Packman Build Service PMBS

Changes of Revision 70

aMule.changes Changed

@@ -1,4 +1,28 @@
 -------------------------------------------------------------------
+Tue Sep 29 05:44:18 UTC 2026 - Giacomo Comes <gcomes.obs@gmail.com>
+
+- Update to version 3.1.0
+  * amuleapi: a REST API and SSE stream for aMule.
+  * A complete new Web UI, shipped with amuleapi.
+  * Faster transfers.
+  * Leaner and quicker under load.
+  * External Connect is encrypted.
+  * Crypto++ for SHA1 and MD5.
+  * The GUI lists are modern widgets.
+  * Remote-to-local path mappings.
+  * Media metadata, end to end. aMule extracts Length,
+  * A Clients page.
+  * Search that remembers.
+  * Chat and friends everywhere.
+  * Bind to an interface, not just an address.
+  * Looks right on modern desktops.
+  * Friendlier first run.
+- remove patch define_MULE_EVT_NOTIFY.patch
+  * included upstream
+- remove patch FTBFS-aMule-leap-15.6.patch
+  * not needed for Leap 16.x
+
+-------------------------------------------------------------------
 Wed Aug  5 02:11:31 UTC 2026 - Giacomo Comes <gcomes.obs@gmail.com>
 
 - add upstream patch define_MULE_EVT_NOTIFY.patch

aMule.spec Changed

@@ -18,7 +18,7 @@
 
 %define _name amule
 Name:           aMule
-Version:        3.0.1
+Version:        3.1.0
 Release:        0
 Summary:        Another eMule file-sharing program
 License:        GPL-2.0-or-later
@@ -28,8 +28,6 @@
 URL:            https://amule-org.github.io
 #https://github.com/amule-org/amule
 Source0:        %{_name}-%{version}.tar.gz
-Patch0:         FTBFS-%{name}-leap-15.6.patch
-Patch1:         define_MULE_EVT_NOTIFY.patch
 BuildRequires:  binutils-devel
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -75,6 +73,7 @@
 %cmake \
    -DBUILD_ALC=ON \
    -DBUILD_ALCC=ON \
+   -DBUILD_AMULEAPI=ON \
    -DBUILD_AMULECMD=ON \
    -DBUILD_CAS=ON \
    -DBUILD_DAEMON=ON \
@@ -110,6 +109,7 @@
 %{_bindir}/alc
 %{_bindir}/alcc
 %{_bindir}/amule
+%{_bindir}/amuleapi
 %{_bindir}/amulecmd
 %{_bindir}/amuled
 %{_bindir}/amulegui
@@ -119,6 +119,7 @@
 %{_bindir}/fileview
 %{_bindir}/wxcas
 %dir %{_datadir}/amule
+%{_datadir}/amule/amuleapi-static
 %{_datadir}/amule/skins
 %{_datadir}/amule/webserver
 %{_datadir}/applications/alc.desktop
@@ -129,11 +130,17 @@
 %{_datadir}/pixmaps/*.xpm
 %{_datadir}/pixmaps/*.png
 %{_datadir}/icons/hicolor/128x128/apps/*.png
+%{_datadir}/icons/hicolor/128x128/mimetypes/*.png
 %{_datadir}/icons/hicolor/256x256/apps/*.png
+%{_datadir}/icons/hicolor/256x256/mimetypes/*.png
 %{_datadir}/metainfo/org.amule.aMule.metainfo.xml
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
+%{_datadir}/icons/hicolor/scalable/mimetypes/*.svg
+%{_datadir}/mime/packages/org.amule.aMule.xml
 %{_mandir}/man1/alc.1%{?ext_man}
 %{_mandir}/man1/alcc.1%{?ext_man}
 %{_mandir}/man1/amule.1%{?ext_man}
+%{_mandir}/man1/amuleapi.1%{?ext_man}
 %{_mandir}/man1/amulecmd.1%{?ext_man}
 %{_mandir}/man1/amuled.1%{?ext_man}
 %{_mandir}/man1/amulegui.1%{?ext_man}

FTBFS-aMule-leap-15.6.patch Deleted

@@ -1,38 +0,0 @@
-diff -urN aMule-2.3.3.20250105.4a1b78a2a.orig/src/amule-gui.cpp aMule-2.3.3.20250105.4a1b78a2a/src/amule-gui.cpp
---- aMule-2.3.3.20250105.4a1b78a2a.orig/src/amule-gui.cpp	2025-02-14 13:18:35.786799500 +0800
-+++ aMule-2.3.3.20250105.4a1b78a2a/src/amule-gui.cpp	2025-02-14 13:18:54.401214405 +0800
-@@ -102,7 +102,7 @@
- 	// Disable these checks for now.  The code really needs updating to
- 	// eliminate these inconsistent flag uses, but these checks are new
- 	// since wx3.0, and this should just return us to what 3.0 did.
--	wxSizerFlags::DisableConsistencyChecks();
-+	// wxSizerFlags::DisableConsistencyChecks();
- 
- 	amuledlg = NULL;
- }
-diff -urN aMule-2.3.3.20250105.4a1b78a2a.orig/src/utils/aLinkCreator/src/alcframe.cpp aMule-2.3.3.20250105.4a1b78a2a/src/utils/aLinkCreator/src/alcframe.cpp
---- aMule-2.3.3.20250105.4a1b78a2a.orig/src/utils/aLinkCreator/src/alcframe.cpp	2025-02-14 13:18:35.846791775 +0800
-+++ aMule-2.3.3.20250105.4a1b78a2a/src/utils/aLinkCreator/src/alcframe.cpp	2025-02-14 13:19:51.262981812 +0800
-@@ -253,18 +253,18 @@
-   m_toolbar->SetToolBitmapSize (wxSize (32, 32));
-   m_toolbar->SetMargins (2, 2);
- 
--  m_toolbar->AddTool (ID_BAR_OPEN, _("Open"), wxBitmapBundle(m_toolBarBitmaps0),
-+  m_toolbar->AddTool (ID_BAR_OPEN, _("Open"), m_toolBarBitmaps0,
-                       _("Open a file to compute its eD2k link"));
- 
--  m_toolbar->AddTool (ID_BAR_COPY, _("Copy"), wxBitmapBundle(m_toolBarBitmaps1),
-+  m_toolbar->AddTool (ID_BAR_COPY, _("Copy"), m_toolBarBitmaps1,
-                       _("Copy computed eD2k link to clipboard"));
- 
--  m_toolbar->AddTool (ID_BAR_SAVEAS, _("Save as"), wxBitmapBundle(m_toolBarBitmaps2),
-+  m_toolbar->AddTool (ID_BAR_SAVEAS, _("Save as"), m_toolBarBitmaps2,
-                       _("Save computed eD2k link to file"));
- 
-   m_toolbar->AddSeparator ();
- 
--  m_toolbar->AddTool (ID_BAR_ABOUT, _("About"), wxBitmapBundle(m_toolBarBitmaps3),
-+  m_toolbar->AddTool (ID_BAR_ABOUT, _("About"), m_toolBarBitmaps3,
-                       _("About aLinkCreator"));
- 
-   m_toolbar->Realize ();

define_MULE_EVT_NOTIFY.patch Deleted

@@ -1,43 +0,0 @@
-commit 6637b9d5ddc90726374b85290982a2bbb55a841d
-Author: got3nks <got3nks@users.noreply.github.com>
-Date:   Thu Jul 9 12:14:07 2026 +0200
-
-    fix(amulecmd): define MULE_EVT_NOTIFY so LTO builds link (#368)
-    
-    amulecmd references MULE_EVT_NOTIFY through the header-inline CMuleGUIEvent
-    (pulled in via TextClient.cpp) but links no translation unit that defines it:
-    GuiEvents.cpp (muleappcore) and WebInterface.cpp (webserver) are not linked
-    into amulecmd. Non-LTO builds dead-strip the unused inline CMuleGUIEvent
-    ctor/Clone() copies before the symbol is demanded, so the gap stayed latent;
-    under LTO the vtable is retained and the reference reaches the final link
-    undefined, breaking the amulecmd link.
-    
-    Regression from c30cdc42b, which changed MULE_EVT_NOTIFY from a plain
-    const wxEventType (an int, foldable/strippable) into a const
-    wxEventTypeTag<wxEvent> object. Define it in amulecmd's console TU, matching
-    the per-binary event-definition pattern already used for MULE_EVT_LOGLINE in
-    LoggerConsole.cpp.
-    
-    Refs #367
-
-diff --git a/src/TextClient.cpp b/src/TextClient.cpp
-index 20281049e..e27618dd0 100644
---- a/src/TextClient.cpp
-+++ b/src/TextClient.cpp
-@@ -1382,6 +1382,16 @@ int CamulecmdApp::OnRun()
- 
- // Stub functions needed by the linker in ASIO builds
- #include "GuiEvents.h"
-+
-+// MULE_EVT_NOTIFY is declared in GuiEvents.h and referenced by the header-inline
-+// CMuleGUIEvent (its ctor and Clone()) that this console binary pulls in, but amulecmd
-+// links no TU that defines it: GuiEvents.cpp lives in muleappcore and WebInterface.cpp
-+// in the webserver, neither of which amulecmd links. Non-LTO builds dead-strip the
-+// unused inline copies before the symbol is demanded; LTO keeps the CMuleGUIEvent vtable
-+// and the reference survives to the final link, so the definition must live here. Same
-+// per-binary event-definition pattern as MULE_EVT_LOGLINE in LoggerConsole.cpp.
-+wxDEFINE_EVENT(MULE_EVT_NOTIFY, wxEvent);
-+
- namespace MuleNotify
- {
- 	void HandleNotification(const class CMuleNotiferBase&) {}

amule-3.0.1.tar.gz/.github/workflows/redirect-issues.yml Deleted

@@ -1,49 +0,0 @@
-name: Redirect new issues to amule-org/amule
-
-on:
-  issues:
-    types: opened
-
-permissions:
-  issues: write
-
-jobs:
-  redirect:
-    # No-op on forks (incl. amule-org/amule, which is the canonical
-    # destination — without this guard, syncing the workflow file there
-    # would make it auto-close its own issues with a redirect to itself).
-    if: github.repository == 'amule-project/amule'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v9
-        with:
-          script: |
-            const newIssuesUrl = "https://github.com/amule-org/amule/issues";
-            const body = 
-              "👋 Thanks for the report.",
-              "",
-              `Please file new issues at the project's current home: **${newIssuesUrl}**`,
-              "",
-              "Issue tracking has moved off this repository; this one is kept as a mirror of the codebase only. New issues filed here are auto-closed and locked because nobody monitors them. The original text of your report is preserved above, so you can copy it across.",
-              "",
-              "Sorry for the friction.",
-            .join("\n");
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              body,
-            });
-            await github.rest.issues.update({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              state: "closed",
-              state_reason: "not_planned",
-            });
-            await github.rest.issues.lock({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              lock_reason: "resolved",
-            });

amule-3.0.1.tar.gz/.github/workflows/redirect-prs.yml Deleted

@@ -1,49 +0,0 @@
-name: Notify on PRs that this repo is a mirror
-
-# Fires once when a PR is opened. Posts a single comment pointing the
-# contributor at amule-org/amule and stops. Does NOT close or lock the
-# PR — maintainers may still merge small fixes from this side.
-#
-# Why pull_request_target (not pull_request): we need write access to
-# call createComment on PRs opened from forks. `pull_request` runs in
-# the fork's context and gets a read-only token; `_target` runs in the
-# base repo's context with full token permissions. This is safe here
-# because the workflow only calls a hardcoded createComment — it does
-# NOT actions/checkout or execute any contributor code.
-#
-# Why the github.repository gate: the workflow file syncs to forks
-# (including amule-org/amule itself), where the redirect would point
-# contributors to the repo they're already on. The if-guard makes it a
-# no-op everywhere except amule-project/amule.
-
-on:
-  pull_request_target:
-    types: opened
-
-permissions:
-  pull-requests: write
-
-jobs:
-  notify:
-    if: github.repository == 'amule-project/amule'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v9
-        with:
-          script: |
-            const newPrsUrl = "https://github.com/amule-org/amule/pulls";
-            const body = 
-              "👋 Thanks for the contribution.",
-              "",
-              `Heads up — this repository is a mirror. Active development happens at the project's current home: **${newPrsUrl}**`,
-              "",
-              "If you re-open this pull request against amule-org/amule it will land in front of the active reviewers right away. We're leaving this PR open here too so it isn't lost — a maintainer may merge it directly from this side if it's a small fix, but the canonical place for follow-ups, review threads, and any related issues is the new repo.",
-              "",
-              "Sorry for the friction.",
-            .join("\n");
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              body,
-            });

amule-3.0.1.tar.gz/docs/wiki Deleted

amule-3.0.1.tar.gz/docs/wiki/AICH_Hashset-de.md Deleted

amule-3.0.1.tar.gz/docs/wiki/AICH_Hashset.md Deleted

amule-3.0.1.tar.gz/docs/wiki/Addresses.dat_file-de.md Deleted

amule-3.0.1.tar.gz/docs/wiki/Addresses.dat_file.md Deleted

amule-3.0.1.tar.gz/docs/wiki/Aggressive_client.md Deleted

amule-3.0.1.tar.gz/org.amule.aMule-256.png Deleted

amule-3.0.1.tar.gz/org.amule.aMule.metainfo.xml Deleted

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>org.amule.aMule</id>
-
-  <name>aMule</name>
-  <summary>P2P client based on eMule</summary>
-  <summary xml:lang="es">Cliente P2P basado en eMule</summary>
-  <summary xml:lang="fr">Client P2P ayant pour base eMule</summary>
-  <summary xml:lang="pt-BR">Cliente P2P baseado em eMule</summary>
-  <summary xml:lang="tr">eMule programına dayalı P2P istemcisi</summary>
-
-  <metadata_license>FSFAP</metadata_license>
-  <project_license>GPL-2.0-or-later</project_license>
-
-  <description>
-    <p>
-      aMule is a multi-platform client for the ED2K file sharing network and based on the windows client eMule. aMule is intended to be as user friendly and feature rich as eMule and to remain faithful to the look and feel of eMule so users familiar with either aMule or eMule will be able switch between the two easily. Since aMule is based upon the eMule codebase, new features in eMule tend to find their way into aMule soon after their inclusion into eMule so users of aMule can expect to ride the cutting-edge of ED2k clients.
-    </p>
-    <p xml:lang="es">
-      aMule es un cliente multiplataforma para la red de intercambio de archivos ED2K basado en el cliente de Windows eMule. aMule pretende ser tan fácil de usar y completo como eMule, y mantener la experiencia de uso de eMule para que los usuarios familiarizados con cualquiera de los dos puedan cambiar entre ambos con facilidad. Dado que aMule se basa en el código de eMule, las nuevas características de eMule suelen llegar a aMule poco después de su inclusión, por lo que los usuarios de aMule pueden esperar estar a la vanguardia de los clientes ED2K.
-    </p>
-    <p xml:lang="fr">
-      aMule est un client multiplateforme pour le réseau de partage de fichiers ED2K fondé sur le client eMUle pour Windows. aMule se veut aussi convivial et riche en fonctionnalités qu'eMule, tout en restant fidèle à son apparence et à son ergonomie afin que les utilisateurs familiarisés avec aMule ou eMule puissent basculer de l'un à l'autre facilement. Comme aMule repose sur le code source d'eMule, les nouvelles fonctionnalités d'eMule ont tendance à être incorporées dans aMule peu après leur inclusion dans eMule, les utilisateurs d'aMule peuvent donc compter sur un client à la pointe de la technologie ED2K.
-    </p>
-    <p xml:lang="pt-BR">
-      aMule é um cliente multi-plataforma para a rede de compartilhamento de arquivos ED2K, baseado no cliente eMule para Windows. aMule pretende ser tão amigável ao usuário e cheio de recursos quanto eMule e se manter fiel à aparência e sentimento de eMule de modo que usuários familiares com qualquer um dos dois serjam capazes de trocar entre os dois facilmente. Como aMule é baseado no código de eMule, novos recursos de eMule tendem a ser incorporados em aMule logo após sua inclusão em eMule de modo que os usuários de aMule podem esperar estar utilizando a mais nova tecnologia dos clientes ED2K.
-    </p>
-    <p xml:lang="tr">
-      aMule, Windows için eMule istemcisine dayalı ve çoklu platform desteği bulunduran bir ED2K dosya paylaşım ağı istemcisidir. aMule, eMule kadar kullanıcı dostu ve zengin işlevli olacak şekilde tasarlanmıştır, aMule veya eMule programına aşina kullanıcılarının birinden diğerine kolay geçiş yapabilmeleri için eMule programının görünümüne sadık kalacaktır. aMule, eMule kaynak koduna dayalı olduğundan dolayı eMule programına eklenen yeni işlevler kısa bir süre sonra aMule programına da gelirler, yani aMule kullanıcıları ED2K istemcilerinin en yeni işlevlerinden istifade edebilirler.
-    </p>
-  </description>
-
-  <url type="homepage">https://amule-org.github.io</url>
-  <url type="bugtracker">https://github.com/amule-org/amule/issues</url>
-  <url type="help">https://amule-org.github.io/docs</url>
-
-  
-  <releases>
-    <release version="3.0.0" date="2026-06-08">
-      <url>https://amule-org.github.io/blog/amule-3-0-0</url>
-      <description>
-        <p>
-          First major release in five years. Headline changes are dramatic throughput improvements (peer-to-peer downloads see ~100–380× speedups over 2.3.3 across macOS, Linux, and Windows), a full build-system overhaul (CMake replaces autotools), a modernized dependency stack, native binaries for Linux / macOS / Windows, and a broad legacy-API cleanup.
-        </p>
-      </description>
-    </release>
-  </releases>
-
-  <launchable type="desktop-id">org.amule.aMule.desktop</launchable>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/amule-org/amule/3.0.0/.github/amule-interface-search.png</image>
-      <caption>Screenshot of the aMule search interface</caption>
-      <caption xml:lang="es">Captura de pantalla de la interfaz de búsqueda de aMule</caption>
-      <caption xml:lang="fr">Capture d'écran de l'interface de recherche d'aMule</caption>
-      <caption xml:lang="pt-BR">Captura de tela da interface de busca de aMule</caption>
-      <caption xml:lang="tr">aMule arama arayüzünün ekran fotoğrafı</caption>
-    </screenshot>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/amule-org/amule/3.0.0/.github/amule-preferences.png</image>
-      <caption>Screenshot of the aMule preferences interface</caption>
-      <caption xml:lang="es">Captura de pantalla de la interfaz de preferencias de aMule</caption>
-      <caption xml:lang="fr">Capture d'écran de l'interface des préférences d'aMule</caption>
-      <caption xml:lang="pt-BR">Captura de tela da interface das preferências de aMule</caption>
-      <caption xml:lang="tr">aMule tercihler arayüzünün ekran fotoğrafı</caption>
-    </screenshot>
-  </screenshots>
-
-  <developer id="org.amule">
-    <name>aMule Team</name>
-  </developer>
-
-  <provides>
-    <binary>amule</binary>
-  </provides>
-
-  <content_rating type="oars-1.1"/>
-</component>

amule-3.0.1.tar.gz/po/LINGUAS Deleted

amule-3.0.1.tar.gz/po/Makevars Deleted

@@ -1,29 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-# --no-wrap matches the project policy enforced in scripts/update-po.sh
-# and the Weblate "application" component: one msgid/msgstr per line, no
-# width-based wrapping. Kept here for symmetry with the legacy autotools
-# update-po target, even though CMake doesn't currently invoke it.
-XGETTEXT_OPTIONS = --no-wrap --keyword=_ --keyword=wxTRANSLATE --keyword=wxPLURAL:1,2
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Free Software Foundation, Inc.
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =

amule-3.0.1.tar.gz/po/Rules-quot Deleted

@@ -1,42 +0,0 @@
-# Special Makefile rules for English message catalogs with quotation marks.
-
-DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
-
-.SUFFIXES: .insert-header .po-update-en
-
-en@quot.po-update: en@quot.po-update-en
-en@boldquot.po-update: en@boldquot.po-update-en
-
-.insert-header.po-update-en:
-	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	ll=`echo $$lang | sed -e 's/@.*//'`; \
-	LC_ALL=C; export LC_ALL; \
-	cd $(srcdir); \
-	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "creation of $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-en@quot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
-
-en@boldquot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
-
-mostlyclean: mostlyclean-quot
-mostlyclean-quot:
-	rm -f *.insert-header

amule-3.0.1.tar.gz/po/boldquot.sed Deleted

amule-3.0.1.tar.gz/po/en@boldquot.header Deleted

@@ -1,25 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#
-# This catalog furthermore displays the text between the quotation marks in
-# bold face, assuming the VT100/XTerm escape sequences.
-#

amule-3.0.1.tar.gz/po/en@quot.header Deleted

@@ -1,22 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#

amule-3.0.1.tar.gz/po/insert-header.sin Deleted

amule-3.0.1.tar.gz/po/it_CH.po Deleted

@@ -1,7860 +0,0 @@
-# Translation of amule interface to Italian
-# aMule i18n resource file.
-# Copyright (c) 2003-2023 aMule Team
-# This file is distributed under the same license as the aMule package.
-#
-# Kry <elkry@users.sourceforge.net>, 2004,2005.
-# ilbuio <ilbuio.bnf@iol.it>, 2004,2005.
-# AnonimoVeneziano <voloterreno@tin.it>, 2004.
-# GhePeU <ghepeu@virgilio.it>, 2004,2005.
-# BELiAL <carlo.casta@gmail.com>, 2007.
-# Luca Pagliero <luca@lucapagliero.it>
-# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2016-2023.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: aMule 2.3.3\n"
-"Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:16+0000\n"
-"Last-Translator: got3nks <got3nks@users.noreply.github.com>\n"
-"Language-Team: SebastianoPistore.info@protonmail.ch\n"
-"Language: it_CH\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: Poedit 3.2.2\n"
-
-#: src/AddFriend.cpp:45
-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/AppImageIntegration.cpp:221
-msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
-"\n"
-"Install desktop integration now?"
-msgstr ""
-"aMule può installare un launcher e un'icona desktop nella tua home directory in modo che appaia nel menu delle applicazioni come un'app normalmente installata. Questa operazione è reversibile — i file vengono creati in ~/.local/share/applications e ~/.local/share/icons e possono essere rimossi in qualsiasi momento.\n"
-"\n"
-"Installare l'integrazione desktop ora?"
-
-#: src/AppImageIntegration.cpp:226
-msgid "Add aMule to your application menu?"
-msgstr "Aggiungere aMule al menu delle applicazioni?"
-
-#: src/AppImageIntegration.cpp:228
-msgid "Install"
-msgstr "Installa"
-
-#: src/AppImageIntegration.cpp:228
-msgid "Not now"
-msgstr "Non ora"
-
-#: src/AppImageIntegration.cpp:229
-msgid "Don't ask again"
-msgstr "Non chiedere più"
-
-#: src/AppImageIntegration.cpp:248
-msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
-msgstr "Impossibile installare l'integrazione desktop: la variabile d'ambiente APPDIR non è impostata. Di solito ciò significa che l'AppImage è stato avviato in modo non standard."
-
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
-msgid "aMule integration failed"
-msgstr "Integrazione di aMule non riuscita"
-
-#: src/AppImageIntegration.cpp:259
-#, c-format
-msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
-msgstr "Impossibile installare l'integrazione desktop: creazione di %s non riuscita. Verifica che la tua home directory sia scrivibile."
-
-#: src/AppImageIntegration.cpp:271
-#, c-format
-msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
-msgstr "Impossibile installare l'integrazione desktop: scrittura di %s non riuscita. Verifica che la tua home directory sia scrivibile."
-
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr "Integrazione AppImage: aMule aggiunto al menu delle applicazioni."
-
-#: src/AppImageIntegration.cpp:284
-msgid ""
-"aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
-"\n"
-"On some desktops, aMule may need to restart for the dock / taskbar icon to bind to the new launcher entry. Modern Wayland compositors (GNOME, KDE) pick this up live, but a restart is the safe fallback if the icon stays generic.\n"
-"\n"
-"Restart aMule now?"
-msgstr ""
-"aMule è stato aggiunto al menu delle applicazioni. Ora puoi avviarlo dal tuo elenco delle applicazioni, e il launcher eseguirà questo stesso AppImage.\n"
-"\n"
-"Su alcuni desktop, aMule potrebbe dover essere riavviato affinché l'icona del dock / barra delle applicazioni si colleghi alla nuova voce del launcher. I compositori Wayland moderni (GNOME, KDE) lo rilevano in tempo reale, ma un riavvio è la soluzione sicura se l'icona rimane generica.\n"
-"\n"
-"Riavviare aMule ora?"
-
-#: src/AppImageIntegration.cpp:287
-msgid "aMule installed"
-msgstr "aMule installato"
-
-#: src/AppImageIntegration.cpp:289
-msgid "Restart now"
-msgstr "Riavvia ora"
-
-#: src/AppImageIntegration.cpp:289
-msgid "Later"
-msgstr "Più tardi"
-
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 "Impossibile aggiungere %u collegamento dal file ED2KLinks (vedere il log per i dettagli)."
-msgstr1 "Impossibile aggiungere %u collegamenti dal file ED2KLinks (vedere il log per i dettagli)."
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ERRORE"
-
-#: src/amuleAppCommon.cpp:179
-msgid "Failed to open ED2KLinks file."
-msgstr "Impossibile aprire il link ed2k."
-
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
-msgstr "ATTENZIONE: non è possibile aggiungere te stesso come fonte di un link eD2k finché avrai un ID basso."
-
-#: src/amule.cpp:251
-msgid "Now, exiting main app..."
-msgstr "Chiusura dell'applicazione..."
-
-#: src/amule.cpp:281
-#, c-format
-msgid "Terminating amuleweb instance with pid '%d' ... "
-msgstr "Sto terminando l'istanza di amuleweb con pid `%d' ... "
-
-#: src/amule.cpp:284
-#, c-format
-msgid "Killing amuleweb instance with pid '%d' ... "
-msgstr "Sto terminando l'istanza di amuleweb con pid `%d' ... "
-
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
-msgid "Failed"
-msgstr "Fallito"
-
-#: src/amule.cpp:292
-msgid "aMule OnExit: Terminating core."
-msgstr "aMule in fase di chiusura: Il core sta venendo terminato."
-
-#: src/amule.cpp:394
-msgid "aMule shutdown completed."
-msgstr "aMule, arresto completato."
-
-#: src/amule.cpp:398
-msgid "Memory debug results for aMule exit:"
-msgstr "Risultati del debug della memoria per l'uscita da aMule:"
-
-#: src/amule.cpp:595
-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/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:601
-msgid ""
-"\n"
-"EC configuration"
-msgstr ""
-"\n"
-"Configurazione EC"
-
-#: src/amule.cpp:604
-msgid "Password set and external connections enabled."
-msgstr "Password impostata, connessioni esterne abilitate."
-
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
-msgid "WARNING"
-msgstr "ATTENZIONE"
-
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr "Elenco server eD2k (server.met)"
-
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr "Nodi bootstrap Kad (nodes.dat)"
-
-#: src/amule.cpp:796
-msgid ""
-"aMule has detected missing network bootstrap files.\n"
-"Select which ones to download:"
-msgstr ""
-"aMule ha rilevato file di bootstrap di rete mancanti.\n"
-"Seleziona quali scaricare:"
-
-#: src/amule.cpp:797
-msgid "Network bootstrap"
-msgstr "Bootstrap di rete"
-
-#: src/amule.cpp:882
-#, c-format
-msgid "web server running on pid %d"
-msgstr "web server in esecuzione su pid %d"
-
-#: src/amule.cpp:886
-#, fuzzy
-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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
-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/amule.cpp:969
-#, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Impossibile aprire le porte sull'indirizzo specificato: %s"
-
-#: src/amule.cpp:993
-#, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "La porta %u non è disponibile. Otterrai un ID basso\n"
-
-#: src/amule.cpp:999
-#, 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 ""
-"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/amule.cpp:1082
-msgid "Failed to create OnlineSig File"
-msgstr "Impossibile creare il file per l'online signature"
-
-#: src/amule.cpp:1090
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Impossibile creare il file per l'online signature di aMule"
-
-#: src/amule.cpp:1262
-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à di impostarla in ogni caso)"
-
-#: src/amule.cpp:1271
-#, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "È la prima che volta che avvii aMule %s"
-
-#: src/amule.cpp:1273
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Questa è una versione di prova, aggiornata quotidianamente, e\n"
-
-#: src/amule.cpp:1274
-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/amule.cpp:1275
-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/amule.cpp:1280
-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/amule.cpp:1281
-msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
-msgstr "https://amule-org.github.io, o nel nostro canale IRC #aMule su irc.libera.chat.\n"
-
-#: src/amule.cpp:1283
-msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
-msgstr "Segnalare ogni bug su https://github.com/amule-org/amule/issues"
-
-#: src/amule.cpp:1296
-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 dell'online signature non è valida!\n"
-"La firma verrà pertanto disabilitata fino a quando il problema non sarà stato risolto attraverso il pannello delle preferenze."
-
-#: src/amule.cpp:1359
-msgid "Server hostname notified"
-msgstr "Nome host del server notificato"
-
-#: src/amule.cpp:1683
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Preallocazione spazio su disco per il file '%s' fallita: %s"
-
-#: src/amule.cpp:1816
-msgid "ERROR: can't open logfile"
-msgstr "ERRORE: impossibile aprire il file di log"
-
-#: src/amule.cpp:1820
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "ERRORE: il file di log è vuoto. Qualcosa non va."
-
-#: src/amule.cpp:1837
-msgid "Log has been reset"
-msgstr "Il file di log è stato cancellato"
-
-#: src/amule.cpp:1863
-#, c-format
-msgid "ServerMessage: %s"
-msgstr "Messaggio del server: %s"
-
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
-#, c-format
-msgid "Skipped download of %s, because requested file is not newer."
-msgstr "Download di %s saltato, perché il file richiesto non è il più recente."
-
-#: src/amule.cpp:1907
-msgid "Failed to download the nodes list."
-msgstr "Impossibile scaricare la lista dei nodi."
-
-#: src/amule.cpp:1927
-msgid "Failed to open the downloaded version check file"
-msgstr "Impossibile aprire il file per il controllo della versione scaricato"
-
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
-msgid "Corrupted version check file"
-msgstr "File per il controllo della versione corrotto"
-
-#: src/amule.cpp:2012
-msgid "You are using an outdated version of aMule!"
-msgstr "Stai usando una versione non aggiornata di aMule!"
-
-#: src/amule.cpp:2014
-#, 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"
-
-#: src/amule.cpp:2015
-msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
-msgstr "L'ultima versione è sempre disponibile su https://github.com/amule-org/amule/releases/latest"
-
-#: src/amule.cpp:2017
-#, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "ATTENZIONE: La tua versione di aMuled è obsoleta: %i.%i.%i < %li.%li.%li"
-
-#: src/amule.cpp:2021
-msgid "Your copy of aMule is up to date."
-msgstr "La tua copia di aMule è aggiornata."
-
-#: src/amule.cpp:2028
-msgid "Failed to download the version check file"
-msgstr "Impossibile scaricare il file per il controllo della versione"
-
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
-#, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Utenti: %s | File: %s"
-
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
-#, 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.cpp:2208 src/amule-remote-gui.cpp:832
-msgid "No networks selected"
-msgstr "Nessuna rete selezionata"
-
-#: src/amule.cpp:2276 src/TextClient.cpp:806
-msgid "with LowID"
-msgstr "con ID basso"
-
-#: src/amule.cpp:2276 src/TextClient.cpp:806
-msgid "with HighID"
-msgstr "con ID alto"
-
-#: src/amule.cpp:2278
-#, c-format
-msgid "Connected to %s %s"
-msgstr "Connesso a %s %s"
-
-#: src/amule.cpp:2282
-#, c-format
-msgid "Connecting to %s"
-msgstr "Connessione in corso a %s"
-
-#: src/amule.cpp:2284
-msgid "Disconnected from eD2k"
-msgstr "Disconnesso dalla rete eD2k"
-
-#: src/amule.cpp:2292
-msgid "Kad started."
-msgstr "Kad avviato."
-
-#: src/amule.cpp:2294
-msgid "Kad stopped."
-msgstr "Kad arrestato."
-
-#: src/amule.cpp:2302
-msgid "Connected to Kad (ok)"
-msgstr "Connesso alla rete Kad (ok)"
-
-#: src/amule.cpp:2304
-msgid "Connected to Kad (firewalled)"
-msgstr "Connesso alla rete Kad (firewalled)"
-
-#: src/amule.cpp:2307
-msgid "Disconnected from Kad"
-msgstr "Disconnesso dalla rete Kad"
-
-#: src/amule.cpp:2339
-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/amule.cpp:2342
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Rete Kad disattivata dalle opzioni, connessione interrotta."
-
-#: src/amuled.cpp:142
-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:145
-msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
-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 https://amule-org.github.io/docs"
-
-#: src/amuled.cpp:161
-msgid "amuled: OnInit - starting timer"
-msgstr "amuled: OnInit - avvio del timer"
-
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: forzato in background - arrivederci"
-
-#: src/amuled.cpp:207
-msgid "Cannot Create Pid File"
-msgstr "Impossibile creare il file Pid"
-
-#: src/amuled.cpp:263
-#, c-format
-msgid "ERROR: %s"
-msgstr "ERRORE: %s"
-
-#: src/amuleDlg.cpp:266
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Questo è aMule %s basato su eMule."
-
-#: src/amuleDlg.cpp:268
-#, c-format
-msgid "Running on %s"
-msgstr "In esecuzione su %s"
-
-#: src/amuleDlg.cpp:270
-msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
-msgstr "Visita https://github.com/amule-org/amule/releases/latest per sapere se è disponibile una nuova versione."
-
-#: src/amuleDlg.cpp:296
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ERRORE FATALE: Creazione timer fallita"
-
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Controllo remoto di aMule "
-
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Snapshot:"
-
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Client p2p multipiattaforma basato su eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Sito: https://amule-org.github.io \n"
-
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
-
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Documentazione: https://amule-org.github.io/docs \n"
-
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
-"Segnalazioni: https://github.com/amule-org/amule/issues \n"
-"\n"
-
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Parte di aMule è basata su \n"
-
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: routing peer-to-peer basato su metrica XOR.\n"
-
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Messaggio"
-
-#: src/amuleDlg.cpp:594
-msgid "aMule dialog destroyed"
-msgstr "Finestra di aMule chiusa"
-
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
-msgid "Connecting"
-msgstr "Connessione in corso"
-
-#: src/amuleDlg.cpp:782
-msgid "eD2k: Connecting"
-msgstr "eD2k: Connessione in corso"
-
-#: src/amuleDlg.cpp:786
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Disconnesso"
-
-#: src/amuleDlg.cpp:792
-msgid "Kad: Firewalled"
-msgstr "Kad: Firewalled"
-
-#: src/amuleDlg.cpp:796
-msgid "Kad: Connected"
-msgstr "Kad: Connesso"
-
-#: src/amuleDlg.cpp:801
-msgid "Kad: Connecting"
-msgstr "Kad: Connessione in corso"
-
-#: src/amuleDlg.cpp:805
-msgid "Kad: Off"
-msgstr "Kad: Spento"
-
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Annulla"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Ferma i tentativi di connessione in corso"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Disconnetti"
-
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Disconnetti dalle reti a cui sei connesso"
-
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Connetti"
-
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Connetti alle reti attualmente abilitate"
-
-#: src/amuleDlg.cpp:943
-#, c-format
-msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
-msgstr "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
-
-#: src/amuleDlg.cpp:947
-#, c-format
-msgid "Up: %.1f%s | Down: %.1f%s"
-msgstr "Up: %.1f%s | Down: %.1f%s"
-
-#: src/amuleDlg.cpp:977
-#, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Connesso)"
-
-#: src/amuleDlg.cpp:979
-#, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Disconnesso)"
-
-#: src/amuleDlg.cpp:1027
-#, c-format
-msgid "Do you really want to exit %s?"
-msgstr "Vuoi veramente uscire da %s?"
-
-#: src/amuleDlg.cpp:1028
-msgid "Exit confirmation"
-msgstr "Chiedi conferma prima di uscire"
-
-#: src/amuleDlg.cpp:1346
-msgid "Launch Command: "
-msgstr "Comando di avvio: "
-
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
-msgid "- default -"
-msgstr "- predefinita -"
-
-#: src/amuleDlg.cpp:1396
-#, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "La directory delle skin '%s' non esiste"
-
-#: src/amuleDlg.cpp:1401
-#, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "ATTENZIONE: Impossibile aprire il file della skin '%s' in lettura"
-
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Reti"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
-msgid "Networks Window"
-msgstr "Finestra reti"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Ricerca"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches Window"
-msgstr "Finestra ricerche"
-
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Download"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
-msgid "Downloads Window"
-msgstr "Finestra dei Download"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "File condivisi"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
-msgid "Shared Files Window"
-msgstr "Finestra file condivisi"
-
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Messaggi"
-
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
-msgid "Messages Window"
-msgstr "Finestra messaggi"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistiche"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
-msgid "Statistics Graph Window"
-msgstr "Finestra grafici e statistiche"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Preferenze"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
-msgid "Preferences Settings Window"
-msgstr "Finestra Impostazione preferenze"
-
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
-msgid "Import"
-msgstr "Importazione"
-
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
-msgid "The partfile importer tool"
-msgstr "Strumento per l'importazione dei file parziali"
-
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "About"
-msgstr "Informazioni"
-
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-msgid "About/Help"
-msgstr "Informazioni/Aiuto"
-
-#: src/amuleDlg.cpp:1687
-msgid "eD2k network"
-msgstr "rete eD2k"
-
-#: src/amuleDlg.cpp:1691
-msgid "Kad network"
-msgstr "Rete Kad"
-
-#: src/amuleDlg.cpp:1691
-msgid "No network"
-msgstr "Nessuna rete"
-
-#: src/amule-gui.cpp:219
-msgid "aMule remote control"
-msgstr "Controllo remoto di aMule"
-
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
-msgid "aMule"
-msgstr "aMule"
-
-#: src/amule-gui.cpp:357
-msgid "Fatal Error: Failed to create Core Timer"
-msgstr "ERRORE FATALE: Creazione del timer principale fallita"
-
-#: src/amule-remote-gui.cpp:79
-msgid "Connect to remote amule"
-msgstr "Connessione ad aMule remoto"
-
-#: src/amule-remote-gui.cpp:370
-msgid "Fatal Error: Failed to create Poll Timer"
-msgstr "ERRORE FATALE: Creazione del timer di interrogazione fallita"
-
-#: src/amule-remote-gui.cpp:393
-msgid "Going to event loop..."
-msgstr "Ciclo evento..."
-
-#: src/amule-remote-gui.cpp:450
-msgid "Connecting..."
-msgstr "Connessione in corso..."
-
-#: src/amule-remote-gui.cpp:480
-msgid "Connection failed. Please check the host, port, and password."
-msgstr "Connessione non riuscita. Controlla host, porta e password."
-
-#: src/amule-remote-gui.cpp:517
-msgid "Remote GUI EC event handler"
-msgstr "Gestore eventi GUI EC remota"
-
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Connessione fallita. Impossibile connettersi a %s:%d\n"
-
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
-msgid "Going down"
-msgstr "Qualcosa è andato storto"
-
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Connessione persa - aMule verrà chiuso."
-
-#: src/amule-remote-gui.cpp:562
-#, c-format
-msgid ""
-"Connection timed out. Unable to reach %s:%d within the allotted time.\n"
-"Please check the host, port and that aMule is running with External Connections enabled."
-msgstr ""
-"Connessione scaduta. Impossibile raggiungere %s:%d entro il tempo previsto.\n"
-"Controlla host, porta e che aMule sia in esecuzione con le connessioni esterne abilitate."
-
-#: src/amule-remote-gui.cpp:657
-msgid "Ready"
-msgstr "Pronto"
-
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
-msgid "All"
-msgstr "Tutto"
-
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
-msgid "Invalid link or already on list."
-msgstr "Collegamento non valido o già nella lista."
-
-#: src/amule-remote-gui.cpp:973
-#, c-format
-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/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Impossibile ricevere i file condivisi dall'utente '%s'"
-
-#: src/BaseClient.cpp:1575
-msgid "Searching buddy for lowid connection"
-msgstr "Ricerca amico per connessione con ID basso"
-
-#: src/BaseClient.cpp:1789
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (falso eMule versione %#x)"
-
-#: src/BaseClient.cpp:1800
-msgid " (Fake eMule)"
-msgstr " (falso eMule)"
-
-#: src/BaseClient.cpp:1802
-msgid "xMule (Fake eMule)"
-msgstr "xMule (falso eMule)"
-
-#: src/BaseClient.cpp:1841
-#, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (basato su eMule v0.%u)"
-
-#: src/BaseClient.cpp:2014
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Nickname: %s ID: %u"
-
-#: src/BaseClient.cpp:2016
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Richiesto: %s\n"
-
-#: src/BaseClient.cpp:2018
-#, 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"
-msgstr0 "Statistiche file per questa sessione: accettata %d di %d richiesta, %s trasferita\n"
-msgstr1 "Statistiche file per questa sessione: accettate %d di %d richieste, %s trasferite\n"
-
-#: src/BaseClient.cpp:2021
-#, 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"
-msgstr0 "Statistiche file per tutte le sessioni: accettata %d di %d richiesta, %s trasferita\n"
-msgstr1 "Statistiche file per tutte le sessioni: accettate %d di %d richieste, %s trasferite\n"
-
-#: src/BaseClient.cpp:2024
-msgid "Requested unknown file"
-msgstr "Richiesto file sconosciuto"
-
-#: src/BaseClient.cpp:2681
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Messaggio filtrato da '%s' (IP:%s)"
-
-#: src/BaseClient.cpp:2788
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nuovo messaggio da '%s' (IP:%s)"
-
-#: src/BaseClient.cpp:2880
-#, 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 in una cartella inesistente '%s' -> richiesta ignorata"
-
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
-#, c-format
-msgid "WARNING: %s cannot be opened."
-msgstr "ATTENZIONE: %s non può essere aperto."
-
-#: src/CanceledFileList.cpp:61
-msgid "WARNING: Canceled file list corrupted, contains invalid header."
-msgstr "ATTENZIONE: la lista dei file conosciuti è danneggiata, contiene un'intestazione non valida."
-
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
-#, c-format
-msgid "IO error while reading %s file: %s"
-msgstr "Errore I/O durante la lettura del file %s: %s"
-
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
-#, c-format
-msgid "Error while saving %s file: %s"
-msgstr "Errore durante il salvataggio del file %s: %s"
-
-#: src/CaptchaDialog.cpp:44
-msgid "Enter Captcha"
-msgstr "Inserisci captcha"
-
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
-msgid "Category"
-msgstr "Categoria"
-
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nuova categoria"
-
-#: src/CatDialog.cpp:125
-msgid "Choose a folder for incoming files"
-msgstr "Scegli una directory per i file scaricati"
-
-#: src/CatDialog.cpp:140
-msgid "You must specify a name for the category!"
-msgstr "Devi specificare un nome per la categoria!"
-
-#: src/CatDialog.cpp:150
-msgid "You must specify a path for the category!"
-msgstr "Devi specificare un percorso per la categoria!"
-
-#: 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. Specificare un percorso valido!"
-
-#: 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/ChatSelector.cpp:208 src/ChatSelector.cpp:288
-msgid "*** Connected to Client ***"
-msgstr "*** Connesso al client ***"
-
-#: src/ChatSelector.cpp:251
-msgid "*** Connecting to Client ***"
-msgstr "*** Connessione al client in corso ***"
-
-#: src/ChatSelector.cpp:282
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Impossibile connettersi al client / Connessione persa ***"
-
-#: 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/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/ChatWnd.cpp:98
-msgid "Chat"
-msgstr "Chat"
-
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
-msgid "Close tab"
-msgstr "Chiudi scheda"
-
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
-msgid "Close all tabs"
-msgstr "Chiudi tutte le schede"
-
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
-msgid "Close other tabs"
-msgstr "Chiudi le altre schede"
-
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
-msgid "Add to Friends"
-msgstr "Inserisci tra gli amici"
-
-#: src/ClientCreditsList.cpp:158
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr0 "Il file dei crediti è stato caricato, %u client conosciuto"
-msgstr1 "Il file dei crediti è stato caricato, %u client conosciuti"
-
-#: src/ClientCreditsList.cpp:161
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr0 " - Crediti scaduti per %u client!"
-msgstr1 " - Crediti scaduti per %u client!"
-
-#: 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/ClientDetailDialog.cpp:49
-msgid "Client Details"
-msgstr "Dettagli client"
-
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
-msgid "LowID"
-msgstr "ID basso"
-
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
-msgid "HighID"
-msgstr "ID alto"
-
-#: src/ClientDetailDialog.cpp:126
-msgid "Enabled"
-msgstr "Abilitato"
-
-#: src/ClientDetailDialog.cpp:127
-msgid "Supported"
-msgstr "Supportato"
-
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
-msgid "Not supported"
-msgstr "Non supportato"
-
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Disabilitato"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
-msgid "Connected"
-msgstr "Connesso"
-
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
-msgid "Disconnected"
-msgstr "Disconnesso"
-
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
-
-#: src/ClientRef.cpp:196
-msgid "Not complete"
-msgstr "Non completo"
-
-#: src/ClientRef.cpp:198
-msgid "Bad Guy"
-msgstr "Cattivo"
-
-#: src/ClientRef.cpp:200
-msgid "Verified - OK"
-msgstr "Verificata - OK"
-
-#: src/ClientRef.cpp:203
-msgid "Not Available"
-msgstr "Non disponibile"
-
-#: src/ClientTCPSocket.cpp:778
-#, 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/ClientTCPSocket.cpp:799
-#, 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/ClientTCPSocket.cpp:831
-#, 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/ClientTCPSocket.cpp:837
-#, 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/ClientTCPSocket.cpp:862
-#, 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/ClientTCPSocket.cpp:875
-#, 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/ClientTCPSocket.cpp:894
-#, c-format
-msgid "User %s (%u) shares directory '%s'"
-msgstr "L'utente %s (%u) condivide la cartella '%s'"
-
-#: src/ClientTCPSocket.cpp:917
-#, 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/ClientTCPSocket.cpp:932
-#, 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/ClientTCPSocket.cpp:939
-#, 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/ClientTCPSocket.cpp:944
-#, 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/ClientTCPSocket.cpp:956
-#, 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"
-
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
-msgid "File Comments"
-msgstr "Commenti file"
-
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
-msgid "Username"
-msgstr "Nome utente"
-
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
-msgid "File Name"
-msgstr "Nome file"
-
-#: src/CommentDialogLst.cpp:71
-msgid "Rating"
-msgstr "Giudizio"
-
-#: src/CommentDialogLst.cpp:72
-msgid "Comment"
-msgstr "Commento"
-
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
-msgid "No comments"
-msgstr "Nessun commento"
-
-#: src/CommentDialogLst.cpp:133
-#, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr0 "%u commento"
-msgstr1 "%u commenti"
-
-#: src/CorruptionBlackBox.cpp:227
-#, c-format
-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:35
-msgid "Auto Lo"
-msgstr "Auto Bassa"
-
-#: src/DataToText.cpp:36
-msgid "Auto No"
-msgstr "Auto No"
-
-#: src/DataToText.cpp:37
-msgid "Auto Hi"
-msgstr "Auto Alta"
-
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
-msgid "Very low"
-msgstr "Molto bassa"
-
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
-msgid "Low"
-msgstr "Bassa"
-
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
-msgid "Normal"
-msgstr "Normale"
-
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
-msgid "High"
-msgstr "Alta"
-
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
-msgid "Very High"
-msgstr "Molto alta"
-
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
-msgid "Release"
-msgstr "Release"
-
-#: src/DataToText.cpp:60
-msgid "Asking"
-msgstr "Richiesta in corso"
-
-#: src/DataToText.cpp:61
-msgid "Connecting via server"
-msgstr "Connessione in corso attraverso il server"
-
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
-msgid "Queue Full"
-msgstr "Coda piena"
-
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
-msgid "On Queue"
-msgstr "In coda"
-
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
-msgid "Downloading"
-msgstr "Download in corso"
-
-#: src/DataToText.cpp:64
-msgid "Receiving hashset"
-msgstr "Ricezione hashset in corso"
-
-#: src/DataToText.cpp:65
-msgid "No needed parts"
-msgstr "Nessuna parte utile"
-
-#: src/DataToText.cpp:66
-msgid "Cannot connect LowID to LowID"
-msgstr "Impossibile connettere un ID basso a un altro ID basso"
-
-#: src/DataToText.cpp:67
-msgid "Too many connections"
-msgstr "Troppe connessioni"
-
-#: src/DataToText.cpp:69
-msgid "Connecting via Kad"
-msgstr "Connessione via Kad"
-
-#: src/DataToText.cpp:70
-msgid "Too many Kad connections"
-msgstr "Troppe connessioni Kad"
-
-#: src/DataToText.cpp:71
-msgid "Banned"
-msgstr "Bannati"
-
-#: src/DataToText.cpp:72
-msgid "Connection Error"
-msgstr "Errore di connessione"
-
-#: src/DataToText.cpp:73
-msgid "Remote Queue Full"
-msgstr "Coda remota piena"
-
-#: src/DataToText.cpp:103
-msgid "Old MLDonkey"
-msgstr "Vecchio MLDonkey"
-
-#: src/DataToText.cpp:106
-msgid "New MLDonkey"
-msgstr "Nuovo MLDonkey"
-
-#: src/DataToText.cpp:116
-msgid "eMule Compatible"
-msgstr "compatibile con eMule"
-
-#: src/DataToText.cpp:126
-msgid "Local Server"
-msgstr "Server locale"
-
-#: src/DataToText.cpp:127
-msgid "Remote Server"
-msgstr "Server remoto"
-
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
-msgid "Kad"
-msgstr "Kad"
-
-#: src/DataToText.cpp:129
-msgid "Source Exchange"
-msgstr "Scambio fonti"
-
-#: src/DataToText.cpp:130
-msgid "Passive"
-msgstr "Passiva"
-
-#: src/DataToText.cpp:131
-msgid "Link"
-msgstr "Collegamento"
-
-#: src/DataToText.cpp:132
-msgid "Source Seeds"
-msgstr "Fonti salvate"
-
-#: src/DataToText.cpp:133
-msgid "Search Result"
-msgstr "Risultato della ricerca"
-
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
-msgid "Completed"
-msgstr "Completati"
-
-#: src/DataToText.cpp:144
-msgid "In progress"
-msgstr "In corso"
-
-#: src/DataToText.cpp:145
-msgid "ERROR: Out of disk space"
-msgstr "ERRORE: Spazio su disco esaurito"
-
-#: src/DataToText.cpp:146
-msgid "ERROR: Partmet not found"
-msgstr "ERRORE: Partmet non trovato"
-
-#: src/DataToText.cpp:147
-msgid "ERROR: IO error!"
-msgstr "ERRORE: Errore di input/output!"
-
-#: src/DataToText.cpp:148
-msgid "ERROR: Failed!"
-msgstr "ERRORE: Fallito!"
-
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
-msgid "Queued"
-msgstr "In coda"
-
-#: src/DataToText.cpp:150
-msgid "Already downloading"
-msgstr "Download già in corso"
-
-#: src/DataToText.cpp:151
-msgid "Unknown or bad tempfile format."
-msgstr "Formato del file temp sconosciuto o errato."
-
-#: src/DownloadListCtrl.cpp:158
-msgid "Part"
-msgstr "Parte"
-
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
-msgid "Size"
-msgstr "Dimensione"
-
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
-msgid "Transferred"
-msgstr "Trasferiti"
-
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
-msgid "Speed"
-msgstr "Velocità"
-
-#: src/DownloadListCtrl.cpp:164
-msgid "Progress"
-msgstr "Avanzamento"
-
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
-msgid "Sources"
-msgstr "Fonti"
-
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
-msgid "Priority"
-msgstr "Priorità"
-
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
-msgid "Status"
-msgstr "Stato"
-
-#: src/DownloadListCtrl.cpp:168
-msgid "Time Remaining"
-msgstr "Tempo rimanente"
-
-#: src/DownloadListCtrl.cpp:169
-msgid "Last Seen Complete"
-msgstr "Ultima fonte completa vista"
-
-#: src/DownloadListCtrl.cpp:170
-msgid "Last Reception"
-msgstr "Ultima ricezione"
-
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Sei certo di voler eliminare il file selezionato?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Sei certo di volere eliminare i file selezionati?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Feedback da: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
-msgid "Auto"
-msgstr "Auto"
-
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
-msgid "&Stop"
-msgstr "Fer&ma"
-
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
-msgid "&Pause"
-msgstr "&Pausa"
-
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
-msgid "&Resume"
-msgstr "&Continua"
-
-#: src/DownloadListCtrl.cpp:656
-msgid "C&lear completed"
-msgstr "&Rimuovi file completati"
-
-#: src/DownloadListCtrl.cpp:662
-msgid "Swap every A4AF to this file now"
-msgstr "Sposta ogni A4AF su questo file"
-
-#: src/DownloadListCtrl.cpp:664
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Sposta ogni A4AF su questo file (Auto)"
-
-#: src/DownloadListCtrl.cpp:669
-msgid "Swap every A4AF to any other file now"
-msgstr "Sposta ogni A4AF sugli altri file"
-
-#: src/DownloadListCtrl.cpp:672
-msgid "Extended Options"
-msgstr "Opzioni avanzate"
-
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
-msgid "Preview"
-msgstr "Anteprima"
-
-#: src/DownloadListCtrl.cpp:678
-msgid "Show file &details"
-msgstr "Mostra &dettagli file"
-
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
-msgid "Show all comments"
-msgstr "Mostra tutti i commenti"
-
-#: src/DownloadListCtrl.cpp:684
-msgid "Copy magnet URI to clipboard"
-msgstr "Copia URI magnet negli appunti"
-
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k &link to clipboard"
-msgstr "Copia il &link eD2k negli appunti"
-
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
-msgid "Copy feedback to clipboard"
-msgstr "Copia feedback negli appunti"
-
-#: src/DownloadListCtrl.cpp:697
-msgid "unassign"
-msgstr "rimuovi"
-
-#: src/DownloadListCtrl.cpp:704
-msgid "Assign to category"
-msgstr "Assegna a categoria"
-
-#: src/DownloadListCtrl.cpp:740
-msgid "&Open the file"
-msgstr "&Apri file"
-
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
-msgid "Enter new name for this file:"
-msgstr "Inserisci un nuovo nome per questo file:"
-
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
-msgid "File rename"
-msgstr "Rinomina file"
-
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Download (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Per prevenire questo avviso ad ogni anteprima, \n"
-"seleziona nelle preferenze il tuo lettore video preferito (di default è %s)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Anteprima"
-
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ERRORE: Impossibile eseguire il lettore multimediale esterno! Comando: `%s'"
-
-#: src/DownloadQueue.cpp:99
-#, c-format
-msgid "Saving PartFile %u of %u"
-msgstr "Salvataggio file parziale %u di %u"
-
-#: src/DownloadQueue.cpp:102
-msgid "All PartFiles Saved."
-msgstr "Tutti i file parziali sono stati salvati."
-
-#: src/DownloadQueue.cpp:109
-#, c-format
-msgid "Loading temp files from %s."
-msgstr "Caricamento dei file parziali da: %s."
-
-#: src/DownloadQueue.cpp:128
-#, c-format
-msgid "Loading PartFile %u of %u"
-msgstr "Caricamento del file parziale %u su %u"
-
-#: src/DownloadQueue.cpp:150
-msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
-msgstr "ERRORE: Impossibile caricare il file di backup. Cerca su https://github.com/amule-org/amule/discussions come recuperare i file .part.met."
-
-#: src/DownloadQueue.cpp:159
-msgid "All PartFiles Loaded."
-msgstr "Tutti i file parziali sono stati caricati."
-
-#: src/DownloadQueue.cpp:162
-msgid "No part files found"
-msgstr "Non è stato trovato alcun file parziale"
-
-#: src/DownloadQueue.cpp:164
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr0 "Trovato %u file parziale"
-msgstr1 "Trovati %u file parziali"
-
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr "Il filesystem della cartella Temp non supporta file di grandi dimensioni."
-
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
-msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr "Il filesytem della cartella Incoming non supporta file di grandi dimensioni."
-
-#: src/DownloadQueue.cpp:373
-#, c-format
-msgid "Downloading %s"
-msgstr "Download di %s"
-
-#: src/DownloadQueue.cpp:381
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Stai già cercando di scaricare il file '%s'"
-
-#: src/DownloadQueue.cpp:393
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Hai già il file '%s'"
-
-#: src/DownloadQueue.cpp:398
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Stai già cercando di scaricare il file %s"
-
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Non posso convertire il magnet link in eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Protocollo del link %s sconosciuto"
-
-#: src/DownloadQueue.cpp:1442
-#, c-format
-msgid "Could not add %u link (see log for details)."
-msgid_plural "Could not add %u links (see log for details)."
-msgstr0 "Impossibile aggiungere %u collegamento (vedere il log per i dettagli)."
-msgstr1 "Impossibile aggiungere %u collegamenti (vedere il log per i dettagli)."
-
-#: src/DownloadQueue.cpp:1464
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Collegamento eD2k non valido! ERRORE: %s"
-
-#: src/ExternalConn.cpp:325
-msgid "Client sent packet after authentication failed."
-msgstr "Il client ha inviato un pacchetto dopo che l'autenticazione era fallita."
-
-#: src/ExternalConn.cpp:343
-msgid "External connection closed."
-msgstr "Connessione esterna chiusa."
-
-#: src/ExternalConn.cpp:420
-msgid "External connections disabled due to empty password!"
-msgstr "Connessioni esterne disabilitate perché la password è vuota!"
-
-#: src/ExternalConn.cpp:441
-msgid "External connections disabled in config file"
-msgstr "Connessioni esterne disabilitate nel file di configurazione"
-
-#: src/ExternalConn.cpp:510
-msgid "New external connection accepted"
-msgstr "Accettata nuova connessione esterna"
-
-#: src/ExternalConn.cpp:513
-msgid "ERROR: couldn't accept a new external connection"
-msgstr "ERRORE: impossibile accettare una nuova connessione esterna"
-
-#: src/ExternalConn.cpp:531
-msgid "External connection refused due to empty password in preferences!"
-msgstr "Connessione esterna rifiutata perché la password nelle preferenze è vuota!"
-
-#: src/ExternalConn.cpp:542
-#, c-format
-msgid "Connecting client: %s %s"
-msgstr "Connessione al client: %s %s"
-
-#: src/ExternalConn.cpp:544
-msgid "Unknown version"
-msgstr "Versione sconosciuta"
-
-#: src/ExternalConn.cpp:554
-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. Usare core e client remoto dello stesso snapshot."
-
-#: src/ExternalConn.cpp:559
-msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
-msgstr "Non puoi connetterti a una versione stabile da una versione CVS qualsiasi! *fiuu!* possibile crash evitato"
-
-#: src/ExternalConn.cpp:620
-msgid "Invalid protocol version."
-msgstr "Versione protocollo non valida."
-
-#: src/ExternalConn.cpp:625
-msgid "Missing protocol version tag."
-msgstr "Tag versione di protocollo mancante."
-
-#: src/ExternalConn.cpp:632
-msgid "Authentication failed: invalid hash specified as EC password."
-msgstr "Autenticazione fallita: l'hash specificato come password EC non è valido."
-
-#: src/ExternalConn.cpp:664
-msgid "Authentication failed: wrong password."
-msgstr "Autenticazione fallita: password errata."
-
-#: src/ExternalConn.cpp:666
-msgid "Authentication failed: missing password."
-msgstr "Autenticazione fallita: devi inserire la password."
-
-#: src/ExternalConn.cpp:676
-msgid "Invalid request, please authenticate first."
-msgstr "Richiesta non valida, prima devi autenticarti."
-
-#: src/ExternalConn.cpp:681
-msgid "Access granted."
-msgstr "Accesso consentito."
-
-#: src/ExternalConn.cpp:689
-#, c-format
-msgid "Sent error message \"%s\" to client."
-msgstr "Invia il messaggio di errore \"%s\" al client."
-
-#: src/ExternalConn.cpp:692
-#, c-format
-msgid "Unauthorized access attempt from %s. Connection closed."
-msgstr "Tentativo di accesso non autorizzato da %s. Connessione terminata."
-
-#: src/ExternalConn.cpp:1176
-#, 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:1178
-#, c-format
-msgid "FileHash not found: %s"
-msgstr "Hash del file non trovato: %s"
-
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
-msgid "OOPS! OpCode processing error!"
-msgstr "OOPS! errore nel processare l'opcode!"
-
-#: src/ExternalConn.cpp:1253
-msgid "Server not added"
-msgstr "Server non aggiunto"
-
-#: src/ExternalConn.cpp:1271
-#, c-format
-msgid "server not found: %s"
-msgstr "server non trovato: %s"
-
-#: src/ExternalConn.cpp:1287
-msgid "need to define server to be removed"
-msgstr "è necessario definire il server da rimuovere"
-
-#: src/ExternalConn.cpp:1301
-msgid "eD2k is disabled in preferences."
-msgstr "eD2k è disabilitato nelle preferenze."
-
-#: src/ExternalConn.cpp:1368
-msgid "Friend not found."
-msgstr "Amico non trovato."
-
-#: src/ExternalConn.cpp:1377
-msgid "Client not found."
-msgstr "Client non trovato."
-
-#: src/ExternalConn.cpp:1382
-msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
-msgstr "EC_TAG_FRIEND_SHARED richiede EC_TAG_FRIEND o EC_TAG_CLIENT."
-
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Ricerca in corso. Risultati in arrivo!"
-
-#: src/ExternalConn.cpp:1536
-msgid "WebSearch from remote interface makes no sense."
-msgstr "Non ha senso usare la ricerca Web da interfaccia remota."
-
-#: src/ExternalConn.cpp:1750
-msgid "No points for graph."
-msgstr "Niente punti per il grafico."
-
-#: src/ExternalConn.cpp:1759
-msgid "Your client is not configured for this detail level."
-msgstr "Il tuo client non è configurato per questo livello di dettaglio."
-
-#: src/ExternalConn.cpp:1786
-msgid "External Connection: shutdown requested"
-msgstr "Connessione esterna: arresto richiesto"
-
-#: src/ExternalConn.cpp:1798
-msgid "Already shutting down."
-msgstr "Sto già uscendo."
-
-#: src/ExternalConn.cpp:1816
-#, c-format
-msgid "ExternalConn: adding link '%s'."
-msgstr "ExternalConn: aggiungo il collegamento '%s'."
-
-#: src/ExternalConn.cpp:1832
-#, c-format
-msgid "%d of %d links failed (invalid or already on list)."
-msgstr "%d di %d collegamenti non riusciti (non validi o già in elenco)."
-
-#: src/ExternalConn.cpp:1959
-msgid "File not found."
-msgstr "File non trovato."
-
-#: src/ExternalConn.cpp:1964
-msgid "Invalid file name."
-msgstr "Nome file non valido."
-
-#: src/ExternalConn.cpp:1972
-msgid "Unable to rename file."
-msgstr "Impossibile rinominare il file."
-
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
-msgid "Kad is disabled in preferences."
-msgstr "La rete Kad è disabilitata nelle Preferenze."
-
-#: src/ExternalConn.cpp:2310
-msgid "Already connected to eD2k."
-msgstr "Già connesso ad eD2k."
-
-#: src/ExternalConn.cpp:2313
-msgid "Connecting to eD2k..."
-msgstr "Connessione alla rete eD2k in corso..."
-
-#: src/ExternalConn.cpp:2321
-msgid "Already connected to Kad."
-msgstr "Già connesso alla rete Kad."
-
-#: src/ExternalConn.cpp:2324
-msgid "Connecting to Kad..."
-msgstr "Connessione alla rete Kad..."
-
-#: src/ExternalConn.cpp:2331
-msgid "All networks are disabled."
-msgstr "Tutte le reti sono disabilitate."
-
-#: src/ExternalConn.cpp:2339
-msgid "Disconnected from eD2k."
-msgstr "Disconnesso dalla rete eD2k."
-
-#: src/ExternalConn.cpp:2343
-msgid "Disconnected from Kad."
-msgstr "Disconnesso dalla rete Kad."
-
-#: src/ExternalConn.cpp:2352
-#, c-format
-msgid "External Connection: invalid opcode received: %#x"
-msgstr "Connessione esterna: ricevuto un opcode invalido: %#x"
-
-#: src/ExternalConn.cpp:2355
-msgid "Invalid opcode (wrong protocol version?)"
-msgstr "Opcode non valido (versione errata del protocollo?)"
-
-#: src/ExternalConnector.cpp:135
-#, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Estensione '%s' sconosciuta per il comando '%s'.\n"
-
-#: src/ExternalConnector.cpp:137
-#, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Comando sconosciuto '%s'.\n"
-
-#: src/ExternalConnector.cpp:149
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Questo comando non può avere un argomento.\n"
-
-#: src/ExternalConnector.cpp:151
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Questo comando richiede un argomento.\n"
-
-#: src/ExternalConnector.cpp:154
-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/ExternalConnector.cpp:160
-msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"Estensioni disponibili:\n"
-
-#: src/ExternalConnector.cpp:162
-msgid "Available commands:\n"
-msgstr "Comandi disponibili:\n"
-
-#: src/ExternalConnector.cpp:179
-#, 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 o minuscolo.\n"
-"Digitare '%s <comando>' per avere informazioni dettagliate su <comando>.\n"
-
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
-msgid "Exits from the application."
-msgstr "Esce dall'applicazione."
-
-#: src/ExternalConnector.cpp:293
-msgid "Show help."
-msgstr "Mostra aiuto."
-
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
-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/ExternalConnector.cpp:323
-#, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
-msgstr ""
-"\n"
-"Usa '%s' per la lista dei comandi\n"
-"\n"
-
-#: src/ExternalConnector.cpp:356
-msgid "Syntax error!"
-msgstr "Errore di sintassi!"
-
-#: src/ExternalConnector.cpp:359
-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/ExternalConnector.cpp:362
-msgid "This command should not have any parameters."
-msgstr "Questo comando non deve avere parametri."
-
-#: src/ExternalConnector.cpp:365
-msgid "This command must have a parameter."
-msgstr "Questo comando richiede un parametro."
-
-#: src/ExternalConnector.cpp:368
-msgid "Invalid argument."
-msgstr "Argomento non valido."
-
-#: src/ExternalConnector.cpp:371
-msgid "This is an incomplete command."
-msgstr "Questo comando è incompleto."
-
-#: src/ExternalConnector.cpp:380
-#, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Digita '%s' per avere altro aiuto.\n"
-
-#: src/ExternalConnector.cpp:435
-#, c-format
-msgid "This is %s %s %s\n"
-msgstr "Questo è %s %s %s\n"
-
-#: src/ExternalConnector.cpp:437
-#, c-format
-msgid "This is %s %s\n"
-msgstr "Questo è %s %s\n"
-
-#: src/ExternalConnector.cpp:452
-msgid ""
-"\n"
-"Creating client...\n"
-msgstr ""
-"\n"
-"Creazione del client in corso...\n"
-
-#: src/ExternalConnector.cpp:477
-#, c-format
-msgid ""
-"\n"
-"Ok, exiting %s...\n"
-msgstr ""
-"\n"
-"Ok, uscita in corso da %s...\n"
-
-#: src/ExternalConnector.cpp:483
-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/ExternalConnector.cpp:492
-msgid "Show this help text."
-msgstr "Mostra questo suggerimento."
-
-#: src/ExternalConnector.cpp:495
-msgid "Host where aMule is running. (default: 127.0.0.1)"
-msgstr "Host su cui aMule è in esecuzione (default: 127.0.0.1)"
-
-#: src/ExternalConnector.cpp:498
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Porta di aMule per connessioni esterne (default: 4712)"
-
-#: src/ExternalConnector.cpp:501
-msgid "External Connection password."
-msgstr "Password connessioni esterne."
-
-#: src/ExternalConnector.cpp:504
-msgid "Read configuration from file."
-msgstr "Leggi la configurazione da file."
-
-#: src/ExternalConnector.cpp:507
-msgid "Do not print any output to stdout."
-msgstr "Non stampare output sullo stdout."
-
-#: src/ExternalConnector.cpp:510
-msgid "Be verbose - show also debug messages."
-msgstr "Verboso - mostra anche i messaggi di debug."
-
-#: src/ExternalConnector.cpp:513
-msgid "Sets program locale (language)."
-msgstr "Impostazioni locali (lingua) del programma."
-
-#: src/ExternalConnector.cpp:516
-msgid "Write command line options to config file."
-msgstr "Salva le opzioni linea di comando nel file di configurazione."
-
-#: src/ExternalConnector.cpp:519
-msgid "Creates config file based on aMule's config file."
-msgstr "Crea un file di configurazione basato su quello di aMule."
-
-#: src/ExternalConnector.cpp:522
-msgid "Print program version."
-msgstr "Mostra la versione del programma."
-
-#: src/ExternalConnector.cpp:525
-msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
-msgstr "Forza la compressione ZLIB indipendentemente dalla località dell'IP contattato (utile quando il server è raggiungibile tramite un tunnel VPN che risolve a un IP locale)."
-
-#: src/FileDetailDialog.cpp:76
-msgid "File Details"
-msgstr "Dettagli file"
-
-#: src/FileDetailDialog.cpp:167
-#, c-format
-msgid "%.1f%% done"
-msgstr "%.1f%% completato"
-
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
-
-#: src/FriendList.cpp:123
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Impossibile aprire in lettura il file della lista degli amici 'emfriend.met'!"
-
-#: src/FriendList.cpp:149
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Impossibile aprire in scrittura il file della lista degli amici 'emfriend.met'!"
-
-#: src/FriendList.cpp:266
-msgid "CRITICAL - no client on StartChatSession"
-msgstr "CRITICO - nessun client in StartChatSession"
-
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
-msgid "Friends"
-msgstr "Amici"
-
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Mostra &Dettagli"
-
-#: src/FriendListCtrl.cpp:141
-msgid "Add a friend"
-msgstr "Aggiungi amico"
-
-#: src/FriendListCtrl.cpp:144
-msgid "Remove Friend"
-msgstr "Rimuovi amico"
-
-#: src/FriendListCtrl.cpp:145
-msgid "Send &Message"
-msgstr "Invia &Messaggio"
-
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Visualizza file"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Crea slot amico"
-
-#: src/FriendListCtrl.cpp:180
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Sei sicuro di voler cancellare l'amico selezionato?"
-
-#: src/FriendListCtrl.cpp:182
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Sei sicuro di voler cancellare gli amici selezionati?"
-
-#: src/FriendListCtrl.cpp:240
-msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Non puoi assegnare più di uno slot amico.\n"
-"Assegnato un solo slot."
-
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Selezione multipla"
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Non puoi assegnare più di uno slot amico.\n"
-"Assegnato un solo slot."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Invia messaggio all'utente"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Messaggio da inviare:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Elimina dagli amici"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Invia messaggio"
-
-#: src/GenericClientListCtrl.cpp:644
-msgid "Swap to this file"
-msgstr "Sposta su questo file"
-
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
-
-#: src/GenericClientListCtrl.cpp:1054
-#, c-format
-msgid "On Queue: %u (%i)"
-msgstr "In coda: %u (%i)"
-
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
-msgid "Asked for another file"
-msgstr "Altro file richiesto"
-
-#: src/GenericClientListCtrl.cpp:1083
-msgid "Waiting for upload slot"
-msgstr "In attesa di slot d'invio"
-
-#: src/GenericClientListCtrl.cpp:1085
-#, c-format
-msgid "On Queue: %u"
-msgstr "In coda: %u"
-
-#: src/GenericClientListCtrl.cpp:1088
-msgid "Uploading"
-msgstr "Caricamento"
-
-#: src/GenericClientListCtrl.cpp:1090
-msgid "None"
-msgstr "Nessuno"
-
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
-msgid "No"
-msgstr "No"
-
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
-msgid "Yes"
-msgstr "Sì"
-
-#: src/HTTPDownload.cpp:58
-msgid "Downloading..."
-msgstr "Scaricamento in corso..."
-
-#: src/HTTPDownload.cpp:122
-msgid "HTTP download cancelled"
-msgstr "Download HTTP cancellato"
-
-#: src/HTTPDownload.cpp:237
-msgid "The URL to download can't be empty"
-msgstr "L'URL per scaricare non può essere vuoto"
-
-#: src/HTTPDownload.cpp:246
-#, c-format
-msgid "Failed to create HTTP request for %s"
-msgstr "Impossibile creare la richiesta HTTP per %s"
-
-#: src/HTTPDownload.cpp:337
-#, c-format
-msgid "HTTP download: empty response body for %s"
-msgstr "Download HTTP: corpo della risposta vuoto per %s"
-
-#: src/HTTPDownload.cpp:349
-#, c-format
-msgid "Could not move downloaded file to %s"
-msgstr "Impossibile spostare il file scaricato in %s"
-
-#: src/HTTPDownload.cpp:353
-#, c-format
-msgid "Downloaded %s (%llu bytes)"
-msgstr "Scaricato %s (%llu byte)"
-
-#: src/HTTPDownload.cpp:358
-#, c-format
-msgid "The URL %s returned: %i"
-msgstr "L'URL %s ha restituito: %i"
-
-#: src/HTTPDownload.cpp:365
-#, c-format
-msgid "HTTP download failed for %s: %s"
-msgstr "Download HTTP non riuscito per %s: %s"
-
-#: src/HTTPDownload.cpp:380
-#, c-format
-msgid "HTTP 401 Unauthorized for %s"
-msgstr "HTTP 401 Non autorizzato per %s"
-
-#: src/IP2Country.cpp:82
-#, c-format
-msgid "Migrated existing GeoLite2-Country.mmdb to %s"
-msgstr ""
-
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr ""
-
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr ""
-
-#: src/IP2Country.cpp:146
-msgid "IP2Country: failed to resolve a GeoIP download URL."
-msgstr ""
-
-#: src/IP2Country.cpp:157
-#, c-format
-msgid "Download new %s from %s"
-msgstr "Scarica nuovo %s da %s"
-
-#: src/IP2Country.cpp:191
-#, c-format
-msgid "Download of %s file failed, aborting update."
-msgstr "Download del file %s non riuscito, aggiornamento interrotto."
-
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
-#, c-format
-msgid "Failed to remove %s file, aborting update."
-msgstr "Impossibile rimuovere %s file, interruzione aggiornamento."
-
-#: src/IP2Country.cpp:211
-#, c-format
-msgid "Failed to rename %s file, aborting update."
-msgstr "Impossibile rinominare %s file, interruzione aggiornamento."
-
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
-#, c-format
-msgid "Successfully updated %s"
-msgstr "%s aggiornato con successo"
-
-#: src/IP2Country.cpp:228
-#, c-format
-msgid "Error updating %s"
-msgstr "Errore durante l'aggiornamento di %s"
-
-#: src/IP2Country.cpp:249
-msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
-msgstr ""
-
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
-#, c-format
-msgid "Failed to download %s from %s"
-msgstr "Impossibile scaricare %s da %s"
-
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Impossibile caricare i dati delle nazioni da '%s'."
-
-#: 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/IPFilter.cpp:299
-#, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Impossibile caricare il file ipfilter.dat '%s', trovato formato sconosciuto."
-
-#: src/IPFilter.cpp:325
-#, 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."
-
-#: src/IPFilter.cpp:329
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr0 "Caricato %u intervallo di IP da '%s'."
-msgstr1 "Caricati %u intervalli di IP da '%s'."
-
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr0 "%u riga non valida è stata scartata."
-msgstr1 "%u righe non valide sono state scartate."
-
-#: src/IPFilter.cpp:503
-#, c-format
-msgid "Failed to rename new %s file, aborting update."
-msgstr "Impossibile rinominare il nuovo file %s, interruzione aggiornamento."
-
-#: src/IPFilter.cpp:534
-msgid "IP filter is ready"
-msgstr "Filtro IP pronto"
-
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap dai\n"
-"client noti"
-
-#: src/KadDlg.cpp:151
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Nodi (%u)"
-
-#: src/KadDlg.cpp:183
-msgid "Invalid ip to bootstrap"
-msgstr "IP non valido per il bootstrap"
-
-#: src/KadDlg.cpp:189
-msgid "Invalid port to bootstrap"
-msgstr "Porta non valida per il bootstrap"
-
-#: src/KadDlg.cpp:193
-msgid "Please fill all fields required"
-msgstr "Completa tutti i campi obbligatori"
-
-#: src/KadDlg.cpp:212
-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/KadDlg.cpp:213
-msgid "Doing so will remove your current nodes and restart Kademlia connection."
-msgstr "Così facendo, rimuoverai i nodi attuali e riavvierai la connessione Kademlia."
-
-#: src/KadDlg.cpp:214
-msgid "Continue?"
-msgstr "Continuare?"
-
-#: src/kademlia/kademlia/SearchManager.cpp:154
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: chiave di ricerca troppo corta"
-
-#: src/kademlia/kademlia/SearchManager.cpp:167
-msgid "Kademlia: Search keyword is already on search list: "
-msgstr "Kademlia: la chiave di ricerca è già nella lista: "
-
-#: src/kademlia/routing/RoutingZone.cpp:171
-msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
-msgstr "Impossibile leggere il file nodes.dat - versione troppo vecchia. Questa versione (0) non è più supportata."
-
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr0 "Letto %u contatto Kad"
-msgstr1 "Letti %u contatti Kad"
-
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
-msgid "No contacts found, please bootstrap, or download a nodes.dat file."
-msgstr "Nessun contatto trovato: fai un bootstrap oppure scarica un file nodes.dat."
-
-#: src/kademlia/routing/RoutingZone.cpp:305
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr0 "Solo %d contatto Kad disponibile, file nodes.dat non scritto"
-msgstr1 "Ci sono solo %d contatti Kad disponibili, file nodes.dat non scritto"
-
-#: src/kademlia/routing/RoutingZone.cpp:336
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr0 "Scritto %d contatto Kad"
-msgstr1 "Scritti %d contatti Kad"
-
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Nome file"
-
-#: src/KnownFile.cpp:1694
-msgid "File size"
-msgstr "Dimensione file"
-
-#: src/KnownFile.cpp:1695
-msgid "Share ratio"
-msgstr "Rapporto di condivisione"
-
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Inviato"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
-msgid "Requested"
-msgstr "Richiesto"
-
-#: src/KnownFile.cpp:1698
-msgid "Accepted"
-msgstr "Accettato"
-
-#: src/KnownFile.cpp:1700
-msgid "Complete sources"
-msgstr "Fonti complete"
-
-#: src/KnownFileList.cpp:119
-msgid "WARNING: Known file list corrupted, contains invalid header."
-msgstr "ATTENZIONE: la lista dei file conosciuti potrebbe essere danneggiata, contiene un'intestazione non valida."
-
-#: src/KnownFileList.cpp:146
-msgid "Failed to load entry in known file list, file may be corrupt"
-msgstr "Impossibile caricare la voce nella lista dei file conosciuti, il file potrebbe essere corrotto"
-
-#: src/KnownFileList.cpp:155
-msgid "Invalid entry in known file list, file may be corrupt: "
-msgstr "Voce non valida nella lista dei file conosciuti, il file potrebbe essere corrotto: "
-
-#: src/libs/common/Format.cpp:306
-#, c-format
-msgid "Unknown error %d"
-msgstr "Errore sconosciuto %d"
-
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
-#, c-format
-msgid "Unable to get error description for error %d"
-msgstr "Impossibile avere una descrizione dell'errore %d"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
-msgid "Hashing"
-msgstr "Hashing in corso"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
-msgid "Completing"
-msgstr "In completamento"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
-msgid "Complete"
-msgstr "Completo"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
-msgid "Paused"
-msgstr "In pausa"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
-msgid "Erroneous"
-msgstr "Errato"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
-msgid "Waiting"
-msgstr "In attesa"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
-msgid "You must specify a non-empty password."
-msgstr "Devi specificare una password non vuota."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Password non valida, non è un hash MD5!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
-msgid "Connection failure"
-msgstr "Connessione fallita"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
-msgstr "Connessione esterna persa — uscita in corso."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
-msgid "EC connection failed. Empty reply."
-msgstr "Connessione EC fallita. Risposta vuota."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
-msgid "External Connection: Bad reply, handshake failed. Connection closed."
-msgstr "Connessione esterna: risposta errata dal server. Connessione terminata."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
-msgid "Succeeded! Connection established to aMule "
-msgstr "Fatto! Connessione stabilita con aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
-msgid "Succeeded! Connection established."
-msgstr "Fatto! Connessione stabilita."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
-msgid "External Connection: Access denied because: "
-msgstr "Connessione esterna: accesso negato a causa di: "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
-msgid "External Connection: Handshake failed."
-msgstr "Connessione esterna: errore di negoziazione."
-
-#: src/LibSocketAsio.cpp:1592
-#, c-format
-msgid "Asio thread %d started"
-msgstr "Thread %d asincrono avviato"
-
-#: src/ListenSocket.cpp:63
-msgid "ListenSocket: Ok."
-msgstr "ListenSocket: Ok."
-
-#: src/ListenSocket.cpp:65
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ERRORE: Impossibile mettersi in ascolto sulla porta TCP."
-
-#: src/Logger.cpp:341
-msgid "ERROR: "
-msgstr "ERRORE: "
-
-#: src/Logger.cpp:341
-msgid "WARNING: "
-msgstr "ATTENZIONE: "
-
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
-msgid "Close"
-msgstr "Chiudi"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Taglia"
-
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
-msgid "Copy"
-msgstr "Copia"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Incolla"
-
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
-msgid "Clear"
-msgstr "Pulisci"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Seleziona tutto"
-
-#: src/MuleTrayIcon.cpp:367
-msgid "eD2k: "
-msgstr "eD2k: "
-
-#: src/MuleTrayIcon.cpp:370
-msgid "Connected (LowID)"
-msgstr "Connesso (LowID)"
-
-#: src/MuleTrayIcon.cpp:371
-msgid "Connected (HighID)"
-msgstr "Connesso (HighID)"
-
-#: src/MuleTrayIcon.cpp:380
-msgid "Kad: "
-msgstr "Kad: "
-
-#: src/MuleTrayIcon.cpp:383
-msgid "Connected (firewalled)"
-msgstr "Connesso (dietro firewall)"
-
-#: src/MuleTrayIcon.cpp:393
-msgid "Server: "
-msgstr "Server: "
-
-#: src/MuleTrayIcon.cpp:394
-msgid "Server IP: "
-msgstr "IP server: "
-
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
-msgid "Not connected"
-msgstr "Non connesso"
-
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
-
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
-#, c-format
-msgid "TCP port: %d"
-msgstr "Porta TCP: %d"
-
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
-msgid "TCP port: Not ready"
-msgstr "Porta TCP: Non disponibile"
-
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
-#, c-format
-msgid "UDP port: %d"
-msgstr "Porta UDP: %d"
-
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
-msgid "UDP port: Not ready"
-msgstr "Porta UDP: Non disponibile"
-
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
-msgid "Client Information"
-msgstr "Informazioni client"
-
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
-msgid "Upload limit"
-msgstr "Limite di invio"
-
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
-msgid "Download limit"
-msgstr "Limite di scaricamento"
-
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Mostra aMule"
-
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Nascondi aMule"
-
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
-msgid "Exit"
-msgstr "Esci"
-
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Illimitato"
-
-#: src/MuleTrayIcon.cpp:769
-msgid "aMule Tray Menu"
-msgstr "Menu di aMule nella barra di sistema"
-
-#: src/MuleTrayIcon.cpp:775
-msgid "Speed limits:"
-msgstr "Limiti velocità:"
-
-#: src/MuleTrayIcon.cpp:780
-msgid "UL: None"
-msgstr "UL: nessuno"
-
-#: src/MuleTrayIcon.cpp:783
-#, c-format
-msgid "UL: %u"
-msgstr "UL: %u"
-
-#: src/MuleTrayIcon.cpp:790
-msgid "DL: None"
-msgstr "DL: nessuno"
-
-#: src/MuleTrayIcon.cpp:793
-#, c-format
-msgid "DL: %u"
-msgstr "DL: %u"
-
-#: src/MuleTrayIcon.cpp:797
-#, c-format
-msgid "Download speed: %.1f%s"
-msgstr "Velocità di scaricamento: %.1f%s"
-
-#: src/MuleTrayIcon.cpp:800
-#, c-format
-msgid "Upload speed: %.1f%s"
-msgstr "Velocità d'invio: %.1f%s"
-
-#: src/MuleTrayIcon.cpp:811
-#, c-format
-msgid "Nickname: %s"
-msgstr "Nickname: %s"
-
-#: src/MuleTrayIcon.cpp:811
-msgid "No Nickname Selected!"
-msgstr "Nessun nickname selezionato!"
-
-#: src/MuleTrayIcon.cpp:818
-msgid "ClientID: "
-msgstr "ID client: "
-
-#: src/MuleTrayIcon.cpp:830
-msgid "ServerName: "
-msgstr "Nome server: "
-
-#: src/MuleTrayIcon.cpp:831
-msgid "ServerIP: "
-msgstr "IP server: "
-
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
-msgid "Not Connected"
-msgstr "Non connesso"
-
-#: src/MuleTrayIcon.cpp:877
-msgid "Online Signature: Enabled"
-msgstr "Online Signature: abilitata"
-
-#: src/MuleTrayIcon.cpp:880
-msgid "Online Signature: Disabled"
-msgstr "Online Signature: disabilitata"
-
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
-#, c-format
-msgid "Uptime: %s"
-msgstr "Uptime: %s"
-
-#: src/MuleTrayIcon.cpp:893
-#, c-format
-msgid "Shared files: %d"
-msgstr "File condivisi: %d"
-
-#: src/MuleTrayIcon.cpp:899
-#, c-format
-msgid "Queued clients: %d"
-msgstr "Client in attesa: %d"
-
-#: src/MuleTrayIcon.cpp:906
-#, c-format
-msgid "Total DL: %s"
-msgstr "DL totale: %s"
-
-#: src/MuleTrayIcon.cpp:913
-#, c-format
-msgid "Total UL: %s"
-msgstr "UL totale: %s"
-
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Link eD2k: "
-
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Invia"
-
-#: src/muuli_wdr.cpp:103
-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 ai download."
-
-#: src/muuli_wdr.cpp:109
-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."
-
-#: src/muuli_wdr.cpp:112
-msgid "Loading ..."
-msgstr "Caricamento in corso..."
-
-#: src/muuli_wdr.cpp:119
-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:122
-msgid "Users: 0"
-msgstr "Utenti: 0"
-
-#: src/muuli_wdr.cpp:123
-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:131
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Up: 0.0 | Down: 0.0"
-
-#: src/muuli_wdr.cpp:132
-msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
-msgstr "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:139
-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 lo stato attuale di connessione e i trasferimenti attivi. Le frecce rosse indicano che attualmente non sei connesso, le frecce gialle indicano 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:142
-msgid "Not Connected ..."
-msgstr "Non connesso..."
-
-#: src/muuli_wdr.cpp:143
-msgid "Currently connected server."
-msgstr "Server attualmente connesso."
-
-#: src/muuli_wdr.cpp:186
-msgid "Search"
-msgstr "Cerca"
-
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nome:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
-msgid "Type"
-msgstr "Tipo"
-
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
-msgid "Local"
-msgstr "Locale"
-
-#: src/muuli_wdr.cpp:203
-msgid "Global"
-msgstr "Globale"
-
-#: src/muuli_wdr.cpp:210
-msgid "Extended Parameters"
-msgstr "Parametri avanzati"
-
-#: src/muuli_wdr.cpp:214
-msgid "Filtering"
-msgstr "Filtraggio"
-
-#: src/muuli_wdr.cpp:223
-msgid "File Type"
-msgstr "Tipo file"
-
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
-msgid "Any"
-msgstr "Qualsiasi"
-
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
-msgid "Archives"
-msgstr "Archivi"
-
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
-msgid "Audio"
-msgstr "Audio"
-
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "Immagini CD"
-
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
-msgid "Pictures"
-msgstr "Immagini"
-
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
-msgid "Programs"
-msgstr "Programmi"
-
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
-msgid "Texts"
-msgstr "Testi"
-
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
-msgid "Videos"
-msgstr "Video"
-
-#: src/muuli_wdr.cpp:247
-msgid "Extension"
-msgstr "Estensione"
-
-#: src/muuli_wdr.cpp:251
-msgid "Min Size"
-msgstr "Dimensione minima"
-
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
-msgid "Bytes"
-msgstr "Byte"
-
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
-
-#: src/muuli_wdr.cpp:270
-msgid "Max Size"
-msgstr "Dimensione massima"
-
-#: src/muuli_wdr.cpp:289
-msgid "Availability"
-msgstr "Disponibilità"
-
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtro:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filtra risultati"
-
-#: src/muuli_wdr.cpp:309
-msgid "Invert Result"
-msgstr "Inverti risultati"
-
-#: src/muuli_wdr.cpp:313
-msgid "Hide Known Files"
-msgstr "Nascondi file conosciuti"
-
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
-msgid "Start"
-msgstr "Cerca"
-
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Ancora"
-
-#: src/muuli_wdr.cpp:325
-msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
-msgstr "Chiedi ai peer Kad che hanno già risposto di ampliare la ricerca. Ogni clic interroga il peer successivo più vicino per altri contatti (KADEMLIA_FIND_VALUE_MORE), facendo emergere ulteriori corrispondenze di file che la frontiera alpha iniziale della ricerca non ha trovato."
-
-#: src/muuli_wdr.cpp:330
-msgid "Stop"
-msgstr "Ferma"
-
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
-msgid "Download"
-msgstr "Download"
-
-#: src/muuli_wdr.cpp:340
-msgid "Reset Fields"
-msgstr "Azzera campi"
-
-#: src/muuli_wdr.cpp:350
-msgid "Results"
-msgstr "Risultati"
-
-#: src/muuli_wdr.cpp:376
-msgid "Clears completed downloads"
-msgstr "Rimuovi download completati"
-
-#: src/muuli_wdr.cpp:415
-msgid "File sources:"
-msgstr "Fonti del file:"
-
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
-msgid "General"
-msgstr "Generale"
-
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Nome completo:"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/D"
-
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "file met:"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash:"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Dimensione file:"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Stato file part:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Ultima volta visto completo:"
-
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
-msgid "Transfer"
-msgstr "Trasferimento"
-
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Fonti trovate:"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Fonti in trasferimento:"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Numero parti:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Disponibili:"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Velocità:"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Download Active Time: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Trasferiti:"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Completati:"
-
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
-msgstr "Intelligent Corruption Handling"
-
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Perdita per corruzione:"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Guadagno per compressione:"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Pacchetti recuperati da ICH:"
-
-#: src/muuli_wdr.cpp:644
-msgid "File Names"
-msgstr "Nomi file"
-
-#: src/muuli_wdr.cpp:652
-msgid "Takeover"
-msgstr "Sovrascrivi"
-
-#: src/muuli_wdr.cpp:659
-msgid "Cleanup"
-msgstr "Pulisci"
-
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
-msgid "Apply"
-msgstr "Applica"
-
-#: src/muuli_wdr.cpp:677
-msgid "Ok"
-msgstr "Ok"
-
-#: src/muuli_wdr.cpp:699
-msgid "Comment/Rate file (Text will be visible to all users)"
-msgstr "Commenta/giudica il file (il testo sarà visibile a tutti gli utenti)"
-
-#: src/muuli_wdr.cpp:705
-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 ""
-"In un film puoi specificare ad esempio durata, trama, lingua... \n"
-"e se è diverso dal titolo che ha, puoi avvisare gli altri utenti di aMule, in modo che NON LO SCARICHINO."
-
-#: src/muuli_wdr.cpp:713
-msgid "File Quality"
-msgstr "Qualità file"
-
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
-msgid "Not rated"
-msgstr "Senza voto"
-
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
-msgid "Invalid / Corrupt / Fake"
-msgstr "Non valido / Corrotto / Falso"
-
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
-msgid "Poor"
-msgstr "Mediocre"
-
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
-msgid "Fair"
-msgstr "Discreto"
-
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
-msgid "Good"
-msgstr "Buono"
-
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
-msgid "Excellent"
-msgstr "Eccellente"
-
-#: src/muuli_wdr.cpp:726
-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:763
-msgid "Refresh"
-msgstr "Aggiorna"
-
-#: src/muuli_wdr.cpp:786
-msgid "Downloading, please wait ..."
-msgstr "Download in corso, attendere prego..."
-
-#: src/muuli_wdr.cpp:790
-msgid "Unknown size"
-msgstr "Dimensione sconosciuta"
-
-#: src/muuli_wdr.cpp:811
-msgid "Required Information"
-msgstr "Informazioni richieste"
-
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Indirizzo IP:"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Porta:"
-
-#: src/muuli_wdr.cpp:826
-msgid "Additional Information"
-msgstr "Informazioni aggiuntive"
-
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Nome utente:"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Hash utente:"
-
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
-msgid "Add"
-msgstr "Aggiungi"
-
-#: src/muuli_wdr.cpp:886
-msgid "Download-Speed"
-msgstr "Velocità download"
-
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Corrente"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Media attuale"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Media sessione"
-
-#: src/muuli_wdr.cpp:923
-msgid "Upload-Speed"
-msgstr "Velocità upload"
-
-#: src/muuli_wdr.cpp:960
-msgid "Connections"
-msgstr "Connessioni"
-
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
-msgid "Active downloads"
-msgstr "Download attivi"
-
-#: src/muuli_wdr.cpp:984
-msgid "Active connections (1:1)"
-msgstr "Connessioni attive (1:1)"
-
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
-msgid "Active uploads"
-msgstr "Upload attivi"
-
-#: src/muuli_wdr.cpp:997
-msgid "Statistics Tree"
-msgstr "Albero statistiche"
-
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Nome utente:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Hash utente:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Software client:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Versione client:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Indirizzo IP:"
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID utente:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP server:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Nome server:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Offuscamento:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
-
-#: src/muuli_wdr.cpp:1095
-msgid "Transfers to client"
-msgstr "Trasferimenti al client"
-
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Richiesta attuale:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Velocità media upload:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Velocità media download:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Inviati nella sessione:"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Scaricati nella sessione:"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Inviati in totale:"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Scaricati in totale:"
-
-#: src/muuli_wdr.cpp:1148
-msgid "Scores"
-msgstr "Punteggi"
-
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modificatore DL/UL:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Identificazione sicura:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Punteggio in coda:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Punteggio in coda:"
-
-#: src/muuli_wdr.cpp:1198
-msgid "Nick"
-msgstr "Nick"
-
-#: src/muuli_wdr.cpp:1201
-msgid "https://amule-org.github.io - the multi-platform Mule"
-msgstr "https://amule-org.github.io - il Mulo multipiattaforma"
-
-#: src/muuli_wdr.cpp:1202
-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:1208
-msgid "Language: "
-msgstr "Lingua: "
-
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
-msgid "The delay before showing tool-tips."
-msgstr "Intervallo prima che vengano mostrati i suggerimenti."
-
-#: src/muuli_wdr.cpp:1214
-msgid "This specifies the language used on controls."
-msgstr "Scelta della lingua utilizzata."
-
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Verifica la disponibilità di nuove versioni all'avvio"
-
-#: src/muuli_wdr.cpp:1218
-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:1225
-msgid "Start aMule automatically when I log in"
-msgstr "Avvia aMule automaticamente all'accesso"
-
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
-msgstr "Registra una voce di avvio automatico per l'utente nel sistema operativo affinché aMule venga avviato all'accesso. Se sposti l'eseguibile di aMule, avvialo manualmente una volta per aggiornare la voce."
-
-#: src/muuli_wdr.cpp:1229
-msgid "Start minimized"
-msgstr "Avvia ridotto ad icona"
-
-#: src/muuli_wdr.cpp:1230
-msgid "Enabling this makes aMule minimize itself upon start."
-msgstr "Abilitando questa opzione, aMule si minimizzerà automaticamente all'avvio."
-
-#: src/muuli_wdr.cpp:1233
-msgid "Prompt on exit"
-msgstr "Chiedi conferma prima di uscire"
-
-#: src/muuli_wdr.cpp:1235
-msgid "Makes aMule prompt before exiting."
-msgstr "Fa in modo che aMule chieda conferma prima di uscire."
-
-#: src/muuli_wdr.cpp:1238
-msgid "Enable Tray Icon"
-msgstr "Abilita icona nella barra"
-
-#: src/muuli_wdr.cpp:1239
-msgid "This Enables/Disables the system tray (or taskbar) icon."
-msgstr "Abilita o disabilita l'icona nella barra di sistema o nella barra delle applicazioni."
-
-#: src/muuli_wdr.cpp:1242
-msgid "Hide application window when close button is pressed"
-msgstr "Nascondi la finestra quando viene premuto il pulsante di chiusura"
-
-#: src/muuli_wdr.cpp:1245
-msgid "Minimize to Tray Icon"
-msgstr "Icona nella barra di sistema"
-
-#: src/muuli_wdr.cpp:1246
-msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
-msgstr "Abilitando questa opzione aMule verrà minimizzato nella barra di sistema invece che nella barra delle applicazioni."
-
-#: src/muuli_wdr.cpp:1249
-msgid "Show notifications when finished downloading"
-msgstr "Mostra notifica al termine dello scaricamento"
-
-#: src/muuli_wdr.cpp:1250
-msgid "Enabling this will make aMule to show notifications when finished downloading."
-msgstr "Con questa funzione abilitata aMule mostrerà una notifica al termine di ogni download."
-
-#: src/muuli_wdr.cpp:1255
-msgid "Tooltip delay time: "
-msgstr "Ritardo dei suggerimenti: "
-
-#: src/muuli_wdr.cpp:1262
-msgid "seconds"
-msgstr "secondi"
-
-#: src/muuli_wdr.cpp:1266
-msgid "Browser Selection"
-msgstr "Selezione browser"
-
-#: src/muuli_wdr.cpp:1272
-msgid "Enter your browser name here. Leave this field empty to use the system default browser."
-msgstr "Inserisci qui il nome del tuo browser. Lascia vuoto questo campo per utilizzare il browser di sistema predefinito."
-
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Sfoglia"
-
-#: src/muuli_wdr.cpp:1279
-msgid "Open in new tab if possible"
-msgstr "Apri in una nuova scheda se possibile"
-
-#: src/muuli_wdr.cpp:1281
-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:1285
-msgid "Video Player"
-msgstr "Riproduttore video"
-
-#: src/muuli_wdr.cpp:1312
-msgid "Bandwidth limits"
-msgstr "Limiti di banda"
-
-#: src/muuli_wdr.cpp:1326
-msgid "Upload"
-msgstr "Upload"
-
-#: src/muuli_wdr.cpp:1334
-msgid "Slot Allocation"
-msgstr "Allocazione slot"
-
-#: src/muuli_wdr.cpp:1343
-msgid "Ports"
-msgstr "Porte"
-
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Porta TCP standard "
-
-#: src/muuli_wdr.cpp:1353
-msgid "This is the standard eD2k port and cannot be disabled."
-msgstr "Questa è la porta standard di eD2k e non può essere disabilitata."
-
-#: src/muuli_wdr.cpp:1356
-msgid "UDP port for server requests (TCP+3):"
-msgstr "Porta UDP per le richieste al server (TCP+3):"
-
-#: src/muuli_wdr.cpp:1358
-msgid "4665"
-msgstr "4665"
-
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Porta UDP estesa (Kad / ricerca globale) "
-
-#: src/muuli_wdr.cpp:1365
-msgid "This UDP port is used for extended eD2k requests and Kad network"
-msgstr "Questa porta UDP è utilizzata per le richieste estese eD2k e per la rete Kad"
-
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Abilita UPnP per il port forwarding del router"
-
-#: src/muuli_wdr.cpp:1372
-msgid "UPnP TCP Port (Optional):"
-msgstr "Porta TCP per UPnP (Facoltativa):"
-
-#: src/muuli_wdr.cpp:1382
-msgid "Bind local address to IP (empty for any):"
-msgstr "Lega l'indirizzo locale all'IP (lascia vuoto per qualsiasi):"
-
-#: src/muuli_wdr.cpp:1385
-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:1391
-msgid "Max sources per downloading file:"
-msgstr "Fonti massime per file in scaricamento:"
-
-#: src/muuli_wdr.cpp:1395
-msgid "Max simultaneous connections:"
-msgstr "Connessioni massime simultanee:"
-
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
-msgid "ED2K"
-msgstr "ED2K"
-
-#: src/muuli_wdr.cpp:1415
-msgid "Autoconnect on startup"
-msgstr "Connetti automaticamente all'avvio"
-
-#: src/muuli_wdr.cpp:1418
-msgid "Reconnect on loss"
-msgstr "Riconnetti dopo perdita connessione"
-
-#: src/muuli_wdr.cpp:1440
-msgid "Remove dead server after"
-msgstr "Rimuovi server inattivi dopo"
-
-#: src/muuli_wdr.cpp:1444
-msgid "retries"
-msgstr "tentativi"
-
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Aggiorna lista server all'avvio"
-
-#: src/muuli_wdr.cpp:1452
-msgid "List"
-msgstr "Lista"
-
-#: src/muuli_wdr.cpp:1455
-msgid "Update server list when connecting to a server"
-msgstr "Aggiorna la lista server quando ti connetti ad un server"
-
-#: src/muuli_wdr.cpp:1458
-msgid "Update server list when a client connects"
-msgstr "Aggiorna la lista server quando ti connetti ad un client"
-
-#: src/muuli_wdr.cpp:1461
-msgid "Use priority system"
-msgstr "Usa sistema di priorità"
-
-#: src/muuli_wdr.cpp:1465
-msgid "Use smart LowID check on connect"
-msgstr "Usa controllo intelligente ID basso in fase di connessione"
-
-#: src/muuli_wdr.cpp:1469
-msgid "Safe connect"
-msgstr "Connessione sicura"
-
-#: src/muuli_wdr.cpp:1473
-msgid "Autoconnect to servers in static list only"
-msgstr "Connetti automaticamente solo ai server statici"
-
-#: src/muuli_wdr.cpp:1476
-msgid "Set manually added servers to High Priority"
-msgstr "Assegna priorità alta ai server aggiunti manualmente"
-
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Trattamento intelligente delle corruzioni (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Abilita"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
-msgid "Add files to download in pause mode"
-msgstr "Aggiungi i nuovi file da scaricare mettendoli in pausa"
-
-#: src/muuli_wdr.cpp:1509
-msgid "Add files to download with auto priority"
-msgstr "Aggiungi i nuovi file da scaricare con priorità automatica"
-
-#: src/muuli_wdr.cpp:1512
-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:1515
-msgid "Start next paused file when a file completes"
-msgstr "Quando un file viene completato inizia a scaricare il primo file in pausa"
-
-#: src/muuli_wdr.cpp:1518
-msgid "From the same category"
-msgstr "Della stessa categoria"
-
-#: src/muuli_wdr.cpp:1520
-msgid "In alphabetic order"
-msgstr "In ordine alfabetico"
-
-#: src/muuli_wdr.cpp:1522
-msgid "Preallocate disk space for new files"
-msgstr "Prealloca lo spazio su disco per i nuovi file"
-
-#: src/muuli_wdr.cpp:1523
-msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
-msgstr "Per i nuovi file prealloca lo spazio su disco per l'intero file, in questo modo ridurrai la frammentazione"
-
-#: src/muuli_wdr.cpp:1528
-msgid "Stop downloads when free disk space reaches "
-msgstr "Interrompi i download quando termina lo spazio su disco "
-
-#: src/muuli_wdr.cpp:1529
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Seleziona se vuoi che aMule controlli il tuo spazio su disco"
-
-#: src/muuli_wdr.cpp:1533
-msgid "Enter here the min disk space desired."
-msgstr "Inserire lo spazio disco minimo desiderato."
-
-#: src/muuli_wdr.cpp:1539
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Salva 10 fonti per i file rari ( con < 20 fonti)"
-
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
-msgid "Uploads"
-msgstr "Upload"
-
-#: src/muuli_wdr.cpp:1546
-msgid "Add new shared files with auto priority"
-msgstr "Assegna priorità automatica ai nuovi file condivisi"
-
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Cartella di destinazione per i file scaricati"
-
-#: src/muuli_wdr.cpp:1567
-msgid ""
-"Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
-"If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
-msgstr ""
-"Qui vengono salvati i download completati. Tutti i file in questa cartella sono condivisi automaticamente con gli altri peer.\n"
-"Se questa cartella contiene anche file che non vuoi condividere, impostala su una sottocartella riservata ad aMule."
-
-#: src/muuli_wdr.cpp:1570
-msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
-msgstr "Scegli la cartella in cui salvare i download completati. Tutti i file in quella cartella saranno condivisi con gli altri peer."
-
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr "(Tutti i file in questa cartella sono condivisi con gli altri peer)"
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Cartella per i file temporanei"
-
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Cartelle condivise"
-
-#: src/muuli_wdr.cpp:1587
-msgid "(Right click on folder icon for recursive share)"
-msgstr "(fai click con il tasto destro sulle icone per condividere ricorsivamente le sottodirectory)"
-
-#: src/muuli_wdr.cpp:1593
-msgid "Share hidden files"
-msgstr "Condividi file nascosti"
-
-#: src/muuli_wdr.cpp:1599
-msgid "Automatically rescan shared folders for changes"
-msgstr "Ricontrolla automaticamente le modifiche nelle cartelle condivise"
-
-#: src/muuli_wdr.cpp:1605
-msgid "Follow symbolic links in shared folders"
-msgstr "Segui i collegamenti simbolici nelle cartelle condivise"
-
-#: src/muuli_wdr.cpp:1624
-msgid "Graphs"
-msgstr "Grafici"
-
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
-msgid "Update delay : 5 secs"
-msgstr "Intervallo di aggiornamento: 5 secondi"
-
-#: src/muuli_wdr.cpp:1631
-msgid "Time for average graph: 100 mins"
-msgstr "Intervallo grafico valori medi: 100 minuti"
-
-#: src/muuli_wdr.cpp:1635
-msgid "Connections Graph Scale: 100 "
-msgstr "Scala grafico connessioni: 100 "
-
-#: src/muuli_wdr.cpp:1642
-msgid "Download graph scale:"
-msgstr "Scala grafico di scaricamento:"
-
-#: src/muuli_wdr.cpp:1650
-msgid "Upload graph scale:"
-msgstr "Scala grafico d'invio:"
-
-#: src/muuli_wdr.cpp:1660
-msgid "Colors: "
-msgstr "Colori: "
-
-#: src/muuli_wdr.cpp:1664
-msgid "Background"
-msgstr "Sfondo"
-
-#: src/muuli_wdr.cpp:1665
-msgid "Grid"
-msgstr "Griglia"
-
-#: src/muuli_wdr.cpp:1666
-msgid "Download current"
-msgstr "Download attuale"
-
-#: src/muuli_wdr.cpp:1667
-msgid "Download running average"
-msgstr "Media download in corso"
-
-#: src/muuli_wdr.cpp:1668
-msgid "Download session average"
-msgstr "Media sessione di download"
-
-#: src/muuli_wdr.cpp:1669
-msgid "Upload current"
-msgstr "Upload attuale"
-
-#: src/muuli_wdr.cpp:1670
-msgid "Upload running average"
-msgstr "Media upload in corso"
-
-#: src/muuli_wdr.cpp:1671
-msgid "Upload session average"
-msgstr "Media sessione di upload"
-
-#: src/muuli_wdr.cpp:1672
-msgid "Active connections"
-msgstr "Connessioni attive"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Systray Icon Speed Bar"
-msgstr "Barra della velocità nell'icona sulla barra di sistema"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Kad-nodes current"
-msgstr "Nodi Kad attuali"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Kad-nodes running"
-msgstr "Nodi Kad attivi"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Kad-nodes session"
-msgstr "Nodi Kad nella sessione"
-
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
-msgid "Select"
-msgstr "Seleziona"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Tree"
-msgstr "Albero"
-
-#: src/muuli_wdr.cpp:1696
-msgid "Number of Client Versions shown (0=unlimited)"
-msgstr "Numero di versioni di client visualizzate (0=illimitate)"
-
-#: src/muuli_wdr.cpp:1721
-msgid "!!! WARNING !!!"
-msgstr "!!! ATTENZIONE !!!"
-
-#: src/muuli_wdr.cpp:1733
-msgid "Max new connections / 5 secs"
-msgstr "Numero massimo nuove connessioni / 5 secondi"
-
-#: src/muuli_wdr.cpp:1738
-msgid "File Buffer Size: 240000 bytes"
-msgstr "Dimensione buffer file: 240000 byte"
-
-#: src/muuli_wdr.cpp:1742
-msgid "Upload Queue Size: 5000 clients"
-msgstr "Dimensione coda upload: 5000 client"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Server connection refresh interval: Disable"
-msgstr "Intervallo aggiornamento connessione al server: disabilitato"
-
-#: src/muuli_wdr.cpp:1750
-msgid "Disable computer's timed standby mode"
-msgstr "Disabilita la modalità standby a tempo"
-
-#: src/muuli_wdr.cpp:1769
-msgid "Skin to use: "
-msgstr "Skin da usare: "
-
-#: src/muuli_wdr.cpp:1778
-msgid "Show \"Fast eD2k Links Handler\" in every window."
-msgstr "Mostra il \"Gestore rapido dei collegamenti eD2k\" in ogni finestra."
-
-#: src/muuli_wdr.cpp:1781
-msgid "Show extended info on categories tabs"
-msgstr "Mostra informazioni estese sulle schede delle categorie"
-
-#: src/muuli_wdr.cpp:1784
-msgid "Show application version on title"
-msgstr "Mostra versione dell'applicazione nella barra del titolo"
-
-#: src/muuli_wdr.cpp:1786
-msgid "Show transfer rates on title"
-msgstr "Mostra velocità di trasferimento nella barra del titolo"
-
-#: src/muuli_wdr.cpp:1788
-msgid "Before application name"
-msgstr "Prima del nome dell'applicazione"
-
-#: src/muuli_wdr.cpp:1790
-msgid "After application name"
-msgstr "Dopo il nome dell'applicazione"
-
-#: src/muuli_wdr.cpp:1793
-msgid "Show overhead bandwidth"
-msgstr "Mostra l'overhead di banda"
-
-#: src/muuli_wdr.cpp:1797
-msgid "Vertical toolbar orientation"
-msgstr "Orientamento verticale della barra degli strumenti"
-
-#: src/muuli_wdr.cpp:1803
-msgid "Download Queue Files"
-msgstr "Scaricamento dei file in coda"
-
-#: src/muuli_wdr.cpp:1806
-msgid "Show progress percentage"
-msgstr "Mostra la percentuale di avanzamento"
-
-#: src/muuli_wdr.cpp:1812
-msgid "Show progress bar"
-msgstr "Mostra la barra di avanzamento"
-
-#: src/muuli_wdr.cpp:1815
-msgid "Flat"
-msgstr "Piatta"
-
-#: src/muuli_wdr.cpp:1819
-msgid "Round"
-msgstr "Arrotondata"
-
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Ordina automaticamente i file (uso elevato della CPU)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
-msgid "External Connection Parameters"
-msgstr "Parametri connessioni esterne"
-
-#: src/muuli_wdr.cpp:1844
-msgid "Accept external connections"
-msgstr "Accetta connessioni esterne"
-
-#: src/muuli_wdr.cpp:1851
-msgid "IP of the listening interface:"
-msgstr "IP dell'interfaccia di ascolto:"
-
-#: src/muuli_wdr.cpp:1854
-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 "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:1860 src/muuli_wdr.cpp:1906
-msgid "TCP port:"
-msgstr "Porta TCP:"
-
-#: src/muuli_wdr.cpp:1866
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr "Abilita il port forwarding tramite UPnP sulla porta EC"
-
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Password"
-msgstr "Password"
-
-#: src/muuli_wdr.cpp:1876
-msgid "Web server parameters"
-msgstr "Parametri del server web"
-
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "Lancia il webserver all'avvio"
-
-#: src/muuli_wdr.cpp:1885
-msgid "Web template"
-msgstr "Template web"
-
-#: src/muuli_wdr.cpp:1890
-msgid "Full rights password"
-msgstr "Password per diritti completi"
-
-#: src/muuli_wdr.cpp:1894
-msgid "Enable Low rights User"
-msgstr "Abilita utente con diritti limitati"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Low rights password"
-msgstr "Password per diritti limitati"
-
-#: src/muuli_wdr.cpp:1913
-msgid "Enable UPnP port forwarding of the web server port"
-msgstr "Abilita port forwarding tramite UPnP sulla porta del server web"
-
-#: src/muuli_wdr.cpp:1918
-msgid "Web server UPnP TCP port (Optional)"
-msgstr "Porta TCP del  server web per UPnP (Facoltativa)"
-
-#: src/muuli_wdr.cpp:1926
-msgid "Page Refresh Time (in secs)"
-msgstr "Intervallo di aggiornamento pagina (in sec)"
-
-#: src/muuli_wdr.cpp:1933
-msgid "Enable Gzip compression"
-msgstr "Abilita compressione gzip"
-
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
-msgid "OK"
-msgstr "OK"
-
-#: src/muuli_wdr.cpp:1966
-msgid "Click here to apply any changes made to the preferences."
-msgstr "Fai click qui per applicare le modifiche apportate alle impostazioni."
-
-#: src/muuli_wdr.cpp:1969
-msgid "Reset any changes made to the preferences."
-msgstr "Annulla ogni modifica alle preferenze."
-
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Titolo:"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Commento:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Directory file scaricati:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Cambia priorità per i nuovi file assegnati:"
-
-#: src/muuli_wdr.cpp:2018
-msgid "Don't change"
-msgstr "Non modificare"
-
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Seleziona colore per questa categoria (attualmente selezionata):"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Pulisci"
-
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
-msgid "Click this button to reset the log."
-msgstr "Fai clic su questo pulsante per cancellare i log."
-
-#: src/muuli_wdr.cpp:2138
-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:2142
-msgid "Server list"
-msgstr "Lista server"
-
-#: src/muuli_wdr.cpp:2146
-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 "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:2151
-msgid "Add server manually: Name"
-msgstr "Aggiungi un server manualmente: Nome"
-
-#: src/muuli_wdr.cpp:2154
-msgid "Enter the name of the new server here"
-msgstr "Inserisci qui il nome di un nuovo server"
-
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
-msgid "IP:Port"
-msgstr "IP:Porta"
-
-#: src/muuli_wdr.cpp:2159
-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:2165
-msgid "Enter the port of the server here."
-msgstr "Inserisci qui la porta del server."
-
-#: src/muuli_wdr.cpp:2168
-msgid "Add manually a server (fill fields to the left before) ..."
-msgstr "Aggiungi server (riempi campi a sinistra)..."
-
-#: src/muuli_wdr.cpp:2197
-msgid "aMule Log"
-msgstr "log di aMule"
-
-#: src/muuli_wdr.cpp:2201
-msgid "Server Info"
-msgstr "Informazioni server"
-
-#: src/muuli_wdr.cpp:2205
-msgid "ED2K Info"
-msgstr "Informazioni ed2k"
-
-#: src/muuli_wdr.cpp:2209
-msgid "Kad Info"
-msgstr "Informazioni Kad"
-
-#: src/muuli_wdr.cpp:2237
-msgid "Click on this button to update the nodes list from URL ..."
-msgstr "Fai clic su questo pulsante per aggiornare la lista nodi da un URL..."
-
-#: src/muuli_wdr.cpp:2241
-msgid "Nodes (0)"
-msgstr "Nodi (0)"
-
-#: src/muuli_wdr.cpp:2245
-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 "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:2248
-msgid "Nodes stats"
-msgstr "Statistiche nodi"
-
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Bootstrap"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nuovo nodo"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Porta:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "Bootstrap dai client noti"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Disconnetti rete Kad"
-
-#: src/muuli_wdr.cpp:2364
-msgid "Use Secure User Identification"
-msgstr "Usa identificazione sicura"
-
-#: src/muuli_wdr.cpp:2366
-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'identificazione non sarà abilitata."
-
-#: src/muuli_wdr.cpp:2368
-msgid "Protocol Obfuscation"
-msgstr "Offuscamento del protocollo"
-
-#: src/muuli_wdr.cpp:2371
-msgid "Support Protocol Obfuscation"
-msgstr "Supporta offuscamento del protocollo"
-
-#: src/muuli_wdr.cpp:2373
-msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
-msgstr "Questa opzione abilita l'offuscamento del protocollo, e fa sì che aMule accetti connessioni offuscate dagli altri client."
-
-#: src/muuli_wdr.cpp:2375
-msgid "Use obfuscation for outgoing connections"
-msgstr "Utilizza offuscamento per le connessioni in uscita"
-
-#: src/muuli_wdr.cpp:2377
-msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
-msgstr "Questa opzione fa sì che aMule utilizzi l'offuscamento del protocollo quando si collega ad altri client/server."
-
-#: src/muuli_wdr.cpp:2379
-msgid "Accept only obfuscated connections"
-msgstr "Accetta SOLO connessioni offuscate"
-
-#: src/muuli_wdr.cpp:2380
-msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
-msgstr "Attivando questa opzione aMule accetterà solo connessioni offuscate. Avrai meno fonti, ma tutto il tuo traffico sarà offuscato"
-
-#: src/muuli_wdr.cpp:2385
-msgid "Everybody"
-msgstr "Chiunque"
-
-#: src/muuli_wdr.cpp:2387
-msgid "No one"
-msgstr "Nessuno"
-
-#: src/muuli_wdr.cpp:2389
-msgid "Who can see my shared files:"
-msgstr "Chi può vedere i miei file condivisi:"
-
-#: src/muuli_wdr.cpp:2390
-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:2392
-msgid "IP-Filtering"
-msgstr "Filtraggio IP"
-
-#: src/muuli_wdr.cpp:2399
-msgid "Filter clients"
-msgstr "Filtra i client"
-
-#: src/muuli_wdr.cpp:2401
-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:2403
-msgid "Filter servers"
-msgstr "Filtra i server"
-
-#: src/muuli_wdr.cpp:2405
-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:2409
-msgid "Reload List"
-msgstr "Ricarica lista"
-
-#: src/muuli_wdr.cpp:2410
-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:2416
-msgid "URL:"
-msgstr "URL:"
-
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
-msgid "Update now"
-msgstr "Aggiorna ora"
-
-#: src/muuli_wdr.cpp:2423
-msgid "Auto-update ipfilter at startup"
-msgstr "Aggiorna ipfilter all'avvio"
-
-#: src/muuli_wdr.cpp:2427
-msgid "Filtering Level:"
-msgstr "Livello filtraggio:"
-
-#: src/muuli_wdr.cpp:2433
-msgid "Always filter LAN IPs"
-msgstr "Filtra sempre gli IP di una LAN"
-
-#: src/muuli_wdr.cpp:2436
-msgid "Paranoid handling of non-matching IPs"
-msgstr "Gestione paranoica degli IP non corrispondenti"
-
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Rifiuta pacchetto se l'IP del Client è diverso dall'IP da cui arriva il pacchetto. Utilizzare con cautela."
-
-#: src/muuli_wdr.cpp:2440
-msgid "Use system-wide ipfilter.dat if available"
-msgstr "Usa l'ipfilter.dat di sistema se disponibile"
-
-#: src/muuli_wdr.cpp:2441
-msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
-msgstr "Se un file ipfilter.dat locale non viene trovato, consenti l'utilizzo del file ipfilter.dat di sistema."
-
-#: src/muuli_wdr.cpp:2458
-msgid "Enable Online-Signature"
-msgstr "Abilita Online Signature"
-
-#: src/muuli_wdr.cpp:2460
-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 usato da applicazioni esterne per creare firme e simili."
-
-#: src/muuli_wdr.cpp:2464
-msgid "Update Frequency (Secs):"
-msgstr "Frequenza di aggiornamento (secondi):"
-
-#: src/muuli_wdr.cpp:2467
-msgid "Change the frequency (in seconds) of Online Signature updates."
-msgstr "Cambia la frequenza (in secondi) degli aggiornamenti dell'Online Signature."
-
-#: src/muuli_wdr.cpp:2475
-msgid "Save online signature file in: "
-msgstr "Salva la firma in linea in: "
-
-#: src/muuli_wdr.cpp:2481
-msgid "Click here to select the directory containing the the Online Signature files."
-msgstr "Clicca qui per selezionare la directory che contiene i file dell'Online Signature."
-
-#: src/muuli_wdr.cpp:2514
-msgid "Show country flags for clients"
-msgstr "Mostra la nazionalità dei client"
-
-#: src/muuli_wdr.cpp:2515
-msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
-msgstr ""
-
-#: src/muuli_wdr.cpp:2520
-#, fuzzy
-msgid "Database"
-msgstr "Velocità:"
-
-#: src/muuli_wdr.cpp:2536
-#, fuzzy
-msgid "Source:"
-msgstr "Fonti"
-
-#: src/muuli_wdr.cpp:2539
-msgid "DB-IP (free, no account)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2540
-msgid "MaxMind GeoLite2 (free, account required)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2541
-msgid "Custom URL"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2544
-msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
-msgstr ""
-
-#: src/muuli_wdr.cpp:2561
-msgid ""
-"No configuration required.\n"
-"\n"
-"IP-to-Country data by DB-IP.com - https://db-ip.com\n"
-"License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2574
-msgid "License key:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2580
-msgid ""
-"Sign up for a free MaxMind account, then generate a License Key:\n"
-"https://www.maxmind.com/en/geolite2/signup\n"
-"\n"
-"This product includes GeoLite2 data created by MaxMind - https://www.maxmind.com\n"
-"License: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
-"Requires attribution and account registration; refresh at least every 30 days."
-msgstr ""
-
-#: src/muuli_wdr.cpp:2595
-#, fuzzy
-msgid "Download URL:"
-msgstr "Download: "
-
-#: src/muuli_wdr.cpp:2601
-msgid ""
-"Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
-"URL may include credentials (https://user:pass@host/...).\n"
-"License and attribution terms are set by the upstream URL - you are responsible."
-msgstr ""
-
-#: src/muuli_wdr.cpp:2614
-msgid "Download the GeoIP database from the selected source."
-msgstr ""
-
-#: src/muuli_wdr.cpp:2616
-#, fuzzy
-msgid "Auto-update on startup"
-msgstr "Aggiorna ipfilter all'avvio"
-
-#: src/muuli_wdr.cpp:2617
-msgid "Re-download the GeoIP database from the selected source every time aMule starts."
-msgstr ""
-
-#: src/muuli_wdr.cpp:2640
-msgid "Filter incoming messages (except current chat):"
-msgstr "Filtra messaggi in arrivo (tranne per la chat in corso):"
-
-#: src/muuli_wdr.cpp:2642
-msgid "Filter all messages"
-msgstr "Filtra tutti i messaggi"
-
-#: src/muuli_wdr.cpp:2644
-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:2646
-msgid "Filter messages from unknown clients"
-msgstr "Filtra i messaggi da client sconosciuti"
-
-#: src/muuli_wdr.cpp:2648
-msgid "Filter messages containing (use ',' as separator):"
-msgstr "Filtra i messaggi che contengono (usa ',' come separatore):"
-
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
-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:2653
-msgid "Show received messages in the log"
-msgstr "Mostra nel log i messaggi ricevuti"
-
-#: src/muuli_wdr.cpp:2656
-msgid "Comments"
-msgstr "Commenti"
-
-#: src/muuli_wdr.cpp:2659
-msgid "Filter comments containing (use ',' as separator):"
-msgstr "Filtra i commenti contenenti (usa ',' come separatore):"
-
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Abilita autenticazione"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Abilita o disabilita l'autenticazione con nome utente e password"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Nome utente: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Nome utente utilizzato per la connessione al proxy"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Password:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "La password usata per la connessione al proxy"
-
-#: src/muuli_wdr.cpp:2696
-msgid "Enable Proxy"
-msgstr "Abilita proxy"
-
-#: src/muuli_wdr.cpp:2697
-msgid "Enable/disable proxy support"
-msgstr "Abilita o disabilita il supporto proxy"
-
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Tipo proxy:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Indirizzo proxy:"
-
-#: src/muuli_wdr.cpp:2714
-msgid "The proxy host name"
-msgstr "Il nome host del proxy"
-
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Porta proxy:"
-
-#: src/muuli_wdr.cpp:2719
-msgid "The proxy port"
-msgstr "La porta del proxy"
-
-#: src/muuli_wdr.cpp:2738
-msgid "Connect to:"
-msgstr "Connetti a:"
-
-#: src/muuli_wdr.cpp:2747
-msgid "Login to remote amule"
-msgstr "Login su aMule remoto"
-
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Nome utente"
-
-#: src/muuli_wdr.cpp:2763
-msgid "Remember those settings"
-msgstr "Ricorda impostazioni"
-
-#: src/muuli_wdr.cpp:2766
-msgid "Force ZLIB compression"
-msgstr "Forza la compressione ZLIB"
-
-#: src/muuli_wdr.cpp:2790
-msgid "Enable Verbose Debug-Logging."
-msgstr "Abilita il log dettagliato dei messaggi di debug."
-
-#: src/muuli_wdr.cpp:2792
-msgid "Only to Logfile"
-msgstr "Solamente sul file di log"
-
-#: src/muuli_wdr.cpp:2794
-msgid "Message Categories:"
-msgstr "Categorie messaggi:"
-
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
-msgid "Waiting..."
-msgstr "In attesa..."
-
-#: src/muuli_wdr.cpp:2838
-msgid "Add imports"
-msgstr "Aggiungi importazioni"
-
-#: src/muuli_wdr.cpp:2841
-msgid "Retry selected"
-msgstr "Riprova selezionati"
-
-#: src/muuli_wdr.cpp:2843
-msgid "Remove selected"
-msgstr "Rimuovi selezionati"
-
-#: src/muuli_wdr.cpp:2906
-msgid "Event Types"
-msgstr "Tipi di evento"
-
-#: src/muuli_wdr.cpp:2925
-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:2949
-msgid "Active Uploads"
-msgstr "Upload attivi"
-
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Percentuale di file totali"
-
-#: src/muuli_wdr.cpp:3002
-msgid "All files"
-msgstr "Tutti i file"
-
-#: src/muuli_wdr.cpp:3003
-msgid "Selected files"
-msgstr "File selezionati"
-
-#: src/muuli_wdr.cpp:3004
-msgid "Active uploads only"
-msgstr "Solo upload attivi"
-
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Mostra client per"
-
-#: src/muuli_wdr.cpp:3008
-msgid "Reload:"
-msgstr "Ricarica lista:"
-
-#: src/muuli_wdr.cpp:3012
-msgid "Reload your shared files"
-msgstr "Ricarica file condivisi"
-
-#: src/muuli_wdr.cpp:3074
-msgid "Send"
-msgstr "Invia"
-
-#: src/muuli_wdr.cpp:3075
-msgid "Sends the specified message."
-msgstr "Invia messaggio specificato."
-
-#: src/muuli_wdr.cpp:3079
-msgid "Close this chat-session."
-msgstr "Chiude questa sessione di chat."
-
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Connetti a qualsiasi server e/o a Kad"
-
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "File condivisi"
-
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled %s"
-msgstr "Disabilitato %s"
-
-#: src/OtherFunctions.cpp:61
-msgid "byte"
-msgid_plural "bytes"
-msgstr0 "byte"
-msgstr1 "byte"
-
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:79
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:81
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:83
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:85
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:92
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr0 "byte/s"
-msgstr1 "byte/s"
-
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
-msgid "secs"
-msgstr "sec"
-
-#: src/OtherFunctions.cpp:112
-msgid "mins"
-msgstr "min"
-
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
-msgid "hours"
-msgstr "ore"
-
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Giorni"
-
-#: src/OtherFunctions.cpp:684
-msgid "all"
-msgstr "tutti"
-
-#: src/OtherFunctions.cpp:685
-msgid "all others"
-msgstr "tutti gli altri"
-
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
-msgid "Incomplete"
-msgstr "Incompleti"
-
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
-msgid "Stopped"
-msgstr "Fermo"
-
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
-msgid "Video"
-msgstr "Video"
-
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
-msgid "Archive"
-msgstr "Archivio"
-
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
-msgid "Text"
-msgstr "Testo"
-
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Attivo"
-
-#: src/OtherFunctions.cpp:1212
-#, c-format
-msgid "Using config dir: %s"
-msgstr "Directory di configurazione in uso: %s"
-
-#: src/PartFileConvert.cpp:154
-msgid "Waiting for partfile convert thread to die..."
-msgstr "In attesa della fine del processo di conversione del file incompleto..."
-
-#: src/PartFileConvert.cpp:198
-#, c-format
-msgid "Importing %s: %s"
-msgstr "Importazione %s: %s"
-
-#: src/PartFileConvert.cpp:234
-msgid "Reading temp folder"
-msgstr "Lettura directory file temporanei"
-
-#: src/PartFileConvert.cpp:238
-msgid "Retrieving basic information from download info file"
-msgstr "Recupero informazioni di base dal file info del download"
-
-#: src/PartFileConvert.cpp:316
-msgid "Creating destination file"
-msgstr "Creazione file di destinazione"
-
-#: src/PartFileConvert.cpp:326
-#, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Caricamento dati da vecchio file in download (%u su %u)"
-
-#: src/PartFileConvert.cpp:344
-#, 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:408
-msgid "Retrieving source downloadfile information"
-msgstr "Recupero informazioni fonti e file in download in corso"
-
-#: src/PartFileConvert.cpp:431
-msgid "Adding download and saving new partfile"
-msgstr "Aggiunta download e salvataggio nuovo file parziale in corso"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importazione file parziale"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Stato"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Hash"
-
-#: src/PartFileConvertDlg.cpp:179
-#, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disco: %s)"
-
-#: src/PartFileConvertDlg.cpp:204
-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:208
-msgid "Do you want the source files of successfully imported downloads be deleted?"
-msgstr "Vuoi che le fonti dei download importati con successo siano cancellate?"
-
-#: src/PartFileConvertDlg.cpp:209
-msgid "Remove sources?"
-msgstr "Rimuovi fonti?"
-
-#: src/PartFile.cpp:364
-msgid "ERROR: Failed to create partfile"
-msgstr "ERRORE: Impossibile creare il file Part"
-
-#: src/PartFile.cpp:402
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Caricamento del backup del file met da %s"
-
-#: src/PartFile.cpp:409
-#, 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:415
-#, 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:426
-#, c-format
-msgid "ERROR: Invalid part.met file version: %s ==> %s"
-msgstr "ERRORE: Versione del file part.met invalida: %s ==> %s"
-
-#: src/PartFile.cpp:664
-#, c-format
-msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
-msgstr "ERRORE: %s (%s) è corrotto (etichette errate: %s), impossibile caricare il file."
-
-#: src/PartFile.cpp:675
-#, 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:678
-msgid "Trying to recover file info..."
-msgstr "Tentativo di recupero informazioni sul file..."
-
-#: src/PartFile.cpp:693
-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:697
-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:699
-msgid "Unable to recover file info :("
-msgstr "Impossibile recuperare le informazioni sul file :("
-
-#: src/PartFile.cpp:734
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Impossibile aprire %s (%s)"
-
-#: src/PartFile.cpp:787
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "ATTENZIONE: %s potrebbe essere corrotto (%i)"
-
-#: src/PartFile.cpp:1006
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "Errore durante il salvataggio del file incompleto: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:1015
-msgid "IO failure while saving partfile: "
-msgstr "Errore di I/O durante il salvataggio dei file Part: "
-
-#: src/PartFile.cpp:1030
-#, c-format
-msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
-msgstr "Scritti 0/sconosciuti byte in '%s' -- viene conservato il .part.met esistente."
-
-#: src/PartFile.cpp:1110
-#, 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:1140
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr0 "Salvata %i fonte per il file incompleto: %s (%s)"
-msgstr1 "Salvate %i fonti per il file incompleto: %s (%s)"
-
-#: src/PartFile.cpp:1170
-#, c-format
-msgid "Can't read seeds file for Partfile %s (%s)"
-msgstr "Impossibile accedere alle fonti del file Part %s (%s)"
-
-#: src/PartFile.cpp:1229
-#, 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:1252 src/PartFile.cpp:1279
-#, 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|"
-msgstr0 "Trovata parte corrotta (%d) in %d parte %s - FileResultHash |%s| FileHash |%s|"
-msgstr1 "Trovata parte corrotta (%d) in %d parti %s - FileResultHash |%s| FileHash |%s|"
-
-#: src/PartFile.cpp:1294
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Trovata parte completata (%i) in %s"
-
-#: src/PartFile.cpp:1329
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Nuovo hashing completato %s"
-
-#: src/PartFile.cpp:2281
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Errore imprevisto durante il completamento di %s. File messo in pausa"
-
-#: src/PartFile.cpp:2318
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Download completato: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid ""
-"Finished downloading:\n"
-"%s"
-msgstr ""
-"Download completato: \n"
-"%s"
-
-#: src/PartFile.cpp:2385
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Cancellazione file in corso: %s"
-
-#: src/PartFile.cpp:2463
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr "ATTENZIONE: Impossibile calcolare l'hash del file parziale - hashset incompleto per '%s'"
-
-#: src/PartFile.cpp:2468
-#, c-format
-msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
-msgstr "ERRORE: Impossibile calcolare l'hash delle parti scaricate - hashset incompleto (%s). Ciò non dovrebbe mai accadere"
-
-#: src/PartFile.cpp:2489
-#, c-format
-msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
-msgstr "Parte %u di '%s' segnata come completata ma il file parziale è più corto del previsto (presenti %llu byte, richiesti %llu); il gap viene riaperto per riscaricare."
-
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
-#, c-format
-msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
-msgstr "EOF durante l'hashing della parte %u scaricata con lunghezza %u (max %u) del file Part '%s' con lunghezza %u: %s"
-
-#: src/PartFile.cpp:3223
-#, 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/PartFile.cpp:3567
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "La parte di file scaricata %i è danneggiata in: %s"
-
-#: src/PartFile.cpp:3617
-#, 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:4262
-msgid "Allocating"
-msgstr "Allocazione in corso"
-
-#: src/PartFile.cpp:4278
-msgid "Insufficient disk space"
-msgstr "Spazio su disco insufficiente"
-
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Scaricato"
-
-#: src/PartFile.cpp:4601
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ERRORE: Apertura del file Part fallita '%s'"
-
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Predefinita di sistema"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanese"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabo"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Basco"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgaro"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Catalano"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Cinese (semplificato)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Cinese (tradizionale)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Croato"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Ceco"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danese"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Olandese"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Inglese (Regno Unito)"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Inglese (Regno Unito)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estone"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finlandese"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francese"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galiziano"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Tedesco"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Greco"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Ebraico"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Ungherese"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italiano (Svizzera)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Giapponese"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvegese (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polacco"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portoghese"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portoghese (Brasile)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Romeno"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Russo"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Sloveno"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spagnolo"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Svedese"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turco"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ucraino"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Cambia lingua"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Non ci sono traduzioni di aMule installate"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Nessuna lingua disponibile"
-
-#: src/Preferences.cpp:982
-msgid "no options available"
-msgstr "nessuna opzione disponibile"
-
-#: src/Preferences.cpp:1857
-msgid "Invalid category found, skipping"
-msgstr "Trovata categoria non valida, ignorata"
-
-#: src/Preferences.cpp:2039
-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:2040
-#, c-format
-msgid "Default port will be used (%d)"
-msgstr "Sarà usata la porta predefinita (%d)"
-
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
-msgid "Connection"
-msgstr "Connessione"
-
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
-msgid "Directories"
-msgstr "Directory"
-
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
-msgid "Servers"
-msgstr "Server"
-
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "File"
-
-#: src/PrefsUnifiedDlg.cpp:200
-msgid "Security"
-msgstr "Sicurezza"
-
-#: src/PrefsUnifiedDlg.cpp:201
-msgid "Interface"
-msgstr "Interfaccia"
-
-#: src/PrefsUnifiedDlg.cpp:208
-msgid "IP2Country"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:211
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:212
-msgid "Filters"
-msgstr "Filtri"
-
-#: src/PrefsUnifiedDlg.cpp:213
-msgid "Remote Controls"
-msgstr "Controlli remoti"
-
-#: src/PrefsUnifiedDlg.cpp:214
-msgid "Online Signature"
-msgstr "Online Signature"
-
-#: src/PrefsUnifiedDlg.cpp:215
-msgid "Advanced"
-msgstr "Avanzato"
-
-#: src/PrefsUnifiedDlg.cpp:216
-msgid "Events"
-msgstr "Eventi"
-
-#: src/PrefsUnifiedDlg.cpp:218
-msgid "Debugging"
-msgstr "Debug"
-
-#: src/PrefsUnifiedDlg.cpp:331
-msgid ""
-"The following variables will be substituted:\n"
-"    %PARTFILE - full path to the file\n"
-"    %PARTNAME - file name only"
-msgstr ""
-"Le seguenti variabili saranno sostituite:\n"
-"    %PARTFILE - percorso completo del file\n"
-"    %PARTNAME - solamente il nome del file"
-
-#: src/PrefsUnifiedDlg.cpp:351
-msgid "Tray icon support requires libayatana-appindicator3 at compile time."
-msgstr "Il supporto per l'icona nella tray richiede libayatana-appindicator3 in fase di compilazione."
-
-#: src/PrefsUnifiedDlg.cpp:366
-msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
-msgstr "Non disponibile su Wayland: il protocollo non segnala quando una finestra viene ridotta a icona, quindi questa opzione non può intercettare il pulsante di riduzione del sistema. Soluzione alternativa: avvia aMule con `GDK_BACKEND=x11` per usare XWayland."
-
-#: src/PrefsUnifiedDlg.cpp:406
-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 funzionerà anche senza modificare questi parametri."
-
-#: src/PrefsUnifiedDlg.cpp:467
-#, c-format
-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/PrefsUnifiedDlg.cpp:516
-#, 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/PrefsUnifiedDlg.cpp:568
-msgid "The type of proxy you are connecting to"
-msgstr "Il tipo di proxy a cui ti stai connettendo"
-
-#: src/PrefsUnifiedDlg.cpp:744
-#, 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/PrefsUnifiedDlg.cpp:817
-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:824
-msgid "- TCP port changed.\n"
-msgstr "- Modifica della porta TCP.\n"
-
-#: src/PrefsUnifiedDlg.cpp:829
-msgid "- UDP port changed.\n"
-msgstr "- Modifica della porta UDP.\n"
-
-#: src/PrefsUnifiedDlg.cpp:834
-msgid "- External connect port changed.\n"
-msgstr "- Porta della connessione esterna modificata. \n"
-
-#: src/PrefsUnifiedDlg.cpp:838
-msgid "- External connect acceptance changed.\n"
-msgstr "Accettata nuova connessione esterna\n"
-
-#: src/PrefsUnifiedDlg.cpp:842
-msgid "- External connect interface changed.\n"
-msgstr "- Interfaccia connessione esterna modificata. \n"
-
-#: src/PrefsUnifiedDlg.cpp:846
-msgid "- Protocol obfuscation support changed.\n"
-msgstr "- Modificato il supporto all'offuscamento del protocollo.\n"
-
-#: src/PrefsUnifiedDlg.cpp:855
-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 sarà disattivato."
-
-#: src/PrefsUnifiedDlg.cpp:862
-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:874
-msgid "- Language changed.\n"
-msgstr "- Modifica della lingua.\n"
-
-#: src/PrefsUnifiedDlg.cpp:879
-msgid "- Temp folder changed.\n"
-msgstr "- Modifica della cartella Temp.\n"
-
-#: src/PrefsUnifiedDlg.cpp:884
-msgid "- ED2K network enabled.\n"
-msgstr "- Rete ed2k abilitata.\n"
-
-#: src/PrefsUnifiedDlg.cpp:976
-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/PrefsUnifiedDlg.cpp:980
-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:1033
-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:1096
-msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
-msgstr "Impossibile registrare aMule per l'avvio automatico all'accesso. L'archivio di avvio automatico potrebbe essere in sola lettura."
-
-#: src/PrefsUnifiedDlg.cpp:1097
-msgid "Could not remove the autostart-at-login entry."
-msgstr "Impossibile rimuovere la voce di avvio automatico all'accesso."
-
-#: src/PrefsUnifiedDlg.cpp:1098
-msgid "Autostart"
-msgstr "Avvio automatico"
-
-#: src/PrefsUnifiedDlg.cpp:1163
-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"
-"Clicca sul pulsante \"Lista\" per inserire l'URL."
-
-#: src/PrefsUnifiedDlg.cpp:1304
-msgid "Temporary files"
-msgstr "File temporanei"
-
-#: src/PrefsUnifiedDlg.cpp:1309
-msgid "Incoming files"
-msgstr "File completi"
-
-#: src/PrefsUnifiedDlg.cpp:1314
-msgid "Online Signatures"
-msgstr "Online Signature"
-
-#: src/PrefsUnifiedDlg.cpp:1327
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Scegli una directory per i %s"
-
-#: src/PrefsUnifiedDlg.cpp:1347
-msgid "Browse for videoplayer"
-msgstr "Sfoglia per trovare un riproduttore video"
-
-#: src/PrefsUnifiedDlg.cpp:1351
-msgid "Select browser"
-msgstr "Scegli browser"
-
-#: src/PrefsUnifiedDlg.cpp:1357
-#, c-format
-msgid "Executable%s"
-msgstr "Eseguibile%s"
-
-#: src/PrefsUnifiedDlg.cpp:1378
-msgid "Edit server list"
-msgstr "Modifica la lista dei server"
-
-#: src/PrefsUnifiedDlg.cpp:1379
-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/PrefsUnifiedDlg.cpp:1431
-msgid "IP2Country update failed"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:1566
-msgid "Data by MaxMind GeoLite2"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:1568
-#, fuzzy
-msgid "Custom source"
-msgstr "Fonti complete"
-
-#: src/PrefsUnifiedDlg.cpp:1570
-msgid "Data by DB-IP.com"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:1590
-#, fuzzy, c-format
-msgid "Status: Loaded%s"
-msgstr "Stato:"
-
-#: src/PrefsUnifiedDlg.cpp:1593
-#, fuzzy, c-format
-msgid "Status: Loaded%s - %s"
-msgstr "Stato:"
-
-#: src/PrefsUnifiedDlg.cpp:1598
-msgid "Status: Failed to load - click 'Update now' to refresh."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:1600
-msgid "Status: Not found - click 'Update now' to download."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr0 "Intervallo aggiornamento: %d secondo"
-msgstr1 "Intervallo aggiornamento: %d secondi"
-
-#: src/PrefsUnifiedDlg.cpp:1652
-#, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr0 "Intervallo grafico della media: %d minuto"
-msgstr1 "Intervallo grafico della media: %d minuti"
-
-#: src/PrefsUnifiedDlg.cpp:1658
-#, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Scala grafico delle connessioni: %d"
-
-#: src/PrefsUnifiedDlg.cpp:1670
-#, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr0 "Dimensione buffer file: %d byte"
-msgstr1 "Dimensione buffer file: %d bytes"
-
-#: src/PrefsUnifiedDlg.cpp:1676
-#, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr0 "Dimensione coda upload: %d client"
-msgstr1 "Dimensione coda upload: %d client"
-
-#: src/PrefsUnifiedDlg.cpp:1683
-#, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr0 "Intervallo aggiornamento connessione ai server: %d minuto"
-msgstr1 "Intervallo aggiornamento connessione ai server: %d minuti"
-
-#: src/PrefsUnifiedDlg.cpp:1685
-msgid "Server connection refresh interval: Disabled"
-msgstr "Intervallo aggiornamento connessione ai server: disabilitato"
-
-#: src/PrefsUnifiedDlg.cpp:1730
-msgid "disabled"
-msgstr "disattivato"
-
-#: src/PrefsUnifiedDlg.cpp:1753
-#, c-format
-msgid "Execute command on '%s' event"
-msgstr "Esegui comando se si verifica l'evento '%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1756
-msgid "Enable command execution on core"
-msgstr "Abilita l'esecuzione del comando sul core"
-
-#: src/PrefsUnifiedDlg.cpp:1764
-msgid "Core command:"
-msgstr "Comando Core:"
-
-#: src/PrefsUnifiedDlg.cpp:1773
-msgid "Enable command execution on GUI"
-msgstr "Abilita l'esecuzione del comando sulla GUI"
-
-#: src/PrefsUnifiedDlg.cpp:1781
-msgid "GUI command:"
-msgstr "Comando GUI:"
-
-#: src/PrefsUnifiedDlg.cpp:1790
-msgid "The following variables will be replaced:"
-msgstr "Le seguenti variabili saranno sostituite:"
-
-#: src/PrefsUnifiedDlg.cpp:1952
-msgid ""
-"The following folders look like system or sensitive locations:\n"
-"\n"
-msgstr ""
-"Le seguenti cartelle sembrano posizioni di sistema o sensibili:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:1957
-msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
-msgstr "Condividerle ricorsivamente pubblicherà ogni file al loro interno sulle reti eD2k/Kad. Vuoi davvero procedere?"
-
-#: src/PrefsUnifiedDlg.cpp:1959
-msgid "Confirm shared folders"
-msgstr "Conferma cartelle condivise"
-
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
-msgstr "Ricarica file condivisi in corso…"
-
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
-msgstr "Analisi delle sottocartelle in corso…"
-
-#: src/PrefsUnifiedDlg.cpp:1994
-msgid "Updating shared folders"
-msgstr "Aggiornamento cartelle condivise"
-
-#: src/PrefsUnifiedDlg.cpp:2023
-#, c-format
-msgid "Scanned %u directories…"
-msgstr "%u cartelle analizzate…"
-
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Ricarica file condivisi: %u file analizzati"
-
-#: src/SearchDlg.cpp:282
-msgid "It's impossible to search when both eD2k and Kademlia are disabled."
-msgstr "Impossibile avviare ricerche con eD2k e Kademlia entrambi disabilitati."
-
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
-msgid "Search error"
-msgstr "Errore di ricerca"
-
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
-msgstr "Ricerca Kad: richiesti risultati più ampi da un altro peer."
-
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr "Ricerca Kad: nessun peer da contattare per altri risultati (limite raggiunto o nessuna risposta ancora)."
-
-#: src/SearchDlg.cpp:543
-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/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Avviso di ricerca"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
-msgid "Main"
-msgstr "Principale"
-
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Impossibile effettuare una ricerca sulla rete Kad senza esserci connessi"
-
-#: src/SearchList.cpp:315
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "La ricerca eD2k non può essere effettuata se la rete eD2k non è connessa"
-
-#: src/SearchList.cpp:336
-msgid "No keyword for Kad search - aborting"
-msgstr "Nessuna chiave di ricerca per Kad - interruzione in corso"
-
-#: src/SearchList.cpp:386
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Errore imprevisto durante la ricerca su Kad: "
-
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID File"
-
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr ""
-
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Senza voto"
-
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr ""
-
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Download nella categoria"
-
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Ottieni %s per questo file"
-
-#: src/SearchListCtrl.cpp:718
-msgid "Search related files (eD2k, local server)"
-msgstr "Cerca file correlati (eD2k, server locale)"
-
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Segna come file conosciuto"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
-msgid "Copy eD2k link to clipboard"
-msgstr "Copia il collegamento eD2k negli appunti"
-
-#: src/SearchListCtrl.cpp:811
-#, fuzzy
-msgid "You are not currently connected to a server supporting the Related Files search function"
-msgstr "Sei connesso al server che vuoi eliminare. Disconnettiti prima."
-
-#: src/SearchListCtrl.cpp:1105
-msgid "Canceled"
-msgstr "Annullata"
-
-#: src/SearchListCtrl.cpp:1108
-msgid "New"
-msgstr "Nuovo"
-
-#: 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 "Rete eD2k disabilitata nelle preferenze, connessione impossibile."
-
-#: 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 "Connected to %s (%s:%i)"
-msgstr "Connesso a %s (%s:%i)"
-
-#: src/ServerConnect.cpp:274
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Connessione stabilita con: %s"
-
-#: 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/ServerConnect.cpp:350
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Persa connessione a %s (%s:%i)"
-
-#: src/ServerConnect.cpp:360
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) sembra non essere attivo."
-
-#: src/ServerConnect.cpp:373
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) sembra essere pieno."
-
-#: 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"
-msgstr0 "Riconnessione automatica al server tra %d secondo"
-msgstr1 "Riconnessione automatica al server tra %d secondi"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Connessione persa"
-
-#: src/ServerConnect.cpp:419
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Connessione a %s (%s:%i) non riuscita."
-
-#: src/ServerConnect.cpp:462
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ERRORE: Nessun socket valido trovato entro il tempo massimo"
-
-#: src/ServerConnect.cpp:472
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Connessione a %s (%s:%i) non riuscita per timeout."
-
-#: src/ServerConnect.cpp:673
-msgid "Received late result of DNS lookup, discarding."
-msgstr "Risultato richiesta DNS ricevuto in ritardo, ignoro."
-
-#: src/ServerList.cpp:96
-#, c-format
-msgid "Loading server.met file: %s"
-msgstr "Caricamento file server.met: %s"
-
-#: src/ServerList.cpp:101
-msgid "Server.met file not found!"
-msgstr "File server.met non trovato!"
-
-#: src/ServerList.cpp:109
-#, c-format
-msgid "Failed to load server.met file '%s', unknown format encountered."
-msgstr "Impossibile caricare il file server.met '%s', formato sconosciuto."
-
-#: src/ServerList.cpp:115
-msgid "Failed to open server.met!"
-msgstr "Impossibile aprire il file server.met!"
-
-#: src/ServerList.cpp:126
-#, 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:182
-#, c-format
-msgid "%i server in server.met found"
-msgid_plural "%i servers in server.met found"
-msgstr0 "Trovato %i server nel file server.met"
-msgstr1 "Trovati %i server nel file server.met"
-
-#: src/ServerList.cpp:184
-#, c-format
-msgid "%d server added"
-msgid_plural "%d servers added"
-msgstr0 "%d server aggiunto"
-msgstr1 "%d server aggiunti"
-
-#: src/ServerList.cpp:187
-msgid "Error: the file 'server.met' is corrupted: "
-msgstr "Errore: il file 'server.met' è corrotto: "
-
-#: src/ServerList.cpp:191
-msgid "IO error while reading 'server.met': "
-msgstr "Errore I/O durante la lettura del file 'server.met': "
-
-#: src/ServerList.cpp:204
-#, 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:222
-#, 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:241
-#, 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:259
-#, 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:355
-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:527
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Impossibile aprire '%s'"
-
-#: src/ServerList.cpp:695
-msgid "Failed to save server.met!"
-msgstr "Impossibile salvare il file server.met!"
-
-#: src/ServerList.cpp:843
-msgid "Invalid URL"
-msgstr "URL non valido"
-
-#: src/ServerList.cpp:866
-#, c-format
-msgid "Finished downloading the server list from %s"
-msgstr "È terminato il download della lista dei server da %s"
-
-#: src/ServerList.cpp:884
-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 "Non è stato trovato nessun indirizzo nel file 'addresses.dat'. Scrivi un indirizzo che contenga una lista di server in questo file in modo da poter aggiornare automaticamente la lista"
-
-#: src/ServerList.cpp:903
-#, c-format
-msgid "Start downloading server list from %s"
-msgstr "Iniziato scaricamento lista server da %s"
-
-#: src/ServerList.cpp:912
-#, 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:916
-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:932
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Impossibile scaricare la lista dei server da %s"
-
-#: src/ServerList.cpp:1006
-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/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:96
-msgid "Static"
-msgstr "Statico"
-
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versione"
-
-#: src/ServerListCtrl.cpp:100
-msgid "TCP Flags"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:101
-msgid "UDP Flags"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:155
-msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
-msgstr "Sei connesso al server che stai cercando di eliminare. Disconnettiti prima. Il server NON è stato eliminato."
-
-#: src/ServerListCtrl.cpp:158
-msgid "(Unknown name)"
-msgstr "(nome sconosciuto)"
-
-#: src/ServerListCtrl.cpp:160
-#, 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:354
-#, c-format
-msgid "Servers (%i)"
-msgstr "Server (%i)"
-
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
-msgid "Server"
-msgstr "Server"
-
-#: src/ServerListCtrl.cpp:408
-msgid "Connect to server"
-msgstr "Connetti al server"
-
-#: src/ServerListCtrl.cpp:414
-msgid "Mark server as static"
-msgstr "Segna il server come statico"
-
-#: src/ServerListCtrl.cpp:415
-msgid "Mark server as non-static"
-msgstr "Segna il server come non statico"
-
-#: src/ServerListCtrl.cpp:417
-msgid "Mark servers as static"
-msgstr "Segna i server come statici"
-
-#: src/ServerListCtrl.cpp:418
-msgid "Mark servers as non-static"
-msgstr "Segna i server come non statici"
-
-#: src/ServerListCtrl.cpp:424
-msgid "Remove server"
-msgstr "Rimuovi il server"
-
-#: src/ServerListCtrl.cpp:426
-msgid "Remove servers"
-msgstr "Rimuovi i server"
-
-#: src/ServerListCtrl.cpp:428
-msgid "Remove all servers"
-msgstr "Rimuovi tutti i server"
-
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Copia il collegamento eD2k negli appunti"
-
-#: src/ServerListCtrl.cpp:443
-msgid "Reconnect to server"
-msgstr "Riconnetti al server"
-
-#: src/ServerListCtrl.cpp:532
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Sei sicuro di voler eliminare tutti i server?"
-
-#: src/ServerListCtrl.cpp:548
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Sei sicuro di voler eliminare il server selezionato?"
-
-#: src/ServerListCtrl.cpp:550
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Sei sicuro di voler eliminare i server selezionati?"
-
-#: src/ServerSocket.cpp:186
-#, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ERRORE: %s (%s) - %s"
-
-#: src/ServerSocket.cpp:201
-#, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "ATTENZIONE: %s (%s) - %s"
-
-#: src/ServerSocket.cpp:320
-#, c-format
-msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
-msgstr "Il server %s (%s) ha rifiutato il login (nessun ID client assegnato). Disconnessione in corso."
-
-#: src/ServerSocket.cpp:362
-#, c-format
-msgid "New clientid is %u"
-msgstr "Il nuovo clientID è %u"
-
-#: src/ServerSocket.cpp:364
-msgid "WARNING: You have received Low-ID!"
-msgstr "ATTENZIONE: hai ricevuto un ID basso!"
-
-#: src/ServerSocket.cpp:365
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tProbabilmente perché il tuo pc è dietro un firewall od un router."
-
-#: src/ServerSocket.cpp:366
-msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
-msgstr "\tPer altre informazioni visita https://amule-org.github.io/docs"
-
-#: src/ServerSocket.cpp:422
-msgid "Unknown server info received! - too short"
-msgstr "Ricevute informazioni sconosciute dal server! - troppo corto"
-
-#: src/ServerSocket.cpp:502
-#, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr0 "Ricevuto %d nuovo server"
-msgstr1 "Ricevuti %d nuovi server"
-
-#: src/ServerSocket.cpp:505
-msgid "Saving of server-list completed."
-msgstr "Salvataggio della lista dei server completato."
-
-#: src/ServerSocket.cpp:555
-msgid "Server rejected last command"
-msgstr "Il server ha rifiutato l'ultimo comando"
-
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Pacchetto bogus ricevuto dal server: %s"
-
-#: src/ServerSocket.cpp:567
-#, 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:606 src/ServerSocket.cpp:610
-#, 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/ServerSocket.cpp:692
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "L'IP del server %s (%s) è filtrato. Connessione bloccata."
-
-#: src/ServerSocket.cpp:702
-msgid "using protocol obfuscation."
-msgstr "utilizzo offuscamento del protocollo."
-
-#: src/ServerSocket.cpp:711
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Connessione a %s (%s - %s:%i) %s"
-
-#: src/ServerSocket.cpp:724
-#, 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/ServerWnd.cpp:124
-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:129
-msgid "Server not added: Invalid server-port specified."
-msgstr "Server non aggiunto: porta del server specificata non valida."
-
-#: src/ServerWnd.cpp:182
-msgid "eD2k Status:"
-msgstr "Stato eD2k:"
-
-#: src/ServerWnd.cpp:193
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:200
-msgid "Connection Type:"
-msgstr "Tipo di connessione:"
-
-#: src/ServerWnd.cpp:218
-msgid "Kademlia Status:"
-msgstr "Stato Kademlia:"
-
-#: src/ServerWnd.cpp:221
-msgid "Running in LAN mode"
-msgstr "Esecuzione in modalità LAN"
-
-#: src/ServerWnd.cpp:221
-msgid "Running"
-msgstr "Attivo"
-
-#: src/ServerWnd.cpp:224
-msgid "Kademlia client ID:"
-msgstr "ID client Kademlia:"
-
-#: src/ServerWnd.cpp:226
-msgid "Status:"
-msgstr "Stato:"
-
-#: src/ServerWnd.cpp:229
-msgid "Connection State:"
-msgstr "Stato connessione:"
-
-#: src/ServerWnd.cpp:231
-#, c-format
-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:233
-msgid "UDP Connection State:"
-msgstr "Stato connessione UDP:"
-
-#: src/ServerWnd.cpp:236
-#, c-format
-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:240
-msgid "Firewalled state: "
-msgstr "Stato del firewall: "
-
-#: src/ServerWnd.cpp:246
-msgid "No buddy required - TCP port open"
-msgstr "Nessun amico richiesto - porta TCP aperta"
-
-#: src/ServerWnd.cpp:248
-msgid "No buddy required - UDP port open"
-msgstr "Nessun amico richiesto - porta UDP aperta"
-
-#: src/ServerWnd.cpp:250
-msgid "No buddy"
-msgstr "Nessun amico"
-
-#: src/ServerWnd.cpp:254
-msgid "Connecting to buddy"
-msgstr "Connessione in corso all'amico"
-
-#: src/ServerWnd.cpp:257
-#, c-format
-msgid "Connected to buddy at %s"
-msgstr "Connesso all'amico a %s"
-
-#: src/ServerWnd.cpp:267
-msgid "Indexed sources:"
-msgstr "Fonti indicizzate:"
-
-#: src/ServerWnd.cpp:269
-msgid "Indexed keywords:"
-msgstr "Parole chiave indicizzate:"
-
-#: src/ServerWnd.cpp:271
-msgid "Indexed notes:"
-msgstr "Note indicizzate:"
-
-#: src/ServerWnd.cpp:273
-msgid "Indexed load:"
-msgstr "Utilizzo indicizzato:"
-
-#: src/ServerWnd.cpp:276
-msgid "Average Users:"
-msgstr "Numero medio utenti:"
-
-#: src/ServerWnd.cpp:279
-msgid "Average Files:"
-msgstr "Numero medio file:"
-
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
-msgid "Not running"
-msgstr "Non attivo"
-
-#: src/SharedFileList.cpp:361
-#, c-format
-msgid "Adding file %s to shares"
-msgstr "Aggiungo il file %s alle condivisioni"
-
-#: src/SharedFileList.cpp:404
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr0 "Trovati %i file condiviso conosciuto"
-msgstr1 "Trovati %i file condivisi conosciuti"
-
-#: src/SharedFileList.cpp:410
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Trovato %i file conosciuto, %i sconosciuto"
-msgstr1 "Trovati %i file condivisi conosciuti, %i sconosciuti"
-
-#: src/SharedFileList.cpp:419
-#, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ERRORE: Tentativo di condividere %s"
-
-#: src/SharedFileList.cpp:444
-#, c-format
-msgid "Shared directory not found, skipping: %s"
-msgstr "Cartella condivisa non trovata, ignoro: %s"
-
-#: src/SharedFileList.cpp:486
-#, 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 locale file"
-
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
-msgid "Shares File List"
-msgstr "Lista file condivisi"
-
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Richieste"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Richieste accettate"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Dati trasferiti"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Rapporto condivisione"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Parti ricevute"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Fonti complete"
-
-#: src/SharedFilesCtrl.cpp:114
-msgid "Directory Path"
-msgstr "Percorso directory"
-
-#: src/SharedFilesCtrl.cpp:151
-msgid "Add Comment/Rating"
-msgstr "Aggiungi commento/giudizio"
-
-#: src/SharedFilesCtrl.cpp:153
-msgid "Edit Comment/Rating"
-msgstr "Modifica commento/giudizio"
-
-#: src/SharedFilesCtrl.cpp:157
-msgid "Rename"
-msgstr "Rinomina"
-
-#: src/SharedFilesCtrl.cpp:161
-msgid "Add files in collection to transfer list"
-msgstr "Aggiungi i file della collezione alla lista dei trasferimenti"
-
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy magnet &URI to clipboard"
-msgstr "Copia &URI magnet negli appunti"
-
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Copia eD2k &link negli appunti (&Fonte)"
-
-#: src/SharedFilesCtrl.cpp:167
-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:168
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Copia il link eD2k negli appunti (&Nome host)"
-
-#: src/SharedFilesCtrl.cpp:169
-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:170
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Copia il collegamento eD2k negli appunti (&AICH info)"
-
-#: src/SharedFilesCtrl.cpp:171
-msgid "Copy eD2k link to clipboard (&AICH info + Source)"
-msgstr "Copia il collegamento eD2k negli appunti (&AICH info + Fonte)"
-
-#: src/SharedFilesCtrl.cpp:319
-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:493
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "File condivisi (%i)"
-
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Partfile"
-
-#: src/SourceListCtrl.cpp:37
-msgid "Remote File Name"
-msgstr "Nome file remoto"
-
-#: src/Statistics.cpp:797
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Dati inviati (sessione (totale)): %s"
-
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Overhead totale (pacchetti): %s"
-
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Overhead richieste file (pacchetti): %s"
-
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Overhead scambio fonti (pacchetti): %s"
-
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Overhead server (pacchetti): %s"
-
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Overhead Kad (pacchetti): %s"
-
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Overhead da offuscamento (UDP): %s"
-
-#: src/Statistics.cpp:810
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Upload attivi: %s"
-
-#: src/Statistics.cpp:811
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Upload in attesa: %s"
-
-#: src/Statistics.cpp:812
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Totale sessioni di upload riuscite: %s"
-
-#: src/Statistics.cpp:813
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Totale sessioni di upload fallite: %s"
-
-#: src/Statistics.cpp:815
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Tempo upload medio: %s"
-
-#: src/Statistics.cpp:818
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Dati scaricati (sessione (totale)): %s"
-
-#: src/Statistics.cpp:831
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Fonti trovate: %s"
-
-#: src/Statistics.cpp:832
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Download attivi (parti): %s"
-
-#: src/Statistics.cpp:834
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Rapporto UL:DL sessione (totale): %s"
-
-#: src/Statistics.cpp:837
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Velocità media di scaricamento (Sessione): %s"
-
-#: src/Statistics.cpp:838
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Velocità media d'invio (Sessione): %s"
-
-#: src/Statistics.cpp:839
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Velocità di scaricamento massima (Sessione): %s"
-
-#: src/Statistics.cpp:840
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Velocità massima d'invio (Sessione): %s"
-
-#: src/Statistics.cpp:841
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Riconnessioni: %i"
-
-#: src/Statistics.cpp:842
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Tempo dal primo trasferimento: %s"
-
-#: src/Statistics.cpp:843
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Connesso al server da: %s"
-
-#: src/Statistics.cpp:844
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Connessioni attive (stima): %i"
-
-#: src/Statistics.cpp:845
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Limite massimo connessioni raggiunto: %s"
-
-#: src/Statistics.cpp:846
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Connessioni medie (stima): %g"
-
-#: src/Statistics.cpp:848
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Picco connessioni (stima): %i"
-
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Client"
-
-#: src/Statistics.cpp:851
-#, c-format
-msgid "Unknown: %s"
-msgstr "Sconosciuti: %s"
-
-#: src/Statistics.cpp:857
-#, c-format
-msgid "Filtered: %s"
-msgstr "Filtrati: %s"
-
-#: src/Statistics.cpp:858
-#, c-format
-msgid "Banned: %s"
-msgstr "Bannati: %s"
-
-#: src/Statistics.cpp:859
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Totale: %i Conosciuti: %i"
-
-#: src/Statistics.cpp:863
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Server attivi: %i"
-
-#: src/Statistics.cpp:864
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Server falliti: %i"
-
-#: src/Statistics.cpp:865
-#, c-format
-msgid "Total: %s"
-msgstr "Totale: %s"
-
-#: src/Statistics.cpp:866
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Server rimossi: %s"
-
-#: src/Statistics.cpp:867
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Server filtrati: %s"
-
-#: src/Statistics.cpp:868
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Utenti su server attivi: %llu"
-
-#: src/Statistics.cpp:869
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "File su server attivi: %llu"
-
-#: src/Statistics.cpp:870
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Utenti totali: %llu"
-
-#: src/Statistics.cpp:871
-#, c-format
-msgid "Total Files: %llu"
-msgstr "File totali: %llu"
-
-#: src/Statistics.cpp:872
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Occupazione server: %.2f%%"
-
-#: src/Statistics.cpp:876
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Numero di file condivisi: %s"
-
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Dimensione totale file condivisi: %s"
-
-#: src/Statistics.cpp:879
-#, c-format
-msgid "Average file size: %s"
-msgstr "Dimensione media dei file: %s"
-
-#: src/Statistics.cpp:1020
-msgid "Operating System"
-msgstr "Sistema operativo"
-
-#: src/Statistics.cpp:1045
-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:551
-msgid "Not available"
-msgstr "Non disponibile"
-
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
-msgid "Never"
-msgstr "Mai"
-
-#: src/TerminationProcess.cpp:47
-#, c-format
-msgid "Command '%s' with pid '%d' has finished with status code '%d'."
-msgstr "Il comando `%s' con pid `%d' è terminato con il codice di stato `%d'."
-
-#: src/TextClient.cpp:207
-msgid "Execute <str> and exit."
-msgstr "Esegui <str> ed esci."
-
-#: src/TextClient.cpp:282
-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:399
-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:435
-msgid "Processing by hash: "
-msgstr "Elaborazione in base all'hash: "
-
-#: src/TextClient.cpp:449
-msgid "Processing by filename: "
-msgstr "Elaborazione in base al nome del file: "
-
-#: src/TextClient.cpp:471
-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:497
-msgid "Not a valid number\n"
-msgstr "Non è un numero valido\n"
-
-#: src/TextClient.cpp:501
-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"
-
-#. TRANSLATORS:
-#. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
-msgid ""
-"Invalid search filter syntax.\n"
-"Type 'help search' to get more help.\n"
-msgstr ""
-"Sintassi del filtro di ricerca non valida.\n"
-"Digitare 'help search' per ottenere ulteriori informazioni.\n"
-
-#. TRANSLATORS:
-#. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
-msgid ""
-"No search keyword provided.\n"
-"Type 'help search' to get more help.\n"
-msgstr ""
-"Nessuna parola chiave di ricerca specificata.\n"
-"Digitare 'help search' per ottenere ulteriori informazioni.\n"
-
-#. TRANSLATORS:
-#. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
-msgid ""
-"No search type defined.\n"
-"Type 'help search' to get more help.\n"
-msgstr ""
-"Il tipo della ricerca non è definito.\n"
-"Digitare 'help search' per ottenere ulteriori informazioni.\n"
-
-#: src/TextClient.cpp:650
-#, c-format
-msgid "Download File: %lu %s\n"
-msgstr "Download del file: %lu %s\n"
-
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
-msgid "Request failed with an unknown error."
-msgstr "Richiesta fallita con errore sconosciuto."
-
-#: src/TextClient.cpp:746
-msgid "Operation was successful."
-msgstr "Operazione conclusa con successo."
-
-#: src/TextClient.cpp:752
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Richiesta fallita con il seguente errore: %s"
-
-#: src/TextClient.cpp:766
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Filtraggio IP per i client: %s.\n"
-
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
-msgid "OFF"
-msgstr "OFF"
-
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
-msgid "ON"
-msgstr "ON"
-
-#: src/TextClient.cpp:772
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Filtraggio IP per i server: %s.\n"
-
-#: src/TextClient.cpp:777
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Il livello IPFilter attuale è %d\n"
-
-#: src/TextClient.cpp:784
-#, 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:798
-msgid "eD2k"
-msgstr "eD2k"
-
-#: src/TextClient.cpp:803
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "Connesso a %s %s %s"
-
-#: src/TextClient.cpp:809
-msgid "Now connecting"
-msgstr "Connessione in corso"
-
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
-msgid "firewalled"
-msgstr "firewalled"
-
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
-msgid "ok"
-msgstr "ok"
-
-#: src/TextClient.cpp:833
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
-msgstr ""
-"\n"
-"Download:\t%s"
-
-#: src/TextClient.cpp:836
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"Upload:\t%s"
-
-#: src/TextClient.cpp:839
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Client in coda:\t%d\n"
-
-#: src/TextClient.cpp:842
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
-msgstr ""
-"\n"
-"Fonti totali:\t%d\n"
-
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Number of search results: %i\n"
-msgstr "Totale risultati della ricerca: %i\n"
-
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Avanzamento ricerca: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Avanzamento ricerca non disponibile"
-
-#: src/TextClient.cpp:972
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Ricevuta risposta sconosciuta dal server, OpCode = %#x."
-
-#: src/TextClient.cpp:985
-msgid "Show short status information."
-msgstr "Mostra informazione sullo stato."
-
-#: src/TextClient.cpp:986
-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:988
-msgid "Show full statistics tree."
-msgstr "Mostra le statistiche complete."
-
-#: src/TextClient.cpp:989
-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 'infinito'.\n"
-"Esempio: 'statistics 5' mostrerà solo le cinque versioni più diffuse per ogni tipo di client.\n"
-
-#: src/TextClient.cpp:991
-msgid "Shut down aMule."
-msgstr "Arresta aMule."
-
-#: src/TextClient.cpp:992
-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 attualmente in esecuzione in remoto (amule/amuled).\n"
-"L'azione arresterà anche il client testuale, dal momento che diventerà inutilizzabile senza un\n"
-"core in esecuzione.\n"
-
-#: src/TextClient.cpp:994
-msgid "Reload the given object."
-msgstr "Ricarica l'oggetto."
-
-#: src/TextClient.cpp:995
-msgid "Reload shared files list."
-msgstr "Ricarica la lista dei file condivisi."
-
-#: src/TextClient.cpp:997
-msgid "Reload IP filtering table."
-msgstr "Ricarica il filtro IP da file."
-
-#: src/TextClient.cpp:998
-msgid "Reload current IP filtering table."
-msgstr "Seleziona il livello del filtraggio degli IP."
-
-#: src/TextClient.cpp:999
-msgid "Update IP filtering table from URL."
-msgstr "Aggiorna il filtro IP da URL."
-
-#: src/TextClient.cpp:1000
-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:1002
-msgid "Connect to the network."
-msgstr "Connettiti alla rete."
-
-#: src/TextClient.cpp:1003
-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"
-"È 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:1004
-msgid "Connect to eD2k only."
-msgstr "Connettiti solo alla rete eD2k."
-
-#: src/TextClient.cpp:1005
-msgid "Connect to Kad only."
-msgstr "Connetti solo alla rete Kad."
-
-#: src/TextClient.cpp:1007
-msgid "Disconnect from the network."
-msgstr "Disconnettiti dalla rete."
-
-#: src/TextClient.cpp:1008
-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:1009
-msgid "Disconnect from eD2k only."
-msgstr "Disconnettiti solo dalla rete eD2k."
-
-#: src/TextClient.cpp:1010
-msgid "Disconnect from Kad only."
-msgstr "Disconnetti solo dalla rete Kad."
-
-#: src/TextClient.cpp:1012
-msgid "Add an eD2k or magnet link to core."
-msgstr "Aggiungi un link eD2k o un magnet link al core."
-
-#: src/TextClient.cpp:1013
-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 ad un file (ed2k://|file|...), che sarà aggiunto ai download in attesa,\n"
-"*) un collegamento ad un server (ed2k://|server|...), che sarà aggiunto alla lista dei server,\n"
-"*) un collegamento ad una lista server, in questo caso tutti i server elencati saranno aggiunti alla\n"
-"lista dei server.\n"
-"\n"
-"Il magnet link deve contenere l'hash eD2k e la lunghezza del file.\n"
-
-#: src/TextClient.cpp:1015
-msgid "Set a preference value."
-msgstr "Imposta un valore delle preferenze."
-
-#: src/TextClient.cpp:1018
-msgid "Set IP filtering preferences."
-msgstr "Imposta le preferenze del Filtro IP."
-
-#: src/TextClient.cpp:1019
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Attiva il filtro IP per client e server."
-
-#: src/TextClient.cpp:1020
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Disattiva il filtro IP per client e server."
-
-#: src/TextClient.cpp:1021
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Attiva/Disabilita il filtro IP per i client."
-
-#: src/TextClient.cpp:1022
-msgid "Turn IP filtering on for clients."
-msgstr "Attiva il filtro IP per i client."
-
-#: src/TextClient.cpp:1023
-msgid "Turn IP filtering off for clients."
-msgstr "Disattiva il filtro IP per i client."
-
-#: src/TextClient.cpp:1024
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Attiva/Disabilita il filtro IP per i server."
-
-#: src/TextClient.cpp:1025
-msgid "Turn IP filtering on for servers."
-msgstr "Attiva il filtro IP per i server."
-
-#: src/TextClient.cpp:1026
-msgid "Turn IP filtering off for servers."
-msgstr "Disabilita il filtro IP per i server."
-
-#: src/TextClient.cpp:1027
-msgid "Select IP filtering level."
-msgstr "Seleziona il livello del filtraggio degli IP."
-
-#: src/TextClient.cpp:1028
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
-msgstr ""
-"I livelli di filtraggio validi vanno da 0 a 255 e il default (iniziale)\n"
-"è 127.\n"
-
-#: src/TextClient.cpp:1030
-msgid "Set bandwidth limits."
-msgstr "Imposta limiti di banda."
-
-#: src/TextClient.cpp:1031
-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:1032
-msgid "Set upload bandwidth limit."
-msgstr "Imposta limiti di banda per l'upload."
-
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
-msgid "The given value must be in kilobytes/sec.\n"
-msgstr "Il valore inserito deve essere espresso in kilobyte al secondo.\n"
-
-#: src/TextClient.cpp:1034
-msgid "Set download bandwidth limit."
-msgstr "Imposta limiti di banda per il download."
-
-#: src/TextClient.cpp:1037
-msgid "Get and display a preference value."
-msgstr "Visualizza un'impostazione delle preferenze."
-
-#: src/TextClient.cpp:1040
-msgid "Get IP filtering preferences."
-msgstr "Visualizza le impostazioni del Filtro IP."
-
-#: src/TextClient.cpp:1041
-msgid "Get IP filtering state for both clients and servers."
-msgstr "Ottieni stato del filtro IP sia dei client che dei server."
-
-#: src/TextClient.cpp:1042
-msgid "Get IP filtering state for clients only."
-msgstr "Ottieni stato del filtro IP dei client."
-
-#: src/TextClient.cpp:1043
-msgid "Get IP filtering state for servers only."
-msgstr "Ottieni stato del filtro IP dei server."
-
-#: src/TextClient.cpp:1044
-msgid "Get IP filtering level."
-msgstr "Imposta il livello del filtraggio degli IP."
-
-#: src/TextClient.cpp:1046
-msgid "Get bandwidth limits."
-msgstr "Visualizza limita di banda."
-
-#: src/TextClient.cpp:1048
-msgid "Execute a search."
-msgstr "Effettua una ricerca."
-
-#: src/TextClient.cpp:1050
-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"
-"\n"
-"Optional filters can be added before, after, or interleaved with\n"
-"the search keyword(s):\n"
-"    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
-"    --extension <ext>      (alias: --ext)\n"
-"    --avail <N>            minimum number of sources\n"
-"    --min-size <NKMG>    smallest file size; K=1024, M=K*1024, G=M*1024\n"
-"    --max-size <NKMG>    largest file size; same suffixes\n"
-"Example: 'search global linux iso --type Iso --min-size 100M' returns\n"
-"results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
-msgstr ""
-"È necessario specificare un tipo di ricerca:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Esempio: 'search kad file' eseguirà una ricerca kad per \"file\".\n"
-"\n"
-"Filtri opzionali possono essere aggiunti prima, dopo o intervallati con\n"
-"le parole chiave della ricerca:\n"
-"    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
-"    --extension <est>      (alias: --ext)\n"
-"    --avail <N>            numero minimo di fonti\n"
-"    --min-size <NKMG>    dimensione minima del file; K=1024, M=K*1024, G=M*1024\n"
-"    --max-size <NKMG>    dimensione massima del file; stessi suffissi\n"
-"Esempio: 'search global linux iso --type Iso --min-size 100M' restituisce\n"
-"risultati per \"linux iso\" di tipo Iso di almeno 100 MiB.\n"
-
-#: src/TextClient.cpp:1066
-msgid "Execute a global search."
-msgstr "Effettua una ricerca globale."
-
-#: src/TextClient.cpp:1067
-msgid "Execute a local search"
-msgstr "Effettua una ricerca locale"
-
-#: src/TextClient.cpp:1068
-msgid "Execute a kad search"
-msgstr "Effettua una ricerca sulla rete Kad"
-
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "Mostra risultati dell'ultima ricerca."
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Restituisce i risultati della ricerca precedente.\n"
-
-#: src/TextClient.cpp:1073
-msgid "Show the progress of a search."
-msgstr "Mostra lo stato d'avanzamento della ricerca."
-
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Mostra lo stato d'avanzamento della ricerca.\n"
-
-#: src/TextClient.cpp:1076
-msgid "Start downloading a file"
-msgstr "Scarica un file"
-
-#: src/TextClient.cpp:1077
-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:1084
-msgid "Pause download."
-msgstr "Metti il download in pausa."
-
-#: src/TextClient.cpp:1087
-msgid "Resume download."
-msgstr "Riavvia download."
-
-#: src/TextClient.cpp:1090
-msgid "Cancel download."
-msgstr "Annulla download."
-
-#: src/TextClient.cpp:1093
-msgid "Set download priority."
-msgstr "Imposta priorità del download."
-
-#: src/TextClient.cpp:1094
-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:1095
-msgid "Set priority to low."
-msgstr "Imposta priorità del download.a Bassa."
-
-#: src/TextClient.cpp:1096
-msgid "Set priority to normal."
-msgstr "Imposta priorità del download.a Normale."
-
-#: src/TextClient.cpp:1097
-msgid "Set priority to high."
-msgstr "Imposta priorità del download.a Alta."
-
-#: src/TextClient.cpp:1098
-msgid "Set priority to auto."
-msgstr "Imposta priorità del download.a Auto."
-
-#: src/TextClient.cpp:1100
-msgid "Show queues/lists."
-msgstr "Mostra code/liste."
-
-#: src/TextClient.cpp:1101
-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"
-"\n"
-
-#: src/TextClient.cpp:1102
-msgid "Show upload queue."
-msgstr "Mostra la coda di upload."
-
-#: src/TextClient.cpp:1103
-msgid "Show download queue."
-msgstr "Mostra la coda di download."
-
-#: src/TextClient.cpp:1104
-msgid "Show log."
-msgstr "Mostra log."
-
-#: src/TextClient.cpp:1105
-msgid "Show servers list."
-msgstr "Mostra la lista dei server."
-
-#: src/TextClient.cpp:1106
-msgid "Show shared files list."
-msgstr "Mostra la lista dei file condivisi."
-
-#: src/TextClient.cpp:1108
-msgid "Reset log."
-msgstr "Cancella log."
-
-#: src/TextClient.cpp:1115
-#, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Comando deprecato, al suo posto usa '%s'."
-
-#: src/TextClient.cpp:1116
-#, 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/TextClient.h:63
-msgid "aMule text client"
-msgstr "Client testuale aMule"
-
-#: src/ThreadTasks.cpp:484
-#, 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/ThreadTasks.cpp:565
-#, 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/ThreadTasks.cpp:577
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "ATTENZIONE: Esiste già un file col nome '%s', rinomino in '%s'."
-
-#: 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/TransferWnd.cpp:209
-msgid "Confirmation Required"
-msgstr "Conferma richiesta"
-
-#: 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/TransferWnd.cpp:369
-msgid "Edit category"
-msgstr "Modifica categoria"
-
-#: src/TransferWnd.cpp:370
-msgid "Remove category"
-msgstr "Elimina categoria"
-
-#: src/UploadClient.cpp:535
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Hashset richiesto per il file sconosciuto: %s"
-
-#: src/UploadQueue.cpp:618
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Ripristino upload del file: %s"
-
-#: src/UploadQueue.cpp:635
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Sospensione upload del file: %s"
-
-#: src/UserEvents.cpp:154
-#, 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:97
-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:82
-msgid "New chat session started"
-msgstr "Nuova sessione di chat iniziata"
-
-#: src/UserEvents.h:85
-msgid "Message sender."
-msgstr "Mittente del messaggio."
-
-#: src/UserEvents.h:88
-msgid "Out of space"
-msgstr "Spazio esaurito"
-
-#: src/UserEvents.h:91
-msgid "Disk partition."
-msgstr "Partizione disco."
-
-#: src/UserEvents.h:94
-msgid "Error on completion"
-msgstr "Errore nel completamento"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:59
-#, c-format
-msgid "Processing file number %u: %s"
-msgstr "Elaborazione del file numero %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:63
-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:80
-#, c-format
-msgid "%s ---> Non existent file !\n"
-msgstr "%s ---> File inesistente!\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:49
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, il creatore di link eD2k di aMule"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
-msgid "Welcome!"
-msgstr "Benvenuto!"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
-msgid "Input parameters"
-msgstr "Parametri di ingresso"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
-msgid "File to Hash"
-msgstr "File da esaminare"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
-msgid "Add Optional URLs for this file"
-msgstr "Aggiungi URL per questo file"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
-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:128
-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 "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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
-msgid "Create link with part-hashes"
-msgstr "Crea link con hash delle parti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
-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:187
-msgid "MD4 File Hash"
-msgstr "Hash MD4 del file"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
-msgid "eD2k File Hash"
-msgstr "hash eD2k del file"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
-msgid "eD2k link"
-msgstr "link eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
-msgid "Save"
-msgstr "Salva"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
-msgid "Copy to clipboard"
-msgstr "Copia negli appunti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
-msgid "Open"
-msgstr "Apri"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
-msgid "Open a file to compute its eD2k link"
-msgstr "Apri un file per calcolarne il link eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Copia il link eD2k calcolato negli appunti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Save as"
-msgstr "Salva come"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
-msgid "Save computed eD2k link to file"
-msgstr "Salva il link eD2k calcolato in un file"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
-msgid "About aLinkCreator"
-msgstr "Informazioni su aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
-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:392
-msgid "Can't open the clipboard"
-msgstr "Non posso aprire gli appunti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
-msgid "Nothing to copy for now !"
-msgstr "Non c'è niente da copiare per ora!"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
-msgid "Select the file to your computed eD2k link"
-msgstr "Seleziona il file del tuo link eD2k calcolato"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
-msgid "Unable to open "
-msgstr "Impossibile aprire "
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
-msgid "Please, enter a non empty file name"
-msgstr "Inserire un nome file non vuoto"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
-msgid "Nothing to save for now !"
-msgstr "Non c'è niente da salvare per ora!"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
-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:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
-msgid "Hashing..."
-msgstr "Hashing..."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator sta lavorando per voi"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-msgid "Computing MD4 Hash..."
-msgstr "Calcolo degli hash MD4 in corso..."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
-msgid "Computing eD2k Hashes..."
-msgstr "Calcolo degli hash eD2k in corso..."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
-msgid "Cancelled !"
-msgstr "Annullato!"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Eseguito in %.2f s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
-msgid "You have already added this URL !"
-msgstr "Hai già aggiunto questo URL!"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
-msgid "Please, enter a non empty URL"
-msgstr "Inserire un URL non vuoto"
-
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
-#, c-format
-msgid "Unable to open %s"
-msgstr "Impossibile aprire %s"
-
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
-msgid "Out of memory while calculating ed2k hash!"
-msgstr "Si è verificato un errore \"out of memory\" durante il calcolo di un hash ed2k!"
-
-#: src/utils/wxCas/src/linuxmon.cpp:77
-#, 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/utils/wxCas/src/onlinesig.cpp:221
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uG %02uore %02umin %02usec"
-
-#: src/utils/wxCas/src/onlinesig.cpp:223
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uore %02umin %02usec"
-
-#: src/utils/wxCas/src/onlinesig.cpp:225
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02usec"
-
-#: src/utils/wxCas/src/onlinesig.cpp:227
-#, c-format
-msgid "%02us"
-msgstr "%02us"
-
-#: src/utils/wxCas/src/onlinesig.cpp:326
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
-
-#: src/utils/wxCas/src/onlinesig.cpp:329
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
-
-#: src/utils/wxCas/src/onlinesig.cpp:332
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
-
-#: src/utils/wxCas/src/onlinesig.cpp:335
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
-
-#: src/utils/wxCas/src/onlinesig.cpp:338
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/wxCas/src/wxcas.cpp:78
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, statistiche online di aMule"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:115
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Velocità di DL massima da quando wxCas è attivo"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:119
-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:142
-msgid "System"
-msgstr "Sistema"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
-msgid "Stop Auto Refresh"
-msgstr "Ferma aggiornamento automatico"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-msgid "Save Online Statistics image"
-msgstr "Salva immagine statistiche online"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:214
-msgid "Print Online Statistics image"
-msgstr "Stampa immagine statistiche online"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:217
-msgid "Preferences setting"
-msgstr "Preferenze"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
-msgid "About wxCas"
-msgstr "Informazioni su wxCas"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:326
-msgid "Start Auto Refresh"
-msgstr "Avvia aggiornamento automatico"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:328
-msgid "Auto Refresh stopped"
-msgstr "Aggiornamento automatico fermato"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:337
-msgid "Auto Refresh started"
-msgstr "Aggiornamento automatico avviato"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:348
-msgid "Save Statistics Image"
-msgstr "Salva immagine statistiche"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:386
-msgid "aMule Online Statistics"
-msgstr "Statistiche online aMule"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:390
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
-"C'è stato un problema durante la stampa.\n"
-"La stampante potrebbe non essere impostata correttamente?"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "Printing"
-msgstr "Stampa in corso"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:409
-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/utils/wxCas/src/wxcasframe.cpp:575
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, aMule non è in esecuzione..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
-msgid "aMule is running"
-msgstr "aMule è in funzione"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:860
-msgid "aMule is running, but disconnected"
-msgstr "aMule è in esecuzione, ma non connesso"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:931
-msgid "aMule is connecting..."
-msgstr "aMule si sta connettendo..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:935
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh oh, stato di aMule sconosciuto..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid "aMule "
-msgstr "aMule "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
-msgid " has been running for "
-msgstr " è stato in funzione per "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
-msgid " is stopped !"
-msgstr " è fermo !"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
-msgid " is not connected !"
-msgstr " non è connesso !"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-msgid " is connecting..."
-msgstr " si sta connettendo..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-msgid " is doing something strange, check it !"
-msgstr " sta facendo qualcosa di strano, controllare!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
-msgid " is connected to "
-msgstr " è connesso a "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " Kad: "
-msgstr " Kad: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
-msgid "off"
-msgstr "off"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-msgid " is on "
-msgstr " è attivo "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
-msgid " with "
-msgstr " con "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
-msgid "Total Download: "
-msgstr "Download totale: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
-msgid ", Upload: "
-msgstr ", Upload: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
-msgid "Session Download: "
-msgstr "Download sessione: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
-msgid "Download: "
-msgstr "Download: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid "Sharing: "
-msgstr "Condivisione: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " file(s), Clients on queue: "
-msgstr " file, client in coda: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid "Time: "
-msgstr "Tempo: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-msgid " on "
-msgstr " attivo "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid "System Load Average (1-5-15 min): "
-msgstr "Carico medio del sistema (1-5-15 min): "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
-msgid "System uptime: "
-msgstr "Uptime del sistema: "
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
-msgid "Directory containing amulesig.dat file"
-msgstr "Directory contenente il file amulesig.dat"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
-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:90
-msgid "Refresh rate interval in seconds"
-msgstr "Intervallo di aggiornamento in secondi"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
-msgid "Generate a stat image at every refresh event"
-msgstr "Genera un'immagine delle statistiche ad ogni aggiornamento"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
-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:150
-msgid "Upload periodically your stat image to FTP server"
-msgstr "Carica periodicamente l'immagine delle statistiche sul server FTP"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
-msgid "FTP Url"
-msgstr "URL FTP"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
-msgid "FTP Path"
-msgstr "Percorso FTP"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
-msgid "Enter here the URL of your FTP server"
-msgstr "Inserire URL del tuo server FTP"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
-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:185
-msgid "User"
-msgstr "Utente"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
-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:209
-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:226
-msgid "FTP update rate interval in minutes"
-msgstr "Intervallo di aggiornamento FTP in minuti"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
-msgid "Validate"
-msgstr "Verifica"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
-msgid "Folder containing your signature file"
-msgstr "Directory contenente il file di firma"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
-msgid "Folder where generating the statistic image"
-msgstr "Directory nella quale generare l'immagine"
-
-#: src/webserver/src/WebInterface.cpp:247
-msgid "Loads template <str>"
-msgstr "Carica modello <str>"
-
-#: src/webserver/src/WebInterface.cpp:251
-msgid "Web server HTTP port"
-msgstr "Porta HTTP del server web"
-
-#: src/webserver/src/WebInterface.cpp:255
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Usa istradamento UPnP sulla porta del server web"
-
-#: src/webserver/src/WebInterface.cpp:259
-msgid "UPnP port"
-msgstr "Porta UPnP"
-
-#: src/webserver/src/WebInterface.cpp:263
-msgid "Use gzip compression"
-msgstr "Usa compressione gzip"
-
-#: src/webserver/src/WebInterface.cpp:271
-msgid "Full access password for web server"
-msgstr "Password per accesso totale al server web"
-
-#: src/webserver/src/WebInterface.cpp:275
-msgid "Guest password for web server"
-msgstr "Password ospite del server web"
-
-#: src/webserver/src/WebInterface.cpp:279
-msgid "Allow guest access"
-msgstr "Permetti l'accesso guest"
-
-#: src/webserver/src/WebInterface.cpp:283
-msgid "Deny guest access"
-msgstr "Vieta l'accesso guest"
-
-#: src/webserver/src/WebInterface.cpp:287
-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:291
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Percorso file di configurazione di aMule. NON USARE DIRETTAMENTE!"
-
-#: src/webserver/src/WebInterface.cpp:299
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Disabilita interprete PHP (deprecato)"
-
-#: src/webserver/src/WebInterface.cpp:307
-msgid "Recompile PHP pages on each request"
-msgstr "Ricompila pagine PHP ad ogni richiesta"
-
-#: src/webserver/src/WebInterface.cpp:413
-msgid "aMule Web Server"
-msgstr "Server web di aMule"
-
-#: src/webserver/src/WebServer.cpp:312
-msgid "web client connection accepted\n"
-msgstr "connessione web client accettata\n"
-
-#: src/webserver/src/WebServer.cpp:315
-msgid "ERROR: cannot accept web client connection\n"
-msgstr "ERRORE: impossibile accettare la connessione del client web\n"
-
-#: src/webserver/src/WebServer.cpp:361
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Richiesta fallita per l'errore: %s."
-
-#: src/webserver/src/WebServer.cpp:1778
-msgid "Index file not found: "
-msgstr "File indice non trovato: "
-
-#: src/webserver/src/WebServer.cpp:1867
-msgid "Session expired - requesting login\n"
-msgstr "Sessione scaduta - login richiesto\n"
-
-#: src/webserver/src/WebServer.cpp:1872
-msgid "Session ok, logged in\n"
-msgstr "Sessione valida, utente loggato\n"
-
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Session ok, not logged in\n"
-msgstr "Sessione valida, utente loggato\n"
-
-#: src/webserver/src/WebServer.cpp:1879
-msgid "No session opened - will request login\n"
-msgstr "Nessuna sessione aperta - richiesta login\n"
-
-#: src/webserver/src/WebServer.cpp:1903
-msgid "Session created - requesting login\n"
-msgstr "Sessione creata - richiesta login\n"
-
-#: src/webserver/src/WebServer.cpp:1918
-msgid "Processing request original: "
-msgstr "Elaborazione richiesta originale: "
-
-#: src/webserver/src/WebServer.cpp:1947
-msgid "Refusing to read `pass` from URL query string\n"
-msgstr ""
-
-#: src/webserver/src/WebServer.cpp:1953
-msgid "No password specified, login will not be allowed."
-msgstr "Nessuna password specificata, login fallito."
-
-#: src/webserver/src/WebServer.cpp:1955
-msgid "Checking password\n"
-msgstr "Verifica password\n"
-
-#: src/webserver/src/WebServer.cpp:1960
-msgid "Password hash invalid\n"
-msgstr "Hash della password non valido\n"
-
-#: src/webserver/src/WebServer.cpp:1975
-msgid "Password ok\n"
-msgstr "Password valida\n"
-
-#: src/webserver/src/WebServer.cpp:1977
-msgid "Password bad\n"
-msgstr "Password errata\n"
-
-#: src/webserver/src/WebServer.cpp:1980
-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:1988
-msgid "Logout requested\n"
-msgstr "Logout richiesto\n"
-
-#: src/webserver/src/WebServer.cpp:1993
-msgid "Processing request redirected: "
-msgstr "Elaborazione richiesta rediretta: "
-
-#: packaging/windows/installer_strings.c:36
-msgid "aMule (required)"
-msgstr ""
-
-#: packaging/windows/installer_strings.c:37
-msgid "Desktop shortcut"
-msgstr ""
-
-#: packaging/windows/installer_strings.c:38
-#, fuzzy
-msgid "Start aMule when I log in"
-msgstr "Avvia aMule automaticamente all'accesso"
-
-#: packaging/windows/installer_strings.c:39
-#, fuzzy
-msgid "Uninstall"
-msgstr "Installa"
-
-#: packaging/windows/installer_strings.c:40
-msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
-msgstr ""
-
-#: packaging/windows/installer_strings.c:43
-#, fuzzy
-msgid "aMule application files (required)."
-msgstr "Integrazione di aMule non riuscita"
-
-#: packaging/windows/installer_strings.c:44
-msgid "Place an aMule shortcut on the desktop."
-msgstr ""
-
-#: packaging/windows/installer_strings.c:45
-msgid "Launch aMule automatically when the current user logs in (per-user setting)."
-msgstr ""
-
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr ""
-
-#: packaging/windows/installer_strings.c:47
-msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
-msgstr ""
-
-#: packaging/windows/installer_strings.c:53
-msgid ""
-"aMule appears to be running from $INSTDIR.\r\n"
-"Please close aMule (and aMuleD / aMuleGUI) and try again."
-msgstr ""
-
-#: packaging/windows/installer_strings.c:54
-msgid ""
-"aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
-"Please stop it and try again."
-msgstr ""
-
-#: packaging/windows/installer_strings.c:55
-msgid "Removing previous aMule installation at $0..."
-msgstr ""
-
-#: packaging/windows/installer_strings.c:56
-msgid ""
-"Could not remove the previous aMule installation at $0.\r\n"
-"Please close any running aMule processes and try again, or uninstall the previous version manually first."
-msgstr ""
-
-#: packaging/windows/installer_strings.c:57
-msgid "aMule appears to be running. Please close it and re-run the uninstaller."
-msgstr ""
-
-#: packaging/windows/installer_strings.c:58
-msgid "Removing user data at $APPDATA\\aMule..."
-msgstr ""
-
-#, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Inviato"
-
-#, fuzzy
-#~ msgid "Not found"
-#~ msgstr "File non trovato."
-
-#, c-format
-#~ msgid "No GeoLite2 update URL configured. Download GeoLite2-Country.mmdb manually (a free MaxMind account is required) and place it at %s, or set the URL in Preferences."
-#~ msgstr "Nessun URL di aggiornamento GeoLite2 configurato. Scarica manualmente GeoLite2-Country.mmdb (è necessario un account MaxMind gratuito) e collocalo in %s, oppure imposta l'URL nelle Preferenze."

amule-3.0.1.tar.gz/po/quot.sed Deleted

amule-3.0.1.tar.gz/po/remove-potcdate.sin Deleted

amule-3.0.1.tar.gz/src/MuleListCtrl.cpp Deleted

@@ -1,793 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
-// 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 <wx/menu.h>			// Needed for wxMenu
-#include <wx/fileconf.h>		// Needed for wxConfig
-#include <wx/tokenzr.h>			// Needed for wxStringTokenizer
-#include <wx/imaglist.h>		// Needed for wxImageList
-
-#include <common/MuleDebug.h>			// Needed for MULE_VALIDATE_
-#include <common/StringFunctions.h>		// Needed for StrToLong
-
-#include <common/MenuIDs.h>
-
-#include "MuleListCtrl.h"		// Interface declarations
-#include "GetTickCount.h"		// Needed for GetTickCount64()
-#include "OtherFunctions.h"
-
-
-#include <wx/artprov.h>             // Needed for wxArtProvider::GetBitmap
-
-
-// Global constants
-#ifdef __WXGTK__
-	const int COL_SIZE_MIN = 10;
-#elif defined(__WINDOWS__) || defined(__WXMAC__) || defined(__WXCOCOA__)
-	const int COL_SIZE_MIN = 0;
-#else
-	#error Need to define COL_SIZE_MIN for your OS
-#endif
-
-
-wxBEGIN_EVENT_TABLE(CMuleListCtrl, MuleExtern::wxGenericListCtrl)
-	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)
-	EVT_MENU_RANGE(MP_LISTCOL_1, MP_LISTCOL_15, CMuleListCtrl::OnMenuSelected)
-	EVT_MOUSEWHEEL(CMuleListCtrl::OnMouseWheel)
-wxEND_EVENT_TABLE()
-
-
-//! Shared list of arrow-pixmaps
-static wxImageList imgList(16, 16, true, 0);
-
-
-CMuleListCtrl::CMuleListCtrl(wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name)
-	: MuleExtern::wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
-{
-	m_sort_func = NULL;
-	m_tts_time = 0;
-	m_tts_item = -1;
-	m_isSorting = false;
-
-	if (imgList.GetImageCount() == 0) {
-		imgList.Add(wxArtProvider::GetBitmap("amule:sort_dn"));
-		imgList.Add(wxArtProvider::GetBitmap("amule:sort_up"));
-		imgList.Add(wxArtProvider::GetBitmap("amule:sort_dnx2"));
-		imgList.Add(wxArtProvider::GetBitmap("amule:sort_upx2"));
-	}
-
-	// Default sort-order is to sort by the first column (asc).
-	m_sort_orders.push_back(CColPair(0, 0));
-
-	SetImageList(&imgList, wxIMAGE_LIST_SMALL);
-}
-
-
-CMuleListCtrl::~CMuleListCtrl()
-{
-	if (!m_name.IsEmpty()) {
-		SaveSettings();
-	}
-}
-
-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(':') == wxNOT_FOUND, "Column name \"" + name + "\" contains invalid characters!");
-		wxASSERT_MSG(name.Find(',') == wxNOT_FOUND, "Column name \"" + name + "\" 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("Column name \"" + name + "\" 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()
-{
-	wxCHECK_RET(!m_name.IsEmpty(), "Cannot save settings for unnamed list");
-
-	wxConfigBase* cfg = wxConfigBase::Get();
-
-	// Save sorting, column and order
-	wxString sortOrder;
-	for (CSortingList::iterator it = m_sort_orders.begin(); it != m_sort_orders.end();) {
-		wxString columnName = GetColumnName(it->first);
-		if (!columnName.IsEmpty()) {
-			sortOrder += columnName;
-			sortOrder += ":";
-			sortOrder += it->second & SORT_DES ? "1" : "0";
-			sortOrder += ":";
-			sortOrder += it->second & SORT_ALT ? "1" : "0";
-			if (++it != m_sort_orders.end()) {
-				sortOrder += ",";
-			}
-		} else {
-			++it;
-		}
-	}
-
-	cfg->Write("/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) {
-		wxString columnName = GetColumnName(i);
-		if (!columnName.IsEmpty()) {
-			if (!buffer.IsEmpty()) {
-				buffer << ",";
-			}
-			int currentwidth = GetColumnWidth(i);
-			int savedsize = (m_column_sizes.size() && (i < (int) m_column_sizes.size())) ? m_column_sizesi : 0;
-			buffer << columnName << ":" << ((currentwidth > 0) ? currentwidth : (-1 * savedsize));
-		}
-	}
-
-	cfg->Write("/eMule/TableWidths" + m_name, buffer);
-}
-
-void CMuleListCtrl::ParseOldConfigEntries(const wxString& sortOrders, const wxString& columnWidths)
-{
-	// Set sort order (including sort column)
-	wxStringTokenizer tokens(sortOrders, ",");
-	while (tokens.HasMoreTokens()) {
-		wxString token = tokens.GetNextToken();
-
-		long column = 0;
-		unsigned long order = 0;
-
-		if (token.BeforeFirst(' ').Strip(wxString::both).ToLong(&column)) {
-			if (token.AfterFirst(' ').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);
-					}
-				}
-			}
-		}
-	}
-
-	// Set column widths
-	int counter = 0;
-	wxStringTokenizer tokenizer(columnWidths, ",");
-	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(), "Cannot load settings for unnamed list");
-
-	wxConfigBase* cfg = wxConfigBase::Get();
-
-	// Load sort order (including sort-column)
-	m_sort_orders.clear();
-	wxString sortOrders = cfg->Read("/eMule/TableOrdering" + m_name, "");
-	wxString columnWidths = cfg->Read("/eMule/TableWidths" + m_name, "");
-
-	// Prevent sorting from occurring when calling SetSorting
-	MuleListCtrlCompare sortFunc = m_sort_func;
-	m_sort_func = NULL;
-
-	if (columnWidths.Find(':') == wxNOT_FOUND) {
-		// Old-style config entries...
-		ParseOldConfigEntries(sortOrders, columnWidths);
-	} else {
-		// Sort orders
-		wxStringTokenizer tokens(sortOrders, ",");
-		// 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(':');
-			long order = StrToLong(token.AfterFirst(':').BeforeLast(':'));
-			long alt = StrToLong(token.AfterLast(':'));
-			int col = GetColumnIndex(name);
-			if (col >= 0) {
-				SetSorting(col, (order ? SORT_DES : 0) | (alt ? SORT_ALT : 0));
-			}
-		}
-
-		// Column widths
-		wxStringTokenizer tkz(columnWidths, ",");
-		while (tkz.HasMoreTokens()) {
-			wxString token = tkz.GetNextToken();
-			wxString name = token.BeforeFirst(':');
-			long width = StrToLong(token.AfterFirst(':'));
-			int col = GetColumnIndex(name);
-			if (col >= 0) {
-				if (col >= (int) m_column_sizes.size()) {
-					m_column_sizes.resize(col + 1, 0);
-				}
-				m_column_sizescol = abs(width);
-				SetColumnWidth(col, (width > 0) ? width : 0);
-			}
-		}
-	}
-
-	// Must have at least one sort-order specified
-	if (m_sort_orders.empty()) {
-		m_sort_orders.push_back(CColPair(0, 0));
-	}
-
-	// Re-enable sorting and resort the contents (if any).
-	m_sort_func = sortFunc;
-	SortList();
-}
-
-
-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(), ",", 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.
-	// Otherwise insert at end.
-	if (Max && m_sort_func) {
-		// 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 less than the one at the current pos
-			if ( cmp < 0 ) {
-				Max = cur_pos;
-			} else {
-				Min = cur_pos + 1;
-			}
-		} while ((Min != Max));
-	}
-
-	return Max;
-}
-
-
-int CMuleListCtrl::CompareItems(wxUIntPtr item1, wxUIntPtr item2)
-{
-	CSortingList::const_iterator it = m_sort_orders.begin();
-	for (; it != m_sort_orders.end(); ++it) {
-		int result = m_sort_func(item1, item2, it->first | it->second);
-		if (result != 0) {
-			return result;
-		}
-	}
-
-	// Ensure that different items are never considered equal.
-	return CmpAny(item1, item2);
-}
-
-int CMuleListCtrl::SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr data)
-{
-	MuleSortData* sortdata = reinterpret_cast<MuleSortData*>(data);
-	const CSortingList& orders = sortdata->m_sort_orders;
-
-	CSortingList::const_iterator it = orders.begin();
-	for (; it != orders.end(); ++it) {
-		int result = sortdata->m_sort_func(item1, item2, it->first | it->second);
-		if (result != 0) {
-			return result;
-		}
-	}
-
-	// Ensure that different items are never considered equal.
-	return CmpAny(item1, item2);
-}
-
-void CMuleListCtrl::SortList()
-{
-	if (!IsSorting() && (m_sort_func && GetColumnCount())) {
-
-		m_isSorting = true;
-
-		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;
-		wxUIntPtr lastItemdata = 0;
-		if (nrItems > 1) {
-			lastItemdata = GetItemData(0);
-		}
-		for (int i = 1; i < nrItems; i++) {
-			wxUIntPtr nextItemdata = GetItemData(i);
-			if (SortProc(lastItemdata, nextItemdata, (wxIntPtr)&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();
-
-		// 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, (wxIntPtr)&sortdata);
-
-		// Re-select the selected items.
-		for (unsigned i = 0; i < selectedItems.size(); ++i) {
-			long it_pos = FindItem(-1, selectedItemsi);
-			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);
-			}
-		}
-
-		m_isSorting = false;
-	}
-}
-
-CMuleListCtrl::ItemDataList CMuleListCtrl::GetSelectedItems() const
-{
-	// Create the initial vector with as many items as are selected
-	ItemDataList list( GetSelectedItemCount() );
-
-	// Current item being located
-	unsigned int current = 0;
-
-	long pos = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	while ( pos != -1 ) {
-		wxASSERT( current < list.size() );
-
-		list current++  = GetItemData( pos );
-
-		pos = GetNextItem( pos, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	}
-
-	return list;
-}
-
-
-void CMuleListCtrl::OnColumnRClick(wxListEvent& evt)
-{
-	wxMenu menu;
-	wxListItem item;
-
-	for ( int i = 0; i < GetColumnCount() && i < 15; ++i) {
-		GetColumn(i, item);
-
-		menu.AppendCheckItem(i + MP_LISTCOL_1, item.GetText() );
-		menu.Check( i + MP_LISTCOL_1, GetColumnWidth(i) > COL_SIZE_MIN );
-	}
-
-	PopupMenu(&menu, evt.GetPoint());
-}
-
-
-void CMuleListCtrl::OnMenuSelected( wxCommandEvent& evt )
-{
-	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_sizescol = GetColumnWidth(col);
-		SetColumnWidth(col, 0);
-	} else {
-		int oldsize = m_column_sizescol;
-		SetColumnWidth(col, (oldsize > 0) ? oldsize : GetColumnDefaultWidth(col));
-	}
-}
-
-
-void CMuleListCtrl::OnColumnLClick(wxListEvent& evt)
-{
-	// Stop if no sorter-function has been defined
-	if (!m_sort_func) {
-		return;
-	} else if (evt.GetColumn() == -1) {
-		// This happens if a user clicks past the last column header.
-		return;
-	}
-
-	unsigned sort_order = 0;
-	if (m_sort_orders.front().first == (unsigned)evt.GetColumn()) {
-		// Same column as before, flip the sort-order
-		sort_order = m_sort_orders.front().second;
-
-		if (sort_order & SORT_DES) {
-			if (AltSortAllowed(evt.GetColumn())) {
-				sort_order = (~sort_order) & SORT_ALT;
-			} else {
-				sort_order = 0;
-			}
-		} else {
-			sort_order = SORT_DES | (sort_order & SORT_ALT);
-		}
-
-		m_sort_orders.pop_front();
-	} else {
-		// Check if the column has already been set
-		CSortingList::iterator it = m_sort_orders.begin();
-		for (; it != m_sort_orders.end(); ++it) {
-			if ((unsigned)evt.GetColumn() == it->first) {
-				sort_order = it->second;
-				break;
-			}
-		}
-	}
-
-
-	SetSorting(evt.GetColumn(), sort_order);
-}
-
-
-void CMuleListCtrl::ClearSelection()
-{
-	if (GetSelectedItemCount()) {
-		long index = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-		while (index != -1) {
-			SetItemState(index, 0, wxLIST_STATE_SELECTED);
-			index = GetNextItem(index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-		}
-	}
-}
-
-
-bool CMuleListCtrl::AltSortAllowed(unsigned WXUNUSED(column)) const
-{
-	return false;
-}
-
-
-void CMuleListCtrl::SetSorting(unsigned column, unsigned order)
-{
-	MULE_VALIDATE_PARAMS(column < (unsigned)GetColumnCount(), "Invalid column to sort by.");
-	MULE_VALIDATE_PARAMS(!(order & ~SORTING_MASK), "Sorting order contains invalid data.");
-
-	if (!m_sort_orders.empty()) {
-		SetColumnImage(m_sort_orders.front().first, -1);
-
-		CSortingList::iterator it = m_sort_orders.begin();
-		for (; it != m_sort_orders.end(); ++it) {
-			if (it->first == column) {
-				m_sort_orders.erase(it);
-				break;
-			}
-		}
-	}
-
-	m_sort_orders.push_front(CColPair(column, order));
-
-	if (order & SORT_DES) {
-		SetColumnImage(column, (order & SORT_ALT) ? 2 : 0);
-	} else {
-		SetColumnImage(column, (order & SORT_ALT) ? 3 : 1);
-	}
-
-	SortList();
-}
-
-
-bool CMuleListCtrl::IsItemSorted(long item)
-{
-	wxCHECK_MSG(m_sort_func, true, "No sort function specified!");
-	wxCHECK_MSG((item >= 0) && (item < GetItemCount()), true, "Invalid item");
-
-	bool sorted = true;
-	wxUIntPtr data = GetItemData(item);
-
-	// Check that the item before the current item is smaller (or equal)
-	if (item > 0) {
-		sorted &= (CompareItems(GetItemData(item - 1), data) <= 0);
-	}
-
-	// Check that the item after the current item is greater (or equal)
-	if (sorted && (item < GetItemCount() - 1)) {
-		sorted &= (CompareItems(GetItemData(item + 1), data) >= 0);
-	}
-
-	return sorted;
-}
-
-
-void CMuleListCtrl::OnMouseWheel(wxMouseEvent &event)
-{
-	// This enables scrolling with the mouse wheel
-	event.Skip();
-}
-
-
-void CMuleListCtrl::SetColumnImage(unsigned col, int image)
-{
-	wxListItem item;
-	item.SetMask(wxLIST_MASK_IMAGE);
-	item.SetImage(image);
-	SetColumn(col, item);
-}
-
-
-long CMuleListCtrl::CheckSelection(wxMouseEvent& event)
-{
-	int flags = 0;
-	wxListEvent evt;
-	evt.m_itemIndex = HitTest(event.GetPosition(), flags);
-
-	return CheckSelection(evt);
-}
-
-
-long CMuleListCtrl::CheckSelection(wxListEvent& event)
-{
-	long item = event.GetIndex();
-
-	// Check if clicked item is selected. If not, unselect all and select it.
-	if ((item != -1) && !GetItemState(item, wxLIST_STATE_SELECTED)) {
-		ClearSelection();
-
-		SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-	}
-
-	return item;
-}
-
-
-wxString CMuleListCtrl::GetTTSText(unsigned item) const
-{
-	MULE_VALIDATE_PARAMS(item < (unsigned)GetItemCount(), "Invalid row.");
-	MULE_VALIDATE_STATE((GetWindowStyle() & wxLC_OWNERDRAW) == 0,
-		"GetTTSText must be overwritten for owner-drawn lists.");
-
-	return GetItemText(item);
-}
-
-
-void CMuleListCtrl::OnChar(wxKeyEvent& evt)
-{
-	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
-		// be returned untranslated. This means for instance, that if
-		// shift and '1' is pressed, the result is '1' rather than '!'
-		// (as it should be on my keyboard). This has been reported:
-		// http://sourceforge.net/tracker/index.php?func=detail&aid=1864810&group_id=9863&atid=109863
-		key = evt.GetUnicodeKey();
-	} else if (key >= WXK_START) {
-		// wxKeycodes are ignored, as they signify events such as the 'home'
-		// button. Unicoded chars are not checked as there is an overlap valid
-		// chars and the wx keycodes.
-		evt.Skip();
-		return;
-	}
-
-	uint64 now = GetTickCount64();
-	// We wish to avoid handling shortcuts, with the exception of 'select-all'.
-	if (evt.AltDown() || evt.ControlDown() || evt.MetaDown()) {
-		if (evt.CmdDown() && (evt.GetKeyCode() == 0x01)) {
-			// Ctrl+a (Command+a on Mac) was pressed, select all items
-			for (int i = 0; i < GetItemCount(); ++i) {
-				SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-			}
-		}
-
-		evt.Skip();
-		return;
-	} else if (m_tts_time + 1500u < now) {
-		m_tts_text.Clear();
-	}
-
-	m_tts_time = now;
-	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()) {
-		m_tts_item = -1;
-	}
-
-	unsigned next = (m_tts_item == -1) ? 0 : m_tts_item;
-	for (unsigned i = 0, count = GetItemCount(); i < count; ++i) {
-		wxString text = GetTTSText((next + i) % count).MakeLower();
-
-		if (text.StartsWith(m_tts_text)) {
-			ClearSelection();
-
-			m_tts_item = (next + i) % count;
-			SetItemState(m_tts_item, wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED,
-					wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED);
-			EnsureVisible(m_tts_item);
-
-			return;
-		}
-	}
-
-	if (m_tts_item != -1) {
-		// Crop the string so that it matches the old item (avoid typos).
-		wxString text = GetTTSText(m_tts_item).MakeLower();
-
-		// If the last key didn't result in a hit, then we skip the event.
-		if (!text.StartsWith(m_tts_text)) {
-			if ((m_tts_text.Length() == 2) && (m_tts_text0 == m_tts_text1)) {
-				// Special case, single-char, repeated. This allows toggeling
-				// between items starting with a specific letter.
-				m_tts_text.Clear();
-				// Increment, so the next will be selected (or wrap around).
-				m_tts_item++;
-				OnChar(evt);
-			} else {
-				m_tts_text.RemoveLast();
-				evt.Skip(true);
-			}
-		}
-	} else {
-		evt.Skip(true);
-	}
-}
-
-
-void CMuleListCtrl::OnItemSelected(wxListEvent& evt)
-{
-	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();
-		}
-		evt.Skip();
-	}
-}
-
-
-void CMuleListCtrl::OnItemDeleted(wxListEvent& evt)
-{
-	if (evt.GetIndex() <= m_tts_item) {
-		m_tts_item--;
-	}
-
-	evt.Skip();
-}
-
-
-void CMuleListCtrl::OnAllItemsDeleted(wxListEvent& evt)
-{
-	ResetTTS();
-
-	evt.Skip();
-}
-
-
-void CMuleListCtrl::ResetTTS()
-{
-	m_tts_item = -1;
-	m_tts_time =  0;
-}
-
-wxString CMuleListCtrl::GetOldColumnOrder() const
-{
-	return "";
-}
-// File_checked_for_headers

amule-3.0.1.tar.gz/src/MuleListCtrl.h Deleted

@@ -1,491 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
-// 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 MULELISTCTRL_H
-#define MULELISTCTRL_H
-
-#ifdef _WIN32
-#include <wx/msw/winundef.h>
-#endif
-
-#include <wx/defs.h> // Do_not_auto_remove (Mac, Win32, and just good practice)
-#include "extern/wxWidgets/listctrl.h"
-
-#include <vector>
-#include <list>
-#include "Types.h"
-
-/**
- * Enhanced wxListCtrl provided custom-drawing among other things.
- *
- * This class provides these features which the original wxListCtrl lacks:
- *  - Automatic sort arrows upon clicks on the column headers
- *  - Custom drawing of items.
- *  - Hiding of columns through auto-generated popup-menu.
- *  - Helper function for inserting items pre-sorted.
- *  - Loading and saving of column properties.
- *  - Selection of items by typing an initial part of the text (TTS).
- */
-class CMuleListCtrl : public MuleExtern::wxGenericListCtrl
-{
-public:
-	/**
-	 * The various ways in which a column can be sorted.
-	 *
-	 * If SORT_DES is not set, sorting is taken to be
-	 * ascending. If SORT_ALT is not set, sorting is
-	 * taken to be normal.
-	 */
-	enum MLOrder
-	{
-		//! If set, sorting is to be in descending order.
-		SORT_DES	= 0x1000,
-
-		//! If sorting should use alternate method.
-		//! Is specified in with or without DEC.
-		SORT_ALT	= 0x2000
-	};
-
-	//! Mask which covers the column part of the sort-data.
-	static const unsigned COLUMN_MASK = 0xfff;
-
-	//! Mask which covers the sorting part of the sort-data.
-	static const unsigned SORTING_MASK = 0x3000;
-
-	/**
-	 * Constructor.
-	 *
-	 * @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 = "mulelistctrl" );
-
-	/**
-	 * Destructor.
-	 *
-	 * If a name for the table has been specified with SetTableName, then
-	 * column settings will be saved automatically.
-	 */
-	virtual ~CMuleListCtrl();
-
-	/**
-	 * Saves column settings.
-	 *
-	 * Currently saves the width of all columns, hidden columns, the column
-	 * to sort by and in which direction to sort.
-	 */
-	virtual void SaveSettings();
-
-	/**
-	 * Loads column settings.
-	 *
-	 * Currently loads the width of all columns, hidden columns, the column
-	 * to sort by and in which direction to sort. This function also ensures
-	 * that the items are sorted after the settings have been read.
-	 */
-	virtual void LoadSettings();
-
-	/**
-	 * This function tries to locate the best place to insert an item.
-	 *
-	 * @param The userdata of the new item.
-	 *
-	 * 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
-	 * through the SetSortFunc function, otherwise it will just return the
-	 * position after the last item.
-	 */
-	long GetInsertPos( wxUIntPtr data );
-
-	/**
-	 * Sorts the list.
-	 *
-	 * Before you can use this function, you will need to specify a sorter
-	 * function using SetSortFunc. wxListCtrl needs such a function to
-	 * perform the sort.
-	 */
-	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 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
-	 * in the current order of the listctrl items.
-	 */
-	ItemDataList GetSelectedItems() const;
-
-	/**
-	 * Sets the sorter function.
-	 *
-	 * @param func
-	 *
-	 * See the documentation on wxListCtrl::SortItems for more information
-	 * about the expected function type.
-	 */
-	void SetSortFunc(MuleListCtrlCompare func)	{ m_sort_func = func; }
-
-	/**
-	 * Deselects all selected items, but does not change focus.
-	 */
-	void ClearSelection();
-
-	/**
-	 * Insert a new column.
-	 *
-	 * @paramin col	Column will be inserted at this position.
-	 * @paramin heading	Heading text for the column.
-	 * @paramin format	Format (alignment) of the column.
-	 * @paramin width	The column width.
-	 * @paramin 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 = ""
-			  );
-
-	/**
-	 * 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:
-
-	/**
-	 * Must be overwritten to enable alternate sorting.
-	 *
-	 * @param The column being sorted.
-	 *
-	 * Subclasses of CMuleListCtrl can allow alternative sorting
-	 * of columns. This is done by overriding this function and
-	 * returning true for the columns where alternative sorting
-	 * is desired.
-	 */
-	virtual bool AltSortAllowed(unsigned column) const;
-
-	/**
-	 * Returns the string used when selecting rows via Type-To-Select.
-	 *
-	 * @param item The index of the item being examined.
-	 *
-	 * By default, this function simply returns the text in the first
-	 * column for the given item. However, when owner-drawing is
-	 * enabled, this function _must_ be overridden.
-	 */
-	virtual wxString GetTTSText(unsigned item) const;
-
-	/**
-	 * Sets the internally used table-name.
-	 *
-	 * @param name The new name or an empty string to disable.
-	 *
-	 * You need to call this function with a unique name before you can
-	 * make use of the LoadSettings/SaveSettings functions. CMuleListCtrl
-	 * uses the name specified in this command to create unique keynames.
-	 */
-	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	{ return m_sort_orders.front().first; }
-
-	/**
-	 * Returns the current sorting order, a combination of the DES and ALT flags.
-	 */
-	unsigned GetSortOrder() const	{ return m_sort_orders.front().second; }
-
-	/**
-	 * 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.
-	 */
-	virtual void SetSorting(unsigned column, unsigned order);
-
-	/**
-	 * Returns true if the item is sorted compared to its neighbours.
-	 */
-	bool IsItemSorted(long item);
-
-	/**
-	 * Check and fix selection state.
-	 *
-	 * @param event The event which triggered the selection.
-	 * @return The index of the item selected or -1 if none.
-	 *
-	 * This function checks if the clicked item is selected.
-	 * If not, then the item is selected and all other items
-	 * are deselected.
-	 */
-	//@{
-	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.
-	 */
-	void OnItemSelected(wxListEvent& evt);
-	void OnItemDeleted(wxListEvent& evt);
-	void OnAllItemsDeleted(wxListEvent& evt);
-
-	/**
-	 * Get column index by name.
-	 *
-	 * @paramin 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;
-
-private:
-	/**
-	 * Resets the current TTS session.
-	 */
-	void ResetTTS();
-
-	/**
-	 * Sets the image of a specific column.
-	 *
-	 * @param col The column to change.
-	 * @param order The sorting order to represent. Zero unsets the image.
-	 */
-	void SetColumnImage(unsigned col, int image);
-
-	//! The name of the table. Used to load/save settings.
-	wxString		m_name;
-
-	//! The sorter function needed by wxListCtrl.
-	MuleListCtrlCompare	m_sort_func;
-
-	//! Contains the current search string.
-	wxString		m_tts_text;
-
-	//! Timestamp for the last TTS event.
-	uint64			m_tts_time;
-
-	//! The index of the last item selected via TTS.
-	int			m_tts_item;
-
-	/**
-	 * Wrapper around the user-provided sorter function.
-	 *
-	 * This function ensures that items are sorted in the order
-	 * specified by clicking on column-headers, and also enforces
-	 * that different entries are never considered equal. This is
-	 * required for lists that make use of child-items, since
-	 * otherwise, parents may not end up properly located in
-	 * relation to child-items.
-	 */
-	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData);
-
-	/** 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.
-	 *
-	 * @paramin 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.
-	 *
-	 * @paramin 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;
-
-	/**
-	 * Find out the new index of the column by the old index.
-	 *
-	 * @paramin 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 occurred.
-	 */
-	int GetNewColumnIndex(int oldindex) const;
-
-	/**
-	 * Parses old config entries.
-	 *
-	 * @paramin sortOrders	Old sort orders line.
-	 * @paramin 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;
-
-	wxDECLARE_EVENT_TABLE();
-};
-
-#endif // MULELISTCTRL_H
-// File_checked_for_headers

amule-3.0.1.tar.gz/src/extern/wxWidgets Deleted

amule-3.0.1.tar.gz/src/extern/wxWidgets/listctrl.cpp Deleted

@@ -1,6038 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/listctrl.cpp
-// Purpose:     generic implementation of wxListCtrl
-// Author:      Robert Roebling
-//              Vadim Zeitlin (virtual list control support)
-// Id:          $Id$
-// Copyright:   Copyright (c) 1998-2011 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// TODO
-//
-//   1. we need to implement searching/sorting for virtual controls somehow
-// 2. when changing selection the lines are refreshed twice
-
-
-// For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_LISTCTRL
-
-#include "listctrl.h"
-
-#ifndef WX_PRECOMP
-    #include <wx/scrolwin.h>
-    #include <wx/timer.h>
-    #include <wx/settings.h>
-    #include <wx/dynarray.h>
-    #include <wx/dcclient.h>
-    #include <wx/dcscreen.h>
-    #include <wx/math.h>
-#endif
-
-#include <wx/imaglist.h>
-#include <wx/selstore.h>
-#include <wx/renderer.h>
-#include <wx/dcbuffer.h>
-
-#include <unordered_map>
-
-
-// NOTE: If using the wxListBox visual attributes works everywhere then this can
-// be removed, as well as the #else case below.
-#define _USE_VISATTR 0
-
-namespace MuleExtern {
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// // the height of the header window (FIXME: should depend on its font!)
-// static const int HEADER_HEIGHT = 23;
-
-static const int SCROLL_UNIT_X = 15;
-
-// the spacing between the lines (in report mode)
-static const int LINE_SPACING = 0;
-
-// extra margins around the text label
-#ifdef __WXGTK__
-static const int EXTRA_WIDTH = 6;
-#else
-static const int EXTRA_WIDTH = 4;
-#endif
-static const int EXTRA_HEIGHT = 4;
-
-// margin between the window and the items
-static const int EXTRA_BORDER_X = 2;
-static const int EXTRA_BORDER_Y = 2;
-
-// offset for the header window
-static const int HEADER_OFFSET_X = 0;
-static const int HEADER_OFFSET_Y = 0;
-
-// margin between rows of icons in small icon view
-static const int MARGIN_BETWEEN_ROWS = 6;
-
-// when autosizing the columns, add some slack
-static const int AUTOSIZE_COL_MARGIN = 10;
-
-// default width for the header columns
-static const int WIDTH_COL_DEFAULT = 80;
-
-// the space between the image and the text in the report mode
-static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
-
-// the space between the image and the text in the report mode in header
-static const int HEADER_IMAGE_MARGIN_IN_REPORT_MODE = 2;
-
-const wxChar wxListCtrlNameStr = L"listCtrl";
-
-// ============================================================================
-// private classes
-// ============================================================================
-
-//-----------------------------------------------------------------------------
-//  wxColWidthInfo (internal)
-//-----------------------------------------------------------------------------
-
-struct wxColWidthInfo
-{
-    int     nMaxWidth;
-    bool    bNeedsUpdate;   //  only set to true when an item whose
-                            //  width == nMaxWidth is removed
-
-    wxColWidthInfo(int w = 0, bool needsUpdate = false)
-    {
-        nMaxWidth = w;
-        bNeedsUpdate = needsUpdate;
-    }
-};
-
-WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray);
-
-//-----------------------------------------------------------------------------
-//  wxListItemData (internal)
-//-----------------------------------------------------------------------------
-
-class wxListItemData
-{
-public:
-    wxListItemData(wxListMainWindow *owner);
-    ~wxListItemData();
-
-    void SetItem( const wxListItem &info );
-    void SetImage( int image ) { m_image = image; }
-    void SetData( wxUIntPtr data ) { m_data = data; }
-    void SetPosition( int x, int y );
-    void SetSize( int width, int height );
-
-    bool HasText() const { return !m_text.empty(); }
-    const wxString& GetText() const { return m_text; }
-    void SetText(const wxString& text) { m_text = text; }
-
-    // we can't use empty string for measuring the string width/height, so
-    // always return something
-    wxString GetTextForMeasuring() const
-    {
-        wxString s = GetText();
-        if ( s.empty() )
-            s = _T('H');
-
-        return s;
-    }
-
-    bool IsHit( int x, int y ) const;
-
-    int GetX() const;
-    int GetY() const;
-    int GetWidth() const;
-    int GetHeight() const;
-
-    int GetImage() const { return m_image; }
-    bool HasImage() const { return GetImage() != -1; }
-
-    void GetItem( wxListItem &info ) const;
-
-    void SetAttr(wxListItemAttr *attr) { m_attr = attr; }
-    wxListItemAttr *GetAttr() const { return m_attr; }
-
-public:
-    // the item image or -1
-    int m_image;
-
-    // user data associated with the item
-    wxUIntPtr m_data;
-
-    // the item coordinates are not used in report mode; instead this pointer is
-    // NULL and the owner window is used to retrieve the item position and size
-    wxRect *m_rect;
-
-    // the list ctrl we are in
-    wxListMainWindow *m_owner;
-
-    // custom attributes or NULL
-    wxListItemAttr *m_attr;
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    wxString m_text;
-};
-
-//-----------------------------------------------------------------------------
-//  wxListHeaderData (internal)
-//-----------------------------------------------------------------------------
-
-class wxListHeaderData : public wxObject
-{
-public:
-    wxListHeaderData();
-    wxListHeaderData( const wxListItem &info );
-    void SetItem( const wxListItem &item );
-    void SetPosition( int x, int y );
-    void SetWidth( int w );
-    void SetState( int state );
-    void SetFormat( int format );
-    void SetHeight( int h );
-    bool HasImage() const;
-
-    bool HasText() const { return !m_text.empty(); }
-    const wxString& GetText() const { return m_text; }
-    void SetText(const wxString& text) { m_text = text; }
-
-    void GetItem( wxListItem &item );
-
-    bool IsHit( int x, int y ) const;
-    int GetImage() const;
-    int GetWidth() const;
-    int GetFormat() const;
-    int GetState() const;
-
-protected:
-    long      m_mask;
-    int       m_image;
-    wxString  m_text;
-    int       m_format;
-    int       m_width;
-    int       m_xpos,
-              m_ypos;
-    int       m_height;
-    int       m_state;
-
-private:
-    void Init();
-};
-
-//-----------------------------------------------------------------------------
-//  wxListLineData (internal)
-//-----------------------------------------------------------------------------
-
-WX_DECLARE_LIST(wxListItemData, wxListItemDataList);
-#include <wx/listimpl.cpp>
-WX_DEFINE_LIST(wxListItemDataList)
-
-class wxListLineData
-{
-public:
-    // the list of subitems: only may have more than one item in report mode
-    wxListItemDataList m_items;
-
-    // this is not used in report view
-    struct GeometryInfo
-    {
-        // total item rect
-        wxRect m_rectAll;
-
-        // label only
-        wxRect m_rectLabel;
-
-        // icon only
-        wxRect m_rectIcon;
-
-        // the part to be highlighted
-        wxRect m_rectHighlight;
-
-        // extend all our rects to be centered inside the one of given width
-        void ExtendWidth(wxCoord w)
-        {
-            wxASSERT_MSG( m_rectAll.width <= w,
-                            _T("width can only be increased") );
-
-            m_rectAll.width = w;
-            m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width) / 2;
-            m_rectIcon.x = m_rectAll.x + (w - m_rectIcon.width) / 2;
-            m_rectHighlight.x = m_rectAll.x + (w - m_rectHighlight.width) / 2;
-        }
-    }
-    *m_gi;
-
-    // is this item selected? NB: not used in virtual mode
-    bool m_highlighted;
-
-    // back pointer to the list ctrl
-    wxListMainWindow *m_owner;
-
-public:
-    wxListLineData(wxListMainWindow *owner);
-
-    ~wxListLineData()
-    {
-        WX_CLEAR_LIST(wxListItemDataList, m_items);
-        delete m_gi;
-    }
-
-    // rule-of-three — silence -Wdeprecated-copy-with-user-provided-dtor.
-    // Shallow copy of m_items / m_gi is the historical behaviour the fork
-    // relied on; preserve it explicitly rather than introducing deep-copy
-    // semantics that would change long-standing container behaviour.
-    wxListLineData(const wxListLineData&) = default;
-    wxListLineData& operator=(const wxListLineData&) = default;
-
-    // are we in report mode?
-    inline bool InReportView() const;
-
-    // are we in virtual report mode?
-    inline bool IsVirtual() const;
-
-    // these 2 methods shouldn't be called for report view controls, in that
-    // case we determine our position/size ourselves
-
-    // calculate the size of the line
-    void CalculateSize( wxDC *dc, int spacing );
-
-    // remember the position this line appears at
-    void SetPosition( int x, int y, int spacing );
-
-    // wxListCtrl API
-
-    void SetImage( int image ) { SetImage(0, image); }
-    int GetImage() const { return GetImage(0); }
-    void SetImage( int index, int image );
-    int GetImage( int index ) const;
-
-    bool HasImage() const { return GetImage() != -1; }
-    bool HasText() const { return !GetText(0).empty(); }
-
-    void SetItem( int index, const wxListItem &info );
-    void GetItem( int index, wxListItem &info );
-
-    wxString GetText(int index) const;
-    void SetText( int index, const wxString& s );
-
-    wxListItemAttr *GetAttr() const;
-    void SetAttr(wxListItemAttr *attr);
-
-    // return true if the highlighting really changed
-    bool Highlight( bool on );
-
-    void ReverseHighlight();
-
-    bool IsHighlighted() const
-    {
-        wxASSERT_MSG( !IsVirtual(), _T("unexpected call to IsHighlighted") );
-
-        return m_highlighted;
-    }
-
-    // draw the line on the given DC in icon/list mode
-    void Draw( wxDC *dc );
-
-    // the same in report mode
-    void DrawInReportMode( wxDC *dc,
-                           const wxRect& rect,
-                           const wxRect& rectHL,
-                           bool highlighted );
-
-private:
-    // set the line to contain num items (only can be > 1 in report mode)
-    void InitItems( int num );
-
-    // get the mode (i.e. style)  of the list control
-    inline int GetMode() const;
-
-    // prepare the DC for drawing with these item's attributes, return true if
-    // we need to draw the items background to highlight it, false otherwise
-    bool SetAttributes(wxDC *dc,
-                       const wxListItemAttr *attr,
-                       bool highlight);
-
-    // draw the text on the DC with the correct justification; also add an
-    // ellipsis if the text is too large to fit in the current width
-    void DrawTextFormatted(wxDC *dc,
-                           const wxString &text,
-                           int col,
-                           int x,
-                           int yMid,    // this is middle, not top, of the text
-                           int width);
-};
-
-WX_DECLARE_OBJARRAY(wxListLineData, wxListLineDataArray);
-#include <wx/arrimpl.cpp>
-WX_DEFINE_OBJARRAY(wxListLineDataArray)
-
-//-----------------------------------------------------------------------------
-//  wxListHeaderWindow (internal)
-//-----------------------------------------------------------------------------
-
-class wxListHeaderWindow : public wxWindow
-{
-protected:
-    wxListMainWindow  *m_owner;
-    const wxCursor    *m_currentCursor;
-    wxCursor          *m_resizeCursor;
-    bool               m_isDragging;
-
-    // column being resized or -1
-    int m_column;
-
-    // divider line position in logical (unscrolled) coords
-    int m_currentX;
-
-    // minimal position beyond which the divider line
-    // can't be dragged in logical coords
-    int m_minX;
-
-public:
-    wxListHeaderWindow();
-
-    wxListHeaderWindow( wxWindow *win,
-                        wxWindowID id,
-                        wxListMainWindow *owner,
-                        const wxPoint &pos = wxDefaultPosition,
-                        const wxSize &size = wxDefaultSize,
-                        long style = 0,
-                        const wxString &name = "wxlistctrlcolumntitles" );
-
-    virtual ~wxListHeaderWindow();
-
-    void DrawCurrent();
-    void AdjustDC( wxDC& dc );
-
-    void OnPaint( wxPaintEvent &event );
-    void OnMouse( wxMouseEvent &event );
-    void OnSetFocus( wxFocusEvent &event );
-
-    // needs refresh
-    bool m_dirty;
-
-private:
-    // common part of all ctors
-    void Init();
-
-    // generate and process the list event of the given type, return true if
-    // it wasn't vetoed, i.e. if we should proceed
-    bool SendListEvent(wxEventType type, const wxPoint& pos);
-
-    wxDECLARE_EVENT_TABLE();
-};
-
-//-----------------------------------------------------------------------------
-// wxListRenameTimer (internal)
-//-----------------------------------------------------------------------------
-
-class wxListRenameTimer: public wxTimer
-{
-private:
-    wxListMainWindow *m_owner;
-
-public:
-    wxListRenameTimer( wxListMainWindow *owner );
-    void Notify();
-};
-
-//-----------------------------------------------------------------------------
-// wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing
-//-----------------------------------------------------------------------------
-
-class wxListTextCtrlWrapper : public wxEvtHandler
-{
-public:
-    // NB: text must be a valid object but not Create()d yet
-    wxListTextCtrlWrapper(wxListMainWindow *owner,
-                          wxTextCtrl *text,
-                          size_t itemEdit);
-
-    wxTextCtrl *GetText() const { return m_text; }
-
-    void AcceptChangesAndFinish();
-
-protected:
-    void OnChar( wxKeyEvent &event );
-    void OnKeyUp( wxKeyEvent &event );
-    void OnKillFocus( wxFocusEvent &event );
-
-    bool AcceptChanges();
-    void Finish();
-
-private:
-    wxListMainWindow   *m_owner;
-    wxTextCtrl         *m_text;
-    wxString            m_startValue;
-    size_t              m_itemEdited;
-    bool                m_finished;
-    bool                m_aboutToFinish;
-
-    wxDECLARE_EVENT_TABLE();
-};
-
-//-----------------------------------------------------------------------------
-//  wxListMainWindow (internal)
-//-----------------------------------------------------------------------------
-
-WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
-#include <wx/listimpl.cpp>
-WX_DEFINE_LIST(wxListHeaderDataList)
-
-class wxListMainWindow : public wxScrolledWindow
-{
-public:
-    wxListMainWindow();
-    wxListMainWindow( wxWindow *parent,
-                      wxWindowID id,
-                      const wxPoint& pos = wxDefaultPosition,
-                      const wxSize& size = wxDefaultSize,
-                      long style = 0,
-                      const wxString &name = _T("listctrlmainwindow") );
-
-    virtual ~wxListMainWindow();
-
-    bool HasFlag(int flag) const { return m_parent->HasFlag(flag); }
-
-    // return true if this is a virtual list control
-    bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
-
-    // return true if the control is in report mode
-    bool InReportView() const { return HasFlag(wxLC_REPORT); }
-
-    // return true if we are in single selection mode, false if multi sel
-    bool IsSingleSel() const { return HasFlag(wxLC_SINGLE_SEL); }
-
-    // do we have a header window?
-    bool HasHeader() const
-        { return InReportView() && !HasFlag(wxLC_NO_HEADER); }
-
-    void HighlightAll( bool on );
-
-    // all these functions only do something if the line is currently visible
-
-    // change the line "selected" state, return true if it really changed
-    bool HighlightLine( size_t line, bool highlight = true);
-
-    // as HighlightLine() but do it for the range of lines: this is incredibly
-    // more efficient for virtual list controls!
-    //
-    // NB: unlike HighlightLine() this one does refresh the lines on screen
-    void HighlightLines( size_t lineFrom, size_t lineTo, bool on = true );
-
-    // toggle the line state and refresh it
-    void ReverseHighlight( size_t line )
-        { HighlightLine(line, !IsHighlighted(line)); RefreshLine(line); }
-
-    // return true if the line is highlighted
-    bool IsHighlighted(size_t line) const;
-
-    // refresh one or several lines at once
-    void RefreshLine( size_t line );
-    void RefreshLines( size_t lineFrom, size_t lineTo );
-
-    // refresh all selected items
-    void RefreshSelected();
-
-    // refresh all lines below the given one: the difference with
-    // RefreshLines() is that the index here might not be a valid one (happens
-    // when the last line is deleted)
-    void RefreshAfter( size_t lineFrom );
-
-    // the methods which are forwarded to wxListLineData itself in list/icon
-    // modes but are here because the lines don't store their positions in the
-    // report mode
-
-    // get the bound rect for the entire line
-    wxRect GetLineRect(size_t line) const;
-
-    // get the bound rect of the label
-    wxRect GetLineLabelRect(size_t line) const;
-
-    // get the bound rect of the items icon (only may be called if we do have
-    // an icon!)
-    wxRect GetLineIconRect(size_t line) const;
-
-    // get the rect to be highlighted when the item has focus
-    wxRect GetLineHighlightRect(size_t line) const;
-
-    // get the size of the total line rect
-    wxSize GetLineSize(size_t line) const
-        { return GetLineRect(line).GetSize(); }
-
-    // return the hit code for the corresponding position (in this line)
-    long HitTestLine(size_t line, int x, int y) const;
-
-    // bring the selected item into view, scrolling to it if necessary
-    void MoveToItem(size_t item);
-
-    // bring the current item into view
-    void MoveToFocus() { MoveToItem(m_current); }
-
-    // start editing the label of the given item
-    wxTextCtrl *EditLabel(long item,
-                          wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
-    wxTextCtrl *GetEditControl() const
-    {
-        return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL;
-    }
-
-    void FinishEditing(wxTextCtrl *text)
-    {
-        delete text;
-        m_textctrlWrapper = NULL;
-        SetFocusIgnoringChildren();
-    }
-
-    // suspend/resume redrawing the control
-    void Freeze();
-    void Thaw();
-
-    void OnRenameTimer();
-    bool OnRenameAccept(size_t itemEdit, const wxString& value);
-    void OnRenameCancelled(size_t itemEdit);
-
-    void OnMouse( wxMouseEvent &event );
-
-    // called to switch the selection from the current item to newCurrent,
-    void OnArrowChar( size_t newCurrent, const wxKeyEvent& event );
-
-    void OnChar( wxKeyEvent &event );
-    void OnKeyDown( wxKeyEvent &event );
-    void OnKeyUp( wxKeyEvent &event );
-    void OnSetFocus( wxFocusEvent &event );
-    void OnKillFocus( wxFocusEvent &event );
-    void OnScroll( wxScrollWinEvent& event );
-
-    void OnPaint( wxPaintEvent &event );
-    void OnErase( wxEraseEvent& event ) {
-        // This is needed to avoid garbage on empty lists.
-        if ( IsEmpty() ) {
-            event.Skip();
-        }
-    }
-
-    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;
-
-    void SetImageList( wxImageList *imageList, int which );
-    void SetItemSpacing( int spacing, bool isSmall = false );
-    int GetItemSpacing( bool isSmall = false );
-
-    void SetColumn( int col, wxListItem &item );
-    void SetColumnWidth( int col, int width );
-    void GetColumn( int col, wxListItem &item ) const;
-    int GetColumnWidth( int col ) const;
-    int GetColumnCount() const { return m_columns.GetCount(); }
-
-    // returns the sum of the heights of all columns
-    int GetHeaderWidth() const;
-
-    int GetCountPerPage() const;
-
-    void SetItem( wxListItem &item );
-    void GetItem( wxListItem &item ) const;
-    void SetItemState( long item, long state, long stateMask );
-    void SetItemStateAll( long state, long stateMask );
-    int GetItemState( long item, long stateMask ) const;
-    void GetItemRect( long index, wxRect &rect ) const;
-    wxRect GetViewRect() const;
-    bool GetItemPosition( long item, wxPoint& pos ) const;
-    int GetSelectedItemCount() const;
-
-    wxString GetItemText(long item) const
-    {
-        wxListItem info;
-        info.m_mask = wxLIST_MASK_TEXT;
-        info.m_itemId = item;
-        GetItem( info );
-        return info.m_text;
-    }
-
-    void SetItemText(long item, const wxString& value)
-    {
-        wxListItem info;
-        info.m_mask = wxLIST_MASK_TEXT;
-        info.m_itemId = item;
-        info.m_text = value;
-        SetItem( info );
-    }
-
-    // set the scrollbars and update the positions of the items
-    void RecalculatePositions(bool noRefresh = false);
-
-    // refresh the window and the header
-    void RefreshAll();
-
-    long GetNextItem( long item, int geometry, int state ) const;
-    void DeleteItem( long index );
-    void DeleteAllItems();
-    void DeleteColumn( int col );
-    void DeleteEverything();
-    void EnsureVisible( long index );
-    long FindItem( long start, const wxString& str, bool partial = false );
-    long FindItem( long start, wxUIntPtr data);
-    long FindItem( const wxPoint& pt );
-    long HitTest( int x, int y, int &flags ) const;
-    void InsertItem( wxListItem &item );
-    void InsertColumn( long col, wxListItem &item );
-    int GetItemWidthWithImage(wxListItem * item);
-    void SortItems( MuleListCtrlCompare fn, wxIntPtr data );
-
-    size_t GetItemCount() const;
-    bool IsEmpty() const { return GetItemCount() == 0; }
-    void SetItemCount(long count);
-
-    // change the current (== focused) item, send a notification event
-    void ChangeCurrent(size_t current);
-    void ResetCurrent() { ChangeCurrent((size_t)-1); }
-    bool HasCurrent() const { return m_current != (size_t)-1; }
-
-    // send out a wxListEvent
-    void SendNotify( size_t line,
-                     wxEventType command,
-                     const wxPoint& point = wxDefaultPosition );
-
-    // override base class virtual to reset m_lineHeight when the font changes
-    virtual bool SetFont(const wxFont& font)
-    {
-        if ( !wxScrolledWindow::SetFont(font) )
-            return false;
-
-        m_lineHeight = 0;
-
-        return true;
-    }
-
-    // these are for wxListLineData usage only
-
-    // get the backpointer to the list ctrl
-    wxGenericListCtrl *GetListCtrl() const
-    {
-        return wxStaticCast(GetParent(), wxGenericListCtrl);
-    }
-
-    // get the height of all lines (assuming they all do have the same height)
-    wxCoord GetLineHeight() const;
-
-    // get the y position of the given line (only for report view)
-    wxCoord GetLineY(size_t line) const;
-
-    // get the brush to use for the item highlighting
-    const wxBrush& GetHighlightBrush() const
-    {
-        return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush;
-    }
-
-    bool HasFocus() const
-    {
-        return m_hasFocus;
-    }
-
-//protected:
-    // the array of all line objects for a non virtual list control (for the
-    // virtual list control we only ever use m_lines0)
-    wxListLineDataArray  m_lines;
-
-    // O(1) reverse-index from user-data to row index, replacing the original
-    // O(N) linear scan in FindItem(long, wxUIntPtr). Built lazily by
-    // RebuildDataIndex() on the first FindItem after invalidation; flagged
-    // dirty by any mutation that shifts indices (mid-insert, delete, sort) or
-    // touches user-data (SetItem with wxLIST_MASK_DATA). aMule list controls
-    // (SharedFilesCtrl, DownloadListCtrl, ServerListCtrl) call
-    // FindItem(-1, pointer) per-EC-event, so this caches the dominant lookup.
-    mutable std::unordered_map<wxUIntPtr, size_t> m_dataIndex;
-    mutable bool m_dataIndexDirty;
-
-    void RebuildDataIndex() const;
-
-    // the list of column objects
-    wxListHeaderDataList m_columns;
-
-    // currently focused item or -1
-    size_t               m_current;
-
-    // the number of lines per page
-    int                  m_linesPerPage;
-
-    // this flag is set when something which should result in the window
-    // redrawing happens (i.e. an item was added or deleted, or its appearance
-    // changed) and OnPaint() doesn't redraw the window while it is set which
-    // allows to minimize the number of repaintings when a lot of items are
-    // being added. The real repainting occurs only after the next OnIdle()
-    // call
-    bool                 m_dirty;
-
-    wxColour            *m_highlightColour;
-    wxImageList         *m_small_image_list;
-    wxImageList         *m_normal_image_list;
-    int                  m_small_spacing;
-    int                  m_normal_spacing;
-    bool                 m_hasFocus;
-
-    bool                 m_lastOnSame;
-    wxTimer             *m_renameTimer;
-    bool                 m_isCreated;
-    int                  m_dragCount;
-    wxPoint              m_dragStart;
-    ColWidthArray        m_aColWidths;
-
-    // for double click logic
-    size_t m_lineLastClicked,
-           m_lineBeforeLastClicked,
-           m_lineSelectSingleOnUp;
-
-protected:
-    wxWindow *GetMainWindowOfCompositeControl() { return GetParent(); }
-
-    // the total count of items in a virtual list control
-    size_t m_countVirt;
-
-    // the object maintaining the items selection state, only used in virtual
-    // controls
-    wxSelectionStore m_selStore;
-
-    // common part of all ctors
-    void Init();
-
-    // get the line data for the given index
-    wxListLineData *GetLine(size_t n) const
-    {
-        wxASSERT_MSG( n != (size_t)-1, _T("invalid line index") );
-
-        if ( IsVirtual() )
-        {
-            wxConstCast(this, wxListMainWindow)->CacheLineData(n);
-            n = 0;
-        }
-
-        return &m_linesn;
-    }
-
-    // get a dummy line which can be used for geometry calculations and such:
-    // you must use GetLine() if you want to really draw the line
-    wxListLineData *GetDummyLine() const;
-
-    // cache the line data of the n-th line in m_lines0
-    void CacheLineData(size_t line);
-
-    // get the range of visible lines
-    void GetVisibleLinesRange(size_t *from, size_t *to);
-
-    // force us to recalculate the range of visible lines
-    void ResetVisibleLinesRange() { m_lineFrom = (size_t)-1; }
-
-    // get the colour to be used for drawing the rules
-    wxColour GetRuleColour() const
-    {
-        return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
-    }
-
-private:
-    // initialize the current item if needed
-    void UpdateCurrent();
-
-    // delete all items but don't refresh: called from dtor
-    void DoDeleteAllItems();
-
-    // the height of one line using the current font
-    wxCoord m_lineHeight;
-
-    // the total header width or 0 if not calculated yet
-    wxCoord m_headerWidth;
-
-    // the first and last lines being shown on screen right now (inclusive),
-    // both may be -1 if they must be calculated so never access them directly:
-    // use GetVisibleLinesRange() above instead
-    size_t m_lineFrom,
-           m_lineTo;
-
-    // the brushes to use for item highlighting when we do/don't have focus
-    wxBrush m_highlightBrush,
-            m_highlightUnfocusedBrush;
-
-    // if this is > 0, the control is frozen and doesn't redraw itself
-    size_t m_freezeCount;
-
-    // wrapper around the text control currently used for in place editing or
-    // NULL if no item is being edited
-    wxListTextCtrlWrapper *m_textctrlWrapper;
-
-
-    wxDECLARE_EVENT_TABLE();
-
-    friend class wxGenericListCtrl;
-};
-
-
-wxListItemData::~wxListItemData()
-{
-    // in the virtual list control the attributes are managed by the main
-    // program, so don't delete them
-    if ( !m_owner->IsVirtual() )
-        delete m_attr;
-
-    delete m_rect;
-}
-
-void wxListItemData::Init()
-{
-    m_image = -1;
-    m_data = 0;
-
-    m_attr = NULL;
-}
-
-wxListItemData::wxListItemData(wxListMainWindow *owner)
-{
-    Init();
-
-    m_owner = owner;
-
-    if ( owner->InReportView() )
-        m_rect = NULL;
-    else
-        m_rect = new wxRect;
-}
-
-void wxListItemData::SetItem( const wxListItem &info )
-{
-    if ( info.m_mask & wxLIST_MASK_TEXT )
-        SetText(info.m_text);
-    if ( info.m_mask & wxLIST_MASK_IMAGE )
-        m_image = info.m_image;
-    if ( info.m_mask & wxLIST_MASK_DATA )
-        m_data = info.m_data;
-
-    if ( info.HasAttributes() )
-    {
-        if ( m_attr )
-            m_attr->AssignFrom(*info.GetAttributes());
-        else
-            m_attr = new wxListItemAttr(*info.GetAttributes());
-    }
-
-    if ( m_rect )
-    {
-        m_rect->x =
-        m_rect->y =
-        m_rect->height = 0;
-        m_rect->width = info.m_width;
-    }
-}
-
-void wxListItemData::SetPosition( int x, int y )
-{
-    wxCHECK_RET( m_rect, _T("unexpected SetPosition() call") );
-
-    m_rect->x = x;
-    m_rect->y = y;
-}
-
-void wxListItemData::SetSize( int width, int height )
-{
-    wxCHECK_RET( m_rect, _T("unexpected SetSize() call") );
-
-    if ( width != -1 )
-        m_rect->width = width;
-    if ( height != -1 )
-        m_rect->height = height;
-}
-
-bool wxListItemData::IsHit( int x, int y ) const
-{
-    wxCHECK_MSG( m_rect, false, _T("can't be called in this mode") );
-
-    return wxRect(GetX(), GetY(), GetWidth(), GetHeight()).Contains(x, y);
-}
-
-int wxListItemData::GetX() const
-{
-    wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") );
-
-    return m_rect->x;
-}
-
-int wxListItemData::GetY() const
-{
-    wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") );
-
-    return m_rect->y;
-}
-
-int wxListItemData::GetWidth() const
-{
-    wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") );
-
-    return m_rect->width;
-}
-
-int wxListItemData::GetHeight() const
-{
-    wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") );
-
-    return m_rect->height;
-}
-
-void wxListItemData::GetItem( wxListItem &info ) const
-{
-    long mask = info.m_mask;
-    if ( !mask )
-        // by default, get everything for backwards compatibility
-        mask = -1;
-
-    if ( mask & wxLIST_MASK_TEXT )
-        info.m_text = m_text;
-    if ( mask & wxLIST_MASK_IMAGE )
-        info.m_image = m_image;
-    if ( mask & wxLIST_MASK_DATA )
-        info.m_data = m_data;
-
-    if ( m_attr )
-    {
-        if ( m_attr->HasTextColour() )
-            info.SetTextColour(m_attr->GetTextColour());
-        if ( m_attr->HasBackgroundColour() )
-            info.SetBackgroundColour(m_attr->GetBackgroundColour());
-        if ( m_attr->HasFont() )
-            info.SetFont(m_attr->GetFont());
-    }
-}
-
-//-----------------------------------------------------------------------------
-//  wxListHeaderData
-//-----------------------------------------------------------------------------
-
-void wxListHeaderData::Init()
-{
-    m_mask = 0;
-    m_image = -1;
-    m_format = 0;
-    m_width = 0;
-    m_xpos = 0;
-    m_ypos = 0;
-    m_height = 0;
-    m_state = 0;
-}
-
-wxListHeaderData::wxListHeaderData()
-{
-    Init();
-}
-
-wxListHeaderData::wxListHeaderData( const wxListItem &item )
-{
-    Init();
-
-    SetItem( item );
-}
-
-void wxListHeaderData::SetItem( const wxListItem &item )
-{
-    m_mask = item.m_mask;
-
-    if ( m_mask & wxLIST_MASK_TEXT )
-        m_text = item.m_text;
-
-    if ( m_mask & wxLIST_MASK_IMAGE )
-        m_image = item.m_image;
-
-    if ( m_mask & wxLIST_MASK_FORMAT )
-        m_format = item.m_format;
-
-    if ( m_mask & wxLIST_MASK_WIDTH )
-        SetWidth(item.m_width);
-
-    if ( m_mask & wxLIST_MASK_STATE )
-        SetState(item.m_state);
-}
-
-void wxListHeaderData::SetPosition( int x, int y )
-{
-    m_xpos = x;
-    m_ypos = y;
-}
-
-void wxListHeaderData::SetHeight( int h )
-{
-    m_height = h;
-}
-
-void wxListHeaderData::SetWidth( int w )
-{
-    m_width = w < 0 ? WIDTH_COL_DEFAULT : w;
-}
-
-void wxListHeaderData::SetState( int flag )
-{
-    m_state = flag;
-}
-
-void wxListHeaderData::SetFormat( int format )
-{
-    m_format = format;
-}
-
-bool wxListHeaderData::HasImage() const
-{
-    return m_image != -1;
-}
-
-bool wxListHeaderData::IsHit( int x, int y ) const
-{
-    return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height));
-}
-
-void wxListHeaderData::GetItem( wxListItem& item )
-{
-    item.m_mask = m_mask;
-    item.m_text = m_text;
-    item.m_image = m_image;
-    item.m_format = m_format;
-    item.m_width = m_width;
-    item.m_state = m_state;
-}
-
-int wxListHeaderData::GetImage() const
-{
-    return m_image;
-}
-
-int wxListHeaderData::GetWidth() const
-{
-    return m_width;
-}
-
-int wxListHeaderData::GetFormat() const
-{
-    return m_format;
-}
-
-int wxListHeaderData::GetState() const
-{
-    return m_state;
-}
-
-//-----------------------------------------------------------------------------
-//  wxListLineData
-//-----------------------------------------------------------------------------
-
-inline int wxListLineData::GetMode() const
-{
-    return m_owner->GetListCtrl()->GetWindowStyleFlag() & wxLC_MASK_TYPE;
-}
-
-inline bool wxListLineData::InReportView() const
-{
-    return m_owner->HasFlag(wxLC_REPORT);
-}
-
-inline bool wxListLineData::IsVirtual() const
-{
-    return m_owner->IsVirtual();
-}
-
-wxListLineData::wxListLineData( wxListMainWindow *owner )
-{
-    m_owner = owner;
-
-    if ( InReportView() )
-        m_gi = NULL;
-    else // !report
-        m_gi = new GeometryInfo;
-
-    m_highlighted = false;
-
-    InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );
-}
-
-void wxListLineData::CalculateSize( wxDC *dc, int spacing )
-{
-    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
-    wxCHECK_RET( node, _T("no subitems at all??") );
-
-    wxListItemData *item = node->GetData();
-
-    wxString s;
-    wxCoord lw, lh;
-
-    switch ( GetMode() )
-    {
-        case wxLC_ICON:
-        case wxLC_SMALL_ICON:
-            m_gi->m_rectAll.width = spacing;
-
-            s = item->GetText();
-
-            if ( s.empty() )
-            {
-                lh =
-                m_gi->m_rectLabel.width =
-                m_gi->m_rectLabel.height = 0;
-            }
-            else // has label
-            {
-                dc->GetTextExtent( s, &lw, &lh );
-                lw += EXTRA_WIDTH;
-                lh += EXTRA_HEIGHT;
-
-                m_gi->m_rectAll.height = spacing + lh;
-                if (lw > spacing)
-                    m_gi->m_rectAll.width = lw;
-
-                m_gi->m_rectLabel.width = lw;
-                m_gi->m_rectLabel.height = lh;
-            }
-
-            if (item->HasImage())
-            {
-                int w, h;
-                m_owner->GetImageSize( item->GetImage(), w, h );
-                m_gi->m_rectIcon.width = w + 8;
-                m_gi->m_rectIcon.height = h + 8;
-
-                if ( m_gi->m_rectIcon.width > m_gi->m_rectAll.width )
-                    m_gi->m_rectAll.width = m_gi->m_rectIcon.width;
-                if ( m_gi->m_rectIcon.height + lh > m_gi->m_rectAll.height - 4 )
-                    m_gi->m_rectAll.height = m_gi->m_rectIcon.height + lh + 4;
-            }
-
-            if ( item->HasText() )
-            {
-                m_gi->m_rectHighlight.width = m_gi->m_rectLabel.width;
-                m_gi->m_rectHighlight.height = m_gi->m_rectLabel.height;
-            }
-            else // no text, highlight the icon
-            {
-                m_gi->m_rectHighlight.width = m_gi->m_rectIcon.width;
-                m_gi->m_rectHighlight.height = m_gi->m_rectIcon.height;
-            }
-            break;
-
-        case wxLC_LIST:
-            s = item->GetTextForMeasuring();
-
-            dc->GetTextExtent( s, &lw, &lh );
-            lw += EXTRA_WIDTH;
-            lh += EXTRA_HEIGHT;
-
-            m_gi->m_rectLabel.width = lw;
-            m_gi->m_rectLabel.height = lh;
-
-            m_gi->m_rectAll.width = lw;
-            m_gi->m_rectAll.height = lh;
-
-            if (item->HasImage())
-            {
-                int w, h;
-                m_owner->GetImageSize( item->GetImage(), w, h );
-                m_gi->m_rectIcon.width = w;
-                m_gi->m_rectIcon.height = h;
-
-                m_gi->m_rectAll.width += 4 + w;
-                if (h > m_gi->m_rectAll.height)
-                    m_gi->m_rectAll.height = h;
-            }
-
-            m_gi->m_rectHighlight.width = m_gi->m_rectAll.width;
-            m_gi->m_rectHighlight.height = m_gi->m_rectAll.height;
-            break;
-
-        case wxLC_REPORT:
-            wxFAIL_MSG( _T("unexpected call to SetSize") );
-            break;
-
-        default:
-            wxFAIL_MSG( _T("unknown mode") );
-            break;
-    }
-}
-
-void wxListLineData::SetPosition( int x, int y, int spacing )
-{
-    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
-    wxCHECK_RET( node, _T("no subitems at all??") );
-
-    wxListItemData *item = node->GetData();
-
-    switch ( GetMode() )
-    {
-        case wxLC_ICON:
-        case wxLC_SMALL_ICON:
-            m_gi->m_rectAll.x = x;
-            m_gi->m_rectAll.y = y;
-
-            if ( item->HasImage() )
-            {
-                m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 4 +
-                    (m_gi->m_rectAll.width - m_gi->m_rectIcon.width) / 2;
-                m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 4;
-            }
-
-            if ( item->HasText() )
-            {
-                if (m_gi->m_rectAll.width > spacing)
-                    m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2);
-                else
-                    m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2) + (spacing / 2) - (m_gi->m_rectLabel.width / 2);
-                m_gi->m_rectLabel.y = m_gi->m_rectAll.y + m_gi->m_rectAll.height + 2 - m_gi->m_rectLabel.height;
-                m_gi->m_rectHighlight.x = m_gi->m_rectLabel.x - 2;
-                m_gi->m_rectHighlight.y = m_gi->m_rectLabel.y - 2;
-            }
-            else // no text, highlight the icon
-            {
-                m_gi->m_rectHighlight.x = m_gi->m_rectIcon.x - 4;
-                m_gi->m_rectHighlight.y = m_gi->m_rectIcon.y - 4;
-            }
-            break;
-
-        case wxLC_LIST:
-            m_gi->m_rectAll.x = x;
-            m_gi->m_rectAll.y = y;
-
-            m_gi->m_rectHighlight.x = m_gi->m_rectAll.x;
-            m_gi->m_rectHighlight.y = m_gi->m_rectAll.y;
-            m_gi->m_rectLabel.y = m_gi->m_rectAll.y + 2;
-
-            if (item->HasImage())
-            {
-                m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 2;
-                m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 2;
-                m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 4 + (EXTRA_WIDTH/2) + m_gi->m_rectIcon.width;
-            }
-            else
-            {
-                m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2);
-            }
-            break;
-
-        case wxLC_REPORT:
-            wxFAIL_MSG( _T("unexpected call to SetPosition") );
-            break;
-
-        default:
-            wxFAIL_MSG( _T("unknown mode") );
-            break;
-    }
-}
-
-void wxListLineData::InitItems( int num )
-{
-    for (int i = 0; i < num; i++)
-        m_items.Append( new wxListItemData(m_owner) );
-}
-
-void wxListLineData::SetItem( int index, const wxListItem &info )
-{
-    wxListItemDataList::compatibility_iterator node = m_items.Item( index );
-    wxCHECK_RET( node, _T("invalid column index in SetItem") );
-
-    wxListItemData *item = node->GetData();
-    item->SetItem( info );
-}
-
-void wxListLineData::GetItem( int index, wxListItem &info )
-{
-    wxListItemDataList::compatibility_iterator node = m_items.Item( index );
-    if (node)
-    {
-        wxListItemData *item = node->GetData();
-        item->GetItem( info );
-    }
-}
-
-wxString wxListLineData::GetText(int index) const
-{
-    wxString s;
-
-    wxListItemDataList::compatibility_iterator node = m_items.Item( index );
-    if (node)
-    {
-        wxListItemData *item = node->GetData();
-        s = item->GetText();
-    }
-
-    return s;
-}
-
-void wxListLineData::SetText( int index, const wxString& s )
-{
-    wxListItemDataList::compatibility_iterator node = m_items.Item( index );
-    if (node)
-    {
-        wxListItemData *item = node->GetData();
-        item->SetText( s );
-    }
-}
-
-void wxListLineData::SetImage( int index, int image )
-{
-    wxListItemDataList::compatibility_iterator node = m_items.Item( index );
-    wxCHECK_RET( node, _T("invalid column index in SetImage()") );
-
-    wxListItemData *item = node->GetData();
-    item->SetImage(image);
-}
-
-int wxListLineData::GetImage( int index ) const
-{
-    wxListItemDataList::compatibility_iterator node = m_items.Item( index );
-    wxCHECK_MSG( node, -1, _T("invalid column index in GetImage()") );
-
-    wxListItemData *item = node->GetData();
-    return item->GetImage();
-}
-
-wxListItemAttr *wxListLineData::GetAttr() const
-{
-    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
-    wxCHECK_MSG( node, NULL, _T("invalid column index in GetAttr()") );
-
-    wxListItemData *item = node->GetData();
-    return item->GetAttr();
-}
-
-void wxListLineData::SetAttr(wxListItemAttr *attr)
-{
-    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
-    wxCHECK_RET( node, _T("invalid column index in SetAttr()") );
-
-    wxListItemData *item = node->GetData();
-    item->SetAttr(attr);
-}
-
-bool wxListLineData::SetAttributes(wxDC *dc,
-                                   const wxListItemAttr *attr,
-                                   bool highlighted)
-{
-    wxWindow *listctrl = m_owner->GetParent();
-
-    // fg colour
-
-    // don't use foreground colour for drawing highlighted items - this might
-    // make them completely invisible (and there is no way to do bit
-    // arithmetics on wxColour, unfortunately)
-    wxColour colText;
-    if ( highlighted )
-#ifdef __WXMAC__
-    {
-        if (m_owner->HasFocus()
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
-                && IsControlActive( (ControlRef)m_owner->GetHandle() )
-#endif
-        )
-            colText = *wxWHITE;
-        else
-            colText = *wxBLACK;
-    }
-#else
-        colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
-#endif
-    else if ( attr && attr->HasTextColour() )
-        colText = attr->GetTextColour();
-    else
-        colText = listctrl->GetForegroundColour();
-
-    dc->SetTextForeground(colText);
-
-    // font
-    wxFont font;
-    if ( attr && attr->HasFont() )
-        font = attr->GetFont();
-    else
-        font = listctrl->GetFont();
-
-    dc->SetFont(font);
-
-    // bg colour
-    bool hasBgCol = attr && attr->HasBackgroundColour();
-    if ( highlighted || hasBgCol )
-    {
-        if ( highlighted )
-            dc->SetBrush( m_owner->GetHighlightBrush() );
-        else
-            dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID)));
-
-        dc->SetPen( *wxTRANSPARENT_PEN );
-
-        return true;
-    }
-
-    return false;
-}
-
-void wxListLineData::Draw( wxDC *dc )
-{
-    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
-    wxCHECK_RET( node, _T("no subitems at all??") );
-
-    bool highlighted = IsHighlighted();
-
-    wxListItemAttr *attr = GetAttr();
-
-    if ( SetAttributes(dc, attr, highlighted) )
-#if ( !defined(__WXGTK2__) && !defined(__WXMAC__) )
-    {
-        dc->DrawRectangle( m_gi->m_rectHighlight );
-    }
-#else
-    {
-        if (highlighted)
-        {
-            int flags = wxCONTROL_SELECTED;
-            if (m_owner->HasFocus()
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
-                && IsControlActive( (ControlRef)m_owner->GetHandle() )
-#endif
-            )
-                flags |= wxCONTROL_FOCUSED;
-            wxRendererNative::Get().DrawItemSelectionRect( m_owner, *dc, m_gi->m_rectHighlight, flags );
-
-        }
-        else
-        {
-            dc->DrawRectangle( m_gi->m_rectHighlight );
-        }
-    }
-#endif
-
-    // just for debugging to better see where the items are
-#if 0
-    dc->SetPen(*wxRED_PEN);
-    dc->SetBrush(*wxTRANSPARENT_BRUSH);
-    dc->DrawRectangle( m_gi->m_rectAll );
-    dc->SetPen(*wxGREEN_PEN);
-    dc->DrawRectangle( m_gi->m_rectIcon );
-#endif
-
-    wxListItemData *item = node->GetData();
-    if (item->HasImage())
-    {
-        // centre the image inside our rectangle, this looks nicer when items
-        // ae aligned in a row
-        const wxRect& rectIcon = m_gi->m_rectIcon;
-
-        m_owner->DrawImage(item->GetImage(), dc, rectIcon.x, rectIcon.y);
-    }
-
-    if (item->HasText())
-    {
-        const wxRect& rectLabel = m_gi->m_rectLabel;
-
-        wxDCClipper clipper(*dc, rectLabel);
-        dc->DrawText(item->GetText(), rectLabel.x, rectLabel.y);
-    }
-}
-
-void wxListLineData::DrawInReportMode( wxDC *dc,
-                                       const wxRect& rect,
-                                       const wxRect& rectHL,
-                                       bool highlighted )
-{
-    // TODO: later we should support setting different attributes for
-    //       different columns - to do it, just add "col" argument to
-    //       GetAttr() and move these lines into the loop below
-    wxListItemAttr *attr = GetAttr();
-    if ( SetAttributes(dc, attr, highlighted) )
-#if ( !defined(__WXGTK2__) && !defined(__WXMAC__) )
-    {
-        dc->DrawRectangle( rectHL );
-    }
-#else
-    {
-        if (highlighted)
-        {
-            int flags = wxCONTROL_SELECTED;
-            if (m_owner->HasFocus()
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
-                && IsControlActive( (ControlRef)m_owner->GetHandle() )
-#endif
-            )
-                flags |= wxCONTROL_FOCUSED;
-            wxRendererNative::Get().DrawItemSelectionRect( m_owner, *dc, rectHL, flags );
-        }
-        else
-        {
-            dc->DrawRectangle( rectHL );
-        }
-    }
-#endif
-
-    wxCoord x = rect.x + HEADER_OFFSET_X,
-            yMid = rect.y + rect.height/2;
-#ifdef __WXGTK__
-    // This probably needs to be done
-    // on all platforms as the icons
-    // otherwise nearly touch the border
-    x += 2;
-#endif
-
-    size_t col = 0;
-    for ( wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
-          node;
-          node = node->GetNext(), col++ )
-    {
-        wxListItemData *item = node->GetData();
-
-        int width = m_owner->GetColumnWidth(col);
-        int xOld = x;
-        x += width;
-
-        if ( item->HasImage() )
-        {
-            int ix, iy;
-            m_owner->GetImageSize( item->GetImage(), ix, iy );
-            m_owner->DrawImage( item->GetImage(), dc, xOld, yMid - iy/2 );
-
-            ix += IMAGE_MARGIN_IN_REPORT_MODE;
-
-            xOld += ix;
-            width -= ix;
-        }
-
-        if ( item->HasText() )
-            DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, width - 8);
-    }
-}
-
-void wxListLineData::DrawTextFormatted(wxDC *dc,
-                                       const wxString& textOrig,
-                                       int col,
-                                       int x,
-                                       int yMid,
-                                       int width)
-{
-    // we don't support displaying multiple lines currently (and neither does
-    // wxMSW FWIW) so just merge all the lines
-    wxString text(textOrig);
-    text.Replace(_T("\n"), _T(" "));
-
-    wxCoord w, h;
-    dc->GetTextExtent(text, &w, &h);
-
-    const wxCoord y = yMid - (h + 1)/2;
-
-    wxDCClipper clipper(*dc, x, y, width, h);
-
-    // determine if the string can fit inside the current width
-    if (w <= width)
-    {
-        // it can, draw it using the items alignment
-        wxListItem item;
-        m_owner->GetColumn(col, item);
-        switch ( item.GetAlign() )
-        {
-            case wxLIST_FORMAT_LEFT:
-                // nothing to do
-                break;
-
-            case wxLIST_FORMAT_RIGHT:
-                x += width - w;
-                break;
-
-            case wxLIST_FORMAT_CENTER:
-                x += (width - w) / 2;
-                break;
-
-            default:
-                wxFAIL_MSG( _T("unknown list item format") );
-                break;
-        }
-
-        dc->DrawText(text, x, y);
-    }
-    else // otherwise, truncate and add an ellipsis if possible
-    {
-        // determine the base width
-        wxString ellipsis("...");
-        wxCoord base_w;
-        dc->GetTextExtent(ellipsis, &base_w, &h);
-
-        // continue until we have enough space or only one character left
-        wxCoord w_c, h_c;
-        size_t len = text.length();
-        wxString drawntext = text.Left(len);
-        while (len > 1)
-        {
-            dc->GetTextExtent(drawntext.Last(), &w_c, &h_c);
-            drawntext.RemoveLast();
-            len--;
-            w -= w_c;
-            if (w + base_w <= width)
-                break;
-        }
-
-        // if still not enough space, remove ellipsis characters
-        while (ellipsis.length() > 0 && w + base_w > width)
-        {
-            ellipsis = ellipsis.Left(ellipsis.length() - 1);
-            dc->GetTextExtent(ellipsis, &base_w, &h);
-        }
-
-        // now draw the text
-        dc->DrawText(drawntext, x, y);
-        dc->DrawText(ellipsis, x + w, y);
-    }
-}
-
-bool wxListLineData::Highlight( bool on )
-{
-    wxCHECK_MSG( !IsVirtual(), false, _T("unexpected call to Highlight") );
-
-    if ( on == m_highlighted )
-        return false;
-
-    m_highlighted = on;
-
-    return true;
-}
-
-void wxListLineData::ReverseHighlight( void )
-{
-    Highlight(!IsHighlighted());
-}
-
-//-----------------------------------------------------------------------------
-//  wxListHeaderWindow
-//-----------------------------------------------------------------------------
-
-wxBEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
-    EVT_PAINT         (wxListHeaderWindow::OnPaint)
-    EVT_MOUSE_EVENTS  (wxListHeaderWindow::OnMouse)
-    EVT_SET_FOCUS     (wxListHeaderWindow::OnSetFocus)
-wxEND_EVENT_TABLE()
-
-void wxListHeaderWindow::Init()
-{
-    m_currentCursor = (wxCursor *) NULL;
-    m_isDragging = false;
-    m_dirty = false;
-}
-
-wxListHeaderWindow::wxListHeaderWindow()
-{
-    Init();
-
-    m_owner = (wxListMainWindow *) NULL;
-    m_resizeCursor = (wxCursor *) NULL;
-}
-
-wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,
-                                        wxWindowID id,
-                                        wxListMainWindow *owner,
-                                        const wxPoint& pos,
-                                        const wxSize& size,
-                                        long style,
-                                        const wxString &name )
-                  : wxWindow( win, id, pos, size, style, name )
-{
-    Init();
-
-    m_owner = owner;
-    m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
-
-#if _USE_VISATTR
-    wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();
-    SetOwnForegroundColour( attr.colFg );
-    SetOwnBackgroundColour( attr.colBg );
-    if (!m_hasFont)
-        SetOwnFont( attr.font );
-#else
-    SetOwnForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
-    SetOwnBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
-    if (!m_hasFont)
-        SetOwnFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT ));
-#endif
-}
-
-wxListHeaderWindow::~wxListHeaderWindow()
-{
-    delete m_resizeCursor;
-}
-
-#ifdef __WXUNIVERSAL__
-#include <wx/univ/renderer.h>
-#include <wx/univ/theme.h>
-#endif
-
-// shift the DC origin to match the position of the main window horz
-// scrollbar: this allows us to always use logical coords
-void wxListHeaderWindow::AdjustDC(wxDC& dc)
-{
-    int xpix;
-    m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
-
-    int view_start;
-    m_owner->GetViewStart( &view_start, NULL );
-
-
-    int org_x = 0;
-    int org_y = 0;
-    dc.GetDeviceOrigin( &org_x, &org_y );
-
-    // account for the horz scrollbar offset
-#ifdef __WXGTK__
-    if (GetLayoutDirection() == wxLayout_RightToLeft)
-    {
-        // Maybe we just have to check for m_signX
-        // in the DC, but I leave the #ifdef __WXGTK__
-        // for now
-        dc.SetDeviceOrigin( org_x + (view_start * xpix), org_y );
-    }
-    else
-#endif
-        dc.SetDeviceOrigin( org_x - (view_start * xpix), org_y );
-}
-
-void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
-{
-    wxPaintDC dc( this );
-
-    PrepareDC( dc );
-    AdjustDC( dc );
-
-    dc.SetFont( GetFont() );
-
-    // width and height of the entire header window
-    int w, h;
-    GetClientSize( &w, &h );
-    m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
-
-    dc.SetBackgroundMode(wxTRANSPARENT);
-    dc.SetTextForeground(GetForegroundColour());
-
-    int x = HEADER_OFFSET_X;
-    int numColumns = m_owner->GetColumnCount();
-    wxListItem item;
-    for ( int i = 0; i < numColumns && x < w; i++ )
-    {
-        m_owner->GetColumn( i, item );
-        int wCol = item.m_width;
-
-        int cw = wCol;
-        int ch = h;
-
-        int flags = 0;
-        if (!m_parent->IsEnabled())
-            flags |= wxCONTROL_DISABLED;
-
-// NB: The code below is not really Mac-specific, but since we are close
-// to 2.8 release and I don't have time to test on other platforms, I
-// defined this only for wxMac. If this behavior is desired on
-// other platforms, please go ahead and revise or remove the #ifdef.
-#ifdef __WXMAC__
-        if ( !m_owner->IsVirtual() && (item.m_mask & wxLIST_MASK_STATE) &&
-                (item.m_state & wxLIST_STATE_SELECTED) )
-            flags |= wxCONTROL_SELECTED;
-#endif
-
-        wxRendererNative::Get().DrawHeaderButton
-                                (
-                                    this,
-                                    dc,
-                                    wxRect(x, HEADER_OFFSET_Y, cw, ch),
-                                    flags
-                                );
-
-        // see if we have enough space for the column label
-
-        // for this we need the width of the text
-        wxCoord wLabel;
-        wxCoord hLabel;
-        dc.GetTextExtent(item.GetText(), &wLabel, &hLabel);
-        wLabel += 2 * EXTRA_WIDTH;
-
-        // and the width of the icon, if any
-        int ix = 0, iy = 0;    // init them just to suppress the compiler warnings
-        const int image = item.m_image;
-        wxImageList *imageList;
-        if ( image != -1 )
-        {
-            imageList = m_owner->m_small_image_list;
-            if ( imageList )
-            {
-                imageList->GetSize(image, ix, iy);
-                wLabel += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE;
-            }
-        }
-        else
-        {
-            imageList = NULL;
-        }
-
-        // ignore alignment if there is not enough space anyhow
-        int xAligned;
-        switch ( wLabel < cw ? item.GetAlign() : wxLIST_FORMAT_LEFT )
-        {
-            default:
-                wxFAIL_MSG( _T("unknown list item format") );
-                // fall through
-
-            case wxLIST_FORMAT_LEFT:
-                xAligned = x;
-                break;
-
-            case wxLIST_FORMAT_RIGHT:
-                xAligned = x + cw - wLabel;
-                break;
-
-            case wxLIST_FORMAT_CENTER:
-                xAligned = x + (cw - wLabel) / 2;
-                break;
-        }
-
-        // draw the text and image clipping them so that they
-        // don't overwrite the column boundary
-        wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h  );
-
-        // if we have an image, draw it on the right of the label
-        if ( imageList )
-        {
-            imageList->Draw
-                       (
-                        image,
-                        dc,
-                        xAligned + wLabel - ix - HEADER_IMAGE_MARGIN_IN_REPORT_MODE,
-                        HEADER_OFFSET_Y + (h - 4 - iy)/2,
-                        wxIMAGELIST_DRAW_TRANSPARENT
-                       );
-        }
-
-        dc.DrawText( item.GetText(),
-                     xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT );
-
-        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()
-{
-#if 1
-    m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
-#else
-    int x1 = m_currentX;
-    int y1 = 0;
-    m_owner->ClientToScreen( &x1, &y1 );
-
-    int x2 = m_currentX;
-    int y2 = 0;
-    m_owner->GetClientSize( NULL, &y2 );
-    m_owner->ClientToScreen( &x2, &y2 );
-
-    wxScreenDC dc;
-    dc.SetLogicalFunction( wxINVERT );
-    dc.SetPen( *(wxThePenList->FindOrCreatePen(*wxBLACK, 2, wxSOLID ) ));
-    dc.SetBrush( *wxTRANSPARENT_BRUSH );
-
-    AdjustDC(dc);
-
-    dc.DrawLine( x1, y1, x2, y2 );
-
-    dc.SetLogicalFunction( wxCOPY );
-
-    dc.SetPen( wxNullPen );
-    dc.SetBrush( wxNullBrush );
-#endif
-}
-
-void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
-{
-    // we want to work with logical coords
-    int x;
-    m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL);
-    int y = event.GetY();
-
-    if (m_isDragging)
-    {
-        SendListEvent(wxEVT_LIST_COL_DRAGGING, event.GetPosition());
-
-        // we don't draw the line beyond our window, but we allow dragging it
-        // there
-        int w = 0;
-        GetClientSize( &w, NULL );
-        m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
-        w -= 6;
-
-        // erase the line if it was drawn
-        if ( m_currentX < w )
-            DrawCurrent();
-
-        if (event.ButtonUp())
-        {
-            ReleaseMouse();
-            m_isDragging = false;
-            m_dirty = true;
-            m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
-            SendListEvent(wxEVT_LIST_COL_END_DRAG, event.GetPosition());
-        }
-        else
-        {
-            if (x > m_minX + 7)
-                m_currentX = x;
-            else
-                m_currentX = m_minX + 7;
-
-            // draw in the new location
-            if ( m_currentX < w )
-                DrawCurrent();
-        }
-    }
-    else // not dragging
-    {
-        m_minX = 0;
-        bool hit_border = false;
-
-        // end of the current column
-        int xpos = 0;
-
-        // find the column where this event occurred
-        int col,
-            countCol = m_owner->GetColumnCount();
-        for (col = 0; col < countCol; col++)
-        {
-            xpos += m_owner->GetColumnWidth( col );
-            m_column = col;
-
-            if ( (abs(x-xpos) < 3) && (y < 22) )
-            {
-                // near the column border
-                hit_border = true;
-                break;
-            }
-
-            if ( x < xpos )
-            {
-                // inside the column
-                break;
-            }
-
-            m_minX = xpos;
-        }
-
-        if ( col == countCol )
-            m_column = -1;
-
-        if (event.LeftDown() || event.RightUp())
-        {
-            if (hit_border && event.LeftDown())
-            {
-                if ( SendListEvent(wxEVT_LIST_COL_BEGIN_DRAG,
-                                   event.GetPosition()) )
-                {
-                    m_isDragging = true;
-                    m_currentX = x;
-                    CaptureMouse();
-                    DrawCurrent();
-                }
-                //else: column resizing was vetoed by the user code
-            }
-            else // click on a column
-            {
-                // record the selected state of the columns
-                if (event.LeftDown())
-                {
-                    for (int i=0; i < m_owner->GetColumnCount(); i++)
-                    {
-                        wxListItem colItem;
-                        m_owner->GetColumn(i, colItem);
-                        long state = colItem.GetState();
-                        if (i == m_column)
-                            colItem.SetState(state | wxLIST_STATE_SELECTED);
-                        else
-                            colItem.SetState(state & ~wxLIST_STATE_SELECTED);
-                        m_owner->SetColumn(i, colItem);
-                    }
-                }
-
-                SendListEvent( event.LeftDown()
-                                    ? wxEVT_LIST_COL_CLICK
-                                    : wxEVT_LIST_COL_RIGHT_CLICK,
-                                event.GetPosition());
-            }
-        }
-        else if (event.Moving())
-        {
-            bool setCursor;
-            if (hit_border)
-            {
-                setCursor = m_currentCursor == wxSTANDARD_CURSOR;
-                m_currentCursor = m_resizeCursor;
-            }
-            else
-            {
-                setCursor = m_currentCursor != wxSTANDARD_CURSOR;
-                m_currentCursor = wxSTANDARD_CURSOR;
-            }
-
-            if ( setCursor )
-                SetCursor(*m_currentCursor);
-        }
-    }
-}
-
-void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
-{
-    m_owner->SetFocus();
-    m_owner->Update();
-}
-
-bool wxListHeaderWindow::SendListEvent(wxEventType type, const wxPoint& pos)
-{
-    wxWindow *parent = GetParent();
-    wxListEvent le( type, parent->GetId() );
-    le.SetEventObject( parent );
-    le.m_pointDrag = pos;
-
-    // the position should be relative to the parent window, not
-    // this one for compatibility with MSW and common sense: the
-    // user code doesn't know anything at all about this header
-    // window, so why should it get positions relative to it?
-    le.m_pointDrag.y -= GetSize().y;
-
-    le.m_col = m_column;
-    return !parent->GetEventHandler()->ProcessEvent( le ) || le.IsAllowed();
-}
-
-//-----------------------------------------------------------------------------
-// wxListRenameTimer (internal)
-//-----------------------------------------------------------------------------
-
-wxListRenameTimer::wxListRenameTimer( wxListMainWindow *owner )
-{
-    m_owner = owner;
-}
-
-void wxListRenameTimer::Notify()
-{
-    m_owner->OnRenameTimer();
-}
-
-//-----------------------------------------------------------------------------
-// wxListTextCtrlWrapper (internal)
-//-----------------------------------------------------------------------------
-
-wxBEGIN_EVENT_TABLE(wxListTextCtrlWrapper, wxEvtHandler)
-    EVT_CHAR           (wxListTextCtrlWrapper::OnChar)
-    EVT_KEY_UP         (wxListTextCtrlWrapper::OnKeyUp)
-    EVT_KILL_FOCUS     (wxListTextCtrlWrapper::OnKillFocus)
-wxEND_EVENT_TABLE()
-
-wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner,
-                                             wxTextCtrl *text,
-                                             size_t itemEdit)
-              : m_startValue(owner->GetItemText(itemEdit)),
-                m_itemEdited(itemEdit)
-{
-    m_owner = owner;
-    m_text = text;
-    m_finished = false;
-    m_aboutToFinish = false;
-
-    wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
-
-    m_owner->CalcScrolledPosition(rectLabel.x, rectLabel.y,
-                                  &rectLabel.x, &rectLabel.y);
-
-    m_text->Create(owner, wxID_ANY, m_startValue,
-                   wxPoint(rectLabel.x-4,rectLabel.y-4),
-                   wxSize(rectLabel.width+11,rectLabel.height+8));
-    m_text->SetFocus();
-
-    m_text->PushEventHandler(this);
-}
-
-void wxListTextCtrlWrapper::Finish()
-{
-    if ( !m_finished )
-    {
-        m_finished = true;
-
-        m_text->RemoveEventHandler(this);
-        m_owner->FinishEditing(m_text);
-
-        wxPendingDelete.Append( this );
-    }
-}
-
-bool wxListTextCtrlWrapper::AcceptChanges()
-{
-    const wxString value = m_text->GetValue();
-
-    // notice that we should always call OnRenameAccept() to generate the "end
-    // label editing" event, even if the user hasn't really changed anything
-    if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
-    {
-        // vetoed by the user
-        return false;
-    }
-
-    // accepted, do rename the item (unless nothing changed)
-    if ( value != m_startValue )
-        m_owner->SetItemText(m_itemEdited, value);
-
-    return true;
-}
-
-void wxListTextCtrlWrapper::AcceptChangesAndFinish()
-{
-    m_aboutToFinish = true;
-
-    // Notify the owner about the changes
-    AcceptChanges();
-
-    // Even if vetoed, close the control (consistent with MSW)
-    Finish();
-}
-
-void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event )
-{
-    switch ( event.m_keyCode )
-    {
-        case WXK_RETURN:
-            AcceptChangesAndFinish();
-            break;
-
-        case WXK_ESCAPE:
-            m_owner->OnRenameCancelled( m_itemEdited );
-            Finish();
-            break;
-
-        default:
-            event.Skip();
-    }
-}
-
-void wxListTextCtrlWrapper::OnKeyUp( wxKeyEvent &event )
-{
-    if (m_finished)
-    {
-        event.Skip();
-        return;
-    }
-
-    // auto-grow the textctrl:
-    wxSize parentSize = m_owner->GetSize();
-    wxPoint myPos = m_text->GetPosition();
-    wxSize mySize = m_text->GetSize();
-    int sx, sy;
-    m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &sx, &sy);
-    if (myPos.x + sx > parentSize.x)
-        sx = parentSize.x - myPos.x;
-    if (mySize.x > sx)
-        sx = mySize.x;
-    m_text->SetSize(sx, wxDefaultCoord);
-
-    event.Skip();
-}
-
-void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )
-{
-    if ( !m_finished && !m_aboutToFinish )
-    {
-        if ( !AcceptChanges() )
-            m_owner->OnRenameCancelled( m_itemEdited );
-
-        Finish();
-    }
-
-    // We must let the native text control handle focus
-    event.Skip();
-}
-
-//-----------------------------------------------------------------------------
-//  wxListMainWindow
-//-----------------------------------------------------------------------------
-
-wxBEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
-  EVT_PAINT          (wxListMainWindow::OnPaint)
-  EVT_ERASE_BACKGROUND (wxListMainWindow::OnErase)
-  EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
-  EVT_CHAR           (wxListMainWindow::OnChar)
-  EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
-  EVT_KEY_UP         (wxListMainWindow::OnKeyUp)
-  EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
-  EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
-  EVT_SCROLLWIN      (wxListMainWindow::OnScroll)
-  EVT_CHILD_FOCUS    (wxListMainWindow::OnChildFocus)
-wxEND_EVENT_TABLE()
-
-void wxListMainWindow::Init()
-{
-    m_dirty = true;
-    m_dataIndexDirty = false;
-    m_countVirt = 0;
-    m_lineFrom =
-    m_lineTo = (size_t)-1;
-    m_linesPerPage = 0;
-
-    m_headerWidth =
-    m_lineHeight = 0;
-
-    m_small_image_list = (wxImageList *) NULL;
-    m_normal_image_list = (wxImageList *) NULL;
-
-    m_small_spacing = 30;
-    m_normal_spacing = 40;
-
-    m_hasFocus = false;
-    m_dragCount = 0;
-    m_isCreated = false;
-
-    m_lastOnSame = false;
-    m_renameTimer = new wxListRenameTimer( this );
-    m_textctrlWrapper = NULL;
-
-    m_current =
-    m_lineLastClicked =
-    m_lineSelectSingleOnUp =
-    m_lineBeforeLastClicked = (size_t)-1;
-
-    m_freezeCount = 0;
-}
-
-wxListMainWindow::wxListMainWindow()
-{
-    Init();
-}
-
-wxListMainWindow::wxListMainWindow( wxWindow *parent,
-                                    wxWindowID id,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    const wxString &name )
-                : wxScrolledWindow( parent, id, pos, size,
-                                    style | wxHSCROLL | wxVSCROLL, name )
-{
-    Init();
-
-    m_highlightBrush = *(wxTheBrushList->FindOrCreateBrush(
-                            wxSystemSettings::GetColour
-                            (
-                                wxSYS_COLOUR_HIGHLIGHT
-                            ),
-                            wxBRUSHSTYLE_SOLID
-                         ));
-
-    // SYS_COLOUR_BTNSHADOW happens to equal SYS_COLOUR_LISTBOX on
-    // some Mate/Cinnamon themes (TraditionalOk, Menta) which makes
-    // an unfocused selection render invisible white-on-white (#640).
-    // Mix HIGHLIGHT 50/50 with LISTBOX so the unfocused selection
-    // always contrasts against the listbox background while still
-    // looking distinctly muted vs. the focused selection.
-    {
-        const wxColour _hl = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
-        const wxColour _lb = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
-        const wxColour _unfocused(
-            (_hl.Red()   + _lb.Red())   / 2,
-            (_hl.Green() + _lb.Green()) / 2,
-            (_hl.Blue()  + _lb.Blue())  / 2);
-        m_highlightUnfocusedBrush = *(wxTheBrushList->FindOrCreateBrush(
-                                     _unfocused, wxBRUSHSTYLE_SOLID));
-    }
-
-    SetScrollbars( 0, 0, 0, 0, 0, 0 );
-
-    wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes();
-    SetOwnForegroundColour( attr.colFg );
-    SetOwnBackgroundColour( attr.colBg );
-    if (!m_hasFont)
-        SetOwnFont( attr.font );
-}
-
-wxListMainWindow::~wxListMainWindow()
-{
-    DoDeleteAllItems();
-    WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
-    WX_CLEAR_ARRAY(m_aColWidths);
-
-    delete m_renameTimer;
-}
-
-void wxListMainWindow::CacheLineData(size_t line)
-{
-    wxGenericListCtrl *listctrl = GetListCtrl();
-
-    wxListLineData *ld = GetDummyLine();
-
-    size_t countCol = GetColumnCount();
-    for ( size_t col = 0; col < countCol; col++ )
-    {
-        ld->SetText(col, listctrl->OnGetItemText(line, col));
-        ld->SetImage(col, listctrl->OnGetItemColumnImage(line, col));
-    }
-
-    ld->SetAttr(listctrl->OnGetItemAttr(line));
-}
-
-wxListLineData *wxListMainWindow::GetDummyLine() const
-{
-    wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );
-    wxASSERT_MSG( IsVirtual(), _T("GetDummyLine() shouldn't be called") );
-
-    wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
-
-    // we need to recreate the dummy line if the number of columns in the
-    // control changed as it would have the incorrect number of fields
-    // otherwise
-    if ( !m_lines.IsEmpty() &&
-            m_lines0.m_items.GetCount() != (size_t)GetColumnCount() )
-    {
-        self->m_lines.Clear();
-    }
-
-    if ( m_lines.IsEmpty() )
-    {
-        wxListLineData *line = new wxListLineData(self);
-        self->m_lines.Add(line);
-
-        // don't waste extra memory -- there never going to be anything
-        // else/more in this array
-        self->m_lines.Shrink();
-    }
-
-    return &m_lines0;
-}
-
-// ----------------------------------------------------------------------------
-// line geometry (report mode only)
-// ----------------------------------------------------------------------------
-
-wxCoord wxListMainWindow::GetLineHeight() const
-{
-    // we cache the line height as calling GetTextExtent() is slow
-    if ( !m_lineHeight )
-    {
-        wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
-
-        wxClientDC dc( self );
-        dc.SetFont( GetFont() );
-
-        wxCoord y;
-        dc.GetTextExtent(_T("H"), NULL, &y);
-
-        if ( m_small_image_list && m_small_image_list->GetImageCount() )
-        {
-            int iw = 0, ih = 0;
-            m_small_image_list->GetSize(0, iw, ih);
-            y = wxMax(y, ih);
-        }
-
-        y += EXTRA_HEIGHT;
-        self->m_lineHeight = y + LINE_SPACING;
-    }
-
-    return m_lineHeight;
-}
-
-wxCoord wxListMainWindow::GetLineY(size_t line) const
-{
-    wxASSERT_MSG( InReportView(), _T("only works in report mode") );
-
-    return LINE_SPACING + line * GetLineHeight();
-}
-
-wxRect wxListMainWindow::GetLineRect(size_t line) const
-{
-    if ( !InReportView() )
-        return GetLine(line)->m_gi->m_rectAll;
-
-    wxRect rect;
-    rect.x = HEADER_OFFSET_X;
-    rect.y = GetLineY(line);
-    rect.width = GetHeaderWidth();
-    rect.height = GetLineHeight();
-
-    return rect;
-}
-
-wxRect wxListMainWindow::GetLineLabelRect(size_t line) const
-{
-    if ( !InReportView() )
-        return GetLine(line)->m_gi->m_rectLabel;
-
-    int image_x = 0;
-    wxListLineData *data = GetLine(line);
-    wxListItemDataList::compatibility_iterator node = data->m_items.GetFirst();
-    if (node)
-    {
-        wxListItemData *item = node->GetData();
-        if ( item->HasImage() )
-        {
-            int ix, iy;
-            GetImageSize( item->GetImage(), ix, iy );
-            image_x = 3 + ix + IMAGE_MARGIN_IN_REPORT_MODE;
-        }
-    }
-
-    wxRect rect;
-    rect.x = image_x + HEADER_OFFSET_X;
-    rect.y = GetLineY(line);
-    rect.width = GetColumnWidth(0) - image_x;
-    rect.height = GetLineHeight();
-
-    return rect;
-}
-
-wxRect wxListMainWindow::GetLineIconRect(size_t line) const
-{
-    if ( !InReportView() )
-        return GetLine(line)->m_gi->m_rectIcon;
-
-    wxListLineData *ld = GetLine(line);
-    wxASSERT_MSG( ld->HasImage(), _T("should have an image") );
-
-    wxRect rect;
-    rect.x = HEADER_OFFSET_X;
-    rect.y = GetLineY(line);
-    GetImageSize(ld->GetImage(), rect.width, rect.height);
-
-    return rect;
-}
-
-wxRect wxListMainWindow::GetLineHighlightRect(size_t line) const
-{
-    return InReportView() ? GetLineRect(line)
-                          : GetLine(line)->m_gi->m_rectHighlight;
-}
-
-long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
-{
-    wxASSERT_MSG( line < GetItemCount(), _T("invalid line in HitTestLine") );
-
-    wxListLineData *ld = GetLine(line);
-
-    if ( ld->HasImage() && GetLineIconRect(line).Contains(x, y) )
-        return wxLIST_HITTEST_ONITEMICON;
-
-    // VS: Testing for "ld->HasText() || InReportView()" instead of
-    //     "ld->HasText()" is needed to make empty lines in report view
-    //     possible
-    if ( ld->HasText() || InReportView() )
-    {
-        wxRect rect = InReportView() ? GetLineRect(line)
-                                     : GetLineLabelRect(line);
-
-        if ( rect.Contains(x, y) )
-            return wxLIST_HITTEST_ONITEMLABEL;
-    }
-
-    return 0;
-}
-
-// ----------------------------------------------------------------------------
-// highlight (selection) handling
-// ----------------------------------------------------------------------------
-
-bool wxListMainWindow::IsHighlighted(size_t line) const
-{
-    if ( IsVirtual() )
-    {
-        return m_selStore.IsSelected(line);
-    }
-    else // !virtual
-    {
-        wxListLineData *ld = GetLine(line);
-        wxCHECK_MSG( ld, false, _T("invalid index in IsHighlighted") );
-
-        return ld->IsHighlighted();
-    }
-}
-
-void wxListMainWindow::HighlightLines( size_t lineFrom,
-                                       size_t lineTo,
-                                       bool highlight )
-{
-    if ( IsVirtual() )
-    {
-        wxArrayInt linesChanged;
-        if ( !m_selStore.SelectRange(lineFrom, lineTo, highlight,
-                                     &linesChanged) )
-        {
-            // many items changed state, refresh everything
-            RefreshLines(lineFrom, lineTo);
-        }
-        else // only a few items changed state, refresh only them
-        {
-            size_t count = linesChanged.GetCount();
-            for ( size_t n = 0; n < count; n++ )
-            {
-                RefreshLine(linesChangedn);
-            }
-        }
-    }
-    else // iterate over all items in non report view
-    {
-        for ( size_t line = lineFrom; line <= lineTo; line++ )
-        {
-            if ( HighlightLine(line, highlight) )
-                RefreshLine(line);
-        }
-    }
-}
-
-bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
-{
-    bool changed;
-
-    if ( IsVirtual() )
-    {
-        changed = m_selStore.SelectItem(line, highlight);
-    }
-    else // !virtual
-    {
-        wxListLineData *ld = GetLine(line);
-        wxCHECK_MSG( ld, false, _T("invalid index in HighlightLine") );
-
-        changed = ld->Highlight(highlight);
-    }
-
-    if ( changed )
-    {
-        SendNotify( line, highlight ? wxEVT_LIST_ITEM_SELECTED
-                                    : wxEVT_LIST_ITEM_DESELECTED );
-    }
-
-    return changed;
-}
-
-void wxListMainWindow::RefreshLine( size_t line )
-{
-    if ( InReportView() )
-    {
-        size_t visibleFrom, visibleTo;
-        GetVisibleLinesRange(&visibleFrom, &visibleTo);
-
-        if ( line < visibleFrom || line > visibleTo )
-            return;
-    }
-
-    wxRect rect = GetLineRect(line);
-
-    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-    RefreshRect( rect );
-}
-
-void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
-{
-    // we suppose that they are ordered by caller
-    wxASSERT_MSG( lineFrom <= lineTo, _T("indices in disorder") );
-
-    wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") );
-
-    if ( InReportView() )
-    {
-        size_t visibleFrom, visibleTo;
-        GetVisibleLinesRange(&visibleFrom, &visibleTo);
-
-        // Skip the refresh entirely when the requested range is fully
-        // outside the visible range. The clamp below assumes overlap;
-        // without this guard, a request strictly above visibleFrom or
-        // strictly below visibleTo leaves lineFrom > lineTo, and
-        // GetLineY(lineTo) - GetLineY(lineFrom) goes negative -- which
-        // wxRect::height (int) wraps to a near-2^32 value when cairo
-        // later reads it as unsigned.
-        if ( lineFrom > visibleTo || lineTo < visibleFrom )
-            return;
-
-        if ( lineFrom < visibleFrom )
-            lineFrom = visibleFrom;
-        if ( lineTo > visibleTo )
-            lineTo = visibleTo;
-
-        wxRect rect;
-        rect.x = 0;
-        rect.y = GetLineY(lineFrom);
-        rect.width = GetClientSize().x;
-        rect.height = GetLineY(lineTo) - rect.y + GetLineHeight();
-
-        CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-        RefreshRect( rect );
-    }
-    else // !report
-    {
-        // TODO: this should be optimized...
-        for ( size_t line = lineFrom; line <= lineTo; line++ )
-        {
-            RefreshLine(line);
-        }
-    }
-}
-
-void wxListMainWindow::RefreshAfter( size_t lineFrom )
-{
-    if ( InReportView() )
-    {
-        size_t visibleFrom, visibleTo;
-        GetVisibleLinesRange(&visibleFrom, &visibleTo);
-
-        if ( lineFrom < visibleFrom )
-            lineFrom = visibleFrom;
-        else if ( lineFrom > visibleTo )
-            return;
-
-        wxRect rect;
-        rect.x = 0;
-        rect.y = GetLineY(lineFrom);
-        CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-
-        wxSize size = GetClientSize();
-        rect.width = size.x;
-
-        // refresh till the bottom of the window
-        rect.height = size.y - rect.y;
-
-        RefreshRect( rect );
-    }
-    else // !report
-    {
-        // TODO: how to do it more efficiently?
-        m_dirty = true;
-    }
-}
-
-void wxListMainWindow::RefreshSelected()
-{
-    if ( IsEmpty() )
-        return;
-
-    size_t from, to;
-    if ( InReportView() )
-    {
-        GetVisibleLinesRange(&from, &to);
-    }
-    else // !virtual
-    {
-        from = 0;
-        to = GetItemCount() - 1;
-    }
-
-    if ( HasCurrent() && m_current >= from && m_current <= to )
-        RefreshLine(m_current);
-
-    for ( size_t line = from; line <= to; line++ )
-    {
-        // NB: the test works as expected even if m_current == -1
-        if ( line != m_current && IsHighlighted(line) )
-            RefreshLine(line);
-    }
-}
-
-void wxListMainWindow::Freeze()
-{
-    m_freezeCount++;
-}
-
-void wxListMainWindow::Thaw()
-{
-    wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen list control?") );
-
-    if ( --m_freezeCount == 0 )
-        Refresh();
-}
-
-void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
-{
-    // Note: a wxPaintDC must be constructed even if no drawing is
-    // done (a Windows requirement).
-    wxBufferedPaintDC dc( this );
-
-    // Force LTR text rendering for cell content. Under an RTL primary locale
-    // (LC_ALL=fa_IR.UTF-8, etc.) wxGTK propagates wxLayout_RightToLeft to the
-    // DC, which mirrors the coordinate system: every DrawText then draws
-    // glyphs flipped horizontally, turning "Ubuntu" into "utnubU". File names
-    // and other tabular cell data are not natural-language paragraphs — they
-    // should render in script order regardless of the surrounding GUI's bidi
-    // layout, so override the DC's direction explicitly. See amule issue #418.
-    dc.SetLayoutDirection(wxLayout_LeftToRight);
-
-    // 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), wxBRUSHSTYLE_SOLID)));
-
-    // 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;
-
-    if ( m_dirty )
-        // delay the repainting until we calculate all the items positions
-        return;
-
-    PrepareDC( dc );
-
-    // IsEmpty is checked now, after clearing, to avoid garbage on empty lists.
-    if ( IsEmpty() ) {
-        return;
-    }
-
-    int dev_x, dev_y;
-    CalcScrolledPosition( 0, 0, &dev_x, &dev_y );
-
-    dc.SetFont( GetFont() );
-
-    if ( InReportView() )
-    {
-        int lineHeight = GetLineHeight();
-
-        size_t visibleFrom, visibleTo;
-        GetVisibleLinesRange(&visibleFrom, &visibleTo);
-
-        wxRect rectLine;
-        int xOrig = dc.LogicalToDeviceX( 0 );
-        int yOrig = dc.LogicalToDeviceY( 0 );
-
-        // tell the caller cache to cache the data
-        if ( IsVirtual() )
-        {
-            wxListEvent evCache(wxEVT_LIST_CACHE_HINT,
-                                GetParent()->GetId());
-            evCache.SetEventObject( GetParent() );
-            evCache.m_oldItemIndex = visibleFrom;
-            evCache.m_itemIndex = visibleTo;
-            GetParent()->GetEventHandler()->ProcessEvent( evCache );
-        }
-
-        for ( size_t line = visibleFrom; line <= visibleTo; line++ )
-        {
-            rectLine = GetLineRect(line);
-
-
-            if ( !IsExposed(rectLine.x + xOrig, rectLine.y + yOrig,
-                            rectLine.width, rectLine.height) )
-            {
-                // don't redraw unaffected lines to avoid flicker
-                continue;
-            }
-
-	    if (HasFlag(wxLC_OWNERDRAW)) {
-		    ((wxGenericListCtrl*)m_parent)->OnDrawItem(line, &dc, rectLine, GetLineHighlightRect(line), IsHighlighted(line));
-	    } else {
-		    GetLine(line)->DrawInReportMode( &dc,
-						     rectLine,
-						     GetLineHighlightRect(line),
-						     IsHighlighted(line) );
-	    }
-        }
-
-        if ( HasFlag(wxLC_HRULES) )
-        {
-            wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxPENSTYLE_SOLID));
-            wxSize clientSize = GetClientSize();
-
-            size_t i = visibleFrom;
-            if (i == 0) i = 1; // Don't draw the first one
-            for ( ; i <= visibleTo; i++ )
-            {
-                dc.SetPen(pen);
-                dc.SetBrush( *wxTRANSPARENT_BRUSH );
-                dc.DrawLine(0 - dev_x, i * lineHeight,
-                            clientSize.x - dev_x, i * lineHeight);
-            }
-
-            // Draw last horizontal rule
-            if ( visibleTo == GetItemCount() - 1 )
-            {
-                dc.SetPen( pen );
-                dc.SetBrush( *wxTRANSPARENT_BRUSH );
-                dc.DrawLine(0 - dev_x, (m_lineTo + 1) * lineHeight,
-                            clientSize.x - dev_x , (m_lineTo + 1) * lineHeight );
-            }
-        }
-
-        // Draw vertical rules if required
-        if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
-        {
-            wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxPENSTYLE_SOLID));
-            wxRect firstItemRect, lastItemRect;
-
-            GetItemRect(visibleFrom, firstItemRect);
-            GetItemRect(visibleTo, lastItemRect);
-            int x = firstItemRect.GetX();
-            dc.SetPen(pen);
-            dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
-            for (int col = 0; col < GetColumnCount(); col++)
-            {
-                int colWidth = GetColumnWidth(col);
-                x += colWidth;
-                int x_pos = x - dev_x;
-                if (col < GetColumnCount()-1) x_pos -= 2;
-                dc.DrawLine(x_pos, firstItemRect.GetY() - 1 - dev_y,
-                            x_pos, lastItemRect.GetBottom() + 1 - dev_y);
-            }
-        }
-    }
-    else // !report
-    {
-        size_t count = GetItemCount();
-        for ( size_t i = 0; i < count; i++ )
-        {
-            GetLine(i)->Draw( &dc );
-        }
-    }
-
-#ifndef __WXMAC__
-    // Don't draw rect outline under Mac at all.
-    if ( HasCurrent() )
-    {
-        if ( m_hasFocus )
-        {
-            wxRect rect( GetLineHighlightRect( m_current ) );
-#ifndef __WXGTK2__
-            dc.SetPen( *wxBLACK_PEN );
-            dc.SetBrush( *wxTRANSPARENT_BRUSH );
-            dc.DrawRectangle( rect );
-#else
-            wxRendererNative::Get().DrawItemSelectionRect( this, dc, rect, wxCONTROL_CURRENT|wxCONTROL_FOCUSED );
-
-#endif
-        }
-    }
-#endif
-}
-
-void wxListMainWindow::HighlightAll( bool on )
-{
-    if ( IsSingleSel() )
-    {
-        wxASSERT_MSG( !on, _T("can't do this in a single selection control") );
-
-        // we just have one item to turn off
-        if ( HasCurrent() && IsHighlighted(m_current) )
-        {
-            HighlightLine(m_current, false);
-            RefreshLine(m_current);
-        }
-    }
-    else // multi selection
-    {
-        if ( !IsEmpty() )
-            HighlightLines(0, GetItemCount() - 1, on);
-    }
-}
-
-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 )
-{
-    wxListEvent le( command, GetParent()->GetId() );
-    le.SetEventObject( GetParent() );
-
-    le.m_itemIndex = line;
-
-    // set only for events which have position
-    if ( point != wxDefaultPosition )
-        le.m_pointDrag = point;
-
-    // don't try to get the line info for virtual list controls: the main
-    // program has it anyhow and if we did it would result in accessing all
-    // the lines, even those which are not visible now and this is precisely
-    // what we're trying to avoid
-    if ( !IsVirtual() )
-    {
-        if ( line != (size_t)-1 )
-        {
-            GetLine(line)->GetItem( 0, le.m_item );
-        }
-        //else: this happens for wxEVT_LIST_ITEM_FOCUSED event
-    }
-    //else: there may be no more such item
-
-    GetParent()->GetEventHandler()->ProcessEvent( le );
-}
-
-void wxListMainWindow::ChangeCurrent(size_t current)
-{
-    m_current = current;
-
-    // as the current item changed, we shouldn't start editing it when the
-    // "slow click" timer expires as the click happened on another item
-    if ( m_renameTimer->IsRunning() )
-        m_renameTimer->Stop();
-
-    SendNotify(current, wxEVT_LIST_ITEM_FOCUSED);
-}
-
-wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass)
-{
-    wxCHECK_MSG( (item >= 0) && ((size_t)item < GetItemCount()), NULL,
-                 "wrong index in wxGenericListCtrl::EditLabel()" );
-
-    wxASSERT_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)),
-                 "EditLabel() needs a text control" );
-
-    size_t itemEdit = (size_t)item;
-
-    wxListEvent le( wxEVT_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
-    le.SetEventObject( GetParent() );
-    le.m_itemIndex = item;
-    wxListLineData *data = GetLine(itemEdit);
-    wxCHECK_MSG( data, NULL, _T("invalid index in EditLabel()") );
-    data->GetItem( 0, le.m_item );
-
-    if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
-    {
-        // vetoed by user code
-        return NULL;
-    }
-
-    // We have to call this here because the label in question might just have
-    // been added and no screen update taken place.
-    if ( m_dirty )
-    {
-        wxSafeYield();
-
-        // Pending events dispatched by wxSafeYield might have changed the item
-        // count
-        if ( (size_t)item >= GetItemCount() )
-            return NULL;
-    }
-
-    wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();
-    m_textctrlWrapper = new wxListTextCtrlWrapper(this, text, item);
-    return m_textctrlWrapper->GetText();
-}
-
-void wxListMainWindow::OnRenameTimer()
-{
-    wxCHECK_RET( HasCurrent(), "unexpected rename timer" );
-
-    EditLabel( m_current );
-}
-
-bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value)
-{
-    wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetParent()->GetId() );
-    le.SetEventObject( GetParent() );
-    le.m_itemIndex = itemEdit;
-
-    wxListLineData *data = GetLine(itemEdit);
-
-    wxCHECK_MSG( data, false, _T("invalid index in OnRenameAccept()") );
-
-    data->GetItem( 0, le.m_item );
-    le.m_item.m_text = value;
-    return !GetParent()->GetEventHandler()->ProcessEvent( le ) ||
-                le.IsAllowed();
-}
-
-void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
-{
-    // let owner know that the edit was cancelled
-    wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetParent()->GetId() );
-
-    le.SetEditCanceled(true);
-
-    le.SetEventObject( GetParent() );
-    le.m_itemIndex = itemEdit;
-
-    wxListLineData *data = GetLine(itemEdit);
-    wxCHECK_RET( data, _T("invalid index in OnRenameCancelled()") );
-
-    data->GetItem( 0, le.m_item );
-    GetEventHandler()->ProcessEvent( le );
-}
-
-void wxListMainWindow::OnMouse( wxMouseEvent &event )
-{
-
-#ifdef __WXMAC__
-    // On wxMac we can't depend on the EVT_KILL_FOCUS event to properly
-    // shutdown the edit control when the mouse is clicked elsewhere on the
-    // listctrl because the order of events is different (or something like
-    // that), so explicitly end the edit if it is active.
-    if ( event.LeftDown() && m_textctrlWrapper )
-        m_textctrlWrapper->AcceptChangesAndFinish();
-#endif // __WXMAC__
-
-    if ( event.LeftDown() )
-        SetFocusIgnoringChildren();
-
-    event.SetEventObject( GetParent() );
-    if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
-        return;
-
-    if (event.GetEventType() == wxEVT_MOUSEWHEEL)
-    {
-        // let the base handle mouse wheel events.
-        event.Skip();
-        return;
-    }
-
-    if ( !HasCurrent() || IsEmpty() )
-    {
-        if (event.RightDown())
-        {
-            SendNotify( (size_t)-1, wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
-            // Allow generation of context menu event
-            event.Skip();
-        }
-        return;
-    }
-
-    if (m_dirty)
-        return;
-
-    if ( !(event.Dragging() || event.ButtonDown() || event.LeftUp() ||
-        event.ButtonDClick()) )
-        return;
-
-    int x = event.GetX();
-    int y = event.GetY();
-    CalcUnscrolledPosition( x, y, &x, &y );
-
-    // where did we hit it (if we did)?
-    long hitResult = 0;
-
-    size_t count = GetItemCount(),
-           current;
-
-    if ( InReportView() )
-    {
-        current = y / GetLineHeight();
-        if ( current < count )
-            hitResult = HitTestLine(current, x, y);
-    }
-    else // !report
-    {
-        // TODO: optimize it too! this is less simple than for report view but
-        //       enumerating all items is still not a way to do it!!
-        for ( current = 0; current < count; current++ )
-        {
-            hitResult = HitTestLine(current, x, y);
-            if ( hitResult )
-                break;
-        }
-    }
-
-    if (event.Dragging())
-    {
-        if (m_dragCount == 0)
-        {
-            // we have to report the raw, physical coords as we want to be
-            // able to call HitTest(event.m_pointDrag) from the user code to
-            // get the item being dragged
-            m_dragStart = event.GetPosition();
-        }
-
-        m_dragCount++;
-
-        if (m_dragCount != 3)
-            return;
-
-        int command = event.RightIsDown() ? wxEVT_LIST_BEGIN_RDRAG
-                                          : wxEVT_LIST_BEGIN_DRAG;
-
-        wxListEvent le( command, GetParent()->GetId() );
-        le.SetEventObject( GetParent() );
-        le.m_itemIndex = m_lineLastClicked;
-        le.m_pointDrag = m_dragStart;
-        GetParent()->GetEventHandler()->ProcessEvent( le );
-
-        return;
-    }
-    else
-    {
-        m_dragCount = 0;
-    }
-
-    if ( !hitResult )
-    {
-        // outside of any item
-        if (event.RightDown())
-        {
-            SendNotify( (size_t) -1, wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
-
-            wxContextMenuEvent evtCtx(
-                wxEVT_CONTEXT_MENU,
-                GetParent()->GetId(),
-                ClientToScreen(event.GetPosition()));
-            evtCtx.SetEventObject(GetParent());
-            GetParent()->GetEventHandler()->ProcessEvent(evtCtx);
-        }
-        else
-        {
-            // reset the selection and bail out
-            HighlightAll(false);
-        }
-
-        return;
-    }
-
-    bool forceClick = false;
-    if (event.ButtonDClick())
-    {
-        if ( m_renameTimer->IsRunning() )
-            m_renameTimer->Stop();
-
-        m_lastOnSame = false;
-
-        if ( current == m_lineLastClicked )
-        {
-            SendNotify( current, wxEVT_LIST_ITEM_ACTIVATED );
-
-            return;
-        }
-        else
-        {
-            // The first click was on another item, so don't interpret this as
-            // a double click, but as a simple click instead
-            forceClick = true;
-        }
-    }
-
-    if (event.LeftUp())
-    {
-        if (m_lineSelectSingleOnUp != (size_t)-1)
-        {
-            // select single line
-            HighlightAll( false );
-            ReverseHighlight(m_lineSelectSingleOnUp);
-        }
-
-        if (m_lastOnSame)
-        {
-            if ((current == m_current) &&
-                (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
-                HasFlag(wxLC_EDIT_LABELS) )
-            {
-                if (InReportView())
-                {
-                    wxRect label = GetLineLabelRect( current );
-                    if (label.Contains( x, y ))
-                        m_renameTimer->Start( 250, true );
-
-                }
-                else
-                    m_renameTimer->Start( 250, true );
-            }
-        }
-
-        m_lastOnSame = false;
-        m_lineSelectSingleOnUp = (size_t)-1;
-    }
-    else
-    {
-        // This is necessary, because after a DnD operation in
-        // from and to ourself, the up event is swallowed by the
-        // DnD code. So on next non-up event (which means here and
-        // now) m_lineSelectSingleOnUp should be reset.
-        m_lineSelectSingleOnUp = (size_t)-1;
-    }
-    if (event.RightDown())
-    {
-        m_lineBeforeLastClicked = m_lineLastClicked;
-        m_lineLastClicked = current;
-
-        // If the item is already selected, do not update the selection.
-        // Multi-selections should not be cleared if a selected item is clicked.
-        if (!IsHighlighted(current))
-        {
-            HighlightAll(false);
-            ChangeCurrent(current);
-            ReverseHighlight(m_current);
-        }
-
-        SendNotify( current, wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
-
-        wxContextMenuEvent evtCtx(
-                wxEVT_CONTEXT_MENU,
-                GetParent()->GetId(),
-                ClientToScreen(event.GetPosition()));
-        evtCtx.SetEventObject(GetParent());
-        GetParent()->GetEventHandler()->ProcessEvent(evtCtx);
-    }
-    else if (event.MiddleDown())
-    {
-        SendNotify( current, wxEVT_LIST_ITEM_MIDDLE_CLICK );
-    }
-    else if ( event.LeftDown() || forceClick )
-    {
-        m_lineBeforeLastClicked = m_lineLastClicked;
-        m_lineLastClicked = current;
-
-        size_t oldCurrent = m_current;
-        bool oldWasSelected = IsHighlighted(m_current);
-
-        bool cmdModifierDown = event.CmdDown();
-        if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )
-        {
-            if ( IsSingleSel() || !IsHighlighted(current) )
-            {
-                HighlightAll( false );
-
-                ChangeCurrent(current);
-
-                ReverseHighlight(m_current);
-            }
-            else // multi sel & current is highlighted & no mod keys
-            {
-                m_lineSelectSingleOnUp = current;
-                ChangeCurrent(current); // change focus
-            }
-        }
-        else // multi sel & either ctrl or shift is down
-        {
-            if (cmdModifierDown)
-            {
-                ChangeCurrent(current);
-
-                ReverseHighlight(m_current);
-            }
-            else if (event.ShiftDown())
-            {
-                ChangeCurrent(current);
-
-                size_t lineFrom = oldCurrent,
-                       lineTo = current;
-
-                if ( lineTo < lineFrom )
-                {
-                    lineTo = lineFrom;
-                    lineFrom = m_current;
-                }
-
-                HighlightLines(lineFrom, lineTo);
-            }
-            else // !ctrl, !shift
-            {
-                // test in the enclosing if should make it impossible
-                wxFAIL_MSG( _T("how did we get here?") );
-            }
-        }
-
-        if (m_current != oldCurrent)
-            RefreshLine( oldCurrent );
-
-        // forceClick is only set if the previous click was on another item
-        m_lastOnSame = !forceClick && (m_current == oldCurrent) && oldWasSelected;
-    }
-}
-
-void wxListMainWindow::MoveToItem(size_t item)
-{
-    if ( item == (size_t)-1 )
-        return;
-
-    wxRect rect = GetLineRect(item);
-
-    int client_w, client_h;
-    GetClientSize( &client_w, &client_h );
-
-    const int hLine = GetLineHeight();
-
-    int view_x = SCROLL_UNIT_X * GetScrollPos( wxHORIZONTAL );
-    int view_y = hLine * GetScrollPos( wxVERTICAL );
-
-    if ( InReportView() )
-    {
-        // the next we need the range of lines shown it might be different,
-        // so recalculate it
-        ResetVisibleLinesRange();
-
-        if (rect.y < view_y)
-            Scroll( -1, rect.y / hLine );
-        if (rect.y + rect.height + 5 > view_y + client_h)
-            Scroll( -1, (rect.y + rect.height - client_h + hLine) / hLine );
-
-#ifdef __WXMAC__
-        // At least on Mac the visible lines value will get reset inside of
-        // Scroll *before* it actually scrolls the window because of the
-        // Update() that happens there, so it will still have the wrong value.
-        // So let's reset it again and wait for it to be recalculated in the
-        // next paint event.  I would expect this problem to show up in wxGTK
-        // too but couldn't duplicate it there.  Perhaps the order of events
-        // is different...  --Robin
-        ResetVisibleLinesRange();
-#endif
-    }
-    else // !report
-    {
-        if (rect.x-view_x < 5)
-            Scroll( (rect.x - 5) / SCROLL_UNIT_X, -1 );
-        if (rect.x + rect.width - 5 > view_x + client_w)
-            Scroll( (rect.x + rect.width - client_w + SCROLL_UNIT_X) / SCROLL_UNIT_X, -1 );
-    }
-}
-
-// ----------------------------------------------------------------------------
-// keyboard handling
-// ----------------------------------------------------------------------------
-
-void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
-{
-    wxCHECK_RET( newCurrent < (size_t)GetItemCount(),
-                 _T("invalid item index in OnArrowChar()") );
-
-    size_t oldCurrent = m_current;
-
-    // in single selection we just ignore Shift as we can't select several
-    // items anyhow
-    if ( event.ShiftDown() && !IsSingleSel() )
-    {
-        ChangeCurrent(newCurrent);
-
-        // refresh the old focus to remove it
-        RefreshLine( oldCurrent );
-
-        // select all the items between the old and the new one
-        if ( oldCurrent > newCurrent )
-        {
-            newCurrent = oldCurrent;
-            oldCurrent = m_current;
-        }
-
-        HighlightLines(oldCurrent, newCurrent);
-    }
-    else // !shift
-    {
-        // all previously selected items are unselected unless ctrl is held
-        // in a multiselection control
-        if ( !event.ControlDown() || IsSingleSel() )
-            HighlightAll(false);
-
-        ChangeCurrent(newCurrent);
-
-        // refresh the old focus to remove it
-        RefreshLine( oldCurrent );
-
-        // in single selection mode we must always have a selected item
-        if ( !event.ControlDown() || IsSingleSel() )
-            HighlightLine( m_current, true );
-    }
-
-    RefreshLine( m_current );
-
-    MoveToFocus();
-}
-
-void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
-{
-    wxWindow *parent = GetParent();
-
-    // propagate the key event upwards
-    wxKeyEvent ke(event);
-    if (parent->GetEventHandler()->ProcessEvent( ke ))
-        return;
-
-    event.Skip();
-}
-
-void wxListMainWindow::OnKeyUp( wxKeyEvent &event )
-{
-    wxWindow *parent = GetParent();
-
-    // propagate the key event upwards
-    wxKeyEvent ke(event);
-    ke.SetEventObject( parent );
-    if (parent->GetEventHandler()->ProcessEvent( ke ))
-        return;
-
-    event.Skip();
-}
-
-void wxListMainWindow::OnChar( wxKeyEvent &event )
-{
-    wxWindow *parent = GetParent();
-
-    // send a list_key event up
-    if ( HasCurrent() )
-    {
-        wxListEvent le( wxEVT_LIST_KEY_DOWN, GetParent()->GetId() );
-        le.m_itemIndex = m_current;
-        GetLine(m_current)->GetItem( 0, le.m_item );
-        le.m_code = event.GetKeyCode();
-        le.SetEventObject( parent );
-        parent->GetEventHandler()->ProcessEvent( le );
-    }
-
-    // propagate the char event upwards
-    wxKeyEvent ke(event);
-    if (parent->GetEventHandler()->ProcessEvent( ke ))
-        return;
-
-    if (event.GetKeyCode() == WXK_TAB)
-    {
-        wxNavigationKeyEvent nevent;
-        nevent.SetWindowChange( event.ControlDown() );
-        nevent.SetDirection( !event.ShiftDown() );
-        nevent.SetEventObject( GetParent()->GetParent() );
-        nevent.SetCurrentFocus( m_parent );
-        if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent ))
-            return;
-    }
-
-    // no item -> nothing to do
-    if (!HasCurrent())
-    {
-        event.Skip();
-        return;
-    }
-
-    // don't use m_linesPerPage directly as it might not be computed yet
-    const int pageSize = GetCountPerPage();
-    wxCHECK_RET( pageSize, _T("should have non zero page size") );
-
-    if (GetLayoutDirection() == wxLayout_RightToLeft)
-    {
-        if (event.GetKeyCode() == WXK_RIGHT)
-            event.m_keyCode = WXK_LEFT;
-        else if (event.GetKeyCode() == WXK_LEFT)
-            event.m_keyCode = WXK_RIGHT;
-    }
-
-    switch ( event.GetKeyCode() )
-    {
-        case WXK_UP:
-            if ( m_current > 0 )
-                OnArrowChar( m_current - 1, event );
-            break;
-
-        case WXK_DOWN:
-            if ( m_current < (size_t)GetItemCount() - 1 )
-                OnArrowChar( m_current + 1, event );
-            break;
-
-        case WXK_END:
-            if (!IsEmpty())
-                OnArrowChar( GetItemCount() - 1, event );
-            break;
-
-        case WXK_HOME:
-            if (!IsEmpty())
-                OnArrowChar( 0, event );
-            break;
-
-        case WXK_PAGEUP:
-            {
-                int steps = InReportView() ? pageSize - 1
-                                           : m_current % pageSize;
-
-                int index = m_current - steps;
-                if (index < 0)
-                    index = 0;
-
-                OnArrowChar( index, event );
-            }
-            break;
-
-        case WXK_PAGEDOWN:
-            {
-                int steps = InReportView()
-                                ? pageSize - 1
-                                : pageSize - (m_current % pageSize) - 1;
-
-                size_t index = m_current + steps;
-                size_t count = GetItemCount();
-                if ( index >= count )
-                    index = count - 1;
-
-                OnArrowChar( index, event );
-            }
-            break;
-
-        case WXK_LEFT:
-            if ( !InReportView() )
-            {
-                int index = m_current - pageSize;
-                if (index < 0)
-                    index = 0;
-
-                OnArrowChar( index, event );
-            }
-            break;
-
-        case WXK_RIGHT:
-            if ( !InReportView() )
-            {
-                size_t index = m_current + pageSize;
-
-                size_t count = GetItemCount();
-                if ( index >= count )
-                    index = count - 1;
-
-                OnArrowChar( index, event );
-            }
-            break;
-
-        case WXK_SPACE:
-            if ( IsSingleSel() )
-            {
-                if ( event.ControlDown() )
-                {
-                    ReverseHighlight(m_current);
-                }
-                else // normal space press
-                {
-                    SendNotify( m_current, wxEVT_LIST_ITEM_ACTIVATED );
-                }
-            }
-            else // multiple selection
-            {
-                ReverseHighlight(m_current);
-            }
-            break;
-
-        case WXK_RETURN:
-        case WXK_EXECUTE:
-            SendNotify( m_current, wxEVT_LIST_ITEM_ACTIVATED );
-            break;
-
-        default:
-            event.Skip();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// focus handling
-// ----------------------------------------------------------------------------
-
-void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
-{
-    if ( GetParent() )
-    {
-        wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() );
-        event.SetEventObject( GetParent() );
-        if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
-            return;
-    }
-
-    // wxGTK sends us EVT_SET_FOCUS events even if we had never got
-    // EVT_KILL_FOCUS before which means that we finish by redrawing the items
-    // which are already drawn correctly resulting in horrible flicker - avoid
-    // it
-    if ( !m_hasFocus )
-    {
-        m_hasFocus = true;
-
-        RefreshSelected();
-    }
-}
-
-void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
-{
-    if ( GetParent() )
-    {
-        wxFocusEvent event( wxEVT_KILL_FOCUS, GetParent()->GetId() );
-        event.SetEventObject( GetParent() );
-        if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
-            return;
-    }
-
-    m_hasFocus = false;
-    RefreshSelected();
-}
-
-void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )
-{
-    if ( HasFlag(wxLC_ICON) && (m_normal_image_list))
-    {
-        m_normal_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
-    }
-    else if ( HasFlag(wxLC_SMALL_ICON) && (m_small_image_list))
-    {
-        m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
-    }
-    else if ( HasFlag(wxLC_LIST) && (m_small_image_list))
-    {
-        m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
-    }
-    else if ( InReportView() && (m_small_image_list))
-    {
-        m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
-    }
-}
-
-void wxListMainWindow::GetImageSize( int index, int &width, int &height ) const
-{
-    if ( HasFlag(wxLC_ICON) && m_normal_image_list )
-    {
-        m_normal_image_list->GetSize( index, width, height );
-    }
-    else if ( HasFlag(wxLC_SMALL_ICON) && m_small_image_list )
-    {
-        m_small_image_list->GetSize( index, width, height );
-    }
-    else if ( HasFlag(wxLC_LIST) && m_small_image_list )
-    {
-        m_small_image_list->GetSize( index, width, height );
-    }
-    else if ( InReportView() && m_small_image_list )
-    {
-        m_small_image_list->GetSize( index, width, height );
-    }
-    else
-    {
-        width =
-        height = 0;
-    }
-}
-
-int wxListMainWindow::GetTextLength( const wxString &s ) const
-{
-    wxClientDC dc( wxConstCast(this, wxListMainWindow) );
-    dc.SetFont( GetFont() );
-
-    wxCoord lw;
-    dc.GetTextExtent( s, &lw, NULL );
-
-    return lw + AUTOSIZE_COL_MARGIN;
-}
-
-void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
-{
-    m_dirty = true;
-
-    // calc the spacing from the icon size
-    int width = 0, height = 0;
-
-    if ((imageList) && (imageList->GetImageCount()) )
-        imageList->GetSize(0, width, height);
-
-    if (which == wxIMAGE_LIST_NORMAL)
-    {
-        m_normal_image_list = imageList;
-        m_normal_spacing = width + 8;
-    }
-
-    if (which == wxIMAGE_LIST_SMALL)
-    {
-        m_small_image_list = imageList;
-        m_small_spacing = width + 14;
-        m_lineHeight = 0;  // ensure that the line height will be recalc'd
-    }
-}
-
-void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
-{
-    m_dirty = true;
-    if (isSmall)
-        m_small_spacing = spacing;
-    else
-        m_normal_spacing = spacing;
-}
-
-int wxListMainWindow::GetItemSpacing( bool isSmall )
-{
-    return isSmall ? m_small_spacing : m_normal_spacing;
-}
-
-// ----------------------------------------------------------------------------
-// columns
-// ----------------------------------------------------------------------------
-
-void wxListMainWindow::SetColumn( int col, wxListItem &item )
-{
-    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
-
-    wxCHECK_RET( node, _T("invalid column index in SetColumn") );
-
-    if ( item.m_width == wxLIST_AUTOSIZE_USEHEADER )
-        item.m_width = GetTextLength( item.m_text );
-
-    wxListHeaderData *column = node->GetData();
-    column->SetItem( item );
-
-    wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
-    if ( headerWin )
-        headerWin->m_dirty = true;
-
-    m_dirty = true;
-
-    // invalidate it as it has to be recalculated
-    m_headerWidth = 0;
-}
-
-void wxListMainWindow::SetColumnWidth( int col, int width )
-{
-    { wxCHECK_RET( col >= 0 && col < GetColumnCount(),
-                 _T("invalid column index") ); }
-
-    { wxCHECK_RET( InReportView(),
-                 _T("SetColumnWidth() can only be called in report mode.") ); }
-
-    m_dirty = true;
-    wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
-    if ( headerWin )
-        headerWin->m_dirty = true;
-
-    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
-	{ wxCHECK_RET( node, _T("no column?") ); }
-
-    wxListHeaderData *column = node->GetData();
-
-    size_t count = GetItemCount();
-
-    if (width == wxLIST_AUTOSIZE_USEHEADER)
-    {
-        width = GetTextLength(column->GetText());
-        width += 2*EXTRA_WIDTH;
-
-        // check for column header's image availability
-        const int image = column->GetImage();
-        if ( image != -1 )
-        {
-            if ( m_small_image_list )
-            {
-                int ix = 0, iy = 0;
-                m_small_image_list->GetSize(image, ix, iy);
-                width += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE;
-            }
-        }
-    }
-    else if ( width == wxLIST_AUTOSIZE )
-    {
-        if ( IsVirtual() )
-        {
-            // TODO: determine the max width somehow...
-            width = WIDTH_COL_DEFAULT;
-        }
-        else // !virtual
-        {
-            wxClientDC dc(this);
-            dc.SetFont( GetFont() );
-
-            int max = AUTOSIZE_COL_MARGIN;
-
-            //  if the cached column width isn't valid then recalculate it
-            if (m_aColWidths.Item(col)->bNeedsUpdate)
-            {
-                for (size_t i = 0; i < count; i++)
-                {
-                    wxListLineData *line = GetLine( i );
-                    wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );
-
-                    wxCHECK_RET( n, _T("no subitem?") );
-
-                    wxListItemData *itemData = n->GetData();
-                    wxListItem      item;
-
-                    itemData->GetItem(item);
-                    int itemWidth = GetItemWidthWithImage(&item);
-                    if (itemWidth > max)
-                        max = itemWidth;
-                }
-
-                m_aColWidths.Item(col)->bNeedsUpdate = false;
-                m_aColWidths.Item(col)->nMaxWidth = max;
-            }
-
-            max = m_aColWidths.Item(col)->nMaxWidth;
-            width = max + AUTOSIZE_COL_MARGIN;
-        }
-    }
-
-    column->SetWidth( width );
-
-    // invalidate it as it has to be recalculated
-    m_headerWidth = 0;
-}
-
-int wxListMainWindow::GetHeaderWidth() const
-{
-    if ( !m_headerWidth )
-    {
-        wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
-
-        size_t count = GetColumnCount();
-        for ( size_t col = 0; col < count; col++ )
-        {
-            self->m_headerWidth += GetColumnWidth(col);
-        }
-    }
-
-    return m_headerWidth;
-}
-
-void wxListMainWindow::GetColumn( int col, wxListItem &item ) const
-{
-    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
-    wxCHECK_RET( node, _T("invalid column index in GetColumn") );
-
-    wxListHeaderData *column = node->GetData();
-    column->GetItem( item );
-}
-
-int wxListMainWindow::GetColumnWidth( int col ) const
-{
-    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
-    wxCHECK_MSG( node, 0, _T("invalid column index") );
-
-    wxListHeaderData *column = node->GetData();
-    return column->GetWidth();
-}
-
-// ----------------------------------------------------------------------------
-// item state
-// ----------------------------------------------------------------------------
-
-void wxListMainWindow::SetItem( wxListItem &item )
-{
-    long id = item.m_itemId;
-    wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(),
-                 _T("invalid item index in SetItem") );
-
-    if ( !IsVirtual() )
-    {
-        wxListLineData *line = GetLine((size_t)id);
-        line->SetItem( item.m_col, item );
-
-        // If the user-data field is being updated, the m_dataIndex map (if
-        // populated) is now stale. Mark dirty rather than chase the old/new
-        // pair; the next FindItem() rebuilds in one pass.
-        if ( item.m_mask & wxLIST_MASK_DATA )
-            m_dataIndexDirty = true;
-
-        // Set item state if user wants
-        if ( item.m_mask & wxLIST_MASK_STATE )
-            SetItemState( item.m_itemId, item.m_state, item.m_state );
-
-        if (InReportView())
-        {
-            //  update the Max Width Cache if needed
-            int width = GetItemWidthWithImage(&item);
-
-            if (width > m_aColWidths.Item(item.m_col)->nMaxWidth)
-                m_aColWidths.Item(item.m_col)->nMaxWidth = width;
-        }
-    }
-
-    // update the item on screen
-    wxRect rectItem;
-    GetItemRect(id, rectItem);
-    RefreshRect(rectItem);
-}
-
-void wxListMainWindow::SetItemStateAll(long state, long stateMask)
-{
-    if ( IsEmpty() )
-        return;
-
-    // first deal with selection
-    if ( stateMask & wxLIST_STATE_SELECTED )
-    {
-        // set/clear select state
-        if ( IsVirtual() )
-        {
-            // optimized version for virtual listctrl.
-            m_selStore.SelectRange(0, GetItemCount() - 1, state == wxLIST_STATE_SELECTED);
-            Refresh();
-        }
-        else if ( state & wxLIST_STATE_SELECTED )
-        {
-            const long count = GetItemCount();
-            for( long i = 0; i <  count; i++ )
-            {
-                SetItemState( i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-            }
-
-        }
-        else
-        {
-            // clear for non virtual (somewhat optimized by using GetNextItem())
-            long i = -1;
-            while ( (i = GetNextItem(i, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1 )
-            {
-                SetItemState( i, 0, wxLIST_STATE_SELECTED );
-            }
-        }
-    }
-
-    if ( HasCurrent() && (state == 0) && (stateMask & wxLIST_STATE_FOCUSED) )
-    {
-        // unfocus all: only one item can be focused, so clearing focus for
-        // all items is simply clearing focus of the focused item.
-        SetItemState(m_current, state, stateMask);
-    }
-    //(setting focus to all items makes no sense, so it is not handled here.)
-}
-
-void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
-{
-    if ( litem == -1 )
-    {
-        SetItemStateAll(state, stateMask);
-        return;
-    }
-
-    wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(),
-                 _T("invalid list ctrl item index in SetItem") );
-
-    size_t oldCurrent = m_current;
-    size_t item = (size_t)litem;    // safe because of the check above
-
-    // do we need to change the focus?
-    if ( stateMask & wxLIST_STATE_FOCUSED )
-    {
-        if ( state & wxLIST_STATE_FOCUSED )
-        {
-            // don't do anything if this item is already focused
-            if ( item != m_current )
-            {
-                ChangeCurrent(item);
-
-                if ( oldCurrent != (size_t)-1 )
-                {
-                    if ( IsSingleSel() )
-                    {
-                        HighlightLine(oldCurrent, false);
-                    }
-
-                    RefreshLine(oldCurrent);
-                }
-
-                RefreshLine( m_current );
-            }
-        }
-        else // unfocus
-        {
-            // don't do anything if this item is not focused
-            if ( item == m_current )
-            {
-                ResetCurrent();
-
-                if ( IsSingleSel() )
-                {
-                    // we must unselect the old current item as well or we
-                    // might end up with more than one selected item in a
-                    // single selection control
-                    HighlightLine(oldCurrent, false);
-                }
-
-                RefreshLine( oldCurrent );
-            }
-        }
-    }
-
-    // do we need to change the selection state?
-    if ( stateMask & wxLIST_STATE_SELECTED )
-    {
-        bool on = (state & wxLIST_STATE_SELECTED) != 0;
-
-        if ( IsSingleSel() )
-        {
-            if ( on )
-            {
-                // selecting the item also makes it the focused one in the
-                // single sel mode
-                if ( m_current != item )
-                {
-                    ChangeCurrent(item);
-
-                    if ( oldCurrent != (size_t)-1 )
-                    {
-                        HighlightLine( oldCurrent, false );
-                        RefreshLine( oldCurrent );
-                    }
-                }
-            }
-            else // off
-            {
-                // only the current item may be selected anyhow
-                if ( item != m_current )
-                    return;
-            }
-        }
-
-        if ( HighlightLine(item, on) )
-        {
-            RefreshLine(item);
-        }
-    }
-}
-
-int wxListMainWindow::GetItemState( long item, long stateMask ) const
-{
-    wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), 0,
-                 _T("invalid list ctrl item index in GetItemState()") );
-
-    int ret = wxLIST_STATE_DONTCARE;
-
-    if ( stateMask & wxLIST_STATE_FOCUSED )
-    {
-        if ( (size_t)item == m_current )
-            ret |= wxLIST_STATE_FOCUSED;
-    }
-
-    if ( stateMask & wxLIST_STATE_SELECTED )
-    {
-        if ( IsHighlighted(item) )
-            ret |= wxLIST_STATE_SELECTED;
-    }
-
-    return ret;
-}
-
-void wxListMainWindow::GetItem( wxListItem &item ) const
-{
-    wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId < GetItemCount(),
-                 _T("invalid item index in GetItem") );
-
-    wxListLineData *line = GetLine((size_t)item.m_itemId);
-    line->GetItem( item.m_col, item );
-
-    // Get item state if user wants it
-    if ( item.m_mask & wxLIST_MASK_STATE )
-        item.m_state = GetItemState( item.m_itemId, wxLIST_STATE_SELECTED |
-                                                 wxLIST_STATE_FOCUSED );
-}
-
-// ----------------------------------------------------------------------------
-// item count
-// ----------------------------------------------------------------------------
-
-size_t wxListMainWindow::GetItemCount() const
-{
-    return IsVirtual() ? m_countVirt : m_lines.GetCount();
-}
-
-void wxListMainWindow::SetItemCount(long count)
-{
-    m_selStore.SetItemCount(count);
-    m_countVirt = count;
-
-    ResetVisibleLinesRange();
-
-    // scrollbars must be reset
-    m_dirty = true;
-}
-
-int wxListMainWindow::GetSelectedItemCount() const
-{
-    // deal with the quick case first
-    if ( IsSingleSel() )
-        return HasCurrent() ? IsHighlighted(m_current) : false;
-
-    // virtual controls remembers all its selections itself
-    if ( IsVirtual() )
-        return m_selStore.GetSelectedCount();
-
-    // TODO: we probably should maintain the number of items selected even for
-    //       non virtual controls as enumerating all lines is really slow...
-    size_t countSel = 0;
-    size_t count = GetItemCount();
-    for ( size_t line = 0; line < count; line++ )
-    {
-        if ( GetLine(line)->IsHighlighted() )
-            countSel++;
-    }
-
-    return countSel;
-}
-
-// ----------------------------------------------------------------------------
-// item position/size
-// ----------------------------------------------------------------------------
-
-wxRect wxListMainWindow::GetViewRect() const
-{
-    wxASSERT_MSG( !HasFlag(wxLC_REPORT | wxLC_LIST),
-                    _T("wxListCtrl::GetViewRect() only works in icon mode") );
-
-    // we need to find the longest/tallest label
-    wxCoord xMax = 0, yMax = 0;
-    const int count = GetItemCount();
-    if ( count )
-    {
-        for ( int i = 0; i < count; i++ )
-        {
-            // we need logical, not physical, coordinates here, so use
-            // GetLineRect() instead of GetItemRect()
-            wxRect r = GetLineRect(i);
-
-            wxCoord x = r.GetRight(),
-                    y = r.GetBottom();
-
-            if ( x > xMax )
-                xMax = x;
-            if ( y > yMax )
-                yMax = y;
-        }
-    }
-
-    // some fudge needed to make it look prettier
-    xMax += 2 * EXTRA_BORDER_X;
-    yMax += 2 * EXTRA_BORDER_Y;
-
-    // account for the scrollbars if necessary
-    const wxSize sizeAll = GetClientSize();
-    if ( xMax > sizeAll.x )
-        yMax += wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
-    if ( yMax > sizeAll.y )
-        xMax += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
-
-    return wxRect(0, 0, xMax, yMax);
-}
-
-void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const
-{
-    wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
-                 _T("invalid index in GetItemRect") );
-
-    // ensure that we're laid out, otherwise we could return nonsense
-    if ( m_dirty )
-    {
-        wxConstCast(this, wxListMainWindow)->
-            RecalculatePositions(true /* no refresh */);
-    }
-
-    rect = GetLineRect((size_t)index);
-
-    CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);
-}
-
-bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const
-{
-    wxRect rect;
-    GetItemRect(item, rect);
-
-    pos.x = rect.x;
-    pos.y = rect.y;
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// geometry calculation
-// ----------------------------------------------------------------------------
-
-void wxListMainWindow::RecalculatePositions(bool noRefresh)
-{
-    const int lineHeight = GetLineHeight();
-
-    wxClientDC dc( this );
-    dc.SetFont( GetFont() );
-
-    const size_t count = GetItemCount();
-
-    int iconSpacing;
-    if ( HasFlag(wxLC_ICON) && m_normal_image_list )
-        iconSpacing = m_normal_spacing;
-    else if ( HasFlag(wxLC_SMALL_ICON) && m_small_image_list )
-        iconSpacing = m_small_spacing;
-    else
-        iconSpacing = 0;
-
-    // Note that we do not call GetClientSize() here but
-    // GetSize() and subtract the border size for sunken
-    // borders manually. This is technically incorrect,
-    // but we need to know the client area's size WITHOUT
-    // scrollbars here. Since we don't know if there are
-    // any scrollbars, we use GetSize() instead. Another
-    // solution would be to call SetScrollbars() here to
-    // remove the scrollbars and call GetClientSize() then,
-    // but this might result in flicker and - worse - will
-    // reset the scrollbars to 0 which is not good at all
-    // if you resize a dialog/window, but don't want to
-    // reset the window scrolling. RR.
-    // Furthermore, we actually do NOT subtract the border
-    // width as 2 pixels is just the extra space which we
-    // need around the actual content in the window. Other-
-    // wise the text would e.g. touch the upper border. RR.
-    int clientWidth,
-        clientHeight;
-    GetSize( &clientWidth, &clientHeight );
-
-    if ( InReportView() )
-    {
-        // all lines have the same height and we scroll one line per step
-        int entireHeight = count * lineHeight + LINE_SPACING;
-
-        m_linesPerPage = clientHeight / lineHeight;
-
-        ResetVisibleLinesRange();
-
-        SetScrollbars( SCROLL_UNIT_X, lineHeight,
-                       GetHeaderWidth() / SCROLL_UNIT_X,
-                       (entireHeight + lineHeight - 1) / lineHeight,
-                       GetScrollPos(wxHORIZONTAL),
-                       GetScrollPos(wxVERTICAL),
-                       true );
-    }
-    else // !report
-    {
-        // we have 3 different layout strategies: either layout all items
-        // horizontally/vertically (wxLC_ALIGN_XXX styles explicitly given) or
-        // to arrange them in top to bottom, left to right (don't ask me why
-        // not the other way round...) order
-        if ( HasFlag(wxLC_ALIGN_LEFT | wxLC_ALIGN_TOP) )
-        {
-            int x = EXTRA_BORDER_X;
-            int y = EXTRA_BORDER_Y;
-
-            wxCoord widthMax = 0;
-
-            size_t i;
-            for ( i = 0; i < count; i++ )
-            {
-                wxListLineData *line = GetLine(i);
-                line->CalculateSize( &dc, iconSpacing );
-                line->SetPosition( x, y, iconSpacing );
-
-                wxSize sizeLine = GetLineSize(i);
-
-                if ( HasFlag(wxLC_ALIGN_TOP) )
-                {
-                    if ( sizeLine.x > widthMax )
-                        widthMax = sizeLine.x;
-
-                    y += sizeLine.y;
-                }
-                else // wxLC_ALIGN_LEFT
-                {
-                    x += sizeLine.x + MARGIN_BETWEEN_ROWS;
-                }
-            }
-
-            if ( HasFlag(wxLC_ALIGN_TOP) )
-            {
-                // traverse the items again and tweak their sizes so that they are
-                // all the same in a row
-                for ( i = 0; i < count; i++ )
-                {
-                    wxListLineData *line = GetLine(i);
-                    line->m_gi->ExtendWidth(widthMax);
-                }
-            }
-
-            SetScrollbars
-            (
-                SCROLL_UNIT_X,
-                lineHeight,
-                (x + SCROLL_UNIT_X) / SCROLL_UNIT_X,
-                (y + lineHeight) / lineHeight,
-                GetScrollPos( wxHORIZONTAL ),
-                GetScrollPos( wxVERTICAL ),
-                true
-            );
-        }
-        else // "flowed" arrangement, the most complicated case
-        {
-            // at first we try without any scrollbars, if the items don't fit into
-            // the window, we recalculate after subtracting the space taken by the
-            // scrollbar
-
-            int entireWidth = 0;
-
-            for (int tries = 0; tries < 2; tries++)
-            {
-                entireWidth = 2 * EXTRA_BORDER_X;
-
-                if (tries == 1)
-                {
-                    // Now we have decided that the items do not fit into the
-                    // client area, so we need a scrollbar
-                    entireWidth += SCROLL_UNIT_X;
-                }
-
-                int x = EXTRA_BORDER_X;
-                int y = EXTRA_BORDER_Y;
-                int maxWidthInThisRow = 0;
-
-                m_linesPerPage = 0;
-                int currentlyVisibleLines = 0;
-
-                for (size_t i = 0; i < count; i++)
-                {
-                    currentlyVisibleLines++;
-                    wxListLineData *line = GetLine( i );
-                    line->CalculateSize( &dc, iconSpacing );
-                    line->SetPosition( x, y, iconSpacing );
-
-                    wxSize sizeLine = GetLineSize( i );
-
-                    if ( maxWidthInThisRow < sizeLine.x )
-                        maxWidthInThisRow = sizeLine.x;
-
-                    y += sizeLine.y;
-                    if (currentlyVisibleLines > m_linesPerPage)
-                        m_linesPerPage = currentlyVisibleLines;
-
-                    if ( y + sizeLine.y >= clientHeight )
-                    {
-                        currentlyVisibleLines = 0;
-                        y = EXTRA_BORDER_Y;
-                        maxWidthInThisRow += MARGIN_BETWEEN_ROWS;
-                        x += maxWidthInThisRow;
-                        entireWidth += maxWidthInThisRow;
-                        maxWidthInThisRow = 0;
-                    }
-
-                    // We have reached the last item.
-                    if ( i == count - 1 )
-                        entireWidth += maxWidthInThisRow;
-
-                    if ( (tries == 0) &&
-                            (entireWidth + SCROLL_UNIT_X > clientWidth) )
-                    {
-                        clientHeight -= wxSystemSettings::
-                                            GetMetric(wxSYS_HSCROLL_Y);
-                        m_linesPerPage = 0;
-                        break;
-                    }
-
-                    if ( i == count - 1 )
-                        tries = 1;  // Everything fits, no second try required.
-                }
-            }
-
-            SetScrollbars
-            (
-                SCROLL_UNIT_X,
-                lineHeight,
-                (entireWidth + SCROLL_UNIT_X) / SCROLL_UNIT_X,
-                0,
-                GetScrollPos( wxHORIZONTAL ),
-                0,
-                true
-            );
-        }
-    }
-
-    if ( !noRefresh )
-    {
-        // FIXME: why should we call it from here?
-        UpdateCurrent();
-
-        RefreshAll();
-    }
-}
-
-void wxListMainWindow::RefreshAll()
-{
-    m_dirty = false;
-    Refresh();
-
-    wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
-    if ( headerWin && headerWin->m_dirty )
-    {
-        headerWin->m_dirty = false;
-        headerWin->Refresh();
-    }
-}
-
-void wxListMainWindow::UpdateCurrent()
-{
-    if ( !HasCurrent() && !IsEmpty() )
-        ChangeCurrent(0);
-}
-
-long wxListMainWindow::GetNextItem( long item,
-                                    int WXUNUSED(geometry),
-                                    int state ) const
-{
-    long ret = item,
-         max = GetItemCount();
-    wxCHECK_MSG( (ret == -1) || (ret < max), -1,
-                 _T("invalid listctrl index in GetNextItem()") );
-
-    // notice that we start with the next item (or the first one if item == -1)
-    // and this is intentional to allow writing a simple loop to iterate over
-    // all selected items
-    ret++;
-    if ( ret == max )
-        // this is not an error because the index was OK initially,
-        // just no such item
-        return -1;
-
-    if ( !state )
-        // any will do
-        return (size_t)ret;
-
-    size_t count = GetItemCount();
-    for ( size_t line = (size_t)ret; line < count; line++ )
-    {
-        if ( (state & wxLIST_STATE_FOCUSED) && (line == m_current) )
-            return line;
-
-        if ( (state & wxLIST_STATE_SELECTED) && IsHighlighted(line) )
-            return line;
-    }
-
-    return -1;
-}
-
-// ----------------------------------------------------------------------------
-// deleting stuff
-// ----------------------------------------------------------------------------
-
-void wxListMainWindow::DeleteItem( long lindex )
-{
-    size_t count = GetItemCount();
-
-    wxCHECK_RET( (lindex >= 0) && ((size_t)lindex < count),
-                 _T("invalid item index in DeleteItem") );
-
-    size_t index = (size_t)lindex;
-
-    // we don't need to adjust the index for the previous items
-    if ( HasCurrent() && m_current >= index )
-    {
-        // if the current item is being deleted, we want the next one to
-        // become selected - unless there is no next one - so don't adjust
-        // m_current in this case
-        if ( m_current != index || m_current == count - 1 )
-            m_current--;
-    }
-
-    if ( InReportView() )
-    {
-        //  mark the Column Max Width cache as dirty if the items in the line
-        //  we're deleting contain the Max Column Width
-        wxListLineData * const line = GetLine(index);
-        wxListItemDataList::compatibility_iterator n;
-        wxListItemData *itemData;
-        wxListItem      item;
-        int             itemWidth;
-
-        for (size_t i = 0; i < m_columns.GetCount(); i++)
-        {
-            n = line->m_items.Item( i );
-            itemData = n->GetData();
-            itemData->GetItem(item);
-
-            itemWidth = GetItemWidthWithImage(&item);
-
-            if (itemWidth >= m_aColWidths.Item(i)->nMaxWidth)
-                m_aColWidths.Item(i)->bNeedsUpdate = true;
-        }
-
-        ResetVisibleLinesRange();
-    }
-
-    SendNotify( index, wxEVT_LIST_DELETE_ITEM, wxDefaultPosition );
-
-    if ( IsVirtual() )
-    {
-        m_countVirt--;
-        m_selStore.OnItemDelete(index);
-    }
-    else
-    {
-        m_lines.RemoveAt( index );
-    }
-
-    // Indices above the removed line have shifted; invalidate the cached map.
-    m_dataIndexDirty = true;
-
-    // we need to refresh the (vert) scrollbar as the number of items changed
-    m_dirty = true;
-
-    RefreshAfter(index);
-}
-
-void wxListMainWindow::DeleteColumn( int col )
-{
-    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
-
-    wxCHECK_RET( node, "invalid column index in DeleteColumn()" );
-
-    m_dirty = true;
-    delete node->GetData();
-    m_columns.Erase( node );
-
-    if ( !IsVirtual() )
-    {
-        // update all the items
-        for ( size_t i = 0; i < m_lines.GetCount(); i++ )
-        {
-            wxListLineData * const line = GetLine(i);
-            wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );
-            delete n->GetData();
-            line->m_items.Erase(n);
-        }
-    }
-
-    if ( InReportView() )   //  we only cache max widths when in Report View
-    {
-        delete m_aColWidths.Item(col);
-        m_aColWidths.RemoveAt(col);
-    }
-
-    // invalidate it as it has to be recalculated
-    m_headerWidth = 0;
-}
-
-void wxListMainWindow::DoDeleteAllItems()
-{
-    if ( IsEmpty() )
-        // nothing to do - in particular, don't send the event
-        return;
-
-    ResetCurrent();
-
-    // to make the deletion of all items faster, we don't send the
-    // notifications for each item deletion in this case but only one event
-    // for all of them: this is compatible with wxMSW and documented in
-    // DeleteAllItems() description
-
-    wxListEvent event( wxEVT_LIST_DELETE_ALL_ITEMS, GetParent()->GetId() );
-    event.SetEventObject( GetParent() );
-    GetParent()->GetEventHandler()->ProcessEvent( event );
-
-    if ( IsVirtual() )
-    {
-        m_countVirt = 0;
-        m_selStore.Clear();
-    }
-
-    if ( InReportView() )
-    {
-        ResetVisibleLinesRange();
-        for (size_t i = 0; i < m_aColWidths.GetCount(); i++)
-        {
-            m_aColWidths.Item(i)->bNeedsUpdate = true;
-        }
-    }
-
-    m_lines.Clear();
-
-    m_dataIndex.clear();
-    m_dataIndexDirty = false;
-}
-
-void wxListMainWindow::DeleteAllItems()
-{
-    DoDeleteAllItems();
-
-    RecalculatePositions();
-}
-
-void wxListMainWindow::DeleteEverything()
-{
-    WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
-    WX_CLEAR_ARRAY(m_aColWidths);
-
-    DeleteAllItems();
-}
-
-// ----------------------------------------------------------------------------
-// scanning for an item
-// ----------------------------------------------------------------------------
-
-void wxListMainWindow::EnsureVisible( long index )
-{
-    wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
-                 _T("invalid index in EnsureVisible") );
-
-    // We have to call this here because the label in question might just have
-    // been added and its position is not known yet
-    if ( m_dirty )
-        RecalculatePositions(true /* no refresh */);
-
-    MoveToItem((size_t)index);
-}
-
-long wxListMainWindow::FindItem(long start, const wxString& str, bool partial )
-{
-    if (str.empty())
-        return wxNOT_FOUND;
-
-    long pos = start;
-    wxString str_upper = str.Upper();
-    if (pos < 0)
-        pos = 0;
-
-    size_t count = GetItemCount();
-    for ( size_t i = (size_t)pos; i < count; i++ )
-    {
-        wxListLineData *line = GetLine(i);
-        wxString line_upper = line->GetText(0).Upper();
-        if (!partial)
-        {
-            if (line_upper == str_upper )
-                return i;
-        }
-        else
-        {
-            if (line_upper.find(str_upper) == 0)
-                return i;
-        }
-    }
-
-    return wxNOT_FOUND;
-}
-
-long wxListMainWindow::FindItem(long start, wxUIntPtr data)
-{
-    // Virtual list controls don't store user-data on m_lines; preserve the
-    // original "not found" outcome for them.
-    if ( IsVirtual() )
-        return wxNOT_FOUND;
-
-    // Fast path: callers asking for the first match (start <= 0) get an O(1)
-    // hash lookup. aMule's list controls all call FindItem(-1, pointer) here.
-    if ( start <= 0 )
-    {
-        if ( m_dataIndexDirty )
-            RebuildDataIndex();
-
-        std::unordered_map<wxUIntPtr, size_t>::const_iterator it =
-            m_dataIndex.find( data );
-        return it != m_dataIndex.end() ? (long)it->second : wxNOT_FOUND;
-    }
-
-    // Slow path for start > 0: callers want the first match at or after a
-    // given index. Direct access to m_linesi.m_items.GetFirst()->m_data
-    // avoids the per-iteration wxListItem construction (and its wxString
-    // allocations) that the original scan paid on every row.
-    size_t count = m_lines.GetCount();
-    for ( size_t i = (size_t)start; i < count; i++ )
-    {
-        wxListItemDataList::compatibility_iterator node =
-            m_linesi.m_items.GetFirst();
-        if ( node && node->GetData()->m_data == data )
-            return (long)i;
-    }
-    return wxNOT_FOUND;
-}
-
-void wxListMainWindow::RebuildDataIndex() const
-{
-    m_dataIndex.clear();
-    if ( IsVirtual() )
-    {
-        m_dataIndexDirty = false;
-        return;
-    }
-    const size_t n = m_lines.GetCount();
-    m_dataIndex.reserve( n );
-    for ( size_t i = 0; i < n; i++ )
-    {
-        wxListItemDataList::compatibility_iterator node =
-            m_linesi.m_items.GetFirst();
-        if ( node )
-            m_dataIndexnode->GetData()->m_data = i;
-    }
-    m_dataIndexDirty = false;
-}
-
-long wxListMainWindow::FindItem( const wxPoint& pt )
-{
-    size_t topItem;
-    GetVisibleLinesRange( &topItem, NULL );
-
-    wxPoint p;
-    GetItemPosition( GetItemCount() - 1, p );
-    if ( p.y == 0 )
-        return topItem;
-
-    long id = (long)floor( pt.y * double(GetItemCount() - topItem - 1) / p.y + topItem );
-    if ( id >= 0 && id < (long)GetItemCount() )
-        return id;
-
-    return wxNOT_FOUND;
-}
-
-long wxListMainWindow::HitTest( int x, int y, int &flags ) const
-{
-    CalcUnscrolledPosition( x, y, &x, &y );
-
-    size_t count = GetItemCount();
-
-    if ( InReportView() )
-    {
-        size_t current = y / GetLineHeight();
-        if ( current < count )
-        {
-            flags = HitTestLine(current, x, y);
-            if ( flags )
-                return current;
-        }
-    }
-    else // !report
-    {
-        // TODO: optimize it too! this is less simple than for report view but
-        //       enumerating all items is still not a way to do it!!
-        for ( size_t current = 0; current < count; current++ )
-        {
-            flags = HitTestLine(current, x, y);
-            if ( flags )
-                return current;
-        }
-    }
-
-    return wxNOT_FOUND;
-}
-
-// ----------------------------------------------------------------------------
-// adding stuff
-// ----------------------------------------------------------------------------
-
-void wxListMainWindow::InsertItem( wxListItem &item )
-{
-    wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual control") );
-
-    int count = GetItemCount();
-    wxCHECK_RET( item.m_itemId >= 0, _T("invalid item index") );
-
-    if (item.m_itemId > count)
-        item.m_itemId = count;
-
-    size_t id = item.m_itemId;
-
-    m_dirty = true;
-
-    if ( InReportView() )
-    {
-        ResetVisibleLinesRange();
-
-        // calculate the width of the item and adjust the max column width
-        wxColWidthInfo *pWidthInfo = m_aColWidths.Item(item.GetColumn());
-        int width = GetItemWidthWithImage(&item);
-        item.SetWidth(width);
-        if (width > pWidthInfo->nMaxWidth)
-            pWidthInfo->nMaxWidth = width;
-    }
-
-    wxListLineData *line = new wxListLineData(this);
-
-    line->SetItem( item.m_col, item );
-
-    m_lines.Insert( line, id );
-
-    // Keep the data->index map consistent: appending at the end is the common
-    // case and stays O(1) without rebuild. A middle-insert shifts subsequent
-    // indices and forces a rebuild on the next FindItem().
-    if ( !m_dataIndexDirty && (item.m_mask & wxLIST_MASK_DATA) &&
-         id == m_lines.GetCount() - 1 )
-    {
-        m_dataIndexitem.m_data = id;
-    }
-    else
-    {
-        m_dataIndexDirty = true;
-    }
-
-    m_dirty = true;
-
-    // If an item is selected at or below the point of insertion, we need to
-    // increment the member variables because the current row's index has gone
-    // up by one
-    if ( HasCurrent() && m_current >= id )
-        m_current++;
-
-    SendNotify(id, wxEVT_LIST_INSERT_ITEM);
-
-    RefreshLines(id, GetItemCount() - 1);
-}
-
-void wxListMainWindow::InsertColumn( long col, wxListItem &item )
-{
-    m_dirty = true;
-    if ( InReportView() )
-    {
-        if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)
-            item.m_width = GetTextLength( item.m_text );
-
-        wxListHeaderData *column = new wxListHeaderData( item );
-        wxColWidthInfo *colWidthInfo = new wxColWidthInfo();
-
-        bool insert = (col >= 0) && ((size_t)col < m_columns.GetCount());
-        if ( insert )
-        {
-            wxListHeaderDataList::compatibility_iterator
-                node = m_columns.Item( col );
-            m_columns.Insert( node, column );
-            m_aColWidths.Insert( colWidthInfo, col );
-        }
-        else
-        {
-            m_columns.Append( column );
-            m_aColWidths.Add( colWidthInfo );
-        }
-
-        if ( !IsVirtual() )
-        {
-            // update all the items
-            for ( size_t i = 0; i < m_lines.GetCount(); i++ )
-            {
-                wxListLineData * const line = GetLine(i);
-                wxListItemData * const data = new wxListItemData(this);
-                if ( insert )
-                    line->m_items.Insert(col, data);
-                else
-                    line->m_items.Append(data);
-            }
-        }
-
-        // invalidate it as it has to be recalculated
-        m_headerWidth = 0;
-    }
-}
-
-int wxListMainWindow::GetItemWidthWithImage(wxListItem * item)
-{
-    int width = 0;
-    wxClientDC dc(this);
-
-    dc.SetFont( GetFont() );
-
-    if (item->GetImage() != -1)
-    {
-        int ix, iy;
-        GetImageSize( item->GetImage(), ix, iy );
-        width += ix + 5;
-    }
-
-    if (!item->GetText().empty())
-    {
-        wxCoord w;
-        dc.GetTextExtent( item->GetText(), &w, NULL );
-        width += w;
-    }
-
-    return width;
-}
-
-// ----------------------------------------------------------------------------
-// sorting
-// ----------------------------------------------------------------------------
-
-MuleListCtrlCompare list_ctrl_compare_func_2;
-wxIntPtr          list_ctrl_compare_data;
-
-static int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 )
-{
-    wxListLineData *line1 = *arg1;
-    wxListLineData *line2 = *arg2;
-    wxListItem item;
-    line1->GetItem( 0, item );
-    wxUIntPtr data1 = item.m_data;
-    line2->GetItem( 0, item );
-    wxUIntPtr data2 = item.m_data;
-    return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );
-}
-
-void wxListMainWindow::SortItems( MuleListCtrlCompare fn, wxIntPtr data )
-{
-    // selections won't make sense any more after sorting the items so reset
-    // them
-    HighlightAll(false);
-    ResetCurrent();
-
-    list_ctrl_compare_func_2 = fn;
-    list_ctrl_compare_data = data;
-    m_lines.Sort( list_ctrl_compare_func_1 );
-    m_dirty = true;
-    m_dataIndexDirty = true;
-}
-
-// ----------------------------------------------------------------------------
-// scrolling
-// ----------------------------------------------------------------------------
-
-void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
-{
-      // wxScrolledWindows::OnScroll is deprecated in wx 3.0.0 and it does not exist anymore in 3.1.0.
-    // Please also notice that call to
-    // - wxScrolledWindow::OnScroll
-    // - HandleOnScroll
-    // have been removed in code present in
-    // src/generic/listctrl.cpp, wxListMainWindow::OnScroll
-    // of wxWidgets 3.0
-    // FIXME
-    HandleOnScroll( event );
-
-    // update our idea of which lines are shown when we redraw the window the
-    // next time
-    ResetVisibleLinesRange();
-
-    if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
-    {
-        wxGenericListCtrl* lc = GetListCtrl();
-        wxCHECK_RET( lc, _T("no listctrl window?") );
-
-        lc->m_headerWin->Refresh();
-        lc->m_headerWin->Update();
-    }
-}
-
-int wxListMainWindow::GetCountPerPage() const
-{
-    if ( !m_linesPerPage )
-    {
-        wxConstCast(this, wxListMainWindow)->
-            m_linesPerPage = GetClientSize().y / GetLineHeight();
-    }
-
-    return m_linesPerPage;
-}
-
-void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
-{
-    wxASSERT_MSG( InReportView(), _T("this is for report mode only") );
-
-    if ( m_lineFrom == (size_t)-1 )
-    {
-        size_t count = GetItemCount();
-        if ( count )
-        {
-            m_lineFrom = GetScrollPos(wxVERTICAL);
-
-            // this may happen if SetScrollbars() hadn't been called yet
-            if ( m_lineFrom >= count )
-                m_lineFrom = count - 1;
-
-            // we redraw one extra line but this is needed to make the redrawing
-            // logic work when there is a fractional number of lines on screen
-            m_lineTo = m_lineFrom + m_linesPerPage;
-            if ( m_lineTo >= count )
-                m_lineTo = count - 1;
-        }
-        else // empty control
-        {
-            m_lineFrom = 0;
-            m_lineTo = (size_t)-1;
-        }
-    }
-
-    wxASSERT_MSG( IsEmpty() ||
-                  (m_lineFrom <= m_lineTo && m_lineTo < GetItemCount()),
-                  _T("GetVisibleLinesRange() returns incorrect result") );
-
-    if ( from )
-        *from = m_lineFrom;
-    if ( to )
-        *to = m_lineTo;
-}
-
-// -------------------------------------------------------------------------------------
-// wxGenericListCtrl
-// -------------------------------------------------------------------------------------
-
-wxBEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl)
-  EVT_SIZE(wxGenericListCtrl::OnSize)
-wxEND_EVENT_TABLE()
-
-wxGenericListCtrl::wxGenericListCtrl()
-{
-    m_imageListNormal = (wxImageList *) NULL;
-    m_imageListSmall = (wxImageList *) NULL;
-    m_imageListState = (wxImageList *) NULL;
-
-    m_ownsImageListNormal =
-    m_ownsImageListSmall =
-    m_ownsImageListState = false;
-
-    m_mainWin = (wxListMainWindow*) NULL;
-    m_headerWin = (wxListHeaderWindow*) NULL;
-    m_headerHeight = 0;
-}
-
-wxGenericListCtrl::~wxGenericListCtrl()
-{
-    if (m_ownsImageListNormal)
-        delete m_imageListNormal;
-    if (m_ownsImageListSmall)
-        delete m_imageListSmall;
-    if (m_ownsImageListState)
-        delete m_imageListState;
-}
-
-void wxGenericListCtrl::CalculateAndSetHeaderHeight()
-{
-    if ( m_headerWin )
-    {
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
-        SInt32 h;
-        GetThemeMetric( kThemeMetricListHeaderHeight, &h );
-#else
-        // we use 'g' to get the descent, too
-        int w, h, d;
-        m_headerWin->GetTextExtent("Hg", &w, &h, &d);
-        h += d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;
-#endif
-
-        // only update if changed
-        if ( h != m_headerHeight )
-        {
-            m_headerHeight = h;
-
-            if ( HasHeader() )
-                ResizeReportView(true);
-            else    //why is this needed if it doesn't have a header?
-                m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
-        }
-    }
-}
-
-void wxGenericListCtrl::CreateHeaderWindow()
-{
-    m_headerWin = new wxListHeaderWindow
-                      (
-                        this, wxID_ANY, m_mainWin,
-                        wxPoint(0,0),
-                        wxSize(GetClientSize().x, m_headerHeight),
-                        wxTAB_TRAVERSAL
-                      );
-    CalculateAndSetHeaderHeight();
-}
-
-bool wxGenericListCtrl::GetFocus()
-{
-	return m_mainWin->m_hasFocus;
-}
-
-bool wxGenericListCtrl::Create(wxWindow *parent,
-                        wxWindowID id,
-                        const wxPoint &pos,
-                        const wxSize &size,
-                        long style,
-                        const wxValidator &validator,
-                        const wxString &name)
-{
-    m_imageListNormal =
-    m_imageListSmall =
-    m_imageListState = (wxImageList *) NULL;
-    m_ownsImageListNormal =
-    m_ownsImageListSmall =
-    m_ownsImageListState = false;
-
-    m_mainWin = (wxListMainWindow*) NULL;
-    m_headerWin = (wxListHeaderWindow*) NULL;
-
-    m_headerHeight = 0;
-
-    if ( !(style & wxLC_MASK_TYPE) )
-    {
-        style = style | wxLC_LIST;
-    }
-
-    // add more styles here that should only appear
-    // in the main window
-    unsigned long only_main_window_style = wxALWAYS_SHOW_SB;
-
-    if ( !wxControl::Create( parent, id, pos, size, style & ~only_main_window_style, validator, name ) )
-        return false;
-
-    // don't create the inner window with the border
-    style &= ~wxBORDER_MASK;
-
-    m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );
-
-#ifdef  __WXMAC_CARBON__
-    // Human Interface Guidelines ask us for a special font in this case
-    if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
-    {
-        wxFont font;
-        font.MacCreateThemeFont( kThemeViewsFont );
-        SetFont( font );
-    }
-#endif
-
-    if ( InReportView() )
-    {
-        CreateHeaderWindow();
-
-#ifdef  __WXMAC_CARBON__
-        if (m_headerWin)
-        {
-            wxFont font;
-            font.MacCreateThemeFont( kThemeSmallSystemFont );
-            m_headerWin->SetFont( font );
-            CalculateAndSetHeaderHeight();
-        }
-#endif
-
-        if ( HasFlag(wxLC_NO_HEADER) )
-            // VZ: why do we create it at all then?
-            m_headerWin->Show( false );
-    }
-
-    SetInitialSize(size);
-
-    return true;
-}
-
-void wxGenericListCtrl::SetSingleStyle( long style, bool add )
-{
-    wxASSERT_MSG( !(style & wxLC_VIRTUAL),
-                  _T("wxLC_VIRTUAL can't be unset") );
-
-    long flag = GetWindowStyle();
-
-    if (add)
-    {
-        if (style & wxLC_MASK_TYPE)
-            flag &= ~(wxLC_MASK_TYPE | wxLC_VIRTUAL);
-        if (style & wxLC_MASK_ALIGN)
-            flag &= ~wxLC_MASK_ALIGN;
-        if (style & wxLC_MASK_SORT)
-            flag &= ~wxLC_MASK_SORT;
-    }
-
-    if (add)
-        flag |= style;
-    else
-        flag &= ~style;
-
-    // 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 )
-{
-    if (m_mainWin)
-    {
-        m_mainWin->DeleteEverything();
-
-        // has the header visibility changed?
-        bool hasHeader = HasHeader();
-        bool willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);
-
-        if ( hasHeader != willHaveHeader )
-        {
-            // toggle it
-            if ( hasHeader )
-            {
-                if ( m_headerWin )
-                {
-                    // don't delete, just hide, as we can reuse it later
-                    m_headerWin->Show(false);
-                }
-                //else: nothing to do
-            }
-            else // must show header
-            {
-                if (!m_headerWin)
-                {
-                    CreateHeaderWindow();
-                }
-                else // already have it, just show
-                {
-                    m_headerWin->Show( true );
-                }
-            }
-
-            ResizeReportView(willHaveHeader);
-        }
-    }
-
-    wxWindow::SetWindowStyleFlag( flag );
-}
-
-bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const
-{
-    m_mainWin->GetColumn( col, item );
-    return true;
-}
-
-bool wxGenericListCtrl::SetColumn( int col, wxListItem& item )
-{
-    m_mainWin->SetColumn( col, item );
-    return true;
-}
-
-int wxGenericListCtrl::GetColumnWidth( int col ) const
-{
-    return m_mainWin->GetColumnWidth( col );
-}
-
-bool wxGenericListCtrl::SetColumnWidth( int col, int width )
-{
-    m_mainWin->SetColumnWidth( col, width );
-    return true;
-}
-
-int wxGenericListCtrl::GetCountPerPage() const
-{
-  return m_mainWin->GetCountPerPage();  // different from Windows ?
-}
-
-bool wxGenericListCtrl::GetItem( wxListItem &info ) const
-{
-    m_mainWin->GetItem( info );
-    return true;
-}
-
-bool wxGenericListCtrl::SetItem( wxListItem &info )
-{
-    m_mainWin->SetItem( info );
-    return true;
-}
-
-long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int imageId )
-{
-    wxListItem info;
-    info.m_text = label;
-    info.m_mask = wxLIST_MASK_TEXT;
-    info.m_itemId = index;
-    info.m_col = col;
-    if ( imageId > -1 )
-    {
-        info.m_image = imageId;
-        info.m_mask |= wxLIST_MASK_IMAGE;
-    }
-
-    m_mainWin->SetItem(info);
-    return true;
-}
-
-int wxGenericListCtrl::GetItemState( long item, long stateMask ) const
-{
-    return m_mainWin->GetItemState( item, stateMask );
-}
-
-bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask )
-{
-    m_mainWin->SetItemState( item, state, stateMask );
-    return true;
-}
-
-bool
-wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
-{
-    return SetItemColumnImage(item, 0, image);
-}
-
-bool
-wxGenericListCtrl::SetItemColumnImage( long item, long column, int image )
-{
-    wxListItem info;
-    info.m_image = image;
-    info.m_mask = wxLIST_MASK_IMAGE;
-    info.m_itemId = item;
-    info.m_col = column;
-    m_mainWin->SetItem( info );
-    return true;
-}
-
-wxString wxGenericListCtrl::GetItemText( long item ) const
-{
-    return m_mainWin->GetItemText(item);
-}
-
-void wxGenericListCtrl::SetItemText( long item, const wxString& str )
-{
-    m_mainWin->SetItemText(item, str);
-}
-
-wxUIntPtr wxGenericListCtrl::GetItemData( long item ) const
-{
-    wxListItem info;
-    info.m_mask = wxLIST_MASK_DATA;
-    info.m_itemId = item;
-    m_mainWin->GetItem( info );
-    return info.m_data;
-}
-
-bool wxGenericListCtrl::SetItemPtrData( long item, wxUIntPtr data )
-{
-    wxListItem info;
-    info.m_mask = wxLIST_MASK_DATA;
-    info.m_itemId = item;
-    info.m_data = data;
-    m_mainWin->SetItem( info );
-    return true;
-}
-
-#if 0
-bool wxGenericListCtrl::SetItemData(long item, long data)
-{
-    return SetItemPtrData(item, data);
-}
-#endif
-
-wxRect wxGenericListCtrl::GetViewRect() const
-{
-    return m_mainWin->GetViewRect();
-}
-
-bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect, int WXUNUSED(code) ) const
-{
-    m_mainWin->GetItemRect( item, rect );
-    if ( m_mainWin->HasHeader() )
-        rect.y += m_headerHeight + 1;
-    return true;
-}
-
-bool wxGenericListCtrl::GetItemPosition( long item, wxPoint& pos ) const
-{
-    m_mainWin->GetItemPosition( item, pos );
-    return true;
-}
-
-bool wxGenericListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )
-{
-    return 0;
-}
-
-int wxGenericListCtrl::GetItemCount() const
-{
-    return m_mainWin->GetItemCount();
-}
-
-int wxGenericListCtrl::GetColumnCount() const
-{
-    return m_mainWin->GetColumnCount();
-}
-
-void wxGenericListCtrl::SetItemSpacing( int spacing, bool isSmall )
-{
-    m_mainWin->SetItemSpacing( spacing, isSmall );
-}
-
-wxSize wxGenericListCtrl::GetItemSpacing() const
-{
-    const int spacing = m_mainWin->GetItemSpacing(HasFlag(wxLC_SMALL_ICON));
-
-    return wxSize(spacing, spacing);
-}
-
-void wxGenericListCtrl::OnDrawItem(int WXUNUSED(item), wxDC* WXUNUSED(dc), const wxRect& WXUNUSED(rect), const wxRect& WXUNUSED(rectHL), bool WXUNUSED(highlighted))
-{
-	// do nothing here, this is just a stub
-}
-
-void wxGenericListCtrl::SetItemTextColour( long item, const wxColour &col )
-{
-    wxListItem info;
-    info.m_itemId = item;
-    info.SetTextColour( col );
-    m_mainWin->SetItem( info );
-}
-
-wxColour wxGenericListCtrl::GetItemTextColour( long item ) const
-{
-    wxListItem info;
-    info.m_itemId = item;
-    m_mainWin->GetItem( info );
-    return info.GetTextColour();
-}
-
-void wxGenericListCtrl::SetItemBackgroundColour( long item, const wxColour &col )
-{
-    wxListItem info;
-    info.m_itemId = item;
-    info.SetBackgroundColour( col );
-    m_mainWin->SetItem( info );
-}
-
-wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const
-{
-    wxListItem info;
-    info.m_itemId = item;
-    m_mainWin->GetItem( info );
-    return info.GetBackgroundColour();
-}
-
-int wxGenericListCtrl::GetScrollPos( int orient ) const
-{
-    return m_mainWin->GetScrollPos( orient );
-}
-
-void wxGenericListCtrl::SetScrollPos( int orient, int pos, bool refresh )
-{
-    m_mainWin->SetScrollPos( orient, pos, refresh );
-}
-
-void wxGenericListCtrl::SetItemFont( long item, const wxFont &f )
-{
-    wxListItem info;
-    info.m_itemId = item;
-    info.SetFont( f );
-    m_mainWin->SetItem( info );
-}
-
-wxFont wxGenericListCtrl::GetItemFont( long item ) const
-{
-    wxListItem info;
-    info.m_itemId = item;
-    m_mainWin->GetItem( info );
-    return info.GetFont();
-}
-
-int wxGenericListCtrl::GetSelectedItemCount() const
-{
-    return m_mainWin->GetSelectedItemCount();
-}
-
-wxColour wxGenericListCtrl::GetTextColour() const
-{
-    return GetForegroundColour();
-}
-
-void wxGenericListCtrl::SetTextColour(const wxColour& col)
-{
-    SetForegroundColour(col);
-}
-
-long wxGenericListCtrl::GetTopItem() const
-{
-    size_t top;
-    m_mainWin->GetVisibleLinesRange(&top, NULL);
-    return (long)top;
-}
-
-void wxGenericListCtrl::GetVisibleLines(long* first, long* last)
-{
-	size_t from, to;
-
-	m_mainWin->GetVisibleLinesRange(&from, &to);
-
-	if (first) *first = (long)from;
-	if (last) *last = (long)to;
-}
-
-long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const
-{
-    return m_mainWin->GetNextItem( item, geom, state );
-}
-
-wxImageList *wxGenericListCtrl::GetImageList(int which) const
-{
-    if (which == wxIMAGE_LIST_NORMAL)
-        return m_imageListNormal;
-    else if (which == wxIMAGE_LIST_SMALL)
-        return m_imageListSmall;
-    else if (which == wxIMAGE_LIST_STATE)
-        return m_imageListState;
-
-    return (wxImageList *) NULL;
-}
-
-void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which )
-{
-    if ( which == wxIMAGE_LIST_NORMAL )
-    {
-        if (m_ownsImageListNormal)
-            delete m_imageListNormal;
-        m_imageListNormal = imageList;
-        m_ownsImageListNormal = false;
-    }
-    else if ( which == wxIMAGE_LIST_SMALL )
-    {
-        if (m_ownsImageListSmall)
-            delete m_imageListSmall;
-        m_imageListSmall = imageList;
-        m_ownsImageListSmall = false;
-    }
-    else if ( which == wxIMAGE_LIST_STATE )
-    {
-        if (m_ownsImageListState)
-            delete m_imageListState;
-        m_imageListState = imageList;
-        m_ownsImageListState = false;
-    }
-
-    m_mainWin->SetImageList( imageList, which );
-}
-
-void wxGenericListCtrl::AssignImageList(wxImageList *imageList, int which)
-{
-    SetImageList(imageList, which);
-    if ( which == wxIMAGE_LIST_NORMAL )
-        m_ownsImageListNormal = true;
-    else if ( which == wxIMAGE_LIST_SMALL )
-        m_ownsImageListSmall = true;
-    else if ( which == wxIMAGE_LIST_STATE )
-        m_ownsImageListState = true;
-}
-
-bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) )
-{
-    return 0;
-}
-
-bool wxGenericListCtrl::DeleteItem( long item )
-{
-    m_mainWin->DeleteItem( item );
-    return true;
-}
-
-bool wxGenericListCtrl::DeleteAllItems()
-{
-    m_mainWin->DeleteAllItems();
-    return true;
-}
-
-bool wxGenericListCtrl::DeleteAllColumns()
-{
-    size_t count = m_mainWin->m_columns.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-        DeleteColumn( 0 );
-    return true;
-}
-
-void wxGenericListCtrl::ClearAll()
-{
-    m_mainWin->DeleteEverything();
-}
-
-bool wxGenericListCtrl::DeleteColumn( int col )
-{
-    m_mainWin->DeleteColumn( col );
-
-    // if we don't have the header any longer, we need to relayout the window
-    if ( !GetColumnCount() )
-        ResizeReportView(false /* no header */);
-    return true;
-}
-
-wxTextCtrl *wxGenericListCtrl::EditLabel(long item,
-                                         wxClassInfo* textControlClass)
-{
-    return m_mainWin->EditLabel( item, textControlClass );
-}
-
-wxTextCtrl *wxGenericListCtrl::GetEditControl() const
-{
-    return m_mainWin->GetEditControl();
-}
-
-bool wxGenericListCtrl::EnsureVisible( long item )
-{
-    m_mainWin->EnsureVisible( item );
-    return true;
-}
-
-long wxGenericListCtrl::FindItem( long start, const wxString& str, bool partial )
-{
-    return m_mainWin->FindItem( start, str, partial );
-}
-
-long wxGenericListCtrl::FindItem( long start, wxUIntPtr data )
-{
-    return m_mainWin->FindItem( start, data );
-}
-
-long wxGenericListCtrl::FindItem( long WXUNUSED(start), const wxPoint& pt,
-                           int WXUNUSED(direction))
-{
-    return m_mainWin->FindItem( pt );
-}
-
-// TODO: sub item hit testing
-long wxGenericListCtrl::HitTest(const wxPoint& point, int& flags, long *) const
-{
-    return m_mainWin->HitTest( (int)point.x, (int)point.y, flags );
-}
-
-long wxGenericListCtrl::InsertItem( wxListItem& info )
-{
-    m_mainWin->InsertItem( info );
-    return info.m_itemId;
-}
-
-long wxGenericListCtrl::InsertItem( long index, const wxString &label )
-{
-    wxListItem info;
-    info.m_text = label;
-    info.m_mask = wxLIST_MASK_TEXT;
-    info.m_itemId = index;
-    return InsertItem( info );
-}
-
-long wxGenericListCtrl::InsertItem( long index, int imageIndex )
-{
-    wxListItem info;
-    info.m_mask = wxLIST_MASK_IMAGE;
-    info.m_image = imageIndex;
-    info.m_itemId = index;
-    return InsertItem( info );
-}
-
-long wxGenericListCtrl::InsertItem( long index, const wxString &label, int imageIndex )
-{
-    wxListItem info;
-    info.m_text = label;
-    info.m_image = imageIndex;
-    info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE;
-    info.m_itemId = index;
-    return InsertItem( info );
-}
-
-long wxGenericListCtrl::InsertColumn( long col, wxListItem &item )
-{
-    wxCHECK_MSG( m_headerWin, -1, _T("can't add column in non report mode") );
-
-    m_mainWin->InsertColumn( col, item );
-
-    // if we hadn't had a header before but have one now
-    // then we need to relayout the window
-    if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )
-        ResizeReportView(true /* have header */);
-
-    m_headerWin->Refresh();
-
-    return 0;
-}
-
-long wxGenericListCtrl::InsertColumn( long col, const wxString &heading,
-                               int format, int width )
-{
-    wxListItem item;
-    item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
-    item.m_text = heading;
-    if (width >= -2)
-    {
-        item.m_mask |= wxLIST_MASK_WIDTH;
-        item.m_width = width;
-    }
-
-    item.m_format = format;
-
-    return InsertColumn( col, item );
-}
-
-bool wxGenericListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
-{
-    return 0;
-}
-
-// Sort items.
-// fn is a function which takes 3 long arguments: item1, item2, data.
-// item1 is the long data associated with a first item (NOT the index).
-// item2 is the long data associated with a second item (NOT the index).
-// data is the same value as passed to SortItems.
-// The return value is a negative number if the first item should precede the second
-// item, a positive number of the second item should precede the first,
-// or zero if the two items are equivalent.
-// data is arbitrary data to be passed to the sort function.
-
-bool wxGenericListCtrl::SortItems( MuleListCtrlCompare fn, wxIntPtr data )
-{
-    m_mainWin->SortItems( fn, data );
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-void wxGenericListCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-    if ( !m_mainWin )
-        return;
-
-    ResizeReportView(m_mainWin->HasHeader());
-    m_mainWin->RecalculatePositions();
-}
-
-void wxGenericListCtrl::ResizeReportView(bool showHeader)
-{
-    int cw, ch;
-    GetClientSize( &cw, &ch );
-
-    if ( showHeader )
-    {
-        m_headerWin->SetSize( 0, 0, cw, m_headerHeight );
-        if(ch > m_headerHeight)
-            m_mainWin->SetSize( 0, m_headerHeight + 1,
-                                   cw, ch - m_headerHeight - 1 );
-        else
-            m_mainWin->SetSize( 0, m_headerHeight + 1,
-                                   cw, 0);
-    }
-    else // no header window
-    {
-        m_mainWin->SetSize( 0, 0, cw, ch );
-    }
-}
-
-void wxGenericListCtrl::OnInternalIdle()
-{
-    wxWindow::OnInternalIdle();
-
-    // do it only if needed
-    if ( !m_mainWin->m_dirty )
-        return;
-
-    m_mainWin->RecalculatePositions();
-}
-
-// ----------------------------------------------------------------------------
-// font/colours
-// ----------------------------------------------------------------------------
-
-bool wxGenericListCtrl::SetBackgroundColour( const wxColour &colour )
-{
-    if (m_mainWin)
-    {
-        m_mainWin->SetBackgroundColour( colour );
-        m_mainWin->m_dirty = true;
-    }
-
-    return true;
-}
-
-bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )
-{
-    if ( !wxWindow::SetForegroundColour( colour ) )
-        return false;
-
-    if (m_mainWin)
-    {
-        m_mainWin->SetForegroundColour( colour );
-        m_mainWin->m_dirty = true;
-    }
-
-    if (m_headerWin)
-        m_headerWin->SetForegroundColour( colour );
-
-    return true;
-}
-
-bool wxGenericListCtrl::SetFont( const wxFont &font )
-{
-    if ( !wxWindow::SetFont( font ) )
-        return false;
-
-    if (m_mainWin)
-    {
-        m_mainWin->SetFont( font );
-        m_mainWin->m_dirty = true;
-    }
-
-    if (m_headerWin)
-    {
-        m_headerWin->SetFont( font );
-        CalculateAndSetHeaderHeight();
-    }
-
-    Refresh();
-
-    return true;
-}
-
-// static
-wxVisualAttributes
-wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
-{
-#if _USE_VISATTR
-    // Use the same color scheme as wxListBox
-    return wxListBox::GetClassDefaultAttributes(variant);
-#else
-    wxUnusedVar(variant);
-    wxVisualAttributes attr;
-    attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT);
-    attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
-    attr.font  = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-    return attr;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// methods forwarded to m_mainWin
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DRAG_AND_DROP
-
-void wxGenericListCtrl::SetDropTarget( wxDropTarget *dropTarget )
-{
-    m_mainWin->SetDropTarget( dropTarget );
-}
-
-wxDropTarget *wxGenericListCtrl::GetDropTarget() const
-{
-    return m_mainWin->GetDropTarget();
-}
-
-#endif
-
-bool wxGenericListCtrl::SetCursor( const wxCursor &cursor )
-{
-    return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : false;
-}
-
-wxColour wxGenericListCtrl::GetBackgroundColour() const
-{
-    return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour();
-}
-
-wxColour wxGenericListCtrl::GetForegroundColour() const
-{
-    return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour();
-}
-
-bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
-{
-#if wxUSE_MENUS
-    return m_mainWin->PopupMenu( menu, x, y );
-#else
-    return false;
-#endif
-}
-
-void wxGenericListCtrl::SetFocus()
-{
-    // The test in window.cpp fails as we are a composite
-    // window, so it checks against "this", but not m_mainWin.
-    if ( DoFindFocus() != this )
-        m_mainWin->SetFocus();
-}
-
-wxSize wxGenericListCtrl::DoGetBestSize() const
-{
-    // Something is better than nothing...
-    // 100x80 is what the MSW version will get from the default
-    // wxControl::DoGetBestSize
-    return wxSize(100, 80);
-}
-
-// ----------------------------------------------------------------------------
-// virtual list control support
-// ----------------------------------------------------------------------------
-
-wxString wxGenericListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const
-{
-    // this is a pure virtual function, in fact - which is not really pure
-    // because the controls which are not virtual don't need to implement it
-    wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemText not supposed to be called") );
-
-    return "";
-}
-
-int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
-{
-    wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
-                -1,
-                "List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden.");
-    return -1;
-}
-
-int wxGenericListCtrl::OnGetItemColumnImage(long item, long column) const
-{
-    if (!column)
-        return OnGetItemImage(item);
-
-   return -1;
-}
-
-wxListItemAttr *
-wxGenericListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
-{
-    wxASSERT_MSG( item >= 0 && item < GetItemCount(),
-                  _T("invalid item index in OnGetItemAttr()") );
-
-    // no attributes by default
-    return NULL;
-}
-
-void wxGenericListCtrl::SetItemCount(long count)
-{
-    wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
-
-    m_mainWin->SetItemCount(count);
-}
-
-void wxGenericListCtrl::RefreshItem(long item)
-{
-    m_mainWin->RefreshLine(item);
-}
-
-void wxGenericListCtrl::RefreshItems(long itemFrom, long itemTo)
-{
-    m_mainWin->RefreshLines(itemFrom, itemTo);
-}
-
-// Generic wxListCtrl is more or less a container for two other
-// windows which drawings are done upon. These are namely
-// 'm_headerWin' and 'm_mainWin'.
-// Here we override 'virtual wxWindow::Refresh()' to mimic the
-// behaviour wxListCtrl has under wxMSW.
-//
-void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect)
-{
-    if (!rect)
-    {
-        // The easy case, no rectangle specified.
-        if (m_headerWin)
-            m_headerWin->Refresh(eraseBackground);
-
-        if (m_mainWin)
-            m_mainWin->Refresh(eraseBackground);
-    }
-    else
-    {
-        // Refresh the header window
-        if (m_headerWin)
-        {
-            wxRect rectHeader = m_headerWin->GetRect();
-            rectHeader.Intersect(*rect);
-            if (rectHeader.GetWidth() && rectHeader.GetHeight())
-            {
-                int x, y;
-                m_headerWin->GetPosition(&x, &y);
-                rectHeader.Offset(-x, -y);
-                m_headerWin->Refresh(eraseBackground, &rectHeader);
-            }
-        }
-
-        // Refresh the main window
-        if (m_mainWin)
-        {
-            wxRect rectMain = m_mainWin->GetRect();
-            rectMain.Intersect(*rect);
-            if (rectMain.GetWidth() && rectMain.GetHeight())
-            {
-                int x, y;
-                m_mainWin->GetPosition(&x, &y);
-                rectMain.Offset(-x, -y);
-                m_mainWin->Refresh(eraseBackground, &rectMain);
-            }
-        }
-    }
-}
-
-void wxGenericListCtrl::Freeze()
-{
-    m_mainWin->Freeze();
-}
-
-void wxGenericListCtrl::Thaw()
-{
-    m_mainWin->Thaw();
-}
-
-} // namespace MuleExtern
-
-#endif // wxUSE_LISTCTRL

amule-3.0.1.tar.gz/src/extern/wxWidgets/listctrl.h Deleted

@@ -1,289 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/listctrl.h
-// Purpose:     Generic list control
-// Author:      Robert Roebling
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   Copyright (c) 1998-2011 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef LISTCTRL_287_H
-#define LISTCTRL_287_H
-
-#include <wx/defs.h>
-#include <wx/listbase.h>
-#include <wx/textctrl.h>
-
-#define wxLC_OWNERDRAW 0x10000
-
-#include <wx/imaglist.h>
-
-#if wxUSE_DRAG_AND_DROP
-class WXDLLEXPORT wxDropTarget;
-#endif
-
-// Fix for bug in wx's implementation, which uses longs for item*
-typedef int (wxCALLBACK *MuleListCtrlCompare)(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData);
-
-namespace MuleExtern {
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-extern const wxChar wxListCtrlNameStr;
-
-//-----------------------------------------------------------------------------
-// internal classes
-//-----------------------------------------------------------------------------
-
-class wxListHeaderWindow;
-class wxListMainWindow;
-
-//-----------------------------------------------------------------------------
-// wxListCtrl
-//-----------------------------------------------------------------------------
-
-class wxGenericListCtrl: public wxControl
-{
-public:
-
-    wxGenericListCtrl();
-    wxGenericListCtrl( wxWindow *parent,
-                wxWindowID winid = wxID_ANY,
-                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
-                long style = wxLC_ICON,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = wxListCtrlNameStr)
-    {
-        Create(parent, winid, pos, size, style, validator, name);
-    }
-    virtual ~wxGenericListCtrl();
-
-    bool Create( wxWindow *parent,
-                 wxWindowID winid = wxID_ANY,
-                 const wxPoint &pos = wxDefaultPosition,
-                 const wxSize &size = wxDefaultSize,
-                 long style = wxLC_ICON,
-                 const wxValidator& validator = wxDefaultValidator,
-                 const wxString &name = wxListCtrlNameStr);
-
-    bool GetColumn( int col, wxListItem& item ) const;
-    bool SetColumn( int col, wxListItem& item );
-    int GetColumnWidth( int col ) const;
-    bool SetColumnWidth( int col, int width);
-    int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think
-    void GetVisibleLines(long* first, long* last);
-    wxRect GetViewRect() const;
-
-    bool GetItem( wxListItem& info ) const;
-    bool SetItem( wxListItem& info );
-    long SetItem( long index, int col, const wxString& label, int imageId = -1 );
-    int  GetItemState( long item, long stateMask ) const;
-    bool SetItemState( long item, long state, long stateMask);
-    bool SetItemImage( long item, int image, int selImage = -1 );
-    bool SetItemColumnImage( long item, long column, int image );
-    wxString GetItemText( long item ) const;
-    void SetItemText( long item, const wxString& str );
-    wxUIntPtr GetItemData( long item ) const;
-#if wxABI_VERSION >= 20804
-    bool SetItemPtrData(long item, wxUIntPtr data);
-#endif // wxABI 2.8.4+
-
-// It is not certain that sizeof(long) == sizeof(void*), and since we
-// just about only use pointers as item-data, I've chosen to disable
-// this function to prevent mistakes. Use SetItemPtrData instead.
-#if 0
-    bool SetItemData(long item, long data);
-#endif
-    bool GetItemRect( long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS ) const;
-    bool GetItemPosition( long item, wxPoint& pos ) const;
-    bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC
-    int GetItemCount() const;
-    int GetColumnCount() const;
-    void SetItemSpacing( int spacing, bool isSmall = false );
-    wxSize GetItemSpacing() const;
-    void SetItemTextColour( long item, const wxColour& col);
-    wxColour GetItemTextColour( long item ) const;
-    void SetItemBackgroundColour( long item, const wxColour &col);
-    wxColour GetItemBackgroundColour( long item ) const;
-    void SetItemFont( long item, const wxFont &f);
-    wxFont GetItemFont( long item ) const;
-    int GetSelectedItemCount() const;
-    wxColour GetTextColour() const;
-    void SetTextColour(const wxColour& col);
-    long GetTopItem() const;
-
-    void SetSingleStyle( long style, bool add = true ) ;
-    void SetWindowStyleFlag( long style );
-    void RecreateWindow() {}
-    long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const;
-    wxImageList *GetImageList( int which ) const;
-    void SetImageList( wxImageList *imageList, int which );
-    void AssignImageList( wxImageList *imageList, int which );
-    bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
-
-    void ClearAll();
-    bool DeleteItem( long item );
-    bool DeleteAllItems();
-    bool DeleteAllColumns();
-    bool DeleteColumn( int col );
-
-    void SetItemCount(long count);
-
-    wxTextCtrl *EditLabel(long item,
-                          wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
-    wxTextCtrl* GetEditControl() const;
-    void Edit( long item ) { EditLabel(item); }
-
-    bool EnsureVisible( long item );
-    long FindItem( long start, const wxString& str, bool partial = false );
-    long FindItem( long start, wxUIntPtr data );
-    long FindItem( long start, const wxPoint& pt, int direction ); // not supported in wxGLC
-    long HitTest( const wxPoint& point, int& flags, long *pSubItem = NULL ) const;
-    long InsertItem(wxListItem& info);
-    long InsertItem( long index, const wxString& label );
-    long InsertItem( long index, int imageIndex );
-    long InsertItem( long index, const wxString& label, int imageIndex );
-    long InsertColumn( long col, wxListItem& info );
-    long InsertColumn( long col, const wxString& heading,
-                       int format = wxLIST_FORMAT_LEFT, int width = -1 );
-    bool ScrollList( int dx, int dy );
-    bool SortItems( MuleListCtrlCompare fn, wxIntPtr data );
-    bool Update( long item );
-    // Must provide overload to avoid hiding it (and warnings about it)
-    virtual void Update() { wxControl::Update(); }
-
-    // are we in report mode?
-    bool InReportView() const { return HasFlag(wxLC_REPORT); }
-
-    // are we in virtual report mode?
-    bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
-
-    // do we have a header window?
-    bool HasHeader() const
-        { return InReportView() && !HasFlag(wxLC_NO_HEADER); }
-
-    // refresh items selectively (only useful for virtual list controls)
-    void RefreshItem(long item);
-    void RefreshItems(long itemFrom, long itemTo);
-
-    virtual wxVisualAttributes GetDefaultAttributes() const
-    {
-        return GetClassDefaultAttributes(GetWindowVariant());
-    }
-
-    static wxVisualAttributes
-    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
-    // implementation only from now on
-    // -------------------------------
-
-    void OnInternalIdle( );
-    void OnSize( wxSizeEvent &event );
-
-    // We have to hand down a few functions
-    virtual void Refresh(bool eraseBackground = true,
-                         const wxRect *rect = NULL);
-
-    virtual void Freeze();
-    virtual void Thaw();
-    virtual void OnDrawItem(int item, wxDC* dc, const wxRect& rect, const wxRect& rectHL, bool highlighted);
-
-    virtual bool SetBackgroundColour( const wxColour &colour );
-    virtual bool SetForegroundColour( const wxColour &colour );
-    virtual wxColour GetBackgroundColour() const;
-    virtual wxColour GetForegroundColour() const;
-    virtual bool SetFont( const wxFont &font );
-    virtual bool SetCursor( const wxCursor &cursor );
-
-    virtual int GetScrollPos(int orient) const;
-    virtual void SetScrollPos(int orient, int pos, bool refresh = true);
-
-#if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget( wxDropTarget *dropTarget );
-    virtual wxDropTarget *GetDropTarget() const;
-#endif
-
-    virtual bool ShouldInheritColours() const { return false; }
-    virtual void SetFocus();
-    virtual bool GetFocus();
-
-    // implementation
-    // --------------
-
-    wxImageList         *m_imageListNormal;
-    wxImageList         *m_imageListSmall;
-    wxImageList         *m_imageListState;  // what's that ?
-    bool                 m_ownsImageListNormal,
-                         m_ownsImageListSmall,
-                         m_ownsImageListState;
-    wxListHeaderWindow  *m_headerWin;
-    wxListMainWindow    *m_mainWin;
-    wxCoord              m_headerHeight;
-
-protected:
-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
-
-    virtual wxSize DoGetBestSize() const;
-
-    // return the text for the given column of the given item
-    virtual wxString OnGetItemText(long item, long column) const;
-
-    // return the icon for the given item. In report view, OnGetItemImage will
-    // only be called for the first column. See OnGetItemColumnImage for
-    // details.
-    virtual int OnGetItemImage(long item) const;
-
-    // return the icon for the given item and column.
-    virtual int OnGetItemColumnImage(long item, long column) const;
-
-    // return the attribute for the item (may return NULL if none)
-    virtual wxListItemAttr *OnGetItemAttr(long item) const;
-
-    // it calls our OnGetXXX() functions
-    friend class wxListMainWindow;
-
-private:
-    // create the header window
-    void CreateHeaderWindow();
-
-    // calculate and set height of the header
-    void CalculateAndSetHeaderHeight();
-
-    // reposition the header and the main window in the report view depending
-    // on whether it should be shown or not
-    void ResizeReportView(bool showHeader);
-
-    wxDECLARE_EVENT_TABLE();
-};
-
-#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && (!defined(__WXMAC__) || defined(__WXUNIVERSAL__))
-/*
- * wxListCtrl has to be a real class or we have problems with
- * the run-time information.
- */
-
-class wxListCtrl: public wxGenericListCtrl
-{
-public:
-    wxListCtrl() {}
-
-    wxListCtrl(wxWindow *parent, wxWindowID winid = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxLC_ICON,
-               const wxValidator &validator = wxDefaultValidator,
-               const wxString &name = wxListCtrlNameStr)
-    : wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
-    {
-    }
-
-};
-#endif // !__WXMSW__ || __WXUNIVERSAL__
-
-} // namespace MuleExtern
-
-#endif // LISTCTRL_287_H

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECCodes.h Deleted

@@ -1,946 +0,0 @@
-// 
-//  This file is part of the aMule Project.
-// 
-//  Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
-// 
-//  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.
-
-#ifndef __ECCODES_H__
-#define __ECCODES_H__
-
-typedef uint8_t ec_opcode_t;
-typedef uint16_t ec_tagname_t;
-typedef uint8_t ec_tagtype_t;
-typedef uint32_t ec_taglen_t;
-
-enum ProtocolVersion {
-	EC_CURRENT_PROTOCOL_VERSION = 0x0204
-};
-
-enum ECFlags {
-	EC_FLAG_ZLIB	 = 0x00000001,
-	EC_FLAG_UTF8_NUMBERS = 0x00000002,
-	EC_FLAG_LARGE_TAG_COUNT = 0x00000010,
-	EC_FLAG_UNKNOWN_MASK = 0xff7f7f08
-};
-
-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_SHARED_FILES              = 0x10,
-	EC_OP_SHARED_SET_PRIO               = 0x11,
-	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_SHARED_FILES                  = 0x22,
-	EC_OP_SHAREDFILES_RELOAD            = 0x23,
-	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_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
-};
-
-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_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_KAD_ID                             = 0x0010,
-	EC_TAG_CAN_LARGE_TAG_COUNT                = 0x0011,
-	EC_TAG_CAN_PARTIAL_UPDATE                 = 0x0012,
-	EC_TAG_FILE_REMOVED                       = 0x0013,
-	EC_TAG_PREFER_NO_ZLIB                     = 0x0014,
-	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_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_ADDRESS                = 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_STATS_KAD_NODES                    = 0x021B,
-	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_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,
-		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_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,
-		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_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_SLOT                 = 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_DOWNLOAD_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_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,
-		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_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,
-			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_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_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_FILES_CREATE_NORMAL                = 0x180F,
-		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_DIRECTORIES_AUTO_RESCAN            = 0x1A05,
-			EC_TAG_DIRECTORIES_FOLLOW_SYMLINKS        = 0x1A06,
-		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,
-			// Active uploads / active downloads per point — parallel
-			// to STATSGRAPH_DATA's connection total, lets amulegui
-			// draw monolithic amule's 3-line connection scope.
-			EC_TAG_STATSGRAPH_DATA_CONN               = 0x1B0A,
-			// Session totals as of the latest point in the reply.
-			// Lets amulegui compute the daemon's
-			// kBytesReceived/sTimestamp session average instead of
-			// integrating locally from GUI startup.
-			EC_TAG_STATSGRAPH_SESSION_DL              = 0x1B0B,
-			EC_TAG_STATSGRAPH_SESSION_UL              = 0x1B0C,
-			EC_TAG_STATSGRAPH_SESSION_KAD             = 0x1B0D,
-			EC_TAG_STATSGRAPH_SESSION_TIMESPAN        = 0x1B0E,
-		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
-};
-
-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
-};
-
-enum EC_SEARCH_TYPE {
-	EC_SEARCH_LOCAL         = 0x00,
-	EC_SEARCH_GLOBAL        = 0x01,
-	EC_SEARCH_KAD           = 0x02,
-	EC_SEARCH_WEB           = 0x03
-};
-
-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
-};
-
-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_DIRECTORIES    = 0x00000200,
-	EC_PREFS_STATISTICS     = 0x00000400,
-	EC_PREFS_SECURITY       = 0x00000800,
-	EC_PREFS_CORETWEAKS     = 0x00001000,
-	EC_PREFS_KADEMLIA       = 0x00002000
-};
-
-#ifdef DEBUG_EC_IMPLEMENTATION
-
-wxString GetDebugNameProtocolVersion(uint16 arg)
-{
-	switch (arg) {
-		case 0x0204: return "EC_CURRENT_PROTOCOL_VERSION";
-		default: return CFormat("unknown %d 0x%x") % arg % arg;
-	}
-}
-
-wxString GetDebugNameECFlags(uint32 arg)
-{
-	switch (arg) {
-		case 0x00000001: return "EC_FLAG_ZLIB";
-		case 0x00000002: return "EC_FLAG_UTF8_NUMBERS";
-		case 0x00000010: return "EC_FLAG_LARGE_TAG_COUNT";
-		case 0xff7f7f08: return "EC_FLAG_UNKNOWN_MASK";
-		default: return CFormat("unknown %d 0x%x") % arg % arg;
-	}
-}
-
-wxString GetDebugNameECOpCodes(uint8 arg)
-{
-	switch (arg) {
-		case 0x01: return "EC_OP_NOOP";
-		case 0x02: return "EC_OP_AUTH_REQ";
-		case 0x03: return "EC_OP_AUTH_FAIL";
-		case 0x04: return "EC_OP_AUTH_OK";
-		case 0x05: return "EC_OP_FAILED";
-		case 0x06: return "EC_OP_STRINGS";
-		case 0x07: return "EC_OP_MISC_DATA";
-		case 0x08: return "EC_OP_SHUTDOWN";
-		case 0x09: return "EC_OP_ADD_LINK";
-		case 0x0A: return "EC_OP_STAT_REQ";
-		case 0x0B: return "EC_OP_GET_CONNSTATE";
-		case 0x0C: return "EC_OP_STATS";
-		case 0x0D: return "EC_OP_GET_DLOAD_QUEUE";
-		case 0x0E: return "EC_OP_GET_ULOAD_QUEUE";
-		case 0x10: return "EC_OP_GET_SHARED_FILES";
-		case 0x11: return "EC_OP_SHARED_SET_PRIO";
-		case 0x16: return "EC_OP_PARTFILE_SWAP_A4AF_THIS";
-		case 0x17: return "EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO";
-		case 0x18: return "EC_OP_PARTFILE_SWAP_A4AF_OTHERS";
-		case 0x19: return "EC_OP_PARTFILE_PAUSE";
-		case 0x1A: return "EC_OP_PARTFILE_RESUME";
-		case 0x1B: return "EC_OP_PARTFILE_STOP";
-		case 0x1C: return "EC_OP_PARTFILE_PRIO_SET";
-		case 0x1D: return "EC_OP_PARTFILE_DELETE";
-		case 0x1E: return "EC_OP_PARTFILE_SET_CAT";
-		case 0x1F: return "EC_OP_DLOAD_QUEUE";
-		case 0x20: return "EC_OP_ULOAD_QUEUE";
-		case 0x22: return "EC_OP_SHARED_FILES";
-		case 0x23: return "EC_OP_SHAREDFILES_RELOAD";
-		case 0x25: return "EC_OP_RENAME_FILE";
-		case 0x26: return "EC_OP_SEARCH_START";
-		case 0x27: return "EC_OP_SEARCH_STOP";
-		case 0x28: return "EC_OP_SEARCH_RESULTS";
-		case 0x29: return "EC_OP_SEARCH_PROGRESS";
-		case 0x2A: return "EC_OP_DOWNLOAD_SEARCH_RESULT";
-		case 0x2B: return "EC_OP_IPFILTER_RELOAD";
-		case 0x2C: return "EC_OP_GET_SERVER_LIST";
-		case 0x2D: return "EC_OP_SERVER_LIST";
-		case 0x2E: return "EC_OP_SERVER_DISCONNECT";
-		case 0x2F: return "EC_OP_SERVER_CONNECT";
-		case 0x30: return "EC_OP_SERVER_REMOVE";
-		case 0x31: return "EC_OP_SERVER_ADD";
-		case 0x32: return "EC_OP_SERVER_UPDATE_FROM_URL";
-		case 0x33: return "EC_OP_ADDLOGLINE";
-		case 0x34: return "EC_OP_ADDDEBUGLOGLINE";
-		case 0x35: return "EC_OP_GET_LOG";
-		case 0x36: return "EC_OP_GET_DEBUGLOG";
-		case 0x37: return "EC_OP_GET_SERVERINFO";
-		case 0x38: return "EC_OP_LOG";
-		case 0x39: return "EC_OP_DEBUGLOG";
-		case 0x3A: return "EC_OP_SERVERINFO";
-		case 0x3B: return "EC_OP_RESET_LOG";
-		case 0x3C: return "EC_OP_RESET_DEBUGLOG";
-		case 0x3D: return "EC_OP_CLEAR_SERVERINFO";
-		case 0x3E: return "EC_OP_GET_LAST_LOG_ENTRY";
-		case 0x3F: return "EC_OP_GET_PREFERENCES";
-		case 0x40: return "EC_OP_SET_PREFERENCES";
-		case 0x41: return "EC_OP_CREATE_CATEGORY";
-		case 0x42: return "EC_OP_UPDATE_CATEGORY";
-		case 0x43: return "EC_OP_DELETE_CATEGORY";
-		case 0x44: return "EC_OP_GET_STATSGRAPHS";
-		case 0x45: return "EC_OP_STATSGRAPHS";
-		case 0x46: return "EC_OP_GET_STATSTREE";
-		case 0x47: return "EC_OP_STATSTREE";
-		case 0x48: return "EC_OP_KAD_START";
-		case 0x49: return "EC_OP_KAD_STOP";
-		case 0x4A: return "EC_OP_CONNECT";
-		case 0x4B: return "EC_OP_DISCONNECT";
-		case 0x4D: return "EC_OP_KAD_UPDATE_FROM_URL";
-		case 0x4E: return "EC_OP_KAD_BOOTSTRAP_FROM_IP";
-		case 0x4F: return "EC_OP_AUTH_SALT";
-		case 0x50: return "EC_OP_AUTH_PASSWD";
-		case 0x51: return "EC_OP_IPFILTER_UPDATE";
-		case 0x52: return "EC_OP_GET_UPDATE";
-		case 0x53: return "EC_OP_CLEAR_COMPLETED";
-		case 0x54: return "EC_OP_CLIENT_SWAP_TO_ANOTHER_FILE";
-		case 0x55: return "EC_OP_SHARED_FILE_SET_COMMENT";
-		case 0x56: return "EC_OP_SERVER_SET_STATIC_PRIO";
-		case 0x57: return "EC_OP_FRIEND";
-		default: return CFormat("unknown %d 0x%x") % arg % arg;
-	}
-}
-
-wxString GetDebugNameECTagNames(uint16 arg)
-{
-	switch (arg) {
-		case 0x0000: return "EC_TAG_STRING";
-		case 0x0001: return "EC_TAG_PASSWD_HASH";
-		case 0x0002: return "EC_TAG_PROTOCOL_VERSION";
-		case 0x0003: return "EC_TAG_VERSION_ID";
-		case 0x0004: return "EC_TAG_DETAIL_LEVEL";
-		case 0x0005: return "EC_TAG_CONNSTATE";
-		case 0x0006: return "EC_TAG_ED2K_ID";
-		case 0x0007: return "EC_TAG_LOG_TO_STATUS";
-		case 0x0008: return "EC_TAG_BOOTSTRAP_IP";
-		case 0x0009: return "EC_TAG_BOOTSTRAP_PORT";
-		case 0x000A: return "EC_TAG_CLIENT_ID";
-		case 0x000B: return "EC_TAG_PASSWD_SALT";
-		case 0x000C: return "EC_TAG_CAN_ZLIB";
-		case 0x000D: return "EC_TAG_CAN_UTF8_NUMBERS";
-		case 0x000E: return "EC_TAG_CAN_NOTIFY";
-		case 0x000F: return "EC_TAG_ECID";
-		case 0x0010: return "EC_TAG_KAD_ID";
-		case 0x0011: return "EC_TAG_CAN_LARGE_TAG_COUNT";
-		case 0x0012: return "EC_TAG_CAN_PARTIAL_UPDATE";
-		case 0x0013: return "EC_TAG_FILE_REMOVED";
-		case 0x0014: return "EC_TAG_PREFER_NO_ZLIB";
-		case 0x0100: return "EC_TAG_CLIENT_NAME";
-		case 0x0101: return "EC_TAG_CLIENT_VERSION";
-		case 0x0102: return "EC_TAG_CLIENT_MOD";
-		case 0x0200: return "EC_TAG_STATS_UL_SPEED";
-		case 0x0201: return "EC_TAG_STATS_DL_SPEED";
-		case 0x0202: return "EC_TAG_STATS_UL_SPEED_LIMIT";
-		case 0x0203: return "EC_TAG_STATS_DL_SPEED_LIMIT";
-		case 0x0204: return "EC_TAG_STATS_UP_OVERHEAD";
-		case 0x0205: return "EC_TAG_STATS_DOWN_OVERHEAD";
-		case 0x0206: return "EC_TAG_STATS_TOTAL_SRC_COUNT";
-		case 0x0207: return "EC_TAG_STATS_BANNED_COUNT";
-		case 0x0208: return "EC_TAG_STATS_UL_QUEUE_LEN";
-		case 0x0209: return "EC_TAG_STATS_ED2K_USERS";
-		case 0x020A: return "EC_TAG_STATS_KAD_USERS";
-		case 0x020B: return "EC_TAG_STATS_ED2K_FILES";
-		case 0x020C: return "EC_TAG_STATS_KAD_FILES";
-		case 0x020D: return "EC_TAG_STATS_LOGGER_MESSAGE";
-		case 0x020E: return "EC_TAG_STATS_KAD_FIREWALLED_UDP";
-		case 0x020F: return "EC_TAG_STATS_KAD_INDEXED_SOURCES";
-		case 0x0210: return "EC_TAG_STATS_KAD_INDEXED_KEYWORDS";
-		case 0x0211: return "EC_TAG_STATS_KAD_INDEXED_NOTES";
-		case 0x0212: return "EC_TAG_STATS_KAD_INDEXED_LOAD";
-		case 0x0213: return "EC_TAG_STATS_KAD_IP_ADDRESS";
-		case 0x0214: return "EC_TAG_STATS_BUDDY_STATUS";
-		case 0x0215: return "EC_TAG_STATS_BUDDY_IP";
-		case 0x0216: return "EC_TAG_STATS_BUDDY_PORT";
-		case 0x0217: return "EC_TAG_STATS_KAD_IN_LAN_MODE";
-		case 0x0218: return "EC_TAG_STATS_TOTAL_SENT_BYTES";
-		case 0x0219: return "EC_TAG_STATS_TOTAL_RECEIVED_BYTES";
-		case 0x021A: return "EC_TAG_STATS_SHARED_FILE_COUNT";
-		case 0x021B: return "EC_TAG_STATS_KAD_NODES";
-		case 0x0300: return "EC_TAG_PARTFILE";
-		case 0x0301: return "EC_TAG_PARTFILE_NAME";
-		case 0x0302: return "EC_TAG_PARTFILE_PARTMETID";
-		case 0x0303: return "EC_TAG_PARTFILE_SIZE_FULL";
-		case 0x0304: return "EC_TAG_PARTFILE_SIZE_XFER";
-		case 0x0305: return "EC_TAG_PARTFILE_SIZE_XFER_UP";
-		case 0x0306: return "EC_TAG_PARTFILE_SIZE_DONE";
-		case 0x0307: return "EC_TAG_PARTFILE_SPEED";
-		case 0x0308: return "EC_TAG_PARTFILE_STATUS";
-		case 0x0309: return "EC_TAG_PARTFILE_PRIO";
-		case 0x030A: return "EC_TAG_PARTFILE_SOURCE_COUNT";
-		case 0x030B: return "EC_TAG_PARTFILE_SOURCE_COUNT_A4AF";
-		case 0x030C: return "EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT";
-		case 0x030D: return "EC_TAG_PARTFILE_SOURCE_COUNT_XFER";
-		case 0x030E: return "EC_TAG_PARTFILE_ED2K_LINK";
-		case 0x030F: return "EC_TAG_PARTFILE_CAT";
-		case 0x0310: return "EC_TAG_PARTFILE_LAST_RECV";
-		case 0x0311: return "EC_TAG_PARTFILE_LAST_SEEN_COMP";
-		case 0x0312: return "EC_TAG_PARTFILE_PART_STATUS";
-		case 0x0313: return "EC_TAG_PARTFILE_GAP_STATUS";
-		case 0x0314: return "EC_TAG_PARTFILE_REQ_STATUS";
-		case 0x0315: return "EC_TAG_PARTFILE_SOURCE_NAMES";
-		case 0x0316: return "EC_TAG_PARTFILE_COMMENTS";
-		case 0x0317: return "EC_TAG_PARTFILE_STOPPED";
-		case 0x0318: return "EC_TAG_PARTFILE_DOWNLOAD_ACTIVE";
-		case 0x0319: return "EC_TAG_PARTFILE_LOST_CORRUPTION";
-		case 0x031A: return "EC_TAG_PARTFILE_GAINED_COMPRESSION";
-		case 0x031B: return "EC_TAG_PARTFILE_SAVED_ICH";
-		case 0x031C: return "EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS";
-		case 0x031D: return "EC_TAG_PARTFILE_AVAILABLE_PARTS";
-		case 0x031E: return "EC_TAG_PARTFILE_HASH";
-		case 0x031F: return "EC_TAG_PARTFILE_SHARED";
-		case 0x0320: return "EC_TAG_PARTFILE_HASHED_PART_COUNT";
-		case 0x0321: return "EC_TAG_PARTFILE_A4AFAUTO";
-		case 0x0322: return "EC_TAG_PARTFILE_A4AF_SOURCES";
-		case 0x0400: return "EC_TAG_KNOWNFILE";
-		case 0x0401: return "EC_TAG_KNOWNFILE_XFERRED";
-		case 0x0402: return "EC_TAG_KNOWNFILE_XFERRED_ALL";
-		case 0x0403: return "EC_TAG_KNOWNFILE_REQ_COUNT";
-		case 0x0404: return "EC_TAG_KNOWNFILE_REQ_COUNT_ALL";
-		case 0x0405: return "EC_TAG_KNOWNFILE_ACCEPT_COUNT";
-		case 0x0406: return "EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL";
-		case 0x0407: return "EC_TAG_KNOWNFILE_AICH_MASTERHASH";
-		case 0x0408: return "EC_TAG_KNOWNFILE_FILENAME";
-		case 0x0409: return "EC_TAG_KNOWNFILE_COMPLETE_SOURCES_LOW";
-		case 0x040A: return "EC_TAG_KNOWNFILE_COMPLETE_SOURCES_HIGH";
-		case 0x040B: return "EC_TAG_KNOWNFILE_PRIO";
-		case 0x040C: return "EC_TAG_KNOWNFILE_ON_QUEUE";
-		case 0x040D: return "EC_TAG_KNOWNFILE_COMPLETE_SOURCES";
-		case 0x040E: return "EC_TAG_KNOWNFILE_COMMENT";
-		case 0x040F: return "EC_TAG_KNOWNFILE_RATING";
-		case 0x0500: return "EC_TAG_SERVER";
-		case 0x0501: return "EC_TAG_SERVER_NAME";
-		case 0x0502: return "EC_TAG_SERVER_DESC";
-		case 0x0503: return "EC_TAG_SERVER_ADDRESS";
-		case 0x0504: return "EC_TAG_SERVER_PING";
-		case 0x0505: return "EC_TAG_SERVER_USERS";
-		case 0x0506: return "EC_TAG_SERVER_USERS_MAX";
-		case 0x0507: return "EC_TAG_SERVER_FILES";
-		case 0x0508: return "EC_TAG_SERVER_PRIO";
-		case 0x0509: return "EC_TAG_SERVER_FAILED";
-		case 0x050A: return "EC_TAG_SERVER_STATIC";
-		case 0x050B: return "EC_TAG_SERVER_VERSION";
-		case 0x050C: return "EC_TAG_SERVER_IP";
-		case 0x050D: return "EC_TAG_SERVER_PORT";
-		case 0x0600: return "EC_TAG_CLIENT";
-		case 0x0601: return "EC_TAG_CLIENT_SOFTWARE";
-		case 0x0602: return "EC_TAG_CLIENT_SCORE";
-		case 0x0603: return "EC_TAG_CLIENT_HASH";
-		case 0x0604: return "EC_TAG_CLIENT_FRIEND_SLOT";
-		case 0x0605: return "EC_TAG_CLIENT_WAIT_TIME";
-		case 0x0606: return "EC_TAG_CLIENT_XFER_TIME";
-		case 0x0607: return "EC_TAG_CLIENT_QUEUE_TIME";
-		case 0x0608: return "EC_TAG_CLIENT_LAST_TIME";
-		case 0x0609: return "EC_TAG_CLIENT_UPLOAD_SESSION";
-		case 0x060A: return "EC_TAG_CLIENT_UPLOAD_TOTAL";
-		case 0x060B: return "EC_TAG_CLIENT_DOWNLOAD_TOTAL";
-		case 0x060C: return "EC_TAG_CLIENT_DOWNLOAD_STATE";
-		case 0x060D: return "EC_TAG_CLIENT_UP_SPEED";
-		case 0x060E: return "EC_TAG_CLIENT_DOWN_SPEED";
-		case 0x060F: return "EC_TAG_CLIENT_FROM";
-		case 0x0610: return "EC_TAG_CLIENT_USER_IP";
-		case 0x0611: return "EC_TAG_CLIENT_USER_PORT";
-		case 0x0612: return "EC_TAG_CLIENT_SERVER_IP";
-		case 0x0613: return "EC_TAG_CLIENT_SERVER_PORT";
-		case 0x0614: return "EC_TAG_CLIENT_SERVER_NAME";
-		case 0x0615: return "EC_TAG_CLIENT_SOFT_VER_STR";
-		case 0x0616: return "EC_TAG_CLIENT_WAITING_POSITION";
-		case 0x0617: return "EC_TAG_CLIENT_IDENT_STATE";
-		case 0x0618: return "EC_TAG_CLIENT_OBFUSCATION_STATUS";
-		case 0x0619: return "EC_TAG_CLIENT_CURRENTLYUNUSED1";
-		case 0x061A: return "EC_TAG_CLIENT_REMOTE_QUEUE_RANK";
-		case 0x061B: return "EC_TAG_CLIENT_DISABLE_VIEW_SHARED";
-		case 0x061C: return "EC_TAG_CLIENT_UPLOAD_STATE";
-		case 0x061D: return "EC_TAG_CLIENT_EXT_PROTOCOL";
-		case 0x061E: return "EC_TAG_CLIENT_USER_ID";
-		case 0x061F: return "EC_TAG_CLIENT_UPLOAD_FILE";
-		case 0x0620: return "EC_TAG_CLIENT_REQUEST_FILE";
-		case 0x0621: return "EC_TAG_CLIENT_A4AF_FILES";
-		case 0x0622: return "EC_TAG_CLIENT_OLD_REMOTE_QUEUE_RANK";
-		case 0x0623: return "EC_TAG_CLIENT_KAD_PORT";
-		case 0x0624: return "EC_TAG_CLIENT_PART_STATUS";
-		case 0x0625: return "EC_TAG_CLIENT_NEXT_REQUESTED_PART";
-		case 0x0626: return "EC_TAG_CLIENT_LAST_DOWNLOADING_PART";
-		case 0x0627: return "EC_TAG_CLIENT_REMOTE_FILENAME";
-		case 0x0628: return "EC_TAG_CLIENT_MOD_VERSION";
-		case 0x0629: return "EC_TAG_CLIENT_OS_INFO";
-		case 0x062A: return "EC_TAG_CLIENT_AVAILABLE_PARTS";
-		case 0x062B: return "EC_TAG_CLIENT_UPLOAD_PART_STATUS";
-		case 0x0700: return "EC_TAG_SEARCHFILE";
-		case 0x0701: return "EC_TAG_SEARCH_TYPE";
-		case 0x0702: return "EC_TAG_SEARCH_NAME";
-		case 0x0703: return "EC_TAG_SEARCH_MIN_SIZE";
-		case 0x0704: return "EC_TAG_SEARCH_MAX_SIZE";
-		case 0x0705: return "EC_TAG_SEARCH_FILE_TYPE";
-		case 0x0706: return "EC_TAG_SEARCH_EXTENSION";
-		case 0x0707: return "EC_TAG_SEARCH_AVAILABILITY";
-		case 0x0708: return "EC_TAG_SEARCH_STATUS";
-		case 0x0709: return "EC_TAG_SEARCH_PARENT";
-		case 0x0800: return "EC_TAG_FRIEND";
-		case 0x0801: return "EC_TAG_FRIEND_NAME";
-		case 0x0802: return "EC_TAG_FRIEND_HASH";
-		case 0x0803: return "EC_TAG_FRIEND_IP";
-		case 0x0804: return "EC_TAG_FRIEND_PORT";
-		case 0x0805: return "EC_TAG_FRIEND_CLIENT";
-		case 0x0806: return "EC_TAG_FRIEND_ADD";
-		case 0x0807: return "EC_TAG_FRIEND_REMOVE";
-		case 0x0808: return "EC_TAG_FRIEND_FRIENDSLOT";
-		case 0x0809: return "EC_TAG_FRIEND_SHARED";
-		case 0x1000: return "EC_TAG_SELECT_PREFS";
-		case 0x1100: return "EC_TAG_PREFS_CATEGORIES";
-		case 0x1101: return "EC_TAG_CATEGORY";
-		case 0x1102: return "EC_TAG_CATEGORY_TITLE";
-		case 0x1103: return "EC_TAG_CATEGORY_PATH";
-		case 0x1104: return "EC_TAG_CATEGORY_COMMENT";
-		case 0x1105: return "EC_TAG_CATEGORY_COLOR";
-		case 0x1106: return "EC_TAG_CATEGORY_PRIO";
-		case 0x1200: return "EC_TAG_PREFS_GENERAL";
-		case 0x1201: return "EC_TAG_USER_NICK";
-		case 0x1202: return "EC_TAG_USER_HASH";
-		case 0x1203: return "EC_TAG_USER_HOST";
-		case 0x1204: return "EC_TAG_GENERAL_CHECK_NEW_VERSION";
-		case 0x1300: return "EC_TAG_PREFS_CONNECTIONS";
-		case 0x1301: return "EC_TAG_CONN_DL_CAP";
-		case 0x1302: return "EC_TAG_CONN_UL_CAP";
-		case 0x1303: return "EC_TAG_CONN_MAX_DL";
-		case 0x1304: return "EC_TAG_CONN_MAX_UL";
-		case 0x1305: return "EC_TAG_CONN_SLOT_ALLOCATION";
-		case 0x1306: return "EC_TAG_CONN_TCP_PORT";
-		case 0x1307: return "EC_TAG_CONN_UDP_PORT";
-		case 0x1308: return "EC_TAG_CONN_UDP_DISABLE";
-		case 0x1309: return "EC_TAG_CONN_MAX_FILE_SOURCES";
-		case 0x130A: return "EC_TAG_CONN_MAX_CONN";
-		case 0x130B: return "EC_TAG_CONN_AUTOCONNECT";
-		case 0x130C: return "EC_TAG_CONN_RECONNECT";
-		case 0x130D: return "EC_TAG_NETWORK_ED2K";
-		case 0x130E: return "EC_TAG_NETWORK_KADEMLIA";
-		case 0x1400: return "EC_TAG_PREFS_MESSAGEFILTER";
-		case 0x1401: return "EC_TAG_MSGFILTER_ENABLED";
-		case 0x1402: return "EC_TAG_MSGFILTER_ALL";
-		case 0x1403: return "EC_TAG_MSGFILTER_FRIENDS";
-		case 0x1404: return "EC_TAG_MSGFILTER_SECURE";
-		case 0x1405: return "EC_TAG_MSGFILTER_BY_KEYWORD";
-		case 0x1406: return "EC_TAG_MSGFILTER_KEYWORDS";
-		case 0x1500: return "EC_TAG_PREFS_REMOTECTRL";
-		case 0x1501: return "EC_TAG_WEBSERVER_AUTORUN";
-		case 0x1502: return "EC_TAG_WEBSERVER_PORT";
-		case 0x1503: return "EC_TAG_WEBSERVER_GUEST";
-		case 0x1504: return "EC_TAG_WEBSERVER_USEGZIP";
-		case 0x1505: return "EC_TAG_WEBSERVER_REFRESH";
-		case 0x1506: return "EC_TAG_WEBSERVER_TEMPLATE";
-		case 0x1600: return "EC_TAG_PREFS_ONLINESIG";
-		case 0x1601: return "EC_TAG_ONLINESIG_ENABLED";
-		case 0x1700: return "EC_TAG_PREFS_SERVERS";
-		case 0x1701: return "EC_TAG_SERVERS_REMOVE_DEAD";
-		case 0x1702: return "EC_TAG_SERVERS_DEAD_SERVER_RETRIES";
-		case 0x1703: return "EC_TAG_SERVERS_AUTO_UPDATE";
-		case 0x1704: return "EC_TAG_SERVERS_URL_LIST";
-		case 0x1705: return "EC_TAG_SERVERS_ADD_FROM_SERVER";
-		case 0x1706: return "EC_TAG_SERVERS_ADD_FROM_CLIENT";
-		case 0x1707: return "EC_TAG_SERVERS_USE_SCORE_SYSTEM";
-		case 0x1708: return "EC_TAG_SERVERS_SMART_ID_CHECK";
-		case 0x1709: return "EC_TAG_SERVERS_SAFE_SERVER_CONNECT";
-		case 0x170A: return "EC_TAG_SERVERS_AUTOCONN_STATIC_ONLY";
-		case 0x170B: return "EC_TAG_SERVERS_MANUAL_HIGH_PRIO";
-		case 0x170C: return "EC_TAG_SERVERS_UPDATE_URL";
-		case 0x1800: return "EC_TAG_PREFS_FILES";
-		case 0x1801: return "EC_TAG_FILES_ICH_ENABLED";
-		case 0x1802: return "EC_TAG_FILES_AICH_TRUST";
-		case 0x1803: return "EC_TAG_FILES_NEW_PAUSED";
-		case 0x1804: return "EC_TAG_FILES_NEW_AUTO_DL_PRIO";
-		case 0x1805: return "EC_TAG_FILES_PREVIEW_PRIO";
-		case 0x1806: return "EC_TAG_FILES_NEW_AUTO_UL_PRIO";
-		case 0x1807: return "EC_TAG_FILES_UL_FULL_CHUNKS";
-		case 0x1808: return "EC_TAG_FILES_START_NEXT_PAUSED";
-		case 0x1809: return "EC_TAG_FILES_RESUME_SAME_CAT";
-		case 0x180A: return "EC_TAG_FILES_SAVE_SOURCES";
-		case 0x180B: return "EC_TAG_FILES_EXTRACT_METADATA";
-		case 0x180C: return "EC_TAG_FILES_ALLOC_FULL_SIZE";
-		case 0x180D: return "EC_TAG_FILES_CHECK_FREE_SPACE";
-		case 0x180E: return "EC_TAG_FILES_MIN_FREE_SPACE";
-		case 0x180F: return "EC_TAG_FILES_CREATE_NORMAL";
-		case 0x1A00: return "EC_TAG_PREFS_DIRECTORIES";
-		case 0x1A01: return "EC_TAG_DIRECTORIES_INCOMING";
-		case 0x1A02: return "EC_TAG_DIRECTORIES_TEMP";
-		case 0x1A03: return "EC_TAG_DIRECTORIES_SHARED";
-		case 0x1A04: return "EC_TAG_DIRECTORIES_SHARE_HIDDEN";
-		case 0x1A05: return "EC_TAG_DIRECTORIES_AUTO_RESCAN";
-		case 0x1A06: return "EC_TAG_DIRECTORIES_FOLLOW_SYMLINKS";
-		case 0x1B00: return "EC_TAG_PREFS_STATISTICS";
-		case 0x1B01: return "EC_TAG_STATSGRAPH_WIDTH";
-		case 0x1B02: return "EC_TAG_STATSGRAPH_SCALE";
-		case 0x1B03: return "EC_TAG_STATSGRAPH_LAST";
-		case 0x1B04: return "EC_TAG_STATSGRAPH_DATA";
-		case 0x1B05: return "EC_TAG_STATTREE_CAPPING";
-		case 0x1B06: return "EC_TAG_STATTREE_NODE";
-		case 0x1B07: return "EC_TAG_STAT_NODE_VALUE";
-		case 0x1B08: return "EC_TAG_STAT_VALUE_TYPE";
-		case 0x1B09: return "EC_TAG_STATTREE_NODEID";
-		case 0x1B0A: return "EC_TAG_STATSGRAPH_DATA_CONN";
-		case 0x1B0B: return "EC_TAG_STATSGRAPH_SESSION_DL";
-		case 0x1B0C: return "EC_TAG_STATSGRAPH_SESSION_UL";
-		case 0x1B0D: return "EC_TAG_STATSGRAPH_SESSION_KAD";
-		case 0x1B0E: return "EC_TAG_STATSGRAPH_SESSION_TIMESPAN";
-		case 0x1C00: return "EC_TAG_PREFS_SECURITY";
-		case 0x1C01: return "EC_TAG_SECURITY_CAN_SEE_SHARES";
-		case 0x1C02: return "EC_TAG_IPFILTER_CLIENTS";
-		case 0x1C03: return "EC_TAG_IPFILTER_SERVERS";
-		case 0x1C04: return "EC_TAG_IPFILTER_AUTO_UPDATE";
-		case 0x1C05: return "EC_TAG_IPFILTER_UPDATE_URL";
-		case 0x1C06: return "EC_TAG_IPFILTER_LEVEL";
-		case 0x1C07: return "EC_TAG_IPFILTER_FILTER_LAN";
-		case 0x1C08: return "EC_TAG_SECURITY_USE_SECIDENT";
-		case 0x1C09: return "EC_TAG_SECURITY_OBFUSCATION_SUPPORTED";
-		case 0x1C0A: return "EC_TAG_SECURITY_OBFUSCATION_REQUESTED";
-		case 0x1C0B: return "EC_TAG_SECURITY_OBFUSCATION_REQUIRED";
-		case 0x1D00: return "EC_TAG_PREFS_CORETWEAKS";
-		case 0x1D01: return "EC_TAG_CORETW_MAX_CONN_PER_FIVE";
-		case 0x1D02: return "EC_TAG_CORETW_VERBOSE";
-		case 0x1D03: return "EC_TAG_CORETW_FILEBUFFER";
-		case 0x1D04: return "EC_TAG_CORETW_UL_QUEUE";
-		case 0x1D05: return "EC_TAG_CORETW_SRV_KEEPALIVE_TIMEOUT";
-		case 0x1E00: return "EC_TAG_PREFS_KADEMLIA";
-		case 0x1E01: return "EC_TAG_KADEMLIA_UPDATE_URL";
-		default: return CFormat("unknown %d 0x%x") % arg % arg;
-	}
-}
-
-wxString GetDebugNameEC_DETAIL_LEVEL(uint8 arg)
-{
-	switch (arg) {
-		case 0x00: return "EC_DETAIL_CMD";
-		case 0x01: return "EC_DETAIL_WEB";
-		case 0x02: return "EC_DETAIL_FULL";
-		case 0x03: return "EC_DETAIL_UPDATE";
-		case 0x04: return "EC_DETAIL_INC_UPDATE";
-		default: return CFormat("unknown %d 0x%x") % arg % arg;
-	}
-}
-
-wxString GetDebugNameEC_SEARCH_TYPE(uint8 arg)
-{
-	switch (arg) {
-		case 0x00: return "EC_SEARCH_LOCAL";
-		case 0x01: return "EC_SEARCH_GLOBAL";
-		case 0x02: return "EC_SEARCH_KAD";
-		case 0x03: return "EC_SEARCH_WEB";
-		default: return CFormat("unknown %d 0x%x") % arg % arg;
-	}
-}
-
-wxString GetDebugNameEC_STATTREE_NODE_VALUE_TYPE(uint8 arg)
-{
-	switch (arg) {
-		case 0x00: return "EC_VALUE_INTEGER";
-		case 0x01: return "EC_VALUE_ISTRING";
-		case 0x02: return "EC_VALUE_BYTES";
-		case 0x03: return "EC_VALUE_ISHORT";
-		case 0x04: return "EC_VALUE_TIME";
-		case 0x05: return "EC_VALUE_SPEED";
-		case 0x06: return "EC_VALUE_STRING";
-		case 0x07: return "EC_VALUE_DOUBLE";
-		default: return CFormat("unknown %d 0x%x") % arg % arg;
-	}
-}
-
-wxString GetDebugNameEcPrefs(uint32 arg)
-{
-	switch (arg) {
-		case 0x00000001: return "EC_PREFS_CATEGORIES";
-		case 0x00000002: return "EC_PREFS_GENERAL";
-		case 0x00000004: return "EC_PREFS_CONNECTIONS";
-		case 0x00000008: return "EC_PREFS_MESSAGEFILTER";
-		case 0x00000010: return "EC_PREFS_REMOTECONTROLS";
-		case 0x00000020: return "EC_PREFS_ONLINESIG";
-		case 0x00000040: return "EC_PREFS_SERVERS";
-		case 0x00000080: return "EC_PREFS_FILES";
-		case 0x00000200: return "EC_PREFS_DIRECTORIES";
-		case 0x00000400: return "EC_PREFS_STATISTICS";
-		case 0x00000800: return "EC_PREFS_SECURITY";
-		case 0x00001000: return "EC_PREFS_CORETWEAKS";
-		case 0x00002000: return "EC_PREFS_KADEMLIA";
-		default: return CFormat("unknown %d 0x%x") % arg % arg;
-	}
-}
-
-#endif	// DEBUG_EC_IMPLEMENTATION
-
-#endif // __ECCODES_H__

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECTagTypes.h Deleted

@@ -1,66 +0,0 @@
-// 
-//  This file is part of the aMule Project.
-// 
-//  Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
-// 
-//  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.
-
-#ifndef __ECTAGTYPES_H__
-#define __ECTAGTYPES_H__
-
-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,
-	EC_TAGTYPE_UINT128 = 10
-};
-
-#ifdef DEBUG_EC_IMPLEMENTATION
-
-wxString GetDebugNameECTagTypes(uint8 arg)
-{
-	switch (arg) {
-		case 0: return "EC_TAGTYPE_UNKNOWN";
-		case 1: return "EC_TAGTYPE_CUSTOM";
-		case 2: return "EC_TAGTYPE_UINT8";
-		case 3: return "EC_TAGTYPE_UINT16";
-		case 4: return "EC_TAGTYPE_UINT32";
-		case 5: return "EC_TAGTYPE_UINT64";
-		case 6: return "EC_TAGTYPE_STRING";
-		case 7: return "EC_TAGTYPE_DOUBLE";
-		case 8: return "EC_TAGTYPE_IPV4";
-		case 9: return "EC_TAGTYPE_HASH16";
-		case 10: return "EC_TAGTYPE_UINT128";
-		default: return CFormat("unknown %d 0x%x") % arg % arg;
-	}
-}
-
-#endif	// DEBUG_EC_IMPLEMENTATION
-
-#endif // __ECTAGTYPES_H__

amule-3.0.1.tar.gz/src/libs/ec/java Deleted

amule-3.0.1.tar.gz/src/libs/ec/java/ECCodes.java Deleted

@@ -1,443 +0,0 @@
-// 
-//  This file is part of the aMule Project.
-// 
-//  Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
-// 
-//  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.
-
-public interface ECCodes {
-
-
-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_UNKNOWN_MASK = 0xff7f7f08;
-
-public final static byte EC_OP_NOOP                          = 0x01;
-public final static byte EC_OP_AUTH_REQ                      = 0x02;
-public final static byte EC_OP_AUTH_FAIL                     = 0x03;
-public final static byte EC_OP_AUTH_OK                       = 0x04;
-public final static byte EC_OP_FAILED                        = 0x05;
-public final static byte EC_OP_STRINGS                       = 0x06;
-public final static byte EC_OP_MISC_DATA                     = 0x07;
-public final static byte EC_OP_SHUTDOWN                      = 0x08;
-public final static byte EC_OP_ADD_LINK                      = 0x09;
-public final static byte EC_OP_STAT_REQ                      = 0x0A;
-public final static byte EC_OP_GET_CONNSTATE                 = 0x0B;
-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_SHARED_FILES              = 0x10;
-public final static byte EC_OP_SHARED_SET_PRIO               = 0x11;
-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;
-public final static byte EC_OP_PARTFILE_PAUSE                = 0x19;
-public final static byte EC_OP_PARTFILE_RESUME               = 0x1A;
-public final static byte EC_OP_PARTFILE_STOP                 = 0x1B;
-public final static byte EC_OP_PARTFILE_PRIO_SET             = 0x1C;
-public final static byte EC_OP_PARTFILE_DELETE               = 0x1D;
-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_SHARED_FILES                  = 0x22;
-public final static byte EC_OP_SHAREDFILES_RELOAD            = 0x23;
-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;
-public final static byte EC_OP_SEARCH_RESULTS                = 0x28;
-public final static byte EC_OP_SEARCH_PROGRESS               = 0x29;
-public final static byte EC_OP_DOWNLOAD_SEARCH_RESULT        = 0x2A;
-public final static byte EC_OP_IPFILTER_RELOAD               = 0x2B;
-public final static byte EC_OP_GET_SERVER_LIST               = 0x2C;
-public final static byte EC_OP_SERVER_LIST                   = 0x2D;
-public final static byte EC_OP_SERVER_DISCONNECT             = 0x2E;
-public final static byte EC_OP_SERVER_CONNECT                = 0x2F;
-public final static byte EC_OP_SERVER_REMOVE                 = 0x30;
-public final static byte EC_OP_SERVER_ADD                    = 0x31;
-public final static byte EC_OP_SERVER_UPDATE_FROM_URL        = 0x32;
-public final static byte EC_OP_ADDLOGLINE                    = 0x33;
-public final static byte EC_OP_ADDDEBUGLOGLINE               = 0x34;
-public final static byte EC_OP_GET_LOG                       = 0x35;
-public final static byte EC_OP_GET_DEBUGLOG                  = 0x36;
-public final static byte EC_OP_GET_SERVERINFO                = 0x37;
-public final static byte EC_OP_LOG                           = 0x38;
-public final static byte EC_OP_DEBUGLOG                      = 0x39;
-public final static byte EC_OP_SERVERINFO                    = 0x3A;
-public final static byte EC_OP_RESET_LOG                     = 0x3B;
-public final static byte EC_OP_RESET_DEBUGLOG                = 0x3C;
-public final static byte EC_OP_CLEAR_SERVERINFO              = 0x3D;
-public final static byte EC_OP_GET_LAST_LOG_ENTRY            = 0x3E;
-public final static byte EC_OP_GET_PREFERENCES               = 0x3F;
-public final static byte EC_OP_SET_PREFERENCES               = 0x40;
-public final static byte EC_OP_CREATE_CATEGORY               = 0x41;
-public final static byte EC_OP_UPDATE_CATEGORY               = 0x42;
-public final static byte EC_OP_DELETE_CATEGORY               = 0x43;
-public final static byte EC_OP_GET_STATSGRAPHS               = 0x44;
-public final static byte EC_OP_STATSGRAPHS                   = 0x45;
-public final static byte EC_OP_GET_STATSTREE                 = 0x46;
-public final static byte EC_OP_STATSTREE                     = 0x47;
-public final static byte EC_OP_KAD_START                     = 0x48;
-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_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;
-public final static short EC_TAG_PROTOCOL_VERSION                   = 0x0002;
-public final static short EC_TAG_VERSION_ID                         = 0x0003;
-public final static short EC_TAG_DETAIL_LEVEL                       = 0x0004;
-public final static short EC_TAG_CONNSTATE                          = 0x0005;
-public final static short EC_TAG_ED2K_ID                            = 0x0006;
-public final static short EC_TAG_LOG_TO_STATUS                      = 0x0007;
-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_KAD_ID                             = 0x0010;
-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;
-public final static short EC_TAG_STATS_UL_SPEED                     = 0x0200;
-public final static short 	EC_TAG_STATS_DL_SPEED                     = 0x0201;
-public final static short 	EC_TAG_STATS_UL_SPEED_LIMIT               = 0x0202;
-public final static short 	EC_TAG_STATS_DL_SPEED_LIMIT               = 0x0203;
-public final static short 	EC_TAG_STATS_UP_OVERHEAD                  = 0x0204;
-public final static short 	EC_TAG_STATS_DOWN_OVERHEAD                = 0x0205;
-public final static short 	EC_TAG_STATS_TOTAL_SRC_COUNT              = 0x0206;
-public final static short 	EC_TAG_STATS_BANNED_COUNT                 = 0x0207;
-public final static short 	EC_TAG_STATS_UL_QUEUE_LEN                 = 0x0208;
-public final static short 	EC_TAG_STATS_ED2K_USERS                   = 0x0209;
-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_ADDRESS               = 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_STATS_KAD_NODES                    = 0x021B;
-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;
-public final static short 	EC_TAG_PARTFILE_SIZE_FULL                 = 0x0303;
-public final static short 	EC_TAG_PARTFILE_SIZE_XFER                 = 0x0304;
-public final static short 	EC_TAG_PARTFILE_SIZE_XFER_UP              = 0x0305;
-public final static short 	EC_TAG_PARTFILE_SIZE_DONE                 = 0x0306;
-public final static short 	EC_TAG_PARTFILE_SPEED                     = 0x0307;
-public final static short 	EC_TAG_PARTFILE_STATUS                    = 0x0308;
-public final static short 	EC_TAG_PARTFILE_PRIO                      = 0x0309;
-public final static short 	EC_TAG_PARTFILE_SOURCE_COUNT              = 0x030A;
-public final static short 	EC_TAG_PARTFILE_SOURCE_COUNT_A4AF         = 0x030B;
-public final static short 	EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT  = 0x030C;
-public final static short 	EC_TAG_PARTFILE_SOURCE_COUNT_XFER         = 0x030D;
-public final static short 	EC_TAG_PARTFILE_ED2K_LINK                 = 0x030E;
-public final static short 	EC_TAG_PARTFILE_CAT                       = 0x030F;
-public final static short 	EC_TAG_PARTFILE_LAST_RECV                 = 0x0310;
-public final static short 	EC_TAG_PARTFILE_LAST_SEEN_COMP            = 0x0311;
-public final static short 	EC_TAG_PARTFILE_PART_STATUS               = 0x0312;
-public final static short 	EC_TAG_PARTFILE_GAP_STATUS                = 0x0313;
-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;
-public final static short 	EC_TAG_KNOWNFILE_REQ_COUNT                = 0x0403;
-public final static short 	EC_TAG_KNOWNFILE_REQ_COUNT_ALL            = 0x0404;
-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;
-public final static short 	EC_TAG_SERVER_ADDRESS                     = 0x0503;
-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_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_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;
-public final static short 	EC_TAG_CLIENT_LAST_TIME                   = 0x0608;
-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_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;
-public final static short 	EC_TAG_CLIENT_USER_IP                     = 0x0610;
-public final static short 	EC_TAG_CLIENT_USER_PORT                   = 0x0611;
-public final static short 	EC_TAG_CLIENT_SERVER_IP                   = 0x0612;
-public final static short 	EC_TAG_CLIENT_SERVER_PORT                 = 0x0613;
-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;
-public final static short 	EC_TAG_SEARCH_MIN_SIZE                    = 0x0703;
-public final static short 	EC_TAG_SEARCH_MAX_SIZE                    = 0x0704;
-public final static short 	EC_TAG_SEARCH_FILE_TYPE                   = 0x0705;
-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;
-public final static short 		EC_TAG_CATEGORY_TITLE                     = 0x1102;
-public final static short 		EC_TAG_CATEGORY_PATH                      = 0x1103;
-public final static short 		EC_TAG_CATEGORY_COMMENT                   = 0x1104;
-public final static short 		EC_TAG_CATEGORY_COLOR                     = 0x1105;
-public final static short 		EC_TAG_CATEGORY_PRIO                      = 0x1106;
-public final static short 	EC_TAG_PREFS_GENERAL                      = 0x1200;
-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_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_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_NETWORK_KADEMLIA                   = 0x130E;
-public final static short 	EC_TAG_PREFS_MESSAGEFILTER                = 0x1400;
-public final static short 		EC_TAG_MSGFILTER_ENABLED                  = 0x1401;
-public final static short 		EC_TAG_MSGFILTER_ALL                      = 0x1402;
-public final static short 		EC_TAG_MSGFILTER_FRIENDS                  = 0x1403;
-public final static short 		EC_TAG_MSGFILTER_SECURE                   = 0x1404;
-public final static short 		EC_TAG_MSGFILTER_BY_KEYWORD               = 0x1405;
-public final static short 		EC_TAG_MSGFILTER_KEYWORDS                 = 0x1406;
-public final static short 	EC_TAG_PREFS_REMOTECTRL                   = 0x1500;
-public final static short 		EC_TAG_WEBSERVER_AUTORUN                  = 0x1501;
-public final static short 		EC_TAG_WEBSERVER_PORT                     = 0x1502;
-public final static short 		EC_TAG_WEBSERVER_GUEST                    = 0x1503;
-public final static short 		EC_TAG_WEBSERVER_USEGZIP                  = 0x1504;
-public final static short 		EC_TAG_WEBSERVER_REFRESH                  = 0x1505;
-public final static short 		EC_TAG_WEBSERVER_TEMPLATE                 = 0x1506;
-public final static short 	EC_TAG_PREFS_ONLINESIG                    = 0x1600;
-public final static short 		EC_TAG_ONLINESIG_ENABLED                  = 0x1601;
-public final static short 	EC_TAG_PREFS_SERVERS                      = 0x1700;
-public final static short 		EC_TAG_SERVERS_REMOVE_DEAD                = 0x1701;
-public final static short 		EC_TAG_SERVERS_DEAD_SERVER_RETRIES        = 0x1702;
-public final static short 		EC_TAG_SERVERS_AUTO_UPDATE                = 0x1703;
-public final static short 		EC_TAG_SERVERS_URL_LIST                   = 0x1704;
-public final static short 		EC_TAG_SERVERS_ADD_FROM_SERVER            = 0x1705;
-public final static short 		EC_TAG_SERVERS_ADD_FROM_CLIENT            = 0x1706;
-public final static short 		EC_TAG_SERVERS_USE_SCORE_SYSTEM           = 0x1707;
-public final static short 		EC_TAG_SERVERS_SMART_ID_CHECK             = 0x1708;
-public final static short 		EC_TAG_SERVERS_SAFE_SERVER_CONNECT        = 0x1709;
-public final static short 		EC_TAG_SERVERS_AUTOCONN_STATIC_ONLY       = 0x170A;
-public final static short 		EC_TAG_SERVERS_MANUAL_HIGH_PRIO           = 0x170B;
-public final static short 		EC_TAG_SERVERS_UPDATE_URL                 = 0x170C;
-public final static short 	EC_TAG_PREFS_FILES                        = 0x1800;
-public final static short 		EC_TAG_FILES_ICH_ENABLED                  = 0x1801;
-public final static short 		EC_TAG_FILES_AICH_TRUST                   = 0x1802;
-public final static short 		EC_TAG_FILES_NEW_PAUSED                   = 0x1803;
-public final static short 		EC_TAG_FILES_NEW_AUTO_DL_PRIO             = 0x1804;
-public final static short 		EC_TAG_FILES_PREVIEW_PRIO                 = 0x1805;
-public final static short 		EC_TAG_FILES_NEW_AUTO_UL_PRIO             = 0x1806;
-public final static short 		EC_TAG_FILES_UL_FULL_CHUNKS               = 0x1807;
-public final static short 		EC_TAG_FILES_START_NEXT_PAUSED            = 0x1808;
-public final static short 		EC_TAG_FILES_RESUME_SAME_CAT              = 0x1809;
-public final static short 		EC_TAG_FILES_SAVE_SOURCES                 = 0x180A;
-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_CREATE_NORMAL                = 0x180F;
-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_DIRECTORIES_AUTO_RESCAN            = 0x1A05;
-public final static short 		EC_TAG_DIRECTORIES_FOLLOW_SYMLINKS        = 0x1A06;
-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;
-public final static short 		EC_TAG_STATSGRAPH_LAST                    = 0x1B03;
-public final static short 		EC_TAG_STATSGRAPH_DATA                    = 0x1B04;
-public final static short 		EC_TAG_STATTREE_CAPPING                   = 0x1B05;
-public final static short 		EC_TAG_STATTREE_NODE                      = 0x1B06;
-public final static short 		EC_TAG_STAT_NODE_VALUE                    = 0x1B07;
-public final static short 		EC_TAG_STAT_VALUE_TYPE                    = 0x1B08;
-public final static short 		EC_TAG_STATTREE_NODEID                    = 0x1B09;
-public final static short 		EC_TAG_STATSGRAPH_DATA_CONN               = 0x1B0A;
-public final static short 		EC_TAG_STATSGRAPH_SESSION_DL              = 0x1B0B;
-public final static short 		EC_TAG_STATSGRAPH_SESSION_UL              = 0x1B0C;
-public final static short 		EC_TAG_STATSGRAPH_SESSION_KAD             = 0x1B0D;
-public final static short 		EC_TAG_STATSGRAPH_SESSION_TIMESPAN        = 0x1B0E;
-public final static short 	EC_TAG_PREFS_SECURITY                     = 0x1C00;
-public final static short 		EC_TAG_SECURITY_CAN_SEE_SHARES            = 0x1C01;
-public final static short 		EC_TAG_IPFILTER_CLIENTS                   = 0x1C02;
-public final static short 		EC_TAG_IPFILTER_SERVERS                   = 0x1C03;
-public final static short 		EC_TAG_IPFILTER_AUTO_UPDATE               = 0x1C04;
-public final static short 		EC_TAG_IPFILTER_UPDATE_URL                = 0x1C05;
-public final static short 		EC_TAG_IPFILTER_LEVEL                     = 0x1C06;
-public final static short 		EC_TAG_IPFILTER_FILTER_LAN                = 0x1C07;
-public final static short 		EC_TAG_SECURITY_USE_SECIDENT              = 0x1C08;
-public final static short 		EC_TAG_SECURITY_OBFUSCATION_SUPPORTED     = 0x1C09;
-public final static short 		EC_TAG_SECURITY_OBFUSCATION_REQUESTED     = 0x1C0A;
-public final static short 		EC_TAG_SECURITY_OBFUSCATION_REQUIRED      = 0x1C0B;
-public final static short 	EC_TAG_PREFS_CORETWEAKS                   = 0x1D00;
-public final static short 		EC_TAG_CORETW_MAX_CONN_PER_FIVE           = 0x1D01;
-public final static short 		EC_TAG_CORETW_VERBOSE                     = 0x1D02;
-public final static short 		EC_TAG_CORETW_FILEBUFFER                  = 0x1D03;
-public final static short 		EC_TAG_CORETW_UL_QUEUE                    = 0x1D04;
-public final static short 		EC_TAG_CORETW_SRV_KEEPALIVE_TIMEOUT       = 0x1D05;
-public final static short 	EC_TAG_PREFS_KADEMLIA                     = 0x1E00;
-public final static short 		EC_TAG_KADEMLIA_UPDATE_URL                = 0x1E01;
-
-public final static byte EC_DETAIL_CMD           = 0x00;
-public final static byte EC_DETAIL_WEB           = 0x01;
-public final static byte EC_DETAIL_FULL          = 0x02;
-public final static byte EC_DETAIL_UPDATE        = 0x03;
-public final static byte EC_DETAIL_INC_UPDATE    = 0x04;
-
-public final static byte EC_SEARCH_LOCAL         = 0x00;
-public final static byte EC_SEARCH_GLOBAL        = 0x01;
-public final static byte EC_SEARCH_KAD           = 0x02;
-public final static byte EC_SEARCH_WEB           = 0x03;
-
-public final static byte EC_VALUE_INTEGER        = 0x00;
-public final static byte EC_VALUE_ISTRING        = 0x01;
-public final static byte EC_VALUE_BYTES          = 0x02;
-public final static byte EC_VALUE_ISHORT         = 0x03;
-public final static byte EC_VALUE_TIME           = 0x04;
-public final static byte EC_VALUE_SPEED          = 0x05;
-public final static byte EC_VALUE_STRING         = 0x06;
-public final static byte EC_VALUE_DOUBLE         = 0x07;
-
-public final static int EC_PREFS_CATEGORIES     = 0x00000001;
-public final static int EC_PREFS_GENERAL        = 0x00000002;
-public final static int EC_PREFS_CONNECTIONS    = 0x00000004;
-public final static int EC_PREFS_MESSAGEFILTER  = 0x00000008;
-public final static int EC_PREFS_REMOTECONTROLS = 0x00000010;
-public final static int EC_PREFS_ONLINESIG      = 0x00000020;
-public final static int EC_PREFS_SERVERS        = 0x00000040;
-public final static int EC_PREFS_FILES          = 0x00000080;
-public final static int EC_PREFS_DIRECTORIES    = 0x00000200;
-public final static int EC_PREFS_STATISTICS     = 0x00000400;
-public final static int EC_PREFS_SECURITY       = 0x00000800;
-public final static int EC_PREFS_CORETWEAKS     = 0x00001000;
-public final static int EC_PREFS_KADEMLIA       = 0x00002000;
-
-}

amule-3.0.1.tar.gz/src/libs/ec/java/ECTagTypes.java Deleted

@@ -1,41 +0,0 @@
-// 
-//  This file is part of the aMule Project.
-// 
-//  Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
-// 
-//  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.
-
-public interface ECTagTypes {
-
-public final static byte EC_TAGTYPE_UNKNOWN = 0;
-public final static byte EC_TAGTYPE_CUSTOM = 1;
-public final static byte EC_TAGTYPE_UINT8 = 2;
-public final static byte EC_TAGTYPE_UINT16 = 3;
-public final static byte EC_TAGTYPE_UINT32 = 4;
-public final static byte EC_TAGTYPE_UINT64 = 5;
-public final static byte EC_TAGTYPE_STRING = 6;
-public final static byte EC_TAGTYPE_DOUBLE = 7;
-public final static byte EC_TAGTYPE_IPV4 = 8;
-public final static byte EC_TAGTYPE_HASH16 = 9;
-public final static byte EC_TAGTYPE_UINT128 = 10;
-
-}

amule-3.1.0.tar.gz/.clang-format Added

@@ -0,0 +1,43 @@
+---
+Language:        Cpp
+BasedOnStyle:    LLVM
+AccessModifierOffset: -8
+AlignAfterOpenBracket: DontAlign
+AlignEscapedNewlines: DontAlign
+AllowShortFunctionsOnASingleLine: Inline
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      true
+  AfterControlStatement: false
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: false
+  AfterStruct:     true
+  AfterUnion:      true
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakConstructorInitializers: BeforeComma
+ConstructorInitializerIndentWidth: 0
+ContinuationIndentWidth: 8
+ColumnLimit:     110
+EmptyLineBeforeAccessModifier: Always
+MacroBlockBegin: '^wx(BEGIN_EVENT_TABLE|BEGIN_EVENT_TABLE_TEMPLATE)'
+MacroBlockEnd:   '^wxEND_EVENT_TABLE'
+Cpp11BracedListStyle: false
+NamespaceIndentation: None
+PointerAlignment: Right
+SortIncludes:    false
+IndentWidth:     8
+TabWidth:        8
+UseTab:          ForContinuationAndIndentation
+...
+

amule-3.0.1.tar.gz/.clang-tidy -> amule-3.1.0.tar.gz/.clang-tidy Changed

@@ -67,25 +67,66 @@
 #   src/extern/.clang-tidy        (vendored wx code)
 #   src/webserver/src/.clang-tidy (PHP interpreter, mostly generated)
 
+# Tier-1 bug/UB checks (added for the whole-tree lint gate). These point at
+# real defects -- use-after-move, null derefs, uninitialised reads, lifetime
+# and self-assignment errors, dangerous conversions, suspicious arithmetic --
+# and were each measured against the tree before adding: the clang-analyzer
+# `cplusplus.*` / `nullability.*` families and most bugprone-* checks below
+# are clean or fire only a handful of real hits. The whole `cplusplus.*`
+# family is enabled EXCEPT `NewDeleteLeaks` (28 false positives from wxThread
+# detached self-delete, same reason it was suppressed before); `NewDelete`
+# (the use-after-free / double-free checker) is the high-value one this pulls
+# back in. Its only non-project hits are in wx template headers, dropped via
+# ExcludeHeaderFilterRegex below.
+#
+# `bugprone-narrowing-conversions` is deliberately NOT in this whole-tree set:
+# it fires ~350× on this C-derived codebase (implicit int->uint8 and friends),
+# so it's enforced diff-only on changed lines in CI instead. Same reasoning
+# retires `branch-clone` / `reserved-identifier` (hundreds / ~2000 idiom hits).
 Checks: >
   -*,
   clang-analyzer-core.*,
-  clang-analyzer-cplusplus.StringChecker,
+  clang-analyzer-cplusplus.*,
+  -clang-analyzer-cplusplus.NewDeleteLeaks,
   clang-analyzer-deadcode.*,
+  clang-analyzer-nullability.*,
   clang-analyzer-optin.core.*,
   clang-analyzer-optin.cplusplus.UninitializedObject,
   clang-analyzer-security.ArrayBound,
   clang-analyzer-unix.*,
+  bugprone-bool-pointer-implicit-conversion,
+  bugprone-copy-constructor-init,
+  bugprone-dangling-handle,
+  bugprone-incorrect-roundings,
+  bugprone-infinite-loop,
+  bugprone-integer-division,
+  bugprone-macro-repeated-side-effects,
   bugprone-misplaced-widening-cast,
+  bugprone-move-forwarding-reference,
   bugprone-multi-level-implicit-pointer-conversion,
+  bugprone-not-null-terminated-result,
+  bugprone-parent-virtual-call,
   bugprone-signed-char-misuse,
   bugprone-sizeof-expression,
+  bugprone-standalone-empty,
+  bugprone-string-constructor,
   bugprone-suspicious-include,
+  bugprone-suspicious-missing-comma,
+  bugprone-suspicious-memory-comparison,
   bugprone-too-small-loop-variable,
+  bugprone-unhandled-self-assignment,
+  bugprone-use-after-move,
   misc-redundant-expression,
   performance-avoid-endl,
-  performance-unnecessary-copy-initialization
+  performance-move-const-arg,
+  performance-unnecessary-copy-initialization,
+  readability-delete-null-pointer
 
 WarningsAsErrors: ''
 HeaderFilterRegex: '.*/src/.*\.(h|hpp)$'
+# clang-analyzer path diagnostics can surface inside instantiated wx template
+# headers (e.g. cplusplus.NewDelete in wx/buffer.h, wx/string.h) even though
+# HeaderFilterRegex targets project headers -- exclude the wx system headers
+# so those library-internal false positives don't fail the gate.
+ExcludeHeaderFilterRegex: '.*/wx-0-9.+/.*'
 FormatStyle: none

amule-3.1.0.tar.gz/.clang-tidy-new-code Added

@@ -0,0 +1,48 @@
+# Diff-only lint config — enforced on CHANGED lines in pull requests only,
+# NOT whole-tree. Complements the whole-tree bug gate in `.clang-tidy`.
+#
+# Purpose: these are the "usually fix" maintainability/modernization checks.
+# On a 20-year-old codebase they fire tens of thousands of times whole-tree
+# (modernize-use-using ~10.7k, use-override ~9.4k, use-nullptr ~7.2k,
+# misc-const-correctness ~4.1k, bugprone-narrowing-conversions ~350), so a
+# whole-tree green gate is impractical -- it would churn nearly every file.
+# Instead the CI runs `clang-tidy-diff.py` with THIS config over the PR patch,
+# so new/changed code is held to a modern standard while the existing tree is
+# left untouched. Tier-1 bug checks are NOT repeated here -- new code is
+# already covered for those by the whole-tree `.clang-tidy` gate.
+#
+# Chosen set (high value, low friction on new code):
+#   bugprone-narrowing-conversions   dangerous implicit narrowing (int->uint8)
+#   modernize-use-nullptr            NULL -> nullptr (type safety)
+#   modernize-use-emplace            emplace_back over push_back(temp)
+#   modernize-loop-convert           index loops -> range-based where clearer
+#   modernize-use-equals-default     hand-written trivial special members
+#   modernize-use-equals-delete      '= delete' over private-unimplemented
+#   modernize-make-unique/shared     make_* over new
+#   performance-for-range-copy       range-for copying instead of const&
+#   performance-unnecessary-value-param  by-value params only read
+#
+# Deliberately EXCLUDED (even diff-only), and why:
+#   modernize-use-override   omitted per project decision (revisit as a
+#                            one-shot whole-tree --fix sweep if wanted)
+#   modernize-use-using      stylistic typedef->using churn, low value
+#   modernize-use-auto       readability-contentious (auto can obscure types)
+#   misc-const-correctness   high false-positive / churn even on new code
+
+Checks: >
+  -*,
+  bugprone-narrowing-conversions,
+  modernize-use-nullptr,
+  modernize-use-emplace,
+  modernize-loop-convert,
+  modernize-use-equals-default,
+  modernize-use-equals-delete,
+  modernize-make-unique,
+  modernize-make-shared,
+  performance-for-range-copy,
+  performance-unnecessary-value-param
+
+WarningsAsErrors: ''
+HeaderFilterRegex: '.*/src/.*\.(h|hpp)$'
+ExcludeHeaderFilterRegex: '.*/wx-0-9.+/.*'
+FormatStyle: none

amule-3.1.0.tar.gz/.git-blame-ignore-revs Added

amule-3.0.1.tar.gz/.git_archival.txt -> amule-3.1.0.tar.gz/.git_archival.txt Changed

amule-3.0.1.tar.gz/.gitattributes -> amule-3.1.0.tar.gz/.gitattributes Changed

amule-3.1.0.tar.gz/.github/actions Added

amule-3.1.0.tar.gz/.github/actions/cache-save-newest Added

amule-3.1.0.tar.gz/.github/actions/cache-save-newest/action.yml Added

@@ -0,0 +1,72 @@
+# actions/cache/save, minus the writes a newer run has already made pointless.
+#
+# Every cache key here ends in the run id, so a run never collides with an
+# earlier one. Runs on master overlap, though, and an older run that finishes
+# last still uploads: the store then carries two generations of the same family
+# until retention prunes it (1.6 GB across 8 families when measured), and
+# restores go to the wrong one, because `restore-keys` resolves a prefix to the
+# most recently CREATED entry rather than the highest run id.
+#
+# Both stop here: if the family already holds an entry from a newer run, this
+# run's copy is worth nothing and is not uploaded. The reverse order still
+# writes -- a newer generation has to land before the older one can go.
+name: Save cache if newest
+description: Save a cache entry unless a newer run already saved one for the same key family.
+
+inputs:
+  path:
+    description: Files to cache, as actions/cache/save takes them.
+    required: true
+  key:
+    description: Cache key. Must end in `-<run id>`, which is what names the family.
+    required: true
+  token:
+    description: "Token for reading the repository's cache list. Needs `actions: read` permission."
+    required: false
+    default: ${{ github.token }}
+
+runs:
+  using: composite
+  steps:
+    - name: Check for a newer saved generation
+      id: guard
+      shell: bash
+      env:
+        GH_TOKEN: ${{ inputs.token }}
+        REPO: ${{ github.repository }}
+        KEY: ${{ inputs.key }}
+        RUN_ID: ${{ github.run_id }}
+      run: |
+        set -euo pipefail
+        prefix="${KEY%-${RUN_ID}}"
+        if  "$prefix" = "$KEY" ; then
+            # Not a run-keyed family, so there is no ordering to compare.
+            echo "key does not end in the run id, saving"
+            echo "skip=false" >> "$GITHUB_OUTPUT"
+            exit 0
+        fi
+        # A listing failure must not cost the save: without the cache the next
+        # run compiles everything, while a redundant entry only waits for the
+        # prune.
+        newest=$(gh api --paginate "repos/${REPO}/actions/caches?per_page=100" \
+                     --jq '.actions_caches.key' 2>/dev/null \
+                 | awk -v p="${prefix}-" '
+                       index($0, p) == 1 {
+                           id = substr($0, length(p) + 1)
+                           # Run ids only; a longer suffix is another family.
+                           if (id ~ /^0-9+$/ && id + 0 > max) max = id + 0
+                       }
+                       END { printf "%d\n", max + 0 }') || newest=0
+        if  "$newest" -gt "$RUN_ID" ; then
+            echo "run ${newest} already saved ${prefix}, skipping this one"
+            echo "skip=true" >> "$GITHUB_OUTPUT"
+        else
+            echo "newest saved for ${prefix} is ${newest}, saving ${RUN_ID}"
+            echo "skip=false" >> "$GITHUB_OUTPUT"
+        fi
+    - name: Save cache
+      if: steps.guard.outputs.skip != 'true'
+      uses: actions/cache/save@v6
+      with:
+        path: ${{ inputs.path }}
+        key: ${{ inputs.key }}

amule-3.1.0.tar.gz/.github/workflows/cache-retention.yml Added

@@ -0,0 +1,103 @@
+# Keeps one Actions cache per key prefix.
+#
+# Every ccache save key ends in `-${{ github.run_id }}` so that a run never
+# collides with an earlier one -- actions/cache refuses to overwrite a key, and
+# a stable key would freeze the cache at its first write. The cost is that
+# nothing is ever replaced: each run mints a fresh 400-500 MB entry and the
+# repo drifted to 32 GB across 139 entries against a 10 GB limit, so GitHub was
+# evicting continuously and entries were being deleted before they served a
+# hit.
+#
+# Restores key on hashFiles() but fall back through `restore-keys: <prefix>-`,
+# which resolves to the newest match, so older generations are never chosen.
+# Deleting them loses nothing.
+name: Cache retention
+
+on:
+  # After every master push, i.e. right behind the runs that write the caches
+  # this prunes. Cheap: one API listing plus a handful of DELETEs, no build.
+  push:
+    branches:
+      - master
+  # As each cache-writing run ends, which a push alone does not cover: the
+  # heavy runs finish long after the push that started them, so the superseded
+  # generation would otherwise sit in the store until the next merge. That
+  # overlap is what holds the store over its 10 GB limit, and GitHub then
+  # evicts by least recent read -- which is how the macOS keg cache kept
+  # disappearing and costing the Intel leg a 2h40m rebuild.
+  #
+  # `C/C++ CI` is deliberately absent. A name the trigger cannot resolve does
+  # not merely fail to match: it stops this workflow compiling for the event,
+  # and every completion then produces a startup_failure with no job and no
+  # log. Reproduced on a fork, where a probe listing a slash-named workflow
+  # broke completions that a sibling probe handled fine. Its ccache is small
+  # and its runs end close to the push that started them, so the push trigger
+  # already covers it. Keep every entry here slash-free.
+  workflow_run:
+    workflows:
+      - Packaging
+      - clang-tidy
+    types:
+      - completed
+  # Backstop for stretches with no merges, and a manual handle.
+  schedule:
+    - cron: '0 3 * * *'
+  workflow_dispatch:
+
+permissions:
+  actions: write
+
+jobs:
+  prune:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Keep only the newest cache per prefix
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REPO: ${{ github.repository }}
+        run: |
+          gh api --paginate "repos/${REPO}/actions/caches?per_page=100" \
+            --jq '.actions_caches | .id, .created_at, .size_in_bytes, .key | @tsv' > caches.tsv
+          python3 - <<'PY' > to_delete.txt
+          import re, collections, os
+          rows = 
+          for line in open("caches.tsv"):
+              cid, created, size, key = line.rstrip("\n").split("\t", 3)
+              rows.append((int(cid), created, int(size), key))
+          # Group by the key with a trailing numeric run id removed. A key that
+          # carries no run id forms a single-entry group and is always kept.
+          # Normalise the run id AND embedded hashes: CodeQL and msys2 key on a
+          # commit sha rather than a run id, so without this each lands in its
+          # own group and survives forever (5 CodeQL TRAP entries alone were
+          # 4.3 GB).
+          def family(key):
+              k = re.sub(r"-\d{6,}$", "", key)
+              return re.sub(r"0-9a-f{16,}", "<h>", k)
+          # Rank by the run id in the key, not by created_at. Two master merges
+          # in quick succession can finish out of order, and the later WRITE may
+          # be the older COMMIT; the run id orders by when the run started, so
+          # the newer commit's cache is the one kept. Falls back to the
+          # timestamp for keys that carry no run id.
+          def rank(entry):
+              created, cid, size, key = entry
+              m = re.search(r"-(\d{6,})$", key)
+              return (1, int(m.group(1))) if m else (0, created)
+          groups = collections.defaultdict(list)
+          for cid, created, size, key in rows:
+              groupsfamily(key).append((created, cid, size, key))
+          freed = kept = 0
+          for prefix, entries in groups.items():
+              entries.sort(key=rank, reverse=True)   # newest run first
+              kept += 1
+              for created, cid, size, key in entries1::
+                  freed += size
+                  print(cid)
+          print(f"::notice::keeping {kept} caches, freeing {freed/2**30:.1f} GB", file=__import__("sys").stderr)
+          PY
+          cat to_delete.txt | while read -r id; do
+               -n "$id"  || continue
+              gh api -X DELETE "repos/${REPO}/actions/caches/${id}" >/dev/null 2>&1 \
+                && echo "deleted $id" || echo "skip $id (already gone)"
+          done
+          echo "remaining: $(gh api "repos/${REPO}/actions/cache/usage" --jq '.active_caches_count') caches, \
+          $(gh api "repos/${REPO}/actions/cache/usage" --jq '(.active_caches_size_in_bytes/1073741824*10|floor)/10') GB"

amule-3.0.1.tar.gz/.github/workflows/ccpp.yml -> amule-3.1.0.tar.gz/.github/workflows/ccpp.yml Changed

@@ -3,11 +3,29 @@
 on:
   push:
     branches:  "**" 
+    paths:
+      - 'src/**'
+      - 'cmake/**'
+      - 'CMakeLists.txt'
+      - 'unittests/**'
+      - 'po/**'
+      - 'config.h.cm'
+      - '.github/workflows/ccpp.yml'
   pull_request:
     branches:  "**" 
+    paths:
+      - 'src/**'
+      - 'cmake/**'
+      - 'CMakeLists.txt'
+      - 'unittests/**'
+      - 'po/**'
+      - 'config.h.cm'
+      - '.github/workflows/ccpp.yml'
 
 permissions:
   contents: read
+  # The cache-save-newest guard lists the repository's caches.
+  actions: read
   pull-requests: write
 
 env:
@@ -15,12 +33,20 @@
   CCACHE_MAXSIZE: 500M
 
   # The minus sign removes the trailing new line in the last line
+  #
+  # libayatana-appindicator3-dev is not needed to build aMule, but its
+  # presence is what flips WITH_LIBAYATANA_APPINDICATOR on (CMakeLists.txt
+  # probes for it with pkg_check_modules). Without it the SNI tray backend
+  # in MuleTrayIcon.cpp is #ifdef'd out and never compiled here -- only
+  # packaging.yml built it, and that runs after merge, so a break in that
+  # half landed on master before anything noticed.
   cmake_ubuntu_deps: |-
     binutils-dev \
     build-essential \
     ccache \
     cmake \
     gettext \
+    libayatana-appindicator3-dev \
     libboost-all-dev \
     libcrypto++-dev \
     libgd-dev \
@@ -43,27 +69,31 @@
     pkg-config \
     wxwidgets
 
+  # CLANG64, not MINGW64: wxWidgets 3.3 is not packaged for the latter, and
+  # 3.3 is what the system light/dark appearance support needs. This also
+  # matches the CLANGARM64 leg the release packaging uses, so CI and the
+  # shipped Windows builds share one toolchain.
   cmake_mingw_w64_deps: |
-    mingw-w64-x86_64-boost
-    mingw-w64-x86_64-ccache
-    mingw-w64-x86_64-cmake
-    mingw-w64-x86_64-crypto++
-    mingw-w64-x86_64-gettext
-    mingw-w64-x86_64-libgd
-    mingw-w64-x86_64-libmaxminddb
-    mingw-w64-x86_64-ninja
-    mingw-w64-x86_64-pkgconf
-    mingw-w64-x86_64-pupnp
-    mingw-w64-x86_64-readline
-    mingw-w64-x86_64-toolchain
-    mingw-w64-x86_64-wxwidgets3.2-msw
-    mingw-w64-x86_64-zlib
+    mingw-w64-clang-x86_64-boost
+    mingw-w64-clang-x86_64-ccache
+    mingw-w64-clang-x86_64-cmake
+    mingw-w64-clang-x86_64-crypto++
+    mingw-w64-clang-x86_64-gettext
+    mingw-w64-clang-x86_64-libgd
+    mingw-w64-clang-x86_64-libmaxminddb
+    mingw-w64-clang-x86_64-ninja
+    mingw-w64-clang-x86_64-pkgconf
+    mingw-w64-clang-x86_64-readline
+    mingw-w64-clang-x86_64-toolchain
+    mingw-w64-clang-x86_64-wxwidgets3.3-msw
+    mingw-w64-clang-x86_64-zlib
 
   cmake_common_config_flags: |-
     -B build \
     -DBUILD_ALC=YES \
     -DBUILD_ALCC=YES \
     -DBUILD_AMULECMD=YES \
+    -DBUILD_AMULEAPI=YES \
     -DBUILD_CAS=YES \
     -DBUILD_DAEMON=YES \
     -DBUILD_WXCAS=YES \
@@ -127,8 +157,8 @@
       - name: make
         run: cmake --build build
       - name: save ccache
-        uses: actions/cache/save@v6
-        if: always()
+        uses: ./.github/actions/cache-save-newest
+        if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-${{ matrix.build_type }}-ccache-${{ github.run_id }}
@@ -138,6 +168,67 @@
       - name: run tests
         run: ctest ${{ env.ctest_flags }}
 
+  # The gate-off build is what every other job already covers, because every
+  # experimental switch defaults to OFF. This job is the other half: one Linux
+  # build per switch with it ON, so the code behind it cannot rot unnoticed.
+  #
+  # One job for the whole set rather than one per switch. It asks for the set
+  # through ENABLE_ALL_EXPERIMENTAL, so CI cost stays flat as switches are
+  # added and no entry here has to be edited: NAT traversal, uTP, QUIC and
+  # IPv6 are all still to come. Enabling everything at once is also what a
+  # user who wants the features actually builds, and it is the only
+  # combination that catches switches which do not compile together.
+  #
+  # The cost of not building each switch alone: one that compiles only
+  # alongside another would pass here and fail for someone enabling just that
+  # one. Accepted deliberately, since these switches are independent
+  # subsystems; a per-switch entry can be added to the matrix if that changes.
+  #
+  # Deliberately not an extra dimension on the OS jobs -- doubling every one of
+  # those would cost far more than it tells us, since these switches change no
+  # platform-dependent code.
+  build_cmake_ubuntu_experimental:
+    name: Build CMake Ubuntu Experimental (${{ matrix.build_type }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        build_type: Debug, Release
+    steps:
+      - uses: actions/checkout@v7
+      - name: restore ccache
+        uses: actions/cache/restore@v6
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ runner.os }}-experimental-${{ matrix.build_type }}-ccache-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
+          restore-keys: ${{ runner.os }}-experimental-${{ matrix.build_type }}-ccache-
+      - name: install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ${{ env.cmake_ubuntu_deps }}
+      - name: create build system
+        run: |
+          cmake \
+            -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+            ${{ env.cmake_common_config_flags }} \
+            ${{ env.cmake_ubuntu_config_flags }} \
+            -DENABLE_ALL_EXPERIMENTAL=YES
+      - name: zero ccache stats
+        run: ccache --zero-stats
+      - name: make
+        run: cmake --build build
+      - name: save ccache
+        uses: ./.github/actions/cache-save-newest
+        if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ runner.os }}-experimental-${{ matrix.build_type }}-ccache-${{ github.run_id }}
+      - name: ccache stats
+        if: always()
+        run: ccache --show-stats
+      - name: run tests
+        run: ctest ${{ env.ctest_flags }}
+
   build_cmake_macos:
     name: Build CMake MacOS (${{ matrix.build_type }})
     runs-on: macos-latest
@@ -178,8 +269,8 @@
       - name: make
         run: cmake --build build
       - name: save ccache
-        uses: actions/cache/save@v6
-        if: always()
+        uses: ./.github/actions/cache-save-newest
+        if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-${{ matrix.build_type }}-ccache-${{ github.run_id }}
@@ -195,7 +286,18 @@
     strategy:
       fail-fast: false
       matrix:
-        build_type: Debug, Release
+        # ENABLE_UTP on one leg only. The vendored libutp compiles
+        # libutp_inet_ntop.cpp under if(WIN32), and both jobs that set
+        # ENABLE_ALL_EXPERIMENTAL run on ubuntu-latest, so that source was
+        # built by nothing: a pin bump or an MSYS2 toolchain shift would break
+        # Windows silently and be found by whoever first turned the switch on
+        # there. One leg is enough to compile it, and keeps the cost of a
+        # snapshot that does not build on Windows to a single job.
+        include:
+          - build_type: Debug
+            extra_config_flags: -DENABLE_UTP=YES
+          - build_type: Release
+            extra_config_flags: ""
     defaults:
       run:
         shell: msys2 {0}
@@ -210,22 +312,41 @@
       - name: set up MSYS2 mingw-w64
         uses: msys2/setup-msys2@v2
         with:
-          msystem: MINGW64
+          msystem: CLANG64
           update: true
           install: ${{ env.cmake_mingw_w64_deps }}
+      # MSYS2 only packages pupnp 1.14.x; build the pinned 22.x from source so
+      # Windows gets the UPnP fixes released in 22.0.4 (issue #242). Installed
+      # into $MINGW_PREFIX so find_package(UPNP CONFIG) picks it up and the DLL
+      # bundles into the portable.
+      - name: build libupnp (pupnp) from source
+        run: |
+          set -euo pipefail
+          . packaging/linux/versions.env
+          curl -L -o /tmp/libupnp.tar.gz "$LIBUPNP_TARBALL_URL"
+          echo "$LIBUPNP_SHA256  /tmp/libupnp.tar.gz" | sha256sum -c -
+          mkdir -p /tmp/libupnp
+          tar -xf /tmp/libupnp.tar.gz -C /tmp/libupnp --strip-components=1
+          cmake -S /tmp/libupnp -B /tmp/libupnp/build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release -DUPNP_BUILD_SHARED=ON -DUPNP_BUILD_STATIC=OFF \
+            -DUPNP_BUILD_SAMPLES=OFF -DUPNP_BUILD_TESTS=OFF -Dreuseaddr=ON -Dipv6=ON \
+            -DCMAKE_INSTALL_PREFIX="$MINGW_PREFIX"
+          cmake --build /tmp/libupnp/build
+          cmake --install /tmp/libupnp/build
       - name: create build system
         run: |
           cmake \
             -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
             ${{ env.cmake_common_config_flags }} \
-            ${{ env.cmake_mingw_w64_config_flags }}
+            ${{ env.cmake_mingw_w64_config_flags }} \
+            ${{ matrix.extra_config_flags }}
       - name: zero ccache stats
         run: ccache --zero-stats
       - name: make
         run: cmake --build build
       - name: save ccache
-        uses: actions/cache/save@v6
-        if: always()
+        uses: ./.github/actions/cache-save-newest
+        if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-${{ matrix.build_type }}-ccache-${{ github.run_id }}

amule-3.1.0.tar.gz/.github/workflows/clang-format.yml Added

@@ -0,0 +1,59 @@
+name: clang-format
+
+on:
+  push:
+    branches:  "**" 
+    paths:
+      - 'src/**'
+      - 'unittests/**'
+      - '.clang-format'
+      - '.github/workflows/clang-format.yml'
+  pull_request:
+    branches:  "**" 
+    paths:
+      - 'src/**'
+      - 'unittests/**'
+      - '.clang-format'
+      - '.github/workflows/clang-format.yml'
+
+permissions:
+  contents: read
+
+jobs:
+  clang-format:
+    name: Check clang-format
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - name: Check src/
+        uses: jidicula/clang-format-action@v4.18.0
+        with:
+          clang-format-version: '18'
+          check-path: 'src'
+      - name: Check unittests/
+        uses: jidicula/clang-format-action@v4.18.0
+        with:
+          clang-format-version: '18'
+          check-path: 'unittests'
+      - name: Check warning-suppression blocks are balanced
+        run: |
+          # WarningsPush_*.h and WarningsPop.h wrap third-party includes, and
+          # clang's diagnostic stack needs one pop per push. The headers carry
+          # no include guard on purpose, so a second include really does push
+          # again -- guarding them would silently unbalance the stack instead.
+          #
+          # An unbalanced block fails silently and in the worst direction: the
+          # suppression stays open to the end of the translation unit, so our
+          # own code stops being diagnosed and nothing says so.
+          status=0
+          while IFS= read -r f; do
+            push=$(grep -c 'include ".*WarningsPush_' "$f" || true)
+            pop=$(grep -c 'include ".*WarningsPop\.h"' "$f" || true)
+            if  "$push" -ne "$pop" ; then
+              echo "::error file=$f::$push WarningsPush_* include(s) but $pop WarningsPop.h"
+              status=1
+            fi
+          done < <(grep -rl 'WarningsPush_\|WarningsPop\.h' src unittests \
+                     --include='*.h' --include='*.cpp' \
+                   | grep -v '^src/Warnings')
+          exit $status

amule-3.1.0.tar.gz/.github/workflows/clang-tidy.yml Added

@@ -0,0 +1,298 @@
+name: clang-tidy
+
+on:
+  push:
+    branches:  "**" 
+    paths:
+      - 'src/**'
+      - 'unittests/**'
+      - 'cmake/**'
+      - 'CMakeLists.txt'
+      - 'config.h.cm'
+      - '.clang-tidy'
+      - '.clang-tidy-new-code'
+      - '.github/workflows/clang-tidy.yml'
+  pull_request:
+    branches:  "**" 
+    paths:
+      - 'src/**'
+      - 'unittests/**'
+      - 'cmake/**'
+      - 'CMakeLists.txt'
+      - 'config.h.cm'
+      - '.clang-tidy'
+      - '.clang-tidy-new-code'
+      - '.github/workflows/clang-tidy.yml'
+
+# Supersede an older run only when a newer push makes it pointless, which means
+# within one branch or one PR. The default branch is the exception: every commit
+# on master is its own thing to gate, and merges land minutes apart while Tier-1
+# takes ten. A group shared by all of master therefore had each merge cancel the
+# run of the merge before it, so that commit was never gated and never wrote the
+# ccache/ctcache that only master runs save -- leaving the next run colder too.
+#
+# Keying master runs on the commit gives each its own group, so nothing cancels
+# them and bursts of merges analyze in parallel. Turning cancellation off for
+# master instead would not do: GitHub keeps at most one pending run per group,
+# so a third merge would still discard the second.
+#
+# The two events do not share a group and never did: a PR branch push fires
+# `push` at refs/heads/<branch> and `pull_request` at refs/pull/<n>/merge.
+concurrency:
+  group: clang-tidy-${{ github.workflow }}-${{ github.ref }}-${{ github.ref == 'refs/heads/master' && github.sha || '' }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  # The cache-save-newest guard lists the repository's caches.
+  actions: read
+
+env:
+  CCACHE_DIR: ${{ github.workspace }}/.ccache
+  CCACHE_MAXSIZE: 500M
+  LLVM_VERSION: '21'
+
+  # clang-tidy result cache (ctcache). The whole-tree Tier-1 job runs the
+  # Clang Static Analyzer over every TU -- path-sensitive and slow. ctcache
+  # keys each TU on its preprocessed source + resolved .clang-tidy config +
+  # analyzer version and, by default, stores a digest ONLY when clang-tidy
+  # emits zero diagnostics (a clean TU). A warning-emitting TU is never
+  # cached, so it re-runs and re-emits every time -- the grep-based gate
+  # below is unaffected. On a warm cache only TUs whose preprocessed output
+  # actually changed are re-analyzed.
+  CTCACHE_DIR: ${{ github.workspace }}/.ctcache
+  # Pinned commit of matus-chochlik/ctcache (audited; do not float to a tag).
+  CTCACHE_SHA: 0c7fee26e09ae8a393ed7d56164102da118ab23a
+
+  # Kept in sync with .github/workflows/ccpp.yml so compile_commands.json
+  # matches the real Ubuntu build.
+  # libayatana-appindicator3-dev: without it the SNI tray backend in
+  # MuleTrayIcon.cpp is #ifdef'd out, so neither tidy tier ever sees it.
+  cmake_ubuntu_deps: |-
+    binutils-dev \
+    build-essential \
+    ccache \
+    cmake \
+    gettext \
+    libayatana-appindicator3-dev \
+    libboost-all-dev \
+    libcrypto++-dev \
+    libgd-dev \
+    libglib2.0-dev \
+    libmaxminddb-dev \
+    libreadline-dev \
+    libupnp-dev \
+    libwxgtk3.2-dev \
+    pkg-config \
+    wx3.2-headers
+
+  cmake_config_flags: |-
+    -B build \
+    -DCMAKE_BUILD_TYPE=Debug \
+    -DCMAKE_EXPORT_COMPILE_COMMANDS=YES \
+    -DBUILD_ALC=YES \
+    -DBUILD_ALCC=YES \
+    -DBUILD_AMULECMD=YES \
+    -DBUILD_AMULEAPI=YES \
+    -DBUILD_CAS=YES \
+    -DBUILD_DAEMON=YES \
+    -DBUILD_WXCAS=YES \
+    -DBUILD_ED2K=YES \
+    -DBUILD_MONOLITHIC=YES \
+    -DBUILD_REMOTEGUI=YES \
+    -DBUILD_TESTING=YES \
+    -DBUILD_WEBSERVER=YES \
+    -DENABLE_NLS=YES \
+    -DENABLE_UPNP=YES \
+    -DENABLE_IP2COUNTRY=YES \
+    -DENABLE_ALL_EXPERIMENTAL=YES
+
+jobs:
+  # Whole-tree Tier-1 gate: the bug-oriented checks in .clang-tidy must report
+  # zero warnings anywhere under src/.
+  clang-tidy-full:
+    name: clang-tidy (whole tree, Tier-1)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - name: restore ccache
+        uses: actions/cache/restore@v6
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: clang-tidy-ccache-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
+          restore-keys: clang-tidy-ccache-
+      # Roll the ctcache forward run-to-run: save under the run id, restore the
+      # newest previous one via the shared prefix. Bump the version suffix when
+      # LLVM_VERSION or CTCACHE_SHA changes so a stale cache can't mask a shift
+      # in analyzer output or digest scheme.
+      - name: restore ctcache
+        uses: actions/cache/restore@v6
+        with:
+          path: ${{ env.CTCACHE_DIR }}
+          key: clang-tidy-ctcache-llvm${{ env.LLVM_VERSION }}-${{ env.CTCACHE_SHA }}-${{ github.run_id }}
+          restore-keys: clang-tidy-ctcache-llvm${{ env.LLVM_VERSION }}-${{ env.CTCACHE_SHA }}-
+      - name: install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ${{ env.cmake_ubuntu_deps }} jq
+          wget -qO- https://apt.llvm.org/llvm.sh | sudo bash -s -- ${LLVM_VERSION}
+          sudo apt-get install -y clang-tidy-${LLVM_VERSION}
+      # Fetch the pinned ctcache wrapper. If the download fails, the next step
+      # falls back to the bare analyzer binary, so ctcache availability never
+      # becomes a gate dependency.
+      - name: fetch ctcache
+        run: |
+          mkdir -p "$HOME/ctcache"
+          if curl -fsSL "https://github.com/matus-chochlik/ctcache/archive/${CTCACHE_SHA}.tar.gz" \
+               | tar -xz --strip-components=1 -C "$HOME/ctcache"; then
+            chmod +x "$HOME/ctcache/clang-tidy"
+            echo "CTCACHE_WRAPPER=$HOME/ctcache/clang-tidy" >> "$GITHUB_ENV"
+            echo "ctcache wrapper ready: $HOME/ctcache/clang-tidy"
+          else
+            echo "::warning::ctcache fetch failed; falling back to uncached clang-tidy-${LLVM_VERSION}"
+            echo "CTCACHE_WRAPPER=clang-tidy-${LLVM_VERSION}" >> "$GITHUB_ENV"
+          fi
+      - name: create build system
+        run: cmake ${{ env.cmake_config_flags }}
+      - name: build (generate headers + compile_commands.json)
+        run: cmake --build build
+      - name: save ccache
+        uses: ./.github/actions/cache-save-newest
+        if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: clang-tidy-ccache-${{ github.run_id }}
+      - name: clang-tidy Tier-1 over src/
+        env:
+          # The ctcache wrapper shells out to this real analyzer on a cache
+          # miss; keep it pinned to the LLVM_VERSION we validated against.
+          CTCACHE_CLANG_TIDY: clang-tidy-${{ env.LLVM_VERSION }}
+        run: |
+          # Analyze every src/ translation unit except the generated lexers
+          # and parsers, and the two subtrees that carry a Checks: '-*'
+          # .clang-tidy of their own: src/extern and src/webserver/src.
+          #
+          # Feeding those to clang-tidy only ever produced "Error: no checks
+          # enabled" and a usage dump, at the full cost of parsing the TU, and
+          # each is a permanent ctcache miss because a digest is only stored
+          # for a TU that emits nothing. If a third subtree is ever excluded
+          # the same way, add it here too.
+          mapfile -t files < <(jq -r '..file' build/compile_commands.json \
+            | grep -E '/src/' \
+            | grep -vE '/src/(extern|webserver/src)/' \
+            | grep -vE '/(Scanner|Parser|IPFilterScanner)\.cpp$' \
+            | sort -u)
+          echo "Analyzing ${#files@} translation units"
+          # Route the analyzer through the ctcache wrapper (bare binary on
+          # fetch fallback). ctcache stores a digest only for TUs that emit
+          # zero diagnostics, so warning-bearing TUs always re-run -- the grep
+          # gate below is authoritative regardless of cache state. The wrapper
+          # forwards every arg and stream verbatim; -quiet keeps clean TUs'
+          # stdout empty so they qualify for caching.
+          run-clang-tidy-${LLVM_VERSION} \
+            -clang-tidy-binary "${CTCACHE_WRAPPER}" \
+            -p build -quiet "${files@}" 2>&1 \
+            | tee tidy-full.log || true
+          # A header warning is reported once per including TU; keep project
+          # locations only (drop system, wxWidgets and generated sources).
+          # clang-diagnostic-* are compiler pass-throughs, not our configured
+          # checks -- the build step above is the real compile gate, and a file
+          # compiled into several targets can carry an incomplete -I set in one
+          # of them; drop those so they don't masquerade as lint findings.
+          grep -E ': (warning|error):' tidy-full.log \
+            | grep -E '/src/' \
+            | grep -vE '/wx-0-9|/(Scanner|Parser|IPFilterScanner)\.cpp|clang-diagnostic-' \
+            | sort -u > tidy-hits.txt || true
+          if  -s tidy-hits.txt ; then
+            echo "::error::clang-tidy Tier-1 reported warnings:"
+            cat tidy-hits.txt
+            exit 1
+          fi
+          echo "clang-tidy Tier-1: clean"
+      # Persist AFTER the analysis so the newly-populated clean digests are
+      # stored; if: always() so a Tier-1 failure still saves the hits computed
+      # this run. Unlike ccache (filled by the build), ctcache is filled here.
+      - name: save ctcache
+        uses: ./.github/actions/cache-save-newest
+        if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
+        with:
+          path: ${{ env.CTCACHE_DIR }}
+          key: clang-tidy-ctcache-llvm${{ env.LLVM_VERSION }}-${{ env.CTCACHE_SHA }}-${{ github.run_id }}
+
+  # Diff-only Tier-2 gate: the maintainability checks in .clang-tidy-new-code
+  # must not fire on any line the change touches.
+  clang-tidy-diff:
+    name: clang-tidy (changed lines, Tier-2)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+      - name: restore ccache
+        uses: actions/cache/restore@v6
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: clang-tidy-ccache-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
+          restore-keys: clang-tidy-ccache-
+      - name: install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ${{ env.cmake_ubuntu_deps }}
+          wget -qO- https://apt.llvm.org/llvm.sh | sudo bash -s -- ${LLVM_VERSION}
+          sudo apt-get install -y clang-tidy-${LLVM_VERSION}
+      - name: determine diff base
+        id: base
+        run: |
+          if  "${{ github.event_name }}" = "pull_request" ; then
+            base="${{ github.event.pull_request.base.sha }}"
+          else
+            def="${{ github.event.repository.default_branch }}"
+            git fetch --no-tags origin "+refs/heads/$def:refs/remotes/origin/$def" || true
+            base="$(git merge-base HEAD "origin/$def" 2>/dev/null || true)"
+          fi
+          # A branch cut straight from the default tip (or a missing ref) leaves
+          # base empty; fall back to the previous commit so the diff is never
+          # the whole tree.
+          if  -z "$base" ; then
+            base="$(git rev-parse HEAD^ 2>/dev/null || git rev-parse HEAD)"
+          fi
+          echo "Using diff base: $base"
+          echo "sha=$base" >> "$GITHUB_OUTPUT"
+      - name: create build system
+        run: cmake ${{ env.cmake_config_flags }}
+      - name: build (generate headers + compile_commands.json)
+        run: cmake --build build
+      - name: save ccache
+        uses: ./.github/actions/cache-save-newest
+        if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: clang-tidy-ccache-${{ github.run_id }}
+      - name: clang-tidy Tier-2 on changed lines
+        run: |
+          # src/extern is vendored: src/extern/.clang-tidy exempts it with
+          # Checks: '-*', but -config-file below overrides per-directory
+          # discovery entirely, so that exemption has no effect in this job
+          # (it does work in Tier-1, which uses discovery). Excluded here
+          # rather than filtered out of the output, so the checks are not run
+          # only to be discarded. Without this, vendoring a dependency lands a
+          # gate demanding edits to third-party sources that the provenance
+          # notes say not to touch.
+          # Generated lexer/parser output is maintained through its source grammar.
+          git diff -U0 "${{ steps.base.outputs.sha }}"...HEAD -- 'src/**' ':(exclude)src/extern/**' \
+            ':(exclude)src/Parser.cpp' ':(exclude)src/Scanner.cpp' ':(exclude)src/IPFilterScanner.cpp' \
+            | clang-tidy-diff-${LLVM_VERSION}.py \
+                -clang-tidy-binary clang-tidy-${LLVM_VERSION} \
+                -p1 -path build -config-file .clang-tidy-new-code -quiet 2>&1 \
+            | tee tidy-diff.log || true
+          # See the Tier-1 job: clang-diagnostic-* are compiler pass-throughs
+          # (the build step is the compile gate), not our configured checks.
+          grep -E ': (warning|error):' tidy-diff.log \
+            | grep -vE '/wx-0-9|clang-diagnostic-' \
+            | sort -u > diff-hits.txt || true
+          if  -s diff-hits.txt ; then
+            echo "::error::clang-tidy Tier-2 reported warnings on changed lines:"
+            cat diff-hits.txt
+            exit 1
+          fi
+          echo "clang-tidy Tier-2: clean"

amule-3.0.1.tar.gz/.github/workflows/codeql.yml -> amule-3.1.0.tar.gz/.github/workflows/codeql.yml Changed

@@ -24,11 +24,14 @@
 
 env:
   # The minus sign removes the trailing new line in the last line
+  # libayatana-appindicator3-dev: without it the SNI tray backend in
+  # MuleTrayIcon.cpp is #ifdef'd out and is never analysed.
   cmake_ubuntu_deps: |-
     binutils-dev \
     build-essential \
     cmake \
     gettext \
+    libayatana-appindicator3-dev \
     libboost-all-dev \
     libcrypto++-dev \
     libgd-dev \
@@ -89,8 +92,9 @@
           - language: c-cpp
             # build-mode: autobuild
             build-mode: manual
-          - language: java-kotlin
-            build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
+          # java-kotlin was dropped: the tree's last Java file, the generated
+          # ECCodes.java, went with the committed EC headers, so the analysis
+          # had nothing left to scan and failed on every run.
           - language: python
             build-mode: none
           #- language: ruby

amule-3.0.1.tar.gz/.github/workflows/i18n.yml -> amule-3.1.0.tar.gz/.github/workflows/i18n.yml Changed

@@ -37,6 +37,13 @@
       - name: Installing tools
         run: sudo apt-get install -y gettext
 
+      # Before regenerating: the regeneration itself cannot catch a source
+      # file missing from POTFILES.in, because it scans that same list. The
+      # catalogs come out perfectly in sync with what was scanned, while the
+      # unscanned file's strings are absent from every language (#786).
+      - name: POTFILES.in lists every file marking strings
+        run: ./scripts/check-potfiles.sh
+
       - name: Regenerate pot + merge into po
         run: ./scripts/update-po.sh
 
@@ -110,3 +117,21 @@
             echo "Run scripts/update-manpages-po.sh locally and commit the result."
             exit 1
           fi
+
+  webapi-dictionaries:
+    name: amuleapi Web UI dictionaries
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v7
+
+      - uses: actions/setup-node@v7
+        with:
+          node-version: '20'
+
+      # Checks every locale carries exactly en.json's keys with matching
+      # {placeholders}, and that every preferences field resolves to a real
+      # label. The label keys are derived from the field names, so a renamed
+      # field with no dictionary entry would silently render the raw key.
+      - name: Checking Web UI dictionaries
+        run: node src/webapi/tools/check-i18n.mjs

amule-3.1.0.tar.gz/.github/workflows/icons.yml Added

@@ -0,0 +1,35 @@
+name: Icons CI
+
+on:
+  push:
+    branches:  "**" 
+  pull_request:
+    branches:  "**" 
+
+permissions:
+  contents: read
+
+jobs:
+  icon-data-sync:
+    name: Icon data in sync with source
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v7
+
+      # src/icons/icon_data.c is regenerated from src/icons/*.png at configure
+      # time when Python3 is present, so the checked-in copy is only ever
+      # compiled on a Python3-less build. Nothing otherwise re-derives it, so it
+      # can silently drift from the icon set (a missing/renamed icon goes
+      # unnoticed until such a build). Regenerate and fail on any difference.
+      - name: Regenerate icon_data.c from the icon set
+        run: python3 src/icons/embed_icons.py src/icons src/icons/icon_data.c
+
+      - name: Verify no drift
+        run: |
+          if ! git diff --quiet -- src/icons/icon_data.c; then
+            echo "::error file=src/icons/icon_data.c::checked-in icon_data.c is out of sync with src/icons/"
+            echo "Run: python3 src/icons/embed_icons.py src/icons src/icons/icon_data.c  and commit the result."
+            git --no-pager diff -- src/icons/icon_data.c | head -60
+            exit 1
+          fi

amule-3.0.1.tar.gz/.github/workflows/packaging.yml -> amule-3.1.0.tar.gz/.github/workflows/packaging.yml Changed

@@ -36,7 +36,7 @@
           Comma-separated list of platform tracks to run.
           Default empty = run all. Useful during iteration to focus
           on the failing tracks without paying for the green ones.
-          Valid: appimage, flatpak, macos, windows.
+          Valid: appimage, flatpak, macos, windows, linux-static.
         required: false
         type: string
         default: ''
@@ -51,6 +51,8 @@
 
 permissions:
   contents: read
+  # The cache-save-newest guard lists the repository's caches.
+  actions: read
 
 # ccache wiring. Every compile job (appimage / flatpak / macos / windows-
 # zip) installs ccache and persists its cache across runs via
@@ -101,13 +103,20 @@
       - name: Zero ccache stats
         if: github.event_name != 'workflow_call'
         run: ccache --zero-stats
+      # buildx + a gha layer cache for the image build, matching the static
+      # track. wxWidgets is compiled inside the image, so ccache never sees
+      # it; without this every run rebuilds it from scratch.
+      - name: Set up Buildx
+        uses: docker/setup-buildx-action@v4
       - name: Build AppImage
+        env:
+          APPIMAGE_CACHE_SCOPE: ${{ github.event_name != 'workflow_call' && format('appimage-{0}', matrix.arch) || '' }}
         run: packaging/linux/build.sh appimage
       - name: Validate via cross-distro Docker matrix
         run: packaging/linux/build.sh validate
       - name: Save ccache
-        if: always() && github.event_name != 'workflow_call'
-        uses: actions/cache/save@v6
+        if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
+        uses: ./.github/actions/cache-save-newest
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-appimage-${{ matrix.arch }}-ccache-${{ github.run_id }}
@@ -121,6 +130,49 @@
           if-no-files-found: error
 
   # ------------------------------------------------------------------
+  # Linux — fully static amuled/amulecmd/amuleapi (musl/Alpine) on
+  # x86_64 + aarch64 native runners. Self-contained binaries with no
+  # runtime shared-library deps, for containers / minimal / musl hosts.
+  # See packaging/docker/Dockerfile.static-daemon.
+  # ------------------------------------------------------------------
+  linux-static:
+    name: Linux static (${{ matrix.arch }})
+    if: >-
+      github.event_name != 'workflow_dispatch' ||
+      inputs.only == '' ||
+      contains(inputs.only, 'linux-static')
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { arch: x86_64,  runs-on: ubuntu-22.04 }
+          - { arch: aarch64, runs-on: ubuntu-22.04-arm }
+    runs-on: ${{ matrix.runs-on }}
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          fetch-depth: 0  # git describe for the version string
+
+      - name: Set up Buildx
+        uses: docker/setup-buildx-action@v4
+
+      # STATIC_CACHE_SCOPE turns on buildx's gha layer cache (the ccache
+      # analogue for this track): the dep layers (Crypto++ / wxWidgets /
+      # pupnp / apk) persist across runs, so only the aMule compile re-runs
+      # on a src change. Empty on workflow_call (release.yml tag builds) so
+      # the shipped binaries always come from a cold compile.
+      - name: Build static tarball
+        env:
+          STATIC_CACHE_SCOPE: ${{ github.event_name != 'workflow_call' && format('linux-static-{0}', matrix.arch) || '' }}
+        run: packaging/linux/build.sh static
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: linux-static-${{ matrix.arch }}
+          path: dist/aMule-*-Linux-*-static.tar.gz
+          if-no-files-found: error
+
+  # ------------------------------------------------------------------
   # Linux — Flatpak on x86_64 + aarch64 native runners
   # ------------------------------------------------------------------
   flatpak:
@@ -174,11 +226,21 @@
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-flatpak-${{ matrix.arch }}-ccache-${{ hashFiles('**/CMakeLists.txt', 'cmake/**', 'packaging/linux/flatpak/**.yml.in') }}
           restore-keys: ${{ runner.os }}-flatpak-${{ matrix.arch }}-ccache-
+      # flatpak-builder compiles inside the build sandbox, which CCACHE_MAXSIZE
+      # does not reach, so ccache applied its own 5 GB default and the x86_64
+      # entry had grown to 4.4 GB of the repository's 10 GB budget -- evicting
+      # the caches every other job depends on. max_size in the cache's own
+      # config travels with it and is read wherever ccache runs. One build
+      # writes ~350 MB, so 1 GB keeps the current generation and two behind it.
+      - name: Cap the flatpak-builder ccache
+        run: |
+          mkdir -p "$CCACHE_DIR"
+          echo "max_size = 1.0G" > "$CCACHE_DIR/ccache.conf"
       - name: Build Flatpak
         run: packaging/linux/build.sh flatpak
       - name: Save flatpak-builder ccache
-        if: always() && github.event_name != 'workflow_call'
-        uses: actions/cache/save@v6
+        if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
+        uses: ./.github/actions/cache-save-newest
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-flatpak-${{ matrix.arch }}-ccache-${{ github.run_id }}
@@ -227,20 +289,145 @@
           # Apple Silicon runners ship Rosetta preinstalled. Install
           # x86_64 Homebrew at /usr/local so we can fetch x86_64 bottles
           # for our deps. The native /opt/homebrew install is left alone.
-          arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+          #
+          # Pinned rather than HEAD: as of 2026-09-11 install.sh aborts
+          # with "Homebrew on macOS is only supported on Apple Silicon
+          # processors!" before it creates the prefix, so HEAD cannot
+          # bootstrap this leg at all. df3c2556 is the last commit that
+          # still installs to /usr/local. A pinned ref also removes a
+          # fetch-HEAD-and-pipe-to-bash hazard.
+          REF=df3c2556141c012eaba0453ede7a1bd4f05b824c
+          arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/$REF/install.sh)"
+      - name: Update Homebrew
+        run: ${{ matrix.archcmd }} ${{ matrix.brew_prefix }}/bin/brew update
+      # Homebrew is retiring Intel macOS, and a formula loses its Intel
+      # bottle the moment it is next revised, publishing arm64_* macOS
+      # tags only (plus x86_64_linux, a Linuxbrew ELF build unusable on
+      # a Mac). `brew install` then aborts with "no bottle available!"
+      # before reaching the rest of the list, so every formula that has
+      # lost its Intel bottle is built from source here instead.
+      #
+      # Pouring the last published Intel bottle by hand looks tempting
+      # and does not work: bottles carry @@HOMEBREW_PREFIX@@ in every
+      # install name, and Homebrew rewrites that during its own pour
+      # with a Mach-O edit plus a re-sign. An untarred bottle is broken,
+      # silently, until something tries to link against it.
+      #
+      # pkgconf is in the list as a build dependency, not a runtime one:
+      # aom, libmaxminddb and wxwidgets all need it to build and it has
+      # no Intel bottle either, so leaving it implicit risks the same
+      # "no bottle available!" abort one level down.
+      #
+      # Building costs upwards of an hour, so the kegs are cached and
+      # only a version bump pays it again. One list drives the cache
+      # paths and the relink below, so they cannot drift apart.
+      - name: Resolve x86_64 source-built versions
+        id: intelkegs
+        if: matrix.arch == 'x86_64'
+        run: |
+          # Everything x86_64 compiles from source, listed once. The last
+          # four are dependencies of the rest with no Intel bottle either:
+          # uncached, they rebuilt on every run for ~12 minutes.
+          KEGS="pcre2 openssl@3 aom jpeg-turbo json-c libmaxminddb libtiff libupnp lz4 pkgconf wxwidgets xz readline mpdecimal libvmaf"
+          ${{ matrix.archcmd }} ${{ matrix.brew_prefix }}/bin/brew info --json=v2 $KEGS > "$RUNNER_TEMP/kegs.json"
+          python3 - "$RUNNER_TEMP/kegs.json" "$GITHUB_OUTPUT" <<'EOF'
+          import json, sys
+          formulae = json.load(open(sys.argv1))"formulae"
+          names = f"name" for f in formulae
+          with open(sys.argv2, "a") as out:
+              out.write("kegs=%s\n" % " ".join(names))
+              # Keg-only formulae stay out of /usr/local; readline would shadow libedit.
+              out.write("linkable=%s\n" % " ".join(f"name" for f in formulae if not f"keg_only"))
+              out.write("paths<<PATHS\n")
+              for f in formulae:
+                  out.write("/usr/local/Cellar/%s\n" % f"name")
+                  # Aliases and old names get an opt link too, and the build
+                  # shims go through those: pkg-config, never pkgconf.
+                  for n in f"name", *f.get("aliases", ), *f.get("oldnames", ):
+                      out.write("/usr/local/opt/%s\n" % n)
+              out.write("PATHS\n")
+          EOF
+      - name: Restore x86_64 source-built kegs
+        if: matrix.arch == 'x86_64' && github.event_name != 'workflow_call'
+        uses: actions/cache/restore@v6
+        with:
+          path: ${{ steps.intelkegs.outputs.paths }}
+          # Keyed by run like ccache, so the newest set is always what restores
+          # and retention prunes the rest. Which kegs are stale is not the key's
+          # job: `brew install` below upgrades only what is outdated, along with
+          # any dependent Homebrew marks for a rebuild.
+          key: ${{ runner.os }}-macos-intel-kegs-${{ github.run_id }}
+          restore-keys: ${{ runner.os }}-macos-intel-kegs-
       - name: Install Homebrew deps
         run: |
           BREW=${{ matrix.brew_prefix }}/bin/brew
-          ${{ matrix.archcmd }} $BREW update
-          ${{ matrix.archcmd }} $BREW install --quiet \
-              cmake wxwidgets cryptopp libupnp gd gettext boost dylibbundler libmaxminddb \
-              ccache
+          MAINDEPS="cmake wxwidgets cryptopp libupnp gd gettext boost dylibbundler libmaxminddb ccache"
+          if  "${{ matrix.arch }}" = "x86_64" ; then
+              SRCBUILD="${{ steps.intelkegs.outputs.kegs }}"
+              # Several of these build against a Homebrew python, whose bin names
+              # (python3, pip3, idle3) are already symlinks to the python.org
+              # framework in /usr/local/bin. Its link step fails, and brew carries
+              # that into the exit status of the whole install even though every
+              # keg built -- which under bash -e ends the step. Only x86_64
+              # collides: arm64 brew lives in /opt/homebrew.
+              #
+              # Before any install, because which formula drags python in depends
+              # on what the cache restored: warm it is gd, cold it is aom, and aom
+              # is in the first install below. Resolved over both lists rather than
+              # pinned, so a python bump does not quietly bring this back. The
+              # install may fail on the very conflict being settled, so the link is
+              # what is checked.
+              for p in $(${{ matrix.archcmd }} $BREW deps --union --include-build $SRCBUILD $MAINDEPS | grep '^python@' || true); do
+                  ${{ matrix.archcmd }} $BREW install "$p" || true
+                  ${{ matrix.archcmd }} $BREW link --overwrite "$p"
+              done
+              # A restored keg has no /usr/local/{lib,include} symlinks and no
+              # alias opt links -- only the Cellar and opt paths are cached --
+              # so relink or dependents will not find the headers. openssl@3 is
+              # found through its opt path, which is cached. The -d guard skips
+              # what a cold cache has not installed yet.
+              relink() {
+                  for f in ${{ steps.intelkegs.outputs.linkable }}; do
+                       "$f" = "openssl@3"  && continue
+                       -d "${{ matrix.brew_prefix }}/Cellar/$f"  || continue
+                      ${{ matrix.archcmd }} $BREW link --overwrite "$f"
+                  done
+              }
+              # Before the install as well: whatever the cache restored stale
+              # compiles here, and configure reaches pkgconf through the shim's
+              # opt/pkg-config -- an alias link only `brew link` restores.
+              relink
+              # What the restored set is missing or has outdated: the only
+              # formulae the install below will compile.
+              ${{ matrix.archcmd }} $BREW outdated $SRCBUILD || true
+              # No-op for each keg the cache restored at the current version.
+              ${{ matrix.archcmd }} $BREW install --build-from-source $SRCBUILD
+              relink
+          fi
+          # NOT --quiet: when the next formula loses its Intel bottle,
+          # the reason has to be in the log. It was suppressed here, so
+          # this step failed with a bare exit 1 and the breakage only
+          # surfaced two steps later as "ccache: command not found".
+          ${{ matrix.archcmd }} $BREW install $MAINDEPS
+          if  "${{ matrix.arch }}" = "x86_64" ; then
+              # An upgrade leaves the old version beside the new one in Cellar;
+              # drop it so the saved cache does not grow with every bump.
+              ${{ matrix.archcmd }} $BREW cleanup $SRCBUILD
+          fi
           # Prepend the matrix-selected brew prefix to PATH so every
           # `brew --prefix` / `cmake` / `pkg-config` invocation in the
           # build script resolves against the right install. gettext
           # is keg-only on macOS; add msgfmt to PATH for the NLS probe.
           echo "${{ matrix.brew_prefix }}/bin" >> "$GITHUB_PATH"
           echo "${{ matrix.brew_prefix }}/opt/gettext/bin" >> "$GITHUB_PATH"
+      - name: Save x86_64 source-built kegs
+        # Master only, as for ccache: retention compares keys across branches,
+        # and a branch-scoped entry that ranked newest would cost master its own.
+        if: matrix.arch == 'x86_64' && github.event_name == 'push' && github.ref == 'refs/heads/master'
+        uses: ./.github/actions/cache-save-newest
+        with:
+          path: ${{ steps.intelkegs.outputs.paths }}
+          key: ${{ runner.os }}-macos-intel-kegs-${{ github.run_id }}
       - name: Restore ccache
         if: github.event_name != 'workflow_call'
         uses: actions/cache/restore@v6
@@ -280,8 +467,8 @@
            -d "${MNT}/aMuleGUI.app"  || { echo "aMuleGUI.app missing from per-arch dmg" >&2; exit 1; }
           hdiutil detach "${MNT}"
       - name: Save ccache
-        if: always() && github.event_name != 'workflow_call'
-        uses: actions/cache/save@v6
+        if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
+        uses: ./.github/actions/cache-save-newest
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-macos-${{ matrix.arch }}-ccache-${{ github.run_id }}
@@ -387,8 +574,7 @@
           cp -R aMule.app    "${STAGE}/"
           cp -R aMuleGUI.app "${STAGE}/"
           ln -s /Applications "${STAGE}/Applications"
-          hdiutil create -volname "aMule ${VERSION}" \
-              -srcfolder "${STAGE}" -ov -format UDZO \
+          packaging/macos/create-dmg.sh "aMule ${VERSION}" "${STAGE}" \
               "dist/aMule-${VERSION}-macOS-universal2.dmg"
       - uses: actions/upload-artifact@v7
         with:
@@ -397,7 +583,13 @@
           if-no-files-found: error
 
   # ------------------------------------------------------------------
-  # Windows — portable .zip for x64 (MINGW64) and ARM64 (CLANGARM64).
+  # Windows — portable .zip for x64 (CLANG64) and ARM64 (CLANGARM64).
+  #
+  # Both arches are clang + UCRT so there is one Windows toolchain to reason
+  # about, and a Windows-specific bug reproduces the same on either. x64 moved
+  # off MINGW64 because wxWidgets 3.3 is not packaged for that environment --
+  # MSYS2 ships it only for clang-x86_64, clang-aarch64 and ucrt-x86_64 -- and
+  # 3.3 is what makes the app follow the system light/dark appearance.
   # ------------------------------------------------------------------
   windows-zip:
     name: Windows portable .zip (${{ matrix.arch }})
@@ -410,9 +602,9 @@
       matrix:
         include:
           - arch: x64
-            msystem: MINGW64
+            msystem: CLANG64
             runs-on: windows-2025
-            pkg_prefix: mingw-w64-x86_64
+            pkg_prefix: mingw-w64-clang-x86_64
           - arch: arm64
             msystem: CLANGARM64
             runs-on: windows-11-arm
@@ -439,11 +631,11 @@
             ${{ matrix.pkg_prefix }}-libgd
             ${{ matrix.pkg_prefix }}-libmaxminddb
             ${{ matrix.pkg_prefix }}-make
+            ${{ matrix.pkg_prefix }}-ninja
             ${{ matrix.pkg_prefix }}-pkgconf
-            ${{ matrix.pkg_prefix }}-pupnp
             ${{ matrix.pkg_prefix }}-readline
             ${{ matrix.pkg_prefix }}-toolchain
-            ${{ matrix.pkg_prefix }}-wxwidgets3.2-msw
+            ${{ matrix.pkg_prefix }}-wxwidgets3.3-msw
             ${{ matrix.pkg_prefix }}-zlib
             git
             zip
@@ -468,6 +660,24 @@
         # aMule-snapshot-Windows-*.zip instead of
         # aMule-<tag>-Windows-*.zip.
         run: git config --global --add safe.directory '*'
+      # MSYS2 only packages pupnp 1.14.x; build the pinned 22.x from source so
+      # the Windows portable gets the UPnP fixes released in 22.0.4 (issue
+      # #242). Installed into $MINGW_PREFIX so find_package(UPNP CONFIG) picks
+      # it up and build.sh's dependency bundling ships the 22.x DLL.
+      - name: Build libupnp (pupnp) from source
+        run: |
+          set -euo pipefail
+          . packaging/linux/versions.env
+          curl -L -o /tmp/libupnp.tar.gz "$LIBUPNP_TARBALL_URL"
+          echo "$LIBUPNP_SHA256  /tmp/libupnp.tar.gz" | sha256sum -c -
+          mkdir -p /tmp/libupnp
+          tar -xf /tmp/libupnp.tar.gz -C /tmp/libupnp --strip-components=1
+          cmake -S /tmp/libupnp -B /tmp/libupnp/build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release -DUPNP_BUILD_SHARED=ON -DUPNP_BUILD_STATIC=OFF \
+            -DUPNP_BUILD_SAMPLES=OFF -DUPNP_BUILD_TESTS=OFF -Dreuseaddr=ON -Dipv6=ON \
+            -DCMAKE_INSTALL_PREFIX="$MINGW_PREFIX"
+          cmake --build /tmp/libupnp/build
+          cmake --install /tmp/libupnp/build
       - name: Build portable .zip
         env:
           WINDOWS_MSYSTEM: ${{ matrix.msystem }}
@@ -490,8 +700,8 @@
           # any tagged-release banner ("aMuleD 3.0.0 ...", etc.).
           grep -q '^aMuleD ' /tmp/version.txt
       - name: Save ccache
-        if: always() && github.event_name != 'workflow_call'
-        uses: actions/cache/save@v6
+        if: always() && github.event_name == 'push' && github.ref == 'refs/heads/master'
+        uses: ./.github/actions/cache-save-newest
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-windows-${{ matrix.arch }}-ccache-${{ github.run_id }}
@@ -505,7 +715,11 @@
           if-no-files-found: error
 
   # ------------------------------------------------------------------
-  # Windows — NSIS installer .exe for x64 (MINGW64) and ARM64 (CLANGARM64).
+  # Windows — NSIS installer .exe for x64 and ARM64.
+  #
+  # msystem here is only the shell the job runs in: the step installs bare
+  # git/unzip/python and wraps an already-built payload, so it needs no
+  # compiler and does not have to match the environment windows-zip built in.
   # Consumes the portable tree built by windows-zip rather than building
   # it a second time. Coupling is correct here: with no payload there's
   # nothing to wrap, so a windows-zip failure should skip the installer.
@@ -555,7 +769,29 @@
         # build.sh installer auto-discovers makensis at the standard
         # install dir, so no $GITHUB_PATH plumbing is needed.
         shell: pwsh
-        run: choco install -y --no-progress nsis
+        run: |
+          # choco exits 0 when the community feed is unreachable ("Unable to
+          # find package 'nsis'" after a 504), so the missing tool only
+          # surfaces two steps later as "makensis not on PATH". Verify what
+          # actually landed, at the paths build.sh searches, and retry the
+          # outage rather than trusting the exit code.
+          $nsis = @(
+            "C:\Program Files (x86)\NSIS\makensis.exe",
+            "C:\Program Files\NSIS\makensis.exe"
+          )
+          foreach ($attempt in 1..3) {
+            if ($nsis | Where-Object { Test-Path $_ }) { break }
+            if ($attempt -gt 1) {
+              Write-Host "NSIS still missing, retrying in 20s (attempt $attempt/3)"
+              Start-Sleep -Seconds 20
+            }
+            choco install -y --no-progress nsis
+          }
+          $found = $nsis | Where-Object { Test-Path $_ }
+          if (-not $found) {
+            throw "NSIS install reported success but makensis.exe is at neither $($nsis -join ' nor ')"
+          }
+          Write-Host "makensis: $($found0)"
       - name: Configure git safe.directory for MSYS2 git
         run: git config --global --add safe.directory '*'
       - name: Download portable .zip from windows-zip job

amule-3.0.1.tar.gz/.github/workflows/release.yml -> amule-3.1.0.tar.gz/.github/workflows/release.yml Changed

@@ -47,6 +47,11 @@
 
 permissions:
   contents: write
+  # A called workflow can only ask for permissions the caller already holds, and naming
+  # one scope sets every other to none. packaging.yml needs actions:read for its cache
+  # guard, so without this the whole run fails to start -- before any job exists, which
+  # is why it reads as a startup failure with nothing to open.
+  actions: read
 
 jobs:
   # One-click entry point: turn the dispatched version into a real tag
@@ -61,6 +66,29 @@
       - uses: actions/checkout@v7
         with:
           fetch-depth: 0
+      # Gate: the release version must have a docs/CHANGELOG.md entry before we
+      # tag. The AppStream metainfo <releases> is generated from that changelog
+      # at build time, so a missing entry would ship a stale store version (the
+      # 3.0.1-labelled-3.0.0 drift this process fixes). Runs before tagging so a
+      # forgotten changelog blocks the release instead of shipping wrong.
+      - name: Verify CHANGELOG has an entry for this version
+        if: github.event_name == 'workflow_dispatch'
+        env:
+          VERSION: ${{ inputs.version }}
+        run: |
+          set -euo pipefail
+          # Throwaway fork-test tags (e.g. 0.0.0-fork-test) won't be in the
+          # changelog; don't block them.
+          case "${VERSION}" in
+            0.0.0*|*fork-test*) echo "Test version ${VERSION}; skipping CHANGELOG gate."; exit 0 ;;
+          esac
+          top="$(grep -m1 -oE '^## Version ^ +' docs/CHANGELOG.md | awk '{print $3}')"
+          if  "${top}" != "${VERSION}" ; then
+            echo "::error::docs/CHANGELOG.md newest entry is '${top}', but releasing '${VERSION}'."
+            echo "Add a '## Version ${VERSION}' block (date line + summary paragraph) to docs/CHANGELOG.md before releasing -- the AppStream metainfo release list is generated from it."
+            exit 1
+          fi
+          echo "CHANGELOG newest entry matches ${VERSION}."
       - name: Create and push tag if missing
         if: github.event_name == 'workflow_dispatch'
         env:
@@ -195,12 +223,17 @@
           pattern: windows-*
           path: dist/
           merge-multiple: true
+      - name: Download Linux static daemon tarballs
+        uses: actions/download-artifact@v8
+        with:
+          pattern: linux-static-*
+          path: dist/
+          merge-multiple: true
       - name: Download source bundle
         uses: actions/download-artifact@v8
         with:
           name: source-bundle
           path: dist/
-
       - name: List artifacts
         run: ls -la dist/
 
@@ -231,12 +264,13 @@
           check "macOS Universal2 .dmg"             1 'aMule-*-macOS-universal2.dmg'
           check "Windows portable .zip (x64 + arm64)" 2 'aMule-*-Windows-*.zip'
           check "Windows installer .exe (x64 + arm64)" 2 'aMule-*-Windows-Setup-*.exe'
+          check "Linux static daemon (x86_64 + aarch64)" 2 'aMule-*-Linux-*-static.tar.gz'
           check "Source bundle"                     1 'aMule-*-src.tar.gz'
           if  "$fail" -ne 0 ; then
             echo "::error::Artifact manifest incomplete — refusing to assemble the draft Release."
             exit 1
           fi
-          echo "All 10 expected release artifacts present."
+          echo "All 12 expected release artifacts present."
 
       - name: Create draft Release
         env:

amule-3.0.1.tar.gz/.gitignore -> amule-3.1.0.tar.gz/.gitignore Changed

amule-3.0.1.tar.gz/CMakeLists.txt -> amule-3.1.0.tar.gz/CMakeLists.txt Changed

@@ -2,7 +2,7 @@
 project (amule)
 
 set (MIN_BOOST_VERSION 1.70)
-set (MIN_CRYPTOPP_VERSION 5.6)
+set (MIN_CRYPTOPP_VERSION 8.1)
 set (MIN_GDLIB_VERSION 2.0.0)
 set (MIN_WX_VERSION 3.2.0)
 set (PACKAGE "amule")
@@ -17,6 +17,21 @@
 set (RECONF_COMMAND ${CMAKE_COMMAND})
 set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+# Pin the language standard rather than inheriting each compiler's default.
+#
+# Unpinned, the tree compiled as C++17 on Ubuntu (gcc 15, clang 21) and mingw
+# clang 22, and as C++14 on AppleClang 21 -- so the same source was a different
+# language depending on who built it. That is not a theoretical hazard: a
+# `static constexpr` member is implicitly inline from C++17 and needs an
+# out-of-line definition before it, so code that links on Linux fails on macOS
+# with an undefined symbol in the caller's translation unit rather than
+# anything visible at the declaration.
+#
+# 17 rather than 14 because three of the four toolchains already default to it,
+# it is nine years old, and pinning 14 would move three platforms backwards.
+set (CMAKE_CXX_STANDARD 17)
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
+
 # Set the possible values of build type for cmake-gui
 if (CMAKE_CONFIGURATION_TYPES)
 	set (CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE
@@ -89,6 +104,10 @@
 	include (cmake/upnp.cmake)
 endif()
 
+if (ENABLE_UTP)
+	include (cmake/libutp.cmake)
+endif()
+
 if (NEED_GLIB_CHECK)
 	include (cmake/glib21.cmake)
 endif()
@@ -121,17 +140,20 @@
 # git state changes, so `cmake --build` alone is enough to pick up new
 # commits in the banner.
 #
-# We need three files, not just .git/HEAD:
-#   * .git/HEAD — touched on `git checkout <branch>` (symref retarget),
+# We need three files, not just HEAD:
+#   * HEAD — touched on `git checkout <branch>` (symref retarget),
 #     `git checkout --detach`, and explicit `git update-ref HEAD ...`.
-#   * the branch-ref file (.git/refs/heads/<branch>) that HEAD points at —
+#   * the branch-ref file (refs/heads/<branch>) that HEAD points at —
 #     touched on `git commit`, `git reset --hard`, `git pull --ff-only`,
 #     and any other op that moves the branch tip.  Tracking only HEAD
 #     misses these because HEAD is a symref text file, not the SHA itself.
-#   * .git/packed-refs — touched by `git gc` / `git pack-refs`, which can
+#   * packed-refs — touched by `git gc` / `git pack-refs`, which can
 #     consolidate the branch ref file out of existence.  After a pack,
 #     the SHA lives only in packed-refs.
 #
+# Where those three live is a question for git, not an assumption about
+# the directory layout — see the resolution step further down.
+#
 if (NOT DEFINED CACHE{GITDATE})
 	find_package (Git)
 	if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
@@ -220,34 +242,99 @@
 			endif()
 		endif()
 	endif()
-	set_property (DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
-		"${CMAKE_SOURCE_DIR}/.git/HEAD")
-	# Also depend on .git_archival.txt so that if it's swapped in
+	# Depend on .git_archival.txt so that if it's swapped in
 	# (e.g. someone re-extracts an archive, or hand-edits the file),
 	# cmake re-runs and re-parses on the next build.
 	if (EXISTS "${CMAKE_SOURCE_DIR}/.git_archival.txt")
 		set_property (DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
 			"${CMAKE_SOURCE_DIR}/.git_archival.txt")
 	endif()
-	# Resolve HEAD's symref target so we can also depend on the branch
-	# ref file directly.  This catches commits/resets that move the
-	# branch tip without retargeting HEAD.
-	if (EXISTS "${CMAKE_SOURCE_DIR}/.git/HEAD")
-		file (READ "${CMAKE_SOURCE_DIR}/.git/HEAD" _amule_head_contents LIMIT 200)
+	#
+	# `${CMAKE_SOURCE_DIR}/.git` is a directory only in a plain clone.  In
+	# a linked worktree (`git worktree add`) — and in a submodule — it is
+	# a *file* holding a `gitdir:` pointer, so every path built by
+	# appending to it resolves to nothing.  The EXISTS guards below then
+	# quietly skip every dependency and the auto-refresh this whole block
+	# exists for stops happening: the revision string stays frozen at
+	# whatever the first configure saw, with no diagnostic.  Ask git for
+	# the real locations instead of assuming the layout:
+	#
+	#   * --git-dir         the per-worktree directory.  Owns HEAD.
+	#   * --git-common-dir  the shared directory.  Owns refs/heads/* and
+	#                       packed-refs, which linked worktrees do not
+	#                       get private copies of.
+	#
+	# The two are the same path in a plain clone and diverge in a
+	# worktree, which is exactly why both are needed — tracking only one
+	# would miss either the branch retarget or the branch tip moving.
+	# Resolution is scoped to the `.git`-at-source-root case on purpose:
+	# rev-parse walks up to any enclosing repository, so running it
+	# unconditionally would make a tarball unpacked inside some unrelated
+	# checkout describe that checkout instead of falling through to the
+	# .git_archival.txt path above.
+	#
+	if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+		execute_process (
+			COMMAND ${GIT_EXECUTABLE} rev-parse --git-dir
+			OUTPUT_VARIABLE _amule_git_dir
+			OUTPUT_STRIP_TRAILING_WHITESPACE
+			ERROR_QUIET
+			RESULT_VARIABLE _amule_git_dir_result
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+		if (NOT _amule_git_dir_result EQUAL 0)
+			set (_amule_git_dir "")
+		endif()
+		execute_process (
+			COMMAND ${GIT_EXECUTABLE} rev-parse --git-common-dir
+			OUTPUT_VARIABLE _amule_git_common_dir
+			OUTPUT_STRIP_TRAILING_WHITESPACE
+			ERROR_QUIET
+			RESULT_VARIABLE _amule_git_common_dir_result
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+		if (NOT _amule_git_common_dir_result EQUAL 0)
+			set (_amule_git_common_dir "")
+		endif()
+		# Both are printed relative to the working directory in a plain
+		# clone (literally ".git") and absolute in a worktree, so
+		# normalise before building paths from them.
+		if (_amule_git_dir)
+			get_filename_component (_amule_git_dir "${_amule_git_dir}"
+				ABSOLUTE BASE_DIR "${CMAKE_SOURCE_DIR}")
+		endif()
+		# --git-common-dir arrived in git 2.5; on anything older the
+		# option is parsed as a revision and fails.  Fall back to the
+		# per-worktree directory, which is the correct answer for every
+		# layout that old a git can produce.
+		if (_amule_git_common_dir AND NOT _amule_git_common_dir STREQUAL "--git-common-dir")
+			get_filename_component (_amule_git_common_dir "${_amule_git_common_dir}"
+				ABSOLUTE BASE_DIR "${CMAKE_SOURCE_DIR}")
+		else()
+			set (_amule_git_common_dir "${_amule_git_dir}")
+		endif()
+	endif()
+	if (_amule_git_dir AND EXISTS "${_amule_git_dir}/HEAD")
+		set_property (DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
+			"${_amule_git_dir}/HEAD")
+		# Resolve HEAD's symref target so we can also depend on the
+		# branch ref file directly.  This catches commits/resets that
+		# move the branch tip without retargeting HEAD.  A detached HEAD
+		# holds the SHA inline instead, and so is already covered by the
+		# dependency on HEAD itself.
+		file (READ "${_amule_git_dir}/HEAD" _amule_head_contents LIMIT 200)
 		string (STRIP "${_amule_head_contents}" _amule_head_contents)
 		if (_amule_head_contents MATCHES "^ref: (.+)$")
 			set (_amule_head_ref "${CMAKE_MATCH_1}")
-			if (EXISTS "${CMAKE_SOURCE_DIR}/.git/${_amule_head_ref}")
+			if (EXISTS "${_amule_git_common_dir}/${_amule_head_ref}")
 				set_property (DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
-					"${CMAKE_SOURCE_DIR}/.git/${_amule_head_ref}")
+					"${_amule_git_common_dir}/${_amule_head_ref}")
 			endif()
 		endif()
 	endif()
 	# Also depend on packed-refs in case the branch ref is packed
 	# (loose ref file may not exist after `git gc`).
-	if (EXISTS "${CMAKE_SOURCE_DIR}/.git/packed-refs")
+	if (_amule_git_common_dir AND EXISTS "${_amule_git_common_dir}/packed-refs")
 		set_property (DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
-			"${CMAKE_SOURCE_DIR}/.git/packed-refs")
+			"${_amule_git_common_dir}/packed-refs")
 	endif()
 endif()
 
@@ -297,15 +384,21 @@
 # require libatomic unconditionally on 32-bit builds.
 set (LIBATOMIC "")
 if (CMAKE_SIZEOF_VOID_P EQUAL 4)
-	# Accept either the unversioned `libatomic.so` (Debian / Fedora /
-	# Arch ship it via the -dev / -devel package) or the versioned-only
-	# `libatomic.so.1` (openSUSE ships only the latter -- there's no
-	# separate -devel package). Listing the unversioned name first keeps
-	# the canonical path preferred when both are present.
-	find_library (LIBATOMIC_LIBRARY NAMES atomic libatomic.so.1)
-	if (LIBATOMIC_LIBRARY)
+	# Probe with a compiler-driven LINK test, not find_library. With GCC,
+	# libatomic ships inside the compiler's own runtime dir (e.g.
+	# .../lib/gcc14/) which is not on find_library's filesystem search
+	# path, so find_library false-fails even though `-latomic` links fine
+	# -- the GCC driver resolves its internal libatomic (MacPorts, #453).
+	# check_library_exists links a probe with `-latomic` through the
+	# compiler driver, so it succeeds wherever the flag actually links:
+	# GCC's internal copy, or a system libatomic (Clang / distro -dev
+	# packages, versioned or not). This replaces the earlier find_library
+	# lookup that only searched standard library paths.
+	include (CheckLibraryExists)
+	check_library_exists (atomic __atomic_load_8 "" HAVE_LIBATOMIC)
+	if (HAVE_LIBATOMIC)
 		set (LIBATOMIC atomic)
-		message (STATUS "32-bit target: linking libatomic for std::atomic<int64_t> (${LIBATOMIC_LIBRARY})")
+		message (STATUS "32-bit target: linking libatomic for std::atomic<int64_t>")
 	else()
 		message (FATAL_ERROR
 			"32-bit target detected (sizeof(void*) == 4). aMule's "
@@ -334,7 +427,10 @@
 if (_amule_wxgtk_idx GREATER -1 AND NOT APPLE)
 	find_package (PkgConfig QUIET)
 	if (PkgConfig_FOUND)
-		pkg_check_modules (GLIB QUIET glib-2.0)
+		# gio-2.0 (ships with glib) provides GDBus, used by the monolithic /
+		# amulegui GUI to ask xdg-desktop-portal for background permission
+		# under Flatpak (see RequestFlatpakBackgroundPermission in amuleDlg.cpp).
+		pkg_check_modules (GLIB QUIET glib-2.0 gio-2.0)
 	endif()
 
 	if ((BUILD_MONOLITHIC OR BUILD_DAEMON OR BUILD_REMOTEGUI) AND NOT GLIB_FOUND)
@@ -369,7 +465,12 @@
 # headers are present we build a SNI backend into MuleTrayIcon; on
 # platforms where the library is missing (Windows, macOS, builds
 # without the dep) we fall back to wxTaskBarIcon.
-if (BUILD_MONOLITHIC AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
+#
+# Both GUI binaries compile MuleTrayIcon (it is in GUI_SOURCES), so the
+# probe covers either of them being built — gating it on the monolithic
+# build alone left a remote-GUI-only build with the invisible legacy
+# backend and no way to know.
+if ((BUILD_MONOLITHIC OR BUILD_REMOTEGUI) AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	find_package (PkgConfig QUIET)
 	if (PkgConfig_FOUND)
 		# `0.1` is the API version (never bumped, every release uses it),
@@ -424,10 +525,17 @@
 	install (FILES org.amule.aMule.png
 		DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps"
 	)
-	install (FILES org.amule.aMule-256.png
+	install (FILES src/icons/amule.png
 		RENAME org.amule.aMule.png
 		DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/256x256/apps"
 	)
+	# The source the raster sizes above are rendered from. Themes and
+	# launchers that can scale prefer this one, and it is what the app
+	# stores ask for; the raster sizes stay for the ones that cannot.
+	install (FILES src/icons/amule.svg
+		RENAME org.amule.aMule.svg
+		DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps"
+	)
 endif()
 
 if (BUILD_REMOTEGUI)
@@ -436,9 +544,71 @@
 	)
 endif()
 
-install (FILES org.amule.aMule.metainfo.xml
-	DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo"
-)
+if (BUILD_MONOLITHIC OR BUILD_REMOTEGUI)
+	# Teaches the desktop what a .emulecollection is, so the MimeType= line
+	# in the .desktop files above can match it. Without this the file is
+	# sniffed as text/plain (text form) or application/octet-stream (binary
+	# form) and aMule never shows up in "Open With".
+	#
+	# No update-mime-database hook here: refreshing the system cache is the
+	# packager's job for a system install. The AppImage path has no packager
+	# and so does it itself, in AppImageIntegration::RefreshSystemCaches.
+	#
+	# The filename is app-id-prefixed because Flathub's linter requires
+	# exported files to be; flatpak exports share/mime/packages
+	# automatically, so the manifests need no change.
+	install (FILES org.amule.aMule.xml
+		DESTINATION "${CMAKE_INSTALL_DATADIR}/mime/packages"
+	)
+
+	# Icon for the file type itself. The name is mandated by the icon
+	# naming spec - the MIME type with '/' replaced by '-' - and without
+	# it file managers fall back to the generic "unknown file" glyph even
+	# though the type is recognised. Reuses the application icon; aMule
+	# has no separate document artwork.
+	install (FILES org.amule.aMule.png
+		RENAME application-x-emule-collection.png
+		DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/mimetypes"
+	)
+	install (FILES src/icons/amule.png
+		RENAME application-x-emule-collection.png
+		DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/256x256/mimetypes"
+	)
+	install (FILES src/icons/amule.svg
+		RENAME application-x-emule-collection.svg
+		DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/mimetypes"
+	)
+endif()
+
+# The AppStream metainfo's <releases> list is generated from docs/CHANGELOG.md
+# at build time so the store-visible version can't drift from the shipped one
+# (single source of truth). This runs inside any CMake build -- including
+# flatpak-builder / Flathub building from a tag -- so the tagged source tree is
+# self-sufficient. AppStream metainfo is a freedesktop concept; gate it to Linux
+# (macOS/Windows never consumed the installed copy) so those builds need no
+# python3.
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+	find_package (Python3 COMPONENTS Interpreter REQUIRED)
+	set (_amule_metainfo "${CMAKE_CURRENT_BINARY_DIR}/org.amule.aMule.metainfo.xml")
+	add_custom_command (
+		OUTPUT "${_amule_metainfo}"
+		COMMAND "${Python3_EXECUTABLE}"
+			"${CMAKE_CURRENT_SOURCE_DIR}/packaging/gen-metainfo-releases.py"
+			--changelog "${CMAKE_CURRENT_SOURCE_DIR}/docs/CHANGELOG.md"
+			--template "${CMAKE_CURRENT_SOURCE_DIR}/org.amule.aMule.metainfo.xml.in"
+			--output "${_amule_metainfo}"
+		DEPENDS
+			"${CMAKE_CURRENT_SOURCE_DIR}/packaging/gen-metainfo-releases.py"
+			"${CMAKE_CURRENT_SOURCE_DIR}/org.amule.aMule.metainfo.xml.in"
+			"${CMAKE_CURRENT_SOURCE_DIR}/docs/CHANGELOG.md"
+		COMMENT "Generating AppStream metainfo releases from docs/CHANGELOG.md"
+		VERBATIM
+	)
+	add_custom_target (amule_metainfo ALL DEPENDS "${_amule_metainfo}")
+	install (FILES "${_amule_metainfo}"
+		DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo"
+	)
+endif()
 
 install (FILES LICENSE.md
 	DESTINATION "${CMAKE_INSTALL_DOCDIR}"
@@ -479,6 +649,9 @@
 	**** aMule WebServer ****
 	Should aMule WebServer be built?				${BUILD_WEBSERVER}
 
+	**** aMule REST API ****
+	Should aMule REST API be built?					${BUILD_AMULEAPI}
+
 	**** aMule ED2K Links Handler ****
 	Should aMule ED2K Links Handler be built?			${BUILD_ED2K}
 
@@ -530,7 +703,7 @@
 	message ("			zlib				${ZLIB_VERSION_STRING}")
 endif()
 
-if (BUILD_MONOLITHIC AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if ((BUILD_MONOLITHIC OR BUILD_REMOTEGUI) AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	if (WITH_LIBAYATANA_APPINDICATOR)
 		message ("			tray-icon backend		StatusNotifierItem (libayatana-appindicator ${AYATANA_APPINDICATOR_VERSION})")
 	else()

amule-3.0.1.tar.gz/LICENSE.md -> amule-3.1.0.tar.gz/LICENSE.md Changed

amule-3.0.1.tar.gz/README.md -> amule-3.1.0.tar.gz/README.md Changed

@@ -1,6 +1,6 @@
 # aMule
 
-!aMule(https://raw.githubusercontent.com/amule-org/amule/master/org.amule.aMule.png)
+!aMule(https://raw.githubusercontent.com/amule-org/amule/master/src/icons/amule.svg)
 
 aMule is an eMule-like client for the eDonkey and Kademlia networks.
 
@@ -29,24 +29,16 @@
 
 ---
 
-| Distributions |
-| --- |
-| !Arch Linux(https://repology.org/badge/version-for-repo/arch/amule.svg)(https://archlinux.org/packages/extra/x86_64/amule/) |
-| !AUR(https://repology.org/badge/version-for-repo/aur/amule.svg)(https://aur.archlinux.org/packages/amule) |
-| !Debian stable(https://badges.debian.net/badges/debian/stable/amule/version.svg)(https://buildd.debian.org/amule) |
-| !Debian testing(https://badges.debian.net/badges/debian/testing/amule/version.svg)(https://buildd.debian.org/amule) |
-| !FreeBSD(https://repology.org/badge/version-for-repo/freebsd/amule.svg)(https://www.freshports.org/net-p2p/amule/) |
-| !Gentoo(https://repology.org/badge/version-for-repo/gentoo/amule.svg)(https://packages.gentoo.org/packages/net-p2p/amule) |
-| !Kali Linux(https://repology.org/badge/version-for-repo/kali_rolling/amule.svg)(https://pkg.kali.org/pkg/amule) |
-| !Manjaro(https://repology.org/badge/version-for-repo/manjaro_stable/amule.svg)(https://repology.org/project/amule/versions) |
-| !NixOS 25.05(https://repology.org/badge/version-for-repo/nix_stable_25_05/amule.svg)(https://search.nixos.org/packages?channel=25.05&query=amule) |
-| !OpenBSD(https://repology.org/badge/version-for-repo/openbsd/amule.svg)(https://openports.pl/path/net/amule) |
-| !openSUSE Tumbleweed (Packman)(https://repology.org/badge/version-for-repo/packman_opensuse_tumbleweed/amule.svg)(http://packman.links2linux.org/package/aMule) |
-| !RPMFusion Fedora 42(https://repology.org/badge/version-for-repo/rpmfusion_fedora_42/amule.svg)(https://repology.org/project/amule/versions) |
-| !Slackware(https://repology.org/badge/version-for-repo/slackbuilds/amule.svg)(https://slackbuilds.org/result/?search=amule) |
-| !Solus(https://repology.org/badge/version-for-repo/solus/amule.svg)(https://repology.org/project/amule/versions) |
-| !Ubuntu 24.04 LTS(https://repology.org/badge/version-for-repo/ubuntu_24_04/amule.svg)(https://packages.ubuntu.com/noble/amule) |
-| !Ubuntu 25.04(https://repology.org/badge/version-for-repo/ubuntu_25_04/amule.svg)(https://packages.ubuntu.com/plucky/amule) |
+| | Distributions | |
+| --- | --- | --- |
+| !Arch Linux(https://repology.org/badge/version-for-repo/arch/amule.svg)(https://archlinux.org/packages/extra/x86_64/amule/) | !AUR(https://repology.org/badge/version-for-repo/aur/amule.svg?allow_ignored=1)(https://aur.archlinux.org/packages/amule) | !Debian 11(https://repology.org/badge/version-for-repo/debian_11/amule.svg)(https://repology.org/project/amule/versions) |
+| !Debian 12(https://repology.org/badge/version-for-repo/debian_12/amule.svg)(https://repology.org/project/amule/versions) | !Debian 13(https://repology.org/badge/version-for-repo/debian_13/amule.svg)(https://repology.org/project/amule/versions) | !Debian 14(https://repology.org/badge/version-for-repo/debian_14/amule.svg)(https://repology.org/project/amule/versions) |
+| !Debian Unstable(https://repology.org/badge/version-for-repo/debian_unstable/amule.svg)(https://repology.org/project/amule/versions) | !Fedora 44 package(https://repology.org/badge/version-for-repo/fedora_44/amule.svg)(https://repology.org/project/amule/versions) | !Fedora Rawhide package(https://repology.org/badge/version-for-repo/fedora_rawhide/amule.svg)(https://repology.org/project/amule/versions) |
+| !FreeBSD(https://repology.org/badge/version-for-repo/freebsd/amule.svg)(https://www.freshports.org/net-p2p/amule/) | !Gentoo(https://repology.org/badge/version-for-repo/gentoo/amule.svg)(https://packages.gentoo.org/packages/net-p2p/amule) | !Kali Linux(https://repology.org/badge/version-for-repo/kali_rolling/amule.svg)(https://pkg.kali.org/pkg/amule) |
+| !Manjaro(https://repology.org/badge/version-for-repo/manjaro_stable/amule.svg)(https://repology.org/project/amule/versions) | !NixOS 25.05(https://repology.org/badge/version-for-repo/nix_stable_25_05/amule.svg)(https://search.nixos.org/packages?channel=25.05&query=amule) | !OpenBSD(https://repology.org/badge/version-for-repo/openbsd/amule.svg)(https://openports.pl/path/net/amule) |
+| !openSUSE Tumbleweed (Packman)(https://repology.org/badge/version-for-repo/packman_opensuse_tumbleweed/amule.svg)(http://packman.links2linux.org/package/aMule) | !Slackware(https://repology.org/badge/version-for-repo/slackbuilds/amule.svg)(https://slackbuilds.org/result/?search=amule) | !Solus(https://repology.org/badge/version-for-repo/solus/amule.svg)(https://repology.org/project/amule/versions) |
+| !Ubuntu 22.04 LTS(https://repology.org/badge/version-for-repo/ubuntu_22_04/amule.svg)(https://repology.org/project/amule/versions) | !Ubuntu 24.04 LTS(https://repology.org/badge/version-for-repo/ubuntu_24_04/amule.svg)(https://packages.ubuntu.com/noble/amule) | !Ubuntu 25.04(https://repology.org/badge/version-for-repo/ubuntu_25_04/amule.svg)(https://packages.ubuntu.com/plucky/amule) |
+| !Ubuntu 25.10(https://repology.org/badge/version-for-repo/ubuntu_25_10/amule.svg)(https://repology.org/project/amule/versions) | !Ubuntu 26.04 LTS(https://repology.org/badge/version-for-repo/ubuntu_26_04/amule.svg)(https://repology.org/project/amule/versions) | !Ubuntu 26.10(https://repology.org/badge/version-for-repo/ubuntu_26_10/amule.svg)(https://repology.org/project/amule/versions) |
 
 ---
 
@@ -68,10 +60,11 @@
   EC (External Connection) protocol.
 * `amuleweb` — HTTP interface to a running `amuled`.
 * `amulecmd` — interactive CLI for a running `amuled`.
+* `amuleapi` — REST API for a running `amuled`.
 
 ## Installation
 
-aMule ships pre-built binaries for every major desktop. Building from
+aMule ships pre-built binaries for every major desktop system. Building from
 source is also supported.
 
 ### Pre-built binaries (recommended)
@@ -79,14 +72,17 @@
 Download the latest release for your platform from the
 Releases page. Quick start:
 
-* **Linux** — AppImage (any distro) or Flatpak: download, `chmod +x`, run.
+* **Linux**
+  * Flatpak: `flatpak install ./appname.flatpak`
+  * AppImage: `chmod +x` and run
+  * Static tarball (headless, x64 / arm64): unpack and run — `amuled`, `amulecmd` and `amuleapi` with no shared-library dependencies, Web UI included
 * **macOS** — Universal2 `.dmg`: download, drag to `/Applications`.
 * **Windows** — choose either the **NSIS installer** `.exe` (Start-menu shortcuts, uninstaller, x64 / ARM64) or the **portable `.zip`** (no install, unzip and run).
 
 See docs/INSTALL_BINARIES.md(docs/INSTALL_BINARIES.md) for
 per-platform notes — including the macOS unsigned-binary
-workaround, the Windows SmartScreen prompt, and the Linux FUSE
-dependency for AppImage.
+workaround, the Windows SmartScreen prompt, the Linux FUSE
+dependency for AppImage, and what the static tarball contains.
 
 Releases page: https://github.com/amule-org/amule/releases/latest
 
@@ -132,13 +128,13 @@
 
 Under `Preferences → Connection`, set the limits to roughly **80 %
 of your actual line speed** to avoid saturating the upstream and
-starving your own traffic. Values are in **kilobytes per second**
-(kB/s); ISP advertised speeds are usually in **megabits per
-second** (Mbps). To convert, multiply Mbps by **125**.
+starving your own traffic. Values are in **kibibytes per second**
+(KiB/s, units of 1024 bytes); ISP advertised speeds are usually in
+**megabits per second** (Mbps). To convert, multiply Mbps by **122**.
 
-> Example: a 100 Mbps / 20 Mbps fibre line → roughly 12 500 kB/s
-> downstream and 2 500 kB/s upstream. Set the limits to about
-> 10 000 down / 2 000 up to stay below the line cap.
+> Example: a 100 Mbps / 20 Mbps fibre line → roughly 12 200 KiB/s
+> downstream and 2 440 KiB/s upstream. Set the limits to about
+> 9 800 down / 1 950 up to stay below the line cap.
 
 ## Reporting Bugs

amule-3.0.1.tar.gz/README.vi.md -> amule-3.1.0.tar.gz/README.vi.md Changed

amule-3.0.1.tar.gz/amule.ico -> amule-3.1.0.tar.gz/amule.ico Changed

amule-3.0.1.tar.gz/cmake/FindReadline.cmake -> amule-3.1.0.tar.gz/cmake/FindReadline.cmake Changed

@@ -143,4 +143,22 @@
 	endif()
 endif()
 
+# A usable readline needs BOTH the library and a header. The function check
+# above can be satisfied by a bare runtime library with no -dev headers
+# installed, or by libedit's readline() compatibility symbol (whose header is
+# <editline/readline.h>, not the <readline.h> / <readline/readline.h> the code
+# includes). In that case config.h would carry HAVE_LIBREADLINE without a
+# header macro, and ExternalConnector.cpp -- which gates its rl_* code on
+# HAVE_LIBREADLINE alone -- would use the readline symbols undeclared and fail
+# deep in the build with a confusing "rl_* undeclared" error. Fail early and
+# loudly instead, pointing at the missing development headers.
+if (HAVE_LIBREADLINE AND NOT HAVE_READLINE_H AND NOT HAVE_READLINE_READLINE_H)
+	message (FATAL_ERROR
+		"The readline library was found but its development headers were not "
+		"(neither <readline/readline.h> nor <readline.h>). Install the readline "
+		"development package and re-run cmake -- e.g. Alpine: 'apk add "
+		"readline-dev'; Debian/Ubuntu: 'apt install libreadline-dev'; Fedora: "
+		"'dnf install readline-devel'; macOS (Homebrew): 'brew install readline'.")
+endif()
+
 find_package_handle_standard_args (readline DEFAULT_MSG READLINE_LIBRARIES)

amule-3.0.1.tar.gz/cmake/cryptopp.cmake -> amule-3.1.0.tar.gz/cmake/cryptopp.cmake Changed

@@ -139,24 +139,76 @@
 endif()
 
 if (NOT CRYPTOPP_VERSION)# AND CRYPTO_COMPLETE)
-	set (CMAKE_CONFIGURABLE_FILE_CONTENT
-		"#include <${CRYPTOPP_CONFIG_FILE}>\n
-		#include <stdio.h>\n
-		int main(){\n
-			printf (\"%d\", CRYPTOPP_VERSION);\n
-		}\n"
-	)
+	if (CMAKE_CROSSCOMPILING)
+		# try_run() cannot execute a binary built for the host, so read the macro out of
+		# the header instead. Kept to the cross path: running the probe is the stronger
+		# check, since it proves the header compiles and yields the value the compiler
+		# sees, not the one a regex found.
+		find_file (CRYPTOPP_VERSION_HEADER
+			NAMES ${CRYPTOPP_INCLUDE_PREFIX}/config_ver.h ${CRYPTOPP_INCLUDE_PREFIX}/config.h
+			HINTS ${CRYPTOPP_INCLUDE_DIR}
+		)
 
-	configure_file ("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
-		"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckCryptoppVersion.cxx" @ONLY IMMEDIATE
-	)
+		if (CRYPTOPP_VERSION_HEADER)
+			file (STRINGS ${CRYPTOPP_VERSION_HEADER} _cryptopp_version_lines
+				REGEX "^ \t*# \t*define \t+CRYPTOPP_VERSION \t+0-9+"
+			)
 
-	try_run (RUNRESULT
-		COMPILERESULT
-		${CMAKE_BINARY_DIR}
-		${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckCryptoppVersion.cxx
-		RUN_OUTPUT_VARIABLE CRYPTOPP_VERSION
-	)
+			if (_cryptopp_version_lines)
+				list (GET _cryptopp_version_lines 0 _cryptopp_version_line)
+				string (REGEX REPLACE "^.*CRYPTOPP_VERSION \t+(0-9+).*$" "\\1"
+					CRYPTOPP_VERSION "${_cryptopp_version_line}"
+				)
+			else()
+				# Some forks derive CRYPTOPP_VERSION from the parts rather than spelling
+				# it out, which the regex above cannot see. Rebuild it the way classic
+				# Crypto++ does (config_ver.h:53).
+				foreach (_part MAJOR MINOR REVISION)
+					file (STRINGS ${CRYPTOPP_VERSION_HEADER} _cryptopp_part_line
+						REGEX "^ \t*# \t*define \t+CRYPTOPP_${_part} \t+0-9+"
+					)
+					if (_cryptopp_part_line)
+						list (GET _cryptopp_part_line 0 _cryptopp_part_line)
+						string (REGEX REPLACE "^.*CRYPTOPP_${_part} \t+(0-9+).*$" "\\1"
+							_cryptopp_${_part} "${_cryptopp_part_line}"
+						)
+					endif()
+				endforeach()
+
+				if (DEFINED _cryptopp_MAJOR AND DEFINED _cryptopp_MINOR AND DEFINED _cryptopp_REVISION)
+					math (EXPR CRYPTOPP_VERSION
+						"${_cryptopp_MAJOR} * 100 + ${_cryptopp_MINOR} * 10 + ${_cryptopp_REVISION}"
+					)
+				endif()
+			endif()
+		endif()
+
+		if (NOT CRYPTOPP_VERSION)
+			message (FATAL_ERROR
+				"could not read CRYPTOPP_VERSION from the crypto++ headers while cross-compiling; "
+				"pass -DCRYPTOPP_VERSION=<n> (the integer the headers define, e.g. 890)"
+			)
+		endif()
+	else()
+		set (CMAKE_CONFIGURABLE_FILE_CONTENT
+			"#include <${CRYPTOPP_CONFIG_FILE}>\n
+			#include <stdio.h>\n
+			int main(){\n
+				printf (\"%d\", CRYPTOPP_VERSION);\n
+			}\n"
+		)
+
+		configure_file ("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
+			"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckCryptoppVersion.cxx" @ONLY IMMEDIATE
+		)
+
+		try_run (RUNRESULT
+			COMPILERESULT
+			${CMAKE_BINARY_DIR}
+			${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckCryptoppVersion.cxx
+			RUN_OUTPUT_VARIABLE CRYPTOPP_VERSION
+		)
+	endif()
 
 	# Two CRYPTOPP_VERSION encodings exist in the wild:
 	#

amule-3.0.1.tar.gz/cmake/glib21.cmake -> amule-3.1.0.tar.gz/cmake/glib21.cmake Changed

@@ -9,27 +9,6 @@
 	check_include_file (fcntl.h HAVE_FCNTL_H)
 	check_include_file (sys/resource.h HAVE_SYS_RESOURCE_H)
 	check_include_file (sys/statvfs.h HAVE_SYS_STATVFS_H)
-
-	set (TEST_APP "#include <features.h>
-		#ifdef __GNU_LIBRARY__
-			#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-				Lucky GNU user
-			#endif
-		#endif"
-	)
-
-	execute_process (COMMAND echo ${TEST_APP}
-		COMMAND ${CMAKE_C_COMPILER} -E -xc -
-		OUTPUT_VARIABLE GLIB_TEST_OUTPUT
-	)
-
-	string (REGEX MATCH "Lucky GNU user" MATCH "${GLIB_TEST_OUTPUT}")
-
-	if (${MATCH})
-		set (__GLIBC__ TRUE)
-		message (STATUS "glibc -- found")
-	endif()
-
 	check_function_exists (posix_fallocate HAVE_POSIX_FALLOCATE)
 endif()
 
@@ -67,21 +46,43 @@
 		set (STDC_HEADERS TRUE)
 	endif()
 
+	# mmap is a *platform capability*, not an external dependency: everything
+	# it needs (sys/mman.h, mmap/munmap, sysconf/_SC_PAGESIZE, sigaction/
+	# SA_SIGINFO) lives in libc.  We therefore probe unconditionally and let
+	# MMAP_SUPPORTED reflect what the platform can actually do; the runtime
+	# MMapEnabled preference (default OFF) decides whether to use it.  The
+	# ENABLE_MMAP build switch (default ON) is only an opt-out escape hatch for
+	# builds that want no mmap code at all (e.g. sanitizer/embedded).
 	if (ENABLE_MMAP)
 		check_include_file (sys/mman.h HAVE_SYS_MMAN_H)
 
 		if (HAVE_SYS_MMAN_H)
+			check_function_exists (mmap HAVE_MMAP)
 			check_function_exists (munmap HAVE_MUNMAP)
+			check_function_exists (sigaction HAVE_SIGACTION)
 
-			if (HAVE_MUNMAP)
+			if (HAVE_MMAP AND HAVE_MUNMAP)
 				check_function_exists (sysconf HAVE_SYSCONF)
 
 				if (HAVE_SYSCONF AND STDC_HEADERS)
-					try_run (PS_RUN_RESULT PS_COMPILE_RESULT
-						${CMAKE_BINARY_DIR}
-						${amule_SOURCE_DIR}/cmake/mmap-test.cpp
-						RUN_OUTPUT_VARIABLE PS_OUTPUT
-					)
+					if (CMAKE_CROSSCOMPILING)
+						# try_run() cannot execute a host binary, so check that the
+						# constant exists rather than that sysconf() answers for it.
+						include (CheckSymbolExists)
+						check_symbol_exists (_SC_PAGESIZE unistd.h HAVE__SC_PAGESIZE_DEFINED)
+						if (HAVE__SC_PAGESIZE_DEFINED)
+							set (PS_RUN_RESULT 0)
+						else()
+							set (PS_RUN_RESULT 1)
+						endif()
+					else()
+						try_run (PS_RUN_RESULT PS_COMPILE_RESULT
+							${CMAKE_BINARY_DIR}
+							${amule_SOURCE_DIR}/cmake/mmap-test.cpp
+							RUN_OUTPUT_VARIABLE PS_OUTPUT
+							WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+						)
+					endif()
 
 					if (PS_RUN_RESULT EQUAL 0)
 						message (STATUS "_SC_PAGESIZE found")
@@ -93,11 +94,20 @@
 					message (STATUS "sysconf function not found, mmap support is disabled")
 				endif()
 			else()
-				message (STATUS "munmap function not found, mmap support is disabled")
+				message (STATUS "mmap/munmap not found, mmap support is disabled")
 			endif()
 		else()
 			message (STATUS "sys/mman.h wasn't found, mmap support is disabled")
 		endif()
+
+		# Single source of truth for "mmap can be compiled in on this build".
+		# Gates the FileArea code path, the preferences checkbox, and the EC
+		# advertisement.  The SIGSEGV/SIGBUS recovery handler needs sigaction +
+		# SA_SIGINFO, so require it here too.
+		if (HAVE_MMAP AND HAVE_MUNMAP AND HAVE_SYSCONF AND HAVE__SC_PAGESIZE AND HAVE_SIGACTION)
+			set (MMAP_SUPPORTED TRUE)
+			message (STATUS "mmap support available (runtime-toggleable via MMapEnabled)")
+		endif()
 	endif()
 endif()

amule-3.0.1.tar.gz/cmake/ip2country.cmake -> amule-3.1.0.tar.gz/cmake/ip2country.cmake Changed

amule-3.1.0.tar.gz/cmake/libutp.cmake Added

@@ -0,0 +1,79 @@
+# Makes the vendored libutp available as Utp::Utp.
+#
+# Included only when ENABLE_UTP is on. Nothing in aMule links the target yet:
+# this exists so the uTP transport work can be reviewed against a dependency
+# that is already in the tree and already builds.
+#
+# ENABLE_UTP gates whether the target exists at all, so a default build has no
+# libutp in its graph and nothing to skip. The library is therefore built as
+# part of `all` whenever the switch is on -- deliberately, since ENABLE_UTP is
+# in AMULE_EXPERIMENTAL_OPTIONS and that is what gives the vendored snapshot CI
+# coverage. Adding EXCLUDE_FROM_ALL here would be a second lock on a door the
+# option has already locked, and its only effect would be to leave the snapshot
+# compiled by no job.
+#
+# The vendored CMakeLists.txt is upstream's and requires CMake 3.12, above this
+# project's 3.10 minimum. That is why the include is conditional rather than
+# unconditional with an internal guard: a default build never enters it, so the
+# floor only rises for builds that ask for uTP.
+
+set (AMULE_LIBUTP_DIR "${CMAKE_SOURCE_DIR}/src/extern/libutp")
+
+if (NOT EXISTS "${AMULE_LIBUTP_DIR}/CMakeLists.txt")
+	message (FATAL_ERROR
+		"ENABLE_UTP is on but the vendored libutp is missing from "
+		"${AMULE_LIBUTP_DIR}. See src/extern/libutp/AMULE_PROVENANCE.md.")
+endif()
+
+if (CMAKE_VERSION VERSION_LESS 3.12)
+	# Not "build without ENABLE_UTP": ENABLE_ALL_EXPERIMENTAL turns it on and
+	# wins over an individual switch, so -DENABLE_UTP=NO cannot be honoured as
+	# an opt-out (see the loop in cmake/options.cmake). Naming the switch that
+	# can actually be turned off is the difference between advice and a dead
+	# end, and 3.10 is this project's declared minimum.
+	message (FATAL_ERROR
+		"ENABLE_UTP requires CMake 3.12 or newer (the vendored libutp asks for "
+		"it); this is CMake ${CMAKE_VERSION}. Upgrade CMake, or build without "
+		"uTP: turn ENABLE_UTP off, and if ENABLE_ALL_EXPERIMENTAL is on turn "
+		"that off too and name the other experimental switches individually.")
+endif()
+
+# Upstream's own switches, pinned before the subdirectory sees them. option()
+# leaves an existing cache entry alone, and INTERNAL keeps these out of
+# `cmake -LAH`, which docs/INSTALL.md tells users to run.
+#
+# Two of them are actively harmful here and none of them is ours to offer.
+# LIBUTP_BUILD_PROGRAMS wants ucat.c, which AMULE_PROVENANCE.md records as
+# deliberately not vendored, so turning it on fails configure with a missing
+# source that reads like a broken checkout. LIBUTP_ENABLE_INSTALL would make
+# `make install` write libutp.a, its headers and a cmake package into aMule's
+# prefix: a library we vendor for our own use is not one we ship. LIBUTP_SHARED
+# would build an uninstalled .so nothing links, and it defaults from
+# BUILD_SHARED_LIBS, so it is reachable without naming libutp at all.
+# FORCE, not just CACHE: a -D on the command line creates the entry before this
+# file runs, and set(CACHE) without FORCE adopts the type while keeping the
+# user's value. Without it the pin is decorative, which a probe run with
+# -DLIBUTP_BUILD_PROGRAMS=ON showed by still failing on the missing ucat.c.
+set (LIBUTP_SHARED OFF CACHE INTERNAL "aMule links the vendored libutp statically" FORCE)
+set (LIBUTP_ENABLE_INSTALL OFF CACHE INTERNAL "aMule does not install the vendored libutp" FORCE)
+set (LIBUTP_ENABLE_WERROR OFF CACHE INTERNAL "aMule does not gate on upstream's warnings" FORCE)
+set (LIBUTP_BUILD_PROGRAMS OFF CACHE INTERNAL "ucat.c is not vendored" FORCE)
+
+add_subdirectory ("${AMULE_LIBUTP_DIR}")
+
+if (NOT TARGET libutp)
+	message (FATAL_ERROR
+		"The vendored libutp did not define the target 'libutp'. The snapshot "
+		"in ${AMULE_LIBUTP_DIR} is not the pinned upstream revision.")
+endif()
+
+# Upstream sets the language standard only for a standalone build, deferring to
+# the parent otherwise. aMule now pins C++17 tree-wide, so this would inherit
+# the right standard anyway; it stays because upstream marks the standard
+# REQUIRED when standalone, making C++17 its requirement rather than ours to
+# lend. If the tree-wide pin ever moves, this target must not move with it.
+set_target_properties (libutp PROPERTIES
+	CXX_STANDARD 17
+	CXX_STANDARD_REQUIRED ON)
+
+add_library (Utp::Utp ALIAS libutp)

amule-3.0.1.tar.gz/cmake/options.cmake -> amule-3.1.0.tar.gz/cmake/options.cmake Changed

@@ -39,8 +39,10 @@
 option (BUILD_MONOLITHIC "enable building of the monolithic aMule app" ON)
 option (BUILD_REMOTEGUI "compile aMule remote GUI")
 option (BUILD_WEBSERVER "compile aMule WebServer")
+option (BUILD_AMULEAPI "compile aMule REST API daemon")
 option (BUILD_WXCAS "compile aMule GUI Statistics")
 option (BUILD_TESTING "Build unit tests" OFF)
+option (USE_SYSTEM_PICOJSON "Use system-installed picojson instead of bundled copy" OFF)
 
 if (PREFIX)
 	set (CMAKE_INSTALL_PREFIX "${PREFIX}")
@@ -63,6 +65,7 @@
 	set (BUILD_FILEVIEW ON CACHE BOOL "compile aMule file viewer for console (EXPERIMENTAL)" FORCE)
 	set (BUILD_REMOTEGUI ON CACHE BOOL "compile aMule remote GUI" FORCE)
 	set (BUILD_WEBSERVER ON CACHE BOOL "compile aMule WebServer" FORCE)
+	set (BUILD_AMULEAPI ON CACHE BOOL "compile aMule REST API daemon" FORCE)
 	set (BUILD_WXCAS ON CACHE BOOL "compile aMule GUI Statistics" FORCE)
 endif()
 
@@ -74,6 +77,39 @@
 	set (NEED_ZLIB TRUE)
 endif()
 
+if (BUILD_AMULEAPI)
+	# Mirrors amulecmd's needs: EC connection, mulecommon helpers (Format,
+	# MD5Sum), socket lib for CRemoteConnect. Boost.Beast is header-only
+	# so we don't add a Boost component requirement; the link-side Boost
+	# is already wired via the project-level `Boost_LIBRARIES` lookup.
+	#
+	# Hard-fail policy. `BUILD_AMULEAPI=YES` + missing dep must fail
+	# at configure time, never soft-disable the target. Today the
+	# guarantees come from upstream wiring:
+	#   * cryptopp — `NEED_LIB_EC` (set below) implies `NEED_LIB_CRYPTO`,
+	#     which includes cmake/cryptopp.cmake; that file FATAL_ERRORs
+	#     on a missing `cryptlib.h`.
+	#   * Boost   — `cmake/boost.cmake` runs unconditionally at the
+	#     project root and uses `find_package(Boost CONFIG REQUIRED)`,
+	#     which FATAL_ERRORs on miss.
+	# If a future refactor breaks either chain (e.g. moves Boost
+	# behind a conditional `if`), add an explicit `find_package(Boost
+	# CONFIG REQUIRED)` here so amuleapi keeps fail-loud.
+	set (NEED_LIB_EC TRUE)
+	set (NEED_LIB_MULECOMMON TRUE)
+	set (NEED_LIB_MULESOCKET TRUE)
+	set (wx_NEED_NET TRUE)
+	set (NEED_ZLIB TRUE)
+	# Compile-time install path the daemon falls back to when
+	# Server/StaticRoot is empty in the conf. Mirrors WEBSERVERDIR but
+	# uses the ABSOLUTE form so a binary running from /usr/local/bin
+	# (or wherever the operator put it) resolves to the matching
+	# /usr/local/share/amule/amuleapi-static without needing to be
+	# cwd'd at the install prefix.
+	set (AMULEAPI_STATIC_DIR
+		"${CMAKE_INSTALL_FULL_DATADIR}/${PACKAGE}/amuleapi-static/")
+endif()
+
 if (BUILD_CAS)
 	set (BUILD_UTIL TRUE)
 endif()
@@ -165,7 +201,11 @@
 
 if (NEED_LIB_MULEAPPCOMMON)
 	option (ENABLE_IP2COUNTRY "compile with GeoIP IP2Country library" ON)
-	option (ENABLE_MMAP "enable using mapped memory if supported")
+	# Compile the mmap file-I/O path where the platform supports it (libc
+	# capability, no external dependency). Actual use is a runtime preference
+	# (MMapEnabled, default OFF). Set OFF only to exclude the mmap code and its
+	# SIGSEGV/SIGBUS handler entirely (e.g. sanitizer builds).
+	option (ENABLE_MMAP "compile the mmap file-I/O path where supported" ON)
 	option (ENABLE_NLS "enable national language support" ON)
 	# Backtrace symbol resolution: ON => use libbfd for in-process
 	# address→file:line resolution; OFF => fall back to
@@ -185,6 +225,9 @@
 
 if (NEED_LIB_MULEAPPGUI)
 	set (wx_NEED_GUI TRUE)
+	# The log/server-info panes use wxStyledTextCtrl (Scintilla) for fast,
+	# full-history scrolling; only the GUI lib pulls it in.
+	set (wx_NEED_STC TRUE)
 endif()
 
 if (NEED_LIB_MULESOCKET)
@@ -196,7 +239,7 @@
 # wxWidgets::NET directly in src/webserver/src/CMakeLists.txt for its
 # socket code). Keep wx_NEED_NET on only when those are actually being
 # built.
-if (NOT (BUILD_DAEMON OR BUILD_MONOLITHIC OR BUILD_REMOTEGUI OR BUILD_WEBSERVER OR BUILD_WXCAS OR BUILD_AMULECMD))
+if (NOT (BUILD_DAEMON OR BUILD_MONOLITHIC OR BUILD_REMOTEGUI OR BUILD_WEBSERVER OR BUILD_WXCAS OR BUILD_AMULECMD OR BUILD_AMULEAPI))
 	set (wx_NEED_NET FALSE)
 endif()
 
@@ -210,6 +253,21 @@
 
 add_compile_definitions ($<$<CONFIG:DEBUG>:__DEBUG__>)
 
+# Refuse deprecated Boost.Asio APIs. Set for EVERY target on purpose, never in
+# a single source file: the macro does not only hide deprecated names, it
+# switches BOOST_ASIO_SYNC_OP_VOID between void and error_code, which changes
+# the return type of basic_socket::close() and its siblings. Those are weak
+# inline templates, so a translation unit that disagrees with the rest still
+# links -- against whichever definition the linker happened to keep -- and the
+# caller then sets up the wrong ABI for the call. Defined in one .cpp, it made
+# amuleapi write a returned error_code over a live socket object and abort with
+# bad_weak_ptr on shutdown (issue #1214).
+#
+# Safe only while Asio is header-only, which it is here: nothing links a
+# prebuilt Boost. If that ever changes, this has to match how that Boost was
+# built, or the same mismatch returns at the library boundary.
+add_compile_definitions (BOOST_ASIO_NO_DEPRECATED)
+
 if (WIN32)
 	add_compile_definitions ($<$<CONFIG:DEBUG>:wxDEBUG_LEVEL=0>)
 endif (WIN32)
@@ -218,11 +276,97 @@
 	option (ENABLE_UPNP "enable UPnP support in aMule" ON)
 endif()
 
-# Initial value of the "Check for new aMule version" preference for fresh
-# installs (the user can still flip it in Preferences after first launch).
-# Packagers shipping aMule via an OS package manager typically want OFF so
-# the daemon-side updater doesn't conflict with the distro's own update
-# mechanism. Standalone / portable / AppImage builds want ON. Existing
-# users' saved amule.conf is unaffected -- only the per-install default
-# applies on first launch or after a config reset.
-option (DEFAULT_VERSION_CHECK "default state of the 'Check for new aMule version' preference" ON)
+# Experimental IPv4 uTP in amule/amuled only: datagram framing, inbound stream
+# acceptance, and dialing a peer that advertised the capability. No capability
+# advertisement of our own. Requires CMake 3.12; see cmake/libutp.cmake.
+option (ENABLE_UTP "enable experimental uTP: datagram framing, inbound streams and outbound dialing" OFF)
+
+# IPv6 TCP admission is intentionally separate from listener activation and the
+# remaining IPv6 identity work. Keep it off until those consumers are migrated.
+option (ENABLE_IPV6 "enable experimental native IPv6 TCP admission (IPv6 identity migration remains incomplete)" OFF)
+
+# Master switch for the in-app "check for a new aMule version" feature: the
+# startup notification, the "Check for new version at startup" preference, and
+# the About dialog's "Check for updates" button. When OFF the whole feature
+# (including the CVersionCheck HTTP code) is compiled out, so nothing contacts
+# GitHub and no download links are shown. Packagers shipping aMule via an OS
+# package manager want OFF, so the distro's package manager owns updates.
+# Standalone / portable / AppImage builds and Windows/macOS want ON.
+option (ENABLE_VERSION_CHECK "compile in the in-app new-version check (startup notification + About 'Check for updates'); OFF for OS-package builds" ON)
+
+# Master switch for the Kademlia protocol 0x0a catch-up: the advertised
+# KADEMLIA_VERSION bump from 0x08 to 0x0a and the AICH hashes that 0x09 added
+# to keyword storage.
+#
+# OFF by default, and OFF means inert: every site that would put a different
+# byte on the wire, or a different byte in the on-disk keyword index, is
+# compiled out, so a default build advertises 0x08 and emits exactly what
+# upstream emits. CKadAICHHashList and its unit test are compiled either way --
+# the class is self-contained, so gating the file would only cost test
+# coverage.
+#
+# The switch is a plain compile definition rather than a config.h entry because
+# it has to be visible inside src/include/protocol/kad2/Constants.h, which is
+# pulled in by headers that never see config.h.
+option (ENABLE_KAD_PROTOCOL_10 "advertise Kademlia protocol 0x0a and enable the AICH hashes on keyword storage that Kad 0x09 introduced" OFF)
+
+# Master switch for the local Kad node-protection heuristics: the adaptive
+# request-timeout estimate (CFastKad) and the Kad identity protections
+# (CSafeKad).
+#
+# Deliberately NOT part of ENABLE_KAD_PROTOCOL_10, and deliberately not named
+# after a protocol version. Neither class defines a tag, an opcode or a packet
+# field: they consume what the Kad protocol already carries and decide only
+# what we do locally -- whether to admit a contact, whether to believe an
+# answer, how long to wait before treating a request as stalled. A peer cannot
+# observe whether we run them and has nothing to implement in response, so
+# gating them behind a protocol-version switch would imply a wire contract that
+# does not exist.
+#
+# OFF by default, and OFF means inert: every call site is compiled out and the
+# two classes are left out of the build entirely, so a default build is the
+# upstream one. Their unit tests compile the two sources directly and run
+# either way, so nothing is gated out of test coverage.
+#
+# A plain compile definition rather than a config.h entry, so it is visible in
+# the Kad headers that never see config.h.
+option (ENABLE_KAD_NODE_PROTECTION "enable the local Kad node-protection heuristics: adaptive request timeouts and Kad identity protections (no wire-protocol change)" OFF)
+
+# Every experimental switch, named once. A switch belongs here as well as in its
+# own option() above, and that is the only bookkeeping adding one costs: the
+# loop below defines it, and ENABLE_ALL_EXPERIMENTAL turns the whole set on, so
+# no CI job has to name individual switches. The clang-tidy jobs build their
+# compile database with ENABLE_ALL_EXPERIMENTAL, because a switch that is OFF is
+# removed by the preprocessor and never analysed at all.
+#
+# Deliberately a list rather than a naming convention or a grep over ENABLE_*:
+# the latter would sweep in ENABLE_UPNP, ENABLE_NLS and the rest, which are
+# ordinary build options rather than unfinished features.
+set (AMULE_EXPERIMENTAL_OPTIONS
+	ENABLE_IPV6
+	ENABLE_KAD_PROTOCOL_10
+	ENABLE_KAD_NODE_PROTECTION
+	ENABLE_UTP
+)
+
+option (ENABLE_ALL_EXPERIMENTAL "turn on every switch in AMULE_EXPERIMENTAL_OPTIONS at once" OFF)
+
+foreach (experimental_option IN LISTS AMULE_EXPERIMENTAL_OPTIONS)
+	# ENABLE_ALL_EXPERIMENTAL wins over an individual switch: option() leaves
+	# an unset switch defined as OFF, so an explicit -DENABLE_X=NO is
+	# indistinguishable from not passing it and cannot be honoured as an
+	# opt-out. To build every switch but one, name the switches individually
+	# and leave ENABLE_ALL_EXPERIMENTAL off.
+	#
+	# Nothing here writes the cache, so enabling the set for one configure
+	# does not leave the individual switches ON for later ones.
+	if (${experimental_option} OR ENABLE_ALL_EXPERIMENTAL)
+		# The variable is set as well as the definition added, because a
+		# switch may gate more than preprocessor state: ENABLE_KAD_NODE_PROTECTION
+		# also selects source files in cmake/source-vars.cmake, and an if()
+		# there has to see it. Directory scope, so it reaches the
+		# subdirectories included after this and still never touches the cache.
+		set (${experimental_option} ON)
+		add_compile_definitions (${experimental_option})
+	endif()
+endforeach()

amule-3.0.1.tar.gz/cmake/source-vars.cmake -> amule-3.1.0.tar.gz/cmake/source-vars.cmake Changed

@@ -10,6 +10,10 @@
 		kademlia/routing/RoutingZone.cpp
 		amule.cpp
 		BaseClient.cpp
+		BrowseLifecycle.cpp
+		BrowseManager.cpp
+		BrowseStore.cpp
+		ChatSessionStore.cpp
 		ClientCreditsList.cpp
 		ClientList.cpp
 		ClientTCPSocket.cpp
@@ -24,6 +28,7 @@
 		EncryptedStreamSocket.cpp
 		EncryptedDatagramSocket.cpp
 		ExternalConn.cpp
+		FirstRunWizard.cpp
 		FriendList.cpp
 		IPFilter.cpp
 		KnownFileList.cpp
@@ -44,8 +49,25 @@
 		UploadQueue.cpp
 		PartFileWriteThread.cpp
 		PartFileHashThread.cpp
+		MediaProbeThread.cpp
+		FreeSpaceThread.cpp
 		ThreadTasks.cpp
 	)
+
+	if (ENABLE_UTP)
+		list (APPEND CORE_SOURCES UtpLibraryAdapter.cpp UtpStreamAcceptor.cpp)
+	endif()
+
+	# Only compiled in when the switch is on. Every call site is behind the
+	# same guard, so with the switch off these two would be dead weight in
+	# the binary; the unit tests compile them directly, so gating them here
+	# costs no coverage.
+	if (ENABLE_KAD_NODE_PROTECTION)
+		list (APPEND CORE_SOURCES
+			kademlia/net/FastKad.cpp
+			kademlia/net/SafeKad.cpp
+		)
+	endif()
 endif()
 
 if (BUILD_MONOLITHIC OR BUILD_REMOTEGUI)
@@ -53,37 +75,55 @@
 		# wxArtProvider subclass + the C TU it pulls icon bytes
 		# from. ${AMULE_ICON_DATA_C} resolves to either the build-
 		# generated copy (Python3 found at configure → regenerated
-		# from src/icons/*.png by src/icons/embed_icons.py) or the
-		# checked-in fallback (Python3 missing → use the file as
-		# committed). See src/CMakeLists.txt for the resolution.
+		# from src/icons/*.png and their .svg twins by
+		# src/icons/embed_icons.py) or the checked-in fallback
+		# (Python3 missing → use the file as committed). See
+		# src/CMakeLists.txt for the resolution.
 		CamuleArtProvider.cpp
 		${AMULE_ICON_DATA_C}
 		AddFriend.cpp
 		amule-gui.cpp
 		AppImageIntegration.cpp
 		amuleDlg.cpp
+		AboutDialog.cpp
+		VersionCheck.cpp
+		BrowseListModel.cpp
 		CatDialog.cpp
 		ChatSelector.cpp
 		ChatWnd.cpp
 		ClientDetailDialog.cpp
+		ClientHistoryListCtrl.cpp
+		ClientNameCell.cpp
+		ClientRowListCtrl.cpp
+		ClientContextActions.cpp
+		ClientsListCtrl.cpp
+		ClientsWnd.cpp
 		CommentDialog.cpp
 		CommentDialogLst.cpp
 		DirectoryTreeCtrl.cpp
 		DownloadListCtrl.cpp
 		FileDetailDialog.cpp
+		FileLaunch.cpp
 		FriendListCtrl.cpp
 		GenericClientListCtrl.cpp
 		KadDlg.cpp
 		MuleTrayIcon.cpp
+		# Compiled per-executable rather than into the shared muleappgui
+		# static lib: its #ifdef CLIENT_GUI branches need the consuming
+		# target's define, which a single shared object cannot provide.
+		muuli_wdr.cpp
 		OScopeCtrl.cpp
 		PrefsUnifiedDlg.cpp
 		SearchDlg.cpp
+			SearchHistory.cpp
 		SearchListCtrl.cpp
+		SearchListModel.cpp
 		ServerListCtrl.cpp
 		ServerWnd.cpp
 		SharedDirsApplyTask.cpp
 		SharedFilePeersListCtrl.cpp
 		SharedFilesCtrl.cpp
+		SharedFilesReloadProgress.cpp
 		SharedFilesWnd.cpp
 		SourceListCtrl.cpp
 		StatisticsDlg.cpp
@@ -101,14 +141,20 @@
 if (BUILD_MONOLITHIC OR BUILD_DAEMON OR BUILD_REMOTEGUI)
 	set (COMMON_SOURCES
 		amuleAppCommon.cpp
+		AppImageEnv.cpp
 		AutostartManager.cpp
+		ProtocolHandlerManager.cpp
+		$<$<BOOL:${APPLE}>:ProtocolHandlerManager_mac.mm>
 		ClientRef.cpp
+		ClientVersionString.cpp
 		ECSpecialMuleTags.cpp
 		GetTickCount.cpp
 		GuiEvents.cpp
 		HTTPDownload.cpp
+		InstanceLock.cpp
 		KnownFile.cpp
 		Logger.cpp
+		MediaProbe.cpp
 		PartFile.cpp
 		Preferences.cpp
 		Proxy.cpp
@@ -119,11 +165,15 @@
 	)
 endif()
 
+# IP2Country.cpp compiles unconditionally: when ENABLE_IP2COUNTRY is off its
+# #else branch provides no-op stubs, so core code (CamuleApp owns the resolver
+# for the #439/#440 EC tags) can reference CIP2Country without sprinkling
+# ENABLE_IP2COUNTRY guards over every call site + the dtor. Only the MaxMind DB
+# reader — and its libmaxminddb link (see src/CMakeLists.txt) — is gated on the
+# feature; the stub needs neither.
+set (IP2COUNTRY IP2Country.cpp)
 if (ENABLE_IP2COUNTRY)
-	set (IP2COUNTRY
-		IP2Country.cpp
-		geoip/MaxMindDBDatabase.cpp
-	)
+	list (APPEND IP2COUNTRY geoip/MaxMindDBDatabase.cpp)
 endif()
 
 if (ENABLE_UPNP)

amule-3.0.1.tar.gz/cmake/upnp.cmake -> amule-3.1.0.tar.gz/cmake/upnp.cmake Changed

@@ -7,11 +7,14 @@
 # (e.g. /usr/COMPONENT, /mingw64/COMPONENT) in INTERFACE_INCLUDE_DIRECTORIES.
 # Observed on Ubuntu 25.10 libupnp-dev 1.14.x and MSYS2 mingw-w64-pupnp 1.14.x.
 # Detect this before loading the broken config by inspecting the targets file,
-# and fall through to pkg-config if affected.
+# and fall through to pkg-config if affected. The multiarch libdir is matched
+# generically via CMAKE_LIBRARY_ARCHITECTURE (e.g. i386-linux-gnu,
+# arm-linux-gnueabihf, s390x-linux-gnu) so detection works on every Debian /
+# Ubuntu architecture, not just x86_64 / aarch64.
 find_file (_upnp_cmake_targets "UPNP.cmake"
 	PATH_SUFFIXES lib/cmake/UPNP lib64/cmake/UPNP
-	              lib/x86_64-linux-gnu/cmake/UPNP
-	              lib/aarch64-linux-gnu/cmake/UPNP)
+	              lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/UPNP
+	              lib64/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/UPNP)
 if (_upnp_cmake_targets)
 	file (READ "${_upnp_cmake_targets}" _upnp_cmake_content)
 	if (_upnp_cmake_content MATCHES "INTERFACE_INCLUDE_DIRECTORIES.*COMPONENT")

amule-3.0.1.tar.gz/cmake/wx.cmake -> amule-3.1.0.tar.gz/cmake/wx.cmake Changed

amule-3.0.1.tar.gz/config.h.cm -> amule-3.1.0.tar.gz/config.h.cm Changed

@@ -10,9 +10,11 @@
 /* Define this to the include prefix of crypto++ */
 #cmakedefine CRYPTOPP_INCLUDE_PREFIX ${CRYPTOPP_INCLUDE_PREFIX}
 
-/* Initial value of the "Check for new aMule version" preference (1 = on,
-   0 = off). Controlled at configure time by -DDEFAULT_VERSION_CHECK. */
-#cmakedefine01 DEFAULT_VERSION_CHECK
+/* Master switch for the in-app new-version check (startup notification, the
+   "check at startup" preference, and the About "Check for updates" button).
+   When undefined the whole feature is compiled out. Controlled at configure
+   time by -DENABLE_VERSION_CHECK (ON by default; OFF for OS-package builds). */
+#cmakedefine ENABLE_VERSION_CHECK
 
 /* Define if upnp was found. */
 #cmakedefine ENABLE_UPNP
@@ -76,6 +78,15 @@
 /* Define if you have the `munmap' function. */
 #cmakedefine HAVE_MUNMAP
 
+/* Define if you have the `sigaction' function (needed for the mmap
+   SIGSEGV/SIGBUS recovery handler). */
+#cmakedefine HAVE_SIGACTION
+
+/* Define if the mmap file-I/O path can be compiled in on this platform.
+   Gates the CFileArea code path, the preferences checkbox and the EC tag.
+   Actual use is the runtime MMapEnabled preference (default OFF). */
+#cmakedefine MMAP_SUPPORTED
+
 /* Define if you have the <nl_types.h> header file. */
 #cmakedefine HAVE_NL_TYPES_H
 
@@ -189,6 +200,10 @@
 /* Where the webserver finds it's themes */
 #cmakedefine WEBSERVERDIR "${WEBSERVERDIR}"
 
+/* Compile-time install path of amuleapi's bundled static frontend.
+   amuleapi falls back to this when Server/StaticRoot is empty. */
+#cmakedefine AMULEAPI_STATIC_DIR "${AMULEAPI_STATIC_DIR}"
+
 /* Define if libpng is present is set. */
 #cmakedefine WITH_LIBPNG

amule-3.0.1.tar.gz/docs/CHANGELOG.md -> amule-3.1.0.tar.gz/docs/CHANGELOG.md Changed

@@ -4,6 +4,183 @@
 
 ---
 
+## Version 3.1.0 - "Three versions in a year! Can we have some REST?"
+2026-09-21
+
+The largest release since the 3.0.0 rebirth: 893 merged PRs on top of 3.0.1. The headline is a new way to drive aMule - `amuleapi`, a REST + Server-Sent-Events daemon shipping a complete new Web UI that covers the same ground as the desktop GUI. Around it landed transfer-performance work that lifts real-world throughput, authenticated encryption for External Connect, a top-to-bottom modernization of the GUI list controls, media metadata that now travels end to end, searches that survive a restart, a dedicated Clients page, and a sweep of memory and CPU work across the daemon, the remote GUI and the API.
+
+Upgrading is a drop-in. No config migration, and nothing an older build cannot read back: the new per-peer metadata rides in an appended `clients.met` trailer that every existing reader ignores (#902), and EC encryption is negotiated per session and off by default, so older amulegui / amulecmd clients keep connecting untouched (#714).
+
+### Highlights
+
+- **amuleapi: a REST API and SSE stream for aMule.** A standalone daemon that speaks to `amuled` as an ordinary EC client and serves `/api/v1/*` plus a live event stream, with ETag-versioned reads and per-endpoint contracts in `docs/api/` (#201).
+- **A complete new Web UI, shipped with amuleapi.** Not a cut-down remote panel: Networks with the log panes, Search with multiple tabs, Downloads, Shared Files, Clients, Messages, Statistics and Preferences - the same sections the desktop GUI has, driven by SSE with throttled re-renders, in light and dark themes, responsive down to a phone, in English and Spanish (#220). It is the replacement path for `amuleweb`, which is now deprecated.
+- **Faster transfers.** Endgame mode requests the final blocks from several sources at once, so a download no longer parks at 99% behind one dead peer (#225). Request and upload depth are now sized to each link's bandwidth-delay product instead of a fixed queue of three, worth up to roughly 12x on high-latency paths (#598). Kad source discovery limits, inherited from eMule and long obsolete, are raised and made configurable (#308).
+- **Leaner and quicker under load.** A per-connection EC cache that never released entries for departed peers is fixed, which is what drove daemon memory growth on long-running nodes (#1424); the startup share scan does one `stat` per file instead of four (#1310); and the EC update path, the remote GUI and the API all stop redoing work nothing asked for (#775, #776, #777, #772, #878, #922, #1098, #1091).
+- **External Connect is encrypted.** Authenticated encryption over the EC packet layer (AES-128-GCM baseline, ChaCha20-Poly1305 where Crypto++ offers it), keyed by an ephemeral X25519 exchange so a credential leaked later cannot decrypt a recording made earlier (#714, #785). Authentication is rate-limited (#741, #742), the daemon listens on loopback by default (#737), and amule, amuled and amuleapi share one credential store (#665).
+- **Crypto++ for SHA1 and MD5.** aMule's own implementations are gone in favour of the library it already linked, picking up hardware SHA instructions where the CPU has them (#238).
+- **The GUI lists are modern widgets.** Every major list control moved to `wxDataViewCtrl`: preferences sidebar, servers, friends, file details, shared files, downloads, clients and search results, with live column sorting and native dark-mode painting (#671, #830, #839, #842, #848, #850, #540).
+- **Remote-to-local path mappings.** An easy one to overlook and a large quality-of-life win for anyone running amulegui against a daemon on another machine: map the core's paths to the ones the GUI can actually reach, and Open / Show in Folder start working on a remote setup (#854).
+- **Media metadata, end to end.** aMule extracts Length, Bitrate and Codec from shared media with ffprobe and advertises them to servers and Kad, so other clients see them too (#280); they surface in search results, shared files, the API and the Web UI, with Artist, Album and Title columns alongside (#1343, #1344, #436, #442), and can be re-extracted on demand (#1106).
+- **A Clients page.** Active peers split by direction plus a known-clients history backed by the credit store, with the same context menu and details dialog as everywhere else (#904, #902, #1271).
+- **Search that remembers.** History and results both persist across restarts (#643, #856), results filter as you type (#821), and searches started by other clients are visible in the GUI (#710).
+- **Chat and friends everywhere.** Peer and friend messaging works over EC and REST, not just the monolithic GUI (#1053), and the friends list is exposed over REST (#986).
+- **Bind to an interface, not just an address.** A real egress-interface bind that a VPN user can rely on, using `IP_UNICAST_IF` / `IP_BOUND_IF` rather than privileged `SO_BINDTODEVICE` (#281).
+- **Looks right on modern desktops.** Windows follows the system light/dark appearance (#818), toolbar and preferences icons are resolution-independent SVG for hi-DPI (#487), and the toolbar artwork was redrawn (#1494).
+- **Friendlier first run.** A setup wizard on first launch (#264), a startup splash for the monolithic build (#760), and an in-app new-version check with a GUI popup and an About button, gated off for OS packages (#277, #406).
+- **Packaging.** A fully static musl track producing self-contained `amuled`, `amulecmd` and `amuleapi` binaries with no shared-library dependencies (#629), libupnp 22.0.4 across every bundle (#681), and `ed2k://` and `magnet:` registered with the OS on all three platforms (#324).
+
+### Deprecations
+
+- **`amuleweb` is deprecated.** It still ships in 3.1.0, still works, and nothing is removed this release - but it now prints a notice at startup and carries one in its manual page (#371). Its replacement is `amuleapi` with the new Web UI, which covers the same ground as the desktop GUI rather than the subset the old PHP templates reached. A future release will retire `amuleweb`; this one gives you a cycle to move.
+- **The ed2k v2 VBT code path was removed** as part of the transfer rework (#598). It was dead code no peer exercised.
+
+### amuleapi and the Web UI
+
+New in this release, so the entries below describe where they ended up rather than each step.
+
+- REST surface: downloads, shared files, search, servers, Kad, clients, known clients, friends, chats, categories, preferences, statistics, logs and IP filter actions, with SSE events for everything that moves.
+- Locale-independent by design: typed values and stable keys rather than the GUI's translated strings, and English error text (#293, #311, #380).
+- Media metadata, client details, friend status and the credit modifier are served from the same core values the desktop shows (#436, #442, #443, #1479, #1480).
+- Web UI features beyond the section list: a download button that pulls a finished file straight to the browser (#1216, #1203), per-peer detail panels, a shared-files tree, category management, version alerts, country flags, and a comments tab driven by SSE rather than polling (#731).
+- Security: amuleapi receives an ephemeral EC token instead of the stored password (#749, #751), and config files are restricted to 0600 (#746).
+
+### Performance and memory
+
+- **EC incremental-update cache.** Each connection kept the last value it sent for every field of every object, and entries for clients, servers and friends that went away were never released - unbounded growth for the life of the connection, which is what long-running daemons were seeing. Entries are now dropped where the object is removed (#1424).
+- **Startup share scan.** `AddPathToShares()` asked the filesystem four separate questions per file; on 10,000 shared files almost three quarters of the walk was syscalls that did not need to happen. Now one `stat` (#1310).
+- **EC update path.** The file list is no longer rebuilt on every `GET_UPDATE` poll (#775), encoders live in a sorted vector rather than a `std::map` (#776), reconciliation is skipped when neither side changed (#777), a client's tags are built only for fields that moved (#772), and unchanged search results are skipped on the multi-search union poll (#723). AES is preferred for the EC channel where the hardware backs it (#798).
+- **GUI.** Lists nobody is looking at are not re-sorted (#878), off-screen rows skip change notifications (#885), the Clients page refreshes once a second instead of ten times (#922), and the remote GUI polls its active page about once a second instead of every three (#773), with remote log delivery batched (#445).
+- **amuleapi.** The file map is diffed in place instead of being copied twice a tick (#1098, #1092), JSON accumulates as UTF-8 rather than UTF-32 (#1091), the SSE diff is skipped when nothing is listening (#1102), the known-clients store is maintained rather than re-read (#912), and glibc's malloc arenas are capped so a request's peak is not retained per pool thread (#1095).
+- **Hashing.** The one-second network-quiescent guard is gone, so per-part verification keeps up in real time on fast links (#791).
+
+### Transfers, sources and performance
+
+- Endgame mode for the last blocks of a file (#225).
+- BDP-adaptive request and upload depth, and the dead VBT code path removed (#598).
+- Kad source-search and connection limits raised and exposed in Preferences (#308).
+- Complete-source counts recomputed when uploaders leave, not only when they arrive (#1052, #1066).
+- Runtime-toggleable memory-mapped file I/O (#565).
+- AICH recovery for parts found corrupt during the completion re-hash (#270), and the post-hashing sync no longer prunes a file it just hashed (#526).
+- A completed file deleted from disk can be downloaded again (#815); a partfile whose handle has been closed is no longer read (#954).
+- Throttled reads that stalled browsing and chat now resume (#1276).
+
+### Networking and protocol
+
+- Interface binding for every socket aMule opens (#281).
+- Hostnames resolve to IPv4 only, so a AAAA answer cannot strand a connection (#699).
+- Connections arriving during startup are no longer dropped (#926).
+- Servers are not marked dead when the fault is at our end, with back-off between sweeps (#893).
+- UPnP: search only for the internet gateway, rate-limit ALIVE-triggered fetches (#310), raise the content-length limit for large router descriptions (#469), and classify IGD devices regardless of UPnP version (#472).
+- SOCKS5 replies and relayed datagrams hardened (#1433).
+- Two long-standing Asio races in the read handoff, each capable of wedging an amulegui / amuled pair until the watchdog fired (#871, #882).
+- eMuleAI peer capabilities are recognised and its reserved frames demultiplexed (#1288).
+
+**Groundwork, not switched on.** A large block of addressing work landed this cycle: an internal address type that can hold IPv6, typed peer identity, address-aware security and filtering, and a uTP transport (#1318 through #1504). A stock 3.1.0 build behaves exactly as before - uTP sits behind `ENABLE_UTP`, off by default, as do the experimental Kad switches (#1297, #1304) - and the work is here so the next cycle has somewhere to stand.
+
+### External Connect and security
+
+- Negotiated authenticated encryption, with forward secrecy from an ephemeral X25519 exchange (#714, #785).
+- Authentication throttling, configurable (#741, #742).
+- Loopback-only listening by default, with detected addresses offered in Preferences (#737).
+- One credential store shared by amule, amuled and amuleapi (#665); config files restricted to 0600 (#746).
+- Remote GUIs can now manage the core's shared folders (#530), browse a peer's shares (#520), follow chat (#517), and poll every search's progress in one request (#758).
+
+### GUI
+
+- List controls migrated to `wxDataViewCtrl` with live sorting, keyboard context menus, and lists that no longer paint blank under an open menu or lose the user's place (#540, #860, #877).
+- Statistics and Kad graphs rewritten: new renderer, hover readout, and the history behind them fixed, which on a remote GUI had been nearly empty (#897).
+- A browsed peer's shared files are shown as a folder tree instead of one flat run (#917).
+- File details for shared files (#495), on double-click for downloading files (#628), and an export of the selection to an emulecollection (#769).
+- Free disk space and total size on the Downloads and Shared Files panels (#847, #689, #929).
+- Open a file or show it in the file manager from both lists (#831), and `.emulecollection` files open from the OS file manager (#647).
+- Alt+letter tab shortcuts mirrored as a macOS menu (#642), server country flags (#691), per-user server file limits (#841), "Connected since" in the ED2K and Kad panes (#650).
+- Byte sizes and rates are labelled in IEC units that match the arithmetic (#931), timestamps follow the user's locale (#928), and the app icon is rendered from one vector source at every size (#932).
+- Verify Local Data is available from the GUI, amuled and amulegui, with progress.
+- amulegui: remote-to-local path mappings (#854), reconnects instead of exiting when the link drops (#452), quietly while minimised (#817), keeps its own log apart from the daemon's (#508), and shows the connected core's version (#1224).
+
+### Search
+
+- History (#643) and results (#856) persist across restarts; 100 past queries instead of 30 (#822).
+- Filter results as you type (#821); rating in its own sortable column (#632).
+- Kad notes and community ratings retrieved and shown, with eMule parity (#462, #500).
+- Searches started by other clients appear in the monolithic GUI (#710); a new eD2k search asks before stopping the running one (#1046).
+- Result grouping and download-under-name over EC and REST (#447).
+
+### Shared files and metadata
+
+- Media metadata advertised over ed2k and Kad (#280), re-extractable from the context menu (#1124, #1106).
+- Exclude shared files by name pattern (#350).
+- Live upload activity per shared file over EC (#473).
+- Shared-folder path index fixes: re-keyed on completion (#309), NFC-normalized on macOS (#312), cleared with the map it mirrors (#1034).
+- The directory watcher handles rename and delete correctly and notifies the GUI when it re-shares a known file (#289, #313).
+
+### Preferences and defaults
+
+- IP filter defaults to emule-security's list (#577) with auto-update off (#582).
+- Free-disk-space floor raised to 500 MB (#578).
+- A GUI control for sparse part files (#662).
+- Media-probe and previously hidden daemon preferences wired over EC and exposed in amuleapi (#479).
+- External connections are required for the web server and amuleapi, instead of failing silently later.
+
+### Platform and packaging
+
+- Fully static musl build of `amuled`, `amulecmd` and `amuleapi` (#629).
+- libupnp 22.0.4 everywhere, source-built on Windows where MSYS2 has no 22.x (#681).
+- `ed2k://` and `magnet:` scheme registration on Windows, macOS and Linux (#324).
+- AppImage: amulegui launcher and shell shortcuts (#328), host GLib and GTK modules kept out of the bundle (#903), sanitized child environment for external programs (#336).
+- Windows: dark mode (#818), correct icon sizes for scaled displays (#933, #934), prevent-sleep under MinGW (#416).
+- macOS: daemonize before `wxEntry` so `amuled -f` no longer aborts (#297), UTF-8 file names (#318), and `LC_NUMERIC` kept at C so a terminal launch does not crash (#1430).
+
+### Known Limitations
+
+Carried over from 3.0.1, unchanged this cycle:
+
+- macOS `.dmg` is **not yet code-signed or notarized** - Gatekeeper warnings on first launch.
+- **Flathub submission still pending** - install the `.flatpak` directly with `flatpak install <file>` for now.
+- AppImage isn't yet in AppImageLauncher's catalogue.
+
+### Contributors
+
+This release is 893 merged PRs. Particular thanks to:
+
+- **got3nks** - 580 PRs. amuleapi and its REST surface, EC encryption and forward secrecy, the transfer pipeline, media metadata, search persistence, chat and friends parity, the Clients page, packaging and the release tooling.
+- **ngosang** (Diego Heras) - 118 PRs. The Web UI: its shape, its features and most of its polish (#220), plus the Spanish catalogue, the redesigned toolbar icons and the API reviews that drove much of the v1 cleanup.
+- **kno** - 40 PRs. The addressing and uTP groundwork: the internal address type, typed peer identity, address-aware security and filtering, and the uTP transport.
+- **LSalami** (Lorenzo Salami) - 35 PRs. The `wxDataViewCtrl` list migration - downloads, shared files, client lists - plus remote-to-local path mappings, search-result persistence and accessibility fixes.
+- **mrjimenez** (Marcelo Roberto Jimenez) - 14 PRs across the build system, compile tooling, deprecation warnings and the README distro table.
+- **danim7** - 9 PRs, including the Crypto++ migration for SHA1 and MD5 (#238) and Verify Local Data across the GUI, daemon and remote GUI.
+- **Cflsft** - 5 PRs, including endgame mode (#225).
+- **adem4ik** (Andrei Stepanov) - 5 PRs on icons and the Russian `.desktop` localization.
+- **Zeyckler** (Carlos Barrero) - 3 PRs, including the hi-DPI SVG toolbar and preferences icons (#487).
+- **tbo47** (Teebo) - 3 PRs, including the first-run setup wizard (#264).
+- **gbcox** (Gerald Cox) - 3 PRs.
+- **ZiTAL**, **ed29**, **frnjjq**, **secretmango** - one PR each.
+
+#### Testing and bug reports
+
+A release this size is only as good as the people who use it before it ships and say what broke.
+
+- **ghysler** - 47 issues filed this cycle, 44 already fixed: remote-GUI performance on large queues, the search lifecycle end to end, and a long run of interface details that would otherwise have shipped. Much of the amulegui and search polish in this release exists because of those reports.
+- **mifritscher2** (9), **slrslr** (5), **Send8213** (4), **irmu** (4), **quimm2003** (3), **falcogiallo** (3) - issues filed and, in almost every case, closed this cycle.
+- Thanks also to everyone who reported a single bug, confirmed a fix, or tried a pre-release build.
+
+#### Translators
+
+Translation flows through Weblate(https://hosted.weblate.org/projects/amule/). Credited on this cycle's translation commits, with the largest contributions first:
+
+**Coool**, **தமிழ்நேரம்**, **mslr8**, **Watchman89**, **Michal Várady**, **Francisco José Juan Quintanilla**, **Kisnov**, **reducedradius**, **Guzleon**, **Marcell Balla**, **Samuel García Del Campo**, **Jaume Casado Ruiz**, **Alec Bourenkov**, **Nioh**, **Libre**, **Артур**, **nathanael**, **lazizkhalilov**, **alexandre.detourne**, **Steven Liu**, and the contributors who translate anonymously.
+
+Several developers credited above also carried catalogues: Diego Heras, Marcelo Roberto Jimenez, Andrei Stepanov, Lorenzo Salami and danim7.
+
+### Merged PRs in this release
+
+At 893 PRs a numbered index stopped being useful, so this release links the record instead of reprinting it: the full compare view(https://github.com/amule-org/amule/compare/3.0.1...3.1.0) lists every merged pull request between 3.0.1 and this tag.
+
+Fixes to features added during this same cycle - most of the amuleapi and Web UI churn - are folded into the entries above rather than listed as separate bug fixes, since no released aMule ever carried those bugs.
+
+---
+
 ## Version 3.0.1 — "bugfixes and polish"
 2026-06-24

amule-3.0.1.tar.gz/docs/EC_Protocol.md -> amule-3.1.0.tar.gz/docs/EC_Protocol.md Changed

@@ -36,7 +36,7 @@
 | `0`               | Compression (`EC_FLAG_ZLIB`) | When set, zlib compression is applied to the application layer's data. |
 | `1`               | Compressed numbers (`EC_FLAG_UTF8_NUMBERS`) | When set (presumably on small packets that aren't worth zlib-compressing), all numbers used in the protocol are encoded as a wide char converted to UTF-8 to avoid sending zero bytes. |
 | `2`               | Has ID                     | When set, a `uint32` follows the flags — the packet ID. The response must echo the same ID. The only requirement is that IDs be unique within one session (or at least don't repeat for a reasonably long time). |
-| `3`               | Reserved                   | Set to 0. |
+| `3`               | Encrypted (`EC_FLAG_ENCRYPTED`) | When set, the application-layer data is sealed with the negotiated AEAD: the body is ciphertext followed by a 16-byte authentication tag, and the transmission-layer length covers both. See Section 1.3. Both sides must have negotiated a cipher during authentication for the bit to appear. This bit was formerly reserved, so a peer predating the feature rejects such a packet outright rather than misparsing ciphertext as tags. |
 | `4`               | Large tag count (`EC_FLAG_LARGE_TAG_COUNT`) | When set, indicates the sender uses the sentinel-extended `TAGCOUNT` encoding (see Section 1.2). Both sides must have advertised `EC_TAG_CAN_LARGE_TAG_COUNT` in their auth packet for the bit to appear in any subsequent flags. Without it, the historical 16-bit `TAGCOUNT` is used, capping any tag at 0xFFFE children for safe interoperation with old peers. |
 | `5`               | Always 1                   | Distinguishes from older (pre-rc8) clients. |
 | `6`               | Always 0                   | Distinguishes from older (pre-rc8) clients. |
@@ -58,6 +58,8 @@
   be set to their predefined values — this can act as a sort of sanity
   check.
 * Bits marked **Reserved** must always be set to 0.
+* Bit `3` was reserved before transport encryption existed, and older peers
+  reject any packet that sets it. That is deliberate: the failure is closed.
 
 
 ### Section 1.2 — Application layer
@@ -122,6 +124,106 @@
 `TAGCOUNT` (a `uint32` follows when the `uint16` reads `0xFFFF`).
 
 
+### Section 1.3 — Transport encryption
+
+Everything after authentication may be encrypted. It is negotiated during the
+auth exchange, applies to the application layer only — the 8-byte transmission
+header stays in clear, because the receiver needs the flags and length to know
+a sealed body is coming — and is signalled per packet by `EC_FLAG_ENCRYPTED`.
+
+**Negotiation.** The client sends `EC_TAG_CAN_AEAD`, whose data is the list of
+cipher ids it supports in its own preference order, together with 32 random
+bytes in `EC_TAG_AEAD_CLIENT_NONCE` and a 32-byte ephemeral X25519 public key in
+`EC_TAG_AEAD_CLIENT_PUBKEY`. The server answers in `EC_OP_AUTH_SALT` with the
+chosen id in `EC_TAG_AEAD_CIPHER`, 32 random bytes of its own in
+`EC_TAG_AEAD_SERVER_NONCE`, and its own ephemeral public key in
+`EC_TAG_AEAD_SERVER_PUBKEY`. A server that omits these tags does not support
+encryption, and the session continues in clear.
+
+The public key is not optional. A peer that offers `EC_TAG_CAN_AEAD` without one
+is malformed, not old — encryption and the key exchange shipped together — and
+the offer is refused rather than answered with a weaker derivation.
+
+| id | cipher | preferred |
+| -- | ------ | -- |
+| `1` | AES-128-GCM (mandatory) | when both sides have hardware support for AES |
+| `2` | ChaCha20-Poly1305 (optional) | when both sides have ChaCha20 and at least one lacks hardware support for AES |
+
+Note that Crypto++ (as of 8.9.0) only detects hardware AES on x86 and on Linux
+ARM. On macOS and Windows ARM builds the check comes up empty even where the
+CPU has the instructions, so those peers offer ChaCha20 first and the channel
+settles on it. That is the right outcome while it lasts: the same flag decides
+whether Crypto++ itself uses the AES instructions, so a peer that preferred AES
+there would get the table-based implementation, which is slower than ChaCha20
+and not constant-time.
+
+**Keys.** Both sides derive from the X25519 shared secret, and from nothing
+else. In particular *not* from the password: a key derived from something that
+outlives the session means a password learned later decrypts a recording made
+earlier. The ephemeral private keys are discarded as soon as the secret exists,
+so once a session ends there is nothing left that could reopen it.
+
+```
+transcript = len(offered) || offered || cipher_id
+             || client_nonce || server_nonce
+             || client_pubkey || server_pubkey
+salt = server_nonce || client_nonce
+info = "aMule EC AEAD v1" || cipher_id || <the offered cipher list, as received>
+okm  = HKDF-SHA256(X25519(client_pubkey, server_pubkey), salt, info, 2*keylen + 8)
+```
+
+`okm` splits into a client-to-server key, a server-to-client key, and a 4-byte
+nonce prefix for each direction. Keys are per direction so the two packet
+counters cannot produce a colliding nonce.
+
+Including the offered list and the chosen id in `info` binds the handshake: if
+either is altered in transit the two sides derive different keys and the first
+sealed packet fails to authenticate, instead of the session silently dropping
+to a weaker cipher.
+
+**Key confirmation.** An anonymous key exchange authenticates nobody: an
+attacker can complete one exchange with each side and relay between them. Since
+the password no longer keys the channel, it is what closes that instead, as an
+explicit proof over the transcript.
+
+```
+client_confirm = HKDF-SHA256(md5(password), transcript, "ec-confirm-client", 32)
+server_confirm = HKDF-SHA256(md5(password), transcript, "ec-confirm-server", 32)
+```
+
+The client sends `EC_TAG_AEAD_CLIENT_CONFIRM` with `EC_OP_AUTH_PASSWD`; the
+server checks it — in constant time — before authenticating, and returns
+`EC_TAG_AEAD_SERVER_CONFIRM` in the sealed `EC_OP_AUTH_OK`, which the client
+checks in turn. A relay runs a different exchange on each leg, so the two
+transcripts differ and at least one check fails.
+
+A missing, malformed or mismatched tag fails authentication on either side.
+There is no fallback to a password-derived key or to clear: a downgrade an
+attacker could force by dropping one tag would be little better than no defence.
+The transcript covers both public keys, so substituting one is caught here even
+though the exchange itself would succeed.
+
+**Per-packet nonce.** 12 bytes: the 4-byte derived prefix followed by a 64-bit
+big-endian counter, starting at zero and incremented once per packet in that
+direction. The counter is *not* transmitted — the stream is ordered and any
+desync is already fatal — so a sealed body costs exactly 16 bytes more than its
+plaintext.
+
+**Ordering.** Serialise, then compress if `EC_FLAG_ZLIB` is set, then seal. The
+receiver reverses it. A failed authentication tag is not recoverable and the
+connection is dropped.
+
+**When it starts.** The last plaintext packet from the client is
+`EC_OP_AUTH_PASSWD`; the server replies with `EC_OP_AUTH_OK` already sealed,
+carrying its confirmation tag. If authentication fails no session key is
+installed, so `EC_OP_AUTH_FAIL` is sent in clear.
+
+**Policy.** Whether to encrypt is the client's choice: only the client knows the
+address it dialed, and a server's view of the peer address misclassifies
+tunnelled connections. Every aMule client offers encryption by default. A server
+may be configured to *require* it (`RequireEncryption`), in which case a session
+that negotiated no cipher is refused at authentication time.
+
 ## Section 2 — Data types
 
 ### Integer types
@@ -194,20 +296,88 @@
     +-- EC_TAG_CAN_UTF8_NUMBERS       (0x0d) (optional, advertises capability)
     +-- EC_TAG_CAN_NOTIFY             (0x0e) (optional, advertises capability)
     +-- EC_TAG_CAN_LARGE_TAG_COUNT    (0x11) (optional, advertises capability)
+    +-- EC_TAG_CAN_PARTIAL_UPDATE     (0x12) (optional, advertises capability)
+    +-- EC_TAG_CAN_MULTI_SEARCH       (0x15) (optional, advertises capability)
+    +-- EC_TAG_CAN_CHAT               (0x16) (optional, advertises capability)
+    +-- EC_TAG_CAN_SHAREDDIRS_CONFIG  (0x17) (optional, advertises capability)
+    +-- EC_TAG_CAN_SEARCH_LIST        (0x1a) (optional, advertises capability)
+    +-- EC_TAG_CAN_CHAT_SESSIONS      (0x27) (optional, advertises capability)
 ```
 
-Each `EC_TAG_CAN_*` is an empty tag advertising support for the
-corresponding wire-format extension. The server may use the matching
-flag (`EC_FLAG_ZLIB`, `EC_FLAG_UTF8_NUMBERS`, `EC_FLAG_LARGE_TAG_COUNT`,
-…) only when both sides have advertised the capability — clients that
-omit a `CAN` tag get the historical wire format for that feature.
-
-For symmetry, the server echoes the `CAN` tags it accepts in its
-`EC_OP_AUTH_OK` response so the client knows which extensions are
-actually negotiated for this connection. A client that only sees
-`EC_TAG_SERVER_VERSION` in the reply (no `CAN` tags) is talking to an
-older daemon and must avoid sending packets that need the corresponding
-extensions.
+Each `EC_TAG_CAN_*` is an empty tag advertising support for one
+extension. They fall into two groups, and the group decides how the
+server confirms the capability — which in turn decides what a client may
+safely do when the confirmation is absent.
+
+**Wire-format capabilities** change how bytes are framed:
+`EC_TAG_CAN_ZLIB`, `EC_TAG_CAN_UTF8_NUMBERS`,
+`EC_TAG_CAN_LARGE_TAG_COUNT`. The server may set the matching flag
+(`EC_FLAG_ZLIB`, `EC_FLAG_UTF8_NUMBERS`, `EC_FLAG_LARGE_TAG_COUNT`) only
+when both sides advertised the capability; a client that omits the tag
+gets the historical wire format for that feature. For `ZLIB` and
+`UTF8_NUMBERS` the flag appearing on a later packet *is* the
+confirmation — the server does not echo those two tags.
+`LARGE_TAG_COUNT` is both echoed and flagged.
+
+**Feature capabilities** gate whole operations rather than the framing:
+`EC_TAG_CAN_PARTIAL_UPDATE`, `EC_TAG_CAN_MULTI_SEARCH`,
+`EC_TAG_CAN_CHAT`, `EC_TAG_CAN_CHAT_SESSIONS`,
+`EC_TAG_CAN_SHAREDDIRS_CONFIG`, `EC_TAG_CAN_SEARCH_LIST`,
+`EC_TAG_CAN_SEARCH_PROGRESS_UNION`. The server
+echoes each of these in its `EC_OP_AUTH_OK` response when it supports it,
+so the client learns what is negotiated for this connection.
+
+For a feature capability the echo is **load-bearing, not informational**.
+A client that does not see one echoed must not send the operations it
+gates: an opcode the server does not know reaches the unknown-opcode
+branch of its request dispatcher, which asserts before it can answer
+`EC_OP_FAILED`. Asking an older server takes it down rather than
+receiving a polite refusal.
+
+`EC_TAG_CAN_SEARCH_PROGRESS_UNION` changes the reply shape of
+`EC_OP_SEARCH_PROGRESS`, so it is advertised only alongside
+`EC_TAG_CAN_MULTI_SEARCH` — a single-search client has one search and no
+use for the union. Once negotiated, **every** `EC_OP_SEARCH_PROGRESS` from
+that connection answers in the union shape: one child entry per search,
+keyed by `EC_TAG_SEARCH_ID`, whose children are the same tags the per-id
+form puts at the top level.
+
+A client should name the searches it is tracking, one `EC_TAG_SEARCH_ID`
+per search. That narrows which searches come back and makes the daemon
+refresh exactly those in its search LRU, as a per-id poll did; naming none
+reports everything the daemon holds. Naming ids does **not** opt back into
+the single-search reply — the shape is fixed by the capability, not by the
+request. A daemon that keyed the union off "no ids named" would answer a
+client that named several about only the first, and the client would read
+every other search's absence as an expiry.
+
+Each entry also carries `EC_TAG_SEARCH_NAME`, the query the search was
+started with — or, for a browse, the peer's nickname. It is the same tag
+and the same string `EC_OP_SEARCH_LIST` reports, so a client polling
+progress can label what it is reporting on without also fetching the list.
+
+The union reply carries no `EC_TAG_SEARCH_EXPIRED`: it reports the whole
+set, so an id the client asked about and did not get back is one the
+daemon no longer holds.
+
+`EC_TAG_CAN_NOTIFY` is the one exception to both patterns: the server
+records it and simply pushes notifications or does not, so there is
+neither an echo nor a flag to observe.
+
+**A missing echo means "do not send", not "send and see".** An older
+daemon has no handler for an operation it predates, so the request
+reaches the unknown-opcode path, which logs
+`External Connection: invalid opcode received: 0x...`, asserts on
+debug builds, and answers `EC_OP_FAILED`. Clients must therefore check
+the echo before sending a gated operation and fall back to the older
+behaviour when it is absent — for `EC_TAG_CAN_SEARCH_LIST`, for
+instance, listing only the searches the client started itself.
+
+Any new operation added to this protocol needs a capability tag of its
+own, advertised by the client, echoed by the server and checked before
+use. Bumping `EC_CURRENT_PROTOCOL_VERSION` is *not* the mechanism for
+this: that constant gates the handshake as a whole, so raising it
+severs every mixed-version pairing instead of degrading one feature.
 
 What gets transmitted (all numbers hexadecimal, the `0x` prefix omitted
 for readability):
@@ -257,6 +427,11 @@
       43 56 53 00                 "CVS"
 ```
 
+This shows the minimum a server must reply with. A current daemon also
+appends one empty tag per feature capability it accepted, so the child
+count is higher and `EC_TAG_SERVER_VERSION` is followed by the echoed
+`EC_TAG_CAN_*` tags. Parse the children rather than assuming a count.
+
 ### Example 2 — Simple stats request
 
 ```
@@ -340,21 +515,139 @@
 This section documents the data types of selected tags where the type
 isn't immediately obvious or has changed across protocol versions.
 
+### Chat (`EC_TAG_CHAT = 0x0900`)
+
+Peer chat is served from a session store in the core, shared by the
+built-in GUI and every EC client, so all of them see one transcript.
+
+Gated by `EC_TAG_CAN_CHAT_SESSIONS` (`0x27`), which is **not** the older
+`EC_TAG_CAN_CHAT` (`0x16`). The two are deliberately distinct: `0x16`
+predates these operations and is echoed by servers that implement none
+of them, so a client gating on it would send `EC_OP_GET_CHAT_SESSIONS`
+to a server whose dispatcher only knows how to assert on it. A client
+must send none of the operations below unless it saw `0x27` echoed.
+
+| Tag                     | Code     | Type     | Description |
+| ----------------------- | -------- | -------- | ----------- |
+| `EC_TAG_CHAT`           | `0x0900` | `string` | Message text |
+| `EC_TAG_CHAT_CLIENT_ID` | `0x0901` | `uint64` | Peer GUI_ID, `(ip << 16) \| port` |
+| `EC_TAG_CHAT_SESSION`   | `0x0902` | `uint64` | Session container; value is the GUI_ID |
+| `EC_TAG_CHAT_MESSAGE`   | `0x0903` | `string` | Message container; value is the text |
+| `EC_TAG_CHAT_MSG_ID`    | `0x0904` | `uint32` | Monotonic message id, also used as a resume cursor |
+| `EC_TAG_CHAT_DIRECTION` | `0x0905` | `uint8`  | `0` = incoming, `1` = outgoing |
+| `EC_TAG_CHAT_TIMESTAMP` | `0x0906` | `uint32` | Unix seconds, stamped by the core |
+| `EC_TAG_CHAT_PEER_NAME` | `0x0907` | `string` | Peer display name; may be empty |
+
+The IP inside a GUI_ID uses the same byte order as
+`EC_TAG_CLIENT_USER_IP`.
+
+#### `EC_OP_GET_CHAT_SESSIONS` (`0x63`) → `EC_OP_CHAT_SESSIONS` (`0x64`)
+
+The polling workhorse: one roundtrip returns the session list *and*
+every message newer than the client's cursor, so an idle connection
+costs one small packet and a busy one needs no follow-up query.
+
+**Request:** optional `EC_TAG_CHAT_MSG_ID` — the highest id the client
+already holds. Absent or `0` means "everything you still have".
+
+**Reply:** a top-level `EC_TAG_CHAT_MSG_ID` carrying the store's current
+last id, then one `EC_TAG_CHAT_SESSION` per session. Each session
+container carries `EC_TAG_CHAT_PEER_NAME`, its own
+`EC_TAG_CHAT_MSG_ID`, an `EC_TAG_CLIENT` when the peer is online, an
+`EC_TAG_FRIEND` when the peer is a friend, and one
+`EC_TAG_CHAT_MESSAGE` per message past the cursor.
+
+The top-level cursor is present even when no messages come back, so a
+client can advance past ids that were evicted rather than requesting
+them forever.
+
+The reply is the server's **complete** session set. A session the client
+is tracking that is absent from it was closed — by another client, or by
+eviction — which is the only signal a close produces. No expiry tag is
+needed, and a client must drop such a session rather than assume it
+still exists.
+
+#### `EC_OP_GET_CHAT_MESSAGES` (`0x5B`) → `EC_OP_CHAT_MESSAGES` (`0x5C`)
+
+Non-destructive backfill of **one** session, for a client opening a
+conversation it has no transcript for. Takes a required
+`EC_TAG_CHAT_CLIENT_ID` and an optional `EC_TAG_CHAT_MSG_ID` cursor, and
+replies with the same shape as above containing a single session
+container.
+
+#### `EC_OP_CHAT_SEND` (`0x65`)
+
+Takes `EC_TAG_CHAT` (the text, non-empty) plus exactly one target:
+
+| Target tag              | Addresses |
+| ----------------------- | --------- |
+| `EC_TAG_CHAT_CLIENT_ID` | A GUI_ID — replying needs no lookup, it is the id messages arrive with |
+| `EC_TAG_CLIENT`         | A live peer by ECID |
+| `EC_TAG_FRIEND`         | A friend by ECID — resolved through the friend's stored address, so an **offline** friend is reachable |
+
+The server creates the session when it does not exist, so this doubles
+as "start a chat with this address".
+
+**Reply:** `EC_OP_NOOP` with `EC_TAG_CHAT_CLIENT_ID` (the resolved
+GUI_ID) and `EC_TAG_CHAT_MSG_ID` (the id assigned), so the sender can
+correlate without waiting for the next poll. `EC_OP_FAILED` with an
+`EC_TAG_STRING` on an unknown target or empty text.
+
+Note that the core's own send returning `false` means *queued while
+connecting*, not *failed*, and does not produce an `EC_OP_FAILED`.
+
+#### `EC_OP_CHAT_CLOSE_SESSION` (`0x66`)
+
+Takes `EC_TAG_CHAT_CLIENT_ID`; drops the session from the store and
+resets the peer's chat state. Replies `EC_OP_NOOP`, or `EC_OP_FAILED`
+when there is no such session.
+
+Closing is **global**, matching the semantics search tabs already have:
+the core state is destroyed for every client, and the others learn of it
+from the session's absence in the next `EC_OP_CHAT_SESSIONS` reply.
+
 ### Connection preferences (`EC_TAG_PREFS_CONNECTIONS = 0x1300`)
 
 | Tag                                | Code     | Type     | Description |
 | ---------------------------------- | -------- | -------- | ----------- |
-| `EC_TAG_CONN_DL_CAP`               | `0x1301` | `uint32` | Download line capacity (kB/s) |
-| `EC_TAG_CONN_UL_CAP`               | `0x1302` | `uint32` | Upload line capacity (kB/s) |
-| `EC_TAG_CONN_MAX_DL`               | `0x1303` | `uint32` | Max download speed (kB/s) |
-| `EC_TAG_CONN_MAX_UL`               | `0x1304` | `uint32` | Max upload speed (kB/s) |
+| `EC_TAG_CONN_DL_CAP`               | `0x1301` | `uint32` | Download line capacity (KiB/s) |
+| `EC_TAG_CONN_UL_CAP`               | `0x1302` | `uint32` | Upload line capacity (KiB/s) |
+| `EC_TAG_CONN_MAX_DL`               | `0x1303` | `uint32` | Max download speed (KiB/s) |
+| `EC_TAG_CONN_MAX_UL`               | `0x1304` | `uint32` | Max upload speed (KiB/s) |
 | `EC_TAG_CONN_SLOT_ALLOCATION`      | `0x1305` | `uint32` | Upload slot allocation |
 | `EC_TAG_CONN_MAX_FILE_SOURCES`     | `0x1309` | `uint16` | Max sources per file |
 | `EC_TAG_CONN_MAX_CONN`             | `0x130A` | `uint16` | Max connections |
 
 > **Note**: `EC_TAG_CONN_MAX_DL`, `EC_TAG_CONN_MAX_UL`, and
 > `EC_TAG_CONN_SLOT_ALLOCATION` were widened from `uint16` to `uint32`
-> to support speeds above 65534 kB/s (~524 Mbps) required on modern
+> to support speeds above 65534 KiB/s (~537 Mbps) required on modern
 > gigabit connections. EC clients reading these tags should use
 > `GetInt()` (which handles any integer width); clients sending them
 > should encode them as 32-bit values.
+
+### Peer vendor capabilities (`EC_TAG_CLIENT_MOD_CAPABILITIES = 0x0633`)
+
+| Tag                              | Code     | Type     | Description |
+| -------------------------------- | -------- | -------- | ----------- |
+| `EC_TAG_CLIENT_MOD_CAPABILITIES` | `0x0633` | `uint32` | Peer's eMuleAI vendor capability bitfield |
+
+A child of `EC_TAG_CLIENT`, carrying what the peer advertised in the
+eD2k handshake tag `CT_MOD_MISCOPTIONS` (`0xAA`):
+
+| Bit | Meaning |
+| --- | ------- |
+| 0 | Extended source exchange |
+| 1 | Legacy uTP NAT traversal |
+| 2 | IPv6 |
+| 3 | Serving-buddy pull |
+| 4 | QUIC NAT traversal |
+
+Bits 5 and above are reserved. The core masks them off before sending,
+so an EC client never has to know which bits are defined — a set bit it
+does not recognise cannot reach it.
+
+The tag is additive and follows the usual convention: a reply without it
+means an older daemon, which is a **third state**, distinct from a peer
+that advertised no capabilities (word `0`). aMule itself advertises
+nothing here yet — it implements none of the five features — so the tag
+describes the peer only.

amule-3.0.1.tar.gz/docs/INSTALL.md -> amule-3.1.0.tar.gz/docs/INSTALL.md Changed

@@ -7,16 +7,19 @@
 
 | Package   | Minimum version | Notes                             |
 | --------- | --------------- | --------------------------------- |
-| CMake     | 3.10            |                                   |
+| CMake     | 3.10            | 3.12 with `-DENABLE_UTP=YES`      |
 | zlib      | 1.2.3           |                                   |
 | wxWidgets | 3.2.0           | 3.2 branch or newer               |
-| Crypto++  | 5.6             | classic or cryptopp-modern        |
+| Crypto++  | 8.1             | classic or cryptopp-modern        |
 | Boost     | 1.47            | headers only; only `asio` is used |
 
 The Crypto++ row accepts either the classic
 weidai11/cryptopp(https://github.com/weidai11/cryptopp) library (minimum
-5.6) or the cryptopp-modern(https://github.com/cryptopp-modern/cryptopp-modern)
-fork (any release). The cmake check disambiguates the two by `CRYPTOPP_VERSION`.
+8.1, for ChaCha20-Poly1305) or the
+cryptopp-modern(https://github.com/cryptopp-modern/cryptopp-modern) fork (any
+release — it is based on 8.9.0, so every release clears the minimum). The cmake
+check disambiguates the two by `CRYPTOPP_VERSION`, which the fork encodes as a
+calendar version.
 
 For `amuleweb` you'll also need a POSIX-compliant regex library — part of
 the standard C library on most GNU systems.
@@ -128,6 +131,7 @@
 | `BUILD_DAEMON`           | NO      | `amuled` — headless daemon                                               |
 | `BUILD_AMULECMD`         | NO      | `amulecmd` — CLI client for the daemon                                   |
 | `BUILD_WEBSERVER`        | NO      | `amuleweb` — HTTP interface for the daemon                               |
+| `BUILD_AMULEAPI`         | NO      | `amuleapi` — REST API + SSE daemon (docs/QUICKSTART-AMULEAPI.md(QUICKSTART-AMULEAPI.md)) |
 | `BUILD_ED2K`             | NO      | `ed2k` — handle `ed2k://` links                                          |
 | `BUILD_CAS`              | NO      | `cas` — C statistics tool                                                |
 | `BUILD_WXCAS`            | NO      | `wxCas` — GUI statistics tool                                            |
@@ -138,7 +142,8 @@
 | `ENABLE_UPNP`            | YES     | UPnP port forwarding                                                     |
 | `ENABLE_IP2COUNTRY`      | YES     | libmaxminddb country flags (docs/IP2Country.md(IP2Country.md))         |
 | `ENABLE_CCACHE`          | AUTO    | use ccache as compiler launcher when found (`AUTO`/`ON`/`OFF`); set `OFF` for distro builds that manage ccache themselves, `ON` to hard-fail if ccache is missing |
-| `DEFAULT_VERSION_CHECK`  | ON      | initial state of the in-app "Check for new aMule version" preference on fresh installs; packagers shipping aMule via an OS package manager typically want `OFF` |
+| `ENABLE_VERSION_CHECK`   | ON      | compile in the in-app new-version check (startup notification, the "Check for new version at startup" preference, and the About dialog's "Check for updates" button). Packagers shipping aMule via an OS package manager want `OFF`, so nothing contacts GitHub and the distro's package manager owns updates |
+| `USE_SYSTEM_PICOJSON`    | OFF     | use a system-installed `picojson.h` instead of the bundled copy           |
 
 For the full list:

amule-3.0.1.tar.gz/docs/INSTALL_BINARIES.md -> amule-3.1.0.tar.gz/docs/INSTALL_BINARIES.md Changed

@@ -14,6 +14,7 @@
 - Linux(#linux)
   - AppImage (recommended)(#appimage-recommended)
   - Flatpak(#flatpak)
+  - Static binaries (headless)(#static-binaries-headless)
   - Distro packages (older release)(#distro-packages-older-release)
 - macOS(#macos)
 - Windows(#windows)
@@ -26,6 +27,7 @@
   - macOS .dmg(#macos-dmg)
   - Linux AppImage(#linux-appimage)
   - Linux Flatpak(#linux-flatpak)
+  - Linux static tarball(#linux-static-tarball)
 
 
 ## Linux
@@ -76,6 +78,45 @@
 partfiles from a previous non-Flatpak install are picked up
 automatically.
 
+### Static binaries (headless)
+
+A self-contained tarball for running aMule without a desktop: a
+NAS, a VPS, a container, or any Linux too old or too minimal to
+satisfy the AppImage. The binaries are built against musl and
+linked fully static, so they depend on no shared library at all -
+not wxWidgets, not Boost, not Crypto++, not even libc. Both `x64`
+and `arm64` builds are published.
+
+1. Download `aMule-<version>-Linux-<arch>-static.tar.gz` from the
+   Releases pagerel.
+2. Unpack and run:
+
+   ```sh
+   tar xzf aMule-*-Linux-*-static.tar.gz
+   cd aMule-*-Linux-*-static
+   ./amuled
+   ```
+
+What is in it:
+
+* `amuled` - the headless daemon.
+* `amulecmd` - the command-line client, for driving the daemon.
+* `amuleapi` - the REST + SSE daemon, which also serves the Web UI.
+* `amuleapi-static/` - the Web UI itself. `amuleapi` finds it next
+  to its own executable, so keep it beside the binary; moving or
+  renaming that directory leaves the API answering `/api/v1` and
+  nothing on `/`.
+
+What is **not** in it: the GUIs (`amule`, `amulegui`) and
+`amuleweb`. This track is daemon, CLI and API only. To drive it
+from a desktop, run `amulegui` from any other package on your own
+machine and point it at this daemon over External Connect, or open
+the Web UI that `amuleapi` serves.
+
+State lives in `~/.aMule/` exactly as it does for every other
+package, so a static daemon picks up an existing config, shared
+files and partfiles without conversion.
+
 ### Distro packages (older release)
 
 Major distros ship aMule via their official repos, but the version
@@ -299,3 +340,21 @@
 
 The Flatpak grants `--filesystem=home`, so `~/.aMule/` is shared
 with native installs and other package formats on the same machine.
+
+### Linux static tarball
+
+The one package that needs no path advice: `amuled`, `amulecmd`
+and `amuleapi` sit together in the directory you unpacked, and
+none of them resolve anything through `$PATH`. Run them from there
+with `./amuled`, or put that directory on your `$PATH` yourself.
+
+```sh
+./amuled                      # start the daemon
+./amulecmd                    # drive it from the CLI
+./amuleapi                    # REST API + Web UI on http://localhost:4713
+```
+
+`amuleapi` serves the bundled Web UI from `amuleapi-static/` next
+to the binary, so no extra download is needed for the web
+interface. See QUICKSTART-AMULEAPI.md(QUICKSTART-AMULEAPI.md)
+for its first-run setup.

amule-3.0.1.tar.gz/docs/IP2Country.md -> amule-3.1.0.tar.gz/docs/IP2Country.md Changed

@@ -47,7 +47,7 @@
 │                                                      │
 │ Update now    ☑ Auto-update on startup            │
 │                                                      │
-│ Status: Loaded (9.0 MB) — Data by DB-IP.com         │
+│ Status: Loaded (9.0 MiB) — Data by DB-IP.com        │
 └──────────────────────────────────────────────────────┘
 ```
 
@@ -212,8 +212,8 @@
 
 | Status                                                       | Meaning                                                              |
 |--------------------------------------------------------------|----------------------------------------------------------------------|
-| `Status: Loaded (X.X MB) — Data by <provider>`               | Database open, country lookups working.                              |
-| `Status: Loaded (X.X MB)` (no attribution)                   | Hand-installed `.mmdb` — aMule has no record of where it came from.  |
+| `Status: Loaded (X.X MiB) — Data by <provider>`              | Database open, country lookups working.                              |
+| `Status: Loaded (X.X MiB)` (no attribution)                  | Hand-installed `.mmdb` — aMule has no record of where it came from.  |
 | `Status: Failed to load — click 'Update now' to refresh.`    | The file is there but isn't a valid `.mmdb`. Click `Update now`.     |
 | `Status: Not found — click 'Update now' to download.`        | No `geoip.mmdb` at the expected path. Click `Update now`.            |

amule-3.1.0.tar.gz/docs/QUICKSTART-AMULEAPI.md Added

@@ -0,0 +1,308 @@
+# amuleapi — quick start
+
+amuleapi gives aMule an HTTP interface: a JSON REST API and a live event
+stream, so other programs can drive a running `amuled`. It connects to
+amuled the same way `amulecmd` does and listens on its own port, so it can
+run alongside `amuleweb`.
+
+> aMule's older web frontend, **amuleweb**, is **deprecated** — it may be removed in aMule 3.2 or later (it is not being removed yet). amuleapi is its intended replacement.
+
+Endpoint details are in `docs/api/REFERENCE.md`(api/REFERENCE.md), and the
+event stream in `docs/api/EVENTS.md`(api/EVENTS.md).
+
+## Let aMule start it
+
+The simplest setup, and the safest: aMule launches amuleapi for you and
+hands it a one-off login token, so amuleapi never needs a copy of your EC
+password.
+
+In the GUI, under *Preferences → Remote Controls*, tick **Run amuleapi
+(REST API) on startup** and set the listening interface, HTTP port and admin
+password. A remote amulegui can do the same over EC. That is all — amuleapi
+then starts and stops with aMule.
+
+Headless, with no GUI: stop amuled (it rewrites `amule.conf` when it exits),
+add this to `amule.conf`, and set a password:
+
+```ini
+AmuleApi
+Enabled=1
+BindAddress=127.0.0.1
+HttpPort=4713
+```
+
+```sh
+amuleapi --set-admin-pass=mySecret123
+```
+
+The password command writes its file and exits. It needs no path, because
+amuleapi looks in the same place amuled does. Start amuled and amuleapi
+comes up with it.
+
+An admin password is required before you can bind anything other than
+`127.0.0.1` — amuleapi refuses to start otherwise.
+
+## Running it yourself
+
+If you start amuleapi by hand, put the EC password in its own config file,
+`amuleapi.conf`:
+
+```ini
+EC
+Password=your-ec-password
+```
+
+then just:
+
+```sh
+amuleapi
+```
+
+There is no `--password` option. A password on the command line is visible
+to every user on the machine through `ps`, and amuleapi has two safer
+routes: the token when aMule starts it, and this file when you don't.
+
+`--host` and `--port` point at amuled (default `127.0.0.1:4712`). amuleapi's
+own HTTP port is separate — `4713` by default, and that is the one REST
+clients use.
+
+aMule ships no systemd or launchd units. Wrap the command in your own if you
+want one.
+
+## Passwords
+
+Two roles: **admin** (full control) and **guest** (read-only, off unless you
+give it a password). Set them from the preferences panel, or:
+
+```sh
+amuleapi --set-admin-pass=mySecret123
+amuleapi --set-guest-pass=readOnlyPass
+```
+
+An empty guest password turns guest access off. Passwords are stored so they
+cannot be read back, only replaced — which is why the preference fields open
+blank, and why leaving one empty keeps the current password. Changes apply at
+the next login, with no restart.
+
+Guest is read-only, not a sandbox: it can see the daemon's incoming, temp and
+shared folder paths, this node's user hash, the configured proxy user, and the
+raw amuled log with the peer addresses and filenames in it. Hand a guest
+password to someone you would give read access to the machine, and not to
+anyone else.
+
+If amuleapi runs on a different machine from aMule, set its password there:
+the preferences panel only writes the file on aMule's own host.
+
+## Files
+
+amuleapi keeps its files beside amuled's, in the same folder:
+
+| Platform | Folder                                 |
+| -------- | -------------------------------------- |
+| Linux    | `~/.aMule/`                            |
+| macOS    | `~/Library/Application Support/aMule/` |
+| Windows  | `%APPDATA%\aMule\`                     |
+
+Use `--config-dir` to point somewhere else.
+
+| File                  | What it is                                                          |
+| --------------------- | ------------------------------------------------------------------- |
+| `amuleapi.conf`       | Settings — see below(#amuleapiconf).                              |
+| `amuleapi-passwords`  | The admin and guest passwords.                                      |
+| `amuleapi-jwt-secret` | Signs login tokens. Delete it to sign everyone out.                 |
+| `amuleapi-ec-token`   | The one-off login token, when aMule starts amuleapi. Lasts seconds. |
+| `amuleapi.log`        | A copy of the console output. `--no-log-file` turns it off.         |
+
+All are readable only by you.
+
+## Checking it works
+
+```sh
+# Is it up? /health is the probe: no login, and it answers from amuleapi's own
+# state without waiting on amuled, so it stays fast even when the daemon is
+# busy. The body also tells you whether the link to amuled is up.
+curl -s http://127.0.0.1:4713/api/v1/health
+
+# Log in, then use the token.
+TOKEN=$(curl -s -X POST "http://127.0.0.1:4713/api/v1/auth/login?include_token=true" \
+    -H 'Content-Type: application/json' \
+    -d '{"password":"mySecret123"}' | jq -r .token)
+
+curl -s -H "Authorization: Bearer $TOKEN" http://127.0.0.1:4713/api/v1/status
+
+# Which versions are these? /version answers without a login too, but it only
+# reports the daemon's update-availability to a caller that has one.
+curl -s -H "Authorization: Bearer $TOKEN" http://127.0.0.1:4713/api/v1/version
+```
+
+Browsers should call `/auth/login` *without* `?include_token=true` — they get a
+cookie instead, which keeps the token out of reach of page scripts.
+
+## Reaching it from another machine
+
+Keep `BindAddress` on `127.0.0.1` and put a reverse proxy in front. The proxy
+holds the certificate and speaks HTTPS to the outside world; amuleapi stays on
+loopback, where nothing else can reach it.
+
+With Caddy(https://caddyserver.com) that is the entire config file, and the
+certificate is obtained and renewed for you:
+
+```caddy
+api.example.com {
+    reverse_proxy 127.0.0.1:4713
+}
+```
+
+nginx needs a little more, and `proxy_http_version 1.1` is not optional — the
+default breaks the event stream:
+
+```nginx
+server {
+    listen 443 ssl;
+    server_name api.example.com;
+
+    ssl_certificate     /etc/letsencrypt/live/api.example.com/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/api.example.com/privkey.pem;
+
+    location / {
+        proxy_pass http://127.0.0.1:4713;
+        proxy_http_version 1.1;
+    }
+}
+```
+
+`certbot --nginx` will get you those two certificate files.
+
+Either way you need a domain name pointing at the machine, with ports 80 and
+443 reachable — that is how the certificate authority checks you own the name.
+Event streams need no extra buffering or timeout settings: amuleapi already
+sends the header that turns nginx buffering off, and its 15-second heartbeat
+keeps idle connections from being dropped. File downloads from
+`/shared/{hash}/content` send the same header, so nginx streams them straight
+through instead of spooling a gigabyte to its own disk first. A proxy that
+ignores `X-Accel-Buffering` wants `proxy_buffering off;` in that location.
+
+On a home network, with no domain name, an SSH tunnel does the same job with
+no certificate at all:
+
+```sh
+ssh -N -L 4713:127.0.0.1:4713 you@your-amule-box
+```
+
+The API is then at `http://127.0.0.1:4713` on your own machine.
+
+## `amuleapi.conf`
+
+Created with sensible defaults on first run. Your edits and comments survive
+restarts.
+
+```ini
+Server
+BindAddress=127.0.0.1     ; who can reach the API
+Port=4713                 ; amuleapi's own HTTP port
+AllowCORS=0               ; see CORS below
+CorsOriginAllowlist=      ; origins allowed to log in cross-origin
+StaticRoot=               ; folder to serve a web frontend from
+
+EC
+Host=127.0.0.1            ; where amuled is
+Port=4712
+Password=                 ; only needed when you start amuleapi yourself
+Encryption=1              ; encrypt the link to amuled
+
+Auth
+LoginFailureWindowSeconds=60
+LoginFailureThreshold=5   ; this many bad logins...
+LoginLockoutSeconds=300   ; ...locks that address out for this long
+TokenFailureWindowSeconds=60
+TokenFailureThreshold=30  ; same, for rejected tokens on any other endpoint
+TokenLockoutSeconds=300
+
+Streaming
+EventBusRingCapacity=16384
+MaxConcurrentFileResponses=6   ; simultaneous downloads from /shared/{hash}/content
+```
+
+`MaxConcurrentFileResponses` is how many clients can be pulling file content
+out of amuleapi at once; over it, the extra requests get a `503` telling them
+to retry rather than joining an unbounded queue. It accepts `1` to `256` and
+falls back to `6` for anything else. Six is sized for one mechanical disk that
+aMule is already hashing and uploading from — raise it on an SSD-backed box
+with several devices in the house, lower it on a Pi that downloads to the same
+USB disk it serves from. Note that it is a budget for the whole machine, not
+per client: behind a reverse proxy every request arrives from one address, so
+there is nothing to divide it up by.
+
+`--bind`, `--http-port`, `--host`, `--port` and `--config-dir` override the
+matching settings for one run.
+
+## Web frontend
+
+amuleapi serves a web frontend at `/` when it can find one. Leave `StaticRoot` empty and it looks for an `amuleapi-static` folder in the usual places: inside the macOS `.app` bundle, next to its own executable, at the path it was configured with at build time, and in the platform's shared-data directory. A package install and the Linux static tarball both need no configuration — open `http://127.0.0.1:4713/` and it is there. If nothing is found, `/` answers 404 and the REST API still works; an API-only deployment needs no frontend.
+
+"Next to its own executable" is what makes the Linux static tarball work: it extracts to three binaries and an `amuleapi-static/` folder beside them, and amuleapi finds that folder wherever you put the directory. Keep them together and rename nothing. Note that this is the directory the binary lives in, not the directory you happen to run it from -- starting the daemon from elsewhere changes nothing.
+
+To serve the frontend from a location of your own, or to keep a modified copy separate from the installed one, copy the folder somewhere readable and point `StaticRoot` at it:
+
+```ini
+Server
+StaticRoot=/opt/amule/amuleapi-static
+```
+
+Copy it as a unit and leave the layout alone. The page loads its stylesheet, its modules, the translations and the images by relative path, so moving or renaming anything inside the folder breaks it.
+
+## CORS
+
+Off by default, so only pages served from the same origin can call the API.
+To allow others:
+
+```ini
+Server
+AllowCORS=1
+CorsOriginAllowlist=https://your-app.example.com, http://localhost:5173
+```
+
+The allowlist is comma-separated and matched exactly against the browser's
+`Origin`: scheme, host and port, no path and no wildcards. So
+`https://example.com` does not cover `https://www.example.com`, and two ports
+on one host are two entries.
+
+**List the origins you actually use.** Leaving the allowlist empty still
+accepts any origin, but only for anonymous requests: a cross-origin page
+cannot then send the session cookie or a bearer token, because amuleapi
+withholds `Access-Control-Allow-Credentials` on that path. Otherwise any site
+your browser visits could call the API as you. A web frontend that logs in
+needs its origin listed.
+
+## What you get
+
+Everything under `/api/v1/`, with full details in
+`docs/api/REFERENCE.md`(api/REFERENCE.md):
+
+- **Downloads** — the queue: add, pause, cancel, clear completed, plus
+  comments, filenames and alternate sources.
+- **Shared files** — list, verify, and the shared folders.
+- **Clients** — who you are connected to, and browsing their shared files.
+- **Servers** — the ed2k server list, connecting, and refreshing it.
+- **Network** — connect and disconnect ed2k and Kad.
+- **Search** — start a search, read results, download one.
+- **Categories**, **preferences**, **logs** and **statistics**.
+
+Lists take `limit`, `offset`, `sort`, `order` and `after` (a keyset anchor for
+paging). `limit` defaults to 100, so a list request returns the first page
+unless it asks for more — see `docs/api/REFERENCE.md`(api/REFERENCE.md). Bulk
+actions report each item's outcome separately rather than one overall result.
+
+`GET /api/v1/events` streams changes as they happen and can resume where it
+left off after a dropped connection — see
+`docs/api/EVENTS.md`(api/EVENTS.md).
+
+## Worth knowing
+
+- **Keep `BindAddress` on `127.0.0.1` unless you need otherwise.** amuleapi
+  starts a thread per event-stream listener, so exposing it directly to a
+  network is not something to do casually. For remote access, put a reverse
+  proxy in front — see above(#reaching-it-from-another-machine).
+- **An admin token can do anything aMule can**, including asking amuled to
+  fetch a server list from a URL you supply. Treat the admin password like
+  the password to the machine.

amule-3.0.1.tar.gz/docs/README.md -> amule-3.1.0.tar.gz/docs/README.md Changed

amule-3.1.0.tar.gz/docs/THIRDPARTY.md Added

@@ -0,0 +1,101 @@
+# Third-party components
+
+aMule binary distributions (AppImage, Flatpak, .deb, macOS bundle, Windows
+installer) include code from third parties under their own permissive
+licenses. This file reproduces the copyright notice and license terms for
+each, as required by their respective binary-distribution clauses. aMule's
+own code is under GPLv2-or-later — see LICENSE.md(../LICENSE.md).
+
+## picojson
+
+JSON parser used by `libwebcommon` (the REST API + SSE auth surface
+shared by amuleapi). License: BSD 2-Clause Simplified.
+
+Upstream: <https://github.com/kazuho/picojson> — version 1.3.0,
+vendored at `src/libwebcommon/picojson.h`(../src/libwebcommon/picojson.h).
+Full license text in
+`src/libwebcommon/picojson.LICENSE`(../src/libwebcommon/picojson.LICENSE).
+
+> Copyright 2009-2010 Cybozu Labs, Inc.
+> Copyright 2011-2014 Kazuho Oku
+> All rights reserved.
+>
+> Redistribution and use in source and binary forms, with or without
+> modification, are permitted provided that the following conditions are met:
+>
+> 1. Redistributions of source code must retain the above copyright notice,
+>    this list of conditions and the following disclaimer.
+>
+> 2. Redistributions in binary form must reproduce the above copyright notice,
+>    this list of conditions and the following disclaimer in the documentation
+>    and/or other materials provided with the distribution.
+>
+> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+> IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+> ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+> LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+> CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+> SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+> INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+> CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+> ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+> POSSIBILITY OF SUCH DAMAGE.
+
+The vendored header is unmodified upstream 1.3.0; the
+`PICOJSON_USE_INT64` toggle is defined at use sites rather than as a
+modification to the header.
+
+The bundled copy is used by default. Distributions may configure with
+`-DUSE_SYSTEM_PICOJSON=ON` to use a system-installed `picojson.h` version
+1.3.0 or newer instead.
+
+## muleunit
+
+Lightweight unit test framework used by the C++ test suite at
+`unittests/tests/`. License: GNU LGPL v2.1.
+
+Source ships at `unittests/muleunit/`(../unittests/muleunit/); full
+license text in
+`unittests/muleunit/license.txt`(../unittests/muleunit/license.txt).
+The framework is statically linked into every test binary but is NOT
+linked into shipped daemon binaries (`amule`, `amuled`, `amulegui`,
+`amuleweb`, `amuleapi`), so the LGPL relinking clause does not constrain
+end-user binary distribution.
+
+## libutp
+
+Micro Transport Protocol (uTP) library, vendored for the forthcoming uTP
+transport. License: MIT.
+
+Upstream: <https://github.com/transmission/libutp> — version 3.4, pinned at
+commit `490874c44a2ecf914404b0a20e043c9755fff47b`, vendored verbatim at
+`src/extern/libutp/`(../src/extern/libutp/). Full license text in
+`src/extern/libutp/LICENSE`(../src/extern/libutp/LICENSE); the pin, the list
+of vendored files and how to verify them against upstream are recorded in
+`src/extern/libutp/AMULE_PROVENANCE.md`(../src/extern/libutp/AMULE_PROVENANCE.md).
+
+> Copyright (c) 2010-2013 BitTorrent, Inc.
+>
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in
+> all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+> THE SOFTWARE.
+
+The snapshot carries no local patches. It is built only with
+`-DENABLE_UTP=YES`, which is OFF by default, and no aMule target links it yet —
+so a default build neither compiles nor ships it, and this notice applies only
+to binaries built with that switch on.

amule-3.0.1.tar.gz/docs/amulesig.md -> amule-3.1.0.tar.gz/docs/amulesig.md Changed

amule-3.1.0.tar.gz/docs/api Added

amule-3.1.0.tar.gz/docs/api/EVENTS.md Added

@@ -0,0 +1,672 @@
+# amuleapi v1 — Server-Sent Events
+
+This document is the contract for the `/api/v1/events` Server-Sent Events stream. For the REST surface see REFERENCE.md(REFERENCE.md). For first-run setup see ../QUICKSTART-AMULEAPI.md(../QUICKSTART-AMULEAPI.md).
+
+Event payloads follow the same machine contract as the REST responses: **English text and C-locale numbers**, independent of the `amuleapi`/`amuled` `--locale` (see Localization and number formatting(REFERENCE.md#localization-and-number-formatting)). The same out-of-scope carve-outs apply (log line content and user/external data are not English-normalized).
+
+## Why SSE
+
+Polling `/api/v1/downloads` every second for a few thousand transfers is a multi-MB-per-tick conversation that the ETag cache helps with but can't eliminate — even a 304 still costs the round trip. SSE lets the daemon push only the deltas the client hasn't seen: a single `download_updated` per transfer per second, against a JSON envelope of a few hundred bytes.
+
+Clients connect once, leave the connection open, and react to typed events as they arrive. The browser EventSource API and `curl -N` both work out of the box.
+
+## Bootstrap: snapshot + stream
+
+REST snapshots and the `/events` stream need a specific call ordering or events that fire between them are silently lost. The right sequence:
+
+1. **Open `/api/v1/events` first** — buffer arrivals, don't apply yet. No `Last-Event-ID` is fine; the cursor anchors on whatever id was newest at handshake time.
+2. **`GET` the REST collections** in parallel. A collection larger than one page needs a **keyset sweep**, not a single `GET` — see below.
+3. **Load, drain, flip** — load each snapshot into the store, drain the buffer in arrival order, then switch to direct-apply, all in one synchronous turn so no event can land between drain and flip.
+
+Buffer-then-replay (rather than merging the snapshot into a live store) is required because of `_removed` events: a snapshot built before the refresher's exclusive lock for a removing tick can still contain the deleted entity, and a merge-style load would `set()` it back over a buffered delete. With buffer-then-replay the snapshot lands first, the buffered `_removed` then clears the stale entry.
+
+```js
+// 1. Open SSE first. One dispatcher per event type, behaviour switched
+//    by a boot flag so we don't have to add-then-remove listeners.
+let booting = true;
+const buffered = ;
+
+function onEvent(ev) {
+  const entry = { type: ev.type, data: JSON.parse(ev.data) };
+  if (booting) buffered.push(entry);
+  else applyEvent(entry);
+}
+
+const EVENT_TYPES = 
+  "download_added", "download_updated", "download_removed",
+  "shared_added",   "shared_updated",   "shared_removed",
+  "client_added",   "client_updated",   "client_removed",
+  "server_added",   "server_updated",   "server_removed",
+  "friend_added",   "friend_updated",   "friend_removed",
+  "status_changed", "log_appended",
+  "search_result_added", "search_result_updated", "search_result_removed",
+  "search_progress", "search_closed",
+  "comments_updated",
+;
+const es = new EventSource("/api/v1/events", { withCredentials: true });
+for (const t of EVENT_TYPES) es.addEventListener(t, onEvent);
+es.addEventListener("resync", () => location.reload()); // simplest recovery
+
+// Page one collection to completion on its identity column (`hash`, `ecid`,
+// ... — see REFERENCE.md). Anchored on `after`, not `offset`, so a row removed
+// mid-sweep cannot slide the window and hide another row. "Why step 2 sweeps"
+// below is why the whole sweep belongs inside step 2.
+async function sweep(collection, key, idField) {
+  const out = ;
+  let after = null;
+  for (;;) {
+    const q = `${collection}?sort=${idField}&limit=500` + (after ? `&after=${after}` : "");
+    const page = (await (await fetch(`/api/v1/${q}`)).json())key;
+    out.push(...page);
+    if (page.length < 500) return out;          // short page == last page
+    after = pagepage.length - 1idField;
+  }
+}
+
+// 2. Pull baseline snapshots in parallel. `limit` defaults to 100, so a list
+//    collection is *swept* page by page; /status is a singleton GET.
+const downloads, shared, clients, servers, status = await Promise.all(
+  sweep("downloads", "downloads", "hash"),
+  sweep("shared",    "shared",    "hash"),
+  sweep("clients",   "clients",   "ecid"),
+  sweep("servers",   "servers",   "ecid"),
+  fetch("/api/v1/status").then((r) => r.json()),
+);
+
+// 3. Load each snapshot into the store, drain the buffer, flip the flag —
+//    single synchronous block so no event can fire between drain and flip.
+//    `loadSnapshot` is your store-specific "replace this collection" call,
+//    e.g. `store.set(name, rows)` or `collections.set(name, new Map(...))`.
+//    The swept collections are arrays of rows; /status is its envelope.
+loadSnapshot("downloads", downloads);
+loadSnapshot("shared",    shared);
+loadSnapshot("clients",   clients);
+loadSnapshot("servers",   servers);
+loadSnapshot("status",    status);
+for (const ev of buffered) applyEvent(ev);
+buffered.length = 0;
+booting = false;
+```
+
+### Why step 2 sweeps
+
+`limit` defaults to 100, so a single `GET` per collection would cover only 100 of N rows and the stream would then deliver `*_updated` for rows the client never fetched. The `sweep()` helper in step 2 above pages the whole set instead, anchored on the endpoint's identity column (see REFERENCE.md(REFERENCE.md#paging-a-whole-collection-safely) for which one).
+
+Three rules go with it:
+
+- **The whole sweep happens inside step 2**, before the drain and flip. Events arriving mid-sweep are buffered as they already are, so a row added or removed while the sweep runs is corrected when the buffer replays. This is what makes paging safe, and it is why the stream is opened first.
+- **A `resync` mid-sweep restarts the sweep**, the same way it already invalidates a single-`GET` bootstrap.
+- **Anchor on the identity column, never on a mutable one.** `sort=speed` with `after` is a `400` precisely because the anchor value would move between requests. `offset` paging is not a substitute: a row can be skipped by a *different* row's deletion, and since that row was not itself added, updated or removed, no event repairs it.
+
+Buffer depth is the one bound worth knowing: a 50 000-row collection at `limit=500` is 100 round-trips of buffering, and an overflow raises `resync`, which restarts the sweep.
+
+If the daemon restarts between steps 1 and 2, or the ring buffer overflows on a very busy bus, the synthetic `resync` event tells the client to wipe its cache and re-GET. See Reconnect and Last-Event-ID(#reconnect-and-last-event-id) for the recovery rules — the bootstrap path is the same `GET` sweep, just on a non-fresh cache.
+
+## Connecting
+
+`GET /api/v1/events` opens the stream. Auth runs synchronously BEFORE the worker thread is spawned and before the 32-slot streaming budget is touched, so an unauthenticated client can't tie up a slot for the read-timeout window.
+
+`HEAD` returns the stream's headers and no body. Any other method is `405` with `Allow: GET, HEAD`, like every other route. A trailing slash is stripped first, so `/api/v1/events/` opens the same stream.
+
+```sh
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+  -d '{"password":"adminpass"}' \
+  "http://$HOST/api/v1/auth/login?include_token=true" | jq -r .token)
+
+curl -N -H "Authorization: Bearer $TOKEN" http://$HOST/api/v1/events
+```
+
+Browser:
+
+```js
+const es = new EventSource("/api/v1/events", { withCredentials: true });
+es.addEventListener("download_added",   (e) => { /* JSON.parse(e.data) */ });
+es.addEventListener("download_updated", (e) => { /* ... */ });
+es.addEventListener("download_removed", (e) => { /* ... */ });
+es.addEventListener("comments_updated", (e) => { /* refresh the file's comments view */ });
+es.addEventListener("resync",           (e) => { /* re-GET REST collections */ });
+es.addEventListener("error",            ()  => {
+  // EventSource auto-reconnects with backoff; only surface to UI on terminal failure.
+  if (es.readyState === EventSource.CLOSED) { /* show "disconnected" */ }
+});
+```
+
+The cookie-based auth path is the default for browser EventSource — the HttpOnly cookie set by `/auth/login` is carried automatically. Bearer-auth works for `curl -N` and any HTTP client that lets you set request headers, but the native browser `EventSource` API doesn't, so browser bearer-on-SSE needs a polyfill (e.g. `@microsoft/fetch-event-source`(https://github.com/Azure/fetch-event-source)). For browser SPAs the cookie path is the friction-free choice.
+
+### Auth failure shape
+
+Auth failures land on the SSE endpoint with the same JSON error envelope as the REST surface, not as an event frame. The HTTP status reflects the failure (`401`, `403`, `429`) so well-behaved clients can react before the stream loop starts. Example:
+
+```
+HTTP/1.1 401 Unauthorized
+Content-Type: application/json
+
+{"error":{"code":"unauthorized","message":"missing bearer token or session cookie"}}
+```
+
+### Response headers
+
+```
+HTTP/1.1 200 OK
+Content-Type: text/event-stream
+Cache-Control: no-cache
+X-Accel-Buffering: no
+Connection: keep-alive
+```
+
+`X-Accel-Buffering: no` tells nginx (the most common reverse proxy in front of amuleapi) not to coalesce chunks — without it, the stream stalls until the proxy buffer fills.
+
+### Initial chunk
+
+The first thing the client sees is a comment line:
+
+```
+: connected
+
+```
+
+Comment lines start with `:` and are discarded by SSE parsers. They keep the channel observably alive for browsers whose `onopen` fires only after a real chunk lands.
+
+## Frame format
+
+Every event the daemon emits has the same three-line shape:
+
+```
+event: <name>
+id: <id>
+data: <json>
+
+```
+
+The trailing blank line terminates the frame. `id` is a monotonically increasing `uint64` per amuleapi process — see Reconnect and Last-Event-ID(#reconnect-and-last-event-id) below. `data` is the JSON payload documented per event in Event catalog(#event-catalog). Payloads never contain literal newlines (the diff serializer escapes them) so one `data:` line is always enough.
+
+## Channels and filtering
+
+Every event belongs to a single channel. The full set, prefix-mapped from the event name:
+
+| Channel | Event-name prefix | What changed |
+|---------|-------------------|--------------|
+| `downloads` | `download_*` | Transfers in the active queue |
+| `shared` | `shared_*` | Shared file list |
+| `servers` | `server_*` | Known ed2k servers |
+| `clients` | `client_*` | Clients we're exchanging with |
+| `friends` | `friend_*` | The friends list, and whether each one is online |
+| `status` | `status_*` | Connection state + headline counters |
+| `logs` | `log_*` | amuled log buffer (live tail; server_info is poll-only) |
+| `search` | `search_*` | Result deltas, completion, and the freeing of a search |
+| `chats` | `chat_*` | Client chat messages, and conversations being closed |
+| `comments` | `comments_*` | Comment/rating lists on a download |
+
+By default every channel is delivered. To subscribe to a subset, pass `?channels=` with a comma-separated list:
+
+```sh
+curl -N -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/events?channels=downloads,status"
+```
+
+Unknown channel names in the query are silently ignored — forward-compatibility hedge for future event families. The token cap on the filter set is 32 to bound the memory the parser allocates; passing more is silently truncated.
+
+The `resync` event (see below) is ALWAYS delivered regardless of the filter. Its purpose is to signal a cache invalidation that the client cannot opt out of.
+
+Mirror your filter in the bootstrap: only `GET` the REST collections matching the channels you subscribed to. Pulling a collection whose channel you filtered out leaves that snapshot silently stale — it never receives updates from the stream.
+
+## Heartbeat
+
+If 15 seconds pass with no event written to the wire, the daemon emits:
+
+```
+: keepalive
+
+```
+
+NAT / load balancers / browser EventSource implementations tend to drop idle TCP connections after 30–60 s of silence. The heartbeat keeps the connection warm. The interval is wall-clock-driven (not Drain-timeout-driven) so a busy bus paired with a restrictive `?channels=` filter — where each Drain returns immediately because events are pending but all of them get filtered out — still emits keepalives on schedule.
+
+## Reconnect and Last-Event-ID
+
+EventSource clients (and well-behaved SDK clients) handle the underlying socket dropping by reopening the stream and replaying the `id:` of the last event they processed via the `Last-Event-ID` request header. The daemon's reconnect path uses that to figure out what (if anything) it can resume:
+
+| Scenario | Daemon response | What the client sees |
+|----------|-----------------|----------------------|
+| Header absent or unparseable | Start at the current newest id | New events as they arrive — no replay |
+| `parsed_id + 1 >= OldestId` | Resume from `parsed_id` | First Drain returns the missed range immediately |
+| `parsed_id + 1 < OldestId` (gap) | Emit a synthetic `resync` event with `reason: "gap"`, start at current newest | Client invalidates its cache and re-GETs the REST collections |
+| `parsed_id > NewestId` (stale) | Emit a synthetic `resync` event with `reason: "restart"`, start at current newest | Client invalidates: amuleapi was restarted (ids are per-process and reset to 1 on each launch) |
+
+The ring buffer holds 16 384 events by default — sized to absorb a cold-start tick on a busy node (5 K downloads + 5 K shared can publish ~10 K `*_added` events in a single tick before any subscriber has had a chance to drain). Operators with very heavy workloads can raise the cap via `amuleapi.confStreaming/EventBusRingCapacity`; values below the bus's compile-time floor (16) are clamped up so an operator can't accidentally disable replay. Worst-case memory ≈ capacity × ~1 KB JSON payload. A burst that adds more events than capacity between reconnects triggers the "gap" path.
+
+The same gap detection also runs on the live path: if a publisher floods the bus between two `Drain()` calls and evicts events the current subscriber hadn't seen, the daemon emits the same `resync` frame and restarts the subscriber's cursor at the current newest. This catches the cold-start tick described above when capacity is set lower than the burst size.
+
+### `resync` frame
+
+```
+event: resync
+id: <current newest>
+data: {"reason":"gap","since_id":<old cursor>,"newest_id":<new cursor>}
+
+```
+
+`reason` is one of:
+
+- `"gap"` — events were evicted from the ring before the subscriber read them.
+- `"restart"` — the subscriber's id was past the bus's newest, only possible after a daemon restart.
+- `"idle"` — the daemon stopped diffing because nothing had been subscribed for several ticks, so no collection change is represented on the bus for that period. A cursor from before it cannot be trusted however in-range it looks — and it may well still be in range, because the chat publisher keeps ids moving regardless.
+- `"log_cleared"` — `DELETE /logs/amule`(REFERENCE.md#delete-apiv1logsamule) emptied the log buffer. The lines a `log_appended` subscriber was tracking no longer exist, and the buffer may already have refilled, so the tail cursor is meaningless: re-read `GET /logs/amule`(REFERENCE.md#get-apiv1logsamule). Any client can clear the log, so this reaches subscribers that did not issue the DELETE.
+
+On any of them, the client's correct response is:
+
+1. Wipe its in-memory cache of whatever REST collections it tracked.
+2. Re-GET those collections from the REST surface.
+3. Continue accepting events from the new id.
+
+`gap` and `restart` are synthesised per subscriber, at connect, and carry `since_id` and `newest_id` — both uint64, opaque; the client never has to compute them and should use `id:` on subsequent events.
+
+`idle` is published on the bus instead, by the tick that resumes diffing, and carries only `reason`: it is broadcast rather than addressed at one subscriber, so there is no single cursor to report, and the frame's own `id:` is the new one. The order matters — the tick re-establishes its baseline first and announces afterwards, so a client re-GETs against state that is already current. Announcing at connect instead would leave the changes of the intervening tick in neither the client's GET nor any event.
+
+## Event catalog
+
+Every event the bus publishes. The `_added` and `_updated` payloads are BYTE-FOR-BYTE identical to the matching REST resource's list-item shape — clients receiving a `*_updated` event get the full new state and never need to re-GET. `_removed` carries only the identity field — `hash` for files (`download_removed`, `shared_removed`) and `ecid` for every ECID-keyed collection (`client_removed`, `friend_removed`, `server_removed`) — so the client can drop the cache entry without needing the old object. `search_result_removed` follows the same rule with the `search_id` that scopes it: `{search_id, hash}`. Three events don't fit the collection-delta model: `status_changed` ships a full status envelope (replace, not merge), `log_appended` is an append operation (`{lines}` — push the lines onto the amule log buffer, don't replace), and `search_closed` retires a whole result space rather than one item (`{search_id}` — drop the view, not a row). Branch on the event type in your dispatcher accordingly.
+
+### `downloads` channel
+
+#### `download_added` / `download_updated`
+
+Identical to the REST `/api/v1/downloads`(REFERENCE.md#get-apiv1downloads) list-item shape. `_updated` fires on any field-level change including `completed_bytes`, `transferred_bytes`, `speed_bytes_per_second`, the source counters, `kad_comment_lookup_running`, `hashed_part_count` and `source_ecids` — clients see live progress (and the Kad-notes lookup start → finish edge, and a running hash) without polling.
+
+```json
+{
+  "hash":          "8b54a3c2...",
+  "name":          "ubuntu-26.04-desktop-amd64.iso",
+  "ed2k_link":     "ed2k://|file|ubuntu...|3825..|8b54...|/",
+  "size_bytes":     3825205248,
+  "completed_bytes":     1142000000,
+  "transferred_bytes":     1102450000,
+  "speed_bytes_per_second":     4500000,
+  "status":        "downloading",
+  "priority":      "normal",
+  "priority_auto": true,
+  "category_index": 0,
+  "sources":  { "total": 217, "unavailable": 23, "transferring": 8, "a4af": 4 },
+  "progress": { "percent": 29.85 },
+  "kad_comment_lookup_running": false,
+  "hashed_part_count":  0,
+  "total_part_count":  411,
+  "source_ecids":   1234, 5678 
+}
+```
+
+`source_ecids` is the A4AF membership: the ECIDs of the clients parked on this file while pulling another. It is compared as a list, not through the `sources.a4af` count beside it, so a swap that moves one client out and another in still fires `download_updated`. Join it against the `clients` channel to shade the A4AF rows of a per-file client list without polling `GET /downloads/{hash}/clients`(REFERENCE.md#get-apiv1downloadshashclients--get-apiv1sharedhashclients) — A4AF is a client-to-*file* relation, so it is the one such row attribute the client object cannot carry.
+
+A `POST /downloads/{hash}/comments` flips `kad_comment_lookup_running` to `true`, producing a `download_updated`; when the Kad lookup finishes (typically ~45 s, or sooner) it flips back to `false`, producing another. Retrieved notes are then read via `GET /downloads/{hash}/comments`.
+
+#### `download_removed`
+
+```json
+{ "hash": "8b54a3c2..." }
+```
+
+Only the hash; clients look up and drop the cache entry by hash.
+
+#### `comments_updated`
+
+Fires whenever a download's comment/rating list changes — a Kad note arriving during a `POST /downloads/{hash}/comments` lookup, **or** a connected ed2k source reporting its comment. Payload is the `GET /downloads/{hash}/comments` body plus `hash`, so a client can update its comments view directly from the event without re-fetching. The extra key is there because nothing else in the frame identifies the file:
+
+```json
+{
+  "hash": "8b54a3c2...",
+  "kad_comment_lookup_running": false,
+  "total": 2,
+  "comments": 
+    { "username": "alice",    "filename": "Some.Movie.mkv", "rating": 5, "comment": "great quality" },
+    { "username": "Kad user", "filename": "some_movie.avi", "rating": 4, "comment": "" }
+  
+}
+```
+
+Downloads only, but it rides the `comments` channel, not `downloads` -- `?channels=downloads` alone will not deliver it. It's kept separate from `download_updated` so the per-tick download frame stays lean — comments ride their own event and only when they actually change.
+
+### `shared` channel
+
+#### `shared_added` / `shared_updated`
+
+Identical to the REST `/api/v1/shared`(REFERENCE.md#get-apiv1shared) list-item shape. `_updated` fires on any field-level change including `priority`, `priority_auto`, `uploaded_bytes_session`, `uploaded_bytes_total`, `request_count_*`, `accepted_request_count_*` and `hashed_part_count` — clients see live upload counters (and priority changes, and a running hash) without polling.
+
+```json
+{
+  "hash":             "1a2b3c4d...",
+  "name":             "release-notes.txt",
+  "ed2k_link":        "ed2k://|file|release-notes.txt|3217|1a2b...|/",
+  "size_bytes":       3217,
+  "priority":         "normal",
+  "priority_auto":    false,
+  "sources":          { "complete": 12 },
+  "uploaded_bytes_session":         5242880,
+  "uploaded_bytes_total":           314572800,
+  "request_count_session":          42,
+  "request_count_total":            1837,
+  "accepted_request_count_session": 18,
+  "accepted_request_count_total":   921,
+  "upload_speed_bytes_per_second": 51200,
+  "uploading_client_count": 2,
+  "last_upload_at":   1700000500,
+  "shared_since_at":  1699000000,
+  "hashed_part_count": 0,
+  "media": { "duration_seconds": 5400, "bitrate_kilobits_per_second": 1500, "codec": "H.264", "artist": "", "album": "", "title": "" }
+}
+```
+
+`media` is always present, and `null` on a file with no probed metadata -- the same object `GET /shared`(REFERENCE.md#get-apiv1shared) carries, so the byte-for-byte parity promised above holds for it too. A metadata re-extraction changes it and therefore fires a `shared_updated`, which is the only way a subscriber learns a probe landed: the refresh endpoint answers `202` with no result.
+
+`last_upload_at` and `shared_since_at` are unix seconds and `null` when unknown -- a file that has never uploaded (the common case), or a `known.met` entry written before those fields existed. They are never `0`.
+
+`hashed_part_count` counts the parts hashed so far by a `POST /shared/{hash}/verify`(REFERENCE.md#post-apiv1sharedhashverify) run or an AICH hashset rebuild, and is `0` when nothing is hashing — each advance pushes a `shared_updated`, so a progress bar can be driven straight off the stream. A file that is both downloading and shared reports the same value on both channels.
+
+#### `shared_removed`
+
+```json
+{ "hash": "1a2b3c4d..." }
+```
+
+### `servers` channel
+
+#### `server_added` / `server_updated`
+
+Identical to the REST `/api/v1/servers`(REFERENCE.md#get-apiv1servers) list-item shape.
+
+```json
+{
+  "ecid":        1,
+  "name":        "eMule Server",
+  "description": "Public server",
+  "software_version": "17.15",
+  "address":     "203.0.113.5:4242",
+  "ip":          "203.0.113.5",
+  "country_code": "de",
+  "port":        4242,
+  "user_count":     312000,
+  "max_user_count": 500000,
+  "file_count":     75000000,
+  "soft_file_limit": 1000,
+  "hard_file_limit": 5000,
+  "priority":    "normal",
+  "ping_ms":     42,
+  "failed_count": 0,
+  "permanent":   false,
+  "tcp_flags":   { "bitmask": 1497, "compression": true, "new_tags": true, "unicode": true,
+                   "related_search": true, "type_tag_integer": true, "large_files": true,
+                   "tcp_obfuscation": true },
+  "udp_flags":   { "bitmask": 1851, "get_sources": true, "get_files": true, "new_tags": true,
+                   "unicode": true, "get_sources_v2": true, "large_files": true,
+                   "udp_obfuscation": true, "tcp_obfuscation": true }
+}
+```
+
+A server announces its capabilities and publishing limits only after it answers a UDP status request, which is usually a tick or two after it is added. Until then it reports `0` / all-`false` and a `null` `software_version`, and the reply produces one `server_updated`. Every bit is documented in `GET /api/v1/servers`(REFERENCE.md#get-apiv1servers).
+
+#### `server_removed`
+
+```json
+{ "ecid": 1 }
+```
+
+Servers are ECID-keyed (not hash-keyed) so the removed payload carries the integer ECID.
+
+### `friends` channel
+
+#### `friend_added` / `friend_updated`
+
+Identical to the REST `/api/v1/friends`(REFERENCE.md#get-apiv1friends) list-item shape.
+
+```json
+{
+  "ecid":         12,
+  "name":         "alice",
+  "user_hash":    "a1b2c3d4e5060e708090a0b0c0d06f00",
+  "ip":           "203.0.113.42",
+  "port":         4662,
+  "client_ecid":  4382,
+  "connected":    true,
+  "friend_slot":  false
+}
+```
+
+`ip` and `port` are `null` for a friend with no address, exactly as the `GET /friends`(REFERENCE.md#get-apiv1friends) row emits them - the payloads are key-for-key identical, so a subscriber hydrating from REST never sees a value flip `null` to `""` on the first tick that touches the row.
+
+`friend_updated` fires on any observable change, including a friend coming online or going offline. Two fields move here and are easy to conflate: `client_ecid` is the live client the friend is linked to (or `null`), while `connected` is the separate reachability field — whether a connection to that client is actually up. A friend can carry a `client_ecid` and still be `connected: false`, the ordinary state for one the daemon is trying, or failing, to reach. See `GET /friends`(REFERENCE.md#get-apiv1friends).
+
+One `PATCH /api/v1/friends/{ecid}` can produce **two** `friend_updated` events. Only one friend may hold the friend slot, so granting it to one clears it on whoever held it before, and both records change.
+
+#### `friend_removed`
+
+```json
+{ "ecid": 12 }
+```
+
+### `chats` channel
+
+Backed by the chat session store in `amuled`, which is shared by every client — so these events carry messages sent from the desktop GUI and amulegui too, not only ones this API sent.
+
+#### `chat_message`
+
+One event per message, **inbound and outbound alike**. An outbound one is how a message sent from amulegui, or from another browser tab, reaches every other viewer.
+
+```json
+{
+  "address": "203.0.113.42:4662",
+  "ip":          "203.0.113.42",
+  "port":        4662,
+  "name":        "alice",
+  "client_ecid": 4382,
+  "friend_ecid": 12,
+  "message":     { "id": 91, "direction": "in", "text": "thanks!", "sent_at": 1786652714 }
+}
+```
+
+`message` is identical to a `messages` entry on `GET /api/v1/chats/{address}/messages`(REFERENCE.md#get-apiv1chatsaddressmessages) - including `sent_at`, which is `null` rather than `0` for an unstamped message, exactly as the REST row spells it. `name` uses the same `"IP: <ip> Port: <port>"` fallback the REST list does.
+
+There is no separate "conversation started" event: a conversation that did not exist yet is implied by the first message carrying its `address`.
+
+#### `chat_session_closed`
+
+```json
+{ "address": "203.0.113.42:4662" }
+```
+
+Closing is global — see `DELETE /api/v1/chats/{address}`(REFERENCE.md#delete-apiv1chatsaddress). This fires whichever client closed it, including the desktop GUI, so a viewer should drop the conversation rather than assume it still exists.
+
+### `clients` channel
+
+#### `client_added` / `client_updated`
+
+Identical to the REST `/api/v1/clients`(REFERENCE.md#get-apiv1clients) list-item shape. Speed fields move on every tick during active transfers, so the `clients` channel can be the loudest one on a busy node.
+
+```json
+{
+  "ecid":                   4382,
+  "name":                   "AnonymousPeer",
+  "user_hash":              "1f2e3a...",
+  "ip":                     "203.0.113.42",
+  "country_code":           "de",
+  "port":                   4662,
+  "software":               "emule",
+  "software_version":       "0.50a",
+  "reported_os":                "Linux",
+  "upload_state":           "uploading",
+  "download_state":         "idle",
+  "ident_state":            "identified",
+  "upload_file_hash":       "8b54a3c20fae9e4b9f7e0c2c8c01b6b1",
+  "download_file_hash":     null,
+  "download_file_name":     null,
+  "upload_file_name":       "example-distribution.iso",
+  "uploaded_bytes_session":   22000000,
+  "downloaded_bytes_session": 0,
+  "uploaded_bytes_total":     452000000,
+  "downloaded_bytes_total":   189000000,
+  "upload_speed_bytes_per_second":       22000,
+  "download_speed_bytes_per_second":     0,
+  "upload_queue_position": 0,
+  "remote_queue_position":      0,
+  "upload_queue_score":                  150,
+  "obfuscation_state":     "enabled",
+  "connected":            true,
+  "protocol_extensions":    ,
+  "friend_slot":            false,
+  "friend":                 false,
+  "credit_ratio":           2.34,
+  "part_progress_percent":  75.0
+}
+```
+Carries the same field set as the `/clients`(REFERENCE.md#get-apiv1clients) list row, including `source_origin`, `protocol_extensions`, `parts_offered_count`, `client_mod_name` and `shared_files_browsable`. `friend` is friends-list membership and `friend_slot` is the reserved upload slot: a peer carries either without the other, and `client_updated` fires when either moves. `credit_ratio` is the core's credit modifier, `null` on a daemon that does not send it; it moves as the peer's totals move, so an active peer updates through this event rather than needing a re-GET.
+
+`part_progress_percent` follows the same rule as on the REST row: it is how much of the file we are downloading **from** this client the client already holds, and it is `null` when there is no such file, rather than sent as a negative sentinel. It is derived from `parts_offered_count` and the linked download's part count, so it moves when `parts_offered_count` does, and goes back to `null` if that download goes away. The key is always present -- see REFERENCE.md's unknown-value rule(REFERENCE.md#unknown-values), under which `null` means "no value" and an absent key means "not reported".
+
+It never carries a `parts` bitmap — those are opt-in on the per-file client routes only, being one boolean per chunk per client.
+
+
+`upload_file_hash` (file we're uploading TO this client) and `download_file_hash` (file we're downloading FROM this client) are 32-char MD4 hex hashes — directly resolvable against `/api/v1/downloads/{hash}`(REFERENCE.md#get-apiv1downloadshash) (in-progress) or the corresponding entry in `/api/v1/shared`(REFERENCE.md#get-apiv1shared) by `.hash`. Either field can be empty when the client is queued / idle in that direction. `download_file_name` is the filename the client advertised while we download from them; `upload_file_name` is the partfile they're downloading from us, resolved locally — see `GET /clients`(REFERENCE.md#get-apiv1clients) for details.
+
+#### `client_removed`
+
+```json
+{ "ecid": 4382 }
+```
+
+### `status` channel
+
+#### `status_changed`
+
+Identical to the REST `/api/v1/status`(REFERENCE.md#get-apiv1status) envelope, including the `null` rule on the two disk figures. The payload is the post-change snapshot, not a diff. Fires when any field anywhere in the envelope changes — ed2k state and identity, Kad state, Kad network counters, headline speeds, the overhead rates, the free-space figures, the queue counters, or `ec_connected`.
+
+Rate impact is small: the overhead rates move about as often as the speeds already in that comparison, so they add no wakeups, and the disk figures are resampled only every 10 s by the daemon, so at worst they add one event per 10 s and only when the number actually moved. An idle daemon still emits nothing.
+
+```json
+{
+  "ec_connected": true,
+  "ed2k": {
+    "state":       "connected",
+    "high_id":     true,
+    "user_id":     1234567890,
+    "public_ip":   "210.2.150.73",
+    "connected_since_at": 1751000000,
+    "server_name": "eMule Server",
+    "server_ip":   "203.0.113.5",
+    "server_port": 4242,
+    "network":     { "user_count": 312000, "file_count": 75000000 }
+  },
+  "kad": {
+    "state":      "connected",
+    "firewalled_tcp": false,
+    "connected_since_at": 1751000000,
+    "network":    { "user_count": 5400000, "file_count": 1400000000, "node_count": 2400 }
+  },
+  "speeds": {
+    "download_speed_bytes_per_second": 4500000, "upload_speed_bytes_per_second": 50000,
+    "download_overhead_bytes_per_second": 8700, "upload_overhead_bytes_per_second": 1100
+  },
+  "disk":   { "temp_free_bytes": 48318382080, "incoming_free_bytes": 48318382080 },
+  "queue":  { "waiting_upload_client_count": 12, "download_source_count": 1843 }
+}
+```
+
+The network figures and `firewalled_tcp` are `null` whenever the corresponding network is not `connected`, byte-identical to `GET /status`(REFERENCE.md#get-apiv1status). The event fires on that edge in both directions, so a subscriber sees the flip to and from `null` rather than a value that quietly stops updating. The sample above is the connected case.
+
+Subscribe to this channel alone for a thin "header bar" client that just wants connection state and headline counters.
+
+### `logs` channel
+
+#### `log_appended`
+
+Emitted when the amuled log buffer appends new lines.
+
+```json
+{ "lines": "2026-06-19 11:00:00: line one", "2026-06-19 11:00:01: line two" }
+```
+
+Only the amuled log has a live channel; the server_info buffer has no SSE feed and is fetched by polling `GET /logs/serverinfo`(REFERENCE.md#get-apiv1logsserverinfo). Multiple lines may be batched into a single event when the buffer landed several lines between refresher ticks. The feed is append-only with one exception: `DELETE /logs/amule`(REFERENCE.md#delete-apiv1logsamule) empties the buffer, and rather than a log event that would leave the cursor pointing into a buffer that no longer exists, every subscriber gets a `resync`(#resync-frame) with `reason: "log_cleared"` and re-reads. Any client can clear the log, so this can arrive without your having asked for it. The Bootstrap example(#bootstrap-snapshot--stream) doesn't pull `/logs/amule` — fetch it in step 2 if your UI shows historical log lines, otherwise treat `log_appended` as a live-only feed.
+
+### `search` channel
+
+Driven by the refresher state machine that owns the `POST /search` → completion lifecycle (see REFERENCE.md(REFERENCE.md#search)). Result and progress events only fire while a search is active; the channel is otherwise silent apart from `search_closed`. The Bootstrap example(#bootstrap-snapshot--stream) omits the search endpoints because searches are normally client-initiated post-boot; if your UI persists a "search-in-progress" state across reloads, list them with `GET /search` and fetch `GET /search/{id}/results` in step 2 too.
+
+#### `search_result_added` / `search_result_updated`
+
+`_added` fires per new result that appears in the results map between refresher ticks. `_updated` fires when a result you already hold changes in one of the fields below. Both carry the identical payload, so a subscriber can handle them with one function keyed by `(search_id, hash)`; they are separate names so that a consumer written against the add-only channel keeps its existing behaviour instead of silently acquiring upsert semantics.
+
+**What `_updated` covers, and what it deliberately does not.** It fires on `status`, `already_downloaded`, `comments`, `kad_comment_lookup_running` and `rating` (which aggregates from the comments). Those are the fields that can change *after* a search finishes, which is the window where nothing else tells you: `search_progress` has stopped, so a hit you download from a finished search would otherwise read `already_downloaded: false` forever, and a Kad notes lookup that lands afterwards would be invisible until someone re-read the endpoint.
+
+It does **not** fire on `sources` or `alternate_names`. Those churn on essentially every tick of a running search, and `search_progress`(#search_progress) already fires on every advance there and is the cue to re-read `GET /search/{id}/results`(REFERENCE.md#get-apiv1searchidresults). Pushing them per result would duplicate an existing signal on the noisiest fields on the surface. The identity fields (`hash`, `name`, `size_bytes`, `file_type`, `directory`, `media`) never change for a given result, so there is nothing to push.
+
+```json
+{
+  "search_id": 42,
+  "hash": "0123456789abcdef0123456789abcdef",
+  "name": "ubuntu-24.04-desktop-amd64.iso",
+  "size_bytes": 5765873664,
+  "sources": { "total": 12, "complete": 7 },
+  "already_downloaded": false,
+  "rating": 0,
+  "status": "new",
+  "file_type": "video",
+  "media": { "duration_seconds": 5400, "bitrate_kilobits_per_second": 1500, "codec": "H.264", "artist": "", "album": "", "title": "" },
+  "alternate_names": 
+}
+```
+
+`search_id` routes the result to the search that produced it — amuleapi runs several searches at once (see REFERENCE.md(REFERENCE.md#post-apiv1search)), so demux on it. Key results by `(search_id, hash)`. Aside from the leading `search_id`, the payload is byte-for-byte identical to a `/search/{id}/results` array entry — the two are emitted by the same writer, so the promise holds by construction. That includes `status`, `file_type`, `directory` (the folder inside a browsed client's share, `""` on ordinary hits), `kad_comment_lookup_running`, `comments` and the `alternate_names` grouping array — see REFERENCE.md(REFERENCE.md#get-apiv1searchidresults); `sources` is the nested `{total, complete}` object, `media` — the audio/video metadata object — is present for locally-known/probed hits and `null` otherwise (the one place the unknown-value rule reaches an object rather than a scalar, so test `media === null` before reaching into it), and `alternate_names` holds the same-hash/different-name alternatives (empty for a single-name hit), same as the REST endpoint. Only parent results fire these events — children are folded into their parent's `alternate_names`, never emitted on their own. A change to a child therefore surfaces as a `search_result_updated` for its parent. Each `search_id` is an independent result space — a new `POST /search` starts a fresh one without disturbing the others.
+
+#### `search_result_removed`
+
+```json
+{ "search_id": 42, "hash": "0a1b..." }
+```
+
+A result the daemon no longer serves for this search. Identity-only, like every other `_removed`: drop the row keyed by `(search_id, hash)`; there is nothing to merge and no re-read needed.
+
+Two things produce one. The incremental union merge erases a result the daemon stopped reporting, and the folding pass drops a row that has since become a child of another result, surfacing instead inside that parent's `alternate_names` — so a removal is sometimes a regrouping rather than a disappearance, and the parent's `search_result_updated` carries the new grouping.
+
+This matters most on a **finished** search, which publishes no further `search_progress`(#search_progress): without this event nothing would signal that a row the API has stopped serving is still on screen.
+
+#### `search_progress`
+
+Emitted whenever a search's completion advances and once more on its completion; every frame carries the `search_id` it refers to. Two triggers, both off the daemon's unambiguous `EC_TAG_SEARCH_LIFECYCLE_*` tags (see REFERENCE.md(REFERENCE.md#get-apiv1searchidresults)): the `percent` changing between refresher ticks while the search runs, and the lifecycle flipping to finished (the `state` `running` → `finished` edge). A newly-started search also emits its initial `running` frame. The completion frame is just the terminal `search_progress` with `"state": "finished"` — there is **no** separate `search_finished` event.
+
+```json
+{ "search_id": 42, "state": "running", "percent": 47, "result_count": 88, "type": "kad" }
+```
+
+```json
+{ "search_id": 42, "state": "finished", "percent": 100, "result_count": 153, "type": "local" }
+```
+
+- `search_id` — which search this frame is about.
+- `state` — `"running"` while the search is in flight, `"finished"` on the terminal frame.
+- `percent` — `0..100`, daemon-computed for every search kind. For **global** it is the real server-queue progress. For **Kad**, which has no measurable progress, it is a cosmetic time-ramp derived from the fixed 45 s keyword-search lifetime (capped at 99 until the daemon authoritatively reports completion, then 100); see REFERENCE.md(REFERENCE.md#get-apiv1searchidresults). Treat the Kad value as a liveliness indicator, not an accurate completion estimate.
+- `type` — the originally-requested search type (`"local"` | `"global"` | `"kad"` | `"browse"`).
+- `result_count` — the current results-map size; subscribers can reconcile against any `search_result_added` / `search_result_updated` they may have missed via `GET /search/{id}/results`.
+
+A Kad search hitting its result cap (`SEARCHKEYWORD_TOTAL`, 300) before the 45 s deadline finishes early — the lifecycle flips to `finished` and `percent` jumps straight to 100 ahead of the ramp.
+
+A **browse** started via `POST /clients/{ecid}/shared_files`(REFERENCE.md#post-apiv1clientsecidshared_files) rides this same channel: its `search_id` fires `search_result_added` per file the client returns and `search_progress` frames with `"type": "browse"`, where `percent` tracks the directories received so far. A denied / unreachable / lost browse flips to `finished` with the results it managed to collect (often zero) — same terminal frame as a completed one, no distinct failure event.
+
+#### `search_closed`
+
+The search is **gone**: its slot has been freed and its results are no longer readable. A subscriber holding one view per search should drop that view — the next `GET /api/v1/search/{id}/results` for this id is a `404`.
+
+```json
+{ "search_id": 42 }
+```
+
+Three things produce it: `DELETE /api/v1/search/{id}`(REFERENCE.md#delete-apiv1searchid) from any client, amuleapi evicting an old finished search to stay under its slot cap, and an EC reconnect (which invalidates every cached `search_id` at once).
+
+**What it is not:** a search that amuled evicted from its own 20-entry ring is *retired*, not freed — amuleapi keeps its last-known results for late reads, so that case arrives as a terminal `search_progress` with `"state": "finished"`. Only a vanished slot produces `search_closed`.
+
+### Filter-bypass: `resync`
+
+`resync` has no underscore prefix — it doesn't belong to any of the channel buckets above and is always delivered regardless of `?channels=`, whether it was synthesised for one subscriber or published on the bus. Documented under Reconnect and Last-Event-ID(#reconnect-and-last-event-id).
+
+## Single-publisher invariant
+
+Only the wxApp refresher tick publishes diffs onto the bus. A future inline-refresh-then-publish path from an HTTP-thread mutation would silently race the refresher's diff walk; the daemon's debug build asserts this and the release build hard-aborts. End-user impact: events are strictly ordered by `id`, monotonically, with no interleavings between distinct publishers.
+
+## Shutdown behaviour
+
+When the daemon receives `SIGINT` / `SIGTERM`, the event bus is latched into a shutdown state, every in-flight `Drain()` wakes immediately and returns no events, and every live SSE socket is closed from the I/O thread. A subscriber loop sees the underlying stream go dead, exits the read loop, and reconnects on its normal backoff. EventSource handles this with no application code on the client side.

amule-3.1.0.tar.gz/docs/api/REFERENCE.md Added

@@ -0,0 +1,3331 @@
+# amuleapi v1 — REST reference
+
+This document is the contract for every REST endpoint exposed by the `amuleapi` daemon under the `/api/v1/` prefix. For the SSE stream see EVENTS.md(EVENTS.md). For first-run setup see ../QUICKSTART-AMULEAPI.md(../QUICKSTART-AMULEAPI.md).
+
+The API is versioned in the path. **`/api/v1/` is frozen**: anything that could break a conformant client is deferred to the next version rather than applied in place, and this document is its contract. See Backward compatibility(#backward-compatibility) for what conformant means and what may still change.
+
+## Index
+
+**Cross-cutting concerns**
+- Base URL and transport(#base-url-and-transport)
+- Authentication(#authentication) — Login response shape(#login-response-shape), Role model(#role-model), Rate limiting(#rate-limiting), JWT structure(#jwt-structure)
+- Response model(#response-model) — Success envelope(#success-envelope), Mutation responses(#mutation-responses), Idempotency(#idempotency), IP addresses(#ip-addresses), List pagination and sorting(#list-pagination-and-sorting), Bulk mutations and the `results` envelope(#bulk-mutations-and-the-results-envelope), Error envelope(#error-envelope), ETag and conditional GET(#etag-and-conditional-get), CORS(#cors), Path validation(#path-validation), Request size limits(#request-size-limits)
+- Naming rules(#naming-rules) — the conventions every path, parameter and key follows, and why rates are spelled out
+- Error code catalog(#error-code-catalog)
+- Backward compatibility(#backward-compatibility)
+
+**System**
+- `GET /api/v1/health`(#get-apiv1health) — liveness probe; readiness flags in the body
+- `GET /api/v1/version`(#get-apiv1version) — version negotiation; identity fields are public, the `update` block needs a token
+- `POST /api/v1/version/check`(#post-apiv1versioncheck) — trigger a daemon-side version check
+- `GET /api/v1/status`(#get-apiv1status) — connection state, network state, headline counters
+
+**Authentication**
+- `POST /api/v1/auth/login`(#post-apiv1authlogin) — mint a JWT, optionally return it in the body
+- `POST /api/v1/auth/logout`(#post-apiv1authlogout) — revoke the bearer's `jti`
+- `GET /api/v1/auth/session`(#get-apiv1authsession) — verified bearer's role and expiry
+- `GET /api/v1/auth/passwords`(#get-apiv1authpasswords) — which roles have a password configured
+- `PATCH /api/v1/auth/passwords`(#patch-apiv1authpasswords) — change the admin password, enable/disable guest
+
+**Downloads**
+- `GET /api/v1/downloads`(#get-apiv1downloads) — list active queue
+- `GET /api/v1/downloads/{hash}`(#get-apiv1downloadshash) — detail view; `{hash}` is the 32-char MD4 hex hash
+- `GET /api/v1/downloads/{hash}/comments`(#get-apiv1downloadshashcomments) — per-source comments/ratings list (incl. retrieved Kad notes)
+- `POST /api/v1/downloads/{hash}/comments`(#post-apiv1downloadshashcomments) — trigger an on-demand Kad notes lookup
+- `GET /api/v1/downloads/{hash}/filenames`(#get-apiv1downloadshashfilenames) — source-reported filenames + counts
+- `GET /api/v1/downloads/{hash}/clients`(#get-apiv1downloadshashclients--get-apiv1sharedhashclients) — sources and A4AF rows of one partfile
+- `POST /api/v1/downloads/{hash}/a4af`(#post-apiv1downloadshasha4af) — force A4AF source-swapping
+- `POST /api/v1/downloads`(#post-apiv1downloads) — add ed2k link(s)
+- `PATCH /api/v1/downloads`(#patch-apiv1downloads) — bulk pause / resume / priority / category
+- `DELETE /api/v1/downloads`(#delete-apiv1downloads) — bulk cancel + remove
+- `PATCH /api/v1/downloads/{hash}`(#patch-apiv1downloadshash) — pause / resume / priority / category
+- `DELETE /api/v1/downloads/{hash}`(#delete-apiv1downloadshash) — cancel + remove
+- `POST /api/v1/downloads_clear_completed`(#post-apiv1downloads_clear_completed) — bulk-clear completed staging buffer
+
+**Clients**
+- `GET /api/v1/clients`(#get-apiv1clients) — list clients, optional filter
+- `GET /api/v1/clients/{ecid}`(#get-apiv1clientsecid) — full detail for one client
+- `POST /api/v1/clients/{ecid}/shared_files`(#post-apiv1clientsecidshared_files) — browse a client's shared files ("View Files"), returns a `search_id`
+
+**Shared files**
+- `GET /api/v1/shared`(#get-apiv1shared) — list shared files
+- `GET /api/v1/shared/{hash}`(#get-apiv1sharedhash) — detail view; every list field plus shared-detail fields
+- `GET /api/v1/shared/{hash}/clients`(#get-apiv1downloadshashclients--get-apiv1sharedhashclients) — clients of one shared file
+- `GET /api/v1/shared/{hash}/content`(#get-apiv1sharedhashcontent) — download the shared file's bytes, with `Range` support
+- `POST /api/v1/shared_reload`(#post-apiv1shared_reload) — re-walk shared directories
+- `POST /api/v1/shared/media/refresh`(#post-apiv1sharedmediarefresh) — re-extract media metadata for the whole share
+- `POST /api/v1/shared/{hash}/media/refresh`(#post-apiv1sharedhashmediarefresh) — re-extract it for one file
+- `GET /api/v1/share_directories`(#get-apiv1share_directories) — the configured share roots
+- `PUT /api/v1/share_directories`(#put-apiv1share_directories) — replace the configured share roots
+- `POST /api/v1/share_directories`(#post-apiv1share_directories) — add one share root
+- `DELETE /api/v1/share_directories`(#delete-apiv1share_directories) — remove one share root
+- `POST /api/v1/shared/{hash}/verify`(#post-apiv1sharedhashverify) — re-hash a shared file against its on-disk data
+- `PATCH /api/v1/shared`(#patch-apiv1shared) — bulk change upload priority
+- `PATCH /api/v1/shared/{hash}`(#patch-apiv1sharedhash) — change upload priority
+
+**Servers**
+- `GET /api/v1/servers`(#get-apiv1servers) — list known ed2k servers
+- `POST /api/v1/servers`(#post-apiv1servers) — add server
+- `POST /api/v1/servers/{ecid}/connect`(#post-apiv1serversecidconnect--post-apiv1serversby-addressaddressconnect) — connect to specific server (by ECID, or by `ip:port` under `by-address`)
+- `DELETE /api/v1/servers/{ecid}`(#delete-apiv1serversecid--delete-apiv1serversby-addressaddress) — remove server (by ECID, or by `ip:port` under `by-address`)
+- `PATCH /api/v1/servers/{ecid}`(#patch-apiv1serversecid--patch-apiv1serversby-addressaddress) — set server priority / static flag (by ECID, or by `ip:port` under `by-address`)
+- `POST /api/v1/servers_update`(#post-apiv1servers_update) — refresh from `server.met` URL
+- `GET /api/v1/friends`(#get-apiv1friends) — list the friends list
+- `POST /api/v1/friends`(#post-apiv1friends) — add a friend, by connected client or by address
+- `DELETE /api/v1/friends/{ecid}`(#delete-apiv1friendsecid) — remove a friend
+- `PATCH /api/v1/friends/{ecid}`(#patch-apiv1friendsecid) — grant or clear the friend slot
+- `POST /api/v1/friends/{ecid}/shared_files`(#post-apiv1friendsecidshared_files) — browse a friend's shared files
+- `GET /api/v1/chats`(#get-apiv1chats) — list chat conversations
+- `GET /api/v1/chats/{address}/messages`(#get-apiv1chatsaddressmessages) — read a conversation's history
+- `POST /api/v1/chats/{address}/messages`(#post-apiv1chatsaddressmessages) — send a message to a client address
+- `DELETE /api/v1/chats/{address}`(#delete-apiv1chatsaddress) — close a conversation
+
+**Categories**
+- `GET /api/v1/categories`(#get-apiv1categories) — list categories
+- `POST /api/v1/categories`(#post-apiv1categories) — create
+- `GET /api/v1/categories/{index}`(#get-apiv1categoriesindex) - read one category
+- `PATCH /api/v1/categories/{index}`(#patch-apiv1categoriesindex) — modify
+- `DELETE /api/v1/categories/{index}`(#delete-apiv1categoriesindex) — remove
+
+**Preferences**
+- `GET /api/v1/preferences`(#get-apiv1preferences) — read all EC-carried preference categories
+- `PATCH /api/v1/preferences`(#patch-apiv1preferences) — update any subset of prefs
+
+**Network control**
+- `POST /api/v1/networks/connect`(#post-apiv1networksconnect) — connect ed2k / kad / both
+- `POST /api/v1/networks/disconnect`(#post-apiv1networksdisconnect) — disconnect ed2k / kad / both
+- `POST /api/v1/kad/bootstrap`(#post-apiv1kadbootstrap) — single-contact Kad bootstrap
+- `POST /api/v1/kad/update`(#post-apiv1kadupdate) — refresh the Kad node list from a `nodes.dat` URL
+- `GET /api/v1/kad`(#get-apiv1kad) — Kad-only status subtree
+
+**IP filter**
+- `POST /api/v1/ipfilter/reload`(#post-apiv1ipfilterreload) — re-read the on-disk IP filter files
+- `POST /api/v1/ipfilter/update`(#post-apiv1ipfilterupdate) — download a fresh `ipfilter.dat` from a URL
+- `POST /api/v1/geoip/update`(#post-apiv1geoipupdate) — download a fresh GeoIP database
+
+**Logs**
+- `GET /api/v1/logs/amule`(#get-apiv1logsamule) — amule log buffer
+- `DELETE /api/v1/logs/amule`(#delete-apiv1logsamule) — clear amule buffer
+- `GET /api/v1/logs/server_info`(#get-apiv1logsserver_info--delete-apiv1logsserver_info) — server-info log buffer
+- `DELETE /api/v1/logs/server_info`(#get-apiv1logsserver_info--delete-apiv1logsserver_info) — clear server-info buffer
+
+**Statistics**
+- `GET /api/v1/stats/tree`(#get-apiv1statstree) — full statistics tree
+- `GET /api/v1/stats/graphs/{graph}`(#get-apiv1statsgraphsgraph) — time-series points (`download_speed`, `upload_speed`, `connections`, `kad_nodes`)
+
+**Search**
+- `GET /api/v1/search`(#get-apiv1search) — enumerate every search amuled currently holds, including ones this session never started
+- `POST /api/v1/search`(#post-apiv1search) — start a search (global / local / kad), returns its `search_id`
+- `GET /api/v1/search/{id}/results`(#get-apiv1searchidresults) — one search's results + progress envelope
+- `POST /api/v1/search/{id}/stop`(#post-apiv1searchidstop) — stop a search, keeping its results
+- `POST /api/v1/search/{id}/more`(#post-apiv1searchidmore) — widen a running Kad search
+- `DELETE /api/v1/search/{id}`(#delete-apiv1searchid) — stop a search and free it
+- `POST /api/v1/search/results/{hash}/download`(#post-apiv1searchresultshashdownload) — promote a result into the download queue
+- `GET /api/v1/search/results/{hash}/comments`(#get-apiv1searchresultshashcomments) — Kad ratings/comments for a result
+- `POST /api/v1/search/results/{hash}/comments`(#post-apiv1searchresultshashcomments) — trigger a Kad notes lookup for a result
+
+**Assets**
+- `GET /flags/{code}.png`(#get-flagscodepng) — country-flag artwork for a `country_code`
+
+## Base URL and transport
+
+`amuleapi` serves HTTP on the address declared in `amuleapi.confServer/Port` (default `4713`). The server is HTTP-only by design — terminate TLS in a reverse proxy (nginx, Caddy, etc.) for any non-loopback deployment. The cookie is deliberately NOT marked `Secure` so the same Set-Cookie works whether the operator runs amuleapi behind TLS or directly. See QUICKSTART for the full bind-vs-listen story.
+
+JSON in, JSON out. Every request body that carries a payload is `Content-Type: application/json`. Every response that carries a payload is `application/json` unless explicitly noted (the SSE endpoint emits `text/event-stream`).
+
+## Authentication
+
+Two carriers, one token. amuleapi mints HS256 JWTs at `/auth/login` and accepts them either as:
+
+- An `Authorization: Bearer <jwt>` header (SDK / curl / server-to-server clients).
+- An HttpOnly session cookie named `amuleapi_token` (browser clients).
+
+If both arrive on the same request, the bearer header wins. The cookie attributes are `HttpOnly; SameSite=Strict; Path=/api/v1`. Cookie lifetime tracks the JWT's `exp` claim (`Max-Age = expires_at - now`).
+
+### Login response shape
+
+The JSON body of `POST /auth/login` deliberately omits the token by default — XSS that can `fetch('/auth/login', ...)` and read the body would defeat the HttpOnly protection. Browser clients work entirely off the Set-Cookie attached to the response. SDK clients that need the token in the body opt in via either:
+
+- `?include_token=true` query string, or
+- `Accept: application/jwt` request header.
+
+The two are equivalent.
+
+| Mode | Body keys | Set-Cookie |
+|------|-----------|------------|
+| Default (cookie) | `role`, `expires_at`, `session_id` | yes |
+| Token opt-in | `token`, `role`, `expires_at`, `session_id` | yes (cookie also goes out so a hybrid client can use either) |
+
+`include_token` adds exactly the one key it names: `session_id` and `expires_at` are unconditional, so a cookie client can identify and expire its own session without asking for a token it will not use.
+
+### Role model
+
+Two roles, each gated by its own password:
+
+- `admin` — full surface, including every mutation (`POST`, `PATCH`, `DELETE`).
+- `guest` — read-only surface. Any `admin`-only endpoint returns `403 forbidden`.
+
+A role is implicitly assigned at login based on which password matched; the verified role is encoded in the JWT and surfaced on `/auth/session`.
+
+Guest access is on exactly when a guest password is configured — there is no separate switch. Clearing the guest password is how guest access is turned off.
+
+**What `guest` is, and is not.** It is a read-only role for someone you already trust on the network, not a sandbox for a hostile party. A guest reads the whole read surface, and that surface includes things an operator may not think of as public: the daemon's incoming, temp and shared **filesystem paths**; the node's `user_hash`; the configured `proxy_user`; and the raw daemon **log**, which carries peer addresses and file names as they are logged. None of that is a defect - a read-only API that hid the paths it is reading from would be hard to use - but it means guest credentials should be handed out on the same basis as read access to the machine, and a guest password is not a way to expose amuleapi to the open internet safely. If a caller should not see those, do not give them a credential at all.
+
+### Where the passwords live
+
+Both are stored in `${config_dir}/amuleapi-passwords` (mode 0600), each as a salted PBKDF2-HMAC-SHA256 record rather than a reversible digest. That file is the only store; nothing is kept in `amule.conf`.
+
+Four things write it, and all of them mean the same thing by it:
+
+| Entry point | Used by |
+|-------------|---------|
+| `amuleapi --set-admin-pass=` / `--set-guest-pass=` | standalone operator |
+| `PATCH /auth/passwords` | REST clients and the web frontend |
+| aMule → *Preferences → Remote Controls* | monolithic aMule |
+| the same panel in amulegui, pushed to amuled over EC | remote GUI |
+
+A change made through any of them takes effect on the next login without restarting amuleapi.
+
+Because the stored form is not reversible, a configured password can never be read back — only replaced. Every interface therefore treats its password field as write-only: leaving it empty means "keep the current password", and `GET /auth/passwords` reports only *whether* each role is configured.
+
+### Changing a password ends other sessions
+
+Any credential change invalidates every token issued before it, whichever entry point made the change. A token whose `iat` predates the credential file's modification time is rejected with `401 unauthorized` (`credentials changed; please sign in again`).
+
+This is what makes rotating a leaked password effective: without it, whoever held the old password would stay signed in for up to the full token lifetime. `PATCH /auth/passwords` issues the caller a replacement token in the same response, so the operator making the change is not signed out by their own request.
+
+### Rate limiting
+
+Two per-IP failure counters, both with sliding-window semantics:
+
+- **Login limiter** — drives `/auth/login`. Defaults are `Auth/LoginFailureWindowSeconds=60`, `LoginFailureThreshold=5`, `LoginLockoutSeconds=300`. Configurable per-deployment.
+- **Generic 401 limiter** counts every rejected token (bad, missing, expired or revoked) on any other auth-protected endpoint. `GET /api/v1/version`(#get-apiv1version) is the one exception: authentication there is optional, so a request that presents no credential at all is not counted — otherwise an anonymous poller of a public endpoint could lock real sessions out. A credential that *is* presented and rejected still counts. Defaults are `Auth/TokenFailureWindowSeconds=60`, `TokenFailureThreshold=30`, `TokenLockoutSeconds=300`. Configurable per-deployment, like the login limiter: this is the one a browser tab left open overnight actually trips, so an operator serving long-lived clients may want it looser.
+
+When the bucket fills, the next request from that IP returns `429 rate_limited` with a `Retry-After: <seconds>` header. The bucket clears when the lockout expires, and individual failures age out of the window on their own.
+
+A successful login does **not** clear the login limiter's bucket. One bucket, keyed by IP, guards both passwords, so clearing it on any success would let a holder of the guest password erase the admin-password failure streak at will and brute-force it without ever arming the lockout. The practical effect is that failed attempts from an IP keep counting for `LoginFailureWindowSeconds` even after a correct login. The generic 401 limiter does clear on success: a valid token is not a guess at another credential.
+
+A polling client must treat its first `401` as terminal for that session and stop sending until it has re-authenticated. Restarting amuleapi invalidates every issued token, so a client that keeps a poll loop and an SSE reconnect running against the old cookie spends the generic limiter's whole budget within seconds and locks its own IP out for five minutes. Retrying a `401` never succeeds — only `POST /auth/login` clears it.
+
+### JWT structure
+
+Header: `{"alg":"HS256","typ":"JWT"}`. Payload: `{"role":"admin"|"guest","iat":<unix>,"exp":<unix>,"jti":"<base64url>"}`. The signing secret is auto-generated as 32 random bytes into `${config_dir}/amuleapi-jwt-secret` on first launch (mode 0600). Delete that file and restart to invalidate every issued token. The `jti` claim drives the server-side revocation list (`/auth/logout`), and the `iat` claim drives the credential-change cutoff described above.
+
+## Response model
+
+### Success envelope
+
+Each endpoint documents its own response shape under the endpoint section. List endpoints wrap their array under the resource plural name (`{"downloads": ...}`, `{"shared": ...}`) so clients can extend the envelope with sibling metadata without breaking JSON-parser pipelines.
+
+### Mutation responses
+
+One rule for what a mutation answers with: **a mutation carries a body only where the body says something the caller could not otherwise know.** A field echoed back out of the request URL or body is not that, and neither is a constant `ok: true` restating the status code.
+
+That resolves to four shapes:
+
+- **`204 No Content`** - a completed action with nothing to report. Deletes, `POST /auth/logout`, `POST /search/{id}/stop`.
+- **`202 Accepted`, no body** - the daemon took the request and the outcome arrives elsewhere: on a later read, on the log channel, or on the SSE stream. Connects, URL fetches, re-hash and reload requests, and the creations whose EC op answers success or failure and nothing more (`POST /servers`, `POST /categories`, `POST /friends`) - a body there could only be reconstructed by scanning the snapshot after an inline refresh and hoping the new record had already landed.
+- **`202 Accepted` with the created resource, plus a `Location` header** - the creations where the daemon really does hand one back: `POST /search`(#post-apiv1search) and the two browse routes, which get an `EC_TAG_SEARCH_ID`. The body is the same row `GET /search`(#get-apiv1search) lists.
+- **`200 OK` with the resource** - a `PATCH`, which answers with the state the caller just produced so no re-read is needed to see it.
+
+Three bodies are deliberate exceptions, because each reports something no later read recovers:
+
+- the per-item `results` envelope(#bulk-mutations-and-the-results-envelope), which carries a real outcome per input item;
+- `message` on the connection-control routes, which is the daemon's own explanation of what it did with the request - and only when the daemon actually said something: with nothing to report those routes answer `202` with no body, like the URL fetches beside them, rather than an empty object;
+- `ip` / `port` on `POST /kad/bootstrap`(#post-apiv1kadbootstrap), which reports **which** address the daemon parsed.
+
+### Idempotency
+
+**Every endpoint is idempotent: sending the same request twice leaves the daemon in the state one request would have left it in.** A client library, a proxy or a browser can repeat a request without the caller knowing, so a surface that toggles rather than sets turns an invisible retry into a silent, wrong state change.
+
+In practice that means a mutation names the value it wants rather than the change it wants. `PATCH /downloads/{hash}` with `{"a4af_auto": true}` reaches `true` from either starting point and stays there however many times it arrives; there is deliberately no "flip it" spelling. Where the daemon's own operation was a flip, amuleapi does not paper over it by reading the current value and deciding -- the value goes down to the core, which stores it.
+
+Two things are idempotent without looking it: a `DELETE` of something already gone is a `404` rather than a second delete, and `POST /downloads` with a link already queued is refused per-item in the `results` envelope(#bulk-mutations-and-the-results-envelope). Both report that the request had no effect, which is the point; neither does the work twice.
+
+The exceptions are the endpoints whose whole purpose is to do something again: `POST /shared_reload`, `POST /shared/{hash}/verify`, `POST /shared/media/refresh`, `POST /shared/{hash}/media/refresh`, the `*/update` fetches, and `POST /search/{id}/more`. Asking twice asks for the work twice, which is what the caller meant.
+
+### IP addresses
+
+**Every IP address on this surface, in either direction, is a dotted-quad string.** `"203.0.113.5"`, never `3405803781`, and never a byte-order the caller has to know about. That covers request bodies, query parameters and response fields alike.
+
+The conversion to and from the host-order integers EC carries happens inside amuleapi. `POST /kad/bootstrap` accepts the address only as a dotted quad; a bare integer is rejected (see the endpoint's errors), so there is no byte-order ambiguity about which address reaches the daemon.
+
+### Query parameter validation
+
+One rule, everywhere: **a query parameter the server does not understand is a `400 bad_request`, never a silent default.** That covers both halves of "does not understand": a value that will not parse, and a value outside the parameter's documented range.
+
+- Booleans (`include_parts`) accept `1`/`0`, `true`/`false` and `yes`/`no`. Anything else is a `400`.
+- Counts (`limit`, `offset`, `tail`, `width`, `max_client_versions`, `since_message_id`) and the one duration (`interval_seconds`) accept decimal digits within the range documented for that parameter. A non-numeric value, a negative one, or one outside the range is a `400` naming the bound.
+- An omitted parameter takes the documented default. Only omission does that; an empty value (`?limit=`) is a `400`, not an omission.
+
+Nothing clamps. A count above its cap is a rejection, not a silently reduced page, so a response is never quietly altered from what was asked.
+
+### List pagination and sorting
+
+The list endpoints (`GET /downloads`, `/clients`, `/known_clients`, `/shared`, `/servers`, `/friends`, `/chats`, `/categories`, `/search`, the two per-file client routes, and `/search/{id}/results` — the same set as the sortable-fields table below) accept optional query parameters for server-side windowing and ordering, and always return pagination metadata beside the array:
+
+| Param    | Default          | Notes |
+|----------|------------------|-------|
+| `limit`  | `100`            | Maximum items to return, `0`–`1000000000`. **Omitting it selects the first 100 items, not the whole collection.** Ask for the whole collection explicitly (`limit=1000000000`). Non-integer, negative or above the ceiling → `400 bad_request`. |
+| `offset` | `0`              | Items to skip before the window, counted from the `after` anchor when one is given. Non-integer, negative or above `1000000000` → `400 bad_request`. |
+| `sort`   | *(native order)* | Field to sort by; endpoint-specific (table below). Unknown field → `400 bad_request`. |
+| `order`  | `asc`            | `asc` or `desc`; anything else → `400 bad_request`. |
+| `after`  | *(none)*         | Keyset anchor: return the items ordered **after** this value. Requires a `sort` on that endpoint's identity column (marked in the table below) and `order=asc`; anything else → `400 bad_request`. |
+
+**Why `limit` defaults rather than meaning "everything".** A response size is predictable from the parameter: `limit` bounds every caller, and a caller that wants everything says so explicitly (`limit=1000000000`), which an operator can also see in an access log.
+
+**Why the ceiling is `1000000000` and not the largest integer available.** `offset + limit` has to stay inside a 32-bit `size_t` for the 32-bit builds, and `1e9 + 1e9` is the largest round pair that does. It is also inside JavaScript's exact-integer range (`2^53 - 1`), so a browser client gets back the number it sent.
+
+Sorting is applied to the full filtered set **before** slicing, so pagination is stable across requests (a stable sort — equal keys keep native order). The response adds three sibling keys to the array:
+
+```json
+{ "shared":  ... , "total": 8431, "offset": 100, "limit": 50 }
+```
+
+- `total` — item count after any endpoint-specific filter (e.g. `/clients?activity=`), before slicing.
+- `offset` — the offset applied.
+- `limit` — the page size applied. Never `null`: every response has a real page size, so `{total, offset, limit}` round-trips straight back into the next request. It is not the row count — that is `total`.
+
+### Paging a whole collection safely
+
+`offset` is a **position**, and a position moves when the collection changes size below it. Delete one row from a page already fetched and every later index slides down by one, so the next request starts a row late and that row is never returned — by anything. It was not added, updated or removed, so no SSE event(EVENTS.md) mentions it either, which is what makes the loss last for the session rather than being repaired a tick later.
+
+`after` removes the arithmetic that fails. It anchors on a **value** instead of a count, so nothing that happens to the rows before it can move the window:
+
+```
+GET /api/v1/shared?sort=hash&limit=500
+GET /api/v1/shared?sort=hash&limit=500&after=<hash of the last row returned>
+...repeat until a page comes back shorter than `limit`
+```
+
+Two rules make this correct:
+
+- **Sort on the endpoint's identity column** — the ones marked **id** below. Anchoring on a mutable column is meaningless because the anchor's own value moves between two requests, so the API rejects it rather than silently skipping rows.
+- **Ascending only.** `order=desc` with `after` is a `400`.
+
+Rows added or removed *during* a sweep are not missed: both emit an SSE event, so a client that opened the stream before starting the sweep (which is the documented bootstrap order(EVENTS.md#bootstrap-snapshot--stream)) learns about them from the stream even when the sweep itself does not return them.
+
+**Sortable fields per endpoint:**
+
+| Endpoint              | `sort` values |
+|-----------------------|---------------|
+| `GET /downloads`      | **`hash`** (id), `name`, `size_bytes`, `progress.percent`, `speed_bytes_per_second`, `status` |
+| `GET /clients`        | **`ecid`** (id), `name`, `software`, `uploaded_bytes_total`, `downloaded_bytes_total`, `upload_speed_bytes_per_second`, `download_speed_bytes_per_second` |
+| `GET /downloads/{hash}/clients`<br>`GET /shared/{hash}/clients` | same keys as `/clients`, `after` included |
+| `GET /known_clients`  | **`user_hash`** (id), `name`, `software`, `first_seen_at`, `last_seen_at`, `session_count`, `uploaded_bytes_total`, `downloaded_bytes_total` |
+| `GET /shared`         | **`hash`** (id), `name`, `size_bytes`, `uploaded_bytes_total`, `upload_speed_bytes_per_second` |
+| `GET /servers`        | **`ecid`** (id), `name`, `user_count`, `ping_ms`, `file_count` |
+| `GET /friends`        | **`ecid`** (id), `name`, `connected` |
+| `GET /chats`          | **`client_ecid`** (id), `last_message_at`, `name` |
+| `GET /search/{id}/results` | **`hash`** (id), `name`, `size_bytes`, `sources.total`, `rating`, `directory` |
+| `GET /search`         | **`search_id`** (id), `query`, `started_at`, `result_count` |
+| `GET /categories`     | **`index`** (id), `name` |
+
+The column marked **id** is the endpoint's identity: immutable for the life of the row, and the only one `after` accepts. Note that `ecid` is stable **within a daemon session** only — `CECID` hands ids out from a counter that restarts with the process — which is enough for a bootstrap sweep, since a reconnect invalidates the sweep anyway and triggers a `resync`.
+
+### Bulk mutations and the `results` envelope
+
+Every mutation that operates on more than one item (`POST /downloads`, `PATCH /downloads`, `DELETE /downloads`, `PATCH /shared`, `POST /downloads_clear_completed`, `PUT /share_directories`) reports one entry per input item under a unified `results` array, so a client submitting N items learns the fate of each rather than an aggregate counter or a first-error-only summary:
+
+```json
+{
+  "results": 
+    { "id": "8b54a3c2…", "ok": true },
+    { "id": "0011…",     "ok": false, "error": { "code": "not_found", "message": "no download with that hash" } }
+  
+}
+```
+
+- `id` — the item key: the MD4 hash for `/downloads` and `/shared`, or the submitted ed2k link for `POST /downloads`.
+- `ok` — whether that single item's mutation succeeded.
+- `error` — present only when `ok` is false; same `{code,message}` shape as the top-level error envelope(#error-envelope).
+
+Processing is **best-effort per item** — each item is an independent EC roundtrip, so a mid-batch failure does not abort the rest. The **HTTP status aggregates** the batch:
+
+| Status | Meaning |
+|--------|---------|
+| `200 OK` (`202 Accepted` for the async `POST /downloads` add) | every item succeeded |
+| `207 Multi-Status` | a mix — inspect each `results.ok` |
+| `503 ec_unavailable` | *every* item failed because the daemon was unreachable |
+
+A malformed **request** (missing/empty `hashes`, an invalid patch field) is still a top-level `400 bad_request` and returns the plain error envelope, not `results`. The `hashes` array is capped at 500 entries.
+
+### Unknown values
+
+A field whose value is not known is `null`, not a sentinel. `remaining_seconds` is `null` rather than `-1` when there is no ETA to compute; `last_upload_at`, `shared_since_at` and `last_seen_complete_at` are `null` rather than `0` when a file has never uploaded, has never been seen complete, or its `known.met` entry predates the field. On a client row, `parts_offered_count` is `null` when that client has not reported its part map -- distinct from `0`, which is a real answer and what a fresh source looks like -- and `remote_queue_position` is `null` when the client's queue is full, which the daemon signals with a `65535` sentinel rather than a position.
+
+A key is **omitted** only where absence itself is the meaning: something the daemon never reported, rather than something known to be absent. `started_at` on `GET /search`(#get-apiv1search) is the example, missing for a search this process did not start, and `result_count` is missing when the daemon is too old to send it, which has to stay distinguishable from a search that found nothing.
+
+So: `null` means "no value", an absent key means "not reported", and neither is ever spelled `0` or `-1`.
+
+This rule covers the whole surface, not just the download and shared objects. These keys are `null` when their value is unknown: `name`, `ip`, `port`, `kad_port`, `country_code`, `software`, `software_version`, `source_origin`, `obfuscation_state`, `first_seen_at` and `session_count` on `GET /known_clients`(#get-apiv1known_clients); `part_progress_percent` and `parts_offered_count` on the client rows and the `client_*` events; `client_ecid` on `GET /search`(#get-apiv1search), `GET /friends`(#get-apiv1friends) and the `friend_*` events; `last_message` on `GET /chats`(#get-apiv1chats); `token`, `label_value` and `extra` on the statistics tree; and `media` everywhere it appears. The address fields follow the same rule: `port` on `GET /friends`(#get-apiv1friends) and the `friend_*` events; `ed2k.public_ip` and `ed2k.server_ip` on `GET /status`(#get-apiv1status); `public_ip` on `GET /kad`(#get-apiv1kad); `server_ip` / `server_port` on `GET /clients/{ecid}`(#get-apiv1clientsecid); `ip` and `port` on `GET /clients`(#get-apiv1clients) and the client detail row (also nulled by the `client_*` events); and `ed2k.server_port` on `GET /status`(#get-apiv1status). The `status_changed` event nulls `ed2k.public_ip`, `ed2k.server_ip` and `ed2k.server_port` to match the REST row. Also `null` when unknown: `kad_port` on `GET /api/v1/clients/{ecid}`(#get-apiv1clientsecid); `last_received_at` on `GET /api/v1/downloads/{hash}`(#get-apiv1downloadshash); `node_id` on `GET /api/v1/kad`(#get-apiv1kad); and `server_name` on `GET /status`(#get-apiv1status) and `GET /clients/{ecid}`(#get-apiv1clientsecid), which `status_changed` nulls too. The client objects follow suit: `name`, `software`, `software_version`, `reported_os`, `download_file_name`, `upload_file_name`, `upload_file_hash`, `download_file_hash`, `obfuscation_state`, `source_origin` and `client_mod_name` on `GET /clients`(#get-apiv1clients), the client detail row and the `client_*` events. And the reachability field: `connected` on `GET /friends`(#get-apiv1friends), `GET /chats`(#get-apiv1chats), `GET /known_clients`(#get-apiv1known_clients) and the client objects, is `null` on a daemon that does not report peer connectivity - unknown, rather than a guessed "offline". One quantity, one key on every resource that carries it (R6).
+
+`media` is the one place this reaches an **object** rather than a scalar, so a client tests `media === null` before reaching into it -- which it had to do regardless, since the object's own fields can be absent.
+
+Five keys stay omitted, because for them absence really is the meaning: `started_at` and `result_count` on `GET /search`(#get-apiv1search) as described above, `key` on a statistics node (absent from a daemon too old to send it), `ratio_session` / `ratio_total` on the statistics ratio node (each absent when the daemon could not compute it), and `parts` under `?include_parts=true`(#get-apiv1downloadshashclients--get-apiv1sharedhashclients) -- there the caller opted in, so the key's absence answers a question they did not ask.
+
+Opting out is not one of them. `parts`, `next_requested_part_index` and `downloading_part_index` are all absent from a client row unless `?include_parts=true` was asked for, but that absence is a property of the request, not a fact about the client, so it is not what the null-versus-absent rule above is about. Under the flag the two index keys are *always* present — `null`, never absent, wherever the index does not apply — which is why only `parts` is in the list above.
+
+### Priority levels
+
+`priority` appears on four resources and accepts three different sets. The differences are deliberate rather than drift, and they reflect what the daemon can actually store:
+
+| Resource | Accepted |
+|---|---|
+| Downloads (`PATCH /downloads`, `PATCH /downloads/{hash}`) | `low`, `normal`, `high`, `auto` |
+| Shared files (`PATCH /shared`, `PATCH /shared/{hash}`) | `very_low`, `low`, `normal`, `high`, `release`, `auto` |
+| Categories (`POST /categories`, `PATCH /categories/{index}`) | `very_low`, `low`, `normal`, `high`, `release`, `auto` |
+| Servers (`PATCH /servers/{ecid}`) | `low`, `normal`, `high` |
+
+`very_low` and `release` are upload-side levels only: the `.part.met` loader clamps anything outside low/normal/high back to normal on restart, so a download pinned to one of them would silently lose it. Categories take the full six-level set on both read and write (see below), even though they apply their priority to member files as a *download* priority. Servers have three levels and no `auto`.
+
+A rejection names the set that endpoint accepts, so sending a wrong value tells you the right ones. Note that a file which is both downloading and shared carries two independent priorities from the two sets, and changing one does not affect the other.
+
+**Categories read and write the same six levels.** A category's `priority` is formatted on read from the same file-priority set as downloads and shared files, so `GET /api/v1/categories` can report `very_low` or `release` -- and `POST` / `PATCH` accept them, so a read-modify-write round-trip cannot fail on a field the client never touched (R9). The narrower four-value set still applies to downloads, whose read side cannot produce the other two.
+
+Reaching it takes a category whose stored priority was not set through this API or the desktop: the desktop's category priority control offers only Low / Normal / High / Auto, and `CDownloadQueue::SetCatPrio` applies whatever it is given as a *download* priority, which is the same four. A hand-edited `amule.conf`, or another client, is what it would take.
+
+The asymmetry is left in place deliberately. Clamping on read would have the API report `high` for a category the daemon holds as `release`, and the client's write-back would then persist that lie; widening the write domain would let the value survive one session and be clamped to normal by the partfile loader on the next restart, which is the silent rewrite the download set refuses those two levels to avoid. Between two ways of quietly changing a user's setting and one documented sentence, the sentence wins.
+
+### Localization and number formatting
+
+The API is a machine contract: **all API text is English and all numbers use the C locale** (a `.` decimal separator, no digit grouping), independent of the `amuleapi`/`amuled` locale or the `--locale` option. Localization is a client concern.
+
+- **Text** — enum-like fields (download status, priorities, upload/connection states) and the `/stats/tree` node label templates cross the wire in English. Strings relayed from amuled (for example `error.message` on an `amuled_rejected` failure, or connect/disconnect `message` fields) are passed through verbatim and are never translated by amuleapi.
+- **Numbers** — every JSON number is C-locale. `/stats/tree` values are raw and typed (seconds, bytes, bytes/second, …) so the client does its own formatting and localization; nothing arrives pre-formatted with a locale's decimal separator.
+
+Explicitly **out of scope** (not English-normalized): `GET /api/v1/logs/amule` content — daemon log lines are gettext-translated at the daemon's locale by nature — and user/external data such as file names, category names and comments, and server names and descriptions.
+
+### Error envelope
+
+Every non-2xx response carries the same shape:
+
+```json
+{
+  "error": {
+    "code": "machine_readable_token",
+    "message": "human-readable explanation"
+  }
+}
+```
+
+`code` is stable across releases; alert on `code`, not on `message`. The catalog at the bottom of this file lists every code emitted by the dispatcher.
+
+### ETag and conditional GET
+
+Every `GET` or `HEAD` that returns `200` carries an `ETag` header. Clients that re-fetch should send `If-None-Match: "<etag>"` and accept `304 Not Modified` (no content, ETag preserved). `If-None-Match` accepts `*`, a comma-separated list, and weak `W/"..."` validators.
+
+The validator is memoized for two collections only, `/downloads` and `/shared`, keyed on the target plus a revision that every writer of those bodies advances. Repeated GETs between changes skip the body hash; everything else on the surface is hashed per request. Eligibility is opt-in rather than exclusion-based, because a resource qualifies only if its body moves solely when the state moves AND is identical for every caller. Anything with its own cache, an append-only mirror, a refresh-on-read, a live daemon roundtrip per request, or a per-caller body is simply not in the set. `/auth/session` is per-caller and is additionally marked `Cache-Control: private, no-store` (see below).
+
+`HEAD` returns the same headers as the equivalent `GET`, including `ETag` and a `Content-Length` describing the body the `GET` would return, and no content -- on every status, not only `200`. The one exception is `GET /api/v1/events`(EVENTS.md): its body is an unbounded chunked stream, so a `HEAD` there reports the stream's headers and no length. Note that this is why `curl -X HEAD` appears to hang or fail: `-X` only changes the method string, leaving curl waiting for a body that a HEAD response correctly never sends. Use `curl --head` (or `-I`).
+
+A validator names one representation, not one URL. When a response is compressed the `ETag` carries a `-gzip` suffix, so the gzipped and identity forms of the same resource never share a validator, and an `If-None-Match` is only a hit against the form the current request would actually receive. A client that stored `"abc123-gzip"` and then re-fetches with `Accept-Encoding: identity` gets a `200` with the identity body, which is the correct answer -- the stored entry does not describe it. Store the validator alongside the encoding you received, which is what an HTTP cache does anyway.
+
+**Caching policy.** Any request that presented credentials -- a bearer token or the session cookie -- is answered `Cache-Control: private` with `Cookie` added to `Vary`. `private` keeps the response out of shared caches, while still letting the client's own cache hold it and revalidate with `If-None-Match`; `no-store` would forbid that too and there would be no stored entry left for the conditional GET above to match. `GET /api/v1/auth/session`(#get-apiv1authsession) is the deliberate exception and is `private, no-store`: it carries the credential itself, which should not be written down anywhere. Requests without credentials are left cacheable. Static assets are the other case. The WebUI shell and its bundles are byte-identical for every caller, so an authenticated request for one is answered exactly as an anonymous request is, and they carry `public, no-cache`. Both tokens do work. `no-cache` means revalidate every time -- not "do not store": the copy stays cached and an unchanged bundle costs one conditional request answered `304`. `public` is what lets a shared cache in front of the daemon keep one copy rather than one per caller: RFC 9111 §3.5 bars a shared cache from reusing a response to a request that carried an `Authorization` header unless the response is marked `public`, `must-revalidate` or `s-maxage`, and `no-cache` is not on that list. The browser WebUI is not the case that engages this -- it authenticates by cookie, which is why the authenticated stamp above adds `Cookie` to `Vary` rather than relying on §3.5 at all. A bearer-token client fetching the same shell is the case that engages it.
+
+There is no freshness lifetime on them because these filenames carry no content hash: `index.html`, `app.js` and `app.css` keep their names across a rebuild, so a `max-age` would let an upgraded daemon keep serving the old shell until the entry expired, and -- since each asset expires on its own clock -- pair a new shell with an old bundle. `must-revalidate` would not prevent that: it governs what a cache may do once an entry is *already* stale (RFC 9111 §5.2.2.2), not whether it may be used while fresh.
+
+The country flags(#get-flagscodepng) take the opposite trade and keep `public, max-age=86400`. That artwork is compiled into the daemon, so it changes only with a new build, and a client list is a page full of `<img>` tags: a day of freshness turns those into cache hits instead of one conditional request per distinct country per reload. The `max-age` is what bounds how long an upgraded daemon can keep serving the old art -- a day, not forever.
+
+Mutations (`POST`/`PATCH`/`DELETE`) and error responses are never ETag-stamped; the body always ships.
+
+### CORS
+
+If `amuleapi.confServer/AllowCORS=1`:
+
+- Every response carries `Vary: Origin`.
+- The origin is echoed in `Access-Control-Allow-Origin` if either the allowlist is empty (any-origin echo) or the request's `Origin` header matches a configured entry.
+- **`Access-Control-Allow-Credentials: true` is sent only for an origin the allowlist names.** With an empty allowlist the echo is `*`-equivalent, and granting credentials there would let any site the user happens to visit call this API with their session cookie and read the replies, which is what the same-origin policy exists to prevent. Anonymous cross-origin reads still work with an empty allowlist; a **credentialed** cross-origin client needs its origin listed in `amuleapi.confServer/CorsOriginAllowlist`: a comma-separated list, entries trimmed, matched by exact string equality against the request's `Origin` header. An origin is a scheme, host and port (`https://app.example.com`, or `http://localhost:5173` in development) with no path and no wildcards, so `https://example.com` does not cover `https://www.example.com` and the two ports of the same host are two entries.
+- Allowed responses carry `Access-Control-Expose-Headers: ETag, Allow, Retry-After` so clients can read the validator, the supported-method list from a `405`, and the back-off hint from a `429` or `503`, from JS.
+- Preflight (`OPTIONS` with `Access-Control-Request-Method`) returns `204` with `Access-Control-Allow-Methods: GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS`, `Access-Control-Allow-Headers: Authorization, Content-Type, If-None-Match, Last-Event-ID`, and `Access-Control-Max-Age: 86400`.
+
+### Path validation
+
+The dispatcher rejects paths containing NUL, encoded NUL (`%00`), encoded `..` (any case of `%2e%2e`), or a literal `..` segment with `400 bad_request` before routing. Defence-in-depth against a future endpoint that admits path captures.
+
+**Trailing slash.** Under `/api/`, one trailing `/` is stripped before routing, so `/api/v1/status/` and `/api/v1/status` are the same request. Exactly one is stripped: `//` is a malformed path rather than a synonym, so `/api/v1/downloads//` does not reach `/api/v1/downloads`. The rule stops at the API prefix: a static asset path is a filesystem path, where a trailing slash means a directory.
+
+**Empty path captures.** A segment standing in for a `{capture}` cannot be empty. Every capture names a resource (a hash, an ECID, an index, an address), so a path that binds one to the empty string matches no route and is `404 not_found`, rather than reaching a handler and being rejected there with whatever status that endpoint happens to use.
+
+### Request size limits
+
+- HTTP header section: hard cap 16 KiB. Exceeding it is `431 headers_too_large`.
+- Request body: hard cap 1 MiB. Exceeding it is `413 payload_too_large`.
+- A request that is not fully sent within 10 s is `408 request_timeout`.
+- JSON nesting: `>32` opening `{` or `` tokens → `400 bad_request`. Applies to every body parser and to the JWT header/payload sections of bearer tokens.
+
+The first three are answered by the transport before any handler runs, and each closes the connection after answering, with `Connection: close` on the response.
+
+## Naming rules
+
+Every path segment, query parameter and JSON key on this surface follows the rules below. They exist so a client can predict a name instead of looking it up, and so a reviewer has something to point at other than taste.
+
+| # | Rule |
+|---|---|
+| **R1** | `snake_case` for every path segment, query parameter and JSON key. |
+| **R2** | **Units live in the name, spelled out.** `_bytes`, `_bytes_per_second`, `_seconds`, `_minutes`, `_ms`, `_percent` (always 0-100). A bare number is only acceptable for a dimensionless count. See the note below on why rates are spelled out rather than abbreviated. |
+| **R3** | **Timestamps are integer unix seconds and end in `_at`.** One representation, not two: no parallel ISO-8601 twin. Formatting is a client concern. |
+| **R4** | **Booleans carry no `is_`/`has_`/`can_` prefix.** A boolean already reads as a predicate: an adjective or past participle (`connected`, `incomplete`, `recursive`), or an `_enabled`/`_supported` suffix on a stateful noun. A boolean is never a field holding a count, a bare command-verb that reads as an imperative, or a reserved word. |
+| **R5** | **Counts end in `_count`** — except inside an object that already names the thing being counted, where the parent carries it (`sources.total`, `sources.transferring`). The pagination envelope keeps `total` for "matching items before the window". |
+| **R6** | **One concept, one key, everywhere.** The same quantity does not get one name on one resource and another on the next. |
+| **R7** | **A `sort` value *is* the response key it orders by**, spelled identically, dotted for nested keys (`sort=sources.total`). No stripped suffixes and no per-endpoint mapping table. |
+| **R8** | **No implementation vocabulary in public names.** EC tag names, C++ member names, aMule config-file section names and on-disk format details stay internal. Protocol terms aMule's own UI shows the user — `ed2k`, `kad`, `a4af`, `ich`, `aich`, `ecid` — stay, and are expanded once here. |
+| **R9** | **A writable field accepts the values the same field returns.** Where a write is really a command it belongs in a differently-named key (`action`), not in the read field's name. |
+| **R10** | **Always emit the key.** An unknown value is `null`, never an omitted key and never a `0`/`-1` sentinel. The few deliberate exceptions are enumerated under Response model(#response-model). |
+| **R11** | **Group by quantity, not by scope.** A sub-object earns its place when it groups *different* quantities (`sources`, `progress`, `media`). One quantity split by time window does not — the window belongs in the key, not in a wrapper. |
+| **R12** | **One word for the remote party: `client`.** `address` is not used in a key, a path or an enum value. `source` is not a synonym: a source is a client *in a role with respect to one file*, so it survives only where that relation is what is being described (`sources.total`, `source_origin`). |
+
+### Why rates are spelled out
+
+A byte rate is `_bytes_per_second`, not `_bps`. The abbreviation was considered and rejected: in networking `bps` means **bits** per second, and every rate on this surface is bytes. The neighbouring fields make that trap concrete rather than theoretical — `GET /downloads/{hash}`(#get-apiv1downloadshash) returns `size_bytes` and `completed_bytes` beside `speed_bytes_per_second`, and `(size_bytes - completed_bytes) / speed` is the most natural thing to compute from the object. Two adjacent, identical-looking fields differing by 8x with nothing on screen to say so is a worse failure than a long name, because a name is visible and a factor of 8 is not.
+
+The same reasoning gives the media bitrate its full spelling. `media.bitrate_kilobits_per_second` really is kilo**bits** — `ParseBitrateKbps` divides ffprobe's bits/second by 1000 — so it is the one quantity on the surface that is not bytes, and the one place `kilo` means 1000 rather than 1024. Abbreviating it would put the surface's only bit-valued rate one character away from its byte-valued ones.
+
+The three bandwidth caps under `connection` are the one place a rate is not per-byte: `max_download_kibibytes_per_second`, `max_upload_kibibytes_per_second` and `upload_slot_min_kibibytes_per_second` carry the KiB/s figure the user types, unconverted, because the core stores and enforces it in those units (`GetMaxUpload() * 1024`). `kibibytes` is spelled out for the same reason every other unit is, and it says 1024 without the reader having to guess which `k` this is.
+
+## Endpoint catalog
+
+The catalog below is grouped by resource. Each entry documents:
+
+- **Method + path**
+- **Auth** — `NONE`, `GUEST` (any authenticated role), or `ADMIN`
+- **Query parameters** if any
+- **Request body schema** for endpoints that consume one
+- **Response status + body**
+- **Error codes the endpoint can emit** beyond the universal `unauthorized` / `forbidden` / `rate_limited` (those are documented in §Response model above and are not repeated per endpoint)
+
+Curl examples use `$HOST` for `127.0.0.1:4713` and `$TOKEN` for a previously-issued bearer.
+
+---
+
+### System
+
+#### `GET /api/v1/health`
+
+**Auth:** `NONE`. A probe has to work before anyone holds a token.
+
+```json
+{ "status": "ok", "ec_connected": true, "snapshot_ready": true }
+```
+
+**Liveness, not readiness.** The status is `200` whenever the HTTP server is answering, so a container, systemd or load-balancer probe never restarts a healthy process just because `amuled` went away. Readiness is in the body instead: `ec_connected` is the live EC link and `snapshot_ready` is whether the first refresher tick has landed. A caller that wants readiness keys on those two fields; a caller that wants liveness keys on the status code.
+
+The handler touches no EC. amuleapi serialises EC through one worker, so a probe that waited on the daemon could block behind an unrelated slow mutation and time out, reporting the service as down when it is merely busy.
+
+`HEAD` is supported. Any other method is `405` with `Allow: GET, HEAD`.
+
+**Conditional requests.** The body is small and changes only when those two flags change, so the usual `ETag` applies and a probe that sends `If-None-Match` will get `304 Not Modified`. That is a healthy answer, not an outage. A checker that treats anything other than `200` as failure should either not send the header or accept `304`.
+
+#### `GET /api/v1/version`
+
+**Auth:** `NONE` for the identity fields, so an unauthenticated caller can negotiate versions. Use `GET /api/v1/health`(#get-apiv1health) for liveness probing rather than this endpoint.
+
+The `update` object is **omitted unless the request is authenticated**: it reports whether this daemon is running an outdated build, which is not something an unauthenticated caller on a deliberately reachable interface should learn. A client showing an "update available" banner is already authenticated when it does. Sending no credential is not an error here — the response is `200` with the identity fields, and it does not count against the generic 401 limiter(#rate-limiting). Sending a *bad* one is also `200` without `update`, but does count.
+
+```sh
+curl -s http://$HOST/api/v1/version
+```
+
+**Response:** `200 OK`
+
+```json
+{
+  "service": "amuleapi",
+  "api_version": "v1",
+  "amuleapi_version": "GIT rev. 3.0.1-773-g500293ba3",
+  "daemon_version": "GIT rev. 3.0.1-773-g500293ba3",
+  "update": {
+    "check_enabled": true,
+    "checked": true,
+    "latest_version": "3.0.1",
+    "available": false,
+    "last_checked_at": 1783675590
+  }
+}
+```
+
+| Field | Meaning |
+| --- | --- |
+| `service` | Always `"amuleapi"`. |
+| `api_version` | REST contract version served on this path (`"v1"`). |
+| `amuleapi_version` | amuleapi's **own** build version. On a tagged release this is the release number (`"3.0.1"`); on a development build it is `"GIT"` followed by the revision (`"GIT rev. 3.0.1-773-g500293ba3"`), because `"GIT"` alone is the same string for every snapshot and identifies nothing. |
+| `daemon_version` | Version of the **connected amuled**, from the EC handshake, in the same spelling as `amuleapi_version` above. Empty string when EC is not (yet) connected, or when the daemon is old enough not to advertise it. Normally equal to `amuleapi_version` (both are built from the same source tree), but they can differ if a mismatched amuleapi is pointed at a different amuled. On development builds the revision makes that comparison meaningful, which bare `"GIT"` could not. |
+| `update` | Update-availability, **relayed from the connected daemon** — amuleapi never contacts GitHub itself. See the sub-table. |
+
+The `update` object:
+
+| Field | Meaning |
+| --- | --- |
+| `check_enabled` | `true` only when the daemon can check **and** is configured to: built with `ENABLE_VERSION_CHECK` **and** its `NewVersionCheck` preference on. `false` for OS-package builds, the preference off, or a pre-3.1 daemon. When `false`, a client should show nothing. |
+| `checked` | `true` once the daemon has completed at least one check this session (so `latest_version` is known). The daemon checks at startup; use `POST /api/v1/version/check` to trigger a fresh one. |
+| `latest_version` | Latest release string (e.g. `"3.0.1"`); `null` when not yet checked or unavailable. |
+| `available` | `true` when a newer release exists, `false` when up to date, `null` when unknown (not yet checked or disabled). |
+| `last_checked_at` | Unix time (seconds) the last check completed; `null` when never checked. Useful because checks are startup-only unless re-triggered. |
+
+#### `POST /api/v1/version/check`
+
+**Auth:** `ADMIN`
+
+Triggers an on-demand version check **on the daemon** (amuleapi does not fetch GitHub itself). Fire-and-forget: the request returns as soon as the daemon accepts it, and the result appears on a subsequent `GET /api/v1/version` once the async check completes. Throttled by the daemon to respect GitHub's rate limit.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" http://$HOST/api/v1/version/check
+```
+
+**Response:** `202 Accepted`, with no body. The check runs asynchronously; the outcome arrives on the `logs` channel and in `GET /api/v1/version`(#get-apiv1version).
+
+**Errors:**
+
+| Status | `error.code` | When |
+| --- | --- | --- |
+| `409` | `version_check_unavailable` | The daemon can't check (`update.check_enabled` is `false`). |
+| `429` | `version_check_throttled` | A check ran too recently; retry shortly. Distinct from the auth limiter's `rate_limited`, which also answers `429` but ends the session. |
+| `503` | `ec_unavailable` | The EC round-trip to amuled failed, or the first snapshot has not landed yet. |
+
+The snapshot gate matters at startup: `version_check_available` defaults to false, so before the first EC tick this route answers `503` (a condition a client can retry) rather than `409 version_check_unavailable`, which would blame the daemon's configuration for amuleapi not having read it yet.
+
+#### `GET /api/v1/status`
+
+**Auth:** `GUEST`
+
+Returns the current connection state, network state, and headline throughput counters.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" http://$HOST/api/v1/status
+```
+
+**Response:** `200 OK`
+
+```json
+{
+  "ec_connected": true,
+  "ed2k": {
+    "state": "connected",
+    "high_id": true,
+    "user_id": 1234567890,
+    "public_ip": "210.2.150.73",
+    "connected_since_at": 1751000000,
+    "server_name": "eMule Server",
+    "server_ip": "203.0.113.5",
+    "server_port": 4242,
+    "network": { "user_count": 312000, "file_count": 75000000 }
+  },
+  "kad": {
+    "state": "connected",
+    "firewalled_tcp": false,
+    "connected_since_at": 1751000000,
+    "network": { "user_count": 5400000, "file_count": 1400000000, "node_count": 2400 }
+  },
+  "speeds": {
+    "download_speed_bytes_per_second": 4500000,
+    "upload_speed_bytes_per_second": 50000,
+    "download_overhead_bytes_per_second": 8700,
+    "upload_overhead_bytes_per_second": 1100
+  },
+  "disk": { "temp_free_bytes": 48318382080, "incoming_free_bytes": 48318382080 },
+  "queue": { "waiting_upload_client_count": 12, "download_source_count": 1843 }
+}
+```
+
+`ec_connected` is `false` while amuleapi can't reach the underlying amuled. Most other endpoints return `503 ec_unavailable` in that state.
+
+`ed2k.connected_since_at` / `kad.connected_since_at` are unix timestamps of the most recent connect, `0` while not connected — gate on `ed2k.state` / `kad.state` rather than trust a `0` timestamp alone.
+
+**Network figures are `null` while their network is down.** `ed2k.network.user_count` / `.file_count`, `kad.network.user_count` / `.file_count` / `.node_count`, and `kad.firewalled_tcp` are all `null` unless the corresponding `state` is `connected`. They are measurements of a network, and there is no measurement when not attached to one -- see Unknown values(#unknown-values). `kad.network.node_count` is this node's own routing-table size, not a network estimate. Sample values above are the connected case.
+
+**`kad.firewalled_tcp` is named for its transport.** It is the TCP half of a pair; `GET /api/v1/kad`(#get-apiv1kad) reports `firewalled_udp` alongside it. The two are independent measurements taken by different mechanisms, not a verdict and a refinement of it. See the `/kad` field table for what each one measures and how their defaults differ.
+
+**Our eD2k identity.** `ed2k.user_id` is the id the connected server assigned us, and `ed2k.high_id` is `true` when it is a HighID — an id `>= 16777216`, the same threshold the client-side `high_id` on `GET /clients/{ecid}`(#get-apiv1clientsecid) uses. A HighID **is** our public IPv4 packed into that integer, which is where `ed2k.public_ip` comes from; a LowID is a small number the server picked for a firewalled client and carries no address, so `public_ip` is `null` there.
+
+While disconnected `user_id` is `0`, `public_ip` is `null` and `high_id` is `false` — so read `high_id` **together with `state`**: `false` means "LowID" only once `state` is `"connected"`, and means "no id yet" otherwise. The transient `0xffffffff` the daemon sends mid-connect is normalized to `0` and never appears.
+
+**`ed2k.user_id` is not the same encoding as a client's `ed2k_user_id`.** `GET /api/v1/clients/{ecid}`(#get-apiv1clientsecid) reports `ed2k_user_id` for a remote client, and the similar name invites the assumption that the two are interchangeable. They are not. Ours is stored exactly as the server sent it and is read least-significant-byte-first to produce `public_ip`; a client's HighID is **byte-swapped** on the way in. A consumer that compares the two values, or feeds one through the other's IP decoder, gets a reversed address. The `>= 16777216` HighID threshold *is* common to both; the byte order is not.
+
+**Overhead is additive.** `speeds.download_overhead_bytes_per_second` / `upload_overhead_bytes_per_second` are protocol and control traffic, counted **separately** from `download_speed_bytes_per_second` / `upload_speed_bytes_per_second` rather than being part of them — the desktop shows them as a second figure in parentheses. Both are `0` when the daemon reports nothing.
+
+**Disk figures may be `null`.** `disk.temp_free_bytes` is free space on the filesystem holding the part files, `disk.incoming_free_bytes` where finished downloads land. Either is `null` when the daemon has no figure — the first seconds after startup, or a directory it cannot stat, such as an unreachable network mount. `null` rather than `0`, because `0` would read as a full disk.
+
+The two are **equal whenever Temp and Incoming share a filesystem**, which is the default layout — that is correct, not a bug. `incoming_free_bytes` describes the **default category's** incoming directory; a category pointed at another filesystem is not covered, because the daemon publishes no per-category figure.
+
+To reproduce the desktop's low-space warning, compare `temp_free_bytes` against the bytes still to write across the queue (`size - completed_bytes` summed over `GET /downloads`(#get-apiv1downloads)), or against the `files.min_free_space_mebibytes` preference when `files.stop_on_low_disk_space` is on. Note that preference is in **MiB** while these fields are bytes.
+
+**Errors:** `503 ec_unavailable` if amuleapi hasn't received its first EC snapshot yet.
+
+---
+
+### Authentication
+
+#### `POST /api/v1/auth/login`
+
+**Auth:** `NONE`
+
+Mints a JWT for the role that matched the supplied password.
+
+**Query parameters:** `?include_token=true` (optional) — also return the token in the body. Equivalent to sending `Accept: application/jwt`.
+
+**Body:**
+
+```json
+{ "password": "string" }
+```
+
+**Default (cookie) request:**
+
+```sh
+curl -i -X POST http://$HOST/api/v1/auth/login \
+  -H 'Content-Type: application/json' \
+  -d '{"password":"adminpass"}'
+```
+
+```
+HTTP/1.1 200 OK
+Set-Cookie: amuleapi_token=eyJhbGciOi...; HttpOnly; SameSite=Strict; Path=/api/v1; Max-Age=86400
+Content-Type: application/json
+
+{"role":"admin","expires_at":1781434800,"session_id":"b3iY9oA1tUW2pK..."}
+```
+
+**Token opt-in request:**
+
+```sh
+curl -s -X POST "http://$HOST/api/v1/auth/login?include_token=true" \
+  -H 'Content-Type: application/json' \
+  -d '{"password":"adminpass"}'
+```
+
+```json
+{
+  "token": "eyJhbGciOi...",
+  "role": "admin",
+  "expires_at": 1781434800,
+  "session_id": "b3iY9oA1tUW2pK..."
+}
+```
+
+`expires_at` is unix seconds, like every other `_at` key on this surface.
+
+**Errors:**
+
+- `400 bad_request` — body missing/non-object/missing `password`/non-string `password`.
+- `401 invalid_credentials` — password didn't match any configured role.
+- `429 rate_limited` — login limiter armed; `Retry-After` set.
+- `503 login_disabled` — no admin and no guest password configured.
+
+#### `POST /api/v1/auth/logout`
+
+**Auth:** `GUEST`
+
+Adds the bearer's `jti` to the server-side revocation list (TTL = JWT's `exp`) and emits a clear-cookie. Idempotent: a token that is already revoked still gets `204` so a double-tap on a logout button doesn't surface a confusing "session expired" toast.
+
+`204 No Content`, no body: the clear-cookie header is the whole result, and an `{"ok": true}` body would only restate the status code.
+
+```sh
+curl -i -X POST -H "Authorization: Bearer $TOKEN" http://$HOST/api/v1/auth/logout
+```
+
+**Response headers:** `Set-Cookie: amuleapi_token=; HttpOnly; SameSite=Strict; Path=/api/v1; Max-Age=0`.
+
+#### `GET /api/v1/auth/session`
+
+**Auth:** `GUEST`
+
+Returns the verified bearer's role and expiry. Useful for SPA bootstrap.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" http://$HOST/api/v1/auth/session
+```
+
+```json
+{
+  "role": "admin",
+  "session_id": "b3iY9oA1tUW2pK...",
+  "expires_at": 1781434800
+}
+```
+
+---
+
+#### `GET /api/v1/auth/passwords`
+
+**Auth:** `ADMIN`
+
+Reports which roles have a password configured. The passwords themselves are stored irreversibly and are never returned.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" http://$HOST/api/v1/auth/passwords
+```
+
+```json
+{
+  "admin_password_set": true,
+  "guest_access_enabled": false
+}
+```
+
+`guest_access_enabled` is simply whether a guest password exists.
+
+---
+
+#### `PATCH /api/v1/auth/passwords`
+
+**Auth:** `ADMIN`
+
+Changes the admin password, and turns guest access on or off or changes its password.
+
+| Field | Type | Meaning |
+|-------|------|---------|
+| `current_password` | string | **Required.** The admin password as it is now. |
+| `admin_password` | string | New admin password. Omit to leave it unchanged. |
+| `guest_password` | string | New guest password. Implies `guest_access_enabled: true` unless that field says otherwise. Omit to leave it unchanged. |
+| `guest_access_enabled` | bool | `false` clears the guest password, turning guest access off. Omit to leave the current state. |
+
+Omitting a field means "leave it alone" — the same rule every other interface follows, and a necessary one, because a client cannot read a stored password back in order to resend it.
+
+**Errors:** `400 bad_request` (body is not an object, a password field is not a string, `current_password` missing or wrong, or nothing to change), `429 rate_limited` (too many failed attempts on this IP), `500 internal_error` (the new credentials could not be written to disk).
+
+`current_password` is required even though the caller already holds an admin token: a stolen token alone should not be enough to lock the real operator out. It is checked against the same per-IP limiter as `/auth/login`, so this is not a softer place to guess passwords.
+
+```sh
+curl -s -X PATCH -H "Authorization: Bearer $TOKEN" \
+    -H 'Content-Type: application/json' \
+    -d '{"current_password":"old-secret","admin_password":"new-secret"}' \
+    "http://$HOST/api/v1/auth/passwords?include_token=true"
+```
+
+```json
+{
+  "admin_password_set": true,
+  "guest_access_enabled": false,
+  "token": "eyJhbGciOiJIUzI1NiIs...",
+  "role": "admin",
+  "expires_at": 1781521200,
+  "session_id": "9pQ2xR7mLk4vTn..."
+}
+```
+
+The response re-issues the caller's session — same shape and same `?include_token=true` / `Accept: application/jwt` opt-in as `/auth/login`, cookie included. Every *other* session is now invalid — unconditionally, which is why the body carries no key for it. Clients that ignore the new token will get `401 unauthorized` on their next request.
+
+**Errors**
+
+| Status | Code | Cause |
+|--------|------|-------|
+| `400` | `bad_request` | no changeable field given; a password field is not a string; `admin_password` empty (the admin role cannot be removed); `guest_password` sent together with `guest_access_enabled: false` |
+| `403` | `invalid_credentials` | `current_password` is not the admin password |
+| `403` | `forbidden` | the token is a guest token |
+| `429` | `rate_limited` | too many failed `current_password` attempts from this IP |
+| `500` | `internal_error` | the credential file could not be written (permissions, full disk); the passwords are unchanged |
+
+---
+
+### Downloads
+
+#### `GET /api/v1/downloads`
+
+**Auth:** `GUEST`
+
+Lists the current transfer queue. Completed entries (status `completed`) are excluded by default — they live in amuled's separate "awaiting clear" list and surfacing them inline confuses queue dashboards.
+
+**Query parameters:**
+
+- `status=active|all|completed` -- which part of the queue to list. Defaults to `active`, which is what is currently transferring; `completed` selects only finished downloads awaiting a clear, and `all` is both. Anything else is a `400`.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" "http://$HOST/api/v1/downloads"
+```
+
+```json
+{
+  "downloads": 
+    {
+      "hash":          "8b54a3c2...",
+      "name":          "ubuntu-26.04-desktop-amd64.iso",
+      "ed2k_link":     "ed2k://|file|ubuntu...|3825..|8b54...|/",
+      "size_bytes":    3825205248,
+      "completed_bytes":     1142000000,
+      "transferred_bytes":     1102450000,
+      "speed_bytes_per_second":     4500000,
+      "status":        "downloading",
+      "priority":      "normal",
+      "priority_auto": true,
+      "category_index": 0,
+      "sources":  { "total": 217, "unavailable": 23, "transferring": 8, "a4af": 4 },
+      "progress": { "percent": 29.85 },
+      "kad_comment_lookup_running": false,
+      "hashed_part_count": 0,
+      "total_part_count": 394,
+      "source_ecids":  1234, 5678 
+    }
+  
+}
+```
+
+`progress.percent` is a float in the range **0-100** (not 0-1), per R2(#naming-rules).
+
+`status` is one of `"downloading"`, `"waiting"`, `"hashing"`, `"allocating"`, `"paused"`, `"stopped"`, `"completing"`, `"completed"`, `"erroneous"`, `"insufficient_disk"` or `"unknown"`. The last three are terminal-ish conditions a client must handle rather than fall through: `"erroneous"` is a failed partfile, `"insufficient_disk"` is one that ran the volume out of space, and `"unknown"` is a status code this version does not recognise. `"stopped"` is a paused file that has also dropped all its sources and reset its Kad source search (set via `PATCH` `action:"stop"`); it is distinct from `"paused"`, which retains its sources.
+
+`priority` is the download priority — one of `"low"`, `"normal"` or `"high"` — and `priority_auto` is `true` when amuled is deriving that level automatically. Downloads never report `very_low` or `release`; those are shared/upload-side levels only. A file that is simultaneously downloading and shared carries two independent priorities: this download priority, and the upload priority reported by `GET /api/v1/shared`(#get-apiv1shared). Changing one does not affect the other.
+
+The list shape omits `progress.parts` to keep large libraries compact. Use the detail endpoint for per-part state.
+
+`kad_comment_lookup_running` is `true` while an on-demand Kad notes lookup is in flight for the file (started by `POST /downloads/{hash}/comments`(#post-apiv1downloadshashcomments)); it flips back to `false` when the lookup finishes. Because it lives on the download object, a client can watch the `download_updated` SSE event for the start → finish transition instead of polling.
+
+`hashed_part_count` is the number of parts hashed so far by a pass running over the file — a `hashing` status, an `AICH`(#post-apiv1sharedhashverify) hashset rebuild — and `0` when nothing is hashing. It is a count of completed parts, not the index of the part in flight, so it runs `0` → `total_part_count`; divide by `total_part_count`, which is on this row, for a percentage. No detail roundtrip is needed for it.
+
+`source_ecids` are the ECIDs of the clients holding this file as an A4AF source — the same array, under the same name, that `POST /downloads/{hash}/a4af`(#post-apiv1downloadshasha4af) returns, and `` when there are none. It is the one thing a per-file client list needs that `GET /api/v1/clients`(#get-apiv1clients) and the `clients` SSE channel cannot say: A4AF is a relation between a client and a *file*, so it does not live on the client object. With it on the download event, a Clients panel driven by the `downloads` and `clients` channels can shade its A4AF rows from the stream instead of polling `GET /downloads/{hash}/clients`(#get-apiv1downloadshashclients--get-apiv1sharedhashclients). Note the name is scoped to A4AF, not to sources at large — the count of *all* sources is `sources.total`.
+
+The SSE `download_added` / `download_updated` event payload matches this object byte-for-byte.
+
+**Errors:** `503 ec_unavailable`.
+
+#### `GET /api/v1/downloads/{hash}`
+
+**Auth:** `GUEST`
+
+Detail view for a single partfile. `{hash}` is the 32-char MD4 hex hash (case-insensitive).
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/downloads/8b54a3c20fae9e4b9f7e0c2c8c01b6b1"
+```
+
+Same envelope as the list item, plus the detail-only fields below (all omitted from the `GET /downloads` list to keep it lean):
+
+| Field | Type | Meaning |
+|---|---|---|
+| `progress.parts` | array | One entry per ~9.28 MiB chunk: `{ "state": string, "sources": int }` — `state` is `complete`/`pending`/`unavailable` -- `complete` when the chunk is done, `pending` when a gap remains and at least one client offers it, `unavailable` when a gap remains and none does -- and `sources` counts clients offering that chunk. |
+| `last_seen_complete_at` | int \| null | Unix ts a complete copy was last seen across sources; `null` when no complete copy has ever been seen, or the daemon does not report it. |
+| `last_received_at` | int \| null | Unix ts the partfile last changed on disk (the daemon's own last-received stamp), `null` when the daemon reports none — it is not a "no byte has arrived yet" flag, since a partfile that has transferred nothing still carries a stamp (see Unknown values(#unknown-values)). |
+| `active_seconds` | int | Seconds spent actively downloading. |
+| `available_part_count` | int | Number of parts available across the current sources. |
+| `remaining_seconds` | int \| null | ETA in seconds, or `null` when stalled or paused (speed ≈ 0) and there is nothing to compute from. |
+| `lost_to_corruption_bytes` | int | Bytes discarded to corruption. |
+| `gained_by_compression_bytes` | int | Bytes saved by on-the-wire compression. |
+| `ich_recovered_packet_count` | int | Packets recovered by **I.C.H.** (Intelligent Corruption Handling), the recovery pass aMule's own UI names. Packets, not bytes -- unlike its two byte-valued neighbours above. |
+| `aich_hash` | string\|null | AICH master hash (hex), or `null` until the hashset exists. |
+| `part_file_name` | string | The partfile's `.part` control-file basename (e.g. `001.part`). **Omitted entirely** once the download has completed (status `completed`, before `clear_completed`): a completed file structurally has no partfile, so the key is absent rather than `null`. Branch on key existence, or read `status`. |
+| `directory` | string | Directory the file lives in on disk — the Temp directory while downloading, the destination directory once completed. |
+| `upload_queue_count` | int | Clients waiting on this file's upload queue. |
+| `my_comment` | string | The user's own comment on this file (`""` if none). Named apart from `comments.comment`, which are *other clients'*. |
+| `my_rating` | int | The user's own rating, `0`–`5` (`0` = unrated). See the rating scale(#get-apiv1downloadshashcomments). |
+| `a4af_auto` | bool | Whether automatic A4AF source-swapping is on for this file. See A4AF(#post-apiv1downloadshasha4af). |
+| `media` | object | Audio/video metadata — see Media metadata(#media-metadata). **`null`** when the file has no probed metadata; the key is always present. |
+
+**Errors:** `400 bad_request` (`{hash}` is not 32 hex characters), `404 not_found` (no partfile with that hash), `503 ec_unavailable`.
+
+##### Media metadata
+
+The `media` object (on both `GET /downloads/{hash}` and `GET /shared/{hash}`) carries the audio/video metadata amuled probed for the file. It is **`null`** when the file has not been probed (a non-media file, or one probing hasn't reached yet) -- the key is always present, so test `media === null` rather than for the key.
+
+```json
+"media": {
+  "duration_seconds": 5400,
+  "bitrate_kilobits_per_second": 1500,
+  "codec": "H.264",
+  "artist": "…",
+  "album": "…",
+  "title": "…"
+}
+```
+
+| Field | Type | Meaning |
+|---|---|---|
+| `duration_seconds` | int | Duration in seconds. |
+| `bitrate_kilobits_per_second` | int | Bitrate (kbps). |
+| `codec` | string | Codec as the interface shows it (e.g. `"H.264"`). A display label, mapped from the FOURCC the file or the remote server advertised; an unmapped codec is passed through as advertised. The desktop renders the same label. |
+| `artist` / `album` / `title` | string | Tag metadata; `""` when the file carries none. |
+
+#### `GET /api/v1/downloads/{hash}/comments`
+
+**Auth:** `GUEST`
+
+The comments and ratings this download's **sources** report for the file (the desktop "Show all comments" list). Downloads-only — a completed/shared file has no live source list.
+
+The list also includes any **Kad community notes** retrieved on demand via `POST` on this same path (see below). A Kad note's `username` is the responding node's IP address when the note carries one, otherwise the placeholder `Kad user`.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/downloads/8b54a3c2…/comments"
+```
+
+```json
+{
+  "total": 2,
+  "kad_comment_lookup_running": false,
+  "comments": 
+    { "username": "alice",    "filename": "Some.Movie.mkv", "rating": 5, "comment": "great quality" },
+    { "username": "Kad user", "filename": "some_movie.avi", "rating": 4, "comment": "" }
+  
+}
+```
+
+`kad_comment_lookup_running` is `true` while an on-demand Kad notes lookup (triggered by the `POST` below) is in flight; poll until it returns to `false` to know the lookup finished. Kad notes appear as ordinary entries whose `username` is the responding node's IP (or `Kad user` when the note carries no IP).
+
+A per-source `rating` of `-1` means the source left a comment but no rating. Rating scale (from the desktop `GetRateString()`):
+
+| value | meaning |
+|---|---|
+| 0 | Not rated |
+| 1 | Invalid / Corrupt / Fake |
+| 2 | Poor |
+| 3 | Fair |
+| 4 | Good |
+| 5 | Excellent |
+
+**Errors:** `400 bad_request` (`{hash}` is not 32 hex characters), `404 not_found` (no download with that hash), `503 ec_unavailable`.
+
+#### `POST /api/v1/downloads/{hash}/comments`
+
+**Auth:** `ADMIN`
+
+Trigger an on-demand **Kad notes** lookup for this download (the desktop "Get from Kad" button). aMule asks the Kad network for community ratings/comments keyed on the file hash. The lookup is **asynchronous** on the daemon (it can take up to ~45 s); this call returns immediately with `202 Accepted`, and the retrieved notes then show up in the `GET` list above. Poll the `GET` endpoint to observe them arrive.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/downloads/8b54a3c2…/comments"
+```
+
+**Response:** `202 Accepted`, with no body. The lookup is asynchronous; results appear on the download's `comments` and via `kad_comment_lookup_running`.
+
+**Errors:** `403 forbidden` (guest token — the lookup makes the daemon do network work, so it is `ADMIN`-only), `404 not_found` (no download with that hash), `503 ec_unavailable`, `400 amuled_rejected` (daemon refused, e.g. Kad not connected).
+
+#### `GET /api/v1/downloads/{hash}/filenames`
+
+**Auth:** `GUEST`
+
+The distinct filenames this download's **sources** report for it, each with how many sources use that name (the desktop "File Names" list). Downloads-only — needs a live source list. Pair it with `PATCH /downloads/{hash}` `{ "name": … }` to implement the desktop "Takeover" flow (pick a source name, then rename).
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/downloads/8b54a3c2…/filenames"
+```
+
+```json
+{
+  "filenames": 
+    { "filename": "Some.Movie.2024.mkv", "source_count": 7 },
+    { "filename": "some_movie.mkv", "source_count": 2 }
+  
+}
+```
+
+**Errors:** `404 not_found` (no download with that hash), `503 ec_unavailable`.
+
+#### `GET /api/v1/downloads/{hash}/clients` / `GET /api/v1/shared/{hash}/clients`
+
+**Auth:** `GUEST`
+
+The clients of one file: sources serving it to us, clients pulling it from us, and — on the downloads side — A4AF sources parked on another file. Replaces the client-side join of the global `/clients` list against `download_file_hash` / `upload_file_hash`, which could never produce the A4AF rows.
+
+Each entry is the `/clients`(#get-apiv1clients) list object plus five keys:
+
+| Key | Meaning |
+|---|---|
+| `role` | which direction this row moves the file: `"downloading_from"` — we pull the file from it (including queued); `"uploading_to"` — it pulls the file from us; `"both"`; `"none"` |
+| `a4af` | `true` for a source parked on another file — the desktop's A4AF row |
+| `parts` | the client's per-part bitmap, **only** when `?include_parts=true` |
+| `next_requested_part_index` | index of the chunk queued next from this client, or `null`; **only** when `?include_parts=true` |
+| `downloading_part_index` | index of the chunk currently in flight from this client, or `null`; **only** when `?include_parts=true` |
+
+`role` and `a4af` are orthogonal: a pure A4AF row is `role: "none"`, `a4af: true`, but a client can be parked on another file *and* be pulling this one from us (`role: "uploading_to"`, `a4af: true`).
+
+`parts` is opt-in because it is one boolean per chunk per client — a multi-TiB file is 100k+ entries each. It is exactly `total_part_count` entries, and it describes the file this row is about: the download bitmap for a `"downloading_from"` row, the upload bitmap for an `"uploading_to"` one. A client the core reports as holding every part comes back all-`true`. A pure A4AF row has no bitmap for this file and omits the key. **`parts` never appears in SSE payloads.**
+
+`next_requested_part_index` and `downloading_part_index` are the two extra states the desktop paints on top of that bitmap — the chunk in flight in amber, the one queued behind it in pale yellow — turning a three-state bar into the desktop's five-state one. Both are `0`-based indices into `parts`, and both ride `include_parts` for the same reason: an index is meaningless without the bitmap it indexes, and a caller that did not ask for `parts` does not know the file's `total_part_count`. Under the flag both keys are always present, `null` rather than omitted whenever the index does not apply, so one query returns one row shape. `null` covers every such case: the client never reported the value, it reported the `0xffff` "nothing pending" sentinel, the index does not address a chunk of this file, the row is not a source for this file at all (`role: "uploading_to"` or a pure A4AF row, whose indices belong to whatever else that client is downloading), or the row carries no `parts` bitmap for the index to point into. `downloading_part_index` carries one further rule: it is `null` unless the client's `download_state` is `"downloading"`, because the daemon reports a stale `0` for a source that is merely connected or queued — treat a number here as "this chunk is arriving right now", which is what makes it safe to paint, and which is why it is named for the present tense rather than for a previous part. Note that `0` is a real chunk index, never a stand-in for unknown — see `Unknown values`(#unknown-values). Neither key ever appears in SSE payloads.
+
+The file's own three-state part view (`complete` / `pending` / `unavailable`) is on `GET /downloads/{hash}`(#get-apiv1downloadshash); combine it with this bitmap and the two indices above to render the desktop's five-state per-source bar.
+
+Both routes accept `limit` / `offset` / `sort` / `order` exactly as `/clients` does. A partfile with at least one completed chunk is both a download and a shared file, and then **both routes return the same body** — they differ only in which collection the hash must belong to, which is what the `404` checks.
+
+```sh
+curl -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/downloads/8b54a3c2…/clients?include_parts=true"
+```
+
+**Errors:** `404 not_found` (no download / no shared file with that hash), `400 bad_request` (bad list params, or an `include_parts` that is not a boolean), `503 ec_unavailable`.
+
+#### `POST /api/v1/downloads/{hash}/a4af`
+
+**Auth:** `ADMIN`
+
+> `POST` only; a `GET` here answers `405`. A4AF sources are rows of `GET /downloads/{hash}/clients`(#get-apiv1downloadshashclients--get-apiv1sharedhashclients), carrying the whole client object rather than a bare ECID, and `a4af_auto` is on the download detail object.
+
+Force A4AF source-swapping for this download. Downloads-only.
+
+**Body:** `{ "action": "<action>", "client_ecid": 1234 }`
+
+| action | Effect |
+|---|---|
+| `swap_this` | Make other files' A4AF sources take over **this** file. |
+| `swap_others` | Release this file's sources to the other files that want them. |
+
+Both move sources one way. To turn automatic A4AF swapping on or off, use `PATCH /downloads/{hash}`(#patch-apiv1downloadshash) with `{"a4af_auto": true|false}` -- the actions here move sources, they do not set that flag.
+
+`client_ecid` is optional and valid **only with `swap_this`**, where it narrows the action from every A4AF source of this file to the single named one — the per-client "Swap to this file" of the desktop client. It must name a client in the current snapshot that is an A4AF source of *this* download; pairing it with `swap_others` is a `400`, because the core has no per-source form of it.
+
+The swap moves the client between two files' source lists, so an SSE subscriber sees `download_updated` for **both** the client's former download and this one, plus `client_updated` for the client itself.
+
+**Response:** `200 OK` — the post-action A4AF view of this download:
+
+```json
+{ "a4af_auto": false, "source_ecids":  1234, 5678  }
+```
+
+`source_ecids` are the ECIDs of the clients holding this file as an A4AF source, joinable against `GET /api/v1/clients`(#get-apiv1clients). The same array, under the same name, rides the download object and its `download_updated` SSE event, so a subscriber does not have to POST here to keep it current. The array is the post-action state, so a `swap_this` naming a single client shows up as that ECID having left it. The same clients appear as rows with `"a4af": true` on `GET /api/v1/downloads/{hash}/clients`(#get-apiv1downloadshashclients--get-apiv1sharedhashclients), which carries the whole client object rather than a bare ECID.
+
+**Errors:** `400 bad_request` (missing or unknown `action`; a non-integer `client_ecid`; `client_ecid` with the wrong action), `400 amuled_rejected` (the daemon refused the swap — most commonly because the client is actively sending data, which it will not be swapped away from), `404 not_found` (no download with that hash, or no client with that ECID), `409 not_a4af_source` (that client is not an A4AF source of this download), `503 ec_unavailable`.
+
+#### `POST /api/v1/downloads`
+
+**Auth:** `ADMIN`
+
+Adds one or more ed2k links to the transfer queue.
+
+**Body:**
+
+```json
+{ "links": "ed2k://|file|a|...|/", "ed2k://|file|b|...|/", "category_index": 0 }
+```
+
+`links` is an array even for one link -- `{"links": "ed2k://|file|a|...|/"}` -- and the response is the per-item `results` envelope either way. `category_index` is optional (defaults to 0).
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  -H 'Content-Type: application/json' \
+  -d '{"links":"ed2k://|file|a|...|/", "ed2k://|file|b|...|/"}' \
+  "http://$HOST/api/v1/downloads"
+```
+
+**Response:** `202 Accepted` (all links accepted — the add is asynchronous: amuled allocates and hashes the partfile before it surfaces in `GET /downloads`, typically within one refresher tick), `207 Multi-Status` (partial), or `503 ec_unavailable` (every link blocked by an EC disconnect). Per-item outcomes use the shared bulk `results` envelope(#bulk-mutations-and-the-results-envelope), keyed by the submitted link:
+
+```json
+{
+  "results": 
+    { "id": "ed2k://|file|a|...|/", "ok": true },
+    { "id": "ed2k://|file|b|...|/", "ok": false,
+      "error": { "code": "amuled_rejected", "message": "malformed ed2k link" } }
+  
+}
+```
+
+**Errors:** `400 bad_request` (malformed body, non-string link, link not starting with `ed2k://`), `503 ec_unavailable`.
+
+#### `PATCH /api/v1/downloads`
+
+**Auth:** `ADMIN`
+
+Bulk pause/resume, priority, or category change over multiple downloads — the same patch applied to every listed hash.
+
+**Body:** `{ "hashes": "<md4>", …, … }` — a non-empty `hashes` array (max 500) plus at least one of the single-item PATCH fields: `action` (`"pause"` | `"resume"` | `"stop"`), `priority` (`low` | `normal` | `high` | `auto`), `category_index` (integer 0–255).
+
+```sh
+curl -s -X PATCH -H "Authorization: Bearer $TOKEN" -H 'Content-Type: application/json' \
+  -d '{"hashes":"8b54a3c2…","0a1b2c3d…","priority":"high"}' "http://$HOST/api/v1/downloads"
+```
+
+**Response:** the bulk `results` envelope(#bulk-mutations-and-the-results-envelope) (`200` all ok / `207` partial / `503`), keyed by hash. Per-item `error.code` is `not_found`, `amuled_rejected`, or `ec_unavailable`.
+
+**Errors:** `400 bad_request` (missing/empty `hashes`, no patch field present, invalid field value), `503 ec_unavailable`.
+
+#### `DELETE /api/v1/downloads`
+
+**Auth:** `ADMIN`
+
+Bulk cancel + remove of active downloads (deletes each `.part`/`.met` from disk). A completed entry is rejected per-item with `download_completed` — clear those via `POST /downloads_clear_completed`.
+
+**Body:** `{ "hashes": "<md4>", … }` (non-empty, max 500).
+
+**Response:** the bulk `results` envelope(#bulk-mutations-and-the-results-envelope), keyed by hash. Per-item `error.code` is `not_found`, `download_completed`, `amuled_rejected`, or `ec_unavailable`.
+
+**Errors:** `400 bad_request` (missing/empty `hashes`), `503 ec_unavailable`.
+
+#### `PATCH /api/v1/downloads/{hash}`
+
+**Auth:** `ADMIN`
+
+Mutates one or more fields of a single partfile. `{hash}` is the 32-char MD4 hex hash (case-insensitive).
+
+**Body:** at least one of:
+
+- `action` — `"pause"`, `"resume"` or `"stop"`. A command, not a state, which is why it is not spelled `status`: the read-side `status` has eleven values and this accepts three of them, in a different tense. `"pause"` halts transfer but keeps the file's sources; `"stop"` additionally drops all known sources and resets the Kad source search (a stopped file must rediscover sources from scratch on resume); `"resume"` clears either state. A stopped file reports `status: "stopped"` in the download object (see `GET /downloads`(#get-apiv1downloads)).
+- `priority` — `"low"` / `"normal"` / `"high"` / `"auto"`. Downloads support only these levels and any other value is a `400`; the reason is that the daemon's `.part.met` loader would clamp it back to `normal` on the next restart. (Shared files support the wider `very_low` … `release` set — see `PATCH /shared/{hash}`(#patch-apiv1sharedhash) and Priority levels(#priority-levels).)
+- `category_index` — uint8
+- `a4af_auto` — bool. Turns automatic A4AF source-swapping on or off for this file. A named value, not a flip: sending `true` twice leaves it `true`. This is the only way to set the flag, because a toggle cannot survive a retry (see Idempotency(#idempotency)).
+- `my_comment` + `my_rating` — set the file's comment (string, ≤ 50 chars) and rating (integer `0`–`5`). Must be sent **together**; only settable when the partfile is also shared (≥ 1 complete chunk), else `409 not_shared`. Primarily a shared-file action — see `PATCH /shared/{hash}`(#patch-apiv1sharedhash).
+- `name` — rename the file (string). Must be non-empty and contain no path separators (`/` or `\`). See the Takeover flow(#get-apiv1downloadshashfilenames).
+
+```sh
+curl -s -X PATCH -H "Authorization: Bearer $TOKEN" \
+  -H 'Content-Type: application/json' \
+  -d '{"action":"pause"}' \
+  "http://$HOST/api/v1/downloads/8b54a3c2..."
+```
+
+**Response:** `200 OK` — the updated download object (full detail envelope including `progress.parts`).
+
+**Errors:** `400 bad_request` (`{hash}` is not 32 hex characters, no recognised field, invalid enum, or `my_comment`/`my_rating` sent alone), `409 not_shared` (comment/rating on a non-shared file), `400 amuled_rejected`, `404 not_found`, `503 ec_unavailable`.
+
+#### `DELETE /api/v1/downloads/{hash}`
+
+**Auth:** `ADMIN`
+
+Cancels an **active** partfile and deletes its on-disk data. `{hash}` is the 32-char MD4 hex hash (case-insensitive). amuled runs `EC_OP_PARTFILE_DELETE` → `CPartFile::Delete()`, which removes the `.part`, `.part.met`, and `.met.bak` files and adds the hash to its `canceledfiles` list (so re-adding the same ed2k link is silently refused until the operator clears that list out-of-band). Completed entries are out of scope; use `POST /downloads_clear_completed`(#post-apiv1downloads_clear_completed) instead.
+
+```sh
+curl -s -X DELETE -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/downloads/8b54a3c2..."
+```
+
+**Response:** `204 No Content`.
+
+**Errors:** `400 bad_request` (`{hash}` is not 32 hex characters), `400 amuled_rejected`, `404 not_found`, `409 download_completed`, `503 ec_unavailable`.
+
+#### `POST /api/v1/downloads_clear_completed`
+
+**Auth:** `ADMIN`
+
+Acks one or more entries in amuled's post-completion notification staging buffer. The on-disk file in the Incoming directory stays in place; this endpoint only clears amuled's "completed transfers awaiting acknowledgement" list. Active partfiles are out of scope; use `DELETE /api/v1/downloads/{hash}`(#delete-apiv1downloadshash) instead.
+
+Two request shapes share this endpoint:
+
+```sh
+# Bulk: no body. Clears every completed entry in one EC roundtrip.
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/downloads_clear_completed"
+
+# Per-entry: clear a single completed entry by hash.
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  -H "Content-Type: application/json" \
+  -d '{"hash": "8b54a3c2..."}' \
+  "http://$HOST/api/v1/downloads_clear_completed"
+```
+
+The response envelope is identical for both shapes:
+
+```json
+{ "results":  { "id": "<md4>", "ok": true }, { "id": "<md4>", "ok": true }  }
+```
+
+One entry per cleared hash, in the shared `results` envelope(#bulk-mutations-and-the-results-envelope). Bulk form returns `200 OK` with an empty `results` array when nothing matches, which is the no-op and stays distinguishable from an amuled rejection (a 4xx with an error envelope). Per-entry form returns `404 not_found` if the hash does not exist and `409 not_completed` if it exists but is not on the completed staging list (an active partfile, where the caller probably wants `DELETE /downloads/{hash}` instead).
+
+**Errors:** `400 amuled_rejected`, `400 bad_request` (malformed body or non-string `hash`), `404 not_found`, `409 not_completed`, `503 ec_unavailable`.
+
+---
+
+### Clients
+
+#### `GET /api/v1/clients`
+
+**Auth:** `GUEST`
+
+Lists the clients amuled is currently exchanging with.
+
+**Query parameters:**
+
+- `activity=uploading` — clients we are currently uploading to (`upload_state == "uploading"`).
+- `activity=downloading` — clients we are currently downloading from (`download_state == "downloading"`).
+- `activity=active` — clients that are either uploading or downloading right now.
+- Default (no `activity`) — every known client, including queued.
+
+The values are spelled the way `upload_state` / `download_state` spell them, so the parameter and the field it selects on read alike. Any other value is a `400 bad_request`.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/clients?activity=active"
+```
+
+```json
+{
+  "clients": 
+    {
+      "ecid": 4382,
+      "name": "AnonymousPeer",
+      "user_hash": "1f2e3a...",
+      "ip": "203.0.113.42",
+      "country_code": "de",
+      "port": 4662,
+      "software": "emule",
+      "software_version": "0.50a",
+      "reported_os": "Linux",
+      "upload_state": "uploading",
+      "download_state": "idle",
+      "ident_state": "identified",
+      "download_file_name": null,
+      "upload_file_name": "example-distribution.iso",
+      "upload_file_hash": "8b54a3c20fae9e4b9f7e0c2c8c01b6b1",
+      "download_file_hash": null,
+      "uploaded_bytes_session": 22000000,
+      "downloaded_bytes_session": 0,
+      "uploaded_bytes_total": 452000000,
+      "downloaded_bytes_total": 189000000,
+      "upload_speed_bytes_per_second": 22000,
+      "download_speed_bytes_per_second": 0,
+      "upload_queue_position": 0,
+      "remote_queue_position": 0,
+      "upload_queue_score": 150,
+      "obfuscation_state": "enabled",
+      "connected": true,
+      "protocol_extensions": ,
+      "friend_slot": false,
+      "friend": false,
+      "credit_ratio": 2.34,
+      "source_origin": "kad",
+      "parts_offered_count": 42,
+      "client_mod_name": null,
+      "shared_files_browsable": false,
+      "part_progress_percent": 87.5
+    }
+  
+}
+```
+
+The last five are on this row and on the `client_added` / `client_updated` SSE payloads as well as the detail view, so a client rendering a client list does not have to fan out a detail request per row. `part_progress_percent` is `null`, not a sentinel, when the client is not a source for anything we are downloading — see the detail section below for what all five mean.
+
+`ecid` identifies the remote *client*, not a file — it's the URL key for `GET /api/v1/clients/{ecid}`(#get-apiv1clientsecid) and the identity carried in `client_removed` SSE payloads. `user_hash` is the client's stable identity *when published* (clients without SecIdent or in their first session don't have one), so `ecid` is the always-populated handle.
+
+`upload_file_hash` / `download_file_hash` are the 32-char MD4 hex hashes of the partfile or shared file the client is currently transferring with — directly resolvable against `/api/v1/downloads/{hash}`(#get-apiv1downloadshash) (in-progress) or the corresponding entry in `/api/v1/shared`(#get-apiv1shared) by `.hash`. Either field is `null` when the client is queued / idle in that direction. `download_file_name` is the filename the client advertised in `OP_REQFILENAMEANSWER` and is populated only while we're actively downloading from them. `upload_file_name` is the partfile the client is downloading **from us**, resolved locally against our own partfile list — present only while we're uploading to them.
+
+`software` and `software_version` are locale-independent, per the API's English-only contract. `software` is one of the tokens in the enumerated-fields table below; `software_version` is a free-form string. A client the daemon could not identify reports `"software": "unknown"` and `"software_version": null` — never a daemon-localized string, since the daemon's own version formatting is gettext-translated and is deliberately not surfaced here. The two differ because `software` is an enum with an `unknown` member to name that case, while `software_version` is free text with no such member, so an unrecorded version is `null` like every other unknown value. `reported_os` is the client's *own* self-reported OS string (raw external data, not normalized by amuled) and is frequently `null`, since most clients don't send it.
+
+`ident_state` is the client's secure-identification (SecIdent) state, one of `"not_available"` (the client does not support SecIdent, or this build has no crypto), `"id_needed"` (its public key is known but the signature exchange has not completed), `"identified"` (verified), `"id_failed"` (signature verification failed), `"bad_guy"` (verified earlier, but currently connecting from a *different* IP than the one it was verified on) or `"unknown"` (state not yet reported for a newly seen client). `"bad_guy"` is also briefly reported for a legitimate client that reconnected after an IP change and has not re-identified yet, so treat it as a hint rather than a verdict.
+
+**Enumerated string fields.** Every client field below carries one of a fixed set of lowercase, locale-independent tokens — the daemon decodes amuled's internal enums server-side so consumers never need the lookup tables. The complete sets:
+
+| Field | Values |
+|---|---|
+| `upload_state` | `uploading`, `queued`, `waiting_callback`, `connecting`, `pending`, `low_to_low_ip`, `banned`, `error`, `idle`, `unknown` |
+| `download_state` | `downloading`, `queued`, `connected`, `connecting`, `waiting_callback`, `waiting_callback_kad`, `requesting_hashset`, `no_needed_parts`, `too_many_connections`, `too_many_connections_kad`, `low_to_low_ip`, `banned`, `error`, `idle`, `remote_queue_full`, `unknown` |
+| `ident_state` | `not_available`, `id_needed`, `identified`, `id_failed`, `bad_guy`, `unknown` |
+| `obfuscation_state` | `undefined`, `enabled`, `supported`, `not_supported`, `disabled`, `unknown` |
+| `software` | `emule`, `cdonkey`, `lxmule`, `amule`, `shareaza`, `emule_plus`, `hydranode`, `mldonkey`, `lphant`, `edonkey_hybrid`, `edonkey`, `old_emule`, `compat`, `unknown` |
+| `source_origin` | `local_server`, `remote_server`, `kad`, `source_exchange`, `passive`, `link`, `source_seeds`, `search_result`, `unknown` |
+
+Every one of them falls back to `"unknown"` for a code the daemon does not map, so a client can treat `"unknown"` as its default branch and never has to handle an unexpected token. Three of them are also nullable on the live client objects: `software`, `obfuscation_state` and `source_origin` are `null` when the daemon never reported the field at all, which is a different thing from reporting a code we could not map. `upload_state`, `download_state` and `ident_state` are never `null` — the daemon always answers those. Note the two distinct sentinels on `obfuscation_state`: `"undefined"` is *the client has not told us yet*, `"unknown"` is *the daemon received a code it does not recognise*. The authoritative mappings are the `Client*Name()` / `SourceOriginName()` functions in `src/webapi/Refresher.cpp`.
+
+`connected` says whether a socket to this peer is up right now. A row existing in this list does not answer that: the daemon holds a client object from the first contact attempt, so a peer it is still trying to reach - or can never reach - appears here with `connected: false`. It is `null` on a daemon that does not report peer connectivity. `GET /friends`(#get-apiv1friends), `GET /chats`(#get-apiv1chats) and `GET /known_clients`(#get-apiv1known_clients) carry the same fact under the same key, so joining any of them against this list does not meet it under a second name.
+
+`friend` is `true` when the peer is in your friends list (`CUpDownClient::IsFriend()`). It is **distinct** from `friend_slot`, the *reserved upload slot*, which can be granted to a peer that is not a friend - a row carries either flag without the other, and a front-end that renders one as the other will mislabel both. Grant and clear the slot through `PATCH /friends/{ecid}`(#patch-apiv1friendsecid); neither flag is writable here. Both read `false` against a daemon predating the EC tags that carry them.
+
+`credit_ratio` is the credit modifier the core computes for this peer from its transfer history (`CClientCredits::GetCreditRatio()`), the value the desktop labels "DL/UP modifier" and both peer lists show as their Ratio column. It runs from `1` to `10`: a peer you have downloaded under 1 MB from reads `1`, and the value climbs with how much you have taken from it relative to what you sent back. It is **not** `downloaded_bytes_total / uploaded_bytes_total` - do not re-derive it, and do not expect the two to agree. `GET /known_clients`(#get-apiv1known_clients) carries the same key computed the same way, so a peer reads the same number online or offline. `null` on a daemon that does not send it, which is not the same as a peer whose history earns exactly `1`.
+
+`protocol_extensions` is the set of protocol extensions the peer claimed in its handshake, as stable tokens: `extended_source_exchange`, `nat_traversal_utp`, `ipv6`, `serving_buddy_pull`, `nat_traversal_quic`. A list rather than one token because a peer claims any combination of them, and tokens rather than the `EC_TAG_CLIENT_MOD_CAPABILITIES` bitfield they arrive in so no consumer has to carry its own copy of aMule's bit meanings. The order is stable. The daemon has already dropped every extension it does not define, so a token here is one aMule names, and an extension aMule does not name is absent rather than unknown. `` means the peer claimed nothing, which is what nearly every peer on the network does — a peer that sent no capability tag and one that sent an all-zero word are the same state on the wire and report the same here. The desktop GUI renders the same set as its *Protocol extensions* row.
+
+It says what the *peer* supports, never what this daemon does: aMule implements none of these extensions yet and advertises none of them back, so the field is recognition only. The bit meanings are wire format shared with eMuleAI and are defined in `src/PeerCapabilities.h`.
+
+`country_code` is the client's ISO 3166-1 alpha-2 country code (lowercase, e.g. `"de"`), resolved server-side from the client IP by the daemon's GeoIP database. It is `null` when GeoIP is disabled or unsupported by the build, or when the IP does not resolve — render the flag and localized country name client-side from the code. The flag image is served by `GET /flags/{code}.png`(#get-flagscodepng); the localized name has no endpoint because the browser already has it (`Intl.DisplayNames` with `{ type: "region" }`).
+
+**Errors:** `400 bad_request` (unknown filter token), `503 ec_unavailable`.
+
+---
+
+#### `GET /api/v1/clients/{ecid}`
+
+**Auth:** `GUEST`
+
+Returns the full detail object for a single client — every field `GET /clients`(#get-apiv1clients) returns for that client, **plus** the detail-only fields below. `{ecid}` is the client's `ecid` (the EC connection id). Bare object, no list envelope.
+
+`ecid`, not `user_hash`, is the resource key: not every client has a hash (unidentified / some LowID / eDonkey clients expose an empty one), a hash is not unique among a client's simultaneous connections, and it is unauthenticated unless the client uses Secure Identification. `ecid` is always present and unique per live connection. Trade-off: `ecid` is reassigned when amuled restarts, so a detail URL is **not** stable across restarts — use the `user_hash` field for a durable reference.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/clients/4382"
+```
+
+```json
+{
+  "ecid": 4382,
+  "name": "AnonymousPeer",
+  "user_hash": "1f2e3a...",
+  "ip": "203.0.113.42",
+  "country_code": "de",
+  "port": 4662,
+  "software": "emule",
+  "software_version": "0.50a",
+  "reported_os": "Linux",
+  "upload_state": "uploading",
+  "download_state": "idle",
+  "ident_state": "identified",
+  "download_file_name": null,
+  "upload_file_hash": "8b54a3c20fae9e4b9f7e0c2c8c01b6b1",
+  "download_file_hash": null,
+  "uploaded_bytes_session": 22000000,
+      "downloaded_bytes_session": 0,
+      "uploaded_bytes_total": 452000000,
+      "downloaded_bytes_total": 189000000,
+  "upload_speed_bytes_per_second": 22000,
+  "download_speed_bytes_per_second": 0,
+  "upload_queue_position": 0,
+  "remote_queue_position": 0,
+  "upload_queue_score": 150,
+  "obfuscation_state": "enabled",
+  "connected": true,
+  "protocol_extensions": ,
+  "friend_slot": false,
+  "friend": false,
+  "credit_ratio": 2.34,
+  "ed2k_user_id": 3232238090,
+  "high_id": true,
+  "server_ip": "203.0.113.9",
+  "server_port": 4242,
+  "server_name": "eD2K Test Server",
+  "kad_port": 4672,
+  "source_origin": "kad",
+  "upload_file_name": "example-distribution.iso",
+  "parts_offered_count": 42,
+  "client_mod_name": null,
+  "shared_files_browsable": false,
+  "part_progress_percent": 87.5
+}
+```
+
+The detail fields mirror the desktop "Client Details" modal. Five of the fields below — `source_origin`, `parts_offered_count`, `client_mod_name`, `shared_files_browsable` and `part_progress_percent` — are **not** detail-only: they are on the `GET /clients`(#get-apiv1clients) row and the SSE payload too, and are described here because this is where the rest of their neighbours live. `ed2k_user_id` is the client's hybrid eD2k id; `high_id` is `true` for a HighID client (id ≥ `16777216`, i.e. `0x1000000`) and `false` for LowID — the same threshold and the same spelling as `ed2k.high_id` on `GET /status`(#get-apiv1status), so the value means the same thing on both ends of the API. `server_ip` / `server_port` / `server_name` describe the eD2k server the client connects through, and all three are `null` together when the server is unknown. `kad_port` is non-zero when the client is reachable on Kad, and `null` when the client has no recorded address at all — it is nulled together with `ip` and `port`, the way `GET /known_clients`(#get-apiv1known_clients) has always nulled the three. `source_origin` is how the client was discovered (values in the enumerated-fields table under `GET /clients`(#get-apiv1clients)). (`upload_file_name`, `friend` and `credit_ratio` are part of the base field set — see `GET /clients`(#get-apiv1clients) above.) `parts_offered_count` is the count of parts the client holds of the linked file, or `null` when the client has not reported a part map (see Unknown values(#unknown-values)); `client_mod_name` is the client's client-mod string (often `null`); `shared_files_browsable` is `true` when the client allows browsing its shared files, and `false` when it forbids it. `part_progress_percent` is the client's completeness of the file we are downloading **from** them (`parts_offered_count` over that file's part count) and is `null` when there is no linked download or the part count is unknown (see Unknown values(#unknown-values)).
+
+**Errors:** `400 bad_request` (`{ecid}` is not a non-negative integer), `404 not_found` (no client with that ecid in the current snapshot), `405 method_not_allowed` (non-GET), `503 ec_unavailable`.
+
+---
+
+#### `POST /api/v1/clients/{ecid}/shared_files`
+
+**Auth:** `ADMIN`
+
+Browse a client's shared file list — the API equivalent of "View Files" in the GUI. `{ecid}` is the client's `ecid`. amuled opens (or reuses) a direct client-to-client connection to that client and asks it to enumerate its shared directories and files.
+
+The browse runs **asynchronously**: the client answers over the network, one directory at a time, and a HighID/reachable client may take seconds while a LowID client needs a server callback or Kad first. So this endpoint does **not** return the files — it returns a `search_id` and the results flow through the **search machinery**, exactly like a query search:
+
+- `GET /api/v1/search/{id}/results` reads the accumulated files as they arrive (standard search-result fields, plus `directory` — the folder each file sits in inside the client's share). The browse also appears in `GET /api/v1/search`(#get-apiv1search) with `type: "browse"` and the browsed client's `client_ecid`.
+- The refresher advances `search_progress` for this `search_id` while the browse is live, and completion arrives as the terminal `search_progress` frame with `"state": "finished"` — when the client's list is complete or the browse fails (denied / client unreachable / connection lost). There is **no** `search_finished` event; a client waiting for one waits forever. A denied or failed browse finishes with zero results, so there is no distinct error event either.
+
+Reusing the search id-space means one poll loop and one SSE stream cover both queries and browses; a client tells them apart by remembering which `search_id` it started with which verb.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/clients/4382/shared_files"
+```
+
+**Response:** `202 Accepted`, with a `Location: /api/v1/search/{search_id}` header and the browse as the body -- the same row `GET /search`(#get-apiv1search) lists, with `type: "browse"` and `query` holding the client's name:
+
+```json
+{
+  "search_id":   17,
+  "query":       "some client",
+  "type":        "browse",
+  "state":       "running",
+  "client_ecid": null,
+  "started_at":  1750412400
+}
+```
+
+`client_ecid` is `null` in this reply even though you addressed the client by ecid: the row is built locally before the daemon has reported anything about the browse, and `client_ecid` is one of the fields it fills in. `GET /search`(#get-apiv1search) carries the client's ecid for the same browse from the next refresher tick onward.
+
+A browse the daemon cannot even start — a LowID client it has no way to call back, for instance — is reported as `finished` immediately rather than left pending: no connection is attempted, so there is nothing to wait for. It carries no results, the same as a browse the client denied.
+
+**Idempotent while a browse is running.** Asking again for a client that is already being browsed returns **the same `search_id`** rather than starting a second browse — amuled will not re-ask a client that is still answering, so a second id would name a browse that never happens. Two clicks therefore leave one browse, one id and one entry on `GET /api/v1/search`(#get-apiv1search). Once that browse has settled, a fresh request starts a new one with a new id.
+
+Status `202 Accepted` — the browse was started, not completed. Then poll:
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/search/17/results"
+```
+
+**Errors:** `400 bad_request` (`{ecid}` is not a non-negative integer), `403 forbidden` (guest token — browsing is `ADMIN`-only), `404 not_found` (no client with that ecid), `405 method_not_allowed` (non-POST), `502 amuled_rejected` (core accepted the request but returned no `search_id`), `503 ec_unavailable`.
+
+---
+
+### Known clients
+
+#### `GET /api/v1/known_clients`
+
+**Auth:** `GUEST`
+
+Lists every client the daemon has ever exchanged data with, from its credit store.
+
+Distinct from `GET /clients`(#get-apiv1clients), which lists the clients connected **right now**. The two differ in identity as well as content: a live client is keyed by `ecid`, which is meaningful only within one daemon process, while a known client is keyed by `user_hash` and survives daemon restarts. Correlate the two on `user_hash`; the `connected` field, the same key the live rows carry, says whether we are actually connected to that peer at this moment.
+
+Standard list envelope(#list-pagination-and-sorting) under the `known_clients` key, with `limit` / `offset` / `sort` / `order`.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/known_clients?sort=last_seen_at&order=desc&limit=2"
+```
+
+```json
+{
+  "known_clients": 
+    {
+      "user_hash": "a1b2c3d4e5060e708090a0b0c0d06f00",
+      "name": "example-client",
+      "ip": "192.0.2.10",
+      "port": 4665,
+      "kad_port": 4675,
+      "country_code": "de",
+      "software": "amule",
+      "software_version": "v2.3.1",
+      "source_origin": "kad",
+      "obfuscation_state": "supported",
+      "uploaded_bytes_total": 0,
+      "downloaded_bytes_total": 0,
+      "credit_ratio": 1.0,
+      "last_seen_at": 1786652714,
+      "first_seen_at": 1786652714,
+      "session_count": 1,
+      "connected": false
+    }
+  ,
+  "total": 392, "offset": 0, "limit": 2
+}
+```
+
+| Field | Notes |
+|---|---|
+| `user_hash` | 32-char lowercase MD4. The identity; join with `/clients`. |
+| `name` | Client-chosen name. `null` when never recorded. |
+| `ip`, `port`, `kad_port` | Last address the client was seen at. `null` together. |
+| `country_code` | ISO 3166-1 alpha-2, lowercase, resolved by the daemon's GeoIP. `null` when GeoIP is off or the address does not resolve. Artwork: `GET /flags/{code}.png`(#get-flagscodepng). |
+| `software`, `software_version` | Same tokens `GET /clients` uses. `null` together. |
+| `source_origin` | How the client was first found — `local_server`, `remote_server`, `kad`, `source_exchange`, … |
+| `obfuscation_state` | Protocol-obfuscation state as of the last session. |
+| `uploaded_bytes_total`, `downloaded_bytes_total` | Lifetime bytes, from the credit record. Always present. |
+| `credit_ratio` | The credit modifier the core computes from those totals, the same key and the same value `GET /clients`(#get-apiv1clients) carries. `null` on a daemon that does not send it. Never re-derive it from the two totals above. |
+| `last_seen_at` | Unix seconds. Always present. For a client that is connected this is *now* — it is being seen — so the connected records are the most recent in the store under `sort=last_seen_at&order=desc`. A client that left during the current tick carries the same timestamp and ties with them; ties keep a stable order across requests. |
+| `first_seen_at`, `session_count` | `null` together, and non-null only for a record the daemon holds metadata for. |
+| `connected` | Whether a connection to this peer is up right now, correlated by `user_hash`. Same key and same quantity as on `GET /clients`(#get-apiv1clients), so a join by `user_hash` does not meet it under a second name. `null` when the daemon does not report peer connectivity. Not the same as having a row in `GET /clients`(#get-apiv1clients): the daemon holds a client object from the first contact attempt, including for a peer it never reaches. |
+
+**Optional fields are `null`, never omitted and never emitted empty.** Every key above is written through `Write*OrNull`, so the shape of a row does not change with what the daemon knows: a record written before the daemon kept per-client metadata carries the hash, the totals and `last_seen_at` as values and the rest as `null`, which is how a consumer tells "never recorded" from "recorded as empty". On a long-lived node most records are of that kind. This follows the surface-wide rule in Unknown values(#unknown-values); `GET /search` is the documented exception where absence itself is the meaning.
+
+The store is read from the daemon **once**, on the first request, and maintained from there: every refresher tick folds the connected clients back in, so later requests never touch EC at all. That is sound rather than a shortcut — a record whose client is not connected cannot change, since credit totals only move during a transfer and `last_seen_at` is written at disconnect. What the maintenance covers:
+
+- a client that connects is added, with `first_seen_at` and `session_count` set to what the daemon recorded when it said hello;
+- a connected client's `connected`, `uploaded_bytes_total`, `downloaded_bytes_total` and `credit_ratio` track the live client state;
+- a bare record gains its name, address, software and origin once its client identifies;
+- a connected client's `last_seen_at` is now, and a client that leaves has `connected` cleared with `last_seen_at` stamped at the moment it went.
+
+The cost is one EC roundtrip per amuleapi process, and the store stays resident from first use.
+
+**Errors:** `405 method_not_allowed` (non-GET/HEAD), `502 amuled_response_invalid` (the daemon answered the history request with something that is not a client list), `503 ec_unavailable`, `503 ec_unsupported` (the connected amuled predates the client-history request — it is never sent to a daemon that does not advertise support).
+
+---
+
+### Shared files
+
+#### `GET /api/v1/shared`
+
+**Auth:** `GUEST`
+
+Lists every file the local node is sharing. The `sources.complete` counter is amuled's estimate of how many clients in the swarm hold the file complete.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" "http://$HOST/api/v1/shared"
+```
+
+```json
+{
+  "shared": 
+    {
+      "hash":             "1a2b3c4d...",
+      "name":             "release-notes.txt",
+      "ed2k_link":        "ed2k://|file|release-notes.txt|3217|1a2b...|/",
+      "size_bytes":       3217,
+      "priority":         "normal",
+      "priority_auto":    false,
+      "sources":          { "complete": 12 },
+      "uploaded_bytes_session":         5242880,
+      "uploaded_bytes_total":           314572800,
+      "request_count_session":          42,
+      "request_count_total":            1837,
+      "accepted_request_count_session": 18,
+      "accepted_request_count_total":   921,
+      "upload_speed_bytes_per_second": 51200,
+      "uploading_client_count": 2,
+      "last_upload_at":      1700000500,
+      "shared_since_at":     1699000000,
+      "hashed_part_count": 0,
+      "media": {
+        "duration_seconds": 212,
+        "bitrate_kilobits_per_second": 320,
+        "codec":    "MP3",
+        "artist":   "Some Artist",
+        "album":    "Some Album",
+        "title":    "Some Title"
+      }
+    }
+  
+}
+```
+
+`uploaded_bytes_session` / `uploaded_bytes_total` are bytes uploaded during the current amuled process vs over the file's lifetime. `request_count_*` counts how many clients have asked for the file; `accepted_request_count_*` counts how many of those requests were granted an upload slot. The `session` counters reset on amuled restart; `total` is persisted in `known.met`.
+
+`upload_speed_bytes_per_second` is the file's current combined upload rate in bytes/sec (summed over the clients it is uploading to), and `uploading_client_count` is how many clients it is actively uploading to right now — together the "is this file being seeded" signal, the upload-side analogue of the `/downloads` speed + transferring-source counts. Subtract `uploading_client_count` from the queued-client count (`upload_queue_count`, on the detail view) to show `uploading / queued`. Both are live and refresh every tick. `last_upload_at` is the unix timestamp of the last time data was sent for the file, and `shared_since_at` is when the file was completed or first shared; both are persisted in `known.met` and are `null` when unknown: a file that has never uploaded, or a `known.met` entry written before these fields existed.
+
+`priority` is the upload priority — `"very_low"` / `"low"` / `"normal"` / `"high"` / `"release"` — and `priority_auto` is `true` when amuled is deriving that level automatically from the upload queue. This mirrors the `/downloads` shape (base `priority` + separate `priority_auto` flag); on an auto file `priority` reports the current derived level, not the literal string `"auto"`. For a file that is both downloading and shared this upload priority is independent of the download priority reported by `GET /api/v1/downloads`(#get-apiv1downloads).
+
+`hashed_part_count` is the number of parts hashed so far by a pass running over the file — a `POST /shared/{hash}/verify`(#post-apiv1sharedhashverify) run, or an AICH hashset rebuild — and `0` when nothing is hashing. It is a count of completed parts, not the index of the part in flight, so it runs `0` → `total_part_count`, which is on this row.
+
+A file that is both downloading and shared reports its progress here as well: amuled describes such a file as a partfile, so the value is read across from the download side and the two agree. That makes `hashed_part_count` usable from either list without checking which one owns the file.
+
+`media` is an object on an audio or video file that has been probed and `null` otherwise — the key is always present, so test `media === null` rather than checking for the key. Its six fields are the same ones the detail endpoint reports, and a media refresh(#post-apiv1sharedmediarefresh) replaces all of them, clearing any the new probe no longer finds.
+
+The SSE `shared_added` / `shared_updated` event payload matches this object byte-for-byte, so a subscriber that received `shared_updated` does not need to re-GET to see the moved counters — including `media`, which is what makes a metadata refresh observable without polling.
+
+**Errors:** `503 ec_unavailable`.
+
+#### `GET /api/v1/shared/{hash}`
+
+**Auth:** `GUEST`
+
+Detail view for a single shared file. `{hash}` is the 32-char MD4 hex hash (case-insensitive). Returns every field of the `GET /shared`(#get-apiv1shared) list item plus the detail-only fields below — one call for everything about a shared file. The list endpoint is unchanged.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/shared/8b54a3c20fae9e4b9f7e0c2c8c01b6b1"
+```
+
+| Field | Type | Meaning |
+|---|---|---|
+| `file_type` | string | Category token derived from the extension: `"audio"`, `"video"`, `"archive"`, `"disc_image"`, `"picture"`, `"text"`, `"program"`, or `"unknown"`. |
+| `upload_ratio` | number | `xfer.total / size`; `0` when `size == 0`. |
+| `directory` | string | Directory path of the on-disk file — the temp directory while the file is still an incomplete partfile, the destination directory once it has completed. Identical to `directory` on `/downloads/{hash}` for the same file. |
+| `incomplete` | bool | `true` while the file is still an incomplete partfile, `false` once complete. Always present. A download that has finished but has not been cleared yet reports `false`, since its data already sits in the destination directory. |
+| `sources.complete_min` / `sources.complete_max` | int | The low and high ends of the estimated full-copy source range behind `sources.complete`. Two scalars, not a nested object. |
+| `aich_hash` | string\|null | AICH master hash (hex), or `null` until the hashset exists. |
+| `total_part_count` | int | Total parts, `ceil(size / 9.28 MiB)`. |
+| `parts` | array | Per-part source availability, `{ "sources": int }, ...`, exactly `total_part_count` entries in file order. **`null`** until the first decode has landed, so "no data yet" and "no sources for any part" stay distinguishable. The key is always present. See below. |
+| `upload_queue_count` | int | Clients waiting on this file's upload queue. |
+| `my_comment` | string | The user's own comment on this file (`""` if none). |
+| `my_rating` | int | The user's own rating, `0`–`5` (`0` = unrated). |
+| `media` | object | Audio/video metadata — see Media metadata(#media-metadata). **`null`** when the file has no probed metadata; the key is always present. |
+
+`hashed_part_count` comes through from the list item; pair it with `total_part_count` here for a percentage.
+
+`parts.sources` is how many clients currently requesting this file hold that part — an **availability** measure, not a progress one. A shared file is fully local by definition, so a part with `"sources": 0` means no other client has it and you are its only source. Counts saturate at `255`.
+
+This is deliberately detail-only. A 100 GB file has ~10 800 parts, so carrying the array on `GET /shared`(#get-apiv1shared) or in `shared_updated` SSE events would multiply that across the whole share on every tick — the same reason `progress.parts` is absent from the downloads list. `shared_updated` events are unaffected by source-count changes.
+
+For a shared file that is also still downloading, the same values are available as `progress.parts.sources` on `GET /downloads/{hash}`(#get-apiv1downloadshash); both come from one encoder in amuled, so they agree.
+
+**Errors:** `400 bad_request` (`{hash}` is not 32 hex characters), `404 not_found` (no shared file with that hash), `503 ec_unavailable`.
+
+#### `GET /api/v1/shared/{hash}/content`
+
+**Auth:** `GUEST` — `HEAD` is accepted too; any other method is `405 method_not_allowed` with `Allow: GET, HEAD`.
+
+Downloads the bytes of a completed shared file. `{hash}` is the 32-char MD4 hex hash (case-insensitive), the same one `GET /shared`(#get-apiv1shared) reports. This is the only route that serves library content: everything else on the surface describes files, this one hands them over.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/shared/8b54a3c20fae9e4b9f7e0c2c8c01b6b1/content" -o file.bin
+```
+
+**Response headers** on a `200` or `206`:
+
+| Header | Value |
+|---|---|
+| `Content-Type` | `application/octet-stream`, always |
+| `Content-Disposition` | `attachment; filename="<name>"; filename*=UTF-8''<name>` |
+| `X-Content-Type-Options` | `nosniff` |
+| `Content-Security-Policy` | `default-src 'none'; sandbox` |
+| `Accept-Ranges` | `bytes` |
+| `ETag` | `"<mtime>-<size>"`, hex, set by this handler rather than hashed from the body |
+| `Content-Length` | the exact number of bytes the response carries |
+| `Content-Range` | on a `206` and a `416` only |
+| `X-Accel-Buffering` | `no` on every streamed response. A zero-byte file is answered with a buffered empty `200` and does not carry it - there is nothing to stream and nothing for a proxy to spool. |
+| `Vary` | `Accept-Encoding` on every file response. |
+
+**Never `inline`, never the file's real media type.** A completed download lands in Incoming, which is itself shared, so both the bytes and the filename came from strangers on the ed2k network — and amuleapi serves the Web UI from this same origin. A shared `evil.html`, or a scripted `.svg`, returned under its "real" type would execute against the user's own session. `octet-stream` + `attachment` + `nosniff` + a sandbox CSP are four independent reasons the browser will not run it. The filename is sanitised for the quoted form and percent-encoded for the extended one, so a name carrying quotes or control characters cannot forge further parameters or split the header.
+
+**Ranges.** A single byte range is served as `206 Partial Content` with a `Content-Range`; `bytes=0-9` and the suffix form `bytes=-100` both work. A range that starts at or past EOF is `416 range_not_satisfiable` with `Content-Range: bytes */<size>`, so the client learns the true length without a second request.
+
+**A multi-range request gets a `200` carrying the whole file** — not a `206`, not a `416`, and never a `multipart/byteranges` body. `Range: bytes=0-99,500-599` is answered exactly as though no `Range` header had been sent, so a client that asks for two small windows of a 4 GB file will be handed 4 GB unless it checks the status. A client that needs several windows must issue one request per window and treat any status other than `206` as "the range was not honoured".
+
+That is one case of a general rule: everything the handler does not recognise as a single satisfiable range is **ignored** rather than refused, and answered `200` with the full body — an unrecognised range unit (per RFC 9110 §14.2), a value too large for a 64-bit offset (rejected, never wrapped), and the multi-range form above. RFC 7233 §3.1 permits a server to ignore `Range`, and never emitting `multipart/byteranges` is what makes the CVE-2011-3192 "Apache Killer" amplification shape a no-op here: a request naming hundreds of overlapping windows costs exactly one linear read of the file, the same as no `Range` header at all.
+
+**`If-Range`.** Honoured, and evaluated between `If-None-Match` and the `Range` itself (RFC 9110 §13.1.5). A resuming client sends the validator it already holds alongside `Range: bytes=N-`; if it still matches, the range is served as usual, and if it does not, the `Range` is **dropped** and the whole current representation is returned as `200`. That is what stops the client from appending bytes of the new file to its copy of the old one and reading the `206` as confirmation that nothing changed.
+
+The comparison is **strong**, unlike the one `If-None-Match` uses on this same route: `W/"<mtime>-<size>"` matches for a `304` and does **not** license a byte range, because a weak validator says two representations are equivalent, not byte-identical. The HTTP-date form of `If-Range` is not implemented and is treated as non-matching — a second-resolution validator compares equal across a replacement that happened inside the same second, which is the race the header exists to close, so the answer is a `200` of the whole file rather than a window taken on a guess. `If-Range` without a `Range` is ignored entirely.
+
+**Conditional GET.** The `ETag` is `mtime-size` rather than a hash of the body — hashing a multi-gigabyte file per request would not be a slow path but an unusable one. `If-None-Match` is answered here rather than by the generic stamping described in ETag and conditional GET(#etag-and-conditional-get), and accepts `*`, a comma-separated list, and weak `W/"..."` validators. A match is `304 Not Modified` with no content and the `ETag` preserved. It is evaluated **before** `Range`, per RFC 9110 §13.2.2, so a conditional request that also carries a `Range` answers `304`, never `206`. The validator carries no `-gzip` suffix because a file response is never compressed: there is exactly one representation to name, and `Accept-Encoding` cannot produce a `Content-Encoding` on this route.
+
+**Concurrency.** The transport caps concurrent file responses at 6 by default, because each one pins a file descriptor and a streaming buffer for as long as the client takes to drain it. Over the cap the answer is `503 file_responses_exhausted` with a `Retry-After`, the same shape the SSE session cap uses — an honest refusal rather than a queue that grows without bound. Within the cap the body streams through a fixed 64 KiB buffer and is never held in memory, so a multi-gigabyte transfer moves the daemon's RSS by kilobytes.
+
+The cap is `amuleapi.confStreaming/MaxConcurrentFileResponses`, accepted in `1..256` and falling back to 6 for anything else. It is a **global** budget, not a per-client one: behind a reverse proxy every request arrives from the proxy's address, so six slots are six slots for the whole household, and a `X-Forwarded-For`-aware per-user allowance does not exist on this surface. Six suits one mechanical disk that the hasher and the ed2k uploader are already using; an SSD-backed NAS serving several devices can afford more. A `HEAD` never claims a slot.
+
+**Behind a reverse proxy.** The response carries `X-Accel-Buffering: no`, nginx's opt-out from response buffering, for the same reason the event stream(EVENTS.md#response-headers) does — with the default `proxy_buffering on`, nginx spools the response to its own disk before the client sees the first byte, up to `proxy_max_temp_file_size` (1 GB out of the box). That both delays the transfer and copies the whole file onto the proxy host, which is precisely the I/O cost streaming off disk was meant to avoid. nginx honours the header, so no configuration is needed; if your proxy does not, set `proxy_buffering off;` (or its equivalent) for this location.
+
+**Same-host only.** The bytes are read from the filesystem **amuleapi** is running on, not amuled's. The two are usually the same machine, but the EC endpoint is configurable, so amuleapi can be pointed at a remote amuled — and then the daemon's paths mean nothing here. The desktop remote GUI carries a whole path-mapping layer for exactly this split; amuleapi has no equivalent, and does not guess. A path that resolves to nothing is `503 ec_content_unreachable`; a path that resolves to a *different* file that merely shares a name is caught by the size invariant and is `503 ec_content_mismatch` rather than being served under the wrong hash. Both say the deployment is misconfigured, not that the request was wrong. On a split deployment, download through amuled instead.
+
+**Errors:** `401 unauthorized` (no token), `404 not_found` (no shared file with that hash — and every path-resolution refusal, collapsed into the same reply so it cannot be used to probe the share layout), `405 method_not_allowed`, `409 partfile_unsupported`, `416 range_not_satisfiable`, `503 path_unavailable`, `503 ec_content_unreachable`, `503 ec_content_mismatch`, `503 file_responses_exhausted`, `503 ec_unavailable`.
+
+Only completed files can be downloaded. A file still downloading is rejected with `409 partfile_unsupported`: a partfile's on-disk layout is gapped and its offsets do not correspond to the completed file's, so a byte range taken out of it would be silently **wrong** rather than merely unavailable.
+
+`503 path_unavailable` carries `Retry-After: 5` and is transient rather than an error in the request. The file's directory rides an EC tag amuled emits only on the frames where it changed, so a snapshot taken before the first such frame knows the file but not where it lives. The resource exists; it just cannot be addressed yet.
+
+#### `POST /api/v1/shared_reload`
+
+**Auth:** `ADMIN`
+
+Equivalent to the desktop client's "Reload" button — amuled re-walks its shared directories and updates the file list.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/shared_reload"
+```
+
+Returns `202 Accepted`. amuled schedules the re-walk and answers immediately, so the response confirms only that the reload was **scheduled** — it never carries the outcome. The walk begins on amuled's next processing tick, within about a second, and a large or network-mounted share tree can take minutes to finish.
+
+Repeated calls coalesce: requesting a reload while one is already pending, or while a walk is in progress, results in a single further walk rather than one per call.
+
+**Reading the result.** The walk brackets itself with two amule log lines, so read them back from `GET /api/v1/logs/amule`(#get-apiv1logsamule) or the `logs` SSE channel. Both are localised and the second is pluralised, so a client matching on them should pin the daemon's locale:
+
+- `Reloading shared files...` when the walk starts
+- `Found 1234 known shared files` when it ends
+
+The resulting changes also arrive as `shared_added` / `shared_removed` events on the `shared` SSE channel, which is the better signal if you only care about the delta.
+
+**Errors:** `503 ec_unavailable`.
+
+#### `POST /api/v1/shared/media/refresh`
+
+**Auth:** `ADMIN`
+
+Re-extract media metadata for every shared file, whether or not it already has some.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/shared/media/refresh"
+```
+
+```json
+{ "scope": "all", "queued_file_count": 812 }
+```
+
+Returns `202 Accepted`. `queued_file_count` is how many files were **accepted for probing**, not how many produced metadata — files the scheduler drops (not audio/video by extension, an incomplete download, missing on disk) are not counted, and nothing has been extracted yet when the response returns.
+
+This is the only way to correct metadata that is *wrong* rather than missing. The normal scheduler skips any file that already carries a media tag, so a value stored by an older build — a cover-art codec, or a preview inherited from a search result before the local probe could overwrite it — is otherwise permanent short of deleting `known.met`, which would also discard the ed2k part hashes and every per-file statistic.
+
+A refresh also retries files a previous probe could not read. amuled records that ffprobe already ran on a file and found nothing usable, so a broken or truncated one is not re-probed on every share reload and every restart; that record is what a refresh clears. Repair the file, or install a working ffprobe, and ask for a refresh -- there is no need to touch `known.met`.
+
+Each probe **replaces** every media field, including *clearing* one the new probe no longer finds, so a refresh corrects a value in both directions. Nothing else about a file is touched: statistics, comment, rating, upload priority, AICH hash set and share state all survive, the file is not re-hashed, its ed2k hash does not change, and it never leaves the share.
+
+The work runs on amuled's media-probe worker, one file at a time, so downloads and uploads are unaffected and the daemon stays responsive. Shutting down mid-refresh is clean — files not yet reached keep their previous values. Progress is observable through `GET /api/v1/logs/amule`(#get-apiv1logsamule) and, as each probe lands, `shared_updated` SSE events.
+
+Cost is roughly 13 ms per file — a probe reads the container header, not the file — so a 10 000-file library is on the order of two minutes of background work.
+
+**Errors:** `400 amuled_rejected` (media metadata extraction is disabled in amuled's preferences), `503 ec_unsupported` (the connected amuled predates this operation), `503 ec_unavailable`.
+
+`queued: 0` means the share held no eligible file, which is a legitimate answer for a share with no audio or video in it. A disabled feature reports itself as a `400` instead, so the two cannot be confused.
+
+#### `POST /api/v1/shared/{hash}/media/refresh`
+
+**Auth:** `ADMIN`
+
+The same operation for a single file, which is the quickest way to check a fix on one file rather than a whole library.
+
+```json
+{ "scope": "file", "queued_file_count": 1 }
+```
+
+**Errors:** `404 not_found` (no shared file with that hash), `409 partfile_unsupported` (an incomplete download has no complete file to read), `400 amuled_rejected` (media metadata extraction is disabled, or the file is not eligible: not audio/video, or an incomplete download), `503 ec_unsupported`, `503 ec_unavailable`.
+
+#### `GET /api/v1/share_directories`
+
+**Auth:** `GUEST`
+
+The share roots amuled is configured with — as opposed to `GET /shared`(#get-apiv1shared), which lists the files those roots produced. This is the *intent*: a recursive root is one entry here however many subdirectories it covers.
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/share_directories"
+```
+
+```json
+{
+  "directories": 
+    { "path": "/home/user/media", "recursive": true },
+    { "path": "/home/user/iso", "recursive": false }
+  
+}
+```
+
+`recursive` distinguishes the two lists amuled keeps (`shareddir-recursive.dat` vs `shareddir-explicit.dat`). The runtime union it derives from them — every expanded subdirectory — is deliberately not exposed: it is generated state, not configuration.
+
+**Errors:** `502 amuled_rejected`, `503 ec_unavailable`.
+
+#### `PUT /api/v1/share_directories`
+
+**Auth:** `ADMIN`
+
+Replace the whole set of roots. A full replace rather than a merge, because that is exactly what amuled's operation does — making it a `PUT` keeps the semantics honest instead of hiding a read-modify-write.
+
+```sh
+curl -s -X PUT -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" \
+  -d '{"directories":{"path":"/home/user/media","recursive":true}}' \
+  "http://$HOST/api/v1/share_directories"
+```
+
+```json
+{ "results":  { "id": "/srv/share", "ok": true }  }
+```
+
+`recursive` is optional and defaults to `false`.
+
+amuled validates every path: a REST client cannot stat the core's filesystem, so a typo would otherwise become a silently dead share. Paths that pass are applied and persisted before the response returns, and every submitted path gets an entry either way, so **one bad entry does not discard the edit** and a caller can tell an applied path from one the response simply did not mention. A response with any rejection is `207 Multi-Status`, as with every other multi-item mutation:
+
+```json
+{
+  "results": 
+    { "id": "/srv/share", "ok": true },
+    { "id": "/typo", "ok": false, "error": { "code": "not_found", "message": "no such directory" } }
+  
+}
+```
+
+`error.code` is `not_found` (missing, or not a directory) or `not_readable` (`403`, amuled cannot read the path). amuled reports these as codes and the API renders them, so its locale never leaks into your response.
+
+The **rescan is scheduled, not completed**, before the response returns: a successful reply means the new roots are validated and persisted, and that the re-walk will start on amuled's next processing tick. Until it finishes, `GET /api/v1/shared`(#get-apiv1shared) still serves the previous file list. Observe completion the same way as `POST /api/v1/shared_reload`(#post-apiv1shared_reload), whose notes on log lines and coalescing apply here too.
+
+**Errors:** `400 bad_request` (`directories` not an array, an entry without a non-empty `path`, non-boolean `recursive`), `502 amuled_rejected`, `503 ec_unavailable`.
+
+#### `POST /api/v1/share_directories`
+
+**Auth:** `ADMIN`
+
+Add a single root, leaving the others alone — the convenience path for scripts that would otherwise have to read the list, splice it and write it back.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" \
+  -d '{"path":"/home/user/new","recursive":true}' \
+  "http://$HOST/api/v1/share_directories"
+```
+
+Idempotent: adding a path that is already configured updates its `recursive` flag rather than failing, so "ensure this folder is shared" is safe to repeat. Same `{results: ...}` envelope as `PUT`.
+
+**Errors:** `400 bad_request` (missing/empty `path`, non-boolean `recursive`), `502 amuled_rejected`, `503 ec_unavailable`.
+
+#### `DELETE /api/v1/share_directories`
+
+**Auth:** `ADMIN`
+
+Remove a single root. The path is a query parameter rather than a path segment because it is an absolute filesystem path.
+
+Pass the **exact** `path` string returned by `GET /share_directories`, percent-encoded — the match is byte-for-byte, so a differing separator or drive-letter case will not match. This is what makes Windows roots work: percent-encoding carries the backslashes, the `C:` colon, and any spaces through unchanged.
+
+```sh
+# POSIX root: /home/user/new
+curl -s -X DELETE -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/share_directories?path=%2Fhome%2Fuser%2Fnew"
+
+# Windows root: C:\Users\bob\My Shares
+curl -s -X DELETE -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/share_directories?path=C%3A%5CUsers%5Cbob%5CMy%20Shares"
+```
+
+Removing a path that is not configured is a `404` rather than a silent success, so a typo — or a path that does not byte-match what `GET` returned — is visible. Same `{results: ...}` envelope as `PUT`.
+
+**Errors:** `400 bad_request` (no `path` parameter), `404 not_found` (path not configured), `502 amuled_rejected`, `503 ec_unavailable`.
+
+> Concurrency: `POST` and `DELETE` are read-modify-write against amuled's whole-list operation, serialised inside amuleapi so two API clients cannot lose each other's change. Nothing can make them atomic against a *simultaneous* edit from amuleGUI — the protocol has no compare-and-set — so that case is last-write-wins.
+
+#### `POST /api/v1/shared/{hash}/verify`
+
+**Auth:** `ADMIN`
+
+Equivalent to the desktop client's "Verify Local Data" — amuled re-hashes the file's on-disk data against the MD4 (and, where a hashset is available, AICH) hashes it has stored, reporting any blocks that no longer match.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/shared/$HASH/verify"
+```
+
+Returns `202 Accepted`, with no body. amuled queues the hashing task and answers immediately, so the response confirms only that the re-hash was **scheduled** — it never carries the outcome, and a large file may take minutes to finish.
+
+**Watching it run.** While the task is hashing, `hashed_part_count` on the file's `GET /shared`(#get-apiv1shared) row counts the parts done so far, and each advance pushes a `shared_updated` SSE event — enough to drive a progress bar without polling. It returns to `0` when the task finishes or aborts, which is the signal that the log line below is available.
+
+**Reading the result.** The verdict is emitted as an amule log line when the task completes, so read it back from `GET /api/v1/logs/amule`(#get-apiv1logsamule) or the `logs` SSE channel:
+
+- `Verify Local Data (MD4 & AICH): Result OK for <path>`
+- `Verify Local Data (MD4 & AICH): ERRORS FOUND! <path> Failed blocks: MD4: 3,7 AICH: 5: (0,2)`
+
+Like all daemon log output these lines are gettext-translated at the daemon's locale and carry no correlation id tying them to a specific request, so treat them as human-readable output rather than a machine-parseable contract.
+
+**Errors:** `400 bad_request` (`{hash}` is not 32 hex characters), `400 amuled_rejected` (the daemon refused the verify), `404 not_found` (no shared file with that hash), `409 partfile_unsupported`, `500 internal_error`, `503 ec_unavailable`.
+
+Only completed files can be verified. A file still downloading is rejected with `409 partfile_unsupported`: the hashing task skips partfiles outright, so accepting one would promise a report that never arrives. A download that has *finished* but is still listed under `/downloads` is a valid target.
+
+#### `PATCH /api/v1/shared`
+
+**Auth:** `ADMIN`
+
+Bulk upload-priority change over multiple shared files — the same `priority` applied to every listed hash.
+
+**Body:** `{ "hashes": "<md4>", …, "priority": "<level>" }` — a non-empty `hashes` array (max 500) plus a required `priority` (`very_low` | `low` | `normal` | `high` | `release` | `auto`).
+
+**Response:** the bulk `results` envelope(#bulk-mutations-and-the-results-envelope) (`200` all ok / `207` partial / `503`), keyed by hash. Per-item `error.code` is `not_found`, `amuled_rejected`, or `ec_unavailable`.
+
+**Errors:** `400 bad_request` (missing/empty `hashes`, missing/invalid `priority`), `503 ec_unavailable`.
+
+#### `PATCH /api/v1/shared/{hash}`
+
+**Auth:** `ADMIN`
+
+Changes the upload priority and/or the comment+rating of a single shared file. `{hash}` is the 32-char MD4 hex hash (case-insensitive). The body must include at least one of `priority` or the `my_comment`+`my_rating` pair.
+
+**Body:**
+
+```json
+{
+  "priority": "very_low" | "low" | "normal" | "high" | "release" | "auto",
+  "my_comment":  "<string, ≤ 50 chars>",
+  "my_rating":   0
+}
+```
+
+Send a bare priority level to pin it (the file's `priority_auto` becomes `false`). Send `"auto"` to hand level selection to amuled — it derives the level from the upload queue, and `GET /api/v1/shared` then reports the derived base `priority` with `priority_auto: true`. The combined `"*_auto"` strings are not accepted as input, since `"auto"` is the level the daemon computes rather than one the caller pins.
+
+`my_comment` and `my_rating` must be sent **together** (both or neither) — the daemon writes them as one atomic operation. `my_comment` is capped at 50 characters; `my_rating` is an integer `0`–`5`. Setting them requires the file to be shared. The same fields are accepted on `PATCH /downloads/{hash}`(#patch-apiv1downloadshash) for a downloading file that is also shared.
+
+`name` renames the file — a non-empty string with no path separators (`/` or `\`, rejected to prevent the rename escaping the file's directory). Rename works on any known file, so it is accepted on both this endpoint and `PATCH /downloads/{hash}`(#patch-apiv1downloadshash).
+
+**Errors:** `400 bad_request` (`{hash}` is not 32 hex characters, missing/invalid fields, `my_comment`/`my_rating` sent alone, or a `name` that is empty or contains a path separator), `404 not_found` (no shared file with that hash), `409 not_shared` (comment/rating on a non-shared file), `400 amuled_rejected`, `503 ec_unavailable`.
+
+---
+
+### Servers (ed2k server list)
+
+#### `GET /api/v1/servers`
+
+**Auth:** `GUEST`
+
+```json
+{
+  "servers": 
+    {
+      "ecid": 1,
+      "name": "eMule Server",
+      "description": "Public server",
+      "software_version": "17.15",
+      "address": "203.0.113.5:4242",
+      "ip":      "203.0.113.5",
+      "country_code": "de",
+      "port": 4242,
+      "user_count": 312000,
+      "max_user_count": 500000,
+      "file_count": 75000000,
+      "soft_file_limit": 1000,
+      "hard_file_limit": 5000,
+      "priority": "normal",
+      "ping_ms": 42,
+      "failed_count": 0,
+      "permanent": false,
+      "tcp_flags": {
+        "bitmask": 1497,
+        "compression": true,
+        "new_tags": true,
+        "unicode": true,
+        "related_search": true,
+        "type_tag_integer": true,
+        "large_files": true,
+        "tcp_obfuscation": true
+      },
+      "udp_flags": {
+        "bitmask": 1851,
+        "get_sources": true,
+        "get_files": true,
+        "new_tags": true,
+        "unicode": true,
+        "get_sources_v2": true,
+        "large_files": true,
+        "udp_obfuscation": true,
+        "tcp_obfuscation": true
+      }
+    }
+  
+}
+```
+
+`software_version` is the server software version string the server reported, or `null` when it has reported none - the same spelling `/clients` and `/known_clients` use for an unknown version. `name` and `description` are *not* nulled: an empty description is a real value a server can advertise, and a server with no name is rendered by its address.
+
+`country_code` is the ISO 3166-1 alpha-2 code (lowercase, e.g. `"de"`) of the server host, resolved server-side from the server IP by the daemon's GeoIP database — same semantics as the client `country_code` on `/clients`, `null` when unresolved, and the same artwork route, `GET /flags/{code}.png`(#get-flagscodepng).
+
+`file_count` is how many files the server indexes. `soft_file_limit` and `hard_file_limit` are something else entirely: the per-user publishing limits the server advertises. Below the soft limit a client may publish every file it shares, between soft and hard only its rarest, above the hard limit nothing. Both arrive only once the server has answered a UDP status request, so **`0` means "not reported yet", not "the limit is zero"** — render it blank rather than as a number, the way the desktop's Soft Files / Hard Files columns do. `user_count`, `max_user_count` and `file_count` share that sentinel.
+
+`failed_count` is the number of consecutive failed connection attempts, not a boolean.
+
+`tcp_flags` and `udp_flags` are the eD2k wire capabilities the server announced, decoded server-side so a consumer never needs the protocol tables. Every key below is always present — `false` when the bit is clear — so there is no need to branch on key existence. `bitmask` carries the raw value alongside, both for diagnostics and so a bit a newer server announces that this build does not name yet is still visible. A server that has announced nothing yet reports `bitmask: 0` with every boolean `false`.
+
+`tcp_flags`:
+
+| Key | Bit | Meaning |
+|---|---|---|
+| `compression` | `0x0001` | zlib-compressed packets |
+| `new_tags` | `0x0008` | compact tag encoding |
+| `unicode` | `0x0010` | Unicode strings |
+| `related_search` | `0x0040` | related-files search — whether a `related::<hash>` local search will work against this server |
+| `type_tag_integer` | `0x0080` | integer file-type tags |
+| `large_files` | `0x0100` | files larger than 4 GiB |
+| `tcp_obfuscation` | `0x0400` | TCP protocol obfuscation |
+
+`udp_flags`:
+
+| Key | Bit | Meaning |
+|---|---|---|
+| `get_sources` | `0x0001` | extended GetSources request |
+| `get_files` | `0x0002` | extended GetFiles request |
+| `new_tags` | `0x0008` | compact tag encoding |
+| `unicode` | `0x0010` | Unicode strings |
+| `get_sources_v2` | `0x0020` | GetSources v2 |
+| `large_files` | `0x0100` | files larger than 4 GiB |
+| `udp_obfuscation` | `0x0200` | UDP obfuscation |
+| `tcp_obfuscation` | `0x0400` | TCP obfuscation, announced over UDP |
+
+Both objects spell out the transport on their obfuscation keys because `udp_flags` legitimately carries both bits; a key means exactly one wire capability in either object.
+
+**Errors:** `503 ec_unavailable`.
+
+#### `POST /api/v1/servers`
+
+**Auth:** `ADMIN`
+
+Add a server to amuled's known-server list.
+
+**Body:**
+
+```json
+{ "address": "203.0.113.5:4242", "name": "eMule Server" }
+```
+
+`name` optional; `address` required and must parse as `host:port`.
+
+**Response:** `202 Accepted`, no body. `EC_OP_SERVER_ADD` answers success or failure and never returns the server it made, so anything reported here would be a reconstruction from the snapshot after an inline refresh -- a guess that can silently come back short. Re-read `GET /servers`(#get-apiv1servers) for the new entry.
+
+**Errors:** `400 bad_request`, `400 amuled_rejected`, `503 ec_unavailable`.
+
+#### `POST /api/v1/servers/{ecid}/connect` / `POST /api/v1/servers/by-address/{address}/connect`
+
+**Auth:** `ADMIN`
+
+Tells amuled to disconnect from its current server and dial the specified one. Two route shapes are equivalent — `{address}` is `<ip>:<port>`, and the address form looks up the ECID by exact `(ip, port)` match against the server cache before delegating to the ECID handler. It has its own `by-address` path rather than being sniffed out of `{ecid}`, so nothing about the URL is ambiguous. Hostname-form addresses do NOT resolve here — pass the literal IP.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/servers/by-address/203.0.113.5:4242/connect"
+```
+
+**Response:** `202 Accepted`, no body. The connect is asynchronous; its outcome shows up on `GET /status`(#get-apiv1status)'s `ed2k.state` and on the SSE stream.
+
+**Errors:** `400 bad_request` (unparseable address/ECID), `400 amuled_rejected` (the daemon refused the connect), `404 not_found`, `503 ec_unavailable`.
+
+#### `DELETE /api/v1/servers/{ecid}` / `DELETE /api/v1/servers/by-address/{address}`
+
+**Auth:** `ADMIN`
+
+Removes the server from amuled's list.
+
+**Response:** `204 No Content`.
+
+**Errors:** `400 bad_request` (`{ecid}` is not a non-negative integer, or `{address}` is not a dotted quad with a port in 1–65535), `400 amuled_rejected`, `404 not_found` (well-formed but no such server), `503 ec_unavailable`.
+
+#### `PATCH /api/v1/servers/{ecid}` / `PATCH /api/v1/servers/by-address/{address}`
+
+**Auth:** `ADMIN`
+
+Sets an ed2k server's priority, its static flag, or both — the same operation the desktop server list offers from its context menu.
+
+**Body:** both fields are optional, and only the ones present are applied; a body with neither is a `400`.
+
+```json
+{ "priority": "high", "permanent": true }
+```
+
+`priority` is one of `"low"` / `"normal"` / `"high"` — the same values `GET /servers` reports. `permanent` marks the server as one amuled keeps across list updates.
+
+```sh
+curl -s -X PATCH -H "Authorization: Bearer $TOKEN" \
+  -H 'Content-Type: application/json' \
+  -d '{"priority":"high","permanent":true}' \
+  "http://$HOST/api/v1/servers/1"
+```
+
+**Response:** `200 OK` → the full server object as it now stands, the same shape `GET /servers`(#get-apiv1servers) lists. A `PATCH` answers with the state the caller just produced, so no re-read is needed to see it.
+
+**Errors:** `400 bad_request` (unknown `priority`, non-bool `permanent`, or neither field present), `400 amuled_rejected`, `404 not_found`, `503 ec_unavailable`.
+
+#### `POST /api/v1/servers_update`
+
+**Auth:** `ADMIN`
+
+Tells amuled to fetch the `server.met` from the supplied URL and refresh its list. Same operation the desktop GUI's "Update server list from URL" button drives.
+
+**Body:**
+
+```json
+{ "url": "http://example.com/server.met" }
+```
+
+`url` is **required** here, and must start with `http://` or `https://`; omitting it, or sending anything else, is a `400 bad_request`. This differs from `POST /ipfilter/update`(#post-apiv1ipfilterupdate), which does fall back to its configured preference when the field is absent.
+
+All three `*/update` endpoints -- servers, Kad nodes and the IP filter -- name this field `url` (R6), rather than repeating a noun the path already carries.
+
+The URL is **persisted** into the `servers.update_url` preference, so a subsequent `GET /preferences` reflects it — there is no need to PATCH it separately.
+
+**Response:** `202 Accepted`, no body. The download runs asynchronously -- its outcome arrives on the log channel.
+
+**Errors:** `400 bad_request`, `400 amuled_rejected`, `503 ec_unavailable`.
+
+---
+
+### Friends
+
+The friends list amuled persists to `emfriends.met`. The daemon ships the whole list inside the update every client already receives, so `GET /friends` costs no roundtrip of its own.
+
+`{ecid}` is the friend's own id, distinct from the client ECIDs on `/clients`. Like every ECID it does **not** survive an `amuled` restart — use `user_hash` as the durable reference where a friend has one. A friend added by address alone has no hash.
+
+#### `GET /api/v1/friends`
+
+**Auth:** `GUEST`
+
+```json
+{
+  "friends": 
+    {
+      "ecid": 12,
+      "name": "alice",
+      "user_hash": "a1b2c3d4e5060e708090a0b0c0d06f00",
+      "ip": "203.0.113.42",
+      "port": 4662,
+      "client_ecid": 4382,
+      "connected": true,
+      "friend_slot": false
+    }
+  ,
+  "total": 7,
+  "offset": 0,
+  "limit": 7
+}
+```
+
+`client_ecid` is the live client this friend is currently linked to, joinable against `GET /api/v1/clients`(#get-apiv1clients), and `null` when no client object is held for the friend. `connected` is a different question and answers it directly: whether a connection to the peer is up. A friend can have a `client_ecid` and be `false` here, which is the ordinary state for one the daemon is trying, or failing, to reach. `null` means the daemon does not report peer connectivity. `user_hash` is `""` for a friend added by address only; `ip` and `port` are `null` for a zero address, and the `friend_*` events emit the same nulls.
+
+`friend_slot` reads `false` against a daemon predating the tag that carries it, the same way `friend` does on `/clients`. (`credit_ratio` reads `null` there rather than a value, being a number with no safe default.)
+
+**Errors:** `503 ec_unavailable`.
+
+#### `POST /api/v1/friends`
+
+**Auth:** `ADMIN`
+
+Two mutually exclusive body forms.
+
+Promote a connected client:
+
+```json
+{ "client_ecid": 4382 }
+```
+
+Or add by address, where `ip` and `port` are required and `port` is an integer in `1..65535` (the same contract `POST /api/v1/kad/bootstrap`(#post-apiv1kadbootstrap) enforces), `user_hash` must be 32 hexadecimal characters when given, and `name` defaults to the address:
+
+```json
+{ "ip": "203.0.113.42", "port": 4662, "name": "alice", "user_hash": "a1b2c3d4e5060e708090a0b0c0d06f00" }
+```
+
+Sending `client_ecid` together with any address field is a `400`.
+
+**Response:** `202 Accepted`, no body. EC's `FRIEND` op answers success or failure and never returns the record it created, so the only way to name the new friend here was to diff the snapshot against a pre-add copy and hope the inline refresh had already surfaced it. Re-read `GET /friends`(#get-apiv1friends), keyed on the address or hash the request carried.
+
+**Errors:** `400 bad_request`, `404 not_found` (no connected client with that `client_ecid`), `400 amuled_rejected`, `503 ec_unavailable`.
+
+#### `DELETE /api/v1/friends/{ecid}`
+
+**Auth:** `ADMIN`
+
+**Response:** `204 No Content`.
+
+Removing the friend that currently holds the friend slot clears it.
+
+**Errors:** `400 bad_request` (`{ecid}` is not a non-negative integer), `404 not_found`, `400 amuled_rejected`, `503 ec_unavailable`.
+
+#### `PATCH /api/v1/friends/{ecid}`
+
+**Auth:** `ADMIN`
+
+**Body:** `{ "friend_slot": true }` — the only mutable field.
+
+**Response:** `200 OK` → the updated friend object.
+
+Only one friend can hold the slot at a time, so granting it clears it on whoever held it before. A single call therefore changes two records and emits two `friend_updated` events; the response body describes only the friend named in the URL.
+
+**Errors:** `400 bad_request`, `404 not_found`, `400 amuled_rejected`, `503 ec_unavailable`.
+
+#### `POST /api/v1/friends/{ecid}/shared_files`
+
+**Auth:** `ADMIN`
+
+Browse a friend's shared files. The friend-addressed twin of `POST /api/v1/clients/{ecid}/shared_files`(#post-apiv1clientsecidshared_files), and more capable: a friend record carries a stored address, so the daemon can browse a friend who is **not currently connected**, which the clients route cannot do.
+
+**Response:** `202 Accepted`, with a `Location` header and the browse row as the body, exactly as on the clients route. Poll `GET /api/v1/search/{id}/results`(#get-apiv1searchidresults) with the `search_id` it carries. Idempotent while a browse of that client is running, exactly as on the clients route.
+
+**Errors:** `400 bad_request` (`{ecid}` is not a non-negative integer), `403 forbidden`, `404 not_found`, `502 amuled_rejected`, `503 ec_unavailable`.
+
+### Categories
+
+amuled's category system lets users tag downloads with one of N user-defined buckets (separate save directory, separate priority, separate color). Category 0 is the default "Uncategorized" and cannot be deleted.
+
+#### `GET /api/v1/categories`
+
+**Auth:** `GUEST`
+
+```json
+{
+  "categories": 
+    {
+      "index": 0,
+      "name": "Default",
+      "save_path": "/home/user/aMule/Incoming",
+      "comment": "",
+      "color": "#1664c0",
+      "priority": "low"
+    }
+  ,
+  "total": 1,
+  "offset": 0,
+  "limit": 1
+}
+```
+
+A list endpoint like the others: `?limit`, `?offset`, `?sort` and `?order` apply, and the `total` / `offset` / `limit` trio describes the window. See List pagination and sorting(#list-pagination-and-sorting); the sort keys are `index` and `name`.
+
+Category `0` is always present, so the list is never empty. amuled's EC omits the row entirely until the first custom category exists, so amuleapi synthesises it when missing:
+
+```json
+{ "index": 0, "name": "Default", "save_path": "/home/user/aMule/Incoming", "comment": "", "color": "#1664c0", "priority": "low" }
+```
+
+`name` and `save_path` are filled in for index `0` whether the row came from the daemon or was synthesised here. amuled holds neither -- its `defaultcat` is built with an empty title and path -- so without this fill-in a category picker would show a blank row and nothing for where an uncategorised download lands. `save_path` is `directories.incoming_path` from `GET /preferences`(#get-apiv1preferences), which is genuinely where such a file is saved. `priority` is `low`, amuled's own default for the row.
+
+Filling both in unconditionally is deliberate: doing it only for the synthesised row would mean `/categories/0` answered `"Default"` on a daemon with no custom categories and `""` as soon as the operator added one, which is a response shape that depends on unrelated state.
+
+**Errors:** `400 bad_request` (bad list params), `503 ec_unavailable`.
+
+#### `POST /api/v1/categories`
+
+**Auth:** `ADMIN`
+
+**Body:**
+
+```json
+{
+  "name": "Linux ISOs",
+  "save_path": "/home/user/aMule/Incoming/Linux",
+  "comment": "Distros only",
+  "color": "#1664c0",
+  "priority": "high"
+}
+```
+
+`name` required; others optional. `color` is a `"#rrggbb"` string in both
+directions. amuleapi converts it from the raw 24-bit integer amuled stores,
+which the core packs as `0x00BBGGRR` with **red in the low byte** -- so a
+client never has to unpack that (a naive hex print of the integer comes out
+reversed). Anything that is not `#` followed by six hex
+digits is a `400 bad_request`. `priority` accepts the same six levels the category read side can return — `"very_low"` / `"low"` / `"normal"` / `"high"` / `"release"` / `"auto"` — so a read-modify-write round-trip always succeeds (R9). It is applied to the category's member files as a download priority.
+
+**`save_path` is resolved on the daemon's filesystem, not yours,** so it is accepted without being checked here. Omit it and the category is created on the incoming directory, which is amuled's own default. Give a path amuled cannot use — it does not exist and cannot be created — and the category is still created, on the incoming directory again. Either way this is a success, and `GET /categories/{index}`(#get-apiv1categoriesindex) reports the path that was actually stored. Compare it with what you sent if it matters to you; a `save_path` that comes back different is the daemon saying it could not use yours.
+
+**Response:** `202 Accepted`, no body. `EC_OP_CREATE_CATEGORY` answers success or failure and never returns the index it assigned, so naming the new category here would mean scanning the snapshot for a matching name and guessing when the scan came up short. Re-read `GET /categories`(#get-apiv1categories) for the assigned index.
+
+**Errors:** `400 bad_request`, `400 amuled_rejected`, `503 ec_unavailable`.
+
+#### `GET /api/v1/categories/{index}`
+
+**Auth:** `GUEST`, matching the collection read.
+
+Returns the single category object, the same shape `PATCH`(#patch-apiv1categoriesindex) returns. Like every other resource with a member path, it has a member `GET`, so a client that has just created a category can read the stored result here instead of re-fetching the whole collection and searching by index.
+
+`{index}` is a uint8. A non-numeric or out-of-range segment is `400 bad_request`; an index no category holds is `404 not_found`. Index `0` is always present, synthesised when amuled omits it and carrying the same `name` / `save_path` fill-in, exactly as on the collection: the two routes cannot disagree about which categories exist or about what they hold.
+
+**Errors:** `400 bad_request`, `404 not_found`, `503 ec_unavailable`.
+
+#### `PATCH /api/v1/categories/{index}`
+
+**Auth:** `ADMIN`
+
+Any subset of the POST body fields. `index 0` (the default category) can be patched but not deleted.
+
+**Response:** `200 OK` with the category object as stored, the same shape `GET /categories/{index}`(#get-apiv1categoriesindex) returns, so a client can see what landed without a follow-up read.
+
+`save_path` follows the same rule as on create: amuled resolves it on its own filesystem, and when it cannot use the path it keeps the one the category already had. The rest of the request still applies — `name`, `comment`, `color` and `priority` all land — and the echoed object reports the path that was kept. That is the one case where a field you sent is not the field you get back, which is why the response echoes the object rather than answering `204`.
+
+**Errors:** `400 bad_request` (non-numeric or out-of-range `{index}`, malformed `color`, unknown `priority`), `404 not_found` (no category at that index), `400 amuled_rejected`, `503 ec_unavailable`.
+
+#### `DELETE /api/v1/categories/{index}`
+
+**Auth:** `ADMIN`
+
+**Response:** `204 No Content`.
+
+**Errors:** `400 bad_request` (non-numeric or out-of-range `{index}`, or index `0`), `404 not_found` (no category at that index), `400 amuled_rejected`, `503 ec_unavailable`.
+
+Deleting `index 0` is refused here, before any EC roundtrip: `400 bad_request` ("cannot delete the default (index=0) category"). amuled is never asked.
+
+---
+
+### Preferences
+
+#### `GET /api/v1/preferences`
+
+**Auth:** `GUEST`
+
+Returns every preference category amuled carries over EC. The `general` and `connection` sub-objects are the original common-case set; the remaining categories map 1:1 to the daemon's own settings and mirror the desktop "Preferences" tabs.
+
+```json
+{
+  "general": {
+    "nickname": "MyNode",
+    "user_hash": "abcd...",
+    "daemon_host_name": "host.example.com",
+    "version_check_enabled": true
+  },
+  "connection": {
+    "max_upload_kibibytes_per_second": 50,
+    "max_download_kibibytes_per_second": 0,
+    "upload_slot_min_kibibytes_per_second": 3,
+    "tcp_port": 4662,
+    "udp_port": 4672,
+    "extended_udp_port_enabled": true,
+    "max_sources_per_file_count": 250,
+    "max_connection_count": 400,
+    "autoconnect": true,
+    "reconnect_on_connection_loss": true,
+    "ed2k_enabled": true,
+    "kad_enabled": true,
+    "bind_address": "",
+    "bind_interface": "",
+    "proxy_enabled": false,
+    "proxy_type": "socks5",
+    "proxy_host": "",
+    "proxy_port": 1080,
+    "proxy_auth_enabled": false,
+    "proxy_user": "",
+    "upnp_supported": true,
+    "upnp_enabled": false,
+    "upnp_control_point_port": 50000
+  },
+  "directories": {
+    "incoming_path":   "/home/me/.aMule/Incoming",
+    "temp_path":       "/home/me/.aMule/Temp",
+    "shared_paths":    "/home/me/media",
+    "share_hidden":    false,
+    "rescan_on_startup": true,
+    "follow_symlinks": false,
+    "exclude_patterns": "",
+    "exclude_patterns_use_regex": false
+  },
+  "files": {
+    "ich_enabled": true, "trust_unverified_aich_hashes": false,
+    "add_new_downloads_paused": false, "new_downloads_auto_priority_enabled": false,
+    "new_shared_files_auto_priority_enabled": false,
+    "prioritize_first_last_chunks": false, "on_finished_start_next_paused": false,
+    "on_finished_start_next_in_same_category": false,
+    "save_sources_for_rare_files": true, "preallocate_full_file_size": false,
+    "mmap_supported": true, "mmap_enabled": false,
+    "stop_on_low_disk_space": true, "min_free_space_mebibytes": 1, "create_sparse_files": true,
+    "on_finished_start_next_alphabetically": false, "endgame_mode_enabled": false,
+    "media_metadata_enabled": true, "ffprobe_path": ""
+  },
+  "servers": {
+    "remove_dead_servers": true, "dead_server_retry_count": 3, "update_list_at_startup": false,
+    "update_list_from_server": true, "update_list_from_client": true,
+    "server_priority_system_enabled": true,
+    "smart_lowid_check_enabled": true, "safe_server_connect_enabled": false,
+    "autoconnect_static_servers_only": false, "manual_servers_high_priority": false,
+    "update_url": "http://upd.emule-security.org/server.met"
+  },
+  "security": {
+    "shared_files_visibility": "everybody",
+    "ipfilter_clients_enabled": true, "ipfilter_servers_enabled": true,
+    "ipfilter_auto_update_enabled": false, "ipfilter_update_url": "",
+    "ipfilter_min_access_level": 127, "ipfilter_include_lan_ips": true,
+    "secure_identification_enabled": true,
+    "protocol_obfuscation_enabled": true, "obfuscation_requested": true, "obfuscation_required": false,
+    "reject_spoofed_source_ips": true, "system_ipfilter_enabled": false
+  },
+  "message_filter": {
+    "enabled": false, "filter_all_messages": false,
+    "accept_from_friends_only": false, "accept_from_known_clients_only": false,
+    "filter_by_keyword": false, "keywords": "",
+    "log_filtered_messages": true, "filter_comments": false, "comment_keywords": ""
+  },
+  "remote_controls": {
+    "webserver": {
+      "enabled": false, "port": 4711, "gzip_enabled": true,
+      "refresh_seconds": 120, "template_name": "", "guest_enabled": false
+    },
+    "amuleapi": { "enabled": true, "port": 4713, "bind_address": "0.0.0.0" }
+  },
+  "online_signature": { "enabled": false, "directory": "/home/me/.aMule", "update_frequency_seconds": 5 },
+  "advanced": {
+    "max_new_connections_per_5_seconds": 200, "verbose_logging": false,
+    "file_buffer_bytes": 240000, "max_upload_queue_client_count": 5000,
+    "server_keepalive_timeout_minutes": 0, "kad_max_concurrent_source_search_count": 50,
+    "kad_source_reask_minutes": 30, "source_reask_minutes": 15
+  },
+  "kad": { "update_url": "http://upd.emule-security.org/nodes.dat" },
+  "geoip": {
+    "supported": true, "enabled": true, "source": "dbip",
+    "custom_update_url": "", "maxmind_license": "", "auto_update_enabled": true,
+    "loaded_source": "dbip", "db_path": "/home/me/.aMule/GeoIP/dbip.mmdb",
+    "db_loaded": true, "download_in_progress": false, "last_update_status": "ok"
+  }
+}
+```
+
+Booleans are plain JSON `true`/`false` regardless of how amuled encodes them on the wire. **Passwords are never returned** — the webserver admin/guest and amuleapi passwords are write-only (see PATCH). `general.user_hash` is the node's own identity hash, not a password.
+
+`connection.extended_udp_port_enabled` is positive-sense: `true` means the extended UDP port (Kad / global search) is on. `security.shared_files_visibility` is a 3-state enum string, not a bool: `"everybody"` / `"friends"` / `"nobody"`.
+
+`geoip` is the GeoIP (IP-to-country) config category. `supported` is a capability flag: `false` when the connected daemon is built without GeoIP — the config fields are then present but inert. `source` is one of `"dbip"` / `"maxmind"` / `"custom"` (the next-download database selector). `maxmind_license` is returned plainly (it is a config string the daemon already round-trips, not a masked password). `loaded_source`, `db_path`, `db_loaded`, `download_in_progress`, and `last_update_status` are **read-only** live status (the currently loaded DB and any in-flight refresh); they are ignored if sent on PATCH.
+
+`files.media_metadata_enabled` / `files.ffprobe_path` control media-metadata extraction: when enabled, the daemon probes shared audio/video with `ffprobe` to advertise length, bitrate, codec, artist, album and title. `ffprobe_path` is a **daemon-side** path — an empty string means the daemon auto-detects the binary, trying `ffprobe` on its `PATH` and then a per-platform list of well-known install locations. The detected path is deliberately **not** written back: it describes the daemon's machine rather than a choice you made, so `ffprobe_path` keeps reading as `""` while extraction works, and a daemon that moves to a host with ffmpeg somewhere else re-detects on its own. Set the field explicitly to pin one binary and override detection. When nothing is found the daemon logs one line saying so — visible on `GET /api/v1/logs/amule`(#get-apiv1logsamule) — and extraction stays inert until ffmpeg is installed or the path is set. `connection.bind_address` (empty = bind to any local IP), `connection.bind_interface` (a daemon-side interface name such as `eth0` / `en0` / `tun0`; empty = any), and `online_signature.directory` are likewise daemon-side paths/addresses. These, together with `files.on_finished_start_next_alphabetically`, `security.reject_spoofed_source_ips`, `security.system_ipfilter_enabled`, and `online_signature.update_frequency_seconds`, are ordinary daemon settings; a `bind_address` change takes effect on the next amuled restart.
+
+`files.mmap_supported` is **read-only** — the daemon advertises whether it was built with memory-mapped file I/O (`false` on a core without mmap support, e.g. Windows or a build with `-DENABLE_MMAP=OFF`); it is ignored if sent on PATCH. `files.mmap_enabled` is the runtime toggle for memory-mapped block I/O — download writes to part files, upload reads of both shared (completed) and partial files, and hashing (lower per-process memory use, at some write-path cost; best for upload-heavy or memory-constrained hosts). It is **capability-gated**: a PATCH that sets `files.mmap_enabled` is rejected with **409 `option_not_supported`** when `files.mmap_supported` is `false`, so the option is only writable against a daemon that can actually use it. Safe to toggle with active transfers.
+
+`connection.upnp_enabled` toggles UPnP router forwarding of the daemon's P2P ports — the ports themselves are `connection.tcp_port` (ed2k TCP) and `connection.udp_port` (ed2k/Kad UDP). `connection.upnp_control_point_port` is a separate optional knob: the fixed local port the UPnP control point (libupnp) binds to for the router's callbacks, `0` meaning auto-assign — **not** a forwarded port. `connection.upnp_supported` is **read-only** — the daemon advertises whether it was built with UPnP (`false` on a core built `-DENABLE_UPNP=OFF`, where `upnp_enabled` has no effect); it is ignored if sent on PATCH. (Web-server and EC-port UPnP are intentionally not exposed — amuleweb is deprecated and the EC port is not a P2P port.)
+
+The `connection.proxy_*` fields configure the proxy the **daemon** routes its P2P and HTTP traffic through. `proxy_type` is one of `"socks5"` / `"socks4"` / `"http"` / `"socks4a"` — any other value is a `400`. It is the empty string when the daemon has no proxy type configured at all (the core's `PROXY_NONE`), a state that cannot be set back through this API; use `proxy_enabled: false` to turn the proxy off. `proxy_auth_enabled` toggles username/password authentication. `proxy_password` is **write-only** — accepted on PATCH but never returned on GET (same as the `remote_controls` passwords); PATCH the other proxy fields without it to leave the stored password unchanged.
+
+**Errors:** `503 ec_unavailable`.
+
+#### `PATCH /api/v1/preferences`
+
+**Auth:** `ADMIN`
+
+**Not every field in the `GET` is writable.** The payload mixes four kinds, and the response does not mark them, so this is the list:
+
+| Kind | What `PATCH` does | Examples |
+| --- | --- | --- |
+| Settable | applied | most of the 125 -- `files.mmap_enabled`, `connection.max_connection_count`, … |
+| Read-only status | ignored, request still succeeds | `files.mmap_supported`, `connection.upnp_supported`, the six `geoip.*` |
+| Write-only | applied, never echoed on `GET` | `remote_controls.webserver.password`, `.guest_password` |
+| Refused | `400 bad_request` | `remote_controls.amuleapi.password`, `.guest_password`, `.guest_enabled` |
+
+Read-only fields are **ignored rather than rejected** when they arrive alongside at least one writable field, so the obvious way to use this endpoint -- `GET` the object, change one value, `PATCH` the whole thing back -- keeps working. A body naming *only* read-only fields is a `400` that says which ones: `no writable fields in the request; files.mmap_supported is read-only`.
+
+Body shape mirrors the GET; every sub-object and every field is optional, and fields not present are left unchanged. Subset example:
+
+```json
+{ "files": { "add_new_downloads_paused": true }, "servers": { "dead_server_retry_count": 5 } }
+```
+
+`remote_controls` nests its two independent subsystems as `remote_controls.webserver` and `remote_controls.amuleapi` rather than prefixing every field. It reports amuleapi's `enabled` / `port` / `bind_address`, but **not** whether its admin or guest password is set. Those live in `amuleapi-passwords`, which amuleapi owns and which may sit on a different host from amuled — so the daemon's view of that file can be the wrong one. Ask the API that actually reads it: `GET /auth/passwords`(#get-apiv1authpasswords), which is admin-only, whereas this endpoint is readable by any authenticated role. `webserver.guest_enabled` is reported because it is a genuine amuled preference rather than a fact about another process's file.
+
+**Write-only passwords** (accepted here, never echoed on GET) live under `remote_controls.webserver`: `password`, `guest_password`. Send the plaintext — amuled stores the hash. `guest_password` is accepted whether or not the webserver's guest access is enabled: amuled stores the hash either way, and it simply sits inert until `guest_enabled` is turned on. (amuleapi's own `PATCH /auth/passwords`(#patch-apiv1authpasswords) does enforce the pairing, and answers `400`; these are different credentials on different daemons.)
+
+amuleapi's own `admin` and `guest` passwords are **not** settable here; `remote_controls.amuleapi.password`, `.guest_password` and `.guest_enabled` are rejected with `400 bad_request`. Use `PATCH /auth/passwords`(#patch-apiv1authpasswords), which writes the credential file this daemon actually reads, requires the current password, and is rate-limited. A field here would instead travel over EC to whichever aMule this amuleapi is attached to and land in that host's config directory.
+
+**`geoip`** accepts `enabled`, `source` (`"dbip"` / `"maxmind"` / `"custom"` — any other value is a `400`), `custom_update_url`, `maxmind_license`, and `auto_update_enabled`. `supported` and the read-only status fields (`loaded_source`, `db_path`, `db_loaded`, `download_in_progress`, `last_update_status`) are ignored if sent.
+
+Downloading a database **now** is `POST /geoip/update`(#post-apiv1geoipupdate), not a field here: it is an action, not a setting. Sending `geoip.update_now` in this body is a `400` naming that endpoint.
+
+> **Note:** these are the daemon's live settings — the same ones the desktop GUI edits. Some are self-affecting: changing `remote_controls.amuleapi.port` / `.bind_address`, or `directories.incoming_path` / `temp_path`, alters the very daemon you are talking to. A port/bind change only takes effect on the next amuled restart, so it will not drop your current connection mid-request.
+
+**Response:** `200 OK` — full preferences object (post-mutation), so a read-modify-write client can confirm what landed without a follow-up GET.
+
+**Numeric fields are bounded to what the daemon can actually hold**, not to the width of their JSON type. A value outside the range is a `400` naming the range; it is never accepted and quietly changed. Several of these bounds are much narrower than they look, because the core stores the setting differently from how the API spells it:
+
+| Field | Range | Step | Why |
+|---|---|---|---|
+| `connection.tcp_port` | `1`–`65532` | | the server UDP socket is TCP+3, and the core substitutes the default port for anything higher |
+| `connection.upload_slot_min_kibibytes_per_second` | `1`–`65535` | | the core clamps anything lower up to `1`, so a `0` would answer `200` and read back as `1` |
+| `advanced.file_buffer_bytes` | `0`–`3825000` | `15000` | stored as a `uint8` count of 15000-byte blocks |
+| `advanced.max_upload_queue_client_count` | `0`–`25500` | `100` | stored as a `uint8` count of hundreds |
+| `advanced.max_new_connections_per_5_seconds` | `0`–`65535` | | stored as a `uint16` |
+| `advanced.kad_max_concurrent_source_search_count` | `5`–`50` | | clamped to this range at daemon start |
+| `advanced.kad_source_reask_minutes` | `30`–`60` | | clamped to this range at daemon start |
+| `advanced.source_reask_minutes` | `15`–`60` | | clamped to this range at daemon start; below it the UDP reask gets you auto-banned for reask spam |
+| `security.ipfilter_min_access_level` | `0`–`255` | | an ipfilter.dat access level, not a percentage: an entry is enforced when its level is **below** this value, so `0` disables the list and `255` enforces every entry |
+| `online_signature.update_frequency_seconds` | `0`–`65535` | | stored as a `uint16` |
+| `advanced.server_keepalive_timeout_minutes` | `0`–`71582` | | the core stores milliseconds in a `uint32`, and 71582 minutes is where that overflows |
+
+The two fields with a **step** accept only whole multiples of it: `file_buffer_bytes: 20000` is a `400`, not a silent round down to `15000`. The names stay in the unit you think in rather than being renamed to the daemon's internal one, and the price is that the API is strict about the values in between.
+
+The three **clamped at daemon start** rows are the reason this is enforced on the write rather than left to the client to check. Their setters assign the value raw, so a `GET` right after the `PATCH` reports it back faithfully and only the next restart reveals that the daemon never kept it.
+
+**A low `connection.max_upload_kibibytes_per_second` caps `max_download_kibibytes_per_second`,** which is the one place a `PATCH` changes a field the request did not name. Below `4` KiB/s up the download limit is forced to 3× the upload; below `10` it is forced to 4×. So `PATCH {"connection": {"max_upload_kibibytes_per_second": 3}}` also sets `max_download_kibibytes_per_second` to `9`. This is a deliberate anti-leech rule in the core rather than a defect, it applies whichever of the two you write, and the `PATCH` response echoes the whole preferences object so the adjusted value is visible in the reply.
+
+**Errors:** `400 bad_request` (unknown/mis-typed field, or a body with no recognized fields), `409 option_not_supported` (the daemon was built without support for the option being set), `400 amuled_rejected`, `503 ec_unavailable`.
+
+---
+
+### Network control
+
+These endpoints drive amuled's connect/disconnect to the ed2k network, the Kad network, or both.
+
+#### `POST /api/v1/networks/connect`
+
+**Auth:** `ADMIN`
+
+**Body:** `{ "network": "ed2k" | "kad" | "both" }` (optional; defaults to `"both"`). Same shape as `/networks/disconnect` — `"ed2k"` fires `EC_OP_SERVER_CONNECT`, `"kad"` fires `EC_OP_KAD_START`, omitted/`"both"` fires `EC_OP_CONNECT`.
+
+**Response:** `202 Accepted`, with amuled's own account of what it did:
+
+```json
+{ "message": "Connecting to eD2k...; Connecting to Kad..." }
+```
+
+`message` is amuled's status text, verbatim; the two networks' lines are joined with `; ` when both act, and it is absent when the daemon said nothing. `202` rather than `200`: the request is handed to amuled over EC and returns before the effect is observable, which is as true of a disconnect as of a connect -- so both answer the same status.
+
+**Errors:** `400 bad_request` (unknown selector), `400 amuled_rejected` (the daemon refused the operation), `503 ec_unavailable`.
+
+#### `POST /api/v1/networks/disconnect`
+
+**Auth:** `ADMIN`
+
+**Body:** `{ "network": "ed2k" | "kad" | "both" }` (optional; defaults to `"both"`).
+
+**Response:** `202 Accepted`, with amuled's own account of what it did:
+
+```json
+{ "message": "Disconnected from eD2k.; Disconnected from Kad." }
+```
+
+`message` is amuled's status text, verbatim; the two networks' lines are joined with `; ` when both act, and it is absent when the daemon said nothing. `202` rather than `200`: the request is handed to amuled over EC and returns before the effect is observable, which is as true of a disconnect as of a connect -- so both answer the same status.
+
+**Errors:** `400 bad_request` (unknown selector), `400 amuled_rejected` (the daemon refused the operation), `503 ec_unavailable`.
+
+> Kad connect and disconnect are driven through the `/networks/{connect,disconnect}` body selector — `{"network":"kad"}`. The `/kad/bootstrap` endpoint below is a genuinely distinct operation.
+
+#### `POST /api/v1/kad/bootstrap`
+
+**Auth:** `ADMIN`
+
+Manual Kad bootstrap against a single known-good Kad node. Fires `EC_OP_KAD_BOOTSTRAP_FROM_IP` against amuled. This is the only Kad bootstrap surface the EC protocol exposes — `nodes.dat` is read by amuled at startup from its own data directory and is NOT manageable via REST.
+
+**Body:** `{ "ip": "203.0.113.5", "port": <uint16> }`. `ip` is a dotted-quad string, per the IP addresses(#ip-addresses) rule; the conversion to the integer EC carries happens inside amuleapi. `port` is the contact's UDP port.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  -H 'Content-Type: application/json' \
+  -d '{"ip":"203.0.113.5","port":4672}' \
+  "http://$HOST/api/v1/kad/bootstrap"
+```
+
+**Response:** `202 Accepted` → `{ "ip": "1.2.3.4", "port": 4672 }`. The Kad probe itself is fire-and-forget UDP; the `202` confirms amuled accepted the request, not that the contact was reachable.
+
+The echo is the documented exception to the no-body rule for actions: it reports **which address the daemon parsed**, which the caller cannot read back anywhere else. `ip` comes back as a dotted quad -- the spelling the request used and the one every other IP on this surface uses, not the host-order integer EC carries internally (a value no other field on this surface produces, and one a client could not post back without converting).
+
+**Errors:** `400 bad_request` (missing `ip`, or an `ip` that is not a string — a numeric one included, missing/non-integer `port`, port outside `1..65535`, malformed dotted-quad), `400 amuled_rejected`, `503 ec_unavailable`.
+
+#### `POST /api/v1/kad/update`
+
+**Auth:** `ADMIN`
+
+Downloads a `nodes.dat` from the supplied URL and rebuilds the Kad node list from it — the Kad counterpart of `POST /api/v1/servers_update`(#post-apiv1servers_update), and the same operation the desktop GUI's "Update node list from URL" button drives.
+
+**Body:**
+
+```json
+{ "url": "https://upd.emule-security.org/nodes.dat" }
+```
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  -H 'Content-Type: application/json' \
+  -d '{"url":"https://upd.emule-security.org/nodes.dat"}' \
+  "http://$HOST/api/v1/kad/update"
+```
+
+Two side effects are worth planning for. The URL is **persisted** into the `kad.update_url` preference, so a subsequent `GET /preferences` reflects it — there is no need to PATCH it separately. And once the download completes, amuled **stops Kad, swaps in the new `nodes.dat`, and starts Kad again**; expect a brief Kad outage and a `kad_state` transition on the SSE stream. The desktop GUI prompts before doing this; the API does not.
+
+**Response:** `202 Accepted`, no body. The URL came from the request, and the download is asynchronous -- the `202` confirms amuled accepted the request, not that the node list was replaced, and its outcome arrives on the log channel.
+
+**Errors:** `400 bad_request` (missing/non-string/empty `url`, or a scheme other than `http://` / `https://`), `400 amuled_rejected`, `503 ec_unavailable`.
+
+#### `GET /api/v1/kad`
+
+**Auth:** `GUEST`
+
+Standalone view of the Kad subtree from `/status`, plus the detail fields the status rollup omits (`node_id`, `firewalled_udp`, `lan_mode`, your `public_ip`, the `indexed` Kad-store counters, and `buddy` contact info for low-ID clients). Together with `GET /api/v1/preferences` (for the TCP/UDP port numbers the firewalled messages quote) this covers every row of the desktop client's **Networks → Kad Info** panel.
+
+```json
+{
+  "state": "connected",
+  "node_id": "8f3a1c07d94b2e5a6018bb4c7f209d3e",
+  "firewalled_tcp": false,
+  "firewalled_udp": false,
+  "lan_mode": false,
+  "connected_since_at": 1751000000,
+  "public_ip": "203.0.113.5",
+  "network": { "user_count": 5400000, "file_count": 1400000000, "node_count": 2400 },
+  "indexed": { "sources": 12000, "keywords": 8500, "notes": 0, "load_percent": 14 },
+  "buddy": { "state": "connected", "ip": "203.0.113.9", "port": 4672 }
+}
+```
+
+| Field | Type | Meaning |
+|---|---|---|
+| `state` | string | `disabled` / `connecting` / `connected`. `disabled` means Kad is not running at all, which is the condition several fields below key their "no measurement" value on. The same value `GET /api/v1/status` reports as `kad.state`. |
+| `node_id` | string \| null | This node's own 128-bit Kademlia id, 32 lowercase hex characters (the desktop panel shows the same value uppercase). `null` while Kad is not running, which is exactly when `state` is `disabled`. Persisted by the daemon, so unlike the session-scoped ECIDs and the server-assigned eD2k id it is stable across restarts — the one identifier for the local node a consumer can key on. It is a DHT routing key, not a credential: every Kad contact the daemon talks to learns it. |
+| `connected_since_at` | int | Unix seconds of the most recent Kad connect, the same value `GET /api/v1/status` reports as `kad.connected_since_at`. `0` when not connected, so gate on `state` rather than trusting a `0`. |
+| `public_ip` | string \| null | This node's externally-visible IPv4, as a remote Kad contact reported it back. Two "not known" cases, both matching what the desktop panel's *IP address* row shows: `null` while Kad is not connected (the daemon sends the field only then), and `0.0.0.0` while connected but not yet told its own address by any contact. **Two distinct "unknown" sentinels, one of them a syntactically valid address**: a consumer that only checks for `null` will treat `0.0.0.0` as a real IP. Distinct from `preferences.connection.bind_address`, which is the local interface the daemon binds to. Named `public_ip` rather than `ip` because `buddy.ip` in the same payload belongs to somebody else. |
+| `firewalled_tcp` | bool \| null | Whether this node is firewalled for **TCP**. The verdict is a **vote**: two distinct clients must confirm reachability by opening an incoming TCP connection carrying `OP_KAD_FWTCPCHECK_ACK` before it clears to `false`. With no verdict yet it reads **`true`**, the conservative assumption. During an IP recheck it freezes at its previous value rather than momentarily reporting a false LowID. **`null` unless `state` is `connected`** - the underlying bit outlives a disconnect, so a stale reachability verdict for a network the daemon is not on is never surfaced. Named for the transport because it is one half of a pair, not an overall verdict that `firewalled_udp` refines. |
+| `firewalled_udp` | bool \| null | Whether this node is firewalled for **UDP**, measured by an entirely different mechanism: a directed test with its own state, which can also declare firewalled **by timeout** after six minutes. **`null` unless `state` is `connected`.** While Kad is down there is no measurement, so this is `null` rather than a `false` that would read as "UDP is open" - matching `firewalled_tcp`'s null, so the pair cannot mislead. |
+| `lan_mode` | bool \| null | `true` when the daemon is running Kad in LAN mode. It **forces both firewalled fields to `false`** regardless of any measurement, which is why it belongs beside them: a `false` on either flag is only meaningful once you have checked this one. `null` unless `state` is `connected`. |
+| `network.user_count` / `.file_count` | int \| null | Network-wide estimates for the whole Kad network, not counts belonging to this node. The same values `GET /api/v1/status` reports under `kad.network`. **`null` unless `state` is `connected`** - not a stale last estimate that would be indistinguishable from a live reading. |
+| `network.node_count` | int \| null | **This node's own routing table size** - how many Kad contacts it currently holds - *not* a network-wide figure like the two above. Saturates at 65535 (the daemon counts it in a `uint16`). **`null` unless `state` is `connected`**: routing contacts outlive the disconnect, so a non-zero count on a fully stopped Kad is not surfaced. |
+| `indexed.sources` / `.keywords` / `.notes` | int \| null | Kad-store counters: how many entries this node is holding for the network as a DHT participant. `null` unless `state` is `connected` - a `0` there would be a real count, indistinguishable from an idle but connected node. |
+| `indexed.load_percent` | int \| null | A **load figure, not a count**, despite sitting beside three counts: it is the Kad store's fill level. `null` unless `state` is `connected`, on the same gate as the three counters above. |
+| `buddy.state` | string \| null | LowID-buddy state for NAT-traversal clients: `no_buddy` / `connecting` / `connected` (`unknown` only if the daemon ever ships a value outside its own enum). **`null` unless `state` is `connected`**, along with `buddy.ip` / `buddy.port`; a `no_buddy` there would be a real state rather than the absence of one. While connected with no buddy, `ip` / `port` are `0.0.0.0` / `0`. |
+
+---
+
+### IP filter
+
+The IP-filter *settings* are ordinary preferences (`security.ipfilter_*` on `GET`/`PATCH /api/v1/preferences`(#get-apiv1preferences)). The two endpoints here are the standalone operations behind the desktop client's Security page buttons: reloading the filter files amuled already has on disk, and downloading a new one.
+
+Neither reports its outcome in the response — amuled answers both immediately and does the work asynchronously. What actually happened shows up only in the amule log, readable through `GET /api/v1/logs/amule`(#get-apiv1logsamule) or the `logs` SSE channel. The lines to watch for:
+
+| Line | Meaning |
+|---|---|
+| `Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'.` | a reload started |
+| `IP filter is ready` | the new filter is live |
+| `Successfully updated ipfilter.dat` | the download landed and a reload follows |
+| `Failed to download ipfilter.dat from <url>` | the download failed; the old filter stays live |
+
+Those lines are gettext-translated at the daemon's locale and carry no correlation id, so treat them as human-readable output, not a machine-parseable contract.
+
+#### On-disk IPv6 filter entries
+
+Both `ipfilter.dat` and `ipfilter_static.dat` also accept native IPv6 CIDRs:
+
+```text
+2001:db8::/32,100,Example network
+2001:db8::1/128,0,Single address
+```
+
+The syntax is `address/prefix,level,description`: an unbracketed IPv6 literal, a prefix length from `0` through `128`, and a level from `0` through `255`. Host bits are cleared. Scope suffixes, IPv4-mapped literals and dotted IPv4 tails are not accepted. Descriptions may contain commas and colons. PeerGuardian lines keep their syntax. An AntiP2P line is rejected whole when anything other than whitespace follows its end address.
+
+A matching rule blocks only when its level is **below** the configured filter level. When IPv6 rules overlap, the later rule wins, not the longest prefix. `ipfilter_static.dat` loads last, so its rules can exempt addresses with a higher level. A reload replaces IPv4 and IPv6 rules together and keeps the old filter live until loading finishes.
+
+#### `POST /api/v1/ipfilter/reload`
+
+**Auth:** `ADMIN`
+
+Re-reads `ipfilter.dat` and `ipfilter_static.dat` from amuled's configuration directory into the live filter — the desktop client's "Reload List" button. Use it after dropping a filter file into that directory by hand. No body.
+
+amuled keeps the current filter live until the new one has finished loading, so this is accepted, never completed.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/ipfilter/reload"
+```
+
+**Response:** `202 Accepted` with **no body** (not an empty object): amuled returns no status string for this opcode, and the route sends nothing rather than inventing one. A client that parses the body unconditionally has to tolerate a zero-length one -- the same shape `POST /api/v1/geoip/update`(#post-apiv1geoipupdate) and the other fire-and-forget actions answer with.
+
+**Errors:** `400 amuled_rejected`, `503 ec_unavailable`.
+
+#### `POST /api/v1/ipfilter/update`
+
+**Auth:** `ADMIN`
+
+Downloads an `ipfilter.dat` from a URL, swaps it in and reloads — the desktop client's "Update now" button.
+
+**Body (optional):**
+
+```json
+{ "url": "http://upd.emule-security.org/ipfilter.zip" }
+```
+
+`url` must start with `http://` or `https://` when given. Omit it and the configured `security.ipfilter_update_url` is used instead; if that is empty too the request is rejected `400 bad_request` rather than accepted and silently dropped. The configured value is read from amuleapi's preferences snapshot, which trails amuled by up to one refresh tick — a `PATCH /preferences` immediately followed by a bodyless update can still send the previous URL, so pass `url` explicitly when it matters which one runs.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  -H 'Content-Type: application/json' \
+  -d '{"url":"http://upd.emule-security.org/ipfilter.zip"}' \
+  "http://$HOST/api/v1/ipfilter/update"
+```
+
+An explicit URL is **persisted** into the `security.ipfilter_update_url` preference, so a subsequent `GET /preferences` reflects it and the next startup auto-update (`security.ipfilter_auto_update_enabled`) uses it — the same side effect `POST /api/v1/servers_update`(#post-apiv1servers_update) and `POST /api/v1/kad/update`(#post-apiv1kadupdate) have.
+
+**Response:** `202 Accepted`, no body. Where the request named a URL it already knows which one ran; where it omitted one, `security.ipfilter_update_url` on `GET /preferences`(#get-apiv1preferences) is the answer, and the paragraph above is why reading it there is the honest version -- the snapshot this handler resolves from is the same one that endpoint serves.
+
+**Errors:** `400 bad_request` (non-string / empty / non-`http(s)` `url`, or no URL available at all), `400 amuled_rejected`, `503 ec_unavailable`.
+
+---
+
+### GeoIP
+
+#### `POST /api/v1/geoip/update`
+
+**Auth:** `ADMIN`
+
+Downloads a fresh GeoIP database now — the desktop client's "Update database now" button. No body.
+
+Unlike the three sibling fetch endpoints this one takes **no URL**: which database to download is `geoip.source` (`"dbip"` / `"maxmind"` / `"custom"`) and, for `"custom"`, `geoip.custom_update_url`. Both stay ordinary preferences, so set them with `PATCH /preferences`(#patch-apiv1preferences) first and then call this. Nothing about the request is persisted.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" \
+  "http://$HOST/api/v1/geoip/update"
+```
+
+**Response:** `202 Accepted` with **no body**. The download runs in the daemon after the reply: watch `geoip.download_in_progress` on `GET /preferences`(#get-apiv1preferences) while it runs, and `geoip.last_update_status` for the outcome.
+
+`geoip.last_update_status` is a **human-readable message, localised to the daemon's language** (`"Successfully updated dbip"`, `"Failed to download dbip from …"`) — not a status enum. Do not parse it; use `db_loaded` and `loaded_source` for the machine-readable answer to "is a database in use, and which one".
+
+A daemon built without GeoIP (`geoip.supported` is `false`) answers `400 amuled_rejected`.
+
+**Errors:** `400 amuled_rejected` (no GeoIP support, or the daemon refused the trigger), `503 ec_unavailable`.
+
+---
+
+### Logs
+
+#### `GET /api/v1/logs/amule`
+
+**Auth:** `GUEST`
+
+amuled's general log buffer.
+
+**Query parameters:** `tail=N` — return only the last N lines (default: full buffer).
+
+```json
+{
+  "lines": "2026-06-19 11:00:00: line one", "...line two",
+  "total_lines": 1024,
+  "returned_lines": 2
+}
+```
+
+`lines` is the array of log lines; `total_lines` is how many lines are held in the buffer and `returned_lines` how many this response carried (≤ `tail`).
+
+**Errors:** `400 bad_request` (`tail` is not an integer, or outside `0`-`100000`), `400 amuled_rejected` (the daemon refused the read), `503 ec_unavailable`.
+
+#### `DELETE /api/v1/logs/amule`
+
+**Auth:** `ADMIN`
+
+Clears the buffer.
+
+**Response:** `204 No Content`, with no body -- a pure action with nothing to report.
+
+**Errors:** `400 amuled_rejected` (the daemon refused the reset), `503 ec_unavailable`.
+
+#### `GET /api/v1/logs/server_info` / `DELETE /api/v1/logs/server_info`
+
+**Auth:** `GUEST` / `ADMIN`
+
+The ed2k server-info log buffer. Unlike `/logs/amule`, amuled ships this one as a single accumulated text blob, so the GET returns a `text` **string** rather than a `lines` array. `?tail=N` still selects by trailing lines (it walks back N newline boundaries), but the byte counts in the response describe the result.
+
+```json
+{
+  "text": "Connecting to eMule Server (203.0.113.5:4242)\nConnection established\n",
+  "total_bytes": 4096,
+  "returned_bytes": 68
+}
+```
+
+**Errors:** `400 bad_request` (`tail` is not an integer, or outside `0`-`100000`), `400 amuled_rejected` (the daemon refused the read), `503 ec_unavailable`.
+
+`DELETE /api/v1/logs/server_info` clears the buffer and answers `204 No Content` with no body. Its own errors are `400 amuled_rejected` (the daemon refused the reset) and `503 ec_unavailable`.
+
+---
+
+### Statistics
+
+#### `GET /api/v1/stats/tree`
+
+**Auth:** `GUEST`
+
+**Query parameters:** `max_client_versions=N` (`0`–`255`, default `0` = unlimited) — caps how many per-software **version** rows the daemon serializes. Only the version lists are affected; the OS breakdown and the fixed skeleton nodes are always complete. A long-lived node accumulates hundreds of version rows, so a dashboard showing a top-10 should pass this rather than discard the rest client-side.
+
+A tree mirroring amuled's "Statistics" tree (transfers, connections, clients, servers, downloads). Cached with a 1 s TTL.
+
+The envelope is `{ "nodes": ... }`. Each node is `{ "key": "<id>", "label_value": "<value>", "label": "<template>", "values": ..., "children": ... }`. A leaf is a node whose `children` array is empty. `key` is optional; `label_value` is always present, `null` unless the node's `label` is itself data (see below).
+
+`label` is the **untranslated English template** (e.g. `"Total uploaded: %s"`), and `values` are the **typed, raw** values that fill its `%s` placeholders in order — the client formats and localizes them. This keeps the response identical regardless of the amuleapi/amuled `--locale` (see Response model(#response-model)). A container node (one that only groups children) has an empty `values` array.
+
+`key` is a **stable, machine-readable identifier** for the node (e.g. `"upload_data"`, `"ul_dl_ratio"`, `"servers_working"`). Unlike `label`, it does not change when the label is reworded, and it is never translated — use it to locate a specific field instead of matching on the label string. The `key` is optional: it is present only for nodes the daemon assigns one to, and it is omitted entirely when absent (older daemons that predate this field emit no `key` at all). Keys are unique among the fixed skeleton nodes; the dynamic per-client-software rows share a key by kind (see below).
+
+`label_value` is the **raw, untranslated machine value** for nodes whose `label` is itself data — the per-client-software breakdown rows, where the label is a version or OS string (`"v0.70b: %s"`, `"Linux: %s"`). It carries just that value (`"v0.70b"`, `"Linux"`) so a client reads it directly instead of parsing it out of the `label`. Present as a string on those rows and `null` otherwise, including on daemons that predate the field; the key itself is always emitted. These rows are grouped under the `client_versions` / `client_operating_system` container nodes and each row carries `key: "client_version"` / `key: "client_os"` — so the `key` tells you the kind and `label_value` gives the value.
+
+Each value is `{ "type": "<type>", "value": <raw> }`:
+
+| `type` | `value` JSON | meaning |
+| --- | --- | --- |
+| `integer` | number | plain count |
+| `bytes` | number | raw bytes |
+| `speed` | number | raw bytes/second |
+| `time` | number | raw seconds |
+| `double` | number | raw double |
+| `string` | string | opaque English string (e.g. a ratio, or `"Not available"`) |
+
+A `string` value that is a **well-known sentinel** additionally carries a `token` field with a stable, locale-independent token — currently `"never"` (a "Never" timestamp, e.g. max-connection-limit-reached) and `"not_available"` (a ratio with no data yet). The English `value` is left in place unchanged, so this is purely additive: prefer `token` when present and fall back to `value` otherwise. It is `null` on non-sentinel values and on daemons that predate the field; the key itself is always emitted.
+
+A value may carry a nested `extra` value of the same shape — whatever the desktop prints in parentheses. It is **three different quantities** depending on the node, so format it from its own `type` rather than assuming: a **percentage of the parent** on counter nodes that show one, a **packet count** beside a byte total on the packet nodes, and the **all-time total** beside a session figure on the transfer counters.
+
+The UL:DL ratio node (`key: "ul_dl_ratio"`) additionally carries two flat numeric fields, `ratio_session` and `ratio_total`, so clients don't have to parse its composite string value. Both are **download-per-upload** doubles (received ÷ sent bytes): `ratio_session` for the current session, `ratio_total` for all time. Each appears only when the daemon can compute it (both sides greater than zero), so both are absent when neither is available and on daemons that predate the fields. No other node type carries them.
+
+```json
+{
+  "nodes": 
+    {
+      "key": "transfer",
+      "label": "Transfers",
+      "label_value": null,
+      "values": ,
+      "children": 
+        {
+          "key": "uploads",
+          "label": "Uploads",
+          "label_value": null,
+          "values": ,
+          "children": 
+            {
+              "key": "upload_data",
+              "label": "Total uploaded: %s",
+              "label_value": null,
+              "values":  { "type": "bytes", "value": 13314398208, "token": null, "extra": null } ,
+              "children": 
+            },
+            {
+              "key": "ul_dl_ratio",
+              "label": "Session UL:DL Ratio (Total): %s",
+              "label_value": null,
+              "values":  { "type": "string", "value": "1 : 769.34 (1 : 1125.54)", "token": null, "extra": null } ,
+              "ratio_session": 769.34,
+              "ratio_total": 1125.54,
+              "children": 
+            }
+          
+        }
+      
+    }
+  
+}
+```
+
+A per-client-software version row (note `label_value`, and an `extra` that is a percentage of the parent here), and a sentinel value (note the additive `token`):
+
+```json
+{
+  "key": "client_version",
+  "label_value": "v0.70b",
+  "label": "v0.70b: %s",
+  "values":  { "type": "integer", "value": 42, "token": null, "extra": { "type": "double", "value": 12.5 } } ,
+  "children": 
+}
+```
+
+```json
+{
+  "label": "Max Connection Limit Reached: %s",
+  "values":  { "type": "string", "value": "Never", "token": "never", "extra": null } ,
+  "children": 
+}
+```
+
+**Errors:** `400 bad_request` for a `max_client_versions` outside `0`-`255` or not an integer; `503 ec_unavailable`.
+
+#### `GET /api/v1/stats/graphs/{graph}`
+
+**Auth:** `GUEST`
+
+Time-series points behind the desktop Statistics graphs.
+
+`{graph}` is one of `download_speed`, `upload_speed`, `connections`, `kad_nodes`.
+
+**Query parameters:**
+
+| Parameter | Type | Default | Meaning |
+|---|---|---|---|
+| `interval_seconds` | int, `1`–`3600` | `1` | Seconds between samples, and the same key the response echoes. Changes what amuled is asked for, so it changes the reach of the window: `interval_seconds=10` covers ten times as long at a tenth the resolution. |
+| `width` | int, `0`–`1800` | full window | Tails the response to the last `N` samples. Applied after the fetch, so it does not change what is requested, so it never changes the time span each sample covers. `0` means the full window, same as omitting it. |
+
+```json
+{
+  "graph": "connections",
+  "unit": "count",
+  "interval_seconds": 1,
+  "max_points": 1800,
+  "points": 
+    { "at": 1781430000, "value": 42, "active_download_count": 7, "active_upload_count": 4 },
+    { "at": 1781430001, "value": 44, "active_download_count": 8, "active_upload_count": 4 }
+  ,
+  "session": {
+    "downloaded_bytes": 12400000000,
+    "uploaded_bytes": 980000000,
+    "kad_node_seconds": 5400000,
+    "duration_seconds": 86400
+  }
+}
+```
+
+Each point has `at` (unix seconds) and `value`, spaced by `interval_seconds`. `unit` is `"bytes_per_second"` for the two speed graphs and `"count"` for the other two.
+
+`max_points` is how many points this daemon can answer with before it starts repeating records; `points` is never longer than it. It is not a constant across daemons, so a client that wants the deepest window available should read it rather than assume 1800.
+
+**`connections` only:** each point also carries `active_download_count` (clients being pulled from) and `active_upload_count` (clients being pushed to), alongside `value`, which stays the total connection count. Against an amuled that does not report them the two keys are **omitted entirely** rather than sent as `0`, so "not reported" is distinguishable from "nothing was transferring". They are all-or-nothing: either every point in a response has them or none does.
+
+**`session`** carries this-session figures so a client doesn't need a separate roundtrip:
+
+| Field | Meaning |
+|---|---|
+| `download_bytes` / `upload_bytes` | Bytes transferred this session. Granularity is 1 KiB — amuled tracks these in kibibytes and truncates before sending. |
+| `kad_node_seconds` | **Not a transfer figure.** The running per-second sum of the Kad node count, i.e. node·seconds. Divide by `duration_seconds` for the session-average node count, which is its only use. |
+| `duration_seconds` | Daemon uptime at the newest point. `0` if the daemon does not report it. Divide any of the three figures above by it to get the session average the desktop plots. |
+
+**Errors:** `400 bad_request` (`interval_seconds` or `width` non-numeric or out of range), `404 not_found` (unknown graph name), `503 ec_unavailable`.
+
+---
+
+### Search
+
+The search surface is admin-only because firing a global ed2k search has real network cost.
+
+#### `GET /api/v1/search`
+
+**Auth:** `GUEST`
+
+Lists every search amuled currently holds — including ones started by a **different** client (another amuleapi request, the monolithic GUI, an amulegui session). Each call is a direct round trip to amuled (`EC_OP_SEARCH_LIST`), independent of the Refresher-maintained `m_state` cache, so a search this process never saw a `POST /search` for still shows up here as soon as amuled is holding it. `GET /search/{id}/results`(#get-apiv1searchidresults) can then fetch that same `search_id` — on a cache miss it does its own one-off `EC_OP_SEARCH_LIST` check before returning `404`, so a search this endpoint just listed is never a dead end there.
+
+```json
+{
+  "searches": 
+    { "search_id": 42, "query": "ubuntu desktop iso", "type": "global", "state": "finished", "client_ecid": null, "started_at": 1751000000, "result_count": 182 },
+    { "search_id": 43, "query": "debian",             "type": "kad",    "state": "running",  "client_ecid": null, "started_at": 1751000042, "result_count": 57  },
+    { "search_id": 44, "query": "SomePeerNick",       "type": "browse", "state": "running",  "client_ecid": 621,  "result_count": 237 }
+  ,
+  "total": 3,
+  "offset": 0,
+  "limit": 3
+}
+```
+
+This is a list endpoint like the others: it takes `?limit`, `?offset`, `?sort` and `?order`, and carries the same `total` / `offset` / `limit` trio. See List pagination and sorting(#list-pagination-and-sorting); the sort keys are `search_id`, `query`, `started_at` and `result_count`.
+
+`search_id` is the value that fills `{id}` on every search-scoped path: `GET /search/{id}/results`(#get-apiv1searchidresults) to read its hits, `POST /search/{id}/stop`(#post-apiv1searchidstop) to stop it, `DELETE /search/{id}`(#delete-apiv1searchid) to free it. `type` is `"local"` | `"global"` | `"kad"` | `"browse"`. The first three are the vocabulary `POST /search`'s `type` accepts; `"browse"` is reported only, for a "View Files" listing of one client's share, which is started through the client endpoints rather than by a query. `state` is `"running"` | `"finished"` | `"idle"`, same vocabulary and meaning as `GET /search/{id}/results`'s `progress.state`.
+
+For a `"browse"` entry, `state` and the results endpoint's `progress.percent` come from the browse's own lifecycle rather than from a query's: the request being sent is `"running"`, and the client having answered, denied the request, or disconnected mid-list is `"finished"` — a browse is never reported as `"idle"`. `percent` is the share of the client's directory list received so far, so it climbs while the listing streams in rather than jumping straight from `0` to `100`.
+
+Browsing a client that is **already being browsed** returns the id already in flight rather than starting a second one, so this list holds one entry per browsed client, not one per request.
+
+`query` is the daemon's name for the search. For a `"browse"` that is **the client's nickname**, not a query string — a browse has no query. `client_ecid` is the browsed client's ecid on a `"browse"` entry and `null` on an ordinary search, so a consumer can tell whose share is being listed and cross-reference `GET /clients`(#get-apiv1clients); it is always present, `null` rather than omitted.
+
+`started_at` is the Unix second amuleapi started the search, and it is the **only recency signal on this list**: entries arrive ordered by `search_id`, and id order is not start order, because Kad search ids carry a high-bit mask and therefore always sort above eD2k ones. Ask for `?sort=started_at&order=desc` when you need "the newest search".
+
+It is **omitted** for any search this `amuleapi` process did not start itself — one begun by another client, by the desktop GUI, or restored from the daemon's on-disk ring after a restart. The daemon ships no timestamp of its own, so there is nothing to report for those; treat a missing `started_at` as *unknown*, not as oldest.
+
+`result_count` is how many results the daemon currently holds for that search. It matches the `total` that `GET /search/{id}/results`(#get-apiv1searchidresults) reports for the same id once the search has finished; while one is still running the two can differ by a fetch, because this number comes straight off the daemon's live index and `total` counts what amuleapi last pulled into its cache. It counts top-level hits only: grouped alternative filenames ride their parent's `alternate_names` and are not counted separately. On a `"browse"` entry it is the files received from the client so far. Like every other field on this listing it is a snapshot at request time, so a running search's count climbs between calls.
+
+It exists so a client that adopts the whole list and fetches each search's results lazily — on first activation of a tab, rather than all at once at load — has a number to label an unopened tab with. It is **omitted**, not zeroed, when the daemon does not report it: a daemon older than this field sends nothing, and "does not report counts" has to stay distinguishable from "this search found nothing". Same rule as `started_at` above.
+
+amuled only tracks multiple concurrent searches for clients that advertise multi-search support; `amuleapi` does, so this always reflects the full live set. `searches` is an empty array when amuled holds no searches, never an error.
+
+**Errors:** `503 ec_unavailable`.
+
+#### `POST /api/v1/search`
+
+**Auth:** `ADMIN`
+
+Kicks off a new search. amuleapi supports **several concurrent searches** — a new search does NOT stop or wipe the others. amuled allocates a globally-unique `search_id` for each start and returns it; every subsequent results/stop/more call names that id in the path. There is no implicit "current search": keep the id you are given, or re-discover it through `GET /search`(#get-apiv1search).
+
+**Body:**
+
+```json
+{
+  "query":     "ubuntu desktop iso",
+  "type":      "global",
+  "file_type": "disc_image",
+  "extension": "iso",
+  "min_size_bytes":  1000000000,
+  "max_size_bytes":  5000000000,
+  "min_source_count": 5
+}
+```
+
+Only `query` is required. `type` defaults to `"global"`; valid values are `"local"`, `"global"`, `"kad"`. `file_type` filters by category and takes the same tokens the result rows report: `"audio"`, `"video"`, `"picture"`, `"text"`, `"program"`, `"archive"`, `"disc_image"`. Omit it, or send `""`, for any type; anything else is `400 bad_request`, `"unknown"` included, since no ed2k category corresponds to it. `min_size_bytes`, `max_size_bytes` and `min_source_count` are integers: a fractional value is a `400` rather than being truncated, so a client that computed a size cannot half-apply a filter it thinks it set. A `"global"`/`"local"` (ed2k) search and a `"kad"` search run independently and can be in flight at the same time; starting one never disturbs the other.
+
+**Response:** `202 Accepted`, with a `Location: /api/v1/search/{search_id}` header and the created search as the body -- the same row `GET /search`(#get-apiv1search) lists, so it can go straight into a collection the client already keeps:
+
+```json
+{
+  "search_id":  42,
+  "query":       "ubuntu desktop iso",
+  "type":        "global",
+  "state":       "running",
+  "client_ecid": null,
+  "started_at":  1750412400
+}
+```
+
+Keep the `search_id` to read this search's results/progress or to stop it. This is one of the two creations that answer with the resource, because `EC_OP_SEARCH_START` really does hand one back; the ones whose EC op answers success or failure and nothing more are a bare `202` with no body.
+
+**Errors:** `400 bad_request` for any body validation (missing or non-string `query`, an unknown `type`, an unknown `file_type`, out-of-range size or availability bounds, and the rest of the body rules above); `400 amuled_rejected` when the daemon refuses the search (its own message is passed through); `502 amuled_rejected` when the daemon accepts it but returns no search_id; `503 ec_unavailable`.
+
+#### `GET /api/v1/search/{id}/results`
+
+**Auth:** `GUEST`
+
+**Path:** `{id}` — the `search_id` to read, from `POST /search`(#post-apiv1search) or `GET /search`(#get-apiv1search). Required. A non-numeric segment or `0` is `400 bad_request`, never a fallback to some other search. An id that names no live search (never started anywhere, freed, or evicted from amuled's ring — see below) returns `404 not_found`, distinct from a known-but-empty search which returns an idle/empty envelope.
+
+Returns one search's results buffer at the moment of the call PLUS a progress envelope so an empty `results` array isn't ambiguous between "search not started", "search in flight with no hits yet", and "search finished with zero hits".
+
+This endpoint does NOT busy-wait — it returns whatever amuled has in its result buffer right now. A client that wants to wait for completion should poll while `progress.state == "running"`. While a search is **running** the refresher polls amuled (`EC_OP_SEARCH_RESULTS` + `EC_OP_SEARCH_PROGRESS`, addressed by `search_id`) every tick, so this GET reads straight from that snapshot and successive polls see the growing result set with no extra EC roundtrip.
+
+A finished search keeps being refreshed. The daemon is polled for every search it holds in one incremental request per tick, so a search that has completed costs nothing to keep current and is not dropped from the poll set: a hit you download from it starts reading `status: "downloaded"` / `already_downloaded: true` without anyone having to ask.
+
+This endpoint additionally refreshes on read, coalesced by a ~1 s TTL, which covers the sub-tick window: a client that starts a Kad notes lookup and immediately re-reads sees the flag without waiting for the next tick. Repeated polling costs at most one EC roundtrip per second, not one per request.
+
+`POST /search` is one way a search becomes readable; an unknown `search_id` (one this session never started) triggers a one-off `EC_OP_SEARCH_LIST` check before the `404`. Once confirmed, that same request reads the search in full, so the first response already carries its whole result set rather than an empty one that fills in over the following ticks; it is then polled every tick like any other. A search another client (or the monolithic GUI) started is therefore readable here too, not just listable via `GET /search`(#get-apiv1search).
+
+amuled keeps a bounded ring of recent searches (20). A search evicted from that ring (because 20 newer searches were started) is reported to amuleapi as expired: its slot is retired as `finished` and reads with its `search_id` then return `404`.
+
+```json
+{
+  "results": 
+    {
+      "hash":         "8b54a3c2...",
+      "name":         "example-distribution-26.04-amd64.iso",
+      "size_bytes":   3825205248,
+      "sources":      { "total": 217, "complete": 142 },
+      "already_downloaded": false,
+      "rating":       0,
+      "status":       "new",
+      "file_type":    "video",
+      "directory":    "",
+      "media":        { "duration_seconds": 5400, "bitrate_kilobits_per_second": 1500, "codec": "H.264", "artist": "", "album": "", "title": "" },
+      "alternate_names": 
+        { "ecid": 621, "name": "example-distribution-26.04.iso", "sources": { "total": 40, "complete": 22 }, "directory": "" },
+        { "ecid": 622, "name": "example_distro_2604_amd64.iso",  "sources": { "total": 10, "complete":  3 }, "directory": "" }
+      ,
+      "kad_comment_lookup_running": false,
+      "comments": 
+    }
+  ,
+  "search_id":  42,
+  "query": "ubuntu desktop iso",
+  "progress": {
+    "state":    "running",
+    "type":     "kad",
+    "percent":  67
+  }
+}
+```
+
+Each result carries `sources` as a nested `{total, complete}` object — `total` is the swarm size amuled reports and `complete` is how many of those hold the file complete. `already_downloaded` is `true` when you are currently downloading the file or already have it completed/shared; it is `false` for a fresh result and for one you have canceled/removed (a canceled result is re-downloadable, so it does not read as held). `rating` is amuled's aggregated quality rating (`0` when unrated). `status` is this result's download status on your node — `"new"` / `"downloaded"` / `"queued"` / `"canceled"` / `"queued_canceled"`. `file_type` is the file-type token derived from the filename extension (same tokens as the shared-detail `file_type`(#get-apiv1sharedhash), e.g. `"video"` / `"audio"`; `"unknown"` when the name has no recognised extension). `media` is the audio/video media metadata(#media-metadata) object (same shape as the file-detail endpoints), and is **`null`** for a hit that carries no metadata (most global/Kad results), matching the blank Length/Bitrate/Codec/Artist/Album/Title columns in the desktop search list. The key is always present. **Unlike `media` on `GET /downloads/{hash}` and `GET /shared/{hash}`, which amuled probed locally, `media` on a search result is whatever the responding server advertised.** It is not verified against the file and can contradict it — a `.pdf` reporting a runtime and a video codec is a real observed result — so treat it as a hint, not as probed metadata. The one exception to "verbatim" is `codec`: it is mapped to the same display label as everywhere else (see media metadata(#media-metadata)), so an advertised `h264` reads as `"H.264"`; an unmapped codec still passes through unchanged.
+
+`directory` is the folder this file sits in **inside a browsed client's share** — the desktop search list's *Directories* column. It is populated only for results filed from a client's shared-file listing (see client browse(#post-apiv1clientsecidshared_files)) and is `""` on every ordinary server/Kad hit, which never carries it. It is per-result rather than per-search: two copies of one file in different folders of the same share group under a single parent and each keeps its own folder, exactly as the desktop shows them, which is why `alternate_names` entries carry it too.
+
+`search_id` and `query` identify the search these results belong to. `search_id` echoes the path so clients can key a view on the response alone; `query` is what the search was started with, so a client that adopted an id from `GET /search`(#get-apiv1search) can label it without a second call. For a **browse**, `query` is the client's nickname rather than a query string. `query` is `""` only for a search discovered before amuled reported a name for it.
+
+`alternate_names` is the result-grouping tree: amuled collapses hits that are the **same file** (same ed2k hash **and** size) but advertised under **different filenames** into one parent row, and `alternate_names` holds the alternative names. Every entry shares the parent's `hash` by construction — that is what groups them, so the `hash` is not repeated on each entry — and carries its own `name`, `sources`, `directory` and a distinct `ecid`; pass that `ecid` to `POST /search/results/{hash}/download`(#post-apiv1searchresultshashdownload) to download the file **under that chosen filename**. `alternate_names` is always present and is an empty array for a hit seen under a single name. The top-level `results` contains parents only — an alternative never appears as its own top-level entry.
+
+`kad_comment_lookup_running` and `comments` carry the file's community ratings/comments fetched from Kad. Unlike a download — whose comments come from connected sources — a search result has no sources, so `comments` is populated purely by an on-demand Kad notes lookup you start with `POST /search/results/{hash}/comments`(#post-apiv1searchresultshashcomments). `kad_comment_lookup_running` is `true` while that lookup is in flight and flips back to `false` when it finishes; `comments` is an empty array until notes arrive, each entry shaped like a download comment (`username` / `filename` / `rating` / `comment`, with `username` the responding node's IP or `Kad user`). Both fields are always present.
+
+The `progress` object carries the same `state` / `type` / `percent` fields as the `search_progress`(EVENTS.md#search_progress) SSE event, so REST pollers and stream consumers interpret progress identically. (The event additionally carries a `results` count, since — unlike this response — it has no `results` array beside it.)
+
+- `state` — `"running"` while the search is in flight, `"finished"` once amuled reports completion, `"idle"` when no search has run this session. This single field is canonical; a client that wants booleans can derive them (`complete = state == "finished"`, `active = state == "running"`).
+- `type` — the originally-requested search type (`"local"` | `"global"` | `"kad"` | `"browse"`), spelled like `POST /search`'s body field and the `searches` row.
+- `percent` — `0, 100`, computed by amuled for every search kind from its `EC_TAG_SEARCH_LIFECYCLE_PERCENT` tag. For **global** it is the real server-queue progress. For **Kad** — which has no measurable mid-flight progress — it is a cosmetic time-ramp off the fixed 45 s keyword-search lifetime, capped at 99 until amuled authoritatively reports completion (`EC_TAG_SEARCH_LIFECYCLE_STATE` = finished), at which point it snaps to 100. Treat the Kad value as a liveliness indicator, not an accurate estimate.
+
+A client that wants to wait for completion polls while `state == "running"`. amuled reports the lifecycle state directly (no sentinel decode), so `state == "running"` unambiguously means in-flight even for Kad; check `state` rather than trying to read `percent: 0` as stalled-or-absent. A Kad search that hits its result cap (`SEARCHKEYWORD_TOTAL`, 300) before the 45 s deadline finishes early — `state` flips to `finished` and `percent` jumps to 100 ahead of the ramp.
+
+**Errors:** `400 bad_request` (bad `{id}`), `404 not_found` (no such search). No `503`: this endpoint serves the refresher's cache, and a failed EC roundtrip while adopting an unknown `{id}` surfaces as the `404` rather than as an availability error.
+
+#### `POST /api/v1/search/{id}/stop`
+
+**Auth:** `ADMIN`
+
+Stops one search. No request body. Its cached results stay readable until it is freed or evicted, so a consumer viewing the search keeps seeing the set it was just looking at. Sibling searches are untouched.
+
+**Response:** `204 No Content`. The same status `DELETE /search/{id}`(#delete-apiv1searchid) answers with: what separates the two is that the results survive this one.
+
+**Errors:** `400 bad_request` (bad `{id}`), `404 not_found` (no such search), `405`, `400 amuled_rejected` (the daemon refused the operation), `503 ec_unavailable`.
+
+#### `DELETE /api/v1/search/{id}`
+
+**Auth:** `ADMIN`
+
+Stops the search **and frees it**: amuled drops it from its result ring and amuleapi drops its slot, so `GET /search/{id}/results`(#get-apiv1searchidresults) for it then returns `404`. Sibling searches are untouched. Use this when a consumer is done with a search rather than just pausing it; use `POST /search/{id}/stop` to halt the in-flight query but keep the results.
+
+Freeing a search delivers a `search_closed`(EVENTS.md#search_closed) event to every SSE subscriber, so other clients holding a view on it find out immediately.
+
+**Response:** `204 No Content`.
+
+**Errors:** `400 bad_request` (bad `{id}`), `404 not_found` (no such search), `405`, `400 amuled_rejected` (the daemon refused the operation), `503 ec_unavailable`.
+
+#### `POST /api/v1/search/{id}/more`
+
+**Auth:** `ADMIN`
+
+Widens a running **Kad** search — the desktop's **"More"** button. It re-asks the Kad clients already queried for a wider result frontier. No body.
+
+Kad-only and running-only, matching what the desktop button allows rather than what the core tolerates: amuled turns a `more` on a non-Kad or finished search into a silent no-op, so both are rejected here instead of being answered with a misleading `202`.
+
+**Response:** `202 Accepted`, no body - the reask was performed, or could not be performed *yet* but may be on a later press. The terminal case is the `409` below, so the status code is the whole answer.
+
+**When it can no longer be widened:** `409 Conflict`, code `kad_more_exhausted`. Kad allows at most **4** reasks per search, and stops accepting them entirely once the search enters its stopping window — which begins 20 s before a keyword search's 45 s life ends, or as soon as it has collected 300 answers. In practice that means `more` only does something during roughly the first half of a search; past that, this is the answer. Disable the control for that search when you see it: nothing about that search will make it widenable again, and re-running the query is the way to get more (a fresh `POST /search` succeeds immediately and returns a new `search_id`).
+
+A `202` does **not** promise a reask went out. A press made while no already-responded client is left un-reasked also answers `202`, because that clears the moment another client answers and retrying is the right next action. The distinction the status carries is *terminal* versus *not terminal*, which is what a UI acts on; the daemon's log line distinguishes all the individual outcomes for anyone debugging.
+
+Note that a successful reask changes neither `progress.percent` nor `progress.state` — the Kad percent is a wall-clock ramp off the search's own start time. The response is the only signal; do not try to infer the outcome from the progress envelope.
+
+**Older daemons.** A daemon predating this reports nothing, and amuleapi keeps answering `202` for every press rather than guessing. Absent is *unknown*, never *exhausted*.
+
+**Errors:** `400 bad_request` (bad `{id}`, a non-Kad search, or one that has already finished), `400 amuled_rejected`, `403 forbidden` (guest), `404 not_found` (no such search), `405`, `409 kad_more_exhausted`, `503 ec_unavailable`.
+
+#### Related-files search
+
+There is no endpoint for the desktop's **"Search related files (eD2k, local server)"** action, and none is needed: the GUI simply composes a magic keyword and starts an ordinary local search. Do the same.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" -H 'Content-Type: application/json' \
+  -d '{"query":"related::8b54a3c2...::0a1b2c3d...","type":"local"}' \
+  "http://$HOST/api/v1/search"
+```
+
+The query is the literal prefix `related` followed by one or more `::`-separated 32-char hex MD4 hashes — one per file you want related hits for (the desktop passes every selected result). `type` must be `"local"`: the request is answered by the ed2k server you are connected to, and there is no Kad or global equivalent.
+
+Not every server implements related search. Check the connected server's capability first rather than reading an empty result set as "nothing related": `GET /api/v1/servers`(#get-apiv1servers) reports `related_search` among each server's flags, and the desktop refuses the action outright when it is absent.
+
+#### `POST /api/v1/search/results/{hash}/download`
+
+**Auth:** `ADMIN`
+
+Promote a search result into the transfer queue. Equivalent to clicking "Download" on a desktop search row.
+
+**Body:** `{ "category_index": 0, "ecid": 621 }` — both optional. `category_index` is the download category (default `0`), spelled like the same field on `PATCH /downloads/{hash}`(#patch-apiv1downloadshash). `ecid` selects one grouped **alternative** by its `results.alternate_names.ecid`, so the file downloads **under that alternative's filename**; omit it to download the parent (the aggregated/highest-source name). Since grouped alternatives share the parent's hash, `{hash}` alone can't disambiguate them — `ecid` is how you pick a specific advertised name.
+
+**Errors:** `400 bad_request` (malformed `{hash}`, or a non-integer `category_index` / `ecid`), `400 amuled_rejected` (the daemon refused the download), `503 ec_unavailable`.
+
+**Response:** `202 Accepted`, no body. `hash` came from the URL and `category_index` is the value the request supplied; the download itself reports the category it landed in.
+
+#### `GET /api/v1/search/results/{hash}/comments`
+
+**Auth:** `GUEST`
+
+Community ratings/comments for a single search result — the Kad notes retrieved so far plus the running flag. The same data rides each result on `GET /search/{id}/results`(#get-apiv1searchidresults); this per-hash endpoint mirrors `GET /downloads/{hash}/comments`(#get-apiv1downloadshashcomments) for polling one result after starting a lookup.
+
+The route is deliberately **not** nested under a search id: amuled runs one Kad notes lookup per hash and fans the notes out to every result carrying it, so the lookup is not scoped to one search. This endpoint refreshes whichever search owns the hit before answering, which is what makes the flag below observable on a search that has already finished.
+
+```json
+{
+  "total": 2,
+  "kad_comment_lookup_running": false,
+  "comments": 
+    { "username": "203.0.113.7", "filename": "example-distribution-26.04-amd64.iso", "rating": 5, "comment": "Verified good, fast sources." },
+    { "username": "Kad user",    "filename": "example-distribution-26.04-amd64.iso", "rating": 4, "comment": "Works." }
+  
+}
+```
+
+`kad_comment_lookup_running` is `true` while an on-demand Kad notes lookup (triggered by the `POST` below) is in flight; poll until it returns to `false` to know the lookup finished. `username` is the responding Kad node's IP, or `Kad user` when the note carries no IP.
+
+**Polling is the only mechanism here — there is no event to wait for.** `comments_updated`(EVENTS.md#comments_updated) is emitted for downloads only and never fires for a search hit, so a client that starts a lookup polls this endpoint (or the results list) while `kad_comment_lookup_running` is `true`.
+
+**Errors:** `400 bad_request` (`{hash}` is not 32 hex characters), `404 not_found` (no live search result with that hash), `503 ec_unavailable`.
+
+#### `POST /api/v1/search/results/{hash}/comments`
+
+**Auth:** `ADMIN`
+
+Trigger an on-demand Kad notes lookup for a search result you have not downloaded. This is the search-side equivalent of `POST /downloads/{hash}/comments`(#post-apiv1downloadshashcomments): the lookup is asynchronous on amuled (up to ~45 s), and retrieved ratings/comments then appear via the `GET` above and on the result's `comments` in the search list.
+
+**Response:** `202 Accepted`, with no body.
+
+**Errors:** `400 bad_request` (malformed hash), `403 forbidden` (guest token — the lookup makes the daemon do network work, so it is `ADMIN`-only), `404 not_found` (no live search result with that hash), `400 amuled_rejected` (Kad down, or a search is already using this hash — retry shortly), `503 ec_unavailable`.
+
+---
+
+### Assets
+
+#### `GET /flags/{code}.png`
+
+**Auth:** `NONE` — public artwork, no per-installation data. `HEAD` is accepted too; any other method is `405 method_not_allowed`.
+
+The country-flag image for a `country_code`. `/clients`, `/servers` and their SSE diffs carry the ISO 3166-1 alpha-2 code (see `GET /api/v1/clients`(#get-apiv1clients)); this is where the matching artwork comes from, so a frontend does not have to ship its own flag set.
+
+Note the path is deliberately **outside** `/api/v1/` — it is an image an `<img src>` points at, not a JSON resource, and it is versioned by the daemon build rather than by the API contract.
+
+`{code}` must be exactly two **lowercase** ASCII letters, or the literal `unknown` for the "??" placeholder the desktop GUI falls back to when a code is empty or unrecognised. The bytes are the 16×11 famfamfam PNGs compiled into the daemon binary — the same artwork the desktop draws — so the route behaves identically whether or not `Server/StaticRoot` is set, and never touches the file system.
+
+```sh
+curl -s http://$HOST/flags/de.png -o de.png
+curl -s http://$HOST/flags/unknown.png -o unknown.png
+```
+
+**Response:** `200 OK`, `Content-Type: image/png`, `Cache-Control: public, max-age=86400`.
+
+Responses carry an `ETag` and honour `If-None-Match` with `304 Not Modified` like every other `GET` (see ETag and conditional GET(#etag-and-conditional-get)). The `max-age` is what keeps a client list full of `<img>` tags from issuing one conditional request per country on every reload; the artwork can only change with a new daemon build, and a day bounds how long an upgraded daemon keeps serving the old image.
+
+The response is never `Content-Encoding: gzip` — a PNG is already entropy-coded, so the server skips compression for it.
+
+**Errors:** `404 not_found` for anything that is neither two lowercase letters nor `unknown` (uppercase, wrong length, digits, another extension), and for a well-formed code the famfamfam set has no artwork for — it covers 248 of the assignable alpha-2 codes, so a resolvable country can legitimately have no flag. Render the code as text, or fall back to `unknown.png`, in that case. `400 bad_request` for paths carrying traversal tokens, per Path validation(#path-validation).
+
+Clients whose country could not be resolved — GeoIP disabled, unsupported by the build, or a private/unmatched address — come back with `country_code: null`. There is no per-country image to request in that case; draw nothing, or `unknown.png` for parity with the desktop list.
+
+---
+
+### Chat
+
+Conversations with clients, backed by the chat session store in `amuled`. The store is shared: a message sent from the desktop GUI, from amulegui or through this API lands in the same transcript, and every client sees the same conversation.
+
+A conversation is keyed on `{address}` = `"<ip>:<port>"` (for example `203.0.113.42:4662`). That is the readable form of the internal id the EC wire already uses, it is stable across client reconnects — unlike an ECID — and it needs no identifier of its own. A `{address}` that is not four dotted octets plus a port is a `400`.
+
+The store is **in memory**: an `amuled` restart empties every conversation, exactly as the desktop's own transcript dies with its notebook tab. Retention is bounded at 200 messages per conversation and 50 conversations, evicting the least recently active first.
+
+Message `id` is monotonic per `amuled` process and never reused, which makes it a safe polling cursor: `since_message_id` never returns a duplicate and never skips a message. It resets when the daemon restarts, which also empties the store.
+
+Every endpoint here answers `503 ec_unsupported` when the connected `amuled` does not serve chat.
+
+#### `GET /api/v1/chats`
+
+**Auth:** `GUEST`
+
+```sh
+curl -s -H "Authorization: Bearer $TOKEN" "http://$HOST/api/v1/chats"
+```
+
+```json
+{
+  "chats": 
+    {
+      "address":            "203.0.113.42:4662",
+      "ip":              "203.0.113.42",
+      "port":            4662,
+      "name":            "alice",
+      "client_ecid":     4382,
+      "friend_ecid":     12,
+      "connected":       true,
+      "message_count":   14,
+      "last_message_id":     91,
+      "last_message_at": 1786652714,
+      "last_message":    { "id": 91, "direction": "in", "text": "thanks!", "sent_at": 1786652714 }
+    }
+  ,
+  "total": 1, "offset": 0, "limit": 1
+}
+```
+
+`name` falls back to `"IP: <ip> Port: <port>"` when the core has no nickname for the client, matching what the desktop shows; the same string appears in the SSE payload. `client_ecid` is `null` when the client is offline and `friend_ecid` is `null` when the client is not a friend — join either against `GET /clients`(#get-apiv1clients) and `GET /friends`(#get-apiv1friends). `connected` says whether a connection to the peer is actually up, which is not the same as `client_ecid` being non-null: the daemon holds a client object from the first contact attempt, so a conversation opened against an unreachable address has an ecid and is not online. `null` means the daemon does not report peer connectivity.
+
+`last_message` is `null` for a conversation that holds none; the key is always present. The full transcript is deliberately **not** on the list: 50 conversations at 200 messages each would be 10 000 objects per read. Use the messages endpoint below.
+
+Served from the refresher snapshot — no EC roundtrip per request. Standard list envelope(#list-pagination-and-sorting); sortable on `last_message_at` and `name`.
+
+**Errors:** `503 ec_unsupported`, `503 ec_unavailable`.
+
+#### `GET /api/v1/chats/{address}/messages`
+
+**Auth:** `GUEST`
+
+**Query:** `since_message_id=N` (only messages with `id > N`), `tail=N` (the last N of that window, max `100000`). This selects a tail rather than a page, which is why it is not called `limit`: on the list endpoints `limit` is a window paired with `offset`, and one word meaning two things is a rule a client has to learn twice.
+
+```json
+{
+  "address": "203.0.113.42:4662",
+  "messages": 
+    { "id": 90, "direction": "out", "text": "hi",      "sent_at": 1786652700 },
+    { "id": 91, "direction": "in",  "text": "thanks!", "sent_at": 1786652714 }
+  ,
+  "total": 14,
+  "last_message_id": 91
+}
+```
+
+`direction` is `"in"` (from the client) or `"out"` (sent by us — from **any** client: this API, amulegui, or the desktop GUI). `sent_at` is stamped by the core when the message was received or sent, and is `null` only in the reply to a send: `EC_OP_CHAT_SEND` answers with the message id and no timestamp, and the core is the only thing entitled to stamp one. That reply is otherwise the same object shape this endpoint returns, emitted by the same writer, so a client can append it optimistically and reconcile on the next read. `total` counts everything the store holds for this conversation, not the returned window.
+
+**Errors:** `404 not_found` (no such conversation), `400 bad_request` (malformed `{address}` or query), `503 ec_unsupported`, `503 ec_unavailable`.
+
+#### `POST /api/v1/chats/{address}/messages`
+
+**Auth:** `ADMIN`
+
+**Body:** `{ "text": "hello" }` — non-empty, at most 1024 bytes.
+
+```sh
+curl -s -X POST -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" \
+  -d '{"text":"hello"}' "http://$HOST/api/v1/chats/203.0.113.42:4662/messages"
+```
+
+```json
+{ "address": "203.0.113.42:4662",
+  "message": { "id": 92, "direction": "out", "text": "hello", "sent_at": null } }
+```
+
+The created message stays in the body because the store-assigned `id` is only readable here. It is the same object shape `GET /chats/{address}/messages`(#get-apiv1chatsaddressmessages) returns, emitted by the same writer, with one difference: `sent_at` is **`null`**, because `EC_OP_CHAT_SEND` answers with the message id and no timestamp. Read the timestamp back from `GET /chats`(#get-apiv1chats) (as `last_message`), from the per-conversation messages endpoint, or from the `chat_message` SSE event.
+
+The core creates the conversation if it does not exist, so this doubles as "start a chat with this address" — an unknown `{address}` is not a `404` here.
+
+This is the only way to send: a conversation is addressed by `ip:port`, never by ECID. The address is already on the rows a caller holds — `GET /friends`(#get-apiv1friends) and `GET /clients`(#get-apiv1clients) both carry `ip` and `port` — and the core opens the session for an address it has never seen, so an ECID-keyed form would only save a lookup. Browsing is the other way round for a real reason: `POST /friends/{ecid}/shared_files`(#post-apiv1friendsecidshared_files) reaches an offline friend through an address only the daemon holds, which no caller can supply.
+
+Returns `202 Accepted`, not `200`: the core acknowledges that it queued the message on the client connection, not that the client received it. An unreachable client is not an error — the desktop behaves the same, optimistically showing `*** Connecting to Client ***`.
+
+**Errors:** `400 bad_request`, `404 not_found` (no client at that address to send to), `503 ec_unsupported`, `503 ec_unavailable`.
+
+#### `DELETE /api/v1/chats/{address}`
+
+**Auth:** `ADMIN`
+
+Closes the conversation: drops it from the core store and resets the client's chat state.
+
+**Response:** `204 No Content`.
+
+Closing is **global**, the same way closing a search tab frees the search for every client. A connected amulegui drops its tab on the next poll, and the desktop GUI closes its own; no client is left showing a conversation the core no longer has.
+
+**Errors:** `404 not_found`, `400 bad_request`, `503 ec_unsupported`, `503 ec_unavailable`.
+
+## Error code catalog
+
+Every error code emitted by `/api/v1/*`, sorted by what triggered it. Two codes are emitted with **two different statuses** depending on the cause, so a client that switches on `code` alone must also look at the status for those.
+
+| Code | Status | Meaning |
+|------|--------|---------|
+| `bad_request` | 400 | Body, query, or path-segment validation failed. Body parse depth-cap rejects also surface here. |
+| `amuled_rejected` | 400, 502 | amuled rejected the EC operation and the message carries its reason verbatim (400); or amuled answered but its reply was unusable, e.g. no `search_id` came back from a search or a browse (502). |
+| `request_timeout` | 408 | The request was not completed within the 10 s read timeout. |
+| `unauthorized` | 401 | Missing token, bad signature, expired, revoked, or `iat` invariants failed. |
+| `invalid_credentials` | 401, 403 | `/auth/login` password didn't match any role (401); or `PATCH /auth/passwords` was given a `current_password` that does not match (403). |
+| `forbidden` | 403 | Authenticated as `guest` but the endpoint requires `admin`. |
+| `not_found` | 404 | Resource doesn't exist (unknown hash, ECID, graph name, or no such endpoint). |
+| `not_readable` | 403 | Per-item code from the `/share_directories`(#post-apiv1share_directories) bulk envelope: amuled cannot read that path. Only ever appears inside a `results.error`, never as a whole-response error. |
+| `method_not_allowed` | 405 | Wrong HTTP verb for the route. The response carries an `Allow` header listing the methods this resource does support. |
+| `option_not_supported` | 409 | `PATCH /preferences` set an option the connected daemon was built without. |
+| `not_a4af_source` | 409 | The client named on a `POST /downloads/{hash}/a4af` request is not an A4AF source of that download. |
+| `partfile_unsupported` | 409 | Verify Local Data, or a content download, requested on a file that is still an incomplete partfile. |
+| `not_shared` | 409 | A comment or rating was posted against a file that is not shared. |
+| `not_completed` | 409 | `clear_completed` named a `hash` that is not a completed download. |
+| `download_completed` | 409 | A `DELETE /downloads` matched a completed download; use `clear_completed` for those. |
+| `kad_more_exhausted` | 409 | `POST /search/{id}/more` on a Kad search that can no longer be widened — its 4-reask budget is spent, or it has entered the stopping window Kad begins 20 s before a keyword search ends. Terminal for that search; re-run the query for more. |
+| `version_check_unavailable` | 409 | `POST /version/check` cannot run - the daemon has no update-check capability. |
+| `payload_too_large` | 413 | Request body exceeds the 1 MiB limit. The connection closes after the response. |
+| `range_not_satisfiable` | 416 | A `Range` on `GET /shared/{hash}/content`(#get-apiv1sharedhashcontent) starts at or past EOF. `Content-Range: bytes */<size>` accompanies the response. |
+| `rate_limited` | 429 | The per-IP auth-failure bucket is full, so the address is locked out of every authenticated route. `Retry-After: <seconds>` accompanies it. A client should treat this as the session ending. |
+| `version_check_throttled` | 429 | `POST /version/check`(#post-apiv1versioncheck) arrived inside the daemon's 60 s cooldown. Affects that route only, so a client must not read it as a lost session. |
+| `headers_too_large` | 431 | Request headers exceed the 16 KiB limit. The connection closes after the response. |
+| `internal_error` | 500 | A server-side failure: a handler failed internally (hash decode, serialization) or threw and was caught by the HTTP layer. The body is generic; details land in the daemon's stderr. |
+| `amuled_response_invalid` | 502 | amuled returned an EC payload this endpoint could not decode. |
+| `ec_unavailable` | 503 | EC connection not ready yet (cold start, transient amuled restart). |
+| `ec_unsupported` | 503 | The connected amuled is too old to serve this route — the chat endpoints and `/known_clients`. |
+| `login_disabled` | 503 | `/auth/login` reached but no admin AND no guest password configured. |
+| `too_many_streams` | 503 | Too many concurrent SSE streams. `Retry-After` accompanies the response. |
+| `file_responses_exhausted` | 503 | Too many concurrent file responses (`Streaming/MaxConcurrentFileResponses`, default 6) on `GET /shared/{hash}/content`(#get-apiv1sharedhashcontent). `Retry-After` accompanies the response. |
+| `path_unavailable` | 503 | The shared file's on-disk directory has not yet arrived over EC. Transient; `Retry-After: 5` accompanies the response. |
+| `ec_content_unreachable` | 503 | The shared file is not present on the filesystem running amuleapi — a deployment where amuleapi talks to a **remote** amuled. |
+| `ec_content_mismatch` | 503 | The file at the resolved path disagrees in size with the shared file the hash names — the same remote-amuled split, resolving to an unrelated local file of the same name. |
+
+`message` is human-readable and may change between releases. Pin on `code`.
+
+## Backward compatibility
+
+**`/api/v1/` is frozen.** The naming rules below hold across the whole surface, the result has been exercised end to end, and from here the additive-only discipline applies: anything that could break a conformant client is deferred to the next version rather than applied in place.
+
+What that means in practice:
+
+- **Fields are not renamed or removed.** A name that later reads wrong stays until the next version.
+- **Response shapes do not change** in any way a conformant client can observe. A field keeps its type and its meaning.
+- **Enum values are not renamed or removed.** New ones may be added, so a client **MUST** tolerate a token it does not recognise.
+- **New endpoints, parameters and fields** may be added at any time. Clients **MUST ignore unknown fields**, and must not depend on field order or on a field's absence.
+
+A client that follows those rules keeps working across every `/api/v1/` release. One that pins on field order, rejects unknown fields or unrecognised enum tokens, or depends on a field being absent, is not conformant and is owed nothing by this document.
+
+Corrections that cannot be made additively wait for `/api/v2/`. There is no alias window and no deprecation period inside a version, which is what makes the guarantee worth having.
+
+`POST /api/v1/auth/login` returns no token in the response body unless `?include_token=true` is given. That is the frozen shape.

amule-3.0.1.tar.gz/docs/man/CMakeLists.txt -> amule-3.1.0.tar.gz/docs/man/CMakeLists.txt Changed

@@ -27,6 +27,10 @@
 	check_manpage ("amuleweb")
 endif()
 
+if (BUILD_AMULEAPI)
+	check_manpage ("amuleapi")
+endif()
+
 # Translated manpages — rendered at build time via po4a from the English
 # masters plus po/manpages-<lang>.po. The rendered files are not tracked in
 # git; po4a writes them straight into the build dir based on absolute paths
@@ -65,6 +69,16 @@
 		# Per-binary install destination + build-system gate. The util
 		# binaries have their rendered outputs land in their own build
 		# subdirs because po4a.config.in points them there explicitly.
+		#
+		# amuleapi is INTENTIONALLY absent from this list: the English
+		# master ships (gated by BUILD_AMULEAPI in the top-half
+		# check_manpage() block above), but the po4a translation
+		# pipeline has no amuleapi strings in po/manpages-*.po yet, so
+		# adding amuleapi here would break the build by asking po4a to
+		# render a translation it has no source for. English-only
+		# until 3.1; the translator workflow lands amuleapi entries in
+		# po/manpages-*.po, which adds amuleapi to MANPAGE_BINARIES +
+		# MANPAGE_GATE_amuleapi BUILD_AMULEAPI here.
 		set (MANPAGE_BINARIES amule amulecmd amuled amulegui amuleweb ed2k alc alcc cas wxcas)
 		set (MANPAGE_BUILD_DIR_amule     "${CMAKE_CURRENT_BINARY_DIR}")
 		set (MANPAGE_BUILD_DIR_amulecmd  "${CMAKE_CURRENT_BINARY_DIR}")

amule-3.0.1.tar.gz/docs/man/amule.1.in -> amule-3.1.0.tar.gz/docs/man/amule.1.in Changed

amule-3.1.0.tar.gz/docs/man/amuleapi.1.in Added

@@ -0,0 +1,135 @@
+.TH AMULEAPI 1 @MAN_DATE@ "aMule REST API daemon v@PACKAGE_VERSION@" "aMule REST API daemon"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH NAME
+amuleapi \- the aMule REST API + Server\-Sent Events daemon
+.SH SYNOPSIS
+.B_untranslated amuleapi
+.RB  \-h " " \fI<host> 
+.RB  \-p " " \fI<port> 
+.RB_untranslated  \-\-bind " " \fI<address> 
+.RB_untranslated  \-\-http\-port " " \fI<num> 
+.RB_untranslated  \-\-config\-dir " " \fI<path> 
+.RB_untranslated  \-\-log\-file " " \fI<path> 
+.RB_untranslated  \-\-no\-log\-file 
+.RB_untranslated  \-\-foreground 
+
+.B_untranslated amuleapi
+.RB_untranslated  \-\-set\-admin\-pass " " \fI<plain> 
+
+.B_untranslated amuleapi
+.RB_untranslated  \-\-set\-guest\-pass " " \fI<plain> 
+
+.B_untranslated amuleapi
+.RB_untranslated  \-\-version 
+
+.B_untranslated amuleapi
+.RB_untranslated  \-\-help 
+.SH DESCRIPTION
+.B_untranslated amuleapi
+serves a JSON REST API and a live event stream for a running
+\fBamuled\fR(1), so other programs can control aMule over HTTP. It
+connects to amuled the same way \fBamulecmd\fR(1) does, and listens on its
+own port, so it can run at the same time as \fBamuleweb\fR(1).
+.PP
+The wire contract for the REST API is documented at
+\fIdocs/api/REFERENCE.md\fR; the SSE event catalog lives at
+\fIdocs/api/EVENTS.md\fR. See \fIdocs/QUICKSTART\-AMULEAPI.md\fR
+for first\-run setup notes.
+.SH OPTIONS
+.TP
+\fB \-h\fR \fI<host>\fR, \fB\-\-host\fR=\fI<host>\fR \fB\fR
+EC host to connect to (default: 127.0.0.1).
+.TP
+\fB \-p\fR \fI<port>\fR, \fB\-\-port\fR=\fI<port>\fR \fB\fR
+EC port on the amuled instance (default: 4712).
+.TP
+\fB \-\-bind\fR=\fI<address>\fR \fB\fR
+HTTP bind address (default: 127.0.0.1, overrides amuleapi.conf
+Server/BindAddress).
+.TP
+\fB \-\-http\-port\fR=\fI<num>\fR \fB\fR
+HTTP listen port (default: 4713, overrides amuleapi.conf
+Server/Port).
+.TP
+\fB \-\-config\-dir\fR=\fI<path>\fR \fB\fR
+Path to the amuleapi config dir. Defaults to the same per\-platform
+aMule data directory that \fBamuled\fR uses (~/.aMule/ on Linux,
+~/Library/Application Support/aMule/ on macOS, %APPDATA%\\aMule\\ on
+Windows). Creates the dir with mode 0700 if absent.
+.TP
+.B_untranslated  \-\-disable\-ec\-encryption \fR
+Do not encrypt the link to \fBamuled\fR(1). Encryption is on by default
+whenever the remote aMule supports it. Turning it off lets anyone watching
+the connection read and alter everything after the login. Same as
+\fBEncryption=0\fR in \fIamuleapi.conf\fR.
+.TP
+\fB \-\-set\-admin\-pass\fR=\fI<plain>\fR \fB\fR
+Set the admin password to \fI<plain>\fR, storing it salted and
+stretched in \fIamuleapi\-passwords\fR (mode 0600), then exit. Does
+not start the HTTP server or connect to amuled. A stored password
+cannot be read back, only replaced.
+.TP
+\fB \-\-set\-guest\-pass\fR=\fI<plain>\fR \fB\fR
+Set the guest password to \fI<plain>\fR, storing it the same way, then
+exit. An empty \fI<plain>\fR clears the guest password, which is how
+guest access is turned off.
+.TP
+\fB \-\-foreground \fR
+Stay in the foreground (default). aMule does not ship init\-system
+units; if you need a system service wrapper, write a downstream unit
+that wraps the foreground command.
+.TP
+\fB \-\-log\-file\fR=\fI<path>\fR \fB\fR
+Write a copy of the console output to \fI<path>\fR. On by default at
+\fI<config\-dir>/amuleapi.log\fR, so there is always a log to attach to a
+bug report; use this to put it somewhere else. It is capped at 10 MiB and
+rotated to \fI<path>.1\fR, so it cannot grow without bound. Each line
+starts with the local date and time, on the console as well as in the file.
+.TP
+\fB \-\-no\-log\-file \fR
+Disable the log file entirely and print to the console only, still
+timestamped.
+.TP
+\fB \-\-version \fR
+Print version information and exit.
+.TP
+\fB \-\-help \fR
+Print a short usage description.
+.SH FILES
+.TP
+\fI~/.aMule/amuleapi.conf\fR
+Settings file: HTTP address and port, the connection to amuled, login
+rate limits and event\-stream sizing. The QUICKSTART document shipped with
+the source has the full reference.
+.TP
+\fI~/.aMule/amuleapi\-jwt\-secret\fR
+Key used to sign login tokens. Created on first launch. Deleting it signs
+out everyone.
+.TP
+\fI~/.aMule/amuleapi\-passwords\fR
+The admin and guest passwords, stored so they cannot be read back, only
+replaced. This is the only place they are kept. Set them with
+\fB\-\-set\-admin\-pass\fR / \fB\-\-set\-guest\-pass\fR, from the REST API, or
+from the Remote Controls preferences in \fBamule\fR(1). A change applies at
+the next login and signs out anyone already logged in.
+.TP
+\fI~/.aMule/amuleapi\-ec\-token\fR
+Short\-lived login token, written by \fBamule\fR(1) / \fBamuled\fR(1) when
+they start amuleapi themselves. Created fresh each time, read once and
+deleted straight away, so an auto\-started amuleapi needs no EC password of
+its own. Started by hand, amuleapi finds no token and uses
+\fBEC/Password\fR from \fIamuleapi.conf\fR instead. There is no
+\fB\-\-password\fR option: a password given on the command line is visible
+to every local user through \fBps\fR(1).
+.SH REPORTING BUGS
+Please report bugs either on our forum
+(\fIhttps://github.com/amule-org/amule/discussions\fR), or in our
+bugtracker (\fIhttps://github.com/amule-org/amule/issues\fR).
+.SH COPYRIGHT
+aMule and all of its related utilities are distributed under the GNU
+General Public License.
+.SH SEE ALSO
+.B_untranslated amule\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1)
+.SH AUTHOR
+This manpage was written for the aMule project.

amule-3.0.1.tar.gz/docs/man/amulecmd.1.in -> amule-3.1.0.tar.gz/docs/man/amulecmd.1.in Changed

@@ -14,6 +14,7 @@
 .RB_untranslated  \-v 
 .RB  \-l " " \fI<lang> 
 .RB { " "  \-w  " " | " "  \-c " " \fI<command>  " " }
+.RB_untranslated  \-\-space\-separated 
 
 .B_untranslated amulecmd
 .RB  \-\-create\-config\-from = \fI<path> 
@@ -61,10 +62,19 @@
 \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
+.B_untranslated  \-\-disable\-ec\-encryption \fR
+Do not encrypt the External Connection link.
+Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.
+Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection.
+.TP
 .B_untranslated  \-\-force\-zlib \fR
 Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.
 Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression.
 .TP
+.B_untranslated  \-\-space\-separated \fR
+Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.
+Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output.
+.TP
 .B_untranslated  \-\-version \fR
 Displays the current version number.
 .TP
@@ -103,7 +113,7 @@
 Start downloading a file.
 
 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
+Example: 'download 12' will start to download the file with the number 12 of the
 previous search.
 .SS_untranslated Exit
 Disconnect from amule/amuled and quit amulecmd.
@@ -137,8 +147,9 @@
 .IP Normal 10
 Normal priority.
 .RE
-.SS_untranslated Progress
-Shows the progress of an on\-going search.
+.SS_untranslated Progress \fI<id>\fP
+Shows the progress of an on\-going search. Optionally takes a search \fI<id>\fR
+(as printed by \fBsearch\fR); with no id, shows the most recently started search.
 .SS_untranslated Quit
 A synonym of the \fBexit\fR command.
 .SS_untranslated Reload \fI<what>\fP
@@ -153,14 +164,18 @@
 .RE
 .SS_untranslated Reset
 Reset the log.
-.SS_untranslated Results
-Shows you the results of the last search.
+.SS_untranslated Results \fI<id>\fP
+Shows you the results of a search. Optionally takes a search \fI<id>\fR (as
+printed by \fBsearch\fR); with no id, shows the most recently started search.
+Several searches can be kept on the daemon at once and addressed by id.
 .SS_untranslated 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_untranslated Search \fI<type>\fP \fI<filters>\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'.
+Example: 'search kad amule' performs a kad search for 'amule'.
+Prints a search id; pass it to \fBresults\fR or \fBprogress\fR to address this
+search. Several searches can run at once, each with its own id.
 
 Available search types:
 .RS
@@ -188,8 +203,8 @@
 Largest file size to return. Same suffixes as \fB\-\-min\-size\fR.
 .RE
 .PP
-Example: `search global linux iso \-\-type Iso \-\-min-size 100M' returns
-results for \(lqlinux iso\(rq of file-type Iso at least 100 MiB.
+Example: 'search global linux iso \-\-type Iso \-\-min-size 100M' returns
+results for 'linux iso' of file-type Iso at least 100 MiB.
 .SS_untranslated Set \fI<what>\fR
 Sets a given preferences value.
 
@@ -224,9 +239,9 @@
 
 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'.
 
-Example: `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_untranslated Status
 Show connection status, current up/download speeds, etc.

amule-3.0.1.tar.gz/docs/man/amuled.1.in -> amule-3.1.0.tar.gz/docs/man/amuled.1.in Changed

amule-3.0.1.tar.gz/docs/man/amuleweb.1.in -> amule-3.1.0.tar.gz/docs/man/amuleweb.1.in Changed

@@ -39,6 +39,10 @@
 .RB  \-\-amule\-config\-file = \fI<path> 
 
 .SH DESCRIPTION
+.B DEPRECATED:
+amuleweb is deprecated and may be removed in aMule 3.2 or later.
+It is not being removed yet; consider migrating to amuleapi, the REST/SSE API.
+.PP
 \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.
@@ -118,6 +122,11 @@
 \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
+.B_untranslated  \-\-disable\-ec\-encryption \fR
+Do not encrypt the External Connection link.
+Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.
+Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection.
+.TP
 .B_untranslated  \-\-force\-zlib \fR
 Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.
 Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression.

amule-3.0.1.tar.gz/docs/man/po/manpages-bn.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-bn.po Changed

@@ -508,7 +508,7 @@
 
 #. type: Plain text
 #: amulecmd.1.in:108
-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."
+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
@@ -618,7 +618,7 @@
 
 #. type: Plain text
 #: amulecmd.1.in:164
-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'."
+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
@@ -673,7 +673,7 @@
 
 #. type: Plain text
 #: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
 msgstr ""
 
 #. type: Plain text
@@ -733,12 +733,12 @@
 
 #. type: Plain text
 #: amulecmd.1.in:228
-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'."
+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.in:231
-msgid "Example: `statistics 5' will show only the top 5 versions for each client type."
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
 msgstr ""
 
 #. type: Plain text

amule-3.1.0.tar.gz/docs/man/po/manpages-ca.po Added

@@ -0,0 +1,1358 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2026-06-10 16:45+0200\n"
+"PO-Revision-Date: 2026-09-20 21:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: none\n"
+"Language: ca\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.in:1
+#, no-wrap
+msgid "AMULE"
+msgstr "AMULE"
+
+#. type: TH
+#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
+#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#, no-wrap
+msgid "@MAN_DATE@"
+msgstr "@MAN_DATE@"
+
+#. type: TH
+#: amule.1.in:1
+#, no-wrap
+msgid "aMule v@PACKAGE_VERSION@"
+msgstr "aMule v@PACKAGE_VERSION@"
+
+#. type: TH
+#: amule.1.in:1
+#, no-wrap
+msgid "aMule"
+msgstr "aMule"
+
+#. type: SH
+#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
+#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
+#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#, no-wrap
+msgid "NAME"
+msgstr "NOM"
+
+#. type: Plain text
+#: amule.1.in:6
+msgid "amule - the all-platform eMule p2p client"
+msgstr "amule - el client p2p d'eMule multiplataforma"
+
+#. type: SH
+#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
+#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "SINOPSI"
+
+#. type: Plain text
+#: amule.1.in:10 amulegui.1.in: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.in:14 amuled.1.in:16
+msgid "B<-w> I<E<lt>pathE<gt>>"
+msgstr "B<-w> I<E<lt>pathE<gt>>"
+
+#. type: Plain text
+#: amule.1.in:18 amuled.1.in:20
+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.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
+#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
+#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "DESCRIPCIÓ"
+
+#. type: TP
+#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
+#: ../../src/utils/cas/docs/cas.1.in:27
+#, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
+#: ../../src/utils/cas/docs/cas.1.in:30
+msgid "Read config from I<E<lt>pathE<gt>> instead of home"
+msgstr "Llegeix la configuració de I<E<lt>pathE<gt>> en lloc del directori d'usuari"
+
+#. type: TP
+#: amule.1.in:29 amulegui.1.in:30
+#, 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.in:32 amulegui.1.in:33
+msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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 "Estableix la geometria de l'aplicació. I<E<lt>geomE<gt>> fa servir el mateix format que les aplicacions X11 estàndard:\tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+msgid "Prints log messages to stdout."
+msgstr "Escriu els missatges de registre a stdout."
+
+#. type: Plain text
+#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+msgid "Resets config to default values."
+msgstr "Restableix la configuració als valors predeterminats."
+
+#. type: Plain text
+#: amule.1.in:42
+msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
+msgstr "Habilita o inhabilita l'inici de l'aMule en iniciar la sessió i surt.  El magatzem específic del sistema operatiu se selecciona automàticament: clau Run del registre de Windows, LaunchAgent de macOS, entrada d'inici automàtic XDG I<.desktop> de Linux."
+
+#. type: TP
+#: amule.1.in:42 amuled.1.in:50
+#, 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.in:45 amuled.1.in:53
+msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
+msgstr "Especifica la ubicació del binari amuleweb a I<E<lt>pathE<gt>>."
+
+#. type: Plain text
+#: amule.1.in:50 amuled.1.in:58 amulegui.1.in:51
+msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
+msgstr "No capturis les excepcions fatals ni bloquegis la sortida en les assercions.  Útil per a configuracions sense interfície o supervisades (systemd, scripts de vigilància)  on el diàleg d'asserció, que altrament és modal, impedeix el reinici automàtic."
+
+#. type: Plain text
+#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+msgid "Does not disable stdin."
+msgstr "No desactiva stdin."
+
+#. type: TP
+#: amule.1.in:53 amulegui.1.in:54
+#, 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.in:56 amuled.1.in:64 amulegui.1.in:57
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
+msgstr "Estableix la categoria dels enllaços eD2k passats a I<E<lt>numE<gt>>"
+
+#. type: Plain text
+#: amule.1.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
+#: amuleweb.1.in:130 ed2k.1.in:40
+msgid "Displays the current version number."
+msgstr "Mostra el número de versió actual."
+
+#. type: Plain text
+#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
+#: amuleweb.1.in:127 ed2k.1.in:37
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
+#: ../../src/utils/cas/docs/cas.1.in:33
+msgid "Prints a short usage description."
+msgstr "Mostra una breu descripció d'ús."
+
+#. type: TP
+#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< eD2k-link >"
+
+#. type: Plain text
+#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
+msgid "Adds an eD2k-link to the core."
+msgstr "Afegeix un enllaç eD2k al nucli."
+
+#. type: Plain text
+#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+msgid "The eD2k link to be added can be:"
+msgstr "L'enllaç eD2k que s'afegeix pot ser:"
+
+#. type: Plain text
+#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
+msgstr "un enllaç de fitxer (ed2k://|file|...), que s'afegirà a la cua de baixades;"
+
+#. type: Plain text
+#: amule.1.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+msgid "a server link (ed2k://|server|...), it will be added to the server list;"
+msgstr "un enllaç de servidor (ed2k://|server|...), que s'afegirà a la llista de servidors;"
+
+#. type: Plain text
+#: amule.1.in:74 amuled.1.in:82 ed2k.1.in:52
+msgid "a serverlist link, in which case all servers in the list will be added to the server list;"
+msgstr "un enllaç de llista de servidors, cas en què tots els servidors de la llista s'afegiran a la llista de servidors;"
+
+#. type: Plain text
+#: amule.1.in:76 amuled.1.in:84
+msgid "a magnet link."
+msgstr "un enllaç magnet."
+
+#. type: SH
+#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#, no-wrap
+msgid "NOTES"
+msgstr "NOTES"
+
+#. type: SS
+#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#, no-wrap
+msgid "Paths"
+msgstr "Camins"
+
+#. type: Plain text
+#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+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 a totes les opcions que accepten un valor I<E<lt>pathE<gt>>, si el I<camí> no conté cap part de directori (és a dir, només un nom de fitxer), es considera que és dins del directori de configuració de l'aMule, I<~/.aMule>."
+
+#. type: SH
+#: amule.1.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
+#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#, no-wrap
+msgid "FILES"
+msgstr "FITXERS"
+
+#. type: Plain text
+#: amule.1.in:84 amuled.1.in:87
+msgid "~/.aMule/*"
+msgstr "~/.aMule/*"
+
+#. type: SH
+#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
+#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
+#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "COM INFORMAR D'ERRORS"
+
+#. type: Plain text
+#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
+#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
+#: ../../src/utils/cas/docs/cas.1.in:46
+#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member."
+msgstr "Informeu dels errors al nostre fòrum (I<https://github.com/amule-org/amule/discussions>) o al nostre sistema de seguiment d'errors (I<https://github.com/amule-org/amule/issues>).  No informeu dels errors per correu electrònic, ni a la nostra llista de correu ni directament a cap membre de l'equip."
+
+#. type: SH
+#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
+#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
+#: ../../src/utils/cas/docs/cas.1.in:46
+#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr "DRETS D'AUTOR"
+
+#. type: Plain text
+#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
+#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
+#: ../../src/utils/cas/docs/cas.1.in:48
+#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+msgid "aMule and all of its related utilities are distributed under the GNU General Public License."
+msgstr "L'aMule i totes les utilitats relacionades es distribueixen sota la Llicència Pública General de GNU."
+
+#. type: SH
+#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
+#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
+#: ../../src/utils/cas/docs/cas.1.in:48
+#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "VEGEU TAMBÉ"
+
+#. type: SH
+#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
+#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
+#: ../../src/utils/cas/docs/cas.1.in:50
+#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#, no-wrap
+msgid "AUTHOR"
+msgstr "AUTOR"
+
+#. type: Plain text
+#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
+#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
+#: ../../src/utils/cas/docs/cas.1.in:51
+#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+msgid "This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr "Aquesta pàgina de manual la va escriure Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+
+#. type: TH
+#: amulecmd.1.in:1
+#, no-wrap
+msgid "AMULECMD"
+msgstr "AMULECMD"
+
+#. type: TH
+#: amulecmd.1.in:1
+#, no-wrap
+msgid "aMuleCmd v@PACKAGE_VERSION@"
+msgstr "aMuleCmd v@PACKAGE_VERSION@"
+
+#. type: TH
+#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#, no-wrap
+msgid "aMule utilities"
+msgstr "Utilitats de l'aMule"
+
+#. type: Plain text
+#: amulecmd.1.in:7
+msgid "amulecmd - Console-based program to control aMule"
+msgstr "amulecmd - programa de consola per controlar l'aMule"
+
+#. type: Plain text
+#: amulecmd.1.in:13 amuleweb.1.in: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.in: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.in:20 amuleweb.1.in: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.in:29
+msgid "B<amulecmd> is a console-based client to control aMule."
+msgstr "B<amulecmd> és un client de consola per controlar l'aMule."
+
+#. type: TP
+#: amulecmd.1.in:29 amuleweb.1.in: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.in:33 amuleweb.1.in:50
+msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
+msgstr "Amfitrió on s'executa l'aMule (predeterminat: I<127.0.0.1>).  I<E<lt>hostE<gt>> pot ser una adreça IP o un nom DNS"
+
+#. type: TP
+#: amulecmd.1.in:33 amuleweb.1.in: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.in:36 amuleweb.1.in:53
+msgid "aMule's port for External Connections, as set in Preferences-E<gt>Remote Controls (default: I<4712>)"
+msgstr "Port de l'aMule per a connexions externes, tal com s'ha definit a Preferències-E<gt>Controls remots (predeterminat: I<4712>)"
+
+#. type: TP
+#: amulecmd.1.in:36 amuleweb.1.in: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.in:39 amuleweb.1.in:56
+msgid "External Connections password."
+msgstr "Contrasenya de les connexions externes."
+
+#. type: TP
+#: amulecmd.1.in:39 amuleweb.1.in: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.in:43 amuleweb.1.in:60
+msgid "Use the given configuration file.  Default configuration file is I<~/.aMule/remote.conf>"
+msgstr "Fa servir el fitxer de configuració indicat.  El fitxer de configuració predeterminat és I<~/.aMule/remote.conf>"
+
+#. type: Plain text
+#: amulecmd.1.in:46 amuleweb.1.in:63
+msgid "Do not print any output to stdout."
+msgstr "No escriguis cap sortida a stdout."
+
+#. type: Plain text
+#: amulecmd.1.in:50 amuleweb.1.in:67
+msgid "Be verbose - show also debug messages."
+msgstr "Mode detallat: mostra també els missatges de depuració."
+
+#. type: TP
+#: amulecmd.1.in:50 amuleweb.1.in: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.in:54 amuleweb.1.in:71
+msgid "Sets program locale (language).  See the B<NOTES> section for the description of the I<E<lt>langE<gt>> parameter."
+msgstr "Estableix la configuració regional (idioma) del programa.  Consulteu la secció B<NOTES> per a la descripció del paràmetre I<E<lt>langE<gt>>."
+
+#. type: Plain text
+#: amulecmd.1.in:57 amuleweb.1.in:74
+msgid "Write command line options to config file and exit"
+msgstr "Escriu les opcions de la línia d'ordres al fitxer de configuració i surt"
+
+#. type: TP
+#: amulecmd.1.in: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.in:60
+msgid "Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and exit."
+msgstr "Executa I<E<lt>commandE<gt>> com si s'hagués escrit a l'indicador d'amulecmd i surt."
+
+#. type: TP
+#: amulecmd.1.in:60 amuleweb.1.in: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.in:63 amuleweb.1.in: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 fitxer de configuració basat en I<E<lt>pathE<gt>>, que ha d'apuntar a un fitxer de configuració vàlid de l'aMule, i després surt."
+
+#. type: Plain text
+#: amulecmd.1.in:67 amuleweb.1.in:124
+msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
+msgstr "Força la compressió ZLIB a l'enllaç de connexió externa independentment de si la IP marcada és local.  Útil quan el costat del servidor és accessible per un túnel VPN que resol a una IP de la LAN i l'heurística ometria la compressió."
+
+#. type: SH
+#: amulecmd.1.in:73
+#, no-wrap
+msgid "COMMANDS"
+msgstr "ORDRES"
+
+#. type: Plain text
+#: amulecmd.1.in:75
+msgid "All commands are case insensitive."
+msgstr "Totes les ordres són insensibles a majúscules i minúscules."
+
+#. type: Plain text
+#: amulecmd.1.in:77
+msgid "Adds an eD2k-link or a magnet-link to the core."
+msgstr "Afegeix un enllaç eD2k o un enllaç magnet al nucli."
+
+#. type: Plain text
+#: amulecmd.1.in:86
+msgid "a serverlist link, in which case all servers in the list will be added to the server list."
+msgstr "un enllaç de llista de servidors, cas en què tots els servidors de la llista s'afegiran a la llista de servidors."
+
+#. type: Plain text
+#: amulecmd.1.in:89
+msgid "The magnet link must contain the eD2k hash and file length."
+msgstr "L'enllaç magnet ha de contenir el hash eD2k i la mida del fitxer."
+
+#. type: Plain text
+#: amulecmd.1.in:91
+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 "Cancel·la la baixada especificada per I<E<lt>hashE<gt>> o I<E<lt>numberE<gt>>. Per obtenir-ne el valor, feu servir B<show>."
+
+#. type: Plain text
+#: amulecmd.1.in:93
+msgid "Connect to the network."
+msgstr "Connecta a la xarxa."
+
+#. type: Plain text
+#: amulecmd.1.in:95
+msgid "This will connect to all networks that are enabled in Preferences."
+msgstr "Això connectarà a totes les xarxes habilitades a les preferències."
+
+#. type: Plain text
+#: amulecmd.1.in:99
+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 "Amb el paràmetre opcional podeu especificar a quina xarxa voleu connectar. Si indiqueu una adreça de servidor en format IP:Port (on IP és una adreça IPv4 decimal amb punts o un nom DNS resoluble), l'aMule connectarà només a aquest servidor."
+
+#. type: Plain text
+#: amulecmd.1.in:102
+msgid "Disconnect from all networks you are connected to, or just disconnect from the specified network."
+msgstr "Desconnecta de totes les xarxes a les quals esteu connectat, o desconnecta només de la xarxa especificada."
+
+#. type: Plain text
+#: amulecmd.1.in:104
+msgid "Start downloading a file."
+msgstr "Comença a baixar un fitxer."
+
+#. type: Plain text
+#: amulecmd.1.in:108
+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 "Cal indicar el I<E<lt>numberE<gt>> d'un fitxer de l'última cerca.  Exemple: «download 12» començarà a baixar el fitxer amb el número 12 de la cerca anterior."
+
+#. type: Plain text
+#: amulecmd.1.in:110
+msgid "Disconnect from amule/amuled and quit amulecmd."
+msgstr "Desconnecta d'amule/amuled i surt d'amulecmd."
+
+#. type: Plain text
+#: amulecmd.1.in:112
+msgid "Get and display a preference value."
+msgstr "Obtén i mostra el valor d'una preferència."
+
+#. type: Plain text
+#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+msgid "Available values for I<E<lt>whatE<gt>>:"
+msgstr "Valors disponibles per a I<E<lt>whatE<gt>>:"
+
+#. type: Plain text
+#: amulecmd.1.in:117
+msgid "Get bandwidth limits."
+msgstr "Obtén els límits d'amplada de banda."
+
+#. type: Plain text
+#: amulecmd.1.in:119
+msgid "Get IPFilter preferences."
+msgstr "Obtén les preferències de l'IPFilter."
+
+#. type: Plain text
+#: amulecmd.1.in:124
+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 "Mostra una breu descripció d'ús.  Si es crida sense paràmetres, mostra una llista de les ordres disponibles.  Si es crida amb I<E<lt>commandE<gt>>, mostra una breu descripció de l'ordre indicada."
+
+#. type: Plain text
+#: amulecmd.1.in:126
+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 "Posa en pausa la baixada especificada per I<E<lt>hashE<gt>> o I<E<lt>numberE<gt>>. Per obtenir-ne el valor, feu servir B<show>."
+
+#. type: Plain text
+#: amulecmd.1.in:128
+msgid "Set priority of a download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>."
+msgstr "Estableix la prioritat d'una baixada especificada per I<E<lt>hashE<gt>> o I<E<lt>numberE<gt>>."
+
+#. type: Plain text
+#: amulecmd.1.in:130
+msgid "Available values for I<E<lt>priorityE<gt>>:"
+msgstr "Valors disponibles per a I<E<lt>priorityE<gt>>:"
+
+#. type: Plain text
+#: amulecmd.1.in:133
+msgid "Automatic priority."
+msgstr "Prioritat automàtica."
+
+#. type: Plain text
+#: amulecmd.1.in:135
+msgid "High priority."
+msgstr "Prioritat alta."
+
+#. type: Plain text
+#: amulecmd.1.in:137
+msgid "Low priority."
+msgstr "Prioritat baixa."
+
+#. type: Plain text
+#: amulecmd.1.in:139
+msgid "Normal priority."
+msgstr "Prioritat normal."
+
+#. type: Plain text
+#: amulecmd.1.in:142
+msgid "Shows the progress of an on-going search."
+msgstr "Mostra el progrés d'una cerca en curs."
+
+#. type: Plain text
+#: amulecmd.1.in:144
+msgid "A synonym of the B<exit> command."
+msgstr "Sinònim de l'ordre B<exit>."
+
+#. type: Plain text
+#: amulecmd.1.in:146
+msgid "Reloads a given object."
+msgstr "Torna a carregar un objecte determinat."
+
+#. type: Plain text
+#: amulecmd.1.in:151
+msgid "Reload shared files list."
+msgstr "Torna a carregar la llista de fitxers compartits."
+
+#. type: Plain text
+#: amulecmd.1.in:153
+msgid "Reload IP filter tables."
+msgstr "Torna a carregar les taules del filtre d'IP."
+
+#. type: Plain text
+#: amulecmd.1.in:156
+msgid "Reset the log."
+msgstr "Reinicia el registre."
+
+#. type: Plain text
+#: amulecmd.1.in:158
+msgid "Shows you the results of the last search."
+msgstr "Mostra els resultats de l'última cerca."
+
+#. type: Plain text
+#: amulecmd.1.in:160
+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 "Reprèn la baixada especificada per I<E<lt>hashE<gt>> o I<E<lt>numberE<gt>>. Per obtenir-ne el valor, feu servir B<show>."
+
+#. type: Plain text
+#: amulecmd.1.in:164
+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 "Fa una cerca de la I<E<lt>keywordE<gt>> indicada. Per fer-ho, cal indicar un tipus de cerca i una paraula clau.  Exemple: 'search kad amule' fa una cerca kad de 'amule'."
+
+#. type: Plain text
+#: amulecmd.1.in:166
+msgid "Available search types:"
+msgstr "Tipus de cerca disponibles:"
+
+#. type: Plain text
+#: amulecmd.1.in:169
+msgid "Performs a global search."
+msgstr "Fa una cerca global."
+
+#. type: Plain text
+#: amulecmd.1.in:171
+msgid "Performs a search on the Kademlia network."
+msgstr "Fa una cerca a la xarxa Kademlia."
+
+#. type: Plain text
+#: amulecmd.1.in:173
+msgid "Performs a local search."
+msgstr "Fa una cerca local."
+
+#. type: Plain text
+#: amulecmd.1.in:177
+msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
+msgstr "Es poden col·locar filtres opcionals abans, després o intercalats amb les paraules de cerca:"
+
+#. type: Plain text
+#: amulecmd.1.in:180
+msgid "Restrict results to the given file type."
+msgstr "Restringeix els resultats al tipus de fitxer indicat."
+
+#. type: Plain text
+#: amulecmd.1.in:182
+msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
+msgstr "Restringeix els resultats a una extensió de fitxer concreta (p. ex.\\ I<iso>, I<mp3>)."
+
+#. type: Plain text
+#: amulecmd.1.in:184
+msgid "Minimum number of sources a result must report."
+msgstr "Nombre mínim de fonts que ha d'informar un resultat."
+
+#. type: Plain text
+#: amulecmd.1.in:187
+msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
+msgstr "Mida de fitxer mínima que es retorna. Els sufixos fan servir multiplicadors binaris (K = 1024, M = K\\(mu1024, G = M\\(mu1024); sense sufix vol dir bytes."
+
+#. type: Plain text
+#: amulecmd.1.in:189
+msgid "Largest file size to return. Same suffixes as B<--min-size>."
+msgstr "Mida de fitxer màxima que es retorna. Mateixos sufixos que B<--min-size>."
+
+#. type: Plain text
+#: amulecmd.1.in:193
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
+msgstr "Exemple: 'search global linux iso --type Iso --min-size 100M' retorna resultats de 'linux iso' del tipus de fitxer Iso de com a mínim 100 MiB."
+
+#. type: Plain text
+#: amulecmd.1.in:195
+msgid "Sets a given preferences value."
+msgstr "Estableix el valor d'una preferència."
+
+#. type: Plain text
+#: amulecmd.1.in:200
+msgid "Set bandwidth limits."
+msgstr "Estableix els límits d'amplada de banda."
+
+#. type: Plain text
+#: amulecmd.1.in:202
+msgid "Set IPFilter preferences."
+msgstr "Estableix les preferències de l'IPFilter."
+
+#. type: Plain text
+#: amulecmd.1.in:205
+msgid "Shows upload/download queue, servers list or shared files list."
+msgstr "Mostra la cua de pujada/baixada, la llista de servidors o la llista de fitxers compartits."
+
+#. type: Plain text
+#: amulecmd.1.in:210
+msgid "Show download queue."
+msgstr "Mostra la cua de baixades."
+
+#. type: Plain text
+#: amulecmd.1.in:212
+msgid "Show log."
+msgstr "Mostra el registre."
+
+#. type: Plain text
+#: amulecmd.1.in:214
+msgid "Show servers list."
+msgstr "Mostra la llista de servidors."
+
+#. type: Plain text
+#: amulecmd.1.in:216
+msgid "Show shared files list."
+msgstr "Mostra la llista de fitxers compartits."
+
+#. type: Plain text
+#: amulecmd.1.in:218
+msgid "Show upload queue."
+msgstr "Mostra la cua de pujades."
+
+#. type: Plain text
+#: amulecmd.1.in:222
+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 "Atura el nucli remot en execució (amule/amuled).  Això també aturarà el client de text, ja que no es pot fer servir sense un nucli en execució."
+
+#. type: Plain text
+#: amulecmd.1.in:224
+msgid "Show statistics tree."
+msgstr "Mostra l'arbre d'estadístiques."
+
+#. type: Plain text
+#: amulecmd.1.in:228
+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 "A aquesta ordre se li pot passar com a argument el I<E<lt>numberE<gt>> opcional, dins del rang 0-255, que indica quantes entrades del subarbre de versions de client s'han de mostrar. Passar-hi 0, o ometre'l, vol dir «il·limitat»."
+
+#. type: Plain text
+#: amulecmd.1.in:231
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
+msgstr "Exemple: 'statistics 5' mostrarà només les 5 versions principals de cada tipus de client."
+
+#. type: Plain text
+#: amulecmd.1.in:233
+msgid "Show connection status, current up/download speeds, etc."
+msgstr "Mostra l'estat de la connexió, les velocitats actuals de pujada i baixada, etc."
+
+#. type: SS
+#: amulecmd.1.in:238 amuleweb.1.in:141
+#, no-wrap
+msgid "Languages"
+msgstr "Idiomes"
+
+#. type: Plain text
+#: amulecmd.1.in:244 amuleweb.1.in:147
+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 "El paràmetre I<E<lt>langE<gt>> de l'opció B<-l> té la forma següent: I<lang>B<_>I<LANG>B<.>I<encoding>B<@>I<modifier> on I<lang> és l'idioma principal, I<LANG> és un subidioma o territori, I<encoding> és el joc de caràcters que cal fer servir i I<modifier> permet a l'usuari seleccionar una instància concreta de dades de localització dins d'una mateixa categoria."
+
+#. type: Plain text
+#: amulecmd.1.in:246 amuleweb.1.in:149
+msgid "For example, the following strings are valid:"
+msgstr "Per exemple, les cadenes següents són vàlides:"
+
+#. type: Plain text
+#: amulecmd.1.in:260 amuleweb.1.in:163
+msgid "Though all the above strings are accepted as valid language definitions, I<encoding> and I<modifier> are yet unused."
+msgstr "Tot i que totes les cadenes anteriors s'accepten com a definicions d'idioma vàlides, I<encoding> i I<modifier> encara no s'utilitzen."
+
+#. type: Plain text
+#: amulecmd.1.in:263 amuleweb.1.in:166
+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 "A més del format anterior, també podeu especificar els noms complets dels idiomes en anglès, de manera que B<-l german> també és vàlid i equival a B<-l de_DE>."
+
+#. type: Plain text
+#: amulecmd.1.in:266 amuleweb.1.in:169
+msgid "When no locale is defined, either on command-line or in config file, system default language will be used."
+msgstr "Quan no es defineix cap configuració regional, ni a la línia d'ordres ni al fitxer de configuració, es farà servir l'idioma predeterminat del sistema."
+
+#. type: Plain text
+#: amulecmd.1.in:268 amuleweb.1.in:177
+msgid "~/.aMule/remote.conf"
+msgstr "~/.aMule/remote.conf"
+
+#. type: SH
+#: amulecmd.1.in:268 amuleweb.1.in:181
+#, no-wrap
+msgid "EXAMPLE"
+msgstr "EXEMPLE"
+
+#. type: Plain text
+#: amulecmd.1.in:270
+msgid "Typically amulecmd will be first run as:"
+msgstr "Normalment amulecmd s'executarà primer així:"
+
+#. type: Plain text
+#: amulecmd.1.in:272
+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.in:274 amuleweb.1.in:187
+msgid "or"
+msgstr "o"
+
+#. type: Plain text
+#: amulecmd.1.in:276
+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.in:278 amuleweb.1.in:191
+msgid "These will save settings to I<$HOME/.aMule/remote.conf>, and later you only need to type:"
+msgstr "Això desarà la configuració a I<$HOME/.aMule/remote.conf>, i després només caldrà que escriviu:"
+
+#. type: Plain text
+#: amulecmd.1.in:282
+msgid "Of course, you don't have to follow this example."
+msgstr "Evidentment, no cal que seguiu aquest exemple."
+
+#. type: TH
+#: amuled.1.in:1
+#, no-wrap
+msgid "AMULED"
+msgstr "AMULED"
+
+#. type: TH
+#: amuled.1.in:1
+#, no-wrap
+msgid "aMule Daemon v@PACKAGE_VERSION@"
+msgstr "aMule Daemon v@PACKAGE_VERSION@"
+
+#. type: TH
+#: amuled.1.in:1
+#, no-wrap
+msgid "aMule Daemon"
+msgstr "Dimoni de l'aMule"
+
+#. type: Plain text
+#: amuled.1.in:6
+msgid "amuled - the all-platform eMule p2p client - daemonized version"
+msgstr "amuled - el client p2p d'eMule multiplataforma - versió dimoni"
+
+#. type: Plain text
+#: amuled.1.in:9 ../../src/utils/cas/docs/cas.1.in:11
+msgid "B<-c> I<E<lt>pathE<gt>>"
+msgstr "B<-c> I<E<lt>pathE<gt>>"
+
+#. type: Plain text
+#: amuled.1.in:11
+msgid "B<-p> I<E<lt>pathE<gt>>"
+msgstr "B<-p> I<E<lt>pathE<gt>>"
+
+#. type: Plain text
+#: amuled.1.in:33
+msgid "Forks to background."
+msgstr "Bifurca en segon pla."
+
+#. type: TP
+#: amuled.1.in:33
+#, 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.in:37
+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 "Després de bifurcar, crea un fitxer pid a I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> ha de contenir el nom del fitxer."
+
+#. type: Plain text
+#: amuled.1.in:40
+msgid "Configure EC (External Connections)."
+msgstr "Configura les EC (connexions externes)."
+
+#. type: Plain text
+#: amuled.1.in:50
+msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
+msgstr "Habilita o inhabilita l'inici d'amuled en iniciar la sessió i surt.  El magatzem específic del sistema operatiu se selecciona automàticament: clau Run del registre de Windows, LaunchAgent de macOS, entrada d'inici automàtic XDG I<.desktop> de Linux."
+
+#. type: TP
+#: amuled.1.in:61
+#, no-wrap
+msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
+msgstr "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
+
+#. type: TH
+#: amulegui.1.in:1
+#, no-wrap
+msgid "AMULEGUI"
+msgstr "AMULEGUI"
+
+#. type: TH
+#: amulegui.1.in:1
+#, no-wrap
+msgid "aMuleGUI v@PACKAGE_VERSION@"
+msgstr "aMuleGUI v@PACKAGE_VERSION@"
+
+#. type: TH
+#: amulegui.1.in:1
+#, no-wrap
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
+
+#. type: Plain text
+#: amulegui.1.in:6
+msgid "amulegui - aMule control program with GUI"
+msgstr "amulegui - programa de control de l'aMule amb interfície gràfica"
+
+#. type: Plain text
+#: amulegui.1.in:17
+msgid "B<-t> I<E<lt>numE<gt>>"
+msgstr "B<-t> I<E<lt>numE<gt>>"
+
+#. type: Plain text
+#: amulegui.1.in:27
+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> és un programa client i es pot connectar a amule o amuled per EC. Amb ell podeu gestionar el vostre programa aMule. Proporciona gairebé les mateixes funcionalitats que l'amule, encara que el nucli s'executi en un altre ordinador."
+
+#. type: Plain text
+#: amulegui.1.in:42
+msgid "Skip connection dialog."
+msgstr "Omet el diàleg de connexió."
+
+#. type: Plain text
+#: amulegui.1.in:46
+msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
+msgstr "Habilita o inhabilita l'inici d'amulegui en iniciar la sessió i surt.  El magatzem específic del sistema operatiu se selecciona automàticament: clau Run del registre de Windows, LaunchAgent de macOS, entrada d'inici automàtic XDG I<.desktop> de Linux."
+
+#. type: Plain text
+#: amulegui.1.in:72
+msgid "This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm DOT orgE<gt>"
+msgstr "Aquesta pàgina de manual la va escriure Julien Delange per a Debian E<lt>julien AT gunnm DOT orgE<gt>"
+
+#. type: Plain text
+#: amulegui.1.in:73
+msgid "This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr "Aquesta pàgina de manual la va reescriure Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+
+#. type: TH
+#: amuleweb.1.in:1
+#, no-wrap
+msgid "AMULEWEB"
+msgstr "AMULEWEB"
+
+#. type: TH
+#: amuleweb.1.in:1
+#, no-wrap
+msgid "aMule webserver v@PACKAGE_VERSION@"
+msgstr "Servidor web de l'aMule v@PACKAGE_VERSION@"
+
+#. type: Plain text
+#: amuleweb.1.in:6
+msgid "amuleweb - aMule web server"
+msgstr "amuleweb - servidor web de l'aMule"
+
+#. type: Plain text
+#: amuleweb.1.in:15
+msgid "B<-l> I<E<lt>langE<gt>>"
+msgstr "B<-l> I<E<lt>langE<gt>>"
+
+#. type: Plain text
+#: amuleweb.1.in: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.in:20
+msgid "B<-U> I<E<lt>portE<gt>>"
+msgstr "B<-U> I<E<lt>portE<gt>>"
+
+#. type: Plain text
+#: amuleweb.1.in: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.in: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.in: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> gestiona el vostre accés a l'aMule mitjançant un navegador web.  Podeu iniciar amuleweb juntament amb B<amule>(1), o per separat, en qualsevol moment posterior.  Les opcions es poden especificar per línia d'ordres o per fitxer de configuració.  Les opcions de la línia d'ordres tenen preferència sobre les del fitxer de configuració."
+
+#. type: TP
+#: amuleweb.1.in: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.in:77
+msgid "Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section for details."
+msgstr "Carrega la plantilla anomenada I<E<lt>nameE<gt>>. Consulteu la secció B<COMPATIBILITAT AMB APARENCES> per a més detalls."
+
+#. type: TP
+#: amuleweb.1.in: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.in:80
+msgid "Webserver's HTTP port. This is the port you must point your browser to (default: I<4711>)."
+msgstr "Port HTTP del servidor web. És el port al qual heu d'apuntar el navegador (predeterminat: I<4711>)."
+
+#. type: Plain text
+#: amuleweb.1.in:84
+msgid "Enable UPnP."
+msgstr "Habilita l'UPnP."
+
+#. type: TP
+#: amuleweb.1.in: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.in:87
+msgid "UPnP port."
+msgstr "Port UPnP."
+
+#. type: Plain text
+#: amuleweb.1.in:90
+msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
+msgstr "Habilita l'ús de la compressió gzip al trànsit HTTP per estalviar amplada de banda."
+
+#. type: Plain text
+#: amuleweb.1.in:93
+msgid "Disables using gzip compression (this is the default)."
+msgstr "Inhabilita l'ús de la compressió gzip (és el valor predeterminat)."
+
+#. type: TP
+#: amuleweb.1.in: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.in:96
+msgid "Full access password for webserver."
+msgstr "Contrasenya d'accés complet al servidor web."
+
+#. type: TP
+#: amuleweb.1.in: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.in:99
+msgid "Guest password for webserver."
+msgstr "Contrasenya de convidat del servidor web."
+
+#. type: Plain text
+#: amuleweb.1.in:102
+msgid "Allows guest access."
+msgstr "Permet l'accés de convidats."
+
+#. type: Plain text
+#: amuleweb.1.in:105
+msgid "Denies guest access (default)."
+msgstr "Denega l'accés de convidats (predeterminat)."
+
+#. type: Plain text
+#: amuleweb.1.in: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 "Carrega o desa la configuració del servidor web des de o cap a l'aMule remot.  Això fa que amuleweb ignori la configuració de la línia d'ordres i del fitxer de configuració, i que la carregui de l'aMule.  En desar les preferències no se n'escriurà cap al fitxer de configuració, sinó a l'aMule.  (Evidentment, això només funciona per als paràmetres que es poden definir a Preferències-E<gt>Controls remots de l'aMule.)"
+
+#. type: Plain text
+#: amuleweb.1.in:114
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Inhabilita l'intèrpret de PHP (obsolet)"
+
+#. type: Plain text
+#: amuleweb.1.in:117
+msgid "Recompiles PHP pages on each request."
+msgstr "Torna a compilar les pàgines PHP a cada petició."
+
+#. type: TP
+#: amuleweb.1.in:130
+#, 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.in:136
+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 "Camí del fitxer de configuració de l'aMule.  B<NO HO FEU SERVIR DIRECTAMENT!> L'aMule utilitza aquesta opció quan inicia amuleweb en iniciar-se.  Aquesta opció fa que s'ignorin tots els altres paràmetres de la línia d'ordres i del fitxer de configuració, que les preferències es llegeixin del fitxer de configuració indicat, i també implica les opcions B<-q -L>."
+
+#. type: SH
+#: amuleweb.1.in:169
+#, no-wrap
+msgid "SKIN SUPPORT"
+msgstr "COMPATIBILITAT AMB APARENCES"
+
+#. type: Plain text
+#: amuleweb.1.in:173
+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> pot mostrar la informació amb aparences diferents.  Aquestes aparences s'anomenen plantilles, i podeu fer que amuleweb en carregui una de concreta amb l'opció B<-t> de la línia d'ordres.  Les plantilles es busquen en dos llocs: primer a I<~/.aMule/webserver/> i després a I</usr/share/amule/webserver/> si heu instal·lat amb --prefix=/usr."
+
+#. type: Plain text
+#: amuleweb.1.in:175
+msgid "Each template must be in a subdirectory of the template name, and this directory must contain all files the template needs."
+msgstr "Cada plantilla ha de ser en un subdirectori amb el nom de la plantilla, i aquest directori ha de contenir tots els fitxers que la plantilla necessita."
+
+#. type: Plain text
+#: amuleweb.1.in:179
+msgid "~/.aMule/webserver/"
+msgstr "~/.aMule/webserver/"
+
+#. type: Plain text
+#: amuleweb.1.in:181
+msgid "I<$(pkgdatadir)>/webserver/"
+msgstr "I<$(pkgdatadir)>/webserver/"
+
+#. type: Plain text
+#: amuleweb.1.in:183
+msgid "Typically amuleweb will be first run as:"
+msgstr "Normalment amuleweb s'executarà primer així:"
+
+#. type: Plain text
+#: amuleweb.1.in:185
+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.in:189
+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.in:195
+msgid "Of course, you may specify any more or less options on the first example line, and you may also totally omit it."
+msgstr "Evidentment, podeu especificar més o menys opcions a la primera línia d'exemple, i també la podeu ometre del tot."
+
+#. type: TH
+#: ed2k.1.in:1
+#, no-wrap
+msgid "ED2K"
+msgstr "ED2K"
+
+#. type: TH
+#: ed2k.1.in:1
+#, no-wrap
+msgid "aMule eD2k link parser v1.5.1"
+msgstr "Analitzador d'enllaços eD2k de l'aMule v1.5.1"
+
+#. type: Plain text
+#: ed2k.1.in:6
+msgid "ed2k - aMule eD2k link parser"
+msgstr "ed2k - analitzador d'enllaços eD2k de l'aMule"
+
+#. type: Plain text
+#: ed2k.1.in: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.in:13
+msgid "I<E<lt>eD2k-linkE<gt>>"
+msgstr "I<E<lt>eD2k-linkE<gt>>"
+
+#. type: Plain text
+#: ed2k.1.in: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 "Envia l'enllaç I<E<lt>eD2k-linkE<gt>> indicat a l'aMule, és a dir, l'escriu al fitxer ~/.aMule/ED2KLinks, que l'aMule comprova cada segon per veure si hi ha enllaços."
+
+#. type: TP
+#: ed2k.1.in:24
+#, no-wrap
+msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
+msgstr "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
+
+#. type: Plain text
+#: ed2k.1.in:28
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
+msgstr "Estableix la categoria dels enllaços eD2k passats a I<E<lt>numE<gt>>.  A diferència de B<--config-dir>, l'analitzador llegeix el valor com a argument següent i no accepta la sintaxi B<--category>=I<E<lt>numE<gt>>."
+
+#. type: Plain text
+#: ed2k.1.in:31
+msgid "Loads all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr "Carrega tots els enllaços que es troben a l'emulecollection indicada com a I<E<lt>ed2k-linkE<gt>>"
+
+#. type: Plain text
+#: ed2k.1.in:34
+msgid "Lists all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr "Llista tots els enllaços que es troben a l'emulecollection indicada com a I<E<lt>ed2k-linkE<gt>>"
+
+#. type: Plain text
+#: ed2k.1.in:54
+msgid "a magnet link;"
+msgstr "un enllaç magnet;"
+
+#. type: Plain text
+#: ed2k.1.in:56
+msgid "an emulecollection file."
+msgstr "un fitxer emulecollection."
+
+#. type: Plain text
+#: ed2k.1.in:61
+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'ordre en què doneu els paràmetres és important.> Podeu donar més d'un enllaç, i cada enllaç pot tenir els seus propis paràmetres.  Per exemple, B<ed2k E<lt>link1E<gt> -t2 E<lt>link2E<gt>> baixarà I<E<lt>link1E<gt>> a la categoria estàndard i I<E<lt>link2E<gt>> a la categoria 2."
+
+#. type: Plain text
+#: ed2k.1.in:63
+msgid "~/.aMule/ED2KLinks"
+msgstr "~/.aMule/ED2KLinks"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#, no-wrap
+msgid "ALC"
+msgstr "ALC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#, no-wrap
+msgid "aLinkCreator"
+msgstr "aLinkCreator"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+msgid "aLinkCreator - the aMule eD2k link creator"
+msgstr "aLinkCreator - el creador d'enllaços eD2k de l'aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1.in:9
+msgid "B<alc> is a graphical utility to create an eD2k link to any file on your computer."
+msgstr "B<alc> és una utilitat gràfica per crear un enllaç eD2k a qualsevol fitxer del vostre ordinador."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+msgid "This app doesn't take any arguments."
+msgstr "Aquesta aplicació no accepta cap argument."
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#, no-wrap
+msgid "ALCC"
+msgstr "ALCC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#, no-wrap
+msgid "aMule eD2k links calculator"
+msgstr "Calculadora d'enllaços eD2k de l'aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+msgid "alcc - text based eD2k links calculator for aMule"
+msgstr "alcc - calculadora d'enllaços eD2k per a l'aMule, basada en text"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:11
+msgid "I<E<lt>inputfiles_listE<gt>>"
+msgstr "I<E<lt>inputfiles_listE<gt>>"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in: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 "Calcula els enllaços eD2k de tots els fitxers d'entrada indicats a I<E<lt>inputfiles_listE<gt>> (hi pot haver un fitxer o més)."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:19
+msgid "Compute and add part hashes to the computed eD2k links."
+msgstr "Calcula i afegeix els hash de les parts als enllaços eD2k calculats."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
+msgid "Be verbose - show also calculation steps."
+msgstr "Mode detallat: mostra també els passos del càlcul."
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1.in:1
+#, no-wrap
+msgid "CAS"
+msgstr "CAS"
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1.in:1
+#, no-wrap
+msgid "cas v0.8"
+msgstr "cas v0.8"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:6
+msgid "cas - c aMule statistics"
+msgstr "cas - estadístiques de l'aMule en c"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in: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> és un programa per mostrar per consola el contingut del fitxer de signatura en línia de l'aMule (en un format llegible per a persones). Perquè funcioni, heu d'activar l'opció «Signatura en línia» a les preferències de l'aMule."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:23
+msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
+msgstr "Escriu la imatge de la signatura en línia.  La forma llarga B<--picture> accepta un I<=E<lt>PATHE<gt>> opcional per especificar la ubicació de sortida; les formes curtes B<-o> / B<-P> no ho fan (B<-P> requereix un argument I<E<lt>PATHE<gt>> immediatament després, i B<-o> és un commutador sense argument).  Requereix compatibilitat amb GD compilada (I<__GD__>); altrament, aquesta opció s'ignora silenciosament."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:27
+msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
+msgstr "Pàgina HTML amb estadístiques i imatge.  La forma llarga B<--html> accepta un I<=E<lt>PATHE<gt>> opcional per especificar la ubicació de sortida; les formes curtes B<-p> / B<-H> no ho fan (B<-H> requereix un argument I<E<lt>PATHE<gt>> immediatament després, i B<-p> és un commutador sense argument)."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:35
+msgid "Without any options, it prints online signature data to stdout."
+msgstr "Sense cap opció, escriu les dades de la signatura en línia a stdout."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:37
+msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+msgstr "B<cas> el va escriure Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:39
+msgid "~/.aMule/casrc"
+msgstr "~/.aMule/casrc"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:41
+msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
+msgstr "aMule-online-sign.png (o .jpg, quan es fa servir B<-o> / B<--picture> i GD està disponible)"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:43
+msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
+msgstr "aMule-online-sign.html (quan es fa servir B<-p> / B<--html>)"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#, no-wrap
+msgid "WXCAS"
+msgstr "WXCAS"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#, no-wrap
+msgid "wxCas"
+msgstr "wxCas"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+msgid "wxcas - wx c aMule statistics"
+msgstr "wxcas - estadístiques de l'aMule en wx c"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1.in: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> és un programa per mostrar el contingut del fitxer de signatura en línia en una finestra wx a l'escriptori.  Perquè funcioni, heu d'activar l'opció «Signatura en línia» a les preferències de l'aMule."
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1.in:14
+msgid "Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish E<lt>thepolish@vipmail.ruE<gt>"
+msgstr "Basat en el B<cas>(1) de Pedro de Oliveira.  B<wxcas> el va escriure ThePolish E<lt>thepolish@vipmail.ruE<gt>"

amule-3.0.1.tar.gz/docs/man/po/manpages-cs.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-cs.po Changed

@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2026-09-20 21:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: none\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 
 #. type: TH
 #: amule.1.in:1
@@ -41,7 +41,7 @@
 #: amule.1.in:1
 #, no-wrap
 msgid "aMule"
-msgstr ""
+msgstr "aMule"
 
 #. type: SH
 #: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
@@ -122,7 +122,7 @@
 #. type: Plain text
 #: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
 msgid "Resets config to default values."
-msgstr ""
+msgstr "Resetuje nastavení na výchozí hodnoty."
 
 #. type: Plain text
 #: amule.1.in:42
@@ -400,12 +400,12 @@
 #. type: Plain text
 #: amulecmd.1.in:46 amuleweb.1.in:63
 msgid "Do not print any output to stdout."
-msgstr ""
+msgstr "Nevypisovat nic na standardní výstup."
 
 #. type: Plain text
 #: amulecmd.1.in:50 amuleweb.1.in:67
 msgid "Be verbose - show also debug messages."
-msgstr ""
+msgstr "Vypisovat podrobnosti - včetně zpráv ladění."
 
 #. type: TP
 #: amulecmd.1.in:50 amuleweb.1.in:67
@@ -484,7 +484,7 @@
 #. type: Plain text
 #: amulecmd.1.in:93
 msgid "Connect to the network."
-msgstr ""
+msgstr "Připojit se k síti."
 
 #. type: Plain text
 #: amulecmd.1.in:95
@@ -508,7 +508,7 @@
 
 #. type: Plain text
 #: amulecmd.1.in:108
-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."
+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
@@ -519,7 +519,7 @@
 #. type: Plain text
 #: amulecmd.1.in:112
 msgid "Get and display a preference value."
-msgstr ""
+msgstr "Získat a zobrazit hodnotu předvolby."
 
 #. type: Plain text
 #: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
@@ -529,7 +529,7 @@
 #. type: Plain text
 #: amulecmd.1.in:117
 msgid "Get bandwidth limits."
-msgstr ""
+msgstr "Získejte limity šířky pásma."
 
 #. type: Plain text
 #: amulecmd.1.in:119
@@ -594,7 +594,7 @@
 #. type: Plain text
 #: amulecmd.1.in:151
 msgid "Reload shared files list."
-msgstr ""
+msgstr "Opětovně načte seznam sdílených souborů."
 
 #. type: Plain text
 #: amulecmd.1.in:153
@@ -604,7 +604,7 @@
 #. type: Plain text
 #: amulecmd.1.in:156
 msgid "Reset the log."
-msgstr ""
+msgstr "Resetovat log."
 
 #. type: Plain text
 #: amulecmd.1.in:158
@@ -618,7 +618,7 @@
 
 #. type: Plain text
 #: amulecmd.1.in:164
-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'."
+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
@@ -673,7 +673,7 @@
 
 #. type: Plain text
 #: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
 msgstr ""
 
 #. type: Plain text
@@ -684,7 +684,7 @@
 #. type: Plain text
 #: amulecmd.1.in:200
 msgid "Set bandwidth limits."
-msgstr ""
+msgstr "Nastavit limity šířky pásma."
 
 #. type: Plain text
 #: amulecmd.1.in:202
@@ -699,27 +699,27 @@
 #. type: Plain text
 #: amulecmd.1.in:210
 msgid "Show download queue."
-msgstr ""
+msgstr "Zobrazit frontu stahování."
 
 #. type: Plain text
 #: amulecmd.1.in:212
 msgid "Show log."
-msgstr ""
+msgstr "Zobrazit log."
 
 #. type: Plain text
 #: amulecmd.1.in:214
 msgid "Show servers list."
-msgstr ""
+msgstr "Zobrazit seznam serverů."
 
 #. type: Plain text
 #: amulecmd.1.in:216
 msgid "Show shared files list."
-msgstr ""
+msgstr "Zobrazit seznam sdílených souborů."
 
 #. type: Plain text
 #: amulecmd.1.in:218
 msgid "Show upload queue."
-msgstr ""
+msgstr "Zobrazit frontu odesílání."
 
 #. type: Plain text
 #: amulecmd.1.in:222
@@ -733,12 +733,12 @@
 
 #. type: Plain text
 #: amulecmd.1.in:228
-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'."
+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.in:231
-msgid "Example: `statistics 5' will show only the top 5 versions for each client type."
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
 msgstr ""
 
 #. type: Plain text
@@ -899,7 +899,7 @@
 #: amulegui.1.in:1
 #, no-wrap
 msgid "aMuleGUI"
-msgstr ""
+msgstr "aMuleGUI"
 
 #. type: Plain text
 #: amulegui.1.in:6
@@ -1071,7 +1071,7 @@
 #. type: Plain text
 #: amuleweb.1.in:114
 msgid "Disable PHP interpreter (deprecated)"
-msgstr ""
+msgstr "Zakázat PHP interpreter (zastaralé)"
 
 #. type: Plain text
 #: amuleweb.1.in:117
@@ -1139,7 +1139,7 @@
 #: ed2k.1.in:1
 #, no-wrap
 msgid "ED2K"
-msgstr ""
+msgstr "ED2K"
 
 #. type: TH
 #: ed2k.1.in:1

amule-3.0.1.tar.gz/docs/man/po/manpages-de.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-de.po Changed

@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-de\n"
-"POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-18 22:13+0000\n"
+"POT-Creation-Date: 2026-08-24 19:02+0200\n"
+"PO-Revision-Date: 2026-09-20 21:08+0000\n"
 "Last-Translator: Balla Marcell <marcell.balla@gmx.at>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de\n"
@@ -17,1541 +17,1577 @@
 
 # type: TH
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "AMULE"
 msgstr "AMULE"
 
 #. type: TH
-#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
-#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "@MAN_DATE@"
 msgstr "@MAN_DATE@"
 
 # type: TH
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule v@PACKAGE_VERSION@"
 msgstr "aMule v@PACKAGE_VERSION@"
 
 # type: TH
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule"
 msgstr "aMule"
 
 # type: SH
 #. type: SH
-#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
-#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
-#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "NAME"
 msgstr "NAME"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:6
+#: amule.1.in
 msgid "amule - the all-platform eMule p2p client"
 msgstr "amule - der alle-Plattformen eMule p2p Client"
 
 # type: SH
 #. type: SH
-#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
-#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
-#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SYNTAX"
 
 # type: TP
 #. type: Plain text
-#: amule.1.in:10 amulegui.1.in:10
+#: amule.1.in amulegui.1.in
 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.in:14 amuled.1.in:16
+#: amule.1.in amuled.1.in
 msgid "B<-w> I<E<lt>pathE<gt>>"
 msgstr "B<-w> I<E<lt>PfadE<gt>>"
 
 #. type: Plain text
-#: amule.1.in:18 amuled.1.in:20
-msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
+#: amule.1.in amuled.1.in
+#, fuzzy
+#| msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
 msgstr "B<-t> I<E<lt>NumE<gt>> I<eD2k-Verweis>"
 
 # type: SH
 #. type: SH
-#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
-#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
-#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
 
 # type: Plain text
 #. type: TP
-#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
-#: ../../src/utils/cas/docs/cas.1.in:30
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:29 amulegui.1.in:30
+#: amule.1.in amulegui.1.in
 #, 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.in:32 amulegui.1.in:33
+#: amule.1.in amulegui.1.in
 msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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:\tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Prints log messages to stdout."
 msgstr "Schreibt Log-Meldungen auf die Standardausgabe."
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Resets config to default values."
 msgstr "Setzt die Konfiguration auf die Standardwerte zurück."
 
 #. type: Plain text
-#: amule.1.in:42
+#: amule.1.in
 msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Aktiviert bzw. deaktiviert den automatischen Start von aMule beim Benutzerlogin, beendet danach.  Der betriebssystemspezifische Speicherort wird automatisch ausgewählt: Windows Registrierung run Schlüssel, macOS LaunchAgent, Linux XDG I<.desktop> Autostart Eintrag."
 
 # type: Plain text
 #. type: TP
-#: amule.1.in:42 amuled.1.in:50
+#: amule.1.in amuled.1.in
 #, 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.in:45 amuled.1.in:53
+#: amule.1.in amuled.1.in
 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>>."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amule.1.in:50 amuled.1.in:58 amulegui.1.in:51
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
 msgstr "Fatale Ausnahmen nicht abfangen und das Beenden bei Assertions nicht blockieren.  Nützlich für Headless- / überwachte Setups (systemd, Watchdog-Skripte), bei denen der sonst modale Assertion-Dialog den automatischen Neustart verhindert."
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Does not disable stdin."
 msgstr "Schaltet die Standardeingabe nicht ab."
 
 # type: TP
 #. type: TP
-#: amule.1.in:53 amulegui.1.in:54
+#: amule.1.in amulegui.1.in
 #, 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.in:56 amuled.1.in:64 amulegui.1.in:57
+#: amule.1.in amuled.1.in amulegui.1.in
 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.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
-#: amuleweb.1.in:130 ed2k.1.in:40
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
 msgid "Displays the current version number."
 msgstr "Zeigt die derzeitige Versionsnummer an."
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
-#: amuleweb.1.in:127 ed2k.1.in:37
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
-#: ../../src/utils/cas/docs/cas.1.in:33
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Prints a short usage description."
 msgstr "Gibt eine kurze Nutzungsbeschreibung aus."
 
 #. type: TP
-#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
-#, no-wrap
-msgid "B< eD2k-link >"
+#: amule.1.in amuled.1.in
+#, fuzzy, no-wrap
+#| msgid "B< eD2k-link >"
+msgid "B< eD2k-link | collection-file >"
 msgstr "B< eD2k-Verweis >"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
-msgid "Adds an eD2k-link to the core."
-msgstr "Fügt einen eD2k-Verweis zur Downloadliste hinzu."
+#: amule.1.in amuled.1.in
+#, fuzzy
+#| msgid "Adds an eD2k-link or a magnet-link to the core."
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
+msgstr "Fügt einen eD2k- oder Magnetverweis dem Kern hinzu."
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "The eD2k link to be added can be:"
 msgstr "Der eD2k-Verweis darf enthalten:"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 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.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 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.in:74 amuled.1.in:82 ed2k.1.in:52
+#: amule.1.in amuled.1.in ed2k.1.in
 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.in:76 amuled.1.in:84
+#: amule.1.in amuled.1.in
 msgid "a magnet link."
 msgstr "ein Magnet Verweis."
 
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr ""
+
 # type: SH
 #. type: SH
-#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "NOTES"
 msgstr "ANMERKUNGEN"
 
 # type: SS
 #. type: SS
-#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Paths"
 msgstr "Pfade"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 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.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
-#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:84 amuled.1.in:87
+#: amule.1.in amuled.1.in
 msgid "~/.aMule/*"
 msgstr "~/.aMule/*"
 
 # type: SH
 #. type: SH
-#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
-#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
-#: ../../src/utils/cas/docs/cas.1.in:43
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr "FEHLER MELDEN"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  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<https://github.com/amule-org/amule/discussions>), oder in unseren Bugtracker (I<https://github.com/amule-org/amule/issues>). Bitte meldet uns weder Fehler per E-Mail, noch auf unsere Mailingliste oder direkt an unsere Teammitglieder."
 
 # type: SH
 #. type: SH
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 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 unter der GNU General Public License verteilt."
 
 # type: SH
 #. type: SH
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 # type: SH
 #. type: SH
-#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
-#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
-#: ../../src/utils/cas/docs/cas.1.in:50
-#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "AUTHOR"
 msgstr "VERFASSER"
 
 #. type: Plain text
-#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
-#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
-#: ../../src/utils/cas/docs/cas.1.in:51
-#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "AMULECMD"
 msgstr "AMULECMD"
 
 # type: TH
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "aMuleCmd v@PACKAGE_VERSION@"
 msgstr "aMuleCmd v@PACKAGE_VERSION@"
 
 # type: TH
 #. type: TH
-#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "aMule utilities"
 msgstr "aMule Hilfsprogramme"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:7
+#: amulecmd.1.in
 msgid "amulecmd - Console-based program to control aMule"
 msgstr "amulecmd - Konsolenbasiertes Programm um aMule zu steuern"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:13 amuleweb.1.in:12
+#: amulecmd.1.in amuleweb.1.in
 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.in:17
+#: amulecmd.1.in
 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.in:20 amuleweb.1.in:31
+#: amulecmd.1.in amuleweb.1.in
 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.in:29
+#: amulecmd.1.in
 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.in:29 amuleweb.1.in:46
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
 msgstr "Der Rechner auf dem aMule läuft (Standard: I<127.0.0.1>).  I<E<lt>HostE<gt>> kann eine IP-Adresse oder ein DNS-Name sein."
 
 # type: TP
 #. type: TP
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 msgid "External Connections password."
 msgstr "Passwort für Externe Verbindungen."
 
 # type: TP
 #. type: TP
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:43 amuleweb.1.in:60
+#: amulecmd.1.in amuleweb.1.in
 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.in:46 amuleweb.1.in:63
+#: amulecmd.1.in amuleweb.1.in
 msgid "Do not print any output to stdout."
 msgstr "Keine Ausgabe auf stdout ausgeben."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 msgid "Be verbose - show also debug messages."
 msgstr "Sei gesprächig - Gebe auch Debuggingausgaben aus"
 
 # type: TP
 #. type: TP
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:54 amuleweb.1.in:71
+#: amulecmd.1.in amuleweb.1.in
 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.in:57 amuleweb.1.in:74
+#: amulecmd.1.in amuleweb.1.in
 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.in:57
+#: amulecmd.1.in
 #, 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.in:60
+#: amulecmd.1.in
 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.in:60 amuleweb.1.in:117
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:63 amuleweb.1.in:120
+#: amulecmd.1.in amuleweb.1.in
 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: Plain text
-#: amulecmd.1.in:67 amuleweb.1.in:124
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
 msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
 msgstr "Erzwingt ZLIB Kompression der externen Verbindung, unabhängig von der Lokalität der gewählten IP. Nützlich, wenn der Server über einen VPN Tunnel erreichbar ist, der eine LAN IP ist, und die Heuristik sonst Kompression deaktivieren würde."
 
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.  Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output."
+msgstr ""
+
 # type: SH
 #. type: SH
-#: amulecmd.1.in:73
+#: amulecmd.1.in
 #, no-wrap
 msgid "COMMANDS"
 msgstr "BEFEHLE"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:75
+#: amulecmd.1.in
 msgid "All commands are case insensitive."
 msgstr "Alle Befehle können groß oder klein geschrieben werden."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:77
+#: amulecmd.1.in
 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.in:86
+#: amulecmd.1.in
 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.in:89
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:91
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:93
+#: amulecmd.1.in
 msgid "Connect to the network."
 msgstr "Verbindung zu einem Netzwerk aufbauen."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:95
+#: amulecmd.1.in
 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.in:99
+#: amulecmd.1.in
 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 "Mit dem optionalen Parameter kannst du das Netzwerk angeben, zu welchem eine Verbindung aufgebaut werden soll. Wenn du eine Server-Adresse als IP:Port angibst (wobei IP entweder eine durch punktierte dezimale IPv4 Adresse oder ein auflösbarer DNS Name ist), so wird aMule sich nur zu diesem Server verbinden."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:102
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:104
+#: amulecmd.1.in
 msgid "Start downloading a file."
 msgstr "Startet den Download einer Datei."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:108
-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."
+#: amulecmd.1.in
+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.in:110
+#: amulecmd.1.in
 msgid "Disconnect from amule/amuled and quit amulecmd."
 msgstr "Verbindung zu amule/amuled trennen und amulecmd beenden."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:112
+#: amulecmd.1.in
 msgid "Get and display a preference value."
 msgstr "Liest eine Option und zeigt sie an."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+#: amulecmd.1.in
 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.in:117
+#: amulecmd.1.in
 msgid "Get bandwidth limits."
 msgstr "Bandbreitenbeschränkungen abfragen."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:119
+#: amulecmd.1.in
 msgid "Get IPFilter preferences."
 msgstr "IPFilter Einstellungen abfragen."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:124
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:126
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:128
+#: amulecmd.1.in
 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.in:130
+#: amulecmd.1.in
 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.in:133
+#: amulecmd.1.in
 msgid "Automatic priority."
 msgstr "Automatische Priorität."
 
 #. type: Plain text
-#: amulecmd.1.in:135
+#: amulecmd.1.in
 msgid "High priority."
 msgstr "Hohe Priorität."
 
 #. type: Plain text
-#: amulecmd.1.in:137
+#: amulecmd.1.in
 msgid "Low priority."
 msgstr "Niedrige Priorität."
 
 #. type: Plain text
-#: amulecmd.1.in:139
+#: amulecmd.1.in
 msgid "Normal priority."
 msgstr "Normale Priorität."
 
-# type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:142
-msgid "Shows the progress of an on-going search."
-msgstr "Zeigt den Fortschritt einer laufenden Suche an."
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr ""
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:144
+#: amulecmd.1.in
 msgid "A synonym of the B<exit> command."
 msgstr "Synonym für den B<exit> Befehl."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:146
+#: amulecmd.1.in
 msgid "Reloads a given object."
 msgstr "Aktualisiert das angegebene Objekt."
 
 #. type: Plain text
-#: amulecmd.1.in:151
+#: amulecmd.1.in
 msgid "Reload shared files list."
 msgstr "Liste der freigegebenen Dateien neu laden."
 
 #. type: Plain text
-#: amulecmd.1.in:153
+#: amulecmd.1.in
 msgid "Reload IP filter tables."
 msgstr "IP Filter Tabellen neu laden."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:156
+#: amulecmd.1.in
 msgid "Reset the log."
 msgstr "Setzt das Log zurück."
 
-# type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:158
-msgid "Shows you the results of the last search."
-msgstr "Zeigt die Resultate der letzten Suche an."
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:160
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:164
-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'."
+#: amulecmd.1.in
+#, fuzzy
+#| 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'."
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
 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.in:166
+#: amulecmd.1.in
 msgid "Available search types:"
 msgstr "Verfügbare Suchtypen:"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:169
+#: amulecmd.1.in
 msgid "Performs a global search."
 msgstr "Führt eine globale Suche durch."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:171
+#: amulecmd.1.in
 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.in:173
+#: amulecmd.1.in
 msgid "Performs a local search."
 msgstr "Führt eine lokale Suche durch."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:177
+#: amulecmd.1.in
 msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
 msgstr "Optionale Filter können vor, nach oder zwischen den Suchbegriffen eingefügt werden:"
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:180
+#: amulecmd.1.in
 msgid "Restrict results to the given file type."
 msgstr "Beschränkt die Ergebnisse auf den angegebenen Dateityp."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:182
+#: amulecmd.1.in
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
 msgstr "Beschränkt die Ergebnisse auf eine bestimmte Dateierweiterung (z. B.\\ I<iso>, I<mp3>)."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:184
+#: amulecmd.1.in
 msgid "Minimum number of sources a result must report."
 msgstr "Mindestanzahl an Quellen, die ein Ergebnis melden muss."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:187
+#: amulecmd.1.in
 msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
 msgstr "Kleinste zurückzugebende Dateigröße. Suffixe verwenden binäre Multiplikatoren (K = 1024, M = K\\(mu1024, G = M\\(mu1024); kein Suffix bedeutet Bytes."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:189
+#: amulecmd.1.in
 msgid "Largest file size to return. Same suffixes as B<--min-size>."
 msgstr "Größte zurückzugebende Dateigröße. Gleiche Suffixe wie B<--min-size>."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
-msgstr "Beispiel: `search global linux iso --type Iso --min-size 100M' liefert Ergebnisse für \\(lqlinux iso\\(rq vom Dateityp Iso mit mindestens 100 MiB."
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
+msgstr "Beispiel: 'search global linux iso --type Iso --min-size 100M' liefert Ergebnisse für 'linux iso' vom Dateityp Iso mit mindestens 100 MiB."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:195
+#: amulecmd.1.in
 msgid "Sets a given preferences value."
 msgstr "Setzt die angegebene Option."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:200
+#: amulecmd.1.in
 msgid "Set bandwidth limits."
 msgstr "Setzt die Bandbreitenbeschränkungen."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:202
+#: amulecmd.1.in
 msgid "Set IPFilter preferences."
 msgstr "IPFilter Einstellungen setzen."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:205
+#: amulecmd.1.in
 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.in:210
+#: amulecmd.1.in
 msgid "Show download queue."
 msgstr "Downloadwarteschlange anzeigen."
 
 #. type: Plain text
-#: amulecmd.1.in:212
+#: amulecmd.1.in
 msgid "Show log."
 msgstr "Log anzeigen."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:214
+#: amulecmd.1.in
 msgid "Show servers list."
 msgstr "Serverliste anzeigen."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:216
+#: amulecmd.1.in
 msgid "Show shared files list."
 msgstr "Liste der freigegebenen Dateien anzeigen."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:218
+#: amulecmd.1.in
 msgid "Show upload queue."
 msgstr "Uploadwarteschlange anzeigen."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:222
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:224
+#: amulecmd.1.in
 msgid "Show statistics tree."
 msgstr "Zeigt die Statistiken an."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:228
-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'."
+#: amulecmd.1.in
+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.in:231
-msgid "Example: `statistics 5' will show only the top 5 versions for each client type."
+#: amulecmd.1.in
+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.in:233
+#: amulecmd.1.in
 msgid "Show connection status, current up/download speeds, etc."
 msgstr "Zeigt den Verbindungsstatus, aktuelle Up/Downloadgeschindigkeiten, etc. an."
 
 #. type: SS
-#: amulecmd.1.in:238 amuleweb.1.in:141
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Languages"
 msgstr "Sprachen"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:244 amuleweb.1.in:147
+#: amulecmd.1.in amuleweb.1.in
 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.in:246 amuleweb.1.in:149
+#: amulecmd.1.in amuleweb.1.in
 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.in:260 amuleweb.1.in:163
+#: amulecmd.1.in amuleweb.1.in
 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.in:263 amuleweb.1.in:166
+#: amulecmd.1.in amuleweb.1.in
 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.in:266 amuleweb.1.in:169
+#: amulecmd.1.in amuleweb.1.in
 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.in:268 amuleweb.1.in:177
+#: amulecmd.1.in amuleweb.1.in
 msgid "~/.aMule/remote.conf"
 msgstr "~/.aMule/remote.conf"
 
 # type: SH
 #. type: SH
-#: amulecmd.1.in:268 amuleweb.1.in:181
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "BEISPIEL"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:270
+#: amulecmd.1.in
 msgid "Typically amulecmd will be first run as:"
 msgstr "Typischerweise startet man amulecmd als erstes mit:"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:272
+#: amulecmd.1.in
 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.in:274 amuleweb.1.in:187
+#: amulecmd.1.in amuleweb.1.in
 msgid "or"
 msgstr "oder"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:276
+#: amulecmd.1.in
 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.in:278 amuleweb.1.in:191
+#: amulecmd.1.in amuleweb.1.in
 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.in:282
+#: amulecmd.1.in
 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.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "AMULED"
 msgstr "AMULED"
 
 # type: TH
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon v@PACKAGE_VERSION@"
 msgstr "aMule Dämon v@PACKAGE_VERSION@"
 
 # type: TH
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon"
 msgstr "aMule Dämon"
 
 # type: Plain text
 #. type: Plain text
-#: amuled.1.in:6
+#: amuled.1.in
 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.in:9 ../../src/utils/cas/docs/cas.1.in:11
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
 msgid "B<-c> I<E<lt>pathE<gt>>"
 msgstr "B<-c> I<E<lt>PfadE<gt>>"
 
 # type: TP
 #. type: Plain text
-#: amuled.1.in:11
+#: amuled.1.in
 msgid "B<-p> I<E<lt>pathE<gt>>"
 msgstr "B<-p> I<E<lt>PfadE<gt>>"
 
 # type: Plain text
 #. type: Plain text
-#: amuled.1.in:33
+#: amuled.1.in
 msgid "Forks to background."
 msgstr "Im Hintergrund ausführen."
 
 # type: Plain text
 #. type: TP
-#: amuled.1.in:33
+#: amuled.1.in
 #, 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.in:37
+#: amuled.1.in
 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.in:40
+#: amuled.1.in
 msgid "Configure EC (External Connections)."
 msgstr "Konfiguration für EC (Externe Verbindungen)."
 
 #. type: Plain text
-#: amuled.1.in:50
+#: amuled.1.in
 msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Aktiviert bzw. deaktiviert den automatischen Start von amuled beim Benutzerlogin, beendet danach.  Der betriebssystemspezifische Speicherort wird automatisch ausgewählt: Windows Registrierung run Schlüssel, macOS LaunchAgent, Linux XDG I<.desktop> Autostart Eintrag."
 
 # type: TP
 #. type: TP
-#: amuled.1.in:61
+#: amuled.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>NumE<gt>>, B<--category>=I<E<lt>NumE<gt>> B<>"
 
 # type: TH
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "AMULEGUI"
 msgstr "AMULEGUI"
 
 # type: TH
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI v@PACKAGE_VERSION@"
 msgstr "aMuleGUI v@PACKAGE_VERSION@"
 
 # type: TH
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
 #. type: Plain text
-#: amulegui.1.in:6
+#: amulegui.1.in
 msgid "amulegui - aMule control program with GUI"
 msgstr "amulegui - aMule Steuerungsprogramm mit GUI"
 
 # type: TP
 #. type: Plain text
-#: amulegui.1.in:17
+#: amulegui.1.in
 msgid "B<-t> I<E<lt>numE<gt>>"
 msgstr "B<-t> I<E<lt>NumE<gt>>"
 
 #. type: Plain text
-#: amulegui.1.in:27
+#: amulegui.1.in
 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.in:42
+#: amulegui.1.in
 msgid "Skip connection dialog."
 msgstr "Überspringe den Verbindungsdialog."
 
 #. type: Plain text
-#: amulegui.1.in:46
+#: amulegui.1.in
 msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Aktiviert bzw. deaktiviert den automatischen Start von amulegui beim Benutzerlogin, beendet danach.  Der betriebssystemspezifische Speicherort wird automatisch ausgewählt: Windows Registrierung run Schlüssel, macOS LaunchAgent, Linux XDG I<.desktop> Autostart Eintrag."
 
 #. type: Plain text
-#: amulegui.1.in:72
+#: amulegui.1.in
 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.in:73
+#: amulegui.1.in
 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.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "AMULEWEB"
 msgstr "AMULEWEB"
 
 # type: TH
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "aMule webserver v@PACKAGE_VERSION@"
 msgstr "aMule Webserver v@PACKAGE_VERSION@"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:6
+#: amuleweb.1.in
 msgid "amuleweb - aMule web server"
 msgstr "amuleweb - aMule Webserver"
 
 # type: TP
 #. type: Plain text
-#: amuleweb.1.in:15
+#: amuleweb.1.in
 msgid "B<-l> I<E<lt>langE<gt>>"
 msgstr "B<-l> I<E<lt>SpracheE<gt>>"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:18
+#: amuleweb.1.in
 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.in:20
+#: amuleweb.1.in
 msgid "B<-U> I<E<lt>portE<gt>>"
 msgstr "B<-U> I<E<lt>PortE<gt>>"
 
 # type: TP
 #. type: Plain text
-#: amuleweb.1.in:24
+#: amuleweb.1.in
 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.in:40
+#: amuleweb.1.in
 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.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr ""
+
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:46
+#: amuleweb.1.in
 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.in:74
+#: amuleweb.1.in
 #, 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.in:77
+#: amuleweb.1.in
 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> für Details."
 
 # type: TP
 #. type: TP
-#: amuleweb.1.in:77
+#: amuleweb.1.in
 #, 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.in:80
+#: amuleweb.1.in
 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 im Browser angegeben werden muss (Standard: I<4711>)."
 
 #. type: Plain text
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 msgid "Enable UPnP."
 msgstr "Aktiviere UPnP."
 
 # type: TP
 #. type: TP
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 #, 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.in:87
+#: amuleweb.1.in
 msgid "UPnP port."
 msgstr "UPnP Port."
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:90
+#: amuleweb.1.in
 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.in:93
+#: amuleweb.1.in
 msgid "Disables using gzip compression (this is the default)."
 msgstr "Schalten die gzip Kompression ab (Standard)"
 
 # type: TP
 #. type: TP
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 #, 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.in:96
+#: amuleweb.1.in
 msgid "Full access password for webserver."
 msgstr "Passwort für vollen Zugriff auf den Webserver"
 
 # type: TP
 #. type: TP
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 #, 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.in:99
+#: amuleweb.1.in
 msgid "Guest password for webserver."
 msgstr "Gäste Passwort für den Webserver"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:102
+#: amuleweb.1.in
 msgid "Allows guest access."
 msgstr "Erlaubt den Zugriff als Gast."
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:105
+#: amuleweb.1.in
 msgid "Denies guest access (default)."
 msgstr "Verbietet den Zugriff als Gast (Standard)"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:111
+#: amuleweb.1.in
 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.in:114
+#: amuleweb.1.in
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Deaktiviert den PHP Interpreter (veraltet)"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:117
+#: amuleweb.1.in
 msgid "Recompiles PHP pages on each request."
 msgstr "Erstellt die PHP-Seiten bei jedem Aufruf neu."
 
 # type: TP
 #. type: TP
-#: amuleweb.1.in:130
+#: amuleweb.1.in
 #, 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.in:136
+#: amuleweb.1.in
 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.in:169
+#: amuleweb.1.in
 #, no-wrap
 msgid "SKIN SUPPORT"
 msgstr "SKIN UNTERSTÜTZUNG"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:173
+#: amuleweb.1.in
 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.in:175
+#: amuleweb.1.in
 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.in:179
+#: amuleweb.1.in
 msgid "~/.aMule/webserver/"
 msgstr "~/.aMule/webserver/"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:181
+#: amuleweb.1.in
 msgid "I<$(pkgdatadir)>/webserver/"
 msgstr "I<$(pkgdatadir)>/webserver/"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:183
+#: amuleweb.1.in
 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.in:185
+#: amuleweb.1.in
 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.in:189
+#: amuleweb.1.in
 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.in:195
+#: amuleweb.1.in
 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.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "ED2K"
 msgstr "ED2K"
 
 # type: TH
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, 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.in:6
+#: ed2k.1.in
 msgid "ed2k - aMule eD2k link parser"
 msgstr "ed2k - aMule ED2k Verweis-Parser"
 
 # type: Plain text
 #. type: Plain text
-#: ed2k.1.in:10
+#: ed2k.1.in
 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.in:13
+#: ed2k.1.in
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr "I<E<lt>eD2k-VerweisE<gt>>"
 
 # type: Plain text
 #. type: Plain text
-#: ed2k.1.in:21
+#: ed2k.1.in
 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 die Datei ~/.aMule/ED2KLinks, welche von aMule jede Sekunde auf neue Verweise geprüft wird."
 
 # type: TP
 #. type: TP
-#: ed2k.1.in:24
+#: ed2k.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>NumE<gt>>, B<--category>=I<E<lt>NumE<gt>> B<>"
 
 #. type: Plain text
-#: ed2k.1.in:28
+#: ed2k.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
 msgstr "Setzt Kategorie für übergebene ed2K Links zu I<E<lt>NumE<gt>>.  Im Unterschied zu B<--config-dir> liest der Parser den Wert als das nächste Argument und akzeptiert das B<--category>=I<E<lt>numE<gt>> Syntax nicht."
 
 #. type: Plain text
-#: ed2k.1.in:31
+#: ed2k.1.in
 msgid "Loads all links 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.in:34
+#: ed2k.1.in
 msgid "Lists all links 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: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< eD2k-Verweis >"
+
+# type: Plain text
 #. type: Plain text
-#: ed2k.1.in:54
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr "Fügt einen eD2k-Verweis zur Downloadliste hinzu."
+
+#. type: Plain text
+#: ed2k.1.in
 msgid "a magnet link;"
 msgstr "ein Magnetverweis;"
 
 #. type: Plain text
-#: ed2k.1.in:56
+#: ed2k.1.in
 msgid "an emulecollection file."
 msgstr "eine emulecollection Datei."
 
 #. type: Plain text
-#: ed2k.1.in:61
+#: ed2k.1.in
 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.in:63
+#: ed2k.1.in
 msgid "~/.aMule/ED2KLinks"
 msgstr "~/.aMule/ED2KLinks"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "ALC"
 msgstr "ALC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "aLinkCreator"
 msgstr "aLinkCreator"
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 msgid "aLinkCreator - the aMule eD2k link creator"
 msgstr "ed2k - aMule eD2k Verweis parser"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:9
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:11
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This app doesn't take any arguments."
 msgstr "Dieses Programm hat keine Parameter."
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "ALCC"
 msgstr "ALCC"
 
 # type: TH
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "aMule eD2k links calculator"
 msgstr "aMule eD2k Verweis Ersteller"
 
 # type: TH
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "I<E<lt>inputfiles_listE<gt>>"
 msgstr "I<E<lt>eingabedatei_listeE<gt>>"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:26
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "CAS"
 msgstr "CAS"
 
 # type: TH
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "cas v0.8"
 msgstr "cas v0.8"
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "cas - c aMule statistics"
 msgstr "cas - c aMule statistics"
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:18
+#: ../../src/utils/cas/docs/cas.1.in
 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). Damit dies funktioniert, musst du die \"Online-Signatur\" Option in den aMule Einstellungen aktivieren."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:23
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
 msgstr "Schreibt das online Signatur Bild.  Die lange Form B<--picture> akzeptiert ein optionales I<=E<lt>PATHE<gt>> um den Ausgabeort zu bestimmen; die Kurzform B<-o> / B<-P> tut es nicht (B<-P> benötigt ein unmittelbar folgendes I<E<lt>PATHE<gt>> Argument, und B<-o> ist eine Option ohne Parameter).  Dafür muss Unterstützung für GD einkompiliert sein (I<__GD__>); ansonsten wird diese Option ohne Nachricht ignoriert."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
 msgstr "HTML Seite with Status und Bild.  Die Langform B<--html> akzeptiert ein optionales I<=E<lt>PATHE<gt>> um den Ausgabeort zu bestimmen; die Kurzform B<-p> / B<-H> tut es nicht (B<-H> benötigt ein unmittelbar folgendes I<E<lt>PATHE<gt>> Argument, und B<-p> ist eine Option ohne Parameter)."
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:35
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:37
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:39
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "~/.aMule/casrc"
 msgstr "~/.aMule/casrc"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:41
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
 msgstr "aMule-online-sign.png (oder .jpg, wenn B<-o> / B<--picture> verwendet wird und GD verfügbar ist)"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
 msgstr "aMule-online-sign.html (wenn B<-p> / B<--html> verwendet wird)"
 
 # type: TH
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "WXCAS"
 msgstr "WXCAS"
 
 # type: TH
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "wxCas"
 msgstr "wxCas"
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "wxcas - wx c aMule statistics"
 msgstr "wxcas - wx c aMule statistics"
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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.  Damit dies funktioniert, musst du die \"Online-Signatur\" Option in den aMule Einstellungen aktivieren."
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:14
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish E<lt>thepolish@vipmail.ruE<gt>"
 msgstr "Basierend auf Pedro de Oliveira's B<cas>(1).  B<wxcas> wurde geschrieben von ThePolish E<lt>thepolish@vipmail.ruE<gt>"
 
 # type: Plain text
+#~ msgid "Shows the progress of an on-going search."
+#~ msgstr "Zeigt den Fortschritt einer laufenden Suche an."
+
+# type: Plain text
+#~ msgid "Shows you the results of the last search."
+#~ msgstr "Zeigt die Resultate der letzten Suche an."
+
+# type: Plain text
 #~ 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."

amule-3.0.1.tar.gz/docs/man/po/manpages-es.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-es.po Changed

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-23 18:44+0000\n"
+"POT-Creation-Date: 2026-08-24 19:02+0200\n"
+"PO-Revision-Date: 2026-09-20 21:08+0000\n"
 "Last-Translator: Mad-Soft <mad.soft@gmail.com>\n"
 "Language-Team: Spanish <es_ES@li.org>\n"
 "Language: es\n"
@@ -20,1346 +20,1374 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "AMULE"
 msgstr "AMULE"
 
 #. type: TH
-#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
-#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "@MAN_DATE@"
 msgstr "@MAN_DATE@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule v@PACKAGE_VERSION@"
 msgstr "aMule v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule"
 msgstr "aMule"
 
 #. type: SH
-#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
-#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
-#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "NAME"
 msgstr "NOMBRE"
 
 #. type: Plain text
-#: amule.1.in:6
+#: amule.1.in
 msgid "amule - the all-platform eMule p2p client"
 msgstr "amule - cliente p2p multiplataforma basado en eMule"
 
 #. type: SH
-#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
-#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
-#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SINOPSIS"
 
 #. type: Plain text
-#: amule.1.in:10 amulegui.1.in:10
+#: amule.1.in amulegui.1.in
 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.in:14 amuled.1.in:16
+#: amule.1.in amuled.1.in
 msgid "B<-w> I<E<lt>pathE<gt>>"
 msgstr "B<-w> I<E<lt>pathE<gt>>"
 
 #. type: Plain text
-#: amule.1.in:18 amuled.1.in:20
-msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
-msgstr "B<-t> I<E<lt>numE<gt>> I<eD2k-Link>"
+#: amule.1.in amuled.1.in
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
+msgstr "B<-t> I<E<lt>numE<gt>> I<enlace-eD2k>|I<fichero-de-colección>"
 
 #. type: SH
-#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
-#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
-#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPCIÓN"
 
 #. type: TP
-#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
-#: ../../src/utils/cas/docs/cas.1.in:30
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:29 amulegui.1.in:30
+#: amule.1.in amulegui.1.in
 #, 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.in:32 amulegui.1.in:33
+#: amule.1.in amulegui.1.in
 msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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:\tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Prints log messages to stdout."
-msgstr "Imprime mensajes de registro en la salida estándar"
+msgstr "Imprime mensajes de registro en la salida estándar."
 
 #. type: Plain text
-#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Resets config to default values."
 msgstr "Reiniciar configuración a valores por defecto."
 
 #. type: Plain text
-#: amule.1.in:42
+#: amule.1.in
 msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Activa o desactiva el arranque automático de aMule al iniciar sesión el usuario, y luego termina. Se seleccionará automáticamente el almacenamiento específico de cada SO: clave del registro en Windows, LaunchAgent en macOS, entrada en Linux XDG I<.desktop> autostart."
 
 #. type: TP
-#: amule.1.in:42 amuled.1.in:50
+#: amule.1.in amuled.1.in
 #, 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.in:45 amuled.1.in:53
+#: amule.1.in amuled.1.in
 msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
 msgstr "Especifica la ubicación del binario amuleweb en I<E<lt>pathE<gt>>."
 
 #. type: Plain text
-#: amule.1.in:50 amuled.1.in:58 amulegui.1.in:51
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
 msgstr "No captura las excepciones fatales y no bloquea la salida en los diálogos modales.  Útil para configuraciones sin interfaz / supervisadas (systemd, scripts watchdog) donde el cuadro de diálogo modal impide el reinicio automático."
 
 #. type: Plain text
-#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Does not disable stdin."
 msgstr "No deshabilitar entrada estándar."
 
 #. type: TP
-#: amule.1.in:53 amulegui.1.in:54
+#: amule.1.in amulegui.1.in
 #, 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.in:56 amuled.1.in:64 amulegui.1.in:57
+#: amule.1.in amuled.1.in amulegui.1.in
 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.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
-#: amuleweb.1.in:130 ed2k.1.in:40
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
 msgid "Displays the current version number."
 msgstr "Mostrar el número de la versión actual."
 
 #. type: Plain text
-#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
-#: amuleweb.1.in:127 ed2k.1.in:37
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
-#: ../../src/utils/cas/docs/cas.1.in:33
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Prints a short usage description."
 msgstr "Imprime una breve descripción de uso."
 
 #. type: TP
-#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
+#: amule.1.in amuled.1.in
 #, no-wrap
-msgid "B< eD2k-link >"
-msgstr "B< eD2k-Link >"
+msgid "B< eD2k-link | collection-file >"
+msgstr "B< enlace-eD2k | fichero-de-colección >"
 
 #. type: Plain text
-#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
-msgid "Adds an eD2k-link to the core."
-msgstr "Añadir un enlace eD2k al núcleo."
+#: amule.1.in amuled.1.in
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
+msgstr "Añade un enlace eD2k, o todos los enlaces en un archivo de colección de eMule, al núcleo."
 
 #. type: Plain text
-#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "The eD2k link to be added can be:"
 msgstr "El enlace eD2k para ser añadido puede ser:"
 
 #. type: Plain text
-#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
 msgstr "un enlace de archivo (ed2k://|archivo|...), será añadido a la cola de descarga;"
 
 #. type: Plain text
-#: amule.1.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a server link (ed2k://|server|...), it will be added to the server list;"
 msgstr "un enlace de servidor (ed2k://|servidor|...), será añadido a la cola de servidores;"
 
 #. type: Plain text
-#: amule.1.in:74 amuled.1.in:82 ed2k.1.in:52
+#: amule.1.in amuled.1.in ed2k.1.in
 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.in:76 amuled.1.in:84
+#: amule.1.in amuled.1.in
 msgid "a magnet link."
 msgstr "un enlace magnet."
 
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr "Alternativamente el argumento puede ser la ruta hacia un archivo .emulecollection, o hacia una URL del tipo file://URL, en cuyo caso cada enlace que contiene se añade a la cola de descargas.  Esto es lo que permite que un gestor de archivos abra una colección con aMule."
+
 #. type: SH
-#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "NOTES"
 msgstr "NOTAS"
 
 #. type: SS
-#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Paths"
 msgstr "Rutas"
 
 #. type: Plain text
-#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 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> no contiene una ruta de directorios (p.e. sólo un archivo normal), entones se usará el directorio de la configuración, I<~/.aMule>."
 
 #. type: SH
-#: amule.1.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
-#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "FILES"
 msgstr "ARCHIVOS"
 
 #. type: Plain text
-#: amule.1.in:84 amuled.1.in:87
+#: amule.1.in amuled.1.in
 msgid "~/.aMule/*"
 msgstr "~/.aMule/*"
 
 #. type: SH
-#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
-#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
-#: ../../src/utils/cas/docs/cas.1.in:43
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr "INFORMANDO ERRORES"
 
 #. type: Plain text
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member."
 msgstr "Por favor informe de fallos ya sea en nuestro foro (I<https://github.com/amule-org/amule/discussions>), o en nuestro bugtracker (I<https://github.com/amule-org/amule/issues>). 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.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 #. type: Plain text
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VÉASE TAMBIÉN"
 
 #. type: SH
-#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
-#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
-#: ../../src/utils/cas/docs/cas.1.in:50
-#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
-#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
-#: ../../src/utils/cas/docs/cas.1.in:51
-#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr "Esta página de manual fue escrita por Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "AMULECMD"
 msgstr "AMULECMD"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "aMuleCmd v@PACKAGE_VERSION@"
 msgstr "aMuleCmd v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "aMule utilities"
 msgstr "aMule utilidades"
 
 #. type: Plain text
-#: amulecmd.1.in:7
+#: amulecmd.1.in
 msgid "amulecmd - Console-based program to control aMule"
 msgstr "amulecmd - Programa basado en consola para controlar aMule"
 
 #. type: Plain text
-#: amulecmd.1.in:13 amuleweb.1.in:12
+#: amulecmd.1.in amuleweb.1.in
 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.in:17
+#: amulecmd.1.in
 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.in:20 amuleweb.1.in:31
+#: amulecmd.1.in amuleweb.1.in
 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.in:29
+#: amulecmd.1.in
 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.in:29 amuleweb.1.in:46
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
 msgstr "Host donde se está ejecutando aMule (por defecto: I<127.0.0.1>).  I<E<lt>hostE<gt>> debe ser o una dirección IP o un nombre DNS"
 
 #. type: TP
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 msgid "External Connections password."
 msgstr "Contraseña de conexiones externas."
 
 #. type: TP
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:43 amuleweb.1.in:60
+#: amulecmd.1.in amuleweb.1.in
 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.in:46 amuleweb.1.in:63
+#: amulecmd.1.in amuleweb.1.in
 msgid "Do not print any output to stdout."
 msgstr "No mostrar ninguna salida en stdout."
 
 #. type: Plain text
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 msgid "Be verbose - show also debug messages."
 msgstr "Modo detallado - muestra también los mensajes de depuración."
 
 #. type: TP
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:54 amuleweb.1.in:71
+#: amulecmd.1.in amuleweb.1.in
 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.in:57 amuleweb.1.in:74
+#: amulecmd.1.in amuleweb.1.in
 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.in:57
+#: amulecmd.1.in
 #, 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.in:60
+#: amulecmd.1.in
 msgid "Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and exit."
 msgstr "Ejecuta I<E<lt>commandE<gt>> como si se hubiera introducido en el prompt en amulecmd, y termina."
 
 #. type: TP
-#: amulecmd.1.in:60 amuleweb.1.in:117
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:63 amuleweb.1.in:120
+#: amulecmd.1.in amuleweb.1.in
 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: Plain text
-#: amulecmd.1.in:67 amuleweb.1.in:124
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr "No cifran el enlace de conexión externa.  El cifrado se negocia automáticamente siempre que el aMule remoto sea compatible con él, y está activado por defecto para todos los destinos, ya sean locales o remotos.  Desactivarlo deja todo lo posterior al inicio de sesión legible y modificable por cualquiera capaz de observar la conexión."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
 msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
 msgstr "Forzar la compresión ZLIB en el protocolo de Conexiones Externas aunque se esté conectando a una IP local/LAN. Esto es útil cuando la conexión al servidor se realiza a través de un túnel VPN que se resuelve a una IP de LAN, lo que por defecto desactivaría la compresión."
 
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.  Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output."
+msgstr "Separa los campos de los comandos de lista con espacios, como hacían las versiones anteriores, en lugar de tabulaciones.  Los nombres de cliente y de archivo pueden contener espacios, por lo que el separador de tabulación predeterminado es lo que permite a un script volver a dividir una fila en sus campos; use esta opción únicamente para scripts diseñados para la salida antigua."
+
 #. type: SH
-#: amulecmd.1.in:73
+#: amulecmd.1.in
 #, no-wrap
 msgid "COMMANDS"
 msgstr "COMANDOS"
 
 #. type: Plain text
-#: amulecmd.1.in:75
+#: amulecmd.1.in
 msgid "All commands are case insensitive."
 msgstr "Todos los comandos ignoran las mayúsculas."
 
 #. type: Plain text
-#: amulecmd.1.in:77
+#: amulecmd.1.in
 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.in:86
+#: amulecmd.1.in
 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.in:89
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:91
+#: amulecmd.1.in
 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 "Cancela la descarga especificada por I<E<lt>hashE<gt>> o I<E<lt>numberE<gt>>. Para obtener el valor use B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:93
+#: amulecmd.1.in
 msgid "Connect to the network."
 msgstr "Conectar a la red."
 
 #. type: Plain text
-#: amulecmd.1.in:95
+#: amulecmd.1.in
 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.in:99
+#: amulecmd.1.in
 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 el parámetro opcional, puede especificar a qué red conectarse. Al dar una dirección en formato IP:puerto (siendo IP una dirección IPv4 numérica o un nombre DNS resoluble) aMule se conectará sólo a ese servidor."
 
 #. type: Plain text
-#: amulecmd.1.in:102
+#: amulecmd.1.in
 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á conectado, o desconectar solo de la red especificada."
 
 #. type: Plain text
-#: amulecmd.1.in:104
+#: amulecmd.1.in
 msgid "Start downloading a file."
 msgstr "Comenzar a descargar un archivo."
 
 #. type: Plain text
-#: amulecmd.1.in:108
-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 "Debe proporcionarse el I<E<lt>numberE<gt>> de un fichero de la última búsqueda.  Ejemplo: `download 12' empezará a descargar el archivo con el número 12 de la búsqueda previa."
+#: amulecmd.1.in
+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 "Debe proporcionarse el I<E<lt>numberE<gt>> de un fichero de la última búsqueda.  Ejemplo: 'download 12' empezará a descargar el archivo con el número 12 de la búsqueda previa."
 
 #. type: Plain text
-#: amulecmd.1.in:110
+#: amulecmd.1.in
 msgid "Disconnect from amule/amuled and quit amulecmd."
 msgstr "Desconectar de amule/amuled y salir de amulecmd."
 
 #. type: Plain text
-#: amulecmd.1.in:112
+#: amulecmd.1.in
 msgid "Get and display a preference value."
-msgstr "Obtener y mostrar un valor de opciones."
+msgstr "Obtener y mostrar un valor de preferencias."
 
 #. type: Plain text
-#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>whatE<gt>>:"
 msgstr "Valores disponibles para I<E<lt>whatE<gt>>:"
 
 #. type: Plain text
-#: amulecmd.1.in:117
+#: amulecmd.1.in
 msgid "Get bandwidth limits."
-msgstr "Obtener limites de ancho de banda."
+msgstr "Obtener los límites de ancho de banda."
 
 #. type: Plain text
-#: amulecmd.1.in:119
+#: amulecmd.1.in
 msgid "Get IPFilter preferences."
 msgstr "Obtener opciones del filtro IP."
 
 #. type: Plain text
-#: amulecmd.1.in:124
+#: amulecmd.1.in
 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 "Muestra una breve descripción de uso. Si se llama sin parámetros, muestra una lista de comando disponibles.  Si se llama con I<E<lt>commandE<gt>>, mostrará una breve descripción de dicho comando."
 
 #. type: Plain text
-#: amulecmd.1.in:126
+#: amulecmd.1.in
 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 "Pausa la descarga especificada por I<E<lt>hashE<gt>> o I<E<lt>numberE<gt>>. Para obtener el valor use B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:128
+#: amulecmd.1.in
 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.in:130
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>priorityE<gt>>:"
 msgstr "Valores disponibles para I<E<lt>priorityE<gt>>:"
 
 #. type: Plain text
-#: amulecmd.1.in:133
+#: amulecmd.1.in
 msgid "Automatic priority."
 msgstr "Prioridad automática."
 
 #. type: Plain text
-#: amulecmd.1.in:135
+#: amulecmd.1.in
 msgid "High priority."
 msgstr "Prioridad alta."
 
 #. type: Plain text
-#: amulecmd.1.in:137
+#: amulecmd.1.in
 msgid "Low priority."
 msgstr "Prioridad baja."
 
 #. type: Plain text
-#: amulecmd.1.in:139
+#: amulecmd.1.in
 msgid "Normal priority."
 msgstr "Prioridad normal."
 
 #. type: Plain text
-#: amulecmd.1.in:142
-msgid "Shows the progress of an on-going search."
-msgstr "Muestra el progreso de la búsqueda en curso."
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr "Muestra el progreso de una búsqueda en curso. Opcionalmente, toma un I<E<lt>idE<gt>> de búsqueda (como obtenido de B<search>); sin id, muestra la última búsqueda iniciada."
 
 #. type: Plain text
-#: amulecmd.1.in:144
+#: amulecmd.1.in
 msgid "A synonym of the B<exit> command."
 msgstr "Un sinónimo del comando B<exit>."
 
 #. type: Plain text
-#: amulecmd.1.in:146
+#: amulecmd.1.in
 msgid "Reloads a given object."
 msgstr "Recargar un objeto dado."
 
 #. type: Plain text
-#: amulecmd.1.in:151
+#: amulecmd.1.in
 msgid "Reload shared files list."
-msgstr "Recargar lista de archivos compartidos."
+msgstr "Recargar la lista de archivos compartidos."
 
 #. type: Plain text
-#: amulecmd.1.in:153
+#: amulecmd.1.in
 msgid "Reload IP filter tables."
 msgstr "Recargar tablas de filtros IP."
 
 #. type: Plain text
-#: amulecmd.1.in:156
+#: amulecmd.1.in
 msgid "Reset the log."
 msgstr "Reiniciar el registro."
 
 #. type: Plain text
-#: amulecmd.1.in:158
-msgid "Shows you the results of the last search."
-msgstr "Muestra los resultados de la última búsqueda."
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr "Muestra los resultados de una búsqueda. Opcionalmente, toma un I<E<lt>idE<gt>> de búsqueda (como obtenido de B<search>); sin id, muestra la última búsqueda iniciada.  Se pueden mantener varias búsquedas a la vez en el núcleo y acceder a ellas por el id."
 
 #. type: Plain text
-#: amulecmd.1.in:160
+#: amulecmd.1.in
 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 "Reanuda la descarga especificada por I<E<lt>hashE<gt>> o I<E<lt>numberE<gt>>. Para obtener el valor use B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:164
-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 "Hace una búsqueda para la I<E<lt>keywordE<gt>> especificada. El tipo de búsqueda y una palabra a buscar son obligatorios.  Ejemplo: `search kad amule' realiza una búsqueda kad de la palabra `amule'."
+#: amulecmd.1.in
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
+msgstr "Hace una búsqueda para la I<E<lt>keywordE<gt>> especificada. El tipo de búsqueda y una palabra a buscar son obligatorios.  Ejemplo: 'search kad amule' realiza una búsqueda kad de la palabra 'amule'.  Muestra un id de búsqueda; páselo a B<results> o B<progress> para identificar esta búsqueda. Varias búsquedas se pueden ejecutar a la vez, cada una con su propio id."
 
 #. type: Plain text
-#: amulecmd.1.in:166
+#: amulecmd.1.in
 msgid "Available search types:"
 msgstr "Tipos de búsquedas disponibles:"
 
 #. type: Plain text
-#: amulecmd.1.in:169
+#: amulecmd.1.in
 msgid "Performs a global search."
 msgstr "Realiza una búsqueda global."
 
 #. type: Plain text
-#: amulecmd.1.in:171
+#: amulecmd.1.in
 msgid "Performs a search on the Kademlia network."
 msgstr "Realiza una búsqueda en la red Kademlia."
 
 #. type: Plain text
-#: amulecmd.1.in:173
+#: amulecmd.1.in
 msgid "Performs a local search."
 msgstr "Realiza una búsqueda local."
 
 #. type: Plain text
-#: amulecmd.1.in:177
+#: amulecmd.1.in
 msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
 msgstr "Pueden colocarse filtros opcionales antes, después o intercalados con la(s) palabra(s) clave de búsqueda:"
 
 #. type: Plain text
-#: amulecmd.1.in:180
+#: amulecmd.1.in
 msgid "Restrict results to the given file type."
 msgstr "Restringe los resultados al tipo de archivo indicado."
 
 #. type: Plain text
-#: amulecmd.1.in:182
+#: amulecmd.1.in
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
 msgstr "Restringe los resultados a una extensión de archivo específica (ej.\\ I<iso>, I<mp3>)."
 
 #. type: Plain text
-#: amulecmd.1.in:184
+#: amulecmd.1.in
 msgid "Minimum number of sources a result must report."
 msgstr "Número mínimo de fuentes que un resultado debe informar."
 
 #. type: Plain text
-#: amulecmd.1.in:187
+#: amulecmd.1.in
 msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
 msgstr "Tamaño mínimo de archivo a devolver. Los sufijos usan multiplicadores binarios (K = 1024, M = K\\(mu1024, G = M\\(mu1024); sin sufijo significa bytes."
 
 #. type: Plain text
-#: amulecmd.1.in:189
+#: amulecmd.1.in
 msgid "Largest file size to return. Same suffixes as B<--min-size>."
 msgstr "Tamaño máximo de archivo a devolver. Mismos sufijos que B<--min-size>."
 
 #. type: Plain text
-#: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
-msgstr "Ejemplo: `search global linux iso --type Iso --min-size 100M' devuelve resultados para \\(lqlinux iso\\(rq de tipo de archivo Iso de al menos 100 MiB."
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
+msgstr "Ejemplo: 'search global linux iso --type Iso --min-size 100M' devuelve resultados para 'linux iso' de tipo de archivo Iso de al menos 100 MiB."
 
 #. type: Plain text
-#: amulecmd.1.in:195
+#: amulecmd.1.in
 msgid "Sets a given preferences value."
 msgstr "Asigna un valor dado de opción."
 
 #. type: Plain text
-#: amulecmd.1.in:200
+#: amulecmd.1.in
 msgid "Set bandwidth limits."
-msgstr "Asignar limites de ancho de banda."
+msgstr "Establecer los límites de ancho de banda."
 
 #. type: Plain text
-#: amulecmd.1.in:202
+#: amulecmd.1.in
 msgid "Set IPFilter preferences."
 msgstr "Ajusta las opciones del FiltroIP."
 
 #. type: Plain text
-#: amulecmd.1.in:205
+#: amulecmd.1.in
 msgid "Shows upload/download queue, servers list or shared files list."
 msgstr "Muestra la cola de subida/descarga, la lista de servidores, o la lista de archivos compartidos."
 
 #. type: Plain text
-#: amulecmd.1.in:210
+#: amulecmd.1.in
 msgid "Show download queue."
-msgstr "Mostrar cola de descarga."
+msgstr "Mostrar la cola de descarga."
 
 #. type: Plain text
-#: amulecmd.1.in:212
+#: amulecmd.1.in
 msgid "Show log."
-msgstr "Mostrar registro."
+msgstr "Mostrar el registro."
 
 #. type: Plain text
-#: amulecmd.1.in:214
+#: amulecmd.1.in
 msgid "Show servers list."
-msgstr "Mostrar lista de servidores."
+msgstr "Mostrar la lista de servidores."
 
 #. type: Plain text
-#: amulecmd.1.in:216
+#: amulecmd.1.in
 msgid "Show shared files list."
-msgstr "Mostrar lista de archivos compartidos."
+msgstr "Mostrar la lista de archivos compartidos."
 
 #. type: Plain text
-#: amulecmd.1.in:218
+#: amulecmd.1.in
 msgid "Show upload queue."
-msgstr "Mostrar cola de subida."
+msgstr "Mostrar la cola de subida."
 
 #. type: Plain text
-#: amulecmd.1.in:222
+#: amulecmd.1.in
 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 "Apaga el núcleo remoto en ejecución (amule/amuled).  Esto también terminará el cliente de texto, ya que es inútil sin un núcleo remoto activo."
 
 #. type: Plain text
-#: amulecmd.1.in:224
+#: amulecmd.1.in
 msgid "Show statistics tree."
 msgstr "Mostrar árbol de estadísticas."
 
 #. type: Plain text
-#: amulecmd.1.in:228
-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 "Un I<E<lt>numberE<gt>> opcional en el rango 0-255 puede pasarse como parámetro de este comando, que indica cuántos valores de versiones de clientes debe mostrar el árbol. Pasar 0, u omitirlo significa `ilimitado'."
+#: amulecmd.1.in
+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 "Un I<E<lt>numberE<gt>> opcional en el rango 0-255 puede pasarse como parámetro de este comando, que indica cuántos valores de versiones de clientes debe mostrar el árbol. Pasar 0, u omitirlo significa 'ilimitado'."
 
 #. type: Plain text
-#: amulecmd.1.in:231
-msgid "Example: `statistics 5' will show only the top 5 versions for each client type."
-msgstr "Ejemplo: `statistics 5' mostrará sólo las primeras 5 versiones de cada tipo de cliente."
+#: amulecmd.1.in
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
+msgstr "Ejemplo: 'statistics 5' mostrará sólo las primeras 5 versiones de cada tipo de cliente."
 
 #. type: Plain text
-#: amulecmd.1.in:233
+#: amulecmd.1.in
 msgid "Show connection status, current up/download speeds, etc."
 msgstr "Muestra el estado de la conexión, la velocidad de subida/descarga actual, etc."
 
 #. type: SS
-#: amulecmd.1.in:238 amuleweb.1.in:141
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Languages"
 msgstr "Lenguajes"
 
 #. type: Plain text
-#: amulecmd.1.in:244 amuleweb.1.in:147
+#: amulecmd.1.in amuleweb.1.in
 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 "El parámetro I<E<lt>langE<gt>> para la opción B<-l> tiene esta forma: I<lang>B<_>I<LANG>B<.>I<encoding>B<@>I<modifier> donde I<lang> es el lenguaje primario, I<LANG> es un sublenguaje/territorio, I<encoding> es el conjunto de caracteres a usar y I<modifier> permite al usuario elegir una instancia específica de localización dentro de una única categoría."
 
 #. type: Plain text
-#: amulecmd.1.in:246 amuleweb.1.in:149
+#: amulecmd.1.in amuleweb.1.in
 msgid "For example, the following strings are valid:"
 msgstr "Por ejemplo, las siguientes cadenas son válidas:"
 
 #. type: Plain text
-#: amulecmd.1.in:260 amuleweb.1.in:163
+#: amulecmd.1.in amuleweb.1.in
 msgid "Though all the above strings are accepted as valid language definitions, I<encoding> and I<modifier> are yet unused."
 msgstr "Aunque todas las cadenas previas son aceptadas como definiciones de lenguaje válidas, I<encoding> y I<modifier> aún no se usan."
 
 #. type: Plain text
-#: amulecmd.1.in:263 amuleweb.1.in:166
+#: amulecmd.1.in amuleweb.1.in
 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 "Además del formato previo, también se pueden especificar el nombre completo del idioma en inglés, por lo que B<-l german> es válido y equivale a B<-l de_DE>."
 
 #. type: Plain text
-#: amulecmd.1.in:266 amuleweb.1.in:169
+#: amulecmd.1.in amuleweb.1.in
 msgid "When no locale is defined, either on command-line or in config file, system default language will be used."
 msgstr "Cuando no se define ninguna localización, ni por línea de comandos ni en fichero de configuración, se usará el lenguaje por defecto del sistema."
 
 #. type: Plain text
-#: amulecmd.1.in:268 amuleweb.1.in:177
+#: amulecmd.1.in amuleweb.1.in
 msgid "~/.aMule/remote.conf"
 msgstr "~/.aMule/remote.conf"
 
 #. type: SH
-#: amulecmd.1.in:268 amuleweb.1.in:181
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "EJEMPLO"
 
 #. type: Plain text
-#: amulecmd.1.in:270
+#: amulecmd.1.in
 msgid "Typically amulecmd will be first run as:"
 msgstr "Normalmente amulecmd se ejecutará primero como:"
 
 #. type: Plain text
-#: amulecmd.1.in:272
+#: amulecmd.1.in
 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.in:274 amuleweb.1.in:187
+#: amulecmd.1.in amuleweb.1.in
 msgid "or"
 msgstr "o"
 
 #. type: Plain text
-#: amulecmd.1.in:276
+#: amulecmd.1.in
 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.in:278 amuleweb.1.in:191
+#: amulecmd.1.in amuleweb.1.in
 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.in:282
+#: amulecmd.1.in
 msgid "Of course, you don't have to follow this example."
 msgstr "Por supuesto, no tiene por qué seguir este ejemplo."
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "AMULED"
 msgstr "AMULED"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon v@PACKAGE_VERSION@"
 msgstr "Demonio aMule v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon"
 msgstr "Demonio aMule"
 
 #. type: Plain text
-#: amuled.1.in:6
+#: amuled.1.in
 msgid "amuled - the all-platform eMule p2p client - daemonized version"
 msgstr "amuled - el cliente p2p eMule multi-plataforma - versión en segundo plano"
 
 #. type: Plain text
-#: amuled.1.in:9 ../../src/utils/cas/docs/cas.1.in:11
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
 msgid "B<-c> I<E<lt>pathE<gt>>"
 msgstr "B<-c> I<E<lt>pathE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:11
+#: amuled.1.in
 msgid "B<-p> I<E<lt>pathE<gt>>"
 msgstr "B<-p> I<E<lt>pathE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:33
+#: amuled.1.in
 msgid "Forks to background."
 msgstr "Enviar a segundo plano."
 
 #. type: TP
-#: amuled.1.in:33
+#: amuled.1.in
 #, 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.in:37
+#: amuled.1.in
 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 "Tras el fork, crear un archivo PID en I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> debe contener el nombre del fichero."
+msgstr "Tras el fork, crear un archivo PID en I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> debe contener el nombre del archivo."
 
 #. type: Plain text
-#: amuled.1.in:40
+#: amuled.1.in
 msgid "Configure EC (External Connections)."
 msgstr "Configurar EC (Conexiones Externas)."
 
 #. type: Plain text
-#: amuled.1.in:50
+#: amuled.1.in
 msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Activa o desactiva el arranque automático del servicio de aMule (amuled) al iniciar sesión el usuario, y luego termina. Se seleccionará automáticamente el almacenamiento específico de cada SO: clave del registro en Windows, LaunchAgent en macOS, entrada en Linux XDG I<.desktop> autostart."
 
 #. type: TP
-#: amuled.1.in:61
+#: amuled.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "AMULEGUI"
 msgstr "AMULEGUI"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI v@PACKAGE_VERSION@"
 msgstr "aMuleGUI v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
 #. type: Plain text
-#: amulegui.1.in:6
+#: amulegui.1.in
 msgid "amulegui - aMule control program with GUI"
 msgstr "amulegui - Programa para controlar aMule con Interfaz Gráfica"
 
 #. type: Plain text
-#: amulegui.1.in:17
+#: amulegui.1.in
 msgid "B<-t> I<E<lt>numE<gt>>"
 msgstr "B<-t> I<E<lt>numE<gt>>"
 
 #. type: Plain text
-#: amulegui.1.in:27
+#: amulegui.1.in
 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> es un programa cliente, y puede conectarse a amule o amuled usando EC. Permite gestionar remotamente la sesión amule(d). Proporciona casi la misma funcionalidad que amule, incluso cuando el núcleo funciona en un ordenador remoto."
 
 #. type: Plain text
-#: amulegui.1.in:42
+#: amulegui.1.in
 msgid "Skip connection dialog."
 msgstr "Saltar diálogo de conexión."
 
 #. type: Plain text
-#: amulegui.1.in:46
+#: amulegui.1.in
 msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Activa o desactiva el arranque automático de amulegui al iniciar sesión el usuario, y luego termina. Se seleccionará automáticamente el almacenamiento específico de cada SO: clave del registro en Windows, LaunchAgent en macOS, entrada en Linux XDG I<.desktop> autostart."
 
 #. type: Plain text
-#: amulegui.1.in:72
+#: amulegui.1.in
 msgid "This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm DOT orgE<gt>"
 msgstr "Esta página de manual fue escrita por Julien Delange para Debian E<lt>julien AT gunnm DOT orgE<gt>"
 
 #. type: Plain text
-#: amulegui.1.in:73
+#: amulegui.1.in
 msgid "This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr "Esta página de manual fue reescrita por Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "AMULEWEB"
 msgstr "AMULEWEB"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "aMule webserver v@PACKAGE_VERSION@"
 msgstr "Servidor web aMule v@PACKAGE_VERSION@"
 
 #. type: Plain text
-#: amuleweb.1.in:6
+#: amuleweb.1.in
 msgid "amuleweb - aMule web server"
 msgstr "amuleweb - servidor web de aMule"
 
 #. type: Plain text
-#: amuleweb.1.in:15
+#: amuleweb.1.in
 msgid "B<-l> I<E<lt>langE<gt>>"
 msgstr "B<-l> I<E<lt>langE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:18
+#: amuleweb.1.in
 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.in:20
+#: amuleweb.1.in
 msgid "B<-U> I<E<lt>portE<gt>>"
 msgstr "B<-U> I<E<lt>portE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:24
+#: amuleweb.1.in
 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.in:40
+#: amuleweb.1.in
 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.in:46
+#: amuleweb.1.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr "B<DEPRECATED:> amuleweb está obsoleto y podría ser eliminado en aMule 3.2 o posterior.  No se está eliminando todavía; considere migrar a amuleapi, el API REST/SSE."
+
+#. type: Plain text
+#: amuleweb.1.in
 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> gestiona una sesión de amule a través del navegador web.  Puede iniciar amuleweb junto a B<amule>(1), o por separado en cualquier momento posterior.  Las opciones se pueden especificar en la línea de comando o en un fichero de configuración.  Las opciones de línea de comandos tienen prioridad sobre las del fichero de configuración."
 
 #. type: TP
-#: amuleweb.1.in:74
+#: amuleweb.1.in
 #, 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.in:77
+#: amuleweb.1.in
 msgid "Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section for details."
 msgstr "Carga la plantilla llamada I<E<lt>nameE<gt>>. Consulte la sección B<SKIN SUPPORT> para más detalles."
 
 #. type: TP
-#: amuleweb.1.in:77
+#: amuleweb.1.in
 #, 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.in:80
+#: amuleweb.1.in
 msgid "Webserver's HTTP port. This is the port you must point your browser to (default: I<4711>)."
 msgstr "Puerto HTTP del servidor web. Éste es el puerto al que debe apuntar su navegador (por defecto: I<4711>)."
 
 #. type: Plain text
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 msgid "Enable UPnP."
 msgstr "Habilitar UPnP."
 
 #. type: TP
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 #, 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.in:87
+#: amuleweb.1.in
 msgid "UPnP port."
 msgstr "Puerto UPnP."
 
 #. type: Plain text
-#: amuleweb.1.in:90
+#: amuleweb.1.in
 msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
 msgstr "Activar compresión gzip para ahorrar tráfico HTTP."
 
 #. type: Plain text
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 msgid "Disables using gzip compression (this is the default)."
 msgstr "Deshabilitar la compresión gzip (esto es por defecto)."
 
 #. type: TP
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 #, 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.in:96
+#: amuleweb.1.in
 msgid "Full access password for webserver."
 msgstr "Contraseña de acceso completo al servidor web."
 
 #. type: TP
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 #, 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.in:99
+#: amuleweb.1.in
 msgid "Guest password for webserver."
 msgstr "Contraseña de invitado al servidor web."
 
 #. type: Plain text
-#: amuleweb.1.in:102
+#: amuleweb.1.in
 msgid "Allows guest access."
 msgstr "Permitir acceso invitado."
 
 #. type: Plain text
-#: amuleweb.1.in:105
+#: amuleweb.1.in
 msgid "Denies guest access (default)."
 msgstr "Deniega el acceso invitado (por defecto)."
 
 #. type: Plain text
-#: amuleweb.1.in:111
+#: amuleweb.1.in
 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 "Cargar/Guardar del aMule remoto la configuración del servidor web.  Esto hace que amuleweb ignore la configuración de la línea de comandos o del fichero de config, y que la cargue directamente de aMule.  Al guardarla, no se escribirá nada en el fichero de configuración, sino en aMule.  (Por supuesto, esto sólo funciona para los parámetros que pueden configurarse en las Preferencias de aMule-E<gt>Controles Remotos.)"
 
 #. type: Plain text
-#: amuleweb.1.in:114
+#: amuleweb.1.in
 msgid "Disable PHP interpreter (deprecated)"
-msgstr "Deshabilitar interprete PHP (obsoleto)"
+msgstr "Deshabilitar el intérprete PHP (obsoleto)"
 
 #. type: Plain text
-#: amuleweb.1.in:117
+#: amuleweb.1.in
 msgid "Recompiles PHP pages on each request."
 msgstr "Recompilar páginas PHP en cada solicitud."
 
 #. type: TP
-#: amuleweb.1.in:130
+#: amuleweb.1.in
 #, 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.in:136
+#: amuleweb.1.in
 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 "Ruta al fichero de configuración de aMule.  B<¡NO USAR DIRECTAMENTE!> aMule usa esta opción al arrancar amuleweb durante el arranque de aMule.  Esta opción hace que cualquier otra configuración de la línea de comandos o del fichero de configuración sea ignorada, y que las preferencias se lean del fichero especificado. También implica las opciones B<-q -L>."
 
 #. type: SH
-#: amuleweb.1.in:169
+#: amuleweb.1.in
 #, no-wrap
 msgid "SKIN SUPPORT"
 msgstr "SOPORTE TEMAS"
 
 #. type: Plain text
-#: amuleweb.1.in:173
+#: amuleweb.1.in
 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> es capaz de usar diferentes skins para mostrar información.  Estos skins se llaman plantillas, y puede cargarse una plantilla específica usando la opción B<-t> de la línea de comandos.  Las plantillas se buscan en dos ubicaciones: primero en I<~/.aMule/webserver/> y luego en I</usr/share/amule/webserver/> si se instaló con la opción --prefix=/usr."
 
 #. type: Plain text
-#: amuleweb.1.in:175
+#: amuleweb.1.in
 msgid "Each template must be in a subdirectory of the template name, and this directory must contain all files the template needs."
 msgstr "Cada plantilla debe estar en un subdirectorio con el nombre de la plantilla, y este directorio debe contener todo los ficheros que la plantilla necesita."
 
 #. type: Plain text
-#: amuleweb.1.in:179
+#: amuleweb.1.in
 msgid "~/.aMule/webserver/"
 msgstr "~/.aMule/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:181
+#: amuleweb.1.in
 msgid "I<$(pkgdatadir)>/webserver/"
 msgstr "I<$(pkgdatadir)>/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:183
+#: amuleweb.1.in
 msgid "Typically amuleweb will be first run as:"
 msgstr "Normalmente amuleweb se ejecutará primero como:"
 
 #. type: Plain text
-#: amuleweb.1.in:185
+#: amuleweb.1.in
 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.in:189
+#: amuleweb.1.in
 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.in:195
+#: amuleweb.1.in
 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 línea, y también puede omitirlo."
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "ED2K"
 msgstr "ED2K"
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "aMule eD2k link parser v1.5.1"
 msgstr "Analizador aMule de enlaces eD2k v1.5.1"
 
 #. type: Plain text
-#: ed2k.1.in:6
+#: ed2k.1.in
 msgid "ed2k - aMule eD2k link parser"
 msgstr "ed2k - analizador aMule de enlaces eD2k"
 
 #. type: Plain text
-#: ed2k.1.in:10
+#: ed2k.1.in
 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.in:13
+#: ed2k.1.in
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr "I<E<lt>eD2k-LinkE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:21
+#: ed2k.1.in
 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 "Envía el I<E<lt>enlace eD2kE<gt>> a aMule, para ello, lo escribe en el fichero ~/.aMule/ED2KLinks, que aMule lee una vez por segundo."
 
 #. type: TP
-#: ed2k.1.in:24
+#: ed2k.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 
 #. type: Plain text
-#: ed2k.1.in:28
+#: ed2k.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
 msgstr "Establece la categoría I<E<lt>numE<gt>> para los enlaces eD2k introducidos.  Al contrario que B<--config-dir>, el parseador lee el valor como el siguiente argumento y no acepta  B<--category>=I<E<lt>numE<gt>> como sintaxis."
 
 #. type: Plain text
-#: ed2k.1.in:31
+#: ed2k.1.in
 msgid "Loads all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "Carga todos los enlaces encontrados en la emulecollection especificada como I<E<lt>ed2k-linkE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:34
+#: ed2k.1.in
 msgid "Lists all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "Lista todos los enlaces encontrados en la emulecollection especificada como I<E<lt>ed2k-linkE<gt>>"
 
+#. type: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< eD2k-Link >"
+
 #. type: Plain text
-#: ed2k.1.in:54
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr "Añadir un enlace eD2k al núcleo."
+
+#. type: Plain text
+#: ed2k.1.in
 msgid "a magnet link;"
 msgstr "Un enlace magnet;"
 
 #. type: Plain text
-#: ed2k.1.in:56
+#: ed2k.1.in
 msgid "an emulecollection file."
 msgstr "Un archivo emulecollection."
 
 #. type: Plain text
-#: ed2k.1.in:61
+#: ed2k.1.in
 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<El orden de los parámetros es importante.> Se pueden proporcionar varios enlaces, y cada enlace puede tener sus propios parámetros.  Por ejemplo B<ed2k E<lt>enlace1E<gt> -t2 E<lt>enlace2E<gt>> descargará I<E<lt>enlace1E<gt>> en la categoría estándar y I<E<lt>enlace2E<gt>> en la categoría 2."
 
 #. type: Plain text
-#: ed2k.1.in:63
+#: ed2k.1.in
 msgid "~/.aMule/ED2KLinks"
 msgstr "~/.aMule/ED2KLinks"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "ALC"
 msgstr "ALC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "aLinkCreator"
 msgstr "aLinkCreator"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:9
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 msgid "B<alc> is a graphical utility to create an eD2k link to any file on your computer."
 msgstr "B<alc> es una herramienta gráfica para crear enlaces eD2k de los archivos de su ordenador."
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This app doesn't take any arguments."
 msgstr "Esta aplicación no recibe ningún argumento."
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "ALCC"
 msgstr "ALCC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "aMule eD2k links calculator"
 msgstr "Calculador de enlaces eD2k de aMule"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "I<E<lt>inputfiles_listE<gt>>"
 msgstr "I<E<lt>inputfiles_listE<gt>>"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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 "Calcula los enlaces eD2k de todos los archivos especificados en I<E<lt>inputfiles_listE<gt>> (Puede haber uno o varios archivos)."
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Compute and add part hashes to the computed eD2k links."
 msgstr "Calcula y añade los hashes de partes a los enlaces eD2k calculados."
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "CAS"
 msgstr "CAS"
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "cas v0.8"
 msgstr "cas v0.8"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "cas - c aMule statistics"
 msgstr "cas - c estadísticas de aMule"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:18
+#: ../../src/utils/cas/docs/cas.1.in
 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> es un programa para mostrar el contenido de la firma online de aMule por consola (en un formato legible para personas). Para funcionar, debe activarse la opción \"Online Signature\" en las preferencias de aMule."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:23
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
 msgstr "Escribe la imagen de la firma online.  La forma larga B<--picture> acepta un I<=E<lt>PATHE<gt>> opcional para especificar la ubicación de salida; las formas cortas B<-o> / B<-P> no lo aceptan (B<-P> requiere un argumento I<E<lt>PATHE<gt>> inmediatamente a continuación, y B<-o> es un switch sin argumentos).  Requiere soporte GD en la compilación (I<__GD__>); de lo contrario esta opción se ignora silenciosamente."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
 msgstr "Página HTML con estadísticas e imagen.  La forma larga B<--picture> acepta un I<=E<lt>PATHE<gt>> opcional para especificar la ubicación de salida; las formas cortas B<-p> / B<-H> no lo aceptan (B<-H> requiere un argumento I<E<lt>PATHE<gt>> inmediatamente a continuación, y B<-p> es un switch sin argumentos)."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:35
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Without any options, it prints online signature data to stdout."
 msgstr "Si no se especifica ninguna opción, imprime los datos de la firma online en stdout."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:37
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
 msgstr "B<cas> fue escrita por Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:39
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "~/.aMule/casrc"
 msgstr "~/.aMule/casrc"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:41
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
 msgstr "aMule-online-sign.png (o .jpg, cuando se usa B<-o> / B<--picture> y GD está disponible)"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
 msgstr "aMule-online-sign.html (cuando se usa B<-p> / B<--html>)"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "WXCAS"
 msgstr "WXCAS"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "wxCas"
 msgstr "wxCas"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "wxcas - wx c aMule statistics"
 msgstr "wxcas - wx c estadísticas de aMule"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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> es un programa para mostrar el contenido de la firma online en una ventana wx Window de su Escritorio.  Para funcionar, debe activarse la opción \"Online Signature\" en las preferencias de aMule."
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:14
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish E<lt>thepolish@vipmail.ruE<gt>"
 msgstr "Basado en B<cas>(1) de Pedro de Oliveira.  B<wxcas> fue escrito por ThePolish E<lt>thepolish@vipmail.ruE<gt>"
 
+#~ msgid "Shows the progress of an on-going search."
+#~ msgstr "Muestra el progreso de la búsqueda en curso."
+
+#~ msgid "Shows you the results of the last search."
+#~ msgstr "Muestra los resultados de la última búsqueda."
+
 #~ 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 "Escribe la imagen de la firma online.  Opcionalmente, se puede añadir I<=E<lt>PATHE<gt>> a este parámetro para especificar dónde debería escribirse."

amule-3.0.1.tar.gz/docs/man/po/manpages-fr.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-fr.po Changed

@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule\n"
-"POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-18 22:17+0000\n"
+"POT-Creation-Date: 2026-08-24 19:02+0200\n"
+"PO-Revision-Date: 2026-09-20 21:08+0000\n"
 "Last-Translator: Dylan Aïssi <bob.dybian@gmail.com>\n"
 "Language-Team: Français\n"
 "Language: fr\n"
@@ -21,1346 +21,1374 @@
 "X-Generator: Poedit 3.9\n"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "AMULE"
 msgstr "AMULE"
 
 #. type: TH
-#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
-#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "@MAN_DATE@"
 msgstr "@MAN_DATE@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule v@PACKAGE_VERSION@"
 msgstr "aMule v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule"
 msgstr "aMule"
 
 #. type: SH
-#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
-#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
-#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "NAME"
 msgstr "NOM"
 
 #. type: Plain text
-#: amule.1.in:6
+#: amule.1.in
 msgid "amule - the all-platform eMule p2p client"
 msgstr "amule - le client P2P eMule multiplateforme"
 
 #. type: SH
-#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
-#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
-#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SYNOPSIS"
 
 #. type: Plain text
-#: amule.1.in:10 amulegui.1.in:10
+#: amule.1.in amulegui.1.in
 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.in:14 amuled.1.in:16
+#: amule.1.in amuled.1.in
 msgid "B<-w> I<E<lt>pathE<gt>>"
 msgstr "B<-w> I<E<lt>cheminE<gt>>"
 
 #. type: Plain text
-#: amule.1.in:18 amuled.1.in:20
-msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
-msgstr "B<-t> I<E<lt>numE<gt>> I<lien eD2k>"
+#: amule.1.in amuled.1.in
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
+msgstr "B<-t> I<E<lt>numE<gt>> I<lien-eD2k>|I<fichier-de-collection>"
 
 #. type: SH
-#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
-#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
-#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
 #. type: TP
-#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
-#: ../../src/utils/cas/docs/cas.1.in:30
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:29 amulegui.1.in:30
+#: amule.1.in amulegui.1.in
 #, 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.in:32 amulegui.1.in:33
+#: amule.1.in amulegui.1.in
 msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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 "Fixe la géométrie de l'application. I<E<lt>géomE<gt>> utilise le même format que les applications X11 standards :\tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Prints log messages to stdout."
 msgstr "Affiche les messages du journal sur stdout."
 
 #. type: Plain text
-#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Resets config to default values."
 msgstr "Réinitialise à la configuration par défaut."
 
 #. type: Plain text
-#: amule.1.in:42
+#: amule.1.in
 msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Activer ou désactiver le lancement d'aMule à l'ouverture d'une session de l'utilisateur, puis quitter.  Le dépôt spécifique au système d'exploitation est sélectionné automatiquement : clef d'exécution (Run) du registre pour Windows, LaunchAgent pour macOS et élément de lancement automatique XDG I<.desktop> pour GNU/Linux."
 
 #. type: TP
-#: amule.1.in:42 amuled.1.in:50
+#: amule.1.in amuled.1.in
 #, 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.in:45 amuled.1.in:53
+#: amule.1.in amuled.1.in
 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.in:50 amuled.1.in:58 amulegui.1.in:51
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
 msgstr "Ne pas intercepter les exceptions fatales et ne pas bloquer la sortie sur les assertions.  Utile pour les configurations sans interface / supervisées (systemd, scripts watchdog) où la boîte de dialogue d'assertion, autrement modale, empêche le redémarrage automatique."
 
 #. type: Plain text
-#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Does not disable stdin."
 msgstr "Ne désactive pas stdin."
 
 #. type: TP
-#: amule.1.in:53 amulegui.1.in:54
+#: amule.1.in amulegui.1.in
 #, 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.in:56 amuled.1.in:64 amulegui.1.in:57
+#: amule.1.in amuled.1.in amulegui.1.in
 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.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
-#: amuleweb.1.in:130 ed2k.1.in:40
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
 msgid "Displays the current version number."
 msgstr "Affiche le numéro de la version actuelle."
 
 #. type: Plain text
-#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
-#: amuleweb.1.in:127 ed2k.1.in:37
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
-#: ../../src/utils/cas/docs/cas.1.in:33
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Prints a short usage description."
 msgstr "Affiche une courte description d'utilisation."
 
 #. type: TP
-#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
+#: amule.1.in amuled.1.in
 #, no-wrap
-msgid "B< eD2k-link >"
-msgstr "B< lien eD2k >"
+msgid "B< eD2k-link | collection-file >"
+msgstr "B< lien-eD2k | fichier-de-collection >"
 
 #. type: Plain text
-#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
-msgid "Adds an eD2k-link to the core."
-msgstr "Ajoute un lien eD2k au noyau."
+#: amule.1.in amuled.1.in
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
+msgstr "Ajoute au noyau un lien eD2k ou bien chaque lien d'un fichier de collection eMule."
 
 #. type: Plain text
-#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "The eD2k link to be added can be:"
 msgstr "Le lien eD2k à ajouter peut être :"
 
 #. type: Plain text
-#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 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 des téléchargements ;"
 
 #. type: Plain text
-#: amule.1.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 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.in:74 amuled.1.in:82 ed2k.1.in:52
+#: amule.1.in amuled.1.in ed2k.1.in
 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.in:76 amuled.1.in:84
+#: amule.1.in amuled.1.in
 msgid "a magnet link."
 msgstr "un lien magnet."
 
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr "De manière alternative, l'argument peut être le chemin vers un fichier .emulecollection ou un URL file:// qui en désigne un, auquel cas chaque lien qu'elle contient est ajouté à la file des téléchargements.  C'est ce qui permet à un gestionnaire de fichiers d'ouvrir une collection avec aMule."
+
 #. type: SH
-#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "NOTES"
 msgstr "NOTES"
 
 #. type: SS
-#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Paths"
 msgstr "Chemins"
 
 #. type: Plain text
-#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 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 (c'est-à-dire 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.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
-#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
 
 #. type: Plain text
-#: amule.1.in:84 amuled.1.in:87
+#: amule.1.in amuled.1.in
 msgid "~/.aMule/*"
 msgstr "~/.aMule/*"
 
 #. type: SH
-#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
-#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
-#: ../../src/utils/cas/docs/cas.1.in:43
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr "RAPPORTER DES BOGUES"
 
 #. type: Plain text
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  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<https://github.com/amule-org/amule/discussions>), ou sur notre traqueur de bogues (I<https://github.com/amule-org/amule/issues>).  Veuillez ne pas rapporter les bogues par e-mail, sur notre liste de diffusion ou directement aux membres de l'équipe."
 
 #. type: SH
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 #. type: Plain text
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "aMule and all of its related utilities are distributed under the GNU General Public License."
 msgstr "aMule et tous ses outils sont distribués sous la Licence publique générale GNU."
 
 #. type: SH
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR ÉGALEMENT"
 
 #. type: SH
-#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
-#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
-#: ../../src/utils/cas/docs/cas.1.in:50
-#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
-#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
-#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
-#: ../../src/utils/cas/docs/cas.1.in:51
-#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr "Cette page de manuel a été écrite par Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "AMULECMD"
 msgstr "AMULECMD"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "aMuleCmd v@PACKAGE_VERSION@"
 msgstr "aMuleCmd v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "aMule utilities"
 msgstr "Outils d'aMule"
 
 #. type: Plain text
-#: amulecmd.1.in:7
+#: amulecmd.1.in
 msgid "amulecmd - Console-based program to control aMule"
 msgstr "amulecmd - Programme de contrôle d'aMule en mode texte"
 
 #. type: Plain text
-#: amulecmd.1.in:13 amuleweb.1.in:12
+#: amulecmd.1.in amuleweb.1.in
 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.in:17
+#: amulecmd.1.in
 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.in:20 amuleweb.1.in:31
+#: amulecmd.1.in amuleweb.1.in
 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.in:29
+#: amulecmd.1.in
 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.in:29 amuleweb.1.in:46
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
 msgstr "Hôte où aMule fonctionne (par défaut : I<127.0.0.1>).  I<E<lt>hôteE<gt>> peut être une adresse IP ou un nom DNS."
 
 #. type: TP
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 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 (par défaut: I<4712>)"
 
 #. type: TP
-#: amulecmd.1.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 msgid "External Connections password."
 msgstr "Mot de passe des connexions externes."
 
 #. type: TP
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:43 amuleweb.1.in:60
+#: amulecmd.1.in amuleweb.1.in
 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.in:46 amuleweb.1.in:63
+#: amulecmd.1.in amuleweb.1.in
 msgid "Do not print any output to stdout."
 msgstr "Ne pas afficher de sortie sur stdout."
 
 #. type: Plain text
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 msgid "Be verbose - show also debug messages."
 msgstr "Mode bavard - afficher aussi les messages de débogage."
 
 #. type: TP
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:54 amuleweb.1.in:71
+#: amulecmd.1.in amuleweb.1.in
 msgid "Sets program locale (language).  See the B<NOTES> section for the description of the I<E<lt>langE<gt>> parameter."
 msgstr "Définit les paramètres régionaux (langue). Voir la section B<NOTES> pour la description du paramètre I<E<lt>langE<gt>>."
 
 #. type: Plain text
-#: amulecmd.1.in:57 amuleweb.1.in:74
+#: amulecmd.1.in amuleweb.1.in
 msgid "Write command line options to config file and exit"
 msgstr "Écrire les options de la ligne de commande sur le fichier de configuration et quitter"
 
 #. type: TP
-#: amulecmd.1.in:57
+#: amulecmd.1.in
 #, 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.in:60
+#: amulecmd.1.in
 msgid "Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and exit."
 msgstr "Exécuter 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.in:60 amuleweb.1.in:117
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:63 amuleweb.1.in:120
+#: amulecmd.1.in amuleweb.1.in
 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 configuration d'aMule valide, et quitter ensuite."
 
 #. type: Plain text
-#: amulecmd.1.in:67 amuleweb.1.in:124
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr "Ne pas chiffrer le lien de Connexion externe.  Le chiffrement est négocié automatiquement chaque fois que le programme aMule distant le prend en charge, et est activé par défaut pour chaque destination, locale ou distante.  Désactiver cette option laisse tout après l'ouverture de session lisible et modifiable pour tout un chacun qui serait capable d'observer la connexion."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
 msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
 msgstr "Forcer la compression ZLIB sur le lien Connexion Externe quelle que soit l'adresse IP de destination.  Utile lorsque le serveur est accessible via un tunnel VPN qui se résout en une adresse IP du réseau local et que l'heuristique ignorerait autrement la compression."
 
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.  Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output."
+msgstr "Séparez les champs des commandes de liste avec des espaces, comme les versions précédentes le faisaient, au lieu d'utiliser des tabulations.  Les noms des clients et les noms des fichiers peuvent contenir des espaces, donc le séparateur de tabulation par défaut est ce qui permet à un script de diviser une ligne en ses champs ; utilisez-le uniquement pour les scripts écrits pour l'ancienne sortie."
+
 #. type: SH
-#: amulecmd.1.in:73
+#: amulecmd.1.in
 #, no-wrap
 msgid "COMMANDS"
 msgstr "COMMANDES"
 
 #. type: Plain text
-#: amulecmd.1.in:75
+#: amulecmd.1.in
 msgid "All commands are case insensitive."
 msgstr "Toutes les commandes sont insensibles à la casse."
 
 #. type: Plain text
-#: amulecmd.1.in:77
+#: amulecmd.1.in
 msgid "Adds an eD2k-link or a magnet-link to the core."
 msgstr "Ajoute un lien eD2k ou magnet au noyau."
 
 #. type: Plain text
-#: amulecmd.1.in:86
+#: amulecmd.1.in
 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.in:89
+#: amulecmd.1.in
 msgid "The magnet link must contain the eD2k hash and file length."
 msgstr "Le lien magnet doit contenir le hachage eD2k et la longueur du fichier."
 
 #. type: Plain text
-#: amulecmd.1.in:91
+#: amulecmd.1.in
 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 utiliser B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:93
+#: amulecmd.1.in
 msgid "Connect to the network."
 msgstr "Se connecter au réseau."
 
 #. type: Plain text
-#: amulecmd.1.in:95
+#: amulecmd.1.in
 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.in:99
+#: amulecmd.1.in
 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.in:102
+#: amulecmd.1.in
 msgid "Disconnect from all networks you are connected to, or just disconnect from the specified network."
 msgstr "Déconnecter de tous les réseaux dont vous êtes connecté, ou juste déconnecter d'un réseau spécifié."
 
 #. type: Plain text
-#: amulecmd.1.in:104
+#: amulecmd.1.in
 msgid "Start downloading a file."
 msgstr "Commencer à télécharger un fichier."
 
 #. type: Plain text
-#: amulecmd.1.in:108
-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."
+#: amulecmd.1.in
+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.in:110
+#: amulecmd.1.in
 msgid "Disconnect from amule/amuled and quit amulecmd."
 msgstr "Déconnecter d'amule/amuled et quitter amulecmd."
 
 #. type: Plain text
-#: amulecmd.1.in:112
+#: amulecmd.1.in
 msgid "Get and display a preference value."
 msgstr "Obtenir et afficher une valeur de préférence."
 
 #. type: Plain text
-#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>whatE<gt>>:"
 msgstr "Valeurs disponibles pour I<E<lt>quoiE<gt>>:"
 
 #. type: Plain text
-#: amulecmd.1.in:117
+#: amulecmd.1.in
 msgid "Get bandwidth limits."
 msgstr "Obtenir les limites de bande passante."
 
 #. type: Plain text
-#: amulecmd.1.in:119
+#: amulecmd.1.in
 msgid "Get IPFilter preferences."
 msgstr "Obtenir les préférences de filtrage IP."
 
 #. type: Plain text
-#: amulecmd.1.in:124
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:126
+#: amulecmd.1.in
 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 utiliser B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:128
+#: amulecmd.1.in
 msgid "Set priority of a download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>."
 msgstr "Définir 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.in:130
+#: amulecmd.1.in
 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.in:133
+#: amulecmd.1.in
 msgid "Automatic priority."
 msgstr "Priorité automatique."
 
 #. type: Plain text
-#: amulecmd.1.in:135
+#: amulecmd.1.in
 msgid "High priority."
 msgstr "Priorité haute."
 
 #. type: Plain text
-#: amulecmd.1.in:137
+#: amulecmd.1.in
 msgid "Low priority."
 msgstr "Priorité basse."
 
 #. type: Plain text
-#: amulecmd.1.in:139
+#: amulecmd.1.in
 msgid "Normal priority."
 msgstr "Priorité normale."
 
 #. type: Plain text
-#: amulecmd.1.in:142
-msgid "Shows the progress of an on-going search."
-msgstr "Affiche la progression d'une recherche en cours."
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr "Affiche la progression d'un recherche en cours. Prend éventuellement un I<E<lt>idE<gt>> de recherche (tel qu'affiché par B<search>) ; sans identifiant, affiche la recherche démarrée le plus récemment."
 
 #. type: Plain text
-#: amulecmd.1.in:144
+#: amulecmd.1.in
 msgid "A synonym of the B<exit> command."
 msgstr "Un synonyme de la commande B<exit>."
 
 #. type: Plain text
-#: amulecmd.1.in:146
+#: amulecmd.1.in
 msgid "Reloads a given object."
 msgstr "Recharge un objet donné."
 
 #. type: Plain text
-#: amulecmd.1.in:151
+#: amulecmd.1.in
 msgid "Reload shared files list."
 msgstr "Recharger la liste des fichiers partagés."
 
 #. type: Plain text
-#: amulecmd.1.in:153
+#: amulecmd.1.in
 msgid "Reload IP filter tables."
 msgstr "Recharger les tables de filtre d'IP."
 
 #. type: Plain text
-#: amulecmd.1.in:156
+#: amulecmd.1.in
 msgid "Reset the log."
 msgstr "Réinitialiser le journal."
 
 #. type: Plain text
-#: amulecmd.1.in:158
-msgid "Shows you the results of the last search."
-msgstr "Vous montre les résultats de la dernière recherche."
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr "Vous affiche les résultats d'une recherche. Prend éventuellement un  I<E<lt>idE<gt>> de recherche (tel qu'affiché par B<search>) ; sans identifiant, affiche la recherche démarrée le plus récemment.  Plusieurs recherches peuvent être conservées sur le démon en même temps et gérées par identifiant."
 
 #. type: Plain text
-#: amulecmd.1.in:160
+#: amulecmd.1.in
 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 "Reprend 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 utiliser B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:164
-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-clefE<gt>> donné. Un type de recherche et d'un mot-clef de recherche sont obligatoires pour le faire. Exemple : `search kad amule' effectue une recherche kad pour `amule'."
+#: amulecmd.1.in
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
+msgstr "Effectue une recherche sur I<E<lt>mot-clefE<gt>> donné. Un type de recherche et un mot-clef de recherche sont obligatoires pour le faire.  Exemple : 'search kad amule' effectue une recherche kad pour 'amule'.   Affiche un identifiant de recherche ; transmettez-le à B<results> ou bien à B<progress> pour cibler cette recherche. Plusieurs recherches peuvent être exécutées simultanément, chacune ayant son identifiant."
 
 #. type: Plain text
-#: amulecmd.1.in:166
+#: amulecmd.1.in
 msgid "Available search types:"
 msgstr "Types de recherche disponibles :"
 
 #. type: Plain text
-#: amulecmd.1.in:169
+#: amulecmd.1.in
 msgid "Performs a global search."
 msgstr "Effectue une recherche globale."
 
 #. type: Plain text
-#: amulecmd.1.in:171
+#: amulecmd.1.in
 msgid "Performs a search on the Kademlia network."
 msgstr "Effectue une recherche sur le réseau Kademlia."
 
 #. type: Plain text
-#: amulecmd.1.in:173
+#: amulecmd.1.in
 msgid "Performs a local search."
 msgstr "Effectue une recherche locale."
 
 #. type: Plain text
-#: amulecmd.1.in:177
+#: amulecmd.1.in
 msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
 msgstr "Des filtres facultatifs peuvent être placés avant, après ou intercalés avec le(s) mot(s)-clé(s) de recherche :"
 
 #. type: Plain text
-#: amulecmd.1.in:180
+#: amulecmd.1.in
 msgid "Restrict results to the given file type."
 msgstr "Restreindre les résultats au type de fichier indiqué."
 
 #. type: Plain text
-#: amulecmd.1.in:182
+#: amulecmd.1.in
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
 msgstr "Restreindre les résultats à une extension de fichier spécifique (par ex.\\ I<iso>, I<mp3>)."
 
 #. type: Plain text
-#: amulecmd.1.in:184
+#: amulecmd.1.in
 msgid "Minimum number of sources a result must report."
 msgstr "Nombre minimum de sources qu'un résultat doit indiquer."
 
 #. type: Plain text
-#: amulecmd.1.in:187
+#: amulecmd.1.in
 msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
 msgstr "Taille minimale du fichier à renvoyer. Les suffixes utilisent des multiplicateurs binaires (K = 1024, M = K\\(mu1024, G = M\\(mu1024) ; l'absence de suffixe signifie octets."
 
 #. type: Plain text
-#: amulecmd.1.in:189
+#: amulecmd.1.in
 msgid "Largest file size to return. Same suffixes as B<--min-size>."
 msgstr "Taille maximale du fichier à renvoyer. Mêmes suffixes que B<--min-size>."
 
 #. type: Plain text
-#: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
-msgstr "Exemple : `search global linux iso --type Iso --min-size 100M' renvoie des résultats pour \\(lqlinux iso\\(rq de type de fichier Iso d'au moins 100 MiB."
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
+msgstr "Exemple : 'search global linux iso --type Iso --min-size 100M' renvoie des résultats pour 'linux iso' de type de fichier Iso d'au moins 100 MiB."
 
 #. type: Plain text
-#: amulecmd.1.in:195
+#: amulecmd.1.in
 msgid "Sets a given preferences value."
 msgstr "Définit une valeur compte tenu des préférences."
 
 #. type: Plain text
-#: amulecmd.1.in:200
+#: amulecmd.1.in
 msgid "Set bandwidth limits."
 msgstr "Définir les limites de bande passante."
 
 #. type: Plain text
-#: amulecmd.1.in:202
+#: amulecmd.1.in
 msgid "Set IPFilter preferences."
 msgstr "Définir les préférences de filtrage d'IP."
 
 #. type: Plain text
-#: amulecmd.1.in:205
+#: amulecmd.1.in
 msgid "Shows upload/download queue, servers list or shared files list."
 msgstr "Montre la file d'attente des envois/réceptions, la liste des serveurs ou la liste des fichiers partagés."
 
 #. type: Plain text
-#: amulecmd.1.in:210
+#: amulecmd.1.in
 msgid "Show download queue."
 msgstr "Montrer la file d'attente des réceptions."
 
 #. type: Plain text
-#: amulecmd.1.in:212
+#: amulecmd.1.in
 msgid "Show log."
 msgstr "Afficher le journal."
 
 #. type: Plain text
-#: amulecmd.1.in:214
+#: amulecmd.1.in
 msgid "Show servers list."
 msgstr "Afficher la liste des serveurs."
 
 #. type: Plain text
-#: amulecmd.1.in:216
+#: amulecmd.1.in
 msgid "Show shared files list."
 msgstr "Afficher la liste des fichiers partagés."
 
 #. type: Plain text
-#: amulecmd.1.in:218
+#: amulecmd.1.in
 msgid "Show upload queue."
 msgstr "Montrer la file d'attente des envois."
 
 #. type: Plain text
-#: amulecmd.1.in:222
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:224
+#: amulecmd.1.in
 msgid "Show statistics tree."
 msgstr "Afficher l'arbre des statistiques."
 
 #. type: Plain text
-#: amulecmd.1.in:228
-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 "Le I<E<lt>chiffreE<gt>> optionnel dans l'intervalle 0-255 peut être passé comme argument à cette commande, ce qui indique le nombre d'entrées de la sous-arborescence de la version du client qui doit être affiché. Indiquer 0 ou bien l'omettre signifie 'illimité'."
+#: amulecmd.1.in
+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 "Le I<E<lt>chiffreE<gt>> optionnel dans l'intervalle 0-255 peut être transmis comme argument à cette commande, ce qui indique le nombre d'entrées de la sous-arborescence de la version du client qui doit être affiché. Indiquer 0 ou bien l'omettre signifie « illimité »."
 
 #. type: Plain text
-#: amulecmd.1.in:231
-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."
+#: amulecmd.1.in
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
+msgstr "Exemple : « statistics 5 » n'affichera que les 5 versions les plus utilisées pour chaque type de client."
 
 #. type: Plain text
-#: amulecmd.1.in:233
+#: amulecmd.1.in
 msgid "Show connection status, current up/download speeds, etc."
 msgstr "Afficher l'état de la connexion, et la vitesse actuelle d'émission/réception, etc."
 
 #. type: SS
-#: amulecmd.1.in:238 amuleweb.1.in:141
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Languages"
 msgstr "Langues"
 
 #. type: Plain text
-#: amulecmd.1.in:244 amuleweb.1.in:147
+#: amulecmd.1.in amuleweb.1.in
 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 le dialecte, I<encoding> est le jeu de caractères 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.in:246 amuleweb.1.in:149
+#: amulecmd.1.in amuleweb.1.in
 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.in:260 amuleweb.1.in:163
+#: amulecmd.1.in amuleweb.1.in
 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 soient acceptées comme des définitions de langue valide,  I<encoding> et I<modifier> ne sont pas encore utilisés."
+msgstr "Bien que toutes les chaînes ci-dessus soient acceptées comme des définitions de langue valide, I<encoding> et I<modifier> ne sont pas encore utilisés."
 
 #. type: Plain text
-#: amulecmd.1.in:263 amuleweb.1.in:166
+#: amulecmd.1.in amuleweb.1.in
 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 entiers de langue en anglais - ainsi B<-l german> est également valide et équivaut à B<-l de_DE>."
 
 #. type: Plain text
-#: amulecmd.1.in:266 amuleweb.1.in:169
+#: amulecmd.1.in amuleweb.1.in
 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éfinis, soit sur la ligne de commande ou sur le fichier de configuration, la langue utilisée par défaut sera celle du système d'exploitation."
+msgstr "Si aucun paramètre régional n'est défini, ni sur la ligne de commande ni dans le fichier de configuration, la langue par défaut du système sera utilisée."
 
 #. type: Plain text
-#: amulecmd.1.in:268 amuleweb.1.in:177
+#: amulecmd.1.in amuleweb.1.in
 msgid "~/.aMule/remote.conf"
 msgstr "~/.aMule/remote.conf"
 
 #. type: SH
-#: amulecmd.1.in:268 amuleweb.1.in:181
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "EXEMPLE"
 
 #. type: Plain text
-#: amulecmd.1.in:270
+#: amulecmd.1.in
 msgid "Typically amulecmd will be first run as:"
 msgstr "Typiquement amulecmd sera lancée la première fois ainsi :"
 
 #. type: Plain text
-#: amulecmd.1.in:272
+#: amulecmd.1.in
 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.in:274 amuleweb.1.in:187
+#: amulecmd.1.in amuleweb.1.in
 msgid "or"
 msgstr "ou"
 
 #. type: Plain text
-#: amulecmd.1.in:276
+#: amulecmd.1.in
 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.in:278 amuleweb.1.in:191
+#: amulecmd.1.in amuleweb.1.in
 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.in:282
+#: amulecmd.1.in
 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.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "AMULED"
 msgstr "AMULED"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon v@PACKAGE_VERSION@"
 msgstr "aMule Daemon v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon"
 msgstr "aMule Daemon"
 
 #. type: Plain text
-#: amuled.1.in:6
+#: amuled.1.in
 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.in:9 ../../src/utils/cas/docs/cas.1.in:11
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
 msgid "B<-c> I<E<lt>pathE<gt>>"
 msgstr "B<-c> I<E<lt>cheminE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:11
+#: amuled.1.in
 msgid "B<-p> I<E<lt>pathE<gt>>"
 msgstr "B<-p> I<E<lt>cheminE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:33
+#: amuled.1.in
 msgid "Forks to background."
 msgstr "Passe en arrière plan."
 
 #. type: TP
-#: amuled.1.in:33
+#: amuled.1.in
 #, 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.in:37
+#: amuled.1.in
 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.in:40
+#: amuled.1.in
 msgid "Configure EC (External Connections)."
 msgstr "Configurer les EC (Connexions Externes)."
 
 #. type: Plain text
-#: amuled.1.in:50
+#: amuled.1.in
 msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Activer ou désactiver le lancement d'amuled à l'ouverture d'une session de l'utilisateur, puis quitter.  Le dépôt spécifique au système d'exploitation est sélectionné automatiquement : clef d'exécution (Run) du registre pour Windows, LaunchAgent pour macOS et élément de lancement automatique XDG I<.desktop> pour GNU/Linux."
 
 #. type: TP
-#: amuled.1.in:61
+#: amuled.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "AMULEGUI"
 msgstr "AMULEGUI"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI v@PACKAGE_VERSION@"
 msgstr "aMuleGUI v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
 #. type: Plain text
-#: amulegui.1.in:6
+#: amulegui.1.in
 msgid "amulegui - aMule control program with GUI"
 msgstr "amulegui - programme de contrôle d'aMule avec Interface Graphique"
 
 #. type: Plain text
-#: amulegui.1.in:17
+#: amulegui.1.in
 msgid "B<-t> I<E<lt>numE<gt>>"
 msgstr "B<-t> I<E<lt>numE<gt>>"
 
 #. type: Plain text
-#: amulegui.1.in:27
+#: amulegui.1.in
 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 qu'amule, même si le noyau fonctionne sur un autre ordinateur."
 
 #. type: Plain text
-#: amulegui.1.in:42
+#: amulegui.1.in
 msgid "Skip connection dialog."
 msgstr "Sauter la boîte de dialogue de connexion."
 
 #. type: Plain text
-#: amulegui.1.in:46
+#: amulegui.1.in
 msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Activer ou désactiver le lancement d'amulegui à l'ouverture d'une session de l'utilisateur, puis quitter.  Le dépôt spécifique au système d'exploitation est sélectionné automatiquement : clef d'exécution (Run) du registre pour Windows, LaunchAgent pour macOS et élément de lancement automatique XDG I<.desktop> pour GNU/Linux."
 
 #. type: Plain text
-#: amulegui.1.in:72
+#: amulegui.1.in
 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ée par Julien Delange pour Debian E<lt>julien AT gunnm DOT orgE<gt>"
 
 #. type: Plain text
-#: amulegui.1.in:73
+#: amulegui.1.in
 msgid "This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr "Cette page de manuel a été réécrite par Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "AMULEWEB"
 msgstr "AMULEWEB"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "aMule webserver v@PACKAGE_VERSION@"
 msgstr "aMule webserver v@PACKAGE_VERSION@"
 
 #. type: Plain text
-#: amuleweb.1.in:6
+#: amuleweb.1.in
 msgid "amuleweb - aMule web server"
 msgstr "amuleweb - serveur web d'aMule"
 
 #. type: Plain text
-#: amuleweb.1.in:15
+#: amuleweb.1.in
 msgid "B<-l> I<E<lt>langE<gt>>"
 msgstr "B<-l> I<E<lt>langE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:18
+#: amuleweb.1.in
 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.in:20
+#: amuleweb.1.in
 msgid "B<-U> I<E<lt>portE<gt>>"
 msgstr "B<-U> I<E<lt>portE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:24
+#: amuleweb.1.in
 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.in:40
+#: amuleweb.1.in
 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.in:46
+#: amuleweb.1.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr "B<OBSOLÈTE :> amuleweb est obsolète est peut être enlevé dans aMule 3.2 ou une version ultérieure.  Il n'est pas enlevé pour l'instant ; envisagez de migrer vers amuleapi, l'API REST/SSE."
+
+#. type: Plain text
+#: amuleweb.1.in
 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.in:74
+#: amuleweb.1.in
 #, 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.in:77
+#: amuleweb.1.in
 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.in:77
+#: amuleweb.1.in
 #, 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.in:80
+#: amuleweb.1.in
 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 vers lequel votre navigateur doit pointer (par défaut : I<4711>)."
 
 #. type: Plain text
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 msgid "Enable UPnP."
 msgstr "Activer UPnP."
 
 #. type: TP
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 #, 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.in:87
+#: amuleweb.1.in
 msgid "UPnP port."
 msgstr "Port UPnP."
 
 #. type: Plain text
-#: amuleweb.1.in:90
+#: amuleweb.1.in
 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.in:93
+#: amuleweb.1.in
 msgid "Disables using gzip compression (this is the default)."
 msgstr "Désactive la compression gzip (c'est le réglage par défaut)."
 
 #. type: TP
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 #, 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.in:96
+#: amuleweb.1.in
 msgid "Full access password for webserver."
 msgstr "Mot de passe d'accès total pour le serveur web."
 
 #. type: TP
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 #, 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.in:99
+#: amuleweb.1.in
 msgid "Guest password for webserver."
 msgstr "Mot de passe invité pour le serveur web."
 
 #. type: Plain text
-#: amuleweb.1.in:102
+#: amuleweb.1.in
 msgid "Allows guest access."
 msgstr "Autoriser l'accès invité."
 
 #. type: Plain text
-#: amuleweb.1.in:105
+#: amuleweb.1.in
 msgid "Denies guest access (default)."
 msgstr "Interdit l'accès invité (par défaut)."
 
 #. type: Plain text
-#: amuleweb.1.in:111
+#: amuleweb.1.in
 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érence ne sera écrite sur le fichier de configuration, mais sur aMule.  (Bien sûr, cela ne fonctionne que pour les paramètres qui peuvent être définis dans les préférences de -E<gt>Contrôle à distance d'aMule.)"
 
 #. type: Plain text
-#: amuleweb.1.in:114
+#: amuleweb.1.in
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Désactiver l'interpréteur PHP (obsolète)"
 
 #. type: Plain text
-#: amuleweb.1.in:117
+#: amuleweb.1.in
 msgid "Recompiles PHP pages on each request."
 msgstr "Recompile les pages PHP à chaque requête."
 
 #. type: TP
-#: amuleweb.1.in:130
+#: amuleweb.1.in
 #, 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.in:136
+#: amuleweb.1.in
 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 options de ligne de commande et les paramètres de fichier de configuration, et lit les préférences depuis le fichier de configuration précisé, et implique également les options B<-q -L>."
 
 #. type: SH
-#: amuleweb.1.in:169
+#: amuleweb.1.in
 #, no-wrap
 msgid "SKIN SUPPORT"
 msgstr "PRISE EN CHARGE DES THÈMES"
 
 #. type: Plain text
-#: amuleweb.1.in:173
+#: amuleweb.1.in
 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 l'option en ligne de commande B<-t>.  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.in:175
+#: amuleweb.1.in
 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 besoin."
 
 #. type: Plain text
-#: amuleweb.1.in:179
+#: amuleweb.1.in
 msgid "~/.aMule/webserver/"
 msgstr "~/.aMule/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:181
+#: amuleweb.1.in
 msgid "I<$(pkgdatadir)>/webserver/"
 msgstr "I<$(pkgdatadir)>/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:183
+#: amuleweb.1.in
 msgid "Typically amuleweb will be first run as:"
 msgstr "Typiquement amuleweb sera lancée la première fois ainsi :"
 
 #. type: Plain text
-#: amuleweb.1.in:185
+#: amuleweb.1.in
 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.in:189
+#: amuleweb.1.in
 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.in:195
+#: amuleweb.1.in
 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.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "ED2K"
 msgstr "ED2K"
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "aMule eD2k link parser v1.5.1"
 msgstr "aMule eD2k link parser v1.5.1"
 
 #. type: Plain text
-#: ed2k.1.in:6
+#: ed2k.1.in
 msgid "ed2k - aMule eD2k link parser"
 msgstr "ed2k - analyseur de liens eD2k pour aMule"
 
 #. type: Plain text
-#: ed2k.1.in:10
+#: ed2k.1.in
 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.in:13
+#: ed2k.1.in
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr "I<E<lt>lien eD2kE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:21
+#: ed2k.1.in
 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 sur le fichier ~/.aMule/ED2KLinks, qui sera vérifié par aMule chaque seconde pour les liens."
 
 #. type: TP
-#: ed2k.1.in:24
+#: ed2k.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 
 #. type: Plain text
-#: ed2k.1.in:28
+#: ed2k.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
 msgstr "Définir la catégorie pour les liens eD2k transmis à I<E<lt>numE<gt>>.  Contrairement à B<--config-dir>, l'analyseur lit la valeur en tant que prochain argument et n'accepte pas la syntaxe B<--category>=I<E<lt>numE<gt>>."
 
 #. type: Plain text
-#: ed2k.1.in:31
+#: ed2k.1.in
 msgid "Loads all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "Charge tous les liens trouvés dans l'emulecollection transmise en tant que I<E<lt>lien-eD2kE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:34
+#: ed2k.1.in
 msgid "Lists all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "Liste tous les liens trouvés dans l'emulecollection transmise en tant que I<E<lt>lien-eD2kE<gt>>"
 
+#. type: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< lien eD2k >"
+
 #. type: Plain text
-#: ed2k.1.in:54
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr "Ajoute un lien eD2k au noyau."
+
+#. type: Plain text
+#: ed2k.1.in
 msgid "a magnet link;"
 msgstr "un lien magnet ;"
 
 #. type: Plain text
-#: ed2k.1.in:56
+#: ed2k.1.in
 msgid "an emulecollection file."
 msgstr "un fichier de collection emule."
 
 #. type: Plain text
-#: ed2k.1.in:61
+#: ed2k.1.in
 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.in:63
+#: ed2k.1.in
 msgid "~/.aMule/ED2KLinks"
 msgstr "~/.aMule/ED2KLinks"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "ALC"
 msgstr "ALC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "aLinkCreator"
 msgstr "aLinkCreator"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:9
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:11
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This app doesn't take any arguments."
 msgstr "Cette application ne prend pas d'arguments."
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "ALCC"
 msgstr "ALCC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "aMule eD2k links calculator"
 msgstr "aMule eD2k links calculator"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "I<E<lt>inputfiles_listE<gt>>"
 msgstr "I<E<lt>liste de fichiers d'entréeE<gt>>"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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éeE<gt>> (Il peut y un seul fichier ou plusieurs)."
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:26
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Be verbose - show also calculation steps."
 msgstr "Mode bavard - afficher aussi les étapes de calculs."
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "CAS"
 msgstr "CAS"
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "cas v0.8"
 msgstr "cas v0.8"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "cas - c aMule statistics"
 msgstr "cas - c aMule statistics"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:18
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:23
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
 msgstr "Écrit l'image de la signature en ligne.  La forme longue B<--picture> accepte un argument facultatif I<=E<lt>CHEMINE<gt>> pour spécifier l'emplacement de sortie ; la forme courte B<-o> / B<-P> ne nécessite pas (B<-P> un argument I<E<lt>CHEMINE<gt>> qui suivrait immédiatement et B<-o> est un commutateur sans argument.  Nécessite que le support de GD soit compilée dans (I<__GD__>) ; cette option est silencieusement ignorée sinon."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
 msgstr "Page HTML avec les statistiques et l'image.  La forme longue B<--html> accepte un argument facultatif I<=E<lt>CHEMINE<gt>> afin de spécifier l'emplacement de sortie ; la forme courte B<-p> / B<-H> ne nécessite pas (B<-H> un argument I<E<lt>PATHE<gt>> qui suivrait immédiatement et B<-o> est un commutateur sans argument."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:35
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:37
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:39
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "~/.aMule/casrc"
 msgstr "~/.aMule/casrc"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:41
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
 msgstr "aMule-online-sign.png (ou bien .jpg, lorsque B<-o> / B<--picture> est utilisé et que GD est disponible)"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
 msgstr "aMule-online-sign.html (lorsque B<-p> / B<--html> est utilisé)"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "WXCAS"
 msgstr "WXCAS"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "wxCas"
 msgstr "wxCas"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "wxcas - wx c aMule statistics"
 msgstr "wxcas - wx c aMule statistics"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:14
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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>"
 
+#~ msgid "Shows the progress of an on-going search."
+#~ msgstr "Affiche la progression d'une recherche en cours."
+
+#~ msgid "Shows you the results of the last search."
+#~ msgstr "Vous montre les résultats de la dernière recherche."
+
 #~ 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."

amule-3.0.1.tar.gz/docs/man/po/manpages-hu.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-hu.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po 4a\n"
-"POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-18 22:22+0000\n"
+"POT-Creation-Date: 2026-08-24 19:02+0200\n"
+"PO-Revision-Date: 2026-09-20 21:08+0000\n"
 "Last-Translator: Dévai Tamás <gonosztopi@amule.org>\n"
 "Language-Team: none\n"
 "Language: hu\n"
@@ -17,1357 +17,1392 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "AMULE"
 msgstr "AMULE"
 
 #. type: TH
-#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
-#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "@MAN_DATE@"
 msgstr "@MAN_DATE@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule v@PACKAGE_VERSION@"
 msgstr "aMule v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule"
 msgstr "aMule"
 
 #. type: SH
-#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
-#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
-#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "NAME"
 msgstr "NÉV"
 
 #. type: Plain text
-#: amule.1.in:6
+#: amule.1.in
 msgid "amule - the all-platform eMule p2p client"
 msgstr "amule - a \"minden-platform\" eMule p2p kliens"
 
 #. type: SH
-#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
-#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
-#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "ÁTTEKINTÉS"
 
 #. type: Plain text
-#: amule.1.in:10 amulegui.1.in:10
+#: amule.1.in amulegui.1.in
 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.in:14 amuled.1.in:16
+#: amule.1.in amuled.1.in
 msgid "B<-w> I<E<lt>pathE<gt>>"
 msgstr "B<-w> I<E<lt>fájlE<gt>>"
 
 #. type: Plain text
-#: amule.1.in:18 amuled.1.in:20
-msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
+#: amule.1.in amuled.1.in
+#, fuzzy
+#| msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
 msgstr "B<-t> I<E<lt>számE<gt>> I<eD2k-hivatkozás>"
 
 #. type: SH
-#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
-#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
-#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "LEÍRÁS"
 
 #. type: TP
-#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
-#: ../../src/utils/cas/docs/cas.1.in:30
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:29 amulegui.1.in:30
+#: amule.1.in amulegui.1.in
 #, 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.in:32 amulegui.1.in:33
+#: amule.1.in amulegui.1.in
 msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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:\tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Prints log messages to stdout."
 msgstr "A napló bejegyzéseket a szabvány kimenetre írja."
 
 #. type: Plain text
-#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Resets config to default values."
 msgstr "Beállítások visszaállítása az alapértelmezett értékekre."
 
 #. type: Plain text
-#: amule.1.in:42
+#: amule.1.in
 msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: TP
-#: amule.1.in:42 amuled.1.in:50
+#: amule.1.in amuled.1.in
 #, 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.in:45 amuled.1.in:53
+#: amule.1.in amuled.1.in
 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.in:50 amuled.1.in:58 amulegui.1.in:51
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Does not disable stdin."
 msgstr "Nem zárja le a szabvány bemenetet."
 
 #. type: TP
-#: amule.1.in:53 amulegui.1.in:54
+#: amule.1.in amulegui.1.in
 #, 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.in:56 amuled.1.in:64 amulegui.1.in:57
+#: amule.1.in amuled.1.in amulegui.1.in
 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.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
-#: amuleweb.1.in:130 ed2k.1.in:40
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
 msgid "Displays the current version number."
 msgstr "Megjeleníti a verziószámot."
 
 #. type: Plain text
-#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
-#: amuleweb.1.in:127 ed2k.1.in:37
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
-#: ../../src/utils/cas/docs/cas.1.in:33
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Prints a short usage description."
 msgstr "Egy rövid használati leírást jelenít meg."
 
 #. type: TP
-#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
-#, no-wrap
-msgid "B< eD2k-link >"
+#: amule.1.in amuled.1.in
+#, fuzzy, no-wrap
+#| msgid "B< eD2k-link >"
+msgid "B< eD2k-link | collection-file >"
 msgstr "B< eD2k-hivatkozás >"
 
 #. type: Plain text
-#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
-msgid "Adds an eD2k-link to the core."
-msgstr "eD2k hivatkozás letöltése."
+#: amule.1.in amuled.1.in
+#, fuzzy
+#| msgid "Adds an eD2k-link or a magnet-link to the core."
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
+msgstr "Egy eD2k vagy magnet hivatkozást ad a letöltéshez."
 
 #. type: Plain text
-#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "The eD2k link to be added can be:"
 msgstr "Az eD2k hivatkozás a következő lehet:"
 
 #. type: Plain text
-#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 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.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 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.in:74 amuled.1.in:82 ed2k.1.in:52
+#: amule.1.in amuled.1.in ed2k.1.in
 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.in:76 amuled.1.in:84
+#: amule.1.in amuled.1.in
 msgid "a magnet link."
 msgstr "egy magnet hivatkozás."
 
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr ""
+
 #. type: SH
-#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "NOTES"
 msgstr "MEGJEGYZÉSEK"
 
 #. type: SS
-#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Paths"
 msgstr "Elérési utak"
 
 #. type: Plain text
-#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 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.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
-#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "FILES"
 msgstr "FÁJLOK"
 
 #. type: Plain text
-#: amule.1.in:84 amuled.1.in:87
+#: amule.1.in amuled.1.in
 msgid "~/.aMule/*"
 msgstr "~/.aMule/*"
 
 #. type: SH
-#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
-#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
-#: ../../src/utils/cas/docs/cas.1.in:43
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr "HIBÁK JELENTÉSE"
 
 #. type: Plain text
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  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<https://github.com/amule-org/amule/discussions>), vagy a hibakövetőben (I<https://github.com/amule-org/amule/issues>) 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.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 #. type: Plain text
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "LÁSD MÉG"
 
 #. type: SH
-#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
-#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
-#: ../../src/utils/cas/docs/cas.1.in:50
-#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "AUTHOR"
 msgstr "SZERZŐ"
 
 #. type: Plain text
-#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
-#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
-#: ../../src/utils/cas/docs/cas.1.in:51
-#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "AMULECMD"
 msgstr "AMULECMD"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "aMuleCmd v@PACKAGE_VERSION@"
 msgstr "aMuleCmd v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "aMule utilities"
 msgstr "aMule segédprogramok"
 
 #. type: Plain text
-#: amulecmd.1.in:7
+#: amulecmd.1.in
 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.in:13 amuleweb.1.in:12
+#: amulecmd.1.in amuleweb.1.in
 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.in:17
+#: amulecmd.1.in
 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.in:20 amuleweb.1.in:31
+#: amulecmd.1.in amuleweb.1.in
 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.in:29
+#: amulecmd.1.in
 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.in:29 amuleweb.1.in:46
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 msgid "Host where aMule is running (default: I<127.0.0.1>).  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<127.0.0.1>). A I<E<lt>gépE<gt>> lehet egy IP cím vagy egy DNS név."
 
 #. type: TP
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 msgid "External Connections password."
 msgstr "A távoli elérés jelszava."
 
 #. type: TP
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:43 amuleweb.1.in:60
+#: amulecmd.1.in amuleweb.1.in
 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.in:46 amuleweb.1.in:63
+#: amulecmd.1.in amuleweb.1.in
 msgid "Do not print any output to stdout."
 msgstr "Ne írjon semmit a szabvány kimenetre."
 
 #. type: Plain text
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 msgid "Be verbose - show also debug messages."
 msgstr "Bőbeszédű mód - a hibakeresési üzenetek megjelenítése."
 
 #. type: TP
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:54 amuleweb.1.in:71
+#: amulecmd.1.in amuleweb.1.in
 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.in:57 amuleweb.1.in:74
+#: amulecmd.1.in amuleweb.1.in
 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.in:57
+#: amulecmd.1.in
 #, 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.in:60
+#: amulecmd.1.in
 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.in:60 amuleweb.1.in:117
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:63 amuleweb.1.in:120
+#: amulecmd.1.in amuleweb.1.in
 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: Plain text
-#: amulecmd.1.in:67 amuleweb.1.in:124
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
 msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
 msgstr ""
 
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.  Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output."
+msgstr ""
+
 #. type: SH
-#: amulecmd.1.in:73
+#: amulecmd.1.in
 #, no-wrap
 msgid "COMMANDS"
 msgstr "PARANCSOK"
 
 #. type: Plain text
-#: amulecmd.1.in:75
+#: amulecmd.1.in
 msgid "All commands are case insensitive."
 msgstr "Minden parancs érzéketlen a kis/nagy betűkre."
 
 #. type: Plain text
-#: amulecmd.1.in:77
+#: amulecmd.1.in
 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.in:86
+#: amulecmd.1.in
 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.in:89
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:91
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:93
+#: amulecmd.1.in
 msgid "Connect to the network."
 msgstr "Kapcsolódik a hálózathoz."
 
 #. type: Plain text
-#: amulecmd.1.in:95
+#: amulecmd.1.in
 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.in:99
+#: amulecmd.1.in
 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.in:102
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:104
+#: amulecmd.1.in
 msgid "Start downloading a file."
 msgstr "Letölt egy fájlt."
 
 #. type: Plain text
-#: amulecmd.1.in:108
-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."
+#: amulecmd.1.in
+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' 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.in:110
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:112
+#: amulecmd.1.in
 msgid "Get and display a preference value."
 msgstr "Megmutat egy beállítás értéket."
 
 #. type: Plain text
-#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+#: amulecmd.1.in
 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.in:117
+#: amulecmd.1.in
 msgid "Get bandwidth limits."
 msgstr "Sávszélesség határok."
 
 #. type: Plain text
-#: amulecmd.1.in:119
+#: amulecmd.1.in
 msgid "Get IPFilter preferences."
 msgstr "IP-szűrő beállítások."
 
 #. type: Plain text
-#: amulecmd.1.in:124
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:126
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:128
+#: amulecmd.1.in
 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.in:130
+#: amulecmd.1.in
 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.in:133
+#: amulecmd.1.in
 msgid "Automatic priority."
 msgstr "Automatikus prioritás."
 
 #. type: Plain text
-#: amulecmd.1.in:135
+#: amulecmd.1.in
 msgid "High priority."
 msgstr "Magas prioritás."
 
 #. type: Plain text
-#: amulecmd.1.in:137
+#: amulecmd.1.in
 msgid "Low priority."
 msgstr "Alacsony prioritás."
 
 #. type: Plain text
-#: amulecmd.1.in:139
+#: amulecmd.1.in
 msgid "Normal priority."
 msgstr "Normál prioritás."
 
 #. type: Plain text
-#: amulecmd.1.in:142
-msgid "Shows the progress of an on-going search."
-msgstr "Egy folymatban lévő keresés állapotát jeleníti meg."
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:144
+#: amulecmd.1.in
 #, fuzzy
 #| msgid "A synonim of the B<exit> command."
 msgid "A synonym of the B<exit> command."
 msgstr "Az B<exit> parancs szinonímája."
 
 #. type: Plain text
-#: amulecmd.1.in:146
+#: amulecmd.1.in
 msgid "Reloads a given object."
 msgstr "A megadott objektum újratöltése."
 
 #. type: Plain text
-#: amulecmd.1.in:151
+#: amulecmd.1.in
 msgid "Reload shared files list."
 msgstr "A megosztott fájlok listájt tölti újra."
 
 #. type: Plain text
-#: amulecmd.1.in:153
+#: amulecmd.1.in
 msgid "Reload IP filter tables."
 msgstr "Az IP szűrő újratöltése."
 
 #. type: Plain text
-#: amulecmd.1.in:156
+#: amulecmd.1.in
 msgid "Reset the log."
 msgstr "Napló újrakezdése."
 
 #. type: Plain text
-#: amulecmd.1.in:158
-msgid "Shows you the results of the last search."
-msgstr "Az utolsó keresés eredményeinek megjelenítése."
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:160
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:164
-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."
+#: amulecmd.1.in
+#, fuzzy
+#| 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'."
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
+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' parancs egy Kademlia keresést indít az \\(Bqamule' kulcsszóra."
 
 #. type: Plain text
-#: amulecmd.1.in:166
+#: amulecmd.1.in
 msgid "Available search types:"
 msgstr "Elérhető keresés típusok:"
 
 #. type: Plain text
-#: amulecmd.1.in:169
+#: amulecmd.1.in
 msgid "Performs a global search."
 msgstr "Globális keresést hajt végre."
 
 #. type: Plain text
-#: amulecmd.1.in:171
+#: amulecmd.1.in
 msgid "Performs a search on the Kademlia network."
 msgstr "A Kademlia hálózaton keres."
 
 #. type: Plain text
-#: amulecmd.1.in:173
+#: amulecmd.1.in
 msgid "Performs a local search."
 msgstr "Lokális keresés."
 
 #. type: Plain text
-#: amulecmd.1.in:177
+#: amulecmd.1.in
 msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:180
+#: amulecmd.1.in
 msgid "Restrict results to the given file type."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:182
+#: amulecmd.1.in
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:184
+#: amulecmd.1.in
 msgid "Minimum number of sources a result must report."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:187
+#: amulecmd.1.in
 msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:189
+#: amulecmd.1.in
 msgid "Largest file size to return. Same suffixes as B<--min-size>."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:195
+#: amulecmd.1.in
 msgid "Sets a given preferences value."
 msgstr "Egy beállítás érték megváltoztatása."
 
 #. type: Plain text
-#: amulecmd.1.in:200
+#: amulecmd.1.in
 msgid "Set bandwidth limits."
 msgstr "Sávszélesség határok beállítása."
 
 #. type: Plain text
-#: amulecmd.1.in:202
+#: amulecmd.1.in
 msgid "Set IPFilter preferences."
 msgstr "IP-szűrő beállításainak módosítása."
 
 #. type: Plain text
-#: amulecmd.1.in:205
+#: amulecmd.1.in
 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.in:210
+#: amulecmd.1.in
 msgid "Show download queue."
 msgstr "Letöltési lista megjelenítése."
 
 #. type: Plain text
-#: amulecmd.1.in:212
+#: amulecmd.1.in
 msgid "Show log."
 msgstr "Napló megjelenítése."
 
 #. type: Plain text
-#: amulecmd.1.in:214
+#: amulecmd.1.in
 msgid "Show servers list."
 msgstr "Kiszolgálók listájának megjelenítése."
 
 #. type: Plain text
-#: amulecmd.1.in:216
+#: amulecmd.1.in
 #, fuzzy
 #| msgid "Reload shared files list."
 msgid "Show shared files list."
 msgstr "A megosztott fájlok listájt tölti újra."
 
 #. type: Plain text
-#: amulecmd.1.in:218
+#: amulecmd.1.in
 msgid "Show upload queue."
 msgstr "Feltöltési lista megjelenítése."
 
 #. type: Plain text
-#: amulecmd.1.in:222
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:224
+#: amulecmd.1.in
 msgid "Show statistics tree."
 msgstr "A statisztika fa megjelenítése."
 
 #. type: Plain text
-#: amulecmd.1.in:228
-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'."
+#: amulecmd.1.in
+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.in:231
-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."
+#: amulecmd.1.in
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
+msgstr "Példa: a \\(Bqstatistics 5' parancs csak az 5 leggyakoribb ügyfél változatot mutatja minden ügyfél típusra."
 
 #. type: Plain text
-#: amulecmd.1.in:233
+#: amulecmd.1.in
 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.in:238 amuleweb.1.in:141
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Languages"
 msgstr "Nyelvek"
 
 #. type: Plain text
-#: amulecmd.1.in:244 amuleweb.1.in:147
+#: amulecmd.1.in amuleweb.1.in
 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.in:246 amuleweb.1.in:149
+#: amulecmd.1.in amuleweb.1.in
 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.in:260 amuleweb.1.in:163
+#: amulecmd.1.in amuleweb.1.in
 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.in:263 amuleweb.1.in:166
+#: amulecmd.1.in amuleweb.1.in
 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.in:266 amuleweb.1.in:169
+#: amulecmd.1.in amuleweb.1.in
 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.in:268 amuleweb.1.in:177
+#: amulecmd.1.in amuleweb.1.in
 msgid "~/.aMule/remote.conf"
 msgstr "~/.aMule/remote.conf"
 
 #. type: SH
-#: amulecmd.1.in:268 amuleweb.1.in:181
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "PÉLDA"
 
 #. type: Plain text
-#: amulecmd.1.in:270
+#: amulecmd.1.in
 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.in:272
+#: amulecmd.1.in
 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.in:274 amuleweb.1.in:187
+#: amulecmd.1.in amuleweb.1.in
 msgid "or"
 msgstr "vagy"
 
 #. type: Plain text
-#: amulecmd.1.in:276
+#: amulecmd.1.in
 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.in:278 amuleweb.1.in:191
+#: amulecmd.1.in amuleweb.1.in
 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.in:282
+#: amulecmd.1.in
 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.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "AMULED"
 msgstr "AMULED"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon v@PACKAGE_VERSION@"
 msgstr "aMule Daemon v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon"
 msgstr "aMule Daemon"
 
 #. type: Plain text
-#: amuled.1.in:6
+#: amuled.1.in
 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.in:9 ../../src/utils/cas/docs/cas.1.in:11
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
 msgid "B<-c> I<E<lt>pathE<gt>>"
 msgstr "B<-c> I<E<lt>útvonalE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:11
+#: amuled.1.in
 msgid "B<-p> I<E<lt>pathE<gt>>"
 msgstr "B<-p> I<E<lt>fájlE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:33
+#: amuled.1.in
 msgid "Forks to background."
 msgstr "Háttérbe vonul."
 
 #. type: TP
-#: amuled.1.in:33
+#: amuled.1.in
 #, 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.in:37
+#: amuled.1.in
 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.in:40
+#: amuled.1.in
 msgid "Configure EC (External Connections)."
 msgstr "A távoli elérés beállítása."
 
 #. type: Plain text
-#: amuled.1.in:50
+#: amuled.1.in
 msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: TP
-#: amuled.1.in:61
+#: amuled.1.in
 #, fuzzy, no-wrap
 #| msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>sablonE<gt>>, B<--template>=I<E<lt>sablonE<gt>> B<>"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "AMULEGUI"
 msgstr "AMULEGUI"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI v@PACKAGE_VERSION@"
 msgstr "aMuleGUI v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
 #. type: Plain text
-#: amulegui.1.in:6
+#: amulegui.1.in
 msgid "amulegui - aMule control program with GUI"
 msgstr "amulegui - aMule vezérlő program grafikus felülettel"
 
 #. type: Plain text
-#: amulegui.1.in:17
+#: amulegui.1.in
 msgid "B<-t> I<E<lt>numE<gt>>"
 msgstr "B<-t> I<E<lt>számE<gt>>"
 
 #. type: Plain text
-#: amulegui.1.in:27
+#: amulegui.1.in
 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.in:42
+#: amulegui.1.in
 msgid "Skip connection dialog."
 msgstr "A kapcsolódási párbeszéd átugrása."
 
 #. type: Plain text
-#: amulegui.1.in:46
+#: amulegui.1.in
 msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: Plain text
-#: amulegui.1.in:72
+#: amulegui.1.in
 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.in:73
+#: amulegui.1.in
 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.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "AMULEWEB"
 msgstr "AMULEWEB"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "aMule webserver v@PACKAGE_VERSION@"
 msgstr "aMule web kiszolgáló v@PACKAGE_VERSION@"
 
 #. type: Plain text
-#: amuleweb.1.in:6
+#: amuleweb.1.in
 msgid "amuleweb - aMule web server"
 msgstr "amuleweb - aMule web kiszolgáló"
 
 #. type: Plain text
-#: amuleweb.1.in:15
+#: amuleweb.1.in
 msgid "B<-l> I<E<lt>langE<gt>>"
 msgstr "B<-l> I<E<lt>nyelvE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:18
+#: amuleweb.1.in
 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.in:20
+#: amuleweb.1.in
 msgid "B<-U> I<E<lt>portE<gt>>"
 msgstr "B<-U> I<E<lt>portE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:24
+#: amuleweb.1.in
 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.in:40
+#: amuleweb.1.in
 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.in:46
+#: amuleweb.1.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in
 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.in:74
+#: amuleweb.1.in
 #, 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.in:77
+#: amuleweb.1.in
 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.in:77
+#: amuleweb.1.in
 #, 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.in:80
+#: amuleweb.1.in
 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.in:84
+#: amuleweb.1.in
 msgid "Enable UPnP."
 msgstr "UPnP engedélyezése."
 
 #. type: TP
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 #, fuzzy, no-wrap
 #| msgid "B< -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<>"
 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.in:87
+#: amuleweb.1.in
 msgid "UPnP port."
 msgstr "UPnP port."
 
 #. type: Plain text
-#: amuleweb.1.in:90
+#: amuleweb.1.in
 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.in:93
+#: amuleweb.1.in
 msgid "Disables using gzip compression (this is the default)."
 msgstr "gzip tömörítés tiltása (alapértelmezett)."
 
 #. type: TP
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 #, 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.in:96
+#: amuleweb.1.in
 msgid "Full access password for webserver."
 msgstr "Teljes hozzáférésű jelszó a web kiszolgálóhoz."
 
 #. type: TP
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 #, 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.in:99
+#: amuleweb.1.in
 msgid "Guest password for webserver."
 msgstr "Web kiszolgáló vendég felhasználó jelszava."
 
 #. type: Plain text
-#: amuleweb.1.in:102
+#: amuleweb.1.in
 msgid "Allows guest access."
 msgstr "Vendég felhasználó engedélyezése."
 
 #. type: Plain text
-#: amuleweb.1.in:105
+#: amuleweb.1.in
 msgid "Denies guest access (default)."
 msgstr "Vendég felhasználó tiltása (alapértelmezett)."
 
 #. type: Plain text
-#: amuleweb.1.in:111
+#: amuleweb.1.in
 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.in:114
+#: amuleweb.1.in
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "PHP értelmező letiltása (elavult, ne használd)"
 
 #. type: Plain text
-#: amuleweb.1.in:117
+#: amuleweb.1.in
 msgid "Recompiles PHP pages on each request."
 msgstr "PHP oldalak újrafordítása minden kérésnél."
 
 #. type: TP
-#: amuleweb.1.in:130
+#: amuleweb.1.in
 #, 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.in:136
+#: amuleweb.1.in
 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.in:169
+#: amuleweb.1.in
 #, no-wrap
 msgid "SKIN SUPPORT"
 msgstr "SABLONOK"
 
 #. type: Plain text
-#: amuleweb.1.in:173
+#: amuleweb.1.in
 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.in:175
+#: amuleweb.1.in
 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.in:179
+#: amuleweb.1.in
 msgid "~/.aMule/webserver/"
 msgstr "~/.aMule/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:181
+#: amuleweb.1.in
 msgid "I<$(pkgdatadir)>/webserver/"
 msgstr "I<$(pkgdatadir)>/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:183
+#: amuleweb.1.in
 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.in:185
+#: amuleweb.1.in
 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.in:189
+#: amuleweb.1.in
 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.in:195
+#: amuleweb.1.in
 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.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "ED2K"
 msgstr "ED2K"
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "aMule eD2k link parser v1.5.1"
 msgstr "aMule eD2k hivatkozás kezelő v1.5.1"
 
 #. type: Plain text
-#: ed2k.1.in:6
+#: ed2k.1.in
 msgid "ed2k - aMule eD2k link parser"
 msgstr "ed2k - Az aMule eD2k hivatkozás kezelő."
 
 #. type: Plain text
-#: ed2k.1.in:10
+#: ed2k.1.in
 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.in:13
+#: ed2k.1.in
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr "I<E<lt>eD2k-hivatkozásE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:21
+#: ed2k.1.in
 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: TP
-#: ed2k.1.in:24
+#: ed2k.1.in
 #, fuzzy, no-wrap
 #| msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>sablonE<gt>>, B<--template>=I<E<lt>sablonE<gt>> B<>"
 
 #. type: Plain text
-#: ed2k.1.in:28
+#: ed2k.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:31
+#: ed2k.1.in
 #, fuzzy
 #| msgid "Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgid "Loads all links 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.in:34
+#: ed2k.1.in
 #, fuzzy
 #| msgid "Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgid "Lists all links 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: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< eD2k-hivatkozás >"
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr "eD2k hivatkozás letöltése."
+
 #. type: Plain text
-#: ed2k.1.in:54
+#: ed2k.1.in
 msgid "a magnet link;"
 msgstr "egy magnet hivatkozás;"
 
 #. type: Plain text
-#: ed2k.1.in:56
+#: ed2k.1.in
 msgid "an emulecollection file."
 msgstr "egy emulecollection (gyűjtemény) fájl."
 
 #. type: Plain text
-#: ed2k.1.in:61
+#: ed2k.1.in
 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.in:63
+#: ed2k.1.in
 msgid "~/.aMule/ED2KLinks"
 msgstr "~/.aMule/ED2KLinks"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "ALC"
 msgstr "ALC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "aLinkCreator"
 msgstr "aLinkCreator"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:9
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:11
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "ALCC"
 msgstr "ALCC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "aMule eD2k links calculator"
 msgstr "aMule eD2k hivatkozás készítő"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:26
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "CAS"
 msgstr "CAS"
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "cas v0.8"
 msgstr "cas v0.8"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "cas - c aMule statistics"
 msgstr "cas - c aMule statisztikák"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:18
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:23
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:35
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:37
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:39
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "~/.aMule/casrc"
 msgstr "~/.aMule/casrc"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:41
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
 msgstr ""
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "WXCAS"
 msgstr "WXCAS"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "wxCas"
 msgstr "wxCas"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "wxcas - wx c aMule statistics"
 msgstr "wxcas - wx c aMule statisztikák"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:14
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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."
 
+#~ msgid "Shows the progress of an on-going search."
+#~ msgstr "Egy folymatban lévő keresés állapotát jeleníti meg."
+
+#~ msgid "Shows you the results of the last search."
+#~ msgstr "Az utolsó keresés eredményeinek megjelenítése."
+
 #~ 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."

amule-3.0.1.tar.gz/docs/man/po/manpages-it.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-it.po Changed

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule SVN\n"
-"POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-18 22:07+0000\n"
+"POT-Creation-Date: 2026-08-24 19:02+0200\n"
+"PO-Revision-Date: 2026-09-20 21:09+0000\n"
 "Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -20,1582 +20,1612 @@
 
 # type: TH
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "AMULE"
 msgstr "AMULE"
 
 #. type: TH
-#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
-#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "@MAN_DATE@"
 msgstr "@MAN_DATE@"
 
 # type: TH
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule v@PACKAGE_VERSION@"
 msgstr "aMule v@PACKAGE_VERSION@"
 
 # type: TH
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule"
 msgstr "aMule"
 
 # type: SH
 #. type: SH
-#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
-#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
-#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "NAME"
 msgstr "NOME"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:6
+#: amule.1.in
 msgid "amule - the all-platform eMule p2p client"
 msgstr "amule - il client p2p multipiattaforma basato su eMule"
 
 # type: SH
 #. type: SH
-#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
-#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
-#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SINTASSI"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:10 amulegui.1.in:10
+#: amule.1.in amulegui.1.in
 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.in:14 amuled.1.in:16
+#: amule.1.in amuled.1.in
 msgid "B<-w> I<E<lt>pathE<gt>>"
 msgstr "B<-w> I<E<lt>percorsoE<gt>>"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:18 amuled.1.in:20
-msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
-msgstr "B<-t> I<E<lt>numeroE<gt>> I<collegamento-eD2k>"
+#: amule.1.in amuled.1.in
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
+msgstr "B<-t> I<E<lt>numeroE<gt>> I<collegamento-eD2k>|I<file-collezione>"
 
 # type: SH
 #. type: SH
-#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
-#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
-#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIZIONE"
 
 # type: TP
 #. type: TP
-#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
-#: ../../src/utils/cas/docs/cas.1.in:30
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:29 amulegui.1.in:30
+#: amule.1.in amulegui.1.in
 #, 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.in:32 amulegui.1.in:33
+#: amule.1.in amulegui.1.in
 msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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: \tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Prints log messages to stdout."
 msgstr "Scrive i messaggi di log nello stdout."
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Resets config to default values."
 msgstr "Reimposta la configurazione ai valori di default."
 
 #. type: Plain text
-#: amule.1.in:42
+#: amule.1.in
 msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Abilita o disabilita l'avvio di aMule all'accesso dell'utente, poi esce.  L'archivio specifico del sistema operativo viene selezionato automaticamente: chiave Run del registro di Windows, LaunchAgent su macOS, voce di avvio automatico XDG I<.desktop> su Linux."
 
 # type: TP
 #. type: TP
-#: amule.1.in:42 amuled.1.in:50
+#: amule.1.in amuled.1.in
 #, 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.in:45 amuled.1.in:53
+#: amule.1.in amuled.1.in
 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>>."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amule.1.in:50 amuled.1.in:58 amulegui.1.in:51
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
 msgstr "Non intercettare le eccezioni fatali e non bloccare l'uscita sulle assertion.  Utile per installazioni headless / supervisionate (systemd, script watchdog)  dove la finestra di assertion altrimenti modale impedisce il riavvio automatico."
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Does not disable stdin."
 msgstr "Non disabilita lo stdin."
 
 # type: TP
 #. type: TP
-#: amule.1.in:53 amulegui.1.in:54
+#: amule.1.in amulegui.1.in
 #, 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.in:56 amuled.1.in:64 amulegui.1.in:57
+#: amule.1.in amuled.1.in amulegui.1.in
 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.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
-#: amuleweb.1.in:130 ed2k.1.in:40
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
 msgid "Displays the current version number."
 msgstr "Visualizza il numero di versione corrente."
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
-#: amuleweb.1.in:127 ed2k.1.in:37
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
-#: ../../src/utils/cas/docs/cas.1.in:33
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Prints a short usage description."
 msgstr "Visualizza una breve descrizione dell'utilizzo."
 
 # type: TP
 #. type: TP
-#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
+#: amule.1.in amuled.1.in
 #, no-wrap
-msgid "B< eD2k-link >"
-msgstr "B< collegamento-eD2k >"
+msgid "B< eD2k-link | collection-file >"
+msgstr "B< collegamento-eD2k | file-collezione >"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
-msgid "Adds an eD2k-link to the core."
-msgstr "Aggiunge un collegamento eD2k."
+#: amule.1.in amuled.1.in
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
+msgstr "Aggiunge al core un collegamento eD2k, o ogni collegamento contenuto in un file collezione eMule."
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 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.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 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.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 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.in:74 amuled.1.in:82 ed2k.1.in:52
+#: amule.1.in amuled.1.in ed2k.1.in
 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.in:76 amuled.1.in:84
+#: amule.1.in amuled.1.in
 msgid "a magnet link."
 msgstr "un collegamento magnet."
 
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr "In alternativa l'argomento può essere il percorso di un file .emulecollection, o un URL file:// che lo indica, nel qual caso ogni collegamento in esso contenuto viene aggiunto alla coda di download. È questo che permette a un file manager di aprire una collezione con aMule."
+
 # type: SH
 #. type: SH
-#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "NOTES"
 msgstr "NOTE"
 
 # type: SS
 #. type: SS
-#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Paths"
 msgstr "Percorsi"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 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.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
-#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "FILES"
 msgstr "FILE"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:84 amuled.1.in:87
+#: amule.1.in amuled.1.in
 msgid "~/.aMule/*"
 msgstr "~/.aMule/*"
 
 # type: SH
 #. type: SH
-#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
-#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
-#: ../../src/utils/cas/docs/cas.1.in:43
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr "SEGNALARE I BUG"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  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<https://github.com/amule-org/amule/discussions>) o nel nostro bugtracker (I<https://github.com/amule-org/amule/issues>). 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.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VEDI ANCHE"
 
 # type: SH
 #. type: SH
-#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
-#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
-#: ../../src/utils/cas/docs/cas.1.in:50
-#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTORE"
 
 # type: Plain text
 #. type: Plain text
-#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
-#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
-#: ../../src/utils/cas/docs/cas.1.in:51
-#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "AMULECMD"
 msgstr "AMULECMD"
 
 # type: TH
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "aMuleCmd v@PACKAGE_VERSION@"
 msgstr "aMuleCmd v@PACKAGE_VERSION@"
 
 # type: TH
 #. type: TH
-#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "aMule utilities"
 msgstr "utilità di aMule"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:7
+#: amulecmd.1.in
 msgid "amulecmd - Console-based program to control aMule"
 msgstr "amulecmd - programma in console per controllare aMule"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:13 amuleweb.1.in:12
+#: amulecmd.1.in amuleweb.1.in
 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.in:17
+#: amulecmd.1.in
 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.in:20 amuleweb.1.in:31
+#: amulecmd.1.in amuleweb.1.in
 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.in:29
+#: amulecmd.1.in
 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.in:29 amuleweb.1.in:46
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
 msgstr "Computer dove è in esecuzione aMule (default: I<127.0.0.1>). I<E<lt>hostE<gt>> può essere un indirizzo IP o un nome DNS"
 
 # type: TP
 #. type: TP
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 msgid "External Connections password."
 msgstr "Password delle connessioni esterne."
 
 # type: TP
 #. type: TP
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:43 amuleweb.1.in:60
+#: amulecmd.1.in amuleweb.1.in
 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.in:46 amuleweb.1.in:63
+#: amulecmd.1.in amuleweb.1.in
 msgid "Do not print any output to stdout."
 msgstr "Non scrivere nulla nello stdout."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 msgid "Be verbose - show also debug messages."
 msgstr "Mostra anche i messaggi di debug."
 
 # type: TP
 #. type: TP
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:54 amuleweb.1.in:71
+#: amulecmd.1.in amuleweb.1.in
 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.in:57 amuleweb.1.in:74
+#: amulecmd.1.in amuleweb.1.in
 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.in:57
+#: amulecmd.1.in
 #, 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.in:60
+#: amulecmd.1.in
 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.in:60 amuleweb.1.in:117
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:63 amuleweb.1.in:120
+#: amulecmd.1.in amuleweb.1.in
 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: Plain text
-#: amulecmd.1.in:67 amuleweb.1.in:124
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr "Non cifrare il collegamento di connessione esterna. La cifratura viene negoziata automaticamente ogni volta che l'aMule remoto la supporta ed è attiva per impostazione predefinita per ogni destinazione, locale o remota. Disattivarla lascia tutto ciò che segue il login leggibile, e modificabile, da chiunque sia in grado di osservare la connessione."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
 msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
 msgstr "Forza la compressione ZLIB sulla connessione esterna indipendentemente dalla località dell'IP contattato.  Utile quando il server è raggiungibile attraverso un tunnel VPN che risolve a un IP di LAN e l'euristica salterebbe altrimenti la compressione."
 
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.  Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output."
+msgstr "Separa i campi dei comandi di elenco con spazi, come facevano le versioni precedenti, invece che con tabulazioni. I nomi dei client e dei file possono contenere spazi, quindi il separatore predefinito di tabulazione è ciò che permette a uno script di suddividere nuovamente una riga nei suoi campi; usare questa opzione solo per script scritti per l'output precedente."
+
 # type: SH
 #. type: SH
-#: amulecmd.1.in:73
+#: amulecmd.1.in
 #, no-wrap
 msgid "COMMANDS"
 msgstr "COMANDI"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:75
+#: amulecmd.1.in
 msgid "All commands are case insensitive."
 msgstr "Tutti i comandi non distinguono tra maiuscolo e minuscolo."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:77
+#: amulecmd.1.in
 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.in:86
+#: amulecmd.1.in
 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.in:89
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:91
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:93
+#: amulecmd.1.in
 msgid "Connect to the network."
-msgstr "Connessione alla rete."
+msgstr "Connettiti alla rete."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:95
+#: amulecmd.1.in
 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.in:99
+#: amulecmd.1.in
 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.in:102
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:104
+#: amulecmd.1.in
 msgid "Start downloading a file."
 msgstr "Inizia il download di un file."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:108
-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."
+#: amulecmd.1.in
+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.in:110
+#: amulecmd.1.in
 msgid "Disconnect from amule/amuled and quit amulecmd."
 msgstr "Disconnette da amule/amuled ed esce da amulecmd."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:112
+#: amulecmd.1.in
 msgid "Get and display a preference value."
 msgstr "Legge e visualizza un valore delle preferenze."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+#: amulecmd.1.in
 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.in:117
+#: amulecmd.1.in
 msgid "Get bandwidth limits."
-msgstr "Legge i limiti di banda."
+msgstr "Visualizza limiti di banda."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:119
+#: amulecmd.1.in
 msgid "Get IPFilter preferences."
 msgstr "Legge le preferenze del filtro IP."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:124
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:126
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:128
+#: amulecmd.1.in
 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.in:130
+#: amulecmd.1.in
 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.in:133
+#: amulecmd.1.in
 msgid "Automatic priority."
 msgstr "Priorità automatica."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:135
+#: amulecmd.1.in
 msgid "High priority."
 msgstr "Priorità alta."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:137
+#: amulecmd.1.in
 msgid "Low priority."
 msgstr "Priorità bassa."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:139
+#: amulecmd.1.in
 msgid "Normal priority."
 msgstr "Priorità normale."
 
-# type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:142
-msgid "Shows the progress of an on-going search."
-msgstr "Mostra i progressi di una ricerca in corso."
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr "Mostra i progressi di una ricerca in corso. Accetta facoltativamente un I<E<lt>idE<gt>> di ricerca (come stampato da B<search>); senza id, mostra la ricerca avviata più di recente."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:144
+#: amulecmd.1.in
 msgid "A synonym of the B<exit> command."
 msgstr "Un sinonimo del comando B<exit>."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:146
+#: amulecmd.1.in
 msgid "Reloads a given object."
 msgstr "Ricarica un dato oggetto."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:151
+#: amulecmd.1.in
 msgid "Reload shared files list."
 msgstr "Ricarica la lista dei file condivisi."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:153
+#: amulecmd.1.in
 msgid "Reload IP filter tables."
 msgstr "Ricarica la tabella dei filtri IP."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:156
+#: amulecmd.1.in
 msgid "Reset the log."
 msgstr "Cancella il log."
 
-# type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:158
-msgid "Shows you the results of the last search."
-msgstr "Mostra i risultati dell'ultima ricerca."
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr "Mostra i risultati di una ricerca. Accetta facoltativamente un I<E<lt>idE<gt>> di ricerca (come stampato da B<search>); senza id, mostra la ricerca avviata più di recente.  È possibile mantenere più ricerche contemporaneamente sul demone, indirizzandole tramite id."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:160
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:164
-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'."
+#: amulecmd.1.in
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
+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'. Stampa un id di ricerca, da passare a B<results> o B<progress> per indirizzare questa ricerca. È possibile eseguire più ricerche contemporaneamente, ciascuna con il proprio id."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:166
+#: amulecmd.1.in
 msgid "Available search types:"
 msgstr "Tipi di ricerca disponibili:"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:169
+#: amulecmd.1.in
 msgid "Performs a global search."
 msgstr "Esegue una ricerca globale."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:171
+#: amulecmd.1.in
 msgid "Performs a search on the Kademlia network."
 msgstr "Esegue una ricerca sulla rete Kademlia."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:173
+#: amulecmd.1.in
 msgid "Performs a local search."
 msgstr "Esegue una ricerca locale."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:177
+#: amulecmd.1.in
 msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
 msgstr "È possibile inserire filtri opzionali prima, dopo o intervallati alla/e parola/e chiave di ricerca:"
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:180
+#: amulecmd.1.in
 msgid "Restrict results to the given file type."
 msgstr "Limita i risultati al tipo di file indicato."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:182
+#: amulecmd.1.in
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
 msgstr "Limita i risultati a un'estensione di file specifica (ad es.\\ I<iso>, I<mp3>)."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:184
+#: amulecmd.1.in
 msgid "Minimum number of sources a result must report."
 msgstr "Numero minimo di fonti che un risultato deve dichiarare."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:187
+#: amulecmd.1.in
 msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
 msgstr "Dimensione minima del file da restituire. I suffissi usano moltiplicatori binari (K = 1024, M = K\\(mu1024, G = M\\(mu1024); senza suffisso indica byte."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:189
+#: amulecmd.1.in
 msgid "Largest file size to return. Same suffixes as B<--min-size>."
 msgstr "Dimensione massima del file da restituire. Stessi suffissi di B<--min-size>."
 
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
-msgstr "Esempio: `search global linux iso --type Iso --min-size 100M' restituisce risultati per \\(lqlinux iso\\(rq di tipo file Iso di almeno 100 MiB."
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
+msgstr "Esempio: 'search global linux iso --type Iso --min-size 100M' restituisce risultati per 'linux iso' di tipo file Iso di almeno 100 MiB."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:195
+#: amulecmd.1.in
 msgid "Sets a given preferences value."
 msgstr "Imposta un dato valore di preferenza."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:200
+#: amulecmd.1.in
 msgid "Set bandwidth limits."
 msgstr "Imposta i limiti di banda."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:202
+#: amulecmd.1.in
 msgid "Set IPFilter preferences."
 msgstr "Imposta le preferenze del filtro IP."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:205
+#: amulecmd.1.in
 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.in:210
+#: amulecmd.1.in
 msgid "Show download queue."
 msgstr "Mostra la coda di download."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:212
+#: amulecmd.1.in
 msgid "Show log."
 msgstr "Mostra il log."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:214
+#: amulecmd.1.in
 msgid "Show servers list."
 msgstr "Mostra la lista dei server."
 
 # type: Plain text
 # AI-GENERATED — please review.
 #. type: Plain text
-#: amulecmd.1.in:216
+#: amulecmd.1.in
 msgid "Show shared files list."
 msgstr "Mostra la lista dei file condivisi."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:218
+#: amulecmd.1.in
 msgid "Show upload queue."
 msgstr "Mostra la coda di upload."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:222
+#: amulecmd.1.in
 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: Plain text
 #. type: Plain text
-#: amulecmd.1.in:224
+#: amulecmd.1.in
 msgid "Show statistics tree."
 msgstr "Mostra l'albero delle statistiche."
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:228
-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'."
+#: amulecmd.1.in
+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.in:231
-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."
+#: amulecmd.1.in
+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.in:233
+#: amulecmd.1.in
 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.in:238 amuleweb.1.in:141
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Languages"
 msgstr "Linguaggi"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:244 amuleweb.1.in:147
+#: amulecmd.1.in amuleweb.1.in
 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.in:246 amuleweb.1.in:149
+#: amulecmd.1.in amuleweb.1.in
 msgid "For example, the following strings are valid:"
 msgstr "Per esempio, le stringhe seguenti sono valide:"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:260 amuleweb.1.in:163
+#: amulecmd.1.in amuleweb.1.in
 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.in:263 amuleweb.1.in:166
+#: amulecmd.1.in amuleweb.1.in
 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.in:266 amuleweb.1.in:169
+#: amulecmd.1.in amuleweb.1.in
 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.in:268 amuleweb.1.in:177
+#: amulecmd.1.in amuleweb.1.in
 msgid "~/.aMule/remote.conf"
 msgstr "~/.aMule/remote.conf"
 
 # type: SH
 #. type: SH
-#: amulecmd.1.in:268 amuleweb.1.in:181
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "ESEMPIO"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:270
+#: amulecmd.1.in
 msgid "Typically amulecmd will be first run as:"
 msgstr "Di norma amulecmd sarà inizialmente eseguito come:"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:272
+#: amulecmd.1.in
 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.in:274 amuleweb.1.in:187
+#: amulecmd.1.in amuleweb.1.in
 msgid "or"
 msgstr "o"
 
 # type: Plain text
 #. type: Plain text
-#: amulecmd.1.in:276
+#: amulecmd.1.in
 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.in:278 amuleweb.1.in:191
+#: amulecmd.1.in amuleweb.1.in
 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.in:282
+#: amulecmd.1.in
 msgid "Of course, you don't have to follow this example."
 msgstr "Ma non è necessario seguire questo esempio."
 
 # type: TH
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "AMULED"
 msgstr "AMULED"
 
 # type: TH
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon v@PACKAGE_VERSION@"
 msgstr "aMule Daemon v@PACKAGE_VERSION@"
 
 # type: TH
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon"
 msgstr "aMule Daemon"
 
 # type: Plain text
 #. type: Plain text
-#: amuled.1.in:6
+#: amuled.1.in
 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.in:9 ../../src/utils/cas/docs/cas.1.in:11
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
 msgid "B<-c> I<E<lt>pathE<gt>>"
 msgstr "B<-c> I<E<lt>percorsoE<gt>>"
 
 # type: Plain text
 #. type: Plain text
-#: amuled.1.in:11
+#: amuled.1.in
 msgid "B<-p> I<E<lt>pathE<gt>>"
 msgstr "B<-p> I<E<lt>percorsoE<gt>>"
 
 # type: Plain text
 #. type: Plain text
-#: amuled.1.in:33
+#: amuled.1.in
 msgid "Forks to background."
 msgstr "Continua l'esecuzione in background."
 
 # type: TP
 #. type: TP
-#: amuled.1.in:33
+#: amuled.1.in
 #, 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.in:37
+#: amuled.1.in
 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.in:40
+#: amuled.1.in
 msgid "Configure EC (External Connections)."
 msgstr "Configura le connessioni esterne (EC)."
 
 #. type: Plain text
-#: amuled.1.in:50
+#: amuled.1.in
 msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Abilita o disabilita l'avvio di amuled all'accesso dell'utente, poi esce.  L'archivio specifico del sistema operativo viene selezionato automaticamente: chiave Run del registro di Windows, LaunchAgent su macOS, voce di avvio automatico XDG I<.desktop> su Linux."
 
 # type: TP
 #. type: TP
-#: amuled.1.in:61
+#: amuled.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 
 # type: TH
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "AMULEGUI"
 msgstr "AMULEGUI"
 
 # type: TH
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI v@PACKAGE_VERSION@"
 msgstr "aMuleGUI v@PACKAGE_VERSION@"
 
 # type: TH
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
 # type: Plain text
 #. type: Plain text
-#: amulegui.1.in:6
+#: amulegui.1.in
 msgid "amulegui - aMule control program with GUI"
 msgstr "amulegui - programma in interfaccia grafica per controllare aMule"
 
 # type: Plain text
 #. type: Plain text
-#: amulegui.1.in:17
+#: amulegui.1.in
 msgid "B<-t> I<E<lt>numE<gt>>"
 msgstr "B<-t> I<E<lt>numeroE<gt>>"
 
 # type: Plain text
 #. type: Plain text
-#: amulegui.1.in:27
+#: amulegui.1.in
 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.in:42
+#: amulegui.1.in
 msgid "Skip connection dialog."
 msgstr "Salta la finestra di connessione."
 
 #. type: Plain text
-#: amulegui.1.in:46
+#: amulegui.1.in
 msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Abilita o disabilita l'avvio di amulegui all'accesso dell'utente, poi esce.  L'archivio specifico del sistema operativo viene selezionato automaticamente: chiave Run del registro di Windows, LaunchAgent su macOS, voce di avvio automatico XDG I<.desktop> su Linux."
 
 # type: Plain text
 #. type: Plain text
-#: amulegui.1.in:72
+#: amulegui.1.in
 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.in:73
+#: amulegui.1.in
 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.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "AMULEWEB"
 msgstr "AMULEWEB"
 
 # type: TH
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "aMule webserver v@PACKAGE_VERSION@"
 msgstr "aMule webserver v@PACKAGE_VERSION@"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:6
+#: amuleweb.1.in
 msgid "amuleweb - aMule web server"
 msgstr "amuleweb - aMule web server"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:15
+#: amuleweb.1.in
 msgid "B<-l> I<E<lt>langE<gt>>"
 msgstr "B<-l> I<E<lt>linguaggioE<gt>>"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:18
+#: amuleweb.1.in
 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.in:20
+#: amuleweb.1.in
 msgid "B<-U> I<E<lt>portE<gt>>"
 msgstr "B<-U> I<E<lt>portaE<gt>>"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:24
+#: amuleweb.1.in
 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.in:40
+#: amuleweb.1.in
 msgid "B<--amule-config-file>=I<E<lt>pathE<gt>>"
 msgstr "B<--amule-config-file>=I<E<lt>percorsoE<gt>>"
 
+#. type: Plain text
+#: amuleweb.1.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr "B<DEPRECATED:> amuleweb è deprecato e potrebbe essere rimosso in aMule 3.2 o versioni successive.  Per ora non viene rimosso; valuta la migrazione ad amuleapi, l'API REST/SSE."
+
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:46
+#: amuleweb.1.in
 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.in:74
+#: amuleweb.1.in
 #, 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.in:77
+#: amuleweb.1.in
 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.in:77
+#: amuleweb.1.in
 #, 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.in:80
+#: amuleweb.1.in
 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.in:84
+#: amuleweb.1.in
 msgid "Enable UPnP."
 msgstr "Abilita il supporto UPnP."
 
 # type: TP
 #. type: TP
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 #, 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.in:87
+#: amuleweb.1.in
 msgid "UPnP port."
 msgstr "Porta per l'UPnP."
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:90
+#: amuleweb.1.in
 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.in:93
+#: amuleweb.1.in
 msgid "Disables using gzip compression (this is the default)."
 msgstr "Disabilita la compressione gzip (questo è il default)."
 
 # type: TP
 #. type: TP
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 #, 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.in:96
+#: amuleweb.1.in
 msgid "Full access password for webserver."
 msgstr "Password per l'accesso completo al web server."
 
 # type: TP
 #. type: TP
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 #, 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.in:99
+#: amuleweb.1.in
 msgid "Guest password for webserver."
 msgstr "Password for l'accesso ospite al web server."
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:102
+#: amuleweb.1.in
 msgid "Allows guest access."
 msgstr "Permette l'accesso ospite."
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:105
+#: amuleweb.1.in
 msgid "Denies guest access (default)."
 msgstr "Nega l'accesso ospite (default)."
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:111
+#: amuleweb.1.in
 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.in:114
+#: amuleweb.1.in
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Disabilita l'interprete PHP (deprecato)"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:117
+#: amuleweb.1.in
 msgid "Recompiles PHP pages on each request."
 msgstr "Ricompila le pagine PHP ad ogni richiesta."
 
 # type: TP
 #. type: TP
-#: amuleweb.1.in:130
+#: amuleweb.1.in
 #, 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.in:136
+#: amuleweb.1.in
 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.in:169
+#: amuleweb.1.in
 #, no-wrap
 msgid "SKIN SUPPORT"
 msgstr "SUPPORTO AGLI SKIN"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:173
+#: amuleweb.1.in
 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.in:175
+#: amuleweb.1.in
 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.in:179
+#: amuleweb.1.in
 msgid "~/.aMule/webserver/"
 msgstr "~/.aMule/webserver/"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:181
+#: amuleweb.1.in
 msgid "I<$(pkgdatadir)>/webserver/"
 msgstr "I<$(pkgdatadir)>/webserver/"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:183
+#: amuleweb.1.in
 msgid "Typically amuleweb will be first run as:"
 msgstr "Di norma amuleweb sarà inizialmente eseguito con:"
 
 # type: Plain text
 #. type: Plain text
-#: amuleweb.1.in:185
+#: amuleweb.1.in
 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.in:189
+#: amuleweb.1.in
 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.in:195
+#: amuleweb.1.in
 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."
+msgstr "Ovviamente, si possono specificare più o meno opzioni della prima riga di esempio, e si possono anche omettere completamente."
 
 # type: TH
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "ED2K"
 msgstr "ED2K"
 
 # type: TH
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, 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.in:6
+#: ed2k.1.in
 msgid "ed2k - aMule eD2k link parser"
 msgstr "ed2k - Analizzatore di collegamenti eD2k per aMule"
 
 # type: Plain text
 #. type: Plain text
-#: ed2k.1.in:10
+#: ed2k.1.in
 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.in:13
+#: ed2k.1.in
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr "I<E<lt>collegamento-eD2kE<gt>>"
 
 # type: Plain text
 #. type: Plain text
-#: ed2k.1.in:21
+#: ed2k.1.in
 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: TP
 #. type: TP
-#: ed2k.1.in:24
+#: ed2k.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 
 #. type: Plain text
-#: ed2k.1.in:28
+#: ed2k.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
 msgstr "Imposta a I<E<lt>numE<gt>> la categoria per i collegamenti eD2k passati.  A differenza di B<--config-dir>, il parser legge il valore come argomento successivo e non accetta la sintassi B<--category>=I<E<lt>numE<gt>>."
 
 # type: Plain text
 #. type: Plain text
-#: ed2k.1.in:31
+#: ed2k.1.in
 msgid "Loads all links 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.in:34
+#: ed2k.1.in
 msgid "Lists all links 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: TP
+#. type: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< collegamento-eD2k >"
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr "Aggiunge un collegamento eD2k."
+
 # type: Plain text
 #. type: Plain text
-#: ed2k.1.in:54
+#: ed2k.1.in
 msgid "a magnet link;"
 msgstr "un collegamento magnet;"
 
 # type: Plain text
 #. type: Plain text
-#: ed2k.1.in:56
+#: ed2k.1.in
 msgid "an emulecollection file."
 msgstr "un file emulecollection."
 
 # type: Plain text
 #. type: Plain text
-#: ed2k.1.in:61
+#: ed2k.1.in
 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.in:63
+#: ed2k.1.in
 msgid "~/.aMule/ED2KLinks"
 msgstr "~/.aMule/ED2KLinks"
 
 # type: TH
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "ALC"
 msgstr "ALC"
 
 # type: TH
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "aLinkCreator"
 msgstr "aLinkCreator"
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:9
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:11
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This app doesn't take any arguments."
 msgstr "Questa applicazione non accetta parametri."
 
 # type: TH
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "ALCC"
 msgstr "ALCC"
 
 # type: TH
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, 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.in:6
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:26
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "CAS"
 msgstr "CAS"
 
 # type: TH
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "cas v0.8"
 msgstr "cas v0.8"
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "cas - c aMule statistics"
 msgstr "cas - statistiche c di aMule"
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:18
+#: ../../src/utils/cas/docs/cas.1.in
 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
-#: ../../src/utils/cas/docs/cas.1.in:23
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
 msgstr "Scrive l'immagine della firma online.  La forma estesa B<--picture> accetta un facoltativo I<=E<lt>PERCORSOE<gt>> per specificare la posizione di output; le forme corte B<-o> / B<-P> no (B<-P> richiede un argomento I<E<lt>PERCORSOE<gt>> immediatamente di seguito, e B<-o> è uno switch senza argomenti).  Richiede il supporto GD compilato (I<__GD__>); in caso contrario l'opzione viene ignorata silenziosamente."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
 msgstr "Pagina HTML con statistiche e immagine.  La forma estesa B<--html> accetta un facoltativo I<=E<lt>PERCORSOE<gt>> per specificare la posizione di output; le forme corte B<-p> / B<-H> no (B<-H> richiede un argomento I<E<lt>PERCORSOE<gt>> immediatamente di seguito, e B<-p> è uno switch senza argomenti)."
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:35
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:37
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:39
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "~/.aMule/casrc"
 msgstr "~/.aMule/casrc"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:41
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
 msgstr "aMule-online-sign.png (o .jpg, quando si usa B<-o> / B<--picture> e GD è disponibile)"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
 msgstr "aMule-online-sign.html (quando si usa B<-p> / B<--html>)"
 
 # type: TH
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "WXCAS"
 msgstr "WXCAS"
 
 # type: TH
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "wxCas"
 msgstr "wxCas"
 
 # type: Plain text
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:14
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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: Plain text
+#~ msgid "Shows the progress of an on-going search."
+#~ msgstr "Mostra i progressi di una ricerca in corso."
+
+# type: Plain text
+#~ msgid "Shows you the results of the last search."
+#~ msgstr "Mostra i risultati dell'ultima ricerca."
+
+# type: Plain text
 #~ 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."

amule-3.0.1.tar.gz/docs/man/po/manpages-lv.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-lv.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-23 12:03+0000\n"
+"PO-Revision-Date: 2026-09-20 21:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: none\n"
 "Language: lv\n"
@@ -64,7 +64,7 @@
 #: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
 #, no-wrap
 msgid "SYNOPSIS"
-msgstr ""
+msgstr "SINTAKSE"
 
 #. type: Plain text
 #: amule.1.in:10 amulegui.1.in:10
@@ -101,7 +101,7 @@
 #: amule.1.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
 #: ../../src/utils/cas/docs/cas.1.in:30
 msgid "Read config from I<E<lt>pathE<gt>> instead of home"
-msgstr ""
+msgstr "Ielādēt norādītā I<E<lt>ceļaE<gt>> konfigurācijas iestatījumu datni, nevis noklusētās aMule mapes"
 
 #. type: TP
 #: amule.1.in:29 amulegui.1.in:30
@@ -117,7 +117,7 @@
 #. type: Plain text
 #: amule.1.in:35 amuled.1.in:43 amulegui.1.in:36
 msgid "Prints log messages to stdout."
-msgstr ""
+msgstr "Izvada žurnālierakstus konsoles/termināļa ekrānā."
 
 #. type: Plain text
 #: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
@@ -159,7 +159,7 @@
 #. type: Plain text
 #: amule.1.in:56 amuled.1.in:64 amulegui.1.in:57
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
-msgstr ""
+msgstr "Iestata nodotajām eD2k saitēm attiecīgo kategorijas I<E<lt>numuruE<gt>>"
 
 #. type: Plain text
 #: amule.1.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
@@ -173,38 +173,38 @@
 #: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
 #: ../../src/utils/cas/docs/cas.1.in:33
 msgid "Prints a short usage description."
-msgstr ""
+msgstr "Sniedz īsu lietošanas aprakstu."
 
 #. type: TP
 #: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
 #, no-wrap
 msgid "B< eD2k-link >"
-msgstr ""
+msgstr "B< eD2k-saite >"
 
 #. type: Plain text
 #: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
 msgid "Adds an eD2k-link to the core."
-msgstr ""
+msgstr "Pievieno eD2k saiti lejupielādes sarakstam."
 
 #. type: Plain text
 #: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
 msgid "The eD2k link to be added can be:"
-msgstr ""
+msgstr "Pievienojamā eD2k saite var būt:"
 
 #. type: Plain text
 #: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
 msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
-msgstr ""
+msgstr "datnes saite (ed2k://|datne|…), datne, ko ietver šī saite, tiks pievienota lejupielādes rindai;"
 
 #. type: Plain text
 #: amule.1.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
 msgid "a server link (ed2k://|server|...), it will be added to the server list;"
-msgstr ""
+msgstr "servera saite (ed2k://|serveris|…), serveris, ko ietver šī saite, tiks pievienots serveru sarakstam;"
 
 #. type: Plain text
 #: amule.1.in:74 amuled.1.in:82 ed2k.1.in:52
 msgid "a serverlist link, in which case all servers in the list will be added to the server list;"
-msgstr ""
+msgstr "serveru saraksta saite, šajā gadījumā visi sarakstā esošie serveri tiks pievienoti serveru sarakstam;"
 
 #. type: Plain text
 #: amule.1.in:76 amuled.1.in:84
@@ -226,7 +226,7 @@
 #. type: Plain text
 #: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
 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 ""
+msgstr "Visi iestatījumi, kas pieņem I<E<lt>ceļaE<gt>> argumentu un nesatur mapi (t.i., norādīts tikai datnes nosaukums), uzskata, ka šī datne atrodas I<~/.aMule> konfigurācijas mapē."
 
 #. type: SH
 #: amule.1.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
@@ -248,7 +248,7 @@
 #: ../../src/utils/wxCas/docs/wxcas.1.in:16
 #, no-wrap
 msgid "REPORTING BUGS"
-msgstr ""
+msgstr "KUR ZIŅOT PAR PROBLĒMĀM"
 
 #. type: Plain text
 #: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
@@ -257,7 +257,7 @@
 #: ../../src/utils/cas/docs/cas.1.in:46
 #: ../../src/utils/wxCas/docs/wxcas.1.in:19
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member."
-msgstr ""
+msgstr "Lūdzu, ziņojiet par problēmām vai nu mūsu forumā (I<https://github.com/amule-org/amule/discussions>), vai mūsu problēmu izsekotājā (I<https://github.com/amule-org/amule/issues>). Lūdzu, nekādā gadījumā neziņojiet mums problēmas pa e-pastu – ne mūsu vēstkopas diskusijā, ne arī tieši nevienam komandas dalībniekiem."
 
 #. type: SH
 #: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
@@ -276,7 +276,7 @@
 #: ../../src/utils/cas/docs/cas.1.in:48
 #: ../../src/utils/wxCas/docs/wxcas.1.in:21
 msgid "aMule and all of its related utilities are distributed under the GNU General Public License."
-msgstr ""
+msgstr "aMule un visi ar to saistītie rīki tiek izplatīti saskaņā ar GNU General Public License licences noteikumiem."
 
 #. type: SH
 #: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
@@ -286,7 +286,7 @@
 #: ../../src/utils/wxCas/docs/wxcas.1.in:21
 #, no-wrap
 msgid "SEE ALSO"
-msgstr ""
+msgstr "SKATIET ARĪ"
 
 #. type: SH
 #: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
@@ -326,7 +326,7 @@
 #: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
 #, no-wrap
 msgid "aMule utilities"
-msgstr ""
+msgstr "aMule rīki"
 
 #. type: Plain text
 #: amulecmd.1.in:7
@@ -336,7 +336,7 @@
 #. type: Plain text
 #: amulecmd.1.in:13 amuleweb.1.in: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 ""
+msgstr "B<-h> I<E<lt>resursdatorsE<gt>> B<-p> I<E<lt>portsE<gt>> B<-P> I<E<lt>paroleE<gt>> B<-f> I<E<lt>ceļšE<gt>>"
 
 #. type: Plain text
 #: amulecmd.1.in:17
@@ -351,7 +351,7 @@
 #. type: Plain text
 #: amulecmd.1.in:29
 msgid "B<amulecmd> is a console-based client to control aMule."
-msgstr "B<amulecmd> ir komandrindas programma aMule vadīšanai."
+msgstr "B<amulecmd> — komandrindas programma aMule vadīšanai."
 
 #. type: TP
 #: amulecmd.1.in:29 amuleweb.1.in:46
@@ -395,12 +395,12 @@
 #. type: Plain text
 #: amulecmd.1.in:43 amuleweb.1.in:60
 msgid "Use the given configuration file.  Default configuration file is I<~/.aMule/remote.conf>"
-msgstr ""
+msgstr "Lietot norādīto konfigurācijas datni. Pēc noklusējuma tiek lietota I<~/.aMule/remote.conf> konfigurācijas datne"
 
 #. type: Plain text
 #: amulecmd.1.in:46 amuleweb.1.in:63
 msgid "Do not print any output to stdout."
-msgstr ""
+msgstr "Neizvadīt nekādus datus konsoles/termināļa ekrānā."
 
 #. type: Plain text
 #: amulecmd.1.in:50 amuleweb.1.in:67
@@ -416,7 +416,7 @@
 #. type: Plain text
 #: amulecmd.1.in:54 amuleweb.1.in:71
 msgid "Sets program locale (language).  See the B<NOTES> section for the description of the I<E<lt>langE<gt>> parameter."
-msgstr ""
+msgstr "Iestata programmas lokāli (valodu). Plašāku informāciju par I<E<lt>valodasE<gt>> parametru skatiet B<PIEZĪMES> sadaļā."
 
 #. type: Plain text
 #: amulecmd.1.in:57 amuleweb.1.in:74
@@ -464,7 +464,7 @@
 #. type: Plain text
 #: amulecmd.1.in:77
 msgid "Adds an eD2k-link or a magnet-link to the core."
-msgstr ""
+msgstr "Pievieno eD2k saiti vai magnētsaiti lejupielādes sarakstam."
 
 #. type: Plain text
 #: amulecmd.1.in:86
@@ -474,7 +474,7 @@
 #. type: Plain text
 #: amulecmd.1.in:89
 msgid "The magnet link must contain the eD2k hash and file length."
-msgstr ""
+msgstr "Magnētsaitei jāsatur eD2k kontrolsumma un datnes izmērs."
 
 #. type: Plain text
 #: amulecmd.1.in:91
@@ -499,22 +499,22 @@
 #. type: Plain text
 #: amulecmd.1.in:102
 msgid "Disconnect from all networks you are connected to, or just disconnect from the specified network."
-msgstr ""
+msgstr "Atvieno no visiem tīkliem, kam esiet pieslēgušies, vai tikai no norādītā tīkla."
 
 #. type: Plain text
 #: amulecmd.1.in:104
 msgid "Start downloading a file."
-msgstr ""
+msgstr "Sākt datnes lejupielādi."
 
 #. type: Plain text
 #: amulecmd.1.in:108
-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."
+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.in:110
 msgid "Disconnect from amule/amuled and quit amulecmd."
-msgstr ""
+msgstr "Atvieno no amule/amuled un aizver amulecmd."
 
 #. type: Plain text
 #: amulecmd.1.in:112
@@ -524,7 +524,7 @@
 #. type: Plain text
 #: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
 msgid "Available values for I<E<lt>whatE<gt>>:"
-msgstr ""
+msgstr "Iespējamās vērtības I<E<lt>parametramE<gt>>:"
 
 #. type: Plain text
 #: amulecmd.1.in:117
@@ -584,7 +584,7 @@
 #. type: Plain text
 #: amulecmd.1.in:144
 msgid "A synonym of the B<exit> command."
-msgstr ""
+msgstr "Tas pats, kas B<exit> jeb B<exit> komandas sinonīms."
 
 #. type: Plain text
 #: amulecmd.1.in:146
@@ -594,22 +594,22 @@
 #. type: Plain text
 #: amulecmd.1.in:151
 msgid "Reload shared files list."
-msgstr ""
+msgstr "Pārlādēt kopīgoto datņu sarakstu."
 
 #. type: Plain text
 #: amulecmd.1.in:153
 msgid "Reload IP filter tables."
-msgstr ""
+msgstr "Pārlādēt IP adrešu filtru tabulas."
 
 #. type: Plain text
 #: amulecmd.1.in:156
 msgid "Reset the log."
-msgstr ""
+msgstr "Notīrīt žurnālu."
 
 #. type: Plain text
 #: amulecmd.1.in:158
 msgid "Shows you the results of the last search."
-msgstr ""
+msgstr "Parāda pēdējos meklēšanas rezultātus."
 
 #. type: Plain text
 #: amulecmd.1.in:160
@@ -618,18 +618,18 @@
 
 #. type: Plain text
 #: amulecmd.1.in:164
-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'."
+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.in:166
 msgid "Available search types:"
-msgstr ""
+msgstr "Iespējamie meklēšanas veidi:"
 
 #. type: Plain text
 #: amulecmd.1.in:169
 msgid "Performs a global search."
-msgstr ""
+msgstr "Veic vispārēju meklēšanu."
 
 #. type: Plain text
 #: amulecmd.1.in:171
@@ -639,7 +639,7 @@
 #. type: Plain text
 #: amulecmd.1.in:173
 msgid "Performs a local search."
-msgstr ""
+msgstr "Veic vietējo meklēšanu."
 
 #. type: Plain text
 #: amulecmd.1.in:177
@@ -654,7 +654,7 @@
 #. type: Plain text
 #: amulecmd.1.in:182
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
-msgstr ""
+msgstr "Atlasīt rezultātus tikai ar noteiktu datnes paplašinājumu (piem.,\\ I<iso>, I<mp3>)."
 
 #. type: Plain text
 #: amulecmd.1.in:184
@@ -673,13 +673,13 @@
 
 #. type: Plain text
 #: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
 msgstr ""
 
 #. type: Plain text
 #: amulecmd.1.in:195
 msgid "Sets a given preferences value."
-msgstr ""
+msgstr "Iestata norādīto iestatījumu vērtību."
 
 #. type: Plain text
 #: amulecmd.1.in:200
@@ -699,27 +699,27 @@
 #. type: Plain text
 #: amulecmd.1.in:210
 msgid "Show download queue."
-msgstr ""
+msgstr "Rādīt lejupielādes rindu."
 
 #. type: Plain text
 #: amulecmd.1.in:212
 msgid "Show log."
-msgstr ""
+msgstr "Skatīt žurnālu."
 
 #. type: Plain text
 #: amulecmd.1.in:214
 msgid "Show servers list."
-msgstr ""
+msgstr "Rādīt serveru sarakstu."
 
 #. type: Plain text
 #: amulecmd.1.in:216
 msgid "Show shared files list."
-msgstr ""
+msgstr "Parādīt kopīgoto datņu sarakstu."
 
 #. type: Plain text
 #: amulecmd.1.in:218
 msgid "Show upload queue."
-msgstr ""
+msgstr "Rādīt augšupielādes rindu."
 
 #. type: Plain text
 #: amulecmd.1.in:222
@@ -729,22 +729,22 @@
 #. type: Plain text
 #: amulecmd.1.in:224
 msgid "Show statistics tree."
-msgstr ""
+msgstr "Parādīt statistiku."
 
 #. type: Plain text
 #: amulecmd.1.in:228
-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'."
+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.in:231
-msgid "Example: `statistics 5' will show only the top 5 versions for each client type."
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
 msgstr ""
 
 #. type: Plain text
 #: amulecmd.1.in:233
 msgid "Show connection status, current up/download speeds, etc."
-msgstr ""
+msgstr "Rādīt savienojuma statusu, pašreizējo augšupielādes/lejupielādes ātrumu utt."
 
 #. type: SS
 #: amulecmd.1.in:238 amuleweb.1.in:141
@@ -760,7 +760,7 @@
 #. type: Plain text
 #: amulecmd.1.in:246 amuleweb.1.in:149
 msgid "For example, the following strings are valid:"
-msgstr ""
+msgstr "Piemēram, derīgas ir šādas virknes:"
 
 #. type: Plain text
 #: amulecmd.1.in:260 amuleweb.1.in:163
@@ -770,12 +770,12 @@
 #. type: Plain text
 #: amulecmd.1.in:263 amuleweb.1.in:166
 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 ""
+msgstr "Papildus iepriekšminētajam formātam variet vienkārši norādīt valodas nosaukumu angļu valodā. Tātad arī B<-l latvian> arguments ir derīgs un līdzvērtīgs B<-l lv_LV>."
 
 #. type: Plain text
 #: amulecmd.1.in:266 amuleweb.1.in:169
 msgid "When no locale is defined, either on command-line or in config file, system default language will be used."
-msgstr ""
+msgstr "Ja valoda nav norādīta ne kā komandrindas arguments, ne konfigurācijas datnē, tiks izmantota sistēmas noklusējuma valoda."
 
 #. type: Plain text
 #: amulecmd.1.in:268 amuleweb.1.in:177
@@ -796,7 +796,7 @@
 #. type: Plain text
 #: amulecmd.1.in:272
 msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
-msgstr ""
+msgstr "B<amulecmd> B<-h> I<resursdatora_nosaukums> B<-p> I<EC_ports> B<-P> I<EC_parole> B<-w>"
 
 #. type: Plain text
 #: amulecmd.1.in:274 amuleweb.1.in:187
@@ -806,7 +806,7 @@
 #. type: Plain text
 #: amulecmd.1.in:276
 msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
-msgstr ""
+msgstr "B<amulecmd> B<--create-config-from>=I</home/lietotājvārds/.aMule/amule.conf>"
 
 #. type: Plain text
 #: amulecmd.1.in:278 amuleweb.1.in:191
@@ -816,7 +816,7 @@
 #. type: Plain text
 #: amulecmd.1.in:282
 msgid "Of course, you don't have to follow this example."
-msgstr ""
+msgstr "Protams, jums nav obligāti jāseko šim piemēram."
 
 #. type: TH
 #: amuled.1.in:1
@@ -839,7 +839,7 @@
 #. type: Plain text
 #: amuled.1.in:6
 msgid "amuled - the all-platform eMule p2p client - daemonized version"
-msgstr ""
+msgstr "amuled - visu operētājsistēmu eMule P2P klients - fona programma"
 
 #. type: Plain text
 #: amuled.1.in:9 ../../src/utils/cas/docs/cas.1.in:11
@@ -860,7 +860,7 @@
 #: amuled.1.in:33
 #, no-wrap
 msgid "B< -p> I<E<lt>pathE<gt>>, B<--pid-file>=I<E<lt>pathE<gt>> B<>"
-msgstr ""
+msgstr "B< -p> I<E<lt>ceļšE<gt>>, B<--pid-file>=I<E<lt>ceļšE<gt>> B<>"
 
 #. type: Plain text
 #: amuled.1.in:37
@@ -881,7 +881,7 @@
 #: amuled.1.in:61
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
-msgstr ""
+msgstr "B< -t> I<E<lt>numursE<gt>>, B<--category>=I<E<lt>numursE<gt>> B<>"
 
 #. type: TH
 #: amulegui.1.in:1
@@ -899,7 +899,7 @@
 #: amulegui.1.in:1
 #, no-wrap
 msgid "aMuleGUI"
-msgstr "aMuleGUI"
+msgstr "aMule grafiskā lietotāja saskarne"
 
 #. type: Plain text
 #: amulegui.1.in:6
@@ -919,7 +919,7 @@
 #. type: Plain text
 #: amulegui.1.in:42
 msgid "Skip connection dialog."
-msgstr ""
+msgstr "Izlaist savienojuma logu."
 
 #. type: Plain text
 #: amulegui.1.in:46
@@ -961,7 +961,7 @@
 #. type: Plain text
 #: amuleweb.1.in:18
 msgid "B<-t> I<E<lt>nameE<gt>> B<-s> I<E<lt>portE<gt>>"
-msgstr ""
+msgstr "B<-t> I<E<lt>nosaukumsE<gt>> B<-s> I<E<lt>portsE<gt>>"
 
 #. type: Plain text
 #: amuleweb.1.in:20
@@ -987,7 +987,7 @@
 #: amuleweb.1.in:74
 #, no-wrap
 msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
-msgstr ""
+msgstr "B< -t> I<E<lt>nosaukumsE<gt>>, B<--template>=I<E<lt>nosaukumsE<gt>> B<>"
 
 #. type: Plain text
 #: amuleweb.1.in:77
@@ -998,7 +998,7 @@
 #: amuleweb.1.in:77
 #, no-wrap
 msgid "B< -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<>"
-msgstr ""
+msgstr "B< -s> I<E<lt>portsE<gt>>, B<--server-port>=I<E<lt>portsE<gt>> B<>"
 
 #. type: Plain text
 #: amuleweb.1.in:80
@@ -1008,7 +1008,7 @@
 #. type: Plain text
 #: amuleweb.1.in:84
 msgid "Enable UPnP."
-msgstr ""
+msgstr "Iespējot UPnP."
 
 #. type: TP
 #: amuleweb.1.in:84
@@ -1029,7 +1029,7 @@
 #. type: Plain text
 #: amuleweb.1.in:93
 msgid "Disables using gzip compression (this is the default)."
-msgstr ""
+msgstr "Atspējo gzip saspiešanu (noklusējuma iestatījums)."
 
 #. type: TP
 #: amuleweb.1.in:93
@@ -1040,7 +1040,7 @@
 #. type: Plain text
 #: amuleweb.1.in:96
 msgid "Full access password for webserver."
-msgstr ""
+msgstr "Vietnes pilnas (administratora) piekļuves parole."
 
 #. type: TP
 #: amuleweb.1.in:96
@@ -1051,17 +1051,17 @@
 #. type: Plain text
 #: amuleweb.1.in:99
 msgid "Guest password for webserver."
-msgstr ""
+msgstr "Vietnes viesa piekļuves parole."
 
 #. type: Plain text
 #: amuleweb.1.in:102
 msgid "Allows guest access."
-msgstr ""
+msgstr "Ļauj viesa piekļuvi."
 
 #. type: Plain text
 #: amuleweb.1.in:105
 msgid "Denies guest access (default)."
-msgstr ""
+msgstr "Liedz viesa piekļuvi (noklusējuma iestatījums)."
 
 #. type: Plain text
 #: amuleweb.1.in:111
@@ -1076,7 +1076,7 @@
 #. type: Plain text
 #: amuleweb.1.in:117
 msgid "Recompiles PHP pages on each request."
-msgstr ""
+msgstr "Veic PHP lapu atkārtotu kompilēšanu katrā pieprasījumā."
 
 #. type: TP
 #: amuleweb.1.in:130
@@ -1093,7 +1093,7 @@
 #: amuleweb.1.in:169
 #, no-wrap
 msgid "SKIN SUPPORT"
-msgstr ""
+msgstr "APDARES ATBALSTS"
 
 #. type: Plain text
 #: amuleweb.1.in:173
@@ -1123,12 +1123,12 @@
 #. type: Plain text
 #: amuleweb.1.in:185
 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 ""
+msgstr "B<amuleweb> B<-h> I<resursdatora_nosaukums> B<-p> I<EC_ports> B<-P> I<EC_parole> B<-s> I<HTTP_ports> B<-A> I<Administratora_(pilnas_piekļuves)_parole> B<-w>"
 
 #. type: Plain text
 #: amuleweb.1.in:189
 msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
-msgstr ""
+msgstr "B<amuleweb> B<--create-config-from>=I</home/lietotājvārds/.aMule/amule.conf>"
 
 #. type: Plain text
 #: amuleweb.1.in:195
@@ -1145,12 +1145,12 @@
 #: ed2k.1.in:1
 #, no-wrap
 msgid "aMule eD2k link parser v1.5.1"
-msgstr ""
+msgstr "aMule eD2k saišu parsētājs v1.5.1"
 
 #. type: Plain text
 #: ed2k.1.in:6
 msgid "ed2k - aMule eD2k link parser"
-msgstr ""
+msgstr "ed2k - aMule eD2k saišu parsētājs"
 
 #. type: Plain text
 #: ed2k.1.in:10
@@ -1171,7 +1171,7 @@
 #: ed2k.1.in:24
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
-msgstr ""
+msgstr "B< -t> I<E<lt>numursE<gt>>, B<--category> I<E<lt>numursE<gt>> B<>"
 
 #. type: Plain text
 #: ed2k.1.in:28
@@ -1196,7 +1196,7 @@
 #. type: Plain text
 #: ed2k.1.in:56
 msgid "an emulecollection file."
-msgstr ""
+msgstr "emulecollection datne."
 
 #. type: Plain text
 #: ed2k.1.in:61
@@ -1212,7 +1212,7 @@
 #: ../../src/utils/aLinkCreator/docs/alc.1.in:1
 #, no-wrap
 msgid "ALC"
-msgstr ""
+msgstr "ALC"
 
 #. type: TH
 #: ../../src/utils/aLinkCreator/docs/alc.1.in:1
@@ -1223,7 +1223,7 @@
 #. type: Plain text
 #: ../../src/utils/aLinkCreator/docs/alc.1.in:5
 msgid "aLinkCreator - the aMule eD2k link creator"
-msgstr ""
+msgstr "aLinkCreator - aMule eD2k saites veidotājs"
 
 #. type: Plain text
 #: ../../src/utils/aLinkCreator/docs/alc.1.in:9
@@ -1234,13 +1234,13 @@
 #: ../../src/utils/aLinkCreator/docs/alc.1.in:11
 #: ../../src/utils/wxCas/docs/wxcas.1.in:16
 msgid "This app doesn't take any arguments."
-msgstr ""
+msgstr "Šī programma neatbalsta komandrindas argumentus."
 
 #. type: TH
 #: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
 #, no-wrap
 msgid "ALCC"
-msgstr ""
+msgstr "ALCC"
 
 #. type: TH
 #: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
@@ -1251,7 +1251,7 @@
 #. type: Plain text
 #: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
 msgid "alcc - text based eD2k links calculator for aMule"
-msgstr ""
+msgstr "alcc - teksta aMule eD2k saišu kalkulators"
 
 #. type: Plain text
 #: ../../src/utils/aLinkCreator/docs/alcc.1.in:11
@@ -1277,7 +1277,7 @@
 #: ../../src/utils/cas/docs/cas.1.in:1
 #, no-wrap
 msgid "CAS"
-msgstr ""
+msgstr "CAS"
 
 #. type: TH
 #: ../../src/utils/cas/docs/cas.1.in:1
@@ -1288,7 +1288,7 @@
 #. type: Plain text
 #: ../../src/utils/cas/docs/cas.1.in:6
 msgid "cas - c aMule statistics"
-msgstr ""
+msgstr "cas - C programmēšanas valodā veidota aMule statistikas programma"
 
 #. type: Plain text
 #: ../../src/utils/cas/docs/cas.1.in:18
@@ -1308,12 +1308,12 @@
 #. type: Plain text
 #: ../../src/utils/cas/docs/cas.1.in:35
 msgid "Without any options, it prints online signature data to stdout."
-msgstr ""
+msgstr "Nenorādot argumentus, izvada tiešsaistes paraksta datus konsoles/termināļa ekrānā."
 
 #. type: Plain text
 #: ../../src/utils/cas/docs/cas.1.in:37
 msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
-msgstr ""
+msgstr "B<cas> izveidoja Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
 
 #. type: Plain text
 #: ../../src/utils/cas/docs/cas.1.in:39
@@ -1323,29 +1323,29 @@
 #. type: Plain text
 #: ../../src/utils/cas/docs/cas.1.in:41
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
-msgstr ""
+msgstr "aMule-online-sign.png (vai .jpg, ja tiek izmantots B<-o> / B<--picture> arguments un GD ir pieejams)"
 
 #. type: Plain text
 #: ../../src/utils/cas/docs/cas.1.in:43
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
-msgstr ""
+msgstr "aMule-online-sign.html (ja tiek izmantots B<-p> / B<--html> arguments)"
 
 #. type: TH
 #: ../../src/utils/wxCas/docs/wxcas.1.in:1
 #, no-wrap
 msgid "WXCAS"
-msgstr ""
+msgstr "WXCAS"
 
 #. type: TH
 #: ../../src/utils/wxCas/docs/wxcas.1.in:1
 #, no-wrap
 msgid "wxCas"
-msgstr ""
+msgstr "wxCas"
 
 #. type: Plain text
 #: ../../src/utils/wxCas/docs/wxcas.1.in:5
 msgid "wxcas - wx c aMule statistics"
-msgstr ""
+msgstr "wxcas - C programmēšanas valodā veidota aMule statistikas programma, izmantojot wxWidgets"
 
 #. type: Plain text
 #: ../../src/utils/wxCas/docs/wxcas.1.in:11

amule-3.1.0.tar.gz/docs/man/po/manpages-nl.po Added

@@ -0,0 +1,1375 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2026-07-30 17:31+0200\n"
+"PO-Revision-Date: 2026-09-20 21:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: none\n"
+"Language: nl\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.in
+#, no-wrap
+msgid "AMULE"
+msgstr "AMULE"
+
+#. type: TH
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+#, no-wrap
+msgid "@MAN_DATE@"
+msgstr "@MAN_DATE@"
+
+#. type: TH
+#: amule.1.in
+#, no-wrap
+msgid "aMule v@PACKAGE_VERSION@"
+msgstr "aMule v@PACKAGE_VERSION@"
+
+#. type: TH
+#: amule.1.in
+#, no-wrap
+msgid "aMule"
+msgstr "aMule"
+
+#. type: SH
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+#, no-wrap
+msgid "NAME"
+msgstr "NAAM"
+
+#. type: Plain text
+#: amule.1.in
+msgid "amule - the all-platform eMule p2p client"
+msgstr "amule - de p2p client van eMule voor alle platformen"
+
+#. type: SH
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "SYNOPSIS"
+
+#. type: Plain text
+#: amule.1.in amulegui.1.in
+msgid "B<-c> I<E<lt>pathE<gt>> B<-geometry> I<E<lt>geomE<gt>>"
+msgstr "B<-c> I<E<lt>padE<gt>> B<-geometry> I<E<lt>geomE<gt>>"
+
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "B<-w> I<E<lt>pathE<gt>>"
+msgstr "B<-w> I<E<lt>padE<gt>>"
+
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
+msgstr "B<-t> I<E<lt>numE<gt>> I<eD2k-koppeling>|I<collectie-bestand>"
+
+#. type: SH
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "BESCHRIJVING"
+
+#. type: TP
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
+#, 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>padE<gt>>, B<--config-dir>=I<E<lt>padE<gt>> B<>"
+
+#. type: Plain text
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
+msgid "Read config from I<E<lt>pathE<gt>> instead of home"
+msgstr "Lees configuratiebestand vanuit I<E<lt>padE<gt>> in plaats van de thuislocatie"
+
+#. type: TP
+#: amule.1.in amulegui.1.in
+#, 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.in amulegui.1.in
+msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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 "Stelt de geometrie van de app in. I<E<lt>geomE<gt>> gebruikt hetzelfde format als standaard X11 apps:\tB<=>I<E<lt>breedteE<gt>>{B<xX>}I<E<lt>hoogteE<gt>>{B<+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>"
+
+#. type: Plain text
+#: amule.1.in amuled.1.in amulegui.1.in
+msgid "Prints log messages to stdout."
+msgstr "Print logberichten naar stdout."
+
+#. type: Plain text
+#: amule.1.in amuled.1.in amulegui.1.in
+msgid "Resets config to default values."
+msgstr "Herstelt configuratiebestand naar standaardwaarden."
+
+#. type: Plain text
+#: amule.1.in
+msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
+msgstr "Schakel het starten van aMule bij het aanmelden van de gebruiker in of uit, sluit dan af.  De OS-specifieke appstore wordt automatisch geselecteerd: Windows registry Run sleutel, macOS LaunchAgent, Linux XDG I<.desktop> autostart item."
+
+#. type: TP
+#: amule.1.in amuled.1.in
+#, 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>padE<gt>>, B<--use-amuleweb>=I<E<lt>padE<gt>> B<>"
+
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
+msgstr "Specificeer locatie van het amuleweb binaire bestand naar I<E<lt>padE<gt>>."
+
+#. type: Plain text
+#: amule.1.in amuled.1.in amulegui.1.in
+msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
+msgstr "Vang fatale uitzonderingen niet op en blokkeer afsluiten bij constatering niet.  Handig voor headless / begeleide configuraties (systemd, watchdog scripts)  waar het anders-modale constateringsdialoogvenster automatisch opnieuw opstarten voorkomt."
+
+#. type: Plain text
+#: amule.1.in amuled.1.in amulegui.1.in
+msgid "Does not disable stdin."
+msgstr "Schakelt stdin niet uit."
+
+#. type: TP
+#: amule.1.in amulegui.1.in
+#, 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.in amuled.1.in amulegui.1.in
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
+msgstr "Stelt categorie voor geslaagde eD2k koppelingen in als I<E<lt>numE<gt>>"
+
+#. type: Plain text
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+msgid "Displays the current version number."
+msgstr "Toont het huidige versienummer."
+
+#. type: Plain text
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
+msgid "Prints a short usage description."
+msgstr "Print een korte gebruiksbeschrijving."
+
+#. type: TP
+#: amule.1.in amuled.1.in
+#, no-wrap
+msgid "B< eD2k-link | collection-file >"
+msgstr "B< eD2k-koppeling | collectie-bestand >"
+
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
+msgstr "Voegt een eD2k-koppeling, of elke koppeling in een eMule collectiebestand, toe aan de kern."
+
+#. type: Plain text
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
+msgid "The eD2k link to be added can be:"
+msgstr "De eD2k-koppeling die toegevoegd gaat worden kan zijn:"
+
+#. type: Plain text
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
+msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
+msgstr "een bestandskoppeling (ed2k://|file|...), het zal worden toegevoegd aan de downloadwachtrij;"
+
+#. type: Plain text
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
+msgid "a server link (ed2k://|server|...), it will be added to the server list;"
+msgstr "een serverkoppeling (ed2k://|server|...), het zal worden toegevoegd aan de serverlijst;"
+
+#. type: Plain text
+#: amule.1.in amuled.1.in ed2k.1.in
+msgid "a serverlist link, in which case all servers in the list will be added to the server list;"
+msgstr "een serverlijst-koppeling, in welk geval alle servers in de lijst zullen worden toegevoegd aan de serverlijst;"
+
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "a magnet link."
+msgstr "een magnet-koppeling."
+
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr "Alternatief kan het argument het pad naar een .emulecollection bestand zijn, of een bestand met een:// URL naam, in welk geval elke koppeling die erin staat wordt toegevoegd aan de downloadwachtrij.  Dit is wat bestandsbeheer een collectie met aMule laat openen."
+
+#. type: SH
+#: amule.1.in amulecmd.1.in amuleweb.1.in
+#, no-wrap
+msgid "NOTES"
+msgstr "NOTITIES"
+
+#. type: SS
+#: amule.1.in amulecmd.1.in amuleweb.1.in
+#, no-wrap
+msgid "Paths"
+msgstr "Paden"
+
+#. type: Plain text
+#: amule.1.in amulecmd.1.in amuleweb.1.in
+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 "Voor alle opties die een I<E<lt>padE<gt>> waarde aannemen, als het I<pad> geen map-deel bevat (b.v.b. een simpele bestandsnaam), dan wordt het aangenomen dat het onder de aMule-configuratiemap valt, I<~/.aMule>."
+
+#. type: SH
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
+#, no-wrap
+msgid "FILES"
+msgstr "BESTANDEN"
+
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "~/.aMule/*"
+msgstr "~/.aMule/*"
+
+#. type: SH
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "RAPPORTEER FOUTEN"
+
+#. type: Plain text
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member."
+msgstr "Rapporteer fouten op ons forum (I<https://github.com/amule-org/amule/discussions>), of in onze foutenvolger (I<https://github.com/amule-org/amule/issues>).  Rapporteer alstublieft geen fouten per e-mail, niet naar onze mailinglijst en niet naar een individueel teamlid."
+
+#. type: SH
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr "COPYRIGHT"
+
+#. type: Plain text
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+msgid "aMule and all of its related utilities are distributed under the GNU General Public License."
+msgstr "aMule en al de gerelateerde hulpprogramma's zijn verspreid onder de GNU Algemene Openbare Licentie."
+
+#. type: SH
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "ZIE OOK"
+
+#. type: SH
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+#, no-wrap
+msgid "AUTHOR"
+msgstr "AUTEUR"
+
+#. type: Plain text
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+msgid "This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr "Deze pagina van de handleiding is geschreven door Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+
+#. type: TH
+#: amulecmd.1.in
+#, no-wrap
+msgid "AMULECMD"
+msgstr "AMULECMD"
+
+#. type: TH
+#: amulecmd.1.in
+#, no-wrap
+msgid "aMuleCmd v@PACKAGE_VERSION@"
+msgstr "aMuleCmd v@PACKAGE_VERSION@"
+
+#. type: TH
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
+#, no-wrap
+msgid "aMule utilities"
+msgstr "aMule hulpprogramma's"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "amulecmd - Console-based program to control aMule"
+msgstr "amulecmd - Console-gebaseerd programma om aMule to besturen"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+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>poortE<gt>> B<-P> I<E<lt>wachtwoordE<gt>> B<-f> I<E<lt>padE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1.in
+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>taalE<gt>> {B< >B<-w>B< >|B< >B<-c> I<E<lt>commandoE<gt>>B< >}"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "B<--create-config-from>=I<E<lt>pathE<gt>>"
+msgstr "B<--create-config-from>=I<E<lt>padE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "B<amulecmd> is a console-based client to control aMule."
+msgstr "B<amulecmd> is een console-gebaseerde client om aMule te besturen."
+
+#. type: TP
+#: amulecmd.1.in amuleweb.1.in
+#, 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.in amuleweb.1.in
+msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
+msgstr "Host waarop aMule op uitgevoerd wordt (standaard: I<127.0.0.1>).  I<E<lt>hostE<gt>> kan een IP-adres of een DNS-naam zijn"
+
+#. type: TP
+#: amulecmd.1.in amuleweb.1.in
+#, no-wrap
+msgid "B< -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<>"
+msgstr "B< -p> I<E<lt>poortE<gt>>, B<--port>=I<E<lt>poortE<gt>> B<>"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "aMule's port for External Connections, as set in Preferences-E<gt>Remote Controls (default: I<4712>)"
+msgstr "De poort die aMule gebruikt voor Externe Verbindingen, zoals ingesteld in Voorkeuren-E<gt>Externe Controle (standaard: I<4712>)"
+
+#. type: TP
+#: amulecmd.1.in amuleweb.1.in
+#, no-wrap
+msgid "B< -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<>"
+msgstr "B< -P> I<E<lt>wachtwoordE<gt>>, B<--password>=I<E<lt>wachtwoordE<gt>> B<>"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "External Connections password."
+msgstr "Wachtwoord voor Externe Verbindingen."
+
+#. type: TP
+#: amulecmd.1.in amuleweb.1.in
+#, 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>padE<gt>>, B<--config-file>=I<E<lt>padE<gt>> B<>"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "Use the given configuration file.  Default configuration file is I<~/.aMule/remote.conf>"
+msgstr "Gebruikt het aangegeven configuratiebestand.  Standaard configuratiebestand is I<~/.aMule/remote.conf>"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not print any output to stdout."
+msgstr "Print geen uitvoer naar stdout."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "Be verbose - show also debug messages."
+msgstr "Wees uitgebreid - toon ook foutopsporingsberichten."
+
+#. type: TP
+#: amulecmd.1.in amuleweb.1.in
+#, no-wrap
+msgid "B< -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<>"
+msgstr "B< -l> I<E<lt>taalE<gt>>, B<--locale>=I<E<lt>taalE<gt>> B<>"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "Sets program locale (language).  See the B<NOTES> section for the description of the I<E<lt>langE<gt>> parameter."
+msgstr "Stelt programmaregio (taal) in.  Zie het deel B<NOTITIES> voor de beschrijving van de I<E<lt>taalE<gt>> parameter."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "Write command line options to config file and exit"
+msgstr "Schrijf commandregelopties naar configuratiebestand en sluit af"
+
+#. type: TP
+#: amulecmd.1.in
+#, no-wrap
+msgid "B< -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<>"
+msgstr "B< -c> I<E<lt>commandoE<gt>>, B<--command>=I<E<lt>commandoE<gt>> B<>"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and exit."
+msgstr "Voer I<E<lt>commandoE<gt>> uit alsof het was ingetoetst in amulecmd's prompt en sluit af."
+
+#. type: TP
+#: amulecmd.1.in amuleweb.1.in
+#, no-wrap
+msgid "B< --create-config-from>=I<E<lt>pathE<gt>> B<>"
+msgstr "B< --create-config-from>=I<E<lt>padE<gt>> B<>"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid aMule config file, and then exit."
+msgstr "Maak configuratiebestand op basis van I<E<lt>padE<gt>>, wat naar een geldig aMule configuratiebestand moet verwijzen, en sluit dan af."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr "Versleutel de Externe Verbinding-koppeling niet.  Er wordt automatisch over versleuteling onderhandeld als aMule het ondersteunt en het staat standaard aan voor elke bestemming, lokaal of extern.  Het uitschakelen laat alles na de aanmeldgegevens leesbaar, en aanpasbaar, door iedereen die de verbinding kan zien."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
+msgstr "Forceer ZLIB-compressie naar de Externe Verbinding-koppeling onafhankelijk van de lokaliteit van het opgevraagde IP-adres.  Nuttig wanneer de server bereikbaar is via een VPN-tunnel die naar een LAN-IP-adres verwijst waarvan de heuristiek anders de compressie zou overslaan."
+
+#. type: SH
+#: amulecmd.1.in
+#, no-wrap
+msgid "COMMANDS"
+msgstr "COMMANDOS"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "All commands are case insensitive."
+msgstr "Alle commando's zijn hoofdletterongevoelig."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Adds an eD2k-link or a magnet-link to the core."
+msgstr "Voegt een eD2k-koppeling of een magnet-koppeling toe aan de kern."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "a serverlist link, in which case all servers in the list will be added to the server list."
+msgstr "een serverlijst-koppeling, in welk geval alle servers in de lijst zullen worden toegevoegd an de serverlijst."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "The magnet link must contain the eD2k hash and file length."
+msgstr "De magnet-koppeling moet de eD2k-hash en bestandslengte bevatten."
+
+#. type: Plain text
+#: amulecmd.1.in
+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 "Annuleert de download gespecificeerd door I<E<lt>hashE<gt>> of I<E<lt>nummerE<gt>>. Om de waarde op te vragen gebruik B<show>."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Connect to the network."
+msgstr "Verbind met het netwerk."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "This will connect to all networks that are enabled in Preferences."
+msgstr "Dit zal met alle netwerken die zijn ingeschakeld in Voorkeuren verbinden."
+
+#. type: Plain text
+#: amulecmd.1.in
+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 "Met deze optionele parameter kan u specificeren met welk netwerk u wilt verbinden. Door een serveradres te geven in de vorm van IP:Poort (waar IP ofwel een gestipt decimal IPv4-adres is of een verwijsbare DNS-naam) zal aMule alleen met die server verbinden."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Disconnect from all networks you are connected to, or just disconnect from the specified network."
+msgstr "Verbreek verbinding met alle netwerken waarmee u verbonden bent, of verbreek alleen de verbinding met het gespecificeerde netwerk."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Start downloading a file."
+msgstr "Start downloaden van een bestand."
+
+#. type: Plain text
+#: amulecmd.1.in
+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 "Het I<E<lt>nummerE<gt>> van een bestand in de laatste zoekopdracht moet gegeven worden.  Voorbeeld: 'download 12' zal het beatand met nummer 12 uit de vorige zoekopdracht beginnen te downloaden."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Disconnect from amule/amuled and quit amulecmd."
+msgstr "Verbreek de verbinding met amule/amuled en sluit amulecmd af."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Get and display a preference value."
+msgstr "Verkrijg en toon een voorkeurswaarde."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Available values for I<E<lt>whatE<gt>>:"
+msgstr "Beschikbare waardes voor I<E<lt>watE<gt>>:"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Get bandwidth limits."
+msgstr "Verkrijg bandbreedtegrenzen."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Get IPFilter preferences."
+msgstr "Verkrijg IPFilter-voorkeuren."
+
+#. type: Plain text
+#: amulecmd.1.in
+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 "Print een korte gebruiksbeschrijving.  Als aangeroepen zonder parameter, toont het een lijst van beschikbare commando's.  Als aangeroepen met I<E<lt>commandE<gt>>, toont het een korte beschrijving van het gegeven commando."
+
+#. type: Plain text
+#: amulecmd.1.in
+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 "Pauseert de download gespecificeerd met I<E<lt>hashE<gt>> of I<E<lt>nummerE<gt>>. Om de waarde op te vragen gebruik B<show>."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Set priority of a download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>."
+msgstr "Stel prioriteit van een download gespecificeerd met I<E<lt>hashE<gt>> of I<E<lt>nummerE<gt>> in."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Available values for I<E<lt>priorityE<gt>>:"
+msgstr "Beschikbare waardes voor I<E<lt>prioriteitE<gt>>:"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Automatic priority."
+msgstr "Automatische prioriteit."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "High priority."
+msgstr "Hoge prioriteit."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Low priority."
+msgstr "Lage prioriteit."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Normal priority."
+msgstr "Normale prioriteit."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr "Toont de vooruitgang van een lopende zoekopdracht. Neemt een optionele zoekopdracht I<E<lt>idE<gt>> (zoals geprint door B<search>); zonder id toont het de meest recent gestartte zoekopdracht."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "A synonym of the B<exit> command."
+msgstr "Een synonym van het B<exit> commando."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Reloads a given object."
+msgstr "Herlaad een gegeven object."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Reload shared files list."
+msgstr "Laad gedeelde bestandenlijst opnieuw."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Reload IP filter tables."
+msgstr "Laad IP-filtertabellen opnieuw."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Reset the log."
+msgstr "Stel het logbestand opnieuw in."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr "Toont u de resultaten van een zoekopdracht. Neemt een optionele zoek I<E<lt>idE<gt>> (zoals geprint door B<search>); zonder id toont het de meest recent gestartte zoekopdracht.  Meerdere zoekopdrachten kunnen tegelijkertijd op de daemon gehouden en met id beschreven worden."
+
+#. type: Plain text
+#: amulecmd.1.in
+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 "Hervat de download gespecificeerd met I<E<lt>hashE<gt>> of I<E<lt>nummerE<gt>>. Om de waarde op te vragen gebruik B<show>."
+
+#. type: Plain text
+#: amulecmd.1.in
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
+msgstr "Voert een zoekopdracht uit voor het gegeven I<E<lt>sleutelwoordE<gt>>. Een zoektype en een sleutelwoord om naar te zoeken zijn vereist om dit te doen.  Voorbeeld: 'search kad amule' voert een kad-zoekopdracht uit voor 'amule'.  Print een zoek-id; geef het door aan B<resultaten> of B<vooruitgang> om de zoekopdracht aan te roepen. Meerdere zoekopdrachten kunnen tegelijkertijd uitgevoerd worden, elk met zijn eigen id."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Available search types:"
+msgstr "Beschikbare zoektypes:"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Performs a global search."
+msgstr "Voert een wereldwijde zoekopdracht uit."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Performs a search on the Kademlia network."
+msgstr "Voert een zoekopdracht uit op het Kademlia-netwerk."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Performs a local search."
+msgstr "Voert een lokale zoekopdracht uit."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
+msgstr "Optionele filters voor de zoekopdracht kunnen worden ingesteld voor, na, of tussen de sleutelwoord(en):"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Restrict results to the given file type."
+msgstr "Beperkt resultaten tot het gegeven bestandstype."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
+msgstr "Beperkt resultaten tot een specifieke bestandsextensie (b.v.b.\\ I<iso>, I<mp3>)."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Minimum number of sources a result must report."
+msgstr "Minimum aantal bronnen die een resultaat moet rapporteren."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
+msgstr "Kleinste bestandsmaat om terug te geven. Achtervoegsels gebruiken binaire factoren (K= 1024, M = K\\(mu1024, G = M\\(mu1024); geen achtervoegsels betekent bytes."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Largest file size to return. Same suffixes as B<--min-size>."
+msgstr "Grootste bestandsmaat om terug te geven. Zelfde achtervoegsels als B<--min-size>."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
+msgstr "Voorbeeld: 'search global linux iso --type Iso --min-size 100M' geeft resultaten terug voor 'linux iso' van bestandstype Iso gelijk aan of groter dan 100 MiB."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Sets a given preferences value."
+msgstr "Stelt een gegeven voorkeurswaarde in."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Set bandwidth limits."
+msgstr "Stel bandbreedtegrenzen in."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Set IPFilter preferences."
+msgstr "Stel IPFilter voorkeuren in."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Shows upload/download queue, servers list or shared files list."
+msgstr "Toont upload-/downloadwachtrij, serverlijst of gedeelde bestandenlijst."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Show download queue."
+msgstr "Toon download wachtrij."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Show log."
+msgstr "Toon logboek."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Show servers list."
+msgstr "Toon server-lijst."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Show shared files list."
+msgstr "Toon gedeelde bestandenlijst."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Show upload queue."
+msgstr "Toon upload-wachtrij."
+
+#. type: Plain text
+#: amulecmd.1.in
+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 "Schakel de uitvoerende externe kern uit (amule/amuled).  Dit zal ook de tekst-client uitschakelen omdat die onbruikbaar is zonder uitvoerende kern."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Show statistics tree."
+msgstr "Toon statistiekboom."
+
+#. type: Plain text
+#: amulecmd.1.in
+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 "Het optionele I<E<lt>nummerE<gt>> binnen een bereik van 0-255 kan worden doorgegeven aan dit commando als argument wat vertelt hoe veel items van de clientversie-substructuur getoond moet enworden. 0 doorgeven, of het leeg laten, betekent 'ongelimiteerd'."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
+msgstr "Voorbeeld: 'statistics 5' toont alleen de top 5 versies voor elk client-type."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Show connection status, current up/download speeds, etc."
+msgstr "Toon verbindingsstatus, huidige up-/downloadsnelheid, etc."
+
+#. type: SS
+#: amulecmd.1.in amuleweb.1.in
+#, no-wrap
+msgid "Languages"
+msgstr "Talen"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+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 "De I<E<lt>taalE<gt>> parameter voor de B<-l> optie heeft de volgende vorm: I<taal>B<_>I<TAAL>B<.>I<codering>B<@>I<modificatie> waar I<taal> de primaire taal is, I<TAAL> is een subtaal/gebied, I<codering> is de tekenset die gebruikt moet worden en I<modificatie> staat toe dat de gebruiker een specifieke instantie van localizatiegegevens binnen een enkele categorie selecteert."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "For example, the following strings are valid:"
+msgstr "Bijvoorbeeld, de volgende reeksen zijn geldig:"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "Though all the above strings are accepted as valid language definitions, I<encoding> and I<modifier> are yet unused."
+msgstr "Alhoewel al de reeksen hierboven als geldige taaldefinities geaccepteerd worden zijn I<codering> and I<modificatie> nog ongebruikt."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+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 "Bovenop het format hierboven kunt u ook volledige taalnamen in het Engels specificeren - dus B<-l german> is ook geldig en gelijk aan B<-l de_DE>."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "When no locale is defined, either on command-line or in config file, system default language will be used."
+msgstr "Als geen regio is gedefiniëerd in de commandoregel of in het configuratiebestand, wordt de standaardtaal van het systeem gebruikt."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "~/.aMule/remote.conf"
+msgstr "~/.aMule/remote.conf"
+
+#. type: SH
+#: amulecmd.1.in amuleweb.1.in
+#, no-wrap
+msgid "EXAMPLE"
+msgstr "VOORBEELD"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Typically amulecmd will be first run as:"
+msgstr "Over het algemeen wordt amulecmd voor het eerst uitgevoerd als:"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
+msgstr "B<amulecmd> B<-h> I<hostnaam> B<-p> I<EV-port> B<-P> I<EV-wachtwoord> B<-w>"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "or"
+msgstr "of"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr "B<amulecmd> B<--create-config-from>=I</home/Gebruikersnaam/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
+msgid "These will save settings to I<$HOME/.aMule/remote.conf>, and later you only need to type:"
+msgstr "Dit zal instellingen opslaan naar I<$HOME/.aMule/remote.conf> en later hoeft u alleen nog het volgende te typen:"
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Of course, you don't have to follow this example."
+msgstr "Natuurlijk hoeft u dit voorbeeld niet te volgen."
+
+#. type: TH
+#: amuled.1.in
+#, no-wrap
+msgid "AMULED"
+msgstr "AMULED"
+
+#. type: TH
+#: amuled.1.in
+#, no-wrap
+msgid "aMule Daemon v@PACKAGE_VERSION@"
+msgstr "aMule Daemon v@PACKAGE_VERSION@"
+
+#. type: TH
+#: amuled.1.in
+#, no-wrap
+msgid "aMule Daemon"
+msgstr "aMule Daemon"
+
+#. type: Plain text
+#: amuled.1.in
+msgid "amuled - the all-platform eMule p2p client - daemonized version"
+msgstr "amuled - de eMule p2p client voor alle platformen - gedaemonizeerde versie"
+
+#. type: Plain text
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
+msgid "B<-c> I<E<lt>pathE<gt>>"
+msgstr "B<-c> I<E<lt>padE<gt>>"
+
+#. type: Plain text
+#: amuled.1.in
+msgid "B<-p> I<E<lt>pathE<gt>>"
+msgstr "B<-p> I<E<lt>padE<gt>>"
+
+#. type: Plain text
+#: amuled.1.in
+msgid "Forks to background."
+msgstr "Schakelt over naar de achtergrond."
+
+#. type: TP
+#: amuled.1.in
+#, 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>padE<gt>>, B<--pid-file>=I<E<lt>padE<gt>> B<>"
+
+#. type: Plain text
+#: amuled.1.in
+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 "Na overschakelen, maakt een pid-bestand in het I<E<lt>padE<gt>>.  I<E<lt>padE<gt>> moet de bestandsnaam bevatten."
+
+#. type: Plain text
+#: amuled.1.in
+msgid "Configure EC (External Connections)."
+msgstr "Stel EV in (Externe Verbindingen)."
+
+#. type: Plain text
+#: amuled.1.in
+msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
+msgstr "Schakel het opstarten van amuled bij aanmelden in of uit, sluit dan af.  De OS-specifieke opslag wordt automatisch geselecteerd: Windows registry Run-sleutel, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
+
+#. type: TP
+#: amuled.1.in
+#, no-wrap
+msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
+msgstr "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
+
+#. type: TH
+#: amulegui.1.in
+#, no-wrap
+msgid "AMULEGUI"
+msgstr "AMULEGUI"
+
+#. type: TH
+#: amulegui.1.in
+#, no-wrap
+msgid "aMuleGUI v@PACKAGE_VERSION@"
+msgstr "aMuleGUI v@PACKAGE_VERSION@"
+
+#. type: TH
+#: amulegui.1.in
+#, no-wrap
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
+
+#. type: Plain text
+#: amulegui.1.in
+msgid "amulegui - aMule control program with GUI"
+msgstr "amulegui - aMule-besturingsprogramma met GUI"
+
+#. type: Plain text
+#: amulegui.1.in
+msgid "B<-t> I<E<lt>numE<gt>>"
+msgstr "B<-t> I<E<lt>numE<gt>>"
+
+#. type: Plain text
+#: amulegui.1.in
+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> is een client-programma en kan verbonden worden met amule of amuled via EV. U kunt uw amule programma ermee beheren. Het biedt bijna dezelfde functionaliteit als amule, zelfs als de kern op een andere computer werkt."
+
+#. type: Plain text
+#: amulegui.1.in
+msgid "Skip connection dialog."
+msgstr "Verbindingsdialoogvenster overslaan."
+
+#. type: Plain text
+#: amulegui.1.in
+msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
+msgstr "Schakel het opstarten van amulegui bij aanmelden in of uit, sluit dan af.  De OS-specifieke opslag wordt automatisch geselecteerd: Windows registry Run-sleutel, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
+
+#. type: Plain text
+#: amulegui.1.in
+msgid "This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm DOT orgE<gt>"
+msgstr "Deze handleidingspagin is geschreven door Julien Delange voor Debian E<lt>julien AT gunnm DOT orgE<gt>"
+
+#. type: Plain text
+#: amulegui.1.in
+msgid "This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr "Deze handleidingspagina is geschreven door Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+
+#. type: TH
+#: amuleweb.1.in
+#, no-wrap
+msgid "AMULEWEB"
+msgstr "AMULEWEB"
+
+#. type: TH
+#: amuleweb.1.in
+#, no-wrap
+msgid "aMule webserver v@PACKAGE_VERSION@"
+msgstr "aMule webserver v@PACKAGE_VERSION@"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "amuleweb - aMule web server"
+msgstr "amuleweb - aMule web server"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "B<-l> I<E<lt>langE<gt>>"
+msgstr "B<-l> I<E<lt>taalE<gt>>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "B<-t> I<E<lt>nameE<gt>> B<-s> I<E<lt>portE<gt>>"
+msgstr "B<-t> I<E<lt>naamE<gt>> B<-s> I<E<lt>poortE<gt>>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "B<-U> I<E<lt>portE<gt>>"
+msgstr "B<-U> I<E<lt>poortE<gt>>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "B<-A> I<E<lt>passwordE<gt>> B<-G> I<E<lt>passwordE<gt>>"
+msgstr "B<-A> I<E<lt>wachtwoordE<gt>> B<-G> I<E<lt>wachtwoordE<gt>>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "B<--amule-config-file>=I<E<lt>pathE<gt>>"
+msgstr "B<--amule-config-file>=I<E<lt>padE<gt>>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr "B<VEROUDERD:> amuleweb is verouderd en kan verwijderd worden in aMule 3.2 of later.  Het wordt nog niet centraal verwijderd; overweeg te migreren naar amuleapi, de REST/SSE API."
+
+#. type: Plain text
+#: amuleweb.1.in
+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> beheert uw toegang tot amule via een webbrowser.  U kan amuleweb samen met B<amule>(1) starten, of zelfstandig op elk later moment.  Opties kunnen via commandoregel of via configuratiebestand gespecificeerd worden. Opties uit de commandoregel krijgen voorrang op opties uit het configuratiebestand."
+
+#. type: TP
+#: amuleweb.1.in
+#, no-wrap
+msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
+msgstr "B< -t> I<E<lt>naamE<gt>>, B<--template>=I<E<lt>naamE<gt>> B<>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section for details."
+msgstr "Laad de template genaamd I<E<lt>nameE<gt>>. Zie de sectie B<SKIN ONDERSTEUNING> voor details."
+
+#. type: TP
+#: amuleweb.1.in
+#, 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>poortE<gt>>, B<--server-port>=I<E<lt>poortE<gt>> B<>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Webserver's HTTP port. This is the port you must point your browser to (default: I<4711>)."
+msgstr "HTTP-poort van de webserver. Dit is de poort waar uw browser naar moet verwijzen (standaard: I<4711>)."
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Enable UPnP."
+msgstr "Schakel UPnP in."
+
+#. type: TP
+#: amuleweb.1.in
+#, 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>poortE<gt>>, B<--upnp-port>=I<E<lt>poortE<gt>> B<>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "UPnP port."
+msgstr "UPnP poort."
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
+msgstr "Schakelt gebruik van gzip compressie in HTTP-verkeer in om bandbreedte te besparen."
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Disables using gzip compression (this is the default)."
+msgstr "Schakelt het gebruik van gzip compressie uit (dit is de standaard)."
+
+#. type: TP
+#: amuleweb.1.in
+#, 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>wachtwoordE<gt>>, B<--admin-pass>=I<E<lt>wachtwoordE<gt>> B<>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Full access password for webserver."
+msgstr "Webserverwachtwoord met volledige toegang."
+
+#. type: TP
+#: amuleweb.1.in
+#, 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>wachtwoordE<gt>>, B<--guest-pass>=I<E<lt>wachtwoordE<gt>> B<>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Guest password for webserver."
+msgstr "Gastenwachtwoord voor de webserver."
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Allows guest access."
+msgstr "Staat gastentoegang toe."
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Denies guest access (default)."
+msgstr "Weigert ganstentoegang (standaard)."
+
+#. type: Plain text
+#: amuleweb.1.in
+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 "Laad/sla webserverinstellingeop vanuit/naar een externe aMule.  Dit laat amuleweb commandoregel- en configuratiebestandinstellingen negeren en laad ze vanuit aMule.   Wanneer voorkeuren worden opgeslagen wordt er niets in het configuratiebestand opgeslagen maar in aMule.  (Natuurlijk werkt dit alleen voor instellingen die in aMule's Voorkeuren-E<gt>Externe Controle.)"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Schakel PHP-interpreter uit (verouderd)"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Recompiles PHP pages on each request."
+msgstr "Hercompileert PHP pagina's bij elke aanvraag."
+
+#. type: TP
+#: amuleweb.1.in
+#, no-wrap
+msgid "B< --amule-config-file>=I<E<lt>pathE<gt>> B<>"
+msgstr "B< --amule-config-file>=I<E<lt>padE<gt>> B<>"
+
+#. type: Plain text
+#: amuleweb.1.in
+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 "Pad voor aMule configuratiebestand.  B<GEBRUIK NIET DIRECT!> aMule gebruikt deze optie tijdens het starten van amuleweb bij aMule configuratie.  Deze optie zorgt ervoor dat alle andere commandoregel- en configuratiebestandinstellingen worden genegeerd, voorkeuren worden gelezen uit het gegeven configuratiebestand, en veronderstelt gebruik van de B<-q -L> opties."
+
+#. type: SH
+#: amuleweb.1.in
+#, no-wrap
+msgid "SKIN SUPPORT"
+msgstr "SKIN ONDERSTEUNING"
+
+#. type: Plain text
+#: amuleweb.1.in
+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> is in staat om informatie te tonen in verschillende skins.  Deze skins worden templates genoemd en u kan amuleweb een specifieke template laten laden via de B<-t> commandoregeloptie.  Templates worden gezocht op twee plekken: ten eerste in I<~/.aMule/webserver/> en daarna in I</usr/share/amule/webserver/> als u geïnstalleerd hebt met --prefix=/usr."
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Each template must be in a subdirectory of the template name, and this directory must contain all files the template needs."
+msgstr "Elke template moet in een ondermap van de templatenaam staan en deze map moet alle bestanden bevatten die de template nodig heeft."
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "~/.aMule/webserver/"
+msgstr "~/.aMule/webserver/"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "I<$(pkgdatadir)>/webserver/"
+msgstr "I<$(pkgdatadir)>/webserver/"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Typically amuleweb will be first run as:"
+msgstr "Over het algemeen wordt amuleweb voor het eerst uitgevoerd als:"
+
+#. type: Plain text
+#: amuleweb.1.in
+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<hostnaam> B<-p> I<EV-poort> B<-P> I<EV-wachtwoord> B<-s> I<HTTP-poort> B<-A> I<AdminWachtwoord> B<-w>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr "B<amuleweb> B<--create-config-from>=I</home/Gebruikersnaam/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amuleweb.1.in
+msgid "Of course, you may specify any more or less options on the first example line, and you may also totally omit it."
+msgstr "Natuurlijk mag u meer of minder opties specificeren op de eerste voorbeeldregel, en u mag deze volledig weg laten."
+
+#. type: TH
+#: ed2k.1.in
+#, no-wrap
+msgid "ED2K"
+msgstr "ED2K"
+
+#. type: TH
+#: ed2k.1.in
+#, no-wrap
+msgid "aMule eD2k link parser v1.5.1"
+msgstr "aMule eD2k-koppeling parser v1.5.1"
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "ed2k - aMule eD2k link parser"
+msgstr "ed2k - aMule eD2k-koppeling parser"
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "B<-c> I<E<lt>pathE<gt>> B<-t> I<E<lt>numE<gt>>"
+msgstr "B<-c> I<E<lt>padE<gt>> B<-t> I<E<lt>numE<gt>>"
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "I<E<lt>eD2k-linkE<gt>>"
+msgstr "I<E<lt>eD2k-koppelingE<gt>>"
+
+#. type: Plain text
+#: ed2k.1.in
+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 "Stuurt de gegeven I<E<lt>eD2k-koppelingE<gt>> naar aMule, d.w.z. schrijft het naar het bestand ~/.aMule/ED2KLinks, die elke seconde wordt gechecked voor koppelingen door aMule."
+
+#. type: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
+msgstr "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
+msgstr "Stel categorie in voor overhandigde eD2k-koopelingen naar I<E<lt>numE<gt>>.  Anders dan B<--config-dir>, leest de parser deze waarde als het volgende argument en accepteert het geen B<--category>=I<E<lt>numE<gt>> syntax."
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "Loads all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr "Laadt alle koppelingen gevonden in de emulecollection gegeven als I<E<lt>ed2k-linkE<gt>>"
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "Lists all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr "Maakt een lijst van alle koppelingen gevonden in de emulecollection gegeven als I<E<lt>ed2k-linkE<gt>>"
+
+#. type: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< eD2k-koppeling >"
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr "Voegt een eD2k-link toe aan de kern."
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "a magnet link;"
+msgstr "een magnet-koppeling;"
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "an emulecollection file."
+msgstr "een emulecollection-bestand."
+
+#. type: Plain text
+#: ed2k.1.in
+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<De volgorde waarin u parameters geeft is belangrijk.> U kunt meer dan één koppeling geven en elke koppeling kan zijn eigen parameters bevatten.  Bijvoorbeeld B<ed2k E<lt>koppeling1E<gt> -t2 E<lt>koppeling2E<gt>> zal I<E<lt>koppeling1E<gt>> downloaden in de standaardcategorie en I<E<lt>koppeling2E<gt>> in categorie 2."
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "~/.aMule/ED2KLinks"
+msgstr "~/.aMule/ED2KLinks"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#, no-wrap
+msgid "ALC"
+msgstr "ALC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#, no-wrap
+msgid "aLinkCreator"
+msgstr "aLinkCreator"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+msgid "aLinkCreator - the aMule eD2k link creator"
+msgstr "aLinkCreator - de eD2k-koppeling maker voor aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+msgid "B<alc> is a graphical utility to create an eD2k link to any file on your computer."
+msgstr "B<alc> is een grafisch hulpprogramma om eD2k-koppelingen te maken in elk bestand op uw computer."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
+msgid "This app doesn't take any arguments."
+msgstr "Deze app neemt geen argumenten aan."
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#, no-wrap
+msgid "ALCC"
+msgstr "ALCC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#, no-wrap
+msgid "aMule eD2k links calculator"
+msgstr "aMule eD2k-koppelingsrekenmachine"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+msgid "alcc - text based eD2k links calculator for aMule"
+msgstr "alcc - tekst-gebaseerde eD2k-koppelingsrekenmachine voor aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+msgid "I<E<lt>inputfiles_listE<gt>>"
+msgstr "I<E<lt>invoerbestanden_lijstE<gt>>"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+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 "Bereken de eD2k-koppelingen van alle invoerbestanden gegeven in de I<E<lt>invoerbestanden_lijstE<gt>> (Er kunnen één of meerdere bestanden zijn)."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+msgid "Compute and add part hashes to the computed eD2k links."
+msgstr "Bereken en voeg part-hashes toe aan de berekende eD2k-koppelingen."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+msgid "Be verbose - show also calculation steps."
+msgstr "Wees uitgebreid - toon ook rekenstappen."
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1.in
+#, no-wrap
+msgid "CAS"
+msgstr "CAS"
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1.in
+#, no-wrap
+msgid "cas v0.8"
+msgstr "cas v0.8"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in
+msgid "cas - c aMule statistics"
+msgstr "cas - c aMule statistiek"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in
+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> is een programma om de inhoud van uw aMule online handtekeningsbestand te tonen in een console (in een mens-leesbaar formaat). Om dit te laten wekren moet u de \"Online Handtekening\" optie inschakelen in de voorkeuren van aMule."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in
+msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
+msgstr "Schrijft het beeld van de online handtekening.  De langvormige B<--picture> accepteert een optionele I<=E<lt>PADE<gt>> om de uitvoerlocatie te specificeren; de kortevorm B<-o> /B<-P> doet dit niet (B<-P> vereist een onmiddelijk volgend I<=E<lt>PADE<gt>> argument, en B<-o> is een geen-argumenten schakelaar).  Vereist GD-ondersteuning gecompileerd in (I<__GD__>); deze optie wordt anders stil genegeerd."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in
+msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
+msgstr "HTML-pagina met statistiek en beeld.  De langvormige B<--html> accepteert een optionele I<=E<lt>PADE<gt>> om de uitvoerlocatie te specificeren; de kortevorm B<-o> /B<-P> doet dit niet (B<-P> vereist een onmiddelijk volgend I<=E<lt>PADE<gt>> argument, en B<-o> is een geen-argumenten schakelaar).  Vereist GD-ondersteuning gecompileerd in (I<__GD__>); deze optie wordt anders stil genegeerd."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in
+msgid "Without any options, it prints online signature data to stdout."
+msgstr "Zonder enige opties print dit online handtekeningsgegevens naar stdout."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in
+msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+msgstr "B<cas> is geschreven door Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in
+msgid "~/.aMule/casrc"
+msgstr "~/.aMule/casrc"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in
+msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
+msgstr "aMule-online-sign.png (of .jpg, als B<-o> / B<--picture> is gebruikt en GD beschikbaar is)"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in
+msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
+msgstr "aMule-online-sign.html (als B<-p> / B<--html> gebruikt is)"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1.in
+#, no-wrap
+msgid "WXCAS"
+msgstr "WXCAS"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1.in
+#, no-wrap
+msgid "wxCas"
+msgstr "wxCas"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1.in
+msgid "wxcas - wx c aMule statistics"
+msgstr "wxcas - wx c aMule statistiek"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1.in
+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> is een programma om de inhoud van uw online handtekeningsbestand te tonen in een mooi wx-venster op uw Bureaublad.  Om dit te laten werken moet u de \"Online Handtekening\" optie inschakelen in de voorkeuren van aMule."
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1.in
+msgid "Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish E<lt>thepolish@vipmail.ruE<gt>"
+msgstr "Gebaseerd op Pedro de Oliveira's B<cas>(1).  B<wxcas> is geschreven door ThePolish E<lt>thepolish@vipmail.ruE<gt>"

amule-3.0.1.tar.gz/docs/man/po/manpages-pt_BR.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-pt_BR.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule man pages\n"
-"POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-18 22:11+0000\n"
+"POT-Creation-Date: 2026-08-24 19:02+0200\n"
+"PO-Revision-Date: 2026-09-20 21:09+0000\n"
 "Last-Translator: \n"
 "Language-Team: Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>\n"
 "Language: pt_BR\n"
@@ -18,1346 +18,1374 @@
 "X-Generator: Poedit 3.9\n"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "AMULE"
 msgstr "AMULE"
 
 #. type: TH
-#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
-#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "@MAN_DATE@"
 msgstr "@MAN_DATE@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule v@PACKAGE_VERSION@"
 msgstr "aMule v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule"
 msgstr "aMule"
 
 #. type: SH
-#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
-#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
-#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "NAME"
 msgstr "NOME"
 
 #. type: Plain text
-#: amule.1.in:6
+#: amule.1.in
 msgid "amule - the all-platform eMule p2p client"
 msgstr "aMule - o cliente p2p eMule multi-plataforma"
 
 #. type: SH
-#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
-#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
-#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SINOPSE"
 
 #. type: Plain text
-#: amule.1.in:10 amulegui.1.in:10
+#: amule.1.in amulegui.1.in
 msgid "B<-c> I<E<lt>pathE<gt>> B<-geometry> I<E<lt>geomE<gt>>"
 msgstr "B<-c> I<E<lt>caminhoE<gt>> B<-geometry> I<E<lt>geomE<gt>>"
 
 #. type: Plain text
-#: amule.1.in:14 amuled.1.in:16
+#: amule.1.in amuled.1.in
 msgid "B<-w> I<E<lt>pathE<gt>>"
 msgstr "B<-w> I<E<lt>caminhoE<gt>>"
 
 #. type: Plain text
-#: amule.1.in:18 amuled.1.in:20
-msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
-msgstr "B<-t> I<E<lt>numE<gt>> I<link eD2k>"
+#: amule.1.in amuled.1.in
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
+msgstr "B<-t> I<E<lt>numE<gt>> I<link eD2k>|I<arquivo-de-coleção>"
 
 #. type: SH
-#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
-#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
-#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIÇÃO"
 
 #. type: TP
-#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, 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>caminhoE<gt>>, B<--config-dir>=I<E<lt>caminhoE<gt>> B<>"
 
 #. type: Plain text
-#: amule.1.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
-#: ../../src/utils/cas/docs/cas.1.in:30
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Read config from I<E<lt>pathE<gt>> instead of home"
 msgstr "Ler configuração de I<E<lt>pathE<gt>> ao invés de home"
 
 #. type: TP
-#: amule.1.in:29 amulegui.1.in:30
+#: amule.1.in amulegui.1.in
 #, 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.in:32 amulegui.1.in:33
+#: amule.1.in amulegui.1.in
 msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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 "Ajusta a geometria do aplicativo. I<E<lt>geomE<gt>> usa o mesmo formato que aplicativos X11 padrão:\tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Prints log messages to stdout."
 msgstr "Imprime mensagens de log para stdout."
 
 #. type: Plain text
-#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Resets config to default values."
 msgstr "Reseta configuração para os valores padrão."
 
 #. type: Plain text
-#: amule.1.in:42
+#: amule.1.in
 msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Habilita ou desabilita iniciar o aMule quando o usuário fizer login, então sair. O armazenamento específico do Sistema Operacional é selecionado automaticamente: chave Run do Registry do Windows, LaunchAgent do MacOS, XDG I<.desktop> autostart entry no Linux."
 
 #. type: TP
-#: amule.1.in:42 amuled.1.in:50
+#: amule.1.in amuled.1.in
 #, 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>caminhoE<gt>>, B<--use-amuleweb>=I<E<lt>caminhoE<gt>> B<>"
 
 #. type: Plain text
-#: amule.1.in:45 amuled.1.in:53
+#: amule.1.in amuled.1.in
 msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
 msgstr "Especifica o local do binário amuleweb para I<E<lt>pathE<gt>>."
 
 #. type: Plain text
-#: amule.1.in:50 amuled.1.in:58 amulegui.1.in:51
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
 msgstr "Não captura exceções fatais e não bloqueia saída em assertivas. Útil para configurações \"headless / supervisionadas\" (systemd, scripts de watchdog) onde caso contrário, diálogos de assertivas modais previnem o recomeço automático."
 
 #. type: Plain text
-#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Does not disable stdin."
 msgstr "Não desabilita stdin."
 
 #. type: TP
-#: amule.1.in:53 amulegui.1.in:54
+#: amule.1.in amulegui.1.in
 #, 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
-#: amule.1.in:56 amuled.1.in:64 amulegui.1.in:57
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
 msgstr "Seta categoria para links eD2k para I<E<lt>numE<gt>>"
 
 #. type: Plain text
-#: amule.1.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
-#: amuleweb.1.in:130 ed2k.1.in:40
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
 msgid "Displays the current version number."
 msgstr "Mostra o número de versão atual."
 
 #. type: Plain text
-#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
-#: amuleweb.1.in:127 ed2k.1.in:37
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
-#: ../../src/utils/cas/docs/cas.1.in:33
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Prints a short usage description."
 msgstr "Imprime uma descrição de uso curta."
 
 #. type: TP
-#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
+#: amule.1.in amuled.1.in
 #, no-wrap
-msgid "B< eD2k-link >"
-msgstr "B< link eD2k >"
+msgid "B< eD2k-link | collection-file >"
+msgstr "B< link eD2k | arquivo-de-coleção >"
 
 #. type: Plain text
-#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
-msgid "Adds an eD2k-link to the core."
-msgstr "Adiciona um link eD2k ao núcleo."
+#: amule.1.in amuled.1.in
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
+msgstr "Adiciona um link eD2k ou todos os links em um arquivo de coleção eMule ao núcleo."
 
 #. type: Plain text
-#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "The eD2k link to be added can be:"
 msgstr "O link eD2k a ser adicionado pode ser:"
 
 #. type: Plain text
-#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
 msgstr "um link de arquivo (ed2k://|file|...), ele será adicionado à fila de download;"
 
 #. type: Plain text
-#: amule.1.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a server link (ed2k://|server|...), it will be added to the server list;"
 msgstr "um link de servidor (ed2k://|server|...), ele será adicionado à lista de servidores;"
 
 #. type: Plain text
-#: amule.1.in:74 amuled.1.in:82 ed2k.1.in:52
+#: amule.1.in amuled.1.in ed2k.1.in
 msgid "a serverlist link, in which case all servers in the list will be added to the server list;"
 msgstr "um link de lista de servidores, neste caso, todos os servidores na lista serão adicionados à lista de servidores;"
 
 #. type: Plain text
-#: amule.1.in:76 amuled.1.in:84
+#: amule.1.in amuled.1.in
 msgid "a magnet link."
 msgstr "um link magnético."
 
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr "Alternativamente, o argumento pode ser o caminho para um arquivo de coleção .emulecollection, ou uma URL file:// que lhe dá o nome, neste caso todos os links que ele contém são adicionados à fila de download.  Isto é o que faz um gerenciador de arquivos abrir uma coleção com o aMule."
+
 #. type: SH
-#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "NOTES"
 msgstr "NOTAS"
 
 #. type: SS
-#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Paths"
 msgstr "Caminhos"
 
 #. type: Plain text
-#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 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 "Para todas as opções que recebem um valor I<E<lt>pathE<gt>>, se o I<path> não contém uma parte de diretório (i.e. apenas o nome de arquivo), então é considerado estar debaixo do diretório de configuração do aMule, I<~/.aMule>."
 
 #. type: SH
-#: amule.1.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
-#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "FILES"
 msgstr "ARQUIVOS"
 
 #. type: Plain text
-#: amule.1.in:84 amuled.1.in:87
+#: amule.1.in amuled.1.in
 msgid "~/.aMule/*"
 msgstr "~/.aMule/*"
 
 #. type: SH
-#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
-#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
-#: ../../src/utils/cas/docs/cas.1.in:43
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr "RELATANDO BUGS"
 
 #. type: Plain text
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member."
 msgstr "Por favor, relate bugs ou em nosso forum (I<https://github.com/amule-org/amule/discussions>), ou em nosso bugtracker (I<https://github.com/amule-org/amule/issues>). Por favor, não relate bugs por e-mail, nem para nossa lista de e-mail, nem diretamente para qualquer membro do time."
 
 #. type: SH
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "DIREITOS DE CÓPIA"
 
 #. type: Plain text
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "aMule and all of its related utilities are distributed under the GNU General Public License."
 msgstr "aMule e todos os seus utilitários relacionados são distribuídos sob a licença geral pública GNU."
 
 #. type: SH
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
 
 #. type: SH
-#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
-#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
-#: ../../src/utils/cas/docs/cas.1.in:50
-#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
-#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
-#: ../../src/utils/cas/docs/cas.1.in:51
-#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr "Esta manpage foi escrita por Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "AMULECMD"
 msgstr "AMULECMD"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "aMuleCmd v@PACKAGE_VERSION@"
 msgstr "aMuleCmd v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "aMule utilities"
 msgstr "utilitários aMule"
 
 #. type: Plain text
-#: amulecmd.1.in:7
+#: amulecmd.1.in
 msgid "amulecmd - Console-based program to control aMule"
 msgstr "amulecmd - Programa baseado em console para controlar o aMule"
 
 #. type: Plain text
-#: amulecmd.1.in:13 amuleweb.1.in:12
+#: amulecmd.1.in amuleweb.1.in
 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>anfitriãoE<gt>> B<-p> I<E<lt>portaE<gt>> B<-P> I<E<lt>senhaE<gt>> B<-f> I<E<lt>pathE<gt>>"
 
 #. type: Plain text
-#: amulecmd.1.in:17
+#: amulecmd.1.in
 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>línguaE<gt>> {B< >B<-w>B< >|B< >B<-c> I<E<lt>comandoE<gt>>B< >}"
 
 #. type: Plain text
-#: amulecmd.1.in:20 amuleweb.1.in:31
+#: amulecmd.1.in amuleweb.1.in
 msgid "B<--create-config-from>=I<E<lt>pathE<gt>>"
 msgstr "B<--create-config-from>=I<E<lt>caminhoE<gt>>"
 
 #. type: Plain text
-#: amulecmd.1.in:29
+#: amulecmd.1.in
 msgid "B<amulecmd> is a console-based client to control aMule."
 msgstr "B<amulecmd> é um cliente de console para controlar o aMule."
 
 #. type: TP
-#: amulecmd.1.in:29 amuleweb.1.in:46
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "B< -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<>"
 msgstr "B< -h> I<E<lt>anfitriãoE<gt>>, B<--host>=I<E<lt>anfitriãoE<gt>> B<>"
 
 #. type: Plain text
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
 msgstr "Anfitrião onde o aMule está rodando (padrão: I<127.0.0.1>).  I<E<lt>anfitriãoE<gt>> pode ser um endereço IP ou um nome de DNS"
 
 #. type: TP
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 #, 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
-#: amulecmd.1.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 msgid "aMule's port for External Connections, as set in Preferences-E<gt>Remote Controls (default: I<4712>)"
 msgstr "Porta do aMule para conexões externas, conforme configurado em Preferências-E<gt>Controles Remotos (padrão: I<4712>)"
 
 #. type: TP
-#: amulecmd.1.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "B< -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<>"
 msgstr "B< -P> I<E<lt>senhaE<gt>>, B<--password>=I<E<lt>senhaE<gt>> B<>"
 
 #. type: Plain text
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 msgid "External Connections password."
 msgstr "Senha das Conexões Externas."
 
 #. type: TP
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 #, 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>caminhoE<gt>>, B<--config-file>=I<E<lt>caminhoE<gt>> B<>"
 
 #. type: Plain text
-#: amulecmd.1.in:43 amuleweb.1.in:60
+#: amulecmd.1.in amuleweb.1.in
 msgid "Use the given configuration file.  Default configuration file is I<~/.aMule/remote.conf>"
 msgstr "Use o arquivo de configuração dado. O arquivo de configuração padrão é I<~/.aMule/remote.conf>"
 
 #. type: Plain text
-#: amulecmd.1.in:46 amuleweb.1.in:63
+#: amulecmd.1.in amuleweb.1.in
 msgid "Do not print any output to stdout."
 msgstr "Não imprima mensagens em stdout."
 
 #. type: Plain text
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 msgid "Be verbose - show also debug messages."
 msgstr "Seja verborrágico - mostre até as mensagens de debug."
 
 #. type: TP
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "B< -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<>"
 msgstr "B< -l> I<E<lt>línguaE<gt>>, B<--locale>=I<E<lt>línguaE<gt>> B<>"
 
 #. type: Plain text
-#: amulecmd.1.in:54 amuleweb.1.in:71
+#: amulecmd.1.in amuleweb.1.in
 msgid "Sets program locale (language).  See the B<NOTES> section for the description of the I<E<lt>langE<gt>> parameter."
 msgstr "Configura o local do programa (linguagem). Veja a seção B<NOTAS> para a descrição do parâmetro I<E<lt>langE<gt>>."
 
 #. type: Plain text
-#: amulecmd.1.in:57 amuleweb.1.in:74
+#: amulecmd.1.in amuleweb.1.in
 msgid "Write command line options to config file and exit"
 msgstr "Escrever as opções da linha de comando para o arquivo de configuração e sair"
 
 #. type: TP
-#: amulecmd.1.in:57
+#: amulecmd.1.in
 #, no-wrap
 msgid "B< -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<>"
 msgstr "B< -c> I<E<lt>commandoE<gt>>, B<--command>=I<E<lt>commandoE<gt>> B<>"
 
 #. type: Plain text
-#: amulecmd.1.in:60
+#: amulecmd.1.in
 msgid "Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and exit."
 msgstr "Executar I<E<lt>commandE<gt>> como se fosse digitado no prompt do amulecmd e sair."
 
 #. type: TP
-#: amulecmd.1.in:60 amuleweb.1.in:117
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "B< --create-config-from>=I<E<lt>pathE<gt>> B<>"
 msgstr "B< --create-config-from>=I<E<lt>caminhoE<gt>> B<>"
 
 #. type: Plain text
-#: amulecmd.1.in:63 amuleweb.1.in:120
+#: amulecmd.1.in amuleweb.1.in
 msgid "Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid aMule config file, and then exit."
 msgstr "Criar arquivo de configuração baseado em I<E<lt>pathE<gt>>, que precisa apontar para um arquivo válido de configuração do aMule, e então sair."
 
 #. type: Plain text
-#: amulecmd.1.in:67 amuleweb.1.in:124
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr "Não criptografe o link de Conexões Externas.  A criptografia é negociada automaticamente sempre que o aMule remoto suportá-la, e está ligada por padrão para todos os destinos, locais ou remotos.  Desligá-la deixa tudo legível após o login, e modificável por qualquer um capaz de observar a conexão."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
 msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
 msgstr "Força compressão ZLIB no link de Conexões Externas independente da localidade IP-discada. Útil quando o lado do servidor for alcançável com um túnel VPN que resolve para um IP de LAN e a heurística iria pular a compressão."
 
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.  Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output."
+msgstr ""
+
 #. type: SH
-#: amulecmd.1.in:73
+#: amulecmd.1.in
 #, no-wrap
 msgid "COMMANDS"
 msgstr "COMANDOS"
 
 #. type: Plain text
-#: amulecmd.1.in:75
+#: amulecmd.1.in
 msgid "All commands are case insensitive."
 msgstr "Todos os comandos são insensíveis a maiúsculas e minúsculas."
 
 #. type: Plain text
-#: amulecmd.1.in:77
+#: amulecmd.1.in
 msgid "Adds an eD2k-link or a magnet-link to the core."
 msgstr "Adiciona um link eD2k ou link magnético ao núcleo."
 
 #. type: Plain text
-#: amulecmd.1.in:86
+#: amulecmd.1.in
 msgid "a serverlist link, in which case all servers in the list will be added to the server list."
 msgstr "um link de lista de servidores, no qual todos os servidores na lista serão adicionados à lista de servidores."
 
 #. type: Plain text
-#: amulecmd.1.in:89
+#: amulecmd.1.in
 msgid "The magnet link must contain the eD2k hash and file length."
 msgstr "O link magnético precisa conter o hash eD2k e o tamanho do arquivo."
 
 #. type: Plain text
-#: amulecmd.1.in:91
+#: amulecmd.1.in
 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 "Cancela o download especificado por I<E<lt>hashE<gt>> ou I<E<lt>numberE<gt>>. Para pegar o valor, use B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:93
+#: amulecmd.1.in
 msgid "Connect to the network."
 msgstr "Conectar à rede."
 
 #. type: Plain text
-#: amulecmd.1.in:95
+#: amulecmd.1.in
 msgid "This will connect to all networks that are enabled in Preferences."
 msgstr "Isto vai conectar à todas as redes que estiverem habilitadas nas preferências."
 
 #. type: Plain text
-#: amulecmd.1.in:99
+#: amulecmd.1.in
 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 "Com o parâmetro opcional você pode especificar a que rede conectar. Ao dar um endereço de servidor na forma IP:Porta (onde IP é um endereço IPv4 ou um nome de DNS resolvível) o aMule vai conectar apenas a este servidor."
 
 #. type: Plain text
-#: amulecmd.1.in:102
+#: amulecmd.1.in
 msgid "Disconnect from all networks you are connected to, or just disconnect from the specified network."
 msgstr "Desconectar de todas as redes que estiver conectado ou apenas desconectar da rede especificada."
 
 #. type: Plain text
-#: amulecmd.1.in:104
+#: amulecmd.1.in
 msgid "Start downloading a file."
 msgstr "Começar a baixar um arquivo."
 
 #. type: Plain text
-#: amulecmd.1.in:108
-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 "O I<E<lt>numeroE<gt>> de um arquivo da última busca tem que ser dado.  Exemplo: `download 12' começará a baixar o arquivo com o número 12 da última busca."
+#: amulecmd.1.in
+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 "O I<E<lt>numeroE<gt>> de um arquivo da última busca tem que ser dado.  Exemplo: 'download 12' começará a baixar o arquivo com o número 12 da última busca."
 
 #. type: Plain text
-#: amulecmd.1.in:110
+#: amulecmd.1.in
 msgid "Disconnect from amule/amuled and quit amulecmd."
 msgstr "Desconecta do amule/amuled e sai de amulecmd."
 
 #. type: Plain text
-#: amulecmd.1.in:112
+#: amulecmd.1.in
 msgid "Get and display a preference value."
 msgstr "Obter e mostrar o valor da preferência selecionada."
 
 #. type: Plain text
-#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>whatE<gt>>:"
 msgstr "Valores disponíveis para I<E<lt>qualE<gt>>:"
 
 #. type: Plain text
-#: amulecmd.1.in:117
+#: amulecmd.1.in
 msgid "Get bandwidth limits."
 msgstr "Obter limites de largura de banda."
 
 #. type: Plain text
-#: amulecmd.1.in:119
+#: amulecmd.1.in
 msgid "Get IPFilter preferences."
 msgstr "Pegar preferências de IPFilter."
 
 #. type: Plain text
-#: amulecmd.1.in:124
+#: amulecmd.1.in
 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 "Imprime uma descrição de uso curta. Se chamado sem parâmetros, mostra a lista dos comandos disponíveis. Se chamado com I<E<lt>commandE<gt>>, mostra uma descrição curta do comando dado."
 
 #. type: Plain text
-#: amulecmd.1.in:126
+#: amulecmd.1.in
 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 "Pausa o download especificado por I<E<lt>hashE<gt>> ou I<E<lt>numeroE<gt>>. Para pegar o número use B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:128
+#: amulecmd.1.in
 msgid "Set priority of a download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>."
 msgstr "Configura a prioridade de um download especificado por I<E<lt>hashE<gt>> ou I<E<lt>numeroE<gt>>."
 
 #. type: Plain text
-#: amulecmd.1.in:130
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>priorityE<gt>>:"
 msgstr "Valores disponíveis para I<E<lt>prioridadeE<gt>>:"
 
 #. type: Plain text
-#: amulecmd.1.in:133
+#: amulecmd.1.in
 msgid "Automatic priority."
 msgstr "Prioridade automática."
 
 #. type: Plain text
-#: amulecmd.1.in:135
+#: amulecmd.1.in
 msgid "High priority."
 msgstr "Alta prioridade."
 
 #. type: Plain text
-#: amulecmd.1.in:137
+#: amulecmd.1.in
 msgid "Low priority."
 msgstr "Baixa prioridade."
 
 #. type: Plain text
-#: amulecmd.1.in:139
+#: amulecmd.1.in
 msgid "Normal priority."
 msgstr "Prioridade normal."
 
 #. type: Plain text
-#: amulecmd.1.in:142
-msgid "Shows the progress of an on-going search."
-msgstr "Mostra o progresso de uma busca em andamento."
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr "Mostra o progresso de uma busca em andamento. Opcionalmente pega uma busca I<E<lt>idE<gt>> (tal como impressa por B<search>); sem id, mostra a busca iniciada mais recentemente."
 
 #. type: Plain text
-#: amulecmd.1.in:144
+#: amulecmd.1.in
 msgid "A synonym of the B<exit> command."
 msgstr "Um sinônimo para o comando B<exit>."
 
 #. type: Plain text
-#: amulecmd.1.in:146
+#: amulecmd.1.in
 msgid "Reloads a given object."
 msgstr "Recarrega um objeto dado."
 
 #. type: Plain text
-#: amulecmd.1.in:151
+#: amulecmd.1.in
 msgid "Reload shared files list."
 msgstr "Recarregar a lista de arquivos compartilhados."
 
 #. type: Plain text
-#: amulecmd.1.in:153
+#: amulecmd.1.in
 msgid "Reload IP filter tables."
 msgstr "Recarrega as tabelas de filtragem de IP."
 
 #. type: Plain text
-#: amulecmd.1.in:156
+#: amulecmd.1.in
 msgid "Reset the log."
 msgstr "Apaga o log."
 
 #. type: Plain text
-#: amulecmd.1.in:158
-msgid "Shows you the results of the last search."
-msgstr "Mostra os resultados da última busca."
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr "Mostra os resultados de uma pesquisa. Opcionalmente, aceita um I<E<lt>idE<gt>> de pesquisa (conforme exibido por B<search>); sem um id, mostra a pesquisa iniciada mais recentemente. Várias pesquisas podem ser mantidas no daemon ao mesmo tempo e acessadas por id."
 
 #. type: Plain text
-#: amulecmd.1.in:160
+#: amulecmd.1.in
 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 "Retoma o download especificado por I<E<lt>hashE<gt>> ou I<E<lt>numeroE<gt>>. Para pegar o valor, use B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:164
-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 "Faz uma busca pela I<E<lt>palavra chaveE<gt>> dada. Um tipo de busca e uma palavra chave são mandatórias para fazer isso. Exemplo: `search kad amule' executa uma busca kad por `amule'."
+#: amulecmd.1.in
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
+msgstr "Realiza uma pesquisa pela I<E<lt>palavra-chaveE<gt>> fornecida. Um tipo de pesquisa e uma palavra-chave são obrigatórios para realizar esta operação. Exemplo: 'search kad amule' realiza uma pesquisa na rede kad por 'amule'. Exibe um id de pesquisa; passe-o para B<results> ou B<progress> para acessar essa pesquisa. Várias pesquisas podem ser executadas ao mesmo tempo, cada uma com seu próprio id."
 
 #. type: Plain text
-#: amulecmd.1.in:166
+#: amulecmd.1.in
 msgid "Available search types:"
 msgstr "Tipos de busca disponíveis:"
 
 #. type: Plain text
-#: amulecmd.1.in:169
+#: amulecmd.1.in
 msgid "Performs a global search."
 msgstr "Executa uma busca global."
 
 #. type: Plain text
-#: amulecmd.1.in:171
+#: amulecmd.1.in
 msgid "Performs a search on the Kademlia network."
 msgstr "Executa uma busca na rede Kademlia."
 
 #. type: Plain text
-#: amulecmd.1.in:173
+#: amulecmd.1.in
 msgid "Performs a local search."
 msgstr "Executa uma busca local."
 
 #. type: Plain text
-#: amulecmd.1.in:177
+#: amulecmd.1.in
 msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
 msgstr "Filtros opcionais podem ser colocado antes, depois ou intercalados com as palavras chaves de busca:"
 
 #. type: Plain text
-#: amulecmd.1.in:180
+#: amulecmd.1.in
 msgid "Restrict results to the given file type."
 msgstr "Restringir os resultados ao tipo de arquivo dado."
 
 #. type: Plain text
-#: amulecmd.1.in:182
+#: amulecmd.1.in
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
 msgstr "Restringir os resultados ao tipo específico de extensão. (e.g. \\ I<iso>, I<mp3>)."
 
 #. type: Plain text
-#: amulecmd.1.in:184
+#: amulecmd.1.in
 msgid "Minimum number of sources a result must report."
 msgstr "Número mínimo de fontes que um resultado tem que reportar."
 
 #. type: Plain text
-#: amulecmd.1.in:187
+#: amulecmd.1.in
 msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
 msgstr "Menor tamanho de arquivo a ser retornado. Os sufixos usam multiplicadores binários (K = 1024, M = K\\(mu1024, G = M\\(mu1024); sem sufixos significa bytes."
 
 #. type: Plain text
-#: amulecmd.1.in:189
+#: amulecmd.1.in
 msgid "Largest file size to return. Same suffixes as B<--min-size>."
 msgstr "Maior tamanho de arquivo a ser retornado. Mesmos sufixos que B<--min-size>."
 
 #. type: Plain text
-#: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
-msgstr "Exemplo: `earch global linux iso --type Iso --min-size 100M' retorna resultados para \\(lqlinux iso\\(rq do tipo de arquivo Iso com no mínimo 100 MiB."
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
+msgstr "Exemplo: 'search global linux iso --type Iso --min-size 100M' retorna resultados para 'linux iso' do tipo de arquivo Iso com no mínimo 100 MiB."
 
 #. type: Plain text
-#: amulecmd.1.in:195
+#: amulecmd.1.in
 msgid "Sets a given preferences value."
 msgstr "Configura um dado valor de preferência."
 
 #. type: Plain text
-#: amulecmd.1.in:200
+#: amulecmd.1.in
 msgid "Set bandwidth limits."
 msgstr "Ajusta a limitação de largura de banda."
 
 #. type: Plain text
-#: amulecmd.1.in:202
+#: amulecmd.1.in
 msgid "Set IPFilter preferences."
 msgstr "Configura preferências de IPFilter."
 
 #. type: Plain text
-#: amulecmd.1.in:205
+#: amulecmd.1.in
 msgid "Shows upload/download queue, servers list or shared files list."
 msgstr "Mostra a fila de upload/download, lista de servidores or lista de arquivos compartilhados."
 
 #. type: Plain text
-#: amulecmd.1.in:210
+#: amulecmd.1.in
 msgid "Show download queue."
 msgstr "Mostrar fila de download."
 
 #. type: Plain text
-#: amulecmd.1.in:212
+#: amulecmd.1.in
 msgid "Show log."
 msgstr "Mostrar o log."
 
 #. type: Plain text
-#: amulecmd.1.in:214
+#: amulecmd.1.in
 msgid "Show servers list."
 msgstr "Mostrar a lista de servidores."
 
 #. type: Plain text
-#: amulecmd.1.in:216
+#: amulecmd.1.in
 msgid "Show shared files list."
 msgstr "Mostrar a lista de arquivos compartilhados."
 
 #. type: Plain text
-#: amulecmd.1.in:218
+#: amulecmd.1.in
 msgid "Show upload queue."
 msgstr "Mostrar fila de upload."
 
 #. type: Plain text
-#: amulecmd.1.in:222
+#: amulecmd.1.in
 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 "Desliga o núcleo rodando remotamente (amule/amuled). Isto também desligará o cliente modo texto, já que este é inútil sem um núcleo rodando."
 
 #. type: Plain text
-#: amulecmd.1.in:224
+#: amulecmd.1.in
 msgid "Show statistics tree."
 msgstr "Mostra a árvore de estatísticas."
 
 #. type: Plain text
-#: amulecmd.1.in:228
-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 "O I<E<lt>numeroE<gt>> opcional na faixa de 0-255 pode ser passado como argumento para este comando, que diz quantas entradas da sub-árvore de versão do cliente deve ser mostrada. Passar 0 ou omitir significa `ilimitado'."
+#: amulecmd.1.in
+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 "O I<E<lt>numeroE<gt>> opcional na faixa de 0-255 pode ser passado como argumento para este comando, que diz quantas entradas da sub-árvore de versão do cliente devem ser mostradas. Passar 0 ou omitir significa 'ilimitado'."
 
 #. type: Plain text
-#: amulecmd.1.in:231
-msgid "Example: `statistics 5' will show only the top 5 versions for each client type."
-msgstr "Exemplo: `statistics 5' vai mostrar apenas as 5 versões mais altas para cada tipo de cliente."
+#: amulecmd.1.in
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
+msgstr "Exemplo: 'statistics 5' vai mostrar apenas as 5 versões mais altas para cada tipo de cliente."
 
 #. type: Plain text
-#: amulecmd.1.in:233
+#: amulecmd.1.in
 msgid "Show connection status, current up/download speeds, etc."
 msgstr "Mostrar o estado das conexões, velocidades atuais de upload/download, etc."
 
 #. type: SS
-#: amulecmd.1.in:238 amuleweb.1.in:141
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Languages"
 msgstr "Línguas"
 
 #. type: Plain text
-#: amulecmd.1.in:244 amuleweb.1.in:147
+#: amulecmd.1.in amuleweb.1.in
 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 "O parâmetro I<E<lt>langE<gt>> da opção B<-l> tem a seguinte forma: I<lang>B<_>I<LANG>B<.>I<encoding>B<@>I<modifier> onde I<lang> é a linguagem principal, I<LANG> é a sub-lingua/território, I<encoding> é o conjunto de caracteres a ser utilizado e I<modifier> permite ao usuário selecionar uma instância específica dos dados de localização dentro de uma única categoria."
 
 #. type: Plain text
-#: amulecmd.1.in:246 amuleweb.1.in:149
+#: amulecmd.1.in amuleweb.1.in
 msgid "For example, the following strings are valid:"
 msgstr "Por exemplo, as seguintes strings são válidas:"
 
 #. type: Plain text
-#: amulecmd.1.in:260 amuleweb.1.in:163
+#: amulecmd.1.in amuleweb.1.in
 msgid "Though all the above strings are accepted as valid language definitions, I<encoding> and I<modifier> are yet unused."
 msgstr "Apesar de todas as strings acima serem aceitas como definições de línguas válidas, I<encoding> e I<modifier> não são utilizados ainda."
 
 #. type: Plain text
-#: amulecmd.1.in:263 amuleweb.1.in:166
+#: amulecmd.1.in amuleweb.1.in
 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 "Além do formato acima, você pode também especificar nomes completos de linguagens em Inglês - deste modo B<-l german> também é válido e é igual a B<-l de_DE>."
 
 #. type: Plain text
-#: amulecmd.1.in:266 amuleweb.1.in:169
+#: amulecmd.1.in amuleweb.1.in
 msgid "When no locale is defined, either on command-line or in config file, system default language will be used."
 msgstr "Quando nenhum local está definido, seja na linha de comando ou no arquivo de configuração, a linguagem padrão do sistema será utilizada."
 
 #. type: Plain text
-#: amulecmd.1.in:268 amuleweb.1.in:177
+#: amulecmd.1.in amuleweb.1.in
 msgid "~/.aMule/remote.conf"
 msgstr "~/.aMule/remote.conf"
 
 #. type: SH
-#: amulecmd.1.in:268 amuleweb.1.in:181
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "EXEMPLO"
 
 #. type: Plain text
-#: amulecmd.1.in:270
+#: amulecmd.1.in
 msgid "Typically amulecmd will be first run as:"
 msgstr "Tipicamente, amulecmd será inicialmente rodado assim:"
 
 #. type: Plain text
-#: amulecmd.1.in:272
+#: amulecmd.1.in
 msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
 msgstr "B<amulecmd> B<-h> I<nome do anfitrião> B<-p> I<porta EC> B<-P> I<senha EC> B<-w>"
 
 #. type: Plain text
-#: amulecmd.1.in:274 amuleweb.1.in:187
+#: amulecmd.1.in amuleweb.1.in
 msgid "or"
 msgstr "ou"
 
 #. type: Plain text
-#: amulecmd.1.in:276
+#: amulecmd.1.in
 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.in:278 amuleweb.1.in:191
+#: amulecmd.1.in amuleweb.1.in
 msgid "These will save settings to I<$HOME/.aMule/remote.conf>, and later you only need to type:"
 msgstr "Estes savarão as configurações em I<$HOME/.aMule/remote.conf>, e posteriormente você só precisa digitar:"
 
 #. type: Plain text
-#: amulecmd.1.in:282
+#: amulecmd.1.in
 msgid "Of course, you don't have to follow this example."
 msgstr "Claro, você não precisa seguir este exemplo."
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "AMULED"
 msgstr "AMULED"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon v@PACKAGE_VERSION@"
 msgstr "aMule Daemon v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon"
 msgstr "aMule Daemon"
 
 #. type: Plain text
-#: amuled.1.in:6
+#: amuled.1.in
 msgid "amuled - the all-platform eMule p2p client - daemonized version"
 msgstr "amuled - o cliente p2p eMule multi-platforma - versão daemonizada"
 
 #. type: Plain text
-#: amuled.1.in:9 ../../src/utils/cas/docs/cas.1.in:11
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
 msgid "B<-c> I<E<lt>pathE<gt>>"
 msgstr "B<-c> I<E<lt>caminhoE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:11
+#: amuled.1.in
 msgid "B<-p> I<E<lt>pathE<gt>>"
 msgstr "B<-p> I<E<lt>caminhoE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:33
+#: amuled.1.in
 msgid "Forks to background."
 msgstr "Bifurca para execução em pano de fundo."
 
 #. type: TP
-#: amuled.1.in:33
+#: amuled.1.in
 #, 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>caminhoE<gt>>, B<--pid-file>=I<E<lt>caminhoE<gt>> B<>"
 
 #. type: Plain text
-#: amuled.1.in:37
+#: amuled.1.in
 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 "Após bifurcar, cria um arquivo pid no caminho I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> precisa conter o nome do arquivo."
 
 #. type: Plain text
-#: amuled.1.in:40
+#: amuled.1.in
 msgid "Configure EC (External Connections)."
 msgstr "Configura EC (Conexões Externas)."
 
 #. type: Plain text
-#: amuled.1.in:50
+#: amuled.1.in
 msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Habilida ou desabilita iniciar o amuled quando o usuário fizer login e então sair. O armazenamento específico do Sistema Operacional é selecionado automaticamente: chave Run da registry do Windows, LaunchAgent do MacOS e a entrada XDG I<.desktop> autostart no Linux."
 
 #. type: TP
-#: amuled.1.in:61
+#: amuled.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>nomeE<gt>>, B<--template>=I<E<lt>nomeE<gt>> B<>"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "AMULEGUI"
 msgstr "AMULEGUI"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI v@PACKAGE_VERSION@"
 msgstr "aMuleGUI v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
 #. type: Plain text
-#: amulegui.1.in:6
+#: amulegui.1.in
 msgid "amulegui - aMule control program with GUI"
 msgstr "amulegui - Programa de controle do aMule com IGU"
 
 #. type: Plain text
-#: amulegui.1.in:17
+#: amulegui.1.in
 msgid "B<-t> I<E<lt>numE<gt>>"
 msgstr "B<-t> I<E<lt>numE<gt>>"
 
 #. type: Plain text
-#: amulegui.1.in:27
+#: amulegui.1.in
 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> é um programa cliente, e pode ser conectado ao aMule via EC. Você pode gerenciar seu programa aMule com ele. Ele provê quase as mesmas funcionalidades que o aMule, mesmo que o núcleo trabalhe em outro computador."
 
 #. type: Plain text
-#: amulegui.1.in:42
+#: amulegui.1.in
 msgid "Skip connection dialog."
 msgstr "Pular o diálogo de conexão."
 
 #. type: Plain text
-#: amulegui.1.in:46
+#: amulegui.1.in
 msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Habilita ou desabilita iniciar o amulegui quando o usuário fizer login e sair. O armazenamento específico do Sistema Operacional é selecionado automaticamente: chave Run da registry do Windows, LaunchAgent do MacOS e a entrada XDG I<.desktop> autostart no Linux."
 
 #. type: Plain text
-#: amulegui.1.in:72
+#: amulegui.1.in
 msgid "This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm DOT orgE<gt>"
 msgstr "Esta página man foi escrita por Julien Delange para o Debian E<lt>julien AT gunnm DOT orgE<gt>"
 
 #. type: Plain text
-#: amulegui.1.in:73
+#: amulegui.1.in
 msgid "This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr "Esta página man foi reescrita por Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "AMULEWEB"
 msgstr "AMULEWEB"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "aMule webserver v@PACKAGE_VERSION@"
 msgstr "aMule webserver v@PACKAGE_VERSION@"
 
 #. type: Plain text
-#: amuleweb.1.in:6
+#: amuleweb.1.in
 msgid "amuleweb - aMule web server"
 msgstr "amuleweb - servidor web de aMule"
 
 #. type: Plain text
-#: amuleweb.1.in:15
+#: amuleweb.1.in
 msgid "B<-l> I<E<lt>langE<gt>>"
 msgstr "B<-l> I<E<lt>línguaE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:18
+#: amuleweb.1.in
 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
-#: amuleweb.1.in:20
+#: amuleweb.1.in
 msgid "B<-U> I<E<lt>portE<gt>>"
 msgstr "B<-U> I<E<lt>portaE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:24
+#: amuleweb.1.in
 msgid "B<-A> I<E<lt>passwordE<gt>> B<-G> I<E<lt>passwordE<gt>>"
 msgstr "B<-A> I<E<lt>senhaE<gt>> B<-G> I<E<lt>senhaE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:40
+#: amuleweb.1.in
 msgid "B<--amule-config-file>=I<E<lt>pathE<gt>>"
 msgstr "B<--amule-config-file>=I<E<lt>caminhoE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:46
+#: amuleweb.1.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr "B<DEPRECATED:> amuleweb está deprecado e pode ser removido no aMule 3.2 ou posterior. Não está removido ainda; considere migrar para amuleapi, que é a  API REST/SSE."
+
+#. type: Plain text
+#: amuleweb.1.in
 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> gerencia seu acesso ao aMule através de um navegador web. Você pode iniciar o amuleweb junto com o B<amule>(1), ou separadamente, a qualquer momento depois. As opções podem ser especificadas via linha de comando ou via arquivo de configuração. Opções de linha de comando têm precedência sobre opções de arquivo de configuração."
 
 #. type: TP
-#: amuleweb.1.in:74
+#: amuleweb.1.in
 #, 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
-#: amuleweb.1.in:77
+#: amuleweb.1.in
 msgid "Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section for details."
 msgstr "Carrega o template chamado I<E<lt>nomeE<gt>>. Veja a seção B<SKIN SUPPORT> para detalhes."
 
 #. type: TP
-#: amuleweb.1.in:77
+#: amuleweb.1.in
 #, 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
-#: amuleweb.1.in:80
+#: amuleweb.1.in
 msgid "Webserver's HTTP port. This is the port you must point your browser to (default: I<4711>)."
 msgstr "Porta HTTP do servidor web. Esta é a porta para a qual você precisa apontar seu navegador web (padrão: I<4711>)."
 
 #. type: Plain text
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 msgid "Enable UPnP."
 msgstr "Habilita UPnP."
 
 #. type: TP
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 #, 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
-#: amuleweb.1.in:87
+#: amuleweb.1.in
 msgid "UPnP port."
 msgstr "Porta UPnP."
 
 #. type: Plain text
-#: amuleweb.1.in:90
+#: amuleweb.1.in
 msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
 msgstr "Habilita o uso de compressão gzip em tráfego HTTP para poupar largura de banda."
 
 #. type: Plain text
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 msgid "Disables using gzip compression (this is the default)."
 msgstr "Desabilita o uso de compressão gzip (este é o padrão)."
 
 #. type: TP
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 #, 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>senhaE<gt>>, B<--admin-pass>=I<E<lt>senhaE<gt>> B<>"
 
 #. type: Plain text
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 msgid "Full access password for webserver."
 msgstr "Senha de acesso total para o servidor web."
 
 #. type: TP
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 #, 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>senhaE<gt>>, B<--guest-pass>=I<E<lt>senhaE<gt>> B<>"
 
 #. type: Plain text
-#: amuleweb.1.in:99
+#: amuleweb.1.in
 msgid "Guest password for webserver."
 msgstr "Senha do convidado para o servidor web."
 
 #. type: Plain text
-#: amuleweb.1.in:102
+#: amuleweb.1.in
 msgid "Allows guest access."
 msgstr "Permite acesso do convidado."
 
 #. type: Plain text
-#: amuleweb.1.in:105
+#: amuleweb.1.in
 msgid "Denies guest access (default)."
 msgstr "Nega acesso ao convidado (padrão)."
 
 #. type: Plain text
-#: amuleweb.1.in:111
+#: amuleweb.1.in
 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 "Carrega/salva a configuração do servidor web de/para o aMule remoto. Isto faz com que o amuleweb ignore configurações de linha de comando e de arquivo de configuração, e as carrega do aMule. Quando estiver salvando as preferências, nenhuma será escrita no arquivo de configuração, e sim para o aMule. (Claro que isto funciona apenas para as configurações que podem ser configuradas nas Preferências-E<gt>Controles Remotos do aMule.)"
 
 #. type: Plain text
-#: amuleweb.1.in:114
+#: amuleweb.1.in
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Desabilitar o interpretador PHP (obsoleto)"
 
 #. type: Plain text
-#: amuleweb.1.in:117
+#: amuleweb.1.in
 msgid "Recompiles PHP pages on each request."
 msgstr "Recompila as páginas PHP a cada pedido."
 
 #. type: TP
-#: amuleweb.1.in:130
+#: amuleweb.1.in
 #, no-wrap
 msgid "B< --amule-config-file>=I<E<lt>pathE<gt>> B<>"
 msgstr "B< --amule-config-file>=I<E<lt>caminhoE<gt>> B<>"
 
 #. type: Plain text
-#: amuleweb.1.in:136
+#: amuleweb.1.in
 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 "Caminho do arquivo de configuração do aMule.  B<NÃO USE DIRETAMENTE!> aMule usa esta opção quando inicia o amuleweb na inicialização. Esta opção faz com que todas as outras opções de linha de comando e de arquivo de configuração sejam ignoradas, preferências sejam lidas do arquivo de configuração dado, e também impica na escolha das opções B<-q -L>."
 
 #. type: SH
-#: amuleweb.1.in:169
+#: amuleweb.1.in
 #, no-wrap
 msgid "SKIN SUPPORT"
 msgstr "SUPORTE À PELES"
 
 #. type: Plain text
-#: amuleweb.1.in:173
+#: amuleweb.1.in
 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> é capaz de mostrar informação em peles diferentes. Estas peles são chamadas \"templates\", e você pode fazer o amuleweb carregar um template específico através da opção de linha de comando B<-t>. Templates são procurados em dois locais: primeiro em I<~/.aMule/webserver/> e depois em I</usr/share/amule/webserver/> se você instalou com --prefix=/usr."
 
 #. type: Plain text
-#: amuleweb.1.in:175
+#: amuleweb.1.in
 msgid "Each template must be in a subdirectory of the template name, and this directory must contain all files the template needs."
 msgstr "Cada template precisa estar em um subdiretório do nome do template, e este diretório precisa conter todos os arquivos que o template necessita."
 
 #. type: Plain text
-#: amuleweb.1.in:179
+#: amuleweb.1.in
 msgid "~/.aMule/webserver/"
 msgstr "~/.aMule/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:181
+#: amuleweb.1.in
 msgid "I<$(pkgdatadir)>/webserver/"
 msgstr "I<$(pkgdatadir)>/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:183
+#: amuleweb.1.in
 msgid "Typically amuleweb will be first run as:"
 msgstr "Tipicamente o amuleweb será rodado primeiro assim:"
 
 #. type: Plain text
-#: amuleweb.1.in:185
+#: amuleweb.1.in
 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.in:189
+#: amuleweb.1.in
 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.in:195
+#: amuleweb.1.in
 msgid "Of course, you may specify any more or less options on the first example line, and you may also totally omit it."
 msgstr "Claro que você pode especificar quaisquer opções a mais ou a menos na primeira linha de exemplo, e você pode também omiti-las totalmente."
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "ED2K"
 msgstr "ED2K"
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "aMule eD2k link parser v1.5.1"
 msgstr "aMule eD2k link parser v1.5.1"
 
 #. type: Plain text
-#: ed2k.1.in:6
+#: ed2k.1.in
 msgid "ed2k - aMule eD2k link parser"
 msgstr "ed2k - aMule eD2k link parser"
 
 #. type: Plain text
-#: ed2k.1.in:10
+#: ed2k.1.in
 msgid "B<-c> I<E<lt>pathE<gt>> B<-t> I<E<lt>numE<gt>>"
 msgstr "B<-c> I<E<lt>caminhoE<gt>> B<-t> I<E<lt>numE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:13
+#: ed2k.1.in
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr "I<E<lt>eD2k-linkE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:21
+#: ed2k.1.in
 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 "Manda o I<E<lt>link eD2kE<gt>> dado para o aMule, i.e. escreve ele no arquivo ~/.aMule/ED2KLinks, o qual será conferido pelo aMule a cada segundo para links novos."
 
 #. type: TP
-#: ed2k.1.in:24
+#: ed2k.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>nomeE<gt>>, B<--template>=I<E<lt>nomeE<gt>> B<>"
 
 #. type: Plain text
-#: ed2k.1.in:28
+#: ed2k.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
 msgstr "Categoria de conjunto para links eD2k passados para I<E<lt>numE<gt>>. Ao contrário de B<--config-dir>, o parser lê os valores como o próximo argumento e não aceita a sintaxe B<--category>=I<E<lt>numE<gt>>."
 
 #. type: Plain text
-#: ed2k.1.in:31
+#: ed2k.1.in
 msgid "Loads all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "Carrega todos os links encontrados na emulecollection dada como I<E<lt>link ed2kE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:34
+#: ed2k.1.in
 msgid "Lists all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "Lista todos os links encontrados na emulecollection dada como I<E<lt>link ed2kE<gt>>"
 
+#. type: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< link eD2k >"
+
 #. type: Plain text
-#: ed2k.1.in:54
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr "Adiciona um link eD2k ao núcleo."
+
+#. type: Plain text
+#: ed2k.1.in
 msgid "a magnet link;"
 msgstr "um link magnético;"
 
 #. type: Plain text
-#: ed2k.1.in:56
+#: ed2k.1.in
 msgid "an emulecollection file."
 msgstr "um arquivo de emulecollection."
 
 #. type: Plain text
-#: ed2k.1.in:61
+#: ed2k.1.in
 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 ordem na qual você dá os parâmetros é importante.> Você pode dar mais de um link, e todo link pode ter seus próprios parâmetros. Por exemplo B<ed2k E<lt>link1E<gt> -t2 E<lt>link2E<gt>> vai baixar I<E<lt>link1E<gt>> na categoria padrão e I<E<lt>link2E<gt>> na categoria 2."
 
 #. type: Plain text
-#: ed2k.1.in:63
+#: ed2k.1.in
 msgid "~/.aMule/ED2KLinks"
 msgstr "~/.aMule/ED2KLinks"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "ALC"
 msgstr "ALC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "aLinkCreator"
 msgstr "aLinkCreator"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 msgid "aLinkCreator - the aMule eD2k link creator"
 msgstr "aLinkCreator - o criador de links eD2k do aMule"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:9
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 msgid "B<alc> is a graphical utility to create an eD2k link to any file on your computer."
 msgstr "B<alc> é um utilitário gráfico para criar um link eD2k para qualquer arquivo em seu computador."
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This app doesn't take any arguments."
 msgstr "Esta aplicação não recebe argumentos."
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "ALCC"
 msgstr "ALCC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "aMule eD2k links calculator"
 msgstr "Calculador de links eD2k do aMule"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "alcc - text based eD2k links calculator for aMule"
 msgstr "alcc - calculador de links eD2k do aMule modo texto (console)"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "I<E<lt>inputfiles_listE<gt>>"
 msgstr "I<E<lt>lista_de_arquivos_de_entradaE<gt>>"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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 "Calcula os links eD2k de todos os arquivos de entrada dados na I<E<lt>inputfiles_listE<gt>> (pode haver mais de um arquivo)."
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Compute and add part hashes to the computed eD2k links."
 msgstr "Calcula e soma hashes de parte aos links eD2k calculados."
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Be verbose - show also calculation steps."
 msgstr "Seja verboso - mostre também os passos de cálculo."
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "CAS"
 msgstr "CAS"
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "cas v0.8"
 msgstr "cas v0.8"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "cas - c aMule statistics"
 msgstr "cas - estatísticas do aMule em C"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:18
+#: ../../src/utils/cas/docs/cas.1.in
 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> é um programa para mostrar o conteúdo de seu arquivo de assinaturas online do aMule no console (em um formato legível para humanos). Para funcionar, você precisa habilitar a opção \"Assinatura Online\" nas preferências de aMule."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:23
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
 msgstr "Escreve a imagem da assinatura on-line. A forma longa B<--picture> aceita um parâmetro opcional I<=E<lt>PATHE<gt>> para especificar o local de saída; as formas curtas B<-o> / B<-P> não (B<-P> requer que imediatamente siga um argumento I<E<lt>PATHE<gt>>, e B<-o> é uma chave sem argumento). Requer suporte GD compilado em (I<__GD__>); esta opção é silenciosamente ignorada, caso contrário."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
 msgstr "Página HTML com estatísticas e imagem. A forma longa B<--html> aceita uma chave opcional I<=E<lt>PATHE<gt>> para especificar o local de saída; as formas curtas B<-p> / B<-H> não (B<-H> requer um argumento I<E<lt>PATHE<gt>> imediatamente seguinte, e B<-p> é uma chave sem argumentos)."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:35
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Without any options, it prints online signature data to stdout."
 msgstr "Sem opção alguma, ele imprime os dados da assinatura online em stdout."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:37
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
 msgstr "B<cas> foi escrito por Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:39
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "~/.aMule/casrc"
 msgstr "~/.aMule/casrc"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:41
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
 msgstr "aMule-online-sign.png (or .jpg, quando B<-o> / B<--picture> for usado e GD estiver disponível)"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
 msgstr "aMule-online-sign.html (quando B<-p> / B<--html> for usado)"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "WXCAS"
 msgstr "WXCAS"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "wxCas"
 msgstr "wxCas"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "wxcas - wx c aMule statistics"
 msgstr "wxcas - estatísticas do aMule em wx + C"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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> é um programa para mostrar o conteúdo de seu arquivo de assinaturas online em uma bonita janela em seu Desktop.  Para funcionar, você precisa habilitar a opção \"Assinatura Online\" na preferências de aMule."
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:14
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish E<lt>thepolish@vipmail.ruE<gt>"
 msgstr "Baseado em B<cas>(1) de Pedro de Oliveira. B<wxcas> foi escrito por ThePolish E<lt>thepolish@vipmail.ruE<gt>"
 
+#~ msgid "Shows the progress of an on-going search."
+#~ msgstr "Mostra o progresso de uma busca em andamento."
+
+#~ msgid "Shows you the results of the last search."
+#~ msgstr "Mostra os resultados da última busca."
+
 #~ 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 "Escreve a imagem da assinatura online. Você pode opcionalmente anexar I<=E<lt>PATHE<gt>> a essa opção, para especificar o local onde ela deve ser escrita."

amule-3.0.1.tar.gz/docs/man/po/manpages-ro.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-ro.po Changed

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-18 22:06+0000\n"
+"POT-Creation-Date: 2026-08-24 19:02+0200\n"
+"PO-Revision-Date: 2026-09-20 21:09+0000\n"
 "Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n"
 "Language-Team: Romanian <kde-i18n-doc@kde.org>\n"
 "Language: ro\n"
@@ -17,1357 +17,1392 @@
 "X-Generator: Poedit 2.0.2\n"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "AMULE"
 msgstr "AMULE"
 
 #. type: TH
-#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
-#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "@MAN_DATE@"
 msgstr "@MAN_DATE@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule v@PACKAGE_VERSION@"
 msgstr "aMule v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule"
 msgstr "aMule"
 
 #. type: SH
-#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
-#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
-#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "NAME"
 msgstr "NUME"
 
 #. type: Plain text
-#: amule.1.in:6
+#: amule.1.in
 msgid "amule - the all-platform eMule p2p client"
 msgstr "amule - client eMule p2p pentru toate platformele"
 
 #. type: SH
-#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
-#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
-#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "REZUMAT"
 
 #. type: Plain text
-#: amule.1.in:10 amulegui.1.in:10
+#: amule.1.in amulegui.1.in
 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.in:14 amuled.1.in:16
+#: amule.1.in amuled.1.in
 msgid "B<-w> I<E<lt>pathE<gt>>"
 msgstr "B<-w> I<E<lt>pathE<gt>>"
 
 #. type: Plain text
-#: amule.1.in:18 amuled.1.in:20
-msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
+#: amule.1.in amuled.1.in
+#, fuzzy
+#| msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
 msgstr "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
 
 #. type: SH
-#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
-#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
-#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIERE"
 
 #. type: TP
-#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
-#: ../../src/utils/cas/docs/cas.1.in:30
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Read config from I<E<lt>pathE<gt>> instead of home"
 msgstr "Citește configurarea din I<E<lt>pathE<gt>> în schimb de acasă"
 
 #. type: TP
-#: amule.1.in:29 amulegui.1.in:30
+#: amule.1.in amulegui.1.in
 #, 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.in:32 amulegui.1.in:33
+#: amule.1.in amulegui.1.in
 msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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 "Configurează geometria aplicației. I<E<lt>geomE<gt>> utilizează același format ca standard X11 apps:\tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Prints log messages to stdout."
 msgstr "Tipărește jurnalul de mesaje la stdout."
 
 #. type: Plain text
-#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Resets config to default values."
 msgstr "Resetare configurări la valorile implicite."
 
 #. type: Plain text
-#: amule.1.in:42
+#: amule.1.in
 msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: TP
-#: amule.1.in:42 amuled.1.in:50
+#: amule.1.in amuled.1.in
 #, 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.in:45 amuled.1.in:53
+#: amule.1.in amuled.1.in
 msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
 msgstr "Specificați locația fișierului binar amuleweb la I<E<lt>pathE<gt>>."
 
 #. type: Plain text
-#: amule.1.in:50 amuled.1.in:58 amulegui.1.in:51
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Does not disable stdin."
 msgstr "Nu dezactiva stdin."
 
 #. type: TP
-#: amule.1.in:53 amulegui.1.in:54
+#: amule.1.in amulegui.1.in
 #, 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.in:56 amuled.1.in:64 amulegui.1.in:57
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
 msgstr "Configurați categoria pentru link-urile eD2k trecute la I<E<lt>numE<gt>>"
 
 #. type: Plain text
-#: amule.1.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
-#: amuleweb.1.in:130 ed2k.1.in:40
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
 msgid "Displays the current version number."
 msgstr "Afișează numărul versiunii curente."
 
 #. type: Plain text
-#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
-#: amuleweb.1.in:127 ed2k.1.in:37
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
-#: ../../src/utils/cas/docs/cas.1.in:33
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Prints a short usage description."
 msgstr "Tipărește o scurtă descriere de utilizare."
 
 #. type: TP
-#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
-#, no-wrap
-msgid "B< eD2k-link >"
+#: amule.1.in amuled.1.in
+#, fuzzy, no-wrap
+#| msgid "B< eD2k-link >"
+msgid "B< eD2k-link | collection-file >"
 msgstr "B< eD2k-link >"
 
 #. type: Plain text
-#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
-msgid "Adds an eD2k-link to the core."
-msgstr "Adaugă o legătură eD2k la nucleu."
+#: amule.1.in amuled.1.in
+#, fuzzy
+#| msgid "Adds an eD2k-link or a magnet-link to the core."
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
+msgstr "Adaugă la nucleu o legătură eD2k sau o legătură magnet."
 
 #. type: Plain text
-#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "The eD2k link to be added can be:"
 msgstr "Link-ul eD2k de adăugat poate fi:"
 
 #. type: Plain text
-#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
 msgstr "un link fișier (ed2k://|file|...), va fi adăugat la coada descărcărilor;"
 
 #. type: Plain text
-#: amule.1.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a server link (ed2k://|server|...), it will be added to the server list;"
 msgstr "o legătură server (ed2k://|server|...), care va fi adăugată la lista serverelor;"
 
 #. type: Plain text
-#: amule.1.in:74 amuled.1.in:82 ed2k.1.in:52
+#: amule.1.in amuled.1.in ed2k.1.in
 msgid "a serverlist link, in which case all servers in the list will be added to the server list;"
 msgstr "o legătură listă server, în care caz toate serverele din listă vor fi adăugate la lista serverelor;"
 
 #. type: Plain text
-#: amule.1.in:76 amuled.1.in:84
+#: amule.1.in amuled.1.in
 msgid "a magnet link."
 msgstr "o legătură magnet."
 
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr ""
+
 #. type: SH
-#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "NOTES"
 msgstr "NOTE"
 
 #. type: SS
-#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Paths"
 msgstr "Căi"
 
 #. type: Plain text
-#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 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 "Pentru toate opțiunile care iau o I<E<lt>pathE<gt>> valoare, dacă I<path> nu conține nici o parte a unui director (ex. doar un nume de fișier simplu), atunci se consideră a fi sub directorul de configurare aMule, I<~/.aMule>."
 
 #. type: SH
-#: amule.1.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
-#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "FILES"
 msgstr "FIȘIERE"
 
 #. type: Plain text
-#: amule.1.in:84 amuled.1.in:87
+#: amule.1.in amuled.1.in
 msgid "~/.aMule/*"
 msgstr "~/.aMule/*"
 
 #. type: SH
-#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
-#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
-#: ../../src/utils/cas/docs/cas.1.in:43
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr "RAPORTAREA ERORILOR"
 
 #. type: Plain text
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member."
 msgstr "Vă rugăm să raportați erorile fie pe forumul  nostru(I<https://github.com/amule-org/amule/discussions>), sau în bugtracker-ul nostru (I<https://github.com/amule-org/amule/issues>). Nu raportați erorile pe email, nici la lista noastră de adrese nici direct la nici un membru al echipei."
 
 #. type: SH
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "DREPT DE AUTOR"
 
 #. type: Plain text
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "aMule and all of its related utilities are distributed under the GNU General Public License."
 msgstr "aMule și toate utilitarele conexe sunt distribuite sub GNU General Public License."
 
 #. type: SH
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VEDEȚI ȘI"
 
 #. type: SH
-#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
-#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
-#: ../../src/utils/cas/docs/cas.1.in:50
-#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
-#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
-#: ../../src/utils/cas/docs/cas.1.in:51
-#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr "Această pagină manual a fost scrisă de Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "AMULECMD"
 msgstr "AMULECMD"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "aMuleCmd v@PACKAGE_VERSION@"
 msgstr "aMuleCmd v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "aMule utilities"
 msgstr "utilitare aMule"
 
 #. type: Plain text
-#: amulecmd.1.in:7
+#: amulecmd.1.in
 msgid "amulecmd - Console-based program to control aMule"
 msgstr "amulecmd - Program bazat pe terminal pentru controlat aMule"
 
 #. type: Plain text
-#: amulecmd.1.in:13 amuleweb.1.in:12
+#: amulecmd.1.in amuleweb.1.in
 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.in:17
+#: amulecmd.1.in
 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.in:20 amuleweb.1.in:31
+#: amulecmd.1.in amuleweb.1.in
 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.in:29
+#: amulecmd.1.in
 msgid "B<amulecmd> is a console-based client to control aMule."
 msgstr "B<amulecmd> este un client bazat pe terminal pentru a controla aMule."
 
 #. type: TP
-#: amulecmd.1.in:29 amuleweb.1.in:46
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
 msgstr "Gazda unde rulează aMule (implicit: I<127.0.0.1>).  I<E<lt>hostE<gt>> ar putea fi o adresă IP sau un nume DNS"
 
 #. type: TP
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 msgid "aMule's port for External Connections, as set in Preferences-E<gt>Remote Controls (default: I<4712>)"
 msgstr "Portul aMule pentru conexiuni externe, cum este configurat în Preferințe-E<gt>Control la distanță (implicit: I<4712>)"
 
 #. type: TP
-#: amulecmd.1.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 msgid "External Connections password."
 msgstr "Parolă conexiuni externe."
 
 #. type: TP
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:43 amuleweb.1.in:60
+#: amulecmd.1.in amuleweb.1.in
 msgid "Use the given configuration file.  Default configuration file is I<~/.aMule/remote.conf>"
 msgstr "Utilizează fișierul de configurare dat. Fișierul de configurare implicit este I<~/.aMule/remote.conf>"
 
 #. type: Plain text
-#: amulecmd.1.in:46 amuleweb.1.in:63
+#: amulecmd.1.in amuleweb.1.in
 msgid "Do not print any output to stdout."
 msgstr "Nu tipării nici o ieșire la stdout."
 
 #. type: Plain text
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 msgid "Be verbose - show also debug messages."
 msgstr "Fi detaliat - arată și mesajele de depanare."
 
 #. type: TP
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:54 amuleweb.1.in:71
+#: amulecmd.1.in amuleweb.1.in
 msgid "Sets program locale (language).  See the B<NOTES> section for the description of the I<E<lt>langE<gt>> parameter."
 msgstr "Configurați localizarea aplicației (limba). Vedeți secțiunea B<NOTES> pentru descrierea parametrului I<E<lt>langE<gt>> ."
 
 #. type: Plain text
-#: amulecmd.1.in:57 amuleweb.1.in:74
+#: amulecmd.1.in amuleweb.1.in
 msgid "Write command line options to config file and exit"
 msgstr "Scrie opțiunile liniei de comandă în fișierul de configurare și ieși"
 
 #. type: TP
-#: amulecmd.1.in:57
+#: amulecmd.1.in
 #, 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.in:60
+#: amulecmd.1.in
 msgid "Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and exit."
 msgstr "Execută I<E<lt>commandE<gt>> ca și cum ar fi fost introdusă în terminalul amulecmd și ieși."
 
 #. type: TP
-#: amulecmd.1.in:60 amuleweb.1.in:117
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:63 amuleweb.1.in:120
+#: amulecmd.1.in amuleweb.1.in
 msgid "Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid aMule config file, and then exit."
 msgstr "Creează fișierul de configurare bazat pe I<E<lt>pathE<gt>>, care trebuie să indice la un fișier de configurare aMule valid, iar apoi ieși."
 
 #. type: Plain text
-#: amulecmd.1.in:67 amuleweb.1.in:124
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
 msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
 msgstr ""
 
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.  Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output."
+msgstr ""
+
 #. type: SH
-#: amulecmd.1.in:73
+#: amulecmd.1.in
 #, no-wrap
 msgid "COMMANDS"
 msgstr "COMENZI"
 
 #. type: Plain text
-#: amulecmd.1.in:75
+#: amulecmd.1.in
 msgid "All commands are case insensitive."
 msgstr "toate comenzile nu sunt sensibile la majuscule."
 
 #. type: Plain text
-#: amulecmd.1.in:77
+#: amulecmd.1.in
 msgid "Adds an eD2k-link or a magnet-link to the core."
 msgstr "Adaugă la nucleu o legătură eD2k sau o legătură magnet."
 
 #. type: Plain text
-#: amulecmd.1.in:86
+#: amulecmd.1.in
 msgid "a serverlist link, in which case all servers in the list will be added to the server list."
 msgstr "un link listă server, în care caz toate serverele din listă vor fi adăugate la lista serverelor."
 
 #. type: Plain text
-#: amulecmd.1.in:89
+#: amulecmd.1.in
 msgid "The magnet link must contain the eD2k hash and file length."
 msgstr "Legătura magnet trebuie să conțină indexul eD2k și lungimea fișierului."
 
 #. type: Plain text
-#: amulecmd.1.in:91
+#: amulecmd.1.in
 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 "Anulează descărcarea specificată de I<E<lt>hashE<gt>> sau I<E<lt>numberE<gt>>. Pentru a obține valoarea utilizați  B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:93
+#: amulecmd.1.in
 msgid "Connect to the network."
 msgstr "Conectare la rețea."
 
 #. type: Plain text
-#: amulecmd.1.in:95
+#: amulecmd.1.in
 msgid "This will connect to all networks that are enabled in Preferences."
 msgstr "Aceasta va conecta la toate rețelele care sunt activate în preferințe."
 
 #. type: Plain text
-#: amulecmd.1.in:99
+#: amulecmd.1.in
 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 "Cu parametrii facultativi puteți specifica la care rețea să se conecteze. Dând o adresă pentru server în forma IP:Port (unde IP este fie o adresă zecimală IPv4 sau un nume DNS rezolvabil) aMule se va conecta numai la acel server."
 
 #. type: Plain text
-#: amulecmd.1.in:102
+#: amulecmd.1.in
 msgid "Disconnect from all networks you are connected to, or just disconnect from the specified network."
 msgstr "Deconectați de la toate rețelele la care sunteți conectat, sau doar deconectați de la rețeaua specificată."
 
 #. type: Plain text
-#: amulecmd.1.in:104
+#: amulecmd.1.in
 msgid "Start downloading a file."
 msgstr "Pornește descărcarea unui fișier."
 
 #. type: Plain text
-#: amulecmd.1.in:108
-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 "Un I<E<lt>numberE<gt>> a unui fișier de la ultima căutare trebuie dat. Exemplu: `descărcarea 12' va porni descărcarea fișierului cu numărul 12 al căutării anterioare."
+#: amulecmd.1.in
+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 "Un I<E<lt>numberE<gt>> a unui fișier de la ultima căutare trebuie dat. Exemplu: 'descărcarea 12' va porni descărcarea fișierului cu numărul 12 al căutării anterioare."
 
 #. type: Plain text
-#: amulecmd.1.in:110
+#: amulecmd.1.in
 msgid "Disconnect from amule/amuled and quit amulecmd."
 msgstr "Deconectează de la amule/amuled și termină amulecmd."
 
 #. type: Plain text
-#: amulecmd.1.in:112
+#: amulecmd.1.in
 msgid "Get and display a preference value."
 msgstr "Ia și afișează o valoare preferată."
 
 #. type: Plain text
-#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>whatE<gt>>:"
 msgstr "Valori disponibile pentru I<E<lt>whatE<gt>>:"
 
 #. type: Plain text
-#: amulecmd.1.in:117
+#: amulecmd.1.in
 msgid "Get bandwidth limits."
 msgstr "Ia limitele lățimii de bandă."
 
 #. type: Plain text
-#: amulecmd.1.in:119
+#: amulecmd.1.in
 msgid "Get IPFilter preferences."
 msgstr "Ia preferințele filtrului IP."
 
 #. type: Plain text
-#: amulecmd.1.in:124
+#: amulecmd.1.in
 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 "Tipărește o scurtă descriere a utilizării. Dacă este adresată fără nici un parametru, va arăta o listă a comenzilor disponibile. Dacă este adresată cu I<E<lt>commandE<gt>>, va arăta o scurtă descriere a comenzii date."
 
 #. type: Plain text
-#: amulecmd.1.in:126
+#: amulecmd.1.in
 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 "Pauzează descărcarea specificată de I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. Pentru a obține valoarea utilizați B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:128
+#: amulecmd.1.in
 msgid "Set priority of a download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>."
 msgstr "Configurați prioritatea unei descărcări cu I<E<lt>hashE<gt>> sau I<E<lt>numberE<gt>>."
 
 #. type: Plain text
-#: amulecmd.1.in:130
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>priorityE<gt>>:"
 msgstr "Valori disponibile pentru I<E<lt>priorityE<gt>>:"
 
 #. type: Plain text
-#: amulecmd.1.in:133
+#: amulecmd.1.in
 msgid "Automatic priority."
 msgstr "Prioritate automată."
 
 #. type: Plain text
-#: amulecmd.1.in:135
+#: amulecmd.1.in
 msgid "High priority."
 msgstr "Prioritate înaltă."
 
 #. type: Plain text
-#: amulecmd.1.in:137
+#: amulecmd.1.in
 msgid "Low priority."
 msgstr "Prioritate scăzută."
 
 #. type: Plain text
-#: amulecmd.1.in:139
+#: amulecmd.1.in
 msgid "Normal priority."
 msgstr "Prioritate normală."
 
 #. type: Plain text
-#: amulecmd.1.in:142
-msgid "Shows the progress of an on-going search."
-msgstr "Arată progresul unei căutări în desfășurare."
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:144
+#: amulecmd.1.in
 #, fuzzy
 #| msgid "A synonim of the B<exit> command."
 msgid "A synonym of the B<exit> command."
 msgstr "Un sinonim a comenzii B<exit> ."
 
 #. type: Plain text
-#: amulecmd.1.in:146
+#: amulecmd.1.in
 msgid "Reloads a given object."
 msgstr "Reâncarcă un obiect dat."
 
 #. type: Plain text
-#: amulecmd.1.in:151
+#: amulecmd.1.in
 msgid "Reload shared files list."
 msgstr "Reâncarcă lista fișierelor partajate."
 
 #. type: Plain text
-#: amulecmd.1.in:153
+#: amulecmd.1.in
 msgid "Reload IP filter tables."
 msgstr "Reâncarcă tabelele filtrului IP."
 
 #. type: Plain text
-#: amulecmd.1.in:156
+#: amulecmd.1.in
 msgid "Reset the log."
 msgstr "Resetează jurnalul."
 
 #. type: Plain text
-#: amulecmd.1.in:158
-msgid "Shows you the results of the last search."
-msgstr "Arată rezultatele ultimei căutări."
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:160
+#: amulecmd.1.in
 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 "Reia descărcarea specificată de I<E<lt>hashE<gt>> sau I<E<lt>numberE<gt>>. Pentru a obține valoarea utilizați B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:164
-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 "Face o căutare a cuvântului cheie dat I<E<lt>keywordE<gt>>. Un tip de căutare și un un cuvânt cheie sunt obligatorii pentru a face asta. Exemplu: `caută kad amule' efectuează o căutare kad pentru `amule'."
+#: amulecmd.1.in
+#, fuzzy
+#| 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'."
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
+msgstr "Face o căutare a cuvântului cheie dat I<E<lt>keywordE<gt>>. Un tip de căutare și un un cuvânt cheie sunt obligatorii pentru a face asta. Exemplu: 'caută kad amule' efectuează o căutare kad pentru 'amule'."
 
 #. type: Plain text
-#: amulecmd.1.in:166
+#: amulecmd.1.in
 msgid "Available search types:"
 msgstr "Tipuri de căutări disponibile:"
 
 #. type: Plain text
-#: amulecmd.1.in:169
+#: amulecmd.1.in
 msgid "Performs a global search."
 msgstr "Efectuează o căutare globală."
 
 #. type: Plain text
-#: amulecmd.1.in:171
+#: amulecmd.1.in
 msgid "Performs a search on the Kademlia network."
 msgstr "Efectuează o căutare în rețeaua Kademlia."
 
 #. type: Plain text
-#: amulecmd.1.in:173
+#: amulecmd.1.in
 msgid "Performs a local search."
 msgstr "Efectuează o căutare locală."
 
 #. type: Plain text
-#: amulecmd.1.in:177
+#: amulecmd.1.in
 msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:180
+#: amulecmd.1.in
 msgid "Restrict results to the given file type."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:182
+#: amulecmd.1.in
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:184
+#: amulecmd.1.in
 msgid "Minimum number of sources a result must report."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:187
+#: amulecmd.1.in
 msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:189
+#: amulecmd.1.in
 msgid "Largest file size to return. Same suffixes as B<--min-size>."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:195
+#: amulecmd.1.in
 msgid "Sets a given preferences value."
 msgstr "Configurați o valoare a preferințelor date."
 
 #. type: Plain text
-#: amulecmd.1.in:200
+#: amulecmd.1.in
 msgid "Set bandwidth limits."
 msgstr "Configurare limite lățime de bandă."
 
 #. type: Plain text
-#: amulecmd.1.in:202
+#: amulecmd.1.in
 msgid "Set IPFilter preferences."
 msgstr "Configurare preferințe filtru IP."
 
 #. type: Plain text
-#: amulecmd.1.in:205
+#: amulecmd.1.in
 msgid "Shows upload/download queue, servers list or shared files list."
 msgstr "Arată coada încărcărilor/descărcărilor, lista serverelor sau lista fișierelor partajate."
 
 #. type: Plain text
-#: amulecmd.1.in:210
+#: amulecmd.1.in
 msgid "Show download queue."
 msgstr "Arată coada descărcărilor."
 
 #. type: Plain text
-#: amulecmd.1.in:212
+#: amulecmd.1.in
 msgid "Show log."
 msgstr "Arată jurnalul."
 
 #. type: Plain text
-#: amulecmd.1.in:214
+#: amulecmd.1.in
 msgid "Show servers list."
 msgstr "Arată lista serverelor."
 
 #. type: Plain text
-#: amulecmd.1.in:216
+#: amulecmd.1.in
 #, fuzzy
 #| msgid "Reload shared files list."
 msgid "Show shared files list."
 msgstr "Reâncarcă lista fișierelor partajate."
 
 #. type: Plain text
-#: amulecmd.1.in:218
+#: amulecmd.1.in
 msgid "Show upload queue."
 msgstr "Arată coada încărcărilor."
 
 #. type: Plain text
-#: amulecmd.1.in:222
+#: amulecmd.1.in
 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 "Închide nucleul distant care rulează (amule/amuled). Aceasta va închide de asemenea clientul text, deoarece este inutilizabil fără un nucleu care rulează."
 
 #. type: Plain text
-#: amulecmd.1.in:224
+#: amulecmd.1.in
 msgid "Show statistics tree."
 msgstr "Arată arborele statisticilor."
 
 #. type: Plain text
-#: amulecmd.1.in:228
-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 "Numărul facultativ I<E<lt>numberE<gt>> în domeniul 0-255 poate fi trecut ca argument la această comandă, care spune cât de multe intrări de subdiviziuni a versiunii clientului vor fi afișate. Trecând 0, sau lăsând gol va însemna `nelimitat'."
+#: amulecmd.1.in
+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 "Numărul facultativ I<E<lt>numberE<gt>> în domeniul 0-255 poate fi trecut ca argument la această comandă, care spune cât de multe intrări de subdiviziuni a versiunii clientului vor fi afișate. Trecând 0, sau lăsând gol va însemna 'nelimitat'."
 
 #. type: Plain text
-#: amulecmd.1.in:231
-msgid "Example: `statistics 5' will show only the top 5 versions for each client type."
-msgstr "Exemplu: `statistici 5' va afișa numai primele 5 versiuni pentru fiecare tip de client."
+#: amulecmd.1.in
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
+msgstr "Exemplu: 'statistici 5' va afișa numai primele 5 versiuni pentru fiecare tip de client."
 
 #. type: Plain text
-#: amulecmd.1.in:233
+#: amulecmd.1.in
 msgid "Show connection status, current up/download speeds, etc."
 msgstr "Arată starea conexiunii, vitezele actuale de încărcare/descărcare, etc."
 
 #. type: SS
-#: amulecmd.1.in:238 amuleweb.1.in:141
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Languages"
 msgstr "Limbi"
 
 #. type: Plain text
-#: amulecmd.1.in:244 amuleweb.1.in:147
+#: amulecmd.1.in amuleweb.1.in
 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 "Parametrul I<E<lt>langE<gt>> pentru opțiunea B<-l> are următoarea formă: I<lang>B<_>I<LANG>B<.>I<encoding>B<@>I<modifier> unde I<lang> este limba primară, I<LANG> este dialectul/teritoriul, I<encoding> este setul de caractere de utilizat iar I<modifier> permite utilizatorului de a specifica o instanță specifică a datelor localizării în cadrul unei singure categorii."
 
 #. type: Plain text
-#: amulecmd.1.in:246 amuleweb.1.in:149
+#: amulecmd.1.in amuleweb.1.in
 msgid "For example, the following strings are valid:"
 msgstr "De exemplu, următoarele șiruri sunt valide:"
 
 #. type: Plain text
-#: amulecmd.1.in:260 amuleweb.1.in:163
+#: amulecmd.1.in amuleweb.1.in
 msgid "Though all the above strings are accepted as valid language definitions, I<encoding> and I<modifier> are yet unused."
 msgstr "Deși toate șirurile de mai sus sunt acceptate ca definiții de limbă valide, I<encoding> și I<modifier> sunt momentan neutilizate."
 
 #. type: Plain text
-#: amulecmd.1.in:263 amuleweb.1.in:166
+#: amulecmd.1.in amuleweb.1.in
 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 "În completare la formatul de mai sus, puteți specifica și numele întreg al limbii în engleză - so B<-l german> este valid și  similar cu B<-l de_DE>."
 
 #. type: Plain text
-#: amulecmd.1.in:266 amuleweb.1.in:169
+#: amulecmd.1.in amuleweb.1.in
 msgid "When no locale is defined, either on command-line or in config file, system default language will be used."
 msgstr "Când nu este definită nici o limbă, în linia de comandă sau în fișierul de configurare, va fi utilizată limba implicită a sistemului de operare."
 
 #. type: Plain text
-#: amulecmd.1.in:268 amuleweb.1.in:177
+#: amulecmd.1.in amuleweb.1.in
 msgid "~/.aMule/remote.conf"
 msgstr "~/.aMule/remote.conf"
 
 #. type: SH
-#: amulecmd.1.in:268 amuleweb.1.in:181
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "EXEMPLU"
 
 #. type: Plain text
-#: amulecmd.1.in:270
+#: amulecmd.1.in
 msgid "Typically amulecmd will be first run as:"
 msgstr "De obicei amulecmd va rula întâi ca:"
 
 #. type: Plain text
-#: amulecmd.1.in:272
+#: amulecmd.1.in
 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.in:274 amuleweb.1.in:187
+#: amulecmd.1.in amuleweb.1.in
 msgid "or"
 msgstr "sau"
 
 #. type: Plain text
-#: amulecmd.1.in:276
+#: amulecmd.1.in
 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.in:278 amuleweb.1.in:191
+#: amulecmd.1.in amuleweb.1.in
 msgid "These will save settings to I<$HOME/.aMule/remote.conf>, and later you only need to type:"
 msgstr "Aceasta va salva configurările la I<$HOME/.aMule/remote.conf>, iar mai târziu trebuie doar să tastați:"
 
 #. type: Plain text
-#: amulecmd.1.in:282
+#: amulecmd.1.in
 msgid "Of course, you don't have to follow this example."
 msgstr "Desigur, nu trebuie să urmați acest exemplu."
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "AMULED"
 msgstr "AMULED"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon v@PACKAGE_VERSION@"
 msgstr "aMule Daemon v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon"
 msgstr "aMule Daemon"
 
 #. type: Plain text
-#: amuled.1.in:6
+#: amuled.1.in
 msgid "amuled - the all-platform eMule p2p client - daemonized version"
 msgstr "amuled - clientul eMule p2p pentru toate platformele - versiunea demonizată"
 
 #. type: Plain text
-#: amuled.1.in:9 ../../src/utils/cas/docs/cas.1.in:11
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
 msgid "B<-c> I<E<lt>pathE<gt>>"
 msgstr "B<-c> I<E<lt>pathE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:11
+#: amuled.1.in
 msgid "B<-p> I<E<lt>pathE<gt>>"
 msgstr "B<-p> I<E<lt>pathE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:33
+#: amuled.1.in
 msgid "Forks to background."
 msgstr "Bifurcă spre fundal."
 
 #. type: TP
-#: amuled.1.in:33
+#: amuled.1.in
 #, 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.in:37
+#: amuled.1.in
 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 "După bifurcare, crează un fișier-pid în I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> trebuie să conțină numele fișierului."
 
 #. type: Plain text
-#: amuled.1.in:40
+#: amuled.1.in
 msgid "Configure EC (External Connections)."
 msgstr "Configurează EC (conexiuni externe)."
 
 #. type: Plain text
-#: amuled.1.in:50
+#: amuled.1.in
 msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: TP
-#: amuled.1.in:61
+#: amuled.1.in
 #, fuzzy, no-wrap
 #| msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "AMULEGUI"
 msgstr "AMULEGUI"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI v@PACKAGE_VERSION@"
 msgstr "aMuleGUI v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
 #. type: Plain text
-#: amulegui.1.in:6
+#: amulegui.1.in
 msgid "amulegui - aMule control program with GUI"
 msgstr "amulegui - Controlul programului aMule prin GUI"
 
 #. type: Plain text
-#: amulegui.1.in:17
+#: amulegui.1.in
 msgid "B<-t> I<E<lt>numE<gt>>"
 msgstr "B<-t> I<E<lt>numE<gt>>"
 
 #. type: Plain text
-#: amulegui.1.in:27
+#: amulegui.1.in
 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> este un program client și poate fi conectat la amule sau amuled prin EC. Puteți administra programul amule cu el. Asigură aproape aceleași funcțiuni ca amule, chiar dacă nucleul funcționează pe un alt computer."
 
 #. type: Plain text
-#: amulegui.1.in:42
+#: amulegui.1.in
 msgid "Skip connection dialog."
 msgstr "Omite dialogul de conectare."
 
 #. type: Plain text
-#: amulegui.1.in:46
+#: amulegui.1.in
 msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: Plain text
-#: amulegui.1.in:72
+#: amulegui.1.in
 msgid "This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm DOT orgE<gt>"
 msgstr "Această pagină manual a fost scrisă de către Julien Delange pentru Debian E<lt>julien AT gunnm DOT orgE<gt>"
 
 #. type: Plain text
-#: amulegui.1.in:73
+#: amulegui.1.in
 msgid "This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr "Această pagină manual a fost revizuită de Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "AMULEWEB"
 msgstr "AMULEWEB"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "aMule webserver v@PACKAGE_VERSION@"
 msgstr "aMule webserver v@PACKAGE_VERSION@"
 
 #. type: Plain text
-#: amuleweb.1.in:6
+#: amuleweb.1.in
 msgid "amuleweb - aMule web server"
 msgstr "amuleweb - aMule server web"
 
 #. type: Plain text
-#: amuleweb.1.in:15
+#: amuleweb.1.in
 msgid "B<-l> I<E<lt>langE<gt>>"
 msgstr "B<-l> I<E<lt>langE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:18
+#: amuleweb.1.in
 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.in:20
+#: amuleweb.1.in
 msgid "B<-U> I<E<lt>portE<gt>>"
 msgstr "B<-U> I<E<lt>portE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:24
+#: amuleweb.1.in
 msgid "B<-A> I<E<lt>passwordE<gt>> B<-G> I<E<lt>passwordE<gt>>"
 msgstr "B<-A> I<E<lt>parolăE<gt>> B<-G> I<E<lt>parolăE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:40
+#: amuleweb.1.in
 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.in:46
+#: amuleweb.1.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in
 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> vă administrează accesul la amule printr-un navigator web. Puteți porni amuleweb împreună cu B<amule>(1), sau separat, oricând mai târziu. Pot fi specificate opțiuni prin linia de comandă sau prin fișierul de configurare. Opțiunile din linia de comandă au prioritate față de opțiunile din fișierul de configurare."
 
 #. type: TP
-#: amuleweb.1.in:74
+#: amuleweb.1.in
 #, 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.in:77
+#: amuleweb.1.in
 msgid "Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section for details."
 msgstr "Încarcă modelul denumit I<E<lt>nameE<gt>>. Vedeți secțiunea B<SKIN SUPPORT> pentru detalii."
 
 #. type: TP
-#: amuleweb.1.in:77
+#: amuleweb.1.in
 #, 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.in:80
+#: amuleweb.1.in
 msgid "Webserver's HTTP port. This is the port you must point your browser to (default: I<4711>)."
 msgstr "Portul HTTP al serverului web. Acesta este portul pe care trebuie să-l indicați navigatorului (implicit: I<4711>)."
 
 #. type: Plain text
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 msgid "Enable UPnP."
 msgstr "Activare UPnP."
 
 #. type: TP
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 #, fuzzy, no-wrap
 #| msgid "B< -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<>"
 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.in:87
+#: amuleweb.1.in
 msgid "UPnP port."
 msgstr "Port UPnP."
 
 #. type: Plain text
-#: amuleweb.1.in:90
+#: amuleweb.1.in
 msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
 msgstr "Activează utilizând compresia gzip în traficul HTTP pentru a salva lățimea de bandă."
 
 #. type: Plain text
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 msgid "Disables using gzip compression (this is the default)."
 msgstr "Dezactivează utilizând compresia gzip (aceasta este implicita)."
 
 #. type: TP
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 #, 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.in:96
+#: amuleweb.1.in
 msgid "Full access password for webserver."
 msgstr "Parola pentru accesul nerestricționat pentru serverul web."
 
 #. type: TP
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 #, 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.in:99
+#: amuleweb.1.in
 msgid "Guest password for webserver."
 msgstr "Parolă oaspete pentru webserver."
 
 #. type: Plain text
-#: amuleweb.1.in:102
+#: amuleweb.1.in
 msgid "Allows guest access."
 msgstr "Permite accesul oaspeților."
 
 #. type: Plain text
-#: amuleweb.1.in:105
+#: amuleweb.1.in
 msgid "Denies guest access (default)."
 msgstr "Interzice accesul oaspeților (implicit)."
 
 #. type: Plain text
-#: amuleweb.1.in:111
+#: amuleweb.1.in
 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 "Încarcă/Salvează configurările serverului web din/la aMule distant. Aceasta determină amuleweb să ignore configurările din linia de comandă sau fișierul de configurare și să le încarece din aMule. Când se salvează preferințele nu se va scrie nimic în fișierul de configurare, doar la aMule. (Desigur, aceasta funcționează doar pentru acele configurări care pot fi configurate în aMule la Preferințe-E<gt>Control la distanță.)"
 
 #. type: Plain text
-#: amuleweb.1.in:114
+#: amuleweb.1.in
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Dezactivează interpretorul PHP (învechit)"
 
 #. type: Plain text
-#: amuleweb.1.in:117
+#: amuleweb.1.in
 msgid "Recompiles PHP pages on each request."
 msgstr "Recompilează paginile PHP la fiecare cerere."
 
 #. type: TP
-#: amuleweb.1.in:130
+#: amuleweb.1.in
 #, 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.in:136
+#: amuleweb.1.in
 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 "Calea fișierului de configurare aMule. B<NU UTILIZAȚI DIRECT!> aMule utilizează această opțiune când pornește amuleweb la pornirea aMule. Această opțiune cauzează tuturor celorlalte configurări din linia de comandă și fișiere de configurare să fie ignorate, preferințele vor fi citite din fișierul de configurare dat, de asemenea implică și opțiunile B<-q -L> ."
 
 #. type: SH
-#: amuleweb.1.in:169
+#: amuleweb.1.in
 #, no-wrap
 msgid "SKIN SUPPORT"
 msgstr "SUPORT ASPECT"
 
 #. type: Plain text
-#: amuleweb.1.in:173
+#: amuleweb.1.in
 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> este capabil să afișeze informația în diferite aspecte. Aceste aspecte se numesc modele, și puteți face ca amuleweb să încarce un model anumit prin B<-t> opțiune linie de comandă. Modelele sunt căutate în două locuri: întâi în I<~/.aMule/webserver/> apoi în I</usr/share/amule/webserver/> dacă a fost instalat cu --prefix=/usr."
 
 #. type: Plain text
-#: amuleweb.1.in:175
+#: amuleweb.1.in
 msgid "Each template must be in a subdirectory of the template name, and this directory must contain all files the template needs."
 msgstr "Fiecare șablon trebuie să fie într-un subdirector al numelui șablonului, iar acest director trebuie să conțină toate fișierele de care șablonul are nevoie."
 
 #. type: Plain text
-#: amuleweb.1.in:179
+#: amuleweb.1.in
 msgid "~/.aMule/webserver/"
 msgstr "~/.aMule/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:181
+#: amuleweb.1.in
 msgid "I<$(pkgdatadir)>/webserver/"
 msgstr "I<$(pkgdatadir)>/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:183
+#: amuleweb.1.in
 msgid "Typically amuleweb will be first run as:"
 msgstr "De obicei amuleweb va rula la început ca:"
 
 #. type: Plain text
-#: amuleweb.1.in:185
+#: amuleweb.1.in
 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<nume gazdă> B<-p> I<ECport> B<-P> I<ECprolă> B<-s> I<HTTPport> B<-A> I<Parolă administrator> B<-w>"
 
 #. type: Plain text
-#: amuleweb.1.in:189
+#: amuleweb.1.in
 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.in:195
+#: amuleweb.1.in
 msgid "Of course, you may specify any more or less options on the first example line, and you may also totally omit it."
 msgstr "Desigur, puteți specifica cât de multe sau cât de puține opțiuni în linia primului exemplu, și de asemenea le puteți omite integral."
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "ED2K"
 msgstr "ED2K"
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "aMule eD2k link parser v1.5.1"
 msgstr "Analizor aMule de link-uri eD2k v1.5.1"
 
 #. type: Plain text
-#: ed2k.1.in:6
+#: ed2k.1.in
 msgid "ed2k - aMule eD2k link parser"
 msgstr "ed2k - analizor aMule de linkuri eD2k"
 
 #. type: Plain text
-#: ed2k.1.in:10
+#: ed2k.1.in
 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.in:13
+#: ed2k.1.in
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr "I<E<lt>eD2k-linkE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:21
+#: ed2k.1.in
 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 "Trimite link-ul dat I<E<lt>eD2k-linkE<gt>> la aMule, ex. îl scrie în fișierul ~/.aMule/ED2KLinks, care va fi verificat de aMule în fiecare secundă pentru link-uri."
 
 #. type: TP
-#: ed2k.1.in:24
+#: ed2k.1.in
 #, fuzzy, no-wrap
 #| msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
 
 #. type: Plain text
-#: ed2k.1.in:28
+#: ed2k.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:31
+#: ed2k.1.in
 #, fuzzy
 #| msgid "Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgid "Loads all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "Încarcă toate link-urile găsite în colecția emule date ca I<E<lt>ed2k-linkE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:34
+#: ed2k.1.in
 #, fuzzy
 #| msgid "Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgid "Lists all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "Listează toate link-urile găsite în colecția emule date ca I<E<lt>ed2k-linkE<gt>>"
 
+#. type: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< eD2k-link >"
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr "Adaugă o legătură eD2k la nucleu."
+
 #. type: Plain text
-#: ed2k.1.in:54
+#: ed2k.1.in
 msgid "a magnet link;"
 msgstr "o legătură magnet;"
 
 #. type: Plain text
-#: ed2k.1.in:56
+#: ed2k.1.in
 msgid "an emulecollection file."
 msgstr "un fișier colecție emule."
 
 #. type: Plain text
-#: ed2k.1.in:61
+#: ed2k.1.in
 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< Ordinea în care dați parametrii este importantă.> Puteți da mai mult decât un link, iar fiecare link poate avea proprii parametri. De exemplu B<ed2k E<lt>link1E<gt> -t2 E<lt>link2E<gt>> va descărca I<E<lt>link1E<gt>> în categoria standard și I<E<lt>link2E<gt>> în categoria 2."
 
 #. type: Plain text
-#: ed2k.1.in:63
+#: ed2k.1.in
 msgid "~/.aMule/ED2KLinks"
 msgstr "~/.aMule/ED2KLinks"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "ALC"
 msgstr "ALC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "aLinkCreator"
 msgstr "aLinkCreator"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 msgid "aLinkCreator - the aMule eD2k link creator"
 msgstr "aLinkCreator - creatorul aMule eD2k de legături"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:9
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 msgid "B<alc> is a graphical utility to create an eD2k link to any file on your computer."
 msgstr "B<alc> este un utilitar grafic care crează o legătură eD2k la orice fișier de pe computerul dumneavoastră."
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This app doesn't take any arguments."
 msgstr "Această aplicație nu ia nici un argument."
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "ALCC"
 msgstr "ALCC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "aMule eD2k links calculator"
 msgstr "Calculator de legături aMule eD2k"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "alcc - text based eD2k links calculator for aMule"
 msgstr "alcc - calculator link-uri eD2k bazat pe text pentru aMule"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "I<E<lt>inputfiles_listE<gt>>"
 msgstr "I<E<lt>inputfiles_listE<gt>>"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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 "Calculează link_urile eD2k pentru toate fișierele de intrare date în I<E<lt>inputfiles_listE<gt>> (Poate fi unul sau mai multe fișiere)."
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Compute and add part hashes to the computed eD2k links."
 msgstr "Calculează și adaugă indexurile părților la legătura eD2k calculată."
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Be verbose - show also calculation steps."
 msgstr "Fi detaliat - arată, de asemenea, pașii de calcul."
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "CAS"
 msgstr "CAS"
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "cas v0.8"
 msgstr "cas v0.8"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "cas - c aMule statistics"
 msgstr "cas - c aMule statistici"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:18
+#: ../../src/utils/cas/docs/cas.1.in
 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> este un program pentru afișarea conținutului fișierului semnătură online al aMule în terminal (într-o formă de citire umană). Pentru ca aceasta să lucreze, trebuie să activați opțiunea \"Semnătură online\" în preferințele aMule."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:23
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:35
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Without any options, it prints online signature data to stdout."
 msgstr "Fără nici o opțiune, va tipării data semnăturii online la stdout."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:37
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
 msgstr "B<cas> a fost scris de  Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:39
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "~/.aMule/casrc"
 msgstr "~/.aMule/casrc"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:41
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
 msgstr ""
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "WXCAS"
 msgstr "WXCAS"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "wxCas"
 msgstr "wxCas"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "wxcas - wx c aMule statistics"
 msgstr "wxcas - wx c aMule statistici"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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> este un program pentru afișarea conținutul fișierului de semnătură online într-o fereastră drăguță wx pe Desktop. Pentru ca aceasta să funcționeze, trebuie să activați opțiunea \"Semnătură online\" în preferințele aMule."
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:14
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish E<lt>thepolish@vipmail.ruE<gt>"
 msgstr "Bazat pe B<cas>(1) a lui Pedro de Oliveira. B<wxcas> a fost scris de ThePolish E<lt>thepolish@vipmail.ruE<gt>"
 
+#~ msgid "Shows the progress of an on-going search."
+#~ msgstr "Arată progresul unei căutări în desfășurare."
+
+#~ msgid "Shows you the results of the last search."
+#~ msgstr "Arată rezultatele ultimei căutări."
+
 #~ 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 "Scrie poza semnăturii online. Puteți adăuga facultativ I<=E<lt>PATHE<gt>> acestei opțiuni, pentru a specifica locația la care ar trebui să fie scrisă."

amule-3.0.1.tar.gz/docs/man/po/manpages-ru.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-ru.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-ru\n"
-"POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-18 22:13+0000\n"
+"POT-Creation-Date: 2026-08-24 19:02+0200\n"
+"PO-Revision-Date: 2026-09-20 21:09+0000\n"
 "Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n"
 "Language-Team: Russian <LL@li.org>\n"
 "Language: ru\n"
@@ -19,1357 +19,1374 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "AMULE"
 msgstr "AMULE"
 
 #. type: TH
-#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
-#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "@MAN_DATE@"
 msgstr "@MAN_DATE@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule v@PACKAGE_VERSION@"
 msgstr "aMule v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule"
 msgstr "aMule"
 
 #. type: SH
-#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
-#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
-#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "NAME"
 msgstr "ИМЯ"
 
 #. type: Plain text
-#: amule.1.in:6
+#: amule.1.in
 msgid "amule - the all-platform eMule p2p client"
-msgstr "amule - мультиплатформенный p2p клиент eMule"
+msgstr "amule — многоплатформенный P2P-клиент eMule"
 
 #. type: SH
-#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
-#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
-#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "ОБЗОР"
 
 #. type: Plain text
-#: amule.1.in:10 amulegui.1.in:10
+#: amule.1.in amulegui.1.in
 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.in:14 amuled.1.in:16
+#: amule.1.in amuled.1.in
 msgid "B<-w> I<E<lt>pathE<gt>>"
 msgstr "B<-w> I<E<lt>путьE<gt>>"
 
 #. type: Plain text
-#: amule.1.in:18 amuled.1.in:20
-msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
-msgstr "B<-t> I<E<lt>номерE<gt>> I<eD2k-ссылка>"
+#: amule.1.in amuled.1.in
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
+msgstr "B<-t> I<E<lt>номерE<gt>> I<eD2k-ссылка>|I<файл-коллекции>"
 
 #. type: SH
-#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
-#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
-#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "ОПИСАНИЕ"
 
 #. type: TP
-#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
-#: ../../src/utils/cas/docs/cas.1.in:30
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Read config from I<E<lt>pathE<gt>> instead of home"
 msgstr "Прочитать конфигурацию из места, указанного в I<E<lt>путиE<gt>>, вместо домашнего каталога"
 
 #. type: TP
-#: amule.1.in:29 amulegui.1.in:30
+#: amule.1.in amulegui.1.in
 #, 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.in:32 amulegui.1.in:33
+#: amule.1.in amulegui.1.in
 msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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:\tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Prints log messages to stdout."
 msgstr "Печатает сообщения лога в стандартный вывод."
 
 #. type: Plain text
-#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Resets config to default values."
 msgstr "Сбрасывает конфигурацию в изначальную."
 
 #. type: Plain text
-#: amule.1.in:42
+#: amule.1.in
 msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
-msgstr ""
+msgstr "Включить или отключить запуск aMule при входе пользователя в систему, затем завершить работу. Хранилище, зависящее от ОС, выбирается автоматически: ключ реестра Windows Run, macOS LaunchAgent, запись автозапуска XDG I<.desktop> в Linux."
 
 #. type: TP
-#: amule.1.in:42 amuled.1.in:50
+#: amule.1.in amuled.1.in
 #, 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.in:45 amuled.1.in:53
+#: amule.1.in amuled.1.in
 msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
 msgstr "Указать I<E<lt>путьE<gt>> к исполняемому файлу amuleweb."
 
 #. type: Plain text
-#: amule.1.in:50 amuled.1.in:58 amulegui.1.in:51
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
-msgstr ""
+msgstr "Не перехватывать фатальные исключения и не блокировать выход при срабатывании утверждений. Полезно для безголовых / контролируемых настроек (systemd, скрипты watchdog), где модальный диалог утверждений препятствует автоматическому перезапуску."
 
 #. type: Plain text
-#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Does not disable stdin."
 msgstr "Не отключать стандартный ввод."
 
 #. type: TP
-#: amule.1.in:53 amulegui.1.in:54
+#: amule.1.in amulegui.1.in
 #, 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.in:56 amuled.1.in:64 amulegui.1.in:57
+#: amule.1.in amuled.1.in amulegui.1.in
 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.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
-#: amuleweb.1.in:130 ed2k.1.in:40
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
 msgid "Displays the current version number."
 msgstr "Выводит информацию о версии."
 
 #. type: Plain text
-#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
-#: amuleweb.1.in:127 ed2k.1.in:37
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
-#: ../../src/utils/cas/docs/cas.1.in:33
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Prints a short usage description."
 msgstr "Выводит короткую помощь по использованию."
 
 #. type: TP
-#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
+#: amule.1.in amuled.1.in
 #, no-wrap
-msgid "B< eD2k-link >"
-msgstr "B< eD2k-ссылка >"
+msgid "B< eD2k-link | collection-file >"
+msgstr "B< eD2k-ссылка | файл-коллекции >"
 
 #. type: Plain text
-#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
-msgid "Adds an eD2k-link to the core."
-msgstr "Передает eD2k-ссылку в ядро."
+#: amule.1.in amuled.1.in
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
+msgstr "Добавляет eD2k-ссылку или все ссылки из файла коллекции eMule в ядро."
 
 #. type: Plain text
-#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "The eD2k link to be added can be:"
 msgstr "Добавляемая eD2k-ссылка может быть:"
 
 #. type: Plain text
-#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
-msgstr "файловая ссылка (ed2k://|file|...), она будет добавлена в очередь закачки;"
+msgstr "файловая ссылка (ed2k://|file|...), она будет добавлена в очередь скачивания;"
 
 #. type: Plain text
-#: amule.1.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a server link (ed2k://|server|...), it will be added to the server list;"
 msgstr "серверная ссылка (ed2k://|server|...), она будет добавлена в список серверов;"
 
 #. type: Plain text
-#: amule.1.in:74 amuled.1.in:82 ed2k.1.in:52
+#: amule.1.in amuled.1.in ed2k.1.in
 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.in:76 amuled.1.in:84
+#: amule.1.in amuled.1.in
 msgid "a magnet link."
 msgstr "magnet-ссылка."
 
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr "В качестве альтернативы аргументом может быть путь к файлу .emulecollection или URL-адрес file://, указывающий на него; в этом случае все содержащиеся в нём ссылки добавляются в очередь загрузки. Именно это позволяет файловому менеджеру открывать коллекцию с помощью aMule."
+
 #. type: SH
-#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "NOTES"
 msgstr "ЗАМЕЧАНИЯ"
 
 #. type: SS
-#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Paths"
 msgstr "Пути"
 
 #. type: Plain text
-#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 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.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
-#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "FILES"
 msgstr "ФАЙЛЫ"
 
 #. type: Plain text
-#: amule.1.in:84 amuled.1.in:87
+#: amule.1.in amuled.1.in
 msgid "~/.aMule/*"
 msgstr "~/.aMule/*"
 
 #. type: SH
-#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
-#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
-#: ../../src/utils/cas/docs/cas.1.in:43
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr "СООБЩЕНИЕ ОБ ОШИБКАХ"
 
 #. type: Plain text
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member."
 msgstr "Пожалуйста, сообщайте об ошибках либо на нашем форуме (I<https://github.com/amule-org/amule/discussions>), либо в багтрекере (I<https://github.com/amule-org/amule/issues>). Пожалуйста, не сообщайте об ошбках по электронной почте, по нашим спискам рассылки, или напрямую участникам."
 
 #. type: SH
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "АВТОРСКИЕ ПРАВА"
 
 #. type: Plain text
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "aMule and all of its related utilities are distributed under the GNU General Public License."
-msgstr "aMule и все прилагающиеся инструменты распространаются под Открытым Лицензионным Соглашением GNU (GNU GPL)."
+msgstr "aMule и все прилагающиеся инструменты распространяются под Стандартной общественной лицензией GNU (GNU GPL)."
 
 #. type: SH
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "СМ. ТАКЖЕ"
 
 #. type: SH
-#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
-#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
-#: ../../src/utils/cas/docs/cas.1.in:50
-#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "AUTHOR"
 msgstr "АВТОРЫ"
 
 #. type: Plain text
-#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
-#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
-#: ../../src/utils/cas/docs/cas.1.in:51
-#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "AMULECMD"
 msgstr "AMULECMD"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "aMuleCmd v@PACKAGE_VERSION@"
 msgstr "aMuleCmd v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "aMule utilities"
 msgstr "утилиты aMule"
 
 #. type: Plain text
-#: amulecmd.1.in:7
+#: amulecmd.1.in
 msgid "amulecmd - Console-based program to control aMule"
 msgstr "amulecmd - консольная программа для управления aMule"
 
 #. type: Plain text
-#: amulecmd.1.in:13 amuleweb.1.in:12
+#: amulecmd.1.in amuleweb.1.in
 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.in:17
+#: amulecmd.1.in
 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.in:20 amuleweb.1.in:31
+#: amulecmd.1.in amuleweb.1.in
 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.in:29
+#: amulecmd.1.in
 msgid "B<amulecmd> is a console-based client to control aMule."
 msgstr "B<amulecmd> консольный клиент для управления программой aMule."
 
 #. type: TP
-#: amulecmd.1.in:29 amuleweb.1.in:46
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
 msgstr "Адрес компьютера на котором работает aMule (по умолчанию: I<127.0.0.1>). I<E<lt>ХостE<gt>> может быть IP-адресом или DNS-именем"
 
 #. type: TP
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 msgid "aMule's port for External Connections, as set in Preferences-E<gt>Remote Controls (default: I<4712>)"
-msgstr "Порт, который использует aMule для внешних соединений. Указывается в Настройках-E<gt>Удаленное управление (по умолчанию: I<4712>)"
+msgstr "Порт, который использует aMule для внешних соединений. Указывается в Настройках-E<gt>Удалённое управление (по умолчанию: I<4712>)"
 
 #. type: TP
-#: amulecmd.1.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 msgid "External Connections password."
 msgstr "Пароль для внешних соединений."
 
 #. type: TP
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:43 amuleweb.1.in:60
+#: amulecmd.1.in amuleweb.1.in
 msgid "Use the given configuration file.  Default configuration file is I<~/.aMule/remote.conf>"
 msgstr "Использовать указанный файл конфигурации. По умолчанию используется I<~/.aMule/remote.conf>"
 
 #. type: Plain text
-#: amulecmd.1.in:46 amuleweb.1.in:63
+#: amulecmd.1.in amuleweb.1.in
 msgid "Do not print any output to stdout."
 msgstr "Не печетать ничего в стандартный вывод."
 
 #. type: Plain text
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 msgid "Be verbose - show also debug messages."
-msgstr "Выводить также отладочную информацию."
+msgstr "Детально — также выводить отладочную информацию."
 
 #. type: TP
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:54 amuleweb.1.in:71
+#: amulecmd.1.in amuleweb.1.in
 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>>."
+msgstr "Задаёт локаль программы (язык). См. секцию B<ЗАМЕЧАНИЯ> для подробностей по параметру I<E<lt>языкE<gt>>."
 
 #. type: Plain text
-#: amulecmd.1.in:57 amuleweb.1.in:74
+#: amulecmd.1.in amuleweb.1.in
 msgid "Write command line options to config file and exit"
 msgstr "Записать параметр командной строки в файл конфигурации и выйти"
 
 #. type: TP
-#: amulecmd.1.in:57
+#: amulecmd.1.in
 #, 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.in:60
+#: amulecmd.1.in
 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.in:60 amuleweb.1.in:117
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:63 amuleweb.1.in:120
+#: amulecmd.1.in amuleweb.1.in
 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: Plain text
-#: amulecmd.1.in:67 amuleweb.1.in:124
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr "Не шифровать соединение внешнего подключения. Шифрование согласовывается автоматически, когда удалённый aMule его поддерживает, и включено по умолчанию для любого назначения, локального или удалённого. Его отключение делает всё после входа в систему читаемым и изменяемым для любого, кто может наблюдать за соединением."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
 msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
-msgstr ""
+msgstr "Принудительно использовать сжатие ZLIB для соединения внешнего подключения независимо от локальности вызванного IP-адреса. Полезно, когда серверная сторона доступна через VPN-туннель, который разрешается в локальный IP-адрес, и эвристика в противном случае пропустила бы сжатие."
+
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.  Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output."
+msgstr "Разделять поля команд списка пробелами, как в более старых версиях, вместо символов табуляции. Имена клиентов и файлов могут содержать пробелы, поэтому стандартный разделитель — табуляция — позволяет скриптам верно разбивать строки на поля; используйте эту опцию только для скриптов, написанных под старый формат вывода."
 
 #. type: SH
-#: amulecmd.1.in:73
+#: amulecmd.1.in
 #, no-wrap
 msgid "COMMANDS"
 msgstr "КОМАНДЫ"
 
 #. type: Plain text
-#: amulecmd.1.in:75
+#: amulecmd.1.in
 msgid "All commands are case insensitive."
 msgstr "Все команды чувствительны к регистру."
 
 #. type: Plain text
-#: amulecmd.1.in:77
+#: amulecmd.1.in
 msgid "Adds an eD2k-link or a magnet-link to the core."
 msgstr "Добавляет eD2k-ссылку или magnet-ссылку в ядро."
 
 #. type: Plain text
-#: amulecmd.1.in:86
+#: amulecmd.1.in
 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.in:89
+#: amulecmd.1.in
 msgid "The magnet link must contain the eD2k hash and file length."
 msgstr "Magnet-ссылка должна содержать eD2k-хэш и размер файла."
 
 #. type: Plain text
-#: amulecmd.1.in:91
+#: amulecmd.1.in
 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>."
+msgstr "Отменяет скачивание, указанное в I<E<lt>хэшуE<gt>> или I<E<lt>номеруE<gt>>. Чтобы определить значения, воспользуйтесь командой B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:93
+#: amulecmd.1.in
 msgid "Connect to the network."
 msgstr "Подключиться к сети."
 
 #. type: Plain text
-#: amulecmd.1.in:95
+#: amulecmd.1.in
 msgid "This will connect to all networks that are enabled in Preferences."
 msgstr "Это подсоединит ко всем сетям, включенным в настройках."
 
 #. type: Plain text
-#: amulecmd.1.in:99
+#: amulecmd.1.in
 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.in:102
+#: amulecmd.1.in
 msgid "Disconnect from all networks you are connected to, or just disconnect from the specified network."
 msgstr "Отсоединяет от всех сетей, или только от указанной сети."
 
 #. type: Plain text
-#: amulecmd.1.in:104
+#: amulecmd.1.in
 msgid "Start downloading a file."
-msgstr "Начать закачку файла."
+msgstr "Начать скачивание файла."
 
 #. type: Plain text
-#: amulecmd.1.in:108
-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 в последнем поиске."
+#: amulecmd.1.in
+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.in:110
+#: amulecmd.1.in
 msgid "Disconnect from amule/amuled and quit amulecmd."
 msgstr "Отключится от amule/amuled и выйти из amulecmd."
 
 #. type: Plain text
-#: amulecmd.1.in:112
+#: amulecmd.1.in
 msgid "Get and display a preference value."
-msgstr "Вывести параметр настроек."
+msgstr "Получить и отобразить значение параметра."
 
 #. type: Plain text
-#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>whatE<gt>>:"
 msgstr "Возможные значения поля I<E<lt>параметрE<gt>>:"
 
 #. type: Plain text
-#: amulecmd.1.in:117
+#: amulecmd.1.in
 msgid "Get bandwidth limits."
-msgstr "Вывести ограничения канала."
+msgstr "Получить ограничения скорости передачи."
 
 #. type: Plain text
-#: amulecmd.1.in:119
+#: amulecmd.1.in
 msgid "Get IPFilter preferences."
-msgstr "Вывести настройки IPFilter."
+msgstr "Вывести настройки IP-фильтра."
 
 #. type: Plain text
-#: amulecmd.1.in:124
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:126
+#: amulecmd.1.in
 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>."
+msgstr "Ставит на паузу скачивание, указанное в I<E<lt>хэшуE<gt>> или I<E<lt>номеруE<gt>>. Чтобы определить значения, воспользуйтесь командой B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:128
+#: amulecmd.1.in
 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>>."
+msgstr "Указывает приоритет скачивания, указанного в I<E<lt>хэшуE<gt>> или I<E<lt>номеруE<gt>>."
 
 #. type: Plain text
-#: amulecmd.1.in:130
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>priorityE<gt>>:"
 msgstr "Возможные значения I<E<lt>приоритетаE<gt>>:"
 
 #. type: Plain text
-#: amulecmd.1.in:133
+#: amulecmd.1.in
 msgid "Automatic priority."
 msgstr "Автоматический приоритет."
 
 #. type: Plain text
-#: amulecmd.1.in:135
+#: amulecmd.1.in
 msgid "High priority."
 msgstr "Высокий приоритет."
 
 #. type: Plain text
-#: amulecmd.1.in:137
+#: amulecmd.1.in
 msgid "Low priority."
 msgstr "Низкий приоритет."
 
 #. type: Plain text
-#: amulecmd.1.in:139
+#: amulecmd.1.in
 msgid "Normal priority."
-msgstr "Нормальный приоритет."
+msgstr "Обычный приоритет."
 
 #. type: Plain text
-#: amulecmd.1.in:142
-msgid "Shows the progress of an on-going search."
-msgstr "Показывает состояние работающего поиска."
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr "Показывает ход выполнения текущего поиска. Может принимать I<E<lt>idE<gt>> поиска (как выводится командой B<search>); без идентификатора показывает последний начатый поиск."
 
 #. type: Plain text
-#: amulecmd.1.in:144
-#, fuzzy
-#| msgid "A synonim of the B<exit> command."
+#: amulecmd.1.in
 msgid "A synonym of the B<exit> command."
-msgstr "То же что и B<exit>."
+msgstr "Синоним команды B<exit>."
 
 #. type: Plain text
-#: amulecmd.1.in:146
+#: amulecmd.1.in
 msgid "Reloads a given object."
 msgstr "Обновляет указанный объект."
 
 #. type: Plain text
-#: amulecmd.1.in:151
+#: amulecmd.1.in
 msgid "Reload shared files list."
-msgstr "Обновляет список публикуемых файлов."
+msgstr "Переподгрузить список публикуемых файлов."
 
 #. type: Plain text
-#: amulecmd.1.in:153
+#: amulecmd.1.in
 msgid "Reload IP filter tables."
-msgstr "Обновляет таблицы IP фильтра."
+msgstr "Обновляет таблицы IP-фильтра."
 
 #. type: Plain text
-#: amulecmd.1.in:156
+#: amulecmd.1.in
 msgid "Reset the log."
-msgstr "Обнуляет лог."
+msgstr "Сбросить журнал."
 
 #. type: Plain text
-#: amulecmd.1.in:158
-msgid "Shows you the results of the last search."
-msgstr "Выводит результат последнего поиска."
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr "Показывает результаты поиска. Может принимать I<E<lt>idE<gt>> поиска (как выводится командой B<search>); без идентификатора показывает последний начатый поиск. В демоне одновременно может храниться несколько поисков, каждый из которых доступен по своему идентификатору."
 
 #. type: Plain text
-#: amulecmd.1.in:160
+#: amulecmd.1.in
 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>."
+msgstr "Возобновляет скачивание, указанное в I<E<lt>хэшуE<gt>> или I<E<lt>номеруE<gt>>. Чтобы определить значения, воспользуйтесь командой B<show>."
 
 #. type: Plain text
-#: amulecmd.1.in:164
-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'."
+#: amulecmd.1.in
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
+msgstr "Выполняет поиск по указанному I<E<lt>ключевому словуE<gt>>. Для этого обязательно указать тип поиска и ключевое слово.  Пример: 'search kad amule' выполняет поиск Kad по запросу 'amule'.  Выводит идентификатор поиска; передайте его командам B<results> или B<progress>, чтобы обратиться к этому поиску. Одновременно может выполняться несколько поисков, каждый со своим идентификатором."
 
 #. type: Plain text
-#: amulecmd.1.in:166
+#: amulecmd.1.in
 msgid "Available search types:"
 msgstr "Возможные типы поиска:"
 
 #. type: Plain text
-#: amulecmd.1.in:169
+#: amulecmd.1.in
 msgid "Performs a global search."
 msgstr "Глобальный поиск."
 
 #. type: Plain text
-#: amulecmd.1.in:171
+#: amulecmd.1.in
 msgid "Performs a search on the Kademlia network."
 msgstr "Поиск по сети kademlia."
 
 #. type: Plain text
-#: amulecmd.1.in:173
+#: amulecmd.1.in
 msgid "Performs a local search."
 msgstr "Локальный поиск."
 
 #. type: Plain text
-#: amulecmd.1.in:177
+#: amulecmd.1.in
 msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
-msgstr ""
+msgstr "Необязательные фильтры можно размещать до, после или вперемешку с ключевыми словами поиска:"
 
 #. type: Plain text
-#: amulecmd.1.in:180
+#: amulecmd.1.in
 msgid "Restrict results to the given file type."
-msgstr ""
+msgstr "Ограничить результаты указанным типом файла."
 
 #. type: Plain text
-#: amulecmd.1.in:182
+#: amulecmd.1.in
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
-msgstr ""
+msgstr "Ограничить результаты конкретным расширением файла (например, I<iso>, I<mp3>)."
 
 #. type: Plain text
-#: amulecmd.1.in:184
+#: amulecmd.1.in
 msgid "Minimum number of sources a result must report."
-msgstr ""
+msgstr "Минимальное количество источников, которое должен иметь результат."
 
 #. type: Plain text
-#: amulecmd.1.in:187
+#: amulecmd.1.in
 msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
-msgstr ""
+msgstr "Наименьший размер файла для возврата. Суффиксы используют двоичные множители (K = 1024, M = K\\(mu1024, G = M\\(mu1024); без суффикса — байты."
 
 #. type: Plain text
-#: amulecmd.1.in:189
+#: amulecmd.1.in
 msgid "Largest file size to return. Same suffixes as B<--min-size>."
-msgstr ""
+msgstr "Наибольший размер файла для возврата. Те же суффиксы, что и для B<--min-size>."
 
 #. type: Plain text
-#: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
-msgstr ""
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
+msgstr "Пример: 'search global linux iso --type Iso --min-size 100M' возвращает результаты для 'linux iso' типа Iso размером не менее 100 МиБ."
 
 #. type: Plain text
-#: amulecmd.1.in:195
+#: amulecmd.1.in
 msgid "Sets a given preferences value."
 msgstr "Задает указанный параметр."
 
 #. type: Plain text
-#: amulecmd.1.in:200
+#: amulecmd.1.in
 msgid "Set bandwidth limits."
-msgstr "Задает ограничения канала."
+msgstr "Задаёт ограничения скорости передачи."
 
 #. type: Plain text
-#: amulecmd.1.in:202
+#: amulecmd.1.in
 msgid "Set IPFilter preferences."
-msgstr "Задает параметры IPFilter."
+msgstr "Задаёт параметры IP-фильтра."
 
 #. type: Plain text
-#: amulecmd.1.in:205
+#: amulecmd.1.in
 msgid "Shows upload/download queue, servers list or shared files list."
-msgstr "Выводит очередь закачки/отдачи, список серверов или опубликованные файлы."
+msgstr "Выводит очередь отдачи/скачивания, список серверов или опубликованных файлов."
 
 #. type: Plain text
-#: amulecmd.1.in:210
+#: amulecmd.1.in
 msgid "Show download queue."
-msgstr "Выводит очередь закачки."
+msgstr "Показать очередь загрузки."
 
 #. type: Plain text
-#: amulecmd.1.in:212
+#: amulecmd.1.in
 msgid "Show log."
-msgstr "Выводит лог."
+msgstr "Показать журнал."
 
 #. type: Plain text
-#: amulecmd.1.in:214
+#: amulecmd.1.in
 msgid "Show servers list."
-msgstr "Выводит список серверов."
+msgstr "Показать список серверов."
 
 #. type: Plain text
-#: amulecmd.1.in:216
-#, fuzzy
-#| msgid "Reload shared files list."
+#: amulecmd.1.in
 msgid "Show shared files list."
-msgstr "Обновляет список публикуемых файлов."
+msgstr "Показать список публикуемых файлов."
 
 #. type: Plain text
-#: amulecmd.1.in:218
+#: amulecmd.1.in
 msgid "Show upload queue."
-msgstr "Выводит список отдачи."
+msgstr "Показать очередь отдачи."
 
 #. type: Plain text
-#: amulecmd.1.in:222
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:224
+#: amulecmd.1.in
 msgid "Show statistics tree."
 msgstr "Выводит дерево статистики."
 
 #. type: Plain text
-#: amulecmd.1.in:228
-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 или пропуск означает `неограниченно'."
+#: amulecmd.1.in
+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.in:231
-msgid "Example: `statistics 5' will show only the top 5 versions for each client type."
-msgstr "Пример: `statistics 5' покажет только 5 наиболее популярных версий для каждого типа клиента."
+#: amulecmd.1.in
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
+msgstr "Пример: 'statistics 5' покажет только 5 самых популярных версий для каждого типа клиента."
 
 #. type: Plain text
-#: amulecmd.1.in:233
+#: amulecmd.1.in
 msgid "Show connection status, current up/download speeds, etc."
-msgstr "Вывести статус соединения, скорости, итд."
+msgstr "Показывает состояние подключения, текущую скорость скачивания и т.д."
 
 #. type: SS
-#: amulecmd.1.in:238 amuleweb.1.in:141
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Languages"
 msgstr "Языки"
 
 #. type: Plain text
-#: amulecmd.1.in:244 amuleweb.1.in:147
+#: amulecmd.1.in amuleweb.1.in
 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.in:246 amuleweb.1.in:149
+#: amulecmd.1.in amuleweb.1.in
 msgid "For example, the following strings are valid:"
 msgstr "К примеру, все следующие строчки являются приемлемыми:"
 
 #. type: Plain text
-#: amulecmd.1.in:260 amuleweb.1.in:163
+#: amulecmd.1.in amuleweb.1.in
 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.in:263 amuleweb.1.in:166
+#: amulecmd.1.in amuleweb.1.in
 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.in:266 amuleweb.1.in:169
+#: amulecmd.1.in amuleweb.1.in
 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.in:268 amuleweb.1.in:177
+#: amulecmd.1.in amuleweb.1.in
 msgid "~/.aMule/remote.conf"
 msgstr "~/.aMule/remote.conf"
 
 #. type: SH
-#: amulecmd.1.in:268 amuleweb.1.in:181
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "ПРИМЕРЫ"
 
 #. type: Plain text
-#: amulecmd.1.in:270
+#: amulecmd.1.in
 msgid "Typically amulecmd will be first run as:"
 msgstr "Как правило, в первый раз amulecmd запускается так:"
 
 #. type: Plain text
-#: amulecmd.1.in:272
+#: amulecmd.1.in
 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.in:274 amuleweb.1.in:187
+#: amulecmd.1.in amuleweb.1.in
 msgid "or"
 msgstr "или"
 
 #. type: Plain text
-#: amulecmd.1.in:276
+#: amulecmd.1.in
 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.in:278 amuleweb.1.in:191
+#: amulecmd.1.in amuleweb.1.in
 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.in:282
+#: amulecmd.1.in
 msgid "Of course, you don't have to follow this example."
 msgstr "Конечно, вы не обязаны следовать этим рекомендациям."
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "AMULED"
 msgstr "AMULED"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon v@PACKAGE_VERSION@"
 msgstr "Демон aMule v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon"
 msgstr "Демон aMule"
 
 #. type: Plain text
-#: amuled.1.in:6
+#: amuled.1.in
 msgid "amuled - the all-platform eMule p2p client - daemonized version"
-msgstr "amuled - мультиплатформенный p2p клиент eMule - демонизированная версия"
+msgstr "amuled — многоплатформенный P2P-клиент eMule — демонизированная версия"
 
 #. type: Plain text
-#: amuled.1.in:9 ../../src/utils/cas/docs/cas.1.in:11
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
 msgid "B<-c> I<E<lt>pathE<gt>>"
 msgstr "B<-c> I<E<lt>путьE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:11
+#: amuled.1.in
 msgid "B<-p> I<E<lt>pathE<gt>>"
 msgstr "B<-p> I<E<lt>путьE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:33
+#: amuled.1.in
 msgid "Forks to background."
 msgstr "Уйти в фоновый режим."
 
 #. type: TP
-#: amuled.1.in:33
+#: amuled.1.in
 #, 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.in:37
+#: amuled.1.in
 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.in:40
+#: amuled.1.in
 msgid "Configure EC (External Connections)."
 msgstr "Сконфигурировать EC (внешние соединения)."
 
 #. type: Plain text
-#: amuled.1.in:50
+#: amuled.1.in
 msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
-msgstr ""
+msgstr "Включить или отключить запуск amuled при входе пользователя в систему, затем завершить работу. Хранилище, зависящее от ОС, выбирается автоматически: ключ реестра Windows Run, macOS LaunchAgent, запись автозапуска XDG I<.desktop> в Linux."
 
 #. type: TP
-#: amuled.1.in:61
-#, fuzzy, no-wrap
-#| msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
+#: amuled.1.in
+#, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
-msgstr "B< -t> I<E<lt>имяE<gt>>, B<--template>=I<E<lt>имяE<gt>> B<>"
+msgstr "B< -t> I<E<lt>номерE<gt>>, B<--category>=I<E<lt>номерE<gt>> B<>"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "AMULEGUI"
 msgstr "AMULEGUI"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI v@PACKAGE_VERSION@"
 msgstr "aMuleGUI v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
 #. type: Plain text
-#: amulegui.1.in:6
+#: amulegui.1.in
 msgid "amulegui - aMule control program with GUI"
 msgstr "amulegui - программа управления aMule с GUI"
 
 #. type: Plain text
-#: amulegui.1.in:17
+#: amulegui.1.in
 msgid "B<-t> I<E<lt>numE<gt>>"
 msgstr "B<-t> I<E<lt>номерE<gt>>"
 
 #. type: Plain text
-#: amulegui.1.in:27
+#: amulegui.1.in
 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.in:42
+#: amulegui.1.in
 msgid "Skip connection dialog."
 msgstr "Пропустить диалог соединения."
 
 #. type: Plain text
-#: amulegui.1.in:46
+#: amulegui.1.in
 msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
-msgstr ""
+msgstr "Включить или отключить запуск amulegui при входе пользователя в систему, затем завершить работу. Хранилище, зависящее от ОС, выбирается автоматически: ключ реестра Windows Run, macOS LaunchAgent, запись автозапуска XDG I<.desktop> в Linux."
 
 #. type: Plain text
-#: amulegui.1.in:72
+#: amulegui.1.in
 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.in:73
+#: amulegui.1.in
 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.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "AMULEWEB"
 msgstr "AMULEWEB"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "aMule webserver v@PACKAGE_VERSION@"
 msgstr "Вебсервер aMule v@PACKAGE_VERSION@"
 
 #. type: Plain text
-#: amuleweb.1.in:6
+#: amuleweb.1.in
 msgid "amuleweb - aMule web server"
 msgstr "amuleweb - вебсервер aMule"
 
 #. type: Plain text
-#: amuleweb.1.in:15
+#: amuleweb.1.in
 msgid "B<-l> I<E<lt>langE<gt>>"
 msgstr "B<-l> I<E<lt>языкE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:18
+#: amuleweb.1.in
 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.in:20
+#: amuleweb.1.in
 msgid "B<-U> I<E<lt>portE<gt>>"
 msgstr "B<-U> I<E<lt>портE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:24
+#: amuleweb.1.in
 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.in:40
+#: amuleweb.1.in
 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.in:46
+#: amuleweb.1.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr "B<УСТАРЕЛО:> amuleweb устарел и может быть удалён в aMule 3.2 или позже. Пока он не удалён; рассмотрите возможность перехода на amuleapi — REST/SSE API."
+
+#. type: Plain text
+#: amuleweb.1.in
 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.in:74
+#: amuleweb.1.in
 #, 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.in:77
+#: amuleweb.1.in
 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<ПОДДЕРЖКА СКИНОВ>."
+msgstr "Устанавливает шаблон с указанным I<E<lt>именемE<gt>>. Подробности в разделе B<ПОДДЕРЖКА ОБОЛОЧЕК>."
 
 #. type: TP
-#: amuleweb.1.in:77
+#: amuleweb.1.in
 #, 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.in:80
+#: amuleweb.1.in
 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.in:84
+#: amuleweb.1.in
 msgid "Enable UPnP."
 msgstr "Включить UPnP."
 
 #. type: TP
-#: amuleweb.1.in:84
-#, fuzzy, no-wrap
-#| msgid "B< -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<>"
+#: amuleweb.1.in
+#, 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<>"
+msgstr "B< -U> I<E<lt>portE<gt>>, B<--upnp-port>=I<E<lt>portE<gt>> B<>"
 
 #. type: Plain text
-#: amuleweb.1.in:87
+#: amuleweb.1.in
 msgid "UPnP port."
 msgstr "Порт UPnP."
 
 #. type: Plain text
-#: amuleweb.1.in:90
+#: amuleweb.1.in
 msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
-msgstr "Включает использование gzip-сжатия HTTP данных для уменьшения трафика."
+msgstr "Включает использование gzip-сжатия HTTP-данных для уменьшения трафика."
 
 #. type: Plain text
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 msgid "Disables using gzip compression (this is the default)."
 msgstr "Отключает использование gzip-сжатия (вариант по умолчанию)."
 
 #. type: TP
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 #, 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.in:96
+#: amuleweb.1.in
 msgid "Full access password for webserver."
 msgstr "Пароль для полного доступа к вебсерверу."
 
 #. type: TP
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 #, 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.in:99
+#: amuleweb.1.in
 msgid "Guest password for webserver."
 msgstr "Пароль для гостевого доступа к вебсерверу."
 
 #. type: Plain text
-#: amuleweb.1.in:102
+#: amuleweb.1.in
 msgid "Allows guest access."
 msgstr "Разрешить гостевой доступ."
 
 #. type: Plain text
-#: amuleweb.1.in:105
+#: amuleweb.1.in
 msgid "Denies guest access (default)."
 msgstr "Запретить гостевой доступ (вариант по умолчанию)."
 
 #. type: Plain text
-#: amuleweb.1.in:111
+#: amuleweb.1.in
 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>Удаленный контроль)"
+msgstr "Загрузить/сохранить настройки веб-сервера из/в удалённый aMule. Это приводит к игнорированию параметров командной строки и конфигурационного файла, и загрузки их из aMule. При сохранении настроек они будут писаться не в файл конфигурации, а в aMule. (Конечно, работает только для настроек которые могут быть заданы через меню Настройки-E<gt>Удалённый контроль)"
 
 #. type: Plain text
-#: amuleweb.1.in:114
+#: amuleweb.1.in
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Отключить интерпретатор PHP (устарело)"
 
 #. type: Plain text
-#: amuleweb.1.in:117
+#: amuleweb.1.in
 msgid "Recompiles PHP pages on each request."
 msgstr "Перекомпилирует страницы PHP при каждом обращении."
 
 #. type: TP
-#: amuleweb.1.in:130
+#: amuleweb.1.in
 #, 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.in:136
+#: amuleweb.1.in
 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.in:169
+#: amuleweb.1.in
 #, no-wrap
 msgid "SKIN SUPPORT"
-msgstr "ПОДДЕРЖКА СКИНОВ"
+msgstr "ПОДДЕРЖКА ОБОЛОЧЕК"
 
 #. type: Plain text
-#: amuleweb.1.in:173
+#: amuleweb.1.in
 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."
+msgstr "B<amuleweb> имеет возможность отображать информацию с разными оболочками. Эти оболочки называются шаблонами, и вы можете переключить amuleweb на определённый шаблон использую опцию B<-t> командной строки. Шаблоны ищутся в двух местах: первое I<~/.aMule/webserver/>, затем I</usr/share/amule/webserver/>, если инсталляция была проведена с --prefix=/usr."
 
 #. type: Plain text
-#: amuleweb.1.in:175
+#: amuleweb.1.in
 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.in:179
+#: amuleweb.1.in
 msgid "~/.aMule/webserver/"
 msgstr "~/.aMule/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:181
+#: amuleweb.1.in
 msgid "I<$(pkgdatadir)>/webserver/"
 msgstr "I<$(pkgdatadir)>/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:183
+#: amuleweb.1.in
 msgid "Typically amuleweb will be first run as:"
 msgstr "Как правило, в первый раз amuleweb запускается так:"
 
 #. type: Plain text
-#: amuleweb.1.in:185
+#: amuleweb.1.in
 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.in:189
+#: amuleweb.1.in
 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.in:195
+#: amuleweb.1.in
 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.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "ED2K"
 msgstr "ED2K"
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "aMule eD2k link parser v1.5.1"
 msgstr "aMule парсер ссылок eD2k v1.5.1"
 
 #. type: Plain text
-#: ed2k.1.in:6
+#: ed2k.1.in
 msgid "ed2k - aMule eD2k link parser"
 msgstr "ed2k - aMule парсер ссылок eD2k"
 
 #. type: Plain text
-#: ed2k.1.in:10
+#: ed2k.1.in
 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.in:13
+#: ed2k.1.in
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr "I<E<lt>eD2k-ссылкаE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:21
+#: ed2k.1.in
 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, который проверяется каждую секунду."
+msgstr "Посылает указанную I<E<lt>eD2k-ссылкуE<gt>> в aMule, т. е. пишет её в файл ~/.aMule/ED2KLinks, который проверяется каждую секунду."
 
 #. type: TP
-#: ed2k.1.in:24
-#, fuzzy, no-wrap
-#| msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
+#: ed2k.1.in
+#, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
-msgstr "B< -t> I<E<lt>имяE<gt>>, B<--template>=I<E<lt>имяE<gt>> B<>"
+msgstr "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 
 #. type: Plain text
-#: ed2k.1.in:28
+#: ed2k.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
-msgstr ""
+msgstr "Установить категорию для переданных eD2k-ссылок в I<E<lt>numE<gt>>. В отличие от B<--config-dir>, анализатор читает значение как следующий аргумент и не поддерживает синтаксис B<--category>=I<E<lt>numE<gt>>."
 
 #. type: Plain text
-#: ed2k.1.in:31
-#, fuzzy
-#| msgid "Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+#: ed2k.1.in
 msgid "Loads all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
-msgstr "Загружает все ссылки из emulecollection как I<E<lt>ed2k-ссылкиE<gt>>"
+msgstr "Загружает все ссылки, найденные в emulecollection, указанном как I<E<lt>ed2k-linkE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:34
-#, fuzzy
-#| msgid "Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+#: ed2k.1.in
 msgid "Lists all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
-msgstr "Перечисляет все ссылки из emulecollection как I<E<lt>ed2k-ссылкиE<gt>>"
+msgstr "Выводит список всех ссылок, найденных в emulecollection, указанном как I<E<lt>ed2k-linkE<gt>>"
+
+#. type: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< eD2k-ссылка >"
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr "Передает eD2k-ссылку в ядро."
 
 #. type: Plain text
-#: ed2k.1.in:54
+#: ed2k.1.in
 msgid "a magnet link;"
 msgstr "magnet-ссылка;"
 
 #. type: Plain text
-#: ed2k.1.in:56
+#: ed2k.1.in
 msgid "an emulecollection file."
 msgstr "файл emulecollection."
 
 #. type: Plain text
-#: ed2k.1.in:61
+#: ed2k.1.in
 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.in:63
+#: ed2k.1.in
 msgid "~/.aMule/ED2KLinks"
 msgstr "~/.aMule/ED2KLinks"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "ALC"
 msgstr "ALC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "aLinkCreator"
 msgstr "aLinkCreator"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 msgid "aLinkCreator - the aMule eD2k link creator"
 msgstr "aLinkCreator - создатель eD2k-ссылок aMule"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:9
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:11
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This app doesn't take any arguments."
 msgstr "Утилита не принимает параметров."
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "ALCC"
 msgstr "ALCC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "aMule eD2k links calculator"
 msgstr "aMule калькулятор eD2k-ссылок"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "alcc - text based eD2k links calculator for aMule"
 msgstr "alcc - текстовый калькулятор eD2k-ссылок для aMule"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "I<E<lt>inputfiles_listE<gt>>"
 msgstr "I<E<lt>список_файловE<gt>>"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Compute and add part hashes to the computed eD2k links."
 msgstr "Вычисляет и добавляет частичные хэши к вычисленным eD2k-ссылкам."
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Be verbose - show also calculation steps."
 msgstr "Показать подробности - показывает также шаги вычислений."
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "CAS"
 msgstr "CAS"
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "cas v0.8"
 msgstr "cas v0.8"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "cas - c aMule statistics"
 msgstr "cas - c-статистика aMule"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:18
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:23
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
-msgstr ""
+msgstr "Записывает изображение онлайн-подписи. Длинная форма B<--picture> принимает необязательный I<=E<lt>ПУТЬE<gt>> для указания места вывода; короткие формы B<-o> / B<-P> не принимают (B<-P> требует следующий за ним аргумент I<E<lt>ПУТЬE<gt>>, а B<-o> является ключом без аргументов). Требует поддержки GD, скомпилированной в (I<__GD__>); в противном случае этот параметр молча игнорируется."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
-msgstr ""
+msgstr "HTML-страница со статистикой и изображением. Длинная форма B<--html> принимает необязательный I<=E<lt>ПУТЬE<gt>> для указания места вывода; короткие формы B<-p> / B<-H> не принимают (B<-H> требует следующий за ним аргумент I<E<lt>ПУТЬE<gt>>, а B<-p> является ключом без аргументов)."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:35
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Without any options, it prints online signature data to stdout."
 msgstr "Без опций программа выведет данные о подписи в стандартный вывод."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:37
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:39
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "~/.aMule/casrc"
 msgstr "~/.aMule/casrc"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:41
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
-msgstr ""
+msgstr "aMule-online-sign.png (или .jpg, если используется B<-o> / B<--picture> и доступна GD)"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
-msgstr ""
+msgstr "aMule-online-sign.html (если используется B<-p> / B<--html>)"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "WXCAS"
 msgstr "WXCAS"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "wxCas"
 msgstr "wxCas"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "wxcas - wx c aMule statistics"
 msgstr "wxcas - wx c-статистика aMule"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:14
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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>"
 
+#~ msgid "Shows the progress of an on-going search."
+#~ msgstr "Показывает состояние работающего поиска."
+
+#~ msgid "Shows you the results of the last search."
+#~ msgstr "Выводит результат последнего поиска."
+
 #~ 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>>, куда она будет сохранена."

amule-3.0.1.tar.gz/docs/man/po/manpages-ta.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-ta.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-22 11:01+0000\n"
+"PO-Revision-Date: 2026-09-20 21:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: none\n"
 "Language: ta\n"
@@ -508,7 +508,7 @@
 
 #. type: Plain text
 #: amulecmd.1.in:108
-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."
+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
@@ -618,7 +618,7 @@
 
 #. type: Plain text
 #: amulecmd.1.in:164
-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'."
+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
@@ -673,7 +673,7 @@
 
 #. type: Plain text
 #: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
 msgstr ""
 
 #. type: Plain text
@@ -733,12 +733,12 @@
 
 #. type: Plain text
 #: amulecmd.1.in:228
-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'."
+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.in:231
-msgid "Example: `statistics 5' will show only the top 5 versions for each client type."
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
 msgstr ""
 
 #. type: Plain text

amule-3.0.1.tar.gz/docs/man/po/manpages-tr.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-tr.po Changed

@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule\n"
-"POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-18 22:07+0000\n"
+"POT-Creation-Date: 2026-08-24 19:02+0200\n"
+"PO-Revision-Date: 2026-09-20 21:09+0000\n"
 "Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n"
 "Language-Team: \n"
 "Language: tr\n"
@@ -16,1346 +16,1374 @@
 "X-Generator: Poedit 3.9\n"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "AMULE"
 msgstr "AMULE"
 
 #. type: TH
-#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
-#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "@MAN_DATE@"
 msgstr "@MAN_DATE@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule v@PACKAGE_VERSION@"
 msgstr "aMule v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule"
 msgstr "aMule"
 
 #. type: SH
-#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
-#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
-#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "NAME"
 msgstr "İSİM"
 
 #. type: Plain text
-#: amule.1.in:6
+#: amule.1.in
 msgid "amule - the all-platform eMule p2p client"
 msgstr "amule - her platformda çalışan eMule p2p istemcisi"
 
 #. type: SH
-#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
-#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
-#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "KULLANIM"
 
 #. type: Plain text
-#: amule.1.in:10 amulegui.1.in:10
+#: amule.1.in amulegui.1.in
 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.in:14 amuled.1.in:16
+#: amule.1.in amuled.1.in
 msgid "B<-w> I<E<lt>pathE<gt>>"
 msgstr "B<-w> I<E<lt>yolE<gt>>"
 
 #. type: Plain text
-#: amule.1.in:18 amuled.1.in:20
-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ı>"
+#: amule.1.in amuled.1.in
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
+msgstr "B<-t> I<E<lt>sayıE<gt>> I<eD2k-bağlantısı>|I<koleksiyon-dosyası>"
 
 #. type: SH
-#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
-#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
-#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "AÇIKLAMA"
 
 #. type: TP
-#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
-#: ../../src/utils/cas/docs/cas.1.in:30
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:29 amulegui.1.in:30
+#: amule.1.in amulegui.1.in
 #, 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.in:32 amulegui.1.in:33
+#: amule.1.in amulegui.1.in
 msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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:\tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Prints log messages to stdout."
 msgstr "Günlük mesajlarını standart çıktıya gönderir."
 
 #. type: Plain text
-#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Resets config to default values."
 msgstr "Yapılandırmayı varsayılan değerlere sıfırlar."
 
 #. type: Plain text
-#: amule.1.in:42
+#: amule.1.in
 msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Kullanıcı oturum açtığında aMule'ün başlatılmasını etkinleştirir veya devre dışı bırakır.  İşletim sistemine has depo otomatik olarak seçilir: Windows için kayıt defteri (registry) Çalıştırma anahtarı, macOS için LaunchAgent, GNU/Linux için XDG I<.desktop> otomatik başlatma unsuru."
 
 #. type: TP
-#: amule.1.in:42 amuled.1.in:50
+#: amule.1.in amuled.1.in
 #, 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.in:45 amuled.1.in:53
+#: amule.1.in amuled.1.in
 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.in:50 amuled.1.in:58 amulegui.1.in:51
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
 msgstr "Ölümcül istisnaları yakalama ve doğrulamalarda çıkmayı engellemez.  Otomatik yeniden başlatmayı engelleyen, normalde modal olan onay diyalog kutusunun bulunmadığı, başsız/denetimli kurulumlar (systemd, watchdog betikleri) için kullanışlıdır."
 
 #. type: Plain text
-#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Does not disable stdin."
 msgstr "Standart girdiyi (stdin) devre dışı bırakmaz."
 
 #. type: TP
-#: amule.1.in:53 amulegui.1.in:54
+#: amule.1.in amulegui.1.in
 #, 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.in:56 amuled.1.in:64 amulegui.1.in:57
+#: amule.1.in amuled.1.in amulegui.1.in
 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.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
-#: amuleweb.1.in:130 ed2k.1.in:40
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
 msgid "Displays the current version number."
 msgstr "Geçerli sürüm numarasını görüntüler."
 
 #. type: Plain text
-#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
-#: amuleweb.1.in:127 ed2k.1.in:37
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
-#: ../../src/utils/cas/docs/cas.1.in:33
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Prints a short usage description."
 msgstr "Kısa bir kullanım açıklaması görüntüler."
 
 #. type: TP
-#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
+#: amule.1.in amuled.1.in
 #, no-wrap
-msgid "B< eD2k-link >"
-msgstr "B< eD2k-bağlantısı >"
+msgid "B< eD2k-link | collection-file >"
+msgstr "B< eD2k-bağlantısı | koleksiyon-dosyası >"
 
 #. type: Plain text
-#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
-msgid "Adds an eD2k-link to the core."
-msgstr "Çekirdeğe bir eD2k bağlantısı ekler."
+#: amule.1.in amuled.1.in
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
+msgstr "Çekirdeğe bir eD2k bağlantısını ya da bir eMule koleksiyon dosyasındaki her bağlantıyı ekler."
 
 #. type: Plain text
-#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "The eD2k link to be added can be:"
 msgstr "Eklenecek eD2k bağlantısı şunlardan biri olabilir:"
 
 #. type: Plain text
-#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 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.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 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.in:74 amuled.1.in:82 ed2k.1.in:52
+#: amule.1.in amuled.1.in ed2k.1.in
 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.in:76 amuled.1.in:84
+#: amule.1.in amuled.1.in
 msgid "a magnet link."
 msgstr "bir magnet bağlantısı."
 
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr "Alternatif olarak, argüman bir .emulecollection dosyasının yolu veya onu isimlendiren bir file:// URL'i olabilir, ki bu durumda içerdiği her bağlantı indirme kuyruğuna eklenir.  Bu, bir dosya yöneticisinin koleksiyonları aMule ile açmasına imkân sağlar."
+
 #. type: SH
-#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "NOTES"
 msgstr "NOTLAR"
 
 #. type: SS
-#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Paths"
 msgstr "Yollar"
 
 #. type: Plain text
-#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 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.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
-#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "FILES"
 msgstr "DOSYALAR"
 
 #. type: Plain text
-#: amule.1.in:84 amuled.1.in:87
+#: amule.1.in amuled.1.in
 msgid "~/.aMule/*"
 msgstr "~/.aMule/*"
 
 #. type: SH
-#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
-#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
-#: ../../src/utils/cas/docs/cas.1.in:43
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr "GERİBİLDİRİM"
 
 #. type: Plain text
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  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<https://github.com/amule-org/amule/discussions>) ya da hata takipçimizi (I<https://github.com/amule-org/amule/issues>) 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.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "TELİF HAKKI"
 
 #. type: Plain text
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "İLGİLİ BELGELER"
 
 #. type: SH
-#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
-#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
-#: ../../src/utils/cas/docs/cas.1.in:50
-#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "AUTHOR"
 msgstr "YAZAN"
 
 #. type: Plain text
-#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
-#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
-#: ../../src/utils/cas/docs/cas.1.in:51
-#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "AMULECMD"
 msgstr "AMULECMD"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "aMuleCmd v@PACKAGE_VERSION@"
 msgstr "aMuleCmd v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "aMule utilities"
 msgstr "aMule yardımcı araçları"
 
 #. type: Plain text
-#: amulecmd.1.in:7
+#: amulecmd.1.in
 msgid "amulecmd - Console-based program to control aMule"
 msgstr "amulecmd - aMule'ü yönetmek için konsol temelli bir program"
 
 #. type: Plain text
-#: amulecmd.1.in:13 amuleweb.1.in:12
+#: amulecmd.1.in amuleweb.1.in
 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.in:17
+#: amulecmd.1.in
 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.in:20 amuleweb.1.in:31
+#: amulecmd.1.in amuleweb.1.in
 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.in:29
+#: amulecmd.1.in
 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.in:29 amuleweb.1.in:46
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 msgid "Host where aMule is running (default: I<127.0.0.1>).  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<127.0.0.1>). I<E<lt>sunucuE<gt>> bir IP adresi ya da DNS ismi olabilir"
 
 #. type: TP
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 msgid "External Connections password."
 msgstr "Dışarıdan kurulan bağlantılar için şifre."
 
 #. type: TP
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:43 amuleweb.1.in:60
+#: amulecmd.1.in amuleweb.1.in
 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.in:46 amuleweb.1.in:63
+#: amulecmd.1.in amuleweb.1.in
 msgid "Do not print any output to stdout."
 msgstr "Standart çıktıya hiçbir veri yazdırmaz."
 
 #. type: Plain text
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 msgid "Be verbose - show also debug messages."
 msgstr "Geveze olur - debug mesajlarını da gösterir."
 
 #. type: TP
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:54 amuleweb.1.in:71
+#: amulecmd.1.in amuleweb.1.in
 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.in:57 amuleweb.1.in:74
+#: amulecmd.1.in amuleweb.1.in
 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.in:57
+#: amulecmd.1.in
 #, 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.in:60
+#: amulecmd.1.in
 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.in:60 amuleweb.1.in:117
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:63 amuleweb.1.in:120
+#: amulecmd.1.in amuleweb.1.in
 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: Plain text
-#: amulecmd.1.in:67 amuleweb.1.in:124
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr "Harici Bağlantı bağlantısını şifreleme.  Şifreleme uzaktaki aMule bunu desteklediğinde otomatik olarak müzakere edilir ve gerek uzak, gerekse yerel her hedef için varsaylan olarak etkindir.  Bunu devre dışı bırakmak oturum açıldıktan sonraki her şeyi bağlantıyı gözlemleyebilen herkes tarafından okunabilir ve değiştirilebilir olarak bırakır."
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
 msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
 msgstr "Seçilen IP adresinin konumuna bakılmaksızın Harici Bağlantı için ZLIB sıkıştırmasını zorlar.  Sunucuya, bir LAN IP adresine çözümlenen VPN tüneli üzerinden erişilebildiğinde ve aksi takdirde sezgisel algoritmanın sıkıştırmayı atlayacağı durumlarda kullanışlıdır."
 
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.  Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output."
+msgstr "Liste komutlarının alanlarını, önceki sürümlerde olduğu gibi sekmeler yerine boşluklarla ayırın. İstemci isimleri ve dosya adları boşluk içerebilir, dolayısıyla bir komut dosyasının bir satırı tekrar alanlarına bölmesine olanak tanıyan şey varsayılan sekme ayırıcıdır; bunu yalnızca eski çıktıya karşı yazılan komut dosyaları için kullanın."
+
 #. type: SH
-#: amulecmd.1.in:73
+#: amulecmd.1.in
 #, no-wrap
 msgid "COMMANDS"
 msgstr "KOMUTLAR"
 
 #. type: Plain text
-#: amulecmd.1.in:75
+#: amulecmd.1.in
 msgid "All commands are case insensitive."
 msgstr "Tüm komutlar harf büyüklüğüne duyarsızdır."
 
 #. type: Plain text
-#: amulecmd.1.in:77
+#: amulecmd.1.in
 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.in:86
+#: amulecmd.1.in
 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.in:89
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:91
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:93
+#: amulecmd.1.in
 msgid "Connect to the network."
 msgstr "Ağa bağlanır."
 
 #. type: Plain text
-#: amulecmd.1.in:95
+#: amulecmd.1.in
 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.in:99
+#: amulecmd.1.in
 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.in:102
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:104
+#: amulecmd.1.in
 msgid "Start downloading a file."
 msgstr "Bir dosyayı indirmeye başlar."
 
 #. type: Plain text
-#: amulecmd.1.in:108
-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."
+#: amulecmd.1.in
+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ğerinin girilmesi gerekir.  Mesela 'download 12' son aramadaki 12 numaralı dosyayı indirmeye başlar."
 
 #. type: Plain text
-#: amulecmd.1.in:110
+#: amulecmd.1.in
 msgid "Disconnect from amule/amuled and quit amulecmd."
 msgstr "amule/amuled ile bağlantıyı keser ve amulecmd kapanır."
 
 #. type: Plain text
-#: amulecmd.1.in:112
+#: amulecmd.1.in
 msgid "Get and display a preference value."
 msgstr "Bir ayar değerini görüntüler."
 
 #. type: Plain text
-#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+#: amulecmd.1.in
 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.in:117
+#: amulecmd.1.in
 msgid "Get bandwidth limits."
 msgstr "Bant genişliği değerlerini görüntüler."
 
 #. type: Plain text
-#: amulecmd.1.in:119
+#: amulecmd.1.in
 msgid "Get IPFilter preferences."
 msgstr "IPFilter ayarlarını görüntüler."
 
 #. type: Plain text
-#: amulecmd.1.in:124
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:126
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:128
+#: amulecmd.1.in
 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.in:130
+#: amulecmd.1.in
 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.in:133
+#: amulecmd.1.in
 msgid "Automatic priority."
 msgstr "Otomatik öncelik."
 
 #. type: Plain text
-#: amulecmd.1.in:135
+#: amulecmd.1.in
 msgid "High priority."
 msgstr "Yüksek öncelik."
 
 #. type: Plain text
-#: amulecmd.1.in:137
+#: amulecmd.1.in
 msgid "Low priority."
 msgstr "Düşük öncelik."
 
 #. type: Plain text
-#: amulecmd.1.in:139
+#: amulecmd.1.in
 msgid "Normal priority."
 msgstr "Normal öncelik."
 
 #. type: Plain text
-#: amulecmd.1.in:142
-msgid "Shows the progress of an on-going search."
-msgstr "Sürmekte olan bir aramanın ilerlemesini gösterir."
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr "Devam etmekte olan bir aramanın ilerleyişini gösterir. Seçime dayalı olarak bir arama  I<E<lt>idE<gt>> yani kimliği alır (B<search> tarafından gösterileceği üzere); kimlik yoksa en son başlatılan aramayı gösterir."
 
 #. type: Plain text
-#: amulecmd.1.in:144
+#: amulecmd.1.in
 msgid "A synonym of the B<exit> command."
 msgstr "B<exit> komutu ile eş anlamlıdır."
 
 #. type: Plain text
-#: amulecmd.1.in:146
+#: amulecmd.1.in
 msgid "Reloads a given object."
 msgstr "Belirtilen değeri yeniden yükler."
 
 #. type: Plain text
-#: amulecmd.1.in:151
+#: amulecmd.1.in
 msgid "Reload shared files list."
 msgstr "Paylaşılan dosyalar listesini yeniden yükler."
 
 #. type: Plain text
-#: amulecmd.1.in:153
+#: amulecmd.1.in
 msgid "Reload IP filter tables."
 msgstr "IP filtre tablolarını yeniden yükler."
 
 #. type: Plain text
-#: amulecmd.1.in:156
+#: amulecmd.1.in
 msgid "Reset the log."
 msgstr "Günlüğü sıfırlar."
 
 #. type: Plain text
-#: amulecmd.1.in:158
-msgid "Shows you the results of the last search."
-msgstr "Son aramanın sonuçlarını gösterir."
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr "Size bir aramanın sonuçlarını gösterir. Seçime dayalı olarak bir arama  I<E<lt>idE<gt>> yani kimliği alır (B<search> tarafından gösterileceği üzere); kimlik yoksa en son başlatılan aramayı gösterir.  Aynı anda birden fazla arama çekirdekte muhafaza edilebilir ve kimlikleriyle hedef alınabilir."
 
 #. type: Plain text
-#: amulecmd.1.in:160
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:164
-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."
+#: amulecmd.1.in
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
+msgstr "Girilen I<E<lt>anahtarkelimeE<gt>> için bir arama yapar. Bir arama türü ve bir anahtar kelime kullanmanız mecburidir.  Mesela 'search kad amule' kad ağında 'amule' sözcüğü ile arama yapar.  Bir arama kimliği görüntüler; bu aramayı hedef almak için onu B<results> veya B<progress> ile kullanın. Birden fazla arama aynı anda çalışabilir, her biri kendi kimliğine sahip olur."
 
 #. type: Plain text
-#: amulecmd.1.in:166
+#: amulecmd.1.in
 msgid "Available search types:"
 msgstr "Kullanılabilecek arama türleri:"
 
 #. type: Plain text
-#: amulecmd.1.in:169
+#: amulecmd.1.in
 msgid "Performs a global search."
 msgstr "Genel arama yapar."
 
 #. type: Plain text
-#: amulecmd.1.in:171
+#: amulecmd.1.in
 msgid "Performs a search on the Kademlia network."
 msgstr "Kad ağında arama yapar."
 
 #. type: Plain text
-#: amulecmd.1.in:173
+#: amulecmd.1.in
 msgid "Performs a local search."
 msgstr "Sunucuda arama yapar."
 
 #. type: Plain text
-#: amulecmd.1.in:177
+#: amulecmd.1.in
 msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
 msgstr "Seçime dayalı filtreler arama kelimelerinden evvel, sonra veya onların arasında konumlandırılabilir:"
 
 #. type: Plain text
-#: amulecmd.1.in:180
+#: amulecmd.1.in
 msgid "Restrict results to the given file type."
 msgstr "Sonuçları belirtilen dosya türüyle snırla."
 
 #. type: Plain text
-#: amulecmd.1.in:182
+#: amulecmd.1.in
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
 msgstr "Sonuçları belli bir dosya uzantısı ile sınırla (mesela \\ I<iso>, I<mp3>)."
 
 #. type: Plain text
-#: amulecmd.1.in:184
+#: amulecmd.1.in
 msgid "Minimum number of sources a result must report."
 msgstr "Bir sonucun bildirmesi gereken asgari kaynak sayısı."
 
 #. type: Plain text
-#: amulecmd.1.in:187
+#: amulecmd.1.in
 msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
 msgstr "Geri gönderilecek asgari dosya boyutu. Uzantılar ikili çarpanlar kullanır  (K = 1024, M = K\\(mu1024, G = M\\(mu1024); uzantı yoksa bayt anlamına gelir."
 
 #. type: Plain text
-#: amulecmd.1.in:189
+#: amulecmd.1.in
 msgid "Largest file size to return. Same suffixes as B<--min-size>."
 msgstr "Geri gönderilecek azami dosya boyutu. B<--min-size> ile aynı uzantılar geçerlidir."
 
 #. type: Plain text
-#: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
-msgstr "Örnek: `search global linux iso --type Iso --min-size 100M', \\(lqlinux iso\\(rq için asgari 100 MiB boyutunda ve Iso dosya türünde sonuçlar geri gönderir."
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
+msgstr "Örnek: 'search global linux iso --type Iso --min-size 100M', 'linux iso' için asgari 100 MiB boyutunda ve Iso dosya türünde sonuçlar geri gönderir."
 
 #. type: Plain text
-#: amulecmd.1.in:195
+#: amulecmd.1.in
 msgid "Sets a given preferences value."
 msgstr "Belirtilen değeri ayarlara girer."
 
 #. type: Plain text
-#: amulecmd.1.in:200
+#: amulecmd.1.in
 msgid "Set bandwidth limits."
 msgstr "Bant genişliği değerlerini ayarlar."
 
 #. type: Plain text
-#: amulecmd.1.in:202
+#: amulecmd.1.in
 msgid "Set IPFilter preferences."
 msgstr "IPFilter tercihlerini ayarlar."
 
 #. type: Plain text
-#: amulecmd.1.in:205
+#: amulecmd.1.in
 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.in:210
+#: amulecmd.1.in
 msgid "Show download queue."
 msgstr "İndirme kuyruğunu gösterir."
 
 #. type: Plain text
-#: amulecmd.1.in:212
+#: amulecmd.1.in
 msgid "Show log."
 msgstr "Günlüğü (log) gösterir."
 
 #. type: Plain text
-#: amulecmd.1.in:214
+#: amulecmd.1.in
 msgid "Show servers list."
 msgstr "Sunucu listesini gösterir."
 
 #. type: Plain text
-#: amulecmd.1.in:216
+#: amulecmd.1.in
 msgid "Show shared files list."
 msgstr "Paylaşılan dosyalar listesini göster."
 
 #. type: Plain text
-#: amulecmd.1.in:218
+#: amulecmd.1.in
 msgid "Show upload queue."
 msgstr "Aktarma (gönderilen dosyalar) kuyruğunu gösterir."
 
 #. type: Plain text
-#: amulecmd.1.in:222
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:224
+#: amulecmd.1.in
 msgid "Show statistics tree."
 msgstr "İstatistikler ağacını gösterir."
 
 #. type: Plain text
-#: amulecmd.1.in:228
-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."
+#: amulecmd.1.in
+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.in:231
-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."
+#: amulecmd.1.in
+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.in:233
+#: amulecmd.1.in
 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.in:238 amuleweb.1.in:141
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Languages"
 msgstr "Diller"
 
 #. type: Plain text
-#: amulecmd.1.in:244 amuleweb.1.in:147
+#: amulecmd.1.in amuleweb.1.in
 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.in:246 amuleweb.1.in:149
+#: amulecmd.1.in amuleweb.1.in
 msgid "For example, the following strings are valid:"
 msgstr "Örnek olarak, aşağıdaki dizeler geçerlidir:"
 
 #. type: Plain text
-#: amulecmd.1.in:260 amuleweb.1.in:163
+#: amulecmd.1.in amuleweb.1.in
 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.in:263 amuleweb.1.in:166
+#: amulecmd.1.in amuleweb.1.in
 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.in:266 amuleweb.1.in:169
+#: amulecmd.1.in amuleweb.1.in
 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.in:268 amuleweb.1.in:177
+#: amulecmd.1.in amuleweb.1.in
 msgid "~/.aMule/remote.conf"
 msgstr "~/.aMule/remote.conf"
 
 #. type: SH
-#: amulecmd.1.in:268 amuleweb.1.in:181
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "ÖRNEK"
 
 #. type: Plain text
-#: amulecmd.1.in:270
+#: amulecmd.1.in
 msgid "Typically amulecmd will be first run as:"
 msgstr "Tipik olarak amulecmd ilk defada şu şekilde başlayacaktır:"
 
 #. type: Plain text
-#: amulecmd.1.in:272
+#: amulecmd.1.in
 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.in:274 amuleweb.1.in:187
+#: amulecmd.1.in amuleweb.1.in
 msgid "or"
 msgstr "ya da"
 
 #. type: Plain text
-#: amulecmd.1.in:276
+#: amulecmd.1.in
 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.in:278 amuleweb.1.in:191
+#: amulecmd.1.in amuleweb.1.in
 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.in:282
+#: amulecmd.1.in
 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.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "AMULED"
 msgstr "AMULED"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon v@PACKAGE_VERSION@"
 msgstr "aMule Daemon v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon"
-msgstr "aMule Daemon"
+msgstr "aMule Daemon'u"
 
 #. type: Plain text
-#: amuled.1.in:6
+#: amuled.1.in
 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.in:9 ../../src/utils/cas/docs/cas.1.in:11
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
 msgid "B<-c> I<E<lt>pathE<gt>>"
 msgstr "B<-c> I<E<lt>yolE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:11
+#: amuled.1.in
 msgid "B<-p> I<E<lt>pathE<gt>>"
 msgstr "B<-p> I<E<lt>yolE<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:33
+#: amuled.1.in
 msgid "Forks to background."
 msgstr "Kendisini arkaplana çatallar."
 
 #. type: TP
-#: amuled.1.in:33
+#: amuled.1.in
 #, 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.in:37
+#: amuled.1.in
 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.in:40
+#: amuled.1.in
 msgid "Configure EC (External Connections)."
 msgstr "DB (Dış Bağlantılar) Kurulumu."
 
 #. type: Plain text
-#: amuled.1.in:50
+#: amuled.1.in
 msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Kullanıcı oturum açtığında amuled'nin başlatılmasını etkinleştirir veya devre dışı bırakır.  İşletim sistemine has depo otomatik olarak seçilir: Windows için kayıt defteri (registry) Çalıştırma anahtarı, macOS için LaunchAgent, GNU/Linux için XDG I<.desktop> otomatik başlatma unsuru."
 
 #. type: TP
-#: amuled.1.in:61
+#: amuled.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "AMULEGUI"
 msgstr "AMULEGUI"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI v@PACKAGE_VERSION@"
 msgstr "aMuleGUI v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
 #. type: Plain text
-#: amulegui.1.in:6
+#: amulegui.1.in
 msgid "amulegui - aMule control program with GUI"
 msgstr "amulegui - Grafik arayüzlü aMule yönetme programı"
 
 #. type: Plain text
-#: amulegui.1.in:17
+#: amulegui.1.in
 msgid "B<-t> I<E<lt>numE<gt>>"
 msgstr "B<-t> I<E<lt>sayıE<gt>>"
 
 #. type: Plain text
-#: amulegui.1.in:27
+#: amulegui.1.in
 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.in:42
+#: amulegui.1.in
 msgid "Skip connection dialog."
 msgstr "Bağlantı diyaloğunu geç."
 
 #. type: Plain text
-#: amulegui.1.in:46
+#: amulegui.1.in
 msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr "Kullanıcı oturum açtığında amulegui'nin başlatılmasını etkinleştirir veya devre dışı bırakır.  İşletim sistemine has depo otomatik olarak seçilir: Windows için kayıt defteri (registry) Çalıştırma anahtarı, macOS için LaunchAgent, GNU/Linux için XDG I<.desktop> otomatik başlatma unsuru."
 
 #. type: Plain text
-#: amulegui.1.in:72
+#: amulegui.1.in
 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.in:73
+#: amulegui.1.in
 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.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "AMULEWEB"
 msgstr "AMULEWEB"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "aMule webserver v@PACKAGE_VERSION@"
 msgstr "aMule webserver v@PACKAGE_VERSION@"
 
 #. type: Plain text
-#: amuleweb.1.in:6
+#: amuleweb.1.in
 msgid "amuleweb - aMule web server"
 msgstr "amuleweb - aMule web sunucusu"
 
 #. type: Plain text
-#: amuleweb.1.in:15
+#: amuleweb.1.in
 msgid "B<-l> I<E<lt>langE<gt>>"
 msgstr "B<-l> I<E<lt>dilE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:18
+#: amuleweb.1.in
 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.in:20
+#: amuleweb.1.in
 msgid "B<-U> I<E<lt>portE<gt>>"
 msgstr "B<-U> I<E<lt>portE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:24
+#: amuleweb.1.in
 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.in:40
+#: amuleweb.1.in
 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.in:46
+#: amuleweb.1.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr "B<DEPRECATED:> amuleweb eskimiş olarak kabul edilir ve aMule 3.2 veya daha sonraki bir sürümde kaldırılabilecektir.  Henüz kaldırılmamıştır; REST/SSE API'sı olan amuleapi'ya geçiş yapmayı değerlendirin."
+
+#. type: Plain text
+#: amuleweb.1.in
 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.in:74
+#: amuleweb.1.in
 #, 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.in:77
+#: amuleweb.1.in
 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.in:77
+#: amuleweb.1.in
 #, 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.in:80
+#: amuleweb.1.in
 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.in:84
+#: amuleweb.1.in
 msgid "Enable UPnP."
 msgstr "UPnP'yi etkinleştirir."
 
 #. type: TP
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 #, 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.in:87
+#: amuleweb.1.in
 msgid "UPnP port."
 msgstr "UPnP port numarası."
 
 #. type: Plain text
-#: amuleweb.1.in:90
+#: amuleweb.1.in
 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.in:93
+#: amuleweb.1.in
 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.in:93
+#: amuleweb.1.in
 #, 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.in:96
+#: amuleweb.1.in
 msgid "Full access password for webserver."
 msgstr "Sunucuya tam erişim için şifre (parola)."
 
 #. type: TP
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 #, 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.in:99
+#: amuleweb.1.in
 msgid "Guest password for webserver."
 msgstr "Web sunucusu için misafir şifresi."
 
 #. type: Plain text
-#: amuleweb.1.in:102
+#: amuleweb.1.in
 msgid "Allows guest access."
 msgstr "Misafir erişimini etkinleştirir."
 
 #. type: Plain text
-#: amuleweb.1.in:105
+#: amuleweb.1.in
 msgid "Denies guest access (default)."
 msgstr "Misafir erişimine izin vermez (varsayılan değer)."
 
 #. type: Plain text
-#: amuleweb.1.in:111
+#: amuleweb.1.in
 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ı uzaktaki 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.in:114
+#: amuleweb.1.in
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "PHP yorumlayıcısını devre dışı bırakır (eskimiş)"
 
 #. type: Plain text
-#: amuleweb.1.in:117
+#: amuleweb.1.in
 msgid "Recompiles PHP pages on each request."
 msgstr "PHP sayfalarını her sorguda yeniden derler."
 
 #. type: TP
-#: amuleweb.1.in:130
+#: amuleweb.1.in
 #, 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.in:136
+#: amuleweb.1.in
 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.in:169
+#: amuleweb.1.in
 #, no-wrap
 msgid "SKIN SUPPORT"
 msgstr "TEMA DESTEĞİ"
 
 #. type: Plain text
-#: amuleweb.1.in:173
+#: amuleweb.1.in
 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.in:175
+#: amuleweb.1.in
 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.in:179
+#: amuleweb.1.in
 msgid "~/.aMule/webserver/"
 msgstr "~/.aMule/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:181
+#: amuleweb.1.in
 msgid "I<$(pkgdatadir)>/webserver/"
 msgstr "I<$(pkgdatadir)>/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:183
+#: amuleweb.1.in
 msgid "Typically amuleweb will be first run as:"
 msgstr "Tipik olarak amuleweb ilk defada şu şekilde başlayacaktır:"
 
 #. type: Plain text
-#: amuleweb.1.in:185
+#: amuleweb.1.in
 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.in:189
+#: amuleweb.1.in
 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.in:195
+#: amuleweb.1.in
 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.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "ED2K"
 msgstr "ED2K"
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, 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.in:6
+#: ed2k.1.in
 msgid "ed2k - aMule eD2k link parser"
 msgstr "ed2k - aMule eD2k bağlantı çözümleyicisi"
 
 #. type: Plain text
-#: ed2k.1.in:10
+#: ed2k.1.in
 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.in:13
+#: ed2k.1.in
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr "I<E<lt>eD2k-bağlantısıE<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:21
+#: ed2k.1.in
 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: TP
-#: ed2k.1.in:24
+#: ed2k.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 
 #. type: Plain text
-#: ed2k.1.in:28
+#: ed2k.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
 msgstr "Kategori belirler, I<E<lt>numE<gt>> unsuruna aktarılan eD2k bağlantıları için.   B<--config-dir> aksine, ayrıştırıcı değeri sonraki argüman olarak okur ve B<--category>=I<E<lt>numE<gt>> söz dizimini kabul etmez."
 
 #. type: Plain text
-#: ed2k.1.in:31
+#: ed2k.1.in
 msgid "Loads all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "I<E<lt>ed2k-bağlantısıE<gt>> olarak aktarılan bir emule koleksiyonunda bulunan tüm bağlantıları yükler"
 
 #. type: Plain text
-#: ed2k.1.in:34
+#: ed2k.1.in
 msgid "Lists all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "I<E<lt>ed2k-bağlantısıE<gt>> olarak aktarılan bir emule koleksiyonunda bulunan tüm bağlantıları listeler"
 
+#. type: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< eD2k-bağlantısı >"
+
 #. type: Plain text
-#: ed2k.1.in:54
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr "Çekirdeğe bir eD2k bağlantısı ekler."
+
+#. type: Plain text
+#: ed2k.1.in
 msgid "a magnet link;"
 msgstr "bir magnet bağlantısı;"
 
 #. type: Plain text
-#: ed2k.1.in:56
+#: ed2k.1.in
 msgid "an emulecollection file."
 msgstr "bir emulecollection dosyası."
 
 #. type: Plain text
-#: ed2k.1.in:61
+#: ed2k.1.in
 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.in:63
+#: ed2k.1.in
 msgid "~/.aMule/ED2KLinks"
 msgstr "~/.aMule/ED2KLinks"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "ALC"
 msgstr "ALC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "aLinkCreator"
 msgstr "aLinkCreator"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:9
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:11
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This app doesn't take any arguments."
 msgstr "Bu uygulama hiçbir argüman almaz."
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "ALCC"
 msgstr "ALCC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "aMule eD2k links calculator"
 msgstr "aMule eD2k bağlantı hesaplayıcısı"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "I<E<lt>inputfiles_listE<gt>>"
 msgstr "I<E<lt>girdidosya_listesiE<gt>>"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:26
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "CAS"
 msgstr "CAS"
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "cas v0.8"
 msgstr "cas v0.8"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "cas - c aMule statistics"
 msgstr "cas - c aMule istatistikleri"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:18
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:23
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
 msgstr "Çevrim içi imza resmini yazar.  Uzun biçimli B<--picture> çıktı konumunu belirtmek için seçime dayalı bir I<=E<lt>YOLE<gt>> kabul eder, kısa biçimli B<-o> / B<-P> kendisini hemen izleyen bir I<E<lt>YOLE<gt>> argümanı gerektirmez (B<-P> ve B<-o> argümansız bir seçenektir.   (I<__GD__>) içinde derlenmiş GD desteğine ihtiyaç duyar; aksi takdirde bu seçenek sessizce görmezden gelinir."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
 msgstr "İstatistikler ve resim içeren HTML sayfası.  Uzun biçimli B<--html> çıktı konumunu belirtmek için seçime dayalı bir I<=E<lt>YOLE<gt>> kabul eder, kısa biçimli B<-p> / B<-H> kendisini hemen izleyen bir I<E<lt>YOLE<gt>> argümanı gerektirmez (B<-H> ve B<-p> argümansız bir seçenektir."
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:35
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:37
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:39
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "~/.aMule/casrc"
 msgstr "~/.aMule/casrc"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:41
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
 msgstr "aMule-online-sign.png (veya .jpg, B<-o> / B<--picture>kullanıldığında ve GD mevcut olduğunda)"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
 msgstr "aMule-online-sign.html (B<-p> / B<--html> kullanıldığında)"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "WXCAS"
 msgstr "WXCAS"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "wxCas"
 msgstr "wxCas"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "wxcas - wx c aMule statistics"
 msgstr "wxcas - wx c aMule istatistikleri"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:14
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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"
 
+#~ msgid "Shows the progress of an on-going search."
+#~ msgstr "Sürmekte olan bir aramanın ilerlemesini gösterir."
+
+#~ msgid "Shows you the results of the last search."
+#~ msgstr "Son aramanın sonuçlarını gösterir."
+
 #~ 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."

amule-3.1.0.tar.gz/docs/man/po/manpages-vi.po Added

@@ -0,0 +1,1363 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2026-07-17 16:56+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: none\n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. type: TH
+#: amule.1.in:1
+#, no-wrap
+msgid "AMULE"
+msgstr ""
+
+#. type: TH
+#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
+#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#, no-wrap
+msgid "@MAN_DATE@"
+msgstr ""
+
+#. type: TH
+#: amule.1.in:1
+#, no-wrap
+msgid "aMule v@PACKAGE_VERSION@"
+msgstr ""
+
+#. type: TH
+#: amule.1.in:1
+#, no-wrap
+msgid "aMule"
+msgstr ""
+
+#. type: SH
+#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
+#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
+#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#, no-wrap
+msgid "NAME"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:6
+msgid "amule - the all-platform eMule p2p client"
+msgstr ""
+
+#. type: SH
+#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
+#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:10 amulegui.1.in:10
+msgid "B<-c> I<E<lt>pathE<gt>> B<-geometry> I<E<lt>geomE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:14 amuled.1.in:16
+msgid "B<-w> I<E<lt>pathE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:18 amuled.1.in:20
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
+msgstr ""
+
+#. type: SH
+#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
+#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
+#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr ""
+
+#. type: TP
+#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
+#: ../../src/utils/cas/docs/cas.1.in:27
+#, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
+#: ../../src/utils/cas/docs/cas.1.in:30
+msgid "Read config from I<E<lt>pathE<gt>> instead of home"
+msgstr ""
+
+#. type: TP
+#: amule.1.in:29 amulegui.1.in:30
+#, no-wrap
+msgid "B< -geometry >I<E<lt>geomE<gt>> B<>"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:32 amulegui.1.in:33
+msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+msgid "Prints log messages to stdout."
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+msgid "Resets config to default values."
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:42
+msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
+msgstr ""
+
+#. type: TP
+#: amule.1.in:42 amuled.1.in:50
+#, 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.in:45 amuled.1.in:53
+msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:50 amuled.1.in:58 amulegui.1.in:51
+msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+msgid "Does not disable stdin."
+msgstr ""
+
+#. type: TP
+#: amule.1.in:53 amulegui.1.in:54
+#, no-wrap
+msgid "B< -t>, B<--category>=I<E<lt>numE<gt>> B<>"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:56 amuled.1.in:64 amulegui.1.in:57
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
+#: amuleweb.1.in:134 ed2k.1.in:40
+msgid "Displays the current version number."
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
+#: amuleweb.1.in:131 ed2k.1.in:37
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
+#: ../../src/utils/cas/docs/cas.1.in:33
+msgid "Prints a short usage description."
+msgstr ""
+
+#. type: TP
+#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
+msgid "Adds an eD2k-link to the core."
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+msgid "The eD2k link to be added can be:"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+msgid "a server link (ed2k://|server|...), it will be added to the server list;"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:74 amuled.1.in:82 ed2k.1.in:52
+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.in:76 amuled.1.in:84
+msgid "a magnet link."
+msgstr ""
+
+#. type: SH
+#: amule.1.in:77 amulecmd.1.in:238 amuleweb.1.in:140
+#, no-wrap
+msgid "NOTES"
+msgstr ""
+
+#. type: SS
+#: amule.1.in:78 amulecmd.1.in:239 amuleweb.1.in:141
+#, no-wrap
+msgid "Paths"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:82 amulecmd.1.in:243 amuleweb.1.in:145
+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.in:82 amulecmd.1.in:271 amuled.1.in:85 amuleweb.1.in:179
+#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#, no-wrap
+msgid "FILES"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:84 amuled.1.in:87
+msgid "~/.aMule/*"
+msgstr ""
+
+#. type: SH
+#: amule.1.in:84 amulecmd.1.in:287 amuled.1.in:87 amulegui.1.in:63
+#: amuleweb.1.in:199 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
+#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:87 amulecmd.1.in:290 amuled.1.in:90 amulegui.1.in:66
+#: amuleweb.1.in:202 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
+#: ../../src/utils/cas/docs/cas.1.in:46
+#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member."
+msgstr ""
+
+#. type: SH
+#: amule.1.in:87 amulecmd.1.in:290 amuled.1.in:90 amulegui.1.in:66
+#: amuleweb.1.in:202 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
+#: ../../src/utils/cas/docs/cas.1.in:46
+#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:89 amulecmd.1.in:292 amuled.1.in:92 amulegui.1.in:68
+#: amuleweb.1.in:204 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
+#: ../../src/utils/cas/docs/cas.1.in:48
+#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+msgid "aMule and all of its related utilities are distributed under the GNU General Public License."
+msgstr ""
+
+#. type: SH
+#: amule.1.in:89 amulecmd.1.in:292 amuled.1.in:92 amulegui.1.in:68
+#: amuleweb.1.in:204 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
+#: ../../src/utils/cas/docs/cas.1.in:48
+#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#, no-wrap
+msgid "SEE ALSO"
+msgstr ""
+
+#. type: SH
+#: amule.1.in:91 amulecmd.1.in:294 amuled.1.in:94 amulegui.1.in:70
+#: amuleweb.1.in:206 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
+#: ../../src/utils/cas/docs/cas.1.in:50
+#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#, no-wrap
+msgid "AUTHOR"
+msgstr ""
+
+#. type: Plain text
+#: amule.1.in:92 amulecmd.1.in:295 amuled.1.in:95 amuleweb.1.in:207
+#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
+#: ../../src/utils/cas/docs/cas.1.in:51
+#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+msgid "This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+
+#. type: TH
+#: amulecmd.1.in:1
+#, no-wrap
+msgid "AMULECMD"
+msgstr ""
+
+#. type: TH
+#: amulecmd.1.in:1
+#, no-wrap
+msgid "aMuleCmd v@PACKAGE_VERSION@"
+msgstr ""
+
+#. type: TH
+#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#, no-wrap
+msgid "aMule utilities"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:7
+msgid "amulecmd - Console-based program to control aMule"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:13 amuleweb.1.in: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.in: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.in:20 amuleweb.1.in:31
+msgid "B<--create-config-from>=I<E<lt>pathE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:29
+msgid "B<amulecmd> is a console-based client to control aMule."
+msgstr ""
+
+#. type: TP
+#: amulecmd.1.in:29 amuleweb.1.in:50
+#, no-wrap
+msgid "B< -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:33 amuleweb.1.in:54
+msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
+msgstr ""
+
+#. type: TP
+#: amulecmd.1.in:33 amuleweb.1.in:54
+#, no-wrap
+msgid "B< -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:36 amuleweb.1.in:57
+msgid "aMule's port for External Connections, as set in Preferences-E<gt>Remote Controls (default: I<4712>)"
+msgstr ""
+
+#. type: TP
+#: amulecmd.1.in:36 amuleweb.1.in:57
+#, no-wrap
+msgid "B< -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:39 amuleweb.1.in:60
+msgid "External Connections password."
+msgstr ""
+
+#. type: TP
+#: amulecmd.1.in:39 amuleweb.1.in:60
+#, 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.in:43 amuleweb.1.in:64
+msgid "Use the given configuration file.  Default configuration file is I<~/.aMule/remote.conf>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:46 amuleweb.1.in:67
+msgid "Do not print any output to stdout."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:50 amuleweb.1.in:71
+msgid "Be verbose - show also debug messages."
+msgstr ""
+
+#. type: TP
+#: amulecmd.1.in:50 amuleweb.1.in:71
+#, no-wrap
+msgid "B< -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:54 amuleweb.1.in:75
+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.in:57 amuleweb.1.in:78
+msgid "Write command line options to config file and exit"
+msgstr ""
+
+#. type: TP
+#: amulecmd.1.in: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.in:60
+msgid "Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and exit."
+msgstr ""
+
+#. type: TP
+#: amulecmd.1.in:60 amuleweb.1.in:121
+#, no-wrap
+msgid "B< --create-config-from>=I<E<lt>pathE<gt>> B<>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:63 amuleweb.1.in:124
+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: Plain text
+#: amulecmd.1.in:67 amuleweb.1.in:128
+msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
+msgstr ""
+
+#. type: SH
+#: amulecmd.1.in:73
+#, no-wrap
+msgid "COMMANDS"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:75
+msgid "All commands are case insensitive."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:77
+msgid "Adds an eD2k-link or a magnet-link to the core."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:86
+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.in:89
+msgid "The magnet link must contain the eD2k hash and file length."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:91
+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: Plain text
+#: amulecmd.1.in:93
+msgid "Connect to the network."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:95
+msgid "This will connect to all networks that are enabled in Preferences."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:99
+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.in:102
+msgid "Disconnect from all networks you are connected to, or just disconnect from the specified network."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:104
+msgid "Start downloading a file."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:108
+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.in:110
+msgid "Disconnect from amule/amuled and quit amulecmd."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:112
+msgid "Get and display a preference value."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:114 amulecmd.1.in:149 amulecmd.1.in:202 amulecmd.1.in:212
+msgid "Available values for I<E<lt>whatE<gt>>:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:117
+msgid "Get bandwidth limits."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:119
+msgid "Get IPFilter preferences."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:124
+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: Plain text
+#: amulecmd.1.in:126
+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: Plain text
+#: amulecmd.1.in:128
+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.in:130
+msgid "Available values for I<E<lt>priorityE<gt>>:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:133
+msgid "Automatic priority."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:135
+msgid "High priority."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:137
+msgid "Low priority."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:139
+msgid "Normal priority."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:143
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:145
+msgid "A synonym of the B<exit> command."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:147
+msgid "Reloads a given object."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:152
+msgid "Reload shared files list."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:154
+msgid "Reload IP filter tables."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:157
+msgid "Reset the log."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:161
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:163
+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: Plain text
+#: amulecmd.1.in:169
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:171
+msgid "Available search types:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:174
+msgid "Performs a global search."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:176
+msgid "Performs a search on the Kademlia network."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:178
+msgid "Performs a local search."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:182
+msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:185
+msgid "Restrict results to the given file type."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:187
+msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:189
+msgid "Minimum number of sources a result must report."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:192
+msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:194
+msgid "Largest file size to return. Same suffixes as B<--min-size>."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:198
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:200
+msgid "Sets a given preferences value."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:205
+msgid "Set bandwidth limits."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:207
+msgid "Set IPFilter preferences."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:210
+msgid "Shows upload/download queue, servers list or shared files list."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:215
+msgid "Show download queue."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:217
+msgid "Show log."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:219
+msgid "Show servers list."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:221
+msgid "Show shared files list."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:223
+msgid "Show upload queue."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:227
+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: Plain text
+#: amulecmd.1.in:229
+msgid "Show statistics tree."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:233
+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.in:236
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:238
+msgid "Show connection status, current up/download speeds, etc."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1.in:243 amuleweb.1.in:145
+#, no-wrap
+msgid "Languages"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:249 amuleweb.1.in:151
+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.in:251 amuleweb.1.in:153
+msgid "For example, the following strings are valid:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:265 amuleweb.1.in:167
+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.in:268 amuleweb.1.in:170
+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.in:271 amuleweb.1.in:173
+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.in:273 amuleweb.1.in:181
+msgid "~/.aMule/remote.conf"
+msgstr ""
+
+#. type: SH
+#: amulecmd.1.in:273 amuleweb.1.in:185
+#, no-wrap
+msgid "EXAMPLE"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:275
+msgid "Typically amulecmd will be first run as:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:277
+msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:279 amuleweb.1.in:191
+msgid "or"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:281
+msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:283 amuleweb.1.in:195
+msgid "These will save settings to I<$HOME/.aMule/remote.conf>, and later you only need to type:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in:287
+msgid "Of course, you don't have to follow this example."
+msgstr ""
+
+#. type: TH
+#: amuled.1.in:1
+#, no-wrap
+msgid "AMULED"
+msgstr ""
+
+#. type: TH
+#: amuled.1.in:1
+#, no-wrap
+msgid "aMule Daemon v@PACKAGE_VERSION@"
+msgstr ""
+
+#. type: TH
+#: amuled.1.in:1
+#, no-wrap
+msgid "aMule Daemon"
+msgstr ""
+
+#. type: Plain text
+#: amuled.1.in:6
+msgid "amuled - the all-platform eMule p2p client - daemonized version"
+msgstr ""
+
+#. type: Plain text
+#: amuled.1.in:9 ../../src/utils/cas/docs/cas.1.in:11
+msgid "B<-c> I<E<lt>pathE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amuled.1.in:11
+msgid "B<-p> I<E<lt>pathE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amuled.1.in:33
+msgid "Forks to background."
+msgstr ""
+
+#. type: TP
+#: amuled.1.in:33
+#, 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.in:37
+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.in:40
+msgid "Configure EC (External Connections)."
+msgstr ""
+
+#. type: Plain text
+#: amuled.1.in:50
+msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
+msgstr ""
+
+#. type: TP
+#: amuled.1.in:61
+#, no-wrap
+msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
+msgstr ""
+
+#. type: TH
+#: amulegui.1.in:1
+#, no-wrap
+msgid "AMULEGUI"
+msgstr ""
+
+#. type: TH
+#: amulegui.1.in:1
+#, no-wrap
+msgid "aMuleGUI v@PACKAGE_VERSION@"
+msgstr ""
+
+#. type: TH
+#: amulegui.1.in:1
+#, no-wrap
+msgid "aMuleGUI"
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1.in:6
+msgid "amulegui - aMule control program with GUI"
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1.in:17
+msgid "B<-t> I<E<lt>numE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1.in:27
+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.in:42
+msgid "Skip connection dialog."
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1.in:46
+msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1.in:72
+msgid "This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm DOT orgE<gt>"
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1.in:73
+msgid "This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+
+#. type: TH
+#: amuleweb.1.in:1
+#, no-wrap
+msgid "AMULEWEB"
+msgstr ""
+
+#. type: TH
+#: amuleweb.1.in:1
+#, no-wrap
+msgid "aMule webserver v@PACKAGE_VERSION@"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:6
+msgid "amuleweb - aMule web server"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:15
+msgid "B<-l> I<E<lt>langE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:18
+msgid "B<-t> I<E<lt>nameE<gt>> B<-s> I<E<lt>portE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:20
+msgid "B<-U> I<E<lt>portE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:24
+msgid "B<-A> I<E<lt>passwordE<gt>> B<-G> I<E<lt>passwordE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:40
+msgid "B<--amule-config-file>=I<E<lt>pathE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:45
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:50
+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.in:78
+#, no-wrap
+msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:81
+msgid "Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section for details."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1.in:81
+#, 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.in:84
+msgid "Webserver's HTTP port. This is the port you must point your browser to (default: I<4711>)."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:88
+msgid "Enable UPnP."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1.in:88
+#, 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.in:91
+msgid "UPnP port."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:94
+msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:97
+msgid "Disables using gzip compression (this is the default)."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1.in:97
+#, 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.in:100
+msgid "Full access password for webserver."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1.in:100
+#, 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.in:103
+msgid "Guest password for webserver."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:106
+msgid "Allows guest access."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:109
+msgid "Denies guest access (default)."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:115
+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.in:118
+msgid "Disable PHP interpreter (deprecated)"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:121
+msgid "Recompiles PHP pages on each request."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1.in:134
+#, no-wrap
+msgid "B< --amule-config-file>=I<E<lt>pathE<gt>> B<>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:140
+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.in:173
+#, no-wrap
+msgid "SKIN SUPPORT"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:177
+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.in:179
+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.in:183
+msgid "~/.aMule/webserver/"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:185
+msgid "I<$(pkgdatadir)>/webserver/"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:187
+msgid "Typically amuleweb will be first run as:"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:189
+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.in:193
+msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in:199
+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.in:1
+#, no-wrap
+msgid "ED2K"
+msgstr ""
+
+#. type: TH
+#: ed2k.1.in:1
+#, no-wrap
+msgid "aMule eD2k link parser v1.5.1"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1.in:6
+msgid "ed2k - aMule eD2k link parser"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1.in:10
+msgid "B<-c> I<E<lt>pathE<gt>> B<-t> I<E<lt>numE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1.in:13
+msgid "I<E<lt>eD2k-linkE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1.in: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: TP
+#: ed2k.1.in:24
+#, no-wrap
+msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1.in:28
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1.in:31
+msgid "Loads all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1.in:34
+msgid "Lists all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1.in:54
+msgid "a magnet link;"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1.in:56
+msgid "an emulecollection file."
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1.in:61
+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.in:63
+msgid "~/.aMule/ED2KLinks"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#, no-wrap
+msgid "ALC"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#, no-wrap
+msgid "aLinkCreator"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+msgid "aLinkCreator - the aMule eD2k link creator"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1.in: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.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+msgid "This app doesn't take any arguments."
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#, no-wrap
+msgid "ALCC"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#, no-wrap
+msgid "aMule eD2k links calculator"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+msgid "alcc - text based eD2k links calculator for aMule"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:11
+msgid "I<E<lt>inputfiles_listE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in: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.in:19
+msgid "Compute and add part hashes to the computed eD2k links."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
+msgid "Be verbose - show also calculation steps."
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1.in:1
+#, no-wrap
+msgid "CAS"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1.in:1
+#, no-wrap
+msgid "cas v0.8"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:6
+msgid "cas - c aMule statistics"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in: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.in:23
+msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:27
+msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:35
+msgid "Without any options, it prints online signature data to stdout."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:37
+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.in:39
+msgid "~/.aMule/casrc"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:41
+msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1.in:43
+msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#, no-wrap
+msgid "WXCAS"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#, no-wrap
+msgid "wxCas"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+msgid "wxcas - wx c aMule statistics"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1.in: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.in:14
+msgid "Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish E<lt>thepolish@vipmail.ruE<gt>"
+msgstr ""

amule-3.0.1.tar.gz/docs/man/po/manpages-zh_Hans.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-zh_Hans.po Changed

amule-3.0.1.tar.gz/docs/man/po/manpages-zh_TW.po -> amule-3.1.0.tar.gz/docs/man/po/manpages-zh_TW.po Changed

@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: aMule Manual zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-10 16:45+0200\n"
-"PO-Revision-Date: 2026-06-18 22:16+0000\n"
+"POT-Creation-Date: 2026-08-24 19:02+0200\n"
+"PO-Revision-Date: 2026-09-20 21:09+0000\n"
 "Last-Translator: Wayne Su <mstarmstar@gmail.com>\n"
 "Language-Team: \n"
 "Language: zh_TW\n"
@@ -24,1357 +24,1392 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "AMULE"
 msgstr "AMULE"
 
 #. type: TH
-#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
-#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "@MAN_DATE@"
 msgstr "@MAN_DATE@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule v@PACKAGE_VERSION@"
 msgstr "aMule v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule"
 msgstr "aMule"
 
 #. type: SH
-#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
-#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
-#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "NAME"
 msgstr "名稱"
 
 #. type: Plain text
-#: amule.1.in:6
+#: amule.1.in
 msgid "amule - the all-platform eMule p2p client"
 msgstr "amule - 跨平台的 eMule P2P 客戶端程式"
 
 #. type: SH
-#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
-#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
-#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "簡介"
 
 #. type: Plain text
-#: amule.1.in:10 amulegui.1.in:10
+#: amule.1.in amulegui.1.in
 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.in:14 amuled.1.in:16
+#: amule.1.in amuled.1.in
 msgid "B<-w> I<E<lt>pathE<gt>>"
 msgstr "B<-w> I<E<lt>路徑E<gt>>"
 
 #. type: Plain text
-#: amule.1.in:18 amuled.1.in:20
-msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
+#: amule.1.in amuled.1.in
+#, fuzzy
+#| msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
 msgstr "B<-t> I<E<lt>號碼E<gt>> I<eD2k 連結>"
 
 #. type: SH
-#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
-#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
-#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "說明"
 
 #. type: TP
-#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
-#: ../../src/utils/cas/docs/cas.1.in:30
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Read config from I<E<lt>pathE<gt>> instead of home"
 msgstr "從 I<E<lt>pathE<gt>> 讀取設定檔，而不是個人目錄"
 
 #. type: TP
-#: amule.1.in:29 amulegui.1.in:30
+#: amule.1.in amulegui.1.in
 #, 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.in:32 amulegui.1.in:33
+#: amule.1.in amulegui.1.in
 msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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 應用程式一樣的格式：\tB<=>I<E<lt>寬度E<gt>>{B<xX>}I<E<lt>高度E<gt>>{B<+->}I<E<lt>X 偏移E<gt>>{B<+->}I<E<lt>Y 偏移E<gt>>"
 
 #. type: Plain text
-#: amule.1.in:35 amuled.1.in:43 amulegui.1.in:36
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Prints log messages to stdout."
 msgstr "將程式記錄顯示在標準輸出。"
 
 #. type: Plain text
-#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Resets config to default values."
 msgstr "將設定重設為預設值。"
 
 #. type: Plain text
-#: amule.1.in:42
+#: amule.1.in
 msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: TP
-#: amule.1.in:42 amuled.1.in:50
+#: amule.1.in amuled.1.in
 #, 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.in:45 amuled.1.in:53
+#: amule.1.in amuled.1.in
 msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
 msgstr "設定 amuleweb 的執行檔位置在 I<E<lt>路徑E<gt>>。"
 
 #. type: Plain text
-#: amule.1.in:50 amuled.1.in:58 amulegui.1.in:51
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Does not disable stdin."
 msgstr "不停用標準輸入。"
 
 #. type: TP
-#: amule.1.in:53 amulegui.1.in:54
+#: amule.1.in amulegui.1.in
 #, 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.in:56 amuled.1.in:64 amulegui.1.in:57
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
 msgstr "給輸入成功的 eD2k 連結分類編號為 I<E<lt>號碼E<gt>>"
 
 #. type: Plain text
-#: amule.1.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
-#: amuleweb.1.in:130 ed2k.1.in:40
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
 msgid "Displays the current version number."
 msgstr "顯示目前的版本號碼。"
 
 #. type: Plain text
-#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
-#: amuleweb.1.in:127 ed2k.1.in:37
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
-#: ../../src/utils/cas/docs/cas.1.in:33
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Prints a short usage description."
 msgstr "顯示簡短的使用說明。"
 
 #. type: TP
-#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
-#, no-wrap
-msgid "B< eD2k-link >"
+#: amule.1.in amuled.1.in
+#, fuzzy, no-wrap
+#| msgid "B< eD2k-link >"
+msgid "B< eD2k-link | collection-file >"
 msgstr "B< eD2k 連結 >"
 
 #. type: Plain text
-#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
-msgid "Adds an eD2k-link to the core."
-msgstr "將 eD2k 連結加到核心。"
+#: amule.1.in amuled.1.in
+#, fuzzy
+#| msgid "Adds an eD2k-link or a magnet-link to the core."
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
+msgstr "將 eD2k 連結或 magnet 加到核心。"
 
 #. type: Plain text
-#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "The eD2k link to be added can be:"
 msgstr "可以使用以下幾種 eD2k 連結："
 
 #. type: Plain text
-#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
 msgstr "檔案連結 (ed2k://|file|...)，會將檔案加入下載等候區；"
 
 #. type: Plain text
-#: amule.1.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a server link (ed2k://|server|...), it will be added to the server list;"
 msgstr "伺服器連結 (ed2k://|server|...)，會將伺服器加入 aMule 的伺服器清單；"
 
 #. type: Plain text
-#: amule.1.in:74 amuled.1.in:82 ed2k.1.in:52
+#: amule.1.in amuled.1.in ed2k.1.in
 msgid "a serverlist link, in which case all servers in the list will be added to the server list;"
 msgstr "伺服器清單連結，在清單內的伺服器會被加入 aMule 的伺服器清單；"
 
 #. type: Plain text
-#: amule.1.in:76 amuled.1.in:84
+#: amule.1.in amuled.1.in
 msgid "a magnet link."
 msgstr "magnet 連結。"
 
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr ""
+
 #. type: SH
-#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "NOTES"
 msgstr "附註"
 
 #. type: SS
-#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Paths"
 msgstr "路徑"
 
 #. type: Plain text
-#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 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<路徑> 裏面沒有含目錄 (即只有單純檔名)，則會被認為是在 aMule 的設定檔所在目錄 I<~/.aMule> 下。"
 
 #. type: SH
-#: amule.1.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
-#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "FILES"
 msgstr "檔案"
 
 #. type: Plain text
-#: amule.1.in:84 amuled.1.in:87
+#: amule.1.in amuled.1.in
 msgid "~/.aMule/*"
 msgstr "~/.aMule/*"
 
 #. type: SH
-#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
-#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
-#: ../../src/utils/cas/docs/cas.1.in:43
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr "回報問題"
 
 #. type: Plain text
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member."
 msgstr "請到我們的論壇 (I<https://github.com/amule-org/amule/discussions>) 或錯誤追蹤網站 (I<https://github.com/amule-org/amule/issues>) 回報發現的問題。請不要用 e-mail 或在我們的群組信件中回報，也不要直接通知某個團隊成員。"
 
 #. type: SH
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "版權"
 
 #. type: Plain text
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "aMule and all of its related utilities are distributed under the GNU General Public License."
 msgstr "aMule 與附加的工具程式都遵守 GNU 的 GPL 協定。"
 
 #. type: SH
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "參考"
 
 #. type: SH
-#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
-#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
-#: ../../src/utils/cas/docs/cas.1.in:50
-#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
-#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
-#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
-#: ../../src/utils/cas/docs/cas.1.in:51
-#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr "說明文件撰寫者： Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "AMULECMD"
 msgstr "AMULECMD"
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "aMuleCmd v@PACKAGE_VERSION@"
 msgstr "aMuleCmd v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "aMule utilities"
 msgstr "aMule 的工具程式"
 
 #. type: Plain text
-#: amulecmd.1.in:7
+#: amulecmd.1.in
 msgid "amulecmd - Console-based program to control aMule"
 msgstr "amulecmd - 終端機模式下控制 aMule 的程式"
 
 #. type: Plain text
-#: amulecmd.1.in:13 amuleweb.1.in:12
+#: amulecmd.1.in amuleweb.1.in
 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.in:17
+#: amulecmd.1.in
 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.in:20 amuleweb.1.in:31
+#: amulecmd.1.in amuleweb.1.in
 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.in:29
+#: amulecmd.1.in
 msgid "B<amulecmd> is a console-based client to control aMule."
 msgstr "B<amulecmd> 是終端機模式下控制 aMule 的的客戶端程式。"
 
 #. type: TP
-#: amulecmd.1.in:29 amuleweb.1.in:46
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
 msgstr "正在執行 aMule 核心的主機 (預設：I<127.0.0.1>)， I<E<lt>主機E<gt>> 可以是 IP 位址或網域名稱"
 
 #. type: TP
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 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.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 msgid "External Connections password."
 msgstr "外部連線密碼。"
 
 #. type: TP
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:43 amuleweb.1.in:60
+#: amulecmd.1.in amuleweb.1.in
 msgid "Use the given configuration file.  Default configuration file is I<~/.aMule/remote.conf>"
 msgstr "使用指定的設定檔，預設是 I<~/.aMule/remote.conf>"
 
 #. type: Plain text
-#: amulecmd.1.in:46 amuleweb.1.in:63
+#: amulecmd.1.in amuleweb.1.in
 msgid "Do not print any output to stdout."
 msgstr "不將任何資訊顯示在標準輸出。"
 
 #. type: Plain text
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 msgid "Be verbose - show also debug messages."
 msgstr "詳細模式 - 也顯示除錯訊息。"
 
 #. type: TP
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:54 amuleweb.1.in:71
+#: amulecmd.1.in amuleweb.1.in
 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.in:57 amuleweb.1.in:74
+#: amulecmd.1.in amuleweb.1.in
 msgid "Write command line options to config file and exit"
 msgstr "將命令列選項寫入設定檔後離開"
 
 #. type: TP
-#: amulecmd.1.in:57
+#: amulecmd.1.in
 #, 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.in:60
+#: amulecmd.1.in
 msgid "Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and exit."
 msgstr "像在 amulecmd 的命令列模式下一樣，執行 I<E<lt>指令E<gt>> 後離開。"
 
 #. type: TP
-#: amulecmd.1.in:60 amuleweb.1.in:117
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:63 amuleweb.1.in:120
+#: amulecmd.1.in amuleweb.1.in
 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>pathE<gt>> 裏的資料來建立設定檔後離開。(I<E<lt>pathE<gt>> 裏必須有有效的 aMule 設定檔)"
 
 #. type: Plain text
-#: amulecmd.1.in:67 amuleweb.1.in:124
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
 msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
 msgstr ""
 
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.  Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output."
+msgstr ""
+
 #. type: SH
-#: amulecmd.1.in:73
+#: amulecmd.1.in
 #, no-wrap
 msgid "COMMANDS"
 msgstr "指令"
 
 #. type: Plain text
-#: amulecmd.1.in:75
+#: amulecmd.1.in
 msgid "All commands are case insensitive."
 msgstr "所有指令都不分大小寫。"
 
 #. type: Plain text
-#: amulecmd.1.in:77
+#: amulecmd.1.in
 msgid "Adds an eD2k-link or a magnet-link to the core."
 msgstr "將 eD2k 連結或 magnet 加到核心。"
 
 #. type: Plain text
-#: amulecmd.1.in:86
+#: amulecmd.1.in
 msgid "a serverlist link, in which case all servers in the list will be added to the server list."
 msgstr "伺服器清單，所有在這個清單內的伺服器都會被加到 aMule 的伺服器清單。"
 
 #. type: Plain text
-#: amulecmd.1.in:89
+#: amulecmd.1.in
 msgid "The magnet link must contain the eD2k hash and file length."
 msgstr "magnet 連結裏必須包含 eD2k 的 hash 值和檔案大小。"
 
 #. type: Plain text
-#: amulecmd.1.in:91
+#: amulecmd.1.in
 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>hash 值E<gt>> 或 I<E<lt>編號E<gt>>；要查詢數值請用 B<show>。"
 
 #. type: Plain text
-#: amulecmd.1.in:93
+#: amulecmd.1.in
 msgid "Connect to the network."
 msgstr "連線到網路。"
 
 #. type: Plain text
-#: amulecmd.1.in:95
+#: amulecmd.1.in
 msgid "This will connect to all networks that are enabled in Preferences."
 msgstr "這樣將會連線到在偏好設定中啟用的所有網路。"
 
 #. type: Plain text
-#: amulecmd.1.in:99
+#: amulecmd.1.in
 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:port」格式指定伺服器的位址 (IP 可以用有小數點的十進位 IPv4 網址，或是可從 DNS 轉換的網域名稱)，aMule 就會只連線到那個伺服器。"
 
 #. type: Plain text
-#: amulecmd.1.in:102
+#: amulecmd.1.in
 msgid "Disconnect from all networks you are connected to, or just disconnect from the specified network."
 msgstr "中斷所有已連線的網路，或只中斷指定的網路連線。"
 
 #. type: Plain text
-#: amulecmd.1.in:104
+#: amulecmd.1.in
 msgid "Start downloading a file."
 msgstr "開始下載檔案。"
 
 #. type: Plain text
-#: amulecmd.1.in:108
-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."
+#: amulecmd.1.in
+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.in:110
+#: amulecmd.1.in
 msgid "Disconnect from amule/amuled and quit amulecmd."
 msgstr "始 amule/amuled 斷線，並離開 amulecmd。"
 
 #. type: Plain text
-#: amulecmd.1.in:112
+#: amulecmd.1.in
 msgid "Get and display a preference value."
 msgstr "取得並顯示某個偏好設定的值。"
 
 #. type: Plain text
-#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>whatE<gt>>:"
 msgstr "I<E<lt>目標E<gt>> 參數可用的值："
 
 #. type: Plain text
-#: amulecmd.1.in:117
+#: amulecmd.1.in
 msgid "Get bandwidth limits."
 msgstr "取得頻寬限制。"
 
 #. type: Plain text
-#: amulecmd.1.in:119
+#: amulecmd.1.in
 msgid "Get IPFilter preferences."
 msgstr "取得 IP 過濾器的偏好設定。"
 
 #. type: Plain text
-#: amulecmd.1.in:124
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:126
+#: amulecmd.1.in
 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>hash 值E<gt>> 或 I<E<lt>編號E<gt>>；要查詢數值請用 B<show>。"
 
 #. type: Plain text
-#: amulecmd.1.in:128
+#: amulecmd.1.in
 msgid "Set priority of a download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>."
 msgstr "用 I<E<lt>hash 值E<gt>> 或 I<E<lt>編號E<gt>> 設定下載檔案的優先程度。"
 
 #. type: Plain text
-#: amulecmd.1.in:130
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>priorityE<gt>>:"
 msgstr "可用在 I<E<lt>優先度E<gt>> 的參數："
 
 #. type: Plain text
-#: amulecmd.1.in:133
+#: amulecmd.1.in
 msgid "Automatic priority."
 msgstr "自動優先權。"
 
 #. type: Plain text
-#: amulecmd.1.in:135
+#: amulecmd.1.in
 msgid "High priority."
 msgstr "高優先權。"
 
 #. type: Plain text
-#: amulecmd.1.in:137
+#: amulecmd.1.in
 msgid "Low priority."
 msgstr "低優先權。"
 
 #. type: Plain text
-#: amulecmd.1.in:139
+#: amulecmd.1.in
 msgid "Normal priority."
 msgstr "一般優先權。"
 
 #. type: Plain text
-#: amulecmd.1.in:142
-msgid "Shows the progress of an on-going search."
-msgstr "顯示正在進行中的搜尋進度。"
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
+msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:144
+#: amulecmd.1.in
 #, fuzzy
 #| msgid "A synonim of the B<exit> command."
 msgid "A synonym of the B<exit> command."
 msgstr "功能和 B<exit> 一樣的指令。"
 
 #. type: Plain text
-#: amulecmd.1.in:146
+#: amulecmd.1.in
 msgid "Reloads a given object."
 msgstr "重新載入指定的物件。"
 
 #. type: Plain text
-#: amulecmd.1.in:151
+#: amulecmd.1.in
 msgid "Reload shared files list."
 msgstr "重新載入分享檔案清單。"
 
 #. type: Plain text
-#: amulecmd.1.in:153
+#: amulecmd.1.in
 msgid "Reload IP filter tables."
 msgstr "重新載入 IP 過濾器資料。"
 
 #. type: Plain text
-#: amulecmd.1.in:156
+#: amulecmd.1.in
 msgid "Reset the log."
 msgstr "清除記錄。"
 
 #. type: Plain text
-#: amulecmd.1.in:158
-msgid "Shows you the results of the last search."
-msgstr "顯示上次搜尋的結果。"
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
+msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:160
+#: amulecmd.1.in
 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>hash 值E<gt>> 或 I<E<lt>編號E<gt>>；要查詢數值請用 B<show>。"
 
 #. type: Plain text
-#: amulecmd.1.in:164
-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'."
+#: amulecmd.1.in
+#, fuzzy
+#| 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'."
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
 msgstr "用指定的 I<E<lt>關鍵字E<gt>> 搜尋。必須要有搜尋的「種類」加上「關鍵字」，例如：「search kad amule」會開始在 KAD 網路搜尋「amule」。"
 
 #. type: Plain text
-#: amulecmd.1.in:166
+#: amulecmd.1.in
 msgid "Available search types:"
 msgstr "可用的搜尋類型："
 
 #. type: Plain text
-#: amulecmd.1.in:169
+#: amulecmd.1.in
 msgid "Performs a global search."
 msgstr "開始在全球伺服器搜尋。"
 
 #. type: Plain text
-#: amulecmd.1.in:171
+#: amulecmd.1.in
 msgid "Performs a search on the Kademlia network."
 msgstr "開始在 Kad 搜尋。"
 
 #. type: Plain text
-#: amulecmd.1.in:173
+#: amulecmd.1.in
 msgid "Performs a local search."
 msgstr "開始在本地伺服器搜尋。"
 
 #. type: Plain text
-#: amulecmd.1.in:177
+#: amulecmd.1.in
 msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:180
+#: amulecmd.1.in
 msgid "Restrict results to the given file type."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:182
+#: amulecmd.1.in
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:184
+#: amulecmd.1.in
 msgid "Minimum number of sources a result must report."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:187
+#: amulecmd.1.in
 msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:189
+#: amulecmd.1.in
 msgid "Largest file size to return. Same suffixes as B<--min-size>."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:195
+#: amulecmd.1.in
 msgid "Sets a given preferences value."
 msgstr "設定指定的偏好設定值。"
 
 #. type: Plain text
-#: amulecmd.1.in:200
+#: amulecmd.1.in
 msgid "Set bandwidth limits."
 msgstr "設定頻寬限制。"
 
 #. type: Plain text
-#: amulecmd.1.in:202
+#: amulecmd.1.in
 msgid "Set IPFilter preferences."
 msgstr "設定 IP過濾器的偏好設定。"
 
 #. type: Plain text
-#: amulecmd.1.in:205
+#: amulecmd.1.in
 msgid "Shows upload/download queue, servers list or shared files list."
 msgstr "顯示 上傳/下載 等候區、伺服器清單 或 分享檔案清單。"
 
 #. type: Plain text
-#: amulecmd.1.in:210
+#: amulecmd.1.in
 msgid "Show download queue."
 msgstr "顯示下載等候區。"
 
 #. type: Plain text
-#: amulecmd.1.in:212
+#: amulecmd.1.in
 msgid "Show log."
 msgstr "顯示記錄。"
 
 #. type: Plain text
-#: amulecmd.1.in:214
+#: amulecmd.1.in
 msgid "Show servers list."
 msgstr "顯示伺服器清單。"
 
 #. type: Plain text
-#: amulecmd.1.in:216
+#: amulecmd.1.in
 #, fuzzy
 #| msgid "Reload shared files list."
 msgid "Show shared files list."
 msgstr "重新載入分享檔案清單。"
 
 #. type: Plain text
-#: amulecmd.1.in:218
+#: amulecmd.1.in
 msgid "Show upload queue."
 msgstr "顯示上傳等候區。"
 
 #. type: Plain text
-#: amulecmd.1.in:222
+#: amulecmd.1.in
 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)。這樣也會關閉文字模式客戶端程式，因為不能在沒有核心下執行。"
 
 #. type: Plain text
-#: amulecmd.1.in:224
+#: amulecmd.1.in
 msgid "Show statistics tree."
 msgstr "顯示統計資訊。"
 
 #. type: Plain text
-#: amulecmd.1.in:228
-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'."
+#: amulecmd.1.in
+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.in:231
-msgid "Example: `statistics 5' will show only the top 5 versions for each client type."
+#: amulecmd.1.in
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
 msgstr "範例：「statistics 5」只會顯示每個客戶端種類的前 5 個版本。"
 
 #. type: Plain text
-#: amulecmd.1.in:233
+#: amulecmd.1.in
 msgid "Show connection status, current up/download speeds, etc."
 msgstr "顯示 連線狀態、目前的上傳/下載速度 等等。"
 
 #. type: SS
-#: amulecmd.1.in:238 amuleweb.1.in:141
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Languages"
 msgstr "語言"
 
 #. type: Plain text
-#: amulecmd.1.in:244 amuleweb.1.in:147
+#: amulecmd.1.in amuleweb.1.in
 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> 選項的 I<E<lt>語系E<gt>> 參數有以下幾種樣式：I<lang>B<_>I<LANG>B<.>I<encoding>B<@>I<modifier>。其中：I<lang> 是主要的語系代碼，I<LANG> 是語系次分類、使用地區代碼，I<encoding> 是使用的編碼，I<modifier> 則讓使用者用一個代號就指定一組語系設定。例如：「zh_TW.UTF-8@Taiwan」"
 
 #. type: Plain text
-#: amulecmd.1.in:246 amuleweb.1.in:149
+#: amulecmd.1.in amuleweb.1.in
 msgid "For example, the following strings are valid:"
 msgstr "例如，以下的字串都有效："
 
 #. type: Plain text
-#: amulecmd.1.in:260 amuleweb.1.in:163
+#: amulecmd.1.in amuleweb.1.in
 msgid "Though all the above strings are accepted as valid language definitions, I<encoding> and I<modifier> are yet unused."
 msgstr "雖然上面這些都是合於規定的語系設定參數，但 I<encoding> 和 I<modifier> 目前已經沒在使用了。"
 
 #. type: Plain text
-#: amulecmd.1.in:263 amuleweb.1.in:166
+#: amulecmd.1.in amuleweb.1.in
 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 german> 也等於 B<-l de_DE>。"
 
 #. type: Plain text
-#: amulecmd.1.in:266 amuleweb.1.in:169
+#: amulecmd.1.in amuleweb.1.in
 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.in:268 amuleweb.1.in:177
+#: amulecmd.1.in amuleweb.1.in
 msgid "~/.aMule/remote.conf"
 msgstr "~/.aMule/remote.conf"
 
 #. type: SH
-#: amulecmd.1.in:268 amuleweb.1.in:181
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "範例"
 
 #. type: Plain text
-#: amulecmd.1.in:270
+#: amulecmd.1.in
 msgid "Typically amulecmd will be first run as:"
 msgstr "通常 amulecmd 會優先以這樣執行："
 
 #. type: Plain text
-#: amulecmd.1.in:272
+#: amulecmd.1.in
 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<外部連線通訊埠> B<-P> I<外部連線密碼> B<-w>"
 
 #. type: Plain text
-#: amulecmd.1.in:274 amuleweb.1.in:187
+#: amulecmd.1.in amuleweb.1.in
 msgid "or"
 msgstr "或"
 
 #. type: Plain text
-#: amulecmd.1.in:276
+#: amulecmd.1.in
 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.in:278 amuleweb.1.in:191
+#: amulecmd.1.in amuleweb.1.in
 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.in:282
+#: amulecmd.1.in
 msgid "Of course, you don't have to follow this example."
 msgstr "當然，你可以不必都遵照這個範例。"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "AMULED"
 msgstr "AMULED"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon v@PACKAGE_VERSION@"
 msgstr "aMule Daemon v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon"
 msgstr "aMule Daemon"
 
 #. type: Plain text
-#: amuled.1.in:6
+#: amuled.1.in
 msgid "amuled - the all-platform eMule p2p client - daemonized version"
 msgstr "amuled - 跨平台的 eMule P2P 客戶端程式 背景常駐程式版"
 
 #. type: Plain text
-#: amuled.1.in:9 ../../src/utils/cas/docs/cas.1.in:11
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
 msgid "B<-c> I<E<lt>pathE<gt>>"
 msgstr "B<-c> I<E<lt>路徑E<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:11
+#: amuled.1.in
 msgid "B<-p> I<E<lt>pathE<gt>>"
 msgstr "B<-p> I<E<lt>路徑E<gt>>"
 
 #. type: Plain text
-#: amuled.1.in:33
+#: amuled.1.in
 msgid "Forks to background."
 msgstr "在背景開啟新程式。"
 
 #. type: TP
-#: amuled.1.in:33
+#: amuled.1.in
 #, 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.in:37
+#: amuled.1.in
 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 "開啟新程式後，在 I<E<lt>路徑E<gt>> 下建立 pid 檔案。I<E<lt>路徑E<gt>> 裏必須有檔案名稱。"
 
 #. type: Plain text
-#: amuled.1.in:40
+#: amuled.1.in
 msgid "Configure EC (External Connections)."
 msgstr "設定 EC (外部連線)。"
 
 #. type: Plain text
-#: amuled.1.in:50
+#: amuled.1.in
 msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: TP
-#: amuled.1.in:61
+#: amuled.1.in
 #, fuzzy, no-wrap
 #| msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>名稱E<gt>>, B<--template>=I<E<lt>名稱E<gt>> B<>"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "AMULEGUI"
 msgstr "AMULEGUI"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI v@PACKAGE_VERSION@"
 msgstr "aMuleGUI v@PACKAGE_VERSION@"
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
 #. type: Plain text
-#: amulegui.1.in:6
+#: amulegui.1.in
 msgid "amulegui - aMule control program with GUI"
 msgstr "amulegui - 圖形介面的 aMule 控制程式"
 
 #. type: Plain text
-#: amulegui.1.in:17
+#: amulegui.1.in
 msgid "B<-t> I<E<lt>numE<gt>>"
 msgstr "B<-t> I<E<lt>號碼E<gt>>"
 
 #. type: Plain text
-#: amulegui.1.in:27
+#: amulegui.1.in
 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 連線，可以用它來管理 amule 程式。甚至就算核心程式是在別台電腦上執行時，它也能提供和 amule 幾乎一樣的功能。"
 
 #. type: Plain text
-#: amulegui.1.in:42
+#: amulegui.1.in
 msgid "Skip connection dialog."
 msgstr "跳過連線對話。"
 
 #. type: Plain text
-#: amulegui.1.in:46
+#: amulegui.1.in
 msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: Plain text
-#: amulegui.1.in:72
+#: amulegui.1.in
 msgid "This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm DOT orgE<gt>"
 msgstr "說明文件撰寫者： Julien Delange for Debian E<lt>julien AT gunnm DOT orgE<gt>"
 
 #. type: Plain text
-#: amulegui.1.in:73
+#: amulegui.1.in
 msgid "This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr "說明文件撰寫者： Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "AMULEWEB"
 msgstr "AMULEWEB"
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "aMule webserver v@PACKAGE_VERSION@"
 msgstr "aMule webserver v@PACKAGE_VERSION@"
 
 #. type: Plain text
-#: amuleweb.1.in:6
+#: amuleweb.1.in
 msgid "amuleweb - aMule web server"
 msgstr "amuleweb - aMule 網頁伺服器"
 
 #. type: Plain text
-#: amuleweb.1.in:15
+#: amuleweb.1.in
 msgid "B<-l> I<E<lt>langE<gt>>"
 msgstr "B<-l> I<E<lt>語言E<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:18
+#: amuleweb.1.in
 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>通訊埠tE<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:20
+#: amuleweb.1.in
 msgid "B<-U> I<E<lt>portE<gt>>"
 msgstr "B<-U> I<E<lt>通訊埠E<gt>>"
 
 #. type: Plain text
-#: amuleweb.1.in:24
+#: amuleweb.1.in
 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.in:40
+#: amuleweb.1.in
 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.in:46
+#: amuleweb.1.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in
 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。你可以和 B<amule>(1) 一起執行 amuleweb，也可以稍候再另外執行。可以在命令列或是用用設定檔指定參數，命令列參數會優先於設定檔的參數。"
 
 #. type: TP
-#: amuleweb.1.in:74
+#: amuleweb.1.in
 #, 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.in:77
+#: amuleweb.1.in
 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.in:77
+#: amuleweb.1.in
 #, 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.in:80
+#: amuleweb.1.in
 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.in:84
+#: amuleweb.1.in
 msgid "Enable UPnP."
 msgstr "啟用 UPnP。"
 
 #. type: TP
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 #, fuzzy, no-wrap
 #| msgid "B< -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<>"
 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.in:87
+#: amuleweb.1.in
 msgid "UPnP port."
 msgstr "UPnP 通訊埠。"
 
 #. type: Plain text
-#: amuleweb.1.in:90
+#: amuleweb.1.in
 msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
 msgstr "在 HTTP 傳輸時啟用 gzip 壓縮以節省頻寬。"
 
 #. type: Plain text
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 msgid "Disables using gzip compression (this is the default)."
 msgstr "停用 gzip 壓縮 (這是預設值)。"
 
 #. type: TP
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 #, 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.in:96
+#: amuleweb.1.in
 msgid "Full access password for webserver."
 msgstr "網站伺服器的完整存取密碼。"
 
 #. type: TP
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 #, 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.in:99
+#: amuleweb.1.in
 msgid "Guest password for webserver."
 msgstr "網站伺服器的訪客密碼。"
 
 #. type: Plain text
-#: amuleweb.1.in:102
+#: amuleweb.1.in
 msgid "Allows guest access."
 msgstr "允許訪客連線。"
 
 #. type: Plain text
-#: amuleweb.1.in:105
+#: amuleweb.1.in
 msgid "Denies guest access (default)."
 msgstr "禁止訪客連線 (預設)。"
 
 #. type: Plain text
-#: amuleweb.1.in:111
+#: amuleweb.1.in
 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 載入網頁伺服器設定/將設定儲存到遠端。這個會使 amuleweb 忽略命令列與設定檔內的設定、並從遠端載入新設定；儲存時則只會寫入遠端 aMule 的設定。(當然，只限於 aMule 的 偏好設定 E<gt> 遠端控制 裏的幾個設定項目)"
 
 #. type: Plain text
-#: amuleweb.1.in:114
+#: amuleweb.1.in
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "停用 PHP 解譯器 (不建議)"
 
 #. type: Plain text
-#: amuleweb.1.in:117
+#: amuleweb.1.in
 msgid "Recompiles PHP pages on each request."
 msgstr "爲每個要求重編譯 PHP 頁面。"
 
 #. type: TP
-#: amuleweb.1.in:130
+#: amuleweb.1.in
 #, 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.in:136
+#: amuleweb.1.in
 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 時會用這個選項，從指定的設定檔讀取偏好設定，並自行加上 B<-q -L> 選項。"
 
 #. type: SH
-#: amuleweb.1.in:169
+#: amuleweb.1.in
 #, no-wrap
 msgid "SKIN SUPPORT"
 msgstr "外觀面板支援"
 
 #. type: Plain text
-#: amuleweb.1.in:173
+#: amuleweb.1.in
 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> 可以用不同的外觀面板顯示資訊；這些面板稱為「模板」，你可以用在命令列用 B<-t> 選項讓 amuleweb 載入指定的模板。程式會在兩個地方搜尋模板：先從 I<~/.aMule/webserver/>，然後如果是用 --prefix=/usr 安裝程式，就會再到 I</usr/share/amule/webserver/> 搜尋。"
 
 #. type: Plain text
-#: amuleweb.1.in:175
+#: amuleweb.1.in
 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.in:179
+#: amuleweb.1.in
 msgid "~/.aMule/webserver/"
 msgstr "~/.aMule/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:181
+#: amuleweb.1.in
 msgid "I<$(pkgdatadir)>/webserver/"
 msgstr "I<$(pkgdatadir)>/webserver/"
 
 #. type: Plain text
-#: amuleweb.1.in:183
+#: amuleweb.1.in
 msgid "Typically amuleweb will be first run as:"
 msgstr "通常 amuleweb 會優先以這樣執行："
 
 #. type: Plain text
-#: amuleweb.1.in:185
+#: amuleweb.1.in
 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<外部連線通訊埠> B<-P> I<外部連線密碼> B<-s> I<HTTP 通訊埠> B<-A> I<管理者密碼> B<-w>"
 
 #. type: Plain text
-#: amuleweb.1.in:189
+#: amuleweb.1.in
 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.in:195
+#: amuleweb.1.in
 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.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "ED2K"
 msgstr "ED2K"
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "aMule eD2k link parser v1.5.1"
 msgstr "aMule 的 eD2k 連結分析程式 v1.5.1"
 
 #. type: Plain text
-#: ed2k.1.in:6
+#: ed2k.1.in
 msgid "ed2k - aMule eD2k link parser"
 msgstr "ed2k - aMule 的 eD2k 連結分析程式"
 
 #. type: Plain text
-#: ed2k.1.in:10
+#: ed2k.1.in
 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.in:13
+#: ed2k.1.in
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr "I<E<lt>eD2k 連結E<gt>>"
 
 #. type: Plain text
-#: ed2k.1.in:21
+#: ed2k.1.in
 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 隨時都在檢查有無新增連結的 ~/.aMule/ED2KLinks 檔案裏。"
 
 #. type: TP
-#: ed2k.1.in:24
+#: ed2k.1.in
 #, fuzzy, no-wrap
 #| msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 msgstr "B< -t> I<E<lt>名稱E<gt>>, B<--template>=I<E<lt>名稱E<gt>> B<>"
 
 #. type: Plain text
-#: ed2k.1.in:28
+#: ed2k.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:31
+#: ed2k.1.in
 #, fuzzy
 #| msgid "Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgid "Loads all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "載入所有以 I<E<lt>eD2k 連結E<gt>> 方式指定的 eMule 收藏庫裏找到的連結"
 
 #. type: Plain text
-#: ed2k.1.in:34
+#: ed2k.1.in
 #, fuzzy
 #| msgid "Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgid "Lists all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr "列出所有以 I<E<lt>eD2k 連結E<gt>> 方式指定的 eMule 收藏庫裏找到的連結"
 
+#. type: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr "B< eD2k 連結 >"
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr "將 eD2k 連結加到核心。"
+
 #. type: Plain text
-#: ed2k.1.in:54
+#: ed2k.1.in
 msgid "a magnet link;"
 msgstr "magnet 連結；"
 
 #. type: Plain text
-#: ed2k.1.in:56
+#: ed2k.1.in
 msgid "an emulecollection file."
 msgstr "eMule 收藏庫檔案。"
 
 #. type: Plain text
-#: ed2k.1.in:61
+#: ed2k.1.in
 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>連結一E<gt> -t2 E<lt>連結二E<gt>> 會將 I<E<lt>連結一E<gt>> 放在「預設分類」、將 I<E<lt>連結二E<gt>> 放在「分類2」。"
 
 #. type: Plain text
-#: ed2k.1.in:63
+#: ed2k.1.in
 msgid "~/.aMule/ED2KLinks"
 msgstr "~/.aMule/ED2KLinks"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "ALC"
 msgstr "ALC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "aLinkCreator"
 msgstr "aLinkCreator"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 msgid "aLinkCreator - the aMule eD2k link creator"
 msgstr "aLinkCreator - aMule 的 eD2k 連結建立程式"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:9
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:11
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This app doesn't take any arguments."
 msgstr "這個應用程式不接受任何引數。"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "ALCC"
 msgstr "ALCC"
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "aMule eD2k links calculator"
 msgstr "aMule 的 eD2k 連結計算程式"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "alcc - text based eD2k links calculator for aMule"
 msgstr "alcc - aMule 的文字介面 eD2k 連結計算程式"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "I<E<lt>inputfiles_listE<gt>>"
 msgstr "I<E<lt>i輸入檔案清單E<gt>>"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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>輸入檔案清單E<gt>> 裏所有檔案的 eD2k 連結。(可接受一個或多個檔案)"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Compute and add part hashes to the computed eD2k links."
 msgstr "計算並將暫存檔 hash 值新增到已計算好的 eD2k 連結裏。"
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Be verbose - show also calculation steps."
 msgstr "詳細模式 - 也顯示計算的過程。"
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "CAS"
 msgstr "CAS"
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "cas v0.8"
 msgstr "cas v0.8"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "cas - c aMule statistics"
 msgstr "cas - 以 C 語言撰寫的 aMule 統計資訊程式"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:18
+#: ../../src/utils/cas/docs/cas.1.in
 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 線上簽名識別檔的程式。要使用這個功能，你必須在偏好設定裏啟用「線上簽名識別」。"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:23
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:35
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Without any options, it prints online signature data to stdout."
 msgstr "如果沒有選項，會在標準輸出顯示線上簽名識別。"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:37
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:39
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "~/.aMule/casrc"
 msgstr "~/.aMule/casrc"
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:41
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
 msgstr ""
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "WXCAS"
 msgstr "WXCAS"
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "wxCas"
 msgstr "wxCas"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "wxcas - wx c aMule statistics"
 msgstr "wxcas - 以 C 語言、wxWidgets 撰寫的 aMule 統計資訊程式"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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> 是可以在桌面以更佳的 wx 視窗顯示你的 aMule 線上簽名識別檔的程式。要使用這個功能，你必須在偏好設定裏啟用「線上簽名識別」。"
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:14
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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 的 B<cas>(1)， B<wxcas>的作者：ThePolish E<lt>thepolish@vipmail.ruE<gt>"
 
+#~ msgid "Shows the progress of an on-going search."
+#~ msgstr "顯示正在進行中的搜尋進度。"
+
+#~ msgid "Shows you the results of the last search."
+#~ msgstr "顯示上次搜尋的結果。"
+
 #~ 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>> 來指定要儲存的地方。"

amule-3.0.1.tar.gz/docs/man/po/manpages.pot -> amule-3.1.0.tar.gz/docs/man/po/manpages.pot Changed

@@ -5,1345 +5,1367 @@
 #
 #, fuzzy
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nPOT-Creation-Date: 2026-06-10 16:45+0200\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nPOT-Creation-Date: 2026-09-14 14:27+0200\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "AMULE"
 msgstr ""
 
 #. type: TH
-#: amule.1.in:1 amulecmd.1.in:1 amuled.1.in:1 amulegui.1.in:1 amuleweb.1.in:1
-#: ed2k.1.in:1 ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "@MAN_DATE@"
 msgstr ""
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule v@PACKAGE_VERSION@"
 msgstr ""
 
 #. type: TH
-#: amule.1.in:1
+#: amule.1.in
 #, no-wrap
 msgid "aMule"
 msgstr ""
 
 #. type: SH
-#: amule.1.in:4 amulecmd.1.in:5 amuled.1.in:4 amulegui.1.in:4 amuleweb.1.in:4
-#: ed2k.1.in:4 ../../src/utils/aLinkCreator/docs/alc.1.in:3
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:4
-#: ../../src/utils/cas/docs/cas.1.in:4 ../../src/utils/wxCas/docs/wxcas.1.in:3
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "NAME"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:6
+#: amule.1.in
 msgid "amule - the all-platform eMule p2p client"
 msgstr ""
 
 #. type: SH
-#: amule.1.in:6 amulecmd.1.in:7 amuled.1.in:6 amulegui.1.in:6 amuleweb.1.in:6
-#: ed2k.1.in:6 ../../src/utils/aLinkCreator/docs/alc.1.in:5
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
-#: ../../src/utils/cas/docs/cas.1.in:6 ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:10 amulegui.1.in:10
+#: amule.1.in amulegui.1.in
 msgid "B<-c> I<E<lt>pathE<gt>> B<-geometry> I<E<lt>geomE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:14 amuled.1.in:16
+#: amule.1.in amuled.1.in
 msgid "B<-w> I<E<lt>pathE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:18 amuled.1.in:20
-msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>"
+#: amule.1.in amuled.1.in
+msgid "B<-t> I<E<lt>numE<gt>> I<eD2k-link>|I<collection-file>"
 msgstr ""
 
 #. type: SH
-#: amule.1.in:25 amulecmd.1.in:26 amuled.1.in:26 amulegui.1.in:23
-#: amuleweb.1.in:41 ed2k.1.in:19 ../../src/utils/aLinkCreator/docs/alc.1.in:7
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:14
-#: ../../src/utils/cas/docs/cas.1.in:14 ../../src/utils/wxCas/docs/wxcas.1.in:7
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
 
 #. type: TP
-#: amule.1.in:26 amuled.1.in:27 amulegui.1.in:27 ed2k.1.in:21
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, 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.in:29 amuled.1.in:30 amulegui.1.in:30 ed2k.1.in:24
-#: ../../src/utils/cas/docs/cas.1.in:30
+#: amule.1.in amuled.1.in amulegui.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Read config from I<E<lt>pathE<gt>> instead of home"
 msgstr ""
 
 #. type: TP
-#: amule.1.in:29 amulegui.1.in:30
+#: amule.1.in amulegui.1.in
 #, no-wrap
 msgid "B< -geometry >I<E<lt>geomE<gt>> B<>"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:32 amulegui.1.in:33
+#: amule.1.in amulegui.1.in
 msgid "Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as standard X11 apps:\tB<=>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.in:35 amuled.1.in:43 amulegui.1.in:36
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Prints log messages to stdout."
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:38 amuled.1.in:46 amulegui.1.in:39
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Resets config to default values."
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:42
+#: amule.1.in
 msgid "Enable or disable starting aMule on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: TP
-#: amule.1.in:42 amuled.1.in:50
+#: amule.1.in amuled.1.in
 #, 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.in:45 amuled.1.in:53
+#: amule.1.in amuled.1.in
 msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:50 amuled.1.in:58 amulegui.1.in:51
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Don't catch fatal exceptions and don't block exit on assertions.  Useful for headless / supervised setups (systemd, watchdog scripts)  where the otherwise-modal assertion dialog prevents auto-restart."
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:53 amuled.1.in:61 amulegui.1.in:54
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Does not disable stdin."
 msgstr ""
 
 #. type: TP
-#: amule.1.in:53 amulegui.1.in:54
+#: amule.1.in amulegui.1.in
 #, no-wrap
 msgid "B< -t>, B<--category>=I<E<lt>numE<gt>> B<>"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:56 amuled.1.in:64 amulegui.1.in:57
+#: amule.1.in amuled.1.in amulegui.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:59 amulecmd.1.in:70 amuled.1.in:67 amulegui.1.in:63
-#: amuleweb.1.in:130 ed2k.1.in:40
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
 msgid "Displays the current version number."
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:62 amulecmd.1.in:73 amuled.1.in:70 amulegui.1.in:60
-#: amuleweb.1.in:127 ed2k.1.in:37
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:22
-#: ../../src/utils/cas/docs/cas.1.in:33
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Prints a short usage description."
 msgstr ""
 
 #. type: TP
-#: amule.1.in:62 amuled.1.in:70 ed2k.1.in:40
+#: amule.1.in amuled.1.in
 #, no-wrap
-msgid "B< eD2k-link >"
+msgid "B< eD2k-link | collection-file >"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:65 amuled.1.in:73 ed2k.1.in:43
-msgid "Adds an eD2k-link to the core."
+#: amule.1.in amuled.1.in
+msgid "Adds an eD2k-link, or every link in an eMule collection file, to the core."
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:67 amulecmd.1.in:79 amuled.1.in:75 ed2k.1.in:45
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "The eD2k link to be added can be:"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:70 amulecmd.1.in:82 amuled.1.in:78 ed2k.1.in:48
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:72 amulecmd.1.in:84 amuled.1.in:80 ed2k.1.in:50
+#: amule.1.in amulecmd.1.in amuled.1.in ed2k.1.in
 msgid "a server link (ed2k://|server|...), it will be added to the server list;"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:74 amuled.1.in:82 ed2k.1.in:52
+#: amule.1.in amuled.1.in ed2k.1.in
 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.in:76 amuled.1.in:84
+#: amule.1.in amuled.1.in
 msgid "a magnet link."
 msgstr ""
 
+#. type: Plain text
+#: amule.1.in amuled.1.in
+msgid "Alternatively the argument can be the path to an .emulecollection file, or a file:// URL naming one, in which case every link it contains is added to the download queue.  This is what lets a file manager open a collection with aMule."
+msgstr ""
+
 #. type: SH
-#: amule.1.in:77 amulecmd.1.in:233 amuleweb.1.in:136
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "NOTES"
 msgstr ""
 
 #. type: SS
-#: amule.1.in:78 amulecmd.1.in:234 amuleweb.1.in:137
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Paths"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:82 amulecmd.1.in:238 amuleweb.1.in:141
+#: amule.1.in amulecmd.1.in amuleweb.1.in
 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.in:82 amulecmd.1.in:266 amuled.1.in:85 amuleweb.1.in:175
-#: ed2k.1.in:61 ../../src/utils/cas/docs/cas.1.in:37
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:84 amuled.1.in:87
+#: amule.1.in amuled.1.in
 msgid "~/.aMule/*"
 msgstr ""
 
 #. type: SH
-#: amule.1.in:84 amulecmd.1.in:282 amuled.1.in:87 amulegui.1.in:63
-#: amuleweb.1.in:195 ed2k.1.in:63 ../../src/utils/aLinkCreator/docs/alc.1.in:11
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
-#: ../../src/utils/cas/docs/cas.1.in:43
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Please report bugs either on our forum (I<https://github.com/amule-org/amule/discussions>), or in our bugtracker (I<https://github.com/amule-org/amule/issues>).  Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member."
 msgstr ""
 
 #. type: SH
-#: amule.1.in:87 amulecmd.1.in:285 amuled.1.in:90 amulegui.1.in:66
-#: amuleweb.1.in:198 ed2k.1.in:66 ../../src/utils/aLinkCreator/docs/alc.1.in:14
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:29
-#: ../../src/utils/cas/docs/cas.1.in:46
-#: ../../src/utils/wxCas/docs/wxcas.1.in:19
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "aMule and all of its related utilities are distributed under the GNU General Public License."
 msgstr ""
 
 #. type: SH
-#: amule.1.in:89 amulecmd.1.in:287 amuled.1.in:92 amulegui.1.in:68
-#: amuleweb.1.in:200 ed2k.1.in:68 ../../src/utils/aLinkCreator/docs/alc.1.in:16
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:31
-#: ../../src/utils/cas/docs/cas.1.in:48
-#: ../../src/utils/wxCas/docs/wxcas.1.in:21
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: SH
-#: amule.1.in:91 amulecmd.1.in:289 amuled.1.in:94 amulegui.1.in:70
-#: amuleweb.1.in:202 ed2k.1.in:70 ../../src/utils/aLinkCreator/docs/alc.1.in:18
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:33
-#: ../../src/utils/cas/docs/cas.1.in:50
-#: ../../src/utils/wxCas/docs/wxcas.1.in:23
+#: amule.1.in amulecmd.1.in amuled.1.in amulegui.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: amule.1.in:92 amulecmd.1.in:290 amuled.1.in:95 amuleweb.1.in:203
-#: ed2k.1.in:71 ../../src/utils/aLinkCreator/docs/alc.1.in:19
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:34
-#: ../../src/utils/cas/docs/cas.1.in:51
-#: ../../src/utils/wxCas/docs/wxcas.1.in:24
+#: amule.1.in amulecmd.1.in amuled.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr ""
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "AMULECMD"
 msgstr ""
 
 #. type: TH
-#: amulecmd.1.in:1
+#: amulecmd.1.in
 #, no-wrap
 msgid "aMuleCmd v@PACKAGE_VERSION@"
 msgstr ""
 
 #. type: TH
-#: amulecmd.1.in:1 amuleweb.1.in:1 ed2k.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
-#: ../../src/utils/cas/docs/cas.1.in:1 ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: amulecmd.1.in amuleweb.1.in ed2k.1.in
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
+#: ../../src/utils/cas/docs/cas.1.in ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "aMule utilities"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:7
+#: amulecmd.1.in
 msgid "amulecmd - Console-based program to control aMule"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:13 amuleweb.1.in:12
+#: amulecmd.1.in amuleweb.1.in
 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.in:17
+#: amulecmd.1.in
 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.in:20 amuleweb.1.in:31
+#: amulecmd.1.in amuleweb.1.in
 msgid "B<--create-config-from>=I<E<lt>pathE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:29
+#: amulecmd.1.in
 msgid "B<amulecmd> is a console-based client to control aMule."
 msgstr ""
 
 #. type: TP
-#: amulecmd.1.in:29 amuleweb.1.in:46
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "B< -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<>"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 msgid "Host where aMule is running (default: I<127.0.0.1>).  I<E<lt>hostE<gt>> might be an IP address or a DNS name"
 msgstr ""
 
 #. type: TP
-#: amulecmd.1.in:33 amuleweb.1.in:50
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "B< -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<>"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 msgid "aMule's port for External Connections, as set in Preferences-E<gt>Remote Controls (default: I<4712>)"
 msgstr ""
 
 #. type: TP
-#: amulecmd.1.in:36 amuleweb.1.in:53
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "B< -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<>"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 msgid "External Connections password."
 msgstr ""
 
 #. type: TP
-#: amulecmd.1.in:39 amuleweb.1.in:56
+#: amulecmd.1.in amuleweb.1.in
 #, 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.in:43 amuleweb.1.in:60
+#: amulecmd.1.in amuleweb.1.in
 msgid "Use the given configuration file.  Default configuration file is I<~/.aMule/remote.conf>"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:46 amuleweb.1.in:63
+#: amulecmd.1.in amuleweb.1.in
 msgid "Do not print any output to stdout."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 msgid "Be verbose - show also debug messages."
 msgstr ""
 
 #. type: TP
-#: amulecmd.1.in:50 amuleweb.1.in:67
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "B< -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<>"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:54 amuleweb.1.in:71
+#: amulecmd.1.in amuleweb.1.in
 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.in:57 amuleweb.1.in:74
+#: amulecmd.1.in amuleweb.1.in
 msgid "Write command line options to config file and exit"
 msgstr ""
 
 #. type: TP
-#: amulecmd.1.in:57
+#: amulecmd.1.in
 #, no-wrap
 msgid "B< -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<>"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:60
+#: amulecmd.1.in
 msgid "Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and exit."
 msgstr ""
 
 #. type: TP
-#: amulecmd.1.in:60 amuleweb.1.in:117
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "B< --create-config-from>=I<E<lt>pathE<gt>> B<>"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:63 amuleweb.1.in:120
+#: amulecmd.1.in amuleweb.1.in
 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: Plain text
-#: amulecmd.1.in:67 amuleweb.1.in:124
+#: amulecmd.1.in amuleweb.1.in
+msgid "Do not encrypt the External Connection link.  Encryption is negotiated automatically whenever the remote aMule supports it, and is on by default for every destination, local or remote.  Turning it off leaves everything after the login readable, and modifiable, by anyone able to observe the connection."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1.in amuleweb.1.in
 msgid "Force ZLIB compression on the External Connection link regardless of the dialed-IP locality.  Useful when the server side is reachable over a VPN tunnel that resolves to a LAN IP and the heuristic would otherwise skip compression."
 msgstr ""
 
+#. type: Plain text
+#: amulecmd.1.in
+msgid "Separate the fields of the list commands with spaces, as earlier versions did, instead of tabs.  Client names and file names may contain spaces, so the default tab separator is what lets a script split a row back into its fields; use this only for scripts written against the older output."
+msgstr ""
+
 #. type: SH
-#: amulecmd.1.in:73
+#: amulecmd.1.in
 #, no-wrap
 msgid "COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:75
+#: amulecmd.1.in
 msgid "All commands are case insensitive."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:77
+#: amulecmd.1.in
 msgid "Adds an eD2k-link or a magnet-link to the core."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:86
+#: amulecmd.1.in
 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.in:89
+#: amulecmd.1.in
 msgid "The magnet link must contain the eD2k hash and file length."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:91
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:93
+#: amulecmd.1.in
 msgid "Connect to the network."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:95
+#: amulecmd.1.in
 msgid "This will connect to all networks that are enabled in Preferences."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:99
+#: amulecmd.1.in
 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.in:102
+#: amulecmd.1.in
 msgid "Disconnect from all networks you are connected to, or just disconnect from the specified network."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:104
+#: amulecmd.1.in
 msgid "Start downloading a file."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:108
-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."
+#: amulecmd.1.in
+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.in:110
+#: amulecmd.1.in
 msgid "Disconnect from amule/amuled and quit amulecmd."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:112
+#: amulecmd.1.in
 msgid "Get and display a preference value."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:114 amulecmd.1.in:148 amulecmd.1.in:197 amulecmd.1.in:207
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>whatE<gt>>:"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:117
+#: amulecmd.1.in
 msgid "Get bandwidth limits."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:119
+#: amulecmd.1.in
 msgid "Get IPFilter preferences."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:124
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:126
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:128
+#: amulecmd.1.in
 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.in:130
+#: amulecmd.1.in
 msgid "Available values for I<E<lt>priorityE<gt>>:"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:133
+#: amulecmd.1.in
 msgid "Automatic priority."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:135
+#: amulecmd.1.in
 msgid "High priority."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:137
+#: amulecmd.1.in
 msgid "Low priority."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:139
+#: amulecmd.1.in
 msgid "Normal priority."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:142
-msgid "Shows the progress of an on-going search."
+#: amulecmd.1.in
+msgid "Shows the progress of an on-going search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:144
+#: amulecmd.1.in
 msgid "A synonym of the B<exit> command."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:146
+#: amulecmd.1.in
 msgid "Reloads a given object."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:151
+#: amulecmd.1.in
 msgid "Reload shared files list."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:153
+#: amulecmd.1.in
 msgid "Reload IP filter tables."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:156
+#: amulecmd.1.in
 msgid "Reset the log."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:158
-msgid "Shows you the results of the last search."
+#: amulecmd.1.in
+msgid "Shows you the results of a search. Optionally takes a search I<E<lt>idE<gt>> (as printed by B<search>); with no id, shows the most recently started search.  Several searches can be kept on the daemon at once and addressed by id."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:160
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:164
-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'."
+#: amulecmd.1.in
+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'.  Prints a search id; pass it to B<results> or B<progress> to address this search. Several searches can run at once, each with its own id."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:166
+#: amulecmd.1.in
 msgid "Available search types:"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:169
+#: amulecmd.1.in
 msgid "Performs a global search."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:171
+#: amulecmd.1.in
 msgid "Performs a search on the Kademlia network."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:173
+#: amulecmd.1.in
 msgid "Performs a local search."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:177
+#: amulecmd.1.in
 msgid "Optional filters can be placed before, after, or interleaved with the search keyword(s):"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:180
+#: amulecmd.1.in
 msgid "Restrict results to the given file type."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:182
+#: amulecmd.1.in
 msgid "Restrict results to a specific file extension (e.g.\\ I<iso>, I<mp3>)."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:184
+#: amulecmd.1.in
 msgid "Minimum number of sources a result must report."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:187
+#: amulecmd.1.in
 msgid "Smallest file size to return. Suffixes use binary multipliers (K = 1024, M = K\\(mu1024, G = M\\(mu1024); no suffix means bytes."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:189
+#: amulecmd.1.in
 msgid "Largest file size to return. Same suffixes as B<--min-size>."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:193
-msgid "Example: `search global linux iso --type Iso --min-size 100M' returns results for \\(lqlinux iso\\(rq of file-type Iso at least 100 MiB."
+#: amulecmd.1.in
+msgid "Example: 'search global linux iso --type Iso --min-size 100M' returns results for 'linux iso' of file-type Iso at least 100 MiB."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:195
+#: amulecmd.1.in
 msgid "Sets a given preferences value."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:200
+#: amulecmd.1.in
 msgid "Set bandwidth limits."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:202
+#: amulecmd.1.in
 msgid "Set IPFilter preferences."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:205
+#: amulecmd.1.in
 msgid "Shows upload/download queue, servers list or shared files list."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:210
+#: amulecmd.1.in
 msgid "Show download queue."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:212
+#: amulecmd.1.in
 msgid "Show log."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:214
+#: amulecmd.1.in
 msgid "Show servers list."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:216
+#: amulecmd.1.in
 msgid "Show shared files list."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:218
+#: amulecmd.1.in
 msgid "Show upload queue."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:222
+#: amulecmd.1.in
 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: Plain text
-#: amulecmd.1.in:224
+#: amulecmd.1.in
 msgid "Show statistics tree."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:228
-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'."
+#: amulecmd.1.in
+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.in:231
-msgid "Example: `statistics 5' will show only the top 5 versions for each client type."
+#: amulecmd.1.in
+msgid "Example: 'statistics 5' will show only the top 5 versions for each client type."
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:233
+#: amulecmd.1.in
 msgid "Show connection status, current up/download speeds, etc."
 msgstr ""
 
 #. type: SS
-#: amulecmd.1.in:238 amuleweb.1.in:141
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "Languages"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:244 amuleweb.1.in:147
+#: amulecmd.1.in amuleweb.1.in
 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.in:246 amuleweb.1.in:149
+#: amulecmd.1.in amuleweb.1.in
 msgid "For example, the following strings are valid:"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:260 amuleweb.1.in:163
+#: amulecmd.1.in amuleweb.1.in
 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.in:263 amuleweb.1.in:166
+#: amulecmd.1.in amuleweb.1.in
 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.in:266 amuleweb.1.in:169
+#: amulecmd.1.in amuleweb.1.in
 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.in:268 amuleweb.1.in:177
+#: amulecmd.1.in amuleweb.1.in
 msgid "~/.aMule/remote.conf"
 msgstr ""
 
 #. type: SH
-#: amulecmd.1.in:268 amuleweb.1.in:181
+#: amulecmd.1.in amuleweb.1.in
 #, no-wrap
 msgid "EXAMPLE"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:270
+#: amulecmd.1.in
 msgid "Typically amulecmd will be first run as:"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:272
+#: amulecmd.1.in
 msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:274 amuleweb.1.in:187
+#: amulecmd.1.in amuleweb.1.in
 msgid "or"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:276
+#: amulecmd.1.in
 msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:278 amuleweb.1.in:191
+#: amulecmd.1.in amuleweb.1.in
 msgid "These will save settings to I<$HOME/.aMule/remote.conf>, and later you only need to type:"
 msgstr ""
 
 #. type: Plain text
-#: amulecmd.1.in:282
+#: amulecmd.1.in
 msgid "Of course, you don't have to follow this example."
 msgstr ""
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "AMULED"
 msgstr ""
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon v@PACKAGE_VERSION@"
 msgstr ""
 
 #. type: TH
-#: amuled.1.in:1
+#: amuled.1.in
 #, no-wrap
 msgid "aMule Daemon"
 msgstr ""
 
 #. type: Plain text
-#: amuled.1.in:6
+#: amuled.1.in
 msgid "amuled - the all-platform eMule p2p client - daemonized version"
 msgstr ""
 
 #. type: Plain text
-#: amuled.1.in:9 ../../src/utils/cas/docs/cas.1.in:11
+#: amuled.1.in ../../src/utils/cas/docs/cas.1.in
 msgid "B<-c> I<E<lt>pathE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amuled.1.in:11
+#: amuled.1.in
 msgid "B<-p> I<E<lt>pathE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amuled.1.in:33
+#: amuled.1.in
 msgid "Forks to background."
 msgstr ""
 
 #. type: TP
-#: amuled.1.in:33
+#: amuled.1.in
 #, 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.in:37
+#: amuled.1.in
 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.in:40
+#: amuled.1.in
 msgid "Configure EC (External Connections)."
 msgstr ""
 
 #. type: Plain text
-#: amuled.1.in:50
+#: amuled.1.in
 msgid "Enable or disable starting amuled on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: TP
-#: amuled.1.in:61
+#: amuled.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category>=I<E<lt>numE<gt>> B<>"
 msgstr ""
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "AMULEGUI"
 msgstr ""
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI v@PACKAGE_VERSION@"
 msgstr ""
 
 #. type: TH
-#: amulegui.1.in:1
+#: amulegui.1.in
 #, no-wrap
 msgid "aMuleGUI"
 msgstr ""
 
 #. type: Plain text
-#: amulegui.1.in:6
+#: amulegui.1.in
 msgid "amulegui - aMule control program with GUI"
 msgstr ""
 
 #. type: Plain text
-#: amulegui.1.in:17
+#: amulegui.1.in
 msgid "B<-t> I<E<lt>numE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amulegui.1.in:27
+#: amulegui.1.in
 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.in:42
+#: amulegui.1.in
 msgid "Skip connection dialog."
 msgstr ""
 
 #. type: Plain text
-#: amulegui.1.in:46
+#: amulegui.1.in
 msgid "Enable or disable starting amulegui on user login, then exit.  The OS-specific store is selected automatically: Windows registry Run key, macOS LaunchAgent, Linux XDG I<.desktop> autostart entry."
 msgstr ""
 
 #. type: Plain text
-#: amulegui.1.in:72
+#: amulegui.1.in
 msgid "This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm DOT orgE<gt>"
 msgstr ""
 
 #. type: Plain text
-#: amulegui.1.in:73
+#: amulegui.1.in
 msgid "This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
 msgstr ""
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "AMULEWEB"
 msgstr ""
 
 #. type: TH
-#: amuleweb.1.in:1
+#: amuleweb.1.in
 #, no-wrap
 msgid "aMule webserver v@PACKAGE_VERSION@"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:6
+#: amuleweb.1.in
 msgid "amuleweb - aMule web server"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:15
+#: amuleweb.1.in
 msgid "B<-l> I<E<lt>langE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:18
+#: amuleweb.1.in
 msgid "B<-t> I<E<lt>nameE<gt>> B<-s> I<E<lt>portE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:20
+#: amuleweb.1.in
 msgid "B<-U> I<E<lt>portE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:24
+#: amuleweb.1.in
 msgid "B<-A> I<E<lt>passwordE<gt>> B<-G> I<E<lt>passwordE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:40
+#: amuleweb.1.in
 msgid "B<--amule-config-file>=I<E<lt>pathE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:46
+#: amuleweb.1.in
+msgid "B<DEPRECATED:> amuleweb is deprecated and may be removed in aMule 3.2 or later.  It is not being removed yet; consider migrating to amuleapi, the REST/SSE API."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1.in
 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.in:74
+#: amuleweb.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<>"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:77
+#: amuleweb.1.in
 msgid "Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section for details."
 msgstr ""
 
 #. type: TP
-#: amuleweb.1.in:77
+#: amuleweb.1.in
 #, 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.in:80
+#: amuleweb.1.in
 msgid "Webserver's HTTP port. This is the port you must point your browser to (default: I<4711>)."
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 msgid "Enable UPnP."
 msgstr ""
 
 #. type: TP
-#: amuleweb.1.in:84
+#: amuleweb.1.in
 #, 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.in:87
+#: amuleweb.1.in
 msgid "UPnP port."
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:90
+#: amuleweb.1.in
 msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 msgid "Disables using gzip compression (this is the default)."
 msgstr ""
 
 #. type: TP
-#: amuleweb.1.in:93
+#: amuleweb.1.in
 #, 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.in:96
+#: amuleweb.1.in
 msgid "Full access password for webserver."
 msgstr ""
 
 #. type: TP
-#: amuleweb.1.in:96
+#: amuleweb.1.in
 #, 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.in:99
+#: amuleweb.1.in
 msgid "Guest password for webserver."
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:102
+#: amuleweb.1.in
 msgid "Allows guest access."
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:105
+#: amuleweb.1.in
 msgid "Denies guest access (default)."
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:111
+#: amuleweb.1.in
 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.in:114
+#: amuleweb.1.in
 msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:117
+#: amuleweb.1.in
 msgid "Recompiles PHP pages on each request."
 msgstr ""
 
 #. type: TP
-#: amuleweb.1.in:130
+#: amuleweb.1.in
 #, no-wrap
 msgid "B< --amule-config-file>=I<E<lt>pathE<gt>> B<>"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:136
+#: amuleweb.1.in
 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.in:169
+#: amuleweb.1.in
 #, no-wrap
 msgid "SKIN SUPPORT"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:173
+#: amuleweb.1.in
 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.in:175
+#: amuleweb.1.in
 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.in:179
+#: amuleweb.1.in
 msgid "~/.aMule/webserver/"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:181
+#: amuleweb.1.in
 msgid "I<$(pkgdatadir)>/webserver/"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:183
+#: amuleweb.1.in
 msgid "Typically amuleweb will be first run as:"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:185
+#: amuleweb.1.in
 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.in:189
+#: amuleweb.1.in
 msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
 msgstr ""
 
 #. type: Plain text
-#: amuleweb.1.in:195
+#: amuleweb.1.in
 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.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "ED2K"
 msgstr ""
 
 #. type: TH
-#: ed2k.1.in:1
+#: ed2k.1.in
 #, no-wrap
 msgid "aMule eD2k link parser v1.5.1"
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:6
+#: ed2k.1.in
 msgid "ed2k - aMule eD2k link parser"
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:10
+#: ed2k.1.in
 msgid "B<-c> I<E<lt>pathE<gt>> B<-t> I<E<lt>numE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:13
+#: ed2k.1.in
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:21
+#: ed2k.1.in
 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: TP
-#: ed2k.1.in:24
+#: ed2k.1.in
 #, no-wrap
 msgid "B< -t> I<E<lt>numE<gt>>, B<--category> I<E<lt>numE<gt>> B<>"
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:28
+#: ed2k.1.in
 msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>.  Unlike B<--config-dir>, the parser reads the value as the next argument and does not accept B<--category>=I<E<lt>numE<gt>> syntax."
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:31
+#: ed2k.1.in
 msgid "Loads all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:34
+#: ed2k.1.in
 msgid "Lists all links found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
 msgstr ""
 
+#. type: TP
+#: ed2k.1.in
+#, no-wrap
+msgid "B< eD2k-link >"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1.in
+msgid "Adds an eD2k-link to the core."
+msgstr ""
+
 #. type: Plain text
-#: ed2k.1.in:54
+#: ed2k.1.in
 msgid "a magnet link;"
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:56
+#: ed2k.1.in
 msgid "an emulecollection file."
 msgstr ""
 
 #. type: Plain text
-#: ed2k.1.in:61
+#: ed2k.1.in
 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.in:63
+#: ed2k.1.in
 msgid "~/.aMule/ED2KLinks"
 msgstr ""
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "ALC"
 msgstr ""
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 #, no-wrap
 msgid "aLinkCreator"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:5
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 msgid "aLinkCreator - the aMule eD2k link creator"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alc.1.in:9
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
 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.in:11
-#: ../../src/utils/wxCas/docs/wxcas.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alc.1.in
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "This app doesn't take any arguments."
 msgstr ""
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "ALCC"
 msgstr ""
 
 #. type: TH
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:1
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 #, no-wrap
 msgid "aMule eD2k links calculator"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:6
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "alcc - text based eD2k links calculator for aMule"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "I<E<lt>inputfiles_listE<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 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.in:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Compute and add part hashes to the computed eD2k links."
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/aLinkCreator/docs/alcc.1.in:26
+#: ../../src/utils/aLinkCreator/docs/alcc.1.in
 msgid "Be verbose - show also calculation steps."
 msgstr ""
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "CAS"
 msgstr ""
 
 #. type: TH
-#: ../../src/utils/cas/docs/cas.1.in:1
+#: ../../src/utils/cas/docs/cas.1.in
 #, no-wrap
 msgid "cas v0.8"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:6
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "cas - c aMule statistics"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:18
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:23
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Writes the online signature picture.  The long form B<--picture> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-o> / B<-P> do not (B<-P> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-o> is a no-argument switch).  Requires GD support compiled in (I<__GD__>); this option is silently ignored otherwise."
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:27
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "HTML page with stats and picture.  The long form B<--html> accepts an optional I<=E<lt>PATHE<gt>> to specify the output location; the short forms B<-p> / B<-H> do not (B<-H> requires an immediately following I<E<lt>PATHE<gt>> argument, and B<-p> is a no-argument switch)."
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:35
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "Without any options, it prints online signature data to stdout."
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:37
+#: ../../src/utils/cas/docs/cas.1.in
 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.in:39
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "~/.aMule/casrc"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:41
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.png (or .jpg, when B<-o> / B<--picture> is used and GD is available)"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/cas/docs/cas.1.in:43
+#: ../../src/utils/cas/docs/cas.1.in
 msgid "aMule-online-sign.html (when B<-p> / B<--html> is used)"
 msgstr ""
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "WXCAS"
 msgstr ""
 
 #. type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1.in:1
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 #, no-wrap
 msgid "wxCas"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:5
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "wxcas - wx c aMule statistics"
 msgstr ""
 
 #. type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1.in:11
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 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.in:14
+#: ../../src/utils/wxCas/docs/wxcas.1.in
 msgid "Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish E<lt>thepolish@vipmail.ruE<gt>"
 msgstr ""

amule-3.0.1.tar.gz/docs/translations.md -> amule-3.1.0.tar.gz/docs/translations.md Changed

@@ -23,8 +23,7 @@
 po/
 ├── amule.pot          # master template (regenerated by update-po.sh)
 ├── POTFILES.in        # list of source files to scan for translatable strings
-├── LINGUAS            # list of language codes that get compiled
-├── Makevars           # xgettext options (keyword list, package metadata)
+├── CMakeLists.txt     # globs *.po and compiles/installs each one
 ├── de.po              # German
 ├── fr.po              # French
 ├── pt_BR.po           # Portuguese (Brazil)
@@ -131,18 +130,16 @@
 
    Replace `xx` with the locale code (e.g. `nl`, `ko_KR`).
 
-2. Add the locale code to `po/LINGUAS` (one code per line, keep the
-   list alphabetically sorted).
+2. Translate the strings in `po/xx.po`.
 
-3. Translate the strings in `po/xx.po`.
-
-4. Verify the file compiles without errors:
+3. Verify the file compiles without errors:
 
    ```sh
    msgfmt --check po/xx.po -o /dev/null
    ```
 
-5. Commit both `po/xx.po` and the updated `po/LINGUAS`.
+4. Commit `po/xx.po`. The build globs `po/*.po`, so the new catalog is
+   compiled and installed automatically — no other file needs editing.
 
 ## Marking strings for translation in C++ source

amule-3.0.1.tar.gz/org.amule.aMule.desktop -> amule-3.1.0.tar.gz/org.amule.aMule.desktop Changed

@@ -1,6 +1,6 @@
 Desktop Entry
 Name=aMule
-Exec=amule %u
+Exec=amule %U
 Icon=org.amule.aMule
 Terminal=false
 Type=Application
@@ -10,8 +10,8 @@
 GenericNamees=Cliente P2P de intercambio de archivos
 GenericNamefr=Client de partage de fichiers P2P
 GenericNameit=Client P2P di condivisione file
-GenericNameit_CH=Client P2P di condivisione file
 GenericNamept_BR=Cliente P2P de compartilhamento de arquivos
+GenericNameru=Клиент обмена файлами по P2P
 GenericNametr=P2P Dosya Paylaşım İstemcisi
 GenericNamezh_CN=P2P 文件共享客户端
 Comment=A client for the eD2k network
@@ -19,8 +19,8 @@
 Commenttr=eD2k ağı için istemci
 Commentzh_CN=eD2k网络客户端
 Commentit=Un client per la rete eD2k
-Commentit_CH=Un client per la rete eD2k
 Commentes=Un cliente para la red eD2k
 Commentpt_BR=Um cliente para a rede eD2k
+Commentru=Клиент для сети eD2k
 Keywords=p2p;peer-to-peer;file-sharing;file-share;download;upload;ed2k;edonkey;kademlia;emule;kad;
-MimeType=x-scheme-handler/ed2k;
+MimeType=x-scheme-handler/ed2k;x-scheme-handler/magnet;application/x-emule-collection;

amule-3.0.1.tar.gz/org.amule.aMule.gui.desktop -> amule-3.1.0.tar.gz/org.amule.aMule.gui.desktop Changed

@@ -1,6 +1,6 @@
 Desktop Entry
 Name=aMuleGUI
-Exec=amulegui
+Exec=amulegui %U
 Icon=org.amule.aMule
 Terminal=false
 Type=Application
@@ -12,8 +12,8 @@
 GenericNamefr=Contrôle à distance pour partage P2P
 GenericNamehu=Távoli vezérlő a P2P fájlmegosztáshoz
 GenericNameit=Terminale remoto per la condivisione P2P
-GenericNameit_CH=Terminale remoto per la condivisione P2P
 GenericNamept_BR=Controle remoto para compartilhamento P2P
+GenericNameru=Дистанционное управление для обмена файлами по P2P
 GenericNametr=P2P Dosya Paylaşımı için Uzaktan Kumanda
 GenericNamezh_CN=P2P 文件共享远程控制
 Comment=aMule remote control
@@ -23,7 +23,8 @@
 Commenttr=aMule uzaktan kumandası
 Commentzh_CN=aMule远程协议
 Commentit=Terminale remoto per aMule
-Commentit_CH=Terminale remoto per aMule
 Commentes=Control remoto de aMule
 Commentpt_BR=Controle remoto do aMule
+Commentru=Дистанционное управление aMule
 Keywords=p2p;peer-to-peer;file-sharing;file-share;remote;amule;ed2k;edonkey;kademlia;emule;kad;
+MimeType=x-scheme-handler/ed2k;x-scheme-handler/magnet;application/x-emule-collection;

amule-3.1.0.tar.gz/org.amule.aMule.metainfo.xml.in Added

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.amule.aMule</id>
+
+  <name>aMule</name>
+  <summary>P2P client based on eMule</summary>
+  <summary xml:lang="es">Cliente P2P basado en eMule</summary>
+  <summary xml:lang="fr">Client P2P ayant pour base eMule</summary>
+  <summary xml:lang="pt-BR">Cliente P2P baseado em eMule</summary>
+  <summary xml:lang="tr">eMule programına dayalı P2P istemcisi</summary>
+
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>GPL-2.0-or-later</project_license>
+
+  <description>
+    <p>
+      aMule is a multi-platform client for the ED2K file sharing network and based on the windows client eMule. aMule is intended to be as user friendly and feature rich as eMule and to remain faithful to the look and feel of eMule so users familiar with either aMule or eMule will be able switch between the two easily. Since aMule is based upon the eMule codebase, new features in eMule tend to find their way into aMule soon after their inclusion into eMule so users of aMule can expect to ride the cutting-edge of ED2k clients.
+    </p>
+    <p xml:lang="es">
+      aMule es un cliente multiplataforma para la red de intercambio de archivos ED2K basado en el cliente de Windows eMule. aMule pretende ser tan fácil de usar y completo como eMule, y mantener la experiencia de uso de eMule para que los usuarios familiarizados con cualquiera de los dos puedan cambiar entre ambos con facilidad. Dado que aMule se basa en el código de eMule, las nuevas características de eMule suelen llegar a aMule poco después de su inclusión, por lo que los usuarios de aMule pueden esperar estar a la vanguardia de los clientes ED2K.
+    </p>
+    <p xml:lang="fr">
+      aMule est un client multiplateforme pour le réseau de partage de fichiers ED2K fondé sur le client eMUle pour Windows. aMule se veut aussi convivial et riche en fonctionnalités qu'eMule, tout en restant fidèle à son apparence et à son ergonomie afin que les utilisateurs familiarisés avec aMule ou eMule puissent basculer de l'un à l'autre facilement. Comme aMule repose sur le code source d'eMule, les nouvelles fonctionnalités d'eMule ont tendance à être incorporées dans aMule peu après leur inclusion dans eMule, les utilisateurs d'aMule peuvent donc compter sur un client à la pointe de la technologie ED2K.
+    </p>
+    <p xml:lang="pt-BR">
+      aMule é um cliente multi-plataforma para a rede de compartilhamento de arquivos ED2K, baseado no cliente eMule para Windows. aMule pretende ser tão amigável ao usuário e cheio de recursos quanto eMule e se manter fiel à aparência e sentimento de eMule de modo que usuários familiares com qualquer um dos dois serjam capazes de trocar entre os dois facilmente. Como aMule é baseado no código de eMule, novos recursos de eMule tendem a ser incorporados em aMule logo após sua inclusão em eMule de modo que os usuários de aMule podem esperar estar utilizando a mais nova tecnologia dos clientes ED2K.
+    </p>
+    <p xml:lang="tr">
+      aMule, Windows için eMule istemcisine dayalı ve çoklu platform desteği bulunduran bir ED2K dosya paylaşım ağı istemcisidir. aMule, eMule kadar kullanıcı dostu ve zengin işlevli olacak şekilde tasarlanmıştır, aMule veya eMule programına aşina kullanıcılarının birinden diğerine kolay geçiş yapabilmeleri için eMule programının görünümüne sadık kalacaktır. aMule, eMule kaynak koduna dayalı olduğundan dolayı eMule programına eklenen yeni işlevler kısa bir süre sonra aMule programına da gelirler, yani aMule kullanıcıları ED2K istemcilerinin en yeni işlevlerinden istifade edebilirler.
+    </p>
+  </description>
+
+  <url type="homepage">https://amule-org.github.io</url>
+  <url type="bugtracker">https://github.com/amule-org/amule/issues</url>
+  <url type="help">https://amule-org.github.io/docs</url>
+
+  
+@RELEASES@
+
+  <launchable type="desktop-id">org.amule.aMule.desktop</launchable>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/amule-org/amule/3.0.0/.github/amule-interface-search.png</image>
+      <caption>Screenshot of the aMule search interface</caption>
+      <caption xml:lang="es">Captura de pantalla de la interfaz de búsqueda de aMule</caption>
+      <caption xml:lang="fr">Capture d'écran de l'interface de recherche d'aMule</caption>
+      <caption xml:lang="pt-BR">Captura de tela da interface de busca de aMule</caption>
+      <caption xml:lang="tr">aMule arama arayüzünün ekran fotoğrafı</caption>
+    </screenshot>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/amule-org/amule/3.0.0/.github/amule-preferences.png</image>
+      <caption>Screenshot of the aMule preferences interface</caption>
+      <caption xml:lang="es">Captura de pantalla de la interfaz de preferencias de aMule</caption>
+      <caption xml:lang="fr">Capture d'écran de l'interface des préférences d'aMule</caption>
+      <caption xml:lang="pt-BR">Captura de tela da interface das preferências de aMule</caption>
+      <caption xml:lang="tr">aMule tercihler arayüzünün ekran fotoğrafı</caption>
+    </screenshot>
+  </screenshots>
+
+  <developer id="org.amule">
+    <name>aMule Team</name>
+  </developer>
+
+  <provides>
+    <binary>amule</binary>
+    <mediatype>application/x-emule-collection</mediatype>
+  </provides>
+
+  <content_rating type="oars-1.1"/>
+</component>

amule-3.0.1.tar.gz/org.amule.aMule.png -> amule-3.1.0.tar.gz/org.amule.aMule.png Changed

amule-3.1.0.tar.gz/org.amule.aMule.xml Added

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-emule-collection">
+    <comment>eMule collection</comment>
+    <glob pattern="*.emulecollection"/>
+    
+    <generic-icon name="package-x-generic"/>
+  </mime-type>
+</mime-info>

amule-3.0.1.tar.gz/packaging/README.md -> amule-3.1.0.tar.gz/packaging/README.md Changed

@@ -2,8 +2,10 @@
 
 This tree builds aMule into the four user-facing distribution formats:
 **AppImage**, **Flatpak**, **macOS Universal2 .dmg**, and **Windows
-portable .zip**. All four are produced from a single `git` checkout
-plus per-platform tooling (Docker / Homebrew / MSYS2).
+portable .zip**, plus a headless **fully static Linux daemon** tarball
+(amuled + amulecmd + amuleapi, no runtime shared-library deps). All are
+produced from a single `git` checkout plus per-platform tooling (Docker /
+Homebrew / MSYS2).
 
 The recipes are driven by `.github/workflows/packaging.yml`(../.github/workflows/packaging.yml)
 on GitHub Actions, but every script also runs locally — useful for
@@ -17,8 +19,9 @@
 ├── linux/
 │   ├── appimage/         AppImage recipe (Docker-driven)
 │   ├── flatpak/          Flatpak manifest (template + generated yaml)
-│   ├── build.sh          dispatcher — picks appimage or flatpak
-│   └── versions.env      pinned tarball URLs + SHA256s for both
+│   ├── static/           Fully static musl daemon recipe (Alpine Docker)
+│   ├── build.sh          dispatcher — picks appimage, flatpak or static
+│   └── versions.env      pinned tarball URLs + SHA256s for all three
 ├── macos/                macOS Universal2 .dmg recipe
 └── windows/              Windows portable .zip recipe (MSYS2)
 ```
@@ -30,6 +33,7 @@
 | -------- | --------------------------------------------------------------------- | --------------------- |
 | Linux    | `linux/appimage/README.md`(linux/appimage/README.md)                | `.AppImage` (single file, glibc ≥ 2.35) |
 | Linux    | `linux/flatpak/README.md`(linux/flatpak/README.md)                  | `.flatpak` (sandboxed, GNOME 49 runtime) |
+| Linux    | `linux/static/README.md`(linux/static/README.md)                    | `.tar.gz` (static musl daemon: amuled + amulecmd + amuleapi) |
 | macOS    | `macos/README.md`(macos/README.md)                                  | `.dmg` (Universal2, arm64 + x86_64) |
 | Windows  | `windows/README.md`(windows/README.md)                              | `.zip` (portable, MSYS2 runtime bundled) |
 
@@ -45,6 +49,9 @@
 # Linux Flatpak (host arch — needs flatpak-builder + GNOME runtime)
 packaging/linux/build.sh flatpak
 
+# Linux fully static musl daemon tarball (host arch — needs Docker)
+packaging/linux/build.sh static
+
 # macOS Universal2 .dmg (needs Homebrew with deps installed)
 packaging/macos/build.sh
 
@@ -66,6 +73,7 @@
 | -------------- | ----------------------- | ----- |
 | AppImage x86_64 / aarch64 | `ubuntu-22.04` / `ubuntu-22.04-arm` | glibc 2.35 baseline for compat |
 | Flatpak x86_64 / aarch64  | `ubuntu-24.04` / `ubuntu-24.04-arm` | needs `appstream-compose` 1.0+ from 24.04 |
+| Linux static x86_64 / aarch64 | `ubuntu-22.04` / `ubuntu-22.04-arm` | musl/Alpine Docker build; buildx gha layer cache |
 | macOS arm64 / x86_64      | both on `macos-15`                  | x86_64 builds via Rosetta-emulated Homebrew at `/usr/local`; the legacy `macos-13` Intel runner is being retired by GitHub |
 | macOS Universal2 .dmg     | `macos-15`                          | depends on the two macOS jobs; lipo-merges + ad-hoc-codesigns the result |
 | Windows x64 / arm64       | `windows-latest`                    | MSYS2 MINGW64 / CLANGARM64 |
@@ -75,7 +83,7 @@
 * **Push to `master`** (or any `packaging**` branch) when packaging /
   source / cmake files change — keeps master always-shippable.
 * **Manual `workflow_dispatch`** — with an `only=appimage,flatpak,
-  macos,windows` input for iterating on a single track.
+  macos,windows,linux-static` input for iterating on a single track.
 
 Pull-request triggers are deliberately omitted to halve CI cost; if
 you want to inspect a PR's artifacts before merging, dispatch the

amule-3.0.1.tar.gz/packaging/flathub/org.amule.aMule.yaml -> amule-3.1.0.tar.gz/packaging/flathub/org.amule.aMule.yaml Changed

@@ -98,8 +98,8 @@
       - -DCMAKE_INSTALL_LIBDIR=lib
     sources:
       - type: archive
-        url: https://github.com/pupnp/pupnp/archive/refs/tags/release-1.14.21.tar.gz
-        sha256: d176a6028b02ab36e9d334372dd64780d9a8e577a2d8d4c1d70ef8ced15d7d19
+        url: https://github.com/pupnp/pupnp/archive/refs/tags/release-22.0.4.tar.gz
+        sha256: 7028d2a151372ff8a34341e0a269f516676c1af95b0a2ba811a2f0a2fe91ea36
 
   - name: boost
     buildsystem: simple
@@ -222,9 +222,12 @@
       - --without-opengl
       - --with-libcurl
     sources:
-      - type: archive
-        url: https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.6/wxWidgets-3.2.6.tar.bz2
-        sha256: 939e5b77ddc5b6092d1d7d29491fe67010a2433cf9b9c0d841ee4d04acb9dce7
+      # 3.2 branch at a pinned commit: no 3.2.x release carries the
+      # wxEpollDispatcher unregister fix amuled needs (amule-org/amule#1136).
+      # Revert to a type: archive tarball when 3.2.12 ships.
+      - type: git
+        url: https://github.com/wxWidgets/wxWidgets.git
+        commit: d73e1df63abee30759a6c8f134be8c091b619b7e
 
   - name: amule
     buildsystem: cmake-ninja
@@ -234,6 +237,7 @@
       - -DBUILD_REMOTEGUI=YES
       - -DBUILD_DAEMON=YES
       - -DBUILD_AMULECMD=YES
+      - -DBUILD_AMULEAPI=YES
       - -DBUILD_ED2K=YES
       - -DBUILD_WEBSERVER=YES
       - -DBUILD_CAS=YES
@@ -252,15 +256,13 @@
     sources:
       - type: git
         url: https://github.com/amule-org/amule.git
-        # Pinned to a master tip newer than the 3.0.0 tag to ship
-        # post-release fixes. Flatpak still self-identifies as 3.0.0
-        # (source version macro unchanged). Tag is intentionally
-        # omitted: flatpak-builder requires that any tag specified
-        # alongside a commit must resolve to that exact commit, so a
-        # tip-of-master pin past the release tag can only be commit-
-        # only. The x-checker-data block below still drives auto-
-        # update PRs against new aMule release tags.
-        commit: cc9460c5b48b19dbc1a271289d48a9204d75bf1f
+        # Pinned to the 3.0.1 release. `commit` is the peeled commit the
+        # annotated 3.0.1 tag resolves to (git rev-parse 3.0.1^{commit});
+        # flatpak-builder requires the tag and commit point at the same
+        # commit. The x-checker-data block below drives auto-update PRs
+        # against future aMule release tags.
+        tag: 3.0.1
+        commit: 02db0d7faecfc377694ff6242bc23346185990ed
         disable-shallow-clone: true
         x-checker-data:
           type: git

amule-3.1.0.tar.gz/packaging/gen-metainfo-releases.py Added

@@ -0,0 +1,127 @@
+#!/usr/bin/env python3
+#
+# This file is part of the aMule Project.
+#
+# Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+#
+# 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.
+#
+"""Generate the AppStream <releases> block from docs/CHANGELOG.md.
+
+The metainfo template (org.amule.aMule.metainfo.xml.in) carries a single
+`@RELEASES@` marker; this script replaces it with one <release> entry per
+CHANGELOG version that has a prose summary paragraph (the 3.0.0+ format).
+Older contributor-list entries (2.3.3 and earlier) have no summary and are
+skipped. Keeping the changelog as the single source of truth stops the
+store-visible version from drifting from the shipped one.
+
+No third-party dependencies -- runs anywhere python3 is available: dev
+machines, CI, the GNOME SDK build sandbox, and Flathub-at-tag builds.
+"""
+
+import argparse
+import re
+import sys
+from html import escape
+
+# "## Version 3.0.1 - "bugfixes and polish"" -> "3.0.1". The separator may be an
+# em dash or a plain hyphen: older entries use one, newer ones the other, and a
+# parser that accepts only its own house style drops a release from the store
+# listing without failing the build.
+_HEADER = re.compile(r"^## Version\s+(\S+)\s+-\u2013\u2014")
+_DATE = re.compile(r"^\d{4}-\d{2}-\d{2}$")
+
+
+def _strip_markdown(text):
+    # Inline code `x` -> x and bold **x** -> x; metainfo <p> is plain text.
+    return text.replace("`", "").replace("**", "")
+
+
+def parse_changelog(path):
+    with open(path, encoding="utf-8") as handle:
+        lines = handle.read().split("\n")
+
+    releases = 
+    i, n = 0, len(lines)
+    while i < n:
+        header = _HEADER.match(linesi)
+        if not header:
+            i += 1
+            continue
+        version = header.group(1)
+        i += 1
+
+        # Date is the next non-empty line.
+        while i < n and not linesi.strip():
+            i += 1
+        if i >= n or not _DATE.match(linesi.strip()):
+            continue
+        date = linesi.strip()
+        i += 1
+
+        # The summary is the next paragraph (up to a blank line).
+        while i < n and not linesi.strip():
+            i += 1
+        para = 
+        while i < n and linesi.strip():
+            para.append(linesi)
+            i += 1
+        if not para:
+            continue
+
+        # Old-format entries open with a tabbed contributor name
+        # ("\talesnav:") or a list/heading -- no prose summary. Skip them.
+        first = para0
+        if first.startswith("\t") or first.lstrip():1 in ("-", "*", "#"):
+            continue
+
+        summary = _strip_markdown(" ".join(s.strip() for s in para)).strip()
+        releases.append((version, date, summary))
+
+    return releases
+
+
+def render_releases(releases):
+    out = "  <releases>"
+    for version, date, summary in releases:
+        url = "https://github.com/amule-org/amule/releases/tag/" + version
+        out += 
+            '    <release version="{0}" date="{1}">'.format(version, date),
+            "      <url>{0}</url>".format(url),
+            "      <description>",
+            "        <p>",
+            "          " + escape(summary, quote=False),
+            "        </p>",
+            "      </description>",
+            "    </release>",
+        
+    out.append("  </releases>")
+    return "\n".join(out)
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--changelog", required=True)
+    parser.add_argument("--template", required=True)
+    parser.add_argument("--output", required=True)
+    args = parser.parse_args()
+
+    releases = parse_changelog(args.changelog)
+    if not releases:
+        sys.exit("gen-metainfo-releases: no prose releases found in " + args.changelog)
+
+    with open(args.template, encoding="utf-8") as handle:
+        template = handle.read()
+    if "@RELEASES@" not in template:
+        sys.exit("gen-metainfo-releases: @RELEASES@ marker missing in " + args.template)
+
+    result = template.replace("@RELEASES@", render_releases(releases))
+    with open(args.output, "w", encoding="utf-8") as handle:
+        handle.write(result)
+
+
+if __name__ == "__main__":
+    main()

amule-3.0.1.tar.gz/packaging/linux/appimage/AppRun -> amule-3.1.0.tar.gz/packaging/linux/appimage/AppRun Changed

@@ -2,7 +2,7 @@
 # Custom AppRun for the aMule AppImage.
 #
 # Dispatches to one of the bundled binaries (amule / amuled / amulegui /
-# amulecmd / amuleweb / ed2k) based on the name the AppImage was invoked
+# amulecmd / amuleweb / amuleapi / ed2k) based on the name the AppImage was invoked
 # as. The AppImage runtime sets $ARGV0 to the path used to launch the
 # image; basename of that gives us the symlink name. Standard idiom —
 # same pattern Krita and GIMP use to ship multiple tools in one bundle.
@@ -27,13 +27,48 @@
     done
 fi
 
+# The AppImage runtime already exports APPDIR when it mounts the image, but set
+# it explicitly so detection also works when AppRun is invoked from an extracted
+# tree (--appimage-extract). aMule reads APPDIR both for desktop integration and
+# to strip these bundle paths back out when it launches external programs like
+# the preview player (#334).
+export APPDIR="${HERE}"
 export PATH="${HERE}/usr/bin:${PATH}"
 export LD_LIBRARY_PATH="${HERE}/usr/lib:${LD_LIBRARY_PATH:-}"
 
+# Keep the host's GLib/GTK plugins out of the bundle. Both of these are set
+# after the plugin hooks above deliberately: linuxdeploy-plugin-gtk sets
+# neither, so nothing here is being overridden.
+#
+# GIO_MODULE_DIR: unset, GLib scans the path it was compiled with, which is
+# the host's /usr/lib/<triplet>/gio/modules. Those modules are built against
+# the host's GLib and get resolved against the older one bundled here, so
+# loading them fails --
+#
+#   /usr/lib/x86_64-linux-gnu/gvfs/libgvfscommon.so: undefined symbol:
+#     g_task_set_static_name
+#   Failed to load module: /usr/lib/x86_64-linux-gnu/gio/modules/libgvfsdbus.so
+#
+# (g_task_set_static_name arrived in GLib 2.76.) We bundle no GIO modules, so
+# this points at a directory that does not exist, which is the intent: it
+# stops the scan rather than redirecting it. aMule uses no GIO module -- the
+# failure was only ever noise on stderr (issue #898).
+export GIO_MODULE_DIR="${HERE}/usr/lib/gio/modules"
+
+# GTK_MODULES comes from the host session, and the bundled GTK cannot load a
+# host module any more than GIO can. Linux Mint exports xapp-gtk3-module,
+# which produces `Gtk-Message: Failed to load module "xapp-gtk3-module"` on
+# every start. These modules are desktop integration aMule does not use.
+unset GTK_MODULES
+
 # argv0 dispatch. ARGV0 is set by the AppImage runtime; fall back to
 # $0 for direct invocation (e.g. when extracted via --appimage-extract).
 INVOCATION="${ARGV0:-$0}"
-NAME="$(basename "${INVOCATION}")"
+# Bash's own suffix removal, not basename: LD_LIBRARY_PATH already points into
+# the bundle, so a host program started here loads our older libraries and can
+# fail to resolve its own symbols. Ubuntu 26.04's basename wants LIBSYSTEMD_254,
+# the bundled libsystemd stops at 252 (#1463). Keep every step below builtin.
+NAME="${INVOCATION##*/}"
 # Strip a trailing .AppImage so renaming aMule-2.4.0-Linux-x64.AppImage
 # to amuled.AppImage still dispatches.
 NAME="${NAME%.AppImage}"
@@ -49,7 +84,7 @@
 NAME="${NAME%-Linux}"
 
 case "${NAME}" in
-    amuled|amulegui|amulecmd|amuleweb|ed2k|cas|wxcas|alc|alcc)
+    amuled|amulegui|amulecmd|amuleweb|amuleapi|ed2k|cas|wxcas|alc|alcc)
         BIN="${HERE}/usr/bin/${NAME}"
         ;;
     *)

amule-3.0.1.tar.gz/packaging/linux/appimage/Dockerfile -> amule-3.1.0.tar.gz/packaging/linux/appimage/Dockerfile Changed

@@ -6,9 +6,16 @@
 FROM ubuntu:${UBUNTU_BASE}
 
 ARG WX_VERSION
-ARG WX_SHA256
+ARG WX_GIT_URL
+ARG WX_COMMIT
 ARG LINUXDEPLOY_VERSION
 ARG LINUXDEPLOY_GTK_SHA
+ARG LIBUPNP_VERSION
+ARG LIBUPNP_TARBALL_URL
+ARG LIBUPNP_SHA256
+ARG APPINDICATOR_VERSION
+ARG APPINDICATOR_TARBALL_URL
+ARG APPINDICATOR_SHA256
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
@@ -40,19 +47,29 @@
         # redistribution; users drop it in ~/.aMule/.
         libmaxminddb-dev \
         libreadline-dev \
-        libupnp-dev \
+        # libupnp-dev intentionally omitted: Ubuntu 22.04 only ships the
+        # ancient 1.8.x line. The pinned 22.x is built from source below.
         # libcurl: backend for wxWebRequest, which aMule's HTTP path requires.
         libcurl4-openssl-dev \
         # GTK3 dev headers (linker target for wx) + Wayland/X11 client headers
         libgtk-3-dev \
         libwayland-dev \
-        # libayatana-appindicator3: enables the StatusNotifierItem (SNI)
-        # tray-icon backend in MuleTrayIcon. Without it the tray falls
+        # Build deps for libayatana-appindicator, which is built from source
+        # below rather than taken from the archive -- see the RUN block for
+        # why. The library itself enables the StatusNotifierItem (SNI)
+        # tray-icon backend in MuleTrayIcon; without it the tray falls
         # back to wxTaskBarIcon → legacy GtkStatusIcon, which GNOME
         # dropped in 3.26 and wlroots compositors never implemented.
         # Ubuntu's GNOME Shell extension renders both, but Fedora /
         # vanilla GNOME / Sway need the SNI path to see the icon at all.
-        libayatana-appindicator3-dev \
+        libayatana-indicator3-dev \
+        libdbusmenu-gtk3-dev \
+        # g-ir-scanner. appindicator calls find_package(GObjectIntrospection
+        # REQUIRED) but the find module does not fail configure when the
+        # scanner is missing -- it leaves INTROSPECTION_SCANNER empty and the
+        # .gir rule then runs its own first argument as the command, failing
+        # with "app-indicator.c: not found" at build time instead.
+        libgirepository1.0-dev \
         # AppImage runtime / linuxdeploy-plugin-gtk deps
         libglib2.0-bin \
         libgdk-pixbuf-2.0-0 \
@@ -68,16 +85,57 @@
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+# libupnp / pupnp from source: Ubuntu 22.04 only packages the ancient 1.8.x
+# line, so build the pinned 22.x (shared, so linuxdeploy bundles the .so into
+# the AppImage). pupnp 22.x is CMake-only. CMAKE_INSTALL_LIBDIR=lib keeps
+# libupnp.pc / .so / the UPNP CMake config out of lib64 where pkg-config, cmake
+# and ldconfig wouldn't find them.
+# libayatana-appindicator from source: 22.04 ships 0.5.90, and only 0.6.0
+# answers the StatusNotifierItem Activate D-Bus method, which is what a host
+# sends on left-click. On anything older the tray icon can only open its menu,
+# so left-click and right-click do the same thing (discussion #1115). Shared,
+# so linuxdeploy bundles the .so into the AppImage. Its own dependencies
+# (ayatana-indicator3 >= 0.8.4, dbusmenu-gtk3, GTK >= 3.24) are satisfied by
+# the archive packages installed above, so nothing else needs building.
+RUN wget -qO /tmp/appindicator.tar.gz "${APPINDICATOR_TARBALL_URL}" \
+    && echo "${APPINDICATOR_SHA256}  /tmp/appindicator.tar.gz" | sha256sum -c - \
+    && mkdir -p /tmp/appindicator && tar -xf /tmp/appindicator.tar.gz -C /tmp/appindicator --strip-components=1 \
+    && cmake -S /tmp/appindicator -B /tmp/appindicator/build -G Ninja -DCMAKE_BUILD_TYPE=Release \
+        -DFLAVOUR_GTK3=ON -DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=OFF \
+        -DENABLE_TESTS=OFF -DENABLE_GTKDOC=OFF \
+        -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=lib \
+    && cmake --build /tmp/appindicator/build && cmake --install /tmp/appindicator/build \
+    && ldconfig \
+    && rm -rf /tmp/appindicator /tmp/appindicator.tar.gz
+
+RUN wget -qO /tmp/libupnp.tar.gz "${LIBUPNP_TARBALL_URL}" \
+    && echo "${LIBUPNP_SHA256}  /tmp/libupnp.tar.gz" | sha256sum -c - \
+    && mkdir -p /tmp/libupnp && tar -xf /tmp/libupnp.tar.gz -C /tmp/libupnp --strip-components=1 \
+    && cmake -S /tmp/libupnp -B /tmp/libupnp/build -G Ninja -DCMAKE_BUILD_TYPE=Release \
+        -DUPNP_BUILD_SHARED=ON -DUPNP_BUILD_STATIC=OFF \
+        -DUPNP_BUILD_SAMPLES=OFF -DUPNP_BUILD_TESTS=OFF -Dreuseaddr=ON -Dipv6=ON \
+        -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=lib \
+    && cmake --build /tmp/libupnp/build && cmake --install /tmp/libupnp/build \
+    && ldconfig \
+    && rm -rf /tmp/libupnp /tmp/libupnp.tar.gz
+
 # wxWidgets from source. --disable-shared so wx links statically into
 # aMule, sidestepping the wxGTK-SONAME-mismatch problem AppImage users
 # hit on distros shipping a different wx 3.2 patch level than the
 # Ubuntu 22.04 base. Subsystems aMule doesn't use are disabled to
 # shrink the static archives.
 WORKDIR /opt/wxwidgets
-RUN wget -q "https://github.com/wxWidgets/wxWidgets/releases/download/v${WX_VERSION}/wxWidgets-${WX_VERSION}.tar.bz2" -O wx.tar.bz2 \
-    && echo "${WX_SHA256}  wx.tar.bz2" | sha256sum -c - \
-    && tar xf wx.tar.bz2 \
-    && cd "wxWidgets-${WX_VERSION}" \
+# Fetched from the 3.2 branch at a pinned commit, not a release tarball: no
+# 3.2.x release yet carries the wxEpollDispatcher unregister fix amuled needs
+# (amule-org/amule#1136). Fetching the SHA directly keeps this reproducible
+# and avoids cloning the full history; submodules supply wx's bundled
+# third-party sources. Revert to the tarball when 3.2.12 ships.
+RUN git init wx \
+    && cd wx \
+    && git remote add origin "${WX_GIT_URL}" \
+    && git fetch --depth 1 origin "${WX_COMMIT}" \
+    && git checkout FETCH_HEAD \
+    && git submodule update --init --depth 1 --recursive \
     && ./configure \
         --prefix=/usr/local \
         --with-gtk=3 \

amule-3.0.1.tar.gz/packaging/linux/appimage/build.sh -> amule-3.1.0.tar.gz/packaging/linux/appimage/build.sh Changed

amule-3.0.1.tar.gz/packaging/linux/build.sh -> amule-3.1.0.tar.gz/packaging/linux/build.sh Changed

@@ -18,6 +18,9 @@
                              arch: host (default) | x86_64 | aarch64
   flatpak arch             produce .flatpak bundle in dist/
                              arch: host (default) | x86_64 | aarch64
+  static arch              produce a fully static musl daemon tarball
+                             (amuled + amulecmd + amuleapi) in dist/
+                             arch: host (default) | x86_64 | aarch64
   validate arch            run amuled --version inside a fixed matrix
                              of distro Docker images to catch lib-load
                              regressions. arch: host (default) only —
@@ -90,14 +93,39 @@
             exit 1
         fi
     fi
-    docker build \
+    # Optional buildx layer cache, mirroring the static track. CI sets
+    # APPIMAGE_CACHE_SCOPE for non-release runs so the wxWidgets, pupnp and
+    # appindicator layers persist across runs -- wx alone is minutes of
+    # compile that no ccache covers, because it happens inside the image
+    # build. Unset = plain build, so release (workflow_call) builds
+    # cold-compile, same rule as the static track.
+    local -a cache_args=()
+    if  -n "${APPIMAGE_CACHE_SCOPE:-}" ; then
+        cache_args+=(--cache-from "type=gha,scope=${APPIMAGE_CACHE_SCOPE}")
+        cache_args+=(--cache-to "type=gha,mode=max,scope=${APPIMAGE_CACHE_SCOPE}")
+    fi
+
+    # buildx rather than plain `docker build`: the gha cache backend needs
+    # it. --load puts the image in the local daemon, which the docker run
+    # below requires; it is a no-op on the default driver, so local dev
+    # builds are unaffected.
+    docker buildx build \
         --platform "${docker_platform}" \
         --build-arg "UBUNTU_BASE=${UBUNTU_BASE}" \
         --build-arg "WX_VERSION=${WX_VERSION}" \
-        --build-arg "WX_SHA256=${WX_SHA256}" \
+        --build-arg "WX_GIT_URL=${WX_GIT_URL}" \
+        --build-arg "WX_COMMIT=${WX_COMMIT}" \
         --build-arg "LINUXDEPLOY_VERSION=${LINUXDEPLOY_VERSION}" \
         --build-arg "LINUXDEPLOY_GTK_SHA=${LINUXDEPLOY_GTK_SHA}" \
+        --build-arg "LIBUPNP_VERSION=${LIBUPNP_VERSION}" \
+        --build-arg "LIBUPNP_TARBALL_URL=${LIBUPNP_TARBALL_URL}" \
+        --build-arg "LIBUPNP_SHA256=${LIBUPNP_SHA256}" \
+        --build-arg "APPINDICATOR_VERSION=${APPINDICATOR_VERSION}" \
+        --build-arg "APPINDICATOR_TARBALL_URL=${APPINDICATOR_TARBALL_URL}" \
+        --build-arg "APPINDICATOR_SHA256=${APPINDICATOR_SHA256}" \
         -t "${image_tag}" \
+        "${cache_args@}" \
+        --load \
         "${SCRIPT_DIR}/appimage"
 
     echo "==> Building AppImage (${target_arch})"
@@ -219,6 +247,122 @@
     echo "==> Done: ${bundle}"
 }
 
+build_static() {
+    # Fully static amuled/amulecmd/amuleapi (musl/Alpine). Unlike the
+    # AppImage track (toolchain image + docker run over a repo mount), this
+    # COPYs the checkout into the build and exports the binaries from a
+    # scratch stage via buildx --output. Versions come from versions.env.
+    local arch_in="${1:-host}"
+    local target_arch
+    case "${arch_in}" in
+        host)    target_arch="$(uname -m)" ;;
+        x86_64)  target_arch=x86_64 ;;
+        aarch64) target_arch=aarch64 ;;
+        *)       echo "fatal: unsupported arch '${arch_in}' (choose host|x86_64|aarch64)" >&2; exit 1 ;;
+    esac
+
+    local docker_platform arch_label
+    case "${target_arch}" in
+        x86_64)  docker_platform=linux/amd64; arch_label=x64   ;;
+        aarch64) docker_platform=linux/arm64; arch_label=arm64 ;;
+    esac
+
+    # Pre-flight: cross-arch builds need tonistiigi/binfmt registered.
+    if  "${target_arch}" != "$(uname -m)" ; then
+        if ! docker run --rm --platform "${docker_platform}" alpine:latest /bin/true 2>/dev/null; then
+            echo "fatal: cross-arch build requested (target=${target_arch}, host=$(uname -m)) but binfmt not registered." >&2
+            echo "       run once on this host: $0 setup-cross-arch" >&2
+            exit 1
+        fi
+    fi
+
+    local artifact_dir="${REPO_ROOT}/dist"
+    mkdir -p "${artifact_dir}"
+    local outdir
+    outdir="$(mktemp -d)"
+
+    # Optional buildx layer cache — the ccache analogue for this track.
+    # CI sets STATIC_CACHE_SCOPE for non-release runs so the dep layers
+    # (Crypto++ / wxWidgets / pupnp / apk) persist via the gha backend;
+    # unset = plain build, so release (workflow_call) builds cold-compile.
+    local -a cache_args=()
+    if  -n "${STATIC_CACHE_SCOPE:-}" ; then
+        cache_args+=(--cache-from "type=gha,scope=${STATIC_CACHE_SCOPE}")
+        cache_args+=(--cache-to "type=gha,mode=max,scope=${STATIC_CACHE_SCOPE}")
+    fi
+
+    echo "==> Building static binaries (${target_arch}, platform=${docker_platform})"
+    docker buildx build \
+        --platform "${docker_platform}" \
+        -f "${SCRIPT_DIR}/static/Dockerfile" \
+        --build-arg "ALPINE_STATIC_BASE=${ALPINE_STATIC_BASE}" \
+        --build-arg "WX_VERSION=${WX_VERSION}" \
+        --build-arg "WX_GIT_URL=${WX_GIT_URL}" \
+        --build-arg "WX_COMMIT=${WX_COMMIT}" \
+        --build-arg "CRYPTOPP_TAG_SUFFIX=${CRYPTOPP_TAG_SUFFIX}" \
+        --build-arg "LIBUPNP_VERSION=${LIBUPNP_VERSION}" \
+        --build-arg "LIBUPNP_TARBALL_URL=${LIBUPNP_TARBALL_URL}" \
+        --build-arg "LIBUPNP_SHA256=${LIBUPNP_SHA256}" \
+        --build-arg "APPINDICATOR_VERSION=${APPINDICATOR_VERSION}" \
+        --build-arg "APPINDICATOR_TARBALL_URL=${APPINDICATOR_TARBALL_URL}" \
+        --build-arg "APPINDICATOR_SHA256=${APPINDICATOR_SHA256}" \
+        "${cache_args@}" \
+        --output "type=local,dest=${outdir}" \
+        "${REPO_ROOT}"
+
+    # Belt-and-suspenders: the Dockerfile already gates on this, re-check here.
+    local b
+    for b in amuled amulecmd amuleapi; do
+        file "${outdir}/${b}" | grep -q "statically linked" \
+            || { echo "fatal: ${b} is not statically linked" >&2; exit 1; }
+    done
+
+    # Filename mirrors the AppImage / Flatpak layout: one tarball per
+    # (arch, version) using the x64 / arm64 label (#764).
+    local version
+    version=$(cd "${REPO_ROOT}" && git describe --tags --always --dirty 2>/dev/null || echo "snapshot")
+    local stem="aMule-${version}-Linux-${arch_label}-static"
+    mkdir -p "${outdir}/${stem}"
+    cp "${outdir}/amuled" "${outdir}/amulecmd" "${outdir}/amuleapi" "${outdir}/${stem}/"
+
+    # The WebUI ships inside this bundle. amuleapi serves no assets of its
+    # own, so a static-binary operator who fetched this tarball had a daemon
+    # that answered /api/v1 and nothing on /, and had to find a separate
+    # download to fix it -- which is why that separate amuleapi-frontend zip
+    # existed and why it no longer needs to. amuleapi finds this copy on its own because it
+    # looks next to its own executable (ResolveDefaultStaticDir), so the
+    # directory name here is load-bearing -- it must stay `amuleapi-static`.
+    local webui="${outdir}/${stem}/amuleapi-static"
+    mkdir -p "${webui}"
+    cp -R "${REPO_ROOT}/src/webapi/static/." "${webui}/"
+
+    # Same guard the frontend-zip job uses: compare against git rather than
+    # spot-checking filenames, so a new view, dictionary or image is covered
+    # the day it lands instead of the day someone remembers to extend a list.
+    local tracked packed
+    tracked=$(cd "${REPO_ROOT}" && git ls-files src/webapi/static | wc -l | tr -d ' ')
+    packed=$(find "${webui}" -type f | wc -l | tr -d ' ')
+    if  "${packed}" -ne "${tracked}" ; then
+        echo "fatal: bundled WebUI has ${packed} files, git tracks ${tracked}" >&2
+        exit 1
+    fi
+    # An entry point that cannot load fails in the browser rather than here.
+    local required
+    for required in index.html css/app.css js/app.js; do
+        if  ! -s "${webui}/${required}" ; then
+            echo "fatal: bundled WebUI is missing ${required}" >&2
+            exit 1
+        fi
+    done
+    echo "==> Bundled WebUI: ${packed} files"
+
+    local tarball="${artifact_dir}/${stem}.tar.gz"
+    echo "==> Bundling ${tarball}"
+    tar -czf "${tarball}" -C "${outdir}" "${stem}"
+    rm -rf "${outdir}"
+    echo "==> Done: ${tarball}"
+}
+
 setup_cross_arch() {
     # tonistiigi/binfmt registers QEMU emulators in the host kernel's
     # binfmt_misc so docker can run / build images for non-native
@@ -383,6 +527,7 @@
 case "${target}" in
     appimage)                build_appimage "${1:-}" ;;
     flatpak)                 build_flatpak "${1:-}" ;;
+    static)                  build_static "${1:-}" ;;
     render-flatpak-manifest) render_flatpak_manifest ;;
     validate)                validate_appimage "${1:-}" ;;
     all)                     build_all ;;

amule-3.0.1.tar.gz/packaging/linux/flatpak/org.amule.aMule.yaml.in -> amule-3.1.0.tar.gz/packaging/linux/flatpak/org.amule.aMule.yaml.in Changed

@@ -289,8 +289,11 @@
       - -DENABLE_GTKDOC=OFF
     sources:
       - type: archive
-        url: https://github.com/AyatanaIndicators/libayatana-appindicator/archive/refs/tags/0.5.94.tar.gz
-        sha256: 884a6bc77994c0b58c961613ca4c4b974dc91aa0f804e70e92f38a542d0d0f90
+        # 0.6.0, not 0.5.94: 0.6.0 is the first release that answers the
+        # StatusNotifierItem Activate D-Bus call, which is what a host sends
+        # on left-click. Without it the tray can only ever show its menu.
+        url: https://github.com/AyatanaIndicators/libayatana-appindicator/archive/refs/tags/0.6.0.tar.gz
+        sha256: 23be92ad8eb9625ce93b23b14f82f3cf88a4970c31d48581945ddfbac0441d06
 
   # libmaxminddb — enables aMule's IP2Country feature (country flag
   # lookup in client lists / search results / transfers). The matching
@@ -328,9 +331,12 @@
       - --without-opengl
       - --with-libcurl
     sources:
-      - type: archive
-        url: ${WX_TARBALL_URL}
-        sha256: ${WX_SHA256}
+      # 3.2 branch at a pinned commit: no 3.2.x release carries the
+      # wxEpollDispatcher unregister fix amuled needs (amule-org/amule#1136).
+      # Revert to a type: archive tarball when 3.2.12 ships.
+      - type: git
+        url: ${WX_GIT_URL}
+        commit: ${WX_COMMIT}
 
   - name: amule
     buildsystem: cmake-ninja
@@ -354,6 +360,7 @@
       - -DBUILD_REMOTEGUI=YES
       - -DBUILD_DAEMON=YES
       - -DBUILD_AMULECMD=YES
+      - -DBUILD_AMULEAPI=YES
       - -DBUILD_ED2K=YES
       - -DBUILD_WEBSERVER=YES
       - -DBUILD_CAS=YES

amule-3.1.0.tar.gz/packaging/linux/static Added

amule-3.1.0.tar.gz/packaging/linux/static/Dockerfile Added

@@ -0,0 +1,153 @@
+# syntax=docker/dockerfile:1
+#
+# Fully static aMule daemon (musl/Alpine) — self-contained amuled, amulecmd
+# and amuleapi binaries with no runtime shared-library dependencies. Feature
+# set: UPnP, IP2Country (GeoIP), BFD backtraces, NLS, and wxWebRequest
+# downloads. The monolithic GUI is intentionally excluded: wxGTK dlopen()s
+# loader/theme/input-method modules, so it cannot be meaningfully static.
+#
+# Driven by packaging/linux/build.sh, which feeds the ARGs below from
+# packaging/linux/versions.env (the single source of truth for pinned
+# versions). Build from the repository root:
+#
+#   packaging/linux/build.sh static            # host arch, tarball in dist/
+#
+# or directly (context is the checkout):
+#
+#   docker build -f packaging/linux/static/Dockerfile \
+#     --build-arg ALPINE_STATIC_BASE=3.20 --build-arg WX_VERSION=... \
+#     --output type=local,dest=out .
+#
+# Build args have no defaults so a missing pin fails loud — the caller must
+# source versions.env.
+
+ARG ALPINE_STATIC_BASE
+
+FROM alpine:${ALPINE_STATIC_BASE} AS builder
+
+ARG WX_VERSION
+ARG WX_GIT_URL
+ARG WX_COMMIT
+ARG CRYPTOPP_TAG_SUFFIX
+ARG LIBUPNP_VERSION
+ARG LIBUPNP_TARBALL_URL
+ARG LIBUPNP_SHA256
+
+RUN apk add --no-cache \
+        build-base cmake git python3 pkgconf wget \
+        autoconf automake libtool \
+        linux-headers \
+        boost-dev \
+        zlib-dev zlib-static \
+        expat-dev expat-static \
+        curl-dev curl-static \
+        openssl-dev openssl-libs-static \
+        nghttp2-dev nghttp2-static \
+        brotli-dev brotli-static \
+        c-ares-dev c-ares-static \
+        zstd-dev zstd-static \
+        libidn2-dev libidn2-static \
+        libunistring-dev libunistring-static \
+        libpsl-dev libpsl-static \
+        binutils-dev \
+        libmaxminddb-dev libmaxminddb-static \
+        gettext gettext-dev gettext-static
+
+# --- Crypto++ (static libcryptopp.a) ---
+RUN git clone --depth 1 --branch "CRYPTOPP_${CRYPTOPP_TAG_SUFFIX}" \
+        https://github.com/weidai11/cryptopp.git /tmp/cryptopp \
+ && make -C /tmp/cryptopp -j"$(nproc)" libcryptopp.a \
+ && make -C /tmp/cryptopp PREFIX=/usr/local install
+
+# --- wxWidgets (static, base + net, no GUI) ---
+# From the 3.2 branch at a pinned commit rather than a release tarball: no
+# 3.2.x release carries the wxEpollDispatcher unregister fix amuled needs
+# (amule-org/amule#1136). Revert to the tarball when 3.2.12 ships.
+RUN git init /tmp/wx \
+ && cd /tmp/wx \
+ && git remote add origin "${WX_GIT_URL}" \
+ && git fetch --depth 1 origin "${WX_COMMIT}" \
+ && git checkout FETCH_HEAD \
+ && git submodule update --init --depth 1 --recursive \
+ && ./configure \
+        --disable-shared \
+        --disable-gui \
+        --with-zlib=builtin \
+        --with-expat=builtin \
+        --prefix=/usr/local \
+ && make -j"$(nproc)" && make install
+
+# --- libupnp / pupnp (static; no static Alpine package, build from source) ---
+# pupnp 22.x is CMake-only (upstream dropped autotools), so build with CMake:
+# static libs only (UPNP_BUILD_SHARED=OFF), no samples/tests.
+# CMAKE_INSTALL_LIBDIR=lib keeps libupnp.pc out of lib64. The install also
+# drops a UPNP CMake package config that exposes only a UPNP::Static target,
+# but aMule links UPNP::Shared -- so remove lib/cmake/{UPNP,IXML} to make
+# aMule's find_package(UPNP CONFIG) fall back to pkg-config, which synthesises
+# UPNP::Shared from the static libupnp.a / libixml.a (the same path the 1.14.x
+# autotools build relied on). 22.x no longer needs the musl "-include stddef.h"
+# workaround the 1.14.x threadutil sources did.
+RUN wget -qO /tmp/libupnp.tar.gz "${LIBUPNP_TARBALL_URL}" \
+ && echo "${LIBUPNP_SHA256}  /tmp/libupnp.tar.gz" | sha256sum -c - \
+ && mkdir -p /tmp/libupnp && tar -xf /tmp/libupnp.tar.gz -C /tmp/libupnp --strip-components=1 \
+ && cd /tmp/libupnp \
+ && cmake -B build -DCMAKE_BUILD_TYPE=Release \
+        -DUPNP_BUILD_SHARED=OFF -DUPNP_BUILD_STATIC=ON \
+        -DUPNP_BUILD_SAMPLES=OFF -DUPNP_BUILD_TESTS=OFF -Dreuseaddr=ON -Dipv6=ON \
+        -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=lib \
+ && cmake --build build -j"$(nproc)" && cmake --install build \
+ && rm -rf /usr/local/lib/cmake/UPNP /usr/local/lib/cmake/IXML
+
+# Force static resolution for deps that ship BOTH .so and .a. CMake's
+# find_library prefers the .so dev symlink and hands its ABSOLUTE path to the
+# linker, which -static then rejects ("attempted static link of dynamic
+# object"). -DCMAKE_FIND_LIBRARY_SUFFIXES=.a doesn't stick (the platform module
+# resets it during project()). Dropping just the libX.so dev symlinks — while
+# keeping libX.so.N for dynamic build tools like msgfmt — makes find_library
+# resolve to the static archive. Every lib below has a .a present.
+RUN for l in bfd opcodes ctf sframe zstd z maxminddb intl; do \
+        rm -f "/usr/lib/lib$l.so" "/lib/lib$l.so"; \
+    done
+
+# --- aMule (static daemon, full feature set: UPnP + IP2Country + BFD + NLS) ---
+# Built from the repository checkout (the build context), so CI validates the
+# code under review. The only feature dropped is the optional
+# CHTTPDownloadThread CURLOPT tuning (CMAKE_DISABLE_FIND_PACKAGE_CURL) — its
+# config-mode target drags in libcurl.so; downloads still work via wx's own
+# (static) libcurl webrequest backend.
+COPY . /src
+WORKDIR /src
+RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig \
+ && cmake -S . -B build-static \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DBUILD_MONOLITHIC=OFF \
+        -DBUILD_DAEMON=ON \
+        -DBUILD_AMULECMD=ON \
+        -DBUILD_AMULEAPI=ON \
+        -DENABLE_UPNP=ON \
+        -DENABLE_IP2COUNTRY=ON \
+        -DENABLE_BFD=ON \
+        -DENABLE_NLS=ON \
+        -DENABLE_VERSION_CHECK=OFF \
+        -DwxWidgets_USE_STATIC=ON \
+        -DwxWidgets_CONFIG_EXECUTABLE=/usr/local/bin/wx-config \
+        -DZLIB_USE_STATIC_LIBS=ON \
+        -DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON \
+        -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc -static-libstdc++" \
+        -DCMAKE_CXX_STANDARD_LIBRARIES="$(pkg-config --static --libs libcurl)" \
+ && cmake --build build-static -j"$(nproc)" \
+ && mkdir -p /out \
+ && for b in amuled amulecmd amuleapi; do \
+        cp "$(find build-static -type f -name "$b" | head -1)" /out/; \
+    done \
+ && strip /out/amuled /out/amulecmd /out/amuleapi
+
+# Sanity gate: fail the build unless each binary is a static executable.
+RUN for b in amuled amulecmd amuleapi; do \
+        file "/out/$b"; \
+        ldd "/out/$b" 2>&1 | grep -qE "Not a valid dynamic program|not a dynamic executable" \
+          || { echo "FAIL: $b is dynamically linked"; ldd "/out/$b"; exit 1; }; \
+    done
+
+FROM scratch AS export
+COPY --from=builder /out/ /

amule-3.1.0.tar.gz/packaging/linux/static/Dockerfile.dockerignore Added

amule-3.1.0.tar.gz/packaging/linux/static/README.md Added

@@ -0,0 +1,59 @@
+# Fully static aMule daemon (musl/Alpine)
+
+Produces `amuled`, `amulecmd` and `amuleapi` as **fully static** binaries —
+one self-contained file each, with no runtime shared-library dependencies.
+`scp` them to any Linux host of the right architecture and run; nothing to
+install.
+
+```sh
+packaging/linux/build.sh static            # host arch → tarball in dist/
+packaging/linux/build.sh static x86_64     # cross-arch (needs setup-cross-arch)
+packaging/linux/build.sh static aarch64
+```
+
+Output: `dist/aMule-<version>-Linux-<x64|arm64>-static.tar.gz`.
+
+## What's included
+
+Feature set is complete for a headless node: **UPnP**, **IP2Country**
+(GeoIP; supply your own `GeoLite2`/`dbip` `.mmdb`), **BFD** crash
+backtraces, **NLS**, and **wxWebRequest** HTTP downloads.
+
+The monolithic **GUI is intentionally excluded** — wxGTK `dlopen()`s
+pixbuf/theme/input-method modules at runtime, so it cannot be meaningfully
+static-linked. This track is daemon-only.
+
+## Why musl (Alpine), not glibc
+
+glibc's NSS `dlopen()`s `libnss_*` even inside a `-static` binary, so
+hostname resolution would still need those `.so`s on the target — not
+self-contained. musl builds NSS into libc, so `-static` is genuinely
+standalone. (macOS static linking isn't possible at all: Apple ships no
+static `libSystem`.)
+
+## How it's built
+
+`Dockerfile`(Dockerfile) on an Alpine base (`ALPINE_STATIC_BASE`),
+driven by `build.sh` which feeds versions from
+`../versions.env`(../versions.env):
+
+- **wxWidgets** built static, `--disable-gui`, with the libcurl backend
+  (`WX_*` pins, SHA256-verified).
+- **Crypto++** built static (`CRYPTOPP_TAG_SUFFIX`).
+- **pupnp/libupnp** built static from the pinned source archive
+  (`LIBUPNP_*`, SHA256-verified; autotools bootstrapped in-tree).
+- `libmaxminddb` / `binutils` (BFD) / `gettext` (libintl) from Alpine's
+  static packages.
+- Final `-static` link pulls the `libcurl → openssl → nghttp2/brotli/…`
+  closure via `pkg-config --static`.
+
+The build gates on a `file`/`ldd` static-linking check, so a regression
+fails the build rather than shipping a dynamically-linked binary.
+
+## Runtime notes
+
+Neither affects the static property:
+
+- **HTTPS needs a CA bundle** present on the host (`/etc/ssl/certs`) for
+  certificate verification — that's data, not a library.
+- These are **daemon binaries only**; there is no GUI.

amule-3.0.1.tar.gz/packaging/linux/versions.env -> amule-3.1.0.tar.gz/packaging/linux/versions.env Changed

@@ -17,13 +17,24 @@
 # openSUSE Leap 15.5/Tumbleweed, Arch, Mint, Pop!_OS, Steam Deck, Pi OS).
 UBUNTU_BASE=22.04
 
+# Alpine base for the fully static musl daemon image (static/). musl (not
+# glibc) because glibc's NSS dlopen()s libnss_* even in a -static binary,
+# so hostname resolution wouldn't be self-contained; musl builds NSS into
+# libc, making -static genuinely standalone.
+ALPINE_STATIC_BASE=3.20
+
 # --------------------------------------------------------------------
 # wxWidgets (built from source for AppImage; consumed as a Flatpak module)
 # --------------------------------------------------------------------
 
-WX_VERSION=3.2.6
-WX_TARBALL_URL=https://github.com/wxWidgets/wxWidgets/releases/download/v${WX_VERSION}/wxWidgets-${WX_VERSION}.tar.bz2
-WX_SHA256=939e5b77ddc5b6092d1d7d29491fe67010a2433cf9b9c0d841ee4d04acb9dce7
+# Tracked from the upstream 3.2 maintenance branch rather than a release
+# tarball: every 3.2.x release to date predates the wxEpollDispatcher
+# unregister fix (upstream 3382306c8) that amuled needs under wxWebRequest,
+# see amule-org/amule#1136. Pinned to a commit, so builds stay reproducible.
+# SWITCH BACK to the release tarball once 3.2.12 ships with that fix.
+WX_VERSION=3.2.12-dev
+WX_GIT_URL=https://github.com/wxWidgets/wxWidgets.git
+WX_COMMIT=d73e1df63abee30759a6c8f134be8c091b619b7e
 
 # --------------------------------------------------------------------
 # AppImage tooling (linuxdeploy + GTK plugin)
@@ -49,9 +60,19 @@
 # for git tags: 8.9.0 -> 8_9_0 (full tag is CRYPTOPP_8_9_0).
 CRYPTOPP_TAG_SUFFIX=8_9_0
 
-LIBUPNP_VERSION=1.14.21
+LIBUPNP_VERSION=22.0.4
 LIBUPNP_TARBALL_URL=https://github.com/pupnp/pupnp/archive/refs/tags/release-${LIBUPNP_VERSION}.tar.gz
-LIBUPNP_SHA256=d176a6028b02ab36e9d334372dd64780d9a8e577a2d8d4c1d70ef8ced15d7d19
+LIBUPNP_SHA256=7028d2a151372ff8a34341e0a269f516676c1af95b0a2ba811a2f0a2fe91ea36
+
+# libayatana-appindicator from source: 22.04 packages 0.5.90, and the
+# StatusNotifierItem Activate D-Bus call -- what a host sends on left-click --
+# is only answered from 0.6.0. Without it the tray icon can only ever open its
+# menu, never the main window. 0.6.0's own deps (ayatana-indicator3 >= 0.8.4,
+# dbusmenu-gtk3, GTK >= 3.24) are all satisfied by 22.04's archive, so only
+# this one library is built from source.
+APPINDICATOR_VERSION=0.6.0
+APPINDICATOR_TARBALL_URL=https://github.com/AyatanaIndicators/libayatana-appindicator/archive/refs/tags/${APPINDICATOR_VERSION}.tar.gz
+APPINDICATOR_SHA256=23be92ad8eb9625ce93b23b14f82f3cf88a4970c31d48581945ddfbac0441d06
 
 LIBGD_VERSION=2.3.3
 LIBGD_TARBALL_URL=https://github.com/libgd/libgd/releases/download/gd-${LIBGD_VERSION}/libgd-${LIBGD_VERSION}.tar.xz

amule-3.0.1.tar.gz/packaging/macos/build.sh -> amule-3.1.0.tar.gz/packaging/macos/build.sh Changed

amule-3.1.0.tar.gz/packaging/macos/create-dmg.sh Added

@@ -0,0 +1,40 @@
+#!/bin/bash
+# Compressed .dmg from a staged folder, with a retry.
+#
+# Usage:
+#   packaging/macos/create-dmg.sh <volume-name> <src-folder> <out.dmg>
+#
+# hdiutil attaches the image it is building, so it loses to whatever else on
+# the machine touches the new volume first (Spotlight, disk arbitration) and
+# fails with "hdiutil: create failed - Resource busy". Nothing the caller does
+# causes it and nothing prevents it, so retry instead of losing the build:
+# observed on CI twice in one morning, a different arch each time. Shared by
+# build.sh and the Universal2 job so both get the same behaviour.
+
+set -euo pipefail
+
+if  $# -ne 3 ; then
+    echo "usage: $0 <volume-name> <src-folder> <out.dmg>" >&2
+    exit 2
+fi
+
+volname="$1"
+srcfolder="$2"
+out="$3"
+
+for attempt in 1 2 3; do
+    rm -f "${out}"
+    if hdiutil create \
+        -volname "${volname}" \
+        -srcfolder "${srcfolder}" \
+        -ov -format UDZO \
+        "${out}"; then
+        exit 0
+    fi
+    if  ${attempt} -eq 3 ; then
+        echo "fatal: hdiutil create failed ${attempt} times." >&2
+        exit 1
+    fi
+    echo "==> hdiutil create failed (attempt ${attempt}/3), retrying in 15s"
+    sleep 15
+done

amule-3.0.1.tar.gz/packaging/windows/build.sh -> amule-3.1.0.tar.gz/packaging/windows/build.sh Changed

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Windows portable .zip recipe for aMule.
 #
-# Runs INSIDE MSYS2 on the Windows host (CLANGARM64 or MINGW64 env).
+# Runs INSIDE MSYS2 on the Windows host (CLANGARM64, CLANG64 or MINGW64).
 # Can also be driven remotely over SSH from another machine, e.g.:
 #   ssh <windows-host> 'cd <repo> && packaging/windows/build.sh'
 
@@ -44,6 +44,7 @@
 # across all platforms in dist/.
 case "${WINDOWS_MSYSTEM}" in
     CLANGARM64) ARCH=arm64 ;;
+    CLANG64)    ARCH=x64 ;;
     MINGW64)    ARCH=x64 ;;
     *) echo "fatal: unsupported WINDOWS_MSYSTEM=${WINDOWS_MSYSTEM}" >&2; exit 1 ;;
 esac
@@ -70,7 +71,7 @@
     require_tool zip   "zip"
 
     # Verify we're in the right MSYS2 env. The MSYSTEM env var should
-    # match versions.env; if a user runs from MINGW64 with versions.env
+    # match versions.env; if a user runs from CLANG64 with versions.env
     # set to CLANGARM64 (or vice versa), the build will silently produce
     # the wrong arch.
     if  "${MSYSTEM:-}" != "${WINDOWS_MSYSTEM}" ; then
@@ -99,6 +100,7 @@
         -DBUILD_REMOTEGUI=YES \
         -DBUILD_DAEMON=YES \
         -DBUILD_AMULECMD=YES \
+        -DBUILD_AMULEAPI=YES \
         -DBUILD_ED2K=YES \
         -DBUILD_WEBSERVER=YES \
         -DBUILD_CAS=YES \

amule-3.0.1.tar.gz/packaging/windows/installer.nsi -> amule-3.1.0.tar.gz/packaging/windows/installer.nsi Changed

@@ -197,6 +197,9 @@
 LangString MYSTR_SEC_CORE              ${LANG_ENGLISH} "aMule (required)"
 LangString MYSTR_SEC_DESKTOP           ${LANG_ENGLISH} "Desktop shortcut"
 LangString MYSTR_SEC_AUTOSTART         ${LANG_ENGLISH} "Start aMule when I log in"
+LangString MYSTR_SEC_PROTO_ED2K        ${LANG_ENGLISH} "Register aMule for ed2k:// links"
+LangString MYSTR_SEC_PROTO_MAGNET      ${LANG_ENGLISH} "Register aMule for magnet: links"
+LangString MYSTR_SEC_ASSOC_COLLECTION  ${LANG_ENGLISH} "Associate .emulecollection files"
 LangString MYSTR_SEC_UNINSTALL         ${LANG_ENGLISH} "Uninstall"
 LangString MYSTR_SEC_REMOVE_USERDATA   ${LANG_ENGLISH} "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 
@@ -204,7 +207,10 @@
 LangString MYSTR_DESC_CORE             ${LANG_ENGLISH} "aMule application files (required)."
 LangString MYSTR_DESC_DESKTOP          ${LANG_ENGLISH} "Place an aMule shortcut on the desktop."
 LangString MYSTR_DESC_AUTOSTART        ${LANG_ENGLISH} "Launch aMule automatically when the current user logs in (per-user setting)."
-LangString MYSTR_DESC_UNINSTALL        ${LANG_ENGLISH} "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+LangString MYSTR_DESC_PROTO_ED2K       ${LANG_ENGLISH} "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+LangString MYSTR_DESC_PROTO_MAGNET     ${LANG_ENGLISH} "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+LangString MYSTR_DESC_ASSOC_COLLECTION ${LANG_ENGLISH} "Adds aMule to the $\"Open with$\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+LangString MYSTR_DESC_UNINSTALL        ${LANG_ENGLISH} "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 LangString MYSTR_DESC_REMOVE_USERDATA  ${LANG_ENGLISH} "Permanently delete %APPDATA%\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 
 ; Runtime messages (MessageBox / DetailPrint).
@@ -365,11 +371,46 @@
   ExecWait '"$INSTDIR\bin\amule.exe" --configure-autostart on'
 SectionEnd
 
+; URL scheme handler registration - two separate sections. ed2k is
+; default ON (clicking an eD2k link on the web is the common case);
+; magnet is default OFF because aMule only handles the eD2k-compatible
+; subset, and a user with a BitTorrent client would otherwise silently
+; lose BT magnet clicks. Both delegate to --configure-protocols with a
+; per-scheme value (ed2k:on / magnet:on) so all four surfaces
+; (installer, wizard, prefs, CLI) stay in sync.
+Section "Register aMule for ed2k:// links" SecProtoEd2k
+  ExecWait '"$INSTDIR\bin\amule.exe" --configure-protocols ed2k:on'
+SectionEnd
+
+Section /o "Register aMule for magnet: links" SecProtoMagnet
+  ExecWait '"$INSTDIR\bin\amule.exe" --configure-protocols magnet:on'
+SectionEnd
+
+; .emulecollection file association. Delegates to --configure-file-assoc
+; for the same reason as the scheme sections above: the same registration
+; is reachable from the installer, the first-run wizard, the Preferences
+; panel and the CLI, so the key layout lives in one place
+; (ProtocolHandlerManager) instead of being duplicated here. It is also
+; what lets a portable copy register itself without an installer.
+;
+; Default ON: a collection is only useful opened in an eD2k client, and on
+; a typical system nothing else claims the type. Note "on" adds aMule to
+; the "Open with" list and takes the extension default only when no other
+; program has claimed it - from Windows 8 on, the user's *chosen* default
+; lives in a hash-protected UserChoice key no installer may write. Same
+; HKCU-under-UAC caveat as the autostart section above.
+Section "Associate .emulecollection files" SecAssocCollection
+  ExecWait '"$INSTDIR\bin\amule.exe" --configure-file-assoc on'
+SectionEnd
+
 ; Component descriptions surfaced on the Components page.
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore}      "$(MYSTR_DESC_CORE)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop}   "$(MYSTR_DESC_DESKTOP)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecAutostart} "$(MYSTR_DESC_AUTOSTART)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore}        "$(MYSTR_DESC_CORE)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop}     "$(MYSTR_DESC_DESKTOP)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecAutostart}   "$(MYSTR_DESC_AUTOSTART)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecProtoEd2k}   "$(MYSTR_DESC_PROTO_ED2K)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecProtoMagnet} "$(MYSTR_DESC_PROTO_MAGNET)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecAssocCollection} "$(MYSTR_DESC_ASSOC_COLLECTION)"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ; --------------------------------------------------------------------
@@ -419,6 +460,36 @@
   DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "aMule"
   autostart_done:
 
+  ; URL scheme handlers — same "only wipe if still pointing at us"
+  ; guard as autostart above, so a user's manual re-registration
+  ; against another app survives the uninstall.
+  ReadRegStr $0 HKCU "Software\Classes\ed2k\shell\open\command" ""
+  StrCmp $0 "" ed2k_done 0
+  Push $0
+  Push "$INSTDIR"
+  Call un.StrContains
+  Pop $1
+  StrCmp $1 "" ed2k_done 0
+  DeleteRegKey HKCU "Software\Classes\ed2k"
+  ed2k_done:
+
+  ReadRegStr $0 HKCU "Software\Classes\magnet\shell\open\command" ""
+  StrCmp $0 "" magnet_done 0
+  Push $0
+  Push "$INSTDIR"
+  Call un.StrContains
+  Pop $1
+  StrCmp $1 "" magnet_done 0
+  DeleteRegKey HKCU "Software\Classes\magnet"
+  magnet_done:
+
+  ; .emulecollection association - delegate to the binary, which owns
+  ; the key layout and already refuses to remove a registration that no
+  ; longer points at us. Run before the files are deleted below.
+  IfFileExists "$INSTDIR\bin\amule.exe" 0 assoc_done
+  ExecWait '"$INSTDIR\bin\amule.exe" --configure-file-assoc off'
+  assoc_done:
+
   ; Application files. Explicit RMDir /r on the known subtrees first
   ; for safety, then the catch-all on $INSTDIR.
   RMDir /r "$INSTDIR\bin"
@@ -501,6 +572,9 @@
   SectionSetText ${SecCore}      "$(MYSTR_SEC_CORE)"
   SectionSetText ${SecDesktop}   "$(MYSTR_SEC_DESKTOP)"
   SectionSetText ${SecAutostart} "$(MYSTR_SEC_AUTOSTART)"
+  SectionSetText ${SecProtoEd2k}   "$(MYSTR_SEC_PROTO_ED2K)"
+  SectionSetText ${SecProtoMagnet} "$(MYSTR_SEC_PROTO_MAGNET)"
+  SectionSetText ${SecAssocCollection} "$(MYSTR_SEC_ASSOC_COLLECTION)"
 FunctionEnd
 
 Function un.onInit

amule-3.0.1.tar.gz/packaging/windows/installer_strings.c -> amule-3.1.0.tar.gz/packaging/windows/installer_strings.c Changed

@@ -36,6 +36,9 @@
 	_("aMule (required)"),
 	_("Desktop shortcut"),
 	_("Start aMule when I log in"),
+	_("Register aMule for ed2k:// links"),
+	_("Register aMule for magnet: links"),
+	_("Associate .emulecollection files"),
 	_("Uninstall"),
 	_("Remove user data (config, ED2K servers, Kad nodes, partfiles)"),
 
@@ -43,7 +46,10 @@
 	_("aMule application files (required)."),
 	_("Place an aMule shortcut on the desktop."),
 	_("Launch aMule automatically when the current user logs in (per-user setting)."),
-	_("Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."),
+	_("Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."),
+	_("aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."),
+	_("Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."),
+	_("Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."),
 	_("Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."),
 
 	/* Runtime messages (MessageBox / DetailPrint).

amule-3.0.1.tar.gz/packaging/windows/po-to-nsh.py -> amule-3.1.0.tar.gz/packaging/windows/po-to-nsh.py Changed

@@ -73,7 +73,6 @@
     "hr":    "CROATIAN",
     "hu":    "HUNGARIAN",
     "it":    "ITALIAN",
-    "it_CH": "ITALIAN",        # NSIS has no Swiss-Italian dialect
     "ja":    "JAPANESE",
     "ko_KR": "KOREAN",
     "lt":    "LITHUANIAN",
@@ -93,10 +92,10 @@
     "zh_TW": "TRADCHINESE",
 }
 
-# Reverse map: NSIS language name -> preferred po locale. When two po
-# locales map to the same NSIS language (it / it_CH both -> ITALIAN),
-# the earlier one wins -- so "it" beats "it_CH". Translations under
-# the less-preferred locale are unused on the installer side.
+# Reverse map: NSIS language name -> preferred po locale. If two po
+# locales ever map to the same NSIS language, the first one iterated
+# wins (setdefault keeps the earliest); translations under the later
+# locale would be unused on the installer side.
 NSIS_LANG_TO_LOCALE = {}
 for _loc, _nsis in LOCALE_TO_NSIS_LANG.items():
     NSIS_LANG_TO_LOCALE.setdefault(_nsis, _loc)
@@ -122,6 +121,12 @@
         "Desktop shortcut"),
     ("MYSTR_SEC_AUTOSTART",
         "Start aMule when I log in"),
+    ("MYSTR_SEC_PROTO_ED2K",
+        "Register aMule for ed2k:// links"),
+    ("MYSTR_SEC_PROTO_MAGNET",
+        "Register aMule for magnet: links"),
+    ("MYSTR_SEC_ASSOC_COLLECTION",
+        "Associate .emulecollection files"),
     ("MYSTR_SEC_UNINSTALL",
         "Uninstall"),
     ("MYSTR_SEC_REMOVE_USERDATA",
@@ -132,8 +137,14 @@
         "Place an aMule shortcut on the desktop."),
     ("MYSTR_DESC_AUTOSTART",
         "Launch aMule automatically when the current user logs in (per-user setting)."),
+    ("MYSTR_DESC_PROTO_ED2K",
+        "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."),
+    ("MYSTR_DESC_PROTO_MAGNET",
+        "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."),
+    ("MYSTR_DESC_ASSOC_COLLECTION",
+        "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."),
     ("MYSTR_DESC_UNINSTALL",
-        "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."),
+        "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."),
     ("MYSTR_DESC_REMOVE_USERDATA",
         "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."),
     ("MYSTR_MSG_AMULE_RUNNING",

amule-3.0.1.tar.gz/packaging/windows/versions.env -> amule-3.1.0.tar.gz/packaging/windows/versions.env Changed

@@ -13,10 +13,14 @@
 # toolchain + dependency packages.
 #
 #   CLANGARM64  arm64 (Snapdragon X Elite, Windows-on-ARM, etc.)
-#   MINGW64     x86_64 (most desktops/laptops). Same arch you run
+#   CLANG64     x86_64 (most desktops/laptops). Same arch you run
 #               "Windows 11" on a typical Intel/AMD PC.
+#   MINGW64     x86_64, still accepted, but capped at wxWidgets 3.2:
+#               MSYS2 does not package wx 3.3 for it, so a MINGW64
+#               build has no system dark mode. CI and the release
+#               packaging both use CLANG64 for x64.
 #
-# Override via env: WINDOWS_MSYSTEM=MINGW64 packaging/windows/build.sh
+# Override via env: WINDOWS_MSYSTEM=CLANG64 packaging/windows/build.sh
 WINDOWS_MSYSTEM=${WINDOWS_MSYSTEM:-CLANGARM64}
 
 # --------------------------------------------------------------------
@@ -24,7 +28,7 @@
 # --------------------------------------------------------------------
 
 # Set automatically from WINDOWS_MSYSTEM by build.sh, kept here for
-# transparency: CLANGARM64 -> arm64, MINGW64 -> x64. Neither matches
+# transparency: CLANGARM64 -> arm64, CLANG64/MINGW64 -> x64. Neither matches
 # Windows' own conventions (which would be ARM64 / AMD64) — we use
 # the names AppImage uses for filename consistency across platforms.

amule-3.0.1.tar.gz/platforms/MacOSX/amule.icns -> amule-3.1.0.tar.gz/platforms/MacOSX/amule.icns Changed

amule-3.0.1.tar.gz/po/CMakeLists.txt -> amule-3.1.0.tar.gz/po/CMakeLists.txt Changed

amule-3.0.1.tar.gz/po/POTFILES.in -> amule-3.1.0.tar.gz/po/POTFILES.in Changed

@@ -1,3 +1,4 @@
+src/AboutDialog.cpp
 src/AddFriend.cpp
 src/AppImageIntegration.cpp
 src/amuleAppCommon.cpp
@@ -7,28 +8,39 @@
 src/amule-gui.cpp
 src/amule-remote-gui.cpp
 src/BaseClient.cpp
+src/BrowseManager.cpp
 src/CanceledFileList.cpp
 src/CaptchaDialog.cpp
 src/CatDialog.cpp
 src/ChatSelector.cpp
 src/ChatWnd.cpp
+src/ClientContextActions.cpp
 src/ClientCreditsList.cpp
 src/ClientDetailDialog.cpp
+src/ClientHistoryListCtrl.cpp
 src/ClientRef.cpp
+src/ClientRowListCtrl.cpp
+src/ClientsListCtrl.cpp
+src/ClientsWnd.cpp
 src/ClientTCPSocket.cpp
 src/CommentDialog.cpp
 src/CommentDialogLst.cpp
 src/CorruptionBlackBox.cpp
+src/CountryFlags.cpp
 src/DataToText.cpp
+src/DirectoryTreeCtrl.cpp
 src/DownloadListCtrl.cpp
 src/DownloadQueue.cpp
 src/ExternalConn.cpp
 src/ExternalConnector.cpp
 src/FileDetailDialog.cpp
 src/FileDetailListCtrl.cpp
+src/FileLaunch.cpp
+src/FirstRunWizard.cpp
 src/FriendList.cpp
 src/FriendListCtrl.cpp
 src/GenericClientListCtrl.cpp
+src/geoip/MaxMindDBDatabase.cpp
 src/HTTPDownload.cpp
 src/IP2Country.cpp
 src/IPFilter.cpp
@@ -37,36 +49,47 @@
 src/kademlia/routing/RoutingZone.cpp
 src/KnownFile.cpp
 src/KnownFileList.cpp
+src/LanguageList.cpp
 src/libs/common/Format.cpp
 src/libs/ec/cpp/ECSpecialTags.cpp
 src/libs/ec/cpp/RemoteConnect.cpp
 src/LibSocketAsio.cpp
 src/ListenSocket.cpp
 src/Logger.cpp
+src/MediaProbe.cpp
+src/MediaProbeThread.cpp
 src/MuleNotebook.cpp
 src/MuleTextCtrl.cpp
 src/MuleTrayIcon.cpp
+src/MuleUDPSocket.cpp
 src/muuli_wdr.cpp
 src/OScopeCtrl.cpp
 src/OtherFunctions.cpp
+src/PartBarLegendUI.cpp
 src/PartFileConvert.cpp
 src/PartFileConvertDlg.cpp
 src/PartFile.cpp
+src/PeerCapabilities.h
 src/Preferences.cpp
 src/PrefsUnifiedDlg.cpp
 src/SearchDlg.cpp
 src/SearchList.cpp
 src/SearchListCtrl.cpp
+src/SearchProgressReport.cpp
 src/ServerConnect.cpp
 src/Server.cpp
 src/ServerList.cpp
 src/ServerListCtrl.cpp
 src/ServerSocket.cpp
 src/ServerWnd.cpp
+src/SharedDirWatcher.cpp
 src/SharedFileList.cpp
 src/SharedFilePeersListCtrl.cpp
 src/SharedFilesCtrl.cpp
+src/SharedFilesReloadProgress.cpp
+src/SharedFilesWnd.cpp
 src/SourceListCtrl.cpp
+src/SplashScreen.cpp
 src/Statistics.cpp
 src/StatisticsDlg.cpp
 src/StatTree.cpp
@@ -76,6 +99,7 @@
 src/ThreadTasks.cpp
 src/TransferWnd.cpp
 src/UploadClient.cpp
+src/UploadDiskIOThread.cpp
 src/UploadQueue.cpp
 src/UserEvents.cpp
 src/UserEvents.h

amule-3.0.1.tar.gz/po/amule.pot -> amule-3.1.0.tar.gz/po/amule.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aMule GIT\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
+"POT-Creation-Date: 2026-09-18 22:25+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"
@@ -18,69 +18,148 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr ""
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr ""
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr ""
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr ""
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -89,134 +168,260 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+msgid "Failed to open ED2KLinks file."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
 msgstr ""
 
-#: src/amuleAppCommon.cpp:179
-msgid "Failed to open ED2KLinks file."
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr ""
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr ""
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr ""
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr ""
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
 msgstr ""
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
 msgstr ""
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
 msgstr ""
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr ""
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
 msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr ""
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -226,1638 +431,1928 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr ""
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr ""
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr ""
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr ""
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr ""
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr ""
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr ""
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr ""
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr ""
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr ""
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr ""
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr ""
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
 msgstr ""
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
 msgstr ""
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
 msgstr ""
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
 msgstr ""
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
 msgstr ""
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
 msgstr ""
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
 msgstr ""
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#: src/amuleDlg.cpp
+msgid "New version available"
 msgstr ""
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
 msgstr ""
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr ""
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr ""
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
+#: src/amuleDlg.cpp
+msgid "Core"
 msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
 msgstr ""
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
 msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
 msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Encryption"
 msgstr ""
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
 msgstr ""
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr ""
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr ""
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr ""
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr ""
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr ""
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr ""
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr ""
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr ""
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr ""
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr ""
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr ""
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr ""
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, c-format
-msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgid "Could not delete the category: %s"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
-msgid "Unknown"
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/BaseClient.cpp:1363
+#: src/amule-remote-gui.cpp
 #, c-format
-msgid "Failed to retrieve shared files from user '%s'"
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
+msgid "Unknown"
 msgstr ""
 
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr ""
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr ""
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr ""
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr ""
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr ""
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr ""
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr ""
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr ""
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr ""
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr ""
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr ""
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr ""
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
+msgid "%.1f KiB/s"
 msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr ""
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr ""
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr ""
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr ""
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 ""
 msgstr1 ""
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr ""
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr ""
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr ""
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr ""
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr ""
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr ""
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr ""
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr ""
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr ""
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr ""
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr ""
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr ""
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr ""
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr ""
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr ""
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr ""
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr ""
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr ""
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr ""
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr ""
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr ""
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr ""
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr ""
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr ""
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr ""
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr ""
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr ""
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr ""
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr ""
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr ""
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr ""
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr ""
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Auto"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
-msgid "Auto"
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
-msgid "Enter new name for this file:"
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
-msgid "File rename"
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
-#, c-format
-msgid "Downloads (%i)"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Enter new name for this file:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "File rename"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
+#: src/DownloadListCtrl.cpp
+#, c-format
+msgid "Downloads (%i)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgid "Total queue size: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr ""
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr ""
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "You already have the file '%s'"
+msgid "You already have the file '%s' (requested as '%s')"
 msgstr ""
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "You are already trying to download the file %s"
+msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1418
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+msgid "You are already trying to download the file %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr ""
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr ""
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr ""
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr ""
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr ""
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr ""
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
+#: src/ExternalConn.cpp
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ExternalConn.cpp:1536
-msgid "WebSearch from remote interface makes no sense."
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr ""
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr ""
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr ""
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr ""
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr ""
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr ""
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1865,23 +2360,23 @@
 "Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr ""
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr ""
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1889,59 +2384,59 @@
 "\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr ""
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr ""
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr ""
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr ""
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1950,2215 +2445,2857 @@
 "Exiting...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr ""
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr ""
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr ""
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
 #, c-format
-msgid "%.2f kB/s"
+msgid "%.2f KiB/s"
 msgstr ""
 
-#: src/FriendList.cpp:123
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/FileLaunch.cpp
+msgid "File preview"
 msgstr ""
 
-#: src/FriendList.cpp:149
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
 msgstr ""
 
-#: src/FriendList.cpp:266
-msgid "CRITICAL - no client on StartChatSession"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
-msgid "Friends"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:141
-msgid "Add a friend"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:144
-msgid "Remove Friend"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:145
-msgid "Send &Message"
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:180
-msgid "Are you sure that you wish to delete the selected friend?"
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:182
-msgid "Are you sure that you wish to delete the selected friends?"
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:574
+#: src/FirstRunWizard.cpp
 msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "CRITICAL - no client on StartChatSession"
+msgstr ""
+
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
+msgid "Friends"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Add a friend"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Remove Friend"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Send &Message"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr ""
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr ""
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr ""
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr ""
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr ""
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr ""
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr ""
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr ""
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr ""
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr ""
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
 msgstr ""
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr ""
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr ""
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr ""
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr ""
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr ""
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr ""
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr ""
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr ""
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr ""
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr ""
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr ""
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
+#: src/muuli_wdr.cpp
+msgid "Add links"
 msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr ""
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr ""
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr ""
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr ""
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr ""
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr ""
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr ""
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr ""
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr ""
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr ""
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
 msgstr ""
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr ""
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr ""
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr ""
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr ""
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
+#: src/muuli_wdr.cpp
+msgid "Filter"
 msgstr ""
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr ""
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr ""
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
+#: src/muuli_wdr.cpp
+msgid "Extend"
 msgstr ""
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr ""
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr ""
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr ""
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr ""
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr ""
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
+#: src/muuli_wdr.cpp
+msgid "met-File"
 msgstr ""
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
+#: src/muuli_wdr.cpp
+msgid "Hash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
 msgstr ""
 
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
+#: src/muuli_wdr.cpp src/Statistics.cpp
+msgid "Transfer"
 msgstr ""
 
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
 msgstr ""
 
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
 msgstr ""
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
-msgid "Transfer"
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
 msgstr ""
 
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
+#: src/muuli_wdr.cpp
+msgid "Available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
+#: src/muuli_wdr.cpp
+msgid "Datarate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
 msgstr ""
 
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
 msgstr ""
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
 msgstr ""
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
 msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr ""
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr ""
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr ""
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr ""
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr ""
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr ""
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr ""
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr ""
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr ""
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr ""
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr ""
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr ""
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr ""
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr ""
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr ""
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr ""
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr ""
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
+#: src/muuli_wdr.cpp
+msgid "Client version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
+#: src/muuli_wdr.cpp
+msgid "User ID"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
+#: src/muuli_wdr.cpp
+msgid "Server IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
+#: src/muuli_wdr.cpp
+msgid "Current request"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
-msgid "Max sources per downloading file:"
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
-msgid "Max simultaneous connections:"
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
+#: src/muuli_wdr.cpp
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1444
-msgid "retries"
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
+#: src/muuli_wdr.cpp
+msgid "retries"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
-msgid "OK"
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1966
-msgid "Click here to apply any changes made to the preferences."
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1969
-msgid "Reset any changes made to the preferences."
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
+msgid "OK"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
+#: src/muuli_wdr.cpp
+msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
+#: src/muuli_wdr.cpp
+msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 msgid "Source:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4166,11 +5303,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4180,836 +5317,748 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
+#: src/muuli_wdr.cpp
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2696
-msgid "Enable Proxy"
+#: src/muuli_wdr.cpp
+msgid "The proxy host name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2697
-msgid "Enable/disable proxy support"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
+#: src/muuli_wdr.cpp
+msgid "The proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2714
-msgid "The proxy host name"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2719
-msgid "The proxy port"
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
+#: src/muuli_wdr.cpp
+msgid "Remember those settings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2763
-msgid "Remember those settings"
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
 msgstr ""
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr ""
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr ""
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr ""
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr ""
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 ""
 msgstr1 ""
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr ""
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr ""
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr ""
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr ""
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr ""
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr ""
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr ""
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr ""
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr ""
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr ""
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
 msgstr ""
 
-#: src/OtherFunctions.cpp:1212
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
 #, c-format
-msgid "Using config dir: %s"
+msgid "%u or more other sources have this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr ""
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr ""
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr ""
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr ""
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr ""
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr ""
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr ""
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
 msgstr ""
 
-#: src/Preferences.cpp:639
-msgid "Arabic"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:640
-msgid "Asturian"
+#: src/PeerCapabilities.h
+msgid "IPv6"
 msgstr ""
 
-#: src/Preferences.cpp:641
-msgid "Basque"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
 msgstr ""
 
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr ""
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr ""
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr ""
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr ""
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr ""
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr ""
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr ""
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr ""
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr ""
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr ""
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr ""
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr ""
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr ""
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr ""
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr ""
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr ""
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr ""
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr ""
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr ""
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr ""
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr ""
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr ""
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr ""
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr ""
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr ""
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr ""
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr ""
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr ""
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr ""
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr ""
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr ""
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr ""
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr ""
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr ""
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
+#: src/Preferences.cpp
+msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:982
-msgid "no options available"
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5019,1337 +6068,1686 @@
 "these settings."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
 "If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
 msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr ""
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr ""
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+#: src/SearchDlg.cpp
+msgid "Search in progress"
 msgstr ""
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Main"
 msgstr ""
 
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
-msgid "Main"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
 msgstr ""
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
 msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-msgid "Bitrate"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:718
-msgid "Search related files (eD2k, local server)"
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
+#: src/SearchListCtrl.cpp
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr ""
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
 msgstr ""
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr ""
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr ""
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr ""
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr ""
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 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"
-msgstr0 ""
-msgstr1 ""
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr ""
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr ""
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr ""
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr ""
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr ""
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr ""
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr ""
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr ""
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr ""
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr ""
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr ""
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr ""
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr ""
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr ""
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr ""
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr ""
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr ""
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr ""
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr ""
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr ""
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr ""
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr ""
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr ""
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 ""
 msgstr1 ""
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
 msgstr0 ""
 msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
+msgid "Shared directory not readable, skipping: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
-msgid "Upload Status"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
-msgid "Download Status"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
-msgid "Local File Name"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
-msgid "Shares File List"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Status"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Download Status"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Local File Name"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Shares File List"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
+#: src/SharedFilesCtrl.cpp
+msgid "Directory Path"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:114
-msgid "Directory Path"
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr ""
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
 msgstr ""
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr ""
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr ""
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr ""
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr ""
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr ""
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr ""
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr ""
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr ""
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr ""
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr ""
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr ""
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr ""
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr ""
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr ""
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr ""
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr ""
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr ""
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr ""
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr ""
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr ""
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6357,7 +7755,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6365,141 +7763,140 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr ""
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr ""
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr ""
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr ""
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr ""
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr ""
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Download:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Upload:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Total sources:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/TextClient.cpp
+msgid "PartFile"
 msgstr ""
 
-#: src/TextClient.cpp:965
+#: src/TextClient.cpp
 #, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr ""
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr ""
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6508,46 +7905,46 @@
 "Example: 'statistics 5' will show only the top 5 versions for each client type.\n"
 msgstr ""
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr ""
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr ""
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6555,35 +7952,35 @@
 "or a resolvable DNS name."
 msgstr ""
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr ""
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6594,109 +7991,121 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr ""
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6715,373 +8124,400 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr ""
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr ""
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr ""
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+msgid "Show the results of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr ""
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr ""
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr ""
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr ""
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr ""
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr ""
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr ""
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr ""
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr ""
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr ""
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr ""
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr ""
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr ""
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr ""
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr ""
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
 "Use '%s' instead.\n"
 msgstr ""
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr ""
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr ""
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr ""
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr ""
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr ""
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr ""
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr ""
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr ""
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr ""
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr ""
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr ""
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr ""
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr ""
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr ""
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr ""
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7093,172 +8529,169 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
+msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
+msgid "%.2f MiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
+msgid "%.2f GiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
+msgid "%.2f TiB"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7269,392 +8702,389 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr ""
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""

amule-3.0.1.tar.gz/po/ar.po -> amule-3.1.0.tar.gz/po/ar.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:19+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:11+0000\n"
 "Last-Translator: saleh alhathal <hathalsal@hotmail.com>\n"
 "Language-Team: \n"
 "Language: ar\n"
@@ -21,69 +21,148 @@
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr ""
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "غير متوفر"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "أضف صديق"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "يجب ان تضيف عنوان شبكي ومنفذ صحيحان!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr ""
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -92,138 +171,267 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "فشل لفتح %s (%s)"
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "إتصال بي : %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
 msgstr0 ""
 msgstr1 ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:179
-#, fuzzy
-msgid "Failed to open ED2KLinks file."
-msgstr "فشل لفتح %s (%s)"
-
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "فشل"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr ""
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "معلومات"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "تاكيد الخروج"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "قبل إتصال خارجي جديد\n"
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i خادمات وجدت في server.met"
+msgid "Loading temp files"
+msgstr "طلب ملف مشاركة من '%s'"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "طلب ملف مشاركة من '%s'"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "وجد %i ملف مشاركة معرف"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "وجد %i ملف مشاركة معرف"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "ابدء"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
 msgstr ""
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
+#: src/amule.cpp src/FirstRunWizard.cpp
+#, fuzzy
+msgid "eD2k server list (server.met)"
+msgstr "%i خادمات وجدت في server.met"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
 msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr ""
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -233,1652 +441,1958 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "ﻻ نضمن انه خالي من اﻻخطاء, قد يتسبب باعطال\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr ""
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr ""
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 #, fuzzy
 msgid "Server hostname notified"
 msgstr "إسم الخادم"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr ""
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr ""
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr ""
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr ""
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr ""
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr ""
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr ""
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr ""
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr ""
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
 msgstr ""
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "بحث"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr ""
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "تحميل"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
 msgstr ""
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr ""
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "عميل"
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "رسائل"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "احصائات"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "اعدادت"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr ""
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "غير متوفر"
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
 msgstr ""
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "يتم الإتصال"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Connected"
 msgstr "متصل"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Connecting"
 msgstr "يتم الإتصال"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr ""
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "إلغاء"
-
-#: src/amuleDlg.cpp:853
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "إيقاف محاولة اﻹتصال الحاليه"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "فصل"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "نسخة"
 
-#: src/amuleDlg.cpp:859
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "فصل من المستضيف الحالي"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "إتصال"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
 msgstr ""
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "وصف"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "سجل aMule"
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "تحميل: %.1f(%.1f) | رفع: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "رفع : %.1f |تحميل : %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "هل تريد حقا الخروج من البرنامج؟"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "تاكيد الخروج"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr ""
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "بحث"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "نافذة البحث"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "تحميل"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "تحميل"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "نافذة ملفات المشاركة"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "رسائل"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "عميل"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "نافذة الرسائل"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "احصائات"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "نافذة اﻻحصائيات"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "اعدادت"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "نافذة اﻹعدادات"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr ""
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr ""
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr ""
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "خطأ قاتل :فشل في تكوين الموَقت"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "اﻹتصال فقد"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "خطأ قاتل :فشل في تكوين الموَقت"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Connecting..."
 msgstr "يتم الإتصال"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Going down"
 msgstr "تسجيل الدخول اﻻن"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Ready"
 msgstr "اعد تحميل"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "غير متوفر"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "ﻻ وجود ﻻجزاء الملفات"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "قمت بمحاولت تحميل الملف مسبقا %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
-msgid "Unknown"
-msgstr "غير معرف"
-
-#: src/BaseClient.cpp:1363
+#: src/amule-remote-gui.cpp
 #, c-format
-msgid "Failed to retrieve shared files from user '%s'"
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
 msgstr ""
 
-#: src/BaseClient.cpp:1575
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
+msgid "Unknown"
+msgstr "غير معرف"
+
+#: src/BaseClient.cpp
 #, fuzzy
 msgid "Searching buddy for lowid connection"
 msgstr "بانتظار اﻻتصال ..."
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "Requested: %s\n"
 msgstr "طلب:"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
 msgstr1 "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
 msgstr1 "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "طلب ملف غير معروف"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr ""
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr ""
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "فشل غير متوقع اثناء كتابة ملف %s : %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "خطأ أثناء اﻹتصال بي%s (%s:%i): %d"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "صنف"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr ""
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "اختر مكان الملفات القادمة"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr ""
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "اضف لي صديق"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "عرض &تفاصيل"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "اعرض الملفات"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, fuzzy, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "حمل ملف الرصيد, تم التعرف على %u عميل"
 msgstr1 "حمل ملف الرصيد, تم التعرف على %u عميل"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, fuzzy, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 "الرصيد منتهى!"
 msgstr1 "الرصيد منتهى!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "تفاصيل العميل"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "هوية متدنية"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr ""
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "متصل"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "فصل الإتصال"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+#, fuzzy
+msgid "Name"
+msgstr "اسم الملف"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "عنوان IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "اخر إستقبال"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "نسخة"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "سرعة-الرفع"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "سرعة-التحميل"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "سرعة-الرفع"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "التحميل"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
 msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "غير مكتمل"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "شخص سيئ"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "تأكيد - صحيح"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "غير متوفر"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "غير متوفر"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "ملفات"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "تحميل"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "الرفع"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "غير معرف"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "ملف تعليقات"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "اسم مستخدم"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "اسم الملف"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "تقيم"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "بانتظار اﻻتصال ..."
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "ﻻ تعليق "
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, fuzzy, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "ﻻ تعليق "
 msgstr1 "ﻻ تعليق "
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "فشل في تحميل النموذج %s\n"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "ذاتي منخفض"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "ذاتي "
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "ذاتي عالي"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "متدني جدا"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "متدني"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "عادي"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "مرتفع"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "عالي جدا"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr ""
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "اطلب"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "اتصال من خلال خادم"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "اﻻنتظار ممتلئ"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "في اﻻنتظار"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "تحميل"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr ""
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "اجزاء غير مطلوبة"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr ""
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "عدد اتصلات كثيرة"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr ""
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "حظر"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr ""
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr ""
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr ""
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr ""
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr ""
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr ""
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr ""
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr ""
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "اكمل"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr ""
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr ""
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr ""
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "حجم"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "نقل"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "سرعة"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "تقدم"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "مصدر"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "أولوية"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "حالة"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "الوقت المتبقي"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "اخر اكتمال"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "اخر إستقبال"
 
-#: src/DownloadListCtrl.cpp:411
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
-
-#: 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:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "ذاتي"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "إلغاء"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "%إيقاف"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&إيقاف مؤقت"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "%إكمل"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "إ&نتهاء التنظيف"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "خيرات اضافية"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "مشاهدة"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "اعرض الملف &تفاصيل"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "اعرض كل التعليقات"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "طلب ملف اخر"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&فتح الملف"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
-msgid "Enter new name for this file:"
-msgstr ""
+#: src/DownloadListCtrl.cpp
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
-msgid "File rename"
-msgstr ""
+#: src/DownloadListCtrl.cpp
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Enter new name for this file:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
-#, c-format
-msgid "Downloads (%i)"
-msgstr "تحميل (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "File rename"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr ""
+msgid "Downloads (%i)"
+msgstr "تحميل (%i)"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "مجموع حجم ملفات المشاركة : %s"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading temp files from %s."
 msgstr "طلب ملف مشاركة من '%s'"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "ﻻ وجود ﻻجزاء الملفات"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "وجد %i جزء ملفات"
 msgstr1 "وجد %i جزء ملفات"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "تحميل %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr ""
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "قمت بمحاولت تحميل الملف مسبقا %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr ""
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr ""
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr ""
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr ""
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "اﻹتصال الذاتي بالخادم سيعيد المحاولة بعد %d ثانية"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr ""
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr ""
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "جاري البحث ستم جلب النتيجة في لحظة"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "جاري البحث ستم جلب النتيجة في لحظة"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr ""
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr ""
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr ""
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr ""
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr ""
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "الغاء المجموعة"
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr ""
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1886,23 +2400,23 @@
 "Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr ""
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr ""
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1910,59 +2424,59 @@
 "\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr ""
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr ""
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr ""
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr ""
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1971,2233 +2485,2905 @@
 "Exiting...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr ""
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr ""
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr ""
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "خطأ: فشل في تكوين ملف اجزاء)"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "يتم الإتصال"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "اتصال"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "قمت بمحاولت تحميل الملف مسبقا %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "تصفح"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
 msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "اصدقاء"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "عرض &تفاصيل"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "اضف صديق"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "احذف صديق"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "ارسل &رسالة"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "اعرض الملفات"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 #, fuzzy
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 #, fuzzy
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "في اﻻنتظار"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "طلب ملف اخر"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "تحميل ينتظر: %i"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "في اﻻنتظار"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "الرفع"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "None"
 msgstr "ﻻ احد"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "ﻻ"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "نعم"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "فشل لفتح %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "تحميل ..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 #, fuzzy
 msgid "HTTP download cancelled"
 msgstr "سعة نطاق التحميل الحقيقية"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "فشل في حفظ ملف part.met.seeds لي %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "قمت بمحاولت تحميل الملف مسبقا %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "مجموع التحميل"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "سعة نطاق التحميل الحقيقية"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "فشل في تحميل قائمة الخادمات من %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "فشل في تحميل قائمة الخادمات من %s"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "فشل في تحميل النموذج %s\n"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "الحالي"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "معدل العمل"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "معدل الجلسة"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr ""
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr ""
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr ""
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr ""
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr ""
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr ""
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "اﻹفتراضية بالنظام"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "العربيه"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Asturian"
+msgstr "الأستونيه"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "البلغاريه"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "الدانماركيه"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "الهولنديه"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "الأستونيه"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "الفلنديه"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "الفرنسية"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "الألمانيه"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "الهنغاريه"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "الايطاليه"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "الكوريه"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "الليتوانيه"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "البرتغاليه"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Romanian"
+msgstr "الأستونيه"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "الروسيه"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "الإسبانيه"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "غير معروف :%i"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "اكتمال"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "اكتمل"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "ايقاف مؤقت"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "خاطئ"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "انتظار"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "عوامل اﻻتصال الخارجي"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Handshake failed."
 msgstr "عوامل اﻻتصال الخارجي"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr ""
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "اغلق"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "واضح"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "بلا حدود"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "متصل"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "متصل"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "عنوان الخادم: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "عنوان الخادم: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "فصل"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "إتصال"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "خروج"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr ""
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "بلا حدود"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "سرعة-التحميل"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "سرعة-الرفع"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "هوية العميل: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "إسم الخادم: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "عنوان الخادم: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "غير متصل"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "توقيع أثناء الإتصال: ممكن"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "توقيع أثناء الإتصال: معطل"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "فترة التشغيل: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "ارتكب"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "اضف لي صديق"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr ""
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "تحميل ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "عدد المستخدمين على الخادم الذي تتصل به..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "مستخدمين: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr ""
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "رفع :0.0 | تحميل : 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "غير متصل"
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr ""
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "بحث"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "نوع"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr ""
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr ""
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "اي"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "ارشيف"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "سمعي"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
 msgstr ""
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "صور"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "برامج"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "فيديو"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "إمتداد"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "اقل حجم"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "بايت"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "اكبر حجم"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr ""
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Filter"
+msgstr "تم ترشيح : %i"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr ""
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "اعرض الملفات"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "ابدء"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "إمتداد"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr ""
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "التحميل"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr ""
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr ""
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "ايجاد المصدر :"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "عام"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "اﻻسم كامل :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "غير متوفر"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "اﻻسم كامل"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "met-File"
+msgstr "ملفات"
 
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
+#: src/muuli_wdr.cpp
+msgid "Hash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "حجم الملف :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "حجم الملف"
 
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "حالة جزء الملف :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "اخر مرة تم اكتمال :"
-
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "نقل"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "ايجاد المصدر :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "حالة جزء الملف"
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "نقل المصدر :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "احصاء اجزاء الملف :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "متوفر :"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "اخر مرة تم اكتمال"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "نسبة المصادر :"
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "ايجاد المصدر"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "نقل المصدر"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "احصاء اجزاء الملف"
 
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "محول :"
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "متوفر"
 
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "حجم المكمل :"
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "نسبة المصادر"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Download Active Time"
+msgstr "سرعة-التحميل"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "حجم المكمل"
+
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "معالجة الفاسد بذكاء"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "فقد بسبب فساد :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "فقد بسبب فساد"
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "أكتسب بواسطة الضغط :"
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "أكتسب بواسطة الضغط"
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "طلبات"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "طلبات مقبوله"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "بينات محوله"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "ملفات مشاركة"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr "رفع نشط"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "غير مقيم"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "عنوان"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr ""
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "سيطر"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "نظف"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "طبق"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "جودة الملف"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "غير مقيم"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "غير صحيح / معطوب / مزيف"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "فقير"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "عادل"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "جيد"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "ممتاز"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "انعش"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "تحميل ,رجاء انتظر..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "مطلوب معلومات"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "عنوان IP :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "منفذ :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "منفذ"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "معلومت إضافية"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "اسم المستخدم :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Userhash"
+msgstr "مستخدمين"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "اضف"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "سرعة-التحميل"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "الحالي"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "معدل العمل"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "معدل الجلسة"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "سرعة-الرفع"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "تحميل نشط"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "إتصال نشط (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "رفع نشط"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "شجرة اﻻحصائيات"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "اسم المستخدم:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Client software"
+msgstr "عميل"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Client version"
+msgstr "عميل"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "User ID"
+msgstr "مستخدمين: 0"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "عنوان الخادم"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Server name"
+msgstr "إسم الخادم"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Current request"
+msgstr "الحالي"
 
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Average upload rate"
+msgstr "متوسط زمن التحميل : %s"
 
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Average download rate"
+msgstr "متوسط زمن التحميل : %s"
 
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Uploaded (session)"
+msgstr "معدل رفع الجلسة"
 
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Downloaded (session)"
+msgstr "معدل تحميل الجلسة"
 
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Uploaded (total)"
+msgstr "الرفع"
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Downloaded (total)"
+msgstr "تحميل (%i)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "مصدر"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "اﻻنتظار ممتلئ"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Queue score"
+msgstr "اﻻنتظار ممتلئ"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "مستعار"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "بدء مصغر"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "تصفح"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "مشغل الفيديو"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "الرفع"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
-msgid "Max sources per downloading file:"
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
-msgid "Max simultaneous connections:"
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
+#: src/muuli_wdr.cpp
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "ربط تلقائي عند بدء التشغيل"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "إعادة اﻹتصال عند الفصل"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "إحذ الخادمات التي ﻻ تعمل بعد"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "أعد المحاولة"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "قائمة"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "إستخدم نظام اﻷولوية"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "إتصال أمن"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "جعل الخادمات المضافة يدويا ذو اولوية عالية"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "أضف الملفات للتحميل بوضع متوقف"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "أضف الملفات للتحميل بوضع ذاتي"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "حاول تحميل القطع اﻻولى واﻻخيرة اوﻻ"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "ارفع"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "أضف ملفات مشاركة جديدة بوضع ذاتي"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "احذف صديق"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "رسم بياني"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "تحيدث كل:5 ثواني"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "خلفية"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "شبكة"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "حمل الحالي"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "معدل تحميل الحالي"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "معدل تحميل الجلسة"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "ارفع الحالي"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "معدل رفع الحالي"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "معدل رفع الجلسة"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "اتصال نشط"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "اختر"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!!تحذير!!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "الحد اﻷعلى للتصالات لكل 5 ثواني"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "فترة تحديث الإتصال بالخادم %i دقيقة"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "اظهر معدل النقل علي العنوان"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "اظهر معدل النقل علي العنوان"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "عوامل اﻻتصال الخارجي"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "اقبل اتصال خارجي"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "زمن تحديث الصفحة (بالثانية)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr " Gzipتمكين ضغط نوع"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "اﻹفتراضية بالنظام"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "موافق"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "عنوان :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "تعليق :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
 msgstr "مجلد القادم"
 
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "تغير الأولوية للملفات الحديثة :"
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "تغير الأولوية للملفات الحديثة"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "ﻻ تغير"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "معاد"
-
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "قم بالضغط على هذا الزر لتحديث قائمة الخادمات من العنوان ..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "قائمة الخادمات"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "عنوان شبكي :منفذ"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "اضف خادم يدويا )قم بمل الخانة على اليسار اوﻻ)..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "سجل aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "معلومات الخادم"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "الكل"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "تمكين التوقيع الشبكي"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "نسبة المصادر :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "مصدر"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4205,11 +5391,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4219,855 +5405,762 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "التحميل"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "ربط تلقائي عند بدء التشغيل"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
+#: src/muuli_wdr.cpp
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2696
-msgid "Enable Proxy"
+#: src/muuli_wdr.cpp
+msgid "The proxy host name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2697
-msgid "Enable/disable proxy support"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
+#: src/muuli_wdr.cpp
+msgid "The proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2714
-msgid "The proxy host name"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2719
-msgid "The proxy port"
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
+#: src/muuli_wdr.cpp
+msgid "Remember those settings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2763
-msgid "Remember those settings"
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "أكتسب بواسطة الضغط :"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&فتح الملف"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "إنتظار..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "رفع نشط :"
 
-#: src/muuli_wdr.cpp:2963
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Percent of total files"
-msgstr "مجموع الملفات"
+msgid "Show Clients for"
+msgstr "منفذ العميل"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "ملفات مشاركة"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "إختر فلتر العرض"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "رفع نشط"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "منفذ العميل"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "اعد تحميل"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "ارسل"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "إلغاء"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "ملفات مشاركة"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "فصل"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "إتصال"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "تعطيل %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 #, fuzzy
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "بايت"
 msgstr1 "بايت"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr ""
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr ""
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr ""
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr ""
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 #, fuzzy
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "بايت"
 msgstr1 "بايت"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "ثانية"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "دقيقة"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr ""
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr ""
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
 msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "الكل"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "الكل ماعدا"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "غير مكتمل"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "إيقاف"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "فيديو"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "أرشيف"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "نص"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
 msgstr ""
 
-#: src/OtherFunctions.cpp:1212
+#: src/PartBarLegendUI.cpp
 #, c-format
-msgid "Using config dir: %s"
+msgid "%u or more other sources have this part"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr ""
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr ""
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "خطأ: فشل في تكوين ملف اجزاء)"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "خطأ: %s (%s) معطوب, غير قادر لتحميل الملف"
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "فشل لفتح %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 #, fuzzy
 msgid "IO failure while saving partfile: "
 msgstr "خطأ أثناء حفظ ملف اجزاء: %s (%s => %s)"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "فشل في حفظ ملف part.met.seeds لي %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "فشل في تحميل قائمة الخادمات من %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "اﻹفتراضية بالنظام"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr ""
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "العربيه"
-
-#: src/Preferences.cpp:640
-#, fuzzy
-msgid "Asturian"
-msgstr "الأستونيه"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr ""
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "البلغاريه"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr ""
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr ""
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr ""
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr ""
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr ""
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "الدانماركيه"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "الهولنديه"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr ""
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr ""
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "الأستونيه"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "الفلنديه"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "الفرنسية"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr ""
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "الألمانيه"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr ""
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr ""
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "الهنغاريه"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "الايطاليه"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr ""
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr ""
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "الكوريه"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "الليتوانيه"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
 msgstr ""
 
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr ""
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "البرتغاليه"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:669
-#, fuzzy
-msgid "Romanian"
-msgstr "الأستونيه"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "الروسيه"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
+#: src/PeerCapabilities.h
+msgid "IPv6"
 msgstr ""
 
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "الإسبانيه"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:674
-msgid "Turkish"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
 msgstr ""
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr ""
-
-#: src/Preferences.cpp:779
-#, fuzzy
-msgid "Change Language"
-msgstr "الغة"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/Preferences.cpp
+msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "غير متوفر"
-
-#: src/Preferences.cpp:982
-msgid "no options available"
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "اتصال"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "مجلدات"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "الخادمات"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "ملفات"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "تحكم عن بعد"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5077,157 +6170,264 @@
 "these settings."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "عوامل اﻻتصال الخارجي"
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "عوامل اﻻتصال الخارجي"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "عوامل اﻻتصال الخارجي"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "عوامل اﻻتصال الخارجي"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "عوامل اﻻتصال الخارجي"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
 "If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "ذاتي"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "قمت بمحاولت تحميل الملف مسبقا %s"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "قبل إتصال خارجي جديد\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "وجد %i ملف مشاركة معرف"
+msgstr1 "وجد %i ملف مشاركة معرف"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "اﻹفتراضية بالنظام"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5235,1210 +6435,1467 @@
 "أضف هنا عنوان لتحميل ملفات server.met \n"
 "عنوان واحد فقط لكل سطر"
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "تحيدث كل:5 ثواني"
 msgstr1 "تحيدث كل:5 ثواني"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "فترة تحديث الإتصال بالخادم %i دقيقة"
 msgstr1 "فترة تحديث الإتصال بالخادم %i دقيقة"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "فترة تحديث الإتصال بالخادم :معطل"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "disabled"
 msgstr "تعطيل"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "وجد %i ملف مشاركة معرف"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "ملفات مشاركة"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
 msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "بحث"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "بحث"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Main"
 msgstr ""
 
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
-msgid "Main"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
 msgstr ""
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
 msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "تعريف ملف"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "غير مقيم"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "تعريف ملف"
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "طلب ملف اخر"
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
-msgid "Copy eD2k link to clipboard"
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "إلغاء"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "الفلنديه"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "Search progress not available"
+msgstr "%s غير متوفر"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "فشل في اﻹتصال باي خادم في القائمة القيام بمحاولة اخرى"
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
 msgstr "فشل في اﻹتصال باي خادم في القائمة القيام بمحاولة اخرى"
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
+msgstr "فشل في اﻹتصال باي خادم في القائمة القيام بمحاولة اخرى"
+
+#: src/ServerConnect.cpp
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "اﻹتصال الذاتي بالخادم سيعيد المحاولة بعد %d ثانية"
+msgstr1 "اﻹتصال الذاتي بالخادم سيعيد المحاولة بعد %d ثانية"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "متصل بي %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "إتصال بي : %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "خطأ قاتل اثناء محاولة اﻹتصال . احتمال أنك غير متصل باﻹنترنت"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "فقد اﻹتصال بي %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) يظهر انه ﻻ يعمل"
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 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"
-msgstr0 "اﻹتصال الذاتي بالخادم سيعيد المحاولة بعد %d ثانية"
-msgstr1 "اﻹتصال الذاتي بالخادم سيعيد المحاولة بعد %d ثانية"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "اﻹتصال فقد"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr ""
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i خادمات وجدت في server.met"
 msgstr1 "%i خادمات وجدت في server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d خادم مضاف"
 msgstr1 "%d خادم مضاف"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 #, fuzzy
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "خطأ: ملف server.met معطوب"
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "فشل غير متوقع اثناء كتابة ملف %s : %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr ""
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr ""
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr ""
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr ""
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr ""
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "فشل في حفظ server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "فشل غير متوقع اثناء كتابة ملف %s : %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "عنوان شبكي غير صحيح"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "فشل في تحميل قائمة الخادمات من %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "إسم الخادم"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "منفذ"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "وصف"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "مستخدمين"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "مستخدمين"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "ثابت"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "نسخة"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "ملفات"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "ملفات مشاركة"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "دقيقة"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "خادمات (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "خادم"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "الغاء الخادم"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Remove servers"
 msgstr "الغاء الخادم"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "الغاء كل الخادمات"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "عميل جديد هو %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, fuzzy, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "تلقي %d خادم جديد"
 msgstr1 "تلقي %d خادم جديد"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "الخادم رفض اخر امر"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "سجل aMule"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "هوية"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "اتصال"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "متصل"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr ""
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "UDP Connection State:"
 msgstr "اعلى سرعة اتصال تقديرية"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr ""
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connecting to buddy"
 msgstr "يتم الإتصال"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, fuzzy, c-format
 msgid "Connected to buddy at %s"
 msgstr "متصل بي %s (%s:%i)"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr ""
+
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed sources:"
 msgstr "ايجاد المصدر :"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr ""
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr ""
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr ""
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr ""
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "وجد %i ملف مشاركة معرف"
 msgstr1 "وجد %i ملف مشاركة معرف"
 
-#: src/SharedFileList.cpp:410
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "وجد %i ملفات مشاركة معروفة , %i غير معروفة"
-msgstr1 "وجد %i ملفات مشاركة معروفة , %i غير معروفة"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
+msgid "Shared directory not readable, skipping: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "اسم مستخدم"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "سرعة-التحميل"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "سرعة-الرفع"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "خطأ أثناء اﻹتصال بي%s (%s:%i): %d"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "وجد %i ملف مشاركة معرف"
+msgstr1 "وجد %i ملف مشاركة معرف"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "متوفر :"
+msgid "User Name"
+msgstr "اسم مستخدم"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "ارفع"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Download Status"
 msgstr "تحميل"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "اسم الملف"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "ملفات مشاركة"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "طلبات"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "طلبات مقبوله"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "بينات محوله"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr ""
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "أجزاء مكتسبة"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr ""
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "غير متوفر"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "ملفات مشاركة"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "اعد تسمية"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "نسخ رابط ED2k للحافظة"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "يجب ان تكون ذا هوية مرتفعة لتتمكن من انشاء رابط مصدر"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "مجموع حجم ملفات المشاركة : %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "مجموع حجم ملفات المشاركة : %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "ملفات مشاركة (%i)"
+msgstr1 "ملفات مشاركة (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "ملفات مشاركة (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr ""
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "وجد %i ملف مشاركة معرف"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "حالة"
+
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "اسم الملف"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "متوسط زمن التحميل : %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr ""
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "اعادة اﻹتصال : %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "الوقت منذ بدء التحميل: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "متصل بالخادم منذ : %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "عميل"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "غير معروف :%i"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "تم ترشيح : %i"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Banned: %s"
 msgstr "حظر"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr ""
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "إحتلال الخادم: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "مجموع حجم ملفات المشاركة : %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr ""
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "إتصال نشط (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr ""
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr ""
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr ""
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr ""
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr ""
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr ""
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6446,7 +7903,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6454,142 +7911,140 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "تحميل (%i)"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr ""
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr ""
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr ""
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr ""
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr ""
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Download:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Upload:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Total sources:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/TextClient.cpp
+msgid "PartFile"
 msgstr ""
 
-#: src/TextClient.cpp:965
+#: src/TextClient.cpp
 #, c-format
-msgid "Search progress: %u %% \n"
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/TextClient.cpp:967
-#, fuzzy
-msgid "Search progress not available"
-msgstr "%s غير متوفر"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr ""
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr ""
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6598,47 +8053,47 @@
 "Example: 'statistics 5' will show only the top 5 versions for each client type.\n"
 msgstr ""
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr ""
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Update IP filtering table from URL."
 msgstr "حدث server.met من العنوان"
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr ""
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6646,35 +8101,35 @@
 "or a resolvable DNS name."
 msgstr ""
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr ""
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6685,109 +8140,121 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr ""
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6806,377 +8273,404 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr ""
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr ""
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr ""
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr ""
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
+msgstr "إظهار شريط التقدم"
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "إظهار شريط التقدم"
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "إظهار شريط التقدم"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr ""
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr ""
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr ""
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr ""
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr ""
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr ""
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr ""
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr ""
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr ""
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr ""
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr ""
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr ""
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr ""
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr ""
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "ملفات مشاركة"
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr ""
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
 "Use '%s' instead.\n"
 msgstr ""
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr ""
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "سعة نطاق التحميل الحقيقية"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "هل أنت متاكد من حذف كل الملفات في هذا المصنف؟"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "مطلوب التاكيد"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "عدد اتصلات كثيرة"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr ""
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "إختر فلتر العرض"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "اضف مجموعة"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "عرض المجموعة"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "الغاء المجموعة"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr ""
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr ""
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr ""
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr ""
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr ""
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr ""
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr ""
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr ""
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7188,173 +8682,170 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 #, fuzzy
 msgid "Cancelled !"
 msgstr "إلغاء"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
+msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
+msgid "%.2f MiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
+msgid "%.2f GiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
+msgid "%.2f TiB"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "معاد"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7365,396 +8856,433 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr ""
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "ﻻ وجود ﻻجزاء الملفات"
+#~ msgid "Ratio"
+#~ msgstr "تقيم"
+
+#, fuzzy
+#~ msgid "Change Language"
+#~ msgstr "الغة"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "غير متوفر"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "أجزاء مكتسبة"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "متوفر :"
+
+#, fuzzy, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "وجد %i ملفات مشاركة معروفة , %i غير معروفة"
+#~ msgstr1 "وجد %i ملفات مشاركة معروفة , %i غير معروفة"
+
+#, fuzzy
+#~ msgid "Percent of total files"
+#~ msgstr "مجموع الملفات"
+
+#, fuzzy
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "إيقاف محاولة اﻹتصال الحاليه"
+
+#, fuzzy
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "فصل من المستضيف الحالي"
+
+#, fuzzy
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "إظهار شريط التقدم"
+
+#~ msgid "Commit"
+#~ msgstr "ارتكب"

amule-3.0.1.tar.gz/po/ast.po -> amule-3.1.0.tar.gz/po/ast.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:19+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:13+0000\n"
 "Last-Translator: astur <malditoastur@gmail.com>\n"
 "Language-Team: Language ast <malditoastur@gmail.com>\n"
 "Language: ast\n"
@@ -21,71 +21,159 @@
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Amosar aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Control remotu de aMule"
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Versión:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Veceru p2p multiplataforma basáu en eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (C) 2003-2019 Equipu aMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Parte d'aMule básase en \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Direicionamientu P2P basáu na métrica XOR.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Web:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Foru:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Comprobar nueva versión al entamu"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Coneutando a Kad..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "¡Tas usando una versión antigua de aMule!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Non disponible"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Amestar a un Collaciu"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Ye necesario introducir una IP y puertu válidos"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Información"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "¡El hash d'usuariu especificáu nun ye válidu!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "Add aMule to your application menu?"
 msgstr "Dempués del nome de l'aplicación"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Conexón fallida"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -94,82 +182,160 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "FALLU"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Fallu al abrir ficheru ED2KLinks."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "Diálogu aMule afaráu"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Ficheru índiz non alcontráu: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Fallu al obtener la llista de compartíos del usuariu '%s'"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "Ensin ficheros que compartir en direutoriu: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Nun pue convertise l'enllaz magnet a eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Enllaz eD2k inválidu! FALLU: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Agora, saliendo de l'aplicación principal..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Matando instancia amuleweb con pid `%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Matando instancia amuleweb con pid `%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Falló"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Matando instancia amuleweb con pid `%d' ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Matando instancia amuleweb con pid `%d' ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Terminando núcleu."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "Zarru d'aMule completáu."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Resultaos de depuración de memoria na salida d'aMule: "
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "La to llingua foi camudada a la de por defeutu del sistema, darréu d'un cambéu de configuración. Siéntolo."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -177,56 +343,109 @@
 "\n"
 "Configuración EC"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Contraseña fixada y conexones esternes habilitaes."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "ALERTA"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i sirvidor alcontráu en server.met"
+msgid "Loading temp files"
+msgstr "Cargando ficheros temporales dende %s."
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Cargando ficheros temporales dende %s."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Recargar los tos ficheros compartíos"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Recargar los tos ficheros compartíos"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Entamar"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Redes"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Redes"
+msgid "eD2k server list (server.met)"
+msgstr "%i sirvidor alcontráu en server.met"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "sirvidor web corriendo con pid: %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 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:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "FALLU"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "sirvidor web corriendo con pid: %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+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
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nun ye dable direicionar los puertos a la direición especificada: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "El puertu %u nun ta disponible. Tendrás IDBaxa\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -241,48 +460,48 @@
 "\n"
 "Comprueba la to rede y asegúrate de que'l puertu ta abiertu pa entrada y salida."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Fallu al criar el ficheru de RoblaOnline"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Fallu al criar el ficheru de RoblaOnline aMule"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Ye la primer vegada qu'anicies aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Esto ye una versión de preba, actualízate diariamente, y \n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "en https://amule-org.github.io, o nel nuesu canal de IRC #aMule en irc.libera.chat. \n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Unvíanos cualesquier fallu a https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -290,1584 +509,1892 @@
 "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/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Nome sirvidor notificáu"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "La reserva del espaciu en discu pal ficheru '%s' falló: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "FALLU: nun puede abrise'l ficheru de rexistru"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "ALERTA: el ficheru de rexistru ta ermu. Hai daqué mal."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "El rexistru resetióse"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Mensax del sirvidor: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Fallu al descargar la llista de nodos."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Fallu al abrir el ficheru de comprobación de versión descargáu"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Ficheru de comprobación de versión toyíu"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "¡Tas usando una versión antigua de aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "La cabera versión pues alcontrala siempres en https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "LA to copia de aMule ta actualizada."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Fallu al descargar el ficheru de comprobación de versión"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Usuarios: %s | Ficheros: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Ensin redes seleicionaes"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "con IDBaxa"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "con IDAlta"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Coneutáu a %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Coneutando a %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Desconeutáu de eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad aniciáu."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad deteníu."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Coneutáu a Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Coneutáu a Kad (tres torgafueos)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Desconeutáu de Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Red Kad deshabilitada n'opciones, nun coneutará."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 #, fuzzy
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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 https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: EnAniciu - Aniciando reló"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: derivando al fondu - vémonos"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Nun puede Crease un Ficheru Pid"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "ERROR: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Esto ye aMule %s basáu en eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Executándose en %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Visita https://github.com/amule-org/amule/releases/latest pa comprobar si hai una nueva versión disponible"
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "FALLU GRAVE: Nun pudo criase'l temporizador"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Control remotu de aMule"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Versión:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Redes"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Veceru p2p multiplataforma basáu en eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Guetar"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Web: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Descargues"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Foru: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Ficheros compartíos"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Web: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Veceros"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Foru: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Mensaxes"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (C) 2003-2019 Equipu aMule \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Estadístiques"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Parte d'aMule básase en \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Preferencies"
 
-#: src/amuleDlg.cpp:552
-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
+msgid "Navigate"
+msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Mensax del sirvidor: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Mensax"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Non disponible"
+
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "La cabera versión pues alcontrala siempres en https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "Diálogu aMule afaráu"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Coneutando"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Coneutando"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Desconeutáu"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Tres Tornafueos"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Coneutáu"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Coneutando"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Apagada"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Encaboxar"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Detener los intentos de conexón actuales"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versión"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Desconeutar"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Desconeutase de les redes coneutaes"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Coneutar"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Direición"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Coneutase a les redes disponibles"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Descripción"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "Rexistru"
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Xu: %.1f(%.1f) | Desc: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Xu: %.1f | Desc: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Coneutáu)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Desconeutáu)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Daveres quies colar de aMule?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Confirmar colar."
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Llanzar comandu:"
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- Por defeutu -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "El direutorio de tema '%s' nun esiste"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, 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:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Redes"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Ventana de redes"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Guetar"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Ventana de gueta"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Descargues"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "Descargando"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Ficheros compartíos"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Ventana de ficheros compartíos"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Mensaxes"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Ventana de redes"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Ventana de mensaxes"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Estadístiques"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Ventana de gráficos d'estadístiques"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Preferencies"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Ventana d'opciones"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importar"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "La ferramienta pa importar ficheros part"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Tocante a"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Tocante a/Aida"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Rede eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Rede Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Ensin rede"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "control remotu de aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Fallu Grave: Nun pudo criase'l temporizador"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Coneutar a amule remotu"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Conexón perdida"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Entrugar al colar"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Fallu Grave: Nun pudo criase'l temporizador"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Diendo a eventu bucle..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Coneutando..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Remanador d'eventu EC n'Interface Remota"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, 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"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Baxando"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Zarróse la conexón - ye dable que aMule finare."
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Intentu de conexón con %s (%s:%i) tiempu escosáu."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Deshabilitáu"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Coneutáu a la rede."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Fallu de conexón. Nun ye dable coneutar a %s:%d\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Llistu"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Toos"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Non disponible"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Ficheru non alcontráu"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Enllaz non válidu o yá ta na llista."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Carpeta pa los ficheros temporales de descargues"
+
+#: src/amule-remote-gui.cpp
 #, 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/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Desconocíu"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Fallu al obtener la llista de compartíos del usuariu '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Guetando a un collaciu con conexón idbaxa"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Versión Falsa eMule %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Falsu eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Falsu eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (basáu en eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Nomatu:  %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Solicitáu: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estadístiques de ficheru pa esta sesión: %d Aceutada de %d petición, %s tresfería\n"
 msgstr1 "Estadístiques de ficheru pa esta sesión: %d Aceutaes de %d peticiones, %s tresferíes\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estadístiques de ficheru pa toles sesiones: %d Aceutada de %d petición, %s tresfería\n"
 msgstr1 "Estadístiques de ficheru pa toles sesiones: %d Aceutaes de %d peticiones, %s tresferíes\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Solicitáu un ficheru desconocíu"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Mensax fieltráu de '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nuevu mensax de '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Usuariu %s (%u) solicitó la to llista de ficheros compartíos del direutoriu %s-> Refugada"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Fallu al obtener la llista de compartíos del usuariu '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "ALVERTENCIA: nun puede abrise known.met."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 #, fuzzy
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "AVISU: Ficheru de llista de compartíos corruptu, tien una testera inválida."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "IO error lleendo'l ficheru known.met: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Fallu guardando ficheru known.met: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Inxertar Captcha"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Categoría"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nueva Categoría"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Seleiciona un direutoriu pa los ficheros entrantes"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "¡Tienes d'especificar un nome pa la categoría!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "¡Tienes d'especificar un camín pa la categoría!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Sesión Charra Aniciada: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Coneutáu al Veceru ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Coneutando al veceru ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Fallu al coneutar col veceru / Conexón perdía ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 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/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Zarrar llingüeta"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Zarrar toles llingüetes"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Zarrar les otres llingüetes"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Amestar a collacios"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Amosar &Detalles"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Desaniciar de collacios"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Afitar puestu reserváu a un collaciu"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Ver ficheros"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Unviar mensax"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Unviar mensax al usuariu"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Mensax a unviar:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\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/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Seleición múltiple"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Desaniciar de collacios"
+msgstr1 "Desaniciar de collacios"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Recargar llista de ficheros compartíos."
+msgstr1 "Recargar llista de ficheros compartíos."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Ficheru de créditos cargáu, %u veceru conocíu"
 msgstr1 "Ficheru de créditos cargáu, %u veceros conocíos"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - ¡Caducó'l créditu de %u veceru!"
 msgstr1 " - ¡Caducaron los créditos de %u veceros!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Ficheru 'cryptkey.dat' nun alcontráu, criando."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Detalles del veceru"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "ID-Baxa"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "ID-Alta"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Habilitáu"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Sofitáu"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Non sofitáu"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Deshabilitáu"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Coneutáu"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Desconeutáu"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nome"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Señes IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Cabera receición"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Versión"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Velocidá de xuba"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "Velocidá de descarga"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Xubío"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Total Descargáu: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Modificador DE/XU"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Robla online"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Non completáu"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Veceru sospechosu"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Verificáu - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Ficheros"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Xubío"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Descargáu"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Descargando"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Xuba"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Activu"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Desconocíu"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Usuariu %s (%u) solicitó la to llista de ficheros compartíos -> Aceutada"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Usuariu %s (%u) solicitó la to llista de ficheros compartíos -> Refugada"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Usuariu %s (%u) solicitó la to llista de direutorios compartíos -> Refugada"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, fuzzy, 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/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, fuzzy, 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/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Usuariu %s (%u) direutorios compartíos %s"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Usuariu %s (%u) unviáu direutorios compartíos non solicitaos."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Usuariu %s (%u) unviada la llista de ficheros compartíos non deseyada"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "Usuariu %s (%u) refugó l'accesu a la llista de direutorios/ficheros compartíos"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Comentarios de ficheru"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Nome d'usuariu"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Nome de ficheru"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Valoración"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Comentariu"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "Guetando a un collaciu con conexón idbaxa"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Ensin comentarios"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u comentariu"
 msgstr1 "%u comentarios"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 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:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Fallu al descargar GeoIP.dat dende %s"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Ba"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Al"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Mui baxa"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Baxa"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Alta"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Mui alta"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Llanzamientu"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Entrugando"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Coneutando vía sirvidor"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Cola enllena"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Na cola"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Descargando"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Recibiendo hashset"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Partes non necesitaes"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Nun se pue coneutar IDBaxa con IDBaxa"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Abondes conexones"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Coneutando vía Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Abondes conexones Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Baneáu"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Fallu de conexón"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Cola remota enllena"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Antiguu MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Nuevu MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule Compatible"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Sirvidor llocal"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Sirvidor remotu"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Intercambéu de Fontes"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Pasivu"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Enllaz"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Semientes fonte"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Resultáu de la gueta"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Completáu"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "En progresu"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "ERROR: Nun queda espaciu en discu"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "ERROR: Partmet non alcontráu"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ERROR: Error d'entrada/salida!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ERROR: Falló!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "En cola"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Yá tás descargando"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Formatu de ficheru temp incorreutu o desconocíu."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Parte"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Tamañu"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Tresferío"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Velocidá"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Progresu"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Fontes"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioridá"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Estáu"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Tiempu Restante"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Cabera comprobación completa"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Cabera receición"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "¿De xuru quies desaniciar esti ficheru?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "¿De xuru quies desaniciar estos ficheros?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Reaición dende: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Auto"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Encaboxar"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Detener"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Posar"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Reanudar"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "&Llimpiar completaos"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Intercambiar toles fontes (A4AF) a esti ficheru"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Intercambiar toles fontes (A4AF) a esti ficheru (Auto)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Intercambiar toles fontes (A4AF) a otru ficheru"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Opciones estendíes"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Amosar detalles fi&cheru"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Amosar tolos comentarios"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Copiar la URL magnético al cartafueyos"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Copiar l'en&llaz eD2k al cartafueyos."
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Copiar rempuesta al cartafueyos"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Amestar URLs opcionales pa esti ficheru"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "non asignáu"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Asignar a categoría"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Abrir el ficheru"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "¿De xuru quies desaniciar esti ficheru?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "¿De xuru quies desaniciar estos ficheros?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Reaición dende: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Introduza'l nuevu nome pa esti ficheru:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Renomar ficheru"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Descargues (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Pa prevenir l'apaición d'esta alvertencia en cada vista previa,\n"
-"afita'l to reproductor de vídeos nes preferencies (%s por defeutu)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Previsualizar"
+msgid "Downloads (%i)"
+msgstr "Descargues (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, 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/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Total DE: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Guardando ficheru part %u de %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Tolos ficheros part atroxaos."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Cargando ficheros temporales dende %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Cargando ficheru part %u de %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "ERROR: Nun pudo cargase'l ficheru de copia de seguridá. Llea en https://github.com/amule-org/amule/discussions p'alcontrar soluciones de recuperación d'archivos part.met."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Tolos ficheros part cargaos."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Nun s'alcontraron ficheros .part"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Alcontróse %u parte de ficheru"
 msgstr1 "Alcontráronse %u partes de ficheru"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "El sistema de ficheros del direutoriu Temporal, nun pue remanar ficheros grandes."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "El sistema de ficheros del direutoriu Entrante, nun pue remanar ficheros grandes."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Descargando %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Yá tas descargando esti ficheru '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Yá tienes esti ficheru '%s'"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Yá tienes esti ficheru '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Yá tas descargando el ficheru %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Nun pue convertise l'enllaz magnet a eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Protocolu desconocíu del enllaz: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Enllaz eD2k inválidu! FALLU: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "El veceru unvió un paquete dempués que falló l'autenticación."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Conexón esterna zarrada."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "¡Conexones esternas deshabilitaes darréu d'una contraseña en blanco!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Conexones esternas deshabilitaes nel ficheru de configuración"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Nueva conexón esterna, aceutada"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "FALLU: nun pudo aceutase una nueva conexón esterna"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 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:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Coneutando con veceru: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Versión desconocía"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "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:559
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "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:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Versión de protocolu non válida"
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Marcador de versión de protocolu inesistente"
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Reintentaráse la conexón automática al sirvidor en %d segundu"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: wrong password."
 msgstr "Autenticación fallía"
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: missing password."
 msgstr "Autenticación fallía"
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Solicitú non válida, tendríes d'autenticate primero."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Accesu concedíu."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Fieltrar mensaxes de veceros desconocíos"
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Intentu d'accesu non autorizáu. Conexón zarrada."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Hash de ficheru non alcontráu: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "¡OOPS! ¡Fallu procesando OpCode!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Sirvidor non amestáu"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "sirvidor non amestáu: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "necesites definir un sirvidor pa desanicialu"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k ta desabilitáu nes preferencies"
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Ficheru non alcontráu"
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Ficheru non alcontráu"
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Gueta en procesu. Resultaos obteníos aína! "
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Gueta web dende un interface remotu nun tien xacíu"
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Gueta en procesu. Resultaos obteníos aína! "
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Ensin puntos pal gráficu."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 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:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Conexón esterna: apagáu solicitáu"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Yá tas zarrando."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Conexón esterna: amestando enllaz '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Enllaz non válidu o yá ta na llista."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Ficheru non alcontráu"
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Nome de ficheru incorreutu"
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Nun ye dable renomar ficheru"
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Zarrar esta sesión de charra"
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Aniciada Nueva sesión de charra"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Zarrar esta sesión de charra"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad ta deshabilitáu n'opciones."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Nome desconocíu)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad ta deshabilitáu n'opciones."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Yá tas coneutáu a eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Coneutando a eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Yá tas coneutáu a Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Coneutando a Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Toles redes tán deshabilitaes"
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Desconeutando de eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Desconeutando de Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, 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:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "opcode non válidu (¿versión de protocolu incorreuta?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Estensión desconocía '%s' pal comandu '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Comandu desconocíu '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1875,7 +2402,7 @@
 "\n"
 "Esti comandu nun tien un argumentu.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1883,7 +2410,7 @@
 "\n"
 "Esti comandu tien de tener un argumentu.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1891,7 +2418,7 @@
 "\n"
 "Esti comandu ta incompletu, tienes d'usar una de les estensiones....\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1899,11 +2426,11 @@
 "\n"
 "Estensiones disponibles:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Comandos disponibles:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1914,17 +2441,17 @@
 "Tolos comandos son sensibles a les mayúscules.\n"
 "Teclea '%s <comandu>' pa obtener información detallao del <comandu>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Colar de l'aplicación."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Amosar aida"
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1932,7 +2459,7 @@
 "Pa tener aida d'un comandu, teclea 'help <comandu>'.\n"
 "Pa tener la llista completa de comandos, teclea 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1943,46 +2470,46 @@
 "Usa '%s' pa la llista de comandos\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "¡Fallu de sintaxis!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Esti comandu nun tendría de tener dengún parámetru"
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Esti comandu tien de tener un parámetru."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Argumentu non válidu."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Esto ye un comandu incompletu."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Teclea '%s' pa tener más aida.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Esto ye %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Esto ye %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1990,7 +2517,7 @@
 "\n"
 "Criando veceru...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1999,7 +2526,7 @@
 "\n"
 "Ok, colando %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2013,118 +2540,361 @@
 "\n"
 "Colando...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Amosar esta aida."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Host au ta executándose aMule. (por defeutu: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Puertu de conexón esterna de aMule. (por defeutu: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Contraseña de conexones esternes"
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Lleer configuración dende'l ficheru."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Nun amueses denguna salida."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Mou Estendíu - amuesa tamién los mensaxes de depuración"
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Seleiciona la llingua del programa."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Escribe opciones de la llinia de comandu al ficheru de configuración."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Imprenta versión del programa."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Detalles del ficheru"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%% fináu."
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Previsualizar"
+
+#: src/FileLaunch.cpp
+#, 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/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ERROR: Fallu al abrir ficheru part '%s'"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "¡Bienllegáu!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Coneutando a collaciu"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Estáu de conexón:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Redes"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Puertu TCP estándar "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Puertu UDP estándar (Kad / gueta global) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Habilitar UPnP pal reunvíu de puertu del router"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Coneutar"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Yá tas descargando el ficheru %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Auto-actualizar la llista de sirvidores al aniciu"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Carpeta de destín pa les descargues"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Desaminar"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Carpeta pa los ficheros temporales de descargues"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "¡ Nun pudo abrise'l ficheru de collacios 'emfriends.met' pa la so llectura !"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 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/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "CRITICU - ensin veceru en sesión charra d'aniciu"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Collacios"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Amosar &Detalles"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Amestar un collaciu"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Desaniciar collaciu"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Unviar &Mensax"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Ver ficheros"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Afitar puestu reserváu a un collaciu"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "¿Daveres quies desaniciar al collaciu seleicionáu?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "¿Daveres quies desaniciar a los collacios seleicionaos?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2132,991 +2902,1312 @@
 "Nun se-y permite asignar más d'ún puestu reserváu.\n"
 " Namái s'asignó un puestu reserváu."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Seleición múltiple"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\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/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Unviar mensax al usuariu"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Mensax a unviar:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Desaniciar de collacios"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Unviar mensax"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Intercambia esti ficheru"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "LC: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Pidióse otru ficheru"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "Xubíes n'espera: %s"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "Na cola"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "Xuba"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "None"
 msgstr "Dengún"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Non"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Sí"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Fallu al abrir %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Descargando..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "Descarga HTTP encaboxada"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Fallu al obtener la llista de compartíos del usuariu '%s'"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Carpeta pa los ficheros temporales de descargues"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Descargaos %d bytes"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Descarga HTTP encaboxada"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr ""
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Descargar nuevu GeoIP.dat dende %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "Fallu al descargar ficheru GeoIP.dat, albortando actualización."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, 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:211
+#: src/IP2Country.cpp
 #, 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:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, fuzzy, c-format
 msgid "Successfully updated %s"
 msgstr "Actualizacion GeoIP.dat satisfactoria"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Error updating %s"
 msgstr "Fallu actualizando GeoIP.dat"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "Fallu al descargar GeoIP.dat dende %s"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Fallu al descargar GeoIP.dat dende %s"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 #, fuzzy
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Cargando fieltros IP 'ipfilter.dat' y 'ipfilter_static.dat'"
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "Cargáu %u rangu IP dende '%s'."
 msgstr1 "Cargáu %u rangos IP dende '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u llinia malformada descartóse"
 msgstr1 "%u llinies malformaes descartáronse"
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, 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/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Coneutar dende \n"
-"veceros conocíos"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Actual"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Media d'execución"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Media de la sesión"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Nodos (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "IP non válida pa coneutar"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Puertu non válidu pa coneutar"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Por favor enllene tolos campos requeríos"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Mensax"
+
+#: src/KadDlg.cpp
 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:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Si lo faes, desaniciarás tolos tos nodos actuales y reaniciarás la conexón Kademlia."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "¿Siguir?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: pallabra de gueta enforma curtia"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: Pallabra de gueta enforma curtia:"
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Lleíu %u contautu Kad"
 msgstr1 "Lleíos %u contautos Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Contautos non alcontraos, por favor descarga un ficheru nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Namái %d contautu Kad disponible, nodes.dat non escritu"
 msgstr1 "Namái %d contautos Kad disponible, nodes.dat non escritu"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Escritu %d contautu Kad"
 msgstr1 "Escritos %d contautos Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Rede Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Nome ficheru"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Tamañu ficheru"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Media compartío"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Xubío"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Pidío"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Aceutao"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Fontes completes"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "AVISU: Ficheru de llista de compartíos corruptu, tien una testera inválida."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Por defeutu"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanés"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Árabe"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturianu"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Euskera"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Búlgaru"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Catalán"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Chinu (simplificáu)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Chinu (Tradicional)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Croata"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Checu"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Danés"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Holandés"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Inglés (U.K.)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Inglés (U.K.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estoniu"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finlandés"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francés"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Gallegu"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Alemán"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Griegu"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebréu"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Húngaru"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italianu"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Xaponés"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Coreanu"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lituanu"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Noruegu"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polacu"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugués"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugués (Brasil)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Romanian"
+msgstr "Albanés"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Rusu"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Eslovenu"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Español"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Suecu"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turcu"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ucranianu"
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "Versión desconocía"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Carpeta de destín pa les descargues"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Codificando"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Completando"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Completáu"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Posáu"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Erróneu"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Aguardando"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Tienes d'especificar una contraseña non erma"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Contraseña incorreuta, nun ye un códigu MD5!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Fallu de conexón"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Conexón esterna zarrada."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "La conexón EC falló. Rempuesta erma."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Conexón esterna: Rempuesta del sirvidor incorreuta, falló handshake. Conexón zarrada."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Conexón esterna: Rempuesta del sirvidor incorreuta, falló handshake. Conexón zarrada."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "¡Fecho! Conexón afitada con aMule"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "¡Fecho! Conexón afitada."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Conexón esterna: Accesu denegáu, xida:"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Conexón esterna: Falló handshake."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "Descarga HTTP filu entamáu"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "Socket d'escucha: Ok"
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "FALLU: Nun pue escuchase nel puertu TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "FALLU:"
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "AVISU:"
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Zarrar"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Apegar"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Llimpiar"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Esbillar too"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Illimitáu"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Amosar aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Anubrir aMule"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Coneutáu"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Coneutáu"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Coneutáu a Kad (tres torgafueos)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "IP del sirvidor: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "IP Sirvidor:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Non coneutáu"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Puertu TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Puertu TCP: Nun ta llistu"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Puertu UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Puertu UDP: Nun ta llistu"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Información del veceru"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Llímite de xuba"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Llímite de descarga"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Amosar aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Desconeutar"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Anubrir aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Coneutar"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Colar"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Illimitáu"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Menú aMule"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Llímites de velocidá"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "XU: Dengún"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "XU: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DE: Denguna, "
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DE: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Velocidá de descarga: %.1f"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Velocidá de xuba: %.1f"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Nomatu: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "¡Dengún nomatu conseñáu!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID Veceru:"
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Nome del sirvidor: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP del sirvidor: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Non coneutáu"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Robla Online: Activada"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Robla Online: Desactivada"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Tiempu d'execución: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Ficheros compartíos: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Veceros na cola: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Total DE: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Total XU: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Enllaz eD2k:"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Unviar"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Amiesta un enllaz eD2k o magnet al núcleu."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Amestar a collacios"
+
+#: src/muuli_wdr.cpp
 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:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Los eventos son amosaos equí. Pa una llista completa d'eventos, empobina al rexistru de la llingüeta de sirvidores."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Cargando ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Usuarios: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Usuarios coneutaos al sirvidor actual y una estimación del númberu total d'usuarios."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Xu: 0.0 | Desc: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Í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:139
+#: src/muuli_wdr.cpp
 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 "Amuesa l'estáu de conexón y les tresferencies actives. Les fleches bermeyes quieren dicir que tas desconeutáu, les marielles que tienes ID-Baxa (darrera d'un torgafueos) y les verdes que tienes ID-Alta (La triba de conexón ye bona)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Non Coneutáu ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Coneutáu al sirvidor."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Guetar"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nome:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Triba"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Llocal"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Opciones estendíes"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Fieltrar"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Triba de ficheru"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Toos"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Archivos"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "Imáxenes de CD"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Imáxenes"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programes"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Testos"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Videos"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Estensión"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Tamañu mín"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Tamañu Máx"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Disponibilidá"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Fieltru:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Fieltrar Resultaos"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Fieltru"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Invertir Resultáu"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Anubrir Ficheros Conocíos"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Llimpiar Campos"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Entamar"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Más"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Estensión"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Encaboxar"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Descarga"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Descargar na categoría"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Resultáu de la gueta"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Llimpiar Campos"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Resultaos"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Llimpiar descargues completaes"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Fieltru:"
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "Fontes completes"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Xeneral"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Nome Completu :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Nome Completu"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "Ficheru-met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Ficheru-met :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Tamañu :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Estáu ficheru part :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Cabera comprobación completa :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Tamañu"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Tresferencia"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Fontes alcontraes :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Tresfiriendo fontes :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Númberu de partes :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Disponibles :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Estáu ficheru part"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Fluxu de datos :"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Cabera comprobación completa"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Tiempu Descarga Activa: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Tresferío :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Tamañu Completáu :"
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Fontes alcontraes"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Tresfiriendo fontes"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Númberu de partes"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Disponibles"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Fluxu de datos"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Tiempu Descarga Activa"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Tamañu Completáu"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Xestión intelixente de corrupción"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Perdío por corrupción :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Ganao por compresión :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Paquetes salvaos por I.C.H.:"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Perdío por corrupción"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Ganao por compresión"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Paquetes salvaos por I.C.H."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Compartiendo:"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Peticiones"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Peticiones aceutaes"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Datos tresferíos"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Media Compartíu"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Fontes completes"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Ficheros compartíos"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Xubío:"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Info Kad"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Non evaluada"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Títulu"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Nomes de ficheru"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Tomar"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Llimpiar"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 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:705
+#: src/muuli_wdr.cpp
 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."
@@ -3124,1137 +4215,1251 @@
 "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."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Calificación de ficheru"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Non evaluada"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Inválidu / Toyíu / Falsificación"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Probe"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Aceutable"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Bonu"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Mui bonu"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Desconeutáu de Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Descargando, por favor aguarda ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Tamañu desconocíu"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Información requería"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Señes IP :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Puertu :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Puertu"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Nome d'usuariu :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Hash del usuariu :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Hash del usuariu"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Amestar"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Velocidá de descarga"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Actual"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Media d'execución"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Media de la sesión"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Velocidá de xuba"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Conexones"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Descargues actives"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Conexones actives (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Xubes actives"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Árbol d'estadístiques"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Nome d'usuariu:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Hash d'usuariu:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Software del veceru:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Versión del veceru:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Software del veceru"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Señes IP:"
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Versión del veceru"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID usuariu:"
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID usuariu"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP Sirvidor:"
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP Sirvidor"
+
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Nome sirvidor"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Nome sirvidor:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Ofuscación:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Ofuscación"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Ofuscación de protocolu"
+
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Tresferencies al veceru"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Solicitú actual:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Velocidá media de xuba :"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Velocidá media de descarga :"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Xubíu (sesión):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Descargáu (sesión):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Xubíu (total):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Descargáu (total):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Solicitú actual"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Velocidá media de xuba"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Velocidá media de descarga"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Xubíu (sesión)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Descargáu (sesión)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Xubíu (total)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Descargáu (total)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Resultaos"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modificador DE/XU:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Ident Segura:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Ident Segura"
 
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "En cola"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Puntuación cola:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Puntuación cola"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Nomatu"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - la mula multi-plataforma"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Llingua: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Allanciu enantes d'amosar los mensaxes emerxentes."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Esto especifica la llingua usada nos controles."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Comprobar nueva versión al entamu"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Habilitando esto, fadrá que aMule compruebe si esiste una nueva versión al entamu."
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Aniciar minimizáu"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Habilitando esto, faes que aMule se minimice nel aniciu."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Entrugar al colar"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Facer que aMule entrugue enantes de colar."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Habilitar iconu de sistema"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 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:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimizar al iconu de la bandexa"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Activando esto fadrás que aMule se minimice na bandexa del sistema, asemeyao a la barra de xeres."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Remembrar estes opciones"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Tiempu d'allanciu de los mensaxes emerxentes: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "segundos"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Seleición del restolador"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 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."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Desaminar"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Abrir en nueva llingüeta si ye dable"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Reproductor de vídeu"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Llímites del anchor de banda"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Xuba"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Asignación de puestu reserváu"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Puertos"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Puertu TCP estándar "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Puertu UDP pa peticiones del sirvidor (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Puertu UDP estándar (Kad / gueta global) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Habilitar UPnP pal reunvíu de puertu del router"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "Puertu UPnP TCP (Opcional):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Señes IP llocal de enllaz: (erma pa cualesquiera):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Señes IP llocal de enllaz: (erma pa cualesquiera):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Max. fontes descargando un ficheru:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Máx. conexones al empar:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Autoconeutar al aniciar"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Reconeutar al perder la conexón"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Desaniciar sirvidores cayíos tres"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "reintentos"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Auto-actualizar la llista de sirvidores al aniciu"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Llista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Actualizar la llista de sirvidores al coneutar a un sirvidor"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Actualizar la llista de sirvidores cuando un veceru se coneuta"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Usar sistema de prioridaes"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Control intelixente de IDBaxa al coneutar"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Conexón segura"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Autoconeutar namái a Sirvidores fixos"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Asignar alta prioridá a los sirvidores amestaos manualmente"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Remanador Intelixente de Corrupciones (I.C.H)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Habilitar"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Amestar ficheros pa descargar en mou posáu"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Amestar nueves descargues con auto prioridá"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Tentar descargar enantes la primer y cabera parte"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Descargar siguiente ficheru posáu cuandu otru se complete"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Namái na mesma categoría"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Reservar espaciu en discu pa los nuevos ficheros"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Pa los nuevos ficheros reservar tol espaciu del ficheru, esto amenorga la fragmentación"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Detener descargues cuando s'algame l'espaciu llibre en discu"
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Introduz l'espaciu mínimu de discu deseyáu."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Guardar 10 fontes en ficheros raros (< 20 fontes)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Xubíes"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Amestar nuevos ficheros compartíos con auto prioridá"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Carpeta de destín pa les descargues"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Remanador Intelixente de Corrupciones (I.C.H)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Habilitar"
+
+#: src/muuli_wdr.cpp
+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:1567
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Carpetes compartíes"
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Carpeta pa los ficheros temporales de descargues"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Carpetes compartíes"
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Desaniciar"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Click drechu n'iconu de carpeta, pa compartición recursiva)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Compartir ficheros anubríos"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Sirvidor remotu"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Sirvidor llocal"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Intervalu d'actualización : 5 segs"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Tiempu de promediu del gráficu: 100 min"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala del gráficu de les conexones: 100"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Descargar escala gráfica:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Escala gráfica de descarga:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Colores: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Fondu"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Rexella"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Descarga actual"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Promediu descarga n'execución"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Promediu Descarga/sesión"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Xuba actual"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Promediu Xuba/tiempu"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Promediu xuba/sesión"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Conexones actives"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Barra de velocidá del iconu de sistema"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Kad-nodos actual"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Kad-nodos executando"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Kad-nodos sesión"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Seleicionar"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Árbol"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 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:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "¡¡¡ AVISU !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Nueves conexones máx. / 5 segs"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "Intervalu d'actualización de FTP en minutos"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "Intervalu d'actualización de FTP en minutos"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tamañu del buffer de ficheru: 240000 bytes"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Tamañu cola d'espera: 5000 veceros"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervalu d'actualización de conexón al sirvidor: Desactiváu"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Tema a usar: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Amosar \"Xestor rápidu d'enllaces eD2k\", en toles ventanes."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Amosar info estendía nes llingüetes de les categoríes"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "Amosar índices de tresferencia nel títulu"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Amosar índices de tresferencia nel títulu"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Enantes del nome de l'aplicación"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Dempués del nome de l'aplicación"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Amosar anchor de banda escedente"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Orientación vertical de la barra de ferramientes"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Ficheros de la cola de descarga"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Amosar porcentax de progresu"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Amosar barra de progresu"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Planu"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "3D"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Auto-ordenar ficheros (Alta CPU)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parámetros de conexón esterna"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Aceutar conexones esternes"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP de la interface que ta escuchando"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Puertu TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Habilitar UPnP port forwarding nel puertu EC"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Parámetros del sirvidor web"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "Puertu TCP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Comprobando contraseña\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Comprobando contraseña\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Denegar accesu a invitáu"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Contraseña d'invitáu pa sirvidor web"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Parámetros del sirvidor web"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Aniciar sirvidor web al entamu"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Plantía Web"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Contraseña alministrador"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Activar invitáu"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Contraseña invitáu"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 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:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Puertu HTTP del sirvidor web (Opcional)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Tiempu d'actualización de páxina (en segs)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Activar compresión gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Por defeutu"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Aceutar"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Aplicar cualesquier cambéu fechu nes opciones."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Encaboxar cualesquier cambéu fechu nes opciones."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Títulu :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Comentariu : "
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Direutoriu entrante :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Cambiar prioridá a nuevos ficheros asignaos :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Direutoriu entrante"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Cambiar prioridá a nuevos ficheros asignaos"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "Non cambiar"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Seleiciona color pa esta categoría (seleicionada) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Reafitar"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Seleiciona color pa esta categoría (seleicionada)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Calca esti botón pa llimpiar el registru."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Llista de sirvidores"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Amestar sirvidor manualmente: Nome"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Introduz el nome del nuevu sirvidor"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Puertu"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Introduz el puertu del sirvidor"
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Amestar manualmente un sirvidor (rellena los campos) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Rexistru"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Info. sirvidores"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Info ED2K"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Info Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nodos (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Estadístiques nodos"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Coneutar"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nuevu nodu"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Puertu:"
-
-#: src/muuli_wdr.cpp:2327
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Bootstrap from known clients"
+msgid "Bootstrap from node: IP"
 msgstr ""
 "Coneutar dende \n"
 "veceros conocíos"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Desconeutar Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node 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:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Usar Identificación Segura d'Usuariu"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Ofuscación de protocolu"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Sofitu d'ofuscación de protocolu"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Esta opción activa la ofuscación de protocolu, y fai que aMule aceute conexones ofuscaes de otros veceros."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usar ofuscación pa conexones salientes"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Esta opción fai que aMule use ofuscación de protocolu cuando se coneuten otros veceros/sirvidores."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Aceutar namái conexones ofuscaes"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Toos"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Dengún"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Quién pue adicar los mios ficheros compartíos:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Fieltráu de IPs"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Fieltru veceros"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Fieltru sirvidores"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Recargar llista"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Actualizar agora"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Auto-actualizar el fieltráu de IPs al entamu"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Nivel de fieltráu:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Fieltrar siempres IP's de LAN"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Control paranoicu de IPs non comprobaes"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Usar el ipfilter.dat de sistema si ta disponible"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Si nun s'alcuentra un ficheru ipfilter.dat llocal, permitir l'usu d'un ficheru ipfilter de sistema"
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Activar Robla online"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Habilitar la escritura de ficheros del SO, suel usase pa criar robles por aplicaciones esternes."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Frecuencia d'actualización (segs):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 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:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Guardar ficheru de robla online en: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Fluxu de datos :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Fontes"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4262,11 +5467,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4276,852 +5481,769 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Descargáu:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Auto-actualizar el fieltráu de IPs al entamu"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Fieltrar mensaxes entrantes (sacantes conversación actual):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Fieltrar tolos mensaxes"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 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:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Fieltrar mensaxes de veceros desconocíos"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Fieltrar mensaxes que contienen (usa ',' como separtador):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Amosar mensaxes recibíos nel rexistru"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Comentarios"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Fieltrar comentarios que contengan (usar ',' como separtador):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Habilitar autentificación"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Habilita/deshabilita autentificación usuariu/contraseña"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Nome d'usuariu:"
-
-#: src/muuli_wdr.cpp:2689
-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:2691
-msgid "Password:"
-msgstr "Contraseña:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "La contraseña a usar pa coneutar al proxy"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Habilitar Proxy"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Habilitar/Deshabilitar soporte Proxy"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Triba Proxy:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Sirvidor Proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Triba Proxy"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Sirvidor Proxy"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Nome del host del proxy"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Puertu Proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Puertu Proxy"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "El puertu del proxy"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Habilitar autentificación"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Habilita/deshabilita autentificación usuariu/contraseña"
+
+#: src/muuli_wdr.cpp
+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
+msgid "The password to use to connect to the proxy"
+msgstr "La contraseña a usar pa coneutar al proxy"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Coneutar a:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Conexón a aMule remotu"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Nome usuariu:"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Remembrar estes opciones"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Conexón esterna zarrada."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Usar compresión gzip"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Habilita mou estendíu de depuración al aniciu"
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&Abrir el ficheru"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Mensaxes de categoríes:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Amestar imports"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Reintentar seleicionáu"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Desaniciar seleicionáu"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Tipos Eventos"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "Xubes aceutaes :"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Amosar Veceros"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "Anubre los ficheros compartíos"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "Seleicionar fieltru de vistes"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "Xubes actives"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "Amosar Veceros"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "Recargar llista"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Recargar los tos ficheros compartíos"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Unviar"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Unviar un mensax específicu."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Zarrar esta sesión de charra"
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Coneutar a cualesquier sirvidor y/o Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Encaboxar"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Fich compartíos"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Desconeutar"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Coneutar"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Deshabilitáu %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
 msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/seg"
 msgstr1 "bytes/seg"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "segs"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "mins"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "hores"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Díes"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "díes"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "too"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "el restu"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Incompletu"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Deteníu"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Vídeu"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Ficheru"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Testu"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Activu"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Esti comandu nun tendría de tener dengún parámetru"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Esti comandu nun tendría de tener dengún parámetru"
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Esti comandu nun tendría de tener dengún parámetru"
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Esti comandu nun tendría de tener dengún parámetru"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Introduz el puertu del sirvidor"
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Introduz el puertu del sirvidor"
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Introduz el puertu del sirvidor"
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Esperando a ficheru part matando filu..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Importando %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Lleendo direutoriu temp"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Obteniendo información básica de ficheru info de descarga"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Criando ficheru de destín"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Cargando datos dende l'antigua descarga del ficheru (%u de %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Obteniendo información del ficheru fonte de descarga"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Amestando descarga y guardando nuevu ficheru part"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importar ficheros part"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Estáu"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Hash de ficheru"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Discu: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "¿Quies que los ficheros fonte d'una descarga importada satisfactoriamente seyan desaniciaos?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "¿Desaniciar fontes?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "ERROR: Fallu al criar el ficheru part"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, 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:409
+#: src/PartFile.cpp
 #, 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:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, 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:664
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), 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:675
+#: src/PartFile.cpp
 #, 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:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Intentando recuperar info de ficheru..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Nun pudo recuperase la info de ficheru..."
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Fallu al abrir %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "AVISU: %s pue tar toyíu (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "FALLU salvando ficheru part: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "ERROR E/S atroxando ficheru part: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Guardáu %i semiente de fontes en ficheru part: %s (%s)"
 msgstr1 "Guardaes %i semientes de fontes en ficheru part: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Guardáu %i semiente de fontes en ficheru part: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Parte toyía alcontrada (%i) en %d parte del ficheru %s - Resultáu del hash del ficheru |%s| Hash del ficheru |%s|"
 msgstr1 "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:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Parte (%i) completa alcontrada en %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Recodificación finada %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Fallu inesperáu mientres se completaba %s. Ficheru posáu"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Descarga finada: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Descarga finada: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Desaniciando ficheru: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "AVISU: Nun pue criase'l hash de la parte descargada, set de hashes incompletu pa '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 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:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Parte descargada %i toyía nel ficheru: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Asignando"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Espaciu en discu insuficiente"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Descargáu"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ERROR: Fallu al abrir ficheru part '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Por defeutu"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanés"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Árabe"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturianu"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Euskera"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Búlgaru"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Catalán"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Chinu (simplificáu)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Chinu (Tradicional)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Croata"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Checu"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danés"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Holandés"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Inglés (U.K.)"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Inglés (U.K.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estoniu"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finlandés"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francés"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Gallegu"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Alemán"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Griegu"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebréu"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Húngaru"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italianu"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italianu (Suizu)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Xaponés"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Coreanu"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituanu"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Noruegu"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polacu"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugués"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugués (Brasil)"
-
-#: src/Preferences.cpp:669
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "Romanian"
-msgstr "Albanés"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Rusu"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Eslovenu"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Español"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Suecu"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turcu"
+msgid "Extended source exchange"
+msgstr "Intercambéu de Fontes"
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ucranianu"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:779
-#, fuzzy
-msgid "Change Language"
-msgstr "Llingua: "
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Non disponible"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "opciones non disponibles"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "Categoría inválida alcontrada, saltando"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Categoría inválida alcontrada, saltando"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Puertu por defeutu que s'usará (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Conexón"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Direutorios"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Sirvidores"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Ficheros"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Seguridá"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interface"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Fieltros"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Controles remotos"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Robla online"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Avanzáu"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Eventos"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Debugging"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5137,26 +6259,43 @@
 "aMule furrulará bien ensin que camudes dengún\n"
 "d'estos parámetros."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "La triba de proxy a la que tas coneutando"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Comprobando contraseña\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5164,35 +6303,49 @@
 "aMule tien de reaniciase p'aplicar los cambeos:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- Puertu TCP camudáu.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- Puertu UDP camudáu.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "Conexón esterna zarrada."
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "Conexón esterna zarrada."
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "Nueva conexón esterna, aceutada"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "Conexón esterna zarrada."
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Ofuscación de protocolu"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Llingua camudada.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5200,27 +6353,33 @@
 "La to llista Auto-actualizable de sirvidores ta erma.\n"
 "La llista de sirvidores auto-actualizable al entamu desactivaráse."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 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:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Llingua camudada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Direutoriu TEMP camudáu.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- Rede ED2K activada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Versión de protocolu non válida"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5228,7 +6387,7 @@
 "eD2k y Kad tán desactivaos.\n"
 "Nun podrás coneutate hasta qu'actives a lo menos ún d'ellos."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5236,7 +6395,7 @@
 "Kad nun s'aniciará si'l to puertu UDP ta deshabilitáu.\n"
 "Habilita un puertu UDP o deshabilita Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5246,20 +6405,69 @@
 "Hai de reaniciar aMule agora.\n"
 "Si nun reanicies agora, nun sabemos si pasará daqué malo.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Auto recargar, aniciáu"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Carpeta pa los ficheros temporales de descargues"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Contraseña fixada y conexones esternes habilitaes."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5269,41 +6477,66 @@
 "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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Ficheros temporales"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Ficheros entrantes"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Robles online"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Escueye una carpeta pa %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Alcontróse %i ficheru compartíu"
+msgstr1 "Alcontráronse %i ficheros compartíos"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Esplorar"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Seleiciona restolador"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Seleiciona restolador"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Executable%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Por defeutu"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Editar llista de sirvidores"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5311,1208 +6544,1471 @@
 "Amesta equí les URL's pa descargar los ficheros server.met.\n"
 "Namái una url per llinia."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Fontes completes"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Estáu:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Estáu:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Intervalu d'actualización: %d seg"
 msgstr1 "Intervalu d'actualización: %d segs"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Tiempu mediu del gráficu: %d min"
 msgstr1 "Tiempu mediu del gráficu: %d mins"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Escala gráfica de conexones: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Tamañu del buffer de ficheru: %d byte"
 msgstr1 "Tamañu del buffer de ficheru: %d bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Tamañu de la cola de xuba: %d veceru"
 msgstr1 "Tamañu de la cola de xuba: %d veceros"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Intervalu de refrescu de la conexón al sirvidor: %d minutu"
 msgstr1 "Intervalu de refrescu de la conexón al sirvidor: %d minutos"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Intervalu de refrescu de la conexón al sirvidor: Deshabilitáu"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "deshabilitáu"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Execute command on '%s' event"
 msgstr "Executar comandu nel eventu `%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Habilitar execución de comandu nel núcleu"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Comandu del núcleu:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Habilitar execución de comandu na Interface"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Comandu de la Interface: "
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Les siguientes variables trocaránse:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Carpetes compartíes"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Recargar los tos ficheros compartíos"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Carpetes compartíes"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Recargar llista de ficheros compartíos."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Carpetes compartíes"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Escueye una carpeta pa %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Remembrar estes opciones"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Alerta de gueta"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Guetar"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "En progresu"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Alerta de gueta"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Principal"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "AVISU: Ficheru de llista de compartíos corruptu, tien una testera inválida."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 #, fuzzy
 msgid "No keyword for Kad search - aborting"
 msgstr "Pallabra clave pa gueta: %s"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Fallu non esperáu mentantu tentaba guetar en Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID Ficheru"
-
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Non evaluada"
-
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Descargar na categoría"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:714
+#: src/SearchList.cpp
 #, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Amestar URLs opcionales pa esti ficheru"
+msgid "Error %u: %s\n"
+msgstr "Fallu actualizando GeoIP.dat"
+
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ID Ficheru"
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Zarrar toles llingüetes"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Guetar ficheros rellacionaos (eD2k, gueta llocal)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Conseñar como ficheru conocíu"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Copiar l'enllaz eD2k al cartafueyos"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Copiar los enllaces eD2k al cartafueyos"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Tas coneutáu al sirvidor, que tentes desaniciar. Por favor desconéutate primero."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "Encaboxar"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Executando"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finlandés"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "Search progress not available"
+msgstr "Amosar porcentax de progresu"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static 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
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
 msgstr "Fallu al coneutar a tolos sirvidores."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
+msgstr "Fallu al coneutar a tolos sirvidores."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Reintentaráse la conexón automática al sirvidor en %d segundu"
+msgstr1 "Reintentaráse la conexón automática al sirvidor en %d segundos"
+
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Coneutáu a %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Conexón afitada en: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Conexón perdía con %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) paez tar cayíu."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) paez tar enllenu."
 
-#: 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"
-msgstr0 "Reintentaráse la conexón automática al sirvidor en %d segundu"
-msgstr1 "Reintentaráse la conexón automática al sirvidor en %d segundos"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Conexón perdida"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Coneutando con %s (%s:%i) fallíu"
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "ERROR: Socket inválidu al comprobar el timeout"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, 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:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Recibióse'l caberu resultáu de la to gueta DNS, descartando."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Cargando ficheru server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "¡Nun s'alcontró ficheru server.met!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "¡Fallu al abrir server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i sirvidor alcontráu en server.met"
 msgstr1 "%i sirvidores alcontraos en server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d sirvidor amestáu"
 msgstr1 "%d sirvidores amestaos"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "IO error lleendo'l ficheru known.met: %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Tas coneutáu al sirvidor, que tentes desaniciar. Por favor desconéutate primero."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Fallu al abrir '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "¡Fallu al guardar server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "IO error lleendo'l ficheru known.met: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "URL non válida"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Descarga finada de la llista de sirvidores de %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Nun s'alcontró una entrada de direición en 'addresses.dat'. Por favor, apega una llista de sirvidores válida nesti ficheru pa poder actualizar de mou automáticu la llista de sirvidores."
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Descargando llista de sirvidores de %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Fallu al descargar la llista de sirvidores dende %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Sirvidor llocal ye fieltráu polos Fieltros IP, ¡coneutando a un sirvidor distintu!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Descripción"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Usuarios"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Usuarios"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Sirvidor fixu"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versión"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Ficheros"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Fich compartíos"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Tas coneutáu a un sirvidor, que tas tentando desaniciar. Desconéutate enantes. El sirvidor NUN se desaniciará."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Nome desconocíu)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "De xuru quies desaniciar el sirvidor fixu %s"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "mins"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Sirvidores (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Sirvidor"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Coneutar al sirvidor"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Conseñar como sirvidor fixu"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Conseñar como sirvidor non-fixu"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Conseñar sirvidores como fixos"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Conseñar sirvidores como non-fixos"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Desaniciar sirvidor"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Desaniciar sirvidores"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Desaniciar tolos sirvidores"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Copiar los enllaces eD2k al cartafueyos"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Reconeutar al sirvidor"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "¿De xuru quies desaniciar tolos sirvidores?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "¿De xuru quies desaniciar el sirvidor seleicionáu?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "¿De xuru quies desaniciar los sirvidores seleicionaos?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ERROR: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "AVISU: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "El nuevU ID-Veceru ye %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "AVISU: ¡Recibiste ID-Baxa!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPa mas información, por favor ve a https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "¡Información recibía del sirvidor desconocía! - enforma pequeña"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Recibíu %d nuevu sirvidor"
 msgstr1 "Recibiéronse %d nuevos sirvidores"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Guardáu de llista de sirvidores fechu."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "El sirvidor refuga'l caberu comandu"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Paquete bogus recibíu dende'l sirvidor: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "Sirvidor IP %s (%s) ta fieltráu. Nun coneutará."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "usando ofuscación de protocolu."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Coneutando a %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "Rexistru"
+
+#: src/ServerWnd.cpp
 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:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Sirvidor non amestáu: Sirvidor-puertu especificáu non válidu."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Estáu de eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Estáu de conexón:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Coneutáu"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Estáu Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Running in LAN mode"
 msgstr "Executándose en %s"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Executando"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Estáu Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Estáu:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Estáu de conexón:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Estáu de conexón UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Estáu tres tornafueos:"
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Nun se requier collaciu - puertu TCP abiertu"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Nun se requier collaciu - puertu UDP abiertu"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Non collaciu"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Coneutando a collaciu"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Coneutáu a collaciu en %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Señes IP:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Fontes indizaes: %s"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Pallabres clave indizaes:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Notes indizaes: "
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Notes indizaes:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Media d'usuarios:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Media de ficheros:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Non executando"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Amestando ficheru %s a compartíos"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Alcontróse %i ficheru compartíu"
 msgstr1 "Alcontráronse %i ficheros compartíos"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Alcontróse %i ficheru compartíu, %i desconocíu"
-msgstr1 "Alcontráronse %i ficheros compartíos, %i desconocíos"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "FALLU: Tentando compartir %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Direutoriu compartíu non alcontráu, saltando: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Direutoriu compartíu non alcontráu, saltando: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Ensin ficheros que compartir en direutoriu: %s"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "Nome usuariu:"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Fallu guardando ficheru known.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "Velocidá de descarga"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Cargando ficheru server.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "Velocidá de xuba"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Ensin ficheros que compartir en direutoriu: %s"
+msgstr1 "Ensin ficheros que compartir en direutoriu: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Ensin ficheros que compartir en direutoriu: %s"
+msgstr1 "Ensin ficheros que compartir en direutoriu: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Alcontróse %i ficheru compartíu"
+msgstr1 "Alcontráronse %i ficheros compartíos"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "Disponibles :"
+msgid "User Name"
+msgstr "Nome usuariu:"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "Estáu de la xuba"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "Estáu de la descarga"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "Nome de ficheru"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "Fich compartíos"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Peticiones"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Peticiones aceutaes"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Datos tresferíos"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Media Compartíu"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Partes obteníes"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Fontes completes"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Disponibilidá"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Direutoriu"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Fich compartíos"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Amestar Comentariu/Valoración"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Editar Comentariu/Valoración"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Renomar"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Amestar ficheros en colleición a la llista de descargues"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Copiar &URL magnéticu al cartafueyos"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Copiar l'enllaz eD2k al cartafueyos (&Fonte)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 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:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Copiar l'enllaz eD2k al cartafueyos (&Nome del host)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 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:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Copiar l'enllaz eD2k al cartafueyos (Información &AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Copiar l'enllaz eD2k al cartafueyos (Información &AICH)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Necesites IDAlta pa criar un enllaz fonte válidu"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Fallu completando"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Fallu al obtener la llista de compartíos del usuariu '%s'"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Recargar los tos ficheros compartíos"
+msgstr1 "Recargar los tos ficheros compartíos"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Tamañu total de ficheros compartíos: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Tamañu total de ficheros compartíos: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Ficheros Compartíos (%i)"
+msgstr1 "Ficheros Compartíos (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Ficheros Compartíos (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Ficheru part"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Recargar llista de ficheros compartíos."
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Estáu"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "Nome de ficheru"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Datos xubíos (Sesión (Total)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Total por tráficu escedente (Paquetes): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Escedente por peticiones de ficheru (Paquetes): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Escedente por intercambéu de fontes (Paquetes): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Tráficu escedente de sirvidores (Paquetes): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Tráficu escedente Kad (Paquetes): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Cifráu escedente (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Xubíes actives: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Xubíes n'espera: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Total de xubíes satisfactories: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Total de xubíes fallíes: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Tiempu mediu de xuba: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Datos descargaos (Sesión (Total)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Fontes alcontraes: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Descargues actives (partes): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Índiz XU:DE Sesión (Total): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Velocidá media de descarga (Sesión): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Velocidá media de xuba (Sesión): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Velocidá máxima de descarga (Sesión): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Velocidá máxima de xuba (Sesión): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Reconexones: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Tiempu dende la primer tresferencia: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Coneutáu al sirvidor dende: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Conexones actives (estimáu): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Algamóse'l llímite máximu de conexones: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Media de conexones (estimáu): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Picu de conexones (estimáu): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Veceros"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Desconocíu: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtráu: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Baneáu: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Total: %i Conocíu(os): %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Sirvidores activos: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Sirvidores cayíos: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Total: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Sirvidores desaniciaos: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Sirvidores fieltraos: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Usuarios en sirvidores activos: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Ficheros en sirvidores activos: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Usuarios totales: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Ficheros totales: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Ocupación de Sirvidores: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Númberu de ficheros compartíos: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Tamañu total de ficheros compartíos: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Tamañu mediu de ficheru: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Sistema Operativu"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Non recibíu"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Conexones actives (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Non disponible"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Enxamás"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Executa <str> y cuela."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Procesando por hash: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Procesando por nome de ficheru: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Númberu inválidu\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6521,7 +8017,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6530,83 +8026,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "Teclea '%s' pa tener más aida.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Tamañu de descarga: %i"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Solicitú fallía con un fallu desconocíu."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operación satisfactoria."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Solicitú fallía col siguiente fallu: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "El Fieltru IP pa veceros ye %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "APAGÁU"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "ENCENDÍU"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "El Fieltru IP pa sirvidores ye %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "El nivel de fieltráu de IP actual ye %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Coneutáu a %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Coneutando agora"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "tres tornafueos"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6615,7 +8115,7 @@
 "\n"
 "Descarga:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6624,7 +8124,7 @@
 "\n"
 "Xuba:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6633,7 +8133,7 @@
 "\n"
 "Veceros na cola:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6642,39 +8142,33 @@
 "\n"
 "Fontes totales:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Ficheru part"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Númberu de resultaos de la gueta: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-#, fuzzy
-msgid "Search progress not available"
-msgstr "Amosar porcentax de progresu"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, 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:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Amosar una información curtia sobro l'estáu."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 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:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Amosar árbol d'estadístiques ensembre."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6688,11 +8182,11 @@
 "\n"
 "Exemplu: 'statistics 5' amosará namái les 5 versiones que más se repiten de cualesquier veceru.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Finar aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6702,40 +8196,40 @@
 "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:994
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload the given object."
 msgstr "Recargar l'oxetu dau."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload shared files list."
 msgstr "Recargar llista de ficheros compartíos."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload IP filtering table."
 msgstr "Recargar tabla de fieltru de IP dende ficheru."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload current IP filtering table."
 msgstr "Seleición nivel de fieltráu de IP"
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Update IP filtering table from URL."
 msgstr "Recargar tabla de fieltru de IP dende ficheru."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Coneutáu a la rede."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6747,36 +8241,36 @@
 "coneutar a esi sirvidor namái. La IP tien de ser una direición IPv4,\n"
 "o un nome DNS."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Coneutar namái a eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Coneutar namái a Kad"
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Desconeutáu de la rede."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Desconeutar de eD2k namái."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Desconeutar de Kad namái."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Add an eD2k or magnet link to core."
 msgstr "Amiesta un enllaz eD2k o magnet al núcleu."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6793,52 +8287,52 @@
 "amestaránse a la llista de sirvidores.\n"
 "\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Asigna un valor d'opción"
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Set IP filtering preferences."
 msgstr "Asignar opciones de fieltráu de IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Activa el fieltru pa veceros y sirvidores."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Desactiva el fieltru pa veceros y sirvidores."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Activa/Desactiva el fieltru IP pa veceros."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Activa el fieltru pa veceros."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Desactiva el fieltru pa veceros."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Activa/Desactiva el fieltru pa sirvidores."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Activa el fieltru pa sirvidores."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Desactiva el fieltru pa sirvidores."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Seleición nivel de fieltráu de IP"
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6846,66 +8340,80 @@
 "Niveles válidos nel fieltru 0-255, y el valor por defeutu (inicial)\n"
 "ye 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Asignar llímites d'anchor de banda."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Asignar un llímite de xuba."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "El valor dau a estos comandos han ser en kilobytes/seg.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Asignar un llímite de descarga."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Habilita/deshabilita autentificación usuariu/contraseña"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "El valor dau a estos comandos han ser en kilobytes/seg.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Obtener y amosar un valor d'opciones"
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering preferences."
 msgstr "Obtener opciones de fieltráu de IP"
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 #, 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:1042
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for clients only."
 msgstr "Obtener estáu del fieltru IP pa veceros."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for servers only."
 msgstr "Obtener estáu del fieltru IP pa sirvidores."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering level."
 msgstr "Seleición nivel de fieltráu de IP"
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Obtener llímites d'anchor de banda."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a search."
 msgstr "Fai una gueta en kad."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6924,46 +8432,48 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a global search."
 msgstr "Fai una gueta global."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a local search"
 msgstr "Fai una gueta llocal."
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a kad search"
 msgstr "Fai una gueta en kad."
 
-#: src/TextClient.cpp:1070
+#: src/TextClient.cpp
 #, fuzzy
-msgid "Show the results of the last search."
+msgid "Show the results of a search."
 msgstr "Amuesa los resultaos de la cabera gueta."
 
-#: src/TextClient.cpp:1071
-#, fuzzy
-msgid "Return the results of the previous search.\n"
-msgstr "Devuelve los resultaos de la gueta anterior.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "Amuesa'l progresu d'una gueta."
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "Amuesa'l progresu d'una gueta.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Entamar descargando un ficheru"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6971,82 +8481,82 @@
 "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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Posar descarga."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Resumir descarga."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Encaboxar descarga."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Asignar prioridá de descarga."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Afitar la prioridá a baxa."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Afitar la prioridá a normal."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Afitar la prioridá a alta."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Afitar la prioridá a auto."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Amosar coles/llistes."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 #, 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Amosar cola de xuba"
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Amosar cola de descarga."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Amosar rexistru."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Amosar llista de sirvidores."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Recargar llista de ficheros compartíos."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Llimpiar rexistru."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Comandu en desusu, usa %s."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7055,256 +8565,279 @@
 "Esti ye un comandu en desusu, y desaniciaráse nel futuru.\n"
 "Usa '%s' en so llugar.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Veceru de testu aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Desaniciando ficheru: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Desaniciando ficheru: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Resumiendo xubíes del ficheru: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Requierse Confirmación"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "Abondes conexones"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Ensin catalogar"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Seleicionar fieltru de vistes"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Amestar categoría"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Editar categoría"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Desaniciar categoría"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Hashset solicitáu de ficheru desconocíu: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Seleiciona quién pue solicitar adicar la nuesa llista de ficheros compartíos."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Resumiendo xubíes del ficheru: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Suspendiendo xuba del ficheru: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Fallu al executar el comandu '%s' nel eventu `%s'."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Fallu al executar el comandu '%s' nel eventu '%s'."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Descarga fecha ensembre"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "El camín completu al ficheru."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "El nome del ficheru ensin el camín."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "El hash eD2k del ficheru."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "El tamañu del ficheru en bytes."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Tiempu d'actividá de descarga acumuláu."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Aniciada Nueva sesión de charra"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Remitente del mensax."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Ensin espaciu"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Partición de discu"
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Fallu completando"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Procesando númberu de ficheru %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s --->¡ Nun esiste'l ficheru !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, el criador d'enllaces eD2k p'aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "¡Bienllegáu!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Parámetros d'entrada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Ficheru a codificar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Amestar URLs opcionales pa esti ficheru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:144
-msgid "Remove"
-msgstr "Desaniciar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Criar enllaz con hashes de partes"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Hash de ficheru MD4"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "Hash de ficheru eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "Enllaz eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Guardar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Copiar al cartafueyos"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Abrir"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Copiar l'enllaz eD2k calculáu al cartafueyos"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Guardar como"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Guardar l'enllaz eD2k calculáu nun ficheru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Tocante a aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Nun pue abrise'l cartafueyos"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "¡Res pa copiar agora!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Seleiciona'l ficheru pal enllaz eD2k calculáu"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Imposible abrir"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Por favor, introduz un nome de ficheru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "¡Nun hai res agora pa guardar!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7324,162 +8857,159 @@
 "\n"
 "Distribuyíu baxo la llicencia GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Calculando hash..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator trabayando pa ti"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Calculando MD4 Hash..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Calculando eD2k Hashes..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "¡ Encaboxáu !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Fináu en %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "¡ Yá amestaste esa URL !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Por favor, introduz una URL"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Nun ye dable abrir %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, Estadístiques aMule en llinia"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Reafitar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistema"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Parar auto recargar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Salvar imaxe d'estadístiques en llinia"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Imprentar imaxe d'estadístiques en llinia"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Opciones"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Tocante a wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Aniciar Auto Recargar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Auto recargar, deteníu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Auto recargar, aniciáu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Salvar imaxe d'estadístiques"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Estadístiques aMule en llinia"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7487,11 +9017,11 @@
 "Hebo un fallu imprentando.\n"
 "Seique la to imprentadora actual nun tea configurada"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Imprentando"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7509,402 +9039,557 @@
 "\n"
 "Distributed under GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Eeepa, aMule nun ta executándose..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule yá ta executándose"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule ta executándose, pero ta desconeutáu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule ta coneutando..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh Oh, l'estáu d'aMule ye desconocíu..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " foi executáu durante "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " ¡ ta deteníu !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " ¡ nun ta coneutáu !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " ta coneutando..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " ta faciendo daqué raro, ¡ compruébalo !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " ta coneutáu a "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "apagáu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " coneutáu "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " con "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Total Descargáu: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Xubío:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Descarga de sesión"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Descargáu:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Xuba: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Compartiendo:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " ficheru(os), Veceros na cola: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Tiempu:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " en "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Media de carga del sistema (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Tiempu d'execución del sistema: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Direutoriu que contién el ficheru amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Intervalu de refrescu en segundos"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically 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:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "Url FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Direutoriu FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Introduz la URL del to sirvidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Usuariu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Intervalu d'actualización de FTP en minutos"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Validáu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Direutoriu que contién el to ficheru de robla"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Direutoriu au se xenera la imaxe d'estadístiques"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Carga la plantía <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Puertu HTTP del sirvidor web"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Usar forwarding de puertos UPnP nel puertu del sirvidor web"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Puertu UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Usar compresión gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Contraseña d'accesu total pal sirvidor web"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Contraseña d'invitáu pa sirvidor web"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Permitir accesu a invitáu"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Denegar accesu a invitáu"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 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:291
+#: src/webserver/src/WebInterface.cpp
 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:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Deshabilitar intérprete PHP (desusu)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Recompila páxines PHP pa otra solicitú"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Sirvidor Web aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "conexón aceutada del veceru web\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 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:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Solicitú fallía col siguiente fallu: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Ficheru índiz non alcontráu: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sesión finada - solicitando conexón\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sesión ok, coneutáu\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sesión ok, non coneutáu\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Nun hai denguna sesión - coneute de nuevu\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sesión criada - solicitando conexón\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Procesando solicitú orixinal: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Nun s'especificó dengún password, nun se permite l'accesu."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Comprobando contraseña\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Hash de la contraseña incorreutu\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Contraseña ok\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Contraseña incorreuta\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Desconexón solicitada\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Procesando solicitú redirixía: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Conexón fallida"
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Xubío"
+#~ msgid "Ratio"
+#~ msgstr "Valoración"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Ensin ficheros que compartir en direutoriu: %s"
+
+#, fuzzy
+#~ msgid "Change Language"
+#~ msgstr "Llingua: "
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "Non disponible"
+
+#~ msgid "User name"
+#~ msgstr "Nome usuariu:"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Partes obteníes"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "Disponibles :"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Alcontróse %i ficheru compartíu, %i desconocíu"
+#~ msgstr1 "Alcontráronse %i ficheros compartíos, %i desconocíos"
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Sirvidor remotu"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Sirvidor llocal"
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Guardando ficheru part %u de %u"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Pa prevenir l'apaición d'esta alvertencia en cada vista previa,\n"
+#~ "afita'l to reproductor de vídeos nes preferencies (%s por defeutu)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Fieltrar Resultaos"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Conseñar como ficheru conocíu"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Coneutar"
+
+#~ msgid "New node"
+#~ msgstr "Nuevu nodu"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Más"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Coneutar dende \n"
+#~ "veceros conocíos"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Coneutar a cualesquier sirvidor y/o Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Desconeutar Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Detener los intentos de conexón actuales"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Desconeutase de les redes coneutaes"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Coneutase a les redes disponibles"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Auto-ordenar ficheros (Alta CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule ordenará automáticamente les columnes na to llista de descargues"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Refugar paquetes si la ip del veceru ye diferente de la ip dende au el paquete ye recibíu. Usar con curiáu."
+
+#, fuzzy
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Devuelve los resultaos de la gueta anterior.\n"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Ficheru non alcontráu"
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Amuesa'l progresu d'una gueta.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Zarróse la conexón - ye dable que aMule finare."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Comprobar nueva versión al entamu"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Enllaz eD2k:"
+
+#~ msgid "Commit"
+#~ msgstr "Unviar"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: derivando al fondu - vémonos"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Web: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Foru: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Web: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Foru: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Xubío"

amule-3.0.1.tar.gz/po/bg.po -> amule-3.1.0.tar.gz/po/bg.po Changed

@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:13+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:18+0000\n"
 "Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
 "Language: bg\n"
@@ -22,69 +22,148 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr ""
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "форум:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Добавяне на приятел"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Трябва да въведете валиден адрес и порт"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr ""
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -93,137 +172,266 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Грешка при запис на файла с кредити"
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Връзката установена на: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
 msgstr0 ""
 msgstr1 ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:179
-#, fuzzy
-msgid "Failed to open ED2KLinks file."
-msgstr "Грешка при запис на файла с кредити"
-
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Грешка"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr ""
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr ""
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Потвърждение за изход"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i сървъра бяха намерени в server.met"
+msgid "Loading temp files"
+msgstr "Искане на споделени файлове от '%s'"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Искане на споделени файлове от '%s'"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Известни са %i споделени файлове"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Известни са %i споделени файлове"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Старт"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
 msgstr ""
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
+#: src/amule.cpp src/FirstRunWizard.cpp
+#, fuzzy
+msgid "eD2k server list (server.met)"
+msgstr "%i сървъра бяха намерени в server.met"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
 msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr ""
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -233,1641 +441,1942 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr ""
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr ""
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr ""
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr ""
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr ""
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr ""
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr ""
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr ""
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr ""
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr ""
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr ""
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr ""
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
 msgstr ""
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
 msgstr ""
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
 msgstr ""
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "форум: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr ""
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "\tЗа повече информация, моля обърнете се към https://amule-org.github.io/docs"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Клиенти"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "форум: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Съобщения"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Статистика"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Настройки"
+
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+msgid "New version available"
 msgstr ""
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
 msgstr ""
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Свързва"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Connected"
 msgstr "Връзкате е установена"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Connecting"
 msgstr "Свързва"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr ""
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Отказ"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "Спира текущите опити за свързване"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "версия"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Разкачи"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "Изключване от текущия сървър"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Връзка"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "адрес"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Описание"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
 msgstr ""
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Кач.: %.1f(%.1f) | Свал.: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " кБ/с"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Кач.: %.1f | Свал.: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Наистина ли желаете да изключите aМуле?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Потвърждение за изход"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- по подразбиране -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr ""
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr ""
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr ""
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "Изтегляне"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Съобщения"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Клиенти"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Статистика"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Настройки"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr ""
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Няма мрежа"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr ""
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Фатална грешка: не можах да създам брояч"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Връзката е прекъсната"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Фатална грешка: не можах да създам брояч"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Connecting..."
 msgstr "Свързва"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "изваден от строя"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "всички"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Не са открити части от файлове"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Вие вече опитвате да свалите файла %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
-msgid "Unknown"
-msgstr "Неизвестен"
-
-#: src/BaseClient.cpp:1363
+#: src/amule-remote-gui.cpp
 #, c-format
-msgid "Failed to retrieve shared files from user '%s'"
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
 msgstr ""
 
-#: src/BaseClient.cpp:1575
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
+msgid "Unknown"
+msgstr "Неизвестен"
+
+#: src/BaseClient.cpp
 #, fuzzy
 msgid "Searching buddy for lowid connection"
 msgstr "изчакване за свързване..."
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Fake съревновавам)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "Requested: %s\n"
 msgstr "Поискан:"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
 msgstr1 "Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
 msgstr1 "Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Заявен е несъществуващ файл"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr ""
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr ""
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr ""
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr ""
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Категория"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr ""
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Изберете папка за входящи файлове"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Чат"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr ""
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr ""
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Показване на &детайли"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Създаване на приятелска връзка"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Преглед на файловете"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, fuzzy, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Файлът с кредити зареден, %u клиента са разпознати"
 msgstr1 "Файлът с кредити зареден, %u клиента са разпознати"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Клиентските Детайли"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "изваден от строя"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Връзкате е установена"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Връзката е разпадната"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Име"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+#, fuzzy
+msgid "IP Address"
+msgstr "адрес"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
 msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "версия"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Време на качване"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "Изтегляне"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Време на качване"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Изтегляне"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr ""
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr ""
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr ""
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "Няма"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Файлове"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Изтегляне"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Качване"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Активен"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Неизвестен"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Коментари за файла"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Потребителско име"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Име на файл"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Оценка"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "коментар"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "изчакване за свързване..."
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Няма коментари"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, fuzzy, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "Няма коментари"
 msgstr1 "Няма коментари"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Грешка при зареждане на файла с кредити"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Автоматичен Lo"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Автоматичен No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Автоматичен Hi"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr ""
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Ниско"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Нормален"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Високо"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr ""
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr ""
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Запитване"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Свързване чрез сървър"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Опашката е пълна"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "На опашката"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Изтегляне"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Получаване на hash сумите"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr ""
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Не може LowID да се свърже към LowID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Твърде много връзки"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr ""
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr ""
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr ""
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr ""
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr ""
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr ""
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr ""
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr ""
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr ""
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr ""
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Завършен"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr ""
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr ""
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr ""
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Размер"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Пренесен"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Скорост"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Прогрес"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Източници"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Приоритет"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Статус"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:411
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
-
-#: 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:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Автоматично"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Отказ"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Стоп"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Пауза"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "В&ъзобновява"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Преглед"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Поискан му е друг файл"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
-msgid "Enter new name for this file:"
-msgstr ""
+#: src/DownloadListCtrl.cpp
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
-msgid "File rename"
-msgstr ""
+#: src/DownloadListCtrl.cpp
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Enter new name for this file:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Файлове за сваляне (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "File rename"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr ""
+msgid "Downloads (%i)"
+msgstr "Файлове за сваляне (%i)"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Общ размер на споределните файлове : %s"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading temp files from %s."
 msgstr "Искане на споделени файлове от '%s'"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Не са открити части от файлове"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Открити са %i части от файлове"
 msgstr1 "Открити са %i части от файлове"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Сваляне %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr ""
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Вие вече опитвате да свалите файла %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr ""
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr ""
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr ""
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr ""
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "На всеки %d секунди ще бъде правен автоматичен опит за свързване"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr ""
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr ""
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
+#: src/ExternalConn.cpp
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ExternalConn.cpp:1536
-msgid "WebSearch from remote interface makes no sense."
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
 msgstr ""
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr ""
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr ""
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr ""
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr ""
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr ""
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Премахване на категория"
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Неизвестно име)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr ""
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1875,11 +2384,11 @@
 "\n"
 "Налични разширения:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1887,23 +2396,23 @@
 "Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr ""
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr ""
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1911,59 +2420,59 @@
 "\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr ""
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr ""
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr ""
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr ""
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1972,2226 +2481,2910 @@
 "Exiting...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr ""
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr ""
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr ""
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr ""
+
+#: src/FileLaunch.cpp
 #, c-format
-msgid "%.2f kB/s"
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "Фатална грешка: не можах да създам брояч"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Добре дошли!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
 msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Свързва"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Връзка"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Вие вече опитвате да свалите файла %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Избери"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Приятели"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Показване на &детайли"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Добавяне на приятел"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Изтриване на приятел"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Изпращане на &съобщение"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Преглед на файловете"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Създаване на приятелска връзка"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 #, fuzzy
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "На опашката"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Поискан му е друг файл"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "Файлове за качване: %i"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "На опашката"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "Качване"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "никой"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Не"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Да"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr ""
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Изтеглям..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Вие вече опитвате да свалите файла %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Свален:"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Файлове за сваляне (%i)"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr ""
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Изтегляне"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr ""
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Грешка при зареждане на файла с кредити"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Текущ"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
 msgstr ""
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr ""
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr ""
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr ""
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr ""
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Размер на файла"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "признат"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "албанец"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "арабски"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Астурия"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "баска"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "български"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Каталунски"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Китайски (опростен)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Китайски (традиционен)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "хърватски"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "чешки"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "датски"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "холандски"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "естонски"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "фински"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Френски"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "галисийски"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Немски"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Гръцки"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "иврит"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "унгарски"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Италиански"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "японски"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "корейски"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "литовски"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "норвежки (Съвременен)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "полски"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "португалски"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "португалски (бразилски)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "румънски"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Руски"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "словенски"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Spanish"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "шведски"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Турски"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "украински"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "неизвестна грешка %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Завършено"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Пауза"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
-msgid "Connection failure"
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Connection failure"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection lost - exiting."
+msgstr "Връзката е прекъсната"
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr ""
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr ""
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Затвори"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "копие"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Изчисти"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "неограничен"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Връзкате е установена"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Връзкате е установена"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "Сървър"
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "Сървър"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Разкачи"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Връзка"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Изход"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "кБ/с"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "неограничен"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Изтегляне"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Време на качване"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
+#: src/muuli_wdr.cpp
+msgid "Add links"
 msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr ""
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Зареждам..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr ""
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr ""
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr ""
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr ""
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Търсене"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Име:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Тип"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr ""
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr ""
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Всеки"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Архиви"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CD-изображения"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Картинки"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Програми"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Клипове"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Разширение"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Минимален размер"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Байта"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Максимален размер"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr ""
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Filter"
+msgstr "Филтрирани: %i"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr ""
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Преглед на файловете"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Старт"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Разширение"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr ""
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Изтегляне"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr ""
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr ""
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "Намерени източници: %i"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Общи"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Full Name"
+msgstr "Име на файл"
 
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "Няма"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "met-File"
+msgstr "Файлове"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
+#: src/muuli_wdr.cpp
+msgid "Hash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Filesize"
+msgstr "Размер на файла"
 
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr ""
+#: src/muuli_wdr.cpp src/Statistics.cpp
+msgid "Transfer"
+msgstr "Трансфер"
 
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Partfilestatus"
+msgstr "Статус"
 
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Last seen complete"
+msgstr "Незавършен"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Found Sources"
+msgstr "Източници"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Transferring Sources"
+msgstr "Пренесен"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
 msgstr ""
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
-msgid "Transfer"
-msgstr "Трансфер"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Available"
+msgstr "Наличен"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Datarate"
+msgstr "Няма оценки"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Download Active Time"
+msgstr "Изтегляне"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Completed Size"
+msgstr "Завършен"
+
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
 msgstr ""
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
 msgstr ""
 
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
 msgstr ""
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
+#: src/muuli_wdr.cpp
+msgid "Sharing"
 msgstr ""
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Заявки"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Приети заявки"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Пренесени данни"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Споделени файлове (%i)"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
 msgstr ""
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
+#: src/muuli_wdr.cpp
+msgid "Media Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Няма оценки"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
 msgstr ""
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
 msgstr ""
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
 msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Заглавие"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr ""
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr ""
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Изчистване"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Потвърди"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr ""
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Няма оценки"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Грешен / Развален / Фалшив"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Лош"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Средно добър"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Добър"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Отличен"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Опресняване"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr ""
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr ""
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Порт"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr ""
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Userhash"
+msgstr "Потребители"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Текущ"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr ""
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr ""
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Име на потребител:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Client software"
+msgstr "Клиенти"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Client version"
+msgstr "Клиенти"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "User ID"
+msgstr "Потребители"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Server IP"
+msgstr "Сървър"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Server name"
+msgstr "Име на сървър"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
 msgstr ""
+"\n"
+"Налични разширения:\n"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Current request"
+msgstr "Текущ"
 
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Average upload rate"
+msgstr "Средно време за качване: %s"
 
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Average download rate"
+msgstr "Средно време за качване: %s"
 
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Downloaded (session)"
+msgstr "Файлове за сваляне (%i)"
 
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Uploaded (total)"
+msgstr "Качване"
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Downloaded (total)"
+msgstr "Файлове за сваляне (%i)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Точки"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "Опашката е пълна"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Queue score"
+msgstr "Опашката е пълна"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "език: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "секунди"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Избери"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Видео плеър"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Качване"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
-msgid "Max sources per downloading file:"
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
-msgid "Max simultaneous connections:"
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
+#: src/muuli_wdr.cpp
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1444
-msgid "retries"
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
+#: src/muuli_wdr.cpp
+msgid "retries"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Списък"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Премахване"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Изтриване на приятел"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Диаграми"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Цветове: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Фон"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Мрежа"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Избор"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! ВНИМАНИЕ !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "парола"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "парола"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "парола"
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "парола"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Заглавие :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Коментар:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Нулира"
-
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Всеки"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Източници"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4199,11 +5392,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4213,845 +5406,756 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Изтегляне"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
+#: src/muuli_wdr.cpp
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
+#: src/muuli_wdr.cpp
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2696
-msgid "Enable Proxy"
+#: src/muuli_wdr.cpp
+msgid "The proxy host name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2697
-msgid "Enable/disable proxy support"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
+#: src/muuli_wdr.cpp
+msgid "The proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2714
-msgid "The proxy host name"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2719
-msgid "The proxy port"
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
+#: src/muuli_wdr.cpp
+msgid "Remember those settings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2763
-msgid "Remember those settings"
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Изчакване"
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "Активни качвания: %i"
 
-#: src/muuli_wdr.cpp:2963
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Percent of total files"
-msgstr "Общо файлове"
+msgid "Show Clients for"
+msgstr "Клиенти"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Всички файлове"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "Избор на филтър"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "Активни качвания: %i"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "Клиенти"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "Качване"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Изпраща"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Отказ"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Разкачи"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Връзка"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "Байта"
 msgstr1 "байта"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 #, fuzzy
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "Байта"
 msgstr1 "Байта"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "сек."
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "мин."
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "часа"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "дни"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "Всички"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "всички останали"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Незавършен"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Спрян"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Видео"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Архив"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Текст"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Активен"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr ""
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr ""
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "Фатална грешка: не можах да създам брояч"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Грешка:файлът known.met е повреден,зареждането на списъка пропадна"
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr ""
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr ""
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Сваляне %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
 msgstr ""
 
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "албанец"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "арабски"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Астурия"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "баска"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "български"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Каталунски"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Китайски (опростен)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Китайски (традиционен)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "хърватски"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "чешки"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "датски"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "холандски"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
+#: src/PeerCapabilities.h
+msgid "IPv6"
 msgstr ""
 
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "естонски"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "фински"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Френски"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "галисийски"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Немски"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Гръцки"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "иврит"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "унгарски"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Италиански"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Италиански (швейцарски)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "японски"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "корейски"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "литовски"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "норвежки (Съвременен)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "полски"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "португалски"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "португалски (бразилски)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "румънски"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Руски"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "словенски"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spanish"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "шведски"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Турски"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "украински"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Смени езика"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "No languages available"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
 msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Връзка"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Директории"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Сървъри"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Файлове"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Дистанционни управления"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "напреднал"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5061,153 +6165,259 @@
 "these settings."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "парола"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Език променило.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Език променило.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
 "If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Автоматично"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Вие вече опитвате да свалите файла %s"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Известни са %i споделени файлове"
+msgstr1 "Известни са %i споделени файлове"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Търсене на видео плеър"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5215,1209 +6425,1463 @@
 "Тук добавете линкове за сваляне на .met файлове.\n"
 "Само по един URL на ред."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "disabled"
 msgstr "деактивиране"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Известни са %i споделени файлове"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Споделени файлове (%i)"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
 msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Търсене"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Търсене"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Main"
 msgstr ""
 
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
-msgid "Main"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
 msgstr ""
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
 msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Няма оценки"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Поискан му е друг файл"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:718
-msgid "Search related files (eD2k, local server)"
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
+#: src/SearchListCtrl.cpp
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "Отказ"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "фински"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Грешка при свързване към всички сървъри в списъка - започвам отначало."
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
 msgstr "Грешка при свързване към всички сървъри в списъка - започвам отначало."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
+msgstr "Грешка при свързване към всички сървъри в списъка - започвам отначало."
+
+#: src/ServerConnect.cpp
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "На всеки %d секунди ще бъде правен автоматичен опит за свързване"
+msgstr1 "На всеки %d секунди ще бъде правен автоматичен опит за свързване"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Свързан към %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Връзката установена на: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Фатална грешка при опит за свързване,вероятно не сте се включили към интернет"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Връзката към %s (%s:%i) бе прекъсната"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) изглежда не отговаря"
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 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"
-msgstr0 "На всеки %d секунди ще бъде правен автоматичен опит за свързване"
-msgstr1 "На всеки %d секунди ще бъде правен автоматичен опит за свързване"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Връзката е прекъсната"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr ""
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i сървъра бяха намерени в server.met"
 msgstr1 "%i сървъра бяха намерени в server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d сървъра бяха добавени"
 msgstr1 "%d сървъра бяха добавени"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 #, fuzzy
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Грешка: файлът server.met е повреден"
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr ""
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr ""
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr ""
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr ""
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr ""
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr ""
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Грешка при записа на server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr ""
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Грешен URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "Име на сървър"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "адрес"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Порт"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Описание"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Потребители"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Потребители"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Статичен"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "версия"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Файлове"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Споделени файлове (%i)"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Неизвестно име)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "мин."
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Сървъри (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Сървър"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Премахване на сървър"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Remove servers"
 msgstr "Премахване на сървър"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Изтриване на всички сървъри"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Новият номер на клиента е %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\tНай-вероятно това е така, защото вие сте зад защитна стена или маршрутизатор."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tЗа повече информация, моля обърнете се към https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, fuzzy, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Получени са %d нови сървъра"
 msgstr1 "Получени са %d нови сървъра"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Сървърът отхвърли последната команда"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Връзка"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Връзкате е установена"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr ""
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "UDP Connection State:"
 msgstr "Максимален брой връзки (изчисляване)"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr ""
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connecting to buddy"
 msgstr "Свързва"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, fuzzy, c-format
 msgid "Connected to buddy at %s"
 msgstr "Свързан към %s (%s:%i)"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr ""
+
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed sources:"
 msgstr "Намерени източници: %i"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr ""
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr ""
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr ""
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr ""
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Известни са %i споделени файлове"
 msgstr1 "Известни са %i споделени файлове"
 
-#: src/SharedFileList.cpp:410
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Известни са %i споделени файлове"
-msgstr1 "Известни са %i споделени файлове"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
+msgid "Shared directory not readable, skipping: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "Потребителско име"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "Изтегляне"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "Време на качване"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Споделени файлове (%i)"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Известни са %i споделени файлове"
+msgstr1 "Известни са %i споделени файлове"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "Наличен"
+msgid "User Name"
+msgstr "Потребителско име"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "Лимит за качване"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Download Status"
 msgstr "Изтегляне"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "Име на файл"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "Споделени файлове (%i)"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Заявки"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Приети заявки"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Пренесени данни"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr ""
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
+#: src/SharedFilesCtrl.cpp
+msgid "Directory Path"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:114
-msgid "Directory Path"
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "преименувам"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Копиране на ED2k линк в системния буфер (име на хост)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Трябва да имате HighID, за да създадете валиден сорс линк"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Общ размер на споределните файлове : %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Общ размер на споределните файлове : %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Споделени файлове (%i)"
+msgstr1 "Споделени файлове (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Споделени файлове (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr ""
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Известни са %i споделени файлове"
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Статус"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "Име на файл"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Средно време за качване: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr ""
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Повторни свързвания: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Изтекло време от пърия трансфер: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Свързан към сървъра от : %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Клиенти"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "Неизвестно: %i"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "Филтрирани: %i"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr ""
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr ""
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Общ размер на споределните файлове : %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Операционна система"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Активни връзки (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr ""
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "никога"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr ""
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr ""
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr ""
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr ""
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6425,7 +7889,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6433,103 +7897,107 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Файлове за сваляне (%i)"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr ""
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr ""
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
 msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr ""
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr ""
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr ""
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Download:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Upload:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6538,38 +8006,33 @@
 "\n"
 "Общо източници:\t%d\n"
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/TextClient.cpp
+msgid "PartFile"
 msgstr ""
 
-#: src/TextClient.cpp:965
+#: src/TextClient.cpp
 #, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr ""
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr ""
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6578,46 +8041,46 @@
 "Example: 'statistics 5' will show only the top 5 versions for each client type.\n"
 msgstr ""
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr ""
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr ""
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6625,35 +8088,35 @@
 "or a resolvable DNS name."
 msgstr ""
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr ""
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6664,109 +8127,121 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr ""
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6785,375 +8260,402 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr ""
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr ""
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr ""
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+msgid "Show the results of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr ""
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr ""
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr ""
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr ""
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr ""
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr ""
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr ""
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr ""
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr ""
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr ""
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr ""
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr ""
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr ""
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr ""
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Споделени файлове (%i)"
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr ""
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
 "Use '%s' instead.\n"
 msgstr ""
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr ""
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Файлове за сваляне (%i)"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "Сигурни ли сте,че желаете да откажете и изтриете всички файлове в тази категория?"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Изисква потвърждение"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "Твърде много връзки"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr ""
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Избор на филтър"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Добавяне на категория"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Промяна на категория"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Премахване на категория"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr ""
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr ""
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr ""
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr ""
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr ""
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr ""
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr ""
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr ""
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Добре дошли!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Премахване"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7165,173 +8667,170 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 #, fuzzy
 msgid "Cancelled !"
 msgstr "Отказ"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
+msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
+msgid "%.2f MiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
+msgid "%.2f GiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
+msgid "%.2f TiB"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Нулира"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7342,396 +8841,436 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr ""
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Не са открити части от файлове"
+#~ msgid "Ratio"
+#~ msgstr "Оценка"
+
+#~ msgid "Change Language"
+#~ msgstr "Смени езика"
+
+#, fuzzy, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Известни са %i споделени файлове"
+#~ msgstr1 "Известни са %i споделени файлове"
+
+#~ msgid " kB/s"
+#~ msgstr " кБ/с"
+
+#~ msgid "kB/s"
+#~ msgstr "кБ/с"
+
+#, fuzzy
+#~ msgid "Percent of total files"
+#~ msgstr "Общо файлове"
+
+#, fuzzy
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Спира текущите опити за свързване"
+
+#, fuzzy
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Изключване от текущия сървър"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "форум: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "\tЗа повече информация, моля обърнете се към https://amule-org.github.io/docs"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "форум: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"

amule-3.0.1.tar.gz/po/bn.po -> amule-3.1.0.tar.gz/po/bn.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aMule GIT\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: none\n"
@@ -17,69 +17,148 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr ""
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr ""
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr ""
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr ""
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -88,134 +167,260 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+msgid "Failed to open ED2KLinks file."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
 msgstr ""
 
-#: src/amuleAppCommon.cpp:179
-msgid "Failed to open ED2KLinks file."
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr ""
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr ""
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr ""
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr ""
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
 msgstr ""
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
 msgstr ""
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
 msgstr ""
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr ""
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
 msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr ""
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -225,1638 +430,1928 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr ""
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr ""
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr ""
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr ""
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr ""
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr ""
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr ""
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr ""
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr ""
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr ""
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr ""
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr ""
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
 msgstr ""
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
 msgstr ""
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
 msgstr ""
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
 msgstr ""
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
 msgstr ""
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
 msgstr ""
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
 msgstr ""
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#: src/amuleDlg.cpp
+msgid "New version available"
 msgstr ""
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
 msgstr ""
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr ""
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr ""
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
+#: src/amuleDlg.cpp
+msgid "Core"
 msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
 msgstr ""
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
 msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
 msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Encryption"
 msgstr ""
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
 msgstr ""
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr ""
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr ""
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr ""
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr ""
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr ""
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr ""
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr ""
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr ""
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr ""
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr ""
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr ""
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr ""
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, c-format
-msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgid "Could not delete the category: %s"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
-msgid "Unknown"
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/BaseClient.cpp:1363
+#: src/amule-remote-gui.cpp
 #, c-format
-msgid "Failed to retrieve shared files from user '%s'"
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
+msgid "Unknown"
 msgstr ""
 
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr ""
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr ""
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr ""
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr ""
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr ""
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr ""
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr ""
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr ""
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr ""
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr ""
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr ""
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr ""
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
+msgid "%.1f KiB/s"
 msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr ""
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr ""
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr ""
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr ""
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 ""
 msgstr1 ""
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr ""
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr ""
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr ""
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr ""
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr ""
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr ""
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr ""
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr ""
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr ""
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr ""
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr ""
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr ""
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr ""
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr ""
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr ""
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr ""
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr ""
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr ""
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr ""
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr ""
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr ""
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr ""
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr ""
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr ""
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr ""
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr ""
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr ""
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr ""
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr ""
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr ""
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr ""
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr ""
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Auto"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
-msgid "Auto"
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
-msgid "Enter new name for this file:"
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
-msgid "File rename"
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
-#, c-format
-msgid "Downloads (%i)"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Enter new name for this file:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "File rename"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
+#: src/DownloadListCtrl.cpp
+#, c-format
+msgid "Downloads (%i)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgid "Total queue size: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr ""
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr ""
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "You already have the file '%s'"
+msgid "You already have the file '%s' (requested as '%s')"
 msgstr ""
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "You are already trying to download the file %s"
+msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1418
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+msgid "You are already trying to download the file %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr ""
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr ""
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr ""
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr ""
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr ""
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr ""
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
+#: src/ExternalConn.cpp
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ExternalConn.cpp:1536
-msgid "WebSearch from remote interface makes no sense."
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr ""
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr ""
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr ""
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr ""
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr ""
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr ""
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1864,23 +2359,23 @@
 "Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr ""
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr ""
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1888,59 +2383,59 @@
 "\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr ""
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr ""
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr ""
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr ""
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1949,2215 +2444,2857 @@
 "Exiting...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr ""
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr ""
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr ""
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
 #, c-format
-msgid "%.2f kB/s"
+msgid "%.2f KiB/s"
 msgstr ""
 
-#: src/FriendList.cpp:123
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/FileLaunch.cpp
+msgid "File preview"
 msgstr ""
 
-#: src/FriendList.cpp:149
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
 msgstr ""
 
-#: src/FriendList.cpp:266
-msgid "CRITICAL - no client on StartChatSession"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
-msgid "Friends"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:141
-msgid "Add a friend"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:144
-msgid "Remove Friend"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:145
-msgid "Send &Message"
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:180
-msgid "Are you sure that you wish to delete the selected friend?"
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:182
-msgid "Are you sure that you wish to delete the selected friends?"
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:574
+#: src/FirstRunWizard.cpp
 msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "CRITICAL - no client on StartChatSession"
+msgstr ""
+
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
+msgid "Friends"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Add a friend"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Remove Friend"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Send &Message"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr ""
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr ""
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr ""
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr ""
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr ""
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr ""
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr ""
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr ""
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr ""
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr ""
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
 msgstr ""
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr ""
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr ""
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr ""
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr ""
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr ""
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr ""
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr ""
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr ""
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr ""
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr ""
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr ""
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
+#: src/muuli_wdr.cpp
+msgid "Add links"
 msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr ""
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr ""
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr ""
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr ""
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr ""
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr ""
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr ""
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr ""
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr ""
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr ""
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
 msgstr ""
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr ""
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr ""
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr ""
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr ""
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
+#: src/muuli_wdr.cpp
+msgid "Filter"
 msgstr ""
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr ""
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr ""
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
+#: src/muuli_wdr.cpp
+msgid "Extend"
 msgstr ""
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr ""
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr ""
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr ""
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr ""
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr ""
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
+#: src/muuli_wdr.cpp
+msgid "met-File"
 msgstr ""
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
+#: src/muuli_wdr.cpp
+msgid "Hash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
 msgstr ""
 
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
+#: src/muuli_wdr.cpp src/Statistics.cpp
+msgid "Transfer"
 msgstr ""
 
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
 msgstr ""
 
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
 msgstr ""
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
-msgid "Transfer"
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
 msgstr ""
 
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
+#: src/muuli_wdr.cpp
+msgid "Available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
+#: src/muuli_wdr.cpp
+msgid "Datarate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
 msgstr ""
 
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
 msgstr ""
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
 msgstr ""
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
 msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr ""
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr ""
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr ""
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr ""
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr ""
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr ""
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr ""
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr ""
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr ""
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr ""
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr ""
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr ""
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr ""
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr ""
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr ""
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr ""
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr ""
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
+#: src/muuli_wdr.cpp
+msgid "Client version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
+#: src/muuli_wdr.cpp
+msgid "User ID"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
+#: src/muuli_wdr.cpp
+msgid "Server IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
+#: src/muuli_wdr.cpp
+msgid "Current request"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
-msgid "Max sources per downloading file:"
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
-msgid "Max simultaneous connections:"
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
+#: src/muuli_wdr.cpp
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1444
-msgid "retries"
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
+#: src/muuli_wdr.cpp
+msgid "retries"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
-msgid "OK"
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1966
-msgid "Click here to apply any changes made to the preferences."
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1969
-msgid "Reset any changes made to the preferences."
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
+msgid "OK"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
+#: src/muuli_wdr.cpp
+msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
+#: src/muuli_wdr.cpp
+msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 msgid "Source:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4165,11 +5302,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4179,836 +5316,748 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
+#: src/muuli_wdr.cpp
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2696
-msgid "Enable Proxy"
+#: src/muuli_wdr.cpp
+msgid "The proxy host name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2697
-msgid "Enable/disable proxy support"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
+#: src/muuli_wdr.cpp
+msgid "The proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2714
-msgid "The proxy host name"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2719
-msgid "The proxy port"
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
+#: src/muuli_wdr.cpp
+msgid "Remember those settings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2763
-msgid "Remember those settings"
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
 msgstr ""
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr ""
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr ""
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr ""
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr ""
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 ""
 msgstr1 ""
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr ""
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr ""
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr ""
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr ""
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr ""
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr ""
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr ""
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr ""
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr ""
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr ""
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
 msgstr ""
 
-#: src/OtherFunctions.cpp:1212
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
 #, c-format
-msgid "Using config dir: %s"
+msgid "%u or more other sources have this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr ""
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr ""
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr ""
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr ""
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr ""
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr ""
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr ""
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
 msgstr ""
 
-#: src/Preferences.cpp:639
-msgid "Arabic"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:640
-msgid "Asturian"
+#: src/PeerCapabilities.h
+msgid "IPv6"
 msgstr ""
 
-#: src/Preferences.cpp:641
-msgid "Basque"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
 msgstr ""
 
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr ""
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr ""
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr ""
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr ""
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr ""
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr ""
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr ""
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr ""
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr ""
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr ""
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr ""
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr ""
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr ""
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr ""
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr ""
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr ""
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr ""
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr ""
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr ""
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr ""
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr ""
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr ""
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr ""
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr ""
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr ""
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr ""
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr ""
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr ""
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr ""
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr ""
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr ""
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr ""
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr ""
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr ""
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
+#: src/Preferences.cpp
+msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:982
-msgid "no options available"
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5018,1337 +6067,1686 @@
 "these settings."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
 "If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
 msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr ""
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr ""
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+#: src/SearchDlg.cpp
+msgid "Search in progress"
 msgstr ""
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Main"
 msgstr ""
 
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
-msgid "Main"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
 msgstr ""
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
 msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-msgid "Bitrate"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:718
-msgid "Search related files (eD2k, local server)"
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
+#: src/SearchListCtrl.cpp
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr ""
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
 msgstr ""
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr ""
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr ""
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr ""
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr ""
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 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"
-msgstr0 ""
-msgstr1 ""
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr ""
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr ""
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr ""
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr ""
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr ""
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr ""
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr ""
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr ""
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr ""
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr ""
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr ""
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr ""
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr ""
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr ""
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr ""
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr ""
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr ""
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr ""
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr ""
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr ""
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr ""
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr ""
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr ""
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 ""
 msgstr1 ""
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
 msgstr0 ""
 msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
+msgid "Shared directory not readable, skipping: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
-msgid "Upload Status"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
-msgid "Download Status"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
-msgid "Local File Name"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
-msgid "Shares File List"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Status"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Download Status"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Local File Name"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Shares File List"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
+#: src/SharedFilesCtrl.cpp
+msgid "Directory Path"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:114
-msgid "Directory Path"
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr ""
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
 msgstr ""
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr ""
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr ""
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr ""
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr ""
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr ""
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr ""
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr ""
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr ""
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr ""
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr ""
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr ""
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr ""
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr ""
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr ""
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr ""
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr ""
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr ""
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr ""
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr ""
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr ""
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6356,7 +7754,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6364,141 +7762,140 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr ""
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr ""
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr ""
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr ""
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr ""
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr ""
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Download:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Upload:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Total sources:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/TextClient.cpp
+msgid "PartFile"
 msgstr ""
 
-#: src/TextClient.cpp:965
+#: src/TextClient.cpp
 #, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr ""
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr ""
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6507,46 +7904,46 @@
 "Example: 'statistics 5' will show only the top 5 versions for each client type.\n"
 msgstr ""
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr ""
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr ""
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6554,35 +7951,35 @@
 "or a resolvable DNS name."
 msgstr ""
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr ""
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6593,109 +7990,121 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr ""
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6714,373 +8123,400 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr ""
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr ""
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr ""
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+msgid "Show the results of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr ""
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr ""
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr ""
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr ""
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr ""
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr ""
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr ""
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr ""
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr ""
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr ""
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr ""
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr ""
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr ""
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr ""
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr ""
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
 "Use '%s' instead.\n"
 msgstr ""
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr ""
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr ""
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr ""
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr ""
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr ""
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr ""
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr ""
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr ""
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr ""
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr ""
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr ""
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr ""
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr ""
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr ""
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr ""
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7092,172 +8528,169 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
+msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
+msgid "%.2f MiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
+msgid "%.2f GiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
+msgid "%.2f TiB"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7268,392 +8701,389 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr ""
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""

amule-3.0.1.tar.gz/po/ca.po -> amule-3.1.0.tar.gz/po/ca.po Changed

@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:06+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:19+0000\n"
 "Last-Translator: minterior <minterior@gmail.com>\n"
 "Language-Team: Català\n"
 "Language: ca\n"
@@ -25,71 +25,155 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 3.7\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "Quant a l'aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Control remot de l'aMule "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Versió:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr "Client P2P 'Multiplataforma' basat en eMule \n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Quant a l'aMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Part de l'aMule està basat en \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Encaminament p2p basat en la mètrica XOR.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Lloc web:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Fòrum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Documentació:"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Problemes:"
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "Feu clic per comprovar si hi ha una versió més nova."
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "Comprova si hi ha actualitzacions"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "S'estan comprovant les actualitzacions..."
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "Esteu executant la darrera versió."
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "Hi ha una versió nova disponible (%s):"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr "No s'han pogut comprovar les actualitzacions. Torneu-ho a provar més tard."
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Afegeix un amic"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Heu d'introduir una IP i port vàlids!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informació"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "El resum d'usuari especificat no és vàlid!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
+"L'aMule pot instal·lar llançadors d'escriptori, icones i dreceres d'ordres de l'intèrpret al vostre directori d'usuari perquè aparegui al menú d'aplicacions com una aplicació instal·lada normalment.\n"
+"\n"
+"És reversible: els fitxers són a ~/.local/share/applications, ~/.local/share/icons i ~/.local/bin, i es poden eliminar en qualsevol moment.\n"
+"\n"
+"Voleu instal·lar la integració amb l'escriptori ara?"
 
-#: src/AppImageIntegration.cpp:226
-#, fuzzy
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
-msgstr "Després del nom de l'aplicació"
+msgstr "Voleu afegir l'aMule al vostre menú d'aplicacions?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
-msgstr ""
+msgstr "Instal·la"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
-msgstr ""
+msgstr "Ara no"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
-msgstr ""
+msgstr "No ho torneu a preguntar"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
-msgstr ""
+msgstr "No es pot instal·lar la integració amb l'escriptori: la variable d'entorn APPDIR no està definida. Això normalment vol dir que l'AppImage s'ha executat d'una manera no estàndard."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
-#, fuzzy
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
-msgstr "La connexió ha fallat "
+msgstr "Ha fallat la integració de l'aMule"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
-msgstr ""
+msgstr "No es pot instal·lar la integració amb l'escriptori: no s'ha pogut crear %s. Comproveu que es pugui escriure al vostre directori d'usuari."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
-msgstr ""
+msgstr "No es pot instal·lar la integració amb l'escriptori: no s'ha pogut escriure %s. Comproveu que es pugui escriure al vostre directori d'usuari."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr ""
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr "Integració d'AppImage: l'aMule s'ha afegit al vostre menú d'aplicacions (%d dreceres d'intèrpret a ~/.local/bin)."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -97,83 +181,173 @@
 "\n"
 "Restart aMule now?"
 msgstr ""
+"L'aMule s'ha afegit al vostre menú d'aplicacions. Ara el podeu executar des de la llista d'aplicacions, i el llançador executarà aquesta mateixa AppImage.\n"
+"\n"
+"En alguns escriptoris, pot ser que l'aMule s'hagi de reiniciar perquè la icona del dock o de la barra de tasques s'enllaci amb la nova entrada del llançador. Els compositors Wayland moderns (GNOME, KDE) ho detecten al moment, però reiniciar és la solució segura si la icona continua sent genèrica.\n"
+"\n"
+"Voleu reiniciar l'aMule ara?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
-msgstr ""
+msgstr "S'ha instal·lat l'aMule"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
-msgstr ""
+msgstr "Reinicia ara"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
-msgstr ""
+msgstr "Més tard"
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ERROR"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "No s'ha pogut obrir el fitxer de enllaços ED2K."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
 msgstr "AVÍS: No us podeu afegir com a font per a un enllaç eD2k mentre teniu ID Baixa."
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+"Un altre programa està retenint el fitxer de blocatge de l'aMule:\n"
+"\n"
+"%s\n"
+"\n"
+"No és una còpia de l'aMule en execució, per tant no hi ha res per portar al davant. Tanqueu l'altre programa o elimineu el fitxer de blocatge mentre l'aMule no s'estigui executant."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+"El dimoni de l'aMule (amuled) ja s'està executant com a procés %d i està fent servir aquesta configuració.\n"
+"\n"
+"No té cap finestra per portar al davant. Connecteu-vos-hi amb l'amuleGUI, o atureu el dimoni abans d'iniciar l'aMule."
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr "L'aMule no es pot iniciar"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr "S'han restringit els permisos de %s només al propietari."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr "No s'ha trobat el fitxer de col·lecció: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Fitxer de col·lecció no vàlid o buit: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr "No hi ha cap enllaç utilitzable a la col·lecció: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 "S'ha omès %u enllaç inservible de la col·lecció: %s"
+msgstr1 "S'han omès %u enllaços inservibles de la col·lecció: %s"
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "No s'ha pogut convertir l'enllaç magnet a eD2k: %s+"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Enllaç eD2k no vàlid «%s» - ERROR: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Sortint del programa..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "S'està aturant el procés amuleweb amb pid '%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Aturant el procés amuleweb amb pid '%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Fallades"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "S'està aturant la instància d'amuleapi amb el pid «%d» ... "
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "S'està matant la instància d'amuleapi amb el pid «%d» ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule Sortida: Finalitzant nucli."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "Aturada aMule completada."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Resultat de la depuració de la memòria a la sortida de l'aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr "S'està vinculant el trànsit d'igual a igual de l'aMule a la interfície: %s (les actualitzacions HTTP fan servir la ruta predeterminada)"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr "S'està vinculant tot el trànsit de xarxa a la interfície: %s"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr "AVÍS: no s'ha trobat la interfície de xarxa configurada «%s»; el trànsit NO hi està vinculat i pot sortir per la ruta predeterminada. Comproveu el nom de la interfície a les preferències."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr "AVÍS: vincular-se a la interfície de xarxa «%s» requereix privilegis elevats i NO s'ha aplicat; el trànsit pot sortir per la ruta predeterminada. Concediu la capacitat (per exemple, «sudo setcap cap_net_raw+ep» sobre el binari de l'aMule) o executeu-lo amb privilegis suficients."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr "AVÍS: no s'ha pogut vincular a la interfície de xarxa «%s»; el trànsit pot sortir per la ruta predeterminada."
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "S'ha establert l'idioma Predeterminat del Sistema a causa d'un canvi de configuració. Disculpeu."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Informació"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -181,56 +355,104 @@
 "\n"
 "Configuració EC"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
-msgstr "Contrassenya definida i connexions externes activades."
+msgstr "Contrasenya definida i connexions externes activades."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "AVÍS"
 
-#: src/amule.cpp:788
-#, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "S'ha trobat %i servidor al server.met"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr "S'està inicialitzant la xarxa"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "S'estan carregant els fitxers temporals"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "S'estan carregant els fitxers temporals (%u de %u)"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "S'estan carregant els fitxers compartits"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "S'estan carregant els fitxers compartits (%u)"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "S'està iniciant"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Arrencada de xarxa"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
+"L'aMule ha detectat que falten fitxers d'arrencada de xarxa.\n"
+"Seleccioneu quins voleu baixar:"
 
-#: src/amule.cpp:797
-#, fuzzy
-msgid "Network bootstrap"
-msgstr "Xarxes"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "Llista de servidors eD2k (server.met)"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Nodes d'arrencada de Kad (nodes.dat)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "servidor web executant-se al pid %d"
 
-#: src/amule.cpp:886
-#, fuzzy
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
-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"
+msgstr "Heu demanat que s'executi el servidor web a l'inici, però el fitxer binari de l'amuleweb no es pot executar. Instal·leu el paquet que conté el servidor web de l'aMule, o compileu l'aMule des del codi font amb -DBUILD_WEBSERVER=YES i instal·leu-lo."
+
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "ERROR"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr "No s'ha pogut escriure el testimoni EC d'amuleapi a %s; amuleapi recorrerà a la contrasenya configurada."
 
-#: src/amule.cpp:969
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr "amuleapi executant-se al pid %d"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Heu demanat que s'executi amuleapi a l'inici, però el fitxer binari d'amuleapi no es pot executar. Instal·leu el paquet que conté el servidor de l'API REST de l'aMule, o compileu l'aMule des del codi font amb -DBUILD_AMULEAPI=YES i instal·leu-lo."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr "Connexió externa: no s'ha pogut vincular a «%s», s'escolta només a 127.0.0.1."
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "No s'han pogut vincular els ports a l'adreça especificada: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "El port %u no està disponible. Tindreu ID BAIXA\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -245,48 +467,48 @@
 "\n"
 "Comproveu la configuració de la xarxa per a assegurar-vos que el port està obert."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "No s'ha pogut crear el fitxer de la signatura en línia"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "No s'ha pogut crear el fitxer de la signatura en línia de l'aMule"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "És la primera vegada que executeu l'aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Aquesta és una versió de prova, actualitzada diàriament, i\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "https://amule-org.github.io, o al nostre canal IRC #aMule de irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Podeu informar de qualsevol error a https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -294,1576 +516,1868 @@
 "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/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Nom del servidor notificat"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr "Metadades multimèdia: el fitxer analitzat ja no es coneix; s'ha descartat el resultat (%s)"
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "La preassignació d'espai per al fitxer '%s' ha fallat: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "ERROR: no es pot obrir el fitxer de registre"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "AVÍS: el fitxer de registre està buit. Alguna cosa no va bé."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "S'ha reiniciat el registre"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Missatge del servidor: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr "S'ha omès la baixada de %s perquè el fitxer sol·licitat no és més recent."
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "No s'ha pogut baixar la llista de nodes."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "No s'ha pogut obrir el fitxer de comprovació de versió"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Fitxer de comprovació de versió corrupte"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Esteu usant una versió antiga de l'aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Sempre podeu trobar l'última versió a https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "La vostra versió de l'aMule és l'última."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "No s'ha pogut baixar el fitxer de comprovació de versió"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Usuaris: %s | Fitxers: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "No s'han seleccionat xarxes"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "amb ID Baixa"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "amb ID Alta"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Connectat a %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "S'està connectant a %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Desconnectat de eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "S'ha engegat la xarxa Kad."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "S'ha aturat la xarxa Kad."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Connectat a Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Connectat a Kad (tallafocs)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Desconnectat de Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "La xarxa Kad està inhabilitada a les preferències, no es connectarà."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
-#, fuzzy
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
-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 https://amule-org.github.io/docs"
+msgstr "ERROR: cal una contrasenya vàlida per usar connexions externes, i el dimoni de l'aMule no es pot fer servir sense connexions externes. Per executar el dimoni de l'aMule, heu d'assignar un valor adequat al camp \"ECPassword\" del fitxer ~/.aMule/amule.conf. Executeu amuled amb el paràmetre --ec-config per establir la contrasenya. Trobareu més informació a https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: A l'Inici - Iniciant timer"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: Bifurcant-se a segon pla - adeu siau"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "No s'ha pogut crear el fitxer Pid"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "ERROR: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "aMule %s basat en eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "S'està executant sobre %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Visiteu https://github.com/amule-org/amule/releases/latest per a comprovar si hi ha disponible una versió nova."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ERROR GREU: No s'ha pogut crear el temporitzador"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Control remot de l'aMule "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "Error! No s'han pogut carregar les preferències"
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Xarxes"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr "Client P2P 'Multiplataforma' basat en eMule \n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Cerques"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Lloc web: https://amule-org.github.io \n"
-
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Fòrum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Baixades"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Lloc web: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Compartits"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Fòrum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Clients"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Missatges"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Part de l'aMule està basat en \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Estadístiques"
 
-#: src/amuleDlg.cpp:552
-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 src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Preferències"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr "Navega"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Missatge"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "Espai lliure: %s"
+
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "Hi ha una versió nova disponible"
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"Hi ha una versió nova de l'aMule (%s) disponible.\n"
+"\n"
+"Esteu executant la %s.\n"
+"\n"
+"Voleu obrir la pàgina de baixada?"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "Diàleg de l'aMule tancat"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Connectant"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: S'està connectant"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Desconnectat"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Bloquejat"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Connectat"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Connectant"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Inativa"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Atura els intents de connexió actuals"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Desconnecta"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr "Nucli"
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versió"
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Desconnecta de les xarxes on s'està connectat actualment"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr "El nucli i l'aMuleGUI són de versions diferents."
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr "El nucli i l'aMuleGUI són de la mateixa versió."
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Connecta"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adreça"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Connecta a les xarxes habilitades actualment"
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "Xifratge"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "PU: %.1f%s (%.1f) | BA: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " MiB/s"
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " KiB/s"
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "PU: %.1f%s | BA: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Connectat)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Desconnectat)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Esteu segur que voleu eixir de %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Confirmació de sortida"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Ordre: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- defecte -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "El directori del tema '%s' no existeix"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, 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:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Xarxes"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Finestra de les Xarxes"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Cerques"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Finestra de cerques"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Baixades"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Finestra de baixades"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Compartits"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Finestra de fitxers compartits"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Missatges"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr "Finestra de clients"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Finestra de Missatges"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Estadístiques"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Finestra del gràfic d'estadístiques"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Preferències"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Finestra de la configuració de preferències"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importa"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Eina d'importació de fitxers de parts"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Quant a"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Quant a / Ajuda"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Xarxa eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Xarxa Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Cap xarxa"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Control remot de l'aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Error Fatal: Ha fallat la creació del Core Timer"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Connecta a l'amule remot"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "S'ha perdut la connexió"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr "Interromp i surt"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "S'està reconnectant... (intent %d)"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr "Pròxim intent d'aquí a %d s..."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+"S'ha perdut la connexió amb %s.\n"
+"%s\n"
+"\n"
+"La interfície està en pausa fins que es restableixi la connexió."
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Error Fatal: Ha fallat la creació del Poll Timer"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "S'està executant un bucle..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Connectant..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
-msgstr ""
+msgstr "Ha fallat la connexió. Comproveu l'amfitrió, el port i la contrasenya."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Gestor d'esdeveniments de la IGU EC Remota"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, 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/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Aturant"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "S'ha tancat la connexió - segurament l'aMule s'ha terminat."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr "L'intent de reconnexió ha esgotat el temps; es torna a provar."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
+"S'ha esgotat el temps de connexió. No s'ha pogut arribar a %s:%d dins del temps assignat.\n"
+"Comproveu l'amfitrió, el port i que l'aMule s'estigui executant amb les connexions externes activades."
+
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr "S'ha perdut la connexió amb el nucli remot. S'està intentant reconnectar..."
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Inhabilitada"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr "S'ha reconnectat al nucli remot."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr "El nucli remot s'ha reiniciat; s'està tornant a carregar."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Intent de reconnexió %d: s'està connectant a %s:%d"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr "No s'ha pogut iniciar la reconnexió; es tornarà a provar d'aquí a poc."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "A punt"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Tots"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr "no llegible"
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr "no s'ha trobat"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr "El nucli ha rebutjat aquestes carpetes compartides:%s"
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "L'enllaç és invàlid o ja és present a la llista."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr "El dimoni ha rebutjat la petició."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "No s'ha pogut suprimir la categoria: %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 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/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr "El nucli remot ha enviat dades incoherents per a «%s» (estat de parts %d, s'esperava %d). Pot ser que la llista de fitxers mostri informació incorrecta; torneu a connectar per esborrar-la."
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "No s'han pogut obtenir els compartits de l'usuari '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Buscant amic per connexió amb ID Baixa"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Versió d'eMule falsa %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (eMule fals)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (eMule fals)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (basat en l'eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Sobrenom: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Demanat: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estadístiques dels fitxers per a aquesta sessió: %d petició acceptada de %d, %s transferida\n"
 msgstr1 "Estadístiques dels fitxers per a aquesta sessió: %d peticions acceptades de %d, %s transferides\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estadístiques dels fitxers per a totes les sessions: %d petició acceptada de %d, %s transferida\n"
 msgstr1 "Estadístiques dels fitxers per a totes les sessions: %d peticions acceptades de %d, %s transferides\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "S'ha demanat un fitxer desconegut"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Missatge filtrat de '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nou missatge de '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "L'usuari %s (%u) ha demanat la llista de fitxers compartits del directori inexistent '%s' -> Ignorat"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "No s'han pogut obtenir els compartits de l'usuari '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "AVÍS: No es pot obrir %s."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "AVÍS: La llista dels fitxers cancel·lats és malmesa, conté una capçalera no vàlida."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Error d'E/S metre es llegia el fitxer %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Error mentre es desava el fitxer %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Introdueix el Captcha"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Categoria"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nova categoria"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Carpeta per als fitxers entrants"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Heu d'especificar un nom per a la categoria!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Heu d'especificar un directori per a la categoria!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, 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/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Connectat amb el client ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** S'està connectant amb el client ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** No s'ha pogut connectar amb el client / Connexió perduda ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 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/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Xat"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Tanca la pestanya"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Tanca totes les pestanyes"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Tanca les altres pestanyes"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Afegeix a la llista d'amics"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Mostra els &detalls"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Elimina'l dels amics"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Estableix posició (slot) d'amic"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Veure els compartits"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Envia un missatge"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Envia un missatge a l'usuari"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Missatge a enviar:"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\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/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Selecció múltiple"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 "Voleu afegir %u client a la vostra llista d'amics?"
+msgstr1 "Voleu afegir %u clients a la vostra llista d'amics?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Voleu eliminar %u client de la vostra llista d'amics?"
+msgstr1 "Voleu eliminar %u clients de la vostra llista d'amics?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 "No s'ha pogut afegir %u client seleccionat a la vostra llista d'amics: no se'n coneix cap adreça."
+msgstr1 "No s'han pogut afegir %u clients seleccionats a la vostra llista d'amics: no se'n coneix cap adreça."
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Voleu demanar els fitxers compartits de %u client?"
+msgstr1 "Voleu demanar els fitxers compartits de %u clients?"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr "S'obre una connexió a cadascun d'ells."
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "El fitxer de crèdits ha estat carregat, %u és un client conegut"
 msgstr1 "El fitxer de crèdits ha estat carregat, %u són clients coneguts"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - Han vençut els crèdits de %u client!"
 msgstr1 " - Han vençut els crèdits de %u clients!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "No s'ha trobat el fitxer 'cryptkey.dat', creant-lo."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Detalls del client"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "ID Baixa"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "ID Alta"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Habilitada"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Suportada"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "No suportada"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Inhabilitada"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Connectat"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f KiB/s"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nom"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "Programari"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Adreça IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Origen"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr "Vist per primer cop"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr "Vist per última vegada"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "Sessions"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Velocitat de pujada"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Velocitat de baixada"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "Total pujat"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "Total baixat"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Modificador PU/BA"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr "En línia ara"
 
-#: src/ClientRef.cpp:196
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Sense completar"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Dolent"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Verificat - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/D"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "No disponible"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "No s'ha pogut demanar els fitxers compartits a %u client seleccionat."
+msgstr1 "No s'han pogut demanar els fitxers compartits a %u clients seleccionats."
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Fitxers"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Transferit"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Baixat"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "S'està baixant de"
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr "S'està pujant a"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Actiu"
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr "Conegut"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "L'usuari %s (%u) ha demanat la llista de fitxers compartits -> Acceptada"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "L'usuari %s (%u) ha demanat la llista de fitxers compartits -> Denegada"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "L'usuari %s (%u) ha demanat la llista de directoris compartits -> Denegada"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "L'usuari %s (%u) ha demanat la teva llista de fitxers compartits del directori '%s' -> Acceptada"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "L'usuari %s (%u) ha demanat la teva llista de fitxers compartits del directori '%s' -> Denegada"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "L'usuari %s (%u) comparteix el directori '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "L'usuari %s (%u) ha enviat directoris compartits no demanats."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "L'usuari %s (%u) ha enviat una llista de fitxers compartits no desitjada"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, 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/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Comentaris del Fitxer"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Usuari"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Fitxer"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Valoració"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Comentari"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr "No s'ha pogut iniciar una cerca de Kad"
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "S'estan cercant comentaris a Kad..."
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Sense comentaris"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u comentari"
 msgstr1 "%u comentaris"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 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:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "No s'han pogut carregar les dades de país per a '%s'."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Ba"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Al"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Molt baixa"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Baixa"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Alta"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Molt alta"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Llançament"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Preguntant"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "S'està connectant via servidor"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Cua plena"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Cua"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "S'està baixant"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Rebent el conjunt de resums"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "No es necessiten parts"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "No és possible connectar d' ID Baixa a ID Baixa"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Massa connexions"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "S'està connectant via Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Massa connexions Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Expulsats"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Error de la connexió"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Cua remota plena"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "MLDonkey antic"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "MLDonkey nou"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Compatible amb eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Servidor local"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Servidor remot"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Intercanvi de fonts"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passiu"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Enllaç"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Llavors font"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Resultat de la cerca"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Completat"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "En progrés"
 
-#: src/DataToText.cpp:145
-#, fuzzy
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "ERROR: Sense espai al disc"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "ERROR: No s'ha trobat el partmet"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ERROR: error d'E/S!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ERROR: Ha fallat!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "En cua"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Ja s'està baixant"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Format de fitxer temporal desconegut o defectuós."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr "Aquest directori forma part d'una compartició recursiva. Per eliminar-lo, deixeu de compartir o modifiqueu l'arrel de la compartició recursiva que hi ha per sobre."
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr "No es pot deixar de compartir dins d'una compartició recursiva"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr "No es pot modificar dins d'una compartició recursiva"
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Part"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Mida"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Transferit"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Velocitat"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Progrés"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Fonts"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioritat"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Estat"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Temps Restant"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Últim cop vist complet"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Última recepció"
 
-#: 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/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/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Retroacció des de: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Auto"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Atura"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Continua"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "&Neteja els completats"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Intercanvia cada A4AF a aquest fitxer ara"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Intercanvia cada A4AF a aquest fitxer (Automàtic)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Intercanvia cada A4AF a qualsevol altre fitxer ara"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Opcions avançades"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Previsualitza"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "Mostra al gestor de fitxers"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Mostra els &detalls del fitxer"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Mostra els comentaris"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Copia l'enllaç amb format Magnet al porta-retalls"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Copia &l'enllaç eD2k al porta-retalls"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Copia la &informació al porta-retalls"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Obté %s per aquest fitxer"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "Cap categoria"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Assigna a una categoria"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Obre el fitxer"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Esteu segur que voleu esborrar el fitxer seleccionat?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Esteu segur que voleu esborrar els fitxers seleccionats?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Retroacció des de: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Introduïu un nom nou per al fitxer:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Reanomena"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%d/%m/%y %H:%M:%S"
+msgid "%.1f MiB/s"
+msgstr "%.1f MiB/s"
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Baixades (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-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 %s)."
+msgid "Total queue size: %s"
+msgstr "Mida total de la cua: %s"
 
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Previsualització"
-
-#: src/DownloadListCtrl.cpp:1500
-#, 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/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Desant fitxer de parts %u de %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Tots els fitxers de parts desats."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "S'estan carregant els fitxers de %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "S'està carregant els fitxer de descarrega %u de %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "ERROR: No s'ha pogut carregar la còpia de seguretat. Cerqueu '.part.met recovery solutions' a https://github.com/amule-org/amule/discussions."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Tots els fitxers de parts carregats."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "No s'han trobat fitxers de parts"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Trobat %u fitxer de parts"
 msgstr1 "Trobats %u fitxers de parts"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "El sistema de fitxers del directori Temp no pot gestionar fitxers de grans dimensions."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 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/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "S'està baixant %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Ja esteu intentant baixar el fitxer '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Ja teniu el fitxer «%s» (demanat com a «%s»)"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Ja disposeu del fitxer '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Ja esteu intentant baixar el fitxer %s"
 
-#: src/DownloadQueue.cpp:1418
-#, 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:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Protocol desconegut de l'enllaç: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
-msgstr0 ""
-msgstr1 ""
+msgstr0 "No s'ha pogut afegir %u enllaç (consulteu el registre per a més detalls)."
+msgstr1 "No s'han pogut afegir %u enllaços (consulteu el registre per a més detalls)."
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Enllaç eD2k invàlid! ERROR: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "El client ha enviat un paquet després d'una autenticació fallida."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Connexió externa tancada."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Les connexions externes han estat inhabilitades per manca d'una contrasenya!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Les connexions externes estan inhabilitades al fitxer de configuració"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Nova connexió externa acceptada"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERROR: no s'ha pogut acceptar una nova connexió externa"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 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:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "S'està connectant al client: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Versió desconeguda"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "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:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "No us podeu connectar a una versió final des d'una versió de desenvolupament arbitrària! *buf* s'ha evitat una possible fallada"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Versió del protocol invàlida."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Marcador de la versió del protocol inexistent."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Massa intents de connexió fallits; torneu-ho a provar d'aquí a %d segons."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "L'autenticació ha fallat: el resum especificat com a contrasenya d'EC no és vàlid."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr "Ha fallat l'autenticació: el client ha ofert una connexió externa xifrada però no ha enviat cap clau utilitzable."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr "Ha fallat l'autenticació: aquest aMule requereix una connexió externa xifrada i el client no n'ha negociat cap."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr "Ha fallat l'autenticació: el client no ha pogut confirmar la sessió xifrada."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
-msgstr "Ha fallat l'autenticació: contrasenya incorrecta"
+msgstr "Ha fallat l'autenticació: contrasenya incorrecta."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
-msgstr "Ha fallat l'autenticació: falta la contrasenya"
+msgstr "Ha fallat l'autenticació: falta la contrasenya."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Petició invàlida, primer heu d'autenticar-vos."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Accés concedit."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "S'ha enviat el missatge d'error \"%s\" al client."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Intent d'accés no autoritzat de %s. Connexió tancada."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "No s'ha trobat el resum del fitxer: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "Error en processar el codi d'opció!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "No s'ha afegit el servidor"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "no s'ha trobat el servidor: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "és necessari definir el servidor a esborrar"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k és inhabilitada a les preferències."
 
-#: src/ExternalConn.cpp:1368
-#, fuzzy
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr "Encara no es coneix cap adreça d'aquest amic."
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
-msgstr "No s'ha trobat el fitxer."
+msgstr "No s'ha trobat l'amic."
 
-#: src/ExternalConn.cpp:1377
-#, fuzzy
+#: src/ExternalConn.cpp
 msgid "Client not found."
-msgstr "No s'ha trobat el fitxer."
+msgstr "No s'ha trobat el client."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
-msgstr ""
-
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Cerca en procés. S'obtindran resultats en un moment!"
+msgstr "EC_TAG_FRIEND_SHARED requereix EC_TAG_FRIEND o EC_TAG_CLIENT."
 
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "La recerca web des de la interfície remota no té sentit."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr "Una exploració no és una cerca que es pugui iniciar."
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Cerca en procés. S'obtindran resultats en un moment!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Cap punt per al gràfic."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 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:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Connexió externa: s'ha demanat l'aturada"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Ja s'està aturant."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: afegint l'enllaç '%s'."
 
-#: src/ExternalConn.cpp:1832
-#, fuzzy, c-format
+#: src/ExternalConn.cpp
+#, c-format
 msgid "%d of %d links failed (invalid or already on list)."
-msgstr "L'enllaç és invàlid o ja és present a la llista."
+msgstr "Han fallat %d enllaços de %d (no són vàlids o ja són a la llista)."
+
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr "Comprovació de versió limitada; torneu-ho a provar d'aquí a poc."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr "La comprovació de versió no està disponible en aquest dimoni."
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "No s'ha trobat el fitxer."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Nom de fitxer invàlid."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "No s'ha pogut canviar el nom del fitxer."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr "No s'ha pogut canviar el client a aquest fitxer."
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr "No s'ha pogut desar la contrasenya d'amuleapi: %s"
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "No existeix aquesta categoria."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr "Petició de categoria mal formada."
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr "La categoria predeterminada no es pot suprimir."
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "Falta l'id de la sessió de xat"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "No existeix aquesta sessió de xat"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "L'extracció de metadades multimèdia està desactivada a les preferències"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr "El fitxer no és apte per a l'extracció de metadades multimèdia (no és un fitxer d'àudio o vídeo, o és una baixada incompleta)"
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "Missatge de xat buit"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "Destinatari de xat desconegut"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad està inhabilitada a les preferències."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Ja esteu connectat a eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Connectant a eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Ja esteu connectat a Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "S'està connectant a Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Totes les xarxes estan inhabilitades."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Desconnectat de eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Desconnectat de Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, 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:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Codi d'opció invàlid (versió de protocol errònia?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Extensió '%s' desconeguda per a l'ordre '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Ordre '%s' desconeguda.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1871,7 +2385,7 @@
 "\n"
 "Aquesta ordre no pot tenir un argument.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1879,7 +2393,7 @@
 "\n"
 "Aquesta ordre ha de tenir un argument.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1887,7 +2401,7 @@
 "\n"
 "Aquesta ordre és incompleta, heu d'usar una de les extensions de sota.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1895,11 +2409,11 @@
 "\n"
 "Extensions disponibles:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Ordres disponibles:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1910,17 +2424,17 @@
 "Les majúscules no influeixen a les ordres.\n"
 "Escriviu '%s <ordre>' per a aconseguir informació sobre l' <ordre>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Surt de l'aplicació."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Mostra l'ajuda."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1928,7 +2442,7 @@
 "Per a aconseguir ajuda sobre una ordre, escriviu 'help <ordre>'.\n"
 "Per a veure la llista completa d'ordres escriviu 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1939,46 +2453,46 @@
 "Useu '%s' per a la llista d'ordres\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Error de sintaxi!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "S'ha produït un error processant una ordre - això no hauria de passar mai! Informeu de l'error, si us plau\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Aquesta ordre no hauria de tenir cap paràmetre."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Aquesta ordre ha de tenir un paràmetre."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Argument invàlid."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Aquesta ordre és incompleta."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Escriviu '%s' per a aconseguir més ajuda.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Això és %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Això és %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1986,7 +2500,7 @@
 "\n"
 "S'està creant el client...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1995,7 +2509,7 @@
 "\n"
 "D'acord, eixint %s ...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2009,118 +2523,370 @@
 "\n"
 "Eixint...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Mostra aquest text d'ajuda."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Ordinador on està executant-se l'aMule. (per defecte: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Port de l'aMule per a connexions externes. (per defecte: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Contrasenya per a les connexions externes."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Llegeix la configuració des del fitxer."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
-msgstr "No mostra res per la sortida estàndard."
+msgstr "No escriguis cap sortida a stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
-msgstr "Detallat - mostra també els missatges de depuració."
+msgstr "Mode detallat: mostra també els missatges de depuració."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Estableix la localització del programa (idioma)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Escriu al fitxer de configuració les opcions de la línia d'ordres."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Crea un fitxer de configuració basat en el de l'aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Mostra la versió del programa."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr "No xifris la sessió de connexió externa. El xifratge està activat per defecte sempre que l'aMule remot l'admeti; desactivar-lo deixa tot el que ve després de l'inici de sessió llegible i modificable per qualsevol que hi hagi pel camí."
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
-msgstr ""
+msgstr "Força la compressió ZLIB independentment de si la IP marcada és local (útil quan el servidor és accessible per un túnel VPN que resol a una IP de la LAN)."
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr "Afegeix una còpia de tota la sortida de consola a aquest fitxer de registre (predeterminat: <config-dir>/amuleapi.log)."
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr "No escriguis cap fitxer de registre; mostra-ho només per consola."
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Detalls del fitxer"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% fet"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Previsualització"
+
+#: src/FileLaunch.cpp
+#, 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/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr "No s'ha trobat el reproductor de vídeo configurat: %s"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr "No es pot obrir «%s»: el fitxer no és en aquest ordinador."
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr "Per previsualitzar una baixada inacabada cal un reproductor de vídeo: el fitxer baixat parcialment no té cap tipus que el sistema pugui obrir pel seu compte. Se'n pot definir un a Preferències -> General."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr "ERROR: no s'ha pogut obrir «%s» amb l'aplicació predeterminada."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ERROR: no s'ha pogut mostrar «%s» al gestor de fitxers."
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "Mòbil / 4G-5G (20 / 5 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL (24 / 1 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL (50 / 10 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Cable (200 / 20 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Fibra 300 (300 / 100 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "Fibra gigabit (1000 / 1000 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr "Configuració inicial de l'aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "Us donem la benvinguda a l'aMule!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+"Aquesta configuració ràpida us connectarà. Podeu canviar\n"
+"qualsevol d'aquests paràmetres més endavant a les preferències."
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "Trieu un àlies que veuran els altres parells:"
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr "Connexió i amplada de banda"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+"Trieu l'opció que s'ajusti millor a la vostra connexió a Internet,\n"
+"o definiu directament els límits de pujada i baixada a sota."
+
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "Velocitat de connexió:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr "Altres / defineix-ho manualment"
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "Límit de pujada (KiB/s, 0 = il·limitat):"
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "Límit de baixada (KiB/s, 0 = il·limitat):"
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "Xarxes i ports"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr "L'aMule pot fer servir dues xarxes. Recomanem mantenir-les totes dues activades."
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Port TCP per defecte "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Port UDP extès (Kad / cerca global) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Activa UPnP per redirecció de ports"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+"Permet que l'aMule demani al vostre encaminador que reenviï els ports\n"
+"de dalt perquè altres parells us puguin arribar (una «HighID»). Desactiveu-ho\n"
+"si el vostre encaminador no admet UPnP o si reenvieu els ports manualment."
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr "Fitxers d'arrencada"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+"Per començar, l'aMule necessita conèixer alguns parells.\n"
+"Seleccioneu quines llistes voleu baixar ara:"
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Les vostres llistes de parells ja hi són; no cal baixar res."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Actualitza automàticament la llista de servidors a l'inici"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr "Integracions (opcional)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+"Trieu com s'integra l'aMule amb el vostre sistema. Podeu\n"
+"canviar qualsevol d'aquestes opcions més endavant a les preferències."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "Inicia l'aMule automàticament en iniciar la sessió"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr "Registra l'aMule per als enllaços ed2k://"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr "Registra l'aMule per als enllaços magnet:"
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr "Només magnet compatibles amb eD2k. Deixeu-ho desactivat si feu servir un client de BitTorrent."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr "Obre els fitxers .emulecollection amb l'aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr "Carpetes (opcional)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+"Els valors predeterminats van bé per a la majoria de gent. Canvieu-los si\n"
+"voleu les baixades en un disc diferent (per exemple, més gran)."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Carpeta on desar les descàrregues"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Explora"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Tots els fitxers d'aquesta carpeta es comparteixen amb altres parells)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Carpeta on desar les descàrregues temporals"
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+"A partir d'això, l'aMule permetrà fins a %i fonts per fitxer\n"
+"i %i connexions de client."
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr "Voleu tornar a mostrar aquest auxiliar de configuració el pròxim cop que inicieu l'aMule?"
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr "Configuració no acabada"
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "No s'ha pogut obrir el fitxer amb la llista d'amics 'emfriends.met' per a lectura!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 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/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr "Encara no es coneix cap adreça de l'amic «%s»; no se'n pot explorar el contingut."
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "CRITIC - no hi ha client a l'Inici de Sessió del Xat"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Amics"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Mostra els &detalls"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Afegeix un amic"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Elimina l'amic"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Envia un &missatge"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Veure els compartits"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Estableix posició (slot) d'amic"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr "Encara no es coneix cap adreça de l'amic «%s»; no se li pot enviar cap missatge."
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Esteu segur que voleu esborrar l'amic seleccionat?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Esteu segur que voleu esborrar els amics seleccionats?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2128,986 +2894,1283 @@
 "No podeu establir més d'una posició d'amic.\n"
 " Només s'ha assignat una posició."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Selecció múltiple"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\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/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Envia un missatge a l'usuari"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Missatge a enviar:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Elimina'l dels amics"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Envia un missatge"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Intercanvia cap a aquest fitxer"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr "Llegenda de colors"
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "En cua: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "S'ha preguntat per un altre fitxer"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Esperant un lloc de pujada"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "En cua: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Pujant"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Cap"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "No"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Sí"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "No s'ha pogut obrir la base de dades MaxMindDB «%s»: %s"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "S'està baixant..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "Descàrrega HTTP cancel·lada"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "L'adreça URL a baixar no pot estar buida"
 
-#: src/HTTPDownload.cpp:246
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Failed to create HTTP request for %s"
-msgstr "No s'han pogut obtenir els compartits de l'usuari '%s'"
+msgstr "No s'ha pogut crear la petició HTTP per a %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
-msgstr ""
+msgstr "Baixada HTTP: cos de resposta buit per a %s"
 
-#: src/HTTPDownload.cpp:349
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Could not move downloaded file to %s"
-msgstr "Carpeta on desar les descàrregues temporals"
+msgstr "No s'ha pogut moure el fitxer baixat a %s"
 
-#: src/HTTPDownload.cpp:353
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Downloaded %s (%llu bytes)"
-msgstr "S'han baixat %d bytes"
+msgstr "S'ha baixat %s (%llu bytes)"
 
-#: src/HTTPDownload.cpp:358
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "The URL %s returned: %i"
-msgstr "L'adreça URL %s ha retornat: %i - Error (%i)!"
+msgstr "L'URL %s ha retornat: %i"
 
-#: src/HTTPDownload.cpp:365
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "HTTP download failed for %s: %s"
-msgstr "Descàrrega HTTP cancel·lada"
+msgstr "Ha fallat la baixada HTTP de %s: %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
-msgstr ""
+msgstr "HTTP 401 no autoritzat per a %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
-msgstr ""
+msgstr "S'ha migrat el GeoLite2-Country.mmdb existent a %s"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr ""
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr "%s no és un fitxer MaxMindDB llegible; es descarta. Se'n baixarà una còpia nova al pròxim inici, o ara mateix des de Preferències -> IP2Country -> «Actualitza ara»."
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr ""
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "IP2Country: s'ha seleccionat MaxMind com a font de GeoIP però no hi ha cap clau de llicència configurada. Obriu Preferències -> IP2Country, enganxeu-hi la vostra clau de llicència gratuïta de MaxMind i feu clic a «Actualitza ara»."
+
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "IP2Country: s'ha seleccionat URL personalitzat com a font de GeoIP però no hi ha cap URL configurat. Obriu Preferències -> IP2Country i indiqueu un URL que apunti a un .mmdb (o a un .gz / .tar.gz que en contingui un)."
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
-msgstr ""
+msgstr "IP2Country: no s'ha pogut resoldre cap URL de baixada de GeoIP."
 
-#: src/IP2Country.cpp:157
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download new %s from %s"
-msgstr "Baixant nou GeoIP.dat de %s"
+msgstr "Baixa un %s nou de %s"
 
-#: src/IP2Country.cpp:191
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download of %s file failed, aborting update."
-msgstr "Baixada del fitxer GeoIP.dat fallida, actualització interrompuda."
+msgstr "Ha fallat la baixada del fitxer %s; s'interromp l'actualització."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Fallada a l'esborrar el fitxer %s, actualització interrompuda."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Fallada al canviar de nom el fitxer %s, actualització interrompuda."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "Actualització de %s correcta"
 
-#: src/IP2Country.cpp:228
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Error updating %s"
-msgstr "Error actualitzant GeoIP.dat"
+msgstr "Error en actualitzar %s"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
-msgstr ""
+msgstr "Ha fallat la baixada de DB-IP per al mes actual; es torna a provar amb l'URL del mes anterior."
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Fallada descarregant %s de %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "No s'han pogut carregar les dades de país per a '%s'."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "S'estan carregant els filtres IP 'ipfilter.dat' i 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "S'ha carregat %u rang IP des de '%s'."
 msgstr1 "S'han carregat %u rangs IP des de '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "S'ha descartat %u línia malformada."
 msgstr1 "S'han descartat %u línies malformades."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Fallada al canviar de nom el nou fitxer %s, actualització interrompuda."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "El filtre d'IP està llest"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Inicia des dels \n"
-"clients coneguts"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Actual"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Mitjana total"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Mitjana de la sessió"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Nodes (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "IP invàlida per a l'arrancada"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Port invàlid per a l'arrancada"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Si us plau empleneu tots els camps requerits"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Missatge"
+
+#: src/KadDlg.cpp
 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:213
+#: src/KadDlg.cpp
 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:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Voleu continuar?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: la paraula clau de cerca és massa curta"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: Paraula clau de cerca ja es troba a la llista de cerca: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "No s'ha pogut llegir el fitxer nodes.dat - és massa antic. Aquesta versió (0) ja no és compatible."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "S'ha llegit %u contacte Kad"
 msgstr1 "S'han llegit %u contactes Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "No es troben contactes, si us plau reinicia o baixa un nou fitxer nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Només %d contacte Kad disponible, nodes.dat no es pot escriure"
 msgstr1 "Només %d contactes Kad disponibles, nodes.dat no es pot escriure"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "S'ha escrit %d contecte Kad"
 msgstr1 "S'han escrit %d contactes Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Usuari de Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr "La cerca de notes de Kad per a «%s» no s'ha iniciat: Kad no està connectat"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr "La cerca de notes de Kad per a «%s» no s'ha iniciat: ja s'està fent una cerca de notes per a aquest fitxer"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr "La cerca de notes de Kad per a «%s» no s'ha iniciat: el fitxer no és a la llista de compartits, ni a la cua de baixades, ni als resultats de cerca"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr "La cerca de notes de Kad per a «%s» no s'ha iniciat: una altra cerca de Kad (per exemple, de fonts) ja està fent servir el hash d'aquest fitxer; torneu-ho a provar d'aquí a poc"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr "La cerca de notes de Kad per a «%s» no s'ha iniciat: ha fallat PrepareLookup"
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Nom del fitxer"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Mida"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Ràtio"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Transferit"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Peticions"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Acceptades"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Fonts completes"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "ALERTA: Llista de fitxers coneguts malmesa, conté una capçalera no vàlida."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "No s'ha pogut carregar l'entrada a la llista de fitxers coneguts, el fitxer podria estar corrupte"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Entrada no vàlida a la llista de fitxers coneguts, el fitxer podria estar corrupte: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Predeterminat"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanès"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Àrab"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturià"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Basc"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Búlgar"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Català; Valencià"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Xinès (Simplificat)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Xinès (Tradicional)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Croat"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Txec"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Danès"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Holandès"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Anglès (R.U.)"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "Anglès (EUA)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estonià"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finès"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francès"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Gallec"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Alemany"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grec"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebreu"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Hongarès"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italià"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japonès"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Coreà"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "Letó"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lituà"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Noruec"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polonès"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portuguès"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portuguès (Brasil)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Romanès"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Rus"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Eslovè"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Espanyol; Castellà"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Suec"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turc"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ucranià"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Error desconegut %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "No s'ha pogut obtenir la descripció de l'error per a l'error %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Resumint"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Completant"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Complet"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Pausat"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Erroni"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Esperant"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Heu d'especificar una contrasenya (no buida)."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Contrasenya invàlida, no és un resum MD5!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr "No s'ha pogut resoldre %s a una adreça IPv4."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Fallada en la connexió"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-#, fuzzy
-msgid "External Connection lost — exiting."
-msgstr "Connexió externa tancada."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
+msgstr "S'ha perdut la connexió externa; s'està sortint."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "La connexió externa ha fallat. Resposta buida."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr "No s'ha pogut configurar el xifratge de la connexió. S'ha tancat la connexió."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr "El nucli no ha negociat una connexió xifrada. Pot ser un aMule antic sense compatibilitat amb el xifratge, o pot ser que la connexió s'hagi manipulat. Per connectar sense xifratge, desactiveu-lo a la configuració de la connexió."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Connexió externa: Resposta incorrecta, confirmació de connexió fallida. S'ha tancat la connexió."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Connexió externa: el dimoni no ha pogut demostrar que coneix la contrasenya. S'ha tancat la connexió."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Connexió establerta amb l'aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Connexió establerta amb èxit."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Connexió externa: Accés denegat perquè: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Connexió externa: Conformitat de connexió denegada."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr "Error en crear el sòcol UDP %s %d : %s"
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "S'ha iniciat el fil Asio %d"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "ERROR: No s'ha pogut escoltar el port TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "ERROR: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "AVÍS: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr "Metadades multimèdia: no s'ha trobat cap binari ffprobe. Instal·leu ffmpeg o definiu el camí a ffprobe a les preferències; no s'extrauran la durada, la taxa de bits ni el còdec."
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr "Metadades multimèdia: %s ha desaparegut, no hi ha res per extreure"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr "S'estan extraient les metadades multimèdia amb ffprobe: %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr "Metadades multimèdia: ffprobe ha esgotat el temps o s'ha cancel·lat per a %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr "Metadades multimèdia: s'ignora una sortida de ffprobe implausiblement gran per a %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr "Metadades multimèdia: no s'ha pogut executar ffprobe (%s); reviseu la configuració de metadades multimèdia"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr "Metadades multimèdia: ffprobe ha fallat (codi %d) per a %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr "Metadades multimèdia: ffprobe no ha trobat res d'útil a %s"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 "S'han acabat d'extreure les metadades multimèdia de %u fitxer compartit (%u han fallat)"
+msgstr1 "S'han acabat d'extreure les metadades multimèdia de %u fitxers compartits (%u han fallat)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 "S'han acabat d'extreure les metadades multimèdia de %u fitxer compartit"
+msgstr1 "S'han acabat d'extreure les metadades multimèdia de %u fitxers compartits"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 "Ha fallat l'extracció de metadades multimèdia de %u fitxer més (no es llisten individualment)"
+msgstr1 "Ha fallat l'extracció de metadades multimèdia de %u fitxers més (no es llisten individualment)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 "%u fitxer compartit més ha desaparegut (no es llisten individualment)"
+msgstr1 "%u fitxers compartits més han desaparegut (no es llisten individualment)"
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Tanca"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Retalla"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Copia"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Enganxa"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Neteja"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Selecciona-ho tot"
 
-#: src/MuleTrayIcon.cpp:367
-#, fuzzy
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "KiB/s"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Il·limitat"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Mostra l'aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Amaga l'aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
-msgstr "eD2k"
+msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
-msgstr "Connectat"
+msgstr "Connectat (LowID)"
 
-#: src/MuleTrayIcon.cpp:371
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
-msgstr "Connectat"
+msgstr "Connectat (HighID)"
 
-#: src/MuleTrayIcon.cpp:380
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
-msgstr " Kad: "
+msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
-msgstr "Connectat a Kad (tallafocs)"
+msgstr "Connectat (darrere tallafocs)"
 
-#: src/MuleTrayIcon.cpp:393
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
-msgstr "IP del Servidor: "
+msgstr "Servidor: "
 
-#: src/MuleTrayIcon.cpp:394
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
-msgstr "IP del servidor:"
+msgstr "IP del servidor: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Desconnectat"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Port TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Port TCP: No està llest"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Port UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Port UDP: No està llest"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Informació del client"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Límit de pujada"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Límit de baixada"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Mostra l'aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Desconnecta"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Amaga l'aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Connecta"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Surt"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Il·limitat"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Menú de la icona d'estat"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Límits de velocitat:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "PU: cap"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "PU: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "BA: cap"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "BA: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Velocitat de baixada: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Velocitat de pujada: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Sobrenom: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "No heu seleccionat cap sobrenom!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID de client: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Servidor: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP del Servidor: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Desconnectat"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Signatura en línia: Habilitada"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Signatura en línia: Inhabilitada"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Funcionant: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Fitxers compartits: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Clients en cua: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Total BA: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Total PU: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Enllaç eD2k: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr "S'ha creat %s al port %u"
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "D'acord"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr "AVÍS! %s: s'ha descartat el paquet cap a %s per un error (%s) en enviar-lo."
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr "Enganxeu aquí enllaços eD2k o magnet"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "Afegeix els enllaços"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Feu clic per a afegir l'enllaç eD2k del camp de text a la cua de descàrregues."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
-msgstr "Els esdeveniments es mostren aquí. Per a veure la llista completa, mireu el registre de la pestanya Servidors."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr "Els esdeveniments es mostren aquí. Per a veure'n la llista completa, mireu el registre de la pestanya Xarxes."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Carregant ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Usuaris: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Usuaris connectats al servidor actual i una estimació del nombre total d'usuaris."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "PU: 0.0 | BA: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "La mitjana de pujada i baixada actuals. Si està habilitat, el valor entre parèntesis mostra la sobrecàrrega provinent de les comunicacions amb els clients."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Desconnectat ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Servidor connectat actualment."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Cerca"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nom:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tipus"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Cerca avançada"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtratge"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Tipus de fitxer"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Qualsevol"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Arxius"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Àudio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "Imatges de CD"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr "Imatges de disc"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Imatges"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programes"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Documents"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Extensió"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Mida Mín."
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "KiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "MiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "GiB"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Mida Màx."
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Disponibilitat"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtre:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Resultat del filtre"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtre"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Inverteix el resultat"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Amaga els fitxers coneguts"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr "Restableix els filtres"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Inicia"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Més"
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "Amplia"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
-msgstr ""
+msgstr "Demana als parells de Kad que ja han respost que ampliïn la cerca. Cada clic consulta el parell més proper següent per obtenir més contactes (KADEMLIA_FIND_VALUE_MORE), fent aparèixer coincidències de fitxers addicionals que la frontera alfa inicial de la cerca no va trobar."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Atura"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Baixada"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Baixa a la categoria"
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "Esborra els resultats de la cerca"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Buida els camps"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Resultats"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Neteja les baixades completades"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtre:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Fonts del fitxer:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
-msgstr "General "
+msgstr "General"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Nom Complet:"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/D"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Nom Complet"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "Fitxer-met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Fitxer-met:"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Resum:"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Mida:"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Estat de les parts:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Últim cop vist complet:"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Mida"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
-msgstr "Transferència "
+msgstr "Transferència"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Fonts trobades:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Estat de les parts"
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Fonts transferint:"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Últim cop vist complet"
 
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Compte de parts:"
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Fonts trobades"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Fonts transferint"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Compte de parts"
 
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Disponibilitat:"
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Disponibilitat"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Velocitat:"
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Velocitat"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Temps actiu de baixada:"
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Temps actiu de baixada"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Completats"
 
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Transferit:"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
+msgstr "Gestió intel·ligent de la corrupció"
 
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Completats:"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Perdut per corrupció"
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
-msgstr "Gestió intel·ligent de la corrupció "
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Guanyat per compressió"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Perdut per corrupció:"
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Paquets recuperats per I.C.H."
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Guanyat per compressió:"
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr "Compartició"
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Paquets recuperats per I.C.H.:"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Peticions"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Peticions acceptades"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Dades transferides"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Ràtio"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Fonts completes"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "Compartit des de"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "Última pujada"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr "Informació multimèdia"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "Durada"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "Taxa de bits"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "Còdec"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "Artista"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "Àlbum"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Títol"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
-msgstr "Noms del fitxer "
+msgstr "Noms del fitxer"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Copia"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Neteja"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Aplica"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 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:705
+#: src/muuli_wdr.cpp
 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."
@@ -3115,1143 +4178,1239 @@
 "Per una pel·lícula es pot definir la seva durada, la seva història, llenguatge...\n"
 "i si és falsa, es pot informar a altres usuaris d'aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Qualitat del fitxer"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Sense Valorar"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Invàlid / Corrupte / Fals"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Pobre"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Correcte"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Bo"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Excel·lent"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "Obtén de Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "S'està baixant, si us plau espereu ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Mida desconeguda"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Informació requerida"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Adreça IP:"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port:"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Informació addicional"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Usuari:"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Resum de l'usuari:"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Hash de l'usuari"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Afegeix"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Velocitat de baixada"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Actual"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Mitjana total"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Mitjana de la sessió"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Velocitat de pujada"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Connexions"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Baixades actives"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Connexions actives (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Pujades actives"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Arbre d'estadístiques"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Nom d'usuari:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Resum de l'usuari:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Programari:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Software del client"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Versió del client"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID de l'usuari"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP del servidor"
+
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Nom del servidor"
+
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Ofuscació"
+
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr "Extensions del protocol"
 
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Versió:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Adreça IP:"
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID de l'usuari:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP del servidor:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Nom del servidor:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Ofuscació:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
-
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Transferències amb el client"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Petició actual:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Mitjana de pujada:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Mitjana de baixada:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Pujat (sessió):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Baixat (sessió):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Pujat (total):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Baixat (total):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Petició actual"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Mitjana de pujada"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Mitjana de baixada"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Pujat (sessió)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Baixat (sessió)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Pujat (total)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Baixat (total)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Puntuacions"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modificador PU/BA:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Identificació segura:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Posició a la cua:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Puntuació (a la cua):"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Identificació segura"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Posició a la cua"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Puntuació (a la cua)"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Sobrenom"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - el Mule multi-plataforma"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Idioma: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "El retard abans de mostrar els consells (notes emergents)."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Açò especifica la llengua que s'usarà."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Comprova si hi ha noves versions a l'inici"
-
-#: src/muuli_wdr.cpp:1218
-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
+msgid "Periodically check for a new version"
+msgstr "Comprova periòdicament si hi ha una versió nova"
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr "Si ho activeu, l'aMule comprovarà si hi ha una versió nova en iniciar-se i un cop al dia mentre s'executi"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
-msgstr ""
+msgstr "Registra una entrada d'inici automàtic per usuari al sistema operatiu perquè l'aMule s'iniciï en iniciar la sessió. Si moveu el binari de l'aMule, executeu-lo un cop manualment després per actualitzar l'entrada."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr "Fa que l'aMule sigui el gestor predeterminat dels enllaços ed2k://, de manera que en clicar-ne un al navegador o al gestor de fitxers s'obri aquí."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr "L'aMule només gestiona els magnet compatibles amb eD2k (que contenen xt=urn:ed2k:). Els magnet de BitTorrent NO són compatibles i, en clicar-los, no passarà res. Si feu servir un client de BitTorrent (Transmission, qBittorrent, etc.), deixeu-ho desactivat."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr "En obrir una col·lecció s'encuen tots els enllaços eD2k que conté. A Windows això afegeix l'aMule a la llista «Obre amb» i només el fa predeterminat si cap altre programa no ha reclamat el tipus de fitxer."
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Inicia minimitzat"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "L'aMule es minimitzarà automàticament a l'inici."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Confirmació per a eixir"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Sol·licita confirmació al sortir."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Habilita la icona d'estat"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 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:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Amaga la finestra de l'aplicació en prémer el botó de tancar"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimitzar a la safata de sistema"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "L'aMule es minimitzarà a la safata de sistema (icona), enlloc de a la barra de tasques (llista de programes)."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "Mostra notificacions en finalitzar les baixades"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "Si s'habilita, l'aMule mostrarà notificacions quan hagin finalitzat les baixades."
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr "Recorda l'historial de cerques"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr "Manté una llista desplegable dels vostres termes de cerca anteriors al camp Nom de la pestanya Cerca. Això recorda les consultes que heu escrit, no els resultats que van retornar."
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
-msgstr "Temps de retard de l'indicador de funció:"
+msgstr "Temps de retard de l'indicador de funció: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "segons"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Selecció del navegador"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Introdueix el nom del teu navegador. Deixa el camp buit per usar el navegador per defecte del sistema."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Explora"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Obre en una nova pestanya si és possible"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Reproductor de vídeo"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
-msgstr "Límits d'ample de banda "
+msgstr "Límits d'ample de banda"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Pujada"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Per posició (slot)"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
-msgstr "Ports "
-
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Port TCP per defecte:"
+msgstr "Ports"
 
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Port UDP per sol·licituds del servidor (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Port UDP extès (Kad / cerca global) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Activa UPnP per redirecció de ports"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnP Port TCP (Opcional):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 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:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr "Vincula a la interfície de xarxa (buit per a qualsevol):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr "Només per a usuaris avançats: fixa tot el trànsit de l'aMule a una sola interfície de xarxa, triada de la llista o escrita pel seu nom (per exemple, tun0, eth0, en0) o índex. A diferència de vincular-se a una IP, això evita que el trànsit s'escapi per la ruta predeterminada; útil amb una VPN. No requereix privilegis elevats."
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Nombre màxim de fonts per descàrrega:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Nombre màxim de connexions simultànies:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Autoconnecta a l'inici"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Reconnecta en perdre la connexió"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Elimina els servidors morts després de"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr "Els servidors estàtics no s'eliminen mai, ni tan sols quan no s'hi pot accedir."
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "intents"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Actualitza automàticament la llista de servidors a l'inici"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Llista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 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:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Actualitza la llista de servidors quan es connecta un client"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Usa el sistema de prioritats"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Usa la comprovació intel·ligent d'ID Baixa en connectar"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Connexió segura"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Autoconnecta només a servidors de la llista estàtica"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Estableix prioritat Alta per als servidors afegits manualment"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Gestió d'Errors Inteligent (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Activa"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Afegeix les noves baixades en mode pausat"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Afegeix les noves baixades amb prioritat automàtica"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Intenta baixar abans les parts inicials i finals"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr "Mode final: canvia a fonts més ràpides per als últims blocs"
+
+#: src/muuli_wdr.cpp
 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:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "De la mateixa categoria"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "En ordre alfabètic"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Preassigna l'espai al disc per als fitxers nous"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Per a fitxers nous reserva l'espai que ocuparà el fitxer complet. Açò redueix la fragmentació"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr "Crea els fitxers nous com a fitxers dispersos"
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr "Els fitxers parcials dispersos només ocupen espai de disc per a les parts ja baixades, de manera que l'espai lliure es va consumint a mesura que el fitxer s'omple. Desactiveu-ho per fer servir un fitxer normal: útil quan els fitxers dispersos no són compatibles o van lents, o quan les eines de còpia de seguretat o de desduplicació els gestionen malament. Només s'aplica quan el nucli s'executa a Windows; a Linux i macOS els fitxers parcials ja són dispersos i aquest paràmetre no té cap efecte."
+
+#: src/muuli_wdr.cpp
 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:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Poseu l'espai mínim de disc desitjat."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Recorda 10 fonts dels fitxers rars (amb < 20 fonts)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Pujades"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Afegeix els nous fitxer compartits amb prioritat automàtica"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Carpeta on desar les descàrregues"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Gestió d'Errors Inteligent (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Activa"
+
+#: src/muuli_wdr.cpp
+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 src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr "Extracció de metadades multimèdia"
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "Extreu la durada, la taxa de bits i el còdec dels fitxers d'àudio i vídeo compartits"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr "Quan s'activa, l'aMule executa ffprobe a cada fitxer multimèdia compartit per omplir les columnes de durada, taxa de bits i còdec que veuen els altres clients quan troben el fitxer en una cerca. Requereix tenir instal·lat ffmpeg (el binari ffprobe)."
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr "Camí a ffprobe:"
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr "Camí complet al binari ffprobe. Deixeu-ho buit perquè l'aMule el detecti automàticament en iniciar-se."
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr "Detecta"
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr "Cerca un binari ffprobe a les ubicacions d'instal·lació estàndard i omple el camp del camí."
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
+"Les baixades completades es desen aquí. Tots els fitxers d'aquesta carpeta es comparteixen automàticament amb altres parells.\n"
+"Si aquesta carpeta també conté fitxers que no voleu compartir, indiqueu una subcarpeta exclusiva per a l'aMule."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
-msgstr ""
-
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Carpeta on desar les descàrregues temporals"
+msgstr "Trieu la carpeta on es desaran les baixades completades. Tots els fitxers d'aquesta carpeta es compartiran amb altres parells."
 
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "Carpetes compartides"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr "(Carpetes compartides pel nucli. Introduïu un camí per afegir-ne una.)"
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr "Camí absolut d'una carpeta a la màquina del nucli, per exemple /home/usuari/compartit"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr "Recursiu"
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr "Comparteix totes les subcarpetes que hi ha a sota, incloses les que es creïn més endavant."
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Esborra"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Per a compartir recursivament feu clic dret sobre el directori)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Comparteix els fitxers ocults"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
-msgstr ""
+msgstr "Torna a examinar automàticament les carpetes compartides per detectar-hi canvis"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
-msgstr ""
+msgstr "Segueix els enllaços simbòlics de les carpetes compartides"
+
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr "Exclou els fitxers que coincideixin amb:"
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr "Patrons de comodins separats per «|», per exemple .DS_Store|Thumbs.db|*.tmp. Els fitxers amb un nom que hi coincideixi no es comparteixen. No es distingeixen majúscules i minúscules."
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr "Els patrons són expressions regulars"
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr "Quan està activat, tot el camp és una sola expressió regular («|» és alternança). Quan està desactivat, és una llista de comodins separats per «|»."
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr "Mostra quants fitxers compartits excloria el patró actual."
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr "Quan els fitxers del nucli connectat són en una altra màquina, feu correspondre un prefix de camí dels que informa amb el lloc des d'on aquest sistema de fitxers és accessible des d'aquí (una compartició de xarxa, per exemple) perquè «Obre» i «Mostra a la carpeta» funcionin."
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr "Correspondències de camins"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr "Prefix remot"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr "Un prefix de camí tal com l'informa el nucli, per exemple /home/usuari/downloads/incoming"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr "Prefix local"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr "On és accessible aquesta mateixa carpeta des d'aquest ordinador, per exemple una compartició de xarxa muntada"
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Gràfics"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Actualitza cada: 5 segs"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Temps per al gràfic de mitjana: 100 mins"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala del Gràfic de Connexions: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Escala del gràfic de descàrrega:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Escala del gràfic de pujada:"
 
-#: src/muuli_wdr.cpp:1660
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Colors: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Fons"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Graella"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Baixada actual"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Mitjana de baixada total"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Mitjana de baixada de la sessió"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Pujada actual"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Mitjana de pujada total"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Mitjana de pujada de la sessió"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Connexions actives"
 
-#: src/muuli_wdr.cpp:1675
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr "Barra de velocitat de la icona d'estat"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Nodes-Kad actuals"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Nodes-Kad funcionant"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Nodes-Kad de la sessió"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Selecciona"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Arbre"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Nombre de versions de client a mostrar (0=il·limitat)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! AVÍS !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Connexions noves màx. / 5 segs"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr "Cerques simultànies de fonts a Kad"
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr "Interval de nova cerca de fonts a Kad (minuts)"
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr "Interval per tornar a demanar fonts (minuts)"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Mida del buffer de fitxer: 240000 bytes"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr "Fes servir MMAP: accés a fitxers mapats en memòria (menys ús de memòria)"
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr "Mapa els fitxers parcials a la memòria en lloc d'emmagatzemar-los temporalment a la memòria dinàmica, cosa que redueix la petjada de memòria del procés. Pot reduir la velocitat de baixada en alguns discos; va millor en amfitrions amb poca memòria o amb molta pujada."
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Mida de la cua de pujades: 5000 clients"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Interval de refresc de la connexió amb el servidor: Inhabilitat"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Inhabilita el mode d'espera programat de l'ordinador"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Aparença a usar: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 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:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Mostra informació estesa a les pestanyes de les categories"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Mostra la versió de l'aplicació al títol"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Mostra les velocitats de transferència al títol"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Abans del nom de l'aplicació"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Després del nom de l'aplicació"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Mostra ample de banda sobrecarregat"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Orientació vertical de la barra d'eines"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr "Ordenació de columnes en directe (reordena les files a mesura que canvien els valors)"
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Cua de descàrregues"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Mostra el percentatge de descàrrega"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Mostra barra de descàrrega"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plana"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Arrodonida"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Auto ordena els fitxers (Alta CPU)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
-msgstr "Paràmetres de la connexió externa "
+msgstr "Paràmetres de la connexió externa"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Accepta connexions externes"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP de la interfície que rep connexions:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Port TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Activa l'encaminament UPnP al port de connexions externes"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Contrasenya"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr "Requereix connexions xifrades (rebutja els clients que no poden xifrar)"
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr "Paràmetres del servidor de l'API de l'aMule"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr "Executa amuleapi (API REST) en iniciar"
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "Port HTTP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr "La interfície on escolta el servidor HTTP d'amuleapi. 127.0.0.1 (predeterminada) només accepta connexions locals; feu servir 0.0.0.0 o una IP concreta per exposar-la a altres amfitrions (definiu una contrasenya d'administrador a sota)."
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr "Escriviu una contrasenya per definir-la o canviar-la. Les contrasenyes desades no es poden mostrar, així que deixar-ho buit manté l'actual."
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "Contrasenya d'administrador"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "Hi ha una contrasenya definida."
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "Activa l'accés de convidat"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr "Les sessions de convidat poden llegir l'estat i els llistats però no poden canviar res. Desactivar-ho esborra la contrasenya de convidat desada."
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "Contrasenya de convidat"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
-msgstr "Paràmetres del servidor web "
+msgstr "Paràmetres del servidor web"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "Executa el servidor web a l'inici"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr "Executa el servidor web a l'inici (obsolet)"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Plantilla web"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Contrasenya de l'administrador:"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Habilita l'usuari convidat"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Contrasenya del convidat:"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 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:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Port TCP del servidor web (Opcional):"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Temps de refresc de la pàgina (en segons):"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Habilita la compressió Gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr "Restableix la pàgina als valors predeterminats"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr "Restableix els paràmetres de la pàgina actual als valors predeterminats."
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Feu clic per a aplicar qualsevol canvi fet a les preferències."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Reinicia qualsevol canvi fet a les preferències."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Títol:"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Comentari:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Dir. d'entrada:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Canvia la prioritat per als nous fitxers assignats:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Dir. d'entrada"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Canvia la prioritat per als nous fitxers assignats"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "No canviar"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Seleccioneu un color per a la Categoria (actualment seleccionat):"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Reinicia"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Seleccioneu un color per a la Categoria (actualment seleccionat)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Feu clic per a reiniciar el registre."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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 URL ... "
+msgstr "Feu clic en aquest botó per a actualitzar la llista de servidors des d'una URL ..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Llista de servidors"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Afegeix un servidor manualment: Nom"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Introduïu el nom del nou servidor"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Introduïu la IP del servidor, fent servir el format x.x.x.x."
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Introduïu el port del servidor."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Registre de l'aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Informació del servidor"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Info. ED2K"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Info. Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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 URL ..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nodes (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Estadístiques de nodes"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Arrancada"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nou node"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Port:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "Inicia des dels clients coneguts"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Desconnecta Kad"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr "Arrenca des d'un node: IP"
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Introduïu aquí la IP del node, fent servir el format x.x.x.x."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Usa la Identificació Segura d'Usuari"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Ofuscació de protocol"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Suport per a l'ofuscació de protocol"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Habilita l'ofuscació de protocol, i permet a l'aMule acceptar connexions ofuscades d'altres clients."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usa l'ofuscació per a les connexions sortints"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "L'aMule usarà l'ofuscació de protocol en connectar amb altres clients/servidors."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Accepta únicament les connexions ofuscades"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "L'aMule només acceptarà les connexions ofuscades. Tindreu menys fonts, però tot el tràfic serà ofuscat"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Tothom"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Ningú"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Qui pot veure els meus fitxers compartits:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Filtratge IP"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtra els clients"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtra els servidors"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Recarrega la llista"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "Adreça:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Actualitza ara"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Actualitza automàticament a l'inici"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Nivell de filtratge:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Filtra sempre les IP LAN"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Gestió paranoica de les IP no corresponents"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr "Rebutja un paquet quan la seva IP d'origen difereix de la IP que el client declara (una comprovació antisuplantació). Desactiveu-ho només si provoca problemes de connexió."
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Usa l'ipfilter.dat del sistema si està disponible"
 
-#: src/muuli_wdr.cpp:2441
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Si no es troba l'ipfilter.dat local, permet l'ús del fitxer ipfilter del sistema."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Habilita la signatura en línia"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Habilita l'escriptura del fitxer de signatura, que altres aplicacions externes poden usar per a crear signatures i similars."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Freqüència d'actualització (segs):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 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:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Desa el fitxer de signatura en línia a: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "Feu clic per a seleccionar el directori que conté els fitxers de signatura en línia."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Mostra les banderes dels països per als clients"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
-msgstr ""
+msgstr "Mostra la columna de la bandera del país a les vistes de transferències, cua i cerca. Requereix una base de dades GeoIP MMDB vàlida (vegeu més avall)."
 
-#: src/muuli_wdr.cpp:2520
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Database"
-msgstr "Velocitat:"
+msgstr "Base de dades"
 
-#: src/muuli_wdr.cpp:2536
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Source:"
-msgstr "Fonts"
+msgstr "Font:"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
-msgstr ""
+msgstr "DB-IP (gratuït, sense compte)"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
-msgstr ""
+msgstr "MaxMind GeoLite2 (gratuït, cal compte)"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
-msgstr ""
+msgstr "URL personalitzat"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
-msgstr ""
+msgstr "Trieu quin proveïdor subministra la base de dades GeoIP MMDB. DB-IP és el predeterminat: no cal compte. MaxMind requereix un compte gratuït i una clau de llicència. Feu servir URL personalitzat per apuntar a qualsevol altre servidor MMDB (per exemple, una rèplica local)."
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
 "IP-to-Country data by DB-IP.com - https://db-ip.com\n"
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
+"No cal cap configuració.\n"
+"\n"
+"Dades d'IP a país de DB-IP.com - https://db-ip.com\n"
+"Llicència: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
-msgstr ""
+msgstr "Clau de llicència:"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4260,520 +5419,590 @@
 "License: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
+"Registreu-vos per obtenir un compte gratuït de MaxMind i genereu una clau de llicència:\n"
+"https://www.maxmind.com/en/geolite2/signup\n"
+"\n"
+"Aquest producte inclou dades GeoLite2 creades per MaxMind - https://www.maxmind.com\n"
+"Llicència: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
+"Requereix atribució i registre de compte; actualitzeu-lo com a mínim cada 30 dies."
 
-#: src/muuli_wdr.cpp:2595
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
-msgstr "Baixant: "
+msgstr "URL de baixada:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
+"Ha d'apuntar a un fitxer .mmdb o a un .gz / .tar.gz que en contingui un.\n"
+"L'URL pot incloure credencials (https://usuari:contrasenya@amfitrio/...).\n"
+"Els termes de llicència i atribució els fixa l'URL d'origen; sou vosaltres els responsables."
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
-msgstr ""
+msgstr "Baixa la base de dades GeoIP de la font seleccionada."
 
-#: src/muuli_wdr.cpp:2616
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr "Actualitza automàticament a l'inici"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
-msgstr ""
+msgstr "Torna a baixar la base de dades GeoIP de la font seleccionada cada cop que s'inicia l'aMule."
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtra els missatges entrants (excepte el xat actual):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtra tots els missatges"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 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:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtra els missatges dels clients desconeguts"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtra els missatges que continguin (useu ',' per a separar):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Mostra els missatges rebuts en el registre"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Comentaris"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtra els comentaris que continguin (useu ',' per a separar):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Habilita l'autenticació"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Habilita/inhabilita l'autenticació amb usuari/contrasenya"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Nom d'usuari:"
-
-#: src/muuli_wdr.cpp:2689
-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:2691
-msgid "Password:"
-msgstr "Contrasenya:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "La contrasenya per a connectar al servidor intermediari"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Habilita el servidor intermediari"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Habilita/inhabilita el suport per a servidor intermediari"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Tipus de servidor:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Servidor intermediari:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Tipus de proxy"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Servidor proxy"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "El nom del servidor intermediari"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Port del servidor:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Port del proxy"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "El port del servidor intermediari"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Habilita l'autenticació"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Habilita/inhabilita l'autenticació amb usuari/contrasenya"
+
+#: src/muuli_wdr.cpp
+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
+msgid "The password to use to connect to the proxy"
+msgstr "La contrasenya per a connectar al servidor intermediari"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Connecta a:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Entra a l'aMule remot"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Nom d'usuari"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Recorda la configuració"
 
-#: src/muuli_wdr.cpp:2766
-#, fuzzy
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "Xifra la connexió (recomanat)"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
-msgstr "Usa la compressió gzip"
+msgstr "Força la compressió ZLIB"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Habilita la depuració-registre detallats."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Només al fitxer de registre"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Categories de missatge:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Esperant..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Afegeix"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Reintenta"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Esborra"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Tipus d'esdeveniments"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr "Estadístiques i clients en cua per als fitxers seleccionats: Sessió / Total"
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Pujades actives"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Percentatge del total de fitxers"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Mostra els clients per"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Tots els fitxers"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Fitxers seleccionats"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Només pujades actives"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Mostra els clients per"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Recarrega:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Recarrega els compartits"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Envia"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Envia el missatge especificat."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Tanca aquesta sessió de xat."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Connecta amb qualsevol servidor i/o Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "Cancel·la %s"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Compartits"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "Desconnecta %s"
 
-#: src/OScopeCtrl.cpp:242
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "Connecta %s"
+
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Inhabilitat %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
 msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "TiB"
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/seg"
 msgstr1 "bytes/seg"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "MiB/s"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "segs"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "mins"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "hores"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Dies"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "dies"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr "%s:"
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "tot"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "tota la resta"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Incomplet"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Aturat"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Vídeos"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arxius"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Documents"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Actiu"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Directori de configuració: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr "Aquesta font no té la part"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr "Tant vós com aquesta font teniu la part"
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr "S'està baixant d'aquesta font ara"
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr "La pròxima part que es demanarà a aquesta font"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr "Aquesta font té la part i encara la necessiteu"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr "Aquest parell ja té la part"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr "Aquest parell no té la part"
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr "Cap altra font no té aquesta part"
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr "Una altra font té aquesta part"
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr "%u o més altres fonts tenen aquesta part"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr "Ja s'ha tornat a llegir i s'ha calculat el hash"
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr "Encara per llegir"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr "Un bloc per cada part del fitxer que s'està baixant."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr "Un bloc per cada part del fitxer compartit."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Un bloc per cada part del fitxer compartit, acolorit segons quantes altres fonts la tenen."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Un bloc per cada part del fitxer compartit, que mostra fins on ha llegit el recàlcul del hash."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr "Al mig, enfosquint-se a mesura que s'afegeixen altres fonts"
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Esperant que el fil de conversió de fitxers de parts acabi..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "S'està important %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "S'està llegint la carpeta temporal"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "S'està recuperant la informació bàsica del fitxer d'informació de baixada"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "S'està creant el fitxer de destí"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, 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:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "S'està recuperant informació del fitxer de baixada font"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "S'està afegint la baixada i desant un nou fitxer de parts"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importa fitxers de parts"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Estat"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Resum del fitxer"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Disc: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
-#, fuzzy
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Voleu que s'esborrin els fitxers originals de les baixades importades amb èxit?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Voleu esborrar les fonts?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "ERROR: No s'ha pogut crear el fitxer de parts"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:409
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr "ERROR: el fitxer part.met té mida 0: %s ==> %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, 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:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Error: %s (%s) és corrupte (etiquetes incorrectes: %s), no s'ha pogut carregar el fitxer."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "ERROR: %s (%s) és corrupte (compte d'etiquetes erroni), no s'ha pogut carregar el fitxer."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "S'està intentant recuperar la informació del fitxer..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "S'està recuperant un fitxer sense nom - s'intentarà recuperar com a RecoveredFile.dat"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 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/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "No s'ha pogut recuperar la informació del fitxer :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "No s'ha pogut obrir %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "AVÍS: %s pot ser corrupte (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, 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:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "ERROR E/S mentre es desava un fitxer de parts: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
-msgstr ""
+msgstr "S'han escrit 0/desconegut bytes a «%s»; es conserva el .part.met existent."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "%i llavor font desada per al fitxer de parts: %s (%s)"
 msgstr1 "%i llavors fonts desades per al fitxer de parts: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "No es pot llegir el fitxer de llavors per al fitxer de parts: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "S'ha trobat una part corrupta (%d) en el fitxer de parts %d %s - FileResultHash |%s| FileHash |%s|"
 msgstr1 "S'ha trobat una part corrupta (%d) en els fitxers de parts %d %s - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "S'ha trobat una part completa (%i) a %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "S'ha acabat de refer els resums de %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "S'ha produït un error inesperat mentre es completava %s. S'ha pausat el fitxer."
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "S'ha acabat de baixar: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4782,307 +6011,153 @@
 "S'ha acabat de baixar:\n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "S'està esborrant el fitxer: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, 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:2468
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
-msgstr ""
+msgstr "La part %u de «%s» està marcada com a completa però el fitxer parcial és més curt del que s'esperava (té %llu bytes, en calen %llu); es torna a obrir el buit per tornar-lo a baixar."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "S'ha arribat al final del fitxer (EOF) mentre es calculava el resum de la part baixada %u amb longitud %u (màx %u) del fitxer de part '%s' amb longitud %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Corrupció a la part baixada %i del fitxer: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Assignant"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Espai en disc insuficient"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Baixat"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ERROR: No s'ha pogut obrir el fitxer part '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Predeterminat"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanès"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr "Intercanvi de fonts ampliat"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr "Travessia de NAT (uTP)"
+
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr "Consulta d'informació de company"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr "Travessia de NAT (QUIC)"
 
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Àrab"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturià"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Basc"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Búlgar"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Català; Valencià"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Xinès (Simplificat)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Xinès (Tradicional)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Croat"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Txec"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danès"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Holandès"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Anglès (R.U.)"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Anglès (R.U.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estonià"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finès"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francès"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Gallec"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Alemany"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grec"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebreu"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Hongarès"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italià"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italià (Suïssa)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japonès"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Coreà"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituà"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Noruec"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polonès"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portuguès"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portuguès (Brasil)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Romanès"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Rus"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Eslovè"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Espanyol; Castellà"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Suec"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turc"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ucranià"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Canvi d'idioma"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "No hi ha traduccions instal·lades per a l'aMule"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Sense idiomes disponibles"
-
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "No hi ha opcions disponibles"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr "S'ha trobat una correspondència de camins no vàlida; s'omet"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
-msgstr "Categoria invàlida trobada, omitint"
+msgstr "S'ha trobat una categoria no vàlida; s'omet"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "S'usarà el port per defecte (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Connexió"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Directoris"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Servidors"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Fitxers"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Seguretat"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interfície"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
-msgstr ""
+msgstr "IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Servidor intermediari"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtres"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Control remot"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Signatura en línia"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Esdeveniments"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Depuració"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5092,15 +6167,15 @@
 "    %PARTFILE - camí complet al fitxer\n"
 "    %PARTNAME - només el nom del fitxer"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
-msgstr ""
+msgstr "La compatibilitat amb la icona de la safata requereix libayatana-appindicator3 en temps de compilació."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
-msgstr ""
+msgstr "No disponible a Wayland: el protocol no informa de quan es minimitza una finestra, així que aquesta opció no pot interceptar el botó de minimitzar del sistema. Alternativa: executeu l'aMule amb `GDK_BACKEND=x11` per fer servir XWayland."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5116,26 +6191,42 @@
 "L'aMule anirà bé sense canviar cap\n"
 "d'aquests paràmetres."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "El tipus de servidor intermediari al que connecteu"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "No hi ha cap contrasenya definida."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "L'accés de convidat necessita una contrasenya. Escriviu-ne una al camp de contrasenya de convidat, o desmarqueu Activa l'accés de convidat."
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5143,31 +6234,43 @@
 "S'ha de reiniciar l'aMule per a habilitar aquests canvis:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- El port TCP ha canviat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- El port UDP ha canviat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr "- S'ha canviat la vinculació a la interfície de xarxa.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- S'ha canviat el port de connexió externa.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- S'ha canviat l'acceptació de la connexió externa.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- S'ha canviat la interfície de connexió externa.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- S'ha canviat el suport d'ofuscació de protocol.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr "- S'ha canviat la configuració del proxy (necessària per a les transferències HTTP).\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr "- S'ha canviat la configuració d'amuleapi.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5175,27 +6278,32 @@
 "La llista d'actualització de servidors és buida.\n"
 "L'actualització de servidors a l'inici serà desactivada."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr "La contrasenya d'amuleapi no s'ha pogut desar: %s"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- L'idioma ha canviat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- El directori temporal ha canviat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- Xarxa ED2K habilitada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr "El patró d'exclusió de fitxers compartits no és una expressió regular vàlida. El filtre s'ha deixat desactivat."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "L'expressió regular no és vàlida"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5203,7 +6311,7 @@
 "Les xarxes eD2k i Kad estan inhabilitades.\n"
 "No podreu connectar fins que n'habiliteu almenys una."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5211,7 +6319,7 @@
 "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:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5221,20 +6329,66 @@
 "HEU de reiniciar l'aMule ara mateix.\n"
 "Si no reinicieu ara, no vos queixeu dels possibles problemes.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
-msgstr ""
+msgstr "No s'ha pogut registrar l'aMule per iniciar-se en iniciar la sessió. Pot ser que el magatzem d'inici automàtic sigui de només lectura."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
-msgstr ""
+msgstr "No s'ha pogut eliminar l'entrada d'inici automàtic en iniciar la sessió."
 
-#: src/PrefsUnifiedDlg.cpp:1098
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
-msgstr "Autorefresc iniciat"
+msgstr "Inici automàtic"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr "Registra el tipus de fitxer"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr "Registra el gestor d'URL"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr "L'aMule només gestiona els magnet compatibles amb eD2k. Si substituïu el gestor de magnet actual (%s), els enllaços magnet de BitTorrent deixaran de funcionar; l'aMule no pot baixar contingut de BitTorrent. Voleu continuar?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr "Actualment una altra aplicació obre els fitxers .emulecollection (%s). La voleu substituir per l'aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr "Actualment una altra aplicació és el gestor predeterminat d'aquests enllaços (%s). La voleu substituir per l'aMule?"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "No s'ha pogut registrar l'aMule per als fitxers .emulecollection. Pot ser que el magatzem de registre sigui de només lectura."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr "No s'ha pogut eliminar el registre del tipus de fitxer."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "No s'ha pogut registrar l'aMule com a gestor d'URL. Pot ser que el magatzem de registre sigui de només lectura."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr "No s'ha pogut eliminar el registre del gestor d'URL."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "El servidor web i l'API de l'aMule requereixen que les connexions externes estiguin activades."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr "El servidor web de l'aMule està obsolet. Considereu executar l'API de l'aMule en lloc seu."
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5244,41 +6398,64 @@
 "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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Fitxers temporals"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Fitxers entrants"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Signatures en línia"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Carpeta per a %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Excloiria %u de %u fitxer compartit"
+msgstr1 "Excloiria %u de %u fitxers compartits"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Explora per a trobar un reproductor de vídeo"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Selecciona navegador"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr "Seleccioneu el binari ffprobe"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Executable%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr "No s'ha trobat ffprobe al PATH ni a les ubicacions d'instal·lació estàndard. Instal·leu ffmpeg (que inclou ffprobe) o feu servir Navega per triar un binari manualment."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr "Voleu restablir els paràmetres d'aquesta pàgina als valors predeterminats?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr "Restableix els valors predeterminats"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Edita la llista de servidors"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5286,1215 +6463,1459 @@
 "Afegiu adreces URL d'on baixar el fitxer server.met.\n"
 "Només una adreça a cada línia."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
-msgstr ""
+msgstr "Ha fallat l'actualització d'IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
-msgstr ""
+msgstr "Dades de MaxMind GeoLite2"
 
-#: src/PrefsUnifiedDlg.cpp:1568
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
-msgstr "Fonts completes"
+msgstr "Font personalitzada"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
-msgstr ""
+msgstr "Dades de DB-IP.com"
 
-#: src/PrefsUnifiedDlg.cpp:1590
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Status: Loaded%s"
-msgstr "Estat:"
+msgstr "Estat: carregat%s"
 
-#: src/PrefsUnifiedDlg.cpp:1593
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Status: Loaded%s - %s"
-msgstr "Estat:"
+msgstr "Estat: carregat%s - %s"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
-msgstr ""
+msgstr "Estat: no s'ha pogut carregar; feu clic a «Actualitza ara» per refrescar-ho."
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
-msgstr ""
+msgstr "Estat: no s'ha trobat; feu clic a «Actualitza ara» per baixar-ho."
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Retard de l'actualització: %d seg"
 msgstr1 "Retard de l'actualització: %d segs"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Temps per al gràfic de mitjanes: %d min"
 msgstr1 "Temps per al gràfic de mitjanes: %d mins"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Escala del gràfic de connexions: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Mida de la memòria intermèdia de fitxer: %d byte"
 msgstr1 "Mida de la memòria intermèdia de fitxer: %d bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Mida de la cua de pujada: %d client"
 msgstr1 "Mida de la cua de pujada: %d clients"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Interval de refresc de la connexió amb el servidor: %d minut"
 msgstr1 "Interval de refresc de la connexió amb el servidor: %d minuts"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Interval de refresc de la connexió amb el servidor: Inhabilitat"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "inhabilitat"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Executa una ordre per a l'esdeveniment '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Activa l'execució d'ordres al nucli"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Odre del nucli:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Activa l'execució d'ordres a la interfície gràfica"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Ordre de la IGU:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Les següents variables seran reemplaçades:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
+"Les carpetes següents semblen ubicacions del sistema o sensibles:\n"
+"\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
-msgstr ""
+msgstr "Compartir-les recursivament publicarà tots els fitxers que contenen a les xarxes eD2k/Kad. Segur que ho voleu fer?"
 
-#: src/PrefsUnifiedDlg.cpp:1959
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
-msgstr "Carpetes compartides"
+msgstr "Confirmeu les carpetes compartides"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-#, fuzzy
-msgid "Reloading shared files…"
-msgstr "Recarrega els compartits"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
+msgstr "S'estan tornant a carregar els fitxers compartits..."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
+msgstr "S'estan cercant subdirectoris..."
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:1994
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
-msgstr "Carpetes compartides"
+msgstr "S'estan actualitzant les carpetes compartides"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
-msgstr ""
+msgid "Scanned %u directories..."
+msgstr "S'han examinat %u directoris..."
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Recarrega la llista de fitxers compartits."
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr "Carpeta compartida"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr "Cal omplir tant el prefix remot com el local."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr "Aquest prefix remot ja té una correspondència."
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr "Trieu la carpeta local"
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "Esborra l'historial de cerques"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr "Voleu esborrar l'historial de cerques desat? Això no es pot desfer."
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Avís de cerca"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "És impossible cercar quan l'eD2k i el Kademlia estan inhabilitats."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "Error en la cerca"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
+"Encara s'està fent una cerca eD2k. Si n'inicieu una de nova, s'aturarà, perquè el protocol eD2k només permet una cerca alhora.\n"
+"\n"
+"Els resultats ja trobats es conserven; només deixen d'arribar-ne de nous.\n"
+"\n"
+"Voleu iniciar la cerca nova igualment?"
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr "Cerca en curs"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Avís de cerca"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Principal"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr "Només es desen les %u cerques obertes més recents de %u a %s."
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr "Només es desen els primers %u resultats de %u de la cerca «%s»."
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "AVÍS: la llista de cerques desada està malmesa, conté una capçalera no vàlida."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Entrada no vàlida a la llista de cerques desada; el fitxer podria estar malmès"
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "No hi ha cap paraula clau per a la cerca Kad - s'està avortant"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Error inesperat mentre s'intentava fer una cerca Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "Resum del fitxer"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr "S'ha esgotat el temps de la cerca: el servidor no ha respost."
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr ""
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Cerca a Kad: s'han demanat més resultats a un parell més."
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Sense Valorar"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Cerca a Kad: no queda cap parell a qui tornar a demanar més resultats (s'ha arribat al límit o encara no hi ha respostes)."
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr ""
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "Error %u: %s\n"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Baixa a la categoria"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "Resum del fitxer"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Obté %s per aquest fitxer"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "Desplega-ho tot"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "Plega-ho tot"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Cerca fitxers relacionats (eD2k, servidor local)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Marca com a fitxer conegut"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Copia l'enllaç eD2k al porta-retalls"
 
-#: src/SearchListCtrl.cpp:811
-#, fuzzy
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Copia els enllaços eD2k al porta-retalls"
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
-msgstr "Esteu connectat al servidor què intenteu eliminar. Si us plau, primer desconnecteu-vos."
+msgstr "Actualment no esteu connectat a cap servidor que admeti la funció de cerca de fitxers relacionats"
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Cancel·lat"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Nou"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr "en execució"
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "acabat"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr "inactiu"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr "Cerca %u: %s, %u %% (%u resultats)\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr "Cerca %u «%s»: %s, %u %% (%u resultats)\n"
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr "La cerca ha caducat o l'ID és desconegut. Inicieu-ne una de nova.\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Progrés de la cerca: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Progrés de cerca no disponible"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr "No hi ha cap cerca de la qual informar.\n"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "No s'ha pogut connectar amb cap dels servidors estàtics ofuscats de la llista. Es fa una altra passada sense ofuscació."
+
+#: src/ServerConnect.cpp
 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
+msgid "Failed to connect to all static servers listed."
+msgstr "No s'ha pogut connectar amb cap dels servidors estàtics de la llista."
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr "No s'ha pogut connectar amb cap dels servidors de la llista."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Es reintentarà la connexió al servidor en %d segon"
+msgstr1 "Es reintentarà la connexió al servidor en %d segons"
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Connectat a %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Connexió establerta amb: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "S'ha perdut la connexió a %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) sembla estar aturat."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) sembla estar ple."
 
-#: 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"
-msgstr0 "Es reintentarà la connexió al servidor en %d segon"
-msgstr1 "Es reintentarà la connexió al servidor en %d segons"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "S'ha perdut la connexió"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "No s'ha pogut connectar a %s (%s:%i)."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "ERROR: Sòcol invàlid en comprovar el temps d'espera"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, 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:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
-msgstr "Resposta de DNS rebuda a destemps, omitint."
+msgstr "S'ha rebut una resposta de DNS a destemps; es descarta."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "S'està carregant el fitxer server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "No s'ha trobat el fitxer server.met!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "No s'ha pogut obrir el server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "S'ha trobat %i servidor al server.met"
 msgstr1 "S'han trobat %i servidors al server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d servidor afegit"
 msgstr1 "%d servidors afegits"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Error: el fitxer 'server.met' està corrupte: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "Error d'E/S mentre es llegia el fitxer 'server.met': "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Esteu connectat al servidor què intenteu eliminar. Si us plau, primer desconnecteu-vos."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "No s'ha pogut obrir '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "No s'ha pogut desar el server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Error d'E/S en escriure «server.met»: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Adreça invàlida"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, 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:884
+#: src/ServerList.cpp
 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 "No s'ha trobat cap adreça d'una llista de servidors al fitxer 'addresses.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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Comença a baixar la llista de servidors des de %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "AVÍS: s'ha especificat una URL invàlida per a l'actualització automàtica de servidors: %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "No s'ha trobat una URL per a baixar un server.met al fitxer addresses.dat"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, 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:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "El servidor local està filtrat pels filtres IP, s'està reconnectant a un servidor diferent!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Descripció"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Usuaris"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "Usuaris màxims"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Estàtic"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versió"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr "Límit tou de fitxers"
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr "Límit dur de fitxers"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
-msgstr ""
+msgstr "Indicadors TCP"
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
-msgstr ""
+msgstr "Indicadors UDP"
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Esteu intentant esborrar un servidor al què esteu connectat. Si us plau, desconnecteu-vos primer. NO s'ha esborrat el servidor."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Nom desconegut)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "ms"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Servidors (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Servidor"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Connecta al servidor"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Marca el servidor com a estàtic"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Marca el servidor com a no estàtic"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Marca els servidors com a estàtics"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Marca els servidors com a no estàtics"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Esborra el servidor"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Esborra els servidors"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Esborra tots els servidors"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Copia els enllaços eD2k al porta-retalls"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Reconnecta amb el servidor"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Esteu segur que voleu esborrar tots els servidors?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Esteu segur que voleu esborrar el servidor seleccionat?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Esteu segur que voleu esborrar els servidors seleccionats?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ERROR: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "AVÍS: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
-msgstr ""
+msgstr "El servidor %s (%s) ha rebutjat el nostre inici de sessió (no s'ha assignat cap ID de client). S'està desconnectant."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "La nova ID d'usuari és %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "AVÍS: Heu rebut una ID Baixa!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPer a rebre més informació, si us plau visiteu https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "S'ha rebut una informació desconeguda del servidor! - massa curta"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "S'han rebut %d servidor nou"
 msgstr1 "S'han rebut %d servidors nous"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "S'ha desat la llista de servidors."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "El servidor ha rebutjat l'última ordre"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "S'ha rebut un paquet fals del servidor: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "L'IP del servidor %s (%s) està filtrada.  No es connectarà."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "S'està utilitzant l'ofuscació de protocol."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "S'està connectant a %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "Registre de l'aMuleGUI"
+
+#: src/ServerWnd.cpp
 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/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 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:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Estat eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
-#, fuzzy
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
-msgstr "Estat de la connexió:"
+msgstr "Tipus de connexió:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "Connectat des de:"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Estat Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Executant en mode LAN (xarxa d'àrea local)"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Funcionant"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "ID del client Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Estat:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Estat de la connexió:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Estat de la connexió UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Estat rere-tallafocs: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Cap amic necessari - Port TCP obert"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Cap amic necessari - Port UDP obert"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Cap amic"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Connectant amb un amic"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Connectat amb l'amic a %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Adreça IP:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Fonts indexades:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Paraules clau indexades:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Notes indexades:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Càrrega indexada:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Mitjana d'usuaris:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Mitjana de fitxers:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Aturat"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr "Vigilant de directoris compartits: desbordament o error del rerefons (%s); es recorre a una recàrrega completa"
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 "Vigilant de directoris compartits: s'ha trobat %u subdirectori nou des de l'última execució; es tornen a examinar les comparticions"
+msgstr1 "Vigilant de directoris compartits: s'han trobat %u subdirectoris nous des de l'última execució; es tornen a examinar les comparticions"
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr "Vigilant de directoris compartits: el rerefons ha descartat esdeveniments; es força una recàrrega completa dels fitxers compartits per tornar a sincronitzar"
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Afegint fitxer %s a compartits"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "S'ha trobat %i fitxer compartit"
 msgstr1 "S'han trobat %i fitxers compartits"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "S'ha trobat %i fitxer compartit conegut, %i desconeguts"
-msgstr1 "S'han trobat %i fitxers compartits coneguts, %i desconeguts"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 "S'ha exclòs %i fitxer de la compartició pel filtre"
+msgstr1 "S'han exclòs %i fitxers de la compartició pel filtre"
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "ERROR: S'ha intentat compartir %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
-msgstr "Carpeta compartida no trobada, omitint: %s"
+msgstr "No s'ha trobat la carpeta compartida; s'omet: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "No s'ha trobat cap fitxer en el directori: %s"
+msgid "Shared directory not readable, skipping: %s"
+msgstr "No es pot llegir la carpeta compartida; s'omet: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Nom d'usuari"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr "L'extracció de metadades multimèdia està desactivada a les preferències, així que no hi ha res per tornar a extreure."
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Velocitat de baixada"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 "S'estan tornant a extreure les metadades multimèdia de %u fitxer compartit"
+msgstr1 "S'estan tornant a extreure les metadades multimèdia de %u fitxers compartits"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Velocitat de pujada"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "Ara es comparteix el fitxer: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "S'ha deixat de compartir el fitxer eliminat: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "S'ha deixat de compartir %u fitxer d'un directori eliminat: %s"
+msgstr1 "S'han deixat de compartir %u fitxers d'un directori eliminat: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Parts disponibles"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Ara es comparteix %u fitxer trobat en un directori compartit nou"
+msgstr1 "Ara es comparteixen %u fitxers trobats en directoris compartits nous"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "S'ha descobert %u fitxer compartit nou"
+msgstr1 "S'han descobert %u fitxers compartits nous"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Nom d'usuari"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr "Parts al parell"
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Estat de pujada"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "Estat remot"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr "Origen"
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Nom de fitxer local"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Llista de fitxers compartits"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Peticions"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr "Disponibilitat de fonts"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Peticions acceptades"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Dades transferides"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Ràtio"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Parts obtingudes"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Fonts completes"
-
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Ubicació"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Compartits"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Afegeix comentari / valoració"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Edita comentari / valoració"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Reanomena"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr "Verifica les dades locals"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr "Torna a extreure les &metadades multimèdia"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Afegeix els fitxers de la col·lecció a les transferències"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Copia l'enllaç en format &Magnet al porta-retalls"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Copia l'enllaç eD2k al porta-retalls (&Font)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 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:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Copia l'enllaç eD2k al porta-retalls (&Nom de l'ordinador)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 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:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Copia l'enllaç eD2k al porta-retalls (amb l'informació &AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Copia l'enllaç eD2k al porta-retalls (informació &AICH + font)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr "Exporta els fitxers seleccionats a una emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr "La verificació de dades locals al fitxer parcial no és compatible actualment: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 "Metadades multimèdia: s'omet %u baixada incompleta"
+msgstr1 "Metadades multimèdia: s'ometen %u baixades incompletes"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 "Metadades multimèdia: s'omet %u fitxer que no és d'àudio ni de vídeo"
+msgstr1 "Metadades multimèdia: s'ometen %u fitxers que no són d'àudio ni de vídeo"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 "Voleu tornar a extreure les metadades multimèdia de %u fitxer?"
+msgstr1 "Voleu tornar a extreure les metadades multimèdia de %u fitxers?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 "S'ometrà %u baixada incompleta."
+msgstr1 "S'ometran %u baixades incompletes."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 "%u fitxer no és d'àudio ni de vídeo i s'ometrà."
+msgstr1 "%u fitxers no són d'àudio ni de vídeo i s'ometran."
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr "Això s'executa en segon pla. El progrés s'informa al registre."
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr "Torna a extreure les metadades multimèdia"
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Necessiteu ID Alta per crear un enllaç font vàlid"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr "Exporta a emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr "No hi ha cap fitxer seleccionat per exportar."
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr "Col·leccions d'eMule (*.emulecollection)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr "«%s» ja existeix. El voleu sobreescriure?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "No s'ha pogut escriure el fitxer de col·lecció «%s»."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "S'ha exportat %u fitxer compartit a «%s»."
+msgstr1 "S'han exportat %u fitxers compartits a «%s»."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Mida total dels fitxers compartits: %s (%s completats)"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Mida total dels fitxers compartits: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Fitxers compartits (%i, calculant el hash de %u més)"
+msgstr1 "Fitxers compartits (%i, calculant el hash de %u més)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Fitxers compartits (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Fitxer de parts"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "S'estan tornant a carregar els fitxers compartits: %u fitxers examinats"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr "Estat de les parts"
+
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Nom de fitxer remot"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Dades pujades (sessió (total)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Sobrecàrrega total (paquets): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Sobrecàrrega per peticions de fitxers (paquets): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Sobrecàrrega en l'intercanvi de fonts (paquets): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Sobrecàrrega del servidor (paquets): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Sobrecàrrega Kad (paquets): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Excedent per xifrat (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Pujades actius: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Pujades en espera: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Total de sessions de pujada resoltes: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Total de sessions de pujada fallades: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Temps mitjà de pujada: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Dades baixades (sessió (total)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Fonts trobades: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Baixades actives (trossos): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Raó PU:BA de la sessió (total): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Raó de baixada mitjana (Sessió): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Raó de pujada mitjana (Sessió): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Raó de baixada màxima (Sessió): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Raó de pujada màxima (Sessió): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Reconnexions: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Temps des de la primera transferència: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Connectat al servidor des de fa: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Connexions actives (aprox.): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "S'ha arribat al límit de connexions màxim: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Mitjana de connexions (aprox.): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Pic de connexions (aprox.): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Clients"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Desconegut: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtrat: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Expulsat: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr "Adreces expulsades de Kad: %s"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Total: %i Coneguts: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Servidors funcionant: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Servidors que han fallat: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Total: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Servidors esborrats: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Servidors filtrats: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Usuaris en servidors funcionant: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Fitxers en servidors funcionant: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Usuaris totals: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Fitxers totals: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Càrrega del servidor: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Fitxers compartits: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Mida total dels fitxers compartits: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Mida mitjana de fitxer: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Sistema operatiu"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "No s'ha rebut"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Connexions actives (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "No disponible"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Mai"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "L'ordre '%s' amb pid '%d' ha finalitzat amb el codi d'estat '%d'."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Executa <str> i surt."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr "Separa els camps de la llista amb espais, com abans, en lloc de tabuladors."
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "S'està processant per resum: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "S'està processant per nom del fitxer: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Número invàlid\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
-"No s'ha definit cap tipus de cerca.\n"
-"Escriviu 'help search' per obtenir més ajuda.\n"
+"La sintaxi del filtre de cerca no és vàlida.\n"
+"Escriviu «help search» per obtenir més ajuda.\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
-"No s'ha definit cap tipus de cerca.\n"
-"Escriviu 'help search' per obtenir més ajuda.\n"
+"No s'ha indicat cap paraula clau de cerca.\n"
+"Escriviu «help search» per obtenir més ajuda.\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6502,76 +7923,80 @@
 "No s'ha definit cap tipus de cerca.\n"
 "Escriviu 'help search' per obtenir més ajuda.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Baixant el fitxer: %lu %s\r\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "La petició ha fallat amb un error desconegut."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "La operació ha finalitzat amb èxit."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "La petició ha fallat amb el següent error: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "El filtre IP per a clients és: %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Desactivat"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Activat"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "El filtre IP per a servidors és: %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "El nivell actual del filtre IP és %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr "Límits d'amplada de banda: pujada: %u KiB/s, baixada: %u KiB/s.\n"
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr "La rotació de fonts del mode final és %s.\n"
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr "S'ha iniciat la cerca (id %u).\n"
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Connectat a %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Connectant"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "protegit per un tallafocs"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "correcte"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6580,7 +8005,7 @@
 "\n"
 "Baixada:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6589,7 +8014,7 @@
 "\n"
 "Pujada:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6598,7 +8023,7 @@
 "\n"
 "Clients a la cua:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6607,38 +8032,33 @@
 "\n"
 "Fonts totals:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Fitxer de parts"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Número de resultats de la cerca: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Progrés de la cerca: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Progrés de cerca no disponible"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, 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:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Mostra la informació d'estat resumida."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 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:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Mostra l'arbre d'estadístiques complet."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6652,11 +8072,11 @@
 "\n"
 "Exemple: 'statistics 5' només mostrarà les 5 versions més usades de cada tipus de client.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Atura l'aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6666,35 +8086,35 @@
 "Açò també aturarà el client de text, ja que no és pot usar sense\n"
 "haver un nucli en execució.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Recarrega l'objecte donat."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
-msgstr "Recarrega la llista de fitxers compartits."
+msgstr "Torna a carregar la llista de fitxers compartits."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Recarrega la taula de filtrat IP."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Recarrega la taula de filtrat IP actual."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Recarrega la taula de filtrat IP des d'una URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 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:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Connecta a la xarxa."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6706,35 +8126,35 @@
 "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:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Connecta només a eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Connecta només a Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Desconnecta de la xarxa."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Desconnecta només de eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Desconnecta només de Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Afegeix un enllaç magnet o eD2k al nucli."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6752,51 +8172,51 @@
 "\n"
 "L'enllaç magnet ha de contenir el resum (hash) eD2k i la mida del fitxer.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Defineix un valor de configuració."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Defineix les preferències del filtrat IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Activa el filtre IP per a clients i servidors."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Atura el filtre IP per a clients i servidors."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Activa/Desactiva el filtre IP per a clients."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Activa el filtre IP per a clients."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Atura el filtre IP per a clients."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Activa/Desactiva el filtre IP per a servidors."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Activa el filtre IP per a servidors."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Atura el filtre IP per a servidors."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Selecciona el nivell de filtratge IP."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6804,59 +8224,71 @@
 "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:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
-msgstr "Defineix els límits d'ample de banda."
+msgstr "Estableix els límits d'amplada de banda."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Defineix el límit d'ample de banda de pujada."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "El valor donat ha de ser en kilobytes/seg.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Defineix el límit d'ample de banda de baixada."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr "Habilita o inhabilita la rotació de fonts del mode final."
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "El valor indicat ha de ser 1/ON (habilita) o 0/OFF (inhabilita).\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
-msgstr "Obté i mostra un valor de les preferències."
+msgstr "Obtén i mostra el valor d'una preferència."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Obté les preferències del filtratge IP."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 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:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Obtenir l'estat del filtre IP només per a clients."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Obtenir l'estat del filtre IP només per a servidors."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Selecciona el nivell de filtratge IP."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
-msgstr "Obté els límits d'ample de banda."
+msgstr "Obtén els límits d'amplada de banda."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr "Obtén l'estat de la rotació de fonts del mode final."
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Realitza una cerca."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6874,40 +8306,63 @@
 "Example: 'search global linux iso --type Iso --min-size 100M' returns\n"
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
+"Cal especificar un tipus de cerca indicant el tipus:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Exemple: «search kad fitxer» farà una cerca kad de «fitxer».\n"
+"\n"
+"Es poden afegir filtres opcionals abans, després o intercalats amb\n"
+"les paraules de cerca:\n"
+"    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
+"    --extension <ext>      (àlies: --ext)\n"
+"    --avail <N>            nombre mínim de fonts\n"
+"    --min-size <NKMG>    mida de fitxer mínima; K=1024, M=K*1024, G=M*1024\n"
+"    --max-size <NKMG>    mida de fitxer màxima; mateixos sufixos\n"
+"Exemple: «search global linux iso --type Iso --min-size 100M» retorna\n"
+"resultats de «linux iso» del tipus Iso de com a mínim 100 MiB.\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Realitza una cerca global."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Realitza una cerca local"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Realitza una cerca kad"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "Mostra els resultats de l'última cerca."
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Retorna els resultats de la cerca anterior.\n"
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr "Mostra els resultats d'una cerca."
+
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+"Retorna els resultats d'una cerca.\n"
+"Opcionalment accepta un id de cerca (de «search ...»); sense id, retorna els resultats de la darrera cerca iniciada.\n"
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Mostra el progrés d'una cerca."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Mostra el progrés d'una cerca.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+"Mostra el progrés d'una cerca.\n"
+"Opcionalment accepta un id de cerca; sense id, mostra el progrés de la darrera cerca iniciada.\n"
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Comença a baixar un fitxer"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6915,80 +8370,80 @@
 "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:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Pausa la baixada."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Reprèn la baixada."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Cancel·la la baixada."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Assigna una prioritat de baixada."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Estableix la prioritat a baixa."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Estableix la prioritat a normal."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Estableix la prioritat a alta."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Estableix la prioritat a auto."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Mostra les cues/llistes."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Mostra la cua de pujades."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Mostra la cua de baixades."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
-msgstr "Mostrar el registre."
+msgstr "Mostra el registre."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Mostra la llista de servidors."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "Mostra la llista de fitxers compartits."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Buida el registre."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Ordre obsoleta, useu '%s' en el seu lloc."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -6997,255 +8452,278 @@
 "Aquesta és una ordre obsoleta, i pot ser s'elimini en el futur.\n"
 "Useu '%s' en el seu lloc.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "client de text de l'aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "S'està calculant el hash del fitxer baixat: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr "S'està calculant el hash del fitxer: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "S'està reconstruint el conjunt de hash AICH del fitxer: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr "Verificació de dades locals (%s): resultat correcte per a %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr "Verificació de dades locals (%s): S'HAN TROBAT ERRORS! %s Blocs fallits: MD4: %s. %s %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Es Requereix Confirmació"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Només s'admeten 99 categories."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Massa categories!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Tota la resta"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Selecciona un filtre de vista"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Afegeix una categoria"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Edita la categoria"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Elimina la categoria"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "S'ha demanat un conjunt de resums d'un fitxer desconegut: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "No s'ha pogut obrir el fitxer (%s); s'elimina de la llista de fitxers compartits."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "S'està reprenent la pujada del fitxer: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "S'està suspenent la pujada del fitxer: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr "Error en executar l'ordre '%s' per a l'esdeveniment '%s'."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Descàrrega completada"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "La ruta completa al fitxer."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "El nom del fitxer sense la ruta."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "El resum eD2k del fitxer."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "La mida del fitxer en bytes."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Temps d'activitat de baixada acumulat."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Inici d'una nova sessió de xat"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Remitent del missatge."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Sense espai"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Partició de disc."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Error completant"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "S'està processant el fitxer número %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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:80
-#, fuzzy, c-format
+#: src/utils/aLinkCreator/src/alcc.cpp
+#, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Fitxer inexistent !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, el creador d'enllaços eD2k de l'aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Benvinguts!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Paràmetres d'entrada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Fitxer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Afegeix URL opcionals per al fitxer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:144
-msgid "Remove"
-msgstr "Esborra"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Crea l'enllaç amb resums per a cada part"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Resum MD4 del fitxer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "Resum eD2k del fitxer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "Enllaç eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Desa"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Copia al porta-retalls"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Obre"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Copia l'enllaç eD2k al porta-retalls"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Anomena i desa"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Desa l'enllaç eD2k a un fitxer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Quant a l'aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "No es pot obrir el porta-retalls"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "No hi ha res a copiar!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "No s'ha pogut obrir "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "No hi ha res a desar!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7265,162 +8743,159 @@
 "\n"
 "Distribuït sota llicència GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Fent el resum..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator està funcionant"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Calculant comprovació MD4..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Calculant comprovació eD2k..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Cancel·lat !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Fet en %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Ja heu afegit aquesta adreça URL!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "No s'ha pogut obrir %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "S'ha esgotat la memòria mentre es calculava el resum eD2k!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr "%.2f KiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr "%.2f GiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr "%.2f TiB"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, Estadístiques en línia de l'aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Reinicia"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistema"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Atura l'autorefresc"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Desa la imatge de les estadístiques en línia"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Imprimeix la imatge de les estadístiques en línia"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Paràmetre de les preferències"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Quant al wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Inicia l'autorefresc"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Autorefresc aturat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Autorefresc iniciat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Desa la imatge de les estadístiques"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Estadístiques en línia de l'aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7428,11 +8903,11 @@
 "Ha hagut un problema en imprimir.\n"
 "Tal volta la impressora actual no està configurada correctament?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Imprimint"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7450,402 +8925,564 @@
 "\n"
 "Distribuït sota GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "L'aMule no s'està executant..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "L'aMule s'està executant"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "L'aMule s'està executant, però desconnectat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "L'aMule s'està connectant..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "L'estat de l'aMule és desconegut..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " ha estat funcionant durant "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " està aturat!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " no està connectat!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " està connectant..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " està fent alguna cosa estranya, comproveu-lo!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " està connectat a "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "inactiu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " és a "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " amb "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Total baixat: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", pujat: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Baixat durant la sessió: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Baixant: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, pujant: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr " KiB/s, pujada: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Compartint: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " fitxers, clients a la cua: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Hora: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " a "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Sistema en funcionament des de: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "El directori on està el fitxer amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Interval de refresc en segons"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Genera una imatge a cada refresc"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
-#, fuzzy
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Puja periòdicament la imatge d'estat a un servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "Adreça FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Directori FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Introduïu l'adreça del servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Usuari"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Interval d'actualització de l'FTP en minuts"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "D'acord"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Directori on està el fitxer de signatura"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Directori on es genera la imatge"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Carrega la plantilla <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Port HTTP del servidor web"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Usa l'encaminament UPnP al port del servidor web"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Port UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Usa la compressió gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Contrasenya d'accés total per al servidor web"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Contrasenya de convidat per al servidor web"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Permetre l'accés de convidats"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Denega l'accés de convidats"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 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/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 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:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
-msgstr "Inhabilita el intèrpret PHP (obsolet)"
+msgstr "Inhabilita l'intèrpret de PHP (obsolet)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Recompila les pàgines PHP a cada petició"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Servidor web de l'aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "s'ha acceptat la connexió del client web\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "ERROR: no es pot acceptar connexions de clients web\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, 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:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "No s'ha trobat el fitxer d'índex: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "La sessió ha caducat - s'està demanant la identificació\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sessió correcta, identificat\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sessió correcta, sense identificar\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "No hi ha cap sessió oberta - es demanarà identificació\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sessió creada - s'està demanant la identificació\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "S'està processant la petició original: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
-msgstr ""
+msgstr "Es rebutja llegir «pass» de la cadena de consulta de l'URL\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 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:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "S'està comprovant la contrasenya\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "El resum de la contrasenya és invàlid\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Contrasenya correcta\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Contrasenya incorrecta\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Eixida sol·licitada\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "S'està processant la petició redirigit: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
-msgstr ""
+msgstr "aMule (necessari)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
-msgstr ""
+msgstr "Drecera a l'escriptori"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
-msgstr ""
+msgstr "Inicia l'aMule en iniciar la sessió"
+
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr "Associa els fitxers .emulecollection"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
-msgstr ""
+msgstr "Desinstal·la"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
-msgstr ""
+msgstr "Elimina les dades d'usuari (configuració, servidors ED2K, nodes Kad, fitxers parcials)"
 
-#: packaging/windows/installer_strings.c:43
-#, fuzzy
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
-msgstr "La connexió ha fallat "
+msgstr "Fitxers de l'aplicació aMule (necessari)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
-msgstr ""
+msgstr "Posa una drecera de l'aMule a l'escriptori."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
-msgstr ""
+msgstr "Inicia l'aMule automàticament quan l'usuari actual iniciï la sessió (paràmetre per usuari)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr ""
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr "Afegeix l'aMule a la llista «Obre amb» dels fitxers .emulecollection, i el fa predeterminat si cap altre programa no els ha reclamat. En obrir una col·lecció s'encuen tots els enllaços eD2k que conté."
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "Elimina els fitxers de l'aplicació aMule, les dreceres del menú Inici i de l'escriptori, l'entrada Run d'inici automàtic, els registres d'esquemes d'URL i l'entrada d'Afegeix o suprimeix programes (necessari)."
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
-msgstr ""
+msgstr "Suprimeix permanentment %APPDATA%\\aMule de l'usuari actual (aMule.conf, llista de servidors ED2K, nodes Kad, fitxers parcials, filtres d'IP, llista d'amics). Deixeu-ho desmarcat per conservar la configuració."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
+"Sembla que l'aMule s'està executant des de $INSTDIR.\r\n"
+"Tanqueu l'aMule (i l'aMuleD / aMuleGUI) i torneu-ho a provar."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
+"Sembla que el dimoni de l'aMule (amuled.exe) s'està executant des de $INSTDIR.\r\n"
+"Atureu-lo i torneu-ho a provar."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
-msgstr ""
+msgstr "S'està eliminant la instal·lació anterior de l'aMule a $0..."
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
+"No s'ha pogut eliminar la instal·lació anterior de l'aMule a $0.\r\n"
+"Tanqueu qualsevol procés de l'aMule que s'estigui executant i torneu-ho a provar, o desinstal·leu primer la versió anterior manualment."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
-msgstr ""
+msgstr "Sembla que l'aMule s'està executant. Tanqueu-lo i torneu a executar el desinstal·lador."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
-msgstr ""
+msgstr "S'estan eliminant les dades d'usuari a $APPDATA\\aMule..."
+
+#~ msgid "Ratio"
+#~ msgstr "Proporció"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "No s'ha trobat cap fitxer en el directori: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Canvi d'idioma"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "No hi ha traduccions instal·lades per a l'aMule"
+
+#~ msgid "No languages available"
+#~ msgstr "Sense idiomes disponibles"
+
+#~ msgid "User name"
+#~ msgstr "Nom d'usuari"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Parts obtingudes"
+
+#~ msgid "Available Parts"
+#~ msgstr "Parts disponibles"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "S'ha trobat %i fitxer compartit conegut, %i desconeguts"
+#~ msgstr1 "S'han trobat %i fitxers compartits coneguts, %i desconeguts"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%d/%m/%y %H:%M:%S"
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Transferit"
+#~ msgid "Remote prefix:"
+#~ msgstr "Servidor remot"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Servidor local"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "No s'ha trobat el fitxer."
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Entrada no vàlida a la llista de fitxers coneguts, el fitxer podria estar corrupte: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Desant fitxer de parts %u de %u"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ 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 %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Resultat del filtre"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Marca com a fitxer conegut"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Percentatge del total de fitxers"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Arrancada"
+
+#~ msgid "New node"
+#~ msgstr "Nou node"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Més"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Inicia des dels \n"
+#~ "clients coneguts"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Connecta amb qualsevol servidor i/o Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Desconnecta Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Atura els intents de connexió actuals"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Desconnecta de les xarxes on s'està connectat actualment"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Connecta a les xarxes habilitades actualment"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Auto ordena els fitxers (Alta CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "L'aMule ordenarà automàticament les columnes de la llista de baixades"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Rebutja el paquet si l'IP del client és diferent de l'IP on es rep el paquet. Useu amb prudència."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Retorna els resultats de la cerca anterior.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Mostra el progrés d'una cerca.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "S'ha tancat la connexió - segurament l'aMule s'ha terminat."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Comprova si hi ha noves versions a l'inici"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Enllaç eD2k: "
+
+#~ msgid "Commit"
+#~ msgstr "D'acord"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: Bifurcant-se a segon pla - adeu siau"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Lloc web: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Fòrum: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Lloc web: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Fòrum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Transferit"

amule-3.0.1.tar.gz/po/cs.po -> amule-3.1.0.tar.gz/po/cs.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:14+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:20+0000\n"
 "Last-Translator: David Watzke <david@watzke.cz>\n"
 "Language-Team: cs <cs@li.org>\n"
 "Language: cs\n"
@@ -21,71 +21,157 @@
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "O aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Vzdálené ovládání aMule "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Snapshot:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Multiplatformní p2p klient založený na eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2026 Tým aMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Část aMule je založena na \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Peer-to-peer směrování založené na metrice XOR.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Web:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Fórum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Dokumentace:"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Problémy:"
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "Klikněte pro kontrolu existence nové verze."
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "Zkontrolovat aktualizace"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "Kontrola aktualizací..."
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "Používáte nejnovější verzi."
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "Je dostupná nová verze (%s):"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr "Nelze zkontrolovat aktualizace. Zkuste to prosím později znovu."
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Přidat kamaráda"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 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
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informace"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Zadaný userhash je neplatný!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
+"aMule může nainstalovat stolní spouštěče, ikony a příkazové zkratky do vašeho domovského adresáře, takže se zobrazí v nabídce aplikací jako běžně nainstalovaná aplikace.\n"
+"\n"
+"Toto lze vrátit zpět - soubory se nachází pod ~/.local/share/applications, ~/.local/share/icons a ~/.local/bin a mohou být kdykoli odstraněny.\n"
+"\n"
+"Nainstalovat nyní integraci?"
 
-#: src/AppImageIntegration.cpp:226
-#, fuzzy
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
-msgstr "Za názvem programu"
+msgstr "Přidat aMule do nabídky aplikací?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
-msgstr ""
+msgstr "Instalovat"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
-msgstr ""
+msgstr "Teď ne"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
-msgstr ""
+msgstr "Znovu se neptat"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
-msgstr ""
+msgstr "Nelze nainstalovat integraci plochy: není nastavena proměnná prostředí APPDIR. To obvykle znamená, že AppImage byl spuštěn nestandardním způsobem."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
-#, fuzzy
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
-msgstr "Připojení selhalo "
+msgstr "Integrace aMule selhala"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
-msgstr ""
+msgstr "Nelze nainstalovat integraci plochy: selhalo vytvoření %s. Zkontrolujte, zda máte právo zapisovat do vašeho domovského adresáře."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
-msgstr ""
+msgstr "Nelze nainstalovat integraci plochy: selhal zápis %s. Zkontrolujte, zda máte právo zapisovat do vašeho domovského adresáře."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr ""
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr "Integrace AppImage: aMule přidán do nabídky aplikací (%d zkratka shell v ~/.local/bin)."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -93,84 +179,174 @@
 "\n"
 "Restart aMule now?"
 msgstr ""
+"aMule byla přidána do nabídky aplikací. Nyní ji můžete spustit z vašeho seznamu aplikací a spouštěč spustí tento stejný AppImage.\n"
+"\n"
+"Na některých stolních počítačích, aMule může být nutné restartovat pro přidružení ikony doku / panelu úloh se spouštěčem. Moderní kompozitory Wayland (GNOME, KDE) toto provedou živě za chodu, ale pokud ikona zůstává generická, tak je restartování spolehlivým řešením.\n"
+"\n"
+"Restartovat aMule nyní?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
-msgstr ""
+msgstr "aMule nainstalován"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
-msgstr ""
+msgstr "Restartovat nyní"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
-msgstr ""
-
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "CHYBA"
+msgstr "Později"
 
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Selhalo otvírání souboru ED2KLinks."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+"Další program drží aMule lock soubor:\n"
+"\n"
+"%s\n"
+"\n"
+"To není běžící kopie aMule, takže není nic, co by šlo přenést do popředí. Zavřete jiný program, nebo odstraňte lock soubor, zatímco aMule nebude spuštěn."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+"aMule daemon (amuled) je již spuštěn jako proces %d a používá tuto konfiguraci.\n"
+"\n"
+"Nemá žádné okno, které by šlo přenést do popředí. Připojte se k němu pomocí amuleGUI, nebo zastavte daemon před spuštěním aMule."
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr "aMule nejde spustit"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr "Oprávnění pro %s byla omezena pouze na vlastníka."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr "Soubor kolekce nenalezen: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Neplatný nebo prázdný soubor kolekce: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr "V kolekci nejsou žádné použitelné odkazy: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 "Vynechán %u nepoužitelný odkaz v kolekci: %s"
+msgstr1 "Vynechány %u nepoužitelné odkazy v kolekci: %s"
+msgstr2 "Vynecháno %u nepoužitelných odkazů v kolekci: %s"
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Nelze převést magnet odkaz na eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Neplatný eD2k odkaz \"%s\" - CHYBA: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Ukončuji hlavní aplikaci..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
-msgstr "Ukončuji instanci amuleweb s PID `%d'..."
+msgstr "Ukončuji instanci amuleweb s pid '%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
-msgstr "Zabíjím instanci amuleweb s PID `%d'..."
+msgstr "Zabíjím instanci amuleweb s pid '%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Selhal"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Ukončování instance amuleapi s pid '%d' ... "
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Rušení instance amuleapi s pid '%d' ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Ukončuji jádro."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "Ukončení aMule dokončeno."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
-msgstr ""
+msgstr "Výstup paměti pro aMule ukončení:"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr "Přidružování P2P síťového provozu aMule k rozhraní: %s (Aktualizace HTTP používají výchozí trasu)"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr "Přidružení veškerého síťového provozu k rozhraní: %s"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr "VAROVÁNÍ: nastavené síťové rozhraní '%s' nebylo nalezeno - síťový provoz není k němu vázán a může odcházet přes výchozí trasu. Zkontrolujte název rozhraní v Nastavení."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr "VAROVÁNÍ: přidružení k síťovému rozhraní '%s' vyžaduje zvýšená oprávnění a nebylo použito - síťový provoz může odcházet přes výchozí trasu. Udělte danou schopnost (např. 'sudo setcap cap_net_raw+ep' binárnímu souboru aMule) nebo spusťte program s dostatečnými oprávněními."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr "VAROVÁNÍ: nepodařilo se přidružit k síťovému rozhraní '%s' - síťový provoz může odcházet přes výchozí trasu."
 
-#: src/amule.cpp:595
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Vaše nastavení locale bylo změněno na výchozí systémové nastavení kvůli změně v konfiguraci. Pardon."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -178,54 +354,104 @@
 "\n"
 "Konfigurace EC"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Heslo nastaveno a externí připojení povoleno."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "VAROVÁNÍ"
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr ""
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr "Zavádění sítě"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "Načítání dočasných souborů"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Načítání dočasných souborů (%u z %u)"
+
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "Načítání sdílených souborů"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "Načítání sdílených souborů (%u)"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "Spouštění"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Zavedení sítě"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
+"aMule zjistil chybějící soubory pro zavedení sítě.\n"
+"Vyberte, které chcete stáhnout:"
 
-#: src/amule.cpp:797
-#, fuzzy
-msgid "Network bootstrap"
-msgstr "Sítě"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "Seznam serverů eD2k (server.met)"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Kad zaváděcí servery (nodes.dat)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
-msgstr "webserver běží s PID %d"
+msgstr "webserver běží s pid %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
-msgstr ""
+msgstr "Požádali jste o spuštění webového serveru po startu, avšak binární soubor amuleweb nelze spustit. Nainstalujte balíček obsahující webový server aMule, nebo sestavte aMule ze zdrojového kódu pomocí přepínače -DBUILD_WEBSERVER=YES a pak jej nainstalujte."
+
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "CHYBA"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr "Nebylo možné zapsat token amuleapi EC do %s; amuleapi se tedy vrátí k použití nastaveného hesla."
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr "amuleapi běží na pid %d"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Požádali jste o spuštění amuleapi po startu, avšak binární soubor amuleapi nelze spustit. Nainstalujte balíček obsahující REST API server aMule, nebo sestavte aMule ze zdrojového kódu pomocí přepínače -DBUILD_AMULEAPI=YES a pak jej nainstalujte."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr "Externí spojení: není možné přidružit k '%s', naslouchání pouze na 127.0.0.1."
 
-#: src/amule.cpp:969
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
-msgstr ""
+msgstr "Nebylo možné přidružit porty k zadané adrese: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port %u je nedostupný. Budete mít LowID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -240,1631 +466,1929 @@
 "\n"
 "Zkontrolujte nastavení vaší sítě a ujistěte se, že je port v obou směrech otevřený."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Selhalo vytvoření OnlineSig souboru"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Selhalo vytvoření aMule OnlineSig souboru"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
-msgstr ""
+msgstr "Zdá se, že vybrané locale není nainstalováno na vašem počítači. (Poznámka: Přesto se jej pokusím nastavit)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Toto je vaše první spuštění aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Toto je testovací verze, která je denně aktualizovaná a\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "my nezaručujeme, že nemůže nic pokazit, zapálit váš dům,\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "na https://amule-org.github.io, nebo na našem IRC kanálu #aMule na irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Hlašte chyby na adrese https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
+"Složka pro soubory online podpisů, kterou jste zadali, je NEPLATNÁ!\n"
+"OnlinePodpis bude VYPNUT, dokud neprovedete opravu v nastaveních."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
-msgstr ""
+msgstr "Jméno hostitele serveru oznámeno"
+
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr "Mediální metadata: sondovaný soubor již není znám, výsledek byl zahozen (%s)"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Předalokace místa na disku pro soubor '%s' selhala: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "CHYBA: nelze otevřít logovací soubor"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "VAROVÁNÍ: log je prázdný. Něco je špatně."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
-msgstr "Log byl vymazán"
+msgstr "Log byl resetován"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Zpráva od serveru: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
-msgstr ""
+msgstr "Bylo vynecháno stažení %s, protože požadovaný soubor není novější."
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Selhalo stahování seznamu uzlů."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Selhalo otvírání staženého kontrolního souboru s verzí"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Porušený soubor pro kontrolu verze"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Používáte zastaralou verzi aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
-msgstr "Poslední verze jsou vždy k nalezení na https://github.com/amule-org/amule/releases/latest "
+msgstr "Poslední verze jsou vždy k nalezení na https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Vaše verze aMule je aktuální."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Selhalo stahování kontrolního souboru s verzí"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Uživatelů: %s | Souborů: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Nezvoleny žádné sítě"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "s LowID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "s HighID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Připojen k %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Připojování k %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Odpojen od eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad spuštěn."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad zastaven."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Připojen ke Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Připojen ke kad (za firewallem)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Odpojen od Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Síť Kad je zakázána v nastavení, nepřipojuji se."
 
-#: src/amuled.cpp:142
-#, fuzzy
+#: src/amuled.cpp
 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"
+msgstr "CHYBA: aMule daemon nelze použít, když jsou zakázaná externí připojení. Pro jejich povolení použijte buď normální aMule, spusťte aMule s přepínačem --ec-config, nebo nastavte klíč \"AcceptExternalConnections\" v souboru ~/.aMule/amule.conf na hodnotu 1"
 
-#: src/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
-msgstr ""
+msgstr "CHYBA: Je požadováno platné heslo pro použití externích připojení a aMule daemon nelze použít bez externích připojení. Chcete-li spustit aMule daemon, musíte nastavit pole \"ECPassword\" v souboru ~/.aMule/amule.conf na příslušnou hodnotu. Pro nastavení hesla spusťte amuled s přepínačem --ec-config. Více informací najdete na https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
-msgstr ""
-
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: jdu do pozadí - měj se"
+msgstr "amuled: OnInit - spouštění časovače"
 
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
-msgstr "Nelze vytvořit soubor s PID"
+msgstr "Nelze vytvořit soubor Pid"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "CHYBA: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Toto je aMule %s založená na eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Běží na %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
-msgstr "Navštivte https://github.com/amule-org/amule/releases/latest  pro kontrolu, jestli není dostupná nová verze."
+msgstr "Navštivte https://github.com/amule-org/amule/releases/latest pro kontrolu, jestli není dostupná nová verze."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "KRITICKÁ CHYBA: Vytváření časovače selhalo"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Vzdálené ovládání aMule"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "Chyba! Nepodařilo se načíst Nastavení"
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Sítě"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Multiplatformní p2p klient založený na eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Vyhledávání"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Web: https://amule-org.github.io\n"
-
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Fórum: https://github.com/amule-org/amule/discussions\n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Stahování"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Web: https://amule-org.github.io\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Sdílené soubory"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Fórum: https://github.com/amule-org/amule/discussions\n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Klienti"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2019 Tým aMule \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Zprávy"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Část aMule je založena na \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistiky"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Nastavení"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr "Navigovat"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Zpráva"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "Volný prostor: %s"
+
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "Nová verze je dostupná"
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"K dispozici je nová verze aMule (%s).\n"
+"\n"
+"Nyní používáte %s.\n"
+"\n"
+"Chcete otevřít stránku stahování?"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
-msgstr "Dialog aMule zničen"
+msgstr "Dialog aMule byl zrušen"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Připojuji"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: připojuji"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: odpojeno"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Za firewallem"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Připojen"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Připojuji"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: vypnut"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Zastaví aktuální pokusy o připojení"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Odpojit"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr "Jádro"
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Verze"
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Odpojit se od aktuálně připojených sítí"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr "Jádro a aMuleGUI jsou různé verze."
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr "Jádro a aMuleGUI jsou stejné verze."
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Připojit"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adresa"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Připojit se k povoleným sítím"
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "Šifrování"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
 
-#: src/amuleDlg.cpp:943
-#, fuzzy, c-format
+#: src/amuleDlg.cpp
+#, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
-msgstr "Od: %.1f(%.1f) | St: %.1f(%.1f)"
+msgstr "Odesílání: %.1f%s (%.1f) | Stahování: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " MiB/s"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " KiB/s"
 
-#: src/amuleDlg.cpp:947
-#, fuzzy, c-format
+#: src/amuleDlg.cpp
+#, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
-msgstr "Od: %.1f | St: %.1f"
+msgstr "Odesílání: %.1f%s | Stahování: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | připojen)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | odpojen)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Opravdu si přejete ukončit %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Potvrzení ukončení"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Spustit příkaz: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- výchozí -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Adresář se skiny '%s' neexistuje"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "VAROVÁNÍ: Nelze otevřít soubor se vzhledem '%s' pro čtení"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Sítě"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Okno sítí"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Vyhledávání"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Vyhledávací okno"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Stahování"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Stahování"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Sdílené soubory"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Okno se sdílenými soubory"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Zprávy"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr "Okno klientů"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Okno zpráv"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistiky"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Okno se statistikami"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Nastavení"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Okno s nastavením"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Import"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Nástroj pro import částečných souborů"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "O programu"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "O programu/Nápověda"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Síť eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Síť Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Žádná síť"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Vzdálené ovládání aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Kritická chyba: Selhalo vytváření časovače jádra"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Připojit se ke vzdálené amuli"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Připojení ztraceno"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr "Přerušit a ukončit"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "Opětovné připojování... (pokus %d)"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr "Další pokus za %d s..."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+"Připojení k %s ztraceno.\n"
+"%s\n"
+"\n"
+"Rozhraní je pozastaveno až do obnovení spojení."
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Kritická chyba: Selhalo vytváření časovače pro dotazování"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Zahajuji smyčku událostí..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Připojuji..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
-msgstr ""
+msgstr "Spojení selhalo. Prosím zkontrolujte hostitele, port a heslo."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
-msgstr ""
+msgstr "Ovladač událostí vzdáleného grafického uživatelského rozhraní EC"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr ""
+msgstr "Spojení selhalo. Nelze se připojit k %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Ukončuji"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Spojení uzavřeno - aMule se pravděpodobně ukončila."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Pokus o opětovné připojení vypršel; probíhá opakování."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
+"Navazování připojení vypršel čas. Nelze dosáhnout %s:%d v přiděleném čase.\n"
+"Prosím zkontrolujte hostitele, port a že aMule běží s povolenými externími připojeními."
+
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr "Připojení ke vzdálenému jádru bylo ztraceno. Probíhá pokus o opětovné připojení..."
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Zakázáno"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr "Znovu připojeno ke vzdálenému jádru."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr "Vzdálené jádro bylo restartováno; opětovné načítání."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Pokus %d o opětovné připojení: připojování k %s:%d"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr "Opětovné připojení nemohlo začít; opakování pokusu nastane brzy."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Připraven"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Vše"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr "nečitelné"
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr "nenalezeno"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr "Jádro odmítlo tyto sdílené složky:%s"
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Neplatný odkaz, nebo je již v seznamu."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr "Daemon odmítl požadavek."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "Nešlo smazat kategorii: %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
-msgstr ""
+msgstr "Nejde vytvořit adresář '%s' pro kategorii '%s', zachovávám adresář '%s'."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr "Vzdálené jádro odeslalo nekonzistentní data pro \"%s\" (částečný stav %d, očekáváno %d). Seznam souborů může zobrazovat nesprávné informace; opět se připojte pro vyčištění."
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: src/BaseClient.cpp:1363
-#, 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/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Hledám kamaráda pro LowID připojení"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (falešná eMule verze %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (falešná eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (falešná eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (založeno na eMule v.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Přezdívka: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Vyžádáno: %s\n"
 
-#: src/BaseClient.cpp:2018
-#, fuzzy, c-format
+#: src/BaseClient.cpp
+#, 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"
-msgstr0 "Statistika souboru pro toto sezení: Přijat %d z %d požadavku, %s přeneseno\n"
-msgstr1 "Statistika souboru pro toto sezení: Přijato %d z %d požadavků, %s přeneseno\n"
-msgstr2 ""
+msgstr0 "Statistika souborů pro toto sezení: Přijat %d z %d požadavku, %s přeneseno\n"
+msgstr1 "Statistika souborů pro toto sezení: Přijato %d z %d požadavků, %s přeneseno\n"
+msgstr2 "Statistika souborů pro toto sezení: Přijato %d z %d požadavků, %s přeneseno\n"
 
-#: src/BaseClient.cpp:2021
-#, fuzzy, c-format
+#: src/BaseClient.cpp
+#, 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"
 msgstr0 "Statistika souboru pro všechna sezení: Přijat %d z %d požadavku, %s přeneseno\n"
-msgstr1 "Statistika souboru pro všechna sezení: Přijato %d z %d požadavků, %s přeneseno\n"
-msgstr2 ""
+msgstr1 "Statistika souborů pro všechna sezení: Přijato %d z %d požadavků, %s přeneseno\n"
+msgstr2 "Statistika souborů pro všechna sezení: Přijato %d z %d požadavků, %s přeneseno\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Vyžádán neznámý soubor"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Zpráva od '%s' filtrována (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nová zpráva od '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
-#, fuzzy, c-format
+#: src/BaseClient.cpp
+#, 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"
+msgstr "Uživatel %s (%u) požádal o seznam sdílených souborů v neexistujícím adresáři '%s' -> ignorováno"
+
+#: src/BrowseManager.cpp
+#, 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/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "VAROVÁNÍ: %s nelze otevřít."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "VAROVÁNÍ: Soubor je porušen, obsahuje neplatnou hlavičku."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
-#, fuzzy, c-format
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
+#, c-format
 msgid "IO error while reading %s file: %s"
-msgstr "I/O chyba při čtení souboru known.met: %s"
+msgstr "Chyba I/O při čtení souboru %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
-#, fuzzy, c-format
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
+#, c-format
 msgid "Error while saving %s file: %s"
-msgstr "Došlo k chybě při ukládání souboru known.met: %s"
+msgstr "Chyba při ukládání souboru %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Vložte captchu"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategorie"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nová kategorie"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
-msgstr "Zvolte adresář pro stažené soubory"
+msgstr "Zvolte složku pro stažené soubory"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Musíte zadat název kategorie!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Musíte zadat cestu pro kategorii!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr ""
+msgstr "Zahájeno sezení chatu: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Připojen ke klientovi ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Připojuji se ke klientovi ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Připojování ke klientovi selhalo / připojení ztraceno ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
-msgstr ""
+msgstr "*** Úspěšně jste prošli kontrolou captcha a uživatel obdržel vaši zprávu. ***"
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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 ""
+msgstr "*** Vaše odpověď na captchu byla nesprávná a vaše zpráva byla ignorována. Novou captchu si můžete vyžádat odesláním nové zprávy. ***"
 
-#: src/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Chat"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Zavřít tab"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Zavřít všechny taby"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Zavřít ostatní taby"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
-msgstr "Přidat do přátel"
+msgstr "Přidat do kamarádů"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Zobrazit &podrobnosti"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Odstranit z kamarádů"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Založit kamarádský slot"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Zobrazit soubory"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Poslat zprávu"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Poslat zprávu uživateli"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Zpráva k odeslání:"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Není povoleno nastavit více než jeden slot pro kamarády.\n"
+" Byl přiřazen pouze jeden slot."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Vícenásobný výběr"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 "Přidat %u klienta do seznamu kamarádů?"
+msgstr1 "Přidat %u klienty do seznamu kamarádů?"
+msgstr2 "Přidat %u klientů do seznamu kamarádů?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Odebrat %u klienta ze seznamu kamarádů?"
+msgstr1 "Odebrat %u klienty ze seznamu kamarádů?"
+msgstr2 "Odebrat %u klientů ze seznamu kamarádů?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 "Nepodařilo se přidat %u vybraného klienta do seznamu kamarádů: není pro něj známa žádná adresa."
+msgstr1 "Nepodařilo se přidat %u vybrané klienty do seznamu kamarádů: není pro ně známa žádná adresa."
+msgstr2 "Nepodařilo se přidat %u vybraných klientů do seznamu kamarádů: není pro ně známa žádná adresa."
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Požádat o sdílené soubory %u klienta?"
+msgstr1 "Požádat o sdílené soubory %u klientů?"
+msgstr2 "Požádat o sdílené soubory %u klientů?"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr "Ke každému z nich je otevřeno spojení."
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "Soubor s kredity byl načten, je znám %u klient"
+msgstr1 "Soubor s kredity byl načten, jsou známi %u klienti"
+msgstr2 "Soubor s kredity byl načten, je známo %u klientů"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 " - Kredit vypršel pro %u klienta!"
+msgstr1 " - Kredit vypršel pro %u klienty!"
+msgstr2 " - Kredit vypršel pro %u klientů!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Soubor 'cryptkey.dat' nenalezen, vytvářím."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Podrobnosti klienta"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Podporováno"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Nepodporováno"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Zakázáno"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Připojen"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Odpojeno"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f KiB/s"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Název"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "Software"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP adresa"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Původ"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr "Poprvé viděn"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr "Naposledy viděn"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "Sezení"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Rychlost odesílání"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Rychlost stahování"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "Celkem odesláno"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "Celkem staženo"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "DL/UP modifikátor"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr "Nyní online"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Nekompletní"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Zloduch"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Ověřeno - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Nedostupný"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "Nešlo požádat %u vybraného klienta o jeho sdílené soubory."
+msgstr1 "Nešlo požádat %u vybrané klienty o jejich sdílené soubory."
+msgstr2 "Nešlo požádat %u vybraných klientů o jejich sdílené soubory."
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Soubory"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Odesláno"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Staženo"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "Stahování od"
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr "Odesílání k"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Aktivní"
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr "Známý"
+
+#: src/ClientTCPSocket.cpp
 #, 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:799
+#: src/ClientTCPSocket.cpp
 #, 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:831
+#: src/ClientTCPSocket.cpp
 #, 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:837
+#: src/ClientTCPSocket.cpp
 #, 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:862
-#, fuzzy, c-format
+#: src/ClientTCPSocket.cpp
+#, c-format
 msgid "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"
+msgstr "Uživatel %s (%u) požádal o váš seznam sdílených souborů v adresáři '%s' -> přijato"
 
-#: src/ClientTCPSocket.cpp:875
-#, fuzzy, c-format
+#: src/ClientTCPSocket.cpp
+#, 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"
+msgstr "Uživatel %s (%u) požádal o váš seznam sdílených souborů v adresáři '%s' -> odmítnuto"
 
-#: src/ClientTCPSocket.cpp:894
-#, fuzzy, c-format
+#: src/ClientTCPSocket.cpp
+#, c-format
 msgid "User %s (%u) shares directory '%s'"
-msgstr "Uživatel %s (%u) sdílí adresář %s"
+msgstr "Uživatel %s (%u) sdílí adresář '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
-msgstr ""
+msgstr "Uživatel %s (%u) odeslal nevyžádané sdílené adresáře."
 
-#: src/ClientTCPSocket.cpp:932
-#, fuzzy, c-format
+#: src/ClientTCPSocket.cpp
+#, 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"
+msgstr "Uživatel %s (%u) odeslal seznam sdílených souborů pro adresář '%s'"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr ""
+msgstr "Uživatel %s (%u) dokončil odesílání seznamu sdílených souborů"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr ""
+msgstr "Uživatel %s (%u) odeslal nežádaný seznam sdílených souborů"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
-msgstr ""
+msgstr "Uživatel %s (%u) odmítl přístup k seznamu sdílených adresářů/souborů"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Komentáře k souboru"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Jméno"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Název souboru"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Hodnocení"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Komentář"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr "Nepodařilo se zahájit Kad hledání"
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "Vyhledávání komentářů v síti Kad..."
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Žádné komentáře"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "%u komentář"
+msgstr1 "%u komentáře"
+msgstr2 "%u komentářů"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
-msgstr ""
+msgstr "Klient %s zablokován za odeslání %s poškozených dat z celkových %s pro soubor '%s'"
+
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Nepodařilo se načíst data o zemi pro '%s'."
 
-#: src/DataToText.cpp:35
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Ní"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Vy"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Velmi nízká"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Nízká"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normální"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Vysoká"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Velmi vysoká"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Vydání"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Vyžaduji"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Připojuji se přes server"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Plná fronta"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Ve frontě"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Stahuji"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Získávám hashset"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Bez potřebných částí"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Nelze spojit LowID s LowID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Příliš mnoho připojení"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Připojuji se přes Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Příliš Kad připojení"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
-msgstr "Zabanován"
+msgstr "Zablokován"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Chyba připojení"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Vzdálená fronta je plná"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Starý MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Nový MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule kompatibilní"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Lokální server"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Vzdálený server"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Výměna zdrojů"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Pasivní"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Odkaz"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
-msgstr ""
+msgstr "Zdrojové seedy"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Výsledek hledání"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Probíhá"
 
-#: src/DataToText.cpp:145
-#, fuzzy
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
-msgstr "CHYBA: Došlo místo na disku"
+msgstr "CHYBA: Nedostatek místa na disku"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
-msgstr ""
+msgstr "CHYBA: Soubor part.met nenalezen"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "CHYBA: I/O chyba!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "CHYBA: Selhání!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Ve frontě"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Již stahuji"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Neznámý nebo špatný formát dočasného souboru."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr "Tento adresář je součástí rekurzivního/víceúrovňového sdílení. Pro odebrání zrušte jeho sdílení, nebo upravte nadřazený kořenový adresář sdílení."
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr "Nelze zrušit sdílení, které je součástí rekurzivního sdílení"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr "Nelze provézt úpravu v rekurzivním sdílení"
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Část"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Velikost"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Přeneseno"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Rychlost"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Průběh"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Zdroje"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Priorita"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Stav"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Zbývající čas"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Naposledy spatřen kompletní"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Poslední příjem"
 
-#: 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/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Opravdu si přejete smazat vybrané soubory?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Odezva od: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Auto"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Zastavit"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pozastavit"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Obnovit"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "V&yčistit dokončené"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Přesunout A4AF zdroje k tomuto souboru"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Přesunout A4AF zdroje k tomuto souboru (automaticky)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Přesunout A4AF zdroje k jinému souboru"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Rozšířené nastavení"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "Zobrazit ve správci souborů"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Zobrazit &podrobnosti souboru"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Zobrazit všechny komentáře"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Zkopírovat magnet URI do schránky"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Zkopírovat eD2k &odkaz do schránky"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Uložit odezvu do schránky"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Získat %s pro tento soubor"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "zrušit přiřazení"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Zařadit do kategorie"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Otevřít tento soubor"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Opravdu si přejete smazat vybraný soubor?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Opravdu si přejete smazat vybrané soubory?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Odezva od: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Zadejte nový název pro tento soubor:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Přejmenování souboru"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%.1f MiB/s"
+msgstr "%.1f MiB/s"
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Stahování (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Náhled souboru"
-
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "CHYBA: Nezdařilo se spustit externí přehrávač! Příkaz: `%s'"
+msgid "Total queue size: %s"
+msgstr "Celková velikost fronty: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
-msgstr ""
+msgstr "Ukládání souboru PartFile %u z %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
-msgstr ""
+msgstr "Všechny soubory PartFile uloženy."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
-msgstr "Načítám dočasné soubory z %s"
+msgstr "Načítám dočasné soubory z %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
-msgstr ""
+msgstr "Načítání souboru PartFile %u z %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
-msgstr ""
+msgstr "CHYBA: Nepodařilo se načíst záložní soubor. Řešení obnovy souborů .part.met hledejte na https://github.com/amule-org/amule/discussions."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
-msgstr ""
+msgstr "Všechny soubory PartFile načteny."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Nenalezeny žádné částečné soubory"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "Nalezen %u částečný soubor"
+msgstr1 "Nalezeny %u částečné soubory"
+msgstr2 "Nalezeno %u částečných souborů"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
+msgstr "Souborový systém pro dočasný adresář nepodporuje velké soubory."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr ""
+msgstr "Souborový systém pro adresář příchozích souborů nepodporuje velké soubory."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Stahování %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Soubor '%s' se již pokoušíte stáhnout"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Soubor '%s' již máte (vyžádán jako '%s')"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Soubor '%s' již máte"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Soubor %s se již pokoušíte stáhnout"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
-msgstr ""
+msgstr "Neznámý protokol odkazu: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "Nešlo přidat %u odkaz (podrobnosti viz log)."
+msgstr1 "Nešlo přidat %u odkazy (podrobnosti viz log)."
+msgstr2 "Nešlo přidat %u odkazů (podrobnosti viz log)."
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Neplatný eD2k odkaz! CHYBA: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Klient odeslal paket poté, co selhala autentizace."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Externí připojení uzavřeno."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 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:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Externí připojení jsou zakázány v konfiguračním souboru"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Nové externí připojení přijato"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
-msgstr ""
+msgstr "CHYBA: nové externí spojení nemohlo být přijato"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 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:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Připojuji klienta: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Neznámá verze"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
-msgstr ""
+msgstr "Nesprávné ID verze EC, může jít o binární nekompatibilitu. Použijte jádro a vzdálené rozhraní ze stejné verze (snapshotu)."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
-msgstr ""
+msgstr "Nelze se připojit k vydané verzi z libovolného vývojového snapshotu! *povzdech* možnému pádu bylo zabráněno"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Neplatná verze protokolu."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
-msgstr ""
+msgstr "Chybí štítek verze protokolu."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Selhalo příliš mnoho pokusů o připojení; zkuste to znovu za %d sekund."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
-msgstr ""
+msgstr "Autentizace selhala: jako heslo EC byl zadán neplatný hash."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr "Autentizace selhala: klient nabídl šifrované externí spojení, ale neodeslal použitelný klíč."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr "Autentizace selhala: tento aMule vyžaduje šifrované externí spojení a klient žádné nevyjednal."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr "Autentizace selhala: klient nemohl potvrdit šifrované sezení."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Autentizace selhala: nesprávné heslo."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Autentizace selhala: chybějící heslo."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Neplatný požadavek, nejdřív se prosím autentizujte."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Přistup povolen."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Odeslána chybová hláška \"%s\" pro klienta."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, 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:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
-msgstr ""
+msgstr "Vzdálený příkaz PartFile selhal: FileHash nenalezen: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "FileHash nenalezen: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
-msgstr ""
+msgstr "PROMIŇTE! Chyba při zpracování OpCode!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Server nepřidán"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "server nenalezen: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
-msgstr ""
+msgstr "je nutné určit server, který má být odebrán"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k je zakázané v nastavení."
 
-#: src/ExternalConn.cpp:1368
-#, fuzzy
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr "Zatím není známa žádná adresa tohoto kamaráda."
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
-msgstr "Soubor nenalezen."
+msgstr "Kamarád nenalezen."
 
-#: src/ExternalConn.cpp:1377
-#, fuzzy
+#: src/ExternalConn.cpp
 msgid "Client not found."
-msgstr "Soubor nenalezen."
+msgstr "Klient nenalezen."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
-msgstr ""
+msgstr "EC_TAG_FRIEND_SHARED vyžaduje EC_TAG_FRIEND nebo EC_TAG_CLIENT."
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr ""
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
-msgstr ""
+msgstr "Webové hledání ze vzdáleného rozhraní nedává smysl."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr "Procházení není hledání, které lze začít."
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Probíhá vyhledávání. Získání výsledků za okamžik!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Žádné údaje pro graf."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Vás klient není nakonfigurován pro tuto úroveň detailů."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
-msgstr ""
+msgstr "Externí připojení: vyžádáno ukončení"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Již se ukončuji."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
-msgstr ""
+msgstr "ExternalConn: přidávání odkazu '%s'."
 
-#: src/ExternalConn.cpp:1832
-#, fuzzy, c-format
+#: src/ExternalConn.cpp
+#, c-format
 msgid "%d of %d links failed (invalid or already on list)."
-msgstr "Neplatný odkaz, nebo je již v seznamu."
+msgstr "%d z %d odkazů selhalo (neplatné nebo již na seznamu)."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr "Kontrola verze je omezena; zkuste to znovu za chvíli."
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr "Kontrola verze není u tohoto daemona k dispozici."
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Soubor nenalezen."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Neplatný název souboru."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Nelze přejmenovat soubor."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr "Klient nemohl být vyměněn do tohoto souboru."
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr "Nepodařilo se uložit heslo amuleapi: %s"
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "Tato kategorie neexistuje."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr "Deformovaný požadavek kategorie."
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr "Výchozí kategorii nelze smazat."
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "Chybějící id sezení chatu"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "Žádné takové sezení chatu"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Extrakce metadat médií je zakázána v nastavení"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr "Soubor není způsobilý pro extrakci mediálních metadat (nejde o audio/video soubor, nebo není dokončeno stahování)"
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "Prázdná zpráva chatu"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "Neznámý cíl chatu"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad je zakázaný v nastavení."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Již připojen k eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Připojuji se k eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Již jste připojen k síti Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Připojuji se k síti Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Všechny sítě jsou zakázány."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Odpojen od eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Odpojen od Kademlia."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
-msgstr ""
+msgstr "Externí připojení: přijat neplatný opcode: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
-msgstr ""
+msgstr "Neplatný opcode (nesprávná verze protokolu?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Neznámé rozšíření '%s' pro příkaz '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Neznámý příkaz '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1872,7 +2396,7 @@
 "\n"
 "Tento příkaz nesmí dostat argument.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1880,13 +2404,15 @@
 "\n"
 "Tento příkaz musí dostat argument.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
+"\n"
+"Tento příkaz je neúplný, musíte použít jedno z níže uvedených rozšíření.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1894,82 +2420,90 @@
 "\n"
 "Dostupná rozšíření:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Dostupné příkazy:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "All commands are case insensitive.\n"
 "Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
+"\n"
+"Ve všech příkazech nezáleží na velikosti písmen.\n"
+"Napište '%s <command>' pro podrobné informace o <command>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Ukončí aplikaci."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Zobrazit nápovědu."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
 msgstr ""
+"Nápovědu k příkazu získáte zadáním 'help <command>'.\n"
+"Úplný seznam příkazů zobrazíte zadáním 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Use '%s' for command list\n"
 "\n"
 msgstr ""
+"\n"
+"Seznam příkazů zobrazíte pomocí '%s'\n"
+"\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Chyba syntaxe!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Tento příkaz by neměl mít parametry."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Tento příkaz musí mít parametr."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Neplatný argument."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Toto je nekompletní příkaz."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Pro nápovědu spusťte '%s'.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Tohle je %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Tohle je %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1977,16 +2511,16 @@
 "\n"
 "Vytvářím klienta...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 "\n"
-"OK, opouštím %s...\n"
+"Ok, ukončuji %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1994,119 +2528,376 @@
 "\n"
 "Exiting...\n"
 msgstr ""
+"Nelze se připojit s prázdným heslem.\n"
+"Heslo musíte zadat buď v konfiguračním souboru,\n"
+"nebo na příkazovém řádku, nebo je zadat na vyžádání.\n"
+"\n"
+"Ukončuji...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Zobrazí tuto nápovědu."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Hostitel, kde běží aMule. (výchozí: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Port aMule pro externí připojení. (výchozí: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Heslo pro externí připojení."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Načíst konfiguraci ze souboru."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
-msgstr "Nevypisovat nic na stdout."
+msgstr "Nevypisovat nic na standardní výstup."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
-msgstr "Buď upovídaný - ukaž také debugovací hlášky"
+msgstr "Vypisovat podrobnosti - včetně zpráv ladění."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Nastaví locale programu (jazyk)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
-msgstr ""
+msgstr "Zapsat možnosti příkazového řádku do konfiguračního souboru."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
-msgstr ""
+msgstr "Vytvoří konfigurační soubor na základě konfiguračního souboru aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Vypíše verzi programu."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr "Nešifrovat sezení externího připojení. Šifrování je použito ve výchozím stavu, pokud ho vzdálený aMule podporuje; vypnutím dojde k ponechání všeho, co následuje po přihlášení, čitelného a upravitelného kýmkoli kdo je na cestě."
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
-msgstr ""
+msgstr "Vynutit kompresi ZLIB bez ohledu na lokalitu vytáčené IP adresy (užitečné, pokud je server dostupný přes VPN tunel, který se překládá na IP adresu LAN)."
+
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr "Připojit kopii veškerého výstupu konzole do tohoto log souboru (výchozí: <config-dir>/amuleapi.log)."
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr "Nezapisovat soubor logu; vypisovat jen do konzole."
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Podrobnosti souboru"
 
-#: src/FileDetailDialog.cpp:167
-#, fuzzy, c-format
+#: src/FileDetailDialog.cpp
+#, c-format
 msgid "%.1f%% done"
-msgstr "%.2f%% dokončeno"
+msgstr "%.1f%% dokončeno"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
 
-#: src/FriendList.cpp:123
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Náhled souboru"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "CHYBA: Selhalo spuštění externího přehrávače médií! Příkaz: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr "Nastavený přehrávač videí nebyl nalezen: %s"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr "Nelze otevřít '%s': soubor není přítomen v tomto počítači."
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr "Náhled nedokončeného stahování potřebuje video přehrávač: částečně stažený soubor není typu, který by systému mohl sám o sobě správně otevřít. Přehrávač můžete nastavit v Nastavení -> Hlavní."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr "CHYBA: Selhalo otevření '%s' pomocí výchozí aplikace."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "CHYBA: Selhalo zobrazení '%s' ve správci souborů."
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "Mobilní / 4G-5G (20 / 5 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL (24 / 1 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL (50 / 10 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Kabel (200 / 20 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Optika 300 (300 / 100 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "Optika Gigabit (1000 / 1000 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr "Prvotní nastavení aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "Vítejte v aMule!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
 msgstr ""
+"Toto krátké nastavení vás připojí. Kteroukoli\n"
+"z těchto voleb můžete později změnit v Nastavení."
 
-#: src/FriendList.cpp:149
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "Vyberte si přezdívku, kterou ostatní uvidí:"
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr "Připojení a šířka pásma"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
 msgstr ""
+"Vyberte možnost, která nejlépe odpovídá vašemu internetovému připojení,\n"
+"nebo nastavte limity odesílání a stahování přímo níže."
 
-#: src/FriendList.cpp:266
-msgid "CRITICAL - no client on StartChatSession"
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "Rychlost připojení:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr "Jiné / nastavit ručně"
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "Limit odesílání (kB/s, 0 = neomezeno):"
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "Limit stahování (kB/s, 0 = neomezeno):"
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "Sítě a porty"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr "aMule může používat dvě sítě. Doporučujeme ponechat obě zapnuté."
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Běžný TCP port "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Rozšířený UDP port (Kad / globální vyhledávání) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Povolit UPnP port forwarding"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+"Umožní aMule požádat váš router o přesměrování výše uvedených portů, aby se k vám\n"
+"mohli ostatní uživatelé připojit (tzv. \"HighID\"). Vypněte, pokud váš router\n"
+"nepodporuje UPnP nebo porty přesměrováváte ručně."
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr "Soubory pro zavedení sítě"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+"Aby mohl aMule začít, potřebuje znát nějaké peery.\n"
+"Vyberte, které seznamy chcete nyní stáhnout:"
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Vaše seznamy peerů jsou již na svém místě – není co stahovat."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Automaticky aktualizovat seznam serverů po spuštění"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr "Integrace (volitelné)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+"Zvolte, jak se aMule integruje s vaším systémem. Kteroukoli\n"
+"z těchto voleb můžete později změnit v Nastavení."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "Spustit aMule automaticky po přihlášení"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr "Zaregistrovat aMule pro odkazy ed2k://"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr "Zaregistrovat aMule pro odkazy magnet"
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr "Pouze magnet odkazy kompatibilní s eD2k. Ponechte vypnuté, pokud používáte klienta BitTorrent."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr "Otevírat soubory .emulecollection pomocí aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr "Složky (nepovinné)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+"Výchozí nastavení vyhovuje většině uživatelů. Změňte je, pokud\n"
+"chcete stahovat na jiný (např. větší) disk."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Cílová složka pro stahování"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Procházet"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Všechny soubory v této složce jsou sdíleny s ostatními peery)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Složka pro dočasné soubory stahování"
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
 msgstr ""
+"Na základě toho aMule povolí až %i zdrojů na soubor\n"
+"a %i připojení klientů."
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr "Zobrazit tohoto průvodce nastavením znovu při příštím spuštění aMule?"
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr "Nastavení nedokončeno"
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "Selhalo otevření souboru seznamu kamarádů 'emfriends.met' pro čtení!"
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "Selhalo otevření souboru seznamu kamarádů 'emfriends.met' pro zápis!"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr "Zatím není známa žádná adresa kamaráda '%s', nelze tedy procházet."
+
+#: src/FriendList.cpp
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "KRITICKÉ - žádný klient v StartChatSession"
+
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Kamarádi"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Zobrazit &podrobnosti"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Přidat kamaráda"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Odstranit kamaráda"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Poslat &zprávu"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Zobrazit soubory"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Založit kamarádský slot"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr "Zatím není známa žádná adresa kamaráda '%s', nelze jim tedy poslat zprávu."
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Opravdu si přejete odstranit vybraného kamaráda?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Opravdu si přejete odstranit vybrané kamarády?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2114,2138 +2905,2532 @@
 "Nemůžete založit více než jeden kamarádský slot.\n"
 " Byl přidělen pouze jeden slot."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Vícenásobný výběr"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\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/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Poslat zprávu uživateli"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Zpráva k odeslání:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Odstranit z přátel"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Poslat zprávu"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
-msgstr ""
+msgstr "Swapovat do tohoto souboru"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr "Barevná legenda"
 
-#: src/GenericClientListCtrl.cpp:1054
-#, fuzzy, c-format
+#: src/GenericClientListCtrl.cpp
+#, c-format
 msgid "On Queue: %u (%i)"
-msgstr "QR: %u (%i)"
+msgstr "Ve frontě: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Vyžádán jiný soubor"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Čekání na odesílací slot"
 
-#: src/GenericClientListCtrl.cpp:1085
-#, fuzzy, c-format
+#: src/GenericClientListCtrl.cpp
+#, c-format
 msgid "On Queue: %u"
-msgstr "Ve frontě"
+msgstr "Ve frontě: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Odesílám"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Nic"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Ne"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Ano"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Selhalo otevření databáze MaxMindDB '%s': %s"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Stahuji..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "HTTP stahování zrušeno"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "URL pro stahování nesmí být prázdné"
 
-#: src/HTTPDownload.cpp:246
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Failed to create HTTP request for %s"
-msgstr "Nelze získat seznam sdílených souborů od uživatele '%s'"
+msgstr "Nepodařilo se vytvořit HTTP požadavek pro %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
-msgstr ""
+msgstr "Stahování přes HTTP: prázdné tělo odpovědi pro %s"
 
-#: src/HTTPDownload.cpp:349
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Could not move downloaded file to %s"
-msgstr "Soubor %s se již pokoušíte stáhnout"
+msgstr "Nepodařilo se přesunout stažený soubor do %s"
 
-#: src/HTTPDownload.cpp:353
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Downloaded %s (%llu bytes)"
-msgstr "Staženo %d bytů"
+msgstr "Staženo %s (%llu bajtů)"
 
-#: src/HTTPDownload.cpp:358
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "The URL %s returned: %i"
-msgstr "URL %s vrátilo: %i - Chyba (%i)!"
+msgstr "URL %s vrátila: %i"
 
-#: src/HTTPDownload.cpp:365
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "HTTP download failed for %s: %s"
-msgstr "HTTP stahování zrušeno"
+msgstr "Stahování přes HTTP selhalo pro %s: %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
-msgstr ""
+msgstr "HTTP 401 Neautorizováno pro %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
-msgstr ""
+msgstr "Existující GeoLite2-Country.mmdb přesunuto do %s"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr ""
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr "%s není čitelným souborem MaxMindDB - odmítám ho. Bude stažena čerstvá kopie při příštím startu, a nebo hned přes Nastavení -> IP2Country -> 'Aktualizovat nyní'."
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr ""
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "IP2Country: jako zdroj GeoIP byl vybrán MaxMind, ale není nastaven licenční klíč. Otevřete Nastavení -> IP2Country, vložte svůj bezplatný licenční klíč MaxMind a klikněte na 'Aktualizovat nyní'."
+
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "IP2Country: jako zdroj GeoIP byla vybrána vlastní URL, ale není nastavena žádná URL. Otevřete Nastavení -> IP2Country a zadejte URL odkazující na soubor .mmdb (nebo .gz / .tar.gz, který jej obsahuje)."
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
-msgstr ""
+msgstr "IP2Country: nepodařilo se připojit k adrese pro stažení GeoIP."
 
-#: src/IP2Country.cpp:157
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download new %s from %s"
-msgstr "Stahování %s z %s selhalo"
+msgstr "Stahování nového souboru %s z %s"
 
-#: src/IP2Country.cpp:191
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download of %s file failed, aborting update."
-msgstr "Přejmenování souboru %s selhalo, přerušuji aktualizaci."
+msgstr "Stažení souboru %s selhalo, aktualizace se přerušuje."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Přejmenování souboru %s selhalo, přerušuji aktualizaci."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Přejmenování souboru %s selhalo, přerušuji aktualizaci."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "Úspěšně aktualizováno: %s"
 
-#: src/IP2Country.cpp:228
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Error updating %s"
-msgstr "Selhala aktualizace GeoIP.dat"
+msgstr "Chyba při aktualizaci %s"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
-msgstr ""
+msgstr "Stažení DB-IP pro aktuální měsíc selhalo - zkouším znovu s URL z předchozího měsíce."
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Stahování %s z %s selhalo"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Stahování seznamu serverů z %s selhalo"
-
-#: src/IPFilter.cpp:113
-#, fuzzy
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Načítám IP filtry 'ipfilter.dat' a 'ipfilter_static.dat'."
+msgstr "Načítání filtrů IP adres 'ipfilter.dat' a 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Nemohu načíst ipfilter.dat (%s), neznámý formát."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
-#, fuzzy, c-format
+#: src/IPFilter.cpp
+#, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr0 "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
-msgstr1 "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
-msgstr2 ""
+msgstr0 "Načten %u rozsah IP adres z '%s'."
+msgstr1 "Načteny %u rozsahy IP adres z '%s'."
+msgstr2 "Načteno %u rozsahů IP adres z '%s'."
 
-#: src/IPFilter.cpp:331
-#, fuzzy, c-format
+#: src/IPFilter.cpp
+#, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
-msgstr0 "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
-msgstr1 "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
-msgstr2 ""
+msgstr0 "%u chybný řádek byl zahozen."
+msgstr1 "%u chybné řádky byly zahozeny."
+msgstr2 "%u chybných řádků bylo zahozeno."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
-msgstr ""
+msgstr "Nepodařilo se přejmenovat nový soubor %s, aktualizace se přerušuje."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP filtr je připraven"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap od \n"
-"známých klientů"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Aktuální"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Klouzavý průměr"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Průměr sezení"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Uzly (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
-msgstr "Neplatná IP pro bootstrap"
+msgstr "Neplatná IP adresa pro zavedení sítě"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
-msgstr "Neplatný port pro bootstrap"
+msgstr "Neplatný port pro zavedení sítě"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
-msgstr "Prosím vyplňte všechna potřebná pole"
+msgstr "Prosím vyplňte všechna vyžadovaná pole"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Zpráva"
+
+#: src/KadDlg.cpp
 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:213
+#: src/KadDlg.cpp
 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:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Pokračovat?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: hledaný výraz je příliš krátký"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
-msgstr ""
+msgstr "Kademlia: Klíčové slovo hledání je již na seznamu hledání: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
-msgstr ""
+msgstr "Nepodařilo se přečíst soubor nodes.dat - je příliš starý. Tato verze (0) již není podporována."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
-#, fuzzy, c-format
+#: src/kademlia/routing/RoutingZone.cpp
+#, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
-msgstr0 "Přečteno %u Kad kontaktů"
-msgstr1 "Přečteno %u Kad kontaktů"
-msgstr2 ""
+msgstr0 "Načten %u kontakt Kad"
+msgstr1 "Načteny %u kontakty Kad"
+msgstr2 "Načteno %u kontaktů Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
-msgstr ""
+msgstr "Nebyly nalezeny žádné kontakty, proveďte prosím zavedení sítě nebo stáhněte soubor nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "K dispozici je pouze %d kontakt Kad, nodes.dat nebyl zapsán"
+msgstr1 "K dispozici jsou pouze %d kontakty Kad, nodes.dat nebyl zapsán"
+msgstr2 "K dispozici je pouze %d kontaktů Kad, nodes.dat nebyl zapsán"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "Zapsán %d kontakt Kad"
+msgstr1 "Zapsány %d kontakty Kad"
+msgstr2 "Zapsáno %d kontaktů Kad"
+
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Uživatel Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr "Hledání poznámek Kad pro '%s' nebylo zahájeno: Kad není připojen"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr "Hledání poznámek Kad pro '%s' nebylo zahájeno: pro tento soubor již probíhá vyhledávání poznámek"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr "Hledání poznámek Kad pro '%s' nebylo zahájeno: soubor není v seznamu sdílených souborů, ve frontě stahování ani ve výsledcích hledání"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr "Hledání poznámek Kad pro '%s' nebylo zahájeno: hash tohoto souboru již používá jiné Kad hledání (např. hledání zdrojů) - zkuste to znovu za chvíli"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr "Hledání poznámek Kad pro '%s' nebylo zahájeno: PrepareLookup selhalo"
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Velikost souboru"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Poměr sdílení"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Odesláno"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Vyžádáno"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Přijato"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Kompletní zdroje"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
-msgstr ""
+msgstr "VAROVÁNÍ: Seznam známých souborů je poškozen, obsahuje neplatnou hlavičku."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
-msgstr ""
+msgstr "Nepodařilo se načíst záznam v seznamu známých souborů, soubor může být poškozen"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
-msgstr ""
+msgstr "Neplatný záznam v seznamu známých souborů, soubor může být poškozen: "
 
-#: src/libs/common/Format.cpp:306
-#, fuzzy, c-format
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Výchozí pro systém"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albánština"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabský"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturian"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baskičtina"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulharský"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalánština"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Čínština (zjednodušená)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Čínština (tradiční)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Chorvatština"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Česky"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Dánština"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Nizozemština"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Angličtina (britská)"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "Angličtina (USA)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estonština"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finština"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francouzština"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galicijština"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Němčina"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Řečtina"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebrejština"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Maďarština"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italština"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japonština"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Korejština"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "Latvian"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Litevština"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norština"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polština"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugalština"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugalština (brazilská)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Rumunština"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Ruština"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slovinština"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Španělština"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Švédština"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turečtina"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukrajinština"
+
+#: src/libs/common/Format.cpp
+#, c-format
 msgid "Unknown error %d"
-msgstr "Neznámá verze"
+msgstr "Neznámá chyba %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
-#, fuzzy, c-format
+#: src/libs/common/Format.cpp
+#, c-format
 msgid "Unable to get error description for error %d"
-msgstr "Nemohu otevřít soubor se skinem %s pro čtení"
+msgstr "Nepodařilo se získat popis chyby %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Hashuji"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Dokončování"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Dokončeno"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Pozastaveno"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Poškozený"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Čekám"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Musíte zadat (neprázdné) heslo."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Neplatné heslo, není MD5 hash!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr "Nepodařilo se vyřešit překlad %s na adresu IPv4."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Chyba při připojování"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-#, fuzzy
-msgid "External Connection lost — exiting."
-msgstr "Externí připojení uzavřeno."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
+msgstr "Externí připojení ztraceno - ukončuji."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
-msgstr ""
+msgstr "EC připojení selhalo. Prázdná odpověď."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
-#, fuzzy
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr "Nepodařilo se nastavit šifrování připojení. Připojení uzavřeno."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr "Jádro nesjednalo šifrované spojení. Možná jde o starou verzi aMule bez podpory šifrování, nebo došlo k manipulaci se spojením. Připojení bez šifrování můžete nastavit v nastavení připojení."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
-msgstr "Špatná odpověď od serveru. Spojení uzavřeno."
+msgstr "Externí připojení: Chybná odpověď, handshake selhalo. Spojení uzavřeno."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Externí spojení: daemonu se nepodařilo dokázat, že zná heslo. Spojení ukončeno."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
-msgstr "Připojení k aMule uspělo"
+msgstr "Úspěch! Navázáno připojení k aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Připojení uspělo."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
-msgstr ""
+msgstr "Externí připojení: Přístup odepřen, protože: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
-#, fuzzy
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
-msgstr "Heslo pro externí připojení."
+msgstr "Externí připojení: Handshake selhalo."
 
-#: src/LibSocketAsio.cpp:1592
-#, fuzzy, c-format
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr "Chyba vytváření UDP socketu %s %d : %s"
+
+#: src/LibSocketAsio.cpp
+#, c-format
 msgid "Asio thread %d started"
-msgstr "Synchronizační vlákno spuštěno."
+msgstr "Vlákno asio %d spuštěno"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "Naslouchací socket: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
-msgstr "CHYBA: Nemohu naslouchat na TCP portu"
+msgstr "CHYBA: Nemohu naslouchat na TCP portu."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "CHYBA: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "VAROVÁNÍ: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr "Mediální metadata: nenalezen binární soubor ffprobe. Nainstalujte ffmpeg, nebo nastavte cestu ffprobe v nastavení; délka, datový tok a kodek nebude extrahován."
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr "Mediální metadata: %s je pryč, nic k extrahování"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr "Extrahování mediálních metadat pomocí ffprobe: %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr "Mediální metadata: ffprobe vypršel čas platnosti nebo bylo zrušeno pro %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr "Mediální metadata: ignorování nepravděpodobně velkého výstupu ffprobe pro %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr "Mediální metadata: nepodařilo se spustit ffprobe (%s) -- zkontrolujte nastavení metadat médií"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr "Mediální metadata: ffprobe selhalo (kód %d) pro %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr "Mediální metadata: ffprobe našelo nic použitelného v %s"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 "Dokončeno extrahování mediálních metadat z %u sdíleného souboru (%u selhalo)"
+msgstr1 "Dokončeno extrahování mediálních metadat ze %u sdílených souborů (%u selhalo)"
+msgstr2 "Dokončeno extrahování mediálních metadat z %u sdílených souborů (%u selhalo)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 "Dokončeno extrahování mediálních metadat z %u sdíleného souboru"
+msgstr1 "Dokončeno extrahování mediálních metadat ze %u sdílených souborů"
+msgstr2 "Dokončeno extrahování mediálních metadat z %u sdílených souborů"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 "%u další soubor selhal při extrakci metadat médií (není jednotlivě vypsáno)"
+msgstr1 "%u další soubory selhaly při extrakci metadat médií (nejsou jednotlivě vypsány)"
+msgstr2 "%u dalších souborů selhalo při extrakci metadat médií (nejsou jednotlivě vypsány)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 "%u další sdílený soubor je pryč (není uveden jednotlivě)"
+msgstr1 "%u další sdílené soubory jsou pryč (nejsou uvedeny jednotlivě)"
+msgstr2 "%u dalších sdílených souborů je pryč (nejsou uvedeny jednotlivě)"
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Vyjmout"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Vložit"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
-msgstr "Vyprázdnit"
+msgstr "Vyčistit"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Označit vše"
 
-#: src/MuleTrayIcon.cpp:367
-#, fuzzy
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "KiB/s"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Neomezený"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Zobrazit aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Skrýt aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
-msgstr "eD2k"
+msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
-msgstr "Připojen"
+msgstr "Připojeno (LowID)"
 
-#: src/MuleTrayIcon.cpp:371
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
-msgstr "Připojen"
+msgstr "Připojeno (HighID)"
 
-#: src/MuleTrayIcon.cpp:380
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
-msgstr " Kad: "
+msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
-msgstr "Připojen ke kad (za firewallem)"
+msgstr "Připojeno (za firewallem)"
 
-#: src/MuleTrayIcon.cpp:393
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
-msgstr "IP serveru: "
+msgstr "Server: "
 
-#: src/MuleTrayIcon.cpp:394
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
-msgstr "IP serveru:"
+msgstr "IP serveru: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Nepřipojen"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP port: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP port: nepřipraven"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP port: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP port: nepřipraven"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Informace o klientu"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Limit odesílání"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Limit stahování"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Zobrazit aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Odpojit"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Skrýt aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Připojit"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Ukončit"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Neomezený"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Tray menu aMule"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Rychlostní limity:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "UL: žádný"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "UL: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DL: žádný"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DL: %u"
 
-#: src/MuleTrayIcon.cpp:797
-#, fuzzy, c-format
+#: src/MuleTrayIcon.cpp
+#, c-format
 msgid "Download speed: %.1f%s"
-msgstr "Rychlost stahování: %.1f"
+msgstr "Rychlost stahování: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
-#, fuzzy, c-format
+#: src/MuleTrayIcon.cpp
+#, c-format
 msgid "Upload speed: %.1f%s"
-msgstr "Rychlost odesílání: %.1f"
+msgstr "Rychlost odesílání: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Přezdívka: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Nezvolena žádná přezdívka!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID klienta: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Název serveru: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP serveru: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Nepřipojen"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online podpis: Povolen"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online podpis: Zakázán"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
-msgstr "Uptime: %s"
+msgstr "Dostupnost: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Sdílené soubory: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Klienti ve frontě: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Celkem DL: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Celkem UL: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k odkaz: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr "Vytvořeno %s na portu %u"
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Přidat"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr "VAROVÁNÍ! %s: Paket k %s byl zahozen kvůli chybě (%s) při odesílání."
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr "Vložte sem odkazy eD2k nebo magnet"
+
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "Přidat odkazy"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
-msgstr ""
+msgstr "Klikněte sem pro přidání eD2k odkazu z textového pole do fronty stahování."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr "Zde se zobrazují události. Úplný seznam událostí naleznete v logu na kartě Sítě."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Načítání ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
-msgstr ""
+msgstr "Počet uživatelů na serveru, ke kterému jste připojeni ..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Uživatelů: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
-msgstr ""
+msgstr "Uživatelé připojeni k aktuálnímu serveru a odhad celkového počtu uživatelů."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Up: 0.0 | Down: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
-msgstr ""
+msgstr "Aktuální průměrné rychlosti odesílání a stahování. Pokud je povoleno, čísla v závorkách označují režii z komunikace mezi klienty."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 ""
+msgstr "Zobrazuje stav připojení a aktivní přenosy. Červené šipky znamenají, že momentálně nejste připojeni, žluté šipky znamenají nízké ID (za firewallem) a zelené šipky znamenají vysoké ID (optimální typ připojení)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Nepřipojen ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Aktuální připojený server."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Vyhledávání"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Název:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Typ"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Lokální"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Globální"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Rozšířené parametry"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtrování"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Typ souboru"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Cokoliv"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Archívy"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "Obrazy CD"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr "Obrazy disků"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Obrázky"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programy"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Texty"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Videa"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Přípona"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Min. velikost"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "bajtů"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "KiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "MiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "GiB"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Max. velikost"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Dostupnost"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtr:"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtr"
 
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filtrování výsledků"
-
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Invertovat výsledek"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Skrýt známé soubory"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr "Resetovat filtry"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Spustit"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Více"
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "Rozšířit"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
-msgstr ""
+msgstr "Požádat o rozšíření hledání uzly Kad, které již odpověděly. Každé kliknutí se dotáže dalšího nejbližšího uzlu na další kontakty (KADEMLIA_FIND_VALUE_MORE), čímž se najdou další shody souborů, které počáteční alfa fronta hledání nezachytila."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Zastavit"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Stahování"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Stažení v kategorii"
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "Vyčistit výsledky vyhledávání"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
-msgstr "Vyprázdnit pole"
+msgstr "Resetovat pole"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Výsledky"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Vyčistí dokončená stahování"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtr:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Zdroje souboru:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Hlavní"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Celá název:"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Celý název"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "soubor .met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Soubor .met:"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Velikost souboru"
 
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash:"
+#: src/muuli_wdr.cpp src/Statistics.cpp
+msgid "Transfer"
+msgstr "Přenos"
 
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Velikost:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Stav částečného souboru"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Naposledy viděno jako kompletní"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Nalezené zdroje"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Přenášející zdroje"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Filepart-počet"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Dostupné"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Datová míra"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Doba aktivního stahování"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Dokončená velikost"
 
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
+msgstr "Chytré zacházení s poškozenými částmi"
 
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Naposledy spatřen kompletní:"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Ztraceno poškozením"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Získáno kompresí"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Balíčků zachráněných pomocí I.C.H."
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr "Sdílení"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
-msgid "Transfer"
-msgstr "Přenos"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Požadavky"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Nalezené zdroje:"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Přijaté požadavky"
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr ""
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Přenesená data"
 
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr ""
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Poměr sdílení"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Kompletní zdroje"
 
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Dostupný:"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "Sdíleno od"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "Poslední odeslání"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr "Media Info"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr ""
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "Délka"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Doba stahování:"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "Datový tok"
 
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Přeneseno:"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "Kodek"
 
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Dokončeno:"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "Umělec"
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
-msgstr "Chytré zacházení s poškozenými částmi"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "Album"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Ztraceno poškozením:"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Získáno kompresí:"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Balíčků zachráněných pomocí I.C.H.:"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Titulek"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Názvy souborů"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Převzít"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Upravit"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Použít"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Budiž"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
-msgstr ""
+msgstr "Komentář/hodnocení souboru (text bude viditelný všem uživatelům)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 uvést jeho délku, děj, jazyk ...\n"
+"a pokud jde o podvrh, můžete to sdělit ostatním uživatelům aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Kvalita souboru"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Nehodnocené"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Neplatný / porušený / podvod"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Špatný"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "V pořádku"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Dobrý"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Výborný"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
-msgstr ""
+msgstr "Vyberte hodnocení souboru nebo upozorněte uživatele, že soubor je neplatný ..."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "Získat z Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Stahuji, prosím čekejte ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Neznámá velikost"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
-msgstr "Nezbytné informace"
-
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP adresa :"
+msgstr "Vyžadovaná informace"
 
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Dodatečné informace"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Uživatelské jméno:"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Hash uživatele"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Přidat"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Rychlost stahování"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr ""
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr ""
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Průměr sezení"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Rychlost odesílání"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Připojení"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktivní stahování"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktivní připojení (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktivní odesílání"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Strom statistik"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Jméno:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Software klienta:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Verze klienta:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Software klienta"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Verze klienta"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID uživatele"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP serveru"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP adresa:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Název serveru"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID uživ.:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP serveru:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Název serveru:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Zatemnění:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Zamaskování"
+
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr "Rozšíření protokolu"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Přenosy ke klientovi"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Průmerná rychlost odesílání:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Průměrná rychlost stahování:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Odesláno (sezení):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Staženo (sezení):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Odesláno (celkem):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Aktuální požadavek"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Průměrná rychlost odesílání"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Průměrná rychlost stahování"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Odesláno (sezení)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Staženo (sezení)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Odesláno (celkem)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Staženo (celkem)"
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Staženo (celkem):"
-
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Skóre"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "DL/UP poměr:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Secure ident"
 
-#: src/muuli_wdr.cpp:1167
-#, fuzzy
-msgid "Queue rank:"
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
 msgstr "Pořadí ve frontě"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Skóre fronty"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
-msgstr ""
+msgstr "https://amule-org.github.io - více-platformový Mule"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
-msgstr ""
+msgstr "Jazyk: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Prodleva před zobrazením tooltipů."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
-msgstr "Jazyk ovládání programu"
+msgstr "Toto stanovuje jazyk ovládání."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Kontrola nové verze po spuštění"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
+msgstr "Pravidelně kontrolovat novou verzi"
 
-#: src/muuli_wdr.cpp:1218
-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
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr "Povolením této volby bude aMule kontrolovat novou verzi při spuštění a jednou denně během běhu"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
-msgstr ""
+msgstr "Zaregistruje v operačním systému záznam automatického spouštění aMule po přihlášení uživatele. Pokud přesunete binární soubor aMule, spusťte poté aMule jednou ručně, aby se záznam obnovil."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr "Nastaví aMule jako výchozí program/ovladač pro odkazy ed2k://, takže se otevře kliknutím na takový odkaz v prohlížeči nebo ve správci souborů."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr "aMule zpracovává pouze magnety kompatibilní s eD2k (obsahující xt=urn:ed2k:). Magnety BitTorrent NEJSOU podporovány a kliknutí na ně tiše selže. Pokud používáte klienta BitTorrent (Transmission, qBittorrent atd.), ponechte tuto volbu vypnutou."
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr "Otevřením kolekce se do fronty zařadí každý eD2k odkaz, který obsahuje. Na Windows to přidá aMule do seznamu „Otevřít pomocí“ a stane se výchozím pouze v případě, že žádný jiný program tento typ souboru nepřevzal."
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Minimalizace po spuštění"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
-msgstr "aMule se po spuštění minimalizuje"
+msgstr "Zapnutí způsobí minimalizaci aMule po spuštění."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Ptát se na ukončení programu"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
-msgstr ""
+msgstr "Způsobí, že se aMule před ukončením zeptá."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Povolit ikonu v trayi"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Povolí/zakáže ikonu v systray."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
-msgstr ""
+msgstr "Skrýt okno aplikace po stisknutí tlačítka pro uzavření"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimalizovat do tray ikony"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 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:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
-msgstr ""
+msgstr "Zobrazit oznámení po dokončení stahování"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
-msgstr ""
+msgstr "Povolením této volby bude aMule zobrazovat oznámení po dokončení stahování."
+
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr "Pamatovat historii hledání"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr "Uchovává rozevírací seznam vašich předchozích vyhledávaných výrazů v poli Název na kartě Hledání. Pamatuje si dotazy, které jste zadali, nikoli výsledky, které vrátily."
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
-msgstr ""
+msgstr "Doba prodlevy vyskakovacího popisku: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
-msgstr ""
+msgstr "sekund"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Výběr prohlížeče"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
-msgstr ""
+msgstr "Zde zadejte název svého prohlížeče. Ponechte pole prázdné, chcete-li použít výchozí prohlížeč systému."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Procházet"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Otevřít pokud možno v novém tabu"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Video přehrávač"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Limity šířky pásma"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Odesílání"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Přidělování slotů"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Porty"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Standardní TCP port"
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Tohle je standardní eD2k port a nelze jej zakázat."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "UDP port pro požadavky serveru (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Rozšířený UDP port (Kad / globální vyhledávání)"
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Povolit UPnP port forwarding"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnP TCP port (volitelné):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
-msgstr ""
+msgstr "Přidružit místní adresu k IP (prázdné pro jakoukoli):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 msgid "Advanced users only: If you have multiple network interfaces, enter the address of the interface to which aMule should be bound."
-msgstr ""
+msgstr "Pouze pro pokročilé uživatele: Pokud máte více síťových rozhraní, zadejte adresu rozhraní, ke kterému by měl být aMule svázán."
+
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr "Přidružit k síťovému rozhraní (prázdné pro všechna):"
 
-#: src/muuli_wdr.cpp:1391
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr "Jen pro pokročilé uživatele: přiřazení veškerého síťového provozu aMule k jednomu síťovému rozhraní, vybranému ze seznamu nebo zadanému podle jména (např. tun0, eth0, en0) nebo indexu. Na rozdíl od přidružení k IP toto brání únikům síťového provozu výchozí trasou - užitečné při používání VPN. Nevyžaduje žádná zvýšená oprávnění."
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Max. zdrojů na stahovaný soubor:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Maximum připojení naráz:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Automatické připojení po spuštění"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Po odpojení znovu připojit"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Odstranit mrtvý server po"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr "Stálé servery nejsou nikdy odebrány, ani když jsou nedostupné."
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "pokusech"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Automaticky aktualizovat seznam serverů po spuštění"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Seznam"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
-msgstr ""
+msgstr "Aktualizace seznamu serverů při připojení k serveru"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
-msgstr ""
+msgstr "Aktualizovat seznamu serverů při připojení klienta"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Použít systém priorit"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Použít po připojení chytrou kontrolu LowID"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Bezpečné připojení"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
-msgstr ""
+msgstr "Automaticky se připojit jen ke stálým serverům"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Přidělit ručně přidaným serverům vysokou prioritu"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Inteligentní zpracování poškození (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Povolit"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Přidávat soubory ke stažení do fronty pozastavené"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 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:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Pokusit se nejprve stáhnout první a poslední části"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr "Režim koncovka: u posledních bloků dat souborů přepínat na rychlejší zdroje"
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
-msgstr ""
+msgstr "Po dokončení souboru spustit další pozastavený soubor"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Ze stejné kategorie"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
-msgstr ""
+msgstr "V abecedním pořadí"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Předalokovat místo na disku pro nové soubory"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
-msgstr ""
+msgstr "U nových souborů předem vyhradí místo na disku pro celý soubor, čímž se snižuje fragmentace"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr "Vytvářet nové soubory jako sparse soubory"
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr "Sparse soubory .part zabírají místo na disku pouze pro již stažené části, takže volné místo se postupně zaplňuje s tím, jak se soubor doplňuje. Vypněte tuto volbu, chcete-li místo toho použít běžný soubor - užitečné tam, kde sparse soubory nejsou podporovány nebo jsou pomalé, nebo kde je nástroje pro zálohování/deduplikaci zpracovávají špatně. Platí pouze tehdy, když jádro běží na Windows; na Linuxu a macOS jsou soubory .part sparse tak jako tak a toto nastavení nemá žádný účinek."
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
-msgstr ""
+msgstr "Zastavit stahování, jakmile volné místo na disku dosáhne "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Zadejte minimum místa na disku."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr ""
+msgstr "Uložit 10 zdrojů u vzácných souborů (< 20 zdrojů)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Odesílání"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Přidat nově sdílené soubory s \"auto\" prioritou"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Cílový adresář pro stahování"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Inteligentní zpracování poškození (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Povolit"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Pokročilé I.C.H. důvěřuje každému hashi (není doporučeno)"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr "Extrakce metadat médií"
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "Získat délku / datový tok / kodek ze sdílených zvukových a video souborů"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr "Je-li povoleno, aMule spustí ffprobe na každém sdíleném mediálním souboru, aby vyplnil sloupce Délka / Datový tok / Kodek, které ostatní klienti vidí, když soubor najdou při hledání. Vyžaduje nainstalovaný ffmpeg (binární soubor ffprobe)."
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr "Cesta k ffprobe:"
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr "Úplná cesta k binárnímu souboru ffprobe. Ponechte prázdné, aby jej aMule automaticky zjistil při spuštění."
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr "Zjistit"
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr "Vyhledat binární soubor ffprobe ve standardních instalačních umístěních a vyplnit pole cesty."
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
+"Dokončená stahování jsou ukládají zde. Všechny soubory v této složce jsou automaticky sdíleny s ostatními uživateli.\n"
+"Pokud tato složka obsahuje i soubory, které nechcete sdílet, nastavte podsložku určenou pouze pro aMule."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
-msgstr ""
+msgstr "Vyberte složku, kam se budou ukládat dokončená stahování. Všechny soubory v této složce budou sdíleny s ostatními uživateli."
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Sdílené složky"
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr "(Složky sdílené jádrem. Přidejte cestu pro přidání nové.)"
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Sdílené adresáře"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr "Absolutní cesta ke složce na počítači jádra, např. /home/user/shared"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr "Rekurzivní"
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr "Sdílet každou podsložku pod touto, včetně těch vytvořených později."
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Odebrat"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
-msgstr ""
+msgstr "(Klikněte pravým tlačítkem na ikonu složky pro rekurzivní sdílení)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Sdílet skryté soubory"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
-msgstr ""
+msgstr "Automaticky prohledávat sdílené složky na změny"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
-msgstr ""
+msgstr "Sledovat symbolické odkazy ve sdílených složkách"
+
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr "Vyloučit soubory odpovídající:"
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr "Zástupné vzory oddělené znakem '|', např. .DS_Store|Thumbs.db|*.tmp. Soubory, jejichž název odpovídá těmto vzorům, nejsou sdíleny. Porovnávání nebere ohled na velikost písmen."
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr "Vzory jsou regulárními výrazy"
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr "Je-li nastaveno, celé pole je jeden regulární výraz ('|' znamená alternaci). Není-li nastaveno, jedná se o seznam zástupných vzorů oddělených znakem '|'."
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr "Zobrazit, kolik sdílených souborů by aktuální vzor vyloučil."
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr "Pokud se soubory připojeného jádra nacházejí na jiném počítači, namapovat předponu cesty, kterou jádro hlásí, na místo, odkud je tento souborový systém odtud přístupný (například síťový disk), aby fungovaly funkce „Otevřít“ a „Zobrazit ve složce“."
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr "Mapování cest"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr "Vzdálená předpona"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr "Předpona cesty tak, jak ji jádro hlásí, např. /home/user/downloads/incoming"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr "Místní předpona"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr "Kde je stejná složka dostupná z tohoto počítače, např. umístění na které je připojena síťově sdílená složka"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafy"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Prodleva aktualizace: 5 sekund"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
-msgstr ""
+msgstr "Čas pro průměrný graf: 100 minut"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
-msgstr ""
+msgstr "Měřítko grafu připojení: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
-msgstr ""
+msgstr "Měřítko grafu stahování:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
-msgstr ""
+msgstr "Měřítko grafu odesílání:"
 
-#: src/muuli_wdr.cpp:1660
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Barvy: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Na pozadí"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Mřížka"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
-msgstr ""
+msgstr "Aktuální stahování"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
-msgstr ""
+msgstr "Klouzavý průměr stahování"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
-msgstr ""
+msgstr "Průměr stahování za sezení"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
-msgstr ""
+msgstr "Aktuální odesílání"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
-msgstr ""
+msgstr "Klouzavý průměr odesílání"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
-msgstr ""
+msgstr "Průměr odesílání za sezení"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktivní připojení"
 
-#: src/muuli_wdr.cpp:1675
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
-msgstr "Ukazatel rychlosti v tray ikoně"
+msgstr "Ukazatel rychlosti v ikoně oznamovací oblasti"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
-msgstr ""
+msgstr "Uzly Kad – aktuální počet"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
-msgstr ""
+msgstr "Uzly Kad v provozu"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
-msgstr ""
+msgstr "Uzly Kad za sezení"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Vyberte"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Strom"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Počet verzí klientů k zobrazení (0=neomezeně)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! VAROVÁNÍ !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Max. nových připojení za 5 sek."
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr "Souběžná vyhledávání zdrojů Kad"
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr "Interval opakovaného vyhledávání zdrojů v síti Kad (minuty)"
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr "Interval opakovaného dotazování zdrojů (minuty)"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Velikost zásobníku pro soubory: 240000 bytů"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr "Použít MMAP: přístup k souborům mapovaným do paměti (nižší spotřeba paměti)"
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr "Mapuje dočasné soubory do paměti místo jejich ukládání do vyrovnávací paměti heap, čímž snižuje paměťovou náročnost procesu. Na některých discích může snížit rychlost stahování; nejlépe se hodí pro hostitele s omezenou pamětí nebo s velkým objemem odesílání."
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Velikost fronty odesílání: 5000 klientů"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
-msgstr ""
+msgstr "Interval obnovení připojení k serveru: Zakázat"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
-msgstr ""
+msgstr "Zakázat časovaný úsporný režim počítače"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Vzhled: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
-msgstr ""
+msgstr "Zobrazit \"Rychlý ovladač eD2k odkazů\" v každém okně."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Zobrazit rozšířené informace na tabech kategorií"
 
-#: src/muuli_wdr.cpp:1784
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
-msgstr "Zobrazit rychlosti přenosu v titulku okna"
+msgstr "Zobrazovat verzi aplikace v titulku okna"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Zobrazit rychlosti přenosu v titulku okna"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Před názvem programu"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Za názvem programu"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Zobrazit šířku pásma režie"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Vertikální umístění nástrojové lišty"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr "Živé řazení sloupců (automatické přeuspořádání řádků při změně hodnot)"
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
-msgstr ""
+msgstr "Soubory fronty stahování"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Zobrazit procenta průběhu"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Zobrazit ukazatel průběhu"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plochý"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Kulatý"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Automaticky řadit soubory (žere CPU)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Nastavení externího připojení"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Přijímat externí připojení"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP naslouchajícího zařízení:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 ""
+msgstr "Zde zadejte platnou IP adresu ve formátu a.b.c.d pro naslouchající rozhraní EC. Prázdné pole nebo 0.0.0.0 bude znamenat libovolné rozhraní."
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "TCP port:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Povolit UPnP port forwarding na EC portu"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Heslo"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr "Vyžadovat šifrovaná připojení (odmítá klienty bez podpory šifrování)"
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr "Parametry serveru aMule API"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr "Spustit amuleapi (REST API) při startu"
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "HTTP port:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr "Rozhraní, na kterém naslouchá HTTP server amuleapi. 127.0.0.1 (výchozí) přijímá pouze místní připojení; použijte 0.0.0.0 nebo konkrétní IP adresu pro zpřístupnění ostatním hostitelům (nastavte níže heslo administrátora)."
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr "Zadejte heslo pro jeho nastavení nebo změnu. Uložená hesla nelze zobrazit, takže ponecháním prázdného pole zůstane zachováno aktuální heslo."
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "Heslo administrátora"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "Heslo je nastaveno."
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "Povolit přístup pro hosty"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr "Sezení hostů mohou číst stav a seznamy, ale nemohou nic měnit. Vypnutím této volby se vymaže uložené heslo hosta."
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "Heslo hosta"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Parametry webserveru"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "Spustit webserver při spuštění aMule"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr "Spustit webový server při startu (zastaralé)"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Šablona webu"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Heslo pro plná práva"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Povolit uživatele s omezenými právy"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Heslo pro omezená práva"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Povolit UPnP port forwarding portu webserveru"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "UPnP TCP port webserveru (volitelné)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Obnovování stránky (v sek.)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Povoliz Gzip kompresi"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr "Resetovat stránku do výchozího stavu"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr "Resetovat nastavení na aktuální stránce na výchozí hodnoty."
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Budiž"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Klikněte zde pro aplikování změn nastavení."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
-msgstr "Zahodí všechny změny v nastavení."
-
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Titulek:"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Komentář:"
+msgstr "Resetovat jakékoli změny v nastavení."
 
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Příchozí adresář:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Příchozí adresář"
 
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Změnit prioritu pro nově přiřazené soubory:"
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Změnit prioritu pro nově přiřazené soubory"
 
-#: src/muuli_wdr.cpp:2018
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Neměnit"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Barva pro tuto kategorii:"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Reset"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Vyberte barvu pro tuto kategorii (nyní vybranou)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
-msgstr "Klikněte na toto tlačítko pro vynulování logu."
+msgstr "Klikněte na toto tlačítko pro resetování logu."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
-msgstr ""
+msgstr "Klikněte na toto tlačítko pro aktualizaci seznamu serverů z URL ..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Seznam serverů"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 ""
+msgstr "Zde zadejte URL souboru server.met a stiskněte tlačítko vlevo pro aktualizaci seznamu známých serverů."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Přidat server ručně: Název"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Zadejte název serveru"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Zadejte port serveru."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
-msgstr ""
+msgstr "Ručně přidat server (nejprve vyplňte pole vlevo) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Log aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Info o serveru"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2K Info"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
-msgstr "Kad Info"
+msgstr "Kad info."
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Aktualizuje seznam uzlů z dané URL..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Uzly (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 ""
+msgstr "Zde zadejte URL souboru nodes.dat a stiskněte tlačítko vlevo pro aktualizaci seznamu známých uzlů."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Statistiky uzlů"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Bootstrap"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nový uzel"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Port:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "Bootstrap od známých klientů"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Odpojit Kad"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr "Zavedení prostřednictvím uzlu: IP"
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Zadejte sem IP adresu uzlu ve formátu x.x.x.x."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Použít bezpečnou uživatelskou identifikaci"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
-msgstr ""
+msgstr "Doporučuje se tuto možnost povolit. Pokud SUI není povoleno, nebudete dostávat kredity."
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
-msgstr "Zatemnění protokolu"
+msgstr "Zamaskování protokolu"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
-msgstr "Podporuje zatemnění protokolu"
+msgstr "Podpora zamaskování protokolu"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
-msgstr ""
+msgstr "Tato možnost zapíná zamaskování protokolu a nastavuje aMule tak, aby přijímal zamaskovaná připojení od ostatních klientů."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
-msgstr "Použít zatemnění protokolu pro odchozí spojení"
+msgstr "Použít zamaskování protokolu pro odchozí spojení"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
-msgstr ""
+msgstr "Tato možnost nastavuje aMule tak, aby při připojování k ostatním klientům/serverům používal zamaskování protokolu."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Přijímat pouze zatemněná spojení"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
-msgstr ""
+msgstr "Tato možnost nastavuje aMule tak, aby přijímal pouze zamaskovaná připojení. Budete mít méně zdrojů, ale veškerý váš provoz bude zamaskovaný"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Všichni"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Nikdo"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Kdo může prohlížet moje sdílené soubory:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
-msgstr ""
+msgstr "Vyberte, kdo může požádat o zobrazení seznamu vašich sdílených souborů."
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP filtrování"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtrovat klienty"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
-msgstr ""
+msgstr "Povolit filtrování IP adres klientů definovaných v souboru ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtrovat servery"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
-msgstr ""
+msgstr "Povolit filtrování IP adres serverů definovaných v souboru ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Obnovit seznam"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
-msgstr ""
+msgstr "Znovu načíst seznam IP adres k filtrování ze souboru ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
-msgstr "Obnovit"
+msgstr "Aktualizovat nyní"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Automaticky aktualizovat IP filtr po spuštění"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Úroveň filtrování:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Vždy filtrovat LAN IP"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoidní nakládání s nesouhlasícími IP"
 
-#: src/muuli_wdr.cpp:2438
-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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr "Odmítne paket, pokud se jeho zdrojová IP liší od IP, kterou uvádí klient (kontrola proti spoofingu). Zakažte pouze v případě, že způsobuje problémy s připojením."
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Použít systémový ipfilter.dat, je-li dostupný"
 
-#: src/muuli_wdr.cpp:2441
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
-msgstr "Neexistuje-li místní ipfilter.dat, umožní použití systémového."
+msgstr "Pokud nebyl nalezen žádný místní soubor ipfilter.dat, povolit použití celosystémového souboru ipfilter."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Povolit online podpis"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
-msgstr ""
+msgstr "Povolí zápis souboru OS, který mohou externí aplikace použít k vytváření podpisů a podobně."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Prodleva aktualizace (sek.):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
-msgstr ""
+msgstr "Změnit frekvenci (v sekundách) aktualizací online podpisu."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
-msgstr ""
+msgstr "Uložit online soubor podpisu v: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
-msgstr ""
+msgstr "Klikněte sem pro výběr adresáře obsahujícího soubory online podpisu."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
-msgstr ""
+msgstr "Zobrazit vlajky zemí u klientů"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
-msgstr ""
+msgstr "Zobrazit sloupec s vlajkou země v seznamu přenosů, frontě a hledání. Vyžaduje platnou GeoIP databázi MMDB (viz níže)."
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
-msgstr ""
+msgstr "Databáze"
 
-#: src/muuli_wdr.cpp:2536
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Source:"
-msgstr "Zdroje"
+msgstr "Zdroj:"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
-msgstr ""
+msgstr "DB-IP (zdarma, žádný účet)"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
-msgstr ""
+msgstr "MaxMind GeoLite2 (zdarma, vyžaduje účet)"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
-msgstr ""
+msgstr "Vlastní URL"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
-msgstr ""
+msgstr "Vyberte poskytovatele GeoIP databáze MMDB. Výchozí je DB-IP - není vyžadován účet. MaxMind vyžaduje bezplatný účet + licenční klíč. Pomocí Vlastní URL můžete odkázat na jiný zdroj MMDB (např. místní zrcadlo)."
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
 "IP-to-Country data by DB-IP.com - https://db-ip.com\n"
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
+"Není vyžadována žádná konfigurace.\n"
+"\n"
+"Data IP-to-Country poskytuje DB-IP.com - https://db-ip.com\n"
+"Licence: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
-msgstr ""
+msgstr "Licenční klíč:"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4254,853 +5439,767 @@
 "License: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
+"Zaregistrujte si bezplatný účet MaxMind a poté vygenerujte licenční klíč:\n"
+"https://www.maxmind.com/en/geolite2/signup\n"
+"\n"
+"Tento produkt obsahuje data GeoLite2 vytvořená společností MaxMind - https://www.maxmind.com\n"
+"Licence: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
+"Vyžaduje uvedení zdroje a registraci účtu; obnovujte alespoň každých 30 dní."
 
-#: src/muuli_wdr.cpp:2595
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
-msgstr "Stahování: "
+msgstr "Adresa URL pro stažení:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
+"Musí odkazovat na soubor .mmdb nebo na .gz / .tar.gz, který jej obsahuje.\n"
+"URL může obsahovat přihlašovací údaje (https://user:pass@host/...).\n"
+"Podmínky licence a uvedení zdroje určuje zdrojová URL - odpovědnost nesete vy."
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
-msgstr ""
+msgstr "Stáhnout GeoIP databázi z vybraného zdroje."
 
-#: src/muuli_wdr.cpp:2616
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
-msgstr "Automaticky aktualizovat IP filtr po spuštění"
+msgstr "Automatická aktualizace při spuštění"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
-msgstr ""
+msgstr "Znovu stáhnout GeoIP databázi z vybraného zdroje při každém spuštění aMule."
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
-msgstr ""
+msgstr "Filtrovat příchozí zprávy (s výjimkou aktuálního chatu):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtrovat všechny zprávy"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
-msgstr "Filtrovat zprávy, které nejsou od přátel"
+msgstr "Filtrovat zprávy, které nejsou od kamarádů"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtrovat zprávy od neznámých klientů"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrovat zprávy obsahující (použijte ',' jako oddělovač):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
-msgstr ""
+msgstr "Zobrazit přijaté zprávy v logu"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Komentáře"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrovat komentáře obsahující (použijte ',' jako oddělovač):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Povolit autentizaci"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Povolí/zakáže autentizaci (uživatelské jméno a heslo)"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Uživatelské jméno: "
-
-#: src/muuli_wdr.cpp:2689
-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:2691
-msgid "Password:"
-msgstr "Heslo:"
-
-#: src/muuli_wdr.cpp:2694
-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:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Povolit proxy"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Povolí/zakáže proxy"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Typ proxy:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Hostitel proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Typ proxy"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Hostitel proxy"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Název hostitele proxy"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Port proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Port proxy"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Port proxy"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Povolit autentizaci"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Povolí/zakáže autentizaci (uživatelské jméno a heslo)"
+
+#: src/muuli_wdr.cpp
+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
+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
 msgid "Connect to:"
 msgstr "Připojit se k:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Připojit k vzdálené aMuli"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Uživatelské jméno"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Zapamatovat si toto nastavení"
 
-#: src/muuli_wdr.cpp:2766
-#, fuzzy
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "Šifrovat připojení (doporučeno)"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
-msgstr "Použít gzip kompresi"
+msgstr "Vynutit kompresi ZLIB"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
-msgstr ""
+msgstr "Povolit podrobné ladicí logování."
 
-#: src/muuli_wdr.cpp:2792
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
-msgstr "&Otevřít tento soubor"
+msgstr "Pouze do souboru logu"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
-msgstr ""
+msgstr "Kategorie zpráv:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Čekání..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
-msgstr ""
+msgstr "Přidat importy"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
-msgstr ""
+msgstr "Opakovat vybrané"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Odstranit vybrané"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
-msgstr ""
+msgstr "Typy událostí"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
-msgstr ""
+msgstr "Statistiky a klienti ve frontě pro vybrané soubory: sezení / celkem"
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Aktivní odesílání"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Zobrazit klienty pro"
 
-#: src/muuli_wdr.cpp:3002
-#, fuzzy
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
-msgstr "Všechny sdílené soubory"
+msgstr "Všechny soubory"
 
-#: src/muuli_wdr.cpp:3003
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Selected files"
-msgstr "Sdílené soubory"
+msgstr "Vybrané soubory"
 
-#: src/muuli_wdr.cpp:3004
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
-msgstr "Aktivní odesílání"
-
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "Zobrazit klienty"
+msgstr "Pouze aktivní odesílání"
 
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Obnovit:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Znovu načíst vaše sdílené soubory"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Odešle zadanou zprávu."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Zavře tento chat."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Připojit k nějakému serveru a/nebo Kadu"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "Zrušit %s"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Sdílené soubory"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "Odpojit %s"
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "Připojit %s"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Zakázaný %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+msgstr0 "bajt"
+msgstr1 "bajty"
+msgstr2 "bajtů"
+
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "TiB"
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+msgstr0 "bajt/sek."
+msgstr1 "bajty/sek."
+msgstr2 "bajtů/sek."
+
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "MiB/s"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sek."
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "min."
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
-msgstr "hod."
+msgstr "hodin"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "dní"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "vše"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "vše ostatní"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Nekompletní"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Archív"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Text"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Aktivní"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Používám konfigurační adresář: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr "Tento zdroj nemá část"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr "Vy a tento zdroj máte část"
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr "Právě je stahováno od tohoto zdroje"
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr "Další část, která bude požadována od tohoto zdroje"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr "Tento zdroj má část a stále ji potřebujete"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr "Tento peer již má část"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr "Tento peer nemá část"
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr "Tuto část nemá žádný jiný zdroj"
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr "Jeden další zdroj má tuto část"
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr "%u nebo více dalších zdrojů má tuto část"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr "Již zpětně přečteno a hashováno"
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr "Ještě bude čteno"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr "Jeden blok na část souboru je stahován."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr "Jeden blok na část sdíleného souboru."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Jeden blok na část sdíleného souboru, zbarvený podle toho, kolik dalších zdrojů ho má."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Jeden blok na každou část sdíleného souboru, ukazující jak daleko přehashování četlo."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr "V mezi, tmavne v průběhu přidávání dalších zdrojů"
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
-msgstr ""
+msgstr "Čekání na ukončení vlákna pro převod souboru part..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Importování %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
-msgstr "Čtení dočasného adresáře"
+msgstr "Čtení dočasné složky"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
-msgstr ""
+msgstr "Načítání základních informací ze souboru informací o stahování"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Vytvářím cílový soubor"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
-msgstr ""
+msgstr "Načítání dat ze starého souboru stahování (%u z %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
-msgstr ""
+msgstr "Ukládání bloku dat do nového jednoho souboru stahování (%u z %u)"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
-msgstr ""
+msgstr "Načítání informací o zdrojovém souboru stahování"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 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
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Import částečných souborů"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Stav"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Hash souboru"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (disk: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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)"
+msgstr "Vyberte prosím složku, ve které se mají hledat dočasná stahování! (zahrnou se i podsložky)"
 
-#: src/PartFileConvertDlg.cpp:208
-#, fuzzy
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
-msgstr "Přejete si smazat zdrojové soubory úspěšný importovaných stahování?"
+msgstr "Chcete, aby byly zdrojové soubory úspěšně importovaných stahování smazány?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Odstranit zdroje?"
 
-#: src/PartFile.cpp:364
-#, fuzzy
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
-msgstr "CHYBA: Částečný soubor nelze vytvořit)"
+msgstr "CHYBA: Nepodařilo se vytvořit soubor part"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, 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:409
+#: src/PartFile.cpp
 #, 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:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "CHYBA: Neplatná verze souboru part.met: %s ==> %s"
 
-#: src/PartFile.cpp:664
-#, fuzzy, c-format
+#: src/PartFile.cpp
+#, 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."
+msgstr "Chyba: %s (%s) je poškozen (chybné štítky: %s), soubor nelze načíst."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
+msgstr "CHYBA: %s (%s) je poškozen (nesprávný počet štítků), soubor nelze načíst."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Zkouším obnovit info o souboru..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Nelze obnovit info o souboru :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Nelze otevřít %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "VAROVÁNÍ: %s je možná poškozený (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, 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:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "I/O chyba během ukládání části: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
-msgstr ""
+msgstr "Zapsáno 0/neznámý počet bajtů do '%s' -- zachovává se stávající .part.met."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "Uložen %i zdrojový seed pro částečný soubor: %s (%s)"
+msgstr1 "Uloženy %i zdrojové seedy pro částečný soubor: %s (%s)"
+msgstr2 "Uloženo %i zdrojových seedů pro částečný soubor: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
-msgstr ""
+msgstr "Nelze přečíst soubor zdrojů seeds pro soubor Partfile %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr ""
+msgstr "Chyba při čtení souboru zdrojů seeds patřícímu k částečnému souboru Partfile (%s - %s): %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "Nalezena poškozená část (%d) v %d částečném souboru %s - FileResultHash |%s| FileHash |%s|"
+msgstr1 "Nalezena poškozená část (%d) v %d částečných souborech %s - FileResultHash |%s| FileHash |%s|"
+msgstr2 "Nalezena poškozená část (%d) v %d částečných souborech %s - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
-msgstr ""
+msgstr "Nalezena dokončená část (%i) v %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Dokončeno přehashování %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
-msgstr ""
+msgstr "Neočekávaná chyba při dokončování %s. Soubor pozastaven"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Dokončené stahování: %s"
 
-#: src/PartFile.cpp:2323
-#, fuzzy, c-format
+#: src/PartFile.cpp
+#, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
-msgstr "Dokončené stahování: %s"
+msgstr ""
+"Dokončené stahování: \n"
+"%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Mazání souboru: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
+msgstr "VAROVÁNÍ: Nelze vytvořit hash stažené části - sada hashů je neúplná pro '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
-msgstr ""
+msgstr "CHYBA: Nelze vytvořit hash stažené části - sada hashů je neúplná (%s). K tomu by nikdy nemělo dojít"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
-msgstr ""
+msgstr "Část %u z '%s' byla označena jako dokončená, ale soubor partfile je kratší, než se očekávalo (má %llu bajtů, potřebuje %llu); mezera je znovu otevírána pro opětovné stažení."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
-msgstr ""
+msgstr "Konec souboru při vytváření hashe stažené části %u o délce %u (max %u) souboru part '%s' o délce %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Stažená část %i souboru '%s' je poškozená."
+msgstr "Stažená část %i souboru '%s' je poškozená"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr ""
+msgstr "ICH: Obnovena poškozená část %i pro %s -> Uloženo bajtů: %s"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Alokuji"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Nedostatek místa na disku"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Staženo"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
-msgstr ""
-
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Výchozí pro systém"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albánština"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabský"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr ""
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baskičtina"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulharský"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalánština"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Čínština (zjednodušená)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Čínština (tradiční)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Chorvatština"
+msgstr "CHYBA: Nepodařilo se otevřít soubor part '%s'"
 
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Česky"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr "Rozšířená výměna zdrojů"
 
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Dánština"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr "NAT traverzování (uTP)"
 
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Nizozemština"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr "IPv6"
 
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Angličtina (britská)"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr "Získávání informací o kamarádovi"
 
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Angličtina (britská)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estonština"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr "NAT traverzování (QUIC)"
 
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finština"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francouzština"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galicijština"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Němčina"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Řečtina"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebrejština"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Maďarština"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italština"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italština (švýcarská)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japonština"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Korejština"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Litevština"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norština"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polština"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugalština"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugalština (brazilská)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Rumunština"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Ruština"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slovinština"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Španělština"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Švédština"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turečtina"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukrajinština"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Změnit jazyk"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr ""
-
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Nedostupný"
-
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "není dostupné žádné nastavení"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr "Nalezeno neplacené mapování cesty, vynechávám"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Nalezena neplatná kategorie, přeskakuji"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Bude použit výchozí port (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Připojení"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Adresáře"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Servery"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Soubory"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Bezpečnost"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
-msgstr ""
+msgstr "IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtry"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Vzdálené ovládání"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Online podpis"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Události"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Debugování"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
+"Budou nahrazeny následující proměnné:\n"
+"    %PARTFILE - úplná cesta k souboru\n"
+"    %PARTNAME - pouze název souboru"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
-msgstr ""
+msgstr "Podpora ikony v systémové liště vyžaduje knihovnu libayatana-appindicator3 v době kompilace."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
-msgstr ""
+msgstr "Není dostupné na Waylandu: protokol nehlásí, kdy je okno minimalizováno, takže tato možnost nemůže zachytit systémové tlačítko minimalizace. Řešení: spusťte aMule s `GDK_BACKEND=x11`, abyste místo toho použili XWayland."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5116,26 +6215,42 @@
 "aMule poběží v pohodě bez změny\n"
 "nastavení na tomto tabu."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
-msgstr ""
+msgstr "Nepodařilo se propojit Cfg s prvkem s ID %d a klíčem %s"
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
-msgstr ""
+msgstr "Nepodařilo se přenést data z Cfg do prvku s ID %d a klíčem %s"
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Typ proxy, ke které se připojujete"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "Nepodařilo se přenést data z prvku do Cfg s ID %d a klíčem %s"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "Heslo není nastaveno."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "Přístup pro hosty vyžaduje heslo. Zadejte jej do pole heslo hosta, nebo zrušte zaškrtnutí volby Povolit přístup pro hosty."
+
+#: src/PrefsUnifiedDlg.cpp
+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 ""
+"Povolili jste externí připojení, ale nezadali jste heslo.\n"
+"Externí připojení nelze povolit, dokud nezadáte platné heslo."
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5143,65 +6258,84 @@
 "Restartujte aMule, aby se projevily následující změny:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP port změněn.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP port změněn.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr "- Bylo změněno přidružení k síťovému rozhraní.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
-msgstr "Externí připojení uzavřeno."
+msgstr "- Port externího připojení změněn.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
-msgstr "Nové externí připojení přijato"
+msgstr "- Nastavení přijímání externích připojení bylo změněno.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
-msgstr "Externí připojení uzavřeno."
+msgstr "- Rozhraní externího připojení bylo změněno.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
-msgstr "Zatemnění protokolu"
+msgstr "- Podpora zamaskování protokolu změněna.\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr "- Změna nastavení proxy (potřebné pro HTTP přenosy).\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr "- Nastavení amuleapi bylo změněno.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
+"Váš seznam serverů pro automatickou aktualizaci je prázdný.\n"
+"Volba 'Automaticky aktualizovat seznam serverů po spuštění' bude zakázána."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr "Heslo amuleapi se nepodařilo uložit: %s"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Jazyk byl změněn.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
-msgstr "- Dočasný adresář byl změněn.\n"
+msgstr "- Dočasná složka změněna.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- Síť eD2k povolena.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr "Vzor pro vyloučení sdílených souborů není platný regulární výraz. Filtr zůstal zakázán."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "Neplatný regulární výraz"
+
+#: src/PrefsUnifiedDlg.cpp
 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 ""
+"Sítě eD2k i Kad jsou zakázány.\n"
+"Nebudete se moci připojit, dokud alespoň jednu z nich nepovolíte."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5209,7 +6343,7 @@
 "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:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5219,61 +6353,134 @@
 "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:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
-msgstr ""
+msgstr "Nepodařilo se zaregistrovat aMule pro automatické spuštění při přihlášení. Úložiště automatického spuštění může být pouze pro čtení."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
-msgstr ""
+msgstr "Nepodařilo se odebrat záznam automatického spuštění při přihlášení."
 
-#: src/PrefsUnifiedDlg.cpp:1098
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
-msgstr "Automatické obnovování spuštěno"
+msgstr "Automatické spuštění"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr "Registrovat typ souboru"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr "Zaregistrovat ovladač URL"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr "aMule zpracovává pouze magnety kompatibilní s eD2k. Pokud nahradíte současný obslužný program/ovladač magnet odkazů (%s), magnet odkazy BitTorrent přestanou fungovat - aMule nedokáže stahovat obsah BitTorrent. Pokračovat?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr "Soubory .emulecollection nyní otevírá jiná aplikace (%s). Nahradit ji aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr "Výchozím obslužným programem/ovladačem těchto odkazů je momentálně jiná aplikace (%s). Nahradit ji aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "Nepodařilo se zaregistrovat aMule pro soubory .emulecollection. Úložiště registrací může být pouze pro čtení."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr "Nepodařilo se odebrat registraci typu souboru."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "Nepodařilo se zaregistrovat aMule jako ovladač URL. Úložiště registrací může být pouze pro čtení."
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr "Nepodařilo se odstranit registraci ovladače URL."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Webový server a aMule API vyžadují povolení externích připojení."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr "Webový server aMule je zastaralý. Zvažte místo něho použít aMule API."
+
+#: src/PrefsUnifiedDlg.cpp
 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 ""
+"Váš seznam pro automatickou aktualizaci serverů je prázdný.\n"
+"Zadejte prosím alespoň jednu URL adresu odkazující na platný soubor server.met.\n"
+"Kliknutím na tlačítko \"Seznam\" vedle tohoto zaškrtávacího políčka zadáte URL."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Dočasné soubory"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Příchozí soubory"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Online podpisy"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
-msgstr "Zvolte adresář pro %s"
+msgstr "Zvolte složku pro %s"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Bylo by vyloučeno %u z %u sdíleného souboru"
+msgstr1 "Bylo by vyloučeno %u z %u sdílených souborů"
+msgstr2 "Bylo by vyloučeno %u z %u sdílených souborů"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Zvolit přehrávač videa"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Výběr prohlížeče"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr "Vybrat binární soubor ffprobe"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Spustitelný soubor %s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr "ffprobe nebyl nalezen v PATH ani ve standardních instalačních umístěních. Nainstalujte ffmpeg (který obsahuje ffprobe), nebo pomocí tlačítka Procházet vyberte binární soubor ručně."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr "Resetovat nastavení na této stránce na výchozí hodnoty?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr "Resetovat do výchozího stavu"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Upravit seznam serverů"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5281,1309 +6488,1563 @@
 "Sem přidejte URL pro stažení server.met souborů.\n"
 "Pouze jedno URL na každý řádek."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
-msgstr ""
+msgstr "Selhala aktualizace IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
-msgstr ""
+msgstr "Data od MaxMind GeoLite2"
 
-#: src/PrefsUnifiedDlg.cpp:1568
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
-msgstr "Kompletní zdroje"
+msgstr "Vlastní zdroj"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
-msgstr ""
+msgstr "Data od DB-IP.com"
 
-#: src/PrefsUnifiedDlg.cpp:1590
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Status: Loaded%s"
-msgstr "Stav:"
+msgstr "Stav: načteno%s"
 
-#: src/PrefsUnifiedDlg.cpp:1593
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Status: Loaded%s - %s"
-msgstr "Stav:"
+msgstr "Stav: načteno%s - %s"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
-msgstr ""
+msgstr "Stav: načtení selhalo – kliknutím na „Aktualizovat nyní“ proveďte aktualizaci."
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
-msgstr ""
+msgstr "Stav: databáze nenalezena – kliknutím na „Aktualizovat nyní“ ji stáhnete."
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "Zpoždění aktualizace: %d sekunda"
+msgstr1 "Zpoždění aktualizace: %d sekundy"
+msgstr2 "Zpoždění aktualizace: %d sekund"
 
-#: src/PrefsUnifiedDlg.cpp:1652
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
-msgstr0 "Čas pro průměrný graf: %d minut"
-msgstr1 "Čas pro průměrný graf: %d minut"
-msgstr2 ""
+msgstr0 "Čas pro graf průměru: %d minuta"
+msgstr1 "Čas pro graf průměru: %d minuty"
+msgstr2 "Čas pro graf průměru: %d minut"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
-msgstr ""
+msgstr "Měřítko grafu připojení: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
-msgstr0 "Velikost zásobníku pro soubory: %d bajtů"
-msgstr1 "Velikost zásobníku pro soubory: %d bajtů"
-msgstr2 ""
+msgstr0 "Velikost zásobníku souborů: %d bajt"
+msgstr1 "Velikost zásobníku souborů: %d bajty"
+msgstr2 "Velikost zásobníku souborů: %d bajtů"
 
-#: src/PrefsUnifiedDlg.cpp:1676
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
-msgstr0 "Velikost fronty pro odesílání: %d klientů"
-msgstr1 "Velikost fronty pro odesílání: %d klientů"
-msgstr2 ""
+msgstr0 "Velikost fronty odesílání: %d klient"
+msgstr1 "Velikost fronty odesílání: %d klienti"
+msgstr2 "Velikost fronty odesílání: %d klientů"
 
-#: src/PrefsUnifiedDlg.cpp:1683
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
-msgstr0 "Interval pro obnovení připojení k serveru: %d minut"
-msgstr1 "Interval pro obnovení připojení k serveru: %d minut"
-msgstr2 ""
+msgstr0 "Interval obnovování připojení k serveru: %d minuta"
+msgstr1 "Interval obnovování připojení k serveru: %d minuty"
+msgstr2 "Interval obnovování připojení k serveru: %d minut"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Interval pro obnovení připojení k serveru: Zakázáno"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "zakázáno"
 
-#: src/PrefsUnifiedDlg.cpp:1753
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Execute command on '%s' event"
-msgstr "Spustí příkaz při událost `%s'"
+msgstr "Spustit příkaz při události '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Povolit jaderné příkazy"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Příkaz jádra:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Povolit GUI příkazy"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Příkaz GUI:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Následující proměnné budou nahrazeny:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
+"Následující složky vypadají jako systémová nebo citlivá umístění:\n"
+"\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
-msgstr ""
+msgstr "Jejich rekurzivní sdílení zveřejní všechny soubory pod nimi v sítích eD2k/Kad. Opravdu to chcete udělat?"
 
-#: src/PrefsUnifiedDlg.cpp:1959
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
-msgstr "Sdílené adresáře"
+msgstr "Potvrdit sdílené složky"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-#, fuzzy
-msgid "Reloading shared files…"
-msgstr "Znovu načíst vaše sdílené soubory"
-
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
+msgstr "Opětovné načítání sdílených souborů..."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
+msgstr "Prohledávám podadresáře..."
 
-#: src/PrefsUnifiedDlg.cpp:1994
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
-msgstr "Sdílené adresáře"
+msgstr "Aktualizace sdílených složek"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
-msgstr ""
+msgid "Scanned %u directories..."
+msgstr "Prohledáno %u adresářů..."
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Znovu načte seznam sdílených souborů."
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr "Sdílená složka"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr "Vzdálená a místní předpona musí být vyplněna."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr "Tato vzdálená předpona je již mapována."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr "Zvolte místní složku"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "Vyčistit historii vyhledávání"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr "Vyčistit uloženou historii hledání? Toto nelze vrátit zpět."
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Varování při vyhledávání"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
-msgstr ""
+msgstr "Vyhledávání není možné, pokud jsou zakázány eD2k i Kademlia."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
-#, fuzzy
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
-msgstr "Vyhledávání"
+msgstr "Chyba vyhledávání"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
+"eD2k vyhledávání stále probíhá. Dojde k jeho zastavení, pokud zahájíte nové vyhledávání, protože protokol eD2k umožňuje pouze jedno aktivní vyhledávání.\n"
+"\n"
+"Výsledky již nalezené jsou zachovány; pouze nové přestanou přibývat.\n"
+"\n"
+"Přesto zahájit nové vyhledávání?"
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr "Vyhledávání probíhá"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Varování při vyhledávání"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Hlavní"
 
-#: src/SearchList.cpp:313
-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/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr "Ukládání jen %u nejnovějších vyhledávání z %u otevřených do %s."
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr "Ukládání jen prvních %u z %u výsledků vyhledávání \"%s\"."
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "VAROVÁNÍ: Uchovávaný seznam vyhledávání je poškozený, obsahuje neplatné záhlaví."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Neplatný vstup v uchovávaném seznamu vyhledávání, soubor může být poškozen"
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr "Nelze vyhledávat na eD2k, když nejste připojen"
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
-msgstr ""
+msgstr "Žádné klíčové slovo pro Kad hledání - přerušuji"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Neočekávaná chyba během vyhledávání v síti Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID souboru"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr "Vypršela platnost vyhledávání: server neodpověděl."
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr ""
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Hledání Kad: vyžádány rozšířené výsledky od dalšího uzlu."
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Nehodnocené"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Kad hledání: nezůstal žádný peer, kterého by bylo možné znovu požádat o další výsledky (dosažen limit nebo zatím žádné odpovědi)."
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr ""
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "Chyba %u: %s\n"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr ""
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ID souboru"
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Přidat volitelné URL pro tento soubor"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "Rozbalit vše"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "Sbalit vše"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Vyhledat související soubory (eD2k, lokální server)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Označit jako známý soubor"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Zkopírovat eD2k odkaz do schránky"
 
-#: src/SearchListCtrl.cpp:811
-#, fuzzy
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopírovat eD2k odkazy do schránky"
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
-msgstr "Snažíte se smazat server, na který jste právě připojen(a). Nejprve se prosím odpojte."
+msgstr "Momentálně nejste připojeni k serveru, který podporuje vyhledávání souvisejících souborů"
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Zrušeno"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Nový"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr "běží"
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "dokončené"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr "nečinné"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr "Vyhledávání %u: %s, %u %% (%u výsledků)\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr "Vyhledávání %u \"%s\": %s, %u %% (%u výsledků)\n"
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr "Hledání vypršelo a nebo je ID neznámé. Zahajte nové hledání.\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Průběh hledání: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Průběh hledání není k dispozici"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr "Žádné vyhledávání k nahlášení.\n"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Selhalo připojení ke všem stálým serverům se zamaskováním, které jsou na seznamu. Zkouším to znovu bez zamaskování."
+
+#: src/ServerConnect.cpp
 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."
+msgstr "Selhalo připojení ke všem uvedeným serverům s maskováním. Následuje další pokus bez maskování."
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
+msgstr "Selhalo připojení ke všem stálým serverům na seznamu."
 
-#: 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
+msgid "Failed to connect to all servers listed."
+msgstr "Selhalo připojení ke všem serverům na seznamu."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Automatické připojení k serveru bude zopakováno za %d sekundu"
+msgstr1 "Automatické připojení k serveru bude zopakováno za %d sekundy"
+msgstr2 "Automatické připojení k serveru bude zopakováno za %d sekund"
+
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
-msgstr ""
+msgstr "V seznamu serverů nebyly nalezeny žádné platné servery, ke kterým by bylo možné se připojit"
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Připojen k %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Připojení vytvořeno k %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Ztracené připojení k %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) se zdá být mrtvý."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) se zdá být plný."
 
-#: 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"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Připojení ztraceno."
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Připojování k %s (%s:%i) selhalo."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
-msgstr ""
+msgstr "CHYBA: Socket neplatný při kontrole časového limitu"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Pokusu o připojení k %s (%s:%i) vypršel čas."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
-msgstr ""
+msgstr "Přijat pozdní výsledek DNS vyhledávání, zahazuji."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Načítám soubor server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Soubor server.met nenalezen!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Nelze otevřít server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "%i server byl nalezen v souboru server.met"
+msgstr1 "%i servery byly nalezeny v souboru server.met"
+msgstr2 "%i serverů bylo nalezeno v souboru server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "%d server přidán"
+msgstr1 "%d servery přidány"
+msgstr2 "%d serverů přidáno"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
-msgstr ""
+msgstr "Chyba: soubor 'server.met' je poškozen: "
 
-#: src/ServerList.cpp:191
-#, fuzzy
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
-msgstr "I/O chyba při čtení souboru known.met: %s"
+msgstr "Chyba I/O při čtení souboru 'server.met': "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Snažíte se smazat server, na který jste právě připojen(a). Nejprve se prosím odpojte."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Nemohu otevřít '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Ukládání server.met selhalo!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Selhání I/O při zápisu 'server.met': %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Neplatná URL"
 
-#: src/ServerList.cpp:866
-#, fuzzy, c-format
+#: src/ServerList.cpp
+#, c-format
 msgid "Finished downloading the server list from %s"
-msgstr "Stahování seznamu serverů z %s selhalo"
+msgstr "Stahování seznamu serverů z %s dokončeno"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 ""
+msgstr "V souboru 'addresses.dat' nebyla nalezena žádná adresa seznamu serverů. Vložte prosím platnou adresu seznamu serverů do tohoto souboru, aby byl váš seznam serverů automaticky aktualizován"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Stáhnout seznam serverů z %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
-msgstr ""
+msgstr "VAROVÁNÍ: pro automatickou aktualizaci serverů byla zadána neplatná URL adresa: %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Stahování seznamu serverů z %s selhalo"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
-msgstr ""
+msgstr "Místní server je filtrován IP filtry, připojuji se k jinému serveru!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "Název serveru"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adresa"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Popis"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Uživatelé"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "Max. uživatelů"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
-msgstr "Pevný"
+msgstr "Stálý"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Verze"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr "Měkké soubory"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr "Tvrdé soubory"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
-msgstr ""
+msgstr "TCP příznaky"
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
-msgstr ""
+msgstr "UDP příznaky"
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 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:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(neznámý název)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
-msgstr "Opravdu si přejete smazat stálý server %s?"
+msgstr "Opravdu si přejete smazat stálý server %s"
+
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "ms"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Servery (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Server"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Připojit k serveru"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Označit server jako stálý"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Označit server jako nestálý"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Označit servery jako stálé"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Označit servery jako nestálé"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
-msgstr "Vzdálený server"
+msgstr "Odstranit server"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Vzdálené servery"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Odstranit všechny servery"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Znovu připojit k serveru"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Opravdu si přejete smazat všechny servery?"
 
-#: src/ServerListCtrl.cpp:548
-#, fuzzy
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Opravdu si přejete smazat vybrané servery?"
+msgstr "Opravdu chcete smazat vybraný server?"
 
-#: src/ServerListCtrl.cpp:550
-#, fuzzy
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Opravdu si přejete smazat vybrané servery?"
+msgstr "Opravdu chcete smazat vybrané servery?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
-msgstr ""
+msgstr "CHYBA: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
-msgstr ""
+msgstr "VAROVÁNÍ: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
-msgstr ""
+msgstr "Server %s (%s) odmítl naše přihlášení (nebylo přiděleno ID klienta). Odpojuji se."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
-msgstr "Nové ID klienta je %u"
+msgstr "Nové clientid je %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
-msgstr ""
+msgstr "VAROVÁNÍ: Obdrželi jste Low-ID!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPro více informací prosím běžte na https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
-msgstr ""
+msgstr "Přijaty neznámé informace o serveru! - příliš krátké"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "Přijat %d nový server"
+msgstr1 "Přijaty %d nové servery"
+msgstr2 "Přijato %d nových serverů"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Uložení seznamu serverů dokončeno."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Server odmítl poslední příkaz"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Chybný paket obdržen od serveru: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr ""
+msgstr "Nelze vytvořit vlákno pro řešení DNS pro připojení k %s"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, 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:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
-msgstr "používám zatemňování protokolu (obfuscation)."
+msgstr "s použitím zamaskování protokolu."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Připojování k %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr ""
+msgstr "Nepodařilo se vyřešit DNS pro server %s: Nelze se připojit!"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "Log aMuleGUI"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
-msgstr ""
+msgstr "Server nepřidán: Nebyla zadána žádná IP adresa ani název hostitele."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
-msgstr ""
+msgstr "Server nepřidán: Byl zadán neplatný port serveru."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Stav eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
-#, fuzzy
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
-msgstr "Stav připojení:"
+msgstr "Typ připojení:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "Připojeno od:"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Stav Kademlia:"
 
-#: src/ServerWnd.cpp:221
-#, fuzzy
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
-msgstr "Běží na %s"
+msgstr "Běží v režimu LAN"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Běží"
 
-#: src/ServerWnd.cpp:224
-#, fuzzy
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
-msgstr "Stav Kademlia:"
+msgstr "ID klienta sítě Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Stav:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Stav připojení:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Stav UDP připojení:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Stav firewallu: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Není třeba kamaráda - TCP port je otevřený"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Není třeba kamaráda - UDP port je otevřený"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Žádný kamarád"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Připojuji se ke kamarádovi"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Připojen ke kamarádovi na %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP adresa:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Indexované zdroje:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Indexovaná klíčová slova:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
-msgstr ""
+msgstr "Indexované poznámky:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
-msgstr ""
+msgstr "Indexovaná zátěž:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
-msgstr ""
+msgstr "Průměr uživatelů:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
-msgstr ""
+msgstr "Průměr souborů:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Neběží"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr "Sledovač sdílené složky: chyba přetečení na backendu (%s); přepínám na celkové opětovné načtení"
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 "Sledovač sdílené složky: %u nová podsložka nalezena od posledního procházení, znovu prohledávám sdílení"
+msgstr1 "Sledovač sdílené složky: %u nové podsložky nalezeny od posledního procházení, znovu prohledávám sdílení"
+msgstr2 "Sledovač sdílené složky: %u nových podsložek nalezeno od posledního procházení, znovu prohledávám sdílení"
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr "Sledovač sdílené složky: události zahozeny backendem, vynucuji celkové opětovné načtení sdílených souborů kvůli synchronizaci"
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
-msgstr ""
+msgstr "Přidávám soubor %s do sdílených"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/SharedFileList.cpp:410
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Nalezeno %i známých a %i neznámých sdílených souborů"
-msgstr1 "Nalezeno %i známých a %i neznámých sdílených souborů"
-msgstr2 ""
+msgstr0 "Nalezen %i známý sdílený soubor"
+msgstr1 "Nalezeny %i známé sdílené soubory"
+msgstr2 "Nalezeno %i známých sdílených souborů"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 "Filtr vyloučil %i soubor ze sdílení"
+msgstr1 "Filtr vyloučil %i soubory ze sdílení"
+msgstr2 "Filtr vyloučil %i souborů ze sdílení"
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
-msgstr ""
+msgstr "CHYBA: Pokus o sdílení %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Sdílený adresář nenalezen, přeskakuji: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr ""
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Sdílený adresář nelze číst, přeskakuji: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Uživatelské jméno"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr "Extrakce mediálních metadat je zakázána v nastavení, není tedy co znovu extrahovat."
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Rychlost stahování"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 "Opětovná extrakce mediálních metadat %u sdíleného souboru"
+msgstr1 "Opětovná extrakce mediálních metadat %u sdílených souborů"
+msgstr2 "Opětovná extrakce mediálních metadat %u sdílených souborů"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Rychlost odesílání"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "Nyní sdílím soubor: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Dostupné části"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Zastaveno sdílení odebraného souboru: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:35
-#, fuzzy
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Zastaveno sdílení %u souboru v odebraném adresáři: %s"
+msgstr1 "Zastaveno sdílení %u souborů v odebraném adresáři: %s"
+msgstr2 "Zastaveno sdílení %u souborů v odebraném adresáři: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Nyní sdílím %u soubor nalezený v novém sdíleném adresáři"
+msgstr1 "Nyní sdílím %u soubory nalezené v nových sdílených adresářích"
+msgstr2 "Nyní sdílím %u souborů nalezených v nových sdílených adresářích"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Nalezen %u nový sdílený soubor"
+msgstr1 "Nalezeny %u nové sdílené soubory"
+msgstr2 "Nalezeno %u nových sdílených souborů"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Uživatelské jméno"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr "Částí na peera"
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Stav odesílání"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
-msgstr "Název souboru"
+msgstr "Místní název souboru"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
-#, fuzzy
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
-msgstr "Sdílené soubory"
-
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Požadavky"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Přijaté požadavky"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Přenesená data"
+msgstr "Seznam sdílených souborů"
 
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Poměr sdílení"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Obdržené části"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Kompletní zdroje"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr "Dostupnost zdroje"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Cesta"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Sdílené soubory"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Přidat komentář/hodnocení"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Upravit komentář/hodnocení"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr "Ověřit místní data"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr "Re-extrahovat &mediální metadata"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
-msgstr ""
+msgstr "Přidat soubory kolekce do seznamu přenosů"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Zkopírovat magnet URI do schránky"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Zkopírovat eD2k odkaz do schránky (%zdroj)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr ""
+msgstr "Kopírovat eD2k odkaz do schránky (zdroj) (&s možnostmi šifrování)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr ""
+msgstr "Kopírovat eD2k odkaz do schránky (&název hostitele)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr ""
+msgstr "Kopírovat eD2k odkaz do schránky (název hostitele) (s &možnostmi šifrování)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr ""
+msgstr "Kopírovat eD2k odkaz do schránky (&info AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
-#, fuzzy
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
-msgstr "Zkopírovat ED2K odkaz do schránky (AICH info)"
+msgstr "Kopírovat eD2k odkaz do schránky (&info AICH + zdroj)"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr "Export vybraných souborů do emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr "Ověření místních dat u částečného souboru PartFile momentálně není podporováno: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 "Mediální metadata: vynechávám %u neúplné stahování"
+msgstr1 "Mediální metadata: vynechávám %u neúplná stahování"
+msgstr2 "Mediální metadata: vynechávám %u neúplných stahování"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 "Mediální metadata: vynechávám %u soubor, který není zvuk nebo video"
+msgstr1 "Mediální metadata: vynechávám %u soubory, které nejsou zvuk nebo video"
+msgstr2 "Mediální metadata: vynechávám %u souborů, které nejsou zvuk nebo video"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 "Re-extrahovat mediální metadata %u souboru?"
+msgstr1 "Re-extrahovat mediální metadata %u souborů?"
+msgstr2 "Re-extrahovat mediální metadata %u souborů?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 "%u neúplné stahování bude vynecháno."
+msgstr1 "%u neúplná stahování budou vynechána."
+msgstr2 "%u neúplných stahování bude vynecháno."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 "%u soubor není zvuk nebo video a bude vynechán."
+msgstr1 "%u soubory nejsou zvuk nebo video a budou vynechány."
+msgstr2 "%u souborů není zvuk nebo video a bude vynecháno."
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr "Toto běží na pozadí. Postup je hlášen do logu."
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr "Re-extrahovat mediální metadata"
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "K vytvoření platného odkazu potřebujete HighID"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr "Exportovat do emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr "Nejsou vybrány žádné soubory k exportování."
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr "eMule sbírky (*.emulecollection)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr "'%s' již existuje. Přepsat?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Selhal zápis souboru kolekce '%s'."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Exportován %u sdílený soubor do '%s'."
+msgstr1 "Exportovány %u sdílené soubory do '%s'."
+msgstr2 "Exportováno %u sdílených souborů do '%s'."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Celková velikost sdílených souborů: %s (%s dokončeno)"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Celková velikost sdílených souborů: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Sdílené soubory (%i, hashuji %u další)"
+msgstr1 "Sdílené soubory (%i, hashuji %u další)"
+msgstr2 "Sdílené soubory (%i, hashuji %u dalších)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Sdílené soubory (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "PartSoubor"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Znovu se načítají sdílené soubory: prohledáno %u souborů"
 
-#: src/SourceListCtrl.cpp:37
-#, fuzzy
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr "Stav části"
+
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
-msgstr "Název souboru"
+msgstr "Vzdálený název souboru"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Odeslaná data (sezení (celkem)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Celková režie (pakety): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
-msgstr ""
+msgstr "Přebytek požadavků na soubor (pakety): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
-msgstr ""
+msgstr "Režie při výměně zdrojů (pakety): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Režie serveru (pakety): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Režie Kadu (pakety): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
-msgstr ""
+msgstr "Režie šifrování (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Aktivní odesílání: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Čekající odesílání: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
-msgstr ""
+msgstr "Celkem úspěšných sezení odesílání: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
-msgstr ""
+msgstr "Celkem neúspěšných sezení odesílání: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Průměrný čas odesílání: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Stažená data (sezení (celkem)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Nalezené zdroje: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Aktivní stahování (části): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "UL:DL poměr sezení (celkem): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Průměrzná rychlost stahování (sezení): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Průměrzná rychlost odesílání (sezení): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Maximální rychlost stahování (sezení): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Maximální rychlost odesílání (sezení): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Znovupřipojení: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Doba od prvního přenosu: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Připojen k serveru od: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Aktivních připojení (odhad): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Limit připojení dosažen: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Průměrný počet připojení (odhad): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
-msgstr ""
+msgstr "Nejvyšší počet připojení (odhad): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Klienti"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Neznámý: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtrován: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
-msgstr "Zabanován: %s"
+msgstr "Zablokováno: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr "Zablokované adresy Kad: %s"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Celkem: %i Známých: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Fungující servery: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Nefungující servery: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Celkem: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Smazané servery: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Filtrované servery: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Uživatelů na fungujících serverech: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Souborů na fungujících serverech: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Celkem uživatelů: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Celkem souborů: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Zaplnění serveru: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Počet sdílených souborů: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Celková velikost sdílených souborů: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Průměrná velikost souboru: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Operační systém"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Neobdrženo"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktivní připojení (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Nedostupný"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
-msgstr ""
+msgstr "Příkaz '%s' s pid '%d' skončil se stavovým kódem '%d'."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Spustí <str> a ukončí se."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr "Oddělit pole seznamu mezerami, jako dříve, místo tabulátorů."
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
-msgstr ""
+msgstr "Tento příkaz vyžaduje argument. Platné argumenty: 'all', název souboru, nebo číslo.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Zpracovávám podle hashe: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Zpracovávám podle názvu souboru: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr ""
+msgstr "Tento příkaz vyžaduje argument. Platné argumenty: hash souboru.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Neplatné číslo\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr ""
+msgstr "Neplatný hash (délka by měla být přesně 32 znaků)\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
-msgstr "Pro nápovědu spusťte '%s'.\n"
+msgstr ""
+"Neplatná syntaxe filtru vyhledávání.\n"
+"Další nápovědu zobrazíte příkazem 'help search'.\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
-msgstr "Pro nápovědu spusťte '%s'.\n"
+msgstr ""
+"Nebylo zadáno klíčové slovo vyhledávání.\n"
+"Další nápovědu zobrazíte příkazem 'help search'.\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
-msgstr "Pro nápovědu spusťte '%s'.\n"
+msgstr ""
+"Nebyl zadán typ vyhledávání.\n"
+"Další nápovědu zobrazíte příkazem 'help search'.\n"
 
-#: src/TextClient.cpp:650
-#, fuzzy, c-format
+#: src/TextClient.cpp
+#, c-format
 msgid "Download File: %lu %s\n"
-msgstr "Stahování (%i)"
+msgstr "Stáhnout soubor: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Požadavek selhal kvůli neznámé chybě."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operace byla úspěšná."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
-msgstr ""
+msgstr "Požadavek selhal s chybou: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
-msgstr ""
+msgstr "Filtrování IP pro klienty je %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "vypnuto"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "zapnuto"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
-msgstr ""
+msgstr "Filtrování IP pro servery je %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
-msgstr ""
+msgstr "Aktuální úroveň IP filtru je %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr ""
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr "Limity šířky pásma: Odes.: %u KiB/s, Stah.: %u KiB/s.\n"
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr "Rotace zdrojů koncovky je %s.\n"
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr "Hledání zahájeno (id %u).\n"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Připojen k %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Připojování"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "za firewallem"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6592,7 +8053,7 @@
 "\n"
 "Stahování:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6601,7 +8062,7 @@
 "\n"
 "Odesílání:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6610,7 +8071,7 @@
 "\n"
 "Klientů ve frontě:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6619,39 +8080,33 @@
 "\n"
 "Celkem zdrojů:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "PartSoubor"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Počet výsledků vyhledávání: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-#, fuzzy
-msgid "Search progress not available"
-msgstr "Zobrazit procenta průběhu"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, 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:985
+#: src/TextClient.cpp
 msgid "Show short status information."
-msgstr ""
+msgstr "Zobrazit stručné stavové informace."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
+msgstr "Zobrazit stav připojení, aktuální rychlosti odesílání/stahování atd.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Zobrazit celý strom statistik."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6659,83 +8114,95 @@
 "\n"
 "Example: 'statistics 5' will show only the top 5 versions for each client type.\n"
 msgstr ""
+"Volitelně lze tomuto příkazu předat jako argument číslo v rozsahu 0-255, které\n"
+"určuje, kolik položek podstromů verzí klientů se má zobrazit. Zadání 0 nebo\n"
+"vynechání argumentu znamená 'neomezeno'.\n"
+"\n"
+"Příklad: 'statistics 5' zobrazí pouze 5 nejlepších verzí pro každý typ klienta.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
-msgstr "Ukončit aMuli"
+msgstr "Ukončit aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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 ""
+"Vypnout vzdáleně běžící jádro (amule/amuled).\n"
+"Tím se také vypne textový klient, protože je bez běžícího jádra\n"
+"nepoužitelný.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
-msgstr ""
+msgstr "Znovu načíst daný objekt."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
-msgstr "Znovu načte seznam sdílených souborů."
+msgstr "Opětovně načte seznam sdílených souborů."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
-msgstr ""
+msgstr "Znovu načíst tabulku filtrování IP."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
-msgstr ""
+msgstr "Znovu načíst současnou tabulku filtrování IP."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
-msgstr ""
+msgstr "Aktualizovat tabulku filtrování IP z URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
-msgstr ""
+msgstr "Pokud je URL vynechána, použije se URL z nastavení."
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Připojit se k síti."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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ímto se připojíte ke všem sítím povoleným v nastavení.\n"
+"Volitelně můžete zadat adresu serveru ve tvaru IP:Port a připojit se pouze\n"
+"k tomuto serveru. IP adresa musí být ve formátu tečkované desítkové IPv4\n"
+"adresy nebo v podobě rozpoznatelného DNS názvu."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Připojit se pouze k eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Připojit se pouze ke Kademlia."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Odpojit se od sítě."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr ""
+msgstr "Tímto se odpojíte od všech sítí, ke kterým jste aktuálně připojeni.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Odpojit se pouze od eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Odpojit se pouze od Kademlia."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Přidat eD2k nebo magnet odkaz do jádra."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6745,110 +8212,131 @@
 "\n"
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
+"Přidávaný eD2k odkaz může být:\n"
+"*) odkaz na soubor (ed2k://|file|...), bude přidán do fronty stahování,\n"
+"*) odkaz na server (ed2k://|server|...), bude přidán do seznamu serverů,\n"
+"*) nebo odkaz na seznam serverů, v takovém případě budou všechny servery ze\n"
+"   seznamu přidány do seznamu serverů.\n"
+"\n"
+"Magnet odkaz musí obsahovat eD2k hash a délku souboru.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Nastavit hodnotu nastavení."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Nastavit filtrování IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Povolit klientům i serverům filtrování IP."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Zakázat klientům i serverům filtrování IP."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Povolit/zakázat klientům filtrování IP."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Povolit klientům filtrování IP."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Zakázat klientům filtrování IP."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Povolit/zakázat klientům filtrování IP."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Povolit serverům filtrování IP."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Zakázat serverům filtrování IP."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Zvolte úroveň filtrování IP."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
 msgstr ""
+"Platné úrovně filtrování jsou v rozsahu 0-255 a výchozí (počáteční)\n"
+"hodnota je 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Nastavit limity šířky pásma."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr ""
+msgstr "Hodnota zadaná těmto příkazům musí být v kilobajtech za sekundu.\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Nastavit limit šířky pásma pro odesílání."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
-msgstr ""
+msgstr "Zadaná hodnota musí být v kilobajtech za sekundu.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Nastavit limit šířky pásma pro stahování."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr "Povolí/zakáže rotaci zdroje koncovky."
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Zadaná hodnota musí být 1/ON (povolit) nebo 0/OFF (zakázat).\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
-msgstr ""
+msgstr "Získat a zobrazit hodnotu předvolby."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
-msgstr ""
+msgstr "Získat nastavení filtrování IP."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
-msgstr ""
+msgstr "Získejte stav filtrování IP pro klienty i servery."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
-msgstr ""
+msgstr "Získejte stav filtrování IP jen pro klienty."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
-msgstr ""
+msgstr "Získejte stav filtrování IP jen pro servery."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
-msgstr ""
+msgstr "Získejte úroveň filtrování IP."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
-msgstr ""
+msgstr "Získejte limity šířky pásma."
+
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr "Získat stav rotace zdrojů koncovky."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
 msgid "Execute a search."
-msgstr "Spustí vyhledávání v síti Kad"
+msgstr "Spustí vyhledávání."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6866,120 +8354,143 @@
 "Example: 'search global linux iso --type Iso --min-size 100M' returns\n"
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
+"Je nutné zadat typ hledání uvedením typu:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Příklad: 'search kad file' provede kad hledání výrazu \"file\".\n"
+"\n"
+"Před, za nebo mezi klíčová slova hledání lze přidat volitelné filtry:\n"
+"    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
+"    --extension <ext>      (alias: --ext)\n"
+"    --avail <N>            minimální počet zdrojů\n"
+"    --min-size <NKMG>    nejmenší velikost souboru; K=1024, M=K*1024, G=M*1024\n"
+"    --max-size <NKMG>    největší velikost souboru; stejné přípony\n"
+"Příklad: 'search global linux iso --type Iso --min-size 100M' vrátí\n"
+"výsledky pro \"linux iso\" typu souboru Iso o velikosti alespoň 100 MiB.\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
-msgstr "Spustí globální vyhledávání"
+msgstr "Spustí globální vyhledávání."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Spustí lokální vyhledávání"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Spustí vyhledávání v síti Kad"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "Zobrazí výsledky posledního vyhledávání."
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Zobrazí výsledky posledního vyhledávání.\n"
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr "Zobrazit výsledky vyhledávání."
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+"Vrátit výsledky hledání.\n"
+"Volitelně přijímá ID hledání (z 'search ...'); bez ID vrátí výsledky naposledy zahájeného hledání.\n"
+
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Zobrazí průběh vyhledávání."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Zobrazí průběh vyhledávání.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+"Zobrazit průběh hledání.\n"
+"Volitelně přijímá ID hledání; bez ID zobrazí průběh naposledy zahájeného hledání.\n"
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
-msgstr ""
+msgstr "Začít stahovat soubor"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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 ""
+"Musí být zadáno číslo souboru z posledního hledání.\n"
+"Příklad: 'download 12' zahájí stahování souboru s číslem 12 z předchozího hledání.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Pozastavit stahování."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Pokračovat ve stahování."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Zrušit stahování."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Nastaví prioritu stahování."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Nastaví nízkou prioritu."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Nastaví normální prioritu."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Nastaví vysokou prioritu."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Nastaví automatickou prioritu."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Zobrazit fronty/seznamy."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
-msgstr ""
+msgstr "Zobrazit frontu odesílání/stahování, seznam serverů nebo seznam sdílených souborů.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Zobrazit frontu odesílání."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Zobrazit frontu stahování."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Zobrazit log."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Zobrazit seznam serverů."
 
-#: src/TextClient.cpp:1106
-#, fuzzy
+#: src/TextClient.cpp
 msgid "Show shared files list."
-msgstr "Znovu načte seznam sdílených souborů."
+msgstr "Zobrazit seznam sdílených souborů."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
-msgstr "Vyčistit log."
+msgstr "Resetovat log."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
-msgstr ""
+msgstr "Zastaralý příkaz, místo něj použijte '%s'."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -6988,256 +8499,278 @@
 "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:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Textový klient aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Hashování staženého soubor: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr "Hashování souboru: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Opětovné sestavování sady hashů AICH pro soubor: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr "Ověření místních dat (%s): Výsledek OK pro %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr "Ověření místních dat (%s): NALEZENY CHYBY! %s Chybné bloky: MD4: %s. %s %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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
+#: src/TransferWnd.cpp
 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
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Potvrzení je nutné"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
-msgstr ""
+msgstr "Je podporováno pouze 99 kategorií."
 
-#: src/TransferWnd.cpp:238
-#, fuzzy
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
-msgstr "Příliš mnoho připojení"
+msgstr "Příliš mnoho kategorií!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Vše ostatní"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
-msgstr ""
+msgstr "Vybrat filtr zobrazení"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Přidat kategorii"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Upravit kategorii"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Odstranit kategorii"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
-msgstr ""
+msgstr "Vyžádána hashová sada pro neznámý soubor: %s"
+
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Selhalo otevření souboru (%s), odebírám ho ze seznamu sdílených souborů."
 
-#: src/UploadQueue.cpp:618
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Obnovuji odesílání souboru %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Zastavuji odesílání souboru %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr ""
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Selhalo vykonání příkazu '%s' události '%s'."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Stahování dokončeno"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Celá cesta k souboru."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
-msgstr ""
+msgstr "Název souboru bez cesty."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
-msgstr "ED2k hash souboru."
+msgstr "eD2k hash souboru."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Velikost souboru v bytech."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
-msgstr ""
+msgstr "Celkový čas aktivity stahování."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Zahájeno nové sezení v chatu"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Odesílač zpráv."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Došlo místo"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Diskový oddíl."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Chyba při dokončení"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Zpracovávám soubor č. %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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/utils/aLinkCreator/src/alcc.cpp:80
-#, fuzzy, c-format
+#: src/utils/aLinkCreator/src/alcc.cpp
+#, c-format
 msgid "%s ---> Non existent file !\n"
-msgstr "%s ---> Neexistující soubor !\n"
+msgstr "%s ---> Neexistující soubor!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, tvůrce eD2k odkazů z aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Vítejte!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Vstupní parametry"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Soubor k hashování"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Přidat volitelné URL pro tento soubor"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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 ""
+msgstr "Zadejte zde URL, kterou chcete přidat k eD2k odkazu: Přidejte na konec /, aby aLinkCreator mohl připojit název aktuálního souboru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Odebrat"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Vytvořit odkaz s hashi částí"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4 hash souboru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k hash souboru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k odkaz"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Uložit"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Zkopírovat do schránky"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Otevřít"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Zkopírovat vypočítaný eD2k odkaz do schránky"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Uložit vytvořený eD2k odkaz do souboru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "O aLinkCreatoru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Nelze otevřít schránku"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Zatím není co zkopírovat!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
-msgstr "Nelze otevřít"
+msgstr "Nelze otevřít "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Zadejte prosím (neprázdný) název souboru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Zatím není co ukládat!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7257,174 +8790,171 @@
 "\n"
 "Šířeno pod GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Hashování..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator pracuje"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Počítám MD4 hash..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Počítám eD2k hashe..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Přerušeno!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Hotovo za %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Tato URL je již přidána!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Zadejte prosím neprázdnou URL"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Nelze otevřít %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
-msgstr ""
+msgstr "Nedostatek paměti při výpočtu ed2k hash!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr "%.2f KiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr "%.2f GiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr "%.2f TiB"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, online statistiky aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Resetovat"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Systém"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Přerušit automatické obnovování"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Uložit obrázek online statistik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Vytisknout obrázek online statistik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Nastavení"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "O wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Spustit automatické obnovování"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Automatické obnovování zastaveno"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Automatické obnovování spuštěno"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Uložit obrázek statistiky"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Online statistiky aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 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."
+"Je vaše tiskárna správně nastavena?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Tisknu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7434,409 +8964,555 @@
 "\n"
 "Distributed under GPL"
 msgstr ""
-"wxCas, aMule online statistiky\n"
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
 "(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
 "\n"
-"Založený na CAS od Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"Založeno na CAS od Pedra de Oliveiry <falso@rdk.homeip.net>\n"
 "\n"
-"Distribuovaný pod GPL licencí"
+"Šířeno pod GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "aMule neběží..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule běží"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule běží, ale je odpojená"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule se připojuje..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Stav aMule je neznámý..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
-msgstr "aMule"
+msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " běží už "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " je zastavená!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " je nepřipojená!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " se připojuje..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " je asi vypnutá, zkontrolujte to!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " je připojena k "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "vypnuto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
-msgstr "běží"
+msgstr " je na "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
-msgstr " s"
+msgstr " s "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
-msgstr "Celkem staženo:"
+msgstr "Celkem staženo: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
-msgstr ", Odesláno:"
+msgstr ", Odesláno: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
-msgstr ""
+msgstr "Stažení za relaci: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Stahování: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, odesílání: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr " KiB/s, Odesílání: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
-msgstr "Sdílení:"
+msgstr "Sdílení: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " soubor(ů), klientů ve frontě: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
-msgstr "Čas:"
+msgstr "Čas: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " na "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Běh systému: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Adresář obsahující soubor amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Interval pro obnovování v sekundách"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
-#, fuzzy
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
-msgstr "Pravidelně nahrávat obrázek statistik na FTP server"
+msgstr "Pravidelně odesílat obrázek statistik na server FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP url"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP cesta"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Zadejte URL vašeho FTP serveru"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Uživatel"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Interval aktualizace FTP v minutách"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Zkontrolovat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
-msgstr "Adresář obsahující váš soubor s podpisem"
+msgstr "Složka obsahující váš soubor s podpisem"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
-msgstr "Adresář pro generování obrázků statistik"
+msgstr "Složka pro generování obrázků statistik"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Načte šablonu <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "HTTP port webserveru"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Použít UPnP port forwarding pro webserver"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP port"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Použít gzip kompresi"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Heslo pro plný přístup k webserveru"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Heslo pro omezený přístup k webserveru"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Povolit přístup hostům"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Zakázat přístup hostům"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
-msgstr ""
+msgstr "Načíst/uložit nastavení webového serveru ze/do vzdáleného aMule"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "Cesta ke konfiguráku aMule. NEPOUŽÍVEJTE PŘÍMO!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Zakázat PHP interpreter (zastaralé)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 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:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Webový server aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
-msgstr ""
+msgstr "připojení webového klienta přijato\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 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:361
+#: src/webserver/src/WebServer.cpp
 #, 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:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Index nenalezen: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sezení vypršelo - vyžaduji přihlášení\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Relace je v pořádku, přihlášen\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Relace je v pořádku, nepřihlášen\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 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:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Relace zahájena - vyžadování přihlášení\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Zpracování požadavku původní: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
-msgstr ""
+msgstr "Odmítám číst `pass` z řetězce dotazu URL\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Heslo nezadáno, přihlášení nebude možné."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Kontrola hesla\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Hash hesla je neplatný\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Heslo v pořádku\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Špatné heslo\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Bylo vyžádáno odhlášení\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
-msgstr "Zpracování požadavku přesměrovaný:"
+msgstr "Zpracování požadavku přesměrovaný: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
-msgstr ""
+msgstr "aMule (vyžadováno)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
-msgstr ""
+msgstr "Zkratka plochy"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
-msgstr ""
+msgstr "Spustit aMule po přihlášení"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr "Přidružit soubory .emulecollection"
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
-msgstr ""
+msgstr "Odinstalace"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
-msgstr ""
+msgstr "Odebrat uživatelská data (konfigurace, ED2K servery, Kad uzly, částečné soubory partfiles)"
 
-#: packaging/windows/installer_strings.c:43
-#, fuzzy
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
-msgstr "Připojení selhalo "
+msgstr "Soubory aplikace aMule (vyžadováno)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
-msgstr ""
+msgstr "Umístit zástupce aMule na plochu."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
-msgstr ""
+msgstr "Automaticky spustit aMule po přihlášení aktuálního uživatele (každý uživatel si může nastavit jinak)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr ""
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr "Přidá aMule do seznamu \"Otevřít pomocí\" pro soubory .emulecollection a nastaví jej jako výchozí, pokud není nastaven jiný program. Otevřením kolekce se do fronty zařadí každý eD2k odkaz, který kolekce obsahuje."
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "Odstranit soubory aplikace aMule, zástupce v nabídce Start / na ploše, položku Run-key pro automatické spuštění, registrace schémat URL a položku v Přidat nebo odebrat programy (vyžadováno)."
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
-msgstr ""
+msgstr "Trvale smazat %APPDATA%\\aMule pro aktuálního uživatele (aMule.conf, seznam ED2K serverů, Kad uzly, částečné soubory, IP filtry, seznam přátel). Nezaškrtávejte, chcete-li zachovat svá nastavení."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
+"Zdá se, že aMule je spuštěn z $INSTDIR.\r\n"
+"Zavřete prosím aMule (a aMuleD / aMuleGUI) a zkuste to znovu."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
+"Zdá se, že daemon aMule (amuled.exe) je spuštěn z $INSTDIR.\n"
+"Zastavte jej prosím a zkuste to znovu."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
-msgstr ""
+msgstr "Odstraňuji předchozí instalaci aMule na $0..."
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
+"Nepodařilo se odstranit předchozí instalaci aMule na $0.\r\n"
+"Zavřete prosím všechny běžící procesy aMule a zkuste to znovu, nebo nejprve ručně odinstalujte předchozí verzi."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
-msgstr ""
+msgstr "Zdá se, že aMule je spuštěn. Zavřete jej prosím a spusťte odinstalační program znovu."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
-msgstr ""
+msgstr "Odstraňuji uživatelská data z $APPDATA\\aMule..."
+
+#~ msgid "Ratio"
+#~ msgstr "Poměr"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Ve složce nebyly nalezeny žádné soubory ke sdílení: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Změnit jazyk"
+
+#~ msgid "No languages available"
+#~ msgstr "Nejsou k dispozici žádné jazyky"
+
+#~ msgid "User name"
+#~ msgstr "Uživatelské jméno"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Obdržené části"
+
+#~ msgid "Available Parts"
+#~ msgstr "Dostupné části"
+
+#, fuzzy, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Nalezeno %i známých a %i neznámých sdílených souborů"
+#~ msgstr1 "Nalezeno %i známých a %i neznámých sdílených souborů"
+#~ msgstr2 ""
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Odesláno"
+#~ msgid "Remote prefix:"
+#~ msgstr "Vzdálený server"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Soubor nenalezen."
+#~ msgid "Local prefix:"
+#~ msgstr "Lokální server"
+
+#, c-format
+#~ msgid "Hashing %u new file"
+#~ msgid_plural "Hashing %u new files"
+#~ msgstr0 "Vytváření hashe %u nového souboru"
+#~ msgstr1 "Vytváření hashe %u nových souborů"
+#~ msgstr2 "Vytváření hashe %u nových souborů"
+
+#~ msgid "Filter Results"
+#~ msgstr "Filtrování výsledků"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Označit jako známý soubor"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Bootstrap"
+
+#~ msgid "New node"
+#~ msgstr "Nový uzel"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Více"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Bootstrap od \n"
+#~ "známých klientů"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Připojit k nějakému serveru a/nebo Kadu"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Odpojit Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Zastaví aktuální pokusy o připojení"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Odpojit se od aktuálně připojených sítí"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Připojit se k povoleným sítím"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Automaticky řadit soubory (žere CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule automaticky seřadí kolonky ve vaší frontě stahování"
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Zobrazí výsledky posledního vyhledávání.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Zobrazí průběh vyhledávání.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Spojení uzavřeno - aMule se pravděpodobně ukončila."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Kontrola nové verze po spuštění"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k odkaz: "
+
+#~ msgid "Commit"
+#~ msgstr "Přidat"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: jdu do pozadí - měj se"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Web: https://amule-org.github.io\n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Fórum: https://github.com/amule-org/amule/discussions\n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Web: https://amule-org.github.io\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Fórum: https://github.com/amule-org/amule/discussions\n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Odesláno"

amule-3.0.1.tar.gz/po/da.po -> amule-3.1.0.tar.gz/po/da.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:10+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:25+0000\n"
 "Last-Translator: Alex Thomsen Leth <alexl@stofanet.dk>\n"
 "Language-Team: aMule Team <https://github.com/amule-org/amule>\n"
 "Language: da\n"
@@ -20,69 +20,150 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Omking wxCas"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr ""
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Du bruger en forældet version af aMule"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Ikke tilgængelig"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Tilføj en Ven"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Du skal indtaste en brugbar IP og port"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr ""
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -91,138 +172,267 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Kunne ikke åbne %s (%s)"
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Index fil ikke fundet: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Hentelse af delte fier fra bruger '%s' fejlede"
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
 msgstr0 ""
 msgstr1 ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:179
-#, fuzzy
-msgid "Failed to open ED2KLinks file."
-msgstr "Kunne ikke åbne %s (%s)"
-
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Fejlede"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr ""
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Bekræft afslut"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "Accepter ydre forbindelser"
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i Serverer fundet i server.met"
+msgid "Loading temp files"
+msgstr "Anmoder om delte filer fra '%s'"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Anmoder om delte filer fra '%s'"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Fandt %i kendte delte filer"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Fandt %i kendte delte filer"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Start"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
 msgstr ""
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
+#: src/amule.cpp src/FirstRunWizard.cpp
+#, fuzzy
+msgid "eD2k server list (server.met)"
+msgstr "%i Serverer fundet i server.met"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
 msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "aMule kører"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -232,1655 +442,1962 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "Vi giver ikke garanti for at det ikke vil ødelægge noget, brænde dit hus,\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr ""
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr ""
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 #, fuzzy
 msgid "Server hostname notified"
 msgstr "Servernavn :"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "FEJL: Kan ikke åbne logfil"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "FARE: logfilen er tom. Noget er galt"
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Log nulstillet"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "ServerBesked: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Fejl ved hentning af node listen"
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Fejl ved åbning af den hentet version check filen"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Korrupt version check fil"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Du bruger en forældet version af aMule"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Den sidste nye version kan altid findes hos https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Din kopi af aMule er op til dato"
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Fejl ved hentning af version check filen"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr ""
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Forbundet til %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Forbundet til %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad startet."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad stoppet."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Forbundet til Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Forbundet til Kad (med firewall)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Afbrudt fra Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kad netværk fravalgt i instillinger, forbinder ikke."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr ""
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
 msgstr ""
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Søg"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr ""
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
 msgstr ""
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr ""
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Klienter"
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Beskeder"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistik"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Indstillinger"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr ""
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "ServerBesked: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr ""
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Ikke tilgængelig"
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr ""
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Den sidste nye version kan altid findes hos https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Forbinder"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Firewalled"
 msgstr "firewalled"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Connected"
 msgstr "Forbundet"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Connecting"
 msgstr "Forbinder"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Off"
 msgstr " Kad: "
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Afbryd"
-
-#: src/amuleDlg.cpp:853
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "Stop de nuværende forbindelses forsøg"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Afbryd"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "Afbryd fra nuvÃŠrende server"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Forbind"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
 msgstr ""
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Beskrivelse"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "aMule Log"
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Op: %.1f | Ned: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Vil du virkelig afslutte aMule?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Bekræft afslut"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr ""
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Søg"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Søge Vindue"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Downloads"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "Henter"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Beskeder"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Klienter"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Besked Vindue"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistik"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Indstillinger"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr ""
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr ""
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Fatal Fejl: Kunne ikke oprette timer"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Forbindelse afbrudt"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Spørg ved afslut"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Fatal Fejl: Kunne ikke oprette timer"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Connecting..."
 msgstr "Forbinder"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Ready"
 msgstr "Opdater"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Ikke tilgængelig"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Ingen part filer fundet"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Du prøver allerede at downloade denne fil %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Hentelse af delte fier fra bruger '%s' fejlede"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 #, fuzzy
 msgid "Searching buddy for lowid connection"
 msgstr "venter pÃ¥ forbindelse..."
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Falsk eMule version-%#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " Falsk eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Falsk eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (baseret på eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "Requested: %s\n"
 msgstr "Anmodede:"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Anmodet om ukendt fil"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, 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/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Hentelse af delte fier fra bruger '%s' fejlede"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Uventet fil fejl ved skrivning %s : %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Fejl ved forbindelse til %s (%s:%i): %d"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategori"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr ""
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Vælg en mappe til indkommende filer"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Luk tab"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Luk alle tabs"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Luk andre tabs"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Tilføj til Venner"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Vis &Detaljer"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Se Filer"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, fuzzy, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 "Kredit udlÃžbet!"
 msgstr1 "Kredit udlÃžbet!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Klient Detaljer"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "Lavt ID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HøjtID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr ""
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Forbundet"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Afbrudt"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+#, fuzzy
+msgid "Name"
+msgstr "Fil Navn"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
 msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP Adresse"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Sidste Kontakt"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Sessions Gennemsnit"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Upload-Hastighed"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "Download-Hastighed"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr " Total Download: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr " Total Download: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Ikke færdig"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr ""
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr ""
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Filer"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Henter"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Upload"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Ukendt"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, 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:875
+#: src/ClientTCPSocket.cpp
 #, 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:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Fil Kommentarer"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Brugernavn"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Fil Navn"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "venter pÃ¥ forbindelse..."
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Ingen kommentarer"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, fuzzy, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "Ingen kommentarer"
 msgstr1 "Ingen kommentarer"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Fejl ved indlÃŠsning af kreditfil"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto La"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Hø"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Meget lav"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Lav"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Høj"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Meget Høj"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Udgiv"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Spørger"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Forbinder via Server"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Kø Fuld"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "I Kø"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Henter"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Modtaget Hashsæt"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Ingen brugbare dele"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Kan ikke forbinde LavID til LavID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "For mange forbindelser"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr ""
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Banlyst"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr ""
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr ""
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr ""
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr ""
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr ""
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr ""
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr ""
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr ""
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Færdig"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr ""
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr ""
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr ""
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Overført"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Hastighed"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Forløb"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Kilder"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Priotet"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Status"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Tid Tilbage"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Sidst Færdig"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Sidste Kontakt"
 
-#: 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/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:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Auto"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Afbryd"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Stop"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pause"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Genoptag"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Ryd færdige"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Udvidet Muligheder"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Smug Kig"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Vis fil &detaljer"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Vis alle kommentarer"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Indtast nyt navn for denne fil:"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "fjern fra ketegori"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Flyt til kategori"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Åben filen"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+#, 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/DownloadListCtrl.cpp
+#, 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 src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Indtast nyt navn for denne fil:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Omdøb fil"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.2f MB"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Downloads (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr ""
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Total Størrelse Af Delte Filer: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading temp files from %s."
 msgstr "Anmoder om delte filer fra '%s'"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Ingen part filer fundet"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Fandt %i part filer"
 msgstr1 "Fandt %i part filer"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Downloader %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr ""
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Du prøver allerede at downloade denne fil %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr ""
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr ""
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr ""
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr ""
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Automatisk forbindelse til server vil prøve igen om %d sekunder"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr ""
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr ""
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Index fil ikke fundet: "
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Index fil ikke fundet: "
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
+#: src/ExternalConn.cpp
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ExternalConn.cpp:1536
-msgid "WebSearch from remote interface makes no sense."
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
 msgstr ""
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr ""
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr ""
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr ""
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr ""
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr ""
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Fjern kategori"
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr ""
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1888,23 +2405,23 @@
 "Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr ""
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr ""
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1912,59 +2429,59 @@
 "\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr ""
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr ""
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr ""
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr ""
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1973,2234 +2490,2919 @@
 "Exiting...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr ""
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr ""
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr ""
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "Fejl: Kunne ikke oprette partfil"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Velkommen"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Forbundet til %s"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Forbindelse"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Du prøver allerede at downloade denne fil %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Gennemse"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Venner"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Vis &Detaljer"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Tilføj en ven"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Fjern Ven"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Send &Besked"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Se Filer"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 #, 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:182
+#: src/FriendListCtrl.cpp
 #, 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:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "I Kø"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Spørger efter en anden fil"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "Ventende Uploads: %i"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "I Kø"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "Upload"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "None"
 msgstr "Ingen"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Nej"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Ja"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Kunne ikke åbne %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Downloader..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 #, fuzzy
 msgid "HTTP download cancelled"
 msgstr "Max download grÃŠnse"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Hentelse af delte fier fra bruger '%s' fejlede"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Du prøver allerede at downloade denne fil %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Downloaded:"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Max download grÃŠnse"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr ""
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Kunne ikke hente serverlist fra %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "Kunne ikke hente serverlist fra %s"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Fejl ved indlÃŠsning af kreditfil"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Nuværende"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Nuværende Gennemsnit"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Sessions Gennemsnit"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr ""
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr ""
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr ""
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: søgeord er for kort"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, fuzzy, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Læs %u Kad kontakter"
 msgstr1 "Læs %u Kad kontakter"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Kad startet."
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr ""
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr ""
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr ""
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "System standard"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabic"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Asturian"
+msgstr "Estonian"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Basque"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgarian"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Catalan"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Danish"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Dutch"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estonian"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finnish"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "French"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "German"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italian"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Korean"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lithuanian"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polish"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Romanian"
+msgstr "Estonian"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Russian"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Spanish"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "Ukendt: %i"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Hasher"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Færdiggør"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Færdig"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Pause"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Beskadiget"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Venter"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Du skal specificere et ikke tomt kodeord"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Forkert kodeord, ikke it MD5 hash!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Forbindelsen fejlede"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Ydre Forbindelses Parametre"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "ExternalConn: Dårligt svar fra server. Forbindelse lukket"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "ExternalConn: Dårligt svar fra server. Forbindelse lukket"
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Succes! Forbindelse oprettet til aMule"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Succes! Forbindelse oprettet"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Handshake failed."
 msgstr "Ydre Forbindelses Parametre"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "Synkroniserings tråd startet."
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Luk"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Ryd"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Ubegrænset"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Forbundet"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Forbundet"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Forbundet til Kad (med firewall)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "ServerIP: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "ServerIP: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Afbryd"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Forbind"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Ubegrænset"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Download-Hastighed"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Upload-Hastighed"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "Klient ID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "ServerNavn: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "ServerIP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Ingen Forbindelse"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online Signatur: Aktiv"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online Signatur: Inaktiv"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Overfør"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Tilføj til Venner"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr ""
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Henter ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Antal brugere på den server du er forbundet til ..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Brugere: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr ""
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Op: 0.0 | Ned: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Ikke Forbundet ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr ""
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Søg"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Type"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr ""
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr ""
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Alle"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Arkiver"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Lyd"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CD-Aftryk"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Billeder"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programer"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Videoer"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Endelse"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Min Størrelse"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Max Størrelse"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr ""
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Filter"
+msgstr "Filtreret: %i"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr ""
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Se Filer"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Start"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Endelse"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr ""
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Download"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr ""
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr ""
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "Fundne Kilder :"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "General"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Navn :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Navn"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met-Fil"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
+
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Filstørrelse"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met-Fil :"
+#: src/muuli_wdr.cpp src/Statistics.cpp
+msgid "Transfer"
+msgstr "Overfør"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Partfilestatus"
+msgstr "Status"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Sidst færdig"
 
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash :"
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Fundne Kilder"
 
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Filstørrelse :"
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Overfører Kilder"
 
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
 msgstr ""
 
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Sidst færdig :"
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Tilgængelig"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
-msgid "Transfer"
-msgstr "Overfør"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Datarate"
+msgstr "Ikke anslået"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Fundne Kilder :"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Download Active Time"
+msgstr "Download-Hastighed"
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Overfører Kilder :"
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Færdig Størrelse"
 
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
+msgstr "Intelligent Fejl Håndtering"
 
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Tilgængelig :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Tabt pga beskadigelse"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Gained by compression"
+msgstr "Brug gzip komprimering"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
 msgstr ""
 
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Overført :"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Deling: "
 
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Færdig Størrelse :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Anmodninger"
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
-msgstr "Intelligent Fejl Håndtering"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Godtaget Anmodninger"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Overført Data"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Tabt pga beskadigelse :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Delings Kvote"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Hele kilder"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Delte Filer"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Upload: "
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Ikke anslået"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
 msgstr ""
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
 msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Titel"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr ""
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Overtag"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Ryd Op"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Anvend"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Fil Kvalitet"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Ikke anslået"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Invalid / fejl / Falsk"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Dårlig"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Nogen Lunde"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "God"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Glimrende"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Afbrudt fra Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Opdater"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Henter, vent venligst"
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Krævet Information"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP Adresse :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Aktuelle Adresse"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Brugernavn :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Userhash"
+msgstr "Brugere"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Download-Hastighed"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Nuværende"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Nuværende Gennemsnit"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Sessions Gennemsnit"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Upload-Hastighed"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktive Downloads"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktive Forbindelser (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktive Uploads"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Navn:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Client software"
+msgstr "Klienter"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Client version"
+msgstr "Klienter"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "User ID"
+msgstr "Bruger"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "ServerIP"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Server name"
+msgstr "Servernavn"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Current request"
+msgstr "Nuværende"
 
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Average upload rate"
+msgstr "Gennemsnitlig upload tid: %s"
 
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Average download rate"
+msgstr "Gennemsnitlig upload tid: %s"
 
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Downloaded (session)"
+msgstr "Downloads (%i)"
 
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Uploaded (total)"
+msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Downloaded (total)"
+msgstr "Downloads (%i)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Point:"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "Kø Fuld"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Queue score"
+msgstr "Kø Fuld"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Brugernavn"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Start minimeret"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Spørg ved afslut"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Gennemse"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Video Afspiller"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Slot Tildeling"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
-msgid "Max sources per downloading file:"
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
-msgid "Max simultaneous connections:"
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
+#: src/muuli_wdr.cpp
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Auto forbind ved start"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Genforbind ved fejl"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Fjern ikke tilgængelige servere, efter"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "forsøg"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Liste"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Brug prioterings system"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Brug smart LavID tjek ved forbindelse"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Sikker forbindelse"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Autoforbind kun til servere i statik liste"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Sæt manuelt tilføjede servere til Høj Priotet"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Tilføj filer til download i pause tilstand"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Tilføj filer til download med auto priotet"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 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:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Uploads"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Tilføj nye delte filer med auto priotet"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Fjern Ven"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafer"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Opdaterings interval : 5 sek"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Tid for gennemsnitlig graf: 100 min"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Baggrund"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Download nu"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Upload nu"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktive Forbindelser"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Vælg"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! Advarsel !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Max nye forbindelser / 5 sekunder"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "FTP opdaterings interval i minutter"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "FTP opdaterings interval i minutter"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Fil Buffer Størrelse"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "Vis overførsels hastighed i titel"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Vis overførsels hastighed i titel"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Flad"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Rund"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Ydre Forbindelses Parametre"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Accepter ydre forbindelser"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Password"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "UPnP port"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Undersøger password\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Undersøger password\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Tillad bruger adgang"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Fuld rettigheds kodeord"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Fuld rettigheds kodeord"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Aktiver lav rettigheds brugere"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Lav rettigheds kodeord"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Side Opdaterings Tid (i sek)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Aktiver Gzip komprimering"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "System standard"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Titel :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Kommentar :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Indkommende Mappe"
 
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Indkommende Mappe :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Reset"
-
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule Log"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Server Info"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Alle"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Aktiver online-signatur"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Kilder"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4208,11 +5410,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4222,854 +5424,762 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Download: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Auto forbind ved start"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
+#: src/muuli_wdr.cpp
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
+#: src/muuli_wdr.cpp
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2696
-msgid "Enable Proxy"
+#: src/muuli_wdr.cpp
+msgid "The proxy host name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2697
-msgid "Enable/disable proxy support"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Proxy port"
+msgstr "UPnP port"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
+#: src/muuli_wdr.cpp
+msgid "The proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2714
-msgid "The proxy host name"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2719
-msgid "The proxy port"
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
+#: src/muuli_wdr.cpp
+msgid "Remember those settings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2763
-msgid "Remember those settings"
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Brug gzip komprimering"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&Åben filen"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Aktive Uploads"
 
-#: src/muuli_wdr.cpp:2963
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Percent of total files"
-msgstr "Antal Filer Total"
+msgid "Show Clients for"
+msgstr "Vis Liste"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "Delte Filer"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "Slettede Servere"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "Aktive Uploads"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "Vis Liste"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "Opdater"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Send"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Afbryd"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Delte Filer"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Afbryd"
 
-#: src/OScopeCtrl.cpp:242
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Forbind"
+
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Inaktiv %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 #, fuzzy
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "Bytes"
 msgstr1 "Bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 #, fuzzy
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "kB/s"
 msgstr1 "kB/s"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sek"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "min"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr ""
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr ""
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
 msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "alt"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "alt andet"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Mangelfuld"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "stoppet"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arkiv"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Tekst"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
 msgstr ""
 
-#: src/OtherFunctions.cpp:1212
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
 #, c-format
-msgid "Using config dir: %s"
+msgid "%u or more other sources have this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr ""
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr ""
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "Fejl: Kunne ikke oprette partfil"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Kunne ikke åbne %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 #, fuzzy
 msgid "IO failure while saving partfile: "
 msgstr "Fejl ved gemning af partfil: %s (%s => %s)"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr ""
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Kunne ikke hente serverlist fra %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "System standard"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
 msgstr ""
 
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabic"
-
-#: src/Preferences.cpp:640
-#, fuzzy
-msgid "Asturian"
-msgstr "Estonian"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Basque"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgarian"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Catalan"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr ""
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr ""
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr ""
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danish"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Dutch"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
+#: src/PeerCapabilities.h
+msgid "IPv6"
 msgstr ""
 
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estonian"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finnish"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "French"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
 msgstr ""
 
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "German"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr ""
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr ""
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr ""
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italian"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr ""
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr ""
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Korean"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr ""
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polish"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portuguese"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: src/Preferences.cpp:669
-#, fuzzy
-msgid "Romanian"
-msgstr "Estonian"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Russian"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr ""
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spanish"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr ""
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr ""
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr ""
-
-#: src/Preferences.cpp:779
-#, fuzzy
-msgid "Change Language"
-msgstr "Sprog"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/Preferences.cpp
+msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Ikke tilgængelig"
-
-#: src/Preferences.cpp:982
-msgid "no options available"
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Forbindelse"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Mapper"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Servere"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Filer"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Fjern Kontrol"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5079,157 +6189,265 @@
 "these settings."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Undersøger password\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "Ydre Forbindelses Parametre"
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "Ydre Forbindelses Parametre"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "Ydre Forbindelses Parametre"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "Ydre Forbindelses Parametre"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Ydre Forbindelses Parametre"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
 "If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Auto Opdatering startet"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Du prøver allerede at downloade denne fil %s"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Accepter ydre forbindelser"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Fandt %i kendte delte filer"
+msgstr1 "Fandt %i kendte delte filer"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Gennemse efter Video Afspiller"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "System standard"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5237,1214 +6455,1471 @@
 "Tilføj URLer hvor der kan hentes server.met filer.\n"
 "Kun en URL på hver linje."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Hele kilder"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Opdaterings interval : 5 sek"
 msgstr1 "Opdaterings interval : 5 sek"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Tid for gennemsnitlig graf: 100 min"
 msgstr1 "Tid for gennemsnitlig graf: 100 min"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Fil Buffer StÃžrrelse %i bytes"
 msgstr1 "Fil Buffer StÃžrrelse %i bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Server forbindelses opdaterings interval %i min"
 msgstr1 "Server forbindelses opdaterings interval %i min"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Server forbindelses opdaterings interval: Inaktiv"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "disabled"
 msgstr "deaktiver"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Fandt %i kendte delte filer"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Delte Filer"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
 msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr ""
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Søg"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Søg"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Main"
 msgstr ""
 
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
-msgid "Main"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
 msgstr ""
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
 msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "Fil ID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Ikke anslået"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "Fil ID"
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Indtast nyt navn for denne fil:"
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Luk alle tabs"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
-msgid "Copy eD2k link to clipboard"
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "Afbryd"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "aMule kører"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finnish"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
 msgstr ""
 
-#: src/ServerConnect.cpp:79
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
 msgstr ""
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "Search progress not available"
+msgstr "%s Ikke tilgÃŠngelig"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "Fejl ved hentning af node listen"
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
+msgstr "Fejl ved hentning af node listen"
+
+#: src/ServerConnect.cpp
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Automatisk forbindelse til server vil prøve igen om %d sekunder"
+msgstr1 "Automatisk forbindelse til server vil prøve igen om %d sekunder"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Forbundet til %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Forbindelse oprettet til: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Kunne ikke forbinde. Internettet må være nede."
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Mistede forbindelsen til %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) ser ud til at være død"
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 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"
-msgstr0 "Automatisk forbindelse til server vil prøve igen om %d sekunder"
-msgstr1 "Automatisk forbindelse til server vil prøve igen om %d sekunder"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Forbindelse afbrudt"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr ""
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i Serverer fundet i server.met"
 msgstr1 "%i Serverer fundet i server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "Servere tilfÃžjet: "
 msgstr1 "Servere tilfÃžjet: "
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 #, fuzzy
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Fejl: filen server.met er beskadiget"
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "Uventet fil fejl ved skrivning %s : %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr ""
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr ""
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr ""
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr ""
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr ""
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Fejl ved gemning af server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Uventet fil fejl ved skrivning %s : %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Invalid URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Kunne ikke hente serverlist fra %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "Servernavn"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Brugere"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Brugere"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Statistik"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr ""
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Filer"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Delte Filer"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "min"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Servere (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Server"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Fjern server"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Remove servers"
 msgstr "Fjern server"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Fjern Alle servere"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 #, 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:550
+#: src/ServerListCtrl.cpp
 #, 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:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Ny Klient-ID er %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, fuzzy, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Modtog %d nye Servere"
 msgstr1 "Modtog %d nye Servere"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Server afviste sidste kommando"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "aMule Log"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Forbindelse"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Forbundet"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr ""
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "UDP Connection State:"
 msgstr "Peak Forbindelser (anslÃ¥et)"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr ""
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connecting to buddy"
 msgstr "Forbundet til %s"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, fuzzy, c-format
 msgid "Connected to buddy at %s"
 msgstr "Forbundet til %s %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr ""
+
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed sources:"
 msgstr "Fundne Kilder :"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed notes:"
 msgstr "Index fil ikke fundet: "
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr ""
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr ""
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr ""
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Fandt %i kendte delte filer"
 msgstr1 "Fandt %i kendte delte filer"
 
-#: src/SharedFileList.cpp:410
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Fandt %i kendte delte filer"
-msgstr1 "Fandt %i kendte delte filer"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
+msgid "Shared directory not readable, skipping: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "Brugernavn"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "Download-Hastighed"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "Upload-Hastighed"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Fejl ved forbindelse til %s (%s:%i): %d"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Suspender upload af fil: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Suspender upload af fil: %s"
+msgstr1 "Suspender upload af fil: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Fandt %i kendte delte filer"
+msgstr1 "Fandt %i kendte delte filer"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "Tilgængelig :"
+msgid "User Name"
+msgstr "Brugernavn"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "Uploads"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Download Status"
 msgstr "Downloads"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "Fil Navn"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "Delte Filer"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Anmodninger"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Godtaget Anmodninger"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Overført Data"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Delings Kvote"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Sendte Dele"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Hele kilder"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Mappe sti"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Delte Filer"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Tilføj kommentar/bedømmelse"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Rediger Kommentar/Bedømmelse"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Omdøb"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Tilføj filer i samling til overførelses liste"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Kopier magnet &URI til udklipsholder"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Kopier eD2k link til udklipsholder (&AICH info)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 #, 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:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Hentelse af delte fier fra bruger '%s' fejlede"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Total Størrelse Af Delte Filer: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Total Størrelse Af Delte Filer: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Delte Filer (%i)"
+msgstr1 "Delte Filer (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Delte Filer (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "DeleAfFil"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Fandt %i kendte delte filer"
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Status"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "Fil Navn"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Gennemsnitlig upload tid: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr ""
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Genforbindelser: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Tid Siden Første Overførsel: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Forbundet Til Server Siden: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Klienter"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "Ukendt: %i"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "Filtreret: %i"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Banned: %s"
 msgstr "Banlyst"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr ""
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Total Størrelse Af Delte Filer: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr ""
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktive forbindelser (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Ikke tilgængelig"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr ""
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr ""
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Processing by filename: "
 msgstr "Udfører anmodning Original: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr ""
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6452,7 +7927,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6460,142 +7935,140 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Downloads (%i)"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Admodning fejlede med en ukendt fejl."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr ""
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr ""
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr ""
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "firewalled"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Download:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Upload:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Total sources:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Number of search results: %i\n"
-msgstr ""
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "DeleAfFil"
 
-#: src/TextClient.cpp:965
+#: src/TextClient.cpp
 #, c-format
-msgid "Search progress: %u %% \n"
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/TextClient.cpp:967
-#, fuzzy
-msgid "Search progress not available"
-msgstr "%s Ikke tilgÃŠngelig"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr ""
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr ""
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6604,46 +8077,46 @@
 "Example: 'statistics 5' will show only the top 5 versions for each client type.\n"
 msgstr ""
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr ""
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr ""
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6651,35 +8124,35 @@
 "or a resolvable DNS name."
 msgstr ""
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr ""
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6690,109 +8163,121 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr ""
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6811,377 +8296,404 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr ""
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr ""
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr ""
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr ""
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
+msgstr "Viss statusbar"
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "Viss statusbar"
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "Viss statusbar"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr ""
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr ""
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr ""
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr ""
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr ""
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr ""
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr ""
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr ""
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr ""
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr ""
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr ""
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr ""
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr ""
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr ""
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Delte Filer"
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr ""
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
 "Use '%s' instead.\n"
 msgstr ""
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr ""
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Hasher"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Hasher"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Genoptager uploads af fil: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Bekræftelse Krævet"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "For mange forbindelser"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr ""
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr ""
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Tilføj kategori"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Ændre kategori"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Fjern kategori"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Genoptager uploads af fil: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, fuzzy, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Suspender upload af fil: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr ""
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr ""
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr ""
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr ""
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr ""
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr ""
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr ""
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Velkommen"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Indput parametre"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7193,163 +8705,160 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 #, fuzzy
 msgid "Cancelled !"
 msgstr "Anulleret !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Ikke muligt at åbne %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, aMule Online Statistik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Maksimum DL rate siden wxCas er startet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Absolute Maksimum DL rate gennem wxCas forrige kørsel"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Reset"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "System"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Stop Auto Genopfriskning"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Gem Online Statistisk billede"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Print Online Statistisk billede"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Omking wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Start Auto Opdatering"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Auto Opdatering stoppet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Auto Opdatering startet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Gem Statistisk Billede"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMule Online Statistik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7357,11 +8866,11 @@
 "Der var et problem med udskrivningen.\n"
 "Måske printer instillingerne er forkerte."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Udskrivning"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7378,398 +8887,441 @@
 "Baseret på CAS af Pedro de Oliveira <falso@rdk.homeip.net>\n"
 "Omdelt under GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh Oh, aMule kører ikke..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule kører"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule kører men ikke forbundet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule forbinder"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh Oh, aMule status ukendt..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " har kørt i "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " er stoppet !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " er ikke forbundet !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " forbinder..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr "gør noget mærkeligt, undersøg det !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " er forbundet til "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "afbrudt"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " er tændt "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 #, fuzzy
 msgid " with "
 msgstr " med "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr " Total Download: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Upload: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Sesion Download: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Download: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Deling: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " fil(er), Klienter i kø: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Tid: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " tændt "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "System Hentnings Gennemsnit (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Mappe indholdende amulesig.dat fil"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "Skriv her i hvilken mappe amulesig.dat befinder sig"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Opdaterings rate interval i sekunder"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Upload periodisk dit statistiske billede til en FTP server"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP Url"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP Sti"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Skriv her URL på din FTP server"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "Skriv her biblioteket hvor dit statistiske billede på FPT serveren skal ligge"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Bruger"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTP opdaterings interval i minutter"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Valider"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Mapper der indeholder din signatur fil"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Mappe hvor det statistiske billede bliver genereret"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Henter template <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP port"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Brug gzip komprimering"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Tillad bruger adgang"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMule configurations fil sti. BRUG IKKE DIREKTE"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule Web Server"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Admoding fejlede med følgende fejl: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Index fil ikke fundet: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Session udløbet - admoder login\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Session ok, logget in\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Session ok, ikke logget in\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Ingen session åbnet - vil admode om login\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Session oprettet - admoder login\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Udfører anmodning Original: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Undersøger password\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Password hash invalid\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Passwork ok\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Password forkert\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Logout anmodning\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Udfører forespørgsel omledt: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Ingen part filer fundet"
+#~ msgid "Ratio"
+#~ msgstr "Delings Kvote"
+
+#, fuzzy
+#~ msgid "Change Language"
+#~ msgstr "Sprog"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "Ikke tilgængelig"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Sendte Dele"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "Tilgængelig :"
+
+#, fuzzy, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Fandt %i kendte delte filer"
+#~ msgstr1 "Fandt %i kendte delte filer"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#, fuzzy
+#~ msgid "Percent of total files"
+#~ msgstr "Antal Filer Total"
+
+#, fuzzy
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Stop de nuværende forbindelses forsøg"
+
+#, fuzzy
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Afbryd fra nuvÃŠrende server"
+
+#, fuzzy
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Viss statusbar"
+
+#~ msgid "Commit"
+#~ msgstr "Overfør"

amule-3.0.1.tar.gz/po/de.po -> amule-3.1.0.tar.gz/po/de.po Changed

@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:07+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:26+0000\n"
 "Last-Translator: Werner Mahr <werner@vollstreckernet.de>\n"
 "Language-Team: German <>\n"
 "Language: de\n"
@@ -24,25 +24,113 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 26.04.0\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Zeige aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMule-Fernbedienung "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Schnappschuss:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"'All-Plattform' p2p Client basierend auf eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Teile von aMule basieren auf \n"
+
+#: src/AboutDialog.cpp
+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/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Forum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Probleme:"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Beim Start auf neue Version prüfen"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Verbinde mit Kad..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Du benutzt eine veraltete aMule-Version!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Nicht verfügbar"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Einen Freund hinzufügen"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Du musst einen gültigen Port und eine gültige IP eingeben!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Information"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Die angegebene Benutzerprüfsumme ist nicht gültig!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
+#, fuzzy
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
@@ -50,46 +138,46 @@
 "\n"
 "Desktop-Integration jetzt installieren?"
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr "aMule zum Anwendungsmenü hinzufügen?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr "Installieren"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr "Nicht jetzt"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr "Nicht erneut fragen"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr "Desktop-Integration konnte nicht installiert werden: die Umgebungsvariable APPDIR ist nicht gesetzt. Dies bedeutet in der Regel, dass das AppImage auf eine nicht standardmäßige Weise gestartet wurde."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr "aMule-Integration fehlgeschlagen"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr "Desktop-Integration konnte nicht installiert werden: Erstellen von %s fehlgeschlagen. Prüfen Sie, ob Ihr persönliches Verzeichnis schreibbar ist."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr "Desktop-Integration konnte nicht installiert werden: Schreiben von %s fehlgeschlagen. Prüfen Sie, ob Ihr persönliches Verzeichnis schreibbar ist."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, fuzzy, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr "AppImage-Integration: aMule wurde zu Ihrem Anwendungsmenü hinzugefügt."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -103,82 +191,160 @@
 "\n"
 "aMule jetzt neu starten?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr "aMule installiert"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr "Jetzt neu starten"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr "Später"
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 "Konnte %u Link aus ED2KLinks nicht hinzufügen (Details: siehe Log)"
-msgstr1 "Konnte %u Links aus ED2KLinks nicht hinzufügen (Details: siehe Log)"
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "FEHLER"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Fehler beim Öffnen der ED2KLinks-Datei."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "aMule installiert"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Index-Datei nicht gefunden: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Konnte Liste der freigegebenen Dateien von Benutzer '%s' nicht abrufen"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "Keine freigebbaren Dateien im Ordner gefunden: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Kann Magnet-Verweis nicht in eD2k umwandeln: %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Ungültiger eD2k-Link! Fehler: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Beende nun Hauptanwendung ..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Beende amuleweb-Instanz mit pid '%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Erzwinge Beenden der amuleweb-Instanz mit pid '%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Beende amuleweb-Instanz mit pid '%d' ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Erzwinge Beenden der amuleweb-Instanz mit pid '%d' ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Beende Programmkern."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "aMule-Herunterfahren abgeschlossen."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Speicherfehlerbehebungsresultate für aMule-Beendung:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Deine Locale wurde wegen einer Konfigurationsänderung auf Systemstandard geändert. Sorry."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -186,24 +352,48 @@
 "\n"
 "EC-Konfiguration"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Passwort eingestellt und externe Verbindungen aktiviert."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr "eD2k-Serverliste (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr "Kad-Bootstrap-Knoten (nodes.dat)"
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading temp files"
+msgstr "Lade temporäre Dateien von %s."
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Lade temporäre Dateien von %s."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Freigegebene Dateien neu laden..."
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Freigegebene Dateien neu laden..."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Start"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Netzwerk-Bootstrap"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
@@ -211,30 +401,59 @@
 "aMule hat fehlende Netzwerk-Bootstrap-Dateien erkannt.\n"
 "Wählen Sie aus, welche heruntergeladen werden sollen:"
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
-msgstr "Netzwerk-Bootstrap"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "eD2k-Serverliste (server.met)"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Kad-Bootstrap-Knoten (nodes.dat)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "Webserver läuft mit pid %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 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 -DBUILD_WEBSERVER=YES  neu und installiere dies."
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "FEHLER"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "Webserver läuft mit pid %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+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 -DBUILD_WEBSERVER=YES  neu und installiere dies."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Kann Ports nicht mit der festgelegten Adresse verbinden: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port %u ist nicht erreichbar. Du wirst eine niedrige ID erhalten\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -249,48 +468,48 @@
 "\n"
 "Bitte überprüfe deine Netzwerkeinstellungen, um sicherzugehen, dass der Port für ein- und ausgehenden Traffic geöffnet ist."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Erstellen der OnlineSig-Datei gescheitert"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Erstellen der aMule OnlineSig-Datei gescheitert"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Dies ist das erste Mal, dass du aMule %s startest"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Dies ist eine Testversion, täglich aktualisiert, und\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "unter https://amule-org.github.io, oder in unserem IRC-Channel #amule auf irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Bitte melde Fehler unter https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -298,513 +517,503 @@
 "Das angegebene Verzeichnis für die Online-Signaturdateien ist UNGÜLTIG!\n"
 "Online-Signatur wird bis zur Fehlerbehebung in den Einstellungen DEAKTIVIERT."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Server Hostname benachrichtigt"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Speicherplatzvorbelegung für Datei '%s' fehlgeschlagen: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "FEHLER: kann Logdatei nicht öffnen"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "WARNUNG: Logdatei ist leer. Etwas ist falsch."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Das Log wurde zurückgesetzt"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Servernachricht: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, 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/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Knotenliste kann nicht geholt werden."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Konnte heruntergeladene Datei zur Versionsprüfung nicht öffnen"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Fehlerhafte Versionsprüfungsdatei"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Du benutzt eine veraltete aMule-Version!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Die neueste Version kann man immer auf https://github.com/amule-org/amule/releases/latest finden."
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Deine Kopie von aMule ist aktuell."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Konnte die Versionsprüfungsdatei nicht herunterladen"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Benutzer: %s | Dateien: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Keine Netzwerke ausgewählt"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "mit niedriger ID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "mit hoher ID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Verbunden zu %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Verbinde zu %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "eD2k getrennt"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad gestartet."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad beendet."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Kad verbunden (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Kad verbunden (firewalled)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Kad getrennt"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kad-Netzwerk ist in den Voreinstellungen deaktiviert, kein Verbindungsversuch."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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 https://amule-org.github.io/docs gefunden werden."
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - Zeitmesser wird gestartet"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: Wechsele in den Hintergrund."
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Kann keine Pid-Datei erstellen"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "FEHLER: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Dies ist aMule %s, basierend auf eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Läuft auf %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Besuche https://github.com/amule-org/amule/releases/latest um zu sehen, ob eine neue Version verfügbar ist."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "UNBEHEBBARER FEHLER: Es konnte kein Zeitgeber erstellt werden."
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMule-Fernbedienung "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Schnappschuss:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Netzwerke"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"'All-Plattform' p2p Client basierend auf eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Suchen"
+
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Webseite: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Freigegebene Dateien"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Clients"
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Webseite: https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Nachrichten"
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
-"Probleme: https://github.com/amule-org/amule/discussions \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistiken"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Einstellungen"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Teile von aMule basieren auf \n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr ""
 
-#: src/amuleDlg.cpp:552
-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
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Servernachricht: %s"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Nicht verfügbar"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Nachricht"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Die neueste Version kann man immer auf https://github.com/amule-org/amule/releases/latest finden."
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "aMule Dialog zerstört."
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Verbinden"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Baue Verbindung auf"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Verbindung getrennt"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Firewalled"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Verbunden"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Baue Verbindung auf"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: aus"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Abbruch"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Beendet die derzeitigen Verbindungsversuche"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Version"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Trennen"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Von den momentan verbundenen Netzwerken trennen."
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Verbinden"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adresse"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Mit den aktuell aktivierten Netzwerken verbinden."
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Beschreibung"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "aMule-Log"
+
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Up: %.1f%s | Down: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Verbunden)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Getrennt)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "%s wirklich beenden?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Beenden bestätigen"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Startbefehl: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- Voreinstellung -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Skin-Verzeichnis '%s' existiert nicht"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, 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/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Netzwerke"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Übersicht der verwendeten Netzwerke"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Suchen"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Dateisuche in den verbundenen Netzwerken"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Downloads"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Download-Fenster"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Freigegebene Dateien"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Übersicht der freigegebenen Dateien"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Nachrichten"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Übersicht der verwendeten Netzwerke"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Nachrichten, Chat, Freundesliste"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistiken"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Diverse Statistiken über Up- und Download, Verbindungen, Clients usw."
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Fenster für Einstellungen"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importiere"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Das Importierwerkzeug für Part-Dateien"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Über"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Über/Hilfe - Hinweise zur Version usw."
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "eD2k-Netzwerk"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kad-Netzwerk"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Kein Netzwerk"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "aMule Fernsteuerung"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Schwerer Fehler: Der Kern-Zeitgeber konnte nicht erstellt werden."
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Verbinde mit entferntem aMule"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Verbindung verloren"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Abfrage beim Beenden"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Schwerer Fehler: Der Nachfrage-Zeitgeber konnte nicht erstellt werden."
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Gehe in Ereignisschleife..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr "Verbindung fehlgeschlagen. Bitte Host, Port und Passwort prüfen."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "EC-Ereignissteuerung für entfernte Benutzeroberfläche"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "Verbindung fehlgeschlagen. Konnte nicht zu %s:%d verbinden\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Beende..."
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Verbindung getrennt - wahrscheinlich hat aMule sich beendet"
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Verbindungsversuch zu %s (%s:%i): Zeitüberschreitung."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
@@ -813,1060 +1022,1377 @@
 "Verbindungs-Timeout. %s:%d konnte innerhalb der vorgegebenen Zeit nicht erreicht werden.\n"
 "Prüfen Sie Host, Port und ob aMule mit aktivierten externen Verbindungen läuft."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Mit Netzwerk verbinden."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Verbindung fehlgeschlagen. Konnte nicht zu %s:%d verbinden\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Bereit"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Alle"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Nicht verfügbar"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Datei nicht gefunden."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Ungültiger Verweis oder schon auf der Liste"
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Konnte heruntergeladene Datei nicht nach %s verschieben"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 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/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Konnte Liste der freigegebenen Dateien von Benutzer '%s' nicht abrufen"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Suche Kumpel für Verbindung mit niedriger ID"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Fake eMule version %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Fake eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Fake eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (basiert auf eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Spitzname: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Angefordert: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Dateistatistik dieser Sitzung: %d von %d Anfrage akzeptiert, %s übertragen\n"
 msgstr1 "Dateistatistik dieser Sitzung: %d von %d Anfragen akzeptiert, %s übertragen\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Dateistatistik aller Sitzungen: %d von %d Anfrage akzeptiert, %s übertragen\n"
 msgstr1 "Dateistatistik aller Sitzungen: %d von %d Anfragen akzeptiert, %s übertragen\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Unbekannte Datei angefordert"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Nachricht gefiltert von '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Neue Nachricht von '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Benutzer %s (%u) hat die Liste freigegebener Dateien für das nicht vorhandene Verzeichnis '%s' angefordert -> Ignoriert"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Konnte Liste der freigegebenen Dateien von Benutzer '%s' nicht abrufen"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "WARNUNG: Datei '%s' kann nicht geöffnet werden."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "WARNUNG: Liste der abgebrochenen Dateien korrumpiert, enthält ungültigen Header."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "IO-Fehler während des Lesens der Datei '%s': %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Fehler während des Speicherns der Datei '%s': %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Captcha eingeben"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategorie"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Neue Kategorie"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Wähle einen Ordner für eingehende Dateien"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Du musst einen Namen für diese Kategorie festlegen!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Du musst einen Pfad für diese Kategorie festlegen!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Beginn der Chat-Sitzung: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Verbunden mit Client ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Verbinde mit Client ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Verbindung zum Client fehlgeschlagen / Verbindung verloren ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 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/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Chat"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Reiter schließen"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Alle Reiter schließen"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Andere Reiter schließen"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Zu Freunden hinzufügen"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Zeige &Details"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Entferne von Freundesliste"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Friendslot erstellen"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Dateien ansehen"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Sende Nachricht"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Sende Nachricht an Benutzer"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Zu sendende Nachricht:"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Du darfst nicht mehr als einen Friendslot vergeben.\n"
+" Nur ein Slot wurde vergeben."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Mehrfachauswahl"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Entferne von Freundesliste"
+msgstr1 "Entferne von Freundesliste"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Liste freigegebener Dateien neu laden."
+msgstr1 "Liste freigegebener Dateien neu laden."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Credit-Datei geladen, %u Client ist bekannt"
 msgstr1 "Credit-Datei geladen, %u Clients sind bekannt"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - Credits für %u Client abgelaufen!"
 msgstr1 " - Credits für %u Clients abgelaufen!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Keine 'cryptkey.dat' gefunden, erzeuge eine neue."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Client-Details"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "Niedrige ID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "Hohe ID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Unterstützt"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Nicht Unterstützt"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Deaktiviert"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Verbunden"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Verbindung getrennt"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Name"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP-Adresse"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Ursprung"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Letzter Empfang"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Version"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Upload-Geschwindigkeit"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Download-Geschwindigkeit"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Hochgeladen"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Gesamtdownload: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "DL/UP-Modifikator"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Onlinesignatur"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Nicht vollständig"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Böser Bube"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Verifiziert - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "Nicht verfügbar"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, fuzzy, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "Konnte %u Link nicht hinzufügen (Details: siehe Log)"
+msgstr1 "Konnte %u Links nicht hinzufügen (Details: siehe Log)"
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Dateien"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Hochgeladen"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Heruntergeladen"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Herunterladen"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Hochladen"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Aktiv"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Unbekannt"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Benutzer %s (%u) hat Deine Liste der freigegebenen Dateien angefordert -> akzeptiert"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Benutzer %s (%u) hat Deine Liste der freigegebenen Dateien angefordert -> abgelehnt"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Benutzer %s (%u) hat die Liste Deiner freigegebenen Verzeichnisse angefragt -> akzeptiert"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Benutzer %s (%u) hat die Liste Deiner freigegebenen Dateien angefragt -> abgelehnt"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "Benutzer %s (%u) hat deine Liste freigegebener Dateien für das Verzeichnis '%s' angefordert -> akzeptiert"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "Benutzer %s (%u) hat deine Liste freigegebener Dateien für das Verzeichnis '%s' angefordert -> abgelehnt"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Benutzer %s (%u) hat das Verzeichnis '%s' freigegeben"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Benutzer %s (%u) hat ungefragt seine freigegebenen Verzeichnisse gesendet."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "Benutzer %s (%u) hat das Senden der Liste freigegebener Dateien abgeschlossen"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Benutzer %s (%u) hat ungefragt die Liste seiner freigegebenen Dateien gesendet"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, 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/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Dateikommentare"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Benutzername"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Dateiname"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Bewertung"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "Suche Kumpel für Verbindung mit niedriger ID"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Keine Kommentare"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u Kommentar"
 msgstr1 "%u Kommentare"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 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:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Herunterladen der Länderdaten für '%s' fehlgeschlagen."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Ni"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Ho"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Sehr niedrig"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Niedrig"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Hoch"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Sehr hoch"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Release"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Anfragen"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Verbunden über Server"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Warteschlange voll"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "in Warteschlange"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Herunterladen"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Empfange Prüfsummensatz"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Keine benötigten Teile"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Verbindung niedriger ID zu niedriger ID nicht möglich"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Zu viele Verbindungen"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Verbinde über Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Zu viele Kad-Verbindungen"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Gebannt"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Entfernte Warteschlange voll"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Alter MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Neuer MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule-kompatibel"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Lokaler Server"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Entfernter Server"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Quellenaustausch"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passiv"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Verweis"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Einstiegsquellen"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Suchresultate:"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Fertiggestellt"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "In Arbeit"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "FEHLER: Ungenügender Festplattenplatz"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "FEHLER: part.met nicht gefunden"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "FEHLER: IO-Fehler!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "FEHLER: Fehlgeschlagen!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "In Warteschlange"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Wird bereits heruntergeladen"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Unbekanntes oder fehlerhaftes Format der Temp-Datei."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Teil"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Größe"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Übertragen"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Quellen"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Priorität"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Status"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Verbleibende Zeit"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Zuletzt vollständig gesehen"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Letzter Empfang"
 
-#: 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/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Wirklich die ausgewählten Dateien löschen?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Rückmeldung von: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Abbruch"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Stopp"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pausieren"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "Fo&rtsetzen"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "&Liste um fertige Dateien bereinigen"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "A4AF Weise alle Quellen dieser Datei zu"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "A4AF Automatisches Zuweisen von Quellen zu dieser Datei"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "A4AF Weise alle Quellen einer anderen Datei zu"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Erweiterte Optionen"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Zeige &Dateieigenschaften"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Zeige alle Kommentare"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Kopiere Magnet-URI in Zwischenablage"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Kopiere eD2k &Link in die Zwischenablage"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Feedback in die Zwischenablage kopieren"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "%s für diese Datei erhalten"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "Zuweisung rückgängig machen"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Einer Kategorie hinzufügen"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Oeffne diese Datei"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Wirklich die ausgewählte Datei löschen?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Wirklich die ausgewählten Dateien löschen?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Rückmeldung von: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Einen neuen Namen für diese Datei eingeben:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Datei umbenennen"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
+msgid "%.1f MiB/s"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Downloads (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Bitte trage deinen bevorzugten Videoplayer in den Einstellungen ein.\n"
-"Bis dahin wird aMule versuchen, %s zu starten, und bei jeder Vorschau wird diese Warnung angezeigt werden."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Dateivorschau"
-
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "FEHLER: Konnte externen Mediaplayer nicht starten!Befehl: `%s'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Gesamt-DL: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Speichere unfertige Datei %u von %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Alle unfertigen Dateien gespeichert."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Lade temporäre Dateien von %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Lade unfertige Datei %u von %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "FEHLER: Konnte Sicherungsdatei nicht laden. Suche auf https://github.com/amule-org/amule/discussions nach .part.met Wiederherstellungslösungen."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Alle unfertigen Dateien geladen."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Keine Part-Dateien gefunden"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "%u part-Datei gefunden"
 msgstr1 "%u part-Dateien gefunden"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Das Dateisystem für temporäre Dateien unterstützt keine großen Dateien."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 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:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Herunterladen von %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Du versuchst bereits, die Datei '%s' herunterzuladen"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Die Datei '%s' ist bereits vorhanden"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Die Datei '%s' ist bereits vorhanden"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Die Datei %s wird bereits heruntergeladen"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Kann Magnet-Verweis nicht in eD2k umwandeln: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Unbekanntes Protokoll von Verweis: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 "Konnte %u Link nicht hinzufügen (Details: siehe Log)"
 msgstr1 "Konnte %u Links nicht hinzufügen (Details: siehe Log)"
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Ungültiger eD2k-Link! Fehler: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Client sendete Paket nach fehlgeschlagener Authentifizierung."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Externe Verbindung getrennt."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Externe Verbindungen deaktiviert. Leeres Passwort!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Externe Verbindungen in der Konfigurationsdatei deaktiviert"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Neue externe Verbindung akzeptiert"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "FEHLER: Konnte keine neue externe Verbindung akzeptieren"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Externe Verbindung verweigert. Kein Passwort in den Einstellungen angegeben!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Verbinde mit Client: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Unbekannte Version"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "Unkorrekte EC-Versions-ID; es könnte eine binär-Inkompatibilität vorliegen. Benutze Kern und Fernsteuerung desselben Schnappschusses."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "Du kannst nicht zu einer Release-Version von einer beliebigen Entwicklungs-Version verbinden! *seufz* möglicher Absturz verhindert"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Ungültige Protokollversion."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Fehlende Protokollversionsmarke."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Automatische Verbindungsherstellung zum Server wird in %d Sekunde wiederholt"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Authentifizierung fehlgeschlagen: ungültiger Hash als EC-Passwort angegeben."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Authentifizierung fehlgeschlagen: falsches Passwort."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Authentifizierung fehlgeschlagen: fehlendes Passwort."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Ungültige Anfrage, bitte zuerst authentifizieren."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Zugang gewährt."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Fehlermeldung \"%s\" zu Client gesendet."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Unerlaubter Verbindungsversuch von %s. Verbindung getrennt."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Dateiprüfsumme nicht gefunden: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! OpCode-Verarbeitungsfehler!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Server nicht hinzugefügt"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "Server nicht gefunden: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "Der zu entfernende Server muss angegeben sein"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k ist in den Einstellungen deaktiviert."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr "Freund nicht gefunden."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr "Client nicht gefunden."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr "EC_TAG_FRIEND_SHARED erfordert EC_TAG_FRIEND oder EC_TAG_CLIENT."
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Suche läuft gerade. Aktualisiere gleich die Ergebnisse!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Websuche mit der Fernsteuerungsschnittstelle macht keinen Sinn."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Suche läuft gerade. Aktualisiere gleich die Ergebnisse!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Keine Punkte für Graphen."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Der Client ist nicht nicht für diese Detailstufe eingestellt."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Externe Verbindungen: Herunterfahren gefordert"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Wird bereits heruntergefahren."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Externe Verbindungen: Füge hinzu Verweis '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "%d von %d Links fehlgeschlagen. Ungültiger Verweis oder schon auf der Liste"
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Datei nicht gefunden."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Ungültiger Dateiname."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Datei kann nicht umbenannt werden."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Schließe diese Chat-Sitzung."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Neue Chat-Sitzung gestartet."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Schließe diese Chat-Sitzung."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad ist in den Einstellungen deaktiviert."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Unbekannter Name)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad ist in den Einstellungen deaktiviert."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Bereits mit eD2k verbunden."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Verbinde mit eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Bereits mit Kad verbunden."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Verbinde mit Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Alle Netzwerke sind deaktiviert."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Von eD2k getrennt."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Von Kad getrennt."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Externe Verbindungen: ungültigen Opcode empfangen: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Ungültiger OpCode (falsche Protokollversion?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Unbekannte Erweiterung '%s' für Befehl '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Unbekannter Befehl '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1874,7 +2400,7 @@
 "\n"
 "Dieser Befehl kann kein Argument haben.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1882,7 +2408,7 @@
 "\n"
 "Dieser Befehl muss ein Argument haben.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1890,7 +2416,7 @@
 "\n"
 "Befehl unvollständig, eine der folgenden Erweiterungen muss verwendet werden:\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1898,11 +2424,11 @@
 "\n"
 "Verfügbare Erweiterungen:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Verfügbare Befehle:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1913,17 +2439,17 @@
 "Alle Befehle sind unabhängig von Groß- und Kleinschreibung.\n"
 "Eingabe von '%s <Befehl>' für weitere Informationen zu <Befehl>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Programm verlassen."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Hilfe anzeigen."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1931,7 +2457,7 @@
 "Um Hilfe zu einem Befehl zu bekommen, gib 'help <Befehl>' ein.\n"
 "Eine vollständige Befehlsübersicht erhält man mit 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1942,46 +2468,46 @@
 "'%s' zeigt die Befehlsübersicht.\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Syntax Fehler!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Dieser Befehl sollte keine Parameter haben."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Dieser Befehl muss einen Parameter haben."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Ungültiges Argument."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Unvollständiger Befehl."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Gib '%s' ein, um mehr Hilfe zu bekommen.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Dies ist %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Dies ist %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1989,7 +2515,7 @@
 "\n"
 "Erstelle Client...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1998,7 +2524,7 @@
 "\n"
 "Ok, beende %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2012,118 +2538,361 @@
 "\n"
 "Beende...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Zeige diese Hilfe."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Host, auf dem aMule läuft. (Standard: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "aMules Port für externe Verbindungen. (Standard: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Passwort für externe Verbindungen."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Lese Konfiguration aus Datei."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Schreibe keinerlei Ausgabe auf stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Sei ausführlich - Zeige auch Debug-Nachrichten."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Setze Programm-Locale (Sprache)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Schreibe Kommandozeilen-Optionen in Konfigurationsdatei."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Erstelle Konfigurationsdatei basierend auf aMules Konfigurationsdatei."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Drucke Programmversion."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr "ZLIB Kompression unabhängig der Ziel-IP erzwingen (nützlich wenn der Server per VPN über eine LAN-IP aufgelöst wird)."
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Dateieinzelheiten"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% erledigt"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Dateivorschau"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "FEHLER: Konnte externen Mediaplayer nicht starten!Befehl: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "FEHLER: Öffnen von Partfile '%s' fehlgeschlagen"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Willkommen!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Verbinde zu Kumpel"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Verbindungstyp:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Netzwerke"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Standard-TCP-Port"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Erweiterter UDP-Port (Kad / globale Suche)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Aktiviere UPnP für Router-Port-Weiterleitung"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Bootstrap"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Die Datei %s wird bereits heruntergeladen"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Serverliste beim Programmstart aktualisieren"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "aMule automatisch starten wenn ich mich einlogge"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Zielverzeichnis für Downloads."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Durchsuchen"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Alle Dateien in diesem Ordner werden mit anderen Nutzern geteilt)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Verzeichnis für temporäre Downloaddateien"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Konnte Freundes-Liste 'emfriends.met' nicht lesen!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Konnte Freundes-Liste 'emfriends.met' nicht schreiben!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "KRITISCH - kein Client bei StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Freunde"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Zeige &Details"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Freund hinzufügen"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Freund entfernen"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "&Message senden"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Dateien ansehen"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Friendslot erstellen"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Den markierten Freund wirklich löschen?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Die markierten Freunde wirklich löschen?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2131,977 +2900,1299 @@
 "Du darfst nicht mehr als einen Friendslot vergeben.\n"
 " Nur ein Slot wurde vergeben."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Mehrfachauswahl"
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Du darfst nicht mehr als einen Friendslot vergeben.\n"
-" Nur ein Slot wurde vergeben."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Sende Nachricht an Benutzer"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Zu sendende Nachricht:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Entferne von Freundesliste"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Sende Nachricht"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Zu dieser Datei verschieben"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "In Warteschlange: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Andere Datei angefordert"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Warte auf Uploadslot"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "In Warteschlange: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Hochladen"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Keine"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Nein"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Ja"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Fehler beim Öffnen von %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Lädt herunter..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "HTTP-Download abgebrochen"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "Die Download-URL kann nicht leer sein."
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Konnte HTTP-Anfrage für %s nicht erstellen"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr "HTTP-Download: leerer Antworttext für %s"
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Konnte heruntergeladene Datei nicht nach %s verschieben"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "%s heruntergeladen (%llu Bytes)"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr "Die URL %s antwortet mit: %i"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "HTTP-Download für %s fehlgeschlagen: %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr "HTTP 401 Nicht autorisiert für %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr "Lade neues %s von %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "Herunterladen der Datei %s fehlgeschlagen, breche Aktualisierung ab."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Das Entfernen der %s-Datei ist fehlgeschlagen, breche Aktualisierung ab."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Das Umbenennen der neuen %s-Datei ist fehlgeschlagen, breche Aktualisierung ab."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "%s erfolgreich aktualisiert."
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr "Fehler beim Aktualisieren von %s"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Herunterladen der Datei %s von %s fehlgeschlagen."
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Herunterladen der Länderdaten für '%s' fehlgeschlagen."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Lade IP-Filter 'ipfilter.dat'·und·'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Laden der ipfilter.dat '%s' fehlgeschlagen, unbekanntes Format aufgetreten."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "%u IP-Bereich von '%s' geladen."
 msgstr1 "%u IP-Bereiche von '%s' geladen."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u fehlerhafte Zeile wurde ignoriert."
 msgstr1 "%u fehlerhafte Zeilen wurden ignoriert."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Das Umbenennen der neuen %s-Datei ist fehlgeschlagen, breche Aktualisierung ab."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP-Filter ist bereit"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap von \n"
-"bekannten Clients"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Aktuell"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "gleitender Mittelwert"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Sitzungsdurchschnitt"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Knoten (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Ungültige Bootstrap-IP"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Ungültiger Bootstrap-Port"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Bitte alle erforderlichen Felder ausfüllen"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Nachricht"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "Wirklich neue nodes.dat herunterladen?\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Dies wird alle momentanen Knoten entfernen und die Kademlia-Verbindung neu starten."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Fortsetzen?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: Suchbegriff zu kurz"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: Das Suchwort ist bereits auf der Suchliste."
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Lesen der nodes.dat Datei fehlgeschlagen - zu alt. Diese Version (0) wird nicht mehr unterstützt."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Lese %u Kad-Kontakt"
 msgstr1 "Lese %u Kad-Kontakte"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Keine Kontakte gefunden, bitte von einem anderen Client bootstrappen oder eine nodes.dat-Datei herunterladen."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Nur %d Kad-Kontakt verfügbar, nodes.dat wurde nicht geschrieben."
 msgstr1 "Nur %d Kad-Kontakte verfügbar, nodes.dat wurde nicht geschrieben."
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "%d Kad-Kontakt geschrieben."
 msgstr1 "%d Kad-Kontakte geschrieben."
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Kad-Netzwerk"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Dateigröße"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Tauschverhältnis"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Hochgeladen"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Angefordert"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Akzeptiert"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "vollständige Quellen"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "WARNUNG: Liste der bekannten Dateien korrumpiert, enthält ungültigen Header."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Laden eines Eintrags aus der Liste bekannter Dateien fehlgeschlagen, Datei möglicherweise beschädigt"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Ungültiger Eintrag in der Liste bekannter Dateien, Datei möglicherweise beschädigt: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Systemvorgabe"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanisch"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabisch"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturisch"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baskisch"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgarisch"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalanisch"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Chinesisch (vereinfacht)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Chinesisch (traditionell)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Kroatisch"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Tschechisch"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Dänisch"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Holländisch"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Englisch (UK)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Englisch (UK)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estnisch"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finnisch"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Französisch"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galizisch"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Deutsch"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Griechisch"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebräisch"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Ungarisch"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italienisch"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japanisch"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Koreanisch"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Litauisch"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norwegisch"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polnisch"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugiesisch"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugiesisch (Brasilianisch)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Rumänisch"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Russisch"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slowenisch"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Spanisch"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Schwedisch"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Türkisch"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukrainisch"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Unbekannter Fehler %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Kann Fehlerbeschreibung für Fehler %d nicht erhalten"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Prüfsumme erstellen"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Wird abgeschlossen"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Vollständig"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Pausiert"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Fehlerhaft"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Warten"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Das angegebene Passwort darf nicht leer sein."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Ungültiges Passwort, keine MD5-Prüfsumme!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Verbindungsfehler"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection lost - exiting."
 msgstr "Externe Verbindung getrennt — Beende."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "EC-Verbindung fehlgeschlagen. Leere Antwort."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Externe Verbindungen: Falsche Antwort, Verhandlung fehlgeschlagen. Verbindung beendet."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Externe Verbindungen: Falsche Antwort, Verhandlung fehlgeschlagen. Verbindung beendet."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Gelungen! Verbindung aufgebaut zu aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Verbindung hergestellt."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Externe Verbindungen: Zugriff verweigert wegen:"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Externe Verbindungen: Verhandlung fehlgeschlagen."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Asio-Thread %d gestartet"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: OK"
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "FEHLER: Kann nicht auf TCP-Port lauschen."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "FEHLER: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "WARNUNG: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Schließen"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Leeren"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Alles auswählen"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Unbegrenzt"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Zeige aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Verstecke aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr "Verbunden (LowID)"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr "Verbunden (HighID)"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr "Verbunden (firewalled)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr "Server: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr "Server-IP: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Nicht verbunden"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP-Port: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP-Port: Nicht bereit"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP-Port: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP-Port: Nicht bereit"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Client-Information"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Upload-Einstellung"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Download-Einstellung"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Zeige aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Trennen"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Verstecke aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Verbinden"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Schließen"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Unbegrenzt"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule-Traymenü"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Geschwindigkeitsbegrenzungen:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "UL: Keine"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "UL: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DL: Keine"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DL: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Download-Geschwindigkeit: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Upload-Geschwindigkeit: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Spitzname: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Kein Spitzname ausgewählt!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "Client-ID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Servername: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "ServerIP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Nicht verbunden"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online-Signatur: An"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online-Signatur: Aus"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Laufzeit: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Freigegebene Dateien: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Clients in Warteschlange: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Gesamt-DL: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Gesamt-UL: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k-Verweis: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Übernehmen"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Sendet einen eD2k- oder Magnet-Verweis an den Kern."
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Zu Freunden hinzufügen"
+
+#: src/muuli_wdr.cpp
 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 Download-Liste hinzuzufügen. "
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Hier werden Ereignisse angezeigt. Eine komplette Ereignisliste kann im Log unter dem Server-Reiter eingesehen werden."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Lade ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Benutzer: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Zum aktuellen Server verbundene Benutzer und ungefähre Anzahl der Benutzer insgesamt im Netz."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Hoch: 0.0 | Herunter: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Derzeitige Upload- und Download-Raten im Schnitt. Wenn aktiviert, dann auch noch in Klammern der Overhead durch Client-Kommunikation."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Zeigt den aktuellen Verbindungsstatus an: rote Pfeile bedeuten, dass du im 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Nicht verbunden..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Momentan verbundener Server."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Suche"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Name:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Suchtyp"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Lokal"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Erweiterte Parameter"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtere"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Dateityp"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Jeder"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Archive"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CD-Abbilder"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Bilder"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programme"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Texte"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Videos"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Dateiendung"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Mindestgröße"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Höchstgröße"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Verfügbarkeit"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filter:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filterergebnisse"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filter"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Ergebnisse umkehren"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Bekannte Dateien ausblenden"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Setze Felder zurück."
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Start"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Mehr"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Dateiendung"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr "Bittet Kad-Peers, die bereits geantwortet haben, die Suche zu erweitern. Jeder Klick fragt den nächstgelegenen Peer nach weiteren Kontakten ab (KADEMLIA_FIND_VALUE_MORE) und macht zusätzliche Dateitreffer sichtbar, die die anfängliche Alpha-Grenze der Suche verfehlt hat."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Download"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Herunterladen in Kategorie"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Suchresultate:"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Setze Felder zurück."
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Ergebnisse"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Vollständige Downloads entfernen"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filter:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Dateiquellen:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Allgemein"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Name:"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "Nicht verfügbar"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Name"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met-Datei"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Prüfsumme"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met-Datei:"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Prüfsumme:"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Dateigröße:"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Status der Part-Datei:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Zuletzt vollständig gesehen:"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Dateigröße"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Übertragungen"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Gefundene Quellen:"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Übertragende Quellen:"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Anzahl der Part-Dateien:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Verfügbar:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Status der Part-Datei"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Datenrate:"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Zuletzt vollständig gesehen"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Gefundene Quellen"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Übertragende Quellen"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Anzahl der Part-Dateien"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Verfügbar"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Datenrate"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Dauer aktiven Herunterladens"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Dauer aktiven Herunterladens: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Übertragen:"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Fertiggestellt:"
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Fertiggestellt"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligente Fehlerkorrektur"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Durch Fehler verloren:"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Durch Kompression gewonnen:"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Durch I.C.H. gesparte Pakete:"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Durch Fehler verloren"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Durch Kompression gewonnen"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Durch I.C.H. gesparte Pakete"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Freigegeben: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Anfragen"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Akzeptierte Anfragen"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Übertragene Datenmenge"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Verteilungsfaktor"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Vollständige Quellen"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Freigegebene Dateien"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Upload: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Kad-Info"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Nicht bewertet"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Titel"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Dateinamen"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Übernehmen"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Aufräumen"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 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:705
+#: src/muuli_wdr.cpp
 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."
@@ -3109,528 +4200,537 @@
 "Für einen Film kann man die Länge, die Handlung, die Sprache,... angeben\n"
 "und wenn es eine Fälschung ist, kann man andere aMule-Benutzer davor warnen."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Dateiqualität"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Nicht bewertet"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Ungültig / fehlerhaft / Fälschung"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Schlecht"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Ordentlich"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Gut"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Hervorragend"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Kad getrennt"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Wird geladen, bitte warten ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Unbekannte Größe"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Benötigte Information"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP-Adresse:"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port:"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Zusätzliche Information"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Benutzername:"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Benutzerprüfsumme:"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Benutzerprüfsumme"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Download-Geschwindigkeit"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Aktuell"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "gleitender Mittelwert"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Sitzungsdurchschnitt"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Upload-Geschwindigkeit"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktive Downloads"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktive Verbindungen (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktive Uploads"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Statistikbaum"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Benutzerprüfsumme:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Client-Software:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Client-Version:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Client-Software"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Client-Version"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "Benutzer-ID"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Server-IP"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP-Adresse:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Servername"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "Benutzer-ID:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Server-IP:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Servername:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Verschleierung:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Verschleierung"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Protokollverschleierung"
+
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Übertragungen zum Client"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Momentane Anfrage:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Durchschnittliche Uploadrate:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Durchschnittliche Downloadrate:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Hochgeladen (Sitzung):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Heruntergeladen (Sitzung):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Hochgeladen (Gesamt):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Heruntergeladen (Gesamt):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Momentane Anfrage"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Durchschnittliche Uploadrate"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Durchschnittliche Downloadrate"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Hochgeladen (Sitzung)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Heruntergeladen (Sitzung)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Hochgeladen (Gesamt)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Heruntergeladen (Gesamt)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Punkte"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "DL/UP-Modifikator:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Sichere Erkennung:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Warteschlangenposition:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Wartepunkte:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Sichere Erkennung"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Warteschlangenposition"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Wartepunkte"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Spitzname"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - der multiplattform Muli"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Sprache:"
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Verzögerung vor dem Anzeigen der Tooltips. "
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Verwendete Sprache für die Einstellungen festlegen."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Beim Start auf neue Version prüfen"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Wenn dies aktiviert ist, wird aMule beim Start überprüfen, ob eine neue Version vorliegt"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
-msgstr "aMule automatisch starten wenn ich mich einlogge"
-
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr "Registriert einen Autostart pro Nutzer. Wenn du das Programm verschiebst musst du aMule manuell starten um den Eintrag zu aktualisieren."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "minimiert starten"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 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:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Abfrage beim Beenden"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Sicherheitsabfrage vorm Beenden."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Tray-Icon aktivieren"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Dies aktiviert/deaktiviert das Symbol im Infobereich (oder Taskleiste)."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Anwendungsfenster bei Klick auf \"Schließen\" verbergen"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimiere zu Symbol im Infobereich"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Wird dies aktiviert, minimiert sich aMule in den Infobereich, anstatt in die Taskleiste."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "Benachrichtigungen anzeigen, wenn Downloads abgeschlossen sind"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "Wenn aktiviert, zeigt aMule Benachrichtigungen an, sobald Downloads abgeschlossen sind."
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Diese Einstellungen speichern"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Tooltip-Verzögerungszeit:"
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "Sekunden"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Browser-Wahl"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Gib den Namen des gewünschten Browsers hier ein. Bei einem leeren Feld wird der voreingestellte Systembrowser benutzt."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Durchsuchen"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Öffne in neuem Reiter, wenn möglich"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Videoplayer"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Bandbreitenbegrenzungen"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Slotzuteilung"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Ports"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Standard-TCP-Port"
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "UDP-Port für Serveranfragen (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Erweiterter UDP-Port (Kad / globale Suche)"
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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 benutzt."
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Aktiviere UPnP für Router-Port-Weiterleitung"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnP-TCP-Port (optional):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Verknüpfe lokale Adresse mit IP (Leer für beliebige):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Verknüpfe lokale Adresse mit IP (Leer für beliebige):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Maximale Anzahl Quellen pro heruntergeladener Datei:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Maximale gleichzeitige Verbindungen:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "eD2k"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Automatisches Verbinden beim Start"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Wiederverbinden nach Trennung"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Lösche tote Server nach"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "Versuchen"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Serverliste beim Programmstart aktualisieren"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Liste"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Serverliste von verbundenem Server beziehen"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Serverliste beim Verbinden zu einem Client beziehen"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Benutze Prioritätssystem"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Benutze intelligente Prüfung für niedrige ID beim Verbinden"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Sicheres/langsames Verbinden zu Servern"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Automatisches Verbinden nur zu Servern aus der statischen Liste"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Setze manuell hinzugefügte Server auf hohe Priorität"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Intelligente Korruptionsverarbeitung (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Aktiviere"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Neue Dateien dem Download pausiert hinzufügen"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Neu hinzugefügte Dateien im Download auf Autopriorität stellen"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Versuche, zuerst die ersten und letzten Dateiteile herunterzuladen"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Starte nächste pausierte Datei, wenn eine Datei fertiggestellt wird"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Aus der selben Kategorie"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "In alphabetischer Reihenfolge"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Reserviere Speicherplatz für neue Dateien"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Reserviert für neue Dateien Speicherplatz für die ganze Datei und reduziert so Fragmentierung."
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Stoppe Downloads wenn freier Speicherplatz folgenden Wert erreicht:"
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Hier den minimalen erwünschten Festplattenplatz angeben."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Bei seltenen (< 20 Quellen) Dateien zehn Quellen speichern"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Uploads"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Neue freigegebene Dateien auf Autopriorität stellen"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Zielverzeichnis für Downloads."
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Intelligente Korruptionsverarbeitung (I.C.H.)"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Aktiviere"
+
+#: src/muuli_wdr.cpp
+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 src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
@@ -3638,601 +4738,707 @@
 "Vollständige Downloads werden hier gespeichert. Alle Dateien in diesem Ordner werden automatisch geteilt\n"
 ". Falls dieser Ordner Dateien enthält die du nicht teilen willst, wähle einen eigenen Ordner nur für aMule aus."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr "Wähle einen Ordner in dem vollständige Downloads gepeichert werden sollen. Dieser Ordner wird automatisch geteilt."
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr "(Alle Dateien in diesem Ordner werden mit anderen Nutzern geteilt)"
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Verzeichnis für temporäre Downloaddateien"
-
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "Freigegebene Ordner"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Entferne"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Rechtsklick auf das Symbol des rekursiv freizugebenden Verzeichnisses)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Versteckte Dateien freigeben"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr "Ornder automatisch auf Änderungen überwachen"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr "Symbolischen Links in geteilten Ordnern folgen"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Entfernter Server"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Lokaler Server"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Graphen"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Aktualisierungsverzögerung: 5 Sekunden"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Durchschnittsgraphen in Minuten berechnen: 100 min"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Verbindungsgraphenskalierung: 100"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Downloadgraphenskalierung:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Uploadgraphenskalierung:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Farben: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Hintergrund"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Gitter"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Aktueller Download"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Download: Durchschnitt"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Download: Sitzungsdurchschnitt"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Aktueller Upload"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Upload: Durchschnitt"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Upload: Sitzungsdurchschnitt"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktive Verbindungen"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr "Transferbalken des Symbols im Infobereich"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Momentane Kad-Knoten"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Laufende Kad-Knoten"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Kad-Knoten Sitzung"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Auswahl"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Baum"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Anzahl angezeigter Client-Versionen (0=unbegrenzt)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! WARNUNG !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Maximale neue Verbindungen pro 5 Sekunden"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "FTP-Aktualisierungsintervall in Minuten"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "FTP-Aktualisierungsintervall in Minuten"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Dateipuffergröße: 240000 Bytes"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Upload-Warteschlangengröße: 5000 Clients"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Server-Wiederverbindungsintervall: Aus"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Zeitgesteuerten Bereitschaftsmodus des Computers deaktivieren"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "benutztes Aussehen:"
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Zeige \"schnelle eD2k-Linkverarbeitung\" in jedem Fenster"
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Zeige erweiterte Informationen auf Kategorie-Reitern"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Zeige Programmversion im Titel"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Zeige Transferraten im Titel"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Vor dem Anwendungsnamen"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Nach dem Anwendungsnamen"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Zeige Overhead-Bandbreite"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Toolbar senkrecht ausrichten"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Downloadwarteschlangendateien"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Zeige Prozent des Fortschritts"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Zeige Fortschrittsbalken"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Flach"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Rund"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "sortiere Dateien automatisch (hohe CPU-Auslastung)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule sortiert automatisch die Spalten der Downloadliste"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parameter für externe Verbindungen"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Externe Verbindungen annehmen"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP der lauschenden Schnittstelle:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "TCP-Port:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Aktiviere UPnP-Port-Weiterleitung zu EC-Port"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Passwort"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Webserver-Parameter"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "TCP-Port:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Prüfe Passwort\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Prüfe Passwort\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Verweigere Gastzugriff"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Gast-Passwort für den Webserver"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Webserver-Parameter"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Starte Webserver mit aMule"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Webvorlage"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Kennwort für Vollzugriff"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Eingeschränkten Benutzer aktivieren"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Kennwort für eingeschränkten Zugriff"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Aktiviere UPnP-Port-Weiterleitung des Webserverports"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Webserver UPnP-TCP-Port (optional)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Aktualisierungsintervall in Sekunden"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Gzip-Kompression an"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Systemvorgabe"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Hier klicken, um alle Einstellungsänderungen zu übernehmen."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Alle Änderungen zu den Einstellungen zurücksetzen."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Titel:"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Kommentar:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Verzeichnis für eingehende Dateien:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Priorität bei neu zugewiesenen Dateien ändern:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Verzeichnis für eingehende Dateien"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Priorität bei neu zugewiesenen Dateien ändern"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Nicht ändern"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Farbe für diese Kategorie wählen (momentan ausgewählt):"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Zurücksetzen"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Farbe für diese Kategorie wählen (momentan ausgewählt)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Drücke diesen Knopf, um das Log zurückzusetzen."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Serverliste"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Server manuell hinzufügen: Name"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Gib den Namen das neuen Servers hier ein"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Hier den Serverport eingeben."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule-Log"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Serverinformation"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "eD2k-Info"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kad-Info"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Knoten (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Knotenstatistik"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Bootstrap"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Neuer Knoten"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Port:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
 msgstr "Bootstrap von bekannten Clients"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Kad trennen"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node 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:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Benutze sichere Benutzeridentifikation"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protokollverschleierung"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Unterstütze Protokollverschleierung"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Diese Option aktiviert die Protokollverschleierung und verfügt aMule, verschleierte Verbindungen von anderen Clients anzunehmen."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Verschleiere ausgehende Verbindungen"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Diese Option verfügt aMule, Protokollverschleierung zu verwenden bei der Verbindung zu anderen Clients und/oder Servern."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Akzeptiere ausschließlich verschleierte Verbindungen"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "Diese Option verfügt aMule, ausschließlich verschleierte Verbindungen zu akzeptieren. Das führt zu weniger Quellen, jedoch ist sämtlicher Verkehr verschleiert."
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Jeder"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Niemand"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Wer kann freigegebene Dateien sehen:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP-Filterung"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtere Clients"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtere Server"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Aktualisieren der Liste"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "IP-Filter beim Start automatisch aktualisieren"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Filterstufe:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "LAN-IP-Adressen immer filtern"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoides Handhaben nicht-passender IP-Adressen"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Benutze systemweite ipfilter.dat, wenn verfügbar."
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Erlaube die Benutzung der systemweiten ipfilter-Datei, falls keine lokale ipfilter.dat gefunden wird."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Online-Signatur aktivieren"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Aktiviert das Schreiben der Online-Signaturdatei, die von externen Programmen verwendet werden kann, um Signaturen o.ä. zu erstellen."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Aktualisierungsintervall (Sekunden):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Ändern des Online-Signatur-Aktualisierungsintervalls (in Sekunden)."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Speichere Online-Signatur-Datei in:"
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Landesflaggen für Clients anzeigen"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Datenrate:"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Quellen"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4240,11 +5446,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4254,517 +5460,589 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Download: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "IP-Filter beim Start automatisch aktualisieren"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Eingehende Nachrichten filtern (außer momentanen Chats):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtere alle Nachrichten"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 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:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtere Nachrichten von unbekannten Clients"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtere Nachrichten, die folgende Worte enthalten (benutze ',' als Trenner):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Zeige empfangene Nachrichten im Log an"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Kommentare"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtere Komentare, die folgende Worte enthalten (benutze ',' als Trenner):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Authentifizierung aktivieren"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Aktiviere/Deaktiviere Authentifizierung mit Benutzername/Passwort"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Benutzername:"
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Der Benutzername, um sich beim Proxy anzumelden"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Passwort:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Proxy-Verbindungspasswort"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Proxy aktivieren"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Aktiviere/Deaktiviere Proxy-Unterstützung"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Proxy-Typ:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Proxy-Host:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Proxy-Typ"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Proxy-Host"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Der Hostname des Proxy"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Proxy-Port:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Proxy-Port"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Der Port des Proxy"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Authentifizierung aktivieren"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Aktiviere/Deaktiviere Authentifizierung mit Benutzername/Passwort"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Der Benutzername, um sich beim Proxy anzumelden"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Proxy-Verbindungspasswort"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Verbinde zu:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Beim entfernten aMule anmelden"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Benutzername"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Diese Einstellungen speichern"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Externe Verbindung getrennt."
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr "ZLIB-Kompression erzwingen"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Aktiviere ausführliche Debug-Protokollierung"
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Nur in Logdatei"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Nachrichtenkategorien:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Wartend..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Füge Importe hinzu"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Versuche Ausgewähltes noch einmal"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Auswahl entfernen"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Ereignisarten"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Aktive Uploads"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Prozent aller Dateien"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Clients anzeigen für"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Ausgewählte Dateien"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Nur aktive Uploads"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Clients anzeigen für"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Aktualisieren:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Freigegebene Dateien neu laden"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Senden"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Sendet die angegebene Nachricht."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Schließe diese Chat-Sitzung."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Mit irgendeinem Server und/oder Kad verbinden"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Abbruch"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Freigaben"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Trennen"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Verbinden"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Ausgeschaltet %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "Byte"
 msgstr1 "Bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "Byte/Sek"
 msgstr1 "Bytes/Sek"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "Sekunden"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "Minuten"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "Stunden"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Tage"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "tage"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "alle"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "alle anderen"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Unvollständig"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Archiv"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Text"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Aktiv"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Verwende Konfigurationsverzeichnis: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Dieser Befehl sollte keine Parameter haben."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Dieser Befehl sollte keine Parameter haben."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Dieser Befehl sollte keine Parameter haben."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Dieser Befehl sollte keine Parameter haben."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Hier den Serverport eingeben."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Hier den Serverport eingeben."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Hier den Serverport eingeben."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Warte auf Ende des Umwandlungsthreads für unfertige Dateien..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Importiere %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Lese Temp-Verzeichnis"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Hole Basis-Informationen aus der Download-Info-Datei"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Erzeuge Zieldatei"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Lade Daten aus der alten Download-Datei (%u von %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Hole Quellen-Download-Datei-Informationen"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Füge Download hinzu und speichere neue Part-Datei"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importiere Part-Dateien"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Status"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Dateiprüfsumme"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Platte: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Quelldateien der erfolgreich importierten Downloads löschen?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Quellen entfernen?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "FEHLER: Erstellen der Part-Datei fehlgeschlagen"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, 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:409
+#: src/PartFile.cpp
 #, 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:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "FEHLER: ungültige part.met-Dateiversion: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, 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:675
+#: src/PartFile.cpp
 #, 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:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Versuche, Dateiinformation wiederherzustellen..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Konnte Dateiinfo nicht wiederherstellen :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Fehler beim Öffnen von %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "WARNUNG: %s könnte defekt sein (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "FEHLER beim Speichern der Part-Datei: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Eingabe/Ausgabe-Fehler beim Speicher der unfertigen Dateien:"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr "0/unbekannt Bytes nach '%s' geschrieben -- erhalte existierende .part.met."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "%i Einstiegsquelle für Part-Datei %s (%s) gespeichert."
 msgstr1 "%i Einstiegsquellen für Part-Datei %s (%s) gespeichert."
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Konnte Seed-Datei für Part-Datei %s (%s) nicht lesen"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "korrumpierter Teil (%d) in %d-teiliger Datei %s gefunden - Dateiergebnishash |%s| Dateihash |%s|"
 msgstr1 "korrumpierter Teil (%d) in %d-teiliger Datei %s gefunden - Dateiergebnishash |%s| Dateihash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Vollständigen Teil (%i) in %s gefunden"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Prüfsumme für %s neu erstellt"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Unerwarteter Fehler beim Abschließen des Herunterladens von %s. Datei pausiert."
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Herunterladen abgeschlossen: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4773,307 +6051,155 @@
 "Herunterladen abgeschlossen:\n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Lösche Datei: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, 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:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "FEHLER: Prüfsumme für einen Teil konnte nicht erstellt werden - Prüfsumme unvollständig (%s). Dies dürfte eigentlich nie passieren."
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr "Teil %u von '%s' als vollständig markiert aber das Partfile ist kürzer als erwartet (%llu Bytes statt %llu); öffne Lücke für wiederholten Download."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "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/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Heruntergeladener Teil %i in Datei '%s' ist defekt"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Reserviere"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Zu wenig Festplattenplatz"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Heruntergeladen"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "FEHLER: Öffnen von Partfile '%s' fehlgeschlagen"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Systemvorgabe"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanisch"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabisch"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturisch"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baskisch"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgarisch"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalanisch"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Chinesisch (vereinfacht)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Chinesisch (traditionell)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Kroatisch"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Tschechisch"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Dänisch"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Holländisch"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Englisch (UK)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "Englisch (UK)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estnisch"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finnisch"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Französisch"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galizisch"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Deutsch"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Griechisch"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebräisch"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Ungarisch"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italienisch"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italienisch (Schweiz)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japanisch"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Koreanisch"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Litauisch"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norwegisch"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polnisch"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugiesisch"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugiesisch (Brasilianisch)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Rumänisch"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Russisch"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slowenisch"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spanisch"
+msgid "Extended source exchange"
+msgstr "Quellenaustausch"
 
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Schwedisch"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Türkisch"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukrainisch"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Sprache ändern"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Für aMule sind keine Übersetzungen installiert"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Keine Sprachen verfügbar"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "keine Optionen verfügbar"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "Ungültige Kategorie gefunden, überspringe."
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Ungültige Kategorie gefunden, überspringe."
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Standard-Port wird verwendet (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Verbindung"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Verzeichnisse"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Server"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Dateien"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Sicherheit"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Aussehen"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filter"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Fernsteuerung"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Onlinesignatur"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Ereignisse"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Fehlersuche (Debugging)"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5083,15 +6209,15 @@
 "    %PARTFILE - ganzer Pfad zur Datei\n"
 "    %PARTNAME - nur der Dateiname"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr "Tray-Icon unterstützung benötigt libayatana-appindicator3 beim kompilieren."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr "Auf Wayland nicht verfügbar: Das Protokoll meldet nicht wenn ein Fenster minimiert is, sodass diese Option nicht auf die Minimieren Schaltfläche des System reagieren kann. Workaround: aMule mit `GDK_BACKEND=x11 starten um XWayland zu verwenden."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5107,26 +6233,43 @@
 "aMule funktioniert auch hervorragend, ohne\n"
 "dass diese Einstellungen verändert werden."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, 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:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Der Typ des Proxy, zu dem du verbindest"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Prüfe Passwort\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5134,31 +6277,45 @@
 "aMule muss neu gestartet werden, um diese Änderungen zu übernehmen:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP-Port geändert.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP-Port geändert.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "- Schnittstelle der externen Verbindung geändert.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Port externer Verbindung geändert.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Akzeptanz externer Verbindung geändert.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Schnittstelle der externen Verbindung geändert.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- Unterstützung für Protokollverschleierung geändert.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Sprache geändert.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5166,27 +6323,33 @@
 "Die Auto-Update-Serverliste ist leer.\n"
 "'Serverliste beim Programmstart aktualisieren' wird deaktiviert."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 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:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Sprache geändert.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Temp-Verzeichnis geändert.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- ED2k-Netzwerk aktiviert.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Ungültige Protokollversion."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5194,7 +6357,7 @@
 "Beide Netzwerke, eD2k und Kad, sind deaktiviert.\n"
 "Mindestens eins davon muss aktiviert sein, um sich verbinden zu können."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5202,7 +6365,7 @@
 "Kad wird nicht starten, solange der UDP-Port deaktiviert ist.\n"
 "Bitte UDP-Port aktivieren, oder Kad ausschalten."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5212,19 +6375,71 @@
 "aMule MUSS jetzt neu gestartet werden.\n"
 "Wenn du jetzt nicht neu startest, beklage dich nicht, wenn irgendwas übles passiert.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr "Konnte aMule nicht für Autostart registrieren. Der Ort dafür könnte nicht beschreibbar sein."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr "Konnte den Autostart-Bei-Login Eintrag nicht entfernen."
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr "Autostart"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "Konnte aMule nicht für Autostart registrieren. Der Ort dafür könnte nicht beschreibbar sein."
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Konnte den Autostart-Bei-Login Eintrag nicht entfernen."
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "Konnte aMule nicht für Autostart registrieren. Der Ort dafür könnte nicht beschreibbar sein."
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the URL handler registration."
+msgstr "Konnte den Autostart-Bei-Login Eintrag nicht entfernen."
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Passwort eingestellt und externe Verbindungen aktiviert."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5234,41 +6449,66 @@
 "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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Temporäre Dateien"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Fertige Dateien"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Online-Signaturen"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Wähle einen Ordner für %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "%i bekannte freigegebene Datei gefunden"
+msgstr1 "%i bekannte freigegebene Dateien gefunden"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Suche nach einem Videoplayer"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Browser-Wahl"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Browser-Wahl"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Ausführbar%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Systemvorgabe"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Serverliste bearbeiten"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5276,115 +6516,115 @@
 "Hier URL's für server.met-Dateien eintragen.\n"
 "Nur eine URL pro Zeile!"
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "vollständige Quellen"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Status:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Status:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Aktualisierungsverzögerung: %d Sekunde"
 msgstr1 "Aktualisierungsverzögerung: %d Sekunden"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Zeit für Durchschnittslinie: %d Minute"
 msgstr1 "Zeit für Durchschnittslinie: %d Minuten"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Verbindungsgraphenskala: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Dateipuffergröße: %d Byte"
 msgstr1 "Dateipuffergröße: %d Bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Upload-Warteschlangengröße: %d Client"
 msgstr1 "Upload-Warteschlangengröße: %d Clients"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Server-Wiederverbindungsintervall: %d Minute"
 msgstr1 "Server-Wiederverbindungsintervall: %d Minuten"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Server-Wiederverbindungsintervall: Aus"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Führe Kommando beim '%s' Ereignis aus"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Aktiviere Befehlsausführung im Kern"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Kern-Befehl:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Aktiviere Befehlsausführung in GUI"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "GUI-Befehl:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Die folgenden Variablen werden ersetzt:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
@@ -5392,1075 +6632,1341 @@
 "Die folgenden Ordner sehen nach System oder Sensiblen Daten aus.\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr "Rekursives Teilen würde jede Datei im eD2k/Kad Netzwerk verfügbar machen. Willst du das wirklich?"
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr "Freigegebene Ordner bestätigen"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
 msgstr "Freigegebene Dateien neu laden..."
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr "Suche nach Unterverzeichnissen..."
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr "Freigegebene Ordner werden aktualisiert"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr "%u Verzeichnisse durchsucht..."
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Liste freigegebener Dateien neu laden: %u Dateien gelesen"
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Freigegebene Ordner"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Wähle einen Ordner für %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Diese Einstellungen speichern"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Suchwarnung"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "Eine Suche ist nicht möglich, wenn sowohl eD2k als auch Kademlia deaktiviert sind."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "Suchfehler"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
-msgstr "Kad-Suche: weitere Ergebnisse von einem zusätzlichen Peer angefordert."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
+msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr "Kad-Suche: kein Peer mehr verfügbar, um weitere Ergebnisse abzufragen (Limit erreicht oder noch keine Antworten)."
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Vergleichsfortschritt: %u %% \n"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Suchwarnung"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Hauptkategorie"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "WARNUNG: Liste der bekannten Dateien korrumpiert, enthält ungültigen Header."
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Ungültiger Eintrag in der Liste bekannter Dateien, Datei möglicherweise beschädigt: "
+
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "Kein Schlüsselwort für Kad-Suche – abgebrochen"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Unerwarteter Fehler bei der Kad-Suche:"
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Kad-Suche: weitere Ergebnisse von einem zusätzlichen Peer angefordert."
+
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Kad-Suche: kein Peer mehr verfügbar, um weitere Ergebnisse abzufragen (Limit erreicht oder noch keine Antworten)."
+
+#: src/SearchList.cpp
+#, fuzzy, c-format
+msgid "Error %u: %s\n"
+msgstr "Fehler beim Aktualisieren von %s"
+
+#: src/SearchListCtrl.cpp
 msgid "FileID"
 msgstr "Datei-ID"
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
+#: src/SearchListCtrl.cpp
 #, fuzzy
-msgid "Bitrate"
-msgstr "Nicht bewertet"
-
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr ""
-
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Herunterladen in Kategorie"
-
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "%s für diese Datei erhalten"
+msgid "Collapse all"
+msgstr "Alle Reiter schließen"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Suche verwandte Dateien (eD2k, lokale Server)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Als bekannte Datei kennzeichnen"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Kopiere eD2k-Verweis in die Zwischenablage"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopiere eD2k-Verweise in die Zwischenablage"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Du bist zu einem Server verbunden, den du zu löschen versuchst. Bitte zuerst trennen."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Abgebrochen"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Neu"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Läuft"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finnisch"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Vergleichsfortschritt: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Fortschritt der Suche nicht verfügbar"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Verbindung zu allen gelisteten verschleierten Servern misslungen. Versuche erneut, ohne Verschleierung."
+
+#: src/ServerConnect.cpp
 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:79
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
 msgstr "Fehler beim Verbinden zu allen Servern in der Liste. Ein neuer Durchgang wird gestartet."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
+msgstr "Fehler beim Verbinden zu allen Servern in der Liste. Ein neuer Durchgang wird gestartet."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Automatische Verbindungsherstellung zum Server wird in %d Sekunde wiederholt"
+msgstr1 "Automatische Verbindungsherstellung zum Server wird in %d Sekunden wiederholt"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "eD2k-Netzwerk ist in den Einstellungen deaktiviert - verbinde nicht."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 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:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Verbunden mit %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Verbindung hergestellt mit %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Schwerer Fehler beim Verbinden. Möglicherweise ist die Internetverbindung getrennt"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Verbindung verloren zu %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) scheint tot zu sein."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) scheint voll zu sein."
 
-#: 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"
-msgstr0 "Automatische Verbindungsherstellung zum Server wird in %d Sekunde wiederholt"
-msgstr1 "Automatische Verbindungsherstellung zum Server wird in %d Sekunden wiederholt"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Verbindung verloren"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Verbindung zu %s (%s:%i) fehlgeschlagen."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "FEHLER: Ungültiger Socket bei Prüfung auf Zeitüberschreitung"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Verbindungsversuch zu %s (%s:%i): Zeitüberschreitung."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Verspätetes Ergebnis für DNS-Nachschlag erhalten, wird verworfen."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Lade Datei server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Datei server.met nicht gefunden!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Konnte Datei server.met nicht öffnen!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i Server in server.met gefunden"
 msgstr1 "%i Server in server.met gefunden"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d Server hinzugefügt"
 msgstr1 "%d Server hinzugefügt"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Fehler: die 'server.met' Datei ist defekt: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "IO-Fehler beim Lesen der 'server.met' Datei: "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Du bist zu einem Server verbunden, den du zu löschen versuchst. Bitte zuerst trennen."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Konnte '%s' nicht öffnen"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Speichern der server.met fehlgeschlagen!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "IO-Fehler beim Lesen der 'server.met' Datei: "
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Ungültige URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Download der Serverliste von %s beendet"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Keine Serverlistenadresse in 'addresses.dat' gefunden. Bitte dort zum automatischen Aktualisieren eine gültige Serverlistenadresse eintragen."
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Beginne Download der Serverliste von %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Konnte Serverliste von %s nicht herunterladen"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Lokaler Server ist gefiltert durch IPFilters, verbinde neu zu einem anderen Server!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Benutzer"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Benutzer"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Statisch"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Version"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Dateien"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Freigaben"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 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:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Unbekannter Name)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "Minuten"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Server (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Server"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Verbinde mit Server"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Markiere den Server als statisch"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Markiere den Server als nicht statisch"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Markiere die Server als statisch"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Markiere die Server als nicht statisch"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Entferne Server"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Entferne die Server"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Alle Server entfernen"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopiere eD2k-Verweise in die Zwischenablage"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Wiederverbinden mit Server"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Wirklich alle Server löschen?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Wirklich den markierten Server löschen?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Wirklich die markierten Server löschen?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "Fehler: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "WARNUNG: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr "Server %s (%s) hat den Login abgelehnt (keine ClientID zugewiesen). Trenne."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Neue Benutzer-ID ist %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "WARNUNG: Du hast eine Low-ID zugeordnet bekommen!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tMehr Informationen dazu gibt es hier: https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Unbekannte Serverinfo empfangen! - Zu kurz"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "%d neuen Server empfangen"
 msgstr1 "%d neue Server empfangen"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Speichern der Serverliste abgeschlossen."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Server hat letzten Befehl abgelehnt"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Seltsames Paket vom Server empfangen: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Unbearbeiteter Fehler beim Verarbeiten eines Paketes vom Server: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "Server-IP %s (%s) ist gefiltert. Verbinde nicht."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "verwende Protokollverschleierung."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Verbinde mit·%s·(%s·-·%s:%i)·%s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "aMule-Log"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Server nicht hinzugefügt: Keine IP-Adresse oder Hostname angegeben."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Server nicht hinzugefügt: Ungültiger Server-Port angegeben."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "eD2k-Status:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr "Verbindungstyp:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Verbunden"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kademlia-Status:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Läuft im LAN Modus"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Läuft"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "Kademlia-Client-ID:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Status:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Verbindungszustand:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "UDP-Verbindungszustand:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Firewalled-Status: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Kein Kumpel notwendig - TCP-Port ist geöffnet."
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Kein Kumpel notwendig - UDP-Port ist geöffnet."
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Kein Kumpel"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Verbinde zu Kumpel"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Verbunden mit Kumpel an %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP-Adresse:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Indizierte Quellen:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Indizierte Schlüsselwörter:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Indizierte Anmerkungen:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Indizes geladen:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Benutzer im Schnitt:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Dateien im Schnitt:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Läuft nicht"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Füge Datei %s zu freigegebenen Dateien hinzu"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "%i bekannte freigegebene Datei gefunden"
 msgstr1 "%i bekannte freigegebene Dateien gefunden"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "%i bekannte Datei gefunden, %i unbekannt"
-msgstr1 "%i bekannte Dateien gefunden, %i unbekannt"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "FEHLER: Versuchte %s freizugeben"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Freigegebenes Verzeichnis nicht gefunden, überspringe: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Freigegebenes Verzeichnis nicht gefunden, überspringe: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Keine freigebbaren Dateien im Ordner gefunden: %s"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Benutzername"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Fehler während des Speicherns der Datei '%s': %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Download-Geschwindigkeit"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Lade Datei server.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Upload-Geschwindigkeit"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Keine freigebbaren Dateien im Ordner gefunden: %s"
+msgstr1 "Keine freigebbaren Dateien im Ordner gefunden: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Verfügbare Teile"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Keine freigebbaren Dateien im Ordner gefunden: %s"
+msgstr1 "Keine freigebbaren Dateien im Ordner gefunden: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "%i bekannte freigegebene Datei gefunden"
+msgstr1 "%i bekannte freigegebene Dateien gefunden"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Benutzername"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Upload-Status"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Lokaler Dateiname"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Liste der Freigaben"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Anfragen"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Akzeptierte Anfragen"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Übertragene Datenmenge"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Verteilungsfaktor"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Erhaltene Teile"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Vollständige Quellen"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Verfügbarkeit"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Verzeichnispfad"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Freigaben"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Kommentar/Bewertung abgeben"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Kommentar/Bewertung ändern"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Füge Dateien aus Sammlung zur Übertragungsliste"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Kopiere Magnet-URL &URI in Zwischenablage"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Kopiere eD2k-Verweis in die Zwischenablage (&Source)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Kopiere eD2k-Verweis in Zwischenablage (Source) (&With Crypt options)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "eD2k-Link in Zwischenablage kopieren (&Hostname)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Kopiere eD2k-Verweis in Zwischenablage (Hostname) (With &Crypt options)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Kopiere eD2k-Verweis in die Zwischenablage (&AICH Info)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "eD2k-Verweis in die Zwischenablage kopieren (&AICH-Info + Quelle)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Du brauchst eine hohe ID, um einen gültigen Quellenverweis zu erstellen"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Fehler beim Fertigstellen der Datei."
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Konnte Liste der freigegebenen Dateien von Benutzer '%s' nicht abrufen"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Freigegebene Dateien neu laden"
+msgstr1 "Freigegebene Dateien neu laden"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Gesamtgröße der freigegebenen Dateien: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Gesamtgröße der freigegebenen Dateien: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Freigegebene Dateien (%i)"
+msgstr1 "Freigegebene Dateien (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Freigegebene Dateien (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "PartFile"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Liste freigegebener Dateien neu laden: %u Dateien gelesen"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Status"
+
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Ferndateiname"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Hochgeladene Daten (Sitzung (Gesamt)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Gesamt-Overhead (Pakete): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Dateianfragen-Overhead (Pakete): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Quellenaustausch-Overhead (Pakete): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Server-Overhead (Pakete): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kad-Overhead (Pakete): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "zusätzlicher Datenverkehr durch Verschlüsselung (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Laufende Uploads: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Wartende Uploads: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Erfolgreiche Upload-Sitzungen insgesamt: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Fehlgeschlagene Upload-Sitzungen insgesamt: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Gesamte Upload-Zeit: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Heruntergeladene Daten (Sitzung (Gesamt)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Gefundene Quellen: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Laufende Downloads (Chunks): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Sitzung UL:DL-Rate (Gesamt): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Durchschnittliche Download-Rate (Sitzung): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Durchschnittliche Upload-Rate (Sitzung): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Max. Download-Rate (Sitzung): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Max. Upload-Rate (Sitzung): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Server-Wiederverbindungen: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Zeit seit erster Übertragung: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Verbunden mit Server seit: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Aktive Verbindungen (geschätzt): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Verbindungslimit erreicht: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Durchschnittliche Verbindungen (geschätzt): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Höchste Verbindungsanzahl (geschätzt): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Clients"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Unbekannt: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Gefiltert: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Gebannt: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Gesamt: %i Bekannt: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Funktionierende Server: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Ausgefallene Server: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Gesamt: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Gelöschte Server: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Gefilterte Server: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Benutzer auf funktionierenden Servern: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Dateien auf funktionierenden Servern: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Benutzer insgesamt: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Dateien insgesamt: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Server-Auslastung: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Anzahl freigegebener Dateien: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Gesamtgröße der freigegebenen Dateien: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Durchschnittliche Dateigröße: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Betriebssystem"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Nicht empfangen"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktive Verbindungen (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Nicht verfügbar"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Niemals"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Führe <str> aus und beende."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Verarbeite Datei nach Hash:"
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Verarbeite Datei nach Namen:"
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Dieser Befehl benötigt ein Argument. Mögliche Argumente: ein Datei-Hash\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Keine gültige Nummer\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6470,7 +7976,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6480,7 +7986,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6488,76 +7994,80 @@
 "Kein Suchtyp angegeben.\n"
 "Geben Sie 'help search' ein, um mehr Hilfe zu erhalten.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Datei herunterladen: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Anfrage ist mit unbekanntem Fehler gescheitert."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Vorgang erfolgreich."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Anfrage mit folgendem Fehler gescheitert: %s."
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "IP-Filterung für Clients ist %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "AUS"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "AN"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "IP-Filterung für Server ist %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Momentane IP-Filterstufe ist %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Verbunden mit %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Verbinde"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "firewalled"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6566,7 +8076,7 @@
 "\n"
 "Download:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6575,7 +8085,7 @@
 "\n"
 "Upload:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6584,7 +8094,7 @@
 "\n"
 "Clients in Warteschlange:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6593,38 +8103,33 @@
 "\n"
 "Quellen insgesamt:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "PartFile"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Anzahl der Suchergebnisse: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Vergleichsfortschritt: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Fortschritt der Suche nicht verfügbar"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Unbekannte Antwort vom Server empfangen, OpCode = %#x"
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Zeige kurze Statusinformation."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Verbindungszustand, momentane Geschwindigkeit des Hoch-/Herunterladens, usw. zeigen\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Zeige vollständigen Statistikbaum."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6638,11 +8143,11 @@
 "\n"
 "Beispiel: 'statistics 5' zeigt nur die ersten 5 Versionen für jeden Clienttyp.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "aMule beenden."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6652,35 +8157,35 @@
 "Dadurch wird auch der Textclient beendet, weil er\n"
 "ohne laufenden Kern (core) nicht verwendbar ist.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Neu laden des angegebenen Objekts."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Liste freigegebener Dateien neu laden."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "IP-Filtertabelle neu laden."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Aktuelle IP-Filtertabelle neu laden."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "IP-Filtertabelle von URL aktualisieren."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 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:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Mit Netzwerk verbinden."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6692,35 +8197,35 @@
 "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:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Nur mit eD2k verbinden."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Nur mit Kad verbinden."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Vom Netzwerk trennen."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Nur von eD2k trennen."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Nur von Kad trennen."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Sendet einen eD2k- oder Magnet-Verweis an den Kern."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6738,51 +8243,51 @@
 "\n"
 "Der Magnet-Verweis muss die eD2k-Prüfsumme(\"Hash\") und die Dateigröße beinhalten.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Einstellwert festlegen."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "IP-Filter-Einstellungen festlegen."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 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:1020
+#: src/TextClient.cpp
 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:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Ein-/Ausschalten von IP-Filterung für Clients."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Einschalten der IP-Filterung für Clients."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Ausschalten der IP-Filterung für Clients."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Ein-/Ausschalten der IP-Filterung für Server."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Einschalten der IP-Filterung für Server."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Ausschalten der IP-Filterung für Server."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "IP-Filterstufe auswählen."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6790,59 +8295,73 @@
 "Gültige Filterlevel liegen im Bereich zwischen 0-255, und die\n"
 "Standardeinstellung (Ausgangswert) ist 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Bandbreiteneinstellungen festlegen."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Upload-Bandbreitenbegrenzung festlegen."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Der Wert für diese Befehle muss in Kilobytes/Sek. angegeben werden.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Download-Bandbreitenbegrenzung festlegen."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Aktiviere/Deaktiviere Authentifizierung mit Benutzername/Passwort"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Der Wert für diese Befehle muss in Kilobytes/Sek. angegeben werden.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Einstellungswert holen und anzeigen."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "IP-Filter-Einstellungen holen."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Hole IP-Filter-Status für Clients und Server."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Hole IP-Filter-Status nur für Clients."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Hole IP-Filter-Status nur für Server."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "IP-Filterstufe holen."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Bandbreiteneinstellungen holen."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Suche ausführen."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6876,39 +8395,44 @@
 "Beispiel: 'search global linux iso --type Iso --min-size 100M' ergibt\n"
 "Ergebnisse für \"linux iso\" vom Datei-Typ Iso mit mindestens 100 MiB.\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Globale Suche ausführen."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Lokale Suche ausführen."
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Kad-Suche ausführen."
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
 msgstr "Zeige die Ergebnisse der letzten Suche an."
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Hole die Ergebnisse der vorhergehenden Suche.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Zeige den Fortschritt einer Suche."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Zeige den Fortschritt einer Suche.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Beginne, eine Datei herunterzuladen."
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6916,80 +8440,80 @@
 "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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Download anhalten."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Download weiterführen."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Download löschen."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Setze Herunterlade-Priorität."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Setze niedrige Priorität."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Setze normale Priorität."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Setze hohe Priorität."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Setze automatische Priorität."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Warteschlangen/Listen zeigen."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Upload-Warteschlange zeigen."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Download-Warteschlange zeigen."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Zeige Log."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Serverliste zeigen."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "Liste freigegebener Dateien anzeigen."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Setze Log zurück."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Veralteter Befehl, bitte '%s' nutzen."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -6998,255 +8522,278 @@
 "Das ist ein veralteter Befehl und könnte in der Zukunft enfernt werden.\n"
 "Nutze stattdessen '%s'.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule Textclient"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Lösche Datei: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Lösche Datei: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Wiederaufnahme des Hochladens der Datei '%s'."
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Bestätigung erforderlich"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Es werden nur 99 Kategorien unterstützt."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Zu viele Kategorien!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Alle anderen"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Ansichtenfilter wählen"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Kategorie hinzufügen"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Kategorie bearbeiten"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Kategorie entfernen"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Prüfsummensatz angefordert für unbekannte Datei '%s'"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Wähle, wer deine freigegebenen Dateien einsehen darf."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Wiederaufnahme des Hochladens der Datei '%s'."
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Aussetzen des Hochladens der Datei '%s'."
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Befehlsausführung fehlgeschlagen: Befehl `%s' aufgrund Ereignis `%s'."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Befehlsausführung fehlgeschlagen: Befehl '%s' aufgrund Ereignis '%s'."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Download fertiggestellt"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Der vollständige Pfad zur Datei."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Der Name der Datei ohne den Pfadanteil."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "Die eD2k-Prüfsumme der Datei."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Die Dateigröße in Byte."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Die Gesamtzeit aktiven Herunterladens."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Neue Chat-Sitzung gestartet."
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Nachrichtensender."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Kein Speicherplatz mehr vorhanden."
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Festplattenpartition."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Fehler beim Fertigstellen der Datei."
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Verarbeite Datei Nummer %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Datei existiert nicht!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, der aMule-eD2k-Verweis-Ersteller"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Willkommen!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Eingabeparameter"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Datei für Prüfsummenberechnung"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Dieser Datei optionale URLs hinzufügen"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:144
-msgid "Remove"
-msgstr "Entferne"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Erstelle Verweis mit Part-Prüfsummen"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4-Dateiprüfsumme"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k-Dateiprüfsumme"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k-Verweis"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Speichern"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Öffnen..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Eine Datei zum Erstellen ihres eD2k-Verweises öffnen"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Kopiere erstellten eD2k-Verweis in die Zwischenablage"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Speichern unter..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Speichere erstellten eD2k-Verweis in Datei"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Über aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Kann die Zwischenablage nicht öffnen."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Derzeit nichts zu Kopieren!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Datei zu dem errechneten eD2k-Verweis auswählen"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Konnte Datei nicht öffnen "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Bitte keinen leeren Dateinamen eingeben"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Momentan nichts zu speichern!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7267,162 +8814,159 @@
 "\n"
 "Vertrieben unter der GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Prüfsummenberechnung..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator arbeitet gerade für dich"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Berechne MD4-Hash..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Berechne eD2k-Hash..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Abgebrochen !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Fertig in %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Du hast diese URL bereits eingegeben!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Bitte keine leere URL eingeben"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Konnte '%s' nicht öffnen"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "Nicht genügend Speicher zum Berechnen des eD2k-Hashes!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uT %02uStd %02uMin %02uSek"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uStd %02uMin %02uSek"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02uMin %02uSek"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02uSek"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, die aMule-Onlinestatistik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Höchste Downloadrate seit wxCas läuft"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Höchste Downloadrate während wxCas jemals lief"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "System"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Automatische Aktualisierung beenden"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Speichere Onlinestatistikbild"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Drucke Onlinestatistikbild"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Einstellungen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Über wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Beginne automatische Aktualisierung"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Automatische Aktualisierung angehalten"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Automatische Aktualisierung begonnen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Speichere Statistikbild"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMule-Onlinestatistik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7430,11 +8974,11 @@
 "Es gab ein Problem beim Drucken.\n"
 "Vielleicht ist der aktuelle Drucker nicht richtig eingestellt?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Drucke"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7452,367 +8996,365 @@
 "\n"
 "Vertrieben unter der GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh-oh, aMule läuft nicht..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule läuft"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule läuft, aber nicht verbunden"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule verbindet gerade...."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh-oh, aMule-Status ist unbekannt..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " läuft seit "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " ist angehalten!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " ist nicht verbunden!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " verbindet sich..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " macht irgendetwas Merkwürdiges, bitte überprüfen!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " ist verbunden mit "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "aus"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " ist auf "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " mit "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Gesamtdownload: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Upload: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Sitzung Download: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Download: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Freigegeben: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " Datei(en), Clients in Warteschlange: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Zeit: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " auf "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Durchschnittliche Systemlast (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Systemlaufzeit: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Verzeichnis mit der Datei amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Aktualisierungsintervall in Sekunden"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Erzeuge bei jeder Aktualisierung ein Statistikbild"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Statistikbild periodisch auf einen FTP-Server hochladen"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP-URL"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP-Pfad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Hier die URL deines FTP-Servers eingeben"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Benutzer"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTP-Aktualisierungsintervall in Minuten"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Bestätigen"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Verzeichnis mit deiner Signaturdatei"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Verzeichnis zum Erzeugen des Statistikbildes"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Lädt Vorlage <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Webserver-HTTP-Port"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Benutze UPnP-Port-Weiterleitung für Webserver-Port"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP-Port"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Benutze gzip-Kompression"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Vollzugriff-Passwort für den Webserver"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Gast-Passwort für den Webserver"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Erlaube Gastzugriff"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Verweigere Gastzugriff"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "Lade/Speichere Webserver-Einstellungen von/zu entferntem aMule"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMule-Konfigurationsdateipfad. NICHT DIREKT BENUTZEN!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "PHP-Interpreter deaktivieren (überholt)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Rekompiliere PHP-Seiten bei jeder Anfrage"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule Webserver"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "Webclient-Verbindung akzeptiert.\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "FEHLER: Kann Webclientverbindung nicht akzeptieren.\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Anfrage mit folgendem Fehler gescheitert: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Index-Datei nicht gefunden: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sitzung abgelaufen - fordere Anmeldung\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sitzung ok, angemeldet\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sitzung ok, nicht angemeldet\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Keine Sitzung geöffnet - fordere Anmeldung\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sitzung eröffnet - fordere Anmeldung\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Anfrage verarbeiten original: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr "Verweigere,  `pass`vom Parameterteil der URL zu lesen\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Kein Passwort angegeben, Anmeldung wird nicht erlaubt."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Prüfe Passwort\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Passwort-Prüfsumme ungültig\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Passwort ok\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Falsches Passwort\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Fordere Abmeldung\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Anfrage verarbeiten umgeleitet: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr "aMule (benötigt)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr "Desktopverknüpfung"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr "aMule beim Login automatisch starten"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr "Deinstallieren"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr "Entferne Benutzerdaten (ED2K Server, Kad Nodes, Part-Dateien)"
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr "aMule Programmdateien (benötigt)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr "Lege eine aMule Verknüpfung auf den Desktop an."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr "Starte aMule automatisch wenn sich der aktuelle Benutzer einloggt (benutzerspezifische Einstellung)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+#, fuzzy
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr "Entferne aMule Programmdateien, Startmenü / Desktopverknüpfungen, Autostarteintrag, und Programm Hinzufügen/Entfernen  Eintrag (benötigt)."
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr "%APPDATA%\\aMule für den aktuellen Benutzer endgültig  löschen (aMule.conf, ED2K Serverliste, Kad Nodes, Part-Dateien, IP Filter, Freundeliste). Unmarkiert lassen, um die Einstellungen zu behalten."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
@@ -7820,7 +9362,7 @@
 "aMule scheint von $INSTDIR zu laufen.\r\n"
 "Bitte aMule (und aMuleD / aMulgeGUI) schließen und erneut versuchen."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
@@ -7828,11 +9370,11 @@
 "Der aMule Service (amuled.exe) scheint von $INSTDIR zu laufen.\r\n"
 "Bitte stoppen und erneut versuchen."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr "Entferne vorherige aMule installation von $0..."
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
@@ -7840,21 +9382,189 @@
 "Konnte die vorherige aMule Installation von $0 nicht entfernen.\r\n"
 "Bitte beende alle laufenden aMule Prozesse und versuche es noch einmal, oder entferne die vorherige Version manuell."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr "aMule scheint zu laufen. Bitte schließen und das Entfernprogram erneut ausführen."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr "Entferne Benutzerdaten von $APPDATA\\aMule..."
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Hochgeladen"
+#~ msgid "Ratio"
+#~ msgstr "Bewertung"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Keine freigebbaren Dateien im Ordner gefunden: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Sprache ändern"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Für aMule sind keine Übersetzungen installiert"
+
+#~ msgid "No languages available"
+#~ msgstr "Keine Sprachen verfügbar"
+
+#~ msgid "User name"
+#~ msgstr "Benutzername"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Erhaltene Teile"
+
+#~ msgid "Available Parts"
+#~ msgstr "Verfügbare Teile"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "%i bekannte Datei gefunden, %i unbekannt"
+#~ msgstr1 "%i bekannte Dateien gefunden, %i unbekannt"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Entfernter Server"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Lokaler Server"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Ungültiger Eintrag in der Liste bekannter Dateien, Datei möglicherweise beschädigt: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Speichere unfertige Datei %u von %u"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Bitte trage deinen bevorzugten Videoplayer in den Einstellungen ein.\n"
+#~ "Bis dahin wird aMule versuchen, %s zu starten, und bei jeder Vorschau wird diese Warnung angezeigt werden."
+
+#~ msgid "Filter Results"
+#~ msgstr "Filterergebnisse"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Als bekannte Datei kennzeichnen"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Prozent aller Dateien"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Bootstrap"
+
+#~ msgid "New node"
+#~ msgstr "Neuer Knoten"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Mehr"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Bootstrap von \n"
+#~ "bekannten Clients"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Mit irgendeinem Server und/oder Kad verbinden"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Kad trennen"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Beendet die derzeitigen Verbindungsversuche"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Von den momentan verbundenen Netzwerken trennen."
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Mit den aktuell aktivierten Netzwerken verbinden."
+
+#, c-format
+#~ msgid "Could not add %u link from ED2KLinks file (see log for details)."
+#~ msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+#~ msgstr0 "Konnte %u Link aus ED2KLinks nicht hinzufügen (Details: siehe Log)"
+#~ msgstr1 "Konnte %u Links aus ED2KLinks nicht hinzufügen (Details: siehe Log)"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "sortiere Dateien automatisch (hohe CPU-Auslastung)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule sortiert automatisch die Spalten der Downloadliste"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Weise Paket zurück, wenn die Client-IP abweicht von der IP, von der das Paket empfangen wurde. Mit Vorsicht zu benutzen."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Hole die Ergebnisse der vorhergehenden Suche.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Zeige den Fortschritt einer Suche.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Verbindung getrennt - wahrscheinlich hat aMule sich beendet"
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Beim Start auf neue Version prüfen"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k-Verweis: "
+
+#~ msgid "Commit"
+#~ msgstr "Übernehmen"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: Wechsele in den Hintergrund."
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Webseite: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Webseite: https://amule-org.github.io/docs \n"
+
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Probleme: https://github.com/amule-org/amule/discussions \n"
+#~ "\n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Datei nicht gefunden."
+#~ msgid "Loaded"
+#~ msgstr "Hochgeladen"
 
 #, c-format
 #~ msgid "No GeoLite2 update URL configured. Download GeoLite2-Country.mmdb manually (a free MaxMind account is required) and place it at %s, or set the URL in Preferences."

amule-3.0.1.tar.gz/po/el.po -> amule-3.1.0.tar.gz/po/el.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:16+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:29+0000\n"
 "Last-Translator: Dimitris <dgalanak@yahoo.com>\n"
 "Language-Team: Greek\n"
 "Language: el\n"
@@ -20,71 +20,159 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Εμφάνιση aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Τηλεχειρισμός aMule"
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Στιγμιότυπο"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Πελάτης P2P για όλες τις πλατφόρμες βασισμένος στο eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Πνευματικά Δικαιώματα (c) 2003-2019 η ομάδα του aMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Μέρος του aMule είναι βασισμένο στο  \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Δρομολόγηση Peer-to-peer βασισμένη στην μετρική XOR.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Ιστοσελίδα:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Συζητήσεις:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Έλεγχος για νέα έκδοση κατά την εκκίνηση"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Διαδικασία σύνδεσης στο Kad..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Χρησιμοποιείται μία ξεπερασμένη έκδοση του aMule!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Δεν είναι διαθέσιμο"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Προσθήκη φίλου"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Πρέπει να βάλετε σωστή IP και θύρα!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Πληροφορίες"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Ο προσδιορισμένος κατακερματισμός χρήστη δεν είναι έγκυρος!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "Add aMule to your application menu?"
 msgstr "Μετά το όνομα της εφαρμογής"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Αποτυχία σύνδεσης"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -93,144 +181,274 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ΣΦΑΛΜΑ"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 #, fuzzy
 msgid "Failed to open ED2KLinks file."
 msgstr "Αποτυχία ανοίγματος %s (%s)"
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν μπορείτε να προσθέσετε τον εαυτό σας σαν πηγή για έναν σύνδεσμο eD2k ενώ έχετε χαμηλή προτεραιότητα."
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Το αρχείο δεικτών δεν βρέθηκε (ψάχνω ψάχνω και τίποτα δεν βρίσκω)"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Αποτυχία λήψης των κοινόχρηστων αρχείων του χρήστη '%s'"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Δεν γίνεται η μετατροπή του μαγνητικού συνδέσμου σε σύνδεσμο eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Άκυρος σύνδεσμος eD2k! ΣΦΑΛΜΑ: %s"
+
+#: src/amule.cpp
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "Όλα μια χαρά, έξοδος %s...\n"
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "Το κατέβασμα ολοκληρώθηκε"
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Οι τοπικές ρυθμίσεις άλλαξαν στις προεπιλεγμένες του συστήματος λόγο μιας αλλαγής παραμέτρων. Sorry!"
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Πληροφορίες"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Έξοδος επιβεβαίωσης"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "Νέα εξωτερική σύνδεση έγινε δεκτή"
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "βρέθηκε %i διακομιστής στο server.met"
+msgid "Loading temp files"
+msgstr "Φόρτωση του αρχείου διακομιστών: %s"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Φόρτωση του αρχείου διακομιστών: %s"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Επαναφόρτωση των κοινόχρηστων αρχείων"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Επαναφόρτωση των κοινόχρηστων αρχείων"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Εκκίνηση"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Δίκτυα"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Δίκτυα"
+msgid "eD2k server list (server.met)"
+msgstr "βρέθηκε %i διακομιστής στο server.met"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "διακομιστής ιστού τρέχει με αριθμό διεργασίας %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "Ζητήσατε να τρέχετε τον διακομιστή ιστού κατά την εκκίνηση, αλλά το εκτελέσιμο αρχείο amuleweb δεν βρέθηκε. Παρακαλώ εγκαταστήστε το πακέτο που περιέχει τον διακομιστή ιστού του aMule, ή μεταφράστε το aMule χρησιμοποιώντας την παράμετρο --enable-webserver"
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "ΣΦΑΛΜΑ"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "διακομιστής ιστού τρέχει με αριθμό διεργασίας %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Ζητήσατε να τρέχετε τον διακομιστή ιστού κατά την εκκίνηση, αλλά το εκτελέσιμο αρχείο amuleweb δεν βρέθηκε. Παρακαλώ εγκαταστήστε το πακέτο που περιέχει τον διακομιστή ιστού του aMule, ή μεταφράστε το aMule χρησιμοποιώντας την παράμετρο --enable-webserver"
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Δεν μπόρεσε να προσδέσει τις θύρες στην προσδιορισμένη διεύθυνση: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Η θύρα %u δεν είναι διαθέσιμη. Θα σας αποδωθεί LOWID (χαμηλή προτεραιότητα)\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -245,48 +463,48 @@
 "\n"
 "Ελέξτε το δίκτυο σας για να βεβαιωθήτε ότι η θύρα είναι ανοιχτή για είσοδο και έξοδο."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Αποτυχία δημιουργίας αρχείου Συνδεδεμένων Υπογραφών"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Αποτυχία δημιουργίας αρχείου Συνδεδεμένων Υπογραφών του aMule"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr "Οι επιλεγμένες τοπικές ρυθμίσεις δεν φαίνεται να είναι εγκατεστημένες στο σύστημά σας. (Σημ. Θα προσπαθήσω να τις θέσω ούτως ή άλλως)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Αυτή είναι η πρώτη φορά που τρέχετε το aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Αυτή η έκδοση είναι δοκιμαστική, και αναβαθμίζεται καθημερινά, και\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "δεν δίνουμε εγγύηση ότι δεν θα χαλάσει κάτι, δεν θα κάψει το σπίτι σας,\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "ή δεν θα σκοτώσει το σκύλο σας. Αλλά πρέπει να είναι ασφαλές στη χρήση\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr "Περισσότερες πληροφορίες, υποστήριξη και νέες εκδόσεις μπορούν να βρεθούν στην ιστοσελίδα μας,\n"
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "στο https://amule-org.github.io, ή στο κανάλι #aMule του IRC στο irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Παρακαλούμε αναφέρετε σφάλματα του προγράμματος στο https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -294,1591 +512,1898 @@
 "Ο δικτυακός κατάλογος των ηλεκτρονικών αρχείων υπογραφών που προσδιορίσατε είναι ΑΚΥΡΟΣ!\n"
 "Οι ηλεκτρονικές υπογραφές θα ΑΠΕΝΕΡΓΟΠΟΙΗΘΟΥΝ μέχρι να το φτιάξετε στις προτιμήσεις."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 #, fuzzy
 msgid "Server hostname notified"
 msgstr "Όνομα διακομιστή:"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Η εκχώρηση χώρου για το αρχείο '%s' απέτυχε: '%s'"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "ΣΦΑΛΜΑ: το αρχείο καταγραφής δεν μπορεί να ανοίξει"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το αρχείο καταγραφών είναι άδειο. Κάτι δεν πάει καλά."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Το αρχείο καταγραφών επαναφέρθηκε στην αρχική κατάσταση"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Μήνυμα Διακομιστή: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Αποτυχία κατεβάσματος της λίστας κόμβων."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Αποτυχία ανοίγματος του κατεβασμένου αρχείου ελέγχου έκδοσης"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Φθαρμένο αρχείο ελέγχου έκδοσης"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Χρησιμοποιείται μία ξεπερασμένη έκδοση του aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Η τελευταία έκδοση μπορεί να βρεθεί στο https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η έκδοση του aMuled είναι ξεπερασμένη: %i.%i.%i < %li.%li.%li"
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Αυτό το αντίγραφο του aMule είναι σύγχρονο. "
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Αποτυχία κατεβάσματος του αρχείου ελέγχου έκδοσης"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Χρήστες: %s | Αρχεία: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr "Χρήστες: E: %s K: %s | Αρχεία: E: %s K: %s"
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Δεν έχουν επιλεχθεί δίκτυα"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "με Χαμηλή Προτεραιότητα"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "με Υψηλή Προτεραιότητα"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Σύνδεση με το %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Διαδικασία σύνδεσης με %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Αποσυνδεδεμένο από το eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Το Kad ξεκίνησε."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Το Kad είναι σταματημένο."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Συνδεδεμένο στο Kad (ΟΚ)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Συνδεδεμένο στο Kad (με προστατευτικό τοίχο)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Αποσυνδεδεμένο από το Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr "Το δίκτυο Kad δεν μπορεί να χρησιμοποιηθεί αν η θύρα UDP είναι απενεργοποιημένη στις προτιμήσεις. Δεν έγινε εκκίνηση."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Το δίκτυο Kad είναι απενεργοποιημένο από τις προτιμήσεις. Δεν έγινε σύνδεση."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 #, 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "ΣΦΑΛΜΑ: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Αυτό το aMule %s είναι βασισμένο στο eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Τρέχει στο %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Επισκεφτείτε το https://github.com/amule-org/amule/releases/latest για να δείτε αν υπάρχει νέα έκδοση."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ΜΟΙΡΑΙΟ ΣΦΑΛΜΑ: Αποτυχία δημιουργίας Χρονομέτρου"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Τηλεχειρισμός aMule"
-
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Στιγμιότυπο"
-
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
 msgstr ""
-"Πελάτης P2P για όλες τις πλατφόρμες βασισμένος στο eMule \n"
-"\n"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Ιστοσελίδα: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Δίκτυα"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Συζητήσεις: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Αναζητήσεις"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Ιστοσελίδα: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Κατεβασμένα"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Συζητήσεις: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Κοινόχρηστα αρχεία"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Πνευματικά Δικαιώματα (c) 2003-2019 η ομάδα του aMule \n"
-"\n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Πελάτες"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Μέρος του aMule είναι βασισμένο στο  \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Μηνύματα"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Δρομολόγηση Peer-to-peer βασισμένη στην μετρική XOR.\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Στατιστικές"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Προτιμήσεις"
+
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Μήνυμα"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Μήνυμα Διακομιστή: %s"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Δεν είναι διαθέσιμο"
+
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Η τελευταία έκδοση μπορεί να βρεθεί στο https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Συνδέοντας"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Συνδέεται"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Αποσυνδεδεμένο"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Πίσω από τοίχο προστασίας"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Συνδεδεμένο"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Σε διαδικασία σύνδεσης"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Εκτός"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Ακύρωση"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Σταμάτησε τις τρέχουσες απόπειρες σύνδεσης"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Έκδοση"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Αποσύνδεση"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Αποσύνδεση από τα συνδεδεμένα δίκτυα"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Σύνδεση"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Διεύθυνση"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Σύνδεση στα ενεργοποιημένα δίκτυα"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Περιγραφή"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "Αρχείο καταγραφής aMule"
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Πάνω: %.1f(%.1f) | Κάτω: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Πάνω: %.1f | Κάτω: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Συνδεδεμένο)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Αποσυνδεδεμένο)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Σίγουρα θέλετε να κλείσετε το aMule;"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Έξοδος επιβεβαίωσης"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- Προεπιλεγμένο -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Ο κατάλογος των θεμάτων '%s'  δεν υπάρχει"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν είναι δυνατή η ανάγνωση του αρχείου θέματος '%s' "
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Δίκτυα"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Παράθυρο δικτύων"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Αναζητήσεις"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Παράθυρο αναζητήσεων"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Κατεβασμένα"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "Κατεβαίνει"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Κοινόχρηστα αρχεία"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Παράθυρο κοινόχρηστων αρχείων"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Μηνύματα"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Παράθυρο δικτύων"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Παράθυρό μηνυμάτων"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Στατιστικές"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Παράθυρο στατιστικών διαγραμμάτων"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Προτιμήσεις"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Παράθυρο ρυθμίσεων"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Το εργαλείο εισαγωγής ημιτελών αρχείων"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Σχετικά"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Σχετικά/Βοήθεια"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Δίκτυο eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Δίκτυο Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Κανένα δίκτυο"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Έλεγχος του aMule εξ' αποστασεως"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Μοιραίο σφάλμα: Αποτυχία δημιουργίας χρονομέτρου"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Σύνδεση σε απομακρυσμένο amule"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Η σύνδεση χάθηκε"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Επιβεβαίωση κατά την έξοδο"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Μοιραίο σφάλμα: Αποτυχία δημιουργίας χρονομέτρου"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Going to event loop..."
 msgstr "Προσπάθεια ανάκτηση πληροφοριών αρχείου..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Connecting..."
 msgstr "Συνδέοντας"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr ""
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Η απόπειρα σύνδεσης στο %s (%s:%i) ξεπέρασε το χρονικό όριο."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Απενεργοποιημένο"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Σύνδεση στο δίκτυο."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Όλα"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Δεν υπάρχει"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Το αρχείο δεν βρέθηκε."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Άκυρος σύνδεσμο ή ήδη στην λίστα."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Κατάλογος για τα προσωρινά αρχεία"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Αποτυχία λήψης των κοινόχρηστων αρχείων του χρήστη '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Πλασματική έκδοση eMule %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Πλασματικό eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Πλασματικό eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (βασισμένο στο eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Παρατσούκλι: %s Ταυτότητα: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Ζητήθηκε: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Στατιστικές αρχείων για αυτή τη συνεδρία: Δεκτό %d από %d αίτηση, %s μεταφέρθηκε\n"
 msgstr1 "Στατιστικές αρχείων για αυτή τη συνεδρία: Δεκτά %d από %d αίτησεις, %s μεταφέρθηκαν\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Στατιστικές αρχείων για όλες τις συνεδρίες: Δεκτό %d από %d αίτηση, %s μεταφέρθηκε\n"
 msgstr1 "Στατιστικές αρχείων για όλες τις συνεδρίες: Δεκτά %d από %d αίτησεις, %s μεταφέρθηκαν\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Αναζητήθηκε άγνωστο αρχείο"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Φιλτραρίστηκε το μήνυμα από τον '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Καινούριο μήνυμα από τον '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Ο χρήστης %s (%u) ζήτησε λίστα κοινόχρηστων αρχείων του κατάλογου %s -> Απορρίφθηκε"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Αποτυχία λήψης των κοινόχρηστων αρχείων του χρήστη '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το αρχείο known.met δεν μπορεί να ανοιχτεί."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 #, fuzzy
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: η λίστα των γνωστών αρχείων είναι φθαρμένη, περιέχει άκυρη επικεφαλίδα."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Σφάλμα εισόδου εξόδου κατά την ανάγνωση του αρχείου known.met: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Σφάλμα κατά το αποθήκευση του αρχείου known.met: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Κατηγορία"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Καινούρια κατηγορία"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Επιλέξτε έναν κατάλογο για τα εισερχόμενα αρχεία"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Πρέπει να προσδιορίσετε ένα όνομα για την κατηγορία!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Πρέπει να προσδιορίσετε μία διαδρομή για την κατηγορία!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr "Αποτυχία δημιουργίας καταλόγου εισερχομένων για την κατηγορία. Παρακαλώ προσδιορίστε μία έγκυρη διαδρομή!"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Ξεκίνησε συνεδρία συνομιλίας: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Συνδεδεμένος σε πελάτη ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Συνδέεται σε πελάτη ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Αποτυχία σύνδεσης σε πελάτη/η σύνδεση χάθηκε ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Κλείσιμο καρτέλας"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Κλείσιμο όλων των καρτελών"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Κλείσιμο των άλλων καρτελών"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Προσθήκη στους φίλους"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Εμφάνιση &Λεπτομερειών"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Αφαίρεση από του φίλους"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Εγκαθίδρυσε φιλική θυρίδα"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Παρουσίαση αρχείων"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Αποστολή μηνύματος"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Αποστολή μηνύματος στον χρήστη"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Μήνυμα προς αποστολή:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Δεν επιτρέπεται να θέσεις μόνο πανω από μία φιλική θυρίδα. \n"
+" Γι αυτό μόνο μία ανατέθηκε."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Πολλαπλή επιλογή"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Αφαίρεση από του φίλους"
+msgstr1 "Αφαίρεση από του φίλους"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Επαναφορτώνει τη λίστα κοινοχρήστων αρχείων."
+msgstr1 "Επαναφορτώνει τη λίστα κοινοχρήστων αρχείων."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Φορτώθηκε το αρχείο πιστώσεων, %u πελάτη είναι γνωστός"
 msgstr1 "Φορτώθηκε το αρχείο πιστώσεων, %u πελάτες είναι γνωστοί"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 "- Εξέπνευσε η προθεσμία πιστώσεων για %u πελάτη!"
 msgstr1 "- Εξέπνευσε η προθεσμία πιστώσεων για %u πελάτες!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Δεν βρέθηκε το αρχείο 'cryptkey.dat' και γι αυτό το δημιουργώ"
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Πληροφορίες πελάτη"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "Κακή ποιότητα σύνδεσης (LowID)"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "Καλή ποιότητα σύνδεσης (HighID)"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Ενεργό"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Υποστηρίζεται"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Δεν υποστηρίζεται"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Απενεργοποιημένο"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Συνδεδεμένο"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Αποσυνδεδεμένο"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Όνομα"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Διεύθυνση IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Τελευταία λήψη"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Έκδοση"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Ταχύτητα ανεβάσματος"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "Ταχύτητα κατεβάσματος"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Ανέβηκε"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Συνολική μεταφόρτωση:"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Τροποποιητής Ανεβοκατεβάσματος"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Διασυνδεδεμένη υπογραφή"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Δεν ολοκληρώθηκε"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Κακό παιδί"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Επιβεβαιώθηκε - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "Δεν υπάρχει"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Δεν υπάρχει"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Αρχεία"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Ανέβηκε"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Έχει κατεβεί"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Κατεβαίνει"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Ανέβασμα"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Ενεργό"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Άγνωστο"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Ο χρήστης %s (%u) ζήτησε τη λίστα με τα κοινόχρηστα αρχεία -> Έγινε δεκτό"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Ο χρήστης %s (%u) ζήτησε τη λίστα με τα κοινόχρηστα αρχεία -> Απορρίφθηκε"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Ο χρήστης %s (%u) ζήτησε τη λίστα με τους κοινόχρηστους καταλόγους -> Έγινε δεκτό"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Ο χρήστης %s (%u) ζήτησε τη λίστα με τους κοινόχρηστους καταλόγους -> Απορρίφθηκε"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "Ο χρήστης %s (%u) ζήτησε λίστα κοινόχρηστων αρχεία του κατάλογου %s -> Έγινε δεκτό"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "Ο χρήστης %s (%u) ζήτησε λίστα κοινόχρηστων αρχείων του κατάλογου %s -> Απορρίφθηκε"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Ο χρήστης %s (%u) μοιράζεται τον κατάλογο %s"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Ο χρήστης %s (%u) έστειλε κοινόχρηστους καταλόγους χωρίς να ζητηθούν."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "Ο χρήσης %s (%u) έστειλε λίστα κοινόχρηστων αρχείων για κατάλογο %s"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "Ο χρήστης %s (%u) τελείωσε την αποστολή της λίστας κοινόχρηστων αρχείων"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Ο χρήστης %s (%u) έστειλε αχρείαστη λίστα κοινόχρηστων αρχείων"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "Ο χρήστης %s (%u) αρνήθηκε πρόσβαση στη λίστα κοινόχρηστψων καταλόγων/αρχείων"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Σχόλια αρχείου"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Όνομα Χρήστη"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Όνομα αρχείου"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Αξιολόγηση"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Σχόλιο"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Δεν μπορεί να γίνει αναζήτηση στο Kad αν το Kad δεν τρέχει"
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Κανένα σχόλιο"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u σχόλιο"
 msgstr1 "%u σχόλια"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Αποτυχία κατεβάσματος της λίστας διακομιστών από το %s"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Αυτόματη Χαμηλή"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Αυτόματη Κανονική"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Αυτόματη Υψηλή"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Πολύ χαμηλή"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Χαμηλή"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Κανονική"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Υψηλή"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Πολύ υψηλή"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Επίσημη έκδοση"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Ζητώντας"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Σύνδεση μέσω διακομιστή"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Ουρά γεμάτη"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Εν αναμονή"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Κατεβαίνει"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Λαμβάνοντας το σύνολο των τεμαχίων"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Δεν υπάρχουν χρειαζούμενα κομμάτια"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Δεν μπορεί να γίνει σύνδεση από LowID σε LowID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Υπερβολικά πολλές συνδέσεις"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Σύνδεση μέσω Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Υπερβολικά πολλές συνδέσεις Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Απαγορευμένοι"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Σφάλμα σύνδεσης"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Η απομακρυσμένη ουρά είναι γεμάτη"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Παλιό MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Νέο MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Συμβατό με eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Τοπικός διακομιστής"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Απομακρυσμένος διακομιστής"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Ανταλλαγή πηγών"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Παθητικό"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Σύνδεσμος"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Πηγαίος σπόρος"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Αποτέλεσμα Αναζήτησης"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Ολοκληρώθηκαν"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Σε εξέλιξη"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "ΣΦΑΛΜΑ: Δεν υπάρχει χώρος στο δίσκο"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "ΣΦΑΛΜΑ: Δεν βρέθηκε το Partmet"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ΣΦΑΛΜΑ: σφάλμα εισόδου/εξόδου!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ΣΦΑΛΜΑ: Απέτυχε!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Εν αναμονή"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Ήδη κατεβαίνει"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Άγνωστος ή κακός τύπος προσωρινού αρχείου."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Μέρος"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Μεταφέρθηκαν"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Ταχύτητα"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Πρόοδος"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Αρ. πηγών"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Υπόλοιπος Χρόνος"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Τελευταία φορά που εμφανίστηκε ολοκληρωμένο"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Τελευταία λήψη"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε το συγκεκριμένο αρχείο;"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τα συγκεκριμένα αρχεία;"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Αντίδραση από %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Αυτόματη"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Σταμάτημα"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Παύση"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Συνέχιση"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Κ&αθάρισμα των ολοκληρωμένων"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Εναλλαγή κάθε A4AF μέχρι αυτό το αρχείο τώρα"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Εναλλαγή κάθε A4AF μέχρι αυτό το αρχείο (αυτόματα)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Εναλλαγή κάθε A4AF μέχρι κάθε άλλο αρχείο (αυτόματα)"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Εκτεταμένες Προτιμήσεις"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Προεπισκόπιση"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Εμφάνιση &λεπτομερειών για το αρχείο"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Εμφάνιση όλων των σχολίων"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Αντιγραφή μαγνητικής URI στο πρόχειρο"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Αντιγραφή των συμβουλών στην πρόχειρη μνήμη"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Προσθήκη προαιρετικών URL για αυτό το αρχείο"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "μη ανάθεση"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Ανάθεση σε κατηγορία"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Άνοιγμα αρχείου"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε το συγκεκριμένο αρχείο;"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τα συγκεκριμένα αρχεία;"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Αντίδραση από %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Δώστε νέο όνομα γι αυτό το αρχείο:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Μετονομασία αρχείου"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Κατεβασμένα (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Για να μην εμφανίζεται αυτή η προειδοποίηση σε κάθε προεπισκόπιση,\n"
-"θέστε το προτιμητέο πρόγραμμα βίντεο στις ρυθμίσεις (ο %s είναι προεπιλεγμένος)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Προεπισκόπηση αρχείου"
+msgid "Downloads (%i)"
+msgstr "Κατεβασμένα (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ΣΦΑΛΜΑ: Αποτυχία εκτέλεσης του εξωτερικού προγράμματος εμφάνισης πολυμέσων! Εντολή: `%s'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Συνολικό Κατέβασμα: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading temp files from %s."
 msgstr "Φόρτωση του αρχείου διακομιστών: %s"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Φόρτωση δεδομένων από το παλιό αρχείο κατεβάσματος (%u από %u)"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "ΣΦΑΛΜΑ: Αποτυχία φορτώματος του αντιγράφου ασφαλείας. Ψάξτε στο https://github.com/amule-org/amule/discussions για λύσεις ανάκτησης αρχείων .part.met"
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Δεν βρέθηκαν ημιτελή αρχεία"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Βρέθηκε %u ημιτελές αρχείο"
 msgstr1 "Βρέθηκαν %u ημιτελή αρχεία"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Το σύστημα αρχείων του προσωρινού καταλόγου δεν μπορεί να διαχειριστεί μεγάλα αρχεία."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Το σύστημα αρχείων του καταλόγου εισερχομένων δεν μπορεί να διαχειριστεί μεγάλα αρχεία."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Κατεβάζοντας %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Προσπαθείτε ήδη να κατεβάσετε αυτό το αρχείο '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Το αρχείο '%s' υπάρχει ήδη"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Το αρχείο '%s' υπάρχει ήδη"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Ήδη προσπαθείτε να κατεβάσετε το αρχείο %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Δεν γίνεται η μετατροπή του μαγνητικού συνδέσμου σε σύνδεσμο eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Άγνωστο πρωτόκολλο του συνδέσμου: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Άκυρος σύνδεσμος eD2k! ΣΦΑΛΜΑ: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client sent packet after authentication failed."
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Η εξωτερική σύνδεση έκλεισε."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Οι εξωτερικές συνδέσεις απενεργοποιήθηκαν λόγω καινού κωδικού!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Οι εξωτερικές συνδέσεις απενεργοποιήθηκαν στο αρχείο ρυθμίσεων"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Νέα εξωτερική σύνδεση έγινε δεκτή"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ΣΦΑΛΜΑ: δεν μπόρεσα να αποδεχτώ νέα εξωτερική σύνδεση"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Οι εξωτερικές συνδέσεις απενεργοποιήθηκαν λόγω καινού κωδικού στις προτιμήσεις!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Συνδεόμενος πελάτης: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Άγνωστη έκδοση"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "Λανθασμένη ταυτότητα έκδοσης EC, ίσως υπάρχει δυαδική ασυμβατότητα. Χρησιμοποιήστε πυρήνα και απομακρυσμένο μέρος από το ίδιο στιγμιότυπο."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "Δεν μπορείτε να συνδεθείτε σε μια επίσημη έκδοση από μια αναπτυσσόμενη (SVN) έκδοση! *ουφ* αποφευχθεί πιθανό κρέμασμα"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Άκυρη έκδοση πρωτοκόλλου."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Λείπει η ετικέτα με την έκδοση του πρωτοκόλλου."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Αυτόματη σύνδεση στον διακομιστή θα επιχειρηθεί ξανά σε %d δευτερόλεπτο"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: wrong password."
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: missing password."
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Invalid request, please authenticate first."
 msgstr "Άκυρη αίτηση, πρέπει πρώτα να πιστοποιηθήτε."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Η πρόσβαση επικυρώθηκε."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Διήθηση μηνυμάτων από άγνωστους πελάτες"
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Απόπειρα μη εξουσιοδοτημένης πρόσβασης. Η σύνδεση έκλεισε."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Η απομακρυσμένη εντολή ημιτελούς αρχείου απέτυχε: Ο κατακερματισμός αρχείου δεν βρέθηκε: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Ο κατακερματισμός αρχείου δεν βρέθηκε: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "Όπα! Σφάλμα επεξεργασίας OpCode!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Ο διακομιστής δεν προστέθηκε"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "Ο διακομιστής δεν βρέθηκε: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "χρειάζεται να οριστεί ο διακομιστής που να διαγραφεί"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "Το eD2k είναι απενεργοποιημένο στις ρυθμίσεις."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Το αρχείο δεν βρέθηκε."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Το αρχείο δεν βρέθηκε."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Αναζήτηση δια εξέλιξη. Επανάκτηση αποτελεσμάτων σε λίγο!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Η αναζήτηση από τον ιστό από απομακρυσμένο περιβάλλον δεν έχει κανένα νόημα."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Αναζήτηση δια εξέλιξη. Επανάκτηση αποτελεσμάτων σε λίγο!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Δεν υπάρχουν σημεία για γράφημα."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Ο πελάτης σας δεν έχει ρυθμιστεί με τόση λεπτομέρεια"
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Εξωτερική σύνδεση: ζητήθηκε κλείσιμο"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Ήδη η λειτουργία είναι σε φάση διακοπής"
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Εξωτερική Σύνδεση: προστίθεται ο σύνδεσμος '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Άκυρος σύνδεσμο ή ήδη στην λίστα."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Το αρχείο δεν βρέθηκε."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Άκυρο όνομα αρχείου."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Αποτυχία μετονομασίας αρχείου."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Κλείσιμο της συνομιλίας."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Ξεκίνησε καινούρια περίοδος συνομιλίας"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Κλείσιμο της συνομιλίας."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Το Kad έχει απενεργοποιηθεί στις προτιμήσεις."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Άγνωστο όνομα)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Το Kad έχει απενεργοποιηθεί στις προτιμήσεις."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Ήδη συνδεδεμένο στο eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Συνδέεται στο eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Ήδη συνδεδεμένο στο Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Διαδικασία σύνδεσης στο Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Όλα τα δίκτυα είναι απενεργοποιημένα."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Αποσυνδεδεμένο από το eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Αποσυνδεδεμένο από το Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Εξωτερική σύνδεση: λήφθηκε άκυρος opcode: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Εσφαλμένος κωδικός (λάθος έκδοση πρωτοκόλλου;)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Άγνωστη επέκταση  '%s' για την εντολή '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Άγνωστη εντολή '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1886,7 +2411,7 @@
 "\n"
 "Αυτή η εντολή δεν μπορεί να έχει όρισμα.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1894,7 +2419,7 @@
 "\n"
 "Αυτή η εντολή πρέπει να έχει όρισμα.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1902,7 +2427,7 @@
 "\n"
 "Αυτή η εντολή είναι ημιτελής, πρέπει να χρησιμοποιήσετε μία από τις παρακάτω επεκτάσεις.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1910,11 +2435,11 @@
 "\n"
 "Διαθέσιμες επεκτάσεις:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Διαθέσιμες εντολές:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1925,17 +2450,17 @@
 "Όλες οι εντολές δεν διακρίνουν πεζά από κεφαλαία.\n"
 "Γράψτε '%s <command>' για να πάρετε λεπτομερείς πληροφορίες πάνω στην <εντολή>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Κλείσιμο της εφαρμογής."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Εμφάνιση βοήθειας."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1943,7 +2468,7 @@
 "Για βοήθεια πάνω σε μία εντολή, γράψτε 'help <εντολή>'.\n"
 "Για την πλήρη λίστα εντολών γράψτε 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1954,46 +2479,46 @@
 "Χρησιμοποιήστε '%s' για την λίστα εντολών\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Συντακτικό λάθος!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "Σφάλμα κατά την επεξεργασία της εντολής - δεν έπρεπε να συμβεί ποτέ! Παρακαλείστε να αναφέρετε σφάλμα προγράμματος\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Αυτή η εντολή δεν πρέπει να έχει παραμέτρους."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Αυτή η εντολή πρέπει να έχει παράμετρο."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Άκυρο όρισμα."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Αυτή είναι ημιτελής εντολή."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Για περισσότερη βοήθεια, γράψτε '%s'.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Αυτό είναι %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Αυτό είναι %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -2001,7 +2526,7 @@
 "\n"
 " Δημιουργία πελάτη...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2010,7 +2535,7 @@
 "\n"
 "Όλα μια χαρά, έξοδος %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2023,118 +2548,361 @@
 "είτε στην γραμμή εντολών είτε προσδιορίζοντας κάποιο όταν ζητηθεί.\n"
 "Έξοδος...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Δείξε αυτό το αρχείο βοήθειας."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Υπολογιστής όπου το aMule τρέχει (προεπιλεγμένος: ο τοπικός υπολογιστής)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Η Θύρα του aMule για Εξωτερική σύνδεση. (προεπιλεγμένη: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Κωδικός εξωτερικής σύνδεσης"
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Διάβασε το αρχείο διευθετήσεων"
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Μην στέλνεις μηνύματα στην stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Να είσαι αναλυτικός - δείξε και να μηνύματα αποσφαλμάτωσης"
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Θέσε τις τοπικές ρυθμίσεις"
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Εγγραφή των παραμέτρων της γραμμής εντολών σε αρχείο."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Δημιουργεί ένα αρχείο παραμέτρων βασισμένο στο αρχείο παραμέτρων του aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Τύπωσε την έκδοση του προγράμματος."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Λεπτομέρειες αρχείου"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%% ολοκληρώθηκαν"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Προεπισκόπηση αρχείου"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "ΣΦΑΛΜΑ: Αποτυχία εκτέλεσης του εξωτερικού προγράμματος εμφάνισης πολυμέσων! Εντολή: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ΣΦΑΛΜΑ: Αποτυχία ανοίγματος του ημιτελούς αρχείου '%s'"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Καλώς ήρθατε (Καλώς σας βρήκαμε)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Συνδεδεμένος στον φιλαράκο"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Κατάσταση σύνδεσης:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Δίκτυα"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Πρότυπη θύρα TCP"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Εκτεταμένη θύρα UDP (Kad / καθολική αναζήτηση)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Ενεργοποίηση UPnP για προώθηση της θύρας του δρομολογητή"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Εκκινητήρας"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Ήδη προσπαθείτε να κατεβάσετε το αρχείο %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Αυτόματη ενημέρωση λίστας διακομιστών κατά την εκκίνηση"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Κατάλογος για τα εισερχόμενα"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Επιλογή"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Κατάλογος για τα προσωρινά αρχεία"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Αποτυχία ανάγνωσης του αρχείου της λίστας φίλων 'emfriends.met' "
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Αποτυχία γραψίματος στο αρχείο της λίστας φίλων 'emfriends.met' "
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Φίλοι"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Εμφάνιση &Λεπτομερειών"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Πρόσθεσε έναν φίλο"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Αφαίρεσε έναν φίλο"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Στείλε &Μήνυμα"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Παρουσίαση αρχείων"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Εγκαθίδρυσε φιλική θυρίδα"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Σίγουρα θέλετε να διαγράψετε τον επιλεγμένο φίλο;"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Σίγουρα θέλετε να διαγράψετε τους επιλεγμένους φίλους;"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2142,993 +2910,1315 @@
 "Δεν επιτρέπεται να θέσεις μόνο πανω από μία φιλική θυρίδα. \n"
 " Γι αυτό μόνο μία ανατέθηκε."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Πολλαπλή επιλογή"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Δεν επιτρέπεται να θέσεις μόνο πανω από μία φιλική θυρίδα. \n"
-" Γι αυτό μόνο μία ανατέθηκε."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Αποστολή μηνύματος στον χρήστη"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Μήνυμα προς αποστολή:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Αφαίρεση από του φίλους"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Αποστολή μηνύματος"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Εναλλαγή σε αυτό το αρχείο"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Αίτηση ενός άλλου αρχείου"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "Ανεβάσματα σε αναμονή: %s"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "Εν αναμονή"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "Ανέβασμα"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "None"
 msgstr "Κανείς"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Όχι"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Ναι"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Αποτυχία ανοίγματος %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Μεταφόρτωση..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Αποτυχία λήψης των κοινόχρηστων αρχείων του χρήστη '%s'"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Κατάλογος για τα προσωρινά αρχεία"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Έχει κατεβεί"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Κατεβασμένα (%i)"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Αποτυχία κατεβάσματος της λίστας διακομιστών από το %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "Αποτυχία κατεβάσματος της λίστας διακομιστών από το %s"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Αποτυχία κατεβάσματος της λίστας διακομιστών από το %s"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 #, fuzzy
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Φόρτωση των φίλτρων IP 'ipfilter.dat' και 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Αποτυχία φόρτωσης του αρχείου ipfilter.dat '%s', εκδηλώθηκε άγνωστο σφάλμα."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "Αποτυχία φόρτωσης του αρχείου ipfilter.dat '%s', δεν μπόρεσε να ανοίξει το αρχείο."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "Φορτώθηκε διάστημα IP %u από '%s'."
 msgstr1 "Φορτώθηκαν διαστήματα IP %u από '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u παραμορφωμένη γραμμή απορρίφθηκε."
 msgstr1 "%u παραμορφωμένες γραμμές απορρίφθηκαν."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Εκκίνηση από\n"
-"γνωστούς πελάτες"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Τρέχων"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Μέσο τρεξίματος"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Μέσο περιόδου"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Κόμβοι (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Άκυρη διεύθυνση ip για εκκινητήρα"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Άκυρη θύρα για εκκινητήρα"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Παρακαλώ συμπληρώστε όλα τα απαιτούμενα πεδία"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Μήνυμα"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "Είστε σίγουροι ότι θέλετε να κατεβάσετε ένα καινούριο αρχείο nodes.dat;\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Κάτι τέτοιο θα αφαιρέσει του τρέχοντες κόμβους και θα ξαναξεκινήσει την σύνδεση Kademlia"
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Συνέχιση;"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: O κωδικός αναζήτησης είναι πολύ μικρός"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: Ο κωδικός αναζήτησης υπάρχει ήδη στη λίστα αναζητήσεων: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Ανάγνωση %u επαφής Kad"
 msgstr1 "Ανάγνωση %u επαφών Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Μόνο %d γνωριμία Kad είναι διαθέσιμο. το αρχείο nodes.dat δεν γράφτηκε"
 msgstr1 "Μόνο %d γνωριμίες Kad είναι διαθέσιμες. το αρχείο nodes.dat δεν γράφτηκε"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Γράψιμο %d επαφής Kad"
 msgstr1 "Γράψιμο %d επαφών Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Δίκτυο Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Μέγεθος αρχείου"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Λόγος μοιράσματος"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Ανέβηκε"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Ζητήθηκε:"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Έγινε δεκτό"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Ολοκλήρωση πηγών"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: η λίστα των γνωστών αρχείων είναι φθαρμένη, περιέχει άκυρη επικεφαλίδα."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Εργοστασιακές ρυθμίσεις"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Αλβανικά"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Αραβικά"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Asturian"
+msgstr "Εσθονικά"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Βάσκικα"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Βουλγάρικα"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Καταλανικά"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Κινέζικα (απλοποιημένα)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Κινέζικα (Παραδοσιακά)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Κροατικά"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Τσέχικα"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Δανέζικα"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Ολλανδικά"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Αγγλικά (Ην. Βασίλειο)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Αγγλικά (Ην. Βασίλειο)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Εσθονικά"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Φιλανδικά"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Γαλλικά"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Γαλικιακά"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Γερμανικά"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Ελληνικά"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Εβραϊκά"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Ουγγαρέζικα"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Ιταλικά"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Γιαπωνέζικα"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Κορεάτικα"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Λιθουανικά"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Νορβηγικά"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Πολωνέζικα"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Πορτογαλλικά"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Πορτογαλλικά (Βραζιλίας)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Romanian"
+msgstr "Αλβανικά"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Ρωσικά"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Σλοβένικα"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Ισπανικά"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Σουηδικά"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Τούρκικα"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "Άγνωστη έκδοση"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Κατάλογος για τα εισερχόμενα"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Κατακερματισμός"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Ολοκληρώνεται"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Ολοκληρωμένο"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Σταματημένο"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Εσφαλμένο"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Εν αναμονή"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Πρέπει να προσδιορίσετε ένα μη κενό κωδικό."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Άκυρο κωδικό, δεν είναι κατακερματισμός τύπου MD5!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Αποτυχία σύνδεσης"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Η εξωτερική σύνδεση έκλεισε."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "Η εξωτερική σύνδεση απέτυχε. Κενή ανταπόκριση."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Εξωτερική Σύνδεση: Κακή ανταπόκριση από τον διακομιστή. Η σύνδεση τερματίστηκε."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Εξωτερική Σύνδεση: Κακή ανταπόκριση από τον διακομιστή. Η σύνδεση τερματίστηκε."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Επιτυχία! Έγινε σύνδεση με το aMule"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Επιτυχία! Έγινε σύνδεση"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Εξωτερική Σύνδεση: Η πρόσβαση απορρίφθηκε επειδή"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Handshake failed."
 msgstr "Εξωτερική σύνδεση: Η πρόσβαση απορρίφθηκε"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "Η αυτόματη ανανέωση ξεκίνησε"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "ΣΦΑΛΜΑ: Δεν μπορώ να ακούσω την θύρα TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "ΣΦΑΛΜΑ:"
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ:"
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Καθαρισμός"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Επιλογή όλων"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Απεριόριστο"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Εμφάνιση aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Κρύψιμο aMule"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Συνδεδεμένο"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Συνδεδεμένο"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Συνδεδεμένο στο Kad (με προστατευτικό τοίχο)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "Διεύθυνση διακομιστή:"
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "Διεύθυνση διακομιστή:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Συνδεδεμένο τώρα"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Θύρα TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Θύρα TCP: Δεν είναι έτοιμη"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Θύρα UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Θύρα UDP: Δεν είναι έτοιμη"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Πληροφορίες πελάτη"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Όριο ανεβάσματος"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Όριο κατεβάσματος"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Εμφάνιση aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Αποσύνδεση"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Κρύψιμο aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Σύνδεση"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Απεριόριστο"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Μενού για το Tray του aMule"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Όρια ταχύτητας:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "Όριο Ανεβάσματος: Κανένα"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "Όριο Ανεβάσματος: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "Όριο Κατεβάσματος: Κανένα"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "Όριο Κατεβάσματος: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Ταχύτητα κατεβάσματος: %.1f"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Ταχύτητα ανεβάσματος: %.1f"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Παρατσούκλι: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Δεν επιλέχτηκε παρατσούκλι!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "Ταυτότητα πελάτη:"
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Όνομα διακομιστή:"
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "Διεύθυνση διακομιστή:"
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Δεν είναι συνδεδεμένο"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Συνδεδεμένη Υπογραφή: Ενεργοποιημένη"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Συνδεδεμένη Υπογραφή: Απενεργοποιημένη"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Χρόνος λειτουργίας: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Κοινόχρηστα αρχεία: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Πελάτες στην αναμονή: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Συνολικό Κατέβασμα: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Συνολικό Ανέβασμα: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Σύνδεσμος eD2k:"
-
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Εκτέλεση"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Προσθήκη ενός μαγνητικού συνδέσμου ή συνδέσμου eD2k στον πυρήνα."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Προσθήκη στους φίλους"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Πατήστε εδώ για να προσθέσετε τον σύνδεσμο eD2k στον διαχειριστή κειμένου της λίστας αναμονής κατεβασμάτων."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Τα γεγονότα εμφανίζονται εδώ. Για μια πλήρη λίστα γεγονότων, αναφερθείτε στο αρχείο καταγραφής στην καρτέλα διακομιστών. "
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Φόρτωμα σε εξέλιξη ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Αριθμός χρηστών στον διακομιστή στον οποίο είστε συνδεδεμένος ..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Χρήστες: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Χρήστες συνδεδεμένοι στην τρέχων διακομιστή και μία εκτίμηση του συνολικού αριθμού χρηστών."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Πάνω: 0.0 | Κάτω: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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, firewalled) και τα πράσινα ότι έχετε υψηλή ποιότητα (HighID, ο ιδανικός τύπος σύνδεσης)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Δεν είναι συνδεδεμένο ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Διακομιστές συνδεδεμένοι αυτή τη στιγμή."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Όνομα:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Τύπος"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Τοπικό"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Καθολικό"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Εκτεταμένες παράμετροι"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Διήθηση"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Τύπος αρχείου"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Οτιδήποτε"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Αρχεία"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Ήχος"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "Είδωλα CD"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Φωτογραφίες"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Προγράμματα"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Κείμενα"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Βίντεο"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Κατάληξη"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Ελάχιστο μέγεθος"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Μέγιστο αρχείο"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Διαθεσιμότητα"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Φίλτρο:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Αποτελέσματα φιλτραρίσματος"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Φίλτρο"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Αντιστροφή αποτελεσμάτων"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Απόκρυψη γνωστών τύπων"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Επαναφορά πεδίων"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Εκκίνηση"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Περισσότερα"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Κατάληξη"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Σταμάτημα"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Κατέβασμα"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Κατέβασμα στην κατηγορία"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Αποτέλεσμα Αναζήτησης"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Επαναφορά πεδίων"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Αποτελέσματα"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Καθάρισμα των ολοκληρωμένων κατεβασμάτων"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Φίλτρο:"
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "Ολοκλήρωση πηγών"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Γενικά"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Πλήρες Όνομα :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "Δεν υπάρχει"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Πλήρες Όνομα"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "Αρχείο met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Κατακερματισμός"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Αρχείο met:"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Κατακερματισμός :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Μέγεθος αρχείου :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Κατάσταση ημιτελούς αρχείου:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Τελευταία φορά που εμφανίστηκε ολόκληρο :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Μέγεθος αρχείου"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Μεταφορά"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Βρέθηκαν πηγές :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Κατάσταση ημιτελούς αρχείου"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Τελευταία φορά που εμφανίστηκε ολόκληρο"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Βρέθηκαν πηγές"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Ενεργές πηγές"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Απαρίθμηση τμημάτων αρχείου"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Διαθέσιμα"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Ρυθμός ροής δεδομένων"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Ενεργός χρόνος κατεβάσματος"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Ολοκληρωμένος όγκος"
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Ενεργές πηγές :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Απαρίθμηση τμημάτων αρχείου:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Διαθέσιμα:"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
+msgstr "Έξυπνη διαχείριση φθοράς (Ε.Δ.Φ.):"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Ρυθμός ροής δεδομένων :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Χάθηκε λόγο φθοράς"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Ενεργός χρόνος κατεβάσματος:"
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Μεταφέρθηκαν :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Ολοκληρωμένος όγκος :"
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Κέρδος σε μέγεθος λόγω συμπίεσης"
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
-msgstr "Έξυπνη διαχείριση φθοράς (Ε.Δ.Φ.):"
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Πακέτα που σώθηκαν από την Ε.Δ.Φ."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Κοινοκτημοσύνη"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Αιτήσεις"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Δεκτές αιτήσεις"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Χάθηκε λόγο φθοράς :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Κέρδος σε μέγεθος λόγω συμπίεσης :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Πακέτα που σώθηκαν από την Ε.Δ.Φ. :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Όγκος δεδομένων που μεταφέρθηκαν"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Λόγος συμμετοχής"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Ολοκληρωμένες πηγές"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Κοινόχρηστα αρχεία"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Ανέβασμα: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Πληροφορίες Kad"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Μη αποτιμημένο"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Τίτλος"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Ονόματα αρχείων"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Ανάληψη ελέγχου"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Καθάρισμα"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Εφαρμογή"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Εντάξει"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Αρχείο σχολίων/Αξιολόγησης (το κείμενο θα είναι ορατό σε όλους του χρήστες)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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."
@@ -3136,1137 +4226,1251 @@
 "Για ταινίες μπορείτε να πείτε το μέγεθος, το σενάριο, τη γλωσσα ...\n"
 "και αν είναι ψεύτικη, μπορείτε να το πείτε στους άλλους χρήστες του aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Ποιότητα αρχείου"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Μη αποτιμημένο"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Άκυρο / Φθαρμένο / Πλαστό"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Φτωχή"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Ανεκτή"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Καλή"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Εξαιρετική"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Βαθμολογήστε την αξία του αρχείου ή ενημερώστε τους χρήστες αν το αρχείο είναι έγκυρο ..."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Αποσυνδεδεμένο από το Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Κατεβαίνει, παρακαλώ περιμένετε ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Άγνωστο μέγεθος"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Απαιτούμενες πληροφορίες"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Διεύθυνση IP :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Θύρα :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Θύρα"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Πρόσθετες πληροφορίες"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Όνομα χρήστη :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Τεμάχιο χρήστη :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Τεμάχιο χρήστη"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Ταχύτητα κατεβάσματος"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Τρέχων"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Μέσο τρεξίματος"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Μέσο περιόδου"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Ταχύτητα ανεβάσματος"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Συνδέσεις"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Ενεργά κατεβάσματα"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Ενεργές συνδέσεις (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Ενεργά ανεβάσματα"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Δέντρο στατιστικών"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Όνομα χρήστη:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Τεμάχιο χρήστη:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Λογισμικό πελάτη:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Αριθμός έκδοσης πελάτη:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Διεύθυνση IP:"
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "Αριθμός Χρήστη:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Λογισμικό πελάτη"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Αριθμός έκδοσης πελάτη"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "Αριθμός Χρήστη"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Διεύθυνση διακομιστή"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Διεύθυνση διακομιστή:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Όνομα διακομιστή"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Όνομα διακομιστή:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Συσκότιση"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Συσκότιση:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Συσκότιση πρωτοκόλλου"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Μεταφορές προς τον πελάτη"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Τρέχουσα αίτηση:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Μέσος ρυθμός ανεβάσματος:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Μέσος ρυθμός κατεβάσματος:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Ανέβηκαν (συνεδρία):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Κατέβηκαν (συνεδρία):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Ανέβηκαν (συνολικά):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Κατέβηκαν (συνολικά):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Τρέχουσα αίτηση"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Μέσος ρυθμός ανεβάσματος"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Μέσος ρυθμός κατεβάσματος"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Ανέβηκαν (συνεδρία)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Κατέβηκαν (συνεδρία)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Ανέβηκαν (συνολικά)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Κατέβηκαν (συνολικά)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Σκορ"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Τροποποιητής Ανεβοκατεβάσματος:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Ασφαλής ταυτότητα:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Ασφαλής ταυτότητα"
 
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "Εν αναμονή"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Βαθμολογία αναμονής:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Βαθμολογία αναμονής"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Παρατσούκλι"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - το μουλάρι όλων των πλατφόρμων"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Αυτό είναι το όνομα που οι άλλοι χρήστες θα βλέπουν όταν είναι συνδεδεμένοι με εσάς."
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Γλώσσα:"
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Ο χρόνος πριν εμφανιστεί το επεξηγηματικό κείμενο."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Αυτό ορίζει την γλώσσα που χρησιμοποιείται στο γραφικό περιβάλλον."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Έλεγχος για νέα έκδοση κατά την εκκίνηση"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Αν ενεργοποιηθεί, το aMule θα ελέγχει αν υπάρχει νέα έκδοση κατά την εκκίνηση"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Εκκίνηση σαν ελαχιστοποιημένο"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Αν ενεργοποιηθεί, το aMule θα ξεκινήσει ελαχιστοποιημένο."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Επιβεβαίωση κατά την έξοδο"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Κάνει το aMule να επιβεβαιώνει πριν την έξοδο."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Ενεργοποιεί την εικόνα της μπάρας"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Αυτό ενεργοποιεί/απενεργοποιεί την εικόνα της μπάρας του συστήματος."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Ελαχιστοποίηση στην μπάρα"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Αν ενεργοποιηθεί το aMule θα ελαχιστοποιηθεί στην μπάρα του συστήματος αντί για την μπάρα εφαρμογών"
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Απομνημόνευση αυτών των ρυθμίσεων"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Χρόνος καθυστέρησης επεξηγήσεων:"
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "δεπτερόλεπτα"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Επιλογή περιηγητή ιστοσελίδων"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Εισάγετε το όνομα το περιηγητή ιστολελίδων. Αφήστε αυτό το πεδίο κενό για τον προεπιλεγμένο περιηγητή."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Επιλογή"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Αν είναι δυνατόν, άνοιξε τη σελίδα σε καινούρια καρτέλα"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Άνοιξε την ιστοσελίδα σε καινούρια καρτέλα αντί σε καινούριο παράθυρο αν αυτό είναι εφικτό"
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Πρόγραμμα προβολής βίντεο"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Ευρυζωνικά όρια"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Ανέβασμα"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Ανάθεση θυρίδας"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Θύρες"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Πρότυπη θύρα TCP"
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Αυτή είναι η βασική θύρα eD2k και δεν μπορεί να απενεργοποιηθεί."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Θύρα UDP για αιτήσεις εξυπηρετητή (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Εκτεταμένη θύρα UDP (Kad / καθολική αναζήτηση)"
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Αυτή η θύρα UDP χρησιμοποιήται για εκτεταμένες αιτήσεις eD2k και για το δίκτυο Kad"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Ενεργοποίηση UPnP για προώθηση της θύρας του δρομολογητή"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "Θύρα UPnP TCP (Προαιρετική):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Συνέδεσε την τοπική διεύθυνση στην διεύθυνση (κενό για όλες):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Συνέδεσε την τοπική διεύθυνση στην διεύθυνση (κενό για όλες):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Μέγιστος αριθμός πηγών ανά εισερχόμενο αρχείο:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Μέγιστος αριθμός παράλληλων συνδέσεων:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Αυτόματη σύνδεση κατά την εκκίνηση"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Επανασύνδεση σε περίπτωση διακοπής"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Αφαίρεση του νεκρού διακομιστή ύστερα από"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "προσπάθειες"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Αυτόματη ενημέρωση λίστας διακομιστών κατά την εκκίνηση"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Λίστα"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Ενημέρωση της λίστας διακομιστών κατά τη σύνδεση σε διακομιστή"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Ενημέρωση της λίστας διακομιστών κατά τη σύνδεση σε πελάτη"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Χρήση συστήματος προτεραιότητα"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Χρήση έξυπνου ελέγχου LowID κατά τη σύνδεση"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Ασφαλής σύνδεση"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Αυτόματη σύνδεση μόνο με τους διακομιστές της στατικής λίστας"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Υψηλή προτεραιότητα στους διακομιστές που προστέθηκαν με το χέρι"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Έξυπνη διαχείριση φθοράς (Ε.Δ.Φ.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Ενεργοποιήση"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr "Προχωρημένη Ε.Δ.Φ. εμπιστεύεται κάθε κατακερματισμό (δεν συνιστάται)"
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Προσθήκη αρχείων προς κατέβασμα κατά τη διάρκεια παύσης"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Προσθήκη αρχείων προς κατέβασμα με αυτόματη προτεραιότητα"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Προσπάθησε να κατεβάσεις πρώτα τα αρχικά και τελικά κομμάτια"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Εκκίνηση του επόμενου σταματημένου αρχείου όταν ένα αρχείο ολοκληρωθεί"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Από την ίδια κατηγορία"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Δέσμευση χώρου στο δίσκο για καινούρια αρχεία"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Δεσμεύει χώρο στο δίσκο για καινούρια αρχεία και έτσι μειώνει τον κατακερματισμό"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Σταμάτημα του κατεβάσματος όταν ο ελεύθερος δίσκος φτάσει τα"
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr "Επιλέξτε αυτό αν θέλετε το aMule να ελέγξει τον χώρο στον δίσκο σας"
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Γράψτε εδώ των ελάχιστο επιθυμητό χώρο στον δίσκο."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Αποθήκευση 10 πηγών σε σπάνια αρχεία (<20 πηγές)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Ανεβασμένα"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Προσθήκη νέων κοινόχρηστων αρχείων με αυτόματη προτεραιότητα"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Κατάλογος για τα εισερχόμενα"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Έξυπνη διαχείριση φθοράς (Ε.Δ.Φ.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Ενεργοποιήση"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Προχωρημένη Ε.Δ.Φ. εμπιστεύεται κάθε κατακερματισμό (δεν συνιστάται)"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Κοινόχρηστα αρχεία"
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Κατάλογος για τα προσωρινά αρχεία"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Κοινόχρηστα αρχεία"
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Αφαίρεση"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Δεξί κλικ στην εικόνα του καταλόγου για να γίνουν κοινόχρηστοι οι υποκατάλογοι)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Κάνε τα κρυφά αρχεία κοινόχρηστα"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Απομακρυσμένος διακομιστής"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Τοπικός διακομιστής"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Γραφικές Παραστάσεις"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Χρόνος καθυστέρηση ενημέρωσης : 5 δευτερόλεπτα"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Χρόνος μέσου γραφήματος: 100 λεπτά"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Κλίμακα διαγράμματος συνδέσεων: 100"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Κλιματα του γραφήματος εισερχομένων:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Κλιμακα του γραφήματος εξερχομένων"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Χρώματα:"
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Υπόβαθρο"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Πλέγμα"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Κατέβασμα του τρέχοντος"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Μέσο τρέξιμο κατεβάσματος"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Μέσο συνεδρίας κατεβάσματος"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Ανέβασμα του τρέχοντος"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Μέσο τρέξιμο ανεβάσματος"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Μέσο συνεδρίας ανεβάσματος"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Ενεργές συνδέσεις"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Εικόνα για την μπάρα ταχείας πρόσβασης του Systray"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Σύνδεσμοι-Kad παρόντες"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Σύνδεσμοι-Kad τρέχοντες"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Σύνδεσμοι-Kad συνεδρία"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Επέλεξε"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Δέντρο"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Αριθμός των εμφανιζόμενων εκδόσεων πελάτη (0=απεριόριστος)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! Προειδοποίηση !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Μέγιστος αρ. νέων συνδέσεων /5 δευτερόλεπτα"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "Περίοδος ενημέρωσης του FTP σε λεπτά"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "Περίοδος ενημέρωσης του FTP σε λεπτά"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Χώρος προσωρινής αποθήκευσης αρχείου: 240000 bytes"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Λίστα αναμονής ανεβάσματος: 5000 πελάτες"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: Απενεργοποίηση"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Θέμα:"
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Εμφάνιση \"Γρήγορου διαχειριστή συνδέσμων eD2k\" σε όλα τα παράθυρα."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Εμφάνιση εκτεταμένων πληροφοριών στην καρτέλα κατηγοριών"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "Εμφάνιση των ταχυτήτων μεταφοράς στον τίτλο"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Εμφάνιση των ταχυτήτων μεταφοράς στον τίτλο"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Πριν απο το όνομα της εφαρμογής"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Μετά το όνομα της εφαρμογής"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Εμφάνιση επιβάρυνσης στο εύρος ζώνης"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Κατακόρυφος προσανατολισμός της γραμμής εντολών"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Ουρά εισερχομένων αρχείων"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Εμφάνιση ποσοστού προόδου"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Εμφάνιση μπάρας προόδου"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Επίπεδη"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Στρογγυλή"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Αυτόματη ταξινόμηση αρχείων (υψηλή απαίτηση σε υπολογική ισχύη)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "Το aMule θα ταξινομήσει τις στήλες τις λίστας κατεβασμάτων αυτόματα."
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Παράμετροι εξωτερικών συνδέσεων"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Να γίνονται αποδεκτές οι εξωτερικές συνδέσεις"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "Η διεύθυνση του εισακούοντος περιβάλλοντος:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "Εισάγετε μία έγκυρη διεύθυνση με φόρμα a.b.c.d για σύνδεση με το περιβάλλον EC. Άδειο πεδίου ή 0.0.0.0 συμβολίζει όλα τα περιβάλλοντα."
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Θύρα TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Ενεργοποίηση της προώθησης της θύρας UPnP στην θύρα EC"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Κωδικός"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Παράμετροι διακομιστή ιστού"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "Θύρα TCP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Έλεγχος κωδικού\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Έλεγχος κωδικού\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Να απαγορεύεται η πρόσβαση σε επισκέπτες"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Κωδικός επισκέπτη για τον διακομιστή ιστού"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Παράμετροι διακομιστή ιστού"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Έναρξη του εξυπηρετητή ιστού κατά την εκκίνηση"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Πρότυπη σελίδα"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Κωδικός πλήρων δικαιωμάτων"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Ενεργοποίηση χρήστη μειωμένων δικαιωμάτων"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Κωδικός μειωμένων δικαιωμάτων"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Ενεργοποίηση της προώθησης της θύρας του εξηπηρετητή ιστού στη θύρα UPnP"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Θύρα UPnP TCP του εξυπηρετητή (Προαιρετική)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Χρόνος ανανέωσης σελίδας (σε δευτερόλεπτα)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Ενεργοποίηση συμπίεσης Gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Εργοστασιακές ρυθμίσεις"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Εντάξει"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Κλικ εδώ για εφαρμογή των αλλαγών που έγιναν στις προτιμήσεις."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Επαναφορά κάθε αλλαγής που έγινε στις προτιμήσεις."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Τίτλος:"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Σχόλιο:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Κατάλογος εισερχομένων :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Αλλαγή προτεραιότητας για τα νέα προσδιορισμένα αρχεία :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Κατάλογος εισερχομένων"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Αλλαγή προτεραιότητας για τα νέα προσδιορισμένα αρχεία"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "Να μην αλλάξει"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Επιλογή χρώματος για τη συγκεκριμένη κατηγορία (τρέχουσα επιλογή) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Καθαρισμός"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Επιλογή χρώματος για τη συγκεκριμένη κατηγορία (τρέχουσα επιλογή)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Πατήστε αυτό το κουμπί για το καθάρισμα του αρχείου καταγραφής."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Πατήστε αυτό το αρχείο για να ανανεώσετε την λίστα διακομιστών από την URL ..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Λίστα διακομιστών"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 και πατήστε το κουμπί στα αριστερά για να ανανεώσετε τη λίστα με τους γνωστούς διακομιστές"
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Προσθήκη διακομιστή: Όνομα"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Γράψτε το όνομα του νέου διακομιστή εδώ"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "Διεύθυνση:Θύρα"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Γράψτε την θύρα του διακομιστή εδώ."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Βάλτε τον διακομιστή με το χέρι (γεμίστε πρώτα τα πεδία στα αριστερά) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Αρχείο καταγραφής aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Πληροφορίες διακομιστή"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Πληροφορίες ED2K"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Πληροφορίες Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Πατήστε το κουμπί για να ανανεώσετε την λίστα των κόμβων από την URL ..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Κόμβοι (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Βάλτε εδώ την url ενός αρχείου nodes.dat και πατήστε το κουμπί στα αριστερά για να ανανεώσετε την λίστα των γνωστών κόμβων."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Στατιστικές κόμβων"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Εκκινητήρας"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Καινούριος κόμβος"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Θύρα:"
-
-#: src/muuli_wdr.cpp:2327
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Bootstrap from known clients"
+msgid "Bootstrap from node: IP"
 msgstr ""
 "Εκκίνηση από\n"
 "γνωστούς πελάτες"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Αποσυνδεδεμένο Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Γράψτε την IP του διακομιστή εδώ, σε μορφή x.x.x.x"
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Χρήση Ασφαλούς Ταυτοποίησης χρήστη"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr "Ενδείκνυται να ενεργοποιήσετε αυτήν την προτίμηση. Δεν θα λάβετε πίστωση αν το SUI δεν είναι ενεργοποιημένο."
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Συσκότιση πρωτοκόλλου"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Υποστήριξη συσκότισης πρωτοκόλλου"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Αυτή η επιλογή ενεργοποίησε την συσκότιση πρωτοκόλλου και κάνει το aMule να δέχεται συσκοτισμένες συνδέσεις από άλλους πελάτες"
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Χρήση συσκότισης για εξωτερικές συνδέσεις"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Αυτή η επιλογή κάνει το aMule να χρησιμοποιεί συσκότιση πρωτοκόλλου όταν συνδέεται σε άλλους πελάτες/διακομιστές."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Να γίνονται δεκτές μόνο συσκοτισμένες συνδέσεις"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Οι πάντες"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Κανείς"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Ποίος μπορεί να δεί τα κοινόχρηστα αρχεία μου:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr "Επιλέξτε ποίος μπορεί να ζητήσει να δει τη λίστα με τα κοινόχρηστα αρχεία σας."
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Φίλτρο IP"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Φιλτράρισμα πελατών"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Ενεργοποίηση φίλτρου του IP των πελατών όπως ορίζεται στο ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Φιλτράρισμα διακομιστών"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Ενεργοποίηση φίλτρου του IP των διακομιστών όπως ορίζεται στο ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Επαναφόρτωση λίστας"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Επαναφόρτωση για φιλτράρισμα της λίστας των IP από το ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Ανανέωσε τώρα"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Αυτόματη ανανέωση του ipfilter κατά την εκκίνηση"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Επίπεδο φιλτραρίσματος:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Πάντα φίλτραρε τις IP του τοπικού δικτύου"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Παρανοϊκή διαχείριση των αταίριαστων διευθύνσεων IP"
 
-#: src/muuli_wdr.cpp:2438
-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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Χρήση του ipfilter.dat όλου του συστήματος αν αυτό υπάρχει"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Αν δεν βρεθεί τοπικό ipfilter.dat, να γίνει επιτρεπτή η χρήση του αρχείου ipfilter (φίλτρο διευθύνσεων) όλου του συστήματος."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Ενεργοποίηση συνδεδεμένων υπογραφών"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Συχνότητα ανανέωσης (δευτερόλεπτα):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Αλλαγή της συχνότητας (σε δευτερόλεπτα) για την ενημέρωση Συνδεδεμένων υπογραφών."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Αποθύκευση του αρχείου συνδεδεμένων υπογραφών σε:"
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "Κλικ εδώ για την επιλογή του καταλόγου που περιέχει τα αρχεία Συνδεδεμένων Υπογραφών."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Ρυθμός ροής δεδομένων :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Αρ. πηγών"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4274,11 +5478,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4288,854 +5492,769 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Μεταφόρτωση"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Αυτόματη ανανέωση του ipfilter κατά την εκκίνηση"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Φιλτράρισμα εισερχομένων μηνυμάτων (εκτός από την τρέχουσα συνομιλία):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Διήθηση όλων των μηνυμάτων"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Διήθηση των μηνυμάτων από μέλη εκτός της λίστας φίλων"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Διήθηση μηνυμάτων από άγνωστους πελάτες"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Διήθηση των μηνυμάτων που περιέχουν (χρήση ',' ως διαχωριστικού):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "προσθήκη σε αυτό το σημείο των λέξεων που το aMule πρέπει να φιλτράρει και μπλοκάρισμα μηνυμάτων που το περιέχουν"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Εμφάνιση των ληφθέντων μηνυμάτων στο αρχείο καταγραφής"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Σχόλια"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Φιλτράρισμα σχολίων που περιέχουν (χρησιμοποίηση ',' ως διαχωριστή):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Ενεργοποίηση πιστοποίησης"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Ενεργοποίηση/Απενεργοποίηση πιστοποίησης ονόματος χρήστη/κωδικού"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Όνομα χρήστη:"
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Το όνομα χρήστη για τη σύνδεση με τον μεσολαβητή"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Κωδικός:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Ο κωδικός που χρειάζεται για τη σύνδεση με τον μεσολαβητή"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Ενεργοποίηση διακομιστή μεσολάβησης"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Ενεργοποίηση/Απενεργοποίηση υποστήριξης διακομιστή μεσολάβησης"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
 msgstr "Τύπος διαμεσολάβησης"
 
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Διεύθυνση διακομιστή μεσολάβησης:"
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Διεύθυνση διακομιστή μεσολάβησης"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Όνομα του διακομιστή μεσολάβησης"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Θύρα διακομιστή μεσολάβησης:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Θύρα διακομιστή μεσολάβησης"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Η θύρα διακομιστή μεσολάβησης"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Ενεργοποίηση πιστοποίησης"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Ενεργοποίηση/Απενεργοποίηση πιστοποίησης ονόματος χρήστη/κωδικού"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Το όνομα χρήστη για τη σύνδεση με τον μεσολαβητή"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Ο κωδικός που χρειάζεται για τη σύνδεση με τον μεσολαβητή"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Σύνδεση με:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Σύνδεση σε απομακρυσμένο amule"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Όνομα χρήστη"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Απομνημόνευση αυτών των ρυθμίσεων"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Η εξωτερική σύνδεση έκλεισε."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Χρήση συμπίεσης τύπου gzip"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Ενεργοποίηση λεπτομερούς καταγραφής για έλεγχο σφαλμάτων"
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&Άνοιγμα αρχείου"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Κατηγορίες μηνυμάτων:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Αναμονή..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Προσθήκη εισακτέων"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Επαναπροσπάθεια των επιλεγμένων"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Αφαίρεση των επιλεγμένων"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Τύποι συμβάντων"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "Ενεργά ανεβάσματα :"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Δείξε τους πελάτες"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "Κρύψιμο των κοινόχρηστων αρχείων "
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "Επιλογή φίλτρου εμφάνισης"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "Ενεργά ανεβάσματα"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "Δείξε τους πελάτες"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "Επαναφόρτωση λίστας"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Επαναφόρτωση των κοινόχρηστων αρχείων"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Αποστολή του προσδιορισμένου μηνύματος."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Κλείσιμο της συνομιλίας."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Σύνδεση σε κάθε διακομιστή ή/και Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Ακύρωση"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Κοινόχρηστα αρχεία"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Αποσύνδεση"
 
-#: src/OScopeCtrl.cpp:242
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Σύνδεση"
+
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Απενεργοποιημένο %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
 msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/δευτερόλεπτο"
 msgstr1 "bytes/δευτερόλεπτο"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "δευτερόλεπτα"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "λεπτά"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "ώρες"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Μέρες"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "μέρες"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "όλα"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "όλα τα άλλα"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Ημιτελές"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Σταματημένο"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Βίντεο"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Αρχείο"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Κείμενο "
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Ενεργό"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Αυτή η εντολή δεν πρέπει να έχει παραμέτρους."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Αυτή η εντολή δεν πρέπει να έχει παραμέτρους."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Αυτή η εντολή δεν πρέπει να έχει παραμέτρους."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Αυτή η εντολή δεν πρέπει να έχει παραμέτρους."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Γράψτε την θύρα του διακομιστή εδώ."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Γράψτε την θύρα του διακομιστή εδώ."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Γράψτε την θύρα του διακομιστή εδώ."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Εισαγωγή %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Ανάγνωση του προσωρινού καταλόγου"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Ανάκτηση στοιχειωδών πληροφοριών από το αρχείο πληροφοριών κατεβάσματος"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Δημιουργία αρχείου προορισμού"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Φόρτωση δεδομένων από το παλιό αρχείο κατεβάσματος (%u από %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "Αποθήκευση του τεμαχίου δεδομένων σε ένα καινούριο μοναδικό αρχείο κατεβάσματος (%u από %u)"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Διαδικασία ανάκτησης πηγαίων πληροφοριών αρχείου κατεβασμάτων"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Προσθήκη κατεβάσματος και αποθήκευση του καινούριου ημιτελούς αρχείου"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Εισαγωγή ημιτελών αρχείων"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Κατάσταση"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Αρχείο κατακερματισμού"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Δίσκος: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "Παρακαλώ διαλέξτε έναν κατάλογο για αναζήτηση προσωρινών κατεβασμάτων! (θα συμπεριληφθούν και οι υποκατάλογοι)"
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Θέλετε να σβηστούν τα πηγαία αρχεία των επιτυχών εισαγόμενων κατεβασμάτων;"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Αφαίρεση πηγών;"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "ΣΦΑΛΜΑ: Αποτυχία δημιουργίας ημιτελούς αρχείου"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Προσπάθεια φόρτωσης του αντιγράφου ασφαλείας του αρχείου met από το %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "ΣΦΑΛΜΑ: Αποτυχία ανοίγματος του αρχείου part.met: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr "ΣΦΑΛΜΑ: το αρχείο έχει μηδενικό μέγεθος: %s ==> %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "ΣΦΑΛΜΑ: άκυρη έκδοση του αρχείου part.met: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Σφάλμα: το %s (%s) είναι φθαρμένο (εσφαλμένη απαρίθμηση ετικέτας), δεν είναι δυνατή η φόρτωση του αρχείου."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "ΣΦΑΛΜΑ: %s (%s) είναι φθαρμένο (εσφαλμένη απαρρίθμηση ετικέτας), δεν είναι δύνατο το φόρτωμα του αρχείου."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Προσπάθεια ανάκτηση πληροφοριών αρχείου..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "Ανάκτηση αρχείου χωρίς όνομα -  θα γίνει προσπάθεια ανάκτησης ως RecoveredFile.dat"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Ανακτήθηκαν όλες οι διαθέσιμες πληροφορίες αρχείου :D - Τώρα προσπαθώ να τις χρησιμοποιήσω..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Δεν είναι δυνατή η ανάκτηση πληροφοριών αρχείου :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Αποτυχία ανοίγματος %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %s μπορεί να είναι φθαρμένο (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "ΣΦΑΛΜΑ κατά το αποθήκευση του ημιτελούς αρχείου: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 #, fuzzy
 msgid "IO failure while saving partfile: "
 msgstr "ΣΦΑΛΜΑ κατά το αποθήκευση του ημιτελούς αρχείου: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "Απέτυχε να σωθεί το αρχείο part.met.seeds για %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Σώθηκε %i σπόρος πηγής για το ημιτελές αρχείο: %s (%s) "
 msgstr1 "Σώθηκαν %i σπόροι πηγής για το ημιτελές αρχείο: %s (%s) "
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Σώθηκε %i σπόρος πηγής για το ημιτελές αρχείο: %s (%s) "
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου σπόρου του ημιτελούς αρχείου (%s - %s): %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Βρέθηκε φθαρμένο τμήμα (%d) στο %d μέρος αρχείου %s -  FileResultHash |%s| FileHash |%s|"
 msgstr1 "Βρέθηκε φθαρμένο τμήμα (%d) στα %d μέρη αρχείου %s -  FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Βρέθηκε ολοκληρωμένο μέρος (%i) στο %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Τελείωσε ο επανακατακερματισμός του %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Απρόσμενο σφάλμα κατά την ολοκλήρωση του %s. Το αρχεί έπαψε"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Ολοκλήρωση του κατεβάσματος: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Ολοκλήρωση του κατεβάσματος: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Σβήσιμο αρχείου: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν είναι δυνατός ο κατακερματισμός του κατεβασμένου τμήματος - του σύνολο κατακερματισμού για το '%s' είναι ημιτελές"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "ΣΦΑΛΜΑ: Δεν είναι δυνατός ο κατακερματισμός του κατεβασμένου τμήματος - του σύνολο κατακερματισμού για το '%s' είναι ημιτελές. Αυτό δεν πρέπει να ξανασυμβεί ποτέ"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Μη αρκετός χώρος στο δίσκο! Παύση αρχείου: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Το κατεβασμένο τμήμα υπ. αρ. %i είναι φθαρμένο στο αρχείο: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr "ICH: Ανακτήθηκε φθαρμένο τεμάχιο %i για το %s -> Σωσμένα bytes: %s"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Κατανέμει"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Ανεπαρκής χώρος στο δίσκο"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Έχει κατεβεί"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ΣΦΑΛΜΑ: Αποτυχία ανοίγματος του ημιτελούς αρχείου '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Εργοστασιακές ρυθμίσεις"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Αλβανικά"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Αραβικά"
-
-#: src/Preferences.cpp:640
-#, fuzzy
-msgid "Asturian"
-msgstr "Εσθονικά"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Βάσκικα"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Βουλγάρικα"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Καταλανικά"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Κινέζικα (απλοποιημένα)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Κινέζικα (Παραδοσιακά)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Κροατικά"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Τσέχικα"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Δανέζικα"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Ολλανδικά"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Αγγλικά (Ην. Βασίλειο)"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Αγγλικά (Ην. Βασίλειο)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Εσθονικά"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Φιλανδικά"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Γαλλικά"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Γαλικιακά"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Γερμανικά"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Ελληνικά"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Εβραϊκά"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Ουγγαρέζικα"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Ιταλικά"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Ιταλικά (Ελβετίας)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Γιαπωνέζικα"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Κορεάτικα"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Λιθουανικά"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Νορβηγικά"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Πολωνέζικα"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Πορτογαλλικά"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Πορτογαλλικά (Βραζιλίας)"
-
-#: src/Preferences.cpp:669
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "Romanian"
-msgstr "Αλβανικά"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Ρωσικά"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Σλοβένικα"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Ισπανικά"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Σουηδικά"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Τούρκικα"
+msgid "Extended source exchange"
+msgstr "Ανταλλαγή πηγών"
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:779
-#, fuzzy
-msgid "Change Language"
-msgstr "Γλώσσα"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Δεν είναι διαθέσιμο"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "Δεν υπάρχουν επιλογές"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Θα χρησιμοποιηθεί η στάνταρ θύρα (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Σύνδεση"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Κατάλογοι Αρχείων"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Διακομιστές"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Αρχεία"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Ασφάλεια"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Περιβάλλον"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Διακομιστής διαμεσολάβησης"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Φίλτρα"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Τηλεχειρισμός"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Διασυνδεδεμένη υπογραφή"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Προχωρημένες"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Γεγονότα"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Έλεγχος σφαλμάτων προγράμματος"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5150,26 +6269,43 @@
 "Το aMule θα τρέχει μια χαρά χωρίς την αλλαγή καμιάς από αυτές\n"
 " τις ρυθμίσεις."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Ο τύπος του διακομιστή μεσολάβησης στον οποίον συνδέεστε"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Έλεγχος κωδικού\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5177,35 +6313,49 @@
 "το aMule πρέπει να επανεκινηθεί για να ενεργοποιηθούν αυτές οι αλλαγές: \n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- Άλλαξε η θύρα TCP.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- Άλλαξε η θύρα UDP.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "Η εξωτερική σύνδεση έκλεισε."
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "Η εξωτερική σύνδεση έκλεισε."
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "Νέα εξωτερική σύνδεση έγινε δεκτή"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "Η εξωτερική σύνδεση έκλεισε."
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Συσκότιση πρωτοκόλλου"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Η γλώσσα άλλαξε.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5213,28 +6363,34 @@
 "Η λίστα αυτόματης ενημέρωσης διακομιστών είναι κενή.\n"
 "Θα απενεργοποιηθεί η επιλογή: 'Αυτόματη ενημέρωση λίστας διακομιστών κατά την εκκίνηση' "
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
-"Έχετε ενεργοποιήσει τις εξωτερικές συνδέσεις αλλά δεν έχετε προσδιορίσει κωδικό.\n"
-"Οι εξωτερικές συνδέσεις δεν μπορούν να ενεργοποιηθούν μέχρι να προσδιοριστεί ένας έγκυρος κωδικός."
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Η γλώσσα άλλαξε.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Ο προσωρινός κατάλογος άλλαξε.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- ED2K network enabled.\n"
 msgstr "Όλα τα δίκτυα είναι απενεργοποιημένα."
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Άκυρη έκδοση πρωτοκόλλου."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5242,7 +6398,7 @@
 "Και το δίκτυο eD2k και το Kad είναι απενεργοποιημένα.\n"
 "Δεν θα μπορέσετε να συνδεθείτε μέχρι να ενεργοποιήσετε τουλάχιστον ένα από αυτα."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5250,7 +6406,7 @@
 "Το δίκτυο Kad δεν θα ξεκινήσει αν η θύρα UDP είναι απενεργοποιημένη.\n"
 "Ενεργοποιήστε τη θύρα UDP ή απενεργοποιήστε το Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5260,20 +6416,69 @@
 "Τώρα πρέπει να επανεκινήσετε το aMule.\n"
 "Διαφορετικά μην διαμαρτυρηθείτε αν συμβεί κάτι κακό.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Η αυτόματη ανανέωση ξεκίνησε"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Κατάλογος για τα προσωρινά αρχεία"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Νέα εξωτερική σύνδεση έγινε δεκτή"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5283,41 +6488,66 @@
 "Παρακαλώ βάλτε τουλάχιστον μία URL που να δείχνει σε ένα έγκυρο αρχείο sever.met.\n"
 "Πατήστε το διπλανό κουμπί \"List\" για να βάλετε ένα URL."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Προσωρινά αρχεία"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Εισερχόμενα αρχεία"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Συνδεδεμένες υπογραφές"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Επιλέξτε κατάλογο για %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Βρέθηκε %i γνωστό κοινόχρηστο αρχείο"
+msgstr1 "Βρέθηκαν %i γνωστά κοινόχρηστα αρχεία"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Αναζήτηση του προγράμματος για βίντεο"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Επιλογή περιηγητή"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Επιλογή περιηγητή"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Εκτελέσιμο%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Εργοστασιακές ρυθμίσεις"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Επεξεργασία λίστας διακομιστών"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5325,1212 +6555,1475 @@
 "Βάλτε εδώ τη διεύθυνση για το κατέβασμα των αρχείων server.met. \n"
 "Μία διεύθυνση σε κάθε γραμμή"
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Ολοκλήρωση πηγών"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Κατάσταση:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Κατάσταση:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Καθυστέρηση ενημέρωσης: %d δευτερόλεπτο"
 msgstr1 "Καθυστέρηση ενημέρωσης: %d δευτερόλεπτα"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Χρόνος για μέσο γράφημα: %d λεπτό"
 msgstr1 "Χρόνος για μέσο γράφημα: %d λεπτά"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Κλίμακα γραφήματος συνδέσεων: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Μέγεθος χώρου ενδιάμεσης αποθήκευση αρχείου: %d byte"
 msgstr1 "Μέγεθος χώρου ενδιάμεσης αποθήκευση αρχείου: %d byteς"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Μέγεθος λίστας αναμονής αποστελλόμενων: %d πελάτης"
 msgstr1 "Μέγεθος λίστας αναμονής ανεβασμάτων: %d πελάτες"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: %d λεπτό"
 msgstr1 "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: %d λεπτά"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: Απενεργοποιημένο"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "disabled"
 msgstr "απενεργοποίηση"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Execute command on '%s' event"
 msgstr "Εκτέλεση εντολής κατά το γεγονός `%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Ενεργοποίηση εκτέλεσης εντολών στον πυρήνα"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Εντολή πυρήνα:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Ενεργοποίηση εκτέλεσης εντολών στο γραφικό περιβάλλον"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Εντολή γραφικού περιβάλλοντος:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Οι παρακάτω μεταβλητές θα αντικατασταθούν:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Κοινόχρηστα αρχεία"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Επαναφόρτωση των κοινόχρηστων αρχείων"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Κοινόχρηστα αρχεία"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Επαναφορτώνει τη λίστα κοινοχρήστων αρχείων."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Κοινόχρηστα αρχεία"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Επιλέξτε κατάλογο για %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Απομνημόνευση αυτών των ρυθμίσεων"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Προειδοποίηση ψαξίματος"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Αναζητήσεις"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Σε εξέλιξη"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr "Το ελάχιστο μέγεθος πρέπει να είναι μικρότερο από το μέγιστο. Το μέγιστο μέγεθος θα αγνοηθεί."
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Προειδοποίηση ψαξίματος"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Κύρια"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Δεν μπορεί να γίνει αναζήτηση στο Kad αν το Kad δεν τρέχει"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: η λίστα των γνωστών αρχείων είναι φθαρμένη, περιέχει άκυρη επικεφαλίδα."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr "Δεν μπορεί να γίνει αναζήτηση στο eD2k αν το eD2k δεν είναι συνδεδεμένο"
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Άγνωστο σφάλμα όταν έγινε απόπειρα αναζήτησης στο Kad:"
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "Τιμή ταυτότητας αρχείου"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Μη αποτιμημένο"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Κατέβασμα στην κατηγορία"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "Τιμή ταυτότητας αρχείου"
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Προσθήκη προαιρετικών URL για αυτό το αρχείο"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Κλείσιμο όλων των καρτελών"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Αναζήτηση παρόμοιων αρχείων (στο eD2k, τοπικός διακομιστής)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Σημείωση αρχείου ως γνωστού"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Αντιγραφή συνδέσμων eD2k στο πρόχειρο"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Είστε συνδεδεμένος στον διακομιστή που προσπαθείτε να σβήσετε. Παρακαλείστε να αποσυνδεθείτε πρώτα"
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "Ακύρωση"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Τρέχει"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Φιλανδικά"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "Search progress not available"
+msgstr "Εμφάνιση ποσοστού προόδου"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Αποτυχία σύνδεσης σε όλους τους συσκοτισμένους διακομιστές της λίστας. Θα γίνει άλλο ένα πέρασμα χωρίς συσκότιση."
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "Αποτυχία σύνδεσης σε όλους τους διακομιστές της λίστας. Θα γίνει άλλο ένα πέρασμα."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "Αποτυχία σύνδεσης σε όλους τους διακομιστές της λίστας. Θα γίνει άλλο ένα πέρασμα."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Αυτόματη σύνδεση στον διακομιστή θα επιχειρηθεί ξανά σε %d δευτερόλεπτο"
+msgstr1 "Αυτόματη σύνδεση στον διακομιστή θα επιχειρηθεί ξανά σε %d δευτερόλεπτα"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "Το δίκτυο eD2k απενεργοποιήθηκε στις επιλογές, δεν γίνεται σύνδεση."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr "Δεν βρέθηκαν διακομιστές στη λίστα διακομιστών στους οποίους να γίνει σύνδεση"
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Συνδεδεμένο στο %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Σύνδεση παγιώθηκε στο: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Μοιραίο Σφάλμα κατά την προσπάθεια σύνδεσης. Η σύνδεση στο διαδίκτυο πρέπει να έχει διακοπεί"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Χάθηκε η σύνδεση στο %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) φαίνεται να είναι νεκρό"
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) φαίνεται να είναι γεμάτο."
 
-#: 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"
-msgstr0 "Αυτόματη σύνδεση στον διακομιστή θα επιχειρηθεί ξανά σε %d δευτερόλεπτο"
-msgstr1 "Αυτόματη σύνδεση στον διακομιστή θα επιχειρηθεί ξανά σε %d δευτερόλεπτα"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Η σύνδεση χάθηκε"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Η σύνδεση στο %s (%s:%i) απέτυχε."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "ΣΦΑΛΜΑ: Η υποδοχή κρίθηκε άκυρη κατά τον έλεγχο χρονικού ορίου"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Η απόπειρα σύνδεσης στο %s (%s:%i) ξεπέρασε το χρονικό όριο."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Φόρτωση του αρχείου διακομιστών: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Το αρχείο server.met δεν βρέθηκε"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Σφάλμα φόρτωσης του αρχείου server.met '%s', βρέθηκε άγνωστη μορφοποίηση."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Αποτυχία ανοίγματος του αρχείου server.met"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Το αρχείο server.met είναι φθαρμένο. βρέθηκε λανθασμένη ετικέτα έκδοσης: 0x%x, μεγεθος %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "βρέθηκε %i διακομιστής στο server.met"
 msgstr1 "βρέθηκαν %i διακομιστές στο server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "Προστέθηκε %d διακομιστής"
 msgstr1 "Προστέθηκαν %d διακομιστές"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "Σφάλμα εισόδου εξόδου κατά την ανάγνωση του αρχείου known.met: %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr "Ο διακομιστής δεν προστέθηκε: %s:%d δεν προσδιορίζει έγκυρη θύρα."
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr "Ο διακομιστής δεν προστέθηκε: Το IP του %s:%d είναι φιλτραρισμένο ή άκυρο."
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr "Ο διακομιστής δεν προστέθηκε: Διακομιστής με το ίδιο IP:Θύρα %s:%d βρέθηκε στη λίστα."
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr "Ο διακομιστής προστέθηκε: Διακομιστής στην %s:%d με όνομα '%s'."
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Είστε συνδεδεμένος στον διακομιστή που προσπαθείτε να σβήσετε. Παρακαλείστε να αποσυνδεθείτε πρώτα"
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Αποτυχημένη προσπάθεια να ανοίξει '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Αποτυχία σβησίματος του server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Σφάλμα εισόδου εξόδου κατά την ανάγνωση του αρχείου known.met: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Άκυρη URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Ολοκληρώθηκε το κατέβασμα της λίστας διακομιστών από το %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Δεν βρέθηκε πεδίο λίστας διακομιστών το αρχείο 'addresses.dat'. Παρακαλώ επικολλήστε μια έγκυρη λίστα σε αυτό το αρχείο έτσι ώστε να ενημερωθεί αυτόματα η λίστα διακομιστών σας"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Εκκίνηση του κατεβάσματος της λίστας διακομιστών από το %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Προσδιορίστηκε άκυρη διεύθυνση για την αυτόματη ενημέρωση των διακομιστών: %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Άκυρη URL αυτόματο κατέβασμα του server.met στο αρχείο addresses.dat"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Αποτυχία κατεβάσματος της λίστας διακομιστών από το %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Ο τοπικός διακομιστής είναι φιλτραρισμένος από τα IPFilters, επανασύνδεση σε διαφορετικό διακομιστή!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "Όνομα διακομιστή"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Διεύθυνση"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Θύρα"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ηχοβόλιση πακέτων"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Χρήστες"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Χρήστες"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Στατικό"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Έκδοση"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Αρχεία"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Κοινόχρηστα αρχεία"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Είστε συνδεδεμένος σε έναν διακομιστή που προσπαθείτε να διαγράψετε. Παρακαλώ αποσυνδεθείτε πρώτα. Ο διακομιστής δεν διαγράφηκε."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Άγνωστο όνομα)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "Είστε σίγουρος/η ότι θέλετε να διαγράψετε τον στατικό διακομιστή %s"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "λεπτά"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Διακομιστές (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Διακομιστής"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Σύνδεση σε διακομιστή"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Σημαδέψτε τον διακομιστή σαν στατικό"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Σημαδέψτε τον διακομιστή σαν μη στατικό"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Σημαδέψτε τους διακομιστές σαν στατικούς"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Σημαδέψτε τους διακομιστές σαν μη στατικούς"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Αφαίρεση διακομιστή"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Αφαίρεση διακομιστών"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Διαγράψτε όλους τους διακομιστές"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Αντιγραφή συνδέσμων eD2k στο πρόχειρο"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Επανασύνδεση στον διακομιστή"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Σίγουρα να σβηστούν όλοι οι διακομιστές;"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τον επιλεγμένο διακομιστή;"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τους επιλεγμένους διακομιστές;"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ΣΦΑΛΜΑ: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Ο νέος πελάτης είναι %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: σας έχει αποδοθεί Low-ID!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\tΠιθανότατα αυτό είναι γιατί είστε πίσω από τοίχο προστασίας ή δρομολογητή."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tΓια περισσότερες πληροφορίες, παρακαλώ αναφερθείτε στο https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Ελήφθησαν άγνωστες πληροφορίες διακομιστή! - υπερβολικά σύντομες"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Λήφθηκε %d καινούριος διακομιστής"
 msgstr1 "Λήφθηκαν %d καινούριοι διακομιστές"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Το αποθήκευση τις λίστας διακομιστών ολοκληρώθηκε."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Ο διακομιστής απέρριψε την τελευταία εντολή"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Κάλπικο πακέτο ελήφθει από τον διακομιστή: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Αδιαχείριστο σφάλμα κατά την επεξεργασία πακέτου από τον διακομιστή: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr "Δεν μπορεί να δημιουργηθεί νήμα επίλυσης DNS για τη σύνδεση στο %s"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "Η διεύθυνση IP %s (%s) του διακομιστή είναι φιλτραρισμένη. Δεν γίνεται σύνδεση."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "χρήση πρωτοκόλλου συσκότισης."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Σύνδεση σε %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr "Δεν μπόρεσε να γίνει επίλυση dns για τον διακομιστή %s: Δεν είναι δυνατή ή σύνδεση!"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "Αρχείο καταγραφής aMule"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Ο διακομιστής δεν προστέθηκε: Δεν προσδιορίστηκε διεύθυνση."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Ο διακομιστής δεν προστέθηκε: Προσδιορίστηκε άκυρη θύρα διακομιστή."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Κατάσταση eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "Ταυτότητα"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Κατάσταση σύνδεσης:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Συνδεδεμένο"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Κατάσταση Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Running in LAN mode"
 msgstr "Τρέχει στο %s"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Τρέχει"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Κατάσταση Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Κατάσταση σύνδεσης:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "UDP Connection State:"
 msgstr "Κατάσταση σύνδεσης:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Κατάσταση τοίχου προστασίας:"
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Όχι φιλαράκος"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connecting to buddy"
 msgstr "Συνδεδεμένος στον φιλαράκο"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, fuzzy, c-format
 msgid "Connected to buddy at %s"
 msgstr "Συνδεδεμένος στον φιλαράκο"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Διεύθυνση IP:"
+
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed sources:"
 msgstr "Βρέθηκαν πηγές :"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed notes:"
 msgstr "Το αρχείο δεικτών δεν βρέθηκε (ψάχνω ψάχνω και τίποτα δεν βρίσκω)"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Μέσοι χρήστες:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Μέσα αρχεία:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Δεν τρέχει"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Βρέθηκε %i γνωστό κοινόχρηστο αρχείο"
 msgstr1 "Βρέθηκαν %i γνωστά κοινόχρηστα αρχεία"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Βρέθηκε %i γνωστό κοινόχρηστο αρχείο και %i άγνωστο"
-msgstr1 "Βρέθηκαν %i γνωστά κοινόχρηστα αρχεία και %i άγνωστα"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "ΣΦΑΛΜΑ: Αποπειράθηκε να μοιραστεί το %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Ο διακομιστής δεν βρέθηκε: %s"
 
-#: src/SharedFileList.cpp:486
-#, c-format
-msgid "No shareable files found in directory: %s"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Ο διακομιστής δεν βρέθηκε: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "Όνομα χρήστη"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "Ταχύτητα κατεβάσματος"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Σφάλμα κατά το αποθήκευση του αρχείου known.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "Ταχύτητα ανεβάσματος"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Φόρτωση του αρχείου διακομιστών: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Φόρτωση του αρχείου διακομιστών: %s"
+msgstr1 "Φόρτωση του αρχείου διακομιστών: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Βρέθηκε %i γνωστό κοινόχρηστο αρχείο"
+msgstr1 "Βρέθηκαν %i γνωστά κοινόχρηστα αρχεία"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "Διαθέσιμα:"
+msgid "User Name"
+msgstr "Όνομα χρήστη"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "Κατάσταση ανεβάσματος"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "Κατάσταση κατεβάσματος"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "Όνομα αρχείου"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "Κοινόχρηστα αρχεία"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Αιτήσεις"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Δεκτές αιτήσεις"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Όγκος δεδομένων που μεταφέρθηκαν"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Λόγος συμμετοχής"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Κεκτημένα τμήματα"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Ολοκληρωμένες πηγές"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Διαθεσιμότητα"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Μονοπάτι καταλόγου"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Κοινόχρηστα αρχεία"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Προσθήκη σχολίου/Αξιολόγησης"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Επεξεργασία σχολίου/Αξιολόγησης"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Προσθήκη των αρχείων της συλλογής στην λίστα με τα μεταφερόμενα"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Αντιγραφή μαγνήτη &URI στην πρόχειρη μνήμη"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο (&Πηγή)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο (Πηγή) (& Με κρυπτογραφικές επιλογές)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο (&Όνομα υπολογιστή)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο (Όνομα υπολογιστή) (&Με κρυπτογραφικές επιλογές)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο) (Πληροφορίες AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο) (Πληροφορίες AICH)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Χρειάζεται Υψηλή Προτεραιότητα για τη δημιουργία έγκυρου πηγαίου συνδέσμου"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Σφάλμα κατά την ολοκλήρωση"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Αποτυχία λήψης των κοινόχρηστων αρχείων του χρήστη '%s'"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Επαναφόρτωση των κοινόχρηστων αρχείων"
+msgstr1 "Επαναφόρτωση των κοινόχρηστων αρχείων"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Συνολικό μέγεθος κοινόχρηστων αρχείων: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Συνολικό μέγεθος κοινόχρηστων αρχείων: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Κοινόχρηστα αρχεία (%i)"
+msgstr1 "Κοινόχρηστα αρχεία (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Κοινόχρηστα αρχεία (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Μέρος αρχείου"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Επαναφορτώνει τη λίστα κοινοχρήστων αρχείων."
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Κατάσταση"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "Όνομα αρχείου"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Ανεβασμένα Δεδομένα (Συνεδρία (Συνολικά)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Συνολική επιβάρυνση (Πακέτα): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Επιβάρυνση αίτησης αρχείου (Πακέτα): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Επιβάρυνση ανταλλαγής πηγών (Πακέτα): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Επιβάρυνση διακομιστή (Πακέτα): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Επιβάρυνση Kad (Πακέτα): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Κρυπτογραφική επιβάρυνση (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Ενεργά ανεβάσματα: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Ανεβάσματα σε αναμονή: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Συνολικός αρ. επιτυχών συνεδριών ανεβάσματος: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Συνολικός αριθμός αποτυχημένων συνεδριών ανεβάσματος: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Μέσος χρόνος ανεβάσματος: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Κατέβηκαν δεδομένα (Συνεδρία (Συνολικά)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Βρέθηκαν πηγές: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Ενεργά κατεβάσματα (κομμάτια): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Συνεδρία λόγος Άνω:Κάτω (Σύνολο): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Μέσος ρυθμός κατεβάσματος (Συνεδρία): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Μέσος ρυθμός ανεβάσματος (Συνεδρία): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Μέγιστος ρυθμός κατεβάσματος (Συνεδρία): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Ελάχιστος ρυθμός κατεβάσματος (Συνεδρία): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Επανασυνδέσεις: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Χρόνος μετά από την πρώτη μεταφορά: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Σύνδεση με τον διακομιστή από: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Ενεργές συνδέσεις (εκτίμηση): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Έφτασε στο μέγιστο αρ. συνδέσεων: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Μέσες συνδέσεις (εκτίμηση): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Κορυφαίες συνδέσεις (εκτίμηση): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Πελάτες"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "Άγνωστο μέγεθος"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "Φιλτραρισμένοι"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Banned: %s"
 msgstr "Απαγορευμένοι"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Συνολικοί: %i Γνωστοί: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Εργαζόμενοι διακομιστές: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Αποτυχημένοι διακομιστές: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Σύνολο: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Διαγραμμένοι διακομιστές: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Φιλτραρισμένοι διακομιστές: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Χρήστες στους εργαζόμενους διακομιστές: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Αρχεία στους εργαζόμενους διακομιστές: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Σύνολο χρηστών: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Σύνολο αρχείων: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Κατοχή διακομιστών: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Αριθμός κοινόχρηστων αρχείων: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Συνολικό μέγεθος κοινόχρηστων αρχείων: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Μέσο μέγεθος αρχείου: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Λειτουργικό σύστημα"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Δεν ελήφθει"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Ενεργές συνδέσεις (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Δεν είναι διαθέσιμο"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Ποτέ"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, fuzzy, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "Η εντολή `%s' με pid `%d' τελείωση με κωδικό κατάστασης `%d'."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Εκτέλεση <str> και έξοδος."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr "Άκυρη μορφή διεύθυνσης IP. Χρησιμοποιήστε xxx.xxx.xxx.xxx:xxxx\n"
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "Αυτή η εντολή χρειάζεται ένα όρισμα. Έγκυρα ορίσματα: 'all', όνομα αρχείου ή έναν αριθμό.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Επεξεργασία κατά κατακερματιστή:"
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Επεξεργασία κατά όνομα αρχείου:"
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Αυτή η εντολή χρειάζεται ένα όρισμα. Έγκυρα ορίσματα: ένας κατακερματιστής αρχείου.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Άκυρος αριθμός\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "Δεν είναι έγκυρος κατακερματισμός (το μήκος πρέπει να είναι ακριβώς 32 χαρακτήρες)\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6539,7 +8032,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6548,83 +8041,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "Για περισσότερη βοήθεια, γράψτε '%s'.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Κατεβασμένα (%i)"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Η αίτηση απέτυχε για άγνωστο λόγο"
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Η διαδικασία ολοκληρώθηκε επιτυχώς."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Η αίτηση απέτυχε με το ακόλουθο σφάλμα: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Το φίλτρο IP για πελάτες είναι %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Εκτός"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Σε λειτουργία"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Το φιλτράρισμα διευθύνσεων για διακομιστές είναι %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Το τρέχον επίπεδο IPFilter είναι %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Ευρυζωνικά όρια: Πάνω: %u kB/s, Κάτω: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Συνδεδεμένο στο %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Συνδέεται τώρα"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "βρίσκεται πίσω από τοίχο προστασίας"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "Εντάξει"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6633,7 +8130,7 @@
 "\n"
 "Κατέβασμα:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6642,7 +8139,7 @@
 "\n"
 "Ανέβασμα:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6651,7 +8148,7 @@
 "\n"
 "Πελάτες σε αναμονή:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6660,39 +8157,33 @@
 "\n"
 "Συνολικές πηγές:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Μέρος αρχείου"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Αριθμός αποτελεσμάτων αναζήτησης: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-#, fuzzy
-msgid "Search progress not available"
-msgstr "Εμφάνιση ποσοστού προόδου"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Ελήφθη άγνωστη απάντηση από τον διακομιστή, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Εμφάνιση σύντομων πληροφοριών κατάστασης."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Εμφάνιση κατάστασης σύνδεσης, τρέχουσες ταχύτητες ανεβοκατεβάσματος, κτλ.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Εμφάνιση πλήρους δέντρου στατιστικών."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6706,11 +8197,11 @@
 "\n"
 "Παράδειγμα: 'statistics 5' θα δείξει μόνο τις 5 πρώτες εκδόσεις του κάθε τύπου πελάτη.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Κλείσιμο του aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6720,40 +8211,40 @@
 "Αυτό θα κλείσει και τον πελάτη κειμένου, γιατί είναι άχρηστος χωρίς έναν\n"
 "τρέχοντα πυρήνα.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload the given object."
 msgstr "Επαναφορτώνει το δεδομένο αντικείμενο"
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload shared files list."
 msgstr "Επαναφορτώνει τη λίστα κοινοχρήστων αρχείων."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload IP filtering table."
 msgstr "Επαναφορτώνει τον πίνακα φίλτρων IP από αρχείο"
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload current IP filtering table."
 msgstr "Επιλογή επιπέδου φιλτραρίσματος IP."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Update IP filtering table from URL."
 msgstr "Επαναφορτώνει τον πίνακα φίλτρων IP από αρχείο"
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Σύνδεση στο δίκτυο."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6765,36 +8256,36 @@
 "μόνο σε αυτόν τον διακομιστή. Η διεύθυνση IP πρέπει να είναι μια διάστικτη δεκαδική διεύθυνση IPv4\n"
 "ή ένα επιλύσιμο όνομα DNS."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Σύνδεση μόνο στο eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Σύνδεση μόνο στο Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Αποσύνδεση από το δίκτυο."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "Αυτό θα προκαλέσει αποσύνδεση από όλα τα συνδεδεμένα δίκτυα.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Αποσύνδεση μόνο από το eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Αποσύνδεση μόνο από το Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Add an eD2k or magnet link to core."
 msgstr "Προσθήκη ενός μαγνητικού συνδέσμου ή συνδέσμου eD2k στον πυρήνα."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6813,52 +8304,52 @@
 "Ο μαγνητικός σύνδεσμος πρέπει να περιέχει τον κατακερματισμό \n"
 " και το μέγεθος αρχείου.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Θέτει την τιμή μίας προτίμησης."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Set IP filtering preferences."
 msgstr "Θέτει τις προτιμήσεις του φίλτρου IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Άνοιγμα του φίλτρου IP τόσο για πελάτες όσο και για διακομιστές."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Κλείσιμο του φίλτρου IP τόσο για πελάτες όσο και για διακομιστές."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Ενεργοποίηση/Απενεργοποίηση του φίλτρου IP για πελάτες."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Άνοιγμα του φίλτρου IP τόσο για πελάτες."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Κλείσιμο του φίλτρου IP τόσο για πελάτες."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Ενεργοποίηση/Απενεργοποίηση του φίλτρου IP για διακομιστές."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Άνοιγμα του φιλτραρίσματος IP για τους διακομιστές."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Κλείσιμο του φιλτραρίσματος IP για τους διακομιστές."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Επιλογή επιπέδου φιλτραρίσματος IP."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6866,66 +8357,80 @@
 "Έγκυρα επίπερα φιλτραρίσματος είναι στο διάστημα 0-255, και η προεπιλεγμένη (αρχική)\n"
 "τιμή είναι 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Ρύθμιση ορίων εύρους ζώνης."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "Η τιμή που δίνεται σε αυτές τις εντολές πρέπει να είναι σε kilobytes/δευτερόλεπτο.\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Θέσε το όριο εύρους ζώνης για ανέβασμα."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Η τιμή που δίνεται σε αυτές τις εντολές πρέπει να είναι σε kilobytes/δευτερόλεπτο.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Θέσε το όριο εύρους ζώνης για κατέβασμα."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Ενεργοποίηση/Απενεργοποίηση πιστοποίησης ονόματος χρήστη/κωδικού"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Η τιμή που δίνεται σε αυτές τις εντολές πρέπει να είναι σε kilobytes/δευτερόλεπτο.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Λήψη και εμφάνιση της τιμής μίας προτίμησης."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering preferences."
 msgstr "Λήψη προτιμήσεων φίλτρου IP."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Λήψη κατάστασης φίλτρου IP για πελάτες και διακομιστές."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for clients only."
 msgstr "Λήψη κατάστασης φίλτρου IP μόνο για πελάτες."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for servers only."
 msgstr "Λήψη κατάστασης φίλτρου IP μόνο για διακομιστές."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering level."
 msgstr "Επιλογή επιπέδου φιλτραρίσματος IP."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Λήψη τον ορίων εύρους ζώνης."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a search."
 msgstr "Εκτελεί αναζήτηση στο Kad"
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6944,46 +8449,48 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a global search."
 msgstr "Εκτελεί συνολική αναζήτηση."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a local search"
 msgstr "Εκτελεί τοπική αναζήτηση"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a kad search"
 msgstr "Εκτελεί αναζήτηση στο Kad"
 
-#: src/TextClient.cpp:1070
+#: src/TextClient.cpp
 #, fuzzy
-msgid "Show the results of the last search."
+msgid "Show the results of a search."
 msgstr "Δείχνει τα αποτελέσματα της τελευταίας αναζήτησης."
 
-#: src/TextClient.cpp:1071
-#, fuzzy
-msgid "Return the results of the previous search.\n"
-msgstr "Επιστρέφει τα αποτελέσματα της προηγούμενης αναζήτησης.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "Δείχνει την πρόοδο της αναζήτησης."
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "Δείχνει την πρόοδο της αναζήτησης.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Ξεκινά να κατεβάζει ένα αρχείο"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6991,82 +8498,82 @@
 "Πρέπει να δωθεί αριθμός του αρχείου από την τελευταί αναζήτηση.\n"
 " Για παράδειγμα \"download 12\" θα ξεκινήσει να κατεβάζει το αρχείο υπ' αριθμό 12 της προηγούμενης αναζήτησης.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Παύση κατεβάσματος."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Συνέχιση κατεβάσματος."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Ακύρωση κατεβάσματος."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Θέσε την προτεραιότητα κατεβάσματος."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr "Βάλτε την προτεραιότητα κατεβάσματος σε χαμηλή, κανονική, ηψηλή ή αυτόματη.\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Θέστε χαμηλή προτεραιότητα."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Θέστε κανονική προτεραιότητα."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Θέστε υψηλή προτεραιότητα."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Θέστε αυτόματη προτεραιότητα."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Δείξε τις ουρές/λίστες."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr "Δείχνει την ουρά ανεβάσματος/κατεβάσματος, τη λίστα διακομιστών ή κοινόχρηστων αρχείων.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Δείξε την ουρά ανεβάσματος."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Δείξε την ουρά κατεβάσματος."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Δείξε τον αρχείο καταγραφής."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Δείξε τη λίστα των διακομιστών."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Επαναφορτώνει τη λίστα κοινοχρήστων αρχείων."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Καθάρισμα αρχείου καταγραφής."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Δεν συνίσταται αυτή η εντολή, αντ' αυτής χρησιμοποιήστε την '%s'."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7075,256 +8582,279 @@
 "Αυτή είναι μη συνιστώμενη εντολή και μπορεί να αφαιρεθεί στο μέλλον. \n"
 "Χρησιμοποιήστε '%s' καλύτερα.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Διακομιστής κειμένου του aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Σβήσιμο αρχείου: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Σβήσιμο αρχείου: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Συνέχεια του ανεβάσματος του αρχείου: %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "Μετατροπή των παλιών συνόλων κατακερματισμού AICH στο '%s' σε 64b στο '%s'."
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr "Ειδοποίηση: Το όνομα αρχείου '%s' είναι άκυρο και μετονομάστηκε σε '%s' "
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr "Ειδοποίηση: Το αρχείο '%s' υπάρχει ήδη, το νέο αρχείο μετονομάστηκε σε '%s'"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "Είστε σίγουροι ότι θέλετε να ακυρώσετε και να σβήσετε όλα τα αρχεία σε αυτήν την κατηγορία;"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Χρειάζεται επιβεβαίωση"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "Υπερβολικά πολλές συνδέσεις"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Όλα τα άλλα"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Επιλογή φίλτρου εμφάνισης"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Προσθήκη κατηγορίας"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Επεξεργασία κατηγορίας"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Διαγραφή κατηγορίας"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Σύνολο κατακερματισμού για άγνωστο αρχείο: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Επιλέξτε ποίος μπορεί να ζητήσει να δει τη λίστα με τα κοινόχρηστα αρχεία σας."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Συνέχεια του ανεβάσματος του αρχείου: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Αναστολή ανεβάσματος του αρχείου: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Αποτυχία εκτέλεσης εντολής `%s' στο συμβάν `%s'."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Αποτυχία εκτέλεσης εντολής '%s' στο συμβάν '%s'."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Το κατέβασμα ολοκληρώθηκε"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Η πλήρης διαδρομή του αρχείου"
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Το όνομα του αρχείου χωρίς τη διαδρομή."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "Ο κατακερματισμός eD2k του αρχείου."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Το μέγεθος του αρχείου σε byte."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Συνολική διάρκεια κατεβάσματος"
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Ξεκίνησε καινούρια περίοδος συνομιλίας"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Αποστολέας μηνύματος"
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Δεν υπάρχει χώρος"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Κατάτμηση δίσκου"
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Σφάλμα κατά την ολοκλήρωση"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Επεξεργασία του αρχείου υπ' αριθμόν %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "Ζητήσατε μερικά τεμάχια (Χρησιμοποιείται μόνο για αρχεία > 9.5ΜΒ)"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Ανύπαρκτο αρχείο !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, ο δημιουργός συνδέσμων eD2k του aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Καλώς ήρθατε (Καλώς σας βρήκαμε)"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Παράμετρος εισόδου"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Αρχείο προς κατακερματισμό"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Προσθήκη προαιρετικών URL για αυτό το αρχείο"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr "Εδώ εισάγετε το αρχείο για το οποίο θέλετε να υπολογίσετε τον σύνδεσμο eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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
-msgid "Remove"
-msgstr "Αφαίρεση"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Δημιουργία συνδέσμου με μερικό κατακερματισμό"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr "Βοηθήστε στην διανομή καινούριων και σπάνιων αρχείων  ταχύτερα, με αντίτιμο ένα μεγαλύτερο μέγεθος συνδέσμου"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Κατακερματισμός αρχείου MD4"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "Αρχείο κατακερματισμού eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "σύνδεσμος eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Αντιγραφή στο πρόχειρο"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Άνοιγμα αρχείου για τον υπολογισμού του συνδέσμου eD2k του"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Αντιγραφή υπολογισμένου συνδέσμου eD2k στο πρόχειρο"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Αποθήκευση υπολογισμένου συνδέσμου eD2k σε αρχείο"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Σχετικά με τον aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr "Επιλέξτε το αρχείο για το οποίο θέλετε να υπολογίσετε τον σύνδεσμο eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Δεν υπάρχει τίποτα για να αντιγραφεί σε αυτή τη φάση !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Επιλέξτε το αρχείο για τον υπολογισμένο σύνδεσμο eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Αδύνατο το άνοιγμα"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Παρακαλώ δώστε ένα μη κενό όνομα αρχείου"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Δεν υπάρχει τίποτα για να σωθεί σε αυτή τη φάση !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7344,162 +8874,159 @@
 "\n"
 "Διανέμεται υπό την GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Κατακερματίζεται..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Ακυρώθηκε!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Ολοκληρώθηκε σε %.2f δεύτερα"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Έχετε ήδη προσθέσει αυτήν την URL !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Παρακαλώ εισάγετε μια μη κενή URL"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Αποτυχία ανοίγματος του %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i Ημέρες %i Ώρες %i λεπτά %i s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, Στατιστικές σύνδεσης aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Μέγιστη ταχύτητα κατεβάσματος στη διάρκεια που το wxCas τρέχει"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Απόλυτα ελάχιστη ταχύτητα κατεβάσματος στις προηγούμενες εκτελέσεις του wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Καθαρισμός"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Σύστημα"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Διακοπή της αυτόματης ανανέωσης"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Αποθήκευση της απεικόνισης στατιστικών σύνδεσης"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Εκτύπωση της απεικόνισης στατιστικών σύνδεσης"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Ρυθμίσεις προτιμήσεων"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Σχετικά με το wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Εκκίνηση της αυτόματης ανανέωσης"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Η αυτόματη ανανέωση σταμάτησε"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Η αυτόματη ανανέωση ξεκίνησε"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Αποθήκευση της στατιστικής απεικόνισης"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Στατιστικές σύνδεσης του aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7507,11 +9034,11 @@
 "Υπήρξε πρόβλημα κατά την εκτύπωση.\n"
 "Μήπως ο τρέχων εκτυπωτής δεν έχει ρυθμιστεί σωστά;"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Εκτύπωση"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7529,402 +9056,547 @@
 "\n"
 "Διανέμετε υπό την GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Να πάρει! Το amule δεν τρέχει.."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "Το aMule τρέχει"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "Το aMule τρέχει, αλλά δεν είναι συνδεδεμένο"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "Το aMule συνδέεται..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Στο καλό! Η κατάσταση του aMule είναι άγνωστη..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr "τρέχει επί"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr "έχει διακοπεί !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr "δεν είναι συνδεδεμένο !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr "συνδέεται.."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr "κάνει κάτι περίεργο, τσεκάρει το!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr "είναι συνδεδεμένο με"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "κλειστό"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr "είναι ανοιχτό"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr "με"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Συνολική μεταφόρτωση:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Ανέβασμα: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Περίοδος κατεβάσματος:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Μεταφόρτωση"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Ανέβασμα: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Κοινοκτημοσύνη"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr "Αρχείο(α), Πελάτες στην αναμονή: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Χρόνος"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " ανοιχτό"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Μέσο φορτίο συστήματος (1-5-15 λεπτά): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Χρόνος λειτουργικότητας συστήματος:"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Ο κατάλογος που περιέχει το αρχείο amulesig.dat."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "Γράψτε εδώ το όνομα του καταλόγου που περιέχει το αρχείο amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Περίοδος ανανέωσης σε δευτερόλεπτα"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Παραγωγή στατιστικής απεικόνισης σε κάθε συμβάν ανανέωσης"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "Γράψτε εδώ τον κατάλογο όπου θέλετε να παραχθεί η στατιστική απεικόνιση"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Περιοδικό ανέβασμα του ειδώλου στατιστικών στον διακομιστή FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "Διεύθυνση FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Διαδρομή FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Εδώ εισάγετε τη διεύθυνση του διακομιστή FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "Εισάγετε εδώ τον κατάλογο που θα μπει το είδωλο στατιστικών στον διακομιστή FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Χρήστης"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "Γράψτε εδώ το όνομα χρήστη για να συνδεθείτε στον διακομιστή FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "Γράψτε εδώ τον κωδικό χρήστη για να συνδεθείτε στον διακομιστή FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Περίοδος ενημέρωσης του FTP σε λεπτά"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Τεκμηρίωση"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Κατάλογος που περιέχει το αρχείο υπογραφής"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Κατάλογος όπου να δημιουργηθεί η στατιστική απεικόνιση"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Φορτώνει προτύπου <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Θύρα HTTP του διακομιστή ιστού"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Χρήση της προώθησης της θύρας UPnP στη θύρα διακομιστή ιστού"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Θύρα UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Χρήση συμπίεσης τύπου gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Κωδικός πλήρους πρόσβασης για τον διακομιστή ιστού"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Κωδικός επισκέπτη για τον διακομιστή ιστού"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Να επιτρέπεται η πρόσβαση σε επισκέπτες"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Να απαγορεύεται η πρόσβαση σε επισκέπτες"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "Φόρτωση/Αποθήκευση των ρυθμίσεων του διακομιστή ιστού από/προς απομακρυσμένο aMule"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "Η διαδρομή στα αρχεία ρυθμίσεων του aMule. ΜΗΝ ΑΛΛΑΖΕΤΕ ΑΠΕΥΘΕΙΑΣ"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Απενεργοποίηση του διερμηνέα PHP (απαρχαιωμένο)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Μεταγλώττιση των σελίδων PHP σε κάθε αίτηση"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Ο διακομιστής δικτύου του aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "η σύνδεση πελάτη ιστού έγινε αποδεκτή\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "ΣΦΑΛΜΑ: δεν μπορεί να γίνει δεκτή η σύνδεση πελάτη ιστού\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Η αίτηση απέτυχε με το εξής σφάλμα: %s"
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Το αρχείο δεικτών δεν βρέθηκε (ψάχνω ψάχνω και τίποτα δεν βρίσκω)"
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Η περίοδος εργασίας έληξε - αίτηση επανασύνδεσης\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Η Περίοδος εργασίας είναι εντάξει, συνδεδεμένο\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Η περίοδος εργασίας είναι εντάξει, μη συνδεδεμένο\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Δεν έχει ξεκινήσει περίοδος εργασίας - θα ζητήσει σύνδεση\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Δημιουργία περιόδου εργασίας - ζήτηση σύνδεσης\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "H αίτηση διεκπεραιώνεται αρχικό:"
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Έλεγχος κωδικού\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Ο κωδικός κατακερματισμού είναι άκυρος\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Ο κωδικός είναι εντάξει\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Κακός κωδικός\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "Δεν βάλατε κανέναν κωδικό. Δεν επιτρέπεται κενός κωδικός.\n"
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Ζητήθηκε αποσύνδεση\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Επεξεργασία αιτήματος ανακατεύθυνση"
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Αποτυχία σύνδεσης"
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Ανέβηκε"
+#~ msgid "Ratio"
+#~ msgstr "Αξιολόγηση"
+
+#, fuzzy
+#~ msgid "Change Language"
+#~ msgstr "Γλώσσα"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "Δεν είναι διαθέσιμο"
+
+#~ msgid "User name"
+#~ msgstr "Όνομα χρήστη"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Κεκτημένα τμήματα"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "Διαθέσιμα:"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Βρέθηκε %i γνωστό κοινόχρηστο αρχείο και %i άγνωστο"
+#~ msgstr1 "Βρέθηκαν %i γνωστά κοινόχρηστα αρχεία και %i άγνωστα"
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Απομακρυσμένος διακομιστής"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Τοπικός διακομιστής"
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Φόρτωση δεδομένων από το παλιό αρχείο κατεβάσματος (%u από %u)"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Για να μην εμφανίζεται αυτή η προειδοποίηση σε κάθε προεπισκόπιση,\n"
+#~ "θέστε το προτιμητέο πρόγραμμα βίντεο στις ρυθμίσεις (ο %s είναι προεπιλεγμένος)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Αποτελέσματα φιλτραρίσματος"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Σημείωση αρχείου ως γνωστού"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Εκκινητήρας"
+
+#~ msgid "New node"
+#~ msgstr "Καινούριος κόμβος"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Περισσότερα"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Εκκίνηση από\n"
+#~ "γνωστούς πελάτες"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Σύνδεση σε κάθε διακομιστή ή/και Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Αποσυνδεδεμένο Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Σταμάτησε τις τρέχουσες απόπειρες σύνδεσης"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Αποσύνδεση από τα συνδεδεμένα δίκτυα"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Σύνδεση στα ενεργοποιημένα δίκτυα"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Αυτόματη ταξινόμηση αρχείων (υψηλή απαίτηση σε υπολογική ισχύη)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "Το aMule θα ταξινομήσει τις στήλες τις λίστας κατεβασμάτων αυτόματα."
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Απορρίπτει τα πακέτα αν η IP του πελάτη είναι διαφορετική από την IP από την οποία ελήφθη το πακέτο. Χρήση με προσοχή."
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Το αρχείο δεν βρέθηκε."
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Επιστρέφει τα αποτελέσματα της προηγούμενης αναζήτησης.\n"
+
+#, fuzzy
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Δείχνει την πρόοδο της αναζήτησης.\n"
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Έλεγχος για νέα έκδοση κατά την εκκίνηση"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Σύνδεσμος eD2k:"
+
+#~ msgid "Commit"
+#~ msgstr "Εκτέλεση"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Ιστοσελίδα: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Συζητήσεις: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Ιστοσελίδα: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Συζητήσεις: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Ανέβηκε"

amule-3.0.1.tar.gz/po/en_GB.po -> amule-3.1.0.tar.gz/po/en_GB.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
 "PO-Revision-Date: 2020-03-04 14:43+0100\n"
 "Last-Translator: Dévai Tamás <devait@vnet.hu>\n"
 "Language-Team: aMule Team <https://github.com/amule-org/amule>\n"
@@ -18,69 +18,148 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr ""
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr ""
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr ""
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr ""
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -89,134 +168,260 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+msgid "Failed to open ED2KLinks file."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
 msgstr ""
 
-#: src/amuleAppCommon.cpp:179
-msgid "Failed to open ED2KLinks file."
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr ""
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr ""
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr ""
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr ""
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
 msgstr ""
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
 msgstr ""
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
 msgstr ""
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr ""
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
 msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr ""
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -226,1638 +431,1928 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr ""
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr ""
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr ""
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr ""
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr ""
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr ""
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr ""
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr ""
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr ""
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr ""
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr ""
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr ""
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
 msgstr ""
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
 msgstr ""
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
 msgstr ""
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
 msgstr ""
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
 msgstr ""
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
 msgstr ""
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
 msgstr ""
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#: src/amuleDlg.cpp
+msgid "New version available"
 msgstr ""
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
 msgstr ""
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr ""
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr ""
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
+#: src/amuleDlg.cpp
+msgid "Core"
 msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
 msgstr ""
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
 msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
 msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Encryption"
 msgstr ""
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
 msgstr ""
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr ""
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr ""
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr ""
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr ""
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr ""
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr ""
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr ""
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr ""
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr ""
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr ""
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr ""
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr ""
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, c-format
-msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgid "Could not delete the category: %s"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
-msgid "Unknown"
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/BaseClient.cpp:1363
+#: src/amule-remote-gui.cpp
 #, c-format
-msgid "Failed to retrieve shared files from user '%s'"
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
+msgid "Unknown"
 msgstr ""
 
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr ""
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr ""
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr ""
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr ""
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr ""
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr ""
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr ""
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr ""
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr ""
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr ""
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr ""
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr ""
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
+msgid "%.1f KiB/s"
 msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr ""
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr ""
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr ""
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr ""
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 ""
 msgstr1 ""
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr ""
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr ""
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr ""
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr ""
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr ""
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr ""
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr ""
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr ""
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr ""
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr ""
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr ""
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr ""
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr ""
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr ""
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr ""
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr ""
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr ""
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr ""
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr ""
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr ""
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr ""
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr ""
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr ""
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr ""
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr ""
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr ""
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr ""
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr ""
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr ""
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr ""
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr ""
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr ""
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Auto"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
-msgid "Auto"
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
-msgid "Enter new name for this file:"
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
-msgid "File rename"
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
-#, c-format
-msgid "Downloads (%i)"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Enter new name for this file:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "File rename"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
+#: src/DownloadListCtrl.cpp
+#, c-format
+msgid "Downloads (%i)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgid "Total queue size: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr ""
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr ""
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "You already have the file '%s'"
+msgid "You already have the file '%s' (requested as '%s')"
 msgstr ""
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "You are already trying to download the file %s"
+msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1418
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+msgid "You are already trying to download the file %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr ""
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr ""
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr ""
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr ""
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr ""
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr ""
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
+#: src/ExternalConn.cpp
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ExternalConn.cpp:1536
-msgid "WebSearch from remote interface makes no sense."
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr ""
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr ""
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr ""
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr ""
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr ""
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr ""
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1865,23 +2360,23 @@
 "Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr ""
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr ""
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1889,59 +2384,59 @@
 "\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr ""
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr ""
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr ""
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr ""
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1950,2215 +2445,2857 @@
 "Exiting...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr ""
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr ""
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr ""
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
 #, c-format
-msgid "%.2f kB/s"
+msgid "%.2f KiB/s"
 msgstr ""
 
-#: src/FriendList.cpp:123
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/FileLaunch.cpp
+msgid "File preview"
 msgstr ""
 
-#: src/FriendList.cpp:149
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
 msgstr ""
 
-#: src/FriendList.cpp:266
-msgid "CRITICAL - no client on StartChatSession"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
-msgid "Friends"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:141
-msgid "Add a friend"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:144
-msgid "Remove Friend"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:145
-msgid "Send &Message"
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:180
-msgid "Are you sure that you wish to delete the selected friend?"
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:182
-msgid "Are you sure that you wish to delete the selected friends?"
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:574
+#: src/FirstRunWizard.cpp
 msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "CRITICAL - no client on StartChatSession"
+msgstr ""
+
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
+msgid "Friends"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Add a friend"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Remove Friend"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Send &Message"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr ""
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr ""
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr ""
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr ""
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr ""
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr ""
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr ""
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr ""
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr ""
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr ""
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
 msgstr ""
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr ""
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr ""
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr ""
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr ""
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr ""
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr ""
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr ""
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr ""
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr ""
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr ""
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr ""
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
+#: src/muuli_wdr.cpp
+msgid "Add links"
 msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr ""
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr ""
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr ""
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr ""
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr ""
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr ""
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr ""
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr ""
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr ""
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr ""
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
 msgstr ""
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr ""
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr ""
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr ""
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr ""
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
+#: src/muuli_wdr.cpp
+msgid "Filter"
 msgstr ""
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr ""
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr ""
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
+#: src/muuli_wdr.cpp
+msgid "Extend"
 msgstr ""
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr ""
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr ""
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr ""
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr ""
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr ""
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
+#: src/muuli_wdr.cpp
+msgid "met-File"
 msgstr ""
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
+#: src/muuli_wdr.cpp
+msgid "Hash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
 msgstr ""
 
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
+#: src/muuli_wdr.cpp src/Statistics.cpp
+msgid "Transfer"
 msgstr ""
 
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
 msgstr ""
 
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
 msgstr ""
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
-msgid "Transfer"
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
 msgstr ""
 
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
+#: src/muuli_wdr.cpp
+msgid "Available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
+#: src/muuli_wdr.cpp
+msgid "Datarate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
 msgstr ""
 
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
 msgstr ""
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
 msgstr ""
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
 msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr ""
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr ""
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr ""
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr ""
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr ""
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr ""
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr ""
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr ""
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr ""
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr ""
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr ""
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr ""
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr ""
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr ""
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr ""
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr ""
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr ""
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
+#: src/muuli_wdr.cpp
+msgid "Client version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
+#: src/muuli_wdr.cpp
+msgid "User ID"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
+#: src/muuli_wdr.cpp
+msgid "Server IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
+#: src/muuli_wdr.cpp
+msgid "Current request"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
-msgid "Max sources per downloading file:"
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
-msgid "Max simultaneous connections:"
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
+#: src/muuli_wdr.cpp
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1444
-msgid "retries"
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
+#: src/muuli_wdr.cpp
+msgid "retries"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
-msgid "OK"
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1966
-msgid "Click here to apply any changes made to the preferences."
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1969
-msgid "Reset any changes made to the preferences."
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
+msgid "OK"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
+#: src/muuli_wdr.cpp
+msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
+#: src/muuli_wdr.cpp
+msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 msgid "Source:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4166,11 +5303,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4180,836 +5317,748 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
+#: src/muuli_wdr.cpp
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2696
-msgid "Enable Proxy"
+#: src/muuli_wdr.cpp
+msgid "The proxy host name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2697
-msgid "Enable/disable proxy support"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
+#: src/muuli_wdr.cpp
+msgid "The proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2714
-msgid "The proxy host name"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2719
-msgid "The proxy port"
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
+#: src/muuli_wdr.cpp
+msgid "Remember those settings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2763
-msgid "Remember those settings"
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
 msgstr ""
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr ""
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr ""
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr ""
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr ""
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 ""
 msgstr1 ""
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr ""
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr ""
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr ""
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr ""
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr ""
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr ""
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr ""
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr ""
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr ""
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr ""
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
 msgstr ""
 
-#: src/OtherFunctions.cpp:1212
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
 #, c-format
-msgid "Using config dir: %s"
+msgid "%u or more other sources have this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr ""
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr ""
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr ""
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr ""
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr ""
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr ""
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr ""
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
 msgstr ""
 
-#: src/Preferences.cpp:639
-msgid "Arabic"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:640
-msgid "Asturian"
+#: src/PeerCapabilities.h
+msgid "IPv6"
 msgstr ""
 
-#: src/Preferences.cpp:641
-msgid "Basque"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
 msgstr ""
 
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr ""
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr ""
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr ""
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr ""
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr ""
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr ""
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr ""
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr ""
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr ""
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr ""
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr ""
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr ""
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr ""
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr ""
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr ""
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr ""
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr ""
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr ""
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr ""
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr ""
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr ""
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr ""
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr ""
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr ""
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr ""
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr ""
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr ""
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr ""
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr ""
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr ""
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr ""
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr ""
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr ""
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr ""
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
+#: src/Preferences.cpp
+msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:982
-msgid "no options available"
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5019,1337 +6068,1686 @@
 "these settings."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
 "If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
 msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr ""
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr ""
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+#: src/SearchDlg.cpp
+msgid "Search in progress"
 msgstr ""
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Main"
 msgstr ""
 
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
-msgid "Main"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
 msgstr ""
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
 msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-msgid "Bitrate"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:718
-msgid "Search related files (eD2k, local server)"
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
+#: src/SearchListCtrl.cpp
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr ""
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
 msgstr ""
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr ""
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr ""
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr ""
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr ""
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 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"
-msgstr0 ""
-msgstr1 ""
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr ""
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr ""
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr ""
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr ""
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr ""
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr ""
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr ""
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr ""
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr ""
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr ""
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr ""
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr ""
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr ""
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr ""
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr ""
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr ""
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr ""
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr ""
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr ""
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr ""
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr ""
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr ""
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr ""
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 ""
 msgstr1 ""
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
 msgstr0 ""
 msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
+msgid "Shared directory not readable, skipping: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
-msgid "Upload Status"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
-msgid "Download Status"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
-msgid "Local File Name"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
-msgid "Shares File List"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Status"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Download Status"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Local File Name"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Shares File List"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
+#: src/SharedFilesCtrl.cpp
+msgid "Directory Path"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:114
-msgid "Directory Path"
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr ""
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
 msgstr ""
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr ""
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr ""
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr ""
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr ""
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr ""
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr ""
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr ""
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr ""
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr ""
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr ""
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr ""
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr ""
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr ""
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr ""
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr ""
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr ""
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr ""
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr ""
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr ""
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr ""
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6357,7 +7755,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6365,141 +7763,140 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr ""
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr ""
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr ""
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr ""
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr ""
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr ""
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Download:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Upload:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Total sources:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/TextClient.cpp
+msgid "PartFile"
 msgstr ""
 
-#: src/TextClient.cpp:965
+#: src/TextClient.cpp
 #, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr ""
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr ""
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6508,46 +7905,46 @@
 "Example: 'statistics 5' will show only the top 5 versions for each client type.\n"
 msgstr ""
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr ""
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr ""
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6555,35 +7952,35 @@
 "or a resolvable DNS name."
 msgstr ""
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr ""
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6594,109 +7991,121 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr ""
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6715,373 +8124,400 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr ""
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr ""
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr ""
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+msgid "Show the results of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr ""
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr ""
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr ""
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr ""
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr ""
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr ""
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr ""
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr ""
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr ""
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr ""
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr ""
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr ""
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr ""
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr ""
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr ""
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
 "Use '%s' instead.\n"
 msgstr ""
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr ""
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr ""
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr ""
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr ""
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr ""
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr ""
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr ""
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr ""
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr ""
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr ""
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr ""
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr ""
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr ""
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr ""
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr ""
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7093,172 +8529,169 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
+msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
+msgid "%.2f MiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
+msgid "%.2f GiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
+msgid "%.2f TiB"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7269,392 +8702,389 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr ""
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""

amule-3.0.1.tar.gz/po/es.po -> amule-3.1.0.tar.gz/po/es.po Changed

@@ -15,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-23 18:51+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:29+0000\n"
 "Last-Translator: Diego Heras <ngosang@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/amule/amule-application/es/>\n"
 "Language: es\n"
@@ -28,72 +28,157 @@
 "X-Language: es_ES\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "Acerca de aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Control remoto de aMule "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Versión:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Cliente p2p multiplataforma basado en eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2026 El equipo de aMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Parte de aMule está basada en \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: direccionamiento P2P basado en la métrica XOR.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov (petar@maymounkov.org)\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Web:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Foro:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Documentación:"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Problemas:"
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "Haz clic para comprobar si hay una versión más nueva."
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "Buscar actualizaciones"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "Buscando actualizaciones..."
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "Estás utilizando la última versión."
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "Una nueva versión (%s) está disponible:"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr "No se pudo comprobar si hay actualizaciones. Por favor, inténtelo de nuevo más tarde."
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Añadir un amigo"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "¡Debe introducir una IP y puerto válidos!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Información"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "¡El hash de usuario especificado no es válido!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
-"aMule puede instalar un acceso directo en el escritorio y un icono en su directorio personal para que aparezca en el menú de aplicaciones como una aplicación instalada. Esto es reversible — los archivos se guardan en ~/.local/share/applications y ~/.local/share/icons y se pueden eliminar en cualquier momento.\n"
+"aMule puede instalar un acceso directo en el escritorio y un icono en su directorio personal para que aparezca en el menú de aplicaciones como una aplicación instalada. \n"
+"\n"
+"Esto es reversible — los archivos se guardan en ~/.local/share/applications y ~/.local/share/icons y se pueden eliminar en cualquier momento.\n"
 "\n"
 "¿Instalar la integración de escritorio ahora?"
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr "¿Añadir aMule al menú de aplicaciones?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr "Instalar"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr "Ahora no"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr "No volver a preguntar"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr "No se puede instalar la integración de escritorio: la variable de entorno APPDIR no está definida. Esto generalmente significa que el AppImage no se inició de forma normal."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr "La integración de aMule ha fallado"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr "No se puede instalar la integración de escritorio: error al crear %s. Compruebe que su directorio personal tenga permisos de escritura."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr "No se puede instalar la integración de escritorio: error al escribir %s. Compruebe que su directorio personal tenga permisos de escritura."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr "Integración de AppImage: aMule se ha añadido al menú de aplicaciones."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr "Integración de AppImage: aMule se ha añadido al menú de aplicaciones (%d atajos de terminal en ~/.local/bin)."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -107,82 +192,167 @@
 "\n"
 "¿Reiniciar aMule ahora?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr "aMule instalado"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr "Reiniciar ahora"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr "Más tarde"
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 "No se pudo añadir %u enlace del archivo ED2KLinks (consulte el registro para más detalles)"
-msgstr1 "No se pudieron añadir %u enlaces del archivo ED2KLinks (consulte el registro para más detalles)"
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ERROR"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Error al abrir el archivo de enlaces ED2K."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
 msgstr "AVISO: no puede añadirse a sí mismo como fuente para un enlace eD2k teniendo Id Baja."
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+"Otro programa tiene abierto el archivo de bloqueo de aMule:\"\n"
+"\n"
+"%s\n"
+"\n"
+"No se trata de una instancia de aMule en ejecución, por lo que no hay nada que traer al frente. Cierre el otro programa o elimine el archivo de bloqueo cuando aMule no esté en ejecución."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+"El demonio de aMule (amuled) ya se está ejecutando como proceso %d y está utilizando esta configuración.\n"
+"\n"
+"No tiene ninguna ventana que traer al primer plano. Conéctese a él mediante amuleGUI o detenga el demonio antes de iniciar aMule."
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr "aMule no puede iniciarse"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr "Permisos restringidos en %s sólo para el propietario."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr "Archivo de la colección no encontrado: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Archivo de colección inválido o vacío: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr "No hay enlaces utilizables en la colección: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 "Saltado %u enlace inutilizables en la colección: %s"
+msgstr1 "Saltados %u enlaces inutilizables en la colección: %s"
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "No se puede convertir el enlace magnético a eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Enlace inválido eD2k \"%s\" - ERROR: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Ahora, saliendo de la aplicación principal..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Cerrando la instancia de amuleweb con pid '%d'... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Matando la instancia de amuleweb con pid '%d'... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Falló"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Cerrando la instancia de amuleapi con pid '%d'... "
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Matando la instancia de amuleapi con pid '%d'... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: terminando el núcleo."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "Cierre de aMule completado."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Resultados de depuración de memoria en la salida de aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr "Vinculando el tráfico P2P de aMule a la interfaz: %s (las actualizaciones HTTP usan la ruta predeterminada)"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr "Vinculando todo el tráfico de red a la interfaz: %s"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr "ADVERTENCIA: la interfaz de red configurada '%s' no se encontró; el tráfico NO está vinculado a ella y puede salir por la ruta predeterminada. Compruebe el nombre de la interfaz en Preferencias."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr "ADVERTENCIA: vincularse a la interfaz de red '%s' requiere privilegios elevados y NO se aplicó; el tráfico puede salir por la ruta predeterminada. Conceda la capacidad (por ejemplo, \"sudo setcap capnetraw+ep\" al binario de aMule) o ejecute con privilegios suficientes."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr "ADVERTENCIA: no se pudo vincular a la interfaz de red '%s'; el tráfico puede salir por la ruta predeterminada."
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Su configuración regional se ha cambiado a la predefinida del sistema debido a un cambio en la configuración. Disculpe."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Información"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -190,24 +360,45 @@
 "\n"
 "Configuración de la EC"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Contraseña fijada y conexiones externas habilitadas."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "AVISO"
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr "Lista de servidores eD2k (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr "Inicializando red"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr "Nodos de bootstrap Kad (nodes.dat)"
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "Cargando archivos temporales"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Cargando archivos temporales (%u de %u)"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "Cargando archivos compartidos"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "Cargando archivos compartidos (%u)"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "Arrancando"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Bootstrap de red"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
@@ -215,30 +406,58 @@
 "aMule ha detectado archivos de bootstrap de red faltantes.\n"
 "Seleccione cuáles descargar:"
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
-msgstr "Bootstrap de red"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "Lista de servidores eD2k (server.met)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Nodos de bootstrap Kad (nodes.dat)"
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "servidor web corriendo con pid: %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "Ha solicitado ejecutar el servidor web al inicio pero no se puede ejecutar el binario amuleweb. Por favor, instale el paquete que contiene el servidor web de aMule, o compile aMule desde el código fuente con -DBUILD_WEBSERVER=YES e instálelo."
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "ERROR"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr "No se ha podido establecer el amuleapi EC token a %s; amuleapi volverá a su contraseña configurada."
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr "amuleapi corriendo con pid %d"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Ha solicitado ejecutar amuleapi al inicio pero no se puede ejecutar el binario amuleapi. Por favor, instale el paquete que contiene el servidor API REST de aMule, o compile aMule desde el código fuente con -DBUILD_AMULEAPI=YES e instálelo."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr "Conexión externa: imposible conectarse a '%s', escuchando solo en 127.0.0.1."
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "No se pueden asociar los puertos con la dirección especificada: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "El puerto %u no está disponible. Tendrás Id Baja\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -253,48 +472,48 @@
 "\n"
 "Comprueba la red y asegúrate de que el puerto está abierto para salida y entrada."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Error al crear el archivo de firma online"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Error al crear el archivo de firma online de aMule"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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 en tu sistema. (Nota: intentaré configurarlo de todos modos)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Es la primera vez que inicias aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Esta es una versión de prueba, actualizada diariamente, y\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "no garantizamos que no rompa nada, no queme su casa,\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "o no mate a su perro. Pero *debería* ser seguro usarla de todas formas.\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr "En nuestra web podrá encontrar más información, soporte y nuevas versiones,\n"
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "en https://amule-org.github.io, o en nuestro canal de IRC #aMule en irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Envíenos cualquier fallo a https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -302,513 +521,506 @@
 "¡El directorio que ha especificado para archivos de firma digital no es válido!\n"
 "La firma digital se ha deshabilitado hasta que lo arregle en las preferencias."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Nombre de servidor notificado"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr "Metadatos del arhivo multimedia: el archivo analizado ya no es conocido, resultado descartado (%s)"
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "La reserva del espacio en disco para el archivo '%s' ha fallado: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "ERROR: no se puede abrir el archivo de registro"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "AVISO: el archivo de registro está vacío. Algo está mal."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "El registro se ha borrado"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Mensaje del servidor: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, 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 más nuevo."
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Error al descargar la lista de nodos."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Error al abrir el archivo de comprobación de versión descargado"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Archivo de comprobación de versión dañado"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "¡Estás usando una versión desactualizada de aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr "Su versión de aMule es %i.%i.%i y la última versión es %li.%li.%li"
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "La última versión siempre se puede encontrar en https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr "AVISO: su versión de aMuled está desactualizada: %i.%i.%i < %li.%li.%li"
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Su copia de aMule está actualizada."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Error al descargar el archivo de comprobación de la versión"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Usuarios: %s | Archivos: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "No hay redes seleccionadas"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "con Id Baja"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "con Id Alta"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Conectado a %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Desconectado de eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad iniciado."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad detenido."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Conectado a Kad (correcto)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Conectado a Kad (tras cortafuegos)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Desconectado de Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr "La red Kad no se puede usar si el puerto UDP está deshabilitado en las preferencias, no se inicia."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Red Kad deshabilitada en las preferencias, no se conecta."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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 demonio de aMule no se puede usar cuando están desactivadas las conexiones externas. Para activarlas, use un aMule normal, inicie amuled con la opción --ec-config, o bien, establezca \"AcceptExternalConnections\" a 1, en el archivo ~/.aMule/amule.conf"
 
-#: src/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr "ERROR: se requiere una contraseña válida para usar conexiones externas, y el demonio de aMule no se puede usar sin conexiones externas. Para iniciar el demonio de aMule, debe especificar en el campo \"ECPassword\" del archivo ~/.aMule/amule.conf el valor apropiado. Ejecute amuled con el parámetro --ec-config para especificar la contraseña. Se puede encontrar más información en https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - iniciando el temporizador"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: pasando a segundo plano - nos vemos"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "No se puede crear el archivo Pid"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "ERROR: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Esto es aMule %s basado en eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Ejecutándose en %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Visite https://github.com/amule-org/amule/releases/latest para comprobar si hay una nueva versión disponible."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ERROR FATAL: no se ha podido crear el temporizador"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Control remoto de aMule "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "¡Error! No se puede cargar Preferencias"
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Versión:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Redes"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Cliente p2p multiplataforma basado en eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Búsquedas"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Web: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Descargas"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Foro: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Compartidos"
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Documentación: https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Clientes"
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
-"Problemas: https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Mensajes"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2026 El equipo de aMule \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Estadísticas"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Parte de aMule está basada en \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Preferencias"
 
-#: src/amuleDlg.cpp:552
-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
+msgid "Navigate"
+msgstr "Navegar"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov (petar@maymounkov.org)\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "Espacio libre: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Mensaje"
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "Nueva versión disponible"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"Una versión nueva de aMule (%s) está disponible.\n"
+"\n"
+"Está ejecutando %s.\n"
+"\n"
+"¿Le gustaría abrir la página de descarga?"
+
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "Diálogo de aMule destruido"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Conectando"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Desconectado"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: tras cortafuegos"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: conectado"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: conectando"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: apagado"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Detener los intentos de conexión actuales"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Desconectar"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr "Núcleo"
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versión"
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Desconectarse de las redes conectadas"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr "El núcleo y aMuleGUI son versiones diferentes."
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr "El núcleo y aMuleGUI son la misma versión."
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Conectar"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Dirección"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Conectarse a las redes habilitadas"
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "Encriptación"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Su: %.1f%s (%.1f) | De: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " MiB/s"
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " KiB/s"
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Su: %.1f%s | De: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Conectado)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Desconectado)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "¿Realmente desea cerrar %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Confirmación de salida"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Ejecutar comando: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- predeterminado -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "El directorio de tema '%s' no existe"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "AVISO: no se puede abrir el archivo de tema '%s' para lectura"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Redes"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Ventana de redes"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Búsquedas"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Ventana de búsquedas"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Descargas"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Ventana de descargas"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Compartidos"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Ventana de archivos compartidos"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Mensajes"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr "Ventana de clientes"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Ventana de mensajes"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Estadísticas"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Ventana de gráficos de estadísticas"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Ventana de preferencias de configuración"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importar"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "La herramienta para importar archivos de partes"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Acerca de"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Acerca de/Ayuda"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Red eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Red Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "No hay red"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Control remoto de aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Error fatal: no se ha podido crear el temporizador del núcleo"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Conectar con un amule remoto"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Conexión perdida"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr "Interrumpir y salir"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "Reconectando... (intento %d)"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr "Próximo intento en %d s..."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+"Conexión con %s perdida.\n"
+"%s\n"
+"\n"
+"La interfaz está en pausa hasta que se restablezca la conexión."
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Error fatal: no se ha podido crear el temporizador de sondeo"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Entrando en el bucle de eventos..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr "Conexión fallida. Por favor, compruebe el host, puerto y contraseña."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Gestor de eventos de la EC de la interfaz remota"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "Error de conexión. No se puede conectar a %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Apagándose"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Conexión cerrada - Es probable que aMule se haya cerrado."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Intento de reconectar expirado; reintentando."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
@@ -817,1060 +1029,1360 @@
 "Tiempo de conexión agotado. No se ha podido contactar con %s:%d dentro del tiempo asignado.\n"
 "Compruebe el host, el puerto y que aMule esté en ejecución con las Conexiones Externas habilitadas."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr "Se perdió la conexión con el núcleo remoto. Intentando reconectar..."
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Deshabilitada"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr "Reconectado al core remoto."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr "El núcleo remoto fue reiniciado; recargando."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Intento de reconexión %d: conectando a %s:%d"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr "No se pudo iniciar la reconexión; se reintentará en breve."
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Listo"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Todos"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr "no legible"
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr "no encontrado"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr "El núcleo rechazó estas carpetas compartidas: %s"
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "El enlace no es válido o ya está en la lista."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr "El demonio rechazó la petición."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "No se pudo eliminar la categoría: %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr "No se puede crear el directorio '%s' para la categoría '%s', se mantiene el directorio '%s'."
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr "El núcleo remoto envió datos inconsistentes para \"%s\" (Estado de la parte %d, esperado %d). La lista de archivos puede estar mostrando la información incorrecta; volver a conectarse para limpiarla."
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Error al obtener la lista de archivos compartidos del usuario '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Buscando un amigo para conexión con Id Baja"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Versión falsa de eMule %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Falso eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (falso eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (basado en eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Alias: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Solicitado: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estadísticas de archivo para esta sesión: aceptada %d de %d petición, %s transferidos\n"
 msgstr1 "Estadísticas de archivo para esta sesión: aceptadas %d de %d peticiones, %s transferidos\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estadísticas de archivo para todas las sesiones: aceptada %d de %d petición, %s transferidos\n"
 msgstr1 "Estadísticas de archivo para todas las sesiones: aceptadas %d de %d peticiones, %s transferidos\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Se ha pedido un archivo desconocido"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Mensaje filtrado de '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nuevo mensaje de '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "El usuario %s (%u) ha pedido la lista de archivos compartidos de un directorio que no existe, '%s' -> Se ignora"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Error al obtener la lista de archivos compartidos del usuario '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "AVISO: no se puede abrir %s."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "AVISO: la lista de archivos cancelados está dañada, contiene una cabecera inválida."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Error de E/S al leer el archivo %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Error guardando el archivo %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Introduzca el \"captcha\""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Categoría"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nueva categoría"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Elija una carpeta para los archivos entrantes"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "¡Debe especificar un nombre para la categoría!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "¡Debe especificar una ruta para la categoría!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr "Error al crear el directorio entrante para la categoría. Por favor, ¡especifique una ruta correcta!"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Sesión de chat iniciada: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Conectado al cliente ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Conectando al cliente ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Error al conectar con el cliente / Conexión perdida ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr "*** Ha pasado la comprobación del captcha y el usuario ha recibido su mensaje. ***"
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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 "*** Su respuesta al captcha ha sido incorrecta y su mensaje se ha ignorado. Puede pedir un nuevo captcha enviando un nuevo mensaje. ***"
 
-#: src/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Chat"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Cerrar la pestaña"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Cerrar todas las pestañas"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Cerrar las otras pestañas"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Añadir a Amigos"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Mostrar los &detalles"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Borrar de Amigos"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Asignar un puesto reservado de amigo"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Ver los archivos"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Enviar un mensaje"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Enviar un mensaje al usuario"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Mensaje a enviar:"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"No se le permite asignar más de un puesto reservado.\n"
+" Solo se ha asignado uno."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Selección múltiple"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 "¿Añadir %u cliente a la lista de amigos?"
+msgstr1 "¿Añadir %u clientes a la lista de amigos?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "¿Quitar %u cliente de la lista de amigos?"
+msgstr1 "¿Quitar %u clientes de la lista de amigos?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 "No se pudo añadir %u cliente seleccionado a la lista de amigos: no se conoce ninguna dirección para él."
+msgstr1 "No se pudieron añadir %u clientes seleccionados a la lista de amigos: no se conoce ninguna dirección para ellos."
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "¿Solicitar los archivos compartidos de %u cliente?"
+msgstr1 "¿Solicitar los archivos compartidos de %u clientes?"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr "Se abre una conexión con cada uno de ellos."
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Archivo de créditos cargado, %u cliente conocido"
 msgstr1 "Archivo de créditos cargado, %u clientes conocidos"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - ¡Ha expirado el crédito de %u cliente!"
 msgstr1 " - ¡Han expirado los créditos de %u clientes!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "No se ha encontrado el archivo 'cryptkey.dat', se crea."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Detalles del cliente"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "Id Baja"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "Id Alta"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Habilitada"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Soportada"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "No soportada"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Deshabilitada"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Conectado"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f KiB/s"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nombre"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "Software"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Dirección IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Origen"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr "Visto por primera vez"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr "Visto por última vez"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "Sesiones"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Velocidad de subida"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Velocidad de descarga"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "Total Subido"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "Total descargado"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Modificador desc./sub."
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr "Ahora en linea"
 
-#: src/ClientRef.cpp:196
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "No completado"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Cliente sospechoso"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Verificado - Correcto"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/D"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "No disponible"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "No se pudo solicitar a %u cliente seleccionado sus archivos compartidos."
+msgstr1 "No se pudo solicitar a %u clientes seleccionados sus archivos compartidos."
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Archivos"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Subido"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Descargado"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "Descargando desde"
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr "Subiendo a"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Activo"
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr "Conocido"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "El usuario %s (%u) ha pedido la lista de sus archivos compartidos -> Aceptada"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "El usuario %s (%u) ha pedido la lista de sus archivos compartidos -> Denegada"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "El usuario %s (%u) ha pedido la lista de sus directorios compartidos -> Aceptada"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "El usuario %s (%u) ha pedido la lista de sus directorios compartidos -> Denegada"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "El usuario %s (%u) ha pedido la lista de sus archivos compartidos en el directorio %s -> Aceptada"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "El usuario %s (%u) ha pedido la lista de sus archivos compartidos en el directorio %s -> Denegada"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "El usuario %s (%u) comparte el directorio '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "El usuario %s (%u) ha enviado directorios compartidos no solicitados."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "El usuario %s (%u) ha enviado su lista de archivos compartidos del directorio '%s'"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "El usuario %s (%u) ha finalizado el envío de su lista de archivos compartidos"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "El usuario %s (%u) ha enviado una lista de archivos compartidos no deseada"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "El usuario %s (%u) ha denegado el acceso a su lista de directorios/archivos compartidos"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Comentarios del archivo"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Nombre del archivo"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Valoración"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr "No se pudo iniciar una búsqueda Kad"
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "No se puede buscar en Kad si no está conectado a Kad"
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "Buscando comentarios en Kad…"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "No hay comentarios"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u comentario"
 msgstr1 "%u comentarios"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr "Cliente bloqueado %s por enviar %s en datos corruptos de un total de %s para el archivo '%s'"
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Error al cargar los datos de países para '%s'."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Automática Ba"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Automática No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Automática Al"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Muy baja"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Baja"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Alta"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Muy alta"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Lanzamiento"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Preguntando"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Conectando vía servidor"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Cola llena"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "En cola"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Descargando"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Recibiendo hashset"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Partes no necesitadas"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "No se puede conectar Id Baja con Id Baja"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Demasiadas conexiones"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Conectando vía Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Demasiadas conexiones Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Bloqueado"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Error de conexión"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Cola remota llena"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Antiguo MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Nuevo MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Compatible con eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Servidor local"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Servidor remoto"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Intercambio de fuentes"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Pasivo"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Enlace"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Semillas fuente"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Resultado de la búsqueda"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Completado"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "En progreso"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "ERROR: no queda espacio en disco"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "ERROR: partmet no encontrado"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ERROR: ¡error de E/S!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ERROR: ¡no se ha podido realizar la acción!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "En la cola"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Ya se está descargando"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Formato de archivo temporal incorrecto o desconocido."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr "Este directorio es parte de una compartición recursiva. Para eliminarlo, deja de compartir o modifica la compartición raíz que la contiene."
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr "No se dejar de compartir dentro de una compartición recursiva"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr "No se puede modificar dentro de una compartición recursiva"
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Parte"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Transferido"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Velocidad"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Progreso"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Fuentes"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioridad"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Estado"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Tiempo restante"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Visto completo por última vez"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Última recepción"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "¿Seguro que desea borrar el archivo archivo seleccionado?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "¿Seguro que desea borrar los archivos seleccionados?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Reacción desde: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automática"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Detener"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pausar"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Reanudar"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "&Limpiar los completados"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Intercambiar todas las fuentes A4AF a este archivo ahora"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Intercambiar todas las fuentes A4AF a este archivo (automático)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Intercambiar todas las fuentes A4AF a otro archivo ahora"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Opciones adicionales"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "Mostrar en el gestor de archivos"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Mostrar los detalles del archivo"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Mostrar todos los comentarios"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Copiar el URI magnético al portapapeles"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Copiar el en&lace eD2k al portapapeles"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Copiar la respuesta al portapapeles"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Obtener %s para este archivo"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "no asignado"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Asignar a la categoría"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Abrir el archivo"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "¿Seguro que desea borrar el archivo seleccionado?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "¿Seguro que desea borrar los archivos seleccionados?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Reacción desde: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Introduzca el nuevo nombre para el archivo:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Renombrar el archivo"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
+msgid "%.1f MiB/s"
+msgstr "%.1f MiB/s"
 
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Descargas (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr "la terminal predeterminada de Windows"
-
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Para evitar la aparición de este aviso en cada previsualización,\n"
-"defina el reproductor de vídeo en las preferencias (%s por defecto)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Previsualizar el archivo"
+msgid "Total queue size: %s"
+msgstr "Tamaño total de la cola: %s"
 
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ERROR: ¡no se ha podido ejecutar el reproductor de medios externo! Comando: `%s'"
-
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Guardando el archivo de partes %u de %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Todos los archivos de partes han sido guardados."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Cargando archivos temporales desde %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Cargando el archivo de partes %u de %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "ERROR: no se ha podido cargar el archivo de copia de seguridad. Busque en https://github.com/amule-org/amule/discussions para encontrar soluciones de recuperación de archivos .part.met."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Todos los archivos de partes han sido cargados."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "No se han encontrado archivos de partes"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Encontrado %u archivo de partes"
 msgstr1 "Encontrados %u archivos de partes"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 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:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "El sistema de ficheros del directorio Entrante no puede manejar archivos grandes."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Descargando %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Ya está intentando descargar el archivo '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Ya tiene el archivo '%s' (solicitado como '%s')"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Ya tiene el archivo '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Ya está intentando descargar el archivo %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "No se puede convertir el enlace magnético a eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Protocolo desconocido del enlace: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 "No se pudo añadir el enlace %u (consulte el registro para más detalles)."
 msgstr1 "No se pudieron añadir los enlaces %u (consulte el registro para más detalles)."
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "¡Enlace eD2k inválido! ERROR: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "El cliente ha enviado un paquete después de una autentificación fallida."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Conexión externa cerrada."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "¡Las conexiones externas están deshabilitadas por estar la contraseña en blanco!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Conexiones externas deshabilitadas en el archivo de configuración"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Nueva conexión externa aceptada"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERROR: no se ha podido aceptar una nueva conexión externa"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "¡Conexión externa rechazada por estar la contraseña en blanco en las preferencias!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Conectando con el cliente: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Versión desconocida"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "ID de versión de EC incorrecto, debe haber una incompatibilidad. Use núcleo y remoto de la misma versión."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "¡No puede conectar a una versión final desde una versión de desarrollo cualquiera! *suspiro* posible error evitado"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Versión de protocolo no válida."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Falta la etiqueta de versión de protocolo."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Demasiados intentos fallidos de conexión; intente de nuevo en %d segundos."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Error de autentificación: se ha dado un hash inválido como contraseña de la EC."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr "La autenticación fallida: el cliente ofreció una Conexión Externa cifrada pero no envió ninguna clave usable."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr "Autenticación fallida: este aMule requiere una Conexión Externa cifrada, y el cliente no negoció uno."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr "Autenticación fallida: el cliente no pudo confirmar la sesión cifrada."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Error de autentificación: contraseña incorrecta."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Error de autentificación: falta la contraseña."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Solicitud no válida, debe autentificarse primero."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Acceso concedido."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Enviar el mensaje de error \"%s\" al cliente."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Intento de acceso no autorizado desde %s. Conexión cerrada."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Error en el comando del archivo de partes remoto: hash de archivo no encontrado: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Hash de archivo no encontrado: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "¡Huy! ¡Error procesando el código de operación!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Servidor no añadido"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "servidor no encontrado: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "necesita definir el servidor que va a borrar"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k está deshabilitado en las preferencias."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr "Todavía no se conoce la dirección de ese amigo."
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr "Amigo no encontrado."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr "Cliente no encontrado."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr "EC_TAG_FRIEND_SHARED requiere EC_TAG_FRIEND o EC_TAG_CLIENT."
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Búsqueda en proceso. ¡Resultados obtenidos en breve!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "La búsqueda web desde una interfaz remota no tiene sentido."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr "Una navegación no es una búsqueda que se pueda iniciar."
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Búsqueda en proceso. ¡Resultados obtenidos en breve!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "No hay puntos para el gráfico."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Su cliente no está configurado para este nivel de detalle."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Conexión externa: apagado solicitado"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Ya se está cerrando."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Conexión externa: añadiendo el enlace '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "%d de %d enlaces fallaron(no válidos o ya está en la lista)."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr "La comprobación de versión se ha limitado; inténtelo de nuevo en breve."
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr "La comprobación de versión no está disponible en este demonio."
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Archivo no encontrado."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Nombre de archivo incorrecto."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "No se puede renombrar el archivo."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr "No se pudo reasignar el cliente a ese archivo."
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr "No se pudo guardar la contraseña amuleapi: %s"
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "Categoría inexistente."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr "Solicitud de categoría malformada."
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr "La categoría predeterminada no se puede eliminar."
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "Falta el id de la sesión de chat"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "Sesión de chat inexistente"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "La extracción de metadatos multimedia está desactivado en preferencias"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr "El archivo no es apto para la extracción de metadatos multimedia (no es un archivo audio/video, o es una descarga incompleta)"
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "Mensaje de chat vacío"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "Objetivo de chat desconocido"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad está deshabilitado en las preferencias."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Ya está conectado a eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Conectado a eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Ya está conectado a Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Conectando a Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Todas las redes están deshabilitadas."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Desconectado de eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Desconectado de Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Conexión externa: se ha recibido un código de operación inválido: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Código de operación no válido (¿versión de protocolo incorrecta?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Extensión desconocida '%s' para el comando '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Comando desconocido '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1878,7 +2390,7 @@
 "\n"
 "El comando no puede tener argumentos.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1886,7 +2398,7 @@
 "\n"
 "El comando debe tener un argumento.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1894,7 +2406,7 @@
 "\n"
 "El comando está incompleto, debe usar una de la extensiones de abajo.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1902,11 +2414,11 @@
 "\n"
 "Extensiones disponibles:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Comandos disponibles:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1917,17 +2429,17 @@
 "Todos los comandos distinguen mayúsculas de minúsculas.\n"
 "Escriba '%s <comando>' para obtener información detallada de <comando>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Sale de la aplicación."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Mostrar la ayuda."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1935,7 +2447,7 @@
 "Para obtener la ayuda de un comando, escriba 'help <comando>'.\n"
 "Para obtener la lista completa de comandos, escriba 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1946,46 +2458,46 @@
 "Use '%s' para obtener la lista de comandos\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "¡Error de sintaxis!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "Error procesando el comando - ¡nunca debería pasar! Informe del fallo, por favor\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "El comando no debe tener ningún parámetro."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "El comando debe tener un parámetro."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Argumento no válido."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "El comando está incompleto."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Escriba '%s' para obtener más ayuda.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Esto es %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Esto es %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1993,7 +2505,7 @@
 "\n"
 "Creando cliente...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2002,7 +2514,7 @@
 "\n"
 "Vale, terminando %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2016,118 +2528,370 @@
 "\n"
 "Saliendo...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Mostrar esta ayuda."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Host donde se está ejecutando aMule (por defecto: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "El puerto de aMule para la conexión externa (por defecto: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Contraseña para conexiones externas."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Leer la configuración desde el archivo."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "No mostrar ninguna salida en stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Modo detallado - muestra también los mensajes de depuración."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Establece la configuración regional (idioma) del programa."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Escribir las opciones de la línea de comandos al archivo de configuración."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Imprimir la versión del programa."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr "No encriptar la sesión de Conexión externa. El cifrado está activo por defecto cuando el aMule remoto lo soporta; apagarlo deja la comunicación tras del inicio de sesión legible y modificable por cualquiera en el camino."
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr "Forzar compresión ZLIB aunque se conecte a una IP local/LAN (útil cuando se conecta al servidor a través de un túnel VPN que se resuelve a una IP de LAN)."
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr "Añadir una copia de toda la salida de la consola a este archivo de registro (predeterminado: <config-dir>/amuleapi.log)."
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr "No escribir un archivo de registro; imprimir solo en la consola."
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Detalles del archivo"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% terminado"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Previsualizar el archivo"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "ERROR: ¡No se pudo ejecutar el reproductor multimedia externo! Comando: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr "El reproductor de vídeo configurado no fue encontrado: %s"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr "No se puede abrir '%s': el archivo no está presente en este ordenador."
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr "Previsualizar una descarga sin terminar necesita un reproductor de vídeo: el archivo parcialmente descargado no tiene un formato que el sistema pueda abrir. Se puede establecer en Preferencias -> General."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr "ERROR: Fallo al abrir '%s' con la aplicación predeterminada."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ERROR: Fallo al mostrar '%s' en el gestor de archivos."
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "Móvil / 4G-5G (20 / 5 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL (24 / 1 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL (50 / 10 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Cable (200 / 20 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Fibra 300 (300 / 100 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "Fibra Gigabit (1000 / 1000 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr "Configuración inicial de aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "¡Bienvenido a aMule!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+"Esta configuración corta te conectará. Puedes cambiar\n"
+"cualquiera de estos ajustes más adelante en Preferencias."
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "Elija un apodo que otros pares verán:"
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr "Conexión & ancho de banda"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+"Elija la opción que mejor coincida con su conexión a Internet,\n"
+"o establezca los límites de subida y descarga directamente debajo."
+
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "Velocidad de conexión:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr "Otros / configuración manual"
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "Límite de subida (KiB/s, 0 = ilimitado):"
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "Límite de descarga (KiB/s, 0 = ilimitado):"
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "Redes & puertos"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr "aMule puede usar dos redes. Recomendamos mantener ambos habilitados."
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Puerto TCP estándar "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Puerto UDP adicional (Kad / búsqueda global) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Activar UPnP para la redirección de puertos del router"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+"Permite a aMule pedir a su router que reenvíe los puertos por encima de otros\n"
+"los pares pueden llegar a usted (una\"ID Alta\"). Desactívelo si su router\n"
+"no soporta UPnP o si redirige los puertos manualmente."
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr "Archivos de inicialización"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+"Para empezar, aMule necesita saber sobre algunos pares.\n"
+"Seleccione las listas para descargar ahora:"
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Sus listas de pares ya existen - nada que descargar."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Autoactualizar la lista de servidores al inicio"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr "Integraciones (opcional)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+"Elija cómo unMule se integra con su sistema. Puedes\n"
+"cambiar cualquiera más adelante en Preferencias."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "Iniciar aMule automáticamente al iniciar sesión"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr "Registrar aMule para los enlaces ed2k://"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr "Registrar aMule para los enlaces magnet:"
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr "Sólo enlaces magnet compatibles con eD2k. Déjalo desactivado si usas un cliente BitTorrent."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr "Abrir archivos .emulecollection con aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr "Carpetas (opcional)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+"La configuración por defectos está bien para la mayoría de las personas. Cámbiala si\n"
+"desea descargas en un disco diferente (p. ej. disco más grande)."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Carpeta de destino para las descargas"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Examinar"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Todos los archivos de esta carpeta se comparten con otros usuarios)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Carpeta para los archivos temporales de las descargas"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+"En base a esto, aMule permitirá hasta %i fuentes por archivo\n"
+"y %i conexiones cliente."
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr "¿Quiere mostrar este asistente de configuración la próxima vez que abra aMule?"
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr "Configuración no terminada"
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "¡Error al abrir el archivo de amigos 'emfriends.met' para lectura!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "¡Error al abrir el archivo de amigos 'emfriends.met' para escritura!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr "Todavía no se conoce la dirección del amigo '%s', no se puede explorar."
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "CRÍTICO - no hay clientes en el inicio de sesión chat"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Amigos"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Mostrar los &detalles"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Añadir un amigo"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Eliminar al amigo"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Enviar un &mensaje"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Ver los archivos"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Asignar un puesto reservado de amigo"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr "Todavía no se conoce la dirección del amigo '%s', no se le puede enviar un mensaje."
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "¿Seguro que desea borrar al amigo seleccionado?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "¿Seguro que desea borrar los amigos seleccionados?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2135,977 +2899,1283 @@
 "No se le permite asignar más de un puesto reservado.\n"
 " Solo se ha asignado uno."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Selección múltiple"
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"No se le permite asignar más de un puesto reservado.\n"
-" Solo se ha asignado uno."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Enviar un mensaje al usuario"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Mensaje a enviar:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Borrar de Amigos"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Enviar un mensaje"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Intercambiar a este archivo"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr "Leyenda de color"
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "En la cola: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Se ha pedido otro archivo"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Esperando un puesto de subida"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "En la cola: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Subiendo"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Ninguno"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "No"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Sí"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Fallo al abrir la base de datos MaxMindDB '%s': %s"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Descargando..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "Descarga HTTP cancelada"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "El URL a descargar no puede estar en blanco"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "No se ha podido crear la petición HTTP para %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr "Descarga HTTP: cuerpo de respuesta vacío para %s"
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "No se ha podido mover el archivo descargado a %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Descargado %s (%llu bytes)"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr "La URL %s ha devuelto: %i"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Descarga HTTP fallida para %s: %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr "HTTP 401 No autorizado para %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr "GeoLite2-Country.mmdb migrado a %s"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr "IP2Country: Se ha seleccionado MaxMind como fuente GeoIP, pero no se ha configurado ninguna clave de licencia. Abra Preferencias → IP2Country, pegue su clave de licencia gratuita de MaxMind y haga clic en «Actualizar ahora»."
-
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr "IP2Country: Se ha seleccionado una URL personalizada como fuente GeoIP, pero no se ha configurado ninguna URL. Abra Preferencias → IP2Country e introduzca una URL que apunte a un archivo .mmdb (o .gz / .tar.gz que contenga uno)."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr "%s no es un archivo MaxMindDB legible - descartandolo. Una nueva copia se descargará en el siguiente inicio, o ahora a través de Preferencias -> IP2Country -> \"Actualizar ahora\"."
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "IP2Country: Se ha seleccionado MaxMind como fuente GeoIP, pero no se ha configurado ninguna clave de licencia. Abra Preferencias -> IP2Country, pegue su clave de licencia gratuita de MaxMind y haga clic en «Actualizar ahora»."
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "IP2Country: Se ha seleccionado URL personalizada como fuente GeoIP, pero no se ha configurado ninguna URL. Abra Preferencias -> IP2Country e introduzca una URL que apunte a un archivo .mmdb (o .gz / .tar.gz que contenga uno)."
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr "IP2Country: La resolución de la URL de la descarga de GeoIP ha fallado."
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr "Descargar nuevo %s desde %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "La descarga del archivo %s ha fallado, cancelando actualización."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Error al borrar el archivo %s, actualización cancelada."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Error al renombrar el archivo %s, actualización cancelada."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "Se ha actualizado %s con éxito"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr "Error actualizando %s"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr "Se ha producido un error al descargar el DB-IP del mes actual; se reintenta con la URL del mes anterior."
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Error al descargar %s desde %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Error al cargar los datos de países para '%s'."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Cargando los filtros de IP 'ipfilter.dat' e 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Error al cargar el archivo ipfilter.dat '%s', el formato encontrado es desconocido."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "Error al cargar el archivo ipfilter.dat '%s', no se ha podido abrir el archivo."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "Cargado %u rango de IP desde '%s'."
 msgstr1 "Cargados %u rangos de IP desde '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u línea malformada fue descartada."
 msgstr1 "%u líneas malformadas fueron descartadas."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Error al renombrar el nuevo archivo %s, actualización cancelada."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "El filtro de IP está listo"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Inicializar desde \n"
-"clientes conocidos"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Actual"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Media de ejecución"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Media de la sesión"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Nodos (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
-msgstr "IP no válida para la inicialización"
+msgstr "IP inválida para la inicialización"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Puerto no válido para la inicialización"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Por favor, rellene todos los campos requeridos"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Mensaje"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "¿Seguro que quiere descargar un nuevo archivo nodes.dat?\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Si lo hace, borrará sus nodos actuales y reiniciará la conexión Kademlia."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "¿Quiere continuar?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: palabra de búsqueda demasiado corta"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: la palabra de búsqueda ya está en la lista de búsqueda: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Error al leer el archivo nodes.dat - es demasiado antiguo. Esta versión (0) ya no está soportada."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Leído %u contacto Kad"
 msgstr1 "Leídos %u contactos Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Contactos no encontrados; por favor, inicialice o descargue un archivo nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Solo %d contacto Kad disponible, nodes.dat no escrito"
 msgstr1 "Solo %d contactos Kad disponibles, nodes.dat no escrito"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Escrito %d contacto Kad"
 msgstr1 "Escritos %d contactos Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Usuario Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr "La búsqueda de notas Kad para '%s' no se inició: Kad no está conectado"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr "La búsqueda de notas Kad para '%s' no se inició: ya hay una búsqueda de notas en ejecución para este archivo"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr "La búsqueda de notas Kad para '%s' no se inició: el archivo no está en la lista de compartidos, en la cola de descargas ni en los resultados de búsqueda"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr "La búsqueda de notas Kad para '%s' no se inició: otra búsqueda Kad (por ejemplo, una búsqueda de fuentes) ya está usando el hash de este archivo. Inténtelo de nuevo en breve"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr "La búsqueda de notas Kad para '%s' no se inició: PrepareLookup falló"
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Nombre del archivo"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Tamaño del archivo"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
-msgstr "Media de compartición"
+msgstr "Proporción de compartición"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Subido"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Pedido"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Fuentes completas"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "AVISO: la lista de archivos conocidos está dañada, contiene una cabecera inválida."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Error al cargar una entrada de la lista de archivos conocidos, el archivo debe de estar dañado"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Entrada inválida en lista de archivos conocidos, el archivo debe de estar dañado: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Por defecto"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanés"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Árabe"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturiano"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Euskera"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Búlgaro"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Catalán"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Chino (simplificado)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Chino (tradicional)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Croata"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Checo"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Danés"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Holandés"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Inglés (Reino Unido)"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "Inglés (EE.UU.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estonio"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finés"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francés"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Gallego"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Alemán"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Griego"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Húngaro"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italiano"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japonés"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Coreano"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "Letón"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Noruego (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polaco"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugués"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugués (brasileño)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Rumano"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Ruso"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Esloveno"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Español"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Sueco"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turco"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ucraniano"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Error desconocido %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "No se puede obtener la descripción del error para el error %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Creando el hash"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Completando"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Completado"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Pausado"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Erróneo"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Esperando"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Debe especificar una contraseña no vacía."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "¡Contraseña incorrecta, no es un hash MD5!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr "No se puede resolver %s a una dirección IPv4."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Error de conexión"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
 msgstr "Conexión Externa perdida - saliendo."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "La conexión EC ha fallado. Respuesta vacía."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr "No se puede configurar el cifrado de conexión. Conexión cerrada."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr "El núcleo no negoció una conexión encriptada. Puede ser un aMule antiguo sin soporte de encriptación, o la conexión puede haber sido manipulada. Para conectarse sin encriptación, desactívalo en la configuración de conexión."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Conexión externa: respuesta errónea, error al establecer la comunicación. Conexión cerrada."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Conexión externa: el demonio no ha podido demostrar conocer la contraseña. Conexión cerrada."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "¡Éxito! Conexión establecida con aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "¡Éxito! Conexión establecida."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Conexión externa: acceso denegado, razón: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Conexión externa: error al establecer la comunicación."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr "Error creando socket UDP %s %d : %s"
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Hilo Asio %d iniciado"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "Socket de escucha: correcto."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "ERROR: no se puede escuchar en el puerto TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "ERROR: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "AVISO: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr "Metadatos multimedia: no se encontró el binario de ffprobe. Instala ffmpeg o establece la ruta de ffprobe en las preferencias; la duración, la tasa de bits y el códec no se extraerán."
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr "Metadatos multimedia: %s ya no existe, nada que extraer"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr "Extrayendo metadatos multimedia con ffprobe: %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr "Metadatos multimedia: se superó el tiempo de espera de ffprobe o se canceló para %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr "Metadatos multimedia: se ignora la salida inverosímilmente grande de ffprobe para %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr "Metadatos multimedia: no se pudo ejecutar ffprobe (%s) -- compruebe la configuración de metadatos multimedia"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr "Metadatos multimedia: ffprobe falló (código %d) para %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr "Metadatos multimedia: ffprobe no encontró nada utilizable en %s"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 "Extracción de metadatos multimedia finalizada en %u archivo compartido (%u con error)"
+msgstr1 "Extracción de metadatos multimedia finalizada en %u archivos compartidos (%u con errores)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 "Se completó la extracción de metadatos multimedia de %u archivo compartido"
+msgstr1 "Se completó la extracción de metadatos multimedia de %u archivos compartidos"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 "Falló la extracción de metadatos multimedia en %u archivo más (no listado individualmente)"
+msgstr1 "Falló la extracción de metadatos multimedia en %u archivos más (no listados individualmente)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 "%u archivo compartido más ya no está disponible (no listado individualmente)"
+msgstr1 "%u archivos compartidos más ya no están disponibles (no listados individualmente)"
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "KiB/s"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Ilimitado"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Mostrar aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Ocultar aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr "Conectado (Id Baja)"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr "Conectado (Id Alta)"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr "Conectado (tras cortafuegos)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr "Servidor: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr "IP del servidor: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "No conectado"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Puerto TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Puerto TCP: no está listo"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Puerto UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Puerto UDP: no está listo"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Información del cliente"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Límite de subida"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Límite de descarga"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Mostrar aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Desconectar"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Ocultar aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Conectar"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Salir"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Ilimitado"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Menú de la bandeja de aMule"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Límites de velocidad:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "SU: ninguno"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "SU: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DES: ninguno"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DES: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Velocidad de descarga: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Velocidad de subida: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Alias: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "¡No hay ningún alias seleccionado!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID de cliente: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Nombre del servidor: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP del servidor: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "No conectado"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Firma digital: activada"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Firma digital: desactivada"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Tiempo en ejecución: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Archivos compartidos: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Clientes en cola: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Total DES: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Total SU: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Enlace eD2k: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr "Creado %s en el puerto %u"
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Añadir"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr "¡AVISO! %s: Paquete a %s descartado debido a error (%s) mientras se enviaba."
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr "Pegar eD2k o enlaces magnet aquí"
+
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "Añadir enlaces"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Haga clic aquí para añadir el enlace eD2k del campo de texto a la cola de descargas."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
-msgstr "Los eventos se muestran aquí. Para obtener una lista completa de eventos, vaya al registro de la pestaña de servidores."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr "Los eventos se muestran aquí. Para obtener una lista completa de eventos, vaya al registro de la pestaña de Redes."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Cargando..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Número de usuarios en el servidor al que está conectado..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Usuarios: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Usuarios conectados al servidor actual y una estimación del número total de usuarios."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Su: 0.0 | De: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Índice medio actual de subidas y descargas. Si está habilitado, los números entre paréntesis indican la sobrecarga en la comunicación con el cliente."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Muestra el estado de la conexión y las transferencias activas. Las flechas rojas significan que está desconectado, las flechas amarillas significan que tiene Id Baja (detrás de cortafuegos) y las flechas verdes significan que tiene Id Alta (el tipo de conexión óptima)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "No conectado..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Conectado al servidor."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Buscar"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nombre:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tipo"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Parámetros adicionales"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtrado"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Tipo de archivo"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Todos"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Archivos comprimidos"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "Imágenes de CD"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr "Imágenes de disco"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Imágenes"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programas"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Textos"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Extensión"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Tamaño mínimo"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "KiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "MiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "GiB"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Tamaño máximo"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Disponibilidad"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtro:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filtrar el resultado"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtro"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Invertir el resultado"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Ocultar los archivos conocidos"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr "Reiniciar filtros"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Comenzar"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Más"
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "Extender"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr "Pide a los pares Kad que ya han respondido que amplíen la búsqueda. Cada clic consulta al siguiente par más cercano para obtener más contactos (KADEMLIA_FIND_VALUE_MORE), revelando coincidencias de archivos adicionales que la frontera alfa inicial de la búsqueda no encontró."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
-msgstr "Parar"
+msgstr "Detener"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Descarga"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Descargar en la categoría"
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "Borrar resultados de búsqueda"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Reiniciar los campos"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Quita de la lista las descargas completadas"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Fuentes del archivo:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "General"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Nombre completo:"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/D"
-
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Archivo met:"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash:"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Tamaño:"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Estado del archivo de partes:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Visto completo por última vez:"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Nombre completo"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "Archivo met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
+
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Tamaño de archivo"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Transferencia"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Fuentes encontradas:"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Fuentes transfiriendo:"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Número de partes:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Disponibles:"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Tasa de datos:"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Tiempo activo de descarga: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Transferido:"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Tamaño completado:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Estado del archivo temporal"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Visto completo por última vez"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Fuentes encontradas"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Fuentes en transferencia"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Número de partes del archivo"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Disponible"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Tasa de datos"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Tiempo activo de descarga"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Tamaño completado"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Gestión inteligente de corrupción"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Perdido por corrupción:"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Ganado por compresión:"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Paquetes salvados por I.C.H.:"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Perdido por corrupción"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Ganado por compresión"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Paquetes salvados por I.C.H."
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr "Compartiendo"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Peticiones"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Peticiones aceptadas"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Datos transferidos"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Proporción de Compartición"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Fuentes completas"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "Compartido desde"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "Última subida"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr "Información del medio"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "Duración"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "Tasa de bits"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "Códec"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "Artista"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "Álbum"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Título"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Nombres del archivo"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Tomar"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Limpiar"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Aceptar"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Comentario/Valoración del archivo (el texto será visible para todos los usuarios)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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."
@@ -3113,1132 +4183,1227 @@
 "Para una película, puede poner su duración, historia, idioma...\n"
 "y si es una falsificación puede informar a los demás usuarios de aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Calidad del archivo"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Sin evaluar"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Inválido / Corrupto / Falsificación"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Pobre"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Aceptable"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Buena"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Excelente"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Elija la valoración del archivo o advierta a otros usuarios si no es válido..."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "Obtener desde Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Descargando; por favor, espere..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Tamaño desconocido"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Información requerida"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Dirección IP:"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Puerto:"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Puerto"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Nombre del usuario:"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Hash del usuario:"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Hash del usuario"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Añadir"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Velocidad de descarga"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Actual"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Media de ejecución"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Media de la sesión"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Velocidad de subida"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Conexiones"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Descargas activas"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Conexiones activas (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Subidas activas"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Árbol de estadísticas"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Nombre del usuario:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Hash del usuario:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Software del cliente:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Versión del cliente:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Software del cliente"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Versión del cliente"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID del usuario"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP del servidor"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Dirección IP:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Nombre del servidor"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID del usuario:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP del servidor:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Nombre del servidor:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Ofuscación:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Ofuscación"
+
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr "Extensiones del protocolo"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Transferencias al cliente"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Solicitud actual:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Velocidad media de subida:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Velocidad media de descarga:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Subido (sesión):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Descargado (sesión):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Subido (total):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Descargado (total):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Solicitud actual"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Velocidad media de subida"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Velocidad media de descarga"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Subido (sesión)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Descargado (sesión)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Subido (total)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Descargado (total)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modificador de DE/SU:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Identificación segura:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Rango de cola:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Puntuación de cola:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Identificación segura"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Puesto en cola"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Puntuación de cola"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Alias"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - la mula multiplataforma"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Este es el nombre que ven los otros usuarios al conectarse con usted."
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Idioma: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "El retardo antes de mostrar los mensajes emergentes."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Esto especifica el idioma usado en los controles."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Comprobar si hay una nueva versión al inicio"
-
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
-msgstr "Habilitando esto, hace que aMule compruebe si existe una nueva versión al inicio"
-
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
-msgstr "Iniciar aMule automáticamente al iniciar sesión"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
+msgstr "Comprobar periódicamente si hay una versión nueva"
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr "Habilitando esto hará que aMule compruebe si existe una versión nueva al inicio, y una vez al día mientras se ejecuta"
 
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr "Registra una entrada en el SO por usuario para arrancar automáticamente aMule al iniciar sesión. Si se mueve el binario de aMule, tras ello deberá lanzarse una vez manualmente para actualizar esa entrada."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr "Hace que aMule sea el manejador predeterminado de los enlaces ed2k://, de modo que al hacer clic en uno desde el navegador o el gestor de archivos se abra aquí."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr "aMule solo maneja enlaces magnet compatibles con eD2k (que contengan xt=urn:ed2k:). Los magnets de BitTorrent NO son compatibles y al hacer clic en ellos simplemente no funcionarán. Si usa un cliente BitTorrent (Transmission, qBittorrent, etc.), deje esta opción desactivada."
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr "Abriendo una cola de colección por cada eD2k enlace que contiene. En Windows esto añade aMule al menú \"Abrir con\" y se configura por defecto sólo cuándo ningún otro programa ha sido configurado."
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Iniciar minimizado"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Habilitando esto, hace que aMule se minimice al inicio."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Preguntar al salir"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Hace que aMule pregunte antes de salir."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Habilitar el icono de la bandeja"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Esto habilita/deshabilita el icono de la bandeja del sistema (o de la barra de tareas)."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Ocultar la ventana de la aplicación al pulsar el botón de cerrar"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimizar al icono de la bandeja"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Activando esto hace que aMule se minimice a la bandeja del sistema, en vez de a la barra de tareas."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "Mostrar notificaciones cuando acabe de descargar"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "Si se activa, aMule mostrará notificaciones cuando acabe de descargar."
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr "Recordar historia de búsqueda"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr "Mantiene una lista desplegable de búsquedas anteriores en el campo Nombre de la pestaña Buscar. Esto recuerda las búsquedas que usted escribió, no los resultados de la búsqueda."
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Retardo de los mensajes emergentes: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "segundos"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Selección del navegador"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Introduzca el nombre de su navegador. Déjelo en blanco si quiere usar el predefinido del sistema."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Examinar"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Abrir en una pestaña nueva si es posible"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Cuando sea posible, abrir la página web en una nueva pestaña en lugar de en una nueva ventana"
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Reproductor de vídeo"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Límites del ancho de banda"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Subida"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Asignación de puesto reservado"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Puertos"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Puerto TCP estándar "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Puerto UDP para peticiones del servidor (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Puerto UDP adicional (Kad / búsqueda global) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Este puerto UDP se usa para peticiones adicionales de eD2k y la red Kad"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Habilitar UPnP para el reenvío del puerto del \"router\""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "Puerto TCP para UPnP (opcional):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Dirección IP local de enlace (vacía para cualquiera):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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 tiene varias tarjetas de red, introduzca la dirección de la tarjeta que debe usar aMule."
 
-#: src/muuli_wdr.cpp:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr "Vincular a interfaz de red (vacío para cualquiera):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr "Solo para usuarios avanzados: fija todo el tráfico de aMule a una única interfaz de red, seleccionada de la lista o introducida por nombre (p. ej., tun0, eth0, en0) o por índice. A diferencia de vincularlo a una IP, esto evita que el tráfico se filtre por la ruta predeterminada, lo cual es útil con una VPN. No requiere privilegios elevados."
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Número máximo de fuentes descargando un archivo:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Número máximo de conexiones simultáneas:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Autoconectar al iniciar"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Reconectar al perder la conexión"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Eliminar los servidores caídos tras"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr "Los servidores estáticos nunca se eliminan, incluso cuando son inalcanzables."
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "reintentos"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Autoactualizar la lista de servidores al inicio"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Actualizar la lista de servidores al conectar a un servidor"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Actualizar la lista de servidores cuando se conecte un cliente"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Usar el sistema de prioridades"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Usar el control inteligente de Id Baja al conectar"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Conexión segura"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Autoconectar sólo a servidores fijos"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Asignar la prioridad alta a los servidores añadidos manualmente"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Gestión inteligente de corrupción (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Habilitar"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr "El I.C.H. avanzado confía en todos los hash (no recomendado)"
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Añadir los archivos a descargar en modo pausado"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Añadir las nuevas descargas con prioridad automática"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Intentar descargar antes el primer y último trozo"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr "Modo endgame: cambiar a fuentes más rápidas para los bloques finales"
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Descargar el siguiente archivo pausado cuando otro se complete"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Solo de la misma categoría"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "En orden alfabético"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Reservar el espacio en disco para los archivos nuevos"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Reserva en disco el espacio para los archivos nuevos enteros, reduciendo asíla fragmentación"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr "Crear nuevos archivos como archivos dispersos"
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr "Los archivos dispersos de partes sólo ocupan espacio de disco para las partes ya descargadas, por lo que el espacio libre se utiliza gradualmente a medida que el archivo se completa. Desactívalo para utilizar un archivo normal en su lugar - útil donde los archivos dispersos son incompatibles o lentos, o cuando las herramientas de copia de seguridad/de-duplicación no los gestionan bien. Sólo se aplica cuando el núcleo se ejecuta en Windows; en Linux y macOS los archivos de parte son dispersos de todos modos y este ajuste no tiene efecto."
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Detener las descargas cuando el espacio libre en disco alcance "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr "Seleccione esta opción si quiere que aMule compruebe el espacio en disco"
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Introduzca el espacio mínimo de disco deseado."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Guardar 10 fuentes para archivos raros (< 20 fuentes)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Subidas"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Añadir los nuevos archivos compartidos con prioridad automática"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Carpeta de destino para las descargas"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Gestión inteligente de corrupción (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Habilitar"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "El I.C.H. avanzado confía en todos los hash (no recomendado)"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr "Extracción de metadatos multimedia"
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "Extraer la duración, el bitrate y el códec de los archivos multimedia compartidos"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr "Cuando está activado, aMule ejecuta ffprobe en cada archivo multimedia compartido para rellenar las columnas de Duración / Bitrate / Códec que otros clientes ven cuando encuentran el archivo en una búsqueda. Requiere tener instalado ffmpeg (el binario ffprobe)."
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr "Ruta a ffprobe:"
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr "Ruta completa al binario de ffprobe. Déjelo vacío para que aMule lo detecte automáticamente al iniciar."
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr "Detectar"
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr "Buscar los lugares de instalación estándar para un binario ffprobe y rellenar el campo de la ruta."
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 "Las descargas completadas se guardan aquí. Todos los archivos de esta carpeta se compartirán automáticamente con otros usuarios.\n"
-"Si esta carpeta contiene archivos que no quiere compartir, apúntelo a un sub-directorio exclusivo para aMule"
+"Si esta carpeta contiene archivos que no quiere compartir, apúntelo a un sub-directorio exclusivo para aMule."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr "Elija la carpeta donde se guardarán las descargas terminadas. Todos los archivos de esa carpeta se compartirán con otros usuarios."
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr "(Todos los archivos de esta carpeta se comparten con otros usuarios)"
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Carpeta para los archivos temporales de las descargas"
-
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "Carpetas compartidas"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr "(Directorios compartidos por el núcleo. Introduzca una ruta para añadir uno.)"
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr "Ruta absoluta de un directorio en la máquina del núcleo, p. ej. /home/user/compartido"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr "Recursivo"
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr "Compartir todos los subdirectorios bajo éste, incluyendo los creados en el futuro."
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Borrar"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Haga clic derecho en los iconos de carpetas para compartirlas recursivamente)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Compartir los archivos ocultos"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr "Buscar cambios automáticamente en los directorios compartidos"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr "Seguir enlaces simbólicos en las carpetas compartidas"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr "Excluir archivos coincidentes:"
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr "Patrones comodines separados por '|', p.ej., .DS_Store|Thumbs.db|*.tmp. Los archivos cuyo nombre coincida no serán compartidos. No distingue mayúsculas/minúsculas."
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr "Los patrones son expresiones regulares"
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr "Cuando se activa, el campo completo es una expresión regular ('|' es or booleano). Cuando no se activa, es un listado de comodines separados por '|'."
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr "Muestra cuántos archivos compartidos excluiría el patrón actual."
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr "Cuando los archivos del núcleo conectado están en una máquina diferente, mapee un prefijo de ruta que informe desde donde ese sistema de archivos es accesible(p. e. una comparición de red) para que \"Abrir\" y \"Mostrar en carpeta\" funcionen."
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr "Mapeos de ruta"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr "Prefijo remoto"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr "Un prefijo de ruta como el núcleo lo informa, p. e. /home/user/downloads/incoming"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr "Prefijo local"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr "Donde la misma carpeta es accesible desde este ordenador, p. e. una carpeta de red montada"
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Intervalo de actualización: 5 s"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Tiempo de promedio del gráfico: 100 minutos"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala del gráfico de las conexiones: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Escala de la gráfica de descarga:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Escala de la gráfica de subida:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Colores: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Fondo"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Rejilla"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Descarga actual"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Promedio de descarga en ejecución"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Promedio de descarga en la sesión"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Subida actual"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Promedio de subida en ejecución"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Promedio de subida en la sesión"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Conexiones activas"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr "Barra de velocidad en el icono de la bandeja del sistema"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Nodos Kad actuales"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Nodos Kad activos"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Nodos Kad de la sesión"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Árbol"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Número de versiones de clientes a mostrar (0=sin límite)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "¡¡¡ AVISO !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Número máximo de nuevas conexiones cada 5 segundos"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr "Búsquedas simultáneas de fuentes Kad"
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr "Intervalo de búsqueda de fuentes Kad (minutos)"
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr "Intervalo re‐solicitud de fuentes (minutos)"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tamaño del búfer de archivo: 240000 bytes"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr "Usar MMAP: acceso a ficheros mapeados en memoria (menor uso de memoria)"
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr "Mapea los ficheros de partes en memoria en vez de usar un buffer en la pila, reduciendo la huella de memoria del proceso. Puede reducir la velocidad de descarga en algunos discos; es mejor usarlo en entornos con poca memoria o nodos que principalmente suban datos."
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Tamaño de cola de espera: 5000 clientes"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervalo de actualización de la conexión al servidor: desactivado"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Deshabilitar el modo de reposo del ordenador"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Tema a usar: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
-msgstr "Mostrar el \"Gestor rápido de enlaces eD2k\" en todas las ventanas"
+msgstr "Mostrar el \"Gestor rápido de enlaces eD2k\" en todas las ventanas."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Mostrar información adicional en las pestañas de las categorías"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Mostrar la versión de la aplicación en el título"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Mostrar las tasas de transferencia en el título"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Antes del nombre de la aplicación"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Después del nombre de la aplicación"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Mostrar el ancho de banda adicional usado"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Orientación vertical de la barra de herramientas"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr "Orden automático de columnas (reordena las filas según cambian sus valores)"
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Archivos de la cola de descarga"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Mostrar el porcentaje de progreso"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Mostrar la barra de progreso"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plana"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Redondeada"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Autoordenar los archivos (uso alto de CPU)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule ordenará automáticamente las columnas en la lista de descargas"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parámetros de la conexión externa"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Aceptar conexiones externas"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP de la interfaz que está escuchando:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "Introduzca aquí una IP válida en la forma a.b.c.d para la interfaz EC que está escuchando. Un campo vacío o 0.0.0.0 significará cualquier interfaz."
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Puerto TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Habilitar la redirección de puertos UPnP en el puerto EC"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr "Requiere conexiones encriptadas (rechaza clientes que no pueden encriptar)"
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr "Parámetros del servidor aMule API"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr "Ejecutar amuleapi (API REST) al iniciar"
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "Puerto HTTP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr "La interfaz en la que escucha el servidor HTTP de amuleapi es 127.0.0.1 (por defecto), que solo acepta conexiones locales; utilice 0.0.0.0 o una IP específica para exponerla a otros hosts (establezca una contraseña de administrador a continuación)."
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr "Escriba una contraseña para configurarla o cambiarla. Las contraseñas almacenadas no se pueden mostrar, así que dejar este vacío mantiene la actual."
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "Contraseña Admin"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "Se establece una contraseña."
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "Activar el acceso de invitados"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr "Las sesiones de invitados pueden leer el estado y las listas, pero no pueden cambiar nada. Desactivarlo borra la contraseña de invitados almacenada."
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "Contraseña de invitado"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Parámetros del servidor web"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "Arrancar el servidor web al inicio"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr "Ejecutar webserver al iniciar (obsoleto)"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Plantilla web"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Contraseña de administrador"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Permitir un invitado"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Contraseña del invitado"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
-msgstr "Habilitar el reenvío de puertos UPnP en el puerto del servidor web"
+msgstr "Habilitar la redirección de puertos UPnP en el puerto del servidor web"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Puerto TCP del servidor web para UPnP (opcional)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Intervalo de actualización de la página (en segundos)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Activar la compresión gzip"
 
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr "Restablecer a los valores por defecto"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr "Restablece los ajustes de la página actual a sus valores por defecto."
+
 # Se usa tanto en la pestaña «Información de Kad», en Redes, como para el
 # botón para cerrar el diálogo de Preferencias guardando los cambios. La
 # traducción sería distinta en cada caso, así que hay que dejar el OK
 # original.
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Haga clic aquí para aplicar los cambios hechos en las preferencias."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Cancelar los cambios hechos en las preferencias."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Título:"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Comentario:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Directorio entrante:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Cambiar la prioridad de los nuevos archivos asignados:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Directorio de archivos recibidos"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Cambiar la prioridad de los nuevos archivos asignados"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "No cambiar"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Seleccione el color para esta categoría (actualmente seleccionado):"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Borrar"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Seleccione el color para esta categoría (actualmente seleccionado)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Pulse este botón para borrar el registro."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Pulse este botón para actualizar la lista de servidores desde un URL..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Lista de servidores"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "Introduzca el URL de un archivo server.met y pulse el botón de la izquierda para actualizar la lista de servidores conocidos."
+msgstr "Introduzca la URL de un archivo server.met y pulse el botón de la izquierda para actualizar la lista de servidores conocidos."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Añadir servidor manualmente: Nombre"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Introduzca aquí el nombre del nuevo servidor"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Puerto"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Introduzca aquí la IP del servidor, usando el formato \"x.x.x.x\"."
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Introduzca el puerto del servidor."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Añadir manualmente un servidor (rellene antes los campos de la izquierda)..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Registro de aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Información del servidor"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Información sobre ED2K"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Información sobre Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Pulse este botón para actualizar la lista de nodos desde el URL..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nodos (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Introduzca el URL del archivo nodes.dat y pulse el botón de la izquierda para actualizar la lista de nodos conocidos."
+msgstr "Introduzca la URL del archivo nodes.dat y pulse el botón de la izquierda para actualizar la lista de nodos conocidos."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Estadísticas de nodos"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Inicialización"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nuevo nodo"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Puerto:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "Inicializar desde clientes conocidos"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Desconectar Kad"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr "Inicializar desde el nodo: IP"
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Introduzca aquí la IP del nodo, usando el formato \"x.x.x.x\"."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
-msgstr "Usar la identificación segura de usuario (ISU)"
+msgstr "Usar la Identificación Segura de Usuario (ISU)"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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 no está habilitada."
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Ofuscación de protocolo"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Permitir la ofuscación de protocolo"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Esta opción activa la ofuscación de protocolo y hace que aMule acepte conexiones ofuscadas de otros clientes."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usar la ofuscación para las conexiones salientes"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Esta opción hace que aMule use la ofuscación de protocolo cuando se conecta a otros clientes/servidores."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Aceptar sólo conexiones ofuscadas"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "Esta opción hace que aMule sólo acepte conexiones ofuscadas. Tendrá menos fuentes, pero todo su tráfico estará ofuscado"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Todos"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Nadie"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Quién puede ver mis archivos compartidos:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr "Seleccione quién puede solicitar ver la lista de sus archivos compartidos."
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Filtrado de direcciones IP"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtrar los clientes"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
-msgstr "Habilitar el filtrado de las IP de clientes definidas en el archivo ~/.aMule/ipfilter.dat"
+msgstr "Habilitar el filtrado de las IP de clientes definidas en el archivo ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtrar los servidores"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
-msgstr "Habilitar el filtrado de las IP de servidores definidas en el archivo ~/.aMule/ipfilter.dat"
+msgstr "Habilitar el filtrado de las IP de servidores definidas en el archivo ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Recargar la lista"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Recargar la lista de filtrado de IP desde el archivo ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Actualizar ahora"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Autoactualizar el filtro de IP al inicio"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Nivel de filtrado:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Filtrar siempre las IP de LAN"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Gestión paranoica de las IP que no coincidan"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Rechaza los paquetes para los que la IP del cliente es diferente de la IP desde donde se ha recibido el paquete. Úselo con cautela."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr "Rechaza un paquete cuando su IP de origen es diferente de la IP que el cliente dice tener (comprobación anti-suplantación). Desactivar sólo si causa problemas de conexión."
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Usar el ipfilter.dat del sistema si está disponible"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Si no hay un archivo ipfilter.dat local, permitir el uso de un archivo ipfilter del sistema."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Habilitar la firma digital"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Habilita la escritura de archivos de firma digital, algo que puede ser usado por las aplicaciones externas para crear firmas y cosas parecidas."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Frecuencia de actualización (segundos):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Cambiar la frecuencia (en segundos) de actualización de la firma digital."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Guardar el archivo de firma digital en: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "Pulse aquí para seleccionar el directorio que contiene los archivos de firmas digitales."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Mostrar las banderas de los países para los clientes"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr "Mostrar la columna de la bandera del país en las vistas de transferencias, cola y búsqueda. Requiere una base de datos MMDB GeoIP válida (ver más abajo)."
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr "Base de datos"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 msgid "Source:"
 msgstr "Fuente:"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr "DB-IP (gratis, sin crear una cuenta)"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr "MaxMind GeoLite2 (gratuito, requiere crear una cuenta)"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr "URL personalizada"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr "Elige qué proveedor ofrece la base de datos GeoIP MMDB. DB-IP es la opción predeterminada; no se necesita cuenta. MaxMind requiere una cuenta gratuita y una clave de licencia. Utiliza la opción 'URL personalizada' para indicar cualquier otro servidor MMDB (por ejemplo, un servidor espejo local)."
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4250,11 +5415,11 @@
 "Datos IP-País de DB-IP.com - https://db-ip.com\n"
 "Licencia: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr "Clave de licencia:"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4270,11 +5435,11 @@
 "Licencia: EULA de MaxMind GeoLite2 - https://www.maxmind.com/en/geolite2/eula\n"
 "Requiere la atribución de la fuente y el registro de una cuenta; actualizar al menos cada 30 días."
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
 msgstr "URL de descarga:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
@@ -4284,504 +5449,569 @@
 "La URL puede incluir credenciales (https://user:pass@host/...).\n"
 "Las condiciones de licencia y atribución dependen de la URL de descarga; la responsabilidad recae en ti."
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr "Descarga la base de datos GeoIP de la fuente seleccionada."
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr "Autoactualizar al inicio"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr "Vuelve a descargar la base de datos GeoIP desde la fuente seleccionada cada vez que se inicie aMule."
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrar los mensajes entrantes (salvo la conversación actual):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtrar todos los mensajes"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtrar los mensajes de gente que no esté en su lista de amigos"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtrar los mensajes de clientes desconocidos"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrar los mensajes que contengan (use ',' como separador):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "añada aquí las palabras que amule debe filtrar para bloquear los mensajes que las incluyan"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Mostrar los mensajes recibidos en el registro"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Comentarios"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrar los comentarios que contengan (use ',' como separador):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Habilitar la autentificación"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Habilitar/deshabilitar la autenticación mediante usuario/contraseña"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Nombre de usuario: "
-
-#: src/muuli_wdr.cpp:2689
-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:2691
-msgid "Password:"
-msgstr "Contraseña:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "La contraseña a usar para conectar al proxy"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Habilitar el proxy"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Habilitar/deshabilitar el soporte para proxy"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Tipo de proxy:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Servidor proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Tipo de proxy"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Servidor proxy"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Nombre del host del proxy"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Puerto del proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Puerto del proxy"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "El puerto del proxy"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Habilitar la autentificación"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Habilitar/deshabilitar la autenticación mediante usuario/contraseña"
+
+#: src/muuli_wdr.cpp
+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
+msgid "The password to use to connect to the proxy"
+msgstr "La contraseña a usar para conectar al proxy"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Conectar a:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Conexión a aMule remoto"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Nombre de usuario"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Recordar estas opciones"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "Cifrar la conexión (recomendado)"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr "Forzar compresión ZLIB"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Habilitar el modo detallado de depuración."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Sólo al archivo de registro"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Categorías de mensajes:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Añadir lo importado"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Reintentar seleccionado"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Borrar seleccionado"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Tipos de evento"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr "Estadísticas y clientes en la cola para los archivos seleccionados: Sesión / Total"
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Subidas activas"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Porcentaje del total de archivos"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Mostrar los clientes para"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Archivos seleccionados"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Solo las subidas activas"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Mostrar los clientes para"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Recargar:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Recargar los archivos compartidos"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Enviar"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Envía el mensaje especificado."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Cerrar esta sesión de chat."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Conectar a cualquier servidor y/o a Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "Cancelar %s"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Compartidos"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "Desconectar %s"
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "Conectar %s"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Deshabilitado %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
 msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "TiB"
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/s"
 msgstr1 "bytes/s"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "MiB/s"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "s"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "minutos"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "horas"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Días"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "días"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "Todo"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "El resto"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Incompleto"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Detenido"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Archivos"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Texto"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Activo"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Usando el directorio de configuración: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr "La fuente no tiene la parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr "Ambos, tú y esta fuente, tenéis la parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr "Está siendo descargado de esta fuente ahora"
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr "La próxima parte se le pedirá a esta fuente"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr "Esta fuente tiene la parte y todavía la necesitas"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr "Este par ya tiene la parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr "Este par no tiene la parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr "Ninguna otra fuente tiene esta parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr "Otra fuente tiene esta parte"
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr "Otras %u fuentes o más tienen esta parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr "Ya releído y calculado el hash"
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr "Pendiente de leer"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr "Un bloque por parte del archivo que se está descargando."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr "Un bloque por parte del archivo compartido."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Un bloque por parte del archivo compartido, coloreado según cuántas otras fuentes la tienen."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Un bloque por parte del archivo compartido, que muestra hasta dónde ha leído el recálculo del hash."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr "Intermedio, oscureciéndose a medida que se añaden otras fuentes"
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Esperando que la tarea de conversión del archivo de partes termine..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Importando %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Leyendo el directorio temporal"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Obteniendo información básica del archivo de información de descarga"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Creando el archivo de destino"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Cargando datos desde un antiguo archivo de descarga (%u de %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Obteniendo información del archivo fuente de descarga"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Añadiendo descarga y guardando el nuevo archivo de partes"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importar archivos de partes"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Estado"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Hash del archivo"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Disco: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "¡Por favor, elija un directorio donde buscar descargas temporales! (se incluirán los subdirectorios)"
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "¿Quiere que los archivos originales de las descargas importadas con éxito sean borrados?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "¿Quiere borrar las fuentes?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "ERROR: no se ha podido crear el archivo de partes"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Intentando cargar una copia de seguridad del archivo met desde %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, 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:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, 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:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Error: %s (%s) está dañado (etiquetas erróneas: %s), no se puede cargar el archivo."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "ERROR: %s (%s) está dañado (número de etiquetas erróneo), no se puede cargar el archivo."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Intentando recuperar información del archivo..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "Recuperando un archivo sin nombre - se intenta recuperarlo como RecoveredFile.dat"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Recuperada toda la información disponible del archivo :D - Intentando usarla..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "No se puede recuperar la información del archivo :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Error al abrir %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "AVISO: %s puede estar dañado (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "ERROR al guardar el archivo de partes: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Error de E/S al guardar el archivo de partes: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr "Se escribieron 0/desconocidos bytes a '%s' -- conservando .part.met existente."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "Error al guardar el archivo part.met.seeds para %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Se ha guardado %i semilla de fuentes para el archivo de partes: %s (%s)"
 msgstr1 "Se han guardado %i semillas de fuentes para el archivo de partes: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "No se puede leer el archivo de semillas para el archivo de partes %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "Error al leer el archivo de semillas del archivo de partes (%s - %s): %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Parte corrupta encontrada (%d) en %d archivo de partes %s - Resultado del hash del archivo |%s| Hash del archivo |%s|"
 msgstr1 "Parte corrupta encontrada (%d) en %d partes del archivo %s - Resultado del hash del archivo |%s| Hash del archivo |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Parte completada encontrada (%i) en %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Recálculo del hash terminado %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Error imprevisto mientras se completaba %s. Archivo pausado"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Descarga terminada: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4790,306 +6020,153 @@
 "Descarga terminada: \n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Borrando archivo: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "AVISO: no se puede crear el hash de la parte descargada - hashset incompleto para '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, 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 - hashset incompleto (%s). Esto no debería pasar nunca"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr "Parte %u de '%s' marcada completa, pero el archivo de partes es más corto de lo esperado (tiene %llu bytes, necesita %llu); reabriendo hueco para re-descargarlo."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "Se ha alcanzado el final del fichero al crear el hash de la parte descargada %u con longitud %u (máximo %u) del archivo de partes '%s' con longitud %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "AVISO: ¡no hay suficiente espacio libre en el disco! Se pausa el archivo: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Parte descargada %i corrupta en el archivo: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Asignando"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Espacio en disco insuficiente"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Descargado"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ERROR: no se ha podido abrir el archivo de partes '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Por defecto"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanés"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Árabe"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Euskera"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Catalán"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Chino (simplificado)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Chino (tradicional)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Croata"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Checo"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danés"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Holandés"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Inglés (Reino Unido)"
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr "Inglés (EE.UU.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estonio"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finés"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francés"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Gallego"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Alemán"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Griego"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebreo"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Húngaro"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italiano (suizo)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japonés"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Noruego (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polaco"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugués"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugués (brasileño)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Rumano"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Ruso"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Esloveno"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Español"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Sueco"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr "Intercambio de fuentes extendido"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr "Superación de NAT (uTP)"
+
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr "Solicitud de información del compañero"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr "Superación de NAT (QUIC)"
 
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turco"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ucraniano"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Cambiar el idioma"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "No hay traducciones instaladas para aMule"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "No hay idiomas disponibles"
-
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "no hay opciones disponibles"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr "Mapa de ruta inválida, saltando"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Categoría inválida encontrada, se omite"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr "El puerto TCP no puede ser mayor que 65532 debido a que el socket del servidor UDP es TCP+3"
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Puerto por defecto que será usado (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Conexión"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Directorios"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Servidores"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Archivos"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Seguridad"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr "IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtros"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Controles remotos"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Firma digital"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Eventos"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Depurando"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5099,15 +6176,15 @@
 "    %PARTFILE - ruta completa al archivo\n"
 "    %PARTNAME - nombre del archivo"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr "El icono de la bandeja requiere libayatana-appindicator3 en tiempo de compilación."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr "No disponible en Wayland: el protocolo no informa cuando una ventana es minimizada, por lo que esta opción no puede interceptar el botón de minimizar del sistema. Como alternativa: lanzar aMule con `GDK_BACKEND=x11` para usar XWayland."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5123,26 +6200,42 @@
 "aMule funciona bien sin cambiar ninguno de\n"
 "estos parámetros."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "El tipo de proxy al que se está conectando"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "Sin contraseña guardada."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "Acceso de invitado necesita una contraseña. Escriba una en el campo de contraseña del invitado, o desactiva Habilitar acceso de invitado."
+
+#: src/PrefsUnifiedDlg.cpp
+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 ""
+"Tiene habilitadas las conexiones externas, pero no ha especificado ninguna contraseña.\n"
+"Las conexiones externas no pueden ser habilitadas a menos que especifique una contraseña válida."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5150,31 +6243,43 @@
 "aMule debe reiniciarse para aplicar los cambios:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- El puerto TCP ha cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- El puerto UDP ha cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr "- La interfaz de red vinculada ha cambiado.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- El puerto para la conexión externa ha cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- La aceptación de conexión externa ha cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- La interfaz de conexión externa ha cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- El soporte de ofuscación de protocolo ha cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr "- Los ajustes proxy cambiaron (necesario para transferencias HTTP).\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr "- Ajustes de amuleapi modificados.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5182,27 +6287,32 @@
 "Su lista autoactualizable de servidores esta vacía.\n"
 "Se desactivará 'Autoactualizar la lista de servidores al inicio'."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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 ""
-"Tiene habilitadas las conexiones externas, pero no ha especificado ninguna contraseña.\n"
-"Las conexiones externas no pueden ser habilitadas a menos que especifique una contraseña válida."
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr "La contraseña amuleapi no se ha podido guardar: %s"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Idioma cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Carpeta temporal cambiada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- Red ED2K habilitada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr "El patrón de exclusión de archivos compartidos no es una expresión regular válida. El filtro ha quedado deshabilitado."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "Expresión regular no válida"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5210,7 +6320,7 @@
 "eD2k y Kad están desactivados.\n"
 "No podrá conectarse hasta que active al menos uno de ellos."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5218,7 +6328,7 @@
 "Kad no se inicia si el puerto UDP está deshabilitado.\n"
 "Habilite un puerto UDP o deshabilite Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5228,19 +6338,66 @@
 "DEBE reiniciar aMule ahora.\n"
 "Si no reinicia ahora, no se queje si sucede algo malo.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr "No se pudo registrar aMule para arrancar automáticamente al iniciar sesión. El almacén de arranque automático podría ser de sólo lectura."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr "No se pudo eliminar la entrada de arranque automático."
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr "Arranque automático"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr "Registrar tipo de archivo"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr "Registrar manejador de URL"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr "aMule sólo maneja magnet:\\\\ compatibles con eD2k. Si reemplazas el manipulador de magnet:\\\\ actual (%s), los enlaces magnet de BitTorrent dejarán de funcionar: aMule no puede descargar contenido BitTorrent. ¿Continuar?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr "Otra aplicación es actualmente la predeterminada para abrir ficheros .emulecollection (%s). ¿Reemplazarlo por aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr "Otra aplicación es actualmente el controlador predeterminado para estos enlaces (%s). ¿Reemplazarlo por aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "No se pudo registrar aMule para archivos .emulecollection. El almacenamiento del registro podría ser de sólo lectura."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr "No se pudo quitar el registro para tipo de archivo."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "No se pudo registrar aMule como el manejador de URL. El almacenamiento del registro podría ser de sólo lectura."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr "No se pudo retirar el manejador URL del registro."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "El servidor web y el API de aMule requieren que las conexiones externas estén habilitadas."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr "El servidor web aMule está obsoleto. Considere usar el API de aMule en su lugar."
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5250,41 +6407,64 @@
 "Por favor, introduzca al menos un URL que apunte a un archivo server.met válido.\n"
 "Haga clic en el botón \"Lista\" junto a esta casilla para introducir un URL."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Archivos temporales"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Archivos entrantes"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Firmas digitales"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Elija una carpeta para %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Excluiría %u de %u archivo compartido"
+msgstr1 "Excluiría %u de %u archivos compartidos"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Buscar un reproductor de vídeo"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Seleccione el navegador"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr "Seleccione el binario ffprobe"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Ejecutable %s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr "ffprobe no se encuentra en la ruta PATH o en las ubicaciones estándar de instalación. Instala ffmpeg (el cual provee ffprobe) o utiliza Examinar para elegir un binario manualmente."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr "¿Desea restablecer los ajustes de esta página a sus valores por defecto?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr "Restablecer a valores por defecto"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Editar la lista de servidores"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5292,114 +6472,114 @@
 "Añada aquí los URL para descargar los archivos server.met.\n"
 "Sólo un URL por línea."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr "Error al actualizar IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr "Datos de MaxMind GeoLite2"
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr "Fuente personalizada"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr "Datos de DB-IP.com"
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr "Estado: Cargado%s"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Estado: Cargado%s -%s"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr "Estado: No se ha podido cargar. Haz clic en 'Actualizar ahora' para refrescar."
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr "Estado: No encontrado. Haz clic en 'Actualizar ahora' para descargarlo."
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Intervalo de actualización: %d segundo"
 msgstr1 "Intervalo de actualización: %d segundos"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Tiempo medio del gráfico: %d minuto"
 msgstr1 "Tiempo medio del gráfico: %d minutos"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Escala gráfica de conexiones: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Tamaño del búfer de archivo: %d byte"
 msgstr1 "Tamaño del búfer de archivo: %d bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Tamaño de la cola de subida: %d cliente"
 msgstr1 "Tamaño de la cola de subida: %d clientes"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Intervalo de actualización de la conexión al servidor: %d minuto"
 msgstr1 "Intervalo de actualización de la conexión al servidor: %d minutos"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Intervalo de actualización de la conexión al servidor: deshabilitado"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Ejecutar comando en el evento '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Habilitar la ejecución de comandos en el núcleo"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Comando del núcleo:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Habilitar la ejecución de comandos en la interfaz"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Comando de la interfaz:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Las siguientes variables serán sustituidas:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
@@ -5407,1073 +6587,1324 @@
 "Estas carpetas parecen ubicaciones sensibles o de sistema:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr "Compartirlas recursivamente publicará todos los archivos en las redes eD2k/Kad. ¿Realmente quiere hacerlo?"
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr "Confirmar carpetas compartidas"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
 msgstr "Recargando los archivos compartidos..."
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
-msgstr "Escaneando por subcarpetas..."
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
+msgstr "Buscando subdirectorios..."
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr "Actualizando carpetas compartidas"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
-msgstr "Escaneadas %u carpetas"
+msgid "Scanned %u directories..."
+msgstr "Escaneadas %u carpetas..."
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Recargando archivos compartidos: %u archivos escaneados."
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr "Carpeta compartida"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr "Tanto el prefijo remoto como local debe ser rellenado."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr "Este prefijo remoto ya está mapeado."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr "Elija la carpeta local"
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "Borrar historial de búsqueda"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr "¿Borrar el historial de búsqueda guardado? Esto no se puede deshacer."
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Aviso de búsqueda"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "No se puede buscar con eD2K y Kademlia deshabilitadas."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "Error de búsqueda"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
-msgstr "Búsqueda Kad: solicitados más resultados a otro par."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
+msgstr ""
+"Todavía se esta realizando una búsqueda de eD2k. Comenzar una nueva la detendrá, porque el protocolo eD2k permite sólo una búsqueda a la vez.\n"
+"\n"
+"Los resultados ya encontrados se mantienen; sólo los nuevos dejan de llegar.\n"
+"\n"
+"¿Iniciar la nueva búsqueda de todas formas?"
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr "Búsqueda Kad: no quedan pares a los que volver a pedir más resultados (límite alcanzado o aún sin respuestas)."
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr "Búsqueda en curso"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr "El tamaño mínimo debe ser menor que el tamaño máximo. Tamaño máximo ignorado."
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Aviso de búsqueda"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Principal"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "No se puede buscar en Kad si no está conectado a Kad"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr "Guardando sólo el %u más reciente de %u búsquedas abiertas a %s."
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr "Guardando sólo el primer %u de %u resultados de búsqueda \"%s\"."
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "AVISO: la lista de búsqueda almacenada está dañada, contiene una cabecera inválida."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Entrada inválida en la lista de búsqueda almacenada, el archivo podría estar dañado,"
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "No hay ninguna palabra para buscar con Kad - cancelada"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Error imprevisto al intentar la búsqueda en Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID del archivo"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr "La búsqueda superó el tiempo de espera: el servidor no respondió."
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr "Duración"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Búsqueda Kad: solicitados más resultados a otro par."
 
-#: src/SearchListCtrl.cpp:105
-msgid "Bitrate"
-msgstr "Tasa de bits"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Búsqueda Kad: no quedan pares a los que volver a pedir más resultados (límite alcanzado o aún sin respuestas)."
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr "Códec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "Error %u: %s\n"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Descargar en la categoría"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ID del archivo"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Obtener %s para este archivo"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "Expandir todo"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "Cerrar todas"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Buscar archivos relacionados (eD2k, servidor local)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Marcar como archivo conocido"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Copiar el enlace eD2k al portapapeles"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Copiar los enlaces eD2k al portapapeles"
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
-msgstr "Actualmente no estás conectado a un servidor que admita la función de búsqueda de 'Archivos relacionados'."
+msgstr "Actualmente no estás conectado a un servidor que admita la función de búsqueda de 'Archivos Relacionados'"
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Cancelada"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Nuevo"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr "en ejecución"
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "Finalizado"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr "En espera"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr "Búsqueda %u: %s, %u %% (%u resultados)\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr "Búsqueda %u \"%s\": %s, %u %% (%u resultados)\n"
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr "Búsqueda expirada o ID desconocido. Inicie una nueva búsqueda.\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Progreso de la búsqueda: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Progreso de la búsqueda no disponible"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr "No hay búsquedas sobre las que informar.\n"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "No se pudo conectar a ninguno de los servidores ofuscados estáticos en la lista. Haciendo otro intento sin ofuscación."
+
+#: src/ServerConnect.cpp
 msgid "Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."
 msgstr "Error al conectar a todos los servidores ofuscados listados. Se va a dar otra pasada 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. Se va a dar otra pasada."
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
+msgstr "No se pudo conectar a ninguno de los servidores estáticos en la lista."
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr "No se pudo conectar a ninguno de los servidores en la lista."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Se reintentará la conexión automática al servidor en %d segundo"
+msgstr1 "Se reintentará la conexión automática al servidor en %d segundos"
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "Protocolo eD2k deshabilitado en las preferencias, no se hace la conexión."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr "No se han encontrado servidores válidos a los que conectar en la lista de servidores"
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Conectado a %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Conexión establecida en: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Error fatal al hacer la conexión. La conexión a Internet podría estar caída"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Conexión perdida con %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) parece estar caído."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) parece estar lleno."
 
-#: 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"
-msgstr0 "Se reintentará la conexión automática al servidor en %d segundo"
-msgstr1 "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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Error al conectar con %s (%s:%i)."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
-msgstr "ERROR: socket no válido en la comprobación de tiempo de espera."
+msgstr "ERROR: socket no válido en la comprobación de tiempo de espera"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Tiempo de espera agotado al intentar conectar con %s (%s:%i)."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Recibido un resultado tardío de búsqueda de DNS, se descarta."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Cargando el archivo server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "¡Archivo server.met no encontrado!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Error al cargar el archivo server.met '%s', el formato encontrado es desconocido."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "¡Error al abrir server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Archivo server.met dañado, encontrada etiqueta de versión no válida: 0x%x, tamaño %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i servidor encontrado en server.met"
 msgstr1 "%i servidores encontrados en server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d servidor añadido"
 msgstr1 "%d servidores añadidos"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Error: el fichero 'server.met' está dañado: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "Error de E/S al leer 'server.met': "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr "Servidor no añadido: %s:%d no especifica un puerto válido."
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr "Servidor no añadido: se ha encontrado un servidor con un par IP:Puerto %s:%d que coincide en la lista."
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Está conectado al servidor que está intentando borrar. Por favor, desconéctese primero."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Error al abrir '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "¡Error al guardar server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Error de E/S al escribir 'server.met': %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "URL no válido"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Descarga de la lista de servidores finalizada desde %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "No se ha encontrado una entrada de dirección en 'addresses.dat'. Por favor, pegue una lista de servidores válida en este archivo para poder actualizar de forma automática la lista de servidores"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Descargando lista de servidores de %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "AVISO: ha especificado un URL inválido para la actualización automática de servidores: %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "No hay ningún URL válido para la autodescarga de server.met en addresses.dat"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Error al descargar la lista de servidores desde %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "El servidor local está filtrado por los filtros de IP, ¡conectando a un servidor diferente!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Descripción"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Usuarios"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "Usuarios Máximos"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Servidor fijo"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versión"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr "Archivos suaves"
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr "Archivos duros"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr "Flags TCP"
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr "Flags UDP"
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Está conectado a un servidor que está intentando borrar. Desconéctese primero. El servidor NO ha sido borrado."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Nombre desconocido)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "¿Seguro que quiere eliminar el servidor fijo %s?"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "ms"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Servidores (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Servidor"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Conectar al servidor"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Marcar el servidor como fijo"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Desmarcar el servidor como fijo"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Marcar los servidores como fijos"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Desmarcar los servidores como fijos"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Borrar el servidor"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Borrar los servidores"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Eliminar todos los servidores"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Copiar los enlaces eD2k al portapapeles"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Reconectar al servidor"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "¿Seguro que desea borrar todos los servidores?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "¿Seguro que desea borrar el servidor seleccionado?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "¿Seguro que desea borrar los servidores seleccionados?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ERROR: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "AVISO: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr "El servidor %s (%s) rechazó nuestro login (no se asignó ID de cliente). Desconectando."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "El nuevo ID de cliente es %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "AVISO: ¡ha recibido Id Baja!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\tEsto sucede porque está detrás de un cortafuegos o de un \"router\"."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPara obtener más información, diríjase a https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "¡Información desconocida del servidor recibida! - demasiado pequeña"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Recibido %d servidor nuevo"
 msgstr1 "Recibidos %d servidores nuevos"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Guardado de la lista de servidores completado."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "El servidor ha rechazado el último comando"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Paquete erróneo recibido desde el servidor: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Error no gestionado mientras se procesaba un paquete del servidor: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr "No se puede crear un hilo de resolución de DNS para conectar con %s"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "La IP %s (%s) del servidor está filtrada. No se hace la conexión."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "usando ofuscación de protocolo."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Conectando a %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr "No se puede resolver dns para el servidor %s: ¡no se puede conectar!"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "Registro de aMuleGUI"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Servidor no añadido: IP o nombre de host no especificado."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Servidor no añadido: el par servidor-puerto dado no es válido."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Estado de eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr "Tipo de conexión:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "Conectado desde:"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Estado de Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Ejecutándose en modo Red Local"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "En ejecución"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "ID de cliente Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Estado:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Estado de la conexión:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr "Tras cortafuegos - abra el puerto TCP %d en su \"router\" o cortafuegos"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Estado de la conexión UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr "Tras cortafuegos - abra el puerto UDP %d en su \"router\" o cortafuegos"
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Estado tras cortafuegos: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "No se requiere amigo - puerto TCP abierto"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "No se requiere amigo - puerto UDP abierto"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Sin amigo"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Conectando a amigo"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Conectando a amigo en %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Dirección IP:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Fuentes indizadas:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Palabras clave indizadas:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Notas indizadas:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Carga indizada:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Media de usuarios:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Media de archivos:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "No está en ejecución"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr "Vigilante de directorios compartidos: desbordamiento/error de backend (%s); volviendo a recargar completamente"
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 "Vigilante de directorios compartidos: se encontró %u nuevo subdirectorio desde la última ejecución; se re-escanean los archivos compartidos"
+msgstr1 "Vigilante de directorios compartidos: se encontraron %u nuevos subdirectorios desde la última ejecución; se re-escanean los archivos compartidos"
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr "Vigilante de directorios compartidos: eventos descartados por el backend, forzando una recarga completa de archivos compartidos para resincronizar"
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Añadiendo archivo %s a compartidos"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Encontrado %i archivo compartido"
 msgstr1 "Encontrados %i archivos compartidos"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Encontrado %i archivo compartido, %i desconocido"
-msgstr1 "Encontrados %i archivos compartidos, %i desconocidos"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 "Se excluyó %i archivo de compartidos por el filtro"
+msgstr1 "Se excluyeron %i archivos de compartidos por el filtro"
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "ERROR: intentando compartir %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Directorio compartido no encontrado, se omite: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "No se han encontrado archivos para compartir en el directorio: %s"
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Directorio compartido no legible, se omite: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Nombre de usuario"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr "La extracción de metadatos multimedia está desactivada en preferencias, por lo que no hay nada que re-extraer."
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Velocidad de descarga"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 "Reextrayendo metadatos multimedia de %u archivo compartido"
+msgstr1 "Reextrayendo metadatos multimedia de %u archivos compartidos"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Velocidad de subida"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "Se ha comenzado a compartir el archivo: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Se ha dejado de compartir el archivo borrado: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Se ha dejado de compartir %u archivo de la carpeta eliminada: %s"
+msgstr1 "\"Se ha dejado de compartir %u archivos de la carpeta eliminada: %s\""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Compartiendo ahora %u archivo encontrado en una nueva carpeta compartida"
+msgstr1 "Compartiendo ahora %u archivos encontrados en nuevas carpetas compartidas"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Descubierto %u nuevo archivo compartido"
+msgstr1 "Descubiertos %u nuevos archivos compartidos"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Nombre de usuario"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Partes disponibles"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr "Partes en el par"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Estado de la subida"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Nombre del archivo local"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Lista de compartidos"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Peticiones"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Peticiones aceptadas"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Datos transferidos"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Media de compartición"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Partes obtenidas"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr "Disponibilidad de fuentes"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Fuentes completas"
-
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Ruta del directorio"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Compartidos"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Añadir comentario/valoración"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Editar comentario/valoración"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr "Verificar datos locales"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr "Reextraer &metadatos multimedia"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Añadir los archivos de la colección a la lista de descargas"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Copiar el &URI magnético al portapapeles"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Copiar el enlace eD2k al portapapeles (&Fuente)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Copiar el enlace eD2k al portapapeles (Fuente) (&Con opciones de cifrado)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Copiar el enlace eD2k al portapapeles (&Nombre del host)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 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/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Copiar el enlace eD2k al portapapeles (información de &AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Copiar el enlace eD2k al portapapeles (información de &AICH + fuente)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr "Exportar archivos seleccionados a una Colección de eMule"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr "La verificación de datos locales en archivos de partes no está aún implementada: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 "Metadatos multimedia: omitiendo %u descarga incompleta"
+msgstr1 "Metadatos multimedia: omitiendo %u descargas incompletas"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 "Metadatos multimedia: omitiendo %u archivo que no es de audio ni vídeo"
+msgstr1 "Metadatos multimedia: omitiendo %u archivos que no son de audio ni vídeo"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 "¿Volver a extraer metadatos multimedia de %u archivo?"
+msgstr1 "¿Volver a extraer metadatos multimedia de %u archivos?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 "Se omitirá %u descarga incompleta."
+msgstr1 "Se omitirán %u descargas incompletas."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 "%u archivo no es de audio ni vídeo y se omitirá."
+msgstr1 "%u archivos no son de audio ni vídeo y se omitirán."
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr "Esto se ejecuta en segundo plano. El progreso se muestra en el registro."
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr "Reextraer metadatos multimedia"
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Necesita Id Alta para crear un enlace fuente válido"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr "Exportar a emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr "No se seleccionan archivos para exportar."
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr "Colecciones de eMule(*.emulecollection)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr "'%s' ya existe. ¿Desea sobreescribirlo?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Fallo al escribir el archivo de colección '%s'."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Exportado %u archivo compartido a '%s."
+msgstr1 "Exportados %u archivos compartidos a '%s."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Tamaño total de los archivos compartidos: %s (%s completados)"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Tamaño total de los archivos compartidos: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Archivo compartido (%i, generando huella %u más)"
+msgstr1 "Archivos compartidos (%i, generando huella %u más)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Archivos compartidos (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Archivo de partes"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Recargando archivos compartidos: %u archivos escaneados"
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr "Estado de partes"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Nombre del archivo remoto"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Datos subidos (sesión (total)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Tráfico adicional total (paquetes): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Tráfico adicional por peticiones de archivos (paquetes): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Tráfico adicional por intercambio de fuentes (paquetes): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Tráfico adicional del servidor (paquetes): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Tráfico adicional por Kad (paquetes): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Tráfico adicional por el cifrado (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Subidas activas: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Subidas en espera: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Total de sesiones de subida satisfactorias: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Total de sesiones de subida erróneas: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Tiempo medio de subida: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Datos descargados (sesión (total)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Fuentes encontradas: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Descargas activas (trozos): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Índice de SU:DE de la sesión (total): %s"
+msgstr "Proporción de SU:DE de la sesión (total): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Velocidad media de descarga (sesión): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Velocidad media de subida (sesión): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Velocidad máxima de descarga (sesión): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Velocidad máxima de subida (sesión): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Reconexiones: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Tiempo desde la primera transferencia: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Conectado al servidor desde hace: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Conexiones activas (estimado): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Alcanzado límite máximo de conexiones: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Media de conexiones (estimada): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Pico de conexiones (estimado): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Clientes"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Desconocidos: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtrados: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Bloqueados: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr "Direcciones bloqueadas de Kad: %s"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Total: %i, conocidos: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Servidores activos: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Servidores caídos: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Total: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Servidores borrados: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Servidores filtrados: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Usuarios en servidores activos: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Archivos en servidores activos: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Total de usuarios: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Total de archivos: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Ocupación de servidores: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Número de archivos compartidos: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Tamaño total de los archivos compartidos: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Tamaño medio de archivo: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "No recibido"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Conexiones activas (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "No disponible"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Nunca"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "El comando '%s' con pid '%d' ha terminado con el código de salida '%d'."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Ejecute <str> y salga."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr "Separar los campos de la lista con espacios, como antes, en lugar de tabulaciones."
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr "Formato de IP no válido. Use xxx.xxx.xxx.xxx:xxxx\n"
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 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), nombre de archivo o un número.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Procesando por hash: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Procesando por nombre de archivo: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Este comando requiere un argumento. Argumentos válidos: un hash de archivo.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Número inválido\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6483,7 +7914,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6493,7 +7924,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6501,76 +7932,80 @@
 "Tipo de búsqueda sin definir.\n"
 "Escriba 'help search' para obtener más ayuda.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Archivo de descarga: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Solicitud fallida con un error desconocido."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "La operación ha tenido éxito."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Solicitud fallida con el siguiente error: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "El filtrado de IP para clientes está %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Apagado"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Encendido"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "El filtrado de IP para servidores está %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "El nivel de filtrado de IP actual es %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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 "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr "Límites de ancho de banda: Subida: %u KiB/s,Bajada %u KiB/s.\n"
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr "La rotación de fuentes del modo endgame es %s.\n"
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr "Búsqueda iniciada (id %u).\n"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Conectado a %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Conectando ahora"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "tras cortafuegos"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "correcto"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6579,7 +8014,7 @@
 "\n"
 "Descarga:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6588,7 +8023,7 @@
 "\n"
 "Subida:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6597,7 +8032,7 @@
 "\n"
 "Clientes en cola:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6606,38 +8041,33 @@
 "\n"
 "Fuentes totales:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Archivo de partes"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Número de resultados de la búsqueda: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Progreso de la búsqueda: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Progreso de la búsqueda no disponible"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Recibida una respuesta desconocida desde el servidor, código de operación = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Mostrar una breve información de estado."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Mostrar el estado de la conexión, la velocidad subida/descarga actual, etc.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Mostrar el árbol completo de estadísticas."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6651,11 +8081,11 @@
 "\n"
 "Ejemplo: 'statistics 5' mostraría sólo las 5 versiones más comunes de cualquier cliente.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Terminar aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6665,35 +8095,35 @@
 "Esto termina también el cliente de modo texto, ya que no se puede\n"
 "usar sin un núcleo funcionando.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Recargar el objeto dado."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Recargar la lista de archivos compartidos."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Recargar la tabla de filtrado de IP."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Recargar la tabla actual de filtrado de IP."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Actualizar la tabla de filtrado de IP desde URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr "Si se omite el URL, se usará el URL de las preferencias."
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Conectar a la red."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6705,35 +8135,35 @@
 "conectarse solo a ese servidor. La IP debe ser una dirección IPv4,\n"
 "o un nombre DNS que se pueda resolver."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Conectar a eD2k solamente."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Conectar a Kad solamente."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Desconectado de la red."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "Esto le desconectará de todas las redes a las que está actualmente conectado.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Desconectarse sólo de eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Desconectarse sólo de Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Añadir un enlace eD2k o magnético al núcleo."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6751,51 +8181,51 @@
 "\n"
 "El enlace magnético debe contener el hash eD2k y el tamaño del archivo.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Establecer el valor de una preferencia."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Establecer las preferencias de filtrado de IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Activar el filtrado de IP para clientes y servidores."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Desactivar el filtrado de IP para clientes y servidores."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Activar/Desactivar el filtrado de IP para clientes."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Activar el filtrado de IP para clientes."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Desactivar el filtrado de IP para clientes."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Activar/Desactivar el filtrado de IP para servidores."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Activar el filtrado de IP para servidores."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Desactivar el filtrado de IP para servidores."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Seleccionar el nivel de filtrado de IP."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6803,59 +8233,71 @@
 "Los niveles válidos de filtrado están en el rango 0-255, y el valor por\n"
 "defecto (inicial) es 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Establecer los límites de ancho de banda."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "El valor dado a estos comandos ha de ser en kilobytes/s.\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Establecer el límite de ancho de banda de subida."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "El valor dado ha de ser en kilobytes/s.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Establecer el límite de ancho de banda de descarga."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr "Habilitar o deshabilitar la rotación de fuentes al final de la descarga."
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "El valor dado debe ser 1/ON (habilitar) o 0/OFF (deshabilitar).\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
-msgstr "Obtener y mostrar el valor de una preferencia."
+msgstr "Obtener y mostrar un valor de preferencias."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Obtener las preferencias de filtrado de IP."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Obtener el estado del filtrado de IP para clientes y servidores."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Obtener el estado del filtrado de IP solo para clientes."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Obtener el estado del filtrado de IP solo para servidores."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Obtener el nivel de filtrado de IP."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
-msgstr "Obtener los límites del ancho de banda."
+msgstr "Obtener los límites de ancho de banda."
+
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr "Obtener el estado de rotación de fuentes de final de la descarga."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Ejecutar una búsqueda."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6873,14 +8315,13 @@
 "Example: 'search global linux iso --type Iso --min-size 100M' returns\n"
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
-"El tipo de búsqueda debe especificarse dando el tipo:\n"
+"El tipo de búsqueda debe especificarse con el tipo:\n"
 "    GLOBAL\n"
 "    LOCAL\n"
 "    KAD\n"
-"Ejemplo: 'search kad archivos' buscará en la red kad el archivo \"archivo\".\n"
+"Ejemplo: 'search kad archivo' buscará en la red kad \"archivo\".\n"
 "\n"
-"Filtros opcionales pueden añadirse antes, después o en medio de\n"
-"Optional filters can be added before, after, or interleaved with\n"
+"Filtros opcionales pueden añadirse antes, después o intercalados con\n"
 "la(s) palabra(s) de búsqueda:\n"
 "    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
 "    --extension <ext>      (alias: --ext)\n"
@@ -6888,41 +8329,49 @@
 "    --min-size <NKMG>    tamaño mínimo de archivo; K=1024, M=K*1024, G=M*1024\n"
 "    --max-size <NKMG>    tamaño máximo de archivo; mismos sufijos\n"
 "Ejemplo: 'search global linux iso --type Iso --min-size 100M' devolverá\n"
-"resultados de  \"linux iso\" de tipo de archivo Iso de al menos 100 MiB.\n"
+"resultados de \"linux iso\" de tipo de archivo Iso de al menos 100 MiB.\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Ejecutar una búsqueda global."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Ejecutar una búsqueda local"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Ejecutar una búsqueda kad"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "Mostrar los resultados de la última búsqueda."
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Devolver los resultados de la búsqueda anterior.\n"
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr "Mostrar los resultados de una búsqueda."
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+"Devuelve los resultados de una búsqueda.\n"
+"Opcionalmente, acepta un id de búsqueda (de 'search ...'); si no se proporciona ningún id, devuelve los resultados de la búsqueda iniciada más recientemente.\n"
+
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Mostrar el progreso de una búsqueda."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Mostrar el progreso de una búsqueda.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+"Muestra el progreso de una búsqueda.\n"
+"Opcionalmente, acepta un id de búsqueda; si no se especifica un id, muestra el progreso de la búsqueda iniciada más recientemente.\n"
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Empezar a descargar un archivo"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6930,80 +8379,80 @@
 "Se tiene que dar el número de un archivo de la última búsqueda.\n"
 "Ejemplo: 'download 12' inicia la descarga del archivo con el número 12 de la búsqueda anterior.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Pausar la descarga."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Reanudar la descarga."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Cancelar la descarga."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Asignar la prioridad de descarga."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr "Establece la prioridad de la descarga a Baja, Normal, Alta o Automática.\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Establecer la prioridad a baja."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Establecer la prioridad a normal."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Establecer la prioridad a alta."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Establecer la prioridad a automática."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Mostrar colas/listas."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr "Mostrar la cola de subida/descarga, la lista de servidores o la lista de archivos compartidos.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Mostrar la cola de subida."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Mostrar la cola de descarga."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Mostrar el registro."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Mostrar la lista de servidores."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "Mostrar la lista de archivos compartidos."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Borrar el registro."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Comando obsoleto, use '%s' en su lugar."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7012,255 +8461,278 @@
 "Este comando está obsoleto y puede ser borrado en el futuro.\n"
 "Use '%s' en su lugar.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Cliente de texto de aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Calculando hash del archivo descargado: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr "Calculando hash del archivo: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Reconstruyendo el conjunto de hashes AICH para el archivo: %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "Convirtiendo antiguos hashset de AICH en '%s' a 64b en '%s'."
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr "Verificar datos locales (%s): Resultado correcto para %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr "Verificar datos locales (%s): ¡ERRORES ENCONTRADOS! %s Bloques fallidos: MD4: %s. %s %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr "AVISO: el nombre de archivo '%s' es incorrecto y se ha renombrado a '%s'."
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr "AVISO: el archivo '%s' ya existe, se renombra el nuevo a '%s'."
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "¿Seguro que desea cancelar y borrar todos los archivos de esta categoría?"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Se requiere confirmación"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Sólo se permiten 99 categorías."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "¡Demasiadas categorías!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Sin catalogar"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Seleccionar un filtro de vista"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Añadir una categoría"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Editar la categoría"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Eliminar la categoría"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Solicitado hashset de un archivo desconocido: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Fallo al abrir archivo (%s), eliminando de la lista de archivos compartidos."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Reanudando las subidas del archivo: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Suspendiendo la subida del archivo: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Error al ejecutar el comando `%s' en el evento `%s'."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Error al ejecutar el comando '%s' en el evento '%s'."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Descarga completada"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "La ruta completa al archivo."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "El nombre del archivo sin la ruta."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "El hash eD2k del archivo."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "El tamaño del archivo en bytes."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Tiempo de actividad de descarga acumulado."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Nueva sesión de chat iniciada"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Remitente del mensaje."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Espacio agotado"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Partición de disco."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Error completando"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Procesando el archivo número %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "Ha pedido los hash de partes (sólo los usan archivos > 9.5 MB)"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> ¡ El archivo no existe !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, el creador de enlaces eD2k para aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "¡Bienvenido!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Parámetros de entrada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Archivo al que calcular el hash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Añadir URL opcionales para este archivo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr "Introduzca aquí el archivo del que quiera calcular el enlace eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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 "Introduzca aquí el URL que quiere añadir al enlace eD2k: añada \"/\" al final para permitir a aLinkCreator agregar el nombre del archivo actual"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Borrar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Crear enlace con hashes de partes"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr "Ayuda a difundir archivos nuevos y raros más rápidamente, a costa de un tamaño de enlace mayor"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Hash de archivo MD4"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "Hash del archivo eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "Enlace eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Guardar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Abrir"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Abrir un archivo para calcular su enlace eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Copiar el enlace eD2k calculado al portapapeles"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Guardar como"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Guardar el enlace eD2k calculado en un archivo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Acerca de aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr "Seleccione el archivo del que quiera calcular el enlace eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "No se puede abrir el portapapeles"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "¡No hay nada que copiar por ahora!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Seleccione el fichero para el enlace eD2k calculado"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "No se puede abrir "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Por favor, introduzca un nombre de archivo no vacío"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "¡No hay nada que guardar por ahora!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7280,162 +8752,159 @@
 "\n"
 "Distribuido bajo la licencia GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Calculando el hash..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator está trabajando para usted"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Calculando el hash MD4..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Calculando los hash eD2k..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "¡Cancelado!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Terminado en %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "¡Ya ha añadido ese URL!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Por favor, introduzca un URL no vacío"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "No se puede abrir %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "¡Memoria agotada al calcular el hash ed2k!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i día(s) %i hora(s) %i minuto(s) %i s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02ud %02uh %02um %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02um %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02um %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr "%.2f KiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr "%.2f GiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr "%.2f TiB"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, estadísticas de aMule en línea"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Máximo índice de descarga desde que wxCas está ejecutándose"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Máximo índice de descarga absoluto durante ejecuciones anteriores de wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Borrar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistema"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Detener la actualización automática"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Guardar imagen de estadísticas en línea"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Imprimir imagen de estadísticas en línea"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Configuración de las preferencias"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Acerca de wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Iniciar la actualización automática"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Actualización automática detenida"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Actualización automática iniciada"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Guardar imagen de estadísticas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Estadísticas de aMule en línea"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7443,11 +8912,11 @@
 "Ha habido un problema al imprimir.\n"
 "¿Es posible que su impresora actual no esté configurada correctamente?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Imprimiendo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7465,367 +8934,364 @@
 "\n"
 "Distribuido bajo GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh oh, aMule no está ejecutándose..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule ya está ejecutándose"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule se está ejecutando, pero está desconectado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule está conectando..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh oh, el estado de aMule es desconocido..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " ha estado en ejecución durante "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " está detenido!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " no está conectado!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " está conectando..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " está haciendo algo extraño, ¡compruébelo!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " está conectado a "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "apagado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " conectado "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " con "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Total descargado: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", subida: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Descarga de esta sesión: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Descargado: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, subida: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr " KiB/s, Subida: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Compartiendo: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " archivo(s), clientes en cola: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Tiempo: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " en "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Carga media del sistema (1-5-15 minutos): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Tiempo de ejecución del sistema: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Directorio que contiene el archivo amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "Introduzca el directorio donde está su archivo amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Intervalo de actualización en segundos"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Generar un archivo de estadísticas con cada evento de actualización"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "Introduzca el directorio donde quiere generar la imagen de estadísticas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Subir periódicamente su imagen de estadísticas al servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "URL del FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Directorio FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Introduzca el URL de su servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "Introduzca el directorio del servidor FTP donde poner su imagen de estadísticas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Usuario"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "Introduzca el nombre de usuario para conectarse a su servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "Introduzca la contraseña de usuario para conectarse a su servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Intervalo de actualización del FTP en minutos"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Validar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Carpeta que contiene su archivo de firma"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Directorio donde se genera la imagen de estadísticas"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Carga la plantilla <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Puerto HTTP del servidor web"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Usar la redirección de puertos UPnP en el puerto del servidor web"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Puerto UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Usar la compresión gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Contraseña de acceso total para el servidor web"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Contraseña de invitado para el servidor web"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Permitir el acceso de invitado"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Denegar el acceso de invitado"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 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:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "Ruta al archivo de configuración de aMule. ¡NO USAR DIRECTAMENTE!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Deshabilitar el intérprete PHP (obsoleto)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Recompilar las páginas PHP en cada solicitud"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Servidor web de aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "conexión aceptada del cliente web\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "ERROR: no se puede aceptar la conexión del cliente web\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Solicitud fallida con el siguiente error: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Fichero de índice no encontrado: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sesión terminada - solicitando conexión\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sesión correcta, conectado\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sesión correcta, no conectado\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "No hay ninguna sesión - se conectará de nuevo\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sesión creada - solicitando conexión\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Procesando la solicitud original: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr "Se rechaza leer `pass` de la cadena de consulta de la URL\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Contraseña no especificada, el inicio de sesión no se permitirá."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Comprobando la contraseña\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Hash de la contraseña incorrecto\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Contraseña correcta\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Contraseña errónea\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "No ha introducido ninguna contraseña. No se permite una contraseña en blanco.\n"
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Desconexión solicitada\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Procesando solicitud redirigida: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr "aMule (obligatorio)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr "Acceso directo en el escritorio"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr "Iniciar aMule al iniciar sesión"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr "Asocia archivos .emulecollection"
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr "Desinstalar"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr "Eliminar datos de usuario (configuración, servidores ED2K, nodos Kad, archivos parciales)"
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr "Archivos de la aplicación aMule (obligatorio)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr "Crea un acceso directo de aMule en el escritorio."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr "Inicia aMule automáticamente cuando el usuario actual inicia sesión (configuración por usuario)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr "Elimina los archivos de la aplicación aMule, los accesos directos del menú Inicio y del escritorio, la entrada de inicio automático del registro (clave Run) y la entrada de Agregar o quitar programas (obligatorio)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr "Añade aMule a la lista \"Abrir con\" para archivos .emulecollection, y lo convierte en el predeterminado si ningún otro programa los ha reclamado. Abrir una colección encola cada enlace eD2k que contiene."
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "Elimine los archivos de la aplicación aMule, los accesos directos del menú Inicio/escritorio, la entrada del registro para inicio automático, los registros del esquema de URL y la entrada de Agregar o quitar programas (obligatorio)."
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr "Elimina permanentemente %APPDATA%\\aMule del usuario actual (aMule.conf, lista de servidores ED2K, nodos Kad, archivos parciales, filtros de IP, lista de amigos). Déjelo sin marcar para conservar su configuración."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
@@ -7833,7 +9299,7 @@
 "aMule parece estar en ejecución desde $INSTDIR.\r\n"
 "Por favor, cierre aMule (y aMuleD / aMuleGUI) e inténtelo de nuevo."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
@@ -7841,11 +9307,11 @@
 "El demonio de aMule (amuled.exe) parece estar en ejecución desde $INSTDIR.\r\n"
 "Por favor, deténgalo e inténtelo de nuevo."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr "Eliminando la instalación anterior de aMule en $0..."
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
@@ -7853,21 +9319,191 @@
 "No se pudo eliminar la instalación anterior de aMule en $0.\r\n"
 "Por favor, cierre los procesos de aMule en ejecución e inténtelo de nuevo, o desinstale primero la versión anterior manualmente."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr "aMule parece estar en ejecución. Por favor, ciérrelo y vuelva a ejecutar el desinstalador."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr "Eliminando los datos de usuario en $APPDATA\\aMule..."
 
+#~ msgid "Ratio"
+#~ msgstr "Proporción"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "No se han encontrado archivos para compartir en el directorio: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Cambiar el idioma"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "No hay traducciones instaladas para aMule"
+
+#~ msgid "No languages available"
+#~ msgstr "No hay idiomas disponibles"
+
+#~ msgid "User name"
+#~ msgstr "Nombre de usuario"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Partes obtenidas"
+
+#~ msgid "Available Parts"
+#~ msgstr "Partes disponibles"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Encontrado %i archivo compartido, %i desconocido"
+#~ msgstr1 "Encontrados %i archivos compartidos, %i desconocidos"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Subido"
+#~ msgid "Remote prefix:"
+#~ msgstr "Servidor remoto"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Archivo no encontrado."
+#~ msgid "Local prefix:"
+#~ msgstr "Servidor local"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Entrada inválida en lista de archivos conocidos, el archivo debe de estar dañado: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Guardando el archivo de partes %u de %u"
+
+#~ msgid "the default Windows shell handler"
+#~ msgstr "la terminal predeterminada de Windows"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Para evitar la aparición de este aviso en cada previsualización,\n"
+#~ "defina el reproductor de vídeo en las preferencias (%s por defecto)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Filtrar el resultado"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Marcar como archivo conocido"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Porcentaje del total de archivos"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Inicialización"
+
+#~ msgid "New node"
+#~ msgstr "Nuevo nodo"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Más"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Inicializar desde \n"
+#~ "clientes conocidos"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Conectar a cualquier servidor y/o a Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Desconectar Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Detener los intentos de conexión actuales"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Desconectarse de las redes conectadas"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Conectarse a las redes habilitadas"
+
+#, c-format
+#~ msgid "Could not add %u link from ED2KLinks file (see log for details)."
+#~ msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+#~ msgstr0 "No se pudo añadir %u enlace del archivo ED2KLinks (consulte el registro para más detalles)"
+#~ msgstr1 "No se pudieron añadir %u enlaces del archivo ED2KLinks (consulte el registro para más detalles)"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Autoordenar los archivos (uso alto de CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule ordenará automáticamente las columnas en la lista de descargas"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Rechaza los paquetes para los que la IP del cliente es diferente de la IP desde donde se ha recibido el paquete. Úselo con cautela."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Devolver los resultados de la búsqueda anterior.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Mostrar el progreso de una búsqueda.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Conexión cerrada - Es probable que aMule se haya cerrado."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Comprobar si hay una nueva versión al inicio"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Enlace eD2k: "
+
+#~ msgid "Commit"
+#~ msgstr "Añadir"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: pasando a segundo plano - nos vemos"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Web: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Foro: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Documentación: https://amule-org.github.io/docs \n"
+
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Problemas: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Subido"
 
 #, c-format
 #~ msgid "No GeoLite2 update URL configured. Download GeoLite2-Country.mmdb manually (a free MaxMind account is required) and place it at %s, or set the URL in Preferences."

amule-3.0.1.tar.gz/po/et_EE.po -> amule-3.1.0.tar.gz/po/et_EE.po Changed

@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:09+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:33+0000\n"
 "Last-Translator: \n"
 "Language-Team: Estonian <kde-i18n-doc@kde.org>\n"
 "Language: et_EE\n"
@@ -21,71 +21,159 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Näita aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMule kaugjuhtimine "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Piiluvaade:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+" eMulel põhinev, platvormist sõltumatu, p2p klient \n"
+"\n"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2019 aMule Meeskond \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Osa aMule põhineb \n"
+
+#: src/AboutDialog.cpp
+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/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (C) 2002-2011 Petar Maymounkov <petar@maymounkov.org>\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Web:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Foorum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Kontrolli käivitumisel uue versiooni olemasolu"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Ühendun Kad..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Kasutad aegunud aMule versiooni!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Info puudub"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Lisa Sõber"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Pead sisestama kehtiva IP ja pordi!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informatsioon"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Määratud kasutaja kontrollsumma pole kehtiv!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "Add aMule to your application menu?"
 msgstr "Järgneva rakenduse nimi"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Ühendus ebaõnnestus "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -94,82 +182,160 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "VIGA"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Ei suuda avada ED2KLinks faili."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "aMule dialoog hävitatud"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Indeksfaili ei leidnud: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Ei suuda tõmmata kasutaja '%s' jagatud faili"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "Kataloogis '%s' pole jagatavaid faile"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Ei suuda muuta magnet linki eD2k lingiks: %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Vigane eD2k link! VIGA: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Ok, lahkun põhiprogrammist..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Mõrvan amuleweb tegelase, protsessi id '%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Mõrvan amuleweb tegelase, protsessi id '%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Nurjunud"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Mõrvan amuleweb tegelase, protsessi id '%d' ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Mõrvan amuleweb tegelase, protsessi id '%d' ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Peatan tuuma."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "aMule seiskamine lõpetatud."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "aMule väljumise mälu veajälituse tulemus:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Sinu keelelokaat muudeti süsteemi vaikeväärtuseks seoses konfiguratsiooni muudatustega. Sorry."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -177,56 +343,109 @@
 "\n"
 "EC seadistused"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Parool on määratud ja välised ühendused võimalikud."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "HOIATUS"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "Failis server.met on %i serverit"
+msgid "Loading temp files"
+msgstr "Laen temp faile %s"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Laen temp faile %s"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Lae oma jagatud failid uuesti"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Lae oma jagatud failid uuesti"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Alusta"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Võrgud"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Võrgud"
+msgid "eD2k server list (server.met)"
+msgstr "Failis server.met on %i serverit"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web server töötab protsessi id'ga %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 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/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "VIGA"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "web server töötab protsessi id'ga %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+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/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Ei suuda siduda porti määratud aadressiga: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port %u ei ole kasutatav. Sa saad LOWID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -241,48 +460,48 @@
 "Kasuta netstat programmi kontrollimaks kuna port vabaneb\n"
 "ja proovi amule uuesti käivitada."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Ei suutnud luua OnlineSig Faili"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Ei suutnud luua aMule OnlineSig Faili"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "See on aMule %s käivitamise esimene kord"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "See on testversioon, mida igapäevaselt uuendatakse ja\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "aadressil https://amule-org.github.io või meie IRC kanalis #aMule aadressil irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Tunne ennast vabalt suvaliste vigade leidmisest teavitamisel aadressil https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -290,1579 +509,1885 @@
 "Online Allkirja kataloog on VIGANE!\n"
 " Online Allkirja ei kasutata, kuni parandad vea seadetes."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Teatatud serveri nimi"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Kettaruumi eraldamine faili '%s' jaoks ebaõnnestus: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "VIGA: Ei suutnud avada logifaili"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "HOIATUS: logifail on tühi, miskit on kapitaalselt viltu."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Log on nullitud"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Serveri teade: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, 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/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Ebaõnnestus sõlmede nimekirja tõmbamine."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Ebaõnnestus tõmmatud versiooni kotrollfaili avamine"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Versiooni kontrollfail on korrumpeerunud"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Kasutad aegunud aMule versiooni!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Uuema aMule versiooni saad alati aadressilt https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Sinu aMule koopia on ajakohane."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Versiooni kontrollfaili tõmbamine ebaõnnestus"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Kasutajaid: %s | Faile: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Ühtegi võrku pole valitud"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "koos LowID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "koos HighID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Ühendatud %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Ühendun %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "eD2k ühendus katkestatud."
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad käivitatud."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad peatatud."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Ühendus Kad võrk (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Ühendus Kad võrku (tulemüüriga)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Ühendus Kad võrguga katkestatud"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kad on seadetes väljalülitatud, ei ühenda."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 #, fuzzy
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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 https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - käivituse stopper"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: lahkun taustaprotsessiks - näeme veel"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Ei suuda luua PID faili"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "VIGA: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "See on eMulel põhinev aMule %s."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Jookseb %s peal"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Külasta https://github.com/amule-org/amule/releases/latest ja vaata ehk on uuem versioon saadaval."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "Fataalne VIGA: Ei suutnud luua stopperit."
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMule kaugjuhtimine "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Piiluvaade:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Võrgud"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" eMulel põhinev, platvormist sõltumatu, p2p klient \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Otsingud"
+
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Tõmbamised"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Web: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Jagatud failid"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Foorum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Kliendid"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Web: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Teated"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Foorum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistika"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2019 aMule Meeskond \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Seaded"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Osa aMule põhineb \n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr ""
 
-#: src/amuleDlg.cpp:552
-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
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Serveri teade: %s"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (C) 2002-2011 Petar Maymounkov <petar@maymounkov.org>\n"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Info puudub"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Teade"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Uuema aMule versiooni saad alati aadressilt https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "aMule dialoog hävitatud"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Ühendun"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Ühendun"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Lahutatud"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Tulemüüriga"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Ühendatud"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Ühendun"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Väljas"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Loobu"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Lõpeta käimasolevad ühenduskatsed"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versioon"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Ühendu lahti"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Lõpeta ühendus ühendatud võrkudega"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Ühenda"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Aadress"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Ühendu olemasolevate, aktiivsete võrkudega"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Kirjeldus"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "aMule Logi"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Üles: %.1f(%.1f) | Alla: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Üles: %.1f | Alla: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Ühendatud)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Ühenduseta)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Kas sa tõesti tahad %s'st väljuda?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Kinnitan väljumise"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Käivitamise korraldus: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- vaikimisi -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Rüüde kataloogi  '%s' ei eksiteeri"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "HOIATUS: Ei suuda rüüfaili '%s' lugemiseks avada"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Võrgud"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Võrgud"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Otsingud"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Otsingu aken"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Tõmbamised"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Tõmbamised"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Jagatud failid"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Jagatud failide Aken"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Teated"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Võrgud"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Teadete Aken"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistika"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Statistiliste graafikute aken"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Seaded"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Seadete aken"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Impordi"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Osafailide importimise tööriist"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Info"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Info/Appi"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "eD2k võrk"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kad võrk"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Võrk puudub"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "aMule kaugjuhtimine"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Fataalne VIGA: Ei suutnud stopperit."
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Ühendu eemalasuva amuulaga"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Ühendus kadunud"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Kinnita väljumine"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Fataalne VIGA: Ei suutnud luua Poll stopperit."
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Lähen tegevuse tsüklisse..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Ühendun..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Võrgu GUI EC sündmuse haldur"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, 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/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Peatun "
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Ühendus suletud - aMule on ilmselt seisatud."
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Serveriga '%s (%s:%i)' ühendumise katsed aegusid."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Keelatud"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Ühendu võrguga."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Ühendus ebaõnnestus. Ei suuda määratud ühenduda %s:%d\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Valmis"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Kõik"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Info Puudub"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Faili ei leitud."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Vigane link või on juba loetelus."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Ajutiste tõmmatavate failide kataloog"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 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/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Teadmata"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Ei suuda tõmmata kasutaja '%s' jagatud faili"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Otsin lowid ühenduse jaoks semu"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Valetatud eMule versioon %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Valetatud eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Valetatud eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (baseerub eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Kasutajanimi: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Küsitud: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Selle seansi failistatistika: Aksepteeritud %d/%d päringust, %s siirdatud\n"
 msgstr1 "Selle seansi failistatistika: Aksepteeritud %d/%d päringust, %s siirdatud\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Kõikide seansside failistatistika: Aksepteeritud %d/%d päringust, %s siirdatud\n"
 msgstr1 "Kõikide seansside failistatistika: Aksepteeritud %d/%d päringust, %s siirdatud\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Küsiti tundmatut faili"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "'%s' (IP:%s) teade filtreeriti"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "'%s' (IP:%s) saatis uue teate"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Kasutaja %s (%u) küsis sinu jagatudfailde loetelu kataloogile %s -> keeldusid"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Ei suuda tõmmata kasutaja '%s' jagatud faili"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "HOIATUS: %s faili ei saa avada."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "HOIATUS: Katkestatud failde loetelu on riknenud, sisaldab riknenud päist."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "IO viga %s faili lugemisel: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "VIGA: tekkis %s faili salvestamisel: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Sisesta inimtesti kontrollkood"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategooria"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Uus Kategooria"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Vali sissetulevate failide kataloog"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Sa pead kategooria jaoks nime defineerima!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Sa pead kategooria jaoks asukoha defineerima!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr "Ei suutnud luua kategooria sisendkataloogi. Palun defineeri kehtiv asukoht!"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "VestlusSeanss Alustatud: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Ühenduses Kliendiga ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Ühendun Kliendiga ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Kliendiga ühendumine ebaõnnestus / Ühendus kadunud ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 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/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Vestle"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Sulge leht"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Sulge kõik lehed"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Sulge teised lehed"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Lisa sõprade nimistusse"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Näita &detaile"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Eemalda sõpradest"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Taasta sõbraslot"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Vaata faile"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Saada teade"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Saada kasutajale teade"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Saadetav teade:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Sul pole lubatud määrata rohkem kui üks sõbraslot.\n"
+"Määrati ainult üks slott."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Vali mitu"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Eemalda sõpradest"
+msgstr1 "Eemalda sõpradest"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Jagatud failide loetelu taaslaadimine."
+msgstr1 "Jagatud failide loetelu taaslaadimine."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Fail 'creditfile' loetud, tuvastati %u klienti"
 msgstr1 "Fail 'creditfile' loetud, tuvastati %u klienti"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - %u Kliendi Krediit aegunud!"
 msgstr1 " - %u Kliendi Krediit aegunud!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Ei leidnud 'cryptkey.dat' faili, loon uue."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Kliendi detailid"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Toetatud"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Pole toetatud"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Keelatud"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Ühendatud"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Pole ühendust"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nimi"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP Aadress"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Allikas"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Viimane vastuvõtt"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Versioon"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Saatmise kiirus"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Tõmbamise kiirus"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Üleslaaditud"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Kokku Tõmbamisi: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "AL/ÜL kordaja"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Online Allkiri"
 
-#: src/ClientRef.cpp:196
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Pole täielik"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Paha Poiss"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Kontrollitud - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Info Puudub"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Failid"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Üleslaaditud"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Allalaetud"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Tõmban"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Saadan"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Aktiivne"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Teadmata"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Kinnitasid"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Keeldusid"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Kinnitasid"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Keeldusid"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "Kasutaja %s (%u) küsis sinu jagatudfailde loetelu kataloogile %s -> Kinnitasid"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "Kasutaja %s (%u) küsis sinu jagatudfailde loetelu kataloogile %s -> keeldusid"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Kasutaja %s (%u) jagab kataloogi %s"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Kasutaja %s (%u) saatis soovimatu jagatud kataloogide nimekirja."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, fuzzy, 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:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "Kasutaja %s (%u) lõpetas jagatud failide nimekirja saatmise"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Kasutaja %s (%u) saatis soovimatu jagatud failide nimekirja"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, 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/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Faili kommentaarid"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Faili nimi"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Hinnang"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Kommentaar"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad otsing pole võimalik kui Kad ei tööta"
+
+#: src/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "Otsin lowid ühenduse jaoks semu"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Kommentaarid puuduvad"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u kommentaar"
 msgstr1 "%u kommentaar(i)"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 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:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "'%s' riigiinfo laadimine ebaõnnestus."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Madal"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto Norm."
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Kõrge"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Väga madal"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Madal"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Keskmine"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Kõrge"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Väga Kõrge"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Versioon"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Pärin"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Ühendun serveri kaudu"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Järjekord täis"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Järjekorras"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Tõmban"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Võtan vastu kontrollsumma"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Pole vajalikke osi"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Ühendus LowID <-> LowID ei õnnestu"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Liiga palju ühendusi"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Ühendun Kad kaudu"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Liiga palju Kad ühendusi"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Blokeeritud"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Ühenduse viga"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "KaugJärjekord täis"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Vana MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Uus MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule Kokkusobiv"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Kohalik server"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Kaug server"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Allikate Vahetus"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passiivne"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Link"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Allikaid"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Otsingu tulemus"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Valmis"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Edenemine"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "VIGA: Kettaruum otsas"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "VIGA: Osamet faili ei leitud."
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "VIGA: IO viga!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "VIGA: Ebaõnnestus!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Järjekorras"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Juba tõmbad"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Tundmatu või paha tempfaili formaat."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Osa"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Suurus"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Siiratud"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Kiirus"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Edenemine"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Allikaid"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioriteet"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Olek"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Lõpetamiseni"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Viimati nähtud terviklikuna"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Viimane vastuvõtt"
 
-#: 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/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Oled kindel et tahad valitud failid kustutada?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Tagasiside : %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Auto"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Loobu"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Seis"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Paus"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Taasta"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Va&lmis"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Tõsta (A4AF) allikad selle faili külge"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Tõsta automaatselt kõik (A4AF) allikad selle faili külge"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Tõsta (A4AF) allikad teiste failide külge"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Laiendatud valikud"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Eelvaade"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Näita &detaile"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Näita kõiki kommentaare"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Kopeeri magnet URI lõikepuhvrisse"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Kopeeri eD2k &link lõikepuhvrisse"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Kopeeri tagasiside lõikepuhvrisse"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Lisa selle faili alternatiivsed URL'id"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "määramata"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Määra kategooria"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "Ava Fail"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Oled kindel et tahad valitud faili kustutada?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Oled kindel et tahad valitud failid kustutada?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Tagasiside : %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Sisesta selle faili uus nimi:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Faili ümbernimetamine"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%H:%M:%S %d/%m/%y"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Tõmbamised (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Et seda viga eelvaatuse ajal rohkem mitte näitdata \n"
-"määra oma seadetes eelistatud video mängija (vaikimisi %s)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Faili eelvaade"
+msgid "Downloads (%i)"
+msgstr "Tõmbamised (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, 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/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Kokku AL: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Salvestan osafaili %u %u-st"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Kõik osafailid salvestatud"
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Laen temp faile %s"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Laen osafaili %u %u-st"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "VIGA: Ei suutnud laadida tagavarafaili. Vaata aadressilt https://github.com/amule-org/amule/discussions, kas leiad juhiseid .part. met faili taastamiseks"
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Kõik osafailid laetud"
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Part(osalisi) faile ei leidnud!"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Leidsin %u osalist faili"
 msgstr1 "Leidsin %u part(osalist) faili."
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Temp kataloogi failisüsteem ei suuda suuri faile käidelda."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Sisenevate failide kataloogi failisüsteem ei suuda suuri faile käidelda."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Tõmban '%s'"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Sa juba proovid faili '%s' tõmmata"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Fail '%s' on juba olemas"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Fail '%s' on juba olemas"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Sa juba proovid '%s' faili tõmmata"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Ei suuda muuta magnet linki eD2k lingiks: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Lingi %s protokoll on tundmatu"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Vigane eD2k link! VIGA: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Klient saatis paketi peale ebaõnnestunud autoriseerimist."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Välisühendus suleti"
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Välisühendused on tühja parooli tõttu mitteaktiivsed"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Välisühendused on konfiguratsioonifailis defineeritud mitteaktiivsena."
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Kinnitati uus väline ühendus"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "VIGA: Ei suutnud uut välist ühendust aksepteerida"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Välisühendustest keelduti tühja parooli tõttu seadetes!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Ühendan klienti: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Versioon teadmata"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "Mittekorrektne Välisühenduste versiooni ID, siin võib olla binaarne kokkusobimatus.Kasuta sama versiooni tuuma ja kaugklienti."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "Ajutise arendusversiooniga ei saa ühenduda reliisi versiooniga!!!! *RRRRRR* hoidsin ära võimaliku crässi"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Vigane protokolli versioon."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Puudub protokolli versiooni märgis"
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Proovin %d sekundi pärast serveriga uuesti automaatselt ühenduda."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Autoriseerimine ebaõnnestus: EC parooliks on määratud vigane räsi."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Autoriserimine ebaõnnestus: vale parool."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Autoriserimine ebaõnnestus: parool puudub."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Vigane päring, alustuseks pead ennast autoriseerima."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Ligipääs Lubatud."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Veateade \"%s\" kliendile saadetud."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Autoriseerimata pääsukatse %s. Ühendus suletud."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Faili '%s' kontrollsummat ei leitud"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! OpCode töötlemise viga!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Serverit ei lisatud"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "serverit ei leidnud: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "eemaldatav server on vaja määrata"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k on seadetes väljalülitatud."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Faili ei leitud."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Faili ei leitud."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Otsing on käimas. Varsti näed tulemusi!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Web Otsing kaugtöökohast ei oma mõtet."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Otsing on käimas. Varsti näed tulemusi!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Graafiku jaoks pole punkte."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Sinu klient pole seadistatud sellise detailsuse astme jaoks."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Väline Ühendus: nõutakse seiskamist"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Juba sulgun..."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Väline ühendus: lisan lingi '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Vigane link või on juba loetelus."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Faili ei leitud."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Vigane failinimi."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Ei suuda faili ringinimetada."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Sulge see vestlus-seanss."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Uus vestlussession alustatud"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Sulge see vestlus-seanss."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad on seadetes väljalülitatud."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Tundmatu nimi)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad on seadetes väljalülitatud."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Juba ühendatud eD2k võrku."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Ühendun eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Juba ühendatud Kad võrku."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Ühendun Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Kõik võrgud on väljalülitatud."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "eD2k ühendus katkestatud."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Kad ühendus katkestatud."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Väline Ühendus: sain vigase opkoodi: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Vigane opcode (vale protokolli versioon?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Tundmatu laiend '%s' käsule '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Tundmatu käsk '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1870,7 +2395,7 @@
 "\n"
 "See käsk ei saa omada parameetrit.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1878,7 +2403,7 @@
 "\n"
 "Sellel käsul peavad olema parameetrid.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1886,7 +2411,7 @@
 "\n"
 "Käsk on lõpetamata, pead kasutama üht laienditest allpool.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1894,11 +2419,11 @@
 "\n"
 "Saadaval laiendid:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Võiamlikud käsud:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1909,17 +2434,17 @@
 "Kõik käsud on tõstutundetud.\n"
 "Tipi '%s <käsunimi>' et saada <käsunimi> kohta rohkem infot.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Lahkub rakendusest."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Näita Abimeest."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1927,7 +2452,7 @@
 "Käsu kohta abi saamiseks tipi 'help <käsunimi>'.\n"
 "Käskude täieliku loetelu saamiseks tipi 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1938,46 +2463,46 @@
 "Käsuloendi saamiseks kasuta '%s'\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Süntaksi viga!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Sellel käsul ei tohiks olla ühtegi parameetrit."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Sellel käsul peab olema parameeter."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Vigane muutuja."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "See on poolik/lõpetamata käsk."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Rohkema info saamiseks tipi '%s'.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "See on %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "See on %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1985,7 +2510,7 @@
 "\n"
 "Loon klienti ....\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1994,7 +2519,7 @@
 "\n"
 "Ok, lahkun %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2008,118 +2533,361 @@
 "\n"
 "Lahkun...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Näita seda abiteksti."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Masin milles aMule töötab. (vaikimisi: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "aMule välisühenduse port. (vaikimisi: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Välisühenduse parool."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Loen konfiguratsiooni failist."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Ära trüki midagi standardväljudisse."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Ole jutukas - näita ka veajälituse infot."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Määrab programmi keele."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Kirjuta käsurea valikud konfiguratsioonifaili."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Loob konfiguratsioonifaili alusel aMule konfigratsioonifaili."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Näita programmi versiooni."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Faili detailid"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%% tehtud"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Faili eelvaade"
+
+#: src/FileLaunch.cpp
+#, 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/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "VIGA: Osafaili '%s' avamine ebaõnnestus"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Ohoo, rõõm sind näha!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Ühendun semuga"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Ühenduse olek:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Võrgud"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Vaikimisi TCP Port "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Laiendatud UDP port (Kad / globaalne otsing) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Luba UPnP ruuteri portide suunamiseks"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Bootstrap"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Sa juba proovid '%s' faili tõmmata"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Käivitamisel värskenda automaatselt serverite nimekirja"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Tõmmatavate failide kataloog"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Lehitse"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Ajutiste tõmmatavate failide kataloog"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Sõprade faili 'emfriends.met' avamine lugemiseks ebaõnnestus!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Sõprade faili 'emfriends.met' avamine kirjutamiseks ebaõnnestus!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "KRIITILINE - StartChatSession puudub klient"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Sõbrad"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Näita &detaile"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Lisa sõber."
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Eemalda sõber"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Saada sõnu&m"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Vaata faile"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Taasta sõbraslot"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Oled kindel et tahad valitud sõbra(d) kustutada?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Oled kindel et tahad valitud sõbra(d) kustutada? "
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2127,986 +2895,1306 @@
 "Sul pole lubatud määrata rohkem kui üks sõbraslot.\n"
 "Määrati ainult üks slott."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Vali mitu"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Sul pole lubatud määrata rohkem kui üks sõbraslot.\n"
-"Määrati ainult üks slott."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Saada kasutajale teade"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Saadetav teade:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Eemalda sõpradest"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Saada teade"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Tõsta selle faili külge"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "JK: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Küsitud teist faili"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Ootan saatmise slotti"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "Järjekorras: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Saadan"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Mitte keegi"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Ei"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Jah"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Ei suuda avada: %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Tõmban..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "HTTP allalaadimine katkestatud"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "Tõmbamise URL ei saa olla tühi."
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Ei suuda tõmmata kasutaja '%s' jagatud faili"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Ajutiste tõmmatavate failide kataloog"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Tõmmatud %d baiti"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "The URL %s returned: %i"
 msgstr "URL %s ütles: %i - VIGA (%i)!"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "HTTP allalaadimine katkestatud"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Tõmban uut GeoIP.dat faili aadressilt %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "GeoIP.dat faili tõmbamine ebaõnnastus, katkestan uuendamise."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Faili %s eemaldamine ebaõnnastus, katkestan uuendamise."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Faili %s ümbernimetamine ebaõnnestus, katkestan uuendamise."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "%s uuendamine õnnestus"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Error updating %s"
 msgstr "GeoIP.dat uuendamise viga"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Faili %s tõmbamine aadressilt %s ebaõnnestus"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "'%s' riigiinfo laadimine ebaõnnestus."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Laen IP-filtrid 'ipfilter.dat' ja 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "Laetud %u IP-piirkond failist '%s'."
 msgstr1 "Laetud %u IP-piirkonda failist '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "ignoreeritud %u vigast rida."
 msgstr1 "ignoreeritud %u vigast rida."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Faili %s ümbernimetamine ebaõnnestus, katkestan uuendamise."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP filter on lähtestatud"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Tuntud klientide \n"
-"Bootstrap"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Hetkel"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Hetke keskmine"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Seansi keskmine"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Sõlmed (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Bootstrapil vigane IP"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Bootstrapil vigane port"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Palun täida kõik nõutud väljad"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Teade"
+
+#: src/KadDlg.cpp
 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/KadDlg.cpp:213
+#: src/KadDlg.cpp
 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/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Kas jätkata?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: otsingu võtmesõna on liiga lühike"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: otsingu võtmesõna on juba loetelus: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "nodes.dat faili laadimine ebaõnnestus -  fail on liiga vana. See versiooni (0) on toetuseta."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Loetud %u Kad kontakti"
 msgstr1 "Loetud %u Kad kontakti"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 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/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Saadaval ainult %d Kad kontakt, nodes.dat ei lisatud"
 msgstr1 "Saadaval ainult %d Kad kontakti, nodes.dat ei lisatud"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Salvestatud %d Kad kontakt"
 msgstr1 "Salvestatud %d Kad kontakti"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Kad võrk"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Faili nimi"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Faili suurus"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Üles- ja allalaadimise suhe"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Üleslaaditud"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Küsitud"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Aksepteeritud"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Täielikke allikaid"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "HOIATUS: Tuttavate failde loetelu on riknenud, sisaldab riknenud päist."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 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:155
+#: src/KnownFileList.cpp
 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:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Süsteemi vaikeväärtus"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albaania"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Araabia"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturia"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baski"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgaaria"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Kataloonia"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Hiina (Lihtsustatud)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Hiina (Traditsiooniline)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Kroaatia"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Tšehhi"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Taani"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Hollandi"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Inglise (U.K.)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Inglise (U.K.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Eesti"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Soome"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Prantsuse"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galiitsia"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Saksa"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Kreeka"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Heebrea"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Ungari"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Itaalia"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Jaapani"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Korea"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Leedu"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norra"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Poola"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugali"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugali (Brasiilia)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Rumeenia"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Vene"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Sloveenia"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Hispaania"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Rootsi"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Türgi"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukraina"
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "Versioon teadmata"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Ei suuda luua sihtkoha faili %s."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Räsin"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Lõpetatud"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Valmis"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Peatatud"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Vigane"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Ootan"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Pead defineerima mittetühja parooli."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Vigane parool, pole MD5 kontrollsumma!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Ühenduse viga"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Välisühendus suleti"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "EC ühendus ebaõnnestus. Tühi vastus."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Väline Ühendus: Vigane vastus, kätlemine ebaõnnestus. Ühendus suletud."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Väline Ühendus: Vigane vastus, kätlemine ebaõnnestus. Ühendus suletud."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Õnnestus! Ühendus aMulaga loodud "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Õnnestus! Ühendus loodud."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Väline Ühendus: Ligipääs keelatud sest: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Väline Ühendus: Kätlemine ebaõnnestus."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "Automaatne värskendamine on käivitatud"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "VIGA: Ei suuda kuulata TCP porti."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "VIGA: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "HOIATUS: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Sulge"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Lõika"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Aseta"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Puhasta"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Vali kõik"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Piiramatu"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Näita aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Peida aMule"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Ühendatud"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Ühendatud"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Ühendus Kad võrku (tulemüüriga)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "ServeriIP: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "Serveri IP:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Pole ühendatud"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP port: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP port: Pole valmis"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP port: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP port: Pole valmis"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Kliendi informatsioon"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Saatmise limiit"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Tõmbamise limiit"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Näita aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Ühendu lahti"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Peida aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Ühenda"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Välju"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Piiramatu"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule Riba Menüü"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Kiiruse piirangud:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "ÜL: puudub"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "ÜL: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "AL: pole"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "AL: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Tõmbamise kiirus: %.1f"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Saatmise kiirus: %.1f"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Hüüdnimi: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Hüüdnime pole valitud!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "KliendiID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Serveri nimi: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "ServeriIP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Pole ühendust"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online Allkiri: Lubatud"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online Allkiri: Keelatud"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Elus juba: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Jagatud failid: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Kliente sabas: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Kokku AL: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Kokku ÜL: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Jõusta"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Lisa tuumale eD2k või magnet link."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Lisa sõprade nimistusse"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 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:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Siin näidatakse sündmusi. Kogu sündmuste loetelu on logis Serverid lehel."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Laadimine..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Kasutajate arv serveris, kuhu sinagi oled ühendunud ..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Kasutajad: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 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:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Üles: 0.0 | Alla: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Hetkel kehtivad keskmised saatmise ja tõmbamise kiirused. Valituna näitavad numbrid sulgudes kliendikommunikatsiooni raisatud pakette."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Näitab ühenduse olekut ja käimasolevaid siirdamisi. Punane nool näitab, et sa pole hetkel üheduses, kollane nool näitab, et sul on LowID (või oled ühenduses läbi tulemüüri) ja roheline nool näitab et omad HighID (Optimaalseim) ühenduse tüüp."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Pole ühendust ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Sa oled serveriga ühenduses."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Otsing"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nimi:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tüüp"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Kohalik"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Üleüldine"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Laiendatud parameetreid"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtreerimine"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Faili tüüp"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Suvaline"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Archiwum"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Muusika"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CD-Image"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Pildid"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programmid"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Tekst"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Filmid"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Laiend"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Vähim Suurus"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Baiti"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Suurim Suurus"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Saadavus"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filter:"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filter"
 
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filtreerimise tulemused"
-
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Tulemus peeglisse"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Vaata faile"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Lähtesta väljad"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Alusta"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Rohkem"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Laiend"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Seiska"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Tõmbamine"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Tõmba kataloogi"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Otsingu tulemus"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Lähtesta väljad"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Tulemused"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Puhastab lõpetatud tõmbamised"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filter:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Faili allikad:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Üldine"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Täis nimi :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Täis nimi"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met-Fail"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Kontrollsumma"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met-Fail :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Kontrollsumma :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Faili suurus :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Osafaili staatus :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Viimati nähtud tervikuna :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Faili suurus"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Liiklus"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Leitud allikaid :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Saatvaid allikaid :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Failiosi :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Saadaval :"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Andmekiirus :"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Aktiivne Tõmbamine: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Siiratud :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Valmis suurus :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Osafaili staatus"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Viimati nähtud tervikuna"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Leitud allikaid"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Saatvaid allikaid"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Failiosi"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Saadaval"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Andmekiirus"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Aktiivne Tõmbamine"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Valmis suurus"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligentne riknemise vältimine"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Riknemise tõttu kaotatud :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Võidetud tänu kokkusurumisele :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "I.C.H. päästetud paketid :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Riknemise tõttu kaotatud"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Võidetud tänu kokkusurumisele"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "I.C.H. päästetud paketid"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Jagamine: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Päringuid"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Aktsepteeritud päringuid"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Siiratud andmed"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Jagamise suhe"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Täielikke allikaid"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Jagatud failid"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Saatmine: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Kad Info"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Pole hinnatud"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Tiitel"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Failide nimed"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Võta Üle"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Puhasta"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Jõusta"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 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:705
+#: src/muuli_wdr.cpp
 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."
@@ -3114,1132 +4202,1247 @@
 "Filmi puhul saad öelda tema pikkuse, tema süzee, keele ....\n"
 "ja kui see on võltsing siis saad sellest teisi aMule kasutajaid hoiatada."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Faili kavliteet"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Pole hinnatud"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Vigane / Vigastatud / Pole õige"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Halb"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Hea"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Keskpärane"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Väga hea"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Ühendus Kad võrguga katkestatud"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Tõmban, palun oota ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Suurus teadmata"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Vajalik informatsioon"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP Aadress :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Lisainformatsioon"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Kasutajanimi :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Kasutaja kontrollsumma :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Kasutaja kontrollsumma"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Lisa"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Tõmbamise kiirus"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Hetkel"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Hetke keskmine"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Seansi keskmine"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Saatmise kiirus"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Ühendused"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktiivsed tõmbamised"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktiivseid ühendusi (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktiivsed saatmised"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Statistika Puu"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Kasutajanimi:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Kasutaja kontrollsumma:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Klienditarkvara:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Kliendiversioon:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Klienditarkvara"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Kliendiversioon"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "Kasutaja ID"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Serveri IP"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP aadress:"
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "Kasutaja ID:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Serveri nimi"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Serveri IP:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Hämatud"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Serveri nimi:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Hämatud:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Protokolli Hämamine"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Liiklus kliendile"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Praegune päring:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Keskmine saatmise suhe:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Keskmine tõmbamise suhe:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Saadetud (selles seansis):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Tõmmatud (selles seansis):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Saadetud (kokku):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Tõmmatud (kokku):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Praegune päring"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Keskmine saatmise suhe"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Keskmine tõmbamise suhe"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Saadetud (selles seansis)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Tõmmatud (selles seansis)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Saadetud (kokku)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Tõmmatud (kokku)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Skoorid"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "AL/ÜL kordaja:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Turvaline ident:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Järjekorras:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Saba skoor:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Turvaline ident"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Järjekorras"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Saba skoor"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Nimi"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - mitme platvormi Muul"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Keel: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Abitekstide kuvamise ajaline viide."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "See määrab kasutatava keele."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Kontrolli käivitumisel uue versiooni olemasolu"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Valituna kontrollib aMule käivitumisel värskema versiooni olemasolu"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Käivita vähendatult"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Valituna minimeerib aMule ennast peale käivitumist."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Kinnita väljumine"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Sunnib aMule väljumiseks kinnitust küsima."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Luba Riba(tray) ikoon"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Valituna lubadab süsteemiriba (või tegumiriba) ikooni."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Vähenda Ribale ikooniks"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 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:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Pea need seaded meeles"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Abitekstide viide sekundites: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "sekundit"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Lehitseja valik"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Sisesta siia lehitsejaprogrammi nimi. Jättes välja tühjaks, kasutab süsteem vaikimisi määratud lehitsejat."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Lehitse"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Võimalusel ava uus sakk"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Video mängija"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Ribalaiuse piirid"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Saatmine"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Määratud pesa"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Pordid"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Vaikimisi TCP Port "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "UDP port serveri päringute jaoks (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Laiendatud UDP port (Kad / globaalne otsing) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Luba UPnP ruuteri portide suunamiseks"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnp TCP Port (Lisana):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Seo lokaalne aadress IP'ga (suvaliseks jäta tühjaks)"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Seo lokaalne aadress IP'ga (suvaliseks jäta tühjaks)"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Maksimaalseid allikaid tõmmatava faili kohta:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Maksimaalselt samaaegseid ühendusi:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Automaatne ühendumine käivitumisel"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Ühenduse kadumisel taasta ühendus"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Eemalda surnud server peale"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "katset"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Käivitamisel värskenda automaatselt serverite nimekirja"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Loend"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Värskenda serverite nimekirja serveriga ühendumisel"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Värskenda serverite nimekirja kliendi ühendumisel"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Kasuta prioriteedisüsteemi"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Ühendumisel kasuta nutikat LowID kontrolli "
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Ohutu ühendumine"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Automaatne ühendumine ainult staatilises serverinimekirjas olevate serveritega"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Määra käsitsi lisatud serveritel Kõrge Prioriteet"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Intelligentne Riknemise Vältimine (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Luba"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Lisa failid tõmbamiseks peatatud olekus"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Lisa failid tõmbamiseks automaatse prioriteediga"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Proovi alustuseks tõmmata esimene ja viimane tükk"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Alusta järgmise peatatud failiga, kui fail lõpetab"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Samast kategooriast"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "Tähestikulises järjekorras"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Eralda kettaruum uute failide jaoks"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Eraldab uuet failide jaoks vajamineva kettaruumi, seeläbi väheneb faili fragmenteerumine"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Lõpeta tõmbamine, kui vaba kettaruumi on jäänud "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Sisesta siia vähim soovitud kettaruum"
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Salvesta haruldaste failide 10 allikat (< 20 allikat)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Saatmised"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Lisa uued jagatud failid automaatse prioriteediga"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Tõmmatavate failide kataloog"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Intelligentne Riknemise Vältimine (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Luba"
+
+#: src/muuli_wdr.cpp
+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 src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Jagatud kataloogid"
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Ajutiste tõmmatavate failide kataloog"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Jagatud kataloogid"
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Eemalda"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Rekursiivseks jagamiseks tee paremklikk kataloogi ikoonil)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Jaga peidetud failid"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Kaug server"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Kohalik server"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Graafikud"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Värskenduste vahe : 5 sekundit"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Keskmine graafiku aeg: 100 minutit"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Ühenduse graafiku skaala: 100"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Tõmbamise graafiku skaala:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Saatmise graafiku skaala:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Värvid: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Taust"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Alusvõrk"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Allalaadimine, jooksev"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Allalaadimine, jooksev keskmine"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Allalaadimine, seansi keskmine"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Saatmine hetkel"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Hetke saatmise keskmine"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Seansi keskmine saatmine"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktiivseid ühendusi"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Süsteemiriba Kiirvaliku Ikoon"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Kad-sõlmi hetkel"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Kad-sõlmi jooksvalt"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Kad-sõlmi seansis"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Vali"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Puu"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Kuvatavate Kliendi Versioonide arv (0=piiramatu)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! HOIATUS !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Maksimaalne arv uusi ühendusi / 5 sek."
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "FTP värskendamise intervall minutites"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "FTP värskendamise intervall minutites"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Faili puhvri suurus: 240000 baiti"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Saatmise saba suurus: 5000 klienti"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Serveriühenduse värskenadamise intervall: Ei kasuta"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Keela arvuti ajastatud uinumine"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Kasutatav rüü: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Näita igas aknas \"Kiiret eD2k lingi käsitlejat\". "
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Näita kategooria juures laiendatud infot"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "Näita tiitelribal siirdamise kiirusi"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Näita tiitelribal siirdamise kiirusi"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Eelmise rakenduse nimi"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Järgneva rakenduse nimi"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Näita raisatud ribalaiust"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Vertikaalne tööriistariba paigutus"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Tõmbamise Järjekorrafailid"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Näita edenemist protsentuaalselt"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Näita edenemise riba"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Lame"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Ümar"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Sorteeri failid automaatselt (high CPU)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule sorteerib tulbad tõmbamise sabas automaatselt"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Välisühenduse parameetrid"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Aksepteeri väliseid ühendusi"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "Kuulava liidese IP aadress:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "TCP port:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Luba UPnP pordisuunamist EC pordile"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Parool"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Web serveri seaded"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "TCP port:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Kontrollin parooli\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Kontrollin parooli\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Keela külalise (guest) ligipääs"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Webserveri külalise (guest) parool"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Web serveri seaded"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Käivita WEBserver koos aMulega"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "WEB näidis/mall"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Täisõiguste parool"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Luba madalate õigustega kasutaja"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Madalate õiguste parool"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Luba webservri portide UPnP pordisuunamist"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Webserveri UPnP TCP port (Valikuline)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Lehekülje värskendusaeg (sekundites)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Luba Gzip pakkimine"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Süsteemi vaikeväärtus"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Sobib"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Seadetes tehtud muudatuste jõustamiseks klikka siia."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Tühista kõik seadetes tehtud muudatused."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Tiitel :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Kommentaar :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Tõmmatud failide kataloog :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Muuda uute failide prioriteeti :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Tõmmatud failide kataloog"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Muuda uute failide prioriteeti"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Ära muuda"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Vali praegu valitud kategooriale värv :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Algväärtusta"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Vali praegu valitud kategooriale värv"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Klikates seda nuppu tühjendad logi."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Serverite nimekiri"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "Sisesta siia server.met faili asukoha URL ja pressi vasakul olevat nuppu tuntud serverite nimekirja värskendamiseks."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Lisa server käsitsi: Nimi"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Sisesta siia uue serveri nimi"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Sisesta siia serveri port."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule Logi"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Serveri info"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2K Info"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kad Info"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Sõlmed (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Sisesta siia nodes.dat faili url ja pressi vasakul olevat nuppu, et tuntud sõlmede loetelu täiendada."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Sõlmede statistika"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Bootstrap"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Uus sõlm"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Port:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
 msgstr "Tuntud klientide Bootstrap"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Lõpeta Kad ühendus"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Sisesta siia serveri IP aadrdess, kasutades x.x.x.x formaati."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Kasuta Turvalist Kasutaja tuvastamist"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protokolli Hämamine"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Protokolli Hämamine lubatud"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "See valik lülitab Protokolli Hämamise sisse ja sunnib aMule aksepteerima ainult teiste klientide hämatud ühendusi."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Kasuta väljuvatel ühendustel hämamist"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "See valik sunnib aMule kasutama teiste serverite/klientidega ühendumisel Protokolli Hämamist."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Aksepteeri ainult hämatud ühendusi"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "See valik sunnib aMule aksepteerima ainult hämatud ühendusi. Sul on vähem allikaid aga kogu liiklus on hämatud."
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Igaüks"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Mitte keegi"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Kes näeb minu jagatud faile:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP-Filtreerimine"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtreeri kliente"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtreeri servereid"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Lae loetelu uuesti"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Värskenda"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Käivitamisel värskenda automaatselt ipfiltrit"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Filtreerimise tase:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Filtreeri alati LAN IP aadresse"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Mitteklappivate IP aadresside paranoiline käitlemine"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Viskab paketi minema kui kliendi IP erineb paketi saatja IP aadressist. Kasuta ettevaatlikult."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Kasuta süsteemi ipfilter.dat kui see on saadaval"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Kui kohalik ipfilter.dat fail puudub, kasuta süsteemi globaalset ipfilter faili."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Luba Online-Allkiri"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Võimaldab kirjutada OS faile, mida saavad kasutada välised rakendused kasvõi allkirja loomiseks."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Värskenduse sagedus (Sek):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Muuda Online Allkirja värskendamise (sekundites) sagedust."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Salvesta online ollkirja fail: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Näita klientide riigi lippe"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Andmekiirus :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Allikaid"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4247,11 +5450,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4261,828 +5464,747 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Tõmbamine: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Käivitamisel värskenda automaatselt ipfiltrit"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtreeri saabuvaid teateid (va. käimasolev vestlus):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtreeri kõiki teateid"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtreeri sinu sõbralistiväliste kodanike teateid"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtreeri tundmatute klientide teateid"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtreeri teateid, mis sisaldavad (loetelus kasuta eraldajana koma):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Näita logis saabunud teateid"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Kommentaarid"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtreeri teateid, mis sisaldavad (loetelus kasuta eraldajana koma):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Nõua autoriseerimist"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Autoriseerimisel Kasuta/Ära kasuta kasutajanime/parooli"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Kasutajanimi: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Puhverserveriga ühenduseks vajalik kasutajanimi"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Parool:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Puhverserveri kasutamiseks vajalik parool"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Kasuta puhverserverit"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Kasuta/ärakasuta puhverserveri tuge"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Puhverserveri tüüp:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Puhverserveri nimi:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Puhverserveri tüüp"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Puhverserveri nimi"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Selle puhverserveri/hosti nimi "
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Puhverserveri port:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Puhverserveri port"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Selle puhverserveri pordi number"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Nõua autoriseerimist"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Autoriseerimisel Kasuta/Ära kasuta kasutajanime/parooli"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Puhverserveriga ühenduseks vajalik kasutajanimi"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Puhverserveri kasutamiseks vajalik parool"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Ühendu :"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Logi sisse eemalasuvasse amuula"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Kasutaja nimi"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Pea need seaded meeles"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Välisühendus suleti"
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Kasuta gzip pakkimist"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Võimalda inimkieelne Veajälitus-Logimine"
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "Ava Fail"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Saadetav teade:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Ootan..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Lisa imporditavad"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Proovi valitutega uuesti"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Eemalda valitud"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Sündmuse tüübid"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Aktiivsed saatmised"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Protsenti kogufailidest"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Näita Kliente"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Kõik failid"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Valitud failid"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Ainult aktiivsed saatmised"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Näita Kliente"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Taaslae:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Lae oma jagatud failid uuesti"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Saada"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Saada määratud teade."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Sulge see vestlus-seanss."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Ühendu suvalise serveri ja/või Kad võrguga"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Loobu"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Jagatud failid"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Ühendu lahti"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Ühenda"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Eemaldatud %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "baiti"
 msgstr1 "baiti"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "baiti/sek"
 msgstr1 "baiti/sek"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sek"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "min"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "tundi"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "päev(a)"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "kõik"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "kõik teised"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Poolik"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Peatatud"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Film"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arhiiv"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Tekst"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Aktiivne"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Kasutan seadete kataloogi: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Sellel käsul ei tohiks olla ühtegi parameetrit."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Sellel käsul ei tohiks olla ühtegi parameetrit."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Sellel käsul ei tohiks olla ühtegi parameetrit."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Sellel käsul ei tohiks olla ühtegi parameetrit."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Sisesta siia serveri port."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Sisesta siia serveri port."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Sisesta siia serveri port."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Ootan osafaili konverteerimise lõime suremist ..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Impordin %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Loen ajutist kataloogi"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Hangin põhiinformatsiooni tõmmatavast infofailist"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Loon sihtkohafaili"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Laen vanast tõmbamisefailist andmeid (%u %u-st)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Hanging allika tõmmatavate failide informatsiooni"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Lisan tõmbamise ja salvestan osafili"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Imporditud osafailid"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Olek"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Faili kontrollsumma"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Ketas: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Kas soovid õnnestunult imporditud tõmmatud failide allikad kustutada?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Eemaldan allikaid?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "VIGA: Ei suutnud luua osafaili!"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Proovin laadida met-faili tagavarakoopiat aadressilt %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, 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:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "VIGA: Vigane fail part.met versioon : %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, 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:675
+#: src/PartFile.cpp
 #, 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:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Proovin taastada faili infot..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Taastatud kogu olemasolev failiinfo :D - Proovin nüüd kasutada..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Ei suuda faili infot taastada :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Ei suuda avada: %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "HOIATUS: %s võib olla riknenud (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "VIGA salvestades osafaili: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "IO viga osafaili salvestamisel: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Salvestatud %i allikat osafailile: %s (%s)"
 msgstr1 "Salvestatud %i allikat osafailile: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Salvestatud %i allikat osafailile: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "VIGA osafaili toitefaili lugemisel (%s - %s): %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Leidsin riknenud osa (%d) %d osast fail '%s' - Arvutatud Kontrollsumma |%s| Saadetud Kontrollsumma |%s|"
 msgstr1 "Leidsin riknenud osa (%d) %d osast fail '%s' - Arvutatud Kontrollsumma |%s| Saadetud Kontrollsumma |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Leitud lõpetatud osa (%i)  %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "'%s' faili kontrollsumma arvutamine lõpetatud"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Ootamatu viga %s lõpetamisel. Fail peatatud"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Faili '%s' tõmbamine lõpetatud"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Faili '%s' tõmbamine lõpetatud"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Kustutan faili: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, 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'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "VIGA: ei suuda tõmmatud osale arvutada kontrollsummat- kontrollsumma on mittetäielik(%s). Seda ei tohiks kunagi juhtuda."
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "HOIATUS: Pole piisavalt vaba kettaruumi! Pausin faili: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Tõmmatud osa %i on failis %s vigane"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Eraldamine"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Ebapiisav kettaruum"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Allalaetud"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "VIGA: Osafaili '%s' avamine ebaõnnestus"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Süsteemi vaikeväärtus"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albaania"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Araabia"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturia"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baski"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgaaria"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Kataloonia"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Hiina (Lihtsustatud)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Hiina (Traditsiooniline)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Kroaatia"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Tšehhi"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Taani"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Hollandi"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Inglise (U.K.)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "Inglise (U.K.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Eesti"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Soome"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Prantsuse"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galiitsia"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Saksa"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Kreeka"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Heebrea"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Ungari"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Itaalia"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Itaalia (Shveits)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Jaapani"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Korea"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Leedu"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norra"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Poola"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugali"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugali (Brasiilia)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Rumeenia"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Vene"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Sloveenia"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Hispaania"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Rootsi"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Türgi"
+msgid "Extended source exchange"
+msgstr "Allikate Vahetus"
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukraina"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Muuda keel"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Info puudub"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "valikud puuduvad"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "Leidsin vigase kategooria, ignoreerin"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Leidsin vigase kategooria, ignoreerin"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Kasutan vaikimisi porti (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Ühendus"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Kataloogid"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Serverid"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Failid"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Turvalisus"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Liides"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Puhverserver"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtrid"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Kaugjuhtimine"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Online Allkiri"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Muud"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Sündmused"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Veajälitus"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5092,15 +6214,15 @@
 "   %PARTFILE - fail täis rada\n"
 "   %PARTNAME - faili nimi"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5116,26 +6238,43 @@
 "aMule toimib ilusasti ilma siinolevaid seadeid muutmata\n"
 "You Are WARNED!!."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Selle puhverserveri tüüp kuhu sa ühendud"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Kontrollin parooli\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5143,32 +6282,46 @@
 "Nende muudatuste jõustamiseks pead aMUle taaskäivitama:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP port muudetud.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP port muudetud.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "- Välisühenduse liides muutunud.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Välisühenduse port on muutunud.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Välisühenduse luba on muudetud.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Välisühenduse liides muutunud.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Protokolli Hämamine"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Keel on muudetud.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5176,27 +6329,33 @@
 "Sinu automaane serverinimekirja värskendamise loetelu on tühi.\n"
 "Käivitamisel serverinimekirja automaatselt ei uuendata."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 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:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Keel on muudetud.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Ajutiste failide kataloog on muudetud.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- ED2K võrk on lubatud.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Vigane protokolli versioon."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5204,7 +6363,7 @@
 "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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5212,7 +6371,7 @@
 "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:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5222,20 +6381,69 @@
 "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:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Automaatne värskendamine on käivitatud"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Ajutiste tõmmatavate failide kataloog"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Parool on määratud ja välised ühendused võimalikud."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5245,41 +6453,66 @@
 "Palun sisesta vähemalt üks server.met faili asukoha kehtiv URL.\n"
 "URL sisestamiseks kliki nupule 'Loend'."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Ajutised failid"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Saabuvad failid"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Online Allkirjad"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Vali %s kataloog"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Leitud %i tuntud ja jagatud faili"
+msgstr1 "Leitud %i tuntud ja jagatud faili."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Otsi filmi taasesitamise programmi"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Vali lehitseja (browser)"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Vali lehitseja (browser)"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Käivitusprogramm%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Süsteemi vaikeväärtus"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Muuda serverite nimekirja"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5287,1200 +6520,1466 @@
 "Lisa siia server.met faili(de) laadimise URL.\n"
 "Üks URL rea kohta."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Täielikke allikaid"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Olek:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Olek:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Värskenduse viide: %d sekundit"
 msgstr1 "Värskenduse viide: %d sekundit"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Keskmiste graafiku aeg: %d minutit"
 msgstr1 "Keskmiste graafiku aeg: %d  minutit"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Ühenduse graafiku skaala: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Failipuhvri suurus: %d baiti"
 msgstr1 "Failipuhvri suurus: %d baiti"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Saatmise Saba suurus: %d klienti"
 msgstr1 "Saatmise Saba suurus: %d klienti"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Serveri ühenduse värskendamise intervall: %d minutit"
 msgstr1 "Serveri ühenduse värskendamise intervall: %d minutit"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Serveri ühenduse värskendamise intervall: Ei kasuta"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "keelatud"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Käivita käsk peale '%s' sündmust"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Luba käskude käivitamine tuumas"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Tuumkäsk:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Luba käskude käivitamine GUI's"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "GUI Käsk:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Järgnevad muutujad asendatakse:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Jagatud kataloogid"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Lae oma jagatud failid uuesti"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Jagatud kataloogid"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Jagatud failide loetelu taaslaadimine."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Jagatud kataloogid"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Vali %s kataloog"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Pea need seaded meeles"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Otsingu hoiatus"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Otsingud"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Otsing : %u %% \n"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Otsingu hoiatus"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Peamine"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "HOIATUS: Tuttavate failde loetelu on riknenud, sisaldab riknenud päist."
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Tuntud falide loetelus vigane kirje, fail võib olla vigane: "
+
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 #, fuzzy
 msgid "No keyword for Kad search - aborting"
 msgstr "Otsingu märksõna: %s"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Ootamatu viga proovides Kad otsingut: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "FailiID"
-
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Pole hinnatud"
-
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Tõmba kataloogi"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:714
+#: src/SearchList.cpp
 #, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Lisa selle faili alternatiivsed URL'id"
+msgid "Error %u: %s\n"
+msgstr "GeoIP.dat uuendamise viga"
+
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "FailiID"
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Sulge kõik lehed"
+
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Otsi seotud faile (eD2k, kohalik server)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Märgi fail tuntuks"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Kopeeri eD2k link lõikepuhvrisse"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopeeri eD2k lingid lõikepuhvrisse"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Sa oled serveriga, mida soovid kustutada, ühenduses. Palun katkesta ühendus. Serverit ei kustutatud."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Loobutud"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Uus"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Töötab"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Soome"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Otsing : %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Otsingu edenemist ei saa näidata"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static 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
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "Serveritega ühenduse loomine ebaõnnestus. Lähen uuele katsele."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "Serveritega ühenduse loomine ebaõnnestus. Lähen uuele katsele."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Proovin %d sekundi pärast serveriga uuesti automaatselt ühenduda."
+msgstr1 "Proovin %d sekundi pärast uuesti serveriga automaatselt ühenduda."
+
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr "Serverite loetelus pole ühendumiseks sobivat kehtivat serverit"
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Ühendus %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Ühendus loodud: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Fataalne viga ühendumisel. Kontrolli ühendust."
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Kaotasin ühenduse %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) on vist surnud."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) on vist täis."
 
-#: 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"
-msgstr0 "Proovin %d sekundi pärast serveriga uuesti automaatselt ühenduda."
-msgstr1 "Proovin %d sekundi pärast uuesti serveriga automaatselt ühenduda."
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Ühendus kadunud"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Ühendumine %s (%s:%i) ebaõnnestus."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "VIGA: Vigane socket aegumise kontrollil"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Serveriga '%s (%s:%i)' ühendumise katsed aegusid."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Saabus DNS päringu hilinenud vastus, ignoreerin."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Laen server.met faili: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Server.met faili ei leitud."
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Ei saanud avada server.met faili!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "Failis server.met on %i serverit"
 msgstr1 "Failis server.met on %i serverit"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d server lisatud"
 msgstr1 "%d server(it) lisatud"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "IO viga %s faili lugemisel: %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Sa oled serveriga, mida soovid kustutada, ühenduses. Palun katkesta ühendus. Serverit ei kustutatud."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Ei suuda avada '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Ei saanud salvestada server.met faili!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "IO viga %s faili lugemisel: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Vigane URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Serverite nimekirja tõmbamine aadressilt %s lõpetatud"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "'addresses.dat' failis puudub serverite nimekirja asukoha kirje. Palun lisa kehtiv serveri nimekirja asukoha aadress sellesse faili, vastasel juhul nimekirja automaatset värskendamist ei toimu."
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Tõmba serverite nimekiri aadressilt %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Serverite nimekirja tõmbamine aadressilt %s ebaõnnestus"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 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/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Kasutajad"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Kasutajad"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Staatiline"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versioon"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Failid"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Jagatud failid"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Sa oled ühenduses selle serveriga mida soovid kustutada. Palun katkesta ühendus. Serverit ei kustutatud."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Tundmatu nimi)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "Oled kindel et tahad kustutada staatilise serveri %s"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "min"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Servereid (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Server"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Ühendu serveriga"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Märgi server staatilisena"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Märgi server mittestaatilisena"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Märgi serverid staatilisena"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Märgi serverid mittestaatilisena"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Eemalda server"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Eemalda serverid"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Eemalda kõik serverid"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopeeri eD2k lingid lõikepuhvrisse"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Taasühendu serveriga"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Oled kindel et tahad kõik serverid kustutada?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Oled kindel et tahad valitud serveri kustutada?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Oled kindel et tahad valitud serverid kustutada?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "VIGA: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "HOIATUS: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Uus kliendi ID %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "HOIATUS: Said omale Low-ID!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tTäpsemat informatsiooni leiad https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Saabus tundmatu serveriinfo! - liiga lühike"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Sain %d uut serverit"
 msgstr1 "Sain %d uut serveri nime"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Serverite loetelu salvestamine lõpetatud."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Server lükkas viimase korralduse tagasi"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Tüngapakett saabus serverist: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Defineerimatu viga serverist %s saabunud paketi töötlemisel"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "Server IP %s (%s) on filtris. Ei ühenda."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "kasutan protokolli hämamist"
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Ühendun %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "aMule Logi"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Serverit ei lisatud: IP aadressi või masinanime pole defineeritud."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Serverit ei lisatud: Defineerisid vigase pordi."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "eD2k Olek:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Ühenduse olek:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Ühendatud"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kademlia Olek:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Jookseb LAN olekus"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Töötab"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Kademlia Olek:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Olek:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Ühenduse olek:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "UDP ühenduse olek:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Olek tulemüüriga: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Semu pole tarvis - TCP port on avatud"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Semu pole tarvis - UDP port on avatud"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Semu puudub"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Ühendun semuga"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Ühendus semuga %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP aadress:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Indekseeritud allikaid:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Indekseeritud märksõnu:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Indekseeritud märkmeid:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Indekseeritud laadimisi:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Keskmiselt kasutajaid:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Keskmiselt faile:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Ei tööta"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Lisan faili '%s' jagatute hulka"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Leitud %i tuntud ja jagatud faili"
 msgstr1 "Leitud %i tuntud ja jagatud faili."
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Leitud %i tuntud ja jagatud faili, %i tundmatut"
-msgstr1 "Leitud %i tuntud ja jagatud faili, %i tundmatut."
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "VIGA: Katse jagada %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Jagatud kataloogi ei leitud, jätan vahele: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Jagatud kataloogi ei leitud, jätan vahele: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Kataloogis '%s' pole jagatavaid faile"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Kasutaja nimi"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "VIGA: tekkis %s faili salvestamisel: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Tõmbamise kiirus"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Laen server.met faili: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Saatmise kiirus"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Kataloogis '%s' pole jagatavaid faile"
+msgstr1 "Kataloogis '%s' pole jagatavaid faile"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Kataloogis '%s' pole jagatavaid faile"
+msgstr1 "Kataloogis '%s' pole jagatavaid faile"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Saadaval osi"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Leitud %i tuntud ja jagatud faili"
+msgstr1 "Leitud %i tuntud ja jagatud faili."
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Kasutaja nimi"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "Saatmise olek"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Kohalik faili nimi"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "Jagatud failid"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Päringuid"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Aktsepteeritud päringuid"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Siiratud andmed"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Jagamise suhe"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Saadud osi"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Täielikke allikaid"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Saadavus"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Kataloogi asukoht"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Jagatud failid"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Lisa Kommentaar/Hinnang"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Muuda Kommentaari/Hinnangut"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Nimeta ümber"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Lisa failid ülekantavate failide loetellu"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Kopeeri magnet &URI lõikepuhvrisse"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Kopeeri eD2k link lõikepuhvrisse (Allika&s)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Kopeeri eD2k link lõikepuhvrisse (Allikas)(&Koos Krüpto seadetega)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Kopeeri eD2k link lõikepuhvrisse (&Hostinimi)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Kopeeri eD2k link lõikepuhvrisse (Hostinimi)(Koos &Krüpto seadetega)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Kopeeri eD2k link lõikepuhvrisse (&AICH info)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Kopeeri eD2k link lõikepuhvrisse (&AICH info)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Allika lingi loomiseks pead omama HighID'd."
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Viga lõpetamisel"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Ei suuda tõmmata kasutaja '%s' jagatud faili"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Lae oma jagatud failid uuesti"
+msgstr1 "Lae oma jagatud failid uuesti"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Jagatud failide suurus kokku: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Jagatud failide suurus kokku: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Jagatud failid (%i)"
+msgstr1 "Jagatud failid (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Jagatud failid (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "FailiOsa"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Jagatud failide loetelu taaslaadimine."
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Olek"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Kaugfaili nimi"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Saadetud andmeid (Seansil (Kokku)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Raisatud Kokku (pakette): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Raisatud faili päringuid (pakette): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Raisatud allikavahetusi (pakette): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Raisatud Servereid (pakette): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Raisatud Kad (pakette): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Krüpteerimise ulatus (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Aktiivsed saatmised: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Ootel saatmised: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Kokku õnnestunud saatmisi: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Kokku ebaõnnestunud saatmisi: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Keskmine saatmise aeg: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Tõmmatud Andmed (Seansil (Kokku)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Leitud allikaid: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Aktiivsed tõmbamised (tükid): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Seanss ÜL:AL suhe (Kokku): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Keskmine tõmbamise kiirus (Sessioon): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Keskmine saatmise kiirus (Sessioon): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Maksimaalne tõmbamise kiirus (Sessioon): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Maksimaalne saatmise kiirus (Sessioon): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Ühenduse taastumised: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Aeg alates esimesest saatmisest: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Ühendatud serveriga alates: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Aktiivseid ühendusi (hinnang): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Saavutati maksimaalne arv ühendusi: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Keskmiselt ühendusi (hinnang): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Suurim ühenduste arv (hinnang): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Kliendid"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Tundmatu: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtreeritud: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Blokeeritud: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Kokku: %i Tuntuid: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Töötavad serverid: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Ebaõnnestunud serverid: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Kokku: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Kustutatud serverid: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Filtreeritud serverid: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Kasutajaid töötavail servereil: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Faile töötavail servereil: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Kokku kasutajaid: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Kokku faile: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Serveri hõivatus: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Jagatud failide arv: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Jagatud failide suurus kokku: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Keskmine faili suurus: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Operatsioonisüsteem"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Pole vastu võetud"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktiivseid ühendusi (l:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Info puudub"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Mitte kunagi"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Käivita <str> ja välju."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "See käsk vajab muutujat. Sobivad muutujad on: 'all', failinimi või number.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Töötlen räsi järgi: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Töötlen failinime järgi: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Pole korrektne number\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6489,7 +7988,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6498,83 +7997,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "Rohkema info saamiseks tipi '%s'.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Tõmban '%s'"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Päring ebaõnnestus tundmatu vea tõttu."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operatsioon oli edukas."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Päring ebaõnnestus järgneval põhjusel: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Klientide IP-Filter on %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Väljas"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Sees"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Serverite IP-Filter on %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Kehtiv IPFilter Tase on %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Ühendatud %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Ühendun"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "tulemüüriga"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6583,7 +8086,7 @@
 "\n"
 "Tõmbamine:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6592,7 +8095,7 @@
 "\n"
 "Saatmine:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6601,7 +8104,7 @@
 "\n"
 "Kliente järjekorras:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6610,38 +8113,33 @@
 "\n"
 "Kokku allikaid:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "FailiOsa"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Otsingu tulemusi: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Otsing : %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Otsingu edenemist ei saa näidata"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Serverilt saabus tundmatu vastus, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Näitab lühikest oleku ja statistika infot."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 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:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Näitab täieliku statistika puud."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6655,11 +8153,11 @@
 "\n"
 "Näiteks: 'statistics 5' näitab ainult 5 enamesinenud versiooni iga kliendi tüübi kohta.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Seiska aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6668,35 +8166,35 @@
 "Seiska eemalasuv töötav tuum (amule/amuled).\n"
 "Seiskab ka tekstikliendi, kuna see on kasutu ilma töötava tuumata.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Määratud objekt taaslaadimine."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Jagatud failide loetelu taaslaadimine."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "IP Filteri taaslaadimine."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Lae preagune IP filtreerimise tabel uuesti."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Uuenda IP filtrit URL'ist."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 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:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Ühendu võrguga."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6707,35 +8205,35 @@
 "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:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Ühendu ainult eD2k võrku."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Ühendu ainult Kad võrku."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Lahku võrgust."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Lõpeta ühendus ainult eD2k võrguga."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Lõpeta ühendus ainult Kad võrguga."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Lisa tuumale eD2k või magnet link."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6752,110 +8250,124 @@
 "   serverid serverite nimekirja.\n"
 "Magnet link peab sisaldama eD2k kontrollsummat ja faili pikkust.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Määra seade väärtus."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Määra IP filtri seaded."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Lülita serverite ja klientide IP filtreerimine sisse."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Lülita serverite ja klientide IP filtreerimine välja."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Rakenda/ära rakenda klientide IP Filtreerimist."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Lülita klientide IP-filtreerimine sisse."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Lülita klientide IP-filtreerimine välja."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Rakenda/ära rakenda serverite IP Filtreerimist."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Lülita serverite IP-filtreerimine sisse."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Lülita serverite IP-filtreerimine välja."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Vali IP Filtreerimise tase."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 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/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Määra ribalaiuse piirang."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "Väärtus, mis nendele käskudele antakse, peab olema kilobaiti/sekundis.\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Määra saatmise ribalaiuse piirang."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Väärtus, mis nendele käskudele antakse, peab olema kilobaiti/sekundis.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Määra tõmbamise ribalaiuse piirang."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Autoriseerimisel Kasuta/Ära kasuta kasutajanime/parooli"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Väärtus, mis nendele käskudele antakse, peab olema kilobaiti/sekundis.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Hangi ja näita atribuudi väärtus."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Hangi IP filtri seaded."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Hangi IP filtri olek nii klientide kui ka serverite kohta."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Hangi IP filtri olek ainult klientide kohta."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Hangi IP filtri olek ainult serverite kohta."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Vali IP filtreerimise tase."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Kehtiv Ribalaiuse piirang."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Käivita otsing."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6874,39 +8386,44 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Käivita globaalne otsing."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Käivita lokaalne otsing."
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Käivita otsing kad võrgust."
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
 msgstr "Näita viimase otsingu tulemusi."
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Tagasta eelmise otsingu tulemuse.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Näita otsingu edenemist."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Näita otsingu edenemist.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Alusta faili tõmbamist"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6914,81 +8431,81 @@
 "Pead andma eelmise/viimase otsingu faili numbri.\n"
 "Näiteks 'download 12' alustab eelmise otsingu 12'nda faili tõmbamist.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Peata tõmbamine."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Jätka tõmbamist."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Katkesta tõmbamine."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Määra tõmbamise prioriteet."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Määra madal prioriteet."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Määra normaalne prioriteet."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Määra kõrge prioriteet."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Määra automaatne prioriteet."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Näita järjekorda/nimekirja."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Näita saatmise saba."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Näita tõmbamise järjekorda."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Näita logi."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Näita serverite nimekirja."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Jagatud failide loetelu taaslaadimine."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Tühjenda logi."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Aegnud käsk, kasuta selle asemel '%s'."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -6997,256 +8514,279 @@
 "See on vananenud/aegunud käsk ja võidakse tulevikus eemaldada.\n"
 "Selle asemel kasuta '%s'.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule tekstiline klient"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Kustutan faili: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Kustutan faili: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Taastan faili '%s' saatmise"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "Konverteerin vanad '%s' AICH kontrollsummad 64b '%s'."
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Ootan kinnitust"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "Liiga palju ühendusi"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "kõik teised"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Vali vaate filter"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Lisa kategooria"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Muuda kategooria"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Eemalda kategooria"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Tundmatu faili '%s' jaoks küsiti kontrollsummat."
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Vali, kes võib vaatamiseks küsida sinu jagatud falide nimekira."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Taastan faili '%s' saatmise"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Peatan faili '%s' saatmise"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+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
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Tõmbamine lõpetatud"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Faili asukoht koos täieliku rajaga."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Faili nimi ilma raja osata."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "Faili eD2k räsi."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Faili suurus baitides."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Kumuleeruv tõmbamise aeg."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Uus vestlussession alustatud"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Teate saatja."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Pole enam ruumi"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Ketta partitsioon."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Viga lõpetamisel"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Töötlen faili number %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Faili pole olemas !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, aMule eD2k lingilooja"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Ohoo, rõõm sind näha!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Sisendparameetrid"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Räsitav fail"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Lisa selle faili alternatiivsed URL'id"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:144
-msgid "Remove"
-msgstr "Eemalda"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Loo link osa-kontrollsummadega"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4 Faili kontrollsumma"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k Faili kontrollsumma"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k link"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Salvesta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Kopeeri lõikepuhvrisse"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Ava"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Ava fail tema eD2k lingi loomiseks"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Kopeeri arvutatud eD2k link lõikepuhvrisse"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Salvesta kui"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Salvesta arvutatud eD2k link faili"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "aLinkCreator'ist"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Ei suuda lõikepuhvrit avada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Praeguseks hetkeks pole midagi kopeerida !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Vali fail mille eD2k lingi arvutasid"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Ei suuda avada "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Palun sisesta mittetühi faili nimi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Pole midagi praeguseks hetkeks salvestada !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7266,162 +8806,159 @@
 "\n"
 "Jaotatakse GPL litsentsi järgselt"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Räsin..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator toimib sinu jaoks"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Arvutan MD4 räsi..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Arvutan eD2k räsi..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Tühistatud !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Tehtud %.2f sekundiga"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Oled juba selle URL lisanud !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Palun sisesta mittetühi URL"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Ei suuda %s avada"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uP %02ut %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02ut %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, aMule Online Statistika"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Suurim Tõmbamine alates wxCas käivitamisest"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Absoluutselt suurim Tõmbamine wxCas eelmistest käivitamistest"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Algväärtusta"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Süsteem"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Peata Automaatne Värskendus"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Salvesta Ühenduse Statistiline pilt"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Trüki Ühenduse Statistiline pilt"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Seaded"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "wxCas Info"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Käivita automaatne värskendamine"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Automaatne värskendamine on peatatud"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Automaatne värskendamine on käivitatud"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Salvesta Statistika"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMule Online Statistika"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7429,11 +8966,11 @@
 "Tekkis viga printimisel.\n"
 "Võibolla pole su printer korralikult seadistatud?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Trükin"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7451,402 +8988,560 @@
 "\n"
 "Jaotatakse GPL litsentsi järgselt"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh Oh, aMule ei tööta ..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule töötab"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule töötab aga ühendus on katkestatud"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule ühendub..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh Oh, aMule olek on teadmata..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " on toimetanud juba "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " on seiskunud !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " pole ühendatud !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " ühendub..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " teeb midagi imelikku, kontrolli !!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " on ühendatud  "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "väljas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " baseerub "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " koos "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Kokku Tõmbamisi: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Saatmine: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Seansil Tõmmatud: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Tõmbamine: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Saatmine: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Jagamine: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " faili, Klienti järjekorras: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Kellaaeg: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " on "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Süsteemi koormuse keskmised (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Süsteem on elus juba: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "amulesig.dat fail asukoht"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Värskendamise intervall sekundites"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Genereeri igal värskendamisel staatiline pilt"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Saada perioodiliselt oma stat fail FTP serverisse"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP Url"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP asukoht"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Sisesta siia oma FTP serveri URL"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Kasutaja"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "Sinu kasutajanimi FTP serverisse logimiseks"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "Sinu parool FTP serverisse logimiseks"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTP värskendamise intervall minutites"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Kinnita/kontrolli"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Sinu allkirjafaili asukoha kataloog"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Genereeritud statistiliste piltide kataloog"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Laeb malli <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "WEB serveri HTTP port"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Kasuta UPnP pordisuunamist webserveri portide suunamiseks"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP port"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Kasuta gzip pakkimist"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Webserveri täieliku ligipääsu parool"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Webserveri külalise (guest) parool"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Luba külalise (guest) ligipääs"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Keela külalise (guest) ligipääs"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "Lae/salvesta webserveri parameetrid eemal-asuvast/asuvasse aMule"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMule seadetefaili asukoht. ÄRA KASUTA OTSE!!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Ära kasuta PHP interpretaatorit (aegunud)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Loo PHP lehed iga päringu puhul uuesti"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule WebServer"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "web kliendi ühenus lubatud\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "VIGA: ei luba web kliendil ühenduda\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Päring ebaõnnestus, põhjus: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Indeksfaili ei leidnud: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Seanss on aegunud - vajalik uuestilogimine\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Seanss ok, sisselogitud\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Seanss ok, pole sisselogitud\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Pole avatud seanssi - nõuan logimist\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Seanss loodud - nõuan logimist\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Töötlen päringut algupärane:"
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Ilma paroolita logimine pole lubatud."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Kontrollin parooli\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Parooli kontrollsumma vigane\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Parool ok\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Parool, paha\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Nõuti väljalogimist\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Töötlen päringut ümbersuunatud: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Ühendus ebaõnnestus "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Üleslaaditud"
+#~ msgid "Ratio"
+#~ msgstr "Hinnang"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Kataloogis '%s' pole jagatavaid faile"
+
+#~ msgid "Change Language"
+#~ msgstr "Muuda keel"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "Info puudub"
+
+#~ msgid "User name"
+#~ msgstr "Kasutaja nimi"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Saadud osi"
+
+#~ msgid "Available Parts"
+#~ msgstr "Saadaval osi"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Leitud %i tuntud ja jagatud faili, %i tundmatut"
+#~ msgstr1 "Leitud %i tuntud ja jagatud faili, %i tundmatut."
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Faili ei leitud."
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%H:%M:%S %d/%m/%y"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Kaug server"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Kohalik server"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Tuntud falide loetelus vigane kirje, fail võib olla vigane: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Salvestan osafaili %u %u-st"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Et seda viga eelvaatuse ajal rohkem mitte näitdata \n"
+#~ "määra oma seadetes eelistatud video mängija (vaikimisi %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Filtreerimise tulemused"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Märgi fail tuntuks"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Protsenti kogufailidest"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Bootstrap"
+
+#~ msgid "New node"
+#~ msgstr "Uus sõlm"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Rohkem"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Tuntud klientide \n"
+#~ "Bootstrap"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Ühendu suvalise serveri ja/või Kad võrguga"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Lõpeta Kad ühendus"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Lõpeta käimasolevad ühenduskatsed"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Lõpeta ühendus ühendatud võrkudega"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Ühendu olemasolevate, aktiivsete võrkudega"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Sorteeri failid automaatselt (high CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule sorteerib tulbad tõmbamise sabas automaatselt"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Viskab paketi minema kui kliendi IP erineb paketi saatja IP aadressist. Kasuta ettevaatlikult."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Tagasta eelmise otsingu tulemuse.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Näita otsingu edenemist.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Ühendus suletud - aMule on ilmselt seisatud."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Kontrolli käivitumisel uue versiooni olemasolu"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k Link: "
+
+#~ msgid "Commit"
+#~ msgstr "Jõusta"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: lahkun taustaprotsessiks - näeme veel"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Web: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Foorum: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Web: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Foorum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Üleslaaditud"

amule-3.0.1.tar.gz/po/eu.po -> amule-3.1.0.tar.gz/po/eu.po Changed

@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:12+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:35+0000\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <librezale@librezale.org>\n"
 "Language: eu\n"
@@ -22,71 +22,159 @@
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "aMule erakutsi"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMule urruneko kontrola "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Argazkia:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"'Plataforma-orotarako' p2p bezeroa eMulen oinarritua \n"
+"\n"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2019 aMule taldea \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "aMuleren zati bat \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Parez-pareko routing-a XOR metrikan oinarritua.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Webgunea:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Foroa:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Arakatu bertsio berrien bila abiaraztean"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Kad-era konektatzen..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Zaharkiturik dagoen aMule bertsio bat erabiltzen ari zara!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Ez dago erabilgarri"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Gehitu laguna"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Baliozko IP helbide eta ataka sartu behar dituzu!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Argibideak"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Emandako erabiltzaile egiaztapena ez da baliozkoa!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "Add aMule to your application menu?"
 msgstr "Aplikazio izenaren ondoren"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Konexioak huts egin du "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -95,82 +183,160 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ERROREA"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Huts ED2KLinks fitxategia irekitzerakoan."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "aMule elkarrizketa suntsitua"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Ez da index fitxategia aurkitu: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Huts '%s' erabiltzailearen partekatutako fitxategiak jasotzerakoan"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "Ez da partekatu daitekeen fitxategirik direktorioan: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Ezin da lotura magnetikoa eD2k bihurtu: %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Okerreko eD2k lotura! ERROREA: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Orain, aplikazio nagusia ixten..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "'%d' pid-a duen amuleweb instantzia amaitzen ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "'%d' pid-a duen amuleweb instantzia hiltzen ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Huts egin du"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "'%d' pid-a duen amuleweb instantzia amaitzen ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "'%d' pid-a duen amuleweb instantzia hiltzen ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule irteten: Muina ixten."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "aMule itzaltzea osaturik."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "aMule ixtearen memoria arazte irteera:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Zure lokalak sistemako lehenetsira aldatu dira konfigurazio aldaketa bat dela eta. Barkatu."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Argb"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -178,56 +344,109 @@
 "\n"
 "EC konfigurazioa"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Pasahitza ezarria eta kanpo konexioak gaiturik."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "OHARRA"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "zerbitzari %i aurkiturik server.met fitxategian"
+msgid "Loading temp files"
+msgstr "%sd-tik aldiroko fitxategiak kargatzen."
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "%sd-tik aldiroko fitxategiak kargatzen."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Berritu zure partekatutako fitxategiak"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Berritu zure partekatutako fitxategiak"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Hasi"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Sareak"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Sareak"
+msgid "eD2k server list (server.met)"
+msgstr "zerbitzari %i aurkiturik server.met fitxategian"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web zerbitzaria abiarazirik %d pid-arekin"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "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:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "ERROREA"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "web zerbitzaria abiarazirik %d pid-arekin"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "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
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Ezin da atakak ezarritako helbidean ireki: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "%u ataka ez dago eskuragarri. IDBaxua izango duzu\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -242,48 +461,48 @@
 "\n"
 "Egiaztatu zure sarea ataka sarrera eta irteerarako irekirik dagoela ziurtatzeko."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Huts online sinadura fitxategia sortzerakoan"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Huts aMule online sinadura fitxategia sortzerakoan"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "aMule %s abiarazten duzun lehen aldia da"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Bertsioa hau beta bertsio bat da, egunero eguneratzen da, eta\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "ez gara ezer apurtu, zure etxea erre, edo zure zakurra akatzen\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "badu ere kargu egingo. Baina erabiltzeko ziurra izan *beharko* litzateke.\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "https://amule-org.github.io -en, edo irc.libera.chat IRC sareko #aMule kanalean.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Edozein akatsen berri emateko:https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -291,1579 +510,1885 @@
 "Zuk aukeratutako sinadura karpeta BALIOGABEA da!\n"
 " Lehenespenak konpondu artean lineako sinadura EZGAITU egingo da."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Zerbitzari ostalari-izena notifikatua"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Disko aurresleipenak huts egin du '%s' fitxategiarentzat: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "ERROREA: ezin da erregistro fitxategia ireki"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "ABISUA: erregistro fitxategia hutsik dago. Zerbait oker dago."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Erregistroa berrezarri egin da"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "ZerbitzariMezua: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, 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/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Huts egin du nodo zerrenda deskargatzerakoan."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Huts egin du"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Hondaturiko bertsio arakatze fitxategia"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Zaharkiturik dagoen aMule bertsio bat erabiltzen ari zara!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Azken bertsioa beti https://github.com/amule-org/amule/releases/latest webgunean aurki daiteke"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Zure aMule kopia zaharkiturik dago."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Huts bertsio arakatze fitxategia deskargatzerakoan"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Erab: %s | Fitx: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Ez dago sarerik hautatuta"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "IDBaxuarekin"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "IDAltuarekin"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "%s %s-ra konektaturik"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s-ra konektatzen"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "eD2k-tik deskonektatua"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad abiarazirik."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad gelditurik."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Kad-era Konektatuta (ondo)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Kad-era Konektatuta (suebakirik)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Kad-etik deskonektatua"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kad sarea hobespenetan ezgaiturik, ez da konektatuko."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 #, fuzzy
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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 https://amule-org.github.io/docs gunean"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: Abioan - ordularia abiarazten"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: bigarren planoan lanean - ikusten gaituk"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Ezin da Pid fitxategia sortu"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "ERROREA: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Hau eMulen oinarrituriko aMule %s da."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "%s-n abiarazirik"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Bisitatu https://github.com/amule-org/amule/releases/latest gunea bertsio berriagorik eskuragarri dagoen jakiteko."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ERRORE KONPONEZINA: Huts kronometroa sortzean"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMule urruneko kontrola "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Argazkia:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Sareak"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"'Plataforma-orotarako' p2p bezeroa eMulen oinarritua \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Bilaketak"
+
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Deskargak"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Webgunea: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Partekatutako fitxategiak"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Foroa: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Bezeroak"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Webgunea: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Mezuak"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Foroa: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Estatistikak"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2019 aMule taldea \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Hobespenak"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "aMuleren zati bat \n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr ""
 
-#: src/amuleDlg.cpp:552
-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
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "ZerbitzariMezua: %s"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Ez dago erabilgarri"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Mezua"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Azken bertsioa beti https://github.com/amule-org/amule/releases/latest webgunean aurki daiteke"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "aMule elkarrizketa suntsitua"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Konektatzen"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Deskonektatua"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Suebakirik"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Konektaturik"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Konektatzen"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Itzalia"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Utzi"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Geratu uneko konexio saiakerak"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Bertsioa"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Deskonektatu"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Deskonektatu konektatutako sareetatik"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Konektatu"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Helbidea"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Konektatu gaituriko sareetara"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Azalpena"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "aMule erregistroa"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Gora: %.1f(%.1f) | Behera: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Gora: %.1f | Behera: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Konektaturik)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Ez konektaturik)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Benetan %s utzi egin nahi duzu?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Irteera berrespena"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Abiarazi komandoa: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- lehenetsia -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Ez dago '%s' itxura direktorioa"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "ABISUA: Ezin da '%s' azal fitxategia irakurri"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Sareak"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Sare leihoa"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Bilaketak"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Bilaketa leihoa"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Deskargak"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Deskargak leihoa"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Partekatutako fitxategiak"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Partekatutako fitxategi leihoa"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Mezuak"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Sare leihoa"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Mezu leihoa"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Estatistikak"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Estatistika grafiko leihoa"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Hobespenak"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Hobespen ezarpen leihoa"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Inportatu"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Zati fitxategi inportazio tresna"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Honi buruz"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Honi buruz/Laguntza"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "eD2k sarea"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kad sarea"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Sarerik ez"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "aMule urruneko kontrola"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Errore konponezina: Akats ordutegi nagusia sortzerakoan"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Urruneko amulera konektatu"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Konexioa galdu egin da"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Galdetu irteterakoan"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Errore konponezina: Akats ilara ordutegia sortzerakoan"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Gertaera begizta batera joaten..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Konektatzen..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Urruneko interfaze KK gertaera kudeatzailea"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, 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/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Itzaltzen"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Konexioa itxita - aMule itxi egin da ziurrenik."
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "%s (%s:%i) -ra konexio saiakera denboraz kanpo geratu da."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Ezgaitua"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Sarera konektatu."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Konexioak huts egin du. Ezin da %s-ra konektatu:%d\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Prest"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Guztiak"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Ez dago erabilgarri"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Fitxategia ez da aurkitu."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Lotura baliogabea edo zerrendan dagoeneko."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Aldiroko deskarga fitxategientzat karpeta"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 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/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Huts '%s' erabiltzailearen partekatutako fitxategiak jasotzerakoan"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Laguna bilatzen id-baxu konexiorako"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Gezurrezko eMule bertsioa %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Gezurrezko eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Gezurrezko eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (eMule v0.%u-tan oinarriturik)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Ezizena: %s ID-a: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Eskaerak: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Fitxategi estatistikak saio honentzat. Onarturik %d - eskakizun %d-etik, %s transferiturik\n"
 msgstr1 "Fitxategi estatistikak saio honentzat. Onarturik %d - %d eskakizunetik, %s transferiturik\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Fitxategi estatistikak saio guztientzat: Onarturik %d eskakizun %d-etik, %s transferiturik\n"
 msgstr1 "Fitxategi estatistikak saio guztientzat: Onarturik %d %d eskakizunetik, %s transferiturik\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Fitxategi ezezaguna eskaturik"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "'%s'-ren mezu bat iragazi da (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "'%s'-ren mezu berria (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, 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/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Huts '%s' erabiltzailearen partekatutako fitxategiak jasotzerakoan"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "Oharra: %s ezin da ireki."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "Abisua: Utzitako fitxategi zerrenda hondaturik dago, buru baliogabeak ditu."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "SI errorea %s fitxategia irakurtzean: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Errorea %s fitxategia gordetzerakoan: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Idatzi kaptxa"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategoria"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Kategoria berria"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Aukeratu karpeta bat deskargatutako fitxategientzat"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Kategoria izen bat ezarri behar duzu!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Kategoriarentzat bide bat ezarri behar duzu!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Berriketa saioa abiarazirik: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Bezerora konektaturik ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Bezerora konektatzen ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Huts bezerora konektatzerakoan / Konexio galdua ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr "*** Kaptxa egiaztapena pasa duzu eta erabiltzaileak zure mezua jaso du. ***"
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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 "*** Kaptxa egiaztapena huts egin du eta zure mezua baztertua izan da. Mezu berri bat bidaliaz kaptxa berri bat eskatu dezakezu. ***"
 
-#: src/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Elkarrizketa"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Itxi fitxa"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Itxi fitxa guztiak"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Itxi beste fitxak"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Gehitu lagun zerrendara"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Erakutsi &xehetasunak"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Lagunetatik kendu"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Ezarri lagunen ataka"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Ikusi fitxategiak"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Mezua bidali"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Bidali mezua erabiltzaileari"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Bidali behar de mezua:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Ez duzu lagun-ataka bat baino gehiago ezartzeko baimenik.\n"
+" Ataka bat bakarrik dago sinaturik."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Aukera anitza"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Lagunetatik kendu"
+msgstr1 "Lagunetatik kendu"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Partekatutako fitxategi zerrenda birkargatu."
+msgstr1 "Partekatutako fitxategi zerrenda birkargatu."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Kreditu fitxategia kargaturik, bezero %u ezagutzen da"
 msgstr1 "Kreditu fitxategia kargaturik, %u bezero ezagutzen dira"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - bezero %u-ren kredituak amaitu dira!"
 msgstr1 " - %u bezeroren kredituak amaitu dira!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Ez da 'cryptkey.dat' fitxategia aurkitu, sortzen."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Bezero xehetasunak"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "IDBaxua"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "IDAltua"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Gaitua"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Onartua"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Ez da onartzen"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Ezgaitua"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Konektaturik"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Deskonektatuta"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Izena"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP helbidea"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Jatorria"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Azkenez jasoa"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Bertsioa"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Igoera abiadura"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Deskarga abiadura"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Igoa"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Deskargak guztira: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "DE/IG aldagaia"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Sinadura linean"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Ez osorik"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Tipo gaiztoa"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Egiaztaturik: Ondo"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "E/G"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Ez dago erabilgarri"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Fitxategiak"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Igoa"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Deskargatua"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Deskargatzen"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Igotzen"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Martxan"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Ezezaguna"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "%s (%u) erabiltzaileak zure partekatutako fitxategi zerrenda eskatu du -> Onartua"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "%s (%u) erabiltzaileak zure partekatutako fitxategi zerrenda eskatu du -> Ukatua"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "%s (%u) erabiltzaileak zure partekatutako direktorioen zerrenda eskatu du -> Onarturik"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "%s (%u) erabiltzaileak zure partekatutako direktorioen zerrenda eskatu du -> Ukaturik"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, 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 -> Onartua"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "%s (%u) erabiltzailearen '%s' partekatutako direktorioa"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "%s (%u) erabiltzailea eskatu gabeko partekatutako direktorioak bidali ditu."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "%s (%u) erabiltzaileak '%s' direktorioko partekatutako fitxategi zerrenda bidali du"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "%s (%u) erabiltzaileak partekatutako fitxategi zerrenda bidaltzeaz bukatu du"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "%s (%u) erabiltzaileak eskatu gabeko partekatutako fitxategi zerrenda bidali du"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "%s (%u) erabiltzaileak fitxategi/direktorio partekatuen zerrenda ikustea ukatu du"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Fitxategi Iruzkinak"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Erabiltzaile izena"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Fitxategi izena"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Kalifikazioa"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Iruzkina"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Ezin da Kad bilaketarik egin Kad ez badago abiarazirik"
+
+#: src/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "Laguna bilatzen id-baxu konexiorako"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Ez dago iruzkinik"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "Iruzkin %u"
 msgstr1 "%u iruzkin"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr "Baztertutako %s bezeroa %s datu hondatu bidaltzeagatik '%s' fitxategiaren osotasunaren %s"
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Huts '%s'-ren estatu datuak kargatzean."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Bax"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto Nor"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "AutoAlt"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Oso txikia"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Baxua"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normala"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Altua"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Oso Altua"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Bertsioa"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Eskatzen"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Konektatu zerbitzaria bidez"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Ilara Osoa"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Ilaran"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Deskargatzen"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Aztertze ezarpenak jasotzen"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Ez du behar den zatirik"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Ezin da IDBaxua-IDBaxua konektatu"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Konexio gehiegi"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Kad bidez Konektatzen"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Kad konexio gehiegi"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Ukatuak"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Konexioa errorea"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Urruneko ilara betea"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "MLDonkey zaharra"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "MLDonkey berria"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule bateragarria"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Zerbitzari lokala"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Urruneko zerbitzaria"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Jatorri trukaketa"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Pasibo"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Esteka"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Jatorri haziak"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Bilaketa emaitza"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Amaitua"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Martxan"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "ERROREA: Disko-leku gabe"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "ERROREA: Partmet ez da aurkitu"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ERROREA: SI errorea!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ERROREA: Huts egin du!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Ilaran"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Dagoeneko deskargatzen"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Aldiroko fitxategia formatu ezezagun edo okerrekoa."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Zatia"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Tamaina"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Transferituta"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Abiadura"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Egoera"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Jatorriak"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Egoera"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Denbora faltan"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Azkenez osoa ikusirik"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Azkenez jasoa"
 
-#: 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/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Ziur zaude aukeratutako fitxategia ezabatu nahi duzula?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Erantzuna hemendik: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Auto"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Utzi"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Gelditu"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Berrekin"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "G&arbitu bukaturikoak"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Jaitsi fitxategi honen A4AF guztiak orain"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Jaitsi fitxategi honen A4AF guztiak (Auto)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Jaitsi fitxategi guztien A4AF guztiak orain"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Hedatutako aukerak"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Aurrebista"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Erakutsi &xehetasunak"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Erakutsi iruzkin guztiak"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Kopiatu URI magnetikoa arbelera"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Kopiatu eD2k &lotura arbelera"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Kopiatu berrelikadura arbelera"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Eskuratu %s fitxategi honentzat"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "ezarri gabea"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Ezarri kategoria bat"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Ireki fitxategia"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Ziur zaude aukeratutako fitxategia ezabatu nahi duzula?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Ziur zaude aukeratutako fitxategia ezabatu nahi duzula?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Erantzuna hemendik: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Sar izen berri bat fitxategi honentzat:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Fitxategia berrizendatu"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Deskargak (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Ohar hau aurreikuspen bakoitzean agertzea saihesteko,\n"
-"ezarri zure bideo erreproduzigailu gogokoena hobespen leihoan (lehenetsia %s da)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Fitxategi aurreikuspena"
+msgid "Downloads (%i)"
+msgstr "Deskargak (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ERROREA: Huts kanpo bideo erreproduzigailua abiaraztean! Komandoa: `%s'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "DE guztira: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "%u zati fitxategia gordetzen %u-tik"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "ZatiFitxategi guztiak gorde dira."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "%sd-tik aldiroko fitxategiak kargatzen."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "%u zati fitxategia kargatzen %u-tik"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "ERROREA: Huts babeskopia fitxategia kargatzerakoan. Bilatu https://github.com/amule-org/amule/discussions -en .part.met fitxategi berreskuratze konponbideak."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "ZatiFitxategi guztiak kargatu dira."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Ez da zati fitxategirik aurkitu"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "zati fitxategi %u aurkitu da"
 msgstr1 "%u zati fitxategi aurkitu dira"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Aldiroko direktorioaren fitxategi sistemak ez ditu fitxategi luzeak onartzen."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Sarrera direktorioaren fitxategi sistemak ez ditu fitxategi luzeak onartzen."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "%s Deskargatzen"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Dagoeneko '%s' fitxategia deskargatzen ari zara"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Dagoeneko baduzu '%s' fitxategia"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Dagoeneko baduzu '%s' fitxategia"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Dagoeneko %s fitxategia deskargatzen ari zara"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Ezin da lotura magnetikoa eD2k bihurtu: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Lotura protokolo ezezaguna: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Okerreko eD2k lotura! ERROREA: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Bezeroak pakete bat bidali du egiaztapenak huts egin ondoren."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Kanpo konexioa ukaturik."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Pasahitz zuria dela eta kanpo konexioak ezgaiturik!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Kanpo konexioak ezgaiturik konfigurazio fitxategian"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Kanpo konexio berri bat onartu da"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERROREA: ezin da kanpo konexio berria onartu"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Hobespenetan pasahitza zurian dela eta kanpo konexioak ukaturik!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Bezerora konektatzen: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Bertsio ezezaguna"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "Okerreko bertsio ID-a, bitar bateratze ezintasuna dago. Erabili urruneko eta nagusi bertsio berdina."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "Ezin zara argitaratutako bertsio batetara konektatu edozein garapen bertsiotik! *ikusi* apurketa aukera saihestua"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Protokolo bertsio baliogabea."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Protokolo bertsio marka falta da."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Zerbitzariarekiko konexio automatikoa berriz saiatuko da segundo %d-etan"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Autentifikazio errorea: okerreko egiaztapena ezarri da EC pasahitz gisa."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Egiaztapenak huts egin du: okerreko pasahitza."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Egiaztapenak huts egin du: pasahitza falta da."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Eskakizun baliogabea, mesedez identifikatu aurretik."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Sarrera onartua."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "\"%s\" errore mezua bezerora bidalia."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Baimendu gabeko sarrera saiakera %s-tik. Konexioa itxia."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Ez da %s fitxategi egiaztapena aurkitu"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! OpCode prozesu errorea!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Zerbitzaria ez da gehitu"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "ez da zerbitzaria aurkitu: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "ezabatzeko zerbitzaria ezarri behar da"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k ezgaiturik dago hobespenetan."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Fitxategia ez da aurkitu."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Fitxategia ez da aurkitu."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Bilaketa bidean. Emaitzak emango une batean!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Urruneko interfazeko Web bilaketak ez du zentzurik."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Bilaketa bidean. Emaitzak emango une batean!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Ez dago punturik grafikoarentzat."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Zure bezeroa ez dago xehetasun maila honetarako konfiguraturik."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Kanpo konexioa: itzaltzea eskatuta"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Dagoeneko irteten."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "KanpoKonexioa: '%s' lotura gehitzen."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Lotura baliogabea edo zerrendan dagoeneko."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Fitxategia ez da aurkitu."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Fitxategi izen baliogabea."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Ezinda fitxategia berrizendatu."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Itxi elkarrizketa saio hau."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Elkarrizketa saio berria hasia"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Itxi elkarrizketa saio hau."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad ezgaiturik dago hobespenetan."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Izen ezezaguna)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad ezgaiturik dago hobespenetan."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Dagoeneko eD2k-ra konektaturik."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "ed2k-era konektatzen..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Dagoeneko Kad-era konektaturik."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Kad-era konektatzen..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Sare guztiak ezgaiturik daude."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "eD2k-tik deskonektatua."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Kad-etik deskonektaturik."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Kanpo Konexioa: okerreko opcode-a jasoa: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Opcode baliogabea (okerreko protokolo bertsioa?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "'%s' luzapen ezezaguna '%s' komandoarentzat.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "'%s' komando ezezaguna.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1871,7 +2396,7 @@
 "\n"
 "Komando honek ezin du argumenturik eduki.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1879,7 +2404,7 @@
 "\n"
 "Komando honek argumentu bat eduki behar du.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1887,7 +2412,7 @@
 "\n"
 "Komando hau osotu gabe dago, beheko luzapen hauetako bat erabili dezakezu.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1895,11 +2420,11 @@
 "\n"
 "Gehigarri erabilgarriak:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Komando erabilgarriak:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1910,17 +2435,17 @@
 "Komando guztietan berdin da maiuskula/minuskula.\n"
 "Idatzi '%s <komandoa>' <komandoa>-ri buruzko xehetasunak ikusteko.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Aplikaziotik ateratzen da."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Laguntza bistarazi."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1928,7 +2453,7 @@
 "Komando bati buruz laguntza jasotzeko, idatz ezazu 'help <komandoa>'.\n"
 "Komandoen zerrenda osoa eskuratzeko, 'help' idatzi.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1939,46 +2464,46 @@
 "Erabili '%s' komando zerrendarentzako\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Sintaxi errorea!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Komando honek ez luke parametrorik eduki beharko."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Komando honek parametro bat eduki beharko luke."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Argumentu baliogabea."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Hau komando osatugabe bat da."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Sakatu '%s' laguntza gehiagorako.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Hau %s %s %s da\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Hau %s %s da\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1986,7 +2511,7 @@
 "\n"
 "Bezeroa sortzen...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1995,7 +2520,7 @@
 "\n"
 "Ados, %s uzten...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2009,118 +2534,361 @@
 "\n"
 "Irteten...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Laguntza testu hau bistarazi."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "aMule abiarazirik duen ostalaria. (lehenetsia: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Kanpo konexioetarako aMuleren ataka. (Lehenetsia 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Kanpo konexio pasahitza."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Konfigurazio fitxategitik irakurri."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Ez ezer bistarazi irteera estandarrean."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Luze - arazten mezuak ere bistarazi."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Programa lokala (hizkuntza) ezarri."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Idatzi komando lerroko aukerak konfigurazio fitxategira."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "aMuleren konfigurazio fitxategian oinarriturik konfigurazio fitxategia sortzen du."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Programa bertsioa bistarazi."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Fitxategi xehetasunak"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% egina"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Fitxategi aurreikuspena"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "ERROREA: Huts kanpo bideo erreproduzigailua abiaraztean! Komandoa: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ERROREA: Huts '%s' zati fitxategia irekitzean"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Ongietorria!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Lagunera konektatzen"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Konexio egoera:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Sareak"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "TCP ataka estandarra "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Hedatutako UDP ataka (Kad / bilaketa orokorra) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Gaitu UPnP router ataka berbideraketarako"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Autoabioa"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Dagoeneko %s fitxategia deskargatzen ari zara"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Auto-eguneratu zerbitzari zerrenda abioan"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Deskargentzat helburu karpeta"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Arakatu"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Aldiroko deskarga fitxategientzat karpeta"
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Huts 'emfriends.met' lagun zerrenda fitxategia irakurketarako irekitzean!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Huts 'emfriends.met' lagun zerrenda fitxategia idazteko irekitzean!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "KRITIKOA - ez dago bezerorik StartChatSession-en"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Lagunak"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Erakutsi &xehetasunak"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Gehitu laguna"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Ezabatu laguna"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Bidali &mezua"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Ikusi fitxategiak"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Ezarri lagunen ataka"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Ziur zaude hautatako laguna ezabatu nahi duzula?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Ziur zaude hautatako lagunak ezabatu nahi dituzula?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2128,986 +2896,1306 @@
 "Ez duzu lagun-ataka bat baino gehiago ezartzeko baimenik.\n"
 " Ataka bat bakarrik dago sinaturik."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Aukera anitza"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Ez duzu lagun-ataka bat baino gehiago ezartzeko baimenik.\n"
-" Ataka bat bakarrik dago sinaturik."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Bidali mezua erabiltzaileari"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Bidali behar de mezua:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Lagunetatik kendu"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Mezua bidali"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Swap fitxategi honentzat"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "Ilaran: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Beste fitxategi batez galdeturik"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Igoera ataka baten zain"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "Ilaran: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Igotzen"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Batez"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Ez"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Bai"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Huts egin du irekitzerakoan: %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Deskargatzen..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "HTTP deskarga utzia"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "Deskargatzeko URLa ezin da hutsik egon"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Huts '%s' erabiltzailearen partekatutako fitxategiak jasotzerakoan"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Aldiroko deskarga fitxategientzat karpeta"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "%d byte deskargaturik"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "The URL %s returned: %i"
 msgstr "%s URL-aren erantzuna: %i - Errorea (%i)!"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "HTTP deskarga utzia"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Deskargatu GeoIP.dat berria %s-tik"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "GeoIP.dat deskargak huts egin du eguneraketa baztertzen."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Huts %s fitxategia ezabatzean, eguneraketa baztertzen."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Huts %s fitxategia berrizendatzean, eguneraketa baztertzen."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "%s behar bezala eguneratu da"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Error updating %s"
 msgstr "Huts GeoIP.dat deskargatzean"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Huts %s %s-tik deskargatzean"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Huts '%s'-ren estatu datuak kargatzean."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "'ipfilter.dat' eta 'ipfilter_static.dat' IP iragazkiak kargatzen."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "IP-eremu %u kargaturik'%s'-tik."
 msgstr1 "%u IP-eremu kargaturik'%s'-tik."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "Gaizki eratutako lerro %u alde batetara utzi da."
 msgstr1 "Gaizki eratutako %u lerro alde batetara utzi dira."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Huts %s fitxategi berria berrizendatzean, eguneraketa baztertzen."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP iragazkia presta dago"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Hemendik abiarazi:\n"
-"bezero ezagunak"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Unekoa"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Funtzionamendu bataz bestekoa"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "saio batez bestekoa"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Nodoak (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Abiarazteko ip baliogabea"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Abiarazteko ataka baliogabea"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Beharrezko eremu guztiak bete"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Mezua"
+
+#: src/KadDlg.cpp
 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:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Hau eginez zure nodo zerrenda ezabatu eta Kademlia konexioa berrabiaraziko da."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Jarraitu?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: bilaketa gako laburregia"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: Bilaketa gakoa dagoeneko bilaketa zerrendan dago: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Huts nodes.dat fitxategia irakurtzean - zaharregia. Bertsioa hau (0) ez da luzaroago onartzen."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Irakurri Kad kontaktu %u"
 msgstr1 "Irakurri %u Kad kontaktu"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Ez da kontakturik aurkitu, mesedez autoabiatu edo deskargatu nodes.dat fitxategi bat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Bakarrik Kad kontaktu %d dago eskuragarri, nodes.dat ez da idatziko"
 msgstr1 "Bakarrik %d Kad kontaktu daude eskuragarri, nodes.dat ez da idatziko"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Idatzi Kad kontaktu %d"
 msgstr1 "Idatzi %d Kad kontaktu"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Kad sarea"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Fitxategia"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Fitxategi tamaina"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Partekatze erlazioa"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Igoa"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Eskatutakoa"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Onartua"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Jatorri osoak"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "Abisua: Fitxategi ezagun zerrenda hondaturik dago, buru baliogabeak ditu."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Huts fitxategi ezagunen zerrendako sarrera bat kargatzean, hondaturik egon liteke"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Okerreko sarrera fitxategi ezagunen zerrendako fitxategian, hondaturik egon liteke: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Sistema lehenetsia"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albaniera"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabiera"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Bablea"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Euskara"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgariera"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalana"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Txinatarra (Sinplea)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Txinatarra (ohizkoa)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Kroaziera"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Txekiera"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Daniera"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Nederlandera"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Ingelesa (E.B.)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Ingelesa (E.B.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estoniera"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finlandiera"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Frantsesa"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galiziera"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Alemana"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grekoa"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebreera"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Hungariera"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italiera"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japoniera"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Koreera"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lituaniera"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvegiera (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Poloniera"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugesa"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugesa (Brasildarra)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Errumaniera"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Errusiera"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Esloveniera"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Gaztelera"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Suediera"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turkiera"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukraniera"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "%d errore ezezaguna"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Ezin da %d errorearen azalpena eskuratu"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Aztertzen"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Osotzen"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Amaitua"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Geraturik"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Akasdun"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Zain"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Pasahitz ez zuri bat ezarri behar duzu."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Pasahitz baliogabea, ez da MD5 egiaztapena!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Konexio errorea"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Kanpo konexioa ukaturik."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "EC konexioa huts egin du. Erantzun hutsa."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Kanpo konexioa: Okerreko erantzuna, esku-emateak huts egin du. Konexioa itxirik."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Kanpo konexioa: Okerreko erantzuna, esku-emateak huts egin du. Konexioa itxirik."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Lortua! Amulera konexioa sortua "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Lortua! Konexioa sortua."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Kanpo konexioa: Sarrera ukatze arrazoia: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Kanpo Konexioa: Esku-emateak huts egin du."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "HTTP deskarga haria hasia"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: Ondo."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "ERROREA: Ezin da TCP ataka entzun."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "ERROREA: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "OHARRA: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Itxi"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Ebaki"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Garbitu"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Hautatu dena"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Mugarik gabea"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "aMule erakutsi"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "aMule ezkutatu"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Konektaturik"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Konektaturik"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Kad-era Konektatuta (suebakirik)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "ZerbitzariIP: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "Zerbitzaria IP-a:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "konektatu gabe"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP ataka: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP ataka: Ez dago prest"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "TCP ataka: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP ataka: Ez dago prest"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Bezero argibidea"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Igoera muga"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Deskarga muga"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "aMule erakutsi"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Deskonektatu"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "aMule ezkutatu"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Konektatu"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Irten"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Mugarik gabea"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule tresna-barra Menua"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Abiadura mugak:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "IG: Batez"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "IG: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DE: Batez"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DE: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Deskarga abiadura: %.1f"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Igoera abiadura: %.1f"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Ezizena: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Goitizena ez hautatuta!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "BezeroID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Zerbitzari izena: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "ZerbitzariIP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Konektatu gabe"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Linean sinadura: Gaituta"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Linean sinadura: Ezgaitua"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Abiarazia: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Partekatutako fitxategiak: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Bezeroak ilaran: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "DE guztira: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "IG guztira: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k lotura: "
-
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Burutu"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Ed2k edo lotura magnetiko bat gehitu muinera."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Gehitu lagun zerrendara"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Hemen klikatu eD2k lotura deskarga ilararen testu kontrolean gehitzeko."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Gertaerak hemen agertuko dira. Gertaera zerrenda osorako, begiratu Zerbitzari fitxako erregistroan."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Kargatzen ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Konektatuta zauden zerbitzariaren erabiltzaile kopurua ..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Erabiltzaile: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Uneko zerbitzarira konektaturiko erabiltzaileak eta guztirako erabiltzaile kalkulua."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Gora: 0.0 | Behera: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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 zenbakiak bezero goiburu datuak dira."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Konexio egoera eta uneko transferentziak bistaratzen ditu. Gezi gorriak deskonektaturik zaudela adierazten du, horiak berriz ID baxua (suebakia) duzula eta berdeak ID altua (konexio mota hoberena)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Ez konektaturik ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Une honetan konektaturiko zerbitzaria."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Bilatu"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Izena:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Mota"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Lokala"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Orokorra"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Hedatutako parametroak"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Iragazten"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Fitxategi mota"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Edozein"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Konprimituak"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audioa"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CD-irudiak"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Irudiak"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programak"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Testuak"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Bideoak"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Hedapena"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Gutx. tamaina"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Byte"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Gehi. tamaina"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Eskuragarritasuna"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Iragazkia:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Iragazi emaitzak"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Iragazkia"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Emaitza alderantzikatu"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Fitxategi ezagunak ezkutatu"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Eremuak garbitu"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Hasi"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Gehiago"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Hedapena"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Gelditu"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Deskargatu"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Kategori honetan deskargatu"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Bilaketa emaitza"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Eremuak garbitu"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Emaitzak"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Garbitu amaituriko deskargak"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Iragazkia:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Fitxategiaren iturburua:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Orokorra"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Izen osoa :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "E/G"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Izen osoa"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met-fitxategia"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Aztertze zenbakia"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met-fitxategia :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Aztertze zenbakia :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Fitxategi tamaina :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Fitxategi zati egoera :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Azkenez osorik ikusia :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Fitxategi tamaina"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Transferentzia"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Aurkitutako jatorriak :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Jatorriak transferitzen :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Fitxategi zati kopurua :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Erabilgarri :"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Data abiadura :"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Deskarga aktibo denbora: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Transferituta :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Amaitua tamaina :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Fitxategi zati egoera"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Azkenez osorik ikusia"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Aurkitutako jatorriak"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Jatorriak transferitzen"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Fitxategi zati kopurua"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Erabilgarri"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Data abiadura"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Deskarga aktibo denbora"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Amaitua tamaina"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Hondatze kudeaketa adimentsua"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Hondaketan galdutakoa :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Konpresioaz irabazitakoa :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "I.C.H. gordetako paketeak :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Hondaketan galdutakoa"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Konpresioaz irabazitakoa"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "I.C.H. gordetako paketeak"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Partekatuak: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Eskaerak"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Onartutako eskaerak"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Transferitutako datuak"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Partekatze erlazioa"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Jatorri osoak"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Partekatutako fitxategiak"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Igoerak: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Kad Argb"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Kalifikatu gabea"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Titulua"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Fitxategi izenak"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Konpondu"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Garbitu"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Ezarri"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ados"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Iruzkin/tasa fitxategia (testua erabiltzaile guztiek ikusgarria)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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."
@@ -3115,1131 +4203,1246 @@
 "Filma batentzat iraupena, istorioa, hizkuntza ...\n"
 "eta faltsua den esan dezakezu, aMule beste erabiltzaileei esan diezaiekezu."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Fitxategi kalitatea"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Kalifikatu gabea"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Baliogabe / Apurturik / Gezurra"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Pobrea"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Oso ona"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Ondo"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Hobezina"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Kad-etik deskonektatua"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Berritu"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Deskargatzen, itxoin mesedez ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Ezezaguna"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Behar den Informazioa"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP helbidea :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Ataka :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Ataka"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Bestelako informazioa"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Erabiltzaile-izena :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Erabiltzaile aztertze zenbakia :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Erabiltzaile aztertze zenbakia"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Gehitu"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Deskarga abiadura"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Unekoa"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Funtzionamendu bataz bestekoa"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "saio batez bestekoa"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Igoera abiadura"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Konexioak"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Deskarga aktiboak"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "konexio aktiboak (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Igoera aktiboak"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Estatistika zuhaitza"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Erabiltzaile izena:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Erabiltzaile-Egiaztapena:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Bezero softwarea:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Bezero bertsioa:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Bezero softwarea"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP helbidea:"
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Bezero bertsioa"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "Erabiltzaile ID-a:"
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "Erabiltzaile ID-a"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Zerbitzaria IP-a:"
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Zerbitzaria IP-a"
+
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Zerbitzari izena"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Zerbitzari izena:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Nahasmena:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Nahasmena"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Protokolo nahastea"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "bezerora transferentziak"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Uneko eskakizuna:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Bataz besteko igoera abiadura:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Bataz besteko deskarga abiadura:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Igoa (saioa):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Deskargatua (saioa):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Igoa (denera):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Deskargatua (denera):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Uneko eskakizuna"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Bataz besteko igoera abiadura"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Bataz besteko deskarga abiadura"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Igoa (saioa)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Deskargatua (saioa)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Igoa (denera)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Deskargatua (denera)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Puntuak"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "DE/IG aldagaia:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Identitate ziurra:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Ilara ranking-a:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Ilara puntuak:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Identitate ziurra"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Ilara ranking-a"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Ilara puntuak"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Ezizena"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - plataforma anitzetarako mandoa"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Hizkuntza: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Argibideak bistarazi aurreko denbora."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Honek kontroletan erabiliko den hizkuntza ezartzen du."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Arakatu bertsio berrien bila abiaraztean"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Hau gaitzean Amulek abiaraztean bertsio berririk dagoen arakatzea egingo du"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Hasi txikiturik"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Gaitzerakoan aMule txikituri abiaraziko da."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Galdetu irteterakoan"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "aMulek irten aurretik galdetzea egiten du."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Tresna-barra ikonoa gaitu"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Honek tresna-barra (edo lan-barra) ikonoa gaitu/ezgaitzen du."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Ezkutatu aplikazio leihoa itxi botoia sakatzean"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Txikitu ikono-barrara"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Hau gaitzeak aMule zeregin-barrara beharrean sistema tresna-barrara txikitzea eragingo du."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Ezarpen hauek gogoratu"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Gomendio atzerapena: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "segundo"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Nabigatzaile hautaketa"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Idatzi zure nabigatzaile izena hemen. Zurian utzi sisteman lehenetsitako nabigatzailea erabiltzeko."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Arakatu"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Ireki fitxa berrian aukera dagoenenean"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Bideo-erreproduzigailua"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Konexio mugak"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Igo"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Ataka ezarpena"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Atakak"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "TCP ataka estandarra "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "UDP ataka zerbitzari eskakizunetarako (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Hedatutako UDP ataka (Kad / bilaketa orokorra) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Gaitu UPnP router ataka berbideraketarako"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnP TCP ataka (aukerakoa):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Lotu helbide lokala IP batetara (zurian edozeinentzat):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Lotu helbide lokala IP batetara (zurian edozeinentzat):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Jatorri muga deskarga bakoitzerako:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Aldibereko konexioa muga:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Konektatu abiaraztekoan"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "birkonektatu konexioa galtzean"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Ezabatu hildako zerbitzaria geroago"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "saiakerak"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Auto-eguneratu zerbitzari zerrenda abioan"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Zerrenda"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Eguneratu zerbitzari zerrenda zerbitzari batetara konektatzean"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Eguneratu zerbitzari zerrenda bezero bat konektatzean"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Erabili lehentasun sistema"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Erabili IDbaxu egiaztapena konektatzerakoan"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Konexio ziurra"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Estatiko zerbitzarietara bakarrik auto-konektatu"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Ezarri eskuz gehitutako zerbitzariak lehentasun altuan"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Hondatze kudeaketa adimentsua (I.C.H)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Gaitu"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Gehitu fitxategiak deskargetara geldirik"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Gehitu fitxategiak deskarga zerrendara auto-lehentasunarekin"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Saiatu lehen eta azken zatiak hasieran deskargatzen"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Abiarazi lehen pausaturiko fitxategia fitxategi bat osatzean"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Kategoria berdinekoa"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "Orden alfabetikoan"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Aurresleitu disko lekua fitxategi berrientzat"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 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:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Gelditu deskargak disko-leku librea hona iristean "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Ezarri hemen nahi duzu disko toki txikiena."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "10 jatorri gorde fitxategi arraroentzat (< 20 jatorri)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Igoerak"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Gehitu partekatutako fitxategi berriak auto-lehentasunarekin"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Deskargentzat helburu karpeta"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Hondatze kudeaketa adimentsua (I.C.H)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Gaitu"
+
+#: src/muuli_wdr.cpp
+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 src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Partekatutako karpetak"
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Aldiroko deskarga fitxategientzat karpeta"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Partekatutako karpetak"
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Ezabatu"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Egin klik eskuineko botoiaz karpeta ikono batean barnekoak ere partekatzeko)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Partekatu ezkutatutako fitxategiak"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Urruneko zerbitzaria"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Zerbitzari lokala"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafikak"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Eguneratze atzerapena : 5 seg"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Bataz besteko grafiko denbora : 100 min"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Konexio graf eskala: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Deskarga grafiko eskala:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Igoera grafiko eskala:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Koloreak: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Atzeko planoa"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Sareta"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Uneko deskargak"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Martxan deskargak bataz bestean"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Saioaren bataz besteko deskargak"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Uneko igoerak"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Martxan igoerak bataz bestean"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Saioaren bataz besteko igoerak"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Konexio aktiboak"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Sistema-barra abiadura-barra ikonoa"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Uneko Kad-nodoak"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Kad-nodoak martxan"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Kad-nodo saioa"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Hautatu"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Zuhaitza"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Erakutsiko diren bezero kopurua (0=mugagabea)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! KONTUZ !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Gehienezko konexio berri / 5 seg"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "FTP igoera aldia minututan"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "FTP igoera aldia minututan"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Fitxategia buffer tamaina: 240000 byte"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Igoera ilara tamaina: 5000 bezero"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Zerbitzari konexio berritze aldia: Ezgaiturik"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Ezgaitu ordenagailu ordulariaren bigarren planoko modua"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Erabiltzeko azala: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Erakutsi \"eD2k lotura kudeatzaile azkarra\" leiho bakoitzean."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Erakutsi argibide hedatuak kategoria fitxetan"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Erakutsi aplikazio bertsioa izenburuan"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Erakutsi transferentziak izenburuan"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Aplikazio izenaren aurretik"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Aplikazio izenaren ondoren"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Erakutsi goiburu erabilpena"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Tresna-barra bertikal orientazioa"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Deskargatu ilara fitxategiak"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Erakutsi aurrerapen ehunekoa"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Erakutsi aurrerapen barra"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Laua"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Biribildu"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Auto-ordenatu fitxategiak (PUZ handia)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Urruneko konexio ezarpenak"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Onartu urruneko konexioak"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "Entzunean dagoen interfazearen IPa:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "Idatzi hemen a.b.c.d formatuan entzun behar den interfazearen baliozko ip helbidea. Eremu huts batek edo 0.0.0.0 ezartzeak edozein interfazetan entzutea eragingo du."
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "TCP ataka:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "UPnP berbideraketa gaitu EC atakan"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Pasahitza"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Web zerbitzari parametroak"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "TCP ataka:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Pasahitz egiaztatzen\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Pasahitz egiaztatzen\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Gonbidatu sarrera ezgaitu"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Gonbidatu pasahitza web zerbitzarirako"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Web zerbitzari parametroak"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Exekutatu web-zerbitzaria abioan"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Web txantiloia"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Baimen osorako pasahitza"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Gaitu baimen gutxiko erabiltzailea"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Baimen baxuko pasahitza"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Gaitu web zerbitzari atakaren UPnP ataka birbidalketa"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Web zerbitzari UPnP ataka (aukerakoa)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Orrialdea berritzeko denbora (segundotan)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Gaitu Gzip konpresioa"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Sistema lehenetsia"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Ados"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Hemen klik egin hobespenetan eginiko edozein aldaketa ezartzeko."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Berrezarri hobespenetan eginiko edozein aldaketa."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Titulua :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Iruzkina :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Deskarga direktorioa :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Aldatu lehentasuna fitxategi berrientzat :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Deskarga direktorioa"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Aldatu lehentasuna fitxategi berrientzat"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Ez aldatu"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Hautatu kolorea kategoria honentzat (unean aukeratutakoa) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Garbitu"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Hautatu kolorea kategoria honentzat (unean aukeratutakoa)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Botoi hau klikatu erregistroa garbitzeko."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Zerbitzari zerrenda"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "Idatzi server.met fitxategiaren URL bat hemen eta gero ezkerreko botoia sakatu zerbitzari ezagunen zerrenda eguneratzeko."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Gehitu zerbitzaria eskuz: Izena"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Idatzi zerbitzari berriaren izen hemen"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP ataka"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Idatzi zerbitzariaren ataka hemen."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Gehitu zerbitzari bat eskuz (sar datuak ezkerrean lehenik) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule erregistroa"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Zerbitzari argibideak"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Argb"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kad Argb"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nodoak (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 fitxategi baten URL-a idatzi eta ezkerreko botoia sakatu nodo ezagunen zerrenda eguneratzeko."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Nodo estatistikak"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Autoabioa"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nodo berria"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Ataka:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
 msgstr "Bezero ezagunetarik abiarazi"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Kad deskonektatu"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Idatzi x.x.x.x formatua erabiliaz zerbitzariaren ip helbidea."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Erabili erabiltzaile identifikazio segurua"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protokolo nahastea"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Gaitu protokolo nahastea"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Aukera honek protokolo nahastea gaitzen du eta aMule-k beste bezeroetako konexio nahastuak onartzea eragite du."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Erabili nahastea kanporako konexioetan"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Aukera honek Amulek beste bezero/zerbitzarietara konektatzerakoan protokolo nahastea erabiltzea eragiten du."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Onartu nahasitako konexioak bakarrik"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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 bakarrik onartzea eragiten du. Jatorri gutxiago izango dituzu baina zure trafiko guztia nahasia egongo da"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Edozeini"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Bat ere ez"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Nork ikusi ditzaken nire partekatutako fitxategiak:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP-Iragazkia"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Bezeroak iragazi"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Zerbitzariak iragazi"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Berritu zerrenda"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL-a:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Eguneratu orain"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Automatikoki eguneratu ip iragazkia abioan"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Iragazki maila:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Beti iragazi LAN IP-ak"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoia kudeaketa pareko ez diren IP helbideentzat"
 
-#: src/muuli_wdr.cpp:2438
-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 ip-a paketea jaso den ip-aren ezberdina bada. Kontu handiaz erabili."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Erabili sistemako ipfilter.dat eskuragarri badago"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Ez bada ipfilter.dat fitxategi lokalik aurkitu, orduan onartu sistema ipfilter fitxategia erabiltzea."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Gaitu sinadura linean"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Gaitu sistemak fitxategiak idaztea, kanpo programek sinadurak sortu ahal izateko egiten da."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Eguneratu maiztasuna (Seg):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Aldatu linean sinadura eguneraketa aldia (segundotan)."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Gorde sare sinadura fitxategia hemen: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Bistarazi estatu banderak bezeroentzat"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Data abiadura :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Jatorriak"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4247,11 +5450,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4261,827 +5464,747 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Deskargak: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Automatikoki eguneratu ip iragazkia abioan"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "sarrera mezu iragazkia (txat honetan ezik):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Mezu guztiak iragazi"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Lagun zerrendan ez daudenen mezuak iragazi"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Bezero ezezagunen mezuak iragazi"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Hau duten mezuak iragazi (erabili ',' bereizle bezala):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Ikusi jasotako mezuak erregistroan"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Iruzkinak"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Fitxategi iruzkinak hau du (',' erabili bereizle gisa):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Gaitu autentifikazioa"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "erabiltzaile/pasahitz autentifikazioa gaitu/ezgaitu"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Erabiltzaile izena: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Proxy-ra konektatzeko erabiliko den erabiltzaile izena"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Pasahitza:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Proxy-ra konektatzeko erabiliko den pasahitza"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Proxy-a gaitu"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Proxy onarpena gaitu/ezgaitu"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Proxy mota:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Proxy ostalaria:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Proxy mota"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Proxy ostalaria"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Proxy ostalari izena"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Proxy ataka:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Proxy ataka"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Proxy ataka"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Gaitu autentifikazioa"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "erabiltzaile/pasahitz autentifikazioa gaitu/ezgaitu"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Proxy-ra konektatzeko erabiliko den erabiltzaile izena"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Proxy-ra konektatzeko erabiliko den pasahitza"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Hona konektaturik:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Urruneko aMulen saioa hasi"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Erabiltzaile izena"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Ezarpen hauek gogoratu"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Kanpo konexioa ukaturik."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Erabili gzip konpresioa"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Gaitu arazten luzeko saio hasiera."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&Ireki fitxategia"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Mezu kategoriak:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Gehitu"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Berriz saiatu hautaturikoak"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Ezabatu hautaturikoak"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Gertaera motak"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Igoera aktiboak"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "fitxategi guztien ehunekoa"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Erakutsi bezeroak:"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Hautatutako fitxategiak"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Igoera aktiboak bakarrik"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Erakutsi bezeroak:"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Berritu:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Berritu zure partekatutako fitxategiak"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Bidali"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Zehaztutako mezua bidali."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Itxi elkarrizketa saio hau."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Konektatu edozein zerbitzari eta/edo Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Utzi"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Partekatutako fitxategiak"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Deskonektatu"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Konektatu"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Ezgaitua %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
 msgstr1 "byte"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "A"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/seg"
 msgstr1 "byte/seg"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "seg"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "min"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "ordu"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Egunak"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "egunak"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "denak"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "Beste denak"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Amaitugabea"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Gelditua"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Bideoa"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Fitxategia"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Testua"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Martxan"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Konfigurazio direktorioa: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Komando honek ez luke parametrorik eduki beharko."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Komando honek ez luke parametrorik eduki beharko."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Komando honek ez luke parametrorik eduki beharko."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Komando honek ez luke parametrorik eduki beharko."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Idatzi zerbitzariaren ataka hemen."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Idatzi zerbitzariaren ataka hemen."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Idatzi zerbitzariaren ataka hemen."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Zati-fitxategiak aria bihurtzearen zain ixteko..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "%s inportatzen: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Aldiroko karpeta irakurtzen"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Deskarga fitxategiaren argibide oinarrizkoak eskuratzen"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Helburu fitxategia sortzen"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Deskarga fitxategi zaharretik Kargatzen (%u %u-tik)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Deskarga fitxategi argibide jatorria eskuratzen"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Deskarga gehitu eta zati fitxategi berria gordetzen"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Zati fitxategiak inportatu"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Egoera"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "FitxategiEgiaztapena"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Diskoa: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Behar bezala deskargaturiko fitxategien jatorri fitxategiak ezabatze nahi al duzu?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Ezabatu jatorriak?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "ERROREA: Huts zati fitxategia sortzerakoan"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, 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:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "ERROREA: Huts part.met fitxategiak irekitzean: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "ERROREA: part.met fitxategi bertsio okerra: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Errorea: %s (%s) hondaturik dago (marka okerrak: %s), ezin da fitxategia kargatu."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "ERROREA: %s (%s) hondaturik dago (okerreko etiketa-kopurua), ezin da fitxategia kargatu."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Fitxategi informazioa berreskuratzen saiatzen..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Fitxategi informazio eskuragarri guztia berreskuraturik :D - Erabiltzen saiatzen..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Ezin da fitxategi informazioa berreskuratu:("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Huts egin du irekitzerakoan: %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "ABISUA: %s agian hondaturik dago (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "ERROREA zati fitxategia gordetzerakoan: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "SI errorea zati fitxategia gordetzerakoan: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "Errorea %s-ren part.met.seeds fitxategia gordetzerakoan"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "jatorri ale %i bildurik zati fitxategiarentzat: %s (%s)"
 msgstr1 "%i jatorri ale bildurik zati fitxategiarentzat: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "jatorri ale %i bildurik zati fitxategiarentzat: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Hondaturiko zatia (%d) aurkitu da %d zati %s zati fitxategian - FitxategiEgiaztapenEmaitza |%s| fitxategiEgiaztapena |%s|"
 msgstr1 "Hondaturiko zatia (%d) aurkitu da %d zatitan %s zati fitxategian - FitxategiEgiaztapenEmaitza |%s| fitxategiEgiaztapena |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Bukatutako (%i) zatia aurkiturik %s-n"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Amaitutako berrazterketa: %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Ustekabeko errorea %s osatzean. Fitxategia gelditurik"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Deskarga amaiturik: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Deskarga amaiturik: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "fitxategia ezabatzen:%s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, 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:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "ERROREA: Ezin da deskargaturiko zatia egiaztatu - egiaztapen-bilduma osatugabea (%s). Hau ez zen inoiz gertatu beharko"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "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/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "KONTUZ: Diskoa leku askieza! Fitxategia gelditzen: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Deskargaturiko %i zatia hondaturik dago fitxategi honetan: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Esleitzen"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Disko leku askieza"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Deskargatua"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ERROREA: Huts '%s' zati fitxategia irekitzean"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Sistema lehenetsia"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albaniera"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabiera"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Bablea"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Euskara"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgariera"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalana"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Txinatarra (Sinplea)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Txinatarra (ohizkoa)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Kroaziera"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Txekiera"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Daniera"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Nederlandera"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Ingelesa (E.B.)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "Ingelesa (E.B.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estoniera"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finlandiera"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Frantsesa"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galiziera"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Alemana"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grekoa"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebreera"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Hungariera"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italiera"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italiera (Suitzarra)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japoniera"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Koreera"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituaniera"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvegiera (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Poloniera"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugesa"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugesa (Brasildarra)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Errumaniera"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Errusiera"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Esloveniera"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Gaztelera"
+msgid "Extended source exchange"
+msgstr "Jatorri trukaketa"
 
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Suediera"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turkiera"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukraniera"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Aldatu hizkuntza"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Ez dago aMulerentzat itzulpen instalaturik"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Ez dago hizkuntza erabilgarririk"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "ez dago aukera erabilgarririk"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "Kategoria baliogabe aurkitua, baztertzen"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Kategoria baliogabe aurkitua, baztertzen"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Lehenetsiriko ataka erabiliko da (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Konexioa"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Direktorioak"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Zerbitzariak"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Fitxategiak"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Segurtasuna"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interfazea"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy-a"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Urruneko kontrolak"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Sinadura linean"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Gertaerak"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Araztena"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5091,15 +6214,15 @@
 "    %PARTFILE - fitxategiaren bide osoa\n"
 "    %PARTNAME - fitxategi-izena soilik"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5115,26 +6238,43 @@
 "Amulek ondo funtzionatu beharko luke ezarpen\n"
 "hauek aldatu gabe."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, 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:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Konektatzen ari zaren Proxy-aren mota"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Pasahitz egiaztatzen\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5142,32 +6282,46 @@
 "aMule berrabiarazi egin behar da aldaketa hauek gaitu ahal izateko:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP ataka aldaturik.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP - ataka aldaturik.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "- Kanpo konexio interfazea aldatua.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Kanpo konexio ataka aldatua.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Lanpo konexio onarpena aldatua.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Kanpo konexio interfazea aldatua.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Protokolo nahastea"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Hizkuntza aldaturik.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5175,27 +6329,33 @@
 "Auto-eguneraketa zerbitzari zerrenda hutsa dago.\n"
 "'Auto-eguneratu zerbitzari zerrenda abioan' ezgaitu egingo da."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
-"Kanpo konexioak gaiturik dituzu baina ez duzu pasahitzik ezarri.\n"
-"Kanpo konexiorik ezin da onartu baliozko pasahitza ezarri arte."
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Hizkuntza aldaturik.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Aldiroko karpeta aldaturik.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- ED2K sarea gaiturik.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Protokolo bertsio baliogabea."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5203,7 +6363,7 @@
 "Bai eD2k eta bai Kad sareak ezgaiturik daude.\n"
 "Ezingo zara konektatu behintzat bietako bat gaitu arte."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5211,7 +6371,7 @@
 "Kad ezin da abiarazi zure UDP ataka ezgaiturik badago.\n"
 "UDP ataka gaitu edo Kad ezgaitu."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5221,20 +6381,69 @@
 "aMule orain berrabiarazi BEHAR duzu.\n"
 "Orain ez berrabiaraziaz gero ez kexatu ezer txarra gertatzen bada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Auto berritzea abiarazirik"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Aldiroko deskarga fitxategientzat karpeta"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Pasahitza ezarria eta kanpo konexioak gaiturik."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5244,41 +6453,66 @@
 "Mesedez bete behintzat baliozko server.met fitxategi batetara zuzenduaz.\n"
 "Klikatu \"zerrenda\" botoia URL-a sartzeko."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Aldi baterako fitxategiak"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Sarrera fitxategiak"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Linean sinadurak"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Aukeratu karpeta bat %s-rentzat"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Ezagututako partekatutako fitxategi %i aurkiturik"
+msgstr1 "%i ezagututako partekatutako fitxategi aurkiturik"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Arakatu bideo erreproduzigailua"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Hautatu nabigatzailea"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Hautatu nabigatzailea"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Abiarazgarria%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Sistema lehenetsia"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Editatu zerbitzari zerrenda"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5286,1197 +6520,1463 @@
 "Gehitu hemen server.met deskargatzeko URL-a.\n"
 "URL helbide bat lerro bakoitzean."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Jatorri osoak"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Egoera:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Egoera:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Eguneratze maiztasuna: seg %d"
 msgstr1 "Eguneratze maiztasuna: %d seg"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Batez besteko grafiko denbora: minutu %d"
 msgstr1 "Batez besteko grafiko denbora: %d minutu"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Konexio grafiko eskala: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Fitxategi buffer tamaina: byte %d"
 msgstr1 "Fitxategi buffer tamaina: %d byte"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Igoera ilara tamaina: bezero %d"
 msgstr1 "Igoera ilara tamaina: %d bezero"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Zerbitzari konexio berritze maiztasuna: minutu %d"
 msgstr1 "Zerbitzari konexio berritze maiztasuna: %d minutu"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Zerbitzarira konexio berritze maiztasuna: Ezgaiturik"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "ezgaiturik"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Gertaeran'%s' komandoa exekutatu"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Gaitu komando exekuzioa muinean"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Muin komandoa:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Gaitu komando exekuzioa urruneko interfazean"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Urruneko interfaze komandoa:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Hurrengo aldagaiak aldatuko dira:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Partekatutako karpetak"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Berritu zure partekatutako fitxategiak"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Partekatutako karpetak"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Partekatutako fitxategi zerrenda birkargatu."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Partekatutako karpetak"
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Aukeratu karpeta bat %s-rentzat"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Ezarpen hauek gogoratu"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Bilaketa oharra"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Bilaketak"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Bilaketa aurrerapena: %u %% \n"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Bilaketa oharra"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Nagusia"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "Abisua: Fitxategi ezagun zerrenda hondaturik dago, buru baliogabeak ditu."
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Okerreko sarrera fitxategi ezagunen zerrendako fitxategian, hondaturik egon liteke: "
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr "Ezin da eD2k bilaketarik egin eD2k ez badago konektaturik"
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 #, fuzzy
 msgid "No keyword for Kad search - aborting"
 msgstr "Bilatzeko gakoa: %s"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Espero gabeko errorea Kad bilaketa egitean: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "FitxategiID"
-
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Kalifikatu gabea"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Kategori honetan deskargatu"
+#: src/SearchList.cpp
+#, fuzzy, c-format
+msgid "Error %u: %s\n"
+msgstr "Huts GeoIP.dat deskargatzean"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Eskuratu %s fitxategi honentzat"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "FitxategiID"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Itxi fitxa guztiak"
+
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Bilatu erlazionatutako fitxategiak (eD2k, zerbitzari lokala)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Markatu fitxategia ezaguna bezala"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Kopiatu ed2k lotura arbelera"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopiatu eD2k loturak arbelera"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Konektaturik zauden zerbitzaria ezabatu nahi duzu. Mesedez deskonektatu lehenik."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Utzia"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Berria"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Martxan"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finlandiera"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Bilaketa aurrerapena: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Bilaketa aurrerapena ez dago eskuragarri"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Huts zerrendaturiko nahasitako zerbitzarietara konektatzean. Nahaste gabeko beste saiakera bat egiten."
+
+#: src/ServerConnect.cpp
 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:79
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "Huts zerrendako zerbitzari guztietara konektatzen saiatzerakoan. Berriz hasiko nahiz."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "Huts zerrendako zerbitzari guztietara konektatzen saiatzerakoan. Berriz hasiko nahiz."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Zerbitzariarekiko konexio automatikoa berriz saiatuko da segundo %d-etan"
+msgstr1 "Zerbitzariarekiko konexio automatikoa berriz saiatuko da %d segundotan"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "eD2k sarea hobespenetan ezgaiturik, ez da konektatuko."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr "Ez da konektatzeko baliozko zerbitzaririk aurkitu zerbitzari zerrendan"
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "%s (%s:%i)-ra konektaturik"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Konexioa sorturik: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Errore konponezina konektatzen saiatzean. Internet konexioa eroria egon daiteke"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "%s (%s:%i)-ra konexioa galduta"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) hilik dagoela dirudi."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) beterik dagoela dirudi."
 
-#: 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"
-msgstr0 "Zerbitzariarekiko konexio automatikoa berriz saiatuko da segundo %d-etan"
-msgstr1 "Zerbitzariarekiko konexio automatikoa berriz saiatuko da %d segundotan"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Konexioa galdu egin da"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Huts %s (%s:%i) -ra konektatzerakoan."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "ERROREA: Socket baliogabea denbora-muga egiaztapenean"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "%s (%s:%i) -ra konexio saiakera denboraz kanpo geratu da."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Zaharkitutako DNS galdeketa erantzuna, baztertzen."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "server.met fitxategia kargatzen: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Server.met fitxategia ez da aurkitu!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Huts server.met fitxategia irekitzerakoan!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "zerbitzari %i aurkiturik server.met fitxategian"
 msgstr1 "%i zerbitzari aurkiturik server.met fitxategian"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "zerbitzari %d gehiturik"
 msgstr1 "%d zerbitzari gehiturik"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Errorea: 'server.met' fitxategia hondatua dago: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "SI errorea 'server.met' fitxategia irakurtzean: "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Konektaturik zauden zerbitzaria ezabatu nahi duzu. Mesedez deskonektatu lehenik."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Huts '%s' irekitzerakoan"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Huts server.met gordetzerakoan!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "SI errorea 'server.met' fitxategia irakurtzean: "
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "URL Baliogabea"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Amaituta zerbitzari zerrenda %s-tik deskargatzeaz"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 helbideri aurkitu 'addresses.dat' fitxategian. Mesedez itsatsi zerbitzari zerrenda erabilgarri bat fitxategi honetan zerbitzari-zerrenda eguneratu ahal izateko"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Hasi zerbitzari zerrenda %s-tik deskargatzen"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "OHARRA: URL baliogabea ezarri zerbitzari auto-eguneraketarako: %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Huts zerbitzari zerrenda %s-tik deskargatzerakoan"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Zerbitzari lokala IPIragazkiak iragazirik dago, beste zerbitzari batetara birkonektatzen!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Azalpena"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Erabi."
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Erabi."
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Estatikoa"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Bertsioa"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Fitxategiak"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Partekatutako fitxategiak"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Ezabatu naian zauden zerbitzarira konektaturik zaude. Mesedez deskonektatu zaitez aurretik. Zerbitzaria EZ da ezabatuko."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Izen ezezaguna)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "Ziur al zaude %s zerbitzari tinkoa ezabatu nahi duzula"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "min"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Zerbitzariak (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Zerbitzarira konektatu"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Zerbitzaria estatiko bezala markatu"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Zerbitzaria ez-estatiko bezala markatu"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Zerbitzariak estatiko bezala markatu"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Zerbitzariak ez-estatiko bezala markatu"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Ezabatu zerbitzaria"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Ezabatu zerbitzariak"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Kendu zerbitzari guztiak"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopiatu eD2k loturak arbelera"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Zerbitzarira birkonektatu"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Ziur zaude zerbitzari guztiak ezabatu nahi dituzula?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Ziur zaude aukeratutako zerbitzaria ezabatu nahi duzula?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Ziur zaude aukeratutako zerbitzariak ezabatu nahi dituzula?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ERROREA: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "ABISUA: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Bezero id berria: %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "ABISUA: ID baxua jaso duzu!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tArgibide gehiagorako begiratu https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Zerbitzari argibide ezezaguna jasoa! - laburregia"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Zerbitzari berri %d jasoa"
 msgstr1 "%d zerbitzari berri jasoak"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Zerbitzari zerrenda gordetzeaz amaitu da."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Zerbitzariak azken komandoa ukatu du"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Hondaturiko pakete bat jaso da zerbitzaritik: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Errore kudeaezina zerbitzariko paketea prozesatzekoan: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, 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:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "protokolo nahastea erabiltzen."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Konektatzen: %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "aMule erregistroa"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Zerbitzaria ez da gehitu: ez da IP edo ostalari izenik ezarri."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Zerbitzaria ez da gehitu: Baliogabeko zerbitzari-ataka ezarririk."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "eD2k egoera:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Konexio egoera:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Konektaturik"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kademlia egoera:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "LAN moduan abiarazirik"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Martxan"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Kademlia egoera:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Egoera:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Konexio egoera:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "UDP konexio egoera:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Suebaki egoera: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Ez da lagunik behar - TCP ataka irekia"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Ez da lagunik behar - UDP ataka irekia"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Laguna ez"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Lagunera konektatzen"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Lagunera %s-en konektaturik"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP helbidea:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Indexatutako jatorriak:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Indexaturiko gakoak:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Indexatutako oharrak:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Indexaturiko karga:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Bataz besteko erab:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Bataz besteko fitxategiak:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Geldirik"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "%s fitxategia partekatuei gehitzen"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Ezagututako partekatutako fitxategi %i aurkiturik"
 msgstr1 "%i ezagututako partekatutako fitxategi aurkiturik"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "%i ezagututako partekatutako eta ezezagun %i aurkiturik"
-msgstr1 "%i ezagututako partekatutako eta %i ezezagun aurkiturik"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "ERROREA: %s partekatzeko saiakera"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Partekatutako direktorioa ez da aurkitu, baztertzen: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Partekatutako direktorioa ez da aurkitu, baztertzen: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Ez da partekatu daitekeen fitxategirik direktorioan: %s"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Erabiltzaile izena"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Errorea %s fitxategia gordetzerakoan: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Deskarga abiadura"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "server.met fitxategia kargatzen: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Igoera abiadura"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Ez da partekatu daitekeen fitxategirik direktorioan: %s"
+msgstr1 "Ez da partekatu daitekeen fitxategirik direktorioan: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Ez da partekatu daitekeen fitxategirik direktorioan: %s"
+msgstr1 "Ez da partekatu daitekeen fitxategirik direktorioan: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Zati eskuragarriak"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Ezagututako partekatutako fitxategi %i aurkiturik"
+msgstr1 "%i ezagututako partekatutako fitxategi aurkiturik"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Erabiltzaile izena"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Igoera egoera"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Fitxategi lokalaren izena"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Partekatutako fitxategi zerrendak"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Eskaerak"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Onartutako eskaerak"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Transferitutako datuak"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Partekatze erlazioa"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Eskuratutako zatiak"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Jatorri osoak"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Eskuragarritasuna"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Karpeta bidea"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Partekatutako fitxategiak"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Iruzkina/Kalifikazioa gehitu"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Iruzkina/Kalifikazioa editatu"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Izena aldatu"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Gehitu fitxategiak bildumara zerrenda bidaltzeko"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Kopiat&URI magnetikoa arbelera"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Kopiatu eD2k lotura arbelera (&Jatorria)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Kopiatu eD2k lotura arbelera (Jatorria) (&zifratu aukerekin)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Kopiatu eD2k lotura arbelera (&ostalaria)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Kopiatu eD2k lotura arbelera (ostalaria) (&zifratu aukerekin)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Kopiatu eD2k lotura arbelera (&AICH argb)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Kopiatu eD2k lotura arbelera (&AICH argb)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "ID altua behar duzu baliozko jatorri lotura bat sortzeko"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Errorea osatzean"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Huts '%s' erabiltzailearen partekatutako fitxategiak jasotzerakoan"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Berritu zure partekatutako fitxategiak"
+msgstr1 "Berritu zure partekatutako fitxategiak"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Guztira partekatutako fitxategi tamaina: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Guztira partekatutako fitxategi tamaina: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Partekatutako fitxategiak (%i)"
+msgstr1 "Partekatutako fitxategiak (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Partekatutako fitxategiak (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "ZatiFitxategia"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Partekatutako fitxategi zerrenda birkargatu."
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Egoera"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Urruneko fitxategiaren izena"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Igotako datuak (saioa (guztira)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Guztira buruak (paketeak): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Fitxategi eskakizun buruak (paketeak): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Jatorri aldaketa buruak (paketeak): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Zerbitzari buruak (paketeak): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kad buruak (paketeak): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Zifratu goiburua (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Igoera aktiboak: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Igoerak zain: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Guztira behar bezala igotako saioak: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Guztira oker igotako saioak: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Batez besteko igoera denbora: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Deskargaturiko datuak (saioa (guztira)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Aurkituriko iturburuak: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Deskarga aktiboak (zatiak): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Saio IG/DE abiadura (guztira): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Bataz besteko deskarga tasa (saioa): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Bataz besteko igoera tasa (saioa): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Gehienezko deskarga tasa (saioa): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Gehienezko igoera tasa (saioa): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Berkonexioak: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Denbora lehen transferentziatik: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Zerbitzaria noiztik konektatua: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Konexio aktiboak (estimazioa): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Gehienezko konexio mugara iritsi: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Batez besteko konexioak (ebaluazioa): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Puntako konexioak (estimazioa): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Bezeroak"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Ezezaguna: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Iragazirik: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Ukatuak: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Guztira: %i Ezagunak: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Zerbitzariak martxan: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Huts egindako zerbitzariak: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Guztira: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Ezabatutako zerbitzariak: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Iragaziriko zerbitzariak: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Erabiltzaileak - zerbitzariak martxan: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Fitxategiak - zerbitzariak martxan: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Guztira erabiltzaileak: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Guztira fitxategiak: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Zerbitzari lan karga %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Partekatutako fitxategi kopurua: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Guztira partekatutako fitxategi tamaina: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Bataz besteko fitxategi tamaina: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Sistema eragilea"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Ez Jasoa"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Konexio aktiboak (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Ez dago erabilgarri"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Inoiz ere ez"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "<str> exekutatu eta irten."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Egiaztapenez prozesatzen: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Izenez prozesatzen: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Ez da baliozko zenbaki bat\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6485,7 +7985,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6494,83 +7994,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "Sakatu '%s' laguntza gehiagorako.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Deskarga tamaina: %i"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Eskakizunak errore ezezagun batez huts egin du."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Ekintza arrakastatsuki amaitu da."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Eskakizunak errore honekin huts egin du: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Bezero IP iragazketa %s dago.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "EZGAITURIK"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "GAITURIK"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Zerbitzari IP iragazketa %s dago.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Uneko IPiragazki maila %d da.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "%s %s %s-(e)ra konektaturik"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Ez konektatzen"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "suebakirik"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ondo"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6579,7 +8083,7 @@
 "\n"
 "Deskargatu:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6588,7 +8092,7 @@
 "\n"
 "Igo:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6597,7 +8101,7 @@
 "\n"
 "Bezero ilaran:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6606,38 +8110,33 @@
 "\n"
 "Jatorriak guztira:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "ZatiFitxategia"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Bilaketa emaitza kopurua: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Bilaketa aurrerapena: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Bilaketa aurrerapena ez dago eskuragarri"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Zerbitzaritik erantzun ezezagun bat jaso da, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Egoera informazio laburra bistarazi."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Konexio egoera bistarazi, uneko igo/deskarga abiadura, etab.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Estatistika zuhaitz osoa bistarazi."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6651,11 +8150,11 @@
 "\n"
 "Adibidea: 'statistics 5' erabiliaz bezero mota bakoitzeko 5 bertsio nagusiak ikusiriko dira.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Itzali aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6665,35 +8164,35 @@
 "Honek testu bezeroa ere itxiko du ez bait da muinik gabe funtzionatzeko\n"
 "gai.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Emandako objektua birkargatu."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Partekatutako fitxategi zerrenda birkargatu."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "IP iragazki taula birkargatu."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Uneko Ip iragazte taula birkargatu."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "IP iragazki taula URLtik eguneratu."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr "URLa ez bada ezartzen hobespenetakoa erabiliko da."
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Sarera konektatu."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6705,35 +8204,35 @@
 "horretara bakarrik konektatzeko. IP helbidea puntuaturiko IPv4 hamartar helbide\n"
 "bat izan behar da edo ebatzi daitekeen izen bat."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "eD2k sarera bakarrik konektatu."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "KAD sarera bakarrik konektatu."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Saretik deskonektatu."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "Honek konektaturik zauden sare guztietatik deskonektatuko zaitu.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "eD2k saretik bakarrik deskonektatu."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Kad saretik bakarrik deskonektatu."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Ed2k edo lotura magnetiko bat gehitu muinera."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6751,51 +8250,51 @@
 "\n"
 "Lotura magnetikoak ed2k egiaztapena eta fitxategi tamaina eduki behar ditu.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Hobespen balio bat ezarri."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "IP iragazki hobespenak ezarri."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "IP iragazketa gaitu bai bezero bai zerbitzarientzat."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "IP iragazketa ezgaitu bai bezero bai zerbitzarientzat."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "IP iragazketa gaitu/ezgaitu bezeroentzat."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "IP iragazketa gaitu bezeroentzat."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "IP iragazketa ezgaitu bezeroentzat."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "IP iragazketa gaitu/ezgaitu zerbitzarientzat."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "IP iragazketa gaitu zerbitzarientzat."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "IP iragazketa ezgaitu zerbitzarientzat."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Ip Iragazte maila hautatu."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6803,60 +8302,74 @@
 "Baliozko iragazte maila 0-255 tartekoak dira, eta lehenetsiriko balioa\n"
 "(hasierakoa) 127 da.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Konexio zabalera mugak ezarri."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Igoera konexio zabalera muga ezarri."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Komando hauentzat emandako balioa Kb/s-tan egon behar da.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Deskarga konexio zabalera muga ezarri."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "erabiltzaile/pasahitz autentifikazioa gaitu/ezgaitu"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Komando hauentzat emandako balioa Kb/s-tan egon behar da.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Hobespen balio bat eskuratu eta bistarazi."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "IP iragazki hobespenak eskuratu."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "IP iragazketa egoera eskuratu bai bezero bai zerbitzarientzat."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "IP iragazketa egoera eskuratu bezeroentzat."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "IP iragazketa egoera eskuratu zerbitzarientzat."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Ip iragazte maila hautatu."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Konexio zabalera mugak eskuratu."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Bilaketa bat egiten."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6875,39 +8388,44 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Bilaketa orokor bat egin."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Bilaketa lokal bat egin"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Kad bilaketa bat egin"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
 msgstr "Azken bilaketaren emaitzak bistaratzen ditu."
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Aurreko bilaketaren emaitzak bistaratzen ditu.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Ikusi bilaketaren aurrerapena."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Ikusi bilaketaren aurrerapena.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Fitxategia deskargatzen hasi"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6915,81 +8433,81 @@
 "Azkenengo bilaketako fitxategiaren zenbakia eman behar da.\n"
 "Adibidez: 'download 12' erabiliaz azken bilaketako 12. emaitzaren deskarga abiaraziko da.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Deskarga pausarazi."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Deskarga berrekin."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Deskarga utzi."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Deskarga lehentasuna ezarri."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Ezarri lehentasun txikia."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Ezarri lehentasun normala."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Ezarri lehentasun handia."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Ezarri lehentasun automatikoa."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Ilarak/zerrenda bistarazi."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Igoera ilara bistarazi."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Deskarga ilara bistarazi."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Erregistroa ikusi."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Zerbitzari zerrenda bistarazi."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Partekatutako fitxategi zerrenda birkargatu."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Erregistroa garbitu."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Zaharkitutako komandoa, '%s' erabili horren ordez."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -6998,255 +8516,278 @@
 "Hau zaharkituriko komando bat da eta etorkizunean ezabatu egin daiteke.\n"
 "Erabili '%s' horren ordez.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule testu bezeroa"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "fitxategia ezabatzen:%s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "fitxategia ezabatzen:%s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Fitxategiaren igoerak berriarazten: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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."
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Berrespena beharrezkoa"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "99 kategoria soilik onartzen dira."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Kategoria gehiegi!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Beste guztiak"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Hautatu ikuspen iruzkina"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Gehitu kategoria"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Editatu kategoria"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Ezabatu kategoria"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Egiaztapena eskaturik fitxategi ezezagunarentzat: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Hautatu zure partekatutako fitxategiak nork ikus ditzakeen."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Fitxategiaren igoerak berriarazten: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Fitxategiaren igoerak gelditzen: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Huts `%s' komandoa `%s' gertaeran exekutatzean."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Huts '%s' komandoa '%s' gertaeran exekutatzean."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Deskarga osatua"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Fitxategiaren bide osoa."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Fitxategiaren izena biderik gabe."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "Fitxategiaren eD2k egiaztapena."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Fitxategi tamaina byte-etan."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Batutako deskarga aktibitate denbora."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Elkarrizketa saio berria hasia"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Mezu bidaltzailea."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Ez dago lekurik"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Disko partizioa."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Errorea osatzean"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "%u zenbakidun fitxategia prozesatzen: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Fitxategia ez dago !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, aMuleren eD2k lotura sortzailea"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Ongietorria!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Sarrera parametroak"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Egiaztatzeko Fitxategia"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Gehitu aukerako URL gehiago fitxategi honentzat"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:144
-msgid "Remove"
-msgstr "Ezabatu"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Zati egiaztapenekin lotura bat sortu"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4 fitxategi egiaztapena"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "MD4 fitxategi egiaztapena"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k lotura"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Gorde"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Kopiatu arbelera"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Ireki"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Ireki fitxategi bat bere eD2k lotura konputatzeko"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Kopiatu konputaturiko eD2l lotura arbelera"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Gorde honela"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Gorde konputaturiko eD2k lotura fitxategi batean"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "ALinkCreator-ri buruz"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Ezin da arbela ireki"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Kopiatzeko ezer ez oraingoz !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Hautatu eD2k lotura konputazioaren fitxategia"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Ezin da ireki "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Mesedez idatzi fitxategi izen bat"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Gordetzeko ezer ez oraingoz !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7266,162 +8807,159 @@
 "\n"
 "GPL-pean banatua"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Aztertzen..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator zuretzat lanean dago"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "MD4 egiaztapena konputatzen..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "eD2k egiaztapena konputatzen..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Ezeztaturik !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "%.2f seg-etan egina"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "URL dagoeneko gehiturik duzu !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Mesedez idatzi zurian ez dagoen URL bat"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Ezin da %s ireki"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i egun %i ordu %i min %i s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uE %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, amule Estatistika"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Deskarga abiadura handiena wxCas abiarazirik dagoenetik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Guztizko gehienezko deskarga abiadura wxCas aurreko abiarazteetan"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Garbitu"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistema"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Auto berritzea gelditu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Gorde estatistikak irudiak"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Inprimatu estatistika irudia"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Hobespen ezarpenak"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "WxCas-ri buruz"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Auto berritzea abiarazi"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Auto berritzea geraturik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Auto berritzea abiarazirik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Gorde estatistika Irudia"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMule estatistikak"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7429,11 +8967,11 @@
 "Arazo bat dago inprimatzerakoan.\n"
 "Agian zure inprimagailua ez dago behar bezala ezarririk?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Inprimatzen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7451,402 +8989,562 @@
 "\n"
 "GPL lizentziapean banaturik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh Oh, aMule ez dago abiarazirik..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule abiarazirik dago"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule abiarazirik dago, baina deskonektaturik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule konektatzen ari da..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh Oh, aMule egoera ezezaguna da..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " noiz abiarazirik "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " gelditurik dago !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " ez dago konektaturik !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " konektatzen..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " zerbait arraroa egiten ari da, araka ezazu !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " hona konektaturik dago: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "deskonektaturik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " hona konektaturik "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " eta "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Deskargak guztira: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Igoerak: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Saio deskargak: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Deskargak: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Igoerak: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Partekatuak: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " fitxategia(k), bezero ilaran: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Denbora: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " - "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Sistema karga bataz-bestekoak (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Sistema noiztik abiarazirik: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "amulesig.dat fitxategia duen karpeta"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Berritze aldia segundotan"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Sortu estatistika irudi bat berritze bakoitzean"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Igo aldiro zure estatistika irudia FTP zerbitzarira"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP Url-a"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP bidea"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Sar hemen zure FTP zerbitzariaren helbidea"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Erabiltzaile"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTP igoera aldia minututan"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Egiaztatu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Zure sinadura fitxategia duen karpeta"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Estatistika irudiak sortuko diren karpeta"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "<str> txantiloia kargatzen du"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Web zerbitzariaren HTTP ataka"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Erabili UPnP ataka berbideraketa web zerbitzari atakan"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP ataka"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Erabili gzip konpresioa"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Sarrera osoko pasahitza web zerbitzarirako"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Gonbidatu pasahitza web zerbitzarirako"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Gaitu gonbidatu sarrera"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Gonbidatu sarrera ezgaitu"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 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:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMule konfigurazio fitxategi bidea. EZ ERABILI ZUZENEAN!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "PHP interpretea ezgaitu (zaharkiturik)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "PHP orrialdeak eskakizun bakoitzean birkonpilatu"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule web zerbitzaria"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "web bezero konexioa onartua\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "ERROREA: ezin da web bezero konexioa onartu\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Eskakizunak errore honez huts egin du: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Ez da index fitxategia aurkitu: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Saioa Iraungirik - saio hasiera eskatzen\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Saioa ondo, saioa hasirik\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Saioa ondo, saioa hasi gabe\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Ez dago saio irekirik - saio hasiera eskatuko da\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Saioa sorturik - saio hasiera eskatzen\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Eskakizuna prozesatzen jatorrizkoa: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Ez da pasahitzik ezarri, ez da saioa hastea onartzen."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Pasahitz egiaztatzen\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Pasahitz egiaztapen baliogabea\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Pasahitza ondo\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Pasahitza oker\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Saio amaiera eskakizuna\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Eskakizuna prozesatzen birbidalia: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Konexioak huts egin du "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Igoa"
+#~ msgid "Ratio"
+#~ msgstr "Kalifikazioa"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Ez da partekatu daitekeen fitxategirik direktorioan: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Aldatu hizkuntza"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Ez dago aMulerentzat itzulpen instalaturik"
+
+#~ msgid "No languages available"
+#~ msgstr "Ez dago hizkuntza erabilgarririk"
+
+#~ msgid "User name"
+#~ msgstr "Erabiltzaile izena"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Eskuratutako zatiak"
+
+#~ msgid "Available Parts"
+#~ msgstr "Zati eskuragarriak"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "%i ezagututako partekatutako eta ezezagun %i aurkiturik"
+#~ msgstr1 "%i ezagututako partekatutako eta %i ezezagun aurkiturik"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Fitxategia ez da aurkitu."
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Urruneko zerbitzaria"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Zerbitzari lokala"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Okerreko sarrera fitxategi ezagunen zerrendako fitxategian, hondaturik egon liteke: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "%u zati fitxategia gordetzen %u-tik"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Ohar hau aurreikuspen bakoitzean agertzea saihesteko,\n"
+#~ "ezarri zure bideo erreproduzigailu gogokoena hobespen leihoan (lehenetsia %s da)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Iragazi emaitzak"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Markatu fitxategia ezaguna bezala"
+
+#~ msgid "Percent of total files"
+#~ msgstr "fitxategi guztien ehunekoa"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Autoabioa"
+
+#~ msgid "New node"
+#~ msgstr "Nodo berria"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Gehiago"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Hemendik abiarazi:\n"
+#~ "bezero ezagunak"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Konektatu edozein zerbitzari eta/edo Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Kad deskonektatu"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Geratu uneko konexio saiakerak"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Deskonektatu konektatutako sareetatik"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Konektatu gaituriko sareetara"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Auto-ordenatu fitxategiak (PUZ handia)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "Amule-k zure deskarga zerrendako zutabeak automatikoki sailkatuko ditu"
+
+#~ 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 ip-a paketea jaso den ip-aren ezberdina bada. Kontu handiaz erabili."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Aurreko bilaketaren emaitzak bistaratzen ditu.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Ikusi bilaketaren aurrerapena.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Konexioa itxita - aMule itxi egin da ziurrenik."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Arakatu bertsio berrien bila abiaraztean"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k lotura: "
+
+#~ msgid "Commit"
+#~ msgstr "Burutu"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: bigarren planoan lanean - ikusten gaituk"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Webgunea: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Foroa: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Webgunea: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Foroa: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Igoa"

amule-3.0.1.tar.gz/po/fi.po -> amule-3.1.0.tar.gz/po/fi.po Changed

@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:08+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:36+0000\n"
 "Last-Translator: Tapio Rantala <tapio.rantala@iki.fi>\n"
 "Language-Team: aMule Team <https://github.com/amule-org/amule>\n"
 "Language: fi\n"
@@ -22,71 +22,159 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Näytä aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMule etähallinta "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Tilannevedos:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"'Kaikkien alustojen' p2p-asiakas perustuen eMuleen\n"
+"\n"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Tekijänoikeudet (c) 2003-2019 aMule-Tiimi\n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Osa aMulesta perustuu\n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademliaan: Vertaisreititys perustuen XOR-metriikkaan.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Tekijänoikeudet (c) 2002-2008 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Verkkosivu:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Foorumi:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Tarkista uuden version saatavuus käynnistettäessä"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Yhdistetään Kadiin..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Käytät vanhentunutta versiota aMulesta!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Ei saatavissa"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Lisää kaveri"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Sinun on annettava kelvollinen IP ja portti!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Tietoa"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Annettu käyttäjätarkiste ei ole kelvollinen!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "Add aMule to your application menu?"
 msgstr "Sovelluksen nimen perässä"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Yhdistäminen epäonnistui "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -95,82 +183,160 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "VIRHE"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "ED2KLinks-tiedoston avaus epäonnistui."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "aMulen dialogi tuhottu"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Indeksitiedostoa ei löydetty: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Jaettujen tiedostojen listaus käyttäjältä '%s' ei onnistunut"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "Jaettavia tiedostoja ei löytynyt kansiosta: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Ei voitu kääntää magnet-linkkiä eD2k-linkiksi: %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Virheellinen eD2k-linkki! VIRHE: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Pääohjelmaa suljetaan..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Lopetetaan amulewebin instanssi prosessinumerolla '%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Tuhotaan amulewebin instanssi prosessinumerolla '%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Epäonnistunut"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Lopetetaan amulewebin instanssi prosessinumerolla '%d' ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Tuhotaan amulewebin instanssi prosessinumerolla '%d' ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMulen poistuessa: Lopetetaan ydin."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "aMule sammutettu."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Muistin virheiden etsinnän tulokset aMulen sulkeutuessa:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Maa-asetuksesi vaihdettiin järjestelmän oletuksiksi asetusmuutoksen takia. Pahoittelen."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -178,56 +344,109 @@
 "\n"
 "Etäyhteyksien asetukset"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Salasana asetettu ja etäyhteydet sallittu."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "VAROITUS"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i palvelin tiedostossa server.met"
+msgid "Loading temp files"
+msgstr "Lataan väliaikaistiedostoja kohteesta %s."
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Lataan väliaikaistiedostoja kohteesta %s."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Uudelleenlataa jaetut tiedostot"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Uudelleenlataa jaetut tiedostot"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Käynnistä haku"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Verkot"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Verkot"
+msgid "eD2k server list (server.met)"
+msgstr "%i palvelin tiedostossa server.met"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web-palvelin käynnissä prosessinumerolla %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 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/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "VIRHE"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "web-palvelin käynnissä prosessinumerolla %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+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/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Ei voitu sitoa portteja annettuun osoitteeseen: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Portti %u ei ole saatavilla. Sinulle annetaan LowID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -242,48 +461,48 @@
 "\n"
 "Tarkista yhteytesi varmistaaksesi että portti on avoinna sekä ulos että sisään."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Online-Signeeraustiedoston luonti epäonnistui"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "aMulen Online-Signeeraustiedoston luonti epäonnistui"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Tämä on ensimmäinen kerta kun käynnistät aMulen version %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Tämä versio on testiversio jota päivitetään päivittäin,\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "https://amule-org.github.io tai IRC-kanavaltamme #aMule palvelimella irc.libera.chat (englanniksi).\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Voit vapaasti raportoida bugeista osoitteessa https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -291,1579 +510,1885 @@
 "Online-Signeeraukselle asettamasi kansio ei ole kelvollinen!\n"
 " Online-Signeeraus kytketään pois päältä kunnes korjaat asian asetuksista."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Palvelimen verkkonimi ilmoitettu"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Levytilan esivaraus tiedostolle '%s' epäonnistui: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "VIRHE: Lokitiedostoa ei voida avata"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "VAROITUS: Lokitiedosto on tyhjä. Jotain on pielessä."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Loki nollattiin"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Palvelimen viesti: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, 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/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Yhteyspisteiden listan lataus epäonnistui."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Ladatun versiotarkistustiedoston avaus epäonnistui"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Turmeltunut versiotarkistustiedosto"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Käytät vanhentunutta versiota aMulesta!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Uusin version löytyy aina osoitteesta https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "aMulesi on uusinta versiota."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Versiotarkistustiedoston lataus epäonnistui"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Käyttäjiä: %s | Tiedostoja: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Ei valittuja verkkoja"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "LowID:llä"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "HighID:llä"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Yhdistetty %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Yhdistän %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "eD2k-yhteys katkaistu"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Käynnistettiin Kad."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Pysäytettiin Kad."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Yhdistetty Kadiin (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Yhdistetty Kadiin (palomuurattu)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Yhteys Kadiin katkaistu"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kad-verkko estetty asetuksissa, ei yhdistetä."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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:145
+#: src/amuled.cpp
 #, fuzzy
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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 https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: käynnistettäessä - käynnistän ajastimen"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: haaroitun taustalle - nähdään"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Ei voitu luoda prosessinumerotiedostoa"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "VIRHE: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Tämä on aMule %s ja pohjautuu eMuleen."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Käynnissä %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Vieraile nettisivulla https://github.com/amule-org/amule/releases/latest tarkistaaksi uuden version saatavuuden."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "KRIITTINEN VIRHE: Ajastimen luominen epäonnistui"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMule etähallinta "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Tilannevedos:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Verkot"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"'Kaikkien alustojen' p2p-asiakas perustuen eMuleen\n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Haut"
+
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Lataukset"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Verkkosivu: https://amule-org.github.io\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Jaetut tiedostot"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Foorumi: https://github.com/amule-org/amule/discussions\n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Asiakkaat"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Verkkosivu: https://amule-org.github.io\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Viestit"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Foorumi: https://github.com/amule-org/amule/discussions\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Tilastot"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Tekijänoikeudet (c) 2003-2019 aMule-Tiimi\n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Asetukset"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Osa aMulesta perustuu\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr ""
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademliaan: Vertaisreititys perustuen XOR-metriikkaan.\n"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Palvelimen viesti: %s"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Tekijänoikeudet (c) 2002-2008 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Ei saatavissa"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Viesti"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Uusin version löytyy aina osoitteesta https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "aMulen dialogi tuhottu"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Yhdistetään"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Ei yhdistetty"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Palomuurattu"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Yhdistety"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Yhdistetään"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Pois päältä"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Peruuta"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Pysäytä nykyiset yhteysyritykset"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versio"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Katkaise yhteys"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Katkaise yhteys yhdistettyihin verkkoihin"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Yhdistä"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Osoite"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Yhdistä sallittuihin verkkoihin"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Kuvaus"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "aMule loki"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Ylös: %.1f(%.1f) | Alas: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " KB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Ylös: %.1f | Alas: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Yhdistetty)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Ei yhdistetty)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Haluatko varmasti sulkea %sn?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Lopettamisen varmistus"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Suorita komento: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- oletus -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Teemakansiota '%s' ei ole olemassa"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "VAROITUS: Ei voida avata teematiedostoa '%s' luettavaksi"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Verkot"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Verkkoikkuna"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Haut"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Hakujen ikkuna"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Lataukset"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Latausten ikkuna"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Jaetut tiedostot"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Jaettujen tiedostojen ikkuna"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Viestit"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Verkkoikkuna"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Viestien ikkuna"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Tilastot"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Tilastokuvaajien ikkuna"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Asetukset"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Asetuksien säätöikkuna"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Tuonti"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Osatiedostojen tuontityökalu"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Tietoja"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Tietoja/Ohje"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "eD2k-verkko"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kad-verkko"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Ei verkkoa"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "aMulen etähallinta"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Kriittinen virhe: Ytimen ajastimen luominen epäonnistui"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Yhdistä etä-aMuleen"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Yhteys katkesi"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Vahvista sulkeminen"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Kriittinen virhe: Kyselyajastimen luominen epäonnistui"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Siirrytään tapahtumasilmukkaan..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Graafisen etäkäyttöliittymän tapahtumakäsittelijä"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "Yhdistäminen epäonnistui. Ei saatu yhteyttä %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Suljen"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Yhteys suljettu - aMule on varmaankin lopetettu."
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Yhteysyritys kohteeseen %s (%s:%i) aikakatkaistiin."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Poissa käytöstä"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Yhdistä verkkoon."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Yhdistäminen epäonnistui. Ei saatu yhteyttä %s:%d\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Valmis"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Kaikki"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Ei saatavilla"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Tiedostoa ei löytynyt."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Virheellinen linkki tai se on jo listalla."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Kansio latauksen väliaikaisille tiedostoille"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 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/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Jaettujen tiedostojen listaus käyttäjältä '%s' ei onnistunut"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Etsitään kaveria lowid-yhteydelle"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Vale-eMule versio %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Vale-eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Vale-eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (pohjautuu eMule-versioon v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Nimimerkki: %s Tunnus: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Pyydetty: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Tiedostotilasto tästä sessiosta: Hyväksytty %d / %d pyynnöstä, %s siirretty\n"
 msgstr1 "Tiedostotilasto tästä sessiosta: Hyväksytty %d / %d pyynnöstä, %s siirretty\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Tiedostotilasto kaikista sessioista: Hyväksytty %d / %d pyynnöstä, %s siirretty\n"
 msgstr1 "Tiedostotilasto kaikista sessioista: Hyväksytty %d / %d pyynnöstä, %s siirretty\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Pyydetty tuntematonta tiedostoa"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Viesti suodatettu käyttäjältä '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Viesti käyttäjältä '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista olemattomassa kansiossa '%s' -> Jätettiin huomioimatta"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Jaettujen tiedostojen listaus käyttäjältä '%s' ei onnistunut"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "VAROITUS: Tiedostoa %s ei voida avata."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "VAROITUS: Peruutettujen latausten lista on turmeltunut, sisältää epäkelvon otsakkeen."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "IO-virhe luettaessa tiedostoa %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Virhe tallennettaessa tiedostoa %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Syötä kuvavarmennus"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Luokittelu"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Uusi luokka"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Valitse kansio saapuville tiedostoille"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Sinun on annettava nimi luokalle!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Sinun on annettava polku luokalle!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr "Saapuvien kansion luonti luokalle epäonnistui. Anna kelvollinen polku!"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Keskustelu aloitettu: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Yhdistetty asiakkaaseen ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Yhdistetään asiakkaaseen ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Asiakkaaseen yhdistäminen epäonnistui / Yhteys katkesi ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 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/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Sulje välilehti"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Lisää kavereihin"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Näytä tie&dot"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Poista ystävistä"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Vapauta kaveripaikka"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Näytä tiedostot"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Lähetä viesti"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Lähetä viesti käyttäjälle"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Lähetettävä viesti:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Et voi asettaa enempää kuin yhden kaveripaikan.\n"
+" Asetettiin yksi paikka."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Monivalinta"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Poista ystävistä"
+msgstr1 "Poista ystävistä"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Lataa uudelleen lista jaetuista tiedostoista."
+msgstr1 "Lataa uudelleen lista jaetuista tiedostoista."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Pisteytystiedosto avattu, %u tunnettu asiakas"
 msgstr1 "Pisteytystiedosto avattu, %u tunnettua asiakasta"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - Pisteet ovat vanhentuneet %u asiakkaalle!"
 msgstr1 " - Pisteet ovat vanhentuneet %u asiakkaalle!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Tiedostoa 'cryptkey.dat' ei löydetty, luodaan."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Asiakkaan tiedot"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Tuettu"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Ei tuettu"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Poissa käytöstä"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Yhteys katkaistu"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f KB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nimi"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP-osoite"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Alkuperä"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Viimeisin vastaanotto"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Versio"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Lähetysnopeus"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Latausnopeus"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Lähetetty"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Yhteensä Ladattu: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Lähetys/vastaanotto-määre"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Online-Signeeraus"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Ei vielä valmis"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Pahis"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Vahvistettu - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "Ei saatavilla"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Ei saatavilla"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Tiedostot"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Lähetetty"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Ladattu"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Lataa"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Lähettää"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Aktiivinen"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Tuntematon"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista -> Annettu"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista -> Estetty"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista kansioista -> Annettu"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista kansioista -> Estetty"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 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:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista kansiossa '%s' -> Estetty"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Käyttäjä %s (%u) jakaa kansion '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, 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:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, 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:944
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "Käyttäjä %s (%u) on estänyt jaettujen kansioiden/tiedostojen listaamisen."
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Tiedoston kommentit"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Tiedoston nimi"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Luokitus"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Kommentti"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "Etsitään kaveria lowid-yhteydelle"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Ei kommentteja"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u kommentti"
 msgstr1 "%u kommenttia"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 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:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Valtiotietojen lataus osoitteesta '%s' epäonnistui."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Ma"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Ko"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Erittäin matala"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Matala"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normaali"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Korkea"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Erittäin korkea"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Julkaisu"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Kysyy"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Yhdistetään serverin kautta"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Jono täynnä"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Jonossa"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Lataa"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Ladataan tarkistejoukkoa"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Ei tarvittavia osia"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Ei voi yhdistää LowID:llä LowID:hen"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Liian monta yhteyttä"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Yhdistetään Kadilla"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Liian monta Kad-yhteyttä"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Estetty"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Etäjono Täysi"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Vanha MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Uusi MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule-Yhteensopiva"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Paikallinen Palvelin"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Etäpalvelin"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Lähdevälitys"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passiivinen"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Linkki"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Lähteitä"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Haun tulos"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Valmiina"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Käynnissä"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "VIRHE: Levytila on loppu"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "VIRHE: Osatiedostoa ei löytynyt"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "VIRHE: IO-virhe!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "VIRHE: Epäonnistui!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Jonossa"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Lataus on jo käynnissä"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Tuntematon tai käyttökelvoton väliaikaistiedostomuoto."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Osa"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Koko"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Siirretty"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Nopeus"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Edistyminen"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Lähteet"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Tärkeys"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Tila"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Aikaa jäljellä"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Viimeksi nähty kokonaisena"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Viimeisin vastaanotto"
 
-#: 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/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Oletko varma että haluat poistaa valitut tiedostot?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Palaute tullut: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "Py&säytä"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Tauota"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Jatka"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Poista va&lmistuneet"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Vaihda jokainen A4AF tälle tiedostolle nyt"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Vaihda jokainen A4AF tälle tiedostolle nyt (Automaattinen)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Vaihda jokainen A4AF muille tiedostolle nyt"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Laajat asetukset"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Esikatsele"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Näytä tie&doston tiedot"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Näytä kaikki kommentit"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Kopioi magnet-URI leikepöydälle"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Kopioi eD2k-&linkki leikepöydälle"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Kopioi palaute leikepöydälle"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Hanki %s tälle tiedostolle"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "poista luokittelu"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Luokittele"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "Avaa tied&osto"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Oletko varma että haluat poistaa valitun tiedoston?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Oletko varma että haluat poistaa valitut tiedostot?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Palaute tullut: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Anna uusi nimi tälle tiedostolle:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Tiedoston uudelleennimeäminen"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f KB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Lataukset (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Estääksesi tämän varoituksen näyttämisen joka kerralla,\n"
-"aseta haluamasi videotoistin asetuksissa (oletuksena %s)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Tiedoston esikatselu"
+msgid "Downloads (%i)"
+msgstr "Lataukset (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "VIRHE: Ulkoista mediatoistinta ei voitu käynnistää! Komento: `%s'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Yht alas: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Tallennetaan osatiedostoa %u / %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Kaikki osatiedostot tallennettu."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Lataan väliaikaistiedostoja kohteesta %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Lataan osatiedostoa %u %u:sta"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "VIRHE: Varmuuskopiotiedostoa ei saatu avattua.  Katso sivuilta https://github.com/amule-org/amule/discussions ratkaisuja .part.met -palautukseen."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Kaikki osatiedostot avattu."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Osatiedostoja ei löytynyt"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Löydetty %u osatiedosto"
 msgstr1 "Löydetty %u osatiedostoa"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Väliaikaiskansion tiedostojärjestelmä ei osaa käsitellä suuria tiedostoja."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Saapuvien kansion tiedostojärjestelmä ei osaa käsitellä suuria tiedostoja."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Ladataan %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Olet jo lataamassa tiedostoa '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Sinulla on jo tiedosto '%s'"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Sinulla on jo tiedosto '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Lataat jo tiedostoa %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Ei voitu kääntää magnet-linkkiä eD2k-linkiksi: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Linkin protokolla tuntematon: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Virheellinen eD2k-linkki! VIRHE: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Asiakas lähetti paketin tunnistautumisen epäonnistumisen jälkeen."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Etäyhteys suljettu."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Etäyhteydet kielletty sillä salasana on tyhjä!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Etäyhteydet estetty asetustiedostossa"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Uusi etäyhteys hyväksytty"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "VIRHE: uutta etäyhteyttä ei voitu ottaa vastaan"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Etäyhteys torjuttu koska salasana on tyhjä asetuksissa!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Yhdistän asiakkaaseen: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Tuntematon versio"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "Epäkelpo etäversiotunniste, binäärinen epäyhteensopivuus on mahdollinen. Käytä ydintä ja etäpäätettä samasta vedoksesta."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "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:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Väärä protokollaversio."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Puuttuva protokollan versiomerkintä."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Automaattinen uudelleenyhdistäminen palvelimelle %d sekunnin päästä"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Tunnistautuminen epäonnistui: etäyhteyssalasanan tarkiste on väärin."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Tunnistautuminen epäonnistui: väärä salasana."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Tunnistautuminen epäonnistui: salasana puuttui."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Epäkelpo pyyntö, tunnistaudu ensin."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Pääsy myönnetty."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Virheilmoitus \"%s\" lähetetty asiakkaalle."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Luvaton yhteysyritys osoitteesta %s. Yhteys suljettu."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Tiedostotarkistetta ei löytynyt: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "Hupsis! Komentosanan käsittelyvirhe!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Palvelinta ei lisätty"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "palvelinta ei löytynyt: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "poistettava palvelin on määriteltävä"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k on poistettu käytöstä asetuksissa."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Tiedostoa ei löytynyt."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Tiedostoa ei löytynyt."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Haku on käynnissä. Nouda tuloksia kohta uudelleen!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Verkkohaku etäliittymästä ei ole mielekästä."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Haku on käynnissä. Nouda tuloksia kohta uudelleen!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Ei pisteitä kaavioon."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Asiakasohjelmaasi ei ole asetettu tälle tarkkuustasolle."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Etäyhteys: sulkemista pyydetty"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Sulkeminen on jo käynnissä."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Etäyhteys: lisään linkkiä '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Virheellinen linkki tai se on jo listalla."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Tiedostoa ei löytynyt."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Epäkelpo tiedostonimi."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Tiedostoa ei voitu uudelleennimetä."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Sulje tämä keskustelu."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Uusi keskustelu aloitettu"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Sulje tämä keskustelu."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad on poistettu päältä asetuksissa."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Tuntematon nimi)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad on poistettu päältä asetuksissa."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "eD2k on jo yhdistetty."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Yhdistetään eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Kad on jo yhdistetty."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Yhdistetään Kadiin..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Kaikki verkot ovat pois päältä."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "eD2k-yhteys katkaistu"
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Kad-yhteys katkaistu."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Etäyhteys: vastaanotettiin epäkelpo komentosana: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Epäkelpo komentosana (väärä protokollaversio?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Tuntematon laajennos '%s' komennolle '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Tuntematon komento '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1871,7 +2396,7 @@
 "\n"
 "Tälle komennolle ei voi antaa parametria.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1879,7 +2404,7 @@
 "\n"
 "Tälle komennolle on annettava parametri.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1887,7 +2412,7 @@
 "\n"
 "Tämä komento on puutteellinen, sinun on käytettävä jotakin alla olevista laajennoksista.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1895,11 +2420,11 @@
 "\n"
 "Mahdolliset laajennokset:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Käytettävissä olevat komennot:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1910,17 +2435,17 @@
 "Komennot eivät erottele isoja ja pieniä kirjaimia.\n"
 "Kirjoita '%s <komento>' saadaksesi lisätietoa komennosta.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Poistuu sovelluksesta."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Näyttää ohjeen."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1928,7 +2453,7 @@
 "Saadaksesi ohjeen komennosta, kirjoita 'help <komento>'.\n"
 "Saadaksesi listan komennoista kirjoita 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1939,46 +2464,46 @@
 "Käytä '%s' listataksesi komennot\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Syntaksivirhe!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Tämä komento ei tarvitse parametreja."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Tälle komennolle on annettava parametri."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Virheellinen parametri."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Komento on puutteellinen."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Kirjoita '%s' saadaksesi lisää ohjeita.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Tämä on %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Tämä on %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1986,7 +2511,7 @@
 "\n"
 "Luon asiakasta...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1995,7 +2520,7 @@
 "\n"
 "Ok, suljen %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2009,118 +2534,361 @@
 "\n"
 "Suljen...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Näytä tämä ohje."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Verkkonimi koneelle jossa aMule on käynnissä. (oletus: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "aMulen portti etäyhteydelle. (oletus: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Etäyhteyden salasana."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Lue asetukset tiedostosta."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Älä tulosta mitään stdout:iin."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Ole monisanainen - näytä myös virheenetsintäviestit."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Asettaa ohjelman maa-asetukset (kielen)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Kirjoita komentoriviparametrit asetustiedostoon."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Luo asetustiedoston perustuen aMulen asetustiedostoon."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Näyttää ohjelman version."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Tiedoston tiedot"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% valmiina"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Tiedoston esikatselu"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "VIRHE: Ulkoista mediatoistinta ei voitu käynnistää! Komento: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "VIRHE: Ei voida avata osatiedostoa '%s'"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Tervetuloa!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Yhdistetään kaveriin"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Yhteyden tila:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Verkot"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Vakio TCP-portti"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Laajennettu UDP-portti (Kad / haku kaikkialta)."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Käytä UPnP:tä reitittimen portinohjauksessa"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Yhdistämisapu"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Lataat jo tiedostoa %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Päivitä palvelinlista käynnistettäessä"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Kansio ladatuille tiedostoille"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Selaa"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Kansio latauksen väliaikaisille tiedostoille"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f KB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Kaverilistatiedostoa 'emfriends.met' ei saatu avattua luettavaksi!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Kaverilistatiedostoa 'emfriends.met' ei saatu avattua kirjoitettavaksi!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "KRIITTINEN - ei asiakasta keskustelun aloituksessa"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Kaverit"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Näytä tie&dot"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Lisää kaveri"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Poista kaveri"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Lähetä Viesti"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Näytä tiedostot"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Vapauta kaveripaikka"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Oletko varma että haluat poistaa valitun kaverin?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Oletko varma että haluat poistaa valitut kaverit?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2128,986 +2896,1306 @@
 "Et voi asettaa enempää kuin yhden kaveripaikan.\n"
 " Asetettiin yksi paikka."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Monivalinta"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Et voi asettaa enempää kuin yhden kaveripaikan.\n"
-" Asetettiin yksi paikka."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Lähetä viesti käyttäjälle"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Lähetettävä viesti:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Poista ystävistä"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Lähetä viesti"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Vaihda tähän tiedostoon"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "Jonossa: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Kysyttiin toista tiedostoa"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Odottaa lähetyspaikkaa"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "Jonossa: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Lähettää"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Ei yhtään"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Ei"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Avaaminen epäonnistui: %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Ladataan..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "HTTP-lataus peruutettu"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "Ladattava URL ei voi olla tyhjä"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Jaettujen tiedostojen listaus käyttäjältä '%s' ei onnistunut"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Kansio latauksen väliaikaisille tiedostoille"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Ladattu %d tavua"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "The URL %s returned: %i"
 msgstr "URL %s palautti: %i - Virhe (%i)!"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "HTTP-lataus peruutettu"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Hae uusi GeoIP.dat osoitteesta %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "GeoIP.dat-tiedoston lataus epäonnistui, keskeytän päivittämisen."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Tiedoston %s poisto epäonnistui, keskeytän päivityksen."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Tiedoston %s uudelleennimeäminen epäonnistui, keskeytän päivityksen."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "Tiedoston %s päivitys onnistui"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Error updating %s"
 msgstr "Virhe päivitettäessä GeoIP.dat-tiedostoa"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Tiedoston %s lataus osoitteesta %s epäonnistui"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Valtiotietojen lataus osoitteesta '%s' epäonnistui."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Lataan IP-suodattimet 'ipfilter.dat' sekä 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Ipfilter.dat-tiedoston '%s' avaaminen epäonnistui, muoto tuntematon."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "Ipfilter.dat-tiedoston '%s' avaaminen epäonnistui, tiedostoa ei voitu avata."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "Ladattu %u IP-alue kohteesta '%s'."
 msgstr1 "Ladattu %u IP-aluetta kohteesta '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u epämuodostunut rivi ohitettiin."
 msgstr1 "%u epämuodostunutta riviä ohitettiin."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Uuden tiedoston %s uudelleennimeäminen epäonnistui, keskeytän päivityksen."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP-suodatin on valmiina"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Käytä tunnettuja \n"
-"asiakkaita yhdistämisapuna"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Nykyinen"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Yhtäjaksoinen keskiarvo"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Session keskiarvo"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Yhteyspisteitä (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "IP ei kelpaa yhdistämisavuksi"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Portti ei kelpaa yhdistämisavuksi"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Ole hyvä ja täytä kaikki vaaditut kentät"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Viesti"
+
+#: src/KadDlg.cpp
 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/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Tämä toiminto korvaa kaikki tunnetut yhteyspisteet ja uudelleenyhdistää Kademlian."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Jatketaanko?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: hakusana on liian lyhyt"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: Hakusana on jo hakulistalla:"
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Tiedoston nodes.dat luku epäonnistui sillä se liian vanha. Versio 0 ei ole enää tuettu."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Luettu %u Kad-kontakti"
 msgstr1 "Luettu %u Kad-kontaktia"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 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/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Vain %d Kad-kontakti saatavilla, tiedostoa nodes.dat ei tallennettu"
 msgstr1 "Vain %d Kad-kontaktia saatavilla, tiedostoa nodes.dat ei tallennettu"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Kirjoitettu %d Kad-kontakti"
 msgstr1 "Kirjoitettu %d Kad-kontaktia"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Kad-verkko"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Tiedoston nimi"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Tiedostokoko"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Jakosuhde"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Lähetetty"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Pyydetty"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Täysiä lähteitä"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "VAROITUS: Tunnettujen tiedostojen lista on turmeltunut, sisältää epäkelvon otsakkeen."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Merkinnän luku tunnettujen tiedostojen lista -tiedostosta epäonnistui, tiedosto saattaa olla turmeltunut"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Epäkelpo merkintä tunnettujen tiedostojen lista -tiedostossa, tiedosto saattaa olla turmeltunut: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Järjestelmän vakio"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albania"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabia"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturia"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baski"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgaria"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalaani"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Kiina (Yksinkertaistettu)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Kiina (Perinteinen)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Kroatia"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Tsekki"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Tanska"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Hollanti"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Englanti (U.K.)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Englanti (U.K.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Viro"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Suomi"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Ranska"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galicia (Galego)"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Saksa"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Kreikka"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Heprea"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Unkari"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italia"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japani"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Korea"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Liettua"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norja (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Puola"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugali"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugali (Brazilia)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Romanian"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Venäjä"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slovenia"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Espanja"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Ruotsi"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turkki"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukraina"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Tuntematon virhe %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Virheelle %d ei ole virhekuvausta"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Luo tarkistetta"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Viimeistelee"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Valmis"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Tauotettu"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Virheellinen"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Salasana ei voi olla tyhjä."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Virheellinen salasana, ei MD5-tarkiste!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Yhdistäminen ei onnistunut"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Etäyhteys suljettu."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "Etäyhteysyritys epäonnistui. Vastaus oli tyhjä."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Etäyhteys: Epäkelpo vastaus, kättely epäonnistui. Yhteys suljettu."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Etäyhteys: Epäkelpo vastaus, kättely epäonnistui. Yhteys suljettu."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Yhdistetty onnistuneesti kohteeseen aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Yhdistetty onnistuneesti."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Etäyhteys: Pääsy evättiin: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Etäyhteys: Kättely epäonnistui"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "HTTP-lataussäie käynnistetty"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "KuunteluPistukka: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "VIRHE: Ei voida kuunnella TCP-porttia."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "VIRHE: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "VAROITUS: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Sulje"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopioi"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Liitä"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Pyyhi"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Rajoittamaton"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Näytä aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Piilota aMule"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Yhdistetty"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Yhdistetty"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Yhdistetty Kadiin (palomuurattu)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "Palvelin-IP: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "Palvelimen IP:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Ei yhdistetty"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP-portti: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP-portti: Ei valmis"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP-portti: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UPD-portti: Ei valmis"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Asiakkaan tiedot"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Lähetysraja"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Latausraja"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Näytä aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Katkaise yhteys"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Piilota aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Yhdistä"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Sulje"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "KB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Rajoittamaton"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMulen palkkivalikko"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Nopeusrajoitukset:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "Ylös: Ei ole"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "Ylös: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "Alas: Ei ole"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "Alas: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Latausnopeus: %.1f"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Lähetysnopeus: %.1f"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Nimimerkki: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Nimimerkkiä ei ole valittu!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "Asiakastunnus: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Palvelinnimi: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "Palvelin-IP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Ei yhdistetty"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online-Signeeraus: Käytössä"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online-Signeeraus: Pois päältä"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Päälläoloaika: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Jaettuja tiedostoja: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Asiakkaita jonossa: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Yht alas: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Yht ylös: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k-linkki: "
-
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Suorita"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Lisää eD2k- tai magnet-linkin ytimelle."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Lisää kavereihin"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 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:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Tapahtumat näytetään tässä. Nähdäksesi täyden listan tapahtumista, katso loki Palvelimet-välilehdeltä."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Lataa ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Käyttäjiä: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Yhdistettyjen käyttäjien määrä nykyisellä palvelimella sekä arvio kaikkien käyttäjien määrästä."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Ylös: 0,0 | Alas: 0,0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Nykyiset keskimääräiset lähetys- ja latausnopeudet. Mikäli aktivoitu, numerot suluissa näyttävät asiakasyhteyksien otsikkotietojen nopeuksia."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Näyttää yhteyden tilan ja aktiiviset siirrot. Punaiset nuolet osoittavat että et ole yhdistetty, keltaiset nuolet että sinulla on LowID (olet palomuurin takana) ja vihreät nuolet että sinulla on HighID (paras yhdistettävyys)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Ei yhdistetty ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Palvelin johon yhdistetty."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Etsi"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nimi:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tyyppi"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Paikallinen"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Kaikkialta"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Laajat parametrit"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Suodatus"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Tiedostotyyppi"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Kaikki"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Pakatut"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Ääni"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CD-levykuvat"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Ohjelmat"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Tekstiä"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Videot"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Pääte"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Vähimmäiskoko"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Tavua"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Enimmäiskoko"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Saatavuus"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Suodatin:"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Suodatin"
 
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Suodata tulokset"
-
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Käännä tulos"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Piilota tunnetut tiedostot"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Nollaa kentät"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Käynnistä haku"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Hae lisää"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Pääte"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Lataa"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Lataa luokassa"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Haun tulos"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Nollaa kentät"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Tulokset"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Siivoaa valmistuneet lataukset pois näkyvistä"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Suodatin:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Tiedostolähteet:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Yleiset"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Koko nimi :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "Ei saatavilla"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Koko nimi"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "Osatiedosto (met)"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Tarkiste"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Osatiedosto (met) :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Tarkiste :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Tiedostokoko :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Osatiedoston tila  :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Viimeksi nähty kokonaisena :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Tiedostokoko"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Siirto"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Löydetyt lähteet :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Siirtäviä lähteitä :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Osien määrä :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Saatavilla :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Osatiedoston tila"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Siirtonopeus :"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Viimeksi nähty kokonaisena"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Löydetyt lähteet"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Siirtäviä lähteitä"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Osien määrä"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Saatavilla"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Siirtonopeus"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Lataus ollut aktiivisena"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Lataus ollut aktiivisena: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Siirretty :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Valmiina :"
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Valmiina"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Älykäs turmeltumien käsittely (I.C.H.)"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Menetetty turmeltumille :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Pakkaamalla saatu hyöty :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Pelastetut paketit (I.C.H.) :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Menetetty turmeltumille"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Pakkaamalla saatu hyöty"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Pelastetut paketit (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Jako: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Pyynnöt"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Hyväksytyt pyynnöt"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Siirretty data"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Jakosuhde"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Täysiä kopioita"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Jaetut tiedostot"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Lähetetty: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Kad Info"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Ei luokitusta"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Otsikko"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Tiedostonimet"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Muuta nimi"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Siivoa"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Käytä"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 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:705
+#: src/muuli_wdr.cpp
 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."
@@ -3115,1131 +4203,1246 @@
 "Elokuvalle voit kertoa sen pituuden, tarinan, kielen ...\n"
 "ja mikäli se on väärennös, voit kertoa sen muille aMulen käyttäjille."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Tiedoston laatu"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Ei luokitusta"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Epäkelpo / Turmeltunut / Väärennös"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Huono"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Kohtalainen"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Hyvä"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Erinomainen"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Yhteys Kadiin katkaistu"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Päivitä"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Lataan, odota hetki ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Koko on tuntematon"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Vaadittavat tiedot"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP-osoite :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Portti :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Portti"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Käyttäjänimi :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Käyttäjätarkiste :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Käyttäjätarkiste"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Lisää"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Latausnopeus"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Nykyinen"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Yhtäjaksoinen keskiarvo"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Session keskiarvo"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Lähetysnopeus"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Yhteydet"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktiiviset lataukset"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktiiviset yhteydet (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktiiviset lähetykset"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Tilastopuu"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Käyttäjänimi:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Käyttäjätarkiste:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Asiakasohjelma:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Asiakasversio:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP-osoite:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Asiakasohjelma"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Asiakasversio"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "Käyttäjätunniste"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Palvelimen IP"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "Käyttäjätunniste:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Palvelimen nimi"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Palvelimen IP:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Kätkeminen"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Palvelimen nimi:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Kätkeminen:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Protokollan kätkeminen"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Siirrot asiakkaalle"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Nykyinen pyyntö:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Keskimääräinen lähetysnopeus:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Keskimääräinen latausnopeus:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Lähetetty (sessiossa):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Ladattu (sessiossa):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Lähetetty (yhteensä):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Ladattu (yhteensä):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Nykyinen pyyntö"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Keskimääräinen lähetysnopeus"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Keskimääräinen latausnopeus"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Lähetetty (sessiossa)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Ladattu (sessiossa)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Lähetetty (yhteensä)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Ladattu (yhteensä)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Pisteet"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Lähetys/vastaanotto-määre:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Turvattu tunnistus:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Sijoitus jonossa:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Jonopisteet:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Turvattu tunnistus"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Sijoitus jonossa"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Jonopisteet"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Nimimerkki"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - monen alustan Mule"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Kieli: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Viive työkaluvihjeiden näyttämiseen."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Tämä määrittää kontrolleissa käytetyn kielen."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Tarkista uuden version saatavuus käynnistettäessä"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "aMule tarkistaa käynnistyessään uuden version olemassaolon kun tämä on päällä."
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Aloita pienennettynä"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Tämä päällä aMule pienentää itsensä käynnistyessään."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Vahvista sulkeminen"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Amule kysyy varmistuksen ennen poistumista."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Näytä kuvake palkissa"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 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:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Piilota sovelluksen ikkuna painettaessa sulje -nappulaa"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Pienennä palkkikuvakkeeksi"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 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:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Muista nämä asetukset"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Työkaluvihjeiden viive:"
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "sekuntia"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Syötä tähän selaimesi nimi. Jätä tyhjäksi jos haluat käyttää järjestelmän oletusselainta."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Selaa"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Avaa uuteen välilehteen mikäli mahdollista"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Videotoistin"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Kaistankäytön rajoitukset"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Lähetys"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Paikkavaraus"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Portit"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Vakio TCP-portti"
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "UDP-portti palvelinpyyntöihin (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Laajennettu UDP-portti (Kad / haku kaikkialta)."
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Tätä UDP-porttia käytetään laajennettuihin eD2k-hakuihin sekä Kad-verkossa"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Käytä UPnP:tä reitittimen portinohjauksessa"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnP:n TCP-portti (Valinnainen):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Sido paikallinen osoite IP:hen (tyhjä sallii mihin tahansa):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Sido paikallinen osoite IP:hen (tyhjä sallii mihin tahansa):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Lähteitä enintään tiedostoa kohden:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Yhtäaikaisten yhteyksien enimmäismäärä:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Yhdistä automaattisesti käynnistettäessä"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Yhdistä uudelleen yhteyden katketessa"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Poista toimimattomat palvelimet"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "yrityksen jälkeen"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Päivitä palvelinlista käynnistettäessä"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Päivitä palvelinlista yhdistettäessä palvelimelle"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Päivitä palvelinlista asiakkaan yhdistäessä"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Käytä tärkeysjärjestystä"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Käytä älykästä LowID-tarkistusta yhdistettäessä"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Turvallinen yhdistäminen"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Yhdistä automaattisesti vain pysyville palvelimille"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Aseta käsin syötetyt palvelimet korkealle tärkeydelle"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Älykäs turmeltumien käsittely (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Käytä"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr "Kehittynyt I.C.H. luottaa kaikkiin tarkisteisiin (ei suositella)"
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Lisää tiedostot lataukseen tauotettuna"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Lisää tiedostot lataukseen tärkeys automaattisella"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Yritä ladata ensimmäiset ja viimeiset palat ensin"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Käynnistä seuraava tauotetty tiedosto kun tiedosto valmistuu"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Samasta luokasta"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "Aakkosellisessa järjestyksessä"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Esivaraa levytila uusille tiedostoille"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Uusia tiedostoja lisätessä varaa levytilaa koko tiedostolle, vähentää pirstaloitumista"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Pysäytä lataukset kun tyhjän levytilan määrä saavuttaa "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Syötä tähän levytila jonka haluat jättää vapaaksi."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Tallenna 10 lähdettä harvinaisille tiedostoille (< 20 lähdettä)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Lähetykset"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Lisää uudet jaetut tiedostot tärkeys automaattisella"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Kansio ladatuille tiedostoille"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Älykäs turmeltumien käsittely (I.C.H.)"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Käytä"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Kehittynyt I.C.H. luottaa kaikkiin tarkisteisiin (ei suositella)"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Jaetut kansiot"
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Kansio latauksen väliaikaisille tiedostoille"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Jaetut kansiot"
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Poista"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Klikkaa oikealla painikkeella kansion kuvaketta jakaaksesi rekursiivisesti)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Jaa piilotiedostot"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Etäpalvelin"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Paikallinen Palvelin"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Kuvaajat"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Päivitysväli : 5 sekuntia"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Keskimääräiskuvaajan aika: 100 minuuttia"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Yhteyskuvaajan Skaala: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Latauskuvaajan skaala:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Lähetyskuvaajan skaala:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Värit: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Taustaväri"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Ruudukko"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Hetkittäinen lataus"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Latauksen yhtäjaksoinen keskiarvo"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Latauksen keskiarvo sessiossa"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Hetkittäinen lähetys"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Lähetyksen yhtäjaksoinen keskiarvo"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Lähetyksen keskiarvo sessiossa"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktiiviset yhteydet"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Järjestelmäpalkin nopeusnäyttö"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Kad-yhteyksiä tällä hetkellä"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Kad-yhteyksiä aktiivisena"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Kad-yhteyksiä sessiossa"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Valitse"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Puu"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Näytettävien asiakasversioiden määrä (0=rajoittamattomasti)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! VAROITUS !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Enimmäismäärä uusia yhteyksiä / 5 s"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "FTP-päivityksien väli minuuteissa"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "FTP-päivityksien väli minuuteissa"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tiedostopuskurin koko: 240000 tavua"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Lähetysjonon koko: 5000 asiakasta"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Palvelinyhteyden päivitysväli: Poissa käytöstä"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Poista käytöstä tietokoneen ajastettu siirtyminen valmiustilaan"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Käytettävä teema: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Näytä \"Nopea eD2k-linkkien käsittelijä\" jokaisessa ikkunassa."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Näytä laajennetut tiedot luokitteluvälilehdillä"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Näytä sovelluksen versio otsikossa"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Näytä siirtonopeudet otsikossa"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Ennen sovelluksen nimeä"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Sovelluksen nimen perässä"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Näytä otsikkotietoihin kuluva kaista"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Pystysuuntainen työkalupalkki"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Latausjonon tiedostot"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Näytä edistyminen prosentteina"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Näytä edistymispalkki"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Tasainen"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Pyöreä"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Järjestä tiedostot automaattisesti (iso suorittimen käyttö)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule järjestää sarakkeet latauslistassasi automaattisesti"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Etäyhteyksien asetukset"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Hyväksy etäyhteydet"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "Kuunneltavan verkkoliitännän IP:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "TCP-portti:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Kytke päälle UPnP-portinohjaus etäyhteysportissa"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Salasana"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Web-palvelimen asetukset"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "TCP-portti:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Tarkistaa salasanaa\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Tarkistaa salasanaa\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Estä vieraskäyttö"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Vieraan salasana web-palvelimelle"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Web-palvelimen asetukset"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Käynnistä web-palvelin käynnistettäessä"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Web-sapluuna"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Täysien oikeuksien salasana"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Salli rajoitettujen oikeuksien käyttäjä"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Rajoitettujen oikeuksien salasana"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Käytä UPnP-portinohjausta web-palvelimen portissa"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Web-palvelimen UPnP TCP-portti (Valinnainen)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Sivun päivitysväli (sekunneissa)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Salli gzip-pakkaus"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Järjestelmän vakio"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Napsauta tästä saattaaksesi voimaan asetuksiin tehdyt muutokset."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Nollaa asetuksiin tekemäsi muutokset."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Otsikko :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Kommentti :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Saapuvien kansio :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Vaihda tärkeyttä uusille sijoitetuille tiedostoille :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Saapuvien kansio"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Vaihda tärkeyttä uusille sijoitetuille tiedostoille"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Älä vaihda"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Valitse väri tälle luokalle (valittuna) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Tyhjennä"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Valitse väri tälle luokalle (valittuna)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Napsauta tätä painiketta nollataksesi lokin."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Palvelinlista"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "Syötä tähän server.met-tiedostoon osoittava url ja paina nappia vasemmalla päivittääksesi tunnettujen palvelimien listan."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Palvelimen lisäys käsin: Nimi"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Syötä uuden palvelimen nimi tähän"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Portti"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Syötä palvelimen portti tähän."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule loki"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Palvelimen tiedot"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2K Info"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kad Info"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Yhteyspisteitä (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Syötä tähän nodes.dat-tiedostoon osoittava url ja paina nappia vasemmalla päivittääksesi tunnettujen yhteyspisteiden listan."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Yhteyspisteiden tilastot"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Yhdistämisapu"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Uusi yhteyspiste"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Portti:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
 msgstr "Käytä tunnettuja asiakkaita yhdistämisapuna"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Katkaise Kad-yhteys"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node 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:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Käytä turvattua käyttäjän tunnistusta"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protokollan kätkeminen"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Tuki protokollan kätkemiselle"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Tämä valinta sallii aMulen ottaa vastaan kätketyn protokollan yhteyksiä muilta asiakkailta."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Käytä kätkemistä lähtevissä yhteyksissä"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Tämä valittuna aMule käyttää protokollan kätkemistä ottaessaan yhteyttä muihin asiakkaisiin/palvelimiin."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Vastaanota vain kätkettyjä yhteyksiä"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Kaikki"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Ei kukaan"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Ketkä voivat nähdä jaetut tiedostoni:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP-suodatus"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Suodata asiakkaat"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Suodata palvelimet"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Uudelleenlataa lista"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Päivitä nyt"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Päivitä ip-suodatus automaattisesti käynnistettäessä"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Suodatustaso:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Suodata aina lähiverkon IP:t"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Käsittele muut IP:t vainoharhaisesti"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Hylkää paketit mikäli asiakkaan ip on eri kuin mistä paketti saapui. Käytä varoen."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Käytä järjestelmänlaajuista ipfilter.dat-tiedostoa mikäli saatavilla"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Mikäli paikallista ipfilter.dat:ia ei löydy, käytetään järjestelmänlaajuista ipfilter.dat-tiedostoa."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Kytke Online-Signeeraus päälle"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Kytkee päälle Online-Signeeraustiedoston kirjoittamisen, jota muut ohjelmat voivat käyttää esimerkiksi signeerauksissa."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Päivitysväli (sekuntia):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Muuttaa Online-Signeerauksen päivitysväliä, annetaan sekunteina."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Online-signeeraus-tiedoston tallennuspaikka:"
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Näytä asiakkaiden valtioiden liput"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Siirtonopeus :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Lähteet"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4247,11 +5450,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4261,827 +5464,747 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Lataus: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Päivitä ip-suodatus automaattisesti käynnistettäessä"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Suodata saapuvat viestit (ei koske keskusteluja):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Suodata kaikki viestit"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Suodata viestit ihmisiltä jotka eivät ole kaverilistallasi"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Suodata viestit tuntemattomilta asiakkailta"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Suodata viestit jotka sisältävät (käytä merkkiä ',' erottimena):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Näytä vastaanotetut viestit lokissa"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Kommentit"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Suodata kommentit jotka sisältävät (käytä merkkiä ',' erottimena):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Käytä tunnistautumista"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Kytkee päälle/pois käyttäjänimellä/salasanalla tunnistautumisen"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Käyttäjänimi: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Käyttäjänimi tunnistautuessa välityspalvelimelle"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Salasana:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Salasana tunnistautuessa välityspalvelimelle"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Käytä välityspalvelinta"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Kytke päälle/pois välityspalvelimen tuki"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Tyyppi:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Välityspalvelin:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Tyyppi"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Välityspalvelin"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Välityspalvelimen verkkonimi"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Portti:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Portti"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Välityspalvelimen portti"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Käytä tunnistautumista"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Kytkee päälle/pois käyttäjänimellä/salasanalla tunnistautumisen"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Käyttäjänimi tunnistautuessa välityspalvelimelle"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Salasana tunnistautuessa välityspalvelimelle"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Yhdistä:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Kirjaudu etä-aMuleen"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Käyttäjänimi"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Muista nämä asetukset"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Etäyhteys suljettu."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Käytä gzip-pakkausta"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Käytä monisanaista lokiin kirjausta."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "Avaa tied&osto"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Viestien luokittelut:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Odottaa..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Lisää tuonteja"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Yritä uudelleen valittuja"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Poista valitut"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Tapahtumatyypit"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Aktiiviset lähetykset"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Prosenttia kaikista tiedostoista"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Näytä asiakkaat"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Valitut tiedostot"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Vain aktiiviset lähetykset"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Näytä asiakkaat"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Uudelleenlataa:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Uudelleenlataa jaetut tiedostot"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Lähetä"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Lähettää annetun viestin."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Sulje tämä keskustelu."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Yhdistä mihin tahansa palvelimeen ja/tai Kadiin"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Peruuta"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Jaetut tiedostot"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Katkaise yhteys"
 
-#: src/OScopeCtrl.cpp:242
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Yhdistä"
+
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Poissa käytöstä %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "tavu"
 msgstr1 "tavua"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "tavu/s"
 msgstr1 "tavua/s"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "s"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "m"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "tuntia"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Päivää"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "päivää"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "kaikki"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "kaikki muut"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Keskeneräinen"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Pysäytetty"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Pakattu"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Teksti"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Aktiivinen"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Asetuskansio: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Tämä komento ei tarvitse parametreja."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Tämä komento ei tarvitse parametreja."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Tämä komento ei tarvitse parametreja."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Tämä komento ei tarvitse parametreja."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Syötä palvelimen portti tähän."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Syötä palvelimen portti tähän."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Syötä palvelimen portti tähän."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Odotellaan osatiedostojen muuntosäikeen päättymistä..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Tuon %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Luen väliaikaiskansiota"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Haen perustietoja ladatusta tietopaketista"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Luon kohdetiedostoa"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Lataan tiedot vanhasta lataustiedostosta (%u %u:sta)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Haen lähdelataustiedoston tietoja"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Lisään latauksen ja tallennan uuden osatiedoston"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Tuo osatiedostot"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Tila"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Tiedostotarkiste"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Levy: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Haluatko että lähteenä käytetyt tiedostot poistetaan onnistuneen tuonnin jälkeen?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Poistetaanko lähteet?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "VIRHE: Osatiedoston luominen epäonnistui"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Yritän avata met-tiedoston varmuuskopion kohteesta %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "VIRHE: part.met-tiedostoa ei avattu: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr "VIRHE: part.met-tiedosto on tyhjä: %s ==> %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "VIRHE: Epäkelpo part.met-tiedoston versio: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Virhe: %s (%s) on turmeltunut (väärät tagit: %s), tiedostoa ei voitu ladata."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "VIRHE: %s (%s) on turmeltunut (väärä tagimäärä), tiedostoa ei voitu avata."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Yritän palauttaa tiedoston tietoja..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Tiedoston tietoja ei saatu palautettua :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Avaaminen epäonnistui: %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "VAROITUS: %s voi olla turmeltunut (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "VIRHE osatiedostoa tallennettaessa: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "IO-virhe osatiedostoa tallennettaessa: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Tallennettu %i lähde osatiedostolle: %s (%s)"
 msgstr1 "Tallennettu %i lähdettä osatiedostolle: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Tallennettu %i lähde osatiedostolle: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "Virhe luettaessa osatiedoston lähdetiedostoa (%s - %s): %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Turmeltunut osa (%d) %d osasta tiedostossa %s - Tiedostotulostarkiste |%s| Tiedostotarkiste |%s|"
 msgstr1 "Turmeltunut osa (%d) %d osasta tiedostossa %s - Tiedostotulostarkiste |%s| Tiedostotarkiste |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Valmis osa (%i) kohteessa %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Tarkiste uudelleenluotu: %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Odottamaton virhe viimeistellessä %s. Tiedosto tauotettu"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Lataus suoritettu: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Lataus suoritettu: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Poistetaan tiedosto: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, 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'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "VIRHE: Ei voitu luoda tarkistetta ladatulle osalle - tarkistejoukko on puutteellinen (%s). Näin ei pitäisi koskaan tapahtua."
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "Data loppui (EOF) luotaessa tarkistetta ladatulle osalle %u jonka pituus on %u (maksimi on %u) osatiedostosta '%s' jonka pituus on %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "VAROITUS: Levytilaa ei ole tarpeeksi! Tauotan tiedoston: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Ladattu osa %i on turmeltunut tiedostossa: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Allokoidaan"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Riittämätön levytila"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Ladattu"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "VIRHE: Ei voida avata osatiedostoa '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Järjestelmän vakio"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albania"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabia"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturia"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baski"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgaria"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalaani"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Kiina (Yksinkertaistettu)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Kiina (Perinteinen)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Kroatia"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Tsekki"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Tanska"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Hollanti"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Englanti (U.K.)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "Englanti (U.K.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Viro"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Suomi"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Ranska"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galicia (Galego)"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Saksa"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Kreikka"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Heprea"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Unkari"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italia"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italia (Sveitsi)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japani"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Korea"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Liettua"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norja (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Puola"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugali"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugali (Brazilia)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Romanian"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Venäjä"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slovenia"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Espanja"
+msgid "Extended source exchange"
+msgstr "Lähdevälitys"
 
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Ruotsi"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turkki"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukraina"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Vaihda kieli"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Käännöksiä ei ole asennettuna aMulelle"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Kieliä ei saatavilla"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "vaihtoehtoja ei saatavilla"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "Löytyi epäkelpo luokka, hypätään yli"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Löytyi epäkelpo luokka, hypätään yli"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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-pistukka on TCP+3"
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Käytetään oletusporttia (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Yhteys"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Kansiot"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Palvelimet"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Tiedostot"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Turvallisuus"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Välityspalvelin"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Etähallinta"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Online-Signeeraus"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Laajennetut"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Debuggaus"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5091,15 +6214,15 @@
 "    %PARTFILE - koko polku tiedostoon\n"
 "    %PARTNAME - pelkästään tiedoston nimi"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5115,26 +6238,43 @@
 "aMule toimii hyvin vaikka näitä ei\n"
 "säädettäisikään."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Yhdistettävän välityspalvelimen tyyppi"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Tarkistaa salasanaa\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5142,32 +6282,46 @@
 "aMule on käynnistettävä uudelleen näiden muutosten voimaansaattamiseksi:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP-portti muuttui.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP-portti muuttui.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "- Etäyhteyden sovitin muuttui.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Etäyhteyden portti vaihtui.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Etäyhteyden vastaanotto muuttui.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Etäyhteyden sovitin muuttui.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Protokollan kätkeminen"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Kieli vaihtui.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5175,27 +6329,33 @@
 "Palvelinlistan automaattisen päivityksen lista on tyhjä.\n"
 "'Päivitä palvelinlista käynnistettäessä' kytketään pois päältä."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
-"Olet sallinut etäyhteydet mutta et ole antanut salasanaa.\n"
-"Etäyhteydet eivät ole mahdollisia ellei salasanaa ole annettu."
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Kieli vaihtui.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Väliaikaiskansio muuttui.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- ED2K-verkko käytössä.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Väärä protokollaversio."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5203,7 +6363,7 @@
 "Sekä eD2k- että Kad-verkko on pois päältä.\n"
 "Et voi yhdistää ennen kuin ainakin toinen niistä on sallittu."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5211,7 +6371,7 @@
 "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:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5221,20 +6381,69 @@
 "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:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Automaattinen Päivitys aloitettu"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Kansio latauksen väliaikaisille tiedostoille"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Salasana asetettu ja etäyhteydet sallittu."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5244,41 +6453,66 @@
 "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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Väliaikaiset tiedostot"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Saapuvat tiedostot"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Online-Signeeraukset"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Valitse kansio kohteelle %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Löydetty %i tunnettu jaettu tiedosto"
+msgstr1 "Löydetty %i tunnettua jaettua tiedostoa"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Etsi videosoitin"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Valitse selain"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Valitse selain"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Suoritettava tiedosto%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Järjestelmän vakio"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Muokkaa palvelinlistaa"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5286,1197 +6520,1463 @@
 "Syötä tähän URLit joista server.met-tiedostot haetaan.\n"
 "Vain yksi urli riville."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Täysiä lähteitä"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Tila:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Tila:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Päivitysväli: %d sekunti"
 msgstr1 "Päivitysväli: %d sekuntia"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Keskimääräiskuvaajan aika: %d minuutti"
 msgstr1 "Keskimääräiskuvaajan aika: %d minuuttia"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Yhteyskuvaajan skaala: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Tiedostopuskurin koko: %d tavu"
 msgstr1 "Tiedostopuskurin koko: %d tavua"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Lähetysjonon koko: %d asiakas"
 msgstr1 "Lähetysjonon koko: %d asiakasta"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Palvelinyhteyden päivitysväli: %d minuutti"
 msgstr1 "Palvelinyhteyden päivitysväli: %d minuuttia"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Palvelinyhteyden päivitysväli: Ei käytössä"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "poissa käytöstä"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Suorita komento tapahtuman '%s' yhteydessä"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Mahdollista komentojen suorittaminen ytimestä"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Ytimen komento:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Mahdollista komentojen suorittaminen graafisesta käyttöliittymästä"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Graafisen käyttöliittymän komento:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Seuraavat muuttujat korvataan:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Jaetut kansiot"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Uudelleenlataa jaetut tiedostot"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Jaetut kansiot"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Lataa uudelleen lista jaetuista tiedostoista."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Jaetut kansiot"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Valitse kansio kohteelle %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Muista nämä asetukset"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Hakuvaroitus"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Haut"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Haun edistyminen: %u %% \n"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Hakuvaroitus"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Kaikki"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "VAROITUS: Tunnettujen tiedostojen lista on turmeltunut, sisältää epäkelvon otsakkeen."
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Epäkelpo merkintä tunnettujen tiedostojen lista -tiedostossa, tiedosto saattaa olla turmeltunut: "
+
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 #, fuzzy
 msgid "No keyword for Kad search - aborting"
 msgstr "Avainsana hakuun: %s"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Odottamaton virhe Kad-hakua tehtäessä: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "Tiedostotunniste"
-
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Ei luokitusta"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Lataa luokassa"
+#: src/SearchList.cpp
+#, fuzzy, c-format
+msgid "Error %u: %s\n"
+msgstr "Virhe päivitettäessä GeoIP.dat-tiedostoa"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Hanki %s tälle tiedostolle"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "Tiedostotunniste"
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Sulje kaikki välilehdet"
+
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Hae tähän liittyviä tiedostoja (eD2k, paikallinen palvelin)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Merkitse tunnetuksi tiedostoksi"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Kopioi eD2k-linkki leikepöydälle"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopioi eD2k-linkit leikepöydälle"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Olet yhdistettynä palvelimeen jota yrität poistaa, katkaise yhteys ensin."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Peruutettu"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Uusi"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Käynnissä"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Suomi"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Haun edistyminen: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Haun edistyminen ei ole tiedossa"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Kätketyt yhteysyritykset palvelimille epäonnistuivat. Yritetään uudelleen ilman kätkemistä."
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "Yhdistäminen kaikkiin listattuihin palvelimiin epäonnistui. Aloitetaan uusi kierros."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "Yhdistäminen kaikkiin listattuihin palvelimiin epäonnistui. Aloitetaan uusi kierros."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Automaattinen uudelleenyhdistäminen palvelimelle %d sekunnin päästä"
+msgstr1 "Automaattinen uudelleenyhdistäminen palvelimelle %d sekunnin päästä"
+
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Yhdistetty %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Yhteys muodostettu: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Kriittinen virhe yhdistettäessä. Internet-yhteys on mahdollisesti poikki"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Yhteys palvelimeen %s (%s:%i) katkesi"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) näyttää kuolleelta."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) on ilmeisesti täysi."
 
-#: 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"
-msgstr0 "Automaattinen uudelleenyhdistäminen palvelimelle %d sekunnin päästä"
-msgstr1 "Automaattinen uudelleenyhdistäminen palvelimelle %d sekunnin päästä"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Yhteys katkesi"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Yhdistäminen kohteeseen %s (%s:%i) epäonnistui."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "VIRHE: Pistukka virheellinen aikakatkaisutarkistuksessa"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Yhteysyritys kohteeseen %s (%s:%i) aikakatkaistiin."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Vastaanotettiin myöhästynyt vastaus DNS-kyselyyn, ohitetaan."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Lataan tiedostoa server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Tiedostoa server.met ei löytynyt!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Server.met-tiedoston '%s' avaaminen epäonnistui, tuntematon muotoilu."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Server.met:in avaus epäonnistui!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i palvelin tiedostossa server.met"
 msgstr1 "%i palvelinta tiedostossa server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d palvelin lisätty"
 msgstr1 "%d palvelinta lisätty"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Virhe: tiedosto 'server.met' on turmeltunut: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "IO-virhe luettaessa tiedostoa 'server.met': "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 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:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Kohteen '%s' avaaminen ei onnistunut"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Server.met:n tallennus epäonnistui!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "IO-virhe luettaessa tiedostoa 'server.met': "
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Virheellinen URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Palvelinlista ladattu osoitteesta %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Palvelinlistan osoitetta ei löydetty tiedostosta 'addresses.dat'. Ole hyvä ja liitä kelvollinen palvelinlistan osoite tähän tiedostoon palvelinlistan automaattiseksi päivittämiseksi"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Aloita palvelinlistan lataus osoitteesta %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Palvelinlistan %s lataus epäonnistui"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Paikallinen palvelin IP-suodatetaan, yhdistän toiselle palvelimelle!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Viive"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Käyttäjiä"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Käyttäjiä"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Kiinteä"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versio"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Tiedostot"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Jaetut tiedostot"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Olet yhdistettynä palvelimeen jota yrität poistaa. Katkaise yhteys ensin. Palvelinta EI poistettu."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Tuntematon nimi)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "Oletko varma että haluat poistaa pysyvän palvelimen %s"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "m"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Palvelimet (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Palvelin"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Yhdistä palvelimelle"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Merkitse palvelin pysyväksi"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Poista palvelimen pysyvyysmerkintä"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Merkitse palvelimet pysyviksi"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Poista palvelimien pysyvyysmerkintä"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Poista palvelin"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Poista palvelimet"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Poista kaikki palvelimet"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopioi eD2k-linkit leikepöydälle"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Uudelleenyhdistä palvelimelle"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Oletko varma että haluat poistaa kaikki palvelimet?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Oletko varma että haluat poistaa valitun palvelimen?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Oletko varma että haluat poistaa valitut palvelimet?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "VIRHE: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "VAROITUS: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Uusi asiakastunnus on %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "VAROITUS: Sinulla on Low-ID!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tLisätietoa https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Tuntematon palvelintieto vastaanotettu! - liian lyhyt"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Vastaanotettiin %d uusi palvelin"
 msgstr1 "Vastaanotettiin %d uutta palvelinta"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Palvelinlista tallennettu."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Palvelin hylkäsi viimeisimmän komennon"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Virheellinen paketti saatu palvelimelta: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Odottamaton virhe käsiteltäessä pakettia palvelimelta: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "Palvelin IP %s (%s) on suodatettu. Ei yhdistetä."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "käyttää protokollan kätkentää."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Yhdistetään %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "aMule loki"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Palvelinta ei lisätty: IP:tä tai verkkonimeä ei annettu."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Palvelinta ei lisätty: Epäkelpo palvelinportti."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "eD2k-tilanne:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Yhteyden tila:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Yhdistetty"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kademlian tilanne:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Lähiverkkokäyttö"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Käynnissä"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Kademlian tilanne:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Tila:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Yhteyden tila:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "UDP-yhteyden tila:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Palomuurattu tilanne: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Kaveria ei vaadita - TCP-portti auki"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Kaveria ei vaadita - UDP-portti auki"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Ei kaveria"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Yhdistetään kaveriin"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Yhdistetty kaveriin osoitteessa %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP-osoite:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Indeksoidut lähteet:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Indeksoidut avainsanat:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Indeksoidut huomautukset:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Indeksoitu kuorma:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Keskimäärin käyttäjiä:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Keskimäärin tiedostoja:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Ei käynnissä"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Lisään tiedoston %s jaettaviin"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Löydetty %i tunnettu jaettu tiedosto"
 msgstr1 "Löydetty %i tunnettua jaettua tiedostoa"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Löydetty %i tunnettu jaettu tiedosto, %i tuntematonta"
-msgstr1 "Löydetty %i tunnettua jaettua tiedostoa, %i tuntematonta"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "VIRHE: Yritettiin jakaa %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Jaettua kansiota ei löytynyt, hypätään yli: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Jaettua kansiota ei löytynyt, hypätään yli: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Jaettavia tiedostoja ei löytynyt kansiosta: %s"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Käyttäjänimi"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Virhe tallennettaessa tiedostoa %s: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Latausnopeus"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Lataan tiedostoa server.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Lähetysnopeus"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Jaettavia tiedostoja ei löytynyt kansiosta: %s"
+msgstr1 "Jaettavia tiedostoja ei löytynyt kansiosta: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Jaettavia tiedostoja ei löytynyt kansiosta: %s"
+msgstr1 "Jaettavia tiedostoja ei löytynyt kansiosta: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Saatavilla olevat osat"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Löydetty %i tunnettu jaettu tiedosto"
+msgstr1 "Löydetty %i tunnettua jaettua tiedostoa"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Käyttäjänimi"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Lähetyksen tilanne"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Paikallinen tiedoston nimi"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Jaettujen tiedostojen lista"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Pyynnöt"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Hyväksytyt pyynnöt"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Siirretty data"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Jakosuhde"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Hankitut osat"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Täysiä kopioita"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Saatavuus"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Kansiopolku"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Jaetut tiedostot"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Lisää kommentti/luokitus"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Muuta kommenttia/luokitusta"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Uudelleennimeä"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Lisää tiedostot kokoelmassa siirtolistalle"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Kopioi magnet-&URI leikepöydälle"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Kopioi eD2k-linkki työpöydälle (Lähde)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Kopioi eD2k-linkki leikepöydälle (Lähde) (Kryptaustiedoilla)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Kopioi eD2k-linkki leikepöydälle (Verkkonimi)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Kopioi eD2k-linkki leikepöydälle (Verkkonimi) (Kyptaustiedoilla)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Kopioi eD2k-linkki leikepöydälle (&AICH-tiedot)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Kopioi eD2k-linkki leikepöydälle (&AICH-tiedot)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Tarvitset HighID:een luodaksesi voimassa olevan lähdelinkin"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Virhe viimeistellessä"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Jaettujen tiedostojen listaus käyttäjältä '%s' ei onnistunut"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Uudelleenlataa jaetut tiedostot"
+msgstr1 "Uudelleenlataa jaetut tiedostot"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Jaettujen tiedostojen yhteenlaskettu koko: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Jaettujen tiedostojen yhteenlaskettu koko: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Jaetut tiedostot (%i)"
+msgstr1 "Jaetut tiedostot (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Jaetut tiedostot (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Osatiedosto"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Lataa uudelleen lista jaetuista tiedostoista."
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Tila"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Tiedoston nimi etäpäässä"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Lähetetty data (Sessiossa (Yhteensä)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Otsikkotietoja yhteensä (Paketteja): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Tiedostopyyntöotsikkoja (Paketteja): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Lähdevaihdon otsikkoja (Paketteja): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Palvelimen otsikkoja (Paketteja): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kad-otsikkoja (Paketteja): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Kryptauksen otsikkoja (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Lähetyksiä käynnissä: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Lähetyksiä odottamassa: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Onnistuneita lähetyksiä yhteensä: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Epäonnistuneita lähetyksiä yhteensä: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Keskimääräinen lähetysaika: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Ladattu data (Sessiossa (Yhteensä)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Lähteitä löytynyt: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Latauksia käynnissä (paloja): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Session jakosuhde lähetys:lataus (Yhteensä): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Keskimääräinen latausnopeus (Sessiossa): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Keskimääräinen lähetysnopeus (Sessiossa): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Suurin latausnopeus (Sessiossa): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Suurin lähetysnopeus (Sessiossa): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Uudelleenyhdistämisiä: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Aikaa ensimmäisestä siirrosta: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Yhdistetty palvelimeen: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Aktiivisia yhteyksiä (arvio): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Maksimimäärä yhteyksiä saavutettu: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Yhteyksiä keskimäärin (arvio): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Yhteyksiä enimmillään (arvio): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Asiakkaat"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Tuntematon: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Suodatettu: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Estetty: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Yhteensä: %i Tunnettuja: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Toimivia palvelimia: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Toimimattomia palvelimia: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Yhteensä: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Poistettuja palvelimia: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Suodatettuja palvelimia: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Käyttäjiä toimivilla palvelimilla: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Tiedostoja toimivilla palvelimilla: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Käyttäjiä yhteensä: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Tiedostoja yhteensä: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Palvelimien käyttö: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Jaettuja tiedostoja: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Jaettujen tiedostojen yhteenlaskettu koko: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Keskimääräinen tiedostokoko: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Käyttöjärjestelmä"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Ei vastaanotettu"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktiiviset yhteydet: (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Ei saatavissa"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Suorita <str> ja poistu."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Käsittelee tarkisteen mukaan: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Käsittelee tiedostonimen mukaan: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Tälle komennolle on annettava parametri. Kelvollisia ovat: tiedostotarkiste.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Ei ole kelvollinen numero\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "Tarkiste ei ole kelvollinen (pituuden on oltava tasan 32 merkkiä)\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6485,7 +7985,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6494,83 +7994,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "Kirjoita '%s' saadaksesi lisää ohjeita.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Latauksen koko: %i"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Pyyntö ei onnistunut, tuntematon virhe."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Toiminto onnistui."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Pyyntö epäonnistui virheeseen: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Asiakkaiden IP-suodatus on %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "POIS PÄÄLTÄ"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "PÄÄLLÄ"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Palvelimien IP-suodatus on %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Nykyinen IP-suodatustaso on %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Yhdistetty %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Yhdistän"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "palomuurattu"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6579,7 +8083,7 @@
 "\n"
 "Lataus:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6588,7 +8092,7 @@
 "\n"
 "Lähetys:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6597,7 +8101,7 @@
 "\n"
 "Asiakkaita jonossa:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6606,38 +8110,33 @@
 "\n"
 "Lähteitä yhteensä:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Osatiedosto"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Hakutuloksia: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Haun edistyminen: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Haun edistyminen ei ole tiedossa"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Palvelin lähetti tunnistamattoman vastauksen, komentosana = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Näytä tilannetiedot lyhyesti."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Näyttää yhteyden tilan, nykyiset lähetys-/latausnopeudet, jne.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Näytä täydet tilastotiedot."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6651,11 +8150,11 @@
 "\n"
 "Esimerkki: 'statistics 5' näyttää vain viisi suosituinta versiota kustakin asiakastyypistä.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Sammuta aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6665,35 +8164,35 @@
 "Tämä sulkee myös tekstikäyttöliittymän, koska se on käyttökelvoton ilman\n"
 "suoritettavaa ydintä.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Lataa uudelleen annetun kohteen."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Lataa uudelleen lista jaetuista tiedostoista."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Lataa uudelleen IP-suodatustaulukko."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Lataa nykyinen IP-suodatustaulukko uudelleen."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Päivittää IP-suodatustaulukon URLista."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 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:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Yhdistä verkkoon."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6705,35 +8204,35 @@
 "kyseiselle palvelimelle. IP:n on oltava pisteillä erotettu IPv4-numero\n"
 "tai DNS-nimi."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Yhdistä vain eD2k:hon."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Yhdistä vain Kadiin."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Katkaise yhteys verkkoon."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "Tämä katkaisee yhteyden kaikkiin yhdistettyihin verkkoihin.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Katkaise vain eD2k-yhteys."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Katkaise vain Kad-yhteys."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Lisää eD2k- tai magnet-linkin ytimelle."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6751,51 +8250,51 @@
 "\n"
 "Magnet-linkin on sisällettävä eD2k-tarkiste ja tiedoston pituus.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Aseta haluamasi asetukset."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Aseta IP-suodatuksen asetukset."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Kytke IP-suodatus päälle sekä asiakkaille että palvelimille."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Kytke IP-suodatus pois päältä sekä asiakkailta että palvelimilta."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Salli/estä asiakkaiden IP-suodatus."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Kytke IP-suodatus päälle asiakkaille."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Kytke IP-suodatus pois päältä asiakkailta."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Salli/estä palvelinten IP-suodatus."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Kytke IP-suodatus päälle palvelimille."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Kytke IP-suodatus pois päältä palvelimilta."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Valitse IP-suodatuksen taso."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6803,60 +8302,74 @@
 "Sallitut suodatustasot ovat välillä 0-255 oletusarvon (myös lähtöarvon)\n"
 "ollessa 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Aseta kaistankäytön rajoitukset."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "Näille komennoille annettujen arvojen on oltava kilotavuja sekunnissa.\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Aseta lähetyskaistan raja."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Näille komennoille annettujen arvojen on oltava kilotavuja sekunnissa.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Aseta latauskaistan raja."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Kytkee päälle/pois käyttäjänimellä/salasanalla tunnistautumisen"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Näille komennoille annettujen arvojen on oltava kilotavuja sekunnissa.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Näytä asetuksen arvo."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Hae IP-suodatuksen asetukset."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Hae IP-suodatuksen tila sekä asiakkaille että palvelimille."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Hae IP-suodatuksen tila asiakkaille."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Hae IP-suodatuksen tila palvelimille."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Hae IP-suodatuksen taso."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Hae kaistankäytön rajat."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Suorittaa haun"
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6875,39 +8388,44 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Suorittaa haun kaikkialta."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Suorittaa haun paikallisesti"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Suorittaa kad-haun"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
 msgstr "Näyttää viimeisimmän haun tulokset."
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Näyttää edellisen haun tulokset.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Näyttää haun edistymisen."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Näyttää haun edistymisen.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Aloittaa tiedoston lataamisen"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6915,81 +8433,81 @@
 "Tiedoston numero viimeisimmästä hausta on annettava.\n"
 "Esimerkki: 'download 12' aloittaa viimeisen haun tiedoston numero 12 latauksen.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Tauota lataus."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Jatka latausta."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Peruuta lataus."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Aseta latauksen tärkeys."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Aseta tärkeys alhaiseksi."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Aseta tärkeys normaaliksi."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Aseta tärkeys korkeaksi."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Aseta tärkeys automaattiseksi."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Näytä jonot/listaukset."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Näytä lähetysjono."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Näytä latausjono."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Näytä loki."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Näytä palvelinlista."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Lataa uudelleen lista jaetuista tiedostoista."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Nollaa loki."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Vanhentunut komento, käytä sen sijaan '%s'."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -6998,255 +8516,278 @@
 "Tämä on vanhentunut komento ja se voidaan poistaa tulevaisuudessa.\n"
 "Käytä sen sijaan '%s'.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule tekstiasiakas"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Poistetaan tiedosto: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Poistetaan tiedosto: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Jatketaan tiedoston %s lähetyksiä"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "Muunnetaan vanhat AICH-tarkistejoukot '%s' 64-bittisiksi '%s'."
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Vaaditaan vahvistus"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Luokittelujen maksimimäärä on 99."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Liian monta luokkaa!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Kaikki muut"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Valitse suodatin"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Lisää luokka"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Muokkaa luokkaa"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Poista luokka"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Tarkistejoukkoa pyydettiin tuntemattomalle tiedostolle: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Valitse ketkä voivat pyytää nähtäville sinun jaettujen tiedostojen listaasi."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Jatketaan tiedoston %s lähetyksiä"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Keskeytetään tiedoston %s lähetys"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr "Komennon '%s' suoritus epäonnistui tapahtuman '%s' yhteydessä."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Lataus valmistunut"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Koko polku tiedostoon."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Tiedoston nimi ilman polkua."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "Tiedoston e2dk-tarkiste."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Tiedoston koko tavuina."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Kumulatiivinen latausaika."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Uusi keskustelu aloitettu"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Viestin lähettäjä."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Levytila loppu"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Levyosio."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Virhe viimeistellessä"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Käsittelee tiedostoa numero %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Tiedostoa ei ole !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "\"aLinkCreator, aMule eD2k-linkkien tekijä"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Tervetuloa!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Syöteparametrit"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Tiedostosta Tarkiste"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Lisää Valinnaisia URLeja tälle tiedostolle"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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 "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
-msgid "Remove"
-msgstr "Poista"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Luo linkki osatarkisteilla"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr "Auttaa levittämään uusia ja harvinaisia tiedostoja nopeammin, kustannuksena linkin koon kasvu"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4-Tiedostotarkiste"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k-tiedostotarkiste"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k-linkki"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Tallenna"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Avaa"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Avaa tiedosto laskeaksesi sen eD2k-linkin"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Kopioi laskettu eD2k-linkki leikepöydälle"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Tallenna nimellä"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Tallenna laskettu eD2k-linkki tiedostoon"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Tietoja aLinkCreatorista"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Leikepöytää ei voitu avata"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Toistaiseksi ei mitään kopioitavaa !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Valitse tiedosto lasketulle eD2k-linkille"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Ei voitu avata "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Ole hyvä ja syötä ei-tyhjä tiedoston nimi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Toistaiseksi ei mitään tallennettavaa !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7266,162 +8807,159 @@
 "\n"
 "Jaetaan GPL:n alaisena"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Laskee tarkistetta..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator on toiminnassa"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Lasken MD4-tarkistetta..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Lasken eD2k-tarkisteita..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Peruutettu !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Valmis %.2f sekunnissa"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Olet jo lisännyt tämän URLin !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Ole hyvä ja syötä ei-tyhjä URL"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Ei voida avata %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uvrk %02ut %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02ut %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, aMulen Online-Tilastotiedot"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Suurin latausnopeus wxCasin käynnistämisestä lähtien"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Suurin latausnopeus edellisten wxCasin ajokertojen aikana"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Tyhjennä"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Järjestelmä"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Pysäytä Automaattinen Päivitys"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Tallenna Online-Tilastotietokuva"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Tulosta Online-Tilastotietokuva"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Asetus"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Tietoja wxCasista"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Aloita Automaattinen Päivitys"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Automaattinen Päivitys pysäytetty"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Automaattinen Päivitys aloitettu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Tallenna Tilastokuva"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMulen Online-Tilastotiedot"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7429,11 +8967,11 @@
 "Tulostamisessa oli ongelma.\n"
 "Kenties tulostin ei ole asennettu oikein?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Tulostus"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7451,402 +8989,562 @@
 "\n"
 "Jaetaan GPL:n alaisena"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oi Oi, aMule ei ole käynnissä..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule on käynnissä"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule on käynnissä, mutta ei yhdistettynä"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule yhdistää..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oi Oi, aMulen tila on tuntematon..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " on ollut käynnissä "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " on pysäytetty !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " ei ole yhdistetty !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " on yhdistämässä..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " on tekemässä jotain outoa, tarkista se !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " on yhdistetty: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "pois päältä"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " palvelimella "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " käyttäen "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Yhteensä Ladattu: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Lähetetty: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Istunnossa Ladattu: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Lataus: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " KB/s, Lähetys: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Jako: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " tiedosto(a), Asiakkaita jonossa: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Aika: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " hetkellä "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Järjestelmän Kuormituskeskiarvo (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Järjestelmä päällä: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Tiedoston amulesig.dat sisältävä kansio"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Päivitysväli sekunteina"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Luo tilastokuva joka päivityksen yhteydessä"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Lähetä tilastokuvasi toistuvasti FTP-palvelimelle"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP-osoite"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP-kansiopolku"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Syötä tähän FTP-palvelimen osoite"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Käyttäjänimi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTP-päivityksien väli minuuteissa"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Tarkista oikeellisuus"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Kansio joka sisältää signeeraustiedostosi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Kansio mihin luodaan tilastokuva"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Lataa mallin <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Web-palvelimen HTTP-portti"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Käytä UPnP-portinohjausta web-palvelimen portissa"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP-portti"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Käytä gzip-pakkausta"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Täyden käyttöoikeuden salasana web-palvelimelle"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Vieraan salasana web-palvelimelle"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Salli vieraskäyttö"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Estä vieraskäyttö"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "Hae/tallenna web-palvelimen asetukset etä-aMulesta/een"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMulen asetustiedoston polku. ÄLÄ KÄYTÄ SUORAAN!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Poista PHP-tulkki käytöstä (vanhentunut)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Uudelleenkoosta PHP-sivut joka pyynnöllä"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule Web-Palvelin"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "web-asiakasyhteys hyväksytty\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "VIRHE: Web-asiakasyhteyttä ei voitu hyväksyä\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Pyyntö ei onnistunut, virhe: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Indeksitiedostoa ei löydetty: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sessio vanhentunut - pyydetään kirjautumista\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sessio kunnossa, kirjautuneena\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sessio kunnossa, ei kirjautuneena\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Ei avattua sessiota - tulee pyytämään kirjautumista\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sessio luotu - pyytää kirjautumista\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Käsittelee pyyntöä alkuperäinen: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Salasanaa ei annettu, kirjautumista ei sallita"
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Tarkistaa salasanaa\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Salasanatarkiste ei kelpaa\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Salasana hyväksytty\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Virheellinen salasana\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Uloskirjautumista pyydetty\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Käsittelee pyyntöä uudelleenohjattu: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Yhdistäminen epäonnistui "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Lähetetty"
+#~ msgid "Ratio"
+#~ msgstr "Luokitus"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Jaettavia tiedostoja ei löytynyt kansiosta: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Vaihda kieli"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Käännöksiä ei ole asennettuna aMulelle"
+
+#~ msgid "No languages available"
+#~ msgstr "Kieliä ei saatavilla"
+
+#~ msgid "User name"
+#~ msgstr "Käyttäjänimi"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Hankitut osat"
+
+#~ msgid "Available Parts"
+#~ msgstr "Saatavilla olevat osat"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Löydetty %i tunnettu jaettu tiedosto, %i tuntematonta"
+#~ msgstr1 "Löydetty %i tunnettua jaettua tiedostoa, %i tuntematonta"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Tiedostoa ei löytynyt."
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " KB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "KB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Etäpalvelin"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Paikallinen Palvelin"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Epäkelpo merkintä tunnettujen tiedostojen lista -tiedostossa, tiedosto saattaa olla turmeltunut: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Tallennetaan osatiedostoa %u / %u"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Estääksesi tämän varoituksen näyttämisen joka kerralla,\n"
+#~ "aseta haluamasi videotoistin asetuksissa (oletuksena %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Suodata tulokset"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Merkitse tunnetuksi tiedostoksi"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Prosenttia kaikista tiedostoista"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Yhdistämisapu"
+
+#~ msgid "New node"
+#~ msgstr "Uusi yhteyspiste"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Hae lisää"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Käytä tunnettuja \n"
+#~ "asiakkaita yhdistämisapuna"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Yhdistä mihin tahansa palvelimeen ja/tai Kadiin"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Katkaise Kad-yhteys"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Pysäytä nykyiset yhteysyritykset"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Katkaise yhteys yhdistettyihin verkkoihin"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Yhdistä sallittuihin verkkoihin"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Järjestä tiedostot automaattisesti (iso suorittimen käyttö)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule järjestää sarakkeet latauslistassasi automaattisesti"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Hylkää paketit mikäli asiakkaan ip on eri kuin mistä paketti saapui. Käytä varoen."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Näyttää edellisen haun tulokset.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Näyttää haun edistymisen.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Yhteys suljettu - aMule on varmaankin lopetettu."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Tarkista uuden version saatavuus käynnistettäessä"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k-linkki: "
+
+#~ msgid "Commit"
+#~ msgstr "Suorita"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: haaroitun taustalle - nähdään"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Verkkosivu: https://amule-org.github.io\n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Foorumi: https://github.com/amule-org/amule/discussions\n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Verkkosivu: https://amule-org.github.io\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Foorumi: https://github.com/amule-org/amule/discussions\n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Lähetetty"

amule-3.0.1.tar.gz/po/fr.po -> amule-3.1.0.tar.gz/po/fr.po Changed

@@ -15,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:21+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:37+0000\n"
 "Last-Translator: Dylan Aïssi <bob.dybian@gmail.com>\n"
 "Language-Team: Français\n"
 "Language: fr\n"
@@ -26,72 +26,157 @@
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Poedit 3.9\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "À propos d'aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Contrôle à distance d'aMule "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Snapshot :"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Client P2P multiplateforme basé sur eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2026 L'équipe aMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Une partie d'aMule est basée sur \n"
+
+#: src/AboutDialog.cpp
+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/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Droits d'auteur (c) 2002-2011 Petar Maymounkov (petar@maymounkov.org)\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Site web :"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Forum :"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Documentation :"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Bugs :"
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "Cliquer pour vérifier s'il existe une version plus récente."
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "Vérifier les mises à jour"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "Recherche de mises à jour…"
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "Vous utilisez la version la plus récente."
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "Une nouvelle version (%s) est disponible :"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr "Impossible de vérifier les mises à jour. Merci de réessayer ultérieurement."
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Ajouter un ami"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Vous devez entrer une IP et un port valides !"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Information"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Le hachage utilisateur spécifié est invalide !"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
-"aMule peut installer un lanceur de bureau et une icône dans votre répertoire personnel afin qu'il apparaisse dans votre menu d'applications comme une application installée normalement. Ce changement est réversible — les fichiers sont placés dans ~/.local/share/applications et ~/.local/share/icons et peuvent être supprimés à tout moment.\n"
+"aMule peut installer un lanceur de bureau, des icônes et des raccourcis de commandes de shell dans votre répertoire personnel afin qu'il apparaisse dans votre menu d'applications comme une application installée normalement.\n"
+"\n"
+"Ce changement est réversible — les fichiers sont placés dans ~/.local/share/applications, ~/.local/share/icons et dans ~/.local/bin et peuvent être supprimés à tout moment.\n"
 "\n"
-"Installer l'intégration de bureau maintenant ?"
+"Installer l'intégration de bureau maintenant ?"
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr "Ajouter aMule à votre menu d'applications ?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr "Installer"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr "Pas maintenant"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr "Ne plus me demander"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr "Impossible d'installer l'intégration de bureau : la variable d'environnement APPDIR n'est pas définie. Cela signifie généralement que l'AppImage a été lancée d'une manière non standard."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr "Échec de l'intégration d'aMule"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr "Impossible d'installer l'intégration de bureau : échec de la création de %s. Vérifiez que votre répertoire personnel est accessible en écriture."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr "Impossible d'installer l'intégration de bureau : échec de l'écriture de %s. Vérifiez que votre répertoire personnel est accessible en écriture."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr "Intégration AppImage : aMule a été ajouté à votre menu d'applications."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr "Intégration AppImage : aMule a été ajouté à votre menu d'applications (%d raccourcis shell sous ~/.local/bin)."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -105,82 +190,167 @@
 "\n"
 "Redémarrer aMule maintenant ?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr "aMule installé"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr "Redémarrer maintenant"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr "Plus tard"
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 "Impossible d'ajouter %u lien depuis le fichier ED2KLinks (cf. le journal pour les détails)."
-msgstr1 "Impossible d'ajouter %u liens depuis le fichier ED2KLinks (cf. le journal pour les détails)."
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ERREUR"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Échec de l'ouverture du fichier ED2KLinks."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+"Un autre programme détient le fichier de verrou d'aMule : \n"
+"\n"
+"%s\n"
+"\n"
+"Ce n'est pas une instance en cours d'exécution d'aMule, donc il n'y a rien à apporter au premier plan. Fermez l'autre programme, ou effacez le fichier de verrou sans qu'aMule soit en cours d'exécution."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+"Le démon aMule (amuled) est déjà en cours d'exécution en tant que processus %d et utilise cette configuration.\n"
+"\n"
+"Il n'a aucune fenêtre à ramener au premier plan. Connectez-vous au démon avec amuleGUI, ou bien arrêtez le démon avant de démarrer aMule."
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr "aMule ne peut démarrer"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr "Permissions restreintes sur %s, accès réservé au propriétaire."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr "Fichier de collection introuvable : %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Fichier de collection vide ou invalide : %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr "Aucun lien utilisable dans la collection : %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 "%u lien inutilisable ignoré dans la collection : %s"
+msgstr1 "%u liens inutilisables ignorés dans la collection : %s"
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Impossible de convertir le lien magnet en eD2k : %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Lien eD2k invalide « %s » ! ERREUR : %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Et maintenant on quitte l'application principale…"
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Interruption de l'instance amuleweb avec le pid '%d' … "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Mise à mort de l'instance amuleweb avec le pid '%d' … "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Échec"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Interruption de l'instance amuleapi avec le pid '%d'… "
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Arrêt de l'instance amuleapi avec le pid '%d'… "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit : Arrêt du noyau."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "Fermeture d'aMule terminée."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Résultats du débogage de la mémoire pour la sortie d'aMule :"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr "Liaison du trafic pair à pair d'aMule à l'interface : %s (les mises à jour HTTP utilisent le chemin par défaut)"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr "Rattacher tout le trafic réseau à l'interface : %s"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr "AVERTISSEMENT : l'interface réseau configurée '%s' n'a pu être trouvé - le trafic ne lui est PAS lié et peut partir sur le chemin par défaut. Vérifiez le nom de l'interface dans les Préférences."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr "AVERTISSEMENT : la liaison à l'interface réseau '%s' nécessite des privilèges élevés et n'a PAS été appliquée - le trafic peut emprunter le chemin par défaut. Attribuez la capacité (par exemple 'sudo setcap cap_net_raw+ep' sur le binaire aMule) ou exécutez avec des privilèges suffisants."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr "AVERTISSEMENT : impossible de lier à l'interface réseau '%s' - le trafic peut emprunter le chemin par défaut."
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Votre localisation a été remise à la valeur par défaut à cause d'un changement dans la configuration. Désolé."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Infos"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -188,24 +358,46 @@
 "\n"
 "Configuration EC"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Mot de passe renseigné et connexions externes activées."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "AVERTISSEMENT"
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr "Liste de serveurs eD2k (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr "Initialisation du réseau"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr "Nœuds d'amorçage Kad (nodes.dat)"
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "Chargement des fichiers temporaires"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Chargement des fichiers temporaires (%u sur %u)"
+
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "Chargement des fichiers partagés"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "Chargement des fichiers partagés (%u)"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "Démarrage"
+
+# AI-GENERATED — please review.
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Amorçage de réseau"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
@@ -213,31 +405,58 @@
 "aMule a détecté des fichiers d'amorçage de réseau manquants.\n"
 "Sélectionnez ceux à télécharger :"
 
-# AI-GENERATED — please review.
-#: src/amule.cpp:797
-msgid "Network bootstrap"
-msgstr "Amorçage de réseau"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "Liste de serveurs eD2k (server.met)"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Nœuds d'amorçage Kad (nodes.dat)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "serveur web s'exécutant avec le pid %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "Vous avez demandé à exécuter le serveur web au démarrage, mais le binaire amuleweb ne peut être exécuté. Veuillez installer le paquet contenant le serveur web aMule, ou compilez aMule depuis le code source avec -DBUILD_WEBSERVER=YES et installez-le."
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "ERREUR"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr "Impossible d’écrire le jeton EC d’amuleapi dans %s ; amuleapi utilisera le mot de passe configuré."
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr "amuleapi s'exécutant avec le pid %d"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Vous avez demandé à exécuter amuleapi au démarrage, mais le binaire amuleapi ne peut être exécuté. Veuillez installer le paquet contenant le serveur API RESTd'aMule, ou compilez aMule depuis le code source avec -DBUILD_AMULEAPI=YES et installez-le."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr "Connexion externe : impossible de s’attacher à « %s » ; écoute limitée à 127.0.0.1."
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Impossible de lier les ports à l'adresse spécifiée : %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Le port %u n'est pas disponible. Vous serez LowID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -252,48 +471,48 @@
 "\n"
 "Vérifiez votre réseau pour être sûr que le port est ouvert en sortie et en entrée."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Échec de la création du fichier OnlineSig"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Échec de la création du fichier aMule OnlineSig"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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 installée sur votre machine. (Note : Je tente de la forcer quand même)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "C'est la première fois que vous lancez aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Cette version est une version de test, mise à jour quotidiennement, et\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "https://amule-org.github.io, ou sur notre canal IRC : #aMule sur irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Ne vous gênez pas pour reporter tout bogue sur https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -301,513 +520,506 @@
 "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/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Nom du serveur signalé"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr "Métadonnées multimédia : le fichier sondé n'est plus connu, le résultat a été ignoré (%s)"
+
+#: src/amule.cpp
 #, 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/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "ERREUR : impossible d'ouvrir le fichier journal"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "AVERTISSEMENT : le fichier journal est vide. Quelque chose ne va pas."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Le journal a été effacé"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "ServerMessage : %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, 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/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Échec du téléchargement de la liste des nœuds."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 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/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Fichier de vérification de version corrompu"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Vous utilisez une version obsolète d'aMule !"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "La dernière version peut toujours être trouvée sur https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Votre version d'aMule est à jour."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Échec du téléchargement du fichier de vérification de version"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Utilisateurs : %s | Fichiers : %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Aucun réseau sélectionné"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "avec un LowID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "avec un HighID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Connecté à %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connexion à %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Déconnecté de eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad démarré."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad arrêté."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Connecté à Kad (OK)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Connecté à Kad (pare-feu)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Déconnecté de Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 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/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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 \"ECPassword\" du fichier ~/.aMule/amule.conf. Lancez amuled avec l'option --ec-config pour configurer le mot de passe. Davantage d'informations sont disponibles sur https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled : OnInit - démarrage du timer"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled : passage en arrière plan - à bientôt"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Impossible de créer le fichier Pid"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "Erreur : %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Ceci est aMule %s basé sur eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Tourne sur %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Visitez https://github.com/amule-org/amule/releases/latest pour vérifier si une nouvelle version est disponible."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ERREUR FATALE : Échec de la création du minuteur"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Contrôle à distance d'aMule "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "Erreur ! Impossible de charger les préférences"
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Snapshot :"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Réseaux"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Client P2P multiplateforme basé sur eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Recherches"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Site web : https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Téléchargements"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forum : https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Fichiers partagés"
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Documentation : https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Clients"
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
-"Bugs : https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Messages"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2026 L'équipe aMule \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistiques"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Une partie d'aMule est basée sur \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Préférences"
 
-#: src/amuleDlg.cpp:552
-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
+msgid "Navigate"
+msgstr "Naviguer"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "Espace libre : %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Message"
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "Une nouvelle version est disponible"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"Une nouvelle version d'aMule (%s) est disponible.\n"
+"\n"
+"Vous utilisez %s\n"
+"\n"
+"Souhaiteriez-vous ouvrir la page de téléchargement ?"
+
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "boîte de dialogue aMule détruite"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Connexion en cours"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k : Connexion en cours"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k : Déconnecté"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad : Derrière un pare-feu"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad : Connecté"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad : Connexion en cours"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad : Coupé"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Annuler"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Stopper les essais de connexions en cours"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Déconnecter"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr "Noyau"
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Version"
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Se déconnecter des réseaux actuellement connectés"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr "Le noyau est aMuleGUI sont des versions différentes."
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr "Le noyau et aMuleGUI sont de la même version."
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Se connecter"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adresse"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Se connecter aux réseaux actuellement activés"
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "Chiffrement"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "E : %.1f%s (%.1f) | R : %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " Mo/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " Ko/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " Mio/s"
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " Kio/s"
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "E : %.1f%s | R : %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Connecté)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Déconnecté)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Voulez-vous vraiment quitter %s ?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Confirmation de sortie"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Commande de lancement : "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- défaut -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Le répertoire de thèmes '%s' n'existe pas"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "AVERTISSEMENT : Impossible d'ouvrir le fichier thème '%s' pour la lecture"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Réseaux"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Fenêtre des réseaux"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Recherches"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Fenêtre de Recherche"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Téléchargements"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Fenêtre des Téléchargements"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Fichiers partagés"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Fenêtre des Fichiers Partagés"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Messages"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr "Fenêtre des clients"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Fenêtre des Messages"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistiques"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Fenêtre des Statistiques"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Préférences"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Fenêtre des Préférences"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importer"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "L'outil d'importation de fichier .part"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "À propos"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "À propos/Aide"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Réseau eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Réseau Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Pas de réseau"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Contrôle à distance d'aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Erreur Fatale : Échec de la création du minuteur noyau"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Connexion distante à aMule"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Connexion perdue"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr "Annuler et quitter"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "Reconnexion… (tentative %d)"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr "Prochaine tentative dans %d s…"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+"Connexion à %s perdue.\n"
+"%s\n"
+"\n"
+"L'interface est mise en pause jusqu'à ce que la connexion soit restaurée."
+
+#: src/amule-remote-gui.cpp
 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:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Départ vers la boucle d'événement…"
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Connexion…"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr "Échec de la connexion. Veuillez vérifier l'hôte, le port et le mot de passe."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Gestionnaire d'événement GUI EC distant"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "Connexion échouée. Impossible de se connecter à %s : %d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Descendant"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Connexion fermée - aMule s'est probablement arrêté."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr "La tentative de reconnexion a dépassé le délai d'attente ; nouvelle tentative en cours."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
@@ -816,1060 +1028,1360 @@
 "Délai de connexion dépassé. Impossible de joindre %s:%d dans le temps imparti.\n"
 "Vérifiez l'hôte, le port et qu'aMule est en cours d'exécution avec les Connexions Externes activées."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr "La connexion au noyau distant a été perdue. Tentative de reconnexion…"
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Désactivé"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr "La connexion au noyau distant a été rétablie."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr "Le noyau distant a redémarré ; rechargement en cours."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Tentative de reconnexion %d : connexion à %s:%d"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr "La reconnexion n'a pu démarrer, nouvelle tentative sous peu."
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Prêt"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Tous"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr "illisible"
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr "introuvable"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr "Le noyau a rejeté ces répertoires partagés : %s"
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Lien invalide ou déjà dans la liste."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr "Le démon a refusé la requête."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "Échec de la suppression de la catégorie : %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr "Impossible de créer le répertoire '%s' pour la catégorie '%s', on garde le répertoire '%s'."
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr "Le serveur distant a envoyé des données incohérentes pour « %s » (état de la partie : %d, valeur attendue : %d). La liste des fichiers peut afficher des informations incorrectes ; reconnectez-vous pour les corriger."
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/BaseClient.cpp:1363
-#, 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:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Recherche d'un pote pour une connexion lowid"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Fausse version d'eMule %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Faux eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Faux eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (basé sur eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Pseudo : %s ID : %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Demandé : %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Statistiques des fichiers pour cette session : %d requête acceptée sur %d, %s transférés\n"
 msgstr1 "Statistiques des fichiers pour cette session : %d requêtes acceptées sur %d, %s transférées\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Statistiques des fichiers pour toutes les sessions : %d requête acceptée sur %d, %s transférés\n"
 msgstr1 "Statistiques des fichiers pour toutes les sessions : %d requêtes acceptées sur %d, %s transférées\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Fichier demandé inconnu"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Message filtré de '%s' (IP : %s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nouveau message de '%s' (IP : %s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, 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/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, 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/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "AVERTISSEMENT : %s n'a pas pu être ouvert."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 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/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Erreur d'E/S lors de la lecture du fichier %s : %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Erreur lors de la sauvegarde du fichier %s : %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Entrer le Captcha"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Catégorie"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nouvelle Catégorie"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Choisissez un répertoire pour les fichiers entrants"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Vous devez indiquer un nom pour cette catégorie !"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Vous devez indiquer un chemin pour cette catégorie !"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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. Veuillez indiquer un chemin valide !"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, 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:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Connecté au Client ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Connexion au Client ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Échec de la connexion au client / Connexion perdue ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 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/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Discussion"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Fermer l'onglet"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Fermer tous les onglets"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Fermer les autres onglets"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Ajouter aux amis"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Afficher les &Détails"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Supprimer des amis"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Établissement d'un Slot Ami"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Voir les fichiers"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Envoyer un message"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Envoyer un message à l'utilisateur"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Message à envoyer :"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Vous n'êtes pas autorisé à établir plus d'un slot ami.\n"
+" Seul un slot a été attribué."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Sélection multiple"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 "Ajouter %u client à votre liste d'amis ?"
+msgstr1 "Ajouter %u clients à votre liste d'amis ?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Supprimer %u client de votre liste d'amis ?"
+msgstr1 "Supprimer %u clients de votre liste d'amis ?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 "Échec de l'ajout de %u client sélectionné à votre liste d'amis : aucune adresse n'est connue pour celui-ci."
+msgstr1 "Échec de l'ajout de %u clients sélectionnés à votre liste d'amis : aucune adresse n'est connue pour ceux-ci."
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Demander les fichiers partagés de %u client ?"
+msgstr1 "Demander les fichiers partagés de %u clients ?"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr "Une connexion est ouverte vers chacun d'entre eux."
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Fichier de Crédits chargé, il y a %u client connu"
 msgstr1 "Fichier de Crédits chargé, il y a %u clients connus"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - Crédits expirés pour %u client !"
 msgstr1 " - Crédits expirés pour %u clients !"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Pas de fichier 'cryptkey.dat' trouvé, création."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Détails du client"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Activé"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Supporté"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Non supporté"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Désactivé"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Connecté"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f Ko/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f Kio/s"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nom"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "Logiciel"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Adresse IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Origine"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr "Vu pour la première fois"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr "Vu pour la dernière fois"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "Sessions"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Vitesse d'Émission"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Vitesse de Réception"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "Total téléversé"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "Total téléchargé"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Modificateur R/É"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr "En ligne actuellement"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Incomplet"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Mauvais garçon"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Vérification - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "Impossible de demander à %u client sélectionné ses fichiers partagés."
+msgstr1 "Impossible de demander à %u clients sélectionnés leurs fichiers partagés."
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Fichiers"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Émis"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Téléchargé"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "Téléchargement en cours depuis"
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr "Téléversement en cours vers"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Actif"
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr "Connu"
+
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 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/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 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/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "L'utilisateur %s (%u) partage le répertoire '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "L'utilisateur %s (%u) a terminé d'envoyer la liste des fichiers partagés"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, 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"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "L'utilisateur %s (%u) a refusé l'accès à la liste des répertoires/fichiers partagés"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Commentaires sur le fichier"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Nom du fichier"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Évaluation"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr "Impossible de démarrer une recherche Kad"
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "Recherche Kad pour des commentaires en cours…"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Pas de commentaire"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u commentaire"
 msgstr1 "%u commentaires"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr "Clients bannis %s pour l'envoi %s de données corrompues de %s total pour le fichier '%s'"
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Échec du chargement des données des pays pour '%s'."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Basse"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto Normale"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Haute"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Très basse"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Basse"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normale"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Haute"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Très haute"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Release"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Demande en cours"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Connexion via le serveur"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "File d'attente pleine"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "En attente"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "En téléchargement"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Réception hashset"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Parties inutiles"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Connexion impossible entre deux LowID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Trop de connexions"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Connexion par Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Trop de connexions Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Banni"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Erreur de Connexion"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "File d'attente distante pleine"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Ancien MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Nouvel MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Compatible eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Serveur Local"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Serveur Distant"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Échange de Sources"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passif"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Lien"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Source Seeds"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Résultat de la recherche"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Terminé"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "En cours"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "ERREUR : Plus d'espace disque"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "ERREUR : Partmet non trouvé"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ERREUR : Erreur E/S !"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ERREUR : Échec !"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Mis en file d'attente"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Déjà en téléchargement"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Format de fichier temp inconnu ou mauvais."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr "Ce dossier fait partie d’un partage récursif. Pour le supprimer, désactivez le partage ou modifiez la racine du partage récursif située au-dessus."
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr "Impossible de désactiver un partage à l’intérieur d’un partage récursif"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr "Impossible de modifier un élément à l’intérieur d’un partage récursif"
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Partie"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Taille"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Reçu"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Vitesse"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Progression"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Sources"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Priorité"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Statut"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Temps restant"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Vu complet pour la dernière fois"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Dernière réception"
 
-#: 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/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/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Retour de : %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Auto"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Stop"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pause"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Reprise"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "E&ffacer terminés"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Mettre tous les A4AF sur ce fichier immédiatement"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Mettre tous les A4AF sur ce fichier (Auto)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 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:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Options avancées"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Prévisualisation"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "Afficher dans le gestionnaire de fichiers"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Afficher les &Détails"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Afficher tous les commentaires"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Copier le lien magnet dans le presse-papiers"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Copier le &lien eD2k dans le presse-papiers"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Copier le rapport dans le presse-papiers"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Obtenir %s pour ce fichier"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "dissocier"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Associer à une catégorie"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Ouvrir le fichier"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+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/DownloadListCtrl.cpp
+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/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Retour de : %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Entrez un nouveau nom pour ce fichier :"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Renommer"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f Mo/s"
+msgid "%.1f MiB/s"
+msgstr "%.1f Mio/s"
 
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H : %M : %S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Téléchargements (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr "le gestionnaire par défaut de shell Windows"
-
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Pour éviter que cet avertissement n'apparaisse avec chaque prévisualisation,\n"
-"indiquez votre lecteur vidéo préféré dans les préférences (%s par défaut)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Aperçu"
+msgid "Total queue size: %s"
+msgstr "Taille totale de la file d'attente : %s"
 
-#: src/DownloadListCtrl.cpp:1500
-#, 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/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Enregistrement du fichier .part %u sur %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Tous les fichiers .part ont été enregistrés."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Chargement des fichiers temporaires depuis %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Chargement du fichier .part %u sur %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "ERREUR : Échec du chargement du fichier de récupération. Recherchez une solution de récupération du .part.met sur https://github.com/amule-org/amule/discussions."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Tous les fichiers .part ont été chargés."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Pas de fichiers .part trouvés"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "%u fichier .part trouvé"
 msgstr1 "%u fichiers .part trouvés"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 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/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 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/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Téléchargement de %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, 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:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Vous avez déjà le fichier '%s' (demandé en tant que '%s')"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Vous avez déjà le fichier '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, 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:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Impossible de convertir le lien magnet en eD2k : %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Protocole de lien inconnu : %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 "Impossible d'ajouter %u lien (cf. le journal pour les détails)."
 msgstr1 "Impossible d'ajouter %u liens (cf. le journal pour les détails)."
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Lien eD2k invalide ! ERREUR : %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Le client a envoyé un paquet après l'échec d'authentification."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Connexion externe fermée."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Les connexions externes sont désactivées car le mot de passe est vide !"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Les connexions externes sont désactivées dans le fichier de configuration"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Nouvelle connexion externe acceptée"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERREUR : impossible d'accepter une nouvelle connexion externe"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 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 !"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Connexion au client : %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Version inconnue"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 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 de la même version."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "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 de développement ! *pfff* un crash potentiel a été évité"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Version du protocole invalide."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "L'étiquette de la version du protocole est manquante."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Trop de tentatives de connexion infructueuses ; veuillez essayer à nouveau dans %d secondes."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Authentification échouée : hachage spécifié comme mot de passe invalide."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr "Échec de l’authentification : le client a proposé une connexion externe chiffrée, mais n’a envoyé aucune clé utilisable."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr "Échec de l’authentification : cet aMule exige une connexion externe chiffrée, mais le client n’en a pas négocié une."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr "Échec de l’authentification : le client n’a pas pu confirmer la session chiffrée."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Authentification échouée : mot de passe erroné."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Authentification échouée : mot de passe manquant."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Requête invalide, veuillez vous authentifier d'abord."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Accès autorisé."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Envoi du message d'erreur \"%s\" au client."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, 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:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Échec de la commande du fichier .part à distance : hachage du fichier non trouvé : %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Hachage du fichier non trouvé : %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "ARGH ! Erreur de traitement de l'OpCode !"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Serveur non ajouté"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "serveur non trouvé : %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "il faut définir le serveur à supprimer"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k est désactivé dans les préférences."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr "Aucune adresse n'est encore connue pour cet ami."
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr "Ami introuvable."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr "Client introuvable."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr "EC_TAG_FRIEND_SHARED nécessite EC_TAG_FRIEND ou bien EC_TAG_CLIENT."
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Recherche en cours. Résultats dans un moment !"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Une recherche Web par une interface distante n'a aucun sens."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr "Une navigation n'est pas une recherche qui peut être lancée."
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Recherche en cours. Résultats dans un moment !"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Pas de points pour le graphique."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 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:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Connexion externe : fermeture demandée"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Arrêt déjà en cours."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ConnExt : ajout du lien '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Échec de %d liens sur %d (invalides ou déjà sur la liste)."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr "Vérification d'une nouvelle version a été empêchée ; veuillez réessayer sous peu."
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr "La vérification de la version est indisponible sur ce démon."
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Fichier non trouvé."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Nom de fichier invalide."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Impossible de renommer le fichier."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr "Impossible de basculer le client vers ce fichier."
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr "Impossible d’enregistrer le mot de passe d’amuleapi : %s"
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "La catégorie n'existe pas."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr "Requête de catégorie malformée."
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr "La catégorie par défaut ne peut être effacée."
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "Identifiant de la session de discussion manquant"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "Discussion introuvable"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "L'extraction des métadonnées multimédias est désactivée dans les préférences"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr "Le fichier n'est pas éligible pour l'extraction des métadonnées multimédias (pas un fichier audio/vidéo, ou un téléchargement incomplet)"
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "Message de discussion vide"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "Destinataire de discussion inconnu"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad est désactivé dans les préférences."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Déjà connecté à eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Connexion à eD2k…"
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Déjà connecté à Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Connexion à Kad…"
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Tous les réseaux sont désactivés."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Déconnecté de eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Déconnecté de Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Connexion externe : opcode reçu invalide : %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "opcode invalide (mauvaise version de protocole ?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Extension '%s' inconnue pour la commande '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Commande '%s' inconnue\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1877,7 +2389,7 @@
 "\n"
 "Cette commande ne prend pas d'argument.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1885,7 +2397,7 @@
 "\n"
 "Cette commande nécessite un argument.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1893,7 +2405,7 @@
 "\n"
 "Cette commande est incomplète, vous devez utiliser une des extensions ci-dessous.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1901,11 +2413,11 @@
 "\n"
 "Extensions disponibles :\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Commandes disponibles :\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1916,17 +2428,17 @@
 "Toutes les commandes sont insensibles à la casse.\n"
 "Tapez '%s <commande>' pour avoir des informations détaillées sur <commande>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Quitte l'application."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Montrer l'aide."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1934,7 +2446,7 @@
 "Pour avoir de l'aide sur une commande, tapez 'help <commande>'.\n"
 "Pour avoir la liste complète des commandes, tapez 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1945,46 +2457,46 @@
 "Utilisez '%s' pour la liste des commandes\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Erreur de syntaxe !"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Cette commande ne devrait pas avoir de paramètres."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Cette commande nécessite un paramètre."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Argument invalide."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Cette commande est incomplète."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Tapez '%s' pour avoir plus d'aide.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "C'est %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "C'est %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1992,7 +2504,7 @@
 "\n"
 "Création du client en cours…\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2001,7 +2513,7 @@
 "\n"
 "OK, fin de %s…\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2015,118 +2527,370 @@
 "\n"
 "Fin d'exécution…\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Montre ce texte d'aide."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Hôte où aMule tourne. (défaut : 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Port d'aMule pour les connexions externes. (par défaut : 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Mot de passe pour les connexions externes."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Configuration lue depuis le fichier."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Ne pas afficher de sortie sur stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Mode bavard - montre aussi les messages de débogage."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Change la localisation du programme (langue)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Écrit les options de la ligne de commande dans le fichier de configuration."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Créé le fichier de configuration à partir du fichier de configuration d'aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Affiche la version du programme."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr "Ne pas chiffrer la session de connexion externe. Le chiffrement est activé par défaut lorsque l’aMule distant le prend en charge ; le désactiver rend tout ce qui suit la connexion lisible et modifiable par toute personne présente sur le trajet."
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr "Forcer la compression ZLIB quelle que soit l'adresse IP de destination (utile lorsque le serveur est accessible via un tunnel VPN qui se résout en une adresse IP du réseau local)."
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr "Joindre une copie de toute la sortie de la console à ce fichier de journalisation (par défaut : <dossier-config>/amuleapi.log)."
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr "Ne pas écrire un fichier de journalisation ; seulement afficher sur la console."
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Détails du fichier"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% effectué"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f Kio/s"
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Aperçu"
+
+#: src/FileLaunch.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f Ko/s"
+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/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr "Le lecteur vidéo configuré est introuvable : %s"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr "Impossible d’ouvrir « %s » : le fichier n’est pas présent sur cet ordinateur."
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr "La prévisualisation d’un téléchargement inachevé nécessite un lecteur vidéo : le fichier partiellement téléchargé n’a pas de type associé que le système puisse ouvrir automatiquement. Vous pouvez en définir un dans Préférences → Général."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr "ERREUR : impossible d’ouvrir « %s » avec l’application par défaut."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ERREUR : échec de l'affichage de « %s » dans le gestionnaire de fichiers."
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "Mobile / 4G-5G (20 / 5 Mbit/s)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL (24 / 1 Mbit/s)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL (50 / 10 Mbit/s)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Câble (200 / 20 Mbit/s)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Fibre 300 (300 / 100 Mbit/s)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "Fibre Gigabit (1 000 / 1 000 Mbit/s)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr "Configuration initiale d’aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "Bienvenue sur aMule !"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+"Cette configuration rapide vous permettra de vous connecter. \n"
+"Vous pourrez modifier chacun de ces paramètres ultérieurement dans les Préférences."
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "Choisissez un pseudonyme que les autres pairs verront :"
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr "Connexion et bande passante"
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+"Choisissez l’option qui correspond le mieux à votre connexion Internet,\n"
+"ou définissez directement les limites de débit montant et descendant ci-dessous."
+
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "Débit de la connexion :"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr "Autre / définir manuellement"
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "Limite de téléversement (Kio/s, 0 = illimitée) :"
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "Limite de téléchargement (Kio/s, 0 = illimitée) :"
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "Réseaux et ports"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr "aMule peut utiliser deux réseaux. Nous vous recommandons de laisser les deux activés."
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Port TCP standard "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Port UDP étendu (recherche Kad / globale) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Activer UPnP pour la redirection de port du routeur"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+"Permet à aMule de demander à votre routeur de rediriger les ports indiqués ci-dessus afin que les autres \n"
+"pairs puissent vous joindre (« HighID »). Désactivez cette option si votre routeur \n"
+"ne prend pas en charge l’UPnP ou si vous redirigez les ports manuellement."
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr "Fichiers d'amorçage"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+"Pour commencer, aMule doit connaître quelques pairs. \n"
+"Sélectionnez les listes à télécharger maintenant :"
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Vos listes de pairs sont déjà en place – rien à télécharger."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Mise à jour automatique de la liste des serveurs au démarrage"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr "Intégrations (facultatif)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+"Choisissez comment aMule s’intègre à votre système. Vous pourrez \n"
+"modifier ces paramètres ultérieurement dans les Préférences."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "Lancer aMule automatiquement lorsque j'ouvre une session"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr "Enregistrer aMule pour les liens ed2k://"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr "Enregistrer aMule pour les liens magnet:"
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr "Uniquement les liens magnet compatibles eD2k. Laissez cette option désactivée si vous utilisez un client BitTorrent."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr "Ouvrir les fichiers .emulecollection avec aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr "Dossiers (facultatif)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+"Les valeurs par défaut conviennent à la plupart des utilisateurs. Modifiez-les si vous \n"
+"souhaitez enregistrer les téléchargements sur un autre disque, par exemple plus grand."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Dossier de destination des téléchargements"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Parcourir"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Tous les fichiers de ce répertoire sont partagés avec les autres pairs)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Dossier des fichiers de téléchargements temporaires"
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+"En fonction de cela, aMule autorisera jusqu’à %i sources par fichier \n"
+"et %i connexions de clients."
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr "Afficher à nouveau cet assistant de configuration au prochain démarrage d’aMule ?"
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr "Configuration non terminée"
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Échec de l'ouverture du fichier de la liste d'amis 'emfriends.met' pour la lecture !"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Échec de l'ouverture du fichier de la liste d'amis 'emfriends.met' pour l'écriture !"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr "Aucune adresse n'est encore connue pour l'ami « %s », impossible de les parcourir."
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "CRITIQUE - Pas de client dans StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Amis"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Afficher les &Détails"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Ajouter un ami"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Supprimer l'Ami"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Envoyer un &Message"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Voir les fichiers"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Établissement d'un Slot Ami"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr "Aucune adresse n'est encore connue pour l'ami « %s », impossible de lui envoyer un message."
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 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/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 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/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2134,977 +2898,1283 @@
 "Vous n'êtes pas autorisé à établir plus d'un slot ami.\n"
 " Seul un slot a été attribué."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Sélection multiple"
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Vous n'êtes pas autorisé à établir plus d'un slot ami.\n"
-" Seul un slot a été attribué."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Envoyer un message à l'utilisateur"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Message à envoyer :"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Supprimer des amis"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Envoyer un message"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Échanger vers ce fichier"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr "Légende des couleurs"
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "En attente : %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Demander un autre fichier"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Attente d'un slot d'émission"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "En attente : %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Émission en cours"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Aucun"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Non"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Oui"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Échec de l'ouverture de la base de données MaxMindDB « %s » : %s"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Téléchargement…"
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "Téléchargement HTTP annulé"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "L'URL de téléchargement ne peut pas être vide"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Échec de la création de la requête HTTP pour %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr "Téléchargement HTTP : corps de réponse vide pour %s"
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Impossible de déplacer le fichier téléchargé vers %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "%s téléchargé (%llu octets)"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr "L'URL %s a retourné : %i"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Échec du téléchargement HTTP pour %s : %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr "HTTP 401 non autorisé pour %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr "Le fichier GeoLite2-Country.mmdb existant a été migré vers %s"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr "IP2COuntry : MaxMind a été sélectionné en tant que source de GeoIP mais aucune clef de licence n'a été configurée. Ouvrez Préférences → IP2Country, collez votre clef de licence MaxMind gratuit et cliquez sur « Mettre à jour maintenant »."
-
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr "IP2Country : un lien (URL) personnalisé est sélectionné comme source de GeoIP, mais aucun lien n'est configuré. Ouvrez Préférences → IP2Country et fournissez un lien qui pointe vers un mmdb (ou bien un .gz / .tar.gz qui en contiendrait un)."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr "%s n'est pas un fichier MaxMindDB lisible – il sera supprimé. Une nouvelle copie sera téléchargée lors du prochain lancement, ou dès maintenant via Préférences -> IP2Country -> « Mettre à jour maintenant »."
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "IP2COuntry : MaxMind a été sélectionné en tant que source de GeoIP mais aucune clef de licence n'a été configurée. Ouvrez Préférences -> IP2Country, collez votre clef de licence MaxMind gratuit et cliquez sur « Mettre à jour maintenant »."
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "IP2Country : un lien (URL) personnalisé est sélectionné comme source de GeoIP, mais aucun lien n'est configuré. Ouvrez Préférences -> IP2Country et fournissez un lien qui pointe vers un mmdb (ou bien un .gz / .tar.gz qui en contiendrait un)."
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr "IP2Country : échec de la résolution de'lURL de téléchargement GeoIP."
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr "Télécharger un nouveau %s depuis %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "Échec du téléchargement du fichier %s, annulation de la mise à jour."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Impossible de supprimer le fichier %s, abandon de la mise à jour."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Impossible de renommer le fichier %s, abandon de la mise à jour."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "Mise à jour réussite de %s"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr "Erreur lors de la mise à jour de %s"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr "Échec du téléchargement DB-IP pour le mois actuel - essai à nouveau avec l'URL du mois précédent."
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Échec du téléchargement %s de %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Échec du chargement des données des pays pour '%s'."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Chargements des filtres IP 'ipfilter.dat' et 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Échec du chargement de fichier ipfilter.dat '%s', format inconnu."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "%u plage d'IP chargé depuis '%s'."
 msgstr1 "%u plages d'IP chargés depuis '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u ligne mal-formée a été mise de côté."
 msgstr1 "%u lignes mal-formées ont été mises de côté."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Impossible de renommer le nouveau fichier %s, abandon de la mise à jour."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP filter est prêt"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Amorçage depuis\n"
-"les clients connus"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Actuelle"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Moyenne totale"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Moyenne de la session"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Nœuds (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "IP invalide pour l'amorçage"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Port invalide pour l'amorçage"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Veuillez remplir tous les champs requis"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Message"
+
+#: src/KadDlg.cpp
 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/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Le faire supprimera les nœuds actuels et redémarrera la connexion à Kademlia."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Continuer ?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia : le mot-clé recherché est trop court"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia : le mot-clé de la recherche est toujours dans la liste de recherche : "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Impossible de lire le fichier nodes.dat - trop vieux. Cette version (0) n'est plus supportée."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "%u contact Kad lu"
 msgstr1 "%u contacts Kad lus"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Aucun contact trouvé, veuillez lancer l'amorçage, ou télécharger un fichier nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Seulement %d contact Kad disponible, nodes.dat non écrit"
 msgstr1 "Seulement %d contacts Kad disponible, nodes.dat non écrit"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "%d contact Kad écrit"
 msgstr1 "%d contacts Kad écrits"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Utilisateur Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr "La recherche Kad de note pour '%s' n'a pu être démarrée : Kad n'est pas connecté"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr "La recherche Kad de note pour '%s' n'a pu être démarrée : une recherche de note est déjà en cours d'exécution pour ce fichier"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr "La recherche Kad de note pour '%s' n'a pu être démarrée : le fichier n'est pas dans la liste des partages, la file des téléchargements ou les résultats de recherche"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr "La recherche Kad de note pour '%s' n'a pu être démarrée : une autre recherche Kad (par exemple une recherche de source) utilise déjà le hachage de ce fichier - veuillez réessayer sous peu"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr "La recherche Kad pour '%s' n'a pu être démarrée : échec de PrepareLookup"
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Nom de fichier"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Taille du fichier"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Ratio de partage"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Émis"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Demandé"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Accepté"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Sources complètes"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "AVERTISSEMENT : La liste de fichiers connus est corrompue, elle contient des entêtes invalides."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Échec du chargement de l'entrée dans la liste des fichiers connus, le fichier est peut être corrompu"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Entrée invalide dans la liste des fichiers connus, le fichier est peut être corrompu : "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Système par défaut"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanais"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabe"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturien"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Basque"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgare"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Catalan"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Chinois (Simplifié)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Chinois (Traditionnel)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Croate"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Tchèque"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Danois"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Hollandais"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Anglais (U.K.)"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "Anglais (É-U)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estonien"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finlandais"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Français"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galicien"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Allemand"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grec"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hébreux"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Hongrois"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italien"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japonais"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Coréen"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "Letton"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lituanien"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvégien (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polonais"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugais"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugais (Brésilien)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Roumain"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Russe"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slovène"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Espagnol"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Suédois"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turc"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukrainien"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Erreur inconnue %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Impossible d'obtenir la description d'erreur pour l'erreur %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Hachage"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Finalisation"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Terminé"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "En pause"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Erroné"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "En attente"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Vous devez entrer un mot de passe non vide."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 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:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr "Impossible de résoudre %s en une adresse IPv4."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Erreur de connexion"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
 msgstr "Connexion externe perdue — fermeture du programme."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "La connexion EC a échoué. Réponse vide."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr "Impossible de configurer le chiffrement de la connexion. Connexion fermée."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr "Le serveur n’a pas négocié de connexion chiffrée. Il peut s’agir d’une ancienne version d’aMule ne prenant pas en charge le chiffrement, ou la connexion a peut-être été altérée. Pour vous connecter sans chiffrement, désactivez-le dans les paramètres de connexion."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Connexion externe : Mauvaise réponse, échange raté. Connexion fermée."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Connexion externe : le démon a échoué à démontrer qu'il connaissait le mot de passe. Connexion fermée."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Succès ! Connexion établie à aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Succès ! Connexion établie."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Connexion externe : accès refusé car : "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Connexion externe : Échange raté."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr "Erreur lors de la création du socket UDP %s %d : %s"
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Processus ASIO %d démarré"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket : OK."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "ERREUR : Le port TCP n'a pas pu être mis en écoute."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "ERREUR : "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "AVERTISSEMENT : "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr "Métadonnées multimédias : aucun binaire ffprobe n'a été trouvé. Installez ffmpeg ou bien définissez le chemin vers ffprobe dans les préférences ; la durée, le taux binaire et le codec ne seront pas extraits."
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr "Métadonnées multimédias : %s n'existe plus, rien à extraire."
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr "Extraire les métadonnées multimédias avec ffprobe : %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr "Métadonnées multimédia : ffprobe a dépassé le délaai d'attente ou a été annulé pour %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr "Métadonnées multimédias : la sortie ffprobe d'une taille invraisemblablement grande pour %s sera ignorée"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr "Métadonnées multimédias : échec de l'exécution de ffprobe (%s) – vérifiez les réglages des métadonnées multimédias"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr "Métadonnées multimédia : échec de ffprobe (code %d) pour %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr "Métadonnées multimédias : ffprobe n'a rien trouvé d'utilisable dans %s"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 "Extraction des métadonnées multimédias terminée depuis %u fichier partagé (échec pour %u)"
+msgstr1 "Extraction des métadonnées multimédias terminée depuis %u fichiers partagés (échec pour %u)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 "Extraction des métadonnées multimédias terminée depuis %u fichier partagé"
+msgstr1 "Extraction des métadonnées multimédias terminée depuis %u fichiers partagés"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 "Échec lors de l'extraction des métadonnées multimédias pour %u autre fichier (non listé individuellement)"
+msgstr1 "Échec lors de l'extraction des métadonnées multimédias pour %u autres fichiers (non listés individuellement)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 "%u autre fichier partagé a disparu (non listé individuellement)"
+msgstr1 "%u autres fichiers partagés ont disparu (non listés individuellement)"
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Fermer"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Couper"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Copier"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Coller"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "Kio/s"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Pas de limite"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Afficher aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Cacher aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr "eD2k : "
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr "Connecté (LowID)"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr "Connecté (HighID)"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr "Kad : "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr "Connecté (derrière un pare-feu)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr "Serveur : "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr "IP du serveur : "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Non connecté"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP : %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Port TCP : %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Port TCP : Non prêt"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Port UDP : %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Port UDP : Non prêt"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Informations Client"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Limite d'émission"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Limite de téléchargement"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Afficher aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Déconnecter"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Cacher aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Se connecter"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "Ko/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Pas de limite"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Menu aMule"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Limites de vitesse :"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "Émission : Aucune"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "Émission : %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "Réception : Aucune"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "Réception : %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Vitesse de téléchargement : %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Vitesse d'émission : %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Pseudo : %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Aucun pseudo sélectionné !"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID Client : "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Nom du serveur : "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP du serveur : "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Non connecté"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Signature En Ligne : Activée"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Signature En Ligne : Désactivée"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Temps de fonctionnement : %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Fichiers partagés : %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Clients en attente : %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Reçu au total : %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Émis au total : %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Lien eD2k : "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr "%s créé sur le port %u"
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr "AVERTISSEMENT ! %s : paquet destiné à %s ignoré en raison d’une erreur (%s) lors de l’envoi."
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Envoyer"
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr "Coller des liens eD2k ou magnet ici"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "Ajouter des liens"
+
+#: src/muuli_wdr.cpp
 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 file de téléchargement."
 
-#: src/muuli_wdr.cpp:109
-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-vous à la fenêtre journal de l'onglet Serveur."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr "Les événements sont affichés ici. Pour une liste complète des évènements, reportez-vous au journal de l'onglet Réseaux."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Chargement…"
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Nombre d'utilisateurs du serveur auquel vous êtes connecté…"
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Utilisateurs : 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Utilisateurs connectés au serveur actuel et une estimation du nombre total d'utilisateurs."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "E : 0.0 | R : 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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 actuelles. S'il est présent, le chiffre entre parenthèses indique la surcharge dût à la communication du client."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Affiche l'état de connexion et les transferts actifs. Des flèches rouges indiquent que vous n'êtes actuellement pas connecté, des flèches jaunes que 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Non connecté…"
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Serveur connecté."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nom :"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Type"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Paramètres étendus"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtrage"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Type de fichier"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Tous"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Archives"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "Images CD"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr "Images disque"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Images"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programmes"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Textes"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Vidéos"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Extension"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Taille Minimum"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Octets"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "Ko"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "Mo"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "Go"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "Kio"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "Mio"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "Gio"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Taille Maximum"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Disponibilité"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtre :"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filtrer les résultats"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtrer"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Inverser les résultats"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Masquer les fichiers connus"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr "Réinitialiser les filtres"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Démarrer"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Plus"
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "Étendre"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr "Demande aux pairs Kad ayant déjà répondu d'élargir la recherche. Chaque clic interroge le pair le plus proche suivant pour obtenir plus de contacts (KADEMLIA_FIND_VALUE_MORE), faisant apparaître des correspondances de fichiers supplémentaires que la frontière alpha initiale de la recherche n'avait pas trouvées."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Arrêter"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Réception"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Télécharger dans la catégorie"
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "Effacer les résultats de recherche"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Réinitialiser les Champs"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Résultats"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Effacer les téléchargements terminés"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtre :"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Sources du fichier :"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Général"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Nom complet :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Nom complet"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "Fichier .met"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Fichier .met :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hachage :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Taille du fichier :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Statut du fichier .part :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Vu complet pour la dernière fois :"
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hachage"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Taille du fichier"
+
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Transfert"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Sources trouvées :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Sources en transfert :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Nombre de fichiers .part :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Disponibles :"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Taux de transfert :"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Temps de téléchargement actif : "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Transféré :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Taille reçue :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "État du fichier .part"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Vu complet pour la dernière fois"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Sources trouvées"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Sources en transfert"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Nombre de fichiers .part"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Disponibles"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Taux de transfert"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Temps de téléchargement actif"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Taille une fois terminée"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Gestion Intelligente de la Corruption (I.C.H.)"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Perdus par corruption :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Gagné avec la compression :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Paquets sauvés par l'I.C.H :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Perdus par corruption"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Gagnés avec la compression"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Paquets sauvés par l'I.C.H"
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr "Partage"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Demandes"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Demandes acceptées"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Données transférées"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Taux de partage"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Sources complètes"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "Partagé depuis"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "Dernier téléversement"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr "Infos média"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "Durée"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "Débit binaire"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "Codec"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "Artiste"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "Album"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Titre"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Noms des fichiers"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Récupérer le nom"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Nettoyage"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Commenter/Noter le fichier (Ce texte sera visible par tous les utilisateurs)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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."
@@ -3112,528 +4182,531 @@
 "Pour un film vous pouvez indiquer sa durée, l'histoire, la langue…\n"
 "et s'il s'agit d'un faux, vous pouvez prévenir les autres utilisateurs d'aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Qualité du fichier"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Non évalué"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Invalide / Corrompu / Contrefaçon"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Mauvais"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Assez bon"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Bon"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Excellent"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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…"
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "Obtenir depuis Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "En téléchargement, veuillez patienter…"
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Taille inconnue"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Informations Requises"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Adresse IP :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Renseignements complémentaires"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Nom d'utilisateur :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Hachage de l'utilisateur :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Hachage de l'utilisateur"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Vitesse de réception"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Actuelle"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Moyenne totale"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Moyenne de la session"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Vitesse d'émission"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Connexions"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Téléchargements actifs"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Connexions actives (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Envois actifs"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Statistiques"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Hachage de l'utilisateur :"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Logiciel client :"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Version du client :"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Logiciel client"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Version du client"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID Utilisateur"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP du serveur"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Adresse IP :"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Nom du serveur"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID Utilisateur :"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP du serveur :"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Nom du serveur :"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Brouillage :"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad :"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Brouillage"
+
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr "Extensions de protocole"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Transferts avec le client"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Requête actuelle :"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Vitesse moyenne d'émission :"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Vitesse moyenne de réception :"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Envoyé (session) :"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Reçu (session) :"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Envoyé (total) :"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Reçu (total) :"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Requête actuelle"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Vitesse moyenne d'émission"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Vitesse moyenne de réception"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Envoyé (session)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Reçu (session)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Envoyé (total)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Reçu (total)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Scores"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modificateur R/E :"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Identification sécurisée :"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Rang dans la file d'attente :"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Score de la file d'attente :"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Identification sécurisée"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Rang dans la file d'attente"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Score de file d'attente"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Pseudo"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - La Mule multiplateforme"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Langue : "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Délai avant l'apparition des infobulles."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Ceci spécifie la langue utilisée dans les commandes."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Vérifier les nouvelles versions au démarrage"
-
-#: src/muuli_wdr.cpp:1218
-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:1225
-msgid "Start aMule automatically when I log in"
-msgstr "Lancer aMule automatiquement lorsque j'ouvre une session"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
+msgstr "Vérifier les nouvelles versions périodiquement"
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr "Si vous activer ceci, aMule vérifiera si de nouvelles versions sont disponibles au démarrage et une fois par jour pendant son exécution"
 
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr "Enregistre une entrée de lancement automatique auprès du système d'exploitation pour qu'aMule se lance à l'ouverture d'une session. Si vous déplacez le binaire d'aMule, lancez-le par la suite une fois manuellement pour que l'entrée soit actualisée."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr "Fait d'aMule le gestionnaire par défaut des liens ed2k:// pour qu'un clic sur un tel lien sur votre navigateur ou gestionnaire de fichiers l'ouvre ici."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr "aMule ne gère que les magnet compatibles avec eD2k (contenant xt=urn:ed2k:). Les magnet BitTorrent ne sont PAS pris en charge et un clic sur un tel lien échouera silencieusement. Si vous utilisez un client BitTorrent (Transmission, qBittorrent, etc.), laissez cela désactivé."
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr "L’ouverture d’une collection met en file d’attente tous les liens eD2k qu’elle contient. Sous Windows, cela ajoute aMule à la liste « Ouvrir avec » et ne le définit comme application par défaut que si aucun autre programme ne s’est déjà associé à ce type de fichier."
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Démarrer minimisé"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Activer ceci minimise immédiatement aMule lors de son lancement."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Confirmation en quittant"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Confirmation de fermeture d'aMule."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Activer l'icône de barre des tâches"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 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:1242
+#: src/muuli_wdr.cpp
 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:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Icône de réduction en zone de notification"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "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:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "Afficher des notifications lorsque le téléchargement est terminé"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "Si vous activez cette option, aMule affichera des notifications une fois le téléchargement terminé."
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr "Se souvenir de l'historique des recherches"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr "Conserve une liste déroulante de vos anciens termes de recherche dans le champ Nom de l’onglet Recherche. Cette liste mémorise les requêtes saisies, et non les résultats obtenus."
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Délai d'affichage des info-bulles : "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "secondes"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Sélection du navigateur"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "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:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Parcourir"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Ouvrir si possible dans un nouvel onglet"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Lecteur vidéo"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Limites de la bande passante"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Émission"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Attribution de slot"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Ports"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Port TCP standard "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Ceci est le port eD2k standard et ne peut pas être activé."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Port UDP pour les requêtes des serveurs (TCP+3) :"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Port UDP étendu (recherche Kad / globale) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Ce port UDP est utilisé pour les requêtes eD2k étendues et pour le réseau Kad"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Activer UPnP pour la redirection de port du routeur"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "Port TCP UPnP (Facultatif) :"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Lier l'adresse locale à une IP (vide pour toutes) :"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr "Lier à une interface réseau (vide pour toutes) :"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr "Utilisateurs avancé uniquement : affecter tout le trafic d'aMule à une interface réseau unique, choisie depuis la liste ou bien par la saisie de son nom (par exemple tun0, eth0, en0) ou son index. Contrairement à la liaison à une adresse IP, cela empêche le trafic de fuiter par la route par défaut - utile avec un VPN. Ne nécessite pas de privilèges élevés."
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Sources maximales par fichier téléchargé :"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Connexions simultanées maximales :"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Se connecter automatiquement au démarrage"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Reconnecter en cas de déconnexion"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Supprimer les serveurs inactifs après"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr "Les serveurs statiques ne sont jamais enlevés, même lorsqu'ils sont injoignables."
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "essais"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Mise à jour automatique de la liste des serveurs au démarrage"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Liste"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Mise à jour de la liste des serveurs dès la connexion à un serveur"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Mise à jour de la liste des serveurs dès la connexion d'un client"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Utiliser le système de priorité"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Utiliser la vérification du LowID à la connexion"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Connexion sûre"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Se connecter automatiquement seulement sur les serveurs statiques"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Mettre les serveurs ajoutés manuellement en priorité haute"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Gestion Intelligente de la Corruption (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Activer"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Ajouter les fichiers à télécharger en mode Pause"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Ajouter les fichiers à télécharger en priorité automatique"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 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:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr "Mode « endgame » : basculer vers les sources plus rapides pour les blocs finaux"
+
+#: src/muuli_wdr.cpp
 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:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "De la même catégorie"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "Dans l'ordre alphabétique"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Réserver de l'espace disque pour les nouveaux fichiers"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 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:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr "Créer les nouveaux fichiers sous forme de fichiers creux"
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr "Les fichiers partiels creux n’occupent de l’espace disque que pour les parties déjà téléchargées ; l’espace libre est donc utilisé progressivement au fur et à mesure que le fichier se remplit. Désactivez cette option pour utiliser un fichier ordinaire à la place — utile lorsque les fichiers creux ne sont pas pris en charge, sont lents ou sont mal gérés par les outils de sauvegarde ou de déduplication. Cette option ne s’applique que lorsque le serveur aMule fonctionne sous Windows ; sous GNU/Linux et macOS, les fichiers partiels sont de toute façon creux et ce réglage n’a aucun effet."
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Stoppe les téléchargements lorsque l'espace disponible est atteint "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Entrez ici l'espace disque minimum désiré."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Sauver 10 sources pour les fichiers rares (< 20 sources)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Émission"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Ajouter les nouveaux fichiers partagés en priorité automatique"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Dossier de destination des téléchargements"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Gestion Intelligente de la Corruption (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Activer"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+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 src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr "Extraction des métadonnées des médias"
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "Extraire la durée / le débit binaire / le codec depuis les fichiers audio et vidéo partagés"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr "Lorsque cette option est activée, aMule exécute ffprobe sur chaque fichier média partagé pour remplir les colonnes Durée / Débit binaire / Codec que les autres clients voient quand ils trouvent le fichier lors d'une recherche. Nécessite que ffmpeg (le binaire ffprobe) soit installé."
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr "Emplacement de ffprobe :"
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr "Chemin complet vers le binaire ffprobe. Laisser vide pour qu'aMule le détecte automatiquement au démarrage."
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr "Détecter"
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr "Rechercher les binaires de ffprobe aux emplacements par défaut et compléter le champ emplacement."
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
@@ -3641,599 +4714,691 @@
 "Les téléchargements terminés sont stockés ici. Tous les fichiers de ce répertoire sont automatiquement partagés avec les autres pairs.\n"
 "Si ce répertoire contient également des fichiers que vous ne souhaitez pas partager, indiquez un sous-répertoire réservé à aMule."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr "Choisissez le répertoire où les téléchargements terminés seront enregistrés. Tous les fichiers de ce répertoire seront partagés avec les autres pairs."
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr "(Tous les fichiers de ce répertoire sont partagés avec les autres pairs)"
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Dossier des fichiers de téléchargements temporaires"
-
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "Dossiers partagés"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr "(Les répertoires partagés par le noyau. Entrer un chemin pour en ajouter un.)"
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr "Le chemin absolu d'un répertoire sur la machine du noyau, par exemple /home/utilisateur/shared"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr "Récursif"
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr "Partager chaque sous-répertoire sous celui-ci, y compris ceux qui seront créés ultérieurement."
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Enlever"
+
+#: src/muuli_wdr.cpp
 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:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Partager les fichiers cachés"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr "Analyser automatiquement à nouveau les répertoires partagés pour rechercher des modifications"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr "Suivre les liens symboliques dans les répertoires partagés"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr "Exclure les fichiers correspondant à :"
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr "Motifs de caractères génériques séparés par '|', par exemple .DS_Store|Thumbs.db|*.tmp. Les fichiers dont le nom correspond ne seront pas partagés. La correspondance est insensible à la casse."
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr "Les motifs sont des expressions régulières"
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr "Lorsque l'option est activée, la totalité du champ est une expression régulière ('|' indique une alternative). Lorsque l'option est désactivée, il s'agit d'une liste de caractères génériques séparés par des '|'."
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr "Afficher combien de fichiers partagés le motif actuel exclurait."
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr "Lorsque les fichiers du noyau connecté se trouvent sur une autre machine, associez le préfixe de chemin qu’il signale à l’emplacement où ce système de fichiers est accessible depuis cette machine (par exemple, un partage réseau), afin que les actions « Ouvrir » et « Afficher dans le dossier » fonctionnent."
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr "Correspondances de chemins"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr "Préfixe distant"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr "Un préfixe de chemin tel que le noyau le signale, par exemple /home/user/downloads/incoming"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr "Préfixe local"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr "Emplacement où ce même dossier est accessible depuis cet ordinateur, par exemple un partage réseau monté"
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Graphiques"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Délais de rafraîchissement : 5 s"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Temps pour la courbe de la moyenne : 100 min"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Échelle du graphique des connexions : 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Échelle des graphiques de réception :"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Échelle des graphiques d'envoi :"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Couleurs : "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Fond"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Quadrillage"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Téléchargement actuel"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Téléchargement moyen total"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Téléchargement moyen sur la session"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Envoi actuel"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Envoi moyen total"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Envoi moyen sur la session"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Connexions actives"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr "Barre de vitesse dans l'icône de barre des tâches"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Nœuds Kad actuels"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Nœuds Kad total"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Nœuds Kad pour la session"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Sélectionner"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Arbre"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Nombre de versions client affichées (0=illimité)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! AVERTISSEMENT !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Nombre maximum de nouvelles connexions / 5 secs"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr "Recherche concurrentes de sources Kad"
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr "Intervalle entre les nouvelles recherches de sources Kad (en minutes)"
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr "Intervalle entre les nouvelles demandes de sources Kad (en minutes)"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Taille du fichier de tampon : 240000 octets"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr "Utiliser MMAP : « memory-mapped file access », c'est-à-dire accès aux fichiers mappés dans la mémoire (utilise moins de mémoire)"
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr "Fait correspondre les fichiers partiels dans la mémoire au lieu de les mettre en tampon sur la pile, baissant l'empreinte mémoire du processus. Peut réduire la vitesse de téléchargement sur certains disques ; idéal pour les hôtes disposant de peu de mémoire ou pour ceux qui téléversent beaucoup."
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Taille de la file d'attente d'envoi : 5000 clients"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervalle de rafraîchissement de la connexion serveur : Désactivé"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Désactiver la mise en veille programmé de l'ordinateur"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Thème à utiliser : "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Afficher le \"Gestionnaire rapide de liens eD2k \" dans chaque fenêtre."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Afficher des infos supplémentaires sur les onglets des catégories"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Afficher la version de l'application dans le titre"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Afficher les taux de transfert dans la barre de titre"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Avant le nom de l'application"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Après le nom de l'application"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Afficher la surcharge de la bande passante"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Orientation de la barre d'outils verticale"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr "Tri des colonnes en temps réel (réorganisation automatique des lignes à mesure que leurs valeurs changent)"
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Fichiers à télécharger en file d'attente"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Afficher le pourcentage de progression"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Afficher la barre de progression"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plat"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Relief"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Triage automatique des fichiers (augmente la charge du CPU)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Paramètres de Connexion Externe"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Accepter les connexions externes"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP de l'interface d'écoute :"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 champ vide ou 0.0.0.0 signifiera toutes les interfaces."
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Port TCP :"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 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:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr "Exiger des connexions chiffrées (rejette les clients qui ne peuvent pas chiffrer)"
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr "Paramètres du serveur aMule API"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr "Exécuter amuleapi (API REST) au démarrage"
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "Port HTTP :"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr "L'interface sur laquelle le serveur HTTP d'amuleapi écoute. 127.0.0.1 (par défaut) n'accepte que les connexions locales  ; utilisez 0.0.0.0 ou bien une adresse IP spécifique pour l'exposer à d'autres hôtes (définissez un mot de passe administrateur ci-dessous)."
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr "Taper un mot de passe pour le définir ou le modifier. Les mots de passe enregistrés ne peuvent être affichés, donc laisser ce champ vide conserve l'existant."
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "Mot de passe administrateur"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "Un mot de passe est défini."
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "Activer l'accès invité"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr "Les sessions invitées peuvent lire l'état et les listes, mais ne peuvent rien modifier. Désactiver cette option efface le mot de passe invité."
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "Mot de passe invité"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Paramètres du serveur Web"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "Démarrer le serveur web au démarrage"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr "Démarrer le serveur web au démarrage (obsolète)"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Template web"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Mot de passe administrateur"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Activer l'accès utilisateur sans privilèges"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Mot de passe sans privilèges"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 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:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Port TCP UPnP du serveur web (Facultatif)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Intervalle de rafraîchissement (en secondes)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Activer la compression Gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr "Réinitialiser la page aux valeurs par défaut"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr "Réinitialiser les réglages sur la page actuelle à leurs valeurs par défaut."
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Cliquer ici pour appliquer tous les changements effectués dans les Préférences."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Annule tous les changements effectués dans les Préférences."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Titre :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Commentaire :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Répertoire entrant :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Changer la priorité des nouveaux fichiers assignés :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Répertoire de téléchargement"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Modifier la priorité des nouveaux fichiers assignés"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Ne rien changer"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Choisir la couleur pour cette Catégorie (actuellement sélectionnée) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Réinitialiser"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Choisir la couleur pour cette Catégorie (actuellement sélectionnée)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Cliquer ici pour effacer le journal."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Cliquer ici pour mettre à jour la liste des serveurs à partir de l'URL…"
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Liste des serveurs"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Ajouter un serveur manuellement : Nom"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Entrer ici le nom du nouveau serveur"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP : Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Entrer ici le port du serveur."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Ajouter manuellement un serveur (remplir les champs à gauche avant)…"
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Journal d'aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Infos Serveur"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Infos ED2K"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Infos Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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…"
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nœuds (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Statistiques des nœuds"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Amorçage"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nouveau nœud"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP :"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Port :"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "Amorçage depuis les clients connus"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Déconnecter Kad"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr "Amorçage depuis le nœud : IP"
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Entrer ici l'adresse IP du nœud, avec le format x.x.x.x."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Utiliser l'Identification Utilisateur Sécurisée (SUI)"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Brouillage de protocole"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Supporter le brouillage de protocole"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Cette option active le brouillage de protocole, cela permet à aMule d'accepter les connexions brouillées des autres clients."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Utiliser le brouillage pour les connexions sortantes"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Avec cette option, aMule utilise le brouillage de protocole lors des connexions aux autres clients/serveurs."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Accepter seulement les connexions brouillées"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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 connexions brouillées. Vous aurez moins de sources, mais tout votre trafic sera brouillé"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Tout le monde"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Personne"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Qui peut voir mes fichiers partagés :"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Filtrage des IP"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtrage des clients"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtrage des serveurs"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Recharger la liste"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL :"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Mettre à jour maintenant"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Mise à jour d' IPFilter au démarrage"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Niveau de filtrage :"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Toujours filtrer les IPs LAN"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Prise en charge paranoïaque des IPs qui ne se correspondent pas"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Rejette le paquet si l'IP du client est différente de l'ip d'où le paquet est envoyé. À utiliser avec prudence."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr "Rejette un paquet lorsque son IP source diffère de l'IP que le client prétend avoir (vérification anti-usurpation). Désactivez seulement si cela provoque des problèmes de connexion."
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Utiliser un ipfilter.dat système si disponible"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "S'il n'y a pas de fichier ipfilter.dat local, autoriser l'utilisation d'un fichier ipfilter système."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Activer la Signature En Ligne"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Active l'écriture du fichier de signature en ligne, qui peut-être utilisé par des applications extérieures pour créer des signatures, etc."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Fréquence de mise à jour (Secondes) :"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 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:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Sauver le fichier de signature en ligne dans : "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Voir les drapeaux des pays pour les clients"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr "Afficher la colonne des drapeaux des pays dans les vues des transferts, des files d'attente et de recherche. Nécessite une base de données MMDB GeoIP valide (cf. ci-dessous)."
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr "Base de données"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 msgid "Source:"
 msgstr "Source :"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr "DB-IP (gratuit, pas de compte)"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr "MaxMind GeoLite2 (gratuit, compte nécessaire)"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr "URL personnalisé"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr "Choisissez quel fournisseur procure la base de données GeoIP MMDB. DB-IP est la valeur par défaut - ne nécessite pas de compte. MaxMind nécessite un compte gratuit + une clef de licence. Utilisez un URL personnalisé pour pointer vers tout autre hôte MMDB (par exemple un miroir local)."
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4245,11 +5410,11 @@
 "Les données IP vers pays par DB-IP.com - https://db-ip.com\n"
 "Licence : Creative Commons Attribution 4.0 - https://creativecommons.org/licenses/by/4.0/deed.fr"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr "Clef de licence :"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4265,11 +5430,11 @@
 "Licence : CLUF MaxMind GeoLite2 - https://www.maxmind.com/en/geolite2/eula\n"
 "Nécessite une attribution et la création d'un compte ; actualisez au moins tous les 30 jours."
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
 msgstr "URL de téléchargement :"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
@@ -4279,504 +5444,569 @@
 "L'URL peut contenir un identifiant et mot de passe (https://utilisateur:motdepasse@hôte/...) \n"
 "La licence et les conditions d'attribution sont définies par l'URL d'origine - vous en êtes responsable."
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr "Télécharger la base de données GeoIP depuis la source sélectionnée."
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr "Mise à jour automatique au démarrage"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr "Télécharger à nouveau la base de données GeoIP depuis la source sélectionnée chaque fois qu'aMule démarre."
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrer les messages entrant (sauf la discussion en cours) :"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtrer tous les messages"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 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:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtrer les messages des clients inconnus"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrer les messages contenant (utiliser ',' comme séparateur) :"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "ajouter ici les mots qu'aMule doit filtrer : blocage des messages les contenant"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Afficher les messages reçus dans le journal"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Commentaires"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrer les commentaires contenant (utiliser ',' comme séparateur) :"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Activer l'authentification"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Active/Désactive l'authentification par nom d'utilisateur/mot de passe"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Nom d'utilisateur : "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Nom d'utilisateur pour se connecter au proxy"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Mot de passe :"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Mot de passe pour se connecter au proxy"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Activer le Proxy"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Active/Désactive le support proxy"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Type de proxy :"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Hôte du proxy :"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Type de serveur mandataire"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Hôte du serveur mandataire"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Nom de l'hôte du proxy"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Port du proxy :"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Port du serveur mandataire"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Numéro du port du proxy"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Activer l'authentification"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Active/Désactive l'authentification par nom d'utilisateur/mot de passe"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Nom d'utilisateur pour se connecter au proxy"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Mot de passe pour se connecter au proxy"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Se connecter à :"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Connexion distante à aMule"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Nom d'utilisateur"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Se rappeler de ces réglages"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "Chiffrer la connexion (recommandée)"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr "Forcer la compression ZLIB"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Activer l'historique du mode de débogage bavard."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Seulement vers le fichier journal"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Catégories des messages :"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "En attente…"
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Ajouter des fichiers à importer"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Réessayer avec la sélection"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Supprimer la sélection"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Types d'événements"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Envois Actifs"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Pourcentage du total de fichiers"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Afficher les clients pour"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Fichiers sélectionnés"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Envois actifs seulement"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Afficher les clients pour"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Recharger :"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Recharge vos fichiers partagés"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Envoie le message spécifié."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Ferme cette session de discussion."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Se connecter à n'importe quel serveur et/ou Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "Annuler %s"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Fichiers partagés"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "Déconnecter %s"
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "Se connecter à %s"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Désactivé %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "octet"
 msgstr1 "octets"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "ko"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "To"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "Tio"
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "octet/sec"
 msgstr1 "octets/sec"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "Mo/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "Mio/s"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "s"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "min"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "heures"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Jours"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "jours"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr "%s :"
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "tous"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "tous les autres"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Incomplet"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Archive"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Texte"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Actif"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Utilisation du répertoire de config : %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr "Cette source n'a pas la partie"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr "Vous et cette source avez tous les deux la partie"
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr "En cours de téléchargement depuis cette source"
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr "La partie suivante qui sera demandée à cette source"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr "Cette source a la partie et vous en avez encore besoin"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr "Ce pair a déjà la partie"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr "Ce pair n'a pas la partie"
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr "Aucune autre source n'a cette partie"
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr "Une autre source a cette partie"
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr "%u ou davantage d'autres sources ont cette partie"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr "Déjà relu et hachage effectué"
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr "Doit encore être lu"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr "Un bloc par partie du fichier en cours de téléchargement."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr "Un bloc par partie du fichier partagé."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Un bloc par partie du fichier partagé, coloré en fonction du nombre de sources qui le possèdent."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Un bloc par partie du fichier partagé, affichant jusqu'où le hachage à nouveau a lu."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr "Entre-temps, cela s'assombrit à mesure que d'autres sources sont ajoutées"
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Attente de la mort du processus de conversion du fichier .part…"
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Importation %s : %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Lecture du répertoire temporaire"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 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/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Création du fichier de destination"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, 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)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Récupérations des informations du fichier de téléchargement source"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Ajout du téléchargement et sauvegarde du nouveau fichier .part"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importer les fichiers .part"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "État"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Hachage du fichier"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Disque : %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Voulez-vous que les fichiers sources d'une importation de téléchargement réussie soient supprimées ?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Supprimer les sources ?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "Erreur : Impossible de créer le fichier .part"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, 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:409
+#: src/PartFile.cpp
 #, 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:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "ERREUR : Version du fichier part.met invalide : %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Erreur : %s (%s) est corrompu (mauvaises étiquettes : %s), impossible de charger le fichier."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Tentative de récupération des infos du fichier…"
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Impossible de récupérer les infos du fichier :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Échec de l'ouverture de %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "AVERTISSEMENT : %s a pu être corrompu (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, 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:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Erreur d'E/S lors de la sauvegarde du fichier .part : "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr "0/inconnu octet écrit sur « %s » -- le fichier .part.met existant sera préservé."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "%i source seed sauvegardé pour le fichier .part : %s (%s)"
 msgstr1 "%i source seeds sauvegardés pour le fichier .part : %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Impossible de lire le fichier seeds pour le fichier partiel %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Une partie corrompue trouvée (%d) dans %d parties du fichier %s - FileResultHash |%s| FileHash |%s|"
 msgstr1 "Une partie corrompue trouvée (%d) dans %d partie du .part %s - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Partie complète (%i) trouvée dans %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Ré-hachage de %s terminé"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, 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:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Téléchargement terminé : %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4785,306 +6015,153 @@
 "Téléchargement suivant terminé :\n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Fichier supprimé : %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "AVERTISSEMENT : Impossible de calculer le hachage de la partie téléchargée. Ensemble de hachage incomplet pour '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "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/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr "La partie %u de «%s » est marqué comme complétée mais le fichier partiel est plus petit qu'attendu (possède %llu octets, nécessite %llu octets) ; réouverture de la fenêtre de téléchargement."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "En cours d'allocation"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Espace disque insuffisant"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Téléchargé"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ERREUR : Impossible d'ouvrir fichier .part : '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Système par défaut"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanais"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabe"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturien"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Basque"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgare"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Catalan"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Chinois (Simplifié)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Chinois (Traditionnel)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Croate"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Tchèque"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danois"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Hollandais"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Anglais (U.K.)"
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr "Anglais (É-U)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estonien"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finlandais"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Français"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galicien"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Allemand"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grec"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hébreux"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Hongrois"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italien"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italien (Suisse)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japonais"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Coréen"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituanien"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvégien (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polonais"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugais"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugais (Brésilien)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Roumain"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Russe"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slovène"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Espagnol"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Suédois"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turc"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukrainien"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr "Échange de sources étendue"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr "Traversée de NAT (uTP)"
+
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr "Récupération d'informations sur le pote"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr "Traversée de NAT (QUIC)"
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Changer de langue"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Il n'y a pas de traductions installées pour aMule"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Pas de langues disponibles"
-
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "pas d'option disponible"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr "Correspondance de chemin invalide trouvée, on passe"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Catégorie invalide trouvée, on passe"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Le port par défaut sera utilisé (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Connexion"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Répertoires"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Serveurs"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Fichiers"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Sécurité"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interface"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr "IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtres"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Contrôles à distance"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Signature en ligne"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Événements"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Débogage"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5094,15 +6171,15 @@
 "    %PARTFILE - chemin complet vers le fichier\n"
 "    %PARTNAME - nom du fichier seulement"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr "L'icône de la barre système nécessite libayatana-appindicator3 au moment de la compilation."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr "Non disponible sous Wayland : le protocole n'informe pas lorsqu'une fenêtre est minimisée, cette option ne peut donc intercepter le bouton de minimisation du système. Solution de contournement : lancez aMule avec `GDK_BACKEND=x11` pour utiliser XWayland à la place."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5118,26 +6195,42 @@
 "aMule fonctionnera bien en ne modifiant pas\n"
 "ces réglages."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, 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:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Type de proxy auquel vous êtes connecté"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "Aucun mot de passe défini."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "L'accès invité nécessite un mot de passe. Tapez un mot de passe dans le champ mot de passe invité, ou bien désactivez l'accès invité."
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5145,31 +6238,43 @@
 "aMule doit être redémarré pour activer ces changements : \n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- Port TCP changé.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- Port UDP changé.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr "- La liaison de Interface réseau modifiée.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Port de connexion externe changé.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Consentement de connexion externe changé.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Interface de connexion externe changé.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- Support du brouillage de protocole changé.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr "- Les réglages de serveur mandataire ont été modifiés (nécessaires pour les transferts HTTP).\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr "- les réglages amuleapi modifiés.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5177,27 +6282,32 @@
 "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/PrefsUnifiedDlg.cpp:862
-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
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr "Le mot de passe amuleapi n'a pu être sauvegardé : %s"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Langue changée.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Dossier temporaire changé.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- Réseau ED2K activé.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr "Le motif d'exclusion de fichiers partagés n'est pas une expression régulière valide. Le filtre a été laissé désactivé."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "Expression régulière invalide"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5205,7 +6315,7 @@
 "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/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5213,7 +6323,7 @@
 "Kad ne démarrera pas si votre port UDP est désactivé.\n"
 "Activez le port UDP ou désactivez Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5223,19 +6333,66 @@
 "Vous DEVEZ redémarrer aMule maintenant.\n"
 "Si vous ne le faites pas, ne vous plaignez pas si des bogues surviennent.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr "Échec de l'enregistrement d'aMule pour un lancement automatique à l'ouverture d'une session. Le dépôt de lancement automatique est peut-être en lecture seule."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr "Échec de l'effacement de l'entrée du lancement automatique à l'ouverture d'une session."
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr "Lancement automatique"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr "Enregistrer le type de fichier"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr "Enregistrer le gestionnaire d'URL"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr "aMule ne gère que les magnet compatibles avec eD2k. Si vous remplacez le gestionnaire de magnet actuel (%s), les liens magnet BitTorrent cesseront de fonctionner - aMule ne peut télécharger du contenu BitTorrent. Continuer ?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr "Une autre application ouvre actuellement les liens .emulecollection (%s). La remplacer par aMule ?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr "Une autre application gère les liens (%s) par défaut. La remplacer par aMule ?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "Échec de l'enregistrement d'aMule pour les fichiers .emulecollection. Le dépôt d'enregistrement est peut-être en lecture seule."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr "Impossible de supprimer l'enregistrement du type de fichier."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "Échec de l'enregistrement d'aMule en tant que gestionnaire des URL. Le dépôt d'enregistrement est peut-être en lecture seule."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr "Impossible de supprimer l'enregistrement du gestionnaire d'URL."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Le serveur web et aMule API nécessitent l'activation des connexions externes."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr "Le serveur web d'aMule est obsolète. Envisagez d'utiliser aMule API à sa place."
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5245,41 +6402,64 @@
 "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/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Fichiers temporaires"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Fichiers réceptionnés"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Signatures En Ligne"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Choisir un dossier pour %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Exclurait %u fichier sur %u fichier partagé"
+msgstr1 "Exclurait %u fichiers sur %u fichiers partagés"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Chercher un lecteur vidéo"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Choisir un navigateur"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr "Sélectionner le binaire ffprobe"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Exécutable%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr "ffprobe n'a pas été trouvé sur PATH ou dans les emplacement standards d'installation. Installez ffmpeg (qui fournit ffprobe) ou bien utilisez Parcourir pour choisir un binaire manuellement."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr "Réinitialiser les réglages sur cette page à leurs valeurs par défaut ?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr "Réinitialiser aux valeurs par défaut"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Éditer la liste des serveurs"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5287,114 +6467,114 @@
 "Ajoutez ci-dessous des URL pour télécharger des fichiers server.met.\n"
 "Seulement une URL par ligne."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr "Échec de la mise à jour IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr "Données fournies par MaxMind GeoLite2"
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr "Source personnalisée"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr "Données fournies par DB-IP.com"
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr "État : %s chargé"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "État : %s - %s chargé"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr "État : échec du chargement - cliquez sur « Mettre à jour maintenant » pour actualiser."
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr "État : introuvable - cliquez sur « Mettre à jour maintenant » pour télécharger."
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Délais de rafraîchissement : %d seconde"
 msgstr1 "Délais de rafraîchissement : %d secondes"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Temps pour le graphe des moyennes : %d minute"
 msgstr1 "Temps pour le graphe des moyennes : %d minutes"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Échelle du graphique des connexions : %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Taille du tampon de fichiers : %d octet"
 msgstr1 "Taille du tampon de fichiers : %d octets"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Taille de la fille d'attente d'émission : %d client"
 msgstr1 "Taille de la fille d'attente d'émission : %d clients"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Intervalle de rafraîchissement de la connexion serveur : %d minute"
 msgstr1 "Intervalle de rafraîchissement de la connexion serveur : %d minutes"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Intervalle de rafraîchissement de la connexion serveur : Désactivé"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "désactivé"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Exécuter la commande lors de l'événement '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Activer l'exécution de la commande sur le noyau"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Commande du noyau :"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Activer l'exécution de la commande sur l'interface graphique"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Commande de l'interface graphique :"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Les variables suivantes seront remplacées :"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
@@ -5402,1073 +6582,1324 @@
 "Les répertoires suivants semblent être des répertoires système ou des emplacements sensibles.\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr "Les partager récursivement publiera chaque fichier contenu dans les sous répertoires sur les réseaux eD2k/Kad. Êtes-vous sûr de vouloir faire cela ?"
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr "Confirmer les dossiers partagés"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
 msgstr "Rechargement des fichiers partagés…"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr "Analyse des sous-répertoires…"
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr "Mise à jour des dossiers partagés"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr "%u répertoires analysés…"
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Rechargement des fichiers partagés : %u fichiers analysés"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr "Dossier partagé"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr "Le préfixe distant et local doivent tous les deux être renseignés."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr "Ce préfixe distant est déjà mappé."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr "Choisir le dossier local"
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "Effacer l'historique des recherches"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr "Effacer l'historique des recherches enregistré ? Cette opération est irréversible."
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Avertissement dans la recherche"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "Lorsque eD2k et Kademlia sont désactivés tous les deux, il est impossible d'effectuer une recherche."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "Erreur de recherche"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
-msgstr "Recherche Kad : résultats étendus demandés à un pair supplémentaire."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
+msgstr ""
+"Une recherche eD2k est déjà en cours d'exécution. Démarrer une nouvelle recherche l'arrêtera, car le protocole eD2k n'autorise qu'une recherche à la fois.\n"
+"\n"
+"Les résultats déjà trouvés seront conservés ; seuls les nouveaux cesseront d'arriver.\n"
+"\n"
+"Démarrer la nouvelle recherche quand même ?"
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr "Recherche Kad : plus aucun pair à recontacter pour plus de résultats (limite atteinte ou aucune réponse pour l'instant)."
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr "Recherche en cours"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Avertissement dans la recherche"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Principal"
 
-#: src/SearchList.cpp:313
-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/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr "Seule les %us plus récentes des %u recherches ouvertes sont enregistrées dans %s."
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr "Seuls les %u résultats sur %u sont enregistrés pour la recherche « %s »."
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "AVERTISSEMENT : la liste de recherches enregistrée est corrompue, elle contient un en-tête invalide."
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Entrée invalide dans la liste des recherches enregistrée, le fichier est peut-être corrompu"
+
+#: src/SearchList.cpp
 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/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "Pas de mot-clé pour la recherche Kad - abandon"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Erreur imprévue lors de la tentative de recherche Kad : "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID du fichier"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr "La recherche a dépassé le délai d'attente : le serveur n'a pas répondu."
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr "Durée"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Recherche Kad : résultats étendus demandés à un pair supplémentaire."
 
-#: src/SearchListCtrl.cpp:105
-msgid "Bitrate"
-msgstr "Débit binaire"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Recherche Kad : plus aucun pair à recontacter pour plus de résultats (limite atteinte ou aucune réponse pour l'instant)."
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "Erreur %u : %s\n"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Télécharger dans la catégorie"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ID du fichier"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Obtenir %s pour ce fichier"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "Tout développer"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "Tout réduire"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Chercher les fichiers liés (eD2k, serveur local)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Marquer comme fichier connu"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Copier le lien eD2k dans le presse-papiers"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Copier les liens eD2k dans le presse-papiers"
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Vous n'êtes actuellement pas connecté à un serveur prenant en charge la fonction de recherche de fichiers associés"
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Annulé"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Nouveau"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr "en cours d'exécution"
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "terminé"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr "inactif"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr "Recherche %u : %s, %u%% (%u résultats)\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr "Recherche %u « %s » : %s, %u%% (%u résultats)\n"
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr "Recherche expirée ou ID inconnue. Démarrez une nouvelle recherche.\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "État d'avancement de la recherche : %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Progrès de la recherche indisponibles"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr "Aucune recherche à signaler.\n"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Échec de la connexion à tous les serveurs statiques brouillés listés. Nouvel essai sans brouillage."
+
+#: src/ServerConnect.cpp
 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/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/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
+msgstr "Échec de la connexion à tous les serveurs statiques listés."
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr "Échec de la connexion à tous les serveurs listés."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Nouvelle tentative de connexion automatique au serveur dans %d seconde"
+msgstr1 "Nouvelle tentative de connexion automatique au serveur dans %d secondes"
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Connecté à %s (%s : %i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Connexion établie sur : %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Connexion à %s (%s : %i) perdue"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) semble être indisponible."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s : %i) semble être plein."
 
-#: 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"
-msgstr0 "Nouvelle tentative de connexion automatique au serveur dans %d seconde"
-msgstr1 "Nouvelle tentative de connexion automatique au serveur dans %d secondes"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Connexion perdue"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Échec de la connexion à %s (%s : %i)."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "ERREUR : Socket invalide lors de la vérification du délai"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, 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/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Réception d'un résultat DNS en retard, on jette."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Chargement du fichier server.met : %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Le fichier server.net est introuvable !"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Échec de l'ouverture du fichier server.met !"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Le fichier server.met est corrompu, une étiquette invalide de version invalide à été trouvé : 0x%x, taille %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i serveur trouvé dans server.met"
 msgstr1 "%i serveurs trouvés dans server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d serveur ajouté"
 msgstr1 "%d serveurs ajoutés"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Erreur : le fichier 'server.met' est corrompu : "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "Erreur d'E/S lors de la lecture de 'server.met' : "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Vous êtes connecté au serveur que vous tentez de supprimer. Déconnectez-vous d'abord s'il vous plaît."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Échec de l'ouverture de '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Échec de l'enregistrement de server.met !"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Échec d'E/S lors de l'écriture de « server.met » : %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "URL invalide"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Téléchargement terminé de la liste de serveur depuis %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 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:903
+#: src/ServerList.cpp
 #, 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:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "AVERTISSEMENT : URL invalide indiquée pour la mise à jour automatique des serveurs : %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Pas d'URL valide pour la mise à jour automatique des serveurs dans adresses.dat"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, 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:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Le serveur local est filtré par les filtres IP, reconnexion à un autre serveur !"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Description"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Temps de réponse"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "Nombre maximal d'utilisateurs"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Statique"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Version"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr "Fichiers souples"
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr "Fichiers durs"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr "Indicateurs TCP"
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr "Indicateurs UDP"
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 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:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Nom inconnu)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "ms"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Serveurs (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Serveur"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Connexion au serveur"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Marquer le serveur comme statique"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Marquer le serveur comme non statique"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Marquer les serveurs comme statiques"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Marquer les serveurs comme non statiques"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Supprimer le serveur"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Supprimer les serveurs"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Supprimer tous les serveurs"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Copier les liens eD2k dans le presse-papiers"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Reconnexion au serveur"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Êtes-vous sûr de vouloir supprimer tous les serveurs ?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 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:550
+#: src/ServerListCtrl.cpp
 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:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ERREUR : %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "AVERTISSEMENT : %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr "Le serveur %s (%s) a rejeté notre identifiant (aucune identité de client attribuée). Déconnexion."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Nouvel ID client : %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "AVERTISSEMENT : Vous avez reçu un Low-ID !"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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 routeur."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPour plus d'informations, consultez https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Info serveur inconnue reçue ! - trop court"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "%d nouveau serveur reçu"
 msgstr1 "%d nouveaux serveurs reçus"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Sauvegarde de la liste des serveurs terminée."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Le serveur a rejeté la dernière commande"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Faux paquet reçu depuis le serveur : %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 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/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, 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/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "utilisation du brouillage de protocole."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Connexion à %s (%s - %s : %i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "Journal d'aMuleGUI"
+
+#: src/ServerWnd.cpp
 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:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Serveur non ajouté : Port du serveur invalide."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "État eD2k :"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr "Type de la connexion :"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "Connecté depuis :"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Statut de Kademlia :"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Exécution en mode LAN"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "En marche"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "ID du client Kademlia :"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Statut :"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "État de la connexion :"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr "Derrière un pare-feu - Ouvrez le port TCP %d sur votre routeur ou pare-feu"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "État de la connexion UDP :"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 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/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "État du pare-feu : "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Pas de pote requis - port TCP ouvert"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Pas de pote requis - port UDP ouvert"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Pas de pote"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Connexion au pote"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Connecté au pote à %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Adresse IP :"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Sources indexées :"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Mots clés indexés :"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Notes indexées :"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Charge indexée :"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Nombre moyen d'utilisateurs :"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Nombre moyen de fichiers :"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "À l'arrêt"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr "Observateur de répertoire partagé : dépassement de capacité/erreur du backend (%s) ; rechargement complet en cours"
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 "Observateur de répertoire partagé : %u nouveau sous-répertoire trouvé depuis la dernière exécution, nouvelle analyse des partages"
+msgstr1 "Observateur de répertoire partagé : %u nouveaux sous-répertoires trouvés depuis la dernière exécution, nouvelle analyse des partages"
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr "Observateur de répertoire partagé : des événements ont été perdus par le backend, ce qui force un rechargement complet des fichiers partagés pour resynchroniser"
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Ajout du fichier %s aux partages"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "%i fichier partagé connu trouvé"
 msgstr1 "%i fichiers partagés connus trouvés"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "%i fichier partagé connu trouvé, %i inconnu"
-msgstr1 "%i fichiers partagés connus trouvés, %i inconnus"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 "%i fichier exclu du partage par le filtre"
+msgstr1 "%i fichiers exclus du partage par le filtre"
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "ERREUR : Tentative de partage %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Répertoire partagé non trouvé, on passe : %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Aucun fichier partageable trouvé dans le répertoire : %s"
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Répertoire partagé illisible, on passe : %s"
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Nom d'Utilisateur"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr "L'extraction des métadonnées multimédias est désactivée dans les préférences, donc il n'y a rien à extraire à nouveau"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Vitesse de Réception"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 "Extraction à nouveau des métadonnées multimédias pour %u fichier partagé"
+msgstr1 "Extraction à nouveau des métadonnées multimédias pour %u fichiers partagés"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Vitesse d'Émission"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "Partage de ce fichier en cours : %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Arrêt du partage du fichier supprimé : %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Arrêt du partage de %u fichier compris dans le répertoire enlevé : %s"
+msgstr1 "Arrêt du partage de %u fichiers compris dans le répertoire enlevé : %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Partage en cours de %u fichier trouvé dans un nouveau répertoire partagé"
+msgstr1 "Partage en cours de %u fichiers trouvés dans les nouveaux répertoires partagés"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "%u nouveau fichier partagé découvert"
+msgstr1 "%u nouveaux fichiers partagés découverts"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Nom d'Utilisateur"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Parties Disponibles"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr "Parties chez le pair"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "État de l'émission"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Nom du fichier local"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Partage de la liste des fichiers"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Demandes"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Demandes acceptées"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Données transférées"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Taux de partage"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Parties obtenues"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr "Disponibilité des sources"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Sources complètes"
-
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Chemin du répertoire"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Fichiers partagés"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Ajouter un Commentaire/Note"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Éditer un Commentaire/Note"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr "Vérifier les données locales"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr "Extraire à nouveau les métadonnées &multimédias"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Ajouter des fichiers de la collection à la liste de transferts"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Copier le &lien magnet dans le presse-papiers"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Copier le lien eD2k dans le presse-papiers (&Source)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Copier le lien eD2k dans le presse-papiers (Source) (Avec &options de chiffrage)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Copier le lien eD2k dans le presse-papiers (Nom d'&hôte)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 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:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Copier le lien eD2k dans le presse-papiers (Info &AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Copier le lien eD2k dans le presse-papiers (Info &AICH + Source)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr "Exporter les fichiers sélectionnés vers une emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr "La vérification des données locles sur PartFile n'est actuellement pas prise en charge : %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 "Métadonnées multimédias : %u téléchargement incomplet sera ignoré"
+msgstr1 "Métadonnées multimédias : %u téléchargements incomplets seront ignorés"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 "Métadonnées multimédias : %u fichier qui n'est pas audio ou vidéo sera ignoré"
+msgstr1 "Métadonnées multimédias : %u fichiers qui ne sont pas audio ou vidéo seront ignorés"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 "Extraire à nouveau les métadonnées multimédias pour %u fichier ?"
+msgstr1 "Extraire à nouveau les métadonnées multimédias pour %u fichiers ?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 "%u téléchargement incomplet sera ignoré."
+msgstr1 "%u téléchargements incomplets seront ignorés."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 "%u fichier n'est pas audio ou vidéo et sera ignoré."
+msgstr1 "%u fichiers ne sont pas audio ou vidéo et seront ignorés."
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr "Cela fonctionne en arrière-plan. L'avancement sera rapporté dans le journal."
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr "Extraire les métadonnées multimédias à nouveau"
+
+#: src/SharedFilesCtrl.cpp
 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:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr "Exporter vers une emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr "Aucun fichier n'a été sélectionné pour être exporté."
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr "Collections eMule (*.emulecollection)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr "« %s » existe déjà. Souhaitez-vous l'écraser ?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Échec de l'écriture du fichier de collection « %s »."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "%u fichier partagé a été exporté vers « %s »."
+msgstr1 "%u fichiers partagés ont été exportés vers « %s »."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Taille totale des Fichiers Partagés : %s (%s terminés)"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Taille totale des Fichiers Partagés : %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Fichiers partagés (%i, hachage de %u autre fichier)"
+msgstr1 "Fichiers partagés (%i, hachage de %u autres fichiers)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Fichiers partagés (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Fichier .part"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Rechargement des fichiers partagés : %u fichiers analysés"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr "État des parties"
+
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Nom du fichier à distance"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Données Émises (Session (Total)) : %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Surcharge Totale (Paquets) : %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Surcharge Requête Fichier (Paquets) : %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Surcharge Échange de Source (Paquets) : %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Surcharge Serveur (Paquets) : %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Surcharge Kad (Paquets) : %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Surcharge Crypt (UDP) : %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Envois Actifs : %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Envois en Attente : %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Sessions d'envois réussies au total : %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Sessions d'envois qui ont échoué au total : %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Temps d'envois moyen : %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Données Reçues (Session (Total)) : %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Sources Trouvées : %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Téléchargements Actifs (parties) : %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Rapport UL : DL pour la Session (Total) : %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Vitesse moyenne de réception (Session) : %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Vitesse moyenne d'envoi (Session) : %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Vitesse maximale de réception (Session) : %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Vitesse maximale d'émission (Session) : %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Reconnexions : %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Temps depuis le premier transfert : %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Connecté au serveur depuis : %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Connexions actives (estimation) : %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Limite max de connexion atteinte : %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Moyenne de connexions (estimation) : %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Pics de connexions (estimation) : %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Clients"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Inconnu : %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtré : %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Banni : %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr "Adresses Kad bannies : %s"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Total : %i Connus : %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Serveurs en fonctionnement : %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Serveurs non-connectés : %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Total : %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Serveurs supprimés : %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Serveurs filtrés : %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Utilisateurs sur les serveurs en fonctionnement : %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Fichiers sur les serveurs en fonctionnement : %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Total des utilisateurs : %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Total des fichiers : %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Occupation du Serveur : %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Nombre de Fichiers Partagés : %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Taille totale des Fichiers Partagés : %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Taille moyenne des fichiers : %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Système d'Exploitation"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Non reçu"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Connexions actives (1 : %u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Non disponible"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Jamais"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Exécute <str> et quitte."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr "Séparez les champs des listes avec des espaces, comme auparavant, au lieu d'utiliser des tabulations."
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Traitement par hachage : "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Traitement par nom de fichier : "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Nombre invalide\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6478,7 +7909,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6488,7 +7919,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6496,76 +7927,80 @@
 "Aucun type de recherche défini.\n"
 "Tapez « help search » pour obtenir davantage d'aide.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Télécharger le fichier : %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "La requête a échoué avec une erreur inconnue."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "L'opération s'est déroulée avec succès."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "La requête a échoué avec l'erreur suivante : %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Statut du filtrage IP pour les clients : %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Arrêt"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Marche"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Le filtrage IP pour les serveurs est %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Le niveau actuel d'IPFilter est %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr "Limites de bande passante : Envoi : %u Kio/s, Réception : %u Kio/s.\n"
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr "La rotation de sources pour « endgame » est %s.\n"
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr "Recherche démarrée (id %u).\n"
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Connecté à %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Connexion en cours"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "derrière un pare-feu"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6574,7 +8009,7 @@
 "\n"
 "Réception : \t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6583,7 +8018,7 @@
 "\n"
 "Émission : \t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6592,7 +8027,7 @@
 "\n"
 "Clients dans la file d'attente : \t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6601,38 +8036,33 @@
 "\n"
 "Nombre total de sources : \t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Fichier .part"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Nombres de résultats de la recherche : %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "État d'avancement de la recherche : %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Progrès de la recherche indisponibles"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, 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:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Montrer de courtes informations sur le statut."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 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:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Montrer l'arbre des statistiques complet."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6646,11 +8076,11 @@
 "\n"
 "Exemple : 'statistics 5' montrera seulement les 5 premières versions pour chaque type de client.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Fermer aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6660,35 +8090,35 @@
 "Ceci coupera aussi le client texte, puisqu'il est\n"
 "inutilisable sans noyau actif.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Recharge l'objet donné."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Recharge la liste des fichiers partagés."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Recharge la table de filtrage d'IP."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Recharge la table actuelle de filtrage d'IP."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Mise à jour de la table de filtrage d'IP depuis l'URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr "Si l'URL est omise l'URL des préférences est utilisée."
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Se connecter au réseau."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6700,35 +8130,35 @@
 "seulement à ce serveur. L'IP doit être une IPv4 décimal,\n"
 "ou un nom DNS pouvant être résolu."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Se connecter à eD2k uniquement."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Se connecter à Kad uniquement."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Se déconnecter du réseau."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Se déconnecter de eD2k uniquement."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Se déconnecter de Kad uniquement."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Ajoute un lien eD2k ou magnet au noyau."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6746,51 +8176,51 @@
 "\n"
 "Le lien magnet devra contenir le hachage eD2k et la taille du fichier.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Définir une valeur de préférence."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Définir les préférences de filtrage d'IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Activer le filtrage IP pour les clients et les serveurs."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 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:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Activer/Désactiver le filtrage IP pour les clients."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Activer le filtrage IP pour les clients."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Désactiver le filtrage IP pour les clients."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Activer/Désactiver le filtrage IP pour les serveurs."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Activer le filtrage IP pour les serveurs."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Désactiver le filtrage IP pour les serveurs."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Choisir le niveau de filtrage IP."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6798,59 +8228,71 @@
 "Les niveaux de filtrage valides sont compris entre 0 et 255, la valeur par défaut (initiale)\n"
 "est 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Définir les limites de bande passante."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Définir la limite de bande passante en émission."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "La valeur en question doit être en kilo-octets/s.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Définir la limite de bande passante en réception."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr "Activer ou désactiver la rotation de sources pour « endgame »."
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "La valeur donnée doit être 1/ON (activer) ou bien 0/OFF (désactiver).\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Obtenir et afficher une valeur de préférence."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Obtenir les préférences de filtrage IP."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 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:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Obtenir le statut du filtrage d'IP pour les clients seulement."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Obtenir le statut du filtrage d'IP pour les serveurs seulement."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Obtenir le niveau de filtrage IP."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Obtenir les limites de bande passante."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr "Obtenir l'état de rotation de sources « endgame »."
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Effectuer une recherche."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6884,39 +8326,47 @@
 "Exemple : 'search global linux iso --type Iso --min-size 100M' retourne\n"
 "des résultats pour le type de fichier Iso d'au moins 100 Mio pour « linux iso ».\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Effectuer une recherche globale."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Effectuer une recherche locale"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Effectuer une recherche Kad"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "Montre les résultats de la dernière recherche."
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Retourne les résultats de la précédente recherche.\n"
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr "Montrer les résultats d'une recherche."
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+"Retourner les résultats d'une recherche.\n"
+"Accepte éventuellement un identifiant de recherche (issu de 'search …') ; en l'absence d'identifiant, renvoie les résultats de la recherche lancée le plus récemment.\n"
+
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Affiche la progression de la recherche."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Affiche la progression de la recherche.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+"Afficher la progression d'une recherche.\n"
+"Prend éventuellement un identifiant ; sans identifiant, affiche la progression de la recherche lancée le plus récemment.\n"
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Démarrer le téléchargement d'un fichier"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6924,80 +8374,80 @@
 "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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Mettre le téléchargement en pause."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Reprendre le téléchargement."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Annuler le téléchargement."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Régler la priorité de téléchargement."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Passer en priorité basse."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Passer en priorité normale."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Passer en priorité haute."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Passer en priorité auto."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Montrer les files d'attente/listes."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Montrer la file d'attente des envois."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Montrer la file d'attente des réceptions."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Montrer le journal."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Montrer la liste des serveurs."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "Afficher la liste des fichiers partagés."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Effacer le journal."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Commande obsolète, utilisez '%s' à la place."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7006,255 +8456,278 @@
 "C'est une commande est obsolète, et pourrait être supprimée dans le futur.\n"
 "Utilisez '%s' à la place.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "client texte aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Hachage des fichiers téléchargés : %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr "Hachage du fichier en cours : %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Reconstruction du groupe de hachage AICH pour le fichier : %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr "Vérification des données locales (%s) : résultat OK pour %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr "Vérification des données locales (%s) : ERREURS TROUVÉES ! %s Blocs défaillants : MD4 : %s. %s%s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Confirmation requise"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Seulement 99 catégories sont prises en charge."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Trop de catégories !"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Tous les autres"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Sélectionner un filtre"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Ajouter une catégorie"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Éditer une catégorie"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Supprimer une catégorie"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Requête d'un hashset pour le fichier inconnu : %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Échec de l'ouverture du fichier (%s), suppression de la liste des fichiers partagés."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Reprise des envois du fichier : %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Pause des envois du fichier : %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, 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'."
+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
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Téléchargement terminé"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Le chemin complet vers le fichier."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Le nom du fichier sans la partie répertoire."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "Le hachage eD2k du fichier."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "La taille du fichier en octets."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Durée d'activité de téléchargement cumulée."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Nouvelle session de chat démarrée"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Expéditeur du message."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Espace insuffisant"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Partition du disque."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Erreur à la complétion"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Traitement du fichier numéro %u : %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "Vous avez demandé les hachages partiels (Seulement utilisés pour des fichiers dont les tailles sont > 9.5 Mo)"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Fichier inexistant !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, le créateur de liens d'aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Bienvenue !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Paramètres d'entrée"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Fichier à hacher"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Ajouter des URLs optionnelles pour ce fichier"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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 "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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Enlever"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Créer le lien avec les hachages partiels"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Hachage MD4 du fichier"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "Hachage eD2k du fichier"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "Lien eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Copier dans le presse-papiers"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Ouvrir un fichier pour calculer son lien eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Copie du lien eD2k calculé dans le presse-papiers"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Conversion du lien eD2k calculé en fichier"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "À propos d'aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Impossible d'ouvrir le presse-papiers"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Rien à copier pour l'instant !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Impossible d'ouvrir "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Veuillez entrer un nom de fichier non vide"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Rien à sauvegarder pour l'instant !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7274,162 +8747,159 @@
 "\n"
 "Distribué sous licence GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Hachage en cours…"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator fonctionne pour vous"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Calcul du hachage MD4…"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Calcul des hachages eD2k…"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Annulé !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Effectué en %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Vous avez déjà ajouté cette URL !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Entrez une URL non vide s'il vous plaît"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Impossible d'ouvrir %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "Dépassement de mémoire lors du calcul du hachage eD2k !"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02u J %02u h %02u min %02u s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02u h %02u min %02u s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02u min %02u s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02u La session a expirées"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f o"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f Ko"
+msgid "%.2f KiB"
+msgstr "%.2f Kio"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f Mo"
+msgid "%.2f MiB"
+msgstr "%.2f Mio"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f Go"
+msgid "%.2f GiB"
+msgstr "%.2f Gio"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f To"
+msgid "%.2f TiB"
+msgstr "%.2f Tio"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, statistiques en ligne d'aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Système"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Arrêter le rafraîchissement automatique"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Sauvegarder l'image des statistiques en ligne"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Imprimer une image des statistiques en ligne"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Préférences"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "À propos de wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Démarrer le rafraîchissement automatique"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Rafraîchissement automatique stoppé"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Rafraîchissement automatique démarré"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Sauvegarder l'image des statistiques en ligne"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Statistiques en ligne d'aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7437,11 +8907,11 @@
 "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:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Impression en cours"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7459,367 +8929,364 @@
 "\n"
 "Distribué sous licence GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh Oh, aMule n'est pas lancé…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule fonctionne"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule est lancé, mais est déconnecté"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule se connecte…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh Oh, l'état d'aMule est inconnu…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " tourne depuis "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " est arrêté !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " n'est pas connecté !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " se connecte…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " est en train de faire des trucs bizarres, à vérifier !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " est connecté à "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad : "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "éteint"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " est sur "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " avec "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Réception totale : "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Émission : "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Réception durant la session : "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Réception : "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " Ko/s, Émission : "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr " Kio/s, téléversement : "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Partage : "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " fichier(s), clients en attente : "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Temps : "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " sur "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Charge moyenne du système (1-5-15 min) : "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Le système fonctionne depuis : "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Répertoire contenant le fichier amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Intervalle de rafraîchissement en secondes"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically 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:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "URL du FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Chemin du FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Entrer ici l'URL du serveur FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Valider"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Répertoire contenant le fichier de signature"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Charge le template <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Port HTTP du serveur Web"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 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:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Port UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Utiliser la compression gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Mot de passe d'accès total pour le serveur web"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Mot de passe invité pour le serveur web"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Autoriser l'accès invité"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Interdire l'accès invité"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 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:291
+#: src/webserver/src/WebInterface.cpp
 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:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Désactiver l'interpréteur PHP (obsolète)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Recompiler les pages PHP à chaque requête"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Serveur Web d'aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "connexion du client web acceptée\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "ERREUR : impossible d'accepter la connexion au client web\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "La requête a échoué avec le message d'erreur suivant : %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Fichier d'index non trouvé : "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "La session a expiré - demande de l'identifiant\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Session correcte, identifié\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Session correcte, non identifié\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Pas de session ouverte - l'identifiant va être demandé\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Session crée - demande de l'identifiant\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Requête en cours originale : "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr "Refus de lire `pass` depuis la chaîne de requête URL\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 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:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Vérification du mot de passe\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Hachage du mot de passe invalide\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Mot de passe correct\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Mauvais mot de passe\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Déconnexion demandée\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Requête en cours redirigée : "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr "aMule (obligatoire)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr "Raccourci de bureau"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr "Lancer aMule lorsque j'ouvre une session"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr "Associer les fichiers .emulecollection"
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr "Désinstaller"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr "Enlever les données d'utilisateur (configuration, serveurs ED2K, nœuds Kad, fichiers partiels)"
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr "Fichiers de l'application aMule (obligatoires)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr "Créer un raccourci aMule sur le bureau."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr "Lancer aMule automatiquement lorsque l'utilisateur actuel ouvre une session (réglage par utilisateur)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr "Enlever les fichiers de l'application aMule, les raccourcis du menu de démarrage / du bureau, l'élément de clef d'exécution de du démarrage automatique et l'élément d'ajout/suppression de programmes (obligatoire)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr "Ajoute aMule à la liste « Ouvrir avec » pour les fichiers .emulecollection et le définit comme programme par défaut si aucun autre programme ne les a réclamés. Ouvrir un collection met en file d'attente chaque lien eD2k qu'elle contient."
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "Enlever les fichiers de l'application aMule, les raccourcis du menu de démarrage / du bureau, l'élément de clef d'exécution de du démarrage automatique, les enregistrements des schémas d'URL et l'élément d'ajout/suppression de programmes (obligatoire)."
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr "Effacer de manière permanente %APPDATA%\\aMule pour l'utilisateur actuel (aMule.conf, la liste des serveurs ED2K, les nœuds Kad, les filtres d'IP, la liste d'amis). Laissez décochée pour conserver vos réglages."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
@@ -7827,7 +9294,7 @@
 "aMule semble être en cours d'exécution depuis $INSTDIR.\r\n"
 "Veuillez fermer aMule (et aMuleD / aMuleGUI) et réessayer."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
@@ -7835,11 +9302,11 @@
 "Le démon aMule (amuled.exe) semble être en cours d'exécution depuis $INSTDIR.\r\n"
 "Veuillez le fermer et réessayer."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr "Suppression de l'installation précédente d'aMule sur $0…"
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
@@ -7847,21 +9314,191 @@
 "Échec de la suppression de l'installation précédente d'aMule sur $0.\r\n"
 "Veuillez fermer tous les processus aMule en cours d'exécution et réessayer, ou désinstallez d'abord manuellement la version précédente."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr "aMule semble être en cours d'exécution. Veuillez le fermer et relancer l'installateur."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr "Suppression des données d'utilisateur sur $APPDATA\\aMule…"
 
+#~ msgid "Ratio"
+#~ msgstr "Ratio"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Aucun fichier partageable trouvé dans le répertoire : %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Changer de langue"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Il n'y a pas de traductions installées pour aMule"
+
+#~ msgid "No languages available"
+#~ msgstr "Pas de langues disponibles"
+
+#~ msgid "User name"
+#~ msgstr "Nom d'utilisateur"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Parties obtenues"
+
+#~ msgid "Available Parts"
+#~ msgstr "Parties Disponibles"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "%i fichier partagé connu trouvé, %i inconnu"
+#~ msgstr1 "%i fichiers partagés connus trouvés, %i inconnus"
+
+#~ msgid " MB/s"
+#~ msgstr " Mo/s"
+
+#~ msgid " kB/s"
+#~ msgstr " Ko/s"
+
+#~ msgid "kB/s"
+#~ msgstr "Ko/s"
+
+#~ msgid "kB"
+#~ msgstr "ko"
+
+#~ msgid "MB/s"
+#~ msgstr "Mo/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H : %M : %S"
+
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Émis"
+#~ msgid "Remote prefix:"
+#~ msgstr "Serveur Distant"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Fichier non trouvé."
+#~ msgid "Local prefix:"
+#~ msgstr "Serveur Local"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Entrée invalide dans la liste des fichiers connus, le fichier est peut être corrompu : "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Enregistrement du fichier .part %u sur %u"
+
+#~ msgid "the default Windows shell handler"
+#~ msgstr "le gestionnaire par défaut de shell Windows"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Pour éviter que cet avertissement n'apparaisse avec chaque prévisualisation,\n"
+#~ "indiquez votre lecteur vidéo préféré dans les préférences (%s par défaut)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Filtrer les résultats"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Marquer comme fichier connu"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Pourcentage du total de fichiers"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Amorçage"
+
+#~ msgid "New node"
+#~ msgstr "Nouveau nœud"
+
+#~ msgid "IP:"
+#~ msgstr "IP :"
+
+#~ msgid "More"
+#~ msgstr "Plus"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Amorçage depuis\n"
+#~ "les clients connus"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Se connecter à n'importe quel serveur et/ou Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Déconnecter Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Stopper les essais de connexions en cours"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Se déconnecter des réseaux actuellement connectés"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Se connecter aux réseaux actuellement activés"
+
+#, c-format
+#~ msgid "Could not add %u link from ED2KLinks file (see log for details)."
+#~ msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+#~ msgstr0 "Impossible d'ajouter %u lien depuis le fichier ED2KLinks (cf. le journal pour les détails)."
+#~ msgstr1 "Impossible d'ajouter %u liens depuis le fichier ED2KLinks (cf. le journal pour les détails)."
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Triage automatique des fichiers (augmente la charge du CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule triera automatiquement les colonnes dans votre liste de téléchargements"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Rejette le paquet si l'IP du client est différente de l'ip d'où le paquet est envoyé. À utiliser avec prudence."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Retourne les résultats de la précédente recherche.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Affiche la progression de la recherche.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Connexion fermée - aMule s'est probablement arrêté."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Vérifier les nouvelles versions au démarrage"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Lien eD2k : "
+
+#~ msgid "Commit"
+#~ msgstr "Envoyer"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled : passage en arrière plan - à bientôt"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Site web : https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Forum : https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Documentation : https://amule-org.github.io/docs \n"
+
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bugs : https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Émis"
 
 #, c-format
 #~ msgid "No GeoLite2 update URL configured. Download GeoLite2-Country.mmdb manually (a free MaxMind account is required) and place it at %s, or set the URL in Preferences."

amule-3.0.1.tar.gz/po/gl.po -> amule-3.1.0.tar.gz/po/gl.po Changed

@@ -24,8 +24,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:11+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:39+0000\n"
 "Last-Translator: Pablo <parodper@gmail.com>\n"
 "Language-Team: http://forum.amule.org/index.php?topic=13883\n"
 "Language: gl\n"
@@ -35,25 +35,114 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 3.6\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Mostrar aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "control remoto de aMule "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Instantánea:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Cliente «Multi-Plataforma» p2p baseado no eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Parte do aMule está baseado en \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Encamiñamento entre pares baseado na métrica XOR.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Páxina web:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Foro:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Comprobar se hai unha nova versión ao iniciar"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Conectando a Kad..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Está usando unha versión de aMule desactualizada!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Non dispoñible"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Engadir un amigo"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Tes que introducir unha IP e porto válidos!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Información"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "O hash de usuario especificado non é válido!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
+#, fuzzy
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
@@ -61,46 +150,46 @@
 "\r\n"
 "Quere instalar os atallos?"
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr "Engadir aMule ao menú de aplicacións?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr "Continuar"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr "Agora non"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr "Non preguntar de novo"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr "Non se puido integrar co escritorio: a variable APPDIR está baleira. Isto pode pasar ao executar a AppImage dun xeito raro."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr "Non se puido integrar aMule"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr "Non se puido integrar co escritorio: non se puido crear %s. Comprobe os permisos de escritura do cartafol persoal."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr "Non se puido integrar co escritorio: non se puido modificar %s. Comprobe os permisos de escritura do cartafol persoal."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, fuzzy, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr "Integración de AppImage: Engadiuse aMule no menú de aplicacións."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -114,82 +203,160 @@
 "\n"
 "Reiniciar agora aMule?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr "Instalouse aMule"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr "Reiniciar agora"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr "Máis tarde"
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 "Non se puido engadir a ligazón %u do ficheiro ED2KLinks (consulte o rexistro)."
-msgstr1 "Non se puideron engadir as ligazóns %u do ficheiro ED2KLinks (consulte o rexistro)."
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ERRO"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Non se puido abrir o ficheiro con ligazóns eD2k."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "Instalouse aMule"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Ficheiro do rexistro non atopado: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Non se puideron recuperar os ficheiros compartidos do usuario «%s»"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "Non se atoparon ficheiros que se puideran compartir: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Non se puido converter a ligazón magnet a eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Ligazón eD2k inválida! ERRO: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Saíndo da aplicación principal..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Rematando o proceso de amuleweb co pid «%d» ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Obrigando ao proceso de amuleweb con pid «%d» a pecharse ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Erro"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Rematando o proceso de amuleweb co pid «%d» ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Obrigando ao proceso de amuleweb con pid «%d» a pecharse ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule Ao Sairen(OnExit): Apagando o núcleo."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "Apagado completado."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Resultados da depuración da memoria ao sair de aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "O idioma cambiouse ao predeterminado do sistema debido a un troco na configuración."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Información"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -197,24 +364,48 @@
 "\n"
 "Configuración CE"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Establecido o contrasinal e habilitadas conexións externas."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "AVISO"
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr "Lista de servidores eD2k (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr "Nodos de inicio de Kad (nodes.dat)"
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading temp files"
+msgstr "Cargando ficheiros temporais dende %s."
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Cargando ficheiros temporais dende %s."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Recargando os ficheiros compartidos..."
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Recargando os ficheiros compartidos..."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Comezar"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Arranque da rede"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
@@ -222,31 +413,60 @@
 "aMule detectou que faltan ficheiros necesarios para arrancar a rede.\n"
 "Escolla os que queira descargar:"
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
-msgstr "Arranque da rede"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "Lista de servidores eD2k (server.met)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Nodos de inicio de Kad (nodes.dat)"
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "servidor web executándose co pid %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "Solicitou executar o servidor web ó inicio pero non se puido executar o programa amuleweb. Instale o paquete que conteña o servidor web do aMule ou compile o aMule empregando o parámetro --enable-webserver e logo execute make install"
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "ERRO"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "servidor web executándose co pid %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Solicitou executar o servidor web ó inicio pero non se puido executar o programa amuleweb. Instale o paquete que conteña o servidor web do aMule ou compile o aMule empregando o parámetro --enable-webserver e logo execute make install"
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "No se puideron vincular os portos á dirección especificada: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "O porto %u non está dispoñible . Terá IDBAIXA\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -261,48 +481,48 @@
 "\n"
 "Comprobe a súa rede para asegurarse de que o porto está aberto para a entrada e saída."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Non se puido crear o ficheiro OnlineSig"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Non se puido crear o ficheiro OnlineSig de aMule"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr "O idioma seleccionado semella non estar instalado. (Nota: Intentarase usalo a pesar diso)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Esta é a primeira vez que iniciou aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Esta versión é unha versión en proba, actualizada diariamente, e\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "non lle aseguramos que non se rompa algo, lle prenda lume a súa casa,\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "ou mate ao seu can. Pero non debería pasar nada.\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr "Pode atopar máis información, axuda e novas actualizacións na nosa páxina,\n"
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "en https://amule-org.github.io, ou na nosa canle IRC #aMule en irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Pode avisar de calquera problema en https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -310,514 +530,503 @@
 "O cartafol que especificou para as Sinaturas En Liña non é válido!\n"
 "A Sinatura En Liña permanecerá desactivada ata que se arranxe a configuración."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Nome do servidor avisado"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Fallou a reserva do espazo no disco duro para o ficheiro «%s»: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "ERRO: non se pode abrir o ficheiro do rexistro"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "AVISO: o ficheiro de rexistro está baleiro. Algo está mal."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "O rexistro foi borrado"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Mensaxe do servidor: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr "Saltouse a descarga de %s, por que o ficheiro pedido é máis antigo."
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Non se puido descargar a lista de nodos."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Non se puido abrir o ficheiro de comprobación da versión descargado"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Ficheiro de comprobación da versión corrupto"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Está usando unha versión de aMule desactualizada!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Pode obter a última versión de aMule en https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "A súa copia de aMule está actualizada."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Non se puido descargar o ficheiro de comprobación de versión"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Usuarios: %s | Ficheiros: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Sen redes seleccionadas"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "con IDBaixa"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "con IDAlta"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Conectado a %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Desconectouse do eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Iniciado Kad."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Parado Kad."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Conectado a Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Conectado a Kad (devasa)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Desconectado de Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr "Non se pode usar a rede Kad se o porto UDP está desactivado nas preferencias. Non se iniciou."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "A rede Kad está desactivada nas preferencias. Non se iniciou."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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 poña a clave «AcceptExternalConnections» a 1 no ficheiro ~/.aMule/amule.conf"
 
-#: src/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr "ERRO: É necesario un contrasinal válido para usar conexións externas, e o daemon de aMule non se pode usar sen elas. Para executar o daemon de aMule indique un valor axeitado no campo «ECPassword» do ficheiro ~/.aMule/amule.conf. Execute amuled co parámetro --ec-config para definir o contrasinal. Pode atopar máis información en https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - iniciando temporizador"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: desdobrando ao segundo plano - ata a volta"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Non se puido crear o ficheiro Pid"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "ERRO: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Este é aMule %s baseado en eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Executando en %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Visite https://github.com/amule-org/amule/releases/latest para obter actualizacións."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ERRO GRAVE: Non se puido crear o temporizador"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "control remoto de aMule "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Instantánea:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Redes"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Cliente «Multi-Plataforma» p2p baseado no eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Buscas"
+
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Descargas"
+
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Ficheiros compartidos"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Páxina web: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Clientes"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Foro: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Mensaxes"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Páxina web: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Estadísticas"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Foro: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Preferencias"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Parte do aMule está baseado en \n"
-
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Encamiñamento entre pares baseado na métrica XOR.\n"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Mensaxe do servidor: %s"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Non dispoñible"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Mensaxe"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Pode obter a última versión de aMule en https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "Destruído o cadro de diálogo de aMule"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Conectando"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Desconectado"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Tras devasa"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Conectado"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Conectando"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Apagado"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Cancelar"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Deter a tentativa actual de conexión"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versión"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Desconectar"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Desconectar das redes conectadas"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Conectar"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Enderezo"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Conectar ás redes activas"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Descrición"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "Rexistro de aMule"
+
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Enviado: %.1f%s (%.1f) | Descargado: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Enviado: %.1f%s | Descargado: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Conectado)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Desconectado)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Desexar saír de %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Confirmación da saída"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Ordes de Arranque: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- por omisión -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Non existe o directorio de temas «%s»"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "AVISO: Non se puido abrir o ficheiro de temas «%s» en modo lectura"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Redes"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Xanela de Redes"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Buscas"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Xanela de buscas"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Descargas"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Xanela de descargas"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Ficheiros compartidos"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Xanela de ficheiros compartidos"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Mensaxes"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Xanela de Redes"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Xanela de mensaxes"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Estadísticas"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Xanela de gráficos de estadísticas"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Xanela de Preferencias"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importar"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "A ferramenta para importar ficheiros «part»"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Sobre"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Sobre/Axuda"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Rede eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Red Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Sen rede"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Control remoto de aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Erro fatal: Non se puido crear o temporizador (Core Timer)"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Conectar ao amule remoto"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Conexión perdida"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Preguntar antes de saír"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Erro fatal: Non se puido crear o temporizador (Poll Timer)"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Entrando no bucle de eventos..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Interface para a manipulación de eventos CE remotos"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "Fallou a conexión. Non se puido conectar a %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Desconectando"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Conexión terminada - probablemente o aMule apagouse."
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "O intento de conexión %s (%s:%i) tardou demasiado."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
@@ -826,1060 +1035,1377 @@
 "A conexión caducou. Non se puido chegar ata %s:%d nun prazo razoable.\n"
 "Comprobe o destino, o porto e que aMule teña activas as conexións externas."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Deshabilitado"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Conectar á rede."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Fallou a conexión. Non se puido conectar a %s:%d\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Listo"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Todo"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Non dispoñible"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Ficheiro non atopado."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Ligazón inválida ou xa presente na lista."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Non se puido mover o ficheiro descargado a %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr "Non se puido crear o directorio «%s» para a categoría «%s», mantendo o directorio «%s»."
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Non se puideron recuperar os ficheiros compartidos do usuario «%s»"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Buscando colega para unha conexión IDBaixa"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (eMule falso versión %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (eMule falso)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (eMule falso)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (baseado en eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Alcume: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Pedido: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estatísticas do ficheiro para esta sesión: Aceptada %d de %d peticións; transferida %s\n"
 msgstr1 "Estatísticas do ficheiro para esta sesión: Aceptadas %d de %d peticións; transferidas %s\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estatísticas do ficheiro para todas as sesións: Aceptada %d de %d peticións; transferida %s\n"
 msgstr1 "Estatísticas do ficheiro para todas as sesións: Aceptadas %d de %d peticións; transferidas %s\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Pedido ficheiro descoñecido"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Mensaxe filtrada de «%s» (IP: %s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nova mensaxe de «%s» (IP: %s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, 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 inexistente «%s» -> Ignorouse"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Non se puideron recuperar os ficheiros compartidos do usuario «%s»"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "AVISO: non se puido abrir %s."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "AVISO: A lista de ficheiros cancelados corrompeuse, a cabeceira non é correcta."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Erro de E/S ao ler o ficheiro %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Non se puido gardar o ficheiro %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Introduza o Captcha"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Categoría"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nova categoría"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Escolla un cartafol para os ficheiros entrantes"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Debe especificar un nome para a categoría!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Debe especificar unha ruta para a categoría!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr "Non se puido crear o directorio de entrada para a categoría. Indique unha ruta correcta!"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Conversa iniciada: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Conectado ao Cliente ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Conectando ao Cliente ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Erro ao conectar ao cliente / Conexión perdida ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr "*** Resolveu o captcha e o usuario recibiu a súa mensaxe. ***"
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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 "*** Non resolveu o captcha e a súa mensaxe foi ignorada. Podes volver a intentalo enviando unha nova mensaxe ***"
 
-#: src/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Conversa"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Pechar lapela"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Pechar todas as lapelas"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Pechar as outras lapelas"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Engadir amigo"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Ver &Detalles"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Borrar da lista de amigos"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Establecer Oco para un Amigo"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Ver ficheiros"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Enviar mensaxe"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Enviar mensaxe ao usuario"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Mensaxes a enviar:"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Non está permitindo establecer máis dun espazo de amigo.\n"
+" Só se asignou un espazo."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Selección múltiple"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Borrar da lista de amigos"
+msgstr1 "Borrar da lista de amigos"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Recarga a lista de ficheiros compartidos."
+msgstr1 "Recarga a lista de ficheiros compartidos."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Ficheiro de créditos cargado, coñécese o cliente %u"
 msgstr1 "Ficheiro de créditos cargado, coñécense os clientes %u"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - Expiraron os créditos do cliente %u!"
 msgstr1 " - Expiraron os créditos dos clientes %u!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Non se atopou o ficheiro «cryptkey.dat», creándoo."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Detalles do cliente"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "IDBaixa"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "IDAlta"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Permitido"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Non permitido"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Deshabilitado"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Conectado"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nome"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Enderezo IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Orixe"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Última recepción"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Versión"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Velocidade de envío"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Velocidade de descarga"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Enviado"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Total descargado: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Modificador DE/EV"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Sinatura En liña"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Incompleto"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Rapaz malo"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Verificado - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Non dispoñible"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, fuzzy, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "Non se puido engadir a ligazón %u (consulte o rexistro)."
+msgstr1 "Non se puideron engadir as ligazóns %u (consulte o rexistro)."
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Ficheiros"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Enviado"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Descargado"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Descargando"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Enviando"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Activo"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Descoñecido"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "O usuario %s (%u) solicitou a súa lista de ficheiros compartidos -> Aceptado"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "O usuario %s (%u) solicitou a súa lista de ficheiros compartidos -> Denegado"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "O usuario %s (%u) solicitou a súa lista de directorios compartidos -> Aceptado"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "O usuario %s (%u) solicitou a súa lista de directorios compartidos -> Denegado"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "O usuario %s (%u) solicitou a súa lista de ficheiros compartidos do directorio %s -> aceptado"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "O usuario %s (%u) solicitou a súa lista de ficheiros compartidos do directorio %s -> denegado"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "O usuario %s (%u) comparte o directorio «%s»"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "O usuario %s (%u) enviou unha lista de cartafoles compartidos non desexada."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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 para o directorio «%s»"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "O usuario %s (%u) enviou unha lista de ficheiros compartidos non desexada"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "O usuario %s (%u) denegou o acceso á lista de ficheiros e directorios compartidos"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Comentarios do ficheiro"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Nome de usuario"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Nome do ficheiro"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Valoración"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Non se pode buscar en Kad se non está activo"
+
+#: src/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "Buscando colega para unha conexión IDBaixa"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Sen comentarios"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u comentario"
 msgstr1 "%u comentarios"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr "O cliente %s foi suspendido por enviar %s información corrupta do total %s do ficheiro «%s»"
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Non se puido cargar información do país para «%s»."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Ba"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Al"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Moi baixa"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Baixa"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Alta"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Moi alta"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Lanzamento"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Preguntando"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Conectando vía servidor"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Cola chea"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "En cola"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Descargando"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Recibindo conxunto de hashes"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Partes innecesarias"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Non se poden conectar IDBaixas entre si"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Demasiadas conexións"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Conectando vía Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Demasiadas conexións Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Vetado"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Erro de conexión"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Cola remota chea"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Vello MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Novo MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Compatible con eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Servidor local"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Servidor remoto"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Intercambio de fontes"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Pasivo"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Ligazón"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Sementes da fonte"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Resultados da busca"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Completado"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "En progreso"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "ERRO: Non queda espazo no disco"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "ERRO: Non se atopou o partmet"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ERRO: Erro de E/S!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ERRO: Non se puido realizar a acción!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "En cola"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Xa se está descargando"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Formato de ficheiro temporal incorrecto ou descoñecido."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Parte"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Transferido"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Velocidade"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Progreso"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Fontes"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioridade"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Estado"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Tempo restante"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Última vez que se vira completo"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Última recepción"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Seguro que quere borrar o ficheiro seleccionado?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Seguro que quere borrar os ficheiros seleccionados?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Comentarios de : %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automático"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Deter"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Parar"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "Continua&r"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "&Limpeza completada"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Pasar todas as A4AF a este ficheiro"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Pasar todas as A4AF a este ficheiro (Automaticamente)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Pasar todas as A4AF a calquera outro ficheiro"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Opcións extendidas"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Amosar &detalles do ficheiro"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Ver todos os comentarios"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Copiar a URI magnética ao portapapeis"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Copiar &ligazón eD2k ao portapapeis"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Copiar comentarios ao portapapeis"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Obter %s para este ficheiro"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "anular a asignación"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Asignar á categoría"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "Abrir o ficheir&o"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Seguro que quere borrar o ficheiro seleccionado?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Seguro que quere borrar os ficheiros seleccionados?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Comentarios de : %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Introducir un novo nome para este ficheiro:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Cambiar o nome do ficheiro"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
+msgid "%.1f MiB/s"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Descargas (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Para evitar a aparición deste aviso en cada vista previa,\n"
-"establece o teu reprodutor de vídeo nos axustes (%s é o predeterminado)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Previsualizar ficheiro"
-
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ERRO: Non se puido executar o reprodutor multimedia externo! Orde: «%s»"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Total DE: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Gardando parte %u de %u do ficheiro"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Gardáronse todas as partes do ficheiro."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Cargando ficheiros temporais dende %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Cargando parte %u de %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "ERRO: Non se puido cargar o ficheiro da copia de seguridade. Busque en https://github.com/amule-org/amule/discussions para atopar unha solución e recuperar os ficheiros part.met."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Todas as partes do ficheiro cargadas."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Non se atoparon ficheiros parciais"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Atopado %u ficheiro partido"
 msgstr1 "Atopados %u ficheiros partidos"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "O sistema de ficheiros do directorio temporal non permite ficheiros grandes."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "O sistema de ficheiros do directorio de descarga non permite ficheiros grandes."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Descargando %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "O ficheiro «%s» xa se está descargando"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "O ficheiro «%s» xa está descargado"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "O ficheiro «%s» xa está descargado"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "O ficheiro %s xa se está descargando"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Non se puido converter a ligazón magnet a eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Protocolo da ligazón descoñecido: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 "Non se puido engadir a ligazón %u (consulte o rexistro)."
 msgstr1 "Non se puideron engadir as ligazóns %u (consulte o rexistro)."
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Ligazón eD2k inválida! ERRO: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "O cliente enviou un paquete despois de que fallara a identificación."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Conexión externa pechada."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Conexións externas desactivadas por mor dun contrasinal baleiro!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Conexións externas desactivadas no ficheiro de configuración"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Nova conexión externa aceptada"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERRO: non se puido aceptar unha nova conexión externa"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Conexións externas desactivadas por mor dun contrasinal baleiro nas preferencias!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Conectando ao cliente: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Versión descoñecida"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "CE incorrecto na ID de versión, os programas non son compatibles. Use a mesma versión para o núcleo e para o remoto."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "Non se pode conectar a una versión estable dende una versión de desenvolvemento calquera! Evitada posible fallo do programa"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Versión do protocolo inválida."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Marcador da versión do protocolo inexistente."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Tentarase conectar automaticamente ao servidor en %d segundo"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Fallou a identificación: o resumo criptográfico (hash) usado coma contrasinal CE é inválido."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Fallou a identificación: contrasinal erróneo."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Fallou a identificación: falta o contrasinal."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Petición inválida, primeiro identifíquese."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Acceso concedido."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Enviando mensaxe «%s» ao cliente."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Intento de acceso non autorizado dende %s. Conexión pechada."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Fallou a orde PartFile remota: FileHash non atopado: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "FileHash non atopado: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! Erro ao procesar o OpCode!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Servidor non engadido"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "servidor non atopado: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "necesita definir o servidor que quere eliminar"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k está desactivado nas preferencias."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr "Non se atopou o amigo."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr "Non se atopou o ficheiro."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr "EC_TAG_FRIEND_SHARED precisa de EC_TAG_FRIEND ou EC_TAG_CLIENT."
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Busca en progreso. Obterá os resultado nun intre!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Non ten sentido usar WebSearch dende unha interface remota."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Busca en progreso. Obterá os resultado nun intre!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Sen puntos para a gráfica."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "O seu cliente non está configurado para este nivel de detalle."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Conexión externa: apagado solicitado"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Xa se está apagando."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Conexión externa: engadinda ligazón «%s»."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Fallaron %d de %d ligazóns (por non valer ou xa estar na lista)."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Ficheiro non atopado."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Nome de ficheiro inválido."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Imposible cambiarlle o nome ao ficheiro."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Pechar esta conversa."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Comezada nova sesión da conversa"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Pechar esta conversa."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad está desactivado nas preferencias."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Nome descoñecido)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad está desactivado nas preferencias."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Xa está conectado ao eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Conectando ao eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Xa está conectado a Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Conectando a Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Tódalas redes están desactivadas."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Desconectado do eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Desconectado de Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, 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:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Opcode inválido (versión do protocolo inválida?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Extensión «%s» descoñecida para a orde «%s».\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Orde descoñecido «%s».\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1887,7 +2413,7 @@
 "\n"
 "Esta orde non pode ter un parámetro.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1895,7 +2421,7 @@
 "\n"
 "Esta orde deber ter un parámetro.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1903,7 +2429,7 @@
 "\n"
 "Esta orde está incompleta, debe usar unha das extensión amosadas abaixo.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1911,11 +2437,11 @@
 "\n"
 "Extensións dispoñibles:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Orde dispoñibles:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1926,17 +2452,17 @@
 "As ordes non diferencian entre maiúsculas e minúsculas\n"
 "Escriba «%s <orde>» para obter información exhaustiva da <orde>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Sae da aplicación."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Amosar axuda."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1944,7 +2470,7 @@
 "Para obter axuda sobre unha orde, escriba «help <orde>».\n"
 "Para obter a lista completa de ordes, escriba «help».\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1955,46 +2481,46 @@
 "Use «%s» para amosar a lista de ordes\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Erro de sintaxe!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "Ocorreu un problema ao procesar a orde - isto non debería pasar! Avise do problema\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Esta orde non debería ter ningún parámetro."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Esta orde debe ter algún parámetro."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Parámetro inválido."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Esta orde está incompleta."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Escriba «%s» para obter máis axuda.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Isto é %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Isto é %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -2002,7 +2528,7 @@
 "\n"
 "Creando cliente...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2011,7 +2537,7 @@
 "\n"
 "Vale, saíndo de %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2025,118 +2551,361 @@
 "\n"
 "Saíndo...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Amosar este texto de axuda."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Anfitrión onde se está executando aMule. (por omisión: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Porto de aMule para conexión externa. (por omisión: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Contrasinal para conexión externa."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Ler configuración do ficheiro."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Non imprimir nada á saída normativizada (stdout)."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Explanarse - mostrar ademais as mensaxes de depuración."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Establecer o idioma do programa."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Escribir opcións da liña de ordes ao ficheiro de configuración."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Crea un ficheiro de configuración baseándose no ficheiro de configuración de aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Amosar versión de programa."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Detalles do ficheiro"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% feito"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Previsualizar ficheiro"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "ERRO: Non se puido executar o reprodutor multimedia externo! Orde: «%s»"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ERRO: Non se puido abrir o partfile «%s»"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Benvido!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Conectado a colega"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Estado de conexión:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Redes"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Porto TCP normativizado "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Porto UDP ampliado (Kad / busca global) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Activar UPnP para configurar os portos no encamiñador"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Arranque autónomo (dende cero)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "O ficheiro %s xa se está descargando"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Actualizar automáticamente a lista de servidores no arranque"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "Arrancar aMule automaticamente ao iniciar sesión"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Cartafol de destino para descargas"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Navegador"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Compartiranse todos os ficheiros do cartafol co resto de parceiros)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Cartafol para ficheiros de descarga temporais"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Non se puido obter a lista de amigos do ficheiro «emfriends.met»!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Non se puido escribir a lista de amigos ao ficheiro «emfriends.met»!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "CRÍTICO - non hai cliente en StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Amigos"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Ver &Detalles"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Engadir un amigo"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Borrar amigo"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Enviar &Mensaxe"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Ver ficheiros"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Establecer Oco para un Amigo"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Está seguro de que quere borrar a amizade seleccionada?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Está seguro de que quere borrar as amizades seleccionados?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2144,978 +2913,1299 @@
 "Non está permitindo establecer máis dun espazo de amigo.\n"
 " Só se asignou un espazo."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Selección múltiple"
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Non está permitindo establecer máis dun espazo de amigo.\n"
-" Só se asignou un espazo."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Enviar mensaxe ao usuario"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Mensaxes a enviar:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Borrar da lista de amigos"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Enviar mensaxe"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Intercambiar a este ficheiro"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "En lista de espera: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Preguntando por outro ficheiro"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Agardando ocasión para o envío"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "En cola: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Enviando"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Ningún"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Non"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Si"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Non se pode abrir %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Descargando..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "Descarga HTTP cancelada"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "A URL para descargar non pode estar baleira"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Non se puido crear unha petición HTTP para %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr "Descarga HTTP: corpo da resposta baleiro para %s"
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Non se puido mover o ficheiro descargado a %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Descargado %s (%llu octetos)"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr "A URL %s devolveu: %i"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Non se puido descargar %s mediante HTTP: %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr "Recibiuse un HTTP 401 (non permitido) para %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr "Descargue un %s novo dende %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "A descarga de %s fallou, cancelouse a actualización."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Non se puido eliminar o ficheiro %s, cancelando actualización."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Non se lle puido cambiar o nome ao ficheiro %s, cancelando a descarga."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "%s actualizado con éxito"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr "Fallou a actualización de %s"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Non se puido descargar %s dende %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Non se puido cargar información do país para «%s»."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Cargando os filtros de IP en «ipfilter.dat» e «ipfilter_static.dat»."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Non se puido cargar o ficheiro ipfilter.dat (%s), atopouse un formato descoñecido."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "Non se puido cargar o ficheiro ipfilter.dat (%s), non se puido abrir o ficheiro."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "Cargado rango de IP %u dende «%s»."
 msgstr1 "Cargados rangos de IP %u dende «%s»."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u liña malformada foi descartada."
 msgstr1 "%u liñas malformadas foron descartadas."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Non se lle puido cambiar o nome ao ficheiro %s, cancelando actualización."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "O filtro de IP está listo"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Arrancando dende cero a partir de \n"
-"clientes coñecidos"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Actual"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Media de execución"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Media de sesión"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Nodos (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Ip inválida para o arranque"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Porto inválido para o arranque"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Enche todos os campos requiridos"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Mensaxe"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "Quere descargar un ficheiro nodes.dat novo?\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Se fai isto borrará os nodos actuais e reiniciarase a conexión Kademlia."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Continuar?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: palabra de busca demasiado curta"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: A palabra buscada xa está na lista de buscas: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Non se puido ler o ficheiro nodes.dat, é demasiado vello. Esta versión (0) xa non é compatible."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Lido %u contacto Kad"
 msgstr1 "Lidos %u contactos Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Non se atoparon contactos, por favor realice un arranque autónomo ou descargue un ficheiro nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Só %d contacto Kad dispoñíbel, non se escribiu o nodes.dat"
 msgstr1 "Só %d contactos Kad dispoñíbeis, non se escribiu o nodes.dat"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Escribiuse %d contacto Kad"
 msgstr1 "Escribíronse %d contactos Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Red Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Tamaño do ficheiro"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Relación enviado/descargado"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Enviado"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Solicitado"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Fontes completas"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "AVISO: A lista de ficheiros coñecidos corrompeuse por mor dunha cabeceira inválida."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Non se puido cargar o campo da lista de ficheiros coñecidos. Pode ser que se corrompera o ficheiro"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Campo inválido na lista de ficheiros coñecidos, Pode ser que se corrompera o ficheiro: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Predeterminado"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanés"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Árabe"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturiano"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Euskera"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Búlgaro"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Catalán"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Chinés (Simplificado)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Chinés (Tradicional)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Croata"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Checo"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Danés"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Holandés"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Inglés (R. U.)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Inglés (R. U.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estonio"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finlandés"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francés"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galego"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Alemán"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grego"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Húngaro"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italiano"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Xaponés"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Coreano"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Noruegués (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polaco"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugués"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugués (Brasileiro)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Rumano"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Ruso"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Esloveno"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Castelán"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Sueco"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turco"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ucraniano"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Erro descoñecido %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Non se puido obter unha descrición do erro %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Creando o hash"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Rematando"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Rematado"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Pausado"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Erróneo"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Agardando"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Debe especificar un contrasinal non baleiro."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Contrasinal inválido, sen un hash MD5!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Erro de conexión"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Conexión externa pechada."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "Fallou a conexión CE. Resposta baleira."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Conexión externa: Mala resposta do servidor, fallou o saúdo. Conexión pechada."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Conexión externa: Mala resposta do servidor, fallou o saúdo. Conexión pechada."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Éxito! Conexión establecida a aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Éxito! Conexión establecida."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Conexión externa: Acceso denegado debido a: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Conexión externa: Fallou o saúdo."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Fío de E/S asíncrono %d iniciado"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: Correcto."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "ERRO: Non se puido escoitar no porto TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "ERRO: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "AVISO: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Pechar"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Ilimitado"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Mostrar aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Ocultar aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr "Conectado (ID Baixa)"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr "Conectado (ID Alta)"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr "Conectado (tras devasa)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr "Servidor: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr "IP do servidor: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Non conectado"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Porto TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Porto TCP: Sen preparar"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Porto UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Porto UDP: Sen preparar"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Información do cliente"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Límite de envío"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Límite de descarga"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Mostrar aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Desconectar"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Ocultar aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Conectar"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Saír"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Ilimitado"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Menú aMule"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Límites de velocidade:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "EV: Ningunha"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "EV: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DE: Ningunha"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DE: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Velocidade de descarga: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Velocidade de envío: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Alcume: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Non seleccionou un alcume!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID do cliente: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Nome do servidor: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP de servidor: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Non conectado"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Sinatura En liña: Activada"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Sinatura En liña: Desactivada"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Tempo de execución: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Ficheiros compartidos: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Clientes na cola: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Total DE: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Total EV: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Ligazón eD2k: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Enviar"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Engadir unha ligazón eD2k ou unha ligazón magnet ó núcleo."
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Engadir amigo"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Preme aquí para engadir a ligazón eD2k no cadro á cola das descargas."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Os eventos amósanse aquí. Para unha lista completa de eventos consulte o rexistro da lapela de servidores."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Cargando ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Usuarios: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Usuarios conectados ao servidor actual e unha estimación do número total de usuarios."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Enviado: 0.0 | Descargado: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Índice actual de envíos e descargas. Se está activado os números entre corchetes indican os datos gastados na comunicación do cliente."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Amosa o estado de conexión e as transferencias activas. As frechas vermellas indican que non está conectado, as frechas amarelas indican que ten ID-Baixa (detrás dunha devasa) e as frechas verdes indican que ten ID-Alta (o tipo de conexión óptima)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Non conectado ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Servidor actualmente conectado."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Buscar"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nome:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tipo"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Parámetros de filtrado"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtrado"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Tipo de ficheiro"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Calquera"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Arquivos"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "Copia de CD"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Imaxes"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programas"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Textos"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Extensión"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Tamaño mínimo"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Octetos"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Tamaño máximo"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Dispoñibilidade"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtrado:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Resultados do filtro"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtrado"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Inverter resultado"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Agochar ficheiros coñecidos"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Borrar campos"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Comezar"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Máis"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Extensión"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr "Solicitar que os clientes Kad contactados estendan a busca. Cada pulsación solicita os contactos do cliente máis preto (KADEMLIA_FIND_VALUE_MORE), amosando máis ficheiros coincidentes que pode ser que non apareceran na fronteira alfa da busca inicial."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Deter"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Descargar"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Descargar na categoría"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Resultados da busca"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Borrar campos"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Limpar descargas completadas"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtrado:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Fontes do ficheiro:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Xeral"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Nome completo :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Nome completo"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "Ficheiro .met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Resumo criptográfico (Hash)"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Ficheiro .met:"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Resumo criptográfico (Hash) :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Tamaño do ficheiro:"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Estado do ficheiro parcial:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Visto completo por última vez:"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Tamaño do ficheiro"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Transferir"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Fontes atopadas:"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Enviando fontes :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Número de partes:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Dispoñible :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Estado do ficheiro parcial"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Visto completo por última vez"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Fontes atopadas"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Enviando fontes"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Número de partes"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Dispoñible"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Fluxo de datos"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Tempo coa descarga activa"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Tamaño total"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Fluxo de datos :"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Tempo coa descarga activa: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Transferido :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Tamaño total :"
-
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Xestión Intelixente da Corrupción"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Perdido por corrupción:"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Gañado por compresión:"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Paquetes salvados pola X.I.C. :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Perdido por corrupción"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Gañado por compresión"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Paquetes salvados pola X.I.C."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Compartindo: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Peticións"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Peticións aceptadas"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Datos transferidos"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Media de datos compartidos"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Fontes completas"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Ficheiros compartidos"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Enviado: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Info. Kad"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Non evaluada"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Título"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Nome do ficheiro"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Tomar"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Limpar"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Aceptar"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Engadir un comentario/cualificación sobre o ficheiro (todos os usuarios poderán velo)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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."
@@ -3123,528 +4213,537 @@
 "Para unha película vostede pode dicir que é largo, a súa historia, o idioma ...\n"
 "e se é un ficheiro falso, pode advertir ós outros usuarios do aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Calidade do ficheiro"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Non evaluada"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Inválido / Corrupto / Falsificación"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Pobre"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Aceptable"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Boa"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Excelente"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Avalíe o ficheiro ou advirtalle a outros usuarios se non é válido ..."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Desconectado de Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Descargando, agarde un intre ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Tamaño descoñecido"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Información requerida"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Enderezo IP :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Porto :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Porto"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Nome de usuario :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Hash do usuario :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Hash do usuario"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Engadir"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Velocidade de descarga"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Actual"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Media de execución"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Media de sesión"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Velocidade de envío"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Conexións"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Descargas activas"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Conexións activas (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Envíos activos"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Árbore de estadísticas"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Nome de usuario:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Hash do usuario :"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Software do cliente :"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Versión do cliente :"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Software do cliente"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Versión do cliente"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID do usuario"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP do servidor"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Enderezo IP :"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Nome do servidor"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID do usuario :"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP do servidor :"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Nome do servidor :"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Ofuscación:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Ofuscación"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Ofuscación do protocolo"
+
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Transferencias ao cliente"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Peticións actuais:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Taxa media de envío:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Índice medio de descarga :"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Enviado (sesión):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Descargado (sesión):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Enviado (total):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Descargado (total):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Peticións actuais"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Taxa media de envío"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Índice medio de descarga"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Enviado (sesión)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Descargado (sesión)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Enviado (total)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Descargado (total)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modificador DE/EV :"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Identidade segura:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Posición na cola:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Puntuación na cola:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Identidade segura"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Posición na cola"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Puntuación na cola"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Alcume"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - A Mula multi-plataforma"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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 conecten a vostede."
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Idioma: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "O retardo antes de mostrar as mensaxes emerxentes."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Isto especifica a linguaxe empregada nas interfaces."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Comprobar se hai unha nova versión ao iniciar"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Activar isto fará que aMule comprobe se hai unha nova versión ao iniciarse"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
-msgstr "Arrancar aMule automaticamente ao iniciar sesión"
-
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr "Crea unha configuración de usuario para que o sistema operativo inicie aMule ao entrar. Se polo que sexa móvese o programa aMule, execúteo unha primeira vez a man para actualizar a configuración."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Iniciar minimizado"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Activando isto aMule minimizarase tras iniciarse."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Preguntar antes de saír"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Obrigar a aMule a pedir confirmación antes de saír."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Activar icona na bandexa"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Isto Activa/Desactiva a icona da bandexa do sistema (ou barra de tarefas)."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Pechar a fiestra da aplicación cando se prema o botón de pechar"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimizar na bandexa do sistema"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Activando isto aMule minimizarase na bandexa do sistema, no canto de na barra de tarefas."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "Amosar unha notificación ao rematar a descarga"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "Activando isto aMule avisaralle cando remate a descarga."
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Recordar esas opcións"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Retardo da información sobre as ferramentas: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "segundos"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Introduza o nome do seu navegador aquí. Deixe o campo baleiro para empregar o navegador predeterminado do sistema."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Navegador"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Abrir nunha nova lapela se é posible"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Abrir as páxinas web nunha nova solapa, en lugar de nunha nova xanela"
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Reprodutor de vídeo"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Límites de ancho de banda"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Enviar"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Asignación de ocos"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Portos"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Porto TCP normativizado "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Este é o porto eD2k normativizado e non se pode desactivar."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Porto UDP para peticións do servidor (TCP+3)"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Porto UDP ampliado (Kad / busca global) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Este porto UDP úsase para peticións eD2k ampliadas e para a rede Kad"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Activar UPnP para configurar os portos no encamiñador"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "Porto TCP para UPnP (Opcional):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Ligar dirección local á IP (deixe baleiro para calquera):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 msgid "Advanced users only: If you have multiple network interfaces, enter the address of the interface to which aMule should be bound."
 msgstr "Só usuarios experimentados: Se ten varias interfaces de rede, introduza a dirección da interface que quere que aMule use."
 
-#: src/muuli_wdr.cpp:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Ligar dirección local á IP (deixe baleiro para calquera):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Límite de fontes por ficheiro descargado:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Conexións simultáneas máximas:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Conectar automaticamente ao iniciarse"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Volver a conectarse ao perder a conexión"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Eliminar servidores caídos tras"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "intentos"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Actualizar automáticamente a lista de servidores no arranque"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Actualizar a lista de servidores ao conectarse a un servidor"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Actualizar a lista de servidores cando un cliente se conecte"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Usar sistema de prioridades"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Control intelixente da IDBaixa ao conectar"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Conexión segura"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Conectar automaticamente só a servidores fixos"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Asignar alta prioridade aos servidores engadidos manualmente"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Xestión Intelixente de Corrupcións (X.I.C, I.C.H en inglés)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Activada"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr "O X.I.C. avanzado confía en cada hash (non recomendado)"
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Poñer en pausa os ficheiros engadidos á lista de descargas"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Engadir os novos ficheiros compartidos con prioridade Automática"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Tentar descargar antes o primeiro e último anaco do ficheiro"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Comezar co seguinte ficheiro que estea pausado cando remate o ficheiro actual"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Da mesma categoría"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "En orde alfabética"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Reservar espazo no disco para os novos ficheiros"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Reserva o tamaño do ficheiro no disco para reducir a fragmentación"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Parar descargas canto o espazo libre no disco acade "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr "Seleccione esta opción se quere que aMule comprobe o espazo libre no disco"
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Introduza o espazo mínimo de disco desexado."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Gardar 10 fontes en ficheiros raros (< 20 fontes)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Enviado"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Engadir novas descargas con prioridade Automática"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Cartafol de destino para descargas"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Xestión Intelixente de Corrupcións (X.I.C, I.C.H en inglés)"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Activada"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "O X.I.C. avanzado confía en cada hash (non recomendado)"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
@@ -3652,601 +4751,707 @@
 "Aquí gárdanse as descargas completas. Automaticamente compartiranse todos os ficheiros do cartafol co resto de parceiros.\n"
 "Se o cartafol tamén conten ficheiros privados, apunte a ruta a un cartafol só para aMule."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr "Escolla o cartafol onde gardar as descargas completas. Compartiranse todos os ficheiros do cartafol co resto de parceiros."
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr "(Compartiranse todos os ficheiros do cartafol co resto de parceiros)"
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Cartafol para ficheiros de descarga temporais"
-
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "Cartafoles compartidos"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Eliminar"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Preme co botón dereito na icona do cartafol para compartir recursivamente)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Compartir ficheiros ocultos"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr "Revisar automaticamente se hai cambios nos cartafoles compartidos"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Servidor remoto"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Servidor local"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Gráficas"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Intervalo de actualización: 5 segs"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Tempo de media do gráfico: 100 minutos"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala do gráfico das conexións: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Escala do gráfico de descargas:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Escala do gráfico de envíos:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Cores: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Fondo"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Enreixado"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Descarga actual"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Media das descargas en execución"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Media de descargas na sesión"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Subida actual"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Media de subida en execución"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Media de subida na sesión"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Conexións activas"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr "Barra de velocidade na bandexa do sistema"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Nodos Kad actuais"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Nodo Kad executándose"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Nodos Kad na sesión"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Árbore"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Cantas versións do cliente a amosar (0=ilimitado)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "ADVERTENCIA !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Novas conexións máx. / 5 segs"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "Intervalo de actualización do FTP en minutos"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "Intervalo de actualización do FTP en minutos"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tamaño do búfer de ficheiro: 240 000 octetos"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Tamaño cola de espera: 5000 clientes"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervalo de actualización de conexión ao servidor: Desactivado"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Impedir que o ordenador entre en modo espera"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Tema a usar: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Amosar «Xestor rápido de ligazóns eD2k» en cada xanela."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Mostrar información engadida nas lapelas das categorías"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Amosar a versión da aplicación no título"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Mostrar velocidades de transferencia no título"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Antes do nome da aplicación"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Despois do nome da aplicación"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Amosar ancho de banda malgastado"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Barra de ferramentas en orientación vertical"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Cola de Descargas"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Amosar porcentaxe de progreso"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Amosar barra de progreso"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plana"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "3D"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Clasificar ficheiros automaticamente (consume bastantes recursos)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule ordenará as columnas na súa lista de descargas automaticamente"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parámetros da Conexión Externa (CE)"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Aceptar conexións externas"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP da interface na que escoitar:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "Introduza aquí a IP (válida, no formato a.b.c.d) da interface para a CE. Un campo baleiro ou 0.0.0.0 significa calquera interface."
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Porto TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Activar a configuración de portos por UPnP para o porto de CE"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Contrasinal"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Parámetros do servidor Web"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "Porto TCP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Comprobando contrasinal\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Comprobando contrasinal\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Denegar acceso de invitado"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Contrasinal de invitado para o servidor web"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Parámetros do servidor Web"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Arrancar o servidor web ao iniciar"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Modelo Web"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Contrasinal para o administrador"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Activar invitado"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Contrasinal para o invitado"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Configurar o porto do servidor web mediante UPnP"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Porto TCP para o UPnP do servidor web (Opcional)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Tempo de actualización da páxina (en segs)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Activar compresión Gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Predeterminado"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Vale"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Aplicar calquera troco feito nas preferencias."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Restablecer calquera troco feito nas preferencias."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Título :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Comentario :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Cartafol de descargas :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Cambiar prioridade para os novos ficheiros asignados :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Cartafol de descargas"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Cambiar prioridade para os novos ficheiros asignados"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Non cambiar"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Seleccionar cor para esta categoría (a seleccionada) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Restablecer"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Seleccionar cor para esta categoría (a seleccionada)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Premer este botón para reiniciar o rexistro."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Premer neste botón para actualizar a lista de servidores desde a URL ..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Lista de servidores"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "Introduza a URL dun ficheiro server.met e prema o botón da esquerda para actualizar a lista de servidores coñecidos."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Engadir servidor manualmente: Nome"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Introduza o nome do novo servidor aquí"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Porto"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Introduza a IP do servidor aquí, usando o formato x.x.x.x ."
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Introduza o porto do servidor aquí."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Engadir servidor manualmente (antes enche os campos á esquerda) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Rexistro de aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Info. do servidor"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Info. ED2K"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Info. Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Prema neste botón para actualizar a lista de nodos dende a URL ..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nodos (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Estatísticas de nodos"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Arranque autónomo (dende cero)"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Novo nodo"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Porto:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
 msgstr "Arrancar a partir de clientes coñecidos"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Desconectar Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Introduza a IP do servidor aquí, usando o formato x.x.x.x ."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Empregar a Identificación Segura do Usuario"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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 a ISU non se habilitou."
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Ofuscación do protocolo"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Aceptar a ofuscación do protocolo"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Esta opción activa a ofuscación do protocolo, e permite que aMule acepte conexións ofuscadas doutros clientes."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usar ofuscación para as conexións saíntes"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Esta opción fai que aMule use a ofuscación de protocolo cando se conectan outros clientes/servidores."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Aceptar só conexións ofuscadas"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "Esta opción fai que aMule só acepte conexións ofuscadas. Terá menos fontes, pero todo o tráfico estará ofuscado"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Todos"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Ninguén"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Quen pode ver os meus ficheiros compartidos:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Filtrado de IPs"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtrar clientes"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Activar filtrado das IPs dos clientes definidas no ficheiro ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtrar servidores"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Activar filtrado das IPs dos servidores definidas no ficheiro ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Recargar lista"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Actualizar agora"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Auto-actualizar o filtrado de IPs ao iniciarse"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Nivel de filtrado:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Filtrar sempre IPs LAN"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Xestión paranoica de IPs non coincidintes"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Rexeitar os paquetes se a IP do cliente é distinta á da IP de onde se recibe o paquete. Usar con coidado."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Empregar un ipfilter.dat global se está dispoñible"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "De non atopar o ipfilter.dat local, permitir o emprego dun ipfilter global."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Activar Sinatura En liña"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Habilitar a escritura de ficheiros do SE. Sóese usar para crear sinaturas para aplicacións externas."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Frecuencia de actualización (segs):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Cambiar a frecuencia (en segundos) da actualización da sinatura en liña."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Gardar o ficheiro de sinaturas en liña en: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "Prema aquí para seleccionar o directorio que contén os ficheiros de sinaturas en liña."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Amosar as bandeiras do país de orixe dos clientes"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Fluxo de datos :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Fontes"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4254,11 +5459,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4268,518 +5473,590 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Descargado: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Auto-actualizar o filtrado de IPs ao iniciarse"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrar mensaxes entrantes (excepto as da conversación actual):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtrar todas as mensaxes"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtrar mensaxes de xente que non estea na lista de amigos"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtrar mensaxes de clientes descoñecidos"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrar mensaxes que conteñan (use «,» como separador):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "engada aquí palabras para filtrar e bloquear as mensaxes que coincidan"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Amosar as mensaxes recibidas no rexistro"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Comentarios"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrar comentarios que conteñan (empregue «,» coma separador):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Activar identificación"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Activar/desactivar a identificación mediante nome de usuario e contrasinal"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Nome de usuario: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "O nome de usuario a usar para conectarse ao proxy"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Contrasinal:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "O contrasinal a empregar para conectarse ao proxy"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Activar proxy"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Activar/desactivar o tipo de proxy"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Tipo de proxy:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Anfitrión do proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Tipo de proxy"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Anfitrión do proxy"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "O nome do anfitrión do proxy"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Porto do proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Porto do proxy"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "O porto do proxy"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Activar identificación"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Activar/desactivar a identificación mediante nome de usuario e contrasinal"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "O nome de usuario a usar para conectarse ao proxy"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "O contrasinal a empregar para conectarse ao proxy"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Conectar a:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Conectar a amule remoto"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Nome de usuario"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Recordar esas opcións"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Conexión externa pechada."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Usar compresión gzip"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Activar Rexistro de Depuración Estendido."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Só ao ficheiro do rexistro"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Categorías das mensaxes:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Engadir importados"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Tentar de novo o seleccionado"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Borrar seleccionados"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Tipos de eventos"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr "Estadísticas e clientes esperando para os ficheiros seleccionados: Sesión / Total"
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Envíos activos"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Porcentaxe de todos os ficheiros"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Amosar clientes para"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Ficheiros selecionados"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Só subidas activas"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Amosar clientes para"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Recargar:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Recargar os seus ficheiros compartidos"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Enviar"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Enviar a mensaxe especificada."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Pechar esta conversa."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Conectar a calquera servidor e/ou Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Cancelar"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Ficheiros compartidos"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Desconectar"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Conectar"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Desactivado %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "octeto"
 msgstr1 "octetos"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "octeto/seg"
 msgstr1 "octetos/seg"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "segundos"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "minutos"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "horas"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Días"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "días"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "todo"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "todo o demais"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Incompleto"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arquivo"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Texto"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Activo"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Usando directorio de configuración: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Esta orde non debería ter ningún parámetro."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Esta orde non debería ter ningún parámetro."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Esta orde non debería ter ningún parámetro."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Esta orde non debería ter ningún parámetro."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Introduza o porto do servidor aquí."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Introduza o porto do servidor aquí."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Introduza o porto do servidor aquí."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Esperando que o fío remate de converter os ficheiros partidos..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Importando %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Lendo o cartafol temporal"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Obtendo información básica do ficheiro con información da descarga"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Creando ficheiro de destino"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Cargando datos dunha descarga previa (%u de %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "Gardando o bloque de datos dun novo ficheiro de descarga (%u de %u)"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Obtendo información do ficheiro de descarga fonte"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Engadindo descarga e gardando novo ficheiro parcial"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importar ficheiros parcial"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Estado"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Hash do ficheiro"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Disco: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "Escolla un cartafol para buscar descargas temporais! (subcartafois incluídos)"
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Borrar os ficheiros orixinais dunha descarga importada sen fallos?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Borrar fontes?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "ERRO: Non se puido crear o ficheiro partido"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Tentando cargar a copia de seguranza do ficheiro met dende %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "ERRO: Non se puido abrir o ficheiro part.met: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr "ERRO: o ficheiro part.met ten tamaño 0: %s ===> %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "ERRO: Versión do part.met inválida: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Erro: %s (%s) está corrupto (etiquetas erróneas: %s), imposible cargar o ficheiro."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "ERRO: %s (%s) está corrupto (conta de etiquetas errónea), imposible cargar o ficheiro."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Tentando recuperar información de ficheiro..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Recuperada toda a información dispoñible do ficheiro :D - Tentando empregala..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Imposible recuperar información de ficheiro :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Non se pode abrir %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "AVISO: %s pode estar corrupto (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "ERRO ao gardar o ficheiro parcial: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Ocorreu un fallo de E/S ao gardar o ficheiro parcial: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr "Escribíronse 0 de a saber cantos octetos de «%s» -- manterase o .part.met actual."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "Non se puido gardar o ficheiro part.met.seeds por %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Gardada %i semente fonte para o ficheiro parcial: %s (%s)"
 msgstr1 "Gardadas %i sementes fonte para o ficheiro parcial: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Non se puido ler o ficheiro coas sementes para o ficheiro parcial %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "Non se puido ler o ficheiro coas semente do ficheiro parcial (%s - %s): %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Parte corrupta atopada (%d) en %d ficheiro parcial %s - FileResultHash |%s| FileHash |%s|"
 msgstr1 "Parte corrupta atopada (%d) en %d ficheiros parcial %s - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Parte (%i) completada atopada en %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Rematouse a recreación do hash %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Ocorreu un erro inesperado mentres se completaba %s. Ficheiro pausado"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Rematouse a descarga: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4788,307 +6065,155 @@
 "Rematouse a descarga:\n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Eliminando ficheiro: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "AVISO: Non se puido crear o hash da parte descargada, o conxunto de hashes de «%s» está incompleto"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "ERRO: Non se puido crear o hash da parte descargada, o conxunto de hash de «%s» está incompleto. Isto non debería ocorrer en absoluto"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr "Parte %u de «%s» aparece como completada, pero o ficheiro parcial é máis pequeno do que debería (temos %llu octetos, precisamos %llu); intentando outra vez a descarga."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "Chegouse ao fin de ficheiro mentres se facía o hash da parte %u descargada con lonxitude %u (máx. %u) do ficheiro partido «%s» con lonxitude %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "AVISO: Non hai suficiente espazo libre no disco! Parando ficheiro: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Part descargado %i é corrupto no ficheiro: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr "XIC: Part corrupto recuperado %i para %s -> Octetos gardados: %s"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Reservando"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Espazo no disco insuficiente"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Descargado"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ERRO: Non se puido abrir o partfile «%s»"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Predeterminado"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanés"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Árabe"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Euskera"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Catalán"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Chinés (Simplificado)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Chinés (Tradicional)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Croata"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Checo"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danés"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Holandés"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Inglés (R. U.)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "Inglés (R. U.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estonio"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finlandés"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francés"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galego"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Alemán"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grego"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebreo"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Húngaro"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italiano (Suizo)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Xaponés"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Noruegués (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polaco"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugués"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugués (Brasileiro)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Rumano"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Ruso"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Esloveno"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Castelán"
+msgid "Extended source exchange"
+msgstr "Intercambio de fontes"
 
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Sueco"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turco"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ucraniano"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Cambiar idioma"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Non hai traducións instaladas para aMule"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Ningunha lingua dispoñible"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "non hai opcións disponibles"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "Categoría inválida atopada, saltandoa"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Categoría inválida atopada, saltandoa"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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 é TCP+3"
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Empregarase o porto predeterminado (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Conexión"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Cartafoles"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Servidores"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Ficheiros"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Seguranza"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interface"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtros"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Controles remotos"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Sinatura En liña"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Eventos"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Depuración"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5098,15 +6223,15 @@
 "    %PARTFILE - ruta completa do ficheiro\n"
 "    %PARTNAME - nome do ficheiro"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr "Para poder engadir unha icona precisa ter libayatana-appindicator3 durante a compilación."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr "Non dispoñible en Wayland: o protocolo non pode avisar se se minimiza unha xanela, polo que non se pode interceptar o botón de minimizar. Como alternativa, execute aMule con «GDK_BACKEND=x11» para usar XWayland."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5122,26 +6247,43 @@
 "aMule funcionará ben sen que cambie ningún\n"
 "destes parámetros."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr "Non se puido conectar a configuración ao compoñente coa ID %d e chave %s"
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr "Non se puido transferir información dende a configuración ao compoñente con ID %d e chave %s"
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "O tipo de proxy ao que se está a conectar"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr "Non se puido transferir información entre o compoñente e a configuración con ID %d e chave %s"
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Comprobando contrasinal\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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 ""
+"Permítense conexións externas pero non se especificou un contrasinal.\n"
+"As conexións externas non poden ser activadas ate que se especifique un contrasinal válido."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5149,31 +6291,45 @@
 "aMule debe ser reiniciado para activar estes trocos:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- Porto TCP cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- Porto UDP cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "- Cambiada interface da conexión externa.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Cambiado o porto da conexión externa.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Cambiada a aceptación da conexión externa.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Cambiada interface da conexión externa.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- Cambiada opción da ofuscación do protocolo.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Idioma cambiado.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5181,27 +6337,33 @@
 "A túa lista de servidores para auto-actualizar está baleira.\n"
 "Desactivarase a actualización no inicio."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
-"Permítense conexións externas pero non se especificou un contrasinal.\n"
-"As conexións externas non poden ser activadas ate que se especifique un contrasinal válido."
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Idioma cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Cartafol temporal cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- Rede eD2K activada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Versión do protocolo inválida."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5209,7 +6371,7 @@
 "Tanto eD2k e Kad están desactivados.\n"
 "Non poderás conectarte ate activar algún dous."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5217,7 +6379,7 @@
 "Kad non se iniciará se non está activado o porto UDP.\n"
 "Active o porto UDP ou desactive Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5227,19 +6389,71 @@
 "Debe reiniciar o aMule agora.\n"
 "Se non o reinicia agora, ature coas consecuencias.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr "Non se puido configurar para que aMule arranque ao iniciar sesión. Pode ser que a configuración non permita modificacións."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr "Non se puido quitar o arranque ao inicio da configuración."
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr "Arrancar ao inicio"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "Non se puido configurar para que aMule arranque ao iniciar sesión. Pode ser que a configuración non permita modificacións."
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Non se puido quitar o arranque ao inicio da configuración."
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "Non se puido configurar para que aMule arranque ao iniciar sesión. Pode ser que a configuración non permita modificacións."
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the URL handler registration."
+msgstr "Non se puido quitar o arranque ao inicio da configuración."
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Establecido o contrasinal e habilitadas conexións externas."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5249,41 +6463,66 @@
 "Introduza polo menos unha URL dun ficheiro server.met.\n"
 "Prema no botón «Listar» para introducir unha URL."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Ficheiros temporais"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Ficheiros entrantes"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Sinaturas En Liña"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Escolla un cartafol para %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Atopado %i ficheiro compartido"
+msgstr1 "Atopados %i ficheiros compartidos"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Atopar o reprodutor de vídeo"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Seleccione o navegador"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Seleccione o navegador"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Executable%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Predeterminado"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Editar a lista dos servidores"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5291,115 +6530,115 @@
 "Engadir aquí unha URL para descargar unha lista server.met.\n"
 "Só unha url nesta liña."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Fontes completas"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Estado:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Estado:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Período de actualización: %d segundo"
 msgstr1 "Período de actualización: %d segundos"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Tempo medio de gráfico: %d min"
 msgstr1 "Tempo medio de gráfico: %d min"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Escala gráfica das conexións: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Tamaño do búfer dos ficheiros: %d octeto"
 msgstr1 "Tamaño do búfer dos ficheiros: %d octetos"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Tamaño da cola de subida: %d cliente"
 msgstr1 "Tamaño da cola de subida: %d clientes"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Intervalo de actualización da conexión ao servidor: %d minuto"
 msgstr1 "Intervalo de actualización da conexión ao servidor: %d minutos"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Intervalo de actualización da conexión ao servidor. Desactivada"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "desactivado"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Executar unha orde no evento «%s»"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Activar execución de ordes no núcleo"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Orde do núcleo:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Activar execución de ordes na interface gráfica"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Orde da interface gráfica:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "As seguintes variables serán substituídas:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
@@ -5407,1076 +6646,1342 @@
 "Estas carpetas semellan parte do sistema, ou que poden ser confidenciais:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr "Compartir de xeito recursivo publicará calquera ficheiro que teñan debaixo nas redes eD2k e Kad. Comprobe todo ben antes de continuar."
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr "Confirmar e compartir cartafoles"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
-msgstr "Recargando os ficheiros compartidos…"
-
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
-msgstr "Buscando subdirectorios…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
+msgstr "Recargando os ficheiros compartidos..."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
+msgstr "Buscando subdirectorios..."
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr "Actualizando os cartafoles compartidos"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
-msgstr "Buscáronse %u directorios…"
+msgid "Scanned %u directories..."
+msgstr "Buscáronse %u directorios..."
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Recargouse a lista de ficheiros compartidos: atopáronse %u ficheiros"
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Cartafoles compartidos"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Escolla un cartafol para %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Recordar esas opcións"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Aviso na busca"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "Non se pode buscar se tanto eD2k coma Kademlia están desactivados."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "Erro na busca"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
-msgstr "Busca de Kad: solicitóuselle ampliar a busca a un parceiro."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
+msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr "Busca de Kad: non quedan parceiros sen preguntar por máis resultados (acadouse o límite, ou inda non hai respostas)."
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Progreso da busca: %u %% \n"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Aviso na busca"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Principal"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Non se pode buscar en Kad se non está activo"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "AVISO: A lista de ficheiros coñecidos corrompeuse por mor dunha cabeceira inválida."
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Campo inválido na lista de ficheiros coñecidos, Pode ser que se corrompera o ficheiro: "
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "Ren palabras clave para a busca Kad - interrumpindo"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Ocorreu un erro inesperado tentando buscar en Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Busca de Kad: solicitóuselle ampliar a busca a un parceiro."
+
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Busca de Kad: non quedan parceiros sen preguntar por máis resultados (acadouse o límite, ou inda non hai respostas)."
+
+#: src/SearchList.cpp
+#, fuzzy, c-format
+msgid "Error %u: %s\n"
+msgstr "Fallou a actualización de %s"
+
+#: src/SearchListCtrl.cpp
 msgid "FileID"
 msgstr "IDFicheiro"
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
+#: src/SearchListCtrl.cpp
 #, fuzzy
-msgid "Bitrate"
-msgstr "Non evaluada"
-
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr ""
-
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Descargar na categoría"
-
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Obter %s para este ficheiro"
+msgid "Collapse all"
+msgstr "Pechar todas as lapelas"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Procurar ficheiros relacionados (eD2k, busca local)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Marcar o ficheiro como coñecido"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Copiar a ligazón eD2k ó portapapeis"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Copia as ligazóns eD2k ó portapapeis"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Está conectado ao servidor que tenta borrar. Por favor desconéctese primeiro."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Novo"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Executando"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finlandés"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Progreso da busca: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Progreso da busca non dispoñible"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Non se puido conectar a todos os servidores ofuscados listados. Tentándoo de novo sen ofuscación."
+
+#: src/ServerConnect.cpp
 msgid "Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."
 msgstr "Non se puido 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "Erro ao conectar a todos os servidores. Tentándoo de novo."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "Erro ao conectar a todos os servidores. Tentándoo de novo."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Tentarase conectar automaticamente ao servidor en %d segundo"
+msgstr1 "Tentarase conectar automaticamente ao servidor en %d segundos"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "Protocolo eD2k inhabilitado nos axustes, non se conectou."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Conectado a %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Conexión establecida a: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Ocorreu un erro fatal ao conectar. A conexión a internet podería estar desactivada"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Conexión perdida con %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) parece estar caído."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) parece estar cheo."
 
-#: 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"
-msgstr0 "Tentarase conectar automaticamente ao servidor en %d segundo"
-msgstr1 "Tentarase conectar automaticamente ao servidor en %d segundos"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Conexión perdida"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Non se puido conectar a %s (%s:%i)."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "ERRO: Conector inválido durante comprobación tras expirar o tempo"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "O intento de conexión %s (%s:%i) tardou demasiado."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Recibido resultado tardío da busca DNS, descartando."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Cargando ficheiro server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Ficheiro server.met non atopado!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Non se puido cargar o ficheiro server.met «%s», atopouse un formato descoñecido."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Non se puido abrir o server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "O ficheiro server.met está corrupto. Atopouse unha marca de versión inválida: 0x%x, tamaño %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i servidor atopado no server.met"
 msgstr1 "%i servidores atopados no server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d servidor engadido"
 msgstr1 "%d servidores engadidos"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Erro: o ficheiro «server.met» corrompeuse: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "Ocorreu un erro de E/S ao ler o ficheiro «server.met»: "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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 coincidente atopado na lista."
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Está conectado ao servidor que tenta borrar. Por favor desconéctese primeiro."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Non se puido abrir «%s»"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Non se puido gardar o ficheiro server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Ocorreu un erro de E/S ao ler o ficheiro «server.met»: "
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "URL inválida"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Finalizouse a descarga da lista dos servidores dende %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Non se encontrou unha entrada de dirección no «addresses.dat». Por favor, pega unha lista de servidores válida neste ficheiro para poder actualizar de forma automática a lista de servidores"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Descargando lista dos servidores de %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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 servidores : %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "O ficheiro addresses.dat non contén unha URL válida para a descarga automática do server.met"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Non se puido descargar a lista de servidores dende %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "O servidor local está filtrado por IPFilters, conectando a un servidor diferente!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Descrición"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Retardo"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Usuarios"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Usuarios"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Estático"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versión"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Ficheiros"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Ficheiros compartidos"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Está conectado ao servidor que tenta borrar. Por favor desconéctese primeiro. O servidor NON foi borrado."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Nome descoñecido)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "Seguro de que quere borrar o servidor estático %s?"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "minutos"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Servidores (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Servidor"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Conectarse ao servidor"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Marcar servidor como estático"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Marcar servidor como non estático"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Marcar servidores como estáticos"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Marcar servidores como non estáticos"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Borrar servidor"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Borrar servidores"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Borrar todos os servidores"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Copia as ligazóns eD2k ó portapapeis"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Tentar conectarse ao servidor de novo"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Está seguro de que quere borrar todos os servidores?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Está seguro de que quere borrar o servidor seleccionado?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Está seguro de que quere borrar os servidores seleccionados?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ERRO: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "AVISO: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "A nova IDCliente é %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "ATENCIÓN: Recibiu ID-Baixa!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\tIsto sucede porque vostede se atopa detrás dunha devasa ou dun encamiñador."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPara máis información, por favor consulte https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Recibida información descoñecida do servidor! - resposta demasiado corta"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Recibido %d novo servidor"
 msgstr1 "Recibidos %d novos servidores"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Completado o gardado da lista de servidores."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "O servidor rexeitou a última orde"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "O servidor enviou un paquete erróneo: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Ocorreu un erro ao procesar o paquete do servidor: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr "Non se puido crear o fío para resolver o DNS e conectarse a %s"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "Filtrouse a IP de servidor %s (%s).  Non se conectará."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "usando ofuscación do protocolo."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Conectando a %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "Rexistro de aMule"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Servidor non engadido: Non se especificou ningunha IP nin o nome de servidor."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Servidor non engadido: Porto do servidor inválido."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Estado do eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Estado de conexión:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Conectado"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Estado Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Executando en modo LAN"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Executando"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "ID do cliente Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Estado:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Estado de conexión:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr "Devasa atopada - abra o porto TCP %d no seu encamiñador ou devasa"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Estado da conexión UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr "Devasa atopada - abra o porto UDP %d no seu encamiñador ou devasa"
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Estado da devasa: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Non se precisa colega - porto TCP aberto"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Non se precisa colega - porto UDP aberto"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Sen colegas"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Conectado a colega"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Conectado a colega en %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Enderezo IP :"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Fontes catalogadas:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Palabras clave catalogadas:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Notas catalogadas:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Carga catalogada:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Media de usuarios:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Media de ficheiros:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Non executando"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Engadindo ficheiro %s aos ficheiros compartidos"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Atopado %i ficheiro compartido"
 msgstr1 "Atopados %i ficheiros compartidos"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Atopado %i ficheiro compartidos, %i descoñecido"
-msgstr1 "Atopados %i ficheiros compartidos, %i descoñecidos"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "ERRO: Intentouse compartir %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Directorio compartido non atopado, saltando: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Directorio compartido non atopado, saltando: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Non se atoparon ficheiros que se puideran compartir: %s"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Nome de usuario"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Non se puido gardar o ficheiro %s: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Velocidade de descarga"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Cargando ficheiro server.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Velocidade de envío"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Non se atoparon ficheiros que se puideran compartir: %s"
+msgstr1 "Non se atoparon ficheiros que se puideran compartir: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Partes dispoñibles"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Non se atoparon ficheiros que se puideran compartir: %s"
+msgstr1 "Non se atoparon ficheiros que se puideran compartir: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Atopado %i ficheiro compartido"
+msgstr1 "Atopados %i ficheiros compartidos"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Nome de usuario"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Estado do envío"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "Estado de descarga"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr "Orixe"
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Nome local do ficheiro"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Lista de ficheiros compartidos"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Peticións"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Peticións aceptadas"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Datos transferidos"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Media de datos compartidos"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Partes obtidas"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Fontes completas"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Dispoñibilidade"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Ruta do directorio"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Ficheiros compartidos"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Engadir Comentario/Calificación"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Editar Comentario/Calificación"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Cambiar o nome"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Engadir os ficheiros na colección á lista de transferencia"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Copiar a &URI magnética ao portapapeis"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Copiar ligazón eD2k ó portapapei&s (Fonte)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Copiar ligazón eD2k ó portapapeis (Fonte) (&Con opcións de cifrado)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Copiar ligazón eD2k ó portapapeis (&Nome do anfitrión)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Copiar ligazón eD2k ó portapapeis (Nome do anfitrión) (Con opcións d&e cifrado)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Copiar ligazón eD2k ó portapapeis (información do XICA &AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Copiar ligazón eD2k ó portapapeis (información do XICA &AICH e fontes)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Precísase ter IDAlta para crear unha ligazón á fonte válido"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Ocorreu un erro ao rematar"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Non se puideron recuperar os ficheiros compartidos do usuario «%s»"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Recargar os seus ficheiros compartidos"
+msgstr1 "Recargar os seus ficheiros compartidos"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Tamaño total dos ficheiros compartidos: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Tamaño total dos ficheiros compartidos: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Ficheiros compartidos (%i)"
+msgstr1 "Ficheiros compartidos (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Ficheiros compartidos (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "PartFile"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Recargouse a lista de ficheiros compartidos: atopáronse %u ficheiros"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Estado"
+
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Nome remoto do ficheiro"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Datos enviados (Sesión (Total)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Sobrecarga total (Paquetes ): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Sobrecarga nas peticións de ficheiro (Paquetes): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Sobrecarga no intercambio de fontes (Paquetes): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Sobrecarga nos servidores (Paquetes): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Sobrecarga no Kad (Paquetes): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Sobrecarga na encriptación (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Envíos activos: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Envíos agardando: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Sesión de envíos totais rematados: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Total de sesións de envío erradas: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Tempo medio de envío: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Datos descargados (Sesión (Total)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Fontes atopadas: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Descargas activas (pedazos): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Índice EV:DE da Sesión (Total): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Velocidade media de baixada (Sesión): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Velocidade media de envío (Sesión): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Velocidade máxima de baixada (Sesión): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Velocidade máxima de envío (Sesión): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Reconexións: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Tempo dende a primeira transferencia: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Inicio da conexión co servidor: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Conexións activas (estimadas): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Límite máximo de conexións acadado: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Media de conexións (estimado): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Pico de conexións (estimado): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Clientes"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Descoñecidos: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtrados: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Vetados: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Total:%i Coñecidos: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Servidores activos: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Servidores caídos: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Total: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Servidores borrados: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Servidores filtrados: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Usuarios en servidores activos: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Ficheiros nos servidores activos: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Usuarios totais: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Ficheiros totais: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Ocupación do servidor: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Número de ficheiros compartidos: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Tamaño total dos ficheiros compartidos: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Tamaño medio de ficheiro: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Non recibido"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Conexións activas (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Non dispoñible"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Nunca"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Executa <str> e sae."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "Esta orde precisa dun parámetro. Parámetros válidos: «all», nome dun ficheiro ou un número.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Procesando por hash: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Procesando por nome de ficheiro: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Esta orde precisa dun parámetro. Parámetros válidos: un hash do ficheiro.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Non é un número válido\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6486,7 +7991,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6496,7 +8001,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6504,76 +8009,80 @@
 "Tipo de busca non especificado.\n"
 "Escriba «help search» para obter máis axuda.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Descargar ficheiro: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "A petición fallou cun erro descoñecido."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "A operación tivo éxito."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "A petición fallou co seguinte erro: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "O filtrado de IP para clientes está %s\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Apagada"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Acendida"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "O filtrado de IP para servidores está %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "O nivel de filtrado de IP actual está %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Conectado a %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Conectando"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "tras unha devasa"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "correcto"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6582,7 +8091,7 @@
 "\n"
 "Descargado: \t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6591,7 +8100,7 @@
 "\n"
 "Enviado:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6600,7 +8109,7 @@
 "\n"
 "Clientes en cola:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6609,38 +8118,33 @@
 "\n"
 "Fontes totais:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "PartFile"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Número de resultados na busca: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Progreso da busca: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Progreso da busca non dispoñible"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, 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:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Mostrar información resumida do estado."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Mostrar estado de conexión, velocidade envío/descarga actual, etc.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Mostrar árbore de estadísticas completa."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6654,11 +8158,11 @@
 "\n"
 "Exemplo: «statistics 5» mostrará só as 5 versións que máis se repitan de calquer cliente.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Apagar o aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6668,35 +8172,35 @@
 "Isto apagará tamén o cliente en modo texto, xa que non se pode\n"
 "empregar sen un núcleo en funcionamento.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Recargar o obxecto dado."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Recarga a lista de ficheiros compartidos."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Recargar a táboa de filtrado de IP."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Recargar a táboa de filtrado IP actual."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Recargar a táboa de filtrado de IP dende URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr "Se se omite a URL usarase a especificada na configuración."
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Conectar á rede."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6708,35 +8212,35 @@
 "conectar a ese servidor soamente. A IP debe ser un enderezo IPv4,\n"
 "ou un nome DNS válido."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Conectar só a eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Conectar só a Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Desconectar da rede."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Desconectar só do eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Desconectar só de Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Engadir unha ligazón eD2k ou unha ligazón magnet ó núcleo."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6754,51 +8258,51 @@
 "\n"
 "A ligazón magnet debe conter o hash eD2k e a lonxitude do ficheiro.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Establecer un valor de preferencia."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Establecer opcións do filtrado de IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Activar o filtrado de IP para clientes e servidores."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Desactivar o filtrado de IP para clientes e servidores."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Activar/Desactivar filtrado de IP para clientes."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Activar filtrado de IP para clientes."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Desactivar filtrado de IP para clientes."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Activar/Desactivar filtrado de IP para servidores."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Activar filtrado de IP para servidores."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Desactivar filtrado de IP para servidores."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Seleccionar nivel de filtrado de IP."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6806,59 +8310,73 @@
 "Os niveis de filtrado válidos son un número de entre 0 e 255, e o valor por omisión (inicial)\n"
 "é 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Establecer límite de ancho de banda."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "O valor dado a estas ordes ha de ser en kilobytes/s\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Establecer límite de ancho de banda na subida."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "O valor dado a estas ordes ha ser en kilobytes/sec.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Establece o límite de ancho de banda na descarga."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Activar/desactivar a identificación mediante nome de usuario e contrasinal"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "O valor dado a estas ordes ha ser en kilobytes/sec.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Obter e mostrar un valor das preferencias."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Obter opcións de filtrado de IP."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 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:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Obter o estado do filtro de IP só para clientes."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Obter o estado do filtro de IP só para servidores."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Seleccionar nivel de filtrado de IP."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Obter límite de ancho de banda."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Facer unha busca."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6892,39 +8410,44 @@
 "Por exemplo: «search global linux iso --type Iso --min-size 100M» devolverá os\n"
 "resultados para «linux iso», de tipo Iso e de máis de 100 MiB.\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Executar unha busca global."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Executar unha busca local"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Executar unha busca de kad"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
 msgstr "Mostrar os resultados da última busca."
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Devolve o resultado da busca anterior.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Mostrar o progreso dunha procura."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Mostrar o progreso dunha procura.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Comezar descargando un ficheiro"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6932,80 +8455,80 @@
 "Tense que dar o número dun ficheiro da última busca.\n"
 "Exemplo: «download 12» iniciará a descarga do ficheiro co número 12 da busca a busca anterior.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Parar descarga."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Continuar descarga."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Cancelar descarga."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Establecer a prioridade da descarga."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Establecer a prioridade a baixa."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Establecer a prioridade a normal."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Establecer a prioridade a alta."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Establecer a prioridade a auto."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Mostrar colas/listas."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Mostrar cola de subida."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Mostrar cola de descarga."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Mostrar rexistro."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Mostrar lista de servidores."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "Recarga a lista de ficheiros compartidos."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Reiniciar rexistro."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Orde obsoleta, empregue «%s» no seu lugar."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7014,255 +8537,278 @@
 "Esta orde quedou obsoleta e probablemente sexa eliminada nun futuro.\n"
 "Empregue «%s» no seu lugar.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Texto do cliente de aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Eliminando ficheiro: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Eliminando ficheiro: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Continuando enviando o ficheiro: %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "Convertendo conxuntos hash XICAAICH antigos en «%s» a 64b en «%s»."
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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 cambiado a «%s»."
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr "AVISO: O ficheiro «%s» xa existe, o ficheiro novo foi chamado «%s»."
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "Está seguro de que quere cancelar e borrar todos os ficheiros desta categoría?"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Precísase confirmación"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Só se permiten 99 categorías."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Demasiadas categorías!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "O resto"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Seleccione o filtro na vista"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Engadir categoría"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Editar categoría"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Borrar categoría"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Pediuse un hashset para un ficheiro descoñecido: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Seleccione quen pode solicitar ver a lista de ficheiros compartidos."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Continuando enviando o ficheiro: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Interrompendo o envío do ficheiro: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr "Non se puido executar a orde `%s» no evento `%s»."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Descarga rematada"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "A ruta completa ao ficheiro."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "O nome do ficheiro sen a ruta."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "O hash eD2k do ficheiro."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "O tamaño do ficheiro en octetos."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Tempo de actividade de descarga acumulado."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Comezada nova sesión da conversa"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Remitente."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Sen espazo"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Partición do disco."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Ocorreu un erro ao rematar"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Procesando número de ficheiro %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "Pediu hashes das partes (Só usado en ficheiros > 9,5 MB)"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Non existe o ficheiro !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, o creador de ligazóns eD2k do aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Benvido!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Parámetros de entrada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Ficheiro do que facer un resumo criptográfico Hash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Engadir URLs opcionais para este ficheiro"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr "Introduza o ficheiro do cal desexa calcular a ligazón eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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 da cal desexa calcular a ligazón eD2k: Engada o carácter «/» ó final para permitirlle ao aLinkCreator engadir o nome do ficheiro actual"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Eliminar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Crear ligazón con hashes das partes"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr "Axuda a espallar ficheiros novos e raros máis rápido, pero coa desvantaxe de ter unha ligazón máis grande"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Ficheiro Hash MD4"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "Hash do ficheiro eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "ligazón eD2K"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Gardar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Copiar ao portapapeis"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Abrir"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Abrir un ficheiro para calcular a súa ligazón eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Copiar a ligazón eD2k calculada ó portapapeis"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Gardar como"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Gardar a ligazón eD2k calculada nun ficheiro"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Sobre o aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr "Selecciona o ficheiro do cal desexe calcular a ligazón eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Non se pode abrir o portapapeis"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Non hai ren para copiar!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Seleccione o ficheiro para a ligazón eD2k calculada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Non se pode abrir "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Non introduza un nome de ficheiro baleiro"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Non hai ren para gardar!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7282,162 +8828,159 @@
 "\n"
 "Distribuído baixo a licenza GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Facendo resumo criptográfico..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator traballa por tí"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Calculando hash MD4..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Calculando hash eD2k..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Cancelado !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Rematou en %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Xa engadiras esta URL !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Non introduza unha URL baleira"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Non se pode abrir %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "Esgotouse a memoria mentres se calculaba o hash eD2k!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, Estatísticas aMule en liña"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Restablecer"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistema"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Deter auto recargar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Gardar imaxe das estadísticas en liña"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Imprimir imaxe das estadísticas en liña"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Preferencias"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Sobre wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Iniciar actualización automática"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Actualización automática detida"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Actualización automática iniciada"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Gardar imaxe das estadísticas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Estatísticas de aMule en liña"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7445,11 +8988,11 @@
 "Houbo un problema imprimindo.\n"
 "Tal vez a súa impresora actual non está configurada?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Imprimindo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7467,406 +9010,571 @@
 "\n"
 "Distribuído baixo GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Vaites, non se está executando aMule..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule está iniciado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule estase executando, pero está desconectado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule estase a conectar..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Vaites, non se puido coñecer o estado de aMule..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " leva executándose "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " está detido !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " non está conectado!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " está conectandose..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " pasou algo estraño, compróbeo !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " está conectado a "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "apagado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " conectado "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " con "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Total descargado: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Enviado: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Descargado na sesión: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Descargado: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Enviado: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Compartindo: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " ficheiro(s), Clientes en cola: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Tempo: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " en "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Media de carga do sistema (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Tempo de execución do sistema: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Directorio que contén o ficheiro amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "Introduza aquí o cartafol onde está o seu ficheiro amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Intervalo de actualización en segundos"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Xerar un ficheiro de estadísticas sempre que se actualice"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "Introduza aquí o directorio onde quere xerar a imaxe das estadísticas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Subir de cando en vez unha imaxe das estadísticas a un servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "URL do servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Ruta FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Introduza aquí a URL do seu servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "Introduza aquí o directorio onde poñer a imaxe das estadísticas no servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Usuario"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "Introduza aquí o nome de Usuario para conectarse ao servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "Introduza aquí o contrasinal de Usuario para conectarse ao servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Intervalo de actualización do FTP en minutos"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Validar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "O cartafol que contén o seu ficheiro de sinatura"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Cartafol onde se xerará a imaxe das estatísticas"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Cargar modelo <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Porto HTTP do servidor Web"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 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:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Porto UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Usar compresión gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Contrasinal de administrador para o servidor web"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Contrasinal de invitado para o servidor web"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Permitir acceso de invitado"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Denegar acceso de invitado"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "Cargar/gardar a configuración do servidor web dende/a un aMule remoto"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 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:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Desactivar intérprete PHP (obsoleto)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Recompilar as páxinas PHP en cada petición"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Servidor web de aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "conexión do cliente web aceptada\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "ERRO: non se poden aceptar conexións do cliente web\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "A petición fallou co seguinte erro: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Ficheiro do rexistro non atopado: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sesión expirada - pedindo conectarse \n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sesión aceptada, conectado\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sesión aceptada, non conectado\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Ningunha sesión aberta - pedirase unha conexión\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sesión creada - pedindo conectarse\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Procesando petición orixinal: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Non se especificou contrasinal, non se permite a entrada."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Comprobando contrasinal\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Cómputo do contrasinal inválido\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Contrasinal aceptado\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Contrasinal erróneo\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "Non introduciu ningún contrasinal. Non se pode usar un contrasinal en branco.\n"
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Solicitada desconexión\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Procesando solicitude redirixida: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "Start aMule when I log in"
 msgstr "Arrancar aMule automaticamente ao iniciar sesión"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "Uninstall"
 msgstr "Continuar"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Non se puido integrar aMule"
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Enviado"
+#~ msgid "Ratio"
+#~ msgstr "Valoración"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Non se atoparon ficheiros que se puideran compartir: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Cambiar idioma"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Non hai traducións instaladas para aMule"
+
+#~ msgid "No languages available"
+#~ msgstr "Ningunha lingua dispoñible"
+
+#~ msgid "User name"
+#~ msgstr "Nome de usuario"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Partes obtidas"
+
+#~ msgid "Available Parts"
+#~ msgstr "Partes dispoñibles"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Atopado %i ficheiro compartidos, %i descoñecido"
+#~ msgstr1 "Atopados %i ficheiros compartidos, %i descoñecidos"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Servidor remoto"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Servidor local"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Campo inválido na lista de ficheiros coñecidos, Pode ser que se corrompera o ficheiro: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Gardando parte %u de %u do ficheiro"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Para evitar a aparición deste aviso en cada vista previa,\n"
+#~ "establece o teu reprodutor de vídeo nos axustes (%s é o predeterminado)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Resultados do filtro"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Marcar o ficheiro como coñecido"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Porcentaxe de todos os ficheiros"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Arranque autónomo (dende cero)"
+
+#~ msgid "New node"
+#~ msgstr "Novo nodo"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Máis"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Arrancando dende cero a partir de \n"
+#~ "clientes coñecidos"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Conectar a calquera servidor e/ou Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Desconectar Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Deter a tentativa actual de conexión"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Desconectar das redes conectadas"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Conectar ás redes activas"
+
+#, c-format
+#~ msgid "Could not add %u link from ED2KLinks file (see log for details)."
+#~ msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+#~ msgstr0 "Non se puido engadir a ligazón %u do ficheiro ED2KLinks (consulte o rexistro)."
+#~ msgstr1 "Non se puideron engadir as ligazóns %u do ficheiro ED2KLinks (consulte o rexistro)."
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Clasificar ficheiros automaticamente (consume bastantes recursos)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule ordenará as columnas na súa lista de descargas automaticamente"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Rexeitar os paquetes se a IP do cliente é distinta á da IP de onde se recibe o paquete. Usar con coidado."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Devolve o resultado da busca anterior.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Mostrar o progreso dunha procura.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Conexión terminada - probablemente o aMule apagouse."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Comprobar se hai unha nova versión ao iniciar"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Ligazón eD2k: "
+
+#~ msgid "Commit"
+#~ msgstr "Enviar"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: desdobrando ao segundo plano - ata a volta"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Páxina web: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Foro: https://github.com/amule-org/amule/discussions \n"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Ficheiro non atopado."
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Páxina web: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Foro: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Enviado"
 
 #, c-format
 #~ msgid "No GeoLite2 update URL configured. Download GeoLite2-Country.mmdb manually (a free MaxMind account is required) and place it at %s, or set the URL in Preferences."

amule-3.0.1.tar.gz/po/he.po -> amule-3.1.0.tar.gz/po/he.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:13+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:43+0000\n"
 "Last-Translator: Peace Kramer <kpeace1@gmail.com>\n"
 "Language-Team: Hebrew\n"
 "Language: he\n"
@@ -21,70 +21,154 @@
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "אודות wxCas"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "אימיול שלט רחוק"
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "צילום:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"זכוייות יוצרים (C) 2003-2019 צוות אימיול \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "קאדימליה: תקשורת עמית לעמית מנותבת המבוסס על ה XOR המטרי.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "מתחבר לקאד..."
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "לא זמין"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "הוסף חבר"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "הזנת כתובת IP ומבואה תקינים!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "מידע"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "גיבוב-המשתמש הספציפי אינו תקף!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "התחברות נכשלה "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -93,139 +177,268 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "פתיחת הקובץ %s·(%s נכשלה"
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "קובץ האינדקס לא נמצא"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "הניסיון לקבל את רשימת הקבצים המשותפים מהמשתמש '%s' כשלה."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
 msgstr0 ""
 msgstr1 ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:179
-#, fuzzy
-msgid "Failed to open ED2KLinks file."
-msgstr "פתיחת הקובץ %s·(%s נכשלה"
-
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "נכשל"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "הורדה הסתיימה"
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr ""
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "מידע"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "אישרור יצאיה"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "גישה חיצונית חדשה התקבלה"
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "אזהרה"
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
 msgstr ""
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading temp files"
+msgstr "קורא את הספרייה הזמנית"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "קורא את הספרייה הזמנית"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "טען מחדש את הקבצים המשותפים שלך"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "טען מחדש את הקבצים המשותפים שלך"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "התחל"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "רשתות"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
-#, fuzzy
-msgid "Network bootstrap"
-msgstr "רשתות"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "אימיול פועל"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -235,1659 +448,1969 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr ""
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "תרגיש חופשי לדוואח על כל שגיאה ל https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 #, fuzzy
 msgid "Server hostname notified"
 msgstr "שם שרת:"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "שגיאה: לא יכול לפתוח קובץ יומן."
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "היומן אופס."
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr ""
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr ""
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "עם מ\"ז נמוך (LowID)"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "עם מ\"ז גבוהה (HighID)"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr ""
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "קאד התחיל."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "קאד נעצר."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "קאד מחובר (בסדר)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "קאד מחובר (מאחורי חומת אש)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "מנותק מקאד."
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr "אי אפשר להשתמש ברשת הקאד אם מוואת UDP מבוטלת בהעדפות, לא התחיל."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "קאד מבוטל בהעדפות, לא מתחבר."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "אירעה שגיאה: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "זהו אֵימיול %s המבוסס על אִמיול"
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "פועל על %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "בקר ב https://github.com/amule-org/amule/releases/latest כדי לבדוק האם ישנה גירסה חדישה זמינה."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "אימיול שלט רחוק"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "צילום:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "רשתות"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "חיפושים"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr ""
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "הורדות"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
 msgstr ""
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "\tעבור מידע נוסף פנה ל https://amule-org.github.io/docs"
-
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "תרגיש חופשי לדוואח על כל שגיאה ל https://github.com/amule-org/amule/issues"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "לקוחות"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"זכוייות יוצרים (C) 2003-2019 צוות אימיול \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "הודעות"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "סטטיסטיקות"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "קאדימליה: תקשורת עמית לעמית מנותבת המבוסס על ה XOR המטרי.\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "העדפות"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "הודעה"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "לא זמין"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "מתחבר"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "קאד: חסום חומתאש"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "קאד: מחובר"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "קאד: מתחבר"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "קאד: מכובה"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "ביטול"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "הפסק את ניסיונות ההתחברות הנוכחיים"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "גירסא"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "מנותק"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "התנתק מהרשתות שאליהם אתה מחובר כעת"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "התחבר"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "כתובת"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "תיאור"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "התחבר לרשתות שמאופשרות כרגע"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "אֵימיול "
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "מעלה: %.1f(%.1f) | מוריד: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "מ\"ב/ש"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " ק\"ב/ש"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "מעלה: %.1f | מוריד: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "אימיול (%s | מחובר)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "אימיול (%s | מנותק)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "האם אתה באמת רוצה לצאת מאימיול?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "אישרור יצאיה"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "ספריית הסקינים '%s' לא קיימת"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "רשתות"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "חלון הרשתות"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "חיפושים"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "חלון החיפושים"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "הורדות"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "מוריד מהרשת"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "חלון הקבצים המשותפים"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "הודעות"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "חלון הרשתות"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "חלון ההודעות"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "סטטיסטיקות"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "חלון גרפי הסטטיסטיקה"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "העדפות"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "חלון הגדרת ההעדפות"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "ייבא"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "כלי הייבא עבור קובץ-החלקים"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "אודות"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "אודות/עזרה"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr ""
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "אֵימיול"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "שגיאה סופנית: יצירת קוצב-זמן נכשלה"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "התחבר לאימיול מרוחק"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "החיבור אבד."
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "שגיאה סופנית: יצירת קוצב-זמן נכשלה"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Going to event loop..."
 msgstr "מנסה לשחזר את המידע של הקובץ"
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Connecting..."
 msgstr "מתחבר"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr ""
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "פג הזמן עבור ניסיון ההתחברות ל %s·(%s:%i)"
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "התחבר לרשת."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "הכול"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "לא זמין"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "קובץ לא נמצא."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "קישור לא תקף או שכבר נמצא ברשימה."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "אתה כבר מנסה להוריד את הקובץ %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "הניסיון לקבל את רשימת הקבצים המשותפים מהמשתמש '%s' כשלה."
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr "(חיקוי אימיול בגרסת %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr "(חיקוי אימיול)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "אקס-מיול (חיקוי אימיול)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.איקס (מבוסס על אימיול בגרסת 0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "כינוי:%s מ\"ז: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "בוּקַש: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "בקשה עבור קובץ לא ידוע"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "סוננה הודעה מ '%s'·(IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "הודעה חדשה מ '%s'·(IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך בתקייה %s -> נדחה"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "הניסיון לקבל את רשימת הקבצים המשותפים מהמשתמש '%s' כשלה."
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "אזהרה: לא ניתן לפתוח את הקובץ known.met."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 #, fuzzy
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "אזהרה: רשימת הקבצים-המכורים פגומה, מכילה כותר פגום."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "שגיאת קריאה/כתיבה תוך כדי הקובץ known.met: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "שגיאה במהלך שמירת הקובץ known.met: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "קטיגוריה"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr ""
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr ""
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr ""
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "הוסף לחברים"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "הצג &פרטים"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "הסר מחברים"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "הוקמה משבצת \"חבר\""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "הצג קבצים"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "שלך הודעה"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "שלח הודעה למשתמש"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "הודה שתשלח:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"אתה לא רשאי להגידר יותר ממשצת \"חבר\" אחת.\n"
+"רק משבצת אחת הוגדרה."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "בחירה מרובה."
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "הסר מחברים"
+msgstr1 "הסר מחברים"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "טוען מחדש את רשימת הקבצים המשותפים."
+msgstr1 "טוען מחדש את רשימת הקבצים המשותפים."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "מ\"ז נמוך (LowID)"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "מ\"ז גבוה (HighID)"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr ""
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "מחובר"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "מנותק"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "שם"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "כתובת IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
 msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "פעם אחרונה שנתקבל"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "גירסא"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "מהירות-העלאה"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "מהירות הורדה"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "סכום כולל של הורדות: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "סכום כולל של הורדות: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "חתימה מקוונת"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr ""
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr ""
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr ""
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "ל\"ת"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "קבצים"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "מוריד מהרשת"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "ההעלאות"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "פןעל"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "לא ידוע"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך -> אושר"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך -> נדחה"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "המשתמש %s (%u) ביקש את רשימת התקיות המשותפים שלך -> אושר"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "המשתמש %s (%u) ביקש את רשימת התקיות המשותפים שלך -> נדחה"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך בתקיה %s -> אושר"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך בתקייה %s -> נדחה"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "משתמש %s·(%u) משתף את התקייה %s"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "משתמש %s·(%u) שלח רשימת תקיות משותף בלי שהתבקש."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "משתמש %s (%u) שלח רשימה של קבצים משותפים עבור הספריה %s"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "משתמש %s (%u) סיים לשלוח את רשימת הקבצים המשותפים"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "משתמש %s·(%u) שלח רשימה של קבצים משותפים מבלי שהתבקש"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "משתמש %s (%u) שלל גישה לרשימת הקבצים/תקיות שלו"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "הערות על הקובץ"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "שם משתמש"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "שם קובץ"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "דרוג"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "הערה"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "לא יכול להתבצע חיפוש באמצעות קאד אם קאד לא פועל"
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "אין הערות"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, fuzzy, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u הערה"
 msgstr1 "%u הערה"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "CIP2Country::CIP2Country(): לא הצליח לטעון מידע עבור המדינה מ "
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "אוטומטי נמוך"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "אוטומטי לא"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "אוטומטי גבוה"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "מאוד נמוך"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "נמוך"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "רגיל"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "גבוה"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "מאוד גבוה"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "שחרור"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "מבקש"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "מתחבר דרך השרת"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "התור מלא"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "על התור"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "מוריד מהרשת"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "מקבל קבוצת גיבובים"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "אין חלקים נדרשים"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "לא יכול לחבר מ\"ז נמוך (LowID) למ\"ז נמוך (LowID)"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "יותר מדי חיבורים"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "מחתבר באמצעות קאד"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "יותר מדי חיבורי קאד"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "חסום"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "שגיאת התחברות"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "התור המרוחק מלא"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "חמורML ישן"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "חמורML חדש"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "תואם אִימיול"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "שרת מקומי"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "שרת מרוחק"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "קאד"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "החלפת מקורות"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "פאסיבי"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "קישור"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "מזריעי מקורות"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "הסתיים"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "בתהליך"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "נגמר המקום"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "נכנס לתור"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "כבר מוריד"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "פורמט הקובץ הזמני לא מוכר או  פגום"
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "גודל"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "הועברו"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "מהירות"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "התקדמות"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "מקורות"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "עדיפות"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "מצב"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "זמן שנשאר"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "פעם אחרונה שנראה שלם"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "פעם אחרונה שנתקבל"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "האם אתה בטוח שברצונך למחוק את הקובץ שנבחר?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "האם אתה בטוח שברצונל ךמחוק את הקבצים שנבחרו?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "אוטמטי"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "ביטול"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&עצור"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&השהה"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&המשך"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "נ&קה מה שהסתיים"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "החלף כל A4AF לקובץ הזה עכשיו"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "החלף כל A4AF לקובץ הזה (אוטומטי)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "החלף את כל ה A4AF לכל קובץ אחר, עכשיו"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "אפשרויות מורחבות"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "תקדימון"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "הראה &פרטי קבצים"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "הראה את כל ההערות"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "העתק מגנט URI ללוח"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "העתק משוב ללוח"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "הוסף כתובות URL אופתינליות לקובץ זה"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "לא מיוחס"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "ייחס לקטיגוריה"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&תפתח את הקובץ"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "האם אתה בטוח שברצונך למחוק את הקובץ שנבחר?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "האם אתה בטוח שברצונל ךמחוק את הקבצים שנבחרו?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "הכנס שם חדש עבור קובץ זה"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "שינוי שם לקובץ"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.2f מ\"ב"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d·%H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "הורדות (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "תקדימון לקובץ"
+msgid "Downloads (%i)"
+msgstr "הורדות (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "שגיאה: הרצת נגן הסרטים נכשלה! הפקודה: '%s'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "סכום כולל: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading temp files from %s."
 msgstr "קורא את הספרייה הזמנית"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "טוען מידע מקובץ הורדות ישן (%u·מ·%u)"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "לא נמצא קובץ-חלקים."
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "נמצא %u קובץ-חלקים"
 msgstr1 "נמצא %u קובץ-חלקים"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "מוריד %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "אתה כבר מנסה להוריד את הקובץ '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "כבר יש לך את הקובץ '%s'"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "כבר יש לך את הקובץ '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "אתה כבר מנסה להוריד את הקובץ %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "פרוטקול לא ידוע עבור קישור: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client sent packet after authentication failed."
 msgstr "זיהוי נכשל"
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "חיבור חיצוני נסגר."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "גישה חיצונית מנוטרלת מאחר שהסיסמא ריקה!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "גישה מרוחקת מנוטרלת בקובץ ההגדרות"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "גישה חיצונית חדשה התקבלה"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "גישה מרחוק נכשלה עקב סיסמא ריקה בהעדפות!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "מחבר לקוח:%s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "גירסה לא ידועה"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "גירסת EC לא נכונה, יתכן ויש אי התאמה בינארית. השתמש בליבה ובלקוח חיצוני מאותו תצלום (גירסה)."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "אתה לא להתחבר לגרסה ששוחררה מSVN (כלי לניהול גרסאות תוכנה) ! *נאנח* ייתכן והתרסקות של התוכנה נמנעה"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "גרסת פרוטוקל לא תקפה."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "חסר התווית של גרסת הפרוטוקול."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "התחברות אוטומטית לשרת ינוסה שוב תוך %d שניות"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: wrong password."
 msgstr "זיהוי נכשל"
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: missing password."
 msgstr "זיהוי נכשל"
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Invalid request, please authenticate first."
 msgstr "בקשה לא תקפה, כדאי שקודם תאמת."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "גישה אושרה."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "ניסיון גישה שאינו מורשה. החיבור נסגר."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "פקודת קובץ-חלקים מרוחקת מכשלה: גיבוב הקובץ לא נמצא: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "גיבוב הקובץ לא מצא: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "אופס! שגיאה בעיבוד קוד-פעולה!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "השרת לא התווסף"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "לא נמצא השרת: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "צריך להגדיר שרת כדי להסירו"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "קובץ לא נמצא."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "קובץ לא נמצא."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "חיפוש פועל כרגע. ייבא מחדש תוצאות בעוד רגע!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "לא הגיוני לבצע חיפוש-רשתי מתוך ממשק מרוחק."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "חיפוש פועל כרגע. ייבא מחדש תוצאות בעוד רגע!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "אין נקודות עבור הגרף."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "הלקוח שלך אינו מוגדר עבור הרמה הזאת של פרטים."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "כבר בתהליך כיבוי."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "חיבור-חיצוני: מוסיף קישור '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "קישור לא תקף או שכבר נמצא ברשימה."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "קובץ לא נמצא."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "שם קובץ לא תכף."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "לא מצליח לשנות את השם של הקובץ."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "סגור את הצ'אט הנוכחי."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "צ'אט חדש החל."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "סגור את הצ'אט הנוכחי."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "קאד מנוטרל בתוך ההעדפות."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(שם לא ידוע)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "קאד מנוטרל בתוך ההעדפות."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "כבר מחובר לקאד."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "מתחבר לקאד..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "כל הרשתות מנוטרלות."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "מתנתק מקאד."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "קוד-פעולה לא תקף (גרסת פרוטקול שגויה?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1895,23 +2418,23 @@
 "Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr ""
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr ""
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1919,59 +2442,59 @@
 "\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr ""
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr ""
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr ""
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr ""
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1980,118 +2503,361 @@
 "Exiting...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr ""
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr ""
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr ""
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "פרטי הקובץ"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%% הושלם"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "תקדימון לקובץ"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "שגיאה: הרצת נגן הסרטים נכשלה! הפקודה: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "שגיאה: יצירת קובץ-החלקים נכשלה)"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "ברוכים הבאים!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "מחובר לחבר"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "מצב חיבור:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "רשתות"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "קבצים זמניים"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "אתה כבר מנסה להוריד את הקובץ %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "דפדף"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f ק\"ב/ש"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "חברים"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "הצג &פרטים"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "הוסף חבר"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "הסר חבר"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "שלך &הודעה"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "הצג קבצים"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "הוקמה משבצת \"חבר\""
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "האם אתה בטוח שאתה רוצה להסיר את החבר שבחרת?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "האם אתה בטוח שאתה רוצה להסיר את החברים שבחרת?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2099,2119 +2865,2552 @@
 "אתה לא רשאי להגידר יותר ממשצת \"חבר\" אחת.\n"
 "רק משבצת אחת הוגדרה."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "בחירה מרובה."
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"אתה לא רשאי להגידר יותר ממשצת \"חבר\" אחת.\n"
-"רק משבצת אחת הוגדרה."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "שלח הודעה למשתמש"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "הודה שתשלח:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "הסר מחברים"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "שלך הודעה"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "החלף לקובץ זה"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "QR:·%u·(%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "התקבלה בקשה עבור קובץ אחר"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "העלאות בהמתנה: %s"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "על התור"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "ההעלאות"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "None"
 msgstr "לא"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "לא"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "כן"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "פתיחת הקובץ %s·(%s נכשלה"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "מוריד מהרשת..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "הניסיון לקבל את רשימת הקבצים המשותפים מהמשתמש '%s' כשלה."
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "אתה כבר מנסה להוריד את הקובץ %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "מוריד %s"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "הורדות (%i)"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "פתיחת הקובץ %s·(%s נכשלה"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "פתיחת הקובץ %s·(%s נכשלה"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "CIP2Country::CIP2Country(): לא הצליח לטעון מידע עבור המדינה מ "
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 #, fuzzy
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "טוען את מסנני ה IP 'ipfilter.dat' ואת 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "טעינת קובץ מסננים עם סיומת '.dat' '%s', נכשלה. פורמט הקובץ לא ידוע."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "טעינת קובץ מסננים עם סיומת '.dat' '%s', נכשלה. לא ניתן לפתוח את הקובץ."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, fuzzy, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "טוען %u טווח - IP מ '%s'."
 msgstr1 "טוען %u טווח - IP מ '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, fuzzy, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "נזרקה השורה המעוותת %u"
 msgstr1 "נזרקה השורה המעוותת %u"
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "נוכחיים"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "ממוצע רץ"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "ממוצע ההרצה הנוכחית"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "צמתים (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "כתובת IP לא חוקית על מנת לבצע אתחול"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "מבואה לא תקפה על מנת לבצע אתחול"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "אנא מלא את כל השדות כפי שנדרש"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "הודעה"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "האם את בטוח שברצונח להוריד קובץ nodes.dat חדש?\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "ביצוע פעולה זו תסיר את כל הצמתים הקחחצחם ןתאתחל את חיבור הקאדימליה."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "להמשיך?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "קאדימליה: מילת חיפוש קצרה מדי"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, fuzzy, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "קרא %u יוצרי קשר ל קאד"
 msgstr1 "קרא %u יוצרי קשר ל קאד"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "קאד התחיל."
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "שם הקובץ"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr ""
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr ""
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "ברירת מחדל של המערכת"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "אלבני"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "ערבית"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Asturian"
+msgstr "אסטונית"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "בסקית"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "בולגרית"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "קטלונית"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "סינית (מופשטת)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "סינית (מסורתית)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "קרואטית"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "צ'כית"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "דנית"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "הולנדית"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "אנגלית (בריטית)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "אנגלית (בריטית)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "אסטונית"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "פינית"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "צרפתית"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "גאלית"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "גרמנית"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "יוונית"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "הונגרית"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "איטלקית"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "יפנית"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "קוראינית"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "ליטאית"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "נורבגית (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "פונלית"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "פורטגזית"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "פורטגזית (ברזילאית)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Romanian"
+msgstr "אלבני"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "רוסית"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "סלובקית"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "ספרדית"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "שוודית"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "טורקית"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "גירסה לא ידועה"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unable to get error description for error %d"
 msgstr "אזהרה: לא ניתן לפתוח את קובץ הסקין '%s' לקריאה"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "מגבב"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "מסיים"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "סיים"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "הושהה"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "שגוי"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "ממתין"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "אתה חייב לציין סיסמא שאינה רקה."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "סיסמא לא תקינה היא איננה מגובבת בפורמט MD5"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "החיבור נכשל"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "חיבור חיצוני נסגר."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "ExternalConn: (התחברות חיצונית) תשובה לא טובה מהשרת. החיבור נסגר. ."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "ExternalConn: (התחברות חיצונית) תשובה לא טובה מהשרת. החיבור נסגר. ."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "הצלחה!נפתח חיבור ל aMule."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "הצלחה!נפתח חיבור ."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Handshake failed."
 msgstr "חיבור חיצוני נסגר."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "רענון אוטמטי התחיל"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "סגור"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "גזור"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "העתק"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "הדבק"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "נקה"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "בחר הכל"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "מחובר"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "מחובר"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " קאד: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "קאד מחובר (מאחורי חומת אש)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "שרת"
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "כתובת IP של השרת:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "לא מחובר"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "מנותק"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "התחבר"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "יציאה"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "ק\"ב/ש"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr ""
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "מהירות הורדה"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "מהירות-העלאה"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "מנותק"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "זמן פעולה: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "שלח"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "מוסיף קישור ed2k או מגנט לליבה."
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "הוסף לחברים"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "ארועים מופיעים כאן. בשביל רשימת האירועים המלאה, הסתכלו ביומן שבלשונית השרתים."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "טוען ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "מספר המשתמשים בשרת שאיליו התחברת ..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "משתמשים: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "משתמשים שמחוברים לשרת הנוכחי ומספר מעורך של כלל המשתמשים."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "מעלה:0.0 | מוריד 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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) (תצורת החיבור האופטימלית)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "לא מחובר ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "שרת מחובר נוכחי."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "חיפוש"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "שם:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "סוג/טיפוס"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "מקומי"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "גלובלי"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "פרמטרים מורחבים"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "מסנן"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "סוג קובץ"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "כל דבר"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "ארכיבים"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "אודיו"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "אימג' של סי.די."
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "תמונות"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "תוכניות"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "טקסט"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "סרטים"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "סיומת"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "גודל מנימלי"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "בתים"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "ק\"ב"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "מ\"ב"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "ג\"ב"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "גודל מקסימלי"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "זמינות"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "מסנן:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "תוצאות מסנן"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "מסנן"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "הפוך תוצאות"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "החבא קבצים מוכרים"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "אפס שדות"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "התחל"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "עוד"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "סיומת"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "עצור"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "הורדה"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "הורדה בקטיגוריה"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "תוצאות מסנן"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "אפס שדות"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "תוצאות"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "מנקה הורדות שהושלמו"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "מסנן:"
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "מקורות שנמצאו :"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "כללי"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "שם מלא :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "ל\"ת"
-
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "קובץ-met :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "גיבוב :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "גודל קובץ :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "מצב קובץ-חלקים :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "נראה שלם בפעם האחרונה :"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "שם מלא"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "קובץ-met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "גיבוב"
+
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "גודל קובץ"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "מעביר"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "מקורות שנמצאו :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "מצב קובץ-חלקים"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "נראה שלם בפעם האחרונה"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "מקורות שנמצאו"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "מעביר מקורות"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "ספירת קובץ-חלקים"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "זמין"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "קצב מידע"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "זמן הורדה פעיל"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "כמות שהושלמה"
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "מעביר מקורות :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "ספירת קובץ-חלקים :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "זמין :"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
+msgstr "תפעול מתוחכם של פגמים"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "קצב מידע :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "אבד עקב פגם"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "זמן הורדה פעיל: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "הועבר :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "כמות שהושלמה :"
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "רווח באמצעות כיווץ"
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
-msgstr "תפעול מתוחכם של פגמים"
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "חבילות שנשמרו ע\"י I.C.H.·"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "אבד עקב פגם :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "רווח באמצעות כיווץ :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "חבילות שנשמרו ע\"י I.C.H.·:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "משתף: "
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "בקשות"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "בקשות שהתקבלו"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "מידע שנשנלח"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "יחס שיתוף"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "מקורות שלמים"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "קבצים משותפים"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", הועלה: "
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "לא מדורג"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "שמות קבצים"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "השתלטות"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "ניקוי"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "ישם"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "בסדר"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "תגיב/תדרג קובץ (הטקבט יהיה זמין לכל המשתמשים)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "איכות הקובץ"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "לא מדורג"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "לא תקף / פגום / מזויף"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "דל"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "ממוצע"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "טוב"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "מצויין"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "תבחר את דרוג הקובץ או תתריע למשתמשים אם הקובץ אינו תקף ..."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "מנותק מקאד."
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "רענן"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "מוריד, אנא המתן ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "גודל לא ידוע"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "נדרש מידע"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "כתובת IP :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "מבואה :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "מבואה"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "מידע נוסף"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "שם משתמש :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "גיבוב משתשמ :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "גיבוב משתשמ"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "הוסף"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "מהירות הורדה"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "נוכחיים"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "ממוצע רץ"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "ממוצע ההרצה הנוכחית"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "מהירות-העלאה"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "חיבורים"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "הורדות פעילות"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "חיבורים פעילים (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "העלאות פעילים"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "עץ סטטיסטיקה"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "שם משתמש:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "גיבוב קובץ:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "תוכנת לקוח:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "גרסת לקוח:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "כתובת IP:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "תוכנת לקוח"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "גרסת לקוח"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "מ\"ז משתמש"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "כתובת IP של השרת"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "מ\"ז משתמש:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "כתובת IP של השרת:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "שם שרת:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "שם שרת"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "העברות ללקוח"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "בקשה נוכחית:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "קצב העלאה ממוצע:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "קצב הורדה ממוצע:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "הועלה (הרצה נוכחית):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "ירד (הרצה נוכחית):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "הועלה (סה\"כ):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "ירד (סה\"כ):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "בקשה נוכחית"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "קצב העלאה ממוצע"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "קצב הורדה ממוצע"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "הועלה (הרצה נוכחית)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "ירד (הרצה נוכחית)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "הועלה (סה\"כ)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "ירד (סה\"כ)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "ציונים"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Secure ident"
+msgstr "אבטחה"
 
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "נכנס לתור"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Queue score"
+msgstr "נכנס לתור"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "דפדף"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
-msgid "Max sources per downloading file:"
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
-msgid "Max simultaneous connections:"
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
+#: src/muuli_wdr.cpp
+msgid "Max sources per downloading file:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1444
-msgid "retries"
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
+#: src/muuli_wdr.cpp
+msgid "retries"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "ההעלאות"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "הסר"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "שרת מרוחק"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "שרת מקומי"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "קצב עדכון התקופתי של ה FTP בדקות"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "קצב עדכון התקופתי של ה FTP בדקות"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "סיסמא"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "מבואת UPnP"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "בודק סיסמא\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "בודק סיסמא\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "מנע גישה מאורחים"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "בודק סיסמא\n"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "ברירת מחדל של המערכת"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "בסדר"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Incoming Dir"
+msgstr "קבצים נכנסים"
 
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "- מבואת UDP שונתה \n"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "אתחל מחדש"
-
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "אי.פי.:מבואה"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
+msgstr "קבצים זמניים"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "קצב מידע :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "מקורות"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4219,11 +5418,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4233,853 +5432,766 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "מוריד: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
+#: src/muuli_wdr.cpp
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Proxy type"
+msgstr "פרוקסי"
 
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Proxy host"
+msgstr "פרוקסי"
 
-#: src/muuli_wdr.cpp:2696
-msgid "Enable Proxy"
+#: src/muuli_wdr.cpp
+msgid "The proxy host name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2697
-msgid "Enable/disable proxy support"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Proxy port"
+msgstr "פרוקסי"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
+#: src/muuli_wdr.cpp
+msgid "The proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2714
-msgid "The proxy host name"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2719
-msgid "The proxy port"
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "חיבור חיצוני נסגר."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "השמתש בדחיסת gzip"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&תפתח את הקובץ"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "ממתין..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "העלאות פעילים :"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Show Clients for"
+msgstr "לקוחות"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "קבצים משותפים"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "בחר מסנן תצוגה"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "העלאות פעילים"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "לקוחות"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "טען מחדש את הקבצים המשותפים שלך"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "שלח"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "שולח את ההודעה המצויינת."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "סגור את הצ'אט הנוכחי."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "ביטול"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "קבצים משותפים"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "מנותק"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "התחבר"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "נוטרל %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 #, fuzzy
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "בית"
 msgstr1 "בית"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "ק\"ב"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "ט\"ב"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "קילו"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "מגה"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "גיגה"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "טרה"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 #, fuzzy
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "בייט/שניה"
 msgstr1 "בייט/שניה"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "מ\"ב/ש"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "שניות"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "דקות"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "שעות"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "ימים"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "הכול"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "כל האחרים"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "חלקי"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "נעצר"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "ווידאו"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "ארכיב"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "טקסט"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "פןעל"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "מייבא %s:·%s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "קורא את הספרייה הזמנית"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "מחלץ מידע בסיסי מקובץ מידע ההורדות"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "יוצר קובץ יעד"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "טוען מידע מקובץ הורדות ישן (%u·מ·%u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "שומר את בלוק המידע לתוך קובץ הורדות יחיד (%u·מ·%u)"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "מחלץ את מידע הקובץ-המורד מהמקור"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "מוסיף הורדה ושומר קובץ-חלקים"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "ייבא קבצי-חלקים"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "מצב"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "גיבוב-קובץ"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (דיסק: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "נא לבחור תקייה לחפש קבצים זמניים שהורדו! (תתי תיקיות יכללו בחיפוש)"
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "האם אתה רוצה שקבצי המקורות של הורדות מוצלחות שיובאו, ימחקו?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "הסר מקור?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "שגיאה: יצירת קובץ-החלקים נכשלה)"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "מנסה לטעון גיבוי של קובץ ה met מ %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "שגיאה: %s (%s) פגום (מספר-תווית שגוי) לא יכול לטעון קובץ."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "מנסה לשחזר את המידע של הקובץ"
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "משחזר קובץ ללא שם - אנסה לשחזר את זה בתור RecoveredFile.dat"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "כל המידע הנגיש על הקבצים שוחזר :-) - מנסה להשתמש בזה..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "לא ניתן לשחזר את המידע אודות הקובץ :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "פתיחת הקובץ %s·(%s נכשלה"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "שגיאה במהלך השמירה של קובץ-החלקים %s (%s·==>·%s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 #, fuzzy
 msgid "IO failure while saving partfile: "
 msgstr "שגיאה במהלך השמירה של קובץ-החלקים %s (%s·==>·%s)"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "שמירת part.met.seeds נכשלה עבור הקובץ %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "נשמרו %i מקורות הזרעה עהור קובץ-החלקים: %s (%s)"
 msgstr1 "נשמרו %i מקורות הזרעה עהור קובץ-החלקים: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "נשמרו %i מקורות הזרעה עהור קובץ-החלקים: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "שגיאה בקריאת קובץ ההזרעה של קובץ החלקים (%s·-·%s):·%s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "נמצא חלק שהושלם (%i) בתוך %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "הסתיים הגיבוב מחדש של %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "הסתיימה ההורדה של: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "הסתיימה ההורדה של: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "מוחק את הקובץ: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "אזהרה. אין מספיק שטח דיסק פנוי! משהה את הקובץ %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "החלק %i שירד מתוך הקובץ %s פגום"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr "ICH: תוקן החלק הפגום %i עבור %s -< בתים שנמשרו: %s"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "ברירת מחדל של המערכת"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "אלבני"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "ערבית"
-
-#: src/Preferences.cpp:640
-#, fuzzy
-msgid "Asturian"
-msgstr "אסטונית"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "בסקית"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "בולגרית"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "קטלונית"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "סינית (מופשטת)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "סינית (מסורתית)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "קרואטית"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "צ'כית"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "דנית"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "הולנדית"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "אנגלית (בריטית)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "אנגלית (בריטית)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "אסטונית"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "פינית"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "צרפתית"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "גאלית"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "גרמנית"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "יוונית"
+msgid "Extended source exchange"
+msgstr "החלפת מקורות"
 
-#: src/Preferences.cpp:658
-msgid "Hebrew"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "הונגרית"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "איטלקית"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "איטלקית (שוויצרית)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "יפנית"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "קוראינית"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "ליטאית"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "נורבגית (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "פונלית"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "פורטגזית"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "פורטגזית (ברזילאית)"
-
-#: src/Preferences.cpp:669
-#, fuzzy
-msgid "Romanian"
-msgstr "אלבני"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "רוסית"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "סלובקית"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "ספרדית"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "שוודית"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "טורקית"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
+#: src/PeerCapabilities.h
+msgid "IPv6"
 msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "לא זמין"
-
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "נשתמש במבואה שבברירת מחדך (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "חיבור"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "מלונים"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "שרתים"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "קבצים"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "אבטחה"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "פרוקסי"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "שליטה מרחוק"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "חתימה מקוונת"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "ארועים"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "ניפוי שגיאות"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5089,26 +6201,43 @@
 "these settings."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "בודק סיסמא\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5116,68 +6245,88 @@
 "אימיול חייב להיות מאותחל מחדש על מנת לאפשר את השינויים הללו:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- מבואת TCP שונתה \n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- מבואת UDP שונתה \n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "חיבור חיצוני נסגר."
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "חיבור חיצוני נסגר."
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "גישה חיצונית חדשה התקבלה"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "חיבור חיצוני נסגר."
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "חיבור חיצוני נסגר."
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- השפה שונתה.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
-"אתה אפשרת חיבוריים חיצוניים אבל לא הזנת סיסמא תקיפה.\n"
-"חיבורים חיצוניים לא יאופשרו אלא אם כן תוזן סיסמא תקיפה."
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- השפה שונתה.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- הפסרייה הזמנית שונתה.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- ED2K network enabled.\n"
 msgstr "כל הרשתות מנוטרלות."
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "גרסת פרוטוקל לא תקפה."
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5185,7 +6334,7 @@
 "קאד לא יתחיל אם מבואת ה UDB מנוטרלת.\n"
 "תאפשר את מבואת ה UDP או שתנטרל את קאד."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5195,20 +6344,69 @@
 "אתה חייב לאתחל את אימיול עכשיו!\n"
 "אם לא תאתחל את אימיול עכשיו אל תתלונן אם משהו רע יקרה.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "רענון אוטמטי התחיל"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "אתה כבר מנסה להוריד את הקובץ %s"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "גישה חיצונית חדשה התקבלה"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5218,41 +6416,66 @@
 "בבקשה תכניס לפחות כתובת URL אחת שתצביע לקובץ server.met תקף.\n"
 "לחץ על הכפתור \"רשימה\" שליד הצ'קבוקס הזה כדי להכניס בתובת URL."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "קבצים זמניים"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "קבצים נכנסים"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "חתימה מקוונת"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "בחר תיקייה עבור %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "נמצא %i קובץ משותף מוכר"
+msgstr1 "נמצא %i קובץ משותף מוכר"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "חפש נגן סרטים"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "בחר דפדפן"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "בחר דפדפן"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "קובץ הרצה %s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "ברירת מחדל של המערכת"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5260,1212 +6483,1472 @@
 "הוסף כאן כתובות URL שמהם ניתן להוריד קבצי server.met.\n"
 "רק כתובת אחת בכל שורה."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "מקורות שלמים"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "סטאטוס:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "סטאטוס:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "השהיית עדון: %d שניות"
 msgstr1 "השהיית עדון: %d שניות"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "זמן עבור גרף הממוצע: %d דקות"
 msgstr1 "זמן עבור גרף הממוצע: %d דקות"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "סקאלאת גרף החיבורים: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "גודל זיכרון זמני לקובץ: %d בתים"
 msgstr1 "גודל זיכרון זמני לקובץ: %d בתים"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "גודל תור ההאלעות: %d לקוחות"
 msgstr1 "גודל תור ההאלעות: %d לקוחות"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "רענון חיבור לשרת כל: %d דקות"
 msgstr1 "רענון חיבור לשרת כל: %d דקות"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "רענון חיבור לשרת: מנוטרל"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "disabled"
 msgstr "נוטרל %s"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Execute command on '%s' event"
 msgstr "בצע פקודה בעת ארוע '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "אפשר הרצת פקודות על הליבה"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "פקודת ליבה:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "אפשר ביצוע פקודות על ממשק גרפי"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "פקודת ממשק גרפי:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "המשתנים הבאים יוחלפו:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "טען מחדש את הקבצים המשותפים שלך"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "טען מחדש את הקבצים המשותפים שלך"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "קורא את הספרייה הזמנית"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "טוען מחדש את רשימת הקבצים המשותפים."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "קבצים משותפים"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "בחר תיקייה עבור %s"
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr ""
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "חיפושים"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "בתהליך"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr ""
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "ראשי"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "לא יכול להתבצע חיפוש באמצעות קאד אם קאד לא פועל"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "אזהרה: רשימת הקבצים-המכורים פגומה, מכילה כותר פגום."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "שגיאה לא צפויה בעת ניסיון ביצוע חיפוש ב קאד: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "מ\"ז של קובץ"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "לא מדורג"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "הורדה בקטיגוריה"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "מ\"ז של קובץ"
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "הוסף כתובות URL אופתינליות לקובץ זה"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:718
-msgid "Search related files (eD2k, local server)"
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "סמן בתור קובץ מוכר"
+#: src/SearchListCtrl.cpp
+msgid "Search related files (eD2k, local server)"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "ביטול"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "פועל"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "פינית"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "החיבור לשרתים המבלבלים שברשימה כשל, מבצע מעבר נוסף ללא השרתים המבלבלים"
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "ההתחברות לכל השרתים הרשומים כשלה, מבצע מעבר נוסף."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "ההתחברות לכל השרתים הרשומים כשלה, מבצע מעבר נוסף."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "התחברות אוטומטית לשרת ינוסה שוב תוך %d שניות"
+msgstr1 "התחברות אוטומטית לשרת ינוסה שוב תוך %d שניות"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "מחובר ל %s·(%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "חיבור הוקם ל: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "כשל חמור בעת הניסיון להתחבר. יתכן והתקשורת למרשתת לא מקוונת."
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "אבד התקשורת ל %s·(%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "נראה כאלו ש %s·(%s:%i) מת."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "נראה כאלו ש %s·(%s:%i) מלא."
 
-#: 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"
-msgstr0 "התחברות אוטומטית לשרת ינוסה שוב תוך %d שניות"
-msgstr1 "התחברות אוטומטית לשרת ינוסה שוב תוך %d שניות"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "החיבור אבד."
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "ההתחברות ל %s·(%s:%i) כשלה"
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "פג הזמן עבור ניסיון ההתחברות ל %s·(%s:%i)"
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr ""
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "שגיאת קריאה/כתיבה תוך כדי הקובץ known.met: %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr ""
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr ""
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr ""
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr ""
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr ""
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "נכשל בפתיחת '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "שגיאת קריאה/כתיבה תוך כדי הקובץ known.met: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr ""
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "הסתיימה ההורדה של: %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "שם שרת"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "כתובת"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "מבואה"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "תיאור"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "פינג"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "משתמשים"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "משתמשים"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "קבוע"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "גירסא"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "קבצים"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "קבצים משותפים"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "אתה מחובר לשרת אותו אתה מנסה למחוק. בבקשה קודםתתנתק. השרת לא נמחק!"
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(שם לא ידוע)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "האם אתה בטוח שאתה רוצה למחוק את השרת הקבוע %s"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "דקות"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "שרתים (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "שרת"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "מחובר לשרת"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "סמן שרת בתור קבוע"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "סמן שרת בתור לא קבוע"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "סמן שרתים בתור קבועים"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "סמן שרתים בתור כאלה שאינם קבועים"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "הסר שרת"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "הסר שרתים"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "הסר את כל השרתים"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "התחבר מחדש לשרת"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "האם אתה בטוח שאתה מעוניין למחוק את כל השרתים?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "האם אתה בטוח שאתה מעוניין למחוק את כל השרת המסומן?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "האם אתה בטוח שאתה מעוניין למחוק את כל השרתים המסומנים?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "מ\"ז החדש ללקוח הוא %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "אזהרה: קיבלת מ\"ז נמוך (Low-ID)!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\t רוב הסיכויים שזה מאחר ואתה נמצא מאחור חומתאש או נתב."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tעבור מידע נוסף פנה ל https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "התקבל מידע על שרת, שהמידע לא ידוע! - קצר מדי"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, fuzzy, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "התקבל %d שרת חדש"
 msgstr1 "התקבל %d שרת חדש"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "שמירת רשימת השרתים הסתיימה."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "השרת דחה את הפקודה האחרונה."
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "חבילה מדומה התקבלב משרת: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "שגיה לא מטופלת בעת עיבוד החבילה שתקלה מהשרת: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr "לא יכול ליצור תהליכון לפענוח ה DNS כדי להתחבר ל %s"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "כתובת ה IP ak var, %s·(%s) מסוננת,  לא מתחבר."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "משתמש בערפול פרוטקול."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "מחבר ל %s·(%s·-·%s:%i)·%s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr "לא יכול לפענח כתובת השרת של %s באמצעות DNS: לא יכול להתחבר!"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "אֵימיול "
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "שרת לא התווסף: לא צויין שם שרת או כתובת אי.פי."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "שרת לא התווסף: צוינה מבואה לא תקפה."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "מ\"ז"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "מצב חיבור:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "מחובר"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "סטטוס קאדימליה:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Running in LAN mode"
 msgstr "פועל על %s"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "פועל"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "סטטוס קאדימליה:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "סטאטוס:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "מצב חיבור:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "UDP Connection State:"
 msgstr "מצב חיבור:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "מצב חומת אש: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "אין חבר"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connecting to buddy"
 msgstr "מחובר לחבר"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, fuzzy, c-format
 msgid "Connected to buddy at %s"
 msgstr "מחובר לחבר"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "כתובת IP:"
+
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed sources:"
 msgstr "מקורות שנמצאו :"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed notes:"
 msgstr "קובץ האינדקס לא נמצא"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "ממוצע משתמשים:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "ממוצע קבצים:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "לא פועל"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "נמצא %i קובץ משותף מוכר"
 msgstr1 "נמצא %i קובץ משותף מוכר"
 
-#: src/SharedFileList.cpp:410
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "נמצא %i שידוע שהם משותפים, %i לא ידועים"
-msgstr1 "נמצא %i שידוע שהם משותפים, %i לא ידועים"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "לא נמצא השרת: %s"
 
-#: src/SharedFileList.cpp:486
-#, c-format
-msgid "No shareable files found in directory: %s"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "לא נמצא השרת: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "שם משתמש"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "מהירות הורדה"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "שגיאה במהלך שמירת הקובץ known.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "מהירות-העלאה"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "משהה את העלאה של קובץ: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "משהה את העלאה של קובץ: %s"
+msgstr1 "משהה את העלאה של קובץ: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "נמצא %i קובץ משותף מוכר"
+msgstr1 "נמצא %i קובץ משותף מוכר"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "זמין :"
+msgid "User Name"
+msgstr "שם משתמש"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "ההעלאות"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Download Status"
 msgstr "הורדות"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "שם קובץ"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "קבצים משותפים"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "בקשות"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "בקשות שהתקבלו"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "מידע שנשנלח"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "יחס שיתוף"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "חלקים שהושגו"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "מקורות שלמים"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "זמינות"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "נתיב תיקייה"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "קבצים משותפים"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "הוסף תגובה/דירוג"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "ערוך תגובה/דירוג"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "שנה שם"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "הוסף קבצים שבאסופה לרשימת המשלוח"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "העתק מגנט &URI ללוח"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "העתק קישור ED2k ללוח (מידע &AICH)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "אתה צריך מ\"ז גבוה (HighID) כדי לחןר קישור-מקור תקף"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "שגיאה בעת הסיום."
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "הניסיון לקבל את רשימת הקבצים המשותפים מהמשתמש '%s' כשלה."
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "טען מחדש את הקבצים המשותפים שלך"
+msgstr1 "טען מחדש את הקבצים המשותפים שלך"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "גודל כולל של קבצים משותפים: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "גודל כולל של קבצים משותפים: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "קבצים משותפים (%i)"
+msgstr1 "קבצים משותפים (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "קבצים משותפים (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "קובץ-חלקים"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "טוען מחדש את רשימת הקבצים המשותפים."
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "מצב"
+
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "שם קובץ"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "מידע שהועלה (התחברות נוכחית(סכום כולל)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "סכום כולל של התקורה (חבילות): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "תקורת בקשות קבצים (חבילות): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "תקורת החלפת מקורות (חבילות): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "תקורת השרת (חבילות): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "תקורת קאד (חבילות): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "האלעות פעילות: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "העלאות בהמתנה: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "סכום כולל של האלעות מוצלחות: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "סכות כולל של העלאות שנשכשלו: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "זמן האלעה ממוצע: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "הורדת מידע (התחברות נוכחית (סכום כולל)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "מקורות שנמצאו: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "הורדות פעילות (נתחים): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "יחס העלאה:הורדה בהתחברות נוכחית (סכום כולל): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "התחברויות מחדש: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "זמן מאז העברה הראשונה: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "מחובר לשרת מאז: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "חיבורים פעילים (משוער): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "גבול מקסימלי של התחברויות הושג: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "חיבורים בממוצע (משוער): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "שיא החיבורים (משוער): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "לקוחות"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "גודל לא ידוע"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "מסוננים"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Banned: %s"
 msgstr "חסום"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "סכום כולל: %i מוכר: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "שרתים פעילים: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "שרתים שנכשלו: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "סכום כולל: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "שרתים שנמחקו: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "שרתים שסוננו: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "משתמשים על שרתים פעילים: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "קבצים על שרתים פעילים: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "סכום כולל של משתמשים: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "סכום כולל של קבצים: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "תעסוקת שרתים: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "מספר קבצים משותפים: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "גודל כולל של קבצים משותפים: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "מערכת הפעלה"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "לא התקבל"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "כישורים פעילים (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "לא זמין"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "אף פעם"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, fuzzy, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "פקודת '%s עם pid '%d' סיים עם קוד סטטוס '%d'."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "הרץ <str> וצא."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr "פורמט IP לא חוקי. התמש ב xxx.xxx.xxx.xxx:xxxx\n"
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "הפקודה הזאת דורשת ארגומנט. ארגומנט חוקי יכול להיות: 'all' שם קובץ או מספר.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "מעבד על פי גיבוב: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "מעבד על פי שם קובץ: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "פקודה זאת דורשת ארגומנט. ארגומנט חוקי: גיבוב של קובץ.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "לא מספר חוקי\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "לא גיבוב חוקי (האורך חייב להיות בדיוק 32 תווים)\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6473,7 +7956,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6481,82 +7964,86 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "הורדות (%i)"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "הבקשה נכשלה עם שגיאה לא ידועה"
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "הפעולה הסתיימה בהצלחה."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "הבקשה נכשלה עם השגיאה הבאה: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "סינון IP עבור לקוחות הוא %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "מכובה"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "דלוק"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "סינון IP עבור שרתים הוא %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "רמת סינום IP נוכחית היא %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
 msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "מחובר ל %s·%s·%s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "מתחבר עכשיו"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "חסום-חומתאש"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "בסדר"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6565,7 +8052,7 @@
 "\n"
 "הורדה:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6574,7 +8061,7 @@
 "\n"
 "העלאה:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6583,7 +8070,7 @@
 "\n"
 "לקוחות בתור:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6592,38 +8079,33 @@
 "\n"
 "סה\"כ מקורות:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "קובץ-חלקים"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "מספר תוצאות חיפוש: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr ""
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "התקבלה תשובה לא מוכרת מהשרת, קוד-פעולה = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "הראה מידעה על מצב בקיצור."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "הראה מצב חיבורים, מהירות הורדה/האלכה נוכחיים וכו'.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "הראה את עץ הסטטיסטיקה המלא."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6637,51 +8119,51 @@
 "\n"
 "דוגמא: 'statistics·5' יראה רק את חמשת הגרסאות הראשונים עבור כל סוג לקוח.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload the given object."
 msgstr "טוען מחדש את האובייקט הנתון."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload shared files list."
 msgstr "טוען מחדש את רשימת הקבצים המשותפים."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload IP filtering table."
 msgstr "טוען מחדש את טבלת סינון ה IP מהקובץ."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload current IP filtering table."
 msgstr "בחר את אמת סינון הIP."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Update IP filtering table from URL."
 msgstr "טוען מחדש את טבלת סינון ה IP מהקובץ."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "התחבר לרשת."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6693,36 +8175,36 @@
 "שרת זה בלבד. ה IP חייב להיות ארבעה מספרים מופרדים בנקודות בפורמט IPv4, \n"
 "או שם שרת שניתן להמירו ל IP."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "התחבר רק לקאד."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "התנתק מהרשת."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "פעולה זו תנתק את כל הרשתות המחוברות.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "התנתק רק מ קאד."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Add an eD2k or magnet link to core."
 msgstr "מוסיף קישור ed2k או מגנט לליבה."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6733,52 +8215,52 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "הגדר ערך מועדף."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Set IP filtering preferences."
 msgstr "הגדר העדפת מסנן IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "הדלק סינון IP הן עבור הלקוחות והן עבור השרתים."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "כבה סינון IP הן עבור הלקוחות והן עבור השרתים."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "אפשר/נטרל סינון IP עבור לקוחות."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "הדלק סינון IP עבור לקוחות."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "כבה סינון IP עבור לקוחות."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "אפשר/נטרל סינון IP עבור שרתים."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "הדלק סינון IP עבור שרתים."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "כבה סינון IP עבור שרתים."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "בחר את אמת סינון הIP."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6786,66 +8268,79 @@
 "רמות סינון תקפים המ בתווך של 0-255, ברירת המחדשל (ערך התחלתי)\n"
 "הוא 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "קבע תיחום רוחב פס."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "הערך שמועבר לפקודות אלו חייב להיות ביחידות של ק\"ב/ש.\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "קבע מגבלת רוחב פס בהעלאה."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "הערך שמועבר לפקודות אלו חייב להיות ביחידות של ק\"ב/ש.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "קבע מגבלת רוחב פס בהורדה."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr ""
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "הערך שמועבר לפקודות אלו חייב להיות ביחידות של ק\"ב/ש.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "שלוף ותציג ערך של העדפה."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering preferences."
 msgstr "שלוף העדפה עבור סינון IP."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for both clients and servers."
 msgstr "שלוף העדפה עבור סינון IP עבור השרתים והלקוחות."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for clients only."
 msgstr "שלוף העדפה עבור סינון IP רק עבור הלקוחות."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for servers only."
 msgstr "שלוף העדפה עבור סינון IP רק עבור השרתים."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering level."
 msgstr "בחר את אמת סינון הIP."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "שלוף הגבלת רוחב הפס."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a search."
 msgstr "הרץ חיפוש בקאדימליה"
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6864,46 +8359,48 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a global search."
 msgstr "הרץ חיפוש גלובלי."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a local search"
 msgstr "הרץ חיפוש מקומי"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a kad search"
 msgstr "הרץ חיפוש בקאדימליה"
 
-#: src/TextClient.cpp:1070
+#: src/TextClient.cpp
 #, fuzzy
-msgid "Show the results of the last search."
+msgid "Show the results of a search."
 msgstr "הראה את התוצאות של החיפוש האחרון."
 
-#: src/TextClient.cpp:1071
-#, fuzzy
-msgid "Return the results of the previous search.\n"
-msgstr "מחזירת את התוצאות של החיפוש האחרון.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "מראה את התקדמות החיפוש."
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "מראה התקדמות של חיפוש.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "התחל בהורדת קובץ"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6911,82 +8408,82 @@
 "מספר הקובץ מהחיפוש האחרון חייב להמסר.\n"
 "דוגמה: 'download·12'· יתחיל להוריד את קובץ מספר 12 מהחיפוש האחרון.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "השהה הורדה."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "המשך הורדה."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "בטל הורדה."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "קבע את העדיפות של ההורדה."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr "קבע את עדיפות ההורדה ל נמוך, נורמלי, גבוה או אוטומטי.\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "קבע את העדיפות ל 'נמוך'."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "קבע את העדיפות ל 'נורמלי'."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "קבע את העדיפות ל 'גבוה'."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "קבע את העדיפות ל 'אוטומטי'."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "הראה תורים/רשימות."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr "הראה תורים של הרודות/העלאות, רשימת שרתים או רשימת קבצים משותפים.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "הראה צור העלאות"
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "הראה את תור ההורדות."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "הראה יומן."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "הראה את רשימת השרתים."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "טוען מחדש את רשימת הקבצים המשותפים."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "אפס את הימון."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -6995,256 +8492,279 @@
 "זאת פקודה מיושנת ועלולה להתבטל בעתיד.\n"
 "השתמש ב '%s' במקומה.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "לקוח טסטואלי של אֵימיול"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "מוחק את הקובץ: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "מוחק את הקובץ: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "ממשיך את העלאה של קובץ: %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "ממיר את קבוצת הגיבובים בפורמט AICH עבור '%s' ל 64b עבור '%s'."
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr "אזהרה: שם הקובץ '%s' אינו חוקי והוא נקרא מחדש בשם '%s'."
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr "אזהרה: הקובץ '%s' כבר קיים. שם הקובץ החדש שונה ל '%s'."
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "האם אתה בטוח שברצונך לבטל ולמחוק את כל הקבצים שבקטגוריה זו?"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "זקוק לאישור."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "יותר מדי חיבורים"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "כל האחרים"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "בחר מסנן תצוגה"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "הוסף קטיגוריה"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "ערוך קטיגוריה"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "הסר קטיגוריה"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "התבקשה קבוצת הגיבובים של קובץ לא ידוע: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "טעינת קובץ מסננים עם סיומת '.dat' '%s', נכשלה. לא ניתן לפתוח את הקובץ."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "ממשיך את העלאה של קובץ: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "משהה את העלאה של קובץ: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr ""
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "הורדה הסתיימה"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "הנתיב המלא לקובץ"
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "שם הקובץ ללא הנתיב."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "גודל הקובץ בבתים."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "זמן מצטבר של פעולת הורדה."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "צ'אט חדש החל."
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "שולח ההודעה"
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "נגמר המקום"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "מחיצת דיסק."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "שגיאה בעת הסיום."
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "מעבד קובץ מס. %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "ביקשת גיבובים עבור חלקים (בשימוש רק עבור קבצים > 9.5 מ\"ב"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "קובץ %s אינו קיים!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "ברוכים הבאים!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "פרמטרים להזנה"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "גיבוב קובץ"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "הוסף כתובות URL אופתינליות לקובץ זה"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "הסר"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "צור קישור עם חלקי הגיבובים"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr "עזור להפיץ קבצים חדשים ונדירים יותר מהר, במחיר קידור יותר גדול"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "קובץ גיבובי MD4"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "שמור"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "העתק ללוח"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "אודות aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "אין שום דבר להעתיק נכון לעכשיו !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "לא הצליך לפתוח את "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "בבקשה תכניס שם קובץ שאינו ריק"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "שום דבר לשמור עכשיו !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7256,162 +8776,159 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "מגבב..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "בוטל !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "הסתיים ב %.2f שניות"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "כבר הוספת את כתובת URL הזאת !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "בבקשה תכניס כתובת URL שאינה ריקה"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "לא מצליח לפתוח את %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "ימים - %i, שעות -%i, דקות - %i, שניות - %i"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uימים %02uשעות %02uדקות %02uשניות"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uשעות %02uדקות %02uשניות"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02uדקות %02uשניות"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02uשניות"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f בתים"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f ק\"ב"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f מ\"ב"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f ג\"ב"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f ט\"ב"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "סטטיסטיקות מקוונות של אימיול - wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "קצב הורדה מקסימלי מאז ש wxCas החל לפעול"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "קצב הורדה מקסימלי אבסלוטי בעת הפעלות קודמות של wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "אתחל מחדש"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "מערכת"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "עצור רענון אוטומטי"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "שמור תמונה סטטיסטית מקוונת"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "הדפס תמונה סטטיסטית מקוונת"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "הגדרת העדפות"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "אודות wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "החל רענון אוטומטי"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "רענון אוטמטי נעצר"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "רענון אוטמטי התחיל"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "שמור תמונה סטטיסטית"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "סטטיסטיקות מקוונות של אימיול"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7419,11 +8936,11 @@
 "ישנה בעייה בהדפסה.\n"
 "האם המדפסת הנוכחית שלך מוגדרת בצורה נכונה?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "מדפיס"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7440,398 +8957,482 @@
 "\n"
 "מופץ תחת רשיון GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "או או.. אימיול לא פועל..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "אימיול פועל"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "אמיול פועל אך אינו מחובר"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "אימיול מתחבר..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "או או... המצב של אימיול אינו ידוע..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "אֵימיול "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " פועל במשך "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " הופסק !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " אינו מחובר !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " מתחבר..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " עושה משהו מוזר, תבדוק את זה!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " מחובר ל "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " קאד: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "מכובה"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " דלוק "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " עם "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "סכום כולל של הורדות: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", הועלה: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "הורד בהחתברות הנוכחית: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "מוריד: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " ק\"ב/ש, העלאה: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "משתף: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " קבצ(ים), לקוחות בתור: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "זמן: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " דלוק "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "עומס ממוצע של המערכת ( 1-5-15 דקות): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "משך הפעולה של המערכת:"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "תקיה המכילה את הקובץ amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "הכנס כאן את התקייה היכן שהקובץ amulesig.dat נמצא"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "קצב מרווח הרענון בשניות"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "צור תמונת סטאטוס בכל ארוע רענון"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "הכנס כאן את התקיה שבה אתה רוצה ליצור את תמונת הסטטוס"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "העלה בתקופתיות את תמונת הסטטוס לשרת FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "כתובת URL של FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "נתיב FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "הכנס כאן את כתובת ה URL של שרת ה FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "הכנס כאן את נתיב הספריה שבה אתה שם את תמונת הסטטוס על שרת ה FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "משתמש"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "הכנס כאן את שם המשתמש שאיתו תתחבר לשרת ה FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "הכנס את סיסמת הזיהוי להתחברות לשרת ה FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "קצב עדכון התקופתי של ה FTP בדקות"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "אַמת"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "תיקיה המכילה את קובץ החתימה שלך"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "תיקיה שבה יווצרו תמונות הסטאטוס"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "טוען תבנית<מחרוזת>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "מבואת UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "השמתש בדחיסת gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "אפשר גישה לאורחים"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "מנע גישה מאורחים"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "נתיב קובץ ההגדרות של אימיול. לא לשימוש בצורה ישירה!!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "נטרל מפענח PHP (מיושן-מבוטל)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "הדר מחדש דפי PHP לאחר כל בקשה"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "שרת אימיול רשתי"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "הבקשה נכשלה עם השגיאות הבאות: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "קובץ האינדקס לא נמצא"
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "פג התוקף של החיבור - מבקש התחברות מחדש\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "התחברות הצליחה - מחובר\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "התחברות הצליחה, לא מזוהה\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "לא נפתחה התחברות - הולך לבקש להזדהות\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "נוצרה התחברות מבקש להזדהות\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "מעבד בקשה מקורי: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "בודק סיסמא\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "גיבוב הסיסמא אינו תקף\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "הסיסמא בסדר\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "סיסמא שגויה\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "לא הזנת סיסמא. סיסמאות ריקות אינם קבילות.\n"
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "ב‏‎ֻקְשַה התנתקות\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "מעבד בקשה הופנתה מחדש: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "התחברות נכשלה "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "קובץ לא נמצא."
+#~ msgid "Ratio"
+#~ msgstr "דרוג"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "לא זמין"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "חלקים שהושגו"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "זמין :"
+
+#, fuzzy, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "נמצא %i שידוע שהם משותפים, %i לא ידועים"
+#~ msgstr1 "נמצא %i שידוע שהם משותפים, %i לא ידועים"
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "מ\"ב/ש"
+
+#~ msgid " kB/s"
+#~ msgstr " ק\"ב/ש"
+
+#~ msgid "kB/s"
+#~ msgstr "ק\"ב/ש"
+
+#~ msgid "kB"
+#~ msgstr "ק\"ב"
+
+#~ msgid "MB/s"
+#~ msgstr "מ\"ב/ש"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d·%H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "שרת מרוחק"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "שרת מקומי"
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "טוען מידע מקובץ הורדות ישן (%u·מ·%u)"
+
+#~ msgid "Filter Results"
+#~ msgstr "תוצאות מסנן"
+
+#~ msgid "Mark as known file"
+#~ msgstr "סמן בתור קובץ מוכר"
+
+#~ msgid "More"
+#~ msgstr "עוד"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "הפסק את ניסיונות ההתחברות הנוכחיים"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "התנתק מהרשתות שאליהם אתה מחובר כעת"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "התחבר לרשתות שמאופשרות כרגע"
+
+#, fuzzy
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "מחזירת את התוצאות של החיפוש האחרון.\n"
+
+#, fuzzy
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "מראה התקדמות של חיפוש.\n"
+
+#~ msgid "Commit"
+#~ msgstr "שלח"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "\tעבור מידע נוסף פנה ל https://amule-org.github.io/docs"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "תרגיש חופשי לדוואח על כל שגיאה ל https://github.com/amule-org/amule/issues"

amule-3.0.1.tar.gz/po/hr.po -> amule-3.1.0.tar.gz/po/hr.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:20+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:44+0000\n"
 "Last-Translator: Sebastiano Pistore <sebastiano.pistore.info@aol.com>\n"
 "Language-Team: https://github.com/amule-org/amule <forum@aMule.org>\n"
 "Language: hr\n"
@@ -20,70 +20,153 @@
 "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-Generator: Poedit 2.0beta1\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "O autoru:"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr ""
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Autorsko pravo (c) 2003-2019 aMule Team \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr "Autorsko pravo (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Web stranica:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Forum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Nije dostupno"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Dodaj prijatelja"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Ukucaj vazecu IP adresu i port!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informacije"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Neuspjelo povezivanje"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -92,139 +175,268 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Neuspjelo otvaranje %s (%s)"
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Uspostavljena veza sa: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
 msgstr0 ""
 msgstr1 ""
 msgstr2 ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "GREŠKA"
-
-#: src/amuleAppCommon.cpp:179
-#, fuzzy
-msgid "Failed to open ED2KLinks file."
-msgstr "Neuspjelo otvaranje %s (%s)"
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
 
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Neuspjesno"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr ""
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Potvrda izlaza"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "Nova vanjska veza prihvacena\n"
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "UPOZORENJE"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i servera pronadjeno u server.met"
+msgid "Loading temp files"
+msgstr "Zahtjev dijeljenih fajlova od '%s'"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Zahtjev dijeljenih fajlova od '%s'"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Pronadjeno %i poznatih dijeljenih fajlova"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Pronadjeno %i poznatih dijeljenih fajlova"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Start"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
 msgstr ""
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
+#: src/amule.cpp src/FirstRunWizard.cpp
+#, fuzzy
+msgid "eD2k server list (server.met)"
+msgstr "%i servera pronadjeno u server.met"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
 msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "GREŠKA"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr ""
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -234,648 +446,675 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "ne dajemo nikakvu garanciju da nece nista unistiti, tvoju kucu zapaliti, \n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr ""
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr ""
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 #, fuzzy
 msgid "Server hostname notified"
 msgstr "Ime servera :"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr ""
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr ""
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr ""
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr ""
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr ""
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr ""
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr ""
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr ""
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "POGREŠKA: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr ""
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
 msgstr ""
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Pretrage"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Web stranica: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr ""
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Web stranica: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Klienti"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Poruke"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Autorsko pravo (c) 2003-2019 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistike"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Opcije"
+
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr "Autorsko pravo (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Nije dostupno"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Poruka"
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Spajanje"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Connected"
 msgstr "Veza uspostavljena"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Connecting"
 msgstr "Spajanje"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr ""
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Otkaz"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "Zaustavlja trenutne pokusaje uspostavljanja veze"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Verzija"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Prekinuti vezu"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "Prekinuti vezu sa sadasnjim serverom"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Uspostavi vezu"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adresa"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr ""
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Opis"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "aMule Log"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Gore: %.1f(%.1f) | Dole: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Gore: %.1f | Dole: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Da li zaista zelite iskljuciti aMule?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Potvrda izlaza"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr ""
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Pretrage"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Prozor pretraga"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Downloads"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "Downloading"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Prozor dijeljenih fajlova"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Poruke"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Klienti"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Prozor poruka"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistike"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Prozor grafova statistike"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Opcije"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Prozor postavke opcija"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Uvezi"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "O autoru:"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr ""
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr ""
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Fatalna greska: Neuspjesno stvaranje tajmera"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Izgubljena veza"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Pitanje pri napustanju"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Fatalna greska: Neuspjesno stvaranje tajmera"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Connecting..."
 msgstr "Spajanje"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Onemogućeno"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Spreman"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Sve"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Nije dostupno"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Datoteka nije pronađena."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Vec pokusavate downloadovati fajl %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
-msgid "Unknown"
-msgstr "Nepoznat"
-
-#: src/BaseClient.cpp:1363
+#: src/amule-remote-gui.cpp
 #, c-format
-msgid "Failed to retrieve shared files from user '%s'"
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
 msgstr ""
 
-#: src/BaseClient.cpp:1575
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
+msgid "Unknown"
+msgstr "Nepoznat"
+
+#: src/BaseClient.cpp
 #, fuzzy
 msgid "Searching buddy for lowid connection"
 msgstr "ceka na spajanje..."
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "Requested: %s\n"
 msgstr "Zahtijevan:"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
@@ -883,7 +1122,7 @@
 msgstr1 "Fajl statistike za ovu misiju: Prihvaceno %d od %d zahtjeva, %s preneseno\n"
 msgstr2 ""
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
@@ -891,119 +1130,198 @@
 msgstr1 "Fajl statistike za ovu misiju: Prihvaceno %d od %d zahtjeva, %s preneseno\n"
 msgstr2 ""
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Zatrazen nepoznat fajl"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, 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/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr ""
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Neocekivana fajl greska prilikom pisanja %s : %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Greska prilikom spajanja sa %s (%s:%i): %d"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Pisati captcha"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategorija"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr ""
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Izaberi mapu (folder) za dolazece fajlove"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Brbljanje"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Zatvori oznaku"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Zatvori sve oznake"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Zatvori druge oznake"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Primi u prijatelje"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Pokazi &Detalje"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Uspostavi slot zu prijatelja"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Ugledaj fajlove"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Pošalji poruku"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
@@ -1011,7 +1329,7 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, fuzzy, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
@@ -1019,160 +1337,272 @@
 msgstr1 "Krediti istekli!"
 msgstr2 ""
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Detalji klienta"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Podržano"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Nije podržano"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Onemogućeno"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Veza uspostavljena"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Prekinuta veza"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
+msgid "%.1f KiB/s"
 msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Naziv"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP adresa"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Posljedni prijem"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Verzija"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Brzina uploada"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "Brzina downloada"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Brzina uploada"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Download"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Nedovrseno"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Los decko"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Priznat - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Nije dostupno"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Fajlovi"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Downloading"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Prijenos"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Aktivan"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Nepoznat"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "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/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Korisnik %s (%u) dijeli direktorije %s"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "Korisnik %s (%u) ja zavrsio slanje liste dijeljenih fajlova"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Korisnik %s (%u) ja zavrsio slanje nezeljene liste dijeljenih fajlova"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Komentari fajla"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Ime korisnika"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Ime fajla"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Ocjena"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Komentiraj"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "ceka na spajanje..."
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Bez komentara"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, fuzzy, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
@@ -1180,406 +1610,415 @@
 msgstr1 "Bez komentara"
 msgstr2 ""
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Neuspjesno citanje kreditnog fajla"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Ni"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Vi"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Vrlo nizak"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Nisko"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normalan"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Visoko"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Vrlo visok"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr ""
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Pita"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Spaja preko servera"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Pun red cekanja"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "U redu cekanja"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Downloading"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Prima hashset"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Nepotrebni dijelovi"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Ne moze spojiti LowID sa LowID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Previse konekcija"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr ""
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Zabranjen"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr ""
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Star MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Novi MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr ""
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr ""
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr ""
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr ""
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr ""
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr ""
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Rezultati pretrage"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Zavrseno"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr ""
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr ""
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr ""
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Velicina"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Transferirano"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Brzina"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Napredak"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Izvori"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioritet"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Status"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Preostalo vrijeme"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Posljednji put vidjen kompletno"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Posljedni prijem"
 
-#: 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/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/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automatski"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Otkaz"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Stop"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pauza"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Nastavak"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "O&dstrani zavrsene fajlove"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Primijeni sve A4AF ovom fajlu"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Primijeni sve A4AF ovom fajlu (Automatski)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Primijeni sve A4AF nekom drugom fajlu"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Prosirene opcije"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Preuvid"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Pokazi &detalje fajla"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Pokazi sve kommentare"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Upitao za drugi fajl"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "neodredjeno"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Odredi u kategoriju"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Otvori fajl"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+#, 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/DownloadListCtrl.cpp
+#, 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/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Downloads (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr ""
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Ukupna velicina dijeljenih fajlova: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading temp files from %s."
 msgstr "Zahtjev dijeljenih fajlova od '%s'"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Nisu nadjeni nikakvi poceti fajlovi"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
@@ -1587,45 +2026,45 @@
 msgstr1 "Nadjeno %i pocetih fajlova"
 msgstr2 ""
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Downloading %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr ""
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Vec pokusavate downloadovati fajl %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
@@ -1633,266 +2072,344 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr ""
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr ""
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr ""
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr ""
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Automatsko spajanje sa serverom ce ponovo poceti za %d sekundi"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr ""
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr ""
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Datoteka nije pronađena."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Datoteka nije pronađena."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
+#: src/ExternalConn.cpp
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ExternalConn.cpp:1536
-msgid "WebSearch from remote interface makes no sense."
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
 msgstr ""
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr ""
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr ""
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr ""
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Datoteka nije pronađena."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Nepravilan naziv datoteke."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr ""
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Odstrani kategoriju"
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr ""
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1900,23 +2417,23 @@
 "Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Izlaz iz aplikacije."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr ""
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1924,59 +2441,59 @@
 "\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Sintaktička pogreška!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr ""
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr ""
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr ""
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1985,318 +2502,538 @@
 "Exiting...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr ""
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr ""
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr ""
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr ""
+
+#: src/FileLaunch.cpp
 #, c-format
-msgid "%.2f kB/s"
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
 msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "GRESKA: neuspjesno stvaranje zapocetog fajla)"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Spajanje"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Veza"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Privremene datoteke"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Vec pokusavate downloadovati fajl %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Pretrazi :"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Prijatelji"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Pokazi &Detalje"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Dodaj prijatelja"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Odstrani prijatelja"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Posalji &Poruku"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Ugledaj fajlove"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Uspostavi slot zu prijatelja"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 #, 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:182
+#: src/FriendListCtrl.cpp
 #, 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:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr ""
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Pošalji poruku"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "U redu cekanja"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Upitao za drugi fajl"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "Uploadovi na cekanju: %i"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "U redu cekanja"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Prijenos"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Nijedno"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Ne"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Da"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Neuspjelo otvaranje %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Downloading..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 #, fuzzy
 msgid "HTTP download cancelled"
 msgstr "Istinska sirina pojasa downloada"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Neuspjesno spasavanje part.met.seeds fajla za %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Vec pokusavate downloadovati fajl %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Downloaded:"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Istinska sirina pojasa downloada"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Neuspio download serverliste od %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "Neuspio download serverliste od %s"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Neuspjesno citanje kreditnog fajla"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
@@ -2304,7 +3041,7 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
@@ -2312,64 +3049,73 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Trenutno"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Prosjek rada"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Prosjek misije"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr ""
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr ""
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Poruka"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Nastaviti?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
@@ -2377,12 +3123,11 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
@@ -2390,7 +3135,7 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
@@ -2398,1828 +3143,2280 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Naziv datoteke"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Veličina datoteke"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr ""
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Standard sistema"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanski"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arapski"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturleonski"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baskijski"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bugarski"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalonski"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Kineski"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Kinesko (tradicionalno)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Hrvatski"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Češki"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Danski"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Nizozemski"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Engleski (U.K.)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Engleski (U.K.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estonski"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finski"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francuski"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galješki"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Njemački"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grčki"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebrejski"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Mađarski"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Talijanski"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japanski"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Korejski"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Litavski"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norveški (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Poljski"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugalski"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugalski (Brazil)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Rumunjski"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Ruski"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slovenski"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Španjolski"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Švedski"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turski"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukrajinski"
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "Nepoznat: %i"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Hashing"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Zavrsavanje"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Zavrseno"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Pausirano"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Sa greskom"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Cekanje"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Parametri za spoljasnju vezu"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Handshake failed."
 msgstr "Parametri za spoljasnju vezu"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr ""
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "POGREŠKA: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "UPOZORENJE: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Staviti"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Ocisti"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Izaberite sve"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Bezkrajno"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Veza uspostavljena"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Veza uspostavljena"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Neuspjelo povezivanje"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "ServerIP: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "ServerIP: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Nije povezano"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Prekinuti vezu"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Uspostavi vezu"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Bezkrajno"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule izbor u koritu"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Brzina downloada"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Brzina uploada"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Nadimak: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "KlientID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Ime servera:"
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "ServerIP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Veza nije uspostavljena"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online potpis: Omogucen"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online potpis: Onemogucen"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Vrijeme korisnika: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Izvrsi"
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Primi u prijatelje"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr ""
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Ucitava..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Broj korisnika na serveru sa kojim si spojen..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Korisnika: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr ""
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Up: 0.0 | Down: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Ne povezan..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr ""
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Pretraga"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Naziv:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tip"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr ""
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr ""
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Bilo koja"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Arhiva"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CD_Imidz"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Slike"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programi"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Tekstovi"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Videa"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Ekstenzija"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Minimalna velicina"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Maksimalna velicina"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Dostupnost"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtar:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtar"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr ""
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Ugledaj fajlove"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Start"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Ekstenzija"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Stop"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Download"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Rezultati pretrage"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr ""
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Rezultati"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtar:"
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "Nadjeni izvori :"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Glavni"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Puno ime :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
-
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met-fajl :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Velicina fajla :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Status pocetog fajla :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Posljednji put vidjen kompletno :"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Puno ime"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met-fajl"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
+
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Velicina fajla"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Transfer"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Nadjeni izvori :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Status pocetog fajla"
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Izvori koji transferuju :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Broj pocetog fajla :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Dostupnost :"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Posljednji put vidjen kompletno"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Podatak rate :"
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Nadjeni izvori"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Izvori koji transferuju"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Broj pocetog fajla"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Dostupnost"
 
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Prenijeto :"
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Podatak rate"
 
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Zavrsna velicina :"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Download Active Time"
+msgstr "Brzina downloada"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Zavrsna velicina"
+
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Rukovanje inteligentne korupcije (I.C.H.)"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Izgubljeno zbog korupcije :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Izgubljeno zbog korupcije"
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Steceno kompresijom :"
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Steceno kompresijom"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Paketi spaseni kroz I.C.H."
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Zahtjevi"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Prihvaceni zahtjevi"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Podatak transfera"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Dijeljeni fajlovi"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr "Aktivni uploadovi"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Bez ocjene"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Paketi spaseni kroz I.C.H. :"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Naziv"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr ""
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Preuzimanje"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Ciscenje"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Primijeni"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Dobro!"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Kvalitet fajla"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Bez ocjene"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Neispravan / Koruptan / Falsifikat"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Los"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Vrlo dobar"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Dobar"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Odlican"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Obnovi"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Downoading, molim strpljenje ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Trazene informacije"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP adresa:"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Ime korisnika :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Hash korisnika :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Hash korisnika"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Brzina downloada"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Trenutno"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Prosjek rada"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Prosjek misije"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Brzina uploada"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktivni downloadovi"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktivne veze (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktivni uploadovi"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Drvo statistike"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Ime korisnika:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Client software"
+msgstr "Klienti"
 
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Client version"
+msgstr "Klienti"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP adresa:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "User ID"
+msgstr "Korisnika: 0"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "ServerIP"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Server name"
+msgstr "Ime servera"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
-
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Current request"
+msgstr "Trenutno"
 
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Average upload rate"
+msgstr "Prosjecno vrijeme uploada: %s"
 
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Average download rate"
+msgstr "Prosjecno vrijeme uploada: %s"
 
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Uploaded (session)"
+msgstr "Prosjek uploada misije"
 
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Downloaded (session)"
+msgstr "Prosjek downloada misije"
 
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Uploaded (total)"
+msgstr "Prijenos"
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Downloaded (total)"
+msgstr "Downloads (%i)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Rezultati"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Secure ident"
+msgstr "Sigurnost"
 
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "Pun red cekanja"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Queue score"
+msgstr "Pun red cekanja"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Nadimak"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Jezik: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Pocni minimiran"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Pitanje pri napustanju"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "sekundi"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Pretrazi :"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Video Plejer"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Alokacija slota"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Autospajanje pri startu"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Ponovni spoj kod gubitka veze"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Otstrani mrtve servere nakon"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "pokusaja"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Koristi sistem prioriteta"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Koristi pametnu LowID provjeru pri vezanju"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Sigurno povezivanje"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Autopovezivanje samo sa serverima iz staticne liste"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Postavi rucno dodate servere na visoki prioritet"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Omogućiti"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Dodaj nove fajlove u stanju pauze"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Dodaj nove fajlove sa auto prioritetom"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Pokusaj prvo downloadovati pocetni i zavrsni chunk "
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Uploadovi"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Dodaj nove dijeljene fajlove sa auto prioritetom"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Omogućiti"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Ukloni"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Odstrani prijatelja"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafovi"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Obnovi kasnjenje : 5 sekundi"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Vrijeme za prosjecni graf: 100 minuta"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Boje: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Pozadina"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Mreza"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Trenutni download"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Prosjek tekuceg downloada"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Prosjek downloada misije"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Trenutni upload"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Prosjek tekuceg uploada"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Prosjek uploada misije"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktivne veze"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "poluga brzine prikazana u sistemskom koritu"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Izaberi"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! UPOZORENJE !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Maksimalne veze u / 5 sekundi"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "Interval obnavljanja veze servera %i minuta"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Fajl Buffer velicina: 240000 bytes"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Duzina reda cekanja: 5000 klienta"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Interval obnavljanja veze servera: onemoguceno"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "Pokazi transfer rate u naslovu"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Pokazi transfer rate u naslovu"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Pljosnata"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Obla"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parametri za spoljasnju vezu"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Prihvati spoljasnje veze"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Lozinka"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Lozinka"
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Sifra za puna prava"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Sifra za puna prava"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Odobri korisnicima sa manje prava"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Sifra za manje prava"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Vrijeme obnove stranice (u sekundama)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Odobri Gzip kompresiju"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Standard sistema"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Naziv :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Komentar:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Prijemni direktorij :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Promijeni prioritet za nove fajlove :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Prijemni direktorij"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Promijeni prioritet za nove fajlove"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "Ne mijenjaj"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Izaberi boju za ovu kategoriju (trenutno izabrana) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Ponistenje"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Izaberi boju za ovu kategoriju (trenutno izabrana)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Dodaj servera rucno (prije ispuni polja lijevo) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule Log"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Lista servera"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
+msgstr "Privremene datoteke"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Svi"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Nitko"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Omoguci online potpis"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Podatak rate :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Izvori"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4227,11 +5424,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4241,242 +5438,239 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Download"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Autospajanje pri startu"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
+#: src/muuli_wdr.cpp
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Korisničko ime:"
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Lozinka:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Proxy type"
+msgstr "Proxy"
 
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Proxy host"
+msgstr "Proxy"
 
-#: src/muuli_wdr.cpp:2696
-msgid "Enable Proxy"
+#: src/muuli_wdr.cpp
+msgid "The proxy host name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2697
-msgid "Enable/disable proxy support"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Proxy port"
+msgstr "Proxy"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
+#: src/muuli_wdr.cpp
+msgid "The proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2714
-msgid "The proxy host name"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2719
-msgid "The proxy port"
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Korisničko ime"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Steceno kompresijom :"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&Otvori fajl"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Ceka ..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "Aktivni uploadovi :"
 
-#: src/muuli_wdr.cpp:2963
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Percent of total files"
-msgstr "Ukupni fajlovi"
+msgid "Show Clients for"
+msgstr "Pokazi liste"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "Dijeljeni fajlovi"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "Izaberi filter za gledanje"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "Aktivni uploadovi"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "Pokazi liste"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "Ponovno ucitati"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Posalji"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Otkaz"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Dijeljeni fajlovi"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Prekinuti vezu"
 
-#: src/OScopeCtrl.cpp:242
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Uspostavi vezu"
+
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Onemoguceno %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 #, fuzzy
 msgid "byte"
 msgid_plural "bytes"
@@ -4484,31 +5678,27 @@
 msgstr1 "Bytes"
 msgstr2 ""
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 #, fuzzy
 msgid "byte/sec"
 msgid_plural "bytes/sec"
@@ -4516,213 +5706,287 @@
 msgstr1 "kBytes/sec"
 msgstr2 ""
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sekundi"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "minuta"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "sati"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Dani"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "dani"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "svi"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "svi drugi"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Nedovrseno"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Stopirano"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arhiva"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Tekst"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Aktivan"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr ""
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr ""
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "GRESKA: neuspjesno stvaranje zapocetog fajla)"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Neuspjelo otvaranje %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 #, fuzzy
 msgid "IO failure while saving partfile: "
 msgstr "GRESKA kod spasavanja pocetog fajla: %s (%s => %s)"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "Neuspjesno spasavanje part.met.seeds fajla za %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
@@ -4730,17 +5994,17 @@
 msgstr1 "Spaseni %i seeds izvora za poceti fajl: %s (%s)"
 msgstr2 ""
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Spaseni %i seeds izvora za poceti fajl: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
@@ -4748,349 +6012,195 @@
 msgstr1 "Nadjen koruptan dio (%i) u %i pocetom fajlu %s - FileResultHash |%s| FileHash |%s|"
 msgstr2 ""
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Zavrseno rehashing %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Zavrseno rehashing %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Standard sistema"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanski"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arapski"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturleonski"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baskijski"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bugarski"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalonski"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Kineski"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Kinesko (tradicionalno)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Hrvatski"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Češki"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danski"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Nizozemski"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Engleski (U.K.)"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Engleski (U.K.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estonski"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finski"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francuski"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galješki"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Njemački"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grčki"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebrejski"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Mađarski"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Talijanski"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Talijanski (Švicarska)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japanski"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Korejski"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Litavski"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norveški (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Poljski"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugalski"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugalski (Brazil)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Rumunjski"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Ruski"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slovenski"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Španjolski"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Švedski"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turski"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr ""
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukrajinski"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Promijeniti jezik"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Nema dostupnih jezika"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Veza"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Direktoriji"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Serveri"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Fajlovi"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Sigurnost"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Daljinsko upravljanje"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Događaji"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Debugiranje"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5106,157 +6216,266 @@
 "aMule ce raditi dobro iako ne promijenis\n"
 "nista od ovih opcija."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Lozinka"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "Parametri za spoljasnju vezu"
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "Parametri za spoljasnju vezu"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "Parametri za spoljasnju vezu"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "Parametri za spoljasnju vezu"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Parametri za spoljasnju vezu"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
 "If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Automatski"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Vec pokusavate downloadovati fajl %s"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Nova vanjska veza prihvacena\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Privremene datoteke"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Pronadjeno %i poznatih dijeljenih fajlova"
+msgstr1 "Pronadjeno %i poznatih dijeljenih fajlova"
+msgstr2 ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Potrazi videoplejer"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Standard sistema"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5264,41 +6483,41 @@
 "Dodaj ovdje URLs da dobijes server.met fajlove. \n"
 "Samo jedna URL po liniji."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
@@ -5306,7 +6525,7 @@
 msgstr1 "Obnovi kasnjenje : 5 sekundi"
 msgstr2 ""
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
@@ -5314,12 +6533,12 @@
 msgstr1 "Vrijeme za prosjecni graf: 100 minuta"
 msgstr2 ""
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
@@ -5327,7 +6546,7 @@
 msgstr1 "Velicina fajl buffera %i bytes"
 msgstr2 ""
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
@@ -5335,7 +6554,7 @@
 msgstr1 "Duzina liste cekanja %i klienata"
 msgstr2 ""
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
@@ -5343,272 +6562,366 @@
 msgstr1 "Interval obnavljanja veze servera %i minuta"
 msgstr2 ""
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Interval obnavljanja veze servera: onemoguceno"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "disabled"
 msgstr "onemoguci"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Pronadjeno %i poznatih dijeljenih fajlova"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Dijeljeni fajlovi"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
 msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Pretrage"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Pretrage"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Main"
 msgstr ""
 
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
-msgid "Main"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
 msgstr ""
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
 msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "FileID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Bez ocjene"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "FileID"
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Upitao za drugi fajl"
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Zatvori sve oznake"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
-msgid "Copy eD2k link to clipboard"
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "Otkaz"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Novo"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Radi"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finski"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "Search progress not available"
+msgstr "%s Nije dostupan"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Neuspjesno spajanje sa svim serverima u list. Pocinje iznova."
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
 msgstr "Neuspjesno spajanje sa svim serverima u list. Pocinje iznova."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
+msgstr "Neuspjesno spajanje sa svim serverima u list. Pocinje iznova."
+
+#: src/ServerConnect.cpp
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Automatsko spajanje sa serverom ce ponovo poceti za %d sekundi"
+msgstr1 "Automatsko spajanje sa serverom ce ponovo poceti za %d sekundi"
+msgstr2 ""
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Spojen sa %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Uspostavljena veza sa: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Fatalna greska prilikom pokusaja spajanja. Veza interneta je moguce prekinuta"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Izgubljena veza sa %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) je mrtav"
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 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"
-msgstr0 "Automatsko spajanje sa serverom ce ponovo poceti za %d sekundi"
-msgstr1 "Automatsko spajanje sa serverom ce ponovo poceti za %d sekundi"
-msgstr2 ""
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Izgubljena veza"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr ""
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
@@ -5616,7 +6929,7 @@
 msgstr1 "%i servera pronadjeno u server.met"
 msgstr2 ""
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
@@ -5624,241 +6937,248 @@
 msgstr1 "%d servera dodato"
 msgstr2 ""
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 #, fuzzy
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Greska: fajl server.met je koruptan"
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "Neocekivana fajl greska prilikom pisanja %s : %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr ""
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr ""
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr ""
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr ""
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr ""
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Neuspjelo spasavanje server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Neocekivana fajl greska prilikom pisanja %s : %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Neispravna URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Neuspio download serverliste od %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "Ime servera"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adresa"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Opis"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Korisnici"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Korisnici"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Staticni"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Verzija"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Fajlovi"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Dijeljeni fajlovi"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "minuta"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Serveri (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Server"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Odstrani servera"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Remove servers"
 msgstr "Odstrani servera"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Odstrani sve servere"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 #, 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:550
+#: src/ServerListCtrl.cpp
 #, 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:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Novi klientID je %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, fuzzy, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
@@ -5866,169 +7186,200 @@
 msgstr1 "Primljeno %d novih servera"
 msgstr2 ""
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Server je odbio posljednju komandu"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "aMule Log"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Veza"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Veza uspostavljena"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Radi"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr ""
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "UDP Connection State:"
 msgstr "Vrh broja veza (procjena)"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr ""
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connecting to buddy"
 msgstr "Spajanje"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, fuzzy, c-format
 msgid "Connected to buddy at %s"
 msgstr "Spojen sa %s (%s:%i)"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP adresa:"
+
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed sources:"
 msgstr "Nadjeni izvori :"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr ""
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr ""
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr ""
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Ne radi"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
@@ -6036,449 +7387,588 @@
 msgstr1 "Pronadjeno %i poznatih dijeljenih fajlova"
 msgstr2 ""
 
-#: src/SharedFileList.cpp:410
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Pronadjeno %i poznatih dijeljenih fajlova, %i nepoznatih"
-msgstr1 "Pronadjeno %i poznatih dijeljenih fajlova, %i nepoznatih"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 msgstr2 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
+msgid "Shared directory not readable, skipping: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "Ime korisnika"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "Brzina downloada"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "Brzina uploada"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Greska prilikom spajanja sa %s (%s:%i): %d"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Pronadjeno %i poznatih dijeljenih fajlova"
+msgstr1 "Pronadjeno %i poznatih dijeljenih fajlova"
+msgstr2 ""
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "Dostupnost :"
+msgid "User Name"
+msgstr "Ime korisnika"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "Uploadovi"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Download Status"
 msgstr "Downloads"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "Ime fajla"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "Dijeljeni fajlovi"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Zahtjevi"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Prihvaceni zahtjevi"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Podatak transfera"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr ""
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Dobiveni dijelovi"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr ""
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Dostupnost"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Dijeljeni fajlovi"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Preimenovanje"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Kopiraj ed2k &linkove u klipbord (&Source)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Za ispravan izvorni link, potrebna je HIGH ID"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Korisnik %s (%u) dijeli direktorije %s"
+msgstr1 "Korisnik %s (%u) dijeli direktorije %s"
+msgstr2 "Korisnik %s (%u) dijeli direktorije %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Ukupna velicina dijeljenih fajlova: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Ukupna velicina dijeljenih fajlova: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Dijeljeni fajlovi (%i)"
+msgstr1 "Dijeljeni fajlovi (%i)"
+msgstr2 "Dijeljeni fajlovi (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Dijeljeni fajlovi (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr ""
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Pronadjeno %i poznatih dijeljenih fajlova"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Status"
+
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "Ime fajla"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Prosjecno vrijeme uploada: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr ""
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Ponovno vezan: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Vriejme od prvog transfera: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Spojen sa serverom vec: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Klienti"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "Nepoznat: %i"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "Filtrirani: %i"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Banned: %s"
 msgstr "Zabranjen"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr ""
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Zauzetost servera: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Ukupna velicina dijeljenih fajlova: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr ""
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktivne veze (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Nije dostupno"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Nikad"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr ""
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr ""
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr ""
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr ""
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6486,7 +7976,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6494,142 +7984,140 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Downloads (%i)"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr ""
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Iskljuceno"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Uključen"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr ""
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr ""
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "Dobro!"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Download:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Upload:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Total sources:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/TextClient.cpp
+msgid "PartFile"
 msgstr ""
 
-#: src/TextClient.cpp:965
+#: src/TextClient.cpp
 #, c-format
-msgid "Search progress: %u %% \n"
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/TextClient.cpp:967
-#, fuzzy
-msgid "Search progress not available"
-msgstr "%s Nije dostupan"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr ""
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr ""
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6638,46 +8126,46 @@
 "Example: 'statistics 5' will show only the top 5 versions for each client type.\n"
 msgstr ""
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr ""
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr ""
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6685,35 +8173,35 @@
 "or a resolvable DNS name."
 msgstr ""
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr ""
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6724,109 +8212,121 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr ""
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6845,377 +8345,404 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr ""
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr ""
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr ""
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr ""
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
+msgstr "Pokazi polugu napretka"
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "Pokazi polugu napretka"
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "Pokazi polugu napretka"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr ""
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr ""
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr ""
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr ""
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr ""
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr ""
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr ""
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr ""
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr ""
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr ""
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr ""
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr ""
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr ""
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr ""
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Dijeljeni fajlovi"
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr ""
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
 "Use '%s' instead.\n"
 msgstr ""
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr ""
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Hashing"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Hashing"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Potrebna potvrda"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "Previse konekcija"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr ""
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Izaberi filter za gledanje"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Dodaj kategoriju"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Editiraj kategoriju"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Odstrani kategoriju"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr ""
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr ""
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr ""
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr ""
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr ""
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr ""
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr ""
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr ""
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Ukloni"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Spremi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Otvori"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Spremi kao"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7227,173 +8754,170 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 #, fuzzy
 msgid "Cancelled !"
 msgstr "Otkaz"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
+msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
+msgid "%.2f MiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
+msgid "%.2f GiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
+msgid "%.2f TiB"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Ponistenje"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sustav"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7404,397 +8928,474 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr ""
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Neuspjelo povezivanje"
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Datoteka nije pronađena."
+#~ msgid "Ratio"
+#~ msgstr "Ocjena"
+
+#~ msgid "Change Language"
+#~ msgstr "Promijeniti jezik"
+
+#~ msgid "No languages available"
+#~ msgstr "Nema dostupnih jezika"
+
+#~ msgid "User name"
+#~ msgstr "Korisničko ime"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Dobiveni dijelovi"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "Dostupnost :"
+
+#, fuzzy, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Pronadjeno %i poznatih dijeljenih fajlova, %i nepoznatih"
+#~ msgstr1 "Pronadjeno %i poznatih dijeljenih fajlova, %i nepoznatih"
+#~ msgstr2 ""
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#, fuzzy
+#~ msgid "Percent of total files"
+#~ msgstr "Ukupni fajlovi"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#, fuzzy
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Zaustavlja trenutne pokusaje uspostavljanja veze"
+
+#, fuzzy
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Prekinuti vezu sa sadasnjim serverom"
+
+#, fuzzy
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Pokazi polugu napretka"
+
+#~ msgid "Commit"
+#~ msgstr "Izvrsi"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Web stranica: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Web stranica: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"

amule-3.0.1.tar.gz/po/hu.po -> amule-3.1.0.tar.gz/po/hu.po Changed

@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:22+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:46+0000\n"
 "Last-Translator: Dévai Tamás <gonosztopi@amule.org>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "Language: hu\n"
@@ -19,25 +19,113 @@
 "X-Generator: Poedit 2.0.6\n"
 "X-Poedit-Basepath: .\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "aMule megjelenítése"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMule távoli vezérlő "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Pillanatkép:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"'Minden-platform' p2p ügyfél az eMule alapján \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Szerzői jog (c) 2003-2026 aMule csapat \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Az aMule részben a következőn alapul: \n"
+
+#: src/AboutDialog.cpp
+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/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Honlap:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Fórum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Dokumentáció:"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Gondok:"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Indításkor új verzió keresése"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Kapcsolódás a Kad-hoz..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Az aMule egy elavult verzióját használod!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Nem elérhető"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Barát hozzáadása"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Érvényes IP címet és portot kell megadnod!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Információ"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "A megadott felhasználói azonosító (userhash) érvénytelen!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
+#, fuzzy
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
@@ -45,46 +133,46 @@
 "\n"
 "Installálásra kerüljön az asztal integráció?"
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr "aMule hozzáadása az alkalmazások menüjéhez?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr "Telepítés"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr "Most nem"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr "Ne kérdezze újra"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr "Asztal integráció nem telepíthető: az APPDIR környezeti változónak nincs értéke. Ez általában azt jelenti, hogy az AppImage egy szokatlan módon került indításra."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr "aMule integráció sikertelen"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr "Az asztal integráció telepítése sikertelen: %s létrehozása nem sikerült. Elleőrizze hogy a home könyvtár írható."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr "Az asztal integráció telepítése sikertelen: %s írása nem sikerült. Elleőrizze hogy a home könyvtár írható."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, fuzzy, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr "AppImage integráció: aMule hozzá lett adva az alkalmazások menüjéhez."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -98,81 +186,159 @@
 "\n"
 "aMule újraindítása most?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr "aMule telepítve"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr "Újraindítás most"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr "Később"
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "HIBA"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "ED2KLinks fájl megnyitása sikertelen."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "aMule telepítve"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Index fájl nem található: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Megosztott fájlok lehozatala sikertelen a(z) '%s' felhasználótól"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "Nincsen megosztott fájl ebben a könyvtárban: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "A magnet hivatkozás nem konvertálható eD2k-ra: %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Érvénytelen eD2k hivatkozás! HIBA: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Kilépés a fő alkalmazásból..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Az amuleweb instancia - melynek a pid-je '%d' - bezárása ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Az amuleweb instancia - melynek a pid-je '%d' - kivégzése ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Az amuleweb instancia - melynek a pid-je '%d' - bezárása ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Az amuleweb instancia - melynek a pid-je '%d' - kivégzése ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Mag leállítása."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "Az aMule leállítása befejeződött."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Memória debug eredmények az aMule bezárásáról:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Nyelvi beállításaid egy konfigurációs változás miatt az alapértelmezettre lettek átállítva. Bocs."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Infó"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -180,24 +346,48 @@
 "\n"
 "EC beállítások"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Jelszó beállítva, külső kapcsolatok engedélyezve."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "FIGYELEM"
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr "eD2k szerver lista (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr "Kad bootstrap csomópontok (nodes.dat)"
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading temp files"
+msgstr "Temp fájlok betöltése %s-ról."
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Temp fájlok betöltése %s-ról."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Megosztott fájlok frissítése"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Megosztott fájlok frissítése"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Indít"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Hálózati bootstrap"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
@@ -205,30 +395,59 @@
 "aMule hiányzó hálózati bootstrap fájlokat észlelt.\n"
 "Válassza ki a letölteni kivántakat:"
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
-msgstr "Hálózati bootstrap"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "eD2k szerver lista (server.met)"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Kad bootstrap csomópontok (nodes.dat)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web kiszolgáló fut, pid=%d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "A web szerver futtatását kérte induláskor, de az amuleweb program nem futtatható. Kérem telepítse az aMule web szervert tartalmazó csomagot, vagy építse az aMule-t a forráskódból a -DBUILD_WEBSERVER=YES paraméterrel és installálja azt."
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "HIBA"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "web kiszolgáló fut, pid=%d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "A web szerver futtatását kérte induláskor, de az amuleweb program nem futtatható. Kérem telepítse az aMule web szervert tartalmazó csomagot, vagy építse az aMule-t a forráskódból a -DBUILD_WEBSERVER=YES paraméterrel és installálja azt."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nem tudom a portokat a megadott címhez (%s) rendelni."
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "A %u port nem elérhető. Alacsony kliens azonosítót kapsz (LOWID)\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -243,48 +462,48 @@
 "\n"
 "Ellenőrízd a hálózatodat, hogy megbizonyosodj, hogy a port nyitva van kifelé és befelé egyaránt."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Online-Aláírás fájl létrehozása sikertelen"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Az aMule OnlineAláírás fájl létrehozása sikertelen"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Ez az első alkalom, hogy az aMule %s-t futtatod"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Ez egy teszt verzió, naponta frissítve, és\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "a https://amule-org.github.io, vagy az #aMule IRC csatornánkon az irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Nyugodtan jelezz bármilyen hibát a https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -292,513 +511,503 @@
 "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/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Szerver hostname értesítve"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, 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/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "HIBA: Nem tudom megnyitni a napló fájlt"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "FIGYELEM: a napló üres. Valami nem stimmel."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Napló törölve"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "KiszolgálóÜzenet: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, 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/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Csomópont-lista letöltése sikertelen."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Nem sikerült megnyitni a letöltött verzió-ellenőrző fájlt"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Sérült verzió-ellenőrző fájl"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Az aMule egy elavult verzióját használod!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "A legújabb verzió mindig megtalálható a https://github.com/amule-org/amule/releases/latest honlapon."
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Az aMule verziód naprakész."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Verzió-ellenőrzés fájl letöltése sikertelen."
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Felhasználók: %s | Fájlok: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Nincs hálózat kiválasztva"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "LowID-val"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "HighID-val"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Kapcsolódva ehhez %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kapcsolódás %s-hez"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Leválasztva az eD2k-ról"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad elindítva."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad leállítva."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Kapcsolódva a Kad-hoz (rendben)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Kapcsolódva a Kad-hoz (tűzfal mögül)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Leválasztva a Kad-ról"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 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/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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ítani. Indítsa az amuled-t a --ec-config paraméterrel, a jelszó beállításához. További információk https://amule-org.github.io/docs alatt találhatóak."
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - időzítő indítása"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: háttérbe való hasadás - viszlát"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Pid fájl létrehozása nem lehetséges"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "HIBA: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Ez az aMule %s, az eMule alapján."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "%s-en fut"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Új verzióért látogasd meg a https://github.com/amule-org/amule/releases/latest oldalt."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "VÉGZETES HIBA: Időzítő létrehozása sikertelen"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMule távoli vezérlő "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Pillanatkép:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Hálózatok"
 
-#: src/amuleDlg.cpp:545
-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
+msgid "Searches"
+msgstr "Keresések"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Honlap: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Letöltések"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Fórum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Megosztott fájlok"
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Dokumentáció: https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Kliensek"
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
-"Gondok: https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Üzenetek"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Szerzői jog (c) 2003-2026 aMule csapat \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statisztikák"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Az aMule részben a következőn alapul: \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Beállítások"
 
-#: src/amuleDlg.cpp:552
-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
+msgid "Navigate"
+msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "KiszolgálóÜzenet: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Üzenet"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Nem elérhető"
+
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "A legújabb verzió mindig megtalálható a https://github.com/amule-org/amule/releases/latest honlapon."
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "aMule dialógus elpusztítva"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2K: Kapcsolódás"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Szétkapcsolva"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Tűzfal mögött"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Csatlakozva"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Kapcsolódás"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Nincs kapcsolat"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Mégsem"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Aktuális kapcsolódási kísérletek leállítása"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Verzió"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Szétkapcsolás"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Leválaszt az éppen kapcsolódott hálózatokról."
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Kapcsolatfelvétel"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "IP-cím"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Kapcsolódás a pillanatnyilag engedélyezett hálózatokhoz."
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Leírás"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "aMule Napló"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Fel: %.1f%s (%.1f) | Le: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Fel: %.1f%s | Le: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Kapcsolódva)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Nincs kapcsolat)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, 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/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Kilépés megerősítése"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Parancs futtatása: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- alapértelmezett -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "A(z) '%s' felület könyvtár nem létezik"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, 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:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Hálózatok"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Hálózatok ablaka"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Keresések"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Keresés ablaka"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Letöltések"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Letöltések ablaka"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Megosztott fájlok"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Megosztott fájlok ablaka"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Üzenetek"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Hálózatok ablaka"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Üzenetek ablaka"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statisztikák"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Statisztikai grafikonok ablaka"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Beállítások"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Tulajdonságok beállításának ablaka"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importálás"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "A részfájl importáló eszköz"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Névjegy"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Névjegy/Súgó"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "eD2k hálózat"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kad hálózat"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Nincs hálózat"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "aMule távoli vezérlő"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Végzetes hiba: a Mag Időzítőjének létrehozása sikertelen"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Kapcsolódás a távoli aMule-hez"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Kapcsolat megszakadt"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Figyelmeztetés kilépéskor"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 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:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Esemény ciklus megkezdése..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Kapcsolódás..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr "Kapcsolat sikertelen. Kerém ellenőrizze a host, port és jelszó értékeket."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Távoli GUI EC esemény kezelő"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, 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/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Kikapcsolás folyamatban"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Kapcsolat megszünt - aMule valószínüleg befejeződött."
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Kapcsolódási kísérlet %s-hez (%s:%i): időtúllépés."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
@@ -807,1053 +1016,1365 @@
 "Kapcsolat időtúllépés. Képtelen a %s:%d elérése a megadott időn bellül.\n"
 "Kérem ellenőrízze a host, port értékeket, és hogy a külső kapcsolatok aktiválva vannak az aMule-ban."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Letiltva"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Kapcsolódás a hálózathoz."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Kapcsolat sikertelen. Kapcsolat felvétel %s:%d-el nem lehetséges\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Készen"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Mind"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Nem elérhető"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Fájl nem található."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Érvénytelen hivatkozás, vagy már rajta van a listán."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "A letöltött fájlok eltolása %s helyre sikertelen"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 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/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/BaseClient.cpp:1363
-#, 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/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Pajtás keresése lowid kapcsolatra"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Hamis eMule %#x verzió)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Hamis eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Hamis eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x  (az eMule v0.%u alapján)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Becenév: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Kért: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Fájlstatisztika ehhez a folyamathoz: %d kérés elfogadva %d-ből, %s átmásolva\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Fájlstatisztika az összes folyamathoz: %d kérés elfogadva %d-ből, %s átmásolva\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Ismeretlen lekérdezett fájl"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Üzenet kiszűrve '%s'-től (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Új üzenet '%s'-től (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "A(z) %s (%u) felhasználó lekérdezte a nem létező '%s' könyvtárban megosztott fájljaid listájá -> Mellőzve"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, 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/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "FIGYELEM: %s nem nyitható meg."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "FIGYELEM: A megszakított fájlok listája sérült, érvénytelen fejlécet tartalmaz."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "IO hiba a %s fájl olvasása közben: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Hiba a %s fájl mentése közben: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Captcha megadása"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategória"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Új kategória"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Könyvtár kiválasztása az érkező fájloknak"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Meg kell adnod a kategória nevét!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Meg kell adnod a kategória elérési útvonalát!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Csevegési folyamat elindítva: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Connected to Client ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Kapcsolódás a klienshez ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Kapcsolódás sikertelen / Kapcsolat elveszítve ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 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/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Csevegés"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Fül bezárása"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Az összes fül bezárása"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "A többi fül bezárása"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Hozzáadás a barátokhoz"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "&Részletek megjelenítése"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Eltávolítás a barátok közül"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Társ Slot létesítése"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Fájlok megtekintése"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Üzenet küldése"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Üzenet küldése ennek a személynek"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Küldendő üzenet:"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Nem szabad egynél több baráti csatlakozást létesíteni.\n"
+" Csak egy csatlakozás lett hozzárendelve."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Többszörös kiválasztás"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Eltávolítás a barátok közül"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "A megosztott fájlok listájának újratöltése."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Kredit fájl betöltve, %u kliens ismert"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - %u kliens kreditérvényessége lejárt!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "A 'cryptkey.dat' fájlt nem találom, létrehozok egyet."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Kliens részletei"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Támogatott"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Nem támogatott"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Letiltva"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Csatlakozva"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Szétkapcsolva"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Név"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP-cím"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Eredet"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Utoljára fogadott"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Verzió"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Feltöltési sebesség"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Letöltési sebesség"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Feltöltve"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Összes letöltés: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Le/Fel módosító"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Online aláírás"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Befejezetlen"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Rossz fiú"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Hitelesítés - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Nem elérhető"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Fájlok"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Feltöltve"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Letöltve"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Letöltés alatt"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Feltöltés alatt"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Aktív"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Ismeretlen"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 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/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 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/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 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/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "A(z) %s (%u) felhasználó lekérdezte a '%s' könyvtárban megosztott fájljaid listáját -> elfogadva"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "A(z) %s (%u) felhasználó lekérdezte a '%s' könyvtárban megosztott fájljaid listáját -> megtagadva"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "A(z) %s (%u) felhasználó megosztja a '%s' könyvtárat"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 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"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Fájl megjegyzés"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Felhasználói név"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Fájlnév"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Értékelés"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "Pajtás keresése lowid kapcsolatra"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Nincs megjegyzés"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u megjegyzés"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 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:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "'%s' ország adatainak betöltése sikertelen."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Al"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Ma"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Nagyon alacsony"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Alacsony"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normál"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Magas"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Nagyon magas"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Forgalomba helyez"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Engedély kérése"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Kapcsolódás a kiszolgálón keresztül"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Várólista betelt"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Várólistások"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Letöltés alatt"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "HashSet fogadása"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Nincs hiányzó fájlrész"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Nem lehet alacsony ID-vel alacsony ID-hez kapcsolódni"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Túl sok a kapcsolat"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Kapcsolódás a Kad-on keresztül"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Túl sok Kad kapcsolat"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Kitiltott"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Kapcsolódási hiba"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Távoli várólista betelt"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Régi MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Új MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule kompatibilis"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Helyi kiszolgáló"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Távoli kiszolgáló"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Forrás-csere"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passzív"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Hivatkozás"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Mentett források"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Keresés eredménye"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Befejezett"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Folyamatban"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "HIBA: Elfogyott a szabad lemezterület"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "HIBA: Partmet nem található"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "HIBA: IO hiba!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "HIBA: Sikertelen!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Várólistán"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Letöltés alatt"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Ismeretlen vagy rossz ideiglenes-fájl formátum."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Rész"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Méret"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Átmásolva"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Sebesség"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Folyamatjelző"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Források"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioritás"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Állapot"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Hátralévő idő"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Utoljára teljesnek látott"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Utoljára fogadott"
 
-#: 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/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/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Visszajelzés %s-től (%s):\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automatikus"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Állj"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Szüneteltet"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Folytatás"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Befejezettek &eltávolítása"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Összes A4AF cseréje ehhez a fájhoz most"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Összes A4AF cseréje ehhez a fájhoz most (Automatikusan)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Összes A4AF cseréje a többi fájhoz most"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Kibővített beállítások"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Előnézet"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Fájl &részleteinek megjelenítése"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Összes megjegyzés megjelenítése"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Magnet URI másolása a vágólapra"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "eD2k hivatkozás másolása a vágólapra"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Visszajelzés másolása a vágólapra"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "%s lekérése ehez a fájlhoz"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "hozzárendelés megszüntetése"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Hozzárendelés kategórához"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "Fájl &megnyitása"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Biztos, hogy törlöd a kiválasztott fájlt?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Biztos, hogy törlöd a kiválasztott fájlokat?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Visszajelzés %s-től (%s):\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Írd be az új nevet ennek a fájlnak:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Fájl átnevezés"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y.%m.%d %H:%M:%S"
+msgid "%.1f MiB/s"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Letöltések (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-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 %s)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Fájl előnézet"
-
-#: src/DownloadListCtrl.cpp:1500
-#, 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'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Összes letöltés: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "PartFile mentése %u a(z) %u-ból"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Az összes PartFile kimentve."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Temp fájlok betöltése %s-ról."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "PartFile betöltése %u a(z) %u-ből"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "HIBA: A biztonsági mentés betöltése sikertelen. Keressen a https://github.com/amule-org/amule/discussions oldalon .part.met visszaállítási lehetőségeket."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Az összes PartFile betöltve."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Nem található .part fájl"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "%u .part fájlt találtam"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 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:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 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/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Letöltés %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, 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:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Már megvan ez a fájl: '%s'"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Már megvan ez a fájl: '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, 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."
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "A magnet hivatkozás nem konvertálható eD2k-ra: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "A következő hivatkozás protokollja ismeretlen: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Érvénytelen eD2k hivatkozás! HIBA: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Kliens csomagot küldött sikertelen hitelesítést követően."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Külső kapcsolat lezárva."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "A külső kapcsolatok letiltásra kerültek üres jelszó miatt!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "A külső kapcsolatok le vannak tiltva konfig fájlban"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Új külső kapcsolat elfogadva"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "HIBA: nem tudtam fogadni egy új külső kapcsolatot"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 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:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Kapcsolódó kliens: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Ismeretlen verzió"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "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:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "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:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Érvénytelen protokoll verzió."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Hiányzó protokoll verzió azonosító."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Automatikus kapcsolódás a kiszolgálóhoz %d másodperc múlva"
+
+#: src/ExternalConn.cpp
 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:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Hitelesítés sikertelen: rossz jelszó."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Hitelesítés sikertelen: hiányzó jelszó."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Érvénytelen kérés, először hitelesíteni kell."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Hozzáférés elfogadva."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Hibaüzenet elküldve a \"%s\" klienshez."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, 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:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "FileHash nem található: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "Hoppá! Opkód feldolgozási hiba!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Kiszolgáló nem lett hozzáadva"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "kiszolgáló nem található: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 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:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "Az eD2k le van tiltva a beállításokban."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr "Barát nem található."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr "Kliens nem található."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr "EC_TAG_FRIEND_SHARED igényel EC_TAG_FRIEND vagy EC_TAG_CLIENT értéket."
 
-#: src/ExternalConn.cpp:1530
-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:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Webes keresésnek a távoli felületről nincs értelme."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+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
 msgid "No points for graph."
 msgstr "Nincsenek pontok a grafikonhoz."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 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:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Külső kapcsolat: leállítás kérve"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Kikapcsolás folyamatban."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: hivatkozás hozzáadása: '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "%d link %d linkből sikertelen (érvénytelen vagy már a listán van)."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Fájl nem található."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Érvénytelen fájl név."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Nem tudom átnevezni a fájlt."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Csevegési folyamat bezárása."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Új beszélgetés kezdődött"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Csevegési folyamat bezárása."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "A Kad le van tiltva a beállításokban."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Ismeretlen név)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "A Kad le van tiltva a beállításokban."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Már csatlakozva az eD2k-hoz."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Kapcsolódás az eD2k-hoz..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Már kapcsolódva a Kad-hoz."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Kapcsolódás a Kad-hoz..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Minden hálózat le van tiltva."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Leválasztva az eD2k-ról."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Leválasztva a Kad-ról."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Külső kapcsolat: érvénytelen opcode: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Érvénytelen opcode (rossz protokoll verzió?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Ismeretlen bővítmény '%s' a '%s' parancshoz.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Ismeretlen parancs: '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1861,7 +2382,7 @@
 "\n"
 "Ennek a parancsnak nem lehet argumentuma.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1869,7 +2390,7 @@
 "\n"
 "Ennek a parancsnak kötelező az argumentum.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1877,7 +2398,7 @@
 "\n"
 "Ez a parancs nem teljes, az alábbi bővítmények valamelyikét kell használnod.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1885,11 +2406,11 @@
 "\n"
 "Elérhető bővítések:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Elérhető parancsok:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1900,17 +2421,17 @@
 "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/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Kilép az alkalmazásból."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Súgó megjelenítése."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1918,7 +2439,7 @@
 "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/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1929,46 +2450,46 @@
 "A parancslistához használd a '%s'-et\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Szintaktikai hiba!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "Hiba a parancs feldolgozásában - soha sem kellene előfordulnia! Kérlek, küldd el a hibajelentést\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Ennek a parancsnak nem kellene paraméterének lennie."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Ennek a parancsnak kötelező paramétert adni."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Érvénytelen paraméter."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Ez a parancs így nem teljes."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "A '%s' paranccsal kaphatsz bővebb segítséget.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Ez a(z) %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Ez a(z) %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1976,7 +2497,7 @@
 "\n"
 "Kliens létrehozása...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1985,7 +2506,7 @@
 "\n"
 "Ok, kilépés a %s-ből...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1999,118 +2520,361 @@
 "\n"
 "Kilépés...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "E súgó megjelenítése."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Host, ahol az aMule fut (alap: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Az aMule Távoli Elérés portja (alap: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Külső kapcsolat jelszava."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Konfiguráció betöltése fájlból."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Nem ír ki semmit a szabvány kimenetre."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Legyen bőbeszédű - mutassa a hibakeresési üzeneteket is."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Beállítja a program nyelvét."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "A parancssori opciók konfig fájlba írása."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "A program verziójának kiírása."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr "ZLIB tömörítés kikényszerítése a tárcsázott IP-cím helyétől függetlenül (hasznos, ha a szerver egy VPN-alagúton keresztül érhető el, amely LAN IP-címre kerül feloldásra)."
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Fájl részletei"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% kész"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Fájl előnézet"
+
+#: src/FileLaunch.cpp
+#, 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'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "HIBA: A(z) '%s' részfájl megnyitása sikertelen."
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Üdvözöljük!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Kapcsolódás a pajtáshoz"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Kapcsolat állapota:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Hálózatok"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Szabvány TCP port "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Bővített UDP port (Kad / globális keresés) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "UPnP engedélyezése a router port továbbításhoz"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Rendszerbetöltés"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Már próbálod letölteni a(z) '%s' fájlt."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Kiszolgáló lista automatikus frissítése indításkor"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "aMule automatikus indítása bejelentkezéskor"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Célkönyvtár a letöltéseknek"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Tallóz"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Minden fájl ebben a könyvtárban másokkal megosztásra kerül)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Könyvtár az ideiglenes letöltési fájloknak"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "A barátokat tartalmazó emfriends.dat fájl olvasásra megnyitása sikertelen!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 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/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "KRITIKUS - nincsen kliens a StartChatSession-en"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Barátok"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "&Részletek megjelenítése"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Barát hozzáadása"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Barát törlése"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "&Üzenet küldése"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Fájlok megtekintése"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Társ Slot létesítése"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 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/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 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/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2118,980 +2882,1290 @@
 "Nem lehet egynél több barát slot-ot létrehozni.\n"
 "Csak egy slot lett hozzárendelve."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Többszörös kiválasztás"
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Nem szabad egynél több baráti csatlakozást létesíteni.\n"
-" Csak egy csatlakozás lett hozzárendelve."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Üzenet küldése ennek a személynek"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Küldendő üzenet:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Eltávolítás a barátok közül"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Üzenet küldése"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Csere ehhez a fájlhoz"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "Várólistán: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Másik fájl kérve"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Várakozás feltöltési slot-ra"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "Várólistán: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Feltöltés alatt"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Egyik sem"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Nem"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Igen"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "A(z) %s (%s) megnyitása sikertelen"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Letöltés..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "HTTP letöltés megszakítva"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "A letöltendő URL nem lehet üres"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "A %s iránti HTTP kérés létrehozása sikertelen"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr "HTTP letöltés: a %s válasz tartalma üres"
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "A letöltött fájlok eltolása %s helyre sikertelen"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Letöltve %s (%llu bájt)"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr "Válasz a %s URL-tól: %i"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "HTTP letöltés megszakítva"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
-msgstr ""
+msgstr "Létező GeoLite2-Country.mmdb migrálva %s helyre"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr ""
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "IP2Country: MaxMind van kiválasztva GeoIP forrásként, de nincs megadva licenckulcs. Nyissa meg a Beállítások -> IP2Country pontot, illessze be az ingyenes MaxMind licenckulcsát, és kattintson a „Frissítés most” gombra."
+
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "IP2Country: Egyéni URL van kiválasztva GeoIP forrásnak, de nincs URL konfigurálva. Nyissa meg a Beállítások -> IP2Country pontot, és adjon meg egy URL-t, amely egy .mmdb (vagy egy olyat tartalmazó .gz / .tar.gz) fájlra mutat."
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
-msgstr ""
+msgstr "IP2Country: nem sikerült a GeoIP letöltési URL-t feoldani."
 
-#: src/IP2Country.cpp:157
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download new %s from %s"
-msgstr "Új GeoIP.dat letöltés %s-ról"
+msgstr "Új %s letöltése %s cím alól"
 
-#: src/IP2Country.cpp:191
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download of %s file failed, aborting update."
-msgstr "GeoIP.dat fájl letöltése sikertelen, frissítés félbeszakítása."
+msgstr "%s letöltése sikertelen, frissítés megszakítása."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "%s fájl törlése sikertelen, frissítés megszakítása."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "%s fájl átnevezése sikertelen, frissítés megszakítása."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "%s frissítése sikerrel járt."
 
-#: src/IP2Country.cpp:228
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Error updating %s"
-msgstr "Hiba a GeoIP.dat frissítése közben."
+msgstr "Hiba %s frissítésekor"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
-msgstr ""
+msgstr "DB-IP letöltése a jelen hónapnak sikertelen - újrapróbálkozás az elmúlt hónap URL-jával."
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "%s letöltése %s-től sikertelen"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "'%s' ország adatainak betöltése sikertelen."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 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/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "%u IP-tartomány '%s'-ból betöltve."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u hibás sor lett eldobva."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Új %s fájl átnevezése sikertelen, frissítés megszakítása."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP szűrő készen áll"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Indítás ismert \n"
-"kliensektől"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Aktuális"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Futásátlag"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Munkafolyamatok átlaga"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Csomópontok (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Érvénytelen IP a rendszerindításhoz"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Érvénytelen port a rendszerindításhoz"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Kérlek töltsd ki az összes kötelező mezőt"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Üzenet"
+
+#: src/KadDlg.cpp
 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:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Ezzel eltávolítod az aktuális csomópontokat és újraindul a Kademlia kapcsolat."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Folytassuk?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: a keresési kulcsszó túl rövid"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: A keresési kulcsszó már a keresési listán: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "A nodes.dat fájl olvasása sikertelen volt - túl régi. Ez a verzió (0) már nincs támogatva."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "%u Kad kapcsolat beolvasva"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Nincsenek kontaktusok, indítsd el a betöltési folyamatot, vagy tölts le magad egy nodes.dat fájlt."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Csak %d Kad kapcsolat elérhető, a nodes.dat fájl nem lett felülírva"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "%d Kad kapcsolat kiírva"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Kad hálózat"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Fájl név"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Fájl méret"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Megosztási arány"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Feltöltve"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Kért"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Elfogadott"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Teljes források"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "FIGYELEM: Az ismert fájlok listája sérült, érvénytelen fejlécet tartalmaz."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Bejegyzés betöltése az ismert fájlok listájából sikertelen, hiba lehet a fájlban"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Érvénytelen bejegyzés az ismert fájlok listájában, hiba lehet a fájlban: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Alapértelmezett"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albán"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arab"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asztúriai"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baszk"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bolgár"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalán"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Kínai (egyszerűsített)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Kínai (hagyományos)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Horvát"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Cseh"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Dán"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Holland"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Angol (Egyesült Királyság)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Angol (Egyesült Királyság)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Észt"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finn"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francia"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Gall"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Német"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Görög"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Héber"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Magyar"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Olasz"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japán"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Koreai"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Litván"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvég (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Lengyel"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugál"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugál (Brazíliai)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Román"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Orosz"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Szlovén"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Spanyol"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Svéd"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Török"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukrán"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Ismeretlen hiba %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "A %d hiba leírásának lekérése sikertelen"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Tördelőalgoritmizálás"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Befejezés"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Kész"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Szüneteltetve"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Hibás"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Várakozik"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Egy nem üres jelszót kell megadni."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Érvénytelen jelszó, nem egy MD5 hash!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Kapcsolódási hiba"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
-msgstr "Külső kapcsolat lezárva."
+msgid "External Connection lost - exiting."
+msgstr "Külső kapcsolat elveszítve - kilépés."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "EC kapcsolat sikertelen. Üres válasz."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Külső kapcsolat: Rossz válasz, kézfogás sikertelen. Kapcsolat megszüntetve."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Külső kapcsolat: Rossz válasz, kézfogás sikertelen. Kapcsolat megszüntetve."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Sikerült! Kapcsolat létrejött ezzel: aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Sikerült! Kapcsolat létrejött."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Külső kapcsolat: Hozzáférés megtagadva, mert: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Külső kapcsolat: Kézfogás sikertelen."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Asio szál %d elindítva"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: rendben."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "HIBA: A TCP porton nem lehet hallgatni."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "HIBA: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "FIGYELEM: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Bezár"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Másolás"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Törlés"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Mindent kijelöl"
 
-#: src/MuleTrayIcon.cpp:367
-#, fuzzy
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Korlátlan"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "aMule megjelenítése"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "aMule elrejtése"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
-msgstr "eD2k"
+msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
-msgstr "Csatlakozva"
+msgstr "Csatlakozva (LowID)"
 
-#: src/MuleTrayIcon.cpp:371
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
-msgstr "Csatlakozva"
+msgstr "Csatlakozva (HighID)"
 
-#: src/MuleTrayIcon.cpp:380
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
-msgstr " Kad: "
+msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
-msgstr "Kapcsolódva a Kad-hoz (tűzfal mögül)"
+msgstr "Kapcsolódva (tűzfal mögül)"
 
-#: src/MuleTrayIcon.cpp:393
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
-msgstr "Kiszolgáló IP: "
+msgstr "Szerver: "
 
-#: src/MuleTrayIcon.cpp:394
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
-msgstr "Kiszolgáló IP:"
+msgstr "Szerver IP: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Nincs kapcsolódva"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP port: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP port: Nem áll készen"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP port: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP port: Nem áll készen"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Kliens információk"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Feltöltési korlát"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Letöltési korlát"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "aMule megjelenítése"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Szétkapcsolás"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "aMule elrejtése"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Kapcsolatfelvétel"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Korlátlan"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule Tálca menü"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Sebesség korlátok:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "Fel: nincs"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "Fel: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "Le: nincs"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "Le: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Letöltési sebesség: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Feltöltési sebesség: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Becenév: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Nem lett Becenév kiválasztva!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "KliensID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Kiszolgáló Név: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "Kiszolgáló IP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Nincs kapcsolódva"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online Aláírás: Engedélyezve"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online Aláírás: Letiltva"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Aktivitási idő: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Megosztott fájlok: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Várólistás ügyfelek: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Összes letöltés: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Összes feltöltés: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k hivatkozás: "
-
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Végrehajt"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Egy eD2k vagy magnet hivatkozás hozzáadása a maghoz."
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Hozzáadás a barátokhoz"
+
+#: src/muuli_wdr.cpp
 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:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "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:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Betöltés..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Felhasználók: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Felhasználó van kapcsolódva az aktuális kiszolgálóhoz és egy becslés az összes felhasználó számát illetően."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Fel: 0.0 | Le: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "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:139
+#: src/muuli_wdr.cpp
 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 "A kapcsolat állapotát és az aktív adatátviteleket jelzi ki. A piros nyilak azt jelentik, hogy jelenleg nem vagy kapcsolatban, a sárga nyilak, hogy 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Nincs csatlakozva ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Jelenleg csatlakozott kiszolgáló."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Keresés"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Név:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Típus"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Helyi"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Globális"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Kibővített paraméterek"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Szűrés"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Fájltípus"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Akármelyik"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Archívált fájlok"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Zene"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CD-Image"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Képek"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programok"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Dokumentumok"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Filmek"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Kiterjesztés"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Min. méret"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "bájt"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Max. méret"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Elérhetőség"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Szűrő:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Eredmények szűrése"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Szűrő"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Eredmény megfordítása"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Ismert fájlok elrejtése"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Mezők törlése"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Indít"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Több"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Kiterjesztés"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
-msgstr ""
+msgstr "Kérje meg a már válaszolt Kad partnereket, hogy szélesítsék a keresést. Minden kattintás a legközelebbi partnertől kérdez le kapcsolatokat (KADEMLIA_FIND_VALUE_MORE), további fájltalálatokat hozva, amelyeket a keresés kezdeti alfa határa kihagyott."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Leállít"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Letöltés"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Letöltés kategóriába"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Keresés eredménye"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Mezők törlése"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Eredmények"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Befejeződött letöltések törlése"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Szűrő:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Fájl források:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Általános"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Teljes név :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
-
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met-fájl :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Tördelőalgoritmus (hash) :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Fájlméret :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Fájlrész állapot :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Utoljára teljesnek látott :"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Teljes név"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met-fájl"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Tördelőalgoritmus (hash)"
+
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Fájlméret"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Átvitel"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Forrás találatok :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Átviteli források :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Fájlrész-számláló :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Elérhető :"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Adatráta :"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Aktív letöltési idő: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Átmásolva :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Teljes méret :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Fájlrész állapot"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Utoljára teljesnek látott"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Forrás találatok"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Átviteli források"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Fájlrész-számláló"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Elérhető"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Adatráta"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Aktív letöltési idő"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Teljes méret"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligens Sérülés Kezelés"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Sérülés miatt elveszett :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Tömörítéssel nyert :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "I.S.K.-val megmentett csomagok :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Sérülés miatt elveszett"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Tömörítéssel nyert"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "I.S.K.-val megmentett csomagok"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Megosztva: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Kérések"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Elfogadott kérések"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Átmásolt adat"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Megosztási arány"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Teljes források"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Megosztott fájlok"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Feltöltés: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Kad infó"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Nincs értékelve"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Cím"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Fájl nevek"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Átvétel"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Kitisztítás"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Alkalmaz"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 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:705
+#: src/muuli_wdr.cpp
 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."
@@ -3099,1143 +4173,1259 @@
 "Megadhatod egy film hosszát, történetét, nyelvét...\n"
 "és ha a fájl hamis, elmondhatod ezt a többi aMule felhasználónak."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Fájl minősítése"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Nincs értékelve"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Érvénytelen / Sérült / Hamis"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Gyenge"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Korrekt"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Jó"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Kitűnő"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Leválasztva a Kad-ról"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Frissít"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Letöltés folyamatban, kis türelmet ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Ismeretlen méret"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Kötelező adatok"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP-cím :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Kiegészítő adatok"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "User név :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Userhash :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Userhash"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Hozzáad"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Letöltési sebesség"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Aktuális"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Futásátlag"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Munkafolyamatok átlaga"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Feltöltési sebesség"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Kapcsolatok"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktív letöltések"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktív kapcsolatok (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktív feltöltések"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Statisztika fa"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Felhasználó neve:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Felhasználói hash:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Kliensszoftver:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Kliensverzió:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Kliensszoftver"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Kliensverzió"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "Felhasználó ID"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Kiszolgáló IP"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP-cím:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Kiszolgáló neve"
+
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Zavarás"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "Felhasználó ID:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Kiszolgáló IP:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Kiszolgáló neve:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Zavarás:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Protokoll zavarás"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Átvitel a kliensnek"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Aktuális kérés:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Átlagos feltöltési arány:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Átlagos letöltési arány:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Feltöltve (ebben a szakaszban):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Letöltve (ebben a szakaszban):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Feltöltve (összesen):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Letöltve (összesen):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Aktuális kérés"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Átlagos feltöltési arány"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Átlagos letöltési arány"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Feltöltve (ebben a szakaszban)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Letöltve (ebben a szakaszban)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Feltöltve (összesen)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Letöltve (összesen)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Eredmények"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Le/Fel módosító:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Biztonsági azonosító:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Várólista helyezés:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Feltöltési várólista pontszám:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Biztonsági azonosító"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Várólista helyezés"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Feltöltési várólista pontszám"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Becenév"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - a multi-platform Mule"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Nyelv: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Késleltetés a tool-tippek előtt."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 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:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Indításkor új verzió keresése"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Engedélyezve indításnál az aMule új verziót fog keresni."
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+msgstr "Felhasználónkénti automatikus indítási bejegyzést regisztrál, hogy az aMule bejelentkezéskor elinduljon. Ha áthelyezi az aMule bináris fájlt, indítsa el az aMule-t manuálisan a bejegyzés frissítéséhez."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Indítás minimalizálva"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 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:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Figyelmeztetés kilépéskor"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Figyelmeztessen az aMule bezárása előtt."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Tálca ikon engedélyezése"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Ez engedélyezi/tiltja a tálca ikont."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 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:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimalizálás a rendszer tálcára"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Engedélyezve az aMule a rendszer tálcára fogja magát minimalizálni a tálca helyett."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "Értesítések megjelenítése a letöltés befejezésekor"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "Ezt engedélyezve az aMule értesítéseket fog megjeleníteni a befejezett letöltésekről."
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Emlékezzen ezekre a beállításokra"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Szóbuborék késési idő: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "másodperc"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Böngésző kiválasztása"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Í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:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Tallóz"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Megnyitás új fülön, ha lehetséges"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Videólejátszó"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Sávszélesség korlátok"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Slot kiosztás"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Portok"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Szabvány TCP port "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "UDP port a kiszolgáló kérésekhez (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Bővített UDP port (Kad / globális keresés) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "UPnP engedélyezése a router port továbbításhoz"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnP TCP port (nem kötelező):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 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:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Lokális cím IP-hez csatolása (mindet ha üres):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Max források letöltési fájlonként:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Max egyidejű kapcsolatok:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Automatikus kapcsolódás induláskor"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Kapcsolódás megismétlése megszakadt kapcsolat esetén"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Halott kiszolgálók eltávolítása"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "próbálkozás után"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Kiszolgáló lista automatikus frissítése indításkor"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 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:1458
+#: src/muuli_wdr.cpp
 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:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Prioritási rendszer használata"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Intelligens LowID ellenőrzés használata kapcsolódáskor"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Biztonságos kapcsolódás"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 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:1476
+#: src/muuli_wdr.cpp
 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:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Intelligens Sérülés Kezelő (I.S.K.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Engedélyezés"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Fájlok felvétele szüneteltetett módban"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Új letöltések felvétele automatikus prioritással"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 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:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 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:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Ugyanabból a kategóriából"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "Betűrendi sorrendben"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Lemezterület helyfogalalás az új fájloknak"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 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:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 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:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Add meg a kívánt min. szabad lemezterületet."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 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:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Feltöltések"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Új megosztott fájl felvétele automatikus prioritással"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Célkönyvtár a letöltéseknek"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Intelligens Sérülés Kezelő (I.S.K.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Engedélyezés"
+
+#: src/muuli_wdr.cpp
+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 src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
+"Elvégzett letöltések tárolási helye. Minden fájl ebben a könytárban automatikusan megosztásra kerül másokkal.\n"
+"Ha a könyvtár fájlokat tartalmaz, amelyek ne kerüljenek megosztásra, állítsa át egy megfelelő alkönyvtárra."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
+msgstr "Válassza ki a könyvtárat az elvégzett letöltéseknek. A könyvtár minden fájlja másokkal megosztásra kerül."
+
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Megosztott mappák"
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Könyvtár az ideiglenes letöltési fájloknak"
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Megosztott mappák"
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Eltávolít"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
 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:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Rejtett fájlok megosztása"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
-msgstr ""
+msgstr "Megosztott könyvtárak automatikus újraszkennelése"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
+msgstr "Szimbólikus hivatkozások követése megosztott könyvtárakban"
+
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Távoli kiszolgáló"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Helyi kiszolgáló"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafikonok"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Frissítés késleltetés: 5 mp"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Grafikon átlagos ideje: 100 perc"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Kapcsolatok grafikon skálája: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Letöltési grafikon méretaránya:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Feltöltési grafikon méretaránya:"
 
-#: src/muuli_wdr.cpp:1660
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Színek: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Háttér"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Rács"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Aktuális letöltés"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Letöltési futás átlaga"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Letöltési folyamatok átlaga"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Aktuális feltöltés"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Feltöltési futás átlaga"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Feltöltési folyamatok átlaga"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktív kapcsolatok"
 
-#: src/muuli_wdr.cpp:1675
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr "Sebességmérő a rendszertálcán"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Kad-csomópontok aktuális"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Kad-csomópontok futó"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Kad-csomópontok folyamat"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Kiválaszt"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Fa"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Megjelenített ügyfél verziók száma (0=mind)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! FIGYELEM !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Max új kapcsolat / 5 mp"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "FTP frissítési gyakorisága percekben"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "FTP frissítési gyakorisága percekben"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Fájl buffer méret: 240000 bájt"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Feltöltők várólistájának nagysága: 5000 kliens"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Kiszolgáló kapcsolat frissítési gyakorisága: Tiltva"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 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:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Használt felület: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "A \"Gyors eD2k hivatkozás kezelő\" mutatása minden ablakban."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 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:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Az alkalmazás verziójának megjelenítése a címsorban"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Átviteli ráták megjelenítése a címsorban"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Az alkalmazás neve előtt"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Az alkalmazás neve után"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Többletterhelés sávszélességének mutatása"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Függőleges eszköztár elrendezés"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Letöltendő fájlok várakozási sora"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Százalékos arány mutatása"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Folyamatjelző csík mutatása"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Lapos"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Gömbölyű"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Fájlok automatikus rendezése (erős CPU)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Külső kapcsolatok jellemzői"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Külső kapcsolat elfogadása"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "Hallgató interfész IP-je:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "TCP port:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 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:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Jelszó"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Web kiszolgáló paraméterek"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "TCP port:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Jelszó ellenőrzése\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Jelszó ellenőrzése\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Vendég felhasználó tiltása"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Vendég jelszó a web kiszolgálóhoz"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Web kiszolgáló paraméterek"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Webkiszolgáló indítása induláskor"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Web minta"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Admin jelszó"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Vendég felhasználó engedélyezése"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Vendég jelszó"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 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:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Web szerver UPnP TCP port (nem kötelező)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Oldal frissítésének időzítése (mp múlva)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Gzip tömörítés engedélyezése"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Alapértelmezett"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 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:1969
+#: src/muuli_wdr.cpp
 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:1991
-msgid "Title :"
-msgstr "Cím :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Megjegyzés:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Bejövő Mappa :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Újonnan hozzárendelt fájlok prioritásának változtatása :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Bejövő Mappa"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Újonnan hozzárendelt fájlok prioritásának változtatása"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Ne változzon"
 
-#: src/muuli_wdr.cpp:2030
-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:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Töröl"
+#: src/muuli_wdr.cpp
+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:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 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:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Kiszolgálók listája"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Kiszolgáló hozzáadása kézzel: Név"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Add meg az új kiszolgáló nevét"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Add meg a kiszolgáló portját."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule Napló"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Kiszolgáló Infó"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2K infó"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kad infó"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Csomópontok (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Csomópont statisztikák"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Rendszerbetöltés"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Új csomópont (node)"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Port:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
 msgstr "Indítás ismert kliensektől"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Leválasztás a Kad-ról"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node 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:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Biztonságos azonosítás használata"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protokoll zavarás"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Protokoll zavarás támogatása"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Ez az opció engedélyezi a protokoll zavarást, és az aMule elfogad zavart kapcsolatokat más ügyfelektől."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Kimenő kapcsolatok zavarása"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Ez az opció engedélyezi a protokoll zavarást, amikor más ügyfelekhez/kiszolgálókhoz kapcsolódik az aMule."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Csak zavart kapcsolatok elfogadása"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Mindenki"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Senki"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Ki láthatja a megosztott fájljaimat:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP-szűrés"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Kliensek szűrése"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Kiszolgálók szűrése"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Lista újratöltése"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "IP-k listájának újratöltése a ~/.aMule/ipfilter.dat fájlból"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Frissítés most"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "IP szűrő automatikus letöltése indításkor"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Szűrési szint:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Mindig szűrje ki a LAN IP-ket"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "A nem-megegyező IP-k paranoid kezelése"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Rendszer-szintű ipfilter.dat használatának engedélyezése"
 
-#: src/muuli_wdr.cpp:2441
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
-msgstr "Ha nem talál helyi ipfilter.dat-ot, akkor a rendszerszintű IP szűrő állomány használatát engedi."
+msgstr "Ha nem talál helyi ipfilter.dat fájlt, akkor engedje a rendszerszintű ipfilter fájl használatát."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Online-aláírás engedélyezése"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Frissítési gyakoriság (mp):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 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:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Online aláírási fájl kimentési helye: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Kliensek országzászlajainak megjelenítése"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Database"
-msgstr "Adatráta :"
+msgstr "Adatbázis"
 
-#: src/muuli_wdr.cpp:2536
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Source:"
-msgstr "Források"
+msgstr "Forrás:"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
-msgstr ""
+msgstr "DB-IP (ingyenes, fiók nélkül)"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
-msgstr ""
+msgstr "MaxMind GeoLite2 (ingyenes, fiók szükséges)"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
-msgstr ""
+msgstr "Egyéni URL"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
-msgstr ""
+msgstr "Válassza ki a GeoIP MMDB adatbázis szolgáltatóját. DB-IP az alapértelmezett - nincs szükség fiókra. MaxMind egy ingyenes fiókot és licenckulcsot igényel. Használjon egyéni URL-t bármely más MMDB host megadásához (pl. egy helyi tükörhöz)."
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
 "IP-to-Country data by DB-IP.com - https://db-ip.com\n"
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
+"Nincs szükség konfigurációra.\n"
+"\n"
+"IP-to-Country adat DB-IP.com által - https://db-ip.com\n"
+"Licenc: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
-msgstr ""
+msgstr "Licenckulcs:"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4244,516 +5434,593 @@
 "License: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
+"Regisztráljon egy ingyenes MaxMind fiókért, majd generáljon egy licenckulcsot:\n"
+"https://www.maxmind.com/en/geolite2/signup\n"
+"\n"
+"Ez a termék a MaxMind által létrehozott GeoLite2 adatokat tartalmaz - https://www.maxmind.com\n"
+"Licenc: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
+"Hozzárendelést és fiókregisztrációt igényel; legalább 30 naponta frissítse."
 
-#: src/muuli_wdr.cpp:2595
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
-msgstr "Letöltés: "
+msgstr "Letöltési URL:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
+"Egy .mmdb fájlra vagy egy azt tartalmazó .gz / .tar.gz fájlra kell mutasson.\n"
+"Az URL tartalmazhat hitelesítő adatokat (https://user:pass@host/...).\n"
+"A licenc- és megnevezési feltételeket a felmenő URL határozza meg - ön a felelőss."
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
-msgstr ""
+msgstr "GeoIP adatbázis letöltése a kiválasztott forrásból."
 
-#: src/muuli_wdr.cpp:2616
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
-msgstr "IP szűrő automatikus letöltése indításkor"
+msgstr "Automatikus frissítés indításkor"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
-msgstr ""
+msgstr "GeoIP adatbázis újonnani letöltése a kiválasztott forrásból minden aMule indításkor."
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 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:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Összes üzenet szűrése"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 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:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Ismeretlen kliensektől érkező üzenetek kiszűrése"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 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:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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ó üzeneteket"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "A kapott üzenetek megjelenítése a naplóban"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Megjegyzések"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Megjegyzések kiszűrése, melyek tartalmazzák (',' az elválasztó):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Hitelesítés engedélyezése"
-
-#: src/muuli_wdr.cpp:2683
-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:2686
-msgid "Username: "
-msgstr "Felhasználói név: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Felhasználói név a proxy kapcsolathoz"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Jelszó:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Jelszó a proxy kapcsolathoz"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Proxy engedélyezése"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Proxy támogatás engedélyezése/tiltása"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Proxy típusa:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Proxy host:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Proxy típusa"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Proxy host"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "A proxy host neve"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Proxy port:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Proxy port"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "A proxy port"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Hitelesítés engedélyezése"
+
+#: src/muuli_wdr.cpp
+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
+msgid "The username to use to connect to the proxy"
+msgstr "Felhasználói név a proxy kapcsolathoz"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Jelszó a proxy kapcsolathoz"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Kapcsolódás ehhez:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Bejeletkezés a távoli amule-ra"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Felhasználói név"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Emlékezzen ezekre a beállításokra"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
 #, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Külső kapcsolat lezárva."
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
-msgstr "Gzip tömörítés használata"
+msgstr "ZLIB tömörítés erőltetése"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Bőbeszédű hiba-naplózás engedélyezése."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Csak napló fájlba"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Üzenet kategóriák:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Várakozás..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Importálandók hozzáadása"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Kijelöltek újrapróbálása"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Kijelöltek eltávolítása"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Esemény típusok"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Aktív feltöltések"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Összes fájl százalékaként"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Kliensek megjelenítése ehhez:"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Összes fájl"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Kiválasztott fájlok"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Csak aktív feltöltések"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Kliensek megjelenítése ehhez:"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Újratöltés:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Megosztott fájlok frissítése"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Küldés"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Megadott üzenet küldése."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Csevegési folyamat bezárása."
 
-#: src/muuli_wdr.cpp:3102
-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
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Mégsem"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Megosztott fájlok"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Szétkapcsolás"
 
-#: src/OScopeCtrl.cpp:242
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Kapcsolatfelvétel"
+
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Tiltva %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "bájt"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "bájt/mp"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "mp"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "perc"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "óra"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "nap"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "mind"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "összes egyéb"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Befejezetlen"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Megállítva"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Film"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Archívált"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Szöveg"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Aktív"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Konfigurációk könyvtára: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Ennek a parancsnak nem kellene paraméterének lennie."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Ennek a parancsnak nem kellene paraméterének lennie."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Ennek a parancsnak nem kellene paraméterének lennie."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Ennek a parancsnak nem kellene paraméterének lennie."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Add meg a kiszolgáló portját."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Add meg a kiszolgáló portját."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Add meg a kiszolgáló portját."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Várakozás a partfile kovertáló thread befejeztére..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "%s importálása: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Ideiglenes mappa olvasása"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 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:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Célfájl létrehozása"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, 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:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Forrás letöltési fájl információ megszerzése"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 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
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Részfájlok importálása"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Állapot"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Fájl Hash"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Lemezen: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
-#, fuzzy
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
-msgstr "Töröljem a sikeresen importált letöltések forrásait?"
+msgstr "Törölni akarja a sikeresen importált letöltések forrás fájljait?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Források eltávolítása?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "HIBA: Részfájl létrehozása sikertelen"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, 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:409
+#: src/PartFile.cpp
 #, 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:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "HIBA: Érvénytelen .part.met fájl változat: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Hiba: %s (%s) sérült (rossz tagek: %s), a fájl betöltése nem lehetséges."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Fájl infó helyreállításának megkísérlése..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Fájl infó helyreállítása nem lehetséges :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "A(z) %s (%s) megnyitása sikertelen"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "FIGYELEM: %s lehet, hogy sérült (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "HIBA a fájlrész mentésénél: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Adatforgalmi hiba a partfile mentésekor: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
-msgstr ""
+msgstr "0/ismeretlen bájt lett írva a '%s' helyre -- megőrizve a létezö .part.met fájlt."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "%i forrás elmentve a részfájlnak: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr " A %s (%s) részfájl forrás fájlja nem olvasható"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Sérült részt (%d) találtam a %d részű %s fájlban - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, 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:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "%s újra algoritmizálása befejeződött"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, 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:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Letöltés befejeződött: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4762,307 +6029,155 @@
 "Letöltés befejeződött:\n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Fájl törlése: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, 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"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 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:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "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/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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:3567
+#: src/PartFile.cpp
 #, 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:3617
+#: src/PartFile.cpp
 #, 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:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Helyfoglalás"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Elégtelen lemezterület"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Letöltve"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "HIBA: A(z) '%s' részfájl megnyitása sikertelen."
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Alapértelmezett"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albán"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arab"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asztúriai"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baszk"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bolgár"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalán"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Kínai (egyszerűsített)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Kínai (hagyományos)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Horvát"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Cseh"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Dán"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Holland"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Angol (Egyesült Királyság)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "Angol (Egyesült Királyság)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Észt"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finn"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francia"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Gall"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Német"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Görög"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Héber"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Magyar"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Olasz"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Olasz (Svájci)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japán"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Koreai"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Litván"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvég (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Lengyel"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugál"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugál (Brazíliai)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Román"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Orosz"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Szlovén"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spanyol"
+msgid "Extended source exchange"
+msgstr "Forrás-csere"
 
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Svéd"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Török"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukrán"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Nyelv megváltoztatása"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Nincsenek fordítások telepítve az aMule-hez"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Nincs elérhető nyelv"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "nincs elérhető opció"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "Érvénytelen kategória találva, mellőzés"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Érvénytelen kategória találva, mellőzés"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Alapértelmezett port lesz használva (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Csatlakozás"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Mappák"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Kiszolgálók"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Fájlok"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Biztonság"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Felület"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Szűrők"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Távoli elérés"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Online aláírás"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Haladó"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Események"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Hibakeresés"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5072,15 +6187,15 @@
 "    %PARTFILE - teljes út a fájlhoz\n"
 "    %PARTNAME - csak a fájl neve"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5096,26 +6211,43 @@
 "Ezen beállítások módosítása nélkül is remekül fog\n"
 "működni az aMule."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "A proxy típusa amihez kapcsolódsz"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Jelszó ellenőrzése\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5123,31 +6255,45 @@
 "Ú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:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP port megváltozott.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP port megváltozott.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "- Külső kapcsolat interfész megváltoztatva.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Külső kapcsolat port megváltoztatva.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Külső kapcsolat elfogadása megváltoztatva.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Külső kapcsolat interfész megváltoztatva.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- Protokoll zavarás támogatása megváltozott.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Nyelv megváltozott.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5155,27 +6301,33 @@
 "Az automatikusan frissített kiszolgálóü lista üres.\n"
 "A 'kiszolgáló lista automatikus frissítése induláskor' letiltva."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 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:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Nyelv megváltozott.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Ideiglenes mappa megváltozott.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- ED2K hálózat engedélyezve.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Érvénytelen protokoll verzió."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5183,7 +6335,7 @@
 "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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5191,7 +6343,7 @@
 "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:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5201,20 +6353,69 @@
 "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:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Automatikus frissítés elindítva"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "A letöltött fájlok eltolása %s helyre sikertelen"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Jelszó beállítva, külső kapcsolatok engedélyezve."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5224,41 +6425,65 @@
 "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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "az Ideiglenes fájloknak"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Bejövő fájlok"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "az Online aláírásnak"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Válassz egy mappát a %s-nek"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "%i ismert megosztott fájlt találtam"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Böngészés a videolejátszóhoz"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Válaszd ki a böngésződet"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Válaszd ki a böngésződet"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Futtatható%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Alapértelmezett"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Kiszolgáló lista szerkesztése"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5266,1182 +6491,1436 @@
 "URL-ek felvétele a server.met fájl letöltéséhez.\n"
 "Egy sorba csak egy URL."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Teljes források"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Állapot:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Állapot:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Frissítés késleltetése: %d másodperc"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Grafikon átlagos ideje: %d perc"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Kapcsolatok grafikon-skálája: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Fájl buffer méret: %d bájt"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Feltöltési várólista nagysága: %d kliens"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Kiszolgáló kapcsolat frissítési gyakorisága: %d perc"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Kiszolgáló kapcsolat frissítési gyakorisága: Tiltva"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "letiltva"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Parancs végrehajtása a(z) '%s' eseménynél"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Parancs futtatása a magon"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Mag parancs:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Parancs futtatása a grafikus felületen"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "GUI parancs:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "A következő változók lesznek behelyettesítve:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Megosztott mappák"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Megosztott fájlok frissítése"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Megosztott mappák"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "A megosztott fájlok listájának újratöltése."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Megosztott mappák"
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Válassz egy mappát a %s-nek"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Emlékezzen ezekre a beállításokra"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Keresési figyelmeztetés"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "Nem lehet keresni, ha az eD2k és a Kademlia hálózat is le van tiltva."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "Keresési hiba"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Keresés haladása: %u %% \n"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Keresési figyelmeztetés"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Alap"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "FIGYELEM: Az ismert fájlok listája sérült, érvénytelen fejlécet tartalmaz."
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Érvénytelen bejegyzés az ismert fájlok listájában, hiba lehet a fájlban: "
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "A Kad kereséshez nincs kulcsszó - megszakítva"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Nem várt hiba amíg a Kad kereséssel próbálkoztam: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "Fájl ID"
-
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Nincs értékelve"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Letöltés kategóriába"
+#: src/SearchList.cpp
+#, fuzzy, c-format
+msgid "Error %u: %s\n"
+msgstr "Hiba %s frissítésekor"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "%s lekérése ehez a fájlhoz"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "Fájl ID"
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Az összes fül bezárása"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Kapcsolódó fájlok keresése (eD2k, helyi kiszolgáló)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Ismertként megjelölés"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "eD2k hivatkozás másolása a vágólapra"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "eD2k hivatkozások másolása a vágólapra"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Olyan kiszolgálót próbál törölni, amelyikhez csatlakozva van. Kérém először válassza le."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Megszakítva"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Új"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Fut"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finn"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Keresés haladása: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Keresés haladása nem elérhető"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static 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
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "Az összes felsorolt kiszolgálóval történő kapcsolatfelvétel sikertelen. Újra próbálkozom."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 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
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Automatikus kapcsolódás a kiszolgálóhoz %d másodperc múlva"
+
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Kapcsolódva %s-hez (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Kapcsolat létrejött a %s-vel"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Megszakadt a kapcsolat %s-vel (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "A %s (%s:%i) halottnak tűnik."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "A %s (%s:%i) úgy látszik megtelt."
 
-#: 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"
-msgstr0 "Automatikus kapcsolódás a kiszolgálóhoz %d másodperc múlva"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Kapcsolat megszakadt"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Kapcsolódás %s-hez (%s:%i) sikertelen."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 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:472
+#: src/ServerConnect.cpp
 #, 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/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 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:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "server.met fájl betöltése: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Server.met fájl nem található!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "A server.met megnyitása sikertelen!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "A server.met fájl sérült, érvénytelen verzió-tag: 0x%x, mérete %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i kiszolgálót találtam a server.met fájlban"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d kiszolgáló hozzáadva"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Hiba: a 'server.met' fájl sérült: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "IO hiba a 'server.met' fájl olvasása közben: "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "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:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Nem sikerült megnyitni a '%s'-t"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "A server.met mentése sikertelen!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "IO hiba a 'server.met' fájl olvasása közben: "
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Érvénytelen URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Kiszolgáló lista letöltése %s-ről befejeződött"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Az addresses.dat fájlban nem található kiszolgáló-lista cím bejegyzés. 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Kiszolgáló lista letöltése %s-ről megkezdve."
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, 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:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "A helyi kiszolgálót kiszűrte az IP-szűrő, újracsatlakozom egy másik kiszolgálóhoz!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Leírás"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Felhasználók"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Felhasználók"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Állandó"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Verzió"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Fájlok"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Megosztott fájlok"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 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:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Ismeretlen név)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "perc"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Kiszolgálók száma (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Kiszolgáló"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Kapcsolódás a kiszolgálóhoz"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Kiszolgáló megjelölése állandóként"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Kiszolgáló megjelölése nem állandóként"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Kiszolgálók megjelölése állandóként"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Kiszolgálók megjelölése nem állandóként"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Kiszolgáló eltávolítása"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Kiszolgálók eltávolítása"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Összes kiszolgáló eltávolítása"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "eD2k hivatkozások másolása a vágólapra"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Újracsatlakozás a kiszolgálóhoz"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 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:548
+#: src/ServerListCtrl.cpp
 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:550
+#: src/ServerListCtrl.cpp
 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:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "HIBA: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "FIGYELEM: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Az új ügyfélazonosító %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "FIGYELEM: Alacsony azonosítót (LowID) kaptál!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tTovábbi információért, kérlek látogasd meg a https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Ismeretlen kiszolgáló infó fogadva! - túl rövid"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "%d új kiszolgáló fogadva"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Kiszolgáló-lista mentése kész."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "A kiszolgáló visszautasította az utolsó parancsot"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Hibás csomag érkezett a kiszolgálótól: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, 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:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "protokoll zavarással."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Kapcsolódás %s-hez (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "aMule Napló"
+
+#: src/ServerWnd.cpp
 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:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Kiszolgáló nem lett hozzáadva: Érvénytelen kiszolgáló-port."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "eD2k állapot:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Kapcsolat állapota:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Csatlakozva"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kademlia állapot:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "LAN módban működik"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Fut"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "Kademlia kliens ID:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Állapot:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Kapcsolat állapota:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr "Tűzfal által levédve - nyisd meg a %d. TCP port-ot a routereden vagy a tűzfaladon"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "UDP Kapcsolat Állapota:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr "Tűzfal által levédve - nyisd meg a %d. UDP port-ot a routereden vagy a tűzfaladon"
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Tűzfal állapot: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Nincs szükség pajtásra - TCP port nyitva"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Nincs szükség pajtásra - UDP port nyitva"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Nincs pajtás"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Kapcsolódás a pajtáshoz"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Pajtáshoz kapcsolódva %s-on"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP-cím:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Indexelt források:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Indexelt kulcsszavak:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Indexelt jegyzetek:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Indexelt terhelés:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Átlagos felhasználószám:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Átlagos fájlszám:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "nem fut"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Fájl %s hozzáadása a megosztásokhoz"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "%i ismert megosztott fájlt találtam"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "%i ismert és %i ismeretlen megosztott fájlt találtam"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "HIBA: Megpróbáltuk megosztani a(z) %s-t"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Megosztott könyvtár nem található, mellőzve: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Megosztott könyvtár nem található, mellőzve: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Nincsen megosztott fájl ebben a könyvtárban: %s"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Felhasználói név"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Hiba a %s fájl mentése közben: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Letöltési sebesség"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "server.met fájl betöltése: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Feltöltési sebesség"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Nincsen megosztott fájl ebben a könyvtárban: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Nincsen megosztott fájl ebben a könyvtárban: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Elérhető részek"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "%i ismert megosztott fájlt találtam"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Felhasználói név"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Feltöltési állapot"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Helyi fájlnév"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Fájl lista megosztása"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Kérések"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Elfogadott kérések"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Átmásolt adat"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Megosztási arány"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Megszerzett részek"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Teljes források"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Elérhetőség"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Könyvtár útvonal"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Megosztott fájlok"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Megjegyzés/Értékelés hozzáadása"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Megjegyzés/Értékelés szerkesztése"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Add a gyűjteményben szereplő fájlokat az átviteli listához"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Magnet &URI másolása a vágólapra"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "eD2k hivatkozás másolása a vágólapra (Forrás)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 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:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "eD2k hivatkozás másolása a vágólapra (Gazda név)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "eD2k hivatkozás másolása a vágólapra (Gazda név) (Titkosítási opciókkal)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "eD2k hivatkozás másolása a vágólapra (AICH infó)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "eD2k hivatkozás másolása a vágólapra (&AICH infó + forrás)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 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:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Hiba a befejezésnél"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Megosztott fájlok lehozatala sikertelen a(z) '%s' felhasználótól"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Megosztott fájlok frissítése"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Megosztott fájlok teljes mérete: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Megosztott fájlok teljes mérete: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Megosztott fájlok (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Megosztott fájlok (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Részfájl"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "A megosztott fájlok listájának újratöltése."
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Állapot"
+
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Távoli fájlnév"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Feltöltött adatok (folyamat (összesen)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Összes többletterhelés (csomagok): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Fájlkérés többletterhelése (csomagok): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Forrásváltás többletterhelése (csomagok): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Kiszolgáló többletterhelése (csomagok): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kad többletterhelés (csomagok): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Titkosítás többletterhelés (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Aktív feltöltések: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Várakozó feltöltések: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Összes sikeres feltöltési folyamat: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Összes sikertelen feltöltési folyamat: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Átlagos feltöltési idő: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Letöltött adatok (folyamat (összesen)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Forrás találatok: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Aktív letöltések száma (adatelemek): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Fel:Le töltési folyamat aránya (összesen): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Átlagos letöltési arány (folyamat): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Átlagos feltöltési arány (folyamat): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Maximum letöltési arány (folyamat): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Maximum feltöltési arány (folyamat): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Újrakapcsolódások: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Első átvitel óta eltelt idő: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Kiszolgálóhoz kapcsolódva: %s óta"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Aktív kapcsolatok száma (becsült): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Max kapcsolódási korlát elérve: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Kapcsolatok átlagos száma (becsült): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Legtöbb kapcsolat (becsült): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Kliensek"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Ismeretlen: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Kiszűrve: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Kitiltott: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Összesen: %i Ismert: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Működő kiszolgálók: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Sikertelen kiszolgálók: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Összes: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Törölt kiszolgálók: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Kiszűrt kiszolgálók: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, 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:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Fájlok a működő kiszolgálókon: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Összes felhasználó: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Összes fájl: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Kiszolgáló leterheltség: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Megosztott fájlok száma: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Megosztott fájlok teljes mérete: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Átlagos fájlméret: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Operációs rendszer"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Nem fogadott"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktív kapcsolatok (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Nem elérhető"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Soha"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "A '%s' parancs - melynek pid-je '%d' - befejeződési állapotkódja '%d' volt."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Végrehajtja az <str>-t és kilép."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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/TextClient.cpp:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Feldolgozás hash alapján: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Feldolgozás fájlnév alapján: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Érvénytelen szám\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6452,7 +7931,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6463,7 +7942,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6471,76 +7950,80 @@
 "Nem lett megadva keresési típus.\n"
 "A 'help search' paranccsal kaphatsz bővebb segítséget.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Letöltöndő fájl: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Kérés ismeretlen hibával sikertelen."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "A művelet sikeres volt."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, 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:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Kliens IP szűrés %s van kapcsolva.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "KI"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "BE"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Kiszolgáló IP szűrés %s van kapcsolva.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "IP szűrő szintje jelenleg %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Kapcsolódva %s-hez %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Kapcsolódás folyamatban"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "tűzfal mögül"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "rendben"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6549,7 +8032,7 @@
 "\n"
 "Letöltés:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6558,7 +8041,7 @@
 "\n"
 "Feltöltés:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6567,7 +8050,7 @@
 "\n"
 "Várólistás kliensek száma:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6576,38 +8059,33 @@
 "\n"
 "Összes forrás:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Részfájl"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Keresés eredményeinek száma: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Keresés haladása: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Keresés haladása nem elérhető"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, 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:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Rövid állapot információ megjelenítése."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 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:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Megjeleníti a teljes statisztika fát."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6622,11 +8100,11 @@
 "Példa: 'statistics 5' csak a leggyakoribb 5 verziót mutatja minden ügyfél\n"
 "típusból.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Az aMule leállítása."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6636,35 +8114,35 @@
 "Ez a szöveges klienst is le fogja állítani,\n"
 "hiszen az használhatatlan futó mag nélkül.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "A megadott objektum újratöltése."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "A megosztott fájlok listájának újratöltése."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Az IP szűrő tábla újratöltése."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Az aktuális IP szűrő tábla újratöltése."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "IP szűrő tábla frissítése URL-ról."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 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:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Kapcsolódás a hálózathoz."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6676,35 +8154,35 @@
 "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:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Kacsolódás csak az eD2k-hoz."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Kapcsolódás csak a Kad-hoz."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Leválaszt a hálózatról."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Leválasztás csak az eD2k-ról."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Csak a Kad-ról választ le."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Egy eD2k vagy magnet hivatkozás hozzáadása a maghoz."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6723,51 +8201,51 @@
 "\n"
 "A magnet hivatkozásnak tartalmaznia kell az eD2k hash-t és a fájl hosszát.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Egy beállítási érték megadása."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "IP szűrő beállítások megadása."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 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:1020
+#: src/TextClient.cpp
 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:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Engedélyezi/Letiltja a kliensek IP szűrését."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Kliens IP szűrés bekapcsolása."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Kliens IP szűrés kikapcsolása."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Engedélyezi/Letiltja a kiszolgálók IP szűrését."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Kiszolgáló IP szűrés bekapcsolása."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Kiszolgáló IP szűrés kikapcsolása."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "IP szűrési szint kiválasztása."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6775,59 +8253,73 @@
 "Az érvényes szűrési szintek a 0-255 tartományban vannak, és az alapértelmezett\n"
 "értéke 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Sávszélességi korlátok beállítása."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Feltöltési sávszélesség beállítása."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "A megadott érték kilobájt/mp-ben kell legyen.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Letöltési sávszélesség beállítása."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Felhasználói név/jelszó hitelesítés engedélyezése/tiltása"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "A megadott érték kilobájt/mp-ben kell legyen.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Beállítási értékek megjelenítése."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "IP szűrő beállítások lekérdezése."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 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:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "IP szűrő állapotának lekérdezése csak ügyfeleknek."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "IP szűrő állapotának lekérdezése csak kiszolgálóknak."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "IP szűrési szint lekérdezése."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Sávszélességi korlátok megtekintése."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Keresés végrehajtása."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6846,39 +8338,44 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Globális keresés végrehajtása."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Helyi keresés végrehajtása."
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Kad hálózaton való keresés végrehajtása."
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
 msgstr "Az utolsó keresés eredményeinek megjelenítése."
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Az előző keresés eredményeinek visszaadása.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Egy keresés állapotának megjelenítése."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Egy keresés állapotának megjelenítése.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Fájl letöltése."
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6886,80 +8383,80 @@
 "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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Letöltés szüneteltetése."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Letöltés folytatása."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Letöltés megszakítása."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Letöltési prioritás beállítása."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Alacsony prioritás beállítása."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Normál prioritás beállítása."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Magas prioritás beállítása."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Automatikus prioritás beállítása."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Várósorok/listák megmutatása."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Feltöltési várósor megmutatása."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Letöltési várósor megmutatása."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Napló megjelenítése."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Kiszolgáló-lista megmutatása."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "A megosztott fájlok listájának megjelenítése."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Napló törlése."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Elavult parancs, használd a(z) '%s'-t helyette."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -6968,255 +8465,278 @@
 "Ez egy elavult parancs és a jövőben eltávolításra kerülhet.\n"
 "Használd a '%s'-t helyette.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule szöveges kliens"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Fájl törlése: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Fájl törlése: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Fájl feltöltés folytatása: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Megerősítés szükséges"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Csak 99 kategória támogatott."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Túl sok kategória!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Összes egyéb"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Válassz nézetet"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Új kategória"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Kategória szerkesztése"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Kategória törlése"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Hash-készlet kérés az ismeretlen %s fájlhoz"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Válaszd ki, hogy kik kérdezhetik le megosztott fájlaid listáját."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Fájl feltöltés folytatása: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Fájl feltöltés felfüggesztése: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+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
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Letöltés befejezve"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "A fájl teljes elérési útja."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "A fájlnév könyvtár komponens nélkül."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "A fájl eD2k hash-e."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Fájlméret bájtokban."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Összegzett letöltési aktivitás idő."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Új beszélgetés kezdődött"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Üzenetküldő."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Helyhiány"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Lemez partíció."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Hiba a befejezésnél"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "%u fájl számának feldolgozása: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Nem létező fájl !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, az aMule eD2k hivatkozás készítője"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Üdvözöljük!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Bemeneti paraméterek"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Fájl tördelőalgoritmizálása"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:144
-msgid "Remove"
-msgstr "Eltávolít"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Hivatkozás készítése rész-hash-ekkel"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4 fájl hash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k fájl hash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k hivatkozás"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Ment"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Másolás a vágólapra"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Megnyitás"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Mentés másként"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "aLinkCreator Névjegy"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Nem tudom megnyitni a vágólapot"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Nem került másolásra semmi !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Nem lehet megnyitni: "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Kérlek, ne üres fájlnevet adj meg"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Nem került mentésre semmi !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7236,162 +8756,159 @@
 "\n"
 "GPL alatt terjesztve"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Tördelőalgoritmizálás..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "Az aLinkCreator dolgozik"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "MD4 hash számítása..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "eD2k hash-ek számítása..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Megszakítva !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Elkészült  %.2f mp alatt"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Kérlek, ne üres URL-t adj meg"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "%s-t nem lehet megnyitni"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "Elfogyott a memória az ed2k hash kiszámítása közben!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02un %02uó %02uperc %02ump"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uó %02uperc %02ump"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02uperc %02ump"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02ump"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, aMule Online Statisztikák"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Töröl"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Rendszer"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Automatikus frissítés leállítása"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Online statisztikák mentése"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Online statisztikák nyomtatása"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Tulajdonságok beállítása"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "wxCas Névjegy"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Automatikus frissítés elindítása"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Automatikus frissítés leállítva"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Automatikus frissítés elindítva"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Statisztikák mentése"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMule online statisztikák"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7399,11 +8916,11 @@
 "Nyomtatási probléma történt.\n"
 "Lehet, hogy a nyomtatód nincs helyesen beállítva?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Nyomtatás"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7421,402 +8938,560 @@
 "\n"
 "Distributed under GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Ó ó, az aMule nem fut..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule fut"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "Az aMule fut, de nincs kapcsolódva"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule kapcsolódása folyamatban..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Ó-Ó, az aMule állapota ismeretlen..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " fut "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " megállt !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " nincs kapcsolódva !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " kapcsolódás folyamatban ..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " kapcsolódva ehhez: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "nincs"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " csatlakozva ehhez "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " ezzel "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Összes letöltés: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Feltöltés: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Szakasz letöltés: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Letöltés: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Feltöltés: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Megosztva: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " fájl(ok), Várólistás kliensek száma: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Idő: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " IP címen "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Rendszer betöltési átlag (1-5-15 perc): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "A rendszer aktivitási ideje (uptime): "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "amulesig.dat fájlt tartalmazó könyvtár"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Frissítés gyakorisága mp-ben"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically 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:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP Url"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP útvonal"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Felhasználó"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTP frissítési gyakorisága percekben"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Mentés"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Aláírás fájlt tartalmazó könyvtár"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "A statisztika készítésének könyvtára"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Betölti a(z) <str> sablont"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Web kiszolgáló HTTP port"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 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:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP port"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Gzip tömörítés használata"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Teljes jogú jelszó a web kiszolgálóhoz"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Vendég jelszó a web kiszolgálóhoz"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Vendég felhasználó engedélyezése"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Vendég felhasználó tiltása"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "A web kiszolgáló beállításait a távoli aMule-től kéri, illetve oda menti"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMule konfig fájl útvonala. NE HASZNÁLD!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "PHP feldolgozó letiltása (nem ajánlott)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "PHP oldalak újrafordítása minden kérésnél"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule Web kiszolgáló"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "web ügyfél kapcsolat elfogadva\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "HIBA: nem tudom fogadni a web ügyfél kapcsolatot\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, 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:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Index fájl nem található: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Munkafolyamat időtúllépés - bejelentkezés kérése\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Munkamenet rendben, bejelentkezve\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Munkamenet rendben, nincs bejelentkezve\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Nincs munkafolyamat megnyitva - bejelentkezés kérése\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Munkafolyamat létrehozva - bejelentkezés kérése\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Kérés feldolgozása eredeti: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Nincsen megadva jelszó, bejelentkezés nem lesz engedélyezve."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Jelszó ellenőrzése\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Jelszó hash érvénytelen\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Jelszó rendben\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Hibás jelszó\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Kijelentkezés\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Kérés feldolgozása átirányított: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Kapcsolódás sikertelen "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Feltöltve"
+#~ msgid "Ratio"
+#~ msgstr "Értékelés"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Nincsen megosztott fájl ebben a könyvtárban: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Nyelv megváltoztatása"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Nincsenek fordítások telepítve az aMule-hez"
+
+#~ msgid "No languages available"
+#~ msgstr "Nincs elérhető nyelv"
+
+#~ msgid "User name"
+#~ msgstr "Felhasználói név"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Megszerzett részek"
+
+#~ msgid "Available Parts"
+#~ msgstr "Elérhető részek"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "%i ismert és %i ismeretlen megosztott fájlt találtam"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y.%m.%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Távoli kiszolgáló"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Fájl nem található."
+#~ msgid "Local prefix:"
+#~ msgstr "Helyi kiszolgáló"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Érvénytelen bejegyzés az ismert fájlok listájában, hiba lehet a fájlban: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "PartFile mentése %u a(z) %u-ból"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ 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 %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Eredmények szűrése"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Ismertként megjelölés"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Összes fájl százalékaként"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Rendszerbetöltés"
+
+#~ msgid "New node"
+#~ msgstr "Új csomópont (node)"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Több"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Indítás ismert \n"
+#~ "kliensektől"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Kapcsolódás bármelyik kiszolgálóhoz és/vagy a Kad-hoz"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Leválasztás a Kad-ról"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Aktuális kapcsolódási kísérletek leállítása"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Leválaszt az éppen kapcsolódott hálózatokról."
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Kapcsolódás a pillanatnyilag engedélyezett hálózatokhoz."
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Fájlok automatikus rendezése (erős CPU)"
+
+#~ 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"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Eldobja a csomagot, ha a kliens IP különbözik az IP-től, ahonnan a csomag jött. Óvatosan használd."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Az előző keresés eredményeinek visszaadása.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Egy keresés állapotának megjelenítése.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Kapcsolat megszünt - aMule valószínüleg befejeződött."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Indításkor új verzió keresése"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k hivatkozás: "
+
+#~ msgid "Commit"
+#~ msgstr "Végrehajt"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: háttérbe való hasadás - viszlát"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Honlap: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Fórum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Dokumentáció: https://amule-org.github.io/docs \n"
+
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Gondok: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Feltöltve"

amule-3.0.1.tar.gz/po/it.po -> amule-3.1.0.tar.gz/po/it.po Changed

@@ -19,8 +19,8 @@
 msgstr ""
 "Project-Id-Version: aMule 2.3.3\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-20 02:01+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:46+0000\n"
 "Last-Translator: got3nks <got3nks@users.noreply.github.com>\n"
 "Language-Team: SebastianoPistore.info@protonmail.ch\n"
 "Language: it\n"
@@ -30,72 +30,157 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "Informazioni su aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Controllo remoto di aMule "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Snapshot:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Client p2p multipiattaforma basato su eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Parte di aMule è basata su \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: routing peer-to-peer basato su metrica XOR.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Sito:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Forum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Documentazione:"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Segnalazioni:"
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "Fai clic per verificare la disponibilità di una versione più recente."
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "Controlla la presenza di aggiornamenti"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "Controllo aggiornamenti in corso..."
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "Stai utilizzando la versione più recente."
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "Una nuova versione (%s) è disponibile:"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr "Impossibile verificare la disponibilità di aggiornamenti. Riprova più tardi."
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Aggiungi amico"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 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
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informazione"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "L'hash utente specificato non è valido!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
-"aMule può installare un'icona di avvio nel menu delle applicazioni mostrandosi come una qualunque app installata. L'operazione è reversibile — i file saranno collocati in ~/.local/share/applications e ~/.local/share/icons e potranno essere rimossi in qualsiasi momento.\n"
+"aMule può installare un'icona di avvio nel menu delle applicazioni mostrandosi come una qualunque app installata.\n"
+"\n"
+"L'operazione è reversibile - i file saranno collocati in ~/.local/share/applications e ~/.local/share/icons e potranno essere rimossi in qualsiasi momento.\n"
 "\n"
 "Installare ora l'integrazione con il desktop?"
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr "Aggiungere aMule al menu delle applicazioni?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr "Installa"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr "Non ora"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr "Non chiedere più"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr "Impossibile installare l'integrazione con il desktop: la variabile di ambiente APPDIR non è impostata. Di solito significa che l'AppImage è stata avviata in modo non standard."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr "Integrazione di aMule non riuscita"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr "Impossibile installare l'integrazione con il desktop: errore nella creazione di %s. Verificare che la home directory sia scrivibile."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr "Impossibile installare l'integrazione con il desktop: errore nella scrittura di %s. Verificare che la home directory sia scrivibile."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr "Integrazione AppImage: aMule è stato aggiunto al menu delle applicazioni."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr "Integrazione AppImage: aMule aggiunto al menu delle applicazioni (%d collegamenti shell in ~/.local/bin)."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -109,82 +194,167 @@
 "\n"
 "Riavviare aMule ora?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr "aMule installato"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr "Riavvia ora"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr "Più tardi"
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 "Impossibile aggiungere %u collegamento dal file ED2KLinks (vedere il log per i dettagli)."
-msgstr1 "Impossibile aggiungere %u collegamenti dal file ED2KLinks (vedere il log per i dettagli)."
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ERRORE"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Impossibile aprire il link ed2k."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
 msgstr "ATTENZIONE: non è possibile aggiungere te stesso come fonte di un link eD2k finché avrai un ID basso."
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+"Un altro programma sta bloccando il file di lock di aMule:\n"
+"\n"
+"%s\n"
+"\n"
+"Non è una copia di aMule in esecuzione, quindi non c'è nessuna finestra da portare in primo piano. Chiudi l'altro programma, oppure elimina il file di lock mentre aMule non è in esecuzione."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+"Il demone di aMule (amuled) è già in esecuzione come processo %d e sta usando questa configurazione.\n"
+"\n"
+"Non ha una finestra da portare in primo piano. Collegati con amuleGUI, oppure arresta il demone prima di avviare aMule."
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr "aMule non può avviarsi"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr "Permessi di %s limitati al solo proprietario."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr "File di collezione non trovato: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "File di collezione non valido o vuoto: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr "Nessun collegamento utilizzabile nella collezione: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 "Ignorato %u collegamento inutilizzabile nella collezione: %s"
+msgstr1 "Ignorati %u collegamenti inutilizzabili nella collezione: %s"
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Non posso convertire il magnet link in eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Collegamento eD2k \"%s\" non valido - ERRORE: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Chiusura dell'applicazione..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Sto terminando l'istanza di amuleweb con pid `%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Sto terminando forzatamente l'istanza di amuleweb con pid `%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Fallito"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Sto terminando l'istanza di amuleapi con pid `%d' ... "
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Sto terminando forzatamente l'istanza di amuleapi con pid `%d' ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule in fase di chiusura: Terminazione del core."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "aMule, arresto completato."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Risultati del debug della memoria per la chiusura di aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr "Associazione del traffico peer-to-peer di aMule all'interfaccia: %s (gli aggiornamenti HTTP usano la route predefinita)"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr "Associazione di tutto il traffico di rete all'interfaccia: %s"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr "ATTENZIONE: l'interfaccia di rete configurata '%s' non è stata trovata - il traffico NON è associato ad essa e potrebbe uscire tramite la route predefinita. Controlla il nome dell'interfaccia nelle Preferenze."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr "ATTENZIONE: l'associazione all'interfaccia di rete '%s' richiede privilegi elevati e NON è stata applicata - il traffico potrebbe uscire tramite la route predefinita. Concedi la capability (ad es. 'sudo setcap cap_net_raw+ep' sul binario di aMule) oppure esegui con privilegi sufficienti."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr "ATTENZIONE: impossibile associare all'interfaccia di rete '%s' - il traffico potrebbe uscire tramite la route predefinita."
+
+#: src/amule.cpp
 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 del cambio di configurazione. Spiacente."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -192,27 +362,47 @@
 "\n"
 "Configurazione EC"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Password impostata, connessioni esterne abilitate."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "ATTENZIONE"
 
-# AI-GENERATED — please review.
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr "Lista server eD2k (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr "Inizializzazione della rete"
+
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "Caricamento dei file parziali"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Caricamento dei file parziali (%u di %u)"
+
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "Caricamento dei file condivisi"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "Caricamento dei file condivisi (%u)"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "Avvio in corso"
 
 # AI-GENERATED — please review.
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr "Nodi di bootstrap Kad (nodes.dat)"
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Bootstrap di rete"
 
 # AI-GENERATED — please review.
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
@@ -221,30 +411,59 @@
 "Selezionare quali scaricare:"
 
 # AI-GENERATED — please review.
-#: src/amule.cpp:797
-msgid "Network bootstrap"
-msgstr "Bootstrap di rete"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "Lista server eD2k (server.met)"
 
-#: src/amule.cpp:882
+# AI-GENERATED — please review.
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Nodi di bootstrap Kad (nodes.dat)"
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web server in esecuzione su pid %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "Hai scelto di lanciare il web server all'avvio, ma il programma amuleweb non può essere eseguito. Installa il pacchetto contenente aMule web server, oppure compila aMule dai sorgenti con -DBUILD_WEBSERVER=YES e installalo."
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "ERRORE"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr "Impossibile scrivere il token EC di amuleapi in %s; amuleapi userà la password configurata."
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr "amuleapi in esecuzione su pid %d"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Hai scelto di lanciare amuleapi all'avvio, ma il programma amuleapi non può essere eseguito. Installa il pacchetto contenente amuleapi, oppure compila aMule dai sorgenti con -DBUILD_AMULEAPI=YES e installalo."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr "Connessione esterna: impossibile mettersi in ascolto su '%s', in ascolto solo su 127.0.0.1."
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Impossibile aprire le porte sull'indirizzo specificato: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "La porta %u non è disponibile. Otterrai un ID basso\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -259,48 +478,48 @@
 "\n"
 "Controlla le impostazioni di rete e verifica che la porta sia aperta in ingresso e in uscita."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Impossibile creare il file per l'online signature"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Impossibile creare il file per l'online signature di aMule"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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à di impostarla in ogni caso)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "È la prima che volta che avvii aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Questa è una versione di prova, aggiornata quotidianamente, e\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "https://amule-org.github.io, o nel nostro canale IRC #aMule su irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Puoi segnalare qualsiasi bug su https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -308,513 +527,506 @@
 "La directory scelta per contenere il file dell'online signature non è valida!\n"
 "La firma verrà pertanto disabilitata fino a quando il problema non sarà stato risolto attraverso il pannello delle preferenze."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Nome host del server notificato"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr "Metadati multimediali: il file analizzato non è più noto, risultato scartato (%s)"
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Preallocazione dello spazio su disco per il file '%s' fallita: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "ERRORE: impossibile aprire il file di log"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "ERRORE: il file di log è vuoto. Qualcosa non va."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Il file di log è stato reimpostato"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Messaggio del server: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr "Download di %s saltato, perché il file richiesto non è il più recente."
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Impossibile scaricare la lista dei nodi."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Impossibile aprire il file scaricato per il controllo della versione"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Il file per il controllo della versione è corrotto"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Stai usando una versione non aggiornata di aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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"
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "L'ultima versione è sempre disponibile su https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr "ATTENZIONE: La tua versione di aMuled è obsoleta: %i.%i.%i < %li.%li.%li"
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "La tua copia di aMule è aggiornata."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Impossibile scaricare il file per il controllo della versione"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Utenti: %s | File: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Nessuna rete selezionata"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "con ID basso"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "con ID alto"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Connesso a %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connessione in corso a %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Disconnesso dalla rete eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad avviato."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad arrestato."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Connesso alla rete Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Connesso alla rete Kad (firewalled)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Disconnesso dalla rete Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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. Connessione non avviata."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Rete Kad disattivata dalle opzioni. Connessione interrotta."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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 https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - avvio del timer"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: forzato in background - arrivederci"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Impossibile creare il file Pid"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "ERRORE: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Questo è aMule %s basato su eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "In esecuzione su %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Visita https://github.com/amule-org/amule/releases/latest per controllare se è disponibile una nuova versione."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ERRORE FATALE: Creazione timer fallita"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Controllo remoto di aMule "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "Errore! Impossibile caricare le Preferenze"
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Reti"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Client p2p multipiattaforma basato su eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Ricerca"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Sito: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Download"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "File condivisi"
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Documentazione: https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Client"
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
-"Segnalazioni: https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Messaggi"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistiche"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Parte di aMule è basata su \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Preferenze"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: routing peer-to-peer basato su metrica XOR.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr "Naviga"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "Spazio libero: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Messaggio"
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "Nuova versione disponibile"
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"Una nuova versione di aMule (%s) è disponibile.\n"
+"\n"
+"Stai eseguendo %s.\n"
+"\n"
+"Vuoi aprire la pagina di download?"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "Finestra di aMule chiusa"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Connessione in corso"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Disconnesso"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Firewalled"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Connesso"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Connessione in corso"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Spento"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Annulla"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Ferma i tentativi di connessione in corso"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Disconnetti"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr "Core"
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versione"
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Disconnetti dalle reti a cui sei connesso"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr "Il core e aMuleGUI hanno versioni diverse."
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr "Il core e aMuleGUI hanno la stessa versione."
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Connetti"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Indirizzo"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Connetti alle reti attualmente abilitate"
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "Cifratura"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " MiB/s"
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " KiB/s"
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Up: %.1f%s | Down: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Connesso)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Disconnesso)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Vuoi veramente uscire da %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Chiedi conferma prima di uscire"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Comando di avvio: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- predefinita -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "La directory delle skin '%s' non esiste"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "ATTENZIONE: Impossibile aprire il file della skin '%s' in lettura"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Reti"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Finestra reti"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Ricerca"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Finestra ricerche"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Download"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Finestra dei Download"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "File condivisi"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Finestra file condivisi"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Messaggi"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr "Finestra client"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Finestra messaggi"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistiche"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Finestra grafici e statistiche"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Preferenze"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Finestra Preferenze"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importazione"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Strumento per l'importazione dei file parziali"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Informazioni"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Informazioni/Aiuto"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "rete eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Rete Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Nessuna rete"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Controllo remoto di aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "ERRORE FATALE: Creazione del timer principale fallita"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Connessione ad aMule remoto"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Connessione persa"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr "Interrompi ed esci"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "Riconnessione... (tentativo %d)"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr "Prossimo tentativo tra %d s..."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+"Connessione a %s persa.\n"
+"%s\n"
+"\n"
+"L'interfaccia è in pausa fino al ripristino della connessione."
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
-msgstr "ERRORE FATALE: Creazione del timer di interrogazione fallita"
+msgstr "Errore Fatale: Creazione del timer di interrogazione fallita"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Ciclo evento..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Connessione in corso..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr "Connessione non riuscita. Controlla host, porta e password."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Gestore eventi GUI EC remota"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "Connessione fallita. Impossibile connettersi a %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Qualcosa è andato storto"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Connessione persa - aMule verrà chiuso."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Tentativo di riconnessione scaduto; nuovo tentativo in corso."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
@@ -823,1060 +1035,1360 @@
 "Connessione scaduta. Impossibile raggiungere %s:%d entro il tempo previsto.\n"
 "Verificare l'host, la porta e che aMule sia in esecuzione con le connessioni esterne abilitate."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr "Connessione al core remoto persa. Tentativo di riconnessione..."
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Disabilitato"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr "Riconnesso al core remoto."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr "Il core remoto è stato riavviato; ricaricamento in corso."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Tentativo di riconnessione %d: connessione a %s:%d"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr "Impossibile avviare la riconnessione; nuovo tentativo a breve."
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Pronto"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Tutto"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr "non leggibile"
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr "non trovato"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr "Il core ha rifiutato queste cartelle condivise:%s"
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Collegamento non valido o già nella lista."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr "Il demone ha rifiutato la richiesta."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "Impossibile eliminare la categoria: %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 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/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr "Il core remoto ha inviato dati incoerenti per \"%s\" (stato della parte %d, atteso %d). La lista dei file potrebbe mostrare informazioni errate; riconnettiti per azzerarla."
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Impossibile ricevere i file condivisi dall'utente '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Ricerca amico per connessione con ID basso"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (falso eMule versione %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (falso eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (falso eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (basato su eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Nickname: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Richiesto: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Statistiche file per questa sessione: accettata %d di %d richiesta, %s trasferita\n"
 msgstr1 "Statistiche file per questa sessione: accettate %d di %d richieste, %s trasferite\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Statistiche file per tutte le sessioni: accettata %d di %d richiesta, %s trasferita\n"
 msgstr1 "Statistiche file per tutte le sessioni: accettate %d di %d richieste, %s trasferite\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Richiesto file sconosciuto"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Messaggio filtrato da '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nuovo messaggio da '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, 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 in una cartella inesistente '%s' -> richiesta ignorata"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Impossibile ricevere i file condivisi dall'utente '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "ATTENZIONE: %s non può essere aperto."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "ATTENZIONE: la lista dei file conosciuti è danneggiata, contiene un'intestazione non valida."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Errore I/O durante la lettura del file %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Errore durante il salvataggio del file %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Inserisci captcha"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Categoria"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nuova categoria"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Scegli una directory per i file scaricati"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Devi specificare un nome per la categoria!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Devi specificare un percorso per la categoria!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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. Specificare un percorso valido!"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Sessione di chat iniziata: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Connesso al client ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Connessione al client in corso ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Impossibile connettersi al client / Connessione persa ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 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/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Chat"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Chiudi scheda"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Chiudi tutte le schede"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Chiudi le altre schede"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Inserisci tra gli amici"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Mostra &dettagli"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Elimina dagli amici"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Crea slot amico"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Visualizza file"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Invia messaggio"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Invia messaggio all'utente"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Messaggio da inviare:"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Non puoi assegnare più di uno slot amico.\n"
+"Assegnato un solo slot."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Selezione multipla"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 "Aggiungere %u client alla lista amici?"
+msgstr1 "Aggiungere %u clients alla lista amici?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Eliminare %u client dalla lista amici?"
+msgstr1 "Eliminare %u clients dalla lista amici?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 "Impossibile aggiungere %u client selezionato alla lista amici: nessun indirizzo noto."
+msgstr1 "Impossibile aggiungere %u clients selezionati alla lista amici: nessun indirizzo noto."
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Richiedere i file condivisi di %u client?"
+msgstr1 "Richiedere i file condivisi di %u clients?"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr "Verrà aperta una connessione a ciascuno di essi."
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Il file dei crediti è stato caricato, %u client conosciuto"
 msgstr1 "Il file dei crediti è stato caricato, %u client conosciuti"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
-msgstr0 " - Crediti scaduti per %u client!"
-msgstr1 " - Crediti scaduti per %u client!"
+msgstr0 " - Crediti scaduti per %u utente!"
+msgstr1 " - Crediti scaduti per %u utenti!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Non è stato trovato il file 'cryptkey.dat', creazione del file in corso."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Dettagli client"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "ID basso"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "ID alto"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Supportato"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Non supportato"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Disabilitato"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Connesso"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Disconnesso"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f KiB/s"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nome"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "Software"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Indirizzo IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Origine"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr "Primo contatto"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr "Ultimo contatto"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "Sessioni"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Velocità upload"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Velocità download"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "Totale inviato"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "Totale scaricato"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Modificatore DL/UL"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr "Online adesso"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Non completo"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Cattivo"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Verificata - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/D"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Non disponibile"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "Impossibile richiedere i file condivisi a %u client selezionato."
+msgstr1 "Impossibile richiedere i file condivisi a %u clients selezionati."
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "File"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Inviato"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Scaricato"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "In download da"
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr "In upload verso"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Attivo"
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr "Conosciuti"
+
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "L'utente %s (%u) condivide la cartella '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, 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"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Commenti file"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Nome utente"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Nome file"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Giudizio"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Commento"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr "Impossibile avviare una ricerca Kad"
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Impossibile effettuare una ricerca sulla rete Kad senza esserci connessi"
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "Ricerca di commenti su Kad in corso..."
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Nessun commento"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u commento"
 msgstr1 "%u commenti"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 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:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Impossibile caricare i dati delle nazioni da '%s'."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Bassa"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Alta"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Molto bassa"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Bassa"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normale"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Alta"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Molto alta"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Release"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Richiesta in corso"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Connessione in corso attraverso il server"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Coda piena"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "In coda"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Download in corso"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Ricezione hashset in corso"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Nessuna parte utile"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Impossibile connettere un ID basso a un altro ID basso"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Troppe connessioni"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Connessione via Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Troppe connessioni Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Bannati"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Errore di connessione"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Coda remota piena"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Vecchio MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Nuovo MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "compatibile con eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Server locale"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Server remoto"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Scambio fonti"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passiva"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Collegamento"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Fonti salvate"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Risultato della ricerca"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Completati"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "In corso"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "ERRORE: Spazio su disco esaurito"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "ERRORE: Partmet non trovato"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ERRORE: Errore di input/output!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ERRORE: Fallito!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "In coda"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Download già in corso"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Formato del file temp sconosciuto o errato."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr "Questa cartella fa parte di una condivisione ricorsiva. Per rimuoverla, annulla la condivisione o modifica la radice della condivisione ricorsiva che la contiene."
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr "Impossibile annullare la condivisione all'interno di una condivisione ricorsiva"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr "Impossibile modificare all'interno di una condivisione ricorsiva"
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Parte"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Trasferiti"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Velocità"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Avanzamento"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Fonti"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Priorità"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Stato"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Tempo rimanente"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Ultima fonte completa vista"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Ultima ricezione"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Sei certo di voler eliminare il file selezionato?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Sei certo di volere eliminare i file selezionati?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Feedback da: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Auto"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "Fer&ma"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Continua"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "&Rimuovi file completati"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Sposta ogni A4AF su questo file"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Sposta ogni A4AF su questo file (Auto)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Sposta ogni A4AF sugli altri file"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Opzioni avanzate"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Anteprima"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "Mostra nel file manager"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Mostra &dettagli file"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Mostra tutti i commenti"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Copia URI magnet negli appunti"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Copia il &link eD2k negli appunti"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Copia feedback negli appunti"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Ottieni %s per questo file"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "rimuovi"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Assegna a categoria"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Apri file"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Sei certo di voler eliminare il file selezionato?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Sei certo di volere eliminare i file selezionati?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Feedback da: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Inserisci un nuovo nome per questo file:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Rinomina file"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
+msgid "%.1f MiB/s"
+msgstr "%.1f MiB/s"
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Download (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr "il gestore di shell predefinito di Windows"
-
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Per prevenire questo avviso ad ogni anteprima, \n"
-"seleziona nelle preferenze il tuo lettore video preferito (di default è %s)."
+msgid "Total queue size: %s"
+msgstr "Dimensione totale coda: %s"
 
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Anteprima"
-
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ERRORE: Impossibile eseguire il lettore multimediale esterno! Comando: `%s'"
-
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Salvataggio file parziale %u di %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Tutti i file parziali sono stati salvati."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Caricamento dei file parziali da: %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Caricamento del file parziale %u su %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "ERRORE: Impossibile caricare il file di backup. Cerca su https://github.com/amule-org/amule/discussions come recuperare i file .part.met."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Tutti i file parziali sono stati caricati."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Non è stato trovato alcun file parziale"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Trovato %u file parziale"
 msgstr1 "Trovati %u file parziali"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Il filesystem della cartella Temp non supporta file di grandi dimensioni."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Il filesytem della cartella Incoming non supporta file di grandi dimensioni."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Download di %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Stai già cercando di scaricare il file '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Hai già il file '%s' (richiesto come '%s')"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Hai già il file '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Stai già cercando di scaricare il file %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Non posso convertire il magnet link in eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Protocollo del link %s sconosciuto"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 "Impossibile aggiungere %u collegamento (vedere il log per i dettagli)."
 msgstr1 "Impossibile aggiungere %u collegamenti (vedere il log per i dettagli)."
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Collegamento eD2k non valido! ERRORE: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Il client ha inviato un pacchetto dopo che l'autenticazione era fallita."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Connessione esterna chiusa."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Connessioni esterne disabilitate perché la password è vuota!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Connessioni esterne disabilitate nel file di configurazione"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Accettata nuova connessione esterna"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERRORE: impossibile accettare una nuova connessione esterna"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Connessione esterna rifiutata perché la password nelle preferenze è vuota!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Connessione al client: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Versione sconosciuta"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 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. Usare core e client remoto dello stesso snapshot."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "Non puoi connetterti a una versione stabile da una versione CVS qualsiasi! *fiuu!* possibile crash evitato"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Versione protocollo non valida."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Tag versione protocollo mancante."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Troppi tentativi di connessione falliti; riprova tra %d secondi."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Autenticazione fallita: l'hash specificato come password EC non è valido."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr "Autenticazione fallita: il client ha offerto una connessione esterna cifrata ma non ha inviato una chiave utilizzabile."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr "Autenticazione fallita: questo aMule richiede una connessione esterna cifrata e il client non l'ha negoziata."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr "Autenticazione fallita: il client non è riuscito a confermare la sessione cifrata."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Autenticazione fallita: password errata."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Autenticazione fallita: devi inserire la password."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Richiesta non valida, prima devi autenticarti."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Accesso consentito."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Invia il messaggio di errore \"%s\" al client."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Tentativo di accesso non autorizzato da %s. Connessione terminata."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Hash del file non trovato: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! errore nel processare l'opcode!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Server non aggiunto"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "server non trovato: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "è necessario definire il server da rimuovere"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k è disabilitato nelle preferenze."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr "Nessun indirizzo ancora noto per quell'amico."
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr "Amico non trovato."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr "Client non trovato."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr "EC_TAG_FRIEND_SHARED richiede EC_TAG_FRIEND o EC_TAG_CLIENT."
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Ricerca in corso. Risultati in arrivo!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Non ha senso usare la ricerca Web da interfaccia remota."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr "La visualizzazione dei file di un utente non è una ricerca che può essere avviata."
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Ricerca in corso. Risultati in arrivo!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Niente punti per il grafico."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Il tuo client non è configurato per questo livello di dettaglio."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Connessione esterna: arresto richiesto"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Sto già uscendo."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: aggiungo il collegamento '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "%d di %d collegamenti non riusciti (non validi o già in elenco)."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr "Controllo versione soggetto a limite di frequenza; riprova a breve."
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr "Il controllo versione non è disponibile su questo demone."
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "File non trovato."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Nome file non valido."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Impossibile rinominare il file."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr "Non è stato possibile spostare il client su quel file."
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr "Impossibile salvare la password di amuleapi: %s"
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "Categoria inesistente."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr "Richiesta di categoria non valida."
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr "La categoria predefinita non può essere eliminata."
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "ID sessione di chat mancante"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "Sessione di chat inesistente"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "L'estrazione dei metadati multimediali è disabilitata nelle preferenze"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr "Il file non è idoneo all'estrazione dei metadati multimediali (non è un file audio/video, oppure è un download incompleto)"
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "Messaggio di chat vuoto"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "Destinatario della chat sconosciuto"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "La rete Kad è disabilitata nelle Preferenze."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Già connesso ad eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Connessione alla rete eD2k in corso..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Già connesso alla rete Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Connessione alla rete Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Tutte le reti sono disabilitate."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Disconnesso dalla rete eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Disconnesso dalla rete Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Connessione esterna: ricevuto un opcode invalido: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Opcode non valido (versione errata del protocollo?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Estensione '%s' sconosciuta per il comando '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Comando sconosciuto '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1884,7 +2396,7 @@
 "\n"
 "Questo comando non può avere un argomento.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1892,7 +2404,7 @@
 "\n"
 "Questo comando richiede un argomento.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1900,7 +2412,7 @@
 "\n"
 "Questo comando è incompleto, devi usare una delle estensioni qui riportate.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1908,11 +2420,11 @@
 "\n"
 "Estensioni disponibili:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Comandi disponibili:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1923,17 +2435,17 @@
 "Tutti i comandi possono essere digitati in maiuscolo o minuscolo.\n"
 "Digitare '%s <comando>' per avere informazioni dettagliate su <comando>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Esce dall'applicazione."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Mostra aiuto."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1941,7 +2453,7 @@
 "Per avere aiuto su un comando, digitare 'help <comando>'.\n"
 "Per avere la lista completa dei comandi, digitare 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1952,46 +2464,46 @@
 "Usa '%s' per la lista dei comandi\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Errore di sintassi!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Questo comando non deve avere parametri."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Questo comando richiede un parametro."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Argomento non valido."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Questo comando è incompleto."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Digita '%s' per avere altro aiuto.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Questo è %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Questo è %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1999,7 +2511,7 @@
 "\n"
 "Creazione del client in corso...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2008,7 +2520,7 @@
 "\n"
 "Ok, uscita in corso da %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2022,118 +2534,370 @@
 "\n"
 "Sto uscendo...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Mostra questo suggerimento."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Host su cui aMule è in esecuzione (default: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Porta di aMule per connessioni esterne (default: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Password connessioni esterne."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Leggi la configurazione da file."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Non stampare output sullo stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Verboso - mostra anche i messaggi di debug."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Impostazioni locali (lingua) del programma."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Salva le opzioni linea di comando nel file di configurazione."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Crea un file di configurazione basato su quello di aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Mostra la versione del programma."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr "Non cifrare la sessione di connessione esterna. La cifratura è attiva per impostazione predefinita ogni volta che l'aMule remoto la supporta; disattivarla lascia tutto ciò che segue il login leggibile e modificabile da chiunque si trovi lungo il percorso."
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr "Forza la compressione ZLIB indipendentemente dalla località dell'IP contattato (utile quando il server è raggiungibile tramite un tunnel VPN che risolve a un IP locale)."
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr "Accoda una copia di tutto l'output della console a questo file di log (default: <config-dir>/amuleapi.log)."
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr "Non scrivere alcun file di log; stampa solo sulla console."
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Dettagli file"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% completato"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Anteprima"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "ERRORE: Impossibile eseguire il lettore multimediale esterno! Comando: '%s'"
+
+#: src/FileLaunch.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid "The configured video player was not found: %s"
+msgstr "Il lettore video configurato non è stato trovato: %s"
 
-#: src/FriendList.cpp:123
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr "Impossibile aprire '%s': il file non è presente su questo computer."
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr "Per visualizzare in anteprima un download non completato è necessario un lettore video: il file parzialmente scaricato non ha un formato che il sistema possa aprire automaticamente. È possibile impostarne uno in Preferenze -> Generali."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr "ERRORE: Impossibile aprire '%s' con l'applicazione predefinita."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ERRORE: impossibile visualizzare '%s' nel file manager."
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "Mobile / 4G-5G (20 / 5 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL (24 / 1 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL (50 / 10 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Via cavo (200 / 20 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Fibra 300 (300 / 100 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "Fibra Gigabit (1000 / 1000 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr "Configurazione iniziale di aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "Benvenuto in aMule!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+"Questa breve configurazione ti permetterà di connetterti. Puoi modificare\n"
+"queste impostazioni in seguito nelle Preferenze."
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "Scegli un nickname che gli altri utenti vedranno:"
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr "Connessione e banda"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+"Scegli l'opzione che corrisponde meglio alla tua connessione Internet,\n"
+"oppure imposta direttamente qui sotto i limiti di upload e download."
+
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "Velocità di connessione:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr "Altro / imposta manualmente"
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "Limite di upload (KiB/s, 0 = illimitato):"
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "Limite di download (KiB/s, 0 = illimitato):"
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "Reti e porte"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr "aMule può usare due reti. Consigliamo di tenerle entrambe abilitate."
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Porta TCP standard "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Porta UDP estesa (Kad / ricerca globale) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Abilita UPnP per il port forwarding del router"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+"Permette ad aMule di chiedere al router di inoltrare le porte qui sopra così che\n"
+"gli altri utenti possano raggiungerti (un \"ID alto\"). Disattivalo se il router\n"
+"non supporta UPnP o se inoltri le porte manualmente."
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr "File di bootstrap"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+"Per iniziare, aMule ha bisogno di conoscere alcuni peer.\n"
+"Seleziona quali liste scaricare ora:"
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Le tue liste di peer sono già presenti - niente da scaricare."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Aggiorna lista server all'avvio"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr "Integrazioni (opzionale)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+"Scegli come aMule si integra con il tuo sistema. Puoi\n"
+"modificare queste opzioni in seguito nelle Preferenze."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "Avvia aMule automaticamente all'accesso"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr "Registra aMule per i link ed2k://"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr "Registra aMule per i magnet: link"
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr "Solo magnet compatibili con eD2k. Lascia disattivato se usi un client BitTorrent."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr "Apri i file .emulecollection con aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr "Cartelle (opzionale)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+"I valori predefiniti vanno bene per la maggior parte degli utenti. Modificali se\n"
+"vuoi salvare i download su un disco diverso (ad es. più capiente)."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Cartella di destinazione per i file scaricati"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Sfoglia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Tutti i file in questa cartella sono condivisi con gli altri peer)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Cartella per i file temporanei"
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+"In base a ciò, aMule consentirà fino a %i fonti per file\n"
+"e %i connessioni client."
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr "Mostrare di nuovo questa procedura guidata al prossimo avvio di aMule?"
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr "Configurazione non completata"
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Impossibile aprire in lettura il file della lista degli amici 'emfriend.met'!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Impossibile aprire in scrittura il file della lista degli amici 'emfriend.met'!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr "Nessun indirizzo ancora noto per l'amico '%s', impossibile visualizzarne i file."
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "CRITICO - nessun client in StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Amici"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Mostra &dettagli"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Aggiungi amico"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Rimuovi amico"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Invia &messaggio"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Visualizza file"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Crea slot amico"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr "Nessun indirizzo ancora noto per l'amico '%s', impossibile inviargli un messaggio."
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Sei sicuro di voler cancellare l'amico selezionato?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Sei sicuro di voler cancellare gli amici selezionati?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2141,1506 +2905,1815 @@
 "Non puoi assegnare più di uno slot amico.\n"
 "Assegnato un solo slot."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Selezione multipla"
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Non puoi assegnare più di uno slot amico.\n"
-"Assegnato un solo slot."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Invia messaggio all'utente"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Messaggio da inviare:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Elimina dagli amici"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Invia messaggio"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Sposta su questo file"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr "Legenda colori"
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "In coda: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Altro file richiesto"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "In attesa di slot d'invio"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "In coda: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Caricamento"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Nessuno"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "No"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Sì"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Impossibile aprire il database MaxMindDB '%s': %s"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Scaricamento in corso..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "Download HTTP cancellato"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "L'URL per scaricare non può essere vuoto"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Impossibile creare la richiesta HTTP per %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr "Download HTTP: corpo della risposta vuoto per %s"
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Impossibile spostare il file scaricato in %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Scaricato %s (%llu byte)"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr "L'URL %s ha restituito: %i"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Download HTTP fallito per %s: %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr "HTTP 401 Non autorizzato per %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr "Migrato il file GeoLite2-Country.mmdb esistente in %s"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr "IP2Country: MaxMind selezionato come sorgente GeoIP ma nessuna License Key configurata. Apri Preferenze → IP2Country, incolla la tua License Key MaxMind gratuita e clicca su 'Aggiorna ora'."
-
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr "IP2Country: URL personalizzato selezionato come sorgente GeoIP ma nessun URL configurato. Apri Preferenze → IP2Country e fornisci un URL che punti a un .mmdb (o un .gz / .tar.gz che ne contenga uno)."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr "%s non è un file MaxMindDB leggibile: verrà scartato. Una nuova copia sarà scaricata al prossimo avvio, oppure subito da Preferenze -> IP2Country -> 'Aggiorna ora'."
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "IP2Country: MaxMind selezionato come sorgente GeoIP ma nessuna License Key configurata. Apri Preferenze -> IP2Country, incolla la tua License Key MaxMind gratuita e clicca su 'Aggiorna ora'."
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "IP2Country: URL personalizzato selezionato come sorgente GeoIP ma nessun URL configurato. Apri Preferenze -> IP2Country e fornisci un URL che punti a un .mmdb (o un .gz / .tar.gz che ne contenga uno)."
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr "IP2Country: impossibile risolvere un URL di scaricamento GeoIP."
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr "Scaricamento in corso di nuovo %s da %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "Scaricamento del file %s fallito, interruzione aggiornamento."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Impossibile rimuovere %s file, interruzione aggiornamento."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Impossibile rinominare %s file, interruzione aggiornamento."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "%s aggiornato con successo"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr "Errore durante l'aggiornamento di %s"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr "Scaricamento DB-IP fallito per il mese corrente - nuovo tentativo con l'URL del mese precedente."
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Impossibile scaricare %s da %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Impossibile caricare i dati delle nazioni da '%s'."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Caricamento filtri IP da 'ipfilter.dat' e 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Impossibile caricare il file ipfilter.dat '%s', trovato formato sconosciuto."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "Caricato %u intervallo di IP da '%s'."
 msgstr1 "Caricati %u intervalli di IP da '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u riga non valida è stata scartata."
 msgstr1 "%u righe non valide sono state scartate."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Impossibile rinominare il nuovo file %s, interruzione aggiornamento."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "Filtro IP pronto"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap dai\n"
-"client noti"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Corrente"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Media attuale"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Media sessione"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Nodi (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "IP non valido per il bootstrap"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Porta non valida per il bootstrap"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Completa tutti i campi obbligatori"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Messaggio"
+
+#: src/KadDlg.cpp
 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/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Così facendo, rimuoverai i nodi attuali e riavvierai la connessione Kademlia."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Continuare?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: chiave di ricerca troppo corta"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: la chiave di ricerca è già nella lista: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Impossibile leggere il file nodes.dat - versione troppo vecchia. Questa versione (0) non è più supportata."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Letto %u contatto Kad"
 msgstr1 "Letti %u contatti Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Nessun contatto trovato: fai un bootstrap oppure scarica un file nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Solo %d contatto Kad disponibile, file nodes.dat non scritto"
 msgstr1 "Ci sono solo %d contatti Kad disponibili, file nodes.dat non scritto"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Scritto %d contatto Kad"
 msgstr1 "Scritti %d contatti Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Utente Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr "Ricerca note Kad per '%s' non avviata: Kad non è connesso"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr "Ricerca note Kad per '%s' non avviata: una ricerca note è già in corso per questo file"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr "Ricerca note Kad per '%s' non avviata: il file non è nella lista dei condivisi, nella coda di download né nei risultati di ricerca"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr "Ricerca note Kad per '%s' non avviata: un'altra ricerca Kad (es. una ricerca di fonti) sta già usando l'hash di questo file - riprovare tra poco"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr "Ricerca note Kad per '%s' non avviata: PrepareLookup non riuscito"
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Nome file"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Dimensione file"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Rapporto di condivisione"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Inviato"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Richiesto"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Accettato"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Fonti complete"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "ATTENZIONE: la lista dei file conosciuti potrebbe essere danneggiata, contiene un'intestazione non valida."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Impossibile caricare la voce nella lista dei file conosciuti, il file potrebbe essere corrotto"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Voce non valida nella lista dei file conosciuti, il file potrebbe essere corrotto: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Predefinita di sistema"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanese"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabo"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturiano"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Basco"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgaro"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Catalano"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Cinese (semplificato)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Cinese (tradizionale)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Croato"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Ceco"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Danese"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Olandese"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Inglese (Regno Unito)"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "Inglese (U.S.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estone"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finlandese"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francese"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galiziano"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Tedesco"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Greco"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Ebraico"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Ungherese"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italiano"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Giapponese"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Coreano"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "Lettone"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvegese (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polacco"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portoghese"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portoghese (Brasile)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Romeno"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Russo"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Sloveno"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Spagnolo"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Svedese"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turco"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ucraino"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Errore sconosciuto %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Impossibile avere una descrizione dell'errore %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Hashing in corso"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "In completamento"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Completo"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "In pausa"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Errato"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "In attesa"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Devi specificare una password non vuota."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Password non valida, non è un hash MD5!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr "Impossibile risolvere %s in un indirizzo IPv4."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Connessione fallita"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
-msgstr "Connessione esterna persa — uscita in corso."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
+msgstr "Connessione esterna persa - uscita in corso."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "Connessione EC fallita. Risposta vuota."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr "Impossibile configurare la cifratura della connessione. Connessione terminata."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr "Il core non ha negoziato una connessione cifrata. Potrebbe essere una versione di aMule più vecchia, priva del supporto alla cifratura, oppure la connessione potrebbe essere stata manomessa. Per connetterti senza cifratura, disattivala nelle impostazioni di connessione."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Connessione esterna: risposta errata dal server. Connessione terminata."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Connessione esterna: il demone non è riuscito a dimostrare di conoscere la password. Connessione terminata."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Fatto! Connessione stabilita con aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Fatto! Connessione stabilita."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Connessione esterna: accesso negato a causa di: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Connessione esterna: errore di negoziazione."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr "Errore durante la creazione del socket UDP %s %d : %s"
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Thread %d asincrono avviato"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "ERRORE: Impossibile mettersi in ascolto sulla porta TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "ERRORE: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "ATTENZIONE: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr "Metadati multimediali: nessun eseguibile ffprobe trovato. Installa ffmpeg oppure imposta il percorso di ffprobe nelle preferenze; durata, bitrate e codec non verranno estratti."
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr "Metadati multimediali: %s non esiste più, nulla da estrarre"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr "Estrazione dei metadati multimediali con ffprobe: %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr "Metadati multimediali: ffprobe è scaduto o è stato annullato per %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr "Metadati multimediali: output di ffprobe di dimensioni implausibili per %s, ignorato"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr "Metadati multimediali: impossibile eseguire ffprobe (%s) -- controlla le impostazioni dei metadati multimediali"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr "Metadati multimediali: ffprobe non riuscito (codice %d) per %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr "Metadati multimediali: ffprobe non ha trovato nulla di utilizzabile in %s"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 "Estrazione dei metadati multimediali completata da %u file condiviso (%u non riusciti)"
+msgstr1 "Estrazione dei metadati multimediali completata da %u file condivisi (%u non riusciti)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 "Estrazione dei metadati multimediali completata da %u file condiviso"
+msgstr1 "Estrazione dei metadati multimediali completata da %u file condivisi"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 "Estrazione dei metadati multimediali non riuscita per %u altro file (non elencato singolarmente)"
+msgstr1 "Estrazione dei metadati multimediali non riuscita per altri %u file (non elencati singolarmente)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 "%u altro file condiviso non esiste più (non elencato singolarmente)"
+msgstr1 "Altri %u file condivisi non esistono più (non elencati singolarmente)"
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Copia"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Incolla"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Seleziona tutto"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "KiB/s"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Illimitato"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Mostra aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Nascondi aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr "Connesso (LowID)"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr "Connesso (HighID)"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr "Connesso (firewalled)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr "Server: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr "IP server: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Non connesso"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Porta TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Porta TCP: Non disponibile"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Porta UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Porta UDP: Non disponibile"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Informazioni client"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Limite di invio"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Limite di scaricamento"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Mostra aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Disconnetti"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Nascondi aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Connetti"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Esci"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Illimitato"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Menu di aMule nella barra di sistema"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Limiti velocità:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "UL: nessuno"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "UL: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DL: nessuno"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DL: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Velocità di scaricamento: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Velocità d'invio: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Nickname: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Nessun nickname selezionato!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID client: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Nome server: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP server: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Non connesso"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online Signature: abilitata"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online Signature: disabilitata"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Uptime: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "File condivisi: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Client in attesa: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "DL totale: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "UL totale: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Link eD2k: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr "Creato %s sulla porta %u"
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Invia"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr "ATTENZIONE! %s: Pacchetto verso %s scartato a causa di un errore (%s) durante l'invio."
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr "Incolla qui un link eD2k o un magnet link"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "Aggiungi collegamenti"
+
+#: src/muuli_wdr.cpp
 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 ai download."
 
-#: src/muuli_wdr.cpp:109
-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."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr "Gli eventi sono visualizzati qui. Per la lista completa, controllare il log nella scheda delle Reti."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Caricamento in corso..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Utenti: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 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:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Up: 0.0 | Down: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "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:139
+#: src/muuli_wdr.cpp
 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 lo stato attuale di connessione e i trasferimenti attivi. Le frecce rosse indicano che attualmente non sei connesso, le frecce gialle indicano 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Non connesso..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Server attualmente connesso."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Cerca"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nome:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tipo"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Locale"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Globale"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Parametri avanzati"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtraggio"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Tipo file"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Qualsiasi"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Archivi"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "Immagini CD"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr "Immagini disco"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Immagini"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programmi"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Testi"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Video"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Estensione"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Dimensione minima"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Byte"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "KiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "MiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "GiB"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Dimensione massima"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Disponibilità"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtro:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filtra risultati"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtro"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Inverti risultati"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Nascondi file conosciuti"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr "Reimposta i filtri"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Cerca"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Ancora"
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "Estendi"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr "Chiedi ai peer Kad che hanno già risposto di ampliare la ricerca. Ogni clic interroga il peer più vicino successivo per ottenere altri contatti (KADEMLIA_FIND_VALUE_MORE), facendo emergere ulteriori corrispondenze di file che la frontiera alfa iniziale della ricerca non ha rilevato."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Ferma"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Download"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Download nella categoria"
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "Cancella Risultati Ricerca"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Azzera campi"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Risultati"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Rimuovi download completati"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Fonti del file:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Generale"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Nome completo:"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/D"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Nome completo"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "file met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "file met:"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash:"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Dimensione file:"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Stato file part:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Ultima volta visto completo:"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Dimensione file"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Trasferimento"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Fonti trovate:"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Fonti in trasferimento:"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Numero parti:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Disponibili:"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Velocità:"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Download Active Time: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Trasferiti:"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Completati:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Stato file part"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Ultima volta visto completo"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Fonti trovate"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Fonti in trasferimento"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Numero parti"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Disponibili"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Velocità"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Tempo Attivo Download"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Completati"
+
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
-msgstr "Intelligent Corruption Handling"
+msgstr "Gestione intelligente della Corruzione"
+
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Perdita per corruzione"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Perdita per corruzione:"
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Guadagno per compressione"
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Guadagno per compressione:"
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Pacchetti recuperati da I.C.H."
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Pacchetti recuperati da ICH:"
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr "Condivisione"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Richieste"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Richieste accettate"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Dati trasferiti"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Rapporto condivisione"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Fonti complete"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "Condiviso dal"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "Ultimo upload"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr "Media Info"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "Durata"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "Bitrate"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "Codec"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "Artista"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "Album"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Titolo"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Nomi file"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Sovrascrivi"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Pulisci"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Applica"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Commenta/giudica il file (il testo sarà visibile a tutti gli utenti)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
-"In un film puoi specificare ad esempio durata, trama, lingua... \n"
-"e se è fake, puoi avvisare gli altri utenti di aMule, in modo che NON LO SCARICHINO."
+"Per un film puoi specificare ad esempio la durata, la trama, la lingua...\n"
+"e se è fake, puoi notificarlo agli altri utenti di aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Qualità file"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Senza voto"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Non valido / Corrotto / Falso"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Mediocre"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Discreto"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Buono"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Eccellente"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "Ottieni da Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Download in corso, attendere prego..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Dimensione sconosciuta"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Informazioni richieste"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Indirizzo IP:"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Porta:"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Porta"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Informazioni aggiuntive"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Nome utente:"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Hash utente:"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Hash utente"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
-msgstr "Velocità download"
-
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Corrente"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Media attuale"
+msgstr "Velocità-Download"
 
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Media sessione"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Velocità upload"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Connessioni"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Download attivi"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Connessioni attive (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Upload attivi"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Albero statistiche"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Nome utente:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Hash utente:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Software client:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Versione client:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Software client"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Versione client"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID utente"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP server"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Indirizzo IP:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Nome server"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID utente:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP server:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Nome server:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Offuscamento:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Offuscamento"
+
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr "Estensioni del protocollo"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Trasferimenti al client"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Richiesta attuale:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Velocità media upload:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Velocità media download:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Inviati nella sessione:"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Scaricati nella sessione:"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Inviati in totale:"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Scaricati in totale:"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Richiesta attuale"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Velocità media upload"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Velocità media download"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Inviati nella sessione"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Scaricati nella sessione"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Inviati in totale"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Scaricati in totale"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Punteggi"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modificatore DL/UL:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Identificazione sicura:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Punteggio in coda:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Punteggio in coda:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Identificazione sicura"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Punteggio in coda"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Punteggio in coda"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Nick"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - il Mulo multipiattaforma"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Lingua: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Intervallo prima che vengano mostrati i suggerimenti."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Scelta della lingua utilizzata."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Verifica la disponibilità di nuove versioni all'avvio"
-
-#: src/muuli_wdr.cpp:1218
-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
+msgid "Periodically check for a new version"
+msgstr "Controlla periodicamente la disponibilità di una nuova versione"
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr "Abilitare questa opzione farà sì che aMule verifichi la disponibilità di nuove versioni all'avvio e una volta al giorno durante l'esecuzione"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
-msgstr "Avvia aMule automaticamente all'accesso"
-
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr "Registra una voce di avvio automatico per l'utente nel sistema operativo affinché aMule venga avviato all'accesso. Se sposti l'eseguibile di aMule, avvialo manualmente una volta per aggiornare la voce."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr "Imposta aMule come gestore predefinito per i link ed2k://, cliccandone uno nel browser o nel file manager verrà aperto qui."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr "aMule gestisce solo i magnet compatibili con eD2k (che contengono xt=urn:ed2k:). I magnet BitTorrent NON sono supportati e cliccandoli non succederà nulla. Se usi un client BitTorrent (Transmission, qBittorrent, ecc.), lascia questa opzione disattivata."
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr "L'apertura di una collezione mette in coda ogni link eD2k che contiene. Su Windows aggiunge aMule all'elenco \"Apri con\" e diventa il programma predefinito solo se nessun altro programma ha già associato questo tipo di file."
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Avvia ridotto ad icona"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Abilitando questa opzione, aMule si minimizzerà automaticamente all'avvio."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Chiedi conferma prima di uscire"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Fa in modo che aMule chieda conferma prima di uscire."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Abilita icona nella barra"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Abilita o disabilita l'icona nella barra di sistema o nella barra delle applicazioni."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Nascondi la finestra quando viene premuto il pulsante di chiusura"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
-msgstr "Icona nella barra di sistema"
+msgstr "Minimizza nella barra di sistema"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Abilitando questa opzione aMule verrà minimizzato nella barra di sistema invece che nella barra delle applicazioni."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "Mostra notifica al termine dello scaricamento"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "Con questa funzione abilitata aMule mostrerà una notifica al termine di ogni download."
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr "Ricorda la cronologia delle ricerche"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr "Mantiene un elenco a discesa dei termini di ricerca usati in precedenza nel campo Nome della scheda Ricerca. Ricorda le ricerche digitate, non i risultati ottenuti."
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Ritardo dei suggerimenti: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "secondi"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Selezione browser"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Inserisci qui il nome del tuo browser. Lascia vuoto questo campo per utilizzare il browser di sistema predefinito."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Sfoglia"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Apri in una nuova scheda se possibile"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Riproduttore video"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Limiti di banda"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Allocazione slot"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Porte"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Porta TCP standard "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Questa è la porta standard di eD2k e non può essere disabilitata."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Porta UDP per le richieste al server (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Porta UDP estesa (Kad / ricerca globale) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Questa porta UDP è utilizzata per le richieste estese eD2k e per la rete Kad"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Abilita UPnP per il port forwarding del router"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "Porta TCP per UPnP (Facoltativa):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Lega l'indirizzo locale all'IP (lascia vuoto per qualsiasi):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr "Associa all'interfaccia di rete (vuoto per qualsiasi):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr "Solo per utenti esperti: forza tutto il traffico di aMule su un'unica interfaccia di rete, scelta dall'elenco oppure digitata per nome (ad es. tun0, eth0, en0) o indice. A differenza dell'associazione a un IP, questo impedisce al traffico di fuoriuscire tramite la route predefinita - utile con una VPN. Non richiede privilegi elevati."
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Fonti massime per file in scaricamento:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Connessioni massime simultanee:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Connetti automaticamente all'avvio"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Riconnetti dopo perdita connessione"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Rimuovi server inattivi dopo"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr "I server statici non vengono mai rimossi, nemmeno quando risultano irraggiungibili."
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "tentativi"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Aggiorna lista server all'avvio"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Aggiorna la lista server quando ti connetti ad un server"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Aggiorna la lista server quando ti connetti ad un client"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Usa sistema di priorità"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Usa controllo intelligente ID basso in fase di connessione"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Connessione sicura"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Connetti automaticamente solo ai server statici"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Assegna priorità alta ai server aggiunti manualmente"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Trattamento intelligente delle corruzioni (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Abilita"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Aggiungi i nuovi file da scaricare mettendoli in pausa"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Aggiungi i nuovi file da scaricare con priorità automatica"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 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:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr "Modalità endgame: passa a fonti più veloci per gli ultimi blocchi"
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Quando un file viene completato inizia a scaricare il primo file in pausa"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Della stessa categoria"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "In ordine alfabetico"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Prealloca lo spazio su disco per i nuovi file"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Per i nuovi file prealloca lo spazio su disco per l'intero file, in questo modo ridurrai la frammentazione"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr "Crea i nuovi file come file sparsi"
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr "I file .part sparsi occupano spazio su disco solo per le parti già scaricate, quindi lo spazio libero viene consumato gradualmente man mano che il file si completa. Disattiva questa opzione per usare un file normale: utile dove i file sparsi non sono supportati o sono lenti, o dove gli strumenti di backup/deduplicazione li gestiscono male. Si applica solo quando il core gira su Windows; su Linux e macOS i file .part sono comunque sparsi e questa impostazione non ha effetto."
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Interrompi i download quando termina lo spazio su disco "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr "Seleziona se vuoi che aMule controlli il tuo spazio su disco"
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Inserire lo spazio disco minimo desiderato."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Salva 10 fonti per i file rari ( con < 20 fonti)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Assegna priorità automatica ai nuovi file condivisi"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Cartella di destinazione per i file scaricati"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Trattamento intelligente delle corruzioni (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Abilita"
+
+#: src/muuli_wdr.cpp
+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 src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr "Estrazione dei metadati multimediali"
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "Estrai durata / bitrate / codec dai file audio e video condivisi"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr "Quando abilitato, aMule esegue ffprobe su ogni file multimediale condiviso per compilare le colonne Durata / Bitrate / Codec che gli altri client vedono quando trovano il file in una ricerca. Richiede l'installazione di ffmpeg (il binario ffprobe)."
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr "Percorso di ffprobe:"
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr "Percorso completo del binario ffprobe. Lascia vuoto per far sì che aMule lo rilevi automaticamente all'avvio."
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr "Rileva"
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr "Cerca nei percorsi di installazione standard un binario ffprobe e compila il campo del percorso."
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
@@ -3648,599 +4721,691 @@
 "Qui vengono salvati i download completati. Tutti i file in questa cartella sono condivisi automaticamente con gli altri peer.\n"
 "Se questa cartella contiene anche file che non vuoi condividere, impostala su una sottocartella riservata ad aMule."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr "Scegli la cartella in cui salvare i download completati. Tutti i file in quella cartella saranno condivisi con gli altri peer."
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr "(Tutti i file in questa cartella sono condivisi con gli altri peer)"
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Cartella per i file temporanei"
-
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "Cartelle condivise"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr "(Cartelle condivise dal core. Inserisci un percorso per aggiungerne una.)"
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr "Percorso assoluto di una cartella sulla macchina del core, ad es. /home/user/shared"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr "Ricorsivo"
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr "Condividi tutte le sottocartelle contenute in questa, comprese quelle create in seguito."
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(fai click con il tasto destro sulle icone per condividere ricorsivamente le sottodirectory)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Condividi file nascosti"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr "Ricontrolla automaticamente le modifiche nelle cartelle condivise"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr "Segui i collegamenti simbolici nelle cartelle condivise"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr "Escludi i file corrispondenti a:"
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr "Modelli con caratteri jolly separati da '|', ad es. .DS_Store|Thumbs.db|*.tmp. I file il cui nome corrisponde non vengono condivisi. La corrispondenza non distingue tra maiuscole e minuscole."
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr "I pattern sono espressioni regolari"
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr "Se attivato, l'intero campo è un'unica espressione regolare ('|' indica l'alternanza). Se disattivato, è un elenco di caratteri jolly separati da '|'."
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr "Mostra quanti file condivisi verrebbero esclusi dal pattern attuale."
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr "Quando i file del core connesso si trovano su un'altra macchina, associa un prefisso di percorso riportato dal core alla posizione in cui quel filesystem è raggiungibile da qui (ad esempio una condivisione di rete), in modo che \"Apri\" e \"Mostra nel file manager\" funzionino."
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr "Mappatura dei percorsi"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr "Prefisso remoto"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr "Un prefisso di percorso così come lo riporta il core, ad es. /home/user/downloads/incoming"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr "Prefisso locale"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr "Dove quella stessa cartella è raggiungibile da questo computer, ad es. una condivisione di rete montata"
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafici"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Intervallo di aggiornamento: 5 secondi"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Intervallo grafico valori medi: 100 minuti"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Scala grafico connessioni: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Scala grafico di scaricamento:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Scala grafico d'invio:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Colori: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Sfondo"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Griglia"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Download attuale"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Media download in corso"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Media sessione di download"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Upload attuale"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Media upload in corso"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Media sessione di upload"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Connessioni attive"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr "Barra della velocità nell'icona sulla barra di sistema"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Nodi Kad attuali"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Nodi Kad attivi"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Nodi Kad nella sessione"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Albero"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Numero di versioni di client visualizzate (0=illimitate)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! ATTENZIONE !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Numero massimo nuove connessioni / 5 secondi"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr "Ricerche di fonti Kad simultanee"
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr "Intervallo tra le ricerche di fonti Kad (minuti)"
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr "Intervallo tra le richieste alle fonti (minuti)"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Dimensione buffer file: 240000 byte"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr "Usa MMAP: accesso ai file mappato in memoria (minor uso di memoria)"
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr "Mappa i file parziali in memoria invece di bufferizzarli nell'heap, riducendo l'occupazione di memoria del processo. Potrebbe ridurre la velocità di download su alcuni dischi; ideale per sistemi con memoria limitata o con molto traffico in upload."
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Dimensione coda upload: 5000 client"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervallo aggiornamento connessione al server: disabilitato"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Disabilita la modalità standby a tempo"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Skin da usare: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Mostra il \"Gestore rapido dei collegamenti eD2k\" in ogni finestra."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Mostra informazioni estese sulle schede delle categorie"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Mostra versione dell'applicazione nella barra del titolo"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Mostra velocità di trasferimento nella barra del titolo"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Prima del nome dell'applicazione"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Dopo il nome dell'applicazione"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Mostra l'overhead di banda"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Orientamento verticale della barra degli strumenti"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr "Ordinamento colonne in tempo reale (riordina le righe automaticamente al variare dei loro valori)"
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Scaricamento dei file in coda"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Mostra la percentuale di avanzamento"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Mostra la barra di avanzamento"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Piatta"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Arrotondata"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Ordina automaticamente i file (uso elevato della CPU)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parametri connessioni esterne"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Accetta connessioni esterne"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP dell'interfaccia di ascolto:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Porta TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Abilita il port forwarding tramite UPnP sulla porta EC"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Password"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr "Richiedi connessioni cifrate (rifiuta i client che non supportano la cifratura)"
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr "Parametri del server API di aMule"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr "Avvia amuleapi (REST API) all'avvio"
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "Porta HTTP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr "L'interfaccia su cui è in ascolto il server HTTP di amuleapi. 127.0.0.1 (predefinito) accetta solo connessioni locali; usa 0.0.0.0 o un IP specifico per esporlo ad altri host (imposta una password di amministrazione qui sotto)."
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr "Digita una password per impostarla o modificarla. Le password memorizzate non possono essere mostrate, quindi lasciando vuoto questo campo si mantiene quella attuale."
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "Password amministrazione"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "Una password è impostata."
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "Abilita accesso guest"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr "Le sessioni guest possono leggere lo stato e gli elenchi ma non possono modificare nulla. Disattivando questa opzione si cancella la password guest memorizzata."
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "Password guest"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Parametri del server web"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "Lancia il webserver all'avvio"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr "Lancia il webserver all'avvio (deprecato)"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Template web"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Password per diritti completi"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Abilita utente con diritti limitati"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Password per diritti limitati"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Abilita port forwarding tramite UPnP sulla porta del server web"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
-msgstr "Porta TCP del  server web per UPnP (Facoltativa)"
+msgstr "Porta TCP del server web per UPnP (Facoltativa)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Intervallo di aggiornamento pagina (in sec)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Abilita compressione gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr "Ripristina i valori predefiniti della pagina"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr "Ripristina le impostazioni della pagina corrente ai loro valori predefiniti."
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Fai click qui per applicare le modifiche apportate alle impostazioni."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Annulla ogni modifica alle preferenze."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Titolo:"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Commento:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Directory file scaricati:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Cambia priorità per i nuovi file assegnati:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Directory file scaricati"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Cambia priorità per i nuovi file assegnati"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Non modificare"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Seleziona colore per questa categoria (attualmente selezionata):"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Pulisci"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Seleziona colore per questa categoria (attualmente selezionata)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Fai clic su questo pulsante per cancellare i log."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Lista server"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Aggiungi un server manualmente: Nome"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Inserisci qui il nome di un nuovo server"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Porta"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Inserisci qui la porta del server."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Aggiungi server (riempi campi a sinistra)..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "log di aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Informazioni server"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Informazioni ed2k"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Informazioni Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Fai clic su questo pulsante per aggiornare la lista nodi da un URL..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nodi (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Statistiche nodi"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Bootstrap"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nuovo nodo"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Porta:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "Bootstrap dai client noti"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Disconnetti rete Kad"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr "Bootstrap dal nodo: IP"
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Inserisci qui l'indirizzo IP del nodo, utilizzando il formato x.x.x.x."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Usa identificazione sicura"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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'identificazione non sarà abilitata."
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Offuscamento del protocollo"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Supporta offuscamento del protocollo"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Questa opzione abilita l'offuscamento del protocollo, e fa sì che aMule accetti connessioni offuscate dagli altri client."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Utilizza offuscamento per le connessioni in uscita"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Questa opzione fa sì che aMule utilizzi l'offuscamento del protocollo quando si collega ad altri client/server."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
-msgstr "Accetta SOLO connessioni offuscate"
+msgstr "Accetta solo connessioni offuscate"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "Attivando questa opzione aMule accetterà solo connessioni offuscate. Avrai meno fonti, ma tutto il tuo traffico sarà offuscato"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Chiunque"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Nessuno"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Chi può vedere i miei file condivisi:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Filtraggio IP"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtra i client"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtra i server"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Ricarica lista"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Aggiorna ora"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Aggiorna ipfilter all'avvio"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Livello filtraggio:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Filtra sempre gli IP di una LAN"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Gestione paranoica degli IP non corrispondenti"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Rifiuta pacchetto se l'IP del Client è diverso dall'IP da cui arriva il pacchetto. Utilizzare con cautela."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr "Rifiuta un pacchetto quando l'IP di origine è diverso dall'IP dichiarato dal client (un controllo anti-spoofing). Disabilitare solo se causa problemi di connessione."
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Usa l'ipfilter.dat di sistema se disponibile"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Se un file ipfilter.dat locale non viene trovato, consenti l'utilizzo del file ipfilter.dat di sistema."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Abilita Online Signature"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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 usato da applicazioni esterne per creare firme e simili."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Frequenza di aggiornamento (secondi):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Cambia la frequenza (in secondi) degli aggiornamenti dell'Online Signature."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Salva la firma in linea in: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "Clicca qui per selezionare la directory che contiene i file dell'Online Signature."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Mostra la nazionalità dei client"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr "Mostra la colonna delle bandiere dei paesi nelle viste trasferimenti, coda e ricerca. Richiede un database GeoIP MMDB valido (vedi sotto)."
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr "Database"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 msgid "Source:"
 msgstr "Sorgente:"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr "DB-IP (gratuito, nessun account)"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr "MaxMind GeoLite2 (gratuito, richiede account)"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr "URL personalizzato"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr "Scegli quale provider fornisce il database GeoIP MMDB. DB-IP è il default - nessun account richiesto. MaxMind richiede un account gratuito + license key. Usa URL personalizzato per puntare a qualsiasi altro host MMDB (es. un mirror locale)."
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4252,11 +5417,11 @@
 "Dati IP-to-Country di DB-IP.com - https://db-ip.com\n"
 "Licenza: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr "License key:"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4272,11 +5437,11 @@
 "Licenza: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
 "Richiede attribuzione e registrazione dell'account; aggiornare almeno ogni 30 giorni."
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
 msgstr "URL di scaricamento:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
@@ -4286,504 +5451,569 @@
 "L'URL può includere credenziali (https://user:pass@host/...).\n"
 "I termini di licenza e attribuzione sono definiti dall'URL upstream - ne sei responsabile."
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr "Scarica il database GeoIP dalla sorgente selezionata."
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr "Aggiornamento automatico all'avvio"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr "Riscarica il database GeoIP dalla sorgente selezionata ogni volta che aMule si avvia."
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtra messaggi in arrivo (tranne per la chat in corso):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtra tutti i messaggi"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 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:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtra i messaggi da client sconosciuti"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtra i messaggi che contengono (usa ',' come separatore):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Mostra nel log i messaggi ricevuti"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Commenti"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtra i commenti contenenti (usa ',' come separatore):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Abilita autenticazione"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Abilita o disabilita l'autenticazione con nome utente e password"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Nome utente: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Nome utente utilizzato per la connessione al proxy"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Password:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "La password usata per la connessione al proxy"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Abilita proxy"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Abilita o disabilita il supporto proxy"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Tipo proxy:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Indirizzo proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Tipo proxy"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Indirizzo proxy"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Il nome host del proxy"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Porta proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Porta proxy"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "La porta del proxy"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Abilita autenticazione"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Abilita o disabilita l'autenticazione con nome utente e password"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Nome utente utilizzato per la connessione al proxy"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "La password usata per la connessione al proxy"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Connetti a:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Login su aMule remoto"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Nome utente"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Ricorda impostazioni"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "Cifra la connessione (consigliato)"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr "Forza la compressione ZLIB"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Abilita il log dettagliato dei messaggi di debug."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Solamente sul file di log"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Categorie messaggi:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "In attesa..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Aggiungi importazioni"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Riprova selezionati"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Rimuovi selezionati"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Tipi di evento"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Upload attivi"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Percentuale di file totali"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Mostra client per"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Tutti i file"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "File selezionati"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Solo upload attivi"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Mostra client per"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Ricarica lista:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Ricarica file condivisi"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Invia"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Invia messaggio specificato."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Chiude questa sessione di chat."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Connetti a qualsiasi server e/o a Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "Annulla %s"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "File condivisi"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "Disconnetti %s"
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "Connetti %s"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Disabilitato %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
-msgstr1 "byte"
+msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "TiB"
 
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/s"
 msgstr1 "byte/sec"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "MiB/s"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sec"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "min"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "ore"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Giorni"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "giorni"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "tutti"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "tutti gli altri"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Incompleti"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Fermo"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Archivio"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Testo"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Attivo"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Directory di configurazione in uso: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr "Questa fonte non ha la parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr "Tu e questa fonte avete entrambi la parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr "Attualmente in download da questa fonte"
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr "La prossima parte che verrà richiesta a questa fonte"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr "Questa fonte ha la parte e ti serve ancora"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr "Questo peer ha già la parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr "Questo peer non ha la parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr "Nessun'altra fonte ha questa parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr "Un'altra fonte ha questa parte"
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr "%u o più altre fonti hanno questa parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr "Già riletto e verificato"
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr "Ancora da leggere"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr "Un blocco per ogni parte del file in download."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr "Un blocco per ogni parte del file condiviso."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Un blocco per ogni parte del file condiviso, colorato in base a quante altre fonti la possiedono."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Un blocco per ogni parte del file condiviso, che mostra fino a dove è arrivato l'hashing."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr "Valori intermedi, sempre più scuro all'aumentare delle fonti"
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "In attesa della fine del processo di conversione del file incompleto..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Importazione %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Lettura directory file temporanei"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Recupero informazioni di base dal file info del download"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Creazione file di destinazione"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Caricamento dati da vecchio file in download (%u su %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Recupero informazioni fonti e file in download in corso"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Aggiunta download e salvataggio nuovo file parziale in corso"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importazione file parziale"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Stato"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Hash"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Disco: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Vuoi che le fonti dei download importati con successo siano cancellate?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Rimuovi fonti?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "ERRORE: Impossibile creare il file Part"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Caricamento del backup del file met da %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, 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:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "ERRORE: Versione del file part.met invalida: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
-msgstr "ERRORE: %s (%s) è corrotto (etichette errate: %s), impossibile caricare il file."
+msgstr "Errore: %s (%s) è corrotto (etichette errate: %s), impossibile caricare il file."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, 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:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Tentativo di recupero informazioni sul file..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Impossibile recuperare le informazioni sul file :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Impossibile aprire %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "ATTENZIONE: %s potrebbe essere corrotto (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "Errore durante il salvataggio del file incompleto: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Errore di I/O durante il salvataggio dei file Part: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr "Scritti 0/sconosciuti byte in '%s' -- viene conservato il .part.met esistente."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Salvata %i fonte per il file incompleto: %s (%s)"
 msgstr1 "Salvate %i fonti per il file incompleto: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Impossibile accedere alle fonti del file Part %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Trovata parte danneggiata (%d) in %d parte %s - FileResultHash |%s| FileHash |%s|"
 msgstr1 "Trovata parte danneggiata (%d) in %d parti %s - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Trovata parte completata (%i) in %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Nuovo hashing completato %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Errore imprevisto durante il completamento di %s. File messo in pausa"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Download completato: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4792,306 +6022,153 @@
 "Download completato: \n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Cancellazione file in corso: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "ATTENZIONE: Impossibile calcolare l'hash del file parziale - hashset incompleto per '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "ERRORE: Impossibile calcolare l'hash delle parti scaricate - hashset incompleto (%s). Ciò non dovrebbe mai accadere"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr "Parte %u di '%s' segnata come completata ma il file parziale è più corto del previsto (presenti %llu byte, richiesti %llu); il gap viene riaperto per riscaricare."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "EOF durante l'hashing della parte %u scaricata con lunghezza %u (max %u) del file Part '%s' con lunghezza %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "La parte di file scaricata %i è danneggiata in: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Allocazione in corso"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Spazio su disco insufficiente"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Scaricato"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ERRORE: Apertura del file Part fallita '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Predefinita di sistema"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanese"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabo"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Basco"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr "Scambio fonti esteso"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr "Attraversamento NAT (uTP)"
+
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr "Richiesta info amico"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr "Attraversamento NAT (QUIC)"
 
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgaro"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Catalano"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Cinese (semplificato)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Cinese (tradizionale)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Croato"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Ceco"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danese"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Olandese"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Inglese (Regno Unito)"
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr "Inglese (U.S.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estone"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finlandese"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francese"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galiziano"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Tedesco"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Greco"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Ebraico"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Ungherese"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italiano (Svizzera)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Giapponese"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvegese (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polacco"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portoghese"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portoghese (Brasile)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Romeno"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Russo"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Sloveno"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spagnolo"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Svedese"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turco"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ucraino"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Cambia lingua"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Non ci sono traduzioni di aMule installate"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Nessuna lingua disponibile"
-
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "nessuna opzione disponibile"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr "Trovata mappatura di percorso non valida, ignorata"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Trovata categoria non valida, ignorata"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Sarà usata la porta predefinita (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Connessione"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Directory"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Server"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "File"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Sicurezza"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr "IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtri"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Controlli remoti"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Online Signature"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Eventi"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Debug"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5101,15 +6178,15 @@
 "    %PARTFILE - percorso completo del file\n"
 "    %PARTNAME - solamente il nome del file"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr "Il supporto per l'icona nella tray richiede libayatana-appindicator3 in fase di compilazione."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr "Non disponibile su Wayland: il protocollo non segnala quando una finestra viene ridotta a icona, quindi questa opzione non può intercettare il pulsante di riduzione del sistema. Soluzione alternativa: avvia aMule con `GDK_BACKEND=x11` per usare XWayland."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5122,28 +6199,45 @@
 "esattamente cosa stai facendo: potresti ottenere\n"
 "effetti indesiderati.\n"
 "\n"
-"aMule funzionerà anche senza modificare questi parametri."
+"aMule funzionerà bene anche senza modificare\n"
+"questi parametri."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Il tipo di proxy a cui ti stai connettendo"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "Nessuna password impostata."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "L'accesso guest richiede una password. Digitane una nel campo della password guest, oppure deseleziona Abilita accesso guest."
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5151,31 +6245,43 @@
 "aMule deve essere riavviato per rendere effettive queste modifiche:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- Modifica della porta TCP.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- Modifica della porta UDP.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr "- Associazione all'interfaccia di rete modificata.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Porta della connessione esterna modificata. \n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Accetta connessione esterna modificata. \n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Interfaccia connessione esterna modificata. \n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- Modificato il supporto all'offuscamento del protocollo.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr "- Impostazioni proxy modificate (necessarie per i trasferimenti HTTP).\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr "- configurazione di amuleapi modificata.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5183,27 +6289,32 @@
 "La tua lista dei server per l'aggiornamento automatico è vuota.\n"
 "L'aggiornamento automatico all'avvio sarà disattivato."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr "Impossibile salvare la password di amuleapi: %s"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Modifica della lingua.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Modifica della cartella Temp.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- Rete ed2k abilitata.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr "Il pattern di esclusione dei file condivisi non è un'espressione regolare valida. Il filtro è stato lasciato disattivato."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "Espressione regolare non valida"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5211,7 +6322,7 @@
 "Le reti eD2k e Kad sono entrambe disabilitate.\n"
 "Non potrai connetterti finché non ne abiliterai almeno una."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5219,7 +6330,7 @@
 "Kad non può partire se la porta UDP è disabilitata.\n"
 "Abilitala o disabilita Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5229,19 +6340,66 @@
 "DEVI riavviare aMule ADESSO.\n"
 "Se non lo fai, non lamentarti se succede qualcosa di strano.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr "Impossibile registrare aMule per l'avvio automatico all'accesso. L'archivio di avvio automatico potrebbe essere in sola lettura."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr "Impossibile rimuovere la voce di avvio automatico all'accesso."
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr "Avvio automatico"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr "Registra il tipo di file"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr "Registra gestore URL"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr "aMule gestisce solo i magnet compatibili con eD2k. Se sostituisci il gestore magnet attuale (%s), i link magnet BitTorrent smetteranno di funzionare: aMule non può scaricare contenuti BitTorrent. Continuare?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr "Attualmente un'altra applicazione apre i file .emulecollection (%s). Sostituirla con aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr "Attualmente un'altra applicazione è il gestore predefinito per questi link (%s). Sostituirla con aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "Impossibile registrare aMule per i file .emulecollection. Il registro delle associazioni potrebbe essere in sola lettura."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr "Impossibile rimuovere la registrazione del tipo di file."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "Impossibile registrare aMule come gestore URL. Il registro delle associazioni potrebbe essere in sola lettura."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr "Impossibile rimuovere la registrazione del gestore URL."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Il server web e aMule API richiedono che le connessioni esterne siano abilitate."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr "Il server web di aMule è deprecato. Valuta in alternativa l'uso di aMule API."
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5251,41 +6409,64 @@
 "Inserisci l'URL di almeno un server valido nel file server.met.\n"
 "Clicca sul pulsante \"Lista\" per inserire l'URL."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "File temporanei"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "File completi"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Online Signature"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Scegli una directory per i %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Escluderebbe %u di %u file condiviso"
+msgstr1 "Escluderebbe %u di %u file condivisi"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Sfoglia per trovare un riproduttore video"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Scegli browser"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr "Seleziona il binario ffprobe"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Eseguibile%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr "ffprobe non trovato nel PATH né nei percorsi di installazione standard. Installa ffmpeg (che include ffprobe) oppure usa Sfoglia per selezionare manualmente un binario."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr "Ripristinare le impostazioni di questa pagina ai loro valori predefiniti?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr "Ripristina i valori predefiniti"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Modifica la lista dei server"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5293,114 +6474,114 @@
 "Inserisci l'URL da cui scaricare il file server.met.\n"
 "Solo un URL per riga."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr "Aggiornamento IP2Country fallito"
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr "Dati di MaxMind GeoLite2"
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr "Sorgente personalizzata"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr "Dati di DB-IP.com"
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr "Stato: Caricato%s"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Stato: Caricato%s - %s"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr "Stato: Caricamento fallito - clicca su 'Aggiorna ora' per ricaricare."
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr "Stato: Non trovato - clicca su 'Aggiorna ora' per scaricare."
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Intervallo aggiornamento: %d secondo"
 msgstr1 "Intervallo aggiornamento: %d secondi"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Intervallo grafico della media: %d minuto"
 msgstr1 "Intervallo grafico della media: %d minuti"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Scala grafico delle connessioni: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Dimensione buffer file: %d byte"
 msgstr1 "Dimensione buffer file: %d bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
-msgstr0 "Dimensione coda upload: %d client"
-msgstr1 "Dimensione coda upload: %d client"
+msgstr0 "Dimensione coda upload: %d utente"
+msgstr1 "Dimensione coda upload: %d utenti"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Intervallo aggiornamento connessione ai server: %d minuto"
 msgstr1 "Intervallo aggiornamento connessione ai server: %d minuti"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Intervallo aggiornamento connessione ai server: disabilitato"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "disattivato"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Esegui comando se si verifica l'evento '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Abilita l'esecuzione del comando sul core"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Comando Core:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Abilita l'esecuzione del comando sulla GUI"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Comando GUI:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Le seguenti variabili saranno sostituite:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
@@ -5408,1073 +6589,1324 @@
 "Le seguenti cartelle sembrano posizioni di sistema o sensibili:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr "Condividerle ricorsivamente pubblicherà ogni file al loro interno sulle reti eD2k/Kad. Vuoi davvero procedere?"
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr "Conferma cartelle condivise"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
-msgstr "Ricarica file condivisi in corso…"
-
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
-msgstr "Analisi delle sottocartelle in corso…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
+msgstr "Ricarica file condivisi in corso..."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
+msgstr "Analisi delle sottocartelle in corso..."
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr "Aggiornamento cartelle condivise"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
-msgstr "%u cartelle analizzate…"
+msgid "Scanned %u directories..."
+msgstr "%u cartelle analizzate..."
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Ricarica file condivisi: %u file analizzati"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr "Cartella condivisa"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr "È necessario compilare sia il prefisso remoto sia quello locale."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr "Questo prefisso remoto è già mappato."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr "Scegli la cartella locale"
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "Cancella Cronologia Ricerche"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr "Cancellare la cronologia delle ricerche salvata? L'operazione non può essere annullata."
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Avviso di ricerca"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "Impossibile avviare ricerche con eD2k e Kademlia entrambi disabilitati."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "Errore di ricerca"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
-msgstr "Ricerca Kad: richiesti risultati più ampi a un altro peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
+msgstr ""
+"È ancora in corso una ricerca eD2k. Avviandone una nuova questa verrà interrotta, perché il protocollo eD2k consente una sola ricerca alla volta.\n"
+"\n"
+"I risultati già trovati vengono mantenuti; smettono soltanto di arrivarne di nuovi.\n"
+"\n"
+"Avviare comunque la nuova ricerca?"
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr "Ricerca Kad: nessun peer rimasto a cui richiedere altri risultati (limite raggiunto o nessuna risposta ancora ricevuta)."
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr "Ricerca in corso"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Avviso di ricerca"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Principale"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Impossibile effettuare una ricerca sulla rete Kad senza esserci connessi"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr "Verranno salvate solo le %u ricerche aperte più recenti su %u in %s."
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr "Verranno salvati solo i primi %u risultati su %u per la ricerca \"%s\"."
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "ATTENZIONE: la lista delle ricerche salvate è danneggiata, contiene un'intestazione non valida."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Voce non valida nella lista delle ricerche salvate, il file potrebbe essere corrotto"
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr "La ricerca eD2k non può essere effettuata se la rete eD2k non è connessa"
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "Nessuna chiave di ricerca per Kad - interruzione in corso"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Errore imprevisto durante la ricerca su Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID File"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr "Ricerca scaduta: il server non ha risposto."
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr "Durata"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Ricerca Kad: richiesti risultati più ampi a un altro peer."
 
-#: src/SearchListCtrl.cpp:105
-msgid "Bitrate"
-msgstr "Bitrate"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Ricerca Kad: nessun peer rimasto a cui richiedere altri risultati (limite raggiunto o nessuna risposta ancora ricevuta)."
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "Errore %u: %s\n"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Download nella categoria"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ID File"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Ottieni %s per questo file"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "Espandi tutto"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "Comprimi tutto"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Cerca file correlati (eD2k, server locale)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Segna come file conosciuto"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Copia il collegamento eD2k negli appunti"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Copia il collegamento eD2k negli appunti"
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Al momento non sei connesso ad un server che supporta la Ricerca di File Correlati"
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Annullata"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Nuovo"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr "in corso"
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "completata"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr "inattiva"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr "Ricerca %u: %s, %u %% (%u risultati)\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr "Ricerca %u \"%s\": %s, %u %% (%u risultati)\n"
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr "Ricerca scaduta o ID sconosciuto. Avvia una nuova ricerca.\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Avanzamento ricerca: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Avanzamento ricerca non disponibile"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr "Nessuna ricerca da riportare.\n"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Impossibile collegarsi ai server statici in lista con offuscamento di protocollo. Ci riprovo senza offuscamento."
+
+#: src/ServerConnect.cpp
 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
+msgid "Failed to connect to all static servers listed."
+msgstr "Impossibile connettersi a tutti i server statici in lista."
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr "Impossibile connettersi a tutti i server in lista."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Riconnessione automatica al server tra %d secondo"
+msgstr1 "Riconnessione automatica al server tra %d secondi"
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "Rete eD2k disabilitata nelle preferenze, connessione impossibile."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Connesso a %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Connessione stabilita con: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Persa connessione a %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) sembra non essere attivo."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) sembra essere pieno."
 
-#: 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"
-msgstr0 "Riconnessione automatica al server tra %d secondo"
-msgstr1 "Riconnessione automatica al server tra %d secondi"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Connessione persa"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Connessione a %s (%s:%i) non riuscita."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "ERRORE: Nessun socket valido trovato entro il tempo massimo"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Connessione a %s (%s:%i) non riuscita per timeout."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Risultato richiesta DNS ricevuto in ritardo, ignoro."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Caricamento file server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "File server.met non trovato!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Impossibile caricare il file server.met '%s', formato sconosciuto."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Impossibile aprire il file server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "Trovato %i server nel file server.met"
 msgstr1 "Trovati %i server nel file server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d server aggiunto"
 msgstr1 "%d server aggiunti"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Errore: il file 'server.met' è corrotto: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "Errore I/O durante la lettura del file 'server.met': "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 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:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Impossibile aprire '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Impossibile salvare il file server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Errore I/O durante la scrittura del file 'server.met': %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "URL non valido"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "È terminato il download della lista dei server da %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Non è stato trovato nessun indirizzo nel file 'addresses.dat'. Scrivi un indirizzo che contenga una lista di server in questo file in modo da poter aggiornare automaticamente la lista"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Inizia il download della lista dei server da %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Impossibile scaricare la lista dei server da %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 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/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Utenti"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "Utenti Max"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Statico"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versione"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr "File Soft"
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr "File Hard"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr "TCP Flags"
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr "UDP Flags"
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Sei connesso al server che stai cercando di eliminare. Disconnettiti prima. Il server NON è stato eliminato."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(nome sconosciuto)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "ms"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Server (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Server"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Connetti al server"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Segna il server come statico"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Segna il server come non statico"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Segna i server come statici"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Segna i server come non statici"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Rimuovi il server"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Rimuovi i server"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Rimuovi tutti i server"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Copia il collegamento eD2k negli appunti"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Riconnetti al server"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Sei sicuro di voler eliminare tutti i server?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Sei sicuro di voler eliminare il server selezionato?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Sei sicuro di voler eliminare i server selezionati?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ERRORE: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "ATTENZIONE: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr "Il server %s (%s) ha rifiutato il login (nessun ID client assegnato). Disconnessione in corso."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Il nuovo clientID è %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "ATTENZIONE: hai ricevuto un ID basso!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\tProbabilmente perché il tuo pc è dietro un firewall od un router."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPer altre informazioni visita https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Ricevute informazioni sconosciute dal server! - troppo corto"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Ricevuto %d nuovo server"
 msgstr1 "Ricevuti %d nuovi server"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Salvataggio della lista dei server completato."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Il server ha rifiutato l'ultimo comando"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Pacchetto bogus ricevuto dal server: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "L'IP del server %s (%s) è filtrato. Connessione bloccata."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "utilizzo offuscamento del protocollo."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Connessione a %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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!"
+msgstr "Non è possibile risolvere il DNS per il server %s: Impossibile connettersi!"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "log di aMuleGUI"
+
+#: src/ServerWnd.cpp
 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:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Server non aggiunto: porta del server specificata non valida."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Stato eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr "Tipo di connessione:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "Connesso dal:"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Stato Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Esecuzione in modalità LAN"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Attivo"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "ID client Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Stato:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Stato connessione:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Stato connessione UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Stato del firewall: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Nessun amico richiesto - porta TCP aperta"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Nessun amico richiesto - porta UDP aperta"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Nessun amico"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Connessione in corso all'amico"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Connesso all'amico a %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Indirizzo IP:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Fonti indicizzate:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Parole chiave indicizzate:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Note indicizzate:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Utilizzo indicizzato:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Numero medio utenti:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Numero medio file:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Non attivo"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr "Monitoraggio cartelle condivise: overflow o errore del backend (%s); si ricorre a una ricarica completa"
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 "Monitoraggio cartelle condivise: rilevata %u nuova sottocartella dall'ultima esecuzione, nuova scansione delle condivisioni"
+msgstr1 "Monitoraggio cartelle condivise: rilevate %u nuove sottocartelle dall'ultima esecuzione, nuova scansione delle condivisioni"
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr "Monitoraggio cartelle condivise: eventi persi dal backend, ricarica completa dei file condivisi per risincronizzare"
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Aggiungo il file %s alle condivisioni"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Trovati %i file condiviso conosciuto"
 msgstr1 "Trovati %i file condivisi conosciuti"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Trovato %i file conosciuto, %i sconosciuto"
-msgstr1 "Trovati %i file condivisi conosciuti, %i sconosciuti"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 "Escluso %i file dalla condivisione tramite il filtro"
+msgstr1 "Esclusi %i file dalla condivisione tramite il filtro"
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "ERRORE: Tentativo di condividere %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Cartella condivisa non trovata, ignoro: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Nessun file condivisibile trovato nella cartella: %s"
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Cartella condivisa non leggibile, ignoro: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Nome utente"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr "L'estrazione dei metadati multimediali è disabilitata nelle preferenze, quindi non c'è nulla da riestrarre."
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Velocità download"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 "Riestrazione dei metadati multimediali per %u file condiviso"
+msgstr1 "Riestrazione dei metadati multimediali per %u file condivisi"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Velocità upload"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "Ora in condivisione il file: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Interrotta la condivisione del file rimosso: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Interrotta la condivisione di %u file nella cartella rimossa: %s"
+msgstr1 "Interrotta la condivisione di %u files nella cartella rimossa: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Parti disponibili"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Ora in condivisione %u file trovato in una nuova cartella condivisa"
+msgstr1 "Ora in condivisione %u file trovati in nuove cartelle condivise"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Rilevato %u nuovo file condiviso"
+msgstr1 "Rilevati %u nuovi file condivisi"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Nome utente"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr "Parti sul peer"
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Stato upload"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Nome locale file"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Lista file condivisi"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Richieste"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Richieste accettate"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Dati trasferiti"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Rapporto condivisione"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Parti ricevute"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Fonti complete"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr "Disponibilità fonti"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Percorso directory"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "File condivisi"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Aggiungi commento/giudizio"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Modifica commento/giudizio"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Rinomina"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr "Verifica Dati Locali"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr "Riestrai &metadati multimediali"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Aggiungi i file della collezione alla lista dei trasferimenti"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Copia &URI magnet negli appunti"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Copia eD2k &link negli appunti (&Fonte)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Copia &link eD2k negli appunti (Fonte) (con &opzioni di offuscamento)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Copia il collegamento eD2k negli appunti (&Hostname)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Copia il collegamento eD2k negli appunti (Hostname) (con &opzioni di offuscamento)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Copia il collegamento eD2k negli appunti (&AICH info)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Copia il collegamento eD2k negli appunti (&AICH info + Fonte)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr "Esporta i file selezionati in una emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr "Verifica Dati Locali su PartFile non è supportato al momento: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 "Metadati multimediali: %u download incompleto ignorato"
+msgstr1 "Metadati multimediali: %u download incompleti ignorati"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 "Metadati multimediali: %u file non audio né video ignorato"
+msgstr1 "Metadati multimediali: %u file non audio né video ignorati"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 "Riestrarre i metadati multimediali per %u file?"
+msgstr1 "Riestrarre i metadati multimediali per %u files?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 "%u download incompleto verrà ignorato."
+msgstr1 "%u download incompleti verranno ignorati."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 "%u file non è audio né video e verrà ignorato."
+msgstr1 "%u file non sono audio né video e verranno ignorati."
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr "L'operazione viene eseguita in background. L'avanzamento è riportato nel log."
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr "Riestrai metadati multimediali"
+
+#: src/SharedFilesCtrl.cpp
 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:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr "Esporta in emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr "Nessun file selezionato da esportare."
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr "Collezioni eMule (*.emulecollection)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr "'%s' esiste già. Sovrascriverlo?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Impossibile scrivere il file di collezione '%s'."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Esportato %u file condiviso in '%s'."
+msgstr1 "Esportati %u file condivisi in '%s'."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Dimensione totale file condivisi: %s (%s completati)"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Dimensione totale file condivisi: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "File condivisi (%i, hashing di %u altro file in corso)"
+msgstr1 "File condivisi (%i, hashing di altri %u file in corso)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "File condivisi (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Partfile"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Ricarica file condivisi: %u file analizzati"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr "Stato parti"
+
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Nome file remoto"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Dati inviati (sessione (totale)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Overhead totale (pacchetti): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Overhead richieste file (pacchetti): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Overhead scambio fonti (pacchetti): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Overhead server (pacchetti): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Overhead Kad (pacchetti): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Overhead da offuscamento (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Upload attivi: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Upload in attesa: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Totale sessioni di upload riuscite: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Totale sessioni di upload fallite: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Tempo upload medio: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Dati scaricati (sessione (totale)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Fonti trovate: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Download attivi (parti): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Rapporto UL:DL sessione (totale): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Velocità media di scaricamento (Sessione): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Velocità media d'invio (Sessione): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Velocità di scaricamento massima (Sessione): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Velocità massima d'invio (Sessione): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Riconnessioni: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Tempo dal primo trasferimento: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Connesso al server da: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Connessioni attive (stima): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Limite massimo connessioni raggiunto: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Connessioni medie (stima): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Picco connessioni (stima): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Client"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Sconosciuti: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtrati: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Bannati: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr "Indirizzi Kad bannati: %s"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Totale: %i Conosciuti: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Server attivi: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Server falliti: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Totale: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Server rimossi: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Server filtrati: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Utenti su server attivi: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "File su server attivi: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Utenti totali: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "File totali: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Occupazione server: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Numero di file condivisi: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Dimensione totale file condivisi: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Dimensione media dei file: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Non ricevuto"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Connessioni attive (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Non disponibile"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Mai"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "Il comando `%s' con pid `%d' è terminato con il codice di stato `%d'."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Esegui <str> ed esci."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr "Separa i campi degli elenchi con spazi, come in precedenza, invece che con tabulazioni."
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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 file, or un numero.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Elaborazione dell' hash: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Elaborazione del file: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Non è un numero valido\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6484,7 +7916,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6494,7 +7926,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6502,76 +7934,80 @@
 "Il tipo della ricerca non è definito.\n"
 "Digitare 'help search' per ottenere ulteriori informazioni.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Download del file: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Richiesta fallita con errore sconosciuto."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operazione conclusa con successo."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Richiesta fallita con il seguente errore: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Il filtraggio IP per i client è %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "OFF"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "ON"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Il filtraggio IP per i server è %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Il livello IPFilter attuale è %d\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr "Limiti di banda: Up: %u KiB/s, Down: %u KiB/s.\n"
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr "La rotazione delle fonti in modalità endgame è %s.\n"
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr "Ricerca iniziata (id %u).\n"
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Connesso a %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Connessione in corso"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "firewalled"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6580,7 +8016,7 @@
 "\n"
 "Download:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6589,7 +8025,7 @@
 "\n"
 "Upload:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6598,7 +8034,7 @@
 "\n"
 "Client in coda:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6607,38 +8043,33 @@
 "\n"
 "Fonti totali:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Partfile"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Totale risultati della ricerca: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Avanzamento ricerca: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Avanzamento ricerca non disponibile"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Ricevuta risposta sconosciuta dal server, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Mostra informazione sullo stato."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 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:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Mostra le statistiche complete."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6649,13 +8080,14 @@
 "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 'infinito'.\n"
+"\n"
 "Esempio: 'statistics 5' mostrerà solo le cinque versioni più diffuse per ogni tipo di client.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Arresta aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6665,35 +8097,35 @@
 "L'azione arresterà anche il client testuale, dal momento che diventerà inutilizzabile senza un\n"
 "core in esecuzione.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Ricarica l'oggetto."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Ricarica la lista dei file condivisi."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Ricarica il filtro IP da file."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Seleziona il livello del filtraggio degli IP."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Aggiorna il filtro IP da URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 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:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Connettiti alla rete."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6705,35 +8137,35 @@
 "connettersi solamente a quello. Si può utilizzare un indirizzo IPv4 oppure\n"
 "un nome risolvibile da un server DNS."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Connettiti solo alla rete eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Connetti solo alla rete Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Disconnettiti dalla rete."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Disconnettiti solo dalla rete eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Disconnetti solo dalla rete Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Aggiungi un link eD2k o un magnet link al core."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6751,51 +8183,51 @@
 "\n"
 "Il magnet link deve contenere l'hash eD2k e la lunghezza del file.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Imposta un valore delle preferenze."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Imposta le preferenze del Filtro IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Attiva il filtro IP per client e server."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Disattiva il filtro IP per client e server."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Attiva/Disabilita il filtro IP per i client."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Attiva il filtro IP per i client."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Disattiva il filtro IP per i client."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Attiva/Disabilita il filtro IP per i server."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Attiva il filtro IP per i server."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Disabilita il filtro IP per i server."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Seleziona il livello del filtraggio degli IP."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6803,59 +8235,71 @@
 "I livelli di filtraggio validi vanno da 0 a 255 e il default (iniziale)\n"
 "è 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Imposta limiti di banda."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Imposta limiti di banda per l'upload."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Il valore inserito deve essere espresso in kilobyte al secondo.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Imposta limiti di banda per il download."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr "Attiva o disattiva la rotazione delle fonti in modalità endgame."
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Il valore fornito deve essere 1/ON (attiva) o 0/OFF (disattiva).\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
-msgstr "Visualizza un'impostazione delle preferenze."
+msgstr "Legge e visualizza un valore delle preferenze."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Visualizza le impostazioni del Filtro IP."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Ottieni stato del filtro IP sia del client che del server."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Ottieni stato del filtro IP per i client."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Ottieni stato del filtro IP dei server."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Imposta il livello del filtraggio degli IP."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
-msgstr "Visualizza limita di banda."
+msgstr "Visualizza limiti di banda."
+
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr "Ottieni lo stato della rotazione delle fonti in modalità endgame."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Effettua una ricerca."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6889,39 +8333,47 @@
 "Esempio: 'search global linux iso --type Iso --min-size 100M' restituisce\n"
 "risultati per \"linux iso\" di tipo Iso di almeno 100 MiB.\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Effettua una ricerca globale."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Effettua una ricerca locale"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Effettua una ricerca sulla rete Kad"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "Mostra risultati dell'ultima ricerca."
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Restituisce i risultati della ricerca precedente.\n"
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr "Mostra risultati di una ricerca."
+
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+"Restituisce i risultati di una ricerca.\n"
+"Accetta facoltativamente un id di ricerca (da 'search ...'); senza id, restituisce i risultati della ricerca avviata più di recente.\n"
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Mostra lo stato d'avanzamento della ricerca."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Mostra lo stato d'avanzamento della ricerca.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+"Mostra lo stato d'avanzamento di una ricerca.\n"
+"Accetta facoltativamente un id di ricerca; senza id, mostra lo stato d'avanzamento della ricerca avviata più di recente.\n"
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Scarica un file"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6929,80 +8381,80 @@
 "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:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Metti il download in pausa."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Riavvia download."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Annulla download."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Imposta priorità del download."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Imposta priorità a Bassa."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Imposta priorità a Normale."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Imposta priorità a Alta."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Imposta priorità a Auto."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Mostra code/liste."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Mostra la coda di upload."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Mostra la coda di download."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Mostra log."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Mostra la lista dei server."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "Mostra la lista dei file condivisi."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Cancella log."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Comando deprecato, al suo posto usa '%s'."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7011,255 +8463,278 @@
 "Questo è un comando obsoleto, e in futuro potrebbe essere rimosso.\n"
 "Al suo posto usa '%s'.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Client testuale aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Hashing del file scaricato in corso: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr "Hashing del file in corso: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Ricostruzione dell'hashset AICH per il file: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr "Verifica Dati Locali (%s): Risultato OK per %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr "Verifica Dati Locali (%s): ERRORI RILEVATI! %s Blocchi con errori: MD4: %s. %s %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Conferma richiesta"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Solo 99 categorie sono accettate."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Troppe categorie!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Tutto il resto"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Seleziona filtro di visualizzazione"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Aggiungi categoria"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Modifica categoria"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Elimina categoria"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Hashset richiesto per il file sconosciuto: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, 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/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Ripristino invio del file: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Sospensione invio del file: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Impossibile eseguire il comando `%s' per l'evento `%s'."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Impossibile eseguire il comando '%s' per l'evento '%s'."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Download completato"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Il percorso completo del file."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Il nome del file senza la parte del percorso."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "L'hash eD2k del file."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "La dimensione del file in bytes."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Tempo cumulativo di download."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Nuova sessione chat iniziata"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Mittente del messaggio."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Spazio esaurito"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Partizione disco."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Errore nel completamento"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Elaborazione del file numero %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> File inesistente!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, il creatore di link eD2k per aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Benvenuto!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Parametri di ingresso"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "File da esaminare"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Aggiungi URL per questo file"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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 "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
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Crea collegamento con hash delle parti"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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ù dimensione maggiore dei link"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Hash del File MD4"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "hash file eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "link D2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Salva"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Apri"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Copia il link eD2k generato negli appunti"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Salva come"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Salva su file il link eD2k generato"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Informazioni su aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Non posso aprire gli appunti"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Non c'è niente da copiare per ora!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Impossibile aprire "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Inserire un nome file non vuoto"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Non c'è niente da salvare per ora!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7279,162 +8754,159 @@
 "\n"
 "sono distribuiti sotto licenza GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Hashing..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator sta lavorando per voi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Calcolo degli hash MD4 in corso..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Calcolo degli hash eD2k in corso..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Annullato !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Eseguito in %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Hai già aggiunto questo URL!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Inserire un URL non vuoto"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Impossibile aprire %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "Si è verificato un errore \"out of memory\" durante il calcolo di un hash ed2k!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uG %02uore %02umin %02usec"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uore %02umin %02usec"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02usec"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr "%.2f KiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr "%.2f GiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr "%.2f TiB"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, statistiche in linea di aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Velocità di DL massima da quando wxCas è attivo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Pulisci"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistema"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Ferma aggiornamento automatico"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Salva immagine statistiche in linea"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Stampa immagine statistiche in linea"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Preferenze"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Informazioni su wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Avvia aggiornamento automatico"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Aggiornamento automatico fermato"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Aggiornamento automatico avviato"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Salva immagine statistiche"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Statistiche online aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7442,11 +8914,11 @@
 "C'è stato un problema durante la stampa.\n"
 "La stampante potrebbe non essere impostata correttamente?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Stampa in corso"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7464,367 +8936,364 @@
 "\n"
 "Distribuito con licenza GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh oh, aMule non è in esecuzione..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule è in funzione"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule è in esecuzione, ma non connesso"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule si sta connettendo..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh oh, stato di aMule sconosciuto..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " è stato in funzione per "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " è fermo!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " non è connesso!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " si sta connettendo..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " sta facendo qualcosa di strano, controllare!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " è connesso a "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "inattivo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " è attivo "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " con "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Download totale: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Upload: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Download sessione: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Download: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr " KiB/s, Upload: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Condivisione: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " file, client in coda: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Tempo: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " attivo "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Carico medio del sistema (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Uptime del sistema: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Cartella contenente il file amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Intervallo di aggiornamento in secondi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Genera un'immagine delle statistiche ad ogni aggiornamento"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Carica periodicamente l'immagine delle statistiche sul server FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "URL FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Percorso FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Inserire URL del tuo server FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Utente"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Intervallo di aggiornamento FTP in minuti"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Verifica"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Cartella contenente il file di firma"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Cartella nella quale generare l'immagine"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Carica modello <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Web server porta HTTP"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 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:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Porta UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Usa compressione gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Password per l'accesso completo al web server"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Password per l'accesso Guest al web server"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Permetti l'accesso guest"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Vieta l'accesso guest"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 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:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "Percorso file di configurazione aMule. NON MODIFICARE MANUALMENTE!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Disabilita interprete PHP (deprecato)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Ricompila pagine PHP ad ogni richiesta"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Server web di aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "connessione web client accettata\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "ERRORE: Impossibile accettare la connessione del client web\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Richiesta non riuscita per l'errore: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "File indice non trovato: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sessione scaduta - accesso richiesto\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sessione valida, utente registrato\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sessione valida, utente registrato\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Nessuna sessione aperta - richiesta di accesso\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sessione creata - richiesta di accesso\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Elaborazione richiesta originale: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr "Rifiuto di leggere `pass` dalla query string dell'URL\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Nessuna password specificata, login fallito."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Verifica password\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Hash della password non valido\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Password valida\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Password errata\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "Non hai inserito alcuna password. Le password vuote non sono ammesse.\n"
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Disconnessone richiesta\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Elaborazione richiesta rediretta: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr "aMule (obbligatorio)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr "Collegamento sul desktop"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr "Avvia aMule all'accesso"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr "Associa i file .emulecollection"
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr "Disinstalla"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr "Rimuovi dati utente (configurazione, server ED2K, nodi Kad, file parziali)"
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr "File dell'applicazione aMule (obbligatori)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr "Crea un collegamento di aMule sul desktop."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr "Avvia automaticamente aMule all'accesso dell'utente corrente (impostazione per singolo utente)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr "Rimuove i file dell'applicazione aMule, i collegamenti del menu Start e del desktop, la voce di avvio automatico nel registro e la voce in Installazione applicazioni (obbligatorio)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr "Aggiunge aMule all'elenco \"Apri con\" per i file .emulecollection e lo imposta come predefinito se nessun altro programma li ha già associati. L'apertura di una collezione mette in coda ogni link eD2k che contiene."
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "Rimuove i file dell'applicazione aMule, i collegamenti del menu Start e del desktop, la voce di avvio automatico nel registro, le registrazioni degli schemi URL e la voce in Installazione applicazioni (obbligatorio)."
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr "Elimina definitivamente %APPDATA%\\aMule per l'utente corrente (aMule.conf, elenco server ED2K, nodi Kad, file parziali, filtri IP, elenco amici). Lascia deselezionato per mantenere le impostazioni."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
@@ -7832,7 +9301,7 @@
 "Sembra che aMule sia in esecuzione da $INSTDIR.\r\n"
 "Chiudi aMule (e aMuleD / aMuleGUI) e riprova."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
@@ -7840,11 +9309,11 @@
 "Sembra che il demone di aMule (amuled.exe) sia in esecuzione da $INSTDIR.\r\n"
 "Arrestalo e riprova."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr "Rimozione dell'installazione precedente di aMule in $0..."
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
@@ -7852,21 +9321,197 @@
 "Impossibile rimuovere l'installazione precedente di aMule in $0.\r\n"
 "Chiudi i processi aMule in esecuzione e riprova, oppure disinstalla manualmente la versione precedente."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr "Sembra che aMule sia in esecuzione. Chiudilo e riavvia il programma di disinstallazione."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr "Rimozione dei dati utente in $APPDATA\\aMule..."
 
+#~ msgid "Ratio"
+#~ msgstr "Rapporto"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Nessun file condivisibile trovato nella cartella: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Cambia lingua"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Non ci sono traduzioni di aMule installate"
+
+#~ msgid "No languages available"
+#~ msgstr "Nessuna lingua disponibile"
+
+#~ msgid "User name"
+#~ msgstr "Nome utente"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Parti ricevute"
+
+#~ msgid "Available Parts"
+#~ msgstr "Parti disponibili"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Trovato %i file conosciuto, %i sconosciuto"
+#~ msgstr1 "Trovati %i file condivisi conosciuti, %i sconosciuti"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Inviato"
+#~ msgid "Remote prefix:"
+#~ msgstr "Server remoto"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Server locale"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Voce non valida nella lista dei file conosciuti, il file potrebbe essere corrotto: "
+
+#, c-format
+#~ msgid "Hashing %u new file"
+#~ msgid_plural "Hashing %u new files"
+#~ msgstr0 "Hashing di %u nuovo file"
+#~ msgstr1 "Hashing di %u nuovi file"
+
+#, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Hashing dei nuovi file (%u di %u)"
+
+#~ msgid "the default Windows shell handler"
+#~ msgstr "il gestore di shell predefinito di Windows"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Per prevenire questo avviso ad ogni anteprima, \n"
+#~ "seleziona nelle preferenze il tuo lettore video preferito (di default è %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Filtra risultati"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Segna come file conosciuto"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Percentuale di file totali"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Bootstrap"
+
+#~ msgid "New node"
+#~ msgstr "Nuovo nodo"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Ancora"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Bootstrap dai\n"
+#~ "client noti"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Connetti a qualsiasi server e/o a Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Disconnetti rete Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Ferma i tentativi di connessione in corso"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Disconnetti dalle reti a cui sei connesso"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Connetti alle reti attualmente abilitate"
+
+#, c-format
+#~ msgid "Could not add %u link from ED2KLinks file (see log for details)."
+#~ msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+#~ msgstr0 "Impossibile aggiungere %u collegamento dal file ED2KLinks (vedere il log per i dettagli)."
+#~ msgstr1 "Impossibile aggiungere %u collegamenti dal file ED2KLinks (vedere il log per i dettagli)."
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Ordina automaticamente i file (uso elevato della CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule ordinerà automaticamente le colonne nella lista dei download"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Rifiuta pacchetto se l'IP del Client è diverso dall'IP da cui arriva il pacchetto. Utilizzare con cautela."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Restituisce i risultati della ricerca precedente.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Mostra lo stato d'avanzamento della ricerca.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Connessione persa - aMule verrà chiuso."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Verifica la disponibilità di nuove versioni all'avvio"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Link eD2k: "
+
+#~ msgid "Commit"
+#~ msgstr "Invia"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: forzato in background - arrivederci"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Sito: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Documentazione: https://amule-org.github.io/docs \n"
+
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Segnalazioni: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "File non trovato."
+#~ msgid "Loaded"
+#~ msgstr "Inviato"
 
 #, c-format
 #~ msgid "No GeoLite2 update URL configured. Download GeoLite2-Country.mmdb manually (a free MaxMind account is required) and place it at %s, or set the URL in Preferences."

amule-3.0.1.tar.gz/po/ja.po -> amule-3.1.0.tar.gz/po/ja.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:15+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:49+0000\n"
 "Last-Translator: \n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -20,70 +20,156 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "aMuleを表示する"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMuleリモート制御"
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "スナップショット："
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"  著作権2003-2019、aMuleのチーム\n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademliaに基づいています：XORトリックに基づいたP2Pルーティング。\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "起動時に新バージョンを確認する"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Kadに接続中です..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "あなたは古いバージョンのaMuleを使用しています！"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "利用不可"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "仲間を追加する"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "正当なIPとポートを入力しなければなりません！"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "情報"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "指定されたユーザハッシュは不正です！"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "接続に失敗しました "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -92,142 +178,271 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr ""
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 #, fuzzy
 msgid "Failed to open ED2KLinks file."
 msgstr "%s（%s）を開くことはできませんでした"
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "インデックスファイルが見付かりませんでした： "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "ユーザ '%s' から共有ファイルを取得することができませんでした"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
-"OK、%s を終了中です…\n"
+"OK、%s を終了中です...\n"
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "失敗しました"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "ダウンロード完了"
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "申し訳ありませんが、設定の変更を行ったため、あなたのロケールはシステム標準に変更されました。"
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "情報"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "終了の確認"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "新しい外部接続を認められました"
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "警告"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "server.metに%i個のサーバが見つかりました"
+msgid "Loading temp files"
+msgstr "server.metファイルをロード中です：%s"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "server.metファイルをロード中です：%s"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "共有ファイルを再ロードする"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "共有ファイルを再ロードする"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "開始"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "ネットワーク"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "ネットワーク"
+msgid "eD2k server list (server.met)"
+msgstr "server.metに%i個のサーバが見つかりました"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "aMuleは動作しています"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "指定したアドレスにポートをバインドできませんでした: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "ポート%uは利用できません。あなたにはLOWIDが与えられます\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -242,48 +457,48 @@
 "\n"
 "ネットワークを調べ、ポートが入出力に対して開いているか確認してください。"
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "オンライン証明ファイルの生成に失敗しました"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "aMuleのオンライン証明ファイルの生成に失敗しました"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr "選択したロケールはあなたのシステムにインストールされていないようです。（注意：いずれにせよ設定を試みます）"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "初めてaMule %sを起動しています"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "このバージョンはテスト・バージョンで、毎日更新されているものです。\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "あなたに損害を与えないということは保証できません。家を焼いてしまうかも知れないし、\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "犬を殺してしまうかも知れません。しかし、安全に使用できる「はず」です。\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr "私たちのホームページamule-org.github.io、またはIRCチャネルirc.libera.chatの#aMuleには、\n"
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "詳細な情報、サポートや新しいリリースがあります。\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "バグはhttps://github.com/amule-org/amule/issuesに気楽に報告してください"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -291,1581 +506,1885 @@
 "あなたが指定したオンライン証明ファイルのフォルダは不正です！\n"
 "設定で訂正するまでオンライン証明を無効にします。"
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 #, fuzzy
 msgid "Server hostname notified"
 msgstr "サーバ名："
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "ファイル '%s' のディスク領域の事前確保が失敗しました: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "エラー：ログファイルを開くことはできません"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "注意：ログファイルは空です。何かがおかしいです。"
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "ログはリセットされました"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "サーバ・メッセージ：%s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "ノード・リストをダウンロードのに失敗しました。"
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "ダウンロードされたバージョン確認ファイルを開くのに失敗しました。"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "破損されたバージョン確認ファイル"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "あなたは古いバージョンのaMuleを使用しています！"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "最新バージョンはいつもhttps://github.com/amule-org/amule/releases/latestにあります"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr "警告：あなたのaMuledバージョンは古くなっています：%i.%i.%i < %li.%li.%li"
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "あなたのaMuleは最新のバージョンです。"
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "バージョン確認ファイルのダウンロードに失敗しました"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "ユーザ: %s | ファイル: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr "ユーザ: E: %s K: %s | ファイル: E: %s K: %s"
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "ネットワークが選択されていません"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "LowIDを持っています"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "HighIDを持っています"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "接続しています：%s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "%sに接続中です"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kadを開始しました。"
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kadを中止しました。"
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Kadに接続しています（OK）"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Kadに接続しています（ファイアウォール）"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Kadから切断しています"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr "UDPポートが設定で無効にされていると、Kadネットワークを使用できないため、開始しません。"
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kadネットワークは設定で無効にされているため、接続はしません。"
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 #, 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "エラー： %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "これはeMuleに基づいたaMule %s です。"
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "%s に起動しています"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "新しいバージョンの確認はhttps://github.com/amule-org/amule/releases/latestで。"
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMuleリモート制御"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "スナップショット："
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "ネットワーク"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "検索"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr ""
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "ダウンロード数"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
 msgstr ""
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "\t詳しい情報にはhttps://amule-org.github.io/docsを参考してください"
-
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "バグはhttps://github.com/amule-org/amule/issuesに気楽に報告してください"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "クライアント数"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"  著作権2003-2019、aMuleのチーム\n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "メッセージ"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "統計"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademliaに基づいています：XORトリックに基づいたP2Pルーティング。\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "設定"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr ""
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "サーバ・メッセージ：%s"
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "メッセージ"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "利用不可"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "最新バージョンはいつもhttps://github.com/amule-org/amule/releases/latestにあります"
+
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "接続中"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: ファイアウォールされています"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: 接続"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: 接続中"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: オフ"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "キャンセル"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "現在の接続試行を中止する"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "バージョン"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "切断する"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "ネットワークから切断します。"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "接続する"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "アドレス"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "ネットワークへ接続します。"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "説明"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "aMuleのログ"
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "アップ： %.1f(%.1f) | ダウン： %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "アップ： %.1f | ダウン： %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | 接続しています)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | 切断しています)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "本当にaMuleを終了しますか？"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "終了の確認"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Launch Command: "
 msgstr "コマンド： %s"
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "スキンディレクトリ '%s' は存在しません"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "ネットワーク"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "ネットワークウィンドウ"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "検索"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "検索ウィンドウ"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "ダウンロード数"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "ダウンロード"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "共有ファイルウィンドウ"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "メッセージ"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "ネットワークウィンドウ"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "メッセージウィンドウ"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "統計"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "統計グラフウィインドウ"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "設定"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "個人設定ウィンドウ"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "インポート"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "部分ファイルをインポートするためのツール"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "情報"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "ソフトウェア情報／ヘルプ"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kadネットワーク"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "ネットワークなし"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "致命的なエラー：タイマを生成できませんでした"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "リモートamuleへ接続する"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "接続を失いました"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "終了時に確認する"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "致命的なエラー：タイマを生成できませんでした"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Going to event loop..."
-msgstr "ファイル情報を回復しようとしています…"
+msgstr "ファイル情報を回復しようとしています..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Connecting..."
 msgstr "接続中"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr ""
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "%s（%s：%i）の接続の試しがタイムアウトました。"
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "無効"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "ネットワークへ接続します。"
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "全て"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "利用不可能です"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "ファイルは見付かりませんでした。"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "不正なリンク、またはリンクがすでにリストに入っています。"
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "あなたはすでにファイル%sをダウンロードしようとしています"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "不明"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "ユーザ '%s' から共有ファイルを取得することができませんでした"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr "（偽のeMuleバージョン %#x）"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr "（偽のeMule）"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule（偽のeMule）"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x（eMule v0.%u に基づいています）"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "NickName: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "要求：%s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "当セッションのファイル統計： %d / %d の要求を受け入れ、%s 転送された\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "全セッションのファイル統計： %d / %d の要求を受け入れ、%s 転送された\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "不明なファイルが要求されました"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "%s（IP：%s）からのメッセージがフィルタされました"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "%s（IP：%s）から新しいメッセージが届きました"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "ユーザ %s（%u）はあなたのディレクトリ %s の共有ファイル・リストを要求しました -> 拒否しました"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "ユーザ '%s' から共有ファイルを取得することができませんでした"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "警告：known.metを開くことはできません。"
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 #, fuzzy
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "警告：Knownfileリストは破損され、不正なヘッダーが含まれています。"
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "known.metファイル%sを読む時にIOエラーが発生しました"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "known.metファイル%sを保存する時にIOエラーが発生しました"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "カテゴリ"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "新しいカテゴリ"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "受信ファイルのフォルダを選択する"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "カテゴリに名前を与えなければなりません！"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "カテゴリにパスを与えなければなりません！"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr "カテゴリに受信ディレクトリを生成するのに失敗しました。正当なパスを指示してください！"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "チャット・セションを開始しました：%s（%s：%u）-%s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** クライアントに接続しています ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** クライアントに接続中です ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** クライアントに接続に失敗しました／接続を失いました ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "タブを閉める"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "全てのタブを閉める"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "他のタブを閉める"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "仲間リストに追加する"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "詳細を表示(&D)"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "仲間リストから外す"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "友達スロットを設立する"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "ファイルを見る"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "メッセージを送る"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "ユーザへメッセージを送る"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "メッセージ："
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr "スロットが一つのみ提供されました。"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "複数選択"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "仲間リストから外す"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "共有ファイル・リストを再ロードします。"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "クレジット・ファイルをロードしました。%u個のクライアントが既知です"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - %u個のクライアントのクレジット期限が満了しました！"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "'cryptkey.dat'が見つかりませんでした。生成します。"
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "クライアントの詳細"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "有効"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "サポート"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "非サポート"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "無効"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "接続"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "切断"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "名前"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IPアドレス"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "最後に受信した時刻"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "バージョン"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "アップロード速度"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "ダウンロード速度："
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "アップロード済み"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "合計ダウンロード： "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "DL/UP変更"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "オンライン署名"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "不完全です"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "悪意の相手"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "検証されています"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "非適用"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "利用不可能です"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "ファイル"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "アップロード済み"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "ダウンロード済み"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "ダウンロード"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "アップロード"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "アクティブ"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "不明"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "ユーザ %s（%u）はあなたの共有ファイル・リストを要求しました -> 許可しました"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "ユーザ %s（%u）はあなたの共有ファイル・リストを要求しました -> 拒否しました"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "ユーザ %s（%u）はあなたの共有ディレクトリ・リストを要求しました -> 許可しました"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "ユーザ %s（%u）はあなたの共有ディレクトリ・リストを要求しました -> 拒否しました"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "ユーザ %s（%u）はあなたのディレクトリ %s の共有ファイル・リストを要求しました -> 許可しました"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "ユーザ %s（%u）はあなたのディレクトリ %s の共有ファイル・リストを要求しました -> 拒否しました"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "ユーザ %s（%u）は %s のディレクトリを共有しています"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "ユーザ %s（%u）は要求されていない共有ディレクトリを送りました。"
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "ユーザ %s（%u）はディレクトリ %s の共有ファイル・リストを送りました。"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "ユーザ %s（%u）は共有ファイル・リストの送信を終了しました"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "ユーザ %s（%u）は無用の共有ファイル・リストを送りました。"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "ユーザ %s（%u）は共有ファイルまたはディレクトリ・リストへのアクセスを拒否しました。"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "ファイル・コメント"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "ユーザ名"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "ファイル名"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "評価"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "コメント"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kadが走っていない中にはKadの検索はできません"
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "コメントがありません"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u個のコメントがあります"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "サーバリストを%sからダウンロードするのに失敗しました"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "オート Lo"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "オート No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "オート Hi"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "非常に低い"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "低い"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "普通"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "高い"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "非常に高い"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "離す"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "要求中"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "サーバ経由に接続中"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "キューが一杯"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "キューに入っています"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "ダウンロード"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "ハッシュセットを取得中"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "必要な部分がありません"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "LowIDとLowIDの間の接続ができません"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "接続が多すぎます"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Kad経由に接続中"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Kad接続が多すぎます"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "接続禁止"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "接続エラー"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "リモートキューが一杯"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "古いMLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "新しいMLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule互換"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "ローカルサーバ"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "リモートサーバ"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "ソース交流"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "パッシブ"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "リンク"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "ソースシード"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "完成された数"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "途中です"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "空き容量不足"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "キューに追加しました"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "すでにダウンロード中です"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "不明な、または不利なtempfileフォーマット。"
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "サイズ"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "転送済み"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "スピード"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "進捗状況"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "ソース数"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "優先度"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "ステータス"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "残り時間"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "最後に全部分を確認した時刻"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "最後に受信した時刻"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "本当に選択されたファイルを削除しますか？"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "本当に選択されたファイルを削除しますか？"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"フィードバック:%s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "自動"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "中止する(&S)"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "停止する(&P)"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "再開する(&R)"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "完了したものをクリアする(&L)"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "すぐにこのファイルの全てのA4AFを交換する"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "このファイルの全てのA4AFを交換する（オート）"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "このファイル以外の全てのA4AFを交換する"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "拡張オプション"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "プレビュー"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "ファイルの詳細(&D)"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "全てのコメントを表示"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "マグネットURIをクリップボードへコピーする"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "フィードバックをクリップボードにコピーする"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "このファイルにオプショナルURLを追加する"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "割り当てない"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "カテゴリに割り当てる"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "ファイルを開く(&O)"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "本当に選択されたファイルを削除しますか？"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "本当に選択されたファイルを削除しますか？"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"フィードバック:%s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "このファイルの新しい名前を入力してください："
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "ファイルの改名"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "ダウンロード数（%i）"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "ファイル・プレビュー"
+msgid "Downloads (%i)"
+msgstr "ダウンロード数（%i）"
 
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "エラー：外部メディア・プレイヤーを実行できませんでした！コマンド: `%s'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "DLの合計：%s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading temp files from %s."
 msgstr "server.metファイルをロード中です：%s"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "古いダウンロード・ファイル（%uから%u）からデータをロード中です"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "部分ファイルは見つかりませんでした"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "%u個の部分ファイルが見つかりました"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "一時ディレクトリがあるファイルシステムは大きなファイルを扱うことができません。"
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "受信ディレクトリがあるファイルシステムは大きなファイルを扱うことができません。"
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "%sをダウンロード中です"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "あなたはすでにファイル'%s'をダウンロードしようとしています"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "あなたはすでにファイル'%s'を持っています"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "あなたはすでにファイル'%s'を持っています"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "あなたはすでにファイル%sをダウンロードしようとしています"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "リンクの不明なプロトコル：%s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client sent packet after authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "外部接続は終了しました。"
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "外部接続は空パスワードのため無効にしました！"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "外部接続を設定ファイルに無効しました"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "新しい外部接続を認められました"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "個人設定に空欄のパスワードがあるため、外部接続を拒否しました！"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "クライアントを接続中： %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "不明なバージョン"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "間違ったECバージョンID。バイナリ不互換性の可能性があります。同じスナップショットの コアとリモートを使用してください。"
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
-msgstr "任意CVSバージョンからリリースバージョンに接続はできません！ *ハァ…*起こり得るクラッシュを予防しました"
+msgstr "任意CVSバージョンからリリースバージョンに接続はできません！ *ハァ...*起こり得るクラッシュを予防しました"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "無効なプロトコルバージョン。"
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "プロトコルバージョンタグがありません。"
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "自動的なサーバへの接続は、あと%d秒で再試行します"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: wrong password."
 msgstr "認証に失敗しました。"
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: missing password."
 msgstr "認証に失敗しました。"
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Invalid request, please authenticate first."
 msgstr "無効なリクエストです。先に認証をしてください。"
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "アクセスを認められました。"
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "知らないクライアントからのメッセージをフィルタする"
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "不正アクセスの試みがなされました。接続は閉じました。"
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "リモート部分ファイルコマンドが失敗しました：ファイルハッシュは見付かりませんでした： %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "ファイルハッシュは見付かりませんでした： %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "あら！OpCode処理エラーが発生しました！"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "サーバは追加しませんでした"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "サーバは見付かりませんでした： %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "削除したいサーバを定義しなければなりません"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "ファイルは見付かりませんでした。"
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "ファイルは見付かりませんでした。"
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "検索中です。あと少しで結果をもう一度取ってきます！"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "リモートインタフェイスからWebSearchする意味がありません。"
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "検索中です。あと少しで結果をもう一度取ってきます！"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "グラフを表示するための点がありません。"
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "あなたのクライアントはこの詳細段階には設定されていません。"
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "既にシャットダウン中です。"
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn：次のリンクを追加中です： '%s'。"
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "不正なリンク、またはリンクがすでにリストに入っています。"
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "ファイルは見付かりませんでした。"
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "不正なファイル名。"
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "ファイルを改名できません。"
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "チャット・セションを閉じます。"
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "新しいチャットセッションの開始"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "チャット・セションを閉じます。"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kadは個人設定に無効されています。"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "（不明な名前）"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kadは個人設定に無効されています。"
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "すでにKadに接続しています。"
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Kadに接続中です…"
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "全てのネットワークが無効になっています。"
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Kadから切断しています。"
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "不正なOpCode（プロトコルバージョンが違いますか？）"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "'%s'コマンドに不明な拡張子'%s'。\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "不明なコマンド'%s'。\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1873,7 +2392,7 @@
 "\n"
 "このコマンドには引数は認められていません。\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1881,7 +2400,7 @@
 "\n"
 "このコマンドには引数が必要です。\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1889,7 +2408,7 @@
 "\n"
 "このコマンドは不完全です。下記から拡張をひとつ選択してください。\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1897,11 +2416,11 @@
 "\n"
 "利用可能な拡張：\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "利用可能なコマンド：\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1912,17 +2431,17 @@
 "すべてのコマンドは大文字と小文字を区別しません。\n"
 "'%s <コマンド>'を入力すると<コマンド>の詳細情報が表示されます。\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "アプリケーションが終了します。"
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "ヘルプを表示します。"
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1930,7 +2449,7 @@
 "コマンドに対してヘルプを得るためには'help ＜コマンド＞'を入力してください。\n"
 "全てのコマンドのリストを得るためには'help'を入力してください。\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1941,46 +2460,46 @@
 "コマンド・リストには'%s'を使用してください\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "シンタックス・エラー！"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "コマンドを処理する時にエラーが発生しました。これはありえない！バッグをリポートしてください\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "このコマンドには引数が認められていません。"
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "このコマンドには引数が不可欠です。"
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "引数が不正です。"
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "このコマンドは不完全です。"
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "'%s'を入力して、ヘルプを得てください。\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "これは %s %s %s　です\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "これは %s %s　です\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1988,7 +2507,7 @@
 "\n"
 "クライアントを生成中です…\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1997,7 +2516,7 @@
 "\n"
 "OK、%s を終了中です…\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2011,2237 +2530,2911 @@
 "\n"
 "終了中です…\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "このヘルプ・テキストを表示する。"
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "aMuleが起動しているホストです。（デフォルト：127.0.0.1）"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "aMuleの外接続用のポート。（デフォルト：4712）"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "外接続用のパスワード。"
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "設定をファイルから読み込む。"
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "アウトプットをstdoutにプリンとしないように。"
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "冗長にして：デバッグ・メッセージも表示する。"
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "プログラム・ロカールを設定する（言語）。"
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "コマンド・ライン・オプションを設定ファイルに書き込む。"
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "aMuleの設定ファイルを元に設定ファイルを生成する。"
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "プログラム・バージョンをプリンとする。"
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "ファイルの詳細"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%%終わりました"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "ファイル・プレビュー"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "エラー：外部メディア・プレイヤーを実行できませんでした！コマンド: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "エラー: 部分ファイル '%s' が開けませんでした"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "ようこそ！"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "仲間と接続しています"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "接続状況："
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "ネットワーク"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "ブートストラップ"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "あなたはすでにファイル%sをダウンロードしようとしています"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "閲覧"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "友達"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "詳細を表示(&D)"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "友達を追加する"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "友達を削除する"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "送信 &Message"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "ファイルを見る"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "友達スロットを設立する"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "選択された友達を削除しますか？"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "選択された友達を削除しますか？"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
 msgstr "スロットが一つのみ提供されました。"
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "複数選択"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr "スロットが一つのみ提供されました。"
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "ユーザへメッセージを送る"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "メッセージ："
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "仲間リストから外す"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "メッセージを送る"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "このファイルへ交換する"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "他のファイルを頼みました"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "待機中のアップロード数： %s"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "キューに入っています"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "アップロード"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "None"
 msgstr "誰も許可しない"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "いいえ"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "はい"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "%s（%s）を開くことはできませんでした"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "ダウンロード中…"
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "ユーザ '%s' から共有ファイルを取得することができませんでした"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "あなたはすでにファイル%sをダウンロードしようとしています"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "ダウンロード済み"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "ダウンロード数（%i）"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "サーバリストを%sからダウンロードするのに失敗しました"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "サーバリストを%sからダウンロードするのに失敗しました"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "サーバリストを%sからダウンロードするのに失敗しました"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 #, fuzzy
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "IPフィルタ'ipfilter.dat'と'ipfilterstatic.dat'をロード中です。"
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "'ipfilter.dat'ファイル'%s'のロードに失敗しました：不明なファイル・フォーマットに出会いました。"
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "'ipfilter.dat'ファイル'%s'のロードに失敗しました：不明なファイルを開くことはできませんでした。"
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "%u個のIPレンジを'%s'からロードしました。"
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "不正な形式の行を %u 個破棄しました。"
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"既知のクライアントから\n"
-"ブートストラップする"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "現在"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "移動平均"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "セッション平均"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "ノード数（%u）"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "ブートストラップするためには正しくないIPです"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "ブートストラップするためには正しくないポートです"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "必要なフィールドをすべて入力してください"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "メッセージ"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "本当に新しいnodes.datファイルをダウンロードしますか？\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "そうすると、現在のノードがなくなり、Kademliaへの接続も初期化されます。"
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "続けますか？"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: 検索キーワードが短すぎます"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "%u 個のKadコンタクトを読み込みました"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "%d個のKadコンタクトを書き込みました"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Kadネットワーク"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "ファイルサイズ"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "共有比"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "アップロード済み"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "要求済み"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "受付済み"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "ソース完了"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "システムの標準設定"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "アルバニア語"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "アラブ語"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Asturian"
+msgstr "エストニア語"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "バスク語"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "ブルガリア語"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "カタロニア語"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "中国語（簡体字）"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "中国語（繁体字）"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "クロアチア語"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "チェコ語"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "デンマーク語"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "オランダ語"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "英語（U.K.）"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "英語（U.K.）"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "エストニア語"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "フィンランド語"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "フランス語"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "ガリシア語"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "ドイツ語"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "ギリシア語"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "ヘブライ語"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "ハンガリー語"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "イタリア語"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "日本語"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "韓国語"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "リトアニア語"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "ルウェー語"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "ポーランド語"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "ポルトガル語"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "ポルトガル語（ブラジル）"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Romanian"
+msgstr "アルバニア語"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "ロシア語"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "スロベニア語"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "スペイン語"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "スウェーデン語"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "トルコ語"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "不明なバージョン"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unable to get error description for error %d"
 msgstr "注意： スキンファイル '%s' を読むために開けませんでした"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "ハッシュ中"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "完了中"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "完了"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "停止"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "エラーあり"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "待機"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "空のパスワードは無効です。"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "不正なパスワード、 MD5ハッシュではありません！"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "接続に失敗しました"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "外部接続は終了しました。"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "ExternalConn: サーバーからの応答が不正です。接続を閉じました。"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "ExternalConn: サーバーからの応答が不正です。接続を閉じました。"
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "成功です！aMuleへの接続を確立しました "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "成功です！接続を確立しました。"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Handshake failed."
 msgstr "外接続用のパスワード。"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "同期化スレドを始めました。"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "閉じる"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "カット"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "コピー"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "ペースト"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "クリア"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "全ての選択"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "無制限"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "aMuleを表示する"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "aMuleを隠す"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "接続"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "接続"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kas: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Kadに接続しています（ファイアウォール）"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "サーバIP："
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "サーバIP："
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "切断しています"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP：%s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "クライアント情報"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "aMuleを表示する"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "切断する"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "aMuleを隠す"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "接続する"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "終了"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "無制限"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMuleのトレイ・メニュー"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "UL：無制限"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "UL：%u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DL：無制限"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DL：%u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "ダウンロード速度："
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "アップロード速度"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "あだ名：%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "あだ名が選択されていません！"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "クライアントID："
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "サーバ名："
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "サーバIP："
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "接続されていません"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "オンライン証明：有効です"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "オンライン証明：無効です"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "動作時間： %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "DLの合計：%s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "ULの合計：%s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "コミット"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "コアにED2K、またはマグネット・リンクを追加します。"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "仲間リストに追加する"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "イベントはここに表示されます。イベントの全てのリストにはサーバ・タブに存在するログを参考してください。"
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "ロード中…"
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "接続中のサーバのユーザ数…"
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "ユーザ：0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "現在接続中のサーバのユーザ数と合計ユーザ数の推測。"
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "アップ： 0.0 | ダウン： 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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 "接続状態とアクティブ転送数を表示します。赤い矢印は現在接続していないことを意味します。黄色の矢印はlow ID（ファイアウォールされている）を意味します。緑色の矢印はhigh ID（最善の接続）を意味します。"
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "切断しています…"
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "現在接続しているサーバ。"
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "検索"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "名前："
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "タイプ"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "ローカル"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "グローバル"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "拡張パラメタ"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "フィルタリング"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "フィルタの種類"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "すべて"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "アーカイブ"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "オーディオ"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CDイメージ"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "画像"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "プログラム"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "テキスト"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "ビデオ"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "拡張子"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "最小サイズ"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "B"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "最大サイズ"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "入手可能範囲"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "フィルタ："
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "フィルタの結果"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "フィルタ"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "結果を反転する"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "既知のファイルを隠す"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "フィールドをリセット"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "開始"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "もっと"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "拡張子"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "中止"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "ダウンロード"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "カテゴリにダウンロードする"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "フィルタの結果"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "フィールドをリセット"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "結果"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "完成したダウンロードをクリアします"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "フィルタ："
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "ソース完了"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "一般"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "完全名："
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "非適用"
-
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "metファイル："
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "ハッシュ："
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "ファイル・サイズ："
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "部分ファイルの状態："
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "最後に完全として見た時間："
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "完全名"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "metファイル"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "ハッシュ"
+
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "ファイル・サイズ"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "転送"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "見つかったソース："
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "部分ファイルの状態"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "最後に完全として見た時間"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "見つかったソース"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "転送中のソース"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "ファイル部分の数"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "入手可能数"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "データ・レート"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "ダウンロードのアクティブ時間"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "完全サイズ"
+
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
+msgstr "I.C.H.（知的破損処理）"
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "転送中のソース："
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "ファイル部分の数："
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "入手可能数："
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "破損による損失"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "データ・レート："
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "圧縮による獲得"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "ダウンロードのアクティブ時間："
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "転送済み："
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "完全サイズ："
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "I.C.H.に救済されたパケット"
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
-msgstr "I.C.H.（知的破損処理）"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "共有： "
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "破損による損失："
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "圧縮による獲得："
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "I.C.H.に救済されたパケット："
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "要求"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "認められた要求"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "転送されたデータ"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "共有比"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "完成したソース"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "共有ファイル"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr "、 アップロード： "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Kad情報"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "評価されていません"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "タイトル"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "ファイル名"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "引き継ぐ"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "クリーンアップ"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "適用"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "ファイルへのコメントまたは評価を書き込んでください（テキストは全ユーザが見ることができます）"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "ファイルの質"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "評価されていません"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "不正／損被／偽造"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "悪い"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "悪くない"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "良い"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "優秀"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "ファイルの評価を選択するか、または偽造の注意を他のユーザに伝えてください…"
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Kadから切断しています"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "リフレッシュする"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "ダウンロード中です。しばらくお待ちください…"
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "サイズが不明です"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "不可欠な情報"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IPアドレス："
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "ポート："
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "ポート"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "追加情報"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "ユーザ名："
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "ユーザ・ハッシュ："
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "ユーザ・ハッシュ"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "追加"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "ダウンロード速度："
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "現在"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "移動平均"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "セッション平均"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "アップロード速度"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "接続数"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "アクティブなダウンロード数"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "アクティブな接続（1:1）"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "アクティブなアップロード数"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "統計木"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "ユーザ名："
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "ユーザ・ハッシュ："
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "クライアント・ソフトウェア："
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "クライアント・バージョン："
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "クライアント・ソフトウェア"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "クライアント・バージョン"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ユーザID"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "サーバIP"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IPアドレス："
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ユーザID："
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "サーバ名"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "サーバIP："
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "難読化"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "サーバ名："
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "難読化:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "プロトコルを難読化する"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "クライアントへの転送数"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "現在の要求："
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "平均アップロード速度："
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "平均ダウンロード速度："
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "アップロード（セッション）："
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "ダウンロード（セッション）："
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "アップロード（合計）："
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "ダウンロード（合計）："
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "現在の要求"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "平均アップロード速度"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "平均ダウンロード速度"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "アップロード（セッション）"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "ダウンロード（セッション）"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "アップロード（合計）"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "ダウンロード（合計）"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "スコア"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "DL/UP変更："
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "セキュア認証"
 
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "セキュア認証："
-
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "キューに追加しました"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "キュースコア："
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "キュースコア"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "ニックネーム"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr "接続してくるユーザはこの名前を見ることになります。"
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "ツールチップを表示するまでの遅延時間。"
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "コントロールに使う言語をここで指定します。"
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "起動時に新バージョンを確認する"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "これを有効にするとaMuleはスタートアップの時に新バージョンをチェックする"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "起動時に最小化にする"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "これを有効にするとaMuleは起動時に最小化する。"
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "終了時に確認する"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "トレイ・アイコンを有効にする"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "システム・トレイ、またはタスク・バーのアイコンを有効／無効にします。"
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "最小化時にトレイ・アイコンに入れる"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "これを有効にするとaMuleはタスク・バーの代わりにシステム・トレイに最小化します。"
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "設定を記憶する"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "ブラウザ選択"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "閲覧"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "可能ならば新しいタブで開く"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "可能なら、ウェブ・ページを新しいウインドウではなくて新しいタブで開きます"
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "ビデオ・プレイヤー"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "アップロード"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "スロット割り当て"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "スタートアップに自動接続する"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "接続を失う時に再接続する"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "再試行後、応答のないサーバを削除する。再試行回数："
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "回"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "リスト"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "優先度システムを使用する"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "接続の時にLowIDチェックを使用する"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "安全接続"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "スタティック・リストに含まれているサーバのみに自動接続する"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "手動で追加したサーバを高い優先度に設定する"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "ダウンロードファイルを停止モードで追加する"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "ダウンロードファイルを優先度を自動にして追加する"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "最初と最後のチャンクを先にダウンロードしようとする"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "同じカテゴリから"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "新しいファイルのためのディスク領域を事前に確保する"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "新しいファイルのためにファイル全体が格納できるディスク領域を事前に確保し、断片化を防ぎます。"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "望ましい最小のディスク領域をここに入力してください。"
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "珍しいファイルには10ソースを保存する（<20ソース）"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "アップロード数"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "新しい共有ファイルを自動優先度として追加する"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "削除"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "（再帰的に共有するにはフォルダ・アイコンを右クリックしてください）"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "隠れたファイルを共有する"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "リモートサーバ"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "ローカルサーバ"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "グラフ"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "アップデート延期：５秒"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "平均グラフの時間：１００分"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "接続数のグラフスケール：１００"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "背景"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "グリッド"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "ダウンロード現在"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "ダウンロード移動平均"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "ダウンロードセッション平均"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "アップロード現在"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "アップロード移動平均"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "アップロードセッション平均"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "アクティブ接続数"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "システム・トレイ・アイコン・スピードバー"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "現在のKadノード数"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "動作中のKadノード数"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "セッションのKadノード数"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "選択"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "表示されているクライアントのバージョン数（0＝無制限）"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "！！！注意！！！"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "最大の新しい接続数（5秒ごと）"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "FTPアップデートレート間隔（分）"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "FTPアップデートレート間隔（分）"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "ファイル・バファー・サイズ：240000バイト"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "アップロードキューサイズ：5000クライアント"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "サーバ接続のリフレッシュ空間：無効にする"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "延長情報をカテゴリ・タブで表示する"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "タイトルに転送速度を表示する"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "タイトルに転送速度を表示する"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "垂直ツールバー"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "フラット"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "ラウンド"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMuleはダウンロードリストの列を自動的にソートする"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "外部接続のパラメタ"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "外部接続を許可にする"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "リスンしているECインターフェイス用の正当なIPアドレスをa.b.c.dのフォーマットで入力してください。空のフィールド、または0.0.0.0は任意のインターフェイスを意味します。"
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "ECポートでUPnPポート転送を有効にする"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "パスワード"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "プロクシー・ポート："
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "パスワードをチェック中です\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "パスワードをチェック中です\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "ゲストアクセスを拒否する"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "全権限パスワード"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "ウェブテンプレート"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "全権限パスワード"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "低権限ユーザを有効にする"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "低権限パスワード"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "ページのリフレッシュ間隔（秒単位）"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "gzip圧縮を有効にする"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "システムの標準設定"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "設定の変更をすべて適用します。"
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "設定の変更を全てリセットする"
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "タイトル："
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "コメント："
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "受信ディレクトリ："
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "新しく割り当てられたファイルの優先度を変更する："
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "受信ディレクトリ"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "新しく割り当てられたファイルの優先度を変更する"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "変更しない"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "このカテゴリの色を選択する（現在選択中）："
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "リセット"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "このカテゴリの色を選択する（現在選択中）"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "このボタンをクリックするとログのリセットが行います。"
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "このボタンをクリックするとサーバ・リストはURLから最新化する..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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ファイルへのURLをここに入力してから左側のボタンをクリックすると、既知のサーバのリストがアップデートされます。"
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "新しいサーバの名前をここに入力してください"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:ポート"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "サーバのポートをここに入力してください。"
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "手動でサーバを追加する（先に左側のフィールドを入力してください）..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMuleのログ"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "サーバ情報"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2K情報"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kad情報"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "このボタンをクリックするとノード・リストをURLからアップデートします..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "ノード数（0）"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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ファイルへのURLを入力してから左側のボタンをクリックすると、既知のノード・リストをアップデートします。"
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "ノードの統計"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "ブートストラップ"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "新しいノード"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP："
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "ポート："
-
-#: src/muuli_wdr.cpp:2327
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Bootstrap from known clients"
+msgid "Bootstrap from node: IP"
 msgstr ""
 "既知のクライアントから\n"
 "ブートストラップする"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Kadを切断する"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "x.x.x.xフォーマットでサーバのIPアドレスを入力してください。"
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "セキュア・ユーザ保証（SUI）を使用する"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr "このオプションを有効にするのは推奨されます。SUIが有効でないとあなたはクレジットを得られません。"
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "プロトコルを難読化する"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "プロトコルの難読化を有効にする"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "このオプションによってプロトコルの難読化を有効にできます。そうすると、aMuleは他のクライアントからの難読化された接続を受け入れられます。"
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "外方向の接続に難読化を使用する"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "このオプションによって、aMuleは他のサーバまたはクライアントに接続する時にプロトコル難読化を使用します。"
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "難読化された接続のみを受信する"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "全員"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr "あなたの共有ファイル・リストを要求できるユーザを選択してください。"
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IPフィルタリング"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "クライアントをフィルタする"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "~/.aMule/ipfilter.datに登録されちるクライアントIPにフィルタリングをかけることを有効にします。"
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "サーバをフィルタする"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "~/.aMule/ipfilter.datに登録されちるサーバIPにフィルタリングをかけることを有効にします。"
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "リストを再ロードする"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "フィルタリングをかける目標のIPリストを~/.aMule/ipfilter.datから再ロードをします。"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL："
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "只今アップデートする"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "スタートアップの時にipfilterを自動アップデートする"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "フィルタリング段階："
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "いつもLANのIPにフィルタリングをかける"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "適合しないIPを被害妄想的に扱う"
 
-#: src/muuli_wdr.cpp:2438
-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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "提供されていれば、全システム応用のipfilter.datファイルを使用する"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "ローカルなipfilter.datファイルが見つからなければ、全システム応用のipfilter.datファイルを使用可能します。"
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "オンライン証明を有効にする"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "OSファイルの書き込みを有効にします。このファイルは外のアプリケーションに証明等を作成するためにを使用されます。"
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "アップデート頻度（秒単位）"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "オンライン証明アップデート頻度（秒単位）を変化します。"
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "ここをクリックするとオンライン証明ファイルが入っているディレクトリを選択できます。"
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "データ・レート："
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "ソース数"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4249,11 +5442,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4263,850 +5456,765 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "ダウンロード： "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "スタートアップの時にipfilterを自動アップデートする"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "受信メッセージをフィルタする（現在のチャットを除く）："
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "全てのメッセージをフィルタする"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "友達リストの入っていない方々からのメッセージをフィルタする"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "知らないクライアントからのメッセージをフィルタする"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "次のストリングが入っているメッセージをフィルタする（','で区分する）："
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "amuleがメッセージ・フィルタ／ブロックの目標にする言葉をここに追加してください"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "コメント"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "次のストリングが入っていコメントをフィルタする（','で区分する）："
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "認証を有効にする"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "ユーザ名／パスワード認証を有効／無効にする"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr ""
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "プロクシーに接続に使うユーザ名"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "パスワード："
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "プロクシーに接続に使うパスワード"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "プロクシを有効にする"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "プロクシ・サポートを有効／無効にする"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "プロクシの種類："
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "プロクシー・ホスト："
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "プロクシの種類"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "プロクシー・ホスト"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "プロクシー・ホスト名："
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "プロクシー・ポート："
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "プロクシー・ポート"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "プロクシーのポート"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "認証を有効にする"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "ユーザ名／パスワード認証を有効／無効にする"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "プロクシーに接続に使うユーザ名"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "プロクシーに接続に使うパスワード"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "次に接続する："
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "リモートamuleにログインする"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "ユーザ名"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "設定を記憶する"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "外部接続は終了しました。"
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "gzip圧縮を使用する"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "冗長なデバッグ・ロギングを有効にする"
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "ファイルを開く(&O)"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "メッセージのカテゴリ："
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "待機中…"
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "インポートを追加する"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "選択したものを再試行"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "選択したものを破棄"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "アクティブなアップロード数："
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Show Clients for"
+msgstr "クライアントを表示する"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "共有ファイルを隠す"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "ビュー・フィルタを選択してください"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "アクティブなアップロード数"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "クライアントを表示する"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "リストを再ロードする"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "共有ファイルを再ロードする"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "送信する"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "指示するメッセージを送信します。"
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "チャット・セションを閉じます。"
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "すべてのサーバ、もしくはKadに接続する"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "キャンセル"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "共有ファイル"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "切断する"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "接続する"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "使用不可能 %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "バイト"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "B/s"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "秒"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "分"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "時間"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "日"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "全て"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "他の全て"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "未完成"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "中断しています"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "アーカイブ"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "テキスト"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "アクティブ"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "このコマンドには引数が認められていません。"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "このコマンドには引数が認められていません。"
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "このコマンドには引数が認められていません。"
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "このコマンドには引数が認められていません。"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "サーバのポートをここに入力してください。"
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "サーバのポートをここに入力してください。"
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "サーバのポートをここに入力してください。"
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "%s：%sをインポートします"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "一時フォルダを読み中です"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "基本情報をダウンロード情報ファイルから取ってきます"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "当てファイルを作成中です"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "古いダウンロード・ファイル（%uから%u）からデータをロード中です"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "データ・ブロックを一つの新しいダウンロード・ファイル（%uから%u）に纏め中です"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "ソース・ダウンロードファイル情報を取ってきます"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "ダウンロードを追加して、新しい部分ファイルを保存中です"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "部分ファイルをインポートをします"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "状況"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "ファイル・ハッシュ"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s（ディスク：%s）"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "一時ダウンロードを検索するフォルダを選択してください（サブフォルダは含まれます）"
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "成功にインポートしたダウンロードのソース・ファイルを削除しますか？"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "ソースを削除しますか？"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "エラー：部分ファイルを作成できませんでした！"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "metファイルのバックアップを%sからロードしようとしています"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "エラー： %s（%s）は破損されて（tagcountが間違っています）、ファイルはロード出来ません。"
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "ファイル情報を回復しようとしています…"
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "無名なファイルを回復中です：RecoveredFile.datとして回復しようとします"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "得られる全てのファイル情報を回復しました：使用しようとしています…"
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "残念ながら、ファイル情報を回復できませんでした。"
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "%s（%s）を開くことはできませんでした"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "部分ファイル%s（%s ==> %s）の保存中にエラーが発生しました"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 #, fuzzy
 msgid "IO failure while saving partfile: "
 msgstr "部分ファイル%s（%s ==> %s）の保存中にエラーが発生しました"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "%sのためのpart.met.seedsファイルは保存できませんでした"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "%i個のソース・シードを次の部分ファイルに保存しました：%s（%s）"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "%i個のソース・シードを次の部分ファイルに保存しました：%s（%s）"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "部分ファイルのシード・ファイルを読む時にエラーが発生しました：（%s - %s）%s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "破損されている部分（%d）が%d部分、ファイル%sに見つかりました：FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "完成した部分（%i）が%sに見つかりました"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "%sの再ハッシュを終了しました"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "ダウンロードが終了しました：%s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "ダウンロードが終了しました：%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "ファイルを削除します：%s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "注意：ディスク容量が足りません！ファイルを停止します：%s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "ダウンロードした部分%i（ファイル：%s）は破損されています"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr "ICH：破損された部分%i（%sのため）を回復しました→：%s バイトを保存しました"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "領域確保中"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "ダウンロード済み"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "エラー: 部分ファイル '%s' が開けませんでした"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "システムの標準設定"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "アルバニア語"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "アラブ語"
-
-#: src/Preferences.cpp:640
-#, fuzzy
-msgid "Asturian"
-msgstr "エストニア語"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "バスク語"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "ブルガリア語"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "カタロニア語"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "中国語（簡体字）"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "中国語（繁体字）"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "クロアチア語"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "チェコ語"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "デンマーク語"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "オランダ語"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "英語（U.K.）"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "英語（U.K.）"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "エストニア語"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "フィンランド語"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "フランス語"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "ガリシア語"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "ドイツ語"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "ギリシア語"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "ヘブライ語"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "ハンガリー語"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "イタリア語"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "イタリア語（スイス）"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "日本語"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "韓国語"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "リトアニア語"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "ルウェー語"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "ポーランド語"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "ポルトガル語"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "ポルトガル語（ブラジル）"
-
-#: src/Preferences.cpp:669
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "Romanian"
-msgstr "アルバニア語"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "ロシア語"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "スロベニア語"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "スペイン語"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "スウェーデン語"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "トルコ語"
+msgid "Extended source exchange"
+msgstr "ソース交流"
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:779
-#, fuzzy
-msgid "Change Language"
-msgstr "言語"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "利用不可"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "デフォルトポートを使用します (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "接続"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "ディレクトリ"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "サーバ数"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "ファイル"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "セキュリティ"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "プロクシ"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "リモート制御"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "オンライン署名"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "イベント"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "デバッグ"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5122,93 +6230,130 @@
 "この設定を変更しなくてもaMuleはうまく動いて\n"
 "います。"
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "接続するプロクシーの種類"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "パスワードをチェック中です\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
 msgstr "この変更点を有効するにはaMuleを再起動しなければなりません：\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCPポートを変更しました。\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDPポートを変更しました。\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "外部接続は終了しました。"
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "外部接続は終了しました。"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "新しい外部接続を認められました"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "外部接続は終了しました。"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "プロトコルを難読化する"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- 言語を変更しました。\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
-"外部接続を有効にしましたがパスワードを設定していません。\n"
-"有効なパスワードを設定しないと外部接続を可能できません。"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- 言語を変更しました。\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- 一時フォルダを変更しました。\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- ED2K network enabled.\n"
 msgstr "全てのネットワークが無効になっています。"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "無効なプロトコルバージョン。"
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5216,7 +6361,7 @@
 "UDPポートが無効になっているとKadは開始できません。\n"
 "UDPポートを有効にするか、またはKadを無効にしてください。"
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5226,20 +6371,69 @@
 "必ず早急にaMuleを再起動してください。\n"
 "今すぐに再起動しなければ、挙動がおかしくなる可能性があります。\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "オートリフレッシュを開始しました"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "あなたはすでにファイル%sをダウンロードしようとしています"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "新しい外部接続を認められました"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5249,41 +6443,65 @@
 "せめて一つのURLを入力して、有効なserver.metファイルを指定してください。\n"
 "このチェックボクスの近くの\"表\"ボタンをクリックして、URLを入力してください。"
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "一時ファイル"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "受信ファイル"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "オンライン署名"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr " %s のためのフォルダを選択する"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "%i個の既知の共有ファイルが見つかりました"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "ビデオプレイヤーを選択する"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "ブラウザを選択する"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "ブラウザを選択する"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "実行ファイル%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "システムの標準設定"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5291,1201 +6509,1451 @@
 "server.metファイルをダウンロードするURLをここに追加してください。\n"
 "一行にひとつのURLのみです。"
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "ソース完了"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "ステータス："
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "ステータス："
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "アップデート遅延時間： %d 秒"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "平均グラフの時間： %d 分"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "接続グラフスケール： %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "ファイルバッファサイズ： %d バイト"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "アップロードキューサイズ： %d クライアント"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "サーバ接続リフレッシュ遅延時間： %d 分"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "サーバ接続リフレッシュ遅延時間： 無効"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "disabled"
 msgstr "無効にする"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Execute command on '%s' event"
 msgstr " `%s' イベントにコマンドを実行する"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "コアにコマンドを実行することを有効にする"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "コアコマンド："
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "GUIにコマンドを実行することを有効にする"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "GUIコマンド："
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "次の変数は置換されます："
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "共有ファイルを再ロードする"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "共有ファイルを再ロードする"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "一時フォルダを読み中です"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "共有ファイル・リストを再ロードします。"
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "共有ファイル"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr " %s のためのフォルダを選択する"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "設定を記憶する"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "検索の注意"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "検索"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "途中です"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr "最小サイズは最大サイズより小さくなければなりません。最大サイズを無視します。"
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "検索の注意"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "メイン"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kadが走っていない中にはKadの検索はできません"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "警告：Knownfileリストは破損され、不正なヘッダーが含まれています。"
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Kadを検索する間に不明なエラーが発生しました： "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ファイルID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "評価されていません"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "カテゴリにダウンロードする"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ファイルID"
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "このファイルにオプショナルURLを追加する"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "全てのタブを閉める"
+
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "既知ファイルとしてマークする"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "削除しようとするサーバには現在接続しています。先に切断を行ってください。"
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "キャンセル"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "走っています"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "フィンランド語"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "難読化されたすべてのサーバへの接続に失敗しました。難読化せずにもう一度試みます。"
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "リストされたすべてのサーバへの接続に失敗しました。もう一度試行します。"
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "リストされたすべてのサーバへの接続に失敗しました。もう一度試行します。"
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "自動的なサーバへの接続は、あと%d秒で再試行します"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "%s（%s：%i）に接続しています"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr " %s に接続を確立しました"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "接続中に致命的なエラーが発生しました。インターネット接続がダウンしている恐れがあります。"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "%s（%s：%i）の接続を失いました"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s（%s：%i）は応答しないようです。"
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s（%s：%i）は一杯のようです。"
 
-#: 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"
-msgstr0 "自動的なサーバへの接続は、あと%d秒で再試行します"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "接続を失いました"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "%s（%s：%i）の接続に失敗しました。"
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "%s（%s：%i）の接続の試しがタイムアウトました。"
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "server.metファイルをロード中です：%s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Server.metファイルは見つかりませんでした！"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "server.metファイル'%s'をロードに失敗しました。不明なフォーマットが原因です。"
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "server.metを開くのに失敗しました！"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "server.metファイルは破損しています。不正なバージョン・タグが見つかりました：0x%x、サイズ %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "server.metに%i個のサーバが見つかりました"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d個のサーバが追加されました"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "known.metファイル%sを読む時にIOエラーが発生しました"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr "サーバは追加されていません：%s:%dは正当なポートを指示していません。"
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr "サーバは追加されていません：%s:%dはフィルタされているか、または不正です。"
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr "サーバは追加されていません：同じ%s:%dのIP:ポートはリストに見つかりました。"
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr "サーバは追加されました：%s:%dは'%s'という名前を使用しています。"
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "削除しようとするサーバには現在接続しています。先に切断を行ってください。"
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "'%s'を開くことができませんでした"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "server.metを保存するのに失敗しました！"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "known.metファイル%sを読む時にIOエラーが発生しました"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "不正なURL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "サーバリストを%sからダウンロードするのを完了しました"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "サーバリストを%sからダウンロードするのを開始する"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "addresses.datに、正しいserver.metの自動ダウンロードURLがありません。"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "サーバリストを%sからダウンロードするのに失敗しました"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "ローカル・サーバはIPFiltersにフィルタされているため、違うサーバに接続します！"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "サーバ名"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "アドレス"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "ポート"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "説明"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "ユーザ"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "ユーザ"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "スタティック"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "バージョン"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "ファイル"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "共有ファイル"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "接続中のサーバを削除しようとしています。先に切断してください。 このサーバは削除されませんでした。"
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "（不明な名前）"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "スタティックサーバ %s を本当に削除しますか？"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "分"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "サーバ （%i）"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "サーバ"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "サーバへ接続する"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "サーバをスタティックとしてマークする"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "サーバを非スタティックとしてマークする"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "サーバをスタティックとしてマークする"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "サーバを非スタティックとしてマークする"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "サーバを削除する"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "サーバを削除する"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "全てのサーバを削除する"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "サーバへ再接続する"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "全てのサーバを本当に削除しますか？"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "全ての選択されたサーバを本当に削除しますか？"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "全ての選択されたサーバを本当に削除しますか？"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "新しいclientidは%uです"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "注意：あなたはLow-IDを得られました！"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\t恐らくパソコンがファイラウォールやルータの裏にあるのが原因です。"
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\t詳しい情報にはhttps://amule-org.github.io/docsを参考してください"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "不明なサーバ情報を受信しました！理由：短しぎます"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "%d個の新しいサーバを受信しました"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "サーバ・リストの保存を終了しました。"
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "サーバは最後のコマンドを断りました"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "サーバ%sから偽造のパケットが届きました"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "サーバ%sのパケットを処理する時に未処理例外エラーが発生しました"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr "%sに接続するためのDNS解決スレッドを作成せきません。"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "IPアドレス%sのサーバ%sはフィルタリングされています。接続はしません。"
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "難読化プロトコルを使用しています。"
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "%s（%s - %s：%i）%sへ接続中です。"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr "%sに接続するためのDNSは解決できませんでした：接続はできません！"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "aMuleのログ"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "サーバは追加しませんでした：IPまたはホスト名は指示されていませんでした。"
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "サーバは追加しませんでした：不正なサーバ・ポートが指示されました。"
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "接続状況："
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "接続"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kademliaのステータス："
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Running in LAN mode"
 msgstr "%s に起動しています"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "走っています"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Kademliaのステータス："
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "ステータス："
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "接続状況："
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "UDP Connection State:"
 msgstr "接続状況："
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "ファイアワォールされた状況："
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "仲間がありません"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connecting to buddy"
 msgstr "仲間と接続しています"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, fuzzy, c-format
 msgid "Connected to buddy at %s"
 msgstr "仲間と接続しています"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IPアドレス："
+
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed sources:"
 msgstr "見つかったソース："
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed notes:"
 msgstr "インデックスファイルが見付かりませんでした： "
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "平均のユーザ数："
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "平均のファイル数："
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "動作していません"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "%i個の既知の共有ファイルが見つかりました"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "%i個の既知、%i個の未知の共有ファイルが見つかりました"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "サーバは見付かりませんでした： %s"
 
-#: src/SharedFileList.cpp:486
-#, c-format
-msgid "No shareable files found in directory: %s"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "サーバは見付かりませんでした： %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "ユーザ名"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "ダウンロード速度："
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "known.metファイル%sを保存する時にIOエラーが発生しました"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "アップロード速度"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "server.metファイルをロード中です：%s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "server.metファイルをロード中です：%s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "%i個の既知の共有ファイルが見つかりました"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "入手可能数："
+msgid "User Name"
+msgstr "ユーザ名"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "アップロードの状態"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "ダウンロードの状態"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "ファイル名"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "共有ファイル"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "要求"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "認められた要求"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "転送されたデータ"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "共有比"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "得られた部分"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "完成したソース"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "入手可能範囲"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "ディレクトリパス"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "共有ファイル"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "コメントおよび評価を追加する"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "コメントおよび評価を編集する"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "改名する"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "コレクションに存在するファイルを転送リストに追加する"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "マグネット &URI をクリップボードにコピーする"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "ED2kリンクをクリップボードにコピーする（&AICH インフォ）"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "有効なソースリンクを作るにはHighIDが必要です"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "完了中にエラー"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "ユーザ '%s' から共有ファイルを取得することができませんでした"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "共有ファイルを再ロードする"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "共有ファイルの合計サイズ： %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "共有ファイルの合計サイズ： %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "共有ファイル（%i）"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "共有ファイル（%i）"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "部分ファイル"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "共有ファイル・リストを再ロードします。"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "ステータス"
+
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "ファイル名"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "アップロードされたデータ（セッション合計）： %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "合計オーバヘッド（パケット数）： %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "ファイル要求のオーバヘッド（パケット数）： %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "ソース交換のオーバヘッド（パケット数）： %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "サーバのオーバヘッド（パケット数）： %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kadのオーバヘッド（パケット数）： %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "暗号化オーバーヘッド (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "アクティブなアップロード数： %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "待機中のアップロード数： %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "成功したアップロードセッションの合計： %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "失敗したアップロードセッションの合計： %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "平均アップロード時間： %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "ダウンロードされたデータ（セッション合計）： %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "見付かったソース： %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "アクティブなダウンロード数（塊数）： %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "セッションの合計UL/DL比： %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "再接続数： %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "最初の転送からの経過時間： %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "サーバへの接続時刻： %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "アクティブな接続数（推測）： %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "最大接続数への到達： %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "平均接続数（推測）： %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "ピーク接続数（推測）： %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "クライアント数"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "サイズが不明です"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "フィルタされた数"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Banned: %s"
 msgstr "接続禁止"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "合計： %i 既知： %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "動作サーバ数： %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "失敗したサーバ数： %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "合計： %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "削除されたサーバ数： %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "フィルタされたサーバ数： %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "動作サーバのユーザ数： %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "動作サーバのファイル数： %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "ユーザ合計： %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "ファイル合計： %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "サーバ占有： %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "共有ファイル数： %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "共有ファイルの合計サイズ： %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "オペレーティング・システム"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "受信していません"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "アクティブな接続（1:%u）"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "利用不可"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "記録なし"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "<str>を実行してから終了する。"
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr "不正なIPフォーマット。xx.xxx.xxx.xxx:xxxxを使用ください\n"
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "このコマンドには引数が必要です。有効な引数：'all'、ファイル名、または数字。\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "ハッシュで処理しています: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "ファイル名で処理しています: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "このコマンドには引数が必要です。有効な引数：ファイルのハッシュ。\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "正当な数字ではありません\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "正当なハッシュではありません（長さは丁度32半角文字あるべきです）\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6494,7 +7962,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6503,83 +7971,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "'%s'を入力して、ヘルプを得てください。\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "ダウンロード数（%i）"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "不明なエラーによって要求が失敗しました。"
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "オペレーションは成功しました。"
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "リクエストは次のエラーで失敗しました：%s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "クライアントのIPフィルタリングは%sです。\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "オフ"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "オン"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "サーバのIPフィルタリングは%sです。\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "現在のIPフィルタ段階は%dです。\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
 msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "%s %s %sに接続されています"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "只今接続中です"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "ファイアウォールされています"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6588,7 +8060,7 @@
 "\n"
 "ダウンロード数：\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6597,7 +8069,7 @@
 "\n"
 "アップロード数：\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6606,7 +8078,7 @@
 "\n"
 "キューに入っているクライアント数：\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6615,38 +8087,33 @@
 "\n"
 "合計ソース数：\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "部分ファイル"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "検索結果数：%i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr ""
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "サーバから不明な返事が届きまして、OpCodeは%#xです。"
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "短い状態情報を表示する"
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "コ接続状態、現在のアップロード／ダウンロード速度等を表示する。\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "詳細な統計ツリーを表示する。"
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6660,51 +8127,51 @@
 "\n"
 "例： 'statistics 5'は各クライアントの一番上の５つのバージョンしか表示しません。\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload the given object."
 msgstr "指示されたオブジェクトを再ロードします。"
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload shared files list."
 msgstr "共有ファイル・リストを再ロードします。"
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload IP filtering table."
 msgstr "指示されたIPフィルタ・テーブルをファイルから再ロードします。"
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload current IP filtering table."
 msgstr "IPフィルタリング段階を選択してください。"
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Update IP filtering table from URL."
 msgstr "指示されたIPフィルタ・テーブルをファイルから再ロードします。"
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "ネットワークへ接続します。"
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6716,36 +8183,36 @@
 "形で指示できます。IPアドレスはIPv4形のドット10進数字、或いは解決できる\n"
 "DNS名として指示しなければなりません。"
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Kadのみに接続します。"
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "ネットワークから切断します。"
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "これで現在に接続している全てのネットワークから切断します。\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Kadのみから切断します。"
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Add an eD2k or magnet link to core."
 msgstr "コアにED2K、またはマグネット・リンクを追加します。"
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6756,52 +8223,52 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "個人設定の値を設定してください。"
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Set IP filtering preferences."
 msgstr "IPFilterを設定してください。"
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "クライアントとサーバの両方のIPフィルタリングをオンします。"
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "クライアントとサーバの両方のIPフィルタリングをオフします。"
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "クライアントのフィルタリングを有効／無効します。"
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "クライアントのフィルタリングをオンします。"
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "クライアントのフィルタリングをオフします。"
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "サーバのフィルタリングを有効／無効します。"
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "サーバのフィルタリングをオンします。"
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "サーバのフィルタリングをオフします。"
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "IPフィルタリング段階を選択してください。"
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6809,66 +8276,80 @@
 "有効なフィルタリング段階は0〜255の間で、\n"
 "デフォルト値は127です。\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "帯域制限を設定します。"
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "このコマンドの引数の値は毎秒のキロバイトです。\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "アップロード・帯域幅の制限を設定します。"
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "このコマンドの引数の値は毎秒のキロバイトです。\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "ダウンロード・帯域幅の制限を設定します。"
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "ユーザ名／パスワード認証を有効／無効にする"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "このコマンドの引数の値は毎秒のキロバイトです。\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "個人設定の値を取ってきて、表示します。"
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering preferences."
 msgstr "IPFilterの個人設定の値を取ってきます。"
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for both clients and servers."
 msgstr "クライアントとサーバの両方のIPFilter状況を取ってきます。"
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for clients only."
 msgstr "クライアントのみのIPFilter状況を取ってきます。"
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for servers only."
 msgstr "サーバのみのIPFilter状況を取ってきます。"
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering level."
 msgstr "IPフィルタリング段階を選択してください。"
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "帯域制限の値を取ってきます。"
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a search."
 msgstr "Kadを検索します"
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6887,46 +8368,48 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a global search."
 msgstr "グローバル検索（GLOBAL）を実行します。"
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a local search"
 msgstr "ローカル検索（LOCAL）を実行します"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a kad search"
 msgstr "Kadを検索します"
 
-#: src/TextClient.cpp:1070
+#: src/TextClient.cpp
 #, fuzzy
-msgid "Show the results of the last search."
+msgid "Show the results of a search."
 msgstr "最後の検索の結果を表示します。"
 
-#: src/TextClient.cpp:1071
-#, fuzzy
-msgid "Return the results of the previous search.\n"
-msgstr "以前の検索の結果を回答します。\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "検索の進捗を表示します。"
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "検索の進捗を表示します。\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "ファイルのダウンロードを開始します"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6934,82 +8417,82 @@
 "以前の検索からファイル番号を選んで指定しなければなりません。\n"
 "例： 'download 12'は以前の検索結果で12として指定されたファイルのダウンロードを開始します。\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "ダウンロードを停止します。"
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "ダウンロードを再開します。"
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "ダウンロードをキャンセルします。"
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "ダウンロードのプライオリティーを設定します。"
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr "ダウンロードのプライオリティーを低い（Low）、普通（Normal）、高い（High）、またはオート（Auto）に設定します。\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "プライオリティーを低いに設定します。"
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "プライオリティーを普通に設定します。"
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "プライオリティーを高いに設定します。"
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "プライオリティーをオートに設定します。"
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "キュー／リストを表示します。"
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr "アップロード／ダウンロードキュー、サーバ・リスト、または共有リストを表示します。\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "アップロードキューを表示します。"
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "ダウンロードキューを表示します。"
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "ログを表示します。"
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "サーバ・リストを表示します。"
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "共有ファイル・リストを再ロードします。"
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "ログを再初期化します。"
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7018,256 +8501,279 @@
 "これは廃止予定のコマンドで、将来に存在がなくなる可能性が高いです。\n"
 "代わりに'%s'を使用してください。\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMuleテキストクライアント"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "ファイルを削除します：%s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "ファイルを削除します：%s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "ファイル %s のアップロードを再開します"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "'%s' の古いAICHハッシュセットを '%s' の64bに変換中です。"
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr "警告：ファイル名 '%s' は無効です。'%s' に改名されました。"
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr "警告：ファイル '%s' は既に存在します。新しいファイルを '%s' に改名しました。"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "本当にこのカテゴリの全てのファイルをキャンセルして削除しますか？"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "確認が必要です"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "接続が多すぎます"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "他の全て"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "ビュー・フィルタを選択してください"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "カテゴリを追加します"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "カテゴリを編集します"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "カテゴリを削除します"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "不明なファイルのハッシュセットが要求されました： %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "あなたの共有ファイル・リストを要求できるユーザを選択してください。"
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "ファイル %s のアップロードを再開します"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "ファイル %s のアップロードを一時停止します"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr "イベント'%2$s'にコマンド'%1$s'を起動できませんでした。"
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "ダウンロード完了"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "ファイルのフルパス。"
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "パス部分を除いたファイルの名前。"
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "ファイルのサイズ（バイト）。"
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "累計ダウンロード活動時間"
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "新しいチャットセッションの開始"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "メッセージ送信者。"
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "空き容量不足"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "ディスク・パーティション。"
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "完了中にエラー"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "ファイル %u: %s 番を処理中です"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "パートハッシュを要求しました（9.5MB以上のファイルサイズのみに使用されます）"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> このファイルは存在していません！\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "ようこそ！"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "入力パラメタ"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "ハッシュをするファイル"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "このファイルにオプショナルURLを追加する"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "削除"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "パートハッシュでリンクを生成する"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr "リンクサイズが大きくなるかわりに、新しくて珍しいファイルの配布を速くする"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4ファイルハッシュ"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "保存する"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "クリップボードへコピーする"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "aLinkCreatorについて"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "現在コピーできる物がありません！"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "開くことができません： "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "空でないファイル名を入力してください"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "現在保存できるものがありません！"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7279,162 +8785,159 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "ハッシュ中…"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "キャンセルされました！"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr " %.2f 秒で完了しました"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "このURLはもう追加しました！"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "空でないURLを入力してください"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "%s を開くことができません"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i 日 %i 時間 %i 分 %i 秒"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas、aMuleのオンライン統計"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "wxCasの起動以来の最大DL速度"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "前のwxCas起動を含めて記憶した最大DL速度"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "リセット"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "システム"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "オートリフレッシュを中止する"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "オンライン統計イメージを保存する"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "オンライン統計イメージを印刷する"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "設定"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "wxCasについて"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "オートリフレッシュを開始する"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "オートリフレッシュを中止しました"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "オートリフレッシュを開始しました"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "統計イメージを保存する"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMuleのオンライン統計"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7442,11 +8945,11 @@
 "印刷中に問題が発生しました。\n"
 "選択されたプリンタの設定に異常がありませんか？"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "印刷中です"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7464,402 +8967,523 @@
 "\n"
 "GPLの元で配布されます"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "aMuleは動作していません…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMuleは動作しています"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMuleは動作していますが接続はしていません"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMuleは接続中です…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "aMuleのステータスは不明です…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " の動作時間は "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " は停止しています！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " は接続していません！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " は接続中です…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " の挙動が変です。チェックしてください！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " は次のものに接続しています： "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kas: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "オフ"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " はオンです "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " とともに "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "合計ダウンロード： "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr "、 アップロード： "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "セッションダウンロード： "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "ダウンロード： "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s、アップロード： "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "共有： "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " ファイル、キュー中のクライアント： "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "時間： "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " オン "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "システムロード平均 （1-5-15分）： "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "システム動作時間： "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "amulesig.datファイルの入っているディレクトリ"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "amulesig.datファイルが入っているディレクトリをここに入力してください"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "リフレッシュレート間隔（秒）"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "各リフレッシュイベントで統計イメージを生成する"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "統計イメージを生成したいディレクトリをここに入力してください"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "統計イメージを定期的にFTPサーバへアップロードする"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTPのUrl"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTPのパース"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "FTPサーバのURLをここに入力してください"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "統計イメージを置きたいFTPサーバのディレクトリをここに入力してください"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "ユーザ"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "FTPサーバのログインに使うユーザ名をここに入力してください"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "FTPサーバのログインに使うパスワードをここに入力してください"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTPアップデートレート間隔（分）"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "実証"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "署名ファイルが入っているフォルダ"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "統計イメージを生成するフォルダ"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "テンプレート <str> をロードします"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnPポート"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "gzip圧縮を使用する"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "ゲストアクセスを許可する"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "ゲストアクセスを拒否する"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMuleの設定ファイルパス。注意：直接使用しないでください！"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "PHPインタープリタを無効にする（非推奨）"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "各要求ごとにPHPページを再コンパイルする"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMuleウェブサーバ"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "ウェブクライアント接続が受け入れられました\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "次のエラーによって要求が失敗しました： %s。"
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "インデックスファイルが見付かりませんでした： "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "セッション有効期限が切れました - ログインを要求しています\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "セッションOK、ログインしています\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "セッションOK、ログインしていません\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "セッションが開いていません - ログインを要求します\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "セッションを作成しました - ログインを要求しています\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "要求を処理中です original: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "パスワードをチェック中です\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "パスワードのハッシュが無効です\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "パスワードOKです\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "パスワードが正しくありません\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "パスワードを入力しませんでした。空のパスワードは許可されていません。\n"
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "ログアウトが要求されました\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "要求を処理中です 変更しました： "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "接続に失敗しました "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "アップロード済み"
+#~ msgid "Ratio"
+#~ msgstr "評価"
+
+#, fuzzy
+#~ msgid "Change Language"
+#~ msgstr "言語"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "利用不可"
+
+#~ msgid "User name"
+#~ msgstr "ユーザ名"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "得られた部分"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "入手可能数："
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "%i個の既知、%i個の未知の共有ファイルが見つかりました"
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "リモートサーバ"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "ファイルは見付かりませんでした。"
+#~ msgid "Local prefix:"
+#~ msgstr "ローカルサーバ"
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "古いダウンロード・ファイル（%uから%u）からデータをロード中です"
+
+#~ msgid "Filter Results"
+#~ msgstr "フィルタの結果"
+
+#~ msgid "Mark as known file"
+#~ msgstr "既知ファイルとしてマークする"
+
+#~ msgid "Bootstrap"
+#~ msgstr "ブートストラップ"
+
+#~ msgid "New node"
+#~ msgstr "新しいノード"
+
+#~ msgid "IP:"
+#~ msgstr "IP："
+
+#~ msgid "More"
+#~ msgstr "もっと"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "既知のクライアントから\n"
+#~ "ブートストラップする"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "すべてのサーバ、もしくはKadに接続する"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Kadを切断する"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "現在の接続試行を中止する"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "ネットワークから切断します。"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "ネットワークへ接続します。"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMuleはダウンロードリストの列を自動的にソートする"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "クライアントIPがパケットがもともと受信されたIPと違いますとパケットを拒否します。使用するに気をつけてください。"
+
+#, fuzzy
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "以前の検索の結果を回答します。\n"
+
+#, fuzzy
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "検索の進捗を表示します。\n"
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "起動時に新バージョンを確認する"
+
+#~ msgid "Commit"
+#~ msgstr "コミット"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "\t詳しい情報にはhttps://amule-org.github.io/docsを参考してください"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "バグはhttps://github.com/amule-org/amule/issuesに気楽に報告してください"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "アップロード済み"

amule-3.0.1.tar.gz/po/ko_KR.po -> amule-3.1.0.tar.gz/po/ko_KR.po Changed

@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:17+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:52+0000\n"
 "Last-Translator: Hyunju Kang <rexington@gmail.com>\n"
 "Language-Team: Korean <hoenny@daum.net>\n"
 "Language: ko_KR\n"
@@ -22,70 +22,153 @@
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "어뮬 보이기"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "어뮬 원격제어"
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "스냅삿"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "시작할때 새 버젼이 있는지 확인"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Kad에 연결중..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "오래된 어뮬 버젼을 사용하고 있습니다!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "유효하지 않음"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "친구 추가"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "정확한 IP와 포트를 입력하세요!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "정보"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "설정된 사용자 해시가 옳바르지 않습니다!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "연결 실패"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -94,142 +177,271 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "%s(%s)을 열지 못했습니다."
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "인덱스 파일을 찾을 수 없음:"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "사용자 %s로부터 공유파일을 찾지 못했습니다."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
 msgstr0 ""
 msgstr1 ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:179
-#, fuzzy
-msgid "Failed to open ED2KLinks file."
-msgstr "%s(%s)을 열지 못했습니다."
-
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "좋아, 나가는중 %s...\n"
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "실패"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "지역정보(로케일)가 설정 변경으로 인해 시스템 기본값으로 변경되었습니다. 죄송합니다."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "정보"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "종료 확인"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "새로운 외부연결이 승인되었습니다."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "경고"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "server.met에서 %i개의 서버가 발견됨"
+msgid "Loading temp files"
+msgstr "server.met 파일을 읽음: %s"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "server.met 파일을 읽음: %s"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "공유된 파일을 다시 읽어들임"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "공유된 파일을 다시 읽어들임"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "시작"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "통신망"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "통신망"
+msgid "eD2k server list (server.met)"
+msgstr "server.met에서 %i개의 서버가 발견됨"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "어뮬은 실행중입니다."
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "포트 %u는 사용할 수 없습니다. 낮은아이디를 가질것입니다.\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -244,48 +456,48 @@
 "\n"
 "나가고 들어오는것에 대해 포트가 열려있는지 통신망을 체크하세요. "
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "온라인서명 파일을 생성하지 못함"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "어뮬 온라인서명 파일을 생성하지 못함"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr "컴퓨터에 선택한 지역정보(로케일)가 설치 않된것 같습니다. (주의: 어쨌든 설정하겠습니다)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "이번에 어뮬 %s를 처음 실행했습니다."
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "이 버전은 테스트 버젼으로, 매일 업데이트되며, \n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "이 프로그램이 어느 것도 부수지 않는다고, 집을 태우지 않는다고, 혹은 \n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "개를 죽이지 않는다고 보장하지 않습니다. 그렇지만 안전하게 사용할 수 있을 것입니다.\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr "더 많은 정보, 지원, 새 릴리즈는 홈페이지 amule-org.github.io, 또는 IRC 채널\n"
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "(irc.libera.chat의 #aMule)에서 찾을 수 있습니다.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "버그는 https://github.com/amule-org/amule/issues로 보고해 주십시오."
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -293,1592 +505,1902 @@
 "지정한 온라인 서명 파일을 위한 폴더가 유효하지 않습니다.\n"
 " 온라인 서명은 환경설정에서 수정될 때까지 비활성화 됩니다."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 #, fuzzy
 msgid "Server hostname notified"
 msgstr "서버 이름:"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "오류: 로그파일을 열 수 없음"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "경고: 로그파일이 비어있습니다. 뭔가 잘못되어 있습니다."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "로그가 초기화되었습니다."
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "서버메시지: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "노드 목록을 내려받지 못했습니다."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "내려받은 버젼 검사 파일을 열지 못했습니다."
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "손상된 버젼 검사 파일"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "오래된 어뮬 버젼을 사용하고 있습니다!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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입니다."
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "최신 버젼은 항상 https://github.com/amule-org/amule/releases/latest 에서 찾을 수 있습니다."
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr "경고: 어뮬 버젼은 오래되었습니다: %i.%i.%i < %li.%li.%li"
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "어뮬은 최신 버전입니다."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "버젼 검사 파일을 내려받지 못했습니다."
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "낮은아이디로"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "높은아이디로"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "%s %s에 연결되었음"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s에 연결중"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad를 시작했습니다."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad를 멈췄습니다."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Kad에 연결됨 (양호)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Kad에 연결됨 (방화벽)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Kad로부터 연결이 끊김"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr "Kad 네트워크는 UDP 포트가 비활성될 시 사용할 수 없으며, 따라서 시작하지 않습니다."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kad 네트워크가 환경설정에서 비활성되어, 연결하지 않습니다."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 #, 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "오류: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "이 어뮬 %s는 이뮬 기반으로 되어있습니다."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "%s에 동작중"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "https://github.com/amule-org/amule/releases/latest에 방문하셔서 새로운버젼이 있는지 확인하십시오."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "어뮬 원격제어"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "스냅삿"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "통신망"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "검색"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr ""
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "내려받기"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
 msgstr ""
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "\t더 많은 정보는 https://amule-org.github.io/docs을 참조하세요."
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "클라이언트"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "버그는 https://github.com/amule-org/amule/issues로 보고해 주십시오."
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "메시지"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "통계"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "환경설정"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr ""
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "서버메시지: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr ""
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "유효하지 않음"
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "메시지"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "최신 버젼은 항상 https://github.com/amule-org/amule/releases/latest 에서 찾을 수 있습니다."
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "연결중"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Firewalled"
 msgstr "방화벽"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Connected"
 msgstr "연결됨"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Connecting"
 msgstr "연결중"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Kad: Off"
 msgstr " Kad: "
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "취소"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "현재 연결시도를 멈춤"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "버젼"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "연결 끊기"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "통신망으로부터 연결을 끊습니다."
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "연결"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "주소"
 
-#: src/amuleDlg.cpp:865
+#: src/amuleDlg.cpp
 #, fuzzy
-msgid "Connect to the currently enabled networks"
-msgstr "통신망에 연결합니다."
+msgid "Encryption"
+msgstr "설명"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "어뮬 로그"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "올려주기: %.1f(%.1f) | 내려받기: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-#, fuzzy
-msgid " kB/s"
-msgstr "kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "올려주기: %.1f | 내려받기: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "어뮬 (%s | 연결됨)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "어뮬 (%s | 끊김)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "어뮬을 종료하시겠습니까?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "종료 확인"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Launch Command: "
 msgstr "명령: %s"
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "외형 폴더 '%s'가 없습니다."
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "통신망"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "통신망 창"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "검색"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "검색 창"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "내려받기"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "받는중"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "공유 파일 창"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "메시지"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "통신망 창"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "메시지 창"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "통계"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "통계 그래프 창"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "환경설정"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "환경 설정 창"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "가져오기"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "부분파일 가져오기 도구"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "정보"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "정보/도움"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr ""
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "어뮬"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "치명적 오류: 타이머 생성 실패"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "원격 어뮬에 연결함"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "연결 끊김"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "종료시 확인창"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "치명적 오류: 타이머 생성 실패"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Going to event loop..."
 msgstr "파일 정보를 복구하려고 하고있습니다..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Connecting..."
 msgstr "연결중"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr ""
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "%s(%s:%i)에 접속을 시도하는데 시간이 지났습니다."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "통신망에 연결합니다."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "전부"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "불가능"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "파일을 찾을 수 없습니다."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "유효하지 않은 링크거나 이미 목록에 존재합니다."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "이미 %s 파일을 내려받으려고 하고있음"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "알수없는"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "사용자 %s로부터 공유파일을 찾지 못했습니다."
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (가짜 이뮬 버젼 %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (가짜 이뮬)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "엑스뮬(가짜 이뮬)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (이뮬 v0.%u 기반)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "별명: %s 아이디: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "Requested: %s\n"
 msgstr "요청됨:"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "이 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니다.\n"
 msgstr1 "이 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니다.\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "모든 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니다.\n"
 msgstr1 "모든 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니다.\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "알 수 없는 파일이 요청되었습니다."
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "'%s'로부터 차단된 메시지 (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "'%s'로부터 새로운 메시지 (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "사용자 %s(%u)가 폴더 %s의 공유파일 목록을 요청합니다. -> 거부됨"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "사용자 %s로부터 공유파일을 찾지 못했습니다."
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "경고: known.met을 열 수 없습니다."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 #, fuzzy
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "경고: 알려진파일 목록이 손상됨, 유효하지 않는 머리말을 포함하고 있습니다."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "known.met 파일을 읽는동안 입출력 오류: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "known.met 파일을 저장하는 동안 오류: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "분류"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "새로운 분류"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "저장할 폴더를 선택"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "분류 이름을 정하세요."
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "분류 경로를 정하세요"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr "분류를 저장할 폴더를 생성하지 못했습니다. 유효한 경로를 지정하세요."
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "채팅세션이 시작됨: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "***클라이언트에 연결되었습니다***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "***클라이언트에 연결중입니다***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "***클라이언트에 연결하지 못했습니다 / 연결이 끊어졌습니다***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "탭 닫기"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "모든 탭 닫기"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "다른 탭 닫기"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "친구에 추가"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "상세히 보기(&D)"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "친구에서 삭제"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "친구 칸으로 확정함"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "파일 보기"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "메시지 보내기"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "사용자에게 메시지를 보내기"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "보낼 메시지:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"하나 이상의 친구칸으로 설정이 허락되지않습니다\n"
+"단지 하나의 칸만 가능합니다."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "다중 선택"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "친구에서 삭제"
+msgstr1 "친구에서 삭제"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "공유된 파일 목록을 다시 읽어들입니다."
+msgstr1 "공유된 파일 목록을 다시 읽어들입니다."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, fuzzy, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "신용 파일을 읽었습니다. %u 클라이언트가 인식되었습니다."
 msgstr1 "신용 파일을 읽었습니다. %u 클라이언트가 인식되었습니다."
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, fuzzy, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 "%u 클라이언트에 대한 신용이 만료되었습니다."
 msgstr1 "%u 클라이언트에 대한 신용이 만료되었습니다."
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "'cryptkey.dat' 파일을 찾을 수 없습니다. 생성합니다."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "클라이언트 세부내역"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "낮은아이디"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "높은아이디"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr ""
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "연결됨"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "연결이 끊김"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "이름"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP 주소"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "최종 받음"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "버젼"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "올려주기 속도"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "내려받기 속도"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "전체 내려받기: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "전체 내려받기: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "내려받기/올려주기 변경자"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "온라인 서명"
 
-#: src/ClientRef.cpp:196
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "완료되지 않음"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "나쁜 사람"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "인증됨"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "없음"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "불가능"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "파일"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "받는중"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "올려주기"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "활성화"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "알수없는"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "사용자 %s(%u)가 공유파일 목록을 요청합니다. -> 허락됨"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "사용자 %s(%u)가 공유파일 목록을 요청합니다. -> 거부됨"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "사용자 %s(%u)가 공유폴더 목록을 요청합니다. -> 허락함"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "사용자 %s(%u)가 공유폴더 목록을 요청합니다. -> 거부됨"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "사용자 %s(%u)가 폴더 %s의 공유파일 목록을 요청합니다. -> 허락됨"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "사용자 %s(%u)가 폴더 %s의 공유파일 목록을 요청합니다. -> 거부됨"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "사용자 %s (%u)는 %s 폴더를 공유하고있습니다."
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "사용자 %s (%u)는 공유폴더를 요청하지 않았습니다."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "사용자 %s (%u)는 %s 폴더의 공유파일 목록을 보냅니다."
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "사용자 %s (%u)는 공유파일 목록 전송을 마쳤습니다."
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "사용자 %s (%u)는 공유파일 목록을 원하지않습니다."
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "사용자 %s (%u)는 공유파일이나 공유폴더 목록에 접근하는것을 거부합니다."
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "파일 의견"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "사용자이름"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "파일 이름"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "등급"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "의견"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad를 실행 중이 아니면 Kad 검색을 할 수 없습니다."
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "의견이 없음"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, fuzzy, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%s 의견"
 msgstr1 "%s 의견"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "%s로부터 서버 목록를 내려받지 못함"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "자동낮음"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "자동아님"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "자동높음"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "매우 낮음"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "낮음"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "보통"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "높음"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "매우높음"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "개방"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "요청"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "서버를 경유하여 연결중"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "대기열이 가득참"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "대기열에"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "받는중"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "해시설정을 받는중입니다."
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "필요없는 부분"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "낮은아이디에서 낮은아이디로 연결할수 없습니다."
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "매우 많은연결"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Kad를 경유하여 연결중"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "매우 많은 Kad 연결"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "퇴장됨"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "연결 오류"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "원격 대기열이 가득참"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "오래된 MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "새로운 MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "이뮬에 호환"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "지역 서버"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "원격 서버"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "자료 교환"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "수동적인"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "링크"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "자료 핵"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "완료됨"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "진행중"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr ""
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "대기열에 있음"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "이미 내려받는중"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "알수없거나 나쁜 임시 파일 형식입니다."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "크기"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "전송됨"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "속도"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "진척"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "자료"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "우선권"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "상태"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "남은 시간"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "최종 완료"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "최종 받음"
 
-#: src/DownloadListCtrl.cpp:411
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "선택된파일을 지우시겠습니까?"
-
-#: src/DownloadListCtrl.cpp:413
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "선택된파일을 지우시겠습니까?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "자동"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "취소"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "멈춤(&S)"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "중지(&P)"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "계속(&R)"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "완료된것 정리(&l)"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "모든 A4AF를 이 파일로 바꿈"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "모든 A4AF를 이 파일로 바꿈 (자동)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "모든 A4AF를 다른 파일로 바꿈"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "확장 옵션"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "미리보기"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "파일 상세 보기(&d)"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "모든 의견 보기"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "magnet URI를 클립보드로 복사"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "반응을 클립보드에 복사"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "이 파일의 추가주소를 더합니다."
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "할당되지않은"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "분류로 할당"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "파일 열기(&O)"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "선택된파일을 지우시겠습니까?"
+
+#: src/DownloadListCtrl.cpp
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "선택된파일을 지우시겠습니까?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "새이름 넣으세요:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "파일 이름변경"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "내려받기 (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "미리보기"
+msgid "Downloads (%i)"
+msgstr "내려받기 (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, fuzzy, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "오류: 외부 재생기를 실행하지 못했습니다."
+msgid "Total queue size: %s"
+msgstr "전체 내려받기: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading temp files from %s."
 msgstr "server.met 파일을 읽음: %s"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "오래된 내려받은 파일로부터 데이터를 읽어들임 (%u (%u의))"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "부분파일을 찾을 수 없음"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "%u 부분파일을 찾았음"
 msgstr1 "%u 부분파일을 찾았음"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "내려받기 %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "이미 '%s' 파일을 내려받으려고 하고있음"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "이미 %s 파일을 가지고 있음"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "이미 %s 파일을 가지고 있음"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "이미 %s 파일을 내려받으려고 하고있음"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "링크의 알려지지 않은 프로토콜: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client sent packet after authentication failed."
 msgstr "인증에 실패했습니다."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "외부연결 끊겼습니다."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "빈암호 때문에 외부연결이 불가능합니다."
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "이 환경설정에서 외부연결은 불가능합니다."
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "새로운 외부연결이 승인되었습니다."
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "환경설정의 빈암호로 인해 외부연결이 거부되었습니다."
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "연결중인 클라이언트: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "알수없는 버젼"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "불확실한 외부연결 버젼 아이디, 이것은 바이너리와 호환되지 않습니다. 동일한 스냅삿으로부터 코어와 원격을 사용하세요."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "비정식 CVS 버젼으로부터 릴리즈된 버젼에 연결할수없습니다! *휴우* 있을 수 있었던 충돌을 막았습니다."
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "유효하지 않은 프로토콜 버젼입니다"
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "프로토콜 버젼 태그 없음"
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "%d 초후에 서버로 자동 접속을 재시도"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: wrong password."
 msgstr "인증에 실패했습니다."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: missing password."
 msgstr "인증에 실패했습니다."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Invalid request, please authenticate first."
 msgstr "유효하지않은 요청, 먼저 인증을 하세요."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "접근 허가되었습니다."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "알 수 없는 클라이언트로부터 메시지를 차단"
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "허락되지않은 접속입니다. 연결이 끊깁니다."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "원격 부분파일 명령 실패: 파일해시를 찾을 수 없음: %s "
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "파일해시를 찾을 수 없음: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "이런! 명령코드 처리 오류!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "서버가 추가되지 않음"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "서버가 발견되지 않음: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "제거할 서버의 정의가 필요합니다."
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "파일을 찾을 수 없습니다."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "파일을 찾을 수 없습니다."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "검색중입니다. 금방 결과를 다시 가져옵니다."
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "원격 인터페이스로부터 웹검색은 좋지않은 선택입니다."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "검색중입니다. 금방 결과를 다시 가져옵니다."
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "그래프가 비어있음."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "클라이언트는 세부 수준이 구성되지 않았습니다."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "이미 종료하는중입니다."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "외부연결: '%s' 링크를 추가합니다."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "유효하지 않은 링크거나 이미 목록에 존재합니다."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "파일을 찾을 수 없습니다."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "유효하지 않은 파일 이름입니다."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "파일이름을 변경할 수 없습니다."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "이 채팅세션을 닫습니다."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "프로토콜 버젼 태그 없음"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "이 채팅세션을 닫습니다."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad는 환경설정에서 비활성화되어 있습니다."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(알수없는 이름)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad는 환경설정에서 비활성화되어 있습니다."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "이미 Kad에 연결되었습니다."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Kad에 연결중..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "모든 통신망을 사용할수 없습니다."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Kad로부터 연결이 끊겼습니다."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "유효하지 않은 실행코드(잘못된 프로토콜 버젼?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "알수없는 확장 '%s' ('%s'명령에 대해)\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "알수없는 명령 '%s' \n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1886,7 +2408,7 @@
 "\n"
 "이 명령은 인수를 가질 수 없습니다.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1894,7 +2416,7 @@
 "\n"
 "이 명령은 반드시 인수가 있어야 합니다.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1902,7 +2424,7 @@
 "\n"
 "이 명령은 불완전합니다. 반드시 아래의 확장중 하나를 사용해야 합니다.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1910,11 +2432,11 @@
 "\n"
 "가능한 확장:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "가능한 명령:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1925,17 +2447,17 @@
 "모든 명령은 대소문자를 구분하지 않습니다.\n"
 "<명령어>에 대한 자세한 정보를 얻으려면 'help <명령어>'를 입력하세요.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "응용프로그램에서 나감."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "도움말을 보여줍니다."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1943,7 +2465,7 @@
 "명령어에 대한 도움말은, 'help <명령어>'를 입력하세요.\n"
 "모든 명령어 목록을 보려면, 'help'를 입력하세요.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1954,46 +2476,46 @@
 "명령 목록을 위해 %s를 사용합니다.\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "문법 오류!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "명령 처리에 오류 발생 - 일어나면 안 됩니다! 버그 리포트를 하세요\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "이 명령은 어떤 변수도 필요하지 않습니다."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "이 명령은 반드시 변수가 있어야 합니다."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "유효하지 않은 인수입니다."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "불완전한 명령입니다."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "더 많은 도움말을 위해서는 '%s'를 입력하세요.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "이것은 %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "이것은 %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -2001,7 +2523,7 @@
 "\n"
 "클라이언트 생성중...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2010,7 +2532,7 @@
 "\n"
 "좋아, 나가는중 %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2024,120 +2546,363 @@
 "\n"
 "종료중...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "이 도움말을 보여줍니다."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "어뮬이 실행중인 호스트. (기본: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "외부연결을 위한 어뮬 포트. (기본: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "외부연결 암호"
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "파일로부터 환경설정을 읽습니다."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "표준출력으로는 어떤 출력도 하지 않습니다."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "상세하게 - 디버그 메시지도 보여줍니다."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "프로그램 지역정보 (로케일, 언어)를 설정합니다."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "명령줄 설정을 환경설정 파일에 기록합니다."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "어뮬의 설정 파일에 기초하여 설정 파일을 생성합니다."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "프로그램 버전을 출력합니다."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "파일 세부내역"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%% 완료"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "미리보기"
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "오류: 외부 재생기를 실행하지 못했습니다."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "오류: 부분파일을 생성하지 못했습니다.)"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "환영합니다!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "친구에게 접속함"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "연결 상태:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "통신망"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "카뎀리아"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "초기적재"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "이미 %s 파일을 내려받으려고 하고있음"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "탐색"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "친구"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "상세히 보기(&D)"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "친구 추가"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "친구 제거"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "메시지 보내기(&M)"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "파일 보기"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "친구 칸으로 확정함"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 #, fuzzy
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "선택한 친구들을 삭제하시겠습니까?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 #, fuzzy
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "선택한 친구들을 삭제하시겠습니까?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2145,2126 +2910,2560 @@
 "하나 이상의 친구칸으로 설정이 허락되지않습니다\n"
 "단지 하나의 칸만 가능합니다."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "다중 선택"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"하나 이상의 친구칸으로 설정이 허락되지않습니다\n"
-"단지 하나의 칸만 가능합니다."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "사용자에게 메시지를 보내기"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "보낼 메시지:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "친구에서 삭제"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "메시지 보내기"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "파일을 교환"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "다른 파일을 요청"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "대기중인 올려주기: %s"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "대기열에"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "올려주기"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "None"
 msgstr "아무도"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "아니오"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "예"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "%s(%s)을 열지 못했습니다."
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "내려받기중..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "사용자 %s로부터 공유파일을 찾지 못했습니다."
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "이미 %s 파일을 내려받으려고 하고있음"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "내려받기 %s"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "내려받기 (%i)"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "%s로부터 서버 목록를 내려받지 못함"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "%s로부터 서버 목록를 내려받지 못함"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "%s로부터 서버 목록를 내려받지 못함"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 #, fuzzy
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "'ipfilter.dat' 와 'ipfilter_static.dat'의 IP 차단을 읽어옵니다."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "ipfilter.dat 파일 '%s'을 읽지 못했습니다. 알 수 없는 형식입니다."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "ipfilter.dat 파일 '%s'을 읽지 못했습니다, 파일을 열 수 없습니다."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, fuzzy, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
 msgstr1 "%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, fuzzy, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
 msgstr1 "%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"알려진 클라이언트로부터 \n"
-"초기적재"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "현재"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "동작중 평균"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "세션 평균"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "노드 (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "초기적재에 유효하지 않은 IP"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "초기적재에 유효하지 않은 포트"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "모든 항목을 채워주세요."
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "메시지"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "새로운 nodes.dat파일을 내려받으시겠습니까?\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "현재노드는 제거되고 카뎀리아 연결이 다시 시작됩니다."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "계속할까요?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "카뎀리아: 검색어가 너무 짧습니다."
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, fuzzy, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "%u개의 Kad 접속을 읽었음"
 msgstr1 "%u개의 Kad 접속을 읽었음"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Kad를 시작했습니다."
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr ""
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr ""
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "기본 설정"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "아랍어"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Asturian"
+msgstr "에스토니아어"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "바스크어"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "불가리아어"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "카탈로니아어"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "중국어(간체)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "중국어(번체)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "크로티아어"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "덴마크어"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "네델란드어"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "영어(영국)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "영어(영국)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "에스토니아어"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "필란드어"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "프랑스어"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "갈리시아어"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "독일어"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "헝가리어"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "이탈리아어"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "한국어"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "폴란드어"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "포르투갈어"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "포르투갈어(브라질)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Romanian"
+msgstr "크로티아어"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "러시아어"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "슬로베니아어"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "스페인어"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "터키어"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "알수없는 버젼"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unable to get error description for error %d"
 msgstr "경고: 외형 파일 '%s'(을)를 읽을 수 없습니다."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "해시중"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "완료중"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "완료"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "중지됨"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "오류투성이"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "대기중"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "반드시 암호를 설정해야 합니다."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "잘못된 패스워드, MD5 해시가 아닙니다."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "연결 실패"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "외부연결 끊겼습니다."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "외부연결: 서버 응답 불량. 연결이 끊겼습니다."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "외부연결: 서버 응답 불량. 연결이 끊겼습니다."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "성공! 어뮬에 연결 되었습니다 "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "성공! 연결이 되었습니다."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Handshake failed."
 msgstr "외부연결 암호"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "동기화 스레드가 시작되었습니다."
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "닫기"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "자르기"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "복사"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "붙이기"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "깨끗이"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "모두 선택"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "무제한"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "어뮬 보이기"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "어뮬 숨기기"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "연결됨"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "연결됨"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Kad에 연결됨 (방화벽)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "서버 IP: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "서버 IP:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "연결 안됨"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "클라이언트 정보"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "어뮬 보이기"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "연결 끊기"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "어뮬 숨기기"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "연결"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "종료"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "무제한"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "어뮬 트레이 메뉴"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "올려주기: 없음"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "올려주기: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "내려받기: 없음"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "내려받기: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "내려받기 속도"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "올려주기 속도"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "별명: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "별명이 선택되지 않음!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "클라이언트 아이디: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "서버 이름: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "서버 IP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "아직 연결되지 않았습니다."
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "온라인 서명: 활성화"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "온라인 서명: 비활성화"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "올려주기 시간: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "전체 내려받기: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "전체 올려주기: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "확정"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "ed2k 또는 magnet 링크를 코어에 추가합니다."
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "친구에 추가"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "사건은 이곳에 보여집니다. 사건 목록의 전체를 보기위해 서버텝에 있는 로그파일을 참조하세요"
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "읽는중..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "접속되어있는 서버의 사용자 수는..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "사용자: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "현재 서버에 연결된 사용자들과 총 사용자수를 측정합니다."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "올려주기: 0.0 | 내려받기: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "연결안됨..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "현재 서버에 연결되었습니다."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "검색"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "이름:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "종류"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "지역"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "광역"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "확장 변수"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "필터링"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "파일 종류"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "어떤"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "압축"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "음악"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CD이미지"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "그림"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "프로그램"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "문장"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "동영상"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "확장자"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "최소 크기"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "바이트"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "최대 크기"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "유효성"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "필터:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "필터링 결과"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "필터"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "반전 결과"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "알려진 파일을 숨김"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "항목 초기화"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "시작"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "추가"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "확장자"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "멈춤"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "내려받기"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "분류내 내려받기"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "필터링 결과"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "항목 초기화"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "결과"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "완료된 내려받기 정리"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "필터:"
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "자료 유지"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "일반"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "전체 이름 :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "없음"
-
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "메타파일 :"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "전체 이름"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "메타파일"
 
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
+#: src/muuli_wdr.cpp
+msgid "Hash"
 msgstr "해시"
 
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "파일 크기 :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "부분파일 상태 :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "마지막 부분이 완료 :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "파일 크기"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "전송"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "찾은 자료 :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "전송된 자료 :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "부분파일 카운트 :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "가능함 :"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "데이터율 :"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "내려받기 활성화 시간: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "전송됨 :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "완료된 크기 :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "부분파일 상태"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "마지막 부분이 완료"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "찾은 자료"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "전송된 자료"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "부분파일 카운트"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "가능함"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "데이터율"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "내려받기 활성화 시간"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "완료된 크기"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "현명한 오류처리"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "오류로 잃어버림 :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "압축으로 얻음 :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "I.C.H에의해 저장된 패키지 :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "오류로 잃어버림"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "압축으로 얻음"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "I.C.H에의해 저장된 패키지"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "공유함: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "요청"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "허락된 요청"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "전송된 크기"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "공유 비율"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "완료된 자료"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "공유 파일"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", 올려주기: "
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Kad 정보"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "선택되지 않은"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "제목"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "파일 이름"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "인계"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "정돈"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "적용"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "확인"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "파일에 대한 의견/등급(내용은 모든 사용자가 볼 수 있습니다.)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "파일 품질"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "선택되지 않은"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "유효하지않은 / 손상된 / 가짜"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "나쁜"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "그저그런"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "좋은"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "아주좋은"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "만약 파일이 유용하지 않으면 파일 품질을 선택하거나 사용자에게 충고하세요."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Kad로부터 연결이 끊김"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "새롭게하다"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "내려받는중. 잠시만 기다려주세요..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "알수없는 크기"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "요구된 정보"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP 주소 :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "포트 :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "포트"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "추가적 정보"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "사용자 이름 :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "사용자 해시 :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "사용자 해시"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "추가"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "내려받기 속도"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "현재"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "동작중 평균"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "세션 평균"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "올려주기 속도"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "연결"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "활성화된 내려받기"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "활성화된 연결 (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "활성화된 올려주기"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "통계 트리"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "사용자 이름:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "사용자 해시:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "클라이언트 소프트웨어:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "클라이언트 버전:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP 주소:"
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "사용자 아이디:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "서버 IP:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "클라이언트 소프트웨어"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "클라이언트 버전"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "사용자 아이디"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "서버 IP"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "서버 이름:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "서버 이름"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Obfuscation"
+msgstr "프로토콜 난독화"
 
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "프로토콜 난독화"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "클라이언트에 전송"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "현재 요청:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "평균 올려주기율:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "평균 내려받기율:"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "현재 요청"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "평균 올려주기율"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "평균 내려받기율"
 
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
 msgstr "올려주기 (세션)"
 
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
 msgstr "내려받기 (세션)"
 
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
 msgstr "올려주기 (전체)"
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
 msgstr "내려받기 (전체)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "점수"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "내려받기/올려주기 변경자:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "안전한 인증"
 
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "안전한 인증:"
-
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "대기열에 있음"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "대기열 점수:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "대기열 점수"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "별명"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr "이것은 접속했을때 다른 사용자가 볼 수 있는 이름입니다."
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "도구도움이 보여주기 이전의 지연시간."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "컨트롤에서 사용하는 언어를 설정합니다."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "시작할때 새 버젼이 있는지 확인"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "이것을 활성화하면 어뮬은 시작할때마다 새로운 버젼이 있는지 확인할것 입니다."
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "최소화된 시작"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "이것은 어뮬을 시작할때 최소화를 가능하게 합니다."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "종료시 확인창"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "트레이아이콘 활성화"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "이것은 시스템 트레이(혹은 작업표시줄) 아이콘을 활성화/비활성화 합니다."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "트레이 아이콘으로 최소화"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "어뮬을 작업표시줄보다 시스템 트레이로 최소화 하도록 합니다."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "설정을 기억"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "브라우저 선택"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "탐색"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "가능하면 새로운 탭을 생성함"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "가능하면 새로운 창을 여는것 대신 새로운 탭을 생성합니다."
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "비디오 재생기"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "올려주기"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "칸 배분"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "카뎀리아"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2k"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "시작시 자동연결"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "끊겼을시 재연결"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "죽은서버 제거"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "재시도"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "목록"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "우선순위 시스템을 사용"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "연결할때 현명한 낮은아이디 검사를 사용"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "안전한 연결"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "정적목록내의 서버에만 연결"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "수동으로 추가된 서버에 높은 우선권 부여"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "멈춤 상태로 내려받기에 파일 추가"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "자동 우선권으로 내려받기에 파일 추가"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "처음과 마지막 부분을 먼저 내려받음"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "동일한 분류로부터"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "원하는 최소한의 디스크공간을 입력하세요."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "희귀한 파일인 경우 10개의 자료 저장 (<20 자료)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "올려주기"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "자동 우선권으로 새로운 공유파일을 추가"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "삭제"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(하위폴더 전체를 공유하려면 폴더 아이콘상에서 오른쪽 버튼을 클릭)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "숨은파일 공유"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "원격 서버"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "지역 서버"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "그래프"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "갱신 지연 : 5 초"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "평균 그래프 시간 : 100 분"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "연결 그래프 크기 : 100"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "바탕"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "눈금"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "현재 내려받기"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "내려받기 운용 평균"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "내려받기 세션 평균"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "현재 올려주기"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "올려주기 운용 평균"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "올려주기 세션 평균"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "활성화된 연결"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "시스템트레이 아이콘 속도바"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "현재 Kad-노드"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Kad-노드 운용"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Kad-노드 세션"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "선택"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "표시될 클라이언트 버젼의 수 (0=무제한)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! 경고 !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "최대 새연결 / 5 초"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "FTP 갱신율 분당 간격"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "FTP 갱신율 분당 간격"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "파일 버퍼 크기: 240000 바이트"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "올려주기 대기열 크기: 5000 클라이언트"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "서버 연결 갱신 간격: 사용않함"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "분류탭의 확장된 정보를 보여줌"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "제목에 전송률을 보여줌"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "제목에 전송률을 보여줌"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "수직방향 툴바"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "평평한"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "둥근"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "어뮬은 내려받는 목록의 항목을 자동으로 정렬합니다."
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "외부연결 설정"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "외부연결 받아들임"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "수신대기 외부연결 인터페이스에 a.b.c.d 형식의 유효한 IP를 입력하세요. 항목이 비었거나 0.0.0.0이면 모든 인터페이스를 의미합니다."
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "외부연결 포트에 UPnP 포트포워딩 활성화"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "암호"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "프록시 포트:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "암호를 검사중\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "암호를 검사중\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "손님 접근 금지"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "모든 권한 암호"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "웹 템플릿"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "모든 권한 암호"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "낮은권한 사용자 활성화"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "낮은 권한 암호"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "페이지를 갱신 시간 (초)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Gzip압축을 활성화"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "기본 설정"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "확인"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "환경설정으로 바꾼것을 적용하려면 이곳을 클릭하세요."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "환경설정으로 바꾼것을 초기화합니다."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "제목 :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "의견 :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "내려받는 폴더 :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "새롭게 할당된 파일의 우선권를 바꿉니다. :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "내려받는 폴더"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "새롭게 할당된 파일의 우선권를 바꿉니다."
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "변경 않음"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "이 분류의 색을 선택 (일반적으로 선택된) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "초기화"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "이 분류의 색을 선택 (일반적으로 선택된)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "로그를 초기화하려면 이 버튼을 클릭하세요."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "URL로부터 서버 목록을 갱신하려면 이 버튼을 클릭..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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파일의 url을 입력하고 왼쪽편의 버튼을 누르세요."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "새로운 서버의 이름을 입력하세요."
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:포트"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "서버의 포트를 이곳에 입력하세요."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "서버 수동 추가 (미리 왼쪽 부분을 채울 것) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "어뮬 로그"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "서버 정보"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2k 정보"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kad 정보"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "URL로부터 노드를 갱신하려면 이 버튼을 클릭..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "노드 (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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파일의 url을 입력하고 왼쪽편의 버튼을 누르세요."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "노드 상태"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "초기적재"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "새로운 노드"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "포트:"
-
-#: src/muuli_wdr.cpp:2327
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Bootstrap from known clients"
+msgid "Bootstrap from node: IP"
 msgstr ""
 "알려진 클라이언트로부터 \n"
 "초기적재"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Kad 끊김"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "x.x.x.x형식으로 서버의 IP를 이곳에 입력하세요."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "프로토콜 난독화"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "프로토콜 난독화 지원"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "이 선택은 프로토콜 난독화를 활성화하며, 어뮬이 다른 클라이언트로부터 난독화된 연결을 받아들이도록 합니다. "
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "나가는 연결에 난독화 사용"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "이 선택은 어뮬이 다른 서버나 클라이언트에 연결할때 프로토콜 난독화를 사용하게 합니다."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "난독화된 연결만 받음"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "모두"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr "공유 파일 목록 보기를 요청할 수 있는 사람을 선택하세요."
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP 차단"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "클라이언트 차단"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "~/.aMule/ipfilter.dat에 기록된 클라이언트 IP의 차단을 활성화합니다."
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "서버 차단"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "~/.aMule/ipfilter.dat에 기록된 서버 IP의 차단을 활성화합니다."
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "목록 다시읽기"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "~/.aMule/ipfilter.dat 파일에서 차단할 IP의 목록을 다시 읽음"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "지금 갱신"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "시작시 IP차단을 자동 갱신"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "차단 수준:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "랜 IP를 항상 차단"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2438
-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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "온라인서명을 활성화"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "갱신 주기(초)"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "온라인 서명 갱신 주기(초)를 바꿉니다."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "온라인서명 파일을 포함하는 폴더를 선택하려면 클릭하세요."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "데이터율 :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "자료"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4272,11 +5471,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4286,856 +5485,771 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "내려받기: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "시작시 IP차단을 자동 갱신"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "받는 메시지 차단(현재 채팅은 제외)"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "모든 메시지를 차단"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "친구 목록에 없는 사람으로부터 메시지를 차단"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "알 수 없는 클라이언트로부터 메시지를 차단"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "다음 내용이 포함된 메시지를 차단 (쉼표로 분리):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "이곳에 어뮬이 차단하고 막을 메시지에 포함될 단어를 추가하세요."
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "의견들"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "인증 활성화"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "사용자이름/암호 인증을 활성화/비활성화"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr ""
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "프록시에 접속하기 위한 사용자이름"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "암호:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "프록시에 접속하기 위한 암호"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "프록시 활성화"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "프록시지원을 활성화/비활성화"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "프록시 종류:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "프록시 호스트:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "프록시 종류"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "프록시 호스트"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "프록시 호스트 이름"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "프록시 포트:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "프록시 포트"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "프록시 포트"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "인증 활성화"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "사용자이름/암호 인증을 활성화/비활성화"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "프록시에 접속하기 위한 사용자이름"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "프록시에 접속하기 위한 암호"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "연결함:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "원격 어뮬에 로그인"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "사용자이름"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "설정을 기억"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "외부연결 끊겼습니다."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "gzip 압축 사용"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "상세한 디버그-로깅 활성화"
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "파일 열기(&O)"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "메시지 분류:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "대기중..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "가져오기 추가"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "선택된 것을 재시도"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "선택된 것을 삭제"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "활성화된 올려주기 :"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Show Clients for"
+msgstr "클라이언트 보기"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "공유된 파일을 숨김"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "보기 필터 선택"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "활성화된 올려주기"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "클라이언트 보기"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "목록 다시읽기"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "공유된 파일을 다시 읽어들임"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "보내기"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "지정된 메시지를 보냅니다."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "이 채팅세션을 닫습니다."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "서버 혹은 Kad에 연결"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "취소"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "공유 파일"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "연결 끊기"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "연결"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "비활성화 %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 #, fuzzy
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "bytes"
 msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 #, fuzzy
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "bytes/s"
 msgstr1 "bytes/s"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "초"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "분"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "시"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "일"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "전부"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "다른 모두"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "내려받음"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "멈춤"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "비디오"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "압축"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "문자"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "활성화"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "이 명령은 어떤 변수도 필요하지 않습니다."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "이 명령은 어떤 변수도 필요하지 않습니다."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "이 명령은 어떤 변수도 필요하지 않습니다."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "이 명령은 어떤 변수도 필요하지 않습니다."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "서버의 포트를 이곳에 입력하세요."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "서버의 포트를 이곳에 입력하세요."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "서버의 포트를 이곳에 입력하세요."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "가져오는중 %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "임시 폴더를 읽는중"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "내려받은 정보 파일로부터 기본적인 정보를 재생"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "대상 파일을 생성"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "오래된 내려받은 파일로부터 데이터를 읽어들임 (%u (%u의))"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "데이터 블럭을 새 내려받은 파일로 저장 (%u (%u의))"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "내려받은 파일 정보 자료를 재생"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "내려받기에 추가하고 새 부분파일을 저장"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "부분파일 가져오기"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "상태"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "파일 해시"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s(디스크: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "임시 내려받기를 위해 검색할 폴더를 선택하세요! (하위 폴더 포함)"
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "성공적으로 가져온 내려받기 파일을 삭제하겠습니까?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "자료를 삭제하겠습니까?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "오류: 부분파일을 생성하지 못했습니다.)"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "%s로부터 met파일의 백업을 읽을려고 합니다."
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "오류: %s(%s)은 손상되었습니다. (잘못된 꼬리계수), 파일을 읽을수 없습니다."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "파일 정보를 복구하려고 하고있습니다..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "이름없는 파일을 복구합니다. - RecoveredFile.dat로 복구합니다."
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "모든 가능한 파일정보를 복구되었습니다. :D - 사용해 보세요..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "파일정보 복구가 불가능합니다. :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "%s(%s)을 열지 못했습니다."
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "부분파일을 저장하는 동안에 오류: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 #, fuzzy
 msgid "IO failure while saving partfile: "
 msgstr "부분파일을 저장하는 동안에 오류: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "%s에 대한 part.met.seeds 파일을 저장하지 못했습니다."
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "부분파일을 위해 %i 자료핵심을 저장되었습니다: %s(%s)"
 msgstr1 "부분파일을 위해 %i 자료핵심을 저장되었습니다: %s(%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "부분파일을 위해 %i 자료핵심을 저장되었습니다: %s(%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "부분파일의 핵심파일(%s - %s)을 읽는중 오류: %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "손상된 부분(%d)이 발견되었습니다. (%d부분 파일 %s에 있는) - 파일해시결과 |%s| 파일해시 |%s|"
 msgstr1 "손상된 부분(%d)이 발견되었습니다. (%d부분 파일 %s에 있는) - 파일해시결과 |%s| 파일해시 |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "완료된 부분(%i)이 발견되었습니다.  (%s에 있는)"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "%s의 재해시가 완료되었습니다."
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "내려받기 완료: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "내려받기 완료: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "파일 삭제: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "경고: 충분한 디스크공간이 없습니다! 파일 정지: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "%i 부분 내려받기는 파일이 손상되었습니다: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr "ICH: 손상된 부분 %i를 복구했습니다. (%s의) -> 저장된 바이트: %s"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "기본 설정"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr ""
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "아랍어"
-
-#: src/Preferences.cpp:640
-#, fuzzy
-msgid "Asturian"
-msgstr "에스토니아어"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "바스크어"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "불가리아어"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "카탈로니아어"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "중국어(간체)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "중국어(번체)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "크로티아어"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr ""
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "덴마크어"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "네델란드어"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "영어(영국)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "영어(영국)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "에스토니아어"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "필란드어"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "프랑스어"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "갈리시아어"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "독일어"
+msgid "Extended source exchange"
+msgstr "자료 교환"
 
-#: src/Preferences.cpp:657
-msgid "Greek"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:658
-msgid "Hebrew"
+#: src/PeerCapabilities.h
+msgid "IPv6"
 msgstr ""
 
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "헝가리어"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "이탈리아어"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "이탈리아어(스위스)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "한국어"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
 msgstr ""
 
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr ""
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "폴란드어"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "포르투갈어"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "포르투갈어(브라질)"
-
-#: src/Preferences.cpp:669
-#, fuzzy
-msgid "Romanian"
-msgstr "크로티아어"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "러시아어"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "슬로베니아어"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "스페인어"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr ""
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "터키어"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr ""
-
-#: src/Preferences.cpp:779
-#, fuzzy
-msgid "Change Language"
-msgstr "언어"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/Preferences.cpp
+msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "유효하지 않음"
-
-#: src/Preferences.cpp:982
-msgid "no options available"
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "기본 포트가 사용될 것입니다.(%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "연결"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "폴더"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "서버"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "파일"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "보안"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "프록시"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "원격 조정"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "온라인 서명"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "사건들"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "디버깅"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5151,26 +6265,43 @@
 "이 설정들을 조정하지 않아도\n"
 "어뮬은 잘 동작할 것입니다."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "연결하고 있는 프록시 타입"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "암호를 검사중\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5178,68 +6309,88 @@
 "변경사항을 활성화 하기위해 어뮬을 재시작해야 합니다:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP 포트가 변경되었습니다.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP 포트가 변경되었습니다.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "외부연결 끊겼습니다."
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "외부연결 끊겼습니다."
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "새로운 외부연결이 승인되었습니다."
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "외부연결 끊겼습니다."
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "프로토콜 난독화"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- 언어가 변경되었습니다.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
-"외부연결이 횔성화되어 있지만, 암호를 설정하지 않았습니다.\n"
-"외부연결은 유효한 암호가 설정되기전까지 활성화되지 않습니다."
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- 언어가 변경되었습니다.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- 임시 폴더가 변경되었습니다.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- ED2K network enabled.\n"
 msgstr "모든 통신망을 사용할수 없습니다."
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "유효하지 않은 프로토콜 버젼입니다"
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5247,7 +6398,7 @@
 "UDP 포트가 비활성화되어 있으면 Kad는 시작하지 않을 것입니다.\n"
 "UDP 포트를 활성화시키거나 Kad를 비활성화시키십시오."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5257,20 +6408,69 @@
 "지금 바로 어뮬을 재시작해야 합니다.\n"
 "만일 재시작하지 않는다면, 나쁜 일이 일어나도 불평하지 마십시오.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "자동갱신이 시작됨"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "이미 %s 파일을 내려받으려고 하고있음"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "새로운 외부연결이 승인되었습니다."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5280,41 +6480,66 @@
 "적어도 한개의 유효한 server.met파일을 가르키는 URL을 적으세요.\n"
 "URL을 입력하려면 채크박스 옆의 \"목록\"버튼을 클릭하세요."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "임시 파일"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "내려받은 파일"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "온라인 서명"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "%s하기 위한 폴더를 선택하세요."
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "알려진 공유 파일 %i개를 찾았음"
+msgstr1 "알려진 공유 파일 %i개를 찾았음"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "비디오재생을 위한 브라우즈"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "브라우저 선택"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "브라우저 선택"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "실행할수 있는 %s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "기본 설정"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5322,1223 +6547,1484 @@
 "server.met파일을 내려받을 URL을 추가하세요.\n"
 "각 행에 오직 하나의 URL을 넣으세요."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "완료된 자료"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "상태:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "상태:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "갱신 지연: %d 초"
 msgstr1 "갱신 지연: %d 초"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "평균 그래프 시간: %d 분"
 msgstr1 "평균 그래프 시간: %d 분"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "연결 그래프 크기: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "파일 버퍼 크기: %d 바이트"
 msgstr1 "파일 버퍼 크기: %d 바이트"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "올려주기 대기열 크기: %d 클라이언트"
 msgstr1 "올려주기 대기열 크기: %d 클라이언트"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "서버 연결 갱신 주기: %d 분"
 msgstr1 "서버 연결 갱신 주기: %d 분"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "서버 연결 갱신 주기: 비활성화"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "disabled"
 msgstr "비활성화"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Execute command on '%s' event"
 msgstr "`%s' 사건에 명령을 실행"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "코어에 명령 실행 활성화"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "코어 명령어:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "GUI에 명령 실행 활성화"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "GUI 명령어:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "다음 변수들은 교체됩니다.:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "공유된 파일을 다시 읽어들임"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "공유된 파일을 다시 읽어들임"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "임시 폴더를 읽는중"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "공유된 파일 목록을 다시 읽어들입니다."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "공유 파일"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "%s하기 위한 폴더를 선택하세요."
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "설정을 기억"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "검색 경고"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "검색"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "진행중"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr "최소 크기가 최대 크기보다 작아야 합니다. 최대 크기는 무시됩니다.."
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "검색 경고"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "주"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad를 실행 중이 아니면 Kad 검색을 할 수 없습니다."
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "경고: 알려진파일 목록이 손상됨, 유효하지 않는 머리말을 포함하고 있습니다."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Kad 검색 시도 중에 예기치 못한 에러: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "파일아이디"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "선택되지 않은"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "분류내 내려받기"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "파일아이디"
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "이 파일의 추가주소를 더합니다."
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "모든 탭 닫기"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
-msgid "Copy eD2k link to clipboard"
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "삭제하려고하는 서버에 접속되어있습니다. 부디 먼저 연결을 끊으세요."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "취소"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "동작중"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "필란드어"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "난독화된 서버들로의 연결이 모두 실패했습니다. 난독화없이 진행합니다."
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "모든 서버 목록에 접속하지 못했습니다. 다른 서버를 만드세요."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "모든 서버 목록에 접속하지 못했습니다. 다른 서버를 만드세요."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "%d 초후에 서버로 자동 접속을 재시도"
+msgstr1 "%d 초후에 서버로 자동 접속을 재시도"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "%s (%s:%i)에 연결되었습니다."
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "다음에 연결이 되었습니다: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "연결하는 동안 치명적 오류가 발생하였습니다. 인터넷 연결이 끊긴것 같습니다."
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "%s(%s:%i)에 연결이 끊김."
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s(%s:%i)가 죽은것 같습니다."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s(%s:%i)가 가득찬것 같습니다."
 
-#: 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"
-msgstr0 "%d 초후에 서버로 자동 접속을 재시도"
-msgstr1 "%d 초후에 서버로 자동 접속을 재시도"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "연결 끊김"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "%s(%s:%i)에 연결하지 못했습니다."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "%s(%s:%i)에 접속을 시도하는데 시간이 지났습니다."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "server.met 파일을 읽음: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "server.met 파일을 찾을 수 없습니다.!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "server.met 파일 '%s' 을 읽지 못했습니다. 알 수 없는 형식입니다."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "server.met 파일을 열지 못했습니다!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Server.met 파일이 손상됨, 유효하지 않는 버젼정보를 발견함: 0x%x, size %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "server.met에서 %i개의 서버가 발견됨"
 msgstr1 "server.met에서 %i개의 서버가 발견됨"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d 서버가 추가됨"
 msgstr1 "%d 서버가 추가됨"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "known.met 파일을 읽는동안 입출력 오류: %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr "서버 추가되지 않음: %s:%d은 유효한 포트가 정해지지 않았습니다."
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr "서버 추가되지 않음: %s:%d의 IP가 유효하지 않거나 차단되었습니다."
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr "서버 추가되지 않음: IP:포트%s:%d와 같은 서버가 목록에 있습니다."
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr "서버 추가됨: %s:%d서버 '%s'이름을 사용"
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "삭제하려고하는 서버에 접속되어있습니다. 부디 먼저 연결을 끊으세요."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "'%s'을(를) 열지 못했습니다."
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "server.met을 저장하지 못함!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "known.met 파일을 읽는동안 입출력 오류: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "유효하지 않는 주소입니다."
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "%s로부터 서버 목록를 내려받지 못함"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "adrresses.dat에 유효한 server.met 자동갱신 주소가 없습니다."
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "%s로부터 서버 목록를 내려받지 못함"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "지역 서버가 IPFilter에 의해 차단되어, 다른 서버로 재연결 합니다."
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "서버 이름"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "주소"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "포트"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "설명"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "핑"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "사용자"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "사용자"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "정적"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "버젼"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "파일"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "공유 파일"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "삭제하려는 서버에 연결되어 있습니다. 먼저 연결을 끊으세요. 서버는 삭제되지 않습니다."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(알수없는 이름)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "정적 서버 %s를 삭제하시겠습니까?"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "분"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "서버 (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "서버"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "서버에 연결함"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Mark server as static"
 msgstr "정적인 서버를 만듦"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Mark server as non-static"
 msgstr "비정적인 서버를 만듦"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Mark servers as static"
 msgstr "정적인 서버를 만듦"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Mark servers as non-static"
 msgstr "비정적인 서버를 만듦"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Remove server"
 msgstr "서버를 삭제"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Remove servers"
 msgstr "서버를 삭제"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "모든 서버를 삭제"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "서버에 재접속"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "모든 서버를 삭제하시겠습니까?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "선택된 서버를 삭제하시겠습니까?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 #, fuzzy
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "선택된 서버를 삭제하시겠습니까?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "새로운 클라이어트 아이디는 %u임"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\t이러한 대부분의 이유는 방화벽이나 라우터때문입니다."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\t더 많은 정보는 https://amule-org.github.io/docs을 참조하세요."
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "알수없는 서버 정보를 받았습니다! - 매우 짧음"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, fuzzy, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "새로운 서버 %d개를 받음"
 msgstr1 "새로운 서버 %d개를 받음"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "서버목록 저장이 완료되었습니다."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "서버가 마지막 명령을 거부함"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "가짜 패킷을 서버로부터 받았습니다: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "서버로부터 패킷을 처리하는동안 조치할수 없는 오류가 생겼습니다: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr "%s에 연결하기 위한 DNS 해석 쓰레드를 만들수 없음"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "서버 IP %s(%s)가 차단되었습니다. 연결할수 없습니다."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "프로토콜 난독화를 사용합니다."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "%s (%s - %s:%i) %s에 연결합니다."
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr "%s 서버에 대한 DNS를 해석 할 수 없음: 연결할수 없습니다!"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "어뮬 로그"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "서버 추가되지 않음: IP나 호스트이름이 지정되지 않았습니다."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "서버 추가되지 않음: 유효하지 않는 서버 포트가 지정되었습니다."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "아이디"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "연결 상태:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "연결됨"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "카뎀리아 상태:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Running in LAN mode"
 msgstr "%s에 동작중"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "동작중"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "카뎀리아 상태:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "상태:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "연결 상태:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "UDP Connection State:"
 msgstr "연결 상태:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "방화벽 상태:"
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "친구가 없음"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connecting to buddy"
 msgstr "친구에게 접속함"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, fuzzy, c-format
 msgid "Connected to buddy at %s"
 msgstr "친구에게 접속함"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP 주소:"
+
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed sources:"
 msgstr "자료 유지"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed notes:"
 msgstr "인덱스 파일을 찾을 수 없음:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "평균 사용자:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "평균 파일:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "동작되지 않음"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "알려진 공유 파일 %i개를 찾았음"
 msgstr1 "알려진 공유 파일 %i개를 찾았음"
 
-#: src/SharedFileList.cpp:410
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "알려진 공유 파일 %i개, 알수없는 %i개를 찾았음 "
-msgstr1 "알려진 공유 파일 %i개, 알수없는 %i개를 찾았음 "
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "서버가 발견되지 않음: %s"
 
-#: src/SharedFileList.cpp:486
-#, c-format
-msgid "No shareable files found in directory: %s"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "서버가 발견되지 않음: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "사용자이름"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "내려받기 속도"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "known.met 파일을 저장하는 동안 오류: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "올려주기 속도"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "server.met 파일을 읽음: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "server.met 파일을 읽음: %s"
+msgstr1 "server.met 파일을 읽음: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "알려진 공유 파일 %i개를 찾았음"
+msgstr1 "알려진 공유 파일 %i개를 찾았음"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "가능함 :"
+msgid "User Name"
+msgstr "사용자이름"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "올려주기 상태"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "내려받기 상태"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "파일 이름"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "공유 파일"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "요청"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "허락된 요청"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "전송된 크기"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "공유 비율"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "획득한 부분"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "완료된 자료"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "유효성"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "폴더 경로"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "공유 파일"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "의견/등급 추가"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "의견/등급 편집"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "이름변경"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "컬렉션내의 파일을 전송목록에 추가"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "magnet URI를 클립보드로 복사(&U)"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "ED2k 링크를 클립보드에 복사(&AICH info)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "유효한 자료 링크를 만들기 위해서 높은아이디가 필요합니다."
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "사용자 %s로부터 공유파일을 찾지 못했습니다."
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "공유된 파일을 다시 읽어들임"
+msgstr1 "공유된 파일을 다시 읽어들임"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "공유파일의 전체 크기: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "공유파일의 전체 크기: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "공유된 파일(%i)"
+msgstr1 "공유된 파일(%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "공유된 파일(%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "부분 파일"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "공유된 파일 목록을 다시 읽어들입니다."
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "상태"
+
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "파일 이름"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "올려준 데이터 (세션 (전체)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "전체 추가자원 (패킷): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "파일 요청 추가자원 (패킷): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "자료 교환 추가자원 (패킷): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "서버 추가자원 (패킷): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kad 추가자원(패킷): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "활성화된 올려주기: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "대기중인 올려주기: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "성공적인 전체 올려주기 세션 : %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "실패한 전체 올려주기 세션: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "평균 올려주기 시간: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "내려받은 데이터 (세션 (전체)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "발견된 자료: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "활성화된 내려받기 (큰 부분): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "세션 올려주기:내려받기 비율 (전체): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "재접속: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "첫 전송으로부터 시간: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "다음으로부터 서버에 연결됨: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "활성화된 연결 (평가): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "최대 연결 제한 접근함: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "평균 연결 (평가): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "최대 연결 (평가): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "클라이언트"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "알수없는 크기"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "차단됨"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Banned: %s"
 msgstr "퇴장됨"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "전체: %i 알려진: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "동작중인 서버: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "실패한 서버: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "전체: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "삭제된 서버: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "차단된 서버: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "동작중인 서버의 사용자: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "동작중인 서버의 파일: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "전체 사용자: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "전체 파일: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "서버 할당: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "공유된 파일의 수: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "공유파일의 전체 크기: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "운영체제"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "받은게 없음"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "활성화된 연결 (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "유효하지 않음"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "결코"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, fuzzy, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "`%s' 명령(pid `%d')은 상태코드 `%d'로 종료되었습니다."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "<str>을 실행하고 종료합니다."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr "유효하지 않은 IP 형식. xxx.xxx.xxx.xxx:xxxx를 사용하세요.\n"
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 #, fuzzy
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "이 명령은 인수를 필요로합니다. 유효한 인수: 'all' 또는 숫자\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Processing by hash: "
 msgstr "파일숫자 %u 처리: %s"
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Processing by filename: "
 msgstr "파일숫자 %u 처리: %s"
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "유효한 숫자가 아님\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "유효한 해시가 아님 (길이는 정확히 32자여야 함)\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6547,7 +8033,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6556,83 +8042,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "더 많은 도움말을 위해서는 '%s'를 입력하세요.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "내려받기 (%i)"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "알 수 없는 오류로 요청이 실패함."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "동작이 성공했습니다."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "다음과 같은 오류로 요청이 실패: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "클라이언트에 대한 IP 차단 %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "끔"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "켬"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "서버에 대한 IP 차단 %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "현재 IP 차단 수준은 %d입니다.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
 msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "%s %s %s에 연결됨"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "지금 연결중"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "방화벽됨"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "확인"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6641,7 +8131,7 @@
 "\n"
 "내려받기:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6650,7 +8140,7 @@
 "\n"
 "올려주기:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6659,7 +8149,7 @@
 "\n"
 "대기열의 클라이언트:/t %d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6668,38 +8158,33 @@
 "\n"
 "전체 자료:\t% d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "부분 파일"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "검색된 결과 갯수: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr ""
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "서버로부터 알수없는 반응을 수신했습니다. 실행코드 =  %#x"
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "간단한 상태 정보를 보여줍니다."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "연결 상태를 보여줌, 현재 올려주기/내려받기 속도, 기타.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "전체 통계 구조도를 보여줍니다."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6712,51 +8197,51 @@
 "0이나 생략은 '무제한'을 뜻합니다..\n"
 "예: 'statistics 5'는 각 클라이언트 종류의 상위 5가지 버전만 보여줍니다.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload the given object."
 msgstr "주어진 대상을 다시 읽어들입니다."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload shared files list."
 msgstr "공유된 파일 목록을 다시 읽어들입니다."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload IP filtering table."
 msgstr "파일로부터 IP 차단 테이블을 다시 읽어들입니다."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload current IP filtering table."
 msgstr "IP 차단 수준을 선택합니다."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Update IP filtering table from URL."
 msgstr "파일로부터 IP 차단 테이블을 다시 읽어들입니다."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "통신망에 연결합니다."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6768,36 +8253,36 @@
 "IP는 점과 십진수의 IPv4 주소이거나, 해석 할 수 있는 DNS이름 이어야 합니다.\n"
 " "
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Kad에만 연결합니다."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "통신망으로부터 연결을 끊습니다."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "현재 연결되어있는 모든 통신망으로부터 연결을 끊습니다.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Kad에서만 연결을 끊습니다."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Add an eD2k or magnet link to core."
 msgstr "ed2k 또는 magnet 링크를 코어에 추가합니다."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6808,52 +8293,52 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "설정값을 정합니다."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Set IP filtering preferences."
 msgstr "IP 차단 설정을 합니다."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "클라이언트와 서버에 IP 차단을 사용합니다."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "클라이언트와 서버에 IP 차단을 사용하지 않습니다."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "클라이언트에 IP 차단을 활성/비활성화 합니다."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "클라이언트에 IP 차단을 사용합니다."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "클라이언트에 IP 차단을 사용하지 않습니다."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "서버에 IP 차단을 활성화/비활성화 합니다."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "서버에 IP 차단을 사용합니다."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "서버에 IP 차단을 사용하지 않습니다."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "IP 차단 수준을 선택합니다."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6861,66 +8346,80 @@
 "유효한 차단 수준은 0-255범위여야 하고, 기본(초기)값은\n"
 "127입니다.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "대역폭 제한 설정합니다."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "이 명령에 주어지는 값은 킬로바이트/초 이어야 합니다..\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "올려주기 대역폭 제한 설정합니다."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "이 명령에 주어지는 값은 킬로바이트/초 이어야 합니다..\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "내려받기 대역폭 제한 설정합니다."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "사용자이름/암호 인증을 활성화/비활성화"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "이 명령에 주어지는 값은 킬로바이트/초 이어야 합니다..\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "설정값 가져와 보여줍니다."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering preferences."
 msgstr "IP 차단 설정을 가져옵니다."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for both clients and servers."
 msgstr "서버와 클라이언트에서 IP 차단 상태를 가져옵니다."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for clients only."
 msgstr "클라이언트에서만 IP 차단 상태를 가져옵니다."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for servers only."
 msgstr "서버에서만 IP 차단 상태를 가져옵니다."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering level."
 msgstr "IP 차단 수준을 선택합니다."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "대역폭 제한 가져옵니다."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a search."
 msgstr "Kad 검색을 수행합니다."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6939,46 +8438,48 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a global search."
 msgstr "광역 검색을 수행합니다."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a local search"
 msgstr "지역 검색을 수행합니다."
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a kad search"
 msgstr "Kad 검색을 수행합니다."
 
-#: src/TextClient.cpp:1070
+#: src/TextClient.cpp
 #, fuzzy
-msgid "Show the results of the last search."
+msgid "Show the results of a search."
 msgstr "마지막 검색의 결과를 보여줍니다."
 
-#: src/TextClient.cpp:1071
-#, fuzzy
-msgid "Return the results of the previous search.\n"
-msgstr "이전 검색의 결과로 돌아갑니다.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "검색의 진행을 보여줍니다."
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "검색의 결과를 보여줍니다..\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "파일의 내려받기를 시작"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6986,338 +8487,361 @@
 "마지막 검색으로부터 파일의 번호가 부여됩니다.\n"
 "예: 'download 12' 는 이전 검색에서 12번 번호를 가진 파일의 내려받기를 시작합니다.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "내려받기를 정지합니다."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "내려받기를 재시작합니다."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "내려받기를 취소합니다."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "내려받기의 우선순위를 설정합니다."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr "내려받기의 우선순위를 낮음, 보통, 높음 또는 자동으로 설정합니다.\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "우선순위를 낮음으로 설정합니다."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "우선순위를 보통으로 설정합니다."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "우선순위를 높음으로 설정합니다."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "우선순위를 자동으로 설정합니다."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "대기열/목록 보여줍니다."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr "올려주기/내려받기 대기열, 서버 목록이나 공유된 파일 목록 보여줍니다.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "올려주기 대기열을 보여줍니다."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "내려받기 대기열을 보여줍니다."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "로그를 보여줍니다."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "서버 목록 보여줍니다."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "공유된 파일 목록을 다시 읽어들입니다."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "로그를 초기화합니다."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
 "Use '%s' instead.\n"
 msgstr ""
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr ""
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "파일 삭제: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "파일 삭제: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "파일의 올려주기를 재시작합니다: %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "'%s'의 낡은 AICH 해시셋을 64b로 '%s'에 변환합니다."
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr "경고: 파일 이름 '%s'는 유효하지 않으며 '%s'로 변경되었습니다."
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr "경고: 파일 이름 '%s'는 이미 존재하며, 새 파일은 '%s'로 변경되었습니다."
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "이 분류에 있는 모든 파일을 취소하고 삭제하시겠습니까?"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "확인이 요청됨"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "매우 많은연결"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "다른 전부"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "보기 필터 선택"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "분류 추가"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "분류 수정"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "분류 삭제"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "알수 없는 파일의 해시설정이 요청되었습니다: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "공유 파일 목록 보기를 요청할 수 있는 사람을 선택하세요."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "파일의 올려주기를 재시작합니다: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "파일의 올려주기를 정지합니다: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "`%s' 명령을 실행하는데 실패했습니다. (`%s' 사건에대해)"
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "'%s' 명령을 실행하는데 실패했습니다. ('%s' 사건에대해)"
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr ""
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr ""
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr ""
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr ""
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr ""
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr ""
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "파일숫자 %u 처리: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "부분 해시를 요청했습니다. (오직 파일크기가 9.5 MB 보다 클때 사용)"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> 존재하는 파일이 없음!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "환영합니다!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "설정값 입력"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "파일을 해시"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "이 파일의 추가주소를 더합니다."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "삭제"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "부분해시의 링크를 생성합니다."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr "링크의 크기를 증가시키는 대신 새 파일 및 희귀한 파일을 빠르게 퍼지는 데에 도움을 줍니다."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "md4 파일 해시"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "저장"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "클립보드로 복사"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "aLinkCreator에 대하여"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "지금 복사할것은 아무것도 없습니다!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "열수 없음"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "제발, 파일이름을 비우지 마세요."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "지금 저장한것은 없습니다!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7329,163 +8853,160 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "해시중..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 #, fuzzy
 msgid "Cancelled !"
 msgstr "취소됨!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "%.2f 초만에 완료"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "이미 이 주소가 추가되어 있습니다!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "주소를 비우지 마세요."
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "%s를 열수없음."
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i 일 %i 시간 %i 분 %i 초"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02u일 %02u시 %02u분 %02u초"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02u시 %02u분 %02u초"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02u분 %02u초"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02u초"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, 어뮬 온라인 통계"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "wxCas 현재 실행시 최대 내려받기 속도"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "wxCas 이전 실행시부터 절대적 최대 내려받기 속도"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "초기화"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "시스템"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "자동갱신 멈춤"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "온라인 정적그림을 저장"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "온라인 정적그림을 프린트"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "환경 설정"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "wxCas에 대하여"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "자동갱신을 시작"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "자동갱신을 멈춤"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "자동갱신이 시작됨"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "통계 이미지를 저장"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "어뮬 온라인 통계"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7493,11 +9014,11 @@
 "프린트하는데 문제가 있습니다.\n"
 "혹시 현재 프린터가 올바로 설정되지 않았나요?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "프린트함"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7515,399 +9036,522 @@
 "\n"
 "GPL로 배포합니다."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "어어, 어뮬이 실행중이 아닙니다..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "어뮬은 실행중입니다."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "어뮬은 실행중이나 연결이 끊겨 있습니다."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "어뮬은 연결중..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "어어, 어뮬의 상태는 알수없음..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "어뮬 "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " 위해 실행되고있는 "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " 은 멈추어져 있습니다."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " 은 연결되지 않았습니다."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " 은 연결중..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " 무엇인가 이상하게 동작하고 있음, 확인 요망!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " 는 다음으로 연결중: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "끔"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr "켜졌습니다."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 #, fuzzy
 msgid " with "
 msgstr " with "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "전체 내려받기: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", 올려주기: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "내려받기 세션: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "내려받기: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr "올려주기, kB/s: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "공유함: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr "대기열에있는 파일, 클라이언트: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "시간:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr "켬"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "시스템 부하 평균 (1-5-15 분): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "시스템 연속 작동 시간: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "amulesig.dat 파일을 포함한 폴더"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "amulesig.dat 파일이 있는 폴더를 이곳에 입력하세요."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "갱신율 초당 간격"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "매회 갱신할 때 통계 이미지를 생성합니다."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "통계 이미지를 생성하는것을 원하는 장소 폴더를 이곳에 입력하세요."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "FTP 서버의 통계 이미지를 정기적으로 올려줍니다."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP Url"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP 경로"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "FTP 서버의 URL을 이곳에 입력하세요."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "FTP 서버에 통계 이미지가 위치할 폴더를 이곳에 입력하세요."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "사용자"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "FTP 서버로 로그인하기 위한 사용자이름을 이곳에 입력하세요."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "FTP 서버로 로그인하기 위한 암호를 이곳에 입력하세요."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTP 갱신율 분당 간격"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "유효합니다"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "서명 파일이 있는 폴더"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "통계 이미지를 생성하는곳의 폴더"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "템플릿<str>을 읽음"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP 포트"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "gzip 압축 사용"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "손님 접근 허가"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "손님 접근 금지"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "어뮬 설정 파일 경로. DO NOT USE DIRECTLY!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "PHP 해석자를 (권장되지 않는) 사용않함"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "각 요청의 PHP 페이지를 재컴파일함"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "어뮬 웹 서버"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "다음과 같은 오류로 요청 실패함: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "인덱스 파일을 찾을 수 없음:"
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "세션이 만료됨 - 로그인 요청중\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "세션 확인, 로그인 됨\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "세션 확인, 로그인 안됨\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "열린 세션 없음 - 로그인을 요청할 것임\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "세션이 생성됨 - 로그인 요청중\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "요청 처리중 원본: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "암호를 검사중\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "암호 해시가 유효하지 않음\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "암호 맞음\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "암호 틀림\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "암호를 입력하지 않았습니다. 빈암호는 사용할수 없습니다.\n"
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "로그아웃이 요청됨\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "요청 처리중redirected: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "연결 실패"
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "파일을 찾을 수 없습니다."
+#~ msgid "Ratio"
+#~ msgstr "등급"
+
+#, fuzzy
+#~ msgid "Change Language"
+#~ msgstr "언어"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "유효하지 않음"
+
+#~ msgid "User name"
+#~ msgstr "사용자이름"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "획득한 부분"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "가능함 :"
+
+#, fuzzy, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "알려진 공유 파일 %i개, 알수없는 %i개를 찾았음 "
+#~ msgstr1 "알려진 공유 파일 %i개, 알수없는 %i개를 찾았음 "
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#, fuzzy
+#~ msgid " kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "원격 서버"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "지역 서버"
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "오래된 내려받은 파일로부터 데이터를 읽어들임 (%u (%u의))"
+
+#~ msgid "Filter Results"
+#~ msgstr "필터링 결과"
+
+#~ msgid "Bootstrap"
+#~ msgstr "초기적재"
+
+#~ msgid "New node"
+#~ msgstr "새로운 노드"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "추가"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "알려진 클라이언트로부터 \n"
+#~ "초기적재"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "서버 혹은 Kad에 연결"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Kad 끊김"
+
+#, fuzzy
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "현재 연결시도를 멈춤"
+
+#, fuzzy
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "통신망으로부터 연결을 끊습니다."
+
+#, fuzzy
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "통신망에 연결합니다."
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "어뮬은 내려받는 목록의 항목을 자동으로 정렬합니다."
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "클라이언트 IP가 패킷이 수신된 IP와 다르면 패킷을 거부합니다. 조심해서 사용하세요."
+
+#, fuzzy
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "이전 검색의 결과로 돌아갑니다.\n"
+
+#, fuzzy
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "검색의 결과를 보여줍니다..\n"
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "시작할때 새 버젼이 있는지 확인"
+
+#~ msgid "Commit"
+#~ msgstr "확정"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "\t더 많은 정보는 https://amule-org.github.io/docs을 참조하세요."
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "버그는 https://github.com/amule-org/amule/issues로 보고해 주십시오."

amule-3.0.1.tar.gz/po/lt.po -> amule-3.1.0.tar.gz/po/lt.po Changed

@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:20+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:55+0000\n"
 "Last-Translator: Dovydas Sankauskas <laisve@gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt@konf.lt>\n"
 "Language: lt\n"
@@ -21,70 +21,156 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Rodyti aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMule nuotolinio valdymo pultelis "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Ekrano kopija:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Autorinės teisės (C) 2003-2019 aMule komanda \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: p2p maršrutizavimas, paremtas XOR metrika.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Paleidus programą ieškoti naujesnės versijos"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Jungiamsi prie Kademlia..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Naudojate pasenusią aMule versiją!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Nėra"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Įdėti draugą"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Įrašyti IP ir prievadas teisingi!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informacija"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Nurodyta naudotojo maišos f-ja klaidinga!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Prisijungti nepavyko "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -93,145 +179,275 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "KLAIDA"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 #, fuzzy
 msgid "Failed to open ED2KLinks file."
 msgstr "Nepavyko atverti %s (%s)"
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Indekso failas nerastas: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Nepavyko gauti dalinamų failų iš vartotojo „%s“"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Nepavyko konvertuoti magnet nuorodos į eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Klaidinga eD2k nuoroda! KLAIDA: %s"
+
+#: src/amule.cpp
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "Darbas baigiamas %s...\n"
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Nepavyko"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "Atsiuntimas baigtas"
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Pasikeitus parinktims aplinkos kalba buvo pakeista į sistemoje numatytą kalbą."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Informacija"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Baigimo patvirtinimas"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "Naujas išorinis ryšys priimtas"
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "DĖMESIO"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "server.met faile rastas %i serveris"
+msgid "Loading temp files"
+msgstr "Įkeliamas server.met failas: %s"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Įkeliamas server.met failas: %s"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Atnaujinti dalinamų failų sąrašą"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Atnaujinti dalinamų failų sąrašą"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Pradėti"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Tinklas"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Tinklas"
+msgid "eD2k server list (server.met)"
+msgstr "server.met faile rastas %i serveris"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "žiniatinklio serverio pid yra %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 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:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "KLAIDA"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "žiniatinklio serverio pid yra %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+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
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nepavyko susieti prievadų su nurodytu adresu: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Prievadas %u neprieinamas. Gavote žemą ID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -247,48 +463,48 @@
 "\n"
 "Patikrinkite sistemines tinklo parinktis ir įsitikinkite, kad nurodytas prievadas atviras tiek išsiuntimui, tiek priėmimui."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Nepavyko sukurti keičiamo parašo failo"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Nepavyko sukurti keičiamo aMule parašo failo"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "aMule paleista pirmą kartą %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Ši versija yra darbinė versija, atnaujinama kasdien, ir\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "svetainėje https://amule-org.github.io arba IRC kanale #aMule serveryje irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Nesikuklinkite pranešti rastas klaidas adresu https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -296,598 +512,629 @@
 "Neteisingai nurodėte keičiamo parašo aplanką!\n"
 "Keičiamas parašas bus išjungtas tol, kol pakeisite parinktis."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 #, fuzzy
 msgid "Server hostname notified"
 msgstr "Serverio pavadinimas:"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Nepavyko paskirti disko vietos failui „%s“: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "KLAIDA: nepavyko atverti žurnalo failo"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "DĖMESIO: žurnalas tuščias. Kažkas čia ne taip."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Žurnalas išvalytas"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Serverio pranešimas: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Nepavyko atsiųsti mazgų sąrašo."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Nepavyko atverti atsiųstos versijos tikrinimo failo"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Sugadintas versijos tikrinimo failas"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Naudojate pasenusią aMule versiją!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Naujausią versiją bet kada galima atsisiųsti iš https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Naudojate naują aMule versiją."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Nepavyko atsiųsti versijos tikrinimo failo"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Naudotojai: %s | Failai: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Neparinktas joks tinklas"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "žemas ID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "aukštas ID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Prisijungta prie %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Jungiamasi prie %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Atsijungta nuo eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kademlia paleista."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kademlia sustabdyta."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Prisijungta prie Kademlia"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Prisijungta prie Kademlia (už ugniasienės)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Atsijungta nuo Kademlia"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr "Nepavyks prisijungti prie Kademlia tinklo, jei parinktyse yra išjungtas UDP prievadas."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kademlia tinklas išjungtas parinktyse, ryšys nebus užmezgamas."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 #, 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 "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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "KLAIDA: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "aMule %s, sukurta eMule pagrindu."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Vykdoma %s sistemoje"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Aplankykite https://github.com/amule-org/amule/releases/latest ir pasitikrinkite ar nėra naujesnės versijos."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "KRITINĖ KLAIDA: nepavyko sukurti laiko skaitliuko"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMule nuotolinio valdymo pultelis "
-
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Ekrano kopija:"
-
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr ""
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Tinklas"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr ""
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Paieška"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "\tNorėdami sužinoti daugiau informacijos apsilankykite https://amule-org.github.io/docs"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Siuntimai"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Nesikuklinkite pranešti rastas klaidas adresu https://github.com/amule-org/amule/issues"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Dalinami failai"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Autorinės teisės (C) 2003-2019 aMule komanda \n"
-"\n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Naudotojai"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr ""
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Žinutės"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: p2p maršrutizavimas, paremtas XOR metrika.\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistika"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Parinktys"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Žinutė"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Serverio pranešimas: %s"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Nėra"
+
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Naujausią versiją bet kada galima atsisiųsti iš https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: jungiamasi"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: atsijungta"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: už ugniasienės"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: prisijungta"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: jungiamasi"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: išjungta"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Atšaukti"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Nutraukti bandymus prisijungti"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versija"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Atsijungti"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Atsijungti nuo pasirinktų tinklų"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Prisijungti"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adresas"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Prisijungti prie pasirinktų tinklų"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Aprašymas"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "aMule žurnalas"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Išs.: %.1f(%.1f) | Ats.: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Išs.: %.1f | Ats.: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | prisijungta)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | neprisijungta)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Ar tikrai norite baigti darbą su aMule?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Baigimo patvirtinimas"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Išvaizdos failų aplankas %s neegzistuoja"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "DĖMESIO: nepavyko atverti temos failo „%s“ skaitymui"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Tinklas"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Tinklo langas"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Paieška"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Paieškos langas"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Siuntimai"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "Atsiunčiama"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Dalinami failai"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Dalinamų failų langas"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Žinutės"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Tinklo langas"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Žinučių langas"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistika"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Statistikos grafikų langas"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Parinktys"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Parinkčių langas"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Įkelti"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Dalinai atsiųstų failų įkėlimo įrankis"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Apie"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Apie/pagalba"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "eD2k tinklas"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kad tinklas"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Jokio tinklo"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "KRITINĖ KLAIDA: nepavyko sukurti laiko skaitliuko"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Prisijungti prie nutolusio aMule"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Ryšys nutrūko"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Klausti prieš baigiant darbą"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "KRITINĖ KLAIDA: nepavyko sukurti laiko skaitliuko"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Going to event loop..."
 msgstr "Bandoma atstatyti failo informaciją..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Connecting..."
 msgstr "Jungiamasi"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr ""
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Baigėsi bandymo susijungti laikas %s (%s:%i)."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Išjungta"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Prisijungti prie tinklo."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Viskas"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Nepasiekiama"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Failas nerastas."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Klaidinga nuoroda arba failas sąraše jau yra."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Failas %s jau yra atsiunčiamų failų sąraše"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Nepavyko gauti dalinamų failų iš vartotojo „%s“"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (neteisinga eMule versija %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (neteisinga eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (neteisinga eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (paremta eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Slapyvardis: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Paprašė: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
@@ -895,7 +1142,7 @@
 msgstr1 "Šio seanso failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
 msgstr2 "Šio seanso failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
@@ -903,120 +1150,202 @@
 msgstr1 "Visų seansų failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
 msgstr2 "Visų seansų failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Paprašė nežinomo failo"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Filtras sulaikė %s žinutę (IP %s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Naują žinutę atsiuntė %s (IP %s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, 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/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Nepavyko gauti dalinamų failų iš vartotojo „%s“"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "DĖMESIO: nepavyko atverti known.met."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 #, fuzzy
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "DĖMESIO: sugadintas known.met, klaidinga antraštė."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Nuskaitant known.met failą įvyko IO klaida: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Įrašant known.met failą įvyko klaida: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategorija"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nauja kategorija"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Nurodykite atsiųstų failų aplanką"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Nurodykite kategorijos pavadinimą!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Nurodykite kategorijos kelią!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Pokalbis pradėtas: %s (%s:%u) – %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Prisijungta prie kliento ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Jungiamasi prie kliento ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Nepavyko prisijungti prie kliento arba ryšys nutrūko ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Užverti kortelę"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Užverti visas korteles"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Užverti kitas korteles"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Įdėti į draugus"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Rodyti &išsamiau"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Pašalinti iš draugų"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Sukurti siuntimo kanalą draugui"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Peržiūrėti failus"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Siųsti žinutę"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Siųsti žinutę naudotojui"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Siųsti žinutę:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Neleidžiama sukurti daugiau nei vieną siuntimo kanalą draugui.\n"
+"Buvo sukurtas tik vienas kanalas."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Pažymėta keletas"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Pašalinti iš draugų"
+msgstr1 "Pašalinti iš draugų"
+msgstr2 "Pašalinti iš draugų"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Atnaujinti dalinamų failų sąrašą."
+msgstr1 "Atnaujinti dalinamų failų sąrašą."
+msgstr2 "Atnaujinti dalinamų failų sąrašą."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
@@ -1024,7 +1353,7 @@
 msgstr1 "Kreditų failas įkeltas, rasti %u žinomi klientai"
 msgstr2 "Kreditų failas įkeltas, rasta %u žinomų klientų"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
@@ -1032,160 +1361,272 @@
 msgstr1 "– %u klientų kreditai nebegalioja!"
 msgstr2 "– %u klientų kreditai nebegalioja!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Nerasta cryptkey.dat failo. Failas kuriamas."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Kliento savybės"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "Žemas ID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "Aukštas ID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Įjungta"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Palaikoma"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Nepalaikoma"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Išjungta"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Prisijungta"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Neprisijungta"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Pavadinimas"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP adresas"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Paskutinį kartą siųsta"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Versija"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Išsiuntimo sparta"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "Atsiuntimo sparta"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Išsiųsta"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Išviso atsiųsta: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Ats./išs. indeksas"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Keičiamas parašas"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Neužbaigta"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Kenkėjas"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Praėjo patikrinimą"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "Nežinoma"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Nepasiekiama"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Failai"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Išsiųsta"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Atsiųsta"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Atsiunčiama"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Išsiuntimas"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Aktyvios"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Nežinoma"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Naudotojas %s (%u) paprašė dalinamų failų sąrašo –> suteikta"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Naudotojas %s (%u) paprašė dalinamų failų sąrašo –> atmesta"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Naudotojas %s (%u) paprašė dalinamų aplankų sąrašo –> suteikta"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Naudotojas %s (%u) paprašė dalinamų aplankų sąrašo –> atmesta"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, fuzzy, 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:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Naudotojas %s (%u) dalinasi aplanku %s"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Naudotojas %s (%u) atsiuntė neprašytus dalinamų failų aplankus"
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "Naudotojas %s (%u) baigė siųsti dalinamų failų sąrašą"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Naudotojas %s (%u) atsiuntė neprašytą dalinamų failų sąrašą"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, 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/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Failo komentarai"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Vardas"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Failo pavadinimas"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Reitingas"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Komentaras"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kademlia paieška negalima, jei nepaleista Kademlia tarnyba"
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Komentarų nėra"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
@@ -1193,409 +1634,416 @@
 msgstr1 "%u komentarai"
 msgstr2 "%u komentarų"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Nepavyko iš %s atsiųsti serverių sąrašo"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Automatiškai (žemas)"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Automatiškai (normalus)"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Automatiškai (aukštas)"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Labai žemas"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Žemas"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normalus"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Aukštas"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Labai aukštas"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Leidinys"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Klausiama"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Jungiamasi per serverį"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Eilė pilna"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Eilėje"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Atsiunčiama"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Laukiama maišos f-jos reikšmės"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Nėra reikalingų dalių"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Žemam ID nepavyks prisijungti prie kito žemo ID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Per daug užmegztų ryšių"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Jungiamasi per Kademlia"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Perdaug Kademlia ryšių"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Užblokuota"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Ryšio klaida"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Nutolusi eilė pilna"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Senasis MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Naujasis MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Suderinamas su eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Vietinis serveris"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Nutolęs serveris"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kademlia"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Keičiamasi šaltiniais"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Neveiklus"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Nuoroda"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Pilni šaltiniai"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Baigtos"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Dirbama"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "KLAIDA: trūksta laisvos disko vietos"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "KLAIDA: nerastas dalių failas"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ERROR: IO klaida!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ERROR: nepavyko!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Eilėje"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Jau siunčiama"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Nežinomas arba klaidingas laikino failo formatas."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Dydis"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Persiųsta"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Sparta"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Eiga"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Šaltiniai"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioritetas"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Būsena"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Likęs laikas"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Paskutinį kartą matyta pilna"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Paskutinį kartą siųsta"
 
-#: 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/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/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Atsakymas iš: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automatiškas"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Atšaukti"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Sustabdyti"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pauzė"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Tęsti"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "I&švalyti baigtus failus"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Visų naudotojų, turinčių šį failą, prašyti šio failo dabar pat"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Visų naudotojų, turinčių šį failą, prašyti šio failo automatiškai"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Visų naudotojų, turinčių šį failą, prašyti kito failo"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Papildomi veiksmai"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Peržiūra"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "&Rodyti failo savybes"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Rodyti komentarus"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Kopijuoti magneto URI į talpyklę"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Kopijuoti eD2k &nuorodą į talpyklę"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Kopijuoti atsakymą į talpyklę"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Šiam failui įdėti papildomus URL"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "Nepriskirti niekur"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Priskirti į kategoriją"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Atverti failą"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Ar tikrai norite pašalinti pažymėtą failą?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Ar tikrai norite pašalinti pažymėtus failus?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Atsakymas iš: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Įrašykite naują failo pavadinimą:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Pervadinti failą"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Atsiuntimai (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Norėdami nebematyti šio įspėjimo kiekvienos peržiūros metu,\n"
-"parinktyse nurodykite pageidaujamą video grotuvą (numatytas yra %s)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Failo peržiūra"
+msgid "Downloads (%i)"
+msgstr "Atsiuntimai (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "KLAIDA: nepavyko paleisti išorinio vaizdo grotuvo! Komanda: „%s“"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Iš viso atsiųsta: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading temp files from %s."
 msgstr "Įkeliamas server.met failas: %s"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Įkeliami duomenys iš seno atsiuntimo failo (%u iš %u)"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "KLAIDA: nepavyko įkelti atsarginės kopijos failo. Paieškokite https://github.com/amule-org/amule/discussions .part.met atstatymo būdų."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Nerastas nei vienas dalių failas"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
@@ -1603,45 +2051,45 @@
 msgstr1 "Rasti %u dalių failai"
 msgstr2 "Rasta %u dalių failų"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Laikino aplanko failų sistema nemoka dirbti su dideliais failais."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Atsiųstų failų aplanko failų sistema nemoka dirbti su dideliais failais."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Atsiunčiama %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, 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:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Failas %s jau buvo atsiųstas"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Failas %s jau buvo atsiųstas"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, 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:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Nepavyko konvertuoti magnet nuorodos į eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Nežinomas protokolas arba nuoroda: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
@@ -1649,243 +2097,325 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Klaidinga eD2k nuoroda! KLAIDA: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client sent packet after authentication failed."
 msgstr "Patvirtinimas nepavyko."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Išorinis ryšys nutrauktas."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Išoriniai ryšiai atjungti, nes slaptažodis tuščias!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Išoriniai ryšiai atjungti parinkčių faile"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Naujas išorinis ryšys priimtas"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "KLAIDA: nepavyko priimti išorinio ryšio"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 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:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Jungiasi klientas: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Nežinoma versija"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "Klaidingos išorinių ryšių versijos, taip gali būti dėl skirtingų programų. Programos branduolį ir nutolusią aplinką naudokite kompiliuotą iš tos pačios pradinio kodo versijos."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "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:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Neteisinga protokolo versija."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Trūksta protokolo versijos žymės."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Po %d sekundės bus bandoma prisijungti prie serverio automatiškai"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: wrong password."
 msgstr "Patvirtinimas nepavyko."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: missing password."
 msgstr "Patvirtinimas nepavyko."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Invalid request, please authenticate first."
 msgstr "Klaidingas prašymas, iš pradžių turite būti atpažinti."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Prieiga suteikta."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Filtruoti žinutes nuo nežinomų klientų"
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Bandymas gauti prieigą. Prieiga nesuteikta, ryšys nutrauktas."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Failo maišos funkcija nerasta: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "Oi! OpCode vykdymo klaida!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Serveris neįdėtas"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "serveris nerastas: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "Nurodykite serverį, kurį pašalinti"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k išjungtas parinktyse."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Failas nerastas."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Failas nerastas."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Ieškoma. Tuoj bus gauti rezultatai!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "www paieška iš nutolusios programos neturi prasmės."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Ieškoma. Tuoj bus gauti rezultatai!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Grafikui nėra duomenų."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Šis klientas nesuderintas pateikti tiek detalių."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Išorinis ryšys: gautas prašymas išjungti"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Jau išsijungiama."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Išoriniai ryšiai: įdedama nuoroda %s."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Klaidinga nuoroda arba failas sąraše jau yra."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Failas nerastas."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Klaidingas failo pavadinimas."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Nepavyko pervadinti failo."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Baigti pokalbį ir užverti pokalbio kortelę."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Pradėtas naujas pokalbis"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Baigti pokalbį ir užverti pokalbio kortelę."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kademlia išjungta parinktyse."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(pavadinimas nežinomas)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kademlia išjungta parinktyse."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Prie eD2k jau prisijungta."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Jungiamasi prie eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Prie Kademlia jau prisijungta."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Jungiamsi prie Kademlia..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Visi tinklai išjungti."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Atsijungta nuo eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Atsijungta nuo Kademlia."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Išorinis ryšys: gautas klaidingas opcode: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Klaidingas opcode (bloga protokolo versija?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Nežinomas plėtinys %s (komandai %s).\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Nežinoma komanda %s.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1893,7 +2423,7 @@
 "\n"
 "Ši komanda neturi kintamųjų.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1901,7 +2431,7 @@
 "\n"
 "Šiai komandai reikia kintamojo.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1909,7 +2439,7 @@
 "\n"
 "Ši komanda nebaigta, naudokite vieną iš plėtinių žemiau.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1917,11 +2447,11 @@
 "\n"
 "Galimi plėtiniai:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Galimos komandos:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1932,17 +2462,17 @@
 "Visoms komandoms svarbu raidžių dydis.\n"
 "Įrašę „%s <komanda>“ gausite išsamią informaciją apie <komandą>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Baigti programos darbą."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Rodyti pagalbą."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1950,7 +2480,7 @@
 "Įrašę „help <komanda>“ gausite išsamią informaciją apie <komandą>.\n"
 "Įrašę „help“ gausite pilną komandų sąrašą.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1961,46 +2491,46 @@
 "Įrašę „%s“ gausite komandų sąrašą\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Sintaksės klaida!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Ši komanda negali turėti parametrų."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Ši komanda privalo turėti parametrą."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Klaidingas kintamasis."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Komanda neužbaigta."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Įrašę „%s“ gausite išsamesnę pagalbą.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Tai %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Tai %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -2008,7 +2538,7 @@
 "\n"
 "Kuriamas klientas...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2017,7 +2547,7 @@
 "\n"
 "Darbas baigiamas %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2031,118 +2561,361 @@
 "\n"
 "Darbas baigiamas...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Rodyti šį pagalbos tekstą."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Mazgas, kuriame paleista aMule. Numatyta: 127.0.0.1"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "aMule išorinių ryšių prievadas. Numatyta: 4712"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Išorinių ryšių slaptažodis."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Nuskaityti parinktis iš failo."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Nepateikti išvesties į stdout įrenginį."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Rodyti išsamius pranešimus, negi klaidų taisymo pranešimus."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Nurodyti programos kalbą."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Komandų eilutės parinktis įrašyti į parinkčių failą."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Sukurti parinkčių failą pagal aMule parinkčių failą."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Atspausdinti programos versiją."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Failo savybės"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%% baigta"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Failo peržiūra"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "KLAIDA: nepavyko paleisti išorinio vaizdo grotuvo! Komanda: „%s“"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "KLAIDA: nepavyko atverti dalių failo „%s“"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Sveikiname!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Prisijungta prie draugo"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Ryšio būklė:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Tinklas"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Inicializavimas"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Failas %s jau yra atsiunčiamų failų sąraše"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Automatiškai atnaujinti serverių sąrašą paleidus programą"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Naršyti"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Nepavyko atverti draugų sąrašo failo „emfriends.met“ skaitymui!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Nepavyko atverti draugų sąrašo failo „emfriends.met“ rašymui!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Draugai"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Rodyti &išsamiau"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Įdėti draugą"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Pašalinti draugą"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Siųsti &žinutę"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Peržiūrėti failus"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Sukurti siuntimo kanalą draugui"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Ar tikrai pašalinti pažymėtą draugą?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Ar tikrai pašalinti pažymėtus draugus?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2150,204 +2923,180 @@
 "Neleidžiama sukurti daugiau nei vieną siuntimo kanalą draugui.\n"
 "Buvo sukurtas tik vienas kanalas."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Pažymėta keletas"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Neleidžiama sukurti daugiau nei vieną siuntimo kanalą draugui.\n"
-"Buvo sukurtas tik vienas kanalas."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Siųsti žinutę naudotojui"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Siųsti žinutę:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Pašalinti iš draugų"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Siųsti žinutę"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Keisti į šį failą"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "Ats. kitą failą"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "Reitingas: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Atsiunčiamas kitas failas"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "Laukiantys išsiuntimai: %s"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "Eilėje"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "Išsiuntimas"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "None"
 msgstr "Niekas"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Ne"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Taip"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Nepavyko atverti %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Atsiunčiama..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Nepavyko gauti dalinamų failų iš vartotojo „%s“"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Failas %s jau yra atsiunčiamų failų sąraše"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Atsiųsta"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Atsiuntimai (%i)"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Nepavyko iš %s atsiųsti serverių sąrašo"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "Nepavyko iš %s atsiųsti serverių sąrašo"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Nepavyko iš %s atsiųsti serverių sąrašo"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 #, fuzzy
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Įkeliami IP filtrai ipfilter.dat ir ipfilter_static.dat."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Nepavyko įkelti ipfilter.dat failo „%s“, nepavyko suprasti failo formato."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "Nepavyko įkelti ipfilter.dat failo „%s“, nepavyko atverti failo."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
@@ -2355,7 +3104,7 @@
 msgstr1 "Įkelti %u IP diapazonai iš „%s“."
 msgstr2 "Įkelta %u IP diapazonų iš „%s“."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
@@ -2363,66 +3112,73 @@
 msgstr1 "%u klaidingi įrašai neįkelti."
 msgstr2 "%u klaidingų įrašų neįkelta."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Inicializuoti iš \n"
-"žinomų klientų"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Dabartinė sparta"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Dabartinis vidurkis"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Seanso vidurkis"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Mazgai (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Klaidingas inicializavimo IP"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Klaidingas inicializavimo prievadas"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Prašome užpildyti visus privalomus laukus"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Žinutė"
+
+#: src/KadDlg.cpp
 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/KadDlg.cpp:213
+#: src/KadDlg.cpp
 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/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Tęsti?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: ieškomas žodis pernelyg trumpas"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
@@ -2430,12 +3186,11 @@
 msgstr1 "Nuskaityti %u Kad kontaktai"
 msgstr2 "Nuskaityta %u Kad kontaktų"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
@@ -2443,7 +3198,7 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
@@ -2451,1832 +3206,2288 @@
 msgstr1 "Įrašyti %d Kad kantaktai"
 msgstr2 "Įrašyta %d Kad kantaktų"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Kad tinklas"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Failo pavadinimas"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Failo dydis"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Platinimo santykis"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Išsiųsta"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Paprašyta"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Priimta"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Pilni šaltiniai"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Numatyta"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanų"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabų"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Asturian"
+msgstr "Estų"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baskų"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgarų"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalonų"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Kinų (supaprastinta)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Kinų (tradicinė)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Kroatų"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Čekų"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Danų"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Olandų"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Anglų (DB)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Anglų (DB)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estų"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Suomių"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Prancūzų"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galisijos"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Vokiečių"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Graikų"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Žydų"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Vengrų"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italų"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japonų"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Korėjiečių"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lietuvių"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvegų (naujoji norvegų)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Lenkų"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugalų"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugalų (Brazilijos)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Romanian"
+msgstr "Albanų"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Rusų"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slovėnų"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Ispanų"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Švedų"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turkų"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "Nežinoma versija"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unable to get error description for error %d"
 msgstr "DĖMESIO: nepavyko atverti temos failo „%s“ skaitymui"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Vykdoma maiša"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Patvirtinama"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Baigta"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Pristabdyta"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Klaidinga"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Laukiama"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Turite įrašyti netuščią slaptažodį."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Klaidingas slaptažodis, ne MD5 maiša!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Ryšio klaida"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Išorinis ryšys nutrauktas."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "Nepavyko užmegzti išorinio ryšio. Gautas tuščias atsakymas."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Išorinis ryšys: neteisingas atsakymas iš serverio. Ryšys nutrauktas."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Išorinis ryšys: neteisingas atsakymas iš serverio. Ryšys nutrauktas."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Pavyko! Užmegztas ryšys su aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Pavyko! Ryšys užmegztas."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Išorinis ryšys: prieiga nesuteikta"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Handshake failed."
 msgstr "Išorinis ryšys: prieiga nesuteikta"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "Automatinis atnaujinimas paleistas"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "KLAIDA: nepavyko klausytis TCP prievado."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "KLAIDA: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "DĖMESIO: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Užverti"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Iškirpti"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Įterpti"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Išvalyti"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Pažymėti viską"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Neribojama"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Rodyti aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Slėpti aMule"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Prisijungta"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Prisijungta"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Prisijungta prie Kademlia (už ugniasienės)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "Serverio IP: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "Serverio IP:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Neprisijungta"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP prievadas: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP prievadas: neparuošta"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP prievadas: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP prievadas: neparuošta"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Kliento informacija"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Išsiuntimo apribojimas"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Atsiuntimo apribojimas"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Rodyti aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Atsijungti"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Slėpti aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Prisijungti"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Baigti"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Neribojama"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule dėklo meniu"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Spartos apribojimai:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "Išs.: jokių"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "Išs.: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "Ats.: jokių"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "Ats.: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Atsiuntimo sparta: %.1f"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Išsiuntimo sparta: %.1f"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Slapyvardis: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Slapyvardis nenurodytas!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "Kliento ID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Serverio pavadinimas: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "Serverio IP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Neprisijungta"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Keičiamas parašas: įjungta"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Keičiamas parašas: išjungta"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Seanso trukmė: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Dalinami failai: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Klientai eilėje: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Iš viso atsiųsta: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Iš viso išsiųsta: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k nuoroda: "
-
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Vykdyti"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Įdėti eD2k arba magneto nuorodą į branduolį."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Įdėti į draugus"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 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:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Įvykių žurnalas. Pilną įvykių žurnalą galite rasti Serverių kortelėje."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Įkeliama..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Naudotojų skaičius serveryje, prie kurio prisijungėte..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Naudotojų: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Naudotojų skaičius dabartiniame serveryje ir apytikslis bendras naudotojų skaičius."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Išs.: 0,0 | Ats.: 0,0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Dabartinė vidutinė išsiuntimo ir atsiuntimo sparta. Jei įjungta papildoma parinktis skaičiai skliausteliuose nurodo išnaudojamą tarnybinį srautą."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Ryšio būklė ir aktyvūs siuntimai. Raudonos rodyklės žymi, kad ryšys neužmegztas, geltonos rodyklės žymi, kad gavote žemą ID (esate už ugniasienės), žalios rodyklės žymi, kad gavote aukštą ID (geriausia ryšio būklė)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Neprisijungta..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Dabartinis serveris."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Paieška"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Pavadinimas:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tipas"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Vietinis"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Globalus"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Papildomos parinktys"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtrai"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Failo tipas"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Bet kas"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Supakuoti failai"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Garso failai"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CD atvaizdai"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Paveiksliukai"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programos"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Teksto failai"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Vaizdo failai"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Plėtinys"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Min dydis"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Baitai"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Maks dydis"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Skaičius"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtras:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filtruoti rezultatus"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtras"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Apversti filtrą"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Slėpti žinomus failus"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Atstatyti laukelius"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Pradėti"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Daugiau"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Plėtinys"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Sustabdyti"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Atsiųsti"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Atsiunčiamą failą įdėti į kategoriją"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Filtruoti rezultatus"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Atstatyti laukelius"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Paieškos rezultatai"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Pašalinti iš sąrašo jau atsiųstus failus"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtras:"
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "Pilni šaltiniai"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Bendra"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Pilnas pavadinimas:"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "Nežinoma"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Pilnas pavadinimas"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met failas"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Maišos f-jos reikšmė"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met failas:"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Maišos f-jos reikšmė:"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Failo dydis:"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Dalinio failo būsena:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Paskutinį kartą matytas pilnas:"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Failo dydis"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Siuntimas"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Rasti šaltiniai:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Dalinio failo būsena"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Paskutinį kartą matytas pilnas"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Rasti šaltiniai"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Siunčiantys šaltiniai"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Dalių skaičius"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Pasiekiamos dalys"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Siuntimo sparta"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Atsiuntimo aktyvi trukmė"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Atsiųstas kiekis"
+
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
+msgstr "Klaidų taisymo įrankis"
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Siunčiantys šaltiniai:"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Dalių skaičius:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Pasiekiamos dalys:"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Dėl klaidų prarasta"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Siuntimo sparta:"
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Sutaupyta supakuojant"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Atsiuntimo aktyvi trukmė: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Persiųsta duomenų:"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Atsiųstas kiekis:"
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Klaidų taisymo įrankis pataisė paketų"
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
-msgstr "Klaidų taisymo įrankis"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Dalinamasi: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Prašymai"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Patenkinti prašymai"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Persiųsta duomenų"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Dalinimo santykis"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Pilni šaltiniai"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Dalinami failai"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Išsiųsta: "
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Dėl klaidų prarasta:"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Sutaupyta supakuojant:"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Klaidų taisymo įrankis pataisė paketų:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Kademlia informacija"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Nevertinta"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Pavadinimas"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Failo pavadinimai"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Pervadinti"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Išvalyti"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Įvykdyti"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Gerai"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Komentuokite ir įvertinkite failą (komentarą matys visi naudotojai)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Failo kokybė"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Nevertinta"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Klaidinga/sugadinta"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Prasta"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Labai gera"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Gera"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Puiki"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Atsijungta nuo Kademlia"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Atnaujinti"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Atsiunčiama, prašome palaukti..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Dydis nežinomas"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Būtina informacija"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP adresas:"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Prievadas:"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Prievadas"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Papildoma informacija"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Naudotojo vardas:"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Naudotojo maišos f-ja:"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Naudotojo maišos f-ja"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Įdėti"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Atsiuntimo sparta"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Dabartinė sparta"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Dabartinis vidurkis"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Seanso vidurkis"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Išsiuntimo sparta"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Ryšiai"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktyvūs atsiuntimai"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktyvūs ryšiai (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktyvūs išsiuntimai"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Statistikos duomenų medis"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Naudotojo vardas:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Naudotojo maišos f-ja:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Kliento programinė įranga:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Programinės įrangos versija:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP adresas:"
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "Naudotojo ID:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Kliento programinė įranga"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Programinės įrangos versija"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "Naudotojo ID"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Serverio IP"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Serverio IP:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Serverio pavadinimas"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Serverio pavadinimas:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Slėpimas"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Slėpimas:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Protokolo slėpimas"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Siuntimai naudotojui"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Dabartinis prašymas:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Vidutinė išsiuntimo sparta:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Vidutinė atsiuntimo sparta:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Išsiųsta (per šį seansą):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Atsiųsta (per šį seansą):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Išsiųsta (iš viso):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Atsiųsta (iš viso):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Dabartinis prašymas"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Vidutinė išsiuntimo sparta"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Vidutinė atsiuntimo sparta"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Išsiųsta (per šį seansą)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Atsiųsta (per šį seansą)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Išsiųsta (iš viso)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Atsiųsta (iš viso)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Reitingas"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Ats./išs. indeksas:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Saugus identifikatorius"
 
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Saugus identifikatorius:"
-
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "Eilėje"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Reitingas eilėje:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Reitingas eilėje"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Slapyvardis"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 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:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Naudotojo aplinkos kalba."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Paleidus programą ieškoti naujesnės versijos"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Įjungus šią parinktį aMule kiekieną kartą paleidus programą patikrins ar nėra naujesnės programos versijos"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Paleidus nuleisti langą"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 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:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Klausti prieš baigiant darbą"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Įjungti sistemos dėklo ženkliuką"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 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:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Sumažinti į sisteminio dėklo ženkliuką"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Jei ši parinktis įungta, nuleidus aMule langą, programa bus sumažinta į sistemos dėklo ženkliuką, o ne į programų juostą."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Įsiminti parinktis"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Naršyklės parintys"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Naršyti"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Jei įmanoma, atverti naują kortelę"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Vaizdo grotuvas"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Išsiuntimas"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Vieno ryšio sparta"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Pradėjus darbą prisijungti automatiškai"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Nutrūkus ryšiui prisijungti vėl"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Pašalinti neatsiliepiantį serverį po"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "bandymų"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Automatiškai atnaujinti serverių sąrašą paleidus programą"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Sąrašas"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Atnaujinti serverių sąrašą prisijungus prie serverio"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Atnaujinti serverių sąrašą prisijungus klientui"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Naudoti prioritetų sistemą"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Jungiantis naudoti išmoningą žemo ID tikrinimą"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Saugus jungimasis"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Automatiškai jungtis tik prie serverių iš pastovaus sąrašo"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Naudotojo įdėtiems serveriams nurodyti aukštą prioritetą"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Failus į atsiuntimo eilę įdėti pristabdytos būsenos"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Į atsiuntimo eilę įdedamiems failams nurodyti automatinį prioritetą"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Visų pirma bandyti atsiųsti pirmą ir paskutinę failo dalį"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Siųsti tos pačios kategorijos failą"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Naujiems failams paskirti vietą diske"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Naujiems failams iš anksto paskirti vietą diske visam failui. Taip bus sumažinta fragmentacija"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Įrašykite kiek diske palikti laisvos vietos."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 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:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Išsiuntimai"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Naujiems dalinamiems failams nurodyti automatinį prioritetą"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Pašalinti"
+
+#: src/muuli_wdr.cpp
 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:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Dalintis slepiamais failais"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Nutolęs serveris"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Vietinis serveris"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafikai"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Atnaujinimo dažnis: 5 s"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Vidurkių grafiko dydis: 100 min"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Ryšių grafiko skalė: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Fonas"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Rėmeliai"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Dabartinė atsiuntimo sparta"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Dabartinis atsiuntimo vidurkis"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Seanso atsiuntimo vidurkis"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Dabartinė išsiuntimo sparta"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Dabartinis išsiuntimo vidurkis"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Seanso išsiuntimo vidurkis"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktyvūs ryšiai"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Sistemos dėklo spartos indikatorius"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Dabartiniai Kademlia mazgai"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Kademlia mazgų dabartinis vidurkis"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Kademlia mazgų seanso vidurkis"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Nurodykite spalvą"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Rodomų klientų versijų skaičius (0 – neribojama)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "DĖMESIO!!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Per 5 s užmegzti ne daugiau ryšių, nei nurodyta"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "FTP atnaujinimo intervalas minutėmis"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "FTP atnaujinimo intervalas minutėmis"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Failo buferio dydis: 240000 baitai"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Išsiuntimo eilė: 5000 klientų"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Serverio ryšio atnaujinimo intervalas: išjungta"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Rodyti papildomą informaciją kategorijų kortelėse"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "Rodyti siuntimo spartą failo pavadinime"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Rodyti siuntimo spartą failo pavadinime"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Mygtukus išdėstyti vertikaliai"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plokščia"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Erdvinė"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Išorinio ryšio parinktys"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Priimti išorinius ryšius"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "Į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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "EC prievade įjungti UPnP prievadų perdavimą"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Žiniatinklio serverio parinktys"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "TCP prievadas: %d"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Tikrinamas slaptažodis\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Tikrinamas slaptažodis\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Išjungti svečio prieigą"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Svečio prieigos prie žiniatinklio serverio slaptažodis"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Žiniatinklio serverio parinktys"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "www šablonas"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Pilnos prieigos slaptažodis"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Įjungti nepilnos prieigos naudotoją"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Nepilnos prieigos slaptažodis"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Puslapio atnaujinimo periodas (sekundėmis)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Įjungti Gzip suspaudimą"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Numatyta"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Gerai"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Patvirtinti naujai nurodytas parinktis."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Atšaukti bet kokius pakeitimus."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Pavadinimas:"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Komentaras:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Atsiųstų failų aplankas:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Keisti naujai priskirtų failų prioritetą:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Atsiųstų failų aplankas"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Keisti naujai priskirtų failų prioritetą"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "Nekeisti"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Nurodykite dabartinės kategorijos spalvą:"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Perkrauti"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Nurodykite dabartinės kategorijos spalvą"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Išvalyti įvykių žurnalą."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Serverių sąrašas"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "Įrašykite server.met failo URL ir paspaudę mygtuką kairėje atnaujinsite serverių sąrašą."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Įdėti serverį rankiniu būdu: pavadinimas"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Įrašykite serverio pavadinimą"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:prievadas"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Įrašykite serverio prievadą."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule žurnalas"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Serverio informacija"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2K informacija"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kademlia informacija"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Mazgai (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Įrašykite nodes.dat failo URL ir paspaudę mygtuką kairėje atnaujinsite mazgų sąrašą."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Mazgų statistika"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Inicializavimas"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Naujas mazgas"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Prievadas:"
-
-#: src/muuli_wdr.cpp:2327
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Bootstrap from known clients"
+msgid "Bootstrap from node: IP"
 msgstr ""
 "Inicializuoti iš \n"
 "žinomų klientų"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Atjungti Kademlia"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Įrašykite serverio IP adresą naudodami a.b.c.d formą."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Naudoti saugų kliento atpažinimą"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protokolo slėpimas"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Įjungti protokolo slėpimą"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Ši parinktis įjungia protokolo slėpimą. Tuomet aMule priiminės slepiamus ryšius iš kitų klientų."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Slėpti išeinančius ryšius"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Įjungus šią parinktį aMule, jungdamasi prie kitų klientų ar serverių, slėps išeinančius ryšius."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Priimti tik slepiamus ryšius"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "Įjungus šią parinktį aMule priims tik slepiamus ryšius. Šaltinių bus rasta mažiau, bet visas srautas bus slepiamas"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Visi"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Niekas"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP filtravimas"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtruoti klientus"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtruoti serverius"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Atnaujinti sąrašą"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Atnaujinti dabar"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Automatiškai įkelti IP filtrą paleidus programą"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Filtravimo lygmuo:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Visuomet filtruoti LAN IP adresus"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranojiškai elgtis su neatitikusiais IP adresais"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Atmesti paketą, jei kliento IP adresas skiriasi nuo paketo šaltinio IP adreso. Naudoti atsargiai."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Jei įjungtas, naudoti ipfilter.dat failą visoje sistemoje"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Jei nėra vietinio ipilter.dat failo, naudoti ipfilter.dat visoje sistemoje."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Įjungti keičiamą parašą"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Į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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Atnaujinimo dažnis (sekundėmis):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Keičiamo parašo atnaujinimo dažnis sekundėmis."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Siuntimo sparta:"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Šaltiniai"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4284,11 +5495,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4298,486 +5509,558 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Atsiųsta: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Automatiškai įkelti IP filtrą paleidus programą"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtruoti gaunamas žinutes (išskyrus dabartinį pokalbį):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtruoti visas žinutes"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 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:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtruoti žinutes nuo nežinomų klientų"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtruoti žinutes turinčias tekstą („,“ naudokite kaip skirtuką):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Komentarai"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtruoti komentarus, turinčius (atskirkite kableliu):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Įjungti autentifikavimą"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Įjungti ar išjungti naudotojo vardo ir slaptažodžio autentifikavimą"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr ""
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Naudotojo vardas prisijungimui prie atstovaujančio serverio"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Slaptažodis:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Slaptažodis prisijungimui prie atstovaujančio serverio"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Įjungti atstovaujančius serverius"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Įjungti ar išjungti atstovaujančius serverius"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Serverio tipas:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Serverio mazgas:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Serverio tipas"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Serverio mazgas"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Atstovaujančio serverio mazgo pavadinimas"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Serverio prievadas:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Serverio prievadas"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Atstovaujančio serverio prievadas"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Įjungti autentifikavimą"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Įjungti ar išjungti naudotojo vardo ir slaptažodžio autentifikavimą"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Naudotojo vardas prisijungimui prie atstovaujančio serverio"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Slaptažodis prisijungimui prie atstovaujančio serverio"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Prijungti prie:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Prisijungti prie nutolusios aMule"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Naudotojo vardas"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Įsiminti parinktis"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Išorinis ryšys nutrauktas."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Naudoti gzip pakavimą"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Įjungti išsamų klaidų taisymo žurnalą."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&Atverti failą"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Žinučių kategorijos:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Įdėti failus"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Pažymėtas bandyti iš naujo"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Pašalinti pažymėtas"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "Aktyvūs išsiuntimai:"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Rodyti klientus"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "Slėpti dalinamus failus"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "Parinkite filtrą"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "Aktyvūs išsiuntimai"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "Rodyti klientus"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "Atnaujinti sąrašą"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Atnaujinti dalinamų failų sąrašą"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Siųsti"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Išsiųsti įrašytą žinutę."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Baigti pokalbį ir užverti pokalbio kortelę."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Prisijungti prie bet kurio serverio ir/ar Kademlia tinklo"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Atšaukti"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Dalinami failai"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Atsijungti"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Prisijungti"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Išjungta %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "baitas"
 msgstr1 "baitai"
 msgstr2 "baitų"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "baitas/s"
 msgstr1 "baitai/s"
 msgstr2 "baitų/s"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "s"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "min."
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "val."
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "dienų"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "Viskas"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "Visa kita"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Neužbaigtos"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Sustabdyta"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Vaizdo failai"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Supakuoti failai"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Teksto failai"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Aktyvios"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Ši komanda negali turėti parametrų."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Ši komanda negali turėti parametrų."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Ši komanda negali turėti parametrų."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Ši komanda negali turėti parametrų."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Įrašykite serverio prievadą."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Įrašykite serverio prievadą."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Įrašykite serverio prievadą."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Įkeliama %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Skaitomas laikinų failų aplankas"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Laukiama pradinės informacijos iš atsiunčiamos informacijos failo"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Kuriamas paskirties failas"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Įkeliami duomenys iš seno atsiuntimo failo (%u iš %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Laukiama atsiuntimo failo šaltinių informacijos"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Įkeliamas atsiuntimo failas ir įrašomas naujas dalinis failas"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Įkelti dalių failus"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Būklė"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Maišos f-ja"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (diskas: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Ar norite, kad sėmingai įkeltų failų pradiniai failai būtų pašalinti?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Pašalinti pradinius failus?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "KLAIDA: nepavyko sukurti dalių failo"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Bandoma įkelti met failo atsarginę kopiją iš %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "KLAIDA: nepavyko atverti part.met failo: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr "KLAIDA: part.met failo dydis yra 0: %s ==> %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, 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:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "KLAIDA: %s (%s) yra sugadintas (blogas žymių skaičius), failo įkelti nepavyks."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Bandoma atstatyti failo informaciją..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "Atstatomas failas be pavadinimo. Atstačius jis bus pavadintas RecoveredFile.dat"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Atstatyta visa įmanoma failo informacija – bandoma naudoti failą..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Nepavyko atstatyti failo informacijos :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Nepavyko atverti %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "DĖMESIO: %s gali būti sugadintas (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "KLAIDA: įrašant dalių failą įvyko klaida: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 #, fuzzy
 msgid "IO failure while saving partfile: "
 msgstr "KLAIDA: įrašant dalių failą įvyko klaida: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
@@ -4785,17 +6068,17 @@
 msgstr1 "Įrašyti %i platinantys šaltiniai dalių failui %s (%s)"
 msgstr2 "Įrašyta %i platinančių šaltinių dalių failui %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Įrašytas %i platinantis šaltinis dalių failui %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
@@ -4803,353 +6086,196 @@
 msgstr1 "Aptikta klaidinga dalis (%d) %d dalių faile %s – failo rezultatų maišos f-ja |%s| failo maišos f-ja |%s|"
 msgstr2 "Aptikta klaidinga dalis (%d) %d dalių faile %s – failo rezultatų maišos f-ja |%s| failo maišos f-ja |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Aptikta baigta dalis (%i) %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Baigtas maišos f-jos reikšmės perskaičiavimas %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Baigiant siųsti %s įvyko netikėta klaida. Failas pristabdytas"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Atsiųsta: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Atsiųsta: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Šalinamas failas: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "DĖMESIO: atsiųstai daliai nepavyko apskaičiuoti maišos funkcijos – %s maišos reikšmės nebaigtos"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 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:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Atsiųsta sugadinta %i dalis: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Paskiriama vieta"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Nepakanka laisvos vietos"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Atsiųsta"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "KLAIDA: nepavyko atverti dalių failo „%s“"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Numatyta"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanų"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabų"
-
-#: src/Preferences.cpp:640
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "Asturian"
-msgstr "Estų"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baskų"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgarų"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalonų"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Kinų (supaprastinta)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Kinų (tradicinė)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Kroatų"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Čekų"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danų"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Olandų"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Anglų (DB)"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Anglų (DB)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estų"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Suomių"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Prancūzų"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galisijos"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Vokiečių"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Graikų"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Žydų"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Vengrų"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italų"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italų (Šveicarijos)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japonų"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Korėjiečių"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lietuvių"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvegų (naujoji norvegų)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Lenkų"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugalų"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugalų (Brazilijos)"
-
-#: src/Preferences.cpp:669
-#, fuzzy
-msgid "Romanian"
-msgstr "Albanų"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Rusų"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slovėnų"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Ispanų"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Švedų"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turkų"
+msgid "Extended source exchange"
+msgstr "Keičiamasi šaltiniais"
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:779
-#, fuzzy
-msgid "Change Language"
-msgstr "Kalba"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Nėra"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Bus naudojamas numatytas prievadas (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Kanalas"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Aplankai"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Serveriai"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Failai"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Saugumas"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Atstovaujantis serveris"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Nutolęs valdymas"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Keičiamas parašas"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Įvykiai"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Taisymas"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5164,26 +6290,43 @@
 "\n"
 "aMule puikiai veikia nieko nepakeitus šiame lange."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Atstovaujančio serverio, prie kurio jungsitės, tipas"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Tikrinamas slaptažodis\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5191,62 +6334,82 @@
 "Kad įsigaliotų šie pakeitimai, aMule reikia paleisti iš naujo:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "– pakeistas TCP prievadas.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "– pakeistas UDP prievadas.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "Išorinis ryšys nutrauktas."
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "Išorinis ryšys nutrauktas."
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "Naujas išorinis ryšys priimtas"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "Išorinis ryšys nutrauktas."
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Protokolo slėpimas"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "– kalba pakeista.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 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:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "– kalba pakeista.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "– laikinų failų aplankas pakeistas.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- ED2K network enabled.\n"
 msgstr "Visi tinklai išjungti."
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Neteisinga protokolo versija."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5254,7 +6417,7 @@
 "Tiek eD2k, tiek Kademlia tinklai yra išjungti.\n"
 "Norėdami prisijungti įjunkite bent vieną iš šių tinklų."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5262,7 +6425,7 @@
 "Nepavyks prisijungti prie Kademlia tinklo, nes išjungtas UDP prievadas.\n"
 "Arba įjunkite UDP prievadą, arba išjunkite Kademlia tinklą."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5272,20 +6435,69 @@
 "Būtina paleisti aMule iš naujo.\n"
 "Jei dabar pat neperleisite aMule, nesiskųskite jei kas nors bus ne taip.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Automatinis atnaujinimas paleistas"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Failas %s jau yra atsiunčiamų failų sąraše"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Naujas išorinis ryšys priimtas"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5295,41 +6507,67 @@
 "Įrašykite bent vieną server.met failo URL.\n"
 "Norėdami įrašyti URL, paspauskite mygtuką „Sąrašas“."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Laikini failai"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Atsiųsti failai"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Keičiami parašai"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Parinkite aplanką %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Aptiktas %i dalinamas failas"
+msgstr1 "Aptikti %i dalinami failai"
+msgstr2 "Aptikta %i dalinamų failų"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Parinkite video grotuvą"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Parinkite naršyklę"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Parinkite naršyklę"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Vykdomas failas %s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Numatyta"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Keisti serverių sąrašą"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5337,42 +6575,42 @@
 "Įrašykite server.met failų URL.\n"
 "Vieną URL vienoje eilutėje."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Pilni šaltiniai"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Būsena:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Būsena:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
@@ -5380,7 +6618,7 @@
 msgstr1 "Atnaujinimo intervalas: %d s"
 msgstr2 "Atnaujinimo intervalas: %d s"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
@@ -5388,12 +6626,12 @@
 msgstr1 "Vidurkių grafiko trukmė: %d min."
 msgstr2 "Vidurkių grafiko trukmė: %d min."
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Ryšių grafiko mastelis: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
@@ -5401,7 +6639,7 @@
 msgstr1 "Failų buferio dydis: %d baitai"
 msgstr2 "Failų buferio dydis: %d baitų"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
@@ -5409,7 +6647,7 @@
 msgstr1 "Išsiuntimo eilės dydis: %d klientai"
 msgstr2 "Išsiuntimo eilės dydis: %d klientų"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
@@ -5417,275 +6655,371 @@
 msgstr1 "Serverio ryšio atnaujinimo intervalas: %d min."
 msgstr2 "Serverio ryšio atnaujinimo intervalas: %d min."
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Serverio ryšio atnaujinimo intervalas: išjungta"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "disabled"
 msgstr "Išjungti"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Execute command on '%s' event"
 msgstr "Įvykus „%s“ įvykiui įvykdyti komandą"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Įjungti komandos vykdymą branduolyje"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Branduolio komanda:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Įjungti komandos vykdymą grafinėje aplinkoje"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Grafinės aplinkos komanda:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Šie kintamieji bus pakeisti:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Atnaujinti dalinamų failų sąrašą"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Atnaujinti dalinamų failų sąrašą"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Skaitomas laikinų failų aplankas"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Atnaujinti dalinamų failų sąrašą."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Dalinami failai"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Parinkite aplanką %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Įsiminti parinktis"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Dėmesio"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Paieška"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Dirbama"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Dėmesio"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Pagrindinė"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kademlia paieška negalima, jei nepaleista Kademlia tarnyba"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "DĖMESIO: sugadintas known.met, klaidinga antraštė."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Vykdant Kademlia paiešką įvyko netikėta klaida: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "Failo ID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Nevertinta"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Atsiunčiamą failą įdėti į kategoriją"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "Failo ID"
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Šiam failui įdėti papildomus URL"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Užverti visas korteles"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Ieškoti panašių failų (eD2k, vietiniame serveryje)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Pažymėti failą kaip jau žinomą"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Kopijuoti eD2k nuorodą į talpyklę"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopijuoti eD2k nuorodas į talpyklę"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Prie serverio, kurį norite pašalinti, esate šiuo metu prisijungę. Norėdami pašalinti serverį, iš pradžių turite atsijungti."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "Atšaukti"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Dirbama"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Suomių"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static 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
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
 msgstr "Nepavyko prisijungti nei prie vieno iš serverių sąraše. Bandoma dar kartą."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
+msgstr "Nepavyko prisijungti nei prie vieno iš serverių sąraše. Bandoma dar kartą."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Po %d sekundės bus bandoma prisijungti prie serverio automatiškai"
+msgstr1 "Po %d sekundžių bus bandoma prisijungti prie serverio automatiškai"
+msgstr2 "Po %d sekundžių bus bandoma prisijungti prie serverio automatiškai"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "eD2k tinklas išjungtas parinktyse, nebus jungiamasi."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Prisijungta prie %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Prisijungta: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Ryšys nutrūko %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) neatsako, galbūt išjungtas."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) pilnas."
 
-#: 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"
-msgstr0 "Po %d sekundės bus bandoma prisijungti prie serverio automatiškai"
-msgstr1 "Po %d sekundžių bus bandoma prisijungti prie serverio automatiškai"
-msgstr2 "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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Prisijungti prie %s (%s:%i) nepavyko."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "KLAIDA: neteisingas lizdas (socket) baigiantis laiko limitui"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Baigėsi bandymo susijungti laikas %s (%s:%i)."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Įkeliamas server.met failas: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Nepavyko aptikti server.met failo!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Nepavyko atverti failo server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
@@ -5693,7 +7027,7 @@
 msgstr1 "server.met faile rasti %i serveriai"
 msgstr2 "server.met faile rasta %i serverių"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
@@ -5701,237 +7035,244 @@
 msgstr1 "%d serveriai įdėti"
 msgstr2 "%d serverių įdėta"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "Nuskaitant known.met failą įvyko IO klaida: %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr "Serveris įdėtas: %s:%d pavadinimas %s."
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Prie serverio, kurį norite pašalinti, esate šiuo metu prisijungę. Norėdami pašalinti serverį, iš pradžių turite atsijungti."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Nepavyko atverti %s"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Nepavyko įrašyti server.met failo!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Nuskaitant known.met failą įvyko IO klaida: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Klaidingas URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, 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:884
+#: src/ServerList.cpp
 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 "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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Atsiųsti serverių sąrašą iš %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Nepavyko iš %s atsiųsti serverių sąrašo"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Vietinis serveris filtruojamas IP filtro, jungiamasi prie kito serverio!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Aprašymas"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping trukmė"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Naudotojų skaičius"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Naudotojų skaičius"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Statiškas"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versija"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Failai"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Dalinami failai"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 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:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(pavadinimas nežinomas)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "min."
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Serveriai (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Serveris"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Prisijungti prie serverio"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Pažymėti, kad serveris statiškas"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Pažymėti, kad serveris nestatiškas"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Pažymėti, kad serveriai statiški"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Pažymėti, kad serveriai nestatiški"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Pašalinti serverį"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Pašalinti serverius"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Pašalinti visus serverius"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopijuoti eD2k nuorodas į talpyklę"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Prisijungti prie serverio iš naujo"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Ar tikrai norite pašalinti visus serverius?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 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:550
+#: src/ServerListCtrl.cpp
 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:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "KLAIDA: %s (%s) – %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "DĖMESIO: %s (%s) – %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Naujas kliento ID yra %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "DĖMESIO: gavote žemą ID!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tNorėdami sužinoti daugiau informacijos apsilankykite https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Gauta nežinomo serverio informacija per trumpa!"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
@@ -5939,172 +7280,203 @@
 msgstr1 "Aptikti %d nauji serveriai"
 msgstr2 "Aptikta %d naujų serverių"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Serverių sąrašo įrašymas baigtas."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Serveris atmetė paskutinę komandą"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Iš serverio %s gautas klaidingas paketas"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, 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:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "naudojamas protokolo slėpimas."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Prisijungta prie %s (%s – %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "aMule žurnalas"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Serveris neįdėtas: nenurodytas IP adresas arba mazgo pavadinimas."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Serveris neįdėtas: nurodytas neteisingas serverio prievadas."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "eD2k būsena:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Ryšio būklė:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Prisijungta"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kademlia būsena:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Running in LAN mode"
 msgstr "Vykdoma %s sistemoje"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Dirbama"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Kademlia būsena:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Būsena:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Ryšio būklė:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "UDP Connection State:"
 msgstr "Ryšio būklė:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Ugniasienės būsena: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Nėra draugo"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connecting to buddy"
 msgstr "Prisijungta prie draugo"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, fuzzy, c-format
 msgid "Connected to buddy at %s"
 msgstr "Prisijungta prie draugo"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP adresas:"
+
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed sources:"
 msgstr "Rasti šaltiniai:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed notes:"
 msgstr "Indekso failas nerastas: "
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Naudotojų vidurkis:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Failų vidurkis:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Nepaleista"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
@@ -6112,448 +7484,588 @@
 msgstr1 "Aptikti %i dalinami failai"
 msgstr2 "Aptikta %i dalinamų failų"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Aptiktas %i žinomas dalinamas failai, %i nežinomų"
-msgstr1 "Aptikti %i žinomi dalinami failai, %i nežinomų"
-msgstr2 "Aptikta %i žinomų dalinamų failų, %i nežinomų"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "KLAIDA: bandoma dalintis %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "serveris nerastas: %s"
 
-#: src/SharedFileList.cpp:486
-#, c-format
-msgid "No shareable files found in directory: %s"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "serveris nerastas: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "Naudotojo vardas"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "Atsiuntimo sparta"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Įrašant known.met failą įvyko klaida: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "Išsiuntimo sparta"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Įkeliamas server.met failas: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Įkeliamas server.met failas: %s"
+msgstr1 "Įkeliamas server.met failas: %s"
+msgstr2 "Įkeliamas server.met failas: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Aptiktas %i dalinamas failas"
+msgstr1 "Aptikti %i dalinami failai"
+msgstr2 "Aptikta %i dalinamų failų"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "Pasiekiamos dalys:"
+msgid "User Name"
+msgstr "Naudotojo vardas"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "Išsiuntimo būsena"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "Failo pavadinimas"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "Dalinami failai"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Prašymai"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Patenkinti prašymai"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Persiųsta duomenų"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Dalinimo santykis"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Gautos dalys"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Pilni šaltiniai"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Skaičius"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Kelias"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Dalinami failai"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Įdėti komentarą/įvertinimą"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Keisti komentarą/įvertinimą"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Failus iš kolekcijos įkelti į siuntimo sąrašą"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Kopijuoti magneto &URI į talpyklę"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Kopijuoti eD2k nuorodą į talpyklę (&šaltinį)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Kopijuoti eD2k nuorodą į talpyklę (šaltinį su ši&fravimo parinktimis)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Kopijuoti eD2k nuorodą į talpyklę (&kompiuterio pavadinimą)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Kopijuoti eD2k nuorodą į talpyklę (kompiuterio pavadinimą su šif&ravimo parinktimis)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Kopijuoti eD2k nuorodą į talpyklę (&klaidų taisymo informaciją)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Kopijuoti eD2k nuorodą į talpyklę (&klaidų taisymo informaciją)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 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:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Baigiant siųsti failą įvyko klaida"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Nepavyko gauti dalinamų failų iš vartotojo „%s“"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Atnaujinti dalinamų failų sąrašą"
+msgstr1 "Atnaujinti dalinamų failų sąrašą"
+msgstr2 "Atnaujinti dalinamų failų sąrašą"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Bendras dalinamų failų dydis: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Bendras dalinamų failų dydis: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Dalinami failai (%i)"
+msgstr1 "Dalinami failai (%i)"
+msgstr2 "Dalinami failai (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Dalinami failai (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Dalių failas"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Atnaujinti dalinamų failų sąrašą."
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Būsena"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "Failo pavadinimas"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "Ats. kitą failą"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Išsiųsta duomenų (per seansą (iš viso)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Tarnybinis srautas iš viso (paketai): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Tarnybinis srautas failų prašymams (paketai): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Tarnybinis srautas šaltinių apsikeitimui (paketai):%s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Tarnybinis srautas serveriams (paketai): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kademlia tarnybinis srautas (paketai): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Šifravimo tarnybinis srautas (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Aktyvūs išsiuntimai: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Laukiantys išsiuntimai: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Iš viso sėkmingų išsiuntimų: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Iš viso nepavykusių išsiuntimų: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Vidutiniškai išsiuntimas trunka: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Atsiųsta duomenų (per seansą (iš viso)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Rasta šaltinių: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Aktyvūs atsiuntimai (dalys): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Seanso Išs./Ats. santykis (iš viso): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Vidutinė atsiuntimo sparta (seanso): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Vidutinė išsiuntimo sparta (seanso): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Didžiausia atsiuntimo sparta (seanso): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Didžiausia išsiuntimo sparta (seanso): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Ryšis pakartotinai užmegztas: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Pirmą kartą siųsta prieš: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Prisijungta prie serverio prieš: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Aktyvių ryšių skaičius (apytikriai): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Didžiausias leistinas ryšių skaičius pasiektas: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Vidutinis ryšių skaičius (apytikriai): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Daugiausia ryšių (apytikriai): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Naudotojai"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "Dydis nežinomas"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "Filtruota"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Banned: %s"
 msgstr "Užblokuota"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Iš viso: %i atpažinta: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Veikiantys serveriai: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Neveikiantys serveriai: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Iš viso: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Pašalinti serveriai: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Filtruoti serveriai: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Naudotojų kiekis veikiančiuose serveriuose: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Failų kiekis veikiančiuose serveriuose: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Iš viso naudotojų: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Iš viso failų: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Serverių užimtumas: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Dalinamų failų kiekis: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Bendras dalinamų failų dydis: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Vidutinis failo dydis: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Operacinė sistema"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Negauta"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktyvūs ryšiai (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Nėra"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Niekada"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Įvykdyti <str> ir baigti darbą."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Apdorojama pagal maišos f-jos reikšmę: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Apdorojama pagal failo pavadinimą: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Neteisingas skaičius\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6562,7 +8074,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6571,83 +8083,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "Įrašę „%s“ gausite išsamesnę pagalbą.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Atsiuntimai (%i)"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Vykdant užduotį įvyko nežinoma klaida."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Užduotis įvykdyta sėkmingai."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Nepavyko įvykdyti prašymo. Gauta klaida: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "IP klientų filtras %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Išjungta"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Įjungta"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "IP serverių filtras %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Dabartinis IP filtro lygmuo %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Prisijungta prie %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Jungiamasi"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "ugniasienė"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "gerai"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6656,7 +8172,7 @@
 "\n"
 "Atsiuntimai:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6665,7 +8181,7 @@
 "\n"
 "Išsiuntimai:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6674,7 +8190,7 @@
 "\n"
 "Klientai eilėje:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6683,38 +8199,33 @@
 "\n"
 "Iš viso šaltinių:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Dalių failas"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Paieškos rezultatų kiekis: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr ""
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Gautas nelauktas atsakymas iš serverio, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Rodyti trumpą būklės informaciją."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 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:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Rodyti išsamų statistikos medį."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6727,11 +8238,11 @@
 "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:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Išjungti aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6740,40 +8251,40 @@
 "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:994
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload the given object."
 msgstr "Atnaujinti objektą."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload shared files list."
 msgstr "Atnaujinti dalinamų failų sąrašą."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload IP filtering table."
 msgstr "Atnaujinti IP filtrų sąrašą iš failo."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload current IP filtering table."
 msgstr "Nurodyti filtravimo lygmenį."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Update IP filtering table from URL."
 msgstr "Atnaujinti IP filtrų sąrašą iš failo."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Prisijungti prie tinklo."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6785,36 +8296,36 @@
 "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:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Prisijungti tik prie eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Prisijungti tik prie Kademlia."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Atsijungti nuo tinklo."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Atsijungti tik nuo eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Atsijungti tik nuo Kademlia."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Add an eD2k or magnet link to core."
 msgstr "Įdėti eD2k arba magneto nuorodą į branduolį."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6831,52 +8342,52 @@
 "\n"
 "Magneto nuorodoje turi būti eD2k maišos f-jos reikšmė ir failo dydis.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Nurodyti parinkties reikšmę."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Set IP filtering preferences."
 msgstr "Nurodyti IP filtro parinktis."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Įjungti klientų ir serverių IP filtravimą."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Išjungti klientų ir serverių IP filtravimą."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Įj./išj. klientų IP filtravimą."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Įjungti klientų IP filtravimą."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Išjungti klientų IP filtravimą."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Įj./išj. serverių IP filtravimą."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Įjungti serverių IP filtravimą."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Išjungti serverių IP filtravimą."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Nurodyti filtravimo lygmenį."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6884,66 +8395,80 @@
 "Filtravimo lygmenys yra skaičiai nuo 0 iki 255.\n"
 "Numatytas lygmuo 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Nurodyti spartos apribojimus."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Nurodyti išsiuntimo spartos apribojimą."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Šioms komandoms reikšmės nurodomos kilobaitais per sekundę.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Nurodyti atsiuntimo spartos apribojimą."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Įjungti ar išjungti naudotojo vardo ir slaptažodžio autentifikavimą"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Šioms komandoms reikšmės nurodomos kilobaitais per sekundę.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Pateikti parinkties reikšmę."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering preferences."
 msgstr "Pateikti IP filtro parinktis."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Pateikti klientų ir serverių IP filtro būseną."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for clients only."
 msgstr "Pateikti tik klientų IP filtro būseną."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for servers only."
 msgstr "Pateikti tik serverių IP filtro būseną."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering level."
 msgstr "Nurodyti filtravimo lygmenį."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Pateikti spartos apribojimus."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a search."
 msgstr "Ieškoti Kademlia tinkle"
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6962,46 +8487,48 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a global search."
 msgstr "Ieškoti globaliai."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a local search"
 msgstr "Ieškoti vietiniame serveryje"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a kad search"
 msgstr "Ieškoti Kademlia tinkle"
 
-#: src/TextClient.cpp:1070
+#: src/TextClient.cpp
 #, fuzzy
-msgid "Show the results of the last search."
+msgid "Show the results of a search."
 msgstr "Pateikti paskutinės paieškos rezultatus."
 
-#: src/TextClient.cpp:1071
-#, fuzzy
-msgid "Return the results of the previous search.\n"
-msgstr "Pateikti ankstesnės paieškos rezultatus.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "Rodyti paieškos eigą."
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "Rodyti paieškos eigą.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Pradėti atsiųsti failą"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -7009,82 +8536,82 @@
 "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:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Pristabdyti atsiunčiamą failą."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Tęsti failo atsiuntimą."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Atšaukti failo atsiuntimą."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Nurodyti atsiuntimo prioritetą."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Nurodyti žemą prioritetą."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Nurodyti normalų prioritetą."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Nurodyti aukštą prioritetą."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Nurodyti automatinį prioritetą."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Rodyti eiles/sąrašus."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 #, 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Rodyti išsiuntimo eilę."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Rodyti atsiuntimo eilę."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Rodyti žurnalą."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Rodyti serverių sąrašą."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Atnaujinti dalinamų failų sąrašą."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Atstatyti žurnalą."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Pasenusi komanda, geriau naudokite „%s“."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7093,256 +8620,279 @@
 "Ši komanda pasenusi ir ateityje gali būti pašalinta.\n"
 "Geriau naudokite „%s“.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule tekstinis klientas"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Šalinamas failas: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Šalinamas failas: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Tęsiame failos siuntimą: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Reikalaujama patvirtinimo"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "Per daug užmegztų ryšių"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Visa kita"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Parinkite filtrą"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Įdėti kategoriją"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Keisti kategoriją"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Pašalinti kategoriją"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Gautas prašymas nežinomo failo maišos f-jai: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Nurodykite kas gali pamatyti dalinamų failų sąrašą."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Tęsiame failos siuntimą: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Nutraukiamas failo siuntimas: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr "Nepavyko įvykdyti komandos „%s„ įvykiui „%s“."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Atsiuntimas baigtas"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Pilnas kelias iki failo."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Failo pavadinimas (be kelio iki jo)."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "Failo eD2k maišos reikšmė."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Failo dydis baitais."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Visas atsiuntimo laikas."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Pradėtas naujas pokalbis"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Žinutės antraštė."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Trūksta laisvos vietos"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Disko skirsnis."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Baigiant siųsti failą įvyko klaida"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Apdorojamo failo numeris %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s —> tokio failo nėra!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, aMule eD2k nuorodų kūrimo įrankis"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Sveikiname!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Įvesties parametrai"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Pateikti failo maišos funkciją"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Šiam failui įdėti papildomus URL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:144
-msgid "Remove"
-msgstr "Pašalinti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Kurti nuorodas su dalių maišos f-jomis"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4 failo maišos f-ja"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k failo maišos f-ja"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k nuoroda"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Įrašyti"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Kopijuoti į talpyklę"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Atverti failą ir apskaičiuoti jo eD2k nuorodą"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Kopijuoti apskaičiuotą eD2k nuorodą į talpyklę"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Įrašyti apskaičiuotą eD2k nuorodą į failą"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Apie aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Kol kas nėra ką kopijuoti!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Nurodykite failą apskaičiuotai eD2k nuorodai"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Nepavyko atverti "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Įrašykite failo pavadinimą"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Kol kas nėra ką įrašyti!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7362,162 +8912,159 @@
 "\n"
 "Platinama pagal GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Skaičiuojamos maišos f-jos reikšmės..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Atšaukta!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Atlikta per %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Šis URL jau įdėtas!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Įrašykite URL"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Nepavyko atverti %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i d. %i val. %i min. %i s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02ud %02uv %02um %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uv %02um %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02um %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, aMule dabartinė statistika"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Didžiausia ats. sparta nuo wxCas paleidimo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Perkrauti"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistema"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Sustabdyti automatinį atnaujinimą"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Įrašyti dabartinės statistikos grafiką"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Spausdinti dabartinės statistikos grafiką"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Parinktys"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Apie wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Paleisti automatinį atnaujinimą"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Automatinis atnaujinimas sustabdytas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Automatinis atnaujinimas paleistas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Įrašyti statistikos grafiką"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMule dabartinė statistika"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7525,11 +9072,11 @@
 "Spausdinant įvyko klaida.\n"
 "Gali būti, kad spausdintuvas nėra tinkamai suderintas."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Spausdinama"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7547,402 +9094,536 @@
 "\n"
 "Platinama pagal GPL licenciją"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oi! aMule nepaleista..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule paleista"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule paleista, bet ryšys neužmegztas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule užmezga ryšį..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oi! aMule būsena nežinoma..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " vykdoma "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " sustabdyta!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " ryšys neužmegztas!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " užmezga ryšį..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " elgiasi keistai, prašome patikrinti!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " užmezgė ryši su "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "išj"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " įj."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " su "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Išviso atsiųsta: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Išsiųsta: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Atsiųsta per šį seansą: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Atsiųsta: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Išsiųsta: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Dalinamasi: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " failas(ai), naudotojai eilėje: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Trukmė: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " – "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Vidutinis sistemos apkrovimas (per 1–5–15 min.): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Sistemos veikimo trukmė: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "amulesig.dat failo aplankas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Atnaujinimo intervalas sekudėmis"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Kurti statistikos grafiką po kiekvieno atnaujinimo"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Periodiškai siųsti staitikos grafiką į FTP serverį"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP URL"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP kelias"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Įrašykite FTP serverio adresą"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Vartotojas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTP atnaujinimo intervalas minutėmis"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Patvirtinti"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Aplankas, kuriame yra parašo failas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Aplankas, kuriame kuriamas statistikos grafikas"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Įkelti šabloną <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Žiniatinklio serverio HTTP prievadas"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "UPnP prievadus persiunti žiniatinklio serverio prievade"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP prievadas"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Naudoti gzip pakavimą"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Pilnos prieigos prie žiniatinklio serverio slaptažodis"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Svečio prieigos prie žiniatinklio serverio slaptažodis"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Įjungti svečio prieigą"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Išjungti svečio prieigą"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 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:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMule parinkčių failas. NENAUDOKITE TIESIOGIAI!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Išjungti PHP interpretatorių (pasenusi)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Kiekvieną kartą perkompiliuoti PHP puslapius"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule www serveris"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "Priimtas žiniatinklio kliento ryšys\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Vykdant užduotį įvyko klaida: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Indekso failas nerastas: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Seansas baigėsi – prašoma prisijungti iš naujo\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Seansas pradėtas, priega gauta\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Seansas pradėtas, priega negauta\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Seansas nepradėtas – bus prašoma prisijungti\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Seansas sukurtas – prašoma prisijungti\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Apdorojamas prašymas pradinis: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Tikrinamas slaptažodis\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Slaptažodžio maišos funkcija neteisinga\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Slaptažodis priimtas\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Neteisingas slaptažodis\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Prašoma atsijungti\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Apdorojamas prašymas persiųstas: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Prisijungti nepavyko "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Išsiųsta"
+#~ msgid "Ratio"
+#~ msgstr "Reitingas"
+
+#, fuzzy
+#~ msgid "Change Language"
+#~ msgstr "Kalba"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "Nėra"
+
+#~ msgid "User name"
+#~ msgstr "Naudotojo vardas"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Gautos dalys"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "Pasiekiamos dalys:"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Aptiktas %i žinomas dalinamas failai, %i nežinomų"
+#~ msgstr1 "Aptikti %i žinomi dalinami failai, %i nežinomų"
+#~ msgstr2 "Aptikta %i žinomų dalinamų failų, %i nežinomų"
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Nutolęs serveris"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Vietinis serveris"
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Įkeliami duomenys iš seno atsiuntimo failo (%u iš %u)"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Norėdami nebematyti šio įspėjimo kiekvienos peržiūros metu,\n"
+#~ "parinktyse nurodykite pageidaujamą video grotuvą (numatytas yra %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Filtruoti rezultatus"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Pažymėti failą kaip jau žinomą"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Inicializavimas"
+
+#~ msgid "New node"
+#~ msgstr "Naujas mazgas"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Daugiau"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Inicializuoti iš \n"
+#~ "žinomų klientų"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Prisijungti prie bet kurio serverio ir/ar Kademlia tinklo"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Atjungti Kademlia"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Nutraukti bandymus prisijungti"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Atsijungti nuo pasirinktų tinklų"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Prisijungti prie pasirinktų tinklų"
+
+#~ 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"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Atmesti paketą, jei kliento IP adresas skiriasi nuo paketo šaltinio IP adreso. Naudoti atsargiai."
+
+#, fuzzy
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Pateikti ankstesnės paieškos rezultatus.\n"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Failas nerastas."
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Rodyti paieškos eigą.\n"
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Paleidus programą ieškoti naujesnės versijos"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k nuoroda: "
+
+#~ msgid "Commit"
+#~ msgstr "Vykdyti"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "\tNorėdami sužinoti daugiau informacijos apsilankykite https://amule-org.github.io/docs"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Nesikuklinkite pranešti rastas klaidas adresu https://github.com/amule-org/amule/issues"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Išsiųsta"

amule-3.0.1.tar.gz/po/lv.po -> amule-3.1.0.tar.gz/po/lv.po Changed

@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: aMule GIT\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-23 12:03+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: none\n"
 "Language: lv\n"
@@ -17,69 +17,150 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n % 10 == 0 || n % 100 >= 11 && n % 100 <= 19) ? 0 : ((n % 10 == 1 && n % 100 != 11) ? 1 : 2);\n"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "Par aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
 msgstr ""
 
-#: src/AddFriend.cpp:61
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Autortiesības (c) 2003-2026 aMule Team \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Vienādranga (P2P) maršrutēšana, pamatojoties uz XOR (izslēdzošā VAI) metriku.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Autortiesības (c) 2002-2011 Petars Majmunkovs ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Vietne:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Forums:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Dokumentācija:"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Problēmas:"
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "Noklikšķiniet, lai pārbaudītu, vai nav pieejama jaunāka versija."
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "Pārbaudīt atjauninājumus"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "Pārbauda atjauninājumus…"
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "Jūs izmantojiet jaunāko versiju."
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "Ir pieejama jauna (%s) versija:"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
+msgid "Add a Friend"
+msgstr "Pievienot draugu sarakstam"
+
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Jums jāievada derīga IP adrese un ports!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informācija"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
-msgstr ""
+msgstr "Norādītā dalībnieka atpazīšanas kods (jaucējvērtība) nav derīga!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
-msgstr ""
+msgstr "Vai pievienot aMule programmu izvēlnei?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr "Uzstādīt"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -88,82 +169,161 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr "aMule uzstādīta"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr "Palaist no jauna tagad"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr "Vēlāk"
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+msgid "Failed to open ED2KLinks file."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "KĻŪDA"
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
 
-#: src/amuleAppCommon.cpp:179
-msgid "Failed to open ED2KLinks file."
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "aMule uzstādīta"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
 msgstr ""
 
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Dzēš datni: %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Neizdevās iegūt lietotāja '%s' kopīgoto datņu sarakstu"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Nederīga eD2k saite \"%s\" - KĻŪDA: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Pašlaik aizver galveno programmu…"
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Pārtrauc amuleweb procesu ar pid '%d' … "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Iznīcina amuleweb procesu ar pid '%d' … "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Neizdevās"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Pārtrauc amuleapi procesu ar pid '%d' … "
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Iznīcina amuleapi procesu ar pid '%d' … "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr ""
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Informācija"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -171,53 +331,103 @@
 "\n"
 "EC iestatījumi"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "BRĪDINĀJUMS"
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr "eD2k serveru saraksts (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "Ielādē pagaidu datnes"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Ielādē pagaidu datnes (%u no %u)"
+
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "Ielādē kopīgotās datnes"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "Ielādē kopīgotās datnes (%u)"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "Palaiž"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
 msgstr ""
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "eD2k serveru saraksts (server.met)"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
 msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "Jūs esiet iespējojuši 'Kad palaiž, palaist arī tīmekļa serveri' iestatījumu, taču amuleweb izpildāmo (bināro) datni nevar palaist. Lūdzu, uzstādiet pakotni, kas satur aMule tīmekļa serveri (amuleweb), vai pārkompilējiet aMule no pirmkoda ar -DBUILD_WEBSERVER=YES parametru un uzstādiet to."
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "KĻŪDA"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Jūs esiet iespējojuši 'Kad palaiž, palaist arī tīmekļa serveri' iestatījumu, taču amuleweb izpildāmo (bināro) datni nevar palaist. Lūdzu, uzstādiet pakotni, kas satur aMule tīmekļa serveri (amuleweb), vai pārkompilējiet aMule no pirmkoda ar -DBUILD_WEBSERVER=YES parametru un uzstādiet to."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -227,929 +437,1144 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
-msgstr ""
+msgstr "Šī ir pirmā reize, kad aMule %s palaista"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
-msgstr ""
+msgstr "Šī ir ikdienas (atjaunina katru dienu) testa versija, tāpēc\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr ""
+msgstr "mēs negarantējam, ka tā neko nesabojās, nenodedzinās jūsu māju\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr ""
+msgstr "vai nenogalinās jūsu suni. Bet tā jebkurā gadījumā *vajadzētu* būt droša lietošanā.\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
-msgstr ""
+msgstr "Plašāka informācija, atbalsts un jaunās versijas ir pieejamas mūsu\n"
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
-msgstr ""
+msgstr "https://amule-org.github.io un mūsu IRC #aMule kanāla irc.libera.chat vietnē.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
-msgstr ""
+msgstr "Nekautrējieties ziņot par problēmām https://github.com/amule-org/amule/issues vietnē"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr ""
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "KĻŪDA: nevar atvērt žurnāldatni"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "BRĪDINĀJUMS: žurnāldatne ir tukša. Te kaut kas nav kā vajag :-(."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr ""
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
-msgstr ""
+msgstr "Servera ziņojums: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr ""
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
-msgstr ""
+msgstr "Jūs izmantojiet novecojušu aMule versiju!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr ""
+msgstr "Jūsu aMule versija — %i.%i.%i un jaunākā versija — %li.%li.%li"
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
-msgstr ""
+msgstr "Jaunāko aMule versiju vienmēr var iegūt https://github.com/amule-org/amule/releases/latest vietnē"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr ""
+msgstr "BRĪDINĀJUMS: Jūsu aMule versija ir novecojusi: %i.%i.%i < %li.%li.%li"
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Šī ir jaunākā aMule versija."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Neizdevās lejupielādēt versijas pārbaudes datni"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
-msgstr "Lietotāji: %s | Datnes: %s"
+msgstr "Dalībnieki: %s | Datnes: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Lietotāji: E: %s K: %s | Datnes: E: %s K: %s"
+msgstr "Dalībnieki: E: %s K: %s | Datnes: E: %s K: %s"
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "ar zemu ID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "ar augstu ID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Pieslēgts %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Pieslēdzas %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
-msgstr ""
+msgstr "Atslēgts no eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr ""
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr ""
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Pieslēgts Kad (veiksmīgi)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Pieslēgts Kad (aiz ugunsmūra)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
-msgstr ""
+msgstr "Atslēgts no Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr ""
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kad tīkls ir atspējots iestatījumos, nepieslēdzas tīklam."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "KĻŪDA: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
-msgstr ""
+msgstr "Apmeklējiet https://github.com/amule-org/amule/releases/latest vietni, lai pārbaudītu, vai nav pieejama jauna versija."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr ""
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "Kļūda! Nevar ielādēt iestatījumus"
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr ""
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Tīkli"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
 msgstr ""
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Vietne: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Lejupielādes"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forums: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Kopīgotās datnes"
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Dokumentācija: https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Klienti"
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
-"Problēmas: https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Ziņojumi"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Autortiesības (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistika"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Iestatījumi"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Autortiesības (c) 2002-2011 Petars Majmunkovs ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "Brīva vieta: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Ziņojums"
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "Pieejama jauna versija"
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"Ir pieejama jauna aMule (%s) versija.\n"
+"\n"
+"Jūs izmantojiet %s versiju.\n"
+"\n"
+"Vai vēlaties atvērt lejupielādes lapu?"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Pieslēdzas"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Pieslēdzas"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
-msgstr ""
+msgstr "eD2k: Atslēgts"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
-msgstr ""
+msgstr "Kad: Aiz ugunsmūra"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Pieslēgts"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Pieslēdzas"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Izslēgts"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Atcelt"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
+#: src/amuleDlg.cpp
+msgid "Core"
 msgstr ""
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versija"
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
 msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Atvienoties no tīkliem, kuriem pašlaik esiet pieslēdzies"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Pieslēgties"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adrese"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr ""
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "Šifrēšana"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMule grafiskā lietotāja saskarne"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
-msgstr ""
+msgstr "↑ Augšup.: %.1f%s (%.1f) | ↓ Lejup.: %.1f%s (%.1f)"
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " MiB/s"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " KiB/s"
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
-msgstr ""
+msgstr "↑ Augšup.: %.1f%s | ↓ Lejup.: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Pieslēgts)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
-msgstr ""
+msgstr "aMule (%s | Atslēgts)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
-msgstr ""
+msgstr "Vai tiešām vēlaties aizvērt %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr ""
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Tīkli"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr ""
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Lejupielādes"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Lejupielādes logs"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Kopīgotās datnes"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Ziņojumi"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Klienti"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistika"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Iestatījumi"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
-msgstr ""
+msgstr "Ievietot"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Par programmu"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Par programmu/Palīdzība"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "eD2k tīkls"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kad tīkls"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr ""
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "Pieslēdzas pa jaunu… (%d. mēģinājums)"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Pieslēdzas…"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr ""
+msgstr "Neizdevās pieslēgties. Nevar izveidot savienojumu ar %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Atspējots"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Pieslēgties tīklam."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Jau %d. mēģinājums atjaunot savienojumu: pieslēdzas %s:%d"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Gatavs"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
+msgstr "Nederīga saite vai jau ir sarakstā."
+
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "Nevarēja izdzēst kategoriju: %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr "Nevar izveidot '%s' mapi '%s' kategorijai, turpinam izmantot '%s' mapi."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr ""
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Viltus eMule %#x versija)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
-msgstr ""
+msgstr " (Viltus eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
-msgstr ""
+msgstr "xMule (Viltus eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
-msgstr ""
+msgstr "Iesauka: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Pieprasīts: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr ""
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
-msgstr ""
+msgstr "Jauns ziņojums no '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr ""
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Neizdevās iegūt dalībnieka '%s' kopīgoto datņu sarakstu"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr ""
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr ""
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Ievadiet Captcha"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategorija"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Jauna kategorija"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Atlasiet mapi, kur saglabāt ienākošās datnes"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
-msgstr ""
+msgstr "Jānorāda kategorijas nosaukums!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
-msgstr ""
+msgstr "Jānorāda kategorijas mape!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr ""
+msgstr "Sākta ziņojumapmaiņas sesija: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Pieslēgts klientam ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Pieslēdzas klientam ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
-msgstr ""
+msgstr "Ziņojumapmaiņa"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Aizvērt cilni"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Aizvērt visas cilnes"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Aizvērt pārējās cilnes"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
+msgstr "Pievienot draugu sarakstam"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
 msgstr ""
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Noņemt no draugu saraksta"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Izveidot drauga izdalīto spraugu"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Skatīt datnes"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Sūtīt ziņojumu"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Vai noņemt %u dalībniekus no draugu saraksta?"
+msgstr1 "Vai noņemt %u dalībnieku no draugu saraksta?"
+msgstr2 "Vai noņemt %u dalībniekus no draugu saraksta?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Pārlādēt kopīgoto datņu sarakstu."
+msgstr1 "Pārlādēt kopīgoto datņu sarakstu."
+msgstr2 "Pārlādēt kopīgoto datņu sarakstu."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
-msgstr ""
+msgstr "Neatrada 'cryptkey.dat' datni, izveido."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "Zems ID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "Augsts ID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
-msgstr ""
+msgstr "Iespējots"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr ""
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Pieslēgts"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
-msgstr ""
+msgstr "Atslēgts"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f KiB/s"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nosaukums"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "Programma"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP adrese"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Izcelsme"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "Sesijas"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "↑ Augšupielādes ātrums"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "↓ Lejupielādes ātrums"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "↑ Kopā augšupielādēts"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "↓ Kopā lejupielādēts"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
 msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Tiešsaistes paraksts"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr ""
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
-msgstr ""
+msgstr "Sliktais čalis"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr ""
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Datnes"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Augšupielādēta"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Lejupielādēta"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "Lejupielādē no"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Augšupielādē"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Nezināms"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Datnes komentāri"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
-msgstr "Lietotājvārds"
+msgstr "Dalībniekvārds"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Datnes nosaukums"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Vērtējums"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Komentārs"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "Meklē komentārus Kad tīklā…"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Nav komentāru"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
@@ -1157,713 +1582,799 @@
 msgstr1 "%u komentārs"
 msgstr2 "%u komentāri"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr ""
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr ""
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr ""
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr ""
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr ""
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr ""
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr ""
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr ""
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr ""
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
-msgstr ""
+msgstr "Izlaidums"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr ""
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Pieslēdzas caur serveri"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Rinda pilna"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Rindā"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Lejupielādē"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr ""
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Nav vajadzīgo daļu"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr ""
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Pārāk daudz savienojumu"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Pieslēdzas caur Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Bloķēts, Aizliegts, Izraidīts, Izslēgts"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Savienojuma kļūda"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr ""
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr ""
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr ""
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr ""
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Saite"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr ""
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Pabeigta"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr ""
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "KĻŪDA: Krātuvē vairs nav vietas"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "KĻŪDA: part.met datne nav atrasta"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "KĻŪDA: ievadizvades (I/O) kļūda!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "KĻŪDA: Neizdevās!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Rindā"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Jau lejupielādē"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Daļa"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Izmērs"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Pārsūtīti"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Ātrums"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Avoti"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioritāte"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Statuss"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Atlikušais laiks"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Pēdējo reizi datne bija pilnībā pieejama"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Atcelt"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Priekšskatījums"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "Rādīt datņu pārvaldniekā"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Rādīt visus komentārus"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
-msgstr ""
+msgstr "Kopēt eD2k saiti starp&liktuvē"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "Atsaukt piešķirto kategoriju"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
-msgid "Enter new name for this file:"
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
-msgid "File rename"
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y.%m.%d %H:%M:%S"
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Lejupielādes (%i)"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Enter new name for this file:"
+msgstr "Ievadiet šīs datnes jauno nosaukumu:"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "File rename"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
+msgid "%.1f MiB/s"
+msgstr "%.1f MiB/s"
 
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Datnes priekšskatījums"
+#: src/DownloadListCtrl.cpp
+#, c-format
+msgid "Downloads (%i)"
+msgstr "Lejupielādes (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgid "Total queue size: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr ""
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr ""
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
+msgstr "Pagaidu mapes datņsistēma neatbalsta liela izmēra datnes."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr ""
+msgstr "Ienākošās mapes datņsistēma neatbalsta liela izmēra datnes."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Lejupielādē no %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "You already have the file '%s'"
+msgid "You already have the file '%s' (requested as '%s')"
 msgstr ""
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "You are already trying to download the file %s"
+msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1418
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+msgid "You are already trying to download the file %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
-msgstr ""
+msgstr "Nederīga eD2k saite! KĻŪDA: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Pieslēdzas klientam: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Nezināma versija"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr ""
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Nederīga protokola versija."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Trūkst protokola versijas birka."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Automātiskā pieslēgšanās serverim tiks veikta pēc %d sekundēm"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr ""
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr ""
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
+msgstr "EC_TAG_FRIEND_SHARED nepieciešams EC_TAG_FRIEND vai EC_TAG_CLIENT."
+
+#: src/ExternalConn.cpp
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
 msgstr ""
 
-#: src/ExternalConn.cpp:1536
-msgid "WebSearch from remote interface makes no sense."
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr ""
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr ""
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr ""
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr ""
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr ""
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "Šāda kategorija nepastāv."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "Trūkst ziņojumapmaiņas sesijas identifikators"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "Šāda ziņojumapmaiņas sesija nepastāv"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "Tukšs ziņojumapmaiņas ziņojums"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "Nezināms ziņojumapmaiņas saņēmējs"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Jau pieslēgts eD2k tīklam."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Pieslēdzas eD2k…"
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Jau pieslēgts Kad tīklam."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Pieslēdzas Kad…"
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr ""
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
-msgstr ""
+msgstr "Atslēgts no eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
-msgstr ""
+msgstr "Atslēgts no Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Pieejamās komandas:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1871,23 +2382,23 @@
 "Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr ""
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr ""
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1895,59 +2406,59 @@
 "\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
-msgstr ""
+msgstr "Sintakses kļūda!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr ""
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr ""
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr ""
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1956,2215 +2467,2883 @@
 "Exiting...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr ""
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr ""
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
-msgstr ""
+msgstr "Neizvadīt nekādus datus konsoles/termināļa ekrānā."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr ""
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Datnes informācija"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Datnes priekšskatījums"
+
+#: src/FileLaunch.cpp
 #, c-format
-msgid "%.2f kB/s"
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
 msgstr ""
 
-#: src/FriendList.cpp:123
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
 msgstr ""
 
-#: src/FriendList.cpp:149
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
 msgstr ""
 
-#: src/FriendList.cpp:266
-msgid "CRITICAL - no client on StartChatSession"
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
-msgid "Friends"
-msgstr "Draugi"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:141
-msgid "Add a friend"
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "Mobilie sakari / 4G-5G (20 / 5 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL pieslēgums (24 / 1 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL pieslēgums (50 / 10 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Vītā pāra kabeļa pieslēgums (200 / 20 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Optiskās šķiedras 300 pieslēgums (300 / 100 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "Optiskās šķiedras gigabitu pieslēgums (1000 / 1000 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:144
-msgid "Remove Friend"
-msgstr "Noņemt no draugu saraksta"
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "Laipni lūdzam aMule!"
 
-#: src/FriendListCtrl.cpp:145
-msgid "Send &Message"
-msgstr "Sūtīt ziņoju&mu"
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Skatīt datnes"
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "Norādiet savu iesauku, kā citi tīkla dalībnieki atpazīs jūs:"
 
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Pieslēdzas draugam"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:180
-msgid "Are you sure that you wish to delete the selected friend?"
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "Savienojuma ātrums:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:182
-msgid "Are you sure that you wish to delete the selected friends?"
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "↑ Augšupielādes ātruma ierob. (KiB/s, 0 = bez ierobežojuma):"
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "↓ Lejupielādes ātruma ierob. (KiB/s, 0 = bez ierobežojuma):"
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "Tīkli un porti"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Standarta TCP ports "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Iespējot UPnP maršrutētāja portu pāradresāciju"
+
+#: src/FirstRunWizard.cpp
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:574
+#: src/FirstRunWizard.cpp
 msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Kad palaiž, automātiski atjaunināt serveru sarakstu"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Sūtīt ziņojumu"
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:644
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr "Atvērt .emulecollection datnes ar aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "KRITISKI – ziņojumapmaiņas sesiju nevar uzsākt klienta trūkuma dēļ"
+
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
+msgid "Friends"
+msgstr "Draugi"
+
+#: src/FriendListCtrl.cpp
+msgid "Add a friend"
+msgstr "Pievienot draugu sarakstam"
+
+#: src/FriendListCtrl.cpp
+msgid "Remove Friend"
+msgstr "Noņemt no draugu saraksta"
+
+#: src/FriendListCtrl.cpp
+msgid "Send &Message"
+msgstr "Sūtīt ziņoju&mu"
+
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Vai tiešām vēlaties dzēst atlasīto draugu?"
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Vai tiešām vēlaties dzēst atlasītos draugus?"
+
+#: src/FriendListCtrl.cpp
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Augšupielādē"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Nē"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Jā"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Neizdevās atvērt MaxMindDB datubāzi '%s': %s"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Lejupielādē…"
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
-msgstr ""
+msgstr "Lejupielādēts %s (%llu baiti)"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr ""
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr ""
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr ""
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr ""
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Pašreizējais"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Visu laiku vidējais"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Sesijas vidējais"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr ""
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr ""
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Ziņojums"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Vai turpināt?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
-msgstr ""
+msgstr "Kademlia: meklēšanas atslēgvārds ir pārāk īss"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Kad lietotājs"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Datnes nosaukums"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Datnes izmērs"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Augšupielādēts"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr ""
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Sistēmas"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albāņu"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arābu"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Astūriešu"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Basku"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgāru"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalāņu"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Ķīniešu (vienkāršotā)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Ķīniešu (tradicionālā)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Horvātu"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Čehu"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Dāņu"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Nīderlandiešu"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Angļu (Apvienotās Karalistes)"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "Angļu (ASV)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Igauņu"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Somu"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Franču"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galisiešu"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Vācu"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grieķu"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Ivrits"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Ungāru"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Itāļu"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japāņu"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Korejiešu"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "Latviešu"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lietuviešu"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvēģu (Jaunnorvēģu)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Poļu"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugāļu"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugāļu (Brazīlijas)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Rumāņu"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Krievu"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slovēņu"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Spāņu"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Zviedru"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turku"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukraiņu"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
-msgstr ""
+msgstr "Nezināma kļūda %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Skaitļo kontrolsummu"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Pabeidz"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
-msgstr ""
+msgstr "Pabeigts"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Gaida"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
+msgstr "Nederīga parole, tā nav MD5 jaucējvērtība!"
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr ""
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr ""
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "KĻŪDA: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "BRĪDINĀJUMS: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Aizvērt"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Izgriezt"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopēt"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Ielīmēt"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Notīrīt"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Atlasīt visas"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "KiB/s"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Bez ierobežojuma"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Rādīt aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr "Pieslēgts (aiz ugunsmūra)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr "Serveris: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr "Servera IP adrese: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP adrese: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP ports: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP ports: Nav gatavs"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP ports: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP ports: Nav gatavs"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
-msgstr "Augšupielādes ātruma ierob."
+msgstr "↑ Augšupielādes ātruma ierob."
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
-msgstr "Lejupielādes ātruma ierob."
+msgstr "↓ Lejupielādes ātruma ierob."
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Atslēgties"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr ""
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Pieslēgties"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Iziet"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr ""
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Ātruma ierobežojumi:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
-msgstr "Augšupielādes ierob.: Nav"
+msgstr "↑ Augšupielādes ierob.: Nav"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
-msgstr "Augšupielādes ierob.: %u"
+msgstr "↑ Augšupielādes ierob.: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
-msgstr "Lejupielādes ierob.: Nav"
+msgstr "↓ Lejupielādes ierob.: Nav"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
-msgstr "Lejupielādes ierob.: %u"
+msgstr "↓ Lejupielādes ierob.: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
-msgstr "Lejupielādes ātrums: %.1f%s"
+msgstr "↓ Lejupielādes ātrums: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
-msgstr "Augšupielādes ātrums: %.1f%s"
+msgstr "↑ Augšupielādes ātrums: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Iesauka: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "Klienta ID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Servera nosaukums: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "Servera IP adrese: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k saite: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "Pievienot saites"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr ""
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Ielādē…"
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
-msgstr "Lietotāju skaits serverī, kam esiet pieslēdzies …"
+msgstr "Dalībnieku skaits serverī, kam esiet pieslēdzies …"
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
-msgstr "Lietotāji: 0"
+msgstr "Dalībnieki: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr ""
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
-msgstr ""
+msgstr "↑ Augšup.: 0.0 | ↓ Lejup.: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Serveris, kuram šobrīd esiet pieslēdzies."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Meklēt"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nosaukums:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr ""
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr ""
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr ""
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
-msgstr ""
+msgstr "Arhīvi"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
-msgstr ""
+msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
 msgstr ""
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
-msgstr ""
+msgstr "Attēli"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
-msgstr ""
+msgstr "Video"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Paplašinājums"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Minimālais izmērs"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Baiti"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr ""
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr ""
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr ""
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "KiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "MiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "GiB"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Maksimālais izmērs"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
-msgstr ""
-
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr ""
+msgstr "Pieejamība"
 
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Filter"
+msgstr "Skatīt datnes"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr ""
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Skatīt datnes"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr ""
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "Izvērst"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
-msgstr ""
+msgstr "Apturēt"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
+msgstr "Lejupielādēt"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "Notīrīt meklēšanas rezultātus"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr ""
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Rezultāti"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr ""
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Full Name"
+msgstr "Datnes nosaukums"
 
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "met-File"
+msgstr "Datnes"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Kontrolsumma"
+
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Datnes izmērs"
 
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
+#: src/muuli_wdr.cpp src/Statistics.cpp
+msgid "Transfer"
 msgstr ""
 
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Datnes izmērs :"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Partfilestatus"
+msgstr "Statuss"
 
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Last seen complete"
+msgstr "Pēdējo reizi datne bija pilnībā pieejama"
 
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Found Sources"
+msgstr "Avoti"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
-msgid "Transfer"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Transferring Sources"
+msgstr "Pārsūtīti"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
 msgstr ""
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Available"
+msgstr "Pieejamība"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Datarate"
+msgstr "Datubāze"
 
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Download Active Time"
+msgstr "↓ Lejupielādes ātrums"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Completed Size"
+msgstr "Pabeigta"
 
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
 msgstr ""
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
 msgstr ""
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Gained by compression"
+msgstr "Iespējot Gzip saspiešanu"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
 msgstr ""
 
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
+#: src/muuli_wdr.cpp
+msgid "Sharing"
 msgstr ""
 
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Pieprasījumi"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
 msgstr ""
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
 msgstr ""
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "Kopīgojas kopš"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "Pēdējoreiz augšupielādēta"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "Ilgums"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "Bitu pārraides ātrums"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "Kodeks"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "Izpildītājs"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "Albums"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Nosaukums"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr ""
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
-msgstr ""
+msgstr "Aizstāt datnes nosaukumu"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr ""
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
-msgstr ""
+msgstr "Labi"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
-msgstr "Komentārs/Datnes vērtējums (teksts būs redzams visiem lietotājiem)"
+msgstr "Komentārs/Datnes vērtējums (teksts būs redzams visiem dalībniekiem)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Datnes kvalitāte"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Nav novērtēta"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Nederīga / Bojāta / Viltota"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Slikta"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Pienācīga"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Laba"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Izcila"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
-msgstr "Novērtēt datni vai dot citiem lietotājiem mājienu, ka datnes nosaukums ir maldinošs un tā saturs neatbilst nosaukumam …"
+msgstr "Novērtēt datni vai dot citiem dalībniekiem mājienu, ka datnes nosaukums ir maldinošs un tā saturs neatbilst nosaukumam …"
+
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "Iegūt no Kad tīkla"
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Atsvaidzināt"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Lejupielādē, lūdzu, uzgaidiet …"
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Nezināms izmērs"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
-msgstr ""
+msgstr "Nepieciešamā informācija"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP adrese :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Ports :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Ports"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
-msgstr ""
+msgstr "Papildinformācija"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Lietotājvārds :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Dalībnieka atpazīšanas kods (jaucējvērtība)"
 
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Pievienot"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
-msgstr "Lejupielādes ātrums"
-
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Pašreizējais"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Visu laiku vidējais"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Sesijas vidējais"
+msgstr "↓ Lejupielādes ātrums"
 
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
-msgstr "Augšupielādes ātrums"
+msgstr "↑ Augšupielādes ātrums"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Savienojumi"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktīvas lejupielādes"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktīvi savienojumi (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktīvas augšupielādes"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Lietotājvārds:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Klienta programma:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Klienta programmas versija:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP adrese:"
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "Lietotāja ID:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Klientprogramma"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Klientprogrammas versija"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "Dalībnieka ID"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Servera IP adrese"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Servera IP adrese:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Servera nosaukums:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Servera nosaukums"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
-
-#: src/muuli_wdr.cpp:1095
-msgid "Transfers to client"
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
+#: src/muuli_wdr.cpp
+msgid "Transfers to client"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Vidējais augšupielādes ātrums:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Vidējais lejupielādes ātrums:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Augšupielādēti (šajā sesijā):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Lejupielādēti (šajā sesijā):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Augšupielādēti (pavisam kopā):"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Current request"
+msgstr "Pašreizējais"
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Lejupielādēti (pavisam kopā):"
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "↑ Vidējais augšupielādes ātrums"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "↓ Vidējais lejupielādes ātrums"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "↑ Augšupielādēti (šajā sesijā)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "↓ Lejupielādēti (šajā sesijā)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "↑ Augšupielādēti (pavisam kopā)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "↓ Lejupielādēti (pavisam kopā)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Secure ident"
+msgstr "Drošība"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Rindas pozīcija"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Queue score"
+msgstr "Rindas pozīcija"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Iesauka"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
-msgstr ""
+msgstr "https://amule-org.github.io - vairāku operētājsistēmu Mule"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
-msgstr "Vārds, kas tiks rādīts lietotājiem, kad pieslēdzas jums."
+msgstr "Vārds, kas tiks rādīts dalībniekiem, kad pieslēdzas jums."
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Valoda: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Kad palaiž, pārbaudīt, vai nav pieejama jauna versija"
-
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
+msgstr "Regulāri pārbaudīt atjauninājumus"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Iespējojot šo, tiks veikta aMule jaunākās versijas pārbaude, kad palaiž programmu"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "sekundes"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Ievadiet šeit sava pārlūka nosaukumu. Atstājiet šo lauku tukšu, ja vēlaties izmantot sistēmas noklusējuma pārlūku."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Video atskaņotājs"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Datu pārraides ierobežojumi"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
-msgstr ""
+msgstr "Augšupielādes (Izejošais)"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
-msgstr ""
+msgstr "Katram klientam (vienam savienojumam) izdalītais spraugas"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Porti"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
-msgid "Max sources per downloading file:"
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
-msgid "Max simultaneous connections:"
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
+#: src/muuli_wdr.cpp
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp
+msgid "Max simultaneous connections:"
+msgstr "Maksimālais vienlaicīgo savienojumu skaits:"
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Kad palaiž, automātiski pieslēgties"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
-msgstr ""
+msgstr "Atkārtoti pieslēgties, kad zaudēts savienojums"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
+msgstr "Noņemt mirušo serveri pēc"
+
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "mēģinājumiem"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Kad palaiž, automātiski atjaunināt serveru sarakstu"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Saraksts"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Atjaunināt serveru sarakstu, kad pieslēdzas serverim"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
+msgstr "Iestatīt pašrocīgi pievienotos serverus kā augstas prioritātes"
 
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Augšupielādes"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Iespējot"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "Iegūt garuma / bitu pārraides ātruma / kodeka infomāciju no kopīgotajām audio un video datnēm"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Noņemt"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
-msgstr ""
+msgstr "Automātiski uzraudzīt kopīgoto mapju izmaiņas"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Noņemt no draugu saraksta"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafiki"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Krāsas: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Fons"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Režģis"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktīvi savienojumi"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Atlasīt"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
-msgstr ""
+msgstr "!!! BRĪDINĀJUMS !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
+msgstr "Datnes bufera izmērs: 240000 baiti"
+
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plakana"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Apaļa"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "TCP ports:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Parole"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "HTTP ports:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "Administratora parole"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "Parole ir norādīta."
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "Iespējot viesa piekļuvi"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "Viesa parole"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Kad palaiž, palaist arī tīmekļa serveri"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Iespējot Gzip saspiešanu"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Sistēmas"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Labi"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Komentārs :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Incoming Dir"
+msgstr "Ienākošās datnes"
 
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Atiestatīt"
-
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Ports"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
-msgstr ""
+msgstr "aMule žurnāls"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
-msgstr ""
+msgstr "Servera informācija"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
-msgstr ""
+msgstr "eD2k informācija"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
-msgstr ""
+msgstr "Kad informācija"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Ports:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Jebkurš"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Neviens"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Kas var skatīt manas kopīgotās datnes:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
-msgstr ""
+msgstr "URL adrese:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr "Datubāze"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 msgid "Source:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4172,11 +5351,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
-msgstr ""
+msgstr "Licences atslēga:"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4186,837 +5365,750 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
-msgstr ""
+msgstr "Lejupielādes URL adrese:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr "Kad palaiž, automātiski atjaunināt"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
-msgstr ""
+msgstr "Filtrēt ienākošos ziņojumus (izņemot esošo ziņojumapmaiņu):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Komentāri"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Lietotājvārds: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Lietotājvārds, ko lietot, kad izmanto starpniekserveri"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Parole:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Parole, ko lietot, kad izmanto starpniekserveri"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Izmantot starpniekserveri"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Starpniekservera tips:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Starpniekserveris:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Starpniekservera tips"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Starpniekservera resursdators"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Starpniekservera resursdatora nosaukums"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Starpniekservera ports:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Starpniekservera ports"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Starpniekservera ports"
 
-#: src/muuli_wdr.cpp:2738
-msgid "Connect to:"
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2747
-msgid "Login to remote amule"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Lietotājvārds, ko lietot, kad izmanto starpniekserveri"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Parole, ko lietot, kad izmanto starpniekserveri"
+
+#: src/muuli_wdr.cpp
+msgid "Connect to:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Login to remote amule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "Šifrēt savienojumu (ieteicams)"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Gaida…"
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Aktīvas augšupielādes"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Sūtīt"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
-msgstr ""
+msgstr "Aizvērt šo ziņojumapmaiņas sesiju."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "Atcelt %s"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "Atslēgt %s"
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "Pieslēgt %s"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
-msgstr ""
+msgstr "Atspējots %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
-msgstr0 ""
-msgstr1 ""
-
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+msgstr0 "baiti"
+msgstr1 "baits"
+msgstr2 "baiti"
+
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "TiB"
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "baiti sekundē"
 msgstr1 "baits sekundē"
 msgstr2 "baiti sekundē"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "MiB/s"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sekundes"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "minūtes"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "stundas"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Dienas"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "dienas"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr ""
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr ""
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr ""
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr ""
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr ""
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr ""
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
 msgstr ""
 
-#: src/OtherFunctions.cpp:1212
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
 #, c-format
-msgid "Using config dir: %s"
+msgid "%u or more other sources have this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr ""
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
-msgstr ""
+msgstr "Datnes kontrolsumma"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr ""
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr ""
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
-msgstr ""
+msgstr "Neizdevās atvērt %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr ""
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr ""
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr ""
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
-msgstr ""
+msgstr "Dzēš datni: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Lejupielādēta"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Sistēmas"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albāņu"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arābu"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Astūriešu"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Basku"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgāru"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalāņu"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Ķīniešu (vienkāršotā)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Ķīniešu (tradicionālā)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Horvātu"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Čehu"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Dāņu"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Nīderlandiešu"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Angļu (Apvienotās Karalistes)"
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr "Angļu (ASV)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Igauņu"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Somu"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Franču"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galisiešu"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Vācu"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grieķu"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Ivrits"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Ungāru"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Itāļu"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Itāļu (Šveices)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japāņu"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Korejiešu"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lietuviešu"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvēģu (Jaunnorvēģu)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Poļu"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugāļu"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugāļu (Brazīlijas)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Rumāņu"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Krievu"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slovēņu"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spāņu"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr ""
 
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Zviedru"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turku"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukraiņu"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Mainīt valodu"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "aMule nav uzstādīta neviena valodas datne"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Nav pieejama neviena valoda"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Savienojums"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
-msgstr ""
+msgstr "Mapes"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Serveri"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Datnes"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Drošība"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Saskarne"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
-msgstr ""
+msgstr "IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Starpniekserveris"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
-msgstr ""
+msgstr "Tiešsaistes paraksts"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Notikumi"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
-msgstr ""
+msgstr "Atkļūdošana"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5026,56 +6118,82 @@
 "these settings."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "Parole nav norādīta."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "Viesa piekļuvei nepieciešama parole. Ievadiet to viesa paroles laukā vai neizmantojiet \"Iespējot viesa piekļuvi\"."
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
-msgstr ""
+msgstr "- TCP ports mainīts.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
+msgstr "- UDP ports mainīts.\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5083,1282 +6201,1630 @@
 "Jūsu automātiskās atjaunināšanas serveru saraksts ir tukšs.\n"
 "'Kad palaiž, automātiski atjaunināt serveru sarakstu' iestatījums tiks atspējots."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
-msgstr ""
+msgstr "- Saskarnes valoda mainīta.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "Nederīga regulārā izteiksme"
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
 "If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
-msgstr ""
+msgstr "Pagaidu datnes"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
-msgstr ""
+msgstr "Ienākošās datnes"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
-msgstr ""
+msgstr "Tiešsaistes paraksti"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Sistēmas"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Rediģēt serveru sarakstu"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
-msgstr ""
+msgstr "Statuss: Ielādēts%s"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
-msgstr ""
+msgstr "Statuss: Ielādēts%s - %s"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Datnes bufera izmērs: %d baiti"
+msgstr1 "Datnes bufera izmērs: %d baits"
+msgstr2 "Datnes bufera izmērs: %d baiti"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
-msgstr ""
+msgstr "GUI komanda:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Kopīgotās datnes"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
 msgstr ""
 
-#: src/SearchDlg.cpp:282
-msgid "It's impossible to search when both eD2k and Kademlia are disabled."
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "Notīrīt meklēšanas vēsturi"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "It's impossible to search when both eD2k and Kademlia are disabled."
+msgstr "Meklēšana nav iespējama, ja gan eD2k, gan Kademlia ir atspējoti."
+
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr ""
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+#: src/SearchDlg.cpp
+msgid "Search in progress"
 msgstr ""
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Main"
+msgstr "Galvenā"
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
 msgstr ""
 
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
-msgid "Main"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
 msgstr ""
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
 msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "Kļūda %u: %s\n"
+
+#: src/SearchListCtrl.cpp
 msgid "FileID"
 msgstr "Datnes ID"
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr "Ilgums"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "Izvērst visu"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "Sakļaut visu"
 
-#: src/SearchListCtrl.cpp:105
-msgid "Bitrate"
-msgstr "Bitu pārraides ātrums"
+#: src/SearchListCtrl.cpp
+msgid "Search related files (eD2k, local server)"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr "Kodeks"
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k link to clipboard"
+msgstr "Kopēt eD2k saiti starpliktuvē"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopēt eD2k saites starpliktuvē"
+
+#: src/SearchListCtrl.cpp
+msgid "You are not currently connected to a server supporting the Related Files search function"
+msgstr "Jūs pašlaik neesiet pieslēgts serverim, kas atbalsta saistīto datņu meklēšanas funkciju"
+
+#: src/SearchListCtrl.cpp
+msgid "Canceled"
+msgstr "Atcelts"
+
+#: src/SearchListCtrl.cpp
+msgid "New"
+msgstr "Jauns"
+
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "pabeigts"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:714
+#: src/SearchProgressReport.cpp
 #, c-format
-msgid "Get %s for this file"
+msgid "Search %u: %s, %u %% (%u results)\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:718
-msgid "Search related files (eD2k, local server)"
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
-msgid "Copy eD2k link to clipboard"
-msgstr "Kopēt eD2k saiti starpliktuvē"
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:811
-msgid "You are not currently connected to a server supporting the Related Files search function"
-msgstr "Jūs pašlaik neesiet pieslēgts serverim, kas atbalsta saistīto datņu meklēšanas funkciju"
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:1105
-msgid "Canceled"
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1108
-msgid "New"
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
 msgstr ""
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Automātiskā pieslēgšanās serverim tiks veikta pēc %d sekundēm"
+msgstr1 "Automātiskā pieslēgšanās serverim tiks veikta pēc %d sekundes"
+msgstr2 "Automātiskā pieslēgšanās serverim tiks veikta pēc %d sekundēm"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "eD2k tīkls ir atspējots iestatījumos, nepieslēdzas tīklam."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Pieslēgts %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr ""
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr ""
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
-msgstr ""
+msgstr "Šķiet, ka %s (%s:%i) miris."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
-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"
-msgstr0 ""
-msgstr1 ""
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr ""
+msgstr "Šķiet, ka %s (%s:%i) pilns."
 
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Pieslēgties %s (%s:%i) neizdevās."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
-msgstr ""
+msgstr "Ielādē server.met datni: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr ""
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Atrasti %i serveri server.met datnē"
+msgstr1 "Atrasts %i serveris server.met datnē"
+msgstr2 "Atrasti %i serveri server.met datnē"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Pievienoti %d serveri"
+msgstr1 "Pievienots %d serveris"
+msgstr2 "Pievienoti %d serveri"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
-msgstr ""
+msgstr "Kļūda: 'server.met' datne ir bojāta: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr ""
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr ""
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr ""
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr ""
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr ""
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
-msgstr ""
+msgstr "Jūs esiet pieslēdzies serverim, kuru mēģiniet dzēst. Lūdzu, vispirms atslēdzieties."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:843
-msgid "Invalid URL"
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
 msgstr ""
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
+msgid "Invalid URL"
+msgstr "Nederīga URL adrese"
+
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "Servera nosaukums"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adrese"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Ports"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Apraksts"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping atbildes laiks"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
-msgstr "Lietotāji"
+msgstr "Dalībnieki"
+
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "Maks. dalībnieku skaits"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versija"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Datnes"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Kopīgotās datnes"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
-msgstr ""
+msgstr "Jūs esiet pieslēdzies serverim, kuru mēģiniet dzēst. Lūdzu, vispirms atslēdzieties. Serveris NETIKA dzēsts."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "ms"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Serveri (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Serveris"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
-msgstr ""
+msgstr "Pieslēgties serverim"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
-msgstr ""
+msgstr "Noņemt atlasīto serveri"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
-msgstr ""
+msgstr "Noņemt atlasītos serverus"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
+msgstr "Noņemt visus serverus"
 
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
-msgstr ""
+msgstr "Vai tiešām dzēst visus serverus?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
-msgstr ""
+msgstr "Vai tiešām dzēst atlasīto serveri?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
-msgstr ""
+msgstr "Vai tiešām dzēst atlasītos serverus?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
-msgstr ""
+msgstr "KĻŪDA: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
-msgstr ""
+msgstr "BRĪDINĀJUMS: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
-msgstr ""
+msgstr "Serveris %s (%s) noraidīja pieteikšanos (nav piešķirts klienta ID). Atslēdzas."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr ""
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Saņemti %d jauni serveri"
+msgstr1 "Saņemts %d jauns serveris"
+msgstr2 "Saņemti %d jauni serveri"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr ""
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Pieslēdzas %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "aMuleGUI žurnāls"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
-msgstr ""
+msgstr "eD2k statuss:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr ""
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "Pieslēgts kopš:"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
-msgstr ""
+msgstr "Kademlia statuss:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
-msgstr ""
+msgstr "Kademlia klienta ID:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
-msgstr ""
+msgstr "Statuss:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
-msgstr ""
+msgstr "Savienojuma stāvoklis:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
-msgstr ""
+msgstr "Aiz ugunsmūra - atveriet %d TCP portu savā maršrutētājā vai ugunsmūrī"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
-msgstr ""
+msgstr "UDP savienojuma stāvoklis:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
-msgstr ""
+msgstr "Aiz ugunsmūra - atveriet %d UDP portu savā maršrutētājā vai ugunsmūrī"
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr ""
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Nav nepieciešams draugs - TCP ports ir atvērts"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Nav nepieciešams draugs - UDP ports ir atvērts"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Nav neviena drauga"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Pieslēdzas draugam"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Savienots ar draugu %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP adrese:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr ""
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr ""
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr ""
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr ""
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr ""
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 ""
 msgstr1 ""
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
 msgstr0 ""
 msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
+msgid "Shared directory not readable, skipping: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "Pašlaik kopīgo datni: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Pārtraukta dzēstās datnes kopīgošana: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:35
-msgid "Upload Status"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Pārtraukta %u datņu kopīgošana noņemtajā mapē: %s"
+msgstr1 "Pārtraukta %u datnes kopīgošana noņemtajā mapē: %s"
+msgstr2 "Pārtraukta %u datņu kopīgošana noņemtajā mapē: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
-msgid "Download Status"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr "Izcelsme"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Atrada %u jaunas kopīgotas datnes"
+msgstr1 "Atrada %u jaunu kopīgotu datni"
+msgstr2 "Atrada %u jaunas kopīgotas datnes"
 
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
-msgid "Local File Name"
-msgstr ""
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Dalībniekvārds"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
-msgid "Shares File List"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Pieprasījumi"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr ""
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Status"
+msgstr "↑ Augšupielādes statuss"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr ""
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Download Status"
+msgstr "↓ Lejupielādes statuss"
 
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Local File Name"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Shares File List"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr ""
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Pieejamība"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Kopīgotās datnes"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Pievienot komentāru/vērtējumu"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Rediģēt komentāru/vērtējumu"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Pārdēvēt"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:319
-msgid "You need a HighID to create a valid sourcelink"
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Shared Files (%i)"
+msgid "Verify Local Data on PartFile is currently not supported: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
 msgstr ""
 
-#: src/SourceListCtrl.cpp:37
+#: src/SharedFilesCtrl.cpp
+msgid "You need a HighID to create a valid sourcelink"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Neizdevās iegūt lietotāja '%s' kopīgoto datņu sarakstu"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Kopējais kopīgoto datņu izmērs: %s (%s lejupielādēti)"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Kopīgoto datņu kopējais izmērs: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Kopīgotās datnes (%i, skaitļo %u kontrolsummu)"
+msgstr1 "Kopīgotās datnes (%i, skaitļo %u kontrolsummu)"
+msgstr2 "Kopīgotās datnes (%i, skaitļo %u kontrolsummu)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Kopīgotās datnes (%i)"
+
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Ielādē kopīgotās datnes (%u)"
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Statuss"
+
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr ""
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Augšupielādēti šajā sesijā (Pavisam kopā): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Kopējais pakalpojuma trafiks (Paketes): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Datņu pieprasījumu trafiks (Paketes): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Avotu apmaiņas trafiks (Paketes): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Serveru trafiks (Paketes): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kad tīkla trafiks (Paketes): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Šifrēšanas trafiks (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Aktīvas augšupielādes: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr ""
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr ""
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr ""
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr ""
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Pieslēgts serverim kopš: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr ""
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
-msgstr ""
+msgstr "Nezināms: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr ""
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr ""
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr ""
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr ""
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
-msgstr ""
+msgstr "Operētājsistēma"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktīvi savienojumi (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr ""
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
-msgstr ""
+msgstr "Nekad"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr ""
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr ""
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr ""
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr ""
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6366,7 +7832,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6374,96 +7840,100 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
-msgstr ""
+msgstr "Lejupielādēt datni: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr ""
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "IZSLĒGTS"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "IESLĒGTS"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Datu pārraides ierobežojumi: ↑Augšup.: %u kB/s, ↓Lejup.: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Pieslēgts %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Pašlaik pieslēdzas"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "aiz ugunsmūra"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr ""
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Download:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Upload:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6472,45 +7942,40 @@
 "\n"
 "Klienti rindā:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Total sources:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/TextClient.cpp
+msgid "PartFile"
 msgstr ""
 
-#: src/TextClient.cpp:965
+#: src/TextClient.cpp
 #, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr ""
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr ""
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6519,46 +7984,46 @@
 "Example: 'statistics 5' will show only the top 5 versions for each client type.\n"
 msgstr ""
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr ""
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
-msgstr ""
+msgstr "Pārlādēt kopīgoto datņu sarakstu."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Pieslēgties tīklam."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6566,35 +8031,35 @@
 "or a resolvable DNS name."
 msgstr ""
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Pieslēgties tikai eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Pieslēgties tikai Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
-msgstr ""
+msgstr "Atslēgties no tīkla."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr ""
+msgstr "Tiks atslēgi visi pašlaik pieslēgtie tīkli.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
-msgstr ""
+msgstr "Atslēgties tikai no eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
-msgstr ""
+msgstr "Atslēgties tikai no Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6605,109 +8070,121 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Iestatīt datu pārraides ierobežojumus."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Iestatīt augšupielādes datu pārraides ātruma ierobežojumu."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Iestatīt lejupielādes datu pārraides ātruma ierobežojumu."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Iegūt un parādīt iestatījuma vērtību."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Iegūt datu pārraides ierobežojumu iestatījumus."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr ""
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6726,373 +8203,400 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr ""
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr ""
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr ""
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+msgid "Show the results of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr ""
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
-msgstr ""
+msgstr "Apturēt lejupielādi."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
-msgstr ""
+msgstr "Turpināt lejupielādi."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
-msgstr ""
+msgstr "Atcelt/Dzēst lejupielādi."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
-msgstr ""
+msgstr "Iestatīt lejupielādes prioritāti."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr ""
+msgstr "Iestatīt lejupielādējamās datnes prioritāti - Zema, Normāla, Augsta vai Automātiska.\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr ""
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr ""
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr ""
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr ""
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr ""
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
-msgstr ""
+msgstr "Rādīt augšupielādes rindu."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
-msgstr ""
+msgstr "Rādīt lejupielādes rindu."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
-msgstr ""
+msgstr "Skatīt žurnālu."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
-msgstr ""
+msgstr "Rādīt serveru sarakstu."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
-msgstr ""
+msgstr "Parādīt kopīgoto datņu sarakstu."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr ""
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
 "Use '%s' instead.\n"
 msgstr ""
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr ""
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Dzēš datni: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Dzēš datni: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr ""
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr ""
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr ""
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
-msgstr ""
+msgstr "Pievienot kategoriju"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
-msgstr ""
+msgstr "Rediģēt kategoriju"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
-msgstr ""
+msgstr "Dzēst kategoriju"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr ""
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr ""
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
-msgstr ""
+msgstr "Lejupielāde pabeigta"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr ""
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr ""
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
-msgstr ""
+msgstr "Datnes eD2k kontrolsumma."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
-msgstr ""
+msgstr "Sākta jauna ziņojumapmaiņas sesija"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr ""
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr ""
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr ""
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Noņemt"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
-msgstr ""
+msgstr "MD4 datnes kontrolsumma"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
-msgstr ""
+msgstr "eD2k datnes kontrolsumma"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k saite"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Saglabāt"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Kopēt starpliktuvē"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Atvērt"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Saglabāt kā"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7104,172 +8608,169 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Skaitļo kontrolsummu…"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
-msgstr ""
+msgstr "Skaitļo MD4 kontrolsummu…"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
-msgstr ""
+msgstr "Skaitļo eD2k kontrolsummas…"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
-msgstr ""
+msgstr "Pietrūka atmiņas, skaitļojot eD2k kontrolsummu!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr ""
+msgstr "%i diena(s) %i stunda(s) %i min. %i sek."
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
-msgstr ""
+msgstr "%02ud. %02ust. %02umin. %02usek."
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
-msgstr ""
+msgstr "%02ust. %02umin. %02usek."
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
-msgstr ""
+msgstr "%02umin. %02usek."
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02usek."
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr "%.2f KiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr "%.2f GiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr "%.2f TiB"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Atiestatīt"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
-msgstr ""
+msgstr "Par wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Saglabāt statistikas attēlu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7280,392 +8781,466 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
-msgstr ""
+msgstr "aMule darbojas, bet atslēgta no tīkla"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule pieslēdzas…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " darbojas "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " pieslēdzas…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " ir pieslēgts "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "izslēgts"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " ar "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Laiks: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Lietotājs"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP ports"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
-msgstr ""
+msgstr "Atļaut viesa piekļuvi"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
-msgstr ""
+msgstr "Liegt viesa piekļuvi"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
-msgstr ""
+msgstr "Pārbauda paroli\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
-msgstr ""
+msgstr "Paroles jaucējvērtība nav derīga\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr ""
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
-msgstr ""
+msgstr "aMule (nepieciešams)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
-msgstr ""
+msgstr "Darbvirsmas saīsne"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
+msgstr "Palaist aMule, kad es piesakos"
+
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr "Noņemt"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
-msgstr ""
+msgstr "Dzēst lietotāja datus (konfigurācijas datni, ED2K serverus, Kad mezglus, part datnes)"
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
-msgstr ""
+msgstr "Uzstāda aMule programmas datnes (nepieciešams)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
-msgstr ""
+msgstr "Izveido aMule saīsni uz darbvirsmas."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
-msgstr ""
+msgstr "Automātiski palaidīs aMule, kad pašreizējais lietotājs, kas uzstāda aMule, pieteiksies (katra lietotāja atsevišķs iestatījums)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+#, fuzzy
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "Dzēš aMule programmas datnes, Sākt izvēlnes un darbvirsmas saīsnes, automātiskās startēšanas un programmas pievienošanas/noņemšanas ierakstus (nepieciešams)."
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
-msgstr ""
+msgstr "Neatgriezeniski dzēš pašreizējā lietotāja %APPDATA%\\aMule mapi (satur aMule.conf datni, ED2K serveru sarakstu, Kad mezglus, part datnes, IP filtrus, draugu sarakstu). Neatķeksējiet, ja vēlaties saglabāt savus iestatījumus."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
+"Izskatās, ka aMule, kas uzstādīta $INSTDIR mapē, darbojas.\n"
+"Lūdzu, aizveriet aMule (un aMuleD / aMuleGUI) un mēģiniet vēlreiz."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
+"Izskatās, ka aMule pakalpojums (amuled.exe), kas uzstādīts $INSTDIR mapē, darbojas.\n"
+"Lūdzu, apturiet to un mēģiniet vēlreiz."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
-msgstr ""
+msgstr "Noņem iepriekš uzstādīto aMule versiju $0 mapē…"
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
+"Nevarēja noņemt iepriekš uzstādīto aMule versiju $0 mapē.\n"
+"Lūdzu, aizveriet visus darbojošos aMule procesus un mēģiniet vēlreiz, jeb pašrocīgi noņemiet iepriekšējo versiju."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
-msgstr ""
+msgstr "Izskatās, ka aMule darbojas. Lūdzu, aizveriet to un vēlreiz palaidiet noņemšanas programmu."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
-msgstr ""
+msgstr "Dzēš lietotāja datus, kas atrodas $APPDATA\\aMule mapē…"
+
+#~ msgid "Ratio"
+#~ msgstr "Datu apmaiņas koeficients"
+
+#~ msgid "Change Language"
+#~ msgstr "Mainīt valodu"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "aMule nav uzstādīta neviena valodas datne"
+
+#~ msgid "No languages available"
+#~ msgstr "Nav pieejama neviena valoda"
+
+#~ msgid "User name"
+#~ msgstr "Lietotājvārds"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y.%m.%d %H:%M:%S"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Atslēgt Kad"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Atslēgties no tīkliem, kuriem pašlaik esiet pieslēdzies"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Pieslēgties pašlaik iespējotajiem tīkliem"
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Kad palaiž, pārbaudīt, vai nav pieejama jauna versija"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k saite: "
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Vietne: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Forums: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Dokumentācija: https://amule-org.github.io/docs \n"
+
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Problēmas: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"

amule-3.0.1.tar.gz/po/nl.po -> amule-3.1.0.tar.gz/po/nl.po Changed

@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:13+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:56+0000\n"
 "Last-Translator: Marcel Pol <marcel@timelord.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "Language: nl\n"
@@ -23,71 +23,157 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.4.2\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "Over aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMule besturing op afstand "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Snapshot:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"'Alle-Platformen' p2p client gebaseerd op eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Een deel van aMule is gebaseerd op \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Peer-to-peer routing gebaseerd op de XOR-metric.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Website:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Forum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Documentatie:"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Problemen:"
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "Klik om te controleren op een nieuwe versie."
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "Controleer op updates"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "Controleren op updates..."
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "U gebruikt de laatste versie."
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "Een nieuwe versie (%s) is beschikbaar:"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr "Kon niet controleren op updates. Probeer het later opnieuw."
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Voeg een vriend toe"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "U moet een geldig IP-adres en poortnummer invoeren!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informatie"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "De aangegeven gebruikers-hash is niet geldig!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
+"aMule kan bureaubladstarters, pictogrammen en shell-opdrachtsnelkoppelingen in uw thuismap installeren, zodat het verschijnt in uw toepassingenmenu zoals een normaal geïnstalleerde app.\n"
+"\n"
+"Dit is omkeerbaar - de bestanden bevinden zich onder ~/.local/share/applications, ~/.local/share/icons en ~/.local/bin, en kunnen op elk moment worden verwijderd.\n"
+"\n"
+"Bureaubladintegratie nu installeren?"
 
-#: src/AppImageIntegration.cpp:226
-#, fuzzy
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
-msgstr "Na applicatienaam"
+msgstr "aMule toevoegen aan uw appmenu?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
-msgstr ""
+msgstr "Installeren"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
-msgstr ""
+msgstr "Niet nu"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
-msgstr ""
+msgstr "Niet meer vragen"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
-msgstr ""
+msgstr "Kan bureaubladintegratie niet installeren: de omgevingsvariabele APPDIR is niet ingesteld. Dit betekent meestal dat de AppImage op een ongebruikelijke manier is gestart."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
-#, fuzzy
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
-msgstr "Verbinding mislukt "
+msgstr "aMule-integratie mislukt"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
-msgstr ""
+msgstr "Kan bureaubladintegratie niet installeren: het aanmaken van %s is mislukt. Controleer of uw thuismap beschrijfbaar is."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
-msgstr ""
+msgstr "Kan bureaubladintegratie niet installeren: het schrijven van %s is mislukt. Controleer of uw thuismap beschrijfbaar is."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr ""
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr "AppImage-integratie: aMule toegevoegd aan uw toepassingenmenu (%d shell-snelkoppelingen onder ~/.local/bin)."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -95,83 +181,173 @@
 "\n"
 "Restart aMule now?"
 msgstr ""
+"aMule is toegevoegd aan uw toepassingenmenu. U kunt het nu starten vanuit uw lijst met toepassingen, en de starter zal dezelfde AppImage uitvoeren.\n"
+"\n"
+"Op sommige bureaubladen moet aMule mogelijk opnieuw worden gestart om het dock-/taakbalkpictogram aan het nieuwe starteritem te koppelen. Moderne Wayland-compositors (GNOME, KDE) nemen dit direct over, maar een herstart is de veilige terugvaloptie als het pictogram generiek blijft.\n"
+"\n"
+"aMule nu opnieuw starten?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
-msgstr ""
+msgstr "aMule geïnstalleerd"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
-msgstr ""
+msgstr "Nu opnieuw starten"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
-msgstr ""
-
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "FOUT"
+msgstr "Later"
 
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Kon bestand ED2KLinks niet openen."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+"Een ander programma gebruikt aMule's vergrendelingsbestand:\n"
+"\n"
+"%s\n"
+"\n"
+"Dat is geen lopende kopie van aMule dus er is verder niets om naar voren te brengen. Sluit het andere programma of verwijder het vergrendelingsbestand terwijl aMule niet wordt uitgevoerd."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+"De aMule daemon (amuled) wordt al uitgevoerd als proces %d en gebruikt deze instellingen.\n"
+"\n"
+"Het heeft geen venster om naar voren te brengen. Verbindt het met amuleGUI of stop de daemon voor u aMule start."
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr "aMule kan niet starten"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr "Toestemmingen van %s beperkt tot alleen de eigenaar."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr "Collectiebestand niet gevonden: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Ongeldig of leeg collectiebestand: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr "Geen bruikbare koppelingen in collectie: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 "%u onbruikbare link overgeslagen in collectie: %s"
+msgstr1 "%u onbruikbare links overgeslagen in collectie: %s"
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Kan magnet-link niet omzetten naar eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Ongeldige eD2k link \"%s\" - FOUT: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Hoofdapp wordt nu afgesloten..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Amuleweb-instantie met pid '%d' wordt afgesloten ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
-msgstr "Amuleweb-instantie met pid '%d' wordt gedood ... "
+msgstr "Amuleweb-instantie met pid '%d' wordt geforceerd beëindigd... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Mislukt"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "amuleapi-exemplaar met pid '%d' wordt beëindigd... "
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "amuleapi-exemplaar met pid '%d' wordt geforceerd beëindigd... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Kern wordt afgesloten."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "aMule is afgesloten."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Geheugen debug resultaten voor het afsluiten van aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr "aMule's peer-to-peer-verkeer wordt gebonden aan interface: %s (HTTP-updates gebruiken de standaardroute)"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr "Al het netwerkverkeer wordt gebonden aan interface: %s"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr "WAARSCHUWING: geconfigureerde netwerkinterface '%s' is niet gevonden - verkeer wordt hier NIET aan gebonden en kan via de standaardroute verlopen. Controleer de interfacenaam in Voorkeuren."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr "WAARSCHUWING: binden aan netwerkinterface '%s' vereist verhoogde rechten en is NIET toegepast - verkeer kan via de standaardroute verlopen. Verleen de capability (bijv. 'sudo setcap cap_net_raw+ep' op het aMule-programma) of voer uit met voldoende rechten."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr "WAARSCHUWING: kon niet binden aan netwerkinterface '%s' - verkeer kan via de standaardroute verlopen."
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "De taalinstelling is veranderd naar de systeemstandaard vanwege een configuratiewijziging. Sorry."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -179,56 +355,104 @@
 "\n"
 "EV-configuratie"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Wachtwoord ingesteld en externe verbindingen ingeschakeld."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "WAARSCHUWING"
 
-#: src/amule.cpp:788
-#, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i server in server.met gevonden"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr "Netwerk initialiseren"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "Tijdelijke bestanden worden geladen"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Tijdelijke bestanden worden geladen (%u van %u)"
+
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "Gedeelde bestanden worden geladen"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "Gedeelde bestanden worden geladen (%u)"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "Aan het opstarten"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Netwerk-bootstrap"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
+"aMule heeft ontbrekende netwerk-bootstrapbestanden gedetecteerd.\n"
+"Selecteer welke u wilt downloaden:"
 
-#: src/amule.cpp:797
-#, fuzzy
-msgid "Network bootstrap"
-msgstr "Netwerken"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "eD2k-serverlijst (server.met)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Kad-bootstrapnodes (nodes.dat)"
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "webserver draait met pid %d"
 
-#: src/amule.cpp:886
-#, fuzzy
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
-msgstr "U heeft ingesteld om de webserver te starten bij het opstarten, maar amuleweb kan niet gestart worden. Installeer het pakket met de aMule webserver, of compileer aMule met --enable-webserver en draai make install"
+msgstr "U hebt gevraagd om de webserver bij het opstarten uit te voeren, maar het programma amuleweb kan niet worden uitgevoerd. Installeer het pakket met de aMule-webserver, of bouw aMule vanuit de broncode met -DBUILD_WEBSERVER=YES en installeer het."
+
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "FOUT"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr "De amuleapi EC token kon niet naar %s geschreven worden; amuleapi zal terugvallen op het ingestelde wachtwoord."
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr "amuleapi actief met pid %d"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "U hebt gevraagd om amuleapi bij het opstarten uit te voeren, maar het programma amuleapi kan niet worden uitgevoerd. Installeer het pakket met de REST API-server van aMule, of bouw aMule vanuit de broncode met -DBUILD_AMULEAPI=YES en installeer het."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr "Externe verbinding: kon niet binden aan '%s', alleen aan het luisteren naar 127.0.0.1."
 
-#: src/amule.cpp:969
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Kon geen poorten koppelen aan het opgegeven adres: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Poort %u is niet beschikbaar. U krijgt een LAAG ID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -243,48 +467,48 @@
 "\n"
 "Controleer uw netwerk en zorg ervoor dat de poort open is voor in- en uitgaand verkeer."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Kon bestand met online handtekening niet maken"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Kon aMule OnlineHandtekening Bestand niet maken"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr "De gekozen taalinstelling lijkt niet geïnstalleerd te zijn op uw pc. (Let op: Ik probeer het toch in te stellen)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Dit is de eerste keer dat u aMule %s draait"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Dit is een testversie, dagelijks geupdatet, en\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "we geven geen garantie dat het niks kapot maakt of uw huis in brand steekt,\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "op https://amule-org.github.io, of op ons IRC-kanaal #amule op irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Bugs kunt u altijd melden op https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -292,1579 +516,1869 @@
 "De map voor online-handtekeningbestanden die u heeft opgegeven is ONGELDIG!\n"
 " OnlineSignature is UITGESCHAKELD totdat u dit verbetert in voorkeuren."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Server-hostnaam geïnformeerd"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr "Media-metadata: gepeild bestand is niet meer bekend, resultaat verwijderd (%s)"
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Toewijzen schijfruimte voor bestand '%s' mislukt: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "FOUT: kan logbestand niet openen"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "WAARSCHUWING: logboekbestand is leeg. Er is iets mis."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Logboek is gewist"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Server-bericht: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, 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/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Kon nodelijst niet downloaden."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Kon gedownload versie controle bestand niet openen"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Beschadigd bestand voor versiecontrole"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "U gebruikt een verouderde versie van aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "De nieuwste versie kan altijd gevonden worden op https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "U heeft de nieuwste aMule-versie."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Kon bestand voor versiecontrole niet downloaden"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Gebruikers: %s | Bestanden: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Geen netwerken geselecteerd"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "met Laag ID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "met Hoog ID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Verbonden met %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Verbinden met %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Verbinding verbroken met eD2K"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad gestart."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad gestopt."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Verbonden met Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Verbonden met Kad (firewalled)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Verbinding met Kad verbroken"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kad-netwerk is uitgeschakeld in voorkeuren, wordt niet mee verbonden."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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:145
-#, fuzzy
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
-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 https://amule-org.github.io/docs"
+msgstr "FOUT: Er is een geldig wachtwoord vereist om externe verbindingen te gebruiken, en de aMule-daemon kan niet worden gebruikt zonder externe verbindingen. Om de aMule-daemon uit te voeren, moet u het veld \"ECPassword\" in het bestand ~/.aMule/amule.conf instellen op een geschikte waarde. Voer amuled uit met de vlag --ec-config om het wachtwoord in te stellen. Meer informatie vindt u op https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - timer wordt gestart"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: naar de achtergrond - tot ziens"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Kan Pid-bestand niet aanmaken"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "FOUT: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Dit is aMule %s gebaseerd op eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Draaiend op %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Bezoek https://github.com/amule-org/amule/releases/latest om te zien of een nieuwe versie beschikbaar is."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "FATALE FOUT: Kon Timer niet aanmaken"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMule controle op afstand "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "Fout! Voorkeuren konden niet geladen worden"
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Netwerken"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"'Alle-Platformen' p2p client gebaseerd op eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Zoeken"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Website: https://amule-org.github.io \n"
-
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Website: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Gedeelde bestanden"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Clients"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Berichten"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Een deel van aMule is gebaseerd op \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistieken"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Peer-to-peer routing gebaseerd op de XOR-metric.\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Voorkeuren"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr "Navigeer"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Bericht"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "Vrije ruimte: %s"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "Nieuwe versie beschikbaar"
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"Er is een nieuwe versie van aMule (%s) beschikbaar.\n"
+"\n"
+"U gebruikt %s.\n"
+"\n"
+"Wilt u de downloadpagina openen?"
+
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "aMule dialoogvenster afgesloten"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Aan het verbinden"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2K: Verbinden"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2K: Verbinding verbroken"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Firewalled"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Verbonden"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Verbinden"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Uitgeschakeld"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Beëindig de huidige verbindingspogingen"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Verbreek"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr "Kern"
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versie"
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Verbreek de huidige verbonden netwerken"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr "De kern en aMuleGUI zijn verschillende versies."
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr "De kern en aMuleGUI zijn dezelfde versie."
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Verbinden"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adres"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Verbind met de momenteel ingeschakelde netwerken"
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "Versleuteling"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Upload: %.1f%s (%.1f) | Download: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " MiB/s"
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " KiB/s"
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Upload: %.1f%s | Download: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Verbonden)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Niet verbonden)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Wilt u %s echt afsluiten?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Bevestig afsluiten"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Voer commando uit: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- standaard -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Skinmap '%s' bestaat niet"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "WAARSCHUWING: Kon skin-bestand '%s' niet openen om te lezen"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Netwerken"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Netwerkvenster"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Zoeken"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Zoekvenster"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Downloads"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Downloadsvenster"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Gedeelde bestanden"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Gedeelde bestanden-venster"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Berichten"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr "Clients-venster"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Berichtenvenster"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistieken"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Statistiekenvenster (Grafieken)"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Voorkeureninstellingen-venster"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importeer"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Het deelbestand importeerprogramma"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Over"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Over/Help"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "eD2k-netwerk"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kad netwerk"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Geen netwerk"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "aMule besturing op afstand"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Fatale fout: Kon Core Timer niet aanmaken"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Verbind met amule op afstand"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Verbinding kwijt"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr "Afbreken en afsluiten"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "Opnieuw verbinden... (poging %d)"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr "Volgende poging over %d s..."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+"Verbinding met %s verloren.\n"
+"%s\n"
+"\n"
+"De interface is gepauzeerd totdat de verbinding is hersteld."
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Fatale fout: Kon Poll Timer niet aanmaken"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Naar de gebeurtenislus..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Aan het verbinden..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
-msgstr ""
+msgstr "Verbinding mislukt. Controleer het hostadres, de poort en het wachtwoord."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "GUI EV gebeurtenisafhandelaar op afstand"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "Verbinding mislukt. Kon niet verbinden met %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Wordt afgesloten"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Verbinding verbroken - aMule is waarschijnlijk afgesloten."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Time-out bij poging tot opnieuw verbinden; opnieuw proberen."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
+"Time-out bij het maken van verbinding. Kan %s:%d niet bereiken binnen de toegestane tijd.\n"
+"Controleer het hostadres, de poort en of aMule wordt uitgevoerd met Externe Verbindingen ingeschakeld."
+
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr "Verbinding met de externe kern is verloren. Opnieuw verbinden wordt geprobeerd..."
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Uitgeschakeld"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr "Opnieuw verbonden met de externe kern."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr "De externe kern is opnieuw opgestart; aan het herladen."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Poging tot opnieuw verbinden %d: verbinden met %s:%d"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr "Opnieuw verbinden kon niet starten; wordt binnenkort opnieuw geprobeerd."
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Klaar"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Alle"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr "niet leesbaar"
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr "niet gevonden"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr "De kern heeft deze gedeelde mappen geweigerd:%s"
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Ongeldige link of al op de lijst."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr "De daemon heeft het verzoek geweigerd."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "Kon de categorie niet verwijderen: %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr "Kan map '%s' niet aanmaken voor categorie '%s', map '%s' wordt behouden."
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr "De externe kern stuurde inconsistente data voor \"%s\" (deel status %d, verwacht %d). De bestandslijst laat mogelijk de verkeerdeinformatie zien; herverbindt om die te legen."
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Kon gedeelde bestanden niet ontvangen van gebruiker '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Op zoek naar buddy voor laag-ID-verbinding"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Nep eMule versie %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Nep eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Nep eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (gebaseerd op eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Bijnaam: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Aangevraagd: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Bestandsstatistieken voor deze sessie: Geaccepteerd %d van %d aanvraag, %s overgebracht\n"
 msgstr1 "Bestandsstatistieken voor deze sessie: Geaccepteerd %d van %d aanvragen, %s overgebracht\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Bestandsstatistieken voor alle sessies: Geaccepteerd %d van %d aanvraag, %s overgebracht\n"
 msgstr1 "Bestandsstatistieken voor alle sessies: Geaccepteerd %d van %d aanvragen, %s overgebracht\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Aangevraagd bestand is onbekend"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Bericht van '%s' gefilterd (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nieuw bericht van '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, 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 map '%s' op -> Genegeerd"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Kon gedeelde bestanden niet ontvangen van gebruiker '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "WAARSCHUWING: %s kan niet geopend worden."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "WAARSCHUWING: Geannuleerde-bestandenlijst beschadigd, bevat ongeldige header."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "IO-fout bij het lezen van bestand %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Fout bij het bewaren van bestand %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Voer captcha in"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Categorie"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nieuwe categorie"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Kies een map voor binnenkomende bestanden"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "U moet een naam opgeven voor de categorie!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "U moet een pad opgeven voor de categorie!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
-msgstr "Kon binnenkomende map niet aanmaken voor categorie. Geef een geldig pad op."
+msgstr "Kon binnenkomende map niet aanmaken voor categorie. Geef een geldig pad op!"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Chat-sessie begonnen: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Verbonden met Client ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Verbinden maken met Client ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Kon niet Verbinden met client / Verbinding verbroken ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr "*** U heeft de captcha-controle gehaald en de gebruiker heeft uw bericht ontvangen. ***"
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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 "*** Uw antwoord op de captcha was fout en uw bericht is genegeerd. U kunt een nieuwe captcha aanvragen door een nieuw bericht te sturen. ***"
 
-#: src/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Chat"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Sluit tabblad"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Sluit alle tabbladen"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Sluit andere tabbladen"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Voeg toe aan vrienden"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Laat &Details zien"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Verwijder uit vriendenlijst"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Maak vriendenslot"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Bekijk bestanden"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Verstuur bericht"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Verstuur bericht naar gebruiker"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Bericht om te versturen:"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"U mag niet meer dan één vriendenslot instellen.\n"
+" Er is slechts één slot toegewezen."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Meerdere selectie"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 "Voeg %u client toe aan uw veiendenlijst?"
+msgstr1 "Voeg %u clients toe aan uw vriendenlijst?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Verwijder %u client uit uw viendenlijst?"
+msgstr1 "Verwijder %u clients uit uw vriendenlijst?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 "Kon %u geselecteerde client niet toevoegen aan uw vriendenlijst: er is geen adres voor bekend."
+msgstr1 "Kon %u geselecteerde clients niet toevoegen aan uw vriendenlijst: er zijn geen adressen voor bekend."
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Vraag de gedeelde bestanden van %u client aan?"
+msgstr1 "Vraag de gedeelde bestanden van %u clients aan?"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr "Daarvan is op elke een verbinding geopend."
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Creditfile geladen, %u client is bekend"
 msgstr1 "Creditfile geladen, %u clients zijn bekend"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - Credits verlopen voor %u client!"
 msgstr1 " - Credits verlopen voor %u clients!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Geen 'cryptkey.dat' bestand gevonden, wordt aangemaakt."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Client details"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "Laag-ID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "Hoog ID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Ondersteund"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Niet ondersteund"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Uitgeschakeld"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Verbonden"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Niet verbonden"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f KB/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f KiB/s"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Naam"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "Software"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP-Adres"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Oorsprong"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr "Voor het eerst gezien"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr "Voor het laatst gezien"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "Sessies"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Uploadsnelheid"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Downloadsnelheid"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "Totaal Geüpload"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "Totaal Gedownload"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "DL/UP modificator"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr "Nu online"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Niet compleet"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Slechterik"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Gecontroleerd - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/B"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Niet beschikbaar"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "Kon %u geselecteerde client niet bevragen om hun gedeelde bestanden."
+msgstr1 "Kon %u geselecteerde clients niet bevragen om hun gedeelde bestanden."
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Bestanden"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Geüpload"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Gedownload"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "Wordt gedownload vanuit"
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr "Wordt geüpload naar"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Actief"
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr "Bekend"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Gebruiker %s (%u) vroeg uw gedeelde-bestandenlijst op -> Geaccepteerd"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Gebruiker %s (%u) vroeg uw gedeelde-bestandenlijst op -> Geweigerd"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Gebruiker %s (%u) vroeg uw gedeelde-mappenlijst op -> Toegestaan"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Gebruiker %s (%u) vroeg uw gedeelde-mappenlijst op -> Geweigerd"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "Gebruiker %s (%u) vroeg uw gedeelde-bestandenlijst van map '%s' op -> geaccepteerd"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "Gebruiker %s (%u) vroeg uw gedeelde-bestandenlijst van map '%s' op -> geweigerd"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Gebruiker %s (%u) deelt map '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Gebruiker %s (%u) stuurde niet-opgevraagde gedeelde mappen."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "Gebruiker %s (%u) stuurde gedeelde-bestandenlijst van map '%s'"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "Gebruiker %s (%u) heeft gedeelde-bestandenlijst gestuurd"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Gebruiker %s (%u) stuurde ongewild gedeelde-bestandenlijst"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "Gebruiker %s (%u) weigerde toegang tot gedeelde mappen/bestanden-lijst"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Bestand commentaren"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Bestandsnaam"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Waardering"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Commentaar"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr "Kon geen Kad-zoekopdracht starten"
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad-zoekopdracht kan niet worden uitgevoerd als Kad niet draait"
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "Kad wordt doorzocht op opmerkingen..."
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Geen commentaren"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u commentaar"
 msgstr1 "%u commentaren"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr "Client %s geband voor het sturen van %s beschadigde gegeven van in totaal %s voor het bestand '%s'"
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Kon landgegevens niet laden voor '%s'."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto La"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Ho"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Heel laag"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Laag"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Hoog"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Heel hoog"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Vrijgeven"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Vragend"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Verbinden via server"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Wachtrij vol"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "In wachtrij"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Downloaden"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Ontvangen van hashset"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Geen benodigde delen"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Kan laag-ID niet verbinden met laag-ID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Te veel verbindingen"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Verbinding maken via Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Te veel Kad-verbindingen"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Geband"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Verbindingsfout"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Wachtrij op Afstand is vol"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Oude MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Nieuwe MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule-compatible"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Lokale server"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Server op Afstand"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Bron uitwisseling"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passief"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Link"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Bron seeds"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Zoekresultaat"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Compleet"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Bezig"
 
-#: src/DataToText.cpp:145
-#, fuzzy
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
-msgstr "FOUT: Onvoldoende schijfruimte"
+msgstr "FOUT: Schijfruimte vol"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "FOUT: Partmet niet gevonden"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "FOUT: IO-fout!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "FOUT: Mislukt!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "In wachtrij"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Wordt al gedownload"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Onbekend of fout tempbestand formaat."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr "Deze map is onderdeel van een recursieve deellijst. Om deze te verwijderen, stop met delen of pas de bronmap van de recursieve deellijst die hierboven staat aan."
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr "Kan niet stoppen met delen binnen een recursieve deellijst"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr "Kan niet aanpassen binnen een recursieve deellijst"
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Deel"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Grootte"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Overgebracht"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Snelheid"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Voortgang"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Bronnen"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Status"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Overgebleven tijd"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
-msgstr "Laatst compleet gezien"
+msgstr "Laatst Compleet Gezien"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Laatste overdracht"
 
-#: 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/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/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Feedback van: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Auto"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Stop"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pauzeer"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "Ve&rder gaan"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Verwijder comp&lete"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Wissel elk A4AF nu uit met dit bestand"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Wissel elk A4AF uit met dit bestand (Auto)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Wissel elk A4AF nu uit met de andere bestanden"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Uitgebreide opties"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "Toon in bestandsbeheer"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Bekijk bestand &details"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Bekijk alle commentaren"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Kopieer magnet-URI naar klembord"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Kopieer eD2k &link naar klembord"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Kopieer feedback naar klembord"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Verkrijg %s voor dit bestand"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "verwijder toewijzing"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Toewijzen aan catgorie"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Open het bestand"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Weet u zeker dat u het geselecteerde bestand wilt verwijderen?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Weet u zeker dat u de geselecteerde bestanden wilt verwijderen?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Feedback van: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Voer een nieuwe naam voor dit bestand in:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Naam wijzigen"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
+msgid "%.1f MiB/s"
+msgstr "%.1f MiB/s"
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Downloads (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Om deze waarschuwing te voorkomen bij elk voorbeeld\n"
-"dient u uw video afspeelprogramma in te stellen bij voorkeuren (standaard is %s)."
+msgid "Total queue size: %s"
+msgstr "Totale maat wachtrij: %s"
 
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Voorbeeld"
-
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "FOUT: Opstarten externe mediaspeler mislukt! Commando: '%s'"
-
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Deelbestand %u van %u wordt bewaard"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Alle deelbestanden bewaard."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Tijdelijke bestanden worden geladen van %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Deelbestand %u van %u wordt geladen"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "FOUT: Laden van backupbestand misukt. Zoek op https://github.com/amule-org/amule/discussions naar .part.met hersteloplossingen."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Alle deelbestanden geladen."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Geen deelbestanden gevonden"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "%u deelbestand gevonden"
 msgstr1 "%u deelbestanden gevonden"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Bestandssysteem voor tijdelijke map kan grote bestanden niet verwerken."
 
 # Translate 'Incoming directory'?
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Bestandssysteem voor binnenkomende map kan grote bestanden niet verwerken."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Downloaden van %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "U probeert het bestand '%s' al te downloaden"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "U hebt het bestand '%s' al (opgevraagd als '%s')"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "U heeft het bestand '%s' al"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "U probeert het bestand %s al te downloaden"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Kan magnet-link niet omzetten naar eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Onbekend protocol in link: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Kon %u link niet toevoegen (zie log voor details)."
+msgstr1 "Kon %u links niet toevoegen (zie log voor details)."
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Ongeldige eD2k-link! FOUT: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Client verstuurde pakket nadat authenticatie mislukte."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Externe verbinding gesloten."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Externe verbindingen uitgeschakeld vanwege leeg wachtwoord!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Externe verbindingen uitgeschakeld in configuratiebestand"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Nieuwe externe verbinding geaccepteerd"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "FOUT: kon nieuwe externe verbinding niet accepteren"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Externe verbinding geweigerd vanwege leeg wachtwoord bij voorkeuren!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Client verbinden: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Onbekende versie"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
-msgstr "Incorrecte EV-versie ID, mogelijk niet compatible. Gebruik kern en op afstand van dezelfde snapshot."
+msgstr "Incorrecte EV-versie ID, mogelijk is het programma incompatibel. Gebruik kern en op afstand van dezelfde snapshot."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "U kunt niet verbinden met een release-versie vanaf een willekeurig ontwikkelingssnapshot! *zucht* mogelijke crash voorkomen"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Ongeldige protocolversie."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Ontbrekend label van protocolversie."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Te veel mislukte verbindingspogingen; probeer opnieuw over %d secondes."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Authenticatie mislukt: ongeldige hash opgegeven als EV-wachtwoord."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr "Authenticatie mislukt: de client bood een versleutelde Externe Verbinding aan maar stuurde geen bruikbare sleutel."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr "Authenticatie mistlut: deze aMule vereist een versleutelde Externe Verbinding, en de client onderhandelde er niet over."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr "Authenticatie mislukt: de client kon de versleutelde sessie niet bevestigen."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Authenticatie mislukt: verkeerd wachtwoord."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Authenticatie mislukt: ontbrekend wachtwoord."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Ongeldig verzoek, authenticeer eerst."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Toegang verleend."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Foutmelding \"%s\" verzonden naar client."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Poging tot ongeautoriseerde toegang van %s. Verbinding gesloten."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Deelbestand-commando op afstand mislukt: Bestands-hash niet gevonden: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Bestandshash niet gevonden: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OEPS! OpCode verwerkingsfout!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Server niet toegevoegd"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "server niet gevonden: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "moet de te verwijderen server opgeven"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2K is uitgeschakeld in voorkeuren."
 
-#: src/ExternalConn.cpp:1368
-#, fuzzy
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr "Nog geen adres bekend voor die vriend."
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
-msgstr "Bestand niet gevonden."
+msgstr "Vriend niet gevonden."
 
-#: src/ExternalConn.cpp:1377
-#, fuzzy
+#: src/ExternalConn.cpp
 msgid "Client not found."
-msgstr "Bestand niet gevonden."
+msgstr "Client niet gevonden."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
-msgstr ""
+msgstr "EC_TAG_FRIEND_SHARED vereist EC_TAG_FRIEND of EC_TAG_CLIENT."
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Bezig met zoeken. Haal de resultaten op over een momentje!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "WebSearch vanaf afstand is zinloos."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr "Een blader-actie is geen zoekopdracht die gestart kan worden."
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Bezig met zoeken. Haal de resultaten op over een momentje!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Geen punten voor grafiek."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Uw client is niet geconfigureerd voor dit niveau van details."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Externe verbinding: afsluiten aangevraagd"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Al bezig met afsluiten."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExterneVerb: link '%s' wordt toegevoegd."
 
-#: src/ExternalConn.cpp:1832
-#, fuzzy, c-format
+#: src/ExternalConn.cpp
+#, c-format
 msgid "%d of %d links failed (invalid or already on list)."
-msgstr "Ongeldige link of al op de lijst."
+msgstr "%d van %d links zijn mislukt (ongeldig of al op de lijst)."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr "Versiecontrole beperkt; probeer het binnenkort opnieuw."
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr "Versiecontrole is niet beschikbaar op deze daemon."
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Bestand niet gevonden."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Ongeldige bestandsnaam."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Kon naam van bestand niet wijzigen."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr "Kan de client niet naar dat bestand overschakelen."
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr "Kon het amuleapi-wachtwoord niet opslaan: %s"
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "Categorie onvindbaar."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr "Categorieverzoek misvormd."
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr "De standaardcategorie kan niet verwijderd worden."
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "Ontbrekende chatsessie-id"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "Chatsessie onvindbaar"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Uitlezen van media-metadata is uitgeschakeld in voorkeuren"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr "Bestand is niet kiesbaar voor uitlezen van media-metadata (geen audio-/videobestand of een incomplete download)"
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "Leeg chatbericht"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "Onbekende doelchat"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad is uitgeschakeld in voorkeuren."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Al verbonden met eD2K."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Aan het verbinden met eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Al verbonden met Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Verbinding met Kad wordt gemaakt..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Alle netwerken zijn uitgeschakeld."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Verbinding met eD2K verbroken."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Verbinding met Kad verbroken."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Externe verbinding: ongeldige opcode ontvangen: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Ongeldige opcode (verkeerde protocolversie?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Onbekende extensie '%s' van het '%s' commando.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Onbekend commando '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1872,7 +2386,7 @@
 "\n"
 "Dit commando heeft geen argumenten.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1880,7 +2394,7 @@
 "\n"
 "Dit commando moet een argument hebben.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1888,7 +2402,7 @@
 "\n"
 "Dit commando is niet compleet, u moet een van onderstaande uitbreidingen gebruiken.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1896,11 +2410,11 @@
 "\n"
 "Beschikbare uitbreidingen:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Beschikbare commando's:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1911,17 +2425,17 @@
 "Alle commando's zijn hoofdlettergevoelig.\n"
 "Type '%s <command>' om gedetailleerde info te krijgen over <command>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Sluit het programma af."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Toon help."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1929,7 +2443,7 @@
 "Om help te krijgen over een commando, type 'help <commando>'.\n"
 "Om de volledige commando lijst te krijgen type 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1940,46 +2454,46 @@
 "Gebruik '%s' voor commandolijst\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Syntax-fout!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Dit commando heeft geen parameters."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Dit commando moet een parameter hebben."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Ongeldig argument."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Dit is een incompleet commando."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Type '%s' voor meer help.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Dit is %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Dit is %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1987,7 +2501,7 @@
 "\n"
 "Aanmaken van client...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1996,7 +2510,7 @@
 "\n"
 "Ok, %s wordt afgesloten...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2006,123 +2520,374 @@
 msgstr ""
 "Kan niet verbinden met een leeg wachtwoord.\n"
 "U moet een wachtwoord opgeven in het configuratiebestand\n"
-"of op de commando-regel, of invoeren als daarom gevraagd\n"
-"wordt.\n"
+"of op de commando-regel, of invoeren als daarom gevraagd wordt.\n"
 "\n"
 "Bezig met afsluiten...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Toon deze helptekst."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Host waar aMule draait. (standaard: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "aMules poort voor externe verbindingen. (standaard: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Externe verbinding wachtwoord."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Lees configuratie uit bestand."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Print geen uitvoer naar stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Wees uitgebreid - toon ook foutopsporingsberichten."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Stelt programma-locale (taal) in."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Schrijf opties op de opdrachtregel naar configuratiebestand."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Maakt configuratiebestand gebaseerd op aMules configuratiebestand."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Toon programma-versie."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr "Versleutel de Externe Verbinding-sessie niet. Versleuteling staat standaard aan als de externe aMule het ondersteund; door het uit te schakelen laat u alles na de aanmelding leesbaar en aanpasbaar door iedereen op het pad."
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
-msgstr ""
+msgstr "Forceer ZLIB-compressie onafhankelijk van de lokaliteit van het opgevraagde IP-adres (nuttig wanneer de server bereikbaar is via een VPN-tunnel die naar een LAN-IP-adres verwijst)."
+
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr "Voeg een kopie van alle consoleuitvoer toe aan dit logbestand (standaard: <config-dir>/amuleapi.log)."
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr "Schrijf geen logbestand; alleen weergeven op de console."
 
-#: src/FileDetailDialog.cpp:76
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Bestandsdetails"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% voltooid"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Voorbeeld"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "FOUT: Opstarten externe mediaspeler mislukt! Commando: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr "De ingestelde videospeler werd niet gevonden: %s"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr "Kan '%s' niet openen: het bestand is niet aanwezig op deze computer."
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr "Voorbeeldweergave van een onvoltooide download heeft een videospeler nodig: het deels-gedownloadde bestand heeft geen type die het systeem zelf kan openen. Er kan er een worden ingesteld in Voorkeuren -> Algemeen."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr "FOUT: Openen van '%s' met de standaardapp mislukt."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "FOUT: Tonen van '%s' in bestandsbeheer mislukt."
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "Mobiel / 4G-5G (20 / 5 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL (24 / 1 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL (50 / 10 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Kabel (200 / 20 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Glasvezel 300 (300 / 100 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "Glasvezel Gigabit (1000 / 1000 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr "Eerste installatie van aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "Welkom bij aMule!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+"Deze korte installatie zorgt dat u verbinding krijgt. U kunt\n"
+"al deze instellingen later wijzigen in Voorkeuren."
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "Kies een bijnaam die andere peers zien:"
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr "Verbinding en bandbreedte"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+"Kies de optie die het beste bij uw Internetverbinding past,\n"
+"of stel de upload- en downloadlimieten hieronder rechtstreeks in."
+
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "Verbindingssnelheid:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr "Anders / handmatig instellen"
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "Uploadlimiet (KiB/s, 0 = onbeperkt):"
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "Downloadlimiet (KiB/s, 0 = onbeperkt):"
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "Netwerken & poorten"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr "aMule kan twee netwerken gebruiken. We raden aan beide ingeschakeld te houden."
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Standaard TCP-poort "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Uitgebreide UDP-poort (Kad / globaal zoeken) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Schakel UPnP voor router portforwarding in"
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+"Laat aMule uw router vragen om de bovenstaande poorten door te sturen, zodat andere\n"
+"peers u kunnen bereiken (een \"HighID\"). Schakel dit uit als uw router\n"
+"geen UPnP ondersteunt of als u poorten handmatig doorstuurt."
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr "Bootstrapbestanden"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+"Om te beginnen moet aMule enkele peers kennen.\n"
+"Selecteer welke lijsten nu moeten worden gedownload:"
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Uw peerlijsten zijn al aanwezig - er hoeft niets te worden gedownload."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Auto-update serverlijst bij het opstarten"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr "Integraties (optioneel)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+"Kies hoe aMule integreert met uw systeem. U kunt\n"
+"al deze instellingen later wijzigen in Voorkeuren."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "aMule automatisch starten bij aanmelden"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr "aMule registreren voor ed2k://-koppelingen"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr "aMule registreren voor magnet:-koppelingen"
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr "Alleen eD2k-compatibele magnet-koppelingen. Laat uitgeschakeld als u een BitTorrent-client gebruikt."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ".emulecollection-bestanden openen met aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr "Mappen (optioneel)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+"De standaardinstellingen zijn geschikt voor de meeste mensen. Wijzig ze als u\n"
+"downloads op een andere (bijv. grotere) schijf wilt."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Doelmap voor downloads"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Bladeren"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Alle bestanden in deze map worden gedeeld met andere peers)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Map voor tijdelijke downloadbestanden"
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+"Op basis hiervan staat aMule maximaal %i bronnen per bestand\n"
+"en %i clientverbindingen toe."
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr "Deze installatiewizard opnieuw weergeven wanneer u aMule de volgende keer start?"
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr "Installatie niet voltooid"
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Kon vriendenlijst-bestand 'emfriends.met' niet lezen!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Kon niet schrijven naar vriendenlijst-bestand 'emfriends.met'!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr "Geen adres bekend voor vriend '%s', kan er niet door bladeren."
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "KRITIEK - geen client bij StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Vrienden"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Laat &Details zien"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Voeg een vriend toe"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Verwijder vriend"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Verstuur &Message"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Bekijk bestanden"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Maak vriendenslot"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr "Geen adres bekend voor vriend '%s', kan ze niet berichten."
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Weet u zeker dat u de geselecteerde vriend wilt verwijderen?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Weet u zeker dat u de geselecteerde vrienden wilt verwijderen?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2130,987 +2895,1284 @@
 "U kunt maximaal één vriendenslot instellen.\n"
 " Slechts één slot is toegekend."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Meerdere selectie"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"U kunt maximaal één vriendenslot instellen.\n"
-" Slechts één slot is toegekend."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Verstuur bericht naar gebruiker"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Bericht om te versturen:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Verwijder uit vriendenlijst"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Verstuur bericht"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Wissel uit naar dit bestand"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr "Kleurenlegenda"
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "In wachtrij: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Al om een ander bestand gevraagd"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Wachtende op upload-slot"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "In wachtrij: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Aan het uploaden"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Geen"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Nee"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Ja"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Openen van MaxMindDB database '%s': %s mislukt"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Downloaden..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "HTTP-download geannuleerd"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "De URL om te downloaden mag niet leeg zijn"
 
-#: src/HTTPDownload.cpp:246
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Failed to create HTTP request for %s"
-msgstr "Kon gedeelde bestanden niet ontvangen van gebruiker '%s'"
+msgstr "Kon geen HTTP-verzoek maken voor %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
-msgstr ""
+msgstr "HTTP-download: lege antwoordinhoud voor %s"
 
-#: src/HTTPDownload.cpp:349
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Could not move downloaded file to %s"
-msgstr "Map voor tijdelijke downloadbestanden"
+msgstr "Kon gedownload bestand niet verplaatsen naar %s"
 
-#: src/HTTPDownload.cpp:353
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Downloaded %s (%llu bytes)"
-msgstr "%d bytes gedownload"
+msgstr "Gedownload: %s (%llu bytes)"
 
-#: src/HTTPDownload.cpp:358
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "The URL %s returned: %i"
-msgstr "De URL %s leverde op: %i - Fout (%i)!"
+msgstr "De URL %s retourneerde: %i"
 
-#: src/HTTPDownload.cpp:365
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "HTTP download failed for %s: %s"
-msgstr "HTTP-download geannuleerd"
+msgstr "HTTP-download mislukt voor %s: %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
-msgstr ""
+msgstr "HTTP 401 Niet geautoriseerd voor %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
-msgstr ""
+msgstr "Bestaand GeoLite2-Country.mmdb gemigreerd naar %s"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr ""
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr "%s is geen leesbaar MaxMindDB-bestand - wordt verwijderd. Een nieuwe kopie wordt gedownload bij de volgende start, of nu via Voorkeuren -> IP2Country -> 'Update nu'."
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr ""
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "IP2Country: MaxMind geselecteerd als GeoIP-bron maar geen Licentiesleutel ingesteld. Open Voorkeuren -> IP2Country, plak uw gratis MaxMind-Licentiesleutel en klik op 'Nu bijwerken'."
+
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "IP2Country: Aangepaste URL geselecteerd als GeoIP-bron, maar geen URL geconfigureerd. Open Voorkeuren -> IP2Country en geef een URL op die verwijst naar een .mmdb-bestand (of een .gz-/.tar.gz-bestand dat er een bevat)."
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
-msgstr ""
+msgstr "IP2Country: GeoIP-download-URL herleiden mislukt."
 
-#: src/IP2Country.cpp:157
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download new %s from %s"
-msgstr "Download van nieuwe GeoIP.dat van %s"
+msgstr "Nieuwe %s downloaden van %s"
 
-#: src/IP2Country.cpp:191
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download of %s file failed, aborting update."
-msgstr "Download van bestand GeoIP.dat mislukt, update wordt gestopt."
+msgstr "Download van bestand %s mislukt, update wordt afgebroken."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Kon bestand %s niet verwijderen, update wordt gestopt."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Kon bestand %s niet hernoemen, update wordt gestopt."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "%s succesvol geüpdatet"
 
-#: src/IP2Country.cpp:228
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Error updating %s"
-msgstr "Fout bij het updaten van GeoIP.dat"
+msgstr "Fout bij bijwerken van %s"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
-msgstr ""
+msgstr "DB-IP-download voor de huidige maand is mislukt - opnieuw proberen met de URL van de vorige maand."
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Kon %s niet downloaden van %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Kon landgegevens niet laden voor '%s'."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "IP-filters 'ipfilter.dat' en 'ipfilter_static.dat' worden geladen."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Kon ipfilter.dat bestand '%s' niet laden, onbekend formaat."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "%u IP-reeks geladen van '%s'."
 msgstr1 "%u IP-reeksen geladen van '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u misvormde regel is genegeerd."
 msgstr1 "%u misvormde regels zijn genegeerd."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Kon nieuw bestand %s niet hernoemen, update wordt gestopt."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP-filter is klaar"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap van \n"
-"bekende clients"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Huidige"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Lopende gemiddelde"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Sessie gemiddelde"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Nodes (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Ongeldig ip om van te bootstrappen"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Ongeldige poort om van te bootstrappen"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Vul alle benodigde velden in"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Bericht"
+
+#: src/KadDlg.cpp
 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"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Dat zal uw huidige nodes verwijderen en de Kademlia verbinding opnieuw starten."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Verder gaan?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: zoekwoord te kort"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: Zoekwoord staat al op de zoeklijst: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Kon bestand nodes.dat niet lezen - te oud. Deze versie (0) wordt niet meer ondersteund."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "%u Kad-contact gelezen"
 msgstr1 "%u Kad-contacten gelezen"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Geen contacten gevonden, bootstrap of download een nodes.dat bestand."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Slechts %d Kad-contact beschikbaar, nodes.dat niet beschreven"
 msgstr1 "Slechts %d Kad contacten beschikbaar, nodes.dat niet beschreven"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "%d Kad-contact geschreven"
 msgstr1 "%d Kad-contacten geschreven"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Kad-gebruiker"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr "Kad-notitiezoekopdracht voor '%s' niet gestart: Kad is niet verbonden"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr "Kad-notitiezoekopdracht voor '%s' niet gestart: er wordt al een notitieopzoeking uitgevoerd voor dit bestand"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr "Kad-notitiezoekopdracht voor '%s' niet gestart: bestand staat niet in de gedeelde lijst, downloadwachtrij of zoekresultaten"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr "Kad-notitiezoekopdracht voor '%s' niet gestart: een andere Kad-zoekopdracht (bijv. een bronzoekopdracht) gebruikt de hash van dit bestand al - probeer het binnenkort opnieuw"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr "Kad-notitiezoekopdracht voor '%s' niet gestart: PrepareLookup mislukt"
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Bestandsgrootte"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Deelverhouding"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Geüpload"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Aangevraagd"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Complete bronnen"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "WAARSCHUWING: Bekende-bestandenlijst beschadigd, bevat ongeldige header."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Kon vermelding in bekende-bestandenlijst niet laden, bestand kan beschadigd zijn"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Ongeldige vermelding in bekende-bestandenlijst, bestand kan beschadigd zijn: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Systeemstandaard"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanees"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabisch"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturisch"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baskisch"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgaars"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Catalaans"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Chinees (Vereenvoudigd)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Chinees (Traditioneel)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Kroatisch"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Tsjechisch"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Deens"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Engels (V.K.)"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "Engels (V.S.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estonisch"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Fins"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Frans"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Gallisch"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Duits"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grieks"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebreeuws"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Hongaars"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italiaans"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japans"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Koreaans"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "Lets"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Litouws"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Noors"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Pools"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugees"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugees (Braziliaans)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Roemeens"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Russisch"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Sloveens"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Spaans"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Zweeds"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turks"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Oekraïens"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Onbekende fout %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Kon foutbeschrijving niet verkrijgen voor fout %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Aan het hashen"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Voltooien"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Compleet"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Gepauzeerd"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Foutief"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Wachten"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "U moet een niet-leeg wachtwoord opgeven."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Ongeldig wachtwoord, geen MD5-hash!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr "Kon %s niet herleiden naar een IPv4-adres."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Verbindingsfout"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-#, fuzzy
-msgid "External Connection lost — exiting."
-msgstr "Externe verbinding gesloten."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
+msgstr "Externe verbinding verloren - wordt afgesloten."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "EV-verbinding mislukt. Leeg antwoord."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr "Kon verbindingsversleuteling niet instellen. Connectie gesloten."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr "De kern onderhandelde niet over een versleutelde verbinding. Het kan een oudere aMule-versie zonder versleutelingsondersteuning zijn of de verbinding kan gemanipuleerd zijn. Om te verbinden zonder versleuteling zet u deze uit in de verbindingsinstellingen."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Externe verbinding: slecht antwoord, handshake mislukt. Verbinding verbroken."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Externe verbinding: de daemon heeft niet kunnen bewijzen dat die het wachtwoord kent. Verbinding verbroken."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Succes! Verbinding gemaakt met aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Gelukt! Verbinding gemaakt."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Externe verbinding: toegang geweigerd omdat: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Externe verbinding: handshake mislukt."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr "Fout bij het aanmaken van UDP socket %s %d : %s"
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Asio-download thread %d gestart"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "FOUT: Kon niet luisteren op TCP-poort."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "FOUT: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "WAARSCHUWING: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr "Media-metadata: geen ffprobe-programma gevonden. Installeer ffmpeg of stel het pad naar ffprobe in Voorkeuren in; Lengte, bitrate en codec worden niet uitgelezen."
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr "Media-metadata: %s is verdwenen, niets om uit te lezen"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr "Media-metadata wordt uitgelezen met ffprobe: %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr "Media-metadata: time-out van ffprobe of geannuleerd voor %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr "Media-metadata: ongelofelijk lange ffprobe-uitvoer wordt genegeerd voor %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr "Media-metadata: kon ffprobe niet uitvoeren (%s) -- controleer de media-metadata instellingen"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr "Media-metadata: ffprobe mislukt (code %d) voor %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr "Media-metadata: ffprobe vond niets bruikbaars in %s"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 "Uitlezen van media-metadata uit %u gedeeld bestand voltooid (%u mislukt)"
+msgstr1 "Uitlezen van media-metadata uit %u gedeelde bestanden voltooid (%u mislukt)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 "Uitlezen van media-metadata vanuit %u gedeeld bestand voltooid"
+msgstr1 "Uitlezen van media-metadata vanuit %u gedeelde bestanden voltooid"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 "Uitlezen van media-metadata mislukt voor nog %u bestand (niet individueel vermeld)"
+msgstr1 "Uitlezen van media-metadata mislukt voor nog %u bestanden (niet individueel vermeld)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 "Nog %u gedeeld bestand is verdwenen (niet individueel vermeld)"
+msgstr1 "Nog %u gedeelde bestanden zijn verdwenen (niet individueel vermeld)"
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Knippen"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Plakken"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Wissen"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: src/MuleTrayIcon.cpp:367
-#, fuzzy
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "KiB/s"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Onbegrensd"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Toon aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Verberg aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
-msgstr "eD2k"
+msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
-msgstr "Verbonden"
+msgstr "Verbonden (LowID)"
 
-#: src/MuleTrayIcon.cpp:371
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
-msgstr "Verbonden"
+msgstr "Verbonden (HighID)"
 
-#: src/MuleTrayIcon.cpp:380
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
-msgstr " Kad: "
+msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
-msgstr "Verbonden met Kad (firewalled)"
+msgstr "Verbonden (firewalled)"
 
-#: src/MuleTrayIcon.cpp:393
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
-msgstr "Server-IP: "
+msgstr "Server: "
 
-#: src/MuleTrayIcon.cpp:394
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
-msgstr "Server-IP:"
+msgstr "Server-IP: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Niet verbonden"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP-poort: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP-poort: Niet gereed"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP-poort: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP-poort: Niet gereed"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Client informatie"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Uploadgrens"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Downloadgrens"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Toon aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Verbreek"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Verberg aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Verbinden"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Onbegrensd"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule systeemvak-menu"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Snelheidsgrenzen:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "UL: Geen"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "UL: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DL: Geen"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DL: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Downloadsnelheid: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Uploadsnelheid: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Bijnaam: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Geen bijnaam geselecteerd!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "Client-ID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Server-naam: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "Server-IP: "
 
 # msgstr "Verbinden"
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Niet verbonden"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online handtekening: Ingeschakeld"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online handtekening: Uitgeschakeld"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Uptime: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Gedeelde bestanden: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Clients in wachtrij: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Totaal gedownload: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Totaal geupload: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k-link: "
-
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Uitvoeren"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr "%s aangemaakt bij poort %u"
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr "WAARSCHUWING! %s: Pakket naar %s genegeerd door fout (%s) tijdens het versturen."
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr "Plak hier eD2k- of magnet-koppelingen"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "Koppelingen toevoegen"
+
+#: src/muuli_wdr.cpp
 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 tekstinvoer toe te voegen aan uw downloadwachtrij."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
-msgstr "Gebeurtenissen worden hier getoond. Voor een complete lijst van gebeurtenissen, bekijk de log in de Servers-tab."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr "Gebeurtenissen worden hier getoond. Voor een complete lijst van gebeurtenissen, bekijk het log in de Netwerken-tab."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Laden ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Gebruikers: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Gebruikers verbonden met de huidige server en een schatting van het totale aantal gebruikers."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Up: 0.0 | Down: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Huidige gemiddelde upload- en downloadsnelheden. Indien ingeschakeld geven de getallen tussen haakjes de overhead door client-communicatie aan."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Toont de verbonden status en actieve overdrachten. Rode pijlen geven aan dat u nu niet verbonden bent, gele pijlen geven aan dat u een laag ID (door firewall) hebt en groene pijlen geven aan dat u een hoog ID (het optimale verbindingstype) hebt."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Niet verbonden ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Server nu mee verbonden."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Zoeken"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Naam:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Type"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Lokaal"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Globaal"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Uitgebreide parameters"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filters"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Bestandstype"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Alles"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Archieven"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Geluid"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr "Schijf images"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Afbeeldingen"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programma's"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Teksten"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Video's"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Uitbreiding"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Min grootte"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "KiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "MiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "GiB"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Max grootte"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Beschikbaarheid"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filter:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filter resultaat"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filter"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Resultaat omkeren"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Verberg bekende bestanden"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr "Filters Resetten"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Start"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Meer"
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "Uitbreiden"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
-msgstr ""
+msgstr "Vraag Kad-peers die al hebben geantwoord om de zoekopdracht te verbreden. Elke klik bevraagt de eerstvolgende dichtstbijzijnde peer voor meer contacten (KADEMLIA_FIND_VALUE_MORE), waardoor extra bestandsresultaten worden gevonden die het initiële alpha-front van de zoekopdracht heeft gemist."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Stop"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Download"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Download in categorie"
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "Zoekresultaten Leegmaken"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Velden leegmaken"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Resultaten"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Verwijdert complete downloads"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filter:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Bestandsbronnen:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Algemeen"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Volledige naam :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/B"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Volledige Naam"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met-Bestand"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met-Bestand :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Bestandsgrootte :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Deelbestandstatus :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Laatst compleet gezien :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Bestandsgrootte"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Overdracht"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Gevonden bronnen :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Bronnen overdragen :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Bestandsdeel-teller :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Beschikbaar :"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Datasnelheid :"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Actieve downloadtijd: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Overgedragen :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Volledige grootte :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Deelbestandstatus"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Laatst compleet gezien"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Gevonden Bronnen"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Bronnen Overdragen"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Bestandsdeel-Teller"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Beschikbaar"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Gegevenssnelheid"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Actieve Downloadtijd"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Voltooide Grootte"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligente corruptieafhandeling (I.C.H.)"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Verloren door beschadiging :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Gewonnen door compressie :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Pakketten gered door I.C.H. :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Verloren door beschadiging"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Gewonnen door comprimering"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Pakketten gered door I.C.H."
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr "Delen"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Aanvragen"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Geaccepteerde aanvragen"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Overgebrachte gegevens"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Deelverhouding"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Complete bronnen"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "Gedeeld sinds"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "Laatste upload"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr "Media-informatie"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "Lengte"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "Codec"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "Artiest"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "Album"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Titel"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Bestandsnamen"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Neem over"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Opruimen"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Geef bestand commentaar/waardering (tekst is zichtbaar voor alle gebruikers)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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."
@@ -3118,1143 +4180,1239 @@
 "Voor een film kunt iets zeggen over de lengte, het verhaal, de taal ...\n"
 "en als het nep is kunt u dat vertellen aan de andere gebruikers van aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Bestandskwaliteit"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Niet beoordeeld"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Onbruikbaar / beschadigd / nep"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Matig"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Redelijk"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Goed"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Uitstekend"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Kies de bestandswaardering of adviseer gebruikers als het bestand ongeldig is ..."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "Ophalen van Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Verversen"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Downloaden, even geduld..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Onbekende grootte"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Benodigde informatie"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP-adres :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Poort :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Poort"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Extra informatie"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Gebruikersnaam :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Gebruikershash :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Gebruikershash"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Downloadsnelheid"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Huidige"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Lopende gemiddelde"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Sessie gemiddelde"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Uploadsnelheid"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Verbindingen"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Actieve downloads"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Actieve verbinding (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Actieve uploads"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Statistiekenboom"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Gebruikersnaam:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Gebruikershash:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Client software:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Client versie:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP-adres:"
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "Gebruikers-ID:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Server-IP:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Server-naam:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Maskering:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Client-software"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Clientversie"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "Gebruikers-ID"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Server-IP"
+
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Servernaam"
+
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Verduistering"
+
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr "Protocoluitbreidingen"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Overdrachten naar client"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Huidige aanvraag:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Gemiddelde uploadsnelheid:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Gemiddelde downloadsnelheid:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Geupload (sessie):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Gedownload (sessie):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Geupload (totaal):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Gedownload (totaal):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Huidige aanvraag"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Gemiddelde uploadsnelheid"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Gemiddelde downloadsnelheid"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Geüpload (sessie)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Gedownload (sessie)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Geüpload (totaal)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Gedownload (totaal)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Scores"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "DL/UP-verhouding:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Veilige identiteit:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Wachtrij positie:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Wachtrij score:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Veilige identiteit"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Wachtrijpositie"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Wachtrijscore"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Bijnaam"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - de multi-platform Mule"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Taal: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "De vertraging voordat tooltips worden getoond."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Dit specificeert de taal waarin aMule wordt getoond."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Controleer op nieuwe versie bij het starten"
-
-#: src/muuli_wdr.cpp:1218
-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:1225
-msgid "Start aMule automatically when I log in"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
+msgstr "Regelmatig controleren op nieuwe versie"
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr "Als u dit inschakelt, controleert aMule bij het opstarten en eenmaal per dag tijdens het uitvoeren op een nieuwe versie"
 
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
-msgstr ""
+msgstr "Registreert een autostart-item per gebruiker bij het besturingssysteem, zodat aMule bij aanmelden wordt gestart. Als u het aMule-programma verplaatst, start aMule dan handmatig eenmaal opnieuw om het item bij te werken."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr "Maakt aMule de standaardafhandelaar voor ed2k://-koppelingen, zodat het klikken op een dergelijke koppeling in uw browser of bestandsbeheerder deze hier opent."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr "aMule verwerkt alleen eD2k-compatibele magnet-koppelingen (met xt=urn:ed2k:). BitTorrent-magnet-koppelingen worden NIET ondersteund en er op klikken mislukt zonder melding. Als u een BitTorrent-client gebruikt (Transmission, qBittorrent, enz.), laat dit dan uitgeschakeld."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr "Het openen van een collectie zet elke eD2k-link die deze bevat in de wachtrij. Op Windows wordt aMule hierdoor toegevoegd aan de lijst \"Openen met\" en wordt het alleen de standaard als geen ander programma het bestandstype heeft geclaimd."
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Start geminimaliseerd"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 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:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Vraag bevestiging bij afsluiten"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Laat aMule om bevestiging vragen alvorens af te sluiten."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Schakel systeemvak-pictogram in"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Dit schakelt het systeemvak (of taakbalk) pictogram in/uit."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Verberg applicatievenster wanneer op de sluitknop wordt geklikt"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimaliseer naar systeemvak"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Deze optie zorgt er voor dat aMule geminimaliseerd wordt naar het systeemvak, i.p.v. naar de taakbalk."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "Toon een melding wanneer een download klaar is"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "Wanneer dit ingeschakeld is zal aMule een melding tonen wanneer een download klaar is."
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr "Zoekgeschiedenis onthouden"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr "Houdt een vervolgkeuzelijst bij van uw eerdere zoektermen in het veld Naam van het tabblad Zoeken. Dit onthoudt de zoekopdrachten die u hebt getypt, niet de resultaten die deze opleverden."
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Tooltip vertragingstijd: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "seconden"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Browserselectie"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Voer hier uw browsernaam in. Laat dit veld leeg om de standaardbrowser van uw systeem te gebruiken."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Bladeren"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Open in nieuw tabblad indien mogelijk"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Open de webpagina, indien mogelijk, in een nieuw tabblad in plaats van in een nieuw venster"
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Videospeler"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Bandbreedtegrenzen"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Slot-toewijzing"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Poorten"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Standaard TCP-poort "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "UDP-poort voor server aanvragen (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Uitgebreide UDP-poort (Kad / globaal zoeken) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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-netwerk"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Schakel UPnP voor router portforwarding in"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnP TCP-Poort (optioneel):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Bind lokaal adres aan IP (laat leeg voor elk):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr "Bind aan netwerkinterface (laat leeg voor elk):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr "Alleen voor gevorderde gebruikers: bind al het verkeer van aMule aan één netwerkinterface, gekozen uit de lijst of ingevoerd op naam (bijv. tun0, eth0, en0) of index. In tegenstelling tot binden aan een IP-adres voorkomt dit dat verkeer via de standaardroute weglekt - nuttig bij een VPN. Vereist geen verhoogde rechten."
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Max bronnen per bestand aan het downloaden:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Max gelijktijdige verbindingen:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Autoverbind bij het opstarten"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Verbind opnieuw bij verbroken verbinding"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Verwijder dode server na"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr "Statische servers worden nooit verwijderd, zelfs niet als ze onbereikbaar zijn."
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "pogingen"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Auto-update serverlijst bij het opstarten"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lijst"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Update serverlijst bij het verbinden met een server"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Update serverlijst wanneer een client verbindt"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Gebruik prioriteitssysteem"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Gebruik slimme laag-ID controle bij verbinden"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Veilig verbinden"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Autoverbind alleen met servers in statische lijst"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Zet handmatig toegevoegde servers op hoge prioriteit"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Intelligente corruptieafhandling (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Inschakelen"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr "Geavanceerde I.C.H. vertrouwt elke hash (niet aanbevolen)"
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Voeg bestanden aan downloads toe in pauze-modus"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Voeg bestanden aan downloads toe met automatische prioriteit"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Probeer eerste en laatste delen eerst te downloaden"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr "Eindspelmodus: overschakelen naar snellere bronnen voor de laatste blokken"
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Start volgend gepauzeerd bestand als een bestand compleet is"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Uit dezelfde categorie"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "In alfabetische volgorde"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Wijst schijfruimte toe voor nieuwe bestanden"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 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:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr "Nieuwe bestanden als sparse-bestanden maken"
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr "Sparse part-bestanden nemen alleen schijfruimte in voor de delen die al zijn gedownload, zodat vrije ruimte geleidelijk wordt opgebruikt naarmate het bestand wordt aangevuld. Schakel dit uit om in plaats daarvan een gewoon bestand te gebruiken - handig wanneer sparse-bestanden niet worden ondersteund of traag zijn, of wanneer back-up-/deduplicatietools ze slecht verwerken. Geldt alleen wanneer de core op Windows draait; op Linux en macOS zijn part-bestanden hoe dan ook sparse en heeft deze instelling geen effect."
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Stop downloads als de vrije schijfruimte bedraagt "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Voer hier de gewenste min schijfruimte in."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Bewaar 10 bronnen van zeldzame bestanden (<20 bronnen)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Uploads"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Voeg nieuwe gedeelde bestanden toe met automatische prioriteit"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Doelmap voor downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Intelligente corruptieafhandling (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Inschakelen"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Geavanceerde I.C.H. vertrouwt elke hash (niet aanbevolen)"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr "Uitlezen van media-metadata"
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "Lengte/bitrate/codec uitlezen uit gedeelde audio- en videobestanden"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr "Indien ingeschakeld voert aMule ffprobe uit op elk gedeeld mediabestand om de kolommen Lengte/Bitrate/Codec in te vullen die andere clients zien wanneer ze het bestand vinden in een zoekopdracht. Vereist dat ffmpeg (het programma ffprobe) is geïnstalleerd."
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr "Pad naar ffprobe:"
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr "Volledig pad naar het ffprobe-programma. Laat leeg om aMule dit automatisch te laten detecteren bij het opstarten."
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr "Detecteren"
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr "Zoek naar een ffprobe-programma op de standaard installatielocaties en vul het padveld in."
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
+"Voltooide downloads worden hier opgeslagen. Alle bestanden in deze map worden automatisch gedeeld met andere peers.\n"
+"Als deze map ook bestanden bevat die u niet wilt delen, wijs dan een submap aan die alleen voor aMule wordt gebruikt."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
-msgstr ""
-
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Map voor tijdelijke downloadbestanden"
+msgstr "Kies de map waarin voltooide downloads worden opgeslagen. Alle bestanden in die map worden gedeeld met andere peers."
 
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "Gedeelde mappen"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr "(Mappen gedeeld door de kern. Voer een pad in om er een toe te voegen.)"
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr "Absoluut pad van een map op de machine van de kern, bijv. /home/user/shared"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr "Recursief"
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr "Deel elke submap onder deze map, inclusief later aangemaakte submappen."
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Verwijder"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Rechtermuisklik op mappictogram om recursief te delen)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Deel verborgen bestanden"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
-msgstr ""
+msgstr "Gedeelde mappen automatisch opnieuw scannen op wijzigingen"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
-msgstr ""
+msgstr "Symbolische koppelingen in gedeelde mappen volgen"
+
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr "Bestanden uitsluiten die overeenkomen met:"
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr "Jokertekenpatronen gescheiden door '|', bijv. .DS_Store|Thumbs.db|*.tmp. Bestanden waarvan de naam overeenkomt, worden niet gedeeld. Overeenkomst is niet hoofdlettergevoelig."
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr "Patronen zijn reguliere expressies"
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr "Indien ingeschakeld, is het volledige veld één reguliere expressie ('|' is alternatie). Indien uitgeschakeld, is het een lijst van door '|' gescheiden jokertekens."
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr "Toon hoeveel gedeelde bestanden het huidige patroon zou uitsluiten."
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr "Wanneer de bestanden van de kern op een ander apparaat bestaan, breng een kaartvoorvoegsel dit rapporteert hoe dat bestamdssysteem bereikbaar is vanaf hier (een netwerklocatie, bijvoorbeeld) waardoor \"Open\" en \"Toon in map\" werken."
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr "Pad Kaarten"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr "Extern voorvoegsel"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr "Een pad voorvoegsel zoals de kern het rapporteert, b.v.b. /home/user/downloads/incoming"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr "Lokaal voorvoegsel"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr "Wanneer diezelfde map bereikbaar is vanaf deze computer, b.v.b. een gemonteerde netwerklocatie"
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafieken"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Update-vertraging : 5 seconden"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Tijd voor gemiddeldengrafiek: 100 minuten"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Schaal verbindingengrafiek: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Schaal downloadgrafiek:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Schaal uploadgrafiek:"
 
-#: src/muuli_wdr.cpp:1660
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Kleuren: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Achtergrond"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Raster"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Huidige download"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Lopend gemiddelde download"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Sessie gemiddelde download"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Huidige upload"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Lopend gemiddelde upload"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Sessie gemiddelde upload"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Actieve verbindingen"
 
-#: src/muuli_wdr.cpp:1675
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
-msgstr "Systeemvak-pictogram met snelheidsbalk"
+msgstr "Snelheidsbalk systeemvakpictogram"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Kad-nodes huidig"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Kad-nodes draaiende"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Kad-nodes sessie"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Selecteer"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Boom"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Aantal getoonde client-versies (0=onbegrensd)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! WAARSCHUWING !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Max nieuwe verbindingen / 5 seconden"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr "Gelijktijdige Kad-bronopzoekingen"
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr "Interval voor Kad-bron-herzoekopdracht (minuten)"
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr "Interval voor opnieuw bevragen van bronnen (minuten)"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Grootte van bestandsbuffer : 240000 bytes"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr "MMAP gebruiken: memory-mapped bestandstoegang (lager geheugengebruik)"
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr "Koppelt deelbestanden aan het geheugen in plaats van ze te bufferen op de heap, wat de geheugenvoetafdruk van het proces verlaagt. Kan de downloadsnelheid op sommige schijven verlagen; het beste voor hosts met beperkt geheugen of veel uploadverkeer."
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Grootte van uploadwachtrij: 5000 clients"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Server-verbinding verversingsinterval: Uitschakelen"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Schakel standby-modus van computer uit"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Gebruik skin: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Toon \"Snelle eD2k-links afhandelaar\" in elk venster."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Geef uitgebreide informatie weer op categorie-tabs"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Toon applicatieversie op titel"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Toon overdrachtsnelheden op titel"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Voor applicatienaam"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Na applicatienaam"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Toon overhead bandbreedte"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Verticale knoppenbalk"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr "Live kolomsortering (rijen automatisch herordenen wanneer hun waarden veranderen)"
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Downloadwachtrij bestanden"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Toon voortgangspercentage"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Toon voortgangsindicator"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plat"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Rond"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Auto-sorteer bestanden (hoog CPU-gebruik)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule zal de kolommen in uw downloadlijst automatisch sorteren"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Externe verbinding parameters"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Accepteer externe verbindingen"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP van de luisterende interface:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "TCP-poort:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Schakel UPnP portforwarding van de EV-poort in"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr "Vereis versleutelde verbindingen (weigert clients die niet kunnen versleutelen)"
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr "Parameters van de aMule API-server"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr "amuleapi (REST API) uitvoeren bij opstarten"
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "HTTP-poort:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr "De interface waarop de HTTP-server van amuleapi luistert. 127.0.0.1 (standaard) accepteert alleen lokale verbindingen; gebruik 0.0.0.0 of een specifiek IP-adres om deze bloot te stellen aan andere hosts (stel hieronder een beheerderswachtwoord in)."
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr "Typ een wachtwoord om het in te stellen of te wijzigen. Opgeslagen wachtwoorden kunnen niet worden weergegeven, dus als u dit leeg laat, blijft het huidige wachtwoord behouden."
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "Beheerderswachtwoord"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "Er is een wachtwoord ingesteld."
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "Gasttoegang inschakelen"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr "Gastsessies kunnen status en lijsten lezen, maar kunnen niets wijzigen. Als u dit uitschakelt, wordt het opgeslagen gastwachtwoord gewist."
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "Gastwachtwoord"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Webserver parameters"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "Start webserver bij het opstarten"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr "Webserver uitvoeren bij opstarten (verouderd)"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Web-template"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Alle rechten wachtwoord"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Schakel gebruiker met beperkte rechten in"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Beperkte rechten wachtwoord"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Schakel UPnP portforwarding van de webserver-poort in"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Web server UPnP TCP-poort (optioneel)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Pagina verversingstijd (in seconden)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Schakel Gzip-compressie in"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr "Pagina terugzetten naar standaardwaarden"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr "Zet de instellingen op de huidige pagina terug naar hun standaardwaarden."
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Klik hier om de veranderingen gemaakt in de voorkeuren toe te passen."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Maak veranderingen aan de voorkeuren ongedaan."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Titel :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Commentaar :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Binnenkomende map :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Verander prioriteit voor nieuw toegevoegde bestanden :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Binnenkomende Map"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Verander prioriteit voor nieuw toegewezen bestanden"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Niet veranderen"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Selecteer kleur voor deze categorie (nu geselecteerd) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Leegmaken"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Selecteer kleur voor deze Categorie (nu geselecteerd)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Klik op deze knop om het logboek te wissen."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Server-lijst"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Voeg server handmatig toe: Naam"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Voer hier de naam van de nieuwe server in"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Poort"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Voer hier de poort van de server in."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule log"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Server-info"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2K-info"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kad info"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nodes (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Nodes stats"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Bootstrap"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nieuwe node"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Poort:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "Bootstrap van bekende clients"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Verbreek verbinding met Kad"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr "Bootstrap van node: IP"
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Voer hier het IP van de node in, gebuik het x.x.x.x formaat."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Gebruik beveiligde gebruikersidentificatie"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protocol-obfuscatie"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Ondersteun protocol-obfuscatie"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Deze optie schakelt Protocol Obfuscatie in, en zorgt er voor dat aMule geobfusceerde verbindingen van andere clients accepteert."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Gebruik obfuscatie voor uitgaande verbindingen"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Deze optie zorgt er voor dat aMule protocol-obfuscatie gebruikt bij het verbinden met andere clients/servers."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Accepteer alleen geobfusceerde verbindingen"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "Deze optie zorgt er voor dat aMule alleen geobfusceerde verbindingen accepteert. U heeft minder bronnen, maar al uw verkeer is geobfusceerd"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Iedereen"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Niemand"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Wie kan mijn gedeelde bestanden zien:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP-filteren"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filter clients"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filter servers"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Lijst opnieuw laden"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Update nu"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Auto-update ip-filter bij het starten"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Niveau van filteren:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Filter LAN IPs altijd"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoïde behandeling van niet-kloppende IPs"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Weigert een pakket als het client-IP anders is dan het IP waar het pakket van is ontvangen. Wees voorzichtig hiermee."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr "Negeert een pakket wanneer het bron-IP-adres afwijkt van het IP-adres dat de client claimt (een anti-spoofingcontrole). Alleen uitschakelen als dit verbindingsproblemen veroorzaakt."
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Gebruik systeemwijd ipfilter.dat indien beschikbaar"
 
-#: src/muuli_wdr.cpp:2441
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
-msgstr "Indien er geen lokaal ipfilter.dat gevonden wordt, sta gebruik van een systeemwijd ipfilter toe."
+msgstr "Als er geen lokaal ipfilter.dat wordt gevonden, gebruik van een systeembreed ipfilter-bestand toestaan."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Schakel online handtekening in"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Update-frequentie (seconden):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 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:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Bewaar online-handtekeningbestand in: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "Klik hier om de map te selecteren die de online-handtekening-bestanden bevat."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Toon landenvlaggen voor clients"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
-msgstr ""
+msgstr "Toon de kolom met landvlag in de overzichten voor overdrachten, wachtrij en zoeken. Vereist een geldige MMDB GeoIP-database (zie hieronder)."
 
-#: src/muuli_wdr.cpp:2520
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Database"
-msgstr "Datasnelheid :"
+msgstr "Database"
 
-#: src/muuli_wdr.cpp:2536
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Source:"
-msgstr "Bronnen"
+msgstr "Bron:"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
-msgstr ""
+msgstr "DB-IP (gratis, geen account nodig)"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
-msgstr ""
+msgstr "MaxMind GeoLite2 (gratis, account vereist)"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
-msgstr ""
+msgstr "Aangepaste URL"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
-msgstr ""
+msgstr "Kies welke provider de GeoIP MMDB-database levert. DB-IP is de standaardoptie - geen account vereist. MaxMind vereist een gratis account + licentiesleutel. Gebruik Aangepaste URL om naar een andere MMDB-host te verwijzen (bijv. een lokale spiegelserver)."
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
 "IP-to-Country data by DB-IP.com - https://db-ip.com\n"
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
+"Geen configuratie vereist.\n"
+"\n"
+"IP-naar-land-gegevens door DB-IP.com - https://db-ip.com\n"
+"Licentie: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
-msgstr ""
+msgstr "Licentiesleutel:"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4263,520 +5421,590 @@
 "License: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
+"Meld u aan voor een gratis MaxMind-account en genereer vervolgens een licentiesleutel:\n"
+"https://www.maxmind.com/en/geolite2/signup\n"
+"\n"
+"Dit product bevat GeoLite2-gegevens gemaakt door MaxMind - https://www.maxmind.com\n"
+"Licentie: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
+"Vereist bronvermelding en accountregistratie; ten minste elke 30 dagen vernieuwen."
 
-#: src/muuli_wdr.cpp:2595
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
-msgstr "Download: "
+msgstr "Download-URL:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
+"Moet verwijzen naar een .mmdb-bestand of een .gz-/.tar.gz-bestand dat er een bevat.\n"
+"De URL kan mogelijk inloggegevens bevatten (https://user:pass@host/...).\n"
+"Licentie- en bronvermeldingsvoorwaarden worden bepaald door de bron-URL - u bent hiervoor verantwoordelijk."
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
-msgstr ""
+msgstr "Download de GeoIP-database van de geselecteerde bron."
 
-#: src/muuli_wdr.cpp:2616
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
-msgstr "Auto-update ip-filter bij het starten"
+msgstr "Automatisch bijwerken bij opstarten"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
-msgstr ""
+msgstr "Download de GeoIP-database opnieuw van de geselecteerde bron telkens wanneer aMule wordt gestart."
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filter binnenkomende berichten (behalve huidige chat):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filter alle berichten"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Filter berichten van mensen niet op uw vriendenlijst"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filter berichten van onbekende clients"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filter berichten met (gebruik ',' als scheiding):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Toon ontvangen berichten in het logboek"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Commentaren"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filter commentaren die de volgende tekens bevatten (gebruik ',' als scheiding):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Schakel aanmelding in"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Schakel gebruikersnaam/wachtwoord aanmelding in/uit"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Gebruikersnaam: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "De gebruikersnaam is nodig om te verbinden met de proxy"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Het wachtwoord nodig om te verbinden met de proxy"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Schakel proxy in"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Schakel proxy ondersteuning in/uit"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Proxy-type:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Proxy-host:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Proxytype"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Proxyhost"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "De proxy hostnaam"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Proxy-poort:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Proxypoort"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "De proxy poort"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Schakel aanmelding in"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Schakel gebruikersnaam/wachtwoord aanmelding in/uit"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "De gebruikersnaam is nodig om te verbinden met de proxy"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Het wachtwoord nodig om te verbinden met de proxy"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Verbind met:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Inloggen op amule op afstand"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Gebruikersnaam"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Onthoud deze instellingen"
 
-#: src/muuli_wdr.cpp:2766
-#, fuzzy
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "Versleutel de verbinding (aanbevolen)"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
-msgstr "Gebruik Gzip-compressie"
+msgstr "ZLIB-compressie forceren"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Schakel uitgebreide foutopsporing en logboek in."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Alleen naar logbestand"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Berichtcategorieën:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Wachtend..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Voeg geïmporteerden toe"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Probeer geselecteerde opnieuw"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Verwijder geselecteerde"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Gebeurtenistypes"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Actieve uploads"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Procent van alle bestanden"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Toon clients voor"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Geselecteerde bestanden"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Alleen actieve uploads"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Toon clients voor"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Opnieuw laden:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Laad uw gedeelde bestanden opnieuw"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Verstuur"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Verstuurt het opgegeven bericht."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Sluit deze chat-sessie."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Verbind met een server en/of Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "Annuleer %s"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Gedeelde bestanden"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "Verbreek verbinding %s"
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "Verbind %s"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Uitgeschakeld %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
 msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "TiB"
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/sec"
 msgstr1 "bytes/sec"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "MiB/s"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "seconden"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "minuten"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "uren"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Dagen"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "dagen"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "alle"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "alle anderen"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Incompleet"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Archief"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Tekst"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Actief"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Gebruikte configdir: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr "Deze bron heeft het deel niet"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr "U en deze bron hebben het deel allebei"
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr "Wordt nu vanuit deze bron gedownload"
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr "Het volgende deel dat van deze bron gevraagd zal worden"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr "Deze bron heeft het deel en u heeft het nog nodig"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr "Deze peer heeft het deel al"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr "Deze peer heeft het deel niet"
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr "Geen andere bronnen hebben dit deel"
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr "Één andere bron heeft dit deel"
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr "%u of meer andere bronnen hebben dit deel"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr "Al teruggelezen en gehashed"
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr "Nog te lezen"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr "Één blok per deel van het bestand dat wordt gedownload."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr "Één blok per deel van het gedeelde bestand."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Één blok per deel van het gedeelde bestand, gekleurd op basis van hoeveel bronnen het hebben."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Één blok per deel van het gedeelde bestand, tonend hoe ver de re-hash gelezen heeft."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr "Er tussenin, wordt donkerder als andere bronnen worden toegevoegd"
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Wachten tot deelbestand-conversiethread sterft..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Bezig met importeren van %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Tijdelijke map wordt gelezen"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Basisinformatie van download infobestand wordt opgehaald"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Doelbestand wordt aangemaakt"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Data van oud downloadbestand wordt geladen (%u van %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "Data-blok wordt bewaard in nieuw enkel downloadbestand (%u van %u)"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Bron downloadbestand informatie wordt opgehaald"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Download wordt toegevoegd en nieuw deelbestand bewaard"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importeer deelbestanden"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Status"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Bestandshash"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Schijf: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "Kies een map om te doorzoeken naar tijdelijke downloads! (onderliggende mappen worden meegenomen)"
 
-#: src/PartFileConvertDlg.cpp:208
-#, fuzzy
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
-msgstr "Wilt u dat de bronbestanden van succesvol geïmporteerde bestanden verwijderd worden?"
+msgstr "Wilt u dat de bronbestanden van succesvol geïmporteerde downloads worden verwijderd?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Verwijder bronnen?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "FOUT: Kon deelbestand niet aanmaken"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, 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:409
+#: src/PartFile.cpp
 #, 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:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "FOUT: Ongeldige part.met bestandsversie: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
-msgstr "FOUT: %s (%s) is beschadigd (verkeerde tags: %s), kan bestand niet laden."
+msgstr "Fout: %s (%s) is beschadigd (verkeerde tags: %s), kan bestand niet laden."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, 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:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Poging om bestandsinfo te herstellen..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Alle beschikbare bestandsinfo hersteld :D - Poging om het te gebruiken..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Kon bestandsinfo niet herstellen :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Kon %s (%s) niet openen"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "WAARSCHUWING: %s is mogelijk beschadigd (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "FOUT bij het bewaren van deelbestand: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "IO-fout bij het bewaren van deelbestand: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
-msgstr ""
+msgstr "0/onbekend aantal bytes geschreven naar '%s' -- bestaand .part.met wordt behouden."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "%i bron seed voor deelbestand bewaard: %s (%s)"
 msgstr1 "%i bron seeds voor deelbestand bewaard: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Kan seed-bestand voor deelbestand niet lezen: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "Fout bij het lezen van deelbestands seeds-bestand (%s - %s): %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Beschadigd deel (%d) gevonden in %d deelbestand %s - FileResultHash |%s| FileHash |%s|"
 msgstr1 "Beschadigd deel (%d) gevonden in %d delen bestand %s - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Compleet deel (%i) gevonden in %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Klaar met opnieuw hashen %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Onverwachte fout tijdens het voltooien van %s. Bestand gepauzeerd"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Klaar met downloaden: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4785,307 +6013,153 @@
 "Klaar met downloaden:\n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Verwijderen van bestand: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "WAARSCHUWING: Kan gedownload deel niet hashen - incomplete hashset voor '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "FOUT: Kan gedownload deel niet hashen - hashset incompleet (%s). Dit zou nooit mogen gebeuren"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
-msgstr ""
+msgstr "Deel %u van '%s' als voltooid gemarkeerd, maar het partbestand is korter dan verwacht (%llu bytes aanwezig, %llu nodig); hiaat wordt heropend voor opnieuw downloaden."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "EOB bij het hashen van gedownload deel %u met lengte %u (max %u) van deelbestand '%s' met lengte %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "WAARSCHUWING: Niet voldoende vrije schijfruimte! Pauzeren van bestand: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Gedownload deel %i is beschadigd in bestand: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Toewijzen"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Onvoldoende schijfruimte"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Gedownload"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "FOUT: Kon deelbestand '%s' niet openen"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Systeemstandaard"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanees"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr "Uitgebreide bronuitwisseling"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr "NAT traversal (uTP)"
+
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr "Buddygegevensopvraag"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr "NAT traversal (QUIC)"
 
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabisch"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturisch"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baskisch"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgaars"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Catalaans"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Chinees (Vereenvoudigd)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Chinees (Traditioneel)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Kroatisch"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Tsjechisch"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Deens"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Nederlands"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Engels (V.K.)"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Engels (V.K.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estonisch"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Fins"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Frans"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Gallisch"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Duits"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grieks"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebreeuws"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Hongaars"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italiaans"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italiaans (Zwitsers)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japans"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Koreaans"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Litouws"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Noors"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Pools"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugees"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugees (Braziliaans)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Roemeens"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Russisch"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Sloveens"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spaans"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Zweeds"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turks"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Oekraïens"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Verander taal"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Er zijn geen vertalingen voor aMule geïnstalleerd"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Geen talen beschikbaar"
-
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "geen opties beschikbaar"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr "Ongeldige padenkaart gevonden, wordt overgeslagen"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Ongeldige categorie gevonden, wordt overgeslagen"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Standaard poort zal worden gebruikt (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Verbinding"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Mappen"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Servers"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Bestanden"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Beveiliging"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interface"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
-msgstr ""
+msgstr "IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filters"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Besturing op afstand"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Online handtekening"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Gebeurtenissen"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Foutopsporing"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5095,15 +6169,15 @@
 "    %PARTFILE - volledig pad naar het bestand\n"
 "    %PARTNAME - alleen bestandsnaam"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
-msgstr ""
+msgstr "Ondersteuning voor systeemvakpictogram vereist libayatana-appindicator3 tijdens het compileren."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
-msgstr ""
+msgstr "Niet beschikbaar op Wayland: het protocol meldt niet wanneer een venster wordt geminimaliseerd, waardoor deze optie de systeemknop voor minimaliseren niet kan onderscheppen. Workaround: start aMule met `GDK_BACKEND=x11` om in plaats daarvan XWayland te gebruiken."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5119,26 +6193,42 @@
 "aMule zal goed draaien zonder deze instellingen\n"
 "te wijzigen."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Het type proxy waarmee u verbinding maakt"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "Geen wachtwoord ingesteld."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "Gasttoegang vereist een wachtwoord. Typ er een in het veld gastwachtwoord, of schakel Gasttoegang inschakelen uit."
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5146,31 +6236,43 @@
 "aMule moet opnieuw gestart worden om deze veranderingen toe te passen:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP-poort veranderd.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP-poort veranderd.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr "- Binding van netwerkinterface gewijzigd.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Poort voor externe verbinding is veranderd.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Acceptatie voor externe verbinding veranderd.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Interface voor externe verbinding veranderd.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- Ondersteuning voor Protocol-obfuscatie is veranderd.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr "- Proxy instellingen veranderd (nodig voor HTTP-overdracht).\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr "- amuleapi-instellingen gewijzigd.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5178,27 +6280,32 @@
 "Uw Auto-update serverlijst is leeg.\n"
 "'Auto-update serverlijst bij het opstarten' wordt uitgeschakeld."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr "Het amuleapi-wachtwoord kon niet worden opgeslagen: %s"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Taal veranderd.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Tijdelijke map veranderd.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- ED2K-netwerk ingeschakeld.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr "Het uitsluitingspatroon voor gedeelde bestanden is geen geldige reguliere expressie. Het filter is uitgeschakeld gelaten."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "Ongeldige reguliere expressie"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5206,7 +6313,7 @@
 "Zowel het eD2K als het Kad-netwerk zijn uitgeschakeld.\n"
 "U kun niet verbinden tot u minimaal een netwerk inschakelt."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5214,7 +6321,7 @@
 "Kad zal niet starten als uw UDP-poort is uitgeschakeld.\n"
 "Schakel de UDP-poort in of schakel Kad uit."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5224,20 +6331,66 @@
 "U MOET aMule nu opnieuw starten.\n"
 "Als u dat niet doet moet u niet klagen als er iets misgaat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
-msgstr ""
+msgstr "Kon aMule niet registreren voor automatisch starten bij aanmelden. De autostart-opslag is mogelijk alleen-lezen."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
-msgstr ""
+msgstr "Kon het item voor automatisch starten bij aanmelden niet verwijderen."
 
-#: src/PrefsUnifiedDlg.cpp:1098
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
-msgstr "Automatisch verversen gestart"
+msgstr "Automatisch starten"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr "Bestandstype registreren"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr "URL-afhandelaar registreren"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr "aMule verwerkt alleen eD2k-compatibele magnet-koppelingen. Als u de huidige magnet-afhandelaar (%s) vervangt, werken BitTorrent-magnetkoppelingen niet meer - aMule kan geen BitTorrent-inhoud downloaden. Doorgaan?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr "Een andere toepassing opent momenteel .emulecollection-bestanden (%s). Vervangen door aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr "Een andere toepassing is momenteel de standaardafhandelaar voor deze koppelingen (%s). Vervangen door aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "Kon aMule niet registreren voor .emulecollection-bestanden. Het registratieopslag is mogelijk alleen-lezen."
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr "Kon de bestandstyperegistratie niet verwijderen."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "Kon aMule niet registreren als URL-afhandelaar. De registratieopslag is mogelijk alleen-lezen."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr "Kon de registratie van de URL-afhandelaar niet verwijderen."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "De webserver en de aMule API vereisen dat externe verbindingen zijn ingeschakeld."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr "De aMule-webserver is verouderd. Overweeg in plaats daarvan de aMule API uit te voeren."
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5247,41 +6400,64 @@
 "Vul 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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Tijdelijke bestanden"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Binnenkomende bestanden"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Online handtekeningen"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Kies een map voor %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Zou %u gedeeld bestand uitsluiten van %u"
+msgstr1 "Zou %u gedeelde bestanden uitsluiten van %u"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Blader naar videospeler"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Selecteer browser"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr "Selecteer ffprobe-programma"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Uitvoerbare%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr "ffprobe niet gevonden in PATH of op de standaard installatielocaties. Installeer ffmpeg (dat ffprobe bevat) of gebruik Bladeren om handmatig een programma te selecteren."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr "Instellingen op deze pagina terugzetten naar hun standaardwaarden?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr "Terugzetten naar standaardwaarden"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Bewerk serverlijst"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5289,1216 +6465,1460 @@
 "Voeg hier URL's toe om server.met bestanden te downloaden.\n"
 "Slechts één url per regel."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
-msgstr ""
+msgstr "IP2Country-update mislukt"
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
-msgstr ""
+msgstr "Gegevens door MaxMind GeoLite2"
 
-#: src/PrefsUnifiedDlg.cpp:1568
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
-msgstr "Complete bronnen"
+msgstr "Aangepaste bron"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
-msgstr ""
+msgstr "Gegevens door DB-IP.com"
 
-#: src/PrefsUnifiedDlg.cpp:1590
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Status: Loaded%s"
-msgstr "Status:"
+msgstr "Status: Geladen%s"
 
-#: src/PrefsUnifiedDlg.cpp:1593
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Status: Loaded%s - %s"
-msgstr "Status:"
+msgstr "Status: Geladen%s - %s"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
-msgstr ""
+msgstr "Status: Laden mislukt - klik op 'Nu bijwerken' om te vernieuwen."
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
-msgstr ""
+msgstr "Status: Niet gevonden - klik op 'Nu bijwerken' om te downloaden."
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Update-vertraging: %d seconde"
 msgstr1 "Update-vertraging: %d seconden"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Tijd voor gemiddeldengrafiek: %d minuut"
 msgstr1 "Tijd voor gemiddeldengrafiek: %d minuten"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Schaal verbindingengrafiek: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Grootte van bestandsbuffer: %d byte"
 msgstr1 "Grootte van bestandsbuffer: %d bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Grootte van uploadwachtrij: %d client"
 msgstr1 "Grootte van uploadwachtrij: %d clients"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Server-verbinding verversingsinterval: %d minuut"
 msgstr1 "Server-verbinding verversingsinterval: %d minuten"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Server verbinding verversingstijd: Uitgeschakeld"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "uitgeschakeld"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Voer commando uit bij gebeurtenis '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Schakel uitvoeren van commando's in kern in"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Kerncommando:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Schakel uitvoeren van commando's in GUI in"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "GUI commando:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "De volgende variabelen worden vervangen:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
+"De volgende mappen lijken systeem- of gevoelige locaties te zijn:\n"
+"\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
-msgstr ""
+msgstr "Als u ze recursief deelt, wordt elk bestand daaronder gepubliceerd op de eD2k/Kad-netwerken. Wilt u dit echt doen?"
 
-#: src/PrefsUnifiedDlg.cpp:1959
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
-msgstr "Gedeelde mappen"
+msgstr "Gedeelde mappen bevestigen"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-#, fuzzy
-msgid "Reloading shared files…"
-msgstr "Laad uw gedeelde bestanden opnieuw"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
+msgstr "Gedeelde bestanden opnieuw laden..."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
+msgstr "Scannen naar submappen..."
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:1994
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
-msgstr "Gedeelde mappen"
+msgstr "Gedeelde mappen bijwerken"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
-msgstr ""
+msgid "Scanned %u directories..."
+msgstr "%u mappen gescand..."
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Laad gedeelde-bestandenlijst opnieuw."
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr "Gedeelde map"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr "Zowel de externe als de lokale voorvoegsels moeten worden ingevuld."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr "Dit externe voorvoegsel is al in kaart gebracht."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr "Kies de lokale map"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "Zoekgeschiedenis Legen"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr "De opgeslagen zoekgeschiedenis legen? Dit kan niet ongedaan worden gemaakt."
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Zoekwaarschuwing"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "Er kan niet gezocht worden wanneer eD2k en Kademlia uitgeschakeld zijn."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "Fout tijdens zoeken"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
+"Een eD2k-zoekopdracht loopt nog. Door een nieuwe te starten stopt deze vorige, omdat het eD2k-protocol slechts één zoekopdracht tegelijkertijd toestaat.\n"
+"\n"
+"Gevonden resultaten worden behouden; nieuwe resultaten komen niet meer binnen.\n"
+"\n"
+"Alsnog de nieuwe zoekopdracht starten?"
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr "Zoekopdracht in uitvoering"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Zoekwaarschuwing"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Standaard"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad-zoekopdracht kan niet worden uitgevoerd als Kad niet draait"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr "Sla alleen de %u meest recente van de %u open zoekopdrachten op in %s."
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr "Sla alleen se eerste %u van %u resultaten van zoekopdracht \"%s\" op."
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "WAARSCHUWING: Opgeslagen zoeklijst beschadigd, bevat ongeldige header."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Ongeldige vermelding in opgeslagen zoeklijst, bestand kan beschadigd zijn"
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr "eD2K-zoekopdracht kan niet worden uitgevoerd als eD2K niet draait"
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "Geen zoekwoord opgegeven voor zoeken in Kad - afbreken"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Onverwachte fout bij Kad-zoekopdracht: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "Bestands-ID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr "Time-out van zoekopdracht: de server antwoordde niet."
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr ""
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Kad-zoekopdracht: bredere resultaten opgevraagd bij nog een peer."
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Niet beoordeeld"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Kad-zoekopdracht: geen peer meer beschikbaar om opnieuw te bevragen voor meer resultaten (limiet bereikt of nog geen reacties)."
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr ""
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "Fout %u: %s\n"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Download in categorie"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "Bestands-ID"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Verkrijg %s voor dit bestand"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "Vouw alles uit"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "Vouw alles in"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Zoek gelijkwaardige bestanden (eD2k, lokale server)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Markeer als bekend bestand"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Kopieer eD2k-link naar klembord"
 
-#: src/SearchListCtrl.cpp:811
-#, fuzzy
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopieer eD2k-links naar klembord"
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
-msgstr "U bent verbonden met de server die u probeert te verwijderen. Vebreek eerst de verbinding."
+msgstr "U bent momenteel niet verbonden met een server die de zoekfunctie voor Gerelateerde Bestanden ondersteunt"
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Geannuleerd"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Nieuw"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr "Draaiend"
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "voltooid"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr "inactief"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr "Zoekopdracht %u: %s, %u %% (%u resultaten)\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr "Zoekopdracht %u \"%s\": %s, %u %% (%u resultaten)\n"
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr "Zoekopdracht verlopen of onbekende ID. Start een nieuwe zoekopdracht.\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Voortgang zoeken: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Voortgang zoeken niet beschikbaar"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr "Geen zoekopdrachten om over te rapporteren.\n"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Kon geen verbinding maken met alle vermelde geobfusceerde statische servers. Er wordt nog een poging gedaan zonder obfuscatie."
+
+#: src/ServerConnect.cpp
 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."
+msgstr "Kon niet verbinden met alle vermeldde geobfusceerde servers. Nogmaals proberen zonder obfuscatie."
 
-#: 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
+msgid "Failed to connect to all static servers listed."
+msgstr "Verbinden met alle statische servers in de lijst mislukt."
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr "Verbinden met alle server in de lijst mislukt."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Automatische verbinding naar server zal in %d seconde opnieuw proberen"
+msgstr1 "Automatische verbinding naar server zal in %d seconden opnieuw proberen"
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Verbonden met %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Verbinding gemaakt met: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Fatale fout bij het proberen te verbinden. Internetverbinding kan uit zijn"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Verbinding verbroken met %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) lijkt dood te zijn."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) lijkt vol te zijn."
 
-#: 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"
-msgstr0 "Automatische verbinding naar server zal in %d seconde opnieuw proberen"
-msgstr1 "Automatische verbinding naar server zal in %d seconden opnieuw proberen"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Verbinding kwijt"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Verbinden met %s (%s:%i) is mislukt."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "FOUT: Socket ongeldig op timeoutcheck"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Poging tot verbinden met %s (%s:%i) gaf timeout."
+msgstr "Poging tot verbinden met %s (%s:%i) gaf time-out."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Te laat resultaat van DNS-lookup ontvangen, wordt genegeerd."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Laden van server.met bestand: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Bestand server.met niet gevonden!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Kon server.met niet openen!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i server in server.met gevonden"
 msgstr1 "%i servers in server.met gevonden"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d server toegevoegd"
 msgstr1 "%d servers toegevoegd"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Fout: het bestand 'server.met' is beschadigd: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "IO- fout bij het lezen van 'server.met': "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "U bent verbonden met de server die u probeert te verwijderen. Vebreek eerst de verbinding."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Kon '%s' niet openen"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Kon server.met niet opslaan!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "IO-fout bij het schrijven van 'server.met': %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Ongeldige URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Downloaden van serverlijst vanaf %s voltooid"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Geen serverlijstadres gevonden in 'addresses.dat'. Plaats een geldig serverlijstadres in dit bestand om uw serverlijst automatisch te updaten"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Begin downloaden serverlijst van %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Kon serverlijst niet downloaden van %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "De lokale server wordt door de IP-filters weggefilterd, er wordt verbonden met een andere server!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "Server-naam"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adres"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Poort"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Gebruikers"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "Max Gebruikers"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Statisch"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versie"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr "Zachte Bestanden"
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr "Harde Bestanden"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
-msgstr ""
+msgstr "TCP-vlaggen"
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
-msgstr ""
+msgstr "UDP-vlaggen"
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "U bent verbonden met een server die u probeert te verwijderen. Verbreek eerst de verbinding. De server is NIET verwijderd."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Onbekende naam)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "ms"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Servers (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Server"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Verbind met server"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Markeer server als statisch"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Markeer server als niet-statisch"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Markeer servers als statisch"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Markeer servers als niet-statisch"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Verwijder server"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Verwijder servers"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Verwijder alle servers"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopieer eD2k-links naar klembord"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Verbind opnieuw met server"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Weet u zeker dat u alle servers wilt verwijderen?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 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:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Weet u zeker dat u de geselecteerde servers wilt verwijderen?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "FOUT: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "WAARSCHUWING: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
-msgstr ""
+msgstr "Server %s (%s) heeft de aanmelding geweigerd (geen client-ID toegewezen). Verbinding wordt verbroken."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
-msgstr "Nieuwe client-ID is %u"
+msgstr "Nieuwe client-id is %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "WAARSCHUWING: U heeft een laag ID gekregen!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tVoor meer informatie, bekijk https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Onbekende serverinfo ontvangen! - te kort"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "%d nieuwe server ontvangen"
 msgstr1 "%d nieuwe servers ontvangen"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Bewaren van server-lijst compleet."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Server keurde laatste opdracht af"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Fout pakket ontvangen van server: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, 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:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "maakt gebruik van protocol-obfuscatie."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Verbinding wordt gemaakt met %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "aMuleGUI-log"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Server niet toegevoegd: Geen IP of hostnaam opgegeven."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Server niet toegevoegd: Ongeldige server-poort opgegeven."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "eD2k-status:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
-#, fuzzy
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
-msgstr "Verbindingsstatus:"
+msgstr "Verbindingstype:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "Verbonden sinds:"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kademlia Status:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Draaiend in LAN-modus"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Draaiende"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "Kademlia client-ID:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Status:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Verbindingsstatus:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "UDP-verbindingsstatus:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Firewalled status: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "No buddy nodig - TCP-poort open"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "No buddy nodig - UDP-poort open"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Geen buddy"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Aan het verbinden met buddy"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Verbonden met buddy op %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP-adres:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Geïndexeerde bronnen :"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Geïndexeerde zoekwoorden:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Geïndexeerde notities:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Geïndexeerde systeembelasting:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Gemiddelde gebruikers:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Gemiddelde bestanden:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Niet draaiende"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr "Gedeelde map-wachter: back-end overstroming/fout (%s); terugvallen op volledig herladen"
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 "Gedeelde-map wachter: %u nieuwe submap gevonden sinds laatste uitvoering, deelmappen worden opnieuw gescand"
+msgstr1 "Gedeelde-map wachter: %u nieuwe submappen gevonden sinds laatste uitvoering, deelmappen worden opnieuw gescand"
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr "Gedeelde map-wachter: gebeurtenissen zijn door de back-end laten vallen, wat het volledig herladen van de gedeelde bestanden vereist om te hersynchronizeren"
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Bestand %s wordt toegevoegd aan gedeelde bestanden"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "%i bekend gedeeld bestand gevonden"
 msgstr1 "%i bekende gedeelde bestanden gevonden"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "%i bekend gedeeld bestand gevonden, %i onbekend"
-msgstr1 "%i bekende gedeelde bestanden gevonden, %i onbekend"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 "Er is %i bestand uitgesloten van delen door het filter"
+msgstr1 "Er zijn %i bestanden uitgesloten van delen door het filter"
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "FOUT: Poging om %s te delen"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Gedeelde map niet gevonden, wordt overgeslagen: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Geen deelbare bestanden gevonden in map: %s"
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Gedeelde map niet leesbaar, wordt overgeslagen: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Gebruikersnaam"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr "Uitlezen van media-metadata is uitgeschakeld in voorkeuren, dus er is niets om opnieuw uit te lezen."
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Downloadsnelheid"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 "Opnieuw media-metadata aan het uitlezen voor %u gedeeld bestand"
+msgstr1 "Opnieuw media-metadata aan het uitlezen voor %u gedeelde bestanden"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Uploadsnelheid"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "Dit bestand wordt nu gedeeld: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Gestopt met het delen van verwijderd bestand: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Gestopt met delen van %u bestand in verwijderde map: %s"
+msgstr1 "Gestopt met delen van %u bestanden in verwijderde map: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Beschikbare delen"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "%u bestand gevonden in een nieuwe gedeelde map wordt nu gedeeld"
+msgstr1 "%u bestanden gevonden in nieuwe gedeelde mappen worden nu gedeeld"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "%u nieuw gedeeld bestand ontdekt"
+msgstr1 "%u nieuwe gedeelde bestanden ontdekt"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Gebruikersnaam"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr "Delen op Peer"
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Uploadstatus"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Lokale bestandsnaam"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Deelt bestandenlijst"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Aanvragen"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Geaccepteerde aanvragen"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Overgebrachte gegevens"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Deelverhouding"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Ontvangen delen"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Complete bronnen"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr "Bronbeschikbaarheid"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Pad naar map"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Gedeelde bestanden"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Voeg commentaar/waardering toe"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Bewerk commentaar/waardering"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr "Lokale gegevens verifiëren"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr "Opnieuw uitlezen &media-metadata"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Voeg bestanden in verzameling toe aan overdrachtenlijst"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Kopieer magnet &URI naar klembord"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Kopieer eD2k-link naar klembord (&Source)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Kopieer eD2k-link naar klembord (Bron) (&With Crypt options)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Kopieer eD2k-link naar klembord (&Hostnaam)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Kopieer eD2k-link naar klembord (Hostnaam) (Met &Crypt opties)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Kopieer eD2k-link naar klembord (&AICH info)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Kopieer eD2k-link naar klembord (&AICH-info + bron)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr "Exporteer geselecteerde bestanden naar een emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr "Lokale gegevens verifiëren op partbestand wordt momenteel niet ondersteund: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 "Media-metadata: %u incomplete download wordt overgeslagen"
+msgstr1 "Media-metadata: %u incomplete downloads worden overgeslagen"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 "Media-metadata: %u bestand dat geen audio of video is wordt overgeslagen"
+msgstr1 "Media-metadata: %u bestanden die geen audio of video zijn worden overgeslagen"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 "Opnieuw media-metadata uitlezen voor %u bestand?"
+msgstr1 "Opnieuw media-metadata uitlezen voor %u bestanden?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 "%u incomplete download wordt overgeslagen."
+msgstr1 "%u incomplete downloads worden overgeslagen."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 "%u bestand is geen audio of video en zal worden overgeslagen."
+msgstr1 "%u bestanden zijn geen audio of video en zullen worden overgeslagen."
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr "Dit draait in de achtergrond. Voortgang wordt gerapporteerd in het logbestand."
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr "Opnieuw media-metadata uitlezen"
+
+#: src/SharedFilesCtrl.cpp
 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:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr "Exporteer naar emulecollectie"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr "Geen bestanden geselecteerd om te exporteren."
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr "eMule collecties (*.emulecollection)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr "'%s' bestaat al. Wilt u deze overschrijven?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Schrijven van collectiebestand '%s' mislukt."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "%u gedeeld bestand geëxporteerd naar '%s'."
+msgstr1 "%u gedeelde bestanden geëxporteerd naar '%s'."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Totale grootte van Gedeelde Bestanden: %s (%s voltooid)"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Totale grootte van gedeelde bestanden: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Gedeelde Bestanden (%i, er wordt er nog %u gehashed)"
+msgstr1 "Gedeelde Bestanden (%i, er worden er nog %u gehashed)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Gedeelde bestanden (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "PartBestand"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Gedeelde bestanden opnieuw laden: %u bestanden gescand"
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr "Deelstatus"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Bestandsnaam op afstand"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Geuploade data (sessie (totaal)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Totale overhead (pakketten): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Overhead van bestandsaanvraag (Pakketten): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Overhead van bron uitwisseling (Pakketten): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Server overhead (Pakketten): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kad overhead (pakketten): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Crypt overhead (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Actieve uploads: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Wachtende uploads: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Totaal van succesvolle upload-sessies: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Totaal van mislukte upload-sessies: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Gemiddelde uploadtijd: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Gedownloade data (sessie (totaal)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Gevonden bronnen: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Actieve downloads (blokken): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Sessie UL:DL verhouding (totaal): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Gemiddelde downloadsnelheid (Sessie): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Gemiddelde uploadsnelheid (Sessie): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Max downloadsnelheid (Sessie): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Max uploadsnelheid (Sessie): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Hernieuwde verbindingen: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Tijd sinds eerste overdracht: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Verbonden met server sinds: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Actieve verbindingen (schatting): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Grens bereikt van max verbindingen: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Gemiddelde verbindingen (schatting): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Aantal piekverbindingen (schatting): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Clients"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Onbekend: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Gefilterd: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Geband: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr "Verbannen Kad-adressen: %s"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Totaal: %i Bekend: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Werkende servers: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Mislukte servers: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Totaal: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Verwijderde servers: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Gefilterde servers: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Gebruikers op werkende servers: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Bestanden op werkende servers: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Totaal gebruikers: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Totaal bestanden: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Server-bezetting: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Aantal gedeelde bestanden: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Totale grootte van gedeelde bestanden: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Gemiddelde bestandsgrootte: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Besturingssysteem"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Niet ontvangen"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Actieve verbindingen (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Niet beschikbaar"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Nooit"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Voer <str> uit en sluit af."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr "Gescheiden lijstvelden met spaties, zoals hiervoor, in plaats van tabs."
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Verwerken per hash: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Verwerken per bestandsnaam: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Dit commando heeft een argument nodig. Geldige argumenten: een bestands-hash.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Niet een geldig nummer\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "Geen geldige hash (lengte moet precies 32 tekens zijn)\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
-"Geen zoektype opgegeven.\n"
-"Typ 'help search' om helptekst te lezen.\n"
+"Ongeldige syntaxis voor zoekfilter.\n"
+"Typ 'help search' voor meer hulp.\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
-"Geen zoektype opgegeven.\n"
-"Typ 'help search' om helptekst te lezen.\n"
+"Geen zoekwoord opgegeven.\n"
+"Typ 'help search' voor meer hulp.\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6506,76 +7926,80 @@
 "Geen zoektype opgegeven.\n"
 "Typ 'help search' om helptekst te lezen.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Downloadbestand: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Aanvraag mislukt met een onbekende fout."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Bewerking was succesvol."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Aanvraag mislukte met de volgende fout: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "IP-filteren van clients is %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "UIT"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "AAN"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "IP-filteren van servers is %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Huidige IP-filter niveau is %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Bandbreedtegrenzen: Upload: %u kB/s, Download: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr "Bandbreedtelimiet: Up: %u KiB/s, Down: %u KiB/s.\n"
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr "Eindspel-bronrotatie is %s.\n"
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr "Zoekopdracht gestart (id %u).\n"
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Verbonden met %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Aan het verbinden"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "firewalled"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6584,7 +8008,7 @@
 "\n"
 "Download:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6593,7 +8017,7 @@
 "\n"
 "Upload:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6602,7 +8026,7 @@
 "\n"
 "Clients in wachtrij:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6611,38 +8035,33 @@
 "\n"
 "Totale bronnen:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "PartBestand"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Aantal zoekresultaten: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Voortgang zoeken: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Voortgang zoeken niet beschikbaar"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Ongeldig antwoord van de server ontvangen, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Toon korte statusinformatie."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Toon verbindingsstatus, huidige up-/downloadsnelheden, etc.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Toon volledige statistiekenboom."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6656,11 +8075,11 @@
 "\n"
 "Voorbeeld: 'statistics 5' toont alleen de bovenste 5 versies van elk client-type.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Sluit aMule af."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6670,35 +8089,35 @@
 "Dit sluit ook de textclient af, omdat die onbruikbaar is zonder een\n"
 "draaiende kern.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Laad gegeven object opnieuw."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
-msgstr "Laad gedeelde-bestandenlijst opnieuw."
+msgstr "Laad gedeelde bestandenlijst opnieuw."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Laad IP-filtertabel opnieuw."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Laad huidige IP-filtertabel opnieuw."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Update IP-filtertabel van URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 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:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Verbind met het netwerk."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6710,35 +8129,35 @@
 "server te verbinden. Het IP moet een decimaal IPv4-adres met punten zijn,\n"
 "of een DNS-naam."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Verbind alleen met eD2K."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Verbind alleen met Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Verbreek verbinding met het netwerk."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Verbreek alleen verbinding met eD2K."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Verbreek alleen verbinding met Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Voeg een eD2k- of magnet-link toe aan de kern."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6756,51 +8175,51 @@
 "\n"
 "De magnet-link moet de eD2k-hash en bestandsgrootte bevatten.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Stel een voorkeurswaarde in."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Stel voorkeuren voor IP-filter in."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Schakel IP-filteren van zowel clients als servers in."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Schakel IP-filteren van zowel clients als servers uit."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Schakel IP-filteren van clients in/uit."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Schakel IP-filteren van clients in."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Schakel IP-filteren van clients uit."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Schakel IP-filteren van servers in/uit."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Schakel IP-filteren van servers in."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Schakel IP-filteren van servers uit."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Selecteer IP-filter-niveau."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6808,59 +8227,71 @@
 "Geldige filterniveau's zijn in de reeks 0-255, en de standaard (initiele)\n"
 "waarde is 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Stel bandbreedtegrenzen in."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Stel upload bandbreedtegrens in."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "De opgegeven waarde moet in kilobytes/sec zijn.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Stel download bandbreedtegrens in."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr "Eindspel-bronrotatie in- of uitschakelen."
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "De opgegeven waarde moet 1/ON (inschakelen) of 0/OFF (uitschakelen) zijn.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Verkrijg en toon een voorkeurswaarde."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Verkrijg voorkeuren voor IP-filter."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Verkrijg status van IP-filter voor zowel clients als servers."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Verkrijg status van IP-filter alleen voor clients."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Verkrijg status van IP-filter alleen voor servers."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Verkrijg niveau van IP-filter."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Verkrijg bandbreedtegrenzen."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr "Status van eindspel-bronrotatie opvragen."
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Voer een zoekopdracht uit."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6878,40 +8309,63 @@
 "Example: 'search global linux iso --type Iso --min-size 100M' returns\n"
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
+"Er moet een zoektype worden opgegeven door het type op te geven:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Voorbeeld: 'search kad file' voert een kad-zoekopdracht uit naar \"file\".\n"
+"\n"
+"Optionele filters kunnen worden toegevoegd voor, na, of tussen\n"
+"het/de zoekwoord(en):\n"
+"    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
+"    --extension <ext>      (alias: --ext)\n"
+"    --avail <N>            minimum aantal bronnen\n"
+"    --min-size <NKMG>    kleinste bestandsgrootte; K=1024, M=K*1024, G=M*1024\n"
+"    --max-size <NKMG>    grootste bestandsgrootte; zelfde achtervoegsels\n"
+"Voorbeeld: 'search global linux iso --type Iso --min-size 100M' geeft\n"
+"resultaten voor \"linux iso\" van bestandstype Iso van minstens 100 MiB.\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Voer een globale zoekopdracht uit."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Voer een lokale zoekopdracht uit"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Voer een kad zoekopdracht uit"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "Toon de resultaten van de laatste zoekopdracht."
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Geef de resultaten van de vorige zoekopdracht.\n"
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr "Toon de resultaten van een zoekopdracht."
+
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+"Geeft de resultaten van een zoekopdracht terug.\n"
+"Accepteert optioneel een zoek-id (van 'search ...'); zonder id worden de resultaten van de meest recent gestarte zoekopdracht teruggegeven.\n"
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Toon de voortgang van een zoekopdracht."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Toon de voortgang van een zoekopdracht.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+"Toont de voortgang van een zoekopdracht.\n"
+"Accepteert optioneel een zoek-id; zonder id wordt de voortgang van de meest recent gestarte zoekopdracht getoond.\n"
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Begin met downloaden van een bestand"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6919,80 +8373,80 @@
 "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:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Pauzeer download."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Verder gaan met download."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Download annuleren."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Stel downloadprioriteit in."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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 automatisch.\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Stel prioriteit in op laag."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Stel prioriteit in op normaal."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Stel prioriteit in op hoog."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Stel prioriteit in op automatisch."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Toon wachtrij/lijsten."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
-msgstr "Toon upload/download-wachtrij, server-lijst of gedeelde-bestandenlijst.\n"
+msgstr "Toon upload/download-wachtrij, server-lijst of gedeelde bestandenlijst.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Toon upload-wachtrij."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Toon download wachtrij."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Toon logboek."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Toon server-lijst."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
-msgstr "Toon gedeelde-bestandenlijst."
+msgstr "Toon gedeelde bestandenlijst."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Logboek wissen."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Verouderd commando, gebruik '%s' in plaats hiervan."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7001,258 +8455,281 @@
 "Dit is een afgekeurd commando, en kan in de toekomst verwijderd worden.\n"
 "Gebruik '%s' in de plaats.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule tekstclient"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Gedownload bestand wordt gehashed: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr "Bestand wordt gehashed: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "AICH hash-set wordt herbouwd voor bestand: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr "Lokale gegevens verifiëren (%s): Resultaat OK voor %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr "Lokale gegevens verifiëren (%s): FOUTEN GEVONDEN! %s Mislukte blokken: MD4: %s. %s %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Bevestiging nodig"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Enkel 99 categorieën worden ondersteund."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Te veel categorieën!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Alle anderen"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Selecteer filter"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Voeg categorie toe"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Bewerk categorie"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Verwijder categorie"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Hashset opgevraagd voor onbekend bestand: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Openen van bestand (%s) mislukt, wordt uit lijst van gedeelde bestanden verwijderd."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Verder gaan met uploads van bestand: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Stoppen van upload van bestand: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Kon commando `%s' niet uitvoeren bij gebeurtenis `%s'."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Kon commando '%s' niet uitvoeren bij gebeurtenis '%s'."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Download voltooid"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Het volledige pad naar het bestand."
 
 # re-check this
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "De naam van het bestand zonder het pad-gedeelte."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "De eD2k-hash van het bestand."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "De grootte van het bestand in bytes."
 
 # Recheck last word
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Cumulatieve download activiteitsduur."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Nieuwe chatsessie begonnen"
 
 # ambiguous in EN, check translation
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Afzender bericht."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Geen schijfruimte meer"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Schijfpartitie."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Fout bij completeren"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Bestand nummer %u wordt verwerkt: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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/utils/aLinkCreator/src/alcc.cpp:80
-#, fuzzy, c-format
+#: src/utils/aLinkCreator/src/alcc.cpp
+#, c-format
 msgid "%s ---> Non existent file !\n"
-msgstr "%s ---> Niet bestaand bestand !\n"
+msgstr "%s ---> Bestand bestaat niet!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, de aMule eD2k-linkmaker"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Welkom!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Invoerparameters"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Bestand om te hashen"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Voeg optionele URLs toe aan dit bestand"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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
-msgid "Remove"
-msgstr "Verwijder"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Maak link met deel-hashes"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4 Bestands-hash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k-bestands-hash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k-link"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Kopieer naar klembord"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Openen"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Kopieer berekende eD2k-link naar klembord"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Opslaan als"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Bewaar berekende eD2k-link naar bestand"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Over aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Kan het klembord niet openen"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Er is nu niets om te kopiëren !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Selecteer het bestand voor uw berekende eD2k-link"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Kon niet openen "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Voer een niet-lege bestandsnaam in"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Er is nu niets om te bewaren !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7272,162 +8749,159 @@
 "\n"
 "Uitgegeven onder de GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Aan het hashen..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator is aan het werk voor u"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "MD4-hash word berekend..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "eD2k-hashes worden berekend..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Afgebroken !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Gedaan in %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "U heeft deze URL al toegevoegd !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Voer een niet-lege URL in"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Kon %s niet openen"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
-msgstr "Geen geheugen beschikbaar voor het berekenen van de ed2k-hash."
+msgstr "Geen geheugen beschikbaar voor het berekenen van de ed2k-hash!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i dag(en) %i uur %i min %i s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uu %0umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uu %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr "%.2f KiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr "%.2f GiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr "%.2f TiB"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxcas, aMule online statistieken"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Maximum DL snelheid sinds wxCas draait"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Leegmaken"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Systeem"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Stop automatisch verversen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Bewaar afbeelding van online statistieken"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Print Online Statistieken figuur"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Voorkeursinstellingen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Over wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Begin automatisch verversen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Automatisch verversen gestopt"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Automatisch verversen gestart"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Bewaar afbeelding van statistieken"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMule Online Statistieken"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7435,11 +8909,11 @@
 "Er was een probleem tijdens het printen.\n"
 "Misschien is uw printer niet goed ingesteld?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Aan het printen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7457,402 +8931,564 @@
 "\n"
 "Uitgegeven onder de GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh oh, aMule draait niet..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule draait"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule draait, maar is niet verbonden"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule maakt verbinding..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh oh, aMule status is onbekend..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " draait "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " is gestopt !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " is niet verbonden !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " is aan het verbinden..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " doet iets raars, controleer het !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " is verbonden met "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "uit"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " is aan "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " met "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Totale download: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Upload: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Sessie download: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Download: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr " KiB/s, Upload: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Deelt: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " bestand(en), clients in wachtrij: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Tijd: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " aan "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Gemiddelde systeembelasting (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Systeem uptime: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Map die het bestand amulesig.dat bevat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "Voer hier de map in waar uw amulesig.dat bestand is"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Tijd tussen de verversingen in seconden"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Genereer een statusafbeelding bij elke verversing"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "Voer hier de map in waar u de statistiekenafbeedling wilt laten genereren"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
-#, fuzzy
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
-msgstr "Upload uw status-afbeelding regelmatig naar een FTP-server"
+msgstr "Upload uw statistiekbeeld regelmatig naar de FTP-server"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP-url"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP-pad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "Voer hier de map in waar uw statusafbeelding op de FTP-server moet komen"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Gebruiker"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Tijd tussen de FTP-updates in minuten"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Controleer"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Map die uw handtekeningbestand bevat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Map waar de afbeelding van statistieken gegenereerd moet worden"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Laadt template <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Webserver HTTP-poort"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Gebruik UPnP portforwarding voor webserver-poort"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP-poort"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Gebruik Gzip-compressie"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Wachtwoord voor volledige toegang tot webserver"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Gastwachtwoord voor webserver"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Sta gasttoegang toe"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Weiger gasttoegang"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "Laad/bewaar webserverinstellingen van/naar aMule op afstand"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMule configuratiebestand pad. NIET DIRECT GEBRUIKEN!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Schakel PHP-interpreter uit (verouderd)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Compileer PHP-pagina's opnieuw bij elke aanvraag"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule webserver"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "webclient verbinding geaccepteerd\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "FOUT: kan verbinding van webclient niet accepteren\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Aanvraag mislukt met de volgende fout: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Indexbestand niet gevonden: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sessie verlopen - inloggen wordt aangevraagd\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sessie ok, ingelogd\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sessie ok, niet ingelogd\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Geen sessie geopend - login wordt aangevraad\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sessie aangemaakt - inloggen wordt aangevraagd\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Aanvraag wordt verwerkt origineel: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
-msgstr ""
+msgstr "Weigert `pass` te lezen uit de URL-queryreeks\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Geen wachtwoord opgegeven, login wordt niet toegestaan."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Controleren van wachtwoord\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Wachtwoord-hash ongeldig\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Wachtwoord is ok\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Wachtwoord-fout\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Uitloggen aangevraagd\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Aanvraag wordt verwerkt omgeleid: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
-msgstr ""
+msgstr "aMule (vereist)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
-msgstr ""
+msgstr "Bureaubladsnelkoppeling"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
-msgstr ""
+msgstr "aMule starten bij aanmelden"
+
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ".emulecollection-bestanden toekennen"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
-msgstr ""
+msgstr "Verwijderen"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
-msgstr ""
+msgstr "Gebruikersgegevens verwijderen (configuratie, ED2K-servers, Kad-nodes, partbestanden)"
 
-#: packaging/windows/installer_strings.c:43
-#, fuzzy
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
-msgstr "Verbinding mislukt "
+msgstr "aMule-toepassingsbestanden (vereist)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
-msgstr ""
+msgstr "Plaats een aMule-snelkoppeling op het bureaublad."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
-msgstr ""
+msgstr "aMule automatisch starten wanneer de huidige gebruiker zich aanmeldt (instelling per gebruiker)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr ""
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr "Voegt aMule toe aan de lijst \"Openen met\" voor .emulecollection-bestanden en maakt het de standaard als geen ander programma deze heeft geclaimd. Het openen van een collectie zet elke eD2k-link die deze bevat in de wachtrij."
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "aMule-toepassingsbestanden, snelkoppelingen in het Startmenu/op het bureaublad, het autostart-Run-sleutelitem, URL-schemaregistraties en het item in Programma's toevoegen of verwijderen (vereist)."
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
-msgstr ""
+msgstr "Verwijder %APPDATA%\\aMule voor de huidige gebruiker permanent (aMule.conf, ED2K-serverlijst, Kad-nodes, partbestanden, IP-filters, vriendenlijst). Laat dit uitgeschakeld om uw instellingen te behouden."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
+"aMule lijkt te worden uitgevoerd vanuit $INSTDIR.\n"
+"Sluit aMule (en aMuleD / aMuleGUI) en probeer het opnieuw."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
+"De aMule-daemon (amuled.exe) lijkt te worden uitgevoerd vanuit $INSTDIR.\n"
+"Stop deze en probeer het opnieuw."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
-msgstr ""
+msgstr "Vorige aMule-installatie op $0 wordt verwijderd..."
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
+"Kon de vorige aMule-installatie op $0 niet verwijderen.\n"
+"Sluit alle actieve aMule-processen en probeer het opnieuw, of verwijder eerst handmatig de vorige versie."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
-msgstr ""
+msgstr "aMule lijkt te worden uitgevoerd. Sluit het en voer het verwijderprogramma opnieuw uit."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
-msgstr ""
+msgstr "Gebruikersgegevens op $APPDATA\\aMule worden verwijderd..."
+
+#~ msgid "Ratio"
+#~ msgstr "Ratio"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Geen deelbare bestanden gevonden in map: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Verander taal"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Er zijn geen vertalingen voor aMule geïnstalleerd"
+
+#~ msgid "No languages available"
+#~ msgstr "Geen talen beschikbaar"
+
+#~ msgid "User name"
+#~ msgstr "Gebruikersnaam"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Ontvangen delen"
+
+#~ msgid "Available Parts"
+#~ msgstr "Beschikbare delen"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "%i bekend gedeeld bestand gevonden, %i onbekend"
+#~ msgstr1 "%i bekende gedeelde bestanden gevonden, %i onbekend"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Geüpload"
+#~ msgid "Remote prefix:"
+#~ msgstr "Server op Afstand"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Lokale server"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Bestand niet gevonden."
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Ongeldige vermelding in bekende-bestandenlijst, bestand kan beschadigd zijn: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Deelbestand %u van %u wordt bewaard"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Om deze waarschuwing te voorkomen bij elk voorbeeld\n"
+#~ "dient u uw video afspeelprogramma in te stellen bij voorkeuren (standaard is %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Filter resultaat"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Markeer als bekend bestand"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Procent van alle bestanden"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Bootstrap"
+
+#~ msgid "New node"
+#~ msgstr "Nieuwe node"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Meer"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Bootstrap van \n"
+#~ "bekende clients"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Verbind met een server en/of Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Verbreek verbinding met Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Beëindig de huidige verbindingspogingen"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Verbreek de huidige verbonden netwerken"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Verbind met de momenteel ingeschakelde netwerken"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Auto-sorteer bestanden (hoog CPU-gebruik)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule zal de kolommen in uw downloadlijst automatisch sorteren"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Weigert een pakket als het client-IP anders is dan het IP waar het pakket van is ontvangen. Wees voorzichtig hiermee."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Geef de resultaten van de vorige zoekopdracht.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Toon de voortgang van een zoekopdracht.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Verbinding verbroken - aMule is waarschijnlijk afgesloten."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Controleer op nieuwe versie bij het starten"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k-link: "
+
+#~ msgid "Commit"
+#~ msgstr "Uitvoeren"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: naar de achtergrond - tot ziens"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Website: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Website: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Geüpload"

amule-3.0.1.tar.gz/po/nn.po -> amule-3.1.0.tar.gz/po/nn.po Changed

@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:21+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 20:58+0000\n"
 "Last-Translator: Hallvor Brunstad <Hallvor_1976@yahoo.com>\n"
 "Language-Team: <i18n-nn@lister.ping.uio.no>\n"
 "Language: nn\n"
@@ -21,70 +21,156 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Syne aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMule fjernkontroll"
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Bilete:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Opphavsrett (c) 2003-2019 aMule Team \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: P2P brukarruting bygd på XOR metric.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Sjå etter ny utgåve ved oppstart"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Koplar til Kad..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Du nyttar ei utdatert utgåve av aMule!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Ikkje tilgjengeleg"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Legg til ein kamerat"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Du må skrive inn ein gangbar IP og port!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informasjon"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Den innskrivne brukarhashen er ikkje gyldig!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Oppkopling mislukka "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -93,144 +179,274 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "FEIL"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 #, fuzzy
 msgid "Failed to open ED2KLinks file."
 msgstr "Greidde ikkje å opne %s·(%s)"
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Registerfil ikkje funne: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Greidde ikkje å hente delte filer frå brukar '%s'"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Kan ikkje konvertere magnetlenkje til eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Ugangbar eD2k lenkje! FEIL: %s"
+
+#: src/amule.cpp
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "Ok,·avsluttar·%s...\n"
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Mislukka"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "Nedlasting fullført"
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Dine lokale innstilingar har vorte endra til opprinnelege systeminnstillingar på grunn av konfigurasjonsending. Beklager."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Stadfesting av avslutting"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "Ny ekstern kopling akseptert"
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "ÅTVARING"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i tenar funne i server.met"
+msgid "Loading temp files"
+msgstr "Lastar server.met fila: %s"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Lastar server.met fila: %s"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Lastar inn att delte filer"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Lastar inn att delte filer"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Start"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Nettverk"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Nettverk"
+msgid "eD2k server list (server.met)"
+msgstr "%i tenar funne i server.met"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "vevtenar køyrer på pid %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 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:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "FEIL"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "vevtenar køyrer på pid %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+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
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Greidde ikkje å knyte portar til adressa: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port·%u er ikkje tilgjengeleg. Du vil få LågID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -245,48 +461,48 @@
 "\n"
 "Sjekk nettverket ditt for å vere viss på at porten er open for inn- og utgåande trafikk."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Greidde ikkje å lage OnlineSigfil"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Greidde ikkje å lage aMule si OnlineSigfil."
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Dette er første gongen du køyrer aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Denne utgåva er ei testutgåve, oppdatert dagleg, og\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "på https://amule-org.github.io, eller på IRC-kanalen vår #aMule·på·irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Vér god å rapportere feil til https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -294,1587 +510,1898 @@
 "Mappa spesifisert for nettsignaturar er UGANGBAR!\n"
 " Nettsignaturar vert DEAKTIVERT fram til du ordnar det i innstillingar."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 #, fuzzy
 msgid "Server hostname notified"
 msgstr "Tenarnamn:"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Henting av diskplass for fila '%s' mislukka: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "FEIL: Greier ikkje å opne loggfila"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "ÅTVARING: loggfila er tom. Noko er gale."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Loggen har vorte nullstilt"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Tenarmelding: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Klarte ikkje å laste ned nodelista."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Klarte ikkje å opne den nedlaste utgåvesjekkfila"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Korrupt utgåvesjekkfil"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Du nyttar ei utdatert utgåve av aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Den siste utgåva finst alltid på https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Utgåva di av aMule er oppdatert."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Klarte ikkje å laste ned utgåvesjekkfila"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Brukarar: %s | Filer: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Ingen valde nettverk"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "med LågID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "med HøgID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Tilkopla %s·%s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Koplar til %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Fråkopla eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad starta."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad stogga."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Tilkopla Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Tilkopla Kad (brannmura)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Fråkopla Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kad-nettverket er deaktivert i innstillingar. Koplar ikkje til."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 #, 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "Feil: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Dette er aMule %s basert på eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Køyrer på %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Vitje https://github.com/amule-org/amule/releases/latest for å sjekke om ei ny utgåve er tilgjengeleg."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "FATAL FEIL: Greidde ikkje å lage tidtakar"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMule fjernkontroll"
-
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Bilete:"
-
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr ""
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Nettverk"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr ""
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Søk"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "\tFor meir informasjon, sjå https://amule-org.github.io/docs"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Nedlastingar"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Vér god å rapportere feil til https://github.com/amule-org/amule/issues"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Delte filer"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Opphavsrett (c) 2003-2019 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Klientar"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr ""
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Meldingar"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: P2P brukarruting bygd på XOR metric.\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistikk"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Innstillingar"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Melding"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Tenarmelding: %s"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Ikkje tilgjengeleg"
+
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Den siste utgåva finst alltid på https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Koplar til"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Koplar til"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Fråkopla"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Brannmura"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Tilkopla"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Koplar til"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Av"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Avbryt"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Stopp inneverande oppkoplingsfreistingar"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Utgåve"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Kople frå"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Kople frå dei aktive nettverka"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Kople til"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Addresse"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Kople til dei valde nettverka"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Skildring"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "aMulelogg"
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Opp:·%.1f(%.1f)·|·Ned:·%.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Opp:·%.1f·|·Ned:·%.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule·(%s·|·Tilkopla)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule·(%s·|·Fråkopla)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Vil du verkeleg avslutte aMule?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Stadfesting av avslutting"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Skinnkatalogen '%s' finst ikkje"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "ÅTVARING: Greidde ikkje å opne hudfila '%s' for lesing"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Nettverk"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Nettverksavindauge"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Søk"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Søkjevindauge"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Nedlastingar"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "Lastar ned"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Delte filer"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Vindauge for delte filer"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Meldingar"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Nettverksavindauge"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Meldingsvindauge"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistikk"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Statistikkgrafvindauge"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Innstillingar"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Innstillingsvalsvindauge"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importér"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Verkty for delfilimport"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Om"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Om/hjelp"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "ed2k nettverk"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kad nettverk"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Ikkje noko nettverk"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "FATAL FEIL: Greidde ikkje å lage tidtakar"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Kople til aMule over nettet"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Kopling mista"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Stadfest avslutting"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "FATAL FEIL: Greidde ikkje å lage tidtakar"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Going to event loop..."
 msgstr "Freistar å hente fram att filinformasjon..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Connecting..."
 msgstr "Koplar til"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr ""
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Tilkoplingsfreisting til %s·(%s:%i)·gjekk over tida."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Deaktivert"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Kople til nettverket."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Alle"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Ikkje tilgjengeleg"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Fil ikkje funne."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Ikkje gangbar lenkje eller lenka allereie på lista."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Du freistar allereie nedlasting av fila %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Greidde ikkje å hente delte filer frå brukar '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Falsk eMuleutgåve %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Falsk eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Falsk eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x·(basert på eMule·v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Brukarnamn: %s·ID:·%u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Etterspurt: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Filstatistikk for denne økta: Godkjende %d av %d etterspurnad, %s overført\n"
 msgstr1 "Filstatistikk for denne økta: Godkjende %d av %d etterspurnader, %s overført\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Filstatistikk for alle økter: Godkjende %d av %d etterspurnad, %s overført\n"
 msgstr1 "Filstatistikk for alle økter: Godkjende %d av %d etterspurnader, %s overført\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Etterspurt ukjend fil"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Melding filtrért frå '%s'·(IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Ny melding frå '%s'·(IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Brukar·%s (%u)·etterspurte·lista·over·delte·filer·for·katalogen·%s ->·nekta"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Greidde ikkje å hente delte filer frå brukar '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "ÅTVARING: known.met let seg ikkje opne."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 #, fuzzy
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "ÅTVARING: Kjendfillista er korrupt; inneheld ugangbar overskrift."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "IO feil underlesing av known.met fila: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Feil under lagring av known.met fila: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategori"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Ny kategori"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Vél ei mappe for innkomande filer"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Du må skrive inn eit namn på kategorien!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Du mp skrive inn ein sti for kategorien!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Lynmeldingsøkt starta: %s·(%s:%u)·-·%s·%s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "***·Tilkopla klient·***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "***·Koplar til klient·***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Greidde ikkje å kople til klient / Kopling mista ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Stengje faneblad"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Stengje alle faneblad"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Stengje andre faneblad"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Legg til kameratar"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Syn &detaljar"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Fjerne frå kameratar"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Opprett venekopling"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Sjå filer"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Send melding"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Send melding til brukar"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Melding å sende:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Det er ikkje tillate å opprette meir enn ei venekopling.\n"
+" Berre ei venekopling vart oppretta."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Fleirval"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Fjerne frå kameratar"
+msgstr1 "Fjerne frå kameratar"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Lastar inn att lista over delte filer."
+msgstr1 "Lastar inn att lista over delte filer."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Kredittfil lasta, %u kjend klient"
 msgstr1 "Kredittfil lasta, %u kjende klientar"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - Kredittar forelda for %u klient!"
 msgstr1 " - Kredittar forelda for %u klientar!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Inga 'cryptkey.dat' fil funne - opprettar."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Klientdetaljar"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LågID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HøgID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Støtta"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Ikkje støtta"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Deaktivert"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Tilkopla"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Fråkopla"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f·kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Namn"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP-adresse"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Sist motteke"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Utgåve"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Opplastingsfart"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "Nedlastingsfart"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Lasta opp"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Total nedlasting: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "NL/OL endringsfaktor"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Nettsignatur"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Ikkje ferdig"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Kjeltring"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Granska - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "I/T"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Ikkje tilgjengeleg"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Filer"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Lasta opp"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Lasta ned"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Lastar ned"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Opplasting"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Aktiv"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Ukjend"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Brukar %s·(%u) etterspurde liste over dei delte filene dine -> Godteke"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Brukar·%s (%u)·etterspurde·liste·over·dei·delte·filene·dine·-> Nekta"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Brukar %s·(%u) etterspurte lista di over delte katalogar -> Godteke"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Brukar·%s (%u)·etterspurte·lista·di·over·delte·katalogar·->·Nekta"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "Brukar %s·(%u) etterspurte lista over delte filer for katalogen %s·-> godteke"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "Brukar·%s (%u)·etterspurte·lista·over·delte·filer·for·katalogen·%s ->·nekta"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Brukar %s·(%u) deler katalogen %s"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Brukar %s·(%u) sende ikkje etterspurte delte kataloger."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, 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:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Brukar%s·(%u) sende ikkje etterspurt liste over delte filer"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "Brukar %s·(%u) nekta tilgang til delte kataloger/filer"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Filkommentarar"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Filnamn"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Verdi"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Ingen kommentarar"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u kommentar"
 msgstr1 "%u kommentarar"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Greidde ikkje å laste ned tenarlista frå %s"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Lå"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto·No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto·Hø"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Svært låg"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Låg"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Vanleg"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Høg"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Svært høg"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Offentleggjering"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Spør"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Koplar til gjennom tenar"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Kø full"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "I kø"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Lastar ned"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Tek imot hashsett"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Ingen naudsynte delar"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Greier ikkje å kople LågID til LågID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "For mange koplingar"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Koplar til gjennom Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "For mange kadkoplingar"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Nekta"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Koplingsfeil"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Fjern kø full"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Gamal MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Ny MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMulekompatibel"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Lokal tenar"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Fjern tenar"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Kjeldeutveksling"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passiv"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Lenkje"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Kjeldefrø"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Ferdig"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "I framdrift"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "FEIL: Tom for diskplass"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "FEIL: Delfil ikkje funne"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "FEIL: Mislukka IO!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "FEIL: Mislukka!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "I kø"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Lastar allereie ned"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Ukjend eller dårleg format på tempfil."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Storleik"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Overført"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Fart"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Framdrift"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Kjelder"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioritet"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Status"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Attståande tid"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Sist sett komplett"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Sist motteke"
 
-#: 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/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/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Tilbakemelding frå: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automatisk"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "%Stopp"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pause"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Hald fram"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "&Ta bort ferdige"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Byt alle A4AF til denne fila no"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Byt alle A4AF til denne fila (auto)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Byt alle A4AF til anna fil no"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Utvida innstillingar"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Førehandssyning"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Syn fil&detaljar"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Syn alle kommentarar"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Kopiér magnet URI til utklippstavla"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Kopier eD2k &lenka til utklippstavla"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Kopiér tilbakemelding til utklippstavla"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Legg til valfrie URL`ar for denne fila"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "ortildele"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Vel kategori"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Opne fila"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+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/DownloadListCtrl.cpp
+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/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Tilbakemelding frå: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Skriv nytt namn på denne fila:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Døyp om fil"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f·kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d·%H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Nedlastingar (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr "Vel ein videospelar i innstillingar for å hindre at denne åtvaringa kjem opp ved kvar førehandssyning (%s er standard)"
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Førehandssyning"
+msgid "Downloads (%i)"
+msgstr "Nedlastingar (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "FEIL: Greidde ikkje å starte ekstern mediespelar! Kommando: '%s'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Totalt NL: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading temp files from %s."
 msgstr "Lastar server.met fila: %s"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Lastar data frå gamal nedlastingsfil (%u·av·%u)"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "FEIL: Greidde ikkje å laste tryggleikskopifila. Søk https://github.com/amule-org/amule/discussions for løysingar på attskaping av part.met filer."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Ingen delfiler funne"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Fann %u delfil"
 msgstr1 "Fann %u delfiler"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Filsystemet for mellombelse filer greier ikkje å handsame store filer."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Filsystemet i mappa for innkomande filer greier ikkje å handsame store filer."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Lastar ned %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Du freistar allereie nedlasting av fila '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Du har allereie fila: '%s'"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Du har allereie fila: '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Du freistar allereie nedlasting av fila %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Kan ikkje konvertere magnetlenkje til eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Ukjend lenkjeprotokoll for: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Ugangbar eD2k lenkje! FEIL: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client sent packet after authentication failed."
 msgstr "Godkjenning mislukka."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Ekstern kopling lukka."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Eksterne koplingar deaktiverte på grunn av tomt passord!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Eksterne koplingar deaktiverte i konfigurasjonsfila"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Ny ekstern kopling akseptert"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "FEIL: greidde ikkje å ta imot ei ny ekstern kopling"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Ekstern kopling nekta på grunn av tomt passord i innstillingar!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Koplar til klient: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Ukjend utgåve"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 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."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "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:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Ugyldig protokullutgåve."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Manglande merkelapp for protokollutgåve."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Automatisk tenaroppkopling freistar på nytt om %d sekund"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: wrong password."
 msgstr "Godkjenning mislukka."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: missing password."
 msgstr "Godkjenning mislukka."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Invalid request, please authenticate first."
 msgstr "Ugyldig etterspurnad, du treng godkjenning først."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Tilgang innvilga."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Filtrér meldingar frå ukjende klientar"
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Uaotorisert freisting på tilgang. Kopling lukka."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Kommando for fjern delfil mislukka: Filhash ikkje funnen: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Filhash ikkje funnen: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OPS! Handsamingsfeil i OpCode!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Tenar ikkje lagd til"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "tenar ikkje funnen: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "treng å velje tenar for fjerning"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k er deaktivert i innstillingar"
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Fil ikkje funne."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Fil ikkje funne."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Søk i framdrift. Hentar inn att resultata om ein augneblink!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Nettsøk frå fjern adresse gir ikkje meining."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Søk i framdrift. Hentar inn att resultata om ein augneblink!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Ingen punkt for graf."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Klienten din er ikkje konfigurert for dette detaljnivået."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Ekstern kopling: avslutting etterspurt"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Avsluttar allereie."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Eksternkopling: legg til lenkje '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Ikkje gangbar lenkje eller lenka allereie på lista."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Fil ikkje funne."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Ikkje gangbart filnamn."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Ikkje i stand til å døype om fila."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Stengje denne lynmeldingsøkta."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Ny lynmeldingsøkt starta"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Stengje denne lynmeldingsøkta."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad er deaktivert i innstillingar."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Ukjent namn)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad er deaktivert i innstillingar."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Allereie tilkopla eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Koplar til eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Allereie tilkopla Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Koplar til Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Alle nettverk er deaktiverte."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Fråkopla eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Fråkopla Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Ekstern kopling: ugangbar opkode motteken: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Ikkje gangbar opkode (feil protokollutgåve?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Ukjend forlenging·'%s'·for·'%s'·kommandoen.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Ukjend kommando '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1882,7 +2409,7 @@
 "\n"
 "Denne kommandoen kan ikkje ha eit argument.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1890,7 +2417,7 @@
 "\n"
 "Denne kommandoen må ha eit argument.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1898,7 +2425,7 @@
 "\n"
 "Denne kommandoen er ikkje komplett; du må nytte ein av forlengjarane under.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1906,11 +2433,11 @@
 "\n"
 "Tilgjengelege forlengjarar:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Tilgjengelege kommandoar:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1921,17 +2448,17 @@
 " Alle kommandoar kan utførast med store og små bokstavar.\n"
 "Skriv '%s <kommando>'for meir opplysningar om <kommando>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Avsluttar programmet."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Syne hjelp."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1939,7 +2466,7 @@
 "For å få hjelp til ein kommando, skriv 'help·<kommando>'.\n"
 "For full kommandoliste, skriv 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1950,46 +2477,46 @@
 "Bruk·'%s'·for·kommandoliste\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Syntaksfeil!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Denne kommandoen skulle ikkje ha nokon parameter."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Denne komamndoen må ha eit parameter."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Ugangbart argument."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Denne kommandoen er ikkje komplett."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Skriv '%s'·for å få meir hjelp.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Dette er %s·%s·%s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Dette er %s·%s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1997,7 +2524,7 @@
 "\n"
 "Opprettar klient...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2006,7 +2533,7 @@
 "\n"
 "Ok,·avsluttar·%s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2020,118 +2547,361 @@
 "\n"
 "Avsluttar...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Syne denne hjelpeteksten."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Vert der aMule køyrer (standard: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "aMule sin port for eksternkopling (standard: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Passord for eksternkopling."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Les innstillingar frå fil."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Ikkje skriv ut data til stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Vér utførleg - syne óg avfeilingsmeldingar,"
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Set programspråk."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Skriv kommandolinjealternativa til konfigurasjonsfila."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Lagar konfigurasjonsfil basert på aMule si konfigurasjonsfil."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Skriv programutgåve."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Fildetaljar"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%%·ferdig"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Førehandssyning"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "FEIL: Greidde ikkje å starte ekstern mediespelar! Kommando: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f·kB/s"
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "Feil: Greidde ikkje opne delfila '%s'"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Velkomen!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Tilkopla kamerat"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Tilkoplingsstatus:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Nettverk"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Eigenoppstart"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Du freistar allereie nedlasting av fila %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Automatisk oppdatering av tenarlista ved oppstart"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Bla"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Greidde ikkje å opne venelista 'emfriends.net' for lesing!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Greidde ikkje å opne venelista 'enfriends.met' for skriving!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Vener"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Syn &detaljar"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Legg til ein ven"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Ta bort ven"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Send &melding"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Sjå filer"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Opprett venekopling"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 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/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 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/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2139,2128 +2909,2562 @@
 "Det er ikkje tillate å opprette meir enn ei venekopling.\n"
 " Berre ei venekopling vart oppretta."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Fleirval"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Det er ikkje tillate å opprette meir enn ei venekopling.\n"
-" Berre ei venekopling vart oppretta."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Send melding til brukar"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Melding å sende:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Fjerne frå kameratar"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Send melding"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Byt til denne fila"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "QR:·%u·(%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Spurt etter anna fil (A4AF)"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "Ventande opplastingar: %s"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "I kø"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "Opplasting"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "None"
 msgstr "Ingen"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Nei"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Ja"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Greidde ikkje å opne %s·(%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Lastar ned..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Greidde ikkje å hente delte filer frå brukar '%s'"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Du freistar allereie nedlasting av fila %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Lasta ned"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Nedlastingar (%i)"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Greidde ikkje å laste ned tenarlista frå %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "Greidde ikkje å laste ned tenarlista frå %s"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Greidde ikkje å laste ned tenarlista frå %s"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 #, fuzzy
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Lastar ipfiltra 'ipfilter.dat'·og·'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Greidde ikkje å laste inn ipfilter.dat fila '%s' - ukjend filformat."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "Lasta %u IP-rekkje frå '%s'."
 msgstr1 "Lasta %u IP-rekkjer frå '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u vanskapt linje vart forkasta."
 msgstr1 "%u vanskapte linjer vart forkasta."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Eigenoppstart frå \n"
-"kjende klientar"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Novérande"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Køyregjennomsnitt"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Gjennomsnitt økt"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Noder (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Ikkje gangbar IP for eigenoppstart"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Ikkje gangbar port for eigenoppstart"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Vér god å fylle ut alle naudsynte felt"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Melding"
+
+#: src/KadDlg.cpp
 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/KadDlg.cpp:213
+#: src/KadDlg.cpp
 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/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Halde fram?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: for kort søkjeord"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Las %u kadkontakt"
 msgstr1 "Las %u kadkontaktar"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Skreiv %d kadkontakt"
 msgstr1 "Skreiv %d kadkontaktar"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Kad nettverk"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Filstorleik"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Delingsrate"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Lasta opp"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Etterspurt"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Godkjend"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Komplette kjelder"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Standardinnstillingar"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albansk"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabisk"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Asturian"
+msgstr "Estisk"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baskisk"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgarsk"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalansk"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Kinesisk (forenkla)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Kinesisk (tradisjonell)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Kroatisk"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Tsjekkisk"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Dansk"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Nederlansk"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Engelsk (U.K.)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Engelsk (U.K.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estisk"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finsk"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Fransk"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galisisk"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Tysk"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Gresk"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebraisk"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Ungarsk"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italiensk"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japansk"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Koreansk"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Litauisk"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norsk (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polsk"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugisisk"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugisisk (Brasil)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Romanian"
+msgstr "Albansk"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Russisk"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slovensk"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Spansk"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Svensk"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Tyrkisk"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "Ukjend utgåve"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unable to get error description for error %d"
 msgstr "ÅTVARING: Greidde ikkje å opne hudfila '%s' for lesing"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Hashar"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Ferdigstiller"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Ferdig"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Pausa"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Feilaktig"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Ventar"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 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:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Feil passord! Ikkje MD5 hash!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Oppkoplingsfeil"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Ekstern kopling lukka."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "EC kopling feila. Tomt svar."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Ekstern kopling: Dårleg svar frå tenar. Kopling stengd."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Ekstern kopling: Dårleg svar frå tenar. Kopling stengd."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Vellukka! Kopling til aMule er oppretta "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Vellukka! Kopling oppretta."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Ekstern kopling: Tilgang nekta fordi:"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Handshake failed."
 msgstr "Ekstern kopling: Tilgang nekta"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "Autooppfrisking starta"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "FEIL: Greidde ikkje lytte til TCP port."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "FEIL: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "ÅTVARING: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Stengje"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopiér"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Lim inn"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Frigjer plass"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Vél alle"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Ubegrensa"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Syne aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Gøyme aMule"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Tilkopla"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Tilkopla"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Tilkopla Kad (brannmura)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "TenarIP: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "Tenar IP:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Ikkje tilkopla"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP:·%s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP port: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP port: Ikkje klar"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP port: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP port: Ikkje klar"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Klientinformasjon"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Opplastingsgrense"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Nedlastingsgrense"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Syne aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Kople frå"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Gøyme aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Kople til"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Avslutt"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Ubegrensa"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule traumeny"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Fartsgrenser:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "OL: Inga"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "OL: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "NL: Ingen"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "NL: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Nedlastingsfart: %.1f"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Opplastingsfart: %.1f"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Kallenamn: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Ikkje valt kallenamn!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "KlientID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Tenarnamn: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "TenarIP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Ikkje tilkopla"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Nettsignatur: Aktivert"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Nettsignatur: Deaktivert"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Oppetid: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Delte filer: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Klientar i kø: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Totalt NL: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Totalt OL: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k lenkje: "
-
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Iverksetje"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Legg til ei eD2k eller magnetlenkje  til kjernen"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Legg til kameratar"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Klikk her for å leggje til eD2k lenkja "
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Hendingar visast her. Sjå i loggen under Tenarar for å sjå alle hendingane."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Lastar ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Tal på brukarar på tenaren du er tilkopla ..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Brukarar: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Brukarar tilkopla den aktuelle tenaren or eit overslag over det totalt antalet brukarar."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Opp:·0.0·|·Ned:·0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Ikkje tilkopla ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Novérande tilkopla tenar."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Søk"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Namn:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Sort"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Lokal"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Utvida parameter"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtrerer"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Filtype"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Alle"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Arkiv"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Lyd"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "CD-bilete"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Bilete"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Program"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Tekstar"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Videoar"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Filetternamn"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Min storleik"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Maks storleik"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Tilgjenge"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filter:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filtrér resultat"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filter"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Snu resultat"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Gøyme kjende filer"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Nullstill felta"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Start"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Meir"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Filetternamn"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Nedlasting"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Nedlasting i kategori"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Filtrér resultat"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Nullstill felta"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Resultat"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Ryddar bort ferdige nedlastingar"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filter:"
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "Komplette kjelder"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Generelt"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Fullt namn :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "I/T"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Fullt namn"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "metfil"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "metfil :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Filstorleik :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Delfilstatus :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Sist sett komplett :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Filstorleik"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Overføring"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Funne kjelder :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Overfører kjelder :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Fildelstal :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Tilgjengeleg:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Delfilstatus"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Datasnøggleik :"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Sist sett komplett"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Aktiv nedlastingstid: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Overført :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Ferdig storleik :"
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Funne kjelder"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Overfører kjelder"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Fildelstal"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Tilgjengeleg"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Datasnøggleik"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Aktiv nedlastingstid"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Ferdig storleik"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligent Korrupsjonshandsaming"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Tapt gjennom korrupsjon :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Vunne gjennom komprimering :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Pakkar lagra av I.C.H. :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Tapt gjennom korrupsjon"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Vunne gjennom komprimering"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Pakkar lagra av I.C.H."
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Deler: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Etterspurnader"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Godtekne etterspurnader"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Overførte data"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Delingssamsvar"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Komplette kjelder"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Delte filer"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr " Opplasting: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Kad-info"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Ikkje gitt verdi"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Tittel"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Filnamn"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Overtaking"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Opprensking"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Utfør"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Kommentér/verdigjé fila (Teksten vert synleg for alle brukarar)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Filkvalitet"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Ikkje gitt verdi"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Ugyldig / Korrupt /Falsk"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Dårleg"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Middels"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "God"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Utmerka"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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 ..."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Fråkopla Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Oppfrisk"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Lastar ned, vér god å vente ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Ukjend storleik"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Naudsynt informasjon"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP-adresse :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Brukarnamn :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Brukarhash :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Brukarhash"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Legg til"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Nedlastingsfart"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Novérande"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Køyregjennomsnitt"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Gjennomsnitt økt"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Opplastingsfart"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Koplingar"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktive nedlastingar"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktive koplingar (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktive opplastingar"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Statistikktre"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Brukarnamn:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Brukarhash:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Klientmjukvare:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Klienten si utgåve:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP-adresse:"
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "BrukarID:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Klientmjukvare"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Klienten si utgåve"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "BrukarID"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Tenar IP"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Tenar IP:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Tenarnamn"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Tenarnamn:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Tåkelegging"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Tåkelegging:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Protokolltåkeleggjing"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Overføringar til klient"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Novérande etterspurnader:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Gjennomsnittleg opplastingsfart:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Gjennomsnittleg nedlastingsfart:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Opplasta (økt):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Novérande etterspurnader"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Gjennomsnittleg opplastingsfart"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Gjennomsnittleg nedlastingsfart"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Opplasta (økt)"
 
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
 msgstr "Lasta ned (økt)"
 
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Opplasta (totalt):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Opplasta (totalt)"
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
 msgstr "Lasta ned (totalt)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Scorar"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "NL/OL endringsfaktor:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Sikker identifikasjon:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Sikker identifikasjon"
 
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "I kø"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
 msgstr "Køscore"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Kallenamn"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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."
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Forseinkinga før ein syner verktytips."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Dette vel språket som vert nytta på kontrollane."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Sjå etter ny utgåve ved oppstart"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Aktivering av denne vil få aMule til å sjå etter ei ny utgåve ved oppstart."
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Start minimert"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Aktivering av denne minimerer aMule ved oppstart."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Stadfest avslutting"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Aktivér trauikon"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Dette aktiverer/deaktiverer ikonet i systemtrauet (eller oppgåvelinja)."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimér til trauikon"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 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."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Hugs desse innstillingane"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Nettlesarval"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Bla"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Opne nytt faneblad dersom mogleg"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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"
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Videospelar"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Opplasting"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Opningsdistribusjon"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2k"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Automatisk tilkopling ved oppstart"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Kople til dersom fråkopla"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Ta bort daude tenarar etter"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "freistnader"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Automatisk oppdatering av tenarlista ved oppstart"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Liste"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Oppdater tenarlista ved oppkopling til ein tenar"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Oppdater tenarlista når ein klient koplar til"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Bruk prioritetssystem"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Bruk smart LågID sjekk ved tilkopling"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Trygg tilkopling"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Automatisk tilkopling berre til tenarar i statisk liste"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Gje høg prioritet til manuelt tillagde tenarar"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Legg filer til nedlasting i pausemodus"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Legg filer til nedlasting med autoprioritet"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 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:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Frå same kategori"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Hent diskplass for nye filer"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 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:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Skriv inn mimimum ønska diskplass."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Lagre 10 kjelder til sjeldne filer (< 20 kjelder)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Opplastingar"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Legg til nye delte filer med autoprioritet"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Ta bort"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Høgreklikk på mappeikonet for å dele underkatalogar)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Dele gøymde filer"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Fjern tenar"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Lokal tenar"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafar"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Oppdateringsforseinking: 5 sek"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Tid for gjennomsnittleg graf: 100 min"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Koplingsgrafskala: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Bakgrunn"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Rutenett"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Last ned novérande"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Last ned køyregjennomsnitt"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Last ned øktgjennomsnitt"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Opplasting no"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Gjennomsnittleg køyrande opplasting"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Gjennomsnittleg økt opplasting"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktive koplingar"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Fartslinje i ikontrauet"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Kadnodar no"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Køyrande kadnodar"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Kadnodar (økt)"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Velje"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Tal på klienutgåver synt (0=uinnskrenka)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! ÅTVARING !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Maks nye koplingar / 5 sek"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "FTP oppdateringsintervall i minutt"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "FTP oppdateringsintervall i minutt"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Filbufferstorleik: 240000·bytes"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Storleik på opplastingskø: 5000 klientar"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Oppfriskingsintervall for tenarkopling: Deaktiver"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Syne utvida informasjon i kategorifaneblad"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "Syne overføringsfart i tittellinja"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Syne overføringsfart i tittellinja"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Vertikal verktylinjeorientering"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Flat"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Rund"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule sorterer kolonnene i nedlastingslista di automatisk"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parameter for ekstern kopling"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Akseptér eksterne koplingar"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Aktivér UPnP-portvidaresending på EC-porten"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Passord"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Vevtenarparameter"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "TCP port: %d"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Sjekkar passord\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Sjekkar passord\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Nekt gjestetilgang"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Gjestepassord for vevtenar"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Vevtenarparameter"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Vevmønster"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Passord for fulle rettar"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Aktivér brukar med få rettar"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Passord for låge rettar"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Sideoppfriskingstid (i sekund)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Aktivér Gzipkompresjon"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Standardinnstillingar"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Klikk her for å utføre samtlege endringar gjorde i innstillingar."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Nullstill alle endringar i innstillingar."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Tittel :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Kommentar :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Innkomande kat:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Endre prioritet for nytileigna filer :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Innkomande kat"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Endre prioritet for nytileigna filer"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "Ikkje endre"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
 msgstr "Vel farge for denne kategprien (no valt)"
 
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Still attende"
-
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Klikk denne knappen for å nullstille loggen."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Klikk på denne knappen for å oppdatere tenarlista frå nettadresse ..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Tenarliste"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Legg til tenar manuelt: Namn"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Skriv inn namnet på den nye tenaren her"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Skriv inn porten til tenaren her."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Legg til ein tenar manuelt (fyll først ut felta til venstre) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMulelogg"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Tenarinfo"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2k-info"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kad-info"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Klikk på denne knappen for å oppdatere nodelista frå internettadresse ..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nodar (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Nodestatistikk"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Eigenoppstart"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Ny node"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Port:"
-
-#: src/muuli_wdr.cpp:2327
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Bootstrap from known clients"
+msgid "Bootstrap from node: IP"
 msgstr ""
 "Eigenoppstart frå \n"
 "kjende klientar"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Kople frå Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node 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:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Sikker brukaridentifikasjon (SUI)"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protokolltåkeleggjing"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Støtte protokolltåkeleggjing"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 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."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Bruk tåkeleggjing for utgåande koplingar"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 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 andreklientar/tenarar."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Berre godta tåkelagde koplingar"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Alle"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Ingen"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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."
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP-filtrering"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtrér klientar"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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."
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtrér tenarar"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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."
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Last om att lista"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "Nettadresse:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Oppdatér no"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Automatisk oppdatér ipfilter ved oppstart"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Filternivå:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Alltid filtrér LAN IP`ar"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoid handsaming av ujamne IP`ar"
 
-#: src/muuli_wdr.cpp:2438
-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."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Bruk systemomspennande ipfilter.dat dersom tilgjengeleg"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Tillat bruk av ipfilter for heile systemet dersom inga lokal ipfilter-dat vert funnen"
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Aktivér nettsignatur"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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å lage signaturar og liknande."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Oppdateringsfrekvens (sekund):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Endre frekvensen (i sekund) for oppdatering av nettsignaturar."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Datasnøggleik :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Kjelder"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4268,11 +5472,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4282,854 +5486,769 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Nedlasting: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Automatisk oppdatér ipfilter ved oppstart"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrér innkomande meldingar (utanom novérande samtale):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtrér alle meldingar"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtrér meldingar frå alle som ikkje er på kameratlista"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtrér meldingar frå ukjende klientar"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrér meldingar som inneheld (bruk ','som skiljeteikn):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "legg til ord aMule skal filtrére og blokkere"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Kommentarar"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrér kommentarar som inneheld (bruk ',' som skiljeteikn):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Aktivér godkjenning"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Aktivér/deaktivér godkjenning av brukarnamn/passord"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr ""
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Brukarnamn å nytte for å kople til vikar"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Passord:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Passord å nytte for å kople til vikar"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Aktivér vikar"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Aktivere/deaktivere vikarstøtte"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Vikartype:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Vikarvert:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Vikartype"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Vikarvert"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Vikaren sitt vertsnamn"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Vikarport:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Vikarport"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Vikarport"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Aktivér godkjenning"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Aktivér/deaktivér godkjenning av brukarnamn/passord"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Brukarnamn å nytte for å kople til vikar"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Passord å nytte for å kople til vikar"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Kople til:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Logge inn på fjern aMule"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Brukarnamn"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Hugs desse innstillingane"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Ekstern kopling lukka."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Nytt gzipkomprimering"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Aktivér utførleg avfeilingslogg."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&Opne fila"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Meldingskategoriar:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Ventar..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Importér"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Prøv om att valde"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Fjern valde"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "Aktive opplastingar :"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Syne klientar"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "Gøyme delte filer"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "Vel synsfilter"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "Aktive opplastingar"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "Syne klientar"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "Last om att lista"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Lastar inn att delte filer"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Send"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Sender meldinga."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Stengje denne lynmeldingsøkta."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Kople til vilkårleg tenar og/eller Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Avbryt"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Kople frå"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Delte filer"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Kople til"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Deaktivert %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
 msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/sek"
 msgstr1 "bytes/sek"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sekund"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "minutt"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "timar"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Dagar"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "dagar"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "alle"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "alle andre"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Uferdig"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Stogga"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arkiv"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Tekst"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Aktiv"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Denne kommandoen skulle ikkje ha nokon parameter."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Denne kommandoen skulle ikkje ha nokon parameter."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Denne kommandoen skulle ikkje ha nokon parameter."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Denne kommandoen skulle ikkje ha nokon parameter."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Skriv inn porten til tenaren her."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Skriv inn porten til tenaren her."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Skriv inn porten til tenaren her."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Importerer %s:·%s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Les mellombels mappe"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Hentar grunnleggjande informasjon frå nedlastingsinformasjonfil"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Lagar målfil"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Lastar data frå gamal nedlastingsfil (%u·av·%u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Hentar informasjon frå nedlastingsfilkjelde"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Legg til nedlasting og lagrar ny delfil"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importér delfiler"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Tilstand"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Filhash"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s·(Disk:·%s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Vil du slette kjeldefilene til vellukka importerte nedlastingar?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Ta bort kjelder?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "FEIL: Greidde ikkje å lage delfil"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Freistar å laste tryggleikskopi av met-fila frå %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "Feil: Greidde ikkje å opne mart.met fila: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, 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:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "FEIL: %s (%s) er korrupt (feil merkelappstal), greidde ikkje å laste fila."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Freistar å hente fram att filinformasjon..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Attskapte all tilgjengeleg filinformasjon :D - Freistar å nytte den..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Ikkje i stand til å attskape filinformasjon :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Greidde ikkje å opne %s·(%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "ÅTVARING: %s kan vere korrupt (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "FEIL under lagring av delfila: %s·(%s·==>·%s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 #, fuzzy
 msgid "IO failure while saving partfile: "
 msgstr "FEIL under lagring av delfila: %s·(%s·==>·%s)"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Lagra %i kjeldefrø for delfila: %s (%s)"
 msgstr1 "Lagra %i kjeldefrø for delfila: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Lagra %i kjeldefrø for delfila: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Fann korrupt del (%d) i %d delfil %s - Filresultathash |%s| Filhash | %s"
 msgstr1 "Fann korrupt del (%d) i %d deler i fila %s - Filresultathash |%s| Filhash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Fann ferdig del (%i)·i·%s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Ferdig med omhashing av %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, 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:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Ferdig med å laste ned: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Ferdig med å laste ned: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Slettar fila: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "ÅTVARING: Greier ikkje å hashe nedlasta del - hashsett ikkje komplett for '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "FEIL: Greier ikkje å hashe nedlasta del - hashsett ikkje komplett (%s). Dette burde aldri skje"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Nedlasta del %i er korrupt i fila: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Hentar plass"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Ikkje nok diskplass"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Lasta ned"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "Feil: Greidde ikkje opne delfila '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Standardinnstillingar"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albansk"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabisk"
-
-#: src/Preferences.cpp:640
-#, fuzzy
-msgid "Asturian"
-msgstr "Estisk"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baskisk"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgarsk"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalansk"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Kinesisk (forenkla)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Kinesisk (tradisjonell)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Kroatisk"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Tsjekkisk"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Dansk"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Nederlansk"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Engelsk (U.K.)"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Engelsk (U.K.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estisk"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finsk"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Fransk"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galisisk"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Tysk"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Gresk"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebraisk"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Ungarsk"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italiensk"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italiensk (sveitsisk)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japansk"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Koreansk"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Litauisk"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norsk (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polsk"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugisisk"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugisisk (Brasil)"
-
-#: src/Preferences.cpp:669
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "Romanian"
-msgstr "Albansk"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Russisk"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slovensk"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spansk"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Svensk"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Tyrkisk"
+msgid "Extended source exchange"
+msgstr "Kjeldeutveksling"
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:779
-#, fuzzy
-msgid "Change Language"
-msgstr "Språk"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Ikkje tilgjengeleg"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Standardport vert nytta (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Kopling"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Katalogar"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Tenarar"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Filer"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Tryggleik"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Fjernkontrollar"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Nettsignatur"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Hendingar"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Melde om feil"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5145,26 +6264,43 @@
 "aMule køyrer fint utan justering av nokon av\n"
 "desse innstillingane."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Typen vikar du koplar til"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Sjekkar passord\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5172,62 +6308,82 @@
 "aMule·treng omstart for å gjere endringane moglege:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "-·TCP-porten endra.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "-·UDP-porten endra.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "Ekstern kopling lukka."
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "Ekstern kopling lukka."
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "Ny ekstern kopling akseptert"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "Ekstern kopling lukka."
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Protokolltåkeleggjing"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Språk endra.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 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:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Språk endra.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Mellombels mappe endra.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- ED2K network enabled.\n"
 msgstr "Alle nettverk er deaktiverte."
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Ugyldig protokullutgåve."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5235,7 +6391,7 @@
 "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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5243,7 +6399,7 @@
 "Kad kan ikkje starte dersom UDP-porten er deaktivert.\n"
 "Aktivér UDP-porten eller deaktivér Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5253,20 +6409,69 @@
 "Du MÅ starte om att aMule no.\n"
 "Ikkje klag dersom du ikkje gjer dette og du får problem.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Autooppfrisking starta"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Du freistar allereie nedlasting av fila %s"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Ny ekstern kopling akseptert"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5276,41 +6481,66 @@
 "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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Mellombelse filer"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Innkomande filer"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Nettsignaturar"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Vel ei mappe for %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Fann %i kjend delt fil"
+msgstr1 "Fann %i kjende delte filer"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Bla etter videospelar"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Vél nettlesar"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Vél nettlesar"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Køyrbar%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Standardinnstillingar"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Handsame tenarlista"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5318,1212 +6548,1474 @@
 "Skriv inn URL`en for å laste ned server.met filer.\n"
 "Berre ein URL på kvar linje."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Komplette kjelder"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Status:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Status:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Oppdateringspause: %d sekund"
 msgstr1 "Oppdateringspause: %d sekund"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Tid for gjennomsnittleg graf: %d minutt"
 msgstr1 "Tid for gjennomsnittleg graf; %d minutt"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Koplingsgrafskala: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Filbufferstorleik: %d byte"
 msgstr1 "Filbufferstorleik: %d bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Opplastingskøstorleik: %d klient"
 msgstr1 "Opplastingskøstorleik: %d klientar"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Oppfriskingsinterval på tenarkoplingar: %d minutt"
 msgstr1 "Oppfriskingsinterval på tenarkoplingar: %d minutt"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Oppfriskingsintervall for tenarkopling: Deaktivert"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "disabled"
 msgstr "deaktivere"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Execute command on '%s' event"
 msgstr "Køyr kommando på `%s' hending"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Aktivér kommandokøyring i kjernen"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Kjernekommando:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Aktivér kommandokøyring på drakt"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Draktkommando:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Følgjande variablar vert erstatta:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Lastar inn att delte filer"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Lastar inn att delte filer"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Les mellombels mappe"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Lastar inn att lista over delte filer."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Delte filer"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Vel ei mappe for %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Hugs desse innstillingane"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Søkeåtvaring"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Søk"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "I framdrift"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Søkeåtvaring"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Hovud"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "ÅTVARING: Kjendfillista er korrupt; inneheld ugangbar overskrift."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Uventa feil oppstod under søk på Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "FilID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Ikkje gitt verdi"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Nedlasting i kategori"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "FilID"
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Legg til valfrie URL`ar for denne fila"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Stengje alle faneblad"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Søk beslekta filer (eD2k, lokal tenar)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Merk som kjend fil"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Kopier eD2k lenkje til skrivebordet"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopier eD2k lenkjer til skrivebordet"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Du er tilkopla tenaren du freistar å slette. Vér god å kople frå først."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "Avbryt"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Køyrer"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finsk"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static 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
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
 msgstr "Greidde ikkje å kople til alle tenarane i lista. Freistar ein gong til."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
+msgstr "Greidde ikkje å kople til alle tenarane i lista. Freistar ein gong til."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Automatisk tenaroppkopling freistar på nytt om %d sekund"
+msgstr1 "Automatisk tenaroppkopling freistar på nytt om %d sekund"
+
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr "Ingen gangbare tenarar funne i tenarlista"
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Tilkopla %s·(%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Kopling oppretta på: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Alvorleg feil i oppkopling. Internett kan vere nede"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Mista kopling til %s·(%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s·(%s:%i) ser ut til å vere daud."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s·(%s:%i) ser ut til å vere 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"
-msgstr0 "Automatisk tenaroppkopling freistar på nytt om %d sekund"
-msgstr1 "Automatisk tenaroppkopling freistar på nytt om %d sekund"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Kopling mista"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Tilkopling til %s·(%s:%i)·mislukka."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "FEIL: Ugangbar sokkel ved uttellingssjekk"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Tilkoplingsfreisting til %s·(%s:%i)·gjekk over tida."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Lastar server.met fila: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Server.met fila ikkje funnen!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Greidde ikkje å laste inn server.met fila '%s' - ukjend filformat."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Greidde ikkje å opne server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i tenar funne i server.met"
 msgstr1 "%i tenarar funne i server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d tenar lagd til"
 msgstr1 "%d tenarar lagde til"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "IO feil underlesing av known.met fila: %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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'."
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 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."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Greidde ikkje å opne '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Greidde ikkje å lagre server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "IO feil underlesing av known.met fila: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Ugangbar URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Tenarlista ferdig nedlasta frå %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Last ned tenarlista frå %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "ÅTVARING: ikkje gangbar URL for automatisk oppdatering av tenarar: %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Ugangbar autonedlastingsnettside for server.met i addresses.dat"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Greidde ikkje å laste ned tenarlista frå %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 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/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Skildring"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Brukarar"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Brukarar"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Statisk"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Utgåve"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Filer"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Delte filer"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Du er tilkopla ein tenar du freistar å slette. Vér god å kople frå først. Tenaren vart IKKJE sletta."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Ukjent namn)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "minutt"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Tenarar (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Tenar"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Kople til tenar"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Merk tenar som statisk"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Merk tenar som ustatisk"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Merk tenarar som statiske"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Merk tenarar som ustatiske"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Ta bort tenar"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Ta bort tenarar"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Fjern alle tenarar"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopier eD2k lenkjer til skrivebordet"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Kople til tenar att"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 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:548
+#: src/ServerListCtrl.cpp
 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:550
+#: src/ServerListCtrl.cpp
 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:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "FEIL: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "ÅTVARING: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Ny klientid er %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "ÅTVARING: Du har motteke ein Låg-ID!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tFor meir informasjon, sjå https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Ukjend tenarinfo motteke! - for kort"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Tok mot %d ny tenar"
 msgstr1 "Tok mot %d nye tenarar"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Lagring av tenarlista ferdig."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Tenar avviste siste kommando"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Falske pakkar mottekne frå tenar: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "Tenar IP %s·(%s) er filtrert.  Koplar ikkje til."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "brukar protokolltåkelegging."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Koplar til·%s·(%s·-·%s:%i)·%s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "aMulelogg"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Tenar ikkje lagd til: Manglar IP eller vertsnamn."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Tenar ikkje lagd til: Ikkje gangbar tenarport."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "eD2k status:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Tilkoplingsstatus:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Tilkopla"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kademlia status:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Running in LAN mode"
 msgstr "Køyrer på %s"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Køyrer"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Kademlia status"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Status:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Tilkoplingsstatus:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "UDP Connection State:"
 msgstr "Tilkoplingsstatus:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Brannmura status: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Ingen kamerat"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connecting to buddy"
 msgstr "Tilkopla kamerat"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, fuzzy, c-format
 msgid "Connected to buddy at %s"
 msgstr "Tilkopla kamerat"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP-adresse:"
+
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed sources:"
 msgstr "Funne kjelder :"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed notes:"
 msgstr "Registerfil ikkje funne: "
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Gjennomsnitt brukarar:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Gjennomsnitt filer:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Køyrer ikkje"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Fann %i kjend delt fil"
 msgstr1 "Fann %i kjende delte filer"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Fann %i kjend delt fil, %i ukjend"
-msgstr1 "Fann %i kjende delte filer, %i ukjende"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "FEIL: Freista å dele %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "tenar ikkje funnen: %s"
 
-#: src/SharedFileList.cpp:486
-#, c-format
-msgid "No shareable files found in directory: %s"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "tenar ikkje funnen: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "Brukarnamn"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "Nedlastingsfart"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Feil under lagring av known.met fila: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "Opplastingsfart"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Lastar server.met fila: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Lastar server.met fila: %s"
+msgstr1 "Lastar server.met fila: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Fann %i kjend delt fil"
+msgstr1 "Fann %i kjende delte filer"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "Tilgjengeleg:"
+msgid "User Name"
+msgstr "Brukarnamn"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "Opplastingsstatus"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "Nedlastingsstatus"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "Filnamn"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "Delte filer"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Etterspurnader"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Godtekne etterspurnader"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Overførte data"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Delingssamsvar"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Nedlasta delar"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Komplette kjelder"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Tilgjenge"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Katalogsti"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Delte filer"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Legg til kommentar/Rangering"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Endre kommentar/Rangering"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Endre namn"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Legg filer frå samlinga til overføringslista"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Kopiér magnet &URI til utklippstavla"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Kopier eD2k lenka til utklippstavla (&Kjelde)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Kopier eD2k lenkje til utklippstavle (Kjelde) &Med krypteringsval)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Kopier eD2k lenkje til utklippstavla (&Vertsnamn)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Kopier eD2k lenkje til utklippstavla (Vertsnamn) (Med &krypteringsval)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Kopier eD2k lenkje til utklippstavla (&AICH info)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Kopier eD2k lenkje til utklippstavla (&AICH info)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Du treng ein HøgID for å lage ei gangbar kjeldelenkje"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Feil ved ferdigstilling"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Greidde ikkje å hente delte filer frå brukar '%s'"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Lastar inn att delte filer"
+msgstr1 "Lastar inn att delte filer"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Total storleik på delte filer: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Total storleik på delte filer: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Delte filer (%i)"
+msgstr1 "Delte filer (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Delte filer (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Delfil"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Lastar inn att lista over delte filer."
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Status"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "Filnamn"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Opplasta data (økt (total)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Totalt dataoverskot (pakkar): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Dataoverskot på filetterspurnader (pakkar): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Dataoverskot på kjeldeutveksling (pakkar): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Dataoverskot på tenar (pakkar): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Dataoverskot Kad (pakkar): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Krypteringsdataoverskot (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Aktive opplastingar: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Ventande opplastingar: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Tal på samtlege vellukka opplastingar: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Tal på samtlege mislukka opplastingar: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Gjennomsnittleg opplastingstid: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Nedlasta data (økt (total)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Funne kjelder: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Aktive nedlastingar (delar): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Økt OL:NL proporsjon (total): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Gjennomsnittleg nedlastingsfart (økt): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Gjennomsnittleg opplastingsfart (økt): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Raskaste nedlastingsfart (økt): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Raskaste opplastingsfart (økt): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Attkoplingar: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Tid sidan første overføring: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Tilkopla tenar sidan: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Aktive koplingar (berekna): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Maksimal koplingsgrense nådd: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Gjennomsnittleg tal på koplingar (berekna): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Topp koplingar (berekna): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Klientar"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "Ukjend storleik"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "Filtrert"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Banned: %s"
 msgstr "Nekta"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Total:·%i·Kjend:·%i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Fungerande tenarar: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Mislukka tenarar: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Total:·%s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Sletta tenarar: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Filtrerte tenarar: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Brukarar på fungerande tenarar: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Filer på fungerande tenarar: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Totalt brukertal: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Totalt filtal: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Tenerlast: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Tal på delte filer: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Total storleik på delte filer: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Gjennomsnittleg filstorleik: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Operativsystem"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Ikkje motteke"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktive koplingar (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Ikkje tilgjengeleg"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Aldri"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Køyr <str> og avslutt."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Handsamar etter hash"
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Handsamar etter filnamn"
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Denne kommandoen krever eit argument: Gangbare argument: ein filhash.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Ikkje gangbart tal\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "Ikkje gangbar hash (lengde må vere nøyaktig 32 teikn)\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6532,7 +8024,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6541,83 +8033,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "Skriv '%s'·for å få meir hjelp.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Nedlastingar (%i)"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Etterspurnaden mislukka med ukjend feil."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operasjonen var vellukka"
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Etterspurnaden mislukka med følgjande feil: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "IP-filtréring for klientar er %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "AV"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "PÅ"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "IP-filtréring for tenarar er %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Novérande IPFilternivå er %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Tilkopla %s·%s·%s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Koplar til no"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "brannmura"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6626,7 +8122,7 @@
 "\n"
 "Nedlasting:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6635,7 +8131,7 @@
 "\n"
 "Opplasting:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6644,7 +8140,7 @@
 "\n"
 "Klientar i kø:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6653,38 +8149,33 @@
 "\n"
 "Alle kjelder:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Delfil"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Tal på søkjeresultat: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr ""
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Tok imot ukjend svar frå tenaren, OpCode·=·%#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Syne kort statusinformasjon."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Syne koplingsstatus, noverande opp- og nedlastingsfart, osb.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Syne fullt statistikktre."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6698,11 +8189,11 @@
 "\n"
 "Til dømes: 'statistics 5' vil berre syne dei 5 utgåvene på top for kvar klienttype.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Avslutt aMule"
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6711,40 +8202,40 @@
 "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:994
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload the given object."
 msgstr "Lastar inn att valt objekt."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload shared files list."
 msgstr "Lastar inn att lista over delte filer."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload IP filtering table."
 msgstr "Lastar om att ipfiltertabell frå fil."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload current IP filtering table."
 msgstr "Vel Ipfilternivå"
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Update IP filtering table from URL."
 msgstr "Lastar om att ipfiltertabell frå fil."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Kople til nettverket."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6756,36 +8247,36 @@
 "den tenaren. IP`en må vere ei punktmerka og desimal IPv4-adresse.\n"
 "eller eit løyseleg DNS-namn."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Kople til berre eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Berre kople til Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Kople frå nettverket."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Kople frå berre eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Berre kople frå Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Add an eD2k or magnet link to core."
 msgstr "Legg til ei eD2k eller magnetlenkje  til kjernen"
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6803,52 +8294,52 @@
 "\n"
 "Magnetlenkja må innehalde eD2k hashen og fillengda.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Set ein brukarvalverdi."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Set IP filtering preferences."
 msgstr "Set brukarval for ipfilter."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 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:1020
+#: src/TextClient.cpp
 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:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Aktivér/deaktivér IP-filtrering av klientar."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Slå IP-filtréring på for klientar."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Slå IP-filtréring av for klientar."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Aktivér/deaktivér IP-filtrering av tenarar."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Slå IP-filtréring på for tenarar."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Slå IP-filtréring av for tenarar."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Vel Ipfilternivå"
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6856,66 +8347,80 @@
 "Gangbart filtréringsnivå er mellom 0-255, og den opprinnelege\n"
 "verdien er 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Set bandbreiddegrense."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Set bandbreiddegrense for opplastingar."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Verdien i desse kommandoane må vere i kilobytes/sek.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Set bandbreiddegrense for nedlastingar."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Aktivér/deaktivér godkjenning av brukarnamn/passord"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Verdien i desse kommandoane må vere i kilobytes/sek.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Hent og syne ein preferanseverdi."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering preferences."
 msgstr "Hent ipfilterinnstillingar"
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Hent ipfilterstatus for både klientar og tenarar."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for clients only."
 msgstr "Hent ipfilterstatus for klientar."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for servers only."
 msgstr "Hent ipfilterstatus for tenarar."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering level."
 msgstr "Vel Ipfilternivå"
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Hent bandbreiddegrense."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a search."
 msgstr "Startar eit kadsøk"
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6934,46 +8439,48 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a global search."
 msgstr "Startar eit globalt søk"
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a local search"
 msgstr "Startar eit lokalt søk"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a kad search"
 msgstr "Startar eit kadsøk"
 
-#: src/TextClient.cpp:1070
+#: src/TextClient.cpp
 #, fuzzy
-msgid "Show the results of the last search."
+msgid "Show the results of a search."
 msgstr "Syne resultata av siste søk."
 
-#: src/TextClient.cpp:1071
-#, fuzzy
-msgid "Return the results of the previous search.\n"
-msgstr "Returnerer resultata frå det tidlegare søket.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "Syner framdrifta i eit søk."
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "Syner framdrifta i eit søk-\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Start nedlasting av ei fil"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6981,82 +8488,82 @@
 "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:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Set nedlasting på pause."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Hald fram nedlasting."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Avbryt nedlasting"
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Set nedlastingsprioritet."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Set prioritet til låg."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Set prioritet til normal."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Set prioritet til høg."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Set prioritet til auto."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Syne køer/lister."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 #, 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Syne opplastingskø"
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Syne nedlastingskø."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Syne logg."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Syne tenarlister."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Lastar inn att lista over delte filer."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Nullstill logg."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Forelda kommando; bruk '%s' i staden."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7065,256 +8572,279 @@
 "Dette er ein forelda kommando som ikkje lenger er tilrådd, og kan verte fjerna i framtida.\n"
 "Bruk '%s' i staden\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule tekstklient"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Slettar fila: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Slettar fila: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Held fram opplastingar av fila: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Stadfesting naudsynt"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "For mange koplingar"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Alle andre"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Vel synsfilter"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Legg til kategori"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Redigér kategori"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Ta bort kategori"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Hashsett etterspurt for ukjend fil: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Vel kven som kan be om å sjå ei liste over dei delte filene dine."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Held fram opplastingar av fila: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Mellombels stogge opplastingar av fila: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Greidde ikkje å utføre kommendoen `%s'·på·`%s hending."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Greidde ikkje å utføre kommendoen '%s'·på·`%s hending."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Nedlasting fullført"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Fullstendig sti til fila"
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Namnet til fila utan stikomponent."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "eD2k hash på fila"
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Filstorleiken i bytes."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Samla tid på nedlastingsaktivitet."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Ny lynmeldingsøkt starta"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Meldingssendar."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Tom for plass"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Diskpartisjon,"
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Feil ved ferdigstilling"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Handsamar filnummer %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s·--->·Fila finst ikkje·!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, lenkjeskaparen for aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Velkomen!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Innmatingsparameter"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Fil å hashe"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Legg til valfrie URL`ar for denne fila"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:144
-msgid "Remove"
-msgstr "Ta bort"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Lag lenkje "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4 filhash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k filhash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k lenkje"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Lagre"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Kopiér til utklippstavle"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Kopier utrekna eD2k lenkje til skrivebordet"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Lagre utrekna eD2k lenkje til fil"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Om aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Ikkje noko å kopiére no !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Vel fila til den utrekna eD2k lenka"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Ikkje i stand til å opne "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Ikkje noko å lagre akkurat no !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7334,162 +8864,159 @@
 "\n"
 "Distribuert under GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Hashar..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Avbrote!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Ferdig om %.2f·s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Du har allereie lagt til denne URL`en!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Vér god å skrive inn ein URL som ikkje er tom"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Ikkje i stand til å opne %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f·KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "WxCas, aMule nettstatistikk"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Høgaste nedlastingsfart medan wxCas har køyrt"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Still attende"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "System"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Stopp. Autooppfrisking"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Lagre nettstatistikkbiletet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Skriv ut nettstatistikkbiletet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Innstillingsval"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Om wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Start autooppfrisking"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Autooppfrisking stogga"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Autooppfrisking starta"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Lagre statistikkbilete"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMule nettstatistikk"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7497,11 +9024,11 @@
 "Det oppstod eit problem med utskrifta.\n"
 "Kanskje er ikkje skrivaren din innstilt skikkeleg?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Skriv ut"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7519,402 +9046,533 @@
 "\n"
 "Distribuert·under·GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Å nei, aMule køyrer ikkje..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule køyrer"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule køyrer, men fråkopla"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule koplar til..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Å nei, ukjend status for aMule..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " har køyrt i "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " er stogga !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " er ikkje tilkopla !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " koplar til..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " gjer noko rart, sjekk det !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " er tilkopla "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "av"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " er på "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " med "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Total nedlasting: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr " Opplasting: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Nedlasting denne økta: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Nedlasting: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, opplasting: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Deler: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " filer, klientar i kø: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Tid: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " på "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Gjennomsnittleg systembelasting (1-5-15·min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Oppetid: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Katalog som inneheld amulesig.dat fila"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Oppfriskingsintervall i sekund"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Lag eit statistikkbilete ved kvar oppfriskingshending"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Last regelbunde opp statistikkbilete til ein FTP tenar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP-Url"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTPsti"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Skriv inn URL til FTP tenar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Brukar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTP oppdateringsintervall i minutt"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Validere"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Katalog som inneheld signaturfila di"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Katalog der statistikkbiletet vert laga"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Lastar modell <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "HTTP port for vevtenar"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Bruk UPnP portvidarekopling på vevtenarport"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP port"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Nytt gzipkomprimering"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Fulltilgangspassord for vevtenar"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Gjestepassord for vevtenar"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Gje løyve til gjestetilgang"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Nekt gjestetilgang"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "Last/lagre vevtenarinnstillingar frå/til fjern aMule"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMule konfugurasjonsfilsti. IKKJE NYTT DIREKTE!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Deaktivér PHP tolk (frårådd)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Omkompilér PHP-sider ved kvar etterspurnad"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule vevtenar"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "vevklientoppkopling godkjend\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Etterspurnaden mislukka med følgjande feil: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Registerfil ikkje funne: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Økt utgått - ber om logginn\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Økt ok, logga inn\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Økt ok, ikkje innlogga\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Inga økt opna - vil be om logginn\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Økt oppretta - ber om logginn\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Handsamar etterspurnad original: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Sjekkar passord\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Passord hash feil\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Passord ok\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Feil passord\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Utlogging etterspurt\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Handsamar etterspurnad omdirigert: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Oppkopling mislukka "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Lasta opp"
+#~ msgid "Ratio"
+#~ msgstr "Verdi"
+
+#, fuzzy
+#~ msgid "Change Language"
+#~ msgstr "Språk"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "Ikkje tilgjengeleg"
+
+#~ msgid "User name"
+#~ msgstr "Brukarnamn"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Nedlasta delar"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "Tilgjengeleg:"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Fann %i kjend delt fil, %i ukjend"
+#~ msgstr1 "Fann %i kjende delte filer, %i ukjende"
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d·%H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Fjern tenar"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Lokal tenar"
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Lastar data frå gamal nedlastingsfil (%u·av·%u)"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr "Vel ein videospelar i innstillingar for å hindre at denne åtvaringa kjem opp ved kvar førehandssyning (%s er standard)"
+
+#~ msgid "Filter Results"
+#~ msgstr "Filtrér resultat"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Merk som kjend fil"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Eigenoppstart"
+
+#~ msgid "New node"
+#~ msgstr "Ny node"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Meir"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Eigenoppstart frå \n"
+#~ "kjende klientar"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Kople til vilkårleg tenar og/eller Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Kople frå Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Stopp inneverande oppkoplingsfreistingar"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Kople frå dei aktive nettverka"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Kople til dei valde nettverka"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule sorterer kolonnene i nedlastingslista di automatisk"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Returnerer resultata frå det tidlegare søket.\n"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Fil ikkje funne."
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Syner framdrifta i eit søk-\n"
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Sjå etter ny utgåve ved oppstart"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k lenkje: "
+
+#~ msgid "Commit"
+#~ msgstr "Iverksetje"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "\tFor meir informasjon, sjå https://amule-org.github.io/docs"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Vér god å rapportere feil til https://github.com/amule-org/amule/issues"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Lasta opp"

amule-3.0.1.tar.gz/po/pl.po -> amule-3.1.0.tar.gz/po/pl.po Changed

@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:20+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:00+0000\n"
 "Last-Translator: Michał Trzebiatowski <hippie_1968@hotmail.com>\n"
 "Language-Team: translationproject.org/team/pl.html <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -23,71 +23,159 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Pokaż aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "zdalna kontrola aMule "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Zrzut ekranu:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"\"Ogólnie-Platformy\" klient P2P oparty na eMule\n"
+"\n"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2019 Zespół aMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Część aMule oparta jest na \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: routing peer-to-peer oparty na metryce XOR.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Strona internetowa:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Forum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Sprawdź podczas startu czy jest nowa wersja"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Łączę z Kad..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Używasz przestarzałej wersji aMule!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Niedostępny"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Dodaj znajomego"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Musisz wpisać poprawne IP oraz port!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informacje"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Wybrany skrót użytkownika jest niepoprawny!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "Add aMule to your application menu?"
 msgstr "Za nazwą aplikacji"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Nieudane połączenie "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -96,83 +184,161 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+msgid "Failed to open ED2KLinks file."
+msgstr "Nie udało się otworzyć pliku ED2KLinks."
+
+#: src/amuleAppCommon.cpp
+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/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "dialog aMule zniszczony"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Nie znaleziono pliku indeksu: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Nieudane pobieranie udostępnionych plików od użytkownika '%s'"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "Nie znaleziono plików do udostępniania w katalogu: %s"
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
 msgstr0 ""
 msgstr1 ""
 msgstr2 ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "BŁĄD"
-
-#: src/amuleAppCommon.cpp:179
-msgid "Failed to open ED2KLinks file."
-msgstr "Nie udało się otworzyć pliku ED2KLinks."
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Nie można skonwertować magnet linka do eD2k: %s"
 
-#: src/amuleAppCommon.cpp:252
-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/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Nieprawidłowy link eD2k! BŁĄD: %s"
 
-#: src/amule.cpp:251
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Teraz, zakańczam główną aplikację..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Zakańczam instancję amuleweb z pid `%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Zabiłam instancję amuleweb z pid `%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Nieudane"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Zakańczam instancję amuleweb z pid `%d' ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Zabiłam instancję amuleweb z pid `%d' ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Zakończenie jądra."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "Zamykanie aMule zakończone."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Wyniki debugu pamięci dla wyjścia aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Twoje ustawienia lokalne zostały zmienione na domyślne systemowe w związku ze zmianą konfiguracji. Przepraszamy."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Informacje"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -180,56 +346,109 @@
 "\n"
 "Konfiguracja EC"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Ustawione hasło i włączone połączenia zewnętrzne."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "UWAGA"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i serwer znaleziono w server.met"
+msgid "Loading temp files"
+msgstr "Ładowanie plików tymczasowych z %s."
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Ładowanie plików tymczasowych z %s."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Przeładuj twoje udostępnione pliki"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Przeładuj twoje udostępnione pliki"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Start"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Sieci"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Sieci"
+msgid "eD2k server list (server.met)"
+msgstr "%i serwer znaleziono w server.met"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "serwer sieciowy uruchomiony na pid %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 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/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "BŁĄD"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "serwer sieciowy uruchomiony na pid %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+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/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nie można było powiązać portów z określonym adresem: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port %u jest niedostępny. Będziesz mieć LowID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -244,48 +463,48 @@
 "\n"
 "Sprawdź swoją sieć aby mieć pewność, że port jest otwarty dla wejścia i wyjścia."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Nie udało się utworzyć pliku podpisu online"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Nie udało się utworzyć pliku podpisu online aMule"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Po raz pierwszy uruchomiłeś aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Ta wersja jest aktualizowaną codziennie wersją testową i\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "https://amule-org.github.io lub na naszym kanale IRC: #aMule na irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Nie wahaj się zgłaszać jakichkolwiek błędów na https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -293,594 +512,623 @@
 "Katalog wybrany na pliki sygnatury online jest nieprawidłowy!\n"
 " Sygnatura online zostanie wyłączona dopóki nie poprawisz tego w preferencjach."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Zawiadomiono nazwę hostu serwera"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, 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/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "BŁĄD: nie mogę otworzyć pliku logów"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "UWAGA: plik logów jest pusty. Coś jest nie tak."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Logi zostały zresetowane"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Wiadomość z serwera: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, 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/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Pobieranie listy węzłów nie powiodło się."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Nie można otworzyć pobranego pliku kontroli wersji"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Uszkodzony plik kontorli wersji"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Używasz przestarzałej wersji aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Najnowsza wersja jest zawsze dostępna na https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Twoja kopia aMule jest przestarzała."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Nie udało się pobrać pliku kontroli wersji"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Użytkowników: %s | Plików: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Nie wybrano sieci"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "z LowID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "z HighID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Połączony z %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Łączenie z %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Rozłączono z eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Włączono Kad."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Zatrzymano Kad."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Połączono z Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Połączono z Kad (za firewallem)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Rozłączono z Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Zablokowano sieć Kad w preferencjach, nie łączę."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 #, fuzzy
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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 https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - począwszy timer"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: rozdzielanie tła - do zobaczenia"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Nie można utworzyć pliku Pid"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "BŁĄD: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "To jest aMule %s oparty na eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Uruchomiony na %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Odwiedź https://github.com/amule-org/amule/releases/latest aby sprawdzić czy jest dostępna nowa wersja."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "KRYTYCZNY BŁĄD: Nie udało się utworzyć Timera"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "zdalna kontrola aMule "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Zrzut ekranu:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Sieci"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"\"Ogólnie-Platformy\" klient P2P oparty na eMule\n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Szukaj"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Strona internetowa: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Pobieranie"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Udostępnione pliki"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Strona internetowa: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Klienci"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Wiadomości"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2019 Zespół aMule \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statystyki"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Część aMule oparta jest na \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Preferencje"
 
-#: src/amuleDlg.cpp:552
-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
+msgid "Navigate"
+msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Wiadomość z serwera: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Wiadomość"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Niedostępny"
+
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Najnowsza wersja jest zawsze dostępna na https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "dialog aMule zniszczony"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Łączenie"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Łączenie"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Rozłączony"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Za firewallem"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Połączony"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Łączenie"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Wyłączony"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Anuluj"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Zatrzymaj aktualne próby połączenia"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Wersja"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Rozłącz"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Rozłącz z aktualnie połączonymi sieciami"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Podłącz"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adres"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Połącz z aktualnie włączonymi sieciami"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Opis"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "Logi aMule"
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Wysł: %.1f(%.1f) | Pobr: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Wysł: %.1f | Pobr: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Połączony)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Rozłączony)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Czy na pewno chcesz opuścić %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Potwierdzenie wyjścia"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Uruchomienie polecenia: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- domyślnie -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Katalog skórek '%s' nie istnieje"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, 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:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Sieci"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Okno sieci"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Szukaj"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Okno wyszukiwania"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Pobieranie"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Okno pobierań"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Udostępnione pliki"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Okno udostępnionych plików"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Wiadomości"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Okno sieci"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Okno wiadomości"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statystyki"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Okno wykresów statystyk"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Preferencje"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Okno preferencji"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Import"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Narzędzie importowania plików części"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Informacje o"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Informacje/Pomoc"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Sieć eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Sieć Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Brak sieci"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Pilot aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Krytyczny Błąd: Nie udało się utworzyć Timera Core"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Podłączony do zdalnego amule"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Utracono połączenie"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Pytaj przy wyjściu"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Krytyczny Błąd: Nie udało się utworzyć Timera Poll"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Przechodzę do pętli wydarzenia..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Zdalne GUI EC obsługi zdarzenia"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 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/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Zamykanie"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Połączenie zostało zamknięte - aMule prawdopodobnie zakończone."
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Próba połączenia z %s (%s:%i) przedawniła się."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Wyłączony"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Połącz z siecią."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Połączenie nie powiodło się. Nie można połączyć się z %s:%d\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Gotowy"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Wszystkie"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Niedostępne"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Nie znaleziono pliku."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Nieprawidłowy lub znajdujący się już na liście link."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Folder dla pobranych plików tymczasowych"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr "Nie można utworzyć katalogu '%s' dla kategorii '%s', używany jest nadal katalog '%s'."
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Nieudane pobieranie udostępnionych plików od użytkownika '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Szukam kolegi dla połączenia lowid"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Fałszywa wersja eMule %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Fałszywy eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Fałszywy eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (oparty na eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Użytkownik: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Zażądano:  %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
@@ -888,7 +1136,7 @@
 msgstr1 "Statystyki plików tej sesji: Zaakceptowano %d z %d żądań, %s przesłano\n"
 msgstr2 "Statystyki plików tej sesji: Zaakceptowano %d z %d żądań, %s przesłano\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
@@ -896,119 +1144,201 @@
 msgstr1 "Statystyki plików dla wszystkich sesji: Zaakceptowano %d z %d żądań, %s przesłano\n"
 msgstr2 "Statystyki plików dla wszystkich sesji: Zaakceptowano %d z %d żądań, %s przesłano\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Zażądano nieznany plik"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Wiadomość przefiltrowana od '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nowa wiadomość od '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Użytkownik %s (%u) zażądał twojej listy plików udostępnionych w katalogu %s -> Odmówiono"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Nieudane pobieranie udostępnionych plików od użytkownika '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "UWAGA: %s nie może być otwarty."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "OSTRZEŻENIE: Anulowana lista plików uszkodzona, zawiera nieprawidłowy nagłówek."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Błąd IO podczas odczytu pliku %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Błąd podczas zapisywania pliku %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Wpisz Captcha"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategoria"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nowa kategoria"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Wybierz folder na pobierane pliki"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Musisz określić nazwę kategorii!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Musisz określić ścieżkę dla kategorii!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Rozpoczęto sesję czata: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Połączony do klienta ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Łączenie z klientem ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Nie udało się połączyć do klienta / Połączenie utracone ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 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/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Chat"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Zamknij kartę"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Zamknij wszystkie karty"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Zamknij inne karty"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Dodaj do znajomych"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Pokaż &szczegóły"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Usuń ze znajomych"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Ustaw slot dla znajomego"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Pokaż pliki"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Wyślij wiadomość"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Wyślij wiadomość do użytkownika"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Wiadomość do wysłania:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Nie możesz ustanowić więcej niż jeden slot dla znajomego.\n"
+"Przydzielono tylko jeden slot."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Wybór wielu"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Usuń ze znajomych"
+msgstr1 "Usuń ze znajomych"
+msgstr2 "Usuń ze znajomych"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Przeładowuje listę udostępnionych plików."
+msgstr1 "Przeładowuje listę udostępnionych plików."
+msgstr2 "Przeładowuje listę udostępnionych plików."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
@@ -1016,7 +1346,7 @@
 msgstr1 "Plik kredytów załadowany, %u klientów jest znanych"
 msgstr2 "Plik kredytów załadowany, %u klientów jest znanych"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
@@ -1024,160 +1354,271 @@
 msgstr1 " - Kredyty wygasły dla %u klientów!"
 msgstr2 " - Kredyty wygasły dla %u klientów!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Nie znaleziono pliku cryptkey.dat, tworzenie."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Szczegóły klienta"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Włączony"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Obsługiwany"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Nieobsługiwany"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Wyłączony"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Połączony"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Rozłączony"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nazwa"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Adres IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Źródło"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Ostatnio widziany"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Wersja"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Prędkość wysyłania"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Prędkość pobierania"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Wysłano"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Razem pobranych: "
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Modyfikator DL/UL"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Sygnatura Online"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Niekompletne"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Zły człowiek"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Weryfikacja - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "Brak"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Niedostępne"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Pliki"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Wysłano"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Pobrano"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Pobieranie"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Wysyłanie"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Aktywny"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Nieznany"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Użytkownik %s (%u) zażądał twojej listy udostępnionych plików-> Zaakceptowano"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 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/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Użytkownik %s (%u) żążądał twojej listy udostępnionych katalogów -> Odmówiono"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, fuzzy, 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/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, fuzzy, 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/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Użytkownik %s (%u) udostępnia katalog %s"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Użytkownik %s (%u) wysłał niechciane katalogi udostępnione."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Użytkownik %s (%u) wysłał niechcianą listę udostępnionych plików"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "Użytkownik %s (%u) odmówił dostępu do listy udostępnionych plików/katalogów"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Komentarze pliku"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Nazwa pliku"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Ocena"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Komentarz"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "Szukam kolegi dla połączenia lowid"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Bez komentarza"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
@@ -1185,409 +1626,416 @@
 msgstr1 "%u komentarze"
 msgstr2 "%u komentarzy"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 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:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Nie można połączyć się z serwerem pobrania HTTPNie powiodło się pobranie GeoIP.dat z %s"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Ni"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Wy"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Bardzo niski"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Niski"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normalny"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Wysoki"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Bardzo wysoki"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Wydanie"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Pytam"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Połączenie przez serwer"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Pełna kolejka"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "W kolejce"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Pobieranie"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Odbieram zestaw skrótów"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Brak potrzebnych części"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Nie można połączyć LowID do LowID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Zbyt dużo połączeń"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Połączenie przez Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Zbyt dużo połączeń Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Zbanowany"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Błąd połączenia"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Zdalna kolejka pełna"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Stary MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Nowy MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Kompatybilny z eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Serwer lokalny"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Serwer zdalny"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Wymiana źródeł"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Pasywny"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Link"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Ziarna źródła"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Wynik wyszukiwania"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Zakończono"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "W trakcie"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "BŁĄD: Brak przestrzeni dyskowej"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "BŁĄD: Nie znaleziono partmet"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "BŁĄD: Błąd IO!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "BŁĄD: Niepowodzenie!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "W kolejce"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Aktualnie pobierane"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Nieznany lub błędny format pliku tymczasowego."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Część"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Przesłano"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Prędkość"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Postęp"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Źródła"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Priorytet"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Status"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Pozostało czasu"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Ostatnio widziano cały"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Ostatnio widziany"
 
-#: 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/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Jesteś pewien, że chcesz usunąć wybrane pliki?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Informacja zwrotna od:  %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automatyczny"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Zatrzymaj"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pauza"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Wznów"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Wyczyść s&kończone"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Przerzuć wszystkie A4AF do tego pliku"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Przerzuć wszystkie A4AF do tego pliku (Auto)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Przerzuć wszystkie A4AF do każdego innego pliku"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Zaawansowane opcje"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Podgląd"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Pokaż &szczegóły pliku"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Pokaż wszystkie komentarze"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Skopiuj magnet URI do schowka"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Kopiuj &link eD2k do schowka"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Kopiuj informację zwrotną do schowka"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Dodaj opcjonalny URL dla tego pliku"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "nieprzydzielony"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Przydziel do kategorii"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Otwórz plik"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Jesteś pewien, że chcesz usunąć wybrany plik?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Jesteś pewien, że chcesz usunąć wybrane pliki?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Informacja zwrotna od:  %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Wprowadź nową nazwę dla tego pliku:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Zmień nazwę"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Pobieranie (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Aby zapobiec pojawianiu się tego komunikatu przy każdym podglądzie,\n"
-"ustaw swój odtwarzacz wideo w preferencjach (domyślny jest %s)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Podgląd pliku"
+msgid "Downloads (%i)"
+msgstr "Pobieranie (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, 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/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Razem DL: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Zapisywanie pliku części %u z %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Wszystkie pliki części zapisane."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Ładowanie plików tymczasowych z %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Ładowanie pliku części %u z %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "BŁĄD: Załadowanie pliku kopii zapasowej nieudane. Poszukaj na https://github.com/amule-org/amule/discussions sposobów odzyskiwania .part.met."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Wszystkie pliki części załadowane."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Nie znaleziono plików z częściami"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
@@ -1595,45 +2043,45 @@
 msgstr1 "Znaleziono %u pliki części"
 msgstr2 "Znaleziono %u plików części"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 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:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 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:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Pobieranie %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Starasz się już pobierać plik '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Masz już ten plik '%s'"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Masz już ten plik '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Starasz się już pobierać plik %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Nie można skonwertować magnet linka do eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Nieznany protokół linku: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
@@ -1641,238 +2089,320 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Nieprawidłowy link eD2k! BŁĄD: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Klient wysyła pakiet po nie udanym uwierzytelnieniu."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Zewnętrzne połączenie zamknięte."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 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:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Zewnętrzne połączenia wyłączone w pliku konfiguracyjnym"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Nowe zewnętrzne połączenie zaakceptowane"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "BŁĄD: nie można zaakceptować nowego połączenia zewnętrznego"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 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:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Łączę z klientem: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Nieznana wersja"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "Niepoprawny ID wersji EC, może występować niezgodność binarna. Użyj rdzenia i zdalnego z tej samej wersji."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "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:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Zła wersja protokołu."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Brak znacznika wersji protokołu."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Automatyczne łączenie do serwera nastąpi za %d sekundę"
+
+#: src/ExternalConn.cpp
 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:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Uwierzytelnianie nie powiodło się: nieprawidłowe hasło."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Uwierzytelnianie nie powiodło się: brak hasła."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Nieprawidłowe żądanie, najpierw musisz się uwierzytelnić."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Dostęp udzielony."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Wyślij wiadomość błędu \"%s\" do klienta."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, 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:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Skrót dla pliku nieznaleziony: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! Błąd przetwarzania OpCode!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Nie dodano serwera"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "serwer nieznaleziony: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "trzeba zdefiniować serwer do usunięcia"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k jest wyłączony w preferencjach."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Nie znaleziono pliku."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Nie znaleziono pliku."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Wyszukiwanie w trakcie. Odświeżenie rezultatów za chwilę!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Szukanie przez WWW ze zdalnych interfejsów nie ma sensu."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Wyszukiwanie w trakcie. Odświeżenie rezultatów za chwilę!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Brak punktów dla wykresu."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 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:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "External Connection: żądanie zamknięcia"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Już w trakcie zamykania."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: dodaję link '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Nieprawidłowy lub znajdujący się już na liście link."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Nie znaleziono pliku."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Nieprawidłowa nazwa pliku."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Nie udało się zmienić nazwy pliku."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Zamknij tę sesję czata."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Rozpoczęto nową sesję czatu"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Zamknij tę sesję czata."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad jest wyłączony w preferencjach."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Nieznana nazwa)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad jest wyłączony w preferencjach."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Już podłączony do eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Łączę do eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Już podłączony do Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Łączę z Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Wszystkie sieci są wyłączone."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Rozłącz z eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Rozłączono z Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "External Connection: otrzymano nieprawidłowy opcode: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Nieprawidłowy opcode (zła wersja protokołu?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Nieznane rozszerzenie '%s' dla komendy '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Nieznana komenda '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1880,7 +2410,7 @@
 "\n"
 "Ta komenda nie może posiadać argumentu.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1888,7 +2418,7 @@
 "\n"
 "Ta komenda musi posiadać argument.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1896,7 +2426,7 @@
 "\n"
 "Ta komenda jest niekompletna, użyj jednego z rozszerzeń podanych niżej.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1904,11 +2434,11 @@
 "\n"
 "Dostępne rozszerzenia:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Dostępne komendy:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1919,17 +2449,17 @@
 "Wszystkie komendy są niewrażliwe na wielkość znaków.\n"
 "Wpisz '%s <komenda>', aby uzyskać szczegółowe informacje na temat <komenda>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Wychodzi z programu."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Pokaż pomoc."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1937,7 +2467,7 @@
 "Aby uzyskać pomoc dotyczącą komendy, wpisz 'help <komenda>'.\n"
 "Aby uzyskać pełną listę komend, wpisz 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1948,46 +2478,46 @@
 "Użyj '%s' aby otrzymać listę komend\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Błąd składni!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "Błąd przetwarzania komendy - to nie powinno się zdarzyć! Proszę zgłosić błąd\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Ta komenda nie powinna posiadać żadnego parametru."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Ta komenda musi posiadać parametr."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Nieprawidłowy argument."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "To jest niekompletna komenda."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Wpisz '%s' , aby uzyskać więcej pomocy.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "To jest %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "To jest %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1995,7 +2525,7 @@
 "\n"
 "Tworzenie klienta...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2004,7 +2534,7 @@
 "\n"
 "OK, wychodzę %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2018,118 +2548,361 @@
 "\n"
 "Wychodzę...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Pokazuj ten tekst pomocy."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Host gdzie jest uruchomiony aMule. (domyślny: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Port zewnętrznych połączeń aMule. (domyślny: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Hasło połączeń zewnętrznych."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Czyta konfiguracje z pliku."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Nie wysyłaj żadnego wyjścia na stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Bądź gadatliwy - pokazuj także wiadomości diagnostyczne."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Ustawia locale programu (język)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Zapisuje opcje listy komend do pliku konfiguracyjnego."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Tworzy plik konfiguracyjny oparty na pliku konfiguracyjnym aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Drukuj wersję programu."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Szczegóły pliku"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%% skończone"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Podgląd pliku"
+
+#: src/FileLaunch.cpp
+#, 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/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "BŁĄD: Nie udało się otworzyć pliku części '%s'"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Witamy!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Łączenie do kolegi"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Stan połączenia:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Sieci"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Standardowy port TCP "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Rozszerzony port UDP (KAD / globalne wyszukiwanie)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Włącz UPnP dla przekierowania portów routera"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Bootstrap"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Starasz się już pobierać plik %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Autoaktualizacja listy serwerów przy starcie"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Folder docelowy dla pobrań"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Przeglądaj"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Folder dla pobranych plików tymczasowych"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Nie udało się otworzyć pliku listy przyjaciół 'emfriends.met' do odczytu!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 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/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "KRYTYCZNE - brak klienta przy StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Znajomi"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Pokaż &szczegóły"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Dodaj znajomego"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Usuń znajomego"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Wyślij &wiadomość"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Pokaż pliki"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Ustaw slot dla znajomego"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Jesteś pewien, że chcesz usunąć wybranego przyjaciela?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Jesteś pewien, że chcesz usunąć wybranych przyjaciół?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2137,200 +2910,176 @@
 "Nie możesz ustanowić więcej niż jeden slot dla znajomego.\n"
 "Przydzielono tylko jeden slot."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Wybór wielu"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Nie możesz ustanowić więcej niż jeden slot dla znajomego.\n"
-"Przydzielono tylko jeden slot."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Wyślij wiadomość do użytkownika"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Wiadomość do wysłania:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Usuń ze znajomych"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Wyślij wiadomość"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Zamień na ten plik"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Proszę o inny plik"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Oczekiwanie na slot wysyłań"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "W kolejce"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Wysyłanie"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Brak"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Nie"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Tak"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Nie udało się otworzyć: %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Pobieranie..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "Pobranie HTTP anulowane"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "Adres URL do pobrania nie może być pusty"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Nieudane pobieranie udostępnionych plików od użytkownika '%s'"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Folder dla pobranych plików tymczasowych"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Pobrano %d bajtów"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "The URL %s returned: %i"
 msgstr "Adres URL %s zwrócił: %i - Błąd (%i)!"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Pobranie HTTP anulowane"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Pobierz nową GeoIP.dat z %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "Nie można pobrąć pliku GeoIP.dat, przerwana aktualizacja."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Nie można usunąć pliku %s, przerwana aktualizacja."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Nie można zmienić nazwy pliku %s, przerwana aktualizacja."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "Pomyślnie zaktualizowany %s"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Error updating %s"
 msgstr "Błąd aktualizacji GeoIP.dat"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Nie powiodło się pobranie %s z %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Nie można połączyć się z serwerem pobrania HTTPNie powiodło się pobranie GeoIP.dat z %s"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Ładowanie filtrów IP 'ipfilter.dat' i 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Ładowanie pliku ipfilter.dat nieudane '%s', napotkano nieznany format."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
@@ -2338,7 +3087,7 @@
 msgstr1 "Załadowano %u zakresy IP z '%s'."
 msgstr2 "Załadowano %u zakresów IP z '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
@@ -2346,66 +3095,73 @@
 msgstr1 "%u niepoprawne linie zostały odrzucone."
 msgstr2 "%u niepoprawnych linii zostało odrzuconych."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Nie można załadować danych kraju dla '%s'."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "Filtr IP jest gotowy"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Rozruch od \n"
-"znanych klientów"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Aktualna"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Bieżąca średnia"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Średnia sesji"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Węzły (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Nieprawidłowe ip do rozruchu"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Nieprawidłowy port do rozruchu"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Proszę wypełnij wszystkie wymagane pola"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Wiadomość"
+
+#: src/KadDlg.cpp
 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:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Kontynuowanie spowoduje usunięcie obecnych węzłów i restart połączenia Kademlii."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Kontynuować?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: wyszukiwana fraza jest za krótka"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: Szukane słowo kluczowe jest już na liście wyszukiwania: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
@@ -2413,12 +3169,11 @@
 msgstr1 "Wczytaj %u kontakty Kad"
 msgstr2 "Wczytaj %u kontaktów Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 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/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
@@ -2426,7 +3181,7 @@
 msgstr1 "Tylko %d dostępne kontakty KAD, nodes.dat nie zapisane"
 msgstr2 "Tylko %d dostępnych kontaktów KAD, nodes.dat nie zapisane"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
@@ -2434,694 +3189,1036 @@
 msgstr1 "Zapisano %d kontakty Kad"
 msgstr2 "Zapisano %d kontaktów Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Sieć Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Rozmiar pliku"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Ratio wymiany"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Wysłano"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Zażądano"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Zaakceptowano"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Pełne źródła"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "OSTRZEŻENIE: Znana lista plików uszkodzona, zawiera nieprawidłowy nagłówek."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Nie można załadować wpisu w znanej liście plików, plik może być uszkodzony"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 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/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Domyślny systemowy"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albański"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabski"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturyjski"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baskijski"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bułgarski"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Kataloński"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Chiński (Uproszczony)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Chiński (Tradycyjny)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Chorwacki"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Czeski"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Duński"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Holenderski"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Angielski (U.K.)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Angielski (U.K.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estoński"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Fiński"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francuski"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galicyjski"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Niemiecki"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grecki"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebrajski"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Węgierski"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Włoski"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japoński"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Koreański"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Litewski"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norweski (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polski"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugalski"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugalski (Brazylijski)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Rumuński"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Rosyjski"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Słoweński"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Hiszpański"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Szwedzki"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turecki"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukraiński"
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "Nieznana wersja"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Nie można utworzyć docelowego pliku %s do pobrania!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Tworzenie skrótu"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Zakańczanie"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Ukończono"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Wstrzymano"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Błędne"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Czeka"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Musisz określić hasło."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Nieprawidłowe hasło, nie skrót MD5!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Błąd połączenia"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Zewnętrzne połączenie zamknięte."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "Połączenie EC nieudane. Pusta odpowiedź."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "External Connection: Zła odpowiedź serwera, brak nawiązania. Zakończono połączenie."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "External Connection: Zła odpowiedź serwera, brak nawiązania. Zakończono połączenie."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Sukces! Nawiązano połączenie z aMule"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Sukces! Nawiązano połączenie."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "External Connection: Brak dostępu z powodu: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "External Connection: Brak nawiązania"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "Rozpoczęte pobranie wątku HTTP"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "BŁĄD: nie można nasłuchiwać na porcie TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "BŁĄD: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "OSTRZEŻENIE: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Wklej"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Zaznacz wszystko"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Nielimitowane"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Pokaż aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Ukryj aMule"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Połączony"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Połączony"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Połączono z Kad (za firewallem)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "IP serwera: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "IP Serwera:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Nie połączony"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Port TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Port TCP: Nie gotowy"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Port UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Port UDP: Nie gotowy"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Informacje o kliencie"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Limit wysyłania"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Limit pobierania"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Pokaż aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Rozłącz"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Ukryj aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Podłącz"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Wyjdź"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Nielimitowane"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Menu podajnika aMule"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Limity prędkości:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "UL: Brak"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "UL: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DL: Brak"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DL: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Prędkość pobierania: %.1f"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Prędkość wysyłania: %.1f"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Ksywka: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Nie wybrano ksywki!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID klienta: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Nazwa serwera: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP serwera: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Nie połączony"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Podpis online: Włączony"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Podpis online: Wyłączony"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Uptime: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Udostępnionych plików: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Klientów w kolejce: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Razem DL: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Razem UL: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Link eD2k: "
-
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Zatwierdź"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Dodaje link eD2k lub magnet do rdzenia."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Dodaj do znajomych"
+
+#: src/muuli_wdr.cpp
 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:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Zdarzenie są wyświetlane tu. Dla pełnej listy zdarzeń, definiuj logowanie w zakładce serwerów."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Ładuje..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Użytkowników: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Użytkowników połączonych do aktualnego serwera i szacunkowa liczba wszystkich użytkowników."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Wysł: 0.0 | Pobr: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Aktualna średnia szybkość wysyłania i pobierania. Jeżeli włączone, liczby w nawiasach wskazują narzut komunikacji z klientem."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Wyświetla status połączonych i aktywnych transferów. Czerwone strzałki wskazują, że nie jesteś aktualnie połączony, żółte, że masz niskie ID (za firewallem) i zielone strzałki wskazują, że masz wysokie ID (optymalny typ połączenia)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Niepołączony ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Aktualnie połączony serwer."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nazwa:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Typ"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Lokalne"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Globalne"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Parametry dodatkowe"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtrowanie"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Typ Pliku"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Dowolny"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Archiwa"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "Obrazy CD"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Obrazki"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programy"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Teksty"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Filmy"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Rozszerzenie"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Min rozmiar"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bajtów"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Maks. rozmiar"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Dostępność"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtr:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Wyniki filtrowania"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtr"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Odwróć wyniki"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Ukryj znane pliki"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Zresetuj pola"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Start"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Więcej"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Rozszerzenie"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Pobieranie"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Pobieranie w kategorii"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Wynik wyszukiwania"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Zresetuj pola"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Wyniki"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Wyczyść skończone pobierania"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtr:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Źródła pliku:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Ogólne"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Pełna nazwa :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "Brak"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Pełna nazwa"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "plik met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Skrót"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "plik met :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Skrót :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Rozmiar pliku :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Status pliku części:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Ostatnio widziano całość :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Rozmiar pliku"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Transfer"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Znaleziono źródeł :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Przesyłam ze źródeł :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Części pliku :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Dostępne :"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Prędkość transmisji danych :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Status pliku części"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Ostatnio widziano całość"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Znaleziono źródeł"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Przesyłam ze źródeł"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Części pliku"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Dostępne"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Prędkość transmisji danych"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Aktywny czas pobierania"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Aktywny czas pobierania: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Przesłano :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Zakończono :"
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Zakończono"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Inteligentny System Obsługi Błędów"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Utracono z powodu błędów :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Zyskano przez kompresję :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Pakietów uratowanych przez I.C.H. :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Utracono z powodu błędów"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Zyskano przez kompresję"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Pakietów uratowanych przez I.C.H."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Udostępnione: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Żądania"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Zaakceptowane żądania"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Przesłane dane"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Ratio wymiany"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Pełne źródła"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Udostępnione pliki"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Wysłanych: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Info Kad"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Nieoceniony"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Tytuł"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Nazwy plików"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Przejmij"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Wyczyść"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 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:705
+#: src/muuli_wdr.cpp
 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."
@@ -3129,1133 +4226,1248 @@
 "Dla filmu można opisać jego długość, historię, język ...\n"
 "i jeśli jest on fałszywy, można powiedzieć to innym użytkownikom aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Jakość pliku"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Nieoceniony"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Nieprawidłowy / Uszkodzony / Fałszywy"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Marny"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "W miarę"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Dobry"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Znakomity"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Rozłączono z Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Pobieranie, proszę czekać..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Nieznany rozmiar"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Adres IP :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Dodatkowe informacje"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Nazwa użytkownika :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Skrót użytkownika :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Skrót użytkownika"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Prędkość pobierania"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Aktualna"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Bieżąca średnia"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Średnia sesji"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Prędkość wysyłania"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Połączenie"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktywne pobierania"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktywnych połączeń (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktywne wysyłania"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Drzewo statystyk"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Nazwa użytkownika:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Skrót użytkownika:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Oprogramowanie klienta:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Wersja klienta:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Adres IP:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Oprogramowanie klienta"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Wersja klienta"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID użytkownika"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP Serwera"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID użytkownika:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Nazwa serwera"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP Serwera:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Maskowanie"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Nazwa serwera:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Maskowanie:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Maskowanie protokołu"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Transfery do klientów"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Aktualnie żądań:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Średnia prędkość wysyłania:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Średnia prędkość pobierania:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Wysłane (sesja):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Pobrane (sesja):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Wysłanych (razem):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Pobranych (razem):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Aktualnie żądań"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Średnia prędkość wysyłania"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Średnia prędkość pobierania"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Wysłane (sesja)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Pobrane (sesja)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Wysłanych (razem)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Pobranych (razem)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Punkty"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modyfikator DL/UL:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Bezpieczny identyfikator:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Pozycja kolejki:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Punkty kolejki:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Bezpieczny identyfikator"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Pozycja kolejki"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Punkty kolejki"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Ksywa"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - Mule na wielu platformach"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Język: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Opóźnienie przed pokazaniem podpowiedzi."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Określa język jaki będzie używany do sterowania."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Sprawdź podczas startu czy jest nowa wersja"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Włączenie tego spowoduje, że aMule będzie sprawdzał, czy jest nowa wersja podczas startu"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Uruchom zminimalizowany"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Włączenie tego spowoduje minimalizowanie aMule podczas startu."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Pytaj przy wyjściu"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Pytaj przed zakończeniem aMule."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Włącz ikonę w zasobniku"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "To włącza/wyłącza ikonę w zasobniku systemowym."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Zminimalizuj do ikony zasobnika"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Włączenie opcji spowoduje, że aMule będzie minimalizował się do paska systemowego zamiast paska stanu."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Zapamiętaj te ustawienia"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Opóźnienie tooltipów: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "sekund"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Wybór przeglądarki"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Podaj tutaj nazwę swojej przeglądarki. Pozostaw to pole puste, aby korzystać z domyślnej przeglądarki systemu."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Przeglądaj"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Otwórz w nowej karcie jeśli to możliwe"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Odtwarzacz filmów"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Limity przepustowości"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Wysyłanie"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Przydział slotów"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Pporty"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Standardowy port TCP "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Port UDP dla żądań serwera (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Rozszerzony port UDP (KAD / globalne wyszukiwanie)"
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Włącz UPnP dla przekierowania portów routera"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "Port UPnP TCP (opcjonalnie):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Wiąż lokalne adresy z IP (puste dla każdego):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Wiąż lokalne adresy z IP (puste dla każdego):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Maks. ilość źródeł dla pobieranego pliku:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Maksymalne połączenia jednoczesne:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Automatycznie połącz przy uruchomieniu"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Połącz ponownie po rozłączeniu"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Usuń martwe serwery po"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "próbach"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Autoaktualizacja listy serwerów przy starcie"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Uaktualnij listę serwerów przy połączeniu do serwera"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Uaktualnij listę serwerów przy połączeniu klienta"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Używaj systemu priorytetów"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Używaj inteligentnego sprawdzania LowID przy połączeniu"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Bezpieczne połączenie"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Automatyczne łączenie tylko do serwerów statycznych"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Ustaw priorytet ręcznie dodanych serwerów na Wysoki"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Inteligentna obsługa uszkodzeń (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Włączone"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Dodaj pliki do pobrania w trybie wstrzymania"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Dodaj pliki do pobrania z automatycznym priorytetem"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Próbuj najpierw pobrać pierwszy i ostatni kawałek"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Zacznij następny wstrzymany plik, gdy plik gotowy"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Z tej samej kategorii"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Alokuj wstępnie przestrzeń dyskową dla nowych plików"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Dla nowych plików alokuje wstępnie przestrzeń dyskową dla całego pliku redukując w ten sposób fragmentację"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Zatrzymaj pobieranie gdy zabraknie wolnego miejsca na dysku"
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Wpisz tu minimalną ilość miejsca na dysku."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 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:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Wysyłanie"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Dodaj udostępnione pliki z automatycznym priorytetem"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Folder docelowy dla pobrań"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Inteligentna obsługa uszkodzeń (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Włączone"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+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 src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Udostępnione foldery"
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Folder dla pobranych plików tymczasowych"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Udostępnione foldery"
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Usuń"
+
+#: src/muuli_wdr.cpp
 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:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Udostępnij pliki ukryte"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Serwer zdalny"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Serwer lokalny"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Wykresy"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Odśwież co : 5 sekund"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Czas dla wykresów średnich: 100 minut"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Skala wykresu połączeń: 100"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Skala wykresu pobierania:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Skala wykresu przesyłania:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Kolory: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Tło"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Siatka"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Aktualnie pobierane"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Bieżąca średnia pobierania"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Średnia pobierania sesji"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Aktualnie wysyłane"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Bieżąca średnia wysyłania"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Średnia wysyłania sesji"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktywnych połączeń"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Ikona prędkości w zasobniku systemowym"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Obecne Kad-węzły "
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Działające Kad-węzły"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Sesyjne Kad-węzły"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Wybierz"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Drzewo"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Liczba wyświetlanych wersji klienta (0=nieograniczona)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! UWAGA !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Maks. nowych połączeń"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "Czas pomiędzy odświeżeniami FTP w minutach"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "Czas pomiędzy odświeżeniami FTP w minutach"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Rozmiar bufora plików: 240000 bajtów"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Rozmiar kolejki wysyłania: 5000 klientów"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Odświeżanie połączeń do serwera co: Wyłączone"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Skóra do użycia:"
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 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:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Pokaż rozszerzone info w kartach kategorii"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "Pokaż prędkość transferu w tytule"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Pokaż prędkość transferu w tytule"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Przed nazwą aplikacji"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Za nazwą aplikacji"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Pokaż narzut przepustowości"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Pionowa orientacja paska narzędzi"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Pobierane pliki w kolejce"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Pokaż procent postępu"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Pokaż pasek postępu"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Płaski"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Okrągły"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Auto-sortowanie plików (wysokie obciążenie procesora)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parametry zewnętrznych połączeń"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Akceptuj zewnętrzne połączenia"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP z interfejsem słuchania:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Port TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Włącz forwarding portu UPnP na porcie EC"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Hasło"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Parametry serwera sieciowego"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "Port TCP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Sprawdzam hasło\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Sprawdzam hasło\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Zabroń dostępu gościom"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Hasło gościa do serwera sieciowego"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Parametry serwera sieciowego"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Uruchom serwera internetowego przy starcie"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Szablon WWW"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Hasło pełnych uprawnień"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Włącz użytkowników z niskimi uprawnieniami"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Hasło niskich uprawnień"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Włącz przekierowanie portu UPnP na port serwera internetowego"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Port web serwera UPnP TCP (opcjonalnie)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Odświeżanie strony co:  (w sekundach)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Włącz kompresję Gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Domyślny systemowy"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 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:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Reset wszystkich zmian dokonanych w preferencjach."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Tytuł :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Komentarz :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Katalog przychodzących :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Zmień priorytet nowo przydzielonych plików :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Katalog przychodzących"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Zmień priorytet nowo przydzielonych plików"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "Nie zmieniaj"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Wybierz kolor dla tej kategorii (aktualnie wybrany) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Resetuj"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Wybierz kolor dla tej kategorii (aktualnie wybrany)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Kliknij tu aby wyczyścić logi."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Lista serwerów"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "Wpisz tu url do pliku server.met  i przyciśnij przycisk po lewej aby zaktualizować listę znanych serwerów."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Dodaj serwer ręcznie: Nazwa"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Wpisz tu nazwę nowego serwera"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Wpisz tu port serwera."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Logi aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Serwer Info"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Info eD2K"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Info Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Węzły (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Wprowadź tutaj url pliku nodes.dat i naciśnij przycisk z lewej, aby zaktualizować listę znanych węzłów."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Statystyki węzłów"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Bootstrap"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nowy węzeł"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Port:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
 msgstr "Rozruch od znanych klientów"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Rozłącz z Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node 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:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Użyj bezpiecznej identyfikacji użytkownika"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Maskowanie protokołu"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Obsługa maskowania protokołu"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "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:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Użyj maskowania dla połączeń wychodzących"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Opcja ta powoduje, że aMule będzie używał maskowania protokołu podczas łączenia z innymi klientami/serwerami."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Akceptuj tylko zamaskowane połączenia"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Wszyscy"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Nikt"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Kto może widzieć moje udostępnione pliki:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Filtrowanie IP"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtruj klientów"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtruj serwery"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Przeładuj listę"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Uaktualnij teraz"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Uaktualniaj filtr IP przy starcie"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Poziom filtrowania:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Zawsze filtruj IP z LAN"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoidalna obsługa niepasujących IP"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Użyj ogólno-systemowego ipfilter.dat jeśli dostępny"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Jeśli ipfilter.dat nie istnieje lokalnie, zezwól na użycie ogólno-systemowego pliku ipfilter."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Włącz podpis online"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Włącza zapisywanie pliku OS, który może być użyty przez zewnętrzne aplikacje do stworzenia sygnatury itp."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Częstotliwość odświeżania (sek):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Zmień częstotliwość (w sekundach) aktualizacji Sygnatury Online."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Zapisz podpis internetowy w pliku: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Prędkość transmisji danych :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Źródła"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4263,11 +5475,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4277,484 +5489,555 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Pobranych: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Uaktualniaj filtr IP przy starcie"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtruj wiadomości przychodzące (za wyjątkiem aktualnej rozmowy):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtruj wszystkie wiadomości"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 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:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtruj wiadomości od nieznanych klientów"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtruj wiadomości zawierające (jako separatora użyj ','):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Pokaż otrzymane wiadomości w dzienniku"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Komentarze"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtruj komentarze zawierające (użyj ',' jako separatora):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Włącz uwierzytelnianie"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Włącza/Wyłącza uwierzytelnianie login/hasło"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Nazwa uzytkownika: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Login używany do połączeń z proxy"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Hasło:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Hasło używane do połączeń z proxy"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Włącz proxy"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Włącza/Wyłącza obsługę proxy"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Typ proxy:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Adres proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Typ proxy"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Adres proxy"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Nazwa hosta proxy"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Port proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Port proxy"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Port serwera proxy"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Włącz uwierzytelnianie"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Włącza/Wyłącza uwierzytelnianie login/hasło"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Login używany do połączeń z proxy"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Hasło używane do połączeń z proxy"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Połącz z:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Login do zdalnego amule"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Nazwa użytkownika"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Zapamiętaj te ustawienia"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Zewnętrzne połączenie zamknięte."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Używaj kompresji gzip"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Włącz gadatliwe logowanie debugowe."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&Otwórz plik"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Kategorie wiadomości:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Czekam..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Dodaj importy"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Przywróć wybrane"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Usuń wybrane"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Typy zdarzeń"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Aktywne wysyłania"
 
-#: src/muuli_wdr.cpp:2963
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Percent of total files"
-msgstr "procent wszystkich plików"
+msgid "Show Clients for"
+msgstr "Pokaż klientów"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "Wszystkie udostępnione pliki"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "Wybierz filtr przeglądania"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "Aktywne wysyłania"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "Pokaż klientów"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Przeładuj:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Przeładuj twoje udostępnione pliki"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Wysyła wybraną wiadomość."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Zamknij tę sesję czata."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Podłącz do dowolnego serwera i/lub Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Anuluj"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Udostępnione pliki"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Rozłącz"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Podłącz"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Wyłączone %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "bajt"
 msgstr1 "bajty"
 msgstr2 "bajtów"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "bajt/sek"
 msgstr1 "bajty/sek"
 msgstr2 "bajtów/sek"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sek"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "min"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "godzin"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Dni"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "dni"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "wszystkie"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "wszystkie inne"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Niekompletne"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Film"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Archiwum"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Tekst"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Aktywny"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Używanie katalogu konfiguracyjnego: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Ta komenda nie powinna posiadać żadnego parametru."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Ta komenda nie powinna posiadać żadnego parametru."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Ta komenda nie powinna posiadać żadnego parametru."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Ta komenda nie powinna posiadać żadnego parametru."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Wpisz tu port serwera."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Wpisz tu port serwera."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Wpisz tu port serwera."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Oczekiwanie na koniec wątku przemiany pliku części ..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Importowanie %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Wczytywanie katalogu temp"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Odbieranie podstawowych informacji z info pobieranego pliku"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Tworzenie pliku docelowego"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, 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:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Odbieranie informacji o źródłach pobieranego pliku"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Dodawanie pobierania i zapisywanie nowego pliku części"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Import pliku części"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Stan"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Skrót pliku"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Dysk: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Czy chcesz, aby źródła pomyślnie zaimportowanych pobierań zostały usunięte?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Usunąć źródła?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "BŁĄD: Nie udało się utworzyć pliku części)"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, 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:409
+#: src/PartFile.cpp
 #, 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:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, 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:664
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "BŁĄD: %s (%s) jest uszkodzony (zła ilość znaków), nie mogę otworzyć pliku."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, 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:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Próbuję odzyskać informacje o pliku..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Nie mogę odzyskać informacji o pliku :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Nie udało się otworzyć: %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "OSTRZEŻENIE: %s może być uszkodzony (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "BŁĄD podczas zapisywania pliku części: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Awaria IO podczas zapisywania pliku części:"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
@@ -4762,17 +6045,17 @@
 msgstr1 "Zapisano %i zarodki źródeł dla pliku części: %s (%s)"
 msgstr2 "Zapisano %i zarodków źródeł dla pliku części: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Zapisano %i zarodek źródeł dla pliku części: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
@@ -4780,335 +6063,182 @@
 msgstr1 "Znaleziono uszkodzoną część (%d) w %d plikach części %s - FileResultHash |%s| FileHash |%s|"
 msgstr2 "Znaleziono uszkodzoną część (%d) w %d plikach części %s - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Znaleziono kompletnych części (%i) w %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Skończono ponowne tworzenie skrótu %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Nieoczekiwany błąd podczas zakańczania %s. Plik wstrzymany"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Skończono pobieranie: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Skończono pobieranie: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Usuwanie pliku: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, 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'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "BŁĄD: Nie można utworzyć skrótu pobranej części - zestaw skrótów niekompletny (%s). Nie powinno do tego dojść"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "UWAGA: Niewystarczająca ilość wolnego miejsca! Wstrzymywanie pliku: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Pobrana część %i jest uszkodzona w pliku: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Alokuję"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Niewystarczająca ilość przestrzeni dyskowej"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Pobrano"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "BŁĄD: Nie udało się otworzyć pliku części '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Domyślny systemowy"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albański"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabski"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturyjski"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baskijski"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bułgarski"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Kataloński"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Chiński (Uproszczony)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Chiński (Tradycyjny)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Chorwacki"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Czeski"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Duński"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Holenderski"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Angielski (U.K.)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "Angielski (U.K.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estoński"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Fiński"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francuski"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galicyjski"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Niemiecki"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grecki"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebrajski"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Węgierski"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Włoski"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Włoski (Szwajcarski)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japoński"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Koreański"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Litewski"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norweski (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polski"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugalski"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugalski (Brazylijski)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Rumuński"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Rosyjski"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Słoweński"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Hiszpański"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Szwedzki"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turecki"
+msgid "Extended source exchange"
+msgstr "Wymiana źródeł"
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukraiński"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Zmień język"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Niedostępny"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "nie ma dostępnych opcji"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "Znaleziono nieprawidłową kategorie, pomijam"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Znaleziono nieprawidłową kategorie, pomijam"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Zostanie użyty domyślny port (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Połączenie"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Katalogi"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Serwery"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Pliki"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtry"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Zdalna kontrola"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Sygnatura Online"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Zawansowane"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Zdarzenia"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Debugowanie"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5118,15 +6248,15 @@
 "    %PARTFILE - pełna ścieżka do pliku\n"
 "    %PARTNAME - tylko nazwa pliku"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5140,26 +6270,43 @@
 "\n"
 "aMule będzie działał prawidłowo bez zmiany tych ustawień."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Typ serwera proxy do którego się łączysz"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Sprawdzam hasło\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5167,35 +6314,49 @@
 "aMule musi zostać zrestartowany przed wprowadzeniem tych zmian:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- Zmieniono port TCP.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- Zmieniono port UDP.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "Zewnętrzne połączenie zamknięte."
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "Zewnętrzne połączenie zamknięte."
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "Nowe zewnętrzne połączenie zaakceptowane"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "Zewnętrzne połączenie zamknięte."
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Maskowanie protokołu"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Zmieniono język.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5203,27 +6364,33 @@
 "Twoja lista auto-aktualizacji serwerów jest pusta.\n"
 "'Autoaktualizacja listy serwerów przy starcie' zostanie wyłączona."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 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:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Zmieniono język.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Zmieniono folder tymczasowy.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- sieć ED2K włączona.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Zła wersja protokołu."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5231,7 +6398,7 @@
 "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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5239,7 +6406,7 @@
 "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:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5249,20 +6416,69 @@
 "Musisz zrestartować teraz aMule.\n"
 "Jeśli nie zrestartujesz go teraz, nie narzekaj, jeśli stanie się coś złego.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "automatyczne odświeżanie rozpoczęte"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Folder dla pobranych plików tymczasowych"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Ustawione hasło i włączone połączenia zewnętrzne."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5272,41 +6488,67 @@
 "Proszę wpisać co najmniej jeden URL wskazujący poprawny plik server.met.\n"
 " Kliknij na przycisku \"Lista\", aby wpisać URL."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Pliki tymczasowe"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Pliki przychodzące"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Sygnatury Online"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Wybierz folder na %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Znaleziono %i znany udostępniony plik"
+msgstr1 "Znaleziono %i znane udostępnionych plików"
+msgstr2 "Znaleziono %i znanych udostępnionych plików"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Szukaj odtwarzacza filmów"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Wybierz przeglądarkę"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Wybierz przeglądarkę"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Program%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Domyślny systemowy"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Edytuj listę serwerów"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5314,42 +6556,42 @@
 "Dodaj jeden URL w każdej linii.\n"
 "Tylko jeden URL w każdej linii."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Pełne źródła"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Status:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Status:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
@@ -5357,7 +6599,7 @@
 msgstr1 "Opóźnienie odświeżania: %d sekundy"
 msgstr2 "Opóźnienie odświeżania: %d sekund"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
@@ -5365,12 +6607,12 @@
 msgstr1 "Czas dla przeciętnego wykresu: %d minuty"
 msgstr2 "Czas dla przeciętnego wykresu: %d minut"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Skala wykresu połączeń: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
@@ -5378,7 +6620,7 @@
 msgstr1 "Rozmiar bufora pliku: %d bajty"
 msgstr2 "Rozmiar bufora pliku: %d bajtów"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
@@ -5386,7 +6628,7 @@
 msgstr1 "Rozmiar kolejki wysyłania: %d klientów"
 msgstr2 "Rozmiar kolejki wysyłania: %d klientów"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
@@ -5394,274 +6636,372 @@
 msgstr1 "Odświeżanie połączeń do serwera co: %d minuty"
 msgstr2 "Odświeżanie połączeń do serwera co: %d minut"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Odświeżanie połączeń do serwera co: Wyłączone"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "wyłączone"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Execute command on '%s' event"
 msgstr "Wykonaj komendę przy wydarzeniu `%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Włącz wykonanie komendy w rdzeniu"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Komenda rdzenia:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Włącz wykonanie komendy w GUI"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Komenda GUI:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Następujące zmienne zostaną zastąpione:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Udostępnione foldery"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Przeładuj twoje udostępnione pliki"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Udostępnione foldery"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Przeładowuje listę udostępnionych plików."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Udostępnione foldery"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Wybierz folder na %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Zapamiętaj te ustawienia"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Ostrzeżenie wyszukiwania"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Szukaj"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "W trakcie"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr "Min. rozmiar musi być mniejszy od maks. Zignorowano maks. rozmiar."
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Ostrzeżenie wyszukiwania"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Główne"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "OSTRZEŻENIE: Znana lista plików uszkodzona, zawiera nieprawidłowy nagłówek."
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Nieprawidłowy wpis w znanej liście plików, plik może być uszkodzony: "
+
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 #, fuzzy
 msgid "No keyword for Kad search - aborting"
 msgstr "Słowa kluczowe dla wyszukiwania: %s"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Nieoczekiwany błąd podczas próby wyszukiwania Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID pliku"
-
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Nieoceniony"
-
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Pobieranie w kategorii"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:714
+#: src/SearchList.cpp
 #, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Dodaj opcjonalny URL dla tego pliku"
+msgid "Error %u: %s\n"
+msgstr "Błąd aktualizacji GeoIP.dat"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ID pliku"
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Zamknij wszystkie karty"
+
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Szukaj powiązanych plików (eD2k, serwer lokalny)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Oznacz jako znany plik"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Skopiuj link eD2k do schowka"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Skopiuj linki eD2k do schowka"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Jesteś połączony do serwera który chcesz usunąć. Proszę rozłącz się najpierw."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Anulowane"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Nowy"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Uruchomiony"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Fiński"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "Search progress not available"
+msgstr "Pokaż procent postępu"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static 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
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "Nie udało się połączyć do serwerów z listy. Kolejne podejście."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "Nie udało się połączyć do serwerów z listy. Kolejne podejście."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Automatyczne łączenie do serwera nastąpi za %d sekundę"
+msgstr1 "Automatyczne łączenie do serwera nastąpi za %d sekundy"
+msgstr2 "Automatyczne łączenie do serwera nastąpi za %d sekund"
+
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Połączony z %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Nawiązano połączenie z: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Utracono połączenie z %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) wygląda na wyłączony."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) wygląda na pełny."
 
-#: 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"
-msgstr0 "Automatyczne łączenie do serwera nastąpi za %d sekundę"
-msgstr1 "Automatyczne łączenie do serwera nastąpi za %d sekundy"
-msgstr2 "Automatyczne łączenie do serwera nastąpi za %d sekund"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Utracono połączenie"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Łączenie z %s (%s:%i) nieudane."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "BŁĄD: nieprawidłowe gniazdo przy sprawdzaniu timeouta"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Próba połączenia z %s (%s:%i) przedawniła się."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Otrzymano późny wynik wyszukiwania DNS, odrzucanie."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Otwieram plik server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Nieznaleziono pliku server.met!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Nie udało się otworzyć server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
@@ -5669,7 +7009,7 @@
 msgstr1 "%i serwery znaleziono w server.met"
 msgstr2 "%i serwery znaleziono w server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
@@ -5677,237 +7017,244 @@
 msgstr1 "%d serwery dodane"
 msgstr2 "%d serwerów dodanych"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "Błąd IO podczas odczytu pliku %s: %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 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:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Nie udało się otworzyć '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Nie udało się zapisać server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Błąd IO podczas odczytu pliku %s: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Nieprawidłowy URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Zakończono pobieranie listy serwerów z %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Rozpocznij pobieranie listy serwerów z %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, 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:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Serwer lokalny jest filtrowany przez IPFilters, podłączam ponownie do innego serwera!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Opis"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Użytkowników"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Użytkowników"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Stałe"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Wersja"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Pliki"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Udostępnione pliki"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Próbujesz usunąć serwer z którym jesteś połączony. Proszę się najpierw rozłączyć. Serwer NIE został usunięty."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Nieznana nazwa)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "min"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Serwery (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Serwer"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Połącz z serwerem"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Oznacz serwer jako statyczny"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Oznacz serwer jako nie statyczny"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Oznacz serwery jako statyczne"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Oznacz serwery jako nie statyczne"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Usuń serwer"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Usuń serwery"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Usuń wszystkie serwery"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Skopiuj linki eD2k do schowka"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Połącz ponownie z serwerem"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Na pewno chcesz usunąć wszystkie serwery?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Jesteś pewien, że chcesz usunąć wybrany serwer?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Jesteś pewien, że chcesz usunąć wybrane serwery?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "BŁĄD: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "OSTRZEŻENIE: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Twoje nowe id to %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "OSTRZEŻENIE: Otrzymałeś Low-ID!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPo więcej informacji udaj się na https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Otrzymane info nieznanego serwera! - za krótkie"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
@@ -5915,168 +7262,199 @@
 msgstr1 "Otrzymano %d nowe serwerów"
 msgstr2 "Otrzymano %d nowych serwerów"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Zapisywanie listy serwerów zakończone."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Serwer odrzucił ostatnią komendę"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Otrzymano podrobiony pakiet z serwera: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "IP serwera %s (%s) jest filtrowane. Nie łącze."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "używa maskowania protokołu."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Łączę z  %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "Logi aMule"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Serwer nie dodany: Nie podano IP lub nazwy hosta."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Serwer nie dodany: Podano nieprawidłowy port serwera."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Status eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Stan połączenia:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Połączony"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Status Kademlii:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Running in LAN mode"
 msgstr "Uruchomiony na %s"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Uruchomiony"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Status Kademlii:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Status:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Stan połączenia:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Stan połączenia UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Stan firewalla: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Bez wymagania kolegi - otwarty port TCP"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Bez wymagania kolegi - otwarty port UDP"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Brak kolegów"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Łączenie do kolegi"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Łączenie do kolegi przy %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Adres IP:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Indeksowane źródła:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Indeksowane słowa kluczowe:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Indeksowane uwagi:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Załadowane indeksowania:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Średnio użytkowników:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Średnio plików:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Nie uruchomiony"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Dodawanie pliku %s do udostępnień"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
@@ -6084,443 +7462,586 @@
 msgstr1 "Znaleziono %i znane udostępnionych plików"
 msgstr2 "Znaleziono %i znanych udostępnionych plików"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Znaleziono %i znany udostępniony plik, %i nieznanych"
-msgstr1 "Znaleziono %i znane udostępnionych plików, %i nieznanych"
-msgstr2 "Znaleziono %i znanych udostępnionych plików, %i nieznanych"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "BŁĄD: Próba udostępnienia %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Nie znaleziono katalogu udostępnionego, pomijam: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Nie znaleziono katalogu udostępnionego, pomijam: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Nie znaleziono plików do udostępniania w katalogu: %s"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Nazwa uzytkownika"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Błąd podczas zapisywania pliku %s: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Prędkość pobierania"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Otwieram plik server.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Prędkość wysyłania"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Nie znaleziono plików do udostępniania w katalogu: %s"
+msgstr1 "Nie znaleziono plików do udostępniania w katalogu: %s"
+msgstr2 "Nie znaleziono plików do udostępniania w katalogu: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Nie znaleziono plików do udostępniania w katalogu: %s"
+msgstr1 "Nie znaleziono plików do udostępniania w katalogu: %s"
+msgstr2 "Nie znaleziono plików do udostępniania w katalogu: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Znaleziono %i znany udostępniony plik"
+msgstr1 "Znaleziono %i znane udostępnionych plików"
+msgstr2 "Znaleziono %i znanych udostępnionych plików"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Nazwa uzytkownika"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Dostępne części"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "Status wysyłania"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Nazwa pliku lokalnego"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "Udostępnione pliki"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Żądania"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Zaakceptowane żądania"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Przesłane dane"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Ratio wymiany"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Otrzymane części"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Pełne źródła"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Dostępność"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Ścieżka katalogu"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Udostępnione pliki"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Dodaj komentarz/ocenę"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Edytuj komentarz/ocenę"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Dodaj pliki kolekcji do listy pobierania"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Kopiuj magnet &URI do schowka"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Kopiuj link eD2k do schowka (Ź&ródło)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 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:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Kopiuj link eD2k do schowka (Nazwa &hosta)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Kopiuj link eD2k do schowka (Nazwa hosta) (Z opcjami &Crypt)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Kopiuj link eD2k do schowka (Informacje &AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Kopiuj link eD2k do schowka (Informacje &AICH)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Potrzebujesz HighID, aby stworzyć poprawny link źródłowy"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Błąd podczas ukończenia"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Nieudane pobieranie udostępnionych plików od użytkownika '%s'"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Przeładuj twoje udostępnione pliki"
+msgstr1 "Przeładuj twoje udostępnione pliki"
+msgstr2 "Przeładuj twoje udostępnione pliki"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Łączny rozmiar udostępnianych plików: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Łączny rozmiar udostępnianych plików: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Udostępnione pliki (%i)"
+msgstr1 "Udostępnione pliki (%i)"
+msgstr2 "Udostępnione pliki (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Udostępnione pliki (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Plik części"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Przeładowuje listę udostępnionych plików."
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Status"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "Nazwa pliku"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Wysłane dane (Sesja (Razem)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Łączny narzut  (Pakiety): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Narzut żądań pliku (Pakiety): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Narzut wymiany źródeł (Pakiety): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Narzut serwera (Pakiety): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Narzut Kad (Pakiety): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Narzut Crypt (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Aktywne wysyłanie: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Oczekujące wysyłanie: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Całkowita ilość udanych sesji wysyłania: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Całkowita ilość nieudanych sesji wysyłania: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Średni czas wysyłania: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Pobrane dane (Sesja (Razem)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Znaleziono źródła: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Aktywne pobieranie (części): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Stosunek UL:DL sesji (Razem): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Średnie tempo pobierania (sesja): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Średnie tempo wysyłania (sesja): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Maksymalne tempo pobierania (sesja): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Maksymalne tempo wysyłania (sesja): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Ponowne łączenia: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Czas od pierwszego transferu: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Podłączony do serwera od: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Aktywne połączenia (szacunkowo): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Osiągnięto maks. limit połączeń: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Średnio połączeń (szacunkowo): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Szczytowe połączenia (szacunkowo): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Klienci"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Nieznane: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtrowane: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Zbanowane: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Razem: %i Znanych: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Działające serwery:  %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Niedziałające serwery: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "W sumie: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Usunięte serwery: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Przefiltrowane serwery: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Użytkowników na działających serwerach: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Plików na działających serwerach:  %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "W sumie użytkowników: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "W sumie plików: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Zajętość serwera: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Liczba udostępnianych plików: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Łączny rozmiar udostępnianych plików: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Średni rozmiar pliku: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "System operacyjny"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Nie otrzymano"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktywnych połączeń (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Niedostępny"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Nigdy"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Wykonaj <str> i wyjdź."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "Komenda ta wymaga argumentu. Prawidłowe argumenty: 'all', nazwa pliku lub liczba.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Przetwarzanie przez skrót: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Przetwarzanie przez nazwę pliku: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Niepoprawny numer\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6529,7 +8050,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6538,83 +8059,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "Wpisz '%s' , aby uzyskać więcej pomocy.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Rozmiar pobierania: %i"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Żądanie nie powiodło się z powodu nieznanego błędu."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operacja zakończona pomyślnie."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Żądanie nieudane z powodu błędu: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Filtrowanie IP klientów jest %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "WYŁĄCZONE"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "WŁĄCZONE"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Filtrowanie IP serwerów jest %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Aktualny poziom filtra IP to %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Połączony z %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Łącze"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "za firewallem"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6623,7 +8148,7 @@
 "\n"
 "Pobieranie:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6632,7 +8157,7 @@
 "\n"
 "Wysyłanie:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6641,7 +8166,7 @@
 "\n"
 "Klientów w kolejce:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6650,39 +8175,33 @@
 "\n"
 "Razem źródeł:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Plik części"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Liczba wyników wyszukiwania: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-#, fuzzy
-msgid "Search progress not available"
-msgstr "Pokaż procent postępu"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Otrzymano nieznaną odpowiedź z serwera, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Pokaż krótką informację o statusie."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 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:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Pokaż pełne drzewo statystyk."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6696,11 +8215,11 @@
 "\n"
 "Przykład: 'statistics 5' wyświetli tylko 5 pierwszych wersji dla każdego typu klienta.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Wyłącz aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6710,35 +8229,35 @@
 "Spowoduje to również wyłączenie klienta tekstowego, ponieważ jest on bezużyteczny\n"
 "bez działającego rdzenia.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Przeładowuje podany obiekt."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Przeładowuje listę udostępnionych plików."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Przeładowuje tabelę filtrowania IP."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Przeładowuje bieżącą tabelę filtrowania IP."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Aktualizuje tabelę filtrowania IP z adresu URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 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:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Połącz z siecią."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6750,35 +8269,35 @@
 "tylko z tym serwerem. IP musi być adresem IPv4\n"
 "lub odczytywalną nazwą DNS."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Połącz tylko z eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Połącz tylko z Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Rozłącz z siecią."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "Spowoduje to rozłączenie z wszystkich sieci, które są obecnie włączone.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Rozłącz tylko z eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Rozłącz tylko z Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Dodaje link eD2k lub magnet do rdzenia."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6796,51 +8315,51 @@
 "\n"
 "Magnet link musi zawierać skrót eD2k i długość pliku.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Ustaw wartość opcji."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Ustaw preferencje filtrowania IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Włącz filtrowanie IP klientów i serwerów."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Wyłącz filtrowanie IP klientów i serwerów."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Włącz/wyłącz filtrowanie IP klientów."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Włącz filtrowanie IP klientów."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Wyłącz filtrowanie IP klientów."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Włącz/Wyłącz filtrowanie IP serwerów."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Włącz filtrowanie IP serwerów."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Wyłącz filtrowanie IP serwerów."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Wybierz poziom filtrowania IP."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6848,60 +8367,74 @@
 "Prawidłowe poziomy filtrowania mieszczą się w zakresie 0-255, a wartością\n"
 "domyślną (początkową) jest 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Ustaw limity przepustowości."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Ustaw limit przepustowości wysyłania."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Wartości podane w tych komendach muszą być w kilobajtach/sekundę.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Ustaw limit przepustowości pobierania."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Włącza/Wyłącza uwierzytelnianie login/hasło"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Wartości podane w tych komendach muszą być w kilobajtach/sekundę.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Pobierz i wyświetl wartość preferencji."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Pobierz preferencje filtrowania IP."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 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:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Pobierz stan filtrowania IP tylko dla klientów."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Pobierz stan filtrowania IP tylko dla serwerów."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Pobierz poziom filtrowania IP."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Pobierz limity przepustowości."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Wykonuje wyszukiwanie."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6920,39 +8453,44 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Wykonuje globalne wyszukiwanie."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Wykonuje lokalne wyszukiwanie"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Wykonuje wyszukiwanie kad"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
 msgstr "Pokazuje wyniki ostatniego wyszukiwania."
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Zwraca wyniki poprzedniego wyszukiwania.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Pokazuje postęp wyszukiwania."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Pokazuje postęp wyszukiwania.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Rozpocznij pobieranie pliku"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6960,81 +8498,81 @@
 "Musi zostać podany numer pliku z ostatniego wyszukiwania.\n"
 "Przykład: 'download 12' rozpocznie pobieranie pliku o numerze 12 z poprzedniego wyszukiwania.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Wstrzymaj pobieranie."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Wznów pobieranie."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Anuluj pobieranie."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Ustaw priorytet pobierania."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Ustaw priorytet na niski."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Ustaw priorytet na normalny."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Ustaw priorytet na wysoki."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Ustaw priorytet na auto."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Pokaż kolejki/listy."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr "Pokazuje kolejkę wysyłania/pobierania, listę serwerów lub listę udostępnionych plików.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Pokaż kolejkę wysyłania."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Pokaż kolejkę pobierania."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Pokaż log."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Pokaż listę serwerów."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Przeładowuje listę udostępnionych plików."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Zresetuj log."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Wycofywana komenda, użyj '%s' zamiast niej."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7043,256 +8581,279 @@
 "Komenda ta jest wycofywana i może zostać usunięta w przyszłości.\n"
 "Użyj zamiast niej '%s'.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Tekstowy klient aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Usuwanie pliku: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Usuwanie pliku: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Wznawianie wysyłania pliku: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Wymagane potwierdzenie"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "Zbyt dużo połączeń"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Wszystkie inne"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Wybierz filtr przeglądania"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Dodaj kategorię"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Edytuj kategorię"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Usuń kategorię"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Żądanie skrótu dla nieznanego pliku: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Wybierz kto może zażądać pokazania listy twoich udostępnionych plików."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Wznawianie wysyłania pliku: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Wstrzymywanie wysyłania pliku: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Nie powiodło się wykonanie komendy `%s' przy zdarzeniu `%s'."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Nie powiodło się wykonanie komendy '%s' przy zdarzeniu '%s'."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Pobieranie zakończone"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Pełna ścieżka do pliku."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Nazwa pliku bez jego ścieżki."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "Skrót eD2k pliku."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Rozmiar pliku w bajtach."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Łączny czas aktywności w pobieraniu."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Rozpoczęto nową sesję czatu"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Nadawca wiadomości."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Brak miejsca"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Partycja dysku."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Błąd podczas ukończenia"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Przetwarzanie pliku numer %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Nie istniejący plik !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, kreator linków eD2k aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Witamy!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Parametry wejściowe"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Plik do skracania"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Dodaj opcjonalny URL dla tego pliku"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:144
-msgid "Remove"
-msgstr "Usuń"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Utwórz link ze skrótami części"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Skrót typu MD4 pliku"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "Skrót eD2k pliku"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "Link eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Zapisz"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Otwórz"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Otwórz plik, by obliczyć jego link eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Kopiuj obliczony link ED2k do schowka"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Zapisz jako"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Zapisz obliczony link ED2k do pliku"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Informacje o aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Nie można otworzyć schowka"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "W tej chwili nie ma nic do skopiowania !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Wybierz plik do twojego obliczonego linku eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Nie mogę otworzyć "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Proszę wpisać nazwę pliku"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "W tej chwili nie ma nic do zapisania !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7312,162 +8873,159 @@
 "\n"
 "Dystrybucja na zasadach GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Tworzę skrót..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator pracuje dla ciebie"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Obliczenie Hashu MD4..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Obliczenie Hashów eD2k..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Anulowano !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Gotowe w %.2f ach"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Masz już dodany ten URL !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Proszę wpisać adres URL"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Nie mogę otworzyć %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, statystyki aMule online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Maksymalna szybkość DL od czasu uruchomienia wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Absolutne maksimum szybkości DL podczas poprzedniego uruchomienia wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Resetuj"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "System"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Zatrzymaj automatyczne odświeżanie"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Zapisz obrazek statystyk online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Wydrukuj obrazek statystyk online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Ustawienia preferencji"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Informacje o wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Rozpocznij automatyczne odświeżanie"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Automatyczne odświeżanie zatrzymane"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "automatyczne odświeżanie rozpoczęte"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Zapisz obrazek statystyk"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Statystyki aMule online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7475,11 +9033,11 @@
 "Wystąpił problem podczas drukowania.\n"
 "Może nie masz prawidłowo ustawionej drukarki ?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Drukuję"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7497,402 +9055,562 @@
 "\n"
 "Dystrybucja na zasadach GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Och och, aMule nie jest uruchomiony..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule jest uruchomiony"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule jest uruchomiony, ale nie połączony"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule łączy się..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Och och, status aMule jest nieznany..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " jest uruchomiony od "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " jest zatrzymany !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " jest nie połączony!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " łączy się..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " robi coś dziwnego, sprawdź to !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " jest połączony z "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "wyłączony"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " jest włączony "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " z "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Razem pobranych: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Wysłanych: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Pobranych w sesji: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Pobranych: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Wysłanych: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Udostępnione: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " plik(ów), Klientów w kolejce: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Czas: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " na "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Średnie obciążenie systemu (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Uptime systemu: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Katalog zawierający plik amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Czas pomiędzy odświeżeniami w sekundach"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Generuj obrazek statystyk przy każdym odświeżeniu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "Wpisz katalog, w którym chcesz generować obrazki statystyk"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Wysyłaj cyklicznie twój obrazek statystyk na serwer FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "Url FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Ścieżka FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Wpisz URL twojego serwera FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Użytkownik"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Czas pomiędzy odświeżeniami FTP w minutach"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Sprawdź"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Katalog zawierający twój plik sygnatury"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Katalog gdzie będzie wygenerowany statyczny obrazek"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Ładuje szablon <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Port HTTP serwera sieciowego"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Użyj forwardowania portu UPnP na porcie serwera sieciowego"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Port UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Używaj kompresji gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Hasło pełnego dostępu do serwera sieciowego"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Hasło gościa do serwera sieciowego"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Pozwól na dostęp gości"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Zabroń dostępu gościom"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "Wczytaj/zapisz ustawienia serwera sieciowego z/do zdalnego aMule"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "Ścieżka do pliku konfiguracyjnego aMule. NIE UŻYWAJ BEZPOŚREDNIO!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Zablokuj interpreter PHP (wycofywany)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Przekompiluj strony PHP przy każdym żądaniu"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Serwer WWW aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "zaakceptowano połączenie klienta sieciowego\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "BŁĄD: nie można zaakceptować połączenia klienta internetowego\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Żądanie nie powiodło się z powodu błędu: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Nie znaleziono pliku indeksu: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sesja wygasła - żądanie loginu\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sesja ok, zalogowano\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sesja ok, nie zalogowano\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Nie otwarto sesji - zażądam loginu\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Utworzono sesję - żądam loginu\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Przetwarzam żądanie (oryginalne): "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Nie podano hasła, logowania nie będą akceptowane."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Sprawdzam hasło\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Nieprawidłowy skrót hasła\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Hasło ok\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Złe hasło\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Zażądano wylogowania\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Przetwarzam żądanie (przekierowane): "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Nieudane połączenie "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Wysłano"
+#~ msgid "Ratio"
+#~ msgstr "Ocena"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Nie znaleziono plików do udostępniania w katalogu: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Zmień język"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "Niedostępny"
+
+#~ msgid "User name"
+#~ msgstr "Nazwa użytkownika"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Otrzymane części"
+
+#~ msgid "Available Parts"
+#~ msgstr "Dostępne części"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Znaleziono %i znany udostępniony plik, %i nieznanych"
+#~ msgstr1 "Znaleziono %i znane udostępnionych plików, %i nieznanych"
+#~ msgstr2 "Znaleziono %i znanych udostępnionych plików, %i nieznanych"
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Serwer zdalny"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Serwer lokalny"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Nieprawidłowy wpis w znanej liście plików, plik może być uszkodzony: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Zapisywanie pliku części %u z %u"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Aby zapobiec pojawianiu się tego komunikatu przy każdym podglądzie,\n"
+#~ "ustaw swój odtwarzacz wideo w preferencjach (domyślny jest %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Wyniki filtrowania"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Oznacz jako znany plik"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Nie znaleziono pliku."
+#~ msgid "Percent of total files"
+#~ msgstr "procent wszystkich plików"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Bootstrap"
+
+#~ msgid "New node"
+#~ msgstr "Nowy węzeł"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Więcej"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Rozruch od \n"
+#~ "znanych klientów"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Podłącz do dowolnego serwera i/lub Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Rozłącz z Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Zatrzymaj aktualne próby połączenia"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Rozłącz z aktualnie połączonymi sieciami"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Połącz z aktualnie włączonymi sieciami"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Auto-sortowanie plików (wysokie obciążenie procesora)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule będzie sortował kolumny w liście pobierania automatycznie"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Odrzuca pakiety, gdy ip klienta jest różne od ip, z którego pakiet jest otrzymywany. Używaj z ostrożnością."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Zwraca wyniki poprzedniego wyszukiwania.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Pokazuje postęp wyszukiwania.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Połączenie zostało zamknięte - aMule prawdopodobnie zakończone."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Sprawdź podczas startu czy jest nowa wersja"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Link eD2k: "
+
+#~ msgid "Commit"
+#~ msgstr "Zatwierdź"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: rozdzielanie tła - do zobaczenia"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Strona internetowa: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Strona internetowa: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Wysłano"

amule-3.0.1.tar.gz/po/pt_BR.po -> amule-3.1.0.tar.gz/po/pt_BR.po Changed

@@ -15,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-23 18:44+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:01+0000\n"
 "Last-Translator: Marcelo Jimenez <mroberto@users.sourceforge.com>\n"
 "Language-Team: Português (Brasileiro) <pt@li.org>\n"
 "Language: pt_BR\n"
@@ -27,72 +27,157 @@
 "X-Generator: Poedit 3.9\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "Sobre o aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Controle Remoto do aMule "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Snapshot:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Cliente p2p 'multi-plataforma' baseado no eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Direitos Reservados (c) 2003-2026 Equipe do aMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Parte do aMule é baseado no \n"
+
+#: src/AboutDialog.cpp
+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/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Direitos autorais reservados (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Página Web:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Fórum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Documentação:"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Problemas:"
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "Clique para conferir se existe uma versão nova ao iniciar."
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "Conferir existência de atualizações"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "Conferindo a existência de atualizações..."
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "Você está rodando a última versão do aMule."
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "Uma versão nova (%s) está disponível:"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr "Não foi possível conferir a existência de atualizações. Tente novamente mais tarde."
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Adicionar um amigo"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 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
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informação"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "A Hash do usuário especificado é inválida!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
-"aMule pode instalar um lançador de desktop e um ícone em seu diretório de usuário, de modo a aparecer em seu menu de aplicativos como um aplicativo instalado regularmente. Esta ação é reversível — os arquivos vivem dentro das pastas ~/.local/share/applications e ~/.local/share/icons e podem ser removidos em qualquer momento.\n"
+"aMule pode instalar um lançador de desktop e um ícone em seu diretório de usuário, de modo a aparecer em seu menu de aplicativos como um aplicativo instalado regularmente.\n"
+"\n"
+" Esta ação é reversível — os arquivos vivem dentro das pastas ~/.local/share/applications e ~/.local/share/icons e podem ser removidos em qualquer momento.\n"
 "\n"
 "Deseja instalar agora a integração com o desktop?"
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr "Adicionar o aMule ao seu menu de aplicativos?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr "Instalar"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr "Agora não"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr "Não perguntar novamente"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr "Não foi possível instalar a integração com o desktop: a variável de ambienteAPPDIR não está setada. Normalmente isto significa que a AppImage foi lançada de uma forma não padrão."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr "A integração do aMule falhou"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr "Não foi possível instalar a integração com o desktop: falha ao criar %s. Confira se seu diretório de usuário tem permissão de escrita."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr "Não foi possível instalar a integração com o desktop: falha escrevendo %s. Confira se seu diretório de usuário tem permissão de escrita."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr "Integração do AppImage: aMule foi adicionado ao seu menu de aplicativos."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr "Integração do AppImage: aMule foi adicionado ao seu menu de aplicativos (%d atalhos do shell em ~/.local/bin)."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -106,82 +191,167 @@
 "\n"
 "Reiniciar agora o aMule?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr "aMule instalado"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr "Reiniciar agora"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr "Mais tarde"
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 "Não foi possível adicionar link %u do arquivo ED2KLinks (veja o log para detalhes)."
-msgstr1 "Não foi possível adicionar %u links do arquivo ED2KLinks (veja o log para detalhes)."
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ERRO"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Falha ao abrir arquivo de Ligações ED2K."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+"Outro programa está de posse do arquivo de tranca do aMule:\n"
+"\n"
+"%s\n"
+"\n"
+"Este não é uma cópia do aMule rodando, portanto não há nada para trazer para frente. Feche o outro programa ou apague o arquivo de tranca enquanto o aMule não estiver rodando."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+"O daemon do aMule (amuled) já está rodando como o processo %d e está usando esta configuração.\n"
+"\n"
+"Ele não tem janela para trazer para frente. Conecte-o com o amuleGUI, ou pare o daemon antes de iniciar o aMule."
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr "O aMule não pode iniciar"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr "Permissões restringidas em %s para o dono apenas."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr "Arquivo de coleção não encontrado: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Arquivo de coleção vazio ou inválido: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr "Nenhum link utilizável na coleção: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 "Pulado %u link inutilizável na coleção: %s"
+msgstr1 "Pulados %u links inutilizáveis na coleção: %s"
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Não pode converter ligação magnética para eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Link eD2k inválido \"%s\" - ERRO: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Agora, deixando a aplicação principal..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Terminando a instância do amuleweb com o pid '%d'... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Matando a instância do amuleweb com o pid '%d'... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Falha"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Terminando a instância do amuleweb com o pid '%d' ... "
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Matando a instância do amuleapi com o pid '%d'... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Finalizando o núcleo."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "Encerramento do aMule completo."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Resultados da depuração da memória para a saída do aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr "Conectando o tráfego par-a-par do aMule para a interface: %s (atualizações via HTTP usam a rota padrão)"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr "Conectando todo o tráfego de rede à interface: %s"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr "AVISO: a interface de rede configurada '%s' não foi encontrada - o tráfego não está conectado a ela e pode sair pela rota padrão. Confira o nome da interface em Preferências."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr "AVISO: para conectar-se à interface de rede '%s' são necessários privilégios elevados e NÃO FOI aplicado - o tráfego pode sair pela rota padrão. Condeda a capacidade (e.g. 'sudo setcap cap_net_raw+ep') ao binário do aMule ou rode-o com privilégios suficientes."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr "AVISO: não foi possível conectar-se à interface de rede '%s' - o tráfego pode sair pela rota padrão."
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Seu locale foi alterado para o padrão do Sistema devido a mudança na configuração. Desculpe."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -189,24 +359,45 @@
 "\n"
 "Configuração EC"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Senha definida e conexões externas habilitadas."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "CUIDADO"
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr "Lista de servidores eD2k (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr "Inicializando a rede"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr "Nós de inicialização de Kad"
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "Carregando arquivos temporários"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Carregando arquivos temporários (%u de %u)"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "Carregando arquivos compartilhados"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "Carregando arquivos compartilhados (%u)"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "Iniciando"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Inicialização da Rede"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
@@ -214,30 +405,58 @@
 "O aMule detectou que faltam arquivos de inicialização da rede.\n"
 "Selecione quais baixar:"
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
-msgstr "Inicialização da Rede"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "Lista de servidores eD2k (server.met)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Nós de inicialização de Kad"
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web server rodando no pid %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "Você pediu para rodar o servidor web na início, mas o binário do amuleweb não pode ser rodado. Por favor instale o pacote contendo o servidro web do aMule, ou compile o aMule a partir do código fonte usando -DBUILD_WEBSERVER=YES e instale-o."
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "ERRO"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr "Não foi possível escrever o token EC do amuleapi para %s; amuleapi vai retroceder para sua senha configurada."
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr "amuleapi rodando com pid %d"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Você pediu para rodar o amuleapi na início, mas o binário do amuleapi não pode ser rodado. Por favor instale o pacote contendo o servidor REST API do aMule, ou compile o aMule a partir do código fonte usando -DBUILD_WEBSERVER=YES e instale-o."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr "Conexão externa: não foi possivel conectar a '%s'; ouvindo apenas em 127.0.0.1."
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Não foi possível conectar às portas desse endereço: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Porta %u não disponível. Você ficará com LOWID (id baixa)\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -252,49 +471,49 @@
 "\n"
 "Verifique sua rede para ver se essa porta está aberta para entrada e saída."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Falha ao criar o arquivo OnlineSig"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Falha ao criar o arquivo OnlineSig do aMule"
 
 # src/amuled.cpp:1246:
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr "Parece que o idioma selecionado não está instalado no seu computador. (Nota: eu irei defini-lo mesmo assim)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Essa é a primeira vez que você executa o aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Essa é uma versão de testes, atualizada diariamente, e\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "homepage https://amule-org.github.io ou em nosso canal de irc #aMule na irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Esteja a vontade para notificar qualquer bug em https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -302,513 +521,506 @@
 "A pasta especificada para os arquivos da Online Signature é INVÁLIDA!\n"
 "OnlineSignature ficará DESATIVADA até você atualizar as preferências."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Nome do servidor notificado"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr "Metadados de mídia: arquivo provado não é mais conhecido, o resultado foi descartado (%s)"
+
+#: src/amule.cpp
 #, 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/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "ERRO: não foi possível abrir arquivo de log"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "AVISO: o arquivo de log está vazio. Algo está errado."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Arquivo de log resetado"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "MensagemDoServidor: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr "Pulando o download de %s, pois o arquivo requerido não é o mais novo."
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Falha ao obter a lista de nodes."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Falha ao abrir arquivo de versão baixado"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Arquivo de versão corrompido"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Você está utilizando uma versão anterior do aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "A mais recente versão pode ser obtida em https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Sua cópia do aMule está em dia."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Falha ao baixar arquivo de controle de versão"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Usuários:%s | Arquivos: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Nenhuma rede selecionada"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "com LowID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "com HighID (Id alta)"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Conectado a %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Desconectado de eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad iniciado."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad parado."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Conectado a rede Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Conectado a rede Kad (sob firewall)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Desconectado da rede Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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 a porta UDP está desabilitada em preferências, não iniciará."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "A rede Kad está desabilitada em preferências, não iniciará."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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 também um aMule normal, inicie o amuled com a opção --ec-config ou mude o comando\"AcceptExternalConnections\" para 1 no arquivo ~/.aMule/amule.conf"
 
-#: src/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr "ERRO: Uma senha válida é requirida para conexões externas, e o daemon aMule não pode ser usado sem conexões externas. Pra rodar o daemon aMule, você deve definir a campo \"ECPassword\" no arquio ~/.aMule/amule.conf com o valor apropriado. Execute o amuled com a opção --ec-config para definir a senha. Mais informações podem ser encontradas em https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - iniciando temporizador"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: forking to background - até mais"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Incapaz Criar Arquivo Pid"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "ERRO: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Esse é o aMule %s, baseado no eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Executando em %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Visite https://github.com/amule-org/amule/releases/latest para ver se há nova versão disponível."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ERRO FATAL: Falha ao criar Timer"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Controle Remoto do aMule "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "Erro! Não foi possível carregar as Preferências"
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Redes"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Cliente p2p 'multi-plataforma' baseado no eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Pesquisas"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Página: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Fórum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Arquivos compartilhados"
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Documentação: https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Clientes"
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
-"Problemas: https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Mensagens"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Direitos Reservados (c) 2003-2026 Equipe do aMule \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Estatísticas"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Parte do aMule é baseado no \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Preferências"
 
-#: src/amuleDlg.cpp:552
-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/amuleDlg.cpp
+msgid "Navigate"
+msgstr "Navegar"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Direitos autorais reservados (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "Espaço livre: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Mensagem"
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "Uma versão mais nova está disponível"
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"Uma versão mais nova do aMule (%s) está disponível.\n"
+"\n"
+"Você está rodando %s\n"
+"\n"
+"Você gostaria de abrir a página de download?"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "destruído caixa de diálogo do aMule"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Conectado"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Desconectado"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Atrás de Firewall"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Conectado"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Conectando"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Desligado"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Cancelar as tentativas atuais de conexão"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Desconectar"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr "Núcleo"
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versão"
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Desconectar das redes atualmente conectadas"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr "O núcleo e o aMuleGUI são de versões diferentes."
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr "O núcleo e o aMuleGUI são da mesma versão."
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Conectar"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Endereço"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Conectar às redes ativas"
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "Encriptar"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " MiB/s"
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " KiB/s"
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Up: %.1f%s | Down: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Conectado)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Desconectado)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Você realmente quer sair %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Confirmação de saída"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Lançar Comando: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- padrão -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "O diretório '%s' de skins não existe"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, 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:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Redes"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Janela de redes"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Pesquisas"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Janela de Pesquisas"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Downloads"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Janela de Downloads"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Arquivos compartilhados"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Janela de compartilhados"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Mensagens"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr "Janela dos Clientes"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Janela de Mensagens"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Janela de Estatísticas"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Preferências"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Janela de Preferências"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importar"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Ferramenta de importação de arquivos .part"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Sobre"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Sobre/Ajuda"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Rede eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "rede Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Sem redes"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Controle remoto do aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Erro Fatal: Falha ao criar Core Timer"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Conectar a aMule remoto"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Conexão perdida"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr "Abortar a edição e sair"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "Reconectando... (tentativa %d)"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr "Próxima tentativa em %d s..."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+"A conexão com %s foi perdida.\n"
+"%s\n"
+"\n"
+"A interface foi pausada até que a conexão seja reestabelecida."
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Erro Fatal: Falha ao criar Poll Timer"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Repetição de evento..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr "A conexão falhou. Por favor, confira o anfitrião, porta e senha."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Manipulador de evento GUI EC remoto"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "Falha na conexão. Incapaz de conectar em %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Desligando"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Conexão fechada - aMule foi provavelmente terminado."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr "O tempo para a tentativa de reconectar foi expirado; tentando novamente."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
@@ -817,1060 +1029,1360 @@
 "Tempo expirado na conexão. Incapaz de atingir %s:%d dentro do tempo alocado.\n"
 "Por favor, confira o host, porta e que aMule esteja rodando com a opção de Conexões Externas habilitada."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr "A conexão com o núcleo remoto foi perdida. Tentando reconectar..."
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Desabilitado"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr "Reconectado ao núcleo remoto."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr "O núcleo remoto foi reiniciado; recarregando."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Tentativa de reconexão %d: conectando-se a %s:%d"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr "A reconexão não pode ser iniciada; tentando novamente em breve."
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Pronto"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Tudo"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr "não é possivel ler"
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr "não encontrado"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr "O núcleo rejeitou as seguintes pastas compartilhadas: %s"
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Link inválido ou já está na lista."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr "O daemon recusou a solicitação."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "Não foi possível excluir a categoria: %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr "Incapaz criar o diretório '%s' para a categoria '%s', mantendo diretório '%s'."
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr "O núcleo remoto mandou dados inconsistentes para \"%s\" (estado da parte %d, esperado %d). A lista de arquivos pode estar mostrando a informação errada; reconecte para limpar."
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Falha ao receber lista de compartilhamentos do usuário '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Procurando amigo para conexão lowid"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (versão de eMule falsa %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (eMule Falso)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (eMule Falso)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (baseado no eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Nickname: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Solicitado: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estatísticas dessa sessão: Aceito %d de %d pedido, %s transferido\n"
 msgstr1 "Estatísticas dessa sessão: Aceitos %d de %d pedidos, %s transferidos\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estatísticas de todas as sessões: Aceito %d de %d pedido, %s transferido\n"
 msgstr1 "Estatísticas de todas as sessões: Aceitos %d de %d pedidos, %s transferidos\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Solicitado um arquivo desconhecido"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Mensagem filtrada de '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nova mensagem de '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Usuário %s (%u) solicitou sua lista de compartilhados para pasta não existente '%s' -> Negado"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Falha ao receber lista de compartilhamentos do usuário '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "CUIDADO: %s não pode ser aberto."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "CUIDADO: Cancela lista de arquivos corrompida, contém cabeçalho inválido."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Erro de I/O ao ler arquivo %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Erro ao salvar arquivo %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Insira o Captcha"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Categoria"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nova Categoria"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Escolha um diretório para os arquivos"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Você precisa dar um nome para a categoria!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Você precisa definir um caminho para a categoria!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Sessão de Chat iniciada: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Conectado ao Cliente ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Conectando ao Cliente ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Falha ao conectar ao Cliente / Conexão perdida ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr "*** Você tem que inserir a checagem captcha e o usuário terá recebido sua mensagem. ***"
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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 "*** Sua resposta para o captcha esta errada e sua mensagem foi ignorada. Você pode requerer um novo captcha enviando uma nova mensagem. ***"
 
-#: src/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Bate-papo"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Fechar aba"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Fechar todas as abas"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Fechar outras abas"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Adicionar aos Amigos"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Exibir &Detalhes"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Remover dos amigos"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Abrir slot para amigos"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Exibir Arquivos"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Enviar mensagem"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Enviar mensagem ao usuário"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Mensagem a Enviar:"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Você não pode definir mais de um slot para amigos.\n"
+" Apenas um foi definido."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Seleção múltipla"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 "Adicionar %u cliente à sua lista de amigos?"
+msgstr1 "Adicionar %u clientes à sua lista de amigos?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Remove %u cliente da sua lista de amigos?"
+msgstr1 "Remove %u clientes da sua lista de amigos?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 "Não foi passível adicionar %u cliente selecionado à sua lista de amigos: não tem endereço conhecido."
+msgstr1 "Não foi passível adicionar %u clientes selecionados à sua lista de amigos: não têm endereço conhecido."
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Pedir a lista de arquivos compartilhados de %u cliente?"
+msgstr1 "Pedir a lista de arquivos compartilhados de %u clientes?"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr "Uma conexão está aberta para cada um deles."
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Arquivo de créditos carregado, %u cliente reconhecido"
 msgstr1 "Arquivo de créditos carregado, %u clientes reconhecidos"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - Créditos expirados para %u cliente!"
 msgstr1 " - Créditos expirados para %u clientes!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Arquivo 'cryptkey.dat' não foi encontrado, criando."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Detalhes do Cliente"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Suportado"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Desabilitado"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Conectado"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f KiB/s"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nome"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "Software"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Endereço IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Origem"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr "Visto primero"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr "Visto por último"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "Sessões"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Velocidade de Upload"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Velocidade de Download"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "Total enviado"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "Total baixado"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Modificador Down/Up"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr "Online agora"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Incompleto"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Cara Mau"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Verificado - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Não Disponível"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "Não foi possível pedir a %u cliente selecionado por seus arquivos compartilhados."
+msgstr1 "Não foi possível pedir a %u clientes selecionados por seus arquivos compartilhados."
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Arquivos"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Enviado"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Baixado"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "Baixando de"
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr "Enviando para"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Ativos"
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr "Conhecido"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Usuário %s (%u) pediu sua lista de shares -> Aceito"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Usuário %s (%u) pediu sua lista de shares -> Negado"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "O usuário %s (%u) solicitou sua lista de pastas compartilhadas -> Aceito"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "Usuário %s (%u) solicitou sua lista de compartilhados para pasta '%s' -> aceito"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "Usuário %s (%u) solicitou sua lista de compartilhados para pasta '%s' -> negado"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Usuário %s (%u) compartilha diretório '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Usuário %s (%u) enviou pastas não solicitadas."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "Usuário %s (%u) enviou lista de compartilhamentos para pasta '%s'"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "Usuário %s (%u) terminou de enviar seus compartilhamentos"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Usuário %s (%u) enviou compartilhamentos não solicitados"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, 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/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Comentários do arquivo"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Nome do usuário"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Nome do arquivo"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Avaliação"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr "Não foi possível começar uma busca Kad"
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "Procurando por comentários em Kad..."
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Sem comentários"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u comentário"
 msgstr1 "%u comentários"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr "O cliente %s foi banido por enviar %s dados corrompidos de um total de %s para o arquio '%s'"
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Falha ao obter a dados de país para '%s'."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Baixo"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto Normal"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Alto"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Muito baixo"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Baixo"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Alto"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Muito Alto"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Lançamento"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Perguntando"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Conectando via servidor"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Fila de espera cheia"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Na fila de espera"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Baixando"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Recebendo hashset"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Nenhuma parte necessária"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Não se pode conectar LowID com LowID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Excesso de conexões"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Conectando via Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Muitas conexões Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Banido"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Erro ao conectar"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Fila de espera remota cheia"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "MlDonkey velho"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Novo MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Compatível com eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Servidor Local"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Servidor Remoto"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Troca de Fontes"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passivo"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Link"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Fontes de arquivo"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Resultado da Busca"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Completado"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Em progresso"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "ERRO: falta de espaço em disco"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "Erro: Partmet não encontrado"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ERRO: erro de E/S!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ERRO: Falhou!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Na fila de espera"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Já baixando"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Arquivo temp desconhecido ou danificado."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr "Este diretório faz parte de um compartilhamento recursivo. Para removê-lo, deixe de compartilhar ou modifique a raiz do compartilhamento recursivo acima dele."
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr "Não é possível cancelar o compartilhamento dentro de um compartilhamento recursivo"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr "Não é possível modificar dentro de um compartilhamento recursivo"
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Parte"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Transferido"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Velocidade"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Progresso"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Fontes"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioridade"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Status"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Tempo Restante"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Última vez concluído"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Último recebimento"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Deseja remover os arquivo selecionado?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Deseja remover os arquivos selecionados?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Resposta de: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Auto"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Parar"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "Pau&se"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Continuar"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Limpar Down&loads concluídos"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Trocar cada entrada A4AF para este arquivo agora"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Trocar cada entrada A4AF para este arquivo (auto)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Trocar cada entrada A4AF para outro arquivo"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Opções Extras"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Pré-visualizar"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "Mostrar no gerenciador de arquivos"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Exibir &detalhes do arquivo"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Exibir todos os comentários"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Copiar URL Magnet para Área de Transferência"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Copiar &link eD2k para área de transferência"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Copiar retorno para a Área de Transferência"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Obtendo %s para este arquivo"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "não definido"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Adicionar na Categoria"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "Abrir &o arquivo"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Deseja remover os arquivo selecionado?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Deseja remover os arquivos selecionados?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Resposta de: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Informe o novo nome para o arquivo:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Renomear"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
+msgid "%.1f MiB/s"
+msgstr "%.1f MiB/s"
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Downloads (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr "O manipulador de shell default do Windows"
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Para impedir que este aviso apareça em toda pré-visualização,\n"
-"defina seu tocador de vídeo preferido nas preferências (%s é o padrão)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Pré-visualização"
-
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, 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'"
+msgid "Total queue size: %s"
+msgstr "Tamanho total da fila: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Salvando PartFile %u de %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Todas PartFiles Salvas."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Carregando arquivos temp de %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Carregando PartFile %u de %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "ERRO: Falha ao carregar arquivo de cópia. Procure em https://github.com/amule-org/amule/discussions para o .part.met recuperar soluções."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Todas PartFiles Carregadas."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Nenhum arquivo parcial (.part) encontrado"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Encontrado %u arquivo parcial"
 msgstr1 "Encontrados %u arquivos parciais"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "O sistema de arquivos para o diretório Temp não pode manusear grandes arquivos."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 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/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Baixando %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Ops! Você já está tentando baixar o arquivo '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Você já tem o arquivo '%s' (pedido como '%s')"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Você já tem o arquivo '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Ops! Você já está tentando baixar o arquivo %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Não pode converter ligação magnética para eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Protocolo de link desconhecido: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 "Não foi possível adicionar %u link (veja o log para detalhes)."
 msgstr1 "Não foi possível adicionar %u links (veja o log para detalhes)."
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Ligação eD2k inválida! ERRO: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Pacote enviado por cliente após falha na autenticação."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Conexão externa encerrada."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Conexões externas desativadas por não ter sido definida uma senha!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Conexões externas desativadas no arquivo de configuração"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Novas conexões externas aceitas"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERRO: Não pôde aceitar uma nova conexão externa"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 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:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Cliente conectando: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Versão desconhecida"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "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:559
+#: src/ExternalConn.cpp
 msgid "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 de desenvolvimento! *ufa* Possível travamento evitado"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Versão do protocolo inválida."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Falta tag de versão do protocolo."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Muitas tentativas de conexão falharam; tente novamente em %d segundos."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Autenticação falhou: hash inválido especificado como senha EC."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr "Falha na autenticação: o cliente ofereceu uma Conexão Externa criptografada, mas não enviou uma chave utilizável."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr "A autenticação falhou: este aMule requer uma conexão esterna criptografada, e o cliente não negociou uma."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr "Falha na autenticação: o cliente não conseguiu confirmar a sessão criptografada."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Falha na autenticação: senha errada."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Falha na autenticação: senha desconhecida."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Requisição inválida, por favor autentique primeiro."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Acesso liberado."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Enviar mensagem de erro \"%s\" para cliente."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Tentativa de acesso de %s não autorizado. Conexão encerrada."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Hash do arquivo não encontrada: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! Processando erro OpCode!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Servidor não adicionado"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "servidor não encontrado: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "precisa definir o servidor a ser removido"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k foi desabilitado nas preferências."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr "Ainda não há endereço conhecido para este amigo."
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr "Amigo não encontrado."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr "Cliente não encontrado."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr "EC_TAG_FRIEND_SHARED requer EC_TAG_FRIEND ou EC_TAG_CLIENT."
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Pesquisa em andamento, aguarde!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Pesquisa web pela interface remota não faz sentido."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr "Uma vistoria não é uma busca que possa ser iniciada."
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Pesquisa em andamento, aguarde!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Sem dados para gráfico."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 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:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Conexão Externa: requerido desligar"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Já estou desligando."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: adicionar link '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "%d de %d links falharam (inválidos ou já estava na lista)."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr "A checagem de versão foi desacelerada; tente novamente em breve."
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr "A checagem de versão não está disponível neste daemon."
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Arquivo não encontrado."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Nome de arquivo inválido."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Não foi possível renomear o arquivo."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr "O cliente não pode ser trocado para este arquivo."
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr "Não foi possível salvar a senha da amuleapi: %s"
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "Não existe tal categoria."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr "Solicitação de categoria malformada."
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr "A categoria padrão não pode ser excluída."
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "Falta o id de sessão"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "Esta sessão de chat não existe"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "A extração de metadados de mídia está desativada nas preferências"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr "O arquivo não é elegível para extração de metadados de mídia (não é um arquivo de audio/vídeo, ou é um download incompleto)"
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "Mensagem de chat vazia"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "Alvo de chat desconhecido"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad está desativado nas preferências."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Já conectado em eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Conectando em eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Já conectado a rede Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Conectando a rede Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Todas as redes estão desabilitadas."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Desconectado de eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Desconectado da rede Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Conexão Externa:opcode recebido inválido: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "O opcode é inválido (versão errada do protocolo?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Extensão '%s' desconhecida para o comando '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Comando desconhecido '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1878,7 +2390,7 @@
 "\n"
 "Esse comando não precisa de argumentos.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1886,7 +2398,7 @@
 "\n"
 "Esse comando precisa de um argumento.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1894,7 +2406,7 @@
 "\n"
 "Esse comando está incompleto, você precisa de uma das extensões abaixo.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1902,11 +2414,11 @@
 "\n"
 "Extensões disponíveis:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Comandos disponíveis:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1917,17 +2429,17 @@
 "Todos os comandos não diferenciam letras maiúsculas de minúsculas.\n"
 "Digite '%s <comando>' para obter ajuda sobre o <comando>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Sair do programa."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Exibe a ajuda."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1935,7 +2447,7 @@
 "Para obter ajuda sobre um comando, digite 'help <comando>'.\n"
 "Para obter a lista completa de comandos, digite 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1946,46 +2458,46 @@
 "Use '%s' para lista de comandos\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Erro na sintaxe!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Este comando não precisa de parâmetros."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Este comando precisa de um parâmetro."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Argumento inválido."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Este comando está incompleto."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Digite '%s' para maiores informações.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Este é %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Este é %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1993,7 +2505,7 @@
 "\n"
 "Criando cliente..\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2002,7 +2514,7 @@
 "\n"
 "Ok, abandonando %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2016,118 +2528,370 @@
 "\n"
 "Finalizando...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Exibir esse texto de ajuda."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Host onde o aMule está rodando. (padrão: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Porta em que o aMule está esperando Conexões Externas (padrão: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Senha para Conexão Externa."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Ler configuração de arquivo."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Não imprima mensagens em stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Seja verborrágico - mostre até as mensagens de debug."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Defina o locale (idioma)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Gravar opções de linha de comando."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Criar arquivo de configuração baseado no do aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Exibir versão do programa."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr "Não criptografar a conexão esterna. A criptografia está ligada por padrão sempre que o aMule remoto suportá-la; desligá-la deixa tudo legível após o login e modificável por qualquer um no caminho."
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr "Força a compressão ZLIB independente da localidade IP discado (útil quando o servidor for alcançável por um túnel VPN que resolve para um IP de LAN)."
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr "Acrescenta uma cópia de toda saída do console a este arquivo de log (padrão: <config-dir>/amuleapi.log)."
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr "Não escrever um arquivo de log; imprimir apenas no console."
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Detalhes do Arquivo"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% concluído"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Pré-visualização"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "ERRO: Falha ao executar o tocador de mídia externo! Comando: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr "O tocador de vídeo configurado não foi encontrado: %s"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr "Não foi possível abrir '%s': o arquivo não está presente neste computador."
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr "Visualizar antecipadamente um download incompleto necessita de um tocador de vídeo: o arquivo parcialmente baixado não tem um tipo que o sistema consiga abrir sozinho. Um tipo pode ser configurado em Preferências -> Geral."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr "ERRO: Falha ao abrir '%s' com o aplicativo padrão."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ERRO: Falha ao mostrar '%s' no gerenciador de arquivos."
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "Móvel / 4G-5G (20 / 5 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL (24 / 1 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL (50 / 10 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Cabo (200 / 20 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Fibra 300 (300 / 100 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "Fibra Gigabit (1000 / 1000 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr "Configuração da primeira rodada do aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "Bem-vindo ao aMule!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+"Esta configuração rápida vai conectar você. Você pode mudar\n"
+"qualquer uma destas configurações mais tarde nas Preferências."
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "Escolha um apelido que será visto por seus pares:"
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr "Conecxão e largura de banda"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+"Escolha a opção que melhor combina com sua conexão de internet,\n"
+"ou configure os limites de upload e download diretamente abaixo."
+
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "Velocidade da Conexão:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr "Outra / configurar manualmente"
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "Limite de upload (KiB/s, 0 = ilimitado):"
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "Limite de download (KiB/s, 0 = ilimitado):"
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "Redes e portas"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr "O aMule pode usar duas redes. Recomendamos manter ambas habilitadas."
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Porta TCP Padrão "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Porta UDP estendida (Kad / pesquisa global) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Habilitar UPnP para redirecionamento de porta do roteador"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+"Permite ao aMule pedir a seu roteador que encaminhe as portas acima de modo que outros\n"
+"pares possam chegar até você (um \"HighID\"). Desligue se seu roteador\n"
+"não suporta UPnP ou se você encaminhar as portas manualmente."
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr "Arquivos de inicialização"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+"Para começar, o aMule precisa saber sobre alguns pares.\n"
+"Selecione qual listas baixar agora:"
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Sua lista de pares já está no lugar - não há nada para baixar."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Lista de servidores auto-atualizáveis na iniciação"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr "Integrações (opcional)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+"Escolha como o aMule se integra com seu sistema. Você pode\n"
+"mudar qualquer uma destas mais tarde nas Preferências."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "Iniciar o aMule automaticamente quando eu logar no sistema"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr "Registrar aMule para links ed2k://"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr "Registra o aMule para links \"magnet:\""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr "Apenas magnets compatíveis com a rede eD2k. Deixe em branco se você usa um cliente BitTorrent."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr "Abrir arquivos .emulecollection com o aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr "Pastas (opcional)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+"Os valores padrão estão bem para a maioria das pessoas. Mude-os se você\n"
+"quiser downloads em um disco diferente (maior, por exemplo)."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Pasta de destino para baixados"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Procurar"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Todos os arquivos nesta pasta são compartilhados com outros pares)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Pasta para arquivos temporários baixados"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+"Baseado nisso, o aMule vai permitir até %i fontes por arquivo\n"
+"e %i conexões de clientes."
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr "Mostrar esse sábio de configuração novamente na próxima vez que você iniciar o aMule?"
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr "Configuração não terminada"
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Falha em abrir lista de amigos do arquivo 'emfriends.met' para leitura!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Falha em abrir lista de amigos do arquivo 'emfriends.met' para escrita!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr "Ainda não há endereço conhecido para o amigo '%s', não é possível visualizá-lo."
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "CRÍTICO - nenhum cliente em StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Amigos"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Exibir &Detalhes"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Adicionar amigo"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Remover amigo"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Enviar &Mensagem"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Exibir Arquivos"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Abrir slot para amigos"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr "Não há endereço conhecido para o amigo '%s', não é possível mandar mensagem."
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Deseja eliminar o amigo selecionado de sua lista?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Deseja eliminar os amigos selecionados de sua lista?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2135,977 +2899,1283 @@
 "Você não pode definir mais de um slot para amigos.\n"
 " Apenas um foi definido."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Seleção múltipla"
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Você não pode definir mais de um slot para amigos.\n"
-" Apenas um foi definido."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Enviar mensagem ao usuário"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Mensagem a Enviar:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Remover dos amigos"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Enviar mensagem"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Trocar para esse arquivo"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr "Legenda colorida"
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "Em Fila: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Pediu por outro arquivo"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Esperando por slot de upload"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "Na fila: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Enviando"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Nenhum"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Não"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Sim"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Falha ao abrir o banco de dados MaxMindDB '%s': %s"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Baixando..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "Download HTTP cancelado"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "A URL para baixar não pode estar vazia"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Falha ao criar requisição HTTP para %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr "HTTP download: corpo da resposta vazio para %s"
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Não foi possível mover arquivo baixado para %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Baixados %s (%llu bytes)"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr "A URL %s retornou: %i"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Baixa HTTP falhou para %s: %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr "HTTP 401 Não autorizado para %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr "Arquivo GeoLite2-Country.mmdb existente migrado para %s"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr "IP2Country: MaxMind selecionado como fonte de GeoIP, mas não existe chave de licensa configurada. Abra Preferências → IP2Country, e cole sua chave de licensa grátis e clique \"Atualizar agora\"."
-
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr "IP2Country: URL Customizada foi selecionada como fonte de GeoIP, mas não existe URL configurada. Abra Preferências → IP2Country, e forneça uma URL que aponte para um arquivo .nmdb (ou .gz / .tar.gz contendo um)."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr "%s não é um arquivo MaxMindDB legível - descartando-o. Uma cópia recente vai ser baixada no próximo começo, ou agora via Preferências -> IP2Country -> 'Atualizar agora'."
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "IP2Country: MaxMind foi selecionado como a fonte de GeoIP, mas não existe chave de licensa configurada. Abra Preferências -> IP2Country, e cole sua chave de licensa grátis da MaxMind e clique 'Atualizar agora'."
+
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "IP2Country: Uma URL Customizada foi selecionada como fonte de GeoIP, mas não existe URL configurada. Abra Preferências -> IP2Country, e forneça uma URL que aponte para um arquivo .nmdb (ou .gz / .tar.gz contendo um)."
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr "IP2Country: falhou em resolver uma URL de download de GeoIP."
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr "Baixando novo %s de %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "Download de %s falhou, a atualização foi interrompida."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Falha ao remover o arquivo %s, a atualização foi interrompida."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Falha ao renomear arquivo %s, a atualização foi interrompida."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "Atualização concluída %s"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr "Erro ao atualizar %s"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr "Falha no download de DB-IP para o mês corrente - tentando novamente com a URL do mês anterior."
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Falha ao baixar %s de %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Falha ao obter a dados de país para '%s'."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Carregando Filtros de IP 'ipfilter.dat' e 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Falha ao carregar arquivo ipfilter.dat '%s', formato desconhecido."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "Carregada %u Faixa de IP de '%s'."
 msgstr1 "Carregadas %u Faixas de IP de '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u linha malformada foi ignorada."
 msgstr1 "%u linhas malformadas foram ignoradas."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Falha ao renomear novo arquivo %s, abortando atualização."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "Filtro IP está pronto"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Inicializando com \n"
-"clientes conhecidos"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Atual"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Média de execução"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Média da sessão"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Nós (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "IP Inválido para inicialização"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Porta inválida para inicialização"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Preencha todos os campos necessários"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Mensagem"
+
+#: src/KadDlg.cpp
 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/KadDlg.cpp:213
+#: src/KadDlg.cpp
 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/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Continuar?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: chave de pesquisa muito curta"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: Termo para busca já está na lista de busca: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Falha ao ler o arquivo nodes.dat - muito velho. Essa versão (0) não é mais suportada."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Lendo %u contato Kad"
 msgstr1 "Lendo %u contatos Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Nenhum contato encontrado, por favor reinicie, ou baixe um arquivo nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Somente %d de contato Kad disponível, nodes.dat não escrito"
 msgstr1 "Somente %d de contatos Kad disponíveis, nodes.dat não escrito"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Gravado %d contato Kad"
 msgstr1 "Gravados %d contatos Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Usuário Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr "A busca de nota em Kad por '%s' não foi iniciada: Kad não está conectada"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr "A busca de nota em Kad por '%s' não foi iniciada: uma busca de nota já está rodando para este arquivo"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr "A busca de nota por '%s' não foi iniciada: o arquivo não está na lista de compartilhamento, na fila de downloads ou nos resultados da busca"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr "A busca por nota em Kad por '%s' não foi iniciada: outra busca Kad (e.g. uma busca por fontes) já está usando o hash deste arquivo - tente novamente em breve"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr "A busca por nota em Kad por '%s' não foi iniciada: falha na preparação de busca (PrepareLookup)"
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Nome do Arquivo"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Tamanho do arquivo"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Taxa de compartilhamento"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Enviado"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Requisitado"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Aceito"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Fontes completas"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "ATENÇÃO: Arquivo de lista known corrompido, contém cabeçalho inválido."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Falha ao carregar entrada em lista de arquivo known, arquivo pode estar corrompido"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Entrada inválida na lista de arquivo known, arquivo pode estar corrompido: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Padrão do sistema"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanês"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Árabe"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturiano"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Basco"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Búlgaro"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Catalão"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Chinês (Simplificado)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Chinês (Tradicional)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Croácia"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Tcheco"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Dinamarquês"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Holandês"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Inglês (UK)"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "Inglês (U.S.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estônia"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finlandês"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francês"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galego"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Alemão"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grego"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebreu"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Hungria"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italiano"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japonês"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Coreano"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "Letão"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lituânia"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Noruega (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polonês"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Português (Portugal)"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Português (Brasil)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Albanês"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Russo"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Esloveno"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Espanhol"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Suécia"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turquia"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ucraniano"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Erro desconhecido %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Incapaz obter descrição do erro para o erro %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Calculando hash"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Finalizando"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Completo"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Pausa"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Com Erro"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Esperando"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Você deve informar uma senha não-vazia."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Senha inválida, não é um hash MD5!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr "Não foi possível resolver %s para um endereço IPV4."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Falha ao conectar"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
-msgstr "Conexão externa encerrada — saindo."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
+msgstr "Conexão externa perdida - saindo."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "Conexão EC falhou. Resposta vazia."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr "Não foi possível configurar a criptografia da conexão. A conexão foi encerrada."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr "O núcleo não negociou uma conexão criptografada. Pode ser uma versão mais antiga do aMule sem suporte à criptografia, ou a conexão pode ter sido adulterada. Para conectar sem criptografia, desative essa opção nas configurações de conexão."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Conexão Externa: Má resposta, handshake falhou. Conexão fechada."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Conexão Externa: o daemon não conseguiu comprovar que conhece a senha. Conexão encerrada."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Sucesso! Conexão estabelecida ao aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Sucesso! Conexão estabelecida."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Conexão Externa: Acesso negado porque: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Conexão Externa: Handshake falhou."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr "Erro criando soquete UDP %s %d: %s"
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Iniciada a linha Asio %d"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "Soquete de escuta: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "ERRO: Não pôde ouvir a porta TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "ERRO: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "CUIDADO: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr "Metadados de media: binário de ffprobe não foi encontrado. Instale o ffmpeg ou configure o caminho do ffprobe nas preferências; O comprimento, o bitrate e o codec não serão extraídos."
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr "Metadados de mídia: %s sumiu, nada a extrair"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr "Extraindo os metadados da mídia com ffprobe: %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr "Metadados de mídia: tempo excedido em ffprobe ou foi cancelado por %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr "Metadados de mídia: ignorando saída de ffprobe implausívamente grande para %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr "Metadados de mídia: não foi possível rodar ffprobe (%s) -- confira as configuração de metadados de mídia"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr "Metadados de mídia: ffprobe falhou (código %d) por %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr "Metadados de mídia: o ffprobe não achou nada usável em %s"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 "Terminada a extração de metadados de mídia de %u arquivo compartilhado (%u falharam)"
+msgstr1 "Terminada a extração de metadados de mídia de %u arquivos compartilhados (%u falharam)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 "Terminada a extração de metadados de mídia de %u arquivo compartilhado"
+msgstr1 "Terminada a extração de metadados de mídia de %u arquivos compartilhados"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 "Falha na extração de metadados de mídia de %u arquivo adicional (não listado individualmente)"
+msgstr1 "Falha na extração de metadados de mídia de %u arquivos adicionais (não listados individualmente)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 "%u arquivo adicional compartilhado sumiu (não listado individualmente)"
+msgstr1 "%u arquivos adicionais compartilhados sumiram (não listados individualmente)"
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Fechar"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Recortar"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Colar"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "KiB/s"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Ilimitado"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Mostrar aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Ocultar aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr "Conectado (LowID)"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr "Conectado (HighID)"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr "Conectado (sob firewall)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr "Servidor: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr "IP do servidor: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Não conectado"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Porta TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Porta TCP: Não está pronta"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Porta UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Porta UDP: Não está pronta"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Informação do Cliente"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Limite de envio"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Limite de download"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Mostrar aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Desconectar"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Ocultar aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Conectar"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Sair"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Ilimitado"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Menu do Tray aMule"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Limites de Velocidade:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "UL: Nenhum"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "UL: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DL: Nenhum"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DL: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Velocidade de Download: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Velocidade de Upload: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Apelido: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Nenhum Nickname definido!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ClienteID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Nome do Servidor: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP do Servidor: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Não conectado"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online Signature: Ativado"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online Signature: Desativado"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Tempo ligado: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Arquivos compartilhados: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Cliente na fila: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "DL Total: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "UL Total: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Ligação 2D2k: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr "Criado %s na porta %u"
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Adicionar"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr "AVISO! %s: Pacote para %s descartado devido a erro (%s) durante o envio."
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr "Cole links eD2k ou magnet aqui"
+
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "Adicionar links"
+
+#: src/muuli_wdr.cpp
 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:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
-msgstr "Os eventos são exibidos aqui. Para uma lista completa, veja o log na aba Servidores."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr "Os eventos são exibidos aqui. Para uma lista completa, veja o log na aba de Redes."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Carregando..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Número de usuários conectados neste servidor..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Usuários: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Usuários conectados a esse servidor e número estimado do total de usuários."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Up: 0.0 | Down: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "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:139
+#: src/muuli_wdr.cpp
 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 "Exibe o status atual da conexão e transferências ativas. Seta VERMELHA significa que você não está conectado, AMARELA significa que você está com 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Não Conectado..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Servidor atualmente conectado."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Pesquisar"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nome:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tipo"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Parâmetros Estendidos"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtrando"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Tipo de Arquivo"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Todos"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Arquivos"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "Imagem-CD"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr "Imagem de disco"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Figuras"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programas"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Textos"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Extensão"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Tamanho Mínimo"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "KiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "MiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "GiB"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Tamanho Máximo"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Disponível"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtro:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Resultados do Filtro"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtro"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Inverter resultado"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Ocultar arquivos conhecidos"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr "Reiniciar os Filtros"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Iniciar"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Mais"
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "Estender"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr "Pedir para pares Kad que já responderam para alargar a busca. Cada clique interroga o próximo par mais próximo por mais contatos (KADEMLIA_FIND_VALUE_MORE), fazendo emergir casamentos de arquivos adicionais que a fronteira alfa inicial da busca perdeu."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Pare"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Download"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Baixar na categoria"
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "Limpar os Resultados da Busca"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Reiniciar Campos"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Limpar downloads completados"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Fontes de arquivos:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Geral"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Nome Completo:"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Nome Completo"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "arquivo met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "arquivo-met :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Tamanho :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Status parcial :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Última vez completo:"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Tamanho do arquivo"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Transferência"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Fontes encontradas:"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Transferindo de (fontes):"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Contador de partes:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Disponíveis:"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Taxa de transf.:"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Tempo ativo de download: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Transferido :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Tamanho completo:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Estado do arquivo de parte"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Última vez completo"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Fontes encontradas"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Fontes transferindo"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Contagem de partes"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Disponíveis"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Taxa de transferência"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Tempo de download ativo"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Tamanho completo"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Manipulador Inteligente de Corrupção (I.C.H.)"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Perdido ao corromper:"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Ganho com compressão:"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Pacotes recuperados pelo I.C.H.:"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Perdido ao corromper"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Ganho por compressão"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Pacotes salvos pelo I.C.H."
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr "Compartilhando"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Pedidos"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Pedidos aceitos"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Dados transferidos"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Taxa Compartilhada"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Fontes Completas"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "Compartilhado desde"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "Ultimo upload"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr "Informação da Mídia"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "Comprimento"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "Taxa de Bits"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "Codec"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "Artista"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "Album"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Título"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Nomes do arquivo"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Assumir"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Limpar"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 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:705
+#: src/muuli_wdr.cpp
 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."
@@ -3113,528 +4183,531 @@
 "Para um filme você pode dizer seu tamanho, sua história, idioma ...\n"
 "e se ele é falso, você pode dizer isso a outros usuários do aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Qualidade do arquivo"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Não avaliado"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Inválido / Corrompido / Falso"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Ruim"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Regular"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Bom"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Excelente"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "Pegar da rede Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Baixando, aguarde..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Tamanho desconhecido"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Informação necessária"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Endereço IP:"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Porta:"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Porta"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Usuário :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Hash do usuário :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Hash do usuário"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Download (Velocidade)"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Atual"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Média de execução"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Média da sessão"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Upload (velocidade)"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Conexões"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Downloads ativos"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Conexões ativas (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Uploads ativos"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Árvore de Estatísticas"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Nome do Usuário:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Hash do Usuário:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Software Cliente:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Versão do Cliente:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Endereço IP:"
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID do Usuário:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP do servidor:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Nome do Servidor:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Obfuscação:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Software Cliente"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Versão do Cliente"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID do Usuário"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP do servidor"
+
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Nome do servidor"
+
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Ofuscação"
+
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr "Estensões de Protocolo"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Transferir para o cliente"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Solicitação atual:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Taxa upload (média):"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Taxa download (média):"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Upload (Sessão):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Download (sessão):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Upload (total):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Download (total):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Pedido atual"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Taxa média de upload"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Taxa média de download"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Upload (sessão)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Download (sessão)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Upload (total)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Download (total)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Pontuação"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modificador Down/Up:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Identificação segura:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Ranking de espera:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Pontuação de fila:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Identificação segura"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Ranking na fila"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Pontuação na fila"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Nick (identificação)"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - A Mula multi-plataforma"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Idioma: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Tempo de espera antes de mostrar as dicas."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Especifica o idioma que será usado no aMule."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Procurar por nova versão ao iniciar"
-
-#: src/muuli_wdr.cpp:1218
-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
+msgid "Periodically check for a new version"
+msgstr "Conferir a existência de uma versão nova periodicamente"
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr "Ativar isto faz com que o aMule verifique por nova versão ao iniciar e uma vez por dia enquanto roda"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
-msgstr "Iniciar o aMule automaticamente quando eu logar no sistema"
-
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr "Registra no sistema operacional uma entrada de início automático por usuário com de modo a iniciar o aMule no login. Se você mover o arquivo binário, rode o aMule uma vez manualmente depois para atualizar a entrada."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr "Torna o aMule o padrão para lidar com links ed2k:// de modo que ao clicar em um em seu navegador ou gerenciador de arquivos o fará abrir aqui."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr "O aMule lida apenas com links magnet compatíveis com eD2k (contendo xt=urn:ed2k:). Magnets de BitTorrent NÃO SÃO suportados e clicá-los irá falhar silenciosamente. Se você usar um cliente BitTorrent (Transmission, qBittorrent, etc.), deixe isso desligado."
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr "Abrir uma coleção enfileira todos os links eD2k que ela contém. No Windows isto acrescenta o aMule à lista \"Abrir com\" e leva o padrão apenas quando nenhum outro program clamou o tipo de arquivo."
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Iniciar minimizado"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Ativando isto deixará o aMule minimizado na inicialização."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Perguntar ao sair"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Fazer o aMule prompt antes de sair."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Ativar ícone no Systray"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 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:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Fechar aplicação quando o botão fechar for pressionado"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimizar para a bandeja"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Ativando isso, o aMule vai minimizar para o ícone de bandeja, ao invés da barra de tarefas."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "Mostrar as notificações quando terminar de baixar"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "Habilitar isto vai fazer com que o aMule mostre notificações quando terminar de baixar."
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr "Lembrar o histórico de busca"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr "Mentém uma lista \"dropdown\" de seus termos de busca passados no campo Nome da aba de Busca. Isto relembra das buscas que você digitou, não dos resultados que elas retornaram."
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Tempo de atraso da janela de dica: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "segundos"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Browser Padrão"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Insira o nome do seu navegador aqui. Deixe vazio para usar o navegador padrão do sistema."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Procurar"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Abrir em nova aba se possível"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Player de Video"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Limites de banda"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Alocação de Slots"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Portas"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Porta TCP Padrão "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 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:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Porta UDP para requisições do servidor (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Porta UDP estendida (Kad / pesquisa global) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Essa porta UDP é usada para requisições eD2k estendidas e rede Kad"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Habilitar UPnP para redirecionamento de porta do roteador"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "Porta TCP UPnP (Opcional):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Casar endereço local ao IP (vazio para qualquer um):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 msgid "Advanced users only: If you have multiple network interfaces, enter the address of the interface to which aMule should be bound."
 msgstr "Somente usuários avançados: Se você tem múltiplas interfaces de rede, insira o endereço da interface com a qual o aMule deverá conectar-se."
 
-#: src/muuli_wdr.cpp:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr "Conectar a uma interface de rede (vazio equivale a todas):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr "Apenas para usuários avançados: concentra todo tráfedo do aMule em uma interface de rede, escolhida da lista ou digitada por nome (e.g. tun0, eth0, en0) ou indice. Diferentemente da ligação por IP, isto impede que o tráfego vaze pela rota default - útil com uma VPN. Requer elevação de privilégios."
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Máximo de fontes para arquivos baixando:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Máximo de conexões simultâneas:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Auto-conectar ao iniciar"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Reconectar ao ser desconectado"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Remover servidores inativos após"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr "Servidores estáticos nunca são removidos, mesmo que inalcançáveis."
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "tentativas"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Lista de servidores auto-atualizáveis na iniciação"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Atualizar lista de servidores quando conectar em um servidor"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Atualizar lista de servidores quando um cliente conectar"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Usar sistema de prioridades"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Usar verificação inteligente de LowID ao conectar"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Conexão segura"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Auto-conectar somente em servidores da lista estática"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Definir servidores adicionados manualmente com prioridade Alta"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Manuseamento Inteligente de Corrupção (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Habilitado"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr "I.C.H. avançado confia em todo hash (não recomendado)"
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Adicionar novos downloads em pausa"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Adicionar novos downloads com prioridade automática"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 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:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr "Modo \"Endgame\": roda para fontes mais rápidas nos blocos finais"
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Começar o próximo arquivo pausado quando o arquivo completar"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Da mesma categoria"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "Em ordem alfabética"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Pré-alocar espaço em disco para novos arquivos"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 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:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr "Criar arquivos novos como arquivos esparsos"
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr "Arquivos de parte esparsos só ocupam espaço em disco para as partes já baixadas, de modo que o espaço livre é usado gradualmente conforme o arquivo vai enchendo. Desligue para usar um arquivo ordinário - útil quando arquivos esparsos não forem suportados ou são muito lentos, ou quando ferramentas de backup/de-duplicação lidam mal com eles. Aplicável apenas quando o núcleo roda no Windows; no Linux e no macOS, arquivos de parte são esparsos de qualquer modo, e esta configuração não tem efeito."
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Parar download quando espaço livre em disco acabar "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Digite aqui o espaço min. de disco desejado."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Salvar 10 fontes em arquivos raros (< 20 fontes)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Uploads"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Adicionar novos compartilhamentos com prioridade automática"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Pasta de destino para baixados"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Manuseamento Inteligente de Corrupção (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Habilitado"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "I.C.H. avançado confia em todo hash (não recomendado)"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr "Extração de metadados da mídia"
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "Extrair compeimento / taxa de bits / codec de arquivos compartilhados de audio e vídeo"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr "Quando habilitado, o aMule roda ffprobe em cada arquivo de mídia compartilhado para preencher as colunas de Comprimento / Taxa de Bits / Codec que os outros clientes veem quando acham o arquivo em uma procura. Requer que o ffmpeg (o binário ffprobe) esteja instalado."
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr "Caminho para ffprobe:"
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr "Caminho completo para o binário ffprobe. Deixe vazio para que o aMule detecte automaticamente quando iniciar."
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr "Detectar"
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr "Procura nos locais de instalação padrão por um binário do ffprobe e preenche o campo de caminho."
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
@@ -3642,599 +4715,691 @@
 "Downloads finalizados são guardados aqui. Todos os arquivos nesta pasta são automaticamente compartilhados com outros pares.\n"
 "Se esta pasta também guarda arquivos que você não quer compartilhar, aponte para uma sub-pasta só para o aMule."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr "Escolha a pasta onde os downloads terminados serão guardados. Todos os arquivos nesta pasta serão compartilhados com outros pares."
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr "(Todos os arquivos nesta pasta são compartilhados com outros pares)"
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Pasta para arquivos temporários baixados"
-
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "Pastas compartilhadas"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr "(Pastas compartilhadas pelo núcleo. Digite um caminho para adicionar uma.)"
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr "Caminho absoluto de uma pasta no núcleo da máquina, e.g. /home/user/shared"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr "Recursivo"
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr "Compartilhar todas as sub-pastas dentro desta, incluindo as criadas posteriormente."
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Remover"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Botão direito na pasta para compartilhar recursivamente)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Compartilhar arquivos ocultos"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr "Vasculha novamente automaticamente arquivos compartilhados que mudaram"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr "Segue links simbólicos em pastas compartilhadas"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr "Exclui arquivos correspondendo a:"
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr "Caracteres curinga separados por '|', e.g. .DS_Store|Thumbs.db|*.tmp. Arquivos cujos nomes corresponderem não serão compartilhados. A correspondência é sensível à letra maiúscula/minúscula."
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr "Padrões são expressões regulares"
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr "Quando ligado, o campo inteiro é uma expressão regular ('|' é alternativa). Quando desligado, é uma lista de caracteres curinga separados por '|'."
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr "Mostra quantos arquivos compartilhados o padrão atual excluiria."
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr "Quando os arquivos do núcleo conectado estiverem em uma máquina diferente, mapeie um prefixo de caminho que reporte onde este sistema de arquivos pode ser alcançado daqui (um compartilhamento de rede, digamos) de modo que \"Abrir\" e \"Mostrar na pasta\" funcionem."
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr "Mapeamentos de caminho"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr "Prefixo Remoto"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr "Um prefixo de caminho como o núcleo o reporta, e.g. /home/user/downloads/incoming"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr "Prefixo Local"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr "Onde esta mesma pasta é alcançável a partir deste computador, e.g. um compartilhamento de rede"
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Tempo de atualização: 5s"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Tempo para gráfico de média: 100min"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala dos gráficos das conexões: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Escala gráfica de download:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Escala gráfica de upload:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Cores: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Fundo"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Grade"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Download atual"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Média dos Downloads ativos"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Média dos Downloads da sessão"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Upload Atual"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Média dos Uploads ativos"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Média dos Uploads da sessão"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Conexões ativas"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr "Ícone de barra de velocidade"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Kad-nodes atuais"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Kad-nodes rodando"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Sessões Kad-nodes"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Selecione"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Árvore"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Número de versões a exibir (0=sem limite)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! CUIDADO !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "No. Max. de conexões / 5s"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr "Procura concorrente de fontes Kad"
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr "Intervalo entre novas buscas de fontes Kad (minutos)"
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr "Intervalo entre novos pedidos de fonte (minutos)"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tamanho do arquivo buffer: 240000 bytes"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr "Usar MMAP: acesso de arquivo mapeado em memória (menor uso de memória)"
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr "Mapeia arquivos part em memória ao invés de buferizá-los na heap, diminuindo a pegada de memória do processo. Pode reduzir a velocidade de download em alguns discos; melhor para hopedeiros com memória restrita ou que façam upload intensivamente."
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Tamanho de Espera de Upload: 5000 clientes"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Atualizar conexão com servidor: desativado"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Desabilitar modo timed standby do computador"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Pele a usar: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Mostrar \"Manipulador Veloz de Ligações eD2k\" em cada janela."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Mostrar info. extras nas abas de categoria"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Exibir versão do aplicativo no título"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Exibir taxa de transferência no título"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Antes do nome da aplicação"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Depois do nome da aplicação"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Mostrar banda sobressalente"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Orientação Vertical da Barra de Ferramentas"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr "Ordenação de coluna ao vivo (reordenamento automático das colunas conforme seus valores mudam)"
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Fila de arquivos baixando"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Mostrar porcentagem do progresso"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Mostrar barra de progresso"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plana"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Arredondada"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Auto-escolha de arquivo (sobrecarrega CPU)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parâmetros de conexão externa"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Aceitar conexões externas"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP da interface ouvindo:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Porta TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Habilitar redirecionamento de porta UPnP para porta EC"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Senha"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr "Requerer conexões criptografadas (rejeita clientes que não conseguem criptografar)"
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr "Parâmetros do servidor da API do aMule"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr "Rodar o amuleapi (REST API) ao iniciar"
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "Porta HTTP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr "A interface do servidor HTTP do amuleapi que escuta em 127.0.0.1 (padrão) aceita apenas conexões locais; use 0.0.0.0 or um IP específico para expô-la a outros hospedeiros (configure uma senha de administração abaixo)."
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr "Digite uma senha para configurá-la ou mudá-la. Senhas guardadas não podem ser mostradas, então se você deixar em branco vai manter a atual."
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "Senha de administração"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "Uma senha está configurada."
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "Habilita acesso de convidado"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr "Sessões de convidado podem ler estado e listagens, mas não podem mudar nada. Desligar isto limpa a senha de convidado guardada."
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "Senha de convidado"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Parâmetros do web server"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "Rodar webserver na iniciação"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr "Rodar webserver ao iniciar (deprecado)"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Modelo de rede"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Password para acesso completo"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Usuário com direitos limitados"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Password para acesso limitado"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Habilitar redirecionamento de porta UPnP da porta do servidor web"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Porta TCP UPnP do servidor web (Opcional)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Tempo atualização (secs)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Ativar compactação Gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr "Retorna a página aos valores padrão"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr "Reseta as configurações na página atual para seus valores padrão."
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Clique aqui para aplicar as alterações feitas."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Ignora todas as alterações feitas."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Título:"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Comentário:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Dir incoming:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Alterar prioridade para novos arquivos:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Pasta de entrada"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Alterar prioridade para novos arquivos atribuidos"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Não alterar"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Selecione a cor para esta Categoria (selecionada):"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Limpar"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Selecione a cor para esta Categoria (atualmente selecionada)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Clique nesse botão para limpar o log."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Lista de servidores"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Adicionar servidor manualmente: Nome"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Informe o nome do novo servidor aqui"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Porta"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Informe a porta do servidor aqui."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Log do aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Informações do Servidor"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2K Info"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Informação de Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nós (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Informe uma URL para um arquivo nodes.dat e pressione o botão da esquerda para atualizar a lista de nós conhecidos."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Estatísticas dos Nodes"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Inicialização"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Novo node"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Porta:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "Inicializando de clientes conhecidos"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Desconectar da rede Kad"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr "Inicialização a partir do nó: IP"
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Informe o IP do nó aqui, usando o formato x.x.x.x."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Utilizar Identificação Segura de Usuário"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Obscurecimento de Protocolo"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Suportar Obscurecimento de Protocolo"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Esta opção habilita Obscurecimento de Protocolo, e faz o aMule aceitar conexões obscuras (criptografadas) de outros clientes."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usar obscurecimento para conexões externas"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Esta opção faz o aMule usar Obscurecimento de Protocolo quando conectando outros clientes/servidores."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Aceitar somente conexões obscuras"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Todos"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Nenhum"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Quem pode ver meus arquivos compartilhados:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Filtro de IP"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtrar clientes"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtrar servidores"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Recarregar lista"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Atualizar agora"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Auto-atualizar ipfilter ao iniciar"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Níveis de Filtro:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Sempre filtrar IPs de redes LAN"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Manuseio paranoico de IPs não-casados"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Rejeitar pacotes se o IP do cliente é diferente do IP onde o pacote foi recebido. Use com cuidado."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr "Rejeita um pacote quando o IP de sua fonte difere do IP que o cliente clama (uma checagem anti-spoofing). Desabilite apenas se causar problemas de conexão."
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Utilizar ipfilter.dat global se disponível"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Se nenhum ipfilter.dat local for encontrado, permita o uso de um arquivo global."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Ativar Assinatura Online"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Frequência de atualização (Seg):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 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:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Salvar arquivos de assinatura online em: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Mostrar bandeiras nacionais para clientes"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr "Renderiza a coluna da bandeira do país nas transferências, filas e vistas de procura. Requer um banco de dados MMDB GeoIP válido (veja abaixo)."
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr "Banco de Dados"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 msgid "Source:"
 msgstr "Fonte:"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr "DB-IP (grátis, sem conta)"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr "MaxMind GeoLite2 (grátis, requer conta)"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr "URL Customizada"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr "Escolha qual provedor fornece o banco de dados MMDB GeoIP. DB-IP é o padrão - não requer conta. MaxMind requer uma conta grátis + chave de licensa. Use uma URL Customizada para apontar para qualquer outro anfitrião MMDB (e.g. um espelho local)."
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4246,11 +5411,11 @@
 "Dados de IP-to-Country por DB-IP.com - https://db-ip.com\n"
 "Licensa: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr "Chave de Licensa:"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4266,11 +5431,11 @@
 "Licensa: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
 "Requer atribuição e registro de conta; renove no mínimo a cada 30 dias."
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
 msgstr "URL de Download:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
@@ -4280,504 +5445,569 @@
 "A URL pode incluir credenciais (https://user:pass@host/...).\n"
 "License e termos de atribuição são realizados pela URL upstream - você é responsável."
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr "Baixe o banco de dados GeoIP da fonte selecionada."
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr "Auto-atualizar ao iniciar"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr "Baixe novamente o banco de dados GeoIP da fonte selecionada toda vez que o aMule iniciar."
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrar mensagens (Exceto chat atual):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtrar todas as mensagens"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 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:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtrar mensagens de clientes desconhecidos"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrar mensagens contendo (use ',' como separador):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Mostrar mensagens recebidas no log"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Comentários"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrar comentários contendo (use '.' como separador):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Ativar autenticação"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Ativa/Desativa autenticação por usuário/senha"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Nome do usuário: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Nome do usuário para conectar ao proxy"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Senha:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Senha utilizada para conectar ao proxy"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Ativar proxy"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Ativa/desativa suporte a proxy"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Tipo de proxy:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Host do Proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Tipo de proxy"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Hospedeiro do proxy"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Nome do Host do proxy"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Porta do Proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Porta do Proxy"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
-msgstr "Porta do Proxy"
+msgstr "A porta do Proxy"
+
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Ativar autenticação"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Ativa/Desativa autenticação por usuário/senha"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Nome do usuário para conectar ao proxy"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Senha utilizada para conectar ao proxy"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Conectar em:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Fazer login em amule remoto"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Usuário"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Lembrar essas definições"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "Criptografar a conex/ao (recomendável)"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr "Força compressão ZLIB"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Ativar log de debug detalhado."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Apenas para o arquivo de log"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Categorias de Mensagens:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Aguardando..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Adicionar importadas"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Tentar novamente selecionada"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Remover selecionada"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Tipos de Eventos"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr "Estatísticas e filas de clientes para arquivo(s) selecionado(s) : Sessão / Sempre"
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Uploads Ativos"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Porcentagem de total de arquivos"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Exibir Clientes para"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Arquivos selecionados"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Somente uploads ativos"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Exibir Clientes para"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Recarregar:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Atualizar lista de compartilhados"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Enviar"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Enviar a mensagem especificada."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Encerrar sessão de Chat."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Conectar a qualquer servidor e/ou Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "Cancelar %s"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Arquivos Compartilhados"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "Desconectar %s"
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "Conectar %s"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Desativado %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
 msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "TiB"
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/s"
 msgstr1 "bytes/s"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "MiB/s"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "s"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "min"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "horas"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Dias"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "dias"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "todos"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "todos os outros"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Incompleto"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arquivo"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Texto"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Ativos"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Usando diretório de configuração: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr "Esta fonte não tem a parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr "Você e esta fonte, ambos têm a parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr "Sendo baixada agora desta fonte"
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr "A pŕoxima parte que será pedida desta fonte"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr "Esta fonte tem a parte e você ainda precisa dela"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr "Este par já tem a parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr "Este par não tem a parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr "Nenhuma outra fonte tem esta parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr "Uma outra fonte tem esta parte"
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr "%u ou mais outras fontes têm esta parte"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr "Já lidas e hasheadas"
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr "Ainda por ser lidas"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr "Um bloco por parte do arquivo sendo baixado."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr "Um bloco por parte do arquivo compartilhado."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Um bloco por parte do arquivo compartilhado, colorido pelo número de outras fontes que possui."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Um bloco por parte do arquivo compartilhado, mostrando o quão longe o re-hash leu."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr "No meio, escurecendo conforme outras fontes forem acrescentadas"
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Esperando pela linha de conversão do partfile para morrer..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Importando %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Lendo pasta temp"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Recebendo informações básicas do arquivo info de download"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Criando arquivo de destino"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Carregando dados do download antigo (%u de %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Recebendo informações sobre fontes do arquivo a baixar"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Adicionando download e salvando novo arquivo .part"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importar arquivos .part"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Estado"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Hash do arquivo"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Disco: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Deseja excluir os temporários dos que foram importados com sucesso?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Remover temporários?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "ERRO: falha na criação de partfile"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Tentando carregar backup do met-file de %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "ERRO:Falha ao abrir arquivo part.met: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr "ERRO: arquivo part.met é de tamanho 0: %s ==> %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "ERRO: Versão do arquivo part.met inválida: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Erro: %s (%s) está corrompido (bad tags: %s), impossível carregar arquivo."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Tentando recuperar info do arquivo..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "Recuperando arquivo sem nome - tentarei recuperá-lo como RecoveredFile.dat"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Não foi possível recuperar o arquivo :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Falha ao abrir %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "CUIDADO: %s pode estar corrompido (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "Erro ao salvar arquivo .part: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Erro de IO enquanto salvava partfile: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr "Escritos 0/desconhecidos bytes para '%s' -- preservando os arquivos .part.met. existentes."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "Falha ao salvar part.met.seeds para %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Salvo %i fonte do .part: %s (%s)"
 msgstr1 "Salvos %i fontes do .part: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Não é possível ler as sementes para Partfile %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Encontrada parte corrompida (%d) em %d arquivo .part %s - Resultado |%s| Hash |%s|"
 msgstr1 "Encontradas partes corrompidas (%d) em %d arquivo .part %s - Resultado |%s| Hash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Achado parte completa (%i) em %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Terminado o rehash %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Erro inesperado quando completado %s. Arquivo parado"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Download concluído: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4786,306 +6016,153 @@
 "Download concluído:\n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Apagando arquivo: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "CUIDADO: Incapaz de fazer hash em part baixado - hashset incompleto para '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "ERRO: Incapaz de fazer hash de part baixado - hashset incompleto (%s). Isto nunca deveria acontecer"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr "Parte %u de '%s' marcada como completa, porém o arquivo parte é menor que o esperado (tem %llu bytes, precisa %llu); reabrindo o gap para re-download."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "EOF enquanto fazia hash de parte %u baixada com tamanho %u (max %u) de parte '%s' com tamanho %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Parte baixada %i do arquivo %s está corrompida"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Alocando"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Espaço em disco insuficiente"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Baixado"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ERRO: Falha ao abrir partfile '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Padrão do sistema"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanês"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Árabe"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Basco"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Catalão"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Chinês (Simplificado)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Chinês (Tradicional)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Croácia"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Tcheco"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Dinamarquês"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Holandês"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Inglês (UK)"
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr "Inglês (U.S.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estônia"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finlandês"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francês"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galego"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Alemão"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grego"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebreu"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Hungria"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italiano (Suíço)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japonês"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituânia"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Noruega (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polonês"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Português (Portugal)"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Português (Brasil)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Albanês"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Russo"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Esloveno"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Espanhol"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Suécia"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turquia"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ucraniano"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Mudar Idioma"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Não há traduções instaladas no aMule"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Nenhum idioma disponível"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr "Troca estendida de fontes"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr "Travessia de NAT(uTP)"
+
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr "Puxada de informação de amigo"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr "Travessia de NAT (QUIC)"
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "nenhuma opção disponível"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr "Mapeamento de caminho inválido encontrado, pulando"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Categoria inválida encontrada, pulando"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Porta padrão será utilizada (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Conexão"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Diretórios"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Servidores"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Arquivos"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Segurança"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interface"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr "IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtros"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Controles remotos"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Assinatura Online"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Eventos"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Debugando"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5095,15 +6172,15 @@
 "    %PARTFILE - caminhos completo para o arquivo\n"
 "    %PARTNAME - somente nome do arquivo"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr "O suporte para ícone da bandeja do sistema requer libayatana-appindicator3 em tempo de compilação."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr "Não disponível no Wayland: o protocolo não avisa quando uma janela foi minimizada, portanto esta opção não pode interceptar o botão de minimização do sistema. Alternativa: lance o aMule com `GDK_BACKEND=x11` para usar XWayland."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5119,26 +6196,42 @@
 "O aMule funciona corretamente sem qualquer tipo de\n"
 "alteração nessas opções."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr "Falha ao conectar Cfg para Widget com o ID %d e senha %s"
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr "Falha ao transferir dado do Cfg para Widget com o ID %d e senha %s"
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Tipo de proxy ao qual você está conectado"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr "Falha ao transferir dado do Widget para Cfg com o ID %d e senha %s"
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "Nenhuma senha configurada."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "O acesso de convidado requer uma senha. Digite uma no campo de senha do convidado, ou desmarque \"Habilitar acesso de convidado\"."
+
+#: src/PrefsUnifiedDlg.cpp
+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 mas não definiu uma senha.\n"
+"Conexões Externas só podem ser feitas se for especificada uma senha válida."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5146,31 +6239,43 @@
 "O aMule deve ser reiniciado para habilitar estas mudanças:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "-Porta TCP alterada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "-Porta UDP alterada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr "- Interface de conexão de rede modificada.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Porta de conexão externa modificada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Aceitação da conexão externa modificada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Interface de conexão externa modificada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- Suporte de protocolo de ofuscamento mudou.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr "- Configuração de proxy mudou (necessário para transferências HTTP).\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr "- A configuração do amuleapi mudou.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5178,27 +6283,32 @@
 "Sua lista de Auto-atualização de servidor está vazia.\n"
 "'Auto-atualização de servidor na iniciação' será desativada."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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 mas não definiu uma senha.\n"
-"Conexões Externas só podem ser feitas se for especificada uma senha válida."
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr "A senha do amuleapi não pode ser salva: %s"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "-Idioma alterado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "-Diretório temporário alterado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- Rede ED2K conectada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr "Este padrão de exclusão de arquivos compartilhados não é uma expressão regular válida. O filtro ficou desabilitado."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "Expressão regular inválida"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5206,7 +6316,7 @@
 "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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5214,7 +6324,7 @@
 "Kad não iniciará se sua porta UDP estiver desabilitada.\n"
 "Habilite a porta UDP ou desative a rede Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5224,19 +6334,66 @@
 "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:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr "Não foi possível registrar o aMule para início automático no login. A lista de autostart pode estar como apenas leitura."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr "Não foi possível remover a entrada de início automático no login."
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr "Início automático"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr "Registrar tipo de arquivo"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr "Registrar manipulador de URL"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr "O aMule lida apenas com links magnet compatíveis com eD2k. Se você trocar o manipulador atual (%s), links magnet deBitTorrent irão parar de funcionar - o aMule não pode baixar conteúdo BitTorrent. Continuar?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr "Outro aplicativo está configurado para abrir arquivos .emulecollection (%s). Troco ele pelo aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr "Atualmente um outro aplicativo é o manipulador padrão para estes links (%s). Troco ele pelo aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "Não foi possível registrar o aMule como manipulador de arquivos .emulecollection. O registro pode estar como \"apenas leitura\"."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr "Não foi possível remover o registro deste tipo de arquivo."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "Não foi possível registrar o aMule como manipulador de URL. O armazenamento deve estar como \"apenas leitura\"."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr "Não foi possível remover o registro de manipulação de URL."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "O servidor web e o aMule API necessitam que as conexões externas estejam habilitadas."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr "O servidor web do aMules está deprecado. Ao invés disso, considere rodar sob a API do aMule."
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5246,41 +6403,64 @@
 "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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Arquivos Temporários"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Arquivos Recebidos"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Assinatura Online"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Escolha uma pasta para %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Iria excluir %u de %u arquivo compartilhado"
+msgstr1 "Iria excluir %u de %u arquivos compartilhados"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Defina seu Player de Vídeo preferido"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Selecione o Browser"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr "Selecione o binário ffprobe"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Executável%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr "O ffprobe não foi encontrado no PATH ou nos locais padronizados de instalação. Instale o ffmpeg (que traz junto o ffprobe) ou use Browse para escolher um binário manualmente."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr "Resetar as configurações nesta página para seus valores padrão?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr "Resetar para os valores padrão"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Editar lista de servidores"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5288,114 +6468,114 @@
 "Adicione aqui URL's para baixar arquivo 'server.met'\n"
 "Somente uma URL por Linha."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr "Falha ao atualizar IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr "Dados por MaxMind GeoLite2"
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr "Fonte customizada"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr "Dados por DB-IP.com"
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr "Status: %s carregados"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Status: %s - %s carregados"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr "Estado: Falha ao carregar - clique 'Atualizar agora' para refrescar."
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr "Estado: Não encontrado - clique 'Atualizar agora' para baixar."
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Delay na atualização: %d segundo"
 msgstr1 "Delay na atualização: %d segundos"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Tempo do gráfico de média: %d minuto"
 msgstr1 "Tempo do gráfico de média: %d minutos"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Escala do gráfico de conexões: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Tamanho do Buffer de Arquivo: %d byte"
 msgstr1 "Tamanho do Buffer de Arquivo: %d bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Tamanho de Espera de Upload: %d cliente"
 msgstr1 "Tamanho de Espera de Upload: %d clientes"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Atualizar conexão com servidor: %d minuto"
 msgstr1 "Atualizar conexão com servidor: %d minutos"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Intervalo para atualizar conexão no servidor: Desativado"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "desativado"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Executar comando em evento '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Habilitar execução de comando no núcleo"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Comando do Núcleo:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Habilitar execução de comando na GUI"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Comando da GUI:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "As seguinte variáveis serão substituídas:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
@@ -5403,1073 +6583,1324 @@
 "As seguintes pastas parecem ser de sistema ou locais sensíveis:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr "Compartilha-los recursivamente vai publicar todos os arquivos sob as redes eD2k/Kad. Você realmente quer isto?"
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr "Confirma pastas compartilhadas"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
-msgstr "Recarregando lista de arquivos compartilhados…"
-
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
-msgstr "Procurando por subdiretórios…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
+msgstr "Recarregando lista de arquivos compartilhados..."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
+msgstr "Procurando por subdiretórios..."
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr "Atualizando pastas compartilhadas"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
-msgstr "Varridos %u diretórios…"
+msgid "Scanned %u directories..."
+msgstr "Varridos %u diretórios..."
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Recarregando arquivos compartilhados: %u arquivos encontrados"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr "Pasta compartilhada"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr "Ambos os prefixos, remoto e local, precisam ser preenchidos."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr "Este prefixo remoto já foi mapeado."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr "Escolha a pasta local"
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "Limpar o Histórico de Busca"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr "Limpar o histórico de busca salvo? Isto não poderá ser desfeito."
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Alerta da busca"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "É impossível realizar busca quando ambas eD2K e Kademlia estão desabilitadas."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "Erro na busca"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
-msgstr "Busca Kad: pediu resultados mais amplos de mais um par."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
+msgstr ""
+"Uma busca de eD2k ainda está rodando. Começar uma nova irá pará-la, porque o protocolo eD2k permite apenas uma busca por vez.\n"
+"\n"
+"Os resultados já encontrados serão mantidos; apenas os novos pararão de chegar.\n"
+"\n"
+"Começar a nova busca de qualquer modo?"
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr "Busca Kad: nenhum par sobrou para pedir mais resultados novamente (capacidade atingida ou ainda sem respostas)."
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr "Busca em andamento"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Alerta da busca"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Principal"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr "Salvando apenas a %u mais recente de %u buscas abertas para %s."
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr "Salvando apenas os primeiros %u de %u resultados para a busca \"%s\"."
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "AVISO: Lista de busca guardada corrompida, contém cabeçalho inválido."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Entrada inválida na lista de busca guardada, o arquivo pode estar corrompido"
+
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "Sem palavra-chave para busca Kad - interrompendo"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Erro inesperado quando tentava fazer a busca do Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID do arquivo"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr "A busca excedeu o tempo limite: o servidor não respondeu."
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr "Comprimento"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Busca Kad: pediu resultados mais amplos de mais um par."
 
-#: src/SearchListCtrl.cpp:105
-msgid "Bitrate"
-msgstr "Taxa de Bits"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Busca Kad: nenhum par sobrou para pedir mais resultados novamente (capacidade atingida ou ainda sem respostas)."
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "Erro %u: %s\n"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Baixar na categoria"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ID do arquivo"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Obtendo %s para este arquivo"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "Espandir tudo"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "Colapsar tudo"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Procurando arquivos relacionados (eD2k, servidor local)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Marcar como arquivo conhecido"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Copiar ligação eD2k para área de transferência"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Copiar ligações eD2k para área de transferência"
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Você não está atualmente conectado a um servidor que suporta a função \"Arquivos Relacionados\""
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Novo"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr "rodando"
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "terminado"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr "parado"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr "Busca %u: %s, %u %% (%u resultados)\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr "Busca %u \"%s\": %s, %u %% (%u resultados)\n"
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr "Busca expirada ou ID desconhecido. Comece uma nova busca.\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Progresso da busca: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Progresso da busca não disponível"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr "Nenhuma busca para reportar sobre.\n"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Falha ao conectar em todos servidores estáticos ofuscados listados. Tentando de novo sem ofuscação."
+
+#: src/ServerConnect.cpp
 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
+msgid "Failed to connect to all static servers listed."
+msgstr "Falha ao conectar a todos os servidores estáticos listados."
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr "Falha ao conectar em todos os servidores listados."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Conexão automática com o servidor irá se repetir em %d segundo"
+msgstr1 "Conexão automática com o servidor irá se repetir em %d segundos"
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Conectado a %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Conexão estabelecida em: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Conexão perdida com %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) parece estar desativado."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) parece estar cheio."
 
-#: 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"
-msgstr0 "Conexão automática com o servidor irá se repetir em %d segundo"
-msgstr1 "Conexão automática com o servidor irá se repetir em %d segundos"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Conexão perdida"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Conexão a %s (%s:%i) falhou."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "ERRO: Socket inválido no tempo de checagem"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, 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:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Recebido último resultado da consulta DNS, descartando."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Carregando arquivo server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Arquivo server.met não encontrado!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Falha ao abrir arquivo server.met !"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "Encontrado %i servidor no server.met"
 msgstr1 "Encontrados %i servidores no server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "Adicionado %d servidor"
 msgstr1 "Adicionados %d servidores"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Erro: o arquivo 'server.met' está corrompido: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "Erro de I/O ao ler arquivo 'server.met': "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Você está conectado a um servidor que está tentando apagar. Desconecte primeiro."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Falha ao abrir '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Falha ao salvar server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Erro de I/O escrevendo o arquivo 'server.met': %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "URL inválida"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Download da lista de servidores de %s concluída"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Nenhuma entrada lista de endereço de servidores encontrada em addresses.dat. 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Iniciando download da lista de servidores de %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Falha ao obter a lista de servidores de %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Servidor local é filtrado pelo IPFilters, reconectando em um servidor diferente!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Descrição"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Usuários"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "Máximo de usuários"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Fixo"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versão"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr "Arquivos \"macios\""
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr "Arquivos \"duros\""
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr "Flags TCP"
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr "Flags UDP"
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Você está conectado a um servidor que está tentando apagar. Desconecte antes. O servidor NÃO foi apagado."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Nome Desconhecido)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "ms"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Servidores (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Servidor"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Conectar ao servidor"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Marcar servidor como fixo"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Marcar servidor como não-fixo"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Marcar servidores como fixos"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Marcar servidores como não-fixos"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Apagar servidor"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Apagar servidores"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Remover todos os servidores"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Copiar ligações eD2k para área de transferência"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Reconectar ao servidor"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Deseja remover todos os servidores?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Deseja remover o servidor selecionado?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Deseja remover o servidores selecionados?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ERRO %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "CUIDADO: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr "O servidor %s (%s) rejeitou nosso login (nenhum ID de cliente atribuído). Desconectando."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Novo ID do cliente é %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "AVISO: você recebeu uma ID baixa (LowID)!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPara maiores informações, vá até https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Info desconhecida recebida do servidor - muito curta"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Recebido %d servidor novo"
 msgstr1 "Recebidos %d servidores novos"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Salvamento da lista de servidores concluído."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "O servidor rejeitou o último comando"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Pacote falso recebido do servidor: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, 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:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "usando obscurecimento de protocolo."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Conectando para %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "Log do aMuleGUI"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Servidor não adicionado: sem IP ou hostname."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Servidor não adicionado: porta informada inválida."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Status de eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr "Tipo de Conexão:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "Conectado desde:"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Status Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Rodando em modo LAN"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Rodando"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "ID do cliente Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Status:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Estado da Conexão:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr "Atrás de Firewall - abra a porta TCP %d em seu roteador ou firewall"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Estado da Conexão UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr "Atrás de Firewall - abra a porta UDP %d em seu roteador ou firewall"
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Estado do Firewall: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Nenhum amigo requirido - porta TCP aberta"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Nenhum amigo requirido - porta UDP aberta"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Sem amigos"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Conectando ao amigo"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Conectado ao amigo em %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Endereço IP:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Fontes indexadas::"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Palavras chaves indexadas:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Notas indexadas:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Index carregado:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Média de Usuários:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Média de Arquivos:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Parado"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr "Monitor de diretórios compartilhados: estouro/erro do backend (%s); recorrendo ao recarregamento completo"
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 "Observador de pasta compartilhada: %u nova pasta encontrada desde a última rodada, revasculhando os compartilhamentos"
+msgstr1 "Observador de pasta compartilhada: %u novas pastas encontradas desde a última rodada, revasculhando os compartilhamentos"
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr "Monitor de diretórios compartilhados: eventos descartados pelo backend; forçando um recarregamento completo dos arquivos compartilhados para ressincronizar"
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Adicionando arquivo %s ao compartilhamento"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Encontrado %i arquivo conhecido compartilhado"
 msgstr1 "Encontrados %i arquivos conhecidos compartilhados"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Encontrado %i arquivo conhecido, %i desconhecido"
-msgstr1 "Encontrados %i arquivos conhecidos, %i desconhecidos"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 "%i arquivo excluído do compartilhamento pelo filtro"
+msgstr1 "%i arquivos excluídos do compartilhamento pelo filtro"
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "ERRO: Tentando compartilhar %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Diretório compartilhado não encontrado, pulando: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Arquivos compartilháveis não encontrado no diretório: %s"
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Diretório compartilhado está ilegível, pulando: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Nome de Usuário"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr "Extração de metadados da mídia está desabilitada nas preferências, assim, não há nada para re-extrair."
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Velocidade de Download"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 "Re-extraindo metadados de mídia para %u arquivo compartilhado"
+msgstr1 "Re-extraindo metadados de mídia para %u arquivos compartilhados"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Velocidade de Upload"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "Compartilhando o arquivo: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Parou de compartilhar o arquivo removido: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Partes Disponíveis"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Parou de compartilhar %u arquivo sob a pasta removida: %s"
+msgstr1 "Parou de compartilhar %u arquivos sob a pasta removida: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Compartilhando %u arquivo encontrado em uma nova pasta compartilhada"
+msgstr1 "Compartilhando %u arquivos encontrado em novas pastas compartilhadas"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Encontrado %u novo arquivo compartilhado"
+msgstr1 "Encontrados %u novos arquivos compartilhados"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Nome de Usuário"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr "Partes no par"
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Status de Upload"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "Status de Download"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr "Origem"
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Nome do arquivo Local"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Lista de Arquivos Compartilhados"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Pedidos"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Pedidos aceitos"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Dados transferidos"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Taxa Compartilhada"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Partes já baixadas"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Fontes Completas"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr "Disponibilidade de fontes"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Caminho completo"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Arquivos Compartilhados"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Adicionar Comentário/Avaliação"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Editar Comentário/Avaliação"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr "Verificar Dados Locais"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr "Re-extrair metadados de &media"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Adicionar arquivo na coleção para lista de transgênica"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Copiar &URL Magnet para Área de Transferência"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Copiar &link eD2k para área de transferência (&Fonte)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Copiar &link eD2k para área de transferência (Fonte) (&Com opções de criptografia)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Copiar &link eD2k para área de transferência (&Nome da máquina)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Copiar &link eD2k para área de transferência (Nome da máquina) (Com &Opções de criptografia)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Copiar &link eD2k para área de transferência (&Info AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Copiar &link eD2k para área de transferência (&Info AICH + Fonte)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr "Exportar os arquivos selecionados para uma coleção do eMule"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr "Verificar Dados Locais em PartFile não é atualmente suportado: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 "Metadados de mídia: pulando %u download incompleto"
+msgstr1 "Metadados de mídia: pulando %u downloads incompletos"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 "Metadados de mídia: pulando %u arquivo que não é audio ou vídeo"
+msgstr1 "Metadados de mídia: pulando %u arquivos que não são audio ou vídeo"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 "Re-extrair metadados de mídia para %u arquivo?"
+msgstr1 "Re-extrair metadados de mídia para %u arquivos?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 "%u download incompleto será pulado."
+msgstr1 "%u downloads incompletos serão pulados."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 "%u arquivo não é audio ou vídeo e será pulado."
+msgstr1 "%u arquivos não são audio ou vídeo e serão pulados."
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr "Isto roda em segundo plano. O progresso é mostrado no log."
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr "Re-extrair os metadados de mídia"
+
+#: src/SharedFilesCtrl.cpp
 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:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr "Exportar para coleção do eMule"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr "Nenhum arquivo foi selecionado para exportação."
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr "Coleções do eMule (*.emulecollection)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr "'%s' já existe. Deseja substituir?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Falha ao gravar o arquivo de coleção '%s'."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Exportado %u arquivo compartilhado para '%s'."
+msgstr1 "Exportados %u arquivos compartilhados para '%s'."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Tamanho total dos arquivos compartilhados: %s (%s completados)"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Tamanho total de compartilhados: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Arquivos Compartilhados (%i, fazendo hash de %u ou mais)"
+msgstr1 "Arquivos Compartilhados (%i, fazendo hash de %u ou mais)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Arquivos Compartilhados (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "PartFile"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Recarregando arquivos compartilhados: %u arquivos encontrados"
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr "Estado da parte"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Nome do arquivo remoto"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Dados enviados (Sessão (Total)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Overhead Total (pacotes): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Solicitações de Arquivo (pacotes): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Troca de fontes (Pacotes): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Overhead de servidor (Pacotes): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Overhead Kad (pacotes): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Criptografia elevada (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Uploads ativos: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Uploads em espera: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Total de sessões de upload com sucesso: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Total de sessões de upload que falharam: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Tempo médio de upload: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Dados baixados (Sessão (Total)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Fontes encontradas: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Downloads ativos (pedaços): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Média de UL:DL da Sessão (Total): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Taxa média de download (Sessão): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Taxa média de envio (Sessão): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Taxa máxima de download (Sessão): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Taxa máxima de envio (Sessão): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Reconectados: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Tempo desde a primeira transferência: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Conectado ao servidor desde: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Conexões ativas (estimada): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Máximo de conexões que atingiram tempo limite: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Média de conexões (estimativa): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Pico de conexões (estimada): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Clientes"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Desconhecido: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtrado: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Banido: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr "Endereços banidos de Kad: %s"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Total: %i Conhecidos: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Servidores ativos: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Servidores que falharam: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Total: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Servidores eliminados: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Servidores Filtrados: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Usuários em servidores ativos: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Arquivos nos servidores ativos: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Total de usuários: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Total de arquivos: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Ocupação do Servidor: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Número de arquivos compartilhados: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Tamanho total de compartilhados: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Média de tamanho de arquivo: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Sistema Operacional"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Não recebido"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Conexões ativas (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Não disponível"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Nunca"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "Comando '%s' com pid '%d' foi finalizado com o código de status '%d'."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Executar <str> e sair."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr "Separar os campos das listas com espaços, como antes, ao invés de caracter de tabulação."
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "Esse comando requer um parâmetro. Válidos: 'all', NomeDeArquivo, ou um número.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Processando pela hash: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Processando por nome de arquivo: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Não é um número válido\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6479,7 +7910,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6489,7 +7920,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6497,76 +7928,80 @@
 "Nenhum tipo de busca definido.\n"
 "Tecle 'help search' para obter mais ajuda.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Arquivo de Download: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Solicitação falhou com erro desconhecido."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operação executada com sucesso."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Solicitação falhou com os seguintes erros: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Filtragem IP para clientes é %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Desligado"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Ligado"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Filtragem IP para servidores é %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Nível atual do IPFilter é %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr "Limites de largura de banda: Up: %u KiB/s, Down: %u KiB/s.\n"
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr "Rotação de fontes \"Endgame\" é %s.\n"
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr "Busca iniciada (id %u).\n"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Conectado a %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Conectando"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "sob firewall"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6575,7 +8010,7 @@
 "\n"
 "Download:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6584,7 +8019,7 @@
 "\n"
 "Upload:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6593,7 +8028,7 @@
 "\n"
 "Clientes na fila:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6602,38 +8037,33 @@
 "\n"
 "Fontes totais:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "PartFile"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Número de resultados da busca: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Progresso da busca: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Progresso da busca não disponível"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Resposta recebida do servidor desconhecida, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Exibir informações de status resumidas."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 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:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Exibir árvore de estatísticas completas."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6647,11 +8077,11 @@
 "\n"
 "Exemplo: 'statistics 5' vai mostrar apenas as 5 maiores versões de cada tipo de cliente.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Fechar aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6661,35 +8091,35 @@
 "Isso irá também desligar o cliente texto, por causa disso é inútil sem um\n"
 "núcleo rodando.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Recarregar objeto selecionado."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Recarregar a lista de arquivos compartilhados."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Recarregar a tabela IPFilter."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Carregar a atual tabela de IP filtering."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Atualizar a tabela de IP filtering de URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr "Se a URL é omitida a URL das preferências é usado."
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Conectar à rede."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6701,35 +8131,35 @@
 "a esse servidor apenas. O IP deve ter notação decimal IPv4,\n"
 "ou um nome DNS que possa ser resolvido."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Conectar somente em eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Conectar a rede Kad apenas."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Desconectar da rede."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Desconectar somente de eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Desconectar apenas da rede Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Adicionar uma ligação eD2k ou magnet ao núcleo."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6747,51 +8177,51 @@
 "\n"
 "A ligação magnética deve conter o hash eD2k e tamanho do arquivo.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Defina as preferências."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Definir preferências de IP filtering."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Ligar filtragem IP para ambos clientes e servidores."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Desligar filtragem IP para ambos clientes e servidores."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Habilitar/Desabilitar filtragem IP para clientes."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Ligar filtragem IP para clientes."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Desligar filtragem IP para clientes."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Habilitar/Desabilitar filtragem IP para servidores."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Ligar filtragem IP para servidores."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Desligar filtragem IP para servidores."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Definir no nível do IP Filter."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6799,59 +8229,71 @@
 "Qualquer valor entre 0 e 255 é válido, e o valor padrão (inicial)\n"
 "é 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Ajusta a limitação de largura de banda."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Definir limite de Upload."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "O Valor informado deve ser em kilobytes/seg.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Definir limite de Download."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr "Ativa ou desativa rotação de fontes \"fim de jogo\"."
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "O Valor informado deve ser 1/ON (ligado) ou 0/OFF (desligado).\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Obter e mostrar o valor da preferência selecionada."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Obter preferências de IP filtering."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Obter estado de IP filtering para ambos clientes e servidores."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Obter estado do IP filtering somente para clientes."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Obter estado do IP filtering somente para servidores."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Definir no nível de IP filtering."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Obter limites de largura de banda."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr "Acessa o estado de rotação de fim de jogo."
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Faça uma pesquisa."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6885,39 +8327,47 @@
 "Exemplo: 'search global linux iso --type Iso --min-size 100M' retorna\n"
 "resultados para \"linux iso\" de arquivos tipo Iso de no mínimo 100 MiB.\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Faça uma pesquisa global."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Faça uma pesquisa local"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Faça uma pesquisa no kad"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "Mostra resultados da última pesquisa."
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Retorna os resultados da pesquisa anterior.\n"
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr "Mostra resultados de uma busca."
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+"Retorna os resultados de uma busca.\n"
+"Opcionalmente recebe uma id (de 'search ...'); sem o id, retorna os resultados da busca mais recentemente começada.\n"
+
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Exibe progresso de uma pesquisa."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Exibe o progresso de uma pesquisa.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+"Mostra o progresso de uma busca.\n"
+"Opcionalmente recebe uma id de busca; sem a id, mostra o progresso da busca mais recentemente começada.\n"
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Iniciar download de um arquivo"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6925,80 +8375,80 @@
 "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:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Parar Download."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Continuar Download."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Cancelar Download."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Definir prioridade de download."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Definir prioridade baixa."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Definir prioridade normal."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Definir prioridade alta."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Definir prioridade auto."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Exibir as listas de Up/Down."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr "Exibe listas de upload/download, lista de servidores ou lista de compartilhados.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Mostrar fila de upload."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Mostrar fila de download."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Mostrar o log."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Mostrar a lista de servidores."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "Mostrar a lista de arquivos compartilhados."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Reiniciar log."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Comando ultrapassado, use '%s' no lugar."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7007,255 +8457,278 @@
 "Esse comando foi depreciado e será removido no futuro.\n"
 "Ao invés desse, use '%s'.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Cliente em modo texto do aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Calculando o hash do arquivo baixado: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr "Calculando o hash do arquivo: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Recriando o conjunto de hashes AICH para o arquivo: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr "Verificar Dados Locais (%s): Resultado OK para %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr "Verificar Dados Locais (%s): ERROS ENCONTRADOS! %s Blocos falhos: MD4: %s. %s %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Confirmação requerida"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Somente 99 categorias são suportadas."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Excesso de conexões!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Todos os outros"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Selecione o filtro de exibição"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Adicionar categoria"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Editar categoria"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Remover categoria"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Hashset solicitado para arquivo desconhecido: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Falha ao abrir o arquivo (%s), removendo-o da lista de arquivos compartilhados."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Continuando uploads para o arquivo: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Suspendendo uploads para o arquivo: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Falha ao executar comando `%s' no evento `%s'."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Falha ao executar o comando '%s' no evento '%s'."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Download concluído"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Caminho completo do arquivo."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Nome do arquivo sem seu caminho completo."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "O hash eD2k do arquivo."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Tamanho do arquivo em bytes."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Tempo acumulado de download ativo."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Nova sessão de chat iniciada"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Remetente da mensagem."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Sem espaço"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Partição do disco."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Erro ao concluir"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Processando arquivo número %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Arquivo não existe !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, o criador de ligações do aMule eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Bem-vindo!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Parâmetros de Entrada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Arquivo a gerar hash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "URL para esse arquivo (opcional)"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Remover"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Criar link com hash de partes"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Hash MD4 do arquivo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "Hash de arquivo eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "Ligação eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Salvar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Copiar para a Área de Transferência"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Abrir"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Salvar como"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Salvar ligação eD2k computada no arquivo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Sobre o aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Não pode abrir o clipboard"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Nada a ser copiado!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Impossível abrir "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Por favor, informe um nome não-vazio"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Nada a ser salvo!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7275,162 +8748,159 @@
 "\n"
 "Distribuído sobre GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Criando Hash..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator está trabalhando por você"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Computando Hash MD4..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Computando Hashes eD2k..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Cancelado !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Pronto em %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Você já adicionou essa URL!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Informe uma URL não-vazia"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Impossível abrir %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "Faltou memória enquanto calculava o hash ed2k!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i dias %i horas %i min %i s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr "%.2f KiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr "%.2f GiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr "%.2f TiB"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, Estatísticas Online do aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Taxa máxima de DL enquanto roda o wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Limpar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistema"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Parar atualização automática"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Salvar imagem de estatística Online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Imprimir imagem de estatística Online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Preferências"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Sobre wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Iniciar atualização automática"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Atualização automática parada"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Atualização automática iniciada"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Salvar imagem estatísticas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Estatísticas Online do aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7438,11 +8908,11 @@
 "Encontrei um problema na hora de imprimir.\n"
 "A sua impressora está configurada corretamente?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Imprimindo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7460,367 +8930,364 @@
 "\n"
 "Distribuído sob licença GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh Oh, aMule não está rodando..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule está rodando"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule está rodando, mas desconectado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule está conectando..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh Oh, o status do aMule é desconhecido..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " está rodando há "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " esta parado !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " não esta conectado !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " está conectando..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " está fazendo algo de estranho, verifique!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " conectado em "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "desligado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " está ativo "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " com "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Download Total: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Upload: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Download da Sessão: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Download: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr " KiB/s, Upload: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Compartilhando: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " arquivos, Clientes na fila: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Tempo: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " em "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Uptime do Sistema: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Pasta contendo arquivo amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Taxa de atualização (em segundos)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Fazer upload periódico da imagem para servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "URL do FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Caminho no FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Informe a URL do seu servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Usuário"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Intervalo entre atualizações do servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Validar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Pasta contendo seu arquivo de assinatura"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Pasta para colocar imagem estatística gerada"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Carregar modelo <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Porta HTTP do web server"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 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:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Porta UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Utilizar compressão gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Senha de total acesso para servidor web"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Senha de visitante para servidor web"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Permitir acesso restrito"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Negar acesso restrito"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 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:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "Caminho para arquivo amule.conf - NÃO USE DIRETAMENTE!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Desabilitar o interpretador PHP (obsoleto)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Recompilar páginas PHP a cada solicitação"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Servidor Web do aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "conexão de cliente web aceita\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "ERRO: não pode aceitar conexões de clientes web\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Solicitação falhou com o seguinte erro: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Arquivo index não encontrado: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sessão expirada - solicitando login\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sessão Ok, logado\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sessão Ok, ainda não logado\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Nenhuma sessão aberta - solicitando login\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sessão criada - solicitando login\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Processando pedido original: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr "Recusando-se a ler `além` de uma URL query string\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Nenhuma senha especificada, login não será permitido."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Verificando senha\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Hash de senha inválido\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Senha Ok\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Senha inválida\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Solicitado logout\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Processando solicitação redirecionado: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr "aMule (obrigatório)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr "Atalho de desktop"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr "Iniciar o aMule quando eu logar no sistema"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr "Associar arquivos .emulecollection"
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr "Desinstalar"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr "Remover dados do usuário (configuração, servidores eD2k, nós Kad, partfiles)"
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr "Arquivos do aplicativo aMule (obrigatório)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr "Coloca um atalho do aMule no desktop."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr "Inicia o aMule automaticamente quando o usuário atual faz login no sistema (configuração por usuário)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr "Remove arquivos de aplicação do aMule, Menu Iniciar / atalhos de desktop, chaves de início automático e entradas de Adiciona/Remove Programas (obrigatório)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr "Adiciona o aMule à lista \"Abrir com\" para arquivos .emulecollection, e o torna o padrão desde que nenhum outro programa o tenha clamado. Abrir uma coleção enfileira todos os links eD2k que ela contém."
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "Remove arquivos de aplicação do aMule, Menu Iniciar / atalhos de desktop, chaves de início automático, registros de esquemas de URL e entradas de Adiciona/Remove Programas (obrigatório)."
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr "Apaga permanentemente %APPDATA%\\aMule para o usuário atual (aMule.conf, lista de servidores eD2k, nós Kad, partfiles, Filtros de IP, lista de amigos). Deixe não-marcado para manter suas configurações."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
@@ -7828,7 +9295,7 @@
 "aMule parece estar rodando de $INSTDIR.\r\n"
 "Por favor, feche o aMule (e o aMuleD / aMuleGUI) e tente novamente."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
@@ -7836,11 +9303,11 @@
 "O daemon aMule (amuled.exe) parece estar rodando de $INSTDIR.\r\n"
 "Por favor, pare-o e tente novamente."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr "Removendo a instalação anterior do aMule em $0..."
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
@@ -7848,21 +9315,200 @@
 "Não foi possível remover a instalação anterior do aMule em $0.\r\n"
 "Por favor, feche todos os processos aMule rodando e tente novamente, ou desinstale as versões anteriores manualmente primeiro."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr "O aMule parece estar rodando. Por favor, feche-o e rode o desinstalador novamente."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr "Removendo os dados do usuário em $APPDATA\\aMule..."
 
+#~ msgid "Ratio"
+#~ msgstr "Razão"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Arquivos compartilháveis não encontrado no diretório: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Mudar Idioma"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Não há traduções instaladas no aMule"
+
+#~ msgid "No languages available"
+#~ msgstr "Nenhum idioma disponível"
+
+#~ msgid "User name"
+#~ msgstr "Usuário"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Partes já baixadas"
+
+#~ msgid "Available Parts"
+#~ msgstr "Partes Disponíveis"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Encontrado %i arquivo conhecido, %i desconhecido"
+#~ msgstr1 "Encontrados %i arquivos conhecidos, %i desconhecidos"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Enviado"
+#~ msgid "Remote prefix:"
+#~ msgstr "Servidor Remoto"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Arquivo não encontrado."
+#~ msgid "Local prefix:"
+#~ msgstr "Servidor Local"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Entrada inválida na lista de arquivo known, arquivo pode estar corrompido: "
+
+#, c-format
+#~ msgid "Hashing %u new file"
+#~ msgid_plural "Hashing %u new files"
+#~ msgstr0 "Calculando o hash de %u novo arquivo"
+#~ msgstr1 "Calculando os hashes de %u novos arquivos"
+
+#, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Calculando o hash de arquivos novos (%u de %u)"
+
+#~ msgid "the default Windows shell handler"
+#~ msgstr "O manipulador de shell default do Windows"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Para impedir que este aviso apareça em toda pré-visualização,\n"
+#~ "defina seu tocador de vídeo preferido nas preferências (%s é o padrão)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Resultados do Filtro"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Marcar como arquivo conhecido"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Porcentagem de total de arquivos"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Inicialização"
+
+#~ msgid "New node"
+#~ msgstr "Novo node"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Mais"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Inicializando com \n"
+#~ "clientes conhecidos"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Conectar a qualquer servidor e/ou Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Desconectar da rede Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Cancelar as tentativas atuais de conexão"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Desconectar das redes atualmente conectadas"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Conectar às redes ativas"
+
+#, c-format
+#~ msgid "Could not add %u link from ED2KLinks file (see log for details)."
+#~ msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+#~ msgstr0 "Não foi possível adicionar link %u do arquivo ED2KLinks (veja o log para detalhes)."
+#~ msgstr1 "Não foi possível adicionar %u links do arquivo ED2KLinks (veja o log para detalhes)."
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Auto-escolha de arquivo (sobrecarrega CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "O aMule vai organizar automaticamente as colunas da lista de downloads"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Rejeitar pacotes se o IP do cliente é diferente do IP onde o pacote foi recebido. Use com cuidado."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Retorna os resultados da pesquisa anterior.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Exibe o progresso de uma pesquisa.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Conexão fechada - aMule foi provavelmente terminado."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Procurar por nova versão ao iniciar"
+
+#~ msgid "Binds to 127.0.0.1 only. Set an admin password in amuleapi.conf to expose it to other hosts."
+#~ msgstr "Liga-se apenas a 127.0.0.1. Configure uma senha de administrador em amuleapi.conf para expô-lo a outros hospedeiros."
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Ligação 2D2k: "
+
+#~ msgid "Commit"
+#~ msgstr "Adicionar"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: forking to background - até mais"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Página: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Fórum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Documentação: https://amule-org.github.io/docs \n"
+
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Problemas: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Enviado"
 
 #, c-format
 #~ msgid "No GeoLite2 update URL configured. Download GeoLite2-Country.mmdb manually (a free MaxMind account is required) and place it at %s, or set the URL in Preferences."

amule-3.0.1.tar.gz/po/pt_PT.po -> amule-3.1.0.tar.gz/po/pt_PT.po Changed

@@ -17,8 +17,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:10+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:03+0000\n"
 "Last-Translator: Luís Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt_PT\n"
@@ -28,71 +28,159 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Mostrar"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Controlo remoto do aMule "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Snapshot:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Cliente p2p 'para todas as plataformas' baseado no eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (C) 2003-2019 Equipa aMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Parte do aMule é baseado em \n"
+
+#: src/AboutDialog.cpp
+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/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (C) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Website:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Fórum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Verificar nova versão no arranque"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "A ligar à Kad..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Está a usar uma versão antiga do aMule!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Indisponível"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Adicionar um Amigo"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Deve indicar um endereço IP e porto válidos!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informação"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "A chave de utilizador especificada não é válida!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "Add aMule to your application menu?"
 msgstr "Depois do nome da aplicação"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "A ligação falhou "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -101,82 +189,160 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ERRO"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Falha ao abrir ficheiro de ligações eD2k."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "Caixa de diálogo do aMule destruída"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Ficheiro de índice não encontrado: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Erro ao receber ficheiros partilhados do utilizador '%s'"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "Não foram encontrados ficheiros partilhados no directório: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, 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"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Ligação eD2k inválida! ERRO: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "A fechar a aplicação..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "A terminar instância do amuleweb com o pid '%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "A matar instância do amuleweb com o pid '%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Falhas"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "A terminar instância do amuleweb com o pid '%d' ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "A matar instância do amuleweb com o pid '%d' ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: A terminar núcleo."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "aMule terminado."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Resultados da depuração de memória para a saída do aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "O seu idioma foi alterado para a predefinição do sistema devido a uma mudança de configuração. Desculpe."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Informação"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -184,56 +350,109 @@
 "\n"
 "Configuração das LE"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Palavra-passe definida e permitidas as ligações externas."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "AVISO"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "Foi encontrado %i servidor no server.met"
+msgid "Loading temp files"
+msgstr "A carregar ficheiros temporários de %s."
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "A carregar ficheiros temporários de %s."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Recarregar os seus ficheiros partilhados"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Recarregar os seus ficheiros partilhados"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Iniciar"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Redes"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Redes"
+msgid "eD2k server list (server.met)"
+msgstr "Foi encontrado %i servidor no server.met"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "servidor web a executar no pid %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 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/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "ERRO"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "servidor web a executar no pid %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+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/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Não foi possível associar os portos ao endereço especificado: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "O porto %u não está disponível. Ficará com LOWID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -248,48 +467,48 @@
 "\n"
 "Verifique a sua rede para se certificar de que o porto está aberto para leitura e escrita."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Erro ao criar o ficheiro da Assinatura Online"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Erro a criar o ficheiro da Assinatura Online do aMule"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Esta é a primeira vez que executa o aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Esta é uma versão de testes actualizada diariamente e\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "em amule-org.github.io ou no canal de IRC #aMule em irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Esteja à vontade para comunicar erros para https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -297,1579 +516,1885 @@
 "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/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Servidor notificado"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, 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/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "ERRO: não é possível abrir o ficheiro de relatório"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "AVISO: o ficheiro de relatório está vazio. Algo está mal."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "O relatório foi limpo"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Mensagem do servidor: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, 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/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Falha ao transferir a lista de nós."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Falha ao abrir o ficheiro de verificação de versão transferido"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Ficheiro de verificação de versão corrompido"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Está a usar uma versão antiga do aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "A última versão pode ser sempre encontrada em https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "A sua cópia do aMule está actualizada."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Falha ao transferir o ficheiro de verificação de versão"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Utilizadores: %s | Ficheiros: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Não foram seleccionadas redes"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "com LowID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "com HighID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Ligado a %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "A ligar a %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Desligado da eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad iniciada."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad parada."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Ligado à Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Ligado à Kad (atrás de firewall)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Desligado da Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Rede Kad desligada nas preferências, a ligação não será efectuada."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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:145
+#: src/amuled.cpp
 #, fuzzy
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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 https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - a iniciar temporizador"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: a fazer fork para segundo plano - adeus"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Não foi Possível Criar o Ficheiro de Pid"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "ERRO: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Este é o aMule %s, baseado no eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "A correr em %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Visite https://github.com/amule-org/amule/releases/latest para verificar se há novas versões."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ERRO FATAL: Falha ao criar Temporizador"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Controlo remoto do aMule "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Redes"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Cliente p2p 'para todas as plataformas' baseado no eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Pesquisas"
+
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Website: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Ficheiros partilhados"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Fórum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Clientes"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Website: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Mensagens"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Fórum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Estatísticas"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (C) 2003-2019 Equipa aMule \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Preferências"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Parte do aMule é baseado em \n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr ""
 
-#: src/amuleDlg.cpp:552
-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/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Mensagem do servidor: %s"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (C) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Indisponível"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Mensagem"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "A última versão pode ser sempre encontrada em https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "Caixa de diálogo do aMule destruída"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "A Ligar"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: A Ligar"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Desligado"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Atrás de firewall"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Ligado"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: A Ligar"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Desligado"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Cancelar"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Cancela as tentativas de ligação actuais"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versão"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Desligar"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Desligar das redes presentemente ligadas"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Ligar"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Endereço"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Ligar às redes presentemente activadas"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Descrição"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "Relatório"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Up: %.1f | Down: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Ligado)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Desligado)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Quer mesmo fechar o %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Confirmação de saída"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Executar Comando: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- predefinição -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Pasta para os temas '%s' não existe"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, 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:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Redes"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Janela de Redes"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Pesquisas"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Janela de Pesquisas"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Downloads"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Janela de Downloads"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Ficheiros partilhados"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Janela de Ficheiros Partilhados"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Mensagens"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Janela de Redes"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Janela de Mensagens"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Janela de Estatísticas"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Preferências"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Janela de Preferências"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importar"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "A ferramenta de importação de ficheiro de partes"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Acerca"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Acerca/Ajuda"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Rede eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Rede Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Sem rede"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Controlo remoto do aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Erro Fatal: Falha ao criar o Temporizador Central"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Ligar ao amule remoto"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Ligação perdida"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Confirmar fecho do programa"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Erro Fatal: Falha ao criar o 'Poll Timer'"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "A ir para o ciclo de eventos..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "A Ligar..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Gestor de eventos da interface gráfica remota"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, 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/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "A fechar"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Ligação fechada - provavelmente o aMule foi terminado."
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "A tentativa de ligação a %s (%s:%i) expirou."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Religar à rede."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "A ligação falhou. Não é possível ligar a %s:%d\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Pronto"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Todos"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Indisponível"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Ficheiro não encontrado."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Ligação inválida ou já na lista."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Pasta para ficheiros temporários"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr "Não é possível criar o directório '%s' para a categoria '%s', a manter directório '%s'."
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Erro ao receber ficheiros partilhados do utilizador '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "A procurar parceiro para ligação com lowid"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Versão do eMule falsa %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (eMule falso)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (eMule falso)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (baseado no eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Alcunha: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Pedido: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estatísticas para esta sessão: Aceite %d de %d pedido, %s transferido\n"
 msgstr1 "Estatísticas para esta sessão: Aceites %d de %d pedidos, %s transferidos\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Estatísticas para todas as sessões: Aceite %d de %d pedido, %s transferido\n"
 msgstr1 "Estatísticas para todas as sessões: Aceites %d de %d pedidos, %s transferidos\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Pedido um ficheiro desconhecido"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Mensagem filtrada de '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nova mensagem de '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, 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/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Erro ao receber ficheiros partilhados do utilizador '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "AVISO: %s não pode ser aberto."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "AVISO: Lista de ficheiros cancelados corrompida, contém cabeçalho inválido."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Erro de entrada/saída ao ler ficheiro %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Erro ao gravar ficheiro %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Escrever 'Captcha'"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Categoria"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nova Categoria"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Seleccione uma pasta de ficheiros completos"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Deve especificar um nome para a categoria!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Deve especificar um caminho para a categoria!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Sessão de Conversa Iniciada: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Ligado ao Cliente ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** A Ligar ao Cliente ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Erro na ligação ao cliente / Ligação perdida ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr "*** Passou o teste do 'captcha' e o utilizador recebeu a sua mensagem. ***"
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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 sua resposta ao 'captcha' estava errada e a sua mensagem foi ignorada. Pode solicitar um novo 'captcha' enviando uma nova mensagem. ***"
 
-#: src/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Chat"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Fechar o separador"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Fechar todos os separadores"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Fechar os outros separadores"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Adicionar à lista de Amigos"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Mostrar &Detalhes"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Tirar da lista dos amigos"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Estabelecer Ligação de Amigo"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Ver Ficheiros"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Enviar mensagem"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Enviar uma mensagem ao utilizador"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Mensagem a enviar:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Não lhe é permitido definir mais do que uma ligação de amigo.\n"
+" Apenas uma ligação foi atribuída."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Selecção múltipla"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Tirar da lista dos amigos"
+msgstr1 "Tirar da lista dos amigos"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Recarrega a lista de ficheiros partilhados."
+msgstr1 "Recarrega a lista de ficheiros partilhados."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Ficheiro de créditos carregado, %u cliente conhecido"
 msgstr1 "Ficheiro de créditos carregado, %u clientes conhecidos"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - Os créditos expiraram para %u cliente!"
 msgstr1 " - Os créditos expiraram para %u clientes!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Ficheiro 'cryptkey.dat' não encontrado, a criar."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Detalhes do Cliente"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Activado"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Suportado"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Desactivado"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Ligado"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Desligado"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Nome"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Endereço IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Origem"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Última recepção"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Versão"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Velocidade de Upload"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Velocidade de Download"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Enviado"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Download Total: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Modificador DL/UL"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Assinatura Online"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Incompleto"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Pessoa Maldosa"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Verificado - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/D"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Indisponível"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Ficheiros"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Enviado"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Transferido"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "A Receber"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "A Enviar"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Activo"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Desconhecido"
+
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "O utilizador %s (%u) pediu a sua lista de ficheiros partilhados -> Negado"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "O utilizador %s (%u) pediu a sua lista de pastas partilhadas -> Aceite"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "O utilizador %s (%u) pediu a sua lista de pastas partilhadas -> Negado"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 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/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 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/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "O utilizador %s (%u) partilha a pasta '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "O utilizador %s (%u) enviou pastas partilhadas não requisitadas."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "O utilizador %s (%u) enviou a lista de ficheiros partilhados para a pasta '%s'"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "O utilizador %s (%u) terminou o envio da lista de ficheiros partilhados"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "O utilizador %s (%u) enviou lista de ficheiros partilhados não desejada"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, 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/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Comentários do ficheiro"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Nome de Utilizador"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Nome do Ficheiro"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Classificação"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "A procurar parceiro para ligação com lowid"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Sem comentários"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u comentário"
 msgstr1 "%u comentários"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 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:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Falha ao carregar dados de país para '%s'."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Automática Baixa"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Automática Normal"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Automática Alta"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Muito baixa"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Baixa"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Alta"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Muito Alta"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Lançamento"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "A Pedir"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "A ligar via servidor"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Fila de Espera Cheia"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Em Fila de Espera"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "A Receber"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "A receber o conjunto de chaves"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Não há partes necessárias"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Não é possível ligar dois clientes com LowID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Demasiadas ligações"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "A ligar via Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Demasiadas ligações Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Banidos"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Erro de Ligação"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Fila de Espera Remota Cheia"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "MLDonkey antigo"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "MLDonkey Novo"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Compatível com eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Servidor Local"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Servidor Remoto"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Troca de Fontes"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passivo"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Ligação"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Sementes de Fontes"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Resultados de Pesquisas"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Concluído"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Em progresso"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "ERRO: Sem espaço em disco"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "ERRO: Partmet não encontrado"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ERRO: erro de entrada/saída!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ERRO: Falhou!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Em Fila"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Já a transferir"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Formato de ficheiro temporário desconhecido ou danificado."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Parte"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Transferido"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Velocidade"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Progresso"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Fontes"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioridade"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Estado"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Tempo Restante"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Última Vez Visto Completo"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Última recepção"
 
-#: 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/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/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Comentário de: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automática"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "P&arar"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Continuar"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "&Limpar terminados"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Trocar cada A4AF para este ficheiro"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Trocar cada A4AF para este ficheiro (Automático)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Trocar cada A4AF para outro ficheiro"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Opções Estendidas"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Pré-visualizar"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Mostrar &detalhes do ficheiro"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Mostrar todos os comentários"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Copiar URI magnet para a área de transferência"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Copiar &ligação eD2k para a área de transferência"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Copiar comentários para a área de transferência"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Obter %s para este ficheiro"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "destituir"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Atribuir à categoria"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Abrir o ficheiro"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Tem a certeza que deseja eliminar o ficheiro seleccionado?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Tem a certeza que deseja eliminar os ficheiros seleccionados?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Comentário de: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Insira o novo nome para este ficheiro:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Renomear ficheiro"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Downloads (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-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 %s)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Pré-visualização do ficheiro"
+msgid "Downloads (%i)"
+msgstr "Downloads (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, 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'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Total DL: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "A gravar Ficheiro Parcial %u de %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Todos os Ficheiros Parciais Gravados."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "A carregar ficheiros temporários de %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "A carregar Ficheiro Parcial %u de %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "ERRO: Falha ao carregar ficheiro de backup. Procure em https://github.com/amule-org/amule/discussions por soluções para recuperação de .part.met."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Carregados Todos os Ficheiros Parciais."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Nenhum ficheiro de partes (.part) encontrado"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Encontrado %u ficheiro de partes"
 msgstr1 "Encontrados %u ficheiros de partes"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 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:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 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/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "A transferir %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Já está a tentar obter o ficheiro '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Já possui o ficheiro '%s'"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Já possui o ficheiro '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Já está a tentar transferir o ficheiro %s"
 
-#: src/DownloadQueue.cpp:1418
-#, 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"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Protocolo do link desconhecido: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Ligação eD2k inválida! ERRO: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "O cliente enviou um pacote depois de a autenticação ter falhado."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Ligação externa fechada."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Ligações externas desactivadas devido a palavra-passe vazia!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Ligações externas desactivadas no ficheiro de configuração"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Nova ligação externa aceite"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 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:531
+#: src/ExternalConn.cpp
 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:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "A ligar cliente: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Versão desconhecida"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "Versão de LE incorrecta, pode haver incompatibilidade binária. Utilize núcleo e remoto da mesma versão."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "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 de desenvolvimento arbitrária! *suspiro*... Prevenido potencial erro futuro"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Versão de protocolo inválida."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Elemento de versão de protocolo em falta."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Ligação automática ao servidor irá repetir-se em %d segundo"
+
+#: src/ExternalConn.cpp
 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:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "A autenticação falhou: palavra-passe errada."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "A autenticação falhou: palavra-passe em falta."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Pedido inválido, deve autenticar-se primeiro."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Acesso concedido."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Enviada mensagem de erro \"%s\" ao cliente."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Acesso não-autorizado de %s. Ligação fechada."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Chave não encontrada: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "UPS! Erro de processamento de código de operação!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Servidor não adicionado"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "servidor não encontrado: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "é necessário definir o servidor a remover"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2K desactivada nas preferências."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Ficheiro não encontrado."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Ficheiro não encontrado."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "A pesquisar. Resultados dentro de momentos!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Pesquisa na web a partir da interface remota não faz sentido."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "A pesquisar. Resultados dentro de momentos!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Sem pontos para gráfico."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 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:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Ligação Externa: finalização pedida"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Já a desligar."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "LigaçãoExterna: a adicionar o link '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Ligação inválida ou já na lista."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Ficheiro não encontrado."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Nome de ficheiro inválido."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Não é possível renomear o ficheiro."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Fechar esta conversa."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Nova sessão de conversa iniciada"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Fechar esta conversa."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "A Kad está desactivada nas preferências."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Nome desconhecido)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "A Kad está desactivada nas preferências."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Já ligado à eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "A ligar à eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Já ligado à Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "A ligar à Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Todas as redes estão desactivadas."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Desligado da eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Desligado da Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, 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:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Código de operação inválido (versão de protocolo errada?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Extensão '%s' desconhecida para o comando '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Comando '%s' desconhecido.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1877,7 +2402,7 @@
 "\n"
 "Este comando não pode ter um argumento.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1885,7 +2410,7 @@
 "\n"
 "Este comando deve ter um argumento.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1893,7 +2418,7 @@
 "\n"
 "Este comando está incompleto, deve usar uma das extensões abaixo.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1901,11 +2426,11 @@
 "\n"
 "Extensões disponíveis:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Comandos disponíveis:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1916,17 +2441,17 @@
 "Todos os comandos não consideram a capitalização das letras.\n"
 "Escreva '%s <comando>' para obter mais detalhes sobre <comando>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Sai do programa."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Mostrar ajuda."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1934,7 +2459,7 @@
 "Para obter ajuda num comando, escreva 'help <comando>'.\n"
 "Para obter a lista completa de comandos escreva 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1945,46 +2470,46 @@
 "Use '%s' para a lista de comandos\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Erro de sintaxe!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Este comando não deveria ter quaisquer parâmetros."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Este comando deve ter um parâmetro."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Argumento inválido."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Este comando está incompleto."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Escreva '%s' para obter mais ajuda.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Isto é %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Isto é %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1992,7 +2517,7 @@
 "\n"
 "A criar o cliente...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2001,7 +2526,7 @@
 "\n"
 "OK, a sair %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2015,118 +2540,361 @@
 "\n"
 "A sair...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Mostra esta ajuda."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Máquina onde o aMule está a ser executado. (predefinida: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Porto do aMule para Ligação Externa. (predefinido: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Palavra-passe de Ligação Externa."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Ler a configuração a partir do ficheiro."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Não mostrar qualquer mensagem para a saída padrão."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Detalhado - mostrar também mensagens de depuração."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Define a localização do programa (idioma)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Escrever as opções da linha de comandos para o ficheiro de configuração."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Mostrar a versão do programa."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Detalhes do ficheiro"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%% terminado"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Pré-visualização do ficheiro"
+
+#: src/FileLaunch.cpp
+#, 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'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ERRO: Falhou ao abrir ficheiro de partes '%s'"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Bem-vindo!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "A ligar a um parceiro"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Estado da Ligação:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Redes"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Porto TCP Padrão "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Porto UDP estendido (Kad / pesquisa global) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Activar UPnP para encaminhamento de portos no router"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Inicialização"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Já está a tentar transferir o ficheiro %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Auto-actualizar lista de servidores no arranque"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Pasta de destino para downloads"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Procurar"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Pasta para ficheiros temporários"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 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/FriendList.cpp:149
+#: src/FriendList.cpp
 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/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "CRÍTICO - sem cliente no StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Amigos"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Mostrar &Detalhes"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Adicionar um amigo"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Remover Amigo"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Enviar &Mensagem"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Ver Ficheiros"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Estabelecer Ligação de Amigo"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Tem a certeza que deseja remover o amigo seleccionado?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Tem a certeza que deseja remover os amigos seleccionados?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2134,986 +2902,1306 @@
 "Não lhe é permitido definir mais do que uma ligação de amigo.\n"
 " Apenas uma ligação foi atribuída."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Selecção múltipla"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Não lhe é permitido definir mais do que uma ligação de amigo.\n"
-" Apenas uma ligação foi atribuída."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Enviar uma mensagem ao utilizador"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Mensagem a enviar:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Tirar da lista dos amigos"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Enviar mensagem"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Mudar para este ficheiro"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "Na Fila: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "A pedir outro ficheiro"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "À espera de upload"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "Em Fila de Espera: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "A Enviar"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Nenhum"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Não"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Sim"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Falha ao abrir %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "A Receber..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "Download HTTP cancelado"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "O URL para download não pode estar vazio"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Erro ao receber ficheiros partilhados do utilizador '%s'"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Pasta para ficheiros temporários"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "%d bytes transferidos"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "The URL %s returned: %i"
 msgstr "O URL %s devolveu: %i - Erro (%i)!"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Download HTTP cancelado"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Transferir novo GeoIP.dat a partir de %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "Transferência do ficheiro GeoIP.dat falhou, a abortar actualização."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Falhou ao remover ficheiro %s, a cancelar actualização."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Falhou ao mudar o nome do ficheiro %s, a cancelar actualização."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "%s actualizado com sucesso"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Error updating %s"
 msgstr "Erro ao actualizar o GeoIP.dat"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Falhou a transferência do %s de %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Falha ao carregar dados de país para '%s'."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "A carregar os filtros de IPs 'ipfilter.dat' e 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "%u intervalo IP carregado de '%s'."
 msgstr1 "%u intervalos IP carregados de '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u linha defeituosa foi ignorada."
 msgstr1 "%u linhas defeituosas foram ignoradas."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Falhou ao mudar o nome ao novo ficheiro %s, a cancelar actualização."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "O filtro de IPs está pronto"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Arrancar a partir de \n"
-"clientes conhecidos"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Actual"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Média actual"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Média da sessão"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Nós (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Endereço IP inválido para arranque"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Porto inválido para arranque"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Por favor, preencha todos os campos pedidos"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Mensagem"
+
+#: src/KadDlg.cpp
 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/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Ao fazê-lo, irá remover os seus nós actuais e reiniciar a ligação à Kademlia."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Continuar?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: palavra-chave de pesquisa demasiado curta"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: A palavra-chave de pesquisa já está na lista de pesquisa: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Falha ao ler o ficheiro nodes.dat - demasiado antigo. Esta versão (0) já não é suportada."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Lido %u contacto Kad"
 msgstr1 "Lidos %u contactos Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Não foram encontrados contactos. Por favor inicialize ou transfira um ficheiro nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Apenas %d contacto Kad disponível, nodes.dat não escrito"
 msgstr1 "Apenas %d contactos Kad disponíveis, nodes.dat não escrito"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Escrito %d contacto Kad"
 msgstr1 "Escritos %d contactos Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Rede Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Tamanho do Ficheiro"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Razão de partilha"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Enviado"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Pedido"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Aceite"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Fontes completas"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "AVISO: Lista de ficheiros conhecidos corrompida, contém cabeçalho inválido."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Falhou ao carregar entrada na lista de ficheiros conhecidos, o ficheiro pode estar corrompido"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Entrada inválida na lista de ficheiros conhecidos, o ficheiro pode estar corrompido"
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Predefinição do sistema"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albanês"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Árabe"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturiano"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Basco"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Búlgaro"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Catalão"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Chinês (Simplificado)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Chinês (Tradicional)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Croata"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Checo"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Dinamarquês"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Holandês"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Inglês"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Inglês"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estoniano"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finlandês"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francês"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galego"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Alemão"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grego"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebreu"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Húngaro"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italiano"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japonês"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Coreano"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norueguês (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polaco"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Português"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Português (Brasil)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Romeno"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Russo"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Esloveno"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Espanhol"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Sueco"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turco"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ucraniano"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Erro desconhecido %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Impossível obter descrição para o erro %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "A gerar chave"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "A completar"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Completo"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Em Pausa"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Erróneo"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Em Espera"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Deve especificar uma palavra-passe não vazia."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Palavra-passe inválida, não é uma chave MD5!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Falha de ligação"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Ligação externa fechada."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "Ligação LE falhou. Resposta vazia."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Ligação Externa: Má resposta, negociação inicial falhou. Ligação fechada."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Ligação Externa: Má resposta, negociação inicial falhou. Ligação fechada."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Sucesso! Ligação estabelecida com o aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Sucesso! Ligação estabelecida."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Ligação Externa: Acesso negado porque: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Ligação Externa: Negociação inicial falhou."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "Actualização automática iniciada"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "ERRO: Não é possível escutar o porto TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "ERRO: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "AVISO: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Fechar"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Colar"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Seleccionar tudo"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Ilimitado"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Mostrar"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Esconder"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Ligado"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Ligado"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Ligado à Kad (atrás de firewall)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "IP do servidor: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "IP do servidor:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Não ligado"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Porto TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Porto TCP: Não preparado"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Porto UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Porto UDP: Não preparado"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Informação do cliente"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Limite de Upload"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Limite de Download"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Mostrar"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Desligar"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Esconder"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Ligar"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Sair"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Ilimitado"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Menu de Área de Notificação do aMule"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Limites de velocidade:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "UL: Nenhum"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "UL: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DL: Nenhum"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DL: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Velocidade de Download: %.1f"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Velocidade de Upload: %.1f"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Alcunha: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Nenhuma Alcunha seleccionada!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID do cliente: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Nome do servidor: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP do servidor: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Não Ligado"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Assinatura Online: Activada"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Assinatura Online: Desactivada"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Tempo de funcionamento: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Ficheiros partilhados: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Clientes em espera: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Total DL: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Total UL: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Ligação eD2k: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Adicionar"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Adiciona uma ligação eD2k ou ligação magnet ao núcleo."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Adicionar à lista de Amigos"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 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:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Os eventos são mostrados aqui. Para uma lista completa de eventos, consulte o relatório no separador Servidores."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "A carregar..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Número de utilizadores ligados a este servidor..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Utilizadores: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 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 de utilizadores."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Up: 0.0 | Down: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "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:139
+#: src/muuli_wdr.cpp
 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 o estado da ligação e as transferências activas. Setas vermelhas significam que actualmente não está ligado, setas amarelas significam que tem LowID (atrás de firewall) e setas verdes significam que tem HighID (o tipo de ligação óptimo)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Desligado..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Servidor a que está ligado."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Pesquisar"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Nome:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tipo"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Parâmetros estendidos"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtragem"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Tipo de Ficheiro"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Qualquer"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Arquivos"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "Imagens de CDs"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Fotografias"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programas"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Textos"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Extensão"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Tamanho Mínimo"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "kB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Tamanho Máximo"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Disponibilidade"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtro:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filtrar Resultados"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtro"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Inverter Resultados"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Esconder Ficheiros Conhecidos"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Limpar campos"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Iniciar"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Mais"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Extensão"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Parar"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Download"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Transferir para a categoria"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Resultados de Pesquisas"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Limpar campos"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Limpa os downloads concluídos"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Fontes de ficheiros:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Geral"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Nome completo :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/D"
-
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Ficheiro de servidores conhecidos :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Chave :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Tamanho do ficheiro :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Estado do ficheiro de partes :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Última vez visto completo :"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Nome completo"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "Ficheiro de servidores conhecidos"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Chave"
+
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Tamanho do ficheiro"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Transferência"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Fontes encontradas :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Fontes em transferência :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Contagem de partes :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Disponíveis :"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Taxa de transferência :"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Tempo de Download Activo: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Transferido :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Tamanho Completo :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Estado do ficheiro de partes"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Última vez visto completo"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Fontes encontradas"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Fontes em transferência"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Contagem de partes"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Disponíveis"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Taxa de transferência"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Tempo de Download Activo"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Tamanho Completo"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Manipulação Inteligente de Corrupção (M.I.C.)"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Perdido por corrupção :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Ganho por compressão :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Pacotes recuperados por M.I.C. :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Perdido por corrupção"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Ganho por compressão"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Pacotes recuperados por M.I.C."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "A partilhar: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Pedidos"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Pedidos Aceites"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Dados Transferidos"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Grau de Partilha"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Fontes Completas"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Ficheiros partilhados"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Upload: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Informação Kad"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Não avaliado"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Título"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Nomes de ficheiros"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Assumir"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Limpar"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 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:705
+#: src/muuli_wdr.cpp
 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."
@@ -3121,1132 +4209,1247 @@
 "Para um filme pode dizer a sua duração, enredo, idioma ...\n"
 "e se for um ficheiro falso, pode transmiti-lo aos outros utilizadores."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Qualidade do Ficheiro"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Não avaliado"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Inválido / Corrompido / Falso"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Mau"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Razoável"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Bom"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Excelente"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Desligado da Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "A transferir, por favor aguarde ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Tamanho desconhecido"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Informação Necessária"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Endereço IP :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Porto :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Porto"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Utilizador :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Chave de utilizador :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Chave de utilizador"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Velocidade de Download"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Actual"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Média actual"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Média da sessão"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Velocidade de Upload"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Ligações"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Downloads activos"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Ligações activas (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Uploads activos"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Árvore de Estatísticas"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Utilizador:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Chave de utilizador:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Programa cliente:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Versão do cliente:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Programa cliente"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Endereço IP:"
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Versão do cliente"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID do utilizador:"
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID do utilizador"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP do servidor:"
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP do servidor"
+
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Nome do servidor"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Nome do servidor:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Ofuscação:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Ofuscação"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Ofuscação do Protocolo"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "A transferir"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Pedidos actuais:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Taxa média de upload:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Taxa média de download:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Enviado (sessão):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Recebido (sessão) :"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Enviado (total):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Recebido (total):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Pedidos actuais"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Taxa média de upload"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Taxa média de download"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Enviado (sessão)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Recebido (sessão)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Enviado (total)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Recebido (total)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Pontuações"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modificador DL/UL:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Identificação segura:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Pontuação na fila de espera:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Pontuação na fila de espera:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Identificação segura"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Pontuação na fila de espera"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Pontuação na fila de espera"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Alcunha"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - a Mula multi-plataforma"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Idioma: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "O tempo que decorre até serem mostradas as dicas."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Especifica o idioma usado nos controlos."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Verificar nova versão no arranque"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Ao activar, fará o aMule procurar por uma nova versão no arranque"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Iniciar minimizado"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Quando activado, o aMule minimiza automaticamente no arranque."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Confirmar fecho do programa"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Faz com que o aMule peça uma confirmação ao sair."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Activar o ícone da área de notificação"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 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:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimizar para a área de notificação"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "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:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Lembrar estas preferências"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Atraso de exibição de dicas: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "segundos"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Selecção de Navegador"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "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:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Procurar"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Abrir num novo separador se possível"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Leitor de vídeo"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Limites de largura de banda"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Atribuição de Ligações"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Portos"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Porto TCP Padrão "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Este é o porto da eD2k por omissão e não pode ser desactivado."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Porto UDP para pedidos ao servidor (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Porto UDP estendido (Kad / pesquisa global) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Activar UPnP para encaminhamento de portos no router"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "Porto TCP UPnP (Opcional):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 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:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Associar endereço local ao IP (em branco para qualquer um):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Máximo de fontes por ficheiro:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Máximo de ligações simultâneas:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Ligar automaticamente no arranque"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Voltar a ligar se perder ligação"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Remover servidores inactivos após"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "tentativas"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Auto-actualizar lista de servidores no arranque"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 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:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Actualizar a lista de servidores quando um cliente se liga"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Usar o sistema de prioridades"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Usar verificação inteligente de LowID ao ligar"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Ligação segura"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Apenas ligar automaticamente a servidores estáticos"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Atribuir alta prioridade a servidores adicionados manualmente"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Manipulação Inteligente de Corrupção (M.I.C.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Activar"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Adicionar ficheiros para transferir em modo de pausa"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Adicionar ficheiros para transferir com prioridade automática"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 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:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 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:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Da mesma categoria"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "Em ordem alfabética"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Reservar previamente espaço em disco para novos ficheiros"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Para novos ficheiros, reserva o espaço em disco para o ficheiro completo, reduzindo assim a fragmentação"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Parar os downloads quando o espaço livre em disco atinge "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Insira o espaço mínimo no disco desejado."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Guardar 10 fontes para ficheiros raros (< 20 fontes)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Uploads"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Adicionar novos ficheiros partilhados com prioridade automática"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Pasta de destino para downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Manipulação Inteligente de Corrupção (M.I.C.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Activar"
+
+#: src/muuli_wdr.cpp
+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 src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Pastas partilhadas"
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Pasta para ficheiros temporários"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Pastas partilhadas"
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Remover"
+
+#: src/muuli_wdr.cpp
 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:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Partilhar ficheiros ocultos"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Servidor Remoto"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Servidor Local"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Atraso de actualização: 5 segundos"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Tempo para gráfico de média: 100 minutos"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala do Gráfico de Ligações: 100"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Escala do gráfico de download:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Escala do gráfico de upload"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Cores: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Fundo"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Grelha"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Download actual"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Média actual de download"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Média de download da sessão"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Upload actual"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Média actual de upload"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Média de upload da sessão"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Ligações activas"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Barra de velocidade no ícone da área de notificação"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Nós Kad actuais"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Nós Kad a executar"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Nós Kad da sessão"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Árvore"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Número de Versões de Cliente mostradas (0=ilimitado)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! AVISO !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Máximo de novas ligações / 5 segundos"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "Intervalo de actualização do FTP em minutos"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "Intervalo de actualização do FTP em minutos"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tamanho da memória temporária de ficheiro: 240000 Byte"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Tamanho da Lista de Espera de Upload: 5000 clientes"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervalo de actualização da ligação ao servidor: Desactivado"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Desactivar o modo de espera temporizado do computador"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Tema a utilizar: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 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:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Mostrar informação extra nos separadores de categorias"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "Mostrar velocidades de transferência na barra de título"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Mostrar velocidades de transferência na barra de título"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Antes do nome da aplicação"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Depois do nome da aplicação"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Mostrar sobrecarga na largura de banda"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Orientação vertical da barra de ferramentas"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Ficheiros na Fila de Espera dos Downloads"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Mostrar percentagem de progresso"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Mostrar barra de progresso"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plana"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Arredondada"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Ordenar ficheiros automaticamente (pode consumir muito CPU)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parâmetros de Ligação Externa"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Aceitar ligações externas"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP da interface a escutar:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Porto TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 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:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Parâmetros do servidor web"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "Porto TCP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "A verificar a palavra-passe\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "A verificar a palavra-passe\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Negar acesso de convidado"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Palavra-passe de convidado para o servidor web"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Parâmetros do servidor web"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Executar o servidor web no arranque"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Aspecto da página web"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Palavra-passe para controlo total"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Activar utilizador com permissões reduzidas"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Palavra-passe para controlo reduzido"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Activar UPnP para encaminhamento do porto do servidor web"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Porto TCP UPnP do servidor web (Opcional)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Taxa de Actualização de Páginas (em segundos)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Activar compressão Gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Predefinição do sistema"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 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:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Anular as alterações efectuadas nas preferências."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Título :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Comentário :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Pasta de completos :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Trocar prioridade nos novos ficheiros :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Pasta de completos"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Trocar prioridade nos novos ficheiros"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Não mudar"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Seleccionar a cor para a categoria seleccionada :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Limpar"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Seleccionar a cor para a categoria seleccionada"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Clique para limpar o relatório."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Lista de Servidores"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Adicionar servidor manualmente: Nome"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Insira o nome do novo servidor"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Porto"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Insira o porto do servidor."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Relatório"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Informações do Servidor"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Informação ED2K"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Informação Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nós (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Estado dos nós"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Inicialização"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Novo nó"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Porto:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
 msgstr "Arrancar a partir de clientes conhecidos"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Desligar Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node 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:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Utilizar Identificação Segura de Utilizador"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Ofuscação do Protocolo"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Suportar a Ofuscação do Protocolo"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "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:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usar ofuscação em ligações para o exterior"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Esta opção faz com que o aMule use a Ofuscação do Protocolo quando ligado a outros clientes/servidores."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Aceitar apenas ligações ofuscadas"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Todos"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Ninguém"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Quem pode ver os meus ficheiros partilhados:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Filtragem de IP"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtrar clientes"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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."
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtrar servidores"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Recarregar a lista"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Actualizar agora"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Actualizar o filtro de IPs automaticamente no arranque"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Nível de filtragem:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Filtrar sempre endereços IP de rede local"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Tratamento paranóico de IPs sem correspondência"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Rejeitar pacotes se o IP do cliente é diferente do IP de onde o pacote é recebido. Usar com cautela."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Utilizar ipfilter.dat global do sistema se disponível"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide 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:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Activar Assinatura Online"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Frequência de Actualização (segundos):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 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:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Gravar a assinatura Online em: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Mostrar bandeiras de países para clientes"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Taxa de transferência :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Fontes"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4254,11 +5457,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4268,828 +5471,747 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Download: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Actualizar o filtro de IPs automaticamente no arranque"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrar mensagens recebidas (excepto da conversa corrente):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtrar todas as mensagens"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 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:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtrar mensagens de clientes desconhecidos"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrar mensagens que contenham (usar ',' como separador):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Mostrar mensagens recebidas no relatório"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Comentários"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrar comentários que contenham (usar ',' como separador):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Activar autenticação"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Activar/desactivar autenticação utilizador/palavra-passe"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Utilizador: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "O nome de utilizador para ligar ao proxy"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Palavra-passe:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "A palavra-passe a usar para ligar ao proxy"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Activar Proxy"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Activar/desactivar o suporte de proxy"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Tipo de proxy:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Servidor:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Tipo de proxy"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Servidor"
+
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "O nome da máquina proxy"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Porto do proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Porto do proxy"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "O porto do proxy"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Activar autenticação"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Activar/desactivar autenticação utilizador/palavra-passe"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "O nome de utilizador para ligar ao proxy"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "A palavra-passe a usar para ligar ao proxy"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Ligar a:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Autenticação remota"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Nome de utilizador"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Lembrar estas preferências"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Ligação externa fechada."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Usar compressão gzip"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Activar Relatório detalhado para Depuração."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&Abrir o ficheiro"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Categorias de Mensagens:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "A aguardar..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Adicionar importações"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Reassumir seleccionados"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Remover seleccionados"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Tipos de eventos"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Uploads Activos"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Percentagem dos ficheiros totais"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Mostrar Clientes para"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Ficheiros seleccionados"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Apenas os uploads activos"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Mostrar Clientes para"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Recarregar:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Recarregar os seus ficheiros partilhados"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Enviar"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Envia a mensagem especificada."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Fechar esta conversa."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Ligar a qualquer servidor e/ou Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Cancelar"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Ficheiros Partilhados"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Desligar"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Ligar"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Desactivado %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
 msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/seg"
 msgstr1 "bytes/seg"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "segundos"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "minutos"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "horas"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Dias"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "dias"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "todos"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "todos os outros"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Incompleto"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arquivo"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Texto"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Activo"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "A utilizar pasta de configuração: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Este comando não deveria ter quaisquer parâmetros."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Este comando não deveria ter quaisquer parâmetros."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Este comando não deveria ter quaisquer parâmetros."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Este comando não deveria ter quaisquer parâmetros."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Insira o porto do servidor."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Insira o porto do servidor."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Insira o porto do servidor."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "À espera que o programa de conversão do ficheiro de partes termine..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "A importar %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "A ler pasta de temporários"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 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:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "A criar ficheiro de destino"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, 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:344
+#: src/PartFileConvert.cpp
 #, 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:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "A obter informação de ficheiro de fontes"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "A adicionar download e a gravar novo ficheiro de partes"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importar ficheiros de partes"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Estado"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Chave de ficheiro"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Disco: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Deseja que os ficheiros de origem dos downloads importados com sucesso sejam removidos?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Remover fontes?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "ERRO: falha na criação do ficheiro de partes"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, 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:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "ERRO: Falha ao abrir o ficheiro part.met: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, 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:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Erro: %s (%s) está corrompido (elementos incorrectos: %s), não é possível carregar o ficheiro."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, 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:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "A tentar recuperar a informação do ficheiro..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Não é possível recuperar a informação do ficheiro :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Falha ao abrir %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "AVISO: %s parece estar corrompido (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "ERRO ao gravar ficheiro parcial: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Falha ao gravar ficheiro parcial: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Gravada %i semente de fontes para o ficheiro de partes: %s (%s)"
 msgstr1 "Gravadas %i sementes de fontes para o ficheiro de partes: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Gravada %i semente de fontes para o ficheiro de partes: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Encontrada parte corrompida (%d) no ficheiro de %d parte %s - FileResultHash |%s| FileHash |%s|"
 msgstr1 "Encontrada parte corrompida (%d) no ficheiro de %d partes %s - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Encontrada parte completa (%i) em %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Terminado a regeneração da chave de %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Erro inesperado ao completar %s. ficheiro em pausa"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Transferência concluída: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Transferência concluída: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "A eliminar o ficheiro: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, 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'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "ERRO: Impossível calcular a chave de uma parte recebida - conjunto de chaves incompleto (%s). Isto nunca deveria acontecer"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "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/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Parte recebida %i está corrompida no ficheiro: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "A atribuir"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Espaço em disco insuficiente"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Transferido"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ERRO: Falhou ao abrir ficheiro de partes '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Predefinição do sistema"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albanês"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Árabe"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Basco"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Catalão"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Chinês (Simplificado)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Chinês (Tradicional)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Croata"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Checo"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Dinamarquês"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Holandês"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Inglês"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "Inglês"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estoniano"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finlandês"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francês"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galego"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Alemão"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grego"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebreu"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Húngaro"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italiano (Suíço)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japonês"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norueguês (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polaco"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Português"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Português (Brasil)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Romeno"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Russo"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Esloveno"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Espanhol"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Sueco"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turco"
+msgid "Extended source exchange"
+msgstr "Troca de Fontes"
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ucraniano"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Alterar Idioma"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Indisponível"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "sem opções disponíveis"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "Categoria inválida encontrada, a ignorar"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Categoria inválida encontrada, a ignorar"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "O porto predefinido será usado (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Ligação"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Directórios"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Servidores"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Ficheiros"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Segurança"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interface"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtros"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Controlos remotos"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Assinatura Online"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Eventos"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Depuração"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5099,15 +6221,15 @@
 "    %PARTFILE - caminho completo do ficheiro\n"
 "    %PARTNAME - apenas o nome do ficheiro"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5123,26 +6245,43 @@
 "O aMule correrá perfeitamente sem ajustar qualquer\n"
 "uma destas opções."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "O tipo de proxy ao qual está a ligar-se"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "A verificar a palavra-passe\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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/PrefsUnifiedDlg.cpp
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5150,32 +6289,46 @@
 "O aMule tem de ser reiniciado para activar estas alterações:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- Porto TCP alterado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- Porto UDP alterado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "- Alterada interface para ligações externas.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Porta para ligações externas alterada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Alterada a aceitação de ligações externas.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Alterada interface para ligações externas.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Ofuscação do Protocolo"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- O idioma foi alterado.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5183,27 +6336,33 @@
 "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:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 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/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- O idioma foi alterado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- A pasta Temp foi alterada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- Rede ED2K activada.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Versão de protocolo inválida."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5211,7 +6370,7 @@
 "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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5219,7 +6378,7 @@
 "A Kad não vai funcionar se o porto UDP estiver desactivado.\n"
 "Active o porto UDP ou desactive a Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5229,20 +6388,69 @@
 "DEVE reiniciar o aMule agora.\n"
 "Se não o fizer, não se queixe se algo grave acontecer.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Actualização automática iniciada"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Pasta para ficheiros temporários"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Palavra-passe definida e permitidas as ligações externas."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5252,41 +6460,66 @@
 "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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Ficheiros temporários"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Ficheiros recebidos"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Assinaturas Online"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Seleccione uma pasta para %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Encontrado %i ficheiro partilhado conhecido"
+msgstr1 "Encontrados %i ficheiros partilhados conhecidos"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Procurar leitor de vídeo"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Seleccionar navegador"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Seleccionar navegador"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Executável%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Predefinição do sistema"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Editar a lista de servidores"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5294,1197 +6527,1463 @@
 "Adicione localizações para obter ficheiros server.met\n"
 "Apenas uma localização por linha."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Fontes completas"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Estado:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Estado:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Intervalo de actualização: %d segundo"
 msgstr1 "Intervalo de actualização: %d segundos"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Tempo para o gráfico de média: %d minuto"
 msgstr1 "Tempo para o gráfico de média: %d minutos"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Escala do Gráfico de Ligações: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Tamanho de memória temporária de ficheiros: %d byte"
 msgstr1 "Tamanho de memória temporária de ficheiros: %d bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Tamanho da fila de espera de upload: %d cliente"
 msgstr1 "Tamanho da fila de espera de upload: %d clientes"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Intervalo de actualização de ligação ao servidor: %d minuto"
 msgstr1 "Intervalo de actualização de ligação ao servidor: %d minutos"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Intervalo de actualização de ligação ao servidor: Desactivado"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "desactivado"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Executar o comando quando ocorrer o evento '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Activar execução de comandos no núcleo"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Comando de núcleo:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Activar execução de comando na interface gráfica"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Comando da interface gráfica:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "As seguintes variáveis serão substituídas:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Pastas partilhadas"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Recarregar os seus ficheiros partilhados"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Pastas partilhadas"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Recarrega a lista de ficheiros partilhados."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Pastas partilhadas"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Seleccione uma pasta para %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Lembrar estas preferências"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Aviso de pesquisa"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Pesquisas"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Progresso da pesquisa: %u %% \n"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Aviso de pesquisa"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Principal"
 
-#: src/SearchList.cpp:313
-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/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "AVISO: Lista de ficheiros conhecidos corrompida, contém cabeçalho inválido."
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Entrada inválida na lista de ficheiros conhecidos, o ficheiro pode estar corrompido"
+
+#: src/SearchList.cpp
 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/SearchList.cpp:336
+#: src/SearchList.cpp
 #, fuzzy
 msgid "No keyword for Kad search - aborting"
 msgstr "Palavra-chave para pesquisa: %s"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Erro inesperado enquanto tentava pesquisar na Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID do Ficheiro"
-
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Não avaliado"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Transferir para a categoria"
+#: src/SearchList.cpp
+#, fuzzy, c-format
+msgid "Error %u: %s\n"
+msgstr "Erro ao actualizar o GeoIP.dat"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Obter %s para este ficheiro"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ID do Ficheiro"
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Fechar todos os separadores"
+
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Procurar ficheiros relacionados (eD2k, servidor local)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Marcar como ficheiro conhecido"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Copiar ligação eD2k para a área de transferência"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Copiar ligações eD2k para a área de transferência"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Está ligado ao servidor que está a tentar remover. Por favor, desligue-se primeiro."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Novo"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "A Executar"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finlandês"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Progresso da pesquisa: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Progresso da pesquisa indisponível"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Ligação a servidores ofuscados falhou. A tentar de novo, sem ofuscação."
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "Falha ao ligar a todos os servidores listados. A tentar novamente."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "Falha ao ligar a todos os servidores listados. A tentar novamente."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Ligação automática ao servidor irá repetir-se em %d segundo"
+msgstr1 "Ligação automática ao servidor irá repetir-se em %d segundos"
+
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 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:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Ligado a %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Ligação estabelecida a: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Perdida a ligação a %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) parece estar morto."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) parece estar cheio."
 
-#: 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"
-msgstr0 "Ligação automática ao servidor irá repetir-se em %d segundo"
-msgstr1 "Ligação automática ao servidor irá repetir-se em %d segundos"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Ligação perdida"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "A Ligação a %s (%s:%i) falhou."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "ERRO: Socket inválido durante a verificação"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "A tentativa de ligação a %s (%s:%i) expirou."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Recebido resultado tardio para pedido DNS, a descartar."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "A carregar o ficheiro server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Ficheiro server.met não encontrado!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Falha ao abrir server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "Foi encontrado %i servidor no server.met"
 msgstr1 "Foram encontrados %i servidores no server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d servidor adicionado"
 msgstr1 "%d servidores adicionados"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Erro: o ficheiro 'server.met' está corrompido: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "Erro de entrada/saída ao ler o ficheiro 'known.met': "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Está ligado ao servidor que está a tentar remover. Por favor, desligue-se primeiro."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Erro ao abrir '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Falha ao gravar server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Erro de entrada/saída ao ler o ficheiro 'known.met': "
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "URL inválido"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Terminou a transferência da lista de servidores de %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Não foi encontrada nenhuma lista de servidores no 'addresses.dat'. Por favor indique um endereço correcto neste ficheiro para a auto-actualização da lista de servidores"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Iniciar transferência de lista de servidores de %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, 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:1006
+#: src/ServerList.cpp
 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/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Descrição"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Utilizadores"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Utilizadores"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Estático"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versão"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Ficheiros"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Ficheiros Partilhados"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 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:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Nome desconhecido)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "minutos"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Servidores (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Servidor"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Ligar ao servidor"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Marcar o servidor como estático"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Marcar o servidor como não estático"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Marcar os servidores como estáticos"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Marcar os servidores como não estáticos"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Remover o servidor"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Remover os servidores"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Remover todos os servidores"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Copiar ligações eD2k para a área de transferência"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Voltar a ligar ao servidor"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Tem a certeza que deseja eliminar todos os servidores?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 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:550
+#: src/ServerListCtrl.cpp
 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:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ERRO: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "AVISO: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "O novo identificador de cliente é %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "AVISO: Recebeu LowID!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPara mais informação, por favor consulte https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Recebida informação do servidor desconhecida! - demasiado curta"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Recebido %d novo servidor"
 msgstr1 "Recebidos %d novos servidores"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Gravação da lista de servidores completa."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "O servidor rejeitou o último comando"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Pacote mal formado recebido do servidor: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, 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:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, 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/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "a utilizar ofuscação do protocolo."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "A ligar a %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "Relatório"
+
+#: src/ServerWnd.cpp
 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:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Servidor não adicionado: Porto de servidor especificado inválido."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Estado da eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Estado da Ligação:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Ligado"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Estado da Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "A correr no modo LAN"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "A Executar"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Estado da Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Estado:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Estado da Ligação:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Estado da Ligação UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Estado da firewall: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Não é necessário um parceiro - porto TCP aberto"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Não é necessário um parceiro - porto UDP aberto"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Sem parceiro"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "A ligar a um parceiro"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Ligado a parceiro em %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Endereço IP:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Fontes indexadas:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Palavras-chave indexadas:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Notas indexadas:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Carga indexada:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Média de Utilizadores:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Média de Ficheiros:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Parado"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "A adicionar ficheiro %s à partilha"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Encontrado %i ficheiro partilhado conhecido"
 msgstr1 "Encontrados %i ficheiros partilhados conhecidos"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Encontrado %i ficheiro partilhado conhecido, %i desconhecido"
-msgstr1 "Encontrados %i ficheiros partilhados conhecidos, %i desconhecidos"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "ERRO: Tentado partilhar %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Pasta partilhada não encontrada, a ignorar: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Pasta partilhada não encontrada, a ignorar: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Não foram encontrados ficheiros partilhados no directório: %s"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Nome de Utilizador"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Erro ao gravar ficheiro %s: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Velocidade de Download"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "A carregar o ficheiro server.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Velocidade de Upload"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Não foram encontrados ficheiros partilhados no directório: %s"
+msgstr1 "Não foram encontrados ficheiros partilhados no directório: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Não foram encontrados ficheiros partilhados no directório: %s"
+msgstr1 "Não foram encontrados ficheiros partilhados no directório: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Partes Disponíveis"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Encontrado %i ficheiro partilhado conhecido"
+msgstr1 "Encontrados %i ficheiros partilhados conhecidos"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Nome de Utilizador"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Estado do Upload"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Nome do Ficheiro Local"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Partilha a Lista de Ficheiros"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Pedidos"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Pedidos Aceites"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Dados Transferidos"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Grau de Partilha"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Partes Obtidas"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Fontes Completas"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Disponibilidade"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Caminho da Pasta"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Ficheiros Partilhados"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Adicionar Comentário/Avaliação"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Editar Comentário/Avaliação"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Adicionar ficheiros na colecção à lista de transferências"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Copiar &URI magnet para a área de transferência"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Copiar ligação eD2k para a área de transferência (&Fonte)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Copiar ligação eD2k para a área de transferência (Fonte) (Com opções C&rypt)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Copiar ligação eD2k para a área de transferência (&Hostname)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 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:170
+#: src/SharedFilesCtrl.cpp
 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:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Copiar ligação eD2k para a área de transferência (informação &AICH)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 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:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Erro ao completar"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Erro ao receber ficheiros partilhados do utilizador '%s'"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Recarregar os seus ficheiros partilhados"
+msgstr1 "Recarregar os seus ficheiros partilhados"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Tamanho total dos Ficheiros Partilhados: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Tamanho total dos Ficheiros Partilhados: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Ficheiros Partilhados (%i)"
+msgstr1 "Ficheiros Partilhados (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Ficheiros Partilhados (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "FicheiroPart"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Recarrega a lista de ficheiros partilhados."
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Estado"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Nome do Ficheiro Remoto"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Dados Enviados (Sessão (Total)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Sobrecarga Total (Pacotes): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Sobrecarga de Pedidos de Ficheiro (Pacotes): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Sobrecarga de Trocas de Fontes (Pacotes): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Sobrecarga do Servidor (Pacotes): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Sobrecarga na Kad (Pacotes): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Sobrecarga criptográfica (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Uploads Activos: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Uploads Em Espera: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Total de sessões de upload com sucesso: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Total de sessões de upload falhadas: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Tempo médio de envio: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Dados recebidos (Sessão (Total)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Fontes Encontradas: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Downloads activos (blocos): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Razão UL:DL da sessão (Total): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Taxa média de download (Sessão): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Taxa média de upload (Sessão): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Taxa máxima de download (Sessão): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Taxa máxima de upload (Sessão): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Religações: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Tempo Desde a Primeira Transferência: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Ligado Ao Servidor Desde: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Ligações Activas (estimativa): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Limite Máximo de Ligações Alcançado: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Média de Ligações (estimativa): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Pico de Ligações (estimativa): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Clientes"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Desconhecido: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtrados: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Banidos: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Total: %i Conhecidos: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Servidores Activos: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Servidores Falhados: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Total: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Servidores Removidos: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Servidores Filtrados: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Utilizadores em Servidores Activos: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Ficheiros em Servidores Activos: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Total de Utilizadores: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Total de Ficheiros: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Ocupação dos Servidores: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Número de Ficheiros Partilhados: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Tamanho total dos Ficheiros Partilhados: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Tamanho médio dos ficheiros: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Sistema Operativo"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Não recebido"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Ligações activas (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Indisponível"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Nunca"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Executar <exp> e sair."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "A processar por chave: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "A processar por ficheiro: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Este comando requer um argumento. Argumentos válidos: uma chave de ficheiro.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Número inválido\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6493,7 +7992,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6502,83 +8001,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "Escreva '%s' para obter mais ajuda.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "A transferir %s"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "O pedido falhou com um erro desconhecido."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operação com sucesso."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Falha no pedido com o seguinte erro: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Filtro de IP para clientes está %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Desactivado"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Activado"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Filtro para servidores está %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "O nível actual do filtro de IPs é %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Ligado a %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "A ligar"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "atrás de uma firewall"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6587,7 +8090,7 @@
 "\n"
 "Download:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6596,7 +8099,7 @@
 "\n"
 "Upload:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6605,7 +8108,7 @@
 "\n"
 "Clientes em espera:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6614,38 +8117,33 @@
 "\n"
 "Total de fontes:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "FicheiroPart"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Número de resultados: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Progresso da pesquisa: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Progresso da pesquisa indisponível"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Recebida resposta desconhecida do servidor, instrução %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Mostrar informação curta de estado."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 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:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Mostrar a árvore de estatísticas completa."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6659,11 +8157,11 @@
 "\n"
 "Exemplo: 'statistics 5' exibirá apenas as 5 versões de topo para cada tipo de cliente.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Terminar o aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6673,35 +8171,35 @@
 "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:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Recarrega o objecto."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Recarrega a lista de ficheiros partilhados."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Recarrega a tabela de filtros de IP a partir do ficheiro."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Recarrega a tabela de filtros de IPs actual."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Actualiza a tabela de filtros de IPs a partir do URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 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:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Religar à rede."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6713,35 +8211,35 @@
 "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:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Ligar apenas à eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Ligar apenas à Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Desligar da rede."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Desligar apenas da eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Desligar apenas da Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 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:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6760,51 +8258,51 @@
 "serão adicionados à lista dos servidores \n"
 "A ligação magnet tem de conter a chave eD2k e o tamanho do ficheiro.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Definir um valor de preferência."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Definir preferências do filtro de IPs."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Activar o filtro de IPs para servidores e clientes."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Desactivar o filtro de IPs para clientes e servidores."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Activar/Desactivar filtro de IPs para clientes."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Activar filtro de IPs para clientes."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Desactivar filtro de IPs para clientes."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Activar/Desactivar filtro de IPs para servidores."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Activar filtro de IPs para servidores."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Desactivar filtro de IPs para servidores."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Seleccionar nível de filtragem de IPs."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6812,60 +8310,74 @@
 "Níveis de filtragem válidos pertencem ao intervalo 0-255 e\n"
 "o valor padrão (inicial) é 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Definir limites de largura de banda."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Definir limite de largura de banda de upload."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "O valor dado nestes comandos deve ser em kilobytes/s.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Definir limite de largura de banda de download."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Activar/desactivar autenticação utilizador/palavra-passe"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "O valor dado nestes comandos deve ser em kilobytes/s.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Obter e exibir um valor de preferência."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Obter preferências do filtro de IPs."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Obter estado do filtro de IPs para clientes e servidores."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Obter estado do filtro de IPs para clientes."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Obter estado do filtro de IPs para servidores."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Obter nível de filtragem de IPs."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Obter limites de largura de banda."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Faz uma pesquisa."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6884,39 +8396,44 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Faz uma pesquisa global."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Faz uma pesquisa local"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Faz uma pesquisa na Kad"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
 msgstr "Mostra os resultados da última pesquisa."
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Mostra os resultados da pesquisa anterior.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Apresenta o progresso da pesquisa."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Apresenta o progresso de uma pesquisa.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Começar a transferir um ficheiro"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6924,81 +8441,81 @@
 "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:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Pausar download."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Continuar download."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Cancelar download."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Estabelecer a prioridade."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Estabelecer a prioridade como Baixa."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Estabelecer a prioridade como Normal."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Estabelecer a prioridade como Alta."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Estabelecer a prioridade como Automática."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Mostrar filas/listas."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Mostrar fila de saída."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Mostrar fila de entrada."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Mostrar o relatório."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Mostrar lista de servidores."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Recarrega a lista de ficheiros partilhados."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Apagar o relatório."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Comando obsoleto, passe a usar '%s'."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7007,255 +8524,278 @@
 "Este é um comando obsoleto, e poderá ser retirado no futuro.\n"
 "Passe a usar '%s'.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Cliente de texto do aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "A eliminar o ficheiro: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "A eliminar o ficheiro: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "A continuar uploads do ficheiro: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Confirmação Necessária"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Só são suportadas 99 categorias"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Demasiadas categorias!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Todos os outros"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Seleccione o filtro de exibição"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Adicionar categoria"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Editar categoria"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Remover categoria"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Conjunto de chaves pedido para ficheiro desconhecido: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Seleccione quem pode pedir a lista dos seus ficheiros partilhados."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "A continuar uploads do ficheiro: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "A suspender upload do ficheiro: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "A execução do comando `%s' no evento `%s' falhou."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "A execução do comando '%s' no evento '%s' falhou."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Download concluído"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "O caminho completo para o ficheiro."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "O nome do ficheiro sem a parte do caminho."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "A chave eD2k do ficheiro."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "O tamanho do ficheiro em bytes."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Tempo cumulativo de download."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Nova sessão de conversa iniciada"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Remetente de mensagem."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Falta de espaço"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Partição de disco."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Erro ao completar"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "A processar o ficheiro número %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Ficheiro inexistente!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, o criador de ligações eD2k do aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Bem-vindo!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Parâmetros de entrada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Ficheiro para gerar chave"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Adicionar URLs Opcionais para este ficheiro"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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 "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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Remover"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Criar a ligação com chaves de partes"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Chave MD4 do ficheiro"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "Chave eD2k do ficheiro"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "Ligação eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Gravar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Abrir"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Gravar como"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Gravar a ligação eD2k calculada para um ficheiro"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Acerca do aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Não é possível abrir a área de transferência"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Nada a copiar por agora!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Não é possível abrir "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Por favor, insira um nome de ficheiro"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Nada a gravar por agora!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7275,162 +8815,159 @@
 "\n"
 "Distribuído sob a licença GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "A gerar chaves..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "O aLinkCreator está a trabalhar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "A calcular chave MD4..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "A calcular chave eD2k..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Cancelado !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Concluído em %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Já adicionou este URL!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Por favor, insira um URL"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Não é possível abrir %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02um %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02um %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02um %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f kB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, Estatísticas Online do aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Limpar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistema"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Parar Actualização Automática"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Gravar imagem das Estatísticas Online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Imprimir a imagem de Estatísticas Online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Definição de preferências"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Acerca do wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Iniciar a Actualização Automática"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Actualização Automática parada"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Actualização automática iniciada"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Gravar a Imagem de Estatísticas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Estatísticas Online do aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7438,11 +8975,11 @@
 "Ocorreu um erro ao imprimir.\n"
 "Talvez a sua impressora actual não esteja bem configurada."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "A imprimir"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7460,402 +8997,560 @@
 "\n"
 "Distribuído sob a licença GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh Oh, o aMule não esta em execução..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "O aMule está em execução"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "O aMule está a funcionar mas está desligado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "O aMule está a ligar..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh Oh, o estado do aMule é desconhecido..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " está em execução há "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " está parado !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " não está ligado !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " está a ligar..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " está a fazer algo estranho, verifique!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " está ligado a "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "parado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " está em "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " com "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Download Total: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Upload: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Download na Sessão: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Download: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "A partilhar: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " ficheiro(s). Clientes na fila de espera: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Hora: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " no "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Tempo de funcionamento do sistema: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Pasta que contém o ficheiro amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Intervalo de actualização em segundos"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Transferir periodicamente a imagem das estatísticas para o servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "URL do FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Caminho do FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Insira aqui o URL do seu servidor FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Utilizador"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Intervalo de actualização do FTP em minutos"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Validar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Pasta que contém o seu ficheiro de assinatura"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Pasta onde se gera a imagem das estatísticas"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Carrega o modelo <exp>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Porto HTTP do servidor web"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 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:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Porto UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Usar compressão gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Palavra-passe de acesso total para o servidor web"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Palavra-passe de convidado para o servidor web"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Permitir acesso de convidado"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Negar acesso de convidado"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 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:291
+#: src/webserver/src/WebInterface.cpp
 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:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Desactivar o interpretador PHP (obsoleto)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Recompilar as páginas PHP em cada pedido"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Servidor Web do aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "Ligação de cliente web aceite\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 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:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "O pedido falhou com o seguinte erro: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Ficheiro de índice não encontrado: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "A sessão expirou - a pedir entrada no sistema\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sessão ok, dentro do sistema\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sessão ok, fora do sistema\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 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:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sessão criada - a pedir entrada no sistema\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "A processar pedido original: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 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:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "A verificar a palavra-passe\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Chave da palavra-passe inválida\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Palavra-passe correcta\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Palavra-passe incorrecta\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Saída do sistema pedida\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "A processar pedido redireccionado: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "A ligação falhou "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Enviado"
+#~ msgid "Ratio"
+#~ msgstr "Classificação"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Não foram encontrados ficheiros partilhados no directório: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Alterar Idioma"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "Indisponível"
+
+#~ msgid "User name"
+#~ msgstr "Nome de utilizador"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Partes Obtidas"
+
+#~ msgid "Available Parts"
+#~ msgstr "Partes Disponíveis"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Encontrado %i ficheiro partilhado conhecido, %i desconhecido"
+#~ msgstr1 "Encontrados %i ficheiros partilhados conhecidos, %i desconhecidos"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Ficheiro não encontrado."
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Servidor Remoto"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Servidor Local"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Entrada inválida na lista de ficheiros conhecidos, o ficheiro pode estar corrompido"
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "A gravar Ficheiro Parcial %u de %u"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ 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 %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Filtrar Resultados"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Marcar como ficheiro conhecido"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Percentagem dos ficheiros totais"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Inicialização"
+
+#~ msgid "New node"
+#~ msgstr "Novo nó"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Mais"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Arrancar a partir de \n"
+#~ "clientes conhecidos"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Ligar a qualquer servidor e/ou Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Desligar Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Cancela as tentativas de ligação actuais"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Desligar das redes presentemente ligadas"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Ligar às redes presentemente activadas"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Ordenar ficheiros automaticamente (pode consumir muito CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "O aMule ordenará as colunas na sua lista de transferências automaticamente"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Rejeitar pacotes se o IP do cliente é diferente do IP de onde o pacote é recebido. Usar com cautela."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Mostra os resultados da pesquisa anterior.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Apresenta o progresso de uma pesquisa.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Ligação fechada - provavelmente o aMule foi terminado."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Verificar nova versão no arranque"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Ligação eD2k: "
+
+#~ msgid "Commit"
+#~ msgstr "Adicionar"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: a fazer fork para segundo plano - adeus"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Website: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Fórum: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Website: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Fórum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Enviado"

amule-3.0.1.tar.gz/po/ro.po -> amule-3.1.0.tar.gz/po/ro.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:18+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:03+0000\n"
 "Last-Translator: Angelescu Constantin <titus0818@yahoo.com>\n"
 "Language-Team: English <kde-i18n-doc@kde.org>\n"
 "Language: ro\n"
@@ -20,71 +20,159 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Arată aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "control distant aMule"
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Variantă versiune:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Client p2p bazat pe eMule pentru toate platformele \n"
+"\n"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Drept de autor (c) 2003-2019 Echipa aMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Părți din aMule sunt bazate pe \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Rutare P2P bazată pe XOR metric.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Drept de autor (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Site web:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Forum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Verifică la pornire dacă au apărut versiuni noi"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Se conectează la Kad..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Utilizați o versiune învechită de aMule!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Indisponibil"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Adaugă un prieten"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Trebuie să introduceți un IP valid și un port!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informații"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Indexul utilizator specificat nu este valid!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "Add aMule to your application menu?"
 msgstr "După numele aplicației"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Conectare eșuată"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -93,83 +181,161 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+msgid "Failed to open ED2KLinks file."
+msgstr "A eșuat deschiderea fișierului legătură eD2k."
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr "ATENȚIE: Nu vă puteți adăuga ca sursă pentru o legătură eD2k cât timp aveți lowid."
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "dialogul aMule distrus"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Fișierul index nu a fost găsit:"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "A eșuat preluarea fișierelor partajate de la utilizatorul '%s'"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "Nu au fost găsite fișiere partajabile în directorul: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
 msgstr0 ""
 msgstr1 ""
 msgstr2 ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "EROARE"
-
-#: src/amuleAppCommon.cpp:179
-msgid "Failed to open ED2KLinks file."
-msgstr "A eșuat deschiderea fișierului legătură eD2k."
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Nu se poate converti legătura magnet la eD2k: %s"
 
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
-msgstr "ATENȚIE: Nu vă puteți adăuga ca sursă pentru o legătură eD2k cât timp aveți lowid."
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Legătură eD2k nevalidă! EROARE: %s"
 
-#: src/amule.cpp:251
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Acum, se oprește aplicația principală..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Se termină instanța amuleweb cu pid '%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Se omoară instanța amuleweb cu pid '%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Eșuat"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Se termină instanța amuleweb cu pid '%d' ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Se omoară instanța amuleweb cu pid '%d' ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule la ieșire: Se închide nucleul."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "aMule închidere terminată."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Rezultatele depanării memoriei pentru ieșirea aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Limba dumneavoastră a fost schimbată la cea implicită a sistemului datorită schimbării configurației. Regretăm."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -177,56 +343,109 @@
 "\n"
 "configurație EC"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Configurarea parolei și conexiunile externe sunt activate."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "ATENȚIE"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "S-a găsit %i server în server.met"
+msgid "Loading temp files"
+msgstr "Se încarcă fișierul temporar de la %s."
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Se încarcă fișierul temporar de la %s."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Reîncărcați fișierele partajate"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Reîncărcați fișierele partajate"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Începe"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Rețele"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Rețele"
+msgid "eD2k server list (server.met)"
+msgstr "S-a găsit %i server în server.met"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "server web rulând pe pid %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "Ați solicitat să ruleze la pornire serverul web, dar fișierul binar amuleweb nu poate fi rulat. Instalați pachetul care conține serverul web aMule, sau compilați aMule utilizând --enable-webserver și apoi rulați make install"
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "EROARE"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "server web rulând pe pid %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Ați solicitat să ruleze la pornire serverul web, dar fișierul binar amuleweb nu poate fi rulat. Instalați pachetul care conține serverul web aMule, sau compilați aMule utilizând --enable-webserver și apoi rulați make install"
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nu se pot lega porturile la adresa specificată: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Portul %u nu este disponibil. Veți fi LOWID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -241,48 +460,48 @@
 "\n"
 "Verificați rețeaua pentru a vă asigura că portul este deschis pentru intrare și ieșire."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "A eșuat crearea fișierului Semnătură Online"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "A eșuat crearea fișierului aMule Semnătură Online"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr "Localizarea selectată se pare că nu este instalată pe computer. (Notă: Se va încerca configurarea acesteia oricum)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Aceasta este prima dată când rulați aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Această versiune este o versiune de testare, actualizată zilnic și\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "nu vă dăm nici un fel de garanție dacă nu se va strica nimic, ardeți-vă casa,\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "sau omorâți-vă câinele. Dar * ar trebui să fie * sigur de utilizat oricum.\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr "Mai multe informații, suport și versiuni noi pot fi găsite pe pagina noastră web,\n"
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "la https://amule-org.github.io, sau în canalul nostru IRC #aMule at irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Raportați orice fel de probleme la https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -290,594 +509,623 @@
 "Dosarul specificat pentru Semnătura Online NU ESTE VALID!\n"
 "Semnătura Online va fi DEZACTIVATĂ până va fi reparată problema în preferințe."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "S-a notificat numele serverului"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Prealocarea spațiului pe disc pentru fișierul '%s' a eșuat: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "EROARE: nu se poate deschide fișierul jurnal"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "ATENȚIE: fișierul jurnal este gol. Ceva este greșit."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Jurnalul a fost resetat"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Mesaj server: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr "Se omite descărcarea a %s, fiindcă fișierul solicitat nu este mai nou."
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "A eșuat descărcarea listei de noduri."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "A eșuat deschiderea fișierului de verificare a versiunii"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Fișierul de verificare a versiunii este corupt"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Utilizați o versiune învechită de aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr "Versiunea dumneavoastră de aMule este %i.%i.%i iar ultima versiune este %li.%li.%li"
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Ultima versiune poate fi găsită mereu la https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr "ATENȚIE: Versiunea dumneavoastră aMuled este învechită: %i.%i.%i < %li.%li.%li"
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Copia dumneavoastră aMule este actualizată."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "A eșuat descărcarea fișierului de verificare a versiunii"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Utilizatori: %s | Fișiere: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr "Utilizatori: E: %s K: %s | Fișiere: E: %s K: %s"
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Nu este selectată nicio rețea"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "cu LowID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "cu HighID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Conectat la %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectare la %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Deconectat de la eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad este pornit."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad este oprit."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Conectat la Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Conectat la Kad (prin firewall)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Deconectat de la Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr "Nu se poate utiliza rețeaua Kad dacă portul UDP este dezactivat în preferințe, nu se pornește."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Rețeaua Kad este dezactivată în preferințe, nu se conectează."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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 "EROARE: Demonul aMule nu poate fi utilizat când conexiunile externe sunt dezactivate. Pentru a se activa Conexiuni Externe, utilizați fie un aMule normal, se pornește amuled cu opțiunea --ec-config sau configurați cheia \"AcceptExternalConnections\" la 1 în fișierul ~/.aMule/amule.conf"
 
-#: src/amuled.cpp:145
+#: src/amuled.cpp
 #, fuzzy
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr "EROARE: Este necesară o parolă validă pentru utilizarea conexiunilor externe, iar demonul aMule nu se poate utiliza fără conexiuni externe. Pentru a rula demonul aMule, trebuie să configurați câmpul \"ECPassword\" în fișierul ~/.aMule/amule.conf cu o valoare corespunzătoare. Executați amuled cu marcajul --ec-config pentru configurarea parolei. Mai multe informații pot fi găsite la https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - se pornește temporizarea"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: se îndreaptă spre fundal - veți vedea"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Nu se poate crea fișierul Pid"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "EROARE: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Acesta este aMule %s bazat pe eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Rulând pe %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Vizitați https://github.com/amule-org/amule/releases/latest pentru a verifica dacă este disponibilă o nouă versiune."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "EROARE FATALĂ: A eșuat crearea temporizatorului"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "control distant aMule"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Variantă versiune:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Rețele"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Client p2p bazat pe eMule pentru toate platformele \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Căutări"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Site web: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Descărcări"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Fișiere partajate"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Site web: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Clienți"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Mesaje"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Drept de autor (c) 2003-2019 Echipa aMule \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistici"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Părți din aMule sunt bazate pe \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Preferințe"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Rutare P2P bazată pe XOR metric.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Drept de autor (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Mesaj server: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Mesaj"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Indisponibil"
+
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Ultima versiune poate fi găsită mereu la https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "dialogul aMule distrus"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Se conecteză"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Se conectează"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Deconectat"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Prin firewall"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Conectat"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Se conectează"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Închis"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Anulare"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Oprește încercările curente de conectare"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versiune"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Deconectează"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Deconectează de la rețelele curent conectate"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Conectează"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adresă"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Conectează la rețelele activate curent"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Descriere"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "Jurnal aMule"
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "În: %.1f(%.1f) | Desc: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MO/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "În: %.1f | Desc: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Conectat)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Deconectat)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Sigur doriți să închideți %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Confirmare închidere"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Lansare comandă:"
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- implicit -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Directorul aspectului aplicației '%s' nu există"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "ATENȚIE: Nu se poate deschide fișierul aspect '%s' pentru citit"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Rețele"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Fereastra rețelelor"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Căutări"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Fereastra căutărilor"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Descărcări"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Fereastra descărcărilor"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Fișiere partajate"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Fereastra fișierelor partajate"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Mesaje"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Fereastra rețelelor"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Fereastra mesajelor"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistici"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Fereastra graficului statisticilor"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Preferințe"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Fereastra configurare preferințe"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importă"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Unealta de importat fișiere parțiale"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Despre"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Despre/Ajutor"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Rețea eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Rețea Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Nicio rețea"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "control la distanță aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Eroare fatală: Nu s-a putut crea temporizatorul nucleului"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Conectare la amule distant"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Conexiune pierdută"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Arată la ieșire"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Eroare fatală: A eșuat crearea Poll Timer"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Se merge la bucla evenimentului..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Conectare..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "GUI distant rezolvare eveniment EC"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "Conectare eșuată. Nu se poate conecta la %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Se închide"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Conexiune închisă - aMule a terminat probabil."
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Încercarea conectării la %s (%s:%i) a expirat."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Dezactivat"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Conectare la rețea."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Conectare eșuată. Nu se poate conecta la %s:%d\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Pregătit"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Toate"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Indisponibilă"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Fișierul nu este găsit."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Legătură nevalidă sau care este deja în listă."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Dosar pentru fișiere descărcate temporar"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr "Nu se poate crea directorul '%s' pentru categoria '%s', se păstrează directorul '%s'."
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "A eșuat preluarea fișierelor partajate de la utilizatorul '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Se caută parteneri pentru conexiunea lowid"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Versiune eMule falsă %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (eMule fals)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (eMule fals)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (bazat pe eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Nume Nick: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Solicitat: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
@@ -885,7 +1133,7 @@
 msgstr1 "Stare fișiere pentru această sesiune: Acceptate %d din %d solicitate, %s transferate\n"
 msgstr2 "Stare fișiere pentru această sesiune: Acceptate %d din %d solicitate, %s transferate\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
@@ -893,119 +1141,201 @@
 msgstr1 "Stare fișiere pentru toate sesiunile: Acceptate %d din %d solicitate, %s transferate\n"
 msgstr2 "Stare fișiere pentru toate sesiunile: Acceptate %d din %d solicitate, %s transferate\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Solicitat fișier necunoscut"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Mesaj filtrat de la '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Mesaj nou de la '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Utilizatorul %s (%u) a solicitat lista fișierelor partajate pentru un director inexistent '%s' -> se ignoră"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "A eșuat preluarea fișierelor partajate de la utilizatorul '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "ATENȚIE: %s nu poate fi deschis."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "ATENȚIE: S-a anulat lista de fișiere coruptă, conține antet nevalid."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Eroare IO în timpul citirii fișierului %s : %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Eroare în timpul salvării fișierului %s : %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Introduceți Captcha"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Categorie"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Categorie nouă"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Alegeți un dosar pentru fișierele primite"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Trebuie să specificați un nume pentru categorie!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Trebuie să specificați o cale pentru categorie!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr "A eșuat crearea directorului de primire pentru categorie. Specificați o cale validă!"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "A pornit sesiunea de chat: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Conectat la client ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Se conectează la client ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** A eșuat conectarea la client / Conexiune pierdută ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr "*** Ați trecut verificarea captcha iar utilizatorul a primit mesajul dumneavoastră. ***"
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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 "*** Răspunsul la verificarea captcha a fost greșit iar mesajul dumneavoastră a fost ignorat. Puteți solicita o nouă verificare captcha pentru a trimite un mesaj nou. ***"
 
-#: src/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Discuție"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Închide tab"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Închide toate ferestrele"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Închide alte ferestre"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Adaugă la prieteni"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Arată &Detaliile"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Elimină dintre prieteni"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Stabilește slot prieten"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Vizualizare fișiere"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Trimite mesaj"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Trimite mesaj utilizatorului"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Mesaj de trimis:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Nu vă este permis să configurați mai mult de un slot prieten.\n"
+"A fost alocat numai un singur slot."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Selecții multiple"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Elimină dintre prieteni"
+msgstr1 "Elimină dintre prieteni"
+msgstr2 "Elimină dintre prieteni"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Reîncarcă lista fișierelor partajate."
+msgstr1 "Reîncarcă lista fișierelor partajate."
+msgstr2 "Reîncarcă lista fișierelor partajate."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
@@ -1013,7 +1343,7 @@
 msgstr1 "Fișierul credit este încărcat, %u clienți sunt cunoscuți"
 msgstr2 "Fișierul credit este încărcat, %u de clienți sunt cunoscuți"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
@@ -1021,160 +1351,271 @@
 msgstr1 " - Credit expirat pentru %u clienți!"
 msgstr2 " - Credit expirat pentru %u de clienți!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Nu s-a găsit niciun fișier 'cryptkey.dat' , se creează."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Detalii client"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Activat"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Susținut"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Nu este susținut"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Dezactivat"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Conectat"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Deconectat"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Name"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Adresă IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Origine"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Ultima recepție"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Versiune"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Viteză încărcare"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Viteză descărcare"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Încărcat"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Descărcat în total:"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Modificator De/În"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Semnătură online"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Nu este finalizat"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Utilizator rău"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Verificat - ok"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "NU SE APLICĂ"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Indisponibilă"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Fișiere"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Încărcat"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Descărcat"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Se descarcă"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Se încarcă"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Activă"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Necunoscut"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Utilizatorul %s (%u) solicită lista fișierelor partajate -> Acceptat"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Utilizatorul %s (%u) solicită lista fișierelor partajate -> Interzis"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Utilizatorul %s (%u) solicită lista directoarelor partajate -> Acceptat"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Utilizatorul %s (%u) solicită lista directoarelor partajate -> Interzis"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "Utilizatorul %s (%u) solicită lista fișierelor partajate pentru directorul '%s' -> acceptat"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "Utilizatorul %s (%u) solicită lista fișierelor partajate pentru directorul '%s' -> interzis"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Utilizatorul %s (%u) partajează directorul '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Utilizatorul %s (%u) trimite directoare partajate nesolicitate."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "Utilizatorul %s (%u) trimite lista fișierelor partajate pentru directorul '%s'"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "Utilizatorul %s (%u) a finalizat trimiterea listei fișierelor partajate"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Utilizatorul %s (%u) trimite o listă de fișiere nedorită"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "Utilizatorul %s (%u) interzice accesul la lista directoarelor/fișierelor partajate"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Comentarii fișier"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Utilizator"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Denumire fișier"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Evaluare"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Comentariu"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Nu se poate face o căutare Kad dacă nu rulează Kad"
+
+#: src/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "Se caută parteneri pentru conexiunea lowid"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Fără comentarii"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
@@ -1182,409 +1623,416 @@
 msgstr1 "%u comentarii"
 msgstr2 "%u de comentarii"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr "Client interzis %s pentru trimiterea %s date corupte a %s total pentru fișierul '%s'"
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "A eșuat încărcarea datei țării pentru '%s'."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Automat Sc"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Automat No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Automat În"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Foarte joasă"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Joasă"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Înaltă"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Foarte ridicat"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Versiune"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Se solicită"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Se conectează prin server"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Coadă plină"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "În coadă"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Se descarcă"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Se primesc indexări"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Nu sunt părți necesare"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Nu se poate conecta LowID la LowID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Prea multe conexiuni"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Conectare prin Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Prea multe conexiuni Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Interzis"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Eroare de conexiune"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Coadă distantă este plină"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Vechiul MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Noul MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Compatibil eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Server local"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Server distant"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Schimb surse"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Pasiv"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Legătură"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Semințe sursă"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Rezultat căutare"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Terminat"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "În curs"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "EROARE: Spațiu disc insuficient"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "EROARE: Nu s-a găsit partmet"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "EROARE: Eroare IO!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "EROARE: Eșuare!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "În coadă"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Deja se descarcă"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Format fișier temporar necunoscut sau greșit."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Parte"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Transferat"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Viteză"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Progres"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Surse"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioritate"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Stare"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Timp rămas"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Văzut complet ultima dată"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Ultima recepție"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Sigur doriți să ștergeți fișierul selectat?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Sigur doriți să ștergeți fișierele selectate?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Feedback de la: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automat"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Anulare"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Stop"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pauză"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Reluare"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "C&urăță terminate"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Schimbă acum fiecare A4AF la acest fișier"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Schimbă fiecare A4AF la acest fișier (automat)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Schimbă acum fiecare A4AF la oricare fișier"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Opțiuni extinse"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Previzualizează"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Arată fișierele & detaliile"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Arată toate comentariile"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Copiază URI magnet în memoria temporară"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Coiază link-ul eD2k în memoria temporară"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Copiază feedback-ul în memoria temporară"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Obține %s pentru acest fișier"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "neatribuit"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Atribuit la categoria"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Deshide fișierul"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Sigur doriți să ștergeți fișierul selectat?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Sigur doriți să ștergeți fișierele selectate?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Feedback de la: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Introduceți noul nume pentru acest fișier:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Redenumire fișier"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Descărcări (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Pentru a preveni apariția acestui avertisment la fiecare previzualizare,\n"
-"configurați în preferințe playerul video preferat (implicit este %s)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Previzualizare fișier"
+msgid "Downloads (%i)"
+msgstr "Descărcări (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "EROARE: A eșuat execuția playerului media extern! Comanda: `%s'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Total DE: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Se salvează fișierul parțial %u of %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Toate fișierele parțiale au fost salvate."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Se încarcă fișierul temporar de la %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Se încarcă fișierul parțial %u of %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "EROARE: A eșuat încărcarea fișierului de backup. Căutați pe https://github.com/amule-org/amule/discussions soluții de recuperare pentru .part.met"
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Toate fișierele parțiale sunt încărcate."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Nu s-au găsit fișiere parțiale"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
@@ -1592,45 +2040,45 @@
 msgstr1 "S-au găsit %u fișiere parțiale"
 msgstr2 "S-au găsit %u de fișiere parțiale"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Sistemul de fișiere pentru directorul temporar nu poate manipula fișiere mari."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Sistemul de fișiere pentru directorul de intrare nu poate manipula fișiere mari."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Se descarcă %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Deja încercați să descărcați fișierul '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Deja aveți fișierul '%s'"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Deja aveți fișierul '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Deja încercați să descărcați fișierul %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Nu se poate converti legătura magnet la eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Protocol necunoscut pentru legătura: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
@@ -1638,238 +2086,320 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Legătură eD2k nevalidă! EROARE: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Clientul a trimis pachetul după eșuarea autentificării."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Conexiune externă închisă."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Conexiunile externe sunt dezactivate datorită lipsei parolei!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Conexiunile externe sunt dezactivate în fișierul de configurare"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Conexiune externă nouă acceptată"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "EROARE: nu se poate accepta o nouă conexiune externă"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Conexiunea externă este refuzată datorită lipsei parolei în preferințe!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Se conectează clientul: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Versiune necunoscută"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "Incorecta EC versiune ID, poate fi o incompatibilitate de aplicații. Utilizați nucleul și aplicația distantă de la aceiași versiune."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "Nu vă puteți conecta la o versiune lansată dintr-o versiune în dezvoltare arbitrară! *uf* se pot preveni disfuncțiile"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Versiune protocol nevalidă."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Lipsește eticheta versiunii protocolului."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Se va reîncerca conectarea automată la server în %d secundă"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Autentificare eșuată: indexul specificat este nevalid ca parolă EC."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Autentificare eșuată: parolă greșită."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Autentificare eșuată: lipsă parolă."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Solicitare nevalidă, autentificați-vă întâi."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Acces asigurat."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Trimite mesajul de eroare \"%s\" la client."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Încercare neautorizată de acces de la %s. Conexiune închisă."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "A eșuat comanda distantă a fișierului parțial: Nu a fost găsit fișierul index: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Indexul fișierului  nu este găsit: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! Eroare la procesarea OpCode!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Serverul nu este adăugat"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "serverul nu este găsit: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "trebuie să definiți un server pentru a fi eliminat"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k este dezactivat în preferințe."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Fișierul nu este găsit."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Fișierul nu este găsit."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Căutare în desfășurare. Se readuc rezultatele imediat!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Nu are nici un sens căutarea web de pe interfața distantă."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Căutare în desfășurare. Se readuc rezultatele imediat!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Nici un punct pentru grafic."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Clientul dumneavoastră nu este configurat pentru acest nivel detaliat."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Conexiune externă: închidere solicitată"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Deja se închide."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Conexiune externă: se adaugă legătura '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Legătură nevalidă sau care este deja în listă."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Fișierul nu este găsit."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Nume fișier nevalid."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Nu se poate redenumii fișierul."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Închide această sesiune de chat."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "O nouă sesiune chat este pornită"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Închide această sesiune de chat."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad este dezactivat din preferințe."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Nume necunoscut)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad este dezactivat din preferințe."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Deja este conectat la eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Se conectează la eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Deja este conectat la Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Se conectează la Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Toate rețelele sunt dezactivate."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Deconectat de la eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Deconectat de la Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Conexiune externă: S-a primit un opcode nevalid: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Opcode nevalid (versiune protocol greșită?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Extensie necunoscută '%s' pentru comanda '%s' .\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Comandă necunoscută '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1877,7 +2407,7 @@
 "\n"
 "Această comandă nu poate avea un argument.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1885,7 +2415,7 @@
 "\n"
 "Această comandă trebuie să aibă un argument.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1893,7 +2423,7 @@
 "\n"
 "Această comandă este incompletă, trebuie să utilizați una dintre extensiile de mai jos.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1901,11 +2431,11 @@
 "\n"
 "Extensii disponibile:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Comenzi disponibile:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1916,17 +2446,17 @@
 "Toate comenzile nu sunt sensibile la majuscule.\n"
 "Tastați '%s <comandă>' pentru a obține informații detaliate la <comandă>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Ieși din aplicație."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Arată ajutorul."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1934,7 +2464,7 @@
 "Pentru a obține ajutor la o comandă, tastați 'help <comandă>'.\n"
 "Pentru a obține lista completă a comenzilor tastați 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1945,46 +2475,46 @@
 "Utilizați '%s' pentru lista de comenzi\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Eroare sintaxă!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "Eroare la procesarea comenzii - nu ar trebui să se întâmple! Raportați defectul\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Această comandă nu ar trebui să aibă niciun parametru."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Comanda trebuie să aibă un parametru."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Argument nevalid."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Aceasta este o comandă incompletă."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Tastați '%s' pentru a obține mai mult ajutor.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Aceasta este %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Aceasta este %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1992,7 +2522,7 @@
 "\n"
 "Se creează clientul...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2001,7 +2531,7 @@
 "\n"
 "Ok, se iese %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2013,118 +2543,361 @@
 "Trebuie să specificați o parolă fie în fișierul de configurare\n"
 "sau în linia de comandă, sau introduceți una când se solicită.\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Arată acest text de ajutor."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Gazda unde aMule rulează. (implicit: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Portul aMule pentru conexiunea externă. (implicit: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Parolă conexiune externă."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Citește configurația din fișier."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Nu tipării nicio ieșire la stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Fi detaliat - arată și mesajele de depanare."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Configurează localizarea programului (limba)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Scrie opțiunile liniei de comandă la fișierul de configurare."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Creează fișierul de configurare bazat pe fișierul de configurare al aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Tipărește versiunea programului."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Detalii fișier"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% realizat"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Previzualizare fișier"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "EROARE: A eșuat execuția playerului media extern! Comanda: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "EROARE: A eșuat deschiderea fișierului parțial '%s'"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Bine ați venit!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Se conectează la persoane"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Stare conexiune:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Rețele"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Port TCP standard"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Port UDP extins (Kad / căutare globală)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Activează UPnP pentru înaintare port ruter"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Bootstrap"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Deja încercați să descărcați fișierul %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Actualizează automat lista serverelor la pornire"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Dosar destinație pentru descărcări"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Navigare"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Dosar pentru fișiere descărcate temporar"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "A eșuat deschiderea fișierului listă prieteni 'emfriends.met' pentru citit!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "A eșuat deschiderea fișierului listă prieteni 'emfriends.met' pentru scris!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "CRITIC - niciun client în StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Prieteni"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Arată &Detaliile"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Adaugă un prieten"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Elimină prieten"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Trimite &Mesaj"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Vizualizare fișiere"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Stabilește slot prieten"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Sigur doriți să eliminați prietenul selectat?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Sigur doriți să eliminați prietenii selectați?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2132,200 +2905,176 @@
 "Nu vă este permis să configurați mai mult de un slot prieten.\n"
 "A fost alocat numai un singur slot."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Selecții multiple"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Nu vă este permis să configurați mai mult de un slot prieten.\n"
-"A fost alocat numai un singur slot."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Trimite mesaj utilizatorului"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Mesaj de trimis:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Elimină dintre prieteni"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Trimite mesaj"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Schimbă la acest fișier"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "În coadă: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Întrebat de un alt fișier"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Se așteaptă slotul de încărcare"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "În coadă: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Se încarcă"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Niciunul"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Nu"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Da"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "A eșuat deschiderea %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Se descarcă..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "Descărcare HTTP anulată"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "Adresa URL de descărcat nu poate fi goală"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "A eșuat preluarea fișierelor partajate de la utilizatorul '%s'"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Dosar pentru fișiere descărcate temporar"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Descărcat %d octeți"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "The URL %s returned: %i"
 msgstr "Adresa URL %s a returnat: %i - Eroare (%i)!"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Descărcare HTTP anulată"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Se descarcă un nou fișier GeoIP.dat de la %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "Descărcarea fișierului GeoIP.dat a eșuat, se abandonează actualizarea."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "A eșuat eliminarea fișierului %s , se abandonează actualizarea."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "A eșuat redenumirea fișierului %s file, se abandonează actualizarea."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "Actualizat cu succes %s"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Error updating %s"
 msgstr "Eroare la actualizarea GeoIP.dat"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "A eșuat descărcarea %s de la %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "A eșuat încărcarea datei țării pentru '%s'."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Se încarcă filtrele 'ipfilter.dat' și 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "A eșuat încărcarea fișierului ipfilter.dat '%s', s-a întâlnit un format necunoscut."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "A eșuat încărcarea fișierului ipfilter.dat '%s', nu se poate deschide fișierul."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
@@ -2333,7 +3082,7 @@
 msgstr1 "S-au încărcat %u intervale IP de la '%s'."
 msgstr2 "S-au încărcat %u de intervale IP de la '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
@@ -2341,66 +3090,73 @@
 msgstr1 "%u linii incorecte au fost descărcate."
 msgstr2 "%u de linii incorecte au fost descărcate."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "A eșuat redenumirea fișierului nou %s , se abandonează actualizarea."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "Filtrul IP este gata"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap de la \n"
-"clienți cunoscuți"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Curentul"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Medie rulare"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Medie sesiune"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Noduri (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Ip nevalid pentru bootstrap"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Port nevalid la bootstrap"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Completați toate câmpurile solicitate"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Mesaj"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "Sigur doriți să descărcați un nou fișier nodes.dat?\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Procedând astfel veți elimina nodurile curente și veți reporni conexiunea Kademlia."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Se continuă?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: cuvântul cheie căutat este prea scurt"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: Cuvântul cheie căutat este deja în lista de căutare:"
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "A eșuat citirea fișierului nodes.dat - prea vechi. Această versiune (0) nu mai este suportată."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
@@ -2408,12 +3164,11 @@
 msgstr1 "S-au citit %u contacte Kad"
 msgstr2 "S-au citit %u de contacte Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Nu s-au găsit contacte, bootstrap, sau descărcați un fișier nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
@@ -2421,7 +3176,7 @@
 msgstr1 "Sunt disponibile numai %d contacte Kad, nodes.dat nu s-a scris"
 msgstr2 "Sunt disponibile numai %d de contacte Kad, nodes.dat nu s-a scris"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
@@ -2429,694 +3184,1036 @@
 msgstr1 "S-au scris %d contacte Kad"
 msgstr2 "S-au scris %d de contacte Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Rețea Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Denumire fișier"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Dimensiune fișier"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Rată de partajare"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Încărcat"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Cerut"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Acceptat"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Surse complete"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "ATENȚIE: Lista de fișiere cunoscute este coruptă, conține antet nevalid."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "A eșuat încărcarea intrării în lista de fișiere cunoscute, fișierul poate fi corupt"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Intrare nevalidă în lista de fișiere cunoscute, fișierul poate fi corupt:"
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Valoare implicită a sistemului"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albaneză"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabă"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturian"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Bască"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgară"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Catalană"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Chineză (Simplificat)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Chinez (tradițional)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Croată"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Cehă"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Daneză"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Olandeză"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Englez (U.K.)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Englez (U.K.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estonă"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finlandeză"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Franceză"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galiciană"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Germană"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grecesc"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Ebraică"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Maghiară"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italiană"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japoneză"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Koreană"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lituaniană"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvegian"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Poloneză"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugheză"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugheză (Brazilia)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Română"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Rusă"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slovenă"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Spaniolă"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Suedeză"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turcă"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ucraineană"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Eroare necunoscută %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Nu se poate obține descrierea erorii pentru eroarea %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Se indexează"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Finalizat"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Terminat"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Întrerupt"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Eronat"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Se așteaptă"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Trebuie să specificați o parolă."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Parolă nevalidă, nu este un index MD5!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Eșec la conectare"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Conexiune externă închisă."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "Conexiune EC eșuată. Răspuns gol."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Conexiune externă: Răspuns greșit, a eșuat strângerea de mână. Conexiune închisă."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Conexiune externă: Răspuns greșit, a eșuat strângerea de mână. Conexiune închisă."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Succes! Conexiune stabilită la aMule"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Succes! Conexiune stabilită."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Conexiune externă; Acces interzis fiindcă:"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Conexiune externă: A eșuat strângerea de mână."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Procesul Asio %d pornit"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "Ascultare socket: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "EROARE: Nu se poate asculta portul TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "EROARE:"
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "ATENȚIE:"
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Închide"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Taie"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Copiază"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Lipește"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Curăță"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Selectează tot"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Nelimitat"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Arată aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Ascunde aMule"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Conectat"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Conectat"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Conectat la Kad (prin firewall)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "IP server"
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "IP server:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Neconectat"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "port TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Port TCP: Nu este pregătit"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "port UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "port UDP: Nu este pregătit"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Informație client"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Limită încărcare"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Limită descărcare"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Arată aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Deconectează"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Ascunde aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Conectează"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Ieşire"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Nelimitat"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Meniul aMule din bara de sistem"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Limite viteză:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "ÎN: Fără"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "ÎN: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DE: Fără"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DE: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Viteză descărcare: %.1f"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Viteză încărcare: %.1f"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Poreclă: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Nu este selectată nicio poreclă!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID client:"
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Nume server:"
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP server"
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Nu este conectat"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Semnătură online: Activat"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Semnătură online: Dezactivat"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Timp conectare: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Fișiere partajate: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Clienți în coadă: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Total DE: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Total ÎN: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Legătură eD2k:"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Trimite"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Adaugă la nucleu un link eD2k sau magnet."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Adaugă la prieteni"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Apăsați aici pentru a adăuga legătura eD2k în controlul textului în coada de descărcare."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Evenimentele sunt afișate aici. Pentru o listă completă de evenimente, aveți referințe în jurnal în fila serverelor."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Se încarcă ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Numărul de utilizatori pe serverul la care sunteți conectat ..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Utilizatori: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Utilizatori conectați la serverul curent și o estimare a numărului total de utilizatori."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "În: 0.0 | Desc: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Media curentă a ratelor de încărcare și descărcare. Dacă activați numerele dintre paranteze semnifică comunicația globală cu clientul."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Afișează starea conexiunii și transferurile active. Săgețile roșii semnifică faptul că nu sunteți actualmente conectat, săgețile galbene semnifică că aveți low ID (prin firewall) iar săgețile verzi semnifică faptul că aveți high ID (Tipul optim de conexiune)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Nu este conectat ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Server conectat curent."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Căutare"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Name:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tip"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Parametrii extinși"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtrare"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Tipul fişierului"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Oricare"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Arhive"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "Imagini-CD"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Imagini"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programe"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Texte"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Videoclipuri"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Extensie"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Dimensiune minimă"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Baiți"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MO"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GO"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Dimensiune maximă"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Disponibilitate"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filtru:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Rezultate filtru"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filtru"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Inversează rezultatul"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Ascunde fișierele cunoscute"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Resetare câmpuri"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Începe"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Mai mult"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Extensie"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Oprește"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Descarcă"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Descarcă în categoria"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Rezultat căutare"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Resetare câmpuri"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Rezultate"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Curăță descărcările terminate"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filtru:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Surse fișier:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "General"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Nume complet :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "NU SE APLICĂ"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Nume complet"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met-File"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Index"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met-File :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Index :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Dimensiune fișier :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Stare fișier parțial :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Văzut ultima oară complet :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Dimensiune fișier"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Transfer"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "S-au găsit sursele :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Se transferă sursele :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Cantitate-fișiere parțiale :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Disponibil :"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Rată date :"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Timp activ de descărcare:"
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Transferat :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Dimensiune completă :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Stare fișier parțial"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Văzut ultima oară complet"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "S-au găsit sursele"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Se transferă sursele"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Cantitate-fișiere parțiale"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Disponibil"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Rată date"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Timp activ de descărcare"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Dimensiune completă"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Gestionare inteligentă a fișierelor corupte"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Pierdut la corupte :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Câștigat prin compresie :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Pachete salvate de I.C.H. :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Pierdut la corupte"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Câștigat prin compresie"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Pachete salvate de I.C.H."
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Partajare:"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Cereri"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Solicitări acceptate"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Date transferate"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Rată partajare"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Surse complete"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Fișiere partajate"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Încărcat: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Informație Kad"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Nu este apreciat"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Titlu"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Denumiri fișier"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Preluare"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Curățire"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Aplică"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Comentariu/evaluare fișier (textul va fi vizibil tuturor utilizatorilor)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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."
@@ -3124,1131 +4221,1246 @@
 "Pentru un film puteți spune lungimea, scenariul, limba ...\n"
 "iar dacă este un fals, puteți spune aceasta altor utilizatori de aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Calitatea fișierului"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Nu este apreciat"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Nevalid / Corupt / Fals"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Slab"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Corect"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Bun"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Excelent"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Alegeți evaluarea fișierului sau atenționați utilizatorii dacă fișierul este nevalid ..."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Deconectat de la Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Reîmprospătează"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Se descarcă, așteptați ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Mărime necunoscută"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Informație solicitată"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Adresă IP :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Informații suplimentare"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Nume utilizator:"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Index utilizator :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Index utilizator"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Adaugă"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Viteză-descărcare"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Curentul"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Medie rulare"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Medie sesiune"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Viteză-încărcare"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Conexiuni"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Descărcări active"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Conexiuni active (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Încărcări active"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Arbore statistici"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Utilizator:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Index utilizator:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Aplicație client:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Versiune client:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "adresă IP:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Aplicație client"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Versiune client"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "Id. utilizator"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "Id. utilizator:"
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP server"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP server:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Nume server"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Nume server:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Disimulare"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Disimulare:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Protocol disimulare"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Transferuri la client"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Solicitare curentă:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Rată medie de încărcare:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Rată medie de descărcare:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Încărcare (sesiune):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Solicitare curentă"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Rată medie de încărcare"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Rată medie de descărcare"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Încărcare (sesiune)"
 
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
 msgstr "Descărcare (sesiune)"
 
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
 msgstr "Încărcat (total)"
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Descărcat (total):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Descărcat (total)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Scoruri"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modificator De/În:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Identificare sigură:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Rang coadă:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Scor coadă:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Identificare sigură"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Rang coadă"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Scor coadă"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Nick"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - Mule multi-platformă"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Acesta este numele pe care ceilalți utilizatori îl va vedea când se va conecta la dumneavoastră."
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Limbă:"
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Întârzierea afișării sfaturilor."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Aceasta specifică limba utilizată la controale."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Verifică la pornire dacă au apărut versiuni noi"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Activând aceasta va face aMule să verifice după noi versiuni la pornire"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Pornește minimizat"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Activând aceasta face aMule să se minimizeze după pornire."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Arată la ieșire"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Face ca aMule să afișeze înainte de ieșire."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Activează miniatura în bara de sistem"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Aceasta activează/dezactivează miniatura de pe bara de sistem (sau bara de sarcini)."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Ascunde fereastra aplicației când este apăsat butonul de închidere"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimizează în bara de sistem"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Activând aceasta va face ca aMule să se minimizeze pe bara de sistem, mai degrabă decât în bara de sarcini."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Amintește aceste configurări"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Timp de întârziere balon de ajutor:"
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "secunde"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Selecție navigator"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Introduceți aici numele navigatorului. Lăsați acest câmp necompletat pentru utilizarea navigatorului implicit de sistem."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Navigare"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Deschide într-o fereastră nouă dacă este posibil"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Deschide pagina web într-o pagină nouă în schimbul unei ferestre noi când este posibil"
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Player video"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Limite lățime de bandă"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Încărcare"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Alocare slot"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Porturi"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Port TCP standard"
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Acesta este portul standard eD2k și nu poate fi dezactivat."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Port UDP pentru cererile serverului (TCP+3)"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Port UDP extins (Kad / căutare globală)"
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Acest port UDP este utilizat pentru solicitări extinse eD2k și rețeaua Kad"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Activează UPnP pentru înaintare port ruter"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "Port UPnP TCP (facultativ):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Leagă adresa locală la IP (gol pentru oricare):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 msgid "Advanced users only: If you have multiple network interfaces, enter the address of the interface to which aMule should be bound."
 msgstr "Numai pentru utilizatorii avansați: Dacă aveți mai multe interfețe de rețea, introduceți adresa interfeței la care aMule ar trebui să fie legat."
 
-#: src/muuli_wdr.cpp:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Leagă adresa locală la IP (gol pentru oricare):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Număr maxim de surse pe fișier descărcat:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Număr maxim de conexiuni simultane:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Conectare automată la pornire"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Reconectare la pierdere"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Elimină serverele moarte după"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "încercări"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Actualizează automat lista serverelor la pornire"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Listă"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Actualizează lista serverelor la conectarea la un server"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Actualizează lista serverelor când se conectează un client"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Utilizează prioritatea sistemului"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Utilizează verificarea inteligentă LowID la conectare"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Conectare sigură"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Conectează automat numai la serverele din lista statică"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Configurează serverele adăugate manual la prioritate înaltă"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Gestionare inteligentă a fișierelor corupte (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Activează"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr "I.C.H. avansat acordă încredere fiecărui index (nu este recomandat)"
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Adaugă fișiere la descărcare în modul pauză"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Adaugă fișiere la descărcare cu prioritate automată"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Încearcă să descarci întâi prima și ultima bucată"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Pornește următorul fișier pauzat când un fișier s-a terminat"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Din aceeași categorie"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "În ordine alfabetică"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Prealocare spațiu pe disc pentru noile fișiere"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Pentru noile fișiere se prealocă spațiu pe disc pentru întreg fișierul, astfel se reduce fragmentarea"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Oprește descărcarea când s-a atins limita spațiului disponibil"
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr "Selectați asta dacă doriți ca aMule să verifice spațiul liber pe disk"
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Introduceți aici minimum de spațiu pe disc dorit."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Salvează 10 surse de fișiere rare (< 20 surse)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Încărcări"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Adaugă noile fișiere partajate cu prioritate automată"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Dosar destinație pentru descărcări"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Gestionare inteligentă a fișierelor corupte (I.C.H.)"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Activează"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "I.C.H. avansat acordă încredere fiecărui index (nu este recomandat)"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Dosare partajate"
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Dosar pentru fișiere descărcate temporar"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Dosare partajate"
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Elimină"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Click dreapta pe miniatura dosarului pentru partajare recursivă)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Partajează fișierele ascunse"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Server distant"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Server local"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafice"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Întârziere actualizare : 5 secunde"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Timp pentru media graficului: 100 minute"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Scală grafic conexiuni: 100"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Scală grafic descărcare:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Scală grafic încărcare:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Colori:"
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Fundal"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Grilă"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Descărcare actuală"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Medie rulare descărcare"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Medie descărcare pe sesiune"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Încărcare actuală"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Medie rulare încărcare"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Medie încărcare pe sesiune"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Conexiuni active"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Miniatură rapidă pe bara de sistem"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Noduri Kad curente"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Noduri Kad care rulează"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Noduri Kad pe sesiune"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Selectează"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Arbore"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Număr de versiuni client arătate (0=nelimitat)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! ATENȚIE !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Maxim conexiuni noi /5 secunde"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "Rată interval actualizare FTP în minute"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "Rată interval actualizare FTP în minute"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Dimensiune fișier tampon: 240000 octeți"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Dimensiune coadă încărcare: 5000 clienți"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Interval reîmprospătare conexiune server: Dezactivat"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Dezactivează temporizarea modului de st-by al computerului"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Aspect interfață de utilizat:"
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Arată \"Manipulator linkuri rapide eD2k\" în fiecare fereastră."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Arată informații extinse în fila categoriilor"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Arată în titlu versiunea aplicației"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Arată rata de transfer în titlu"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Înaintea numelui aplicației"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "După numele aplicației"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Arată lățimea de bandă globală"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Orientare verticală a barei de unelte"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Descărcare coadă fișiere"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Arată procentul progresului"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Arată bara de progres"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plat"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Rotund"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Sortare automată fișiere (consum mare de CPU)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule va sorta automat coloanele în lista descărcărilor"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parametrii conexiune externă"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Acceptă conexiuni externe"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP a interfeței de ascultare:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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ți aici un ip valid în formatul a.b.c.d pentru ascultarea interfeței EC. Un câmp gol sau 0.0.0.0 va însemna orice interfață."
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "port TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Activează înaintarea portului UPnP pe portul EC"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Parolă"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Parametrii server web"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "port TCP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Se verifică parola\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Se verifică parola\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Interzice accesul oaspeților"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Parola de oaspete pentru serverul web"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Parametrii server web"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Rulează la pornire serverul web"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Șablon web"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Parolă cu drepturi depline"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Activează utilizatorul cu drepturi scăzute"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Parolă cu drepturi scăzute"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Activează înaintarea portului UPnP pe portul serverului web"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Port UPnP TCP server web (facultativ)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Timp reîmprospătare pagină (în secunde)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Activează compresia Gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Valoare implicită a sistemului"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Bine"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Apăsați aici pentru a aplica orice modificare efectuată la preferințe."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Resetează orice schimbare efectuată la preferințe."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Titlu :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Comentariu :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Director intrare :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Schimbă prioritatea pentru noile fișiere alocate :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Director intrare"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Schimbă prioritatea pentru noile fișiere alocate"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Nu modifica"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Selectați culoarea pentru această categorie (selectată curent):"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Resetare"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Selectați culoarea pentru această categorie (selectată curent)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Apăsați acest buton pentru resetarea jurnalului."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Apăsați acest buton pentru a se actualiza lista serverelor din URL ..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Listă server"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "Introduceți aici adresa URL pentru un fișier server.met și apăsați butonul din stânga pentru a actualiza lista serverelor. cunoscute."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Adăugare server manual: Nume"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Introduceți aici numele noului server"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Introduceți aici adresa IP a serverului, utilizând formatul x.x.x.x  ."
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Introduceți aici portul serverului."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Adăugați un server manual (completați întâi câmpurile din stânga) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Jurnal aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Informație server"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Informație eD2k"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Informație Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Apăsați pe acest buton pentru a actualiza lista nodurilor din URL ..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Noduri (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Introduceți aici adresa url către un fișier nodes.dat și apăsați butonul din stânga pentru actualizarea listei nodurilor cunoscute."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Stare noduri"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Bootstrap"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nod nou"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Port:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
 msgstr "Bootstrap de la clienții cunoscuți"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Deconectare Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Introduceți aici adresa IP a serverului, utilizând formatul x.x.x.x  ."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Utilizează identificarea securizată a utilizatorilor"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr "Este recomandat să activați această opțiune. Nu veți primii credite dacă SUI nu este activat."
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protocol disimulare"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Suport protocol disimulare"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Această opțiune activează Protocolul Disimulare, și determină aMule să accepte conexiuni disimulate de la alți clienți."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Utilizați disimularea pentru conexiunile de ieșire"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Această opțiune determină aMule să utilizeze Protocolul Disimulare când conectează alți clienți/servere."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Acceptă numai conexiuni disimulate"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "Această opțiune face aMule să accepte numai conexiuni disimulate. Veți avea mai puține surse, dar tot traficul va fi disimulat"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Fiecare"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Nimănui"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Cine poate vedea fișierele mele partajate:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr "Selectați cine poate solicita să vizualizeze o listă a fișierelor partajate."
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Filtrare-IP"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtru clienți"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Activați filtrarea IP-urilor client cum este definit în fișierul ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtrare servere"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Activați filtrarea IP-urilor server cum este definit în fișierul ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Reîncarcă lista"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Reîncarcă lista IP-urilor de filtrat din fișierul ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Actualizează acum"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Actualizare automată filtru ip la pornire"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Nivel de filtrare:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Filtrează mereu IP-urile LAN"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Manipulare paranoică a IP-urilor care nu se potrivesc"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Respinge pachetele dacă adresa ip a clientului este diferită de adresa ip de unde este primit pachetul. Utilizați cu precauție."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Utilizați în tot sistemul ipfilter.dat dacă este disponibil"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Dacă nu s-a găsit local ipfilter.dat, permite utilizarea unui fișier ipfilter din sistem."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Activare semnătură online"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Activați scrierea fișierului OS, care poate fi utilizat de aplicații exterioare la crearea semnăturilor și aprecierii."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Frecvență actualizare (secunde)"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Schimbați frecvența (în secunde) a actualizărilor semnăturii online."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Salvează fișierul semnăturii online în:"
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "Apăsați aici pentru a selecta directorul care conține fișierele cu semnătura online."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Arată steagul țării pentru clienți"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Rată date :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Surse"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4256,11 +5468,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4270,477 +5482,549 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Descărcare:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Actualizare automată filtru ip la pornire"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrare mesaje de intrare (cu excepția chat-ului curent):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtrează toate mesajele"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtrare mesaje de la persoane care nu sunt în lista de prieteni"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtrare mesaje de la clienți necunoscuți"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrare mesaje conținând )utilizați ',' ca separator):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "adăugați aici cuvintele pe care amule trebuie să le filtreze și să blocheze mesajele care le includ"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Arată în jurnal mesajele primite"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Comentarii"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrare comentarii conținând (utilizați ',' ca separator):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Activează autentificarea"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Activează/dezactivează autentificarea cu nume utilizator/parolă"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Utilizator:"
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Numele de utilizator de utilizat pentru conectarea la proxy"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Parolă:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Parola de utilizat pentru conectarea la proxy"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Activează proxy"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Activează/dezactivează suportul proxy"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Tip proxy:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Gazdă proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Tip proxy"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Gazdă proxy"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Numele de gazdă proxy"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Port proxy:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Port proxy"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Portul proxy"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Activează autentificarea"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Activează/dezactivează autentificarea cu nume utilizator/parolă"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Numele de utilizator de utilizat pentru conectarea la proxy"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Parola de utilizat pentru conectarea la proxy"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Conectează la:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Autentificare la amule distant"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Nume utilizator"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Amintește aceste configurări"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Conexiune externă închisă."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Utilizează compresia gzip"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Activează jurnalizarea de depanare detaliată."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Numai la fișierul jurnal"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Categorii mesaje:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Așteptați..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Adaugă importurile"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Reîncearcă selectatele"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Elimină selecția"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Tipuri de evenimente"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr "Statistici și clienți în coadă pentru fișier(ele) selectate : Sesiune / Tot timpul"
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Încărcări active"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Procentul din totalul fișierelor"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Arată clienții pentru"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Toate fișierele"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Fișierele selectate"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Numai încărcările active"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Arată clienții pentru"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Reîncarcă:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Reîncărcați fișierele partajate"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Trimite"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Trimite mesajul specificat"
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Închide această sesiune de chat."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Conectare la orice server și/sau Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Anulare"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Fișiere partajate"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Deconectează"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Conectează"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Dezactivat %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "octet"
 msgstr1 "octeți"
 msgstr2 "octeți"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kO"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TO"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "octet/secundă"
 msgstr1 "octeți/secundă"
 msgstr2 "octeți/secundă"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MO/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "secunde"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "minute"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "ore"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Zile"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "zile"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "toţi"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "toți ceilalți"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "incomplet"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Oprit"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arhivă"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Text"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Activă"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Utilizând directorul de configurare: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Această comandă nu ar trebui să aibă niciun parametru."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Această comandă nu ar trebui să aibă niciun parametru."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Această comandă nu ar trebui să aibă niciun parametru."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Această comandă nu ar trebui să aibă niciun parametru."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Introduceți aici portul serverului."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Introduceți aici portul serverului."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Introduceți aici portul serverului."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Se așteaptă ca procesul de conversie pentru fișierul parțial să moară..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Se importă %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Se citește dosarul temporar"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Se obține informația de bază din fișierul informație descărcat"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Se creează fișierul destinație"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Se încarcă datele din fișierul vechi descărcat (%u of %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "Se salvează datele blocului într-un nou și unic fișier descărcat (%u of %u)"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Se preia sursa informației fișierelor descărcate"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Se adaugă descărcarea și se salvează fișierul parțial nou"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Se importă fișiere parțiale"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Stare"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Fișier index"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Disc: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "Alegeți un dosar pentru a căuta descărcări temporare! (subdosarele vor fi incluse)"
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Doriți ca fișierele sursă ale descărcărilor importate cu succes să fie șterse?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Se elimină sursele?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "EROARE: A eșuat crearea fișierului parțial"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Se încearcă încărcarea copiei de siguranță a met-file de la %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "EROARE: A eșuat deschiderea fișierului part.met : %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr "EROARE: fișierul part.met este de dimensiune 0: %s ==> %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "EROARE: Versiune nevalidă a fișierului part.met: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Eroare: %s (%s) este corupt (etichete greșite: %s), nu se poate încărca fișierul."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "EROARE: %s (%s) este corupt (număr etichetă greșit), nu se poate încărca fișierul."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Se încearcă recuperarea informației fișierului..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "Se recuperează fișierul nedenumit - se va încerca recuperarea ca RecoveredFile.dat"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "S-a recuperat toate fișierele informație disponibile :D - Se încearcă utilizarea lor..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Nu se poate recupera informația fișierului :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "A eșuat deschiderea %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "ATENȚIE: %s ar putea fi corupt (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "EROARE în timpul salvării fișierului parțial: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Eșuare IO în timpul salvării fișierului parțial:"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "A eșuat salvarea fișierului part.met.seeds pentru %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
@@ -4748,17 +6032,17 @@
 msgstr1 "S-au salvat %i surse semințe pentru fișierul parțial: %s (%s)"
 msgstr2 "S-au salvat %i de surse semințe pentru fișierul parțial: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Nu se poate citi fișierul semințe pentru fișierul parțial %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "Eroare la citirea fișierului sămânță al fișierului parțial (%s - %s): %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
@@ -4766,334 +6050,182 @@
 msgstr1 "S-a găsit partea coruptă (%d) în %d fișiere parțiale %s - Rezultat index fișier |%s| Index fișier |%s|"
 msgstr2 "S-a găsit partea coruptă (%d) în %d de fișiere parțiale %s - Rezultat index fișier |%s| Index fișier |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "S-au găsit părți complete (%i) în %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "S-a finalizat reindexarea %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Eroare neașteptată în timpul finalizării %s. Fișier pauzat"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "S-a finalizat descărcarea: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "S-a finalizat descărcarea: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Se șterge fișierul: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "Atenție: Nu se poate indexa partea descărcată - indexare incompletă pentru '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "EROARE: Nu se poate indexa partea descărcătă - indexare incompletă (%s). Aceasta nu ar trebui să se întâmple"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "EOF  în timpul indexării părții descărcate %u cu lungimea %u (max %u) de fișiere parțiale '%s' cu lungimea %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "ATENȚIE: Nu este suficient spațiu liber pe disc! Se pauzează fișierul: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Partea descărcată %i este coruptă în fișierul: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr "ICH: S-a recuperat partea coruptă %i pentru %s -> Octeți salvați: %s"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Se alocă"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Spațiu pe disc insuficient"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Descărcat"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "EROARE: A eșuat deschiderea fișierului parțial '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Valoare implicită a sistemului"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albaneză"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabă"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturian"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Bască"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgară"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Catalană"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Chineză (Simplificat)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Chinez (tradițional)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Croată"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Cehă"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Daneză"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Olandeză"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Englez (U.K.)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "Englez (U.K.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estonă"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finlandeză"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Franceză"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galiciană"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Germană"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grecesc"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Ebraică"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Maghiară"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italiană"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italian (elvețian)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japoneză"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Koreană"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituaniană"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvegian"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Poloneză"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugheză"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugheză (Brazilia)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Română"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Rusă"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slovenă"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spaniolă"
+msgid "Extended source exchange"
+msgstr "Schimb surse"
 
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Suedeză"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turcă"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ucraineană"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Schimbă limba"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Nu sunt instalate traduceri pentru aMule"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Nu sunt limbi disponibile"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "Nu sunt opțiuni disponibile"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "S-a găsit o categorie nevalidă, se omite"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "S-a găsit o categorie nevalidă, se omite"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr "Portul TCP nu poate fi mai mare decât 65532 fiindcă soclul UDP al serverului trebuie să fie TCP+3"
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Va fi folosit portul implicit (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Conexiune"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Directoare"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Servere"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Fișiere"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Securitate"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Interfaţă"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtre"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Control la distanță"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Semnătură online"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Avansat"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Evenimente"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Depanare"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5103,15 +6235,15 @@
 "    %PARTFILE - calea completă la fișier\n"
 "    %PARTNAME - numai nume fișier"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5126,26 +6258,43 @@
 "aMule va rula perfect fără să ajustați nimic\n"
 "din aceste configurări."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr "A eșuat conectarea Cfg la widget cu ID %d și cheia %s"
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr "A eșuat transferul datelor de la Cfg la widget cu ID %d și cheia %s"
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Tipul de proxy la care sunteți conectat"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr "A eșuat transferul datelor de la widget la Cfg cu ID %d și cheia %s"
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Se verifică parola\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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 ""
+"Ați activat conexiunile externe dar nu ați specificat o parolă.\n"
+"Conexiunile externe nu se pot activa până ce nu va fi specificată o parolă validă."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5153,31 +6302,45 @@
 "aMule trebuie repornit pentru ca aceste modificări să fie activate:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- Portul TCP s-a schimbat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- Portul UDP s-a schimbat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "- Interfața conexiunii externe s-a schimbat.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Portul conexiunii externe s-a schimbat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Conectarea externă acceptă modificarea.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Interfața conexiunii externe s-a schimbat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- Suportul protocolului disimulare s-a schimbat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Limba s-a schimbat.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5185,27 +6348,33 @@
 "Lista de actualizare automată a serverelor este goală.\n"
 "'Actualizează automat lista serverelor la pornire' va fi dezactivată."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
-"Ați activat conexiunile externe dar nu ați specificat o parolă.\n"
-"Conexiunile externe nu se pot activa până ce nu va fi specificată o parolă validă."
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Limba s-a schimbat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Dosarul temporar s-a schimbat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- Rețeaua ED2K s-a activat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Versiune protocol nevalidă."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5213,7 +6382,7 @@
 "Ambele rețele eD2k și Kad sunt dezactivate.\n"
 "Nu vă puteți conecta doar după ce veți activa cel puțin una dintre ele."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5221,7 +6390,7 @@
 "Kad nu va porni dacă portul UDP este dezactivat.\n"
 "Activați portul UDP sau dezactivați Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5231,20 +6400,69 @@
 "Trebuie să reporniți aMule acum.\n"
 "Dacă nu îl reporniți acum, nu vă plângeți dacă ceva rău se întâmplă.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Reîmprospătarea automată pornită"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Dosar pentru fișiere descărcate temporar"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Configurarea parolei și conexiunile externe sunt activate."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5254,41 +6472,67 @@
 "Introduceți în listă cel puțin o adresă URL pentru a se indica un fișier server.met valid.\n"
 "Apăsați butonul \"List\" cu această căsuță pentru a introduce o adresă URL."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Fișiere temporare"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Fișiere de intrare"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Semnături online"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Alegeți un dosar pentru %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "S-a găsit %i fișier partajat cunoscut"
+msgstr1 "S-au găsit %i fișiere partajate cunoscute"
+msgstr2 "S-au găsit %i de fișiere partajate cunoscute"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Navigați pentru playerul video"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Selectare navigator"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Selectare navigator"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Executabil%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Valoare implicită a sistemului"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Editare listă server"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5296,42 +6540,42 @@
 "Adăugați aici adresele URL pentru descărcat fișierele server.met.\n"
 "Numai o singură adresă URL pe fiecare linie."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Surse complete"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Stare:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Stare:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
@@ -5339,7 +6583,7 @@
 msgstr1 "Întârziere actualizare: %d secunde"
 msgstr2 "Întârziere actualizare: %d de secunde"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
@@ -5347,12 +6591,12 @@
 msgstr1 "Timp pentru media graficului: %d minute"
 msgstr2 "Timp pentru media graficului: %d de minute"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Scală grafic conexiuni: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
@@ -5360,7 +6604,7 @@
 msgstr1 "Dimensiune fișier tampon: %d octeți"
 msgstr2 "Dimensiune fișier tampon: %d de octeți"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
@@ -5368,7 +6612,7 @@
 msgstr1 "Dimensiune coadă încărcări: %d clienți"
 msgstr2 "Dimensiune coadă încărcări: %d de clienți"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
@@ -5376,274 +6620,371 @@
 msgstr1 "Interval reâmprospătare conexiune server: %d minute"
 msgstr2 "Interval reâmprospătare conexiune server: %d de minute"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Interval reâmprospătare conexiune server: Dezactivat"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "dezactivată"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Execută comanda la evenimentul '%s' "
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Activați executarea de comenzi în nucleu"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Comandă nucleu:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Activează execuția comenzi pe GUI"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Comandă GUI:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Următoarele variabile vor fi înlocuite:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Dosare partajate"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Reîncărcați fișierele partajate"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Dosare partajate"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Reîncarcă lista fișierelor partajate."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Dosare partajate"
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Alegeți un dosar pentru %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Amintește aceste configurări"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Atenționare căutare"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Căutări"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Progres căutare: %u %% \n"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr "Dimensiunea mică trebuie să fie mai mică decât dimensiunea mare. Dimensiunea maximă s-a ignorat."
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Atenționare căutare"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Principal"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Nu se poate face o căutare Kad dacă nu rulează Kad"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "ATENȚIE: Lista de fișiere cunoscute este coruptă, conține antet nevalid."
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Intrare nevalidă în lista de fișiere cunoscute, fișierul poate fi corupt:"
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr "Nu se poate face o căutare eD2k dacă eD2k nu este conectat"
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 #, fuzzy
 msgid "No keyword for Kad search - aborting"
 msgstr "Cuvinte cheie de căutat: %s"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Eroare neașteptată în timp ce se încerca o căutare Kad:"
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID fișier"
-
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Nu este apreciat"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Descarcă în categoria"
+#: src/SearchList.cpp
+#, fuzzy, c-format
+msgid "Error %u: %s\n"
+msgstr "Eroare la actualizarea GeoIP.dat"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Obține %s pentru acest fișier"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ID fișier"
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Închide toate ferestrele"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Caută fișiere asociate (eD2k, server local)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Marchează ca fișier cunoscut"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Copiază link-ul eD2k în memoria temporară"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Copiază link-urile eD2k în memoria temporară"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Sunteți conectat la serverul pe care încercați să-l ștergeți, deconectați-vă întâi."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Anulat"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Nou"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Rulează"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finlandeză"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Progres căutare: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Progresul căutării nu este disponibil"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "A eșuat conectarea la toate serverele disimulate listate. Se execută un alt pas fără disimulare."
+
+#: src/ServerConnect.cpp
 msgid "Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."
 msgstr "A eșuat conectarea la toate serverele disimulate listate. Se execută un alt pas fără disimulare."
 
-#: src/ServerConnect.cpp:79
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "A eșuat conectarea la toate serverele listate. Se execută un alt pas."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "A eșuat conectarea la toate serverele listate. Se execută un alt pas."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Se va reîncerca conectarea automată la server în %d secundă"
+msgstr1 "Se va reîncerca conectarea automată la server în %d secunde"
+msgstr2 "Se va reîncerca conectarea automată la server în %d de secunde"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "Rețeaua eD2k este dezactivată în preferințe, nu se conectează."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr "În lista de servere nu s-au găsit servere valide pentru conectare"
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Conectat la %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Conexiune stabilită cu: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Eroare fatală în timpul conectării. Conexiunea la internet poate fi căzută"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "S-a pierdut conexiunea cu %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) par să fie moarte."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) par să fie pline."
 
-#: 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"
-msgstr0 "Se va reîncerca conectarea automată la server în %d secundă"
-msgstr1 "Se va reîncerca conectarea automată la server în %d secunde"
-msgstr2 "Se va reîncerca conectarea automată la server în %d de secunde"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Conexiune pierdută"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Conexiunea la %s (%s:%i) a eșuat."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "EROARE: Soclu nevalid la expirarea verificării"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Încercarea conectării la %s (%s:%i) a expirat."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "S-a primit ultimele rezultate pentru căutarea DNS, se înlătură."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Se încarcă fișierul server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Fișierul server.met nu a fost găsit!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "A eșuat încărcarea fișierului server.met '%s', s-a întâlnit un format necunoscut."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "A eșuat deschiderea server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Fișierul server.met este corupt, s-a găsit o versiune de etichetă nevalidă: 0x%x, dimensiune %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
@@ -5651,7 +6992,7 @@
 msgstr1 "S-au găsit %i servere în server.met"
 msgstr2 "S-au găsit %i de servere în server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
@@ -5659,236 +7000,243 @@
 msgstr1 "%d servere adăugate"
 msgstr2 "%d de servere adăugate"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Eroare: fișierul 'server.met' este corupt:"
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "Eroare IO la citirea 'server.met': "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr "Serverul nu s-a adăugat: %s:%d nu specifică un port valid."
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr "Serverul nu a fost adăugat: Adresa IP a %s:%d este filtrată sau nevalidă."
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr "Serverul nu s-a adăugat: S-a găsit în listă un server care se potrivește cu IP:Port %s:%d ."
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr "Serverul s-a adăugat: Server la %s:%d utilizând numele '%s'."
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Sunteți conectat la serverul pe care încercați să-l ștergeți, deconectați-vă întâi."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "A eșuat deschiderea '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "A eșuat salvarea server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Eroare IO la citirea 'server.met': "
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "URL nevalid"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "S-a finalizat descărcarea listei serverelor de la %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Nu s-a găsit nici o adresă de intrare în lista serverelor în 'addresses.dat' . Lipiți o adresă validă listă server în acest fișier pentru a se actualiza automat lista serverelor"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Pornește descărcarea listei serverelor de la %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "ATENȚIE: Adresa URL specificată pentru actualizarea automată a serverelor este nevalidă: %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Nu este o adresă url de descărcare automată server.met validă în addresses.dat"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "A eșuat descărcarea listei serverelor de la %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Serverul local este filtrat de filtrele IP, reconectați la un server diferit!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "Nume server"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adresă"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Descriere"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Utilizatori"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Utilizatori"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Static"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versiune"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Fișiere"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Fișiere partajate"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Sunteți conectat la un server pe care încercați să-l ștergeți. Întâi deconectați-vă. Serverul NU a fost șters."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Nume necunoscut)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "Sigur doriți să ștergeți serverul static %s"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "minute"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Servere (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Server"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Conectare la server"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Marcați serverul ca static"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Marcați serverul ca ne-static"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Marcați serverele ca statice"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Marcați serverele ca ne-statice"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Elimină server"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Elimină servere"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Elimină toate serverele"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Copiază link-urile eD2k în memoria temporară"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Reconectează la server"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Sigur doriți să ștergeți toate serverele?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Sigur doriți să ștergeți serverul selectat?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Sigur doriți să ștergeți serverele selectate?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "EROARE: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "ATENȚIE: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Noul ID client este %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "ATENȚIE: Ați primit Low-ID!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\tCel mai probabil este fiindcă vă aflați în spatele unui firewall sau router."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPentru mai multe informații, consultați https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "S-a primit o informație server necunoscută - prea scurtă"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
@@ -5896,167 +7244,198 @@
 msgstr1 "S-au primit %d servere noi"
 msgstr2 "S-au primit %d de servere noi"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Salvarea listei server terminată."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Serverul a respins ultima comandă"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "S-a primit un pachet fals de la serverul: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Eroare nerezolvată în timpul procesării pachetului de la server: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr "Nu se poate crea procesul de rezolvare DNS pentru conectarea la %s"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "Adresa IP a serverului %s (%s) este filtrată. Nu se conectează."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "utilizând protocolul de disimulare."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Se conectează la %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr "Nu se poate rezolva dns pentru serverul %s: Nu se poate conecta!"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "Jurnal aMule"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Serverul nu s-a adăugat: Nu este specificat adresa IP sau numele de gazdă."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Serverul nu s-a adăugat: Portul specificat pentru server este nevalid."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Stare eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Stare conexiune:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Conectat"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Stare Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Rulare în mod LAN"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Rulează"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Stare Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Stare:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Stare conexiune:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr "Cu firewall - deschideți portul TCP %d în ruter sau firewall"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Stare conexiune UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr "Cu firewall - deschideți portul UDP %d în ruter sau firewall"
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Stare firewall:"
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Nici un prieten nu necesită - port TCP deschis"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Nici un prieten nu necesită - port UDP deschis"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Nici un prieten"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Se conectează la persoane"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Conectat cu prietenul la %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "adresă IP:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Surse indexate:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Cuvinte cheie indexate:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Note indexate:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Încărcare indexate:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Medie utilizatori:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Medie fișiere:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Nu rulează"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Se adaugă fișierul %s la partajări"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
@@ -6064,439 +7443,582 @@
 msgstr1 "S-au găsit %i fișiere partajate cunoscute"
 msgstr2 "S-au găsit %i de fișiere partajate cunoscute"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "S-a găsit %i fișier partajat cunoscut, %i necunoscut"
-msgstr1 "S-au găsit %i fișiere partajate cunoscute, %i necunoscute"
-msgstr2 "S-au găsit %i de fișiere partajate cunoscute, %i necunoscute"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "EROARE: Se încearcă partajarea %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Directorul partajat nu a fost găsit, se omite: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Directorul partajat nu a fost găsit, se omite: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Nu au fost găsite fișiere partajabile în directorul: %s"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Nume utilizator"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Eroare în timpul salvării fișierului %s : %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Viteză descărcare"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Se încarcă fișierul server.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Viteză încărcare"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Nu au fost găsite fișiere partajabile în directorul: %s"
+msgstr1 "Nu au fost găsite fișiere partajabile în directorul: %s"
+msgstr2 "Nu au fost găsite fișiere partajabile în directorul: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Nu au fost găsite fișiere partajabile în directorul: %s"
+msgstr1 "Nu au fost găsite fișiere partajabile în directorul: %s"
+msgstr2 "Nu au fost găsite fișiere partajabile în directorul: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "S-a găsit %i fișier partajat cunoscut"
+msgstr1 "S-au găsit %i fișiere partajate cunoscute"
+msgstr2 "S-au găsit %i de fișiere partajate cunoscute"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Părți disponibile"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Nume utilizator"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Stare încărcare"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "Stare descărcare"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr "Origine"
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Nume fișier local"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Listă fișiere partajate"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Cereri"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Solicitări acceptate"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Date transferate"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Rată partajare"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Părți obținute"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Surse complete"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Disponibilitate"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Cale director"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Fișiere partajate"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Adaugă comentariu/evaluare"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Editare comentariu/evaluare"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Rdenumire"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Adaugă fișierele în colecție la lista de transfer"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Copiază &URI magnet în memoria temporară"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Copiază link-ul eD2k în memoria temporară (&sursă)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Copiază link-ul eD2k în memoria temporară (sursă) (opțiunile &With Crypt)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Copiază link-ul eD2k în memoria temporară (&nume gazdă)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Copiază link-ul eD2k în memoria temporară (nume gazdă) (opțiuni With &Crypt)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Copiază link-ul eD2k în memoria temporară (informație &AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Copiază link-ul eD2k în memoria temporară (sursă + informație &AICH)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Vă trebuie un HighID pentru a se crea o legătură sursă validă"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Eroare la finalizare"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "A eșuat preluarea fișierelor partajate de la utilizatorul '%s'"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Reîncărcați fișierele partajate"
+msgstr1 "Reîncărcați fișierele partajate"
+msgstr2 "Reîncărcați fișierele partajate"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Dimensiunea totală a fișierelor partajate: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Dimensiunea totală a fișierelor partajate: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Fișiere partajate (%i)"
+msgstr1 "Fișiere partajate (%i)"
+msgstr2 "Fișiere partajate (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Fișiere partajate (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Fișier parțial"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Reîncarcă lista fișierelor partajate."
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Stare"
+
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Nume fișier distant"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Date încărcate (sesiune (total)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Adițional total (pachete): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Adițional cerere fișiere (pachete): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Adițional schimb surse (pachete): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Adițional server (pachete): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Adițional kad (pachete): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Adițional criptate (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Încărcări active: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Încărcări în așteptare: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Total încărcări realizate cu succes pe sesiuni: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Total încărcări eșuate pe sesiuni: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Medie timp încărcare: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Date descărcate (sesiune(total)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Surse găsite: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Descărcări active (bucăți): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Raport ÎN:Des sesiune (total): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Medie rată descărcare (sesiune): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Medie rată încărcare (sesiune): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Rată maximă descărcare (sesiune): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Rată maximă încărcare (sesiune): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Reconectări: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Timpul de la primul transfer: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Conectat la server din: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Conexiuni active (estimativ): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "S-a atins limita maximă de conexiuni: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Medie conexiuni (estimativ): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Vârf conexiuni (estimare): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Clienți"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Necunoscut: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtrat: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Interzis: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Total: %i Cunoscute: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Servere funcționale: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Servere eșuate: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Total: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Servere șterse: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Servere filtrate: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Utilizatori pr serverele funcționale: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Fișiere pe serverele funcționale: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Total utilizatori: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Total fișiere: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Ocupare server: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Număr de fișiere partajate: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Dimensiunea totală a fișierelor partajate: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Medie dimensiune fișier: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Sistem de operare"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Nu s-a primit"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Conexiuni active (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Indisponibil"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Niciodată"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "Comanda '%s' cu pid '%d' s-a finalizat cu cod stare '%d'."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Execută <str> și ieși."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr "Format IP nevalid. Utilizați xxx.xxx.xxx.xxx:xxxx\n"
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "Această comandă necesită un argument. Argumentele valide sunt: 'toate', nume fișier, sau un număr.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Se procesează după index:"
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Se procesează după nume fișier:"
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Această comandă necesită un argument. Argumente valide: un index fișier.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Nu este un număr valid\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "Nu este un index valid (lungimea trebuie să fie exact 32 caractere)\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6507,7 +8029,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6518,7 +8040,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6526,76 +8048,80 @@
 "Nu s-a definit nici un tip de căutare.\n"
 "Tastați 'ajutor căutare' pentru a obține mai mult ajutor.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Descărcare fișier: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Solicitarea a eșuat cu o eroare necunoscută."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operația a fost un succes."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Solicitarea a eșuat cu următoarea eroare: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Filtrarea IP pentru clienți este %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "OPRIT"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "PORNIT"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Filtrarea IP pentru servere este %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Nivelul actual al filtrului IP este %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Limite lățime de bandă: În: %u kB/s, Desc: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Conectat la %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Se conectează acum"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "cu firewall"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6604,7 +8130,7 @@
 "\n"
 "Descărcat:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6613,7 +8139,7 @@
 "\n"
 "Încărcat:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6622,7 +8148,7 @@
 "\n"
 "Clienți în coadă:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6631,38 +8157,33 @@
 "\n"
 "Total surse:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Fișier parțial"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Numărul rezultatelor căutării: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Progres căutare: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Progresul căutării nu este disponibil"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "S-a primit un răspuns necunoscut de la server, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Arată o scurtă informație de stare."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Arată starea conexiunii, viteza curentă de încărcare/descărcare, etc.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Afișează arborele complet al statisticilor."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6676,11 +8197,11 @@
 "\n"
 "Exemplu: 'statistici 5' va arăta numai primele 5 versiuni de început pentru fiecare tip de client.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Închide aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6690,35 +8211,35 @@
 "Aceasta va închide de asemenea și clientul text, fiind nefuncțional fără un\n"
 "nucleu care rulează.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Reîncarcă obiectul dat."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Reîncarcă lista fișierelor partajate."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Reîncarcă tabelul de filtrare IP."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Reîncarcă tabelul curent de filtrare IP."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Actualizează tabelul de filtrare IP din URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr "Dacă adresa URL este omisă este utilizată în schimb adresa URL din preferințe."
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Conectare la rețea."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6730,35 +8251,35 @@
 "numai la acel server. Adresa IP trebuie să fie o adresă IPv4 zecimală despărțită de puncte,\n"
 "sau un nume DNS rezolvabil."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Conectează numai la eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Conectează numai la Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Deconectează de la rețea."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "Aceasta va deconecta de la toate rețelele la care sunteți actualmente conectat.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Deconectează numai de la eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Deconectează numai de la Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Adaugă la nucleu un link eD2k sau magnet."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6776,51 +8297,51 @@
 "\n"
 "Link-ul magnet trebuie să conțină indexul eD2k și lungimea fișierului.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Configurează o valoare preferată."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Configurează preferințele filtrării IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Pornește filtrarea IP pentru clienți și servere."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Oprește filtrarea IP pentru clienți și servere."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Activați/dezactivați filtrarea IP pentru clienți."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Pornește filtrarea IP pentru clienți."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Oprește filtrarea IP pentru clienți."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Activează/dezactivează filtrarea IP pentru servere."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Pornește filtrarea IP pentru servere."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Oprește filtrarea IP pentru servere."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Selectați nivelul de filtrare IP."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6828,59 +8349,73 @@
 "Nivelele de filtrare valide sunt în domeniul 0-255, iar valoarea implicită (inițială)\n"
 "este 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Configurare limite lățime de bandă."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "Valoarea dată acestei comenzi trebuie să fie în kiloocteți/secundă.\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Configurare limită lățime de bandă încărcare."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Valoarea dată trebuie să fie în kiloocteți/secundă.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Configurare limită lățime de bandă descărcare."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Activează/dezactivează autentificarea cu nume utilizator/parolă"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Valoarea dată trebuie să fie în kiloocteți/secundă.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Ia și afișează o valoare preferată."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Obține preferințele filtrării IP."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Obține starea filtrării IP pentru clienți și servere."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Obține starea filtrării IP numai pentru clienți."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Obține starea filtrării IP numai pentru servere."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Obține nivelul filtrării IP."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Obține limitele lățimii de bandă."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Execută o căutare."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6899,39 +8434,44 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Execută o căutare globală."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Execută o căutare locală"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Execută o căutare kad"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
 msgstr "Arată rezultatul ultimei căutări."
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Revino la rezultatele căutării anterioare.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Arată progresul unei căutări."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Arată progresul unei căutări.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Pornește descărcarea unui fișier"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6939,80 +8479,80 @@
 "Trebuie dat numărul unui fișier de la ultima căutare.\n"
 "Exemplu: 'descarcă 12' va porni descărcarea fișierului cu numărului 12 a căutării anterioare.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Pauzează descărcarea."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Reia descărcarea."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Anulează descărcarea."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Configurare prioritate descărcare."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr "Configurați prioritatea unei descărcări la Scăzută, Normală, Înaltă sau Automată.\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Configurează prioritatea la scăzută."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Configurează prioritatea la normală."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Configurează prioritatea la înaltă."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Configurează prioritatea la automată."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Arată cozile/listele."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr "Arată coada de încărcare/descărcare, lista serverelor sau fișierele partajate.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Arată coada încărcărilor."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Arată coada descărcărilor."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Arată jurnalul."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Arată lista serverelor."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "Reîncarcă lista fișierelor partajate."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Resetare jurnal."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Comandă învechită, utilizați '%s' în schimb."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7021,255 +8561,278 @@
 "Este o comandă învechită, și poate fi înlăturată în viitor.\n"
 "Utilizați '%s' în schimb.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "client text aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Se șterge fișierul: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Se șterge fișierul: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Se reia încărcarea fișierului: %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "Se convertește vechile indexări AICH în '%s' la 64b în '%s'."
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr "ATENȚIE: Numele fișierului '%s' este nevalid și a fost redenumit la '%s'."
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr "ATENȚIE: Fișierul '%s' deja există, noul fișier este redenumit la '%s'."
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "Sigur doriți să anulați și să ștergeți toate fișierele din această categorie?"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Confirmare necesară"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Sunt suportate numai 99 de categorii."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Prea multe categorii!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Toate celelalte"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Selectează filtrul de vizualizare"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Adaugă categorie"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Editează categoria"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Elimină categoria"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Indexare solicitată pentru fișierul necunoscut: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Selectați cine poate solicita să vizualizeze o listă a fișierelor partajate."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Se reia încărcarea fișierului: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Se suspendă încărcarea fișierului: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "A eșuat executarea comenzii `%s' la evenimentul `%s' ."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "A eșuat executarea comenzii '%s' la evenimentul '%s' ."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Descărcare completă"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Calea completă la fișier."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Numele fișierului fără componenta de cale."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "Indexul eD2k al fișierului."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Dimensiunea fișierului în octeți."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Timp cumulat activitate de descărcare:"
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "O nouă sesiune chat este pornită"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Expeditor mesaj."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Fără spațiu"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Partiție disc."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Eroare la finalizare"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Se procesează numărul fișierului %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "Ați fost întrebat pentru indexările parțiale (Utilizat numai pentru fișiere > 9.5 MB)"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Fișier inexistent !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, creatorul de link-uri eD2k aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Bine ați venit!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Parametrii de intrare"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Fișier de indexat"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Adaugă o adresă URL facultativă pentru acest fișier"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr "Introduceți aici fișierul pentru care doriți să calculați linkul eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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ți aici adresa URL pe care doriți să o adăugați la linkul eD2k: Adaugă / la sfârșit pentru a permite aLinkCreator să adauge numele de fișier curent"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Elimină"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Creează un link cu indexuri parțiale"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr "Ajutați să popularizați rapid fișierele noi și rare, cu costul unei măriri a dimensiunii linkului"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Fișier index MD4"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "Fișier index eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "legătură eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Salvează"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Copiază în clipboard"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Deschide"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Deschide un fișier pentru a calcula legătura sa eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Copiază în memoria temporară link-ul eD2k calculat"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Salvează ca"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Salvează legătura eD2k calculată în fișier"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Despre aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr "Selectați fișierul pentru care doriți să calculați legătura eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Nu se poate deschide memoria temporară"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Nimic de copiat pentru acum !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Selectați fișierul link-ului calculat eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Nu se poate deschide"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Introduceți un nume de fișier valid"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Nimic de salvat pentru acum !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7289,162 +8852,159 @@
 "\n"
 "Distribuit sub GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Se indexează..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator lucrează pentru dumneavostră"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Se calculează indexul MD4..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Se calculează indexurile eD2k..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Anulat !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Realizat în %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Ați adăugat deja acest URL !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Introduceți un URL valid"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Nu se poate deschide %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "S-a depășit memoria în timpul calculului indexului ed2k!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i zi(e) %i oră(e) %i min %i s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, Statistici online aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Rată maximă de descărcare de când wxCas rulează"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Rată maximă absolută de descărcare în timpul rulării anterioare a wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Resetare"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistem"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Oprește reîmprospătarea automată"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Salvează imaginea statisticilor online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Tipărește imaginea statisticilor online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Configurare preferințe"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Despre wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Pornește reîmprospătarea automată"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Reîmprospătarea automată oprită"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Reîmprospătarea automată pornită"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Salvează imaginea statisticilor"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Statistici online aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7452,11 +9012,11 @@
 "A fost o problemă cu tipărirea.\n"
 "Poate imprimanta curentă nu este configurată corect?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Tipărire"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7474,402 +9034,563 @@
 "\n"
 "Distribuit sub GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Vai vai, aMule nu rulează..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule rulează"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule rulează, dar deconectat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule se conectează..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Vai vai, starea aMule este necunoscută..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr "a rulat pentru"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr "este oprit !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr "nu este conectat !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr "se conectează..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr "se întâmplă ceva ciudat, verificați !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr "este conectat la"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "dezactivat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr "este pornit"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr "cu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Descărcat în total:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Încărcat: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Descărcat în această sesiune:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Descărcare:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Încărcare:"
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Partajare:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " fișier(ere), Clienți în coadă:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Timp:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " pornit "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Medie încărcare sistem (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Sistem activ:"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Director care conține fișierul amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "Introduceți aici directorul unde se află fișierul amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Interval rată de reîmprospătare în secunde"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Generează o imagine statistică la fiecare reîmprospătare a evenimentului"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "Introduceți aici directorul unde doriți să se genereze imaginea statistică"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Încărcați periodic imaginea statistică pe un server FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "Url FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Cale FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Introduceți aici adresa URL a serverului FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "Introduceți aici directorul unde puneți imaginea statistică pe serverul FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Utilizator"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "Introduceți aici numele de utilizator pentru autentificare pe serverul FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "Introduceți aici parola de autentificare în serverul FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Rată interval actualizare FTP în minute"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Validează"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Dosar care conține fișierul semnătură"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Dosar unde se generează imaginea statistică"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Încarcă modelul <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Port server web HTTP"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Utilizează înaintarea portului UPnP pe portul serverului web"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Port UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Utilizează compresia gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Parola pentru accesul nerestricționat pentru serverul web"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Parola de oaspete pentru serverul web"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Permite accesul oaspeților"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Interzice accesul oaspeților"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "Încarcă/salvează configurările serverului web de la/la aMule distant"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "Calea fișierului de configurare aMule. NU UTILIZAȚI DIRECT!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Dezactivează interpretorul PHP (învechit)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Recompilează paginile PHP la fiecare solicitare"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Serverul Web aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "conexiunea clientului web este acceptată\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "EROARE: nu se poate accepta conexiunea clientului web\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Solicitare eșuată cu următoarea eroare: %s. "
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Fișierul index nu a fost găsit:"
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sesiune expirată - se solicită autentificarea\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sesiunea este ok, sunteți autentificat\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sesiunea este ok, nu sunteți autentificat\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Nu este deschisă nicio sesiune - va solicita autentificare\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sesiunea s-a creat - se solicită autentificarea\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Se procesează cererea original: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Nu s-a specificat nicio parolă, autentificarea nu va fi permisă."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Se verifică parola\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Index parolă nevalid\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Parolă validă\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Parolă greșită\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "Nu ați introdus nicio parolă. Nu se permite fără parolă.\n"
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Deautentificare solicitată\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Se procesează cererea redirecționat: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Conectare eșuată"
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Încărcat"
+#~ msgid "Ratio"
+#~ msgstr "Evaluare"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Nu au fost găsite fișiere partajabile în directorul: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Schimbă limba"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Nu sunt instalate traduceri pentru aMule"
+
+#~ msgid "No languages available"
+#~ msgstr "Nu sunt limbi disponibile"
+
+#~ msgid "User name"
+#~ msgstr "Nume utilizator"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Părți obținute"
+
+#~ msgid "Available Parts"
+#~ msgstr "Părți disponibile"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "S-a găsit %i fișier partajat cunoscut, %i necunoscut"
+#~ msgstr1 "S-au găsit %i fișiere partajate cunoscute, %i necunoscute"
+#~ msgstr2 "S-au găsit %i de fișiere partajate cunoscute, %i necunoscute"
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "MO/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kO"
+
+#~ msgid "MB/s"
+#~ msgstr "MO/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Server distant"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Server local"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Intrare nevalidă în lista de fișiere cunoscute, fișierul poate fi corupt:"
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Se salvează fișierul parțial %u of %u"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Pentru a preveni apariția acestui avertisment la fiecare previzualizare,\n"
+#~ "configurați în preferințe playerul video preferat (implicit este %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Rezultate filtru"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Marchează ca fișier cunoscut"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Procentul din totalul fișierelor"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Bootstrap"
+
+#~ msgid "New node"
+#~ msgstr "Nod nou"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Mai mult"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Bootstrap de la \n"
+#~ "clienți cunoscuți"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Conectare la orice server și/sau Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Deconectare Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Oprește încercările curente de conectare"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Deconectează de la rețelele curent conectate"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Conectează la rețelele activate curent"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Sortare automată fișiere (consum mare de CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule va sorta automat coloanele în lista descărcărilor"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Respinge pachetele dacă adresa ip a clientului este diferită de adresa ip de unde este primit pachetul. Utilizați cu precauție."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Revino la rezultatele căutării anterioare.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Arată progresul unei căutări.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Conexiune închisă - aMule a terminat probabil."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Verifică la pornire dacă au apărut versiuni noi"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Legătură eD2k:"
+
+#~ msgid "Commit"
+#~ msgstr "Trimite"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: se îndreaptă spre fundal - veți vedea"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Site web: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Fișierul nu este găsit."
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Site web: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Încărcat"

amule-3.0.1.tar.gz/po/ru.po -> amule-3.1.0.tar.gz/po/ru.po Changed

@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:23+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:04+0000\n"
 "Last-Translator: Radist Morse <radist.morse@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -26,71 +26,158 @@
 "X-Generator: Poedit 2.3\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "О программе aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Удалённое управление aMule "
+
+# Used only in CVS!
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Сборка:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Многоплатформенный P2P-клиент на базе eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Авторское право (c) 2003-2026 Команда aMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Часть aMule основана на \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: пиринговый роутинг на основе XOR-метрики.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Авторское право (c) 2002-2011 Петар Маймунков (petar@maymounkov.org)\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Веб-сайт:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Форум:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Документация:"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Проблемы:"
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "Нажмите для проверки наличия новой версии."
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "Проверить обновления"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "Проверка наличия обновлений…"
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "Вы используете последнюю версию."
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "Доступна новая версия (%s):"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr "Не удалось проверить обновления. Попробуйте позже."
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Добавить в друзья"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
-msgstr "Вы должны ввести правильный IP-адрес и порт."
+msgstr "Вы должны ввести правильный IP-адрес и порт!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Информация"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
-msgstr "Указанный хеш пользователя недопустим."
+msgstr "Указанный хеш пользователя недопустим!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
+"aMule может установить ярлыки рабочего стола, значки и ссылки на команды оболочки в ваш домашний каталог, чтобы он появился в меню приложений, как обычное установленное приложение.\n"
+"\n"
+"Это обратимо — файлы находятся в ~/.local/share/applications, ~/.local/share/icons и ~/.local/bin, и их можно удалить в любой момент.\n"
+"\n"
+"Установить интеграцию с рабочим столом сейчас?"
 
-#: src/AppImageIntegration.cpp:226
-#, fuzzy
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
-msgstr "После имени приложения"
+msgstr "Добавить aMule в меню приложений?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
-msgstr ""
+msgstr "Установить"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
-msgstr ""
+msgstr "Не сейчас"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
-msgstr ""
+msgstr "Больше не спрашивать"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
-msgstr ""
+msgstr "Не удалось установить интеграцию с рабочим столом: переменная окружения APPDIR не задана. Обычно это означает, что AppImage был запущен нестандартным способом."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
-#, fuzzy
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
-msgstr "Попытка подключиться не удалась "
+msgstr "Не удалось выполнить интеграцию aMule"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
-msgstr ""
+msgstr "Не удалось установить интеграцию с рабочим столом: не удалось создать %s. Убедитесь, что домашний каталог доступен для записи."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
-msgstr ""
+msgstr "Не удалось установить интеграцию с рабочим столом: не удалось записать %s. Убедитесь, что домашний каталог доступен для записи."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr ""
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr "Интеграция AppImage: aMule добавлен в меню приложений (%d ссылок оболочки в ~/.local/bin)."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -98,84 +185,174 @@
 "\n"
 "Restart aMule now?"
 msgstr ""
+"aMule был добавлен в меню приложений. Теперь вы можете запускать его из списка приложений, и ярлык будет запускать этот же AppImage.\n"
+"\n"
+"На некоторых рабочих столах aMule может потребоваться перезапустить, чтобы значок в доке / панели задач привязался к новому ярлыку. Современные композиторы Wayland (GNOME, KDE) применяют это на лету, но перезапуск — надёжный запасной вариант, если значок остаётся стандартным.\n"
+"\n"
+"Перезапустить aMule сейчас?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
-msgstr ""
+msgstr "aMule установлен"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
-msgstr ""
+msgstr "Перезапустить сейчас"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
-msgstr ""
+msgstr "Позже"
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ОШИБКА"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Не удалось открыть файл ED2KLinks."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Вы не можете добавить себя в качестве источника для eD2k ссылки если у вас lowid."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Вы не можете добавить себя в качестве источника для ссылки eD2k, если у вас Низкий ИД."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+"Другая программа удерживает файл блокировки aMule:\n"
+"\n"
+"%s\n"
+"\n"
+"Это не запущенная копия aMule, поэтому выводить на передний план нечего. Закройте ту программу или удалите файл блокировки, пока aMule не запущен."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+"Демон aMule (amuled) уже запущен как процесс %d и использует эту конфигурацию.\n"
+"\n"
+"У него нет окна, которое можно вывести на передний план. Подключитесь к нему через amuleGUI или остановите демон перед запуском aMule."
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr "aMule не может запуститься"
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr "Права доступа к %s ограничены только для владельца."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr "Файл коллекции не найден: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Неверный или пустой файл коллекции: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr "Нет пригодных ссылок в коллекции: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 "Пропущена %u непригодная ссылка в коллекции: %s"
+msgstr1 "Пропущены %u непригодные ссылки в коллекции: %s"
+msgstr2 "Пропущено %u непригодных ссылок в коллекции: %s"
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Не удаётся преобразовать магнит-ссылку в eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Неверная ссылка eD2k «%s» — ОШИБКА: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Выходим из основного приложения..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
-msgstr "Завершаем процесс amuleweb с pid `%d' ... "
+msgstr "Завершение экземпляра amuleweb с pid «%d»… "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
-msgstr "Убиваем процесс amuleweb с pid `%d' ... "
+msgstr "Убивается экземпляр amuleweb с pid «%d»… "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
-msgstr "Неудачно"
+msgstr "Сбой"
+
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Завершение экземпляра amuleapi с pid «%d»… "
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Принудительное завершение экземпляра amuleapi с pid «%d»… "
 
-#: src/amule.cpp:292
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Прекращаем работу ядра."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "выключение aMule завершено."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Результаты дебага памяти при выходе из aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr "Привязка пирингового трафика aMule к интерфейсу: %s (HTTP-обновления используют маршрут по умолчанию)"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr "Привязка всего сетевого трафика к интерфейсу: %s"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: настроенный сетевой интерфейс «%s» не найден — трафик НЕ привязан к нему и может проходить через маршрут по умолчанию. Проверьте имя интерфейса в настройках."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: привязка к сетевому интерфейсу «%s» требует повышенных привилегий и НЕ была применена — трафик может проходить через маршрут по умолчанию. Предоставьте соответствующую возможность (напр., «sudo setcap cap_net_raw+ep» для исполняемого файла aMule) или запустите с достаточными привилегиями."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: не удалось выполнить привязку к сетевому интерфейсу «%s» — трафик может проходить через маршрут по умолчанию."
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "В связи со сменой версии, значение вашей локали было изменено на значение по умолчанию. Извините."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Сведения"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -183,56 +360,104 @@
 "\n"
 "EC конфигурация"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Пароль задан и внешние соединения разрешены."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "ПРЕДУПРЕЖДЕНИЕ"
 
-#: src/amule.cpp:788
-#, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "В файле 'server.met' найден %i сервер"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr "Инициализация сети"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "Подгрузка временных файлов"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Подгрузка временных файлов (%u из %u)"
+
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "Подгрузка публикуемых файлов"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "Подгрузка публикуемых файлов (%u)"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "Запуск"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Начальная загрузка сети"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
+"aMule обнаружил отсутствующие файлы начальной загрузки сети.\n"
+"Выберите, какие из них загрузить:"
 
-#: src/amule.cpp:797
-#, fuzzy
-msgid "Network bootstrap"
-msgstr "Сети"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "Список серверов eD2k (server.met)"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Узлы начальной загрузки Kad (nodes.dat)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "веб-сервер работает с pid %d"
 
-#: src/amule.cpp:886
-#, fuzzy
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
-msgstr "Вы хотите запускать веб-сервер при загрузке, но исполняемый файл amuleweb не может быть запущен. Установите пакет содержащий веб-сервер aMule или скомпилируйте его с опцией --enable-webserver и запустите make install"
+msgstr "Вы запросили запуск веб-сервера при старте, но исполняемый файл amuleweb не может быть запущен. Установите пакет, содержащий веб-сервер aMule, либо соберите aMule из исходного кода с параметром -DBUILD_WEBSERVER=YES и установите его."
+
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "ОШИБКА"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr "Не удалось записать токен EC amuleapi в %s; amuleapi переключится на настроенный пароль."
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr "amuleapi запущен с pid %d"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Вы запросили запуск amuleapi при старте, но исполняемый файл amuleapi не может быть запущен. Установите пакет, содержащий REST API-сервер aMule, либо соберите aMule из исходного кода с параметром -DBUILD_AMULEAPI=YES и установите его."
 
-#: src/amule.cpp:969
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr "Внешнее подключение: не удалось привязаться к «%s», прослушивание только на 127.0.0.1."
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Невозможно связать порты с указанными адресами: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Порт %u не доступен. У вас будет LowID\n"
+msgstr "Порт %u не доступен. У вас будет Низкий ИД\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -243,652 +468,681 @@
 msgstr ""
 "Порт %u недоступен!\n"
 "\n"
-"Это означает что вам будет выдан LowID.\n"
+"Это означает, что вам будет выдан Низкий ИД.\n"
 "\n"
-"Проверьте вашу сетевую конфигурацию, убедитесь что необходимый порт открыт."
+"Проверьте сеть: порт должен быть открыт для входящего и исходящего трафика."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Не удалось создать aMule OnlineSig файл"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Не удалось создать aMule OnlineSig файл"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
-msgstr "Выбранная локаль отсутствует в вашей системе (тем не менее, будет произведена попытка ее использовать)."
+msgstr "Выбранная локаль отсутствует в вашей системе (тем не менее, будет произведена попытка ее использовать)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
-msgstr "Это первый запуск aMule %s"
+msgstr "Это ваш первый запуск aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
-msgstr "Эта версия является тестовой и обновляется ежедневно.\n"
+msgstr "Эта тестовая версия, которая ежедневно обновляется, и\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "мы не предоставляем никаких гарантий на случай каких либо повреждений, пожара \n"
+msgstr "мы не гарантируем, что она ничего не сломает, не спалит ваш дом,\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "или же смерти вашей любимой собачки. И все же использование ее *должно* быть безопасным. \n"
+msgstr "или не навредит вашей собаке. Но использовать её *вроде бы* безопасно.\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
-msgstr "Дополнительную информацию, поддержку и обновленные версии вы найдете на нашем сайте \n"
+msgstr "Подробности, поддержку и новые версии можно найти на нашем сайте:\n"
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
-msgstr "https://amule-org.github.io, или на нашем irc-канале #aMule, находящемся на сервере irc.libera.chat. \n"
+msgstr "https://amule-org.github.io, или в нашем IRC-канале #aMule на сервере irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
-msgstr "Сообщайте нам о найденных ошибках на форум https://github.com/amule-org/amule/issues"
+msgstr "Сообщайте нам об ошибках на https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Указан неверный каталог для файлов Online-подписей!\n"
-"Online-подписи будут отключены пока вы не исправите это в настройках."
+"Указан НЕВЕРНЫЙ каталог для файлов сетевых подписей!\n"
+"Сетевые подписи будут ОТКЛЮЧЕНЫ, пока вы не исправите это в настройках."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Имя сервера подтверждено"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr "Метаданные медиафайла: проверяемый файл больше не известен, результат отброшен (%s)"
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Выделение место под файл '%s' не удалось: %s"
+msgstr "Не удалось выделить место на диске для файла «%s»: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "Ошибка: невозможно открыть файл журнала"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: файл журнала пуст. Что-то здесь не так :-("
+msgstr "ПРЕДУПРЕЖДЕНИЕ: файл журнала пуст. Что-то пошло не так."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Журнал был очищен"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Сообщение сервера: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr "Пропущена загрузка %s, так как запрашиваемый файл не новее."
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Ошибка при загрузке списка узлов."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
-msgstr "Ошибка при загрузке файла контроля версии"
+msgstr "Ошибка при открытии загруженного файла проверки версии"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Поврежден файл контроля версии"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Вы используете устаревшую версию aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
-msgstr "Актуальная версия aMule всегда доступна тут:  https://github.com/amule-org/amule/releases/latest"
+msgstr "Последняя версия aMule всегда доступна на https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr "ВНИМАНИЕ: Версия вашего aMule устарела: %i.%i.%i < %li.%li.%li"
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Ваша копия aMule актуальна."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
-msgstr "Ошибка при загрузке файла контроля версии"
+msgstr "Ошибка при загрузке файла проверки версии"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
-msgstr "Польз.: %s | Файлов: %s"
+msgstr "Участники: %s | Файлы: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Польз.: E: %s K: %s | Файлов: E: %s K: %s"
+msgstr "Участники: E: %s K: %s | Файлы: E: %s K: %s"
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Нет выделенной сети"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
-msgstr "LowID"
+msgstr "с Низким ИД"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
-msgstr "HighID"
+msgstr "с Высоким ИД"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
-msgstr "Соединен с %s %s"
+msgstr "Подключён к %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Подключение к %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Отсоединен от eD2k"
 
 # Kad как сеть, или служба - поэтому в женском роде
 # да, согласен
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad запущена."
 
 # Kad как сеть, или служба - поэтому в женском роде
 # согласен
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad остановлена."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
-msgstr "Подключен к Kad (норм.)"
+msgstr "Подключён к Kad (в порядке)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
-msgstr "Подключен к Kad (за брандмауэром)"
+msgstr "Подключён к Kad (за экраном)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
-msgstr "Отключился от Kad"
+msgstr "Отключено от Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
-msgstr "Сеть Kad не может быть использована если порт UDP выключен в настройках. Отменяю запуск."
+msgstr "Сеть Kad нельзя использовать, если порт UDP отключён в настройках. Отмена запуска."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Сеть Kad выключена в настройках. Отменяю соединение."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
-#, fuzzy
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
-msgstr "ОШИБКА: Для использования внешних соединений необходим пароль, а без внешних соединений демон aMule бесполезен. Чтобы запустить aMule-демона необходимо заполнить поле \"ECPassword\" в файле ~/.aMule/amule.conf. Запустите amuled с флагом --ec-config чтобы создать пароль. Более подробную информацию вы найдете на https://amule-org.github.io/docs"
+msgstr "ОШИБКА: для использования внешних подключений требуется действительный пароль, а демон aMule не может работать без внешних подключений. Чтобы запустить демон aMule, необходимо задать поле «ECPassword» в файле ~/.aMule/amule.conf с подходящим значением. Запустите amuled с флагом --ec-config, чтобы задать пароль. Дополнительную информацию можно найти на https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - запускаем таймер"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: уходим в фоновый режим - до встречи"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Не удалось создать pid-файл"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "Ошибка: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "aMule %s (основан на eMule)."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Работает на %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Посетите https://github.com/amule-org/amule/releases/latest для проверки наличия новой версии."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ФАТАЛЬНАЯ ОШИБКА: не удалось создать таймер"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Удаленное управление aMule"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "Ошибка! Не удалось подгрузить настройки"
 
-# Used only in CVS!
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Версия CVS:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Сети"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Многоплатформенный p2p клиент основанный на eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Поиск"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Сайт: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Загрузки"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Форум: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Общие файлы"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Сайт: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Клиенты"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Форум: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Сообщения"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2019 команда aMule \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Статистика"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Часть aMule основана на \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Настройки"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: пиринговый роутинг на основе XOR-метрики.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr "Навигация"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr "Copyright (c) 2002-2011 Петр Маймунков ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "Свободное место: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Сообщение"
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "Доступна новая версия"
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"Доступна новая версия aMule (%s).\n"
+"\n"
+"Вы используете %s.\n"
+"\n"
+"Открыть страницу загрузки?"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
-msgstr "диалоговое окно aMule уничтожено"
+msgstr "Диалог aMule уничтожен"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
-msgstr "Идет подключение"
+msgstr "Подключается"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Соединение"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
-msgstr "eD2k: не соединено"
+msgstr "eD2k: отключён"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
-msgstr "Kad: За брандмауэром"
+msgstr "Kad: за экраном"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
-msgstr "Kad: Подключена"
+msgstr "Kad: подключён"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
-msgstr "Kad: Идет подключение"
+msgstr "Kad: Подключается"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
-msgstr " Kad: Выключено"
+msgstr "Kad: отключён"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Отменить"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Прекратить попытки соединения"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Отключиться"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr "Ядро"
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Версия"
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Отключиться от работающих сетей"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr "Версии ядра и aMuleGUI не совпадают."
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr "Версии ядра и aMuleGUI совпадают."
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Подключиться"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Адрес"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Подключиться к разрешенным сетям"
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "Шифрование"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
 
-#: src/amuleDlg.cpp:943
-#, fuzzy, c-format
+#: src/amuleDlg.cpp
+#, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
-msgstr "Передача: %.1f(%.1f) | Прием: %.1f(%.1f)"
+msgstr "Отд: %.1f%s (%.1f) | Заг: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "МБ/с"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " МиБ/с"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr "kB/сек"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " КиБ/с"
 
-#: src/amuleDlg.cpp:947
-#, fuzzy, c-format
+#: src/amuleDlg.cpp
+#, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
-msgstr "Передача: %.1f | Прием: %.1f"
+msgstr "Отд: %.1f%s | Заг: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Подключен)"
+msgstr "aMule (%s | Подключён)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Отключен)"
+msgstr "aMule (%s | Отключён)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
-msgstr "Вы действительно хотите выйти из %s?"
+msgstr "Уверены, что хотите выйти из %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Подтверждение выхода"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
-msgstr "Команда запуска:"
+msgstr "Команда запуска: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- по умолчанию -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
-msgstr "Каталог с темами оформления '%s' не существует."
+msgstr "Каталог с темами «%s» не существует"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: невозможно открыть для чтения файл скина '%s'"
-
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Сети"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: невозможно открыть для чтения файл темы «%s»"
 
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Окно сетей"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Поиск"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Окно поиска"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Загрузки"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
-msgstr "Окно загрузки"
+msgstr "Окно загрузок"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Публикуемые файлы"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Окно публикуемых файлов"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Сообщения"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr "Окно клиентов"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
-msgstr "Сообщения"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Статистика"
+msgstr "Окно сообщений"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
-msgstr "Статистика"
+msgstr "Окно графиков статистики"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Настройки"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
-msgstr "Окно настроек клиента"
+msgstr "Окно настроек"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Импорт"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
-msgstr "Инструмент импортирования частично загруженных файлов (part files)"
+msgstr "Инструмент импортирования частично загруженных файлов"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
-msgstr "О программе"
+msgstr "Справка"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
-msgstr "О программе/Помощь"
+msgstr "О программе / справка"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Сеть eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Сеть Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Нет сети"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
-msgstr "удаленное управление aMule"
+msgstr "Удалённое управление aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Фатальная Ошибка: не удалось создать таймер ядра"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
-msgstr "Подключиться к удаленному aMule"
+msgstr "Подключиться к удалённому aMule"
+
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Соединение потеряно"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr "Прервать и выйти"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "Переподключение… (попытка %d)"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr "Следующая попытка через %d с…"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+"Подключение к %s потеряно.\n"
+"%s\n"
+"\n"
+"Интерфейс приостановлен до восстановления подключения."
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Фатальная Ошибка: не удалось создать Poll-таймер"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Переходим в событийный цикл..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Подключаемся..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
-msgstr ""
+msgstr "Не удалось подключиться. Проверьте адрес узла, порт и пароль."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
-msgstr "Обработчик событий EC удаленного GUI"
+msgstr "Обработчик событий EC удалённого графического интерфейса"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "Неудачное соединение. Невозможно соединиться с %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Выключаемся"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Соединение прервано. Возможно, aMule остановлен."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Истекло время ожидания попытки переподключения; повтор."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
+"Истекло время ожидания подключения. Не удалось связаться с %s:%d за отведённое время.\n"
+"Проверьте адрес узла, порт и что aMule запущен с включёнными внешними подключениями."
+
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr "Подключение к удалённому ядру потеряно. Попытка переподключения…"
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Запрещено"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr "Подключение к удалённому ядру восстановлено."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr "Удалённое ядро перезапущено; выполняется подгрузка."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Попытка переподключения %d: подключение к %s:%d"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr "Не удалось начать переподключение; повтор в ближайшее время."
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Готов"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Все"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr "не читается"
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr "не найден"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr "Ядро отклонило следующие общие папки:%s"
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Ссылка неверна или уже в списке."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr "Демон отклонил запрос."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "Не удалось удалить категорию: %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
-msgstr "Не удается создать директорию '%s' для категории '%s', оставляем директорию '%s'."
+msgstr "Не удаётся создать каталог «%s» для категории «%s», сохраняется каталог «%s»."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr "Удалённое ядро отправило противоречивые данные для «%s» (состояние части %d, ожидалось %d). Список файлов может отображать неверную информацию; переподключитесь для очистки."
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Не удалось получить список доступных файлов от '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
-msgstr "Ищем друга для lowid-соединения"
+msgstr "Ищем друга для соединения с Низким ИД"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Поддельная версия eMule %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (имитация eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (имитация eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (на основе eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Псевдоним: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Запрошено: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
@@ -896,7 +1150,7 @@
 msgstr1 "Статистика для текущего сеанса: принято %d из %d запросов, %s передано\n"
 msgstr2 "Статистика для текущего сеанса: принято %d из %d запросов, %s передано\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
@@ -904,127 +1158,208 @@
 msgstr1 "Статистика для всех сеансов: принято %d из %d запросов, %s передано\n"
 msgstr2 "Статистика для всех сеансов: принято %d из %d запросов, %s передано\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Запрошен неизвестный файл"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Отфильтрованное сообщение от '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Новое сообщение от '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
-msgstr "Пользователь %s (%u) запросил список публикуемых файлов из несуществующего каталога %s -> Проигнорировано"
+msgstr "Пользователь %s (%u) запросил список публикуемых файлов из несуществующего каталога «%s» -> Проигнорировано"
+
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Не удалось получить список доступных файлов от '%s'"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: файл %s не может быть открыт"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: файл %s не может быть открыт."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Список отмененных файлов поврежден, содержит некорректный заголовок."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Список отменённых файлов повреждён, содержит неверный заголовок."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Ошибка ввода/вывода при чтении файла %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Ошибка при сохранении файла %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Введите код"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Категория"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Новая категория"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Выберите каталог для входящих файлов"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Вы должны указать имя для категории!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Вы должны указать путь для категории!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
-msgstr "Не удалось создать каталог для загружаемых файлов категории. Укажите верный путь."
+msgstr "Не удалось создать каталог для загружаемых файлов категории. Укажите верный путь!"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Сеанс чата запущен: %s (%s:%u) - %s %s"
+msgstr "Сеанс чата запущен: %s (%s:%u) — %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Соединен с клиентом ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Соединение с клиентом ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Не удалость соединиться с клиентом / Соединение разорвано ***"
+msgstr "*** Не удалось соединиться с клиентом / Соединение разорвано ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr "*** Код введен верно. Пользователь получил ваше сообщение. ***"
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Чат"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Закрыть вкладку"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Закрыть все вкладки"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Закрыть остальные вкладки"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Добавить в список друзей"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Показать с&ведения"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Удалить из списка друзей"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Создать слот для друга"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Просмотреть файлы"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Отправить сообщение"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Послать сообщение пользователю"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Сообщение:"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Нельзя задать более одного слота для друзей.\n"
+" Назначен только один слот."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Множественный выбор"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 "Добавить %u клиента в список друзей?"
+msgstr1 "Добавить %u клиентов в список друзей?"
+msgstr2 "Добавить %u клиентов в список друзей?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Удалить %u клиента из списка друзей?"
+msgstr1 "Удалить %u клиентов из списка друзей?"
+msgstr2 "Удалить %u клиентов из списка друзей?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 "Не удалось добавить %u выбранного клиента в список друзей: его адрес неизвестен."
+msgstr1 "Не удалось добавить %u выбранных клиентов в список друзей: их адреса неизвестны."
+msgstr2 "Не удалось добавить %u выбранных клиентов в список друзей: их адреса неизвестны."
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Запросить список общих файлов у %u клиента?"
+msgstr1 "Запросить список общих файлов у %u клиентов?"
+msgstr2 "Запросить список общих файлов у %u клиентов?"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr "Соединение открыто с каждым из них."
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
-msgstr0 "Файл кредитов загружен, %u клиент известен"
-msgstr1 "Файл кредитов загружен, %u клиента известно"
-msgstr2 "Файл кредитов загружен, %u клиентов известно"
+msgstr0 "Файл кредитов подгружен, %u клиент известен"
+msgstr1 "Файл кредитов подгружен, %u клиента известно"
+msgstr2 "Файл кредитов подгружен, %u клиентов известно"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
@@ -1032,160 +1367,265 @@
 msgstr1 " - Кредиты перестали действовать для %u клиентов!"
 msgstr2 " - Кредиты перестали действовать для %u клиентов!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Файл 'cryptkey.dat' не найден. Создаю заново."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Сведения о клиенте"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
-msgstr "LowID"
+msgstr "Низкий ИД"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
-msgstr "HighID"
+msgstr "Высокий ИД"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Разрешено"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Поддерживается"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Запрещено"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
-msgstr "Подключен"
+msgstr "Подключён"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
-msgstr "Отключен"
+msgstr "Отключён"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f КиБ/с"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Имя"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "ПО"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP-адрес"
+
+# Source of a source. I mean, it's where a client came from.
+# (GonoszTopi)
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Источник"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr "Впервые замечен"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr "Последнее появление"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "Сеансы"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Скорость отдачи"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Скорость загрузки"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "Всего отдано"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "Всего загружено"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Баланс приёма/отдачи"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr "Сейчас в сети"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
-msgstr "Не завершен"
+msgstr "Не завершён"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Нарушитель"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
-msgstr "Проверено - OK"
+msgstr "Проверено — хорошо"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "Н/Д"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Не доступно"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "Не удалось запросить список общих файлов у %u выбранного клиента."
+msgstr1 "Не удалось запросить список общих файлов у %u выбранных клиентов."
+msgstr2 "Не удалось запросить список общих файлов у %u выбранных клиентов."
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Файлы"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Отдано"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Загружено"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "С кого загружается"
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr "Кому отдаётся"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Активные"
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr "Известные"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Пользователь %s (%u) запросил список публикуемых файлов -> Принято"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Пользователь %s (%u) запросил список публикуемых файлов -> Отказано"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Пользователь %s (%u) запросил список публикуемых папок -> Принято"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Пользователь %s (%u) запросил список публикуемых папок -> Отказано"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
-msgstr "Пользователь %s (%u) запросил список публикуемых файлов из каталога '%s' -> Принято"
+msgstr "Пользователь %s (%u) запросил список публикуемых файлов из каталога «%s» -> Принято"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
-msgstr "Пользователь %s (%u) запросил список публикуемых файлов из каталога '%s' -> Отказано"
+msgstr "Пользователь %s (%u) запросил список публикуемых файлов из каталога «%s» -> Отказано"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Пользователь %s (%u) сделал доступным каталог '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Пользователь %s (%u) отправил незапрошенный список публикуемых папок."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "Пользователь %s (%u) отправил список публикуемых каталогов из каталога '%s'"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Пользователь %s (%u) закончил передачу списка публикуемых файлов."
+msgstr "Пользователь %s (%u) закончил передачу списка публикуемых файлов"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Пользователь %s (%u) отправил список публикуемых файлов, который не нужен."
+msgstr "Пользователь %s (%u) отправил список публикуемых файлов, который не нужен"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "Пользователь %s (%u) отказал в доступе к списку публикуемых файлов/папок"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
-msgstr "Комментарии к файлам"
+msgstr "Комментарии файла"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Имя файла"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
-msgstr "Рейтинг"
+msgstr "Оценка"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Комментарий"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr "Не удалось начать поиск Kad"
+
+# unification
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Поиск по сети Kad не может быть произведён, когда она отсоединена"
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "Поиск комментариев в Kad…"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Нет комментариев"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
@@ -1193,697 +1633,777 @@
 msgstr1 "%u комментария"
 msgstr2 "%u комментариев"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr "Клиент %s забанен за отсыл %s поврежденных данных из %s всего для файла '%s'"
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Не удалось подгрузить данные страны для «%s»."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
-msgstr "Авто Низк"
+msgstr "Авто низкий"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
-msgstr "Авто Норм"
+msgstr "Авто обычный"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
-msgstr "Авто Выс"
+msgstr "Авто высокий"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Очень низкий"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Низкий"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
-msgstr "Нормальный"
+msgstr "Обычный"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Высокий"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Очень высокий"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
-msgstr "Релиз"
+msgstr "Выпуск"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Запрос"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Соединение через сервер"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Очередь заполнена"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "В очереди"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Загружается"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Получение контрольных сумм"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Нет нужных частей"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
-msgstr "Клиенты с LowID не могут подключаться друг с другом"
+msgstr "Низкие ИД не могут соединяться"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Слишком много соединений"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
-msgstr "Подключение Kad"
+msgstr "Подключение через Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Слишком много соединений Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Заблокированы"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Ошибка подключения"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
-msgstr "Удаленная очередь полна"
+msgstr "Удалённая очередь полна"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Старый MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Новый MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Совместимый с eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Локальный сервер"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
-msgstr "Удаленный сервер"
+msgstr "Удалённый сервер"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Обмен источниками"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
-msgstr "Пассивный"
+msgstr "Пассивно"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Ссылка"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
-msgstr "Источники"
+msgstr "Источники сидов"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Результаты поиска"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Завершено"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "В процессе"
 
-#: src/DataToText.cpp:145
-#, fuzzy
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
-msgstr "ОШИБКА: Недостаточно места на диске"
+msgstr "ОШИБКА: недостаточно места на диске"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
-msgstr "ОШИБКА: Не найден файл part.met"
+msgstr "ОШИБКА: частичный met-файл не найден"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ОШИБКА: Ошибка ввода/вывода!"
 
 # знаю что звучит глупо. если есть идеи - прошу
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ОШИБКА: Неудачно!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "В очереди"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
-msgstr "Уже скачивается"
+msgstr "Уже загружается"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Неизвестный или нарушенный формат временного файла."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr "Этот каталог входит в рекурсивную публикацию. Чтобы удалить его, отмените публикацию или измените корневой каталог выше."
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr "Нельзя отменить публикацию внутри рекурсивной публикации"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr "Нельзя изменять внутри рекурсивной публикации"
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Часть"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Размер"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Передано"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Скорость"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Выполнено"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Источники"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Приоритет"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Состояние"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Осталось времени"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
-msgstr "Последний раз файл был доступен полностью"
+msgstr "Замечен целиком"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
-msgstr "Последнее получение данных"
-
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Удалить выбранный файл?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Удалить выбранные файлы?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Ответ от: %s (%s)\n"
-"\n"
+msgstr "Последний приём"
 
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Авто"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Отмена"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Остановить"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Пауза"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Возобновить"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
-msgstr "Очистить &завершенные"
+msgstr "Очистить &завершённые"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
-msgstr "Использовать все A4AF источники для этого файла"
+msgstr "Выдать все источники A4AF этому файлу сейчас"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
-msgstr "Использовать все A4AF источники для этого файла (авто)"
+msgstr "Выдать все источники A4AF этому файлу (автоматически)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
-msgstr "Отдать все A4AF источники этого файла другим файлам"
+msgstr "Отдать все источники A4AF другим файлам сейчас"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Дополнительные настройки"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
-msgstr "Предварительный просмотр"
+msgstr "Предпросмотр"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "Показать в файловом менеджере"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
-msgstr "По&казать подробности"
+msgstr "Показать с&ведения о файле"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Показать все комментарии"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
-msgstr "Скопировать magnet URL в буфер обмена"
+msgstr "Копировать магнит-ссылку в буфер"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
-msgstr "Копировать eD2k &ссылку в буфер"
+msgstr "Копировать &ссылку eD2k в буфер"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
-msgstr "Скопировать доп. информацию в буфер обмена"
+msgstr "Копировать сведения в буфер обмена"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Получить %s для этого файла"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
-msgstr "отменить категорию"
+msgstr "убрать категорию"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
-msgstr "Присвоить категорию"
+msgstr "Назначить категорию"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Открыть файл"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Удалить выбранный файл?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Уверены, что хотите удалить выбранные файлы?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Ответ от: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Введите новое имя файла:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Переименовать файл"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%.1f MiB/s"
+msgstr "%.1f МиБ/с"
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Загрузки (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Чтобы избежать появления этого предупреждения\n"
-"при каждом предпросмотре, установите предпочитаемый\n"
-"видео проигрыватель в настройках (по умолчанию %s)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Предварительный просмотр"
-
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ОШИБКА: невозможно запустить видео-проигрыватель. Команда: `%s'"
+msgid "Total queue size: %s"
+msgstr "Общий размер очереди: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Сохранаяем файл %u из %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
-msgstr "Все файлы сохранены."
+msgstr "Все частичные файлы сохранены."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
-msgstr "Загружаются файлы из %s"
+msgstr "Подгрузка временных файлов из %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
-msgstr "Загружается файл %u из %u"
+msgstr "Подгрузка частичного файла %u из %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
-msgstr "ОШИБКА: не удалось загрузить резервный файл. Ищите на https://github.com/amule-org/amule/discussions как восстановить файл part.met"
+msgstr "ОШИБКА: не удалось подгрузить резервный файл. Ищите на https://github.com/amule-org/amule/discussions способы восстановления .part.met."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
-msgstr "Все файлы загружены."
+msgstr "Все частичные файлы подгружены."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
-msgstr "Частично загруженных файлов не найдено"
+msgstr "Частичные файлы не найдены"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
-msgstr0 "Найден %u частично закаченный файл"
-msgstr1 "Найдено %u частично закаченных файла"
-msgstr2 "Найдено %u частично закаченных файлов"
+msgstr0 "Найден %u частичный файл"
+msgstr1 "Найдено %u частичный файл"
+msgstr2 "Найдено %u частичный файлов"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
-msgstr "Файловая система каталога временных файлов не поддерживает файлы больших размеров"
+msgstr "Файловая система каталога временных файлов не поддерживает большие файлы."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr "Файловая система каталога принятых файлов не поддерживает файлы больших размеров"
+msgstr "Файловая система каталога принятых файлов не поддерживает большие файлы."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
-msgstr "Прием %s"
+msgstr "Загружается %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
-msgstr "Вы уже загружаете файл '%s'"
+msgstr "Вы уже пытаетесь загрузить файл «%s»"
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "У вас уже есть файл «%s» (запрошен как «%s»)"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "У вас уже есть файл '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Вы уже пытаетесь загрузить файл %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Не удается преобразовать magnet-ссылку в eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Неизвестный протокол ссылки: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "Не удалось добавить %u ссылку (подробности в журнале)."
+msgstr1 "Не удалось добавить %u ссылки (подробности в журнале)."
+msgstr2 "Не удалось добавить %u ссылок (подробности в журнале)."
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Неверная eD2k ссылка! ОШИБКА: %s"
+msgstr "Неверная ссылка eD2k! ОШИБКА: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Клиент послал пакет после ошибки идентификации."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Внешнее соединение закрыто."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
-msgstr "Внешние соединения выключены из-за отсутствия пароля."
+msgstr "Внешние подключения отключены из-за отсутствия пароля!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
-msgstr "Внешние соединения выключены в конфигурационном файле"
+msgstr "Внешние соединения отключены в файле конфигурации"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Принято новое внешнее соединение"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ОШИБКА: невозможно принять новое внешнее соединение"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
-msgstr "Отказано во внешнем соединении из-за пустого пароля"
+msgstr "Отказано во внешнем соединении из-за пустого пароля в настройках!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Соединение с клиентом: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Неизвестная версия"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
-msgstr "Неверный идентификатор версии ВС. Возможна бинарная несовместимость. Используйте ядро и компонент удаленного доступа одинаковой версии."
+msgstr "Неверный идентификатор версии ВС. Возможна бинарная несовместимость. Используйте ядро и компонент удалённого доступа одинаковой версии."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
-msgstr "Вы не можете подсоединиться к релизной версии с произвольной SVN версии! Возможный сбой предотвращен"
+msgstr "Вы не можете подключиться к стабильной версии из произвольного снимка разработки! *вздох* возможный сбой предотвращён"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Недопустимая версия протокола."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Тег версии протокола отсутствует."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Слишком много неудачных попыток подключения; повторите через %d секунд."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Ошибка авторизации: в качестве EC-пароля указан неправильный хэш."
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr "Ошибка аутентификации: клиент предложил зашифрованное внешнее соединение, но не отправил ключ."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr "Ошибка аутентификации: этот aMule требует зашифрованного внешнего подключения, а клиент не согласовал его."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr "Ошибка аутентификации: клиент не смог подтвердить шифрованный сеанс."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Ошибка идентификации: неверный пароль."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Ошибка идентификации: пароль не задан."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
-msgstr "Неверный запрос, сначала пройдите идентификацию."
+msgstr "Неверный запрос, сначала пройдите авторизацию."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Доступ получен."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Клиенту отправлено сообщение об ошибке \"%s\"."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Попытка неавторизированного доступа с %s. Соединение разорвано."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
-msgstr "Удаленная команда PartFile не удалась: хеш файла не найден: %s"
+msgstr "Удалённая команда PartFile не удалась: хеш файла не найден: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Хеш файла не найден: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
-msgstr "Ошибка при выполнении OpCode."
+msgstr "Ошибка при выполнении OpCode!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Сервер не добавлен"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "сервер не найден: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "необходимо выделить сервер для удаления"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
-msgstr "Сеть eD2k отключена в настройках"
+msgstr "Сеть eD2k отключена в настройках."
 
-#: src/ExternalConn.cpp:1368
-#, fuzzy
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr "Адрес этого друга пока неизвестен."
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
-msgstr "Файл не найден."
+msgstr "Друг не найден."
 
-#: src/ExternalConn.cpp:1377
-#, fuzzy
+#: src/ExternalConn.cpp
 msgid "Client not found."
-msgstr "Файл не найден."
+msgstr "Клиент не найден."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
-msgstr ""
-
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Поиск запущен. Ждите результатов."
+msgstr "EC_TAG_FRIEND_SHARED требует EC_TAG_FRIEND или EC_TAG_CLIENT."
 
 # Explained by Jacobo221.
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
-msgstr "При удаленном использовании aMule WWW поиск бесполезен."
+msgstr "При удалённом использовании aMule веб-поиск бесполезен."
+
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr "Просмотр не является поиском, который можно запустить."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Поиск выполняется. Обновите результаты через мгновение!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "В графике нет точек."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Ваш клиент не настроен на этот уровень детализации."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Внешнее соединение: запрошено выключение"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Уже завершаю работу."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: добавляю ссылку '%s'."
 
-#: src/ExternalConn.cpp:1832
-#, fuzzy, c-format
+#: src/ExternalConn.cpp
+#, c-format
 msgid "%d of %d links failed (invalid or already on list)."
-msgstr "Ссылка неверна или уже в списке."
+msgstr "%d из %d ссылок не обработаны (недействительны или уже есть в списке)."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr "Проверка версии временно ограничена; повторите попытку чуть позже."
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr "Проверка версии недоступна для этого демона."
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Файл не найден."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Неверное имя файла."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Невозможно переименовать файл."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr "Не удалось переключить клиента на этот файл."
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr "Не удалось сохранить пароль amuleapi: %s"
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "Нет такой категории."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr "Неверно сформированный запрос категории."
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr "Категорию по умолчанию нельзя удалить."
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "Отсутствует идентификатор сеанса беседы"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "Такой беседы нет"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Извлечение метаданных медиафайлов отключено в настройках"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr "Файл не подходит для извлечения метаданных медиафайла (не аудио/видеофайл или незавершённая загрузка)"
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "Пустое сообщение беседы"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "Неизвестный получатель беседы"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad выключена в настройках."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Уже подсоединен к сети eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Подсоединение к сети eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
-msgstr "Уже подключен к Kad."
+msgstr "Уже подключён к Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Подключаюсь к Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Все сети выключены."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Отсоединен от сети eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
-msgstr "Отключен от Kad."
+msgstr "Отключён от Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Внешнее соединение: получен неверный код операции: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Неверный opcode (Возможно, не та версия протокола)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Неизвестное расширение '%s' для команды '%s'.\n"
+msgstr "Неизвестное расширение «%s» для команды «%s».\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Неизвестная команда '%s.'\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1891,7 +2411,7 @@
 "\n"
 "У этой команды не может быть аргументов.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1899,7 +2419,7 @@
 "\n"
 "У этой команды должен быть аргумент.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1907,7 +2427,7 @@
 "\n"
 "Команда не завершена. Необходимо использовать одно из следующих расширений.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1915,11 +2435,11 @@
 "\n"
 "Доступные расширения:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Доступные команды:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1930,25 +2450,25 @@
 "Все команды чувствительны к регистру.\n"
 "Наберите '%s <имя команды>' чтобы получить справку по этой команде.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Завершить работу с приложением."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Показать справку."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 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"
+"Чтобы получить справку по команде, наберите «help <имя команды>».\n"
+"Чтобы получить полный список команд, наберите «help».\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1959,46 +2479,46 @@
 "Введите '%s' для получения списка команд\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Синтаксическая ошибка!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "Ошибка при обработке команды - это не должно было произойти! Пожалуйста, сообщите нам об этой ошибке\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "У этой команды не должно быть параметров."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "У этой команды должен быть параметр."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Неверный аргумент."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Команда введена не полность."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Наберите '%s' для подробной справки.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Это %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Это %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -2006,16 +2526,16 @@
 "\n"
 "Создается клиент...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 "\n"
-"Ok, выход из %s...\n"
+"Хорошо, выход из %s…\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2029,118 +2549,370 @@
 "\n"
 "Завершение работы...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Показать эту справку."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Узел, на котором работает aMule (по умолчанию: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Порт aMule для внешних подключений (по умолчанию: 4712)"
+msgstr "Порт aMule для внешних соединений (по умолчанию: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Пароль для внешнего соединения."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Прочесть настройки из файла."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
-msgstr "Не выводить ничего в поток стандартного вывода."
+msgstr "Не печетать ничего в стандартный вывод."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
-msgstr "Детально - выводить отладочную информацию."
+msgstr "Детально — также выводить отладочную информацию."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Установить локаль программы (язык)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Записать параметры командной строки в конфигурационный файл."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Создает конфигурационный файл на основе оного из aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Вывести версию программы."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr "Не шифровать сеанс внешнего подключения. Шифрование включено по умолчанию, когда удалённый aMule его поддерживает; отключение делает трафик после входа открытым для перехвата."
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
-msgstr ""
+msgstr "Принудительно использовать сжатие ZLIB независимо от локальности IP-адреса подключения (полезно, если сервер доступен через VPN-туннель, разрешающийся в локальный IP-адрес)."
+
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr "Дублировать весь вывод консоли в этот файл журнала (по умолчанию: <config-dir>/amuleapi.log)."
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr "Не записывать файл журнала; выводить только в консоль."
 
-#: src/FileDetailDialog.cpp:76
+#: src/FileDetailDialog.cpp
 msgid "File Details"
-msgstr "Детали файла"
+msgstr "Сведения о файле"
 
-#: src/FileDetailDialog.cpp:167
-#, fuzzy, c-format
+#: src/FileDetailDialog.cpp
+#, c-format
 msgid "%.1f%% done"
-msgstr "%.2f%% готово"
+msgstr "%.1f%% выполнено"
+
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f КиБ/с"
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Предпросмотр файла"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "ОШИБКА: невозможно запустить проигрыватель видео. Команда: «%s»"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr "Настроенный проигрыватель видео не найден: %s"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr "Невозможно открыть «%s»: файл отсутствует на этом компьютере."
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr "Для предпросмотра незавершённой загрузки нужен видеоплеер: частично загруженный файл не имеет типа, который система может открыть сама. Его можно настроить в Настройки → Основные."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr "ОШИБКА: не удалось открыть «%s» стандартным приложением."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ОШИБКА: не удалось показать «%s» в файловом менеджере."
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "Мобильная связь / 4G-5G (20 / 5 Мбит)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL (24 / 1 Мбит)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL (50 / 10 Мбит)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Кабель (200 / 20 Мбит)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Оптоволокно 300 (300 / 100 Мбит)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "Оптоволокно Gigabit (1000 / 1000 Мбит)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr "Первоначальная настройка aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "Добро пожаловать в aMule!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+"Эта короткая настройка поможет вам подключиться. Вы можете\n"
+"изменить любой из этих параметров позже в Настройках."
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "Выберите ник, который увидят другие участники сети:"
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr "Соединение и скорость передачи"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+"Выберите вариант, наиболее подходящий вашему подключению к интернету,\n"
+"или задайте ограничения отдачи и загрузки непосредственно ниже."
+
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "Скорость соединения:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr "Другое / указать вручную"
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "Ограничение отдачи (КиБ/с, 0 — без ограничений):"
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "Ограничение загрузки (КиБ/с, 0 — без ограничений):"
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "Сети и порты"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr "aMule может использовать две сети. Рекомендуем оставить обе включёнными."
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Стандартный порт TCP "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Расширенный порт UDP (Kad / глобальный поиск) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Включить UPnP для проброса портов в маршрутизаторе"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+"Позволяет aMule запросить у роутера проброс указанных портов, чтобы\n"
+"другие пиры могли до вас достучаться («Высокий ИД»). Отключите, если\n"
+"роутер не поддерживает UPnP или вы настраиваете порты вручную."
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr "Файлы начальной загрузки"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+"Для начала работы aMule нужно узнать о нескольких пирах.\n"
+"Выберите, какие списки загрузить сейчас:"
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Ваши списки пиров уже на месте — загружать нечего."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Автоматически обновлять список серверов при запуске"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr "Интеграции (необязательно)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+"Выберите, как aMule будет интегрироваться с вашей системой.\n"
+"Вы можете изменить это позже в Настройках."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "Запускать aMule автоматически при моём входе в систему"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr "Зарегистрировать aMule для ссылок ed2k://"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr "Зарегистрировать aMule для магнит-ссылок"
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr "Только магнит-ссылки, совместимые с eD2k. Оставьте отключённым, если вы используете клиент БитТоррент."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr "Открывать файлы .emulecollection с помощью aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr "Папки (необязательно)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+"Значения по умолчанию подходят большинству пользователей. Измените их,\n"
+"если хотите сохранять загрузки на другом (например, более вместительном) диске."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Папка для загружаемых файлов"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Открыть"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Все файлы в этой папке доступны другим пирам)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Папка для временных файлов"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/сек"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+"Исходя из этого, aMule будет разрешать до %i источников\n"
+"на файл и %i подключений клиентов."
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr "Показать этот мастер настройки снова при следующем запуске aMule?"
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr "Настройка не завершена"
 
-#: src/FriendList.cpp:123
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Не удалось открыть список друзей 'emfriends.met' для чтения!"
+msgstr "Не удалось открыть файл списка друзей «emfriends.met» для чтения!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Не удалось открыть список друзей 'emfriends.met' для записи!"
+msgstr "Не удалось открыть файл списка друзей «emfriends.met» для записи!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr "Адрес друга «%s» пока неизвестен, невозможно просмотреть его файлы."
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "КРИТИЧНО - нет клиентов на StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Друзья"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Показать &подробности"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Добавить в друзья"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Удалить из друзей"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Послать &сообщение"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Просмотр файлов"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Создать слот для друга"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr "Адрес друга «%s» пока неизвестен, невозможно отправить ему сообщение."
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Удалить выбранного пользователя из списка друзей?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Удалить выбранных пользователей из списка друзей?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2148,276 +2920,258 @@
 "Устанавка более одного слота для друзей запрещена.\n"
 " Был выделен только один слот."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Множественный выбор"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Устанавка более одного слота для друзей запрещена.\n"
-" Был выделен только один слот."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Послать сообщение пользователю"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Сообщение:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Удалить из списка друзей"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Отправить сообщение"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Переключить на этот файл"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr "Легенда цветов"
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "В очереди: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Запрошен другой файл"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Ожидание слота отдачи"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "В очереди: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
-msgstr "Отдается"
+msgstr "Отдаётся"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Нет"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Нет"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Да"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Не удалось открыть базу данных MaxMindDB «%s»: %s"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
-msgstr "Принимается..."
+msgstr "Загружается…"
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
-msgstr "загрузка HTTP отменена"
+msgstr "Загрузка по HTTP отменена"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
-msgstr "URL загрузки не может быть пустым"
+msgstr "URL для загрузки не может быть пустым"
 
-#: src/HTTPDownload.cpp:246
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Failed to create HTTP request for %s"
-msgstr "Не удалось получить список доступных файлов от '%s'"
+msgstr "Не удалось создать HTTP-запрос для %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
-msgstr ""
+msgstr "HTTP-загрузка: пустое тело ответа для %s"
 
-#: src/HTTPDownload.cpp:349
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Could not move downloaded file to %s"
-msgstr "Папка для временных файлов"
+msgstr "Не удалось переместить загруженный файл в %s"
 
-#: src/HTTPDownload.cpp:353
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Downloaded %s (%llu bytes)"
-msgstr "Загружено %d байт"
+msgstr "Загружено %s (%llu байт)"
 
-#: src/HTTPDownload.cpp:358
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "The URL %s returned: %i"
-msgstr "Обработка URL %s: %i - Ошибка (%i)!"
+msgstr "URL-адрес %s вернул: %i"
 
-#: src/HTTPDownload.cpp:365
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "HTTP download failed for %s: %s"
-msgstr "загрузка HTTP отменена"
+msgstr "Ошибка HTTP-загрузки для %s: %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
-msgstr ""
+msgstr "HTTP 401 Unauthorized для %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
-msgstr ""
+msgstr "Существующий файл GeoLite2-Country.mmdb перенесён в %s"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr ""
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr "%s не является читаемым файлом MaxMindDB — файл будет отброшен. Свежая копия будет загружена при следующем запуске или сейчас через Настройки → Страна по IP → «Обновить сейчас»."
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr ""
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "Страна по IP: в качестве источника GeoIP выбран MaxMind, но лицензионный ключ не настроен. Откройте «Настройки» → «Страна по IP», вставьте бесплатный ключ лицензии MaxMind и нажмите «Обновить сейчас»."
+
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "Страна по IP: в качестве источника GeoIP выбран пользовательский URL-адрес, но URL-адрес не настроен. Откройте «Настройки» → «Страна по IP» и укажите URL-адрес, ведущий к файлу .mmdb (или .gz / .tar.gz, содержащему такой файл)."
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
-msgstr ""
+msgstr "Страна по IP: не удалось определить URL-адрес для загрузки GeoIP."
 
-#: src/IP2Country.cpp:157
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download new %s from %s"
-msgstr "Загружен новый GeoIP.dat с %s"
+msgstr "Загрузка нового %s с %s"
 
-#: src/IP2Country.cpp:191
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download of %s file failed, aborting update."
-msgstr "Загрузка GeoIP.dat неудачна, прекращаем обновление."
+msgstr "Не удалось загрузить файл %s, обновление прервано."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
-msgstr "Удаление файла %s неудачно, прекращаем обновление."
+msgstr "Не удалось удалить файл %s, обновление прервано."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
-msgstr "Переименование файла %s неудачно, прекращаем обновление."
+msgstr "Не удалось переименовать файл %s, обновление прервано."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
-msgstr "Обновление %s успешно."
+msgstr "%s успешно обновлён"
 
-#: src/IP2Country.cpp:228
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Error updating %s"
-msgstr "Ошибка обновления GeoIP.dat"
+msgstr "Ошибка обновления %s"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
-msgstr ""
+msgstr "Не удалось загрузить DB-IP за текущий месяц — повтор с URL за предыдущий месяц."
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Не удалось загрузить %s с %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Не удалось загрузить данные страны для %s"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Загружаю IP-фильтры 'ipfilter.dat' и 'ipfilter_static.dat'."
+msgstr "Подгрузка IP-фильтров «ipfilter.dat» и «ipfilter_static.dat»."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Не удалось загрузить ipfilter.dat файл '%s', формат файла неизвестен."
+msgstr "Не удалось подгрузить файл ipfilter.dat «%s», неизвестный формат."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "Не удалось загрузить ipfilter.dat файл '%s', не удалось открыть файл."
+msgstr "Не удалось подгрузить файл ipfilter.dat «%s», не удалось открыть файл."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr0 "Загружен %u IP-диапазон из '%s'."
-msgstr1 "Загружено %u IP-диапазона из '%s'."
-msgstr2 "Загружено %u IP-диапазонов из '%s'."
+msgstr0 "Подгружен %u IP-диапазон из «%s»."
+msgstr1 "Подгружены %u IP-диапазона из «%s»."
+msgstr2 "Подгружено %u IP-диапазонов из «%s»."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
-msgstr0 "%u испорченная строка была пропущена."
-msgstr1 "%u испорченных строки было пропущено."
-msgstr2 "%u испорченных строк было пропущено."
+msgstr0 "%u испорченная строка пропущена."
+msgstr1 "%u испорченных строки пропущено."
+msgstr2 "%u испорченных строк пропущено."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
-msgstr "Переименование нового файла %s неудачно, прекращаем обновление."
+msgstr "Не удалось переименовать новый файл %s, обновление прервано."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP-фильтр готов"
 
-# Похоже, bootstrap в eMule перевели как инициализация
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Инициализация от \n"
-"известных клиентов"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Текущая"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Средняя за всё время"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Средняя за сеанс"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Узлы (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
-msgstr "Неверный IP для инициализации"
+msgstr "Неверный IP-адрес для начальной загрузки"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
-msgstr "Неверный порт для инициализации"
+msgstr "Неверный порт для начальной загрузки"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
-msgstr "Пожалуйста, заполните все необходимые поля"
+msgstr "Заполните все обязательные поля"
+
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Сообщение"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Вы уверены что хотите загрузить новый файл nodes.dat?\n"
+msgstr "Уверены, что хотите загрузить новый файл nodes.dat?\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
-msgstr "Это удалит используемые в данный момент узлы и перезапустит Kademlia."
+msgstr "Это удалит ваши текущие узлы и перезапустит Kademlia."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Продолжить?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kad: слово запроса лишком коротко"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
-msgstr "Kademlia: ключевое слово поиска уже в списке поиска:"
+msgstr "Kademlia: ключевое слово поиска уже в списке поиска: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Ошибка чтения nodes.dat - формат файла устарел. Эта версия (0) больше не поддерживается."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
@@ -2425,1873 +3179,2286 @@
 msgstr1 "Считано %u контакта Kad"
 msgstr2 "Считано %u контактов Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
-msgstr "Не найдено контактов. Произведите инициализацию, или загрузите файл nodes.dat."
+msgstr "Контакты не найдены. Выполните начальную загрузку или загрузите файл nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Доступен только %d контакт Kad, файл nodes.dat не записан"
-msgstr1 "Доступно только %d контакта Kad, файл nodes.dat не записан"
+msgstr1 "Доступны только %d контакта Kad, файл nodes.dat не записан"
 msgstr2 "Доступно только %d контактов Kad, файл nodes.dat не записан"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
-msgstr0 "Записан %d Kad контакт"
-msgstr1 "Записано %d Kad контакта"
-msgstr2 "Записано %d Kad контактов"
+msgstr0 "Записан %d контакт Kad"
+msgstr1 "Записаны %d контакта Kad"
+msgstr2 "Записано %d контактов Kad"
+
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Пользователь Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr "Поиск заметок Kad для «%s» не начат: Kad не подключён"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr "Поиск заметок Kad для «%s» не начат: поиск заметок для этого файла уже выполняется"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr "Поиск заметок Kad для «%s» не начат: файл отсутствует в списке общих файлов, очереди загрузки или результатах поиска"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr "Поиск заметок Kad для «%s» не начат: хеш этого файла уже используется другим поиском Kad (напр., поиском источников) — повторите попытку чуть позже"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr "Поиск заметок Kad для «%s» не начат: ошибка PrepareLookup"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Размер файла"
 
 # по крайней мере торренты называют его так
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
-msgstr "Рейтинг"
-
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Загружено"
+msgstr "Рейтинг раздачи"
 
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Запрошено"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Разрешено"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
-msgstr "Полных источников"
+msgstr "Полные источники"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Список известных файлов поврежден, содержит некорректный заголовок."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Список известных файлов повреждён, содержит неверный заголовок."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
-msgstr "Ошибка загрузки элемента списка известных файлов, файл возможно поврежден"
+msgstr "Ошибка подгрузки элемента списка известных файлов, файл возможно повреждён"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
-msgstr "Неверный элемент списка известных файлов, файл возможно поврежден:"
+msgstr "Неверный элемент списка известных файлов, файл возможно повреждён: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Системный"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Албанский"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Арабский"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Астурианский"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Баскский"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Болгарский"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Каталонский"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Китайский (упрощенный)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Китайский (традиционный)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Хорватский"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Чешский"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Датский"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Голландский"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Английский (Великобритания)"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "Английский (США)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Эстонский"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Финский"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Французский"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Гальский"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Немецкий"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Греческий"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Израильский"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Венгерский"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Итальянский"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Японский"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Корейский"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "Латышский"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Литовский"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Норвежский (Нюнорск)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Польский"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Португальский"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Португальский (Бразилия)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Румынский"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Русский"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Словакский"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Испанский"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Шведский"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Турецкий"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Украинский"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Неизвестная ошибка %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Невозможно получить описание ошибки %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Хешируется"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Завершается"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
-msgstr "Завершен"
+msgstr "Завершено"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Приостановлен"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Ошибочный"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Ожидает"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Необходимо указать пароль."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Неверный пароль. Не MD5-хеш!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr "Не удалось разрешить %s в IPv4-адрес."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Подключение не удалось"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-#, fuzzy
-msgid "External Connection lost — exiting."
-msgstr "Внешнее соединение закрыто."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
+msgstr "Внешнее подключение потеряно — завершение работы."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "EC соединение не удалось. Пустой ответ."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr "Не удалось настроить шифрование соединения. Соединение закрыто."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr "Ядро не согласовало зашифрованное соединение. Возможно, это старая версия aMule без поддержки шифрования, или соединение было подменено. Чтобы подключиться без шифрования, отключите его в настройках соединения."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Внешнее соединение: Некорректный ответ, авторизация неудачна. Соединение закрыто."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Внешнее соединение: демон не смог подтвердить знание пароля. Соединение закрыто."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Успешное подключение к aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Соединение установлено."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
-msgstr "Внешнее Соединение: В доступе отказано по причине:"
+msgstr "Внешнее Соединение: в доступе отказано по причине: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Внешнее Соединение: авторизация неудачна."
 
-#: src/LibSocketAsio.cpp:1592
-#, fuzzy, c-format
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr "Ошибка создания UDP-сокета %s %d: %s"
+
+#: src/LibSocketAsio.cpp
+#, c-format
 msgid "Asio thread %d started"
-msgstr "Автоматическое обновление начато"
+msgstr "Поток Asio %d запущен"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
-msgstr "ListenSocket: Ok."
+msgstr "Сокет прослушивания: в порядке."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
-msgstr "ОШИБКА: невозможно открыть TCP порт."
+msgstr "ОШИБКА: не удалось прослушать порт TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
-msgstr "ОШИБКА:"
+msgstr "ОШИБКА: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
-msgstr "ПРЕДУПРЕЖДЕНИЕ:"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: "
+
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr "Метаданные медиа: двоичный файл ffprobe не найден. Установите ffmpeg или укажите путь к ffprobe в настройках; длительность, битрейт и кодек не будут извлечены."
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr "Метаданные медиафайла: %s отсутствует, извлекать нечего"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr "Извлечение метаданных медиафайла через ffprobe: %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr "Метаданные медиафайла: ffprobe превысил время ожидания или был отменён для %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr "Метаданные медиафайла: игнорируется неправдоподобно большой вывод ffprobe для %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr "Метаданные медиафайла: не удалось запустить ffprobe (%s) — проверьте настройки извлечения метаданных медиафайлов"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr "Метаданные медиафайла: ffprobe завершился с ошибкой (код %d) для %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr "Метаданные медиафайла: ffprobe не нашёл ничего пригодного в %s"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 "Завершено извлечение метаданных медиафайлов для %u общего файла (%u с ошибкой)"
+msgstr1 "Завершено извлечение метаданных медиафайлов для %u общих файлов (%u с ошибкой)"
+msgstr2 "Завершено извлечение метаданных медиафайлов для %u общих файлов (%u с ошибкой)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 "Завершено извлечение метаданных медиафайлов для %u общего файла"
+msgstr1 "Завершено извлечение метаданных медиафайлов для %u общих файлов"
+msgstr2 "Завершено извлечение метаданных медиафайлов для %u общих файлов"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 "Ещё для %u файла не удалось извлечь метаданные медиафайла (не показаны по отдельности)"
+msgstr1 "Ещё для %u файлов не удалось извлечь метаданные медиафайлов (не показаны по отдельности)"
+msgstr2 "Ещё для %u файлов не удалось извлечь метаданные медиафайлов (не показаны по отдельности)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 "Ещё %u общий файл отсутствует (не показан по отдельности)"
+msgstr1 "Ещё %u общих файла отсутствуют (не показаны по отдельности)"
+msgstr2 "Ещё %u общих файлов отсутствуют (не показаны по отдельности)"
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Вставить"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Очистить"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Выделить все"
 
-#: src/MuleTrayIcon.cpp:367
-#, fuzzy
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "КиБ/с"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Неограниченно"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Показать aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Свернуть aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
-msgstr "eD2k"
+msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
-msgstr "Подключен"
+msgstr "Подключён (Низкий ИД)"
 
-#: src/MuleTrayIcon.cpp:371
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
-msgstr "Подключен"
+msgstr "Подключён (Высокий ИД)"
 
-#: src/MuleTrayIcon.cpp:380
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
-msgstr " Kad: "
+msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
-msgstr "Подключен к Kad (за брандмауэром)"
+msgstr "Подключён (за экраном)"
 
-#: src/MuleTrayIcon.cpp:393
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
-msgstr "IP-адрес сервера: "
+msgstr "Сервер: "
 
-#: src/MuleTrayIcon.cpp:394
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
-msgstr "IP сервера:"
+msgstr "IP сервера: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
-msgstr "Отсоединен"
+msgstr "Не подключён"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
-msgstr "TCP порт: %d"
+msgstr "Порт TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
-msgstr "TCP порт: Не готово"
+msgstr "Порт TCP: не готов"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
-msgstr "UDP порт: %d"
+msgstr "Порт UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
-msgstr "UDP порт: Не готово"
+msgstr "Порт UDP: не готов"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
-msgstr "Информация о клиенте"
+msgstr "Сведения о клиенте"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
-msgstr "Ограничение отдачи"
+msgstr "Предел отдачи"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
-msgstr "Ограничение приема"
+msgstr "Предел загрузки"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Показать aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Отключить"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Свернуть aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Подключиться"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
-msgstr "Выйти"
-
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "кБ/сек"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Неограниченно"
+msgstr "Выход"
 
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
-msgstr "Меню aMule в области уведомлений"
+msgstr "Меню трея aMule"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Ограничения скорости:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "UL: Нет"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "UL: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DL: Нет"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DL: %u"
 
-#: src/MuleTrayIcon.cpp:797
-#, fuzzy, c-format
+#: src/MuleTrayIcon.cpp
+#, c-format
 msgid "Download speed: %.1f%s"
-msgstr "Скорость приема: %.1f"
+msgstr "Скорость загрузки: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
-#, fuzzy, c-format
+#: src/MuleTrayIcon.cpp
+#, c-format
 msgid "Upload speed: %.1f%s"
-msgstr "Скорость отдачи: %.1f"
+msgstr "Скорость отдачи: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Псевдоним: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Псевдоним не выбран!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
-msgstr "ID клиента: "
+msgstr "ИД клиента: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Имя сервера: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP-адрес сервера: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
-msgstr "Не подключен"
+msgstr "Не подключён"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
-msgstr "Онлайн-подпись: Включена"
+msgstr "Сетевая подпись: включена"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
-msgstr "Онлайн-подпись: Выключена"
+msgstr "Сетевая подпись: отключена"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Время работы: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Опубликованные файлы: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Клиентов в очереди: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Всего загружено: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
-msgstr "Всего передано: %s"
+msgstr "Всего отдано: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k ссылка:"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr "Создан %s на порту %u"
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Добавить"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr "ПРЕДУПРЕЖДЕНИЕ! %s: пакет для %s отброшен из-за ошибки (%s) при отправке."
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr "Вставьте сюда ссылки eD2k или магнит-ссылки"
+
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "Добавить ссылки"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
-msgstr "Нажмите сюда чтобы добавить eD2k ссылку из текстового поля в очередь загрузок."
+msgstr "Нажмите сюда, чтобы добавить ссылку eD2k из текстового поля в очередь загрузок."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
-msgstr "Тут отображаются события. Для полного списка событий, обратитесь к журналу в окне \"Сети\"."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr "События отображаются здесь. Для полного списка событий обратитесь к журналу во вкладке «Сети»."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
-msgstr "Загружается..."
+msgstr "Подгрузка…"
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
-msgstr "Количество пользователей на сервере, к которым вы подключены..."
+msgstr "Количество пользователей на сервере, к которым вы подключены…"
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Пользователей: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
-msgstr "Пользователи, подключенные к данному серверу и оценка общего количества пользователей."
+msgstr "Пользователи, подключённые к текущему серверу, и примерное общее число пользователей."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
-msgstr "Передача: 0.0 | Прием: 0.0"
+msgstr "Отд: 0,0 | Заг: 0,0"
 
 # Тултип. Лучше оставить как можно более коротким (не все системы автоматом
 # делают их многострочными ;-))
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
-msgstr "Входящая и исходящая усредненные скорости. Значения в скобках (если включены), отображают служебный трафик (трафик связи между клиентами)."
+msgstr "Текущая средняя скорость отдачи и загрузки. Если включено, числа в скобках обозначают служебный трафик от обмена данными с клиентами."
 
 # Тултип. Лучше оставить как можно более коротким (не все системы автоматом
 # делают их многострочными ;-))
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 (оптимальный вариант)."
+msgstr "Отображает статус подключения и активные передачи. Красные стрелки означают, что вы в данный момент не подключены, жёлтые стрелки — что у вас Низкий ИД (LowID, вы за межсетевым экраном), а зелёные стрелки — что у вас Высокий ИД (HighID, оптимальный тип подключения)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
-msgstr "Не подключен..."
+msgstr "Не подключён…"
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
-msgstr "Подключен к серверу."
+msgstr "Сейчас подключён к серверу."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Поиск"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Имя:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Тип"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Локальный"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Глобальный"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
-msgstr "Дополнительные параметры"
+msgstr "Расширенные параметры"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
-msgstr "Фильтрация"
+msgstr "Фильтр"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Тип файла"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Любой"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Архив"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "CD-образ"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr "Образ диска"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Изображение"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Программа"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Текст"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Видео"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Расширение"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Мин. размер"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Байт"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "КБ"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "МБ"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "ГБ"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "КиБ"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "МиБ"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "ГиБ"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Макс. размер"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Доступность"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Фильтр:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Фильтровать результаты"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Фильтр"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
-msgstr "Инвертировать"
+msgstr "Обратить результаты"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Скрывать известные файлы"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr "Сбросить фильтры"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Начать"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Дополнительно"
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "Расширить"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
-msgstr ""
+msgstr "Запросить у уже ответивших пиров Kad расширение поиска. Каждый клик опрашивает следующего ближайшего пира на предмет дополнительных контактов (KADEMLIA_FIND_VALUE_MORE), выявляя дополнительные совпадения файлов, пропущенные начальной альфа-границей поиска."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Остановить"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
-msgstr "Загрузка"
+msgstr "Загрузить"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Загрузить в категорию"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "Очистить результаты поиска"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Сбросить значения"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Результаты"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
-msgstr "Очистить результаты"
+msgstr "Очистить завершённые загрузки"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Фильтр:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
-msgstr "Источников:"
+msgstr "Источники файлов:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
-msgstr "Общие"
-
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Полное имя :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
+msgstr "Основные"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Файл met:"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Хеш:"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Размер файла:"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Полное имя"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "Met-файл"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Хеш"
 
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Статус:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Последний раз полный файл был доступен :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Размер файла"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Передача"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Найдено источников:"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Передающие источники:"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Число частей:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Доступно:"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Скорость передачи:"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Время активности закачки:"
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Передано:"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Завершено:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Состояние частичных файлов"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Замечен целиком"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Найдено источников"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Передающие источники"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Число частей"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Доступно"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Скорость передачи"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Время активности загрузки"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Завершено"
+
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
-msgstr "Интеллектуальная Обработка Ошибок (I.C.H.)"
+msgstr "Умный обработчик повреждений (ICH)"
+
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Потери из-за повреждений"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Выигрыш сжатия"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Экономия пакетов от ICH"
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr "Общий доступ"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Запросы"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Принято запросов"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Передано данных"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Рейтинг раздачи"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Полные источники"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "Опубликовано с"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "Последняя отдача"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Потери из-за повреждений :"
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr "Сведения о медиафайле"
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Выигрыш сжатия:"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "Длительность"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "Битрейт"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "Кодек"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "Исполнитель"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "Альбом"
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Экономия пакетов I.C.H. :"
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Заголовок"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Имя файла"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
-msgstr "Выбрать"
+msgstr "Заменить имя"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Очистить"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Применить"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
-msgstr "Ok"
+msgstr "ОК"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
-msgstr "Комментарий/Оценка файла (Текст будет доступен всем пользователям)"
+msgstr "Комментарий/оценка файла (текст доступен всем участникам)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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."
+"Напр., для фильма вы можете указать его длительность, сюжет, язык…\n"
+"Если это — фальшивка, вы можете сообщить об этом остальным пользователям aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Качество файла"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Без оценки"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
-msgstr "Ошибочный / Поврежденный / Фальшивка"
+msgstr "Неверен / повреждён / подделка"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Плохой"
 
 # было "очень хороший" непонятно почему. это название среднего рейтинга (обе
 # полоски белые)
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Нормальный"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Хороший"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
-msgstr "Великолепный"
+msgstr "Отличный"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
-msgstr "Выберите оценку файлу, или сообщите пользователям, что это - утка..."
+msgstr "Оцените файл или расскажите пользователям, что файл неверен…"
+
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "Получить из Kad"
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Обновить"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
-msgstr "Идет загрузка, подождите..."
+msgstr "Загрузка, подождите…"
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Неизвестный размер"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Обязательная информация"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP адрес :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Порт :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Порт"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Дополнительная информация"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Имя пользователя :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Хеш пользователя :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Хеш пользователя"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Добавить"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
-msgstr "Скорость приема"
-
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Текущая"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Средняя за все время"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "В среднем за сеанс"
+msgstr "Скорость загрузки"
 
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Скорость отдачи"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Соединения"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Активные загрузки"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Активные соединения (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
-msgstr "Активные передачи"
+msgstr "Активные отдачи"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Дерево статистики"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Имя пользователя:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Хеш пользователя:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Клиентское ПО:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Версия клиентского ПО:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "ПО клиента"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Версия клиента"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ИД пользователя"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP сервера"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP адрес:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Имя сервера"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID пользователя:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Маскировка"
+
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr "Расширения протокола"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP сервера:"
+#: src/muuli_wdr.cpp
+msgid "Transfers to client"
+msgstr "Передачи клиенту"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Имя сервера:"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Текущий запрос"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Вуалирование:"
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Средняя скорость отдачи"
 
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Средняя скорость загрузки"
 
-#: src/muuli_wdr.cpp:1095
-msgid "Transfers to client"
-msgstr "Передача"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Отдано (за сеанс)"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Текущий запрос:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Средняя скорость отдачи:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Средняя скорость приема:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Передано (сеанс):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Принято (этот сеанс):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Передано всего:"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Принято всего:"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Загружено (за сеанс)"
 
-#: src/muuli_wdr.cpp:1148
-msgid "Scores"
-msgstr "Счет"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Отдано (всего)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Загружено (всего)"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Модификатор DL/UP:"
+#: src/muuli_wdr.cpp
+msgid "Scores"
+msgstr "Счёт"
 
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Безопасная идентификация:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Безопасный ИД"
 
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "QR:"
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Позиция в очереди"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Счет на передачу:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Счёт очереди"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - многоплатформный Mule"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Это имя, которое будет показано пользователям, подключающимся к вам."
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
-msgstr "Язык:"
+msgstr "Язык: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Задержка отображения контекстных подсказок (как эта) в секундах."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
-msgstr "Выберите язык интерфейса."
+msgstr "Указывает язык, используемый для элементов управления."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Проверка наличия новой версии при запуске"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
+msgstr "Периодически проверять наличие новой версии"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
-msgstr "При запуске aMule будет проверено наличие новой версии"
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr "При включённом флажке aMule проверяет наличие новой версии при запуске и раз в день во время работы"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
-msgstr ""
+msgstr "Регистрирует запись автозапуска для текущего пользователя в ОС, чтобы aMule запускался при входе в систему. Если вы переместите исполняемый файл aMule, запустите его после этого один раз вручную, чтобы обновить запись."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr "Делает aMule обработчиком по умолчанию для ссылок ed2k://, чтобы при нажатии на них в браузере или файловом менеджере, они открывались здесь."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr "aMule обрабатывает только магнит-ссылки eD2k (вида xt=urn:ed2k:). Магнит-ссылки БитТоррента НЕ поддерживаются, и переход по ним завершится неудачей без уведомления. Если вы пользуетесь клиентом БитТоррент (Transmission, qBittorrent и т. д.), оставьте эту опцию отклюеённой."
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr "Открытие коллекции ставит в очередь все содержащиеся в ней ссылки eD2k. В Windows это добавляет aMule в список «Открыть с помощью» и делает его приложением по умолчанию, только если ни одна другая программа не заняла этот тип файлов."
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
-msgstr "Сворачиваться при запуске"
+msgstr "Сворачивать при запуске"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
-msgstr "Сразу после запуска  aMule будет минимизирован в область уведомлений."
+msgstr "Сразу после запуска aMule будет свёрнут."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Подтверждение при выходе"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
-msgstr "Делать подтверждающий запрос перед выходом"
+msgstr "Запрашивать подтверждение перед выходом."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Значок в области уведомлений"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
-msgstr "Эта опция включает/выключает значок в области уведомлений"
+msgstr "Включить/отключить значок в системном трее или на панели задач."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
-msgstr ""
+msgstr "Скрывать окно приложения при нажатии кнопки закрытия"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Сворачивать в область уведомлений"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Сворачивать aMule в область уведомлений, а не в панель задач."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "Показывать уведомления о завершении загрузки"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
-msgstr ""
+msgstr "При включённом флажке aMule показывает уведомления по завершении загрузки."
+
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr "Запоминать историю поиска"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr "Сохраняет раскрывающийся список ваших прошлых поисковых запросов в поле «Имя» вкладки поиска. Запоминаются введённые запросы, а не полученные по ним результаты."
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
-msgstr "Время задержки подсказок:"
+msgstr "Время задержки подсказок: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "секунд"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Выбор браузера"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
-msgstr "Введите имя предпочитаемого браузера. Оставьте поле пустым чтобы использовать системный браузер по умолчанию."
-
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Открыть"
+msgstr "Введите имя предпочитаемого браузера. Оставьте поле пустым, чтобы использовать системный браузер по умолчанию."
 
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
-msgstr "Открывать в новой вкладке"
+msgstr "Открывать в новой вкладке по возможности"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
-msgstr "Открывать веб-страницы в новой вкладке, а не в отдельном окне, если это возможно"
+msgstr "Открывать веб-страницы в новой вкладке, а не в отдельном окне, по возможности"
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
-msgstr "Видео-проигрыватель"
+msgstr "Проигрыватель видео"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
-msgstr "Ограничения загрузки"
+msgstr "Ограничения скорости передачи"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Отдача"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
-msgstr "Слот"
+msgstr "Выделение слотов"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Порты"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Стандартный порт TCP"
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
-msgstr "Это стандартный порт eD2k, он не может быть отключен."
+msgstr "Это стандартный порт eD2k, его нельзя отключить."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Порт UDP для запросов сервера (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Дополнительный порт UDP (Kad / Глобальный поиск)"
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Этот порт UDP используется для дополнительных eD2k запросов и Kad"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Разрешить UPnP форвардинг портов роутера"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
-msgstr "UPnP TCP порт (Не обязательно):"
+msgstr "Порт UPnP TCP (необязательно):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
-msgstr "Закрепить локальный адрес за IP (пустой для любого):"
+msgstr "Привязать локальный адрес к IP (пусто — любой):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 msgid "Advanced users only: If you have multiple network interfaces, enter the address of the interface to which aMule should be bound."
-msgstr "Только для продвинутых пользователей: если у вас несколько сетевых интерфейсов введите адрес того, которым будет пользоваться aMule."
+msgstr "Только для опытных пользователей: если у вас несколько сетевых интерфейсов, введите адрес того, которым будет пользоваться aMule."
+
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr "Привязать к сетевому интерфейсу (пусто — любой):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr "Только для опытных пользователей: привязывает весь трафик aMule к одному сетевому интерфейсу, выбранному из списка или введённому вручную по имени (напр., tun0, eth0, en0) или индексу. В отличие от привязки к IP-адресу, это не даёт трафику уходить через маршрут по умолчанию — полезно при использовании VPN. Не требует повышенных привилегий."
 
-#: src/muuli_wdr.cpp:1391
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
-msgstr "Максимум источников на файл:"
+msgstr "Максимум источников на загружаемый файл:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Максимум одновременных соединений:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
-msgstr "Соединяться автоматически после запуска"
+msgstr "Автоподключение при запуске"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
-msgstr "Восстановить соединение в случае разрыва"
+msgstr "Переподключать при обрыве связи"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Удалить нерабочий сервер после"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr "Постоянные серверы никогда не удаляются, даже если они недоступны."
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "попыток"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Автоматически обновлять список серверов при запуске"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Список"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Обновлять список серверов при подключении к серверу"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Обновлять список серверов при подключении к клиенту"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Использовать систему приоритетов"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
-msgstr "Проверка на LowID при подключении к серверу"
+msgstr "Умная проверка на Низкий ИД при подключении"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
-msgstr "Безопасное подключение"
+msgstr "Осторожное подключение к серверам"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
-msgstr "Автоподключение только к статическим серверам"
+msgstr "Автоподключение только к постоянным серверам"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Высокий приоритет серверов, добавленных вручную"
 
-# слишком уж частая аббривеатура. написать И.О.О. - никто не поймет
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Интеллектуальная Обработка Ошибок (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Разрешить"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr "AICH-доверие для каждого хэша (не рекомендуется)"
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
-msgstr "Добавлять файлы на загрузку в режиме паузы"
+msgstr "Добавлять файлы для загрузки в режиме паузы"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
-msgstr "Добавлять файлы в загрузку с авто приоритетом"
+msgstr "Добавлять файлы для загрузки с автоматическим приоритетом"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Пытаться сначала загрузить первую и последнюю части"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr "Режим завершения: переключать на быстрые источники для последних блоков"
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
-msgstr "Возобновлять следующий файл на паузе при завершении загрузки"
+msgstr "Возобновлять следующий файл из паузы по завершении текущего"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Из той же категории"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "В алфавитном порядке"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
-msgstr "Заранее выделять место для новых фалов"
+msgstr "Заранее выделять место на диске для новых фалов"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Сразу выделяет место под весь файл. Таким образом уменьшается фрагментация"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr "Создавать новые файлы как разреженные"
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr "Разрежённые частичные файлы занимают место на диске только для уже загруженных частей, так что свободное место расходуется постепенно по мере заполнения файла. Отключите эту опцию, чтобы использовать обычный файл — полезно, если разрежённые файлы не поддерживаются или работают медленно, либо если средства резервного копирования / дедупликации плохо с ними работают. Действует только когда ядро запущено в Windows; в Linux и macOS part-файлы и так разрежённые, и этот параметр не влияет."
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
-msgstr "Останавливать загрузки по окончанию свободного места на диске"
+msgstr "Остановить загрузки, если на диске свободно менее "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
-msgstr "Отметьте это если  хотите чтобы aMule проверял наличие свободного места"
+msgstr "Отметьте это, если хотите, чтобы aMule проверял наличие свободного места"
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
-msgstr "Введите здесь минимальное количество свободного места на диске."
+msgstr "Введите здесь минимальный размер свободного места на диске."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Оставлять 10 источников для редких файлов (<20 источников)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Отдача"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Добавлять новые файлы для публикации с авто приоритетом"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Папка для загружаемых файлов"
+# слишком уж частая аббривеатура. написать И.О.О. - никто не поймет
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Умный обработчик повреждений (ICH)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Разрешить"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Расширенный ICH доверяет каждому хешу (не рекомендуется)"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr "Извлечение метаданных медиафайлов"
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "Извлекать длительность / битрейт / кодек из общих файлов аудио и видео"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr "Если включено, aMule запускает ffprobe для каждого общего медиафайла, чтобы заполнить столбцы «Длительность» / «Битрейт» / «Кодек», которые видят другие клиенты при обнаружении файла в поиске. Требуется установленный ffmpeg (исполняемый файл ffprobe)."
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr "Путь к ffprobe:"
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr "Полный путь к исполняемому файлу ffprobe. Оставьте пустым, чтобы aMule определял его автоматически при запуске."
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr "Определить"
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr "Найти исполняемый файл ffprobe в стандартных местах установки и заполнить поле пути."
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
+"Здесь хранятся завершённые загрузки. Все файлы в этой папке автоматически становятся доступны другим пирам.\n"
+"Если в этой папке также есть файлы, которыми вы не хотите делиться, укажите вместо неё отдельную подпапку только для aMule."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
-msgstr ""
-
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr ""
+msgstr "Выберите папку, в которой будут храниться завершённые загрузки. Все файлы в этой папке будут доступны другим пирам."
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Папка для временных файлов"
-
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "Публикуемые папки"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr "(Папки, опубликованные ядром. Введите путь, чтобы добавить новую.)"
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr "Абсолютный путь к папке на машине ядра, напр. /home/user/shared"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr "Рекурсивно"
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr "Публиковать каждую вложенную подпапку, включая созданные позже."
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Удалить"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
-msgstr "(кликните правой кнопкой на значке каталога для рекурсивной публикации)"
+msgstr "(ПКМ по значку каталога для рекурсивной публикации)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
-msgstr "Включая скрытые файлы"
+msgstr "Публиковать скрытые файлы"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
-msgstr ""
+msgstr "Автоматически проверять изменения в общих папках"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
-msgstr ""
+msgstr "Переходить по символическим ссылкам в общих папках"
+
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr "Исключать файлы по шаблону:"
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr "Шаблоны с подстановочными знаками, разделённые «|», напр. .DS_Store|Thumbs.db|*.tmp. Файлы с совпадающим именем не публикуются. Регистр не учитывается."
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr "Шаблоны являются регулярными выражениями"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr "Если включено, всё поле является одним регулярным выражением («|» означает альтернативу). Если выключено, это список подстановочных шаблонов, разделённых «|»."
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr "Показать, сколько общих файлов исключит текущий шаблон."
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr "Если файлы подключённого ядра находятся на другой машине, укажите соответствие между путём, который сообщает ядро, и тем, где эта файловая система доступна с этого компьютера (напр., сетевой ресурс), чтобы команды «Открыть» и «Показать в папке» работали."
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr "Сопоставление путей"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr "Удалённый префикс"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr "Префикс пути, который сообщает ядро, например /home/user/downloads/incoming"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr "Локальный префикс"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr "Где эта же папка доступна с этого компьютера, напр. смонтированный сетевой ресурс"
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Графики"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
-msgstr "Интервал обновления: 5 сек"
+msgstr "Задержка обновления: 5 секунд"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
-msgstr "Время для среднестатического графика: 100 минут"
+msgstr "Время для усреднения графика: 100 минут"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Масштаб графика соединений: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Масштаб графика загрузки:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Масштаб графика отдачи:"
 
-#: src/muuli_wdr.cpp:1660
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Colors: "
-msgstr "Цвета:"
+msgstr "Цвета: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Фон"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Сетка"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Текущая загрузка"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Средняя общая загрузка"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Средняя загрузка за сеанс"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Текущая отдача"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Средняя общая отдача"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Средняя отдача за сеанс"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Активные соединения"
 
-#: src/muuli_wdr.cpp:1675
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
-msgstr "Скорость передачи в области уведомлений"
+msgstr "Индикатор скорости в значке трея"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Узлы Kad (текущие)"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Узлы Kad (действующие)"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
-msgstr "Узлы Kad (сессия)"
+msgstr "Узлы Kad за сеанс"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Выбрать"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Дерево"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
-msgstr "Число отображаемых версий клиентов (0=неогр.)"
+msgstr "Число отображаемых версий клиентов (0 — без ограничения)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! ВНИМАНИЕ !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
-msgstr "Предел количества новых соединений за 5 секунд"
+msgstr "Предел числа новых соединений за 5 секунд"
+
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr "Одновременные запросы источников Kad"
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr "Период повторного поиска источников Kad (мин.)"
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr "Период повторного запроса источников (мин.)"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
-msgstr "Размер буфера: 240000 байт"
+msgstr "Размер буфера файла: 240000 байт"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr "Включить MMAP: доступ с отображением файлов в память (экономит память)"
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr "Отображает частичные файлы в память вместо буферизации в куче, снижая потребление памяти процессом. На некоторых дисках может снижать скорость загрузки; лучше всего подходит для узлов с ограниченной памятью или высокой нагрузкой на отдачу."
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
-msgstr "Размер очереди: 5000 клиентов"
+msgstr "Размер очереди отдачи: 5000 клиентов"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Интервал обновления соединения с сервером: Отключено"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
-msgstr "Отключить засыпание компьютера"
+msgstr "Отключить таймер перехода компьютера в режим ожидания"
 
 # в LA помнится так и перевели - "шкурка", но по-моему глупо.
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
-msgstr "Скин:"
+msgstr "Использовать тему: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
-msgstr "Показывать строку \"быстрой загрузки\" в каждой вкладке."
+msgstr "Показывать «Быстрый обработчик ссылок eD2k» в каждом окне"
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Показывать дополнительную информацию на закладках категорий"
 
-#: src/muuli_wdr.cpp:1784
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
-msgstr "Выводить скорость передачи в заголовке"
+msgstr "Показывать версию приложения в заголовке"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Выводить скорость передачи в заголовке"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Перед именем приложения"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "После имени приложения"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Показывать скорость служебного трафика"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
-msgstr "Вертикальное расположение панели инструментов"
+msgstr "Расположить панель инструментов вертикально"
+
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr "Динамическая сортировка столбцов (упорядочивание строк при смене значений)"
 
 # This is the heading for the preference options regarding the files in the
 # transfer list.
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
-msgstr "Загружаемые файлы"
+msgstr "Файлы в очереди загрузки"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
-msgstr "Показывать процент загрузки"
+msgstr "Показывать процент выполнения"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Показывать полосу выполнения"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Плоская"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Круглая"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Авто-сортировка файлов (нагружает процессор)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule будет сортировать файлы в списке загрузок автоматически."
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Параметры внешних соединений"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Принимать внешние соединения"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP прослушиваемого интерфейса:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 означают любой интерфейс."
+msgstr "Введите верный IP формате A.B.C.D для прослушиваемого интерфейса внешних соединений. Пустое поле или 0.0.0.0 — любой интерфейс."
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
-msgstr "порт TCP:"
+msgstr "Порт TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
-msgstr "Включить UPnP для порта ВС"
+msgstr "Включить UPnP-проброс для порта внешних соединений"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Пароль"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr "Требовать шифрованные соединения (отклоняет клиенты без шифрования)"
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr "Параметры сервера aMule API"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr "Запускать amuleapi (REST API) при старте"
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "Порт HTTP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr "Интерфейс, на котором HTTP-сервер amuleapi ожидает подключения. 127.0.0.1 (по умолчанию) принимает только локальные подключения; используйте 0.0.0.0 или конкретный IP-адрес, чтобы сделать сервер доступным для других узлов (задайте пароль администратора ниже)."
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr "Введите пароль, чтобы установить или изменить его. Сохранённые пароли нельзя показать, поэтому если оставить поле пустым, текущий пароль сохранится."
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "Пароль администратора"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "Пароль установлен."
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "Включить гостевой доступ"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr "Гостевые сеансы могут просматривать статус и списки, но не могут ничего изменять. Отключение этой опции удаляет сохранённый гостевой пароль."
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "Гостевой пароль"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Параметры веб-сервера"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "Запускать веб-сервер при старте"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr "Запускать веб-сервер при старте (устарело)"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Веб-шаблон"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Пароль для обычного доступа"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Разрешить ограниченный доступ"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Пароль ограниченного доступа"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
-msgstr "Разрешить UPnP форвардинг порта веб-сервера"
+msgstr "Включить проброс порта веб-сервера через UPnP"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
-msgstr "UPnP TCP порт веб-сервера (не обязательно):"
+msgstr "Порт UPnP TCP веб-сервера (необязательно)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Период обновления страницы (в секундах)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Включить сжатие Gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr "Сбросить настройки страницы"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr "Сбросить настройки на текущей странице к значениям по умолчанию."
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "ОК"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
-msgstr "Кликните тут, чтобы сохранить внесенные вами изменения."
+msgstr "Нажмите здесь, чтобы применить изменения, сделанные в настройках."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Сбросить все изменения, внесенные вами."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Заголовок :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Комментарий :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Каталог загрузок:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Установить приоритет для новых файлов:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Каталог загрузок"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Смена приоритета для новых присвоенных файлов"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
-msgstr "Не изменять"
+msgstr "Не менять"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Выбрать цвет для этой категории:"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Сбросить"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Выбор цвета для этой категории (сейчас выбран)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
-msgstr "Кликните тут для очистки журнала."
+msgstr "Нажмите эту кнопку для очистки журнала."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
-msgstr "Кликните здесь чтобы обновить список серверов через URL ..."
+msgstr "Нажмите для обновления списка серверов из URL-адреса…"
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Список серверов"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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' и нажмите кнопку слева для обновления списка известных серверов."
+msgstr "Введите адрес к файлу server.met и нажмите кнопку слева для обновления списка известных серверов."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Добавить сервер вручную: Имя"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Введите имя нового сервера"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Порт"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
-msgstr "Введите здесь IP-адрес сервера в формате: x.x.x.x"
+msgstr "Введите IP-адрес сервера в формате x.x.x.x."
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Введите здесь порт сервера."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Добавить сервер (предварительно заполните поля слева) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Журнал aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
-msgstr "Сообщение сервера"
+msgstr "Сведения сервера"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
-msgstr "Инфо ED2K"
+msgstr "Сведения ED2K"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
-msgstr "Инфо Kad"
+msgstr "Сведения Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
-msgstr "Нажмите на эту кнопку чтобы обновить список узлов из URL..."
+msgstr "Нажмите для обновления списка узлов из URL-адреса…"
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Узлы (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Ведите сюда URL к файлу nodes.dat и нажмите кнопку слева чтобы обновить список известных узлов."
+msgstr "Ведите сюда URL-адрес к файлу nodes.dat и нажмите кнопку слева, чтобы обновить список известных узлов."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Статистика узлов"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Инициализация"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Новый узел"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Порт:"
-
 # Похоже, bootstrap в eMule перевели как инициализация
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "Инициализация от известных клиентов"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Отключить Kad"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr "Начальная загрузка с узла: IP"
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Введите здесь IP-адрес узла в формате x.x.x.x."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Использовать безопасную идентификацию пользователя"
 
 # интересно, что на самом деле подразумевалось под 'credits'
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
-msgstr "Рекомендуется включить данную опцию. Вы не будете получать рейтинга если БИП выключена."
+msgstr "Рекомендуется включить этот параметр. Если SUI не включена, вы не будете получать кредиты."
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
-msgstr "Вуалирование протокола"
+msgstr "Маскировка протокола"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
-msgstr "Поддержка вуалирования протокола"
+msgstr "Поддержка маскировки протокола"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
-msgstr "Включает вуалирование протокола и позволяет aMule принимать завуалированные соединения от других клиентов."
+msgstr "Включает маскировку протокола и позволяет aMule принимать замаскированные соединения от других клиентов."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
-msgstr "Использовать вуалирование исходящих соединений"
+msgstr "Использовать маскировку исходящих соединений"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
-msgstr "Включает вуалирование протокола при соединении с другими клиентами и серверами."
+msgstr "Включает маскировку протокола при соединении с другими клиентами и серверами."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
-msgstr "Принимать только завуалированные соединения"
+msgstr "Принимать только замаскированные соединения"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
-msgstr "aMule будет принимать только завуалированные соединения. У вас будет меньше источников, но зато весь трафик будет завуалирован."
+msgstr "aMule будет принимать только обфусцированные соединения. Источников станет меньше, но весь трафик будет обфусцирован"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Все"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Никто"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
-msgstr "Кто может запрашивать публикуемые файлы:"
+msgstr "Кто может видеть мои опубликованные файлы:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr "Выберите, кому показывать список ваших файлов."
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
-msgstr "Фильтрование IP"
+msgstr "Фильтрация IP"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
-msgstr "Фильтровать клиентов."
+msgstr "Фильтровать клиентов"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Включает фильтрацию IP клиентов в соответствии с файлом ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
-msgstr "Фильтровать сервера"
+msgstr "Фильтровать серверы"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Включает фильтрацию IP серверов в соответствии с файлом ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
-msgstr "Обновить список"
+msgstr "Перезагрузить список"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
-msgstr "Прочесть список IP адресов, указанных в файле '~/.aMule/ipfilter.dat'."
+msgstr "Перезагрузить список IP-адресов для фильтрации из файла ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
-msgstr "URL:"
+msgstr "Адрес:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Обновить сейчас"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Автоматически обновлять IP-фильтр при запуске"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Уровень фильтрации:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
-msgstr "Всегда фильтровать IP-адреса LAN"
+msgstr "Всегда фильтровать IP-адреса локальной сети"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
-msgstr "Параноидная обработка несовпадающих IP "
+msgstr "Усиленная обработка несовпадающих IP-адресов"
 
-#: src/muuli_wdr.cpp:2438
-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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr "Отклоняет пакет, если его исходный IP-адрес отличается от IP-адреса, заявленного клиентом (проверка против спуфинга). Отключайте только при возникновении проблем с подключением."
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
-msgstr "Использовать системный ipfilter.dat если возможно"
+msgstr "Использовать системный ipfilter.dat по возможности"
 
-#: src/muuli_wdr.cpp:2441
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
-msgstr "Если не найден локальный ipfilter.dat разрешить использовать системный"
+msgstr "Если локальный файл ipfilter.dat не найден, разрешить использование общесистемного файла ipfilter."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
-msgstr "Включить Online-подпись"
+msgstr "Включить сетевую подпись"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
-msgstr "Включает запись файла OS, который может использоваться другими приложениями для создания подписей."
+msgstr "Включает запись файла сетевой подписи, который может использоваться другими приложениями для создания подписей."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
-msgstr "Частота обновления (в секундах):"
+msgstr "Период обновления (в секундах):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
-msgstr "Изменить частоту обновления для Online-подписи в секундах."
+msgstr "Изменить частоту обновления в секундах для сетевой подписи."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
-msgstr "Сохранять Online-подпись в:"
+msgstr "Сохранять файл сетевой подписи в: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
-msgstr "Кликните здесь, чтобы выбрать каталок для файлов Online-подписи."
+msgstr "Нажмите здесь, чтобы выбрать каталог, содержащий файлы сетевых подписей."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
-msgstr "Показывать национальные флаги клиентов"
+msgstr "Показывать флаги стран для клиентов"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
-msgstr ""
+msgstr "Отображать столбец с флагом страны в списках передач, очереди и поиска. Требуется действительная база данных GeoIP в формате MMDB (см. ниже)."
 
-#: src/muuli_wdr.cpp:2520
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Database"
-msgstr "Скорость передачи:"
+msgstr "База данных"
 
-#: src/muuli_wdr.cpp:2536
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Source:"
-msgstr "Источники"
+msgstr "Источник:"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
-msgstr ""
+msgstr "DB-IP (бесплатно, без учётной записи)"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
-msgstr ""
+msgstr "MaxMind GeoLite2 (бесплатно, требуется учётная запись)"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
-msgstr ""
+msgstr "Свой URL-адрес"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
-msgstr ""
+msgstr "Выберите поставщика базы данных GeoIP в формате MMDB. По умолчанию используется DB-IP — учётная запись не требуется. Для MaxMind требуется бесплатная учётная запись и лицензионный ключ. Используйте пользовательский URL-адрес, чтобы указать на любой другой источник MMDB (напр., локальное зеркало)."
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
 "IP-to-Country data by DB-IP.com - https://db-ip.com\n"
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
+"Настройка не требуется.\n"
+"\n"
+"Данные IP-to-Country предоставлены DB-IP.com — https://db-ip.com\n"
+"Лицензия: Creative Commons BY 4.0 — https://creativecommons.org/licenses/by/4.0/"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
-msgstr ""
+msgstr "Ключ лицензии:"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4300,483 +5467,551 @@
 "License: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
+"Создайте бесплатную учётную запись и ключ лицензии в MaxMind:\n"
+"https://www.maxmind.com/en/geolite2/signup\n"
+"\n"
+"Включает данные GeoLite2 от MaxMind — https://www.maxmind.com\n"
+"Лицензия: MaxMind GeoLite2 EULA — https://www.maxmind.com/en/geolite2/eula\n"
+"Требует указания авторства и регистрации; обновляйте не реже раза в 30 дней."
 
-#: src/muuli_wdr.cpp:2595
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
-msgstr "Прием: "
+msgstr "URL для загрузки:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
+"Должен указывать на файл .mmdb либо на .gz / .tar.gz, содержащий такой.\n"
+"Адрес может включать учётные данные (https://user:pass@host/…).\n"
+"Лицензия и условия указаны по адресу источника — ответственность на вас."
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
-msgstr ""
+msgstr "Загрузить базу данных GeoIP из выбранного источника."
 
-#: src/muuli_wdr.cpp:2616
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
-msgstr "Автоматически обновлять IP-фильтр при запуске"
+msgstr "Автообновление при запуске"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
-msgstr ""
+msgstr "Повторно загружать базу данных GeoIP из выбранного источника при каждом запуске aMule."
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Фильтровать входящие сообщения (кроме текущего чата):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Фильтровать все сообщения"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Фильтровать сообщения пользователей не из вашего списка друзей"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Фильтровать сообщения от неизвестных клиентов"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
-msgstr "Фильтровать сообщения по содержанию (используйте ',' как разделитель):"
+msgstr "Фильтровать сообщения по содержимому (разделять «,»):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
-msgstr "Добавьте сюда ключевые слова, при наличии которых aMule будет отфильтровывать и блокировать входящие сообщения."
+msgstr "Добавьте слова, при наличии которых aMule будет фильтровать и блокировать сообщения"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Показывать полученные сообщения в логе"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Комментарии"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
-msgstr "Фильтровать комментарии содержащие (используйте ',' как разделитель):"
-
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Включить идентификацию"
+msgstr "Фильтровать комментарии содержащие (разделять «,»):"
 
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Включить/выключить использование пароля и логина"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Имя:"
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Имя пользователя для подключения к прокси-серверу"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Пароль:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Пароль для подключения к прокси-серверу"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Использовать прокси-сервер"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Включить/выключить поддержку прокси-сервера"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Тип прокси-сервера:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Прокси-сервер:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Тип прокси-сервера"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Прокси-сервер"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Имя прокси-сервера"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Порт:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Порт прокси"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Порт прокси-сервера"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Включить авторизацию"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Включить/выключить использование пароля и логина"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Имя пользователя для подключения к прокси-серверу"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Пароль для подключения к прокси-серверу"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Соединиться с:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
-msgstr "Войти на удаленный aMule"
-
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Имя пользователя"
+msgstr "Войти на удалённый aMule"
 
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
-msgstr "Запомнить настройки"
+msgstr "Запомнить эти настройки"
 
-#: src/muuli_wdr.cpp:2766
-#, fuzzy
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "Шифровать соединение (рекомендуется)"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
-msgstr "Использовать gzip-сжатие"
+msgstr "Принудительно использовать сжатие ZLIB"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Записывать в журнал подробные сообщения отладчика."
 
-#: src/muuli_wdr.cpp:2792
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
-msgstr "&Открыть файл"
+msgstr "Только в файл журнала"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Категории сообщений:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
-msgstr "Ожидание..."
+msgstr "Ожидание…"
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Добавить файлы"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
-msgstr "Перезапустить выбранное"
+msgstr "Повторить выбранное"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Удалить выбранное"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
-msgstr "Типы Событий"
+msgstr "Типы событий"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
-msgstr "Статистика и очередь клиентов для выбранных файлов: За сессию / За все время"
+msgstr "Статистика и очередь клиентов для выбранных файлов: за сеанс / за всё время"
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
-msgstr "Активные загрузки"
+msgstr "Активные отдачи"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Процент от всех файлов"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Показать клиентов для"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
-msgstr "Все файлы"
+msgstr "Всех файлов"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
-msgstr "Выбранные файлы"
+msgstr "Выбранных файлов"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
-msgstr "Только активные передачи"
+msgstr "Только активных отдач"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Показать клиентов для"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Обновить:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Обновить список публикуемых файлов"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Отправить"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Отправить данное сообщение."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Закрыть данный чат."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Соединиться с произвольным сервером и/или Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "Отменить %s"
 
-# подпись в главном окне. длинная просто не влезет.
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Файлы"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "Отключить %s"
 
-#: src/OScopeCtrl.cpp:242
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "Подключить %s"
+
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Отключено %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
-msgstr0 "Б"
-msgstr1 "байт"
+msgstr0 "байт"
+msgstr1 "байта"
 msgstr2 "байт"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "КБ"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "ТБ"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "ТиБ"
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "К"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "М"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "Г"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "Т"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
-msgstr0 "Б/с"
-msgstr1 "байт/сек"
-msgstr2 "байт/сек"
-
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "МБ/с"
+msgstr0 "байт/с"
+msgstr1 "байт/с"
+msgstr2 "байт/с"
+
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "МиБ/с"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "с"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "м"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "ч"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "д"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "все"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "все остальные"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
-msgstr "Незавершенные"
+msgstr "Незавершённые"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Остановлен"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Видео"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Архив"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Текст"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Активные"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
-msgstr "Используем директорию конфигурации: %s"
+msgstr "Используемый каталог конфигурации: %s"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr "У этого источника нет части"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr "Эта часть есть и у вас, и у источника"
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr "Сейчас загружается от этого источника"
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr "Следующая часть, которая будет запрошена у этого источника"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr "У источника есть эта часть, и она вам ещё нужна"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr "У этого пира уже есть эта часть"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr "У этого пира нет этой части"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr "Ни у одного другого источника нет этой части"
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr "У одного другого источника есть эта часть"
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr "У %u или более других источников есть эта часть"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr "Уже прочитано и захэшировано"
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr "Ожидает чтения"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr "По одному блоку на каждую часть загружаемого файла."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr "По одному блоку на каждую часть публикуемого файла."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "По одному блоку на каждую часть публикуемого файла; цвет показывает, у скольких других источников есть эта часть."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "По одному блоку на каждую часть публикуемого файла; показывает, как далеко продвинулось перехеширование."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr "Промежуточное состояние, темнеет по мере добавления других источников"
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Ожидание завершения нити конвертации файла..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Импортируется %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Чтение из временного каталога"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
-msgstr "Извлекаю основную информацию из информационного файла загрузки"
+msgstr "Извлечение основной информации из файла информации о загрузке"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Создаю целевой файл"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
-msgstr "Загружаю данные из старого файла загрузки (%u из %u)"
+msgstr "Подгрузка данных из старого файла загрузки (%u из %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Сохраняю данные в новый монолитный файл загрузки (%u из %u)"
+msgstr "Сохранение блока данных в новый единый файл загрузки (%u из %u)"
 
 # не уверен что верно
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
-msgstr "Получаем информацию по источникам"
+msgstr "Получение информации об источнике загрузки"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
-msgstr "Добавляю загрузку и сохраняю новый частично закачанный файл"
+msgstr "Добавление загрузки и сохранение нового частичного файла"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
-msgstr "Импорт частично загруженных файлов"
+msgstr "Импорт частичных файлов"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Состояние"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Хеш файла"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Диск: %s)"
 
 # Полностью лучше не переводить - это титул небольшого диалога.
 # Если перевести полностью - будет маленький, но широоооокий диалог :)
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
-msgstr "Укажите каталог для поиска незавершенных загрузок."
+msgstr "Выберите папку для поиска незавершённых загрузок (включая подпапки)!"
 
-#: src/PartFileConvertDlg.cpp:208
-#, fuzzy
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
-msgstr "Вы хотите, чтобы исходные файлы импортированных закачек были удалены?"
+msgstr "Удалить исходные файлы успешно импортированных загрузок?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Удалить исходные файлы?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "ОШИБКА: невозможно создать part-файл"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
-msgstr "Попытка загрузки резервной копии файла '.met'  из %s"
+msgstr "Попытка подгрузки резервной копии met-файла из %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "ОШИБКА: не удалось открыть файл part.met: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ОШИБКА: файл part.met пуст: %s ==> %s"
+msgstr "ОШИБКА: файл part.met нулевого размера: %s ==> %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "ОШИБКА: неверная версия файла part.met: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
-msgstr "ОШИБКА: %s (%s) поврежден (неверные теги: %s), невозможно открыть файл."
+msgstr "ОШИБКА: %s (%s) повреждён (неверные теги: %s), невозможно подгрузить файл."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr "ОШИБКА: %s (%s) поврежден (неверное число тегов), невозможно открыть файл."
+msgstr "ОШИБКА: %s (%s) повреждён (неверное число тегов), невозможно подгрузить файл."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Попытка восстановления информации о файле..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "Восстановление безымянного файла - попытка восстановить его как 'RecoveredFile.dat'"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Восстановлена вся возможная информация о файлах ;-))) Попытаемся ее использовать..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Не удалось восстановить информацию о файлах :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Не удалось открыть %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: %s возможно поврежден (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "Ошибка сохранения part-файла: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
-msgstr "Ошибка ввода-вывода во время сохранения файла:"
+msgstr "Ошибка ввода-вывода при сохранении файла: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
-msgstr ""
+msgstr "Записано 0 / неизвестное число байт в «%s» — существующий .part.met сохранён."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
-msgstr "Не удалось сохранить файл 'part.met.seeds' для %s"
+msgstr "Не удалось сохранить файл part.met.seeds для %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
@@ -4784,371 +6019,218 @@
 msgstr1 "Сохранено %i источника для файла %s (%s)"
 msgstr2 "Сохранено %i источников для файла %s (%s)"
 
-#: src/PartFile.cpp:1170
-#, fuzzy, c-format
+#: src/PartFile.cpp
+#, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
-msgstr "Сохранен %i источник для файла %s (%s)"
+msgstr "Не удалось прочитать файл seeds для part-файла %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "Ошибка при чтении источников частично загруженного файла (%s - %s): %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
-msgstr0 "Найдена испорченная часть (%d) в %d части файла %s - FileResultHash |%s| FileHash |%s|"
-msgstr1 "Найдена испорченная часть (%d) в %d частях файла %s - FileResultHash |%s| FileHash |%s|"
-msgstr2 "Найдена испорченная часть (%d) в %d частях файла %s - FileResultHash |%s| FileHash |%s|"
+msgstr0 "Найдена повреждённая часть (%d) в %d части файла %s — Результат хеша файла |%s| Хеш файла |%s|"
+msgstr1 "Найдена повреждённая часть (%d) в %d частях файла %s — Результат хеша файла |%s| Хеш файла |%s|"
+msgstr2 "Найдена повреждённая часть (%d) в %d частях файла %s — Результат хеша файла |%s| Хеш файла |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
-msgstr "Найдена завершенная часть (%i) в %s"
+msgstr "Найдена завершённая часть (%i) в %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Завершено повторное хеширование %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
-msgstr "Неожиданная ошибка во время завершения %s. Файл приостановлен."
+msgstr "Неожиданная ошибка при завершении %s. Файл приостановлен"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Загрузка завершена: %s"
 
-#: src/PartFile.cpp:2323
-#, fuzzy, c-format
+#: src/PartFile.cpp
+#, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
-msgstr "Загрузка завершена: %s"
+msgstr ""
+"Загрузка завершена:\n"
+"%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Удаление файла: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удается схэшировать загруженную часть - хэш-набор неполон для '%s'"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удаётся захешировать загруженную часть — хеш-набор неполон для «%s»"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
-msgstr "ОШИБКА: Не удается схэшировать загруженную часть - хэш-набор неполон (%s). Это никогда не должно происходить"
+msgstr "ОШИБКА: Не удаётся захешировать загруженную часть — хеш-набор неполон (%s). Это никогда не должно происходить"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
-msgstr ""
+msgstr "Часть %u файла «%s» помечена как завершённая, но part-файл короче ожидаемого (имеется %llu байт, требуется %llu); участок открыт заново для повторной загрузки."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
-msgstr "EOF при хешировании загруженной части %u с длиной %u (макс %u) файла '%s' с длиной %u: %s"
+msgstr "EOF при хешировании загруженной части %u с длиной %u (макс %u) файла «%s» с длиной %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: не достаточно свободного места на диске. Файл приостановлен: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Загруженная часть %i повреждена: %s"
+msgstr "Загруженная часть %i повреждена в файле: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Восстановлена поврежденная часть %i для %s -> Выигрыш: %s Б"
+msgstr "ICH: Восстановлена повреждённая часть %i для %s -> Выигрыш: %s Б"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Выделяется место"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Недостаточно места на диске"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Загружено"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ОШИБКА: не удалось открыть частично закаченный '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Системный"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr "Расширенный обмен источниками"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr "Обход NAT (uTP)"
+
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr "Запрос информации о друге"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr "Обход NAT (QUIC)"
 
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Албанский"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Арабский"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Астурианский"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Баскский"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Болгарский"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Каталонский"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Китайский (упрощенный)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Китайский (традиционный)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Хорватский"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Чешский"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Датский"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Голландский"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Английский (Великобритания)"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Английский (Великобритания)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Эстонский"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Финский"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Французский"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Гальский"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Немецкий"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Греческий"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Израильский"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Венгерский"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Итальянский"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Итальянский (Швеция)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Японский"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Корейский"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Литовский"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Норвежский (Нюнорск)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Польский"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Португальский"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Португальский (Бразилия)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Румынский"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Русский"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Словакский"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Испанский"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Шведский"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Турецкий"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Украинский"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Изменить язык"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr ""
-
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Недоступен"
-
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "нет доступных опций"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr "Найдено неверное сопоставление путей, пропускается"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
-msgstr "Обнаружена неверная категория, пропускаем"
+msgstr "Обнаружена неверная категория, пропускается"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr "TCP порт не может быть выше 65532, так как UDP сокет - TCP+3"
+msgstr "Порт TCP не может быть выше 65532, так как UDP-сокет сервера = TCP+3"
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Используется порт по умолчанию (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Соединение"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Каталоги"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
-msgstr "Сервера"
-
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Файлы"
+msgstr "Серверы"
 
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Безопасность"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
-msgstr ""
+msgstr "Страна по IP"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Прокси"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Фильтры"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
-msgstr "Удаленный контроль"
+msgstr "Удалённое управление"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
-msgstr "Online-подпись"
+msgstr "Сетевая подпись"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "События"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Отладчик"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
-"Эти переменный будут подставлены:\n"
-"   %PARTFILE - полный путь к файлу\n"
-"   %PARTNAME - только имя файла"
+"Будут подставлены следующие переменные:\n"
+"   %PARTFILE — полный путь к файлу\n"
+"   %PARTNAME — только имя файла"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
-msgstr ""
+msgstr "Поддержка значка в трее требует наличия libayatana-appindicator3 на этапе компиляции."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
-msgstr ""
+msgstr "Недоступно в Wayland: протокол не сообщает о сворачивании окна, поэтому эта опция не может перехватывать системную кнопку сворачивания. Обходной путь: запустите aMule с `GDK_BACKEND=x11`, чтобы использовать XWayland."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5157,66 +6239,93 @@
 "aMule will run fine without adjusting any of\n"
 "these settings."
 msgstr ""
-"Не изменяйте следующие настройки до тех пор, пока\n"
-"вы не будете абсолютно уверены в том, что вы делаете,\n"
-"в противном случае может случиться непоправимое.\n"
+"Не меняйте следующие настройки,\n"
+"если не уверены в своих действиях,\n"
+"иначе вы можете ухудшить работу.\n"
 "\n"
-"aMule будет превосходно работать и БЕЗ ИЗМЕНЕНИЯ вами\n"
-"этих настроек."
+"aMule будет прекрасно работать\n"
+"и без изменения этих настроек."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr "Не удалось подключить Cfg к widget с ID %d и ключом %s"
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Тип прокси-сервера, который вы используете"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "Пароль не задан."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "Для гостевого доступа требуется пароль. Введите его в поле гостевого пароля или снимите отметку с пункта «Включить гостевой доступ»."
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
 msgstr ""
-"Необходимо перезапустить aMule чтобы следующие изменения вступили в силу:\n"
+"Требуется перезапуск aMule для применения изменений:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
-msgstr "- изменен порт TCP.\n"
+msgstr "— изменён порт TCP.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
-msgstr "- изменен порт UDP.\n"
+msgstr "- изменён порт UDP.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr "— Изменена привязка к сетевому интерфейсу.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
-msgstr "- Порт для внешних соединений изменен.\n"
+msgstr "- Порт для внешних соединений изменён.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Принятие внешних соединений изменено.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Интерфейс внешних соединений изменен.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
-msgstr "Вуалирование протокола"
+msgstr "— Изменена поддержка маскировки протокола.\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr "— Изменены настройки прокси (требуется для HTTP-передач).\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr "— Изменены настройки amuleapi.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5224,27 +6333,32 @@
 "Список авто обновления пуст.\n"
 "Автоматическое обновление списка серверов отключено."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr "Не удалось сохранить пароль amuleapi: %s"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
-msgstr "- Изменен язык.\n"
+msgstr "- Смена языка.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Изменен временный каталог.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- сеть eD2k включена. \n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr "Шаблон исключения общих файлов не является допустимым регулярным выражением. Фильтр оставлен отключённым."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "Недопустимое регулярное выражение"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5252,15 +6366,15 @@
 "Сети eD2k и Kad обе отключены.\n"
 "Вы не сможете подсоединиться пока не подключите хотя бы одну из них."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
 msgstr ""
-"Kad не будет запущена, если UDP-порт выключен.\n"
-"Включите UDP-порт или выключите Kad."
+"Kad не будет запущена, если UDP-порт отключён.\n"
+"Включите UDP-порт или отключите Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5268,138 +6382,207 @@
 msgstr ""
 "\n"
 "Вам НЕОБХОДИМО перезапустить aMule немедленно.\n"
-"Иначе не жалуйтесь, если произойдет какая-нибудь неприятность.\n"
+"Иначе не жалуйтесь, если произойдёт какая-нибудь неприятность.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
-msgstr ""
+msgstr "Не удалось зарегистрировать aMule для автозапуска при входе. Возможно, хранилище автозапуска доступно только для чтения."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
-msgstr ""
+msgstr "Не удалось удалить запись автозапуска при входе."
 
-#: src/PrefsUnifiedDlg.cpp:1098
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
-msgstr "Автоматическое обновление начато"
+msgstr "Автозапуск"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr "Зарегистрировать тип файла"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr "Регистрация обработчика URL-адресов"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr "aMule обрабатывает только магнит-ссылки, совместимые с eD2k. Если вы замените текущий обработчик магнит-ссылок (%s), ссылки БитТоррент перестанут работать — aMule не может загружать содержимое БитТоррент. Продолжить?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr "В настоящее время файлы .emulecollection открываются другим приложением (%s). Заменить его на aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr "В настоящее время обработчиком этих ссылок по умолчанию является другое приложение (%s). Заменить его на aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "Не удалось зарегистрировать aMule для файлов .emulecollection. Возможно, хранилище регистрации доступно только для чтения."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr "Не удалось удалить регистрацию типа файла."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "Не удалось зарегистрировать aMule как обработчик URL-адресов. Возможно, хранилище регистрации доступно только для чтения."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr "Не удалось удалить регистрацию обработчика URL-адресов."
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Веб-сервер и aMule API требуют включённых внешних подключений."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr "Веб-сервер aMule устарел. Рассмотрите возможность использования aMule API вместо него."
+
+#: src/PrefsUnifiedDlg.cpp
 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."
+"Ваш список автообновления серверов пуст.\n"
+"Пожалуйста, внесите в список хотя бы один адрес, указывающий на верный server.met.\n"
+"Щёлкните на кнопке «Список», чтобы ввести адрес."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Временные файлы"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Входящие файлы"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Online-подписи"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Выберите каталог для %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Будет исключён %u из %u общих файлов"
+msgstr1 "Будут исключены %u из %u общих файлов"
+msgstr2 "Будет исключено %u из %u общих файлов"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
-msgstr "Выбрать видео-проигрыватель"
+msgstr "Выбрать проигрыватель видео"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
-msgstr "Выберите броузер"
+msgstr "Выбор браузера"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr "Выбор исполняемого файла ffprobe"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Команда запуска%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr "ffprobe не найден в PATH или в стандартных местах установки. Установите ffmpeg (в комплект которого входит ffprobe) либо воспользуйтесь кнопкой «Обзор», чтобы выбрать файл вручную."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr "Сбросить настройки на этой странице к значениям по умолчанию?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr "Сбросить к значениям по умолчанию"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Редактировать список серверов"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
 msgstr ""
-"Впишите сюда адреса для получения файлов 'server.met'.\n"
-"Только один URL в одной строчке."
+"Добавьте URL для загрузки файлов server.met.\n"
+"По одному на строку."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
-msgstr ""
+msgstr "Не удалось обновить IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
-msgstr ""
+msgstr "Данные предоставлены MaxMind GeoLite2"
 
-#: src/PrefsUnifiedDlg.cpp:1568
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
-msgstr "Полных источников"
+msgstr "Пользовательский источник"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
-msgstr ""
+msgstr "Данные предоставлены DB-IP.com"
 
-#: src/PrefsUnifiedDlg.cpp:1590
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Status: Loaded%s"
-msgstr "Статус:"
+msgstr "Статус: подгружено%s"
 
-#: src/PrefsUnifiedDlg.cpp:1593
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Status: Loaded%s - %s"
-msgstr "Статус:"
+msgstr "Статус: подгружено%s — %s"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
-msgstr ""
+msgstr "Статус: не удалось подгрузить — нажмите «Обновить сейчас» для обновления."
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
-msgstr ""
+msgstr "Статус: не найдено — нажмите «Обновить сейчас» для загрузки."
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
-msgstr0 "Интервал обновления: %d с"
-msgstr1 "Интервал обновления: %d сек"
-msgstr2 "Интервал обновления: %d сек"
+msgstr0 "Задержка обновления: %d секунда"
+msgstr1 "Задержка обновления: %d секунды"
+msgstr2 "Задержка обновления: %d секунд"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
-msgstr0 "Отрезок времени, охватывающийся графиком: %d м"
-msgstr1 "Отрезок времени, охватывающийся графиком: %d минут"
-msgstr2 "Отрезок времени, охватывающийся графиком: %d минут"
+msgstr0 "Время для усреднения графика: %d минута"
+msgstr1 "Время для усреднения графика: %d минуты"
+msgstr2 "Время для усреднения графика: %d минут"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Масштаб графика соединений: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
-msgstr0 "Файловый буфер: %d Б"
-msgstr1 "Размер буфера: %d байт"
+msgstr0 "Файловый буфер: %d байт"
+msgstr1 "Размер буфера: %d байта"
 msgstr2 "Размер буфера: %d байт"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
@@ -5407,530 +6590,619 @@
 msgstr1 "Размер очереди отдачи: %d клиентов"
 msgstr2 "Размер очереди отдачи: %d клиентов"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
-msgstr0 "Частота связи с сервером: %d м"
-msgstr1 "Интервал обновления соединения с сервером: %d минут"
-msgstr2 "Интервал обновления соединения с сервером: %d минут"
+msgstr0 "Период обновления соединения с сервером: %d минуту"
+msgstr1 "Период обновления соединения с сервером: %d минуты"
+msgstr2 "Период обновления соединения с сервером: %d минут"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Обновление соединения с сервером: Отключено"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "выключена"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
-msgstr "Выполнить команду при событии '%s'"
+msgstr "Выполнить команду при событии «%s»"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Включить выполнение команд в ядре"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Команда ядра:"
 
 # никто ни в жизни не поймет переведенную аббревиатуру
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
-msgstr "Включить выполнение команд в GUI"
+msgstr "Включить выполнение команд в графическом интерфейсе"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
-msgstr "Команда GUI:"
+msgstr "Команда граф. интерфейса:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Следующие переменные будут заменены:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
+"Следующие папки похожи на системные или важные расположения:\n"
+"\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
-msgstr ""
+msgstr "Рекурсивный общий доступ к ним опубликует все находящиеся внутри файлы в сетях eD2k/Kad. Вы действительно хотите это сделать?"
 
-#: src/PrefsUnifiedDlg.cpp:1959
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
-msgstr "Публикуемые папки"
-
-#: src/PrefsUnifiedDlg.cpp:1992
-#, fuzzy
-msgid "Reloading shared files…"
-msgstr "Обновить список публикуемых файлов"
+msgstr "Подтверждение общих папок"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
+msgstr "Переподгрузка общих файлов…"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
+msgstr "Сканирование подкаталогов…"
 
-#: src/PrefsUnifiedDlg.cpp:1994
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
-msgstr "Публикуемые папки"
+msgstr "Обновление общих папок"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
-msgstr ""
+msgid "Scanned %u directories..."
+msgstr "Просканировано каталогов: %u…"
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Обновить список публикуемых файлов."
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr "Общая папка"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr "Необходимо заполнить оба поля: удалённый и локальный префиксы."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr "Этот удалённый префикс уже сопоставлен."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr "Выберите локальную папку"
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "Очистить историю поиска"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr "Очистить сохранённую историю поиска? Это действие невозможно отменить."
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Предупреждение поиска"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
-msgstr ""
+msgstr "Поиск невозможен, если отключены и eD2k, и Kademlia."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
-#, fuzzy
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
-msgstr "Поиск"
+msgstr "Ошибка поиска"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
+"Поиск по eD2k ещё выполняется. Запуск нового остановит текущий, так как протокол eD2k допускает только один поиск за раз.\n"
+"\n"
+"Уже найденные результаты сохранятся; перестанут приходить только новые.\n"
+"\n"
+"Всё равно начать новый поиск?"
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr "Поиск выполняется"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr "Мин. размер должен быть меньше макс. размера. Игнорирую макс. размер."
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Предупреждение поиска"
-
 # It's about default category to download to.
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Общая"
 
-# unification
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Поиск по сети Kad не может быть произведен когда она отсоединена."
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr "Сохраняются только %u последних из %u открытых поисков в %s."
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr "Сохраняются только первые %u из %u результатов для поиска «%s»."
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: сохранённый список поиска повреждён, содержит неверный заголовок."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Неверная запись в сохранённом списке поиска, файл возможно повреждён"
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "Поиск по сети eD2k  не может быть произведен когда она отсоединена."
+msgstr "Поиск по eD2k невозможен, если сеть eD2k не подключена"
 
-#: src/SearchList.cpp:336
-#, fuzzy
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
-msgstr "Ключевое слово поиска: %s"
+msgstr "Нет ключевого слова для поиска Kad — отмена"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Ошибка при поиске через Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "FileID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr "Время поиска истекло: сервер не ответил."
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr ""
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Поиск Kad: запрошено расширение результатов ещё у одного пира."
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Без оценки"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Поиск Kad: не осталось пиров для повторного запроса результатов (достигнут предел или ответов пока нет)."
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr ""
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "Ошибка %u: %s\n"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Загрузить в категории"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ИД файла"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Получить %s для этого файла"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "Развернуть всё"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "Свернуть всё"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Искать связанные файлы (eD2k, локально)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Отметить как известный"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
-msgstr "Копировать eD2k ссылку в буфер"
+msgstr "Копировать ссылку eD2k в буфер"
 
-#: src/SearchListCtrl.cpp:811
-#, fuzzy
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Копировать eD2k ссылки в буфер"
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
-msgstr "Вы соединены с сервером, который вы пытаетесь удалить. Отключитесь от него."
+msgstr "В настоящий момент вы не подключены к серверу, поддерживающему функцию поиска связанных файлов"
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Отменено"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Новый"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr "выполняется"
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "завершён"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr "бездействует"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr "Поиск %u: %s, %u %% (%u результатов)\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr "Поиск %u «%s»: %s, %u %% (%u результатов)\n"
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr "Поиск истёк или идентификатор неизвестен. Начните новый поиск.\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Состояние поиска: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Прогресс поиска недоступен"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr "Нет поиска для отчёта.\n"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Не удалось подключиться ко всем перечисленным замаскированным постоянным серверам. Повторная попытка без маскировки."
+
+#: src/ServerConnect.cpp
 msgid "Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."
-msgstr "Не могу соединиться ни с одним завуалированным сервером в списке. Пробую еще раз, но без вуалирования."
+msgstr "Не удалось соединиться ни с одним замаскированным сервером в списке. Повторная попытка, но без маскировки."
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
+msgstr "Не удалось подключиться к перечисленным постоянным серверам."
 
-#: src/ServerConnect.cpp:79
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Не удалось соединиться ни с одним указанным сервером. Еще один заход."
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr "Не удалось подключиться к перечисленным серверам."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Автоматическое соединение с сервером будет предпринято через %d секунду"
+msgstr1 "Автоматическое соединение с сервером будет предпринято через %d секунды"
+msgstr2 "Автоматическое соединение с сервером будет предпринято через %d секунд"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "Сеть eD2k отключена в настройках, не соединяется."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr "В списке серверов не найдено ни одного доступного сервера"
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
-msgstr "Подключен к %s (%s:%i)"
+msgstr "Подключён к %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Установлено соединение с: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr "Ошибка во время соединения. Возможно нет соединения с Интернет."
+msgstr "Критическая ошибка при попытке подключения. Возможно, нет соединения с Интернетом"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
-msgstr "Утеряно соединение с %s (%s:%i)"
+msgstr "Потеряно соединение с %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) вероятно умер."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) вероятно заполнен."
 
-#: 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"
-msgstr0 "Автоматическое соединение с сервером будет предпринято через %d секунду"
-msgstr1 "Автоматическое соединение с сервером будет предпринято через %d секунды"
-msgstr2 "Автоматическое соединение с сервером будет предпринято через %d секунд"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Соединение утрачено"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Подключение к %s (%s:%i) завершилось ошибкой."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "ОШИБКА: сокет был закрыт по таймауту"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Время ожидания соединения с %s (%s:%i) вышло."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
-msgstr "Получен старый результат поиска DNS, опускаем."
+msgstr "Получен устаревший результат DNS-запроса, отбрасывается."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
-msgstr "Загружается файл 'server.met': %s"
+msgstr "Подгрузка файла server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
-msgstr "Файл 'server.met' не найден!"
+msgstr "Файл server.met не найден!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
-msgstr "Не удалось загрузить файл server.met '%s', потому что он имеет неправильный формат."
+msgstr "Не удалось подгрузить файл server.met «%s», неизвестный формат."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Не удалось открыть файл 'server.met'!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
-msgstr0 "В файле 'server.met' найден %i сервер"
-msgstr1 "В файле 'server.met' найдено %i сервера"
-msgstr2 "В файле 'server.met' найдено %i серверов"
+msgstr0 "В файле server.met найден %i сервер"
+msgstr1 "В файле server.met найдены %i сервера"
+msgstr2 "В файле server.met найдено %i серверов"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
-msgstr0 "%d сервер добавлен"
-msgstr1 "%d сервера добавлено"
-msgstr2 "%d серверов добавлено"
+msgstr0 "Добавлен %d сервер"
+msgstr1 "Добавлены %d сервера"
+msgstr2 "Добавлено %d серверов"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
-msgstr "Ошибка: файл 'server.met' поврежден:"
+msgstr "Ошибка: файл «server.met» повреждён: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "Ошибка ввода/вывода при чтении файла known.met: "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr "Сервер не был добавлен: %s:%d не указывает на подходящий порт."
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
-msgstr "Сервер не был указан: IP адрес %s:%d был отфильтрован или неверен."
+msgstr "Сервер не был указан: IP-адрес %s:%d отфильтрован или неверен."
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
-msgstr "Сервер не был добавлен: сервер с совпадающим IP:порт %s:%d был найден в списке."
+msgstr "Сервер не был добавлен: сервер с такими IP:порт %s:%d уже есть в списке."
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
-msgstr "Сервер добавлен: сервер %s:%d использует имя '%s'."
+msgstr "Сервер добавлен: сервер %s:%d использует имя «%s»."
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Вы соединены с сервером, который вы пытаетесь удалить. Отключитесь от него."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Невозможно открыть %s"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
-msgstr "Не удалось сохранить файл 'server.met'."
+msgstr "Не удалось сохранить server.met!"
+
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Ошибка ввода-вывода при записи server.met: %s"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
-msgstr "Завершена загрузка списка серверов с %s"
+msgstr "Загрузка списка серверов с %s завершена"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Не найдено адресов списков серверов в 'addresses.dat'. Пожалуйста, введите правильные адреса чтобы авто-обновление работало."
+msgstr "В «addresses.dat» не найдено адресов списков серверов. Вставьте действительный адрес в этот файл для автообновления списка серверов"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
-msgstr "Начинаю загружать список серверов с %s"
+msgstr "Начало загрузки списка серверов с %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: неверный URL для авто-обновления серверов: %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
-msgstr "Отсутствует допустимый 'server.met' файл по адресу для автоматического обновления серверов"
+msgstr "В addresses.dat нет верного URL-адреса для автоматической загрузки server.met"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
-msgstr "Не удалось получить список серверов из %s"
+msgstr "Не удалось загрузить список серверов с %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
-msgstr "Локальный сервер отфильтрован через IPFilters. Подключаюсь к другому серверу!"
+msgstr "Локальный сервер отфильтрован IP-фильтром, переподключение к другому серверу!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "Имя сервера"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Адрес"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Порт"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Описание"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
-msgstr "Ping"
+msgstr "Пинг"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
-msgstr "Пользователей"
+msgstr "Участники"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "Макс. участников"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
-msgstr "Статический"
+msgstr "Постоянный"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Версия"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr "Мягк. порог файлов"
 
-#: src/ServerListCtrl.cpp:100
+# подпись в главном окне. длинная просто не влезет.
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr "Жёст. порог файлов"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
-msgstr ""
+msgstr "Флаги TCP"
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
-msgstr ""
+msgstr "Флаги UDP"
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
-msgstr "Вы соединены с сервером, который вы пытаетесь удалить. Сначала нужно отключиться от него. Сервер НЕ удален."
+msgstr "Вы соединены с сервером, который вы пытаетесь удалить. Сначала нужно отключиться от него. Сервер НЕ удалён."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Неизвестное имя)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
-msgstr "Вы уверены, что хотите удалить сервер %s из статического списка "
+msgstr "Уверены, что хотите удалить постоянный сервер %s"
+
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "мс"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
-msgstr "Серверов (%i)"
+msgstr "Серверы (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Сервер"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Подключиться к серверу"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
-msgstr "Внести в список статических серверов"
+msgstr "Внести в список постоянных серверов"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
-msgstr "Удалить из списка статических серверов"
+msgstr "Убрать из списка постоянных серверов"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
-msgstr "Внести в список статических серверов"
+msgstr "Внести в список постоянных серверов"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
-msgstr "Удалить из списка статических серверов"
+msgstr "Убрать из списка постоянных серверов"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Удалить выбранный сервер"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Удалить выбранные серверы"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
-msgstr "Удалить все сервера"
-
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Копировать eD2k ссылки в буфер"
+msgstr "Удалить все серверы"
 
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Восстановить соединение с сервером"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
-msgstr "Вы уверены, что хотите удалить все сервера?"
+msgstr "Уверены, что хотите удалить все серверы?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Удалить выбранный сервер?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Удалить выбранные серверы?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ОШИБКА: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
-msgstr ""
+msgstr "Сервер %s (%s) отклонил вход (клиентский идентификатор не назначен). Отключение."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
-msgstr "Новый ID клиента %u"
+msgstr "Новый идентификатор клиента — %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: вы получили Low-ID!"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: вы получили Низкий ИД!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tСкорее всего это из-за того, что вы находитесь за брандмауэром или маршрутизатором."
+msgstr "\tСкорее всего, вы за межсетевым экраном (брандмауэром) или маршрутизатором."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
-msgstr "\tДля подробностей, обратитесь к https://amule-org.github.io/docs"
+msgstr "\tПодробнее на https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Получена неизвестная информация о сервере. - слишком коротко"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
@@ -5938,719 +7210,889 @@
 msgstr1 "Получено %d новых сервера"
 msgstr2 "Получено %d новых серверов"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Сохранение списка серверов завершено."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Сервер отклонил последнюю команду"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Подложный пакет получен от сервера: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Неизвестная ошибка при обработке пакета от сервера: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr "Невозможно создать поток разрешения DNS для соединения с %s"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "IP адрес сервера %s (%s) запрещен фильтром.  Соединение отменено."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
-msgstr "использую вуалирование протокола."
+msgstr "используется маскировка протокола."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Установка соединения с %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Не удалось разрешить DNS для сервера %s: Невозможно подключиться."
+msgstr "Не удалось разрешить DNS для сервера %s: Невозможно подключиться!"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "Журнал aMuleGUI"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Сервер не был добавлен: не указан адрес сервера."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Сервер не был добавлен: указан неверный порт сервера."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Статус eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
-msgstr "ID"
+msgstr "Идентификатор"
 
-#: src/ServerWnd.cpp:200
-#, fuzzy
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
-msgstr "Состояние соединения:"
+msgstr "Тип подключения:"
+
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "Подключён с:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Статус Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Работает в режиме LAN"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Выполняется"
 
-#: src/ServerWnd.cpp:224
-#, fuzzy
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
-msgstr "Статус Kademlia:"
+msgstr "Клиентский ИД Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Статус:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Состояние соединения:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
-msgstr "За брандмауэром - откройте TCP порт %d на вашем роутере или брандмауэре"
+msgstr "За экраном — откройте порт TCP %d в вашем роутере или межсетевом экране"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
-msgstr "Состояние UDP соединения:"
+msgstr "Состояние соединения UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
-msgstr "За брандмауэром - откройте UDP порт %d на вашем роутере или брандмауэре"
+msgstr "За экраном — откройте порт UDP %d в вашем роутере или межсетевом экране"
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
-msgstr "Состояние брандмауэра:"
+msgstr "Состояние межсетевого экрана: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
-msgstr "Друг не требуется - TCP порт открыт"
+msgstr "Друг не требуется — порт TCP открыт"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
-msgstr "Друг не требуется - UDP порт открыт"
+msgstr "Друг не требуется — порт UDP открыт"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Нет друзей"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Соединяем с другом"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Соединяем с другом на %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Адрес IP:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
-msgstr "Проиндексировано источников:"
+msgstr "Индексировано источников:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
-msgstr "Ключевые слова проиндексированы:"
+msgstr "Ключевые слова в индексе:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
-msgstr "Проиндексировано записей:"
+msgstr "Индексировано записей:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
-msgstr "Загрузки проиндексированы:"
+msgstr "Нагрузка индекса:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Пользователей в среднем:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Файлов в среднем:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Не запущен"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr "Наблюдатель общих папок: переполнение или ошибка бэкенда (%s); переход к полной переподгрузке"
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 "Наблюдатель общих папок: найдена %u новая подпапка с момента последнего запуска, повторное сканирование"
+msgstr1 "Наблюдатель общих папок: найдены %u новые подпапки с момента последнего запуска, повторное сканирование"
+msgstr2 "Наблюдатель общих папок: найдено %u новых подпапок с момента последнего запуска, повторное сканирование"
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr "Наблюдатель общих папок: бэкенд потерял события, принудительная полная переподгрузка общих файлов для синхронизации"
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
-msgstr "Добавляем файл %s к списку опубликованных"
+msgstr "Добавляется файл %s к публикуемым"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
-msgstr0 "Найден %i известный публикуемый файл."
-msgstr1 "Найдено %i известных публикуемых файла."
-msgstr2 "Найдено %i известных публикуемых файлов."
-
-#: src/SharedFileList.cpp:410
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Найден %i известный публикуемый файл, %i неизвестных."
-msgstr1 "Найдено %i известных публикуемых файла, %i неизвестных."
-msgstr2 "Найдено %i известных публикуемых файлов, %i неизвестных."
+msgstr0 "Найден %i известный публикуемый файл"
+msgstr1 "Найдено %i известных публикуемых файла"
+msgstr2 "Найдено %i известных публикуемых файлов"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 "Исключён %i файл из общего доступа по фильтру"
+msgstr1 "Исключено %i файла из общего доступа по фильтру"
+msgstr2 "Исключено %i файлов из общего доступа по фильтру"
 
 # ей-богу не понимаю что за ошибка и когда вылазит
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "ОШИБКА: попытка опубликовать %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
-msgstr "Публикуемая директория не найдена, пропускаем: %s"
+msgstr "Общий каталог не найден, пропускается: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Нет публикуемых файлов в директории: %s"
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Общий каталог недоступен для чтения, пропускается: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Имя пользователя"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr "Извлечение метаданных медиафайлов отключено в настройках, поэтому нечего извлекать заново."
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Скорость загрузки"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 "Повторное извлечение метаданных медиафайлов для %u общего файла"
+msgstr1 "Повторное извлечение метаданных медиафайлов для %u общих файлов"
+msgstr2 "Повторное извлечение метаданных медиафайлов для %u общих файлов"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Скорость отдачи"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "Теперь публикуется файл: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Прекращена публикация удалённого файла: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Доступные части"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Прекращена публикация %u файла в удалённом каталоге: %s"
+msgstr1 "Прекращена публикация %u файлов в удалённом каталоге: %s"
+msgstr2 "Прекращена публикация %u файлов в удалённом каталоге: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:35
-#, fuzzy
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Теперь публикуется %u файл, найденный в новом общем каталоге"
+msgstr1 "Теперь публикуется %u файла, найденных в новых общих каталогах"
+msgstr2 "Теперь публикуется %u файлов, найденных в новых общих каталогах"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Обнаружен %u новый публикуемый файл"
+msgstr1 "Обнаружены %u новых публикуемых файла"
+msgstr2 "Обнаружено %u новых публикуемых файлов"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Имя пользователя"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr "Части у пира"
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Статус отдачи"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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 "Откуда"
+msgstr "Статус загрузки"
 
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Локальное имя файла"
 
 # подпись в главном окне. длинная просто не влезет.
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
-#, fuzzy
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
-msgstr "Файлы"
-
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Запросов"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Принятых запросов"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Передано данных"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Коэффициент передачи"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Полученные части"
+msgstr "Общ. файлы"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Полных источников"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr "Доступность у источников"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Каталог"
 
-#: src/SharedFilesCtrl.cpp:151
+# подпись в главном окне. длинная просто не влезет.
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Общие файлы"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
-msgstr "Добавить комментарий/рейтинг"
+msgstr "Добавить комментарий/оценку"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
-msgstr "Редактировать комментарий/рейтинг"
+msgstr "Изменить комментарий/оценку"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr "Проверить локальные данные"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr "Извлечь метаданные медиафайлов заново"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
-msgstr "Добавить файлы коллекции в список для закачки"
+msgstr "Добавить файлы из коллекции в список передач"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
-msgstr "Скопировать magnet URL в буфер &обмена"
+msgstr "Копировать ма&гнит-ссылку в буфер"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Копировать eD2k ссылку в буфер (&Источник)"
+msgstr "Копировать ссылку eD2k в буфер (&источник)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Копировать eD2k ссылку в буфер (Источник) (&С шифрованием)"
+msgstr "Копировать ссылку eD2k в буфер (источник) (&с шифрованием)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Копировать eD2k ссылку в буфер (Имя &хоста)"
+msgstr "Копировать ссылку eD2k в буфер (имя &хоста)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr "Копировать eD2k ссылку в буфер (Имя хоста) (С &шифрованием)"
+msgstr "Копировать ссылку eD2k в буфер (имя хоста) (с &шифрованием)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Копировать eD2k ссылку в &буфер (информация AICH)"
+msgstr "Копировать ссылку eD2k в &буфер (сведения AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
-#, fuzzy
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
-msgstr "Копировать eD2k ссылку в &буфер (информация AICH)"
+msgstr "Копировать ссылку eD2k в буфер (све&дения AICH + источник)"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr "Экспорт выбранных файлов в коллекцию emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr "Проверка локальных данных для part-файла в настоящее время не поддерживается: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 "Метаданные медиафайла: пропускается %u незавершённая загрузка"
+msgstr1 "Метаданные медиафайлов: пропускаются %u незавершённые загрузки"
+msgstr2 "Метаданные медиафайлов: пропускается %u незавершённых загрузок"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 "Метаданные медиафайла: пропускается %u файл, не являющийся аудио или видео"
+msgstr1 "Метаданные медиафайлов: пропускаются %u файла, не являющиеся аудио или видео"
+msgstr2 "Метаданные медиафайлов: пропускается %u файлов, не являющихся аудио или видео"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 "Извлечь метаданные медиафайлов заново для %u файла?"
+msgstr1 "Извлечь метаданные медиафайлов заново для %u файлов?"
+msgstr2 "Извлечь метаданные медиафайлов заново для %u файлов?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 "%u незавершённая загрузка будет пропущена."
+msgstr1 "%u незавершённые загрузки будут пропущены."
+msgstr2 "%u незавершённых загрузок будет пропущено."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 "%u файл не является аудио или видео и будет пропущен."
+msgstr1 "%u файла не являются аудио или видео и будут пропущены."
+msgstr2 "%u файлов не являются аудио или видео и будут пропущены."
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr "Это выполняется в фоновом режиме. Ход работы отображается в журнале."
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr "Извлечь метаданные медиафайлов заново"
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
-msgstr "Для создания ссылки на источник требуется HighID"
+msgstr "Вам нужен Высокий ИД для создания рабочей ссылки на источник"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr "Экспорт в emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr "Не выбрано ни одного файла для экспорта."
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr "Коллекции eMule (*.emulecollection)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr "«%s» уже существует. Перезаписать?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Не удалось записать файл коллекции «%s»."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Экспортирован %u общий файл в «%s»."
+msgstr1 "Экспортированы %u общих файла в «%s»."
+msgstr2 "Экспортировано %u общих файлов в «%s»."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Общий размер публикуемых файлов: %s (завершено %s)"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Общий размер публикуемых файлов: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Общие файлы (%i, вычисляется хеш для %u)"
+msgstr1 "Общие файлы (%i, вычисляется хеш для %u)"
+msgstr2 "Общие файлы (%i, вычисляется хеш для %u)"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
-msgstr "Публикуемые файлы (%i)"
+msgstr "Общие файлы (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "частично"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Переподгрузка общих файлов: просканировано файлов — %u"
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr "Состояние части"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
-msgstr "Удаленное имя файла"
+msgstr "Удалённое имя файла"
+
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
 
-#: src/Statistics.cpp:797
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Передано за сеанс (всего): %s"
+msgstr "Отдано данных (за сеанс (всего)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Служебный трафик (пакеты): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Трафик запросов (пакеты): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Трафик обмена источниками (пакеты): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Трафик с сервером (пакеты): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Служебный трафик Kad (пакеты): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Потери шифрования (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Активные отдачи: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Ожидающие отдачи: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
-msgstr "Всего успешных сессий отдачи: %s"
+msgstr "Всего успешных сеансов отдачи: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
-msgstr "Всего неудачных сессий отдачи: %s"
+msgstr "Всего неудачных сеансов отдачи: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Среднее время отдачи: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Принято за сеанс (всего): %s"
+msgstr "Загружено данных (за сеанс (всего)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Найдено источников: %s"
 
 # chunk, конечно, никакой не пакет.... но фиг знает
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Активных загрузок (фрагменты файлов): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Соотношение UL:DL (всего): %s"
+msgstr "Отношение отданного/загруженного за сеанс (всего): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
-msgstr "Средняя скорость закачки (Сессия): %s"
+msgstr "Средняя скорость загрузки (за сеанс): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
-msgstr "Средняя скорость отдачи (Сессия): %s"
+msgstr "Средняя скорость отдачи (за сеанс): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
-msgstr "Максимальная скорость закачки (Сессия): %s"
+msgstr "Максимальная скорость загрузки (за сеанс): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
-msgstr "Максимальная скорость отдачи (Сессия): %s"
+msgstr "Максимальная скорость отдачи (за сеанс): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
-msgstr "Пересоединений: %i"
+msgstr "Переподключений: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Прошло после первой передачи: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Время подключения к серверу: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Активных соединений (примерно): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Достигнуто макс. число соединений: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
-msgstr "Соединений в среднем (прибл.): %g"
+msgstr "Соединений в среднем (примерно): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Максимальное число соединений (примерно): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Клиенты"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Неизвестны: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Отфильтрованы: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Заблокированы: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr "Запрещённые Kad адреса: %s"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Всего: %i Известно: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
-msgstr "Работающих серверов: %i"
+msgstr "Рабочие серверы: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Сбойных серверов: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Всего: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
-msgstr "Удаленных серверов: %s"
+msgstr "Удалённых серверов: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Отфильтрованных серверов: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Пользователей на работающих серверах: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Файлов на работающих серверах: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Всего пользователей: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Всего файлов: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Загруженность сервера: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Число публикуемых файлов: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Общий размер публикуемых файлов: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Средний размер файлов: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Операционная система"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Не получено"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Активные соединения (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
-msgstr "Недоступен"
+msgstr "Недоступно"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Никогда"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
-msgstr "Команда `%s' с pid `%d' завершилась с кодом статуса `%d'."
+msgstr "Команда «%s» с pid «%d» завершилась с кодом статуса «%d»."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Выполнить <str> и выйти."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr "Разделять поля списков пробелами, как раньше, вместо символов табуляции."
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr "Неверный формат IP-адреса. Пример: xxx.xxx.xxx.xxx:xxxx\n"
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "Этой команде требуется аргумент. Доступные аргументы: 'all', имя файла или номер.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
-msgstr "Обрабатывается по хэшу:"
+msgstr "Обрабатывается по хешу: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
-msgstr "Обрабатывается по имени:"
+msgstr "Обрабатывается по имени файла: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Эта команда требует аргумента. Допустимые аргументы: хэш файла.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Недопустимый номер\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "Недопустимый хеш (длина должна быть равна 32 символам)\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
-msgstr "Наберите '%s' для подробной справки.\n"
+msgstr ""
+"Неверный синтаксис фильтра поиска.\n"
+"Введите «help search» для получения справки.\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
-msgstr "Наберите '%s' для подробной справки.\n"
+msgstr ""
+"Не указано ключевое слово поиска.\n"
+"Введите «help search» для получения справки.\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
-msgstr "Наберите '%s' для подробной справки.\n"
+msgstr ""
+"Не задан тип поиска.\n"
+"Введите «help search» для получения справки.\n"
 
-#: src/TextClient.cpp:650
-#, fuzzy, c-format
+#: src/TextClient.cpp
+#, c-format
 msgid "Download File: %lu %s\n"
-msgstr "Прием %s"
+msgstr "Загрузить файл: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Запрос не удался - неизвестная ошибка."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Операция выполнена успешно."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Запрос не удался: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "IP-фильтрация клиентов: %s\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "ВЫКЛ"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "ВКЛ"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "IP-фильтрация серверов: %s\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Текущий уровень IP-фильтра: %d.\n"
 
 # писать тут "вверх" и "вниз" по-моему глупо. да и не поймет никто
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Ограничения загрузки: UL: %u kB/сек, DL: %u kB/сек.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr "Ограничения скорости: Отд: %u КиБ/с, Заг: %u КиБ/с.\n"
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr "Ротация источников в режиме завершения: %s.\n"
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr "Поиск начат (ИД %u).\n"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Подключен к %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
-msgstr "Идет подключение"
+msgstr "Идёт подключение"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
-msgstr "за брандмауэром"
+msgstr "за экраном"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
-msgstr "ok"
+msgstr "хорошо"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Download:\t%s"
 msgstr ""
 "\n"
-"Закачка:\t%s"
+"Загрузка:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6659,7 +8101,7 @@
 "\n"
 "Отдача:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6668,7 +8110,7 @@
 "\n"
 "Клиентов в очереди:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6677,38 +8119,33 @@
 "\n"
 "Всего источников:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "частично"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Число результатов поиска: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Состояние поиска: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Состояние поиска неизвестно"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Получен неверный ответ сервера, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Показать краткую информацию о статусе."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Показать состояние соединения, такущие скорости отдачи/закачки, и т.д.\n"
+msgstr "Показать состояние соединения, текущие скорости отдачи/загрузки и т.д.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Показать полную статистику."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6720,51 +8157,51 @@
 "которое указывает сколько версий клиентов должно быть показано.\n"
 "0 или пустое значение отключает ограничение.\n"
 "\n"
-"Пример:  'statistics 5' покажет только пять наиболее частых номеров версий каждого клиента .\n"
+"Пример: «statistics 5» покажет только пять наиболее частых номеров версий каждого клиента .\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Закрыть aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
+"Завершить работу удалённого ядра (amule/amuled).\n"
+"Это так же завершит работу текстового клиента, т. к.\n"
 "без ядра он бесполезен.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
-msgstr "Обновить данный объект."
+msgstr "Переподгрузить данный объект."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
-msgstr "Обновить список публикуемых файлов."
+msgstr "Переподгрузить список публикуемых файлов."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
-msgstr "Обновить таблицу IP фильтра."
+msgstr "Переподгрузить таблицу IP-фильтра."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
-msgstr "Обновить локальную таблицу IP фильтра."
+msgstr "Переподгрузить локальную таблицу IP-фильтра."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Обновить таблицу IP фильтра с URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr "Если URL пропущен, используется URL из настроек."
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Подключиться к сети."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6776,35 +8213,35 @@
 "подключиться, в форме IP:Порт. В поле IP вводится либо\n"
 "сетевой адрес вида x.x.x.x, либо доменное имя."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Подключиться только к eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Подключиться только к Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Отключиться от сети."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "Это отключит от всех подсоединенных сетей.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Отключиться только от eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Отсоединиться от Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
-msgstr "Добавить eD2k или magnet-ссылку в ядро"
+msgstr "Добавить ссылку eD2k или magnet в ядро."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6814,61 +8251,59 @@
 "\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"
+"Добавляемая ссылка eD2k может быть:\n"
+"*) ссылкой на файл (ed2k://|file|...), тогда файл добавится в очередь загрузки\n"
+"*) ссылкой на сервер (ed2k://|server|...), тогда сервер добавится в список серверов\n"
+"*) ссылкой на список серверов, тогда все серверы из него будут\n"
 "   добавлены в список\n"
 "\n"
-"magnet-ссылка должна содержать eD2k хэш и длину файла.\n"
+"Магнит-ссылка должна содержать хеш eD2k и длину файла.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Установить значение параметра."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Установить настройки IP фильтра."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Включить IP-фильтрацию для клиентов и серверов."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Выключить IP-фильтрацию для клиентов и серверов."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Включить/выключить IP-фильтрацию для клиентов."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Включить IP-фильтрацию для клиентов."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Выключить IP-фильтрацию для клиентов."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Включить/выключить IP-фильтрацию для серверов."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Включить IP-фильтрацию для серверов."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Выключить IP-фильтрацию для серверов."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Выбирите уровень IP фильтрации."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6876,60 +8311,71 @@
 "Допустимые уровни фильтрации находятся в диапазоне 0-255,\n"
 "значением по умолчанию является 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
-msgstr "Укажите пределы канала."
+msgstr "Задаёт ограничения скорости передачи."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Значения тут указываются в кб/сек (килобайтах в секунду).\n"
+msgstr "Значения тут указываются в килобайтах в секунду.\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
-msgstr "Укажите ограничение скорости отдачи."
+msgstr "Установить ограничение скорости отдачи."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
-#, fuzzy
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
-msgstr "Значения тут указываются в кб/сек (килобайтах в секунду).\n"
+msgstr "Указанное значение должно быть в килобайтах в секунду.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
-msgstr "Укажите ограничение скорости загрузки."
+msgstr "Установить ограничение скорости загрузки."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr "Включить или отключить ротацию источников в режиме завершения."
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Указанное значение должно быть 1/ON (включить) или 0/OFF (отключить).\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Получить и отобразить значение параметра."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Получить параметры IP фильтра."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Получить состояние IP фильтра для клиентов и серверов."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Получить состояние IP фильтра только для клиентов."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Получить состояние IP фильтра только для серверов."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Получить уровень IP фильтрации."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
-msgstr "Получить ограничения полосы пропускания."
+msgstr "Получить ограничения скорости передачи."
+
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr "Получить состояние ротации источников в режиме завершения."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Выполнить поиск."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6947,122 +8393,144 @@
 "Example: 'search global linux iso --type Iso --min-size 100M' returns\n"
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
+"Необходимо указать тип поиска, задав тип:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Пример: «search kad file» выполнит поиск kad по слову «file».\n"
+"\n"
+"Необязательные фильтры можно добавлять до, после или вперемешку\n"
+"с ключевым словом (словами) поиска:\n"
+"    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
+"    --extension <ext>      (псевдоним: --ext)\n"
+"    --avail <N>            минимальное количество источников\n"
+"    --min-size <NKMG>    минимальный размер файла; K=1024, M=K*1024, G=M*1024\n"
+"    --max-size <NKMG>    максимальный размер файла; те же суффиксы\n"
+"Пример: «search global linux iso --type Iso --min-size 100M» вернёт\n"
+"результаты для «linux iso» типа Iso размером не менее 100 МиБ.\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Выполнить глобальный поиск."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Выполнить локальный поиск"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Выполнить поиск в Kad"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "Показать результаты последнего поиска."
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Вернуть результаты предыдущего поиска.\n"
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr "Показать результаты поиска."
+
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+"Вернуть результаты поиска.\n"
+"Может принимать идентификатор поиска (от «search …»); без идентификатора возвращает результаты последнего начатого поиска.\n"
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Показать состояние поиска."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Показать состояние поиска.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+"Показать ход выполнения поиска.\n"
+"Может принимать идентификатор поиска; без идентификатора показывает ход выполнения последнего начатого поиска.\n"
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
-msgstr "Начать загрузку файла."
+msgstr "Начать загрузку файла"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
+"Пример: «download 12» начнёт загрузку файла №12 из предыдущего поиска.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
-msgstr "Приостановить закачку."
+msgstr "Приостановить загрузку."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
-msgstr "Продолжить закачку."
+msgstr "Возобновить загрузку."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
-msgstr "Отменить закачку."
+msgstr "Отменить загрузку."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Установить приоритет загрузки."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Установить для загрузки низкий, нормальный, высокий или автоматический приоритет.\n"
+msgstr "Установить для загрузки низкий, обычный, высокий или автоматический приоритет.\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Установить низкий приоритет."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
-msgstr "Установить нормальный приоритет."
+msgstr "Установить обычный приоритет."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Установить высокий приоритет."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Установить авто-приоритет."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Показать очереди/списки."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
-msgstr "Показать очереди на закачку/отдачу, список серверов или публикуемых файлов.\n"
+msgstr "Показать очереди отдачи/загрузки, список серверов или публикуемых файлов.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
-msgstr "Показать очередь на отдачу."
+msgstr "Показать очередь отдачи."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
-msgstr "Показать очередь на закачку."
+msgstr "Показать очередь загрузки."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Показать журнал."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Показать список серверов."
 
-#: src/TextClient.cpp:1106
-#, fuzzy
+#: src/TextClient.cpp
 msgid "Show shared files list."
-msgstr "Обновить список публикуемых файлов."
+msgstr "Показать список публикуемых файлов."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Очистить журнал."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Устаревшая команда, используйте вместо нее '%s'."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7071,255 +8539,278 @@
 "Устаревшая команда, и возможно в будущем будет удалена.\n"
 "Используйте вместо нее '%s'.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Текстовый клиент aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Вычисление хеша загруженного файла: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr "Вычисление хеша файла: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Перестроение набора хешей AICH для файла: %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Конвертирую старые AICH хеши из '%s' в 64b в '%s'"
+msgstr "Преобразование старых наборов хешей AICH в «%s» в 64-битные в «%s»."
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr "Проверка локальных данных (%s): результат в порядке для %s"
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr "Проверка локальных данных (%s): ОБНАРУЖЕНЫ ОШИБКИ! %s Неудачные блоки: MD4: %s. %s %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Имя файла '%s' - неверно и было изменено на '%s'."
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Файл '%s' уже существует. Новый файл назван '%s'."
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "Вы уверены, что хотите отменить и удалить все файлы в этой категории?"
+msgstr "Уверены, что хотите отменить и удалить все файлы в этой категории?"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Требуется подтверждение"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Поддерживается только 99 категорий."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Слишком много категорий!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Все остальные"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Выбрать фильтр просмотра"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Добавить категорию"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Редакировать категорию"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Удалить категорию"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Запрошен набор хешей для неизвестного файла: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Не удалось открыть файл (%s), удаляется из списка общих."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
-msgstr "Возобновляется отдача файла: %s"
+msgstr "Возобновление отдачи файла: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
-msgstr "Приостанавливается отдача файла: %s"
+msgstr "Приостановка отдачи файла: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Не удалось выполнить команду `%s' при событии `%s'."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Не удалось выполнить команду «%s» при событии «%s»."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Загрузка завершена"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
-msgstr "Полный путь к файлу"
+msgstr "Полный путь к файлу."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
-msgstr "Имя файла без пути"
+msgstr "Имя файла без пути."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
-msgstr "eD2k хэш файла"
+msgstr "Хеш eD2k файла."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
-msgstr "Размер файла в байтах"
+msgstr "Размер файла в байтах."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
-msgstr "Общее время загрузки"
+msgstr "Общее время загрузки."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Начата новая беседа"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
-msgstr "Отправитель"
+msgstr "Отправитель."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Недостаточно места"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
-msgstr "Раздел диска"
+msgstr "Раздел диска."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Ошибка при завершении"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Обрабатывается файл под номером %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Вы запросили частичные хеши (используется только для файлов > 9.5 MБ)"
+msgstr "Вы запросили хеши частичных файлов (используется только для файлов > 9,5 MБ)"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
-#, fuzzy, c-format
+#: src/utils/aLinkCreator/src/alcc.cpp
+#, c-format
 msgid "%s ---> Non existent file !\n"
-msgstr "%s ---> Файл не существует !\n"
+msgstr "%s —> Файл не существует!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, программа для создания eD2k ссылок для aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Добро пожаловать!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Параметры ввода"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Файл для хеширования"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Добавьте возможные URL для этого файла"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr "Введите здесь файл для которого вы хотите получить eD2k ссылку"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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 "Введите здесь URL который вы хотите добавить к eD2k ссылке: добавьте / в конце если хотите чтобы aLinkCreator присоеденил текущее имя файла"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Удалить"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Создать ссылку с хешами частей"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
-msgstr "Помогите распространить новые и редкие файлы быстрее, за счет увеличения размера ссылки"
+msgstr "Помогите распространить новые и редкие файлы быстрее, за счёт увеличения размера ссылки"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Хеш MD4"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k хэш-файл"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
-msgstr "eD2k ссылка"
+msgstr "Ссылка eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
-msgstr "Скопировать в буфер обмена"
+msgstr "Копировать в буфер обмена"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Открыть"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Открыть файл и получить его eD2k ссылку"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
-msgstr "Копировать полученную eD2k ссылку в буфер"
+msgstr "Копировать вычисленную ссылку eD2k в буфер"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Сохранить как"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Сохранить полученную eD2k ссылку в файл"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "О программе aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr "Выберите файл для которого вы хотите получить eD2k ссылку"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Невозможно открыть буфер"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Сейчас нечего копировать!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Выберите файл в который сохранить полученную eD2k ссылку"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Невозможно открыть "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Пожалуйста, введите не пустое имя файла"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Сейчас нечего сохранять!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7330,183 +8821,180 @@
 "\n"
 "Distributed under GPL"
 msgstr ""
-"aLinkCreator, программа для создания eD2k ссылок для aMule\n"
+"aLinkCreator, программа для создания ссылок eD2k для aMule\n"
 "\n"
 "(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
 "\n"
-"Иконки взяты из http://www.everaldo.com и http://www.icomania.com\n"
+"Значки из http://www.everaldo.com и http://www.icomania.com\n"
 "и http://jimmac.musichall.cz/ikony.php3\n"
 "\n"
-"Лицензия - GPL"
+"Распространяется по лицензии GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Идет хеширование..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator работает для вас"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Считаем MD4 хэш..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Считаем eD2k хэши..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
-msgstr "Отменено."
+msgstr "Отменено!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
-msgstr "Выполнено за %.2f сек"
+msgstr "Выполнено за %.2f с"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Этот URL уже добавлен !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Введите URL"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Не удалось открыть %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
-msgstr ""
+msgstr "Не хватает памяти при вычислении хеша ed2k!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i дней %i часов %i минут %i секунд"
+msgstr "%i дн. %i ч %i мин. %i с"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uд %02uч %02uмин %02uс"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uч %02uмин %02uс"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02uмин %02uс"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02uс"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr "%.2f КиБ"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr "%.2f МиБ"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr "%.2f ГиБ"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr "%.2f ТиБ"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, модуль статистики aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Максимальная скорость загрузки за время работы wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Абсолютная максимальная скорость загрузки за время работы wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Сбросить"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Система"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Остановить автоматическое обновление"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Сохранить картинку со статистикой"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Распечатать картинку со статистикой"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Настройки"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "О модуле wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Начать авто обновление"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Автоматическое обновление остановлено"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Автоматическое обновление начато"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Сохранить картинку со статистикой"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
-msgstr "Онлайн-статистика"
+msgstr "Сетевая статистика aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
 msgstr ""
 "Проблема с печатью.\n"
-"Возможно принтер неправильно установлен."
+"Возможно, принтер неправильно установлен?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Печать"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7524,404 +9012,578 @@
 "\n"
 "Лицензия - GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Ох-ох... aMule то не запущен..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule запущен"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
-msgstr "aMule запущен, но не подключен"
+msgstr "aMule запущен, но не подключён"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule подключается..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Ох-ох... статус aMule неизвестен..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " работает "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " остановлен!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
-msgstr " не подключен!"
+msgstr " не подключён!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " подключается..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " делает что-то непонятное, проверьте!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
-msgstr " подключен к "
+msgstr " подключён к "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
-msgstr "отключен"
+msgstr "отключён"
 
 #  stands for $User is on $server
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " на "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " с "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
-msgstr "Всего принято: "
+msgstr "Всего загружено: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
-msgstr ", Передано: "
+msgstr ", Отдача: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
-msgstr "Принято за сеанс: "
+msgstr "Загружено за сеанс: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
-msgstr "Прием: "
+msgstr "Загрузка: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/сек, Передача: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr " КиБ/с, отдача: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
-msgstr "Передача другим: "
+msgstr "Публикуется: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
-msgstr "файлов, клиентов в очереди: "
+msgstr " файлов, клиентов в очереди: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
-msgstr "Время:"
+msgstr "Время: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " на "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
-msgstr "Системная загрузка (за 1-5-15 мин): "
+msgstr "Средняя нагрузка системы (за 1-5-15 мин.): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Время работы системы: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Каталог, содержащий файл amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "Введите здесь путь к вашему файлу amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Интервал обновления в секундах"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Генерировать картинку со статистикой после каждого события обновления"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "Укажите здесь каталог, в который вы хотите сохранять картинку со статистикой"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
-#, fuzzy
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
-msgstr "Периодическая загрузка картинки со статистикой на FTP сервер"
+msgstr "Периодически отправлять изображение статистики на FTP-сервер"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
-msgstr "FTP Url"
+msgstr "Адрес FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP путь"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Введите здесь адрес вашего FTP сервера"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "Введите здесь путь для сохранения картинки со статистикой на FTP сервере"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Пользователь"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "Введите здесь имя пользователя для вашего FTP сервера"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "Введите здесь пароль для вашего FTP сервера"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Интервал обновления через FTP в минутах"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Проверить"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Каталог, в котором хранится файл-подпись"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Каталог, в котором будет сохранятся картинка со статистикой"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
-msgstr "Загрузить шаблон <str>"
+msgstr "Подгружает шаблон <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "HTTP порт веб-сервера"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
-msgstr "Использовать UPnP форвардинг портов для порта веб-сервера"
+msgstr "Использовать проброс порта веб-сервера через UPnP"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
-msgstr "UPnP-порт"
+msgstr "Порт UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Использовать gzip-сжатие"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Пароль веб-сервера для полного доступа"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Пароль веб-сервера для ограниченного доступа"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Позволять ограниченный доступ"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Запрещать ограниченный доступ"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
-msgstr "Загрузить/сохранить настройки веб-сервера из/в удаленный aMule"
+msgstr "Подгрузить/сохранить настройки веб-сервера из/в удалённый aMule"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "Путь к файлу конфигурации aMule. НЕ ИСПОЛЬЗУЙТЕ ПРЯМОЙ ПУТЬ!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
-msgstr "Отключить PHP (не рекомендуется)"
+msgstr "Отключить интерпретатор PHP (устарело)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Компилировать PHP-страницы при каждом запросе"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Веб-сервер aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "соединение Веб-клиента принято\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "ОШИБКА: невозможно принять соединение web-клиента\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Запрос не удался из-за следующей ошибки: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
-msgstr "Индексный файл не найден:"
+msgstr "Индексный файл не найден: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
-msgstr "Сессия просрочена - запрашиваю логин\n"
+msgstr "Сеанс просрочен — запрашивается новый вход\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
-msgstr "Сессия в порядке, авторизован\n"
+msgstr "Сеанс в порядке, вход выполнен\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
-msgstr "Сессия в порядке, не авторизован\n"
+msgstr "Сеанс в порядке, выход не выполнен\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
-msgstr "Нет открытых сессий - буду запрашивать логин\n"
+msgstr "Нет открытых сеансов — будет запрошен вход\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
-msgstr "Сессия открыта - запрашиваю логин\n"
+msgstr "Сеанс создан — запрашивается вход\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
-msgstr "Обрабатываю запрос исходный:"
+msgstr "Обрабатывается запрос исходный: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
-msgstr ""
+msgstr "Отказ от чтения `pass` из строки запроса URL-адреса\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Не указан пароль, авторизация запрещена."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Проверяю пароль\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Хеш пароля неверен\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Пароль верен\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Неверный пароль\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "Вы не ввели пароль. Пустой пароль недопустим.\n"
 
 # в eMule - так и пишут: логин/логаут, но мне не нравится
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Запрошено отсоединение\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
-msgstr "Обрабатываю запрос перенаправленный:"
+msgstr "Обрабатывается запрос перенаправленный: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
-msgstr ""
+msgstr "aMule (обязательно)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
-msgstr ""
+msgstr "Ярлык на рабочем столе"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
-msgstr ""
+msgstr "Запускать aMule при входе в систему"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr "Связать файлы .emulecollection"
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
-msgstr ""
+msgstr "Удалить"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
-msgstr ""
+msgstr "Удалить данные пользователя (конфигурация, серверы ED2K, узлы Kad, частичные файлы)"
 
-#: packaging/windows/installer_strings.c:43
-#, fuzzy
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
-msgstr "Попытка подключиться не удалась "
+msgstr "Файлы приложения aMule (обязательно)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
-msgstr ""
+msgstr "Разместить ярлык aMule на рабочем столе."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
-msgstr ""
+msgstr "Автоматически запускать aMule при входе текущего пользователя (настройка для пользователя)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr ""
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr "Добавляет aMule в список «Открыть с помощью» для файлов .emulecollection и делает его приложением по умолчанию, если ни одна другая программа не заняла этот тип. Открытие коллекции ставит в очередь все содержащиеся в ней ссылки eD2k."
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "Удалить файлы приложения aMule, ярлыки в меню «Пуск» / на рабочем столе, запись автозапуска в ключе Run, регистрации схем URL-адресов и запись в списке установленных программ (обязательно)."
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
-msgstr ""
+msgstr "Безвозвратно удалить %APPDATA%\\aMule для текущего пользователя (aMule.conf, список серверов ED2K, узлы Kad, частичные файлы, IP-фильтры, список друзей). Оставьте флажок снятым, чтобы сохранить настройки."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
+"Похоже, что aMule запущен из $INSTDIR.\n"
+"Закройте aMule (а также aMuleD / aMuleGUI) и повторите попытку."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
+"Похоже, что демон aMule (amuled.exe) запущен из $INSTDIR.\n"
+"Остановите его и повторите попытку."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
-msgstr ""
+msgstr "Удаление предыдущей установки aMule в $0…"
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
+"Не удалось удалить предыдущую установку aMule в $0.\n"
+"Закройте все запущенные процессы aMule и повторите попытку, либо сначала удалите предыдущую версию вручную."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
-msgstr ""
+msgstr "Похоже, что aMule запущен. Закройте его и повторно запустите деинсталлятор."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
-msgstr ""
+msgstr "Удаление пользовательских данных в $APPDATA\\aMule…"
+
+#~ msgid "Ratio"
+#~ msgstr "Соотношение"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Нет публикуемых файлов в директории: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Сменить язык"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Для aMule не установлено ни одного перевода"
+
+#~ msgid "No languages available"
+#~ msgstr "Нет доступных языков"
+
+#~ msgid "User name"
+#~ msgstr "Имя пользователя"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Полученные части"
+
+#~ msgid "Available Parts"
+#~ msgstr "Доступные части"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Найден %i известный публикуемый файл, %i неизвестных"
+#~ msgstr1 "Найдено %i известных публикуемых файла, %i неизвестных"
+#~ msgstr2 "Найдено %i известных публикуемых файлов, %i неизвестных"
+
+#~ msgid " MB/s"
+#~ msgstr " МБ/с"
+
+#~ msgid " kB/s"
+#~ msgstr " КБ/с"
+
+#~ msgid "kB/s"
+#~ msgstr "КБ/с"
+
+#~ msgid "kB"
+#~ msgstr "КБ"
+
+#~ msgid "MB/s"
+#~ msgstr "МБ/с"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Загружено"
+#~ msgid "Remote prefix:"
+#~ msgstr "Удалённый сервер"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Локальный сервер"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Файл не найден."
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Неверный элемент списка известных файлов, файл возможно повреждён: "
+
+#, c-format
+#~ msgid "Hashing %u new file"
+#~ msgid_plural "Hashing %u new files"
+#~ msgstr0 "Вычисление хеша для %u нового файла"
+#~ msgstr1 "Вычисление хеша для %u новых файлов"
+#~ msgstr2 "Вычисление хеша для %u новых файлов"
+
+#, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Вычисление хеша для новых файлов (%u из %u)"
+
+#~ msgid "the default Windows shell handler"
+#~ msgstr "стандартный обработчик Windows"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Для предотвращения этого предупреждения при каждом предпросмотре\n"
+#~ "укажите предпочитаемый проигрыватель видео в настройках (по умолчанию: %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Фильтровать результаты"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Отметить как известный"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Процент от всех файлов"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Инициализация"
+
+#~ msgid "New node"
+#~ msgstr "Новый узел"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Дополнительно"
+
+# Похоже, bootstrap в eMule перевели как инициализация
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Инициализация от \n"
+#~ "известных клиентов"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Соединиться с произвольным сервером и/или Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Отключить Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Прекратить попытки соединения"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Отключиться от работающих сетей"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Подключиться к разрешенным сетям"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Авто-сортировка файлов (нагружает процессор)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule будет сортировать файлы в списке загрузок автоматически."
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Отбрасывает пакеты у которых IP клиента отличается от IP с которого пришел пакет. Используйте осторожно."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Вернуть результаты предыдущего поиска.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Показать состояние поиска.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Соединение прервано. Возможно, aMule остановлен."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Проверка наличия новой версии при запуске"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k ссылка:"
+
+#~ msgid "Commit"
+#~ msgstr "Добавить"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: уходим в фоновый режим - до встречи"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Сайт: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Форум: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Сайт: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Форум: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Загружено"

amule-3.0.1.tar.gz/po/sl.po -> amule-3.1.0.tar.gz/po/sl.po Changed

@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:14+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:04+0000\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian\n"
 "Language: sl\n"
@@ -22,71 +22,159 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Generator: Poedit 3.9\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Prikaži aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Oddaljen nadzor aMule "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Posnetek:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"Odjemalec P2P, ki temelji na eMule in je za vse platforme\n"
+"\n"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Avtorske pravice © 2003–2019 ekipa aMule\n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Del aMule temelji na\n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: usmerjanje med enakovrednimi, ki temelji na metriki XOR.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Avtorske pravice 2002–2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Ob zagonu preveri za novo različico"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Povezovanje s Kad ..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Uporabljate zastarelo različico aMule."
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Ni na voljo"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Dodaj prijatelja"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Vnesti morate veljaven IP in vrata."
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Podatki"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Navedena koda uporabnika ni veljavna."
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "Add aMule to your application menu?"
 msgstr "Za imenom programa"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Povezovanje ni uspelo "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -95,84 +183,162 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+msgid "Failed to open ED2KLinks file."
+msgstr "Ni bilo mogoče odpreti datoteke ED2KLinks."
+
+#: src/amuleAppCommon.cpp
+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/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "Pogovorno okno aMule je bilo uničeno"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Indeksne datoteke ni mogoče najti: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Ni bilo mogoče dobiti deljenih datotek od uporabnika »%s«"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "V mapi ni bilo moč najti datotek za deliti: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
 msgstr0 ""
 msgstr1 ""
 msgstr2 ""
 msgstr3 ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "NAPAKA"
-
-#: src/amuleAppCommon.cpp:179
-msgid "Failed to open ED2KLinks file."
-msgstr "Ni bilo mogoče odpreti datoteke ED2KLinks."
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Povezave magnet ni moč pretvoriti v eD2k: %s"
 
-#: src/amuleAppCommon.cpp:252
-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/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Neveljavna povezava eD2k. NAPAKA: %s"
 
-#: src/amule.cpp:251
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Sedaj, zapuščanje glavnega programa …"
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
-msgstr "Končanje izvoda amuleweb s PID »%d« … "
+msgstr "Končanje izvoda amuleweb s PID »%d« ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
-msgstr "Ubijanje izvoda amuleweb s PID »%d« … "
+msgstr "Ubijanje izvoda amuleweb s PID »%d« ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Neuspeh"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Končanje izvoda amuleweb s PID »%d« ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Ubijanje izvoda amuleweb s PID »%d« ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Končevanje jedra."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "Zaustavitev aMule zaključena."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Rezultati razhroščevanja pomnilnika za izhod iz aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Vaše področne nastavitve so bile spremenjene na sistemsko privzete zaradi spremembe v nastavitvah. Oprostite."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Podatki"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -180,56 +346,109 @@
 "\n"
 "Nastavitev zunanje povezave"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Geslo je bilo nastavljeno in zunanje povezave omogočene."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "OPOZORILO"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i najdenih strežnikov v server.met"
+msgid "Loading temp files"
+msgstr "Nalaganje začasnih datotek iz %s."
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Nalaganje začasnih datotek iz %s."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Ponovno naloži deljene datoteke"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Ponovno naloži deljene datoteke"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Začni"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Omrežja"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Omrežja"
+msgid "eD2k server list (server.met)"
+msgstr "%i najdenih strežnikov v server.met"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "spletni strežnik teče s PID %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 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:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "NAPAKA"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "spletni strežnik teče s PID %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+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
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Vrat ni bilo moč povezati z navedenim naslovom: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Vrata %u niso razpoložljiva. Imeli boste nizek ID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -244,49 +463,49 @@
 "\n"
 "Preverite omrežje in se prepričajte, da so vrata odprta za izhod in vhod."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Ni bilo mogoče ustvariti datoteke spletnega podpisa"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Ni bilo mogoče ustvariti aMule datoteke spletnega podpisa"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "To je vaš prvi zagon aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "To je testna različica, posodobljena dnevno in\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "ne dajemo zagotovila, da ne bo ničesar poškodovala, zažgala vaše hiše\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "ali ubila vašega psa. Vendar bi vseeno morala biti varna za uporabo.\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "na https://amule-org.github.io, ali na kanalu IRC #aMule, na strežniku irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 #, fuzzy
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Morebitne hrošče lahko sporočite na https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -294,597 +513,625 @@
 "Navedena mapa za datoteke za spletni podpis je NEVELJAVNA.\n"
 "Spletni podpis bo ONEMOGOČEN, dokler težave ne odpravite v nastavitvah."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Gostitelj strežnika obveščen"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, 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/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "NAPAKA: ni mogoče odpreti dnevniške datoteke"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "OPOZORILO: dnevniška datoteka je prazna. Nekaj je narobe."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Dnevnik je bil ponastavljen"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Sporočilo strežnika: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, 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/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Ni bilo mogoče prejeti seznama vozlišč."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Ni bilo mogoče odpreti prejete datoteke za preverjanje različice"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Datoteka za preverjanje različice je pokvarjena"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Uporabljate zastarelo različico aMule."
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 #, fuzzy
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Najnovejšo različico lahko vedno najdete na https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Uporabljate najnovejšo različico aMule."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Ni bilo mogoče prejeti datoteke za preverjanje različice"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Uporabniki: %s | Datoteke: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Izbranega ni nobenega omrežja"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "z nizkim ID-jem"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "z visokim ID-jem"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Povezano na %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezovanje z %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Povezava z eD2k prekinjena"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad zagnan."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad ustavljen."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Povezano v Kad (v redu)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Povezano v Kad (za požarnim zidom)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Povezava s Kad prekinjena"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Omrežje Kad je onemogočeno v nastavitvah. Ni povezave."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 #, fuzzy
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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 https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - zaganjanje časomerilnika"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: cepljenje v ozadje – se vidimo"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Ni moč ustvariti datoteke PID"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "NAPAKA: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "To je aMule %s, ki temelji na eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Operacijski sistem: %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Obiščite https://github.com/amule-org/amule/releases/latest da preverite, če je na voljo nova različica."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "USODNA NAPAKA: ustvaritev časomerilnika ni uspela"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Oddaljen nadzor aMule "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Posnetek:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Omrežja"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Odjemalec P2P, ki temelji na eMule in je za vse platforme\n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Iskanja"
 
-#: src/amuleDlg.cpp:546
-#, fuzzy
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Spletna stran: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Prejemanja"
 
-#: src/amuleDlg.cpp:547
-#, fuzzy
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Deljene datoteke"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Spletna stran: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Odjemalci"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Sporočila"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Avtorske pravice © 2003–2019 ekipa aMule\n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistika"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Del aMule temelji na\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Nastavitve"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: usmerjanje med enakovrednimi, ki temelji na metriki XOR.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Avtorske pravice 2002–2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Sporočilo strežnika: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Sporočilo"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Ni na voljo"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Najnovejšo različico lahko vedno najdete na https://github.com/amule-org/amule/releases/latest"
+
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "Pogovorno okno aMule je bilo uničeno"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Povezovanje"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: povezovanje"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: povezava prekinjena"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: za požarnim zidom"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: povezano"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: povezovanje"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: izklopljen"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Prekliči"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Ustavi trenutne poskuse povezovanja"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Različica"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Prekini povezave"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Prekini povezavo s trenutno povezanimi omrežji"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Poveži se"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Naslov"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Opis"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Poveži se s trenutno omogočenimi omrežji"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "aMule dnevnik"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Gor: %.1f%s (%.1f) | Dol: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MiB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Gor: %.1f%s | Dol: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Povezano)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Ni povezave)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Ali res želite zapustiti %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Potrditev izhoda"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Zaženi ukaz: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "– privzeto –"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Mapa za preobleke »%s« ne obstaja"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "OPOZORILO: datoteke s preobleko »%s« ni moč odpreti za branje"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Omrežja"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Okno z omrežji"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Iskanja"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Okno z iskanji"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Prejemanja"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Okno s prejemanji"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Deljene datoteke"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Okno z deljenimi datotekami"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Sporočila"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Okno z omrežji"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Okno s sporočili"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistika"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Okno s statističnimi grafi"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Nastavitve"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Okno z nastavitvami"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Uvoz"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Orodje za uvažanje delnih datotek"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "O programu"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "O programu/pomoč"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Omrežje eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Omrežje Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Brez omrežja"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Oddaljeni nadzor aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Usodna napaka: ni bilo mogoče ustvariti osrednjega časomerilnika"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Poveži se z oddaljenim aMule"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Povezava izgubljena"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Opozori ob končanju"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 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:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Prehod v dogodkovno zanko …"
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Povezovanje …"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Rokovalnik z dogodki zunanje povezave oddaljenega vmesnika"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, 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/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Zaustavljanje"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Povezava prekinjena – aMule se je najverjetneje končal."
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Čas za poskus povezovanja z %s (%s:%i) je potekel."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Onemogočeno"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Poveži se z omrežjem."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Povezava ni uspela. Ni se moč povezati z %s: %d\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Pripravljen"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Vse"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Ni na voljo"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Datoteke ni mogoče najti."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Neveljavna povezava oz. je že na seznamu."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Mapa za začasne datoteke prejemanj"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 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/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Neznano"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Ni bilo mogoče dobiti deljenih datotek od uporabnika »%s«"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Iskanje kolega za povezavo z nizkim ID-jem"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (lažna različica eMule %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (lažni eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (lažni eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (temelji na eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Vzdevek: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Zahtevano: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
@@ -893,7 +1140,7 @@
 msgstr2 "Statistika datotek v tej seji: Sprejetih %d od %d zahtev, %s prenesenih\n"
 msgstr3 "Statistika datotek v tej seji: Sprejetih %d od %d zahtev, %s prenesenih\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
@@ -902,119 +1149,205 @@
 msgstr2 "Statistika datotek vseh sej: Sprejetih %d od %d zahtev, %s prenesenih\n"
 msgstr3 "Statistika datotek vseh sej: Sprejetih %d od %d zahtev, %s prenesenih\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Zahtevana neznana datoteka"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Filtrirano sporočilo od »%s« (IP: %s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Novo sporočilo od »%s« (IP: %s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Uporabnik %s (%u) je zahteval seznam deljenih datotek za mapo »%s« → prezrto"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Ni bilo mogoče dobiti deljenih datotek od uporabnika »%s«"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "OPOZORILO: %s ni moč odpreti."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "OPOZORILO: Seznam preklicanih datotek je pokvarjen, vsebuje neveljavno glavo."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Vhodno/izhodna napaka med branjem datoteke %s: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Napaka med shranjevanjem datoteke %s: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Vnesite besedilo s slike"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategorija"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Nova kategorija"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Izberite mapo za prejete datoteke"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Navesti morate ime za kategorijo."
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Navesti morate pot za kategorijo."
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Pogovorna seja se je začela: %s (%s:%u) – %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Povezan z odjemalcem ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Povezovanje z odjemalcem ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Povezava z odjemalcem ni uspela / povezava izgubljena ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 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/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Klepet"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Zapri zavihek"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Zapri vse zavihke"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Zapri druge zavihke"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Dodaj med prijatelje"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Prikaži po&drobnosti"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Odstrani s seznama prijateljev"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Ustvari mesto za prijatelja"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Prikaži datoteke"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Pošlji sporočilo"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Pošlji uporabniku sporočilo"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Sporočilo:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Ne morete dodeliti več kot enega mesta za prijatelja.\n"
+"Samo eno mesto je bilo dodeljeno."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Izbira večih"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Odstrani s seznama prijateljev"
+msgstr1 "Odstrani s seznama prijateljev"
+msgstr2 "Odstrani s seznama prijateljev"
+msgstr3 "Odstrani s seznama prijateljev"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Ponovno naloži seznam deljenih datotek."
+msgstr1 "Ponovno naloži seznam deljenih datotek."
+msgstr2 "Ponovno naloži seznam deljenih datotek."
+msgstr3 "Ponovno naloži seznam deljenih datotek."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
@@ -1023,7 +1356,7 @@
 msgstr2 "Datoteka s krediti naložena, %u znana odjemalca"
 msgstr3 "Datoteka s krediti naložena, %u znani odjemalci"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
@@ -1032,160 +1365,272 @@
 msgstr2 " - Zasluge potekle za %u odjemalca."
 msgstr3 " - Zasluge potekle za %u odjemalce."
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Datoteka »cryptkey.dat« ne obstaja. Ustvarjanje."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Podrobnosti o odjemalcu"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "Nizek ID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "Visok ID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Omogočeno"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Podprto"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Ni podprto"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Onemogočeno"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Povezano"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Ni povezave"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Ime"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Naslov IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Izvor"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Zadnji sprejem"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Različica"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Hitrost pošiljanja"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Hitrost prejemanja"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Poslano"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Skupno prejetega: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Količnik dol/gor"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Spletni podpis"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Nezaključeno"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Baraba"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Preverjeno – v redu"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "Ni na voljo"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Ni na voljo"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Datoteke"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Poslano"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Prejeto"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Prejemanje"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Pošiljanje"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Dejavno"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Neznano"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Uporabnik %s (%u) je zahteval vaš seznam deljenih datotek → sprejeto"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Uporabnik %s (%u) je zahteval vaš seznam deljenih datotek → zavrnjeno"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Uporabnik %s (%u) je zahteval vaš seznam deljenih map → sprejeto"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Uporabnik %s (%u) je zahteval vaš seznam deljenih map → zavrnjeno"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "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/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "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/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Uporabnik %s (%u) deli mapo »%s«"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Uporabnik %s (%u) je poslal nezahtevane deljene mape."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "Uporabnik %s (%u) je zaključil s pošiljanjem seznama deljenih datotek"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Uporabnik %s (%u) je poslal nezaželen seznam deljenih datotek"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, 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/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Komentarji o datoteki"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Ime datoteke"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Ocena"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Komentar"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "Iskanje kolega za povezavo z nizkim ID-jem"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Ni komentarjev"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
@@ -1194,410 +1639,417 @@
 msgstr2 "%u komentarja"
 msgstr3 "%u komentarji"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 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:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Nalaganje državnih podatkov za »%s« ni uspelo."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Samod. Ni"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Samod. No"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Samod. Vi"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Zelo nizka"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Nizka"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Običajna"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Visoka"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Zelo visoka"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Najvišja"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Povpraševanje"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Povezovanje preko strežnika"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Vrsta polna"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "V vrsti"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Prejemanje"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Prejemanje nabora kod"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Nič uporabnih delov"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Povezava nizkega ID-ja z nizkim ID-jem ni mogoča"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Preveč povezav"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Povezovanje preko Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Preveč povezav Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Izločen"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Napaka povezave"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Oddaljena vrsta polna"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Star MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Nov MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule združljiv"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Krajevni strežnik"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Oddaljni strežnik"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Izmenjava virov"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Pasivno"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Povezava"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Izvorna semena"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Rezultat iskanja"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Zaključeno"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "V teku"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "NAPAKA: zmanjkalo je prostora na disku"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "NAPAKA: ni bilo moč najti datoteke partmet"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "NAPAKA: vhodno/izhodna napaka"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "NAPAKA: neuspeh"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "V vrsti"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Datoteka se že prejema"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Neznan ali pokvarjen format začasne datoteke."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Del"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Velikost"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Preneseno"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Hitrost"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Napredek"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Viri"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prednost"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Stanje"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Preostali čas"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Nazadnje videno celotno"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Zadnji sprejem"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Ali res želite izbrisati izbrano datoteko?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Ali res želite izbrisati izbrane datoteke?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Odziv od: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Samod."
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Ustavi"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Premor"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Nadaljuj"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Počisti &zaključene"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Prenesi vse vire PZDD na to datoteko zdaj"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Prenesi vse vire PZDD na to dat. (samod.)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Prenesi vse vire PZDD na druge datoteke"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Dodatne možnosti"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Ogled"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Prikaži po&drobnosti datoteke"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Prikaži vse komentarje"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Skopiraj magnet URI na odložišče"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Skopiraj &povezavo eD2k na odložišče"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Skopiraj odziv na odložišče"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Dobi %s za to datoteko"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "prekliči dodelitev"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Dodeli kategoriji"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Odpri datoteko"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Ali res želite izbrisati izbrano datoteko?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Ali res želite izbrisati izbrane datoteke?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Odziv od: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Vnesite novo ime za to datoteko:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Preimenuj datoteko"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MiB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%d.%m.%y %H:%M:%S"
+msgid "%.1f MiB/s"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Prejemanja (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Da preprečite to opozorilo ob vsakem ogledu,\n"
-"nastavite svoj priljubljen predvajalnik video posnetkov (privzet je %s)"
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Ogled datoteke"
-
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "NAPAKA: Ni bilo mogoče zagnati zunanjega predvajalnika. Ukaz: »%s«"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Skupno dol: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Shranjevanje delne datoteke %u od %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Vse delne datoteke shranjene."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Nalaganje začasnih datotek iz %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Nalaganje delne datoteke %u od %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 #, fuzzy
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "NAPAKA: nalaganje varnostne kopije ni uspelo. Na https://github.com/amule-org/amule/discussions pošičite rešitve za obnavljanje datotek .part.met."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Vse delne datoteke naložene."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Ni mogoče najti delnih datotek"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
@@ -1606,45 +2058,45 @@
 msgstr2 "Najdeni %u delni datoteki"
 msgstr3 "Najdene %u delne datoteke"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Datotečni sistem z začasno mapo ne more shranjevati velikih datotek."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Datotečni sistem z mapo prejetih datotek ne more shranjevati velikih datotek."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Prejemanje %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Datoteko »%s« že poskušate prejeti."
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Datoteko »%s« že imate."
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Datoteko »%s« že imate."
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Datoteko %s že poskušate prejemati"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Povezave magnet ni moč pretvoriti v eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Neznan protokol povezave: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
@@ -1653,238 +2105,320 @@
 msgstr2 ""
 msgstr3 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Neveljavna povezava eD2k. NAPAKA: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Po neuspelem overjanju je odjemalec poslal paket."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Zunanja povezava se je zaprla."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Zunanje povezave onemogočene zaradi praznega gesla."
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Zunanje povezave onemogočene v nastavitveni datoteki"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Nova zunanja povezava sprejeta"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "NAPAKA: nove zunanje povezave ni bilo moč sprejeti"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Zunanja povezava zavrnjena zaradi praznega gesla v nastavitvah."
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Povezovanje z odjemalcem: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Neznana različica"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "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:559
+#: src/ExternalConn.cpp
 msgid "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:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Neveljavna različica protokola."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Manjka oznaka različice protokola."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Samodejen poskus povezovanja na strežnik se bo ponovil čez %d sekund"
+
+#: src/ExternalConn.cpp
 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:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Overjanje ni uspelo: napačno geslo."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Overjanje ni uspelo: manjkajoče geslo."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Neveljavna zahteva, najprej se morate overiti."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Dostop dovoljen."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Odjemalcu je bilo poslano sporočilo o napaki »%s«."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Nepooblaščen poskus dostopa od %s. Povezava prekinjena."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Ukaz za oddaljeno delno datoteko ni uspel: Ni bilo mogoče najti kode datoteke: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Kode datoteke ni mogoče najti: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "UPS. Napaka pri obdelavi OpCode."
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Strežnik ni bil dodan"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "strežnika ni mogoče najti: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "morate navesti strežnik za odstranitev"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k je onemogočen v nastavitvah."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Datoteke ni mogoče najti."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Datoteke ni mogoče najti."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Iskanje poteka. Ponovno poglejte za rezultati čez nekaj trenutkov."
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Spletno iskanje iz oddaljenega vmesnika nima smisla."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Iskanje poteka. Ponovno poglejte za rezultati čez nekaj trenutkov."
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Ni točk za graf."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Vaš odjemalec ni nastavljen za to stopnjo podrobnosti."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Zunanja povezava: zahtevana zaustavitev"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Ustavljanje že poteka."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Zunanja povezava: dodajanje povezave »%s«."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Neveljavna povezava oz. je že na seznamu."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Datoteke ni mogoče najti."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Neveljavno ime datoteke."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Ni mogoče preimenovati datoteke."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Zapri to pogovorno sejo."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Začeta je bila nova seja klepeta."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Zapri to pogovorno sejo."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad je onemogočen v nastavitvah."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(neznano ime)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad je onemogočen v nastavitvah."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Povezava z eD2k že obstaja."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Povezovanje z eD2k …"
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Povezava s Kad že obstaja."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Povezovanje s Kad …"
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Vsa omrežja so onemogočena."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Povezava z eD2k prekinjena."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Povezava s Kad prekinjena."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Zunanja povezava: prejeta je bila neveljavna operacijska koda: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Neveljavna operacijska koda (napačna različica protokola?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Neznana razširitev »%s« za ukaz »%s«.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Neznan ukaz »%s«.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1892,7 +2426,7 @@
 "\n"
 "Ta ukaz nima argumentov.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1900,7 +2434,7 @@
 "\n"
 "Ta ukaz mora imeti argument.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1908,7 +2442,7 @@
 "\n"
 "Ta ukaz je nepopoln, uporabiti morate eno od spodnjih razširitev.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1916,11 +2450,11 @@
 "\n"
 "Razpoložljive razširitve:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Razpoložljivi ukazi:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1931,17 +2465,17 @@
 "Ukazi niso občutljivi na velikost črk.\n"
 "Napišite »%s <ukaz>« za podrobne informacije o <ukaz>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Konča program."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Prikaži pomoč."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1949,7 +2483,7 @@
 "Za pomoč pri ukazu napišite »help <ukaz>«.\n"
 "Za celoten seznam ukazov napišite »help«.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1960,46 +2494,46 @@
 "Uporabite »%s« za seznam ukazov\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Napaka v skladnji."
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Ta ukaz ne sme imeti parametrov."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Ta ukaz mora imeti parameter."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Neveljaven argument."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Ukaz ni popoln."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Napišite »%s« za dodatno pomoč.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "To je %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "To je %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -2007,7 +2541,7 @@
 "\n"
 "Ustvarjanje odjemalca …\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2016,7 +2550,7 @@
 "\n"
 "V redu, končevanje %s …\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2030,118 +2564,361 @@
 "\n"
 "Končevanje …\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Prikaži to besedilo pomoči."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Gostitelj kjer teče aMule. (privzeto: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Vrata aMule za zunanje povezave. (privzeto: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Geslo za zunanje povezave."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Preberi nastavitve iz datoteke."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Ne izpisuj izhodnih podatkov na standardni izhod."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Zgovorno – prikaži tudi razhroščevalna sporočila."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Nastavi področne nastavitve (jezik) programa."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Zapiši možnosti ukazne vrstice v nastavitveno datoteko."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Ustvari nastavitveno datoteko, ki temelji na nastavitveni datoteki aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Izpiši različico programa."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Podrobnosti datoteke"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f %% zaključeno"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Ogled datoteke"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "NAPAKA: Ni bilo mogoče zagnati zunanjega predvajalnika. Ukaz: »%s«"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "NAPAKA: delne datoteke »%s« ni bilo moč odpreti"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Dobrodošli!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "Povezovanje s kolegom"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Stanje povezave:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Omrežja"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Standardna vrata TCP "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Dodatna vrata UDP (globalno/Kad iskanje) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Omogoči posredovanje vrat na usmerjevalniku"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Začetno nalaganje"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Datoteko %s že poskušate prejemati"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Ob zagonu samodejno posodobi seznam strežnikov"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Ciljna mapa za prejeto"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Brskanje"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Mapa za začasne datoteke prejemanj"
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 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/FriendList.cpp:149
+#: src/FriendList.cpp
 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/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "KRITIČNO – ni odjemalca za StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Prijatelji"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Prikaži po&drobnosti"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Dodaj prijatelja"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Odstrani prijatelja"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Pošlji &sporočilo"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Prikaži datoteke"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Ustvari mesto za prijatelja"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Ali res želite izbrisati izbranega prijatelja?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Ali res želite izbrisati izbrane prijatelje?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2149,200 +2926,176 @@
 "Ne morete dodeliti več kot enega mesta za prijatelja.\n"
 "Samo eno mesto je bilo dodeljeno."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Izbira večih"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Ne morete dodeliti več kot enega mesta za prijatelja.\n"
-"Samo eno mesto je bilo dodeljeno."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Pošlji uporabniku sporočilo"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Sporočilo:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Odstrani s seznama prijateljev"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Pošlji sporočilo"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Prenesi k tej datoteki"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "PZDD"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "V vrsti: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Prosil za drugo datoteko"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Čakanje na mesto za pošiljanje"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "V vrsti: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Pošiljanje"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Brez"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Ne"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Da"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Ni bilo mogoče odpreti %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Prejemanje …"
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "Prejemanje HTTP preklicano"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "URL za prejemanje ne sme biti prazen"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Ni bilo mogoče dobiti deljenih datotek od uporabnika »%s«"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Mapa za začasne datoteke prejemanj"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Prejetih %d bajtov"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "The URL %s returned: %i"
 msgstr "URL %s je vrnil: %i – Napaka (%i)."
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Prejemanje HTTP preklicano"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr ""
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Pridobi novo datoteko GeoIP.dat od %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "Prejemanje datoteke GeoIP.dat ni uspelo, posodobitev preklicana."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Odstranitev datoteke %s ni uspela, posodobitev preklicana."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Preimenovanje datoteke %s ni uspelo, posodobitev preklicana."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "%s je bila uspešno posodobljena"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Error updating %s"
 msgstr "Napaka pri posodabljanju GeoIP.dat"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Prejemanje %s od %s ni uspelo"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Nalaganje državnih podatkov za »%s« ni uspelo."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Nalaganje datotek filtrov IP »ipfilter.dat« in »ipfilter_static.dat«."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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«, ni bilo moč odpreti datoteke"
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
@@ -2351,7 +3104,7 @@
 msgstr2 "Naložena %u niza IP iz '%s'."
 msgstr3 "Naloženi %u nizi IP iz '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
@@ -2360,66 +3113,73 @@
 msgstr2 "%u nepravilni vrstici sta bili izpuščeni."
 msgstr3 "%u nepravilne vrstice so bile izpuščene."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Preimenovanje nove datoteke %s ni uspelo, posodobitev preklicana."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "Filter IP je pripravljen"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Naloži od znanih \n"
-"odjemalcev"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Trenutno"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Trenutno povprečje"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Povprečje seje"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Vozlišča (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Neveljaven IP za začetno nalaganje"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Neveljavna vrata za začetno nalaganje"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Prosimo, izpolnite vsa zahtevana polja"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Sporočilo"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "Ali res želite prejeti novo datoteko nodes.dat?\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "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/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Ali želite nadaljevati?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: iskalni niz je prekratek"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: iskalna ključna beseda je že na iskalnem seznamu: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Branje datoteke nodes.dat ni uspelo – prestara je. Ta različica (0) ni več podprta."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
@@ -2428,12 +3188,11 @@
 msgstr2 "Prebrana %u stika Kad"
 msgstr3 "Prebrani %u stiki Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Najdenega ni bilo nobenega stika. Opravite začetno nalaganje ali pa pridobite datoteko nodes.dat."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
@@ -2442,7 +3201,7 @@
 msgstr2 "Na voljo sta samo %d stika Kad, nodes.dat ni bila zapisana"
 msgstr3 "Na voljo so samo %d stiki Kad, nodes.dat ni bila zapisana"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
@@ -2451,1829 +3210,2290 @@
 msgstr2 "Zapisana %d stika Kad"
 msgstr3 "Zapisani %d stiki Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Omrežje Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Velikost datoteke"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Delilno razmerje"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Poslano"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Zahtevano"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Popolnih virov"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "OPOZORILO: seznam znanih datotek je pokvarjen, vsebuje neveljavno glavo."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 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/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Neveljaven vnos na seznamu znanih datotek, datoteka je morda pokvarjena: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Sistemsko privzet"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albansko"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabsko"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturijsko"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baskovsko"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bolgarsko"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalonsko"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Kitajsko (poenostavljeno)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Kitajsko (tradicionalno)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Hrvaško"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Češko"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Dansko"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Nizozemsko"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Angleško (Z.K.)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Angleško (Z.K.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estonsko"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finsko"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Francosko"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galicijsko"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Nemško"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grško"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebrejsko"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Madžarsko"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italijansko"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japonsko"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Korejsko"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Litvansko"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norveško (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Poljsko"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugalsko"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugalsko (brazilsko)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Romunsko"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Rusko"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slovensko"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Špansko"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Švedsko"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turško"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukrajinsko"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Neznana napaka %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Ni moč dobiti opisa napake za napako %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Ustvarjanje kode"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Zaključevanje"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Zaključeno"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Prekinjeno"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Vsebuje napake"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Na čakanju"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Navesti morate neprazno geslo."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Neveljavno geslo, ni zgoščena vrednost MD5."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Napaka med povezovanjem"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Zunanja povezava se je zaprla."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "Zunanja povezava ni uspela. Prazen odgovor."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Zunanja povezava: slab odgovor, rokovanje ni uspelo. Povezava prekinjena."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Zunanja povezava: slab odgovor, rokovanje ni uspelo. Povezava prekinjena."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Uspeh! Vzpostavljena povezava z aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Uspeh! Povezava vzpostavljena."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Zunanja povezava: dostop je bil zavrnjen. Razlog: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Zunanja povezava: rokovanje ni uspelo."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Asinhrona nit %d se je začela"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "Vtičnica za poslušanje: v redu."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "NAPAKA: ni moč poslušati na vratih TCP."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "NAPAKA: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "OPOZORILO: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Zapri"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Izreži"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Skopiraj"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Prilepi"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Počisti"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Neomejeno"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Prikaži aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Skrij aMule"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "Povezano"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "Povezano"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "Povezano v Kad (za požarnim zidom)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "IP strežnika: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "IP strežnika:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Ni povezave"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Vrata TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Vrata TCP: niso pripravljena"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Vrata UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Vrata UDP: niso pripravljena"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Podatki o odjemalcu"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Omejitev pošiljanja"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Omejitev prejemanja"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Prikaži aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Prekini povezave"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Skrij aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Poveži se"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Neomejeno"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule meni sistemske vrstice"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Omejitve hitrosti"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "Gor: brez"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "Gor: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "Dol: brez"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "Dol: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Hitrost prejemanja: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Hitrost pošiljanja: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Vzdevek: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Izbran ni noben vzdevek."
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "Odjemalčev ID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Ime strežnika: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP strežnika: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Ni povezave"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Spletni podpis: omogočen"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Spletni podpis: onemogočen"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Neprekinjeno delovanje: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Deljene datoteke: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Odjemalci v vrsti: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Skupno dol: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Skupno gor: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "Povezava eD2k: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Pridobi"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Dodaj povezavo magnet ali povezavo ed2k v jedro."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Dodaj med prijatelje"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Kliknite za dodajanje povezave eD2k v vrsto za prejemanje."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Dogodki so prikazani tukaj. Za celoten seznam dogodkov, poglejte v zapisnik na zavihku Strežniki."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Nalaganje …"
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Uporabnikov: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Število uporabnikov povezanih na ta strežnik in ocena skupnega števila uporabnikov."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Gor: 0,0 | Dol: 0,0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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 odjemalci."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 in dejavne 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Ni povezave …"
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Trenutno povezan strežnik."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Iskanje"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Ime:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Vrsta"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Krajevno"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Globalno"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Dodatni parametri"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtriranje"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Vrsta datoteke"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Vse"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Arhivi"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Zvok"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "Odtisi CD-jev"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Slike"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programi"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Besedila"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Video"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Končnica"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Min. velikost"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bajtov"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KiB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MiB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GiB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Maks. velikost"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Razpoložljivost"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filter:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filtriraj rezultate"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filter"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Obrni rezultat"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Skrij znane datoteke"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Ponastavi polja"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Začni"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Več"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Končnica"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Ustavi"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Pridobi"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Prejemaj v kategoriji"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Rezultat iskanja"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Ponastavi polja"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Rezultati"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Počisti zaključena prejemanja"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filter:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Viri datoteke:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Splošno"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Polno Ime:"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "Ni na voljo"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Polno Ime"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "Datoteka met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Koda"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Datoteka met:"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Koda:"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Velikost datoteke:"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Stanje delne datoteke:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Nazadnje videno celotno:"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Velikost datoteke"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Prenos"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Najdenih virov:"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Prenašajoči viri:"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Število delov:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Razpoložljivih:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Stanje delne datoteke"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Podatkovna hitrost:"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Nazadnje videno celotno"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Najdenih virov"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Prenašajoči viri"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Število delov"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Razpoložljivih"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Podatkovna hitrost"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Čas dejavnega prejemanja"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Čas dejavnega prejemanja: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Preneseno:"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Zaključeno:"
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Zaključeno"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Inteligentno rokovanje s poškodbami"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Izguba zaradi poškodb:"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Pridobitev zaradi stiskanja:"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Paketi rešeni z I.R.P.:"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Izguba zaradi poškodb"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Pridobitev zaradi stiskanja"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Paketi rešeni z I.R.P."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Deljenih: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Zahteve"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Sprejete zahteve"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Prenesenih podatkov"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Delilno razmerje"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Popolni viri"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Deljene datoteke"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", poslanega: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Podatki o Kad"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Ni ocenjena"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Naslov"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Imena datoteke"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Prevzemi"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Počisti"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Uveljavi"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "V redu"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Komentirajte/ocenite datoteko (besedilo bo vidno vsem uporabnikom)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 poveste njegovo dolžino, zgodbo, jezik …\n"
+"Za film lahko poveste njegovo dolžino, zgodbo, jezik ...\n"
 "in če je lažna, lahko to sporočite drugim uporabnikom."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Kakovost datoteke"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Ni ocenjena"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Neveljavna/poškodovana/lažna"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Slaba"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Povprečna"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Dobra"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Odlična"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Povezava s Kad prekinjena"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Osveži"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Prejemanje, prosimo počakajte …"
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Neznana velikost"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Zahtevani podatki"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Naslov IP:"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Vrata:"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Vrata"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Dodatni podatki"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Uporabniško ime:"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Koda uporabnika:"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Koda uporabnika"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Hitrost prejemanja"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Trenutno"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Trenutno povprečje"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Povprečje seje"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Hitrost pošiljanja"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Povezave"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Dejavna prejemanja"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Dejavne povezave (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Dejavna pošiljanja"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Statistično drevo"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Uporabniško ime:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Koda uporabnika:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Program odjemalca:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Različica odjemalca:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Naslov IP:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Program odjemalca"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Različica odjemalca"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID uporabnika"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP strežnika"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID uporabnika:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Ime strežnika"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP strežnika:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Maskiranje"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Ime strežnika:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Maskiranje:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Maskiranje protokola"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Prenosi do uporabnika"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Trenutna zahteva:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Povprečna hitrost pošiljanja:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Povprečna hitrost prejemanja:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Poslano (seja):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Prejeto (seja):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Poslano (skupno):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Prejeto (skupno):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Trenutna zahteva"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Povprečna hitrost pošiljanja"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Povprečna hitrost prejemanja"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Poslano (seja)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Prejeto (seja)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Poslano (skupno)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Prejeto (skupno)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Točke"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Količnik dol/gor:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Varna identifikacija:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Položaj v vrsti:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Točke v vrsti:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Varna identifikacija"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Položaj v vrsti"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Točke v vrsti"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Vzdevek"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io – Mule za vse platforme"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Jezik: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Zakasnitev preden se pojavi namig z navodili."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "To določa jezik vmesnika programa."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Ob zagonu preveri za novo različico"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Ob vklopu te možnosti, bo aMule ob vsakem zagonu preveril za novo različico programa."
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Zaženi pomanjšano"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Vklop te možnosti pomanjša aMule ob zagonu."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Opozori ob končanju"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Preden se aMule konča vas o tem opozori."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Ikona v sistemski vrstici"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Vklopi/izklopi ikono v sistemski vrstici."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Skrij okno programa, ko kliknete okno za zapiranje"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Pomanjšaj v sistemsko vrstico"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Ob vklopu te možnosti se bo aMule pomanjšal v sistemsko vrstico, namesto v opravilno vrstico."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "Prikaži obvestilo ob zaključku prejemanja"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "Če to omogočite, bo aMule ob zaključku prejemanja prikazal obvestilo."
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Zapomni si te nastavitve"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Zakasnitev namigov: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "sekund"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Sem vnesite ime brskalnika. Za uporabo privzetega sistemskega brskalnika pustite prazno."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Brskanje"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Odpri v novem zavihku, če je mogoče"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Video predvajalnik"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Omejitve povezave"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Pošlji"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Hitrost za eno mesto"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Vrata"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Standardna vrata TCP "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "To so standardna vrata za eD2k in jih ni moč onemogočiti."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Vrata UDP za zahtevke strežnika (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Dodatna vrata UDP (globalno/Kad iskanje) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Omogoči posredovanje vrat na usmerjevalniku"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "Vrata TCP za UPnP (neobvezno):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Krajevni naslov poveži z IP-jem (prazno za poljuben):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Krajevni naslov poveži z IP-jem (prazno za poljuben):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Največ virov na prejemanje:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Največ istočasnih povezav:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "eD2k"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Samodejno se poveži ob zagonu"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Ponovno se poveži ob prekinjeni povezavi"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Izbriši nedosegljiv strežnik po"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "poskusih"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Ob zagonu samodejno posodobi seznam strežnikov"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Seznam"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Ob povezavi na strežnik posodobi seznam strežnikov"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Ob povezavi odjemalca posodobi seznam strežnikov"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Uporabi sistem prednosti"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Uporabi preverjanje za nizek ID ob povezavi"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Varno povezovanje"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Samodejna povezava samo na strežnike na statičnem seznamu"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Nastavi ročno dodane strežnike na visoko prednost"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Inteligentno rokovanje s poškodbami (I.R.P.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Omogoči"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Na novo dodani prejemi naj bodo zaustavljeni"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Na novo dodani prejemi naj imajo samodejno prednost"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Najprej poskusi prejeti prvi in zadnji del"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Po zaključku datoteke začni naslednjo prekinjeno"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Iz iste kategorije"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "Po abecednem vrstnem redu"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Novim datotekam vnaprej dodeli prostor na disku"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 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:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Ustavi prejemanja, ko prostor na disku doseže "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Sem vnesite min. želen prostor na disku."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Shrani 10 virov pri redkih datotekah (< 20 virov)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Pošiljanja"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Nove deljene datoteke naj imajo samodejno prednost"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Ciljna mapa za prejeto"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Inteligentno rokovanje s poškodbami (I.R.P.)"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Omogoči"
+
+#: src/muuli_wdr.cpp
+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 src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Deljene mape"
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Mapa za začasne datoteke prejemanj"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Deljene mape"
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Odstrani"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(desni klik na ikono mape izbere tudi podmape)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Deli skrite datoteke"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Oddaljni strežnik"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Krajevni strežnik"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafi"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Zamik posodabljanja: 5 sek."
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Čas za graf povprečja: 100 min."
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Merilo za graf povezav: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Merilo za graf prejemanj:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Merilo za graf pošiljanj:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Barve: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Ozadje"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Mreža"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Trenutno prejemanje"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Povprečje prejemanja"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Povprečje seje za prejemanje"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Trenutno pošiljanje"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Povprečje pošiljanja"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Povprečje seje za pošiljanje"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Dejavne povezave"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Prikaz hitrosti v sistemski vrstici"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Trenutna vozlišča Kad"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Vozlišča Kad v teku"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Vozlišča Kad te seje"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Izberi"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Drevo"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Število prikazanih različic odjemalcev (0 = neomejeno)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! OPOZORILO !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Maks. novih povezav / 5 sek."
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "Interval med osvežitvami FTP-ja v minutah"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "Interval med osvežitvami FTP-ja v minutah"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Datotečni medpomnilnik: 240000 bajtov"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Velikost vrste za pošiljanje: 5000 odjemalcev"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Čas med osvežitvama povezave na strežnik: onemogoči"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Onemogoči prehod računalnika v pripravljenost"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Uporabljena preobleka: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Prikaži hitri rokovalnik s povezavami eD2k v vsakem oknu."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Prikaži razširjene podatke na zavihkih kategorij"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "V naslovni vrstici pokaži različico programa"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Kaži hitrosti prenosa v naslovni vrstici"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Pred imenom programa"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Za imenom programa"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Kaži presežek prenosov"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Usmeri orodjarno navpično"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Datoteke v vrsti prejemanj"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Prikaži odstotek napredka"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Prikaži črto napredka"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Plosko"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Zaokroženo"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Samodejno razvrščaj datoteke"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule bo samodejno razvrstil datoteke na vašem seznamu pprejemanj, kar potrebuje precej procesorske moči."
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parametri za zunanje povezave"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Sprejmi zunanje povezave"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP vmesnika, ki posluša:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Vrata TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Vklopi posredovanje vrat UPnP za vrata zunanjih povezav"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Geslo"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Parametri spletnega strežnika"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "Vrata TCP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Preverjanje gesla\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Preverjanje gesla\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Zavrni dostop gostom"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Geslo za goste na spletnem strežniku"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Parametri spletnega strežnika"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Spletni strežnik zaženi ob zagonu"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Spletna predloga"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Geslo za vse pravice"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Omogoči uporabnika z nizkimi pravicami"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Geslo za nizke pravice"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Vklopi posredovanje vrat UPnP za vrata spletnega strežnika"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Vrata TCP za UPnP za spletni strežnik (neobvezno)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Čas med osvežitvami strani (v sek.)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Omogoči stiskanje gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Sistemsko privzet"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "V redu"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Kliknite tukaj za uveljavitev sprememb v nastavitvah."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Razveljavi vse spremembe v nastavitvah."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Naslov:"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Komentar:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Mapa za prejeto:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Spremeni prednost novo dodeljenim datotekam:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Mapa za prejeto"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Spremeni prednost novo dodeljenim datotekam"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Ne spremeni"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Izberite barvo za to kategorijo (trenutno izbrano):"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Ponastavi"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Izberite barvo za to kategorijo (trenutno izbrano)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Kliknite ta gumb, da ponastavite dnevnik."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Kliknite ta gumb za posodobitev seznama strežnikov iz URL-ja."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Seznam strežnikov"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 datoteke server.met in kliknite gumb na levi, da posodobite seznam strežnikov."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Ročno dodaj strežnik: ime"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Sem vnesite ime novega strežnika"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Vrata"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Sem vnesite IP strežnika v formatu x.x.x.x."
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Sem vnesite vrata strežnika."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule dnevnik"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Podatki o strežniku"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Podatki o eD2k"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Podatki o Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Kliknite ta gumb za posodobitev seznama vozlišč iz URL-ja."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Vozlišča (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Vnesite URL do datoteke nodes.dat in pritisnite gumb na levi za posodobitev seznama vozlišč."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Statistika vozlišč"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Začetno nalaganje"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Novo vozlišče"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Vrata:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bootstrap from node: IP"
 msgstr ""
 "Naloži od znanih \n"
 "odjemalcev"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Prekini povezavo s Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Sem vnesite IP strežnika v formatu x.x.x.x."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Uporabi varno identifikacijo uporabnikov"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Maskiranje protokola"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Omogoči maskiranje protokola"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Ob vklopu te možnosti, bo aMule sprejemal maskirane povezave od drugih odjemalcev."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Uporabi maskiranje za izhodne povezave"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Ob vklopu te možnosti, bo aMule uporabil maskiranje pri povezavi z drugimi odjemalci in na strežnike."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Dovoli samo maskirane povezave"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "Ob vklopu te možnosti, bo aMule sprejemal samo maskirane povezave. Imeli boste manj virov, vendar bodo vse povezave maskirane."
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Vsi"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Nihče"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Kdo lahko vidi moje deljene datoteke:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr "Izberite, kdo lahko zahteva vaš seznam deljenih datotek."
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Filtriranje IP-jev"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtriraj odjemalce"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtriraj strežnike"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Znova naloži seznam"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Posodobi zdaj"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Samodejno posodobi filter IP-jev ob zagonu"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Stopnja filtriranja:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Vedno filtriraj IP-je krajevnega omrežja"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoično rokovanje z ne-ujemajočimi IP-ji"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Uporabi sistemsko ipfilter.dat, če je na voljo"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Če krajevne datoteke ipfilter.dat ni moč najti, omogoči uporabo sistemske datoteke."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Omogoči spletni podpis"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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 spletnega podpisa, katero lahko uporabljajo zunanji programi za izdelavo podpisov in podobnih stvari."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Pogostost posodobitev (sek.):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Spremeni pogostost (v sekundah) posodobitev spletnega podpisa."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Spletni podpis shrani v datoteko: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "Kliknite tukaj, da nastavite mapo, ki vsebuje datoteke za spletni podpis."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Prikaži zastave držav za odjemalce"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Podatkovna hitrost:"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Viri"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4281,11 +5501,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4295,234 +5515,230 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Prejemanje: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Samodejno posodobi filter IP-jev ob zagonu"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtriraj prejeta sporočila (razen v trenutnem pogovoru):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtriraj vsa sporočila"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtriraj sporočila vseh, ki niso na seznamu prijateljev"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtriraj sporočila neznanih uporabnikov"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtriraj sporočila, ki vsebujejo (uporabi »,« kot ločilnik):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "Sem dodajte besede, ki naj jih aMule filtrira, vključno s sporočili v katerih se nahajajo."
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Prejeta sporočila prikaži v dnevniku"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Komentarji"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtriraj komentarje, ki vsebujejo (uporabi »,« kot ločilnik):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Omogoči overjanje"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Omogoči/onemogoči overjanje z uporabniškim imenom/geslom"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Uporabniško ime: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Uporabniško ime za povezavo s posrednikom"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Geslo:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Geslo za povezavo s posrednikom"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Omogoči posrednika"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Omogoči/onemogoči podporo za posrednika"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Vrsta posrednika:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Gostitelj posrednika:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Vrsta posrednika"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Gostitelj posrednika"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Ime gostitelja posredniškega strežnika"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Vrata posrednika:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Vrata posrednika"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Vrata posredniškega strežnika"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Omogoči overjanje"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Omogoči/onemogoči overjanje z uporabniškim imenom/geslom"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Uporabniško ime za povezavo s posrednikom"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Geslo za povezavo s posrednikom"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Poveži se z:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Prijavi se pri oddaljenem aMule"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Uporabniško ime"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Zapomni si te nastavitve"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Zunanja povezava se je zaprla."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Uporabi stiskanje gzip"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Omogoči podrobno beleženje za razhroščevanje."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Samo v dnevniško datoteko"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Kategorije sporočil:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Čakanje …"
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Dodaj uvoze"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Ponovno poskusi izbrane"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Odstrani izbrane"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Vrste dogodkov"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Dejavna pošiljanja"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Odstotek vseh datotek"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Prikaži odjemalce za"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Vse datoteke"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Izbrane datoteke"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Samo dejavna pošiljanja"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Prikaži odjemalce za"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Znova naloži"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Ponovno naloži deljene datoteke"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Pošlje navedeno sporočilo."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Zapri to pogovorno sejo."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Poveži se s poljubnim strežnikom in/ali s Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Prekliči"
+
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Prekini povezave"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Deljene datoteke"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Poveži se"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Onemogočeno %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "bajtov"
@@ -4530,31 +5746,27 @@
 msgstr2 "bajta"
 msgstr3 "bajti"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "bajtov/sek."
@@ -4562,212 +5774,292 @@
 msgstr2 "bajta/sek."
 msgstr3 "bajti/sek."
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MiB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sek."
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "min."
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "ur"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "dni"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "vse"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "vse ostalo"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Nezaključeno"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Ustavljeno"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arhiv"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Besedilo"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Dejavno"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Uporaba mape z nastavitvami: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Ta ukaz ne sme imeti parametrov."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Ta ukaz ne sme imeti parametrov."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Ta ukaz ne sme imeti parametrov."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Ta ukaz ne sme imeti parametrov."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Sem vnesite vrata strežnika."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Sem vnesite vrata strežnika."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Sem vnesite vrata strežnika."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Čakanje na zamrtje niti za pretvarjanje delnih datotek …"
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Uvažanje %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Branje začasne mape"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Pridobivanje osnovnih podatkov iz datoteke o prejemanjuh"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Ustvarjanje ciljne datoteke"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, 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:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "Shranjevanje podatkovnega bloka v novo enojno datoteko prejemanja (%u od %u)"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Pridobivanje podatkov o izvorni datoteki prejemanja"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Dodajanje prejemanja in shranjevanje nove delne datoteke"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Uvozi delne datoteke"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Stanje"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Koda datoteke"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (disk: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "Prosimo, izberite mapo za iskanje začasnih prejemanj (vključene bodo tudi podmape)"
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Ali želite izbrisati izvorne datoteke uspešno uvoženih prejemanj?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Ali želite odstraniti vire?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "NAPAKA: delne datoteke ni bilo mogoče ustvariti"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Poskus nalaganja varnostne kopije datoteke met iz %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "NAPAKA: odpiranje datoteke part.met ni uspelo: %s → %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr "NAPAKA: datoteka part.met je velika 0: %s → %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "NAPAKA: neveljavna različica datoteke part.met: %s → %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Napaka: %s (%s) je pokvarjena (slabe oznake: %s), ni mogoče naložiti datoteke."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "NAPAKA: %s (%s) je pokvarjena (napačno število oznak), ni mogoče naložiti datoteke."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Poskus reševanja podatkov o datoteki …"
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Rešeni vsi podatki o datoteki, ki so na voljo :D – Poskus njihove uporabe …"
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Ni mogoče rešiti podatkov o datoteki :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Ni bilo mogoče odpreti %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "OPOZORILO: %s je morda pokvarjena (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "NAPAKA med shranjevanjem delne datoteke: %s (%s → %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Vhodno/izhodna napaka med shranjevanjem delne datoteke: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "Ni bilo mogoče shraniti datoteke part.met.seeds za %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
@@ -4776,17 +6068,17 @@
 msgstr2 "Shranjeni %i izvorni semeni za delno datoteko: %s (%s)"
 msgstr3 "Shranjena %i izvorna semena za delno datoteko: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Ni moč brati datoteke s semeni za delno datoteko %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
@@ -4795,27 +6087,27 @@
 msgstr2 "Najden pokvarjen del (%d) v %d delnih datotekah %s - - FileResultHash |%s| FileHash |%s|"
 msgstr3 "Najden pokvarjen del (%d) v %d delnih datotekah %s - - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Najden zaključen del (%i) v %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Zaključeno ponovno ustvarjanje kode za %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Nepričakovana napaka med zaključevanjem %s. Datoteka prekinjena."
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Zaključeno prejemanje: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4824,307 +6116,155 @@
 "Zaključeno prejemanje:\n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Brisanje datoteke: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "OPOZORILO: ni moč ustvariti kode za prejet del – nabor kod za »%s« ni popoln"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "NAPAKA: ni moč ustvariti kode za prejet del – nabor kod ni popoln (%s). To se nikoli ne bi smelo zgoditi."
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "Konec datoteke med ustvarjanjem kode prejetega dela %u z dolžino %u (maks. %u) delne datoteke »%s« z dolžino %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "OPOZORILO: na disku ni dovolj prostora. Datoteka prekinjena: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Prejet del %i v datoteki je pokvarjen: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Dodeljevanje"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Premalo prostora na disku"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Prejeto"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "NAPAKA: delne datoteke »%s« ni bilo moč odpreti"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Sistemsko privzet"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albansko"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabsko"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturijsko"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baskovsko"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bolgarsko"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalonsko"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Kitajsko (poenostavljeno)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Kitajsko (tradicionalno)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Hrvaško"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Češko"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Dansko"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Nizozemsko"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Angleško (Z.K.)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "Angleško (Z.K.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estonsko"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finsko"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Francosko"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galicijsko"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Nemško"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grško"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebrejsko"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Madžarsko"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italijansko"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italijansko (Švica)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japonsko"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Korejsko"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Litvansko"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norveško (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Poljsko"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugalsko"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugalsko (brazilsko)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Romunsko"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Rusko"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slovensko"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Špansko"
+msgid "Extended source exchange"
+msgstr "Izmenjava virov"
 
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Švedsko"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turško"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukrajinsko"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr ""
 
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Spremeni jezik"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Za aMule ni nameščenega nobenega prevoda"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Na voljo ni nobenega jezika"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "na voljo ni nobene možnosti"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "Najdena neveljavna kategorija, preskočena"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Najdena neveljavna kategorija, preskočena"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Uporabljena bodo privzeta vrata (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Povezava"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Mape"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Strežniki"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Datoteke"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Varnost"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Posrednik"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filtri"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Oddaljeno upravljanje"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Spletni podpis"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Dogodki"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Razhroščevanje"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5134,15 +6274,15 @@
 "    %PARTFILE – polna pot do datoteke\n"
 "    %PARTNAME – samo ime datoteke"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5158,26 +6298,43 @@
 "aMule bo deloval dobro tudi brez\n"
 "spreminjanja teh nastavitev."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Vrsta posrednika s katerim se hočete povezati"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Preverjanje gesla\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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/PrefsUnifiedDlg.cpp
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5185,31 +6342,45 @@
 "Potreben je ponoven zagon aMule za uveljavitev teh sprememb:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "• Vrata TCP so spremenjena.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "• Vrata UDP so spremenjena.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "• Vmesnik za zunanje povezave je spremenjen.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "• Vrata za zunanje povezave so spremenjena.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "• Sprejemljivost zunanjih povezav je spremenjena.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "• Vmesnik za zunanje povezave je spremenjen.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "• Podpora za maskiranje protokola je bila spremenjena.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "• Jezik je spremenjen.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5217,27 +6388,33 @@
 "Seznam za samodejno posodobitev strežnikov je prazen.\n"
 "Možnost »Ob zagonu samodejno posodobi seznam strežnikov« bo onemogočena."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
-"Omogočili ste zunanje povezave, vendar niste navedli gesla.\n"
-"Zunanje povezave ne morejo biti omogočene, dokler ne navedete veljavnega gesla."
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "• Jezik je spremenjen.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "• Mapa za začasne datoteke spremenjena.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "• Omrežje eD2k je omogočeno.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Neveljavna različica protokola."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5245,7 +6422,7 @@
 "Omrežji eD2k in Kad sta onemogočeni.\n"
 "Ne boste se mogli povezati, dokler ne omogočite vsaj enega izmed njih."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5253,7 +6430,7 @@
 "Kad se ne bo zagnal, če so vrata UDP onemogočena.\n"
 "Omogočite vrata UDP ali pa onemogočite Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5263,20 +6440,69 @@
 "aMule morate NUJNO ponovno zagnati.\n"
 "Če tega ne storite zdaj, se ne pritožujte, če se zgodi kaj slabega.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Samodejno osveževanje začeto"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Mapa za začasne datoteke prejemanj"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Geslo je bilo nastavljeno in zunanje povezave omogočene."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5286,41 +6512,68 @@
 "Vnesite vsaj en URL do veljavne datoteke server.met.\n"
 "Kliknite na gumb »Seznam«, zraven potrditvenega polja, za vnos URL-ja."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Začasne datoteke"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Prejete datoteke"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Spletni podpisi"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Izberite mapo za %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Najdenih %i znanih deljenih datotek"
+msgstr1 "Najdena %i znana deljena datoteka"
+msgstr2 "Najdeni %i znani deljeni datoteki"
+msgstr3 "Najdene %i znane deljene datoteke"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Prebrskajte za video predvajalnik"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Izberite brskalnik"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Izberite brskalnik"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Izvedljiva datoteka %s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Sistemsko privzet"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Uredi seznam strežnikov"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5328,42 +6581,42 @@
 "Sem dodajte URL-je do datotek server.met.\n"
 "Po en URL v vsako vrstico."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Popolnih virov"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Stanje:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Stanje:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
@@ -5372,7 +6625,7 @@
 msgstr2 "Osveži vsakih: %d sekundi"
 msgstr3 "Osveži vsakih: %d sekunde"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
@@ -5381,12 +6634,12 @@
 msgstr2 "Čas za graf trenutnega povprečja: %i minuti"
 msgstr3 "Čas za graf trenutnega povprečja: %i minute"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Merilo za graf povezav: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
@@ -5395,7 +6648,7 @@
 msgstr2 "Datotečni medpomnilnik: %d bajta"
 msgstr3 "Datotečni medpomnilnik: %d bajti"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
@@ -5404,7 +6657,7 @@
 msgstr2 "Velikost vrste za pošiljanje: %d odjemalca"
 msgstr3 "Velikost vrste za pošiljanje: %d odjemalci"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
@@ -5413,273 +6666,370 @@
 msgstr2 "Čas med osvežitvama povezave na strežnik: %d minuti"
 msgstr3 "Čas med osvežitvama povezave na strežnik: %d minute"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Čas med osvežitvama povezave na strežnik: onemogočeno"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "onemogočeno"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Izvrši ukaz ob dogodku »%s«"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Omogoči izvrševanje ukazov na jedru"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Ukaz jedra:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Omogoči izvrševanje ukazov v vmesniku"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Ukaz vmesnika:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Sledeče spremenljivke bodo nadomeščene:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Deljene mape"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Ponovno naloži deljene datoteke"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Deljene mape"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Ponovno naloži seznam deljenih datotek."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Deljene mape"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Izberite mapo za %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Zapomni si te nastavitve"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Opozorilo iskanja"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "Iskanje ni mogoče, ko sta tako eD2k kot tudi Kademlia onemogočena."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "Napaka iskanja"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Napredek iskanja: %u %% \n"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Opozorilo iskanja"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Glavna"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "OPOZORILO: seznam znanih datotek je pokvarjen, vsebuje neveljavno glavo."
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Neveljaven vnos na seznamu znanih datotek, datoteka je morda pokvarjena: "
+
+#: src/SearchList.cpp
 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:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "Brez ključne besede za iskanje – prekinjam"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Nepričakovana napaka med iskanjem Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID datoteke"
-
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Ni ocenjena"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Prejemaj v kategoriji"
+#: src/SearchList.cpp
+#, fuzzy, c-format
+msgid "Error %u: %s\n"
+msgstr "Napaka pri posodabljanju GeoIP.dat"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Dobi %s za to datoteko"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ID datoteke"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Zapri vse zavihke"
+
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Poišči sorodne datoteke (eD2k, krajevni strežnik)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Označi kot znano datoteko"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Skopiraj povezavo eD2k na odložišče"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Skopiraj povezave eD2k na odložišče"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Povezani ste na strežnik, ki ga poskušate izbrisati. Prosimo, najprej prekinite povezavo."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Preklicano"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Novo"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Teče"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finsko"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Napredek iskanja: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Napredek iskanja ni na voljo"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Ni bilo mogoče vzpostaviti maskirane povezave na strežnike na seznamu. Ponoven poskus brez maskiranja."
+
+#: src/ServerConnect.cpp
 msgid "Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."
 msgstr "Ni bilo mogoče vzpostaviti maskirane povezave na strežnike na seznamu. Ponoven poskus brez maskiranja."
 
-#: src/ServerConnect.cpp:79
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "Ni se bilo mogoče povezati na katerega koli izmed strežnikov na seznamu. Ponoven poskus."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 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
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Samodejen poskus povezovanja na strežnik se bo ponovil čez %d sekund"
+msgstr1 "Samodejen poskus povezovanja na strežnik se bo ponovil čez %d sekundo"
+msgstr2 "Samodejen poskus povezovanja na strežnik se bo ponovil čez %d sekundi"
+msgstr3 "Samodejen poskus povezovanja na strežnik se bo ponovil čez %d sekunde"
+
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Povezano na %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Povezava vzpostavljena z: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Izgubljena povezava z %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) je nedosegljiv."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, 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"
-msgstr0 "Samodejen poskus povezovanja na strežnik se bo ponovil čez %d sekund"
-msgstr1 "Samodejen poskus povezovanja na strežnik se bo ponovil čez %d sekundo"
-msgstr2 "Samodejen poskus povezovanja na strežnik se bo ponovil čez %d sekundi"
-msgstr3 "Samodejen poskus povezovanja na strežnik se bo ponovil čez %d sekunde"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Povezava izgubljena"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Povezovanje z %s (%s:%i) ni uspelo."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "NAPAKA: po poteku časa je bila vtičnica neveljavna"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, 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:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Prejel zapoznjen rezultat poizvedbe DNS, preziram"
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Nalaganje datoteke server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Ni bilo mogoče najti datoteke server.met."
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Ni bilo mogoče odpreti server.met."
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Datoteka server.met je pokvarjena, napačna oznaka različice: 0x%x, velikost %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
@@ -5688,7 +7038,7 @@
 msgstr2 "%i najdena strežnika v server.met"
 msgstr3 "%i najdeni strežniki v server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
@@ -5697,237 +7047,244 @@
 msgstr2 "%d strežnika dodana"
 msgstr3 "%d strežniki dodani"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Napaka: datoteka »server.met« je pokvarjena: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "Vhodno/izhodna napaka med branjem »server.met«: "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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«."
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Povezani ste na strežnik, ki ga poskušate izbrisati. Prosimo, najprej prekinite povezavo."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Ni bilo mogoče odpreti »%s«"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Ni bilo mogoče shraniti server.met."
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Vhodno/izhodna napaka med branjem »server.met«: "
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Neveljaven URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Prejemanje seznama strežnikov od %s zaključeno"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Začni s prejemanjem seznama strežnikov od %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, 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:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Ni bilo mogoče prejeti seznama strežnikov od %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 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."
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Opis"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Odziv"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Uporabniki"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Uporabniki"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Statičen"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Različica"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Datoteke"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Deljene datoteke"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Povezani ste na strežnik, ki ga poskušate izbrisati. Prosimo, najprej prekinite povezavo. Strežnik NI bil izbrisan."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(neznano ime)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "Ali res želite izbrisati statičen strežnik %s?"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "min."
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Strežniki (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Strežnik"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Poveži se na strežnik"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Označi strežnik kot statičen"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Označi strežnik kot ne-statičen"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Označi strežnike kot statične"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Označi strežnike kot ne-statične"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Odstrani strežnik"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Odstrani strežnike"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Odstrani vse strežnike"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Skopiraj povezave eD2k na odložišče"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Ponovno se poveži na strežnik"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Ali res želite izbrisati vse strežnike?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Ali res želite izbrisati izbrani strežnik?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Ali res želite izbrisati izbrane strežnike?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "NAPAKA: %s (%s) – %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "OPOZORILO: %s (%s) – %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Nov odjemalčev ID je %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "OPOZORILO: prejeli ste nizek ID."
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 #, fuzzy
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tZa več informacij se obrnite na https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Prejeti neznani podatki o strežniku – prekratko"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
@@ -5936,166 +7293,198 @@
 msgstr2 "Prejeta %d nova strežnika"
 msgstr3 "Prejeti %d novi strežniki"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Shranjevanje seznama strežnikov zaključeno."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Strežnik je zavrnil zadnji ukaz"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Nepravi paket prejet od strežnika: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Neobravnavana napaka med obdelavo paketa od strežnika: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "Strežnikov IP %s (%s) je filtriran.  Ni povezave."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "z maskiranim protokolom."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Povezovanje z %s (%s – %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "aMule dnevnik"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Strežnik ni bil dodan: IP ali ime gostitelja nista navedena."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Strežnik ni bil dodan: navedena so neveljavna vrata strežnika."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Stanje eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Stanje povezave:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "Povezano"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Stanje Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Teče v načinu krajevnega omrežja"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Teče"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "Določilnik odjemalca Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Stanje:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Stanje povezave:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, 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:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Stanje povezave UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 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:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Stanje za požarnim zidom: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Potreben ni noben kolega – vrata TCP odprta"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Potreben ni noben kolega – vrata UDP odprta"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Brez kolegov"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Povezovanje s kolegom"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Povezano s kolegom na %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Naslov IP:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Indeksirani viri:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Indeksirane ključne besede:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Indeksirane opombe:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Indeksirana obremenitev:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Povprečno uporabnikov:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Povprečno datotek:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Ne teče"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Dodajanje datoteke %s med deljene"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
@@ -6104,440 +7493,594 @@
 msgstr2 "Najdeni %i znani deljeni datoteki"
 msgstr3 "Najdene %i znane deljene datoteke"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Najdenih %i znanih deljenih datotek, %i neznanih"
-msgstr1 "Najdena %i znana deljena datoteka, %i neznanih"
-msgstr2 "Najdeni %i znani deljeni datoteki, %i neznanih"
-msgstr3 "Najdene %i znane deljene datoteke, %i neznanih"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "NAPAKA: poskus delitve %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Deljene mape ni bilo moč najti, preskakujem: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Deljene mape ni bilo moč najti, preskakujem: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "V mapi ni bilo moč najti datotek za deliti: %s"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Uporabniško ime"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Napaka med shranjevanjem datoteke %s: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Hitrost prejemanja"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Nalaganje datoteke server.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Hitrost pošiljanja"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "V mapi ni bilo moč najti datotek za deliti: %s"
+msgstr1 "V mapi ni bilo moč najti datotek za deliti: %s"
+msgstr2 "V mapi ni bilo moč najti datotek za deliti: %s"
+msgstr3 "V mapi ni bilo moč najti datotek za deliti: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "V mapi ni bilo moč najti datotek za deliti: %s"
+msgstr1 "V mapi ni bilo moč najti datotek za deliti: %s"
+msgstr2 "V mapi ni bilo moč najti datotek za deliti: %s"
+msgstr3 "V mapi ni bilo moč najti datotek za deliti: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Najdenih %i znanih deljenih datotek"
+msgstr1 "Najdena %i znana deljena datoteka"
+msgstr2 "Najdeni %i znani deljeni datoteki"
+msgstr3 "Najdene %i znane deljene datoteke"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Uporabniško ime"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Razpoložljivi deli"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Stanje pošiljanja"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Krajevno ime datoteke"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Deli seznam datotek"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Zahteve"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Sprejete zahteve"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Prenesenih podatkov"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Delilno razmerje"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Dobljeni deli"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Popolni viri"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Razpoložljivost"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Pot mape"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Deljene datoteke"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Dodaj komentar/oceno"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Uredi komentar/oceno"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Dodaj datoteke iz zbirke na seznam prenosov"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Skopiraj magnet &URI na odložišče"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Skopiraj povezavo eD2k na odložišče (&vir)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 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:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Skopiraj povezavo eD2k na odložišče (&gostitelj)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Skopiraj povezavo eD2k na odložišče (gostitelj) (s &šifrirnimi možnostmi)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Skopiraj povezavo eD2k na odložišče (&podatki NIRP)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Skopiraj povezavo eD2k na odložišče (&podatki NIRP + vir)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Potrebujete visok ID, da ustvarite povezavo z virom"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Napaka pri zaključevanju"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Ni bilo mogoče dobiti deljenih datotek od uporabnika »%s«"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Ponovno naloži deljene datoteke"
+msgstr1 "Ponovno naloži deljene datoteke"
+msgstr2 "Ponovno naloži deljene datoteke"
+msgstr3 "Ponovno naloži deljene datoteke"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Skupna velikost deljenih datotek: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Skupna velikost deljenih datotek: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Deljene datoteke (%i)"
+msgstr1 "Deljene datoteke (%i)"
+msgstr2 "Deljene datoteke (%i)"
+msgstr3 "Deljene datoteke (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Deljene datoteke (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Delna datoteka"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Ponovno naloži seznam deljenih datotek."
+
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Stanje"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Oddaljeno ime datoteke"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "PZDD"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Poslani podatki (seja (skupno)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Skupni presežek (paketov): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Presežek zahtev datotek (paketov): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Presežek izmenjav virov (paketov): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Presežek strežnikov (paketov): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Presežek Kad (paketov): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Presežek šifriranja (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Dejavna pošiljanja: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Čakajoča pošiljanja: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Skupno št. uspelih sej pošiljanj: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Skupno št. neuspelih sej pošiljanj: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Povprečen čas pošiljanja: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Prejeti podatki (seja (skupno)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Najdeni viri: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Dejavna prejemanja (deli): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Razmerje poslano/prejeto te seje (skupno): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Povprečna hitrost prejemanja (seja): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Povprečna hitrost pošiljanja (seja): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Največja hitrost prejemanja (seja): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Največja hitrost pošiljanja (seja): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Ponovne povezave: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Čas od prvega prenosa: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Na strežnik povezano od: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Dejavnih povezav (ocena): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Dosežnih največ možnih povezav: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Povprečno povezav (ocena): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Največ povezav (ocena): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Odjemalci"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Neznani: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtrirani: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Izločeni: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Skupno: %i Znani: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Delujoči strežniki: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Nedelujoči strežniki: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Skupno: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Izbrisani strežniki: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Filtrirani strežniki: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Uporabniki na delujočih strežnikih: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Datoteke na delujočih strežnikih: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Skupno uporabnikov: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Skupno datotek: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Zasedenost strežnikov: %.2f %%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Število deljenih datotek: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Skupna velikost deljenih datotek: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Povprečna velikost datoteke: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Operacijski sistem"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Ni prejeto"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Dejavne povezave (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Ni na voljo"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Nikoli"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Izvrši <str> in končaj."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Obdelovanje po kodi: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Obdelovanje po imenu datoteke: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Ni veljavno število\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6548,7 +8091,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6559,7 +8102,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6567,76 +8110,80 @@
 "Vrsta iskanja ni bila navedena.\n"
 "Napišite »help search« za dodatno pomoč.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Prejmi datoteko: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Zahteva spodletela z neznano napako."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operacija je bila uspešna."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Zahteva ni uspela zaradi napake: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Filtriranje IP za odjemalce je %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "IZKLOPLJENO"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "VKLOPLJENO"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Filtriranje IP za strežnike je %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Trenutna stopnja IP filtriranja je %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-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 "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Povezano na %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Povezovanje"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "za požarnim zidom"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "v redu"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6645,7 +8192,7 @@
 "\n"
 "Prejemanje:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6654,7 +8201,7 @@
 "\n"
 "Pošiljanje:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6663,7 +8210,7 @@
 "\n"
 "Odjemalci v vrsti:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6672,38 +8219,33 @@
 "\n"
 "Skupno virov:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Delna datoteka"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Število rezultatov iskanja: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Napredek iskanja: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Napredek iskanja ni na voljo"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Prejet neznan odgovor od strežnika, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Prikaži kratke podatke o stanju."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Prikaži stanje povezave, trenutne hitrosti prenosov, itd.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Prikaži celotno statistično drevo."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6717,11 +8259,11 @@
 "\n"
 "Primer: »statistics 5« bo prikazalo 5 najpogostejših različic vsakega tipa odjemalca.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Zaustavi aMule"
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6730,35 +8272,35 @@
 "Zaustavi oddaljeno tekoče jedro (amule/amuled).\n"
 "To bo zaustavilo tudi besedilnega odjemalca, ker brez tekočega jedra ni uporaben.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Ponovno naloži naveden objekt."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Ponovno naloži seznam deljenih datotek."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Ponovno naloži seznam za filtriranje IP-jev."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Ponovno naloži trenutni seznam za filtriranje current IP-jev."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Posodobi seznam za filtriranje IP-jev iz URL-ja."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 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:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Poveži se z omrežjem."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6770,35 +8312,35 @@
 "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:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Poveži se samo z eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Poveži se samo s Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Prekini povezavo z omrežjem."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "To bo prekinilo povezavo z vsemi omrežji, v katera ste povezani.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Prekini samo povezavo z eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Prekini samo povezavo s Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Dodaj povezavo magnet ali povezavo ed2k v jedro."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6815,109 +8357,123 @@
 "\n"
 "Povezava magnet mora vsebovati kodo eD2k in dolžino datoteke.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Nastavi vrednost nastavitve."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Nastavi filtriranje IP-jev."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Vključi filtriranje IP-jev za odjemalce in strežnike."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Izključi filtriranje IP-jev za odjemalce in strežnike."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Omogoči/onemogoči filtriranje IP-jev za odjemalce."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Vključi filtriranje IP-jev za odjemalce."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Izključi filtriranje IP-jev za odjemalce."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Omogoči/onemogoči filtriranje IP-jev za strežnike."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Vključi filtriranje IP-jev za strežnike."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Izključi filtriranje IP-jev za strežnike."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Izberite stopnjo filtriranja IP-jev."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 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:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Nastavi omejitve povezave."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Nastavi omejitev pošiljanja."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Podana vrednost mora biti v kilobajtih/sek.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Nastavi omejitev prejemanja."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Omogoči/onemogoči overjanje z uporabniškim imenom/geslom"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Podana vrednost mora biti v kilobajtih/sek.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Dobi in prikaži vrednost nastavitve."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Dobi nastavitve filtriranja IP-jev."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Dobi stanje filtriranja IP-jev za odjemalce in strežnike."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Dobi stanje filtriranja IP-jev samo za odjemalce."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Dobi stanje filtriranja IP-jev samo za strežnike."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Dobi stopnjo filtriranja IP-jev."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Dobi omejitve prenosov."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Izvrši iskanje."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6936,39 +8492,44 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Izvrši globalno iskanje."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Izvrši krajevno iskanje."
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Izvrši iskanje kad."
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Show the results of a search."
 msgstr "Prikaže rezultate zadnjega iskanja."
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Vrne rezultate prejšnjega iskanja.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Prikaže napredek iskanja."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Prikaže napredek iskanja.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Začni prejemati datoteko"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6976,80 +8537,80 @@
 "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:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Prekini prejemanje."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Nadaljuj prejemanje."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Prekliči prejemanje."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Nastavi prednost prejemanja."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr "Nastavi prednost prejemanja na nizko, običajno, visoko ali samodejno.\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Nastavi prednost na nizko."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Nastavi prednost na običajno."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Nastavi prednost na visoko."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Nastavi prednost na samodejno."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Prikaži čakalne vrste/sezname."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Prikaži čakalno vrsto pošiljanj."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Prikaži čakalno vrsto prejemanj."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Prikaži dnevnik."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Prikaži seznam strežnikov."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "Prikaži seznam deljenih datotek."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Ponastavi dnevnik."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Opuščen ukaz, namesto njega uporabite »%s«."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7058,255 +8619,278 @@
 "Ta ukaz je opuščen in bo morda v prihodnosti odstranjen.\n"
 "Namesto njega uporabite »%s«.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule besedilni odjemalec"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Brisanje datoteke: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Brisanje datoteke: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Nadaljevanje ppošiljanja za datoteko: %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "Pretvarjanje starih naborov kod NIRP v »%s« v 64b v »%s«."
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Potrebna je potrditev"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Podprtih je največ 99 kategorij."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Preveč kategorij."
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Vse drugo"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Izberite filter prikaza"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Dodaj kategorijo"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Uredi kategorijo"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Odstrani kategorijo"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Zahtevan je bil nabor kod za neznano datoteko: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Izberite, kdo lahko zahteva vaš seznam deljenih datotek."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Nadaljevanje ppošiljanja za datoteko: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Ustavljanje pošiljanja za datoteko: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr "Ni bilo mogoče izvesti ukaza »%s« za dogodek »%s«."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Prejemanje zaključeno"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Polna pot datoteke."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Ime datoteke brez poti."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "Koda eD2k datoteke."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Velikost datoteke v bajtih."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Skupni čas dejavnega prejemanja."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Začeta je bila nova seja klepeta."
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Pošiljatelj sporočila."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Zmanjkalo je prostora"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Razdelek diska."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Napaka pri zaključevanju"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Obdelovanje datoteke številka %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "Zahtevali ste kode delov (uporabljeno samo za datoteke > 9,5 MiB)"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s → Datoteka ne obstaja.\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, ustvarjalnik povezav eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Dobrodošli!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Vhodni parametri"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Ustvari kodo za datoteko"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Dodaj URL-je za to datoteko (neobvezno)"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Odstrani"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Ustvari povezavo s kodami delov"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Koda MD4 datoteke"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "Koda eD2k datoteke"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "Povezava eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Shrani"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Skopiraj na odložišče"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Odpri"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Odpre datoteko za ustvaritev povezave eD2k zanjo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Skopira ustvarjeno povezavo eD2k na odložišče"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Shrani kot"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Shrani ustvarjeno povezavo eD2k v datoteko"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "O aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Odložišča ni moč odpreti"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Zaenkrat ni ničesar za skopirati."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Izberite datoteko za ustvaritev povezave eD2k"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Ni mogoče odpreti "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Prosimo, vnesite neprazno ime datoteke"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Zaenkrat ni ničesar za shraniti."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7326,162 +8910,159 @@
 "\n"
 "Razširja se pod pogoji licence GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Ustvarjanje kode …"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator dela za vas"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Izračunavanje kode MD4 …"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Izračunavanje kode eD2k …"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Preklicano."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Zaključeno v %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Ta URL ste že dodali."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Prosimo, vnesite neprazen URL"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Ni mogoče odpreti %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "Med izračunavanjem kode eD2k je zmanjkalo pomnilnika."
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KiB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MiB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GiB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TiB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, spletna statistika aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Najhitrejše prejemanje odkar teče wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Ponastavi"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistem"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Ustavi samodejno osveževanje"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Shrani sliko spletne statistike"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Natisni sliko spletne statistike"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Nastavitve"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "O wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Zaženi samodejno osveževanje"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Samodejno osveževanje ustavljeno"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Samodejno osveževanje začeto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Shrani statistično sliko"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Spletna statistika aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7489,11 +9070,11 @@
 "Pri tiskanju se je pojavila težava.\n"
 "Morda privzeti tiskalnik ni pravilno nastavljen?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Tiskanje"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7511,402 +9092,565 @@
 "\n"
 "Na voljo pod licenco GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "aMule ne teče."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule teče."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule teče, vendar ni povezave."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule se povezuje …"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Stanje aMule je neznano."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " teče že "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " je ustavljen."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " ni povezan."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " se povezuje …"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " dela nekaj nenavadnega, preverite."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " je povezan z "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "ugasnjen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " je povezan "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " z "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Skupno prejetega: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", poslanega: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "To sejo prejetega: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Prejemanje: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Pošiljanje: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Deljenih: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " datotek, Odjemalcev v vrsti: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Čas: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " na "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Povprečna obremenitev sistema (1-5-15 min.):"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Neprekinjeno delovanje: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Mapa, ki vsebuje datoteko amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Interval med osvežitvami v sekundah"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Ustvari statistično sliko ob vsaki osvežitvi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Periodično pošiljaj sliko s statistiko na strežnik FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "URL FTP-ja"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Pot na FTP-ju"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Sem vnesite URL vašega strežnika FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Uporabnik"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Interval med osvežitvami FTP-ja v minutah"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Preveri veljavnost"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Mapa, ki vsebuje vašo datoteko s podpisom"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Mapa, v katerem je ustvarjena statistična slika"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Naloži predlogo <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Vrata HTTP spletnega strežnika"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Uporabi posredovanje vrat UPnP za vrata spletnega strežnika"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Vrata UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Uporabi stiskanje gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Geslo za polni dostop do spletnega strežnika"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Geslo za goste na spletnem strežniku"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Dovoli dostop gostom"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Zavrni dostop gostom"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 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:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "Pot do nastavitvene datoteke. NE UPORABITE NEPOSREDNO."
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Onemogoči tolmača PHP-ja (opuščeno)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Ponovno prevedi strani PHP ob vsaki zahtevi"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Spletni strežnik aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "povezava spletnega odjemalca sprejeta\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "NAPAKA: ni moč sprejeti povezave spletnega odjemalca\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, 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:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Indeksne datoteke ni mogoče najti: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Seja potekla – zahtevek za prijavo\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Seja v redu, prijavljen\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Seja v redu, ni prijave\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Ni odprte seje – zahtevek za prijavo\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Seja ustvarjena – zahtevek za prijavo\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Obdelovanje zahteve izvorno: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Geslo ni nastavljeno, prijava ne bo dovoljena."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Preverjanje gesla\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Koda gesla ni veljavna\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Geslo v redu\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Napačno geslo\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Zahtevana odjava\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Obdelovanje zahteve preusmerjeno: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Povezovanje ni uspelo "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Poslano"
+#~ msgid "Ratio"
+#~ msgstr "Ocena"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "V mapi ni bilo moč najti datotek za deliti: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Spremeni jezik"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Za aMule ni nameščenega nobenega prevoda"
+
+#~ msgid "No languages available"
+#~ msgstr "Na voljo ni nobenega jezika"
+
+#~ msgid "User name"
+#~ msgstr "Uporabniško ime"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Dobljeni deli"
+
+#~ msgid "Available Parts"
+#~ msgstr "Razpoložljivi deli"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Najdenih %i znanih deljenih datotek, %i neznanih"
+#~ msgstr1 "Najdena %i znana deljena datoteka, %i neznanih"
+#~ msgstr2 "Najdeni %i znani deljeni datoteki, %i neznanih"
+#~ msgstr3 "Najdene %i znane deljene datoteke, %i neznanih"
+
+#~ msgid " MB/s"
+#~ msgstr " MiB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MiB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%d.%m.%y %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Oddaljni strežnik"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Krajevni strežnik"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Datoteke ni mogoče najti."
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Neveljaven vnos na seznamu znanih datotek, datoteka je morda pokvarjena: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Shranjevanje delne datoteke %u od %u"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Da preprečite to opozorilo ob vsakem ogledu,\n"
+#~ "nastavite svoj priljubljen predvajalnik video posnetkov (privzet je %s)"
+
+#~ msgid "Filter Results"
+#~ msgstr "Filtriraj rezultate"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Označi kot znano datoteko"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Odstotek vseh datotek"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Začetno nalaganje"
+
+#~ msgid "New node"
+#~ msgstr "Novo vozlišče"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Več"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Naloži od znanih \n"
+#~ "odjemalcev"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Poveži se s poljubnim strežnikom in/ali s Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Prekini povezavo s Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Ustavi trenutne poskuse povezovanja"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Prekini povezavo s trenutno povezanimi omrežji"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Poveži se s trenutno omogočenimi omrežji"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Samodejno razvrščaj datoteke"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule bo samodejno razvrstil datoteke na vašem seznamu pprejemanj, kar potrebuje precej procesorske moči."
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Zavrne paket, če se odjemalčev IP razlikuje od IP-ja kjer paket izvira. Bodite pazljivi pri uporabi te možnosti."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Vrne rezultate prejšnjega iskanja.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Prikaže napredek iskanja.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Povezava prekinjena – aMule se je najverjetneje končal."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Ob zagonu preveri za novo različico"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "Povezava eD2k: "
+
+#~ msgid "Commit"
+#~ msgstr "Pridobi"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: cepljenje v ozadje – se vidimo"
+
+#, fuzzy
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Spletna stran: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Spletna stran: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Poslano"

amule-3.0.1.tar.gz/po/sq.po -> amule-3.1.0.tar.gz/po/sq.po Changed

@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:18+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:05+0000\n"
 "Last-Translator: Fation <dj_barthezz@linuxmail.org lushnja_corps@hotmail.Language-Team:\n"
 "Language: sq\n"
 "MIME-Version: 1.0\n"
@@ -20,70 +20,156 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Trego aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Kontrolli remote i aMule "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Snapshot:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (C) 2003-2026 aMule Team \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+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/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Kerko per versione te reja sapo te filloje"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "Duke u lidhur me Kad..."
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Ju po perdorni nje version te vjeter te aMule!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Nuk eshte ne dispozicion"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Shto nje shoke"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 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
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Informacion"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Userhash-i i specifikuar nuk eshte i vlefshem!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "Lidhja deshtoi "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -92,143 +178,272 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Deshtoi ne hapjen %s (%s)"
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Indeksi i failit nuk u gjet:  "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Deshtoi te rimarri failet e ndara nga perdoruesi '%s'"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
 msgstr0 ""
 msgstr1 ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:179
-#, fuzzy
-msgid "Failed to open ED2KLinks file."
-msgstr "Deshtoi ne hapjen %s (%s)"
-
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "Ne rregull, duke dalur %s...\n"
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "E Deshtuar"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "Shkarkimi Perfundoi"
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Vendndodhja juaj eshte ndryshuar tek System Default i pershtatur per nje nderrim konfigurimi. Me vjen keq."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Informacion"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Konfirmimi i daljes"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "U pranua nje lidhje e jashtme e re"
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "KUJDES"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i u gjet server ne server.met"
+msgid "Loading temp files"
+msgstr "Duke ngarkuar failin e server.met: %s"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Duke ngarkuar failin e server.met: %s"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Ringarko failet e ndara"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Ringarko failet e ndara"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Fillo"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Rrjetet"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Rrjetet"
+msgid "eD2k server list (server.met)"
+msgstr "%i u gjet server ne server.met"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "aMule eshte duke punuar"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nuk mund te lidh portat tek adresa e dhene: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Porta %u nuk eshte me vlere. Ju do te keni ID te ulet\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -243,48 +458,48 @@
 "\n"
 "KOntrolloni rrjetin tuaj per tu siguruar qe porta eshte hapur per hyrje dhe dalje."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Deshtoi te krijoje failin per Firmen Online"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Deshtoi te krijoje failin per Firmen Online te aMule-s"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Kjo eshte hera e pare qe ju po persorni aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Ky eshte nje version per testim,i azhornuar per dite, dhe\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "tek amule-org.github.io ose ne kanalin tone IRC #amule tek irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Raportoni cdo gabim tek https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -292,1585 +507,1896 @@
 "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/amule.cpp:1359
+#: src/amule.cpp
 #, fuzzy
 msgid "Server hostname notified"
 msgstr "Emri i Serverit:"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "GABIM: nuk mund te hapet logfile"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "KUJDES: faili i log-ve eshte bosh. Dicka nuk shkon."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Faili i Log eshte risetuar"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Mesazhe nga Serveri: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Deshtoi ne shkarkimin e listave nod."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Deshtoi te hapi failin per kontrollin e versionit qe sapo shkarkuat"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Fili per kontrollin e versionit eshte i demtuar"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Ju po perdorni nje version te vjeter te aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Versioni i fundit mund te gjendet gjithmone tek https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Kopja juaj e aMule eshte azhornuar."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Deshtoi ne shkarkimin e failit per kontrollin e versionit"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "me ID te ulet"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "me ID te larte"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "I lidhur tek %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Duke u lidhur tek %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad filloi."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad u ndalua."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "I lidhur ne Kad (Ne rregull)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "I lidhur ne Kad (Me firewall)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "I shkeputur nga Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Rrjeti Kad eshte c'aktivizuar tek Preferencat,nuk eshte duke u lidhur."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 #, 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/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "GABIM: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Kjo eshte aMule %s dhe bazohet ne eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Duke punuar ne %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Vizitoni https://github.com/amule-org/amule/releases/latest per te kontrolluar nqs eshte ne dispozicion nje version i ri."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Kontrolli remote i aMule "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Rrjetet"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Kerkimet"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr ""
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Shkarkime"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
 msgstr ""
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "\tPer me shume informacion ju lutem vizitoni https://amule-org.github.io/docs"
-
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Raportoni cdo gabim tek https://github.com/amule-org/amule/issues"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Kliente"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (C) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Mesazhe"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr ""
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistikat"
 
-#: src/amuleDlg.cpp:552
-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 src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Preferencat"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr ""
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Mesazhe nga Serveri: %s"
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Mesazh"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Nuk eshte ne dispozicion"
+
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Versioni i fundit mund te gjendet gjithmone tek https://github.com/amule-org/amule/releases/latest"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Duke u lòidhur"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Me Firewall"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: I lidhur"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Po lidhet"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Fikur"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Fshij"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Ndalo tentativat e lidhjes qe po behen"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Versioni"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Shkeputu"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Shkeputu nga rrjetet e lidhura"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Lidhu"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adresa"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Lidhu tek rrjetet"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Pershkrimi"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "Log i aMule"
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Larte: %.1f(%.1f) | Poshte: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Larte: %.1f | Poshte: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | e lidhur)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | e shkeputur)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Vertet deshironi qe te dilni nga aMule?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Konfirmimi i daljes"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Direktoria e skin '%s' nuk ekziston"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Rrjetet"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Dritaret e rrjeteve"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Kerkimet"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Dritaret e kerkimeve"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Shkarkime"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "Duke shkarkuar"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Dritarja e faileve te ndara"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Mesazhe"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Dritaret e rrjeteve"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Dritarja e mesazheve"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistikat"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Dritarja e grafikut te statistikave"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Preferencat"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Dritarja e rregullimeve te preferencave"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importimi"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Veglat per importimin e pjeseve te faileve"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Rreth"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Rreth/Ndihme"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Rrjeti Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Nuk ka rrjet"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Gabim Fatal: Deshtoi te krijoje Timerin"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Lidhu me Remote te amule"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "LIdhja humbi"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Pyet kur del"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Gabim Fatal: Deshtoi te krijoje Timerin"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Going to event loop..."
 msgstr "Tentative per rekuperimin e informacionit te failit..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 #, fuzzy
 msgid "Connecting..."
 msgstr "Duke u lòidhur"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr ""
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Lidhja tek %s (%s:%i) nuk u vendos per time-out."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "Lidhu me rrjetin."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Te gjithe"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Nuk eshte aktive"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Faili nuk u gjete."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Link i pavlere ose qe eshte ne liste."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Jeni duke u perpjekur te shkarkoni edhe njehere tjeter kete fail %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "E panjohur"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Deshtoi te rimarri failet e ndara nga perdoruesi '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (eMule e falsifikuar versioni %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (eMule e falsifikuar)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (eMule e falsifikuar)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (e bazuar ne eMule v0 %u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Emri: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Kerkuar: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Statistikat e failit per kete sesion: U pranua %d nga %d kerkesa, %s te transferuara\n"
 msgstr1 "Statistikat e failit per kete sesion: U pranuan %d nga %d kerkesat, %s te transferuara\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Statistikat e failit per te gjitha sesionet: U pranua %d nga %d kerkesa, %s te transferuar\n"
 msgstr1 "Statistikat e faileve per te gjitha sesionet: U pranua %d nga %d kerkesat, %s te transferuara\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Po kerkoni nje faili te panjohur"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Filtrim mesazhi nga '%s' (IP: %s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Mesazh i ri nga '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, 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/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Deshtoi te rimarri failet e ndara nga perdoruesi '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "Kujdes: known.met nuk mund te hapet."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 #, 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/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Gabim IO duke lexuar failin known.met: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Gabim duke shpetuar failin known.met: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategori"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Kategori e re"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Zgjidh nje kartele per failet ne hyrje"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Ju duhet te specifikoni nje emer per kategorine!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Ju duhet te specifikoni nje rruge per kategorine!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Sesioni i chatit filloi: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** I lidhur me klientin ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** DUke u lidhur me klientin ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Deshtoi te lidhet me klientin / Lidhja humbi ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Mbyll tabelen"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Mbylli te gjitha tabelat"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Mbyll tabelat e tjera"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Shto tek shoket"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Trego &Detaje"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Hiqe nga shoket"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Vendos slotin per shoket"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Shiko failet"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Dergo mesazh"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Dergo nje mesash perdoruesit"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Mesazhi qe do te dergohet:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\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/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Perzgjedhje e shumte"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Hiqe nga shoket"
+msgstr1 "Hiqe nga shoket"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Ringarko listen e faileve te ndara."
+msgstr1 "Ringarko listen e faileve te ndara."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Faili i kreditit u ngarkua, %u klienti eshte njohur"
 msgstr1 "Faili i kreditit u ngarkua, %u klientet u njohen"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - Kreditet mbaruan per %u klientin!"
 msgstr1 " - Kreditet mbaruan per %u klientet!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "NUk u gjet faili cryptkey.dat,duke e krijuar."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Detajet e klientit"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "ID i ulet"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "ID i larte"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr ""
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "I lidhur"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "I shkeputur"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Emri"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "Adresa IP"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Marrja e fundit"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Versioni"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Shpejtesia-Ngarkimit"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "Shpejtesia-Shkarkimit"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Shkarkimi Total: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Shkarkimi Total: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Modifikuesi DL/UP"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Firma online"
 
-#: src/ClientRef.cpp:196
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Nuk eshte e kompletuar"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Djale i keq"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "E verifikuar - Ne rregull"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Nuk eshte aktive"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Failet"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Duke shkarkuar"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Ngarkim"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Aktive"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "E panjohur"
+
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Perdoruesi %s (%u) ndan kartelen %s"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, 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/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, 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:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Perdoruesi %s (%u) dergoi listen e faileve te ndara te padeshiruara"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, 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/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Komentet e faileve"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Emri i perdorimit"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Emri i failit"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Vleresimi"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Komenti"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+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/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Nuk ka komente"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u koment"
 msgstr1 "%u komente"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Deshtoi te shkarkoje listen e serverave nga %s"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Automatike Ulet"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Automatike Normale"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Automatike Larte"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Shume ngadale"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Ngadale"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normale"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "E larte"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Shume e larte"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Leshim"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Duke pyetur"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Lidhje nepermjet serverit"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Radha ne pritje eshte plote"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Ne radhe"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Duke shkarkuar"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Hashsete te ardhura"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Pjese qe nuk nevojiten"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Nuk mund te lidh nje ID te ulet me nje ID te ulet"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Shume lidhje"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Lidhje nepermjet Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Shume lidhje Kad"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Te larguar"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Gabim ne lidhje"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Radha e plote"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "MLDonkey i vjeter"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "MLDonkey i ri"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Pershtatet me eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Server Lokal"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Server i larget"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Shkembim burimesh"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Pasiv"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Link"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Burime te shpetuara"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Te kompletuara"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Ne vazhdim"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "Jashte nga hapesira"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Ne radhe"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Jam duke e shkarkuar"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Formati i failit temp i panjohur ose i gabuar."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Madhesia"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Te transferuara"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Shpejtesia"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Avancimi"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Burime"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Perparesia"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Gjendja"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Koha e mbetur"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Hera e fundit qe u pa e kompletuar"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Marrja e fundit"
 
-#: 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/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/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Automatike"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Fshij"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Ndal"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pushim"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Rimerr"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "&Pastro te kompletuarit"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Sposto cdo A4AF ne kete fail tani"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Sposto cdo A4F4 ne kete fail (Automatikisht)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Sposto cdo A4F4 ne cdo fail tjeter tani"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Opsione te Avancuara"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Parashikim"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Trego &detajet e faileve"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Trego te gjithe komentet"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Kopjo magnetin URI ne shenimet"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Kopjo feedback ne shenimet"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Shtoni URLs opsionale per kete fail"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "hiq"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Vendos tek kategoria"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Hap failin"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Jeni te sigurte qe deshironi te fshini failin e zgjedhur?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Jeni te sigurte qe deshironi te fshini failet e zgjedhura?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Futni nje emer te ti per kete fail:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Riemertim i failit"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Shkarkimet (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Parashikimi i failit"
+msgid "Downloads (%i)"
+msgstr "Shkarkimet (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "GABIM: Deshtoi te luaj media-player te jashtem! Komanda: `%s'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Totali i shkarkimit: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, fuzzy, c-format
 msgid "Loading temp files from %s."
 msgstr "Duke ngarkuar failin e server.met: %s"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, 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/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Nuk u gjenden part-files"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "U gjend %u part file"
 msgstr1 "U gjenden %u part files"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Duke shkarkuar %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, 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:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Ju e keni kete fail '%s'"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Ju e keni kete fail '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, 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"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Protokoll i panjohur i linut: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client sent packet after authentication failed."
 msgstr "Autentifikimi deshtoi."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Lidhja e jashtme u mbyll."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "LIdhjet e jashtme u c'aktivizuan sepse fjalekalimi ishte bosh|"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Lidhjet e jashtme u c'aktivizuan ne failin e konfigurimeve"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "U pranua nje lidhje e jashtme e re"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 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:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Duke lidhur klientin: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Version i panjohur"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "ID-ja i versionit EC jo korrekt,duhet te kete mospershtatje binaresh. Perdor Core dhe Remote nga i njejti Snapshot."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "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:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Version protokoli jo i rregullt."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Munfon tag-u i versionit te protokolit."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Rilidhje automatike tek serveri do te behet ne %d sekonde"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: wrong password."
 msgstr "Autentifikimi deshtoi."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: missing password."
 msgstr "Autentifikimi deshtoi."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Invalid request, please authenticate first."
 msgstr "Kerkese jo e rregullt, fillimisht duhet te identifikoheni."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Hyrja lejohet."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Filtron mesazhet nga klienta t èanjohur"
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Tentative per hyrje e paautorizuar. Lidhja u mbyll."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Nuk u gjet FileHash: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! Gabim ne procesimin e OpCode|"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Serveri nuk u shtua"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "Serveri nuk u gjend: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "nevojitet percaktimi i serverit qe do te levizet"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Faili nuk u gjete."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Faili nuk u gjete."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Kerkimi vazhdon. Rezultate ne ardhje!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Kerkimi WebSearch nga Remote eshte i kote."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Kerkimi vazhdon. Rezultate ne ardhje!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "NUk ka pika per grafike."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Klienti juaj nuk eshte i konfiguruar per kete nivel detaji."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Jam duke dalur."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Lidhje e jashtme: Duke shtuar linkun '%s'."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Link i pavlere ose qe eshte ne liste."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Faili nuk u gjete."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Emri i failit i pavlere."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "E pamundur te riemeroje failin."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Mbylle kete sesion chati."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Sesion i ri chati filloi"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Mbylle kete sesion chati."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad-i eshte c'aktivizuar tek Preferencat."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(Emer i panjohur)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad-i eshte c'aktivizuar tek Preferencat."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Jam i lidhur ne Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Duke u lidhur me Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Te gjithe rrjetet jane c'aktivizuar."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "I shkeputur nga Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "OpCode e pavlere (version protokoli i gabuar?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Shtim i panjohur '%s' per komanden '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "KOmande e panjohur '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1878,7 +2404,7 @@
 "\n"
 "Kjo komande nuk mund te kete nje argument.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1886,7 +2412,7 @@
 "\n"
 "Kjo komande duhet te kete nje argument.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1894,7 +2420,7 @@
 "\n"
 "Kjo komande nuk eshte komplete, ju duhet te perdorni nje nga shtimet me poshte.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1902,11 +2428,11 @@
 "\n"
 "Shtime ne dispozicion:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Komanda ne dispozicion:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1917,17 +2443,17 @@
 "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:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Del nga aplikimi."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Trego ndihme."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1935,7 +2461,7 @@
 "Per te marre ndihme per nje komande shtyp help <command> .\n"
 "Per te marre listen e plote te komandave shtyp help .\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1946,46 +2472,46 @@
 "Perdor '%s' per listen e komandave\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Gabim Sintakse!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Kjo komande nuk duhet te kete parametra."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Kjo komande duhet te kete nje parameter."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Argument i pavlere."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Kjo eshte nje komande jo komplete."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Shtyp '%s' per te marre me shume ndihme.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Ky eshte %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Ky eshte %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1993,7 +2519,7 @@
 "\n"
 "Duke krijuar klientin...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2002,7 +2528,7 @@
 "\n"
 "Ne rregull, duke dalur %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2015,118 +2541,361 @@
 "ose ne nje linje-komande, ose futni nje kur kerkohet.\n"
 "Duke dalur.\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Trego kete tekstin ndihmues."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Host ne te cilin aMule vepron. (default: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Porta e aMule per Lidhjet e Jashtme. (default: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Fjalekalimi per Lidhjet e Jashtme."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Lexo rregullimin nga faili."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Mos printo asnje output tek stdout"
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Behu fjaleshume - trego dhe mesazhet e Debug-ut."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Vendos Locale-n e programit (gjuha)"
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Shkruaj opsionet e lenjes se komandave tek faili i konfigurimeve(rregullimeve)"
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Krijo nje fail per konfigurimin te bazuar ne ate te aMule-s."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Printo versioni ne programit."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Detajet e failit"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%% te mbaruara"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Parashikimi i failit"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "GABIM: Deshtoi te luaj media-player te jashtem! Komanda: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "GABIM: Deshtoi te krijoje partfile)"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Miresevini!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "I lidhur me shokun"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Gjendja e lidhjes"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Rrjetet"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Bootstrap"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Jeni duke u perpjekur te shkarkoni edhe njehere tjeter kete fail %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Shfleto"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Shkoket"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Trego &Detaje"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Shto nje shoke"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Fshi nje shoke"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Dergo &Mesazh"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Shiko failet"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Vendos slotin per shoket"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Jeni te sigurt qe deshironi te fshini shokun e zgjedhur?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Jeni te sigurt qe deshironi te fshini shoket e zgjedhur?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2134,2127 +2903,2561 @@
 "Ju nuk lejoheni qe te vendosni me shume se nje slot per shoket.\n"
 " Vetem nje slot i vetem u vendos."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Perzgjedhje e shumte"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\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/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Dergo nje mesash perdoruesit"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Mesazhi qe do te dergohet:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Hiqe nga shoket"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Dergo mesazh"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Sposto tek ky fail"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Nje tjeter fail i kerkuar"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "Ngarkime ne pritje: %s"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "Ne radhe"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "Ngarkim"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "None"
 msgstr "Asnjeri"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Jo"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Po"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Deshtoi ne hapjen %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Duke shkarkuar..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Deshtoi te rimarri failet e ndara nga perdoruesi '%s'"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Jeni duke u perpjekur te shkarkoni edhe njehere tjeter kete fail %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Duke shkarkuar %s"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "Shkarkimet (%i)"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Deshtoi te shkarkoje listen e serverave nga %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "Deshtoi te shkarkoje listen e serverave nga %s"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Deshtoi te shkarkoje listen e serverave nga %s"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 #, 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/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "U ngarkua %u intervali i adreses se IP nga '%s'."
 msgstr1 "U ngarkuan %u intervale te adresave IP nga '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u linja e deformuar u skarcua."
 msgstr1 "%u linjat e deformuara u skarcuan."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap nga \n"
-"kliente te njohur"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Aktualisht"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Mesatarja e Punes"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Mesatarja e Sesionit"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Nyjet (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "IP i pavlefshem per bootstrap"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Porte e pavlefshme per bootstrap"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Ju lutem plotesoni te gjitha fushat e kerkuara"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Mesazh"
+
+#: src/KadDlg.cpp
 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/KadDlg.cpp:213
+#: src/KadDlg.cpp
 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/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Te vazhdoj?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: fjala qe u kerkua eshte shume e shkurter"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Po lexoj %u kontakt Kad"
 msgstr1 "Po lexoj %u kontakte Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "U shkruajt %d kontakt Kadi"
 msgstr1 "U shkruajten %d kontakte Kadi"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Rrjeti Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Emri i failit"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr ""
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr ""
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "E vendosur nga sistemi"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Shqip"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabe"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Asturian"
+msgstr "Estoneze"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baske"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bullgare"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katallanase"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Kineze (E thjeshtesuar)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "KIneze (Tradicionale)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Kroate"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Ceke"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Daneze"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Holandeze"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Anglisht (G.B.)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Anglisht (G.B.)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estoneze"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finlandeze"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Frengjisht"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galiciane"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Gjermanisht"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Greqisht"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Cifut"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Hungarisht"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italiane"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japonisht"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Koreane"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Lituane"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvegjeze (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polake"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugeze"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugeze (Braziliane)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Romanian"
+msgstr "Shqip"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Ruse"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Sllovene"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Spanjolle"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Suedeze"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turqisht"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "Version i panjohur"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Kujdes: E pamundur te lexohet skin nga faili '%s'"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Hashing"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Duke perfunduar"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "E kompletuar"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Ne pritje"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "E gabuar"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Duke pritur"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Ju duhet te specifikoni nje fjalekalim jo bosh "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Fjalekalim i gabuar, nuk eshte nje hash MD5 "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Lidhja deshtoi"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Lidhja e jashtme u mbyll."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Lidje e jashtme: Pergjigje e keqe nga serveri. Lidhja u mbyll."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Lidje e jashtme: Pergjigje e keqe nga serveri. Lidhja u mbyll."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Sukses! Lidhja u vendos ne aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Sukses! Lidhja u vendos."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Handshake failed."
 msgstr "Fjalekalimi per Lidhjet e Jashtme."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "Rifreskimi Automatik filloi"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Mbylle"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Ndaj"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopjo"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Ngjit"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Pastro"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Zgjidhi te gjitha"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "E pakufijshme"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Trego aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Fshih aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "I lidhur"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "I lidhur"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "I lidhur ne Kad (Me firewall)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "IP-ja e Serverit: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "IP-ja e Serverit:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Nuk jam i lidhur"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Informacion mbi klientin"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Trego aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Shkeputu"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Fshih aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Lidhu"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Dlje"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "E pakufijshme"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "Menuja e sherbimeve te aMule"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "Ngarkim: Asnje"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "Ngarkim: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "Shkarkim: Asnje"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "Shkarkim: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Shpejtesia-Shkarkimit"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Shpejtesia-Ngarkimit"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Nickname: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Nuk eshte perzgjedhur asnje Nickname"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID-ja e klientit: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Emri i Serverit: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP-ja e Serverit: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "I palidhur"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Firma Online: E aktivizuar"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Firma Online: E c'aktivizuar"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Uptime: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Totali i shkarkimit: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Totali i ngarkimit: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Dergo"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Shton nje link magnet ose ed2k tek Core."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Shto tek shoket"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Ngjarjet jane te treguara ketu. Per nje liste komplete te ngjarjeve, referohuni log-ut ne skeden e Serverave."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Duke ngarkuar ..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Perdorues: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Perdoruesit e lidhur tek serveri aktual dhe nje vleresim i numrit te te gjithe perdoruesve."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Larte: 0.0 | Poshte: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Mesatarja aktuale e ngarkimeve dhe shkarkimeve. Nese aktivizohet numrat ne thonjeza tregojne overhead-in nga komunikimi me klientin."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Tregon gjendjen e lidhjes dhe transferimet aktive. Shigjetat e kuqe tregojne qe ju aktualisht nuk jeni lidhur, shigjetat e verdha tregojne qe ju keni nje ID te ulet (me firewall) dhe shigjetat e jeshile tregojne qe ju keni ID te larte (Tipi i lidhjes optimale)"
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Nuk eshte i lidhur ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Serveri aktualisht i lidhur."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Kerko"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Emri:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tipi"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Lokale"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Globale"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Parametra te zgjeruara"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtrim"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Lloji i failit"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Kushdo"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Arkive"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "Imazhet-CD"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Figurat"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programe"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Tekste"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Video"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Zgjerimi"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Madhesia Minimale"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Madhesia Maksimale"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Te disponueshem"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filteri:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Rezultatet e filterit"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filteri"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Nderro pozicionin e rezultateve"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Fshi failet e njohura"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Reseto fushat"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Fillo"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Me shume"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Zgjerimi"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Ndalo"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Shkarkime"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Shkarko ne kategori"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Rezultatet e filterit"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Reseto fushat"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Rezultatet"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Pastro shkarkimet e perfunduara"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filteri:"
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "Burime te gjetura :"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Te pergjithshme"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Emri i plote :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
-
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "Faili-met :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Madhesia e failit :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Gjendja e pjeseve te failit :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Hera e fundit qe u pa i perfunduar :"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Emri i plote"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "Faili-met"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
+
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Madhesia e failit"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Transferimi"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Burime te gjetura :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Gjendja e pjeseve te failit"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Hera e fundit qe u pa i perfunduar"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Burime te gjetura"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Burime ne transferim"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Numerimi i pjeseve te failit"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Te disponueshem"
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Burime ne transferim :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Numerimi i pjeseve te failit :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Te disponueshem :"
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Shpejtesia"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Shpejtesia :"
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Koha Aktive e Shkarkimit"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Koha Aktive e Shkarkimit : "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Te transferuara :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Te kompletuara :"
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Te kompletuara"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligent Corruption Handling"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Humbje per pjese te prishura :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Fitimi nga kompresimi :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Paketa te rekuperuara nga I.C.H. :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Humbje per pjese te prishura"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Fitimi nga kompresimi"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Paketa te rekuperuara nga I.C.H."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Te ndara: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Kerkesa"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Kerkesa te pranuara"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Te dhena te transferuara"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Raporti i ndarjeve"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Burime te kompletuara"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "File te ndara"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", Ngarkimi: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Informacioni i Kad"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "E pavotuar"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Titulli"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Emrat e Faileve"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Mbishkruaj"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Pastro"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Zbato"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ne rregull"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 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:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Cilesia e failit"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "E pavotuar"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Pa vlere / E prishur / Falso"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "I varfer"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Mjaftueshem"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Mire"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "E perkryer"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "I shkeputur nga Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Rifreskim"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Duke shkarkuar, ju lutem prisni ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Madhesi e panjohur"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Informacion i Kerkuar"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "Adresa IP :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Porta :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Porta"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Informacion i Shtuar"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Emri i Perdoruesit :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Userhash :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Userhash"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Shto"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Shpejtesia-Shkarkimit"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Aktualisht"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Mesatarja e Punes"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Mesatarja e Sesionit"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Shpejtesia-Ngarkimit"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Lidhjet"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Shkarkime Aktive"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Lidhje Aktive (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Ngarkime Aktive"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Pema e statistikave"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Emri i perdoruesit:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Userhash:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Software i klientit:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Versioni i klientit:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Software i klientit"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "Adresa IP:"
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Versioni i klientit"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID-ja e Perdoruesit:"
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID-ja e Perdoruesit"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "IP-ja e Serverit:"
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "IP-ja e Serverit"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Emri i Serverit:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Emri i Serverit"
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Obfuscation"
+msgstr "Protokolli i Turbullimit"
 
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Protokolli i Turbullimit"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Transferime tek klienti"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Kerkesa aktuale:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Shpejtesia mesatare e ngarkimeve:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Shpejtesia mesatare e shkarkimeve:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Te ngarkuara (sesione):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Te shkarkuara (sesione):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Ngarkimet (total):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Shkarkimet (total):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Kerkesa aktuale"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Shpejtesia mesatare e ngarkimeve"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Shpejtesia mesatare e shkarkimeve"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Te ngarkuara (sesione)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Te shkarkuara (sesione)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Ngarkimet (total)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Shkarkimet (total)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Piket"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Modifikuesi DL/UP:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Identifikim i sigurte"
 
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Identifikim i sigurte:"
-
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "Ne radhe"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Piket e pritjes:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Piket e pritjes"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Nick"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Interval kohor para se te tregohen sugjerimet."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Kjo specifikon gjuhen e perzgjedhur."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Kerko per versione te reja sapo te filloje"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Duke aktivizuar kete beni qe aMule te kerkoje per versione te reja sapo te filloje"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Fillo te minimizuar"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 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:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Pyet kur del"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Aktivizo Ikonen Tray"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 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:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimizoje ne ikonen Tray"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Duke aktivizuar kete opsion do te beni qe te minimizoni aMule-n ne System Tray sesa ne taskbar."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Mbaji mend keto rregullime"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Zgjedhesi i shfletuesit"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Shfleto"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Hape ne nje faqe te re nqs eshte e mundur"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Video Player"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Ngarkim"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Vendndodhja e slotit"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Lidje automatike sapo programi te hapet"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Rilidhu mbas humbjes se lidhjes"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Largo serverat e papune mbas"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "tentativa"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Perdor sistemin e prioritetit"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Perdor kontrollin e zgjuar per ID e ulet kur lidhesh"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Lidhje e sigurte"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Lidhu automatikisht vetem me serverat e qendrueshem"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Vendosni ne menyre manuale serverat e shtuar ne Prioritet te Larte"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Shto failet tek shkarkimi duke i vene ne pushim"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Shto failet tek shkarkimi me prioritet automatik"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 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:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Nga e njejta kategori"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Futni ketu hapesiren minimale qe deshironi per diskun."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Shpeto 10 burime per failet e rralla (< 20 burime)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Ngarkimi"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Shto faile te reja te ndara me prioritet automatik"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Hiq"
+
+#: src/muuli_wdr.cpp
 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:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Nda failet e fshehur"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Server i larget"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Server Lokal"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafiket"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Intervali i azhornimit : 5 sek"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Intervali grafik i vlerave mesatare: 100 minuta"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Shkalla grafike e lidhjeve: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Sfondi"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Zgara"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Shkarkimi aktual"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Mesatarja e shkarkimeve ne punim"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Mesatarja e sesioneve te shkarkimit"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Ngarkimi aktual"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Mesatarja e ngarkimit ne punim"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Mesatarja e sesionit te ngarkimeve"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Lidhjet aktive"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Ikona e Speedbar-it ne Systray"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Nyjet e Kad aktuale"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Nyjet e Kad jane duke punuar"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Sesioni i Nyjeve te Kad"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Zgjidh"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Numera te treguar te versioneve te klienteve (0= pa kufij)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! KUJDES !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Lidhe maksimale te reja / 5 sek"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "Intervali i rifreskimit te FTP-se ne minuta"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "Intervali i rifreskimit te FTP-se ne minuta"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Madhesia e Buffer-it te failit: 240000 bytes"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Madhesia e Radhes ne Ngarkim: 5000 klienta"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Interval i azhornimit te lidhjes se serverit: C'aktivizuar"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Trego informacion te zgjeruar ne tabelat e kategorive"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "Trego shpejtesine e transferimit ne titull"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Trego shpejtesine e transferimit ne titull"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Orientim Vertikal i toolbar-it"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "E sheshte"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "E rrumbullakosur"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Parametrat e Lidhjeve te Jashtme"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Prano lidhje te jashtme"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Aktivizo port forwarding UPnP tek porta EC"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Fjalekalim"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "Porta e Proksit:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Duke kerkuar fjalekalimin\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Duke kerkuar fjalekalimin\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Ndalo hyrjen e guest-ve"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Fjalekalim per te drejta komplete"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Modeli Web"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Fjalekalim per te drejta komplete"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Aktivizo Perdorues me te drejta te kufizuara"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Fjalekalim per te drejta te kufizuara"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Koha e Rifreskimit te Faqes (ne sek)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Aktivizo kompresimin Gzip"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "E vendosur nga sistemi"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Ne rregull"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 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:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Rikthe ne gjendjen e meparshme ndryshimet te bera tek Preferencat."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Titulli :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Komente :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Direktoria e Hyrjeve :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Nderro perparesine per failet e reja te caktuara :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Direktoria e Hyrjeve"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Nderro perparesine per failet e reja te caktuara"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "Mos nderro"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Zgjidh ngjyren per kete kategori (e zgjedhur aktualisht) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Rivendos"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Zgjidh ngjyren per kete kategori (e zgjedhur aktualisht)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Kliko ne kete buton per te resetuar log-un."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 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:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Futni emrin e serverit te ri ketu"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Porta"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Futni porten e serverit ketu."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 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:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Log i aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Informacion mbi serverin"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Informacioni i ED2K"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Informacioni i Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 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:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Nyjet (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Statistikat e Nyjeve"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Bootstrap"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Nyje e re"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Porta:"
-
-#: src/muuli_wdr.cpp:2327
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Bootstrap from known clients"
+msgid "Bootstrap from node: IP"
 msgstr ""
 "Bootstrap nga \n"
 "kliente te njohur"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Shkeput Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node 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:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Perdor Identifikimin e Sigurte te Perdoruesve"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protokolli i Turbullimit"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Mbeshtet Protokollin e Turbullimit"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Ky opsion lejon Protokollin e Turbullimit, dhe ben qe aMule te pranoje lidhje te turbulluara nga kliente te tjere."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Perdor turbullimin per lidhjet ne dalje"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Ky opsion lejon aMule-n qe te perdori protokollin e turbullimit kur lidhet me klientet/serverat e tjere."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Prano vetem lidhje te turbulluara"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Te gjithe"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "Filtrimi-IP"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtro klientet"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtron Serverat"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Lista e Ringarkimeve"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Azhorno tani"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Azhornim-Automatik i ipfilter sapo te ndizet"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Niveli i Filtrimit:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Gjithmone filtro IP-te LAN"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Perdorim Paranoik te IP-ve qe nuk korrespondojne"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Refuzo paketat nqs IP e klientit eshte e ndryshme nga IP se ku paketat kane ardhur. Perdore me kujdes."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Perdor ipfilter.dat te sistemit nqs eshte i disponueshem"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Nese nuk eshte gjetur ndonje ipfilter.dat lokal, lejo perdorimin e failit ipfilter te sistemit."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Lejo Firmen-Online"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Lejon shkrimin e faileve OS, qe mund te perdorren nga aplikacione te jashtme per te krijuar firma dhe te ngjashme."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Frekuenca e azhornimeve (sek):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Nderron frekuqncen (ne sekonda) te azhornimit te Firmes Online."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Shpejtesia :"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Burime"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4262,11 +5465,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4276,854 +5479,769 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Shkarkim: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Azhornim-Automatik i ipfilter sapo te ndizet"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtron mesazhet ne hyrje (pervec chatit qe po zhvilloni):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtron te gjithe mesazhet"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 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:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtron mesazhet nga klienta t èanjohur"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtron mesazhet qe permbajne (perdor ',' si nje ndarese):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Komente"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Komente e filtrave permbajne (perdor ',' si nje ndarese):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Aktivizo njohjen"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Aktivizo/C'aktivizo emri i perdoruesit/njohja e fjalekalimit"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr ""
-
-#: src/muuli_wdr.cpp:2689
-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:2691
-msgid "Password:"
-msgstr "Fjalekalimi:"
-
-#: src/muuli_wdr.cpp:2694
-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:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Aktivizo Proksin(Proxy)"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Aktivizo/C'aktivizo mbeshtetjen e Proksit(Proxy)"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Lloji i Proksit(Proxy):"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Lloji i Proksit(Proxy)"
 
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
 msgstr "Hosti i Proksit(Proxy)"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Host Name i Proksit(Proxy)"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Porta e Proksit:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Porta e Proksit"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Porta e Proksit(Proxy)"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Aktivizo njohjen"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Aktivizo/C'aktivizo emri i perdoruesit/njohja e fjalekalimit"
+
+#: src/muuli_wdr.cpp
+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
+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
 msgid "Connect to:"
 msgstr "Lidhu me:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Futu tek Remote i aMule"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Emri i Perdoruesit"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Mbaji mend keto rregullime"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Lidhja e jashtme u mbyll."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Perdor kompresimin gzip"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Aktivizon logging-un e detajuar te mesazheve te debug-ut."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "&Hap failin"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Kategorite e Mesazheve:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Ne pritje..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Shton importimet"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Provoji perseri te perzgjedhurit"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Zhvendos te perzgjedhurat"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "Ngarkime Aktive :"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Trego klientet"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "Fshih failet e ndara"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "Zgjidh filtrin e shikimit"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "Ngarkime Aktive"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "Trego klientet"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "Lista e Ringarkimeve"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Ringarko failet e ndara"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Dergo"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Dergo mesazhin e specifikuar."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Mbylle kete sesion chati."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Lidhu me ndonje server dhe/ose Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Fshij"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "File te ndara"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Shkeputu"
 
-#: src/OScopeCtrl.cpp:242
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "Lidhu"
+
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Jo aktive %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
 msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/sec"
 msgstr1 "bytes/sec"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sekonda"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "minuta"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "ore"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Dite"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "dite"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "te gjithe"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "te gjithe te tjeret"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "E pakompletuar"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "E ndalur"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arkivi"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Tekst"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Aktive"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Kjo komande nuk duhet te kete parametra."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Kjo komande nuk duhet te kete parametra."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Kjo komande nuk duhet te kete parametra."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Kjo komande nuk duhet te kete parametra."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Futni porten e serverit ketu."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Futni porten e serverit ketu."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Futni porten e serverit ketu."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Duke importuar %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Duke lexuar kartelen temp"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Rekuperim informacioni themelor nga informacioni i failit ne shkarkim"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Duke krijuar destinacionin e failit"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, 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)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "Shpetimi i blloqeve te dhenave ne nje fail shkarkimi te vetem (%u te %u)"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Rekuperim informacioni mbi burimet e failit ne shkarkim"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Shtim shkarkimi dhe duke shpetuar partfile-n e re"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importo pjeset e faileve"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Gjendja"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Filehash"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Disku: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Deshironi qe burimet e faileve te importuara ne menyre te suksesshme te fshihen?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Te heq burimet?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "GABIM: Deshtoi te krijoje partfile)"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Ngarkimi i backup-it te failit met nga %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Gabim: %s (%s) eshte e pavlere (tagcount i gabuar), e pamundur te ngarkoj failin."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Tentative per rekuperimin e informacionit te failit..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "Rekuperim i failit pa emer - tentativa e rekuperimit si RecoveredFile.dat"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "E pamundur te merren informacione mbi failin :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Deshtoi ne hapjen %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "GABIM duke shpetuar partfile: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 #, fuzzy
 msgid "IO failure while saving partfile: "
 msgstr "GABIM duke shpetuar partfile: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Te shpetuar %i burimi seed per partfile: %s (%s)"
 msgstr1 "Te shpetuar %i burimet seeds per partfile: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Te shpetuar %i burimi seed per partfile: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "U gjend pjese e prishur (%d) ne %d pjesen e failit %s - Rezultati Hash i Failit |%s| Hash i Failit |%s|"
 msgstr1 "U gjend pjese e prishur (%d) ne %d pjeset e failit %s - Rezultati Hash i Failit !%s| Hash i Failit |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "U gjend pjese e kompletuar (%i) ne %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Hashing i ri i kompletuar %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Shkarkim i perfunduar: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Shkarkim i perfunduar: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Duke fshire failin: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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:3567
+#: src/PartFile.cpp
 #, 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:3617
+#: src/PartFile.cpp
 #, 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:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "E vendosur nga sistemi"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Shqip"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabe"
-
-#: src/Preferences.cpp:640
-#, fuzzy
-msgid "Asturian"
-msgstr "Estoneze"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baske"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bullgare"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katallanase"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Kineze (E thjeshtesuar)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "KIneze (Tradicionale)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Kroate"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Ceke"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Daneze"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Holandeze"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Anglisht (G.B.)"
-
-#: src/Preferences.cpp:651
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "English (U.S.)"
-msgstr "Anglisht (G.B.)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estoneze"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finlandeze"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Frengjisht"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galiciane"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Gjermanisht"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Greqisht"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Cifut"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Hungarisht"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italiane"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italiane (Zvic)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japonisht"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Koreane"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Lituane"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvegjeze (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polake"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugeze"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugeze (Braziliane)"
-
-#: src/Preferences.cpp:669
-#, fuzzy
-msgid "Romanian"
-msgstr "Shqip"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Ruse"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Sllovene"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spanjolle"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Suedeze"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turqisht"
+msgid "Extended source exchange"
+msgstr "Shkembim burimesh"
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:779
-#, fuzzy
-msgid "Change Language"
-msgstr "Gjuha"
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Nuk eshte ne dispozicion"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Do te perdoret porta e vendosur (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Lidhje"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Direktorite"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Servera"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Failet"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Sigurimi"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proksi"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Kontrollet e remote"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Firma online"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Ngjarje"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Debug"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5139,26 +6257,43 @@
 "aMule do te punoje ne rregull pa modifikuarr asnje nga\n"
 "keto rregullime"
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Lloji i Proksit(Proxy) qe ju po lidheni"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Duke kerkuar fjalekalimin\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5166,68 +6301,88 @@
 "aMule duhet qe te ristartohet qe keto ndryshime te aplikohen:\n"
 " \n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "Porta TCP eshte ndryshuar.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "Porta UDP eshte ndryshuar.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "Lidhja e jashtme u mbyll."
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "Lidhja e jashtme u mbyll."
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "U pranua nje lidhje e jashtme e re"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "Lidhja e jashtme u mbyll."
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Protokolli i Turbullimit"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Gjuha ndryshoi.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 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:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Gjuha ndryshoi.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "Kartela Temp ndryshoi.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- ED2K network enabled.\n"
 msgstr "Te gjithe rrjetet jane c'aktivizuar."
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Version protokoli jo i rregullt."
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5235,7 +6390,7 @@
 "Kad nuk mund te filloje nqs porta juaj UDP eshte c'aktivizuar.\n"
 "Aktivizoni porten UDP ose c'aktivizoni Kad-in."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5245,20 +6400,69 @@
 "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:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Rifreskimi Automatik filloi"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Jeni duke u perpjekur te shkarkoni edhe njehere tjeter kete fail %s"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "U pranua nje lidhje e jashtme e re"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5268,41 +6472,66 @@
 "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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Failet e perkohshme"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Failet e shkarkuara"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Firma online"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Zgjidhni nje kartele per %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "U gjend %i fail i njohur i ndare"
+msgstr1 "U gjenden %i faile te njohura te ndara"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Shfletoni per nje videoplayer"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Perzgjidhni shfletuesin"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Perzgjidhni shfletuesin"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Te ekzekutueshme%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "E vendosur nga sistemi"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5310,1212 +6539,1474 @@
 "Futni ketu URL-te per te shkarkuar failet server.met.\n"
 "Vetem nga nje URL per c'do linje."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Burime te kompletuara"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Statusi:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Statusi:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Intervali i azhornimit: %d sekonde"
 msgstr1 "Intervali i azhornimit: %d sekonda"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Koha per mesataren grafike: %d minute"
 msgstr1 "Koha per mesataren grafike: %d minuta"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Shkalla grafike e lidhjeve: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Madhesia buffer e failit: %d byte"
 msgstr1 "Madesia Buffer e failit: %d bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Madhesia e radhes se ngarkimit: %d klienti"
 msgstr1 "Madhesia e radhes se ngarkimit: %d klientet"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Intervali i rifreskimit te lidhjeve te serverit: %d minute"
 msgstr1 "Intervali i rifreskimit te lidhjeve te serverit: %d minuta"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Intervali i rifreskimit te lidhjeve te serverit: I c'aktivizuar"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "disabled"
 msgstr "c'aktivizo"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Execute command on '%s' event"
 msgstr "Ekzekuto komanden ne kete ngjarje `%s' "
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Lejo ekzekutimin e komandes ne core"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "KOmanda Core:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Lejo ekzekutimin e komandes ne GUI"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Komanda GUI:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Variacionet qe vijojne do te rivendosen:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Ringarko failet e ndara"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Ringarko failet e ndara"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Duke lexuar kartelen temp"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Ringarko listen e faileve te ndara."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "File te ndara"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Zgjidhni nje kartele per %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Mbaji mend keto rregullime"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "PoParalajmerim per kerkim"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Kerkimet"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "Ne vazhdim"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "PoParalajmerim per kerkim"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Kryesore"
 
-#: src/SearchList.cpp:313
-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
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "Kujdes: Lista e faileve te njohur eshte e demtuar, permban nje header te pavlere."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Gabim i paparashikuar duke kerkuar Kad: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "FailiID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "E pavotuar"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Shkarko ne kategori"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "FailiID"
 
-#: src/SearchListCtrl.cpp:714
-#, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Shtoni URLs opsionale per kete fail"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Mbylli te gjitha tabelat"
+
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Shenoje si fail te njohur"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Ju jeni i lidhur tek serveri qe deshironi te fshini. ju lutem ne fillim shkeputuni prej tij."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "Fshij"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Aktive"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Finlandeze"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static 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
 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:79
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
 msgstr "E pamundur te lidhem tek serverat qe jane ne liste. Po provoj perseri."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
+msgstr "E pamundur te lidhem tek serverat qe jane ne liste. Po provoj perseri."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Rilidhje automatike tek serveri do te behet ne %d sekonde"
+msgstr1 "Rilidhje automatike tek serveri do te behet ne %d sekonda"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "I lidhur tek %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Lidhja u vendos ne: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Humbi lidhja tek %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) duket sikur nuk ka shenja jete."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) duket sikur eshte plote."
 
-#: 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"
-msgstr0 "Rilidhje automatike tek serveri do te behet ne %d sekonde"
-msgstr1 "Rilidhje automatike tek serveri do te behet ne %d sekonda"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "LIdhja humbi"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Lidhja tek %s (%s:%i) deshtoi."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Lidhja tek %s (%s:%i) nuk u vendos per time-out."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Duke ngarkuar failin e server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Faili i server.met nuk u gjete!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, 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:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Deshtoi per te hapur server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i u gjet server ne server.met"
 msgstr1 "%i u gjeten servera ne server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d serveri i shtua"
 msgstr1 "%d serverat u shtuan"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "Gabim IO duke lexuar failin known.met: %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Ju jeni i lidhur tek serveri qe deshironi te fshini. ju lutem ne fillim shkeputuni prej tij."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Deshtoi te hapi '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Deshtoi te shpetoje server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Gabim IO duke lexuar failin known.met: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "URL e pavlere"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Mbaroi se shkarkuari listen e serverave nga %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Duke filluar shkarkimin e listes se serverave nga %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Deshtoi te shkarkoje listen e serverave nga %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Serverat lokale jane te filtruara nga IPFilters, duke u rilidhur ne nje server tjeter!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "Emri i serverit"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adresa"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Porta"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Pershkrimi"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping-u"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Perdoruesit"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Perdoruesit"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "E qendrueshme"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Versioni"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Failet"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "File te ndara"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 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:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Emer i panjohur)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, 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:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "minuta"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Serverat (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Serveri"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Lidhu ne Server"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Shenoje Serverin si te qendrueshem"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Shenoje Serverin si te Jo-Qendrueshem"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Shenoji Serverat si te qendrueshem"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Shenoji Serverat si te Jo-Qendrueshem"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Hiq Server"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Hiq Serverat"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Hiq te gjithe Serverat"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Rilidhu ne Server"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 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:548
+#: src/ServerListCtrl.cpp
 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:550
+#: src/ServerListCtrl.cpp
 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:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Klienti i ri eshte %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "KUJDES: Ju keni marre nje ID te ulet!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 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:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tPer me shume informacion ju lutem vizitoni https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "U moren Informacione serveri te panjohura! - shume e shkurter"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "U mor %d server i ri"
 msgstr1 "U moren %d servera te rinj"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Shpetimi i listes se serverit u perfundua."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Serveri nuk pranoi komanden e fundit"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Paketa Bogus te marra nga serveri: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Gabim qe nuk mund te menaxhohet derisa punohet me paketat nga serveri: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, 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:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "duke perdorur protokollin e turbullimit."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Duke u lidhur tek %s ( %s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "Log i aMule"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Serveri nuk u shtua: Nuk ka Hostname ose IP per specifikuar."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Serveri nuk u shtua: Porta e serverit te specifkuar eshte e pavlere."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Gjendja e lidhjes"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "I lidhur"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Statusi i Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Running in LAN mode"
 msgstr "Duke punuar ne %s"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Aktive"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Statusi i Kademlia"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Statusi:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Gjendja e lidhjes"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "UDP Connection State:"
 msgstr "Gjendja e lidhjes"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Gjendja e firewall-it: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Nuk ka Shoke"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connecting to buddy"
 msgstr "I lidhur me shokun"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, fuzzy, c-format
 msgid "Connected to buddy at %s"
 msgstr "I lidhur me shokun"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "Adresa IP:"
+
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed sources:"
 msgstr "Burime te gjetura :"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Indexed notes:"
 msgstr "Indeksi i failit nuk u gjet:  "
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Perdorues mesatare:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Mesatarja e faileve:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Nuk eshte aktive"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "U gjend %i fail i njohur i ndare"
 msgstr1 "U gjenden %i faile te njohura te ndara"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "U gjenden %i faile te njohur te ndare, %i te panjohura"
-msgstr1 "U gjenden %i faile te njohura te ndara,%i te panjohura"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, fuzzy, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Serveri nuk u gjend: %s"
 
-#: src/SharedFileList.cpp:486
-#, c-format
-msgid "No shareable files found in directory: %s"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Serveri nuk u gjend: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "Emri i Perdoruesit"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "Shpejtesia-Shkarkimit"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Gabim duke shpetuar failin known.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "Shpejtesia-Ngarkimit"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Duke ngarkuar failin e server.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Duke ngarkuar failin e server.met: %s"
+msgstr1 "Duke ngarkuar failin e server.met: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "U gjend %i fail i njohur i ndare"
+msgstr1 "U gjenden %i faile te njohura te ndara"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "Te disponueshem :"
+msgid "User Name"
+msgstr "Emri i Perdoruesit"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "Gjendja e ngarkimit"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "Emri i failit"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "File te ndara"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Kerkesa"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Kerkesa te pranuara"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Te dhena te transferuara"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Raporti i ndarjeve"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Pjese te marra"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Burime te kompletuara"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Te disponueshem"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Direktoria Path"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "File te ndara"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Shti Komento/Klasifiko"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Redakto Koment/Klasifiko"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Riemerto"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Shto failet ne koleksionin e listes per transferim"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Kopjo magnetin &URI ne shenime"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Kopjo linkun ED2k ne shenime (&AICH informacion)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 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:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Gabim ne perfundim"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Deshtoi te rimarri failet e ndara nga perdoruesi '%s'"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Ringarko failet e ndara"
+msgstr1 "Ringarko failet e ndara"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Totali i madhesise se faileve te ndara: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Totali i madhesise se faileve te ndara: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Faile te ndara (%i)"
+msgstr1 "Faile te ndara (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Faile te ndara (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "File ne shkarkim"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Ringarko listen e faileve te ndara."
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Gjendja"
+
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "Emri i failit"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Vlera te ngarkuara (Sesioni (Total)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Overhead-i Total (Paketa): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Overhead-i i faileve te kerkuara (Paketa): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Overhead-i i nderrimit te burimit (Paketa): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Overhead-i i Serverit (Paketa): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Overhead i Kad (Paketa): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Ngarkime Aktive: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Ngarkime ne pritje: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Sesione totale ngarkimi me sukses: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Sesione totale ngarkimi te deshtuara: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Mesatarja kohore e ngarkimeve: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Te dhenat e shkarkimeve (Sesioni(Total)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Burime te gjetura: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Shkarkime Aktive (pjeset): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Raporti NG:SHK i sesionit (Total): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Rilidhjet: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Koha qe nga transferimi i pare: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "I lidhur ne server qe prej: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Lidhje Aktive (vleresimi): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Kufiri maksimal i lidhjeve u arrit: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Mesatarja e lidhjeve (vleresim): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Kulmi i lidhjeve (vleresim): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Kliente"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "Madhesi e panjohur"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "Te filtruar"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Banned: %s"
 msgstr "Te larguar"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Totale: %i Te njohur: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Servera qe punojne: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Servera te deshtuar: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Totale: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Servera te fshire: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Servera te filtruar: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Perdorues ne serverat qe punojne: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Faile ne serverat qe punojne: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Perdorues Total: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Totali i Faileve: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Zenia e Serverit: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Numeri i faileve te ndara: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Totali i madhesise se faileve te ndara: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Sistemi Operativ"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Jo te marra"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Lidhjet Aktive (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Nuk eshte ne dispozicion"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Asnjehere"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Shtyp <str> dhe dil."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Perpunim nga Hash: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Perpunim nga emri i failit: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 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:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Nuk eshte numer i vlefshem\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6524,7 +8015,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6533,83 +8024,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "Shtyp '%s' per te marre me shume ndihme.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Shkarkimet (%i)"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Kerkesa deshtoi me nje gabim te panjohur."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operacioni u mbyll me sukses."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Kerkesa deshtoi me kete gabim: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Filtrimi i IP per klientet eshte %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Fikur"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Ndezur"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Filtrimi i IP per serverat eshte %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Niveli aktual i filtrimit te IP eshte %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "I lidhur tek %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Tani po lidhem"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "firewalled"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6618,7 +8113,7 @@
 "\n"
 "Shkarkim:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6627,7 +8122,7 @@
 "\n"
 "Ngarkim:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6636,7 +8131,7 @@
 "\n"
 "Kliente ne radhe:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6645,38 +8140,33 @@
 "\n"
 "Burime Totale:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "File ne shkarkim"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Numri i rezultateve te kerkimeve: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr ""
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, 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:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Trego informacione mbi gjendjen."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Trego gjendjen e lidhjes, ngarkim/shkarkim shpejtesi aktuale, etj.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Trego pemen e te gjitha statistikave."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6689,51 +8179,51 @@
 ". 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:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr ""
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload the given object."
 msgstr "Ringarko objektet e dhena."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload shared files list."
 msgstr "Ringarko listen e faileve te ndara."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload IP filtering table."
 msgstr "Ringarko tabelen e Filterit te Ip nga faili."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload current IP filtering table."
 msgstr "Zgjidh nivelin e filtrimit te IP."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Update IP filtering table from URL."
 msgstr "Ringarko tabelen e Filterit te Ip nga faili."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Lidhu me rrjetin."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6744,36 +8234,36 @@
 "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:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Lidhu vetem tek Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Shkeputu nga rrjeti."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Shkeputu vetem nga Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Add an eD2k or magnet link to core."
 msgstr "Shton nje link magnet ose ed2k tek Core."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6784,52 +8274,52 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Vendos nje vlere te preferuar."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Set IP filtering preferences."
 msgstr "Vendos preferimet per filtrin e IP."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Ndize filtrin e IP si per kliente dhe per serverat."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Fike filterin e IP si per klientet si per serverat."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Aktivizo/C'aktivizo filtrimin e IP per klientat."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Ndiz filtrimin e IP per klientet."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Fike filtrimin e IP per klientet."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Aktivizo/C'aktivizo filtrimin e IP per serverat."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Ndize filtrimin e IP per serverat."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Fike filtrimin e IP per serverat."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Zgjidh nivelin e filtrimit te IP."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6837,66 +8327,80 @@
 "Niveled e duhura per filtrimin jane nga 0-255, dhe eshte e dhene (fillimisht)\n"
 "vlera eshte 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Vendos kufijte e rrjetit."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Vendos kufijte ngarkues te rrjetit."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Vlera e dhene e ketyre komandave duhet te jete ne kilobytes/sec.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Vendos kufijte shkarkues per rrjetin."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Aktivizo/C'aktivizo emri i perdoruesit/njohja e fjalekalimit"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Vlera e dhene e ketyre komandave duhet te jete ne kilobytes/sec.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Merr dhe trego nje vlere te preferencave."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering preferences."
 msgstr "Merr preferencat e filtrit te IP."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 #, 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:1042
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for clients only."
 msgstr "Merr gjendjen e filterit te IP vetem per kliente."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for servers only."
 msgstr "Merr gjendjen e filterit IP vetem per servera."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering level."
 msgstr "Zgjidh nivelin e filtrimit te IP."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Merrni kufijte e bandwdith."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a search."
 msgstr "Fillon nje kerkim Kad"
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6915,46 +8419,48 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a global search."
 msgstr "Fillon nje kerkim global."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a local search"
 msgstr "Fillon nje kerkim lokal"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a kad search"
 msgstr "Fillon nje kerkim Kad"
 
-#: src/TextClient.cpp:1070
+#: src/TextClient.cpp
 #, fuzzy
-msgid "Show the results of the last search."
+msgid "Show the results of a search."
 msgstr "Tregon rezultatet e kerkimit te fundit."
 
-#: src/TextClient.cpp:1071
-#, fuzzy
-msgid "Return the results of the previous search.\n"
-msgstr "Rikthen rezultatet tek kerkimi i meparshem.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "Tregon ecurine e nje kerkimi."
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "Tregon ecurine e nje kerkimi.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Shkarko nje fail"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6962,82 +8468,82 @@
 "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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Pusho shkarkimin."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Rimerr shkarkimin."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Fshij shkarkimin."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Vendos prioritetin e shkarkimit."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Vendos prioritetin tek Ulet,"
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Vendos prioritetin tek Normale."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Vendos prioritetin tek Larte."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Vendos prioritetin tek auto."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Trego radhet/listat."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 #, 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/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Trego radhen e ngarkimeve."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Trego radhen e shkarkimeve."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Trego log."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Trego listen e serverave."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Ringarko listen e faileve te ndara."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Fshi log-un."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7046,256 +8552,279 @@
 "Kjo eshte nje komande e pavlere dhe mund te largohet ne te ardhmen.\n"
 "Perdor '%s' ne vendin e saj.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Teksti i klientit aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Duke fshire failin: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Duke fshire failin: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Rimarrja e ngarkimeve te failit: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Konfirmo kerkesen"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "Shume lidhje"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Te gjithe te tjeret"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Zgjidh filtrin e shikimit"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Shto kategorine"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Redakto kategorine"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Zhvendos kategorine"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Kerkohet Hashset-i per failin e panjohur: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Zgjidh se kush ka kerkuar te shikoje listene faileve qe ju keni ndare."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Rimarrja e ngarkimeve te failit: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Duke pezulluar ngarkimin e failit: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Deshtoi te ekzekutoje komanden `%s' ne `%s' ngjarjet."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Deshtoi te ekzekutoje komanden '%s' ne '%s' ngjarjet."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Shkarkimi Perfundoi"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Path-i i plote per tek faili"
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Emri i failit pa perberesit e Path-it."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Madhesia e failit ne bytes."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "KOha permbledhese e shkarkimeve."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Sesion i ri chati filloi"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Derguesi i mesazheve."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Jashte nga hapesira"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Particioni i diskut."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Gabim ne perfundim"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Numeri i failit ne proces %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Fail qe nuk ekziston !\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Miresevini!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Parametrat e hyrjes"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Faili per ekzaminim"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Shtoni URLs opsionale per kete fail"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Hiq"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Krijo lidhje me pjeset-hash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "Hash MD4"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Shpeto"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Kopjo ne shenime"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Rreth aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Asgje per te kopjuar tani !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "E pamundur te hapet "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Ju lutem, futni nje emer faili jo boshe"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Asgje per te shpetuar tani !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7307,162 +8836,159 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Hashing..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "i anulluar !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "I perfunduar ne %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Ju e keni futur edhe me pare kete URL !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Ju lutem, futni nje URL jo boshe"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "I paafte per te hapur %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, 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:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uo %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%2f GB"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%2f TB"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, Statistikat Online te aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Shpejtesia maksimale e DL qe kur eshte aktive wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Shpejtesia maksimale e DL ne aktivizimet e meparshme"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Rivendos"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistem"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Ndalo Rifreskimin Automatik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Shpeto imazhet e statistikave online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Printo imazhet e statistikave online"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Rregullimet e preferencave"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Rreth wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Fillo Rifreskimin Automatik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Rifreskimi Automatik u ndalua"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Rifreskimi Automatik filloi"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Shpeto imazhet e statistikave"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Statistikat Online te aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7470,11 +8996,11 @@
 "Kishte nje problem duke printuar.\n"
 " Mos valle printeri juaj nuk eshte instaluar ne menyre korrekte?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Duke printuar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7492,398 +9018,520 @@
 "\n"
 "Shperndare nga GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh Oh, aMule nuk eshte duke punuar..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule eshte duke punuar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule eshte duke punuar,por e shkeputur"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule po lidhet..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh Oh, Statusi i aMule eshte i panjohur..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr "ka punuar per "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " ka ndaluar !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " nuk eshte lidhur !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " po lidhet..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " eshte duke bere dicka te cuditshme, kontrolloje !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " eshte lidhur me "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "Fikur"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr "  Eshte ndezur "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " me "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Shkarkimi Total: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Ngarkimi: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Sesioni i Shkarkimit: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Shkarkim: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Ngarkim: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Te ndara: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " faili(et), Klientet ne pritje: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Koha: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " Ndezur "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Ngarikimi mesatar i sistemit (1-5-15 minuta): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Uptime i Sistemit: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Direktoria permban failin amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Intervali i rifreskimit ne sekonda"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Ngarko periodikisht imazhin tuaj te statistikave ne serverin FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "Url e FTP-se"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "Rruga e FTP-se"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Futni ketu URL e serverit tuaj FTP"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Perdorues"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Intervali i rifreskimit te FTP-se ne minuta"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Konvalido"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Kartela qe mban failoin e firmes"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Kartela ku prodhohet imazhi i statistikave"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Duke ngarkuar modelin <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "Porta UPnP"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Perdor kompresimin gzip"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Lejo hyrjen e guest-ve"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Ndalo hyrjen e guest-ve"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 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:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "C'aktivizo interpretuesin e PHP (nuk aprovohet)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Rimbush faqet PHP ne c'do kerkese"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Web Server i aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Kerkesa deshtoi me kete gabim: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Indeksi i failit nuk u gjet:  "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Sesioni mbaroi - kerkohet hyrja\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Sesioni ne rregull, u futet ne\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Sesioni ne rregul,nuk u futet ne\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Nuk ka sesion te hapur - kerkese per hyrje\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Sesioni u krijua - kerkohet hyrja\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Perpunim i kerkeses origjinale: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Duke kerkuar fjalekalimin\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Hash-i i fjalekalimit nuk eshte i rregullt\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Fjalekalimi ne rregull\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Fjalekalim i gabuar\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Dalja e kerkuar\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Perpunimi i kerkeses e ridrejtuar: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "Lidhja deshtoi "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Faili nuk u gjete."
+#~ msgid "Ratio"
+#~ msgstr "Vleresimi"
+
+#, fuzzy
+#~ msgid "Change Language"
+#~ msgstr "Gjuha"
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "Nuk eshte ne dispozicion"
+
+#~ msgid "User name"
+#~ msgstr "Emri i Perdoruesit"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Pjese te marra"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "Te disponueshem :"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "U gjenden %i faile te njohur te ndare, %i te panjohura"
+#~ msgstr1 "U gjenden %i faile te njohura te ndara,%i te panjohura"
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Server i larget"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Server Lokal"
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Duke ngarkuar te dhena nga nje fail i shkarkuar i vjeter (%u te %u)"
+
+#~ msgid "Filter Results"
+#~ msgstr "Rezultatet e filterit"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Shenoje si fail te njohur"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Bootstrap"
+
+#~ msgid "New node"
+#~ msgstr "Nyje e re"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Me shume"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Bootstrap nga \n"
+#~ "kliente te njohur"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Lidhu me ndonje server dhe/ose Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Shkeput Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Ndalo tentativat e lidhjes qe po behen"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Shkeputu nga rrjetet e lidhura"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Lidhu tek rrjetet"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule do te rreshtoje automatikisht kollonat ne listen tuaj te shkarkimeve"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Refuzo paketat nqs IP e klientit eshte e ndryshme nga IP se ku paketat kane ardhur. Perdore me kujdes."
+
+#, fuzzy
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Rikthen rezultatet tek kerkimi i meparshem.\n"
+
+#, fuzzy
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Tregon ecurine e nje kerkimi.\n"
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Kerko per versione te reja sapo te filloje"
+
+#~ msgid "Commit"
+#~ msgstr "Dergo"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "\tPer me shume informacion ju lutem vizitoni https://amule-org.github.io/docs"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Raportoni cdo gabim tek https://github.com/amule-org/amule/issues"

amule-3.0.1.tar.gz/po/sv.po -> amule-3.1.0.tar.gz/po/sv.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:17+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:05+0000\n"
 "Last-Translator: raffe <raffe@localhost.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -20,71 +20,157 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "Om aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMule fjärrkontroll"
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Snapshot:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"'Alla-Platformar' p2p-klient basserad på eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003–2026 aMule-teamet \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Delar av aMule är baserad på \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Peer-to-peer routing baserad på XOR metric.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Webbsida:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Forum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Dokumentation:"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Problem:"
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "Klicka för att kontrollera om det finns en nyare version."
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "Kontrollera uppdateringar"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "Kontrollerar uppdateringar..."
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "Du använder den senaste versionen."
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "En ny version (%s) finns:"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr "Kunde inte kontrollera uppdateringar. Försök igen senare."
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Lägg till en vän"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Du måste ange en giltig IP-adress och port!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Information"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Angiven userhash är inte giltig!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
+"aMule kan installera skrivbordsstartare, ikoner och genvägar till skal-kommandon i din hemkatalog så att programmet visas i programmenyn som ett vanligt installerat program.\n"
+"\n"
+"Detta går att återställa – filerna ligger under ~/.local/share/applications, ~/.local/share/icons och ~/.local/bin, och kan tas bort när som helst.\n"
+"\n"
+"Installera skrivbordsintegrering nu?"
 
-#: src/AppImageIntegration.cpp:226
-#, fuzzy
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
-msgstr "Efter programnamn"
+msgstr "Lägg till aMule i programmenyn?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
-msgstr ""
+msgstr "Installera"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
-msgstr ""
+msgstr "Inte nu"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
-msgstr ""
+msgstr "Fråga inte igen"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
-msgstr ""
+msgstr "Det går inte att installera skrivbordsintegrering: miljövariabeln APPDIR är inte angiven. Det betyder vanligen att AppImage startades på ett ovanligt sätt."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
-#, fuzzy
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
-msgstr "Anslutningen misslyckades "
+msgstr "aMule-integrering misslyckades"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
-msgstr ""
+msgstr "Det går inte att installera skrivbordsintegrering: kunde inte skapa %s. Kontrollera att hemkatalogen är skrivbar."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
-msgstr ""
+msgstr "Det går inte att installera skrivbordsintegrering: kunde inte skriva %s. Kontrollera att hemkatalogen är skrivbar."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr ""
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr "AppImage-integrering: aMule lades till i programmenyn (%d skalgenvägar under ~/.local/bin)."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -92,83 +178,173 @@
 "\n"
 "Restart aMule now?"
 msgstr ""
+"aMule har lagts till i programmenyn. Du kan nu starta det från programlistan, och startaren kör samma AppImage.\n"
+"\n"
+"På vissa skrivbord kan aMule behöva startas om för att dockans eller aktivitetsfältets ikon ska kopplas till den nya startaren. Moderna Wayland-kompositorer (GNOME, KDE) upptäcker detta direkt, men en omstart är en säker reserv om ikonen förblir generisk.\n"
+"\n"
+"Starta om aMule nu?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
-msgstr ""
+msgstr "aMule installerat"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
-msgstr ""
+msgstr "Starta om nu"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
-msgstr ""
-
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "FEL"
+msgstr "Senare"
 
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "Kunde inte öppna ED2KLinks-filen"
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
 msgstr "VARNING: Du kan inte lägga till dig själv som källa för en eD2k-länk när du har lowid."
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+"Ett annat program håller aMules låsfil:\n"
+"\n"
+"%s\n"
+"\n"
+"Det är inte en körande kopia av aMule, så det finns inget att ta fram. Stäng det andra programmet eller ta bort låsfilen när aMule inte körs."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+"aMule-demonen (amuled) körs redan som processen %d och använder den här konfigurationen.\n"
+"\n"
+"Den har inget fönster att ta fram. Anslut till den med amuleGUI eller stoppa demonprocessen innan du startar aMule."
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr "aMule kan inte starta"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr "Begränsade behörigheterna på %s till enbart ägaren."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr "Samlingsfilen hittades inte: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Ogiltig eller tom samlingsfil: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr "Inga användbara länkar i samlingen: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 "Hoppade över %u oanvändbar länk i samlingen: %s"
+msgstr1 "Hoppade över %u oanvändbara länkar i samlingen: %s"
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Kan inte konvertera magnetlänk till eD2k: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Ogiltig eD2k-länk ”%s” – FEL: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Nu, avslutar huvudapplikationen..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Avslutar  amuleweb-instansen med pid '%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Dödar amuleweb-instansen med pid '%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Avslutar  amuleweb-instansen med pid '%d' ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Dödar amuleweb-instansen med pid '%d' ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule VidAvslut: Avslutar huvudprogrammet."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "aMules avslutning slutförd"
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Minnes-debug-resultat för aMules avslut"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr "Binder aMules peer-to-peer-trafik till gränssnittet: %s (HTTP-uppdateringar använder standardrutten)"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr "Binder all nätverkstrafik till gränssnittet: %s"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr "VARNING: det konfigurerade nätverksgränssnittet ”%s” hittades inte – trafiken är INTE bunden till det och kan lämna via standardrutten. Kontrollera gränssnittsnamnet i Inställningar."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr "VARNING: bindning till nätverksgränssnittet ”%s” kräver förhöjda behörigheter och tillämpades INTE – trafiken kan lämna via standardrutten. Ge behörigheten (till exempel ”sudo setcap cap_net_raw+ep” för aMule-binärfilen) eller kör med tillräckliga behörigheter."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr "VARNING: kunde inte binda till nätverksgränssnittet ”%s” – trafiken kan lämna via standardrutten."
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Din plats har ändrats till systemets standard på grund av en konfigurationsändring. Ledsen."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -176,56 +352,104 @@
 "\n"
 "EC-konfiguration"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Lösenord sparad och extern anslutning aktiverad."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/amule.cpp:788
-#, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i server hittad i server.met"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr "Initierar nätverk"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "Läser in tillfälliga filer"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Läser in tillfälliga filer (%u av %u)"
+
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "Läser in delade filer"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "Läser in delade filer (%u)"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "Startar"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Nätverksbootstrap"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
+"aMule saknar nätverkets bootstrapfiler.\n"
+"Välj vilka som ska hämtas:"
 
-#: src/amule.cpp:797
-#, fuzzy
-msgid "Network bootstrap"
-msgstr "Nätverk"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "eD2k-serverlista (server.met)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Kad-bootstrapnoder (nodes.dat)"
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "webbservern kör på pid %d"
 
-#: src/amule.cpp:886
-#, fuzzy
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
-msgstr "Du vill köra webbservern vid uppstart, men binärfilen amuleweb kan inte köras. Vänligen installera paketet med aMule webservern eller compilera aMule med --enable-webserver och kör make install"
+msgstr "Du har begärt att webbservern ska köras vid start, men binärfilen amuleweb kan inte köras. Installera paketet som innehåller aMules webbserver, eller bygg aMule från källkod med -DBUILD_WEBSERVER=YES och installera det."
+
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "FEL"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr "Kunde inte skriva amuleapis EC-token till %s; amuleapi faller tillbaka till sitt konfigurerade lösenord."
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "webbservern kör på pid %d"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Du har begärt att amuleapi ska köras vid start, men binärfilen amuleapi kan inte köras. Installera paketet som innehåller aMules REST API-server, eller bygg aMule från källkod med -DBUILD_AMULEAPI=YES och installera den."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr "Extern anslutning: kunde inte binda till ”%s”, lyssnar endast på 127.0.0.1."
 
-#: src/amule.cpp:969
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Kunde inte binda portarna till specificerad adress: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, 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/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -240,48 +464,48 @@
 "\n"
 "Kontrollera ditt nätverk för att se att porten är öppen för ut och in-trafik."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Misslyckades med att skapa OnlineSig-fil"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Misslyckades med att skapa aMule OnlineSig-fil"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr "Den valda platsen verkar inte vara installerad på din burk. (OBS: Jag försöker ändå)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Det här är första gången du kör aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Den här versionen är en testversion, uppdateras dagligen, och\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "vi ger inga garantier att den inte förstör allt, bränner ner huset,\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "eller dödar din hund. Men den *bör* vara säker att använda.\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr "Mer information, support och nya versioner kan hittas på vår hemsida,\n"
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "https://amule-org.github.io, eller i vår IRC-kanal #aMule på irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Rapportera gärna eventuella fel på https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -289,1583 +513,1869 @@
 "Katalogen för Online Signaturefiler som du angav är OGILTIG!\n"
 " OnlineSignatur kommer vara INAKTIVERAD tills du ändrar inställningarna."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Serverns hostname underrättad"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr "Mediemetadata: den undersökta filen är inte längre känd, resultatet kasseras (%s)"
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Förallokerad diskutrymme för filen '%s' misslyckades: %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "FEL: kan inte öppna loggfilen"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "VARNING: loggfilen är tom. Någonting är fel."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Loggen har nollställts"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Servermeddelande: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr "Avslutade nerladdningen av %s eftersom begärd fil inte är nyare."
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Misslyckades med att hämta nodlistan."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Misslyckades med att öppna den hämtade versionskontrollfilen"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Korrupt versionskontrollfil"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Du använder en gammal version av aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr "Din aMuleversion är %i.%i.%i och den senaste versionen är %li.%li.%li"
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Den senaste versionen kan alltid hittas på https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr "VARNING: Din version av aMuled är gammal: %i.%i.%i < %li.%li.%li"
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Din version av aMule är den senaste."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Misslyckades med att hämta versionskontrollfilen"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Användare: %s | Filer: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Inga nätverk valda"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "med LowID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "med HighID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Ansluten till %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Ansluter till %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Frånkopplad från eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad startad."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad stoppad."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Ansluten till Kad (ok)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Ansluten till Kad (brandvägg)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Frånkopplad från Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr "Kadnätverket kan inte användas om UDP-porten är inaktiverad i inställningarna, startar inte."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kadnätverket är inaktiverad i inställningarna, ansluter inte."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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 "FEL: aMule-deamon kan inte användas när externa anslutningar är inaktiverade. För att aktivera Externa Anslutningar, använd en normal aMule, starta amuled med optionen --ec-config eller sätt nyckeln \"AcceptExternalConnections\" till 1 i filen ~/.aMule/amule.conf"
 
-#: src/amuled.cpp:145
-#, fuzzy
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
-msgstr "FEL: Ett giltigt lösenord krävs för att använda externa anslutningar och aMule daemon kan inte användas utan externa anslutningar. För att köra aMule deamon måste du ställa in \"ECPassword\"-fältet i filen  ~/.aMule/amule.conf med ett lämpligt värde. Kör amuled med flaggan --ec-config för att ställa in lösenordet. Mer info finns på https://amule-org.github.io/docs"
+msgstr "FEL: Ett giltigt lösenord krävs för externa anslutningar, och aMule-daemonen kan inte användas utan dem. För att köra aMule-daemonen måste du ange ett lämpligt värde för fältet ”ECPassword” i filen ~/.aMule/amule.conf. Kör amuled med flaggan --ec-config för att ange lösenordet. Mer information finns på https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - startar timern"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: lägger mig i bakgrunden - vi ses"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Kan inte skapa Pid-fil"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "FEL: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Det här är aMule %s baserad på eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Kör på %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Besök https://github.com/amule-org/amule/releases/latest för att se om en ny version finns tillgänglig."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ALLVARLIGT FEL: Kunde inte skapa Timer"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMule fjärrkontroll"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "Fel! Kunde inte läsa in inställningarna"
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Nätverk"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"'Alla-Platformar' p2p-klient basserad på eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Sökningar"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr ""
-"Webbsida: https://amule-org.github.io \n"
-"\n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Hämtningar"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Delade filer"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr ""
-"Webbsida: https://amule-org.github.io \n"
-"\n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Klienter"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Meddelanden"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Statistik"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Delar av aMule är baserad på \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Inställningar"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Peer-to-peer routing baserad på XOR metric.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr "Navigera"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "Ledigt utrymme: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Meddelande"
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "Ny version tillgänglig"
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"En ny version av aMule (%s) finns.\n"
+"\n"
+"Du använder %s.\n"
+"\n"
+"Vill du öppna hämtningssidan?"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "aMule-dialog avslutad"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Ansluter"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Frånkopplad"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Via brandvägg"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Ansluten"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Ansluter"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Av"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Stoppa de nuvarande anslutningsförsöken"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Koppla från"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr "Kärna"
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Version"
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Koppla från de nätverk som nu är anslutna."
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr "Kärnan och aMuleGUI har olika versioner."
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr "Kärnan och aMuleGUI har samma version."
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Anslut"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adress"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Anslut till de nätverk som är aktiverade."
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
 
-#: src/amuleDlg.cpp:943
-#, fuzzy, c-format
+#: src/amuleDlg.cpp
+#, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
-msgstr "Upp: %.1f(%.1f) | Ner: %.1f(%.1f)"
+msgstr "Upp: %.1f%s (%.1f) | Ned: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "MB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " MiB/s"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " KiB/s"
 
-#: src/amuleDlg.cpp:947
-#, fuzzy, c-format
+#: src/amuleDlg.cpp
+#, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
-msgstr "Upp: %.1f | Ner: %.1f"
+msgstr "Upp: %.1f%s | Ned: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Ansluten)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Frånkopplad)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Vill du verkligen avsluta %s?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Bekräfta avslutning"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Kör kommando:"
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- standard -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Skin-mappen '%s' finns inte"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "Varning: Kan inte öppna skin-filen '%s' för läsning"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Nätverk"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Nätverksfönster"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Sökningar"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Sökfönster"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Hämtningar"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "Hämtningsfönster"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Delade filer"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Delade filer-fönster"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Meddelanden"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr "Klientfönster"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Meddelandefönster"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Statistik"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Statistiksgrafsfönster"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Inställningar"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Inställningsfönster"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Importera"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Partfile-importerings-verktyget"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Om"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Om/Hjälp"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "eD2k-nätverk"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kad-nätverk"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Inget nätverk"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "aMule fjärrkontroll"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Allvarligt fel: Kunde inte skapa Core Timer"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Anslut till fjärr-aMule"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Anslutningen förlorades"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr "Avbryt och avsluta"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "Återansluter … (försök %d)"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr "Nästa försök om %d s …"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+"Anslutningen till %s bröts.\n"
+"%s\n"
+"\n"
+"Gränssnittet är pausat tills anslutningen återställs."
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Allvarligt Fel: Kunde inte skapa Poll Timer"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Går till händelse-loop..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
-msgstr ""
+msgstr "Anslutningen misslyckades. Kontrollera värddator, port och lösenord."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Fjärr-GUI EC händelse-hanterare"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "Anslutning misslyckades. Kan inte ansluta till %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Stänger ner"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Anslutning stängd - troligen har aMule avslutats"
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Återanslutningsförsöket fick tidsgräns; försöker igen."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
+"Tidsgränsen för anslutningen överskreds. Det gick inte att nå %s:%d inom den avsatta tiden.\n"
+"Kontrollera värddatorn, porten och att aMule körs med externa anslutningar aktiverade."
+
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr "Anslutningen till fjärrkärnan bröts. Försöker återansluta …"
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Inaktiverad"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr "Återansluten till fjärrkärnan."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr "Fjärrkärnan startades om; läser in igen."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Återanslutningsförsök %d: ansluter till %s:%d"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr "Kunde inte starta återanslutning; försöker igen snart."
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Färdig"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Alla"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr "inte läsbar"
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr "hittades inte"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr "Kärnan avvisade dessa delade mappar:%s"
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Felaktig länk eller redan i listan."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr "Demonprocessen avvisade begäran."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "Kunde inte ta bort kategorin: %s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr "Kan inte skapa mappen '%s' för kategori '%s', behåller mappen '%s'."
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr "Fjärrkärnan skickade inkonsekventa data för ”%s” (delstatus %d, förväntade %d). Fillistan kan visa felaktig information; återanslut för att rensa den."
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Misslyckades med att hämta filer från användaren '%s'"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Letar efter en kompis för lowid-anslutning"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Falsk eMule-version %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Falsk eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Falsk eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (baserad på eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Smeknamn: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Begärd: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Filstatistik för den här gången: Accepterat %d av %d begäran, %s överfört\n"
 msgstr1 "Filstatistik för den här gången: Accepterat %d av %d begäran, %s överfört\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Filstatistik sedan början: Accepterat %d av %d begäran, %s överfört\n"
 msgstr1 "Filstatistik sedan början: Accepterat %d av %d begäran, %s överfört\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Begärde okänd fil"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Meddelande filtrerat från '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Nytt meddelande från '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Användare %s (%u) begärde sharedfiles-list för icke exiterade mapp '%s' -> Ignorerad"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Misslyckades med att hämta filer från användaren '%s'"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "VARNING: %s kan inte öppnas."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "VARNING: Avbruten fillista korrupt, har inkorrekt header."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "IO-fel vid läsning av %s fil: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Fel vid sparandet av %s fil: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Ange Captcha"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Kategori"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Ny kategori"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Välj en mapp för inkommande filer"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Du måste ange ett namn för kategorin!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Du måste ange en sökväg för kategorin!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr "Kunde inte skapa inkommande-mapp för kategorin. Ange giltig sökväg!"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Chat startad: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Ansluten till klient ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Ansluter till klient ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Kunde inte ansluta till klient / anslutningen bröts ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr "*** Du klarade captcha-testet och användaren har fått ditt meddelande ***"
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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 "*** Ditt svar på captcha var fel och ditt meddelande har ignoretats. Du kan begära ett nytt captcha genom att skicka ett nytt meddelande. ***"
 
-#: src/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Chat"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Stäng flik"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Stäng alla flikar"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Stäng andra flikar"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Lägg till i vänner"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Visa &Details"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Ta bort från vänner"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Skapa vän-spår"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Visa filer"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Skicka meddelande"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Skicka meddelande till användare"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Meddelande att skicka:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Du kan endast ha ett vän-spår.\n"
+" Endast ett spår tilldelades. "
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Flerval"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 "Lägga till %u klient i din vänlista?"
+msgstr1 "Lägga till %u klienter i din vänlista?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Ta bort %u klient från din vänlista?"
+msgstr1 "Ta bort %u klienter från din vänlista?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 "Kunde inte lägga till %u vald klient i din vänlista: ingen adress är känd för den."
+msgstr1 "Kunde inte lägga till %u valda klienter i din vänlista: inga adresser är kända för dem."
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Begära delade filer från %u klient?"
+msgstr1 "Begära delade filer från %u klienter?"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr "En anslutning öppnas till var och en av dem."
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Kreditfilen laddad, %u klient är känd"
 msgstr1 "Kreditfilen laddad, %u klienter är kända"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - Krediten utgått för %u klient!"
 msgstr1 " - Krediten utgått för %u klienter!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Ingen 'cryptkey.dat'-fil funnen, skapar."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Klientdetaljer"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Stöds"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Stöds inte"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Inaktiverad"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Ansluten"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f KiB/s"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Namn"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "Programvara"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP-adress"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Ursprung"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr "Först sedd"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr "Senast sedd"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "Sessioner"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Uppladdningshastighet"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "Hämtningshastighet"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "Totalt uppladdat"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "Totalt hämtat"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "DL/UP-modifierare"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr "Uppkopplad nu"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Inte färdig"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Bad Guy"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Verifierad - OK"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Inte tillgänglig"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "Kunde inte begära delade filer från %u vald klient."
+msgstr1 "Kunde inte begära delade filer från %u valda klienter."
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Filer"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Uppladdad"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Nedladdad"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "Hämtar från"
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr "Laddar upp till"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Aktiv"
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr "Känd"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Användare %s (%u) begärde din sharedfiles-lista -> Accepterad"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Användare %s (%u) begärde din sharedfiles-lista -> Nekad"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Användare %s (%u) begärde lista på utdelade mappar -> Accepterad"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Användare %s (%u) begärde lista på utdelade mappar -> Nekad"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "Användare %s (%u) begärde din sharedfiles-lista för mapp '%s'  -> Accepterad"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "Användare %s (%u) begärde din sharedfiles-lista för mapp '%s'  -> Nekad"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Användare %s (%u) delar mapp '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Användare %s (%u) skickade obegärda delade mappar."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "Användare %s (%u) skickade sharedfiles-list för mappen '%s'"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "Användare %s (%u) färdig med sändningen av sharedfiles-listan"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Användare %s (%u) skickade oönskad sharedfiles-lista"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "Användare %s (%u) nekade tillgång till listan för delade mappar/filer"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Filkommentarer"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Användarnamn"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Filnamn"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Rankning"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr "Kunde inte starta en Kad-sökning"
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad-sökning kan inte göras om Kad inte är igång"
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "Söker efter kommentarer i Kad..."
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Inga kommentarer"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u kommentar"
 msgstr1 "%u kommentarer"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr "Bannlyser klient %s för skickandet av %s korrupt data av totalt %s för filen '%s'"
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Kunde inte hämta lands-data för '%s'."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Auto Lå"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Auto Nej"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Auto Hö"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Mycket låg"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Låg"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Hög"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Mycket hög"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Version"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Frågar"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Ansluter via server"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Kö full"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "I kö"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Hämtar"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Tar emot hashset"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Inga behövda delar"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Kan inte ansluta LowID till LowID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "För många anslutningar"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Ansluter via Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "För många Kad-anslutningar"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Bannlyst"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Anslutningsfel"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Fjärrkö full"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Gammal MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Ny MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule-kompatibel"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Lokal server"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Fjärrserver"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Källutbyte"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Passiv"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Länk"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Käll-frön"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Sökresultat"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Färdig"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "Pågår"
 
-#: src/DataToText.cpp:145
-#, fuzzy
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "FEL: Slut på diskutrymme"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "FEL: Hittade inte Partmet"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "FEL: IO-fel"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "FEL: Mysslyckades!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Lagd i kö"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Laddar redan ner"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Okänd eller trasig temp-fil-format"
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr "Den här katalogen är en del av en rekursiv delning. Om du vill ta bort den måste du sluta dela eller ändra den rekursiva delningens rot ovanför den."
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr "Kan inte sluta dela inuti en rekursiv delning"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr "Kan inte ändra inuti en rekursiv delning"
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Del"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Storlek"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Överfört"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Hastighet"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Förlopp"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Källor"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Prioritet"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Status"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Återstående tid"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Senast sedd komplett"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Senast mottagen"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Är du säker på att du vill ta bort vald fil?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Är du säker på att du vill ta bort alla valda filer?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Återkoppling från: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Auto"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Stoppa"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Fortsätt"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Ta bort färdiga"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Byt alla A4AF till denna fil nu"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Byt alla A4AF till denna fil (Auto)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Byt alla A4AF till någon annan fil nu"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Utökade inställningar"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "Visa i filhanteraren"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Visa fil &details"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Visa alla kommentarer"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Kopiera magnet URI till urklipp"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Kopiera eD2k &link till urklipp"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Kopiera återkoppling till urklipp"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Hämta %s för den här filen:"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "Otilldela"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Koppla till kategori"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "&Öppna filen"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Är du säker på att du vill ta bort vald fil?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Är du säker på att du vill ta bort alla valda filer?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Återkoppling från: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Ange nytt namn för den här filen:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Byt namn på fil"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f kB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H.%M.%S"
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%.1f MiB/s"
+msgstr "%.1f MiB/s"
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "Hämtningar (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"För att slippa den här varningen i varje förhandsvisning,\n"
-"Ställ in önskad videospelare i inställningar (standard är %s)."
+msgid "Total queue size: %s"
+msgstr "Total köstorlek: %s"
 
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Förhandsvisning av fil"
-
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "FEL: Kunde inte starta externa mediaspelaren! Kommado: `%s'"
-
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Sparar PartFile %u av %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Alla PartFiles sparade."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Laddar temp-filer från %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Laddar PartFile %u av %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "Fel: Kunde inte ladda backupfilen. Sök i https://github.com/amule-org/amule/discussions efter .part.met recovery solutions."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Alla PartFiles laddade."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Inga PartFiles hittade"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "Hittade %u part file"
 msgstr1 "Hittade %u part filer"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Filsystemet för Temp-mappen kan inte hantera stora filer."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Filsystemet för inkommande filer kan inte hantera stora filer."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Hämtar %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Du försöker redan hämta filen '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Du har redan filen ”%s” (begärd som ”%s”)"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Du har redan filen '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Du försöker redan hämta filen %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Kan inte konvertera magnetlänk till eD2k: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Ökänd protokoll för filen: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Kunde inte lägga till %u länk (se loggen för detaljer)."
+msgstr1 "Kunde inte lägga till %u länkar (se loggen för detaljer)."
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Felaktig eD2k-länk! FEL: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "Klienten skickade paket efter att autentisering misslyckades. "
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Extern anslutning stängd."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Externa anslutningar inaktiverade pga. tomt lösenord!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Externa anslutningar inaktiverade i konfigfilen"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Ny extern anslutning accepterad"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "FEL: Kunde inte acceptera ny extern anslutning"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Extern anslutning nekad pga. tomt lösenord i inställningarna!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Ansluter klient: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Okänd version"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "Fel EC-versions-ID, kanske är det inkompatibla binärfiler. Använd core och remote från samma snapshot."
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "Du kan inte ansluta en release-version från en godtycklig utvecklings-snapshot! *suck* Trolig krasch förhindrad "
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Fel protokoll-version"
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Saknar tag för protokoll-version"
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "För många misslyckade anslutningsförsök; försök igen om %d sekunder."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "Autentisering misslyckades: fel hash specificerad som EC-lösenord"
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr "Autentisering misslyckades: klienten erbjöd en krypterad extern anslutning men skickade ingen användbar nyckel."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr "Autentisering misslyckades: den här aMule-instansen kräver en krypterad extern anslutning, och klienten förhandlade inte fram en sådan."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr "Autentisering misslyckades: klienten kunde inte bekräfta den krypterade sessionen."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Autentisering misslyckades: fel lösenord"
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Autentisering misslyckades: saknar lösenord"
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Felaktig begäran, vänligen autentisera först."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Tillgång beviljad."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Skickade felmeddelandet \"%s\" till klienten."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Obehörigt åtkomstförsök från %s. Anslutning stängd."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Extern PartFile kommando misslyckades: FileHash hittades inte: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "FileHash hittades inte: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "HOPPSAN!  OpCode-bearbetningsfel!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Server inte inlaggd"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "server inte hittad: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "måste definiera server som ska tas bort"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k är inaktiverad i inställningarna."
 
-#: src/ExternalConn.cpp:1368
-#, fuzzy
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr "Ingen adress är känd för den vännen ännu."
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
-msgstr "Filen hittades inte."
+msgstr "Vännen hittades inte."
 
-#: src/ExternalConn.cpp:1377
-#, fuzzy
+#: src/ExternalConn.cpp
 msgid "Client not found."
-msgstr "Filen hittades inte."
+msgstr "Klienten hittades inte."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
-msgstr ""
+msgstr "EC_TAG_FRIEND_SHARED kräver EC_TAG_FRIEND eller EC_TAG_CLIENT."
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Sök pågår. Visar snart svaren!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Websök från fjärrgränssnitt är meningslöst."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr "En bläddring är inte en sökning som kan startas."
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Sök pågår. Visar snart svaren!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Inga poäng för graf."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Din klient är inte konfigurerad för denna detaljnivå."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Extern Anslutning: avstängning begärd"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Håller redan på att stänga ner."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: lägger till länk '%s'."
 
-#: src/ExternalConn.cpp:1832
-#, fuzzy, c-format
+#: src/ExternalConn.cpp
+#, c-format
 msgid "%d of %d links failed (invalid or already on list)."
-msgstr "Felaktig länk eller redan i listan."
+msgstr "%d av %d länkar kunde inte läggas till (ogiltiga eller redan i listan)."
+
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr "Versionskontroll begränsad; försök igen om en stund."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr "Versionskontroll är inte tillgänglig på den här demonprocessen."
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Filen hittades inte."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Ogiltigt filnamn."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Kunde inte byta namn på fil."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr "Klienten kunde inte växlas till den filen."
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr "Kunde inte spara amuleapi-lösenordet: %s"
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "Ingen sådan kategori."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr "Felaktigt utformad kategoribegäran."
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr "Standardkategorin kan inte tas bort."
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "Chattsessions-ID saknas"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "Ingen sådan chattsession"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Extrahering av mediemetadata är inaktiverad i inställningarna"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr "Filen är inte berättigad till extrahering av mediemetadata (inte en ljud-/videofil eller en ofullständig hämtning)"
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "Tomt chattmeddelande"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "Okänt chattmål"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad inaktiverad i inställningarna."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Redan ansluten till eD2k."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "Ansluter till eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Redan ansluten till Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Ansluter till Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Alla nätverk är inaktiverade."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Koppla ifrån eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Frånkopplad från Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Extern anlutning: Felaktig opcode mottagen: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Felaktig opcode (fel protokollversion?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Okänd tillägg '%s' för kommandot '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Okänd kommando '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1873,7 +2383,7 @@
 "\n"
 "Det här kommandot har inga argument.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1881,7 +2391,7 @@
 "\n"
 "Det här kommandot måste ha ett argument.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1889,7 +2399,7 @@
 "\n"
 "Det här kommandot är inte komplett, du måste använda ett av tilläggen nedan.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1897,11 +2407,11 @@
 "\n"
 "Tillgängliga tillägg:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Tillgängliga kommandon:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1912,17 +2422,17 @@
 "Kommandon är inte skiftlägeskänsliga.\n"
 "Skriv '%s <command>' för att få detaljerad info om <command>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Avslutar programmet."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Visa hjälp."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1930,7 +2440,7 @@
 "För att få hjälp om ett kommando, skriv 'help <command>'.\n"
 "För att se en lista över alla kommandon, skriv 'help'.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1941,46 +2451,46 @@
 "Använd '%s' för kommandolista\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Syntaxfel!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "Fel när kommandot skulle utföras - ska aldrig hända! Vänligen rapportera buggen\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Det här kommandot ska inte ha några parametrar."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Det här kommandot måste ha parametrar."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Ogiltigt argument."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Det här är inte ett komplett kommando."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Skriv '%s' för att få mer hjälp.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Det här är %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Det här är %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1988,7 +2498,7 @@
 "\n"
 "Skapar klient...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1997,7 +2507,7 @@
 "\n"
 "Ok, avslutar %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2011,118 +2521,370 @@
 "\n"
 "Avslutar...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Visa den här hjälptexten."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Värd där aMule körs. (standard: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "aMules port for extern anslutning. (standard: 4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Lösenord för extern anslutning"
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Läs in konfiguration från fil."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Skriv inte någon output till stout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Använd verbose - visa även debug-meddelanden."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Ställer in program locale (språk)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Skriv kommandon för inställningar till configfilen."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Skapar config-fil baserad på aMules configfil."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Skriv ut programversion."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr "Kryptera inte sessionen för extern anslutning. Kryptering är som standard på när fjärranslutna aMule stöder den; om den stängs av kan allt efter inloggningen läsas och ändras av vem som helst på vägen."
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
-msgstr ""
+msgstr "Tvinga ZLIB-komprimering oavsett den uppringda IP-adressens lokalitet (användbart när servern nås genom en VPN-tunnel som löses till en LAN-IP-adress)."
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr "Lägg till en kopia av all konsolutdata i den här loggfilen (standard: <config-dir>/amuleapi.log)."
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr "Skriv ingen loggfil; skriv endast till konsolen."
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Fildetaljer"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% färdig"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Förhandsvisning av fil"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "FEL: Kunde inte starta externa mediaspelaren! Kommado: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr "Den konfigurerade videospelaren hittades inte: %s"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr "Kan inte öppna ”%s”: filen finns inte på den här datorn."
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr "Förhandsvisning av en ofullständig hämtning kräver en videospelare: den delvis hämtade filen har ingen typ som systemet kan öppna på egen hand. En kan anges i Inställningar → Allmänt."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr "FEL: Kunde inte öppna ”%s” med standardprogrammet."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "FEL: Kunde inte visa ”%s” i filhanteraren."
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "Mobil/4G-5G (20/5 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL (24/1 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL (50/10 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Kabel (200/20 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Fiber 300 (300/100 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "Fiber Gigabit (1000/1000 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr "Förstagångsinställning för aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "Välkommen till aMule!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+"Den här korta inställningen hjälper dig att ansluta. Du kan ändra\n"
+"alla dessa inställningar senare i Inställningar."
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "Välj ett smeknamn som andra noder ser:"
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr "Anslutning och bandbredd"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+"Välj alternativet som bäst motsvarar din Internetanslutning,\n"
+"eller ange gränserna för uppladdning och hämtning direkt nedan."
+
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "Anslutningshastighet:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr "Annat/ange manuellt"
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "Uppladdningsgräns (KiB/s, 0 = obegränsat):"
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "Hämtningsgräns (KiB/s, 0 = obegränsat):"
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "Nätverk och portar"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr "aMule kan använda två nätverk. Vi rekommenderar att båda är aktiverade."
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Standard TCP-port "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Utökad UDP-port (Kad / global sökning) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Aktivera UPnP för vidarebefordring av routerport"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+"Låter aMule be din router vidarebefordra portarna ovan så att andra\n"
+"noder kan nå dig (ett ”HighID”). Stäng av om routern\n"
+"inte stöder UPnP eller om du vidarebefordrar portar manuellt."
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr "Bootstrapfiler"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+"För att komma i gång måste aMule känna till några noder.\n"
+"Välj vilka listor som ska hämtas nu:"
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Dina nodlistor finns redan på plats – inget att hämta."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Auto-uppdatera serverlistan vid start"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr "Integreringar (valfritt)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+"Välj hur aMule integreras med systemet. Du kan\n"
+"ändra allt detta senare i Inställningar."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "Starta aMule automatiskt när jag loggar in"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr "Registrera aMule för ed2k://-länkar"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr "Registrera aMule för magnet:-länkar"
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr "Endast eD2k-kompatibla magnetlänkar. Lämna avstängt om du använder en BitTorrent-klient."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr "Öppna .emulecollection-filer med aMule"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr "Mappar (valfritt)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+"Standardvärdena passar de flesta. Ändra dem om du\n"
+"vill hämta till en annan disk, till exempel en större."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Målmapp för hämtningar"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Bläddra"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Alla filer i den här mappen delas med andra noder)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Mapp för temporära nerladdningsfiler"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+"Utifrån detta tillåter aMule upp till %i källor per fil\n"
+"och %i klientanslutningar."
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr "Visa den här installationsguiden igen nästa gång du startar aMule?"
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr "Installationen är inte klar"
 
-#: src/FriendList.cpp:123
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Kunde inte öppna vän-list-filen 'emfriends.met' för läsning!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Kunde inte öppna vän-list-filen 'emfriends.met' för skrivning!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr "Ingen adress är känd för vännen ”%s” ännu; det går inte att bläddra hos den."
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "KRITISKT - ingen klient för StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Vänner"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Visa &Details"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Lägg till en vän"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Ta bort vän"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Skicka &Message"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Visa filer"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Skapa vän-spår"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr "Ingen adress är känd för vännen ”%s” ännu; det går inte att skicka meddelande till den."
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Är du säker på att du vill ta bort vald vän?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Är du säker på att du vill ta bort valda vänner?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2130,986 +2892,1283 @@
 "Du kan endast ha ett vän-spår.\n"
 " Endast ett spår tilldelades. "
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Flerval"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Du kan endast ha ett vän-spår.\n"
-" Endast ett spår tilldelades. "
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Skicka meddelande till användare"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Meddelande att skicka:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Ta bort från vänner"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Skicka meddelande"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Växla till den här filen"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr "Färgförklaring"
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "På kö: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Frågade om en annan fil"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Väntar på ett uppladdningsspår"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "På kö: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Skickar"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Ingen"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Nej"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Ja"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Kunde inte öppna MaxMindDB-databasen ”%s”: %s"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Hämtar..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "HTTP-hämtning avbryten"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "URLen för hämtningen kan inte vara tom"
 
-#: src/HTTPDownload.cpp:246
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Failed to create HTTP request for %s"
-msgstr "Misslyckades med att hämta filer från användaren '%s'"
+msgstr "Kunde inte skapa HTTP-begäran för %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
-msgstr ""
+msgstr "HTTP-hämtning: tom svarstext för %s"
 
-#: src/HTTPDownload.cpp:349
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Could not move downloaded file to %s"
-msgstr "Mapp för temporära nerladdningsfiler"
+msgstr "Kunde inte flytta den hämtade filen till %s"
 
-#: src/HTTPDownload.cpp:353
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "Downloaded %s (%llu bytes)"
-msgstr "Hämtat %d bytes"
+msgstr "Hämtade %s (%llu byte)"
 
-#: src/HTTPDownload.cpp:358
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "The URL %s returned: %i"
-msgstr "URLen %s returnerade: %i - Fel (%i)!"
+msgstr "URL:en %s returnerade: %i"
 
-#: src/HTTPDownload.cpp:365
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp
+#, c-format
 msgid "HTTP download failed for %s: %s"
-msgstr "HTTP-hämtning avbryten"
+msgstr "HTTP-hämtning misslyckades för %s: %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
-msgstr ""
+msgstr "HTTP 401 – obehörig för %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
-msgstr ""
+msgstr "Migrerade befintlig GeoLite2-Country.mmdb till %s"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr ""
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr "%s är inte en läsbar MaxMindDB-fil – kasserar den. En ny kopia hämtas vid nästa start eller nu via Inställningar → IP2Country → ”Uppdatera nu”."
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr ""
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "IP2Country: MaxMind har valts som GeoIP-källa men ingen licensnyckel är konfigurerad. Öppna Inställningar → IP2Country, klistra in din kostnadsfria MaxMind-licensnyckel och klicka på ”Uppdatera nu”."
+
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "IP2Country: Anpassad URL har valts som GeoIP-källa men ingen URL är konfigurerad. Öppna Inställningar → IP2Country och ange en URL som pekar på en .mmdb (eller .gz/.tar.gz som innehåller en)."
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
-msgstr ""
+msgstr "IP2Country: kunde inte slå upp en GeoIP-hämtnings-URL."
 
-#: src/IP2Country.cpp:157
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download new %s from %s"
-msgstr "Hämta ny GeoIP.dat från %s"
+msgstr "Hämta ny %s från %s"
 
-#: src/IP2Country.cpp:191
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Download of %s file failed, aborting update."
-msgstr "Hämtning av GeoIP.dat-fil misslyckades, avbryter updateringen."
+msgstr "Hämtningen av filen %s misslyckades; avbryter uppdateringen."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Kunde inte ta bort %s filen, avbryter uppdateringen."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Kunde inte byta namn på %s filen, avbryter uppdateringen."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "Lyckad uppdatering av %s"
 
-#: src/IP2Country.cpp:228
-#, fuzzy, c-format
+#: src/IP2Country.cpp
+#, c-format
 msgid "Error updating %s"
-msgstr "Fel vid uppdatering av GeoIP.dat"
+msgstr "Fel vid uppdatering av %s"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
-msgstr ""
+msgstr "Hämtningen från DB-IP misslyckades för innevarande månad – försöker igen med föregående månads URL."
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "Kunde inte hämta %s från %s"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Kunde inte hämta lands-data för '%s'."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Laddar IP filter 'ipfilter.dat' och 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Kunde inte ladda ipfilter.dat-fil '%s', okänt format upptäcktes."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "Kunde inte ladda ipfilter.dat-fil '%s', kunde inte öppna filen."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "Laddade %u IP-range från '%s'."
 msgstr1 "Laddade %u IP-ranges från '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u felaktigt linje kastades."
 msgstr1 "%u felaktiga linjer kastades."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Det gick inte att byta namn på ny %s fil, avbryter uppdateringen."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP-filter är redo"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap från \n"
-"kända klienter"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Aktuell"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Löpande medelvärde"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Sessionens genomsnittliga"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Noder (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Ogiltig ip till bootstrap"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Ogiltig port till bootstrap"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Fyll i alla fält som krävs"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Meddelande"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "Är du säker på att du vill hämta en ny nodes.dat-fil?\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Om du gör det tas dina nuvarande noder bort och Kademlias anslutning startas om."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Fortsätt?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: sökord för kort"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: sökord är redan på söklistan: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Det gick inte att läsa nodes.dat fil - för gammal. Denna version (0) stöds inte längre."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "Läs %u Kad-kontakt"
 msgstr1 "Läs %u Kad-kontakter"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Inga kontakter hittades, vänligen bootstrappa, eller ladda ner en nodes.dat fil."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Endast %d Kad-kontakt tillgänglig, nodes.dat inte skriven"
 msgstr1 "Endast %d Kad-kontakter tillgängliga, nodes.dat inte skriven"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "Skrev %d Kad kontakt"
 msgstr1 "Skrev %d Kad kontakter"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Kad-användare"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr "Kad-anteckningssökning efter ”%s” startades inte: Kad är inte anslutet"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr "Kad-anteckningssökning efter ”%s” startades inte: en anteckningsuppslagning körs redan för den här filen"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr "Kad-anteckningssökning efter ”%s” startades inte: filen finns inte i listan över delade filer, hämtningskön eller sökresultaten"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr "Kad-anteckningssökning efter ”%s” startades inte: en annan Kad-sökning (till exempel källsökning) använder redan filens hash – försök igen snart"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr "Kad-anteckningssökning efter ”%s” startades inte: PrepareLookup misslyckades"
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Filstorlek"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Dela-förhållande"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Uppladdad"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Begärda"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Accepterad"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Kompletta källor"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "VARNING: listan med kända filer skadad, innehåller ogiltig header."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Det gick inte att läsa posten i filen med kända filer, filen kan vara skadad"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Ogiltig post i filen med kända filer, filen kan vara skadad: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Systemets standard"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Albansk"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arabiska"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturiska"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baskiska"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgariska"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalanska"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Kinesiska (Förenklad)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Kinesiska (Traditionell)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Kroatiska"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Checkiska"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Danska"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Nederländska"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Engelska (Storbritannien)"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "Engelska (USA)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estniska"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Finska"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Franska"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galiciska"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Tyska"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Grekisk"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Hebreiska"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Ungerska"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Italienska"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japanska"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Koreanska"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "Lettiska"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Litauisk"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norska (nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Polska"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portugisiska"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portugisiska (Brasilien)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Romänska"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Ryska"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slovenska"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Spanska"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Svenska"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Turkiska"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukraina"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Okänd version %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Det går inte att få felbeskrivning för fel %d"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Hashing"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Färdigställer"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Färdig"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Pausad"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Felaktig"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Väntar"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Du måste ange ett icke-tomt lösenord."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Ogiltigt lösenord, inte en MD5-hash!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr "Kunde inte slå upp %s till en IPv4-adress."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Anslutningsfel"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-#, fuzzy
-msgid "External Connection lost — exiting."
-msgstr "Extern anslutning stängd."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
+msgstr "Extern anslutning bröts – avslutar."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "EC-anslutningen misslyckades. Tomt svar."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr "Kunde inte konfigurera anslutningskryptering. Anslutningen stängdes."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr "Kärnan förhandlade inte fram en krypterad anslutning. Den kan vara en äldre aMule utan krypteringsstöd, eller så kan anslutningen ha manipulerats. Om du vill ansluta utan kryptering stänger du av den i anslutningsinställningarna."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Extern Anslutning: Fel svar, handskakning misslyckades. Anslutning stängd."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Extern anslutning: demonprocessen kunde inte bevisa att den känner till lösenordet. Anslutningen stängdes."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Lyckades! Anslutning etablerad till aMule "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Lyckades! Anslutning etablerad."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Extern Anslutning: Åtkomst nekad på grund av: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Extern anslutning: Handskakning misslyckades."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr "Fel vid skapande av UDP-socket %s %d: %s"
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Asio tråd %d startad"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "FEL: Det gick inte att lyssna på TCP-port."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "FEL: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "VARNING: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr "Mediemetadata: ingen ffprobe-binärfil hittades. Installera ffmpeg eller ange ffprobe-sökvägen i inställningarna; längd, bithastighet och kodek extraheras inte."
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr "Mediemetadata: %s är borta, inget att extrahera"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr "Extraherar mediemetadata med ffprobe: %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr "Mediemetadata: ffprobe fick tidsgräns eller avbröts för %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr "Mediemetadata: ignorerar osannolikt stor ffprobe-utdata för %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr "Mediemetadata: kunde inte köra ffprobe (%s) – kontrollera inställningarna för mediemetadata"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr "Mediemetadata: ffprobe misslyckades (kod %d) för %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr "Mediemetadata: ffprobe hittade inget användbart i %s"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 "Extraheringen av mediemetadata är klar för %u delad fil (%u misslyckades)"
+msgstr1 "Extraheringen av mediemetadata är klar för %u delade filer (%u misslyckades)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 "Extraheringen av mediemetadata är klar för %u delad fil"
+msgstr1 "Extraheringen av mediemetadata är klar för %u delade filer"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 "%u ytterligare fil misslyckades med extrahering av mediemetadata (listas inte var för sig)"
+msgstr1 "%u ytterligare filer misslyckades med extrahering av mediemetadata (listas inte var för sig)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 "%u ytterligare delad fil är borta (listas inte var för sig)"
+msgstr1 "%u ytterligare delade filer är borta (listas inte var för sig)"
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Stäng"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopiera"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Klistra in"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Töm"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Markera alla"
 
-#: src/MuleTrayIcon.cpp:367
-#, fuzzy
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "KiB/s"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Obegränsad"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Visa aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Dölj aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
-msgstr "eD2k"
+msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
-msgstr "Ansluten"
+msgstr "Ansluten (LowID)"
 
-#: src/MuleTrayIcon.cpp:371
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
-msgstr "Ansluten"
+msgstr "Ansluten (HighID)"
 
-#: src/MuleTrayIcon.cpp:380
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
-msgstr " Kad: "
+msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
-msgstr "Ansluten till Kad (brandvägg)"
+msgstr "Ansluten (bakom brandvägg)"
 
-#: src/MuleTrayIcon.cpp:393
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
-msgstr "ServerIP: "
+msgstr "Server: "
 
-#: src/MuleTrayIcon.cpp:394
-#, fuzzy
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
-msgstr "Server-IP:"
+msgstr "Server-IP: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Inte ansluten"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP-port: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP-port: Inte klar"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP-port: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP-port: Inte klar"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Klientinformation"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Uppladdningsbegränsning"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Nerladdningsbegränsning"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Visa aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Koppla från"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Dölj aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Anslut"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Obegränsad"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule Fackmeny"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Hastighetsbegränsningar:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "UL: Inga"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "UL: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "DL: Inga"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "DL: %u"
 
-#: src/MuleTrayIcon.cpp:797
-#, fuzzy, c-format
+#: src/MuleTrayIcon.cpp
+#, c-format
 msgid "Download speed: %.1f%s"
-msgstr "Nedladdningshastighet: %.1f"
+msgstr "Hämtningshastighet: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
-#, fuzzy, c-format
+#: src/MuleTrayIcon.cpp
+#, c-format
 msgid "Upload speed: %.1f%s"
-msgstr "Uppladdningshastighet: %.1f"
+msgstr "Uppladdningshastighet: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Smeknamn: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Inget smeknamn vald!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "Klient-ID "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Servernamn: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "ServerIP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Inte ansluten"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online Signatur: Aktiverad"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online Signatur: Inaktiverad"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Upptid: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Delade filer: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Kö klienter: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Totalt DL: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Totalt UL: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k-länk: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr "Skapade %s på port %u"
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Verkställ"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr "VARNING! %s: Paket till %s kastades på grund av fel (%s) vid sändning."
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr "Klistra in eD2k- eller magnetlänkar här"
+
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "Lägg till länkar"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Klicka här för att lägga till eD2k-länken i textkontrollen till hämtningskön."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
-msgstr "Händelser visas här. För en fullständig lista över händelser, se i loggen i Serverfliken.."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr "Händelser visas här. En fullständig lista över händelser finns i loggen på fliken Nätverk."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Läser in..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Antal användare på servern du är ansluten till ..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Användare: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Användare som är anslutna till den aktuella servern och en uppskattning av det totala antalet användare."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Upp: 0.0 | Ner: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Nuvarande genomsnittliga uppladdnings- och nedladdningsnivåer. Om aktiverat visar siffrorna även overhead från klientkommunikationen."
 
-#: src/muuli_wdr.cpp:139
+#: src/muuli_wdr.cpp
 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 "Visar anslutningsstatus och aktiva överföringar. Röda pilar innebär att du för tillfället inte är ansluten, gula pilar betyder att du har låg ID (brandvägg) och gröna pilarna betyder att du har högt ID (Den optimala anslutningstypen)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Inte ansluten ..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Just nu ansluten server."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Sök"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Namn:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Typ"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Lokal"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Utökade Parametrar"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Filtrering"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Filtyp"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Alla"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Arkiv"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Audio"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "CD-avbildningar"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr "Diskavbildningar"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Bilder"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Program"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Texter"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Videoklipp"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Filändelse"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Min storlek"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "KiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "MiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "GiB"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Max storlek"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Tillgänglighet"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Filter:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Filtrerresultat"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Filter"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Invertera resultat"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Dölj kända filer"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr "Återställ filter"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Starta"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Mer"
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "Utöka"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
-msgstr ""
+msgstr "Be Kad-noder som redan svarat att utvidga sökningen. Varje klick frågar nästa närmaste nod efter fler kontakter (KADEMLIA_FIND_VALUE_MORE), vilket visar ytterligare filträffar som sökningens ursprungliga alfa-gräns inte nådde."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Stoppa"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Hämta"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Nedladdning i kategori"
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "Rensa sökresultat"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Återställ fält"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Resultat"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Rensar färdiga nedladdningar"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Filter:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Filkällor:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Allmänt"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Hela namnet :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Hela namnet"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met-fil"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Hash"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met-fil :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Hash :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Filstorlek :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Partfilestatus :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Senast sedd komplett :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Filstorlek"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Överför"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Hittade Källor :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Källor som överför :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Filepart-antal :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Tillgänglig :"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Datahastighet :"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Hämta Aktiv Tid: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Överförd :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Färdig storlek :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Partfilestatus"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Senast sedd komplett"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Hittade Källor"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Källor som överför"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Filepart-antal"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Tillgänglig"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Datahastighet"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Hämta Aktiv Tid"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Färdig storlek"
+
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligent korruptionshantering"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Förlorat till korruption :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Vunnits genom komprimering :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Paket sparad av I.C.H. :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Förlorat till korruption"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Vunnits genom komprimering"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Paket sparad av I.C.H."
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr "Delning"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Förfrågningar"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Godkända förfrågningar"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Överförd data"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Delningsförhållande"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "kompletta Källor"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "Delad sedan"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "Senaste uppladdning"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr "Medieinformation"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "Längd"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "Bithastighet"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "Kodek"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "Artist"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "Album"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Titel"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Filnamn"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Övertagande"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Städa"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Verkställ"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Kommentera/Betygsätt fil (Text kommer att vara synlig för alla användare)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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."
@@ -3117,1143 +4176,1239 @@
 "För en film kan du berätta om dess längd, innehåll, språk ... \n"
 "och om det är en bluff, kan du berätta det till andra användare av aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Filkvalitet"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Inte betygsatt"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Ogiltig / Korrupt / Bluff"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Dålig"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Duglig"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Bra"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Utmärkt"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Välj filbetyg eller berätta om filen är felaktig..."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "Hämta från Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Hämtar, vänta ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Okänd storlek"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Nödvändig information"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP-adress :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Ytterligare information"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Användarnamn :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Userhash:"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Userhash"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Nedladdningshastighet"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Aktuell"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Löpande medelvärde"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Sessionens genomsnittliga"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Uppladdningshastighet"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Anslutningar"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktiva hämtningar"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktiva anslutningar (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktiva uppladdningar"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Statistikträd"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Användarnamn:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Userhash:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Klientprogramvara:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Klientversion:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP-adress:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Klientprogramvara"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Klientversion"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
+#: src/muuli_wdr.cpp
+msgid "User ID"
 msgstr "Användar-ID"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Server-IP:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Servernamn:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Fördunkling:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Server-IP"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Servernamn"
+
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Fördunkling"
+
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr "Protokolltillägg"
+
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Överföringar till klienten"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Aktuella begäran:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Genomsnittlig uppladdningshastighet:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Genomsnittliga nedladdningshastighet:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Skickat (session):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Hämtat (session):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Skickat (totalt):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Hämtat (totalt):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Aktuella begäran"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Genomsnittlig uppladdningshastighet"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Genomsnittliga nedladdningshastighet"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Skickat (session)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Hämtat (session)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Skickat (totalt)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Hämtat (totalt)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Poäng"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "DL/UP-modifierare:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Säker ident:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Kö-rang:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Kö-poäng:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Säker ident"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Kö-rang"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Kö-poäng"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - multiplattforms Mule"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Detta är det namn som andra användare ser när du ansluter till dig."
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Språk: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Fördröjningen innan visning av verktygstips."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Detta anger det språk som används på kontroller."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Sök efter ny version vid start"
-
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
-msgstr "Aktivering av detta kommer att få aMule att leta efter en ny version vid start"
-
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
-msgstr ""
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
+msgstr "Kontrollera regelbundet om det finns en ny version"
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr "När detta aktiveras kontrollerar aMule om en ny version finns vid start och en gång om dagen medan programmet körs"
 
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
-msgstr ""
+msgstr "Registrerar en autostartpost per användare i operativsystemet så att aMule startar vid inloggning. Om du flyttar aMule-binärfilen ska du starta aMule manuellt en gång efteråt för att uppdatera posten."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr "Gör aMule till standardhanterare för ed2k://-länkar så att ett klick i webbläsaren eller filhanteraren öppnar dem här."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr "aMule hanterar endast eD2k-kompatibla magnetlänkar (som innehåller xt=urn:ed2k:). BitTorrent-magnetlänkar stöds INTE och klick på dem misslyckas utan meddelande. Om du använder en BitTorrent-klient, som Transmission eller qBittorrent, ska du lämna detta avstängt."
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr "Att öppna en samling lägger varje eD2k-länk den innehåller i kö. I Windows läggs aMule till i listan ”Öppna med” och blir standard endast när inget annat program har tagit över filtypen."
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Starta minimerad."
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Vid aktivering av detta startar aMule minimerad vid start."
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Fråga vid avslut"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Gör så att aMule frågar innan du avslutar programmet."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Aktivera fack-Ikon"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Detta Aktiverar/Inaktiverar systemfält- (eller aktivitetsfält-) ikonen."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Dölj programfönstret när stängningsknapp trycks"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Minimera till Ikonen"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Aktivering av detta gör så att aMule minimeras till systemfältet, snarare än aktivitetsfältet."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
-msgstr ""
+msgstr "Visa aviseringar när hämtningen är klar"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
-msgstr ""
+msgstr "När detta är aktiverat visar aMule aviseringar när hämtningen är klar."
+
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr "Kom ihåg sökhistorik"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr "Behåller en rullgardinslista med dina tidigare söktermer i fältet Namn på fliken Sök. Detta sparar frågorna du skrev, inte resultaten de gav."
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Tooltip fördröjningstid: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Webbläsarval"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Ange din webbläsares namn här. Lämna detta fält tomt för att använda systemets standardwebbläsare."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Bläddra"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Öppna i ny flik om möjligt"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Öppna webbsidan i en ny flik istället för ett nytt fönster när det är möjligt"
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Videouppspelare"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Bandbreddsbegränsningar"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Spårallokering"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Portar"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Standard TCP-port "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Detta är standard ed2k-port och kan inte avaktiveras."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "UDP-port för serverförfrågningar (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Utökad UDP-port (Kad / global sökning) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Denna UDP-port används under utökade ed2k-förfrågningar och Kadnätverk"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Aktivera UPnP för vidarebefordring av routerport"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnP TCP-port (tillval):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Bind lokal adress till IP (tom för alla):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 msgid "Advanced users only: If you have multiple network interfaces, enter the address of the interface to which aMule should be bound."
 msgstr "Endast avancerade användare: Om du har flera nätverksgränssnitt, ange adressen för gränssnittet till vilket aMule ska bindas."
 
-#: src/muuli_wdr.cpp:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr "Bind till nätverksgränssnitt (tomt för valfritt):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr "Endast för avancerade användare: fäst all aMule-trafik vid ett nätverksgränssnitt, valt i listan eller angivet med namn (till exempel tun0, eth0, en0) eller index. Till skillnad från bindning till en IP-adress förhindrar detta trafikläckage via standardrutten – användbart med VPN. Kräver inga förhöjda behörigheter."
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Max källor per hämtad fil:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Max samtidiga anslutningar:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Autoanslut vid start"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Återanslut vid nedkoppling"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Ta bort död server efter"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr "Statiska servrar tas aldrig bort, även när de inte går att nå."
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "försök"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Auto-uppdatera serverlistan vid start"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Uppdatera serverlistan vid anslutning till en server"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Uppdatera serverlistan när en klient ansluter"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Använd prioriteringssystem"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Använda smart LowID kontroll vid anslutning"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Säker anslutning"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Autoanslut endast till servrar i statisk-listan"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Ställ in hög prioritet på manuellt tillagda servrar"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Intelligent Corruption Handling (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Aktivera"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr "Avancerad I.C.H. litar på varje hash (rekommenderas inte)"
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Lägg till filer för nerladdning i pausläge"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Lägg till filer för nerladdning med automatisk prioritet"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Försök att hämta första och sista bitarna först"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr "Slutspelsläge: växla till snabbare källor för de sista blocken"
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Börja nästa pausade fil när en fil är klar"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Från samma kategori"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "I alfabetisk ordning"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Förallokera diskutrymme för nya filer"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "För nya filer förallokeras diskutrymme för hela filen, detta minskar fragmentering"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr "Skapa nya filer som glesa filer"
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr "Glesa delfiler använder bara diskutrymme för de delar som redan hämtats, så ledigt utrymme används gradvis när filen fylls. Stäng av för att använda en vanlig fil i stället – användbart där glesa filer inte stöds, är långsamma eller hanteras dåligt av verktyg för säkerhetskopiering/deduplikering. Gäller bara när kärnan körs i Windows; i Linux och macOS är delfiler ändå glesa och inställningen saknar effekt."
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Stoppa nedladdningar när ledigt diskutrymme når "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr "Välj detta om du vill aMule att kontrollera diskutrymmet"
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Ange här min diskutrymme."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Spara 10 källor för sällsynta filer (<20 källor)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Uppladdningar"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Lägg till nya delade filer med automatisk prioritet"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Målmapp för hämtningar"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Intelligent Corruption Handling (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Aktivera"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Avancerad I.C.H. litar på varje hash (rekommenderas inte)"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr "Extrahering av mediemetadata"
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "Extrahera längd/bithastighet/kodek från delade ljud- och videofiler"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr "När detta är aktiverat kör aMule ffprobe för varje delad mediefil för att fylla i kolumnerna Längd/Bithastighet/Kodek som andra klienter ser när de hittar filen i en sökning. Kräver att ffmpeg (binärfilen ffprobe) är installerat."
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr "Sökväg till ffprobe:"
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr "Fullständig sökväg till binärfilen ffprobe. Lämna tom för att låta aMule hitta den automatiskt vid start."
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr "Identifiera"
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr "Sök efter binärfilen ffprobe på vanliga installationsplatser och fyll i sökvägsfältet."
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
+"Färdiga hämtningar lagras här. Alla filer i den här mappen delas automatiskt med andra noder.\n"
+"Om mappen även innehåller filer du inte vill dela ska du välja en undermapp som endast används av aMule."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
-msgstr ""
-
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Mapp för temporära nerladdningsfiler"
+msgstr "Välj mappen där färdiga hämtningar ska lagras. Alla filer i mappen delas med andra noder."
 
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "Delade mappar"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr "(Mappar som delas av kärnan. Ange en sökväg för att lägga till en.)"
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr "Absolut sökväg till en mapp på kärnans dator, till exempel /home/user/shared"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr "Rekursiv"
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr "Dela varje undermapp under denna, även sådana som skapas senare."
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Ta bort"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Högerklicka på mappikonen för rekursiv delning)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Dela ut dolda filer"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
-msgstr ""
+msgstr "Sök automatiskt igenom delade mappar efter ändringar"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
+msgstr "Följ symboliska länkar i delade mappar"
+
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr "Uteslut filer som matchar:"
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr "Jokerteckenmönster avgränsade med ”|”, till exempel .DS_Store|Thumbs.db|*.tmp. Filer vars namn matchar delas inte. Matchning skiljer inte mellan stora och små bokstäver."
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr "Mönster är reguljära uttryck"
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr "Visa hur många delade filer det aktuella mönstret skulle utesluta."
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr "När den anslutna kärnans filer finns på en annan dator ska du mappa ett sökvägsprefix som den rapporterar till platsen där filsystemet nås härifrån, till exempel en nätverksresurs, så att ”Öppna” och ”Visa i mapp” fungerar."
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr "Sökvägsmappningar"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr "Fjärrprefix"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr "Ett sökvägsprefix som kärnan rapporterar, till exempel /home/user/downloads/incoming"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr "Lokalt prefix"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr "Där samma mapp nås från den här datorn, till exempel en monterad nätverksresurs"
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Diagram"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Uppdateringsfördröjning: 5 sekunder"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Tid för genomsnittlig graf: 100 minuter"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Anslutningar Diagramskala: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Hämtningsgrafskala:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Uppladdningsgraf-skala:"
 
-#: src/muuli_wdr.cpp:1660
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Färger: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Bakgrund"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Rutnät"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Hämtning nu"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Hämtningar nu, medelvärde"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Hämtningar session, genomsnittlig"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Hämtningar nu"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Hämtningar nu, medelvärde"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Uppladdningsession, genomsnittlig"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktiva anslutningar"
 
-#: src/muuli_wdr.cpp:1675
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
-msgstr "Systray Ikon Speedbar"
+msgstr "Hastighetsfält för systemfältsikon"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Kad-noder nuvarande"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Kad-noder körs"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Kad-noder session"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Välj"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Träd"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Antal klientversioner visas (0 = obegränsat)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! VARNING !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Max nya anslutningar / 5 sek"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr "Samtidiga uppslag av Kad-källor"
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr "Intervall för att söka igen efter Kad-källor (minuter)"
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr "Intervall för att fråga källor igen (minuter)"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Filbuffertstorlek: 240000 bytes"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr "Använd MMAP: minnesmappad filåtkomst (lägre minnesanvändning)"
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr "Mappar delfiler i minnet i stället för att buffra dem på högen, vilket minskar processens minnesanvändning. Kan minska hämtningshastigheten på vissa diskar; bäst för värdar med begränsat minne eller hög uppladdning."
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Uppladdningsköstorlek: 5000 klienter"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Serveranslutningsuppdateringsintervall: Inaktivera"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Inaktivera datorns inställda standby-läge"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Skin att använda: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Visa \"Snabb eD2k-Länkhanterare\" i varje fönster."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Visa utökad information på kategoriflikar"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Visa programversionen på titel"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Visa överföringshastigheter på titel"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Före programnamn"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Efter programnamn"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Visa overheadsbandbredd"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Vertikal verktygsfältsorientering"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr "Direktsortering av kolumner (ordna om rader automatiskt när deras värden ändras)"
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Nedladdningsköfiler"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Visa framsteg i procent"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Visa förloppsindikator"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Platt"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Rund"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Auto-sortera filer (hög CPU)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule sorterar kolumnerna i din nedladdningslista automatiskt"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Externa Anslutningsparametrar "
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Acceptera externa anslutningar"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP för lyssningsgränssnitt:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 "Ange här en giltig ip i ABCD format för att lyssna EC-gränssnittet. Ett tomt fält eller 0.0.0.0 kommer att innebära alla gränssnitt."
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "TCP-port:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Aktivera UPnP-portforwarding på EC-port"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr "Kräv krypterade anslutningar (avvisar klienter som inte kan kryptera)"
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr "Parametrar för aMule API-server"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr "Kör amuleapi (REST API) vid start"
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "HTTP-port:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr "Gränssnittet som amuleapis HTTP-server lyssnar på. 127.0.0.1 (standard) accepterar endast lokala anslutningar; använd 0.0.0.0 eller en specifik IP-adress för att exponera den för andra värdar (ange ett administratörslösenord nedan)."
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr "Skriv ett lösenord för att ange eller ändra det. Sparade lösenord kan inte visas, så om du lämnar fältet tomt behålls det nuvarande lösenordet."
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "Administratörslösenord"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "Ett lösenord är angivet."
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "Aktivera gäståtkomst"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr "Gästsessioner kan läsa status och listor men kan inte ändra något. När detta stängs av rensas det sparade gästlösenordet."
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "Gästlösenord"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Webbserverparametrar"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "Kör webbserver vid start"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr "Kör webbserver vid start (föråldrat)"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Web mall"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Fullständiga rättigheterslösenord"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Aktivera låga användarrättigheter"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Låga rättigheterslösenord"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Aktivera UPnP-port-forwarding för webbserverport"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Webbserverns UPnP TCP-port (tillval)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Siduppdateringstid (i sek)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Aktivera Gzip-komprimering"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr "Återställ sidan till standardvärden"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr "Återställ inställningarna på den aktuella sidan till standardvärdena."
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Klicka här för att tillämpa eventuella ändringar i inställningarna."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Återställ eventuella ändringar i inställningarna."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Titel :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Kommentar :"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Inkommande mapp:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Ändra prioritet för nya tilldelade filer:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Inkommande mapp"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Ändra prioritet för nya tilldelade filer"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Ändra inte"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Välj färg för denna kategori (den valda):"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Nollställ"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Välj färg för denna kategori (den valda)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Klicka på den här knappen för att återställa loggen."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Klicka på knappen för att uppdatera servrerlistan från URL ..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Serverlista"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "Ange URL till en server.met-fil här och tryck på knappen till vänster för att uppdatera listan över kända servrar."
 
-#: src/muuli_wdr.cpp:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Lägg till server manuellt: Namn"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Skriv in namnet på den nya servern här"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Ange IP på servern här, med hjälp av xxxx format."
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Ange porten på servern här."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Lägg manuellt till en server (fyll fälten till vänster innan) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule-logg"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Serverinformation"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2K-info"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kad-info"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Klicka på knappen för att uppdatera nodlistan från URL ..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Noder (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Ange URL till en nodes.dat fil här och tryck på knappen till vänster för att uppdatera listan över kända noder."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Nodstatistik"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Bootstrap"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Ny nod"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Port:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "Bootstrap från kända klienter"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Koppla från Kad"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr "Bootstrap från nod: IP"
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Ange nodens IP-adress här i formatet x.x.x.x."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Använd säker användarIdentifiering"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr "Det rekommenderas att aktivera det här alternativet. Du kommer inte att få poäng om SUI är inte aktiverat."
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protokollfördunkling"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Stöd protokollfördunkling"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Det här alternativet aktiverat protokollffördunkling och låter aMule acceptera dålda anslutningar från andra klienter."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Använd obfuscation (fördunkling) för utgående anslutningar"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Det här alternativet gör aMule använder protokoll-Obfuscation (fördunkling) vid anslutning till andra klienter/servrar."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Accepterar endast fördunklade anslutningar"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "Det här alternativet gör aMule endast acceptera fördunklade anslutningar. Du kommer att ha mindre källor, men all din trafik kommer att döljas"
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Alla"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Ingen."
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Vem kan se mina delade filer:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr "Välj vem som kan begära att få se en lista över dina delade filer."
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP-filtrering"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Filtrera klienter"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Aktivera filtrering av klient-IP:n definierade i filen ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Filtrera servrar"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Aktivera filtrering av server-IP:n definierade i filen ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Återladda lista"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Återladda listan över IP-adresser att filtrera bort från filen ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Uppdatera nu"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Auto-uppdatering av ipfilter vid start"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Filtreringsnivå:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Filtrera alltid LAN-IP-adresser"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoid hantering av icke-matchande IP"
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Förkastar paketet om klient-ip skiljer sig från ip där paketet hämtas från. Används med försiktighet."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr "Avvisar ett paket när dess käll-IP skiljer sig från den IP-adress klienten uppger (en kontroll mot IP-förfalskning). Inaktivera endast om den orsakar anslutningsproblem."
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Använd systemvidd ipfilter.dat om sådan finns"
 
-#: src/muuli_wdr.cpp:2441
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
-msgstr "Om det inte en lokal ipfilter.dat hittas, tillåt användning av systemvidd ipfilterfil."
+msgstr "Om ingen lokal ipfilter.dat hittas, tillåt användning av ett systemomfattande ipfilter."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Aktivera Onlinesignaturer"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Möjliggör skrivning av OS-filen, som kan användas av externa program för att skapa signaturer och liknande."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Uppdateringsfrekvens (Sek):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Ändra frekvensen (i sekunder) av OnlineSignaturuppdateringar."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Spara onlinesignaturfil i: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "Klicka här för att välja den katalog som innehåller onlineSignaturFilerna."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "Visa landsflagger för klienter"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
-msgstr ""
+msgstr "Visa landsflaggekolumnen i vyerna för överföringar, kö och sökning. Kräver en giltig MMDB GeoIP-databas (se nedan)."
 
-#: src/muuli_wdr.cpp:2520
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Database"
-msgstr "Datahastighet :"
+msgstr "Databas"
 
-#: src/muuli_wdr.cpp:2536
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Source:"
-msgstr "Källor"
+msgstr "Källa:"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
-msgstr ""
+msgstr "DB-IP (gratis, inget konto)"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
-msgstr ""
+msgstr "MaxMind GeoLite2 (gratis, konto krävs)"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
-msgstr ""
+msgstr "Anpassad URL"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
-msgstr ""
+msgstr "Välj vilken leverantör som tillhandahåller GeoIP MMDB-databasen. DB-IP är standard och kräver inget konto. MaxMind kräver ett gratis konto och en licensnyckel. Använd Anpassad URL för att ange en annan MMDB-värd, till exempel en lokal spegel."
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
 "IP-to-Country data by DB-IP.com - https://db-ip.com\n"
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
+"Ingen konfiguration krävs.\n"
+"\n"
+"IP-till-land-data från DB-IP.com – https://db-ip.com\n"
+"Licens: Creative Commons BY 4.0 – https://creativecommons.org/licenses/by/4.0/"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
-msgstr ""
+msgstr "Licensnyckel:"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4262,827 +5417,745 @@
 "License: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
+"Registrera ett gratis MaxMind-konto och skapa sedan en licensnyckel:\n"
+"https://www.maxmind.com/en/geolite2/signup\n"
+"\n"
+"Den här produkten innehåller GeoLite2-data från MaxMind – https://www.maxmind.com\n"
+"Licens: MaxMind GeoLite2 EULA – https://www.maxmind.com/en/geolite2/eula\n"
+"Kräver tillskrivning och kontoregistrering; uppdatera minst var 30:e dag."
 
-#: src/muuli_wdr.cpp:2595
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
-msgstr "Hämta: "
+msgstr "Hämtnings-URL:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
+"Måste peka på en .mmdb-fil eller en .gz/.tar.gz som innehåller en.\n"
+"URL:en kan innehålla inloggningsuppgifter (https://användare:lösenord@värd/...).\n"
+"Licens- och tillskrivningsvillkor anges av uppströms-URL:en – du ansvarar för dem."
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
-msgstr ""
+msgstr "Hämta GeoIP-databasen från den valda källan."
 
-#: src/muuli_wdr.cpp:2616
-#, fuzzy
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
-msgstr "Auto-uppdatering av ipfilter vid start"
+msgstr "Uppdatera automatiskt vid start"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
-msgstr ""
+msgstr "Hämta GeoIP-databasen på nytt från den valda källan varje gång aMule startar."
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrera inkommande meddelanden (utom nuvarande chatt):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Filtrera alla meddelanden"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtrera meddelanden från folk som inte finns i din kompislista"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Filtrera meddelanden från okända klienter"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrera meddelanden som innehåller (använd ',' som separator):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "skriv här orden amule ska filtrera och blockera meddelanden med dem"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Visa mottagna meddelanden i loggen"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrera kommentarer som innehåller (använd ',' som separator):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Aktivera autentisering"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Aktivera/inaktivera användarnamn/lösenordsautentisering"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Användarnamn: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Användarnamnet som ska användas för att ansluta till proxyn"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Lösenord:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Lösenordet som ska användas för att ansluta till proxyn"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Aktivera proxy"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Aktivera/inaktivera proxy-stöd"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Proxytyp:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Proxyserver:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Proxytyp"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Proxyserver"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Proxyserverns värdnamn"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Proxyport:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Proxyport"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Proxyporten"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Aktivera autentisering"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Aktivera/inaktivera användarnamn/lösenordsautentisering"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Användarnamnet som ska användas för att ansluta till proxyn"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Lösenordet som ska användas för att ansluta till proxyn"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Anslut till:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Logga in på fjärr-amule"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Användarnamn"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Kom ihåg dessa inställningar"
 
-#: src/muuli_wdr.cpp:2766
-#, fuzzy
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "Kryptera anslutningen (rekommenderas)"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
-msgstr "Använd gzip-komprimering"
+msgstr "Tvinga ZLIB-komprimering"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Aktivera Utförlig Debug-loggning."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Endast till loggfil"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Meddelandekategorier:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Lägg till importer"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Återförsök den valda"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Ta bort vald"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Händelsetyper"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr "Statistik och köade klienter för vald fil(er): Session / All tid"
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Aktiva uppladdningar"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Procent av den totala filer"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Visa klienter för"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Alla filer"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Valda filer"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Endast aktiva uppladdningar"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Visa klienter för"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Återladda:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Återladda dina delade filer"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Skicka"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Skickar det specificerade meddelandet."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Stäng denna chat-session."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Anslut till någon server och/eller Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "Avbryt %s"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Utdelade filer"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "Koppla från %s"
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "Anslut %s"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Inaktiverad %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "byte"
 msgstr1 "bytes"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "TiB"
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "byte/sek"
 msgstr1 "bytes/sek"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "MiB/s"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sekunder"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "minuter"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "timmar"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Dagar"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "dagar"
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr "%s:"
 
-#: src/OtherFunctions.cpp:684
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "alla"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "alla andra"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Ofullständig"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Video"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Arkiv"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Text"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Aktiv"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Använder config dir: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr "Den här källan har inte delen"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr "Du och den här källan har båda delen"
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr "Hämtas från den här källan nu"
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr "Nästa del som begärs från den här källan"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr "Den här källan har delen och du behöver den fortfarande"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr "Den här noden har redan delen"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr "Den här noden har inte delen"
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr "Ingen annan källa har den här delen"
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr "En annan källa har den här delen"
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr "%u eller fler andra källor har den här delen"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr "Redan läst och hashberäknad"
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr "Återstår att läsa"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr "Ett block per del av filen som hämtas."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr "Ett block per del av den delade filen."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Ett block per del av den delade filen, färglagt efter hur många andra källor som har den."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Ett block per del av den delade filen som visar hur långt omhashningen har läst."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr "Mellanliggande, mörknar när andra källor läggs till"
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Väntar på att partfile-konverterings-tråd ska dö..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Importerar %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Läsa temp-mappen"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Hämta grundläggande information från nedladdnings-infofil"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Skapa målfilen"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Ladda data från gamla hämtade filen (%u av %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "Spara datablock till ny enskilld nerladdningsfil (%u av %u)"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Hämtar källor nerladningasfilsinformation"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Lägger till nerladdning och sparar ny partfile"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Importera partfiles"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Tillstånd"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Filehash"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Disk: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "Välj en mapp för att söka efter temporära hämtningar! (Undermappar kommer att ingå)"
 
-#: src/PartFileConvertDlg.cpp:208
-#, fuzzy
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
-msgstr "Vill du radera källfilerna för framgångsrikt importerade nedladdningar?"
+msgstr "Vill du ta bort källfilerna för hämtningar som importerats utan fel?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Ta bort källor?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "FEL: Misslyckades med att skapa partfile"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Försöker ladda backup av met-fil från %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "FEL: Det gick inte att öppna part.met-fil: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr "FEL: part.met fil är 0 i storlek: %s ==> %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "FEL: Ogiltig part.met-fil-version: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "Fel: %s ( %s ) är korrupt (dåliga taggar: %s ), kan inte läsa in filen."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "FEL: %s ( %s ) är skadad (fel tagcount), oförmögen att läsa in filen."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Försöker återhämta sig filinformation ..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "Återstället icke namngiven fil - kommer att försöka återställa det som RecoveredFile.dat"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Återvann all tillgängliga filinformation :D - Försöker att använda filen..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Det går inte att återställa filinformation :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Misslyckades med att öppna %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "VARNING: %s kan vara skadad (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "FEL vid sparning av partfile: %s ( %s ==> %s )"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "IO-fel vid sparandet av partfile: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
-msgstr ""
+msgstr "Skrev 0/okänt antal byte till ”%s” – bevarar befintlig .part.met."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "Det gick inte att spara part.met-frö-fil för %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "Sparade %i käll-frö för partfile: %s (%s)"
 msgstr1 "Sparade %i käll-frön för partfile: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Kan inte läsa frö-filen för Partfile %s ( %s )"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "Fel vid läsning partfile frö-fil ( %s - %s ): %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Hittade skadade delen (%d) i %d del fil %s - FileResultHash |%s| FileHash |%s|"
 msgstr1 "Hittade skadade delen (%d) i %d dels fil %s - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Hittade avslutande del (%i) i %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Klar med återhashning av %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Oväntat fel vid färdigställande %s . Fil pausad"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Hämtat färdigt: %s"
 
-#: src/PartFile.cpp:2323
-#, fuzzy, c-format
+#: src/PartFile.cpp
+#, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
-msgstr "Hämtat färdigt: %s"
+msgstr ""
+"Hämtning klar:\n"
+"%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Tar bort fil: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "VARNING: Det går inte att hasha nedladdade delen - hashset ofullständig för '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "FEL: Det går inte att hasha nedladdade delen - hashset ofullständig (%s). Detta bör aldrig hända"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
-msgstr ""
+msgstr "Del %u av ”%s” är markerad som klar men delfilen är kortare än väntat (har %llu byte, behöver %llu); öppnar luckan igen för ny hämtning."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "EOF medan hashning av hämtade del %u med längd %u (max %u) av partfile %s med längd %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "VARNING: Inte tillräckligt med ledigt diskutrymme! Pausa fil: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Nedladdade del %i är skadad i fil: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr "ICH: Återvunnen skadad del %i för %s -> Sparade bytes: %s"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Allokera"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Otillräckligt diskutrymme"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Nedladdad"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "FEL: Det gick inte att öppna partfile ' %s '"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Systemets standard"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Albansk"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arabiska"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturiska"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baskiska"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgariska"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalanska"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Kinesiska (Förenklad)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Kinesiska (Traditionell)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Kroatiska"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Checkiska"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danska"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Nederländska"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Engelska (Storbritannien)"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Engelska (Storbritannien)"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr "Utökat källutbyte"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr "NAT-traversering (uTP)"
+
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr "Hämtning av väninformation"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr "NAT-traversering (QUIC)"
 
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estniska"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Finska"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Franska"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galiciska"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Tyska"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Grekisk"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Hebreiska"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Ungerska"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Italienska"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Italienska (Schweiz)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japanska"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Koreanska"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Litauisk"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norska (nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Polska"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portugisiska"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portugisiska (Brasilien)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Romänska"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Ryska"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slovenska"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Spanska"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Svenska"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Turkiska"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukraina"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Byt språk"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "Det finns inga översättningar installerade för aMule"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Inga språk tillgängliga"
-
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "Inga alternativ tillgängliga"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr "Ogiltig sökvägsmappning hittades; hoppar över"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Ogiltig kategori hittad, hoppar över"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr "TCP-port kan inte vara högre än 65532 på grund av server UDP-socket är TCP+3"
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Standardporten kommer att användas ( %d )"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Anslutning"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Kataloger"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Servrar"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Filer"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Säkerhet"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
-msgstr ""
+msgstr "IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Filter"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Fjärrkontroller"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Onlinesignatur"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Avancerad"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Händelser"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Felsökning"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5092,15 +6165,15 @@
 "    %PARTFILE - hela sökvägen till filen\n"
 "    %PARTNAME - endast filnamnet"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
-msgstr ""
+msgstr "Stöd för systemfältsikon kräver libayatana-appindicator3 vid kompilering."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
-msgstr ""
+msgstr "Inte tillgängligt i Wayland: protokollet rapporterar inte när ett fönster minimeras, så det här alternativet kan inte fånga systemets minimeringsknapp. Lösning: starta aMule med `GDK_BACKEND=x11` för att använda XWayland i stället."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5116,26 +6189,42 @@
 "aMule kommer fungera bra utan att justera några av\n"
 "dessa inställningar."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr "Det gick inte att ansluta Cfg till widget med ID %d och nyckel %s"
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr "Det gick inte att överföra data från Cfg till widget med ID %d och nyckel %s"
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Den typen av proxy du ansluter till"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr "Det gick inte att överföra data från widget till Cfg med ID %d och nyckel %s"
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "Inget lösenord angivet."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "Gäståtkomst kräver ett lösenord. Ange ett i fältet för gästlösenord eller avmarkera Aktivera gäståtkomst."
+
+#: src/PrefsUnifiedDlg.cpp
+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 aktiverat externa anslutningar men har inte angett ett lösenord.\n"
+"External anslutningar kan inte aktiveras om inte ett giltigt lösenord anges."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5143,31 +6232,43 @@
 "aMule måste startas om för att aktivera dessa ändringar:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP-port ändrad.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP-port ändrad.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr "- Bindning till nätverksgränssnitt ändrad.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Extern anslutningsport ändrad.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Extern anslutningsacceptans ändrades.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Extern anslutningsgränssnitt ändrad.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- Stöd för fördunkling av protokoll ändrad.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr "- Proxyinställningar ändrade (behövs för HTTP-överföringar).\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr "- amuleapi-inställningar ändrade.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5175,27 +6276,32 @@
 "Din automatiska uppdateringsserverlista är tom.\n"
 "'Auto-uppdateringsserverlista vid start' inaktiveras."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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 aktiverat externa anslutningar men har inte angett ett lösenord.\n"
-"External anslutningar kan inte aktiveras om inte ett giltigt lösenord anges."
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr "Kunde inte spara amuleapi-lösenordet: %s"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Språk ändrat.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Mappen Temp ändrades.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- ED2K-nätverk aktiverad.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr "Uteslutningsmönstret för delade filer är inte ett giltigt reguljärt uttryck. Filtret har lämnats inaktiverat."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "Ogiltigt reguljärt uttryck"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5203,7 +6309,7 @@
 "Både eD2k- och Kad-nätverk är inaktiverade.\n"
 "Du kommer inte att kunna ansluta förrän du aktiverar åtminstone en av dem."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5211,7 +6317,7 @@
 "Kad startar inte om din UDP-port är inaktiverad.\n"
 "Aktivra UDP-port eller inaktivera Kad."
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5221,20 +6327,66 @@
 "Du MÅSTE starta om aMule nu.\n"
 "Om du inte startar nu, klaga inte om något dåligt händer.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
-msgstr ""
+msgstr "Kunde inte registrera aMule för automatisk start vid inloggning. Autostartlagret kan vara skrivskyddat."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
-msgstr ""
+msgstr "Kunde inte ta bort posten för automatisk start vid inloggning."
 
-#: src/PrefsUnifiedDlg.cpp:1098
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
-msgstr "Auto Refresh startad"
+msgstr "Automatisk start"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr "Registrera filtyp"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr "Registrera URL-hanterare"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr "aMule hanterar endast eD2k-kompatibla magnetlänkar. Om du ersätter den nuvarande magnetlänkhanteraren (%s) slutar BitTorrent-magnetlänkar att fungera – aMule kan inte hämta BitTorrent-innehåll. Fortsätta?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr "Ett annat program öppnar för närvarande .emulecollection-filer (%s). Ersätta det med aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr "Ett annat program är för närvarande standardhanterare för dessa länkar (%s). Ersätta det med aMule?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "Kunde inte registrera aMule för .emulecollection-filer. Registreringslagret kan vara skrivskyddat."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr "Kunde inte ta bort filtypsregistreringen."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "Kunde inte registrera aMule som URL-hanterare. Registreringslagret kan vara skrivskyddat."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr "Kunde inte ta bort URL-hanterarregistreringen."
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Webbservern och aMule API kräver att externa anslutningar är aktiverade."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr "aMules webbserver är föråldrad. Överväg att köra aMule API i stället."
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5244,41 +6396,64 @@
 "Vänligen fylla i åtminstone en URL för att peka på en giltig server.met-fil.\n"
 "Klicka på knappen \"lista\" i denna kryssruta för att ange en URL."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Temporära filer"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Inkommande filer"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Online-signaturer"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Välj en mapp för %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Skulle utesluta %u av %u delad fil"
+msgstr1 "Skulle utesluta %u av %u delade filer"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Bläddra efter videospelare"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Välj webbläsare"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr "Välj ffprobe-binärfil"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Körbar %s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr "ffprobe hittades inte i PATH eller på vanliga installationsplatser. Installera ffmpeg (som innehåller ffprobe) eller välj en binärfil manuellt med Bläddra."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr "Återställ inställningarna på den här sidan till standardvärden?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr "Återställ till standardvärden"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Redigera serverlista"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5286,1217 +6461,1462 @@
 "Lägg här URL för att hämta server.met filer.\n"
 "Endast en webbadress på varje rad."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
-msgstr ""
+msgstr "Uppdatering av IP2Country misslyckades"
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
-msgstr ""
+msgstr "Data från MaxMind GeoLite2"
 
-#: src/PrefsUnifiedDlg.cpp:1568
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
-msgstr "Kompletta källor"
+msgstr "Anpassad källa"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
-msgstr ""
+msgstr "Data från DB-IP.com"
 
-#: src/PrefsUnifiedDlg.cpp:1590
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Status: Loaded%s"
-msgstr "Status:"
+msgstr "Status: Inläst%s"
 
-#: src/PrefsUnifiedDlg.cpp:1593
-#, fuzzy, c-format
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
 msgid "Status: Loaded%s - %s"
-msgstr "Status:"
+msgstr "Status: Inläst%s – %s"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
-msgstr ""
+msgstr "Status: Kunde inte läsa in – klicka på ”Uppdatera nu” för att uppdatera."
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
-msgstr ""
+msgstr "Status: Hittades inte – klicka på ”Uppdatera nu” för att hämta."
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Uppdateringsfördröjning: %d sekund"
 msgstr1 "Uppdateringsfördröjning: %d sekunder"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Tid för genomsnittlig graf: %d minut"
 msgstr1 "Tid för genomsnittlig graf: %d minuter"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Anslutningsdiagramskala: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Filbuffertstorlek: %d byte"
 msgstr1 "Filbuffertstorlek: %d bytes"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Uppladdningsköstorlek: %d klient"
 msgstr1 "Uppladdningsköstorlek: %d klienter"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Serveranslutninguppdateringsintervall: %d minut"
 msgstr1 "Serveranslutninguppdateringsintervall: %d minuter"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Serveranslutningsuppdateringsintervall: Inaktiverad"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "Exekvera kommando på '%s' händelse"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Aktivera kommandokörning på kärnan"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Kommando till kärnan:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Aktivera kommandokörning via GUI"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "GUI kommando:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Följande variabler kommer att ersättas:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
+"Följande mappar verkar vara systemmappar eller känsliga platser:\n"
+"\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
-msgstr ""
+msgstr "Att dela dem rekursivt publicerar alla underliggande filer på eD2k- och Kad-nätverken. Vill du verkligen göra detta?"
 
-#: src/PrefsUnifiedDlg.cpp:1959
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
-msgstr "Delade mappar"
+msgstr "Bekräfta delade mappar"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-#, fuzzy
-msgid "Reloading shared files…"
-msgstr "Återladda dina delade filer"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
+msgstr "Läser in delade filer igen..."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
+msgstr "Söker igenom underkataloger …"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:1994
-#, fuzzy
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
-msgstr "Delade mappar"
+msgstr "Uppdaterar delade mappar"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
-msgstr ""
+msgid "Scanned %u directories..."
+msgstr "Genomsökte %u kataloger …"
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Ladda om listan med delade filer."
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr "Delad mapp"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr "Både fjärr- och lokalprefix måste fyllas i."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr "Det här fjärrprefixet är redan mappat."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr "Välj den lokala mappen"
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "Rensa sökhistorik"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr "Rensa den sparade sökhistoriken? Detta kan inte ångras."
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Sökvarning"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
-msgstr ""
+msgstr "Det går inte att söka när både eD2k och Kademlia är inaktiverade."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
-#, fuzzy
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
-msgstr "Sökningar"
+msgstr "Sökfel"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
+"En eD2k-sökning kör fortfarande. Att starta en ny stoppar den, eftersom eD2k-protokollet endast tillåter en sökning i taget.\n"
+"\n"
+"Resultat som redan hittats behålls; bara nya resultat slutar komma.\n"
+"\n"
+"Starta den nya sökningen ändå?"
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr "Sökning pågår"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr "Min storlek måste vara mindre än max storlek. Max storlek ignoreras."
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Sökvarning"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Huvud"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad-sökning kan inte göras om Kad inte är igång"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr "Sparar bara de %u senaste av %u öppna sökningarna till %s."
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr "Sparar bara de första %u av %u resultat för sökningen ”%s”."
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "VARNING: Sparad söklista är skadad och innehåller ett ogiltigt huvud."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Ogiltig post i sparad söklista; filen kan vara skadad"
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr "eD2k-sökning kan inte göras om eD2k inte är ansluten"
 
-#: src/SearchList.cpp:336
-#, fuzzy
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
-msgstr "Sökord för sökning: %s"
+msgstr "Inget sökord för Kad-sökning – avbryter"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Oväntat fel vid försöket med Kadsökningen: "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "FileID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr "Sökningen fick tidsgräns: servern svarade inte."
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr ""
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Kad-sökning: begärde bredare resultat från ytterligare en nod."
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Inte betygsatt"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Kad-sökning: det finns ingen nod kvar att fråga om fler resultat (gränsen nådd eller inga svar ännu)."
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr ""
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "Fel %u: %s\n"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Nedladdning i kategori"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "FileID"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Hämta %s för den här filen:"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "Fäll ut alla"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "Fäll ihop alla"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Sök relaterade filer (eD2k, lokal server)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Markera som känd fil"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Kopiera eD2k-länken till urklipp"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopiera eD2k länkar till Urklipp"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Du är ansluten till den server som du försöker ta bort. Vänligen koppla ifrån först."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "Avbryten"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Ny"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr "körs"
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "klar"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr "Sökning %u: %s, %u %% (%u resultat)\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr "Sökning %u ”%s”: %s, %u %% (%u resultat)\n"
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr "Sökningen har upphört eller har okänt ID. Starta en ny sökning.\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Sökets framstigande: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Framskridandet för söket är inte tillgänglig"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr "Ingen sökning att rapportera om.\n"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Kunde inte ansluta till någon av de listade obfuskerade statiska servrarna. Gör ett nytt försök utan obfuskering."
+
+#: src/ServerConnect.cpp
 msgid "Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."
 msgstr "Det gick inte att ansluta till några fördunkliade servrar i listan. Gör ett nytt försök utan obfuscation."
 
-#: 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/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
+msgstr "Kunde inte ansluta till någon av de listade statiska servrarna."
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr "Kunde inte ansluta till någon av de listade servrarna."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Automatisk anslutning till servern testas igen om %d sekund"
+msgstr1 "Automatisk anslutning till servern testas igen om %d sekunder"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "eD2k-nätverket inaktiverad i inställnigarna, ansluter inte."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr "Inga giltiga servrar att ansluta till finns i serverlista"
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "Ansluten till %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "Anslutning etablerad med: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Allvarligt fel vid försök att ansluta. Internet-anslutningen kan vara nere"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Förlorade anslutningen till %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) verkar vara död."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, 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"
-msgstr0 "Automatisk anslutning till servern testas igen om %d sekund"
-msgstr1 "Automatisk anslutning till servern testas igen om %d sekunder"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Anslutningen förlorades"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "Anslutning till %s (%s:%i) misslyckades."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "FEL: Socket ogiltig vid timeout-kontroll"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Anslutningsförsöket till %s (%s:%i) tog för lång tid."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Mottog sent resultat av DNS-sökning, förkastar."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Laddar server.met fil: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Server.met filen hittades inte!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Det gick inte att läsa in server.met filen '%s', okänt format påträffades."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Det gick inte att öppna server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Server.met filen är korrupt, hittade ogiltig versiontag: 0x%x , storlek %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i server hittad i server.met"
 msgstr1 "%i servrar hittade i server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d server tillagd"
 msgstr1 "%d servrar tillagda"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Fel: filen 'server.met' är skadad: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "IO fel vid läsning av 'server.met': "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr "Server inte tillagd: %s:%d anger inte en giltig port."
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr "Server inte tillagd: IP på %s:%d filtrerades eller är ogiltig."
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr "Server inte tilllagt: Server med matchande IP:Port %s:%d hittades i listan."
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr "Server tillagd: server på %s:%d med namnet '%s'."
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Du är ansluten till den server som du försöker ta bort. Vänligen koppla ifrån först."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Misslyckades med att öppna '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Det gick inte att spara server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "I/O-fel vid skrivning av ”server.met”: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Ogiltig URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Färdig med hämtningen av serverlistan från %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Ingen serverlistadresspost i 'addresses.dat' hittades. Klistra in en giltig serverlista adressen i denna fil för att auto-uppdatera din serverlista"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Börja ladda ner serverlista från %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "VARNING: ogiltig URL som angavs för auto-uppdatering av servrar: %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Ingen giltig server.met auto-nedladdnings-url i addresses.dat"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Det gick inte att hämta serverlistan från %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Lokal server filtreras av IPFilters, återansluter till en annan server!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Användare"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "Max. användare"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Statisk"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Version"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Filer"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Utdelade filer"
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
-msgstr ""
+msgstr "TCP-flaggor"
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
-msgstr ""
+msgstr "UDP-flaggor"
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Du är ansluten till en server som du försöker ta bort. Koppla ifrån först. Servern togs INTE bort."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Okänt namn)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "Är du säker på att du vill ta bort den statiska servern %s"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "ms"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Servrar (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Server"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Anslut till server"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Markera servern som statisk"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Markera servern som icke-statisk"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Markera servrar som statiska"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Markera servrar som icke-statiska"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Ta bort server"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Ta bort servrar"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Ta bort alla servrar"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopiera eD2k länkar till Urklipp"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Återanslut till server"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 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:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Är du säker på att du vill ta bort vald server?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Är du säker på att du vill ta bort valda servrar?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "FEL: %s ( %s ) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "VARNING: %s ( %s ) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
-msgstr ""
+msgstr "Servern %s (%s) avvisade vår inloggning (inget klient-ID tilldelades). Kopplar från."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Ny clientid är %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "VARNING: Du har fått low-ID!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\tMest sannolikt är det på grund av att du är bakom en brandvägg eller router."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tFör mer information, referera till https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Okänd server info mottagen! - för kort"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "Tagit emot %d ny server"
 msgstr1 "Tagit emot %d nya servrar"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Lagring av serverlista klar."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Servern avvisade senaste kommandot"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Boguspaket/skräppaket mottagen från servern: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Ohanterat fel vid bearbetning av paket från servern: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr "Det går inte att skapa DNS tråd för anslutning till %s"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "Server IP %s (%s) är filtrerad. Ansluter inte."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "med hjälp av protokollfördunkling."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Ansluter till %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr "Det gick inte att hitta dns för server %s: Kan inte ansluta!"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "aMuleGUI-logg"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Server inte tilllagd: Ingen IP eller värdnamn angiven."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Server inte tilllagd: Ogiltig serverport angiven."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "eD2k Status:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
-#, fuzzy
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
-msgstr "Anslutningstillstånd:"
+msgstr "Anslutningstyp:"
+
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "Ansluten sedan:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kademlia-status:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "Kör på LAN-läge"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Kör"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "Kademlia klient-ID:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Status:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Anslutningstillstånd:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr "Bakom brandvägg - öppna TCP-port %d i din router eller brandvägg"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "UDP anslutningstillstånd:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr "Bakom brandvägg - öppna UDP-port %d i din router eller brandvägg"
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Brandväggstillstånd: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Ingen kompis krävs - TCP-port öppen"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Ingen kompis krävs - UDP-port öppen"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Ingen kompis"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Ansluter till vän"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Ansluten till vän på %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP-adress:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Indexerade källor:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Indexerade nyckelord:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Indexerade anteckningar:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Indexerad belastning:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Genomsnittliga Användare:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Genomsnittliga Filer:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Kör inte"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 "Övervakare av delade mappar: %u ny underkatalog hittades sedan senaste körningen; läser om delningar"
+msgstr1 "Övervakare av delade mappar: %u nya underkataloger hittades sedan senaste körningen; läser om delningar"
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Lägga fil %s till utdelning"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Hittade %i känd delad fil"
 msgstr1 "Hittade %i kända delad filer"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Hittade %i känd delad fil, %i okänd"
-msgstr1 "Hittade %i kända delade filer, %i okänd"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 "Uteslöt %i fil från delning med filter"
+msgstr1 "Uteslöt %i filer från delning med filter"
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "FEL: Försökte dela %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Delad mapp hittades inte, hoppar över: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Inga delbara filer hittade i mappen: %s"
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Delad katalog är inte läsbar; hoppar över: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Användarnamn"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr "Extrahering av mediemetadata är inaktiverad i inställningarna, så det finns inget att extrahera igen."
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "Hämtningshastighet"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 "Extraherar mediemetadata igen för %u delad fil"
+msgstr1 "Extraherar mediemetadata igen för %u delade filer"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Uppladdningshastighet"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "Delar nu filen: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Tillgängliga delar"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Slutade dela borttagen fil: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Slutade dela %u fil under borttagen katalog: %s"
+msgstr1 "Slutade dela %u filer under borttagen katalog: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Delar nu %u fil som hittades i en ny delad katalog"
+msgstr1 "Delar nu %u filer som hittades i nya delade kataloger"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Hittade %u ny delad fil"
+msgstr1 "Hittade %u nya delade filer"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Användarnamn"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr "Delar hos nod"
+
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Uppladdningsstatus"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "Hämtningsstatus"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr "Ursprung"
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Lokalt filnamn"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Lista på delade filer"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Förfrågningar"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Godkända förfrågningar"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Överförd data"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Delningsförhållande"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Erhållna delar"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr "Källtillgänglighet"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "kompletta Källor"
-
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Mappsökväg"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Utdelade filer"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Lägg till Kommentar/Betyg"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Redigera Kommentar/Betyg"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Byt namn"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr "Verifiera lokala data"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr "Extrahera &mediemetadata igen"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Lägg till filer i samlingen för att överföringslistan"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Kopiera magnet &URI till urklipp"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Kopiera eD2k-länk till urklipp (&Source)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Kopiera eD2k-länk till urklipp (Source) (&With Crypt alternativ)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Kopiera eD2k-länk till urklipp (&Hostname)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Kopiera eD2k-länk till Urklipp (värdnamn) (Med &Crypt alternativ)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Kopiera eD2k-länken till urklipp (&AICH info)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Kopiera eD2k-länk till urklipp (&AICH info + källa)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr "Exportera valda filer till en emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr "Verifiering av lokala data på PartFile stöds för närvarande inte: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 "Mediemetadata: hoppar över %u ofullständig hämtning"
+msgstr1 "Mediemetadata: hoppar över %u ofullständiga hämtningar"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 "Mediemetadata: hoppar över %u fil som inte är ljud eller video"
+msgstr1 "Mediemetadata: hoppar över %u filer som inte är ljud eller video"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 "Extrahera mediemetadata igen för %u fil?"
+msgstr1 "Extrahera mediemetadata igen för %u filer?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 "%u ofullständig hämtning hoppas över."
+msgstr1 "%u ofullständiga hämtningar hoppas över."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 "%u fil är inte ljud eller video och hoppas över."
+msgstr1 "%u filer är inte ljud eller video och hoppas över."
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr "Detta körs i bakgrunden. Förloppet rapporteras i loggen."
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr "Extrahera mediemetadata igen"
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Du behöver en HighID att skapa en giltig sourcelink"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr "Exportera till emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr "Inga filer är valda för export."
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr "eMule-samlingar (*.emulecollection)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr "”%s” finns redan. Skriva över den?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Kunde inte skriva samlingsfilen ”%s”."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Exporterade %u delad fil till ”%s”."
+msgstr1 "Exporterade %u delade filer till ”%s”."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Total storlek på delade filer: %s (%s klara)"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Total storlek på Delade filer: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Delade filer (%i, hashar ytterligare %u)"
+msgstr1 "Delade filer (%i, hashar ytterligare %u)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Utdelade filer (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "PartFile"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Läser in delade filer igen: %u filer genomsökta"
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr "Delstatus"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Fjärrfilnamn"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Överförd data (Session (Total)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Totalt Overhead (paket): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Filbegäran Overhead (paket): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Source Exchange Overhead (paket): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Server Overhead (paket): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kad Overhead (paket): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Crypt overhead (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Aktiva uppladdningar: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Väntande uppladdningar: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Totalt framgångsrika uppladdningssessioner: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Totalt misslyckade uppladdningssessioner: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Genomsnittlig uppladdningstid: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Nedladdad data (Session (Total)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Hittade Källor: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Aktiva nedladdningar (chunks): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Session UL: DL förhållande (Total): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Genomsnittliga nedladdningshastighet (Session): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Genomsnittlig uppladdningshastighet (Session): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Max nedladdningshastighet (Session): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Max uppladdningshastighet (Session): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Återansluter: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Tid sedan första överföringen: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "Ansluten till server sedan: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Aktiva anslutningar (uppskattning): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Max anslutningsgräns har uppnåtts: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Genomsnittliga anslutningar (uppskattning): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Toppar anslutningar (uppskattning): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Klienter"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Okänd: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Filtrerade: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Bannlysta: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr "Kad-blockerade adresser: %s"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Totalt: %i Kända: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Fungerande servrar: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Inte fungerande servrar: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Totalt: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Borttagna servrar: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Filtrerade servrar: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Användare på fungerande servrar: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Filer på fungerande servrar: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Totalt antal användare: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Totalt antal filer: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Serveranvändade: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Antal Delade filer: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Total storlek på Delade filer: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Genomsnittlig filstorlek: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Operativsystem"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Inte mottagen"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktiva anslutningar (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Inte tillgänglig"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "Kommando '%s' med pid '%d' är klar med statuskoden '%d'."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Kör <str> och avsluta."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr "Avgränsa listfält med mellanslag, som tidigare, i stället för tabbar."
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr "Ogiltigt IP-format. Använd xxx.xxx.xxx.xxx:xxxx\n"
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "Detta kommando kräver ett argument. Giltiga argument. 'all', filename, eller ett nummer.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Bearbetning efter hash: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Bearbetning efter filnamn: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Detta kommando kräver ett argument. Giltiga argument: a file hash.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Inte ett giltigt nummer\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "Inte ett giltigt hash (längd ska vara exakt 32 tecken)\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
-"Ingen söktyp vald.\n"
-"Skriv 'help search' för att få mer hjälp.\n"
+"Ogiltig syntax för sökfilter.\n"
+"Skriv 'help search' för mer hjälp.\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
-#, fuzzy
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
-"Ingen söktyp vald.\n"
-"Skriv 'help search' för att få mer hjälp.\n"
+"Inget sökord angavs.\n"
+"Skriv 'help search' för mer hjälp.\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6504,76 +7924,80 @@
 "Ingen söktyp vald.\n"
 "Skriv 'help search' för att få mer hjälp.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Hämta fil: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Begäran misslyckades med ett okänt fel."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Operationen var lyckad."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Begäran misslyckades med följande fel: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "IP-filtrering för klienterna är %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "AV"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "PÅ"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "IP-filtrering för servrar är %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Aktuell IPFilternivå är %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Bandbreddsgränser: Upp: %u kB/s, Ner: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr "Bandbreddsgränser: upp: %u KiB/s, ned: %u KiB/s.\n"
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr "Källrotation i slutspelsläge är %s.\n"
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr "Sökning startad (id %u).\n"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Ansluten till %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Ansluter nu"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "via brandvägg"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "ok"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6582,7 +8006,7 @@
 "\n"
 "Hämtningar:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6591,7 +8015,7 @@
 "\n"
 "Uppladdningar:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6600,7 +8024,7 @@
 "\n"
 "Klienter i kö:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6609,38 +8033,33 @@
 "\n"
 "Totalt källor:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "PartFile"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Antal sökresultat: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Sökets framstigande: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Framskridandet för söket är inte tillgänglig"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Fick ett okänt svar från servern, Opcode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Visa kort statusinformation."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Visa anslutningsstatus, nuvarande upp/nedladdningshastigheter, etc.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Visa fullständigt statistikträd."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6654,11 +8073,11 @@
 "\n"
 "Exempel: 'statistics 5' kommer att visa endast de översta 5 versionerna för varje klienttyp.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Stäng ner aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6668,35 +8087,35 @@
 "Detta kommer också stänga av textklienten, eftersom det är oanvändbar utan en\n"
 "körande kärna.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Ladda om det givna objektet."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Ladda om listan med delade filer."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Ladda om IP-filtreringtabell."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "Ladda om nuvarande IP-filtreringstabell."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Uppdatera IP-filtreringstabell från URL."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr "Om URL utelämnas används URLen från inställningarna."
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Anslut till nätverket."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6708,35 +8127,35 @@
 "endast den servern. IP måste vara en punktad decimal-IPv4-adress,\n"
 "eller ett fungerande DNS-namn."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Anslut endast till eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Anslut endast till Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Koppla ifrån nätverket."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "Detta kommer att koppla ifrån alla nätverk som nu är anslutna.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Koppla endast ifrån eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Koppla endast ifrån Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Lägg till en ed2k- eller magnetlänk till kärnan."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6754,51 +8173,51 @@
 "\n"
 "Magnetlänken måste innehålla eD2k-hash och fillängd.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Ange ett inställningvärde."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "Ange IP-filtreringsinställningar."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Slå på IP-filtrering för både klienter och servrar."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Stäng av IP-filtrering för både klienter och servrar."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Aktivera/inaktivera IP-filtrering för klienter."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Slå på IP-filtrering för klienter."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Stäng av IP-filtrering för klienter."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Aktivera/inaktivera IP-filtrering för servrar."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Slå på IP-filtrering för servrar."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Stäng av IP-filtrering för servrar."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Välj IP-filtreringsnivå."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6806,59 +8225,71 @@
 "Giltiga filtreringsnivåer är i intervallet 0-255, och dess standard (initialt)\n"
 "värde är 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Sätt bandbreddsgränser."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "Det värde som ges till dessa kommandon måste vara i kilobyte/s.\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Sätt gräns för bandbredd."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Det givna värdet måste vara i kilobyte/sekund.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Sätt gräns för nedladdningsbandbredd."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr "Aktivera eller inaktivera källrotation vid slutspel."
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Det angivna värdet måste vara 1/ON (aktivera) eller 0/OFF (inaktivera).\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Hämta och visa ett inställningsvärde."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "Hämta IP-filtreringsinställningar."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Hämta IP-filtreringstillstånd för både klienter och servrar."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Hämta IP-filtreringstillstånd endast för klienter."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Hämta IP-filtreringstillstånd endast för servrar."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "Hämta IP-filtreringsnivå."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Hämta bandbreddbegränsningar."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr "Hämta tillståndet för källrotation i slutspelsläge."
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Utför en sökning."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6876,40 +8307,63 @@
 "Example: 'search global linux iso --type Iso --min-size 100M' returns\n"
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
+"En söktyp måste anges genom att ange typen:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Exempel: ”search kad file” utför en Kad-sökning efter ”file”.\n"
+"\n"
+"Valfria filter kan läggas till före, efter eller mellan\n"
+"sökord(en):\n"
+"    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
+"    --extension <ext>      (alias: --ext)\n"
+"    --avail <N>            minsta antal källor\n"
+"    --min-size <NKMG>    minsta filstorlek; K=1024, M=K*1024, G=M*1024\n"
+"    --max-size <NKMG>    största filstorlek; samma suffix\n"
+"Exempel: ”search global linux iso --type Iso --min-size 100M” returnerar\n"
+"resultat för ”linux iso” av filtypen Iso som är minst 100 MiB.\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Utför en global sökning."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Utför en lokal sökning"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Utför en kadsökning"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "Visar resultaten av den senaste sökningen."
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Returnera resultaten från föregående sökningen.\n"
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr "Visa resultatet av en sökning."
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+"Returnera resultatet av en sökning.\n"
+"Tar valfritt ett sök-ID (från ”search ...”); utan ID returneras resultatet av den senast startade sökningen.\n"
+
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Visa sökförloppet."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Visa sökförloppet.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+"Visa förloppet för en sökning.\n"
+"Tar valfritt ett sök-ID; utan ID visas förloppet för den senast startade sökningen.\n"
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Börja ladda ner en fil"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6917,80 +8371,80 @@
 "Numret på en fil från den senaste sökningen måste anges\n"
 "Exempel.. 'download 12' kommer att börja ladda ner filen med nummer 12 i den föregående sökningen.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Pausa hämtning."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Fortsätt hämtning."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Avbryt hämtning."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Ställ in hämtningsprioritet."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr "Sätt prioritet för en nedladdning till Låg, Normal, Hög eller Auto.\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Sätt prioritet till låg."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Sätt prioritet till det normala."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Sätt prioritet till högt."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Sätt prioritet till auto."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Visa köer/listor."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr "Visa upp-/ner-laddningskö, serverlistan eller listan över delade filer.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Visa sändningskö."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Visa hämtningskö."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Visa logg."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Visa serverlista."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "Visa listan med delade filer."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Nollställ logg."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Utfasad kommando, använda '%s' i stället."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -6999,255 +8453,278 @@
 "Detta är ett föråldrat kommando, och kan tas bort i framtiden.\n"
 "Använd '%s' istället.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule textklient"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Beräknar hash för hämtad fil: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr "Beräknar hash för fil: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Bygger om AICH-hashuppsättning för fil: %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "Konvertera gamla AICH-hashsets i '%s' till 64b i '%s'."
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr "Verifiera lokala data (%s): resultatet är OK för %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr "Verifiera lokala data (%s): FEL HITTADES! %s misslyckade block: MD4: %s. %s %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr "VARNING: filnamn '%s' är ogiltig och har döpts om till '%s'."
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr "VARNING: Filen '%s' finns redan, ny fil omdöpt till '%s'."
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "Är du säker på att du vill avbryta och ta bort alla filer i denna kategori?"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Konfirmation Krävs"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Endast 99 kategorier stöds."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "För många kategorier!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Alla andra"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Välj vyfiltret"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Lägg till kategori"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Redigera kategori"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Ta bort kategori"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "HashSet begärd för okänd fil: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Kunde inte öppna filen (%s); tar bort den från listan över delade filer."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Återupptar uppladdning av filen: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Uppskjuter uppladdning av filen: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr "Det gick inte att köra kommandot '%s' på '%s' händelsen."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Nedladdning avslutad"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Den fullständiga sökvägen till filen."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Namnet på filen utan sökvägskomponent."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "eD2k-hash av filen."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Storleken på filen i bytes."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Ackumulerad nedladdningsaktivitetstid."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Ny chatt startad"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Meddelandeavsändare."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Slut på utrymme"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Diskpartition."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Fel vid slutföring"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Bearbetar filnummer %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "Du har bett om en del-hashar (används endast för filer> 9,5 MB)"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
-#, fuzzy, c-format
+#: src/utils/aLinkCreator/src/alcc.cpp
+#, c-format
 msgid "%s ---> Non existent file !\n"
-msgstr "%s ---> icke existerande fil!\n"
+msgstr "%s ---> Filen finns inte!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, aMule-eD2k-länk-skapare"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Välkommen!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Inparametrar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Fil att Hash:a"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Lägg till valfria URLer för den här filen"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr "Skriv in filen du vill beräkna eD2k-länk för"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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 in URLen som du vill lägga till eD2k-länken: Lägg till / i slutet för att låta aLinkCreator bifoga det aktuella filnamnet"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr "Ta bort"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Skapa länk med part-hashes"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr "Hjälpa till att sprida nya och ovanliga filer snabbare, på bekostnad av en ökad länk storlek"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4 Fil-hash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k-fil-hash"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k-länk"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Spara"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Kopiera till urklipp"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Öppna"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Öppna en fil för att beräkna dess ed2k-länk"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Kopiera beräknad ED2K-adress till urklipp"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Spara som"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Spara beräknad ED2K-länk till fil"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Om aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr "Välj den fil du vill beräkna ED2K-länk för"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Det går inte att öppna urklipp"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Inget att kopiera just nu!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Välj filen för din beräknade ED2K-länk"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Kunde inte öppna "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Vänligen ange en icke tom filnamn"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Inget att spara just nu!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7267,162 +8744,159 @@
 "\n"
 "Distribuerad under GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Hashar..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator fungerar för dig"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Räknar ut MD4-Hash ..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Räknar ut ED2K-Hashar ..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Avbruten!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Klar om %.2f s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Du har redan lagt till denna URL!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Vänligen ange en icke tom URL"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Kunde inte öppna %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "Slut på minne vid beräkning ed2k hash!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i dag(ar) %i timme(ar) %i min %i s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02umin %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr "%.2f KiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr "%.2f GiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr "%.2f TiB"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, aMule Onlinestatistik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Maximal DL takt sedan wxCas körts"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Absolut Maximal DL takt under wxCas tidigare körningar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Nollställ"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "System"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Stoppa Auto Refresh"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Spara Onlinestatistikbild"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Skriv ut Onlinestatistikbild"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Preferensinställningar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Om wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Starta Auto Refresh"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Auto Refresh stoppad"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Auto Refresh startad"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Spara Statistikbild"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMule Online-statistik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7430,11 +8904,11 @@
 "Det fanns ett problem med utskriften.\n"
 "Är kanske den aktuella skrivaren inte korrekt inställd?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Utskrift"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7452,402 +8926,570 @@
 "\n"
 "Distribuerad under GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Oh nej, aMule körs inte..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule körs"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule kör, men är frånkopplad"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule ansluter..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Oh nej, status för aMule är okänd..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " har kört i "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " är stoppad !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " är inte ansluten!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " ansluter..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " gör någonting konstigt, kontrollera det!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " är ansluten till "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "av"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " är på "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " med "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Totalt Laddat ner: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Ladda upp: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Session nerladdning: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Hämta: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upp: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr " KiB/s, uppladdning: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Delningar: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " fil(er), klienter i kö: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Tid: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " på "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Genomsnittlig systembelastning (1-5-15 min): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Drifttid: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Mapp som innehåller amulesig.dat-fil"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "Skriv in den mapp där din amulesig.dat-fil finns"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Uppdateringsfrekvens intervall i sekunder"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Generera en stat-bild vid varje uppdateringshändelse"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "Skriv in den mapp där du vill generera statistikbilden"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
-#, fuzzy
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
-msgstr "Ladda periodiskt din stat-bild till FTP-servern"
+msgstr "Ladda regelbundet upp din statistikbild till FTP-servern"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP URL"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP sökväg"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Skriv in URL-adressen till din FTP-server"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "Ange här katalogen var du vill spara din stat-bild på FTP-servern"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Användare"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "Här anger du användarnamn för att logga in på din FTP-server"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "Skriv in användarens lösenord för att logga in på din FTP-server"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTP-uppdateringshastighetsintervall i minuter"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Validera"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Mapp som innehåller din signaturfil"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Mapp för skapande av statistikbild"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Laddar mall <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Webbserverns HTTP-port"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Använd UPnP port forwarding på webbserverport"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP-port"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Använd gzip-komprimering"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Lösenord för full tillgång till webbservern"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Gästlösenord för webbservern"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Tillåt gäståtkomst"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Neka gäståtkomst"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "Ladda/spara webbserverinställningar från / till fjärr-aMule"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMule konfigurationsfilssökväg. ANVÄND INTE DIREKT!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Inaktivera PHP-tolk (föråldrat)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Återkompilera PHP-sidor vid varje begäran"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule webbserver"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "webbklientanslutning accepterad\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "FEL: kan inte acceptera webbklientanslutning\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Begäran misslyckades med följande fel: %s ."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Indexfil hittades inte: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Session löpt ut - begär inloggning\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Session ok, loggade in\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Session ok, inte inloggad\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Ingen session öppnades - kommer att begära inloggning\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Session skapad - begär inloggning\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Bearbetar begäran original: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
-msgstr ""
+msgstr "Vägrar läsa `pass` från URL-frågesträngen\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Inget lösenord angiven, inloggning kommer inte att tillåtas."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Kontrollerar lösenord\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Lösenords-hash ogiltig\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Lösenord OK\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Lösenord dålig\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "Du har inte anget något lösenord. Tomt lösenord är inte tillåtet.\n"
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Utloggning begärd\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Bearbetar begäran omdirigerad: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
-msgstr ""
+msgstr "aMule (krävs)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
-msgstr ""
+msgstr "Skrivbordsgenväg"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
-msgstr ""
+msgstr "Starta aMule när jag loggar in"
+
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr "Koppla .emulecollection-filer"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
-msgstr ""
+msgstr "Avinstallera"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
-msgstr ""
+msgstr "Ta bort användardata (konfiguration, ED2K-servrar, Kad-noder, delfiler)"
 
-#: packaging/windows/installer_strings.c:43
-#, fuzzy
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
-msgstr "Anslutningen misslyckades "
+msgstr "aMule-programfiler (krävs)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
-msgstr ""
+msgstr "Placera en aMule-genväg på skrivbordet."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
-msgstr ""
+msgstr "Starta aMule automatiskt när den aktuella användaren loggar in (inställning per användare)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr ""
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr "Lägger till aMule i listan ”Öppna med” för .emulecollection-filer och gör programmet till standard om inget annat program har tagit över dem. Att öppna en samling lägger varje eD2k-länk den innehåller i kö."
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "Ta bort aMule-programfiler, genvägar i Start-menyn/på skrivbordet, autostartpost i Run-nyckeln, URL-schemaregistreringar samt posten i Lägg till/ta bort program (krävs)."
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
-msgstr ""
+msgstr "Ta bort %APPDATA%\\aMule permanent för den aktuella användaren (aMule.conf, ED2K-serverlista, Kad-noder, delfiler, IP-filter, vänlista). Lämna avmarkerat för att behålla dina inställningar."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
+"aMule verkar köras från $INSTDIR.\r\n"
+"Stäng aMule (och aMuleD/aMuleGUI) och försök igen."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
+"aMule-demonen (amuled.exe) verkar köras från $INSTDIR.\r\n"
+"Stoppa den och försök igen."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
-msgstr ""
+msgstr "Tar bort föregående aMule-installation vid $0..."
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
+"Kunde inte ta bort föregående aMule-installation vid $0.\r\n"
+"Stäng alla aMule-processer som körs och försök igen, eller avinstallera den föregående versionen manuellt först."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
-msgstr ""
+msgstr "aMule verkar köras. Stäng programmet och kör avinstallationsprogrammet igen."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Uppladdad"
+#~ msgid "Ratio"
+#~ msgstr "Rankning"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Inga delbara filer hittade i mappen: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Byt språk"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "Det finns inga översättningar installerade för aMule"
+
+#~ msgid "No languages available"
+#~ msgstr "Inga språk tillgängliga"
+
+#~ msgid "User name"
+#~ msgstr "Användarnamn"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Erhållna delar"
+
+#~ msgid "Available Parts"
+#~ msgstr "Tillgängliga delar"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Hittade %i känd delad fil, %i okänd"
+#~ msgstr1 "Hittade %i kända delade filer, %i okänd"
+
+#, fuzzy
+#~ msgid " MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H.%M.%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Fjärrserver"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Lokal server"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Ogiltig post i filen med kända filer, filen kan vara skadad: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Sparar PartFile %u av %u"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "För att slippa den här varningen i varje förhandsvisning,\n"
+#~ "Ställ in önskad videospelare i inställningar (standard är %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Filtrerresultat"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Markera som känd fil"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Procent av den totala filer"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Bootstrap"
+
+#~ msgid "New node"
+#~ msgstr "Ny nod"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Mer"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Bootstrap från \n"
+#~ "kända klienter"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Anslut till någon server och/eller Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Koppla från Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Stoppa de nuvarande anslutningsförsöken"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Koppla från de nätverk som nu är anslutna."
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Anslut till de nätverk som är aktiverade."
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Auto-sortera filer (hög CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule sorterar kolumnerna i din nedladdningslista automatiskt"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Förkastar paketet om klient-ip skiljer sig från ip där paketet hämtas från. Används med försiktighet."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Returnera resultaten från föregående sökningen.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Visa sökförloppet.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Anslutning stängd - troligen har aMule avslutats"
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Sök efter ny version vid start"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k-länk: "
+
+#~ msgid "Commit"
+#~ msgstr "Verkställ"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: lägger mig i bakgrunden - vi ses"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr ""
+#~ "Webbsida: https://amule-org.github.io \n"
+#~ "\n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr ""
+#~ "Webbsida: https://amule-org.github.io \n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Forum: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Filen hittades inte."
+#~ msgid "Loaded"
+#~ msgstr "Uppladdad"

amule-3.0.1.tar.gz/po/ta.po -> amule-3.1.0.tar.gz/po/ta.po Changed

@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: aMule GIT\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-23 12:03+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: none\n"
 "Language: ta\n"
@@ -17,69 +17,148 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr ""
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "நண்பரைச் சேர்"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "நீங்கள் சரியான ஐபி மற்றும் துறைமுகம் உள்ளிட வேண்டும்!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "தகவல்"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "குறிப்பிட்ட பயனர்கொத்து தவறானது!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -88,134 +167,260 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+msgid "Failed to open ED2KLinks file."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 ""
-msgstr1 ""
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
 msgstr ""
 
-#: src/amuleAppCommon.cpp:179
-msgid "Failed to open ED2KLinks file."
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+msgstr1 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr ""
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr ""
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr ""
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr ""
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr ""
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
 msgstr ""
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
 msgstr ""
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
 msgstr ""
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr ""
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
 msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr ""
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr ""
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -225,1638 +430,1928 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr ""
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr ""
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr ""
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr ""
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr ""
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, c-format
 msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr ""
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr ""
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr ""
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr ""
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr ""
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr ""
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr ""
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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 deemon ஐப் பயன்படுத்த முடியாது. வெளிப்புற இணைப்புகளை இயக்க, ஒரு சாதாரண aMule ஐப் பயன்படுத்தவும், --ec-config விருப்பத்துடன் அமல் செய்யத் தொடங்கவும் அல்லது ~/.aMule/amule.conf கோப்பில் \"AcceptExternalConnections\" விசையை 1 ஆக அமை"
 
-#: src/amuled.cpp:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr ""
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr ""
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
 msgstr ""
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
 msgstr ""
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
 msgstr ""
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
 msgstr ""
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
 msgstr ""
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
 msgstr ""
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
 msgstr ""
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
 msgstr ""
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
 msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#: src/amuleDlg.cpp
+msgid "New version available"
 msgstr ""
 
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
 msgstr ""
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr ""
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr ""
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr ""
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
 msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
 msgstr ""
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
 msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
 msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
+#: src/amuleDlg.cpp
+msgid "Encryption"
 msgstr ""
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
 msgstr ""
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr ""
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr ""
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr ""
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr ""
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr ""
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr ""
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr ""
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr ""
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr ""
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr ""
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr ""
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr ""
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr ""
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr ""
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr ""
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr ""
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr ""
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr ""
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 #, c-format
-msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgid "Could not delete the category: %s"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
-msgid "Unknown"
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/BaseClient.cpp:1363
+#: src/amule-remote-gui.cpp
 #, c-format
-msgid "Failed to retrieve shared files from user '%s'"
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
+msgid "Unknown"
 msgstr ""
 
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr ""
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr ""
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr ""
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr ""
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr ""
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr ""
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr ""
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr ""
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr ""
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr ""
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr ""
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr ""
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr ""
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
 msgstr ""
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr ""
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr ""
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr ""
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr ""
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr ""
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "பயனர் %s (%u) உங்கள் பகிரப்பட்ட கோப்பகங்கள்-பட்டியல் -> ஏற்கப்பட்டது"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "பயனர் %s (%u) உங்கள் பகிரப்பட்ட கோப்பகங்கள்-பட்டியலைக் கோரினார் -> மறுக்கப்பட்டது"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "பயனர் %s (%u) உங்கள் பகிரப்பட்ட கோப்புகளின் பட்டியலை '%s' கோப்பகத்திற்காக கோரினார் -> மறுக்கப்பட்டது"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "பயனர் %s (%u) பகிர்ந்த கோப்பகம் '%s'"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "பயனர் %s (%u பகிரப்பட்ட கோப்பகம்/கோப்புகள் பட்டியலுக்கான அணுகலை மறுத்தனர்"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 ""
 msgstr1 ""
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr ""
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr ""
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr ""
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr ""
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr ""
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr ""
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr ""
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr ""
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr ""
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr ""
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr ""
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr ""
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr ""
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr ""
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr ""
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr ""
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr ""
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr ""
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr ""
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr ""
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr ""
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr ""
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr ""
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr ""
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "காட்"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr ""
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr ""
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr ""
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr ""
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr ""
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr ""
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr ""
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr ""
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr ""
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr ""
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Auto"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
-msgid "Auto"
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
-msgid "Enter new name for this file:"
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
-msgid "File rename"
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1279
-#, c-format
-msgid "Downloads (%i)"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Enter new name for this file:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "File rename"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
+#: src/DownloadListCtrl.cpp
+#, c-format
+msgid "Downloads (%i)"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgid "Total queue size: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr ""
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr ""
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr ""
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "You already have the file '%s'"
+msgid "You already have the file '%s' (requested as '%s')"
 msgstr ""
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "You are already trying to download the file %s"
+msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1418
+#: src/DownloadQueue.cpp
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+msgid "You are already trying to download the file %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 ""
 msgstr1 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr ""
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr ""
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr ""
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr ""
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr ""
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr ""
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
+#: src/ExternalConn.cpp
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ExternalConn.cpp:1536
-msgid "WebSearch from remote interface makes no sense."
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr ""
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr ""
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr ""
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr ""
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr ""
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr ""
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr ""
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1864,23 +2359,23 @@
 "Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr ""
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr ""
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1888,59 +2383,59 @@
 "\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr ""
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr ""
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr ""
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr ""
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
 "Ok, exiting %s...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -1949,2215 +2444,2857 @@
 "Exiting...\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr ""
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "அகோவேறுகழுதை இயங்கும் புரவலன். (இயல்புநிலை: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr ""
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr ""
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
 #, c-format
-msgid "%.2f kB/s"
+msgid "%.2f KiB/s"
 msgstr ""
 
-#: src/FriendList.cpp:123
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/FileLaunch.cpp
+msgid "File preview"
 msgstr ""
 
-#: src/FriendList.cpp:149
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
 msgstr ""
 
-#: src/FriendList.cpp:266
-msgid "CRITICAL - no client on StartChatSession"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
-msgid "Friends"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:141
-msgid "Add a friend"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:144
-msgid "Remove Friend"
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:145
-msgid "Send &Message"
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:180
-msgid "Are you sure that you wish to delete the selected friend?"
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:182
-msgid "Are you sure that you wish to delete the selected friends?"
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:574
+#: src/FirstRunWizard.cpp
 msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "CRITICAL - no client on StartChatSession"
+msgstr ""
+
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
+msgid "Friends"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Add a friend"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Remove Friend"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Send &Message"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr ""
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr ""
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr ""
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr ""
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr ""
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr ""
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr ""
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr ""
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr ""
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr ""
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "%u ஐபி-வரம்பு ஏற்றப்பட்டது '%s' இலிருந்து."
 msgstr1 "%u ஐபி-வரம்புகள் ஏற்றப்பட்டது '%s' இலிருந்து."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 ""
 msgstr1 ""
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
 msgstr ""
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr ""
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr ""
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr ""
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr ""
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr ""
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 ""
 msgstr1 ""
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 ""
 msgstr1 ""
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr ""
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr ""
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr ""
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr ""
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr ""
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr ""
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr ""
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr ""
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr ""
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr ""
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "அகோவேறுகழுதையை மறை"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr ""
-
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "அகோவேறுகழுதையை மறை"
-
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
-msgid "Exit"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Exit"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
 msgstr ""
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
 msgstr ""
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr ""
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr ""
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr ""
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr ""
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr ""
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr ""
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr ""
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr ""
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr ""
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr ""
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
 msgstr ""
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr ""
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr ""
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr ""
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
 msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr ""
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
+#: src/muuli_wdr.cpp
+msgid "Filter"
 msgstr ""
 
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr ""
-
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr ""
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr ""
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
+#: src/muuli_wdr.cpp
+msgid "Extend"
 msgstr ""
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr ""
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr ""
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr ""
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr ""
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr ""
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
+#: src/muuli_wdr.cpp
+msgid "met-File"
 msgstr ""
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
+#: src/muuli_wdr.cpp
+msgid "Hash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
 msgstr ""
 
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
+#: src/muuli_wdr.cpp src/Statistics.cpp
+msgid "Transfer"
 msgstr ""
 
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
 msgstr ""
 
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
 msgstr ""
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
-msgid "Transfer"
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
 msgstr ""
 
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
+#: src/muuli_wdr.cpp
+msgid "Available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
+#: src/muuli_wdr.cpp
+msgid "Datarate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
 msgstr ""
 
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
 msgstr ""
 
-#: src/muuli_wdr.cpp:611
-msgid "Intelligent Corruption Handling"
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
 msgstr ""
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
 msgstr ""
 
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
 msgstr ""
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr ""
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr ""
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr ""
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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 ""
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr ""
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr ""
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr ""
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr ""
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr ""
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr ""
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr ""
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr ""
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr ""
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr ""
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr ""
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr ""
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr ""
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr ""
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
+#: src/muuli_wdr.cpp
+msgid "Client version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
+#: src/muuli_wdr.cpp
+msgid "User ID"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
+#: src/muuli_wdr.cpp
+msgid "Server IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
+#: src/muuli_wdr.cpp
+msgid "Current request"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr ""
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
-msgid "Max sources per downloading file:"
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1395
-msgid "Max simultaneous connections:"
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
+#: src/muuli_wdr.cpp
+msgid "Max sources per downloading file:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1444
-msgid "retries"
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
+#: src/muuli_wdr.cpp
+msgid "retries"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
-msgid "OK"
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1966
-msgid "Click here to apply any changes made to the preferences."
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1969
-msgid "Reset any changes made to the preferences."
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
+msgid "OK"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
+#: src/muuli_wdr.cpp
+msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
+#: src/muuli_wdr.cpp
+msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 msgid "Source:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4165,11 +5302,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4179,836 +5316,748 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
+#: src/muuli_wdr.cpp
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2696
-msgid "Enable Proxy"
+#: src/muuli_wdr.cpp
+msgid "The proxy host name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2697
-msgid "Enable/disable proxy support"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
+#: src/muuli_wdr.cpp
+msgid "The proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2714
-msgid "The proxy host name"
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2719
-msgid "The proxy port"
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
+#: src/muuli_wdr.cpp
+msgid "Remember those settings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2763
-msgid "Remember those settings"
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
 msgstr ""
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr ""
-
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr ""
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr ""
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr ""
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 ""
 msgstr1 ""
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr ""
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr ""
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr ""
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr ""
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr ""
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr ""
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr ""
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr ""
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr ""
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr ""
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr ""
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
 msgstr ""
 
-#: src/OtherFunctions.cpp:1212
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
 #, c-format
-msgid "Using config dir: %s"
+msgid "%u or more other sources have this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr ""
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr ""
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr ""
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr ""
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr ""
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr ""
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "முடிக்கப்பட்ட பகுதி (%i) கண்டறியப்பட்டது %s இல்"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr ""
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr ""
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr "முடிந்ததாக %u பகுதி '%s' இன் குறிக்கப்பட்டது, ஆனால் பார்ட்ஃபைல் எதிர்பார்த்ததை விடக் குறைவாக உள்ளது (%llu பைட்டுகள் உள்ளன, %llu தேவை); மீண்டும் பதிவிறக்குவதற்கான இடைவெளியை மீண்டும் திறக்கிறது."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "%u பகுதி %u (அதிகஅளவு %u) நீளம் கொண்ட கொத்து செய்யும் போது கோப்புமுடிவு ஆனது நீளம் கொண்ட '%s' பகுதி கோப்பு %u: %s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr "ICH: சிதைந்த பகுதி %i %s க்காக மீட்கப்பட்டது -> சேமிக்கப்பட்ட பைட்டுகள்: %s"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr ""
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr ""
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "System default"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
 msgstr ""
 
-#: src/Preferences.cpp:638
-msgid "Albanian"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
 msgstr ""
 
-#: src/Preferences.cpp:639
-msgid "Arabic"
+#: src/PeerCapabilities.h
+msgid "IPv6"
 msgstr ""
 
-#: src/Preferences.cpp:640
-msgid "Asturian"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr ""
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr ""
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr ""
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr ""
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr ""
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr ""
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr ""
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr ""
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr ""
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr ""
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr ""
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr ""
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr ""
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr ""
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr ""
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr ""
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr ""
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
 msgstr ""
 
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr ""
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr ""
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr ""
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr ""
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr ""
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr ""
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr ""
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr ""
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr ""
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr ""
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr ""
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr ""
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr ""
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr ""
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr ""
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr ""
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr ""
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/Preferences.cpp
+msgid "no options available"
 msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "No languages available"
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:982
-msgid "no options available"
-msgstr ""
-
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5018,1337 +6067,1686 @@
 "these settings."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
 "If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 ""
 msgstr1 ""
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
 msgstr ""
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr ""
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr ""
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+#: src/SearchDlg.cpp
+msgid "Search in progress"
 msgstr ""
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Main"
 msgstr ""
 
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
-msgid "Main"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
 msgstr ""
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
 msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr ""
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-msgid "Bitrate"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:718
-msgid "Search related files (eD2k, local server)"
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
+#: src/SearchListCtrl.cpp
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr ""
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
 msgstr ""
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr ""
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr ""
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr ""
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr ""
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 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"
-msgstr0 ""
-msgstr1 ""
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr ""
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr ""
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr ""
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr ""
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr ""
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr ""
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr "சேவையகம் சேர்க்கப்பட்டது: %s:%d இல் உள்ள சேவையகம் '%s' என்ற பெயரைப் பயன்படுத்தி."
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr ""
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr ""
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr ""
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr ""
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr ""
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr ""
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr ""
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr ""
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 ""
 msgstr1 ""
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr ""
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr "%s சேவையகங்களுக்கான dns ஐத் தீர்க்க முடியவில்லை: இணைக்க முடியவில்லை!"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr ""
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr ""
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr ""
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr ""
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr ""
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr ""
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr ""
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr ""
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr ""
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr ""
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr ""
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr ""
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr ""
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr ""
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr ""
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr ""
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr ""
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 ""
 msgstr1 ""
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
 msgstr0 ""
 msgstr1 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
+msgid "Shared directory not readable, skipping: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
-msgid "Upload Status"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
-msgid "Download Status"
-msgstr ""
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+msgstr1 ""
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "பயனர் %s (%u) பகிர்ந்த கோப்பகம் '%s'"
+msgstr1 "பயனர் %s (%u) பகிர்ந்த கோப்பகம் '%s'"
 
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
-msgid "Local File Name"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
 msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
-msgid "Shares File List"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Status"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Download Status"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Local File Name"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Shares File List"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
+#: src/SharedFilesCtrl.cpp
+msgid "Directory Path"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:114
-msgid "Directory Path"
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "பயனர் %s (%u) பகிர்ந்த கோப்பகம் '%s'"
+msgstr1 "பயனர் %s (%u) பகிர்ந்த கோப்பகம் '%s'"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr ""
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
 msgstr ""
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr ""
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr ""
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr ""
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr ""
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr ""
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr ""
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr ""
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr ""
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr ""
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr ""
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr ""
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr ""
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr ""
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr ""
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr ""
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr ""
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr ""
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr ""
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "கட்டளை '%s' pid '%d' உடன் '%d' நிலைக் குறியீட்டுடன் முடிந்தது."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr ""
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr ""
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr ""
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr ""
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6356,7 +7754,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6364,141 +7762,140 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr ""
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr ""
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr ""
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr ""
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr ""
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
 msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr ""
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr ""
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr ""
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Download:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Upload:\t%s"
 msgstr ""
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
 "Total sources:\t%d\n"
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/TextClient.cpp
+msgid "PartFile"
 msgstr ""
 
-#: src/TextClient.cpp:965
+#: src/TextClient.cpp
 #, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr ""
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr ""
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6507,46 +7904,46 @@
 "Example: 'statistics 5' will show only the top 5 versions for each client type.\n"
 msgstr ""
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "அகோவேறுகழுதை ஐ மூடவும்."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr ""
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr ""
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6554,35 +7951,35 @@
 "or a resolvable DNS name."
 msgstr ""
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr ""
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6593,109 +7990,121 @@
 "The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr ""
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr ""
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr ""
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6714,373 +8123,400 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr ""
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr ""
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr ""
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
+#: src/TextClient.cpp
+msgid "Show the results of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr ""
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr ""
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr ""
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr ""
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr ""
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr ""
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr ""
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr ""
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr ""
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr ""
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr ""
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr ""
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr ""
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr ""
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr ""
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr ""
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr ""
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
 "Use '%s' instead.\n"
 msgstr ""
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr ""
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr ""
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr ""
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr ""
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr ""
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr ""
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr ""
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr ""
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr ""
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Failed to execute command '%s' on '%s' event."
 msgstr ""
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr ""
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr ""
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr ""
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr ""
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr ""
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr ""
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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/utils/aLinkCreator/src/alcframe.cpp:144
-msgid "Remove"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7092,172 +8528,169 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
+msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f மெபை"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
+msgid "%.2f GiB"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
+msgid "%.2f TiB"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7268,392 +8701,389 @@
 "Distributed under GPL"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "தொலைநிலை aMule இலிருந்து/வரை வலை சேவையக அமைப்புகளை ஏற்றவும்/சேமிக்கவும்"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr ""
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""

amule-3.0.1.tar.gz/po/tr.po -> amule-3.1.0.tar.gz/po/tr.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:08+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:06+0000\n"
 "Last-Translator: \n"
 "Language-Team: Turkish <li@li.org>\n"
 "Language: tr\n"
@@ -20,72 +20,157 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 3.9\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "aMule Hakkında"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMule uzak denetimi "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Bilgileri:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"eMule üzerine kurulu 'Sistem-Üstü' p2p yazılımı \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2026 aMule Ekibi \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "aMule'nin üzerinde kurulduğu parçalar: \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: XOR matrisi üzerine kurulu eşten eşe iletişim.\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Web Sitesi:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Forum:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "Belgelendirme:"
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "Hata raporları:"
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "Yeni sürümü denetlemek için tıklayın."
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "Güncellemeleri kontrol et"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "Güncellemeler kontrol ediliyor…"
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "En yeni sürümü kullanıyorsunuz."
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "Yeni bir sürüm (%s) mevcuttur:"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr "Güncellemeler kontrol edilemedi. Lütfen daha sonra tekrar deneyin."
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Arkadaş Ekle"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Geçerli bir IP ve port girmelisiniz!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Bilgi"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Belirlenen kullanıcı adreslemesi geçersiz!"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
-"aMule, normal olarak kurulmuş bir uygulama gibi görünmesi için ev dizininize bir masaüstü başlatıcısı ve ikonu kurabilir. Bu, geri alınabilir — dosyalar ~/.local/share/applications ile ~/.local/share/icons konumlarında bulunurlar ve ne zaman isterseniz onları kaldırabilirsiniz.\n"
+"aMule, normal olarak kurulmuş bir uygulama gibi görünmesi için ev dizininize bir masaüstü başlatıcısı, ikonlar ve kabuk komut kısayolları kurabilir.\n"
+"\n"
+"Bu, geri alınabilir — dosyalar ~/.local/share/applications, ~/.local/share/icons ile ~/.local/bin konumlarında bulunurlar ve ne zaman isterseniz onları kaldırabilirsiniz.\n"
 "\n"
 "Masaüstü birleşimi şimdi kurulsun mu?"
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr "aMule uygulama menünüze eklensin mi?"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr "Kur"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr "Şimdi değil"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr "Tekrar sorma"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr "Masaüstü birleşimi kurulamaz: APPDIR ortam değişkeni tanımlı değil. Bu, genelde AppImage başlatılmasının standart olmayan bir yolla yapıldığı manasına gelir."
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr "aMule birleşimi başarısız"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr "Masaüstü birleşimi kurulamaz: %s oluşturulması başarısız oldu. Ev dizininizin yazılabilir olduğundan emin olun."
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr "Masaüstü birleşimi kurulamaz: %s yazması başarısız oldu. Ev dizininizin yazılabilir olduğundan emin olun."
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr "AppImage birleşimi: aMule uygulama menünüze ilave edildi."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr "AppImage birleşimi: aMule uygulama menünüze ilave edildi (~/.local/bin konumunda %d kabuk kısayolu)."
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -99,82 +184,167 @@
 "\n"
 "aMule şimdi tekrar başlatılsın mı?"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr "aMule kuruldu"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr "Şimdi tekrar başlat"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr "Daha sonra"
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 "ED2Links dosyasından %u bağlantı eklenemedi (ayrıntılar için kütüğe bakın)."
-msgstr1 "ED2Links dosyasından %u bağlantı eklenemedi (ayrıntılar için kütüğe bakın)."
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "HATA"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "ED2KBağlantı dosyası açılamadı."
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 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/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+"Başka bir program aMule kilit dosyasına sahiptir:\n"
+"\n"
+"%s\n"
+"\n"
+"Bu, çalışmakta olan bir aMule örneklemesi değildir, yani ön plana getirilecek hiçbir şey yoktur. Diğer programı kapatın veya kilit dosyasını aMule çalışmazken silin."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+"aMule daemon'u (amuled) zaten %d süreci olarak çalışmaktadır ve bu yapılandırmayı kullanmaktadır.\n"
+"\n"
+"Ön plana getirilecek hiçbir penceresi yoktur. Ona amuleGUI ile bağlanın veya daemon'u aMule'ü başlatmadan önce durdurun."
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr "aMule başlatılamaz"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr "%s üzerinde izinler sadece sahibi için olarak kısıtlanmıştır."
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr "Fihristleme dosyası bulunamadı: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Geçersiz veya boş koleksiyon dosyası: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr "Koleksiyonda kullanılabilir bağlantı bulunamadı: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 "Şu koleksiyonda %u kullanılamaz bağlantı atlandı: %s"
+msgstr1 "Şu koleksiyonda %u kullanılamaz bağlantı atlandı: %s"
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Magnet bağlantısı eD2k' ya çevrilemez: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Geçersiz eD2k bağlantısı \"%s\" - HATA: %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Ana uygulamadan çıkılıyor…"
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Amuleweb oturumu pid `%d' ile sonlandırılıyor… "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "pid `%d' ile ilişkili amuleweb oturumu öldürülüyor… "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Başarısız"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "'%d' pid'sine sahip amuleapi oturumu sonlandırılıyor… "
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "pid `%d' ile ilişkili amuleapi oturumu sonlandırılıyor… "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule Çıkışında: Çekirdek imha ediliyor."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "aMule kapatılma işlemi tamamlandı."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "aMule çıkışı için hafıza hata raporlama sonuçları:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr "aMule eşten eşe trafiği şu arayüze bağlanıyor: %s (HTTP güncellemeleri varsayılan yolu kullanır)"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr "Tüm ağ trafiği şu arayüze bağlanıyor: %s"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr "İKAZ: yapılandırılmış ağ arayüzü '%s' bulunamadı - trafik ona bağlı DEĞİL ve varsayılan yol ile dışarı çıkabilir. Arayüz ismini Tercihler'de kontrol edin."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr "İKAZ: '%s' ağ arayüzüne bağlamak yüksek izinler gerektirmektedir ve UYGULANMAMIŞTIR - trafik varsayılan yol ile dışarı çıkabilir. Gerekli yeteneği tanıyın (mesela aMule ikili dosyası üzerinde 'sudo setcap cap_net_raw+ep' komutunu kullanarak) veya yeterli imtiyazlarla çalıştırın."
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr "İKAZ: '%s' ağ arayüzüne bağlama yapılamadı - trafik varsayılan yoldan dışarı çıkabilir."
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Bir yapılandırma değişikliği nedeniyle dil ayarınız 'Sistem Varsayılanı'na çevrildi. Üzgünüm. Vallahi…"
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Bilgi"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -182,24 +352,45 @@
 "\n"
 "EC yapılandırması"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Parola ayarlandı ve dış bağlantılar etkinleştirildi."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "UYARI"
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr "eD2k sunucu listesi (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr "Ağ başlatılıyor"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr "Kad başlangıç düğümleri (nodes.dat)"
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "Geçici dosyalar yükleniyor"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Geçici dosyalar yükleniyor (%u, toplam %u üzerinden)"
+
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "Paylaşılan dosyalar yükleniyor"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "Paylaşılan dosyalar yükleniyor (%u)"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "Başlatılıyor"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "Ağ başlatması"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
@@ -207,30 +398,58 @@
 "aMule, eksik ağ başlatma dosyaları olduğunu tespit etti.\n"
 "Hangilerinin indirileceklerini seçin:"
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
-msgstr "Ağ başlatması"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "eD2k sunucu listesi (server.met)"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Kad başlangıç düğümleri (nodes.dat)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web sunucusu pid %d üzerinde çalışıyor"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "Web sunucusunun başlangıçta çalışmasını istediniz, fakat amuleweb ikilisi çalıştırılamıyor. Lütfen aMule web sunucusunu içeren paketi yükleyin veya aMule' yi -DBUILD_WEBSERVER=YES seçeneği ile derleyin ve kurun."
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "HATA"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr "amuleapi Harici Bağlantı jetonu %s konumuna yazılamadı; amuleapi yapılandırılmış parolasına dönüş yapacaktır."
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr "amuleapi pid %d üzerinde çalışıyor"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "amuleapi'nın başlangıçta çalışmasını istediniz, fakat amuleapi ikilisi çalıştırılamıyor. Lütfen aMule REST API sunucusunu içeren paketi yükleyin veya aMule' yi -DBUILD_AMULEAPI=YES seçeneği ile derleyin ve kurun."
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr "Harici Bağlantı: '%s' unsuruna bağlanılamadı, sadece 127.0.0.1 üzerinde dinleniliyor."
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Belirtilen şu adrese portlar bağlanamıyor: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port. %u kullanılamıyor. DÜŞÜKID alacaksınız.\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -245,48 +464,48 @@
 "\n"
 "Ağ ayarlarınıza göz atarak portun giriş ve çıkışlar için açık olup olmadığını denetleyiniz."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Çevrim içi İmza dosyası oluşturma başarısız."
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "aMule Çevrim içi İmza dosyası oluşturma başarısız."
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 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/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Hoş geldiniz! aMule %s sürümünü ilk kez kullanıyorsunuz."
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 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/amule.cpp:1274
+#: src/amule.cpp
 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/amule.cpp:1275
+#: src/amule.cpp
 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/amule.cpp:1280
+#: src/amule.cpp
 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/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "https://amule-org.github.io veya IRC kanalımız: irc.libera.chat sunucusunda #aMule \n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Her türlü hatayı bize bildirmekten çekinmeyin https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -294,513 +513,506 @@
 "Belirlediğiniz Çevrim içi İmza dosyaları dizini GEÇERSİZ!\n"
 " Çevrim içi İmza, ayarlarınızda düzeltene kadar DEVRE DIŞI bırakıldı."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Sunucu makine adı uyarıldı"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr "Ortam üst verileri: incelenen dosya artık bilinmiyor, sonuç görmezden gelindi (%s)"
+
+#: src/amule.cpp
 #, 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/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "HATA: Günlük dosyası açılamıyor."
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "UYARI: Günlük dosyası boş, bir şeyler yanlış."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Günlük kaydı silindi"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Sunucu İletisi: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr "%s indirilmeyecek; çünkü istenen dosya yeni değil."
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Nod listesini indirme başarısız."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 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/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Bozuk sürüm denetleme dosyası"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "aMule'nin eski bir sürümünü kullanıyorsunuz!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "En güncel sürüm her zaman https://github.com/amule-org/amule/releases/latest adresinde bulunabilir."
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, 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/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "aMule sürümünüz güncel."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Sürüm denetleme dosyasını indirme başarısız oldu."
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Kullanıcılar: %s | Dosyalar: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, 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/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Hiç bir ağ seçilmedi"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "DüşükID ile"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "YüksekID ile"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "Bağlandı: %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "Bağlanıyor: %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "eD2k Bağlantısı kesildi"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kademlia başladı."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kademlia durdu."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "Kademlia ağına bağlanıldı (tamam)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "Kademlia ağına bağlanıldı (Güvenlik duvarı arkasında)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Kademlia bağlantısı kesildi."
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 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/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Kad ağı ayarlarda devre dışı bırakılmış, bağlanılmıyor."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 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 https://amule-org.github.io/docs adresinde bulunabilir."
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - zamanlayıcı başlatılıyor"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: arka plana çatallanıyor - görüşürüz"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "Pid dosyası oluşturulamıyor"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "HATA: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Bu, eMule üzerine kurulu olan aMule %s yazılımıdır."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "%s üzerinde çalışıyor"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Yeni sürüm denetimi için https://github.com/amule-org/amule/releases/latest adresini ziyaret ediniz."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ÖNEMLİ HATA: Zamanlayıcı oluşturulamadı"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMule uzak denetimi "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "Hata! Tercihler yüklenemedi"
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Bilgileri:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Ağlar"
 
-#: src/amuleDlg.cpp:545
-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
+msgid "Searches"
+msgstr "Aramalar"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Web Sitemiz: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "İndirmeler"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Forumumuz: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Paylaşılan dosyalar"
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Belgelendirme: https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Kullanıcılar"
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
-"Hata raporları: https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Sohbet"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2026 aMule Ekibi \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "İstatistikler"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "aMule'nin üzerinde kurulduğu parçalar: \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Ayarlar"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: XOR matrisi üzerine kurulu eşten eşe iletişim.\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr "Gezinti"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "Boş alan: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "İleti"
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "Yeni bir sürüm mevcuttur"
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"Yeni bir aMule sürümü (%s) mevcuttur.\n"
+"\n"
+"Siz, %s sürümünü çalıştırmaktasınız.\n"
+"\n"
+"İndirme sayfasını açmak ister misiniz?"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "aMule diyaloğu imha edildi"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "Bağlanıyor"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: Bağlanıyor"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: Bağlantı kesildi"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: Güvenlik Duvarı"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: Bağlandı"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: Bağlanıyor"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: Kapalı"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "İptal"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Durdur"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Bağlantıyı Kes"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr "Çekirdek"
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Sürüm"
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Bağlanılmış olan ağlar ile bağlantıyı Kes"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr "Çekirdek ve aMuleGUI farklı sürümlerdir."
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr "Çekirdek ve aMuleGUI aynı sürümdedir."
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "Bağlan"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Adres"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "Etkinleştirilmiş olan ağlara bağlan"
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "Şifreleme"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Gön: %.1f%s (%.1f) | İnd: %.1f%s (%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/sn"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " MiB/s"
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " KiB/s"
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Gön: %.1f%s | İnd: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | Bağlandı)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Bağlantı kesildi)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "%s üzerinden çıkmayı gerçekten istiyor musunuz?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Çıkışı onaylayınız"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Çalıştırma Komutu: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- ön tanımlı -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Kaplama dizini '%s' yok"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "UYARI: Kaplama dosyası '%s' okuma için açılamıyor"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Ağlar"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Ağ Penceresi"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Aramalar"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Arama Penceresi"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "İndirmeler"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "İndirme Penceresi"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Paylaşılan dosyalar"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Paylaşılan Dosya Penceresi"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Sohbet"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr "İstemciler Penceresi"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Sohbet Penceresi"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "İstatistikler"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "İstatistik Grafik Penceresi"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Ayarlar"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Ayar Penceresi"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "İçe Aktar"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Parça dosyası içe aktarım aracı"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Hakkında"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Hakkında/Yardım"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "eD2k ağı"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kademlia ağı"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Ağ yok"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "aMule Uzak Denetimi"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Önemli Hata: Çekirdek Zamanlayıcı oluşturulamadı"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "Uzak aMule'ye bağlan"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Bağlantı Koptu"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr "İptal et ve çık"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "Tekrar bağlanılıyor… (teşebbüs %d)"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr "Bir sonraki teşebbüs %d saniye sonra…"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+"%s unsuruyla bağlantı koptu.\n"
+"%s\n"
+"\n"
+"Arayüz, bağlantı geri gelinceye dek duraklatıldı."
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Önemli Hata: Havuz Zamanlayıcı oluşturulamadı"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Olay döngüsüne gidiliyor…"
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "Bağlanıyor…"
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr "Bağlantı başarısız oldu. Lütfen makine ismini, bağlantı noktasını ve parolayı kontrol edin."
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Uzak ARAYÜZ EC olay yakalayıcı"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, 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"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "İniyor"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "Bağlantı kesildi - Muhtemelen aMule sonlandırıldı."
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Tekrar bağlanma teşebbüsü zaman aşımına uğradı; yeniden deneniyor."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
@@ -809,1060 +1021,1360 @@
 "Bağlantı zaman aşımına uğradı. Ayrılan vakit zarfında %s:%d ile irtibat kurulamadı.\n"
 "Lütfen adresi, bağlantı noktasını ve aMule'ün Harici Bağlantılar etkinleştirilmiş olarak çalıştırılıp çalıştırılmadığını kontrol edin."
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr "Uzaktaki çekirdekle kurulan bağlantı koptu. Tekrar bağlanma deneniyor…"
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Devre dışı"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr "Uzaktaki çekirdeğe tekrar bağlanıldı."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr "Uzaktaki çekirdek yeniden başlatıldı, tekrar yükleniyor."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "Tekrar bağlanma teşebbüsü %d: %s:%d unsuruna bağlanılıyor"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr "Tekrar bağlanma başlatılamadı; kısa zamanda yeniden denenecek."
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Hazır"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Tümü"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr "okunabilir değil"
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr "bulunamadı"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr "Çekirdek şu paylaşılan dizinleri reddetti: %s"
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Geçersiz bağlantı veya zaten listede mevcut."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr "Daemon, talebi reddetti."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "Kategori silinemedi: %s"
+
+#: src/amule-remote-gui.cpp
 #, 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/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr "Uzaktaki çekirdek \"%s\" için tutarsız veri gönderdi (kısmi durum %d, beklenilen %d). Dosya listesi yanlış bilgi gösteriyor olabilir, bunu düzeltmek için tekrar bağlanın."
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: src/BaseClient.cpp:1363
-#, 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/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "DüşükID bağlantı için bir eş aranıyor"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Sahte eMule sürümü %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Sahte eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (Sahte eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (eMule s.0.%u üzerine kurulu)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Rumuz: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "İstek: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Bu oturum için dosya durumu: Kabul edilen istek %d, toplam %d, %s aktarıldı\n"
 msgstr1 "Bu oturum için dosya durumu: Kabul edilen istek %d, toplam %d, %s aktarıldı\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "Tüm oturumlar için dosya durumu: Kabul edilen istek %d, toplam %d, %s aktarıldı\n"
 msgstr1 "Tüm oturumlar için dosya durumu: Kabul edilen istek %d, toplam %d, %s aktarıldı\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Bilinmeyen dosya istendi"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "'%s' kullanıcısından gelen ileti engellendi. (IP: %s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "'%s' kullanıcısından yeni ileti geldi (IP: %s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Kullanıcı %s (%u), var olmayan '%s' dizini için paylaşılmış dosya listenizi istedi. -> Görmezden gelindi."
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, 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/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "UYARI: %s açılamıyor."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "UYARI: İptal edilen dosya listesi bozuk. Geçersiz başlık içeriyor."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "%s dosyası okumada IO hatası: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "%s dosyası kaydedilirken hata: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "Captcha Gir"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Sınıf"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Yeni Sınıf"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Gelen dosyalar için bir dizin seçin"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Sınıf için bir isim girmelisiniz!"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Sınıf için bir yol girmelisiniz!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 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/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Sohbet Oturumu Başladı: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** Kullanıcıya Bağlandı. ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** Kullanıcıya Bağlanıyor.***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Kullanıcıya bağlantı başarısız. / Bağlantı koptu.***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 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/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "Sohbet"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Sekmeyi Kapat"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Tüm sekmeleri kapat"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Diğer sekmeleri kapat"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Arkadaşlara Ekle"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "&Ayrıntıları Göster"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Arkadaşlardan Çıkar"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Arkadaş Slotu Kur"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Paylaşılmış Dosyalara bak"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "İleti Gönder"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Kullanıcıya ileti gönder"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Gönderilecek ileti:"
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Birden fazla arkadaş oluğu kurmanıza izin verilmez.\n"
+"Sadece bir oluk atandı."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Çoklu seçim"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 "Arkadaş listenize %u istemci eklensin mi?"
+msgstr1 "Arkadaş listenize %u istemci eklensin mi?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "%u istemci arkadaş listenizden çıkarılsın mı?"
+msgstr1 "%u istemci arkadaş listenizden çıkarılsın mı?"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 "%u seçili istemci arkadaş listenize eklenemedi: onun için hiçbir adres bilinmiyor."
+msgstr1 "%u seçili istemci arkadaş listenize eklenemedi: onlar için hiçbir adres bilinmiyor."
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "%u istemciden paylaşılan dosyalar talep edilsin mi?"
+msgstr1 "%u istemciden paylaşılan dosyalar talep edilsin mi?"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr "Her biri için bir bağlantı açılmıştır."
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "Kredi dosyası yüklendi. %u adet kullanıcı biliniyor"
 msgstr1 "Kredi dosyası yüklendi. %u adet kullanıcı biliniyor"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - %u adet kullanıcı için krediler bitti!"
 msgstr1 " - %u adet kullanıcı için krediler bitti!"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "'cryptkey.dat' dosyası bulunamadı. Oluşturuluyor…"
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Kullanıcı Ayrıntıları"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "DüşükID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "YüksekID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Etkinleştirildi"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Destekleniyor"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Desteklenmiyor"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Devre dışı"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "Bağlandı"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Bağlantı kesildi"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f KiB/s"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Ad"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "Yazılım"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP Adresi"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "Köken"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr "İlk görülme"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr "Son Görülme"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "Oturumlar"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "Gönderme Hızı"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "İndirme Hızı"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "Toplam Gönderilen"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "Toplam İndirilen"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "İND./GÖN. niteleyici"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr "Şimdi çevrimiçi"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Eksik"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Kötü Çocuk"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "İncelendi - Tamam"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Uygun değil"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "%u seçili istemciden paylaşılan dosyaları talep edilemedi."
+msgstr1 "%u seçili istemciden paylaşılan dosyaları talep edilemedi."
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Dosyalar"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Gönderilen"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "İndirildi"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "Şundan indiriliyor:"
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr "Şuna gönderiliyor:"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Etkin"
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr "Bilinen"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Kullanıcı %s (%u), paylaşılmış dosya listenizi istedi. -> Kabul edildi"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Kullanıcı %s (%u), paylaşılmış dosya listenizi istedi. -> Reddedildi"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Kullanıcı %s (%u), paylaşılmış dizin listenizi istedi. -> Kabul edildi"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Kullanıcı %s (%u), paylaşılmış dizin listenizi istedi. -> Reddedildi"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "Kullanıcı %s (%u), '%s' dizini için paylaşılmış dosya listenizi istedi. -> kabul edildi"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "Kullanıcı %s (%u), '%s' dizini için paylaşılmış dosya listenizi istedi. -> reddedildi."
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Kullanıcı %s (%u), %s dizinini paylaşıyor"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, 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:932
+#: src/ClientTCPSocket.cpp
 #, 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:939
+#: src/ClientTCPSocket.cpp
 #, 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:944
+#: src/ClientTCPSocket.cpp
 #, 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:956
+#: src/ClientTCPSocket.cpp
 #, 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/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Dosya Yorumları"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Kullanıcı Adı"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Dosya Adı"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Puanlama"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Yorum"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr "Kad araması başlatılamadı"
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad çalışmıyorsa, Kad. araması yapılamaz."
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "Yorumlar için Kad üzerinde arama yapılıyor…"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Yorum yok"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u adet yorum"
 msgstr1 "%u adet yorum"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, 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:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "'%s' için ülke verisi yüklenemedi."
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Oto (Düş)"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Oto Nor"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Oto (Yük)"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Çok düşük"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Düşük"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Normal"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Yüksek"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Çok Yüksek"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Yayım"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Soruyor"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "Sunucu yoluyla bağlanıyor"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Sıra dolu"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "Sırada"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Aktarılıyor"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Adresleme seti alınıyor"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Gereksiz parçalar"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "DüşükID'den DüşükID'ye bağlanılamaz"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Çok fazla bağlantı"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "Kad yoluyla bağlanıyor"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Çok fazla Kad bağlantısı"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "Engellendi"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Bağlantı Hatası"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Uzaktaki Sıra Dolu"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Eski MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Yeni MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Sunucu"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Uzak Sunucu"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Kaynak Değişimi"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Pasif"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Bağlantı"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Kaynak Girdileri"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Arama Sonucu"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Tamamlandı"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "İşlem yapılıyor"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "HATA: disk alanı yetersiz"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "HATA: Partmet bulunamadı"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "HATA: Girdi-çıktı hatası!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "HATA: Başarısız!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "Sıraya girdi"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Zaten aktarılıyor"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Bilinmeyen yada bozuk geçici dosya formatı."
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr "Bu dizin özyinelemeli bir paylaşımın bir parçasıdır. Onu kaldırmak için, üzerindeki özyinelemeli paylaşım kökünün paylaşımını kaldırın veya değiştirin."
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr "Özyinelelemeli bir paylaşım dahilinde paylaşım kaldırılamaz"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr "Özyinelemeli bir paylaşım dahilinde değişim yapılamaz"
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Parça"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Boyut"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Aktarıldı"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Hız"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "İşlem"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Kaynaklar"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Öncelik"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Durum"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Kalan Süre"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Son Tamamlanmış Görülme"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Son Alım"
 
-#: 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/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/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Geri besleme: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Otomatik"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "İptal"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "&Dur"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "&Durakla"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "&Başlat"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Tamamlananları T&emizle"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Tüm A4Afleri derhal bu dosyaya geçir"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Tüm A4Afleri bu dosyaya geçir (Otomatik)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Tüm A4Afleri derhal bir başka dosyaya geçir"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Genişletilmiş Seçenekler"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Ön İzleme"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "Dosya yöneticisinde göster"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Dosya &ayrıntılarını göster"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Tüm yorumları göster"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Magnet bağlantısını panoya kopyala"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "eD2k bağlantısını panoya kopya&la"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Geri beslemeyi panoya kopyala"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "Bu dosya için %s iste"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "atamayı kaldır"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Sınıfa Ekle"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "Dosyayı &Aç"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Seçili dosyayı silmek istediğinizden emin misiniz?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Seçili dosyaları silmek istediğinizden emin misiniz?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Geri besleme: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Bu dosya için yeni bir isim girin:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Dosya yeniden adlandır"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
+msgid "%.1f MiB/s"
+msgstr "%.1f MiB/s"
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "İndirmeler (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr "varsayılan Windows kabuk işleyicisi"
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Her önizlemede bu uyarının gösterilmesini önlemek için,\n"
-"seçeneklerden tercih ettiğiniz video oynatıcısını ayarlayın (varsayılan %s)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Dosya ön izlemesi"
-
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, 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'"
+msgid "Total queue size: %s"
+msgstr "Toplam kuyruk boyutu: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "ParçaDosyası %u, %u'da kaydediliyor"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Tüm ParçaDosyaları Kaydedildi."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "%s konumundan geçici dosyalar yükleniyor."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "ParçaDosyası %u %u'dan yükleniyor"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "HATA: Yedekleme dosyası yüklenemedi. .part.met kurtarma çözümleri için https://github.com/amule-org/amule/discussions adresini ziyaret edin."
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Tüm ParçaDosyaları Yüklendi."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Hiç part dosyası bulunamadı"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "%u adet parça dosyası bulundu"
 msgstr1 "%u adet parça dosyası bulundu"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Geçici dizininin dosya sistemi büyük dosyaları kullanamaz."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Gelen dizininin dosya sistemi büyük dosyaları kullanamaz."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Aktarılıyor %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Zaten %s dosyasını indirmeye çalışıyorsunuz."
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Zaten '%s' dosyasına sahipsiniz ('%s' olarak talep edilmiş)"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Zaten %s dosyası var."
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "%s dosyasını indirmeyi zaten deniyorsunuz"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Magnet bağlantısı eD2k' ya çevrilemez: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Bağlantı için bilinmeyen protokol: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 "%u bağlantı eklenemedi (teferruatlar için kütüğe bakın)."
 msgstr1 "%u bağlantı eklenemedi (teferruatlar için kütüğe bakın)."
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Geçersiz eD2k bağlantısı! HATA: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 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:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Dışarıdan bağlantı kesildi."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Boş şifre sebebiyle dışarıdan bağlantı devre dışı!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 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:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Yeni dışarıdan bağlantı kabul edildi"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "HATA: yeni bir dış bağlantı kabul edilemiyor"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 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:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Kullanıcıya bağlanılıyor: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Bilinmeyen sürüm"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "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:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "Bir geliştirme sürümünden dengeli bir sürüme bağlanamazsınız! *muhtemel* bir çökme önlendi"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Geçersiz protokol sürümü."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Kayıp protokol sürüm eki."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Çok fazla başarısız bağlantı teşebbüsü; %d saniye içinde tekrar deneyin."
+
+#: src/ExternalConn.cpp
 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:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr "Kimlik doğrulaması başarısız oldu: istemci şifrelenmiş bir Harici Bağlantı sundu fakat hiçbir kullanılabilir anahtar göndermedi."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr "Kimlik doğrulaması başarısız oldu: bu aMule şifrelenmiş bir Harici Bağlantı gerektiriyor fakat istemci böyle bir bağlantı kuramadı."
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr "Kimlik doğrulaması başarısız oldu: istemci şifrelenmiş oturumu teyit edemedi."
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "Kimlik doğrulama başarısız oldu: yanlış parola."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "Kimlik doğrulama başarısız oldu: kayıp parola."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "Geçersiz istem, öncelikle doğrulatmanız lazım."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Giriş izni verildi."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "\"%s\" hata iletisi istemciye gönderildi."
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "%s üzerinden yetkilendirilmemiş giriş denemesi. Bağlantı kesildi."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, 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:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Dosya adreslemesi bulunamadı: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "Aman aman! OpCode işleme hatası!"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Sunucu eklenmedi."
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "sunucu bulunamadı: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "çıkarılacak sunucunun tanımlanması gerekli"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k ayarlarda devre dışı bırakılmış."
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr "Bu arkadaş için henüz hiçbir adres bilinmiyor."
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr "Arkadaş bulunamadı."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr "İstemci bulunamadı."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr "EC_TAG_FRIEND_SHARED, EC_TAG_FRIEND veya EC_TAG_CLIENT gerektirir."
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Arama sürüyor. Bir dakikaya sonuçlanır!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Uzak arayüzden Web araması yapmak anlamsız."
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr "Göz atma, başlatılabilecek bir arama değildir."
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Arama sürüyor. Bir dakikaya sonuçlanır!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Grafik için hiç nokta yok."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 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:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Bağlantı kapat"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Zaten kapatılıyor."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Dışarıdan Bağ.:'%s' bağlantısı ekleniyor."
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "%d bağlantı, ki toplam %d üzerinden, başarısız oldu (geçersiz veya zaten listede)."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr "Sürüm kontrolü sınırlandırıldı; kısa bir süre sonra tekrar deneyin."
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr "Bu daemon üzerinde sürüm kontrolü mevcut değildir."
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Dosya bulunamadı."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Geçersiz dosya adı."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Dosya yeniden adlandırılamıyor."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr "İstemci bu dosyaya geçirilemedi."
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr "amuleapi parolası kaydedilemedi: %s"
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "Böyle bir kategori yok."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr "Hatalı biçimlendirilmiş kategori talebi."
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr "Varsayılan kategori silinemez."
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "Eksik sohbet oturum kimliği"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "Böyle bir sohbet oturumu yok"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Ortam üst verileri çıkarılması ayarlarda devre dışı bırakılmış"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr "Dosya, ortam üst verileri çıkarılmasına uygun değil (bir ses/video dosyası değil, veya kısmi bir indirme)"
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "Boş sohbet mesajı"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "Bilinmeyen sohbet hedefi"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad ayarlarda devre dışı bırakılmış."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "eD2k ağına zaten bağlandı."
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "eD2k ağına bağlanıyor…"
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Kad zaten bağlı."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "Kad ağına bağlanıyor…"
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Bütün ağlar devre dışı."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "eD2k ağından bağlantı kesildi."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Kad ağından bağlantı kesildi."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Dış Bağlantı: geçersiz opcode alındı: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Geçersiz opcode (yanlış protokol sürümü mü?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Bilinmeyen %s uzantısı, %s komutu için.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Bilinmeyen komut '%s' .\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1870,7 +2382,7 @@
 "\n"
 "Bu komut bir argüman içeremez.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1878,7 +2390,7 @@
 "\n"
 "Bu komut bir argüman içermelidir.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1886,7 +2398,7 @@
 "\n"
 "Bu komut eksik. Aşağıdaki uzantılardan birini girmelisiniz.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1894,11 +2406,11 @@
 "\n"
 "Uygun uzantılar:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Uygun komutlar:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1909,17 +2421,17 @@
 "Tüm komutlar büyük-küçük harf duyarlıdır.\n"
 "'%s <komut>' tuşlayarak <komut> hakkında detaylı bilgi alabilirsiniz.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Uygulamadan çıkar."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Yardımı göster."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1927,7 +2439,7 @@
 "Bir komut hakkında yardım çağırmak için 'help <komut>' yazınız.\n"
 "Tüm komutları görmek için 'help' yazınız.\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1938,46 +2450,46 @@
 "Komut listesi için '%s' kullanınız.\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Söz dizimi hatası!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Bu komut herhangi bir parametre içermemeli."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Bu komut bir parametre içermeli."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Geçersiz argüman."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Bu eksik bir komut."
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Daha fazla yardım için '%s' yazınız.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Bu bir %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Bu bir %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1985,7 +2497,7 @@
 "\n"
 "Yazılım oluşturuluyor…\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1994,7 +2506,7 @@
 "\n"
 "Tamam, çıkılıyor %s…\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2008,118 +2520,370 @@
 "\n"
 "Çıkılıyor…\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Bu yardım dosyasını göster."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "aMule'nin çalıştığı makine. (varsayılan: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Dışarıdan bağlantı için aMule portu. (Varsayılan:4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Dışarıdan bağlantı şifresi."
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Yapılandırmayı dosyadan oku."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "stdout' a herhangi bir çıktı yazdırma."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Geveze ol - hata iletilerini de göster."
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Yazılım yerelini ayarla (dil)"
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Komut satırı seçeneklerini yapılandırma dosyasına yaz."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 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/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Yazılım sürümünü yazdır."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr "Harici Bağlantı oturumunu şifreleme. Şifreleme varsayılan olarak uzaktaki aMule bunu desteklediği her zaman etkindir; devre dışı bırakmak oturum açılışından sonraki her şeyin yol üzerindeki herhangi biri tarafından okunabilir ve değiştirilebilir olarak bırakır."
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr "Seçilen IP adresinin konumuna bakılmaksızın ZLIB sıkıştırmasını zorla (sunucuya, bir LAN IP adresine çözümlenen VPN tüneli üzerinden erişilebildiğinde kullanışlıdır)."
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr "Tüm konsol çıktısının bir kopyasını bu kütük dosyasına ilave et (varsayılan: <ayar-dizini>/amuleapi.log)."
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr "Kütük dosyası yazma; sadece konsolda görüntüle."
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Dosya Ayrıntıları"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% tamamlandı"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Dosya ön izlemesi"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "HATA: harici ortam oynatıcısını çalıştırma başarısız! Komut: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr "Yapılandırılmış video çalıcı bulunamadı: %s"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr "'%s' açılamaz: dosya bu bilgisayarda mevcut değil."
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr "Tamamlanmamış bir indirmenin önizlenmesi bir video çalıcı gerektirir: kısmi olarak indirilmiş dosya, sistemin kendiliğinden açabileceği hiçbir türe sahip değildir. Bu, Tercihler -> Genel bölümünde ayarlanabilir."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr "HATA: '%s' unsurunun varsayılan uygulama ile açılması başarısız oldu."
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "HATA: dosya yöneticisinde '%s' unsurunun gösterilmesi başarısız oldu."
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "Mobil / 4G-5G (20 / 5 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL (24 / 1 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL (50 / 10 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Kablo (200 / 20 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Fiber 300 (300 / 100 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "Gigabit Fiber (1000 / 1000 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr "aMule ilk çalıştırma kurulumu"
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "aMule programına hoş geldiniz!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+"Bu kısa kurulum bağlantı kurmanıza imkân sağlayacaktır. Tüm\n"
+"ayarları daha sonra Ayarlar kısmında değiştirebilirsiniz."
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "Diğer eşlerin göreceği bir rumuz seçin:"
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr "Bağlantı ve bant genişliği"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+"İnternet bağlantınıza en iyi denk gelen seçeneği seçin,\n"
+"veya gönderme ve indirme sınırlarını doğrudan aşağıda ayarlayın."
+
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "Bağlantı hızı:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr "Diğer / el ile ayarla"
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "Gönderme sınırı (KiB/s, 0 = sınırsız):"
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "İndirme sınırı (KiB/s, 0 = sınırsız):"
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "Ağlar ve bağlantı noktaları"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr "aMule iki ağ kullanabilir. Her ikisini de etkin bırakmanızı tavsiye ederiz."
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Standart TCP Portu "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Genişletilmiş UDP portu (Kad / Genel arama) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Yönlendirici port iletimi için UPnP'yi etkinleştir"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+"aMule'ün yönlendiricinizden yukarıdaki bağlantı noktalarını yönlendirmesini istemesine \n"
+"imkân verir, böylece diğer eşler size ulaşabilir (\"YüksekID\"). Bağlantı noktalarını el ile \n"
+"yönlendirecekseniz veya yönlendiriciniz UPnP desteklemiyorsa devre dışı bırakın."
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr "Ön Yükleme dosyaları"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+"Başlamak için aMule'ün eşler hakkında bilgiye ihtiyacı vardır.\n"
+"Şimdi hangi listenin indirileceğini seçin:"
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Eş listeleriniz zaten mevcut - indirilecek hiçbir şey yok."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Otomatik başlangıç"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr "Birleşimler (seçime dayalı)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+"aMule'ün sisteminizle nasıl birleşeceğini seçin. Bu ayarlardan\n"
+"herhangi birini daha sonra Ayarlar'da değiştirebilirsiniz."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "aMule'ü oturum açtığımda otomatik olarak başlat"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr "aMule'ü ed2k:// bağlantıları için kaydet"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr "aMule'ü magnet: bağlantıları için kaydet"
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr "Sadece eD2k-uyumlu magnet bağlantıları. Şayet bir BitTorrent istemcisi kullanıyorsanız devre dışı bırakın."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ".emulecollection dosyalarını aMule ile aç"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr "Dizinler (seçime dayalı)"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+"Varsayılan ayarlar çoğu kişi için uygundur. Başka (mesela daha\n"
+"büyük) bir diske indirme yapmak istiyorsanız bunları değiştirin."
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "İndirmeler için hedef dizin"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Göz at"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "(Bu dizindeki tüm dosyalar diğer eşler ile paylaşılmaktadır)"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Geçici dosyalar için dizin"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+"Buna dayalı olarak aMule, dosya başına %i kaynağa kadar ve %i \n"
+"istemci bağlantısına kadar izin verecektir."
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr "aMule tekrar başlattığınızda bu kurulum sihirbazı yeniden gösterilsin mi?"
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr "Kurulum sona ermedi"
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Arkadaş listesi 'emfriends.met' dosyası okunamıyor!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Arkadaş listesi 'emfriends.met' dosyasına yazılamıyor!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr "'%s' arkadaşı için henüz hiçbir adres bilinmiyor, ona göz atamazsınız."
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "KRİTİK - SohbetOturumunuBaşlat' ta istemci yok"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Arkadaşlar"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "&Ayrıntıları Göster"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Arkadaş ekle"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Arkadaş sil"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "&İleti Gönder"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Paylaşılmış Dosyalara bak"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Arkadaş Slotu Kur"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr "'%s' arkadaşı için henüz hiçbir adres bilinmiyor, ona mesaj gönderemezsiniz."
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Seçili arkadaşı silmek istediğinizden emin misiniz?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Seçili arkadaşları silmek istediğinizden emin misiniz?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2127,977 +2891,1283 @@
 "Birden fazla arkadaş slotu kuramazsınız.\n"
 "Sadece bir slot kuruldu."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Çoklu seçim"
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Birden fazla arkadaş oluğu kurmanıza izin verilmez.\n"
-"Sadece bir oluk atandı."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Kullanıcıya ileti gönder"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Gönderilecek ileti:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Arkadaşlardan Çıkar"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "İleti Gönder"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Bu dosyaya geçir"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr "Renk açıklaması"
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "Sırada: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Başka dosya için soruldu"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "Gönderme slotu için bekleniyor"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "Sırada: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "Gönderiliyor"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "Yok"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Hayır"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Evet"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "'%s' MaxMindDB veri tabanının açılması başarısız oldu: %s"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Aktarılıyor…"
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "HTTP aktarımı iptal edildi"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "İndirme bağlantısı boş olamaz."
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "'%s' için HTTP talebi oluşturulması başarısız oldu"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr "HTTP indirmesi: %s için boş cevap gövdesi"
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "İndirilen dosyanın %s konumuna taşınması başarısız oldu."
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "%s (%llu bayt) indirildi."
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr "%s bağlantısı şunu geri gönderdi: %i"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "%s için HTTP indirmesi başarısız oldu: %s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr "%s için HTTP 401 Yetkisiz"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr "Mevcut GeoLite2-Country.mmdb dosyası %s unsuruna taşındı"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr "IP2Country: MaxMind GeoIP kaynağı olarak seçilmiştir fakat hiçbir Lisans Anahtarı yapılandırılmamıştır. Ayarlar → IP2Country menülerine gidin, ücretsiz MaxMind Lisans Anahtarınızı yapıştırın ve 'Şimdi güncelle' düğmesine tıklayın."
-
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr "IP2Country: kişiselleştirilmiş bir URL (bağlantı) GeoIP kaynağı olarak seçilmiştir fakat hiçbir URL yapılandırılmamıştır. Ayarlar → IP2Country menülerine gidin ve bir .mmdb dosyasına (veya onu içeren bir .gz / .tar.gz dosyasına) işaret eden bir URL girin."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr "%s okunabilir bir MaxMindDB dosyası değil - görmezden geliniyor. Yeni bir kopya gelecek başlatılma esnasında indirilecektir, veya şimdi Ayarlar -> IP2Country -> 'Şimdi güncelle' yoluyla."
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "IP2Country: MaxMind, GeoIP kaynağı olarak seçilmiştir fakat hiçbir Lisans Anahtarı yapılandırılmamıştır. Ayarlar -> IP2Country menülerine gidin, ücretsiz MaxMind Lisans Anahtarınızı yapıştırın ve 'Şimdi güncelle' düğmesine tıklayın."
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "IP2Country: kişiselleştirilmiş bir URL (bağlantı) GeoIP kaynağı olarak seçilmiştir fakat hiçbir URL yapılandırılmamıştır. Ayarlar -> IP2Country menülerine gidin ve bir .mmdb dosyasına (veya onu içeren bir .gz / .tar.gz dosyasına) işaret eden bir URL girin."
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr "IP2Country: bir GeoIP indirme bağlantısının çözümlenmesi başarısız oldu."
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr "Yeni %s unsurunu %s konumundan indir"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "%s dosyasının indirilmesi başarısız oldu, güncelleme iptal ediliyor."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "%s dosyası silinemedi. Güncelleme iptal edildi."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "%s dosyası yeniden adlandırılamadı. Güncelleme iptal edildi."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "%s başarıyla güncellendi."
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr "%s unsurunun güncellemesinde hata oluştu"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr "DB-IP indirmesi güncel ay için başarısız oldu - önceki ayın bağlantısıyla tekrar deneniyor."
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "%s, %s kaynağından indirilemedi."
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "'%s' için ülke verisi yüklenemedi."
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "IP süzgeçleri 'ipfilter.dat' ve 'ipfilter_static.dat' yükleniyor."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, 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 format algılandı."
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, 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."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "%u adet IP-aralığı '%s' unsurundan yüklendi."
 msgstr1 "%u adet IP-aralığı '%s' unsurundan yüklendi."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "%u adet bozuk satır göz ardı edildi."
 msgstr1 "%u adet bozuk satır göz ardı edildi."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Yeni %s dosyası yeniden adlandırılamadı. Güncelleme iptal edildi."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP süzgeci hazır"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bilinen kullanıcılardan\n"
-"Ön Yükleme"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Şimdiki"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Çalışma ortalaması"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Oturum ortalaması"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Düğümler (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Ön yükleme için geçersiz ip"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Ön yükleme için geçersiz port"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "İstenilen tüm alanları doldurunuz."
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "İleti"
+
+#: src/KadDlg.cpp
 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/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Bunu yapmanız şu anki düğümleri silecek ve Kademlia bağlantısını baştan başlatacaktır."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Devam mı?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: Arama sözcüğü çok kısa"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: Arama anahtar sözcüğü zaten arama listesinde var. "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "Nodes.dat dosyası okunamadı- dosya çok eski. Bu sürüm (0) artık desteklenmiyor."
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "%u adet Kademlia bağlantısı okundu"
 msgstr1 "%u adet Kademlia bağlantısı okundu"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Hiç bağlantı bulunamadı. Lütfen, ön yükleme veya nodes.dat dosyası indirmeyi deneyin."
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "Sadece %d Kad bağlantısı var. Nodes.dat yazılmadı"
 msgstr1 "Sadece %d Kad bağlantısı var. Nodes.dat yazılmadı"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "%d Kademlia bağlantısı yazıldı"
 msgstr1 "%d Kademlia bağlantısı yazıldı"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Kad kullanıcısı"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr "'%s' için Kad not araması başlatılmadı: Kad bağlı değil"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr "'%s' için Kad not araması başlatılmadı: bu dosya için bir not araması zaten çalışıyor"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr "'%s' için Kad not araması başlatılmadı: dosya paylaşım listesinde, indirme kuyruğunda veya arama sonuçlarında mevcut değil"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr "'%s' için Kad not araması başlatılmadı: başka bir Kad araması (mesela bir kaynak araması) zaten bu dosyanın karma değeri kullanılarak çalışıyor - kısa bir süre sonra tekrar deneyin"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr "'%s' için Kad not araması başlatılmadı: PrepareLookup başarısız oldu"
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Dosya"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Paylaşım oranı"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Gönderilen"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "İstenen"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Kabul edilen"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Tamamlandı"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "UYARI: Bilinen dosya listesi bozuk. Geçersiz başlık içeriyor."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "Bilinen dosyalar listesinden girdi yüklenemedi. Dosya bozuk olabilir"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "Bilinen dosyalar listesinde geçersiz girdi bulundu. Dosya bozuk olabilir: "
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Sistem öntanımlısı"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Arnavutça"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Arapça"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "Asturyasça"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Baskça"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Bulgarca"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Katalanca"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Çince (Basitleştirilmiş)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Çince (Geleneksel)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Hırvatça"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Çekçe"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Danca"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Felemenkçe"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "İngilizce (U.K)"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "İngilizce (ABD)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Estonca"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Fince"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Fransızca"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Galce"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Almanca"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Yunanca"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "İbranice"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Macarca"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "İtalyanca"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Japonca"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Korece"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "Letonca"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Litvanyaca"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Norveççe (Nynorsk)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Lehçe"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Portekizce"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Portekizce (Brezilya)"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "Rumence"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Rusça"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Slovence"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "İspanyolca"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "İsveççe"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Türkçe"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Ukraynaca"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "Bilinmeyen hata %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "%d hatası için tanımlama alınamadı!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Adresleniyor"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Tamamlanıyor"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Tamamlandı"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Duraklatıldı"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Hatalı"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Bekliyor"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Boş olmayan bir şifre girmelisiniz."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Geçersiz şifre, bir MD5 adreslemesi değil!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr "%s, bir IPv4 adresine çözümlenemedi."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "Bağlantı başarısız"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
 msgstr "Dış bağlantı kesildi — programdan çıkılıyor."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "EC bağlantısı başarısız. Boş cevap."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr "Bağlantı şifrelemesi ayarlanamadı. Bağlantı kapatıldı."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr "Çekirdek, şifrelenmiş bir bağlantı kurmadı. Şifreleme desteği olmayan eski bir aMule sürümü olabilir veya bağlantıya müdahale edilmiş olabilir. Şifreleme olmadan bağlantı kurmak için bağlantı ayarlarında onu devre dışı bırakın."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Dış Bağlantı: Kötü yanıt. Bağlantı kapatıldı."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Harici Bağlantı: servis, parolayı bildiğini ispatlayamadı. Bağlantı kapatıldı."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Başarıldı! aMule'ye bağlantı kuruldu. "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Başarıldı! Bağlantı kuruldu."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Dış Bağlantı: Erişim engellendi çünkü: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "Dış Bağlantı: Tanılama engellendi."
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr "UDP soketinin oluşturulmasında hata %s%d:%s"
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Asio iş parçacığı %d başladı"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "DinlemeSoketi: Tamam."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "HATA: TCP portu dinlenemiyor."
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "HATA: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "UYARI: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr "Ortam üst verileri: hiçbir ffprobe ikilisi bulunamadı. ffmpeg'i kurun veya ffprobe yolunu ayarlarda tanımlayın; süre, bir hızı ve kodlama bilgileri alınamayacaktır."
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr "Ortam üst verileri: %s artık mevcut değil, çıkarılacak hiçbir şey yok"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr "ffprobe ile ortam üst verileri çıkarılıyor: %s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr "Ortam üst verileri: ffprobe %s için zaman aşımına uğradı veya iptal edildi"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr "Ortam üst verileri: %s için inanılmaz derecede büyük ffprobe çıktısı görmezden geliniyor"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr "Ortam üst verileri: ffprobe çalıştırılamadı (%s) -- ortam üst verileri ayarlarını kontrol edin"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr "Ortam üst verileri: ffprobe başarısız oldu (kod %d), %s dosyası için"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr "Ortam üst verileri: ffprobe, %s dahilinde kullanılabilir hiçbir şey bulamadı"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 "%u paylaşılan dosyadan ortam üst verilerinin çıkarılması tamamlandı (%u başarısız)"
+msgstr1 "%u paylaşılan dosyadan ortam üst verilerinin çıkarılması tamamlandı (%u başarısız)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 "%u paylaşılan dosyadan ortam üst verilerinin çıkarılması tamamlandı"
+msgstr1 "%u paylaşılan dosyadan ortam üst verilerinin çıkarılması tamamlandı"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 "%u başka dosyadan ortam verilerinin çıkarılması başarısız oldu (tek tek listelenmemiş)"
+msgstr1 "%u başka dosyadan ortam verilerinin çıkarılması başarısız oldu (tek tek listelenmemiş)"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 "%u başka paylaşılan dosya artık mevcut değil (tek tek listelenmemiş)"
+msgstr1 "%u başka paylaşılan dosya artık mevcut değil (tek tek listelenmemiş)"
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Kapat"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Kes"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Kopyala"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Temizle"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Tümünü Seç"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "KiB/s"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Sınırsız"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "aMule'yi Göster"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "aMule'yi Gizle"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr "eD2k: "
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr "Bağlandı (DüşükID)"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr "Bağlandı (YüksekID)"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr "Çevrim içi (Güvenlik duvarı arkasında)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr "Sunucu: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr "Sunucu IP: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Bağlı değil"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP port: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP port: Hazır değil"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP port: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP port: Hazır değil"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Yazılım Bilgisi"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Gönderim sınırı"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Aktarım sınırı"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "aMule'yi Göster"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Bağlantıyı Kes"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "aMule'yi Gizle"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "Bağlan"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Çıkış"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Sınırsız"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule Sistem Tablası Menüsü"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Hız:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "GÖN: Yok"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "GÖN: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "İND: Yok"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "İND: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "İndirme hızı: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Gönderme hızı: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Rumuz: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Rumuz Seçilmedi!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "KullanıcıID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Sunucu Adı: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "SunucuIP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Bağlanmadı"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Çevrim içi İmza: Etkin"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Çevrim içi İmza: devre dışı"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Çalışma Süresi: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Paylaşılan dosyalar: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Sıraya giren kullanıcılar: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Toplam İND: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Toplam GÖN: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k Bağlantısı: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr "%s, %u bağlantı noktasında oluşturuldu"
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Onayla"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr "İKAZ! %s: %s unsuruna gönderilen paket, gönderi esnasındaki hata (%s) sebebiyle atıldı."
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr "eD2k veya magnet bağlantılarını buraya yapıştırın"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "Bağlantı ekle"
+
+#: src/muuli_wdr.cpp
 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:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
-msgstr "Olaylar burada gösterilir. Olayların tam listesi için Sunucu sekmesine bakınız."
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr "Olaylar burada gösterilir. Olayların tam listesi için Ağlar sekmesindeki kütüğe bakın."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Yükleniyor…"
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 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:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Kullanıcılar: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 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:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Gön: 0.0 | İnd: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 msgid "Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication."
 msgstr "Ş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:139
+#: src/muuli_wdr.cpp
 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 "Bağlantı durumu ve aktif aktarımları gösterir. Kırmızı ok henüz 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:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Bağlanmadı …"
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "Şu an bağlanılan sunucu."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Ara"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Ad:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Tür"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Sunucu"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Genel"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Genişletilmiş Parametreler"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Süzgeç"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Dosya Türü"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Herhangi"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Sıkıştırılmış Dosyalar"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Ses"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "CD-Kalıbı"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr "Disk kalıpları"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Resim"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Programlar"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Belgeler"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Videolar"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Uzantı"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "En Az Boyut"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "Bayt"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "KiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "MiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "GiB"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "En Fazla Boyut"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Uygunluk"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Süz:"
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Süzme Sonuçları"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Süz"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Sonuçları tersine çevir"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Bilinen Dosyaları Gizle"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr "Süzgeçleri Sıfırla"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Başlat"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Daha Fazla"
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "Genişlet"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr "Zaten cevap vermiş Kad eşlerinden aramayı genişletmelerini iste. Aramanın ilk alfa hududunun bulamadığı ilave dosya eşleşmelerini ortaya çıkarmak için her bir tıklama bir sonraki en yakın eşten daha fazla irtibat talep eder (KADEMLIA_FIND_VALUE_MORE)."
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Durdur"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "İndir"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Sınıfa göre indir"
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "Arama Sonuçlarını Sil"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Alanları Sıfırla"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Sonuçlar"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Tamamlanan aktarımları temizler."
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Süz:"
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "Dosya kaynakları:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Genel"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Tam Ad :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
-
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met-Dosyası :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Adresleme:"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Dosya Boyutu :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Parça Dosya Durumu :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Son Görülen Tamamlama :"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Tam Ad"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met-Dosyası"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Karma Değer"
+
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Dosya Boyutu"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Aktarım"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Bulunan Kaynaklar:"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Aktarılan Kaynaklar:"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Dosya Parçası-Sayısı:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Uygun:"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Veri Oranı:"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Aktarım Süresi: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Aktarılan:"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Tamamlanmış Boyut:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Parça Dosya Durumu"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Son Tam Görülme"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Bulunan Kaynaklar"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Aktarma Yapan Kaynaklar"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Dosya Parçası-Sayısı"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Mevcut"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Veri Hızı"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Etkin İndirme Süresi"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Tamamlanmış Boyut"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Akıllı Bozulma Yakalayıcısı"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Bozulma ile kaybedilen:"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Sıkıştırma ile kazanılan:"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "I.C.H ile kurtarılan paketler :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Bozulma ile kaybedilen"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Sıkıştırma ile kazanılan"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "I.C.H ile kurtarılan paketler"
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr "Paylaşılan"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "İstekler"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Kabul Edilen İstekler"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Aktarılan Veri"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Paylaşım Oranı"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Tam Kaynak Sayısı"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "Şu tarihten beri paylaşılıyor:"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "Son gönderme"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr "Ortam Bilgileri"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "Süre"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "Akış hızı"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "Kodlama"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "Sanatçı"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "Albüm"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Başlık"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Dosya Adları"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Devral"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Temizle"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Uygula"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Tamam"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 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:705
+#: src/muuli_wdr.cpp
 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."
@@ -3105,528 +4175,531 @@
 "Bir film için süresini, öyküsünü, dilini belirtebilir …\n"
 "ve sahte bir dosya ise bunu diğer aMule kullanıcılarına bildirebilirsiniz."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Dosya Kalitesi"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Derecelendirilmemiş"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Geçersiz / Bozuk / Sahte"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Zayıf"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Doğru"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "İyi"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Mükemmel"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 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:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "Kad üzerinden al"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Yenile"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Aktarılıyor, lütfen bekleyiniz …"
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Boyut bilinmiyor"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Gerekli Bilgiler"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP Adresi:"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Port:"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Ek Bilgi"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Kullanıcı Adı :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Kullanıcı Adreslemesi :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Kullanıcı Karma Değeri"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Ekle"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "İndirme Hızı"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Şimdiki"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Çalışma ortalaması"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Oturum ortalaması"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Gönderim Hızı"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "Bağlantılar"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Aktif İndirmeler"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Aktif Bağlantılar (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Aktif Göndermeler"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "İstatistik Ağacı"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Kullanıcı Adı:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Kullanıcı Adreslemesi:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Yazılım:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Yazılım Sürümü:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP :"
-
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "Kullanıcı ID:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Sunucu IP:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Sunucu:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Gizleme:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kademlia:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "İstemci yazılımı"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "İstemci sürümü"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "Kullanıcı ID"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Sunucu IP"
+
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Sunucu ismi"
+
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Gizleme"
+
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr "Protokol uzantıları"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Yapılan aktarımlar"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Şimdiki İstek:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Ortalama gönderim oranı:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Ortalama aktarım oranı:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Gönderilen (oturum):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "İndirilen (oturum):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Gönderilen (toplam):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "İndirilen (toplam):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Şimdiki istek"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Ortalama gönderim hızı"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Ortalama indirme hızı"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Gönderilen (oturum)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "İndirilen (oturum)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Gönderilen (toplam)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "İndirilen (toplam)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Skor"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "İND./GÖN. niteleyici:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Güvenli Kimlik:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "Kuyruk sırası:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Sıra skoru:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Güvenli kimlik"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "Kuyruk sırası"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Sıra skoru"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Rumuz"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - çok-sistemli Katır"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 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:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Dil: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "İpuçlarını göstermeden önce geçecek süreyi belirler."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Arayüzde kullanılacak dil."
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "Yeni sürümü başlangıçta denetle."
-
-#: src/muuli_wdr.cpp:1218
-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:1225
-msgid "Start aMule automatically when I log in"
-msgstr "aMule'ü oturum açtığımda otomatik olarak başlat"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
+msgstr "Yeni sürümü düzenli olarak denetle"
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr "Bunu etkinleştirmek, aMule'nin yeni sürümleri başlangıçta ve çalıştığı sürece günde bir defa aramasını sağlar"
 
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr "Oturum açıldığında aMule'ün çalıştırılması için işletim sistemine kullanıcı başı bir otomatik başlatma unsuru kaydeder. Eğer aMule ikilisini taşırsanız, sonrasında onu bir kere el ile başlatın ki bu unsur güncellensin."
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr "aMule'ü ed2k:// bağlantıları için varsayılan yönetici yapar, yani böyle bir bağlantıya tarayıcınızda veya dosya yöneticinizde tıklamanız onu burada açar."
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr "aMule sadece eD2k uyumlu (xt=urn:ed2k: içeren) magnet'leri işler. BitTorrent magnet'leri DESTEKLENMEZ ve onlara tıklamanız sessizce başarısızlığa uğrayacaktır. Şayet bir BitTorrent istemcisi (Transmission, aBittorrent, vs.) kullanıyorsanız, bunu devre dışı bırakın."
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr "Bir koleksiyon açmak, ihtiva ettiği her eD2k bağlantısını kuyruğa alır. Windows üzerinde bu, aMule programını \"Birlikte Aç\" listesine ekler ve sadece başka hiçbir program bu dosya türünü yönetmiyorsa varsayılan olarak ayarlar."
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Küçültülmüş başla"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 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:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Çıkışta uyar"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "aMule'nin çıkıştan önce uyarmasını sağlar."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Sistem tablası simgesini etkinleştir."
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Bu, sistem tablası (ya da görev çubuğu) simgesini Etkinleştirir/Devre dışı bırakır."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "Kapatma butonuna tıklandığında uygulamayı sakla"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Sistem tablasına küçült."
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 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:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "İndirme sona erdiğinde bildirimleri göster"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "Bu şık etkinleştirilirse, indirmeler sona erdiğinde aMule bildirimleri gösterecektir."
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr "Arama tarihçesini hatırla"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr "Arama sekmesinin İsim alanında geçmiş arama terimlerinizin açılır bir listesini muhafaza eder. Bu, girdiğiniz sorguları hatırlar, bunların getirdikleri sonuçları değil."
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "İpucu gecikme süresi: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "saniye"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Tarayıcı Seçimi"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "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:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Göz at"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Mümkünse yeni sekmede aç"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 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:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Ortam Çalıcısı"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Bağlantı sınırları"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Gönderme"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Slot Tahsis Boyutu"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Portlar"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Standart TCP Portu "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Bu, standart eD2k bağlantı noktasıdır ve devre dışı bırakılamaz."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Sunucu istemleri için UDP Portu (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Genişletilmiş UDP portu (Kad / Genel arama) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 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:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Yönlendirici port iletimi için UPnP'yi etkinleştir"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnP TCP Portu (İsteğe bağlı):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 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:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr "Ağ arayüzüne bağla (herhangi biri için boş bırakın):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr "Sadece ileri seviye kullanıcılar için: tüm aMule trafiğini listeden seçilmiş veya ismi (mesela tun0, eth0, en0) ya da endeksi yazılmış tek bir ağ arayüzüne sabitle. Bir IP adresine sabitlemenin aksine bu, trafiğin varsayılan yoldan sızmasını engeller - VPN'ler ile faydalıdır. Yüksek izinlere ihtiyaç duymaz."
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "İndirilen dosya başına en fazla kaynak sayısı:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "En cazla eş bağlantı sayısı:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Başlangıçta otomatik bağlan"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Bağlantı koptuğunda yeniden bağlan"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Ölü sunucuları"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr "Statik sunucular hiçbir zaman kaldırılmazlar, ulaşılamaz oldukları zaman dahi."
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "denemeden sonra kaldır"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Otomatik başlangıç"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Liste"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Bir sunucuya bağlandığında sunucu listesini güncelle"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Bir kullanıcı bağlandığında sunucu listesini güncelle"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Öncelik sistemini kullan"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Bağlanırken akıllı DüşükID denetimi yap"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Güvenli Bağlantı"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Sadece statik listesindeki sunuculara otomatikman bağlan"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Elle eklenmiş sunuculara Yüksek Öncelik ata"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Akıllı Bozulma Yakalayıcısı (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Etkinleştir"
-
-#: src/muuli_wdr.cpp:1500
-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:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Dosyaları aktarımlara duraklatılmış kipte ekle"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Dosyaları, aktarımlara otomatik öncelikle ekle"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "İlk ve son parçaları en önce indirmeye çalış"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr "\"Endgame\" kipi: son bloklar için hızlı kaynaklara geç"
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Bir dosya tamamlandığında duraklatılan sonraki dosyaya başla"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "Aynı sınıftan"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "Alfabetik sırayla"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Yeni dosyalar için diskte yer ayır"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 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:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr "Yeni dosyaları aralıklı dosyalar olarak oluştur"
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr "Aralıklı dosyalar zaten indirilmiş parçalar için disk alanı işgal eder, yani boş alan dosya doldukça kademeli olarak kullanılır. Olağan dosyalar kullanmak için bunu devre dışı bırakın - bu, aralıklı dosyaların desteklenmedikleri veya yavaş oldukları veya yedekleme/tekrarsızlaştırma araçlarının bunları kötü yönettikleri yerlerde kullanışlıdır. Sadece çekirdek Windows üzerinde çalıştırıldığında uygulanır; GNU/Linux ve macOS kısmi dosyaları daima aralıklıdır ve bu ayarın bir etkisi bulunmaz."
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Boş disk alanı şu kadar kaldığında aktarımları durdur "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 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:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Buraya istenilen en az disk alanını giriniz."
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Nadir bulunan dosyalarda 10 kaynak sakla (<20 kaynak)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Gönderilenler"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Dosyaları paylaşılanlara otomatik öncelikle ekle"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "İndirmeler için hedef dizin"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Akıllı Bozulma Yakalayıcısı (I.C.H.)"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Etkinleştir"
+
+#: src/muuli_wdr.cpp
+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 src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr "Ortam üst verisi çıkarımı"
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "Süre / bit hızı / kodlama bilgilerini paylaşılan ses ve video dosyalarından çıkar"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr "Etkinleştirildiğinde, dosyayı bir aramada bulan diğer istemcilerin gördükleri Süre / Bit Akışı / Kodlama sütunlarını doldurmak için aMule her paylaşılan ortam dosyası üzerinde ffprobe çalıştırır. ffmpeg (ffprobe ikilisi) kurulumu gerektirir."
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr "ffprobe yolu:"
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr "ffprobe ikilisi için tam yol. aMule tarafından başlangıçta otomatik olarak tespit edilmesi için boş bırakın."
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr "Tespit et"
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr "Bir ffprobe ikilisi için standart kurulum konumlarını ara ve yol alanını doldur."
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
@@ -3634,599 +4707,691 @@
 "Tamamlanmış indirmeler burada muhafaza edilir. Bu dizindeki tüm dosyalar otomatik olarak diğer eşler ile paylaşılır.\n"
 "Şayet bu dizin paylaşmak istemediğiniz dosyalar da içeriyorsa, aMule'e özel bir alt dizini seçin."
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr "Tamamlanmış indirmelerin muhafaza edilecekleri dizini seçin. Bu dizindeki tüm dosyalar diğer eşler ile paylaşılacaktır."
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr "(Bu dizindeki tüm dosyalar diğer eşler ile paylaşılmaktadır)"
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Geçici dosyalar için dizin"
-
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "Paylaşılan dizinler"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr "(Çekirdek tarafından paylaşılan dizinler. Bir dizin eklemek için yol ilave edin.)"
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr "Çekirdeğin makinesinde bir dizinin mutlak yolu, mesela /home/rumuz/shared"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr "Özyinelemeli"
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr "Bunun altındaki tüm alt dizinleri paylaş, ki buna daha sonra oluşturulacak dizinler de dahildir."
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Çıkar"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Özyinelemeli paylaşım için dizin simgesine sağ tıklayınız.)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Gizli dosyaları paylaş"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr "Paylaşılan dizinleri değişiklikler için otomatik olarak tekrar tara"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr "Paylaşılan dizinlerdeki simgesel bağlantıları takip et"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr "Şununla eşleşen dosyaları dışla:"
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr "'|' ile ayrılmış joker karakterli örüntüler (mesela .DS_Store|Thumbs.db|*.tmp). İsmi eşleşen dosyalar paylaşılmaz. Eşleştirme sırasında büyük/küçük harf ayrımı yapılmaz."
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr "Örüntüler düzenli ifadelerdir"
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr "Etkinleştirildiğinde, tüm alan tek bir düzenli ifadedir ('|' alternatifler içindir). Devre dışı bırakıldığında, '|' ile ayrılmış jokerler listesidir."
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr "Güncel örüntünün kaç paylaşılan dosyayı dışlayacağını göster."
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr "Bağlı çekirdeğin dosyaları başka bir makinede bulunduklarında, \"Aç\" ve \"Klasörde göster\" işlevlerinin çalışması için, bildirdiği yol önekini bu dosya sisteminin buradan erişilebilir olduğu yere (mesela bir ağ paylaşımına) eşle."
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr "Yol Eşlemeleri"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr "Uzak önek"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr "Çekirdeğin bildirdiği üzere bir yol öneki, mesela /home/user/downloads/incoming"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr "Yerel önek"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr "Bu dizine bu bilgisayardan nereden erişilebileceği, mesela bağlı bir ağ paylaşımı"
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Grafikler"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Güncelleme gecikmesi: 5 sn"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Ortalama grafiği için süre: 100 dk"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Bağlantı Grafik Ölçüsü: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "İndirme grafik ölçüsü:"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Gönderme grafik ölçüsü:"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "Renkler: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Arka plan"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Izgara"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Şu anki aktarımlar"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Aktarım çalışma ortalaması"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Aktarım oturum ortalaması"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Şu anki gönderme"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Gönderme çalışma Ortalaması"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Gönderme oturum ortalaması"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Aktif bağlantılar"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr "Sistem Tepsisi İkonu Hız Göstergesi"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Şu anki Kad düğümleri"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "İşlemdeki Kad-düğümleri"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Oturumdaki Kad-düğümleri"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Seçiniz"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Ağaç"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 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:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! UYARI !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "En fazla yeni bağlantı / 5 sn"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr "Eşzamanlı Kad kaynak aramaları"
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr "Kad kaynak tekrar arama zaman aralığı (dakika)"
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr "Kaynaklara tekrar sorma zaman aralığı (dakika)"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Dosya Tampon Boyutu: 240000 bayt"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr "MMAP kullan: \"memory-mapped file access\" yani bellek eşlemeli dosya erişimi (daha az bellek kullanır)"
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr "Yığın üzerinde tampona almak yerine kısmi dosyaları bellekte eşleştirir, böylece sürecin bellek ayak izini azaltır. Bazı disklerde indirme hızını düşürebilir; belleği sınırlı veya çok fazla gönderide bulunan makineler için idealdir."
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Gönderme Sıra Boyutu: 5000 kullanıcı"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Sunucu bağlantısı yenileme sıklığı: devre dışı"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "Bilgisayarın devre dışı kalma kipini etkisiz hale getir"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Kullanılacak kaplama: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 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:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Sınıf sekmelerinde genişletilmiş bilgi göster."
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "Başlık çubuğunda uygulama sürümünü göster"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Başlık çubuğunda aktarım oranlarını göster."
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Uygulama adından önce"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Uygulama adından sonra"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Ek yük ağ genişliğini göster"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Dikey araç çubuğu yerleşimi"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr "Naklen sütun düzenleme (değerleri değiştikçe satırları otomatik olarak tekrar sırala)"
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Sıradaki Dosyaları İndir"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "İşlem yüzdesini göster"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "İşlem çubuğunu göster"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Düz"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Yuvarlatılmış"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Dosyaları otomatik sırala (yüksek CPU)"
-
-#: src/muuli_wdr.cpp:1824
-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:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Dışarıdan Bağlantı Parametreleri"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Dışarıdan bağlantıları kabul et."
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "Dinlenen arayüzün IP' si:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "TCP portu:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "EC portuna UPnP port yönlendirmesi etkin."
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Şifre"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr "Şifrelenmiş bağlantı talep et (şifreleyemeyen eşleri reddeder)"
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr "aMule API sunucusu parametreleri"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr "Başlangıçta amuleapi (REST API) çalıştır"
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "HTTP bağlantı noktası:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr "amuleapi HTTP sunucusunun dinlediği arayüz. 127.0.0.1 (varsayılan) sadece yerel bağlantıları kabul eder; onu başka makinelere açmak için 0.0.0.0 veya belirli bir IP kullanın (aşağıda bir yönetici parolası tanımlayın)."
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr "Ayarlamak veya değiştirmek için bir parola girin. Kaydedilmiş parolalar gösterilemez, yani bunu boş bırakmak güncel parolayı muhafaza edecektir."
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "Yönetici parolası"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "Bir parola belirlendi."
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "Konuk erşimini etkinleştir"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr "Misafir oturumları durumu ve listeleri okuyabilir fakat hiçbir şey değiştiremez. Bunu devre dışı bırakmak, kaydedilmiş misafir parolasını siler."
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "Misafir parolası"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Web sunucusu değerleri"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "Başlangıçta web sunucusunu başlat"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr "Başlangıçta web sunucusunu başlat (eskimiş)"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Web şablonu"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Tam hak şifresi"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Düşük hakka sahip kullanıcıyı etkin kıl."
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Düşük hak şifresi"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Web sunucu portunun UPnp port iletimini etkinleştir"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Web sunucusu UPnp TCP portu (İsteğe bağlı)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Sayfa yenileme zamanı (sn)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Gzip sıkıştırmayı etkinleştir."
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr "Sayfayı varsayılan değerlere sıfırla"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr "Güncel sayfadaki ayarları varsayılan değerlerine sıfırla."
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Tamam"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 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:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Ayarlarda yapılan değişiklikleri sil."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Başlık :"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Yorum:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Gelen Dosyalar Dizini :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Yeni eklenen dosyalar için öncelikleri değiştir:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Gelen Dosyalar Dizini"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Yeni atanan dosyalar için öncelikleri değiştir"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "Değiştirme"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Bu sınıf için renk seçiniz (varsayılan) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Sıfırla"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Bu Kategori (güncel olarak seçili) için renk seç"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Günlük kayıtlarını silmek için bu düğmeye basınız."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Sunucu listesini İnternet'den güncellemek için bu düğmeye basınız…"
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Sunucu"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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 "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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Sunucuyu elle ekle: İsim"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Yeni sunucunun adını buraya giriniz."
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Sunucunu portunu buraya giriniz."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Sunucuyu elle ekle (önce soldaki alanları doldurunuz) …"
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule Günlüğü"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Sunucu Bilgisi"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2K Bilgileri"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kademlia Bilgileri"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Düğüm listesini İnternet'den güncellemek için bu düğmeye tıklayınız."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Düğümler (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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 "Bilinen düğümleri güncellemek için buraya adresi giriniz ve soldaki düğmeye tıklayınız."
 
-#: src/muuli_wdr.cpp:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Düğüm istatistikleri"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Ön Yükleme"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Yeni düğüm"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Port:"
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "Bilinen kullanıcılardan Ön Yükleme"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Kad Bağlantısını Kes"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr "Düğüm:IP unsurundan ön yükleme yap"
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Düğümün IP adresini x.x.x.x biçiminde buraya giriniz."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Güvenli Kullanıcı Kimlik Doğrulamasını Kullan"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 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:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Protokol Gizleme"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Protokol Gizleme etkin"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Bu seçenek Protokol Gizleme'yi etkinleştirir ve aMule'nin gizlenmiş bağlantıları kabul etmesini sağlar."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Giden bağlantılar için gizleme kullan"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Bu seçenek diğer kullanıcı veya sunucularla olan bağlantılarda Protokol Gizleme'yi etkinleştirir."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Sadece gizlenmiş bağlantıları kabul et"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated"
 msgstr "Bu seçenek aMule'nin sadece gizlenmiş bağlantıları kabul etmesini sağlar. Daha az kaynak bulursunuz; ancak tüm trafiğiniz de karartılmış olur."
 
-#: src/muuli_wdr.cpp:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Herkes"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Hiç kimse"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Paylaşılan dosyalarımı kim görebilir:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 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:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP_Süzme"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Kullanıcıları Süz"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 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:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Sunucuları süz"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 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:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Listeyi yeniden yükle"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 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:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "Adres:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Şimdi güncelle"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Ip süzgecini başlangıçta otomatikman güncelle."
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Süzme Seviyesi:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Her zaman LAN IP'lerini süz."
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Uyuşmayan IP'lere şüpheci yaklaşım."
 
-#: src/muuli_wdr.cpp:2438
-msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
-msgstr "Paketin alındığı ip ile kullanıcı ip numarası farklıysa paket reddedilir. Dikkatli kullanın."
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr "İstemcinin sahip olduğunu iddia ettiği IP, kaynak IP'den farklı olduğunda paketi reddeder (sahtekarlık önleyici kontrol). Sadece bağlantı sorunları oluşturuyorsa devre dışı bırakın."
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Varsa, sistem geneli ipfilter.dat kullan"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Yerel bir ipfilter.dat dosyası bulunamazsa, sistem geneli ipfilter kullanımına izin ver."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Çevrimiçi-İmza' yı Etkinleştir"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 msgid "Enables the writing of the OS file, which can be used by external apps to create signatures and the like."
 msgstr "Diğer uygulamaların imzalar ve benzerlerini oluşturabilmesi için kullanabileceği Çev.İmza dosyasını yazmayı etkinleştirir."
 
-#: src/muuli_wdr.cpp:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Güncelleme Sıklığı (Sn.):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 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:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Çevrim içi imza dosyasını buraya sakla: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 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:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "İstemciler için ülke bayraklarını göster"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr "Transferler, kuyruklar ve arama görünümlerinde ülkelerin bayrakları sütununu görüntüle. Geçerli bir MMDB GeoIP veri tabanı gerektirir (aşağıya bakınız)."
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr "Veri Tabanı"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 msgid "Source:"
 msgstr "Kaynak:"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr "DB-IP (ücretsiz, hesap gerektirmez)"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr "MaxMind GeoLite2 (ücretsiz, hesap gerektirir)"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr "Kişiselleştirilmiş URL"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr "Hangi tedarikçinin GeoIP MMDB veri tabanını sağlayacağını seçin. DB-IP varsayılan değerdir - hesap gerektirmez. MaxMind ücretsiz bir hesap + lisans anahtarı gerektirir. Herhangi başka bir MMDB makinesine (mesela yerel bir yansıya) yönlendirme yapmak için kişiselleştirilmiş URL kullanın."
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4238,11 +5403,11 @@
 "IP-Ülke verileri DB-IP.com tarafından sağlanmaktadır - https://db-ip.com\n"
 "Lisans: Creative Commons Atıf 4.0 - https://creativecommons.org/licenses/by/4.0/deed.tr"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr "Lisans anahtarı:"
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4258,11 +5423,11 @@
 "Lisans: MaxMind GeoLite2 Kullanıcı Lisans Anlaşması - https://www.maxmind.com/en/geolite2/eula\n"
 "Atıf ve hesap oluşturulması gerektirir; en az her 30 günde bir güncelleyin."
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
 msgstr "İndirme Bağlantısı:"
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
@@ -4272,504 +5437,569 @@
 "Bağlantı kimlik doğrulama bilgileri içerebilir (https://kullanıcı:parola@makine/…)\n"
 "Lisans ve atıf koşulları kaynak URL tarafından belirlenir - bunlardan siz sorumlu olursunuz."
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr "Seçili kaynaktan GeoIP veri tabanını indir."
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr "Başlangıçta otomatik olarak güncelle"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr "aMule her başladığında, GeoIP veri tabanını seçili kaynaktan tekrar indir."
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Gelen iletileri süz (o anki sohbet dışında):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Hepsini süz."
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Arkadaş listesindekiler dışında herkesi süz."
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Bilinmeyen yazılımlardan gelenleri süz."
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Şu içerikteki iletileri süz (ayraç olarak ',' kullanınız.):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 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:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Günlükte alınan iletileri göster"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Yorumlar"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Şu içerikteki iletileri süz (ayraç olarak ',' kullanınız.):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Yetkilendirmeyi etkinleştir."
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Kullanıcı adı/şifre yetkilendirmeyi etkinleştir/devre dışı bırak."
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Kullanıcı adı: "
-
-#: src/muuli_wdr.cpp:2689
-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:2691
-msgid "Password:"
-msgstr "Şifre:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Vekil sunucuya bağlanmak için gerekli şifre"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Vekil sunucuyu Etkinleştir."
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Vekil sunucu desteğini etkinleştir/devre dışı bırak"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Vekil sunucu Türü:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Vekil sunucu makine:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Vekil sunucu türü"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Vekil sunucu makinesi"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Vekil sunucu makine adı"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Vekil sunucu Portu:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Vekil sunucu bağlantı noktası"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Vekil sunucu portu"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Yetkilendirmeyi etkinleştir."
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Kullanıcı adı/şifre yetkilendirmeyi etkinleştir/devre dışı bırak."
+
+#: src/muuli_wdr.cpp
+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
+msgid "The password to use to connect to the proxy"
+msgstr "Vekil sunucuya bağlanmak için gerekli şifre"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "Bağlan:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Uzaktan aMule'ye giriş yapınız."
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Kullanıcı adı"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Bu ayarları hatırla"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "Bağlantıyı şifrele (tavsiye edilir)"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr "ZLIB sıkıştırmasını zorla"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Fazladan Hata Çıktısı Kaydını Etkinleştir."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "Sadece Kütük Dosyasına"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "İleti Sınıfları:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Bekliyor…"
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "İçe aktarımları ekle"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Seçileni tekrar dene"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Seçileni çıkar"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Olay Türleri"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 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:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "Etkin Göndermeler"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "Toplam dosyaların yüzdesi"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "Kullanıcıları Göster"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "Tüm dosyalar"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "Seçilen dosyalar"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "Sadece aktif Göndermeler"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "Kullanıcıları Göster"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "Yeniden yükle:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Paylaşılan dosyalarınızı yeniden yükleyin"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Gönder"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Belirlenen iletiyi gönderir."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Bu sohbet oturumunu kapatır."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "Herhangi bir sunucuya ve/veya Kad'a bağlan."
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "%s unsurunu iptal et"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Paylaşılan Dosyalar"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "%s ile bağlantıyı Kes"
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "%s unsuruyla bağlantı kur"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Devre dışı %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "bayt"
 msgstr1 "bayt"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "TiB"
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "bayt/sn"
 msgstr1 "bayt/sn"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "MiB/s"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "sn"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "dk"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "saat"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
-msgstr "Gün"
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr "gün"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "tümü"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "diğerleri"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Tamamlanmamış"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Durduruldu"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Görüntü"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Sıkıştırılmış"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Belge"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Etkin"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "Kullanılan yapılandırma dizini: %s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr "Bu kaynakta parça mevcut değil"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr "Hem siz hem de bu kaynak parçaya sahipsiniz"
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr "Şu anda bu kaynaktan indiriliyor"
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr "Bu kaynaktan istenecek gelecek parça"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr "Bu kaynak parçaya sahip ve sizin hâlâ buna ihtiyacınız var"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr "Bu eşte zaten parça mevcut"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr "Bu eşte parça mevcut değil"
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr "Başka hiçbir kaynakta bu parça mevcut değil"
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr "Bir başka kaynakta bu parça mevcut"
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr "%u veya daha fazla kaynakta bu parça mevcut"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr "Zaten geri okundu ve karma değeri hesaplandı"
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr "Hâlâ okunacak"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr "İndirilmekte olan dosyanın her bir parçası için bir blok."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr "Paylaşılan dosyanın her bir parçası için bir blok."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Paylaşılan dosyanın her bir parçası için bir blok, kaç başka kaynağın ona sahip olduğuna göre renklendirilir."
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Paylaşılan dosyanın her bir parçası için bir blok, tekrar karma değeri hesaplamasının ne kadar okuduğunu gösterir."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr "Bu arada başka kaynaklar eklendikçe koyulaşır"
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Parçadosyası dönüşümünün bitmesi bekleniyor…"
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "İçe Aktarılıyor %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Geçici dosyalar dizini okunuyor."
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Aktarım bilgisi dosyasından temel bilgiler alınıyor."
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Hedef dosya oluşturuluyor."
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Eski aktarım dosyasından veri yükleniyor (%u, %u üzerinden)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, 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, %u üzerinden)"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Kaynak aktarım dosyası bilgisi alınıyor."
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Aktarım ekleniyor ve yeni parça dosyası kaydediliyor."
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Parça dosyalarını içe aktar"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Durum"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Dosya adreslemesi"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (Disk: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 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:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Başarılı bir şekilde içe aktarılan indirmelerin kaynak dosyalarının silinmelerini ister misiniz?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Kaynakları çıkar?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "HATA: Part dosyası oluşturma başarısız"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, 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:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "HATA: part.met dosyası açılamadı: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, 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:426
+#: src/PartFile.cpp
 #, 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:664
+#: src/PartFile.cpp
 #, 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:675
+#: src/PartFile.cpp
 #, 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:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Dosya bilgisi kurtarılmaya çalışılıyor…"
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 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:697
+#: src/PartFile.cpp
 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:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Dosya bilgisi kurtarılamıyor :("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "%s (%s) açma başarısız"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "UYARI: %s bozulmuş olabilir (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "Parça dosyası kaydedilirken HATA: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Parçadosyası kaydedilirken girdi-çıktı hatası: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr "'%s' konumuna 0/bilinmeyen bayt yazıldı -- mevcut .part.met muhafaza ediliyor."
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, 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:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "%i kaynak tohumu parça dosyası için kaydedildi: %s (%s)"
 msgstr1 "%i kaynak tohumu parça dosyası için kaydedildi: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Kısmi dosya %s (%s) için tohum dosyası okunamadı"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, 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:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "Bozuk parça (%d) %d parça dosyası %s içinde bulundu -Dosya sonuç adreslemesi |%s| Dosya adreslemesi |%s|"
 msgstr1 "Bozuk parça (%d) %d parça dosyası %s içinde bulundu -Dosya sonuç adreslemesi |%s| Dosya adreslemesi |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Tamamlanmış (%i) parçası %s içinde bulundu."
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "%s dosyasının yeniden adreslenmesi bitti"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, 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:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Aktarım tamamlandı: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4778,306 +6008,153 @@
 "Şu indirme tamamlandı:\n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Dosya siliniyor: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, 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:2468
+#: src/PartFile.cpp
 #, c-format
 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:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr "%u kısmı ('%s' dosyasının) tamamlanmış olarak işaretlendi ama kısmi dosya beklenenden daha küçük (%llu bayt bulunduruyor halbuki %llu bayt gerektiriyor); yeniden indirme için boşluk tekrar açılıyor."
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "İ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/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, 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:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "İndirilen %i parçası %s dosyasındaydı ve bozuk."
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, 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/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Ayrılıyor"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Yetersiz disk alanı"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "İndirildi"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "HATA: Parça dosyası '%s' açılamıyor"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Sistem öntanımlısı"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Arnavutça"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Arapça"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "Asturyasça"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Baskça"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Bulgarca"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Katalanca"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Çince (Basitleştirilmiş)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Çince (Geleneksel)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Hırvatça"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Çekçe"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Danca"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Felemenkçe"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "İngilizce (U.K)"
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr "İngilizce (ABD)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Estonca"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Fince"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Fransızca"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Galce"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Almanca"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Yunanca"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "İbranice"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Macarca"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "İtalyanca"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "İtalyanca (İsviçre)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Japonca"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Korece"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Litvanyaca"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Norveççe (Nynorsk)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Lehçe"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Portekizce"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Portekizce (Brezilya)"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "Rumence"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Rusça"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Slovence"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "İspanyolca"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "İsveççe"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Türkçe"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr "Genişletilmiş kaynak değişimi"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr "NAT geçişi (uTP)"
+
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr "Eş bilgileri alımı"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr "NAT geçişi (QUIC)"
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Ukraynaca"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "Dili Değiştirin"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "aMule tercümeleri kurulu değildir"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "Diller mevcut değil"
-
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "mevcut seçenek yok"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr "Geçersiz yol eşleşmesi bulundu, atlanıyor"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Geçersiz sınıf bulundu, atlanıyor"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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/Preferences.cpp:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Varsayılan port kullanılacak (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "Bağlantı"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Dizinler"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Sunucular"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Dosyalar"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Güvenlik"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr "IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Vekil sunucu"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Süzgeçler"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Uzak Denetimler"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Çevrimiçi İmza"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Olaylar"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Hata Çıktısı"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5087,15 +6164,15 @@
 "    %PARTFILE - dosyanın tam yolu\n"
 "    %PARTNAME - dosyanın sadece adı"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr "Sistem tepsisi ikon desteği, derleme esnasında libayatana-appindicator3'e ihtiyaç duyar."
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr "Wayland ile kullanılamaz: protokol bir pencere küçültüldüğünde bunu iletmez, yani bu seçenek sistemin küçült düğmesi tıklamasını yakalayamaz. Çözüm: yerine XWayland kullanmak için aMule'ü `GDK_BACKEND=x11` ile başlatın."
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5111,26 +6188,42 @@
 "Bu ayarlarla oynanmasa da\n"
 "aMule gayet iyi işleyecektir."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Bağlanacağınız vekil sunucu türü"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "Hiçbir parola ayarlanmamış."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "Misafir erişimi parola gerektirir. Parola alanına bir parola girin, veya Misafir erişimini etkinleştir seçeneğini devre dışı bırakın."
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5138,31 +6231,43 @@
 "Değişikliklerin uygulanması için, aMule yeniden başlatılmalı\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP portu değişti.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP Portu değişti.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr "- Ağ arayüz bağlaması değişti.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- Dışarıdan bağlantı portu değişti.\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- Dışarıdan bağlantı kabul edilme işlemi değişti.\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- Dışarıdan bağlantı arayüzü değişti.\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- Protokol gizleme desteği değişti.\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr "- Vekil sunucu ayarları değiştirildi (HTTP aktarımları için gerekidir).\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr "- amuleapi ayarları değişti.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5170,27 +6275,32 @@
 "Otomatik Sunucu güncelleme listeniz boş.\n"
 "'Sunucu listesini başlangıçta otomatikman güncelle' devre dışı bırakılacak."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr "amuleapi parolası kaydedilemedi: %s"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Dil ayarları değişti.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Geçici Dosyalar dizini değişti.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "- ED2K ağı etkinleştirildi.\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr "Paylaşılan dosya dışlama örüntüsü geçerli bir düzenli ifade değil. Filtre devre dışı olarak bırakıldı."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "Geçersiz düzenli ifade"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5198,7 +6308,7 @@
 "Hem eD2k hem de Kad ağları devre dışı bırakılmış.\n"
 "En az birini etkinleştirmeden bağlanamayacaksınız."
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5206,7 +6316,7 @@
 "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:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5216,19 +6326,66 @@
 "aMule' yi ŞİMDİ yeniden başlatmalısınız.\n"
 "Şimdi yeniden başlatmazsanız, kötü şeyler olabilir.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr "Oturum açıldığında otomatik başlatma için aMule kaydedilemedi. Otomatik başlatma deposu salt okunur olabilir."
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr "Oturum açılışında otomatik başlatma unsuru kaldırılamadı."
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr "Otomatik başlatma"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr "Dosya türünü kaydet"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr "URL yöneticisini kaydet"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr "aMule, sadece eD2k uyumlu magnet'leri işler. Şayet güncel magnet yöneticisinin (%s) yerine onu koyarsanız, BitTorrent magnet bağlantıları artık çalışmayacaktır - aMule BitTorrent içeriği indiremez. Devam edilsin mi?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr "Başka bir uygulama güncel olarak .emulecollection dosyalarını açmaktadır (%s). Yerine aMule konsun mu?"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr "Başka bir uygulama güncel olarak bu bağlantıların yöneticisidir (%s). Yerine aMule konsun mu?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "aMule, .emulecollection dosyaları için kaydedilemedi. Kayıt deposu salt okunur olabilir."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr "Dosya türü kaydı kaldırılamadı."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "aMule, URL yöneticisi olarak kaydedilemedi. Kayıt deposu salt okunur olabilir."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr "URL yönetim kaydı kaldırılamadı."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Web sunucusu ve aMule API, dış bağlantıların etkinleştirilmiş olmalarına ihtiyaç duyar."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr "aMule Web sunucusu eskimiştir. Yerine aMule API çalıştırmayı değerlendirin."
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5238,41 +6395,64 @@
 "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:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Geçici dosya(lar)"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Gelen dosya(lar)"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Çevrimiçi İmzalar"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "%s için bir dizin seçiniz."
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "%u dosya, ki %u üzerinde dışlanırdı"
+msgstr1 "%u dosya, ki %u üzerinde dışlanırdı"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Ortam Çalıcısı için göz at"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Tarayıcı Seçiniz"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr "ffprobe ikilisi seçin"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Çalıştırılabilir %s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr "ffprobe, PATH veya standart kurulum konumlarında bulunamadı. ffmepg kurun (ffprobe'u sağlar) veya el ile bir ikili seçmek için Tara düğmesine tıklayın."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr "Bu sayfadaki ayarlar varsayılan değerlerine sıfırlansınlar mı?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr "Varsayılanlara sıfırla"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Sunucu listesini düzenle"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5280,114 +6460,114 @@
 "Server.met dosyasını indirmek için buraya bağlantı adresi girin.\n"
 "Her satıra sadece bir adres yazılmalıdır."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr "IP2Country güncellemesi başarısız oldu"
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr "Veriler MaxMind GeoLite2 tarafından sağlanmıştır"
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr "Kişiselleştirilmiş kaynak"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr "Veriler DB-IP.com tarafından sağlanmıştır"
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr "Durum: %s yüklendi"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Durum: %s - %s yüklendi"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr "Durum: yükleme başarısız oldu - güncellemek için 'Şimdi güncelle' düğmesine tıklayın."
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr "Durum: bulunamadı - indirmek için 'Şimdi güncelle' düğmesine tıklayın."
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "Güncelleme gecikmesi: %d saniye"
 msgstr1 "Güncelleme gecikmesi: %d saniye"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "Ortalama grafiği için süre: %d dakika"
 msgstr1 "Ortalama grafiği için süre: %d dakika"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Bağlantı Grafik Ölçüsü: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "Dosya Alım Boyutu: %d bayt"
 msgstr1 "Dosya Alım Boyutu: %d bayt"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "Gönderme Sıra Boyutu: %d kullanıcı"
 msgstr1 "Gönderme Sıra Boyutu: %d kullanıcı"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "Sunucu bağlantısı yenileme sıklığı: %d dakika"
 msgstr1 "Sunucu bağlantısı yenileme sıklığı: %d dakika"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Sunucu bağlantısı yenileme döngüsü: Devre dışı"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "devre dışı"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "'%s' olayında komut çalıştır."
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Çekirdekte komut çalıştırmayı aktifleştir."
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Çekirdek komutu:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Arayüzde komut çalıştırmayı etkinleştir."
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Arayüz komutu:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Şu girdiler değiştirilecek:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
@@ -5395,1073 +6575,1324 @@
 "Şu dizinler sistem dizinleri veya hassas konumlar gibi görünüyor:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr "Bunları yinelemeli olarak paylaşmanız, kapsadıkları her dosyayı eD2k/Kad ağlarında yayınlayacaktır. Bunu hakikaten yapmak istiyor musunuz?"
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr "Paylaşılan dizinleri teyit et"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
 msgstr "Paylaşılan dosyalar yeniden yükleniyor…"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr "Alt dizinler taranıyor…"
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr "Paylaşılan dizinler güncelleniyor"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr "%u dizin tarandı…"
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Paylaşılmış dosyalar yeniden yükleniyor: %u dosya tarandı"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr "Paylaşılan dizin"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr "Hem uzak, hem de yerel önek girilmelidir."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr "Bu uzak önek zaten eşlenmiş durumda."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr "Yerel dizini seç"
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "Arama Tarihçesini Sil"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr "Kaydedilmiş arama tarihçesi silinsin mi? Bu geri alınamaz."
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Arama uyarısı."
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "Hem eD2k hem de Kademlia devre dışı bırakıldığında arama yapmak mümkün değildir."
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "Arama hatası"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
-msgstr "Kad araması: bir eşten daha, daha geniş sonuçlar talep edildi."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
+msgstr ""
+"Bir eD2k araması zaten işlemekte. Yeni bir arama başlatmak onu sonlandıracaktır çünkü eD2k protokolü aynı anda sadece bir aramaya izin verir.\n"
+"\n"
+"Halihazırda bulunan sonuçlar muhafaza edilir; sadece yenilerinin gelişi duracaktır.\n"
+"\n"
+"Yine de yeni arama başlatılsın mı?"
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr "Kad araması: daha fazla sonucu tekrar talep edecek eş kalmadı (sınıra ulaşıldı veya henüz cevap alınamadı)."
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr "Arama devam ediyor"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 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:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Arama uyarısı."
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Ana"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad çalışmıyorsa, Kad. araması yapılamaz."
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr "Sadece yakın geçmişteki %u arama, ki açık %u arama üzerinden, %s unsuruna kaydediliyor."
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr "Sadece ilk %u sonuç, toplam %u sonuç üzerinden, \"%s\" araması için kaydediliyor."
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "UYARI: kaydedilmiş arama listesi bozuk, geçersiz başlık içeriyor."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "Kaydedilmiş arama listesinde geçersiz girdi bulundu, dosya bozuk olabilir"
+
+#: src/SearchList.cpp
 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/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "Kad araması için anahtar kelime yok - iptal ediliyor"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Kad araması sırasında beklenilmeyen hata oluştu. "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "Dosya Adresi"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr "Arama zaman aşımına uğradı: sunucu cevap vermedi."
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr "Süre"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Kad araması: bir eşten daha, daha geniş sonuçlar talep edildi."
 
-#: src/SearchListCtrl.cpp:105
-msgid "Bitrate"
-msgstr "Akış hızı"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Kad araması: daha fazla sonucu tekrar talep edecek eş kalmadı (sınıra ulaşıldı veya henüz cevap alınamadı)."
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr "Kodlama"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "Hata %u: %s\n"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Sınıfa göre indir"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "Dosya Adresi"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "Bu dosya için %s iste"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "Tümünü genişlet"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "Tümünü daralt"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "İlgili dosyaları ara (eD2k, yerel sunucu)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Bilinen dosya olarak işaretle"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "eD2k bağlantısını panoya kopyala"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "eD2k bağlantısını panoya kopyala"
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Şu anda İlgili Dosyalar arama işlevini destekleyen bir sunucuya bağlı değilsiniz"
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "İptal edildi"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "Yeni"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr "çalışıyor"
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "tamamlanmış"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr "boşta"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr "Arama %u: %s, %% %u (%u sonuç)\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr "Arama %u \"%s\": %s, %% %u (%u sonuç)\n"
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr "Arama süresi dolmuş veya bilinmeyen kimlik. Yeni bir arama başlatın.\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Arama süreci: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "Arama süreci görüntülenemiyor"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr "Rapor edilecek hiçbir arama yok.\n"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Listelenen gizlenmiş bağlantılı tüm statik sunuculara bağlanma başarısız. Gizlenmiş bağlantı olmadan geçiş yapılacak."
+
+#: src/ServerConnect.cpp
 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: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/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
+msgstr "Listelenen statik sunucuların hiçbirine bağlanılamadı."
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr "Listelenen sunucuların hiçbirine bağlanılamadı."
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Sunucuya otomatik bağlanma %d saniye içinde tekrar denenecek"
+msgstr1 "Sunucuya otomatik bağlanma %d saniye içinde tekrar denenecek"
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "eD2k ağı ayarlarda devre dışı bırakılmış, bağlanılmıyor."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 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:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "%s (%s:%i) unsuruna bağlanıldı"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "%s sunucusuna bağlanıldı"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 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/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Bağlantı kaybedildi: %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) görünüşe göre ölü."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) görünüşe göre dolu."
 
-#: 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"
-msgstr0 "Sunucuya otomatik bağlanma %d saniye içinde tekrar denenecek"
-msgstr1 "Sunucuya otomatik bağlanma %d saniye içinde tekrar denenecek"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Bağlantı Koptu"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "%s (%s:%i) adresine bağlantı başarısız."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "HATA: Zaman aşımı denetlemesinde soket geçersiz"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, 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/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "DNS araştırmasında geç sonuç alındı, atlanıyor."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Server.met dosyası yükleniyor: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Server.met dosyası bulunamadı!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Server.met dosyası '%s' açılamadı. Bilinmeyen format."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Server.met açılamadı!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, 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:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "%i adet sunucu server.met dosyasında bulundu"
 msgstr1 "%i adet sunucu server.met dosyasında bulundu"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "%d adet sunucu eklendi"
 msgstr1 "%d adet sunucu eklendi"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "Hata: 'server.met' dosyası bozuk: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "'server.met' dosyası okumada IO hatası: "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, 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:222
+#: src/ServerList.cpp
 #, 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:241
+#: src/ServerList.cpp
 #, 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:259
+#: src/ServerList.cpp
 #, 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:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Silmeye çalıştığınız sunucuya bağlı durumdasınız. Lütfen, öncelikle bağlantıyı kesiniz."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "'%s' açma başarısız"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Server.met kaydetme işlemi başarısız!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "'server.met' dosyasını yazmada GÇ hatası: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Geçersiz adres"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "%s adresinden sunucu listesi aktarımı tamamlandı."
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "'addresses.dat' dosyasında hiç sunucu listesi adresi bulunamadı. Lütfen sunucu listenizi otomatik güncellemek için bu dosyaya sunucu listesi dosyası yapıştırın"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Sunucu listesini %s adresinden indirmeye başla."
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "UYARI: sunucuların otomatik güncellenmesi için geçersiz URL girildi: %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 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:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "%s adresinden sunucu listesi alınamadı."
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Yerel sunucu IP Süzgeci tarafından engellendi, başka bir sunucuya bağlanılıyor!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 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
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Açıklama"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Ping"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "Azami Kullanıcı"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Statik Sunucu"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Sürüm"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr "Yumuşak Dosyalar"
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr "Sert Dosyalar"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr "TCP Bayrakları"
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr "UDP Bayrakları"
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 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:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(Bilinmeyen ad)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "Statik sunucu %s'i silmek istediğinizden emin misiniz"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "ms"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Sunucular (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Sunucu"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "Sunucuya bağlan"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Sunucuyu statik olarak işaretle"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Sunucuyu statik olmayan olarak işaretle"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Sunucuları statik olarak işaretle"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Sunucuları statik olmayan olarak işaretle"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Sunucuyu kaldır"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Sunucuları kaldır"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Bütün sunucuları kaldır"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "eD2k bağlantısını panoya kopyala"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Sunucuya yeniden bağlan"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Hepsini silmek istediğinizden emin misiniz?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Seçili sunucuyu silmek istediğinizden emin misiniz?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Seçili sunucuları silmek istediğinizden emin misiniz?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "HATA: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "UYARI: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr "%s (%s) sunucusu oturum açmamızı reddetti (hiçbir istemci kimliği tahsis etmedi). Bağlantı kesiliyor."
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Yeni kullanıcı kimliğiniz %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "UYARI: Düşük ID aldınız!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\tBüyük ihtimalle bir güvenlik duvarı veya yönlendirici arkasındasınız."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tDaha fazla bilgi için: https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Bilinmeyen sunucu bilgisi alındı! - çok kısa"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "%d adet yeni sunucu alındı"
 msgstr1 "%d adet yeni sunucu alındı"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Sunucu listesinin kaydı tamamlandı."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Sunucu son komutu reddetti"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "Sunucudan bozuk paket alındı: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Sunucudan paket alınırken beklenmeyen hata: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, 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:692
+#: src/ServerSocket.cpp
 #, 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:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "protokol gizleme kullanılarak."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "Şuna bağlanılıyor: %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, 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:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "aMuleGUI Günlüğü"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Sunucu eklenmedi: Bir IP veya makine adı girilmedi."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Sunucu eklenmedi: Geçersiz sunucu portu girildi."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "eD2k Durumu:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr "Bağlantı Türü:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "Bağlantı başlangıç tarihi:"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kademlia Durumu:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "LAN kipinde çalışıyor"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Çalışıyor"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "Kademlia istemci kimliği:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Durum:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Bağlantı Durumu:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr "Güvenlik Duvarı - yönlendirici veya güvenlik duvarınızda %d TCP portunu açın"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "UDP Bağlantı Durumu:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr "Güvenlik Duvarı - yönlendirici veya güvenlik duvarınızda %d UDP portunu açın"
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Güvenlik duvarı durumu: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Eşe gerek yok - TCP portu açık"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Eşe gerek yok - UDP portu açık"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Eş yok"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "Eşe Bağlanıyor"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "Eşe %s üzerinde bağlandı"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP :"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Fihristlenen Kaynaklar:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Fihristlenen anahtar kelimeler:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Fihristlenen notlar:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Fihristlenen yük:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Kullanıcı Ortalaması:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Dosya Ortalaması:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Çalışmıyor"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr "Paylaşılan dizin izleyici: arka uç taşması/hatası (%s); tam yeniden yüklemeye geri dönülüyor"
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 "Paylaşılan dizin izleyici: son çalıştırılmadan beri %u yeni alt dizin bulundu, paylaşımlar tekrar taranıyor"
+msgstr1 "Paylaşılan dizin izleyici: son çalıştırılmadan beri %u yeni alt dizin bulundu, paylaşımlar tekrar taranıyor"
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr "Paylaşılan dizin izleyici: arka uç tarafından atlanan olaylar mevcut ve bu, eşleşmeyi tekrar sağlamak için paylaşılan dosyaların tamamen yeniden yüklenmesini zorluyor"
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "%s dosyası paylaşılanlara ekleniyor"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "Bilinen %i adet paylaşılmış dosya bulundu"
 msgstr1 "Bilinen %i adet paylaşılmış dosya bulundu"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Bilinen %i adet paylaşılmış dosya bulundu. Bilinmeyen %i adet"
-msgstr1 "Bilinen %i adet paylaşılmış dosya bulundu. Bilinmeyen %i adet"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 "Filtre tarafından %i dosya paylaşımdan dışlandı"
+msgstr1 "Filtre tarafından %i dosya paylaşımdan dışlandı"
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "HATA: %s paylaşılmak istendi"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Paylaşılan dizin bulunamadı, atlanıyor: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Dizinde paylaşılabilir dosya bulunamadı: %s"
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Paylaşılan dizin okunamıyor, atlanıyor: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "Kullanıcı Adı"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr "Ortam üst verileri çıkarımı ayarlada devre dışı bırakılmış, yani yeniden çıkarılacak hiçbir şey yok."
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "İndirme Hızı"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 "Ortam üst verileri %u paylaşılan dosya için tekrar çıkarılıyor"
+msgstr1 "Ortam üst verileri %u paylaşılan dosya için tekrar çıkarılıyor"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "Gönderme Hızı"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "Artık paylaşılan dosya: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Kaldırılan dosyanın paylaşılması durduruldu: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Kaldırılan dizindeki %u dosyanın paylaşılması durduruldu: %s"
+msgstr1 "Kaldırılan dizindeki %u dosyanın paylaşılması durduruldu: %s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Yeni paylaşılan dizindeki %u dosya artık paylaşılıyor"
+msgstr1 "Yeni paylaşılan dizinlerdeki %u dosya artık paylaşılıyor"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Yeni paylaşılan %u dosya bulundu"
+msgstr1 "Yeni paylaşılan %u dosya bulundu"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "Kullanıcı Adı"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "Erişilebilir Parçalar"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr "Eşteki Parçalar"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "Gönderme Durumu"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 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
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "Yerel Dosya Adı"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "Paylaşılan Dosyalar Listesi"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "İstekler"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Kabul Edilen İstekler"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Aktarılan Veri"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Paylaşım Oranı"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Alınan Parçalar"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr "Kaynak Mevcudiyeti"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Tam Kaynak Sayısı"
-
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Dizin Konumu"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Paylaşılan Dosyalar"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Yorum/Puanlama Ekle"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Yorum/Puanlama Düzenle"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Yeniden Adlandır"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr "Yerel Verileri Kontrol Et"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr "&Ortam üst verilerini tekrar çıkar"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Koleksiyondaki dosyaları aktarım listesine ekle"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Magnet &bağlantısını panoya kopyala"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "eD2k bağlantısını panoya kopyala (&Kaynak)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "eD2k bağlantısını panoya kopyala (Kaynak) (&Şifreleme seçenekleriyle birlikte)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "eD2k bağlantısını panoya kopyala (&Makine Adı)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "eD2k bağlantısını panoya kopyala (Makine adı) (&Şifreleme seçenekleriyle birlikte)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "eD2k bağlantısını panoya kopyala (&AICH bilgisi)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "eD2k bağlantısını panoya kopyala (&AICH bilgisi + Kaynak)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr "Seçili dosyaları bir emulecollection dosyasına aktar"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr "PartFile üzerinde Yerel Veri Kontrolü güncel olarak desteklenmemektedir: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 "Ortam üst verileri: %u tamamlanmamış indirme görmezden geliniyor"
+msgstr1 "Ortam üst verileri: %u tamamlanmamış indirme görmezden geliniyor"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 "Ortam üst verileri: ses veya video olmayan %u dosya görmezden geliniyor"
+msgstr1 "Ortam üst verileri: ses veya video olmayan %u dosya görmezden geliniyor"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 "%u dosya için ortam üst verileri tekrar çıkarılsın mı?"
+msgstr1 "%u dosya için ortam üst verileri tekrar çıkarılsın mı?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 "%u kısmi indirme atlanacaktır."
+msgstr1 "%u kısmi indirme atlanacaktır."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 "%u dosya ses veya video değildir ve atlanacaktır."
+msgstr1 "%u dosya ses veya video değildir ve atlanacaktır."
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr "Bu, arka planda çalışır. İlerleyiş kütükte raporlanır."
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr "Ortam üst verilerini tekrar çıkar"
+
+#: src/SharedFilesCtrl.cpp
 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:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr "emulecollection dosyasına aktar"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr "Dışa aktarmak için hiçbir dosya seçili değil."
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr "eMule koleksiyonları (*.emulecollection)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr "'%s' zaten mevcut. Üzerine yazılsın mı?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "'%s' koleksiyon dosyasının yazılması başarısız oldu."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "%u paylaşılan dosya '%s' unsuruna aktarıldı."
+msgstr1 "%u paylaşılan dosya '%s' unsuruna aktarıldı."
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Paylaşılan Dosyaların Toplam Boyutu: %s (%s tamamlandı)"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Paylaşılan Dosyaların Toplam Boyutu: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Payşılan Dosyalar (%i, %u dosyanın daha karma değeri hesaplanıyor)"
+msgstr1 "Payşılan Dosyalar (%i, %u dosyanın daha karma değeri hesaplanıyor)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Paylaşılan Dosyalar (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "Parça Dosyası"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Paylaşılmış dosyalar yeniden yükleniyor: %u dosya tarandı"
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr "Parça Durumu"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "Dosya Adı"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Gönderilen Veri (Oturum (Toplam)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Toplam Ek Yük (Paket): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Dosya İstemi Ek Yükü (Paket): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Kaynak Değişimi Ek Yükü (Paket): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Sunucu Ek Yükü (Paket):%s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kad Ek Yükü (Paketler): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Şifreleme ek yükü (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Aktif Gönderimler: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Bekleyen Gönderimler: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Toplam başarılı gönderme oturumu: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Toplam başarısız gönderme oturumu: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Ortalama gönderme süresi: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Aktarılan Veri (Oturum (Toplam)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Bulunan Kaynaklar: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Aktif İndirmeler (parçalar): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Oturum GÖN:İND Oranı (Toplam): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Ortalama aktarım oranı (Oturum): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Ortalama gönderim oranı (Oturum): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "En fazla aktarım oranı (Oturum): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "En fazla gönderim oranı (Oturum): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Yeniden Bağlanma: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "İlk Aktarımdan Beri Geçen Süre: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "%s beri Sunucuya Bağlı"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Aktif Bağlantılar (yaklaşık): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Ulaşılan En Fazla Bağlantı Sınırı: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Ortalama Bağlantılar (yaklaşık): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Doruk Bağlantılar (yaklaşık): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Kullanıcılar"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "Bilinmiyor: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "Süzülen: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "Engellenen: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr "Yasaklanmış Kad adresleri: %s"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Toplam: %i Bilinen: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Çalışan Sunucular: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Başarısız Sunucular: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Toplam: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Silinen Sunucular: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Süzülen Sunucular: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Çalışan Sunuculardaki Kullanıcı Sayısı: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Çalışan Sunuculardaki Dosya Sayısı: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Toplam Kullanıcılar: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Toplam Dosyalar: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Sunucu Bağlantısı: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Paylaşılmış Dosya Sayısı: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Paylaşılan Dosyaların Toplam Boyutu: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Ortalama dosya boyutu: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "İşletim Sistemi"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Alınmadı"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Aktif Bağlantılar (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Devre dışı"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Hiç"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, 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:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "<str> çalıştır ve çık."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr "Liste alanlarını eskisi gibi, sekmeler yerine boşluklar ile ayırın."
+
+#: src/TextClient.cpp
 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:399
+#: src/TextClient.cpp
 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 bir sayı.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Adresleme ile işleniyor: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Dosya adı ile işleniyor: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Bu komut bir argüman gerektirir. Geçerli argümanlar: bir dosya adreslemesi.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Geçerli bir sayı değil\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 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"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6471,7 +7902,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6481,7 +7912,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6489,76 +7920,80 @@
 "Hiçbir arama türü tanımlanmadı.\n"
 "Daha fazla yardım için 'help search' yazınız.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Dosyayı indir: %lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "İstem bilinmeyen bir hatayla başarısız oldu."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "İşlem başarılı."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "İstek şu hata ile başarısız oldu: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Kullanıcılar için IP Süzgeci %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "KAPALI"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "AÇIK"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Sunucular için IP süzgeci %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Şu anki IP Süzgeç seviyesi %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, 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"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr "Bant genişliği sınırları: Gönderi: %u KiB/s, İndirme: %u KiB/s.\n"
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr "\"Endgame\" kaynak değişimi şu durumdadır: %s.\n"
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr "Arama başlatıldı (id %u).\n"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "Bağlandı: %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Şimdi bağlanıyor"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "güvenlik duvarı"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "tamam"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6567,7 +8002,7 @@
 "\n"
 "İndirme:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6576,7 +8011,7 @@
 "\n"
 "Gönderme:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6585,7 +8020,7 @@
 "\n"
 "Sıradaki Kullanıcılar:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6594,38 +8029,33 @@
 "\n"
 "Toplam Kaynak:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "Parça Dosyası"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Arama sonuçları sayısı:%i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "Arama süreci: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "Arama süreci görüntülenemiyor"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Sunucudan bilinmeyen bir cevap alındı.: OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Kısa durum bilgisi göster."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 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:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Tüm istatistik ağacını göster."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6639,11 +8069,11 @@
 "\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:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "aMule' yi kapat."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6653,35 +8083,35 @@
 "Bu ayrıca sonraki aracı da kapatacaktır; çünkü çalışan bir çekirdek olmadan\n"
 "bir işe yaramayacaktır.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "Verilen nesne yeniden yükleniyor."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "Paylaşılmış dosya listesini yeniden yükler."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "Dosyadan IP süzgeci tablosunu yeniden yükler."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "IP süzme seviyesini seçiniz."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "Dosyadan IP süzgeci tablosunu yeniden yükler."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 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:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "Ağa bağlan."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6693,35 +8123,35 @@
 "IP onluk IPv4 adresi biçiminde veya çözümlenebilir\n"
 "bir DNS adı olmalıdır."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "Sadece eD2k ağına bağlan."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "Sadece Kad'a bağlan."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Ağ bağlantısını kes."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 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:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Sadece eD2k bağlantısını kes."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Sadece Kad'dan bağlantıyı kes."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "Çekirdeğe bir eD2k veya magnet bağlantısı ekler."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6739,51 +8169,51 @@
 "\n"
 "Magnet bağlantısı eD2k adreslemesi ve dosya boyutunu içermelidir.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Bir ayar değeri girin."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "IP Süzgeci ayarları girin."
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 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:1020
+#: src/TextClient.cpp
 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:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "IP süzgecini kullanıcılar için Aç/Kapat."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "IP süzgecini kullanıcılar için aç."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "IP süzgecini kullanıcılar için kapat."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "IP süzgecini sunucular için Aç/Kapa."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "IP süzgecini sunucular için aç."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "IP süzgecini sunucular için kapat."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "IP süzme seviyesini seçiniz."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6791,59 +8221,71 @@
 "Geçerli süzme seviyeleri 0-255 aralığındadır. Varsayılan\n"
 "değer 127'dir.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Bağlantı sınırlarını girin."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 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:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Gönderme sınırını girin."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Girilen değer kilobayt/saniye cinsinden olmalıdır.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "İndirme sınırını girin."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr "\"Endgame\" kaynak değişimini etkinleştir veya devre dışı bırak."
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Girilen değer 1/ON (etkinleştir) veya 0/OFF (devre dışı bırak) olmalıdır.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Bir ayar değerini al ve göster"
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
 msgstr "IP Süzgeci ayarlarını al."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 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:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "Sadece kullanıcılar için IP süzgeci durumunu al."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "Sadece sunucular için IP süzgeci durumunu al."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "IP süzme seviyesini seçiniz."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Bağlantı sınırlarını al."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr "\"Endgame\" kaynak değişim durumunu al."
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "Kad araması yapar."
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6877,39 +8319,47 @@
 "Örnek: 'search global linux iso --type Iso --min-size 100M' şunu geri gönderir:\n"
 "\"linux iso\" için Iso dosya türünde asgari 100 MiB boyutunda sonuçlar.\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
 msgstr "Genel arama yapar."
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "Sunucuda arama yapar."
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "Kad araması yapar."
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "Son arama sonuçlarını gösterir."
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "Önceki aramanın sonuçlarına döner.\n"
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr "Bir arama sonuçlarını göster."
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+"Bir aramanın sonuçlarını gösterir.\n"
+"Seçime dayalı olarak bir arama kimliği alır ('search …' unsurundan); kimlik yoksa en son başlatılan aramanın sonuçlarını gösterir.\n"
+
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "Bir aramanın işleyişini göster."
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "Bir aramanın işleyişini gösterir.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+"Bir aramanın ilerleyişini göster.\n"
+"Seçime dayalı olarak bir kimlik alır; kimlik yoksa en son başlatılan aramanın ilerleyişini gösterir.\n"
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Dosyayı indirmeye başla."
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6917,80 +8367,80 @@
 "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:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Aktarımı duraklat."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Aktarıma devam et."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Aktarım İptal."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "İndirme önceliği ayarla."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 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:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Önceliği Düşük ayarla."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Önceliği Normal ayarla."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Önceliği Yüksek ayarla."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Önceliği Otomatik ayarla."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Sıra/liste göster."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 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:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Gönderim sırasını göster."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "İndirme sırasını göster."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Günlük kayıtlarını göster."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Sunucu listesini göster."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "Paylaşılan dosyalar listesini göster."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Günlük kayıtlarını sıfırla."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Geçersiz komut, yerine '%s' kullanın."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -6999,255 +8449,278 @@
 "Bu geçersiz bir komut, ve gelecekte belki çıkartılabilir.\n"
 "Bunun yerine '%s' kullanın.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule metin aracı"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "İndirilen dosyanın karma değeri hesaplanıyor: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr "Dosyanın karma değeri hesaplanıyor: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "AICH karma değer grubu dosya için yeniden derleniyor: %s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr "Yerel Veri Kontrolü (%s): %s için Sonuç Tamam"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr "Yerel Veri Kontrolü (%s): HATA TESPİT EDİLDİ! %s başarısız blok: MD4: %s. %s%s"
+
+#: src/ThreadTasks.cpp
 #, 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/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 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/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Onaylama Gerekiyor"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "Sadece 99 kategori desteklenir."
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "Çok fazla kategori!"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Tüm Diğerleri"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Görünüm Süzgeci Seç"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Sınıf Ekle"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Sınıfı Düzenle"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Sınıfı Kaldır"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Bilinmeyen dosya için adresleme seti istendi: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Dosyanın açılması başarısız oldu (%s), paylaşılan dosyalar listesinden kaldırılıyor."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Şu dosya için gönderimler sürdürülüyor: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Şu dosya için gönderimler bekletiliyor: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, 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."
+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
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "İndirme tamamlandı"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Dosyanın tam konumu."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Konum eki olmaksızın dosyanın tam adı."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "Dosyanın eD2k adreslemesi."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Dosyanın bayt cinsinden boyutu."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Toplam indirme hareketleri süresi."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Yeni sohbet oturumu başladı"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "İleti göndericisi."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Dolu"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Disk bölümü."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Tamamlama sırasında hata"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "İşlenmekte olan dosya sayısı %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 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/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Var olmayan dosya!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, aMule'nin eD2k bağlantı oluşturucusu"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Hoş geldiniz!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Girdi parametreleri"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Adreslenecek Dosya"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Bu dosya için isteğe bağlı adres ekleyin"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:144
-msgid "Remove"
-msgstr "Çıkar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Parça adreslemesi içeren bağlantı oluştur."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4 Dosya Adreslemesi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k Dosya Adreslemesi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k bağlantısı"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Kaydet"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Panoya kopyala"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Aç"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Hesaplanan eD2k bağlantısını panoya kopyala"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Farklı Kaydet"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Hesaplanan eDk2 bağlantısını dosyaya kaydet"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "aLinkCreator Hakkında"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Pano açılamıyor"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Şimdilik kopyalanacak bir şey yok !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Seçiniz"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Açılamıyor "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Lütfen boş olmayan bir dosya adı giriniz."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Şimdilik kaydedilecek bir şey yok !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7267,162 +8740,159 @@
 "\n"
 "GPL kapsamında dağıtılır."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Adresleniyor…"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator sizin için çalışıyor"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "MD4 Adreslemesi hesaplanıyor…"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "eD2k Adreslemeleri hesaplanıyor…"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "İptal Edildi !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "%.2f s içinde tamamlandı."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Bu adresi zaten eklemiştiniz. !"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Lütfen boş olmayan bir adres giriniz."
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "%s açılamıyor."
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "ed2k adreslemesi hesaplanırken bellek yetersiz kaldı!"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i gün %i saat %i dakika %i saniye"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uD %02uh %02udk. %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uh %02udk. %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02udk. %02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02us"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr "%.2f KiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr "%.2f GiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr "%.2f TiB"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, aMule Bağlantı İstatistikleri"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 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:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "wxCas'ın önceki açılışlarındaki kesin En Fazla İND. oranı"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Sıfırla"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Sistem"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Otomatik Yenilemeyi Durdur."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Bağlantı İstatistikleri imajını kaydet."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Bağlantı İstatistikleri imajını yazdır."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Ayarlar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "wxCas Hakkında"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Otomatik Yenilemeyi Başlat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Otomatik Yenilemeyi Durdu."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Otomatik Yenileme Başladı."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "İstatistik imajını kaydet."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMule Bağlantı İstatistikleri"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7430,11 +8900,11 @@
 "Yazdırmada bir sorun var.\n"
 "Yazıcınız doğru ayarlanmamış olabilir mi?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Yazdırılıyor"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7452,367 +8922,364 @@
 "\n"
 "GPL kapsamında dağıtımı yapılır."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "Aman aman, aMule çalışmıyor…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule çalışıyor"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule çalışıyor ama bağlı değil."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule bağlanıyor…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Aman aman, aMule'nin durumu bilinmiyor…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " şu süredir çalışıyor: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " durdu !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " bağlı değil !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " bağlanıyor…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " garip şeyler yapıyor, denetleyiniz!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " şuna bağlandı: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "bağlı değil"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " bağlı "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " ile "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Toplam Aktarım: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", Gönderme: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Oturumdaki Aktarım: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Aktarım: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " kB/s, Gönderme "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr " KiB/s, Gönderi: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Paylaşılan: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " dosya(lar), sıradaki kullanıcılar: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Süre: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " bağlı "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Sistem Yükü Ortalaması (1-5-15 dk.): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Sistem çalışma süresi: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Dizin amulesig.dat dosyası içeriyor"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Saniye bazında yenileme döngüsü"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Durum imajını düzenli olarak FTP sunucusuna gönder"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP bağlantısı"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP Yolu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Buraya FTP Sunucunuz için adresi giriniz."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Kullanıcı"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 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:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Dakika bazında FTP günceleme hızı"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Onayla"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Dizin imza dosyanızı içeriyor."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "İstatistik imajının üretildiği dizin"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Şablonu yükler <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Web sunucusu HTTP portu"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Web sunucu portu üzerine iletmek için UPnP portunu kullan"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP portu"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Gzip sıkıştırması kullan"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Web sunucusu için tam erişim parolası"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Web sunucusu için konuk parolası"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Konuk girişine izin ver"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Konuk girişini reddet"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 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:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "aMule yapılandırma yolu: DOĞRUDAN KULLANMAYINIZ!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "PHP yorumcusunu devreden çıkar (eskimiş)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Her istemde PHP sayfalarını yeniden oluştur"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule Web Sunucusu"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "web aracı bağlantısı kabul edildi\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "HATA: web aracı bağlantısı kabul edilemiyor\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, 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:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Fihristleme dosyası bulunamadı: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Oturum sona erdi - giriş gerekiyor\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Oturum tamam, giriş yapıldı.\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Oturum tamam, giriş yapılmadı.\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Hiç oturum açılmadı - giriş gerekecek\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Oturum oluşturuldu - giriş gerekiyor\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "İstem işleniyor özgün: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr "URL sorgu dizesinden `pass` unsurunun okunması reddediliyor.\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "Bir parola belirtilmemiş. Giriş yapılamaz."
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Şifre denetleniyor\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Şifre adreslemesi geçersiz.\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Şifre kabul edildi.\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Şifre kötü.\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 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:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Çıkış istendi.\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "İstem işleniyor yönlendirilmiş: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr "aMule (gerekli)"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr "Masaüstü kısayolu"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr "aMule'ü oturum açtığımda başlat"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ".emulecollection dosyaları ile ilişkilendir"
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr "Kurulumu kaldır"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr "Kullanıcı verilerini sil (yapılandırma, ED2K sunucuları, Kad düğümleri, kısmi dosyalar)"
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr "aMule uygulama dosyaları (gerekli)."
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr "Masaüstünde bir aMule kısayolu oluştur."
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr "Güncel kullanıcı oturum açtığında aMule'ü otomatik olarak başlat (kullanıcı başı ayar)."
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr "aMule uygulama dosyalarını, Başlat Menüsü / masaüstü kısayollarını, otomatik başlatma çalıştırma anahtar unsurunu, Program Ekle/Kaldır unsurunu kaldır (gerekli)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr "aMule'ü emulecollection dosyaları için \"Birlikte Aç\" listesine ilave der ve bu dosyaları başka bir program yönetmiyorsa onu varsayılan yapar. Bir koleksiyon açmak içerdiği her eD2k bağlantısını kuyruğa ekler."
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "aMule uygulama dosyalarını, Başlat Menüsü / masaüstü kısayollarını, otomatik başlatma çalıştırma anahtar unsurunu, URL şema kayıtlarını ve Program Ekle/Kaldır unsurunu kaldır (gerekli)."
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr "Güncel kullanıcı için %APPDATA%\\aMule unsurunu (aMule.conf, ED2K sunucu listesi, Kad düğümleri, kısmi dosyalar, IP filtreleri, arkadaş listesi) daimi olarak sil. Ayarlarınızı muhafaza etmek için şıkkı işaretlemeyin."
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
@@ -7820,7 +9287,7 @@
 "aMule, $INSTDIR. konumundan çalışıyor gibi görünüyor.\r\n"
 "Lütfen aMule'ü (ve aMuleD ile aMuleGUI programlarını) kapatın ve tekrar deneyin."
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
@@ -7828,11 +9295,11 @@
 "aMule daemon'u (amuled.exe) $INSTDIR konumundan çalışıyor gibi görünüyor.\r\n"
 "Lütfen onu durdurup tekrar deneyin."
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr "$0 konumundaki önceki aMule kurulumu kaldırılıyor…"
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
@@ -7840,21 +9307,191 @@
 "$0 konumundaki önceki aMule kurulumu kaldırılamadı.\r\n"
 "Lütfen çalışmakta olan tüm aMule süreçlerini kapatın ve tekrar deneyin, veya evvela önceki kurulumu el ile kaldırın."
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr "aMule çalışmakta gibi görünüyor. Lütfen onu kapatıp kurulum programını tekrar başlatın."
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr "Kullanıcı verileri $APPDATA\\aMule konumunda kaldırılıyor…"
 
+#~ msgid "Ratio"
+#~ msgstr "Oran"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Dizinde paylaşılabilir dosya bulunamadı: %s"
+
+#~ msgid "Change Language"
+#~ msgstr "Dili Değiştirin"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "aMule tercümeleri kurulu değildir"
+
+#~ msgid "No languages available"
+#~ msgstr "Diller mevcut değil"
+
+#~ msgid "User name"
+#~ msgstr "Kullanıcı adı"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Alınan Parçalar"
+
+#~ msgid "Available Parts"
+#~ msgstr "Erişilebilir Parçalar"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Bilinen %i adet paylaşılmış dosya bulundu. Bilinmeyen %i adet"
+#~ msgstr1 "Bilinen %i adet paylaşılmış dosya bulundu. Bilinmeyen %i adet"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/sn"
+
+#~ msgid "kB/s"
+#~ msgstr "kB/s"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
+
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Gönderilen"
+#~ msgid "Remote prefix:"
+#~ msgstr "Uzak Sunucu"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Dosya bulunamadı."
+#~ msgid "Local prefix:"
+#~ msgstr "Sunucu"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "Bilinen dosyalar listesinde geçersiz girdi bulundu. Dosya bozuk olabilir: "
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "ParçaDosyası %u, %u'da kaydediliyor"
+
+#~ msgid "the default Windows shell handler"
+#~ msgstr "varsayılan Windows kabuk işleyicisi"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Her önizlemede bu uyarının gösterilmesini önlemek için,\n"
+#~ "seçeneklerden tercih ettiğiniz video oynatıcısını ayarlayın (varsayılan %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Süzme Sonuçları"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Bilinen dosya olarak işaretle"
+
+#~ msgid "Percent of total files"
+#~ msgstr "Toplam dosyaların yüzdesi"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Ön Yükleme"
+
+#~ msgid "New node"
+#~ msgstr "Yeni düğüm"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Daha Fazla"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Bilinen kullanıcılardan\n"
+#~ "Ön Yükleme"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "Herhangi bir sunucuya ve/veya Kad'a bağlan."
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Kad Bağlantısını Kes"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Durdur"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Bağlanılmış olan ağlar ile bağlantıyı Kes"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "Etkinleştirilmiş olan ağlara bağlan"
+
+#, c-format
+#~ msgid "Could not add %u link from ED2KLinks file (see log for details)."
+#~ msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+#~ msgstr0 "ED2Links dosyasından %u bağlantı eklenemedi (ayrıntılar için kütüğe bakın)."
+#~ msgstr1 "ED2Links dosyasından %u bağlantı eklenemedi (ayrıntılar için kütüğe bakın)."
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Dosyaları otomatik sırala (yüksek CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule aktarım listenizdeki sütunları otomatikman sıralayacaktır."
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Paketin alındığı ip ile kullanıcı ip numarası farklıysa paket reddedilir. Dikkatli kullanın."
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Önceki aramanın sonuçlarına döner.\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Bir aramanın işleyişini gösterir.\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "Bağlantı kesildi - Muhtemelen aMule sonlandırıldı."
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Yeni sürümü başlangıçta denetle."
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k Bağlantısı: "
+
+#~ msgid "Commit"
+#~ msgstr "Onayla"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: arka plana çatallanıyor - görüşürüz"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Web Sitemiz: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Forumumuz: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Belgelendirme: https://amule-org.github.io/docs \n"
+
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Hata raporları: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Gönderilen"
 
 #, c-format
 #~ msgid "No GeoLite2 update URL configured. Download GeoLite2-Country.mmdb manually (a free MaxMind account is required) and place it at %s, or set the URL in Preferences."

amule-3.0.1.tar.gz/po/uk.po -> amule-3.1.0.tar.gz/po/uk.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-18 22:15+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:07+0000\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "Language: uk\n"
@@ -20,71 +20,159 @@
 "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-Generator: Poedit 2.3\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "About aMule"
+msgstr "Показати aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "Віддалене керування aMule"
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Знімок:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"'Багатоплатформений' p2p-клієнт, що оснований на eMule \n"
+"\n"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "Частина aMule основана на \n"
+
+#: src/AboutDialog.cpp
+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/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "Сторінка в Інтернет:"
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "Форум:"
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Click to check for a newer version."
+msgstr "Перевірити наявність нової версії під час запуску"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "Checking for updates..."
+msgstr "З'єднується з Kad"
+
+#: src/AboutDialog.cpp
+#, fuzzy
+msgid "You are running the latest version."
+msgstr "Ви використовуєте застарілу версію aMule!"
+
+#: src/AboutDialog.cpp
+#, fuzzy, c-format
+msgid "A new version (%s) is available:"
+msgstr "Недоступний"
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "Додати друга"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "Ви повинні ввести вірну IP-адресу та порт!"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "Інформація"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "Визначений хеш користувача невірний"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "Add aMule to your application menu?"
 msgstr "Після назви програми"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 #, fuzzy
 msgid "aMule integration failed"
 msgstr "З'єднання невдале "
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
 msgstr ""
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -93,83 +181,161 @@
 "Restart aMule now?"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr ""
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr ""
 
-#: src/amuleAppCommon.cpp:174
+#: src/amuleAppCommon.cpp
+msgid "Failed to open ED2KLinks file."
+msgstr "Не вдалося відкрити файл ED2KLinks."
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr "ЗАСТЕРЕЖЕННЯ: ви не можете додати себе як джерело для eD2k-посилання маючи LowID."
+
+#: src/amuleAppCommon.cpp
 #, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy
+msgid "aMule cannot start"
+msgstr "Діалог aMule знищений"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Collection file not found: %s"
+msgstr "Файл індексу не знайдено: "
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "Неможливо отримати спільні файли користувача %s"
+
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "No usable links in collection: %s"
+msgstr "Не знайдені спільні файли в теці: %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
 msgstr0 ""
 msgstr1 ""
 msgstr2 ""
 
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "ПОМИЛКА"
-
-#: src/amuleAppCommon.cpp:179
-msgid "Failed to open ED2KLinks file."
-msgstr "Не вдалося відкрити файл ED2KLinks."
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Неможливо перетворити magnet-посилання в eD2k-посилання: %s"
 
-#: src/amuleAppCommon.cpp:252
-msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
-msgstr "ЗАСТЕРЕЖЕННЯ: ви не можете додати себе як джерело для eD2k-посилання маючи LowID."
+#: src/amuleAppCommon.cpp
+#, fuzzy, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "Невірне eD2k-посилання! ПОМИЛКА: %s"
 
-#: src/amule.cpp:251
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "Тепер, виходимо з головної програми..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "Вбиваю екземпляр amuleweb з pid `%d' ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "Вбиваю екземпляр amuleweb з pid `%d' ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "Невдалі"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "Вбиваю екземпляр amuleweb з pid `%d' ... "
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "Вбиваю екземпляр amuleweb з pid `%d' ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Завершується core."
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "Завершення роботи aMule закінчене."
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "Наслідки зневадження пам'яті для виходу aMule:"
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "Ваша локаль змінена на системну за замовчуванням із-за зміни налаштувань. Вибачте."
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "Інфо"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -177,56 +343,109 @@
 "\n"
 "Налаштування зовнішніх з'єднань"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "Пароль встановлений та дозволені зовнішні з'єднання."
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "ЗАСТЕРЕЖЕННЯ"
 
-#: src/amule.cpp:788
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
 #, fuzzy
-msgid "eD2k server list (server.met)"
-msgstr "%i сервер знайдено в server.met"
+msgid "Loading temp files"
+msgstr "Завантаження тимчасових файлів з %s."
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr ""
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "Завантаження тимчасових файлів з %s."
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Loading shared files"
+msgstr "Перезавантажити ваші спільні файли"
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "Loading shared files (%u)"
+msgstr "Перезавантажити ваші спільні файли"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Starting up"
+msgstr "Почати"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "Network bootstrap"
+msgstr "Мережі"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
 msgstr ""
 
-#: src/amule.cpp:797
+#: src/amule.cpp src/FirstRunWizard.cpp
 #, fuzzy
-msgid "Network bootstrap"
-msgstr "Мережі"
+msgid "eD2k server list (server.met)"
+msgstr "%i сервер знайдено в server.met"
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
 
-#: src/amule.cpp:882
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "Веб-сервер запущений з %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 #, fuzzy
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "Ви встановили запуск веб-сервера під час завантаження, але amuleweb не може бути запущено. Будь ласка, встановіть пакунок, що містить веб-сервер aMule, зберіть aMule з --enable-webserver та виконайте make install"
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "ПОМИЛКА"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, fuzzy, c-format
+msgid "amuleapi running on pid %d"
+msgstr "Веб-сервер запущений з %d"
+
+#: src/amule.cpp
+#, fuzzy
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "Ви встановили запуск веб-сервера під час завантаження, але amuleweb не може бути запущено. Будь ласка, встановіть пакунок, що містить веб-сервер aMule, зберіть aMule з --enable-webserver та виконайте make install"
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Неможливо прив'язати порт до визначеної адреси: %s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Порт %u недоступний. Ви будете мати LowID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -241,48 +460,48 @@
 "\n"
 "Перевірте вашу мережу, щоб впевнитись, що порт відкритий."
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "Неможливо створити файл онлайн-підпису"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Неможливо створити файл онлайн-підпису aMule"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr "Обрана локаль здається не встановлена. (примітка: спроба встановити її в будь-якому випадку)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Ви запускаєте aMule %s вперше"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Це тестова версія, оновлюється щодня, та\n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "ми не даємо жодної гарантії, якщо вона щось пошкодить, спалить ваш будинок,\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "або вб'є собаку. Але вона *має бути* безпечною у використанні всюди.\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr "Більше подробиць, підтримка та нові випуски можуть бути знайдені на нашій сторінці,\n"
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "на https://amule-org.github.io, або у нашому IRC-каналі #aMule на irc.libera.chat.\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "Не соромтеся повідомити про будь-які помилки на https://github.com/amule-org/amule/issues"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 msgid ""
 "The folder for Online Signature files you specified is INVALID!\n"
 " OnlineSignature will be DISABLED until you fix it on preferences."
@@ -290,595 +509,624 @@
 "Тека для файлів онлайн-підпису НЕВІРНА!\n"
 "Онлайн-підпис буде ВИМКНЕНО поки ви не виправите це в налаштуваннях."
 
-#: src/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "Назва сервера повідомлена"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "Не вдалося виділити місце на диску для файлу '%s': %s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "ПОМИЛКА: не можу відкрити файл часопису"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "ЗАСТЕРЕЖЕННЯ: журнал порожній. Щось негаразд."
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "Часопис очищено"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "Повідомлення сервера: %s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "Не вдалося звантажити перелік вузлів."
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "Не вдалося відкрити звантажений файл перевірки версії"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "Файл перевірки версії зіпсований"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "Ви використовуєте застарілу версію aMule!"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "Остання версія може бути завжди знайдена на https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr "ЗАСТЕРЕЖЕННЯ: Ваша версія aMuled застаріла: %i.%i.%i < %li.%li.%li"
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "Ваша копія aMule оновлена."
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "Неможливо звантажити файл перевірки версії"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "Користувачі: %s | Файли: %s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr "Користувачі: %s K: %s | Файли: E: %s K: %s"
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "Не вибрано жодної мережі"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "з LowID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "з HighID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "З'єднано з %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "З'єднується з %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "Від'єднано від eD2k"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad запущена."
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad зупинена."
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "З'єднано з Kad (все гаразд)"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "З'єднано з Kad (за фаєрволом)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "Від'єднано від Kad"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
 msgstr "Мережа Kad не може бути використана якщо UDP-порт вимкнено в налаштуваннях, не починаю."
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
 msgstr "Мережа Kad вимкнена в налаштуваннях, не з'єднуюсь."
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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/amuled.cpp:145
+#: src/amuled.cpp
 #, fuzzy
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr "ПОМИЛКА: необхідний вірний пароль, щоб використовувати зовнішні з'єднання, і демон aMule не може бути використаний без зовнішніх з'єднань. Щоб запустити демон aMule, ви маєте встановити відповідне значення у полі \"ECPassword\" у файлі ~/.aMule/amule.conf. Виконайте amuled  з параметром --ec-config, щоб встановити пароль. Більше інформації можете знайти на https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled: OnInit - запускається timer"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled: переходимо у фоновий режим - до зустрічі"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "ПОМИЛКА: %s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "Це aMule %s оснований на eMule."
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "Запущений на %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "Відвідайте https://github.com/amule-org/amule/releases/latest, щоб перевірити наявність нових версій."
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "ЖАХЛИВА ПОМИЛКА: не вдалося створити Timer"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "Віддалене керування aMule"
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Знімок:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "Мережі"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"'Багатоплатформений' p2p-клієнт, що оснований на eMule \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "Пошук"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "Сторінка в Інтернет: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "Звантаження"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "Форум: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "Спільні файли"
 
-#: src/amuleDlg.cpp:548
-#, fuzzy
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "Сторінка в Інтернет: https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "Клієнти"
 
-#: src/amuleDlg.cpp:549
-#, fuzzy
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr "Форум: https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "Повідомлення"
 
-#: src/amuleDlg.cpp:550
-#, fuzzy
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "Статистика"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "Частина aMule основана на \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "Налаштування"
 
-#: src/amuleDlg.cpp:552
-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
+msgid "Navigate"
+msgstr ""
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid "Free space: %s"
+msgstr "Повідомлення сервера: %s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "Повідомлення"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "New version available"
+msgstr "Недоступний"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
+#, fuzzy, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr "Остання версія може бути завжди знайдена на https://github.com/amule-org/amule/releases/latest"
+
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "Діалог aMule знищений"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "З'єднується"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: з'єднання"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: від'єднаний"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: за фаєрволом"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: з'єднаний"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: з'єднуюсь"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: вимкнена"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "Скасувати"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
 
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "Зупинити поточні спроби з'єднань"
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "Версія"
 
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "Від'єднатися"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "Від'єднатися від з'єднаних мереж"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "З'єднатися"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "Адреса"
+
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Encryption"
+msgstr "Опис"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "З'єднатися з дозволеними мережами"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "aMuleGUI"
+msgstr "Часопис aMule"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "Вивантаження: %.1f(%.1f) | Звантаження: %.1f(%.1f)"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#, fuzzy
-msgid " MB/s"
-msgstr "Мбайт/с"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " кбайт/с"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "Вивантаження: %.1f | Звантаження: %.1f"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule (%s | З'єднано)"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule (%s | Від'єднано)"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, fuzzy, c-format
 msgid "Do you really want to exit %s?"
 msgstr "Ви справді хочете вийти з aMule?"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "Підтвердження виходу"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "Команда для запуску: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- за замовчуванням -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "Тека з шкірами '%s' не існує"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "ЗАСТЕРЕЖЕННЯ: Неможливо відкрити файл шкіри '%s' для читання"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "Мережі"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "Вікно мереж"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "Пошук"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "Вікно пошуку"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "Звантаження"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 #, fuzzy
 msgid "Downloads Window"
 msgstr "Звантажується"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "Спільні файли"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "Вікно спільних файлів"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "Повідомлення"
+#: src/amuleDlg.cpp
+#, fuzzy
+msgid "Clients Window"
+msgstr "Вікно мереж"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "Вікно повідомлень"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "Статистика"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "Вікно статистики"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "Налаштування"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "Вікно налаштувань"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "Зовн. внесення"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "Засіб зовнішнього внесення частково звантажених файлів"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "Про програму"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "Про/Допомога"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "Мережа eD2k"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Мережа Kad"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "Немає мережі"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "Віддалене керування aMule"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "Жахлива помилка: не вдалося створити Core Timer"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "З'єднатися з віддаленим aMule"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "Втрата з'єднання"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Abort and exit"
+msgstr "Запит на вихід"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "Жахлива помилка: не вдалося створити Poll Timer"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "Переходимо до циклу обробки подій..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "З'єднання..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "Віддалений обробник подій зовнішніх з'єднань графічного інтерфейсу"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "З'єдання невдале. Неможливо з'єднатися з %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "Вимикається"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr ""
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnect attempt timed out; retrying."
+msgstr "Спроба з'єднання з %s (%s:%i) добігла кінця."
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
 "Please check the host, port and that aMule is running with External Connections enabled."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "Вимкнено"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "Reconnected to the remote core."
+msgstr "З'єднання з мережею."
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "З'єдання невдале. Неможливо з'єднатися з %s:%d\n"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
 msgstr "Готовий"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "Всі"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not readable"
+msgstr "Недоступно"
+
+#: src/amule-remote-gui.cpp
+#, fuzzy
+msgid "not found"
+msgstr "Файл не знайдено."
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "Недопустиме посилання або вже в переліку."
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, fuzzy, c-format
+msgid "Could not delete the category: %s"
+msgstr "Тека для тимчасових звантажуваних файлів"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Неможливо отримати спільні файли користувача %s"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "Шукається друг для lowid-з'єднання"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (Підробна версія eMule %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (Підробний eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (підробний eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (оснований на eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "Прізвисько: %s ID: %u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "Запросив: %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
@@ -886,7 +1134,7 @@
 msgstr1 "Статистика файлів для цієї сесії: дозволено %d з %d запитаних, %s передано\n"
 msgstr2 "Статистика файлів для цієї сесії: дозволено %d з %d запитаних, %s передано\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
@@ -894,120 +1142,202 @@
 msgstr1 "Статистика файлів для всіх сесій: дозволено %d з %d запитаних, %s передано\n"
 msgstr2 "Статистика файлів для всіх сесій: дозволено %d з %d запитаних, %s передано\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "Запитаний невідомий файл"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "Повідомлення відфільтроване від '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "Нове повідомлення від '%s' (IP:%s)"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "Користувач %s (%u) запитав ваш перелік спільних файлів для теки %s -> відмовлено"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Неможливо отримати спільні файли користувача %s"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "ЗАСТЕРЕЖЕННЯ: не можна відкрити known.met."
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 #, fuzzy
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "ЗАСТЕРЕЖЕННЯ: Перелік відомих файлів зіпсовано, містить неприпустимий заголовок."
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, fuzzy, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "Помилка введення-виведення під час читання файлу known.met: %s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, fuzzy, c-format
 msgid "Error while saving %s file: %s"
 msgstr "Помилка під час збереження файлу known.met: %s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr ""
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "Категорія"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "Нова категорія"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "Виберіть теку для вхідних файлів"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "Ви повинні визначити назву категорії"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "Ви повинні визначити шлях категорії!"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr "Неможливо створити вхідну теку для категорії. Будь ласка, вкажіть вірний шлях!"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "Розмову розпочато: %s (%s:%u) - %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** З'єднано з клієнтом ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** З'єднуюсь з клієнтом ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** Неможливо з'єднатись з клієнтом / з'єднання втрачене***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr ""
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr ""
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "Закрити вкладки"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "Закрити всі вкладки"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "Закрити інші вкладки"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "Додати до друзів"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "Показати подробиці"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "Видалити з друзів"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "Встановити шматок для друга"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "Переглянути файли"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "Надіслати повідомлення"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "Надіслати повідомлення користувачу"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "Повідомлення:"
+
+#: src/ClientContextActions.cpp
+#, fuzzy
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Встановлення більш ніж одного шматка для друга не дозволено.\n"
+"Був виділений тільки один слот."
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "Численний вибір"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "Видалити з друзів"
+msgstr1 "Видалити з друзів"
+msgstr2 "Видалити з друзів"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientContextActions.cpp
+#, fuzzy, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "Перезавантажується перелік спільних файлів."
+msgstr1 "Перезавантажується перелік спільних файлів."
+msgstr2 "Перезавантажується перелік спільних файлів."
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
@@ -1015,7 +1345,7 @@
 msgstr1 "Завантажено файл довіри, %u відомі клієнти"
 msgstr2 "Завантажено файл довіри, %u відомих клієнтів"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
@@ -1023,160 +1353,273 @@
 msgstr1 " - Довіра сплила для %u клієнтів"
 msgstr2 " - Довіра сплила для %u клієнтів"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "Не знайдено 'cryptkey.dat', створюємо."
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "Подробиці клієнта"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "LowID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "HighID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "Дозволено"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "Підтримується"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "Не підтримується"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "Вимкнено"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "З'єднано"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "Від'єднана"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f кбайт/с"
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "Назва"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP-адреса"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Last seen"
+msgstr "Останнє отримання"
+
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Sessions"
+msgstr "Версія"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Швидкість вивантаження"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+#, fuzzy
+msgid "Download Speed"
+msgstr "Швидкість звантаження"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Uploaded"
+msgstr "Вивантажено"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#, fuzzy
+msgid "Total Downloaded"
+msgstr "Всього звантажень: "
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "Модифікатор звантаження/вивантаження"
 
-#: src/ClientRef.cpp:196
+#: src/ClientHistoryListCtrl.cpp
+#, fuzzy
+msgid "Online now"
+msgstr "Онлайн-підпис"
+
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "Незавершено"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "Поганий хлопець"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "Перевірено - добре"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "недоступні"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "Недоступно"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "Файли"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "Вивантажено"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "Звантажені"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Downloading from"
+msgstr "Звантажується"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Uploading to"
+msgstr "Вивантаження"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "Чинні"
+
+#: src/ClientsWnd.cpp
+#, fuzzy
+msgid "Known"
+msgstr "Невідомо"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "Користувач %s (%u) запитав ваш перелік спільних файлів -> Дозволено"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "Користувач %s (%u) запитав ваш перелік спільних файлів -> Відмовлено"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "Користувач %s (%u) запитав ваш перелік спільних тек -> Дозволено"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "Користувач %s (%u) запитав ваш перелік спільних тек -> Відмовлено"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "Користувач %s (%u) запитав ваш перелік спільних файлів для теки %s -> Дозволено"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "Користувач %s (%u) запитав ваш перелік спільних файлів для теки %s -> відмовлено"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "Користувач %s (%u) зробив спільною теку %s"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "Користувач %s (%u) надіслав незапитані спільні теки."
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, fuzzy, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "Користувач %s (%u) надіслав перелік спільних файлів для теки %s"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "Користувач %s (%u) завершив надсилати перелік спільних файлів"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "Користувач %s (%u) надіслав небажаний перелік спільних файлів"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "Користувач %s (%u) заборонив доступ до переліку спільних тек/файлів"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "Коментарі файлу"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "Назва файлу"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "Коментар"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Пошук у Kad неможливо виконати коли Kad не працює"
+
+#: src/CommentDialogLst.cpp
+#, fuzzy
+msgid "Searching Kad for comments..."
+msgstr "Шукається друг для lowid-з'єднання"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "Немає коментарів"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
@@ -1184,413 +1627,420 @@
 msgstr1 "%u коментарі"
 msgstr2 "%u коментарів"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
+#: src/CountryFlags.cpp
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Не вдалося звантажити GeoIP.dat з %s"
+
 # перевага
-#: src/DataToText.cpp:35
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "Авто низька"
 
 # перевага
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "Авто звичайна"
 
 # перевага
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "Авто висока"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "Дуже низька"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "Низька"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "Звичайна"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "Висока"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "Дуже висока"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "Випуск"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "Запитується"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "З'єднується через сервер"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "Черга заповнена"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "В черзі"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "Звантажується"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "Отримується набір хешів"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "Немає потрібних частин"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "Не можу з'єднати LowID з LowID"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "Забагато з'єднань"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "З'єднується через Kad"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Забагато з'єднань Kad"
 
 # користувач
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "заборонений"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "Помилка з'єднання"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "Віддалена черга заповнена"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "Старий MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "Новий MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "Сумісний з eMule"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "Місцевий сервер"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "Віддалений сервер"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "Обмін джерелами"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "Бездіяльні"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "Посилання"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "Поширювачі джерел"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "Здобутки пошуку"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "Завершених"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "В дії"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 #, fuzzy
 msgid "ERROR: Out of disk space"
 msgstr "ПОМИЛКА: немає місця на диску"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "ПОМИЛКА: частковий met-файл не знайдений"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "ПОМИЛКА: помилка введення-виведення!"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "ПОМИЛКА: невдача!"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "В черзі"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "Вже звантажений"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "Невідомий або неправильний формат тимчасового файлу"
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "Частина"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "Розмір"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "Переданих"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "Швидкість"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "Перебіг"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "Джерела"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "Перевага"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "Стан"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "Залишилось"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "Востаннє повний"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "Останнє отримання"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Ви впевнені, що хочете видалити вибраний файл?"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Ви впевнені, що хочете видалити вибрані файли?"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Відгук від: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "Автоматично"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "Скасувати"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "Зупинити"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "Призупинити"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "Продовжити"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "Видалити завершені"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "Віддати всі A4AF-джерела цьому файлу зараз"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "Віддати всі A4AF-джерела цьому файлу (авто)"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "Віддати всі A4AF-джерела іншим файлам зараз"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "Розширені налаштування"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "Попередній перегляд"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
 msgstr "Показати подробиці файлу"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "Показати всі коментарі"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "Скопіювати magnet-посилання в буфер обміну"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "Скопіювати eD2k-посилання до буферу обміну"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
 msgstr "Скопіювати інформацію відгуку до буферу обміну"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Додати додаткові URL-адреси для цього файлу"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
 msgstr "прибрати"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "Призначити категорію"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "Відкрити файл"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Ви впевнені, що хочете видалити вибраний файл?"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Ви впевнені, що хочете видалити вибрані файли?"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"Відгук від: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "Введіть нову назву для цього файлу:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "Змінити назву файлу"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
-#, fuzzy, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f кбайт/с"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y.%m.%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "Downloads (%i)"
-msgstr "Звантаження (%i)"
-
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
+msgid "%.1f MiB/s"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1454
+#: src/DownloadListCtrl.cpp
 #, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"Щоб попередити показ цього застереження під час кожного попереднього перегляду,\n"
-"оберіть відеопрогравач в налаштуваннях (за замовчуванням %s)."
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "Попередній перегляд файлу"
+msgid "Downloads (%i)"
+msgstr "Звантаження (%i)"
 
-#: src/DownloadListCtrl.cpp:1500
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ПОМИЛКА: не вдалося виконати зовнішній медіа-програвач! Команда: '%s'"
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, fuzzy, c-format
+msgid "Total queue size: %s"
+msgstr "Всього звантажень: %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "Зберігається частковий файл %u з %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "Всі часткові файли збережені."
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "Завантаження тимчасових файлів з %s."
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "Завантажуються частковий файл %u з %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "ПОМИЛКА: не вдалося завантажити файл резервної копії. Шукайте на https://github.com/amule-org/amule/discussions вирішення проблем відновлення .part.met"
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "Всі часткові файли завантажені."
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "Не знайдено жодного часткового файлу"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
@@ -1598,45 +2048,45 @@
 msgstr1 "Знайдені %u часткові файли"
 msgstr2 "Знайдені %u часткових файлів"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "Файлова система для теки тимчасових файлів не може обробити великі файли."
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "Файлова система для теки вхідних файлів не може обробити великі файли."
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "Звантажую %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "Ви вже спробували звантажити файл '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, fuzzy, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "Ви вже маєте файл '%s'"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "Ви вже маєте файл '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "Ви вже спробували звантажити файл %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Неможливо перетворити magnet-посилання в eD2k-посилання: %s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "Невідомий протокол посилання: %s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
@@ -1644,243 +2094,325 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "Невірне eD2k-посилання! ПОМИЛКА: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client sent packet after authentication failed."
 msgstr "Аутентифікація не вдалася."
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "Зовнішнє з'єднання розірвано."
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "Зовнішні з'єднання вимкнені, оскільки відсутній пароль!"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "Зовнішні з'єднання вимкнені у файлі налаштувань."
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "Дозволено нове зовнішнє з'єднання"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ПОМИЛКА: неможливо дозволити нове зовнішнє з'єднання"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Відмовлено у зовнішньому з'єднанні, оскільки в налаштуваннях порожній пароль!"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "З'єднується клієнт: %s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "Невідома версія"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "Невірний ID версії EC, може бути двійкова несумісність. Використовуйте ядро та віддаленого клієнта з того самого зрізу"
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "Ви не можете під'єднатись до остаточної версії з довільної SVN-версії! Можлива відмова попереджена"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "Невірна версія протоколу."
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "Відсутня позначка версії протоколу."
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, fuzzy, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "Автоматичне з'єднання з сервером повториться через %d секунду"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: wrong password."
 msgstr "Аутентифікація не вдалася."
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Authentication failed: missing password."
 msgstr "Аутентифікація не вдалася."
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Invalid request, please authenticate first."
 msgstr "Невірний запит, ви маєте спочатку представитись."
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "Дозвіл надано."
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "Фільтрувати повідомлення від невідомих клієнтів"
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "Спроба доступу без уповноваження. З'єднання розірвано."
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Віддалена PartFile-команда не вдалася: хеш файлу не знайдено: %s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Хеш файлу не знайдений: %s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "Помилка при виконання OpCode"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "Сервер не додано"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "сервер не знайдено: %s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "потрібно визначити сервер для видалення"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k вимкнена у налаштуваннях"
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Friend not found."
 msgstr "Файл не знайдено."
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 #, fuzzy
 msgid "Client not found."
 msgstr "Файл не знайдено."
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr ""
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "Пошук просувається. За мить отримаю здобутки!"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Веб-пошук через віддалений інтерфейс не має сенсу. "
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "Пошук просувається. За мить отримаю здобутки!"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "Немає точок для графіку."
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "Ваш клієнт не налаштований для такого рівня подробиць."
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "Зовнішнє з'єднання: запит на вимкнення"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "Вже вимикається."
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Зовнішнє з'єднання: додається посилання '%s'"
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, fuzzy, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "Недопустиме посилання або вже в переліку."
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "Файл не знайдено."
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "Недопустима назва файлу."
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "Неможливо змінити назву файлу."
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such category."
+msgstr "Закрити цю розмову."
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Missing chat session id"
+msgstr "Розпочато нову розмову"
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "No such chat session"
+msgstr "Закрити цю розмову."
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "Kad вимкнена в налаштуваннях."
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, fuzzy
+msgid "Unknown chat target"
+msgstr "(невідома назва)"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
 msgstr "Kad вимкнена в налаштуваннях."
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "Вже з'єднано з eD2k"
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "З'єднується з eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "Вже з'єднано з Kad."
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "З'єднується з Kad"
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "Всі мережі вимкнені."
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "Від'єднується від eD2k."
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "Від'єднується від Kad."
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Зовнішнє з'єднання: отримано недопустимий opcode: %#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Недопустимий opcode (невірна версія протоколу?)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "Невідоме розширення '%s' для команди '%s'.\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "Невідома команда '%s'.\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1888,7 +2420,7 @@
 "\n"
 "Ця команда не може мати аргумент.\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1896,7 +2428,7 @@
 "\n"
 "Ця команда повинна мати аргумент.\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1904,7 +2436,7 @@
 "\n"
 "Ця команда незавершена, ви повинні використати одне з розширень, що подані нижче.\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1912,11 +2444,11 @@
 "\n"
 "Доступні розширення:\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "Доступні команди:\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1926,17 +2458,17 @@
 "\n"
 "Всі команди розрізняють великі та малі літери.Введіть '%s <command>' щоб отримати докладну інформацію по <command>.\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "Вийти з програми."
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "Показати допомогу."
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1944,7 +2476,7 @@
 "Щоб отримати допомогу по команді, введіть 'help <command>'.\n"
 "Щоб отримати повний перелік команд, введіть ''help\".\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1955,46 +2487,46 @@
 "Використовуйте '%s' для переліку команд\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "Помилка синтаксису!"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "Помилка обробки команди - не повинно ніколи такого бути! Будь, ласка, повідомте про помилку\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "Ця команда не повинна мати жодного параметру."
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "Ця команда повинна мати параметр."
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "Невірний аргумент."
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "Це незавершена команда"
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "Напишіть '%s' щоб отримати більше допомоги.\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "Це %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "Це %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -2002,7 +2534,7 @@
 "\n"
 "Створюється клієнт...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -2011,7 +2543,7 @@
 "\n"
 "Добре, виходимо %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2025,118 +2557,361 @@
 "\n"
 "Вихід...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "Показати цей текст допомоги."
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "Хост, де запущений aMule (за замовчуванням: 127.0.0.1)."
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "Порт aMule для зовнішніх з'єднань (зазвичай: 4712)."
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "Пароль зовнішнього з'єднання"
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "Читати налаштування з файлу."
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "Не друкувати нічого до stdout."
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "Бути докладним: показувати також всі повідомлення налагодження"
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "Вибрати локаль програми (мова)."
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "Записати параметри командного рядка до файлу налаштувань."
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "Створити файл налаштувань оснований на файлі налаштувань aMule."
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "Друкувати версію програми."
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr ""
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "Подробиці файлу"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, fuzzy, c-format
 msgid "%.1f%% done"
 msgstr "%.2f%% виконано"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "Попередній перегляд файлу"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "ПОМИЛКА: не вдалося виконати зовнішній медіа-програвач! Команда: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f кбайт/с"
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, fuzzy, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "ПОМИЛКА: не вдалося відкрити частковий файл '%s'"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Welcome to aMule!"
+msgstr "Ласкаво просимо!"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection & bandwidth"
+msgstr "З'єднання з другом"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Connection speed:"
+msgstr "Стан з'єднання:"
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Networks & ports"
+msgstr "Мережі"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kademlia"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "Зразковий TCP-порт "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Розширений порт UDP (Kad / глобальний пошук) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "Ввімкнути UPnP для перенаправлення портів"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Bootstrap files"
+msgstr "Початковий запуск"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, fuzzy
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "Ви вже спробували звантажити файл %s"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "Автоматичне оновлення переліку серверів після запуску"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "Тека призначення для звантажень"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "Переглянути"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "Тека для тимчасових звантажуваних файлів"
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "Неможливо відкрити перелік друзів 'emfriends.met' для читання!"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "Неможливо відкрити перелік друзів 'emfriends.met' для запису!"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "КРИТИЧНО - немає клієнта на StartChatSession"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "Друзі"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "Показати подробиці"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "Додати друга"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "Видалити друга"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "Надіслати повідомлення"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "Переглянути файли"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "Встановити шматок для друга"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "Ви впевнені, що бажаєте видалити вибраного друга?"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "Ви впевнені, що бажаєте видалити вибраних друзів?"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2144,204 +2919,180 @@
 "Встановлення більш ніж одного шматка для друга не дозволено.\n"
 "Був виділений тільки один слот."
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "Численний вибір"
-
-#: src/GenericClientListCtrl.cpp:574
-#, fuzzy
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Встановлення більш ніж одного шматка для друга не дозволено.\n"
-"Був виділений тільки один слот."
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "Надіслати повідомлення користувачу"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "Повідомлення:"
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "Видалити з друзів"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "Надіслати повідомлення"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "Перемкнути на цей файл"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "Запитано інший файл"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "Waiting for upload slot"
 msgstr "Вивантаження очікують: %s"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, fuzzy, c-format
 msgid "On Queue: %u"
 msgstr "В черзі"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 #, fuzzy
 msgid "Uploading"
 msgstr "Вивантаження"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 #, fuzzy
 msgid "None"
 msgstr "Жоден"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "Ні"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "Так"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, fuzzy, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "Не вдалося відкрити %s (%s)"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "Звантажування..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "HTTP завантаження скасоване"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "Неможливо отримати спільні файли користувача %s"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr ""
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "Тека для тимчасових звантажуваних файлів"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "Звантажені"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr ""
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, fuzzy, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "HTTP завантаження скасоване"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr ""
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr ""
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
 msgstr ""
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr ""
+
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr ""
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download new %s from %s"
 msgstr "Звантажую новий GeoIP.dat з %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "Неможливо видалити файл GeoIP.dat, оновлення зірване."
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, fuzzy, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "Неможливо видалити файл GeoIP.dat, оновлення зірване."
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "Неможливо змінити назву нового файлу GeoIP.dat, оновлення зірване."
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, fuzzy, c-format
 msgid "Successfully updated %s"
 msgstr "Успішно оновлено GeoIP.dat"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, fuzzy, c-format
 msgid "Error updating %s"
 msgstr "Помилка оновлення GeoIP.dat"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr ""
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Failed to download %s from %s"
 msgstr "Не вдалося звантажити GeoIP.dat з %s"
 
-#: src/IP2Country.cpp:295
-#, fuzzy, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "Не вдалося звантажити GeoIP.dat з %s"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 #, fuzzy
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "Завантажую IP-filters 'ipfilter.dat' та 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "Звантаження файлу ipfilter.dat '%s' зазнало невдачі, невідомий формат"
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "Звантаження файлу ipfilter.dat '%s' зазнало невдачі, неможливо відкрити файл."
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
@@ -2349,7 +3100,7 @@
 msgstr1 "Завантажено %u обсяги IP-адрес з '%s'."
 msgstr2 "Завантажено %u обсягів IP-адрес з '%s'."
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
@@ -2357,66 +3108,73 @@
 msgstr1 "%u спотворені рядки були відкинуті."
 msgstr2 "%u спотворених рядків були відкинуті."
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, fuzzy, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "Неможливо змінити назву нового файлу GeoIP.dat, оновлення зірване."
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr ""
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Початковий запуск\n"
-"відомого клієнта"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "Поточна"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "Середня"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "Середня за сесію"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "Вузли (%u)"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "Недопустима IP-адреса для початкового запуску"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "Недопустимий порт для початкового запуску"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "Будь ласка, заповніть потрібні поля"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "Повідомлення"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "Ви впевнені, що хочете звантажити новий файл nodes.dat?\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "Такі дії призведуть до видалення поточних вузлів та перез'єднання з Kademlia."
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "Продовжити?"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kademlia: пошукове слово занадто коротке"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademlia: пошукове слово вже в переліку пошуку: "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
@@ -2424,12 +3182,11 @@
 msgstr1 "Прочитано %u контакти Kad"
 msgstr2 "Прочитано %u контактів Kad"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "Не знайдено жодного контакту, будь ласка, здійсніть початковий запуск або звантажте файл nodes.dat"
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
@@ -2437,7 +3194,7 @@
 msgstr1 "Тільки %d контакти Kad доступні, nodes.dat не записано"
 msgstr2 "Тільки %d контактів Kad доступні, nodes.dat не записано"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
@@ -2445,698 +3202,1042 @@
 msgstr1 "Записано %d контакти Kad"
 msgstr2 "Записано %d контактів Kad"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+#, fuzzy
+msgid "Kad user"
+msgstr "Мережа Kad"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "Назва файлу"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "Розмір файлу"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "Відношення передачі"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "Вивантажено"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "Запитано"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "Дозволено"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "Завершених джерел"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "ЗАСТЕРЕЖЕННЯ: Перелік відомих файлів зіпсовано, містить неприпустимий заголовок."
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "Мова системи"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "Албанська"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "Арабська"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Asturian"
+msgstr "Естонська"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "Баскська"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "Болгарська"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "Каталонська"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "Китайська (спрощена)"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "Китайська (традиційна)"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "Хорватська"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "Чеська"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "Данська"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "Нідерландська"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "Англійська (Великобританія)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "English (U.S.)"
+msgstr "Англійська (Великобританія)"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "Естонська"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "Фінська"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "Французька"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "Галісійська"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "Німецька"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "Грецька"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "Іврит"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "Угорська"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "Італійська"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "Японська"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "Корейська"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "Литовська"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "Норвезька (Нюнорск)"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "Польська"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "Португальська"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "Португальська (Бразилія)"
+
+#: src/LanguageList.cpp
+#, fuzzy
+msgid "Romanian"
+msgstr "Албанська"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "Російська"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "Словенська"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "Іспанська"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "Шведська"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "Турецька"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "Українська"
+
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unknown error %d"
 msgstr "Невідома версія"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, fuzzy, c-format
 msgid "Unable to get error description for error %d"
 msgstr "Тека призначення для звантажень"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "Обчислюється хеш"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "Завершується"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "Завершений"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "Призупинений"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "Помилковий"
 
 # файл
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "Очікує"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "Ви повинні вказати непорожній пароль."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "Неправильний пароль, не MD5-хеш"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "З'єднання невдале"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
-msgid "External Connection lost — exiting."
+msgid "External Connection lost - exiting."
 msgstr "Зовнішнє з'єднання розірвано."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "EC з'єднання невдале. Порожня відповідь."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "Зовнішнє з'єднання: невірна відповідь сервера. З'єднання закрите."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, fuzzy
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "Зовнішнє з'єднання: невірна відповідь сервера. З'єднання закрите."
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "Успіх! Встановлене з'єднання до aMule"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "Успіх! Встановлене з'єднання."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "Зовнішнє з'єднання: в доступі відмовлено з причини: "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 #, fuzzy
 msgid "External Connection: Handshake failed."
 msgstr "Зовнішнє з'єднання: в доступі відмовлено"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
 #, fuzzy, c-format
 msgid "Asio thread %d started"
 msgstr "Потік звантаження HTTP розпочатий"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: Гаразд."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "ПОМИЛКА: неможливо відкрити TCP-порт"
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "ПОМИЛКА: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "ЗАСТЕРЕЖЕННЯ: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "Закрити"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "Вирізати"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "Скопіювати"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "Вставити"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "Очистити"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "Вибрати всі"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "Безмежно"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "Показати aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "Сховати aMule"
+
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "eD2k: "
 msgstr "eD2k"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (LowID)"
 msgstr "З'єднано"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (HighID)"
 msgstr "З'єднано"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Kad: "
 msgstr " Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Connected (firewalled)"
 msgstr "З'єднано з Kad (за фаєрволом)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server: "
 msgstr "IP серверу: "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 #, fuzzy
 msgid "Server IP: "
 msgstr "Адреса сервера:"
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "Не з'єднаний"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "Порт TCP: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "Порт TCP: не готовий"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "Порт UDP: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "Порт UDP: не готовий"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "Інформація клієнта"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "Обмеження вивантаження"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "Обмеження звантаження"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "Показати aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "Від'єднатися"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "Сховати aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "З'єднатися"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "Вийти"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "кбайт/с"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "Безмежно"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule Tray Menu"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "Обмеження швидкості:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "Вивантаження: Немає"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "Вивантаження: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "Звантаження: немає"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "Звантаження: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Download speed: %.1f%s"
 msgstr "Швидкість звантаження: %.1f"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, fuzzy, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "Швидкість вивантаження: %.1f"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "Прізвисько: %s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "Не вибрано прізвисько!"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "ID клієнта: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "Назва серверу: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "IP серверу: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "Не з'єднано"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "Online-підпис: увімкнено"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "Online-підпис: вимкнено"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "Час роботи: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "Спільні файли: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "Клієнтів в черзі: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "Всього звантажень: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "Всього вивантажень: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k-посилання: "
-
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "Підтвердити"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Paste eD2k or magnet links here"
+msgstr "Додає eD2k-посилання або magnet-посилання до ядра."
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Add links"
+msgstr "Додати до друзів"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Натисніть щоб додати eD2k-посилання в текстовий нагляд до черги звантажень."
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
 msgstr "Тут відображаються події. Для повного переліку подій, зверніться до часопису у вкладці серверів."
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "Завантаження..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "Кількість користувачів на сервері, з якими ви з'єднані..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "Користувачів: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "Користувачі, що з'єднані з поточним сервером, та оцінка загальної кількості користувачів."
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "Вивантаження: 0.0 | Звантаження: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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 (за фаєрволом), зелені - маєте high ID (найкраще)."
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "Не з'єднано..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "З'єднаний сервер в даний час."
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "Пошук"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "Назва:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "Тип"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "Місцевий"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "Глобальний"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "Розширені параметри"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "Фільтрування"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "Тип файлу"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "Будь-який"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "Архіви"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "Аудіо"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+#, fuzzy
+msgid "Disc images"
 msgstr "Образи CD"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "Зображення"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "Програми"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "Тексти"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "Відео"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "Розширення"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "Найменший розмір"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "байт"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "кбайт"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "Мбайт"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "Гбайт"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "Найбільший розмір"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "Доступність"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "Фільтр:"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "Фільтр"
 
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "Здобутки фільтру"
-
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "Перевернути фільтр"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "Сховати відомі файли"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset Filters"
+msgstr "Очистити поля"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "Почати"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "Більше"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Extend"
+msgstr "Розширення"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "Зупинити"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "Звантаження"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "Звантажити в категорію"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Clear Search Results"
+msgstr "Здобутки пошуку"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "Очистити поля"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "Здобутки"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "Очистити завершені звантаження"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "Фільтр:"
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "File sources:"
 msgstr "Завершених джерел"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "Загальні"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "Повна назва:"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "недоступні"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "Повна назва"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr "met-файл"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "Хеш"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr "met-файл:"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "Хеш:"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "Розмір файлу:"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "Стан часткових файлів:"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "Востаннє повний:"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "Розмір файлу"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "Передавання"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "Знайдено джерел:"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "Передані джерела:"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "Кількість часткових файлів:"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "Наявні:"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "Стан часткових файлів"
 
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "Швидкість передачі:"
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "Востаннє повний"
 
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "Чинний час звантаження: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "Передані:"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "Розмір завершених:"
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "Знайдено джерел"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "Передані джерела"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "Кількість часткових файлів"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "Наявні"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "Швидкість передачі"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "Чинний час звантаження"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "Розмір завершених"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "Розумна обробка пошкоджень"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "Втрачено за рахунок спотворень:"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "Здобуто стисненням:"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "Пакунки збережено Р.О.П. :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "Втрачено за рахунок спотворень"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "Здобуто стисненням"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "Пакунки збережено Р.О.П."
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Sharing"
+msgstr "Спільні файли: "
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "Запитів"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "Прийняті запити"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "Передані дані"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "Відношення поширення"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "Повних джерел"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Shared since"
+msgstr "Спільні файли"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Last upload"
+msgstr ", вивантажень: "
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Media Info"
+msgstr "Інфо Kad"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Bitrate"
+msgstr "Без рейтингу"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "Назва"
+
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "Назви файлів"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "Прибрати"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "Очистити"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "Застосувати"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "Гаразд"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Коментувати/оцінити файл (текст буде видно всім користувачам)"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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."
@@ -3144,1137 +4245,1251 @@
 "Для фільму ви можете написати тривалість, сюжет, мову... \n"
 "або ж якщо він підробний, ви можете розповісти це іншим користувачам aMule."
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "Якість файлу"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "Без рейтингу"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "Невірний / Зіпсований / Підробний"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "Погано"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "Непогано"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "Добре"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "Відмінно"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Змінити оцінку файлу або повідомити користувачів, якщо файл невірний..."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Get from Kad"
+msgstr "Від'єднано від Kad"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "Оновити"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "Звантажується, будь ласка, зачекайте..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "Невідомий розмір"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "Потрібна інформація"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP-адреса:"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "Порт:"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "Порт"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "Додаткова інформація"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "Ім'я користувача:"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "Хеш користувача:"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "Хеш користувача"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "Додати"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "Швидкість звантаження"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "Поточна"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "Середня"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "Середня за сесію"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "Швидкість вивантаження"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "З'єднання"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "Чинні звантаження"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "Чинні з'єднання (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "Чинні вивантаження"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "Дерево статистики"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "Ім'я користувача:"
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "Хеш користувача:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "Програма клієнта:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "Версія клієнта:"
-
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP-адреса:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "Програма клієнта"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "Версія клієнта"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "ID користувача"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "Адреса сервера"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "ID користувача:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "Назва сервера"
 
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "Адреса сервера:"
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "Приховування"
 
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "Назва сервера:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "Приховування:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Protocol extensions"
+msgstr "Приховування протоколу"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "Передано клієнту"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "Поточні запити:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "Середня швидкість вивантаження:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "Середня швидкість звантаження:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "Вивантажено (сесія):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "Звантажено (сесія):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "Вивантажено (всього):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "Звантажено (всього):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "Поточні запити"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "Середня швидкість вивантаження"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "Середня швидкість звантаження"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "Вивантажено (сесія)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "Звантажено (сесія)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "Вивантажено (всього)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "Звантажено (всього)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "Рахунок"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "Модифікатор звантаження/вивантаження:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "Безпечна ідентифікація:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "Безпечна ідентифікація"
 
-#: src/muuli_wdr.cpp:1167
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Queue rank:"
+msgid "Queue rank"
 msgstr "В черзі"
 
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "Рахунок черги:"
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "Рахунок черги"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "Прізвисько"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - багатоплатформений Mule"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Це ім'я, яке бачать інші користувачі, коли під'єднуються до вас."
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "Мова: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "Затримка перед показом підказок."
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "Це визначає мову"
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Periodically check for a new version"
 msgstr "Перевірити наявність нової версії під час запуску"
 
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
 msgstr "Перевірка нової версії після запуску"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1226
-msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "Розпочати зменшеним"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Зменшитись після запуску"
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "Запит на вихід"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "Питає перед виходом."
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "Увімкнути знак у системному лотку"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Ввімкнути/вимкнути знак в системному лотку або панелі."
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "Зменшитись в знак"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "Зменшуватись в системний лоток, а не в смужку програм."
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Remember search history"
+msgstr "Запам'ятати ці налаштування"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "Затримка показу порад: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "с"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "Обрати переглядач тенет"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "Введіть тут назву вашого переглядача тенет. Залиште це поле порожнім, щоб використовувати переглядач встановлений за замовчуванням."
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "Переглянути"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "Відкрити в новій вкладці, якщо можливо"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Відкрити сторінку тенет в новій вкладці замість нового вікна, якщо можливо"
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "Відеопрогравач"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "Обмеження ширини смуги"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "Вивантаження"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "Виділення шматків"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "Порти"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "Зразковий TCP-порт "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Це звичайний порт eD2k і не може бути вимкненим."
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "Порт UDP для запитів сервера (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "Розширений порт UDP (Kad / глобальний пошук) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Цей порт використовується для зовнішній запитів eD2k та для мережі Kad"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "Ввімкнути UPnP для перенаправлення портів"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnP TCP порт (не обов'язково):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "Використовувати IP-адресу (пусто для будь-якої):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Bind to network interface (empty for any):"
+msgstr "Використовувати IP-адресу (пусто для будь-якої):"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "Найбільше джерел на звантажуваний файл:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "Найбільше одночасних з'єднань:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kademlia"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "eD2k"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "Автоматичне з'єднання після запуску"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "Перез'єднатись при втраті з'єднання"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "Вилучити мертвий сервер після"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "спроб"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "Автоматичне оновлення переліку серверів після запуску"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "Перелік"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "Оновити перелік серверів після з'єднання з сервером"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "Оновити перелік серверів після з'єднання з клієнтами"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "Використовувати систему переваг"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "Використовувати розумну перевірку LowID під час з'єднання"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "Безпечне з'єднання"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "Автоматично з'єднуватись тільки з серверами з переліку постійних"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "Встановити високу перевагу доданим вручну серверам"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "Розумна обробка пошкоджень (Р.О.П.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "Ввімкнено"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr "Вдосконалена Р.О.П. довіряє всім хешам (не радимо)"
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "Додати файли для звантаження призупиненими"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "Додати файли для звантаження з автоматичною перевагою"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "Спробувати спершу звантажити перший та останній шматки"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "Запустити наступний призупинений файл, коли файл завершиться"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "З тієї самої категорії"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "Попереднє виділення місця на диску для нових файлів"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "Повністю виділяти місце для всього нового файлу, це зменшить фрагментування"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "Припинити звантаження коли вільне місце на диску досягнуло "
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr "Виберіть це якщо хочете, щоб aMule перевіряв ваше місце на диску"
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "Введіть найменше бажане місце на диску"
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "Зберегти 10 джерел рідкісних файлів (менше ніж 20 джерел)"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "Вивантаження"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "Додати нові спільні файли з автоматичною перевагою"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "Тека призначення для звантажень"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Розумна обробка пошкоджень (Р.О.П.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "Ввімкнено"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Вдосконалена Р.О.П. довіряє всім хешам (не радимо)"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr "Спільні теки"
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "Тека для тимчасових звантажуваних файлів"
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1584
-msgid "Shared folders"
-msgstr "Спільні теки"
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "Вилучити"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Праве клацання по значку теки для рекурсивного додавання)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "Робити спільними приховані файли"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Remote prefix"
+msgstr "Віддалений сервер"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Local prefix"
+msgstr "Місцевий сервер"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "Графіки"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "Час оновлення: 5 с"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "Час для середніх графіків: 100 хв"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "Шкала графіку з'єднань: 100"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "Шкала графіку звантаження"
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "Шкала графіку вивантаження"
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Colors: "
 msgstr "Кольори: "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "Фон"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "Сітка"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "Звантаження зараз"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "Звантаження середні за роботу"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "Звантаження середні за сесію"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "Вивантаження поточні"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "Вивантаження середні за роботу"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "Вивантаження середні за сесію"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "Чинні з'єднання"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Systray Icon Speed Bar"
 msgstr "Показувати стовпчик швидкості в системному лотку"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "Вузлів Kad зараз"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "Вузлів Kad запущено"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "Вузлів Kad за сесію"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "Вибрати"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "Дерево"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Кількість відображуваних версій клієнтів (0=необмежено)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "!!! ЗАСТЕРЕЖЕННЯ !!!"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "Найбільше зовнішніх з'єднань за 5 с"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Kad source re-search interval (minutes)"
+msgstr "Час оновлення FTP в хвилинах"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Source re-ask interval (minutes)"
+msgstr "Час оновлення FTP в хвилинах"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Розмір файлу буфера: 240000 байт"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Розмір черги вивантаження: 5000 клієнтів"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "Час оновлення з'єднання з сервером: вимкнено"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "Використати шкіру: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "Показати \"Швидкий оброблювач eD2k-посилань\" в кожному вікні."
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "Показати розширену інформацію на вкладках категорій"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Show application version on title"
 msgstr "Показувати швидкість передавання в заголовку"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "Показувати швидкість передавання в заголовку"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "Перед назвою програми"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "Після назви програми"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "Показати ширину смуги службового трафіку"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "Вертикальне розміщення панелі інструментів"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "Звантажити файли в черзі"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "Показувати поступ у відсотках"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "Показувати панель поступу"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "Плаский"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "Круглий"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "Автоматично впорядковувати файли (багато ресурсів CPU)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule буде автоматично впорядковувати стовпці в переліку звантажень"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "Параметри зовнішніх з'єднань"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "Дозволити зовнішні з'єднання"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "IP-адреса інтерфейса:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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 для прослуховування EC-інтерфейсу. Порожнє поле або 0.0.0.0 означатиме всі."
 
-#: src/muuli_wdr.cpp:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "Порт TCP:"
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Ввімкнути UPnP перенаправлення для EC-порту"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "Пароль"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "aMule API server parameters"
+msgstr "Налаштування веб-сервера"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "HTTP port:"
+msgstr "Порт TCP:"
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Admin password"
+msgstr "Перевіряється пароль\n"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "A password is set."
+msgstr "Перевіряється пароль\n"
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enable guest access"
+msgstr "Заборонити гостьовий доступ"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Guest password"
+msgstr "Пароль гостя веб-сервера"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Налаштування веб-сервера"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Run webserver on startup (deprecated)"
 msgstr "Запустити веб-сервер під час запуску"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Веб шаблон"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "Пароль повних прав"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "Ввімкнути користувача з низькими правами"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "Пароль низьких прав"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "Ввімкнути UPnP перенаправлення портів для порту веб-сервера"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "UPnP TCP-порт веб-сервера (не обов'язково)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "Час оновлення сторінки (с)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "Дозволити Gzip-стиснення"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Reset page to defaults"
+msgstr "Мова системи"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "Гаразд"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Натисніть тут щоб застосувати зміни зроблені в налаштуваннях."
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
 msgstr "Скинути всі зміни внесені в налаштування."
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "Назва:"
-
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "Коментар:"
-
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "Вхідна тека:"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "Змінити перевагу для нового призначеного файлу:"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "Вхідна тека"
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "Змінити перевагу для нового призначеного файлу"
 
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Don't change"
 msgstr "Не змінювати"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "Виберіть колір для цієї категорії (зараз вибрано):"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "Очистити"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "Виберіть колір для цієї категорії (зараз вибрано)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "Натисніть цю кнопку, щоб очистити часопис."
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Натисніть на кнопку щоб оновити перелік серверів з адреси..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "Перелік серверів"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "Додати сервер вручну: Назва"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "Введіть тут назву нового сервера"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP:Порт"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "Введіть тут порт сервера."
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Додати сервер вручну (заповніть поля ліворуч)..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "Часопис aMule"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "Інфо сервера"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "Інфо eD2k"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Інфо Kad"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Натисніть на цю кнопку щоб оновити перелік вузлів з URL..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "Вузли (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "Статистика вузлів"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "Початковий запуск"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "Новий вузол"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP:"
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "Порт:"
-
-#: src/muuli_wdr.cpp:2327
+#: src/muuli_wdr.cpp
 #, fuzzy
-msgid "Bootstrap from known clients"
+msgid "Bootstrap from node: IP"
 msgstr ""
 "Початковий запуск\n"
 "відомого клієнта"
 
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "Від'єднатися від Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "Тут введіть IP-адресу сервера, використовуючи формат x.x.x.x."
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "Використовувати безпечну ідентифікацію користувача"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr "Рекомендовано ввімкнути цю опцію. Ви не отримаєте довіру якщо безпечна ідентифікація вимкнена."
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "Приховування протоколу"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "Підтримка приховування протоколу"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "Ця опція вмикає приховування протоколу та дозволяє aMule приймати приховані з'єднання від інших клієнтів."
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "Використовувати приховування для вихідних з'єднань"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "Ця опція вмикає приховування протоколу під час з'єдання з іншими клієнтами/серверами."
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "Приймати тільки приховані з'єднання"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "Кожен"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "Жоден"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "Хто може бачити мої спільні файли:"
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr "Оберіть тих, хто може запитати перелік ваших спільних файлів."
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP-фільтрування"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "Фільтрувати клієнтів"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Ввімкнено фільтрування IP-адрес клієнтів, що визначені в файлі ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "Фільтрувати сервери"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Ввімкнено фільтрування IP-адрес серверів, що визначені в файлі ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "Перезавантажити перелік"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Перезавантажити перелік IP-адрес для фільтрування з файлу ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "Оновити зараз"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "Автоматичне оновлення IP-фільтру після запуску"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "Рівень фільтра:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "Завжди відфільтровувати IP-адреси локальних мереж"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Параноїдальна обробка IP-адрес, що не співпали"
 
-#: src/muuli_wdr.cpp:2438
-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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Використовувати системний ipfilter.dat якщо наявний"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "Якщо не знайдено місцевий ipfilter.dat, дозволити використання системного."
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "Ввімкнути онлайн-підпис"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "Частота оновлення (с)"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Змінити частоту (в секундах) оновлень онлайн-підписів."
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "Зберегти файл онлайн-підпису в: "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "Натисніть тут, щоб вибрати теку, що містить файли з онлайн-підписами."
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Database"
 msgstr "Швидкість передачі:"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Source:"
 msgstr "Джерела"
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4282,11 +5497,11 @@
 "License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4296,485 +5511,557 @@
 "Requires attribution and account registration; refresh at least every 30 days."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Download URL:"
 msgstr "Звантаження: "
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
 "License and attribution terms are set by the upstream URL - you are responsible."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Auto-update on startup"
 msgstr "Автоматичне оновлення IP-фільтру після запуску"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "Фільтрувати вхідні повідомлення (окрім поточної розмови):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "Фільтрувати всі повідомлення"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "Фільтрувати повідомлення від людей, що не в вашому переліку друзів"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "Фільтрувати повідомлення від невідомих клієнтів"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Фільтрувати повідомлення, що містять (використовуйте ',' для переліку):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "додати слова, які aMule буде фільтрувати, та забороняти повідомлення, що їх містять"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "Показувати отримані повідомлення в часописі"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "Коментарі"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Фільтрувати коментарі, що містять (використовуйте ',' для переліку):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "Включити авторизацію"
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "Ввімкнути/вимкнути аутентифікацію з ім'ям/паролем"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "Ім'я користувача: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "Ім'я користувача для з'єднання з проксі"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "Пароль:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "Пароль для з'єднання з проксі"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "Ввімкнути проксі"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "Ввімкнути/вимкнути підтримку проксі"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "Тип проксі:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "Хост проксі:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "Тип проксі"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "Хост проксі"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "Ім'я хосту проксі"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "Порт проксі:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "Порт проксі"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "Порт проксі"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "Включити авторизацію"
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "Ввімкнути/вимкнути аутентифікацію з ім'ям/паролем"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "Ім'я користувача для з'єднання з проксі"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "Пароль для з'єднання з проксі"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "З'єднатись з:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "Вхід до віддаленого aMule"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "Ім'я користувача"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "Запам'ятати ці налаштування"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Encrypt the connection (recommended)"
+msgstr "Зовнішнє з'єднання розірвано."
+
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Force ZLIB compression"
 msgstr "Використовувати gzip-стиснення"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "Ввімкнути докладне ведення часопису."
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Only to Logfile"
 msgstr "Відкрити файл"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "Категорія повідомлення:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "Очікується..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "Додати зовнішні внесення"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "Повторити вибрані"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "Вилучити вибрані"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "Типи подій"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active Uploads"
 msgstr "Чинні вивантаження:"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr ""
+#: src/muuli_wdr.cpp
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Показати клієнтів"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "All files"
 msgstr "Сховати спільні файли"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Selected files"
 msgstr "Вибрати фільтр перегляду"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Active uploads only"
 msgstr "Чинні вивантаження"
 
-#: src/muuli_wdr.cpp:3006
-#, fuzzy
-msgid "Show Clients for"
-msgstr "Показати клієнтів"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 #, fuzzy
 msgid "Reload:"
 msgstr "Перезавантажити перелік"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "Перезавантажити ваші спільні файли"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "Надіслати"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "Надіслати вказане повідомлення."
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "Закрити цю розмову."
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "З'єднатися з будь-яким сервером та/чи Kad"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Cancel %s"
+msgstr "Скасувати"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "Спільні файли"
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "Від'єднатися"
 
-#: src/OScopeCtrl.cpp:242
+#: src/muuli_wdr.cpp
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "З'єднатися"
+
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "Вимкнено %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "байт"
 msgstr1 "байти"
 msgstr2 "байт"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "кбайт"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "Тбайт"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "к"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "М"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "Г"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "Т"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "байт/с"
 msgstr1 "байти/с"
 msgstr2 "байт/с"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "Мбайт/с"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "с"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "хв"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "год"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "діб"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "всі"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "всі інші"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "Незавершені"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "Зупинені"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "Відео"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "Архів"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "Текст"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "Чинні"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "This source does not have the part"
+msgstr "Ця команда не повинна мати жодного параметру."
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "No other source has this part"
+msgstr "Ця команда не повинна мати жодного параметру."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One other source has this part"
+msgstr "Ця команда не повинна мати жодного параметру."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy, c-format
+msgid "%u or more other sources have this part"
+msgstr "Ця команда не повинна мати жодного параметру."
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file."
+msgstr "Введіть тут порт сервера."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "Введіть тут порт сервера."
+
+#: src/PartBarLegendUI.cpp
+#, fuzzy
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "Введіть тут порт сервера."
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "Очікується завершення потому перетворення часткового файлу..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "Вноситься %s: %s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "Читається тимчасова тека"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "Витягується основна інформація з інформації звантажуваного файла"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "Створюється файл призначення"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "Завантажуються дані зі старого файлу звантажень (%u з %u)"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "Зберігається блок даних в новий один файл звантаження (%u з %u)"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "Отримується інформація по джерелам звантажуваного файла"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "Додається звантаження та зберігається новий частковий файл"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "Вношу часткові файли"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "Стан"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "Хеш файлу"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (диск: %s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "Будь ласка, виберіть теку з тимчасовими звантаженнями! (підтеки будуть додані)"
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 #, fuzzy
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "Ви хочете, щоб джерела успішно внесених звантажень були видалені?"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "Видалити джерела?"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 #, fuzzy
 msgid "ERROR: Failed to create partfile"
 msgstr "ПОМИЛКА: Не вдалося створити частковий файл"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "Спроба завантажити резервну копію met-файлу з %s"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "ПОМИЛКА: Не вдалося відкрити файл part.met: %s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr "ПОМИЛКА: файл part.met має розмір 0: %s ==> %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "ПОМИЛКА: Невірна версія файлу part.met: %s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "ПОМИЛКА: %s (%s) зіпсований (невірна кількість міток), неможливо завантажити файл."
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "ПОМИЛКА: %s (%s) зіпсований (невірна кількість міток), неможливо завантажити файл."
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "Намагання відтворити інформацію файлу..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "Відновлюється файл без назви - спроба відновити як RecoveredFile.dat"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "Відновлена вся доступна інформація файлу :D - спроба використати її..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "Неможливо відтворити інформацію файлу"
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "Не вдалося відкрити %s (%s)"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "ЗАСТЕРЕЖЕННЯ: %s може бути зіпсований (%i)"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "ПОМИЛКА під час збереження часткового файлу: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "Помилка введення-виведення під час збереження часткового файлу: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr ""
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "Не вдалося зберегти файл part.met.seeds для %s"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
@@ -4782,17 +6069,17 @@
 msgstr1 "Збережено %i джерела для часткового файлу: %s (%s)"
 msgstr2 "Збережено %i джерел для часткового файлу: %s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "Збережено %i джерело для часткового файлу: %s (%s)"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "Помилка читання файлу-джерела часткового файлу (%s - %s): %s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
@@ -4800,353 +6087,197 @@
 msgstr1 "Знайдена підробна частина (%d) в (%d) часткових файлах %s - FileResultHash |%s| FileHash |%s|"
 msgstr2 "Знайдена підробна частина (%d) в (%d) часткових файлах %s - FileResultHash |%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "Знайдено завершену частину (%i) в %s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "Завершене повторне обчислення хешу: %s"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "Неочікувана помилка під час завершення %s. Файл призупинено"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "Завершене звантаження: %s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, fuzzy, c-format
 msgid ""
 "Finished downloading:\n"
 "%s"
 msgstr "Завершене звантаження: %s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "Видаляється файл: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "ЗАСТЕРЕЖЕННЯ: неможливо обчислити хеш звантаженого файлу - набір хешів неповний для '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "ПОМИЛКА: неможливо обчислити хеш звантаженого файлу - набір хешів неповний (%s). Такого ніколи не повинно бути"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr ""
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr ""
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "ЗАСТЕРЕЖЕННЯ: недостатньо вільного місця на диску! Призупиняється файл: %s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "Звантажена частина %i зіпсована в файлі: %s"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr "Р.О.П.: відновлено зіпсовану частину %i для %s -> Збережено байт: %s"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "Виділяється"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "Не вистачає місця на диску"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "Звантажені"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "ПОМИЛКА: не вдалося відкрити частковий файл '%s'"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "Мова системи"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "Албанська"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "Арабська"
-
-#: src/Preferences.cpp:640
-#, fuzzy
-msgid "Asturian"
-msgstr "Естонська"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "Баскська"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "Болгарська"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "Каталонська"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "Китайська (спрощена)"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "Китайська (традиційна)"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "Хорватська"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "Чеська"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "Данська"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "Нідерландська"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "Англійська (Великобританія)"
-
-#: src/Preferences.cpp:651
-#, fuzzy
-msgid "English (U.S.)"
-msgstr "Англійська (Великобританія)"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "Естонська"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "Фінська"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "Французька"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "Галісійська"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "Німецька"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "Грецька"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "Іврит"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "Угорська"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "Італійська"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "Італійська (Швейцарія)"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "Японська"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "Корейська"
-
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "Литовська"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "Норвезька (Нюнорск)"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "Польська"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "Португальська"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "Португальська (Бразилія)"
-
-#: src/Preferences.cpp:669
+#: src/PeerCapabilities.h
 #, fuzzy
-msgid "Romanian"
-msgstr "Албанська"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "Російська"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "Словенська"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "Іспанська"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "Шведська"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "Турецька"
+msgid "Extended source exchange"
+msgstr "Обмін джерелами"
 
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "Українська"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
 
-#: src/Preferences.cpp:779
-#, fuzzy
-msgid "Change Language"
-msgstr "Мова: "
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
 
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
 msgstr ""
 
-#: src/Preferences.cpp:840
-#, fuzzy
-msgid "No languages available"
-msgstr "Недоступний"
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
 
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "немає наявних опцій"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+#, fuzzy
+msgid "Invalid path mapping found, skipping"
+msgstr "Знайдена помилкова категорія, пропущена"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "Знайдена помилкова категорія, пропущена"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "Буде використовуватися порт за замовчуванням (%d)"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "З'єднання"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "Теки"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "Сервери"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "Файли"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "Безпека"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "Зовнішній вигляд"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "Проксі"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "Фільтри"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "Віддалене керування"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "Онлайн-підпис"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "Розширені"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "Події"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "Налагоджувач"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
 "    %PARTNAME - file name only"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5162,26 +6293,43 @@
 "aMule чудово працює без зміни будь-яких\n"
 "з цих параметрів."
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr "Помилка з'єднання Cfg до Widget з ID %d та ключем %s"
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, 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/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "Тип проксі з яким ви з'єднуєтесь"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, 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:817
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "No password set."
+msgstr "Перевіряється пароль\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5189,35 +6337,49 @@
 "aMule має бути перезапущений, щоб зміни подіяли:\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP-порт змінено.\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP-порт змінено.\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- Network interface binding changed.\n"
+msgstr "Зовнішнє з'єднання розірвано."
+
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect port changed.\n"
 msgstr "Зовнішнє з'єднання розірвано."
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect acceptance changed.\n"
 msgstr "Дозволено нове зовнішнє з'єднання"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- External connect interface changed.\n"
 msgstr "Зовнішнє з'єднання розірвано."
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "Приховування протоколу"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "- amuleapi settings changed.\n"
+msgstr "- Мова змінена.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5225,28 +6387,34 @@
 "Ваш перелік автоматичного оновлення серверів порожній.\n"
 "'Автоматичне оновлення серверів під час завантаження буде вимкнено."
 
-#: src/PrefsUnifiedDlg.cpp:862
-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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
 msgstr ""
-"Ви увімкнули зовнішні з'єднання, але не визначили пароль.\n"
-"Зовнішні з'єднання не можуть бути ввімкнені поки не вказано вірний пароль."
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- Мова змінена.\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- Тимчасова тека змінена.\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "- ED2K network enabled.\n"
 msgstr "Всі мережі вимкнені."
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "Невірна версія протоколу."
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5254,7 +6422,7 @@
 "Обидві eD2k та Kad-мережі вимкнені.\n"
 "Ви не зможете з'єднатися поки не увімкнете хоча б одну з них"
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5262,7 +6430,7 @@
 "Kad не розпочне роботу, якщо UDP-порт вимкнено.\n"
 "Увімкніть UDP-порт або вимкніть Kad"
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5272,20 +6440,69 @@
 "Ви ЗОБОВ'ЯЗАНІ перезапустити aMule зараз.\n"
 "Якщо ж не перезапустите, не скаржтеся, коли станеться щось жахливе.\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Autostart"
 msgstr "Автоматичне оновлення розпочато"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Could not remove the file type registration."
+msgstr "Тека для тимчасових звантажуваних файлів"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "Пароль встановлений та дозволені зовнішні з'єднання."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5295,41 +6512,67 @@
 "Будь ласка заповніть принаймні одну адресу, що посилається на існуючий файл server.met.\n"
 "Натисніть на кнопку \"Перелік\" щоб ввести адресу."
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "Тимчасові файли"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "Вхідні файли"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "Онлайн-підписи"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "Виберіть теку для %s"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "Знайдено %i новий спільний файл"
+msgstr1 "Знайдено %i нові спільні файли"
+msgstr2 "Знайдено %i нових спільних файлів"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "Переглянути, щоб знайти відеопрогравач"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "Вибрати переглядач тенет"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Select ffprobe binary"
+msgstr "Вибрати переглядач тенет"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "Виконуваний %s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Мова системи"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "Редагувати перелік серверів"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5337,42 +6580,42 @@
 "Додайте тут адреси файлів server.met.\n"
 "Тільки одна адреса на рядок."
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Custom source"
 msgstr "Завершених джерел"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s"
 msgstr "Стан:"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "Стан:"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
@@ -5380,7 +6623,7 @@
 msgstr1 "Затримка оновлення: %d секунди"
 msgstr2 "Затримка оновлення: %d секунд"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
@@ -5388,12 +6631,12 @@
 msgstr1 "Час усереднення графіків: %d хвилини"
 msgstr2 "Час усереднення графіків: %d хвилин"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "Зміна розміру графіка з'єднань: %d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
@@ -5401,7 +6644,7 @@
 msgstr1 "Розмір файлу буфера: %d байти"
 msgstr2 "Розмір файлу буфера: %d байт"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
@@ -5409,7 +6652,7 @@
 msgstr1 "Розмір черги вивантаження: %d клієнти"
 msgstr2 "Розмір черги вивантаження: %d клієнтів"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
@@ -5417,275 +6660,372 @@
 msgstr1 "Інтервал оновлення з'єднання з сервером: %d хвилини"
 msgstr2 "Інтервал оновлення з'єднання з сервером: %d хвилин"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "Інтервал оновлення з'єднання з сервером: вимкнено"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "вимкнено"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy, c-format
 msgid "Execute command on '%s' event"
 msgstr "Виконати команду на подію '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "Ввімкнути виконання команди в ядрі"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "Команда ядра:"
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "Ввімкнути виконання команд в ГІК"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "Команда ГІК:"
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "Наступні змінні будуть замінені:"
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Confirm shared folders"
 msgstr "Спільні теки"
 
-#: src/PrefsUnifiedDlg.cpp:1992
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
 #, fuzzy
-msgid "Reloading shared files…"
+msgid "Reloading shared files..."
 msgstr "Перезавантажити ваші спільні файли"
 
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 #, fuzzy
 msgid "Updating shared folders"
 msgstr "Спільні теки"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
+msgid "Scanned %u directories..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, fuzzy, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "Перезавантажується перелік спільних файлів."
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Shared folder"
+msgstr "Спільні теки"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, fuzzy
+msgid "Choose the local folder"
+msgstr "Виберіть теку для %s"
+
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Clear Search History"
+msgstr "Запам'ятати ці налаштування"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "Очікування пошуку"
 
-#: src/SearchDlg.cpp:282
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr ""
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Search error"
 msgstr "Пошук"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
 msgstr ""
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr ""
+#: src/SearchDlg.cpp
+#, fuzzy
+msgid "Search in progress"
+msgstr "В дії"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr "Найменший розмір має бути меншим ніж найбільший. Найбільшим розміром знехтувано."
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "Очікування пошуку"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "Головна"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Пошук у Kad неможливо виконати коли Kad не працює"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+#, fuzzy
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "ЗАСТЕРЕЖЕННЯ: Перелік відомих файлів зіпсовано, містить неприпустимий заголовок."
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr "Пошук eD2k не може бути виконаний, якщо eD2k не з'єднана"
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 #, fuzzy
 msgid "No keyword for Kad search - aborting"
 msgstr "Ключове слово для пошуку: %s"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "Неочікувана помилка, коли намагаюсь шукати в Kad:"
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "ID файлу"
-
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:105
-#, fuzzy
-msgid "Bitrate"
-msgstr "Без рейтингу"
-
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "Звантажити в категорію"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:714
+#: src/SearchList.cpp
 #, fuzzy, c-format
-msgid "Get %s for this file"
-msgstr "Додати додаткові URL-адреси для цього файлу"
+msgid "Error %u: %s\n"
+msgstr "Помилка оновлення GeoIP.dat"
+
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "ID файлу"
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+#, fuzzy
+msgid "Collapse all"
+msgstr "Закрити всі вкладки"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "Пошук схожих файлів (eD2k, місцевий сервер)"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "Позначити як відомий файл"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "Скопіювати eD2k посилання до буферу обміну"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "Скопіювати eD2k посилання до буферу обміну"
+
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "Ви з'єднані з сервером, який хочете видалити, будь ласка, роз'єднайтесь спочатку."
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 #, fuzzy
 msgid "Canceled"
 msgstr "Скасувати"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "running"
+msgstr "Працює"
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "finished"
+msgstr "Фінська"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, fuzzy
+msgid "Search progress not available"
+msgstr "Показувати поступ у відсотках"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "Не вдалося з'єднатися з усіма переліченими прихованими серверами. Робиться ще одна спроба без приховування."
+
+#: src/ServerConnect.cpp
 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."
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all static servers listed."
+msgstr "Не вдалося з'єднатися з усіма переліченими серверами. Робиться ще одна спроба."
+
+#: src/ServerConnect.cpp
+#, fuzzy
+msgid "Failed to connect to all servers listed."
 msgstr "Не вдалося з'єднатися з усіма переліченими серверами. Робиться ще одна спроба."
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "Автоматичне з'єднання з сервером повториться через %d секунду"
+msgstr1 "Автоматичне з'єднання з сервером повториться через %d секунди"
+msgstr2 "Автоматичне з'єднання з сервером повториться через %d секунд"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
 msgstr "eD2k вимкнена в налаштуваннях, не з'єднується."
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr "Не знайдено справних серверів в переліку серверів з якими можна було з'єднатися"
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "З'єднані з %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "З'єднання встановлено з: %s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "Жахлива помилка під час спроби з'єднання. З'єднання з Інтернет може бути відсутнє"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "Втрачене з'єднання з %s (%s:%i)"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s (%s:%i) здається мертвий."
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s (%s:%i) здається заповнений."
 
-#: 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"
-msgstr0 "Автоматичне з'єднання з сервером повториться через %d секунду"
-msgstr1 "Автоматичне з'єднання з сервером повториться через %d секунди"
-msgstr2 "Автоматичне з'єднання з сервером повториться через %d секунд"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "Втрата з'єднання"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "З'єднання з %s (%s:%i) не вдалося."
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "ПОМИЛКА: невірний сокет після сплину часу"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "Спроба з'єднання з %s (%s:%i) добігла кінця."
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "Отриманий застарілий наслідок запиту до DNS, відкидається."
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Завантажую файл server.met: %s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "Файл server.met не знайдено!"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Неможливо завантажити файл server.met '%s', невірний формат."
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "Неможливо відкрити server.met!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Файл server.met підробний, знайдена невірна мітка версії: 0x%x, розмір %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
@@ -5693,7 +7033,7 @@
 msgstr1 "%i сервери знайдені в server.met"
 msgstr2 "%i серверів знайдені в server.met"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
@@ -5701,237 +7041,244 @@
 msgstr1 "Додано %d сервери"
 msgstr2 "Додано %d серверів"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 #, fuzzy
 msgid "IO error while reading 'server.met': "
 msgstr "Помилка введення-виведення під час читання файлу known.met: %s"
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr "Сервер не додано: %s:%d не визначив вірний порт."
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr "Сервер не додано: IP-адреса %s:%d відфільтрована або неприпустима."
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr "Сервер не додано: сервер з такими ж IP:порт %s:%d вже в переліку."
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr "Сервер додано: сервер на %s:%d використовуючи назву '%s'."
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "Ви з'єднані з сервером, який хочете видалити, будь ласка, роз'єднайтесь спочатку."
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "Не вдалося відкрити '%s'"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "Неможливо зберегти server.met!"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, fuzzy, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "Помилка введення-виведення під час читання файлу known.met: %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "Невірна URL-адреса"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, fuzzy, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "Завершилось звантаження переліку серверів з %s"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "Не знайдено жодного запису переліку серверів в addresses.dat. Будь ласка, вставте вірний перелік адрес серверів в цей файл для того щоб автоматично оновити ваш перелік серверів"
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Починається звантаження переліку серверів з %s"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "ЗАСТЕРЕЖЕННЯ: вказана невірна адреса для автоматичного оновлення серверів: %s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Немає правильної адреси автоматичного звантаження server.met в addresses.dat"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "Неможливо звантажити перелік серверів з %s"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "Місцевий сервер відфільтрований IPFilters, з'єднайтесь з іншим!"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "Назва сервера"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Адреса"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Порт"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "Опис"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "Час луни"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "Користувачі"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Max Users"
+msgstr "Користувачі"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "Постійні"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "Версія"
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Soft Files"
+msgstr "Файли"
+
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "Hard Files"
+msgstr "Спільні файли"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "Ви з'єднані з сервером, який намагаєтесь видалити. Будь ласка, роз'єднайтеся спочатку. Сервер НЕ був видалений."
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(невідома назва)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "Ви впевнені, що хочете видалити постійний сервер %s"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+#, fuzzy
+msgid "ms"
+msgstr "хв"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "Сервери (%i)"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "Сервер"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "З'єднатися з сервером"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "Позначити сервер як постійний"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "Позначити сервер як непостійний"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "Позначити сервери як постійні"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "Позначити сервери як непостійні"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "Видалити сервер"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "Видалити сервери"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "Видалити всі сервери"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "Скопіювати eD2k посилання до буферу обміну"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "Перез'єднатись з сервером"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "Ви впевнені, що хочете видалити всі сервери?"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "Ви впевнені, що хочете видалити вибраний сервер?"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "Ви впевнені, що хочете видалити вибрані сервери?"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "ПОМИЛКА: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "ЗАСТЕРЕЖЕННЯ: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr ""
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "Новий id клієнта %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "ЗАСТЕРЕЖЕННЯ: ви отримали LowID!"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\tНайбільш ймовірно це тому, що ви за фаєрволом або маршрутизатором."
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\tЗа додатковою інформацією, будь ласка, завітайте до https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "Отримана невідома інформація про сервери! - занадто коротко"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
@@ -5939,168 +7286,199 @@
 msgstr1 "Отримано %d нові сервери"
 msgstr2 "Отримано %d нових серверів"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "Збереження переліку серверів завершено."
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "Сервер відхилив останню команду"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "З сервера отримано підробний пакет: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "Помилка, що не може бути опрацьована, під час обробки пакету з сервера: %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr "Неможливо створити потік DNS-запиту для з'єднання з %s"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "IP-адреса сервера %s (%s) відфільтрована.  Не з'єднується."
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "використовується приховування протоколу."
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "З'єднуюсь з %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr "Неможливо визначити DNS-назву для сервера: %s. Неможливо з'єднатися!"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "aMuleGUI Log"
+msgstr "Часопис aMule"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "Сервер не додано: не задана ні адреса, ні назва."
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "Сервер не додано: неприпустимий порт."
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "Стан eD2k:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Connection Type:"
 msgstr "Стан з'єднання:"
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+#, fuzzy
+msgid "Connected since:"
+msgstr "З'єднано"
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Стан Kademlia:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Running in LAN mode"
 msgstr "Запущений на %s"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "Працює"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 #, fuzzy
 msgid "Kademlia client ID:"
 msgstr "Стан Kademlia:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "Стан:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "Стан з'єднання:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr "За фаерволом - відкрийте порт TCP:%d на вашому маршрутизаторі або фаерволі"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "Стан з'єднання UDP:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr "За фаерволом - відкрийте порт UDP:%d на вашому маршрутизаторі або фаерволі"
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "Стан фаєрволу: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "Не потрібен жоден друг: порт TCP відкритий"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "Не потрібен жоден друг: порт UDP відкритий"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "Немає друга"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "З'єднання з другом"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "З'єднання з другом на %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP-адреса:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "Проіндексовані джерела:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "Проіндексовані ключові слова:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "Проіндексовані нотатки:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "Проіндексовані завантаження:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
 msgstr "Середня кількість користувачів:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
 msgstr "Всередньому файлів:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "Не запущений"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "Додається файл %s до спільних"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
@@ -6108,449 +7486,589 @@
 msgstr1 "Знайдено %i нові спільні файли"
 msgstr2 "Знайдено %i нових спільних файлів"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "Знайдено %i відомий спільний файл, невідомих - %i"
-msgstr1 "Знайдено %i відомі спільні файли, невідомих - %i"
-msgstr2 "Знайдено %i відомих спільних файли, невідомих - %i"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "ПОМИЛКА: спроба зробити спільним %s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "Спільна тека не знайдена, пропускаємо: %s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr "Спільна тека не знайдена, пропускаємо: %s"
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "Не знайдені спільні файли в теці: %s"
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-#, fuzzy
-msgid "User Name"
-msgstr "Ім'я користувача"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing file: %s"
+msgstr "Помилка під час збереження файлу known.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-#, fuzzy
-msgid "Download Speed"
-msgstr "Швидкість звантаження"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "Завантажую файл server.met: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-#, fuzzy
-msgid "Upload Speed"
-msgstr "Швидкість вивантаження"
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "Не знайдені спільні файли в теці: %s"
+msgstr1 "Не знайдені спільні файли в теці: %s"
+msgstr2 "Не знайдені спільні файли в теці: %s"
+
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "Не знайдені спільні файли в теці: %s"
+msgstr1 "Не знайдені спільні файли в теці: %s"
+msgstr2 "Не знайдені спільні файли в теці: %s"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#: src/SharedFileList.cpp
+#, fuzzy, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "Знайдено %i новий спільний файл"
+msgstr1 "Знайдено %i нові спільні файли"
+msgstr2 "Знайдено %i нових спільних файлів"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
-msgid "Available Parts"
-msgstr "Наявні:"
+msgid "User Name"
+msgstr "Ім'я користувача"
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 #, fuzzy
 msgid "Upload Status"
 msgstr "Стан вивантаження"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "Стан звантаження"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr ""
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Local File Name"
 msgstr "Назва файлу"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Shares File List"
 msgstr "Спільні файли"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "Запитів"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "Прийняті запити"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "Передані дані"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "Відношення поширення"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "Отримані частини"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "Повних джерел"
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Source Availability"
+msgstr "Доступність"
 
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "Шлях до теки"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "Спільні файли"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "Додати коментар/рейтинг"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "Редагувати коментар/рейтинг"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "Змінити назву"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "Додати файли зі збірки до переліку передач"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "Скопіювати magnet-посилання до буферу обміну"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "Скопіювати eD2k-посилання до буферу обміну (джерело)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "Скопіювати eD2k-посилання до буферу обміну (джерело з шифруванням)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "Скопіювати eD2k-посилання до буферу обміну (назва хосту)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "Скопіювати eD2k-посилання до буферу обміну (назва хосту з шифруванням)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "Скопіювати eD2k-посилання до буферу обміну (інформація AICH)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 #, fuzzy
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "Скопіювати eD2k-посилання до буферу обміну (інформація AICH)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "Вам потрібно мати HighID щоб створити посилання на джерело"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+#, fuzzy
+msgid "Export to emulecollection"
+msgstr "Помилка під час завершення"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "Неможливо отримати спільні файли користувача %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "Перезавантажити ваші спільні файли"
+msgstr1 "Перезавантажити ваші спільні файли"
+msgstr2 "Перезавантажити ваші спільні файли"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "Загальний розмір спільних файлів: %s"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Загальний розмір спільних файлів: %s"
+
+#: src/SharedFilesCtrl.cpp
+#, fuzzy, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "Спільні файли (%i)"
+msgstr1 "Спільні файли (%i)"
+msgstr2 "Спільні файли (%i)"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "Спільні файли (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "частковий файл"
+#: src/SharedFilesReloadProgress.cpp
+#, fuzzy, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "Перезавантажується перелік спільних файлів."
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
+#, fuzzy
+msgid "Part Status"
+msgstr "Стан"
+
+#: src/SourceListCtrl.cpp
 #, fuzzy
 msgid "Remote File Name"
 msgstr "Назва файлу"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "Вивантажені дані (сесія (всього)): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "Всього службового трафіку (пакети): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "Трафік запитів (пакети): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "Трафік обміну джерелами (пакети): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "Трафік з сервером (пакети): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Трафік Kad (пакети): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "Втрати на шифрування (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "Активні вивантаження: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "Вивантаження очікують: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "Вього успішних сесій вивантаження: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "Всього невдалих сесій вивантаження: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "Середній час вивантаження: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "Звантажені дані (сесія (всього)): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "Знайдені джерела: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "Чинні звантаження (шматки): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "Відношення вивантажено/звантажено за сесію (всього): %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "Середня швидкість звантаження (сесія): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "Середня швидкість вивантаження (сесія): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "Найбільша швидкість звантаження (сесія): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "Найбільша швидкість вивантаження (сесія): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "Перепід'єднань: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "Пройшло часу з останньої передачі: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "З'єднано з сервером з: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "Чинні з'єднання (приблизно): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "Досягнуто найбільшої кількості з'єднань: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "Середня кількість з'єднань (приблизно): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "Найбільше з'єднань (приблизно): %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "Клієнти"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Unknown: %s"
 msgstr "Невідомий розмір"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Filtered: %s"
 msgstr "Відфільтровані"
 
 # користувач
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, fuzzy, c-format
 msgid "Banned: %s"
 msgstr "заборонений"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "Всього: %i Відомих: %i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "Робочі сервери: %i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "Неробочі сервери: %i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "Всього: %s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "Видалені сервери: %s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "Відфільтровані сервери: %s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "Користувачів на робочих серверах: %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "Файлів на робочих серверах: %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "Всього користувачів: %llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "Всього файлів: %llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "Навантаження на сервер: %.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "Кількість спільних файлів: %s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Загальний розмір спільних файлів: %s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "Середній розмір файлу: %s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "Операційна система"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "Не отримана"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "Чинні з'єднання (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "Недоступний"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "Ніколи"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, fuzzy, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "Команда '%s' з pid '%d' завершилась з кодом стану '%d'."
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "Виконати <str> та вийти."
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr "Невірний формат IP-адреси. Використовуйте xxx.xxx.xxx.xxx:xxxx\n"
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "Ця команда потребує аргумент. Вірні аргументи:  'all', назва файлу, або номер.\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "Оброблюється за хешем: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "Оброблюється на назвою файлу: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "Ця команда потребує аргумент. Правильний аргумент: хеш файлу.\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "Невірне число\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "Невірний хеш (довжина має бути точно 32 символи)\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "Invalid search filter syntax.\n"
@@ -6559,7 +8077,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search keyword provided.\n"
@@ -6568,83 +8086,87 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 #, fuzzy
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
 msgstr "Напишіть '%s' щоб отримати більше допомоги.\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, fuzzy, c-format
 msgid "Download File: %lu %s\n"
 msgstr "Розмір звантаження: %i"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "Запит невдалий з невідомою помилкою."
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "Дія була вдалою."
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "Запит невдалий з помилкою: %s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "Фільтрування IP для клієнтів %s.\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "Вимк"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "Ввімк"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "Фільтрування IP для серверів %s.\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "Поточний рівень IP-фільтра %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
+#, c-format
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Обмеження смуги пропускання: вивантаження %u кб/с, звантаження: %u кб/с.\n"
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "З'єднався з %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "Не з'єднується"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "за фаєрволом"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "гаразд"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6653,7 +8175,7 @@
 "\n"
 "Звантаження:\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6662,7 +8184,7 @@
 "\n"
 "Вивантаження:\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6671,7 +8193,7 @@
 "\n"
 "Клієнтів у черзі:\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6680,39 +8202,33 @@
 "\n"
 "Всього джерел:\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "частковий файл"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "Кількість здобутків пошуку: %i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr ""
-
-#: src/TextClient.cpp:967
-#, fuzzy
-msgid "Search progress not available"
-msgstr "Показувати поступ у відсотках"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "Отримано невідому відповідь з серверу, OpCode = %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "Показати коротку інформацію про стан."
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "Показати стан з'єднань, поточні швидкості вивантаження/звантаження, інше.\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "Показати повне дерево статистики."
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6726,11 +8242,11 @@
 "\n"
 "Наприклад: 'statistics 5' покаже тільки 5 найбільш частих номерів для кожного типу клієнта.\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "Завершити роботу aMule."
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6740,40 +8256,40 @@
 "Це також вимкне текстові клієнти, оскільки вони непридатні\n"
 "без запущеного ядра.\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload the given object."
 msgstr "Перезавантажується отриманий об'єкт."
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload shared files list."
 msgstr "Перезавантажується перелік спільних файлів."
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload IP filtering table."
 msgstr "Перезавантажується IP фільтр з файлу."
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Reload current IP filtering table."
 msgstr "Вибрати рівні IP-фільтрування."
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Update IP filtering table from URL."
 msgstr "Перезавантажується IP фільтр з файлу."
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "З'єднання з мережею."
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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"
@@ -6785,36 +8301,36 @@
 "щоб з'єднатись тільки з ним. IP-адреса повинна мати вигляд a.b.c.d версії IPv4\n"
 "або назва."
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "З'єднання тільки з eD2k."
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "З'єднання тільки з Kad."
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "Від'єднано тільки від мережі."
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "Це від'єднає від всіх мереж, до яких зараз під'єднано.\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "Від'єднано тільки від eD2k."
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "Від'єднано тільки від Kad."
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Add an eD2k or magnet link to core."
 msgstr "Додає eD2k-посилання або magnet-посилання до ядра."
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6832,52 +8348,52 @@
 "\n"
 "Magnet-посилання повинне містити eD2k-хеш та довжину файлу.\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "Встановити значення налаштувань."
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Set IP filtering preferences."
 msgstr "Налаштувати IP-фільтри"
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "Ввімкнути IP фільтрування для клієнтів та серверів."
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "Вимкнути IP фільтрування для клієнтів та серверів."
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "Ввімкнути/вимкнути IP фільтрування для клієнтів."
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "Ввімкнути IP-фільтри для клієнтів."
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "Вимкнути IP-фільтри для клієнтів."
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "Ввімкнути/вимкнути IP фільтрування для серверів."
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "Ввімкнути IP-фільтри для серверів."
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "Вимкнути IP-фільтри для серверів."
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "Вибрати рівні IP-фільтрування."
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6885,66 +8401,80 @@
 "Вірні рівні фільтрування в межах 0-255, і їх значення\n"
 "за замовчуванням(початкове) 127.\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "Встановити обмеження швидкостей."
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "Значення передане цій команді має бути в кб/с.\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "Встановити обмеження швидкості вивантаження."
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 #, fuzzy
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "Значення передане цій команді має бути в кб/с.\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "Встановити обмеження швидкості звантаження."
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+#, fuzzy
+msgid "Enable or disable endgame source rotation."
+msgstr "Ввімкнути/вимкнути аутентифікацію з ім'ям/паролем"
+
+#: src/TextClient.cpp
+#, fuzzy
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "Значення передане цій команді має бути в кб/с.\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
 msgstr "Отримати та відобразити значення налаштувань."
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering preferences."
 msgstr "Отримати налаштування IP-фільтра."
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for both clients and servers."
 msgstr "Отримати стан IP-фільтра для клієнта і сервера."
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for clients only."
 msgstr "Отримати стан IP-фільтра тільки для клієнта."
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering state for servers only."
 msgstr "Отримати стан IP-фільтра тільки для сервера."
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Get IP filtering level."
 msgstr "Вибрати рівні IP-фільтрування."
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "Отримати обмеження смуги пропускання."
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a search."
 msgstr "Виконати пошук у Kad"
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6963,46 +8493,48 @@
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a global search."
 msgstr "Виконати глобальний пошук"
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a local search"
 msgstr "Виконати місцевий пошук"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Execute a kad search"
 msgstr "Виконати пошук у Kad"
 
-#: src/TextClient.cpp:1070
+#: src/TextClient.cpp
 #, fuzzy
-msgid "Show the results of the last search."
+msgid "Show the results of a search."
 msgstr "Показати здобутки попереднього пошуку."
 
-#: src/TextClient.cpp:1071
-#, fuzzy
-msgid "Return the results of the previous search.\n"
-msgstr "Повернути здобутки попереднього пошуку.\n"
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show the progress of a search."
 msgstr "Показати перебіг пошуку."
 
-#: src/TextClient.cpp:1074
-#, fuzzy
-msgid "Show the progress of a search.\n"
-msgstr "Показати перебіг пошуку.\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "Почати звантаження файлу"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -7010,82 +8542,82 @@
 "Потрібно вказати номер файлу з останнього пошуку.\n"
 "Наприклад:  'download 12'  розпочне звантаження файлу з номером 12 попереднього пошуку.\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "Призупинити звантаження."
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "Відновити звантаження."
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "Відмінити звантаження."
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "Встановити перевагу звантаження."
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr "Встановити перевагу звантаження на низьку, звичайну або автоматичну.\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "Встановити перевагу низькою."
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "Встановити перевагу звичайною."
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "Встановити перевагу високою."
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "Встановити перевагу авто."
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "Показати черги/переліки."
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr "Показати чергу звантаження та вивантаження, перелік серверів або перелік спільних файлів.\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "Показати чергу вивантаження."
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "Показати чергу звантаження."
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "Показати часопис."
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "Показати перелік серверів."
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 #, fuzzy
 msgid "Show shared files list."
 msgstr "Перезавантажується перелік спільних файлів."
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "Очистити журнал."
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "Застаріла команда, використовуйте '%s' замість неї."
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
@@ -7094,256 +8626,279 @@
 "Це застаріла команда та може бути видалена в майбутньому.\n"
 "Використовуйте '%s' замість неї.\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "Текстовий клієнт aMule"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "Видаляється файл: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Hashing file: %s"
+msgstr "Видаляється файл: %s"
+
+#: src/ThreadTasks.cpp
+#, fuzzy, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "Відновлюється вивантаження файлу: %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "Перетворюється старий набір хешів AICH в '%s' до 64b в '%s'."
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr "ЗАСТЕРЕЖЕННЯ: назва файлу '%s' невірна і буде змінена на '%s'."
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr "ЗАСТЕРЕЖЕННЯ: файл '%s' вже існує, новий файл буде перейменований у '%s'."
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "Ви впевнені, що хочете відмінити або видалити всі файли в цій категорії?"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "Потрібне підтвердження"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 #, fuzzy
 msgid "Too many categories!"
 msgstr "Забагато з'єднань"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "Всі інші"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "Вибрати фільтр перегляду"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "Додати категорію"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "Редагувати категорію"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "Видалити категорію"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "Запитано набір хешів для невідомого файлу: %s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, fuzzy, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Оберіть тих, хто може запитати перелік ваших спільних файлів."
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "Відновлюється вивантаження файлу: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "Призупиняється вивантаження файлу: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Не вдалося виконати команду `%s' на подію `%s'."
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "Не вдалося виконати команду '%s' на подію '%s'."
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "Звантаження завершено"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "Повний шлях до файлу."
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "Ім'я файлу без шляху."
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "eD2k-хеш файлу."
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "Розмір файлу в байтах."
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "Загальний час звантаження."
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "Розпочато нову розмову"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "Відправник."
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "Немає місця"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "Розділ диску."
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "Помилка під час завершення"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "Кількість оброблених файлів %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "Ви запитали частковий хеш (використовується тільки для файлів розмір яких більше ніж 9.5 МБ"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, fuzzy, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> Файл не існує!\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator, створювач eD2k-посилань aMule"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "Ласкаво просимо!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "Вхідні параметри"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "Файл для обчислення хешу"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "Додати додаткові URL-адреси для цього файлу"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr "Введіть тут файл, eD2k-посилання якого хочете обчислити"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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
-msgid "Remove"
-msgstr "Вилучити"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "Створити посилання з частковими хешами"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr "Допоможіть поширювати нові та рідкісні файли швидше за рахунок збільшення розміру посилання"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4-хеш файлу"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k-хеш файлу"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k-посилання"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "Зберегти"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "Скопіювати до буферу обміну"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "Відкрити"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "Відкрити файл, щоб обчислити його eD2k-посилання"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "Копіювати eD2k-посилання до буферу обміну"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "Зберегти як"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "Зберегти розраховане eD2k-посилання до файлу"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "Про aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr "Виберіть файл eD2k-посилання якого потрібно обчислити"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "Не можу відкрити буфер обміну"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "Зараз немає що копіювати!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "Виберіть файл для обчисленого eD2k-посилання"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "Неможливо відкрити "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "Будь ласка, введіть непорожнє ім'я файлу"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "Зараз немає що зберігати!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7363,162 +8918,159 @@
 "\n"
 "Distributed under GPL"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "Обчислення хешу..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator працює для вас"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "Обчислюється MD4-хеш..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "Обчислюються хеші eD2k..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "Скасовано!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "Виконано за %.2f с"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "Ви вже додали цю URL-адресу!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "Будь ласка, введіть непустий URL-адресу"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "Неможливо відкрити %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i діб %i год %i хв %i с"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02uдіб %02uгод %02uхв %02uс"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02uгод %02uхв %02uс"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02uхв %02uс"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02uс"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f байт"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.0f кбайт"
+msgid "%.2f KiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.0f Мбайт"
+msgid "%.2f MiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.0f Гбайт"
+msgid "%.2f GiB"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.0f Тбайт"
+msgid "%.2f TiB"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas, aMule онлайн-статистика"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "Найбільша швидкість звантаження з тих пір як wxCas запущено"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "Безумовна найбільша швидкість звантаження під час попереднього запуску wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "Очистити"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "Система"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "Зупинити автоматичне оновлення"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "Зберегти зображення онлайн статистики"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "Надрукувати зображення онлайн статистики"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
 msgstr "Налаштування"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "Про wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "Розпочати автоматичне оновлення"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "Автоматичне оновлення зупинено"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "Автоматичне оновлення розпочато"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "Зберегти зображення статистики"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "Онлайн статистика aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7526,11 +9078,11 @@
 "Негаразди друку.\n"
 "Можливо ваша поточна друкарка не налаштована вірно?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "Друк"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7548,402 +9100,555 @@
 "\n"
 "Distributed under GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "aMule не запущений..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule запущений"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule запущений, але від'єднаний"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule з'єднується..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "Стан aMule невідомий..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " працює "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " зупинений!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " не з'єднаний!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " з'єднується..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " робить щось дивне, перевірте!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " з'єднався з "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "вимкнено"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " ввімкнено "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " з "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "Всього звантажень: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", вивантажень: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "Сесія звантаження: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "Звантаження: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " кбайт/с, вивантаження: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "Спільні файли: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " файл(ів), клієнтів у черзі: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "Час: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " ввімкнено "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "Середня завантаженість системи (1-5-15 хв): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "Час роботи системи: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "Тека, що містить файл amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "Введіть тут теку, де знаходиться файл amulesig.dat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "Час оновлення в секундах"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "Створювати зображення статистики під час кожного оновлення"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "Введіть назву теки, де б ви хотіли зберігати зображення статистики"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 #, fuzzy
 msgid "Upload periodically your stat image to FTP server"
 msgstr "Вивантажувати час від часу ваші зображення статистики на FTP-сервер"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP-адреса"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP-шлях"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "Введіть тут адресу вашого FTP-сервера"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "Введіть тут теку, куди будуть складатися зображення зі статистикою на FTP-сервері"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "Користувач"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "Введіть тут ім'я користувача для входу на ваш FTP-сервер"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "Введіть тут пароль входу на ваш FTP-сервер"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "Час оновлення FTP в хвилинах"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "Перевірити"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "Тека, що містить файл з вашим підписом"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "Тека, де створюються зображення статистики"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "Завантажується зразок <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "HTTP порт веб-сервера"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "Використовувати перенаправлення UPnP-портів на порт веб-сервера"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP порт"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "Використовувати gzip-стиснення"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Пароль повного доступу для веб-сервера"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Пароль гостя веб-сервера"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "Дозволити гостьовий доступ"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "Заборонити гостьовий доступ"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "Завантажити/записати налаштування веб-сервера з/до віддаленого aMule"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr "Шлях до файлу налаштувань aMule. НЕ ВИКОРИСТОВУЙТЕ БЕЗПОСЕРЕДНЬО!"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "Вимкнути інтерпретатор PHP (застаріло)"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "Перекомпілювати PHP-сторінки під час кожного запиту"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "Веб-сервер aMule"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "з'єднання веб-клієнта прийнято\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "ПОМИЛКА: неможливо прийняти з'єднання веб-клієнта\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "Запит невдалий з наступною помилкою: %s."
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "Файл індексу не знайдено: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "Сесія добігла кінця - запитуємо новий вхід\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "Сесія в порядку, входимо\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "Сесія в порядку, не увійшли\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "Немає відкритих сесій, буде запитано вхід\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "Сесію створено - запит на вхід\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "Оброблюю запит початковий: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "Перевіряється пароль\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "Неправильний хеш пароля\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "Пароль правильний\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "Пароль неправильний\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "Ви не ввели жодного паролю. Порожній пароль не дозволено.\n"
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "Запитано вихід\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "Обробляється запит перенаправлений:"
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
 msgstr ""
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 #, fuzzy
 msgid "aMule application files (required)."
 msgstr "З'єднання невдале "
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
 msgstr ""
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "Вивантажено"
+#~ msgid "Ratio"
+#~ msgstr "Рейтинг"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "Не знайдені спільні файли в теці: %s"
+
+#, fuzzy
+#~ msgid "Change Language"
+#~ msgstr "Мова: "
+
+#, fuzzy
+#~ msgid "No languages available"
+#~ msgstr "Недоступний"
+
+#~ msgid "User name"
+#~ msgstr "Ім'я користувача"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "Отримані частини"
+
+#, fuzzy
+#~ msgid "Available Parts"
+#~ msgstr "Наявні:"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "Знайдено %i відомий спільний файл, невідомих - %i"
+#~ msgstr1 "Знайдено %i відомі спільні файли, невідомих - %i"
+#~ msgstr2 "Знайдено %i відомих спільних файли, невідомих - %i"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "Файл не знайдено."
+#~ msgid " MB/s"
+#~ msgstr "Мбайт/с"
+
+#~ msgid " kB/s"
+#~ msgstr " кбайт/с"
+
+#~ msgid "kB/s"
+#~ msgstr "кбайт/с"
+
+#~ msgid "kB"
+#~ msgstr "кбайт"
+
+#~ msgid "MB/s"
+#~ msgstr "Мбайт/с"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y.%m.%d %H:%M:%S"
+
+#, fuzzy
+#~ msgid "Remote prefix:"
+#~ msgstr "Віддалений сервер"
+
+#, fuzzy
+#~ msgid "Local prefix:"
+#~ msgstr "Місцевий сервер"
+
+#, fuzzy, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "Зберігається частковий файл %u з %u"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "Щоб попередити показ цього застереження під час кожного попереднього перегляду,\n"
+#~ "оберіть відеопрогравач в налаштуваннях (за замовчуванням %s)."
+
+#~ msgid "Filter Results"
+#~ msgstr "Здобутки фільтру"
+
+#~ msgid "Mark as known file"
+#~ msgstr "Позначити як відомий файл"
+
+#~ msgid "Bootstrap"
+#~ msgstr "Початковий запуск"
+
+#~ msgid "New node"
+#~ msgstr "Новий вузол"
+
+#~ msgid "IP:"
+#~ msgstr "IP:"
+
+#~ msgid "More"
+#~ msgstr "Більше"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr ""
+#~ "Початковий запуск\n"
+#~ "відомого клієнта"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "З'єднатися з будь-яким сервером та/чи Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "Від'єднатися від Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "Зупинити поточні спроби з'єднань"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "Від'єднатися від з'єднаних мереж"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "З'єднатися з дозволеними мережами"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "Автоматично впорядковувати файли (багато ресурсів CPU)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule буде автоматично впорядковувати стовпці в переліку звантажень"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "Відкинути пакет якщо IP-адреса клієнта відрізняється від IP-адреси з якої прийшов пакет. Використовуйте обережно."
+
+#, fuzzy
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "Повернути здобутки попереднього пошуку.\n"
+
+#, fuzzy
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "Показати перебіг пошуку.\n"
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "Перевірити наявність нової версії під час запуску"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k-посилання: "
+
+#~ msgid "Commit"
+#~ msgstr "Підтвердити"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled: переходимо у фоновий режим - до зустрічі"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "Сторінка в Інтернет: https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "Форум: https://github.com/amule-org/amule/discussions \n"
+
+#, fuzzy
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "Сторінка в Інтернет: https://amule-org.github.io \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr "Форум: https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "Вивантажено"

amule-3.1.0.tar.gz/po/vi.po Added

@@ -0,0 +1,9067 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2026 Free Software Foundation, Inc.
+# This file is distributed under the same license as the aMule package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: aMule GIT\n"
+"Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: none\n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr ""
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr ""
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr ""
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr ""
+
+#: src/AddFriend.cpp
+msgid "Add a Friend"
+msgstr ""
+
+#: src/AddFriend.cpp
+msgid "You have to enter a valid IP and port!"
+msgstr ""
+
+#: src/AddFriend.cpp
+msgid "Information"
+msgstr ""
+
+#: src/AddFriend.cpp
+msgid "The specified userhash is not valid!"
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+msgid ""
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
+"\n"
+"Install desktop integration now?"
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+msgid "Add aMule to your application menu?"
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+msgid "Install"
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+msgid "Not now"
+msgstr ""
+
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
+msgid "Don't ask again"
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+msgid "aMule integration failed"
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+msgid ""
+"aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
+"\n"
+"On some desktops, aMule may need to restart for the dock / taskbar icon to bind to the new launcher entry. Modern Wayland compositors (GNOME, KDE) pick this up live, but a restart is the safe fallback if the icon stays generic.\n"
+"\n"
+"Restart aMule now?"
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+msgid "aMule installed"
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+msgid "Restart now"
+msgstr ""
+
+#: src/AppImageIntegration.cpp
+msgid "Later"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "Failed to open ED2KLinks file."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 ""
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Now, exiting main app..."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleweb instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleweb instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
+msgid "Failed"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr ""
+
+#: src/amule.cpp
+msgid "aMule OnExit: Terminating core."
+msgstr ""
+
+#: src/amule.cpp
+msgid "aMule shutdown completed."
+msgstr ""
+
+#: src/amule.cpp
+msgid "Memory debug results for aMule exit:"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr ""
+
+#: src/amule.cpp
+msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
+msgstr ""
+
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
+msgid "Info"
+msgstr ""
+
+#: src/amule.cpp
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Password set and external connections enabled."
+msgstr ""
+
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
+msgid "WARNING"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr ""
+
+#: src/amule.cpp
+msgid ""
+"aMule has detected missing network bootstrap files.\n"
+"Select which ones to download:"
+msgstr ""
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr ""
+
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "web server running on pid %d"
+msgstr ""
+
+#: src/amule.cpp
+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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
+msgstr ""
+
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr ""
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not bind ports to the specified address: %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr ""
+
+#: src/amule.cpp
+#, 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/amule.cpp
+msgid "Failed to create OnlineSig File"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Failed to create aMule OnlineSig File"
+msgstr ""
+
+#: src/amule.cpp
+msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr ""
+
+#: src/amule.cpp
+msgid "This version is a testing version, updated daily, and\n"
+msgstr ""
+
+#: src/amule.cpp
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr ""
+
+#: src/amule.cpp
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+
+#: src/amule.cpp
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+
+#: src/amule.cpp
+msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
+msgstr ""
+
+#: src/amule.cpp
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
+msgstr ""
+
+#: src/amule.cpp
+msgid "Server hostname notified"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr ""
+
+#: src/amule.cpp
+msgid "ERROR: can't open logfile"
+msgstr ""
+
+#: src/amule.cpp
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr ""
+
+#: src/amule.cpp
+msgid "Log has been reset"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "ServerMessage: %s"
+msgstr ""
+
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
+
+#: src/amule.cpp
+msgid "Failed to download the nodes list."
+msgstr ""
+
+#: src/amule.cpp
+msgid "Failed to open the downloaded version check file"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Corrupted version check file"
+msgstr ""
+
+#: src/amule.cpp
+msgid "You are using an outdated version of aMule!"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr ""
+
+#: src/amule.cpp
+msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Your copy of aMule is up to date."
+msgstr ""
+
+#: src/amule.cpp
+msgid "Failed to download the version check file"
+msgstr ""
+
+#: src/amule.cpp src/amule-remote-gui.cpp
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr ""
+
+#: src/amule.cpp src/amule-remote-gui.cpp
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr ""
+
+#: src/amule.cpp src/amule-remote-gui.cpp
+msgid "No networks selected"
+msgstr ""
+
+#: src/amule.cpp src/TextClient.cpp
+msgid "with LowID"
+msgstr ""
+
+#: src/amule.cpp src/TextClient.cpp
+msgid "with HighID"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Connected to %s %s"
+msgstr ""
+
+#: src/amule.cpp
+#, c-format
+msgid "Connecting to %s"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Disconnected from eD2k"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Kad started."
+msgstr ""
+
+#: src/amule.cpp
+msgid "Kad stopped."
+msgstr ""
+
+#: src/amule.cpp
+msgid "Connected to Kad (ok)"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Connected to Kad (firewalled)"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Disconnected from Kad"
+msgstr ""
+
+#: src/amule.cpp
+msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
+msgstr ""
+
+#: src/amule.cpp
+msgid "Kad network disabled on preferences, not connecting."
+msgstr ""
+
+#: src/amuled.cpp
+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/amuled.cpp
+msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
+msgstr ""
+
+#: src/amuled.cpp
+msgid "amuled: OnInit - starting timer"
+msgstr ""
+
+#: src/amuled.cpp
+msgid "Cannot Create Pid File"
+msgstr ""
+
+#: src/amuled.cpp
+#, c-format
+msgid "ERROR: %s"
+msgstr ""
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr ""
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Running on %s"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr ""
+
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr ""
+
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr ""
+
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr ""
+
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr ""
+
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr ""
+
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr ""
+
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr ""
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr ""
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "aMule dialog destroyed"
+msgstr ""
+
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
+msgid "Connecting"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "eD2k: Connecting"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "eD2k: Disconnected"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Kad: Firewalled"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Kad: Connected"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Kad: Connecting"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Kad: Off"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr ""
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr ""
+
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr ""
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr ""
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Up: %.1f%s | Down: %.1f%s"
+msgstr ""
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr ""
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr ""
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Exit confirmation"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Launch Command: "
+msgstr ""
+
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
+msgid "- default -"
+msgstr ""
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr ""
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Networks Window"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Searches Window"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Downloads Window"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Shared Files Window"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Messages Window"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Statistics Graph Window"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Preferences Settings Window"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Import"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "The partfile importer tool"
+msgstr ""
+
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "About"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "About/Help"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "eD2k network"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "Kad network"
+msgstr ""
+
+#: src/amuleDlg.cpp
+msgid "No network"
+msgstr ""
+
+#: src/amule-gui.cpp
+msgid "aMule remote control"
+msgstr ""
+
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid "aMule"
+msgstr ""
+
+#: src/amule-gui.cpp
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Connect to remote amule"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Going to event loop..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Connecting..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Connection failed. Please check the host, port, and password."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Remote GUI EC event handler"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Going down"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection timed out. Unable to reach %s:%d within the allotted time.\n"
+"Please check the host, port and that aMule is running with External Connections enabled."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "Ready"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
+msgid "All"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
+msgid "Invalid link or already on list."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr ""
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
+msgid "Unknown"
+msgstr ""
+
+#: src/BaseClient.cpp
+msgid "Searching buddy for lowid connection"
+msgstr ""
+
+#: src/BaseClient.cpp
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr ""
+
+#: src/BaseClient.cpp
+msgid " (Fake eMule)"
+msgstr ""
+
+#: src/BaseClient.cpp
+msgid "xMule (Fake eMule)"
+msgstr ""
+
+#: src/BaseClient.cpp
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr ""
+
+#: src/BaseClient.cpp
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr ""
+
+#: src/BaseClient.cpp
+#, c-format
+msgid "Requested: %s\n"
+msgstr ""
+
+#: src/BaseClient.cpp
+#, 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"
+msgstr0 ""
+msgstr1 ""
+
+#: src/BaseClient.cpp
+#, 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"
+msgstr0 ""
+msgstr1 ""
+
+#: src/BaseClient.cpp
+msgid "Requested unknown file"
+msgstr ""
+
+#: src/BaseClient.cpp
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr ""
+
+#: src/BaseClient.cpp
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr ""
+
+#: src/BaseClient.cpp
+#, c-format
+msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
+msgstr ""
+
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr ""
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr ""
+
+#: src/CanceledFileList.cpp
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr ""
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr ""
+
+#: src/CaptchaDialog.cpp
+msgid "Enter Captcha"
+msgstr ""
+
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
+msgid "Category"
+msgstr ""
+
+#: src/CatDialog.cpp
+msgid "New Category"
+msgstr ""
+
+#: src/CatDialog.cpp
+msgid "Choose a folder for incoming files"
+msgstr ""
+
+#: src/CatDialog.cpp
+msgid "You must specify a name for the category!"
+msgstr ""
+
+#: src/CatDialog.cpp
+msgid "You must specify a path for the category!"
+msgstr ""
+
+#: src/CatDialog.cpp
+msgid "Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+
+#: src/ChatSelector.cpp
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr ""
+
+#: src/ChatSelector.cpp
+msgid "*** Connected to Client ***"
+msgstr ""
+
+#: src/ChatSelector.cpp
+msgid "*** Connecting to Client ***"
+msgstr ""
+
+#: src/ChatSelector.cpp
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr ""
+
+#: src/ChatSelector.cpp
+msgid "*** You have passed the captcha check and the user has received your message. ***"
+msgstr ""
+
+#: src/ChatSelector.cpp
+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/ChatWnd.cpp
+msgid "Chat"
+msgstr ""
+
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
+msgid "Close tab"
+msgstr ""
+
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
+msgid "Close all tabs"
+msgstr ""
+
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
+msgid "Close other tabs"
+msgstr ""
+
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
+msgid "Add to Friends"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 ""
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 ""
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr ""
+
+#: src/ClientCreditsList.cpp
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientCreditsList.cpp
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ClientCreditsList.cpp
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr ""
+
+#: src/ClientDetailDialog.cpp
+msgid "Client Details"
+msgstr ""
+
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
+msgid "LowID"
+msgstr ""
+
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
+msgid "HighID"
+msgstr ""
+
+#: src/ClientDetailDialog.cpp
+msgid "Enabled"
+msgstr ""
+
+#: src/ClientDetailDialog.cpp
+msgid "Supported"
+msgstr ""
+
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
+msgid "Not supported"
+msgstr ""
+
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
+msgid "Connected"
+msgstr ""
+
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+msgid "Disconnected"
+msgstr ""
+
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%.1f KiB/s"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr ""
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr ""
+
+#: src/ClientRef.cpp
+msgid "Not complete"
+msgstr ""
+
+#: src/ClientRef.cpp
+msgid "Bad Guy"
+msgstr ""
+
+#: src/ClientRef.cpp
+msgid "Verified - OK"
+msgstr ""
+
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr ""
+
+#: src/ClientRef.cpp
+msgid "Not Available"
+msgstr ""
+
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 ""
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr ""
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr ""
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr ""
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr ""
+
+#: src/ClientTCPSocket.cpp
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr ""
+
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
+msgid "File Comments"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+msgid "Username"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "File Name"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
+msgid "Rating"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
+msgid "Comment"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr ""
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
+msgid "No comments"
+msgstr ""
+
+#: src/CommentDialogLst.cpp
+#, c-format
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr0 ""
+msgstr1 ""
+
+#: src/CorruptionBlackBox.cpp
+#, c-format
+msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Auto Lo"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Auto No"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Auto Hi"
+msgstr ""
+
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
+msgid "Very low"
+msgstr ""
+
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Low"
+msgstr ""
+
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Normal"
+msgstr ""
+
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "High"
+msgstr ""
+
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
+msgid "Very High"
+msgstr ""
+
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
+msgid "Release"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Asking"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Connecting via server"
+msgstr ""
+
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
+msgid "Queue Full"
+msgstr ""
+
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
+msgid "On Queue"
+msgstr ""
+
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
+msgid "Downloading"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Receiving hashset"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "No needed parts"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Cannot connect LowID to LowID"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Too many connections"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Connecting via Kad"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Too many Kad connections"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Banned"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Connection Error"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Remote Queue Full"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Old MLDonkey"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "New MLDonkey"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "eMule Compatible"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Local Server"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Remote Server"
+msgstr ""
+
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
+msgid "Kad"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Source Exchange"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Passive"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Link"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Source Seeds"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Search Result"
+msgstr ""
+
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
+msgid "Completed"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "In progress"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "ERROR: Out of disk space"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "ERROR: Partmet not found"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "ERROR: IO error!"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "ERROR: Failed!"
+msgstr ""
+
+#: src/DataToText.cpp src/SearchListCtrl.cpp
+msgid "Queued"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Already downloading"
+msgstr ""
+
+#: src/DataToText.cpp
+msgid "Unknown or bad tempfile format."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr ""
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Part"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
+msgid "Size"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+msgid "Transferred"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Speed"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Progress"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
+msgid "Sources"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
+msgid "Priority"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+msgid "Status"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Time Remaining"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Last Seen Complete"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Last Reception"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Auto"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+msgid "&Stop"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+msgid "&Pause"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+msgid "&Resume"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "C&lear completed"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Swap every A4AF to this file now"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Swap every A4AF to this file (Auto)"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Swap every A4AF to any other file now"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Extended Options"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Preview"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show file &details"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Show all comments"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Copy magnet URI to clipboard"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Copy eD2k &link to clipboard"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Copy feedback to clipboard"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "unassign"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Assign to category"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "&Open the file"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Enter new name for this file:"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "File rename"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%.1f MiB/s"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp
+#, c-format
+msgid "Downloads (%i)"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
+#, c-format
+msgid "Total queue size: %s"
+msgstr ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "Saving PartFile %u of %u"
+msgstr ""
+
+#: src/DownloadQueue.cpp
+msgid "All PartFiles Saved."
+msgstr ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "Loading temp files from %s."
+msgstr ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "Loading PartFile %u of %u"
+msgstr ""
+
+#: src/DownloadQueue.cpp
+msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
+msgstr ""
+
+#: src/DownloadQueue.cpp
+msgid "All PartFiles Loaded."
+msgstr ""
+
+#: src/DownloadQueue.cpp
+msgid "No part files found"
+msgstr ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/DownloadQueue.cpp
+msgid "Filesystem for Temp directory cannot handle large files."
+msgstr ""
+
+#: src/DownloadQueue.cpp
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "Downloading %s"
+msgstr ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You are already trying to download the file '%s'"
+msgstr ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s'"
+msgstr ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You are already trying to download the file %s"
+msgstr ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "Unknown protocol of link: %s"
+msgstr ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "Could not add %u link (see log for details)."
+msgid_plural "Could not add %u links (see log for details)."
+msgstr0 ""
+msgstr1 ""
+
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Client sent packet after authentication failed."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "External connection closed."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "External connections disabled due to empty password!"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "External connections disabled in config file"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "New external connection accepted"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "ERROR: couldn't accept a new external connection"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "External connection refused due to empty password in preferences!"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Connecting client: %s %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Unknown version"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Invalid protocol version."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Missing protocol version tag."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: wrong password."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: missing password."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Invalid request, please authenticate first."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Access granted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Remote PartFile command failed: FileHash not found: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "FileHash not found: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "OOPS! OpCode processing error!"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Server not added"
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "server not found: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "need to define server to be removed"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "eD2k is disabled in preferences."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Friend not found."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Client not found."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "WebSearch from remote interface makes no sense."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No points for graph."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Your client is not configured for this detail level."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "External Connection: shutdown requested"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Already shutting down."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "ExternalConn: adding link '%s'."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "%d of %d links failed (invalid or already on list)."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "File not found."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Invalid file name."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Unable to rename file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Kad is disabled in preferences."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Already connected to eD2k."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Connecting to eD2k..."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Already connected to Kad."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Connecting to Kad..."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "All networks are disabled."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Disconnected from eD2k."
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Disconnected from Kad."
+msgstr ""
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "External Connection: invalid opcode received: %#x"
+msgstr ""
+
+#: src/ExternalConn.cpp
+msgid "Invalid opcode (wrong protocol version?)"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+#, c-format
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+#, c-format
+msgid "Unknown command '%s'.\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Available commands:\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+#, c-format
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Exits from the application."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Show help."
+msgstr ""
+
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+#, c-format
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Syntax error!"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "This command should not have any parameters."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "This command must have a parameter."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Invalid argument."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "This is an incomplete command."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+#, c-format
+msgid "Type '%s' to get more help.\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+#, c-format
+msgid "This is %s %s %s\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+#, c-format
+msgid "This is %s %s\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid ""
+"\n"
+"Creating client...\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+#, c-format
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+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/ExternalConnector.cpp
+msgid "Show this help text."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Host where aMule is running. (default: 127.0.0.1)"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "External Connection password."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Read configuration from file."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not print any output to stdout."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Be verbose - show also debug messages."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Sets program locale (language)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Write command line options to config file."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Creates config file based on aMule's config file."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Print program version."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr ""
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr ""
+
+#: src/FileDetailDialog.cpp
+msgid "File Details"
+msgstr ""
+
+#: src/FileDetailDialog.cpp
+#, c-format
+msgid "%.1f%% done"
+msgstr ""
+
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr ""
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr ""
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr ""
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+#, c-format
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr ""
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr ""
+
+#: src/FriendList.cpp
+msgid "CRITICAL - no client on StartChatSession"
+msgstr ""
+
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
+msgid "Friends"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Add a friend"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Remove Friend"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Send &Message"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr ""
+
+#: src/FriendListCtrl.cpp
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp
+msgid "Swap to this file"
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp
+#, c-format
+msgid "On Queue: %u (%i)"
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp
+msgid "Asked for another file"
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp
+msgid "Waiting for upload slot"
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp
+#, c-format
+msgid "On Queue: %u"
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
+msgid "Uploading"
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp
+msgid "None"
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
+msgid "No"
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Yes"
+msgstr ""
+
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr ""
+
+#: src/HTTPDownload.cpp
+msgid "Downloading..."
+msgstr ""
+
+#: src/HTTPDownload.cpp
+msgid "HTTP download cancelled"
+msgstr ""
+
+#: src/HTTPDownload.cpp
+msgid "The URL to download can't be empty"
+msgstr ""
+
+#: src/HTTPDownload.cpp
+#, c-format
+msgid "Failed to create HTTP request for %s"
+msgstr ""
+
+#: src/HTTPDownload.cpp
+#, c-format
+msgid "HTTP download: empty response body for %s"
+msgstr ""
+
+#: src/HTTPDownload.cpp
+#, c-format
+msgid "Could not move downloaded file to %s"
+msgstr ""
+
+#: src/HTTPDownload.cpp
+#, c-format
+msgid "Downloaded %s (%llu bytes)"
+msgstr ""
+
+#: src/HTTPDownload.cpp
+#, c-format
+msgid "The URL %s returned: %i"
+msgstr ""
+
+#: src/HTTPDownload.cpp
+#, c-format
+msgid "HTTP download failed for %s: %s"
+msgstr ""
+
+#: src/HTTPDownload.cpp
+#, c-format
+msgid "HTTP 401 Unauthorized for %s"
+msgstr ""
+
+#: src/IP2Country.cpp
+#, c-format
+msgid "Migrated existing GeoLite2-Country.mmdb to %s"
+msgstr ""
+
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "IP2Country: failed to resolve a GeoIP download URL."
+msgstr ""
+
+#: src/IP2Country.cpp
+#, c-format
+msgid "Download new %s from %s"
+msgstr ""
+
+#: src/IP2Country.cpp
+#, c-format
+msgid "Download of %s file failed, aborting update."
+msgstr ""
+
+#: src/IP2Country.cpp src/IPFilter.cpp
+#, c-format
+msgid "Failed to remove %s file, aborting update."
+msgstr ""
+
+#: src/IP2Country.cpp
+#, c-format
+msgid "Failed to rename %s file, aborting update."
+msgstr ""
+
+#: src/IP2Country.cpp src/IPFilter.cpp
+#, c-format
+msgid "Successfully updated %s"
+msgstr ""
+
+#: src/IP2Country.cpp
+#, c-format
+msgid "Error updating %s"
+msgstr ""
+
+#: src/IP2Country.cpp
+msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
+msgstr ""
+
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
+#, c-format
+msgid "Failed to download %s from %s"
+msgstr ""
+
+#: src/IPFilter.cpp
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr ""
+
+#: src/IPFilter.cpp
+#, c-format
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr ""
+
+#: src/IPFilter.cpp
+#, c-format
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr ""
+
+#: src/IPFilter.cpp
+#, c-format
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr0 ""
+msgstr1 ""
+
+#: src/IPFilter.cpp
+#, c-format
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr0 ""
+msgstr1 ""
+
+#: src/IPFilter.cpp
+#, c-format
+msgid "Failed to rename new %s file, aborting update."
+msgstr ""
+
+#: src/IPFilter.cpp
+msgid "IP filter is ready"
+msgstr ""
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr ""
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr ""
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr ""
+
+#: src/KadDlg.cpp
+#, c-format
+msgid "Nodes (%u)"
+msgstr ""
+
+#: src/KadDlg.cpp
+msgid "Invalid ip to bootstrap"
+msgstr ""
+
+#: src/KadDlg.cpp
+msgid "Invalid port to bootstrap"
+msgstr ""
+
+#: src/KadDlg.cpp
+msgid "Please fill all fields required"
+msgstr ""
+
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr ""
+
+#: src/KadDlg.cpp
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr ""
+
+#: src/KadDlg.cpp
+msgid "Doing so will remove your current nodes and restart Kademlia connection."
+msgstr ""
+
+#: src/KadDlg.cpp
+msgid "Continue?"
+msgstr ""
+
+#: src/kademlia/kademlia/SearchManager.cpp
+msgid "Kademlia: search keyword too short"
+msgstr ""
+
+#: src/kademlia/kademlia/SearchManager.cpp
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr ""
+
+#: src/kademlia/routing/RoutingZone.cpp
+msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
+msgstr ""
+
+#: src/kademlia/routing/RoutingZone.cpp
+#, c-format
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr0 ""
+msgstr1 ""
+
+#: src/kademlia/routing/RoutingZone.cpp
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+msgstr ""
+
+#: src/kademlia/routing/RoutingZone.cpp
+#, c-format
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr0 ""
+msgstr1 ""
+
+#: src/kademlia/routing/RoutingZone.cpp
+#, c-format
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr0 ""
+msgstr1 ""
+
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr ""
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr ""
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
+msgid "File name"
+msgstr ""
+
+#: src/KnownFile.cpp
+msgid "File size"
+msgstr ""
+
+#: src/KnownFile.cpp
+msgid "Share ratio"
+msgstr ""
+
+#: src/KnownFile.cpp src/muuli_wdr.cpp
+msgid "Requested"
+msgstr ""
+
+#: src/KnownFile.cpp
+msgid "Accepted"
+msgstr ""
+
+#: src/KnownFile.cpp
+msgid "Complete sources"
+msgstr ""
+
+#: src/KnownFileList.cpp
+msgid "WARNING: Known file list corrupted, contains invalid header."
+msgstr ""
+
+#: src/KnownFileList.cpp
+msgid "Failed to load entry in known file list, file may be corrupt"
+msgstr ""
+
+#: src/KnownFileList.cpp
+msgid "Invalid entry in known file list, file may be corrupt: "
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr ""
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr ""
+
+#: src/libs/common/Format.cpp
+#, c-format
+msgid "Unknown error %d"
+msgstr ""
+
+#: src/libs/common/Format.cpp
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr ""
+
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
+msgid "Hashing"
+msgstr ""
+
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
+msgid "Completing"
+msgstr ""
+
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
+msgid "Complete"
+msgstr ""
+
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
+msgid "Paused"
+msgstr ""
+
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
+msgid "Erroneous"
+msgstr ""
+
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
+msgid "Waiting"
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "You must specify a non-empty password."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Invalid password, not a MD5 hash!"
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Connection failure"
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "EC connection failed. Empty reply."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Succeeded! Connection established to aMule "
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Succeeded! Connection established."
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: Access denied because: "
+msgstr ""
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: Handshake failed."
+msgstr ""
+
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr ""
+
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Asio thread %d started"
+msgstr ""
+
+#: src/ListenSocket.cpp
+msgid "ListenSocket: Ok."
+msgstr ""
+
+#: src/ListenSocket.cpp
+msgid "ERROR: Could not listen to TCP port."
+msgstr ""
+
+#: src/Logger.cpp
+msgid "ERROR: "
+msgstr ""
+
+#: src/Logger.cpp
+msgid "WARNING: "
+msgstr ""
+
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr ""
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 ""
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 ""
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
+msgid "Close"
+msgstr ""
+
+#: src/MuleTextCtrl.cpp
+msgid "Cut"
+msgstr ""
+
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Copy"
+msgstr ""
+
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
+msgid "Paste"
+msgstr ""
+
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Clear"
+msgstr ""
+
+#: src/MuleTextCtrl.cpp
+msgid "Select All"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "eD2k: "
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Connected (LowID)"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Connected (HighID)"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Kad: "
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Connected (firewalled)"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Server: "
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Server IP: "
+msgstr ""
+
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
+msgid "Not connected"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "IP: %s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "TCP port: %d"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "TCP port: Not ready"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "UDP port: %d"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "UDP port: Not ready"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Client Information"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Upload limit"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Download limit"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Exit"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "aMule Tray Menu"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Speed limits:"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "UL: None"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "UL: %u"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "DL: None"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "DL: %u"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "Download speed: %.1f%s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "Upload speed: %.1f%s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "Nickname: %s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "No Nickname Selected!"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "ClientID: "
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "ServerName: "
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "ServerIP: "
+msgstr ""
+
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
+msgid "Not Connected"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Online Signature: Enabled"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+msgid "Online Signature: Disabled"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
+#, c-format
+msgid "Uptime: %s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "Shared files: %d"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "Queued clients: %d"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "Total DL: %s"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp
+#, c-format
+msgid "Total UL: %s"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr ""
+
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Click here to add the eD2k link in the text control to your download queue."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Loading ..."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Number of users on the server you are connected to ..."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Users: 0"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Users connected to the current server and an estimate of the total number of users."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Up: 0.0 | Down: 0.0"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+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
+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
+msgid "Not Connected ..."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Currently connected server."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Type"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Local"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Global"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extended Parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filtering"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "File Type"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "Any"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "Archives"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Audio"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Pictures"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "Programs"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "Texts"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "Videos"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extension"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Min Size"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Bytes"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Max Size"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Availability"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Invert Result"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Hide Known Files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Start"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Stop"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Reset Fields"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Results"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Clears completed downloads"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "File sources:"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "General"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/Statistics.cpp
+msgid "Transfer"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "File Names"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Takeover"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Cleanup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Apply"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Ok"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Comment/Rate file (Text will be visible to all users)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+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 ""
+
+#: src/muuli_wdr.cpp
+msgid "File Quality"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "Not rated"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "Invalid / Corrupt / Fake"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "Poor"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "Fair"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "Good"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "Excellent"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Choose the file rating or advice users if the file is invalid ..."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Refresh"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Downloading, please wait ..."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Unknown size"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Required Information"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Additional Information"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Add"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Download-Speed"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Upload-Speed"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Connections"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Active downloads"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Active connections (1:1)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Active uploads"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Statistics Tree"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Transfers to client"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Scores"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Nick"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "https://amule-org.github.io - the multi-platform Mule"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "This is the name that other users will see when connecting to you."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Language: "
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The delay before showing tool-tips."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "This specifies the language used on controls."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr ""
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Start minimized"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this makes aMule minimize itself upon start."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Prompt on exit"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Makes aMule prompt before exiting."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable Tray Icon"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "This Enables/Disables the system tray (or taskbar) icon."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Hide application window when close button is pressed"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Minimize to Tray Icon"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show notifications when finished downloading"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule to show notifications when finished downloading."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Tooltip delay time: "
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "seconds"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Browser Selection"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enter your browser name here. Leave this field empty to use the system default browser."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Open in new tab if possible"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Open the web page in a new tab instead of in a new window when possible"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Video Player"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Bandwidth limits"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Upload"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Slot Allocation"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Ports"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "This is the standard eD2k port and cannot be disabled."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "UDP port for server requests (TCP+3):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "4665"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "UPnP TCP Port (Optional):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Bind local address to IP (empty for any):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+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
+msgid "Bind to network interface (empty for any):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Max sources per downloading file:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
+msgid "ED2K"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Autoconnect on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Reconnect on loss"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Remove dead server after"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "retries"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "List"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Update server list when connecting to a server"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Update server list when a client connects"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Use priority system"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Use smart LowID check on connect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Safe connect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Autoconnect to servers in static list only"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Set manually added servers to High Priority"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Add files to download in pause mode"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Add files to download with auto priority"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Try to download first and last chunks first"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Start next paused file when a file completes"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "From the same category"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "In alphabetic order"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Preallocate disk space for new files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Stop downloads when free disk space reaches "
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Select this if you want aMule to check your disk space"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enter here the min disk space desired."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/Statistics.cpp
+msgid "Uploads"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Add new shared files with auto priority"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid ""
+"Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
+"If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Shared folders"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "(Right click on folder icon for recursive share)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Share hidden files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Automatically rescan shared folders for changes"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Follow symbolic links in shared folders"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Graphs"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Update delay : 5 secs"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Time for average graph: 100 mins"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Connections Graph Scale: 100 "
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Download graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Upload graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Colors: "
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Background"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Grid"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Download current"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Download running average"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Download session average"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Upload current"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Upload running average"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Upload session average"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Active connections"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Systray Icon Speed Bar"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad-nodes current"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad-nodes running"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad-nodes session"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Select"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Tree"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Number of Client Versions shown (0=unlimited)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "!!! WARNING !!!"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Max new connections / 5 secs"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "File Buffer Size: 240000 bytes"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Upload Queue Size: 5000 clients"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Server connection refresh interval: Disable"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Disable computer's timed standby mode"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Skin to use: "
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show extended info on categories tabs"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show application version on title"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show transfer rates on title"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Before application name"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "After application name"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show overhead bandwidth"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Vertical toolbar orientation"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Download Queue Files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show progress percentage"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show progress bar"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Flat"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Round"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "External Connection Parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Accept external connections"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "IP of the listening interface:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+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
+msgid "TCP port:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable UPnP port forwarding on the EC port"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Password"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Web server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Web template"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Full rights password"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable Low rights User"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Low rights password"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Web server UPnP TCP port (Optional)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Page Refresh Time (in secs)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable Gzip compression"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
+msgid "OK"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Click here to apply any changes made to the preferences."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Reset any changes made to the preferences."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Don't change"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Click this button to reset the log."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Click on this button to update the servers list from URL ..."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Server list"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+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
+msgid "Add server manually: Name"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enter the name of the new server here"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
+msgid "IP:Port"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the server here, using the x.x.x.x format."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enter the port of the server here."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Add manually a server (fill fields to the left before) ..."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "aMule Log"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Server Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "ED2K Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Kad Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Click on this button to update the nodes list from URL ..."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Nodes (0)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+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
+msgid "Nodes stats"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Use Secure User Identification"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Protocol Obfuscation"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Support Protocol Obfuscation"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Use obfuscation for outgoing connections"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Accept only obfuscated connections"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+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
+msgid "Everybody"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "No one"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Who can see my shared files:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Select who can request to view a list of your shared files."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "IP-Filtering"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filter clients"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filter servers"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Reload List"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "URL:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Update now"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Auto-update ipfilter at startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filtering Level:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Always filter LAN IPs"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Paranoid handling of non-matching IPs"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Use system-wide ipfilter.dat if available"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable Online-Signature"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+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
+msgid "Update Frequency (Secs):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Change the frequency (in seconds) of Online Signature updates."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Save online signature file in: "
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Click here to select the directory containing the the Online Signature files."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show country flags for clients"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Database"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Source:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "DB-IP (free, no account)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "MaxMind GeoLite2 (free, account required)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Custom URL"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid ""
+"No configuration required.\n"
+"\n"
+"IP-to-Country data by DB-IP.com - https://db-ip.com\n"
+"License: Creative Commons BY 4.0 - https://creativecommons.org/licenses/by/4.0/"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "License key:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid ""
+"Sign up for a free MaxMind account, then generate a License Key:\n"
+"https://www.maxmind.com/en/geolite2/signup\n"
+"\n"
+"This product includes GeoLite2 data created by MaxMind - https://www.maxmind.com\n"
+"License: MaxMind GeoLite2 EULA - https://www.maxmind.com/en/geolite2/eula\n"
+"Requires attribution and account registration; refresh at least every 30 days."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Download URL:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid ""
+"Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
+"URL may include credentials (https://user:pass@host/...).\n"
+"License and attribution terms are set by the upstream URL - you are responsible."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Download the GeoIP database from the selected source."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Auto-update on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Re-download the GeoIP database from the selected source every time aMule starts."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filter incoming messages (except current chat):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filter all messages"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filter messages from people not on your friend list"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filter messages from unknown clients"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filter messages containing (use ',' as separator):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "add here the words amule should filter and block messages including it"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show received messages in the log"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Comments"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Filter comments containing (use ',' as separator):"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable Proxy"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable proxy support"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The proxy host name"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The proxy port"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Connect to:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Login to remote amule"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Remember those settings"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Force ZLIB compression"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Enable Verbose Debug-Logging."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Only to Logfile"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Message Categories:"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
+msgid "Waiting..."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Add imports"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Retry selected"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Remove selected"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Event Types"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Active Uploads"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr ""
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "All files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Selected files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Active uploads only"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Reload:"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Reload your shared files"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Send"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Sends the specified message."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+msgid "Close this chat-session."
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr ""
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr ""
+
+#: src/OScopeCtrl.cpp
+#, c-format
+msgid "Disabled %s"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "byte"
+msgid_plural "bytes"
+msgstr0 ""
+msgstr1 ""
+
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "k"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "M"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "G"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "T"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr0 ""
+msgstr1 ""
+
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "secs"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "mins"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "hours"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "days"
+msgstr ""
+
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "all"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+msgid "all others"
+msgstr ""
+
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Incomplete"
+msgstr ""
+
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
+msgid "Stopped"
+msgstr ""
+
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Video"
+msgstr ""
+
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Archive"
+msgstr ""
+
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Text"
+msgstr ""
+
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr ""
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr ""
+
+#: src/PartFileConvert.cpp
+msgid "Waiting for partfile convert thread to die..."
+msgstr ""
+
+#: src/PartFileConvert.cpp
+#, c-format
+msgid "Importing %s: %s"
+msgstr ""
+
+#: src/PartFileConvert.cpp
+msgid "Reading temp folder"
+msgstr ""
+
+#: src/PartFileConvert.cpp
+msgid "Retrieving basic information from download info file"
+msgstr ""
+
+#: src/PartFileConvert.cpp
+msgid "Creating destination file"
+msgstr ""
+
+#: src/PartFileConvert.cpp
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr ""
+
+#: src/PartFileConvert.cpp
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr ""
+
+#: src/PartFileConvert.cpp
+msgid "Retrieving source downloadfile information"
+msgstr ""
+
+#: src/PartFileConvert.cpp
+msgid "Adding download and saving new partfile"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp
+msgid "Import partfiles"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp
+msgid "State"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp
+msgid "Filehash"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp
+msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp
+msgid "Do you want the source files of successfully imported downloads be deleted?"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp
+msgid "Remove sources?"
+msgstr ""
+
+#: src/PartFile.cpp
+msgid "ERROR: Failed to create partfile"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Trying to load backup of met-file from %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+msgstr ""
+
+#: src/PartFile.cpp
+msgid "Trying to recover file info..."
+msgstr ""
+
+#: src/PartFile.cpp
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr ""
+
+#: src/PartFile.cpp
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+
+#: src/PartFile.cpp
+msgid "Unable to recover file info :("
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr ""
+
+#: src/PartFile.cpp
+msgid "IO failure while saving partfile: "
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Can't read seeds file for Partfile %s (%s)"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, 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|"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Finished rehashing %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Finished downloading: %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid ""
+"Finished downloading:\n"
+"%s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Deleting file: %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr ""
+
+#: src/PartFile.cpp
+msgid "Allocating"
+msgstr ""
+
+#: src/PartFile.cpp
+msgid "Insufficient disk space"
+msgstr ""
+
+#: src/PartFile.cpp
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr ""
+
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr ""
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr ""
+
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr ""
+
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr ""
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr ""
+
+#: src/Preferences.cpp
+msgid "no options available"
+msgstr ""
+
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp
+msgid "Invalid category found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp
+msgid "TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+
+#: src/Preferences.cpp
+#, c-format
+msgid "Default port will be used (%d)"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Connection"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
+msgid "Directories"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Servers"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Security"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Interface"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "IP2Country"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Proxy"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Filters"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Remote Controls"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Online Signature"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Advanced"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Events"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Debugging"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Tray icon support requires libayatana-appindicator3 at compile time."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The type of proxy you are connecting to"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- TCP port changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- UDP port changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- External connect port changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- External connect acceptance changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- External connect interface changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Protocol obfuscation support changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Language changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Temp folder changed.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- ED2K network enabled.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the autostart-at-login entry."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Autostart"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+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
+msgid "Temporary files"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Incoming files"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Online Signatures"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Choose a folder for %s"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Browse for videoplayer"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select browser"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Executable%s"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Edit server list"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "IP2Country update failed"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Data by MaxMind GeoLite2"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Custom source"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Data by DB-IP.com"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Status: Loaded%s"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Status: Loaded%s - %s"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Status: Failed to load - click 'Update now' to refresh."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Status: Not found - click 'Update now' to download."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr0 ""
+msgstr1 ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Server connection refresh interval: Disabled"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "disabled"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Execute command on '%s' event"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Enable command execution on core"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Core command:"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Enable command execution on GUI"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "GUI command:"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The following variables will be replaced:"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid ""
+"The following folders look like system or sensitive locations:\n"
+"\n"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Confirm shared folders"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Updating shared folders"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Scanned %u directories..."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "It's impossible to search when both eD2k and Kademlia are disabled."
+msgstr ""
+
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Search error"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr ""
+
+#: src/SearchDlg.cpp
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
+msgid "Main"
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "No keyword for Kad search - aborting"
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Unexpected error while attempting Kad search: "
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr ""
+
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr ""
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+msgid "Search related files (eD2k, local server)"
+msgstr ""
+
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k link to clipboard"
+msgstr ""
+
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+msgid "You are not currently connected to a server supporting the Related Files search function"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+msgid "Canceled"
+msgstr ""
+
+#: src/SearchListCtrl.cpp
+msgid "New"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr ""
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all static servers listed."
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ServerConnect.cpp
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Connected to %s (%s:%i)"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Connection established on: %s"
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "ERROR: Socket invalid at timeout check"
+msgstr ""
+
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr ""
+
+#: src/ServerConnect.cpp
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "Loading server.met file: %s"
+msgstr ""
+
+#: src/ServerList.cpp
+msgid "Server.met file not found!"
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "Failed to load server.met file '%s', unknown format encountered."
+msgstr ""
+
+#: src/ServerList.cpp
+msgid "Failed to open server.met!"
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "%i server in server.met found"
+msgid_plural "%i servers in server.met found"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "%d server added"
+msgid_plural "%d servers added"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ServerList.cpp
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp
+msgid "IO error while reading 'server.met': "
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "Server not added: %s:%d does not specify a valid port."
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "Server not added: The IP of %s:%d is filtered or invalid."
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "Server not added: Server with matching IP:Port %s:%d found in list."
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "Server added: Server at %s:%d using the name '%s'."
+msgstr ""
+
+#: src/ServerList.cpp
+msgid "You are connected to the server you are trying to delete. please disconnect first."
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "Failed to open '%s'"
+msgstr ""
+
+#: src/ServerList.cpp
+msgid "Failed to save server.met!"
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr ""
+
+#: src/ServerList.cpp
+msgid "Invalid URL"
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "Finished downloading the server list from %s"
+msgstr ""
+
+#: src/ServerList.cpp
+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
+#, c-format
+msgid "Start downloading server list from %s"
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
+msgstr ""
+
+#: src/ServerList.cpp
+msgid "No valid server.met auto-download url on addresses.dat"
+msgstr ""
+
+#: src/ServerList.cpp
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr ""
+
+#: src/ServerList.cpp
+msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Server Name"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Description"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Ping"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Users"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Static"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "TCP Flags"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "UDP Flags"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "(Unknown name)"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+#, c-format
+msgid "Servers (%i)"
+msgstr ""
+
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
+msgid "Server"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Connect to server"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Mark server as static"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Mark server as non-static"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Mark servers as static"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Mark servers as non-static"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Remove server"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Remove servers"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Remove all servers"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Reconnect to server"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Are you sure that you wish to delete all servers?"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr ""
+
+#: src/ServerListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr ""
+
+#: src/ServerSocket.cpp
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr ""
+
+#: src/ServerSocket.cpp
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr ""
+
+#: src/ServerSocket.cpp
+#, c-format
+msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
+msgstr ""
+
+#: src/ServerSocket.cpp
+#, c-format
+msgid "New clientid is %u"
+msgstr ""
+
+#: src/ServerSocket.cpp
+msgid "WARNING: You have received Low-ID!"
+msgstr ""
+
+#: src/ServerSocket.cpp
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr ""
+
+#: src/ServerSocket.cpp
+msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
+msgstr ""
+
+#: src/ServerSocket.cpp
+msgid "Unknown server info received! - too short"
+msgstr ""
+
+#: src/ServerSocket.cpp
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr0 ""
+msgstr1 ""
+
+#: src/ServerSocket.cpp
+msgid "Saving of server-list completed."
+msgstr ""
+
+#: src/ServerSocket.cpp
+msgid "Server rejected last command"
+msgstr ""
+
+#: src/ServerSocket.cpp
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr ""
+
+#: src/ServerSocket.cpp
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr ""
+
+#: src/ServerSocket.cpp
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr ""
+
+#: src/ServerSocket.cpp
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr ""
+
+#: src/ServerSocket.cpp
+msgid "using protocol obfuscation."
+msgstr ""
+
+#: src/ServerSocket.cpp
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr ""
+
+#: src/ServerSocket.cpp
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Server not added: No IP or hostname specified."
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Server not added: Invalid server-port specified."
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "eD2k Status:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "ID"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Connection Type:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Kademlia Status:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Running in LAN mode"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Running"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Kademlia client ID:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Status:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Connection State:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "UDP Connection State:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Firewalled state: "
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "No buddy required - TCP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "No buddy required - UDP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "No buddy"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Connecting to buddy"
+msgstr ""
+
+#: src/ServerWnd.cpp
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Indexed sources:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Indexed keywords:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Indexed notes:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Indexed load:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Average Users:"
+msgstr ""
+
+#: src/ServerWnd.cpp
+msgid "Average Files:"
+msgstr ""
+
+#: src/ServerWnd.cpp src/TextClient.cpp
+msgid "Not running"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr ""
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 ""
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Adding file %s to shares"
+msgstr ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 ""
+msgstr1 ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Shared directory not readable, skipping: %s"
+msgstr ""
+
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 ""
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 ""
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Status"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Download Status"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Local File Name"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Shares File List"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Directory Path"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Add Comment/Rating"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Edit Comment/Rating"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Rename"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Add files in collection to transfer list"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Copy magnet &URI to clipboard"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Copy eD2k link to clipboard (&AICH info + Source)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "You need a HighID to create a valid sourcelink"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 ""
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i)"
+msgstr ""
+
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr ""
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr ""
+
+#: src/SourceListCtrl.cpp
+msgid "Remote File Name"
+msgstr ""
+
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Active Uploads: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Average upload time: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Found Sources: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Reconnects: %i"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Unknown: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Filtered: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Banned: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Working Servers: %i"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Failed Servers: %i"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Total: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Total Users: %llu"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Total Files: %llu"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+#, c-format
+msgid "Average file size: %s"
+msgstr ""
+
+#: src/Statistics.cpp
+msgid "Operating System"
+msgstr ""
+
+#: src/Statistics.cpp
+msgid "Not Received"
+msgstr ""
+
+#: src/StatisticsDlg.cpp
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr ""
+
+#: src/StatTree.cpp
+msgid "Not available"
+msgstr ""
+
+#: src/StatTree.cpp
+msgid "Never"
+msgstr ""
+
+#: src/TerminationProcess.cpp
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Execute <str> and exit."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Processing by hash: "
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Processing by filename: "
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Not a valid number\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr ""
+
+#. TRANSLATORS:
+#. 'help search' is a command to the program, do not translate it.
+#: src/TextClient.cpp
+msgid ""
+"Invalid search filter syntax.\n"
+"Type 'help search' to get more help.\n"
+msgstr ""
+
+#. TRANSLATORS:
+#. 'help search' is a command to the program, do not translate it.
+#: src/TextClient.cpp
+msgid ""
+"No search keyword provided.\n"
+"Type 'help search' to get more help.\n"
+msgstr ""
+
+#. TRANSLATORS:
+#. 'help search' is a command to the program, do not translate it.
+#: src/TextClient.cpp
+msgid ""
+"No search type defined.\n"
+"Type 'help search' to get more help.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Download File: %lu %s\n"
+msgstr ""
+
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
+msgid "Request failed with an unknown error."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Operation was successful."
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Request failed with the following error: %s"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "OFF"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "ON"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Now connecting"
+msgstr ""
+
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid "firewalled"
+msgstr ""
+
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid "ok"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid ""
+"\n"
+"Download:\t%s"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid ""
+"\n"
+"Upload:\t%s"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid ""
+"\n"
+"Clients in queue:\t%d\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid ""
+"\n"
+"Total sources:\t%d\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show short status information."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show full statistics tree."
+msgstr ""
+
+#: src/TextClient.cpp
+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
+msgid "Shut down aMule."
+msgstr ""
+
+#: src/TextClient.cpp
+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
+msgid "Reload the given object."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Reload shared files list."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Reload IP filtering table."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Reload current IP filtering table."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Update IP filtering table from URL."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Connect to the network."
+msgstr ""
+
+#: src/TextClient.cpp
+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
+msgid "Connect to eD2k only."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Connect to Kad only."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Disconnect from the network."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Disconnect from eD2k only."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Disconnect from Kad only."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Add an eD2k or magnet link to core."
+msgstr ""
+
+#: src/TextClient.cpp
+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
+msgid "Set a preference value."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Set IP filtering preferences."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Turn IP filtering on for both clients and servers."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Turn IP filtering off for both clients and servers."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Enable/Disable IP filtering for clients."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Turn IP filtering on for clients."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Turn IP filtering off for clients."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Enable/Disable IP filtering for servers."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Turn IP filtering on for servers."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Turn IP filtering off for servers."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Select IP filtering level."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Set bandwidth limits."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Set upload bandwidth limit."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The given value must be in kilobytes/sec.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Set download bandwidth limit."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Get and display a preference value."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Get IP filtering preferences."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Get IP filtering state for both clients and servers."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Get IP filtering state for clients only."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Get IP filtering state for servers only."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Get IP filtering level."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Get bandwidth limits."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Execute a search."
+msgstr ""
+
+#: src/TextClient.cpp
+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"
+"\n"
+"Optional filters can be added before, after, or interleaved with\n"
+"the search keyword(s):\n"
+"    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
+"    --extension <ext>      (alias: --ext)\n"
+"    --avail <N>            minimum number of sources\n"
+"    --min-size <NKMG>    smallest file size; K=1024, M=K*1024, G=M*1024\n"
+"    --max-size <NKMG>    largest file size; same suffixes\n"
+"Example: 'search global linux iso --type Iso --min-size 100M' returns\n"
+"results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Execute a global search."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Execute a local search"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Execute a kad search"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show the progress of a search."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Start downloading a file"
+msgstr ""
+
+#: src/TextClient.cpp
+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/TextClient.cpp
+msgid "Pause download."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Resume download."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Cancel download."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Set download priority."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Set priority to low."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Set priority to normal."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Set priority to high."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Set priority to auto."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show queues/lists."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show upload queue."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show download queue."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show log."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show servers list."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Show shared files list."
+msgstr ""
+
+#: src/TextClient.cpp
+msgid "Reset log."
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid "Deprecated command, use '%s' instead."
+msgstr ""
+
+#: src/TextClient.cpp
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+
+#: src/TextClient.h
+msgid "aMule text client"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+
+#: src/TransferWnd.cpp
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+
+#: src/TransferWnd.cpp
+msgid "Confirmation Required"
+msgstr ""
+
+#: src/TransferWnd.cpp
+msgid "Only 99 categories are supported."
+msgstr ""
+
+#: src/TransferWnd.cpp
+msgid "Too many categories!"
+msgstr ""
+
+#: src/TransferWnd.cpp
+msgid "All others"
+msgstr ""
+
+#: src/TransferWnd.cpp
+msgid "Select view filter"
+msgstr ""
+
+#: src/TransferWnd.cpp
+msgid "Add category"
+msgstr ""
+
+#: src/TransferWnd.cpp
+msgid "Edit category"
+msgstr ""
+
+#: src/TransferWnd.cpp
+msgid "Remove category"
+msgstr ""
+
+#: src/UploadClient.cpp
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr ""
+
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+
+#: src/UploadQueue.cpp
+#, c-format
+msgid "Resuming uploads of file: %s"
+msgstr ""
+
+#: src/UploadQueue.cpp
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr ""
+
+#: src/UserEvents.cpp
+#, c-format
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr ""
+
+#: src/UserEvents.h
+msgid "Download completed"
+msgstr ""
+
+#: src/UserEvents.h
+msgid "The full path to the file."
+msgstr ""
+
+#: src/UserEvents.h
+msgid "The name of the file without path component."
+msgstr ""
+
+#: src/UserEvents.h
+msgid "The eD2k hash of the file."
+msgstr ""
+
+#: src/UserEvents.h
+msgid "The size of the file in bytes."
+msgstr ""
+
+#: src/UserEvents.h
+msgid "Cumulative download activity time."
+msgstr ""
+
+#: src/UserEvents.h
+msgid "New chat session started"
+msgstr ""
+
+#: src/UserEvents.h
+msgid "Message sender."
+msgstr ""
+
+#: src/UserEvents.h
+msgid "Out of space"
+msgstr ""
+
+#: src/UserEvents.h
+msgid "Disk partition."
+msgstr ""
+
+#: src/UserEvents.h
+msgid "Error on completion"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcc.cpp
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcc.cpp
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcc.cpp
+#, c-format
+msgid "%s ---> Non existent file !\n"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alc.cpp
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid "Welcome!"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Input parameters"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "File to Hash"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Add Optional URLs for this file"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+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/utils/aLinkCreator/src/alcframe.cpp
+msgid "Create link with part-hashes"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Help to spread new and rare files faster, at the cost of an increased link size"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "MD4 File Hash"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "eD2k File Hash"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Save"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Open"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Open a file to compute its eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Copy computed eD2k link to clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Save as"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Save computed eD2k link to file"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "About aLinkCreator"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Select the file you want to compute the eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Can't open the clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Nothing to copy for now !"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Select the file to your computed eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Unable to open "
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Please, enter a non empty file name"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Nothing to save for now !"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+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
+msgid "Hashing..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "aLinkCreator is working for you"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Computing MD4 Hash..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Computing eD2k Hashes..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
+msgid "Cancelled !"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+#, c-format
+msgid "Done in %.2f s"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "You have already added this URL !"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Please, enter a non empty URL"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp
+#, c-format
+msgid "Unable to open %s"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp
+msgid "Out of memory while calculating ed2k hash!"
+msgstr ""
+
+#: src/utils/wxCas/src/linuxmon.cpp
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr ""
+
+#: src/utils/wxCas/src/onlinesig.cpp
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr ""
+
+#: src/utils/wxCas/src/onlinesig.cpp
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr ""
+
+#: src/utils/wxCas/src/onlinesig.cpp
+#, c-format
+msgid "%02umin %02us"
+msgstr ""
+
+#: src/utils/wxCas/src/onlinesig.cpp
+#, c-format
+msgid "%02us"
+msgstr ""
+
+#: src/utils/wxCas/src/onlinesig.cpp
+#, c-format
+msgid "%.0f B"
+msgstr ""
+
+#: src/utils/wxCas/src/onlinesig.cpp
+#, c-format
+msgid "%.2f KiB"
+msgstr ""
+
+#: src/utils/wxCas/src/onlinesig.cpp
+#, c-format
+msgid "%.2f MiB"
+msgstr ""
+
+#: src/utils/wxCas/src/onlinesig.cpp
+#, c-format
+msgid "%.2f GiB"
+msgstr ""
+
+#: src/utils/wxCas/src/onlinesig.cpp
+#, c-format
+msgid "%.2f TiB"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcas.cpp
+msgid "wxCas, aMule Online Statistics"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Maximum DL rate since wxCas is running"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "System"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Stop Auto Refresh"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Save Online Statistics image"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Print Online Statistics image"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Preferences setting"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "About wxCas"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Start Auto Refresh"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Auto Refresh stopped"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Auto Refresh started"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Save Statistics Image"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "aMule Online Statistics"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Printing"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+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/utils/wxCas/src/wxcasframe.cpp
+msgid "Oh Oh, aMule is not running..."
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "aMule is running"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "aMule is running, but disconnected"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "aMule is connecting..."
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Oh Oh, aMule status is unknown..."
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "aMule "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " has been running for "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " is stopped !"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " is not connected !"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " is connecting..."
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " is doing something strange, check it !"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " is connected to "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " Kad: "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "off"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " is on "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " with "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Total Download: "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid ", Upload: "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Session Download: "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Download: "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Sharing: "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " file(s), Clients on queue: "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Time: "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " on "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "System Load Average (1-5-15 min): "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "System uptime: "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Directory containing amulesig.dat file"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Refresh rate interval in seconds"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Generate a stat image at every refresh event"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Upload periodically your stat image to FTP server"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "FTP Url"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "FTP Path"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Enter here the URL of your FTP server"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "User"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Enter here the User name to log into your FTP server"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Enter here the User password to log into your FTP server"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "FTP update rate interval in minutes"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Validate"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Folder containing your signature file"
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Folder where generating the statistic image"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "Loads template <str>"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "Web server HTTP port"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "Use UPnP port forwarding on web server port"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "UPnP port"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "Use gzip compression"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "Full access password for web server"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "Guest password for web server"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "Allow guest access"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "Deny guest access"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "Load/save web server settings from/to remote aMule"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "Disable PHP interpreter (deprecated)"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "Recompile PHP pages on each request"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp
+msgid "aMule Web Server"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "web client connection accepted\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "ERROR: cannot accept web client connection\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Index file not found: "
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Session expired - requesting login\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Session ok, logged in\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Session ok, not logged in\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "No session opened - will request login\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Session created - requesting login\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Processing request original: "
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Refusing to read `pass` from URL query string\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "No password specified, login will not be allowed."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Checking password\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Password hash invalid\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Password ok\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Password bad\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Logout requested\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp
+msgid "Processing request redirected: "
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "aMule (required)"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Desktop shortcut"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Start aMule when I log in"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Uninstall"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "aMule application files (required)."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Place an aMule shortcut on the desktop."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Launch aMule automatically when the current user logs in (per-user setting)."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid ""
+"aMule appears to be running from $INSTDIR.\r\n"
+"Please close aMule (and aMuleD / aMuleGUI) and try again."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid ""
+"aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
+"Please stop it and try again."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Removing previous aMule installation at $0..."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid ""
+"Could not remove the previous aMule installation at $0.\r\n"
+"Please close any running aMule processes and try again, or uninstall the previous version manually first."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "aMule appears to be running. Please close it and re-run the uninstaller."
+msgstr ""
+
+#: packaging/windows/installer_strings.c
+msgid "Removing user data at $APPDATA\\aMule..."
+msgstr ""

amule-3.0.1.tar.gz/po/zh_CN.po -> amule-3.1.0.tar.gz/po/zh_CN.po Changed

@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: https://github.com/amule-org/amule/issues\n"
-"POT-Creation-Date: 2026-06-17 20:13+0200\n"
-"PO-Revision-Date: 2026-06-20 17:13+0000\n"
+"POT-Creation-Date: 2026-09-18 22:25+0100\n"
+"PO-Revision-Date: 2026-09-20 21:07+0000\n"
 "Last-Translator: Mike Akiba <mike2718@gmail.com>\n"
 "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n"
 "Language: zh_CN\n"
@@ -24,72 +24,157 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.5\n"
 
-#: src/AddFriend.cpp:45
+#: src/AboutDialog.cpp
+msgid "About aMule"
+msgstr "关于 aMule"
+
+#: src/AboutDialog.cpp
+msgid "aMule remote control "
+msgstr "aMule 远程控制 "
+
+#: src/AboutDialog.cpp
+msgid "Snapshot:"
+msgstr "Snapshot:"
+
+#: src/AboutDialog.cpp src/SplashScreen.cpp
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"基于 eMule 的“全平台” P2P客户端 \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid ""
+"Copyright (c) 2003-2026 aMule Team \n"
+"\n"
+msgstr ""
+"版权所有 (c) 2003-2026 aMule 团队 \n"
+"\n"
+
+#: src/AboutDialog.cpp
+msgid "Part of aMule is based on \n"
+msgstr "aMule 的一部分是基于 \n"
+
+#: src/AboutDialog.cpp
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: 基于异或算法的点对点路由。\n"
+
+#: src/AboutDialog.cpp
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+msgstr " 版权所有 (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+
+#: src/AboutDialog.cpp
+msgid "Website:"
+msgstr "网站："
+
+#: src/AboutDialog.cpp
+msgid "Forum:"
+msgstr "论坛："
+
+#: src/AboutDialog.cpp
+msgid "Documentation:"
+msgstr "文档："
+
+#: src/AboutDialog.cpp
+msgid "Issues:"
+msgstr "问题："
+
+#: src/AboutDialog.cpp
+msgid "Click to check for a newer version."
+msgstr "单击检查新版本。"
+
+#: src/AboutDialog.cpp
+msgid "Check for updates"
+msgstr "检查更新"
+
+#: src/AboutDialog.cpp
+msgid "Checking for updates..."
+msgstr "正在检查更新…"
+
+#: src/AboutDialog.cpp
+msgid "You are running the latest version."
+msgstr "运行的是最新版。"
+
+#: src/AboutDialog.cpp
+#, c-format
+msgid "A new version (%s) is available:"
+msgstr "有新版本（%s）可用："
+
+#: src/AboutDialog.cpp
+msgid "Could not check for updates. Please try again later."
+msgstr "无法检查更新。请稍后重试。"
+
+#: src/AddFriend.cpp
 msgid "Add a Friend"
 msgstr "添加好友"
 
-#: src/AddFriend.cpp:61
+#: src/AddFriend.cpp
 msgid "You have to enter a valid IP and port!"
 msgstr "您必须输入有效的 IP 地址和端口！"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "Information"
 msgstr "信息"
 
-#: src/AddFriend.cpp:67
+#: src/AddFriend.cpp
 msgid "The specified userhash is not valid!"
 msgstr "指定的用户哈希无效！"
 
-#: src/AppImageIntegration.cpp:221
+#: src/AppImageIntegration.cpp
 msgid ""
-"aMule can install a desktop launcher and icon into your home directory so it appears in your application menu like a regularly installed app. This is reversible — the files live under ~/.local/share/applications and ~/.local/share/icons and can be removed at any time.\n"
+"aMule can install desktop launchers, icons, and shell command shortcuts into your home directory so it appears in your application menu like a regularly installed app.\n"
+"\n"
+"This is reversible - the files live under ~/.local/share/applications, ~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n"
 "\n"
 "Install desktop integration now?"
 msgstr ""
-"aMule 可以在主目录中安装桌面启动器和图标，以便它像常规安装的应用程序一样显示在应用菜单中。此操作是可逆的—— 相关文件存放在 ~/.local/share/applications 和 ~/.local/share/icons 目录下，你可以随时将其删除。\n"
+"aMule 可以在主目录中安装桌面启动器和图标，以便它像常规安装的应用程序一样显示在应用菜单中。\n"
+"\n"
+"此操作是可逆的—— 相关文件存放在 ~/.local/share/applications 和 ~/.local/share/icons 目录下，你可以随时将其删除。\n"
 "\n"
 "现在立即安装桌面集成吗？"
 
-#: src/AppImageIntegration.cpp:226
+#: src/AppImageIntegration.cpp
 msgid "Add aMule to your application menu?"
 msgstr "添加 aMule 到程序菜单吗？"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Install"
 msgstr "安装"
 
-#: src/AppImageIntegration.cpp:228
+#: src/AppImageIntegration.cpp
 msgid "Not now"
 msgstr "不是现在"
 
-#: src/AppImageIntegration.cpp:229
+#: src/AppImageIntegration.cpp src/amuleDlg.cpp
 msgid "Don't ask again"
 msgstr "不要再提醒我"
 
-#: src/AppImageIntegration.cpp:248
+#: src/AppImageIntegration.cpp
 msgid "Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way."
 msgstr "无法安装桌面集成：APPDIR 环境变量未设置。这通常表明 AppImage 以非标准的形式启动。"
 
-#: src/AppImageIntegration.cpp:250 src/AppImageIntegration.cpp:262
-#: src/AppImageIntegration.cpp:274
+#: src/AppImageIntegration.cpp
 msgid "aMule integration failed"
 msgstr "aMule 集成失败"
 
-#: src/AppImageIntegration.cpp:259
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to create %s. Check that your home directory is writable."
 msgstr "无法安装桌面集成：创建 %s 失败。请检查主目录是可写入的。"
 
-#: src/AppImageIntegration.cpp:271
+#: src/AppImageIntegration.cpp
 #, c-format
 msgid "Cannot install desktop integration: failed to write %s. Check that your home directory is writable."
 msgstr "无法安装桌面集成。写入 %s 失败。请检查主目录是可写入的。"
 
-#: src/AppImageIntegration.cpp:281
-msgid "AppImage integration: aMule added to your application menu."
-msgstr "AppImage 集成：aMule 已添加到你的应用程序菜单。"
+#: src/AppImageIntegration.cpp
+#, c-format
+msgid "AppImage integration: aMule added to your application menu (%d shell shortcuts under ~/.local/bin)."
+msgstr "AppImage 集成：aMule 已添加到你的应用程序菜单(%d shell 快捷方式，位于~/.local/bin)。"
 
-#: src/AppImageIntegration.cpp:284
+#: src/AppImageIntegration.cpp
 msgid ""
 "aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n"
 "\n"
@@ -103,82 +188,167 @@
 "\n"
 "现在立即重启 aMule 吗？"
 
-#: src/AppImageIntegration.cpp:287
+#: src/AppImageIntegration.cpp
 msgid "aMule installed"
 msgstr "aMule 已安装"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Restart now"
 msgstr "立即重启"
 
-#: src/AppImageIntegration.cpp:289
+#: src/AppImageIntegration.cpp
 msgid "Later"
 msgstr "稍后重启"
 
-#: src/amuleAppCommon.cpp:174
-#, c-format
-msgid "Could not add %u link from ED2KLinks file (see log for details)."
-msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
-msgstr0 "无法添加 ED2KLinks 文件的 %u 个链接（详情见日志）。"
-msgstr1 "无法添加 ED2KLinks 文件的 %u 个链接（详情见日志）。"
-
-#: src/amuleAppCommon.cpp:176 src/amule.cpp:887 src/amule.cpp:1001
-#: src/amule.cpp:1296 src/amule-remote-gui.cpp:481 src/amule-remote-gui.cpp:533
-#: src/amule-remote-gui.cpp:546 src/amule-remote-gui.cpp:564
-#: src/amule-remote-gui.cpp:953 src/amule-remote-gui.cpp:982
-#: src/DownloadQueue.cpp:1444
-msgid "ERROR"
-msgstr "错误"
-
-#: src/amuleAppCommon.cpp:179
+#: src/amuleAppCommon.cpp
 msgid "Failed to open ED2KLinks file."
 msgstr "打开 ED2K 链接文件失败。"
 
-#: src/amuleAppCommon.cpp:252
+#: src/amuleAppCommon.cpp
 msgid "WARNING: You can't add yourself as a source for an eD2k link while having a lowid."
 msgstr "警告：在 Low ID 的情况下，你不能添加自己作为 ed2k 链接的源。"
 
-#: src/amule.cpp:251
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"Another program is holding aMule's lock file:\n"
+"\n"
+"%s\n"
+"\n"
+"That is not a running copy of aMule, so there is nothing to bring to the front. Close the other program, or delete the lock file while aMule is not running."
+msgstr ""
+"另一个程序扣住了 aMule 的锁定文件：\n"
+"\n"
+"%s\n"
+"\n"
+"这不是 aMule 的运行副本, 因此没有可以带到前台的东西。关闭其他应用，或在 aMule 未运行时删除该锁定文件。"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid ""
+"The aMule daemon (amuled) is already running as process %d and is using this configuration.\n"
+"\n"
+"It has no window to bring to the front. Connect to it with amuleGUI, or stop the daemon before starting aMule."
+msgstr ""
+"aMule 守护进程 (amuled) 已经在作为 %d 进程运行并在使用此配置。\n"
+"\n"
+"它没有可以带到前台的窗口。用 amuleGUI 连接它，或在启动 amule 前停止该守护进程。"
+
+#: src/amuleAppCommon.cpp
+msgid "aMule cannot start"
+msgstr "aMule 无法启动"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Restricted permissions on %s to owner-only."
+msgstr "已将 %s 的权限限制为仅所有者。"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Collection file not found: %s"
+msgstr "集合文件未找到：%s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid or empty collection file: %s"
+msgstr "无效或空白的链接集文件： %s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "No usable links in collection: %s"
+msgstr "集合中无可用链接：%s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Skipped %u unusable link in collection: %s"
+msgid_plural "Skipped %u unusable links in collection: %s"
+msgstr0 "跳过了集合中 %u 个不可用链接：%s"
+msgstr1 "跳过了集合中 %u 个不可用链接：%s"
+
+#: src/amuleAppCommon.cpp src/DownloadQueue.cpp
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "无法转换 magnet 链接为 eD2k：%s"
+
+#: src/amuleAppCommon.cpp
+#, c-format
+msgid "Invalid eD2k link \"%s\" - ERROR: %s"
+msgstr "无效 eD2k 链接 \"%s\" - 错误： %s"
+
+#: src/amule.cpp
 msgid "Now, exiting main app..."
 msgstr "现在，正在退出主程序..."
 
-#: src/amule.cpp:281
+#: src/amule.cpp
 #, c-format
 msgid "Terminating amuleweb instance with pid '%d' ... "
 msgstr "正在终止 pid 为“%d”的 amuleweb 实例 ... "
 
-#: src/amule.cpp:284
+#: src/amule.cpp
 #, c-format
 msgid "Killing amuleweb instance with pid '%d' ... "
 msgstr "正在终止 pid 为“%d”的 amuleweb 实例 ... "
 
-#: src/amule.cpp:286 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp src/ClientRef.cpp src/SearchDlg.cpp src/ServerListCtrl.cpp
 msgid "Failed"
 msgstr "失败"
 
-#: src/amule.cpp:292
+#: src/amule.cpp
+#, c-format
+msgid "Terminating amuleapi instance with pid '%d' ... "
+msgstr "正在终止 pid 为“%d”的 amuleapi 实例 ... "
+
+#: src/amule.cpp
+#, c-format
+msgid "Killing amuleapi instance with pid '%d' ... "
+msgstr "正在终止 pid 为“%d”的 amuleapi 实例 ... "
+
+#: src/amule.cpp
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule 正在退出：中止内核。"
 
-#: src/amule.cpp:394
+#: src/amule.cpp
 msgid "aMule shutdown completed."
 msgstr "aMule 已经关闭。"
 
-#: src/amule.cpp:398
+#: src/amule.cpp
 msgid "Memory debug results for aMule exit:"
 msgstr "对 aMule 退出的内存 Debug 结果："
 
-#: src/amule.cpp:595
+#: src/amule.cpp
+#, c-format
+msgid "Binding aMule's peer-to-peer traffic to interface: %s (HTTP updates use the default route)"
+msgstr "将 amule 的 p2p 流量绑定到接口：%s（HTTP 流量使用默认路由）"
+
+#: src/amule.cpp
+#, c-format
+msgid "Binding all network traffic to interface: %s"
+msgstr "将所有网络流量绑定到接口：%s"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: configured network interface '%s' was not found - traffic is NOT bound to it and may leave via the default route. Check the interface name in Preferences."
+msgstr "警告：未找到配置的网络接口'%s' - 流量未绑定到该接口，可能通过默认路由离开。 在首选项中检查接口名。"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: binding to network interface '%s' requires elevated privileges and was NOT applied - traffic may leave via the default route. Grant the capability (e.g. 'sudo setcap cap_net_raw+ep' on the aMule binary) or run with sufficient privileges."
+msgstr "警告：绑定到网络接口“%s”需要提升权限，但未成功 - 流量可能通过默认路由离开。请授予相应权限（例如，在 aMule 二进制文件上运行“sudo setcap cap_net_raw+ep”），或以足够的权限运行命令。"
+
+#: src/amule.cpp
+#, c-format
+msgid "WARNING: could not bind to network interface '%s' - traffic may leave via the default route."
+msgstr "警告：无法绑定到网络接口“%s” − 流量可能经默认路由离开。"
+
+#: src/amule.cpp
 msgid "Your locale has been changed to System Default due to a configuration change. Sorry."
 msgstr "对不起，由于配置变动，您的地区设置已经变为系统默认值。"
 
-#: src/amule.cpp:595 src/amule.cpp:1285 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:355
-#: src/ServerListCtrl.cpp:155
+#: src/amule.cpp src/CatDialog.cpp src/ServerList.cpp src/ServerListCtrl.cpp
 msgid "Info"
 msgstr "信息"
 
-#: src/amule.cpp:601
+#: src/amule.cpp
 msgid ""
 "\n"
 "EC configuration"
@@ -186,24 +356,45 @@
 "\n"
 "EC 配置"
 
-#: src/amule.cpp:604
+#: src/amule.cpp
 msgid "Password set and external connections enabled."
 msgstr "密码已设置，启用远程连接。"
 
-#: src/amule.cpp:615 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:1034 src/SharedFilesCtrl.cpp:319
+#: src/amule.cpp src/KadDlg.cpp src/PrefsUnifiedDlg.cpp src/SharedFilesCtrl.cpp
 msgid "WARNING"
 msgstr "警告"
 
-#: src/amule.cpp:788
-msgid "eD2k server list (server.met)"
-msgstr "eD2k 服务器列表 (server.met)"
+#: src/amule.cpp
+msgid "Initializing network"
+msgstr "正初始化网络"
 
-#: src/amule.cpp:789
-msgid "Kad bootstrap nodes (nodes.dat)"
-msgstr "Kad 引导节点 (nodes.dat)"
+#: src/amule.cpp
+msgid "Loading temp files"
+msgstr "正加载临时文件"
+
+#: src/amule.cpp
+#, c-format
+msgid "Loading temp files (%u of %u)"
+msgstr "正加载临时文件 （第 %u 个，共 %u 个）"
+
+#: src/amule.cpp
+msgid "Loading shared files"
+msgstr "正加载共享文件"
 
-#: src/amule.cpp:796
+#: src/amule.cpp
+#, c-format
+msgid "Loading shared files (%u)"
+msgstr "正加载共享文件（%u）"
+
+#: src/amule.cpp
+msgid "Starting up"
+msgstr "启动中"
+
+#: src/amule.cpp
+msgid "Network bootstrap"
+msgstr "网络引导"
+
+#: src/amule.cpp
 msgid ""
 "aMule has detected missing network bootstrap files.\n"
 "Select which ones to download:"
@@ -211,30 +402,58 @@
 "aMule 检测到缺少网络引导文件。\n"
 "请选择需要下载的文件："
 
-#: src/amule.cpp:797
-msgid "Network bootstrap"
-msgstr "网络引导"
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "eD2k server list (server.met)"
+msgstr "eD2k 服务器列表 (server.met)"
 
-#: src/amule.cpp:882
+#: src/amule.cpp src/FirstRunWizard.cpp
+msgid "Kad bootstrap nodes (nodes.dat)"
+msgstr "Kad 引导节点 (nodes.dat)"
+
+#: src/amule.cpp
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web 服务器正在运行，pid 为 %d"
 
-#: src/amule.cpp:886
+#: src/amule.cpp
 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 build aMule from source with -DBUILD_WEBSERVER=YES and install it."
 msgstr "您要求启动时运行 Web 服务器，但 amuleweb 程序无法运行， 请先安装包含 amule web 服务器的 aMule 包，或者使用 -DBUILD_WEBSERVER=YES 选项从源码构建 aMule 并安装它。"
 
-#: src/amule.cpp:969
+#: src/amule.cpp src/amule-remote-gui.cpp src/DownloadQueue.cpp
+#: src/PrefsUnifiedDlg.cpp src/SearchDlg.cpp
+msgid "ERROR"
+msgstr "错误"
+
+#: src/amule.cpp
+#, c-format
+msgid "Could not write the amuleapi EC token to %s; amuleapi will fall back to its configured password."
+msgstr "无法写入 amuleapi EC 令牌到 %s； amuleapi 将退回到其配置的密码。"
+
+#: src/amule.cpp
+#, c-format
+msgid "amuleapi running on pid %d"
+msgstr "amuleapi 正在运行，pid 为 %d"
+
+#: src/amule.cpp
+msgid "You requested to run amuleapi on startup, but the amuleapi binary cannot be run. Please install the package containing aMule's REST API server, or build aMule from source with -DBUILD_AMULEAPI=YES and install it."
+msgstr "您要求启动时运行 amuleapi，但 amuleapi 程序无法运行， 请先安装包含 amule REST API 服务器的 包，或者使用 -DBUILD_AMULEAPI=YES 选项从源码构建 aMule 并安装它。"
+
+#: src/amule.cpp
+#, c-format
+msgid "External connection: could not bind to '%s', listening on 127.0.0.1 only."
+msgstr "外部连接：无法绑定 '%s'，仅监听 127.0.0.1。"
+
+#: src/amule.cpp
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "无法绑定端口到指定的地址：%s"
 
-#: src/amule.cpp:993
+#: src/amule.cpp
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "端口 %u 不可用，你会成为 Low ID\n"
 
-#: src/amule.cpp:999
+#: src/amule.cpp
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -245,566 +464,559 @@
 msgstr ""
 "端口 %u 已被占用。\n"
 "\n"
-"这意味着你会成为 Low ID。\n"
+"这意味着你会是 Low ID。\n"
 "\n"
-"请检测网络设置以确保端口可用于输入输出。"
+"请检测网络确保端口开启可用于输入输出。"
 
-#: src/amule.cpp:1082
+#: src/amule.cpp
 msgid "Failed to create OnlineSig File"
 msgstr "创建在线统计文件失败"
 
-#: src/amule.cpp:1090
+#: src/amule.cpp
 msgid "Failed to create aMule OnlineSig File"
 msgstr "创建 aMule 在线统计文件失败"
 
-#: src/amule.cpp:1262
+#: src/amule.cpp
 msgid "The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"
 msgstr "您所选择的地区设置在您的计算机上似乎没有安装。(注意：我还是会尝试您所选择的地区设置。)"
 
-#: src/amule.cpp:1271
+#: src/amule.cpp
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "这是您第一次运行 aMule %s"
 
-#: src/amule.cpp:1273
+#: src/amule.cpp
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "此版本是测试版，更新频繁， \n"
 
-#: src/amule.cpp:1274
+#: src/amule.cpp
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "我们无法承诺它不会损坏任何东西，烧毁您的房子，\n"
 
-#: src/amule.cpp:1275
+#: src/amule.cpp
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "或杀死你的狗，但 * 一般来讲 * 它应该是安全的。\n"
 
-#: src/amule.cpp:1280
+#: src/amule.cpp
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr "如要获取使用信息、用户支持以及下载最新版本，请访问我们的首页\n"
 
-#: src/amule.cpp:1281
+#: src/amule.cpp
 msgid "at https://amule-org.github.io, or in our IRC channel #aMule at irc.libera.chat.\n"
 msgstr "https://amule-org.github.io，或进入我们在 irc.libera.chat 的 IRC 频道 #aMule。\n"
 
-#: src/amule.cpp:1283
+#: src/amule.cpp
 msgid "Feel free to report any bugs to https://github.com/amule-org/amule/issues"
 msgstr "欢迎您到 https://github.com/amule-org/amule/issues 去提交错误报告"
 
-#: src/amule.cpp:1296
+#: src/amule.cpp
 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/amule.cpp:1359
+#: src/amule.cpp
 msgid "Server hostname notified"
 msgstr "获取服务器名称"
 
-#: src/amule.cpp:1683
+#: src/amule.cpp
+#, c-format
+msgid "Media metadata: probed file is no longer known, result discarded (%s)"
+msgstr "媒体元数据：探测的文件不再已知，结果被丢弃（%s）"
+
+#: src/amule.cpp
 #, c-format
 msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr "为文件 '%s' 预分配磁盘空间失败：%s"
 
-#: src/amule.cpp:1816
+#: src/amule.cpp
 msgid "ERROR: can't open logfile"
 msgstr "错误：无法打开日志文件"
 
-#: src/amule.cpp:1820
+#: src/amule.cpp
 msgid "WARNING: logfile is empty. Something is wrong."
 msgstr "警告：日志文件为空。肯定有什么地方出错了。"
 
-#: src/amule.cpp:1837
+#: src/amule.cpp
 msgid "Log has been reset"
 msgstr "记录文件已被重置"
 
-#: src/amule.cpp:1863
+#: src/amule.cpp
 #, c-format
 msgid "ServerMessage: %s"
 msgstr "服务器消息：%s"
 
-#: src/amule.cpp:1905 src/IP2Country.cpp:235 src/IPFilter.cpp:510
-#: src/ServerList.cpp:870
+#: src/amule.cpp src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Skipped download of %s, because requested file is not newer."
 msgstr "跳过下载%s，因为请求的文件不是最新的。"
 
-#: src/amule.cpp:1907
+#: src/amule.cpp
 msgid "Failed to download the nodes list."
 msgstr "下载节点列表失败。"
 
-#: src/amule.cpp:1927
+#: src/amule.cpp
 msgid "Failed to open the downloaded version check file"
 msgstr "打开已下载的版本检查文件失败"
 
-#: src/amule.cpp:1930 src/amule.cpp:1949 src/amule.cpp:1980 src/amule.cpp:2001
+#: src/amule.cpp
 msgid "Corrupted version check file"
 msgstr "损坏的版本检查文件"
 
-#: src/amule.cpp:2012
+#: src/amule.cpp
 msgid "You are using an outdated version of aMule!"
 msgstr "您使用的是老版本的aMule！"
 
-#: src/amule.cpp:2014
+#: src/amule.cpp
 #, 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/amule.cpp:2015
+#: src/amule.cpp
 msgid "The latest version can always be found at https://github.com/amule-org/amule/releases/latest"
 msgstr "最新版本可从这里下载：https://github.com/amule-org/amule/releases/latest"
 
-#: src/amule.cpp:2017
+#: src/amule.cpp
 #, c-format
 msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr "警告：您的 aMuled 版本太旧：%i.%i.%i < %li.%li.%li"
 
-#: src/amule.cpp:2021
+#: src/amule.cpp
 msgid "Your copy of aMule is up to date."
 msgstr "您的aMule是最新版本。"
 
-#: src/amule.cpp:2028
+#: src/amule.cpp
 msgid "Failed to download the version check file"
 msgstr "下载版本检查文件失败"
 
-#: src/amule.cpp:2198 src/amule-remote-gui.cpp:822
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: %s | Files: %s"
 msgstr "用户：%s | 文件：%s"
 
-#: src/amule.cpp:2199 src/amule-remote-gui.cpp:823
+#: src/amule.cpp src/amule-remote-gui.cpp
 #, c-format
 msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr "用户：E：%s K：%s | 文件：E：%s K：%s"
 
-#: src/amule.cpp:2208 src/amule-remote-gui.cpp:832
+#: src/amule.cpp src/amule-remote-gui.cpp
 msgid "No networks selected"
 msgstr "没有选择网络"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with LowID"
 msgstr "是 Low ID"
 
-#: src/amule.cpp:2276 src/TextClient.cpp:806
+#: src/amule.cpp src/TextClient.cpp
 msgid "with HighID"
 msgstr "是 High ID"
 
-#: src/amule.cpp:2278
+#: src/amule.cpp
 #, c-format
 msgid "Connected to %s %s"
 msgstr "已连接到 %s %s"
 
-#: src/amule.cpp:2282
+#: src/amule.cpp
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在连接到 %s"
 
-#: src/amule.cpp:2284
+#: src/amule.cpp
 msgid "Disconnected from eD2k"
 msgstr "已从 eD2k 断开"
 
-#: src/amule.cpp:2292
+#: src/amule.cpp
 msgid "Kad started."
 msgstr "Kad 已启动。"
 
-#: src/amule.cpp:2294
+#: src/amule.cpp
 msgid "Kad stopped."
 msgstr "Kad 已停止。"
 
-#: src/amule.cpp:2302
+#: src/amule.cpp
 msgid "Connected to Kad (ok)"
 msgstr "已连接至 Kad (ok）"
 
-#: src/amule.cpp:2304
+#: src/amule.cpp
 msgid "Connected to Kad (firewalled)"
 msgstr "已连接至 Kad 网络 (有防火墙)"
 
-#: src/amule.cpp:2307
+#: src/amule.cpp
 msgid "Disconnected from Kad"
 msgstr "已断开 Kad 连接"
 
-#: src/amule.cpp:2339
+#: src/amule.cpp
 msgid "Kad network cannot be used if UDP port is disabled on preferences, not starting."
-msgstr "如果在设置中禁用了 UDP 端口，Kad 网络将不能使用，没有启动。"
+msgstr "如果在首选项中禁用了 UDP 端口，Kad 网络将不能使用，没有启动。"
 
-#: src/amule.cpp:2342
+#: src/amule.cpp
 msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kad 网络在设置中被禁用了，没有连接。"
+msgstr "Kad 网络在首选项中被禁用了，没有连接。"
 
-#: src/amuled.cpp:142
+#: src/amuled.cpp
 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:145
+#: src/amuled.cpp
 msgid "ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"
 msgstr "错误：如果需要使用外部连接，必须设置一个可用的密码，aMule daemon不能在没有启用外部连接的情况下使用。要运行aMule daemon，你必须设置~/.aMule/amule.conf文件中的\"ECPassword\"字段，使它有一个合适的值。执行amuled --ce-config来设置这个密码。更多信息请访问https://amule-org.github.io/docs"
 
-#: src/amuled.cpp:161
+#: src/amuled.cpp
 msgid "amuled: OnInit - starting timer"
 msgstr "amuled：正在初始化 - 启动计时器"
 
-#: src/amuled.cpp:176
-msgid "amuled: forking to background - see you"
-msgstr "amuled： 进入后台 - 再见"
-
-#: src/amuled.cpp:207
+#: src/amuled.cpp
 msgid "Cannot Create Pid File"
 msgstr "不能创建 Pid 文件"
 
-#: src/amuled.cpp:263
+#: src/amuled.cpp
 #, c-format
 msgid "ERROR: %s"
 msgstr "错误：%s"
 
-#: src/amuleDlg.cpp:266
+#: src/amuleDlg.cpp
 #, c-format
 msgid "This is aMule %s based on eMule."
 msgstr "这是基于 eMule 的 aMule %s。"
 
-#: src/amuleDlg.cpp:268
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Running on %s"
 msgstr "运行于 %s"
 
-#: src/amuleDlg.cpp:270
+#: src/amuleDlg.cpp
 msgid "Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available."
 msgstr "访问 https://github.com/amule-org/amule/releases/latest 来检查 是否有新版本。"
 
-#: src/amuleDlg.cpp:296
+#: src/amuleDlg.cpp
 msgid "FATAL ERROR: Failed to create Timer"
 msgstr "致命错误：创建计时器失败"
 
-#: src/amuleDlg.cpp:537
-msgid "aMule remote control "
-msgstr "aMule 远程控制 "
+#: src/amuleDlg.cpp
+msgid "Error! Unable to load Preferences"
+msgstr "错误！无法加载首选项"
 
-#: src/amuleDlg.cpp:543
-msgid "Snapshot:"
-msgstr "Snapshot:"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Networks"
+msgstr "网络"
 
-#: src/amuleDlg.cpp:545
-msgid ""
-"'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"基于 eMule 的“全平台” P2P客户端 \n"
-"\n"
+#: src/amuleDlg.cpp
+msgid "Searches"
+msgstr "搜索"
 
-#: src/amuleDlg.cpp:546
-msgid "Website: https://amule-org.github.io \n"
-msgstr "网站：https://amule-org.github.io \n"
+#: src/amuleDlg.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/Statistics.cpp
+msgid "Downloads"
+msgstr "下载"
 
-#: src/amuleDlg.cpp:547
-msgid "Forum: https://github.com/amule-org/amule/discussions \n"
-msgstr "论坛：https://github.com/amule-org/amule/discussions \n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Shared files"
+msgstr "共享文件"
 
-#: src/amuleDlg.cpp:548
-msgid "Documentation: https://amule-org.github.io/docs \n"
-msgstr "文档： https://amule-org.github.io/docs \n"
+#: src/amuleDlg.cpp src/ClientContextActions.cpp src/Statistics.cpp
+msgid "Clients"
+msgstr "用户"
 
-#: src/amuleDlg.cpp:549
-msgid ""
-"Issues: https://github.com/amule-org/amule/issues \n"
-"\n"
-msgstr ""
-"提交问题：https://github.com/amule-org/amule/issues \n"
-"\n"
+#: src/amuleDlg.cpp src/muuli_wdr.cpp
+msgid "Messages"
+msgstr "消息"
 
-#: src/amuleDlg.cpp:550
-msgid ""
-"Copyright (c) 2003-2026 aMule Team \n"
-"\n"
-msgstr ""
-"版权所有 (c) 2003-2026 aMule 团队 \n"
-"\n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/Statistics.cpp
+msgid "Statistics"
+msgstr "统计"
 
-#: src/amuleDlg.cpp:551
-msgid "Part of aMule is based on \n"
-msgstr "aMule 的一部分是基于 \n"
+#: src/amuleDlg.cpp src/PrefsUnifiedDlg.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Preferences"
+msgstr "首选项"
 
-#: src/amuleDlg.cpp:552
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: 基于异或算法的点对点路由。\n"
+#: src/amuleDlg.cpp
+msgid "Navigate"
+msgstr "导航"
 
-#: src/amuleDlg.cpp:553
-msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
-msgstr " 版权所有 (c) 2002-2011 Petar Maymounkov ( petar@maymounkov.org )\n"
+#: src/amuleDlg.cpp
+#, c-format
+msgid "Free space: %s"
+msgstr "剩余空间：%s"
 
-#: src/amuleDlg.cpp:554
-msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
-
-#: src/amuleDlg.cpp:557 src/KadDlg.cpp:193 src/PartFile.cpp:1032
-#: src/PrefsUnifiedDlg.cpp:856 src/PrefsUnifiedDlg.cpp:981
-#: src/PrefsUnifiedDlg.cpp:1164
-msgid "Message"
-msgstr "消息"
+#: src/amuleDlg.cpp
+msgid "New version available"
+msgstr "有新版"
+
+#: src/amuleDlg.cpp
+#, c-format
+msgid ""
+"A new version of aMule (%s) is available.\n"
+"\n"
+"You are running %s.\n"
+"\n"
+"Would you like to open the download page?"
+msgstr ""
+"有新版 aMule (%s) 可用。\n"
+"\n"
+"正在运行 %s.\n"
+"\n"
+"要打开下载页吗？"
 
-#: src/amuleDlg.cpp:594
+#: src/amuleDlg.cpp
 msgid "aMule dialog destroyed"
 msgstr "aMule 对话框损坏"
 
-#: src/amuleDlg.cpp:618 src/DataToText.cpp:59 src/IPFilter.cpp:544
+#: src/amuleDlg.cpp src/DataToText.cpp src/IPFilter.cpp src/ServerWnd.cpp
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/amuleDlg.cpp:782
+#: src/amuleDlg.cpp
 msgid "eD2k: Connecting"
 msgstr "eD2k: 正在连接"
 
-#: src/amuleDlg.cpp:786
+#: src/amuleDlg.cpp
 msgid "eD2k: Disconnected"
 msgstr "eD2k: 已断开"
 
-#: src/amuleDlg.cpp:792
+#: src/amuleDlg.cpp
 msgid "Kad: Firewalled"
 msgstr "Kad: 通过防火墙"
 
-#: src/amuleDlg.cpp:796
+#: src/amuleDlg.cpp
 msgid "Kad: Connected"
 msgstr "Kad: 已连接"
 
-#: src/amuleDlg.cpp:801
+#: src/amuleDlg.cpp
 msgid "Kad: Connecting"
 msgstr "Kad: 正在连接"
 
-#: src/amuleDlg.cpp:805
+#: src/amuleDlg.cpp
 msgid "Kad: Off"
 msgstr "Kad: 关闭"
 
-#: src/amuleDlg.cpp:852 src/DownloadListCtrl.cpp:415
-#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:185
-#: src/muuli_wdr.cpp:681 src/muuli_wdr.cpp:732 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:846 src/muuli_wdr.cpp:1968 src/muuli_wdr.cpp:2050
-#: src/muuli_wdr.cpp:2773 src/ServerListCtrl.cpp:160 src/ServerListCtrl.cpp:534
-#: src/ServerListCtrl.cpp:553 src/TransferWnd.cpp:375
-#: src/utils/wxCas/src/wxcasprefs.cpp:266
-msgid "Cancel"
-msgstr "取消"
-
-#: src/amuleDlg.cpp:853
-msgid "Stop the current connection attempts"
-msgstr "终止本次连接尝试"
-
-#: src/amuleDlg.cpp:858 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:977
-#: src/muuli_wdr.cpp:2172
-msgid "Disconnect"
-msgstr "断开连接"
+#: src/amuleDlg.cpp
+msgid "Core"
+msgstr "核心"
+
+#: src/amuleDlg.cpp src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/ServerListCtrl.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp src/Statistics.cpp
+msgid "Version"
+msgstr "版本"
 
-#: src/amuleDlg.cpp:859
-msgid "Disconnect from the currently connected networks"
-msgstr "从当前已连接的网络断开"
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are different versions."
+msgstr "核心和 aMule 图形用户界面是不同的版本。"
+
+#: src/amuleDlg.cpp
+msgid "The core and aMuleGUI are the same version."
+msgstr "核心和 aMule 图形用户界面是同一版本。"
 
-#: src/amuleDlg.cpp:864 src/MuleTrayIcon.cpp:465 src/MuleTrayIcon.cpp:980
-#: src/muuli_wdr.cpp:2321 src/muuli_wdr.cpp:2770 src/muuli_wdr.cpp:3102
-msgid "Connect"
-msgstr "连接"
+#: src/amuleDlg.cpp src/ServerListCtrl.cpp
+msgid "Address"
+msgstr "地址"
 
-#: src/amuleDlg.cpp:865
-msgid "Connect to the currently enabled networks"
-msgstr "连接至当前已启用的网络"
+#: src/amuleDlg.cpp
+msgid "Encryption"
+msgstr "加密"
+
+#: src/amuleDlg.cpp
+msgid "aMuleGUI"
+msgstr "aMule 图形用户界面"
 
-#: src/amuleDlg.cpp:943
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"
 msgstr "上传: %.1f%s（%.1f） | 下载: %.1f%s（%.1f）"
 
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-msgid " MB/s"
-msgstr " MB/s"
-
-#: src/amuleDlg.cpp:944 src/amuleDlg.cpp:945 src/amuleDlg.cpp:948
-#: src/amuleDlg.cpp:949 src/amuleDlg.cpp:960 src/amuleDlg.cpp:961
-#: src/MuleTrayIcon.cpp:798 src/MuleTrayIcon.cpp:801
-#: src/utils/wxCas/src/wxcasframe.cpp:1110
-msgid " kB/s"
-msgstr " kB/s"
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp
+msgid " MiB/s"
+msgstr " MiB/s"
+
+#: src/amuleDlg.cpp src/MuleTrayIcon.cpp src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s"
+msgstr " KiB/s"
 
-#: src/amuleDlg.cpp:947
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Up: %.1f%s | Down: %.1f%s"
 msgstr "上传: %.1f%s | 下载: %.1f%s"
 
-#: src/amuleDlg.cpp:977
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Connected)"
 msgstr "aMule（%s | 已连接）"
 
-#: src/amuleDlg.cpp:979
+#: src/amuleDlg.cpp
 #, c-format
 msgid "aMule (%s | Disconnected)"
 msgstr "aMule（%s | 已断开）"
 
-#: src/amuleDlg.cpp:1027
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Do you really want to exit %s?"
 msgstr "您确定要退出 %s 吗？"
 
-#: src/amuleDlg.cpp:1028
+#: src/amuleDlg.cpp
 msgid "Exit confirmation"
 msgstr "退出确认"
 
-#: src/amuleDlg.cpp:1346
+#: src/amuleDlg.cpp
 msgid "Launch Command: "
 msgstr "运行命令: "
 
-#: src/amuleDlg.cpp:1366 src/muuli_wdr.cpp:1773 src/Preferences.cpp:911
+#: src/amuleDlg.cpp src/muuli_wdr.cpp src/Preferences.cpp
 msgid "- default -"
 msgstr "- 默认 -"
 
-#: src/amuleDlg.cpp:1396
+#: src/amuleDlg.cpp
 #, c-format
 msgid "Skin directory '%s' does not exist"
 msgstr "皮肤目录 %s 不存在"
 
-#: src/amuleDlg.cpp:1401
+#: src/amuleDlg.cpp
 #, c-format
 msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr "警告：无法打开皮肤文件 %s 进行读取"
 
-#: src/amuleDlg.cpp:1500 src/amuleDlg.cpp:1683 src/muuli_wdr.cpp:1402
-#: src/muuli_wdr.cpp:3104
-msgid "Networks"
-msgstr "网络"
-
-#: src/amuleDlg.cpp:1500 src/muuli_wdr.cpp:3104
+#: src/amuleDlg.cpp
 msgid "Networks Window"
 msgstr "网络窗口"
 
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
-msgid "Searches"
-msgstr "搜索"
-
-#: src/amuleDlg.cpp:1501 src/muuli_wdr.cpp:3105
+#: src/amuleDlg.cpp
 msgid "Searches Window"
 msgstr "搜索窗口"
 
-#: src/amuleDlg.cpp:1502 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:379
-#: src/muuli_wdr.cpp:1504 src/muuli_wdr.cpp:3106 src/Statistics.cpp:817
-msgid "Downloads"
-msgstr "下载"
-
-#: src/amuleDlg.cpp:1502 src/muuli_wdr.cpp:3106
+#: src/amuleDlg.cpp
 msgid "Downloads Window"
 msgstr "下载窗口"
 
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:2997
-msgid "Shared files"
-msgstr "共享文件"
-
-#: src/amuleDlg.cpp:1503 src/muuli_wdr.cpp:3108
+#: src/amuleDlg.cpp
 msgid "Shared Files Window"
 msgstr "共享文件窗口"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:2637 src/muuli_wdr.cpp:3062
-#: src/muuli_wdr.cpp:3109
-msgid "Messages"
-msgstr "消息"
+#: src/amuleDlg.cpp
+msgid "Clients Window"
+msgstr "客户端窗口"
 
-#: src/amuleDlg.cpp:1504 src/muuli_wdr.cpp:3109
+#: src/amuleDlg.cpp
 msgid "Messages Window"
 msgstr "消息窗口"
 
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110 src/PrefsUnifiedDlg.cpp:210
-#: src/Statistics.cpp:787 src/Statistics.cpp:1093
-msgid "Statistics"
-msgstr "统计"
-
-#: src/amuleDlg.cpp:1505 src/muuli_wdr.cpp:3110
+#: src/amuleDlg.cpp
 msgid "Statistics Graph Window"
 msgstr "统计图窗口"
 
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112 src/PrefsUnifiedDlg.cpp:225
-#: src/utils/wxCas/src/wxcasprefs.cpp:41
-msgid "Preferences"
-msgstr "设置"
-
-#: src/amuleDlg.cpp:1507 src/muuli_wdr.cpp:3112
+#: src/amuleDlg.cpp
 msgid "Preferences Settings Window"
 msgstr "设置窗口"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "Import"
 msgstr "导入"
 
-#: src/amuleDlg.cpp:1509 src/muuli_wdr.cpp:3113
+#: src/amuleDlg.cpp
 msgid "The partfile importer tool"
 msgstr "part 文件导入工具"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
+#: src/amuleDlg.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About"
 msgstr "关于"
 
-#: src/amuleDlg.cpp:1511 src/muuli_wdr.cpp:3114
+#: src/amuleDlg.cpp
 msgid "About/Help"
 msgstr "关于/帮助"
 
-#: src/amuleDlg.cpp:1687
+#: src/amuleDlg.cpp
 msgid "eD2k network"
 msgstr "eD2k 网络"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "Kad network"
 msgstr "Kad 网络"
 
-#: src/amuleDlg.cpp:1691
+#: src/amuleDlg.cpp
 msgid "No network"
 msgstr "无网络"
 
-#: src/amule-gui.cpp:219
+#: src/amule-gui.cpp
 msgid "aMule remote control"
 msgstr "aMule 远程控制"
 
-#: src/amule-gui.cpp:221 src/utils/wxCas/src/wxcasframe.cpp:111
+#: src/amule-gui.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule"
 msgstr "aMule"
 
-#: src/amule-gui.cpp:357
+#: src/amule-gui.cpp
 msgid "Fatal Error: Failed to create Core Timer"
 msgstr "严重错误：无法创建核心计时器"
 
-#: src/amule-remote-gui.cpp:79
+#: src/amule-remote-gui.cpp
 msgid "Connect to remote amule"
 msgstr "连接到远程 amule"
 
-#: src/amule-remote-gui.cpp:370
+#: src/amule-remote-gui.cpp src/ServerConnect.cpp
+msgid "Connection lost"
+msgstr "连接已断"
+
+#: src/amule-remote-gui.cpp
+msgid "Abort and exit"
+msgstr "终止并退出"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnecting... (attempt %d)"
+msgstr "正在重连…（第 %d 次尝试）"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Next attempt in %d s..."
+msgstr "%d 秒后进行下一次重试…"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid ""
+"Connection to %s lost.\n"
+"%s\n"
+"\n"
+"The interface is paused until the connection is restored."
+msgstr ""
+"到 %s 的连接丢失。\n"
+"%s\n"
+"\n"
+"连接恢复前将暂停该接口。"
+
+#: src/amule-remote-gui.cpp
 msgid "Fatal Error: Failed to create Poll Timer"
 msgstr "严重错误：无法建立轮询计时器"
 
-#: src/amule-remote-gui.cpp:393
+#: src/amule-remote-gui.cpp
 msgid "Going to event loop..."
 msgstr "准备事件循环..."
 
-#: src/amule-remote-gui.cpp:450
+#: src/amule-remote-gui.cpp
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: src/amule-remote-gui.cpp:480
+#: src/amule-remote-gui.cpp
 msgid "Connection failed. Please check the host, port, and password."
 msgstr "连接失败。请检查主机、端口和密码。"
 
-#: src/amule-remote-gui.cpp:517
+#: src/amule-remote-gui.cpp
 msgid "Remote GUI EC event handler"
 msgstr "远程 GUI 外部连接事件处理程序"
 
-#: src/amule-remote-gui.cpp:532 src/ExternalConnector.cpp:463
+#: src/amule-remote-gui.cpp src/ExternalConnector.cpp
 #, c-format
 msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr "连接失败。不能连接到 %s:%d\n"
 
-#: src/amule-remote-gui.cpp:536 src/amule-remote-gui.cpp:545
+#: src/amule-remote-gui.cpp
 msgid "Going down"
 msgstr "下降"
 
-#: src/amule-remote-gui.cpp:546
-msgid "Connection closed - aMule has terminated probably."
-msgstr "连接关闭 - aMule 可能已经终止运行。"
+#: src/amule-remote-gui.cpp
+msgid "Reconnect attempt timed out; retrying."
+msgstr "重连尝试超时；重试中。"
 
-#: src/amule-remote-gui.cpp:562
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid ""
 "Connection timed out. Unable to reach %s:%d within the allotted time.\n"
@@ -813,1060 +1025,1360 @@
 "连接超时。无法在指定时间内连接到 %s:%d。\n"
 "请检查主机、端口，并确保 aMule 正在运行且已启用外部连接。"
 
-#: src/amule-remote-gui.cpp:657
+#: src/amule-remote-gui.cpp
+msgid "Connection to the remote core was lost. Trying to reconnect..."
+msgstr "到远程核心的连接丢失。正尝试重新连接…"
+
+#: src/amule-remote-gui.cpp src/ClientDetailDialog.cpp
+msgid "Disabled"
+msgstr "已禁用"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnected to the remote core."
+msgstr "已重新连接到远程核心。"
+
+#: src/amule-remote-gui.cpp
+msgid "The remote core was restarted; reloading."
+msgstr "远程核心被重启；重新加载中。"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Reconnect attempt %d: connecting to %s:%d"
+msgstr "重新连接尝试 %d：正在连接到 %s:%d"
+
+#: src/amule-remote-gui.cpp
+msgid "Reconnect could not start; retrying shortly."
+msgstr "重新连接无法开始；即将重试。"
+
+#: src/amule-remote-gui.cpp
 msgid "Ready"
-msgstr "准备"
+msgstr "就绪"
 
-#: src/amule-remote-gui.cpp:888 src/TransferWnd.cpp:340
+#: src/amule-remote-gui.cpp src/TransferWnd.cpp
 msgid "All"
 msgstr "全部"
 
-#: src/amule-remote-gui.cpp:943 src/ExternalConn.cpp:1828
+#: src/amule-remote-gui.cpp
+msgid "not readable"
+msgstr "不可读"
+
+#: src/amule-remote-gui.cpp
+msgid "not found"
+msgstr "未找到"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The core rejected these shared folders:%s"
+msgstr "核心拒绝了这些共享的文件夹：%s"
+
+#: src/amule-remote-gui.cpp src/ExternalConn.cpp
 msgid "Invalid link or already on list."
 msgstr "非法链接或已经存在列表中。"
 
-#: src/amule-remote-gui.cpp:973
+#: src/amule-remote-gui.cpp
+msgid "The daemon refused the request."
+msgstr "守护进程拒绝了请求。"
+
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "Could not delete the category: %s"
+msgstr "无法删除分类：%s"
+
+#: src/amule-remote-gui.cpp
 #, c-format
 msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr "无法创建 “%s” 目录用于 “%s” 分类，保留 “%s” 目录。"
 
-#: src/amule-remote-gui.cpp:1797 src/BaseClient.cpp:1772
-#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2603
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:86
-#: src/ClientDetailDialog.cpp:119 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:130 src/DataToText.cpp:52 src/DataToText.cpp:68
-#: src/DataToText.cpp:78 src/DataToText.cpp:114 src/DataToText.cpp:135
-#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1100
-#: src/DownloadListCtrl.cpp:1111 src/ExternalConn.cpp:543
-#: src/FileDetailDialog.cpp:183 src/GenericClientListCtrl.cpp:1109
-#: src/GenericClientListCtrl.cpp:1120 src/GenericClientListCtrl.cpp:1130
-#: src/HTTPDownload.cpp:87 src/KnownFile.cpp:986 src/KnownFile.cpp:992
-#: src/MuleTrayIcon.cpp:410 src/MuleTrayIcon.cpp:846 src/PartFile.cpp:2765
-#: src/PartFile.cpp:2771 src/Server.cpp:133 src/Server.cpp:211
-#: src/Statistics.cpp:1032
+#: src/amule-remote-gui.cpp
+#, c-format
+msgid "The remote core sent inconsistent data for \"%s\" (part status %d, expected %d). The file list may be showing the wrong information; reconnect to clear it."
+msgstr "远程核心发送了不一致的 \"%s\" 数据（part 状态 %d，预期 %d）。 文件列表可能显示错误信息；重连清除它。"
+
+#: src/amule-remote-gui.cpp src/BaseClient.cpp src/ClientDetailDialog.cpp
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/ExternalConn.cpp
+#: src/FileDetailDialog.cpp src/GenericClientListCtrl.cpp src/HTTPDownload.cpp
+#: src/KnownFile.cpp src/MuleTrayIcon.cpp src/PartFile.cpp
+#: src/ServerListCtrl.cpp src/Statistics.cpp
 msgid "Unknown"
 msgstr "未知"
 
-#: src/BaseClient.cpp:1363
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "无法获取用户 %s 的共享文件"
-
-#: src/BaseClient.cpp:1575
+#: src/BaseClient.cpp
 msgid "Searching buddy for lowid connection"
 msgstr "正在搜索好友进行 Low ID 连接"
 
-#: src/BaseClient.cpp:1789
+#: src/BaseClient.cpp
 #, c-format
 msgid " (Fake eMule version %#x)"
 msgstr " (假冒 eMule 版本 %#x)"
 
-#: src/BaseClient.cpp:1800
+#: src/BaseClient.cpp
 msgid " (Fake eMule)"
 msgstr " (假冒 eMule)"
 
-#: src/BaseClient.cpp:1802
+#: src/BaseClient.cpp
 msgid "xMule (Fake eMule)"
 msgstr "xMule (假冒 eMule)"
 
-#: src/BaseClient.cpp:1841
+#: src/BaseClient.cpp
 #, c-format
 msgid "1.x (based on eMule v0.%u)"
 msgstr "1.x (基于 eMule v0.%u)"
 
-#: src/BaseClient.cpp:2014
+#: src/BaseClient.cpp
 #, c-format
 msgid "NickName: %s ID: %u"
 msgstr "昵称：%s ID：%u"
 
-#: src/BaseClient.cpp:2016
+#: src/BaseClient.cpp
 #, c-format
 msgid "Requested: %s\n"
 msgstr "已请求： %s\n"
 
-#: src/BaseClient.cpp:2018
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "本次会话运行文件统计：接受了 %d 个请求（总请求数 %d），已传输 %s\n"
 msgstr1 "本次会话运行文件统计：接受了 %d 个请求（总请求数 %d），已传输 %s\n"
 
-#: src/BaseClient.cpp:2021
+#: src/BaseClient.cpp
 #, 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"
 msgstr0 "所有会话文件统计：接受了 %d 个请求（总请求数 %d），已传输 %s\n"
 msgstr1 "所有会话文件统计：接受了 %d 个请求（总请求数 %d），已传输 %s\n"
 
-#: src/BaseClient.cpp:2024
+#: src/BaseClient.cpp
 msgid "Requested unknown file"
 msgstr "请求了未知文件"
 
-#: src/BaseClient.cpp:2681
+#: src/BaseClient.cpp
 #, c-format
 msgid "Message filtered from '%s' (IP:%s)"
 msgstr "来自 %s（IP：%s）的消息被过滤掉了"
 
-#: src/BaseClient.cpp:2788
+#: src/BaseClient.cpp
 #, c-format
 msgid "New message from '%s' (IP:%s)"
 msgstr "新消息来自于 %s（IP：%s）"
 
-#: src/BaseClient.cpp:2880
+#: src/BaseClient.cpp
 #, c-format
 msgid "User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored"
 msgstr "用户 %s（%u）请求目录 %s 的共享文件列表 -> 已忽略"
 
-#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:112
+#: src/BrowseManager.cpp
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "无法获取用户 %s 的共享文件"
+
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "WARNING: %s cannot be opened."
 msgstr "警告：%s 文件无法打开。"
 
-#: src/CanceledFileList.cpp:61
+#: src/CanceledFileList.cpp
 msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr "警告：已取消文件列表损坏，包含有非法头部。"
 
-#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:158
+#: src/CanceledFileList.cpp src/KnownFileList.cpp src/SearchList.cpp
 #, c-format
 msgid "IO error while reading %s file: %s"
 msgstr "读取 %s 文件时发生 IO 错误：%s"
 
-#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:244
+#: src/CanceledFileList.cpp src/KnownFileList.cpp
 #, c-format
 msgid "Error while saving %s file: %s"
 msgstr "保存 %s 文件时发生错误：%s"
 
-#: src/CaptchaDialog.cpp:44
+#: src/CaptchaDialog.cpp
 msgid "Enter Captcha"
 msgstr "输入验证码"
 
-#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:240
-#: src/SearchListCtrl.cpp:702 src/TransferWnd.cpp:335
+#: src/CatDialog.cpp src/DownloadListCtrl.cpp src/SearchListCtrl.cpp
+#: src/TransferWnd.cpp
 msgid "Category"
 msgstr "分类"
 
-#: src/CatDialog.cpp:87
+#: src/CatDialog.cpp
 msgid "New Category"
 msgstr "新分类"
 
-#: src/CatDialog.cpp:125
+#: src/CatDialog.cpp
 msgid "Choose a folder for incoming files"
 msgstr "请选择下载文件夹"
 
-#: src/CatDialog.cpp:140
+#: src/CatDialog.cpp
 msgid "You must specify a name for the category!"
 msgstr "必须定义分类名称！"
 
-#: src/CatDialog.cpp:150
+#: src/CatDialog.cpp
 msgid "You must specify a path for the category!"
 msgstr "必须定义分类路径！"
 
-#: src/CatDialog.cpp:162
+#: src/CatDialog.cpp
 msgid "Failed to create incoming dir for category. Please specify a valid path!"
 msgstr "无法建立该分类的接收文件夹，请给出一个有效的分类路径！"
 
-#: src/ChatSelector.cpp:129
+#: src/ChatSelector.cpp
 #, c-format
 msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr "聊天已开始：%s（%s：%u）- %s %s"
 
-#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+#: src/ChatSelector.cpp
 msgid "*** Connected to Client ***"
 msgstr "*** 已连接到用户 ***"
 
-#: src/ChatSelector.cpp:251
+#: src/ChatSelector.cpp
 msgid "*** Connecting to Client ***"
 msgstr "*** 正在连接用户 ***"
 
-#: src/ChatSelector.cpp:282
+#: src/ChatSelector.cpp
 msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr "*** 无法连接用户/连接丢失 ***"
 
-#: src/ChatSelector.cpp:335
+#: src/ChatSelector.cpp
 msgid "*** You have passed the captcha check and the user has received your message. ***"
 msgstr "*** 您已经通过了 captcha 检测，用户已经接收到你的信息了。***"
 
-#: src/ChatSelector.cpp:336
+#: src/ChatSelector.cpp
 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 信息，您的信息已经被忽略。您可以通过重新发送一条信息来再一次请求一个captcha验证。***"
 
-#: src/ChatWnd.cpp:98
+#: src/ChatWnd.cpp
 msgid "Chat"
 msgstr "聊天"
 
-#: src/ChatWnd.cpp:100 src/MuleNotebook.cpp:182
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close tab"
 msgstr "关闭分页"
 
-#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:183
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close all tabs"
 msgstr "关闭所有分页"
 
-#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:184
+#: src/ChatWnd.cpp src/MuleNotebook.cpp
 msgid "Close other tabs"
 msgstr "关闭其它分页"
 
-#: src/ChatWnd.cpp:106 src/GenericClientListCtrl.cpp:631
+#: src/ChatWnd.cpp src/ClientContextActions.cpp
 msgid "Add to Friends"
 msgstr "加为好友"
 
-#: src/ClientCreditsList.cpp:158
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Show &Details"
+msgstr "查看详细信息 (&D)"
+
+#: src/ClientContextActions.cpp
+msgid "Remove from friends"
+msgstr "从好友中删除"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Establish Friend Slot"
+msgstr "建立好友通道"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "View Files"
+msgstr "查看共享文件"
+
+#: src/ClientContextActions.cpp
+msgid "Send message"
+msgstr "发送消息"
+
+#: src/ClientContextActions.cpp
+msgid "Send message to user"
+msgstr "发送消息给用户"
+
+#: src/ClientContextActions.cpp
+msgid "Message to send:"
+msgstr "发送消息："
+
+#: src/ClientContextActions.cpp
+msgid ""
+"You are not allowed to set more than one friend slot.\n"
+" Only one slot was assigned."
+msgstr ""
+"不允许设置超过一个好友通道。\n"
+" 只分配了一个通道。"
+
+#: src/ClientContextActions.cpp src/FriendListCtrl.cpp
+msgid "Multiple selection"
+msgstr "多选"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Add %u client to your friend list?"
+msgid_plural "Add %u clients to your friend list?"
+msgstr0 "添加 %u 个客户端到好友列表？"
+msgstr1 "添加 %u 个客户端到好友列表？"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Remove %u client from your friend list?"
+msgid_plural "Remove %u clients from your friend list?"
+msgstr0 "要从你的好友列表中删除 %u 个客户端吗？"
+msgstr1 "要从你的好友列表中删除 %u 个客户端吗？"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Could not add %u selected client to your friend list: no address is known for it."
+msgid_plural "Could not add %u selected clients to your friend list: no address is known for them."
+msgstr0 "无法添加 %u 个选中客户端到好友列表：不知道它们的地址。"
+msgstr1 "无法添加 %u 个选中客户端到好友列表：不知道它们的地址。"
+
+#: src/ClientContextActions.cpp
+#, c-format
+msgid "Request the shared files of %u client?"
+msgid_plural "Request the shared files of %u clients?"
+msgstr0 "请求 %u 个客户端的共享文件吗？"
+msgstr1 "请求 %u 个客户端的共享文件吗？"
+
+#: src/ClientContextActions.cpp
+msgid "A connection is opened to each of them."
+msgstr "对它们中的每个打开了一个连接。"
+
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid "Creditfile loaded, %u client is known"
 msgid_plural "Creditfile loaded, %u clients are known"
 msgstr0 "积分文件已载入，%u 个已知用户"
 msgstr1 "积分文件已载入，%u个已知用户"
 
-#: src/ClientCreditsList.cpp:161
+#: src/ClientCreditsList.cpp
 #, c-format
 msgid " - Credits expired for %u client!"
 msgid_plural " - Credits expired for %u clients!"
 msgstr0 " - %u 个客户端的积分已过期！"
 msgstr1 " - %u 个客户端的积分已过期！"
 
-#: src/ClientCreditsList.cpp:305
+#: src/ClientCreditsList.cpp
 msgid "No 'cryptkey.dat' file found, creating."
 msgstr "文件 'crytkey.dat' 未找到，正在创建。"
 
-#: src/ClientDetailDialog.cpp:49
+#: src/ClientDetailDialog.cpp
 msgid "Client Details"
 msgstr "客户端详细信息"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:256
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "LowID"
 msgstr "Low ID"
 
-#: src/ClientDetailDialog.cpp:105 src/ServerWnd.cpp:201
-#: src/utils/wxCas/src/onlinesig.cpp:254
+#: src/ClientDetailDialog.cpp src/ServerWnd.cpp
+#: src/utils/wxCas/src/onlinesig.cpp
 msgid "HighID"
 msgstr "High ID"
 
-#: src/ClientDetailDialog.cpp:126
+#: src/ClientDetailDialog.cpp
 msgid "Enabled"
 msgstr "已启用"
 
-#: src/ClientDetailDialog.cpp:127
+#: src/ClientDetailDialog.cpp
 msgid "Supported"
 msgstr "已支持"
 
-#: src/ClientDetailDialog.cpp:128 src/ClientRef.cpp:192
+#: src/ClientDetailDialog.cpp src/ClientRef.cpp
 msgid "Not supported"
 msgstr "不支持"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Disabled"
-msgstr "已禁用"
-
-#: src/ClientDetailDialog.cpp:136 src/MuleTrayIcon.cpp:384
-#: src/ServerWnd.cpp:185 src/ServerWnd.cpp:227 src/TextClient.cpp:816
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
+#: src/TextClient.cpp
 msgid "Connected"
 msgstr "已连接"
 
-#: src/ClientDetailDialog.cpp:138 src/MuleTrayIcon.cpp:373
-#: src/MuleTrayIcon.cpp:386 src/ServerWnd.cpp:227
+#: src/ClientDetailDialog.cpp src/MuleTrayIcon.cpp src/ServerWnd.cpp
 msgid "Disconnected"
 msgstr "断开连接"
 
-#: src/ClientDetailDialog.cpp:160 src/ClientDetailDialog.cpp:164
-#: src/DownloadListCtrl.cpp:967 src/GenericClientListCtrl.cpp:926
-#: src/GenericClientListCtrl.cpp:937
+#: src/ClientDetailDialog.cpp src/DownloadListCtrl.cpp
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "%.1f KiB/s"
+msgstr "%.1f KiB/s"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "Name"
+msgstr "名称"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Software"
+msgstr "软件"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "IP Address"
+msgstr "IP 地址"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Origin"
+msgstr "来源"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "First seen"
+msgstr "首次看到"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Last seen"
+msgstr "上次看到"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Sessions"
+msgstr "会话"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Upload Speed"
+msgstr "上传速度"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Download Speed"
+msgstr "下载速度"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Uploaded"
+msgstr "总上传"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp
+msgid "Total Downloaded"
+msgstr "总下载"
+
+#: src/ClientHistoryListCtrl.cpp src/ClientsListCtrl.cpp src/muuli_wdr.cpp
+msgid "DL/UP modifier"
+msgstr "下载/上传比率"
+
+#: src/ClientHistoryListCtrl.cpp
+msgid "Online now"
+msgstr "当前在线"
 
-#: src/ClientRef.cpp:196
+#: src/ClientRef.cpp
 msgid "Not complete"
 msgstr "未完成"
 
-#: src/ClientRef.cpp:198
+#: src/ClientRef.cpp
 msgid "Bad Guy"
 msgstr "坏蛋"
 
-#: src/ClientRef.cpp:200
+#: src/ClientRef.cpp
 msgid "Verified - OK"
 msgstr "验证 - 通过"
 
-#: src/ClientRef.cpp:203
+#: src/ClientRef.cpp src/muuli_wdr.cpp
+msgid "N/A"
+msgstr "N/A"
+
+#: src/ClientRef.cpp
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/ClientTCPSocket.cpp:778
+#: src/ClientRowListCtrl.cpp
+#, c-format
+msgid "Could not ask %u selected client for its shared files."
+msgid_plural "Could not ask %u selected clients for their shared files."
+msgstr0 "无法请求 %u 个所选客户端的共享文件。"
+msgstr1 "无法请求 %u 个所选客户端的共享文件。"
+
+#: src/ClientsListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
+msgid "Files"
+msgstr "文件"
+
+#: src/ClientsListCtrl.cpp src/KnownFile.cpp src/SharedFilePeersListCtrl.cpp
+#: src/SourceListCtrl.cpp
+msgid "Uploaded"
+msgstr "已上传"
+
+#: src/ClientsListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "Downloaded"
+msgstr "已下载"
+
+#: src/ClientsWnd.cpp
+msgid "Downloading from"
+msgstr "当前下载源"
+
+#: src/ClientsWnd.cpp
+msgid "Uploading to"
+msgstr "正在上传到"
+
+#: src/ClientsWnd.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Active"
+msgstr "活动"
+
+#: src/ClientsWnd.cpp
+msgid "Known"
+msgstr "已知"
+
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr "用户 %s (%u) 请求您的共享文件列表 -> 已接受"
 
-#: src/ClientTCPSocket.cpp:799
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr "用户 %s (%u) 请求您的共享文件列表 -> 已拒绝"
 
-#: src/ClientTCPSocket.cpp:831
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr "用户 %s (%u) 请求了您的共享文件夹列表 -> 已接受"
 
-#: src/ClientTCPSocket.cpp:837
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr "用户 %s（%u）请求了您的共享文件夹列表 -> 已拒绝"
 
-#: src/ClientTCPSocket.cpp:862
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr "用户 %s (%u) 请求目录“%s”的共享文件列表 -> 已接受"
 
-#: src/ClientTCPSocket.cpp:875
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr "用户 %s (%u) 请求目录“%s”的共享文件列表 -> 已拒绝"
 
-#: src/ClientTCPSocket.cpp:894
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) shares directory '%s'"
 msgstr "用户 %s (%u) 共享了目录“%s”"
 
-#: src/ClientTCPSocket.cpp:917
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unrequested shared dirs."
 msgstr "用户 %s（%u）发送了未经请求的共享目录。"
 
-#: src/ClientTCPSocket.cpp:932
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr "用户 %s (%u) 发送了目录“%s”的共享文件列表"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr "用户 %s (%u) 完成了共享文件列表的发送"
 
-#: src/ClientTCPSocket.cpp:944
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr "用户 %s (%u) 发送了未经请求的共享文件列表"
 
-#: src/ClientTCPSocket.cpp:956
+#: src/ClientTCPSocket.cpp
 #, c-format
 msgid "User %s (%u) denied access to shared directories/files list"
 msgstr "用户 %s (%u) 拒绝了目录/文件列表的访问"
 
-#: src/CommentDialog.cpp:53 src/CommentDialogLst.cpp:61
+#: src/CommentDialog.cpp src/CommentDialogLst.cpp
 msgid "File Comments"
 msgstr "文件评论"
 
-#: src/CommentDialogLst.cpp:69 src/FriendListCtrl.cpp:64
+#: src/CommentDialogLst.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Username"
 msgstr "用户名"
 
-#: src/CommentDialogLst.cpp:70 src/DownloadListCtrl.cpp:159
-#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:94
-#: src/SharedFilesCtrl.cpp:103
+#: src/CommentDialogLst.cpp src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp
+#: src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File Name"
 msgstr "文件名"
 
-#: src/CommentDialogLst.cpp:71
+#: src/CommentDialogLst.cpp src/SearchListCtrl.cpp
 msgid "Rating"
 msgstr "评价"
 
-#: src/CommentDialogLst.cpp:72
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "Comment"
 msgstr "评论"
 
-#: src/CommentDialogLst.cpp:131 src/muuli_wdr.cpp:756
+#: src/CommentDialogLst.cpp
+msgid "Could not start a Kad search"
+msgstr "无法启动 Kad 搜索"
+
+#: src/CommentDialogLst.cpp src/SearchList.cpp
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad搜索不能使用，因为Kad没有连接"
+
+#: src/CommentDialogLst.cpp
+msgid "Searching Kad for comments..."
+msgstr "正在搜索 Kad 获取评论…"
+
+#: src/CommentDialogLst.cpp src/muuli_wdr.cpp
 msgid "No comments"
 msgstr "没有评论"
 
-#: src/CommentDialogLst.cpp:133
+#: src/CommentDialogLst.cpp
 #, c-format
 msgid "%u comment"
 msgid_plural "%u comments"
 msgstr0 "%u 条评论"
 msgstr1 "%u 条评论"
 
-#: src/CorruptionBlackBox.cpp:227
+#: src/CorruptionBlackBox.cpp
 #, c-format
 msgid "Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr "封禁了客户端 %s，发送了 %s 受损的数据，共发送 %s （文件 “%s”）"
 
-#: src/DataToText.cpp:35
+#: src/CountryFlags.cpp
+#, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "加载 \"%s\" 的地区数据失败。"
+
+#: src/DataToText.cpp
 msgid "Auto Lo"
 msgstr "自动 低"
 
-#: src/DataToText.cpp:36
+#: src/DataToText.cpp
 msgid "Auto No"
 msgstr "自动 普通"
 
-#: src/DataToText.cpp:37
+#: src/DataToText.cpp
 msgid "Auto Hi"
 msgstr "自动 高"
 
-#: src/DataToText.cpp:41 src/SharedFilesCtrl.cpp:138
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very low"
 msgstr "极低"
 
-#: src/DataToText.cpp:42 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2019
-#: src/ServerListCtrl.cpp:242 src/ServerListCtrl.cpp:405
-#: src/SharedFilesCtrl.cpp:139
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Low"
 msgstr "低"
 
-#: src/DataToText.cpp:43 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2020
-#: src/ServerListCtrl.cpp:243 src/ServerListCtrl.cpp:406
-#: src/SharedFilesCtrl.cpp:140
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Normal"
 msgstr "普通"
 
-#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2021
-#: src/ServerListCtrl.cpp:244 src/ServerListCtrl.cpp:407
-#: src/SharedFilesCtrl.cpp:141
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "High"
 msgstr "高"
 
-#: src/DataToText.cpp:45 src/SharedFilesCtrl.cpp:142
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Very High"
 msgstr "极高"
 
-#: src/DataToText.cpp:46 src/SharedFilesCtrl.cpp:143
+#: src/DataToText.cpp src/SharedFilesCtrl.cpp
 msgid "Release"
 msgstr "发布"
 
-#: src/DataToText.cpp:60
+#: src/DataToText.cpp
 msgid "Asking"
 msgstr "正在询问"
 
-#: src/DataToText.cpp:61
+#: src/DataToText.cpp
 msgid "Connecting via server"
 msgstr "通过服务器连接中"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1036
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp
 msgid "Queue Full"
 msgstr "队列已满"
 
-#: src/DataToText.cpp:62 src/GenericClientListCtrl.cpp:1056
-#: src/KnownFile.cpp:1699
+#: src/DataToText.cpp src/GenericClientListCtrl.cpp src/KnownFile.cpp
+#: src/muuli_wdr.cpp
 msgid "On Queue"
 msgstr "正在排队"
 
-#: src/DataToText.cpp:63 src/libs/ec/cpp/ECSpecialTags.cpp:53
-#: src/OtherFunctions.cpp:689 src/PartFile.cpp:4282 src/TransferWnd.cpp:348
+#: src/DataToText.cpp src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp
+#: src/PartFile.cpp src/TransferWnd.cpp
 msgid "Downloading"
 msgstr "正在下载"
 
-#: src/DataToText.cpp:64
+#: src/DataToText.cpp
 msgid "Receiving hashset"
 msgstr "正在接收校检码"
 
-#: src/DataToText.cpp:65
+#: src/DataToText.cpp
 msgid "No needed parts"
 msgstr "没有需要的部分"
 
-#: src/DataToText.cpp:66
+#: src/DataToText.cpp
 msgid "Cannot connect LowID to LowID"
 msgstr "无法连接两个 Low ID 用户"
 
-#: src/DataToText.cpp:67
+#: src/DataToText.cpp
 msgid "Too many connections"
 msgstr "连接过多"
 
-#: src/DataToText.cpp:69
+#: src/DataToText.cpp
 msgid "Connecting via Kad"
 msgstr "正在通过 Kad 连接"
 
-#: src/DataToText.cpp:70
+#: src/DataToText.cpp
 msgid "Too many Kad connections"
 msgstr "Kad 连接过多"
 
-#: src/DataToText.cpp:71
+#: src/DataToText.cpp
 msgid "Banned"
 msgstr "已封杀"
 
-#: src/DataToText.cpp:72
+#: src/DataToText.cpp
 msgid "Connection Error"
 msgstr "连接错误"
 
-#: src/DataToText.cpp:73
+#: src/DataToText.cpp
 msgid "Remote Queue Full"
 msgstr "队列已满"
 
-#: src/DataToText.cpp:103
+#: src/DataToText.cpp
 msgid "Old MLDonkey"
 msgstr "旧版 MLDonkey"
 
-#: src/DataToText.cpp:106
+#: src/DataToText.cpp
 msgid "New MLDonkey"
 msgstr "新版 MLDonkey"
 
-#: src/DataToText.cpp:116
+#: src/DataToText.cpp
 msgid "eMule Compatible"
 msgstr "eMule 兼容程序"
 
-#: src/DataToText.cpp:126
+#: src/DataToText.cpp
 msgid "Local Server"
 msgstr "本地服务器"
 
-#: src/DataToText.cpp:127
+#: src/DataToText.cpp
 msgid "Remote Server"
 msgstr "远程服务器"
 
-#: src/DataToText.cpp:128 src/muuli_wdr.cpp:204 src/muuli_wdr.cpp:2890
-#: src/SearchDlg.cpp:110 src/TextClient.cpp:813
+#: src/DataToText.cpp src/KadDlg.cpp src/muuli_wdr.cpp src/SearchDlg.cpp
+#: src/TextClient.cpp
 msgid "Kad"
 msgstr "Kad"
 
-#: src/DataToText.cpp:129
+#: src/DataToText.cpp
 msgid "Source Exchange"
 msgstr "源交换"
 
-#: src/DataToText.cpp:130
+#: src/DataToText.cpp
 msgid "Passive"
 msgstr "被动"
 
-#: src/DataToText.cpp:131
+#: src/DataToText.cpp
 msgid "Link"
 msgstr "链接"
 
-#: src/DataToText.cpp:132
+#: src/DataToText.cpp
 msgid "Source Seeds"
 msgstr "资源种子"
 
-#: src/DataToText.cpp:133
+#: src/DataToText.cpp
 msgid "Search Result"
 msgstr "搜索结果"
 
-#: src/DataToText.cpp:143 src/DownloadListCtrl.cpp:162
-#: src/OtherFunctions.cpp:687 src/TransferWnd.cpp:346
+#: src/DataToText.cpp src/DownloadListCtrl.cpp src/OtherFunctions.cpp
+#: src/TransferWnd.cpp
 msgid "Completed"
 msgstr "已完成"
 
-#: src/DataToText.cpp:144
+#: src/DataToText.cpp
 msgid "In progress"
 msgstr "正在处理"
 
-#: src/DataToText.cpp:145
+#: src/DataToText.cpp
 msgid "ERROR: Out of disk space"
 msgstr "错误：磁盘空间不足"
 
-#: src/DataToText.cpp:146
+#: src/DataToText.cpp
 msgid "ERROR: Partmet not found"
 msgstr "错误：缺少参数"
 
-#: src/DataToText.cpp:147
+#: src/DataToText.cpp
 msgid "ERROR: IO error!"
 msgstr "错误：IO 错误！"
 
-#: src/DataToText.cpp:148
+#: src/DataToText.cpp
 msgid "ERROR: Failed!"
 msgstr "错误：失败！"
 
-#: src/DataToText.cpp:149 src/SearchListCtrl.cpp:1102
+#: src/DataToText.cpp src/SearchListCtrl.cpp
 msgid "Queued"
 msgstr "已加入队列"
 
-#: src/DataToText.cpp:150
+#: src/DataToText.cpp
 msgid "Already downloading"
 msgstr "已经在下载"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp
 msgid "Unknown or bad tempfile format."
 msgstr "未知或错误的临时文件格式。"
 
-#: src/DownloadListCtrl.cpp:158
+#: src/DirectoryTreeCtrl.cpp
+msgid "This directory is part of a recursive share. To remove it, un-share or modify the recursive share root above it."
+msgstr "此目录是递归共享的一部分。要删除它，取消共享或修改其上方的递归共享根目录。"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot unshare inside a recursive share"
+msgstr "无法在递归共享中取消共享"
+
+#: src/DirectoryTreeCtrl.cpp
+msgid "Cannot modify inside a recursive share"
+msgstr "无法在递归共享中修改"
+
+#: src/DownloadListCtrl.cpp
 msgid "Part"
 msgstr "块"
 
-#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:95
-#: src/SearchListCtrl.cpp:95 src/SharedFilesCtrl.cpp:104
+#: src/DownloadListCtrl.cpp src/PartFileConvertDlg.cpp src/SearchListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Size"
 msgstr "大小"
 
-#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:2957
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp
 msgid "Transferred"
 msgstr "已传输"
 
-#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+#: src/SourceListCtrl.cpp
 msgid "Speed"
 msgstr "速度"
 
-#: src/DownloadListCtrl.cpp:164
+#: src/DownloadListCtrl.cpp
 msgid "Progress"
 msgstr "进度"
 
-#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:96
+#: src/DownloadListCtrl.cpp src/FileDetailListCtrl.cpp src/PartFile.cpp
+#: src/SearchListCtrl.cpp
 msgid "Sources"
 msgstr "源"
 
-#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:409
-#: src/SharedFilesCtrl.cpp:106 src/SharedFilesCtrl.cpp:146
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/ServerListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 msgid "Priority"
 msgstr "优先级"
 
-#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:4330 src/SearchListCtrl.cpp:99
+#: src/DownloadListCtrl.cpp src/PartFile.cpp src/SearchListCtrl.cpp
 msgid "Status"
 msgstr "状态"
 
-#: src/DownloadListCtrl.cpp:168
+#: src/DownloadListCtrl.cpp
 msgid "Time Remaining"
 msgstr "剩余时间"
 
-#: src/DownloadListCtrl.cpp:169
+#: src/DownloadListCtrl.cpp
 msgid "Last Seen Complete"
 msgstr "最后一次发现完整文件"
 
-#: src/DownloadListCtrl.cpp:170
+#: src/DownloadListCtrl.cpp
 msgid "Last Reception"
 msgstr "最后一次下载"
 
-#: src/DownloadListCtrl.cpp:411
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "您确定要删除选择的文件吗？"
-
-#: src/DownloadListCtrl.cpp:413
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "您确定要删除选择的文件吗？"
-
-#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:204
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"报告来自: %s (%s)\n"
-"\n"
-
-#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2022
-#: src/SharedFilesCtrl.cpp:144
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Auto"
 msgstr "自动"
 
-#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+#: src/DownloadListCtrl.cpp src/FriendListCtrl.cpp src/muuli_wdr.cpp
+#: src/ServerListCtrl.cpp src/TransferWnd.cpp
+#: src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Cancel"
+msgstr "取消"
+
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Stop"
 msgstr "停止 (&S)"
 
-#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Pause"
 msgstr "暂停 (&P)"
 
-#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 msgid "&Resume"
 msgstr "继续 (&R)"
 
-#: src/DownloadListCtrl.cpp:656
+#: src/DownloadListCtrl.cpp
 msgid "C&lear completed"
 msgstr "清除已完成的文件 (&l)"
 
-#: src/DownloadListCtrl.cpp:662
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file now"
 msgstr "立即转移所有已要求其它文件 (A4AF) 到这个文件"
 
-#: src/DownloadListCtrl.cpp:664
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to this file (Auto)"
 msgstr "自动转移所有已要求其它文件 (A4AF) 到这个文件"
 
-#: src/DownloadListCtrl.cpp:669
+#: src/DownloadListCtrl.cpp
 msgid "Swap every A4AF to any other file now"
 msgstr "立即转移所有已要求其它文件 (A4AF) 到其它文件"
 
-#: src/DownloadListCtrl.cpp:672
+#: src/DownloadListCtrl.cpp
 msgid "Extended Options"
 msgstr "扩展选项"
 
-#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "Preview"
 msgstr "预览"
 
-#: src/DownloadListCtrl.cpp:678
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Show in file manager"
+msgstr "在文件管理器显示"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Show file &details"
-msgstr "显示文件信息 (&D)"
+msgstr "显示文件详情 (&D)"
 
-#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:656
+#: src/DownloadListCtrl.cpp src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Show all comments"
 msgstr "显示所有评论"
 
-#: src/DownloadListCtrl.cpp:684
+#: src/DownloadListCtrl.cpp
 msgid "Copy magnet URI to clipboard"
 msgstr "复制 magnet 地址到剪贴板"
 
-#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:165
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy eD2k &link to clipboard"
 msgstr "复制 eD2k 链接到剪贴板 (&L)"
 
-#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:172
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Copy feedback to clipboard"
-msgstr "复制统计信息到剪贴板"
+msgstr "复制反馈信息到剪贴板"
 
-#: src/DownloadListCtrl.cpp:697
+#: src/DownloadListCtrl.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Get %s for this file"
+msgstr "获取此文件的 %s"
+
+#: src/DownloadListCtrl.cpp
 msgid "unassign"
-msgstr "清除分类"
+msgstr "取消分类"
 
-#: src/DownloadListCtrl.cpp:704
+#: src/DownloadListCtrl.cpp
 msgid "Assign to category"
 msgstr "指定到分类"
 
-#: src/DownloadListCtrl.cpp:740
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "&Open the file"
 msgstr "打开文件 (&O)"
 
-#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:716
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "您确定要删除选择的文件吗？"
+
+#: src/DownloadListCtrl.cpp
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "您确定要删除选择的文件吗？"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"报告来自: %s (%s)\n"
+"\n"
+
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Enter new name for this file:"
 msgstr "请输入新文件名:"
 
-#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:717
+#: src/DownloadListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "File rename"
 msgstr "重命名文件"
 
-#: src/DownloadListCtrl.cpp:965 src/GenericClientListCtrl.cpp:924
-#: src/GenericClientListCtrl.cpp:935
+#: src/DownloadListCtrl.cpp src/GenericClientListCtrl.cpp
+#: src/SharedFilesCtrl.cpp
 #, c-format
-msgid "%.1f MB/s"
-msgstr "%.1f MB/s"
-
-#: src/DownloadListCtrl.cpp:1098 src/DownloadListCtrl.cpp:1109
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
+msgid "%.1f MiB/s"
+msgstr "%.1f MiB/s"
 
-#: src/DownloadListCtrl.cpp:1279
+#: src/DownloadListCtrl.cpp
 #, c-format
 msgid "Downloads (%i)"
 msgstr "下载 (%i)"
 
-#: src/DownloadListCtrl.cpp:1447
-msgid "the default Windows shell handler"
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:1454
-#, c-format
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is %s)."
-msgstr ""
-"为了不让此提示在每次预览时都出现，\n"
-"请在设置中预设您喜欢的播放器（默认为%s）。"
-
-#: src/DownloadListCtrl.cpp:1455
-msgid "File preview"
-msgstr "文件预览"
-
-#: src/DownloadListCtrl.cpp:1500
+#: src/DownloadListCtrl.cpp src/TransferWnd.cpp
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "错误: 无法运行外部媒体播放器！ 命令: `%s'"
+msgid "Total queue size: %s"
+msgstr "总下载大小： %s"
 
-#: src/DownloadQueue.cpp:99
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Saving PartFile %u of %u"
 msgstr "正在保存 PartFile %u 之 %u"
 
-#: src/DownloadQueue.cpp:102
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Saved."
 msgstr "所有 PartFile 都已经保存。"
 
-#: src/DownloadQueue.cpp:109
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading temp files from %s."
 msgstr "从 %s 载入临时文件。"
 
-#: src/DownloadQueue.cpp:128
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Loading PartFile %u of %u"
 msgstr "载入 PartFile %u 之 %u"
 
-#: src/DownloadQueue.cpp:150
+#: src/DownloadQueue.cpp
 msgid "ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."
 msgstr "错误：载入备份文件失败！请到 https://github.com/amule-org/amule/discussions 搜索 .part 和 .met 文件的恢复方法。"
 
-#: src/DownloadQueue.cpp:159
+#: src/DownloadQueue.cpp
 msgid "All PartFiles Loaded."
 msgstr "所有 PartFile 已经载入。"
 
-#: src/DownloadQueue.cpp:162
+#: src/DownloadQueue.cpp
 msgid "No part files found"
 msgstr "没有找到 part 文件"
 
-#: src/DownloadQueue.cpp:164
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Found %u part file"
 msgid_plural "Found %u part files"
 msgstr0 "发现 %u 个 part 文件"
 msgstr1 "发现 %u 个 part 文件"
 
-#: src/DownloadQueue.cpp:240 src/DownloadQueue.cpp:1501
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Temp directory cannot handle large files."
 msgstr "存放零时文件分区的文件系统不支持大文件。"
 
-#: src/DownloadQueue.cpp:243 src/DownloadQueue.cpp:1504
+#: src/DownloadQueue.cpp
 msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr "存放下载文件分区的文件系统不支持大文件。"
 
-#: src/DownloadQueue.cpp:373
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Downloading %s"
 msgstr "正在下载 %s"
 
-#: src/DownloadQueue.cpp:381
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file '%s'"
 msgstr "您已经在下载文件 '%s'"
 
-#: src/DownloadQueue.cpp:393
+#: src/DownloadQueue.cpp
+#, c-format
+msgid "You already have the file '%s' (requested as '%s')"
+msgstr "你已有文件“%s”（请求的文件名为“%s”）"
+
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You already have the file '%s'"
 msgstr "您已下载了文件 '%s'"
 
-#: src/DownloadQueue.cpp:398
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "You are already trying to download the file %s"
 msgstr "您已经尝试下载文件 %s"
 
-#: src/DownloadQueue.cpp:1418
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "无法转换 magnet 链接为 eD2k：%s"
-
-#: src/DownloadQueue.cpp:1426
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Unknown protocol of link: %s"
 msgstr "未知链接协议：%s"
 
-#: src/DownloadQueue.cpp:1442
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Could not add %u link (see log for details)."
 msgid_plural "Could not add %u links (see log for details)."
 msgstr0 "无法添加 %u 个链接（详情请查看日志）"
 msgstr1 "无法添加 %u 个链接（详情请查看日志）"
 
-#: src/DownloadQueue.cpp:1464
+#: src/DownloadQueue.cpp
 #, c-format
 msgid "Invalid eD2k link! ERROR: %s"
 msgstr "非法 eD2k 链接！错误: %s"
 
-#: src/ExternalConn.cpp:325
+#: src/ExternalConn.cpp
 msgid "Client sent packet after authentication failed."
 msgstr "客户端在验证失败后发送包。"
 
-#: src/ExternalConn.cpp:343
+#: src/ExternalConn.cpp
 msgid "External connection closed."
 msgstr "已关闭远程连接。"
 
-#: src/ExternalConn.cpp:420
+#: src/ExternalConn.cpp
 msgid "External connections disabled due to empty password!"
 msgstr "密码未设置，已禁止远程连接！"
 
-#: src/ExternalConn.cpp:441
+#: src/ExternalConn.cpp
 msgid "External connections disabled in config file"
 msgstr "配置文件中已禁止远程连接"
 
-#: src/ExternalConn.cpp:510
+#: src/ExternalConn.cpp
 msgid "New external connection accepted"
 msgstr "新的远程连接已被接受"
 
-#: src/ExternalConn.cpp:513
+#: src/ExternalConn.cpp
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "错误：不能接受新的远程连接"
 
-#: src/ExternalConn.cpp:531
+#: src/ExternalConn.cpp
 msgid "External connection refused due to empty password in preferences!"
 msgstr "由于未设置密码，远程连接已被拒绝！"
 
-#: src/ExternalConn.cpp:542
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "正在连接客户端：%s %s"
 
-#: src/ExternalConn.cpp:544
+#: src/ExternalConn.cpp
 msgid "Unknown version"
 msgstr "未知版本"
 
-#: src/ExternalConn.cpp:554
+#: src/ExternalConn.cpp
 msgid "Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot."
 msgstr "错误的远程连接版本号，可能会不兼容，请使用相同版本的核心和远程程序。"
 
-#: src/ExternalConn.cpp:559
+#: src/ExternalConn.cpp
 msgid "You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented"
 msgstr "您无法从任意开发快照连接到发布版本！*sigh* 防止可能发生的崩溃"
 
-#: src/ExternalConn.cpp:620
+#: src/ExternalConn.cpp
 msgid "Invalid protocol version."
 msgstr "非法协议版本。"
 
-#: src/ExternalConn.cpp:625
+#: src/ExternalConn.cpp
 msgid "Missing protocol version tag."
 msgstr "缺失协议版本标签。"
 
-#: src/ExternalConn.cpp:632
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Too many failed connection attempts; try again in %d seconds."
+msgstr "失败的连接尝试过多；%d 秒后重试。"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: invalid hash specified as EC password."
 msgstr "身份验证失败: 指定为 EC 密码的 MD5 哈希值无效。"
 
-#: src/ExternalConn.cpp:664
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client offered an encrypted External Connection but sent no usable key."
+msgstr "身份认证失败：客户端提供了加密的外部连接，但未发送可用密钥。"
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: this aMule requires an encrypted External Connection, and the client did not negotiate one."
+msgstr "身份认证失败：此 aMule 需要加密的外部连接，但客户端未协商。"
+
+#: src/ExternalConn.cpp
+msgid "Authentication failed: the client could not confirm the encrypted session."
+msgstr "身份认证失败：客户端无法确认加密会话。"
+
+#: src/ExternalConn.cpp
 msgid "Authentication failed: wrong password."
 msgstr "验证失败：密码错误。"
 
-#: src/ExternalConn.cpp:666
+#: src/ExternalConn.cpp
 msgid "Authentication failed: missing password."
 msgstr "认证失败: 没有密码。"
 
-#: src/ExternalConn.cpp:676
+#: src/ExternalConn.cpp
 msgid "Invalid request, please authenticate first."
 msgstr "无效请求，请先验证。"
 
-#: src/ExternalConn.cpp:681
+#: src/ExternalConn.cpp
 msgid "Access granted."
 msgstr "登录成功。"
 
-#: src/ExternalConn.cpp:689
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Sent error message \"%s\" to client."
 msgstr "发送错误消息喔 \"%s\"到客户端。"
 
-#: src/ExternalConn.cpp:692
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr "来自%s的非法登录尝试，已关闭连接。"
 
-#: src/ExternalConn.cpp:1176
+#: src/ExternalConn.cpp
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "远程 Part 文件命令失败：文件校验码不存在：%s"
 
-#: src/ExternalConn.cpp:1178
+#: src/ExternalConn.cpp
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "文件校验码不存在：%s"
 
-#: src/ExternalConn.cpp:1225 src/ExternalConn.cpp:1307
-#: src/ExternalConn.cpp:1388
+#: src/ExternalConn.cpp
 msgid "OOPS! OpCode processing error!"
 msgstr "OpCode 处理错误！"
 
-#: src/ExternalConn.cpp:1253
+#: src/ExternalConn.cpp
 msgid "Server not added"
 msgstr "服务器没有被添加"
 
-#: src/ExternalConn.cpp:1271
+#: src/ExternalConn.cpp
 #, c-format
 msgid "server not found: %s"
 msgstr "找不到服务器：%s"
 
-#: src/ExternalConn.cpp:1287
+#: src/ExternalConn.cpp
 msgid "need to define server to be removed"
 msgstr "必须定义需删除的服务器"
 
-#: src/ExternalConn.cpp:1301
+#: src/ExternalConn.cpp
 msgid "eD2k is disabled in preferences."
-msgstr "eD2k 在设置中已禁用。"
+msgstr "eD2k 在首选项中已禁用。"
 
-#: src/ExternalConn.cpp:1368
+#: src/ExternalConn.cpp
+msgid "No address known for that friend yet."
+msgstr "还不知道那个好友的地址。"
+
+#: src/ExternalConn.cpp
 msgid "Friend not found."
 msgstr "未找到好友。"
 
-#: src/ExternalConn.cpp:1377
+#: src/ExternalConn.cpp
 msgid "Client not found."
 msgstr "未找到客户端。"
 
-#: src/ExternalConn.cpp:1382
+#: src/ExternalConn.cpp
 msgid "EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."
 msgstr "EC_TAG_FRIEND_SHARED 需要 EC_TAG_FRIEND 或 EC_TAG_CLIENT。"
 
-#: src/ExternalConn.cpp:1530
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "正在搜索，请稍等然后重新获取结果！"
-
-#: src/ExternalConn.cpp:1536
+#: src/ExternalConn.cpp
 msgid "WebSearch from remote interface makes no sense."
 msgstr "远程界面使用网络搜索没有意义。"
 
-#: src/ExternalConn.cpp:1750
+#: src/ExternalConn.cpp
+msgid "A browse is not a search that can be started."
+msgstr "浏览不是可以被启动的搜索。"
+
+#: src/ExternalConn.cpp
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "正在搜索，请稍等然后重新获取结果！"
+
+#: src/ExternalConn.cpp
 msgid "No points for graph."
 msgstr "此图没有节点。"
 
-#: src/ExternalConn.cpp:1759
+#: src/ExternalConn.cpp
 msgid "Your client is not configured for this detail level."
 msgstr "您的客户端没有为详细级别进行配置。"
 
-#: src/ExternalConn.cpp:1786
+#: src/ExternalConn.cpp
 msgid "External Connection: shutdown requested"
 msgstr "远程连接：已请求关闭"
 
-#: src/ExternalConn.cpp:1798
+#: src/ExternalConn.cpp
 msgid "Already shutting down."
 msgstr "已经在关闭。"
 
-#: src/ExternalConn.cpp:1816
+#: src/ExternalConn.cpp
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "远程连接：正在添加链接 '%s'。"
 
-#: src/ExternalConn.cpp:1832
+#: src/ExternalConn.cpp
 #, c-format
 msgid "%d of %d links failed (invalid or already on list)."
 msgstr "%d 个链接失败，共 %d 个（无效或已经在列表中）。"
 
-#: src/ExternalConn.cpp:1959
+#: src/ExternalConn.cpp
+msgid "Version check throttled; try again shortly."
+msgstr "版本检查受限；请稍后再试。"
+
+#: src/ExternalConn.cpp
+msgid "Version check is not available on this daemon."
+msgstr "版本检查在此 daemon 上不可用。"
+
+#: src/ExternalConn.cpp
 msgid "File not found."
 msgstr "文件未找到。"
 
-#: src/ExternalConn.cpp:1964
+#: src/ExternalConn.cpp
 msgid "Invalid file name."
 msgstr "无效的文件名。"
 
-#: src/ExternalConn.cpp:1972
+#: src/ExternalConn.cpp
 msgid "Unable to rename file."
 msgstr "无法重命名文件。"
 
-#: src/ExternalConn.cpp:2271 src/ExternalConn.cpp:2298
+#: src/ExternalConn.cpp
+msgid "Client could not be swapped to that file."
+msgstr "无法交换客户端到那个文件。"
+
+#: src/ExternalConn.cpp
+#, c-format
+msgid "Could not save the amuleapi password: %s"
+msgstr "无法保存 amuleapi 密码：%s"
+
+#: src/ExternalConn.cpp
+msgid "No such category."
+msgstr "没有这样的分类。"
+
+#: src/ExternalConn.cpp
+msgid "Malformed category request."
+msgstr "畸形的分类请求。"
+
+#: src/ExternalConn.cpp
+msgid "The default category cannot be deleted."
+msgstr "无法删除默认的分类。"
+
+#: src/ExternalConn.cpp
+msgid "Missing chat session id"
+msgstr "没有聊天会话 id"
+
+#: src/ExternalConn.cpp
+msgid "No such chat session"
+msgstr "没有这样的聊天会话"
+
+#: src/ExternalConn.cpp
+msgid "Media metadata extraction is disabled in preferences"
+msgstr "首选项中禁用了媒体元数据提取"
+
+#: src/ExternalConn.cpp
+msgid "File is not eligible for media metadata extraction (not an audio/video file, or an incomplete download)"
+msgstr "文件不满足媒体元数据提取要求（不是音/视频文件，或者是不完整的下载）"
+
+#: src/ExternalConn.cpp
+msgid "Empty chat message"
+msgstr "空的聊天信息"
+
+#: src/ExternalConn.cpp
+msgid "Unknown chat target"
+msgstr "未知聊天目标"
+
+#: src/ExternalConn.cpp
 msgid "Kad is disabled in preferences."
-msgstr "Kad 在设置中被禁用。"
+msgstr "Kad 在首选项中被禁用。"
 
-#: src/ExternalConn.cpp:2310
+#: src/ExternalConn.cpp
 msgid "Already connected to eD2k."
 msgstr "已经连接至 eD2k。"
 
-#: src/ExternalConn.cpp:2313
+#: src/ExternalConn.cpp
 msgid "Connecting to eD2k..."
 msgstr "正在连接至 eD2k..."
 
-#: src/ExternalConn.cpp:2321
+#: src/ExternalConn.cpp
 msgid "Already connected to Kad."
 msgstr "已连接至 Kad。"
 
-#: src/ExternalConn.cpp:2324
+#: src/ExternalConn.cpp
 msgid "Connecting to Kad..."
 msgstr "正在连接至 Kad..."
 
-#: src/ExternalConn.cpp:2331
+#: src/ExternalConn.cpp
 msgid "All networks are disabled."
 msgstr "全部网络都被禁用了。"
 
-#: src/ExternalConn.cpp:2339
+#: src/ExternalConn.cpp
 msgid "Disconnected from eD2k."
 msgstr "已从 eD2k 断开连接。"
 
-#: src/ExternalConn.cpp:2343
+#: src/ExternalConn.cpp
 msgid "Disconnected from Kad."
 msgstr "已从 Kad 断开连接。"
 
-#: src/ExternalConn.cpp:2352
+#: src/ExternalConn.cpp
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "远程连接：非法 opcode：%#x"
 
-#: src/ExternalConn.cpp:2355
+#: src/ExternalConn.cpp
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "非法的 opcode（错误的协议版本？)"
 
-#: src/ExternalConnector.cpp:135
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr "未知扩展选项 '%s' 用于命令 '%s'。\n"
 
-#: src/ExternalConnector.cpp:137
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Unknown command '%s'.\n"
 msgstr "未知命令 '%s'。\n"
 
-#: src/ExternalConnector.cpp:149
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command cannot have an argument.\n"
@@ -1874,7 +2386,7 @@
 "\n"
 "此命令不能含有参数。\n"
 
-#: src/ExternalConnector.cpp:151
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command must have an argument.\n"
@@ -1882,7 +2394,7 @@
 "\n"
 "此命令必须有参数。\n"
 
-#: src/ExternalConnector.cpp:154
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "This command is incomplete, you must use one of the extensions below.\n"
@@ -1890,7 +2402,7 @@
 "\n"
 "此命令不完整，您必须使用以下扩展选项中的一个。\n"
 
-#: src/ExternalConnector.cpp:160
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Available extensions:\n"
@@ -1898,11 +2410,11 @@
 "\n"
 "可用扩展选项：\n"
 
-#: src/ExternalConnector.cpp:162
+#: src/ExternalConnector.cpp
 msgid "Available commands:\n"
 msgstr "可用命令：\n"
 
-#: src/ExternalConnector.cpp:179
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1913,17 +2425,17 @@
 "全部命令都不区分大小写。\n"
 "输入 '%s <命令>' 获取在 <命令> 中的详细信息。\n"
 
-#: src/ExternalConnector.cpp:291 src/ExternalConnector.cpp:292
+#: src/ExternalConnector.cpp
 msgid "Exits from the application."
 msgstr "退出程序。"
 
-#: src/ExternalConnector.cpp:293
+#: src/ExternalConnector.cpp
 msgid "Show help."
 msgstr "显示帮助。"
 
 #. TRANSLATORS:
 #. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:296
+#: src/ExternalConnector.cpp
 msgid ""
 "To get help on a command, type 'help <command>'.\n"
 "To get the full command list type 'help'.\n"
@@ -1931,7 +2443,7 @@
 "输入 'help <命令>' 可显示命令的帮助。\n"
 "输入 'help' 可显示全部命令列表。\n"
 
-#: src/ExternalConnector.cpp:323
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1942,46 +2454,46 @@
 "使用 '%s' 列出所有命令\n"
 "\n"
 
-#: src/ExternalConnector.cpp:356
+#: src/ExternalConnector.cpp
 msgid "Syntax error!"
 msgstr "语法错误！"
 
-#: src/ExternalConnector.cpp:359
+#: src/ExternalConnector.cpp
 msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr "处理指令时发生意外错误 - 这不应该发生！请提交错误报告\n"
 
-#: src/ExternalConnector.cpp:362
+#: src/ExternalConnector.cpp
 msgid "This command should not have any parameters."
 msgstr "此命令不需要任何参数。"
 
-#: src/ExternalConnector.cpp:365
+#: src/ExternalConnector.cpp
 msgid "This command must have a parameter."
 msgstr "此命令必须有一个参数。"
 
-#: src/ExternalConnector.cpp:368
+#: src/ExternalConnector.cpp
 msgid "Invalid argument."
 msgstr "无效参数。"
 
-#: src/ExternalConnector.cpp:371
+#: src/ExternalConnector.cpp
 msgid "This is an incomplete command."
 msgstr "此命令不完整。"
 
-#: src/ExternalConnector.cpp:380
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "Type '%s' to get more help.\n"
 msgstr "输入 '%s' 显示更多帮助信息。\n"
 
-#: src/ExternalConnector.cpp:435
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s %s\n"
 msgstr "这是 %s %s %s\n"
 
-#: src/ExternalConnector.cpp:437
+#: src/ExternalConnector.cpp
 #, c-format
 msgid "This is %s %s\n"
 msgstr "这是 %s %s\n"
 
-#: src/ExternalConnector.cpp:452
+#: src/ExternalConnector.cpp
 msgid ""
 "\n"
 "Creating client...\n"
@@ -1989,7 +2501,7 @@
 "\n"
 "正在建立用户...\n"
 
-#: src/ExternalConnector.cpp:477
+#: src/ExternalConnector.cpp
 #, c-format
 msgid ""
 "\n"
@@ -1998,7 +2510,7 @@
 "\n"
 "完成，正在退出 %s...\n"
 
-#: src/ExternalConnector.cpp:483
+#: src/ExternalConnector.cpp
 msgid ""
 "Cannot connect with an empty password.\n"
 "You must specify a password either in config file\n"
@@ -2012,118 +2524,370 @@
 "\n"
 "退出...\n"
 
-#: src/ExternalConnector.cpp:492
+#: src/ExternalConnector.cpp
 msgid "Show this help text."
 msgstr "显示帮助信息。"
 
-#: src/ExternalConnector.cpp:495
+#: src/ExternalConnector.cpp
 msgid "Host where aMule is running. (default: 127.0.0.1)"
 msgstr "aMule 正在运行的主机 (默认: 127.0.0.1)"
 
-#: src/ExternalConnector.cpp:498
+#: src/ExternalConnector.cpp
 msgid "aMule's port for External Connection. (default: 4712)"
 msgstr "aMule 的远程连接端口。(默认：4712)"
 
-#: src/ExternalConnector.cpp:501
+#: src/ExternalConnector.cpp
 msgid "External Connection password."
 msgstr "远程连接密码。"
 
-#: src/ExternalConnector.cpp:504
+#: src/ExternalConnector.cpp
 msgid "Read configuration from file."
 msgstr "从文件读取设置。"
 
-#: src/ExternalConnector.cpp:507
+#: src/ExternalConnector.cpp
 msgid "Do not print any output to stdout."
 msgstr "不在控制台输出任何信息。"
 
-#: src/ExternalConnector.cpp:510
+#: src/ExternalConnector.cpp
 msgid "Be verbose - show also debug messages."
 msgstr "详细显示调试信息。"
 
-#: src/ExternalConnector.cpp:513
+#: src/ExternalConnector.cpp
 msgid "Sets program locale (language)."
 msgstr "设置程序地区(语言)。"
 
-#: src/ExternalConnector.cpp:516
+#: src/ExternalConnector.cpp
 msgid "Write command line options to config file."
 msgstr "把命令行参数写入设置文件。"
 
-#: src/ExternalConnector.cpp:519
+#: src/ExternalConnector.cpp
 msgid "Creates config file based on aMule's config file."
 msgstr "基于 aMule 的设置文件建立新设置文件。"
 
-#: src/ExternalConnector.cpp:522
+#: src/ExternalConnector.cpp
 msgid "Print program version."
 msgstr "输出程序版本。"
 
-#: src/ExternalConnector.cpp:525
+#: src/ExternalConnector.cpp
+msgid "Do not encrypt the External Connect session. Encryption is on by default whenever the remote aMule supports it; turning it off leaves everything after the login readable and modifiable by anyone on the path."
+msgstr "不加密外部连接会话。只要远程 aMule 支持加密，则默认启用加密；如禁用则该路径上的任何人都可读取和修改登录后的一切内容。"
+
+#: src/ExternalConnector.cpp
 msgid "Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."
 msgstr "强制使用 ZLIB 压缩，忽略目标 IP 的地域属性（适用于服务器可通过解析为局域网 IP 的 VPN 隧道访问场景）。"
 
-#: src/FileDetailDialog.cpp:76
+#: src/ExternalConnector.cpp
+msgid "Append a copy of all console output to this log file (default: <config-dir>/amuleapi.log)."
+msgstr "将所有控制台输出的副本附加到此日志文件（默认：<config-dir>/amuleapi.log）。"
+
+#: src/ExternalConnector.cpp
+msgid "Do not write a log file; print to the console only."
+msgstr "不写入日志文件；只打印到控制台。"
+
+#: src/FileDetailDialog.cpp
 msgid "File Details"
 msgstr "文件信息"
 
-#: src/FileDetailDialog.cpp:167
+#: src/FileDetailDialog.cpp
 #, c-format
 msgid "%.1f%% done"
 msgstr "%.1f%% 已完成"
 
-#: src/FileDetailDialog.cpp:169 src/utils/wxCas/src/wxcasframe.cpp:1139
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
+#: src/FileDetailDialog.cpp src/utils/wxCas/src/wxcasframe.cpp
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: src/FileLaunch.cpp
+msgid "File preview"
+msgstr "文件预览"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: '%s'"
+msgstr "错误: 无法运行外部媒体播放器！ 命令: '%s'"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "The configured video player was not found: %s"
+msgstr "未找到配置好的视频播放器：%s"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "Cannot open '%s': the file is not present on this computer."
+msgstr "无法打开'%s'： 该文件不存在于此计算机上。"
+
+#: src/FileLaunch.cpp
+msgid "Previewing an unfinished download needs a video player: the partly-downloaded file has no type the system can open on its own. One can be set in Preferences -> General."
+msgstr "预览未完成的下载需要视频播放器：部分下载的文件没有系统可自行打开的类型。可以在“首选项”->“常规”中设置一个。"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to open '%s' with the default application."
+msgstr "错误：未能使用默认应用打开'%s'。"
+
+#: src/FileLaunch.cpp
+#, c-format
+msgid "ERROR: Failed to show '%s' in the file manager."
+msgstr "错误：未能在文件管理器中显示 “%s”。"
+
+#: src/FirstRunWizard.cpp
+msgid "Mobile / 4G-5G (20 / 5 Mbit)"
+msgstr "移动 / 4G-5G (20 / 5 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "ADSL (24 / 1 Mbit)"
+msgstr "ADSL (24 / 1 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "VDSL (50 / 10 Mbit)"
+msgstr "VDSL (50 / 10 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Cable (200 / 20 Mbit)"
+msgstr "Cable (200 / 20 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre 300 (300 / 100 Mbit)"
+msgstr "Fibre 300 (300 / 100 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "Fibre Gigabit (1000 / 1000 Mbit)"
+msgstr "千兆光纤 (1000 / 1000 Mbit)"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule first-run setup"
+msgstr "aMule 首次运行设置"
+
+#: src/FirstRunWizard.cpp
+msgid "Welcome to aMule!"
+msgstr "欢迎来到 aMule！"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"This short setup will get you connected. You can change\n"
+"any of these settings later in Preferences."
+msgstr ""
+"这个简略的设置流程会让 aMule 联网。之后你可以在\n"
+"首选项中更改这些设置中的任意一项。"
+
+#: src/FirstRunWizard.cpp
+msgid "Choose a nickname other peers will see:"
+msgstr "选择一个其他对等方会见到的昵称："
+
+#: src/FirstRunWizard.cpp
+msgid "Connection & bandwidth"
+msgstr "连接和带宽"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Pick the option that best matches your Internet connection,\n"
+"or set the upload and download limits directly below."
+msgstr ""
+"挑一个最匹配你的互联网连接的选项，\n"
+"或者直接在下方设置上传和下载限制。"
+
+#: src/FirstRunWizard.cpp
+msgid "Connection speed:"
+msgstr "连接速度："
+
+#: src/FirstRunWizard.cpp
+msgid "Other / set manually"
+msgstr "其他 /手动设置"
+
+#: src/FirstRunWizard.cpp
+msgid "Upload limit (KiB/s, 0 = unlimited):"
+msgstr "上传限制（KiB/s, 0=无限制）："
+
+#: src/FirstRunWizard.cpp
+msgid "Download limit (KiB/s, 0 = unlimited):"
+msgstr "下载限制（KiB/s, 0=无限制）："
+
+#: src/FirstRunWizard.cpp
+msgid "Networks & ports"
+msgstr "网络和端口"
+
+#: src/FirstRunWizard.cpp
+msgid "aMule can use two networks. We recommend keeping both enabled."
+msgstr "aMule 可以使用两个网络。我们建议两个都开启。"
+
+#: src/FirstRunWizard.cpp src/TextClient.cpp
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Kademlia"
+msgstr "Kad"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Standard TCP Port "
+msgstr "标准 TCP 端口 "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Extended UDP port (Kad / global search) "
+msgstr "扩展 UDP 端口 (Kad/全局搜索) "
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Enable UPnP for router port forwarding"
+msgstr "启用 UPnP 以用于路由器端口转发"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Lets aMule ask your router to forward the ports above so other\n"
+"peers can reach you (a \"HighID\"). Turn off if your router\n"
+"doesn't support UPnP or you forward ports manually."
+msgstr ""
+"让 aMule 请求你的路由器转发上方的这些端口，以便其他\n"
+"对等方可以和你连上 ( \"HighID\")。如果你的\n"
+"路由器不支持 UPnP 或者你手动转发端口，请关闭该选项。"
+
+#: src/FirstRunWizard.cpp
+msgid "Bootstrap files"
+msgstr "启动文件"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"To get started, aMule needs to know about some peers.\n"
+"Select which lists to download now:"
+msgstr ""
+"要开始，aMule 需要知道一些对等方。\n"
+"选择现在要下载哪些列表："
+
+#: src/FirstRunWizard.cpp
+msgid "Your peer lists are already in place - nothing to download."
+msgstr "对等方列表已就绪 -- 没有要下载的。"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Auto-update server list at startup"
+msgstr "启动时自动更新服务器列表"
+
+#: src/FirstRunWizard.cpp
+msgid "Integrations (optional)"
+msgstr "集成（可选）"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"Choose how aMule integrates with your system. You can\n"
+"change any of these later in Preferences."
+msgstr ""
+"选择 aMule 如何与你的系统集成。 你之后可以在\n"
+"首选项中更改任意一项设置。"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Start aMule automatically when I log in"
+msgstr "登录时自动启动 aMule"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for ed2k:// links"
+msgstr "将 aMule 注册为打开 ed2k:// 链接的应用"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: packaging/windows/installer_strings.c
+msgid "Register aMule for magnet: links"
+msgstr "将 aMule 注册为打开 magnet: 链接的应用"
+
+#: src/FirstRunWizard.cpp
+msgid "Only eD2k-compatible magnets. Leave off if you use a BitTorrent client."
+msgstr "仅兼容 eD2k 的磁力链接。如果你使用 BitTorrent 客户端请不要开启。"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Open .emulecollection files with aMule"
+msgstr "用 aMule 打开 .emulecollection 文件"
+
+#: src/FirstRunWizard.cpp
+msgid "Folders (optional)"
+msgstr "文件夹（可选）"
+
+#: src/FirstRunWizard.cpp
+msgid ""
+"The defaults are fine for most people. Change them if you\n"
+"want downloads on a different (e.g. larger) disk."
+msgstr ""
+"多数人使用默认值即可。如果想在不同的（比如更大的）\n"
+"磁盘上下载可以更改默认值。"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Destination folder for downloads"
+msgstr "存放下载文件的文件夹"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasprefs.cpp
+msgid "Browse"
+msgstr "浏览"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "(All files in this folder are shared with other peers)"
+msgstr "（此文件夹中的所有文件均与其他对等方共享）"
+
+#: src/FirstRunWizard.cpp src/muuli_wdr.cpp
+msgid "Folder for temporary download files"
+msgstr "存放临时下载文件的文件夹"
+
+#: src/FirstRunWizard.cpp
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid ""
+"Based on this, aMule will allow up to %i sources per file\n"
+"and %i client connections."
+msgstr ""
+"基于此，aMule 会允许每个文件最多 %i 个来源\n"
+"以及 %i 个客户端连接。"
 
-#: src/FriendList.cpp:123
+#: src/FirstRunWizard.cpp
+msgid "Show this setup wizard again the next time you start aMule?"
+msgstr "下次启动 aMule 时再次显示这个设置向导吗？"
+
+#: src/FirstRunWizard.cpp
+msgid "Setup not finished"
+msgstr "设置未完成"
+
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr "读取好友列表文件 emfriends.met 失败！"
 
-#: src/FriendList.cpp:149
+#: src/FriendList.cpp
 msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr "写好友列表文件emfriends.met失败！"
 
-#: src/FriendList.cpp:266
+#: src/FriendList.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot browse them."
+msgstr "还不知道好友“%s”的地址，无法浏览。"
+
+#: src/FriendList.cpp
 msgid "CRITICAL - no client on StartChatSession"
 msgstr "严重错误 - 开始聊天进程没有客户端"
 
-#: src/FriendListCtrl.cpp:133 src/muuli_wdr.cpp:2386 src/muuli_wdr.cpp:3038
+#: src/FriendListCtrl.cpp src/muuli_wdr.cpp
 msgid "Friends"
 msgstr "好友"
 
-#: src/FriendListCtrl.cpp:137 src/GenericClientListCtrl.cpp:630
-msgid "Show &Details"
-msgstr "查看详细信息 (&D)"
-
-#: src/FriendListCtrl.cpp:141
+#: src/FriendListCtrl.cpp
 msgid "Add a friend"
 msgstr "添加好友"
 
-#: src/FriendListCtrl.cpp:144
+#: src/FriendListCtrl.cpp
 msgid "Remove Friend"
 msgstr "删除好友"
 
-#: src/FriendListCtrl.cpp:145
+#: src/FriendListCtrl.cpp
 msgid "Send &Message"
 msgstr "发送消息 (&M)"
 
-#: src/FriendListCtrl.cpp:146 src/GenericClientListCtrl.cpp:641
-msgid "View Files"
-msgstr "查看共享文件"
-
-#: src/FriendListCtrl.cpp:147 src/GenericClientListCtrl.cpp:633
-msgid "Establish Friend Slot"
-msgstr "建立好友通道"
+#: src/FriendListCtrl.cpp
+#, c-format
+msgid "No address known for friend '%s' yet, cannot message them."
+msgstr "还不知道好友“%s”的地址，无法发消息。"
 
-#: src/FriendListCtrl.cpp:180
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friend?"
 msgstr "确定删除选中的好友吗？"
 
-#: src/FriendListCtrl.cpp:182
+#: src/FriendListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected friends?"
 msgstr "确定删除选中的好友吗？"
 
-#: src/FriendListCtrl.cpp:240
+#: src/FriendListCtrl.cpp
 msgid ""
 "You are not allowed to set more than one friendslot.\n"
 " Only one slot was assigned."
@@ -2131,975 +2895,1283 @@
 "不允许设置超过一个好友通道。\n"
 " 只能指定一个通道。"
 
-#: src/FriendListCtrl.cpp:240 src/GenericClientListCtrl.cpp:574
-msgid "Multiple selection"
-msgstr "多选"
-
-#: src/GenericClientListCtrl.cpp:574
-msgid ""
-"You are not allowed to set more than one friend slot.\n"
-" Only one slot was assigned."
-msgstr ""
-"不允许设置超过一个好友通道。\n"
-" 只分配了一个通道。"
-
-#: src/GenericClientListCtrl.cpp:591
-msgid "Send message to user"
-msgstr "发送消息给用户"
-
-#: src/GenericClientListCtrl.cpp:592
-msgid "Message to send:"
-msgstr "发送消息："
-
-#: src/GenericClientListCtrl.cpp:631
-msgid "Remove from friends"
-msgstr "从好友中删除"
-
-#: src/GenericClientListCtrl.cpp:642
-msgid "Send message"
-msgstr "发送消息"
-
-#: src/GenericClientListCtrl.cpp:644
+#: src/GenericClientListCtrl.cpp
 msgid "Swap to this file"
 msgstr "转移到这个文件"
 
-#: src/GenericClientListCtrl.cpp:995
-msgid "A4AF"
-msgstr "A4AF"
+#: src/GenericClientListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Colour legend"
+msgstr "颜色图例"
 
-#: src/GenericClientListCtrl.cpp:1054
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u (%i)"
 msgstr "在队列中: %u (%i)"
 
-#: src/GenericClientListCtrl.cpp:1064 src/GenericClientListCtrl.cpp:1093
+#: src/GenericClientListCtrl.cpp
 msgid "Asked for another file"
 msgstr "已要求其它文件"
 
-#: src/GenericClientListCtrl.cpp:1083
+#: src/GenericClientListCtrl.cpp
 msgid "Waiting for upload slot"
 msgstr "等待上传机会"
 
-#: src/GenericClientListCtrl.cpp:1085
+#: src/GenericClientListCtrl.cpp
 #, c-format
 msgid "On Queue: %u"
 msgstr "在队列中: %u"
 
-#: src/GenericClientListCtrl.cpp:1088
+#: src/GenericClientListCtrl.cpp src/muuli_wdr.cpp
 msgid "Uploading"
 msgstr "正在上传"
 
-#: src/GenericClientListCtrl.cpp:1090
+#: src/GenericClientListCtrl.cpp
 msgid "None"
 msgstr "没有"
 
-#: src/GenericClientListCtrl.cpp:1152 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/ServerListCtrl.cpp
 msgid "No"
 msgstr "否"
 
-#: src/GenericClientListCtrl.cpp:1154 src/ServerListCtrl.cpp:249
+#: src/GenericClientListCtrl.cpp src/PrefsUnifiedDlg.cpp src/ServerListCtrl.cpp
 msgid "Yes"
 msgstr "是"
 
-#: src/HTTPDownload.cpp:58
+#: src/geoip/MaxMindDBDatabase.cpp
+#, c-format
+msgid "Failed to open MaxMindDB database '%s': %s"
+msgstr "打开 MaxMindDB 数据库 '%s' 失败： %s"
+
+#: src/HTTPDownload.cpp
 msgid "Downloading..."
 msgstr "正在下载..."
 
-#: src/HTTPDownload.cpp:122
+#: src/HTTPDownload.cpp
 msgid "HTTP download cancelled"
 msgstr "HTTP 下载已经取消"
 
-#: src/HTTPDownload.cpp:237
+#: src/HTTPDownload.cpp
 msgid "The URL to download can't be empty"
 msgstr "要下载的地址不能为空"
 
-#: src/HTTPDownload.cpp:246
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Failed to create HTTP request for %s"
 msgstr "创建 %s 的 HTTP 请求失败"
 
-#: src/HTTPDownload.cpp:337
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download: empty response body for %s"
 msgstr "HTTP 下载：%s 返回的响应体为空"
 
-#: src/HTTPDownload.cpp:349
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Could not move downloaded file to %s"
 msgstr "无法移动已下载文件到 %s"
 
-#: src/HTTPDownload.cpp:353
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "Downloaded %s (%llu bytes)"
 msgstr "已下载 %s （%llu 字节）"
 
-#: src/HTTPDownload.cpp:358
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "The URL %s returned: %i"
 msgstr "URL %s 返回了：%i"
 
-#: src/HTTPDownload.cpp:365
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP download failed for %s: %s"
 msgstr "%s HTTP 下载失败：%s"
 
-#: src/HTTPDownload.cpp:380
+#: src/HTTPDownload.cpp
 #, c-format
 msgid "HTTP 401 Unauthorized for %s"
 msgstr "HTTP 401 未授权访问 %s"
 
-#: src/IP2Country.cpp:82
+#: src/IP2Country.cpp
 #, c-format
 msgid "Migrated existing GeoLite2-Country.mmdb to %s"
 msgstr "已将现有的 GeoLite2-Country.mmdb 迁移至 %s"
 
-#: src/IP2Country.cpp:134
-msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences → IP2Country, paste your free MaxMind License Key and click 'Update now'."
-msgstr "IP2Country：已选择 MaxMind 作为 GeoIP 源，但未配置许可证密钥。请打开偏好设置 → IP2Country，粘贴您的免费 MaxMind 许可证密钥，然后点击“立即更新”。"
-
-#: src/IP2Country.cpp:140
-msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences → IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
-msgstr "IP2Country：已选择自定义 URL 作为 GeoIP 源，但未配置 URL。请打开偏好设置 → IP2Country，并提供指向 .mmdb 文件（或包含该文件的.gz/.tar.gz 压缩包）的 URL。"
+#: src/IP2Country.cpp
+#, c-format
+msgid "%s is not a readable MaxMindDB file - discarding it. A fresh copy will be downloaded on the next start, or now via Preferences -> IP2Country -> 'Update now'."
+msgstr "%s 不是可读的 MaxMindDB 文件 —— 正在丢弃它。下次启动时会下载新副本，或者现在通过“首选项” -> IP2Country -> '立即更新' 下载。"
+
+#: src/IP2Country.cpp
+msgid "IP2Country: MaxMind selected as the GeoIP source but no License Key configured. Open Preferences -> IP2Country, paste your free MaxMind License Key and click 'Update now'."
+msgstr "IP2Country：已选择 MaxMind 作为 GeoIP 源，但未配置许可证密钥。请打开首选项 -> IP2Country，粘贴您的免费 MaxMind 许可证密钥，然后点击“立即更新”。"
+
+#: src/IP2Country.cpp
+msgid "IP2Country: Custom URL selected as the GeoIP source but no URL configured. Open Preferences -> IP2Country and supply a URL that points to an .mmdb (or .gz / .tar.gz containing one)."
+msgstr "IP2Country：已选择自定义 URL 作为 GeoIP 源，但未配置 URL。请打开首选项 -> IP2Country，并提供指向 .mmdb 文件（或包含该文件的.gz/.tar.gz 压缩包）的 URL。"
 
-#: src/IP2Country.cpp:146
+#: src/IP2Country.cpp
 msgid "IP2Country: failed to resolve a GeoIP download URL."
 msgstr "IP2Country：无法解析 GeoIP 下载链接。"
 
-#: src/IP2Country.cpp:157
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download new %s from %s"
 msgstr "下载新的 %s，来源 %s"
 
-#: src/IP2Country.cpp:191
+#: src/IP2Country.cpp
 #, c-format
 msgid "Download of %s file failed, aborting update."
 msgstr "%s 文件下载失败，更新终止。"
 
-#: src/IP2Country.cpp:201 src/IPFilter.cpp:500
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Failed to remove %s file, aborting update."
 msgstr "删除%s文件失败，放弃更新。"
 
-#: src/IP2Country.cpp:211
+#: src/IP2Country.cpp
 #, c-format
 msgid "Failed to rename %s file, aborting update."
 msgstr "重名命%s文件失败，放弃更新。"
 
-#: src/IP2Country.cpp:221 src/IPFilter.cpp:506
+#: src/IP2Country.cpp src/IPFilter.cpp
 #, c-format
 msgid "Successfully updated %s"
 msgstr "成功更新 %s"
 
-#: src/IP2Country.cpp:228
+#: src/IP2Country.cpp
 #, c-format
 msgid "Error updating %s"
 msgstr "更新 %s 出错"
 
-#: src/IP2Country.cpp:249
+#: src/IP2Country.cpp
 msgid "DB-IP download failed for the current month - retrying with the previous month's URL."
 msgstr "当前月份的 DB-IP 下载失败，正在尝试使用上个月的 URL 重试。"
 
-#: src/IP2Country.cpp:254 src/IPFilter.cpp:512 src/ServerList.cpp:872
+#: src/IP2Country.cpp src/IPFilter.cpp src/ServerList.cpp
 #, c-format
 msgid "Failed to download %s from %s"
 msgstr "从%s下载%s失败"
 
-#: src/IP2Country.cpp:295
-#, c-format
-msgid "Failed to load country data for '%s'."
-msgstr "加载 \"%s\" 的地区数据失败。"
-
-#: src/IPFilter.cpp:113
+#: src/IPFilter.cpp
 msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr "正在载入IP过滤文件ipfilter.dat和ipfilter_static.dat。"
 
-#: src/IPFilter.cpp:299
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr "载入 ipfilter.dat 文件 '%s' 失败，遇到未知格式。"
 
-#: src/IPFilter.cpp:325
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr "载入 ipfilter.dat 文件 '%s' 失败，无法打开文件。"
 
-#: src/IPFilter.cpp:329
+#: src/IPFilter.cpp
 #, c-format
 msgid "Loaded %u IP-range from '%s'."
 msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr0 "载入了 %u 个 IP 段，来源为 “%s”。"
 msgstr1 "载入了 %u 个 IP 段，来源为 “%s”。"
 
-#: src/IPFilter.cpp:331
+#: src/IPFilter.cpp
 #, c-format
 msgid "%u malformed line was discarded."
 msgid_plural "%u malformed lines were discarded."
 msgstr0 "丢弃了 %u 行错误数据。"
 msgstr1 "丢弃了 %u 行错误数据。"
 
-#: src/IPFilter.cpp:503
+#: src/IPFilter.cpp
 #, c-format
 msgid "Failed to rename new %s file, aborting update."
 msgstr "重名命新的%s文件失败，放弃更新。"
 
-#: src/IPFilter.cpp:534
+#: src/IPFilter.cpp
 msgid "IP filter is ready"
 msgstr "IP过滤器已准备好"
 
-#: src/KadDlg.cpp:86
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr "从已知用户启动"
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Current"
+msgstr "当前"
 
-#: src/KadDlg.cpp:151
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Running average"
+msgstr "动态平均值"
+
+#: src/KadDlg.cpp src/muuli_wdr.cpp src/StatisticsDlg.cpp
+msgid "Session average"
+msgstr "本次运行平均值"
+
+#: src/KadDlg.cpp
 #, c-format
 msgid "Nodes (%u)"
 msgstr "节点（%u）"
 
-#: src/KadDlg.cpp:183
+#: src/KadDlg.cpp
 msgid "Invalid ip to bootstrap"
 msgstr "无效 IP"
 
-#: src/KadDlg.cpp:189
+#: src/KadDlg.cpp
 msgid "Invalid port to bootstrap"
 msgstr "无效端口"
 
-#: src/KadDlg.cpp:193
+#: src/KadDlg.cpp
 msgid "Please fill all fields required"
 msgstr "请填写所有必要信息"
 
-#: src/KadDlg.cpp:212
+#: src/KadDlg.cpp src/PartFile.cpp src/PrefsUnifiedDlg.cpp
+msgid "Message"
+msgstr "消息"
+
+#: src/KadDlg.cpp
 msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr "确定要下载新的 node.dat 文件吗？\n"
 
-#: src/KadDlg.cpp:213
+#: src/KadDlg.cpp
 msgid "Doing so will remove your current nodes and restart Kademlia connection."
 msgstr "这样将删除您当前节点并重启 Kad 连接。"
 
-#: src/KadDlg.cpp:214
+#: src/KadDlg.cpp
 msgid "Continue?"
 msgstr "继续？"
 
-#: src/kademlia/kademlia/SearchManager.cpp:154
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: search keyword too short"
 msgstr "Kad：搜索关键词太短"
 
-#: src/kademlia/kademlia/SearchManager.cpp:167
+#: src/kademlia/kademlia/SearchManager.cpp
 msgid "Kademlia: Search keyword is already on search list: "
 msgstr "Kademila：搜索关键词已经在搜索列表中： "
 
-#: src/kademlia/routing/RoutingZone.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "Failed to read nodes.dat file - too old. This version (0) is not supported anymore."
 msgstr "无法读取 node.dat 档案 - 版本 （0） 太旧，已经不再支持了。"
 
-#: src/kademlia/routing/RoutingZone.cpp:209
-#: src/kademlia/routing/RoutingZone.cpp:283
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Read %u Kad contact"
 msgid_plural "Read %u Kad contacts"
 msgstr0 "读取 %u 个 Kad 联系人"
 msgstr1 "读取 %u 个 Kad 联系人"
 
-#: src/kademlia/routing/RoutingZone.cpp:221
-#: src/kademlia/routing/RoutingZone.cpp:287
+#: src/kademlia/routing/RoutingZone.cpp
 msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr "没有找到联系人，请尝试 bootstrap 或者下载一个 nodes.dat 文件。"
 
-#: src/kademlia/routing/RoutingZone.cpp:305
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Only %d Kad contact available, nodes.dat not written"
 msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr0 "只有 %d 个 Kad 联系人可用，nodes.dat 没有写入"
 msgstr1 "只有%d个Kad联系人可用，nodes.dat没有写入"
 
-#: src/kademlia/routing/RoutingZone.cpp:336
+#: src/kademlia/routing/RoutingZone.cpp
 #, c-format
 msgid "Wrote %d Kad contact"
 msgid_plural "Wrote %d Kad contacts"
 msgstr0 "已写入 %d 个 Kad 联系人"
 msgstr1 "已写入%d个Kad联系人"
 
-#: src/KnownFile.cpp:1693 src/PartFileConvertDlg.cpp:93
+#: src/KnownFile.cpp
+msgid "Kad user"
+msgstr "Kad 用户"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: Kad is not connected"
+msgstr "“%s” 的 Kad 笔记搜索未启动：Kad 未连接"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: a note lookup is already running for this file"
+msgstr "“%s” 的 Kad 笔记搜索未启动：已经有一个该文件的笔记查询在运行"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: file is not in the shared list, download queue or search results"
+msgstr "“%s” 的 Kad 笔记搜索未启动：文件不在共享列表、下载队列或搜索结果中"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: another Kad search (e.g. a source search) is already using this file's hash - try again shortly"
+msgstr "“%s” 的 Kad 笔记搜索未启动：另一个 Kad 搜索（比如来源搜索）已经在使用此文件的哈希值 —— 请稍后重试"
+
+#: src/KnownFile.cpp
+#, c-format
+msgid "Kad note search for '%s' not started: PrepareLookup failed"
+msgstr "“%s” 的 Kad 笔记搜索未启动：PrepareLookup 失败"
+
+#: src/KnownFile.cpp src/PartFileConvertDlg.cpp
 msgid "File name"
 msgstr "文件名"
 
-#: src/KnownFile.cpp:1694
+#: src/KnownFile.cpp
 msgid "File size"
 msgstr "文件大小"
 
-#: src/KnownFile.cpp:1695
+#: src/KnownFile.cpp
 msgid "Share ratio"
 msgstr "共享率"
 
-#: src/KnownFile.cpp:1696 src/SharedFilePeersListCtrl.cpp:31
-#: src/SourceListCtrl.cpp:31
-msgid "Uploaded"
-msgstr "已上传"
-
-#: src/KnownFile.cpp:1697 src/muuli_wdr.cpp:2941
+#: src/KnownFile.cpp src/muuli_wdr.cpp
 msgid "Requested"
 msgstr "已请求"
 
-#: src/KnownFile.cpp:1698
+#: src/KnownFile.cpp
 msgid "Accepted"
 msgstr "已接受"
 
-#: src/KnownFile.cpp:1700
+#: src/KnownFile.cpp
 msgid "Complete sources"
 msgstr "完成的源"
 
-#: src/KnownFileList.cpp:119
+#: src/KnownFileList.cpp
 msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr "警告: 已知文件列表已经损坏，包含有非法头部。"
 
-#: src/KnownFileList.cpp:146
+#: src/KnownFileList.cpp
 msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr "在已知文件列表载入条目失败，文件可能损坏"
 
-#: src/KnownFileList.cpp:155
+#: src/KnownFileList.cpp
 msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr "已知文件列表包含非法条目，文件可能损坏："
 
-#: src/libs/common/Format.cpp:306
+#: src/LanguageList.cpp
+msgid "System default"
+msgstr "系统默认"
+
+#: src/LanguageList.cpp
+msgid "Albanian"
+msgstr "阿尔巴尼亚语"
+
+#: src/LanguageList.cpp
+msgid "Arabic"
+msgstr "阿拉伯语"
+
+#: src/LanguageList.cpp
+msgid "Asturian"
+msgstr "澳大利亚"
+
+#: src/LanguageList.cpp
+msgid "Basque"
+msgstr "巴斯克语"
+
+#: src/LanguageList.cpp
+msgid "Bulgarian"
+msgstr "保加利亚语"
+
+#: src/LanguageList.cpp
+msgid "Catalan"
+msgstr "加泰罗尼亚语"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Simplified)"
+msgstr "简体中文"
+
+#: src/LanguageList.cpp
+msgid "Chinese (Traditional)"
+msgstr "繁体中文"
+
+#: src/LanguageList.cpp
+msgid "Croatian"
+msgstr "克罗的亚语"
+
+#: src/LanguageList.cpp
+msgid "Czech"
+msgstr "捷克语"
+
+#: src/LanguageList.cpp
+msgid "Danish"
+msgstr "丹麦语"
+
+#: src/LanguageList.cpp
+msgid "Dutch"
+msgstr "荷兰语"
+
+#: src/LanguageList.cpp
+msgid "English (U.K.)"
+msgstr "英语（英国）"
+
+#: src/LanguageList.cpp
+msgid "English (U.S.)"
+msgstr "英语（美国）"
+
+#: src/LanguageList.cpp
+msgid "Estonian"
+msgstr "爱斯托尼亚语"
+
+#: src/LanguageList.cpp
+msgid "Finnish"
+msgstr "芬兰语"
+
+#: src/LanguageList.cpp
+msgid "French"
+msgstr "法语"
+
+#: src/LanguageList.cpp
+msgid "Galician"
+msgstr "加利西亚语"
+
+#: src/LanguageList.cpp
+msgid "German"
+msgstr "德语"
+
+#: src/LanguageList.cpp
+msgid "Greek"
+msgstr "希腊语"
+
+#: src/LanguageList.cpp
+msgid "Hebrew"
+msgstr "希伯来语"
+
+#: src/LanguageList.cpp
+msgid "Hungarian"
+msgstr "匈牙利语"
+
+#: src/LanguageList.cpp
+msgid "Italian"
+msgstr "意大利语"
+
+#: src/LanguageList.cpp
+msgid "Japanese"
+msgstr "日语"
+
+#: src/LanguageList.cpp
+msgid "Korean"
+msgstr "韩语"
+
+#: src/LanguageList.cpp
+msgid "Latvian"
+msgstr "拉脱维亚语"
+
+#: src/LanguageList.cpp
+msgid "Lithuanian"
+msgstr "立陶宛语"
+
+#: src/LanguageList.cpp
+msgid "Norwegian (Nynorsk)"
+msgstr "新挪威语"
+
+#: src/LanguageList.cpp
+msgid "Polish"
+msgstr "芬兰语"
+
+#: src/LanguageList.cpp
+msgid "Portuguese"
+msgstr "葡萄牙语"
+
+#: src/LanguageList.cpp
+msgid "Portuguese (Brazilian)"
+msgstr "葡萄牙语（巴西）"
+
+#: src/LanguageList.cpp
+msgid "Romanian"
+msgstr "罗马尼亚语"
+
+#: src/LanguageList.cpp
+msgid "Russian"
+msgstr "俄语"
+
+#: src/LanguageList.cpp
+msgid "Slovenian"
+msgstr "斯洛文尼亚语"
+
+#: src/LanguageList.cpp
+msgid "Spanish"
+msgstr "西班牙语"
+
+#: src/LanguageList.cpp
+msgid "Swedish"
+msgstr "瑞典语"
+
+#: src/LanguageList.cpp
+msgid "Turkish"
+msgstr "土耳其语"
+
+#: src/LanguageList.cpp
+msgid "Ukrainian"
+msgstr "乌克兰"
+
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unknown error %d"
 msgstr "未知错误 %d"
 
-#: src/libs/common/Format.cpp:311 src/libs/common/Format.cpp:320
+#: src/libs/common/Format.cpp
 #, c-format
 msgid "Unable to get error description for error %d"
 msgstr "无法获取错误 %d 的错误描述"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:4260
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Hashing"
 msgstr "正在计算哈希"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:4266
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Completing"
 msgstr "即将完成"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:4269
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/PartFile.cpp
 msgid "Complete"
 msgstr "已完成"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:691
-#: src/PartFile.cpp:4272 src/TransferWnd.cpp:350
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Paused"
 msgstr "已暂停"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:690
-#: src/PartFile.cpp:4275 src/TransferWnd.cpp:349
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Erroneous"
 msgstr "已出错"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:688
-#: src/PartFile.cpp:4284 src/TransferWnd.cpp:347
+#: src/libs/ec/cpp/ECSpecialTags.cpp src/OtherFunctions.cpp src/PartFile.cpp
+#: src/TransferWnd.cpp
 msgid "Waiting"
 msgstr "等待中"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:148 src/libs/ec/cpp/RemoteConnect.cpp:156
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "You must specify a non-empty password."
 msgstr "您必须输入一个非空密码。"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:153
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Invalid password, not a MD5 hash!"
 msgstr "密码无效，不是一个 MD5 哈希值！"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:242
+#: src/libs/ec/cpp/RemoteConnect.cpp
+#, c-format
+msgid "Could not resolve %s to an IPv4 address."
+msgstr "无法解析 %s 到 IPv4 地址。"
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Connection failure"
 msgstr "连接失败"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:254
-msgid "External Connection lost — exiting."
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection lost - exiting."
 msgstr "外部连接丢失 — 正在退出。"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:318
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "EC connection failed. Empty reply."
 msgstr "远程连接失败，回复为空。"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:329
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "Could not set up connection encryption. Connection closed."
+msgstr "无法设置连接加密。连接关闭。"
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "The core did not negotiate an encrypted connection. It may be an older aMule without encryption support, or the connection may have been tampered with. To connect without encryption, turn it off in the connection settings."
+msgstr "核心未协商加密连接。它可能是没有加密支持的较老的 aMule，或者该连接可能已遭篡改。要进行不加密连接，在连接设置中关闭它。"
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr "远程连接：错误回应，握手失败。连接已经关闭。"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:337
+#: src/libs/ec/cpp/RemoteConnect.cpp
+msgid "External Connection: the daemon failed to prove it knows the password. Connection closed."
+msgstr "外部连接：守护进程未能证明它知道密码。连接关闭。"
+
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established to aMule "
 msgstr "成功！已建立到 aMule 的连接 "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:340
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "Succeeded! Connection established."
 msgstr "成功！已经建立连接。"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:368
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Access denied because: "
 msgstr "远程连接：访问被拒绝，原因："
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:371
+#: src/libs/ec/cpp/RemoteConnect.cpp
 msgid "External Connection: Handshake failed."
 msgstr "远程连接：握手失败。"
 
-#: src/LibSocketAsio.cpp:1592
+#: src/LibSocketAsio.cpp
+#, c-format
+msgid "Error creating UDP socket %s %d : %s"
+msgstr "创建 UDP 套接字 %s %d 出错：%s"
+
+#: src/LibSocketAsio.cpp
 #, c-format
 msgid "Asio thread %d started"
 msgstr "Asio 线程 %d 已启动"
 
-#: src/ListenSocket.cpp:63
+#: src/ListenSocket.cpp
 msgid "ListenSocket: Ok."
 msgstr "ListenSocket: Ok."
 
-#: src/ListenSocket.cpp:65
+#: src/ListenSocket.cpp
 msgid "ERROR: Could not listen to TCP port."
 msgstr "错误: 无法监听 TCP 端口。"
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "ERROR: "
 msgstr "错误: "
 
-#: src/Logger.cpp:341
+#: src/Logger.cpp
 msgid "WARNING: "
 msgstr "警告: "
 
-#: src/MuleNotebook.cpp:181 src/muuli_wdr.cpp:765 src/muuli_wdr.cpp:1181
-#: src/muuli_wdr.cpp:2845 src/muuli_wdr.cpp:3078
+#: src/MediaProbe.cpp
+msgid "Media metadata: no ffprobe binary found. Install ffmpeg, or set the ffprobe path in preferences; length, bitrate and codec will not be extracted."
+msgstr "媒体元数据：未找到 ffprobe 二进制文件。安装 ffmpeg，或在首选项中设置 ffprobe 路径；不会提取长度、比特率和编解码器信息。"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: %s is gone, nothing to extract"
+msgstr "媒体元数据：缺少 %s，没有可提取的信息"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Extracting media metadata with ffprobe: %s"
+msgstr "正用 ffprobe 提取媒体元数据：%s"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe timed out or was cancelled for %s"
+msgstr "媒体元数据：ffprobe 超时或取消了 %s 的 ffprobe"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ignoring implausibly large ffprobe output for %s"
+msgstr "媒体元数据：忽略 %s 的难以置信的大 ffprobe 输出"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: could not run ffprobe (%s) -- check the media metadata settings"
+msgstr "媒体元数据：无法运行 ffprobe (%s) —— 检查媒体元数据设置"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe failed (code %d) for %s"
+msgstr "媒体元数据：%2$s 的 ffprobe 失败（代码 %1$d）"
+
+#: src/MediaProbe.cpp
+#, c-format
+msgid "Media metadata: ffprobe found nothing usable in %s"
+msgstr "媒体元数据：ffprobe 没有在 %s 找到可用信息"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file (%u failed)"
+msgid_plural "Finished extracting media metadata from %u shared files (%u failed)"
+msgstr0 "已完成从 %u 个共享文件中提取媒体元数据（%u 个失败）"
+msgstr1 "已完成从 %u 个共享文件中提取媒体元数据（%u 个失败）"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "Finished extracting media metadata from %u shared file"
+msgid_plural "Finished extracting media metadata from %u shared files"
+msgstr0 "已完成从 %u 个共享文件中提取媒体元数据"
+msgstr1 "已完成从 %u 个共享文件中提取媒体元数据"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further file failed media metadata extraction (not listed individually)"
+msgid_plural "%u further files failed media metadata extraction (not listed individually)"
+msgstr0 "另外 %u 个文件的媒体元数据提取失败（未逐个列出）"
+msgstr1 "另外 %u 个文件的媒体元数据提取失败（未逐个列出）"
+
+#: src/MediaProbeThread.cpp
+#, c-format
+msgid "%u further shared file is gone (not listed individually)"
+msgid_plural "%u further shared files are gone (not listed individually)"
+msgstr0 "找不到另外 %u 个共享文件（未逐个列出）"
+msgstr1 "找不到另外 %u 个共享文件（未逐个列出）"
+
+#: src/MuleNotebook.cpp src/muuli_wdr.cpp
 msgid "Close"
 msgstr "关闭"
 
-#: src/MuleTextCtrl.cpp:79
+#: src/MuleTextCtrl.cpp
 msgid "Cut"
 msgstr "剪切"
 
-#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:388 src/ServerWnd.cpp:393
-#: src/utils/aLinkCreator/src/alcframe.cpp:257
+#: src/MuleTextCtrl.cpp src/PartFileConvert.cpp src/ServerWnd.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy"
 msgstr "复制"
 
-#: src/MuleTextCtrl.cpp:81
+#: src/MuleTextCtrl.cpp src/SearchDlg.cpp
 msgid "Paste"
 msgstr "粘贴"
 
-#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:345 src/muuli_wdr.cpp:707
-#: src/utils/aLinkCreator/src/alcframe.cpp:146
+#: src/MuleTextCtrl.cpp src/muuli_wdr.cpp
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Clear"
 msgstr "清除"
 
-#: src/MuleTextCtrl.cpp:86
+#: src/MuleTextCtrl.cpp
 msgid "Select All"
 msgstr "全选"
 
-#: src/MuleTrayIcon.cpp:367
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp src/OtherFunctions.cpp
+#: src/StatisticsDlg.cpp
+msgid "KiB/s"
+msgstr "KiB/s"
+
+#: src/MuleTrayIcon.cpp
+msgid "Unlimited"
+msgstr "无限制"
+
+#: src/MuleTrayIcon.cpp
+msgid "Show aMule"
+msgstr "显示 aMule"
+
+#: src/MuleTrayIcon.cpp
+msgid "Hide aMule"
+msgstr "隐藏 aMule"
+
+#: src/MuleTrayIcon.cpp
 msgid "eD2k: "
 msgstr "eD2k： "
 
-#: src/MuleTrayIcon.cpp:370
+#: src/MuleTrayIcon.cpp
 msgid "Connected (LowID)"
 msgstr "已连接 (LowID)"
 
-#: src/MuleTrayIcon.cpp:371
+#: src/MuleTrayIcon.cpp
 msgid "Connected (HighID)"
 msgstr "已连接 (HighID)"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/MuleTrayIcon.cpp
 msgid "Kad: "
 msgstr "Kad: "
 
-#: src/MuleTrayIcon.cpp:383
+#: src/MuleTrayIcon.cpp
 msgid "Connected (firewalled)"
 msgstr "已连接 (有防火墙)"
 
-#: src/MuleTrayIcon.cpp:393
+#: src/MuleTrayIcon.cpp
 msgid "Server: "
 msgstr "服务器： "
 
-#: src/MuleTrayIcon.cpp:394
+#: src/MuleTrayIcon.cpp
 msgid "Server IP: "
 msgstr "服务器 IP: "
 
-#: src/MuleTrayIcon.cpp:399 src/MuleTrayIcon.cpp:400 src/MuleTrayIcon.cpp:823
-#: src/MuleTrayIcon.cpp:837 src/TextClient.cpp:811 src/TextClient.cpp:824
+#: src/MuleTrayIcon.cpp src/TextClient.cpp
 msgid "Not connected"
 msgstr "未连接"
 
-#: src/MuleTrayIcon.cpp:407 src/MuleTrayIcon.cpp:846
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: src/MuleTrayIcon.cpp:414 src/MuleTrayIcon.cpp:855
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "TCP port: %d"
 msgstr "TCP 端口: %d"
 
-#: src/MuleTrayIcon.cpp:415 src/MuleTrayIcon.cpp:857
+#: src/MuleTrayIcon.cpp
 msgid "TCP port: Not ready"
 msgstr "TCP 端口: 未就绪"
 
-#: src/MuleTrayIcon.cpp:418 src/MuleTrayIcon.cpp:866
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UDP port: %d"
 msgstr "UDP 端口: %d"
 
-#: src/MuleTrayIcon.cpp:419 src/MuleTrayIcon.cpp:868
+#: src/MuleTrayIcon.cpp
 msgid "UDP port: Not ready"
 msgstr "UDP 端口: 未就绪"
 
-#: src/MuleTrayIcon.cpp:423 src/MuleTrayIcon.cpp:807
+#: src/MuleTrayIcon.cpp
 msgid "Client Information"
 msgstr "客户端信息"
 
-#: src/MuleTrayIcon.cpp:441 src/MuleTrayIcon.cpp:924
+#: src/MuleTrayIcon.cpp
 msgid "Upload limit"
 msgstr "上传限制"
 
-#: src/MuleTrayIcon.cpp:454 src/MuleTrayIcon.cpp:928
+#: src/MuleTrayIcon.cpp
 msgid "Download limit"
 msgstr "下载限制"
 
-#: src/MuleTrayIcon.cpp:480 src/MuleTrayIcon.cpp:491 src/MuleTrayIcon.cpp:990
-msgid "Show aMule"
-msgstr "显示 aMule"
+#: src/MuleTrayIcon.cpp
+msgid "Disconnect"
+msgstr "断开连接"
 
-#: src/MuleTrayIcon.cpp:483 src/MuleTrayIcon.cpp:490 src/MuleTrayIcon.cpp:988
-msgid "Hide aMule"
-msgstr "隐藏 aMule"
+#: src/MuleTrayIcon.cpp src/muuli_wdr.cpp
+msgid "Connect"
+msgstr "连接"
 
-#: src/MuleTrayIcon.cpp:501 src/MuleTrayIcon.cpp:997
-#: src/utils/aLinkCreator/src/alcframe.cpp:229
+#: src/MuleTrayIcon.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Exit"
 msgstr "退出"
 
-#: src/MuleTrayIcon.cpp:569 src/MuleTrayIcon.cpp:945 src/MuleTrayIcon.cpp:966
-#: src/muuli_wdr.cpp:1324 src/muuli_wdr.cpp:1332 src/muuli_wdr.cpp:1339
-#: src/muuli_wdr.cpp:1648 src/muuli_wdr.cpp:1654 src/OtherFunctions.cpp:94
-#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
-msgid "kB/s"
-msgstr "KB/s"
-
-#: src/MuleTrayIcon.cpp:584 src/MuleTrayIcon.cpp:603 src/MuleTrayIcon.cpp:932
-#: src/MuleTrayIcon.cpp:953
-msgid "Unlimited"
-msgstr "无限制"
-
-#: src/MuleTrayIcon.cpp:769
+#: src/MuleTrayIcon.cpp
 msgid "aMule Tray Menu"
 msgstr "aMule 托盘菜单"
 
-#: src/MuleTrayIcon.cpp:775
+#: src/MuleTrayIcon.cpp
 msgid "Speed limits:"
 msgstr "速度限制:"
 
-#: src/MuleTrayIcon.cpp:780
+#: src/MuleTrayIcon.cpp
 msgid "UL: None"
 msgstr "上传: 无"
 
-#: src/MuleTrayIcon.cpp:783
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "UL: %u"
 msgstr "上传: %u"
 
-#: src/MuleTrayIcon.cpp:790
+#: src/MuleTrayIcon.cpp
 msgid "DL: None"
 msgstr "下载: 无"
 
-#: src/MuleTrayIcon.cpp:793
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "DL: %u"
 msgstr "下载: %u"
 
-#: src/MuleTrayIcon.cpp:797
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Download speed: %.1f%s"
 msgstr "下载速度: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:800
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Upload speed: %.1f%s"
 msgstr "上传速度: %.1f%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Nickname: %s"
 msgstr "昵称：%s"
 
-#: src/MuleTrayIcon.cpp:811
+#: src/MuleTrayIcon.cpp
 msgid "No Nickname Selected!"
 msgstr "未选择昵称！"
 
-#: src/MuleTrayIcon.cpp:818
+#: src/MuleTrayIcon.cpp
 msgid "ClientID: "
 msgstr "客户端 ID: "
 
-#: src/MuleTrayIcon.cpp:830
+#: src/MuleTrayIcon.cpp
 msgid "ServerName: "
 msgstr "服务器名称: "
 
-#: src/MuleTrayIcon.cpp:831
+#: src/MuleTrayIcon.cpp
 msgid "ServerIP: "
 msgstr "服务器 IP: "
 
-#: src/MuleTrayIcon.cpp:838 src/ServerWnd.cpp:204
-#: src/utils/wxCas/src/onlinesig.cpp:259
+#: src/MuleTrayIcon.cpp src/ServerWnd.cpp src/utils/wxCas/src/onlinesig.cpp
 msgid "Not Connected"
 msgstr "未连接"
 
-#: src/MuleTrayIcon.cpp:877
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Enabled"
 msgstr "在线签名: 启用"
 
-#: src/MuleTrayIcon.cpp:880
+#: src/MuleTrayIcon.cpp
 msgid "Online Signature: Disabled"
 msgstr "在线签名: 禁用"
 
-#: src/MuleTrayIcon.cpp:887 src/Statistics.cpp:792
+#: src/MuleTrayIcon.cpp src/Statistics.cpp
 #, c-format
 msgid "Uptime: %s"
 msgstr "运行时间: %s"
 
-#: src/MuleTrayIcon.cpp:893
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Shared files: %d"
 msgstr "共享文件: %d"
 
-#: src/MuleTrayIcon.cpp:899
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Queued clients: %d"
 msgstr "排队客户端: %d"
 
-#: src/MuleTrayIcon.cpp:906
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total DL: %s"
 msgstr "总下载: %s"
 
-#: src/MuleTrayIcon.cpp:913
+#: src/MuleTrayIcon.cpp
 #, c-format
 msgid "Total UL: %s"
 msgstr "总上传: %s"
 
-#: src/muuli_wdr.cpp:97
-msgid "eD2k Link: "
-msgstr "eD2k 链接: "
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "Created %s at port %u"
+msgstr "在端口 %2$u 创建了 %1$s"
 
-#: src/muuli_wdr.cpp:102
-msgid "Commit"
-msgstr "确定"
+#: src/MuleUDPSocket.cpp
+#, c-format
+msgid "WARNING! %s: Packet to %s discarded due to error (%s) while sending."
+msgstr "警告！ %s: 数据包将 %s 被丢弃，因发送时的错误 (%s) 。"
 
-#: src/muuli_wdr.cpp:103
+#: src/muuli_wdr.cpp
+msgid "Paste eD2k or magnet links here"
+msgstr "在此添加 eD2k 或 magnet 链接"
+
+#: src/muuli_wdr.cpp
+msgid "Add links"
+msgstr "添加链接"
+
+#: src/muuli_wdr.cpp
 msgid "Click here to add the eD2k link in the text control to your download queue."
 msgstr "点击此处将添加文本框中的 eD2k 链接至下载队列。"
 
-#: src/muuli_wdr.cpp:109
-msgid "Events are displayed here. For a complete list of events, refer to the log in the Servers-tab."
-msgstr "此处显示系统事件。如需完整事件列表，请到服务器分页。"
+#: src/muuli_wdr.cpp
+msgid "Events are displayed here. For a complete list of events, refer to the log in the Networks tab."
+msgstr "此处显示事件。如需完整事件列表，请查看网络分页中的“登录”。"
 
-#: src/muuli_wdr.cpp:112
+#: src/muuli_wdr.cpp
 msgid "Loading ..."
 msgstr "正在载入..."
 
-#: src/muuli_wdr.cpp:119
+#: src/muuli_wdr.cpp
 msgid "Number of users on the server you are connected to ..."
 msgstr "当前服务器上用户数..."
 
-#: src/muuli_wdr.cpp:122
+#: src/muuli_wdr.cpp
 msgid "Users: 0"
 msgstr "用户: 0"
 
-#: src/muuli_wdr.cpp:123
+#: src/muuli_wdr.cpp
 msgid "Users connected to the current server and an estimate of the total number of users."
 msgstr "当前服务器上的用户和估算总用户数。"
 
-#: src/muuli_wdr.cpp:131
+#: src/muuli_wdr.cpp
 msgid "Up: 0.0 | Down: 0.0"
 msgstr "上传: 0.0 | 下载: 0.0"
 
-#: src/muuli_wdr.cpp:132
+#: src/muuli_wdr.cpp
 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:139
+#: src/muuli_wdr.cpp
 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 "显示当前连接状态及当前传送状态。红色箭头表示未连接，黄色箭头表示 Low ID (有防火墙)，绿色箭头表示正常连接(最佳连接方式)。"
 
-#: src/muuli_wdr.cpp:142
+#: src/muuli_wdr.cpp
 msgid "Not Connected ..."
 msgstr "未连接..."
 
-#: src/muuli_wdr.cpp:143
+#: src/muuli_wdr.cpp
 msgid "Currently connected server."
 msgstr "现在已连接的服务器。"
 
-#: src/muuli_wdr.cpp:186
+#: src/muuli_wdr.cpp
 msgid "Search"
 msgstr "搜索"
 
-#: src/muuli_wdr.cpp:192
-msgid "Name:"
-msgstr "名称:"
-
-#: src/muuli_wdr.cpp:198 src/SearchListCtrl.cpp:97 src/SharedFilesCtrl.cpp:105
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
 msgid "Type"
 msgstr "类型"
 
-#: src/muuli_wdr.cpp:202 src/SearchDlg.cpp:109 src/SearchListCtrl.cpp:808
+#: src/muuli_wdr.cpp src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Local"
 msgstr "本地"
 
-#: src/muuli_wdr.cpp:203
+#: src/muuli_wdr.cpp
 msgid "Global"
 msgstr "全局"
 
-#: src/muuli_wdr.cpp:210
+#: src/muuli_wdr.cpp
 msgid "Extended Parameters"
 msgstr "附加参数"
 
-#: src/muuli_wdr.cpp:214
+#: src/muuli_wdr.cpp
 msgid "Filtering"
 msgstr "过滤"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp
 msgid "File Type"
 msgstr "文件类型"
 
-#: src/muuli_wdr.cpp:227 src/OtherFunctions.cpp:251
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Any"
 msgstr "任何"
 
-#: src/muuli_wdr.cpp:228 src/OtherFunctions.cpp:216
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Archives"
 msgstr "归档"
 
-#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:209 src/OtherFunctions.cpp:694
-#: src/TransferWnd.cpp:357
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Audio"
 msgstr "音频"
 
-#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:223 src/OtherFunctions.cpp:696
-#: src/TransferWnd.cpp:359
-msgid "CD-Images"
-msgstr "CD 映像"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
+msgid "Disc images"
+msgstr "磁盘映像"
 
-#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:230 src/OtherFunctions.cpp:697
-#: src/TransferWnd.cpp:360
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Pictures"
 msgstr "图片"
 
-#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:244
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Programs"
 msgstr "程序"
 
-#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:237
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Texts"
 msgstr "文本"
 
-#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:202
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Videos"
 msgstr "视频"
 
-#: src/muuli_wdr.cpp:247
+#: src/muuli_wdr.cpp
 msgid "Extension"
 msgstr "扩展名"
 
-#: src/muuli_wdr.cpp:251
+#: src/muuli_wdr.cpp
 msgid "Min Size"
 msgstr "大小下限"
 
-#: src/muuli_wdr.cpp:259 src/muuli_wdr.cpp:278
+#: src/muuli_wdr.cpp
 msgid "Bytes"
 msgstr "字节"
 
-#: src/muuli_wdr.cpp:260 src/muuli_wdr.cpp:279
-msgid "KB"
-msgstr "KB"
-
-#: src/muuli_wdr.cpp:261 src/muuli_wdr.cpp:280 src/muuli_wdr.cpp:1536
-#: src/OtherFunctions.cpp:65
-msgid "MB"
-msgstr "MB"
-
-#: src/muuli_wdr.cpp:262 src/muuli_wdr.cpp:281 src/OtherFunctions.cpp:67
-msgid "GB"
-msgstr "GB"
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "KiB"
+msgstr "KiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp src/PrefsUnifiedDlg.cpp
+msgid "MiB"
+msgstr "MiB"
+
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
+msgid "GiB"
+msgstr "GiB"
 
-#: src/muuli_wdr.cpp:270
+#: src/muuli_wdr.cpp
 msgid "Max Size"
 msgstr "大小上限"
 
-#: src/muuli_wdr.cpp:289
+#: src/muuli_wdr.cpp
 msgid "Availability"
 msgstr "可用来源数"
 
-#: src/muuli_wdr.cpp:299
-msgid "Filter:"
-msgstr "过滤："
-
-#: src/muuli_wdr.cpp:305
-msgid "Filter Results"
-msgstr "过滤结果"
+#: src/muuli_wdr.cpp
+msgid "Filter"
+msgstr "过滤"
 
-#: src/muuli_wdr.cpp:309
+#: src/muuli_wdr.cpp
 msgid "Invert Result"
 msgstr "反向排序结果"
 
-#: src/muuli_wdr.cpp:313
+#: src/muuli_wdr.cpp
 msgid "Hide Known Files"
 msgstr "隐藏已知文件"
 
-#: src/muuli_wdr.cpp:319 src/utils/aLinkCreator/src/alcframe.cpp:223
+#: src/muuli_wdr.cpp
+msgid "Reset Filters"
+msgstr "重置筛选器"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Start"
 msgstr "开始"
 
-#: src/muuli_wdr.cpp:324
-msgid "More"
-msgstr "更多"
+#: src/muuli_wdr.cpp
+msgid "Extend"
+msgstr "扩展"
 
-#: src/muuli_wdr.cpp:325
+#: src/muuli_wdr.cpp
 msgid "Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed."
-msgstr "向已响应的 Kad 节点请求扩大搜索范围。每次点击都会查询下一个最近的节点，以获取更多联系人（KADEMLIA_FIND_VALUE_MORE），从而显示搜索初始 alpha 边界遗漏的其他文件匹配项。"
+msgstr "请求已响应的 Kad 对等方扩大搜索范围。每次单击都会查询下一个离得最近的对等方获取更多联系人（KADEMLIA_FIND_VALUE_MORE），从而显示搜索初始 alpha 边界遗漏的其他文件匹配项。"
 
-#: src/muuli_wdr.cpp:330
+#: src/muuli_wdr.cpp
 msgid "Stop"
 msgstr "停止"
 
-#: src/muuli_wdr.cpp:335 src/muuli_wdr.cpp:1318 src/SearchListCtrl.cpp:700
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
 msgid "Download"
 msgstr "下载"
 
-#: src/muuli_wdr.cpp:340
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp
+msgid "Download in category"
+msgstr "下载分类"
+
+#: src/muuli_wdr.cpp
+msgid "Clear Search Results"
+msgstr "清除搜索结果"
+
+#: src/muuli_wdr.cpp
 msgid "Reset Fields"
 msgstr "重置表单"
 
-#: src/muuli_wdr.cpp:350
+#: src/muuli_wdr.cpp
 msgid "Results"
 msgstr "搜索结果"
 
-#: src/muuli_wdr.cpp:376
+#: src/muuli_wdr.cpp
 msgid "Clears completed downloads"
 msgstr "清除已完成的下载"
 
-#: src/muuli_wdr.cpp:415
+#: src/muuli_wdr.cpp
+msgid "Filter:"
+msgstr "过滤："
+
+#: src/muuli_wdr.cpp
 msgid "File sources:"
 msgstr "文件源:"
 
-#: src/muuli_wdr.cpp:466 src/muuli_wdr.cpp:1017 src/PrefsUnifiedDlg.cpp:195
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
 msgid "General"
 msgstr "常规"
 
-#: src/muuli_wdr.cpp:471
-msgid "Full Name :"
-msgstr "全名 :"
-
-#: src/muuli_wdr.cpp:474 src/muuli_wdr.cpp:482 src/muuli_wdr.cpp:490
-#: src/muuli_wdr.cpp:502 src/muuli_wdr.cpp:510 src/muuli_wdr.cpp:518
-#: src/muuli_wdr.cpp:535 src/muuli_wdr.cpp:543 src/muuli_wdr.cpp:551
-#: src/muuli_wdr.cpp:559 src/muuli_wdr.cpp:567 src/muuli_wdr.cpp:575
-#: src/muuli_wdr.cpp:583 src/muuli_wdr.cpp:593 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:622 src/muuli_wdr.cpp:630 src/muuli_wdr.cpp:638
-#: src/muuli_wdr.cpp:1032 src/muuli_wdr.cpp:1035 src/muuli_wdr.cpp:1047
-#: src/muuli_wdr.cpp:1054 src/muuli_wdr.cpp:1059 src/muuli_wdr.cpp:1066
-#: src/muuli_wdr.cpp:1071 src/muuli_wdr.cpp:1078 src/muuli_wdr.cpp:1083
-#: src/muuli_wdr.cpp:1090 src/muuli_wdr.cpp:1102 src/muuli_wdr.cpp:1112
-#: src/muuli_wdr.cpp:1119 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:1131
-#: src/muuli_wdr.cpp:1136 src/muuli_wdr.cpp:1143 src/muuli_wdr.cpp:1157
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1169 src/muuli_wdr.cpp:1176
-#: src/muuli_wdr.cpp:2943 src/muuli_wdr.cpp:2951 src/muuli_wdr.cpp:2959
-msgid "N/A"
-msgstr "N/A"
+#: src/muuli_wdr.cpp
+msgid "Full Name"
+msgstr "全名"
+
+#: src/muuli_wdr.cpp
+msgid "met-File"
+msgstr ".met 文件"
+
+#: src/muuli_wdr.cpp
+msgid "Hash"
+msgstr "哈希值"
 
-#: src/muuli_wdr.cpp:480
-msgid "met-File :"
-msgstr ".met 文件 :"
-
-#: src/muuli_wdr.cpp:488
-msgid "Hash :"
-msgstr "eD2k 文件哈希 :"
-
-#: src/muuli_wdr.cpp:500
-msgid "Filesize :"
-msgstr "文件大小 :"
-
-#: src/muuli_wdr.cpp:508
-msgid "Partfilestatus :"
-msgstr "part 文件状态 :"
-
-#: src/muuli_wdr.cpp:516
-msgid "Last seen complete :"
-msgstr "最后发现完成的文件 :"
+#: src/muuli_wdr.cpp
+msgid "Filesize"
+msgstr "文件大小"
 
-#: src/muuli_wdr.cpp:524 src/Statistics.cpp:794
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Transfer"
 msgstr "传输"
 
-#: src/muuli_wdr.cpp:533
-msgid "Found Sources :"
-msgstr "已发现源 :"
-
-#: src/muuli_wdr.cpp:541
-msgid "Transferring Sources :"
-msgstr "正在传输的源 :"
-
-#: src/muuli_wdr.cpp:549
-msgid "Filepart-Count :"
-msgstr "文件分块数量 :"
-
-#: src/muuli_wdr.cpp:557
-msgid "Available :"
-msgstr "可用 :"
-
-#: src/muuli_wdr.cpp:565
-msgid "Datarate :"
-msgstr "数据率 :"
-
-#: src/muuli_wdr.cpp:573
-msgid "Download Active Time: "
-msgstr "下载活动时间: "
-
-#: src/muuli_wdr.cpp:581
-msgid "Transferred :"
-msgstr "已传输 :"
-
-#: src/muuli_wdr.cpp:589
-msgid "Completed Size :"
-msgstr "已完成大小 :"
+#: src/muuli_wdr.cpp
+msgid "Partfilestatus"
+msgstr "part 文件状态"
+
+#: src/muuli_wdr.cpp
+msgid "Last seen complete"
+msgstr "最后发现完成的文件"
+
+#: src/muuli_wdr.cpp
+msgid "Found Sources"
+msgstr "已发现源"
+
+#: src/muuli_wdr.cpp
+msgid "Transferring Sources"
+msgstr "正在传输的源"
+
+#: src/muuli_wdr.cpp
+msgid "Filepart-Count"
+msgstr "文件分块数量"
+
+#: src/muuli_wdr.cpp
+msgid "Available"
+msgstr "可用"
+
+#: src/muuli_wdr.cpp
+msgid "Datarate"
+msgstr "数据速率"
+
+#: src/muuli_wdr.cpp
+msgid "Download Active Time"
+msgstr "下载活动时间"
+
+#: src/muuli_wdr.cpp
+msgid "Completed Size"
+msgstr "已完成大小"
 
-#: src/muuli_wdr.cpp:611
+#: src/muuli_wdr.cpp
 msgid "Intelligent Corruption Handling"
 msgstr "智能损坏数据处理"
 
-#: src/muuli_wdr.cpp:620
-msgid "Lost to corruption :"
-msgstr "因数据损坏而丢失 :"
-
-#: src/muuli_wdr.cpp:628
-msgid "Gained by compression :"
-msgstr "压缩效益 :"
-
-#: src/muuli_wdr.cpp:636
-msgid "Packages saved by I.C.H. :"
-msgstr "由 I.C.H. 挽救的数据包 :"
+#: src/muuli_wdr.cpp
+msgid "Lost to corruption"
+msgstr "因数据损坏而丢失"
+
+#: src/muuli_wdr.cpp
+msgid "Gained by compression"
+msgstr "压缩效益"
+
+#: src/muuli_wdr.cpp
+msgid "Packages saved by I.C.H."
+msgstr "由 I.C.H. 挽救的数据包."
+
+#: src/muuli_wdr.cpp
+msgid "Sharing"
+msgstr "正在分享"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Requests"
+msgstr "请求"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Accepted Requests"
+msgstr "接受的请求"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Transferred Data"
+msgstr "已传送数据"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Share Ratio"
+msgstr "共享比率"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Complete Sources"
+msgstr "完成的源"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Shared since"
+msgstr "共享始于"
+
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
+msgid "Last upload"
+msgstr "最后上传"
+
+#: src/muuli_wdr.cpp
+msgid "Media Info"
+msgstr "媒体信息"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Length"
+msgstr "长度"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Bitrate"
+msgstr "比特率"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Codec"
+msgstr "编解码器"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Artist"
+msgstr "艺术家"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Album"
+msgstr "专辑"
+
+#: src/muuli_wdr.cpp src/SearchListCtrl.cpp src/SharedFilesCtrl.cpp
+msgid "Title"
+msgstr "标题"
 
-#: src/muuli_wdr.cpp:644
+#: src/muuli_wdr.cpp
 msgid "File Names"
 msgstr "文件名"
 
-#: src/muuli_wdr.cpp:652
+#: src/muuli_wdr.cpp
 msgid "Takeover"
 msgstr "替换"
 
-#: src/muuli_wdr.cpp:659
+#: src/muuli_wdr.cpp
 msgid "Cleanup"
 msgstr "清除"
 
-#: src/muuli_wdr.cpp:673 src/muuli_wdr.cpp:729
+#: src/muuli_wdr.cpp
 msgid "Apply"
 msgstr "应用"
 
-#: src/muuli_wdr.cpp:677
+#: src/muuli_wdr.cpp
 msgid "Ok"
 msgstr "确定"
 
-#: src/muuli_wdr.cpp:699
+#: src/muuli_wdr.cpp
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "评论/评价文件（文本将对全部用户可见）"
 
-#: src/muuli_wdr.cpp:705
+#: src/muuli_wdr.cpp
 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."
@@ -3107,1128 +4179,1223 @@
 "像电影的话，您可以说明它的长度、情节和语言等等...\n"
 "如果文件是假冒的，您可以提醒其它 aMule 用户。"
 
-#: src/muuli_wdr.cpp:713
+#: src/muuli_wdr.cpp
 msgid "File Quality"
 msgstr "文件质量"
 
-#: src/muuli_wdr.cpp:718 src/OtherFunctions.cpp:271 src/OtherFunctions.cpp:277
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Not rated"
 msgstr "未评价"
 
-#: src/muuli_wdr.cpp:719 src/OtherFunctions.cpp:272
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Invalid / Corrupt / Fake"
 msgstr "无效 / 损坏 / 假冒"
 
-#: src/muuli_wdr.cpp:720 src/OtherFunctions.cpp:273
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Poor"
 msgstr "差"
 
-#: src/muuli_wdr.cpp:721 src/OtherFunctions.cpp:274
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Fair"
 msgstr "一般"
 
-#: src/muuli_wdr.cpp:722 src/OtherFunctions.cpp:275
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Good"
 msgstr "好"
 
-#: src/muuli_wdr.cpp:723 src/OtherFunctions.cpp:276
+#: src/muuli_wdr.cpp src/OtherFunctions.cpp
 msgid "Excellent"
 msgstr "很好"
 
-#: src/muuli_wdr.cpp:726
+#: src/muuli_wdr.cpp
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "选择文件评价或者提醒其它用户该文件是无效的..."
 
-#: src/muuli_wdr.cpp:763
+#: src/muuli_wdr.cpp
+msgid "Get from Kad"
+msgstr "从 Kad 获取"
+
+#: src/muuli_wdr.cpp
 msgid "Refresh"
 msgstr "刷新"
 
-#: src/muuli_wdr.cpp:786
+#: src/muuli_wdr.cpp
 msgid "Downloading, please wait ..."
 msgstr "正在下载，请等待 ..."
 
-#: src/muuli_wdr.cpp:790
+#: src/muuli_wdr.cpp
 msgid "Unknown size"
 msgstr "未知大小"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp
 msgid "Required Information"
 msgstr "必填信息"
 
-#: src/muuli_wdr.cpp:816
-msgid "IP Address :"
-msgstr "IP 地址 :"
-
-#: src/muuli_wdr.cpp:820
-msgid "Port :"
-msgstr "端口 :"
+#: src/muuli_wdr.cpp src/ServerListCtrl.cpp
+msgid "Port"
+msgstr "端口"
 
-#: src/muuli_wdr.cpp:826
+#: src/muuli_wdr.cpp
 msgid "Additional Information"
 msgstr "附加信息"
 
-#: src/muuli_wdr.cpp:831
-msgid "Username :"
-msgstr "用户名 :"
-
-#: src/muuli_wdr.cpp:835
-msgid "Userhash :"
-msgstr "用户哈希 :"
+#: src/muuli_wdr.cpp
+msgid "Userhash"
+msgstr "用户哈希"
 
-#: src/muuli_wdr.cpp:843 src/muuli_wdr.cpp:2167
-#: src/utils/aLinkCreator/src/alcframe.cpp:139
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add"
 msgstr "添加"
 
-#: src/muuli_wdr.cpp:886
+#: src/muuli_wdr.cpp
 msgid "Download-Speed"
 msgstr "下载速度"
 
-#: src/muuli_wdr.cpp:902 src/muuli_wdr.cpp:939 src/muuli_wdr.cpp:2265
-msgid "Current"
-msgstr "当前"
-
-#: src/muuli_wdr.cpp:910 src/muuli_wdr.cpp:947 src/muuli_wdr.cpp:2273
-msgid "Running average"
-msgstr "动态平均值"
-
-#: src/muuli_wdr.cpp:918 src/muuli_wdr.cpp:955 src/muuli_wdr.cpp:2281
-msgid "Session average"
-msgstr "本次运行平均值"
-
-#: src/muuli_wdr.cpp:923
+#: src/muuli_wdr.cpp
 msgid "Upload-Speed"
 msgstr "上传速度"
 
-#: src/muuli_wdr.cpp:960
+#: src/muuli_wdr.cpp
 msgid "Connections"
 msgstr "连接"
 
-#: src/muuli_wdr.cpp:976 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active downloads"
 msgstr "活跃下载"
 
-#: src/muuli_wdr.cpp:984
+#: src/muuli_wdr.cpp
 msgid "Active connections (1:1)"
 msgstr "活跃连接 (1:1)"
 
-#: src/muuli_wdr.cpp:992 src/muuli_wdr.cpp:1674
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active uploads"
 msgstr "活跃上传"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp
 msgid "Statistics Tree"
 msgstr "统计树"
 
-#: src/muuli_wdr.cpp:1024
-msgid "Username:"
-msgstr "用户名："
-
-#: src/muuli_wdr.cpp:1026
-msgid "Userhash:"
-msgstr "用户哈希:"
-
-#: src/muuli_wdr.cpp:1045
-msgid "Client software:"
-msgstr "客户端软件:"
-
-#: src/muuli_wdr.cpp:1052
-msgid "Client version:"
-msgstr "客户端版本:"
+#: src/muuli_wdr.cpp
+msgid "Client software"
+msgstr "客户端软件"
+
+#: src/muuli_wdr.cpp
+msgid "Client version"
+msgstr "客户端版本"
+
+#: src/muuli_wdr.cpp
+msgid "User ID"
+msgstr "用户 ID"
+
+#: src/muuli_wdr.cpp
+msgid "Server IP"
+msgstr "服务器 IP"
 
-#: src/muuli_wdr.cpp:1057 src/ServerWnd.cpp:263
-msgid "IP address:"
-msgstr "IP 地址:"
+#: src/muuli_wdr.cpp
+msgid "Server name"
+msgstr "服务器名称"
+
+#: src/muuli_wdr.cpp
+msgid "Obfuscation"
+msgstr "模糊协议"
 
-#: src/muuli_wdr.cpp:1064
-msgid "User ID:"
-msgstr "用户 ID:"
-
-#: src/muuli_wdr.cpp:1069
-msgid "Server IP:"
-msgstr "服务器 IP:"
-
-#: src/muuli_wdr.cpp:1076
-msgid "Server name:"
-msgstr "服务器名称:"
-
-#: src/muuli_wdr.cpp:1081
-msgid "Obfuscation:"
-msgstr "模糊协议:"
-
-#: src/muuli_wdr.cpp:1088
-msgid "Kad:"
-msgstr "Kad:"
+#: src/muuli_wdr.cpp
+msgid "Protocol extensions"
+msgstr "协议扩展"
 
-#: src/muuli_wdr.cpp:1095
+#: src/muuli_wdr.cpp
 msgid "Transfers to client"
 msgstr "到客户端的传输"
 
-#: src/muuli_wdr.cpp:1100
-msgid "Current request:"
-msgstr "当前请求:"
-
-#: src/muuli_wdr.cpp:1110
-msgid "Average upload rate:"
-msgstr "平均上传速度:"
-
-#: src/muuli_wdr.cpp:1117
-msgid "Average download rate:"
-msgstr "平均下载速度:"
-
-#: src/muuli_wdr.cpp:1122
-msgid "Uploaded (session):"
-msgstr "上传 (本次运行):"
-
-#: src/muuli_wdr.cpp:1129
-msgid "Downloaded (session):"
-msgstr "下载 (本次运行):"
-
-#: src/muuli_wdr.cpp:1134
-msgid "Uploaded (total):"
-msgstr "上传 (总共):"
-
-#: src/muuli_wdr.cpp:1141
-msgid "Downloaded (total):"
-msgstr "下载 (总共):"
+#: src/muuli_wdr.cpp
+msgid "Current request"
+msgstr "当前请求"
+
+#: src/muuli_wdr.cpp
+msgid "Average upload rate"
+msgstr "平均上传速度"
+
+#: src/muuli_wdr.cpp
+msgid "Average download rate"
+msgstr "平均下载速度"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (session)"
+msgstr "上传 (本次运行)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (session)"
+msgstr "下载 (本次运行)"
+
+#: src/muuli_wdr.cpp
+msgid "Uploaded (total)"
+msgstr "上传 (总共)"
+
+#: src/muuli_wdr.cpp
+msgid "Downloaded (total)"
+msgstr "下载 (总共)"
 
-#: src/muuli_wdr.cpp:1148
+#: src/muuli_wdr.cpp
 msgid "Scores"
 msgstr "得分"
 
-#: src/muuli_wdr.cpp:1155
-msgid "DL/UP modifier:"
-msgstr "下载/上传比率:"
-
-#: src/muuli_wdr.cpp:1162
-msgid "Secure ident:"
-msgstr "安全身份认证:"
-
-#: src/muuli_wdr.cpp:1167
-msgid "Queue rank:"
-msgstr "队列等级:"
-
-#: src/muuli_wdr.cpp:1174
-msgid "Queue score:"
-msgstr "队列积分:"
+#: src/muuli_wdr.cpp
+msgid "Secure ident"
+msgstr "安全身份认证"
+
+#: src/muuli_wdr.cpp
+msgid "Queue rank"
+msgstr "等候队伍排名"
+
+#: src/muuli_wdr.cpp
+msgid "Queue score"
+msgstr "队列积分"
 
-#: src/muuli_wdr.cpp:1198
+#: src/muuli_wdr.cpp
 msgid "Nick"
 msgstr "昵称"
 
-#: src/muuli_wdr.cpp:1201
+#: src/muuli_wdr.cpp
 msgid "https://amule-org.github.io - the multi-platform Mule"
 msgstr "https://amule-org.github.io - 跨平台的电骡"
 
-#: src/muuli_wdr.cpp:1202
+#: src/muuli_wdr.cpp
 msgid "This is the name that other users will see when connecting to you."
 msgstr "其他用户连接到您的时候，他们会看到这个名字。"
 
-#: src/muuli_wdr.cpp:1208
+#: src/muuli_wdr.cpp
 msgid "Language: "
 msgstr "语言: "
 
-#: src/muuli_wdr.cpp:1209 src/muuli_wdr.cpp:1256 src/muuli_wdr.cpp:1260
-#: src/muuli_wdr.cpp:1263
+#: src/muuli_wdr.cpp
 msgid "The delay before showing tool-tips."
 msgstr "显示提示前的延迟时间。"
 
-#: src/muuli_wdr.cpp:1214
+#: src/muuli_wdr.cpp
 msgid "This specifies the language used on controls."
 msgstr "这用来指定控制语言。"
 
-#: src/muuli_wdr.cpp:1217
-msgid "Check for new version at startup"
-msgstr "启动时检查新版本"
-
-#: src/muuli_wdr.cpp:1218
-msgid "Enabling this will make aMule check for new version at startup"
-msgstr "启用此选项将让 aMule 启动时检查新版本"
+#: src/muuli_wdr.cpp
+msgid "Periodically check for a new version"
+msgstr "定期检查新版本"
+
+#: src/muuli_wdr.cpp
+msgid "Enabling this will make aMule check for a new version at startup and once a day while running"
+msgstr "启用此选项将让 aMule 检查新版本（开启时检查及运行时每天检查一次）"
 
-#: src/muuli_wdr.cpp:1225
-msgid "Start aMule automatically when I log in"
-msgstr "登录时自动启动 aMule"
-
-#: src/muuli_wdr.cpp:1226
+#: src/muuli_wdr.cpp
 msgid "Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry."
 msgstr "在操作系统中注册一个按用户自动启动的条目，以便在登录时启动 aMule。如果移动了 aMule 的可执行文件，之后请手动启动一次 aMule 以刷新该条目。"
 
-#: src/muuli_wdr.cpp:1229
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here."
+msgstr "让 aMule 成为 ed2k:// 链接的默认处理程序，因而在浏览器或文件管理器中点击一个该类型链接时可以在本应用打开。"
+
+#: src/muuli_wdr.cpp packaging/windows/installer_strings.c
+msgid "aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off."
+msgstr "aMule 仅支持兼容 eD2k 的磁力链接（包含 xt=urn:ed2k:）。不支持 BitTorrent 磁力链接，点击此类链接将静默失败。如果你正在使用 BitTorrent 客户端（如 Transmission、qBittorrent 等），请勿开启此项。"
+
+#: src/muuli_wdr.cpp
+msgid "Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type."
+msgstr "打开链接集合会查询其所包含的每个 eD2k 链接。在 Windows 系统上，这会添加 aMule 到 “打开方式”列表并只在没有其他程序注册了该文件类型时使用默认程序。"
+
+#: src/muuli_wdr.cpp
 msgid "Start minimized"
 msgstr "启动时最小化"
 
-#: src/muuli_wdr.cpp:1230
+#: src/muuli_wdr.cpp
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "启用后会使 aMule 在启动时立即最小化。"
 
-#: src/muuli_wdr.cpp:1233
+#: src/muuli_wdr.cpp
 msgid "Prompt on exit"
 msgstr "退出时确认"
 
-#: src/muuli_wdr.cpp:1235
+#: src/muuli_wdr.cpp
 msgid "Makes aMule prompt before exiting."
 msgstr "在退出前让 aMule 询问。"
 
-#: src/muuli_wdr.cpp:1238
+#: src/muuli_wdr.cpp
 msgid "Enable Tray Icon"
 msgstr "启用状态栏图标"
 
-#: src/muuli_wdr.cpp:1239
+#: src/muuli_wdr.cpp
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "启用/禁用系统状态栏图标。"
 
-#: src/muuli_wdr.cpp:1242
+#: src/muuli_wdr.cpp
 msgid "Hide application window when close button is pressed"
 msgstr "按下关闭按钮时隐藏应用程序窗口"
 
-#: src/muuli_wdr.cpp:1245
+#: src/muuli_wdr.cpp
 msgid "Minimize to Tray Icon"
 msgstr "最小化至系统状态栏图标"
 
-#: src/muuli_wdr.cpp:1246
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule minimize to the System Tray, rather than the taskbar."
 msgstr "启用此选项将使 aMule 最小化到系统状态栏，而不是任务栏。"
 
-#: src/muuli_wdr.cpp:1249
+#: src/muuli_wdr.cpp
 msgid "Show notifications when finished downloading"
 msgstr "下载完成后通知"
 
-#: src/muuli_wdr.cpp:1250
+#: src/muuli_wdr.cpp
 msgid "Enabling this will make aMule to show notifications when finished downloading."
 msgstr "启用此项将使 aMule 在下载完成时显示通知。"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp
+msgid "Remember search history"
+msgstr "记住搜索历史"
+
+#: src/muuli_wdr.cpp
+msgid "Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned."
+msgstr "在搜索标签页的名称字段中保留过往搜索词的下拉列表。这会让程序记住你输入过的搜索词，而非返回的搜索结果。"
+
+#: src/muuli_wdr.cpp
 msgid "Tooltip delay time: "
 msgstr "工具提示延迟时间: "
 
-#: src/muuli_wdr.cpp:1262
+#: src/muuli_wdr.cpp
 msgid "seconds"
 msgstr "秒"
 
-#: src/muuli_wdr.cpp:1266
+#: src/muuli_wdr.cpp
 msgid "Browser Selection"
 msgstr "浏览器"
 
-#: src/muuli_wdr.cpp:1272
+#: src/muuli_wdr.cpp
 msgid "Enter your browser name here. Leave this field empty to use the system default browser."
 msgstr "在此处输入您的浏览器名称，如要使用系统默认浏览器则请留空。"
 
-#: src/muuli_wdr.cpp:1275 src/muuli_wdr.cpp:1292 src/muuli_wdr.cpp:1569
-#: src/muuli_wdr.cpp:1581 src/muuli_wdr.cpp:2480
-#: src/utils/aLinkCreator/src/alcframe.cpp:136
-#: src/utils/wxCas/src/wxcasprefs.cpp:56 src/utils/wxCas/src/wxcasprefs.cpp:131
-msgid "Browse"
-msgstr "浏览"
-
-#: src/muuli_wdr.cpp:1279
+#: src/muuli_wdr.cpp
 msgid "Open in new tab if possible"
 msgstr "如果可能的话，在新标签页中打开"
 
-#: src/muuli_wdr.cpp:1281
+#: src/muuli_wdr.cpp
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "如果可能的话，在新的标签页中打开而不是新的窗口"
 
-#: src/muuli_wdr.cpp:1285
+#: src/muuli_wdr.cpp
 msgid "Video Player"
 msgstr "视频播放器"
 
-#: src/muuli_wdr.cpp:1312
+#: src/muuli_wdr.cpp
 msgid "Bandwidth limits"
 msgstr "带宽限制"
 
-#: src/muuli_wdr.cpp:1326
+#: src/muuli_wdr.cpp
 msgid "Upload"
 msgstr "上传"
 
-#: src/muuli_wdr.cpp:1334
+#: src/muuli_wdr.cpp
 msgid "Slot Allocation"
 msgstr "槽速度"
 
-#: src/muuli_wdr.cpp:1343
+#: src/muuli_wdr.cpp
 msgid "Ports"
 msgstr "端口"
 
-#: src/muuli_wdr.cpp:1349
-msgid "Standard TCP Port "
-msgstr "标准 TCP 端口 "
-
-#: src/muuli_wdr.cpp:1353
+#: src/muuli_wdr.cpp
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "这是标准的 eD2k 端口，不能被禁用。"
 
-#: src/muuli_wdr.cpp:1356
+#: src/muuli_wdr.cpp
 msgid "UDP port for server requests (TCP+3):"
 msgstr "用户服务器请求的 UDP 端口 (TCP+3):"
 
-#: src/muuli_wdr.cpp:1358
+#: src/muuli_wdr.cpp
 msgid "4665"
 msgstr "4665"
 
-#: src/muuli_wdr.cpp:1361
-msgid "Extended UDP port (Kad / global search) "
-msgstr "扩展 UDP 端口 (Kad/全局搜索) "
-
-#: src/muuli_wdr.cpp:1365
+#: src/muuli_wdr.cpp
 msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "此 UDP 端口用于扩展 eD2k 请求和 Kad 网络"
 
-#: src/muuli_wdr.cpp:1368
-msgid "Enable UPnP for router port forwarding"
-msgstr "启用 UPnP 以用于路由器端口转发"
-
-#: src/muuli_wdr.cpp:1372
+#: src/muuli_wdr.cpp
 msgid "UPnP TCP Port (Optional):"
 msgstr "UPnP 的 TCP 端口 (可选):"
 
-#: src/muuli_wdr.cpp:1382
+#: src/muuli_wdr.cpp
 msgid "Bind local address to IP (empty for any):"
 msgstr "为本地地址绑定 IP (全部绑定则留空):"
 
-#: src/muuli_wdr.cpp:1385
+#: src/muuli_wdr.cpp
 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:1391
+#: src/muuli_wdr.cpp
+msgid "Bind to network interface (empty for any):"
+msgstr "绑定网络接口（留空绑定全部）："
+
+#: src/muuli_wdr.cpp
+msgid "Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges."
+msgstr "仅限高级用户：将 aMule 的所有流量绑定到一个网络接口，可以从列表中选择，也可以按名称（例如 tun0、eth0、en0）输入或索引。与绑定到 IP 地址不同，这可以防止流量通过默认路由泄漏—— 在 VPN 环境下有用。无需管理员权限。"
+
+#: src/muuli_wdr.cpp
 msgid "Max sources per downloading file:"
 msgstr "每个下载文件的最大的源数量:"
 
-#: src/muuli_wdr.cpp:1395
+#: src/muuli_wdr.cpp
 msgid "Max simultaneous connections:"
 msgstr "最大同时连接数:"
 
-#: src/muuli_wdr.cpp:1405
-msgid "Kademlia"
-msgstr "Kad"
-
-#: src/muuli_wdr.cpp:1408 src/muuli_wdr.cpp:2885
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "ED2K"
 msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1415
+#: src/muuli_wdr.cpp
 msgid "Autoconnect on startup"
 msgstr "启动后自动连接"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp
 msgid "Reconnect on loss"
 msgstr "断线后自动重连"
 
-#: src/muuli_wdr.cpp:1440
+#: src/muuli_wdr.cpp
 msgid "Remove dead server after"
 msgstr "如果"
 
-#: src/muuli_wdr.cpp:1444
+#: src/muuli_wdr.cpp
+msgid "Static servers are never removed, even when unreachable."
+msgstr "即使静态服务器连不上也永远不删除。"
+
+#: src/muuli_wdr.cpp
 msgid "retries"
 msgstr "次连接失败，则删除该服务器"
 
-#: src/muuli_wdr.cpp:1449
-msgid "Auto-update server list at startup"
-msgstr "启动时自动更新服务器列表"
-
-#: src/muuli_wdr.cpp:1452
+#: src/muuli_wdr.cpp
 msgid "List"
 msgstr "列表"
 
-#: src/muuli_wdr.cpp:1455
+#: src/muuli_wdr.cpp
 msgid "Update server list when connecting to a server"
 msgstr "与服务器连接时更新服务器列表"
 
-#: src/muuli_wdr.cpp:1458
+#: src/muuli_wdr.cpp
 msgid "Update server list when a client connects"
 msgstr "与其他用户连接时更新服务器列表"
 
-#: src/muuli_wdr.cpp:1461
+#: src/muuli_wdr.cpp
 msgid "Use priority system"
 msgstr "启用优先级系统"
 
-#: src/muuli_wdr.cpp:1465
+#: src/muuli_wdr.cpp
 msgid "Use smart LowID check on connect"
 msgstr "连接时启用智能 Low ID 检测"
 
-#: src/muuli_wdr.cpp:1469
+#: src/muuli_wdr.cpp
 msgid "Safe connect"
 msgstr "安全连接"
 
-#: src/muuli_wdr.cpp:1473
+#: src/muuli_wdr.cpp
 msgid "Autoconnect to servers in static list only"
 msgstr "只自动连接到静态服务器列表里的服务器"
 
-#: src/muuli_wdr.cpp:1476
+#: src/muuli_wdr.cpp
 msgid "Set manually added servers to High Priority"
 msgstr "设置手动添加的服务器为高优先级"
 
-#: src/muuli_wdr.cpp:1494
-msgid "Intelligent Corruption Handling (I.C.H.)"
-msgstr "智能损坏数据处理 (I.C.H.)"
-
-#: src/muuli_wdr.cpp:1497
-msgid "Enable"
-msgstr "启用"
-
-#: src/muuli_wdr.cpp:1500
-msgid "Advanced I.C.H. trusts every hash (not recommended)"
-msgstr "高级 I.C.H. 信任全部哈希值 (不推荐)"
-
-#: src/muuli_wdr.cpp:1507
+#: src/muuli_wdr.cpp
 msgid "Add files to download in pause mode"
 msgstr "添加新下载文件时设为暂停状态"
 
-#: src/muuli_wdr.cpp:1509
+#: src/muuli_wdr.cpp
 msgid "Add files to download with auto priority"
 msgstr "添加新下载文件时设定优先级为自动"
 
-#: src/muuli_wdr.cpp:1512
+#: src/muuli_wdr.cpp
 msgid "Try to download first and last chunks first"
 msgstr "尝试先下载文件的第一段和最后一段"
 
-#: src/muuli_wdr.cpp:1515
+#: src/muuli_wdr.cpp
+msgid "Endgame mode: rotate to faster sources for the final blocks"
+msgstr "末端模式：在下载最后的区块时，切换至速度更快的来源"
+
+#: src/muuli_wdr.cpp
 msgid "Start next paused file when a file completes"
 msgstr "当一个文件完成时开始下一个暂停的文件"
 
-#: src/muuli_wdr.cpp:1518
+#: src/muuli_wdr.cpp
 msgid "From the same category"
 msgstr "来自同一分类"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp
 msgid "In alphabetic order"
 msgstr "依照字母顺序"
 
-#: src/muuli_wdr.cpp:1522
+#: src/muuli_wdr.cpp
 msgid "Preallocate disk space for new files"
 msgstr "为新文件预分配磁盘空间"
 
-#: src/muuli_wdr.cpp:1523
+#: src/muuli_wdr.cpp
 msgid "For new files preallocates disk space for the whole file, thus reduces fragmentation"
 msgstr "为新文件分配全部所需的磁盘空间，这样可以减少碎片"
 
-#: src/muuli_wdr.cpp:1528
+#: src/muuli_wdr.cpp
+msgid "Create new files as sparse files"
+msgstr "新建文件为稀疏文件"
+
+#: src/muuli_wdr.cpp
+msgid "Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect."
+msgstr "稀疏的 part 文件只占用已下载部分的磁盘空间，因此可用空间随文件填入逐渐用尽。关闭此选项使用正常的文件 —— 这在稀疏文件不受支持或速度缓慢，或者备份/去重工具对稀疏文件的处理不佳时有用。仅当 aMule 核心在 Windows 系统上运行时应用；在 Linux 和 macOS 系统上 part 文件不论怎样都是稀疏的，此设置没有效果。"
+
+#: src/muuli_wdr.cpp
 msgid "Stop downloads when free disk space reaches "
 msgstr "停止下载当可用磁盘空间只有"
 
-#: src/muuli_wdr.cpp:1529
+#: src/muuli_wdr.cpp
 msgid "Select this if you want aMule to check your disk space"
 msgstr "要求检查磁盘空间"
 
-#: src/muuli_wdr.cpp:1533
+#: src/muuli_wdr.cpp
 msgid "Enter here the min disk space desired."
 msgstr "请输入最低硬盘空间。"
 
-#: src/muuli_wdr.cpp:1539
+#: src/muuli_wdr.cpp
 msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr "保存稀有文件（少于20个源）的10个源"
 
-#: src/muuli_wdr.cpp:1543 src/Statistics.cpp:796
+#: src/muuli_wdr.cpp src/Statistics.cpp
 msgid "Uploads"
 msgstr "上传"
 
-#: src/muuli_wdr.cpp:1546
+#: src/muuli_wdr.cpp
 msgid "Add new shared files with auto priority"
 msgstr "添加新共享文件时设优先级为自动"
 
-#: src/muuli_wdr.cpp:1563
-msgid "Destination folder for downloads"
-msgstr "存放下载文件的文件夹"
+#: src/muuli_wdr.cpp
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "智能损坏数据处理 (I.C.H.)"
+
+#: src/muuli_wdr.cpp
+msgid "Enable"
+msgstr "启用"
+
+#: src/muuli_wdr.cpp
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "高级 I.C.H. 信任全部哈希值 (不推荐)"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Media metadata extraction"
+msgstr "媒体元数据提取"
+
+#: src/muuli_wdr.cpp
+msgid "Extract length / bitrate / codec from shared audio and video files"
+msgstr "从共享的音视频文件提取长度/比特率/编解码器信息"
+
+#: src/muuli_wdr.cpp
+msgid "When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed."
+msgstr "启用此功能后，aMule 会对每个共享媒体文件运行 ffprobe 填充其他客户端在搜索到该文件时看到的“长度”、“比特率”和“编解码器”列。需要安装 ffmpeg（ffprobe 二进制文件）。"
+
+#: src/muuli_wdr.cpp
+msgid "Path to ffprobe:"
+msgstr "ffprobe 路径："
+
+#: src/muuli_wdr.cpp
+msgid "Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup."
+msgstr "ffprobe 二进制文件的完整路径。留空让 amule 在启动时自动检测。"
+
+#: src/muuli_wdr.cpp
+msgid "Detect"
+msgstr "检测"
+
+#: src/muuli_wdr.cpp
+msgid "Search the standard install locations for an ffprobe binary and fill the path field."
+msgstr "搜索标准的 ffprobe 二进制文件安装路径，并填写路径字段。"
 
-#: src/muuli_wdr.cpp:1567
+#: src/muuli_wdr.cpp
 msgid ""
 "Completed downloads are stored here. All files in this folder are automatically shared with other peers.\n"
 "If this folder also holds files you don't want to share, point it at an aMule-only sub-folder."
 msgstr ""
-"已完成下载的文件存储在此处。此文件夹中的所有文件将自动与其他对等点共享。\n"
+"已完成下载的文件存储在此处。此文件夹中的所有文件将自动与其他 对等方 共享。\n"
 "如果此文件夹中还包含您不想共享的文件，请为 aMule 选择一个专用子文件夹。"
 
-#: src/muuli_wdr.cpp:1570
+#: src/muuli_wdr.cpp
 msgid "Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."
-msgstr "选择完成下载文件的存储文件夹。该文件夹中的所有文件都将与其他对等节点共享。"
+msgstr "选择完成下载文件的存储文件夹。该文件夹中的所有文件都将与其他对等方共享。"
 
-#: src/muuli_wdr.cpp:1574
-msgid "(All files in this folder are shared with other peers)"
-msgstr "（此文件夹中的所有文件均与其他对等方共享）"
-
-#: src/muuli_wdr.cpp:1576
-msgid "Folder for temporary download files"
-msgstr "存放临时下载文件的文件夹"
-
-#: src/muuli_wdr.cpp:1584
+#: src/muuli_wdr.cpp
 msgid "Shared folders"
 msgstr "共享的文件夹"
 
-#: src/muuli_wdr.cpp:1587
+#: src/muuli_wdr.cpp
+msgid "(Folders shared by the core. Enter a path to add one.)"
+msgstr "(由核心共享的文件夹。输入路径添加一个。)"
+
+#: src/muuli_wdr.cpp
+msgid "Absolute path of a folder on the core's machine, e.g. /home/user/shared"
+msgstr "核心机器上文件夹的绝对路径，如 /home/user/shared"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Recursive"
+msgstr "递归"
+
+#: src/muuli_wdr.cpp
+msgid "Share every sub-folder underneath this one, including ones created later."
+msgstr "分享此文件夹下每个子文件夹，包括之后创建的子文件夹。"
+
+#: src/muuli_wdr.cpp src/utils/aLinkCreator/src/alcframe.cpp
+msgid "Remove"
+msgstr "删除"
+
+#: src/muuli_wdr.cpp
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(鼠标右键单击文件夹图标来递归共享)"
 
-#: src/muuli_wdr.cpp:1593
+#: src/muuli_wdr.cpp
 msgid "Share hidden files"
 msgstr "共享隐藏文件"
 
-#: src/muuli_wdr.cpp:1599
+#: src/muuli_wdr.cpp
 msgid "Automatically rescan shared folders for changes"
 msgstr "自动重新扫描共享文件夹以检测更改"
 
-#: src/muuli_wdr.cpp:1605
+#: src/muuli_wdr.cpp
 msgid "Follow symbolic links in shared folders"
 msgstr "在共享文件夹中跟踪符号链接"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp
+msgid "Exclude files matching:"
+msgstr "排除文件匹配："
+
+#: src/muuli_wdr.cpp
+msgid "Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."
+msgstr "以“|”分隔的通配符模式，例如 .DS_Store|Thumbs.db|*.tmp。不会共享文件名匹配的文件。匹配不区分大小写。"
+
+#: src/muuli_wdr.cpp
+msgid "Patterns are regular expressions"
+msgstr "模式是正则表达式"
+
+#: src/muuli_wdr.cpp
+msgid "When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."
+msgstr "启用后，整个字段是一个正则表达式（'|' 表示交替）。禁用后，它是一个以 '|' 分隔的通配符列表。"
+
+#: src/muuli_wdr.cpp
+msgid "Show how many shared files the current pattern would exclude."
+msgstr "显示当前模式会排除多少共享文件。"
+
+#: src/muuli_wdr.cpp
+msgid "When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."
+msgstr "当已连接核心的文件位于别的机器上时，将其报告的路径前缀映射到从此处可以访问到那个文件系统的地方（比如一个网络共享），这样“打开”和“显示在文件夹中”正常工作。"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Path Mappings"
+msgstr "路径映射"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Remote prefix"
+msgstr "远程前缀"
+
+#: src/muuli_wdr.cpp
+msgid "A path prefix as the core reports it, e.g. /home/user/downloads/incoming"
+msgstr "核心报告的路径前缀，如 /home/user/downloads/incoming"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "Local prefix"
+msgstr "本地前缀"
+
+#: src/muuli_wdr.cpp
+msgid "Where that same folder is reachable from this computer, e.g. a mounted network share"
+msgstr "可以从这台电脑访问到同一个文件夹的地方，如已挂载的网络共享"
+
+#: src/muuli_wdr.cpp
 msgid "Graphs"
 msgstr "图表"
 
-#: src/muuli_wdr.cpp:1627 src/muuli_wdr.cpp:1689
+#: src/muuli_wdr.cpp
 msgid "Update delay : 5 secs"
 msgstr "刷新延迟：5 秒"
 
-#: src/muuli_wdr.cpp:1631
+#: src/muuli_wdr.cpp
 msgid "Time for average graph: 100 mins"
 msgstr "平均值图表显示时间：100 分钟"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp
 msgid "Connections Graph Scale: 100 "
 msgstr "连接图表尺寸: 100 "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp
 msgid "Download graph scale:"
 msgstr "下载图表尺寸："
 
-#: src/muuli_wdr.cpp:1650
+#: src/muuli_wdr.cpp
 msgid "Upload graph scale:"
 msgstr "上传图表尺寸："
 
-#: src/muuli_wdr.cpp:1660
+#: src/muuli_wdr.cpp
 msgid "Colors: "
 msgstr "颜色： "
 
-#: src/muuli_wdr.cpp:1664
+#: src/muuli_wdr.cpp
 msgid "Background"
 msgstr "背景"
 
-#: src/muuli_wdr.cpp:1665
+#: src/muuli_wdr.cpp
 msgid "Grid"
 msgstr "网格"
 
-#: src/muuli_wdr.cpp:1666
+#: src/muuli_wdr.cpp
 msgid "Download current"
 msgstr "目前下载"
 
-#: src/muuli_wdr.cpp:1667
+#: src/muuli_wdr.cpp
 msgid "Download running average"
 msgstr "动态平均下载"
 
-#: src/muuli_wdr.cpp:1668
+#: src/muuli_wdr.cpp
 msgid "Download session average"
 msgstr "本次运行平均下载"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp
 msgid "Upload current"
 msgstr "目前上传"
 
-#: src/muuli_wdr.cpp:1670
+#: src/muuli_wdr.cpp
 msgid "Upload running average"
 msgstr "动态平均上传"
 
-#: src/muuli_wdr.cpp:1671
+#: src/muuli_wdr.cpp
 msgid "Upload session average"
 msgstr "本次运行平均上传"
 
-#: src/muuli_wdr.cpp:1672
+#: src/muuli_wdr.cpp src/StatisticsDlg.cpp
 msgid "Active connections"
 msgstr "活跃连接"
 
-#: src/muuli_wdr.cpp:1675
+#: src/muuli_wdr.cpp
 msgid "Systray Icon Speed Bar"
 msgstr "系统状态栏图标速度显示"
 
-#: src/muuli_wdr.cpp:1676
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes current"
 msgstr "当前 Kad 节点"
 
-#: src/muuli_wdr.cpp:1677
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes running"
 msgstr "运行的 Kad 节点"
 
-#: src/muuli_wdr.cpp:1678
+#: src/muuli_wdr.cpp
 msgid "Kad-nodes session"
 msgstr "本次运行的 Kad 节点"
 
-#: src/muuli_wdr.cpp:1682 src/muuli_wdr.cpp:2040
+#: src/muuli_wdr.cpp
 msgid "Select"
 msgstr "选择"
 
-#: src/muuli_wdr.cpp:1686
+#: src/muuli_wdr.cpp
 msgid "Tree"
 msgstr "树"
 
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "显示用户软件版本的数量(0代表不限制)"
 
-#: src/muuli_wdr.cpp:1721
+#: src/muuli_wdr.cpp
 msgid "!!! WARNING !!!"
 msgstr "！！！警告！！！"
 
-#: src/muuli_wdr.cpp:1733
+#: src/muuli_wdr.cpp
 msgid "Max new connections / 5 secs"
 msgstr "5 秒内最大新连接数"
 
-#: src/muuli_wdr.cpp:1738
+#: src/muuli_wdr.cpp
+msgid "Concurrent Kad source lookups"
+msgstr "并发 Kad 源查找"
+
+#: src/muuli_wdr.cpp
+msgid "Kad source re-search interval (minutes)"
+msgstr "Kad 源重新搜索间隔（分钟）"
+
+#: src/muuli_wdr.cpp
+msgid "Source re-ask interval (minutes)"
+msgstr "源重新请求间隔（分钟）"
+
+#: src/muuli_wdr.cpp
 msgid "File Buffer Size: 240000 bytes"
 msgstr "文件缓冲：24000 字节"
 
-#: src/muuli_wdr.cpp:1742
+#: src/muuli_wdr.cpp
+msgid "Use MMAP: memory-mapped file access (lower memory use)"
+msgstr "使用 MMAP：内存映射文件访问（降低内存占用）"
+
+#: src/muuli_wdr.cpp
+msgid "Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts."
+msgstr "映射 part 文件到内存而不是在堆栈上缓冲，降低进程内存占用。在一些磁盘上可能降低下载速度；最适合内存紧张或重度上传的主机。"
+
+#: src/muuli_wdr.cpp
 msgid "Upload Queue Size: 5000 clients"
 msgstr "上传队列长度：5000 用户"
 
-#: src/muuli_wdr.cpp:1746
+#: src/muuli_wdr.cpp
 msgid "Server connection refresh interval: Disable"
 msgstr "服务器连接刷新周期：禁用"
 
-#: src/muuli_wdr.cpp:1750
+#: src/muuli_wdr.cpp
 msgid "Disable computer's timed standby mode"
 msgstr "停用电脑自动进入待命模式功能"
 
-#: src/muuli_wdr.cpp:1769
+#: src/muuli_wdr.cpp
 msgid "Skin to use: "
 msgstr "要使用的皮肤: "
 
-#: src/muuli_wdr.cpp:1778
+#: src/muuli_wdr.cpp
 msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr "在全部窗口都显示“快捷 eD2k 链接处理栏”。"
 
-#: src/muuli_wdr.cpp:1781
+#: src/muuli_wdr.cpp
 msgid "Show extended info on categories tabs"
 msgstr "在分类页中显示附加信息"
 
-#: src/muuli_wdr.cpp:1784
+#: src/muuli_wdr.cpp
 msgid "Show application version on title"
 msgstr "在标题栏显示应用程序版本"
 
-#: src/muuli_wdr.cpp:1786
+#: src/muuli_wdr.cpp
 msgid "Show transfer rates on title"
 msgstr "在标题栏显示传输速度"
 
-#: src/muuli_wdr.cpp:1788
+#: src/muuli_wdr.cpp
 msgid "Before application name"
 msgstr "在应用程序名称之前"
 
-#: src/muuli_wdr.cpp:1790
+#: src/muuli_wdr.cpp
 msgid "After application name"
 msgstr "在应用程序名称之后"
 
-#: src/muuli_wdr.cpp:1793
+#: src/muuli_wdr.cpp
 msgid "Show overhead bandwidth"
 msgstr "显示额外开销的带宽"
 
-#: src/muuli_wdr.cpp:1797
+#: src/muuli_wdr.cpp
 msgid "Vertical toolbar orientation"
 msgstr "垂直显示工具栏"
 
-#: src/muuli_wdr.cpp:1803
+#: src/muuli_wdr.cpp
+msgid "Live column sorting (auto-reorder rows as their values change)"
+msgstr "实时列排序（值更改时自动调整顺序）"
+
+#: src/muuli_wdr.cpp
 msgid "Download Queue Files"
 msgstr "下载队列文件"
 
-#: src/muuli_wdr.cpp:1806
+#: src/muuli_wdr.cpp
 msgid "Show progress percentage"
 msgstr "显示进度百分比"
 
-#: src/muuli_wdr.cpp:1812
+#: src/muuli_wdr.cpp
 msgid "Show progress bar"
 msgstr "显示进度条"
 
-#: src/muuli_wdr.cpp:1815
+#: src/muuli_wdr.cpp
 msgid "Flat"
 msgstr "扁平"
 
-#: src/muuli_wdr.cpp:1819
+#: src/muuli_wdr.cpp
 msgid "Round"
 msgstr "圆柱"
 
-#: src/muuli_wdr.cpp:1822
-msgid "Auto-sort files (high CPU)"
-msgstr "自动排序文件 (高 CPU 占用)"
-
-#: src/muuli_wdr.cpp:1824
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule 会自动将下载列表按列排序"
-
-#: src/muuli_wdr.cpp:1841
+#: src/muuli_wdr.cpp
 msgid "External Connection Parameters"
 msgstr "远程连接参数"
 
-#: src/muuli_wdr.cpp:1844
+#: src/muuli_wdr.cpp
 msgid "Accept external connections"
 msgstr "接受远程连接"
 
-#: src/muuli_wdr.cpp:1851
+#: src/muuli_wdr.cpp
 msgid "IP of the listening interface:"
 msgstr "监听接口的 IP:"
 
-#: src/muuli_wdr.cpp:1854
+#: src/muuli_wdr.cpp
 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:1860 src/muuli_wdr.cpp:1906
+#: src/muuli_wdr.cpp
 msgid "TCP port:"
 msgstr "TCP 端口："
 
-#: src/muuli_wdr.cpp:1866
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "为远程连接端口启用 UPnP"
 
-#: src/muuli_wdr.cpp:1870 src/muuli_wdr.cpp:2757
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
+#: src/muuli_wdr.cpp src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Password"
 msgstr "密码"
 
-#: src/muuli_wdr.cpp:1876
+#: src/muuli_wdr.cpp
+msgid "Require encrypted connections (rejects clients that cannot encrypt)"
+msgstr "要求加密的连接 （拒绝不能加密的客户端）"
+
+#: src/muuli_wdr.cpp
+msgid "aMule API server parameters"
+msgstr "aMule API 服务器参数"
+
+#: src/muuli_wdr.cpp
+msgid "Run amuleapi (REST API) on startup"
+msgstr "启动时运行 amuleapi (REST API)"
+
+#: src/muuli_wdr.cpp
+msgid "HTTP port:"
+msgstr "HTTP 端口："
+
+#: src/muuli_wdr.cpp
+msgid "The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below)."
+msgstr "amuleapi 接口的 HTTP 服务器监听默认地址为 127.0.0.1，该地址仅接受本地连接；使用 0.0.0.0 或特定 IP 地址可将其暴露给其他主机（请在下方设置管理密码）。"
+
+#: src/muuli_wdr.cpp
+msgid "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one."
+msgstr "输入一个密码来设置或更改它。存储的密码无法显示，因此留空会保留当前值。"
+
+#: src/muuli_wdr.cpp
+msgid "Admin password"
+msgstr "管理密码"
+
+#: src/muuli_wdr.cpp src/PrefsUnifiedDlg.cpp
+msgid "A password is set."
+msgstr "设好了密码。"
+
+#: src/muuli_wdr.cpp
+msgid "Enable guest access"
+msgstr "启用访客访问"
+
+#: src/muuli_wdr.cpp
+msgid "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password."
+msgstr "访客会话可以读取状态和列举项，但什么也改不了。关闭此选项会清除存储的访客密码。"
+
+#: src/muuli_wdr.cpp
+msgid "Guest password"
+msgstr "访客密码"
+
+#: src/muuli_wdr.cpp
 msgid "Web server parameters"
 msgstr "Web 服务参数"
 
-#: src/muuli_wdr.cpp:1879
-msgid "Run webserver on startup"
-msgstr "启动时运行 Web 服务"
+#: src/muuli_wdr.cpp
+msgid "Run webserver on startup (deprecated)"
+msgstr "启动时运行 web 服务器（已废弃）"
 
-#: src/muuli_wdr.cpp:1885
+#: src/muuli_wdr.cpp
 msgid "Web template"
 msgstr "Web 模板"
 
-#: src/muuli_wdr.cpp:1890
+#: src/muuli_wdr.cpp
 msgid "Full rights password"
 msgstr "最高权限密码"
 
-#: src/muuli_wdr.cpp:1894
+#: src/muuli_wdr.cpp
 msgid "Enable Low rights User"
 msgstr "启用低权限用户"
 
-#: src/muuli_wdr.cpp:1899
+#: src/muuli_wdr.cpp
 msgid "Low rights password"
 msgstr "低权限密码"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp
 msgid "Enable UPnP port forwarding of the web server port"
 msgstr "为 Web 服务端口启用 UPn P端口转发"
 
-#: src/muuli_wdr.cpp:1918
+#: src/muuli_wdr.cpp
 msgid "Web server UPnP TCP port (Optional)"
 msgstr "Web 服务器 UPnP 的 TCP 端口(可选)"
 
-#: src/muuli_wdr.cpp:1926
+#: src/muuli_wdr.cpp
 msgid "Page Refresh Time (in secs)"
 msgstr "页面刷新周期(秒)"
 
-#: src/muuli_wdr.cpp:1933
+#: src/muuli_wdr.cpp
 msgid "Enable Gzip compression"
 msgstr "启用 Gzip 压缩"
 
-#: src/muuli_wdr.cpp:1964 src/muuli_wdr.cpp:2047 src/ServerWnd.cpp:232
-#: src/ServerWnd.cpp:237
+#: src/muuli_wdr.cpp
+msgid "Reset page to defaults"
+msgstr "重置页面为默认"
+
+#: src/muuli_wdr.cpp
+msgid "Reset the settings on the current page to their default values."
+msgstr "重置当前页面设置为默认值。"
+
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "OK"
 msgstr "确定"
 
-#: src/muuli_wdr.cpp:1966
+#: src/muuli_wdr.cpp
 msgid "Click here to apply any changes made to the preferences."
-msgstr "点击这里立即使用新的设置。"
+msgstr "点击这里立即使用新的首选项。"
 
-#: src/muuli_wdr.cpp:1969
+#: src/muuli_wdr.cpp
 msgid "Reset any changes made to the preferences."
-msgstr "取消所有设置改动。"
+msgstr "取消所有首选项改动。"
 
-#: src/muuli_wdr.cpp:1991
-msgid "Title :"
-msgstr "标题 :"
+#: src/muuli_wdr.cpp
+msgid "Incoming Dir"
+msgstr "下载目录"
 
-#: src/muuli_wdr.cpp:1998
-msgid "Comment :"
-msgstr "注释 :"
+#: src/muuli_wdr.cpp
+msgid "Change priority for new assigned files"
+msgstr "设置新加入的文件优先级为"
 
-#: src/muuli_wdr.cpp:2005
-msgid "Incoming Dir :"
-msgstr "下载目录 :"
-
-#: src/muuli_wdr.cpp:2014
-msgid "Change priority for new assigned files :"
-msgstr "设置新加入的文件优先级为 :"
-
-#: src/muuli_wdr.cpp:2018
+#: src/muuli_wdr.cpp
 msgid "Don't change"
 msgstr "不要改变"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Select color for this Category (currently selected) :"
-msgstr "选择该分类颜色 (当前选择) :"
-
-#: src/muuli_wdr.cpp:2095 src/muuli_wdr.cpp:2117
-#: src/utils/wxCas/src/wxcasframe.cpp:133
-#: src/utils/wxCas/src/wxcasframe.cpp:137
-msgid "Reset"
-msgstr "重置"
+#: src/muuli_wdr.cpp
+msgid "Select color for this Category (currently selected)"
+msgstr "选择该分类颜色 (当前选择)"
 
-#: src/muuli_wdr.cpp:2096 src/muuli_wdr.cpp:2118
+#: src/muuli_wdr.cpp
 msgid "Click this button to reset the log."
 msgstr "按此按钮清空日志。"
 
-#: src/muuli_wdr.cpp:2138
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "按此按钮从该网址更新服务器列表 ..."
 
-#: src/muuli_wdr.cpp:2142
+#: src/muuli_wdr.cpp
 msgid "Server list"
 msgstr "服务器列表"
 
-#: src/muuli_wdr.cpp:2146
+#: src/muuli_wdr.cpp
 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:2151
+#: src/muuli_wdr.cpp
 msgid "Add server manually: Name"
 msgstr "手动添加服务器：名称"
 
-#: src/muuli_wdr.cpp:2154
+#: src/muuli_wdr.cpp
 msgid "Enter the name of the new server here"
 msgstr "在此输入新服务器的名称"
 
-#: src/muuli_wdr.cpp:2156 src/ServerWnd.cpp:188
+#: src/muuli_wdr.cpp src/ServerWnd.cpp
 msgid "IP:Port"
 msgstr "IP 地址:端口"
 
-#: src/muuli_wdr.cpp:2159
+#: src/muuli_wdr.cpp
 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:2165
+#: src/muuli_wdr.cpp
 msgid "Enter the port of the server here."
 msgstr "在此请输入服务器端口。"
 
-#: src/muuli_wdr.cpp:2168
+#: src/muuli_wdr.cpp
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "添加新服务器 (先填写左侧的内容) ..."
 
-#: src/muuli_wdr.cpp:2197
+#: src/muuli_wdr.cpp
 msgid "aMule Log"
 msgstr "aMule 日志"
 
-#: src/muuli_wdr.cpp:2201
+#: src/muuli_wdr.cpp
 msgid "Server Info"
 msgstr "服务器信息"
 
-#: src/muuli_wdr.cpp:2205
+#: src/muuli_wdr.cpp
 msgid "ED2K Info"
 msgstr "ED2K 信息"
 
-#: src/muuli_wdr.cpp:2209
+#: src/muuli_wdr.cpp
 msgid "Kad Info"
 msgstr "Kad 信息"
 
-#: src/muuli_wdr.cpp:2237
+#: src/muuli_wdr.cpp
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "按此更新节点列表自网址..."
 
-#: src/muuli_wdr.cpp:2241
+#: src/muuli_wdr.cpp
 msgid "Nodes (0)"
 msgstr "节点 (0)"
 
-#: src/muuli_wdr.cpp:2245
+#: src/muuli_wdr.cpp
 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:2248
+#: src/muuli_wdr.cpp
 msgid "Nodes stats"
 msgstr "节点状态"
 
-#: src/muuli_wdr.cpp:2288
-msgid "Bootstrap"
-msgstr "启动"
-
-#: src/muuli_wdr.cpp:2291
-msgid "New node"
-msgstr "新节点"
-
-#: src/muuli_wdr.cpp:2296
-msgid "IP:"
-msgstr "IP："
-
-#: src/muuli_wdr.cpp:2316
-msgid "Port:"
-msgstr "端口："
-
-#: src/muuli_wdr.cpp:2327
-msgid "Bootstrap from known clients"
-msgstr "从已知用户启动"
-
-#: src/muuli_wdr.cpp:2330
-msgid "Disconnect Kad"
-msgstr "断开 Kad"
+#: src/muuli_wdr.cpp
+msgid "Bootstrap from node: IP"
+msgstr "从 node: IP 启动"
+
+#: src/muuli_wdr.cpp
+msgid "Enter the IP of the node here, using the x.x.x.x format."
+msgstr "在此输入节点的 IP 地址 (x.x.x.x 格式)。"
 
-#: src/muuli_wdr.cpp:2364
+#: src/muuli_wdr.cpp
 msgid "Use Secure User Identification"
 msgstr "使用安全用户认证"
 
-#: src/muuli_wdr.cpp:2366
+#: src/muuli_wdr.cpp
 msgid "It is recommended to enable this option. You will not receive credits if SUI is not enabled."
 msgstr "建议使用此选项，如果安全用户认证没有启用，将不会接收信用证明。"
 
-#: src/muuli_wdr.cpp:2368
+#: src/muuli_wdr.cpp
 msgid "Protocol Obfuscation"
 msgstr "模糊协议"
 
-#: src/muuli_wdr.cpp:2371
+#: src/muuli_wdr.cpp
 msgid "Support Protocol Obfuscation"
 msgstr "支持模糊协议"
 
-#: src/muuli_wdr.cpp:2373
+#: src/muuli_wdr.cpp
 msgid "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients."
 msgstr "此选项启用了模糊协议，可让aMule接受其他用户用迷糊协议的连接"
 
-#: src/muuli_wdr.cpp:2375
+#: src/muuli_wdr.cpp
 msgid "Use obfuscation for outgoing connections"
 msgstr "为传出连接使用模糊协议"
 
-#: src/muuli_wdr.cpp:2377
+#: src/muuli_wdr.cpp
 msgid "This option makes aMule use Protocol Obfuscation when connecting other clients/servers."
 msgstr "此选项使aMule在连接其他用户或服务器时使用模糊协议。"
 
-#: src/muuli_wdr.cpp:2379
+#: src/muuli_wdr.cpp
 msgid "Accept only obfuscated connections"
 msgstr "仅接受模糊协议连接"
 
-#: src/muuli_wdr.cpp:2380
+#: src/muuli_wdr.cpp
 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:2385
+#: src/muuli_wdr.cpp
 msgid "Everybody"
 msgstr "任何人"
 
-#: src/muuli_wdr.cpp:2387
+#: src/muuli_wdr.cpp
 msgid "No one"
 msgstr "没有人"
 
-#: src/muuli_wdr.cpp:2389
+#: src/muuli_wdr.cpp
 msgid "Who can see my shared files:"
 msgstr "谁可查看我的共享文件："
 
-#: src/muuli_wdr.cpp:2390
+#: src/muuli_wdr.cpp
 msgid "Select who can request to view a list of your shared files."
 msgstr "选择可以浏览共享文件列表的用户。"
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp
 msgid "IP-Filtering"
 msgstr "IP 过滤"
 
-#: src/muuli_wdr.cpp:2399
+#: src/muuli_wdr.cpp
 msgid "Filter clients"
 msgstr "过滤用户"
 
-#: src/muuli_wdr.cpp:2401
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "过滤在文件~/.aMule/ipfilter.dat中定义的用户IP"
 
-#: src/muuli_wdr.cpp:2403
+#: src/muuli_wdr.cpp
 msgid "Filter servers"
 msgstr "过滤服务器"
 
-#: src/muuli_wdr.cpp:2405
+#: src/muuli_wdr.cpp
 msgid "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "过滤在文件~/.aMule/ipfilter.dat中定义的服务器IP"
 
-#: src/muuli_wdr.cpp:2409
+#: src/muuli_wdr.cpp
 msgid "Reload List"
 msgstr "刷新列表"
 
-#: src/muuli_wdr.cpp:2410
+#: src/muuli_wdr.cpp
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "更新 IP 地址过滤列表自文件 ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:2416
+#: src/muuli_wdr.cpp
 msgid "URL:"
 msgstr "地址:"
 
-#: src/muuli_wdr.cpp:2420 src/muuli_wdr.cpp:2613
+#: src/muuli_wdr.cpp
 msgid "Update now"
 msgstr "立即更新"
 
-#: src/muuli_wdr.cpp:2423
+#: src/muuli_wdr.cpp
 msgid "Auto-update ipfilter at startup"
 msgstr "启动后自动更新IP 地址过滤列表"
 
-#: src/muuli_wdr.cpp:2427
+#: src/muuli_wdr.cpp
 msgid "Filtering Level:"
 msgstr "过滤级别:"
 
-#: src/muuli_wdr.cpp:2433
+#: src/muuli_wdr.cpp
 msgid "Always filter LAN IPs"
 msgstr "始终过滤局域网 IP"
 
-#: src/muuli_wdr.cpp:2436
+#: src/muuli_wdr.cpp
 msgid "Paranoid handling of non-matching IPs"
 msgstr "处理不匹配的 IP"
 
-#: src/muuli_wdr.cpp:2438
-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
+msgid "Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems."
+msgstr "当数据包的源 IP 地址与客户端声称的 IP 地址不同时，拒绝该数据包（防欺骗检查）。仅在导致连接问题时才禁用此功能。"
 
-#: src/muuli_wdr.cpp:2440
+#: src/muuli_wdr.cpp
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "在可用的情况下使用系统级别的 ipfilter.dat"
 
-#: src/muuli_wdr.cpp:2441
+#: src/muuli_wdr.cpp
 msgid "If there's no local ipfilter.dat found, allow usage of a system-wide ipfilter file."
 msgstr "如果没有找到本地 ipfilter.dat 文件，则允许使用系统级的IP过滤文件。"
 
-#: src/muuli_wdr.cpp:2458
+#: src/muuli_wdr.cpp
 msgid "Enable Online-Signature"
 msgstr "启用在线统计"
 
-#: src/muuli_wdr.cpp:2460
+#: src/muuli_wdr.cpp
 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:2464
+#: src/muuli_wdr.cpp
 msgid "Update Frequency (Secs):"
 msgstr "更新频率 (秒):"
 
-#: src/muuli_wdr.cpp:2467
+#: src/muuli_wdr.cpp
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "更改在线统计文件的更新频率 (秒) 。"
 
-#: src/muuli_wdr.cpp:2475
+#: src/muuli_wdr.cpp
 msgid "Save online signature file in: "
 msgstr "保存在线签名位置： "
 
-#: src/muuli_wdr.cpp:2481
+#: src/muuli_wdr.cpp
 msgid "Click here to select the directory containing the the Online Signature files."
 msgstr "单击此处选择包含在线签名文件的目录。"
 
-#: src/muuli_wdr.cpp:2514
+#: src/muuli_wdr.cpp
 msgid "Show country flags for clients"
 msgstr "为客户端显示国旗"
 
-#: src/muuli_wdr.cpp:2515
+#: src/muuli_wdr.cpp
 msgid "Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below)."
 msgstr "在传输、队列和搜索视图中渲染地区旗帜列。需要有效的 MMDB GeoIP 数据库（见下文）。"
 
-#: src/muuli_wdr.cpp:2520
+#: src/muuli_wdr.cpp
 msgid "Database"
 msgstr "数据库"
 
-#: src/muuli_wdr.cpp:2536
+#: src/muuli_wdr.cpp
 msgid "Source:"
 msgstr "源："
 
-#: src/muuli_wdr.cpp:2539
+#: src/muuli_wdr.cpp
 msgid "DB-IP (free, no account)"
 msgstr "DB-IP（免费，无需账户）"
 
-#: src/muuli_wdr.cpp:2540
+#: src/muuli_wdr.cpp
 msgid "MaxMind GeoLite2 (free, account required)"
 msgstr "MaxMind GeoLite2（免费，需注册账户）"
 
-#: src/muuli_wdr.cpp:2541
+#: src/muuli_wdr.cpp
 msgid "Custom URL"
 msgstr "自定义 URL"
 
-#: src/muuli_wdr.cpp:2544
+#: src/muuli_wdr.cpp
 msgid "Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror)."
 msgstr "选择哪个提供商提供 GeoIP MMDB 数据库。DB-IP 是默认选项，无需账户。MaxMind 需要一个免费账户和许可证密钥。使用自定义 URL 指向任何其他 MMDB 主机（例如本地镜像）。"
 
-#: src/muuli_wdr.cpp:2561
+#: src/muuli_wdr.cpp
 msgid ""
 "No configuration required.\n"
 "\n"
@@ -4240,11 +5407,11 @@
 "IP-to-Country 数据由 DB-IP.com 提供 - https://db-ip.com\n"
 "许可证：知识共享署名 4.0 国际版 - https://creativecommons.org/licenses/by/4.0/"
 
-#: src/muuli_wdr.cpp:2574
+#: src/muuli_wdr.cpp
 msgid "License key:"
 msgstr "许可证密钥："
 
-#: src/muuli_wdr.cpp:2580
+#: src/muuli_wdr.cpp
 msgid ""
 "Sign up for a free MaxMind account, then generate a License Key:\n"
 "https://www.maxmind.com/en/geolite2/signup\n"
@@ -4260,11 +5427,11 @@
 "许可证：MaxMind GeoLite2 最终用户许可协议 - https://www.maxmind.com/en/geolite2/eula\n"
 "需要注明出处并注册账户；至少每 30 天刷新一次。"
 
-#: src/muuli_wdr.cpp:2595
+#: src/muuli_wdr.cpp
 msgid "Download URL:"
 msgstr "下载地址："
 
-#: src/muuli_wdr.cpp:2601
+#: src/muuli_wdr.cpp
 msgid ""
 "Must point to an .mmdb file or a .gz / .tar.gz containing one.\n"
 "URL may include credentials (https://user:pass@host/...).\n"
@@ -4274,504 +5441,569 @@
 "URL 可包含凭据（例如 https://user:pass@host/...）。\n"
 "许可和署名条款由上游 URL 决定——你需自行负责。"
 
-#: src/muuli_wdr.cpp:2614
+#: src/muuli_wdr.cpp
 msgid "Download the GeoIP database from the selected source."
 msgstr "从所选源下载 GeoIP 数据库。"
 
-#: src/muuli_wdr.cpp:2616
+#: src/muuli_wdr.cpp
 msgid "Auto-update on startup"
 msgstr "启动后自动更新"
 
-#: src/muuli_wdr.cpp:2617
+#: src/muuli_wdr.cpp
 msgid "Re-download the GeoIP database from the selected source every time aMule starts."
 msgstr "每次启动 aMule 时，从所选源重新下载 GeoIP 数据库。"
 
-#: src/muuli_wdr.cpp:2640
+#: src/muuli_wdr.cpp
 msgid "Filter incoming messages (except current chat):"
 msgstr "过滤收到的消息 (不包括当前对话):"
 
-#: src/muuli_wdr.cpp:2642
+#: src/muuli_wdr.cpp
 msgid "Filter all messages"
 msgstr "过滤所有消息"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp
 msgid "Filter messages from people not on your friend list"
 msgstr "过滤来自好友列表外的消息"
 
-#: src/muuli_wdr.cpp:2646
+#: src/muuli_wdr.cpp
 msgid "Filter messages from unknown clients"
 msgstr "过滤来自未知用户的消息"
 
-#: src/muuli_wdr.cpp:2648
+#: src/muuli_wdr.cpp
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "过滤包含以下内容的消息 (用半角逗号分隔):"
 
-#: src/muuli_wdr.cpp:2651 src/muuli_wdr.cpp:2662
+#: src/muuli_wdr.cpp
 msgid "add here the words amule should filter and block messages including it"
 msgstr "输入需过滤的词组"
 
-#: src/muuli_wdr.cpp:2653
+#: src/muuli_wdr.cpp
 msgid "Show received messages in the log"
 msgstr "在日志中显示接收的消息"
 
-#: src/muuli_wdr.cpp:2656
+#: src/muuli_wdr.cpp
 msgid "Comments"
 msgstr "备注"
 
-#: src/muuli_wdr.cpp:2659
+#: src/muuli_wdr.cpp
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "过滤包含以下内容的备注 (使用“,”作为分隔符):"
 
-#: src/muuli_wdr.cpp:2682
-msgid "Enable authentication"
-msgstr "启用验证："
-
-#: src/muuli_wdr.cpp:2683
-msgid "Enable/disable username/password authentication"
-msgstr "启用/禁用用户名/密码验证"
-
-#: src/muuli_wdr.cpp:2686
-msgid "Username: "
-msgstr "用户名: "
-
-#: src/muuli_wdr.cpp:2689
-msgid "The username to use to connect to the proxy"
-msgstr "连接代理服务器的用户名"
-
-#: src/muuli_wdr.cpp:2691
-msgid "Password:"
-msgstr "密码:"
-
-#: src/muuli_wdr.cpp:2694
-msgid "The password to use to connect to the proxy"
-msgstr "连接代理服务器的密码"
-
-#: src/muuli_wdr.cpp:2696
+#: src/muuli_wdr.cpp
 msgid "Enable Proxy"
 msgstr "启用代理"
 
-#: src/muuli_wdr.cpp:2697
+#: src/muuli_wdr.cpp
 msgid "Enable/disable proxy support"
 msgstr "启用/禁用代理支持"
 
-#: src/muuli_wdr.cpp:2700
-msgid "Proxy type:"
-msgstr "代理类型:"
-
-#: src/muuli_wdr.cpp:2711
-msgid "Proxy host:"
-msgstr "代理服务器:"
+#: src/muuli_wdr.cpp
+msgid "Proxy type"
+msgstr "代理类型"
+
+#: src/muuli_wdr.cpp
+msgid "Proxy host"
+msgstr "代理服务器"
 
-#: src/muuli_wdr.cpp:2714
+#: src/muuli_wdr.cpp
 msgid "The proxy host name"
 msgstr "代理服务器名称"
 
-#: src/muuli_wdr.cpp:2716
-msgid "Proxy port:"
-msgstr "代理端口:"
+#: src/muuli_wdr.cpp
+msgid "Proxy port"
+msgstr "代理端口"
 
-#: src/muuli_wdr.cpp:2719
+#: src/muuli_wdr.cpp
 msgid "The proxy port"
 msgstr "代理端口"
 
-#: src/muuli_wdr.cpp:2738
+#: src/muuli_wdr.cpp
+msgid "Enable authentication"
+msgstr "启用验证："
+
+#: src/muuli_wdr.cpp
+msgid "Enable/disable username/password authentication"
+msgstr "启用/禁用用户名/密码验证"
+
+#: src/muuli_wdr.cpp
+msgid "The username to use to connect to the proxy"
+msgstr "连接代理服务器的用户名"
+
+#: src/muuli_wdr.cpp
+msgid "The password to use to connect to the proxy"
+msgstr "连接代理服务器的密码"
+
+#: src/muuli_wdr.cpp
 msgid "Connect to:"
 msgstr "连接到:"
 
-#: src/muuli_wdr.cpp:2747
+#: src/muuli_wdr.cpp
 msgid "Login to remote amule"
 msgstr "登录远程 amule"
 
-#: src/muuli_wdr.cpp:2752
-msgid "User name"
-msgstr "用户名"
-
-#: src/muuli_wdr.cpp:2763
+#: src/muuli_wdr.cpp
 msgid "Remember those settings"
 msgstr "记住这些设置"
 
-#: src/muuli_wdr.cpp:2766
+#: src/muuli_wdr.cpp
+msgid "Encrypt the connection (recommended)"
+msgstr "加密连接（推荐）"
+
+#: src/muuli_wdr.cpp
 msgid "Force ZLIB compression"
 msgstr "强制使用 ZLIB 压缩"
 
-#: src/muuli_wdr.cpp:2790
+#: src/muuli_wdr.cpp
 msgid "Enable Verbose Debug-Logging."
 msgstr "启用详细调试日志。"
 
-#: src/muuli_wdr.cpp:2792
+#: src/muuli_wdr.cpp
 msgid "Only to Logfile"
 msgstr "只记录到日志文件"
 
-#: src/muuli_wdr.cpp:2794
+#: src/muuli_wdr.cpp
 msgid "Message Categories:"
 msgstr "消息分类:"
 
-#: src/muuli_wdr.cpp:2818 src/PartFileConvertDlg.cpp:155
+#: src/muuli_wdr.cpp src/PartFileConvertDlg.cpp
 msgid "Waiting..."
 msgstr "等待中..."
 
-#: src/muuli_wdr.cpp:2838
+#: src/muuli_wdr.cpp
 msgid "Add imports"
 msgstr "添加导入文件"
 
-#: src/muuli_wdr.cpp:2841
+#: src/muuli_wdr.cpp
 msgid "Retry selected"
 msgstr "重试所选"
 
-#: src/muuli_wdr.cpp:2843
+#: src/muuli_wdr.cpp
 msgid "Remove selected"
 msgstr "删除所选"
 
-#: src/muuli_wdr.cpp:2906
+#: src/muuli_wdr.cpp
 msgid "Event Types"
 msgstr "事件类型"
 
-#: src/muuli_wdr.cpp:2925
+#: src/muuli_wdr.cpp
 msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr "所选文件的统计和队列用户：会话/全部时间"
 
-#: src/muuli_wdr.cpp:2949
+#: src/muuli_wdr.cpp
 msgid "Active Uploads"
 msgstr "活跃上传"
 
-#: src/muuli_wdr.cpp:2963
-msgid "Percent of total files"
-msgstr "全部文件的百分比"
+#: src/muuli_wdr.cpp
+msgid "Show Clients for"
+msgstr "显示客户端"
 
-#: src/muuli_wdr.cpp:3002
+#: src/muuli_wdr.cpp src/SharedFilesCtrl.cpp
 msgid "All files"
 msgstr "所有文件"
 
-#: src/muuli_wdr.cpp:3003
+#: src/muuli_wdr.cpp
 msgid "Selected files"
 msgstr "选择的文件"
 
-#: src/muuli_wdr.cpp:3004
+#: src/muuli_wdr.cpp
 msgid "Active uploads only"
 msgstr "仅活跃上传"
 
-#: src/muuli_wdr.cpp:3006
-msgid "Show Clients for"
-msgstr "显示客户端"
-
-#: src/muuli_wdr.cpp:3008
+#: src/muuli_wdr.cpp
 msgid "Reload:"
 msgstr "重新载入:"
 
-#: src/muuli_wdr.cpp:3012
+#: src/muuli_wdr.cpp
 msgid "Reload your shared files"
 msgstr "刷新共享文件"
 
-#: src/muuli_wdr.cpp:3074
+#: src/muuli_wdr.cpp
 msgid "Send"
 msgstr "发送"
 
-#: src/muuli_wdr.cpp:3075
+#: src/muuli_wdr.cpp
 msgid "Sends the specified message."
 msgstr "发送指定消息。"
 
-#: src/muuli_wdr.cpp:3079
+#: src/muuli_wdr.cpp
 msgid "Close this chat-session."
 msgstr "结束本次聊天。"
 
-#: src/muuli_wdr.cpp:3102
-msgid "Connect to any server and/or Kad"
-msgstr "连接至任何服务器和/或 Kad"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Cancel %s"
+msgstr "取消 %s"
 
-#: src/muuli_wdr.cpp:3108 src/SharedFilesCtrl.cpp:136 src/Statistics.cpp:875
-msgid "Shared Files"
-msgstr "共享文件"
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Disconnect %s"
+msgstr "断开 %s 连接"
+
+#: src/muuli_wdr.cpp
+#, c-format
+msgid "Connect %s"
+msgstr "连接 %s"
 
-#: src/OScopeCtrl.cpp:242
+#: src/OScopeCtrl.cpp
 #, c-format
 msgid "Disabled %s"
 msgstr "已禁用 %s"
 
-#: src/OtherFunctions.cpp:61
+#: src/OtherFunctions.cpp
 msgid "byte"
 msgid_plural "bytes"
 msgstr0 "字节"
 msgstr1 "字节"
 
-#: src/OtherFunctions.cpp:63
-msgid "kB"
-msgstr "KB"
-
-#: src/OtherFunctions.cpp:69
-msgid "TB"
-msgstr "TB"
+#: src/OtherFunctions.cpp
+msgid "TiB"
+msgstr "TiB"
 
-#: src/OtherFunctions.cpp:79
+#: src/OtherFunctions.cpp
 msgid "k"
 msgstr "K"
 
-#: src/OtherFunctions.cpp:81
+#: src/OtherFunctions.cpp
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:83
+#: src/OtherFunctions.cpp
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:85
+#: src/OtherFunctions.cpp
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:92
+#: src/OtherFunctions.cpp
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr0 "字节/秒"
 msgstr1 "字节/秒"
 
-#: src/OtherFunctions.cpp:96
-msgid "MB/s"
-msgstr "MB/s"
+#: src/OtherFunctions.cpp
+msgid "MiB/s"
+msgstr "MiB/s"
 
-#: src/OtherFunctions.cpp:105 src/OtherFunctions.cpp:108
+#: src/OtherFunctions.cpp
 msgid "secs"
 msgstr "秒"
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp
 msgid "mins"
 msgstr "分钟"
 
-#: src/OtherFunctions.cpp:115 src/OtherFunctions.cpp:119
+#: src/OtherFunctions.cpp
 msgid "hours"
 msgstr "小时"
 
-#: src/OtherFunctions.cpp:118
-msgid "Days"
+#: src/OtherFunctions.cpp
+msgid "days"
 msgstr "日"
 
-#: src/OtherFunctions.cpp:684
+#. TRANSLATORS:
+#. Punctuation for a "label: value" pair. %s is the already-translated
+#. label. Place the colon as your language requires -- e.g. "%s :" with a
+#. space in French, "%s:" without one in Russian and English.
+#: src/OtherFunctions.cpp
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: src/OtherFunctions.cpp
 msgid "all"
 msgstr "所有"
 
-#: src/OtherFunctions.cpp:685
+#: src/OtherFunctions.cpp
 msgid "all others"
 msgstr "其它"
 
-#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:345
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Incomplete"
 msgstr "未完成"
 
-#: src/OtherFunctions.cpp:692 src/PartFile.cpp:4289 src/TransferWnd.cpp:351
+#: src/OtherFunctions.cpp src/PartFile.cpp src/TransferWnd.cpp
 msgid "Stopped"
 msgstr "已停止"
 
-#: src/OtherFunctions.cpp:693 src/TransferWnd.cpp:356
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Video"
 msgstr "视频"
 
-#: src/OtherFunctions.cpp:695 src/TransferWnd.cpp:358
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Archive"
 msgstr "归档"
 
-#: src/OtherFunctions.cpp:698 src/TransferWnd.cpp:361
+#: src/OtherFunctions.cpp src/TransferWnd.cpp
 msgid "Text"
 msgstr "文本"
 
-#: src/OtherFunctions.cpp:699 src/TransferWnd.cpp:352
-msgid "Active"
-msgstr "活动"
-
-#: src/OtherFunctions.cpp:1212
+#: src/OtherFunctions.cpp
 #, c-format
 msgid "Using config dir: %s"
 msgstr "使用配置目录：%s"
 
-#: src/PartFileConvert.cpp:154
+#: src/PartBarLegendUI.cpp
+msgid "This source does not have the part"
+msgstr "这个源没有该部分"
+
+#: src/PartBarLegendUI.cpp
+msgid "You and this source both have the part"
+msgstr "你和这个源都有该部分"
+
+#: src/PartBarLegendUI.cpp
+msgid "Being downloaded from this source now"
+msgstr "正从这个源下载"
+
+#: src/PartBarLegendUI.cpp
+msgid "The next part that will be asked of this source"
+msgstr "下一个要从这个源请求的部分"
+
+#: src/PartBarLegendUI.cpp
+msgid "This source has the part and you still need it"
+msgstr "这个源有该部分，你仍需要它"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer already has the part"
+msgstr "这个对等方已经有该部分"
+
+#: src/PartBarLegendUI.cpp
+msgid "This peer does not have the part"
+msgstr "这个对等方没有该部分"
+
+#: src/PartBarLegendUI.cpp
+msgid "No other source has this part"
+msgstr "没有其他源有该部分"
+
+#: src/PartBarLegendUI.cpp
+msgid "One other source has this part"
+msgstr "另一个源有该部分"
+
+#: src/PartBarLegendUI.cpp
+#, c-format
+msgid "%u or more other sources have this part"
+msgstr "另 %u 个源或更多的源有该部分"
+
+#: src/PartBarLegendUI.cpp
+msgid "Already read back and hashed"
+msgstr "已回读并哈希"
+
+#: src/PartBarLegendUI.cpp
+msgid "Still to be read"
+msgstr "仍待读取"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the file being downloaded."
+msgstr "正被下载的文件每部分对应一个区块。"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file."
+msgstr "共享文件每个部分对应一个区块。"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, coloured by how many other sources have it."
+msgstr "共享文件每部分对应一个区块，按另有多少个源有这个部分着色。"
+
+#: src/PartBarLegendUI.cpp
+msgid "One block per part of the shared file, showing how far the re-hash has read."
+msgstr "共享文件每部分对应一个区块，显示 re-hash 读取进度。"
+
+#: src/PartBarLegendUI.cpp
+msgid "In between, darkening as other sources are added"
+msgstr "其间，添加其他源时颜色变暗"
+
+#: src/PartFileConvert.cpp
 msgid "Waiting for partfile convert thread to die..."
 msgstr "等待partfile转换线程结束..."
 
-#: src/PartFileConvert.cpp:198
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Importing %s: %s"
 msgstr "正在导入 %s：%s"
 
-#: src/PartFileConvert.cpp:234
+#: src/PartFileConvert.cpp
 msgid "Reading temp folder"
 msgstr "正在读取临时文件夹"
 
-#: src/PartFileConvert.cpp:238
+#: src/PartFileConvert.cpp
 msgid "Retrieving basic information from download info file"
 msgstr "正在从下载信息文件获取基本信息"
 
-#: src/PartFileConvert.cpp:316
+#: src/PartFileConvert.cpp
 msgid "Creating destination file"
 msgstr "创建目标文件"
 
-#: src/PartFileConvert.cpp:326
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr "从旧下载文件载入数据（%u 共 %u）"
 
-#: src/PartFileConvert.cpp:344
+#: src/PartFileConvert.cpp
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr "正在保存数据块至新的单个下载文件（%u 共 %u）"
 
-#: src/PartFileConvert.cpp:408
+#: src/PartFileConvert.cpp
 msgid "Retrieving source downloadfile information"
 msgstr "正在获取源下载文件信息"
 
-#: src/PartFileConvert.cpp:431
+#: src/PartFileConvert.cpp
 msgid "Adding download and saving new partfile"
 msgstr "正在下载和保存新part文件"
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp
 msgid "Import partfiles"
 msgstr "导入 part 文件"
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp
 msgid "State"
 msgstr "状态"
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp
 msgid "Filehash"
 msgstr "文件校验码"
 
-#: src/PartFileConvertDlg.cpp:179
+#: src/PartFileConvertDlg.cpp
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr "%s (磁盘：%s)"
 
-#: src/PartFileConvertDlg.cpp:204
+#: src/PartFileConvertDlg.cpp
 msgid "Please choose a folder to search for temporary downloads! (subfolders will be included)"
 msgstr "请选择一个目录用于搜索临时下载文件！（子目录也将被包括）"
 
-#: src/PartFileConvertDlg.cpp:208
+#: src/PartFileConvertDlg.cpp
 msgid "Do you want the source files of successfully imported downloads be deleted?"
 msgstr "要删除成功导入的下载项的源文件吗？"
 
-#: src/PartFileConvertDlg.cpp:209
+#: src/PartFileConvertDlg.cpp
 msgid "Remove sources?"
 msgstr "删除源？"
 
-#: src/PartFile.cpp:364
+#: src/PartFile.cpp
 msgid "ERROR: Failed to create partfile"
 msgstr "错误：无法创建 part 文件"
 
-#: src/PartFile.cpp:402
+#: src/PartFile.cpp
 #, c-format
 msgid "Trying to load backup of met-file from %s"
 msgstr "尝试从 %s 载入 met 文件的备份"
 
-#: src/PartFile.cpp:409
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr "错误：无法打开part.met文件：%s ==> %s"
 
-#: src/PartFile.cpp:415
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr "错误：part.met文件大小为0： %s ==> %s"
 
-#: src/PartFile.cpp:426
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr "错误：无效的 part.met 文件版本：%s ==> %s"
 
-#: src/PartFile.cpp:664
+#: src/PartFile.cpp
 #, c-format
 msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr "错误：文件 %s（%s）已损坏（损坏的标签：%s），无法读取文件。"
 
-#: src/PartFile.cpp:675
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr "错误：文件 %s（%s）已损坏（标签数不对），无法读取文件。"
 
-#: src/PartFile.cpp:678
+#: src/PartFile.cpp
 msgid "Trying to recover file info..."
 msgstr "尝试恢复文件信息..."
 
-#: src/PartFile.cpp:693
+#: src/PartFile.cpp
 msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr "尝试恢复无名文件 - 保存为 RecoveredFile.dat"
 
-#: src/PartFile.cpp:697
+#: src/PartFile.cpp
 msgid "Recovered all available file info :D - Trying to use it..."
 msgstr "成功恢复所有文件信息 :D - 尝试使用文件信息..."
 
-#: src/PartFile.cpp:699
+#: src/PartFile.cpp
 msgid "Unable to recover file info :("
 msgstr "无法恢复文件：("
 
-#: src/PartFile.cpp:734
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to open %s (%s)"
 msgstr "无法读取 %s（%s）"
 
-#: src/PartFile.cpp:787
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: %s might be corrupted (%i)"
 msgstr "警告：%s可能已损坏（%i）"
 
-#: src/PartFile.cpp:1006
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr "part 文件存盘时发生错误：%s（%s => %s）"
 
-#: src/PartFile.cpp:1015
+#: src/PartFile.cpp
 msgid "IO failure while saving partfile: "
 msgstr "保存 part 文件时，发生 IO 错误: "
 
-#: src/PartFile.cpp:1030
+#: src/PartFile.cpp
 #, c-format
 msgid "Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."
 msgstr "已向 '%s' 写入 0/未知字节——保留现有 .part.met 文件。"
 
-#: src/PartFile.cpp:1110
+#: src/PartFile.cpp
 #, c-format
 msgid "Failed to save part.met.seeds file for %s"
 msgstr "%s 的 part.met.seeds 文件存盘失败"
 
-#: src/PartFile.cpp:1140
+#: src/PartFile.cpp
 #, c-format
 msgid "Saved %i source seed for partfile: %s (%s)"
 msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr0 "保存了 part 文件的 %i 个源种子：%s (%s)"
 msgstr1 "保存了 part 文件的 %i 个源种子：%s (%s)"
 
-#: src/PartFile.cpp:1170
+#: src/PartFile.cpp
 #, c-format
 msgid "Can't read seeds file for Partfile %s (%s)"
 msgstr "无法为 part 文件 %s（%s）读取源"
 
-#: src/PartFile.cpp:1229
+#: src/PartFile.cpp
 #, c-format
 msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr "读取 part 文件的种子文件出错（%s - %s）：%s"
 
-#: src/PartFile.cpp:1252 src/PartFile.cpp:1279
+#: src/PartFile.cpp
 #, 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|"
 msgstr0 "发现损坏的数据块 (%d) 于%d段文件 %s - 文件结果校检码 |%s| 文件校检码 |%s|"
 msgstr1 "发现损坏的数据块 (%d) 于%d段文件 %s - 文件结果校检码 |%s| 文件校检码 |%s|"
 
-#: src/PartFile.cpp:1294
+#: src/PartFile.cpp
 #, c-format
 msgid "Found completed part (%i) in %s"
 msgstr "发现了已完成的数据段 %i 在%s"
 
-#: src/PartFile.cpp:1329
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished rehashing %s"
 msgstr "重新校验 %s 完成"
 
-#: src/PartFile.cpp:2281
+#: src/PartFile.cpp
 #, c-format
 msgid "Unexpected error while completing %s. File paused"
 msgstr "在完成文件%s时遇到意外文件错误，文件已暂停"
 
-#: src/PartFile.cpp:2318
+#: src/PartFile.cpp
 #, c-format
 msgid "Finished downloading: %s"
 msgstr "完成下载：%s"
 
-#: src/PartFile.cpp:2323
+#: src/PartFile.cpp
 #, c-format
 msgid ""
 "Finished downloading:\n"
@@ -4780,306 +6012,153 @@
 "完成下载：\n"
 "%s"
 
-#: src/PartFile.cpp:2385
+#: src/PartFile.cpp
 #, c-format
 msgid "Deleting file: %s"
 msgstr "正在删除文件: %s"
 
-#: src/PartFile.cpp:2463
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr "警告：无法为已下载的数据段计算校检码 - 校检码集不完整 '%s'"
 
-#: src/PartFile.cpp:2468
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen"
 msgstr "警告：无法生成校检码 - 校检码集不完整（%s）， 正常情况下这是不应该发生的"
 
-#: src/PartFile.cpp:2489
+#: src/PartFile.cpp
 #, c-format
 msgid "Part %u of '%s' marked complete but partfile is shorter than expected (have %llu bytes, need %llu); reopening gap for re-download."
 msgstr "分块 %u（属于文件 '%s'）标记为已完成，但该分片文件大小小于预期（现有 %llu 字节，需要 %llu 字节）；正在重新开放该区间以重新下载。"
 
-#: src/PartFile.cpp:2501 src/PartFile.cpp:2506
+#: src/PartFile.cpp
 #, c-format
 msgid "EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"
 msgstr "计算已下载部分 %u (长度 %u，最多 %u) 的哈希值时出现 EOF 错误，它属于part 文件 “%s”（长度 %u）：%s"
 
-#: src/PartFile.cpp:3223
+#: src/PartFile.cpp
 #, c-format
 msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr "警告：硬盘空间不足！暂停文件：%s"
 
-#: src/PartFile.cpp:3567
+#: src/PartFile.cpp
 #, c-format
 msgid "Downloaded part %i is corrupt in file: %s"
 msgstr "下载的数据段 %i 已损坏 文件： (%s)"
 
-#: src/PartFile.cpp:3617
+#: src/PartFile.cpp
 #, c-format
 msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr "ICH：修复了损坏的数据段 %i（%s），挽救数据（字节）： %s"
 
-#: src/PartFile.cpp:4262
+#: src/PartFile.cpp
 msgid "Allocating"
 msgstr "正在分配"
 
-#: src/PartFile.cpp:4278
+#: src/PartFile.cpp
 msgid "Insufficient disk space"
 msgstr "磁盘空间不足"
 
-#: src/PartFile.cpp:4328 src/SearchListCtrl.cpp:1097
-#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
-msgid "Downloaded"
-msgstr "已下载"
-
-#: src/PartFile.cpp:4601
+#: src/PartFile.cpp
 #, c-format
 msgid "ERROR: Failed to open partfile '%s'"
 msgstr "错误：打开part文件'%s'失败"
 
-#: src/Preferences.cpp:637
-msgid "System default"
-msgstr "系统默认"
-
-#: src/Preferences.cpp:638
-msgid "Albanian"
-msgstr "阿尔巴尼亚语"
-
-#: src/Preferences.cpp:639
-msgid "Arabic"
-msgstr "阿拉伯语"
-
-#: src/Preferences.cpp:640
-msgid "Asturian"
-msgstr "澳大利亚"
-
-#: src/Preferences.cpp:641
-msgid "Basque"
-msgstr "巴斯克语"
-
-#: src/Preferences.cpp:642
-msgid "Bulgarian"
-msgstr "保加利亚语"
-
-#: src/Preferences.cpp:643
-msgid "Catalan"
-msgstr "加泰罗尼亚语"
-
-#: src/Preferences.cpp:644
-msgid "Chinese (Simplified)"
-msgstr "简体中文"
-
-#: src/Preferences.cpp:645
-msgid "Chinese (Traditional)"
-msgstr "繁体中文"
-
-#: src/Preferences.cpp:646
-msgid "Croatian"
-msgstr "克罗的亚语"
-
-#: src/Preferences.cpp:647
-msgid "Czech"
-msgstr "捷克语"
-
-#: src/Preferences.cpp:648
-msgid "Danish"
-msgstr "丹麦语"
-
-#: src/Preferences.cpp:649
-msgid "Dutch"
-msgstr "荷兰语"
-
-#: src/Preferences.cpp:650
-msgid "English (U.K.)"
-msgstr "英语（英国）"
-
-#: src/Preferences.cpp:651
-msgid "English (U.S.)"
-msgstr "英语（美国）"
-
-#: src/Preferences.cpp:652
-msgid "Estonian"
-msgstr "爱斯托尼亚语"
-
-#: src/Preferences.cpp:653
-msgid "Finnish"
-msgstr "芬兰语"
-
-#: src/Preferences.cpp:654
-msgid "French"
-msgstr "法语"
-
-#: src/Preferences.cpp:655
-msgid "Galician"
-msgstr "加利西亚语"
-
-#: src/Preferences.cpp:656
-msgid "German"
-msgstr "德语"
-
-#: src/Preferences.cpp:657
-msgid "Greek"
-msgstr "希腊语"
-
-#: src/Preferences.cpp:658
-msgid "Hebrew"
-msgstr "希伯来语"
-
-#: src/Preferences.cpp:659
-msgid "Hungarian"
-msgstr "匈牙利语"
-
-#: src/Preferences.cpp:660
-msgid "Italian"
-msgstr "意大利语"
-
-#: src/Preferences.cpp:661
-msgid "Italian (Swiss)"
-msgstr "意大利语（瑞士）"
-
-#: src/Preferences.cpp:662
-msgid "Japanese"
-msgstr "日语"
-
-#: src/Preferences.cpp:663
-msgid "Korean"
-msgstr "韩语"
+#: src/PeerCapabilities.h
+msgid "Extended source exchange"
+msgstr "扩展源交换"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (uTP)"
+msgstr "NAT穿透（uTP）"
+
+#: src/PeerCapabilities.h
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/PeerCapabilities.h
+msgid "Buddy info pull"
+msgstr "好友信息拉取"
+
+#: src/PeerCapabilities.h
+msgid "NAT traversal (QUIC)"
+msgstr "NAT 穿透（QUIC）"
 
-#: src/Preferences.cpp:664
-msgid "Lithuanian"
-msgstr "立陶宛语"
-
-#: src/Preferences.cpp:665
-msgid "Norwegian (Nynorsk)"
-msgstr "新挪威语"
-
-#: src/Preferences.cpp:666
-msgid "Polish"
-msgstr "芬兰语"
-
-#: src/Preferences.cpp:667
-msgid "Portuguese"
-msgstr "葡萄牙语"
-
-#: src/Preferences.cpp:668
-msgid "Portuguese (Brazilian)"
-msgstr "葡萄牙语（巴西）"
-
-#: src/Preferences.cpp:669
-msgid "Romanian"
-msgstr "罗马尼亚语"
-
-#: src/Preferences.cpp:670
-msgid "Russian"
-msgstr "俄语"
-
-#: src/Preferences.cpp:671
-msgid "Slovenian"
-msgstr "斯洛文尼亚语"
-
-#: src/Preferences.cpp:672
-msgid "Spanish"
-msgstr "西班牙语"
-
-#: src/Preferences.cpp:673
-msgid "Swedish"
-msgstr "瑞典语"
-
-#: src/Preferences.cpp:674
-msgid "Turkish"
-msgstr "土耳其语"
-
-#: src/Preferences.cpp:675
-msgid "Ukrainian"
-msgstr "乌克兰"
-
-#: src/Preferences.cpp:779
-msgid "Change Language"
-msgstr "更改语言"
-
-#: src/Preferences.cpp:840
-msgid "There are no translations installed for aMule"
-msgstr "没有为 aMule 安装语言文件"
-
-#: src/Preferences.cpp:840
-msgid "No languages available"
-msgstr "语言文件不可用"
-
-#: src/Preferences.cpp:982
+#: src/Preferences.cpp
 msgid "no options available"
 msgstr "选项不可用"
 
-#: src/Preferences.cpp:1857
+#: src/Preferences.cpp
+msgid "Invalid path mapping found, skipping"
+msgstr "发现无效的路径映射，跳过"
+
+#: src/Preferences.cpp
 msgid "Invalid category found, skipping"
 msgstr "发现无效的分类，跳过"
 
-#: src/Preferences.cpp:2039
+#: src/Preferences.cpp
 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:2040
+#: src/Preferences.cpp
 #, c-format
 msgid "Default port will be used (%d)"
 msgstr "缺省端口将被使用（%d）"
 
-#: src/PrefsUnifiedDlg.cpp:196 src/Statistics.cpp:836
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Connection"
 msgstr "连接"
 
-#: src/PrefsUnifiedDlg.cpp:197 src/SearchListCtrl.cpp:110
+#: src/PrefsUnifiedDlg.cpp src/SearchListCtrl.cpp
 msgid "Directories"
 msgstr "目录"
 
-#: src/PrefsUnifiedDlg.cpp:198 src/Statistics.cpp:862
+#: src/PrefsUnifiedDlg.cpp src/Statistics.cpp
 msgid "Servers"
 msgstr "服务器"
 
-#: src/PrefsUnifiedDlg.cpp:199 src/ServerListCtrl.cpp:93
-msgid "Files"
-msgstr "文件"
-
-#: src/PrefsUnifiedDlg.cpp:200
+#: src/PrefsUnifiedDlg.cpp
 msgid "Security"
 msgstr "安全"
 
-#: src/PrefsUnifiedDlg.cpp:201
+#: src/PrefsUnifiedDlg.cpp
 msgid "Interface"
 msgstr "界面"
 
-#: src/PrefsUnifiedDlg.cpp:208
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country"
 msgstr "IP2Country"
 
-#: src/PrefsUnifiedDlg.cpp:211
+#: src/PrefsUnifiedDlg.cpp
 msgid "Proxy"
 msgstr "代理"
 
-#: src/PrefsUnifiedDlg.cpp:212
+#: src/PrefsUnifiedDlg.cpp
 msgid "Filters"
 msgstr "过滤"
 
-#: src/PrefsUnifiedDlg.cpp:213
+#: src/PrefsUnifiedDlg.cpp
 msgid "Remote Controls"
 msgstr "远程控制"
 
-#: src/PrefsUnifiedDlg.cpp:214
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signature"
 msgstr "在线签名"
 
-#: src/PrefsUnifiedDlg.cpp:215
+#: src/PrefsUnifiedDlg.cpp
 msgid "Advanced"
 msgstr "高级"
 
-#: src/PrefsUnifiedDlg.cpp:216
+#: src/PrefsUnifiedDlg.cpp
 msgid "Events"
 msgstr "事件"
 
-#: src/PrefsUnifiedDlg.cpp:218
+#: src/PrefsUnifiedDlg.cpp
 msgid "Debugging"
 msgstr "调试"
 
-#: src/PrefsUnifiedDlg.cpp:331
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following variables will be substituted:\n"
 "    %PARTFILE - full path to the file\n"
@@ -5089,15 +6168,15 @@
 "    %PARTFILE - 文件的完整路径\n"
 "    %PARTNAME - 仅文件名"
 
-#: src/PrefsUnifiedDlg.cpp:351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Tray icon support requires libayatana-appindicator3 at compile time."
 msgstr "系统托盘图标支持在编译时需要 libayatana-appindicator3。"
 
-#: src/PrefsUnifiedDlg.cpp:366
+#: src/PrefsUnifiedDlg.cpp
 msgid "Not available on Wayland: the protocol does not report when a window is minimized, so this option cannot intercept the system minimize button. Workaround: launch aMule with `GDK_BACKEND=x11` to use XWayland instead."
 msgstr "在 Wayland 上不可用：该协议无法报告窗口何时被最小化，因此此选项无法拦截系统的最小化按钮。解决方法：使用 `GDK_BACKEND=x11` 启动 aMule，以改用 XWayland。"
 
-#: src/PrefsUnifiedDlg.cpp:406
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Do not change these setting unless you know\n"
 "what you are doing, otherwise you can easily\n"
@@ -5113,26 +6192,42 @@
 "即使不改动这些设置，aMule\n"
 "也完全可以正常运行。"
 
-#: src/PrefsUnifiedDlg.cpp:467
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr "使用ID %d和密匙%s连接Cfg到小插件失败"
 
-#: src/PrefsUnifiedDlg.cpp:516
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr "通过ID %d和密匙%s把数据从Cfg转移到小插件失败"
 
-#: src/PrefsUnifiedDlg.cpp:568
+#: src/PrefsUnifiedDlg.cpp
 msgid "The type of proxy you are connecting to"
 msgstr "正在连接的代理服务器类型"
 
-#: src/PrefsUnifiedDlg.cpp:744
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr "通过ID %d和密匙%s把数据从小插件转移到Cfg失败"
 
-#: src/PrefsUnifiedDlg.cpp:817
+#: src/PrefsUnifiedDlg.cpp
+msgid "No password set."
+msgstr "未设置密码。"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Guest access needs a password. Type one in the guest password field, or untick Enable guest access."
+msgstr "访客访问需要密码。请在访客密码字段中输入密码，或取消勾选启用访客访问。"
+
+#: src/PrefsUnifiedDlg.cpp
+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
 msgid ""
 "aMule must be restarted to enable these changes:\n"
 "\n"
@@ -5140,31 +6235,43 @@
 "重启aMule后这些更改才能生效：\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:824
+#: src/PrefsUnifiedDlg.cpp
 msgid "- TCP port changed.\n"
 msgstr "- TCP端口已更改。\n"
 
-#: src/PrefsUnifiedDlg.cpp:829
+#: src/PrefsUnifiedDlg.cpp
 msgid "- UDP port changed.\n"
 msgstr "- UDP端口已更改。\n"
 
-#: src/PrefsUnifiedDlg.cpp:834
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Network interface binding changed.\n"
+msgstr "- 更改了网络接口绑定.\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect port changed.\n"
 msgstr "- 外部连接端口已更改。\n"
 
-#: src/PrefsUnifiedDlg.cpp:838
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect acceptance changed.\n"
 msgstr "- 更改了外部连接接受。\n"
 
-#: src/PrefsUnifiedDlg.cpp:842
+#: src/PrefsUnifiedDlg.cpp
 msgid "- External connect interface changed.\n"
 msgstr "- 更改了外部连接接口。\n"
 
-#: src/PrefsUnifiedDlg.cpp:846
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Protocol obfuscation support changed.\n"
 msgstr "- 模糊协议支持已更改。\n"
 
-#: src/PrefsUnifiedDlg.cpp:855
+#: src/PrefsUnifiedDlg.cpp
+msgid "- Proxy settings changed (needed for HTTP transfers).\n"
+msgstr "- 更改了代理设置 (HTTP 传输需要)。\n"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "- amuleapi settings changed.\n"
+msgstr "- amuleapi 首选项已更改。\n"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Your Auto-update server list is empty.\n"
 "'Auto-update server list at startup' will be disabled."
@@ -5172,27 +6279,32 @@
 "您的自动更新服务器列表是可空的，\n"
 "启动时自动更新服务器列表功能将被禁用。"
 
-#: src/PrefsUnifiedDlg.cpp:862
-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
+#, c-format
+msgid "The amuleapi password could not be saved: %s"
+msgstr "无法保存 amuleapi 密码：%s"
 
-#: src/PrefsUnifiedDlg.cpp:874
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Language changed.\n"
 msgstr "- 语言已更改。\n"
 
-#: src/PrefsUnifiedDlg.cpp:879
+#: src/PrefsUnifiedDlg.cpp
 msgid "- Temp folder changed.\n"
 msgstr "- 临时文件目录已更改。\n"
 
-#: src/PrefsUnifiedDlg.cpp:884
+#: src/PrefsUnifiedDlg.cpp
 msgid "- ED2K network enabled.\n"
 msgstr "-ED2K网络已启用。\n"
 
-#: src/PrefsUnifiedDlg.cpp:976
+#: src/PrefsUnifiedDlg.cpp
+msgid "The shared-file exclusion pattern is not a valid regular expression. The filter has been left disabled."
+msgstr "共享文件排除模式不是有效的正则表达式。已禁用该筛选器。"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Invalid regular expression"
+msgstr "无效的正则表达式"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Both eD2k and Kad network are disabled.\n"
 "You won't be able to connect until you enable at least one of them."
@@ -5200,7 +6312,7 @@
 "eD2k 和 Kad 网络都已被禁用，\n"
 "你至少要启用其中的一项才能连接。"
 
-#: src/PrefsUnifiedDlg.cpp:980
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Kad will not start if your UDP port is disabled.\n"
 "Enable UDP port or disable Kad."
@@ -5208,7 +6320,7 @@
 "如果你的 UDP 端口被禁用，Kad 将不能启动。\n"
 "启动 UDP 端口或禁用 Kad。"
 
-#: src/PrefsUnifiedDlg.cpp:1033
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "\n"
 "You MUST restart aMule now.\n"
@@ -5218,19 +6330,66 @@
 "你必须现在重启aMule，\n"
 "如果现在不重启的话，出现任何问题可别怪别人。\n"
 
-#: src/PrefsUnifiedDlg.cpp:1096
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not register aMule for autostart at login. The autostart store may be read-only."
 msgstr "无法将 aMule 注册为登录时自动启动。自动启动存储可能为只读。"
 
-#: src/PrefsUnifiedDlg.cpp:1097
+#: src/PrefsUnifiedDlg.cpp
 msgid "Could not remove the autostart-at-login entry."
 msgstr "无法移除登录时自动启动的条目。"
 
-#: src/PrefsUnifiedDlg.cpp:1098
+#: src/PrefsUnifiedDlg.cpp
 msgid "Autostart"
 msgstr "自启动"
 
-#: src/PrefsUnifiedDlg.cpp:1163
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register file type"
+msgstr "注册文件类型"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Register URL handler"
+msgstr "注册URL处理程序"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "aMule only handles eD2k-compatible magnets. If you replace the current magnet handler (%s), BitTorrent magnet links will stop working - aMule cannot download BitTorrent content. Continue?"
+msgstr "aMule 仅支持兼容 eD2k 的磁力链接。如果替换当前磁力链接处理程序（%s），BitTorrent 磁力链接将停止工作——aMule 无法下载 BitTorrent 内容。是否继续？"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application currently opens .emulecollection files (%s). Replace it with aMule?"
+msgstr "另一个程序目前打开了 .emulecollection 文件 (%s)。 用 aMule 替换它吗？"
+
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Another application is currently the default handler for these links (%s). Replace it with aMule?"
+msgstr "目前已存在另一个应用程序作为这些链接（%s) 的默认处理程序。是否要将其换成aMule？"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule for .emulecollection files. The registration store may be read-only."
+msgstr "无法将 aMule 注册为处理 .emulecollection 文件的程序 。注册存储可能为只读。"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the file type registration."
+msgstr "无法删除文件类型注册。"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not register aMule as the URL handler. The registration store may be read-only."
+msgstr "无法将 aMule 注册为URL处理程序。自动启动存储可能为只读。"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Could not remove the URL handler registration."
+msgstr "无法移除URL处理程序的注册。"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The web server and aMule API require external connections to be enabled."
+msgstr "启用 web 服务器和 aMule API 需要外部连接。"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "The aMule web server is deprecated. Consider running the aMule API instead."
+msgstr "aMule Web 服务器已弃用。请考虑运行 aMule API。"
+
+#: src/PrefsUnifiedDlg.cpp
 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"
@@ -5240,41 +6399,64 @@
 "请输入至少一个指向有效 server.met 的网址，\n"
 "点击这个勾选框旁边的\"列表\"按钮然后输入网址。"
 
-#: src/PrefsUnifiedDlg.cpp:1304
+#: src/PrefsUnifiedDlg.cpp
 msgid "Temporary files"
 msgstr "临时文件"
 
-#: src/PrefsUnifiedDlg.cpp:1309
+#: src/PrefsUnifiedDlg.cpp
 msgid "Incoming files"
 msgstr "传入文件"
 
-#: src/PrefsUnifiedDlg.cpp:1314
+#: src/PrefsUnifiedDlg.cpp
 msgid "Online Signatures"
 msgstr "在线签名"
 
-#: src/PrefsUnifiedDlg.cpp:1327
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Choose a folder for %s"
 msgstr "为%s选择文件夹"
 
-#: src/PrefsUnifiedDlg.cpp:1347
+#: src/PrefsUnifiedDlg.cpp
+#, c-format
+msgid "Would exclude %u of %u shared file"
+msgid_plural "Would exclude %u of %u shared files"
+msgstr0 "将排除 %u 个共享文件，共 %u 个"
+msgstr1 "将排除 %u 个共享文件，共 %u 个"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Browse for videoplayer"
 msgstr "浏览寻找视频播放器"
 
-#: src/PrefsUnifiedDlg.cpp:1351
+#: src/PrefsUnifiedDlg.cpp
 msgid "Select browser"
 msgstr "选择浏览器"
 
-#: src/PrefsUnifiedDlg.cpp:1357
+#: src/PrefsUnifiedDlg.cpp
+msgid "Select ffprobe binary"
+msgstr "选择 ffprobe 文件"
+
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Executable%s"
 msgstr "可执行%s"
 
-#: src/PrefsUnifiedDlg.cpp:1378
+#: src/PrefsUnifiedDlg.cpp
+msgid "ffprobe not found on PATH or in the standard install locations. Install ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."
+msgstr "未在 PATH 或标准安装位置找到 ffprobe。安装 ffmpeg（ffmpeg 自带 ffprobe），或使用“浏览”手动选择一个二进制文件。"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset the settings on this page to their default values?"
+msgstr "重置此页面设置为默认值?"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Reset to defaults"
+msgstr "重置为默认"
+
+#: src/PrefsUnifiedDlg.cpp
 msgid "Edit server list"
 msgstr "编辑服务器列表"
 
-#: src/PrefsUnifiedDlg.cpp:1379
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "Add here URL's to download server.met files.\n"
 "Only one url on each line."
@@ -5282,114 +6464,114 @@
 "在此添加下载 server.met 文件的地址\n"
 "每行只限一个。"
 
-#: src/PrefsUnifiedDlg.cpp:1431
+#: src/PrefsUnifiedDlg.cpp
 msgid "IP2Country update failed"
 msgstr "IP2Country 更新失败"
 
-#: src/PrefsUnifiedDlg.cpp:1566
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by MaxMind GeoLite2"
 msgstr "数据来自 MaxMind GeoLite2"
 
-#: src/PrefsUnifiedDlg.cpp:1568
+#: src/PrefsUnifiedDlg.cpp
 msgid "Custom source"
 msgstr "自定义源"
 
-#: src/PrefsUnifiedDlg.cpp:1570
+#: src/PrefsUnifiedDlg.cpp
 msgid "Data by DB-IP.com"
 msgstr "数据来源：DB-IP.com"
 
-#: src/PrefsUnifiedDlg.cpp:1590
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s"
 msgstr "状态：已加载%s"
 
-#: src/PrefsUnifiedDlg.cpp:1593
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Status: Loaded%s - %s"
 msgstr "状态：已加载%s~%s"
 
-#: src/PrefsUnifiedDlg.cpp:1598
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Failed to load - click 'Update now' to refresh."
 msgstr "状态：加载失败 - 点击“立即更新”以刷新。"
 
-#: src/PrefsUnifiedDlg.cpp:1600
+#: src/PrefsUnifiedDlg.cpp
 msgid "Status: Not found - click 'Update now' to download."
 msgstr "状态：未找到 - 点击“立即更新”进行下载。"
 
-#: src/PrefsUnifiedDlg.cpp:1645 src/PrefsUnifiedDlg.cpp:1664
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Update delay: %d second"
 msgid_plural "Update delay: %d seconds"
 msgstr0 "更新延迟：%d秒"
 msgstr1 "更新延迟：%d秒"
 
-#: src/PrefsUnifiedDlg.cpp:1652
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Time for average graph: %d minute"
 msgid_plural "Time for average graph: %d minutes"
 msgstr0 "平均值图表显示时间：%d分钟"
 msgstr1 "平均值图表显示时间：%d分钟"
 
-#: src/PrefsUnifiedDlg.cpp:1658
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Connections Graph Scale: %d"
 msgstr "网络连接图表缩放：%d"
 
-#: src/PrefsUnifiedDlg.cpp:1670
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "File Buffer Size: %d byte"
 msgid_plural "File Buffer Size: %d bytes"
 msgstr0 "文件缓冲区大小：%d字节"
 msgstr1 "文件缓冲区大小：%d字节"
 
-#: src/PrefsUnifiedDlg.cpp:1676
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Upload Queue Size: %d client"
 msgid_plural "Upload Queue Size: %d clients"
 msgstr0 "上传队列长度：%d个用户"
 msgstr1 "上传队列长度：%d个用户"
 
-#: src/PrefsUnifiedDlg.cpp:1683
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Server connection refresh interval: %d minute"
 msgid_plural "Server connection refresh interval: %d minutes"
 msgstr0 "服务器连接刷新周期：%d分钟"
 msgstr1 "服务器连接刷新周期：%d分钟"
 
-#: src/PrefsUnifiedDlg.cpp:1685
+#: src/PrefsUnifiedDlg.cpp
 msgid "Server connection refresh interval: Disabled"
 msgstr "服务器连接刷新周期：已禁用"
 
-#: src/PrefsUnifiedDlg.cpp:1730
+#: src/PrefsUnifiedDlg.cpp
 msgid "disabled"
 msgstr "禁用"
 
-#: src/PrefsUnifiedDlg.cpp:1753
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
 msgid "Execute command on '%s' event"
 msgstr "在“%s”事件时执行命令"
 
-#: src/PrefsUnifiedDlg.cpp:1756
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on core"
 msgstr "在核心启用执行命令"
 
-#: src/PrefsUnifiedDlg.cpp:1764
+#: src/PrefsUnifiedDlg.cpp
 msgid "Core command:"
 msgstr "核心命令："
 
-#: src/PrefsUnifiedDlg.cpp:1773
+#: src/PrefsUnifiedDlg.cpp
 msgid "Enable command execution on GUI"
 msgstr "在图形界面端启用执行命令"
 
-#: src/PrefsUnifiedDlg.cpp:1781
+#: src/PrefsUnifiedDlg.cpp
 msgid "GUI command:"
 msgstr "图形界面命令："
 
-#: src/PrefsUnifiedDlg.cpp:1790
+#: src/PrefsUnifiedDlg.cpp
 msgid "The following variables will be replaced:"
 msgstr "以下变量将被替换："
 
-#: src/PrefsUnifiedDlg.cpp:1952
+#: src/PrefsUnifiedDlg.cpp
 msgid ""
 "The following folders look like system or sensitive locations:\n"
 "\n"
@@ -5397,1073 +6579,1324 @@
 "以下文件夹看起来像是系统或敏感位置：\n"
 "\n"
 
-#: src/PrefsUnifiedDlg.cpp:1957
+#: src/PrefsUnifiedDlg.cpp
 msgid "Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?"
 msgstr "递归共享会将每个子文件发布到 eD2k/Kad 网络上。您确定要这样做吗？"
 
-#: src/PrefsUnifiedDlg.cpp:1959
+#: src/PrefsUnifiedDlg.cpp
 msgid "Confirm shared folders"
 msgstr "确认共享的文件夹"
 
-#: src/PrefsUnifiedDlg.cpp:1992
-msgid "Reloading shared files…"
-msgstr "正重新加载共享文件…"
-
-#: src/PrefsUnifiedDlg.cpp:1993
-msgid "Scanning for subdirectories…"
-msgstr "正在扫描子目录…"
+#: src/PrefsUnifiedDlg.cpp src/SharedFileList.cpp
+#: src/SharedFilesReloadProgress.cpp
+msgid "Reloading shared files..."
+msgstr "正重新加载共享文件..."
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Scanning for subdirectories..."
+msgstr "正在扫描子目录..."
 
-#: src/PrefsUnifiedDlg.cpp:1994
+#: src/PrefsUnifiedDlg.cpp
 msgid "Updating shared folders"
 msgstr "正在上传共享的文件夹"
 
-#: src/PrefsUnifiedDlg.cpp:2023
+#: src/PrefsUnifiedDlg.cpp
 #, c-format
-msgid "Scanned %u directories…"
-msgstr "已扫描 %u 个目录……"
+msgid "Scanned %u directories..."
+msgstr "已扫描 %u 个目录......"
 
-#: src/PrefsUnifiedDlg.cpp:2073
-#, c-format
-msgid "Reloading shared files: %u files scanned"
-msgstr "正重新加载共享文件：扫描了 %u 个文件"
+#: src/PrefsUnifiedDlg.cpp
+msgid "Shared folder"
+msgstr "共享的文件夹"
 
-#: src/SearchDlg.cpp:282
+#: src/PrefsUnifiedDlg.cpp
+msgid "Both the remote and local prefix must be filled in."
+msgstr "远程和本地前缀都必填。"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "This remote prefix is already mapped."
+msgstr "已映射这个远程前缀。"
+
+#: src/PrefsUnifiedDlg.cpp
+msgid "Choose the local folder"
+msgstr "选择本地文件夹"
+
+#: src/SearchDlg.cpp
+msgid "Clear Search History"
+msgstr "清除搜索历史"
+
+#: src/SearchDlg.cpp
+msgid "Clear the saved search history? This cannot be undone."
+msgstr "清除保存的搜索历史？这无法撤销。"
+
+#: src/SearchDlg.cpp
+msgid "Search warning"
+msgstr "搜索警告"
+
+#: src/SearchDlg.cpp
 msgid "It's impossible to search when both eD2k and Kademlia are disabled."
 msgstr "同时禁用 eD2k 和 Kademlia 时将无法搜索。"
 
-#: src/SearchDlg.cpp:283 src/SearchListCtrl.cpp:812
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Search error"
 msgstr "搜索错误"
 
-#: src/SearchDlg.cpp:432
-msgid "Kad search: requested wider results from one more peer."
-msgstr "Kad 搜索：向另一个节点请求了更广泛的结果。"
+#: src/SearchDlg.cpp
+msgid ""
+"An eD2k search is still running. Starting a new one will stop it, because the eD2k protocol allows only one search at a time.\n"
+"\n"
+"Results already found are kept; only new ones stop arriving.\n"
+"\n"
+"Start the new search anyway?"
+msgstr ""
+"还在运行一个 eD2k 搜索。启动一个新搜索会停止它，因为 eD2k 协议一次只允许一个搜索。\n"
+"\n"
+"已找到的结果将被保留；仅新结果会停止到来。\n"
+"\n"
+"仍要启动新搜索吗？"
 
-#: src/SearchDlg.cpp:438
-msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
-msgstr "Kad 搜索：没有剩余节点可重新请求更多结果（已达上限或尚无响应）。"
+#: src/SearchDlg.cpp
+msgid "Search in progress"
+msgstr "搜索中"
 
-#: src/SearchDlg.cpp:543
+#: src/SearchDlg.cpp
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr "最小值必须小于最大值，最大值已被忽略。"
 
-#: src/SearchDlg.cpp:544 src/SearchDlg.cpp:602
-msgid "Search warning"
-msgstr "搜索警告"
-
-#: src/SearchDlg.cpp:662 src/SearchListCtrl.cpp:703
+#: src/SearchDlg.cpp src/SearchListCtrl.cpp
 msgid "Main"
 msgstr "主要"
 
-#: src/SearchList.cpp:313
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad搜索不能使用，因为Kad没有连接"
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the %u most recent of %u open searches to %s."
+msgstr "仅保存最近的 %u 个打开的搜索 （共 %u 个）到 %s。"
+
+#: src/SearchList.cpp
+#, c-format
+msgid "Only saving the first %u of %u results for search \"%s\"."
+msgstr "仅保存搜索 “%3$s” 获得的前 %1$u 个结果，共 %2$u 个结果。"
+
+#: src/SearchList.cpp
+msgid "WARNING: Stored search list corrupted, contains invalid header."
+msgstr "警告: 存储的搜索列表已损坏，含无效头部。"
+
+#: src/SearchList.cpp
+msgid "Invalid entry in stored search list, file may be corrupt"
+msgstr "存储的搜索列表包含无效条目，文件可能损坏："
 
-#: src/SearchList.cpp:315
+#: src/SearchList.cpp
 msgid "eD2k search can't be done if eD2k is not connected"
 msgstr "eD2k未连接时eD2k搜索无法进行"
 
-#: src/SearchList.cpp:336
+#: src/SearchList.cpp
 msgid "No keyword for Kad search - aborting"
 msgstr "Kad 搜索没有关键字 - 中止"
 
-#: src/SearchList.cpp:386
+#: src/SearchList.cpp
 msgid "Unexpected error while attempting Kad search: "
 msgstr "尝试Kad搜索时出现未预料的错误： "
 
-#: src/SearchListCtrl.cpp:98 src/SharedFilesCtrl.cpp:107
-msgid "FileID"
-msgstr "文件 ID"
+#: src/SearchList.cpp
+msgid "Search timed out: the server did not answer."
+msgstr "搜索超时：服务器未回应。"
 
-#: src/SearchListCtrl.cpp:104
-msgid "Length"
-msgstr "长度"
+#: src/SearchList.cpp
+msgid "Kad search: requested wider results from one more peer."
+msgstr "Kad 搜索：从又一个对等方请求了更广泛的结果。"
 
-#: src/SearchListCtrl.cpp:105
-msgid "Bitrate"
-msgstr "比特率"
+#: src/SearchList.cpp
+msgid "Kad search: no peer left to reask for more results (cap reached or no responses yet)."
+msgstr "Kad 搜索：没有剩余对等方可重新请求更多结果（已达上限或尚无响应）。"
 
-#: src/SearchListCtrl.cpp:106
-msgid "Codec"
-msgstr "编解码器"
+#: src/SearchList.cpp
+#, c-format
+msgid "Error %u: %s\n"
+msgstr "错误 %u：%s\n"
 
-#: src/SearchListCtrl.cpp:709
-msgid "Download in category"
-msgstr "下载分类"
+#: src/SearchListCtrl.cpp
+msgid "FileID"
+msgstr "文件 ID"
 
-#: src/SearchListCtrl.cpp:714
-#, c-format
-msgid "Get %s for this file"
-msgstr "获取此文件的 %s"
+#: src/SearchListCtrl.cpp
+msgid "Expand all"
+msgstr "全部展开"
+
+#: src/SearchListCtrl.cpp
+msgid "Collapse all"
+msgstr "折叠所有"
 
-#: src/SearchListCtrl.cpp:718
+#: src/SearchListCtrl.cpp
 msgid "Search related files (eD2k, local server)"
 msgstr "搜索相关文件（eD2k，本地服务器）"
 
-#: src/SearchListCtrl.cpp:723
-msgid "Mark as known file"
-msgstr "标记为已知文件"
-
-#: src/SearchListCtrl.cpp:727 src/ServerListCtrl.cpp:433
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
 msgid "Copy eD2k link to clipboard"
 msgstr "复制eD2k链接至剪贴板"
 
-#: src/SearchListCtrl.cpp:811
+#: src/SearchListCtrl.cpp src/ServerListCtrl.cpp
+msgid "Copy eD2k links to clipboard"
+msgstr "复制eD2k链接至剪贴板"
+
+#: src/SearchListCtrl.cpp
 msgid "You are not currently connected to a server supporting the Related Files search function"
 msgstr "当前未连接到支持“相关文件”搜索功能的服务器"
 
-#: src/SearchListCtrl.cpp:1105
+#: src/SearchListCtrl.cpp
 msgid "Canceled"
 msgstr "已取消"
 
-#: src/SearchListCtrl.cpp:1108
+#: src/SearchListCtrl.cpp
 msgid "New"
 msgstr "新建"
 
-#: src/ServerConnect.cpp:74
+#: src/SearchProgressReport.cpp
+msgid "running"
+msgstr "正在运行"
+
+#: src/SearchProgressReport.cpp
+msgid "finished"
+msgstr "已完成"
+
+#: src/SearchProgressReport.cpp
+msgid "idle"
+msgstr "空闲"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u: %s, %u %% (%u results)\n"
+msgstr "搜索 %u: %s, %u %% (%u 个结果)\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search %u \"%s\": %s, %u %% (%u results)\n"
+msgstr "搜索 %u \"%s\": %s, %u %% (%u 个结果)\n"
+
+#: src/SearchProgressReport.cpp src/TextClient.cpp
+msgid "Search expired or unknown ID. Start a new search.\n"
+msgstr "搜索已过期或未知的ID。开始新的搜索。\n"
+
+#: src/SearchProgressReport.cpp
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "搜索进度: %u %% \n"
+
+#: src/SearchProgressReport.cpp
+msgid "Search progress not available"
+msgstr "搜索进度不可用"
+
+#: src/SearchProgressReport.cpp
+msgid "No search to report on.\n"
+msgstr "没有可报告的搜索。\n"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all obfuscated static servers listed. Making another pass without obfuscation."
+msgstr "无法连接至列出的全部混淆静态服务器，尝试不用混淆再连一次。"
+
+#: src/ServerConnect.cpp
 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
+msgid "Failed to connect to all static servers listed."
+msgstr "无法连接到列出的所有静态服务器。"
+
+#: src/ServerConnect.cpp
+msgid "Failed to connect to all servers listed."
+msgstr "未能连接到列出的所有服务器。"
 
-#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+#: src/ServerConnect.cpp
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr0 "服务器自动连接会在 %d 秒后重新尝试"
+msgstr1 "服务器自动连接会在 %d 秒后重新尝试"
+
+#: src/ServerConnect.cpp
 msgid "eD2k network disabled on preferences, not connecting."
-msgstr "设置中已禁用eD2k网络，将不会连接。"
+msgstr "首选项中已禁用eD2k网络，将不会连接。"
 
-#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+#: src/ServerConnect.cpp
 msgid "No valid servers to which to connect found in server list"
 msgstr "服务器列表中没有可以连接的服务器"
 
-#: src/ServerConnect.cpp:198
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connected to %s (%s:%i)"
 msgstr "已连接至 %s (%s:%i)"
 
-#: src/ServerConnect.cpp:274
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection established on: %s"
 msgstr "已成功连接到：%s"
 
-#: src/ServerConnect.cpp:346
+#: src/ServerConnect.cpp
 msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr "尝试连接时出现严重错误，网络可能没有连接"
 
-#: src/ServerConnect.cpp:350
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Lost connection to %s (%s:%i)"
 msgstr "连接已断开 %s（%s：%i）"
 
-#: src/ServerConnect.cpp:360
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be dead."
 msgstr "%s（%s：%i）可能已当机"
 
-#: src/ServerConnect.cpp:373
+#: src/ServerConnect.cpp
 #, c-format
 msgid "%s (%s:%i) appears to be full."
 msgstr "%s（%s：%i）可能已没有空位"
 
-#: 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"
-msgstr0 "服务器自动连接会在 %d 秒后重新尝试"
-msgstr1 "服务器自动连接会在 %d 秒后重新尝试"
-
-#: src/ServerConnect.cpp:412
-msgid "Connection lost"
-msgstr "连接已断"
-
-#: src/ServerConnect.cpp:419
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connecting to %s (%s:%i) failed."
 msgstr "连接失败 %s（%s：%i）"
 
-#: src/ServerConnect.cpp:462
+#: src/ServerConnect.cpp
 msgid "ERROR: Socket invalid at timeout check"
 msgstr "错误：连接超时，端口无效"
 
-#: src/ServerConnect.cpp:472
+#: src/ServerConnect.cpp
 #, c-format
 msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr "连接超时 %s（%s：%i）"
 
-#: src/ServerConnect.cpp:673
+#: src/ServerConnect.cpp
 msgid "Received late result of DNS lookup, discarding."
 msgstr "获取更新的DNS查询结果，丢弃。"
 
-#: src/ServerList.cpp:96
+#: src/ServerList.cpp
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "正在载入 server.met 文件：%s"
 
-#: src/ServerList.cpp:101
+#: src/ServerList.cpp
 msgid "Server.met file not found!"
 msgstr "没找到 server.met 文件！"
 
-#: src/ServerList.cpp:109
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "载入 server.met 文件 '%s' 失败，遇到未知格式。"
 
-#: src/ServerList.cpp:115
+#: src/ServerList.cpp
 msgid "Failed to open server.met!"
 msgstr "未能打开 server.met 文件!"
 
-#: src/ServerList.cpp:126
+#: src/ServerList.cpp
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Server.met 文件损坏，发现错误的版本标记：0x%x，大小 %i"
 
-#: src/ServerList.cpp:182
+#: src/ServerList.cpp
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr0 "server.met 中找到%i个服务器"
 msgstr1 "server.met 中找到%i个服务器"
 
-#: src/ServerList.cpp:184
+#: src/ServerList.cpp
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr0 "新增%d个服务器"
 msgstr1 "新增%d个服务器"
 
-#: src/ServerList.cpp:187
+#: src/ServerList.cpp
 msgid "Error: the file 'server.met' is corrupted: "
 msgstr "错误: 文件 'server.met' 已经损坏: "
 
-#: src/ServerList.cpp:191
+#: src/ServerList.cpp
 msgid "IO error while reading 'server.met': "
 msgstr "读取“server.met”时发生 IO 错误: "
 
-#: src/ServerList.cpp:204
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: %s:%d does not specify a valid port."
 msgstr "没有添加服务器：%s:%d 未指定有效端口。"
 
-#: src/ServerList.cpp:222
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: The IP of %s:%d is filtered or invalid."
 msgstr "没有添加服务器：%s:%d IP 地址无效或被过滤。"
 
-#: src/ServerList.cpp:241
+#: src/ServerList.cpp
 #, c-format
 msgid "Server not added: Server with matching IP:Port %s:%d found in list."
 msgstr "没有添加服务器： 服务器列表中已有%s：%d"
 
-#: src/ServerList.cpp:259
+#: src/ServerList.cpp
 #, c-format
 msgid "Server added: Server at %s:%d using the name '%s'."
 msgstr "成功添加服务器：%s:%d 服务器名为 '%s'"
 
-#: src/ServerList.cpp:355
+#: src/ServerList.cpp
 msgid "You are connected to the server you are trying to delete. please disconnect first."
 msgstr "您在连接您已决定删除的服务器，请断开连接。"
 
-#: src/ServerList.cpp:527
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "无法打开“%s”"
 
-#: src/ServerList.cpp:695
+#: src/ServerList.cpp
 msgid "Failed to save server.met!"
 msgstr "无法保存 server.met！"
 
-#: src/ServerList.cpp:843
+#: src/ServerList.cpp
+#, c-format
+msgid "IO failure while writing 'server.met': %s"
+msgstr "写入“server.met”时发生 IO 错误： %s"
+
+#: src/ServerList.cpp
 msgid "Invalid URL"
 msgstr "无效 URL"
 
-#: src/ServerList.cpp:866
+#: src/ServerList.cpp
 #, c-format
 msgid "Finished downloading the server list from %s"
 msgstr "从%s下载服务器列表完成"
 
-#: src/ServerList.cpp:884
+#: src/ServerList.cpp
 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 "addresses.dat文件内没有服务器列表地址，请粘贴一个有效服务器列表地址到该文件以自动更新服务器列表."
 
-#: src/ServerList.cpp:903
+#: src/ServerList.cpp
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "正在开始从 %s 下载服务器列表"
 
-#: src/ServerList.cpp:912
+#: src/ServerList.cpp
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "警告：自动下载服务器列表的地址错误：%s"
 
-#: src/ServerList.cpp:916
+#: src/ServerList.cpp
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "addresses.dat 文件中没有有效的自动更新 server.met 的地址"
 
-#: src/ServerList.cpp:932
+#: src/ServerList.cpp
 #, c-format
 msgid "Failed to download the server list from %s"
 msgstr "无法从 %s 下载服务器列表"
 
-#: src/ServerList.cpp:1006
+#: src/ServerList.cpp
 msgid "Local server is filtered by the IPFilters, reconnecting to a different server!"
 msgstr "本地服务器被IP过滤器过滤掉了，正在重新连接至其他服务器！"
 
-#: src/ServerListCtrl.cpp:87
+#: src/ServerListCtrl.cpp
 msgid "Server Name"
 msgstr "服务器名称"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "地址"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "端口"
-
-#: src/ServerListCtrl.cpp:90
+#: src/ServerListCtrl.cpp
 msgid "Description"
 msgstr "描述"
 
-#: src/ServerListCtrl.cpp:91
+#: src/ServerListCtrl.cpp
 msgid "Ping"
 msgstr "响应时间"
 
-#: src/ServerListCtrl.cpp:92
+#: src/ServerListCtrl.cpp
 msgid "Users"
 msgstr "用户数"
 
-#: src/ServerListCtrl.cpp:96
+#: src/ServerListCtrl.cpp
+msgid "Max Users"
+msgstr "最大用户数"
+
+#: src/ServerListCtrl.cpp
 msgid "Static"
 msgstr "静态"
 
-#: src/ServerListCtrl.cpp:97 src/SharedFilePeersListCtrl.cpp:34
-#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:1019
-msgid "Version"
-msgstr "版本"
+#: src/ServerListCtrl.cpp
+msgid "Soft Files"
+msgstr "文件排序"
+
+#: src/ServerListCtrl.cpp
+msgid "Hard Files"
+msgstr "硬文件"
 
-#: src/ServerListCtrl.cpp:100
+#: src/ServerListCtrl.cpp
 msgid "TCP Flags"
 msgstr "TCP 标志"
 
-#: src/ServerListCtrl.cpp:101
+#: src/ServerListCtrl.cpp
 msgid "UDP Flags"
 msgstr "UDP 标志"
 
-#: src/ServerListCtrl.cpp:155
+#: src/ServerListCtrl.cpp
 msgid "You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."
 msgstr "现在正连接在要删除的服务器。该服务器暂时无法删除。请先断开连接。"
 
-#: src/ServerListCtrl.cpp:158
+#: src/ServerListCtrl.cpp
 msgid "(Unknown name)"
 msgstr "(未知名称)"
 
-#: src/ServerListCtrl.cpp:160
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Are you sure you want to delete the static server %s"
 msgstr "您确定要删除静态服务器 %s ?"
 
-#: src/ServerListCtrl.cpp:354
+#: src/ServerListCtrl.cpp
+msgid "ms"
+msgstr "毫秒"
+
+#: src/ServerListCtrl.cpp
 #, c-format
 msgid "Servers (%i)"
 msgstr "服务器（%i）"
 
-#: src/ServerListCtrl.cpp:403 src/ServerSocket.cpp:184 src/ServerSocket.cpp:199
-#: src/ServerSocket.cpp:321 src/ServerWnd.cpp:190
+#: src/ServerListCtrl.cpp src/ServerSocket.cpp src/ServerWnd.cpp
 msgid "Server"
 msgstr "服务器"
 
-#: src/ServerListCtrl.cpp:408
+#: src/ServerListCtrl.cpp
 msgid "Connect to server"
 msgstr "连接到服务器"
 
-#: src/ServerListCtrl.cpp:414
+#: src/ServerListCtrl.cpp
 msgid "Mark server as static"
 msgstr "标记服务器为静态"
 
-#: src/ServerListCtrl.cpp:415
+#: src/ServerListCtrl.cpp
 msgid "Mark server as non-static"
 msgstr "标记服务器为非静态"
 
-#: src/ServerListCtrl.cpp:417
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as static"
 msgstr "标记服务器为静态"
 
-#: src/ServerListCtrl.cpp:418
+#: src/ServerListCtrl.cpp
 msgid "Mark servers as non-static"
 msgstr "标记服务器为非静态"
 
-#: src/ServerListCtrl.cpp:424
+#: src/ServerListCtrl.cpp
 msgid "Remove server"
 msgstr "删除服务器"
 
-#: src/ServerListCtrl.cpp:426
+#: src/ServerListCtrl.cpp
 msgid "Remove servers"
 msgstr "删除服务器"
 
-#: src/ServerListCtrl.cpp:428
+#: src/ServerListCtrl.cpp
 msgid "Remove all servers"
 msgstr "删除所有服务器"
 
-#: src/ServerListCtrl.cpp:435
-msgid "Copy eD2k links to clipboard"
-msgstr "复制eD2k链接至剪贴板"
-
-#: src/ServerListCtrl.cpp:443
+#: src/ServerListCtrl.cpp
 msgid "Reconnect to server"
 msgstr "重新连接到服务器"
 
-#: src/ServerListCtrl.cpp:532
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete all servers?"
 msgstr "您确定要删除所有服务器吗？"
 
-#: src/ServerListCtrl.cpp:548
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected server?"
 msgstr "您确定要删除已选的服务器吗？"
 
-#: src/ServerListCtrl.cpp:550
+#: src/ServerListCtrl.cpp
 msgid "Are you sure that you wish to delete the selected servers?"
 msgstr "您确定要删除已选的服务器吗？"
 
-#: src/ServerSocket.cpp:186
+#: src/ServerSocket.cpp
 #, c-format
 msgid "ERROR: %s (%s) - %s"
 msgstr "错误: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:201
+#: src/ServerSocket.cpp
 #, c-format
 msgid "WARNING: %s (%s) - %s"
 msgstr "警告: %s (%s) - %s"
 
-#: src/ServerSocket.cpp:320
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server %s (%s) rejected our login (no client ID assigned). Disconnecting."
 msgstr "服务器 %s（%s）拒绝了我们的登录（未分配客户端 ID）。正在断开连接。"
 
-#: src/ServerSocket.cpp:362
+#: src/ServerSocket.cpp
 #, c-format
 msgid "New clientid is %u"
 msgstr "新的用户编号是 %u"
 
-#: src/ServerSocket.cpp:364
+#: src/ServerSocket.cpp
 msgid "WARNING: You have received Low-ID!"
 msgstr "警告: 您获得了 Low ID！"
 
-#: src/ServerSocket.cpp:365
+#: src/ServerSocket.cpp
 msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr "\t大概这是因为您处在防火墙或路由器后面。"
 
-#: src/ServerSocket.cpp:366
+#: src/ServerSocket.cpp
 msgid "\tFor more information, please refer to https://amule-org.github.io/docs"
 msgstr "\t如需了解更多相关信息，请访问 https://amule-org.github.io/docs"
 
-#: src/ServerSocket.cpp:422
+#: src/ServerSocket.cpp
 msgid "Unknown server info received! - too short"
 msgstr "收到未知服务器信息 ! - 长度过短"
 
-#: src/ServerSocket.cpp:502
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Received %d new server"
 msgid_plural "Received %d new servers"
 msgstr0 "收到 %d 个新服务器"
 msgstr1 "收到 %d 个新服务器"
 
-#: src/ServerSocket.cpp:505
+#: src/ServerSocket.cpp
 msgid "Saving of server-list completed."
 msgstr "服务器列表保存完毕。"
 
-#: src/ServerSocket.cpp:555
+#: src/ServerSocket.cpp
 msgid "Server rejected last command"
 msgstr "服务器拒绝了上一个明令"
 
-#: src/ServerSocket.cpp:563 src/ServerSocket.cpp:565
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Bogus packet received from server: %s"
 msgstr "从服务器接收到虚假数据包: %s"
 
-#: src/ServerSocket.cpp:567
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Unhandled error while processing packet from server: %s"
 msgstr "处理来自服务器的数据包时出现未处理的错误 ： %s"
 
-#: src/ServerSocket.cpp:606 src/ServerSocket.cpp:610
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr "无法建立DNS线程以连接 %s"
 
-#: src/ServerSocket.cpp:692
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr "服务器 IP %s (%s) 已被过滤，不在连接。"
 
-#: src/ServerSocket.cpp:702
+#: src/ServerSocket.cpp
 msgid "using protocol obfuscation."
 msgstr "使用模糊协议。"
 
-#: src/ServerSocket.cpp:711
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr "正在连接至 %s (%s - %s:%i) %s"
 
-#: src/ServerSocket.cpp:724
+#: src/ServerSocket.cpp
 #, c-format
 msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr "无法解析服务器 %s 的 DNS： 无法连接！"
 
-#: src/ServerWnd.cpp:124
+#: src/ServerWnd.cpp
+msgid "aMuleGUI Log"
+msgstr "aMule图形用户界面日志"
+
+#: src/ServerWnd.cpp
 msgid "Server not added: No IP or hostname specified."
 msgstr "没有添加服务器： 没有指定 IP 地址或主机名。"
 
-#: src/ServerWnd.cpp:129
+#: src/ServerWnd.cpp
 msgid "Server not added: Invalid server-port specified."
 msgstr "没有添加服务器： 指定的服务器端口组合无效。"
 
-#: src/ServerWnd.cpp:182
+#: src/ServerWnd.cpp
 msgid "eD2k Status:"
 msgstr "eD2k状态:"
 
-#: src/ServerWnd.cpp:193
+#: src/ServerWnd.cpp
 msgid "ID"
 msgstr "ID"
 
-#: src/ServerWnd.cpp:200
+#: src/ServerWnd.cpp
 msgid "Connection Type:"
 msgstr "连接类型："
 
-#: src/ServerWnd.cpp:218
+#: src/ServerWnd.cpp
+msgid "Connected since:"
+msgstr "连接起始自："
+
+#: src/ServerWnd.cpp
 msgid "Kademlia Status:"
 msgstr "Kad 状态:"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running in LAN mode"
 msgstr "以局域网模式运行"
 
-#: src/ServerWnd.cpp:221
+#: src/ServerWnd.cpp
 msgid "Running"
 msgstr "正在运行"
 
-#: src/ServerWnd.cpp:224
+#: src/ServerWnd.cpp
 msgid "Kademlia client ID:"
 msgstr "Kad 客户端 ID:"
 
-#: src/ServerWnd.cpp:226
+#: src/ServerWnd.cpp
 msgid "Status:"
 msgstr "状态:"
 
-#: src/ServerWnd.cpp:229
+#: src/ServerWnd.cpp
 msgid "Connection State:"
 msgstr "连接状态:"
 
-#: src/ServerWnd.cpp:231
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr "被防火墙阻挡-请在你的路由器或者防火墙中打开TCP端口%d"
 
-#: src/ServerWnd.cpp:233
+#: src/ServerWnd.cpp
 msgid "UDP Connection State:"
 msgstr "UDP连接状态:"
 
-#: src/ServerWnd.cpp:236
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr "被防火墙阻挡-请在你的路由器或者防火墙中打开UDP端口%d"
 
-#: src/ServerWnd.cpp:240
+#: src/ServerWnd.cpp
 msgid "Firewalled state: "
 msgstr "防火墙状态: "
 
-#: src/ServerWnd.cpp:246
+#: src/ServerWnd.cpp
 msgid "No buddy required - TCP port open"
 msgstr "没有好友请求 - TCP 端口打开"
 
-#: src/ServerWnd.cpp:248
+#: src/ServerWnd.cpp
 msgid "No buddy required - UDP port open"
 msgstr "没有好友请求 - UDP 端口打开"
 
-#: src/ServerWnd.cpp:250
+#: src/ServerWnd.cpp
 msgid "No buddy"
 msgstr "没有好友"
 
-#: src/ServerWnd.cpp:254
+#: src/ServerWnd.cpp
 msgid "Connecting to buddy"
 msgstr "已连接至好友"
 
-#: src/ServerWnd.cpp:257
+#: src/ServerWnd.cpp
 #, c-format
 msgid "Connected to buddy at %s"
 msgstr "连接到好友于 %s"
 
-#: src/ServerWnd.cpp:267
+#: src/ServerWnd.cpp
+msgid "IP address:"
+msgstr "IP 地址:"
+
+#: src/ServerWnd.cpp
 msgid "Indexed sources:"
 msgstr "索引源:"
 
-#: src/ServerWnd.cpp:269
+#: src/ServerWnd.cpp
 msgid "Indexed keywords:"
 msgstr "索引关键词:"
 
-#: src/ServerWnd.cpp:271
+#: src/ServerWnd.cpp
 msgid "Indexed notes:"
 msgstr "索引批注:"
 
-#: src/ServerWnd.cpp:273
+#: src/ServerWnd.cpp
 msgid "Indexed load:"
 msgstr "索引载入:"
 
-#: src/ServerWnd.cpp:276
+#: src/ServerWnd.cpp
 msgid "Average Users:"
-msgstr "平均用户:"
+msgstr "平均用户数:"
 
-#: src/ServerWnd.cpp:279
+#: src/ServerWnd.cpp
 msgid "Average Files:"
-msgstr "平均文件:"
+msgstr "平均文件数:"
 
-#: src/ServerWnd.cpp:284 src/TextClient.cpp:827
+#: src/ServerWnd.cpp src/TextClient.cpp
 msgid "Not running"
 msgstr "没有运行"
 
-#: src/SharedFileList.cpp:361
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: backend overflow/error (%s); falling back to full reload"
+msgstr "共享目录监测：后端溢出/错误 (%s); 回退到完整加载"
+
+#: src/SharedDirWatcher.cpp
+#, c-format
+msgid "Shared-dir watcher: %u new subdirectory found since last run, rescanning shares"
+msgid_plural "Shared-dir watcher: %u new subdirectories found since last run, rescanning shares"
+msgstr0 "共享目录监视：上次运行以来找到了 %u 个新的子目录，正重新扫描分享"
+msgstr1 "共享目录监视：上次运行以来找到了 %u 个新的子目录，正重新扫描分享"
+
+#: src/SharedDirWatcher.cpp
+msgid "Shared-dir watcher: events dropped by backend, forcing a full shared-files reload to resync"
+msgstr "共享目录监测：事件被后端丢弃，强制完整的共享文件重加载以重新同步"
+
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Adding file %s to shares"
 msgstr "将文件 %s 加入共享"
 
-#: src/SharedFileList.cpp:404
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Found %i known shared file"
 msgid_plural "Found %i known shared files"
 msgstr0 "发现 %i 个已知共享文件"
 msgstr1 "发现 %i 个已知共享文件"
 
-#: src/SharedFileList.cpp:410
+#: src/SharedFileList.cpp
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr0 "发现 %i 个已知共享的文件， %i 个未知"
-msgstr1 "发现 %i 个已知共享的文件， %i 个未知"
+msgid "Excluded %i file from sharing by filter"
+msgid_plural "Excluded %i files from sharing by filter"
+msgstr0 "筛选器排除了 %i 个文件的共享"
+msgstr1 "筛选器排除了 %i 个文件的共享"
 
-#: src/SharedFileList.cpp:419
+#: src/SharedFileList.cpp
 #, c-format
 msgid "ERROR: Attempted to share %s"
 msgstr "错误：尝试共享%s"
 
-#: src/SharedFileList.cpp:444
+#: src/SharedFileList.cpp
 #, c-format
 msgid "Shared directory not found, skipping: %s"
 msgstr "找不到共享目录，跳过：%s"
 
-#: src/SharedFileList.cpp:486
+#: src/SharedFileList.cpp
 #, c-format
-msgid "No shareable files found in directory: %s"
-msgstr "在目录中没有找到可以共享的文件：%s"
+msgid "Shared directory not readable, skipping: %s"
+msgstr "无法读取共享目录，跳过：%s"
 
-#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
-msgid "User Name"
-msgstr "用户名"
+#: src/SharedFileList.cpp
+msgid "Media metadata extraction is disabled in preferences, so there is nothing to re-extract."
+msgstr "首选项中禁用了媒体元数据提取，因此没有要重新提取的信息。"
 
-#: src/SharedFilePeersListCtrl.cpp:30
-msgid "Download Speed"
-msgstr "下载速度"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Re-extracting media metadata for %u shared file"
+msgid_plural "Re-extracting media metadata for %u shared files"
+msgstr0 "重新提取 %u 个共享文件的媒体元数据"
+msgstr1 "重新提取 %u 个共享文件的媒体元数据"
 
-#: src/SharedFilePeersListCtrl.cpp:32
-msgid "Upload Speed"
-msgstr "上传速度"
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing file: %s"
+msgstr "正在分享文件：%s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing removed file: %s"
+msgstr "已停止分享已删除的文件：%s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Stopped sharing %u file under removed directory: %s"
+msgid_plural "Stopped sharing %u files under removed directory: %s"
+msgstr0 "已停止分享已删除目录下的 %u 个文件：%s"
+msgstr1 "已停止分享已删除目录下的 %u 个文件：%s"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Now sharing %u file found in a new shared directory"
+msgid_plural "Now sharing %u files found in new shared directories"
+msgstr0 "正分享在新共享目录中发现的 %u 个文件"
+msgstr1 "正分享在新共享目录中发现的 %u 个文件"
+
+#: src/SharedFileList.cpp
+#, c-format
+msgid "Discovered %u new shared file"
+msgid_plural "Discovered %u new shared files"
+msgstr0 "发现了 %u 个新的共享文件"
+msgstr1 "发现了 %u 个新的共享文件"
+
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
+msgid "User Name"
+msgstr "用户名"
 
-#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
-msgid "Available Parts"
-msgstr "可用分块"
+#: src/SharedFilePeersListCtrl.cpp
+msgid "Parts on Peer"
+msgstr "对等方拥有的部分"
 
-#: src/SharedFilePeersListCtrl.cpp:35
+#: src/SharedFilePeersListCtrl.cpp
 msgid "Upload Status"
 msgstr "上传状态"
 
-#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Download Status"
 msgstr "下载状态"
 
-#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
-msgid "Origin"
-msgstr "来源"
-
-#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Local File Name"
 msgstr "本地文件名"
 
-#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#: src/SharedFilePeersListCtrl.cpp src/SourceListCtrl.cpp
 msgid "Shares File List"
 msgstr "共享文件列表"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Requests"
-msgstr "请求"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Accepted Requests"
-msgstr "接受的请求"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Transferred Data"
-msgstr "已传送数据"
-
-#: src/SharedFilesCtrl.cpp:111
-msgid "Share Ratio"
-msgstr "共享比率"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Obtained Parts"
-msgstr "已获取的部分"
+#: src/SharedFilesCtrl.cpp
+msgid "Source Availability"
+msgstr "来源可用性"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Complete Sources"
-msgstr "完成的源"
-
-#: src/SharedFilesCtrl.cpp:114
+#: src/SharedFilesCtrl.cpp
 msgid "Directory Path"
 msgstr "所在目录"
 
-#: src/SharedFilesCtrl.cpp:151
+#: src/SharedFilesCtrl.cpp src/Statistics.cpp
+msgid "Shared Files"
+msgstr "共享文件"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add Comment/Rating"
 msgstr "添加评论/评价"
 
-#: src/SharedFilesCtrl.cpp:153
+#: src/SharedFilesCtrl.cpp
 msgid "Edit Comment/Rating"
 msgstr "编辑评论/评价"
 
-#: src/SharedFilesCtrl.cpp:157
+#: src/SharedFilesCtrl.cpp
 msgid "Rename"
 msgstr "重命名"
 
-#: src/SharedFilesCtrl.cpp:161
+#: src/SharedFilesCtrl.cpp
+msgid "Verify Local Data"
+msgstr "验证本地数据"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract &media metadata"
+msgstr "重新提取媒体元数据(&M)"
+
+#: src/SharedFilesCtrl.cpp
 msgid "Add files in collection to transfer list"
 msgstr "添加收藏中的文件至传输列表"
 
-#: src/SharedFilesCtrl.cpp:164
+#: src/SharedFilesCtrl.cpp
 msgid "Copy magnet &URI to clipboard"
 msgstr "复制magnet地址到剪贴板（&U）"
 
-#: src/SharedFilesCtrl.cpp:166
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Source)"
 msgstr "复制 eD2k 链接到剪贴板 (含源) (&S)"
 
-#: src/SharedFilesCtrl.cpp:167
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr "复制 eD2k 链接到剪贴板 (含源) (包括加密选项) (&W)"
 
-#: src/SharedFilesCtrl.cpp:168
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr "复制 eD2k 链接到剪贴板 (含主机名) (&H)"
 
-#: src/SharedFilesCtrl.cpp:169
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr "复制 eD2k 链接到剪贴板 (含主机名) (包括加密选项) (&C)"
 
-#: src/SharedFilesCtrl.cpp:170
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr "复制 eD2k 链接到剪贴板 (含 &AICH 信息)"
 
-#: src/SharedFilesCtrl.cpp:171
+#: src/SharedFilesCtrl.cpp
 msgid "Copy eD2k link to clipboard (&AICH info + Source)"
 msgstr "复制 eD2k 链接到剪贴板 (含 &AICH 信息、源)"
 
-#: src/SharedFilesCtrl.cpp:319
+#: src/SharedFilesCtrl.cpp
+msgid "Export selected files to an emulecollection"
+msgstr "导出所选文件到 emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Verify Local Data on PartFile is currently not supported: %s"
+msgstr "目前不支持验证 Part 文件的本地数据：%s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u incomplete download"
+msgid_plural "Media metadata: skipping %u incomplete downloads"
+msgstr0 "媒体元数据：跳过 %u 个不完整的下载"
+msgstr1 "媒体元数据：跳过 %u 个不完整的下载"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Media metadata: skipping %u file that is not audio or video"
+msgid_plural "Media metadata: skipping %u files that are not audio or video"
+msgstr0 "媒体元数据：跳过 %u 个非音频或视频文件"
+msgstr1 "媒体元数据：跳过 %u 个非音频或视频文件"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Re-extract media metadata for %u file?"
+msgid_plural "Re-extract media metadata for %u files?"
+msgstr0 "重新提取 %u 个文件的媒体元数据？"
+msgstr1 "重新提取 %u 个文件的媒体元数据？"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u incomplete download will be skipped."
+msgid_plural "%u incomplete downloads will be skipped."
+msgstr0 "将跳过 %u 个不完整的下载。"
+msgstr1 "将跳过 %u 个不完整的下载。"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "%u file is not audio or video and will be skipped."
+msgid_plural "%u files are not audio or video and will be skipped."
+msgstr0 "%u 个文件不是音频或视频，将被跳过。"
+msgstr1 "%u 个文件不是音频或视频，将被跳过。"
+
+#: src/SharedFilesCtrl.cpp
+msgid "This runs in the background. Progress is reported in the log."
+msgstr "这在后台运行。会在日志中报告进度。"
+
+#: src/SharedFilesCtrl.cpp
+msgid "Re-extract media metadata"
+msgstr "重新提取媒体元数据"
+
+#: src/SharedFilesCtrl.cpp
 msgid "You need a HighID to create a valid sourcelink"
 msgstr "你需要高ID来产生源链接"
 
-#: src/SharedFilesCtrl.cpp:493
+#: src/SharedFilesCtrl.cpp
+msgid "Export to emulecollection"
+msgstr "导出到 emulecollection"
+
+#: src/SharedFilesCtrl.cpp
+msgid "No files are selected to export."
+msgstr "未选中要导出的文件。"
+
+#: src/SharedFilesCtrl.cpp
+msgid "eMule collections (*.emulecollection)"
+msgstr "eMule 集合 (*.emulecollection)"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "'%s' already exists. Overwrite it?"
+msgstr "'%s' 已存在。要覆盖它吗?"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Failed to write the collection file '%s'."
+msgstr "写入链接集文件 '%s' 失败。"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Exported %u shared file to '%s'."
+msgid_plural "Exported %u shared files to '%s'."
+msgstr0 "导出了 %u 个共享文件到 '%s'。"
+msgstr1 "导出了 %u 个共享文件到 '%s'。"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Total size of Shared Files: %s (%s completed)"
+msgstr "共享文件大小总和：%s（%s 已完成）"
+
+#: src/SharedFilesCtrl.cpp src/SharedFilesWnd.cpp src/Statistics.cpp
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "共享文件大小总和：%s"
+
+#: src/SharedFilesCtrl.cpp
+#, c-format
+msgid "Shared Files (%i, hashing %u more)"
+msgid_plural "Shared Files (%i, hashing %u more)"
+msgstr0 "共享的文件 (%i，正在计算另外 %u 个文件的哈希值）"
+msgstr1 "共享的文件 (%i，正在计算另外 %u 个文件的哈希值）"
+
+#: src/SharedFilesCtrl.cpp
 #, c-format
 msgid "Shared Files (%i)"
 msgstr "共享文件 (%i)"
 
-#: src/SharedFilesCtrl.cpp:630 src/TextClient.cpp:925
-msgid "PartFile"
-msgstr "part 文件"
+#: src/SharedFilesReloadProgress.cpp
+#, c-format
+msgid "Reloading shared files: %u files scanned"
+msgstr "正重新加载共享文件：扫描了 %u 个文件"
+
+#: src/SourceListCtrl.cpp
+msgid "Part Status"
+msgstr "Part 状态"
 
-#: src/SourceListCtrl.cpp:37
+#: src/SourceListCtrl.cpp
 msgid "Remote File Name"
 msgstr "远程文件名"
 
-#: src/Statistics.cpp:797
+#: src/SourceListCtrl.cpp
+msgid "A4AF"
+msgstr "A4AF"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Uploaded Data (Session (Total)): %s"
 msgstr "本次上传 (全部): %s"
 
-#: src/Statistics.cpp:799 src/Statistics.cpp:820
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Overhead (Packets): %s"
 msgstr "总开销 (数据包): %s"
 
-#: src/Statistics.cpp:800 src/Statistics.cpp:821
+#: src/Statistics.cpp
 #, c-format
 msgid "File Request Overhead (Packets): %s"
 msgstr "文件请求开销 (数据包): %s"
 
-#: src/Statistics.cpp:802 src/Statistics.cpp:823
+#: src/Statistics.cpp
 #, c-format
 msgid "Source Exchange Overhead (Packets): %s"
 msgstr "源交换开销 (数据包): %s"
 
-#: src/Statistics.cpp:804 src/Statistics.cpp:825
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Overhead (Packets): %s"
 msgstr "服务器开销 (数据包): %s"
 
-#: src/Statistics.cpp:806 src/Statistics.cpp:827
+#: src/Statistics.cpp
 #, c-format
 msgid "Kad Overhead (Packets): %s"
 msgstr "Kad 开销 (数据包): %s"
 
-#: src/Statistics.cpp:808 src/Statistics.cpp:829
+#: src/Statistics.cpp
 #, c-format
 msgid "Crypt overhead (UDP): %s"
 msgstr "加密开销 (UDP): %s"
 
-#: src/Statistics.cpp:810
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Uploads: %s"
 msgstr "活动上传: %s"
 
-#: src/Statistics.cpp:811
+#: src/Statistics.cpp
 #, c-format
 msgid "Waiting Uploads: %s"
 msgstr "等待上传: %s"
 
-#: src/Statistics.cpp:812
+#: src/Statistics.cpp
 #, c-format
 msgid "Total successful upload sessions: %s"
 msgstr "成功上传会话总数: %s"
 
-#: src/Statistics.cpp:813
+#: src/Statistics.cpp
 #, c-format
 msgid "Total failed upload sessions: %s"
 msgstr "失败上传会话总数: %s"
 
-#: src/Statistics.cpp:815
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload time: %s"
 msgstr "平均上传时间: %s"
 
-#: src/Statistics.cpp:818
+#: src/Statistics.cpp
 #, c-format
 msgid "Downloaded Data (Session (Total)): %s"
 msgstr "本次下载 (总共): %s"
 
-#: src/Statistics.cpp:831
+#: src/Statistics.cpp
 #, c-format
 msgid "Found Sources: %s"
 msgstr "发现的源: %s"
 
-#: src/Statistics.cpp:832
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Downloads (chunks): %s"
 msgstr "活动下载 (块数): %s"
 
-#: src/Statistics.cpp:834
+#: src/Statistics.cpp
 #, c-format
 msgid "Session UL:DL Ratio (Total): %s"
 msgstr "本次上传/下载比率: %s"
 
-#: src/Statistics.cpp:837
+#: src/Statistics.cpp
 #, c-format
 msgid "Average download rate (Session): %s"
 msgstr "平均下载速度 (本次运行): %s"
 
-#: src/Statistics.cpp:838
+#: src/Statistics.cpp
 #, c-format
 msgid "Average upload rate (Session): %s"
 msgstr "平均上传速度 (本次运行): %s"
 
-#: src/Statistics.cpp:839
+#: src/Statistics.cpp
 #, c-format
 msgid "Max download rate (Session): %s"
 msgstr "最大下载速度 (本次运行): %s"
 
-#: src/Statistics.cpp:840
+#: src/Statistics.cpp
 #, c-format
 msgid "Max upload rate (Session): %s"
 msgstr "最大上传速度 (本次运行): %s"
 
-#: src/Statistics.cpp:841
+#: src/Statistics.cpp
 #, c-format
 msgid "Reconnects: %i"
 msgstr "重新连接: %i"
 
-#: src/Statistics.cpp:842
+#: src/Statistics.cpp
 #, c-format
 msgid "Time Since First Transfer: %s"
 msgstr "首次传输到现在时间: %s"
 
-#: src/Statistics.cpp:843
+#: src/Statistics.cpp
 #, c-format
 msgid "Connected To Server Since: %s"
 msgstr "与服务器连接时间: %s"
 
-#: src/Statistics.cpp:844
+#: src/Statistics.cpp
 #, c-format
 msgid "Active Connections (estimate): %i"
 msgstr "活跃连接 (估计值): %i"
 
-#: src/Statistics.cpp:845
+#: src/Statistics.cpp
 #, c-format
 msgid "Max Connection Limit Reached: %s"
 msgstr "达到最大连接数: %s"
 
-#: src/Statistics.cpp:846
+#: src/Statistics.cpp
 #, c-format
 msgid "Average Connections (estimate): %g"
 msgstr "平均连接数 (估计): %g"
 
-#: src/Statistics.cpp:848
+#: src/Statistics.cpp
 #, c-format
 msgid "Peak Connections (estimate): %i"
 msgstr "最高连接（估计值）： %i"
 
-#: src/Statistics.cpp:850
-msgid "Clients"
-msgstr "用户"
-
-#: src/Statistics.cpp:851
+#: src/Statistics.cpp
 #, c-format
 msgid "Unknown: %s"
 msgstr "未知大小: %s"
 
-#: src/Statistics.cpp:857
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered: %s"
 msgstr "过滤: %s"
 
-#: src/Statistics.cpp:858
+#: src/Statistics.cpp
 #, c-format
 msgid "Banned: %s"
 msgstr "封杀: %s"
 
-#: src/Statistics.cpp:859
+#: src/Statistics.cpp
+#, c-format
+msgid "Kad banned addresses: %s"
+msgstr "Kad 封禁地址：%s"
+
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %i Known: %i"
 msgstr "总数：%i　已知：%i"
 
-#: src/Statistics.cpp:863
+#: src/Statistics.cpp
 #, c-format
 msgid "Working Servers: %i"
 msgstr "有效服务器：%i"
 
-#: src/Statistics.cpp:864
+#: src/Statistics.cpp
 #, c-format
 msgid "Failed Servers: %i"
 msgstr "无效服务器：%i"
 
-#: src/Statistics.cpp:865
+#: src/Statistics.cpp
 #, c-format
 msgid "Total: %s"
 msgstr "总共：%s"
 
-#: src/Statistics.cpp:866
+#: src/Statistics.cpp
 #, c-format
 msgid "Deleted Servers: %s"
 msgstr "已删除服务器：%s"
 
-#: src/Statistics.cpp:867
+#: src/Statistics.cpp
 #, c-format
 msgid "Filtered Servers: %s"
 msgstr "被过滤的服务器：%s"
 
-#: src/Statistics.cpp:868
+#: src/Statistics.cpp
 #, c-format
 msgid "Users on Working Servers: %llu"
 msgstr "有效服务器中的用户数： %llu"
 
-#: src/Statistics.cpp:869
+#: src/Statistics.cpp
 #, c-format
 msgid "Files on Working Servers: %llu"
 msgstr "有效服务器中的文件数： %llu"
 
-#: src/Statistics.cpp:870
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Users: %llu"
 msgstr "用户总数：%llu"
 
-#: src/Statistics.cpp:871
+#: src/Statistics.cpp
 #, c-format
 msgid "Total Files: %llu"
 msgstr "文件总数：%llu"
 
-#: src/Statistics.cpp:872
+#: src/Statistics.cpp
 #, c-format
 msgid "Server Occupation: %.2f%%"
 msgstr "服务器开销：%.2f%%"
 
-#: src/Statistics.cpp:876
+#: src/Statistics.cpp
 #, c-format
 msgid "Number of Shared Files: %s"
 msgstr "共享文件数：%s"
 
-#: src/Statistics.cpp:877
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "共享文件大小总和：%s"
-
-#: src/Statistics.cpp:879
+#: src/Statistics.cpp
 #, c-format
 msgid "Average file size: %s"
 msgstr "平均文件大小：%s"
 
-#: src/Statistics.cpp:1020
+#: src/Statistics.cpp
 msgid "Operating System"
 msgstr "操作系统"
 
-#: src/Statistics.cpp:1045
+#: src/Statistics.cpp
 msgid "Not Received"
 msgstr "没有收到"
 
-#: src/StatisticsDlg.cpp:189
+#: src/StatisticsDlg.cpp
 #, c-format
 msgid "Active connections (1:%u)"
 msgstr "活跃连接 (1:%u)"
 
-#: src/StatTree.cpp:551
+#: src/StatTree.cpp
 msgid "Not available"
 msgstr "不可用"
 
-#: src/StatTree.cpp:612 src/StatTree.cpp:623
+#: src/StatTree.cpp
 msgid "Never"
 msgstr "从来没有"
 
-#: src/TerminationProcess.cpp:47
+#: src/TerminationProcess.cpp
 #, c-format
 msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr "命令“%s”，pid “%d”已完成，状态代码为“%d”。"
 
-#: src/TextClient.cpp:207
+#: src/TextClient.cpp
 msgid "Execute <str> and exit."
 msgstr "执行 <str> 然后退出。"
 
-#: src/TextClient.cpp:282
+#: src/TextClient.cpp
+msgid "Separate list fields with spaces, as before, instead of tabs."
+msgstr "和前面一样，用空格键而非 tab 键分开列表字段。"
+
+#: src/TextClient.cpp
 msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr "无效 IP 地址格式，请使用 xxx.xxx.xxx.xxx:xxxx\n"
 
-#: src/TextClient.cpp:399
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: 'all', filename, or a number.\n"
 msgstr "此命令需要一个参数，合法参数为 'all'、文件名或一个数字。\n"
 
-#: src/TextClient.cpp:435
+#: src/TextClient.cpp
 msgid "Processing by hash: "
 msgstr "正在用此哈希值处理: "
 
-#: src/TextClient.cpp:449
+#: src/TextClient.cpp
 msgid "Processing by filename: "
 msgstr "正在用此文件名处理: "
 
-#: src/TextClient.cpp:471
+#: src/TextClient.cpp
 msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr "此命令需要一个参数，合法参数为文件校验码。\n"
 
-#: src/TextClient.cpp:497
+#: src/TextClient.cpp
 msgid "Not a valid number\n"
 msgstr "非有效数字\n"
 
-#: src/TextClient.cpp:501
+#: src/TextClient.cpp
 msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr "无效的校验值（长度必须为32个字符）\n"
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:613
+#: src/TextClient.cpp
 msgid ""
 "Invalid search filter syntax.\n"
 "Type 'help search' to get more help.\n"
@@ -6473,7 +7906,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:619
+#: src/TextClient.cpp
 msgid ""
 "No search keyword provided.\n"
 "Type 'help search' to get more help.\n"
@@ -6483,7 +7916,7 @@
 
 #. TRANSLATORS:
 #. 'help search' is a command to the program, do not translate it.
-#: src/TextClient.cpp:631
+#: src/TextClient.cpp
 msgid ""
 "No search type defined.\n"
 "Type 'help search' to get more help.\n"
@@ -6491,76 +7924,80 @@
 "未定义搜索类型。\n"
 "输入“help search”以获得更多帮助。\n"
 
-#: src/TextClient.cpp:650
+#: src/TextClient.cpp
 #, c-format
 msgid "Download File: %lu %s\n"
 msgstr "下载文件：%lu %s\n"
 
-#: src/TextClient.cpp:742 src/webserver/src/WebServer.cpp:364
+#: src/TextClient.cpp src/webserver/src/WebServer.cpp
 msgid "Request failed with an unknown error."
 msgstr "请求失败，错误未知。"
 
-#: src/TextClient.cpp:746
+#: src/TextClient.cpp
 msgid "Operation was successful."
 msgstr "操作成功。"
 
-#: src/TextClient.cpp:752
+#: src/TextClient.cpp
 #, c-format
 msgid "Request failed with the following error: %s"
 msgstr "请求失败，错误为：%s"
 
-#: src/TextClient.cpp:766
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for clients is %s.\n"
 msgstr "用户的IP过滤器是：%s。\n"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "OFF"
 msgstr "关"
 
-#: src/TextClient.cpp:767 src/TextClient.cpp:773
+#: src/TextClient.cpp
 msgid "ON"
 msgstr "开"
 
-#: src/TextClient.cpp:772
+#: src/TextClient.cpp
 #, c-format
 msgid "IP filtering for servers is %s.\n"
 msgstr "服务器的IP过滤器是%s。\n"
 
-#: src/TextClient.cpp:777
+#: src/TextClient.cpp
 #, c-format
 msgid "Current IPFilter Level is %d.\n"
 msgstr "当前IP过滤级别时 %d.\n"
 
-#: src/TextClient.cpp:784
+#: src/TextClient.cpp
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "带宽限制：上传：%u kB/s，下载：%u kB/s。\n"
+msgid "Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n"
+msgstr "带宽限制：上传：%u KiB/s，限制：%u KiB/s\n"
 
-#: src/TextClient.cpp:798
-msgid "eD2k"
-msgstr "eD2k"
+#: src/TextClient.cpp
+#, c-format
+msgid "Endgame source rotation is %s.\n"
+msgstr "Endgame 源轮替状态为 %s。\n"
 
-#: src/TextClient.cpp:803
+#: src/TextClient.cpp
+#, c-format
+msgid "Search started (id %u).\n"
+msgstr "已启动搜索（id %u）。\n"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Connected to %s %s %s"
 msgstr "已连接到 %s %s %s"
 
-#: src/TextClient.cpp:809
+#: src/TextClient.cpp
 msgid "Now connecting"
 msgstr "正在连接"
 
-#: src/TextClient.cpp:818 src/utils/wxCas/src/wxcasframe.cpp:1051
-#: src/utils/wxCas/src/wxcasframe.cpp:1073
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "firewalled"
 msgstr "被防火墙阻挡"
 
-#: src/TextClient.cpp:820 src/utils/wxCas/src/wxcasframe.cpp:1049
-#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#: src/TextClient.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "ok"
 msgstr "确定"
 
-#: src/TextClient.cpp:833
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6569,7 +8006,7 @@
 "\n"
 "下载：\t%s"
 
-#: src/TextClient.cpp:836
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6578,7 +8015,7 @@
 "\n"
 "上传：\t%s"
 
-#: src/TextClient.cpp:839
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6587,7 +8024,7 @@
 "\n"
 "队列长度：\t%d\n"
 
-#: src/TextClient.cpp:842
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "\n"
@@ -6596,38 +8033,33 @@
 "\n"
 "源总数：\t%d\n"
 
-#: src/TextClient.cpp:951
+#: src/TextClient.cpp
+msgid "PartFile"
+msgstr "part 文件"
+
+#: src/TextClient.cpp
 #, c-format
 msgid "Number of search results: %i\n"
 msgstr "搜索结果数量：%i\n"
 
-#: src/TextClient.cpp:965
-#, c-format
-msgid "Search progress: %u %% \n"
-msgstr "搜索进度: %u %% \n"
-
-#: src/TextClient.cpp:967
-msgid "Search progress not available"
-msgstr "搜索进度不可用"
-
-#: src/TextClient.cpp:972
+#: src/TextClient.cpp
 #, c-format
 msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr "从服务器收到未知的回复，操作码是 %#x."
 
-#: src/TextClient.cpp:985
+#: src/TextClient.cpp
 msgid "Show short status information."
 msgstr "显示简短的状态信息。"
 
-#: src/TextClient.cpp:986
+#: src/TextClient.cpp
 msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr "显示连接状态，当前上传下载速度等等。\n"
 
-#: src/TextClient.cpp:988
+#: src/TextClient.cpp
 msgid "Show full statistics tree."
 msgstr "显示全部统计树。"
 
-#: src/TextClient.cpp:989
+#: src/TextClient.cpp
 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"
@@ -6641,11 +8073,11 @@
 "\n"
 "比如：“statistics 5” 只显示每个客户端类型的前 5 大版本。\n"
 
-#: src/TextClient.cpp:991
+#: src/TextClient.cpp
 msgid "Shut down aMule."
 msgstr "关闭 aMule。"
 
-#: src/TextClient.cpp:992
+#: src/TextClient.cpp
 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"
@@ -6654,75 +8086,75 @@
 "关闭远程运行的服务程序（amule/amuled）,\n"
 "当远程服务程序不可用时，文本客户端也将关闭。\n"
 
-#: src/TextClient.cpp:994
+#: src/TextClient.cpp
 msgid "Reload the given object."
 msgstr "重新载入所给的对象。"
 
-#: src/TextClient.cpp:995
+#: src/TextClient.cpp
 msgid "Reload shared files list."
 msgstr "重新载入共享文件列表。"
 
-#: src/TextClient.cpp:997
+#: src/TextClient.cpp
 msgid "Reload IP filtering table."
 msgstr "重新载入IP过滤表。"
 
-#: src/TextClient.cpp:998
+#: src/TextClient.cpp
 msgid "Reload current IP filtering table."
 msgstr "重新载入当前IP过滤表。"
 
-#: src/TextClient.cpp:999
+#: src/TextClient.cpp
 msgid "Update IP filtering table from URL."
 msgstr "从URL更新IP过滤表。"
 
-#: src/TextClient.cpp:1000
+#: src/TextClient.cpp
 msgid "If URL is omitted the URL from the preferences is used."
 msgstr "如果URL省略了则将使用设置的URL。"
 
-#: src/TextClient.cpp:1002
+#: src/TextClient.cpp
 msgid "Connect to the network."
 msgstr "连接至网络。"
 
-#: src/TextClient.cpp:1003
+#: src/TextClient.cpp
 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:端口）定义一个服务器地址，并只连接至此服务器。\n"
 "此IP必须是用点分隔的十进制IPv4地址，\n"
 "或者是可以解析的DNS名称。"
 
-#: src/TextClient.cpp:1004
+#: src/TextClient.cpp
 msgid "Connect to eD2k only."
 msgstr "只连接eD2k。"
 
-#: src/TextClient.cpp:1005
+#: src/TextClient.cpp
 msgid "Connect to Kad only."
 msgstr "只连接Kad。"
 
-#: src/TextClient.cpp:1007
+#: src/TextClient.cpp
 msgid "Disconnect from the network."
 msgstr "断开网络。"
 
-#: src/TextClient.cpp:1008
+#: src/TextClient.cpp
 msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr "这将断开当前已连接的全部网络。\n"
 
-#: src/TextClient.cpp:1009
+#: src/TextClient.cpp
 msgid "Disconnect from eD2k only."
 msgstr "只断开eD2k。"
 
-#: src/TextClient.cpp:1010
+#: src/TextClient.cpp
 msgid "Disconnect from Kad only."
 msgstr "只断开 Kad 连接。"
 
-#: src/TextClient.cpp:1012
+#: src/TextClient.cpp
 msgid "Add an eD2k or magnet link to core."
 msgstr "添加一个eD2k或magnet链接到核心。"
 
-#: src/TextClient.cpp:1013
+#: src/TextClient.cpp
 msgid ""
 "The eD2k link to be added can be:\n"
 "*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
@@ -6740,51 +8172,51 @@
 "magnet链接必须包含eD2k校验码和文件大小。\n"
 "\n"
 
-#: src/TextClient.cpp:1015
+#: src/TextClient.cpp
 msgid "Set a preference value."
 msgstr "设置一个参数值。"
 
-#: src/TextClient.cpp:1018
+#: src/TextClient.cpp
 msgid "Set IP filtering preferences."
 msgstr "设置IP过滤参数。"
 
-#: src/TextClient.cpp:1019
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for both clients and servers."
 msgstr "开启用户和服务器的 IP 过滤。"
 
-#: src/TextClient.cpp:1020
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for both clients and servers."
 msgstr "关闭用户和服务器的 IP 过滤。"
 
-#: src/TextClient.cpp:1021
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for clients."
 msgstr "启动/禁用用户 IP 过滤。"
 
-#: src/TextClient.cpp:1022
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for clients."
 msgstr "开启用户 IP 过滤。"
 
-#: src/TextClient.cpp:1023
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for clients."
 msgstr "关闭用户 IP 过滤。"
 
-#: src/TextClient.cpp:1024
+#: src/TextClient.cpp
 msgid "Enable/Disable IP filtering for servers."
 msgstr "启用/禁用服务器 IP 过滤。"
 
-#: src/TextClient.cpp:1025
+#: src/TextClient.cpp
 msgid "Turn IP filtering on for servers."
 msgstr "开启服务器 IP 过滤。"
 
-#: src/TextClient.cpp:1026
+#: src/TextClient.cpp
 msgid "Turn IP filtering off for servers."
 msgstr "关闭服务器 IP 过滤。"
 
-#: src/TextClient.cpp:1027
+#: src/TextClient.cpp
 msgid "Select IP filtering level."
 msgstr "选择 IP 过滤级别。"
 
-#: src/TextClient.cpp:1028
+#: src/TextClient.cpp
 msgid ""
 "Valid filtering levels are in the range 0-255, and it's default (initial)\n"
 "value is 127.\n"
@@ -6792,59 +8224,71 @@
 "正确的 IP 过滤级别是在0-255之间，\n"
 "默认（初始）值是127。\n"
 
-#: src/TextClient.cpp:1030
+#: src/TextClient.cpp
 msgid "Set bandwidth limits."
 msgstr "设置带宽限制。"
 
-#: src/TextClient.cpp:1031
+#: src/TextClient.cpp
 msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr "这些命令的值必须使用单位 KB/s。\n"
 
-#: src/TextClient.cpp:1032
+#: src/TextClient.cpp
 msgid "Set upload bandwidth limit."
 msgstr "设置上传带宽限制。"
 
-#: src/TextClient.cpp:1033 src/TextClient.cpp:1035
+#: src/TextClient.cpp
 msgid "The given value must be in kilobytes/sec.\n"
 msgstr "给出的值的单位必须为 KB/s。\n"
 
-#: src/TextClient.cpp:1034
+#: src/TextClient.cpp
 msgid "Set download bandwidth limit."
 msgstr "设置下载带宽限制。"
 
-#: src/TextClient.cpp:1037
+#: src/TextClient.cpp
+msgid "Enable or disable endgame source rotation."
+msgstr "启用/禁用 末端 源轮替。"
+
+#: src/TextClient.cpp
+msgid "The given value must be 1/ON (enable) or 0/OFF (disable).\n"
+msgstr "给出的值必须是 1/ON(启用)或 0/OFF(禁用)。\n"
+
+#: src/TextClient.cpp
 msgid "Get and display a preference value."
-msgstr "获取并显示设置值。"
+msgstr "获取并显示首选项值。"
 
-#: src/TextClient.cpp:1040
+#: src/TextClient.cpp
 msgid "Get IP filtering preferences."
-msgstr "获取 IP 过滤器设置。"
+msgstr "获取 IP 过滤器首选项。"
 
-#: src/TextClient.cpp:1041
+#: src/TextClient.cpp
 msgid "Get IP filtering state for both clients and servers."
 msgstr "获取用户和服务器的 IP 过滤器状态。"
 
-#: src/TextClient.cpp:1042
+#: src/TextClient.cpp
 msgid "Get IP filtering state for clients only."
 msgstr "只获取用户的 IP 过滤器状态。"
 
-#: src/TextClient.cpp:1043
+#: src/TextClient.cpp
 msgid "Get IP filtering state for servers only."
 msgstr "只获取服务器的 IP 过滤器状态。"
 
-#: src/TextClient.cpp:1044
+#: src/TextClient.cpp
 msgid "Get IP filtering level."
 msgstr "获取 IP 过滤级别。"
 
-#: src/TextClient.cpp:1046
+#: src/TextClient.cpp
 msgid "Get bandwidth limits."
 msgstr "获取带宽限制。"
 
-#: src/TextClient.cpp:1048
+#: src/TextClient.cpp
+msgid "Get endgame source rotation state."
+msgstr "获取 末端 源轮替状态。"
+
+#: src/TextClient.cpp
 msgid "Execute a search."
 msgstr "执行搜索。"
 
-#: src/TextClient.cpp:1050
+#: src/TextClient.cpp
 msgid ""
 "A search type has to be specified by giving the type:\n"
 "    GLOBAL\n"
@@ -6862,40 +8306,63 @@
 "Example: 'search global linux iso --type Iso --min-size 100M' returns\n"
 "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
 msgstr ""
+"必须通过赋予类型明确搜索类型：\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"示例：'search kad file' 会执行 kad \"file\" 搜索。\n"
+"\n"
+"可在搜索词前、后、中间添加筛选器\n"
+"（非必需)\n"
+"    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
+"    --extension <ext>      (alias: --ext)\n"
+"    --avail <N>            最少来源数\n"
+"    --min-size <NKMG>    最小文件大小； K=1024, M=K*1024, G=M*1024\n"
+"    --max-size <NKMG>    最大大小；相同后缀\n"
+"示例：'search global linux iso --type Iso --min-size 100M' 返回\n"
+"至少100 MiB 大小文件类型为 lso 的 \"linux iso\"。\n"
 
-#: src/TextClient.cpp:1066
+#: src/TextClient.cpp
 msgid "Execute a global search."
-msgstr "执行全面搜索。"
+msgstr "执行全局搜索。"
 
-#: src/TextClient.cpp:1067
+#: src/TextClient.cpp
 msgid "Execute a local search"
 msgstr "执行本地搜索"
 
-#: src/TextClient.cpp:1068
+#: src/TextClient.cpp
 msgid "Execute a kad search"
 msgstr "执行 Kad 搜索"
 
-#: src/TextClient.cpp:1070
-msgid "Show the results of the last search."
-msgstr "显示上次搜索的结果。"
-
-#: src/TextClient.cpp:1071
-msgid "Return the results of the previous search.\n"
-msgstr "返回以前搜索的结果。\n"
+#: src/TextClient.cpp
+msgid "Show the results of a search."
+msgstr "显示搜索结果。"
+
+#: src/TextClient.cpp
+msgid ""
+"Return the results of a search.\n"
+"Optionally takes a search id (from 'search ...'); with no id, returns the results of the most recently started search.\n"
+msgstr ""
+"返回搜索结果。\n"
+"可使用搜索 ID（从“搜索 ...”）；若没有 ID，返回最近启动的搜索的结果。\n"
 
-#: src/TextClient.cpp:1073
+#: src/TextClient.cpp
 msgid "Show the progress of a search."
 msgstr "显示搜索进度。"
 
-#: src/TextClient.cpp:1074
-msgid "Show the progress of a search.\n"
-msgstr "显示搜索进度。\n"
+#: src/TextClient.cpp
+msgid ""
+"Show the progress of a search.\n"
+"Optionally takes a search id; with no id, shows the progress of the most recently started search.\n"
+msgstr ""
+"显示搜索进度。\n"
+"可使用搜索 id; 如不使用 id 则显示最近启动的搜索的进度。\n"
 
-#: src/TextClient.cpp:1076
+#: src/TextClient.cpp
 msgid "Start downloading a file"
 msgstr "开始下载文件"
 
-#: src/TextClient.cpp:1077
+#: src/TextClient.cpp
 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"
@@ -6903,335 +8370,358 @@
 "必须指定上次搜索的文件数量。\n"
 "示例：'download 12' 将开始下载上次搜索结果中的12个文件。\n"
 
-#: src/TextClient.cpp:1084
+#: src/TextClient.cpp
 msgid "Pause download."
 msgstr "停止下载。"
 
-#: src/TextClient.cpp:1087
+#: src/TextClient.cpp
 msgid "Resume download."
 msgstr "继续下载。"
 
-#: src/TextClient.cpp:1090
+#: src/TextClient.cpp
 msgid "Cancel download."
 msgstr "取消下载。"
 
-#: src/TextClient.cpp:1093
+#: src/TextClient.cpp
 msgid "Set download priority."
 msgstr "设置下载优先级。"
 
-#: src/TextClient.cpp:1094
+#: src/TextClient.cpp
 msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr "设置下载的优先级为低、正常、高或自动。\n"
 
-#: src/TextClient.cpp:1095
+#: src/TextClient.cpp
 msgid "Set priority to low."
 msgstr "设为低优先级。"
 
-#: src/TextClient.cpp:1096
+#: src/TextClient.cpp
 msgid "Set priority to normal."
 msgstr "设为正常优先级。"
 
-#: src/TextClient.cpp:1097
+#: src/TextClient.cpp
 msgid "Set priority to high."
 msgstr "设为高优先级。"
 
-#: src/TextClient.cpp:1098
+#: src/TextClient.cpp
 msgid "Set priority to auto."
 msgstr "设为自动优先级。"
 
-#: src/TextClient.cpp:1100
+#: src/TextClient.cpp
 msgid "Show queues/lists."
 msgstr "显示队列/列表。"
 
-#: src/TextClient.cpp:1101
+#: src/TextClient.cpp
 msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr "显示上传/下载队列，服务器列表或共享文件列表。\n"
 
-#: src/TextClient.cpp:1102
+#: src/TextClient.cpp
 msgid "Show upload queue."
 msgstr "显示上传队列。"
 
-#: src/TextClient.cpp:1103
+#: src/TextClient.cpp
 msgid "Show download queue."
 msgstr "显示下载队列。"
 
-#: src/TextClient.cpp:1104
+#: src/TextClient.cpp
 msgid "Show log."
 msgstr "显示日志。"
 
-#: src/TextClient.cpp:1105
+#: src/TextClient.cpp
 msgid "Show servers list."
 msgstr "显示服务器列表。"
 
-#: src/TextClient.cpp:1106
+#: src/TextClient.cpp
 msgid "Show shared files list."
 msgstr "显示共享文件列表。"
 
-#: src/TextClient.cpp:1108
+#: src/TextClient.cpp
 msgid "Reset log."
 msgstr "重设日志。"
 
-#: src/TextClient.cpp:1115
+#: src/TextClient.cpp
 #, c-format
 msgid "Deprecated command, use '%s' instead."
 msgstr "废弃的命令，请使用%s代替。"
 
-#: src/TextClient.cpp:1116
+#: src/TextClient.cpp
 #, c-format
 msgid ""
 "This is a deprecated command, and may be removed in the future.\n"
 "Use '%s' instead.\n"
 msgstr "这是一个已废弃的命令，将来可能被删除，请使用 '%s' 替代。\n"
 
-#: src/TextClient.h:63
+#: src/TextClient.h
 msgid "aMule text client"
 msgstr "aMule 文本客户端"
 
-#: src/ThreadTasks.cpp:484
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing downloaded file: %s"
+msgstr "正计算已下载文件哈希值: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Hashing file: %s"
+msgstr "正计算文件哈希: %s"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Rebuilding AICH hashset for file: %s"
+msgstr "正重建文件的 AICH 哈希集: %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr "正把 “%s” 中旧的 AICH 校验和集转换为 “%s” 中的 64b。"
 
-#: src/ThreadTasks.cpp:565
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): Result OK for %s"
+msgstr "验证本地数据（%s）：%s 的结果没问题"
+
+#: src/ThreadTasks.cpp
+#, c-format
+msgid "Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s"
+msgstr "验证本地数据（%s）：发现错误！%s 个失败的文件块：MD4: %s。%s %s"
+
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr "警告：文件名 '%s' 非法，已经重命名为 '%s'。"
 
-#: src/ThreadTasks.cpp:577
+#: src/ThreadTasks.cpp
 #, c-format
 msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr "警告：文件 '%s' 已经存在，新文件重命名为 '%s'。"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr "您确定要删除分类中的所有下载文件吗?"
 
-#: src/TransferWnd.cpp:209
+#: src/TransferWnd.cpp
 msgid "Confirmation Required"
 msgstr "需要确认"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Only 99 categories are supported."
 msgstr "仅支持 99 个分类。"
 
-#: src/TransferWnd.cpp:238
+#: src/TransferWnd.cpp
 msgid "Too many categories!"
 msgstr "分类过多！"
 
-#: src/TransferWnd.cpp:341
+#: src/TransferWnd.cpp
 msgid "All others"
 msgstr "所有其它"
 
-#: src/TransferWnd.cpp:363
+#: src/TransferWnd.cpp
 msgid "Select view filter"
 msgstr "选择显示过滤"
 
-#: src/TransferWnd.cpp:366
+#: src/TransferWnd.cpp
 msgid "Add category"
 msgstr "新建分类"
 
-#: src/TransferWnd.cpp:369
+#: src/TransferWnd.cpp
 msgid "Edit category"
 msgstr "编辑分类"
 
-#: src/TransferWnd.cpp:370
+#: src/TransferWnd.cpp
 msgid "Remove category"
 msgstr "删除分类"
 
-#: src/UploadClient.cpp:535
+#: src/UploadClient.cpp
 #, c-format
 msgid "Hashset requested for unknown file: %s"
 msgstr "请求未知文件校检码：%s"
 
-#: src/UploadQueue.cpp:618
+#: src/UploadDiskIOThread.cpp
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "打开文件 (%s) 失败，从共享文件列表中删除。"
+
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Resuming uploads of file: %s"
 msgstr "继续上传此文件: %s"
 
-#: src/UploadQueue.cpp:635
+#: src/UploadQueue.cpp
 #, c-format
 msgid "Suspending upload of file: %s"
 msgstr "暂停上传此文件: %s"
 
-#: src/UserEvents.cpp:154
+#: src/UserEvents.cpp
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "无法执行命令 `%s' 于 `%s' 事件。"
+msgid "Failed to execute command '%s' on '%s' event."
+msgstr "无法执行命令 '%s' 于 '%s' 事件。"
 
-#: src/UserEvents.h:60
+#: src/UserEvents.h
 msgid "Download completed"
 msgstr "下载已完成"
 
-#: src/UserEvents.h:63 src/UserEvents.h:97
+#: src/UserEvents.h
 msgid "The full path to the file."
 msgstr "文件的完整路径。"
 
-#: src/UserEvents.h:67
+#: src/UserEvents.h
 msgid "The name of the file without path component."
 msgstr "不包含路径部分的文件名。"
 
-#: src/UserEvents.h:71
+#: src/UserEvents.h
 msgid "The eD2k hash of the file."
 msgstr "文件的eD2k校验码。"
 
-#: src/UserEvents.h:75
+#: src/UserEvents.h
 msgid "The size of the file in bytes."
 msgstr "文件大小（字节）。"
 
-#: src/UserEvents.h:79
+#: src/UserEvents.h
 msgid "Cumulative download activity time."
 msgstr "累计下载活动时间。"
 
-#: src/UserEvents.h:82
+#: src/UserEvents.h
 msgid "New chat session started"
 msgstr "新的聊天对话已启动"
 
-#: src/UserEvents.h:85
+#: src/UserEvents.h
 msgid "Message sender."
 msgstr "消息发送者。"
 
-#: src/UserEvents.h:88
+#: src/UserEvents.h
 msgid "Out of space"
 msgstr "空间不足"
 
-#: src/UserEvents.h:91
+#: src/UserEvents.h
 msgid "Disk partition."
 msgstr "磁盘分区。"
 
-#: src/UserEvents.h:94
+#: src/UserEvents.h
 msgid "Error on completion"
 msgstr "最后阶段出错"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:59
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "Processing file number %u: %s"
 msgstr "正在处理文件号 %u: %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:63
+#: src/utils/aLinkCreator/src/alcc.cpp
 msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr "您要求了 part 文件哈希（只用于大于 9.5 MB 的文件）"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:80
+#: src/utils/aLinkCreator/src/alcc.cpp
 #, c-format
 msgid "%s ---> Non existent file !\n"
 msgstr "%s ---> 文件不存在！\n"
 
-#: src/utils/aLinkCreator/src/alc.cpp:49
+#: src/utils/aLinkCreator/src/alc.cpp
 msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr "aLinkCreator，aMule eD2k链接的创建程序"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:79
-#: src/utils/wxCas/src/wxcasframe.cpp:91
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/wxCas/src/wxcasframe.cpp
 msgid "Welcome!"
 msgstr "欢迎！"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:99
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Input parameters"
 msgstr "输入参数"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:110
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "File to Hash"
 msgstr "要计算哈希的文件"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:114
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Add Optional URLs for this file"
 msgstr "添加附加链接到该文件"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:122
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Enter here the file you want to compute the eD2k link"
 msgstr "在此处输入需要生成eD2k链接的文件名"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:128
+#: src/utils/aLinkCreator/src/alcframe.cpp
 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
-msgid "Remove"
-msgstr "删除"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:155
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Create link with part-hashes"
 msgstr "创建有文件块校检码的链接"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:161
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Help to spread new and rare files faster, at the cost of an increased link size"
 msgstr "该选项可以帮助新文件和稀有文件更快散播，只是链接长度会增加"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:187
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "MD4 File Hash"
 msgstr "MD4 文件哈希"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:199
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k File Hash"
 msgstr "eD2k 文件哈希"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:210
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "eD2k link"
 msgstr "eD2k 链接"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:225
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save"
 msgstr "保存"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:227
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy to clipboard"
 msgstr "复制到剪贴板"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:254
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open"
 msgstr "打开"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:255
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Open a file to compute its eD2k link"
 msgstr "打开一个文件并生成它的 eD2k 链接"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:258
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Copy computed eD2k link to clipboard"
 msgstr "将生成的 eD2k 链接复制到剪贴板"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save as"
 msgstr "另存为"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:261
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Save computed eD2k link to file"
 msgstr "保存已生成的eD2k链接至文件"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-#: src/utils/aLinkCreator/src/alcframe.cpp:461
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "About aLinkCreator"
 msgstr "关于 aLinkCreator"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:358
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file you want to compute the eD2k link"
 msgstr "选择要生成 eD2k 链接的文件"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:392
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Can't open the clipboard"
 msgstr "不能打开剪贴簿"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:401
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to copy for now !"
 msgstr "当前无内容需要复制！"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:428
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Select the file to your computed eD2k link"
 msgstr "选择已生成 eD2k 链接的文件"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:439
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Unable to open "
 msgstr "无法读取 "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:446
-#: src/utils/aLinkCreator/src/alcframe.cpp:571
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty file name"
 msgstr "请输入一个非空的文件名"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:451
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Nothing to save for now !"
 msgstr "暂时没有东西可保存！"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid ""
 "aLinkCreator, the aMule eD2k link creator\n"
 "\n"
@@ -7251,162 +8741,159 @@
 "\n"
 "基于 GPL 协议发布"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:501
-#: src/utils/aLinkCreator/src/alcframe.cpp:502
-#: src/utils/aLinkCreator/src/alcframe.cpp:508
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Hashing..."
 msgstr "正在生成哈希值..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "aLinkCreator is working for you"
 msgstr "aLinkCreator 正在为您工作"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:506
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing MD4 Hash..."
 msgstr "计算 MD4 哈希..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:521
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Computing eD2k Hashes..."
 msgstr "计算 eD2k 哈希..."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:556
-#: src/utils/aLinkCreator/src/alcframe.cpp:557
-#: src/utils/aLinkCreator/src/md4.cpp:351
+#: src/utils/aLinkCreator/src/alcframe.cpp src/utils/aLinkCreator/src/md4.cpp
 msgid "Cancelled !"
 msgstr "已取消！"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:565
+#: src/utils/aLinkCreator/src/alcframe.cpp
 #, c-format
 msgid "Done in %.2f s"
 msgstr "在 %.2f 秒内完成"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:603
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "You have already added this URL !"
 msgstr "您已添加了该链接！"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:608
+#: src/utils/aLinkCreator/src/alcframe.cpp
 msgid "Please, enter a non empty URL"
 msgstr "请输入一个非空的链接"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:58
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 #, c-format
 msgid "Unable to open %s"
 msgstr "无法打开 %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:153
+#: src/utils/aLinkCreator/src/ed2khash.cpp
 msgid "Out of memory while calculating ed2k hash!"
 msgstr "计算 ed2k 哈希时内存不足！"
 
-#: src/utils/wxCas/src/linuxmon.cpp:77
+#: src/utils/wxCas/src/linuxmon.cpp
 #, c-format
 msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr "%i 天 %i 小时 %i 分钟 %i 秒"
 
-#: src/utils/wxCas/src/onlinesig.cpp:221
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uD %02uh %02umin %02us"
 msgstr "%02u天 %02u小时 %02u分钟 %02u秒"
 
-#: src/utils/wxCas/src/onlinesig.cpp:223
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02uh %02umin %02us"
 msgstr "%02u小时 %02u分钟 %02u秒"
 
-#: src/utils/wxCas/src/onlinesig.cpp:225
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02umin %02us"
 msgstr "%02u分钟 %02u秒"
 
-#: src/utils/wxCas/src/onlinesig.cpp:227
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%02us"
 msgstr "%02u秒"
 
-#: src/utils/wxCas/src/onlinesig.cpp:326
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
 msgid "%.0f B"
 msgstr "%.0f B"
 
-#: src/utils/wxCas/src/onlinesig.cpp:329
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "%.2f KiB"
+msgstr "%.2f KiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:332
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "%.2f MiB"
+msgstr "%.2f MiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:335
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "%.2f GiB"
+msgstr "%.2f GiB"
 
-#: src/utils/wxCas/src/onlinesig.cpp:338
+#: src/utils/wxCas/src/onlinesig.cpp
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+msgid "%.2f TiB"
+msgstr "%.2f TiB"
 
-#: src/utils/wxCas/src/wxcas.cpp:78
+#: src/utils/wxCas/src/wxcas.cpp
 msgid "wxCas, aMule Online Statistics"
 msgstr "wxCas，aMule在线统计"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:115
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Maximum DL rate since wxCas is running"
 msgstr "本次运行最高下载速度"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:119
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr "历史最高下载速度"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:142
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid "Reset"
+msgstr "重置"
+
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System"
 msgstr "系统"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:206
-#: src/utils/wxCas/src/wxcasframe.cpp:335
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Stop Auto Refresh"
 msgstr "停止自动刷新"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Online Statistics image"
 msgstr "保存在线统计图"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:214
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Print Online Statistics image"
 msgstr "打印在线统计图"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:217
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Preferences setting"
-msgstr "设置"
+msgstr "首选项设置"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-#: src/utils/wxCas/src/wxcasframe.cpp:410
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "About wxCas"
 msgstr "关于 wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:326
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Start Auto Refresh"
 msgstr "开始自动刷新"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:328
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh stopped"
 msgstr "自动刷新已停止"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:337
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Auto Refresh started"
 msgstr "自动刷新已开始"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:348
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Save Statistics Image"
 msgstr "保存统计图"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:386
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule Online Statistics"
 msgstr "aMule 在线统计"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:390
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "There was a problem printing.\n"
 "Perhaps your current printer is not set correctly?"
@@ -7414,11 +8901,11 @@
 "打印时出现问题。\n"
 "可能当前打印机没有设置正确？"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Printing"
 msgstr "打印中"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:409
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ""
 "wxCas, aMule OnLine Signature Statistics\n"
 "\n"
@@ -7436,400 +8923,580 @@
 "\n"
 "基于 GPL 协议分发"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:575
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule is not running..."
 msgstr "aMule 没有在运行..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:651
-#: src/utils/wxCas/src/wxcasframe.cpp:721
-#: src/utils/wxCas/src/wxcasframe.cpp:790
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running"
 msgstr "aMule 正在运行"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:860
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is running, but disconnected"
 msgstr "aMule 正在运行，但是已断开连接"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:931
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule is connecting..."
 msgstr "aMule 正在连接..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:935
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Oh Oh, aMule status is unknown..."
 msgstr "aMule 的状态不明..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1006
-#: src/utils/wxCas/src/wxcasframe.cpp:1011
-#: src/utils/wxCas/src/wxcasframe.cpp:1015
-#: src/utils/wxCas/src/wxcasframe.cpp:1019
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "aMule "
 msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1008
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " has been running for "
 msgstr " 已经运行 "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1013
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is stopped !"
 msgstr " 已停止！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1017
-#: src/utils/wxCas/src/wxcasframe.cpp:1041
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is not connected !"
 msgstr " 未连接！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connecting..."
 msgstr " 正在连接..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is doing something strange, check it !"
 msgstr " 状态不正常，请检查！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1046
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is connected to "
 msgstr " 已连接至 "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1047
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " Kad: "
 msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1053
-#: src/utils/wxCas/src/wxcasframe.cpp:1075
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "off"
 msgstr "关闭"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " is on "
 msgstr " 是在 "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1066
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " with "
 msgstr " 和 "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1084
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Total Download: "
 msgstr "总下载: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1086
-#: src/utils/wxCas/src/wxcasframe.cpp:1097
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid ", Upload: "
 msgstr ", 上传: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1095
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Session Download: "
 msgstr "本次运行下载: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1106
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Download: "
 msgstr "下载: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1108
-msgid " kB/s, Upload: "
-msgstr " KB/s, 上传: "
+#: src/utils/wxCas/src/wxcasframe.cpp
+msgid " KiB/s, Upload: "
+msgstr " KiB/s，上传： "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Sharing: "
 msgstr "共享: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " file(s), Clients on queue: "
 msgstr " 队列中的文件，客户端: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "Time: "
 msgstr "时间: "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid " on "
 msgstr " 在 "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System Load Average (1-5-15 min): "
 msgstr "系统平均负载 (1-5-15 分钟): "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1171
+#: src/utils/wxCas/src/wxcasframe.cpp
 msgid "System uptime: "
 msgstr "系统运行时间: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:51
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Directory containing amulesig.dat file"
 msgstr "amulesig.dat 文件所在的目录"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:71
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where your amulesig.dat file is"
 msgstr "请输入 amulesig.dat 文件所在的目录"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:90
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Refresh rate interval in seconds"
 msgstr "刷新周期（秒）"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:105
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Generate a stat image at every refresh event"
 msgstr "每次刷新都生成统计图"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:128
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where you want to generate the statistic image"
 msgstr "输入存放所产生的统计图的目录"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:150
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Upload periodically your stat image to FTP server"
 msgstr "定期上传统计图到 FTP 服务器"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:157
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Url"
 msgstr "FTP 地址"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:160
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP Path"
 msgstr "FTP 路径"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:169
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the URL of your FTP server"
 msgstr "输入 FTP 服务器的地址"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:180
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr "输入 FTP 服务器上存放统计图的目录"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:185
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "User"
 msgstr "用户名"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User name to log into your FTP server"
 msgstr "输入登录 FTP 服务器的用户名"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:209
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Enter here the User password to log into your FTP server"
 msgstr "输入登录FTP服务器的密码"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:226
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "FTP update rate interval in minutes"
 msgstr "FTP上传周期 (分钟)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:264
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Validate"
 msgstr "检测"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:298
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder containing your signature file"
 msgstr "统计文件所在文件夹"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:312
+#: src/utils/wxCas/src/wxcasprefs.cpp
 msgid "Folder where generating the statistic image"
 msgstr "统计图存放文件夹"
 
-#: src/webserver/src/WebInterface.cpp:247
+#: src/webserver/src/WebInterface.cpp
 msgid "Loads template <str>"
 msgstr "载入模板 <str>"
 
-#: src/webserver/src/WebInterface.cpp:251
+#: src/webserver/src/WebInterface.cpp
 msgid "Web server HTTP port"
 msgstr "Web服务器的HTTP端口"
 
-#: src/webserver/src/WebInterface.cpp:255
+#: src/webserver/src/WebInterface.cpp
 msgid "Use UPnP port forwarding on web server port"
 msgstr "为Web服务器端口启用uPnP"
 
-#: src/webserver/src/WebInterface.cpp:259
+#: src/webserver/src/WebInterface.cpp
 msgid "UPnP port"
 msgstr "UPnP 端口"
 
-#: src/webserver/src/WebInterface.cpp:263
+#: src/webserver/src/WebInterface.cpp
 msgid "Use gzip compression"
 msgstr "使用 gzip 压缩"
 
-#: src/webserver/src/WebInterface.cpp:271
+#: src/webserver/src/WebInterface.cpp
 msgid "Full access password for web server"
 msgstr "Web服务器的完整权限密码"
 
-#: src/webserver/src/WebInterface.cpp:275
+#: src/webserver/src/WebInterface.cpp
 msgid "Guest password for web server"
 msgstr "Web服务器的访客密码"
 
-#: src/webserver/src/WebInterface.cpp:279
+#: src/webserver/src/WebInterface.cpp
 msgid "Allow guest access"
 msgstr "允许访客访问"
 
-#: src/webserver/src/WebInterface.cpp:283
+#: src/webserver/src/WebInterface.cpp
 msgid "Deny guest access"
 msgstr "拒绝访客访问"
 
-#: src/webserver/src/WebInterface.cpp:287
+#: src/webserver/src/WebInterface.cpp
 msgid "Load/save web server settings from/to remote aMule"
 msgstr "载入/保存Web服务器设置从/至远程aMule"
 
-#: src/webserver/src/WebInterface.cpp:291
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule设置文件路径，不要直接使用！"
+msgstr "aMule 配置文件路径，不要直接使用！"
 
-#: src/webserver/src/WebInterface.cpp:299
+#: src/webserver/src/WebInterface.cpp
 msgid "Disable PHP interpreter (deprecated)"
 msgstr "禁用 PHP 解释器（已废弃）"
 
-#: src/webserver/src/WebInterface.cpp:307
+#: src/webserver/src/WebInterface.cpp
 msgid "Recompile PHP pages on each request"
 msgstr "为每个请求重编译 PHP 页面"
 
-#: src/webserver/src/WebInterface.cpp:413
+#: src/webserver/src/WebInterface.cpp
 msgid "aMule Web Server"
 msgstr "aMule Web 服务器"
 
-#: src/webserver/src/WebServer.cpp:312
+#: src/webserver/src/WebServer.cpp
 msgid "web client connection accepted\n"
 msgstr "网页客户端连接已被接受\n"
 
-#: src/webserver/src/WebServer.cpp:315
+#: src/webserver/src/WebServer.cpp
 msgid "ERROR: cannot accept web client connection\n"
 msgstr "错误：无法接受网页客户端连接\n"
 
-#: src/webserver/src/WebServer.cpp:361
+#: src/webserver/src/WebServer.cpp
 #, c-format
 msgid "Request failed with the following error: %s."
 msgstr "请求失败，错误为: %s 。"
 
-#: src/webserver/src/WebServer.cpp:1778
+#: src/webserver/src/WebServer.cpp
 msgid "Index file not found: "
 msgstr "索引文件未找到: "
 
-#: src/webserver/src/WebServer.cpp:1867
+#: src/webserver/src/WebServer.cpp
 msgid "Session expired - requesting login\n"
 msgstr "会话过期 - 正在请求登录\n"
 
-#: src/webserver/src/WebServer.cpp:1872
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, logged in\n"
 msgstr "会话正常，已登录\n"
 
-#: src/webserver/src/WebServer.cpp:1874
+#: src/webserver/src/WebServer.cpp
 msgid "Session ok, not logged in\n"
 msgstr "会话正常，未登录\n"
 
-#: src/webserver/src/WebServer.cpp:1879
+#: src/webserver/src/WebServer.cpp
 msgid "No session opened - will request login\n"
 msgstr "没有会话已打开 - 将请求登录\n"
 
-#: src/webserver/src/WebServer.cpp:1903
+#: src/webserver/src/WebServer.cpp
 msgid "Session created - requesting login\n"
 msgstr "会话已创建 - 正在请求登录\n"
 
-#: src/webserver/src/WebServer.cpp:1918
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request original: "
 msgstr "正在处理请求 原始: "
 
-#: src/webserver/src/WebServer.cpp:1947
+#: src/webserver/src/WebServer.cpp
 msgid "Refusing to read `pass` from URL query string\n"
-msgstr ""
+msgstr "拒绝从 URL 查询字符串读取 `pass`\n"
 
-#: src/webserver/src/WebServer.cpp:1953
+#: src/webserver/src/WebServer.cpp
 msgid "No password specified, login will not be allowed."
 msgstr "没有指定密码，不允许登录。"
 
-#: src/webserver/src/WebServer.cpp:1955
+#: src/webserver/src/WebServer.cpp
 msgid "Checking password\n"
 msgstr "检查密码\n"
 
-#: src/webserver/src/WebServer.cpp:1960
+#: src/webserver/src/WebServer.cpp
 msgid "Password hash invalid\n"
 msgstr "密码哈希值无效\n"
 
-#: src/webserver/src/WebServer.cpp:1975
+#: src/webserver/src/WebServer.cpp
 msgid "Password ok\n"
 msgstr "密码正确\n"
 
-#: src/webserver/src/WebServer.cpp:1977
+#: src/webserver/src/WebServer.cpp
 msgid "Password bad\n"
 msgstr "密码错误\n"
 
-#: src/webserver/src/WebServer.cpp:1980
+#: src/webserver/src/WebServer.cpp
 msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr "您没有输入密码，不能输入空密码。\n"
 
-#: src/webserver/src/WebServer.cpp:1988
+#: src/webserver/src/WebServer.cpp
 msgid "Logout requested\n"
 msgstr "已请求注销\n"
 
-#: src/webserver/src/WebServer.cpp:1993
+#: src/webserver/src/WebServer.cpp
 msgid "Processing request redirected: "
 msgstr "正在处理请求 已重定向: "
 
-#: packaging/windows/installer_strings.c:36
+#: packaging/windows/installer_strings.c
 msgid "aMule (required)"
-msgstr ""
+msgstr "aMule（必需）"
 
-#: packaging/windows/installer_strings.c:37
+#: packaging/windows/installer_strings.c
 msgid "Desktop shortcut"
-msgstr ""
+msgstr "桌面快捷方式"
 
-#: packaging/windows/installer_strings.c:38
+#: packaging/windows/installer_strings.c
 msgid "Start aMule when I log in"
-msgstr ""
+msgstr "登录时启动 aMule"
 
-#: packaging/windows/installer_strings.c:39
+#: packaging/windows/installer_strings.c
+msgid "Associate .emulecollection files"
+msgstr "关联 .emulecollection 文件"
+
+#: packaging/windows/installer_strings.c
 msgid "Uninstall"
-msgstr ""
+msgstr "卸载"
 
-#: packaging/windows/installer_strings.c:40
+#: packaging/windows/installer_strings.c
 msgid "Remove user data (config, ED2K servers, Kad nodes, partfiles)"
-msgstr ""
+msgstr "删除用户数据（配置、ED2K 服务器、Kad 节点、part文件）"
 
-#: packaging/windows/installer_strings.c:43
+#: packaging/windows/installer_strings.c
 msgid "aMule application files (required)."
 msgstr "aMule 程序文件（必需）。"
 
-#: packaging/windows/installer_strings.c:44
+#: packaging/windows/installer_strings.c
 msgid "Place an aMule shortcut on the desktop."
-msgstr ""
+msgstr "在桌面上创建 aMule 快捷方式。"
 
-#: packaging/windows/installer_strings.c:45
+#: packaging/windows/installer_strings.c
 msgid "Launch aMule automatically when the current user logs in (per-user setting)."
-msgstr ""
+msgstr "当前用户登录时自动启动 aMule（每用户设置）。"
 
-#: packaging/windows/installer_strings.c:46
-msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, and Add/Remove Programs entry (required)."
-msgstr ""
+#: packaging/windows/installer_strings.c
+msgid "Adds aMule to the \"Open with\" list for .emulecollection files, and makes it the default if no other program has claimed them. Opening a collection queues every eD2k link it contains."
+msgstr "添加 aMule 到 .emulecollection 文件的“打开方式”列表，且如果没有其他程序注册过该扩展名让 aMule 成为默认程序。打开链接集会查询其包含的每个 eD2k 链接。"
 
-#: packaging/windows/installer_strings.c:47
+#: packaging/windows/installer_strings.c
+msgid "Remove aMule application files, Start Menu / desktop shortcuts, autostart Run-key entry, URL scheme registrations, and Add/Remove Programs entry (required)."
+msgstr "删除 aMule 应用程序文件、开始菜单/桌面快捷方式、自启动注册表键、URL scheme 注册和添加/删除程序条目（必需）。"
+
+#: packaging/windows/installer_strings.c
 msgid "Permanently delete %APPDATA%\\aMule for the current user (aMule.conf, ED2K server list, Kad nodes, partfiles, IP filters, friends list). Leave unchecked to keep your settings."
-msgstr ""
+msgstr "永久删除当前用户的 %APPDATA%\\aMule 目录（包含 aMule.conf 文件、ED2K 服务器列表、Kad 节点、part文件、IP 过滤器和好友列表）。取消选中此项可保留您的设置。"
 
-#: packaging/windows/installer_strings.c:53
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule appears to be running from $INSTDIR.\r\n"
 "Please close aMule (and aMuleD / aMuleGUI) and try again."
 msgstr ""
+"aMule 似乎正从 $INSTDIR 目录运行。\n"
+"请关闭 aMule（以及 aMuleD / aMuleGUI），然后重试。"
 
-#: packaging/windows/installer_strings.c:54
+#: packaging/windows/installer_strings.c
 msgid ""
 "aMule daemon (amuled.exe) appears to be running from $INSTDIR.\r\n"
 "Please stop it and try again."
 msgstr ""
+"aMule守护进程（amuled.exe）似乎正从 $INSTDIR目录运行。\n"
+"请停止它并重试。"
 
-#: packaging/windows/installer_strings.c:55
+#: packaging/windows/installer_strings.c
 msgid "Removing previous aMule installation at $0..."
-msgstr ""
+msgstr "正在删除之前 $0 位置的 aMule 安装…"
 
-#: packaging/windows/installer_strings.c:56
+#: packaging/windows/installer_strings.c
 msgid ""
 "Could not remove the previous aMule installation at $0.\r\n"
 "Please close any running aMule processes and try again, or uninstall the previous version manually first."
 msgstr ""
+"无法删除之前在 $0 处安装的 aMule。\n"
+"请关闭所有正在运行的 aMule 进程并重试，或者先手动卸载之前的版本。"
 
-#: packaging/windows/installer_strings.c:57
+#: packaging/windows/installer_strings.c
 msgid "aMule appears to be running. Please close it and re-run the uninstaller."
-msgstr ""
+msgstr "aMule 似乎正在运行。请将其关闭并重新运行卸载程序。"
 
-#: packaging/windows/installer_strings.c:58
+#: packaging/windows/installer_strings.c
 msgid "Removing user data at $APPDATA\\aMule..."
-msgstr ""
+msgstr "正在删除 $APPDATA\\aMule 中的用户数据..."
+
+#~ msgid "Ratio"
+#~ msgstr "比例"
+
+#, c-format
+#~ msgid "No shareable files found in directory: %s"
+#~ msgstr "在目录中没有找到可以共享的文件：%s"
+
+#~ msgid "Change Language"
+#~ msgstr "更改语言"
+
+#~ msgid "There are no translations installed for aMule"
+#~ msgstr "没有为 aMule 安装语言文件"
+
+#~ msgid "No languages available"
+#~ msgstr "语言文件不可用"
+
+#~ msgid "User name"
+#~ msgstr "用户名"
+
+#~ msgid "Obtained Parts"
+#~ msgstr "已获取的部分"
+
+#~ msgid "Available Parts"
+#~ msgstr "可用分块"
+
+#, c-format
+#~ msgid "Found %i known shared file, %i unknown"
+#~ msgid_plural "Found %i known shared files, %i unknown"
+#~ msgstr0 "发现 %i 个已知共享的文件， %i 个未知"
+#~ msgstr1 "发现 %i 个已知共享的文件， %i 个未知"
+
+#~ msgid " MB/s"
+#~ msgstr " MB/s"
+
+#~ msgid " kB/s"
+#~ msgstr " kB/s"
+
+#~ msgid "kB/s"
+#~ msgstr "KB/s"
+
+#~ msgid "kB"
+#~ msgstr "KB"
+
+#~ msgid "MB/s"
+#~ msgstr "MB/s"
+
+#~ msgid "%y/%m/%d %H:%M:%S"
+#~ msgstr "%y/%m/%d %H:%M:%S"
 
 #, fuzzy
-#~ msgid "Loaded"
-#~ msgstr "已上传"
+#~ msgid "Remote prefix:"
+#~ msgstr "远程服务器"
 
 #, fuzzy
-#~ msgid "Not found"
-#~ msgstr "文件未找到。"
+#~ msgid "Local prefix:"
+#~ msgstr "本地服务器"
+
+#, fuzzy
+#~ msgid "Invalid entry in stored search list, file may be corrupt: "
+#~ msgstr "已知文件列表包含非法条目，文件可能损坏："
+
+#, c-format
+#~ msgid "Hashing %u new file"
+#~ msgid_plural "Hashing %u new files"
+#~ msgstr0 "正计算 %u 个新文件的哈希值"
+#~ msgstr1 "正计算 %u 个新文件的哈希值"
+
+#, c-format
+#~ msgid "Hashing new files (%u of %u)"
+#~ msgstr "正计算新文件哈希值（第 %u 个，共 %u 个）"
+
+#~ msgid "the default Windows shell handler"
+#~ msgstr "默认的 Windows 外壳处理器"
+
+#, c-format
+#~ msgid ""
+#~ "To prevent this warning to show up in every preview,\n"
+#~ "set your preferred video player in preferences (default is %s)."
+#~ msgstr ""
+#~ "为了不让此提示在每次预览时都出现，\n"
+#~ "请在首选项中预设您喜欢的播放器（默认为%s）。"
+
+#~ msgid "Filter Results"
+#~ msgstr "过滤结果"
+
+#~ msgid "Mark as known file"
+#~ msgstr "标记为已知文件"
+
+#~ msgid "Percent of total files"
+#~ msgstr "全部文件的百分比"
+
+#~ msgid "Bootstrap"
+#~ msgstr "启动"
+
+#~ msgid "New node"
+#~ msgstr "新节点"
+
+#~ msgid "IP:"
+#~ msgstr "IP："
+
+#~ msgid "More"
+#~ msgstr "更多"
+
+#~ msgid ""
+#~ "Bootstrap from \n"
+#~ "known clients"
+#~ msgstr "从已知用户启动"
+
+#~ msgid "Connect to any server and/or Kad"
+#~ msgstr "连接至任何服务器和/或 Kad"
+
+#~ msgid "Disconnect Kad"
+#~ msgstr "断开 Kad"
+
+#~ msgid "Stop the current connection attempts"
+#~ msgstr "终止本次连接尝试"
+
+#~ msgid "Disconnect from the currently connected networks"
+#~ msgstr "从当前已连接的网络断开"
+
+#~ msgid "Connect to the currently enabled networks"
+#~ msgstr "连接至当前已启用的网络"
+
+#, c-format
+#~ msgid "Could not add %u link from ED2KLinks file (see log for details)."
+#~ msgid_plural "Could not add %u links from ED2KLinks file (see log for details)."
+#~ msgstr0 "无法添加 ED2KLinks 文件的 %u 个链接（详情见日志）。"
+#~ msgstr1 "无法添加 ED2KLinks 文件的 %u 个链接（详情见日志）。"
+
+#~ msgid "Auto-sort files (high CPU)"
+#~ msgstr "自动排序文件 (高 CPU 占用)"
+
+#~ msgid "aMule will sort the columns in your download list automatically"
+#~ msgstr "aMule 会自动将下载列表按列排序"
+
+#~ msgid "Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution."
+#~ msgstr "如果客户端 ip 和发送数据包的 ip 不同则拒绝数据包。请谨慎使用。"
+
+#~ msgid "Return the results of the previous search.\n"
+#~ msgstr "返回以前搜索的结果。\n"
+
+#~ msgid "Show the progress of a search.\n"
+#~ msgstr "显示搜索进度。\n"
+
+#~ msgid "Connection closed - aMule has terminated probably."
+#~ msgstr "连接关闭 - aMule 可能已经终止运行。"
+
+#~ msgid "Check for new version at startup"
+#~ msgstr "启动时检查新版本"
+
+#~ msgid "Binds to 127.0.0.1 only. Set an admin password in amuleapi.conf to expose it to other hosts."
+#~ msgstr "仅绑定到 127.0.0.1。在 amuleapi.conf 中设置管理员密码将其暴露给其他主机。"
+
+#~ msgid "eD2k Link: "
+#~ msgstr "eD2k 链接: "
+
+#~ msgid "Commit"
+#~ msgstr "确定"
+
+#~ msgid "amuled: forking to background - see you"
+#~ msgstr "amuled： 进入后台 - 再见"
+
+#~ msgid "Website: https://amule-org.github.io \n"
+#~ msgstr "网站：https://amule-org.github.io \n"
+
+#~ msgid "Forum: https://github.com/amule-org/amule/discussions \n"
+#~ msgstr "论坛：https://github.com/amule-org/amule/discussions \n"
+
+#~ msgid "Documentation: https://amule-org.github.io/docs \n"
+#~ msgstr "文档： https://amule-org.github.io/docs \n"
+
+#~ msgid ""
+#~ "Issues: https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+#~ msgstr ""
+#~ "提交问题：https://github.com/amule-org/amule/issues \n"
+#~ "\n"
+
+#~ msgid "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+#~ msgstr "https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n"
+
+#, fuzzy
+#~ msgid "Loaded"
+#~ msgstr "已上传"

amule-3.0.1.tar.gz/po/zh_TW.po -> amule-3.1.0.tar.gz/po/zh_TW.po Changed

amule-3.1.0.tar.gz/scripts/check-potfiles.sh Added

@@ -0,0 +1,68 @@
+#! /bin/bash
+#
+# Verifies that po/POTFILES.in lists every source file that marks a string for
+# translation.
+#
+# xgettext is told which files to scan with --files-from=po/POTFILES.in, so a
+# file missing from that list is simply never read: its _() strings never reach
+# po/amule.pot, never reach Weblate, and render untranslated forever no matter
+# how complete a language is. Nothing else catches this. The "catalogs in sync"
+# job regenerates the template from the same list, so the check and the bug
+# share a blind spot -- the catalogs really are in sync with what was scanned.
+#
+# Exits non-zero and names the files when the list has drifted.
+
+set -u
+
+cd "$(dirname "$0")/.." || exit 1
+
+POTFILES=po/POTFILES.in
+
+# The keywords xgettext is invoked with; keep in step with update-po.sh.
+#
+# Matched only where the call opens with a string literal, optionally wrapped
+# in wxT(), which is the only form xgettext can extract anyway -- `_(variable)`
+# yields nothing whether or not the file is listed. Requiring the literal is
+# also what keeps XPM pixmap data out: rows like "... &.&._ _ _ ( F <.-Xj ..."
+# contain the keyword next to a paren, but never immediately followed by one
+# and a quote.
+KEYWORDS='_|wxTRANSLATE|wxPLURAL'
+LITERAL='(^|^A-Za-z0-9_)('"${KEYWORDS}"')\(:space:*(wxT\()?"'
+
+status=0
+
+# Files that mark strings but are not listed.
+while read -r file; do
+	case "${file}" in
+	# The amuleapi Web UI ships its own JSON dictionaries and has its own
+	# gate (src/webapi/tools/check-i18n.mjs); its C++ side serves that UI
+	# rather than emitting user-facing text through gettext.
+	src/webapi/*) continue ;;
+	unittests/*) continue ;;
+	esac
+
+	grep -qxF "${file}" "${POTFILES}" && continue
+
+	if  ${status} == 0 ; then
+		echo "Source files marking translatable strings but missing from ${POTFILES}:" >&2
+	fi
+	echo "  ${file}" >&2
+	status=1
+done < <(git grep -lE "${LITERAL}" -- '*.c' '*.cpp' '*.h' | sort)
+
+if  ${status} != 0 ; then
+	echo >&2
+	echo "Add them to ${POTFILES}, then run scripts/update-po.sh and commit the result." >&2
+fi
+
+# The reverse: a listed file that no longer exists. xgettext fails on this
+# anyway, but failing here says which line to delete instead of dying inside
+# a regeneration.
+while read -r listed; do
+	 -z ${listed} || ${listed} == \#*  && continue
+	 -f ${listed}  && continue
+	echo "${POTFILES} lists a file that does not exist: ${listed}" >&2
+	status=1
+done < "${POTFILES}"
+
+exit "${status}"

amule-3.0.1.tar.gz/scripts/compile.sh -> amule-3.1.0.tar.gz/scripts/compile.sh Changed

@@ -21,15 +21,21 @@
 	echo "  --help       Display this help message"
 	echo "  -j<n>"
 	echo "  --jobs<n>    Run <n> jobs in parallel"
+	echo "  -c"
+	echo "  --measure-cache"
+	echo "               Build against an empty, isolated ccache directory"
+	echo "               and print its size at the end, to measure this"
+	echo "               project's own ccache footprint. Skips running tests."
 }
 
 OPT_DEBUG=Release
 OPT_J=1
+OPT_MEASURE_CACHE=0
 
 # Setup parse options
 # -o "j:" means short flag 'j' requires an argument
 # --long "jobs:" means long flag 'jobs' requires an argument
-if ! PARAMS=$(getopt -o "dhj:" -l "debug,jobs:,help" -n "$0" -- "$@"); then
+if ! PARAMS=$(getopt -o "dhj:c" -l "debug,jobs:,help,measure-cache" -n "$0" -- "$@"); then
 	# If getopt fails (invalid flag), exit
 	usage
 	false; die 10
@@ -59,6 +65,10 @@
 			false; die 12
 		fi
 		;;
+	-c | --measure-cache )
+		OPT_MEASURE_CACHE=1
+		shift
+		;;
 	-- )
 		shift
 		break;
@@ -80,10 +90,12 @@
 		-DBUILD_ALC=YES \
 		-DBUILD_ALCC=YES \
 		-DBUILD_AMULECMD=YES \
+		-DBUILD_AMULEAPI=YES \
 		-DBUILD_CAS=YES \
 		-DBUILD_DAEMON=YES \
 		-DBUILD_WXCAS=YES \
 		-DBUILD_ED2K=YES \
+		-DBUILD_FILEVIEW=YES \
 		-DBUILD_MONOLITHIC=YES \
 		-DBUILD_REMOTEGUI=YES \
 		-DBUILD_TESTING=YES \
@@ -97,8 +109,23 @@
 
 cmake_build() {
 	echo Running the CMake build with "${OPT_J} parallel jobs"
+
+	local HAVE_CCACHE=0
+	if command -v ccache > /dev/null 2>&1; then
+		HAVE_CCACHE=1
+		ccache -z > /dev/null
+	fi
+
 	cmake --build build -j"${OPT_J}" "$@"
+	local BUILD_STATUS=$?
+
+	if  ${HAVE_CCACHE} == 1 ; then
+		echo
+		echo "ccache statistics for this build:"
+		ccache -s
+	fi
 
+	(exit "${BUILD_STATUS}")
 	die 3 "CMake build failed"
 }
 
@@ -118,8 +145,22 @@
 	$'\n' \
 	"This script must be run in '${GIT_ROOT}'"
 
+if  ${OPT_MEASURE_CACHE} == 1 ; then
+	CCACHE_DIR=$(mktemp -d "${TMPDIR:-/tmp}/amule-ccache-measure.XXXXXX")
+	die 23 "Error creating scratch ccache directory"
+	export CCACHE_DIR
+	trap 'rm -rf "${CCACHE_DIR}"' EXIT
+fi
+
 cmake_configure
 cmake_build "$@"
-cmake_test
+
+if  ${OPT_MEASURE_CACHE} == 1 ; then
+	echo
+	echo "This project's ccache footprint (empty cache, full build):"
+	du -sh "${CCACHE_DIR}"
+else
+	cmake_test
+fi
 
 exit 0

amule-3.0.1.tar.gz/scripts/update-manpages-po.sh -> amule-3.1.0.tar.gz/scripts/update-manpages-po.sh Changed

amule-3.0.1.tar.gz/scripts/update-po.sh -> amule-3.1.0.tar.gz/scripts/update-po.sh Changed

@@ -66,8 +66,19 @@
 # wrapping. Keeps Weblate / msgmerge / hand-regen diffs to real content
 # changes instead of reflow noise. Weblate's "application" component is
 # configured to match.
+#
+# --add-location=file: emit "#: src/amuleDlg.cpp" instead of
+# "#: src/amuleDlg.cpp:1234". A line number shifts whenever anything above a
+# string is edited, so with full locations every catalog rewrote its entire
+# reference block on every regen -- the overwhelming bulk of a catalog diff
+# was renumbering rather than content, and any two PRs in flight conflicted
+# on it. File names rarely move, so translators keep the "where is this
+# string used" context Weblate shows while the churn goes away. msgmerge
+# below needs the same flag, otherwise it re-expands locations to full
+# file:line when merging the pot into each .po.
 xgettext \
 	--no-wrap \
+	--add-location=file \
 	--keyword=_ \
 	--keyword=wxTRANSLATE \
 	--keyword=wxPLURAL:1,2 \
@@ -87,6 +98,15 @@
 	&& mv po/amule.pot.tmp po/amule.pot
 die 32 "failed to substitute copyright year in po/amule.pot"
 
+# xgettext stamps "charset=CHARSET" whenever every extracted msgid is ASCII
+# (it only infers UTF-8 once it sees a non-ASCII byte). An all-ASCII template
+# is legitimate, but "CHARSET" is not a portable encoding name -- msgcat and
+# the catalog-sync check reject it. Pin the header to UTF-8, which is correct
+# for ASCII and already matches every .po.
+sed -e "s/charset=CHARSET/charset=UTF-8/" po/amule.pot > po/amule.pot.tmp \
+	&& mv po/amule.pot.tmp po/amule.pot
+die 33 "failed to normalise charset in po/amule.pot"
+
 echo "Merging po/amule.pot into each .po file ..."
 # Write via --output-file + mv rather than --update: msgmerge --update
 # treats the .po as up-to-date when only the pot's wrap differs from
@@ -94,7 +114,7 @@
 # any .po that was previously committed in wrapped form.
 for PO_FILE in po/*.po; do
 	echo "  $PO_FILE"
-	msgmerge --no-wrap "$PO_FILE" po/amule.pot --output-file="$PO_FILE.tmp"
+	msgmerge --no-wrap --add-location=file "$PO_FILE" po/amule.pot --output-file="$PO_FILE.tmp"
 	die 31 "msgmerge failed for $PO_FILE"
 	mv "$PO_FILE.tmp" "$PO_FILE"
 	die 31 "failed to install merged $PO_FILE"

amule-3.1.0.tar.gz/src/AboutDialog.cpp Added

@@ -0,0 +1,192 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "AboutDialog.h"
+
+#include "config.h" // Needed for VERSION, GITDATE
+
+#include <common/Format.h> // Needed for CFormat
+
+#include <wx/artprov.h>
+#include <wx/bmpbndl.h> // Needed for wxBitmapBundle
+#include <wx/button.h>
+#include <wx/hyperlink.h>
+#include <wx/settings.h>
+#include <wx/sizer.h>
+#include <wx/statbmp.h>
+#include <wx/statline.h>
+#include <wx/stattext.h>
+
+namespace
+{
+#ifdef ENABLE_VERSION_CHECK
+const int ID_CHECK_UPDATES = wxID_HIGHEST + 1;
+const wxString RELEASES_URL = wxT("https://github.com/amule-org/amule/releases/latest");
+#endif // ENABLE_VERSION_CHECK
+
+// A hyperlink whose colour is uniform (the system link colour) in every state -- dropping
+// wxHyperlinkCtrl's red rollover / purple visited defaults so links look native and consistent on
+// GTK / macOS / MSW.
+wxHyperlinkCtrl *MakeLink(wxWindow *parent, const wxString &url)
+{
+	wxHyperlinkCtrl *link = new wxHyperlinkCtrl(parent, wxID_ANY, url, url);
+	const wxColour linkColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT);
+	link->SetNormalColour(linkColour);
+	link->SetHoverColour(linkColour);
+	link->SetVisitedColour(linkColour);
+	return link;
+}
+} // namespace
+
+CAboutDlg::CAboutDlg(wxWindow *parent)
+: wxDialog(parent, wxID_ANY, _("About aMule"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+#ifdef ENABLE_VERSION_CHECK
+, m_status(NULL)
+, m_downloadLink(NULL)
+, m_checkButton(NULL)
+#endif
+{
+	// Header (version + description) and the credits block reuse the exact strings the old
+	// wxMessageBox About used, so their existing translations carry over unchanged; trailing
+	// whitespace is trimmed for the layout.
+	wxString head;
+#ifdef CLIENT_GUI
+	head << _("aMule remote control ") << VERSION;
+#else
+	head << wxT("aMule ") << VERSION;
+#endif
+#ifdef GITDATE
+	head << wxT("\n") << _("Snapshot:") << wxT(" ") << GITDATE;
+#endif
+	head << wxT("\n\n") << _("'All-Platform' p2p client based on eMule \n\n");
+	head.Trim();
+
+	wxString credits;
+	credits << _("Copyright (c) 2003-2026 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-2011 Petar Maymounkov ( petar@maymounkov.org )\n");
+	credits.Trim();
+
+	// aMule logo on the left, matching the previous wxMessageBox About. A bundle, so it renders
+	// at the display's scale. 42px: the artwork this replaced was 32x42, so the logo keeps its
+	// height.
+	const wxBitmapBundle logoBmp =
+		wxArtProvider::GetBitmapBundle("amule:amule", wxART_MESSAGE_BOX, wxSize(42, 42));
+
+	// The project links, as native clickable hyperlinks.
+	wxFlexGridSizer *linkGrid = new wxFlexGridSizer(2, wxSize(6, 2));
+	const struct
+	{
+		wxString label;
+		wxString url;
+	} projectLinks = {
+		{ _("Website:"), wxT("https://amule-org.github.io") },
+		{ _("Forum:"), wxT("https://github.com/amule-org/amule/discussions") },
+		{ _("Documentation:"), wxT("https://amule-org.github.io/docs") },
+		{ _("Issues:"), wxT("https://github.com/amule-org/amule/issues") },
+	};
+	for (const auto &l : projectLinks) {
+		linkGrid->Add(new wxStaticText(this, wxID_ANY, l.label), wxSizerFlags().CenterVertical());
+		linkGrid->Add(MakeLink(this, l.url), wxSizerFlags().CenterVertical());
+	}
+
+#ifdef ENABLE_VERSION_CHECK
+	// Update-check controls.
+	m_status = new wxStaticText(this, wxID_ANY, _("Click to check for a newer version."));
+	m_checkButton = new wxButton(this, ID_CHECK_UPDATES, _("Check for updates"));
+	// Clickable download link, revealed only when a newer version is found.
+	m_downloadLink = MakeLink(this, RELEASES_URL);
+	m_downloadLink->Hide();
+
+	wxBoxSizer *checkRow = new wxBoxSizer(wxHORIZONTAL);
+	checkRow->Add(m_status, wxSizerFlags(1).CenterVertical().Border(wxRIGHT, 10));
+	checkRow->Add(m_checkButton, wxSizerFlags().CenterVertical());
+#endif // ENABLE_VERSION_CHECK
+
+	wxBoxSizer *right = new wxBoxSizer(wxVERTICAL);
+	right->Add(new wxStaticText(this, wxID_ANY, head));
+	right->Add(linkGrid, wxSizerFlags().Border(wxTOP | wxBOTTOM, 8));
+	right->Add(new wxStaticText(this, wxID_ANY, credits));
+	right->Add(
+		MakeLink(this, wxT("https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf")),
+		wxSizerFlags().Border(wxTOP, 2));
+#ifdef ENABLE_VERSION_CHECK
+	right->Add(new wxStaticLine(this, wxID_ANY), wxSizerFlags().Expand().Border(wxTOP | wxBOTTOM, 10));
+	right->Add(checkRow, wxSizerFlags().Expand());
+	right->Add(m_downloadLink, wxSizerFlags().Border(wxTOP, 4));
+#endif // ENABLE_VERSION_CHECK
+
+	wxBoxSizer *topRow = new wxBoxSizer(wxHORIZONTAL);
+	if (logoBmp.IsOk()) {
+		topRow->Add(
+			new wxStaticBitmap(this, wxID_ANY, logoBmp), wxSizerFlags().Top().Border(wxALL, 10));
+	}
+	topRow->Add(right, wxSizerFlags(1).Border(wxALL, 10));
+
+	wxBoxSizer *top = new wxBoxSizer(wxVERTICAL);
+	top->Add(topRow, wxSizerFlags(1).Expand());
+	top->Add(CreateButtonSizer(wxOK), wxSizerFlags().Right().Border(wxALL, 10));
+
+	SetSizerAndFit(top);
+	Centre();
+
+#ifdef ENABLE_VERSION_CHECK
+	Bind(wxEVT_BUTTON, &CAboutDlg::OnCheckClicked, this, ID_CHECK_UPDATES);
+	Bind(wxEVT_VERSION_CHECK_DONE, &CAboutDlg::OnCheckDone, this);
+#endif // ENABLE_VERSION_CHECK
+}
+
+#ifdef ENABLE_VERSION_CHECK
+
+void CAboutDlg::OnCheckClicked(wxCommandEvent &WXUNUSED(evt))
+{
+	m_checkButton->Enable(false);
+	m_downloadLink->Hide();
+	m_status->SetLabel(_("Checking for updates..."));
+	Layout();
+	m_check.Start(this, wxID_ANY);
+}
+
+void CAboutDlg::OnCheckDone(wxCommandEvent &evt)
+{
+	m_checkButton->Enable(true);
+	switch (evt.GetInt()) {
+	case CVersionCheck::UpToDate:
+		m_status->SetLabel(_("You are running the latest version."));
+		m_downloadLink->Hide();
+		break;
+	case CVersionCheck::Outdated:
+		m_status->SetLabel(CFormat(_("A new version (%s) is available:")) % m_check.LatestVersion());
+		m_downloadLink->Show();
+		break;
+	default:
+		m_status->SetLabel(_("Could not check for updates. Please try again later."));
+		m_downloadLink->Hide();
+		break;
+	}
+	// The status/link can change height; relayout so the dialog resizes.
+	GetSizer()->Layout();
+	Fit();
+}
+#endif // ENABLE_VERSION_CHECK

amule-3.1.0.tar.gz/src/AboutDialog.h Added

amule-3.0.1.tar.gz/src/AddFriend.cpp -> amule-3.1.0.tar.gz/src/AddFriend.cpp Changed

@@ -23,53 +23,55 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "AddFriend.h"		// Interface declarations.
-#include "muuli_wdr.h"		// Needed for addFriendDlg
-#include "amule.h"		// Needed for theApp
-#include "amuleDlg.h"	// Needed for amuleDlg
+#include "AddFriend.h" // Interface declarations.
+#include "muuli_wdr.h" // Needed for addFriendDlg
+#include "amule.h"     // Needed for theApp
+#include "amuleDlg.h"  // Needed for amuleDlg
 #include "FriendList.h"
 #include "NetworkFunctions.h"
 #include "OtherFunctions.h"
 #include "MD4Hash.h"
 #include <common/StringFunctions.h> // Needed for unicode2char
 
-
 wxBEGIN_EVENT_TABLE(CAddFriend, wxDialog)
 	EVT_BUTTON(ID_ADDFRIEND, CAddFriend::OnAddBtn)
 	EVT_BUTTON(ID_CLOSEDLG, CAddFriend::OnCloseBtn)
 wxEND_EVENT_TABLE()
 
-
-CAddFriend::CAddFriend(wxWindow* parent)
-: wxDialog(parent, 9995, _("Add a Friend"), wxDefaultPosition, wxDefaultSize,
-wxDEFAULT_DIALOG_STYLE|wxSYSTEM_MENU)
+CAddFriend::CAddFriend(wxWindow *parent)
+: wxDialog(parent, 9995, _("Add a Friend"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
-	wxSizer* content=addFriendDlg(this, TRUE);
+	wxSizer *content = addFriendDlg(this, TRUE);
 	content->Show(this, TRUE);
 }
 
-void CAddFriend::OnAddBtn(wxCommandEvent& WXUNUSED(evt))
+void CAddFriend::OnAddBtn(wxCommandEvent &WXUNUSED(evt))
 {
 	wxString name = CastChild(ID_USERNAME, wxTextCtrl)->GetValue().Strip(wxString::both);
 	wxString hash = CastChild(ID_USERHASH, wxTextCtrl)->GetValue().Strip(wxString::both);
 	wxString fullip = CastChild(ID_IPADDRESS, wxTextCtrl)->GetValue().Strip(wxString::both);
-	uint16 port = StrToULong( CastChild(ID_IPORT, wxTextCtrl)->GetValue() );
+	uint16 port = StrToULong(CastChild(ID_IPORT, wxTextCtrl)->GetValue());
 	uint32 ip = StringIPtoUint32(fullip);
 
 	if (!ip || !port) {
-		wxMessageBox(_("You have to enter a valid IP and port!"), _("Information"), wxOK | wxICON_INFORMATION, this);
+		wxMessageBox(_("You have to enter a valid IP and port!"),
+			_("Information"),
+			wxOK | wxICON_INFORMATION,
+			this);
 		return;
 	}
 
 	CMD4Hash userhash;
 	if ((!hash.IsEmpty()) && (!userhash.Decode(hash))) {
-		wxMessageBox(_("The specified userhash is not valid!"), _("Information"), wxOK | wxICON_INFORMATION, this);
+		wxMessageBox(_("The specified userhash is not valid!"),
+			_("Information"),
+			wxOK | wxICON_INFORMATION,
+			this);
 		return;
 	};
 
 	// Better than nothing at all...
-	if ( name.IsEmpty() ) {
+	if (name.IsEmpty()) {
 		name = fullip;
 	}
 
@@ -78,8 +80,7 @@
 	EndModal(true); // Friend added
 }
 
-
-void CAddFriend::OnCloseBtn(wxCommandEvent& WXUNUSED(evt))
+void CAddFriend::OnCloseBtn(wxCommandEvent &WXUNUSED(evt))
 {
 	EndModal(false); // Friend not added
 }

amule-3.0.1.tar.gz/src/AddFriend.h -> amule-3.1.0.tar.gz/src/AddFriend.h Changed

amule-3.1.0.tar.gz/src/AddressFamilyPolicy.h Added

@@ -0,0 +1,157 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 ADDRESSFAMILYPOLICY_H
+#define ADDRESSFAMILYPOLICY_H
+
+#include "NetworkAddress.h"
+
+#include <atomic>
+
+/**
+ * Address-family decisions derived from configuration and target addresses.
+ *
+ * IPv4-only is the default. Dual stack requires an explicit SetConfigured() call; providing this
+ * policy does not enable IPv6 or change existing sockets.
+ *
+ * Kademlia remains IPv4: its wire format carries 32-bit addresses and its routing table keys on
+ * them. A socket-family policy cannot widen that format.
+ */
+namespace AddressFamilyPolicy
+{
+
+enum class Families
+{
+	IPv4Only,
+	IPv6Only,
+	DualStack
+};
+
+/**
+ * The configured family set.
+ *
+ * Atomic so socket-opening and name-resolution threads can read it while configuration is set from
+ * the main thread. Relaxed ordering is enough: nothing else is published with it, and a socket
+ * opened in the same instant as a reconfiguration may see either value.
+ */
+inline std::atomic<Families> &ConfiguredStorage() noexcept
+{
+	static std::atomic<Families> families{ Families::IPv4Only };
+	return families;
+}
+
+inline Families Configured() noexcept
+{
+	return ConfiguredStorage().load(std::memory_order_relaxed);
+}
+
+/**
+ * Sets the configured family set explicitly, including opting into dual stack.
+ *
+ * Sockets already open are unaffected -- this decides what the @b next socket does, exactly like
+ * the bind-interface setting next to it.
+ */
+inline void SetConfigured(Families families) noexcept
+{
+	ConfiguredStorage().store(families, std::memory_order_relaxed);
+}
+
+// Both predicates switch rather than test for inequality, so an out-of-range value falls back the
+// same way ResolverFamilyForLookup() does. Comparing against one enumerator made a value outside
+// the enum permit *both* families while the resolver fell back to IPv4Only, and piece 4 will build
+// this from a configuration integer, which is exactly where such a value comes from.
+inline bool PermitsIPv4() noexcept
+{
+	switch (Configured()) {
+	case Families::IPv4Only:
+	case Families::DualStack:
+		return true;
+	case Families::IPv6Only:
+		return false;
+	}
+	return true; // Same IPv4-only fallback as the resolver.
+}
+
+inline bool PermitsIPv6() noexcept
+{
+	switch (Configured()) {
+	case Families::IPv6Only:
+	case Families::DualStack:
+		return true;
+	case Families::IPv4Only:
+		return false;
+	}
+	return false; // Same IPv4-only fallback as the resolver.
+}
+
+/**
+ * Whether @a target is reachable over IPv4, mapped form included.
+ *
+ * One definition, because the asio half asks the same question when it picks a protocol. Two
+ * copies would let a later change to what counts as IPv4, for NAT64 or 6to4, be applied to one
+ * of them and reintroduce a v4 socket opened towards a v6 endpoint.
+ */
+inline bool IsIPv4Reachable(const CNetworkAddress &target) noexcept
+{
+	return target.IsIPv4() || target.IsIPv4Mapped();
+}
+
+/**
+ * Whether a socket may be opened towards @a target at all.
+ *
+ * An IPv4-mapped IPv6 target counts as IPv4: it narrows losslessly, so an IPv4-only configuration
+ * can reach it.
+ *
+ * Absence is refused, and so is the unspecified address in either spelling. It arrives as a
+ * present IPv4 value, so the family test alone would permit it under every configuration, and a
+ * call site replacing an old @c if(ip) guard would dial 0.0.0.0 -- which on Linux connects to
+ * this machine. A value that names nobody is not a target.
+ */
+inline bool Permits(const CNetworkAddress &target) noexcept
+{
+	// Absence names no peer, and neither does the unspecified address. It reaches here as a
+	// present IPv4 value, so the family test would permit it under any configuration, and a
+	// call site replacing an old `if (ip)` guard would dial 0.0.0.0 -- which on Linux connects
+	// to this machine. "May a socket be opened towards this" has to answer no.
+	if (target.IsAbsent() || target.Unmapped().IsUnspecified()) {
+		return false;
+	}
+	if (IsIPv4Reachable(target)) {
+		return PermitsIPv4();
+	}
+	return PermitsIPv6();
+}
+
+/*
+ * Socket protocols, resolver-family selection and wildcard addresses live in
+ * AddressFamilyPolicyAsio.h, because their return types are Boost.Asio values and naming those
+ * here would pull asio's executor machinery into every TU that only wants to ask which family is
+ * permitted. What stays here needs no library: Configured(), the two Permits predicates and
+ * Families are the decision itself.
+ */
+
+} // namespace AddressFamilyPolicy
+
+#endif // ADDRESSFAMILYPOLICY_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/AddressFamilyPolicyAsio.h Added

@@ -0,0 +1,162 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 ADDRESSFAMILYPOLICYASIO_H
+#define ADDRESSFAMILYPOLICYASIO_H
+
+#include "AddressFamilyPolicy.h"
+#include "NetworkAddressAsio.h" // Needed for ToAsioAddress in AsioTargetFor
+
+#include <boost/optional.hpp>
+
+#include "WarningsPush_Asio.h"
+#include <boost/asio/ip/tcp.hpp>
+#include "WarningsPop.h"
+
+/**
+ * Socket-specific address-family policy and Boost.Asio values.
+ *
+ * Split from AddressFamilyPolicy.h so that a translation unit which only needs to know @b whether a
+ * family is permitted does not compile asio's socket headers to find out. Unlike asio's
+ * ip/address.hpp, ip/tcp.hpp reaches the boost/asio/execution headers, which do not survive this
+ * tree's -Werror=deprecated gate unmodified -- see the measurement above the include.
+ *
+ * Include this only from a TU that opens a socket or resolves a name; including it from a public
+ * header puts asio back into the closure of most of src/, which is what the split undoes.
+ */
+namespace AddressFamilyPolicy
+{
+
+/** A protocol and the endpoint address to use with it, guaranteed to be the same family. */
+struct SAsioTarget
+{
+	boost::asio::ip::tcp protocol;
+	boost::asio::ip::address address;
+};
+
+/**
+ * The protocol and address for one connection attempt, decided together.
+ *
+ * Deciding the protocol and the address separately does not work for an IPv4-mapped target. The
+ * family test calls it IPv4, because a mapped address is reachable over IPv4, while
+ * NetworkAddressAsio::ToAsioAddress() preserves the family and hands back an @c address_v6, and
+ * connecting the two gives EAFNOSUPPORT on every mapped peer. Narrowing the address here is what
+ * makes the pair agree, and returning them together is what stops them drifting apart again.
+ *
+ * This supersedes a protocol-only accessor that took a target and returned just the @c tcp. It
+ * was removed rather than left beside this one: a caller reaching for it would pair it with
+ * ToAsioAddress() and land back on that same mismatch, and the protocol for a listening socket
+ * comes from the endpoint built on AnyAddress() rather than from a target.
+ *
+ * Returning one optional also removes the other half of that footgun. With two calls a caller
+ * writes `sock.open(*ProtocolFor(t))` after a separate Permits() check and dereferences an empty
+ * optional if anything moved in between; here there is one decision and one thing to test.
+ *
+ * There is no fallback: a v4 socket opened for a v6 target is how a truncated address turns into
+ * a connection to the wrong host, so a family the configuration refuses yields no pair at all.
+ *
+ * Not @c noexcept, unlike the predicates beside it: NetworkAddressAsio::ToAsioAddress() is an
+ * out-of-line function that makes no such promise, and inheriting one here would turn a future
+ * throw into a terminate rather than something a caller can handle.
+ *
+ * @return The pair, or no value when @a target is absent, unspecified, or of a family the
+ *         configuration does not permit.
+ */
+inline boost::optional<SAsioTarget> AsioTargetFor(const CNetworkAddress &target)
+{
+	if (!Permits(target)) {
+		return boost::none;
+	}
+	const CNetworkAddress narrowed = target.Unmapped();
+	SAsioTarget result = { IsIPv4Reachable(narrowed) ? boost::asio::ip::tcp::v4()
+							 : boost::asio::ip::tcp::v6(),
+		NetworkAddressAsio::ToAsioAddress(narrowed) };
+	return result;
+}
+
+/** An explicit lookup-family restriction; Any means unrestricted, not refusal. */
+enum class ResolverFamily
+{
+	Any,
+	IPv4Only,
+	IPv6Only
+};
+
+/**
+ * The family restriction for a name lookup. Dual stack requests an unrestricted lookup. A single-
+ * family configuration restricts results to that family; DNS results do not establish connectivity.
+ */
+inline ResolverFamily ResolverFamilyForLookup() noexcept
+{
+	switch (Configured()) {
+	case Families::IPv4Only:
+		return ResolverFamily::IPv4Only;
+	case Families::IPv6Only:
+		return ResolverFamily::IPv6Only;
+	case Families::DualStack:
+		return ResolverFamily::Any;
+	}
+	return ResolverFamily::IPv4Only;
+}
+
+/** The IPv4 wildcard, @c 0.0.0.0. */
+inline boost::asio::ip::address AnyIPv4Address() noexcept
+{
+	return boost::asio::ip::address(boost::asio::ip::address_v4::any());
+}
+
+/**
+ * The IPv6 wildcard, @c ::. With @c IPV6_V6ONLY off it also accepts IPv4 peers, which arrive in
+ * IPv4-mapped form.
+ */
+inline boost::asio::ip::address AnyIPv6Address() noexcept
+{
+	return boost::asio::ip::address(boost::asio::ip::address_v6::any());
+}
+
+/**
+ * The wildcard "any address of this machine" for a caller that has not said which family it wants.
+ *
+ * Prefer the IPv4 wildcard whenever IPv4 is permitted, including dual stack, so a single-socket
+ * service is not implicitly moved to another family. Accepting both families on an IPv6 socket
+ * requires explicitly choosing AnyIPv6Address() and clearing @c IPV6_V6ONLY.
+ *
+ * Under @c IPv6Only this returns the IPv6 wildcard, and the caller must then @b set
+ * @c IPV6_V6ONLY rather than leave it at the platform default. Linux defaults it off, so the
+ * listener would accept IPv4 peers as mapped addresses while Permits() refuses mapped addresses
+ * under that configuration: connections arriving that the policy will not talk to. This header
+ * cannot set socket options, so the obligation is the caller's either way.
+ */
+inline boost::asio::ip::address AnyAddress() noexcept
+{
+	if (PermitsIPv4()) {
+		return AnyIPv4Address();
+	}
+	return AnyIPv6Address();
+}
+
+} // namespace AddressFamilyPolicy
+
+#endif // ADDRESSFAMILYPOLICYASIO_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/AmuleApiCredentials.cpp Added

@@ -0,0 +1,93 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "AmuleApiCredentials.h"
+
+#include "Preferences.h"
+
+#include <Credentials.h>
+
+#include <wx/string.h>
+
+#include <string>
+
+namespace
+{
+
+// amuleapi is started with --config-dir=thePrefs::GetConfigDir(), so both
+// processes resolve amuleapi-passwords to the same path.
+std::string ConfigDir()
+{
+	return std::string(thePrefs::GetConfigDir().utf8_str());
+}
+
+} // namespace
+
+namespace AmuleApiCredentials
+{
+
+bool ApplyPrefs(wxString &error)
+{
+	error.clear();
+
+	// Straight translation: the preferences say what the user asked for, webcommon knows what
+	// that means for the stored records. The rules are not repeated here because the amuleapi
+	// CLI and REST endpoint have to follow exactly the same ones.
+	webcommon::CredentialChange change;
+	change.admin_md5 = std::string(thePrefs::GetAmuleApiPass().Lower().utf8_str());
+	change.guest_enabled = thePrefs::GetAmuleApiGuestIsEnabled();
+	change.guest_md5 = std::string(thePrefs::GetAmuleApiGuestPass().Lower().utf8_str());
+
+	std::string err;
+	if (!webcommon::ApplyCredentialChange(ConfigDir(), change, err)) {
+		error = wxString::FromUTF8(err.c_str());
+		return false;
+	}
+
+	// Consumed. A pending password is a request, and replaying it on every later save would
+	// keep re-hashing it and keep it in memory for the rest of the session.
+	thePrefs::SetAmuleApiPass(wxEmptyString);
+	thePrefs::SetAmuleApiGuestPass(wxEmptyString);
+
+	RefreshState();
+	return true;
+}
+
+void RefreshState()
+{
+	webcommon::Credentials creds;
+	std::string err;
+	if (!webcommon::LoadCredentialsFile(ConfigDir(), creds, err)) {
+		// A corrupt file is amuleapi's problem to report -- it refuses to start and names
+		// the bad key. Here it only means we cannot say what is configured, so claim
+		// nothing rather than guess.
+		thePrefs::SetAmuleApiAdminIsSet(false);
+		thePrefs::SetAmuleApiGuestIsEnabled(false);
+		return;
+	}
+	thePrefs::SetAmuleApiAdminIsSet(!creds.admin.empty());
+	thePrefs::SetAmuleApiGuestIsEnabled(!creds.guest.empty());
+}
+
+} // namespace AmuleApiCredentials

amule-3.1.0.tar.gz/src/AmuleApiCredentials.h Added

@@ -0,0 +1,75 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 AMULEAPICREDENTIALS_H
+#define AMULEAPICREDENTIALS_H
+
+class wxString;
+
+/**
+ * aMule's side of amuleapi's admin/guest credentials.
+ *
+ * The credentials live in one file, amuleapi-passwords, in the aMule config dir. amuleapi reads it;
+ * amuleapi, amuled and monolithic aMule all write it. The format and the hashing belong to
+ * webcommon/Credentials.h so the three cannot drift apart -- this header is only the glue between
+ * that store and aMule's preferences.
+ *
+ * Not compiled into amulegui: a remote GUI has no local credential file, and its config dir belongs
+ * to another machine. amulegui asks the daemon to make the change over EC, and the daemon lands
+ * here.
+ */
+namespace AmuleApiCredentials
+{
+
+/**
+ * Writes whatever the preferences are currently asking for into amuleapi-passwords, then refreshes
+ * the state mirrors.
+ *
+ * The two password preferences are pending requests, not stored values:
+ *
+ *  - a non-empty admin digest sets the admin password;
+ *  - guest disabled clears the guest credential, which is what turns guest access off;
+ *  - guest enabled with a non-empty digest sets the guest password;
+ *  - guest enabled with an empty digest leaves the stored guest password alone, so an EC client can
+ *    change the port without resending a password it can never read back.
+ *
+ * Each applied digest is cleared from the preferences afterwards, so the request is not replayed on
+ * the next save.
+ *
+ * Returns false and fills `error` if the file could not be written. Preferences applied before the
+ * failure stay applied -- each role is written separately, and a half-applied change is better left
+ * visible than silently rolled back to a password the user thinks they replaced.
+ */
+bool ApplyPrefs(wxString &error);
+
+/**
+ * Reads amuleapi-passwords and updates the "admin is set" / "guest is enabled" preference mirrors
+ * from it. Called at startup and after every change, so the preferences dialog shows what is
+ * actually stored rather than what was last typed.
+ */
+void RefreshState();
+
+} // namespace AmuleApiCredentials
+
+#endif // AMULEAPICREDENTIALS_H

amule-3.1.0.tar.gz/src/AppImageEnv.cpp Added

@@ -0,0 +1,95 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+
+#include "AppImageEnv.h"
+
+#include <wx/string.h>
+#include <wx/tokenzr.h>
+#include <wx/utils.h>
+
+#include <cstdlib>
+
+namespace
+{
+
+// The AppImage runtime (and our AppRun) export APPDIR = the squashfs mount
+// point. Its presence is what tells us we're running from inside a bundle.
+wxString GetAppDir()
+{
+	const char *env = getenv("APPDIR");
+	return env ? wxString::FromUTF8(env) : wxString();
+}
+
+} // namespace
+
+namespace AppImageEnv
+{
+
+bool GetSanitizedExecEnv(wxExecuteEnv &env)
+{
+	const wxString appdir = GetAppDir();
+	if (appdir.IsEmpty()) {
+		// Not inside an AppImage: nothing to strip, inherit the environment.
+		return false;
+	}
+
+	wxEnvVariableHashMap current;
+	if (!wxGetEnvMap(&current)) {
+		return false;
+	}
+
+	// A path component belongs to the bundle when it is $APPDIR itself or sits beneath it.
+	// Strip such components from every variable; a variable whose whole value was bundle-owned
+	// is dropped. Deliberately generic rather than a fixed LD_LIBRARY_PATH/GTK_PATH list, so
+	// the module- and data-path variables the linuxdeploy GTK hooks inject are covered too.
+	const wxString prefix = appdir + wxT("/");
+	for (const auto &var : current) {
+		const wxString &value = var.second;
+		if (!value.Contains(appdir)) {
+			env.envvar.first = value;
+			continue;
+		}
+		wxString kept;
+		wxStringTokenizer parts(value, wxT(":"), wxTOKEN_RET_EMPTY_ALL);
+		while (parts.HasMoreTokens()) {
+			const wxString part = parts.GetNextToken();
+			if (part == appdir || part.StartsWith(prefix)) {
+				// Bundle-owned entry -- drop it so the child resolves the
+				// host's system copy instead.
+				continue;
+			}
+			if (!kept.IsEmpty()) {
+				kept << wxT(":");
+			}
+			kept << part;
+		}
+		if (!kept.IsEmpty()) {
+			env.envvar.first = kept;
+		}
+		// else: every component was bundle-owned -> omit the variable.
+	}
+	return true;
+}
+
+} // namespace AppImageEnv

amule-3.1.0.tar.gz/src/AppImageEnv.h Added

@@ -0,0 +1,48 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+
+#ifndef APPIMAGEENV_H
+#define APPIMAGEENV_H
+
+#include <wx/utils.h> // wxExecuteEnv
+
+namespace AppImageEnv
+{
+
+// Fill `env` with a copy of the current environment that is safe for launching an external, non-
+// bundled program: the preview player, the configured web browser, a user-event command. Inside an
+// AppImage, every search-path entry pointing into the bundle ($APPDIR) is stripped so the child
+// loads the host's system libraries and modules instead of the older bundled copies; otherwise a
+// GnuTLS-linked host program picks up the bundle's stale libnghttp2 and dies with an undefined-
+// symbol error (#334). True when a sanitized environment was produced (pass &env to wxExecute);
+// false when not inside an AppImage, in which case the child should inherit the environment
+// unchanged.
+//
+// Lives in COMMON so both the daemon and the GUI can share it; it has no GUI dependencies and is a
+// no-op on every platform that does not set $APPDIR.
+bool GetSanitizedExecEnv(wxExecuteEnv &env);
+
+} // namespace AppImageEnv
+
+#endif // APPIMAGEENV_H

amule-3.0.1.tar.gz/src/AppImageIntegration.cpp -> amule-3.1.0.tar.gz/src/AppImageIntegration.cpp Changed

@@ -25,9 +25,11 @@
 #include "AppImageIntegration.h"
 
 #include "amule.h"
+#include "AppImageEnv.h" // Needed for GetSanitizedExecEnv
 #include "Logger.h"
 #include "Preferences.h"
 
+#include <wx/arrstr.h>
 #include <wx/dir.h>
 #include <wx/file.h>
 #include <wx/filefn.h>
@@ -40,35 +42,36 @@
 #include <wx/textfile.h>
 #include <wx/utils.h>
 
+#include <vector> // Needed for the argv vector in RunHelper
+
 #include <cstdlib>
+#include <sys/stat.h>
 #include <unistd.h>
 
+namespace
+{
 
-namespace {
-
-// AppImage's AppRun exports both env vars: APPIMAGE = the original .AppImage
-// path the user invoked; APPDIR = the squashfs mount point. We need both —
-// APPIMAGE for the rewritten Exec= line so launcher-clicks invoke the image
-// at its real on-disk path, APPDIR to find the bundled .desktop and icons.
+// AppRun exports both env vars: APPIMAGE is the original .AppImage path the user invoked, APPDIR
+// the squashfs mount point. Both are needed -- APPIMAGE for the rewritten Exec= line, APPDIR to
+// find the bundled .desktop and icons.
 wxString GetAppImagePath()
 {
-	const char* env = getenv("APPIMAGE");
+	const char *env = getenv("APPIMAGE");
 	return env ? wxString::FromUTF8(env) : wxString();
 }
 
 wxString GetAppDir()
 {
-	const char* env = getenv("APPDIR");
+	const char *env = getenv("APPDIR");
 	return env ? wxString::FromUTF8(env) : wxString();
 }
 
-// Resolve the XDG user data dir per the basedir spec. Don't derive from
-// wxStandardPaths::GetUserDataDir() — wx returns "$HOME/.<appname>" for
-// aMule (legacy dot-prefixed dir), not the canonical XDG location, so
-// any path arithmetic on top of it lands in the wrong tree.
+// Resolve the XDG user data dir per the basedir spec. Not derived from
+// wxStandardPaths::GetUserDataDir(), which returns the legacy "$HOME/.<appname>" for aMule rather
+// than the canonical XDG location.
 wxString GetUserDataHome()
 {
-	const char* xdg = getenv("XDG_DATA_HOME");
+	const char *xdg = getenv("XDG_DATA_HOME");
 	if (xdg && *xdg) {
 		return wxString::FromUTF8(xdg);
 	}
@@ -85,15 +88,19 @@
 	return GetUserDataHome() + wxT("/icons");
 }
 
-// Read the bundled .desktop, swap Exec= and TryExec= to point at $APPIMAGE,
-// and write the result to ~/.local/share/applications/org.amule.aMule.desktop.
-// Returns true on success.
-bool InstallDesktopFile(const wxString& appimagePath, const wxString& sourceDesktop, const wxString& destDesktop)
+wxString GetUserMimePackagesDir()
+{
+	return GetUserDataHome() + wxT("/mime/packages");
+}
+
+// Read the bundled .desktop, swap Exec= and TryExec= to point at $APPIMAGE, and write the result to
+// ~/.local/share/applications/org.amule.aMule.desktop. Returns true on success.
+bool InstallDesktopFile(
+	const wxString &appimagePath, const wxString &sourceDesktop, const wxString &destDesktop)
 {
 	wxTextFile in(sourceDesktop);
 	if (!in.Open()) {
-		AddDebugLogLineC(logGeneral,
-			wxT("AppImageIntegration: failed to open ") + sourceDesktop);
+		AddDebugLogLineC(logGeneral, wxT("AppImageIntegration: failed to open ") + sourceDesktop);
 		return false;
 	}
 
@@ -102,18 +109,19 @@
 		out.Open();
 		out.Clear();
 	} else if (!out.Create()) {
-		AddDebugLogLineC(logGeneral,
-			wxT("AppImageIntegration: failed to create ") + destDesktop);
+		AddDebugLogLineC(logGeneral, wxT("AppImageIntegration: failed to create ") + destDesktop);
 		return false;
 	}
 
 	for (size_t i = 0; i < in.GetLineCount(); ++i) {
 		wxString line = ini;
 		if (line.StartsWith(wxT("Exec="))) {
-			// Quote the AppImage path so spaces survive; %F passes file
-			// arguments from the shell when the launcher is invoked with
-			// drag-and-drop or "Open With".
-			line = wxT("Exec=\"") + appimagePath + wxT("\" %F");
+			// Quote the AppImage path so spaces survive. %U matches the shipped
+			// org.amule.aMule.desktop: aMule accepts ed2k:// and magnet: URLs plus
+			// .emulecollection paths and file:// URLs, any number of them. Must stay in
+			// step with the shipped file, which was %F once and silently swallowed URL
+			// clicks.
+			line = wxT("Exec=\"") + appimagePath + wxT("\" %U");
 		} else if (line.StartsWith(wxT("TryExec="))) {
 			line = wxT("TryExec=") + appimagePath;
 		}
@@ -126,29 +134,34 @@
 	return ok;
 }
 
-// Walk $APPDIR/usr/share/icons/hicolor and mirror the org.amule.aMule.* PNG
-// files into ~/.local/share/icons/hicolor preserving the size subdirs.
-// Best-effort: any single copy failure is logged but doesn't abort the rest.
-bool InstallIcons(const wxString& appdir, const wxString& userIconsDir)
+// Walk $APPDIR/usr/share/icons/hicolor and mirror the org.amule.aMule.* PNG files into
+// ~/.local/share/icons/hicolor, preserving the size subdirs. Best-effort: any single copy failure
+// is logged but does not abort the rest.
+bool InstallIcons(const wxString &appdir, const wxString &userIconsDir)
 {
 	const wxString sourceHicolor = appdir + wxT("/usr/share/icons/hicolor");
 	if (!wxDirExists(sourceHicolor)) {
-		AddDebugLogLineC(logGeneral,
-			wxT("AppImageIntegration: hicolor tree missing at ") + sourceHicolor);
+		AddDebugLogLineC(
+			logGeneral, wxT("AppImageIntegration: hicolor tree missing at ") + sourceHicolor);
 		return false;
 	}
 
+	// Two name shapes to collect: the application icons (org.amule.aMule.* under apps/) and the
+	// icon for the collection file type, whose name is dictated by the icon naming spec -- the
+	// MIME type with '/' replaced by '-' -- and so does not carry the app id.
 	wxArrayString found;
 	wxDir::GetAllFiles(sourceHicolor, &found, wxT("org.amule.aMule.*"), wxDIR_FILES | wxDIR_DIRS);
+	wxDir::GetAllFiles(
+		sourceHicolor, &found, wxT("application-x-emule-collection.*"), wxDIR_FILES | wxDIR_DIRS);
 	if (found.IsEmpty()) {
-		AddDebugLogLineC(logGeneral,
-			wxT("AppImageIntegration: no org.amule.aMule.* icons under ") + sourceHicolor);
+		AddDebugLogLineC(
+			logGeneral, wxT("AppImageIntegration: no aMule icons under ") + sourceHicolor);
 		return false;
 	}
 
 	bool anyOk = false;
 	for (size_t i = 0; i < found.GetCount(); ++i) {
-		const wxString& src = foundi;
+		const wxString &src = foundi;
 		wxString relative = src.Mid(sourceHicolor.length());
 		wxString dest = userIconsDir + wxT("/hicolor") + relative;
 
@@ -167,17 +180,87 @@
 	return anyOk;
 }
 
-// update-desktop-database and gtk-update-icon-cache exist on every desktop
-// distro that ships a .desktop file system, but we don't fail integration
-// if they're missing — modern compositors inotify-watch the dirs and pick
-// up new files within seconds anyway. wxExecute with wxEXEC_SYNC still
-// returns instantly if the binary isn't found.
-void RefreshSystemCaches(const wxString& userAppsDir, const wxString& userIconsDir)
+// Copy the bundled shared-mime-info package into ~/.local/share/mime/packages so the desktop learns
+// what a .emulecollection is. Without it the file is sniffed as text/plain or application/octet-
+// stream, the MimeType= line never matches, and aMule is absent from the file manager's "Open
+// With". A system package gets this from CMake; an AppImage has no packager.
+bool InstallMimePackage(const wxString &appdir, const wxString &userMimePackagesDir)
+{
+	const wxString source = appdir + wxT("/usr/share/mime/packages/org.amule.aMule.xml");
+	if (!wxFileExists(source)) {
+		AddDebugLogLineC(logGeneral, wxT("AppImageIntegration: mime package missing at ") + source);
+		return false;
+	}
+
+	wxFileName destPath(userMimePackagesDir + wxT("/org.amule.aMule.xml"));
+	if (!destPath.DirExists()) {
+		destPath.Mkdir(0755, wxPATH_MKDIR_FULL);
+	}
+
+	const wxString dest = destPath.GetFullPath();
+	if (!wxCopyFile(source, dest, true)) {
+		AddDebugLogLineC(
+			logGeneral, wxT("AppImageIntegration: copy failed: ") + source + wxT(" -> ") + dest);
+		return false;
+	}
+	return true;
+}
+
+// Run a helper with its arguments passed as an argv vector rather than as one command string. The
+// string form of wxExecute does its own tokenising and hands the quote characters through to the
+// program, so `cmd "/home/me/dir"` arrives as a path that literally starts with a quote. Quoting
+// was there to survive spaces in $HOME; argv gives that for free and without a shell.
+static void RunHelper(const wxString &program, const wxArrayString &args)
+{
+	std::vector<wxCharBuffer> storage;
+	std::vector<const char *> argv;
+	storage.reserve(args.GetCount() + 1);
+
+	storage.emplace_back(program.mb_str(wxConvUTF8));
+	argv.push_back(storage.back().data());
+	for (size_t i = 0; i < args.GetCount(); ++i) {
+		storage.emplace_back(argsi.mb_str(wxConvUTF8));
+		argv.push_back(storage.back().data());
+	}
+	argv.push_back(nullptr);
+
+	// These are system binaries, and AppRun has put the AppImage's own library directory at the
+	// front of LD_LIBRARY_PATH for our sake. A child inheriting that loads our bundled glib
+	// rather than the host's and dies before doing any work -- update-mime-database exits with
+	// "undefined symbol: g_string_free_and_steal". Same class of failure as #334, so reuse its
+	// helper.
+	wxExecuteEnv execEnv;
+	const bool sanitized = AppImageEnv::GetSanitizedExecEnv(execEnv);
+	const int flags = wxEXEC_SYNC | wxEXEC_NODISABLE | wxEXEC_NOEVENTS;
+
+	wxExecute(argv.data(), flags, nullptr, sanitized ? &execEnv : nullptr);
+}
+
+// update-desktop-database, gtk-update-icon-cache and update-mime-database exist on every desktop
+// distro that ships a .desktop file system, and integration does not fail if they are missing.
+//
+// The .desktop and icon caches have a safety net -- desktop environments watch those directories
+// and rebuild within seconds, which is why the broken quoting above went unnoticed for so long. The
+// shared-mime-info database has no such watcher: without update-mime-database the collection type
+// stays unknown and a double-click opens whatever handles text/plain.
+void RefreshSystemCaches(
+	const wxString &userAppsDir, const wxString &userIconsDir, const wxString &userMimeDir)
 {
-	wxExecute(wxT("update-desktop-database \"") + userAppsDir + wxT("\""),
-		wxEXEC_SYNC | wxEXEC_NODISABLE | wxEXEC_NOEVENTS);
-	wxExecute(wxT("gtk-update-icon-cache -f -t \"") + userIconsDir + wxT("/hicolor\""),
-		wxEXEC_SYNC | wxEXEC_NODISABLE | wxEXEC_NOEVENTS);
+	wxArrayString args;
+
+	args.Add(userAppsDir);
+	RunHelper(wxT("update-desktop-database"), args);
+
+	args.Clear();
+	args.Add(wxT("-f"));
+	args.Add(wxT("-t"));
+	args.Add(userIconsDir + wxT("/hicolor"));
+	RunHelper(wxT("gtk-update-icon-cache"), args);
+
+	args.Clear();
+	// Takes the mime dir itself, not the packages/ subdir inside it.
+	args.Add(userMimeDir);
+	RunHelper(wxT("update-mime-database"), args);
 }
 
 bool DesktopFileAlreadyInstalled()
@@ -185,16 +268,99 @@
 	return wxFileExists(GetUserApplicationsDir() + wxT("/org.amule.aMule.desktop"));
 }
 
-} // anonymous namespace
+wxString GetUserBinDir()
+{
+	return wxGetUserHome() + wxT("/.local/bin");
+}
 
+// True if `path` names an existing symlink, broken or intact. Distinct from wxFileExists, which is
+// also true for a regular file and for a symlink pointing at a missing target -- the difference
+// decides whether it is safe to replace with our own symlink. POSIX-only; MinGW-w64 has neither
+// lstat nor S_ISLNK, and the whole AppImage path is a no-op there anyway.
+#ifdef __WXGTK__
+bool IsSymlink(const wxString &path)
+{
+	struct stat st;
+	return lstat((const char *)path.mb_str(wxConvUTF8), &st) == 0 && S_ISLNK(st.st_mode);
+}
+#endif
+
+// The names AppRun's argv0-dispatch case knows about. Any name AppRun does not recognize falls
+// back to `amule`, so a stale symlink to a since-removed binary still launches the monolithic GUI.
+// Order matches the AppRun case statement.
+const wxString kAppRunNames = {
+	wxT("amule"),
+	wxT("amuled"),
+	wxT("amulegui"),
+	wxT("amulecmd"),
+	wxT("amuleweb"),
+	wxT("amuleapi"),
+	wxT("ed2k"),
+	wxT("cas"),
+	wxT("wxcas"),
+	wxT("alc"),
+	wxT("alcc"),
+};
+
+// Create ~/.local/bin/<name> symlinks for each AppRun-dispatched binary this AppImage actually
+// bundles, returning the count created. Refuses to clobber a pre-existing regular file at any of
+// these paths, protecting a user's distro-packaged binary; existing symlinks ARE replaced, so re-
+// installing a new AppImage refreshes the targets. POSIX-only, and never called on Windows or macOS
+// (ShouldPrompt returns false there), but it still has to compile.
+#ifdef __WXGTK__
+int InstallCommandSymlinks(const wxString &appdir, const wxString &appimagePath)
+{
+	const wxString binDir = GetUserBinDir();
+	if (!wxDirExists(binDir) && !wxFileName::Mkdir(binDir, 0755, wxPATH_MKDIR_FULL)) {
+		AddDebugLogLineC(logGeneral, wxT("AppImageIntegration: failed to create ") + binDir);
+		return 0;
+	}
+
+	int created = 0;
+	for (const wxString &name : kAppRunNames) {
+		// Only if this AppImage actually bundles the binary.
+		const wxString bundled = appdir + wxT("/usr/bin/") + name;
+		if (!wxFileExists(bundled)) {
+			continue;
+		}
+		const wxString linkPath = binDir + wxT("/") + name;
+		if (wxFileExists(linkPath) && !IsSymlink(linkPath)) {
+			AddDebugLogLineC(logGeneral,
+				wxT("AppImageIntegration: not clobbering existing non-symlink ") + linkPath);
+			continue;
+		}
+		if (IsSymlink(linkPath)) {
+			wxRemoveFile(linkPath);
+		}
+		if (symlink((const char *)appimagePath.mb_str(wxConvUTF8),
+			    (const char *)linkPath.mb_str(wxConvUTF8)) == 0) {
+			++created;
+		} else {
+			AddDebugLogLineC(
+				logGeneral, wxT("AppImageIntegration: symlink failed for ") + linkPath);
+		}
+	}
+	return created;
+}
+#else
+// Non-GTK stub - never called at runtime (PromptAndInstall bails
+// early via ShouldPrompt on !__WXGTK__), but needs to link.
+int InstallCommandSymlinks(const wxString &, const wxString &)
+{
+	return 0;
+}
+#endif // __WXGTK__
+
+} // anonymous namespace
 
-namespace AppImageIntegration {
+namespace AppImageIntegration
+{
 
 bool ShouldPrompt()
 {
 #ifdef __WXGTK__
 	if (GetAppImagePath().IsEmpty()) {
-		// Not running from an AppImage — distro install or dev build.
+		// Not running from an AppImage -- distro install or dev build.
 		return false;
 	}
 	if (thePrefs::IsAppImageIntegrationDeclined()) {
@@ -202,7 +368,7 @@
 		return false;
 	}
 	if (DesktopFileAlreadyInstalled()) {
-		// Already installed — most likely from a previous "Yes" click.
+		// Already installed -- most likely from a previous "Yes" click.
 		return false;
 	}
 	return true;
@@ -211,17 +377,18 @@
 #endif
 }
 
-void PromptAndInstall(wxWindow* parent)
+void PromptAndInstall(wxWindow *parent)
 {
 	if (!ShouldPrompt()) {
 		return;
 	}
 
 	wxRichMessageDialog dlg(parent,
-		_("aMule can install a desktop launcher and icon into your home directory "
-		  "so it appears in your application menu like a regularly installed app. "
-		  "This is reversible — the files live under ~/.local/share/applications "
-		  "and ~/.local/share/icons and can be removed at any time.\n\n"
+		_("aMule can install desktop launchers, icons, and shell command "
+		  "shortcuts into your home directory so it appears in your application "
+		  "menu like a regularly installed app.\n\n"
+		  "This is reversible - the files live under ~/.local/share/applications, "
+		  "~/.local/share/icons, and ~/.local/bin, and can be removed at any time.\n\n"
 		  "Install desktop integration now?"),
 		_("Add aMule to your application menu?"),
 		wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION);
@@ -245,7 +412,9 @@
 	const wxString appimagePath = GetAppImagePath();
 	const wxString appdir = GetAppDir();
 	if (appdir.IsEmpty()) {
-		const wxString msg = _("Cannot install desktop integration: the APPDIR environment variable is not set. This usually means the AppImage was launched in a non-standard way.");
+		const wxString msg =
+			_("Cannot install desktop integration: the APPDIR environment variable is not set. "
+			  "This usually means the AppImage was launched in a non-standard way.");
 		AddLogLineC(msg);
 		wxMessageBox(msg, _("aMule integration failed"), wxOK | wxICON_ERROR, parent);
 		return;
@@ -255,34 +424,66 @@
 	const wxString userIconsDir = GetUserIconsDir();
 
 	if (!wxDirExists(userAppsDir) && !wxFileName::Mkdir(userAppsDir, 0755, wxPATH_MKDIR_FULL)) {
-		const wxString msg = wxString::Format(
-			_("Cannot install desktop integration: failed to create %s. Check that your home directory is writable."),
-			userAppsDir);
+		const wxString msg =
+			wxString::Format(_("Cannot install desktop integration: failed to create %s. Check "
+					   "that your home directory is writable."),
+				userAppsDir);
 		AddLogLineC(msg);
 		wxMessageBox(msg, _("aMule integration failed"), wxOK | wxICON_ERROR, parent);
 		return;
 	}
 
-	const wxString sourceDesktop = appdir + wxT("/usr/share/applications/org.amule.aMule.desktop");
-	const wxString destDesktop = userAppsDir + wxT("/org.amule.aMule.desktop");
-
-	if (!InstallDesktopFile(appimagePath, sourceDesktop, destDesktop)) {
-		const wxString msg = wxString::Format(
-			_("Cannot install desktop integration: failed to write %s. Check that your home directory is writable."),
-			destDesktop);
+	// Shell-command shortcuts first: the amulegui .desktop file installed below points at
+	// ~/.local/bin/amulegui to route clicks to the correct AppRun dispatch. Without that
+	// symlink the Exec= still resolves via PATH lookup.
+	const int symlinkCount = InstallCommandSymlinks(appdir, appimagePath);
+
+	// Install org.amule.aMule.desktop (monolithic amule). Exec= points
+	// straight at the AppImage - default AppRun dispatch is amule.
+	const wxString sourceAmuleDesktop = appdir + wxT("/usr/share/applications/org.amule.aMule.desktop");
+	const wxString destAmuleDesktop = userAppsDir + wxT("/org.amule.aMule.desktop");
+	if (!InstallDesktopFile(appimagePath, sourceAmuleDesktop, destAmuleDesktop)) {
+		const wxString msg = wxString::Format(_("Cannot install desktop integration: failed to write "
+							"%s. Check that your home directory is writable."),
+			destAmuleDesktop);
 		AddLogLineC(msg);
 		wxMessageBox(msg, _("aMule integration failed"), wxOK | wxICON_ERROR, parent);
 		return;
 	}
 
+	// Install org.amule.aMule.gui.desktop (remote-GUI amulegui). Exec= points at the
+	// ~/.local/bin/amulegui symlink so AppRun's basename dispatch picks amulegui rather than
+	// the default amule. Attempted only if the AppImage bundles amulegui AND the symlink was
+	// created.
+	const wxString guiSource = appdir + wxT("/usr/share/applications/org.amule.aMule.gui.desktop");
+	const wxString guiSymlink = GetUserBinDir() + wxT("/amulegui");
+	if (wxFileExists(guiSource) && wxFileExists(guiSymlink)) {
+		const wxString destGuiDesktop = userAppsDir + wxT("/org.amule.aMule.gui.desktop");
+		if (!InstallDesktopFile(guiSymlink, guiSource, destGuiDesktop)) {
+			AddDebugLogLineC(logGeneral,
+				wxT("AppImageIntegration: failed to install amulegui .desktop; "
+				    "amulegui menu entry and scheme-handler association will not "
+				    "work until re-integrated"));
+		}
+	}
+
 	InstallIcons(appdir, userIconsDir);
-	RefreshSystemCaches(userAppsDir, userIconsDir);
+	// Best-effort, like the icons: no mime package just means
+	// .emulecollection files aren't offered to aMule in the file manager.
+	InstallMimePackage(appdir, GetUserMimePackagesDir());
+	RefreshSystemCaches(userAppsDir, userIconsDir, GetUserDataHome() + wxT("/mime"));
 
-	AddLogLineN(_("AppImage integration: aMule added to your application menu."));
+	AddLogLineN(wxString::Format(
+		_("AppImage integration: aMule added to your application menu (%d shell shortcuts under "
+		  "~/.local/bin)."),
+		symlinkCount));
 
 	wxMessageDialog success(parent,
-		_("aMule has been added to your application menu. You can now launch it from your applications list, and the launcher will run this same AppImage.\n\n"
-		  "On some desktops, aMule may need to restart for the dock / taskbar icon to bind to the new launcher entry. Modern Wayland compositors (GNOME, KDE) pick this up live, but a restart is the safe fallback if the icon stays generic.\n\n"
+		_("aMule has been added to your application menu. You can now launch it from your "
+		  "applications list, and the launcher will run this same AppImage.\n\n"
+		  "On some desktops, aMule may need to restart for the dock / taskbar icon to bind to the "
+		  "new launcher entry. Modern Wayland compositors (GNOME, KDE) pick this up live, but a "
+		  "restart is the safe fallback if the icon stays generic.\n\n"
 		  "Restart aMule now?"),
 		_("aMule installed"),
 		wxYES_NO | wxNO_DEFAULT | wxICON_INFORMATION);
@@ -292,17 +493,16 @@
 		return;
 	}
 
-	// Spawn a detached shell that polls our PID and re-execs the AppImage
-	// once we fully exit. This gives aMule's normal shutdown path time to
-	// save partfiles, release the EC port, etc., before the new instance
-	// tries to grab the same locks.
-	const wxString relaunchCmd = wxString::Format(
-		wxT("sh -c 'while kill -0 %d 2>/dev/null; do sleep 0.2; done; exec \"%s\"'"),
-		static_cast<int>(getpid()),
-		appimagePath);
+	// Spawn a detached shell that polls our PID and re-execs the AppImage once we fully exit,
+	// so aMule's normal shutdown has time to save partfiles and release the EC port before the
+	// new instance grabs the same locks.
+	const wxString relaunchCmd =
+		wxString::Format(wxT("sh -c 'while kill -0 %d 2>/dev/null; do sleep 0.2; done; exec \"%s\"'"),
+			static_cast<int>(getpid()),
+			appimagePath);
 	wxExecute(relaunchCmd, wxEXEC_ASYNC | wxEXEC_MAKE_GROUP_LEADER);
 
-	// Trigger normal close on the main dialog — same path as red X / File>Quit.
+	// Trigger normal close on the main dialog -- same path as red X / File>Quit.
 	if (parent) {
 		parent->Close(true);
 	}

amule-3.0.1.tar.gz/src/AppImageIntegration.h -> amule-3.1.0.tar.gz/src/AppImageIntegration.h Changed

@@ -27,25 +27,23 @@
 
 #include <wx/window.h>
 
+namespace AppImageIntegration
+{
 
-namespace AppImageIntegration {
-
-// Whether we're running from inside an AppImage AND the user hasn't yet
-// installed launcher integration AND hasn't opted out via prefs. When true,
-// the GUI app should call PromptAndInstall() once the main frame is realised.
+// Whether we are running from inside an AppImage AND the user has not yet installed launcher
+// integration AND has not opted out via prefs. When true, the GUI app should call
+// PromptAndInstall() once the main frame is realised.
 bool ShouldPrompt();
 
-// Show a wxRichMessageDialog asking whether to install
-// ~/.local/share/applications + ~/.local/share/icons entries pointing at the
-// running AppImage. The dialog includes a "Don't ask again" checkbox.
-//
-// On Yes: copies the bundled .desktop and hicolor icons into the user's home,
-// rewrites Exec= to point at $APPIMAGE, and runs update-desktop-database /
-// gtk-update-icon-cache best-effort.
-// On No: nothing this run; the prompt fires again on next launch.
-// "Don't ask again" checked: sets the prefs flag so we never prompt again,
-// regardless of which button was clicked.
-void PromptAndInstall(wxWindow* parent);
+// Show a wxRichMessageDialog asking whether to install ~/.local/share/applications +
+// ~/.local/share/icons entries pointing at the running AppImage. The dialog includes a "Don't ask
+// again" checkbox.
+//
+// On Yes: copies the bundled .desktop and hicolor icons into the user's home, rewrites Exec= to
+// point at $APPIMAGE, and runs update-desktop-database / gtk-update-icon-cache best-effort. On No:
+// nothing this run, and the prompt fires again on next launch. "Don't ask again" checked sets the
+// prefs flag so we never prompt again, whichever button was clicked.
+void PromptAndInstall(wxWindow *parent);
 
 } // namespace AppImageIntegration

amule-3.0.1.tar.gz/src/ArchSpecific.h -> amule-3.1.0.tar.gz/src/ArchSpecific.h Changed

@@ -29,207 +29,164 @@
 #include "Types.h"
 #include "config.h"
 
+#include <cstring> // Needed for memcpy
+
 #define ENDIAN_SWAP_16(x) (wxUINT16_SWAP_ON_BE(x))
 #define ENDIAN_SWAP_I_16(x) x = wxUINT16_SWAP_ON_BE(x)
 #define ENDIAN_SWAP_32(x) (wxUINT32_SWAP_ON_BE(x))
 #define ENDIAN_SWAP_I_32(x) x = wxUINT32_SWAP_ON_BE(x)
 
-#if ((defined __GNUC__) && __GNUC__ >= 2) || defined (_MSC_VER) || (defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x550))
-	#define ENDIAN_SWAP_64(x) (wxUINT64_SWAP_ON_BE(x))
-	#define ENDIAN_SWAP_I_64(x) x = wxUINT64_SWAP_ON_BE(x)
+#if ((defined __GNUC__) && __GNUC__ >= 2) || defined(_MSC_VER) || \
+	(defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x550))
+#define ENDIAN_SWAP_64(x) (wxUINT64_SWAP_ON_BE(x))
+#define ENDIAN_SWAP_I_64(x) x = wxUINT64_SWAP_ON_BE(x)
 #endif
 
 // ntohs
-#define ENDIAN_NTOHS(x) ( wxUINT16_SWAP_ON_LE(x) )
+#define ENDIAN_NTOHS(x) (wxUINT16_SWAP_ON_LE(x))
 // ntohl
-#define ENDIAN_NTOHL(x) ( wxUINT32_SWAP_ON_LE(x) )
+#define ENDIAN_NTOHL(x) (wxUINT32_SWAP_ON_LE(x))
 // new
-#define ENDIAN_NTOHLL(x) ( wxUINT64_SWAP_ON_LE(x) )
+#define ENDIAN_NTOHLL(x) (wxUINT64_SWAP_ON_LE(x))
 // htons
-#define ENDIAN_HTONS(x) ( wxUINT16_SWAP_ON_LE(x) )
+#define ENDIAN_HTONS(x) (wxUINT16_SWAP_ON_LE(x))
 // htonl
-#define ENDIAN_HTONL(x) ( wxUINT32_SWAP_ON_LE(x) )
+#define ENDIAN_HTONL(x) (wxUINT32_SWAP_ON_LE(x))
 // new
-#define ENDIAN_HTONLL(x) ( wxUINT64_SWAP_ON_LE(x) )
-
+#define ENDIAN_HTONLL(x) (wxUINT64_SWAP_ON_LE(x))
 
 /**
- * Returns the value in the given bytestream.
- *
- * The value is returned exactly as it is found.
+ * Returns the value in the given bytestream, exactly as it is found.
  */
 // \{
-inline uint16 RawPeekUInt16(const void* p);
-inline uint32 RawPeekUInt32(const void* p);
-inline uint64 RawPeekUInt64(const void* p);
+inline uint16 RawPeekUInt16(const void *p);
+inline uint32 RawPeekUInt32(const void *p);
+inline uint64 RawPeekUInt64(const void *p);
 // \}
 
-
-
 /**
- * Writes the specified value into the bytestream.
- *
- * The value is written exactly as it is.
+ * Writes the specified value into the bytestream, exactly as it is.
  */
 // \{
-inline void RawPokeUInt16(void* p, uint16 nVal);
-inline void RawPokeUInt32(void* p, uint32 nVal);
-inline void RawPokeUInt64(void* p, uint64 nVal);
+inline void RawPokeUInt16(void *p, uint16 nVal);
+inline void RawPokeUInt32(void *p, uint32 nVal);
+inline void RawPokeUInt64(void *p, uint64 nVal);
 // \}
 
-
 /**
- * Returns the value in the given bytestream.
- *
- * The value is returned as little-endian.
+ * Returns the value in the given bytestream, as little-endian.
  */
 // \{
-inline uint8 PeekUInt8(const void* p);
-inline uint16 PeekUInt16(const void* p);
-inline uint32 PeekUInt32(const void* p);
-inline uint64 PeekUInt64(const void* p);
+inline uint8 PeekUInt8(const void *p);
+inline uint16 PeekUInt16(const void *p);
+inline uint32 PeekUInt32(const void *p);
+inline uint64 PeekUInt64(const void *p);
 // \}
 
-
 /**
- * Writes the specified value into the bytestream.
- *
- * The value is written as little-endian.
+ * Writes the specified value into the bytestream, as little-endian.
  */
 // \{
-inline void PokeUInt8(void* p, uint8 nVal);
-inline void PokeUInt16(void* p, uint16 nVal);
-inline void PokeUInt32(void* p, uint32 nVal);
-inline void PokeUInt64(void* p, uint64 nVal);
+inline void PokeUInt8(void *p, uint8 nVal);
+inline void PokeUInt16(void *p, uint16 nVal);
+inline void PokeUInt32(void *p, uint32 nVal);
+inline void PokeUInt64(void *p, uint64 nVal);
 // \}
 
-
-#if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(GCC_USES_STRICT_ALIASING)
-	#define ARCHSPECIFIC_USE_MEMCPY
-#endif
-
+// The Raw* helpers below read and write through pointers whose alignment the caller does not
+// control -- packet buffers, and the 16-byte CMD4Hash array, which sits at a 4-byte-aligned offset
+// inside several objects. Reading eight bytes from there via `*(uint64 *)p` is undefined behaviour
+// regardless of the architecture: it is a property of the C++ object model, not of what the CPU
+// tolerates. x86 and aarch64 happen to execute such a load, which is why this went unnoticed for
+// two decades, but the compiler is still entitled to assume the alignment holds and optimise
+// accordingly.
+//
+// So the memcpy form is unconditional rather than selected per-arch. It costs nothing: every
+// compiler this project supports folds a fixed-size memcpy into the same single load or store the
+// cast would have emitted. The old guard listed __arm__, __sparc__ and __mips__ -- 32-bit ARM only,
+// written years before aarch64 existed, and never updated for it.
 
 ///////////////////////////////////////////////////////////////////////////////
 // Peek - helper functions for read-accessing memory without modifying the memory pointer
 
-inline uint16 RawPeekUInt16(const void* p)
+inline uint16 RawPeekUInt16(const void *p)
 {
-#ifndef ARCHSPECIFIC_USE_MEMCPY
-	return *((uint16*)p);
-#else
 	uint16 value;
-	memcpy( &value, p, sizeof( uint16 ) );
+	memcpy(&value, p, sizeof(uint16));
 	return value;
-#endif
 }
 
-
-inline uint32 RawPeekUInt32(const void* p)
+inline uint32 RawPeekUInt32(const void *p)
 {
-#ifndef ARCHSPECIFIC_USE_MEMCPY
-	return *((uint32*)p);
-#else
 	uint32 value;
-	memcpy( &value, p, sizeof( uint32 ) );
+	memcpy(&value, p, sizeof(uint32));
 	return value;
-#endif
 }
 
-
-inline uint64 RawPeekUInt64(const void* p)
+inline uint64 RawPeekUInt64(const void *p)
 {
-#ifndef ARCHSPECIFIC_USE_MEMCPY
-	return *((uint64*)p);
-#else
 	uint64 value;
-	memcpy( &value, p, sizeof( uint64 ) );
+	memcpy(&value, p, sizeof(uint64));
 	return value;
-#endif
 }
 
-
-inline uint8 PeekUInt8(const void* p)
+inline uint8 PeekUInt8(const void *p)
 {
-	return *((uint8*)p);
+	return *((uint8 *)p);
 }
 
-
-inline uint16 PeekUInt16(const void* p)
+inline uint16 PeekUInt16(const void *p)
 {
-	return ENDIAN_SWAP_16( RawPeekUInt16( p ) );
+	return ENDIAN_SWAP_16(RawPeekUInt16(p));
 }
 
-
-inline uint32 PeekUInt32(const void* p)
+inline uint32 PeekUInt32(const void *p)
 {
-	return ENDIAN_SWAP_32( RawPeekUInt32( p ) );
+	return ENDIAN_SWAP_32(RawPeekUInt32(p));
 }
 
-inline uint64 PeekUInt64(const void* p)
+inline uint64 PeekUInt64(const void *p)
 {
-	return ENDIAN_SWAP_64( RawPeekUInt64( p ) );
+	return ENDIAN_SWAP_64(RawPeekUInt64(p));
 }
 
-
-
 ///////////////////////////////////////////////////////////////////////////////
 // Poke - helper functions for write-accessing memory without modifying the memory pointer
 
-
-inline void RawPokeUInt16(void* p, uint16 nVal)
+inline void RawPokeUInt16(void *p, uint16 nVal)
 {
-#ifndef ARCHSPECIFIC_USE_MEMCPY
-	*((uint16*)p) = nVal;
-#else
-	memcpy( p, &nVal, sizeof(uint16) );
-#endif
+	memcpy(p, &nVal, sizeof(uint16));
 }
 
-
-inline void RawPokeUInt32(void* p, uint32 nVal)
+inline void RawPokeUInt32(void *p, uint32 nVal)
 {
-#ifndef ARCHSPECIFIC_USE_MEMCPY
-	*((uint32*)p) = nVal;
-#else
-	memcpy( p, &nVal, sizeof(uint32) );
-#endif
+	memcpy(p, &nVal, sizeof(uint32));
 }
 
-
-inline void RawPokeUInt64(void* p, uint64 nVal)
+inline void RawPokeUInt64(void *p, uint64 nVal)
 {
-#ifndef ARCHSPECIFIC_USE_MEMCPY
-	*((uint64*)p) = nVal;
-#else
-	memcpy( p, &nVal, sizeof(uint64) );
-#endif
+	memcpy(p, &nVal, sizeof(uint64));
 }
 
-
-inline void PokeUInt8(void* p, uint8 nVal)
+inline void PokeUInt8(void *p, uint8 nVal)
 {
-	*((uint8*)p) = nVal;
+	*((uint8 *)p) = nVal;
 }
 
-
-inline void PokeUInt16(void* p, uint16 nVal)
+inline void PokeUInt16(void *p, uint16 nVal)
 {
-	RawPokeUInt16( p, ENDIAN_SWAP_16( nVal ) );
+	RawPokeUInt16(p, ENDIAN_SWAP_16(nVal));
 }
 
-
-inline void PokeUInt32(void* p, uint32 nVal)
+inline void PokeUInt32(void *p, uint32 nVal)
 {
-	RawPokeUInt32( p, ENDIAN_SWAP_32( nVal ) );
+	RawPokeUInt32(p, ENDIAN_SWAP_32(nVal));
 }
 
-inline void PokeUInt64(void* p, uint64 nVal)
+inline void PokeUInt64(void *p, uint64 nVal)
 {
-	RawPokeUInt64( p, ENDIAN_SWAP_64( nVal ) );
+	RawPokeUInt64(p, ENDIAN_SWAP_64(nVal));
 }
 
-// Don't pollute the preprocessor namespace
-#undef ARCHSPECIFIC_USE_MEMCPY
-
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/AsyncDNS.cpp -> amule-3.1.0.tar.gz/src/AsyncDNS.cpp Changed

@@ -24,44 +24,42 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "AsyncDNS.h"	// Interface declaration
+#include "AsyncDNS.h" // Interface declaration
 
-#include "InternalEvents.h"	// Needed for wxEVT_*
+#include "InternalEvents.h"   // Needed for wxEVT_*
 #include "NetworkFunctions.h" // Needed for StringHosttoUint32
 #include "Logger.h"
 
-
-CAsyncDNS::CAsyncDNS(const wxString& ipName, DnsSolveType type, wxEvtHandler* handler, void* socket)
-	: wxThread(wxTHREAD_DETACHED)
-	, m_ipName(ipName.wc_str())		// make a deep copy to to circument the thread-unsafe wxString reference counting
+CAsyncDNS::CAsyncDNS(const wxString &ipName, DnsSolveType type, wxEvtHandler *handler, void *socket)
+: wxThread(wxTHREAD_DETACHED)
+, m_ipName(ipName.wc_str()) // make a deep copy to to circument the thread-unsafe wxString reference counting
 {
 	m_type = type;
 	m_socket = socket;
 	m_handler = handler;
 }
 
-
 wxThread::ExitCode CAsyncDNS::Entry()
 {
 	uint32 result = StringHosttoUint32(m_ipName);
 	uint32 event_id = 0;
-	void* event_data = NULL;
+	void *event_data = NULL;
 
 	switch (m_type) {
-		case DNS_UDP:
-			event_id = wxEVT_CORE_UDP_DNS_DONE;
-			event_data = m_socket;
-			break;
-		case DNS_SOURCE:
-			event_id = wxEVT_CORE_SOURCE_DNS_DONE;
-			event_data = NULL;
-			break;
-		case DNS_SERVER_CONNECT:
-			event_id = wxEVT_CORE_SERVER_DNS_DONE;
-			event_data = m_socket;
-			break;
-		default:
-			AddLogLineN("WRONG TYPE ID ON ASYNC DNS SOLVING!!!");
+	case DNS_UDP:
+		event_id = wxEVT_CORE_UDP_DNS_DONE;
+		event_data = m_socket;
+		break;
+	case DNS_SOURCE:
+		event_id = wxEVT_CORE_SOURCE_DNS_DONE;
+		event_data = NULL;
+		break;
+	case DNS_SERVER_CONNECT:
+		event_id = wxEVT_CORE_SERVER_DNS_DONE;
+		event_data = m_socket;
+		break;
+	default:
+		AddLogLineN(LOG_DIAGNOSTIC("WRONG TYPE ID ON ASYNC DNS SOLVING!!!"));
 	}
 
 	if (event_id) {

amule-3.0.1.tar.gz/src/AsyncDNS.h -> amule-3.1.0.tar.gz/src/AsyncDNS.h Changed

amule-3.0.1.tar.gz/src/AutostartManager.cpp -> amule-3.1.0.tar.gz/src/AutostartManager.cpp Changed

@@ -24,51 +24,47 @@
 
 #include "AutostartManager.h"
 
-#include <wx/app.h>		// Needed for wxTheApp
-#include <wx/filename.h>	// Needed for wxFileName
-#include <wx/log.h>		// Needed for wxLogDebug
-#include <wx/regex.h>		// Needed for wxRegEx (macOS plist parsing)
-#include <wx/stdpaths.h>	// Needed for wxStandardPaths
+#include <wx/app.h>      // Needed for wxTheApp
+#include <wx/filename.h> // Needed for wxFileName
+#include <wx/log.h>      // Needed for wxLogDebug
+#include <wx/regex.h>    // Needed for wxRegEx (macOS plist parsing)
+#include <wx/stdpaths.h> // Needed for wxStandardPaths
 
 #ifdef __WXMSW__
-	#include <windows.h>
-	#include <cwchar>	// Needed for wcslen
-	#include <vector>	// Needed for std::vector buffer in BackendReadTargetPath
+#include <windows.h>
+#include <cwchar> // Needed for wcslen
+#include <vector> // Needed for std::vector buffer in BackendReadTargetPath
 #else
-	#include <climits>	// Needed for PATH_MAX
-	#include <stdlib.h>	// Needed for realpath
-	#include <wx/utils.h>	// Needed for wxGetEnv / wxGetUserHome
-	#include <wx/file.h>	// Needed for wxFile
-	#include <wx/filefn.h>	// Needed for wxRemoveFile
-	#include <wx/tokenzr.h>	// Needed for wxStringTokenizer
+#include <climits>      // Needed for PATH_MAX
+#include <stdlib.h>     // Needed for realpath
+#include <wx/utils.h>   // Needed for wxGetEnv / wxGetUserHome
+#include <wx/file.h>    // Needed for wxFile
+#include <wx/filefn.h>  // Needed for wxRemoveFile
+#include <wx/tokenzr.h> // Needed for wxStringTokenizer
 #endif
 
 // Per-backend low-level helpers (return raw OS state, no policy).
 // Defined in the platform-specific section near the bottom of this file.
 namespace
 {
-	// Reads the autostart entry's target path from the OS store.
-	// Returns wxEmptyString when the entry doesn't exist OR can't be
-	// parsed. Doesn't validate the path against the filesystem.
-	wxString BackendReadTargetPath();
-
-	// Writes/overwrites the autostart entry to point at `executable`.
-	// Returns true on success.
-	bool BackendWrite(const wxString &executable);
-
-	// Removes the autostart entry. Idempotent — returns true if the
-	// entry didn't exist either.
-	bool BackendRemove();
-}
+// Reads the autostart entry's target path from the OS store. Empty when the entry does not exist or
+// cannot be parsed. Does not validate the path against the filesystem.
+wxString BackendReadTargetPath();
+
+// Writes/overwrites the autostart entry to point at `executable`.
+// Returns true on success.
+bool BackendWrite(const wxString &executable);
 
+// Removes the autostart entry. Idempotent -- returns true if the
+// entry didn't exist either.
+bool BackendRemove();
+} // namespace
 
 wxString AutostartManager::GetCanonicalExecutablePath()
 {
-	// wxStandardPaths::GetExecutablePath() wraps the OS native call
-	// (GetModuleFileNameW on Windows, _NSGetExecutablePath on macOS,
-	// /proc/self/exe readlink on Linux), then on POSIX we resolve
-	// any intermediate symlinks via realpath() so AppImage / .app
-	// bundle moves are detected correctly.
+	// wxStandardPaths::GetExecutablePath() wraps the OS native call; on POSIX we then resolve
+	// intermediate symlinks via realpath(), so AppImage / .app bundle moves are detected
+	// correctly.
 	wxString raw = wxStandardPaths::Get().GetExecutablePath();
 
 #ifndef __WXMSW__
@@ -80,43 +76,39 @@
 	if (realpath(raw.mb_str(wxConvUTF8), resolved) != NULL) {
 		return wxString::FromUTF8(resolved);
 	}
-	// realpath failed (binary unlinked? permission?) — fall through
-	// to the raw path; the autostart entry will still work as long
-	// as the OS can resolve it.
+	// realpath failed (binary unlinked? permission?) -- fall through to the raw
+	// path, which still works as long as the OS can resolve it.
 #endif
 
 	return raw;
 }
 
-
 bool AutostartManager::IsEnabled()
 {
 	return !BackendReadTargetPath().empty();
 }
 
-
 bool AutostartManager::Enable()
 {
 	wxString exe = GetCanonicalExecutablePath();
 	if (exe.empty()) {
-		wxLogDebug(wxT("AutostartManager::Enable: no executable path resolved, refusing to write a broken entry"));
+		wxLogDebug(wxT("AutostartManager::Enable: no executable path resolved, refusing to write a "
+			       "broken entry"));
 		return false;
 	}
 	return BackendWrite(exe);
 }
 
-
 bool AutostartManager::Disable()
 {
 	return BackendRemove();
 }
 
-
 void AutostartManager::SelfHealOnStartup()
 {
 	wxString registered = BackendReadTargetPath();
 	if (registered.empty()) {
-		// No entry — user chose not to autostart, or never enabled it.
+		// No entry -- user chose not to autostart, or never enabled it.
 		// Don't second-guess.
 		return;
 	}
@@ -133,16 +125,14 @@
 		return;
 	}
 
-	// Path drifted (user moved AppImage / .app / install dir, or
-	// upgraded via a tool that didn't rewrite the entry). Rewrite
-	// to match the current canonical path so the next login launches
-	// the right binary.
+	// Path drifted (moved AppImage / .app / install dir, or an upgrade tool that
+	// did not rewrite the entry), so rewrite it to the current canonical path.
 	wxLogDebug(wxT("AutostartManager::SelfHealOnStartup: rewriting autostart entry from '%s' to '%s'"),
-		registered.c_str(), canonical.c_str());
+		registered.c_str(),
+		canonical.c_str());
 	BackendWrite(canonical);
 }
 
-
 // --------------------------------------------------------------------
 // Platform backends
 // --------------------------------------------------------------------
@@ -152,322 +142,307 @@
 
 #if defined(__WXMSW__)
 
-	// Windows: per-user "Run on login" registry key. HKCU (not HKLM)
-	// so autostart is a per-user choice on shared machines and toggling
-	// never needs elevation. The same key Task Manager → Startup tab
-	// reads.
-	static const wchar_t *RUN_KEY = L"Software\\Microsoft\\Windows\\CurrentVersion\\Run";
-	static const wchar_t *RUN_VALUE_NAME = L"aMule";
-
-	wxString BackendReadTargetPath()
-	{
-		HKEY hKey;
-		if (RegOpenKeyExW(HKEY_CURRENT_USER, RUN_KEY, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) {
-			return wxEmptyString;
-		}
+// Windows: per-user "Run on login" registry key. HKCU rather than HKLM, so autostart is a per-user
+// choice on shared machines and toggling never needs elevation. The same key Task Manager's Startup
+// tab reads.
+static const wchar_t *RUN_KEY = L"Software\\Microsoft\\Windows\\CurrentVersion\\Run";
+static const wchar_t *RUN_VALUE_NAME = L"aMule";
 
-		// First call returns the required buffer size; second call
-		// reads the value. Sized in bytes, includes the trailing NUL.
-		DWORD type = 0;
-		DWORD cb = 0;
-		LSTATUS rc = RegQueryValueExW(hKey, RUN_VALUE_NAME, NULL, &type, NULL, &cb);
-		if (rc != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ) || cb == 0) {
-			RegCloseKey(hKey);
-			return wxEmptyString;
-		}
+wxString BackendReadTargetPath()
+{
+	HKEY hKey;
+	if (RegOpenKeyExW(HKEY_CURRENT_USER, RUN_KEY, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) {
+		return wxEmptyString;
+	}
 
-		// cb is in bytes; convert to wide-character count, rounding up.
-		size_t wlen = (cb + sizeof(wchar_t) - 1) / sizeof(wchar_t);
-		std::vector<wchar_t> buf(wlen + 1, L'\0');
-		rc = RegQueryValueExW(hKey, RUN_VALUE_NAME, NULL, &type,
-			reinterpret_cast<LPBYTE>(buf.data()), &cb);
+	// First call returns the required buffer size; second call
+	// reads the value. Sized in bytes, includes the trailing NUL.
+	DWORD type = 0;
+	DWORD cb = 0;
+	LSTATUS rc = RegQueryValueExW(hKey, RUN_VALUE_NAME, NULL, &type, NULL, &cb);
+	if (rc != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ) || cb == 0) {
 		RegCloseKey(hKey);
-		if (rc != ERROR_SUCCESS) {
-			return wxEmptyString;
-		}
-
-		wxString raw(buf.data());
+		return wxEmptyString;
+	}
 
-		// Windows stores Run entries either bare ("C:\Foo\bar.exe")
-		// or quoted ('"C:\Foo\bar.exe" --some-flag'). Strip surrounding
-		// quotes and discard any argument tail so the path comparison
-		// in SelfHealOnStartup matches the unadorned canonical path.
-		if (!raw.empty() && raw0 == wxT('"')) {
-			size_t closing = raw.find(wxT('"'), 1);
-			if (closing != wxString::npos) {
-				return raw.SubString(1, closing - 1);
-			}
-		}
-		// Unquoted: take the leading non-whitespace run as the path.
-		size_t sp = raw.find_first_of(wxT(" \t"));
-		if (sp != wxString::npos) {
-			return raw.SubString(0, sp - 1);
-		}
-		return raw;
+	// cb is in bytes; convert to wide-character count, rounding up.
+	size_t wlen = (cb + sizeof(wchar_t) - 1) / sizeof(wchar_t);
+	std::vector<wchar_t> buf(wlen + 1, L'\0');
+	rc = RegQueryValueExW(hKey, RUN_VALUE_NAME, NULL, &type, reinterpret_cast<LPBYTE>(buf.data()), &cb);
+	RegCloseKey(hKey);
+	if (rc != ERROR_SUCCESS) {
+		return wxEmptyString;
 	}
 
-	bool BackendWrite(const wxString &executable)
-	{
-		HKEY hKey;
-		if (RegCreateKeyExW(HKEY_CURRENT_USER, RUN_KEY, 0, NULL, 0,
-				KEY_SET_VALUE, NULL, &hKey, NULL) != ERROR_SUCCESS) {
-			return false;
+	wxString raw(buf.data());
+
+	// Windows stores Run entries either bare or quoted with an argument tail, so strip
+	// surrounding quotes and discard any arguments -- the path comparison in SelfHealOnStartup
+	// matches the unadorned canonical path.
+	if (!raw.empty() && raw0 == wxT('"')) {
+		size_t closing = raw.find(wxT('"'), 1);
+		if (closing != wxString::npos) {
+			return raw.SubString(1, closing - 1);
 		}
+	}
+	// Unquoted: take the leading non-whitespace run as the path.
+	size_t sp = raw.find_first_of(wxT(" \t"));
+	if (sp != wxString::npos) {
+		return raw.SubString(0, sp - 1);
+	}
+	return raw;
+}
 
-		// Quote the path so spaces in "Program Files" don't get parsed
-		// as argument separators by Windows' Run-key handler.
-		wxString quoted = wxT("\"") + executable + wxT("\"");
-		const wchar_t *wstr = quoted.wc_str();
-		// cb counts the trailing NUL too, per RegSetValueExW contract.
-		DWORD cb = static_cast<DWORD>((wcslen(wstr) + 1) * sizeof(wchar_t));
-		LSTATUS rc = RegSetValueExW(hKey, RUN_VALUE_NAME, 0, REG_SZ,
-			reinterpret_cast<const BYTE *>(wstr), cb);
-		RegCloseKey(hKey);
-		return rc == ERROR_SUCCESS;
+bool BackendWrite(const wxString &executable)
+{
+	HKEY hKey;
+	if (RegCreateKeyExW(HKEY_CURRENT_USER, RUN_KEY, 0, NULL, 0, KEY_SET_VALUE, NULL, &hKey, NULL) !=
+		ERROR_SUCCESS) {
+		return false;
 	}
 
-	bool BackendRemove()
-	{
-		HKEY hKey;
-		if (RegOpenKeyExW(HKEY_CURRENT_USER, RUN_KEY, 0, KEY_SET_VALUE, &hKey) != ERROR_SUCCESS) {
-			// Key itself doesn't exist → nothing to remove, success.
-			return true;
-		}
-		LSTATUS rc = RegDeleteValueW(hKey, RUN_VALUE_NAME);
-		RegCloseKey(hKey);
-		// ERROR_FILE_NOT_FOUND = value already absent, also success.
-		return rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND;
+	// Quote the path so spaces in "Program Files" don't get parsed
+	// as argument separators by Windows' Run-key handler.
+	wxString quoted = wxT("\"") + executable + wxT("\"");
+	const wchar_t *wstr = quoted.wc_str();
+	// cb counts the trailing NUL too, per RegSetValueExW contract.
+	DWORD cb = static_cast<DWORD>((wcslen(wstr) + 1) * sizeof(wchar_t));
+	LSTATUS rc =
+		RegSetValueExW(hKey, RUN_VALUE_NAME, 0, REG_SZ, reinterpret_cast<const BYTE *>(wstr), cb);
+	RegCloseKey(hKey);
+	return rc == ERROR_SUCCESS;
+}
+
+bool BackendRemove()
+{
+	HKEY hKey;
+	if (RegOpenKeyExW(HKEY_CURRENT_USER, RUN_KEY, 0, KEY_SET_VALUE, &hKey) != ERROR_SUCCESS) {
+		// Key itself doesn't exist → nothing to remove, success.
+		return true;
 	}
+	LSTATUS rc = RegDeleteValueW(hKey, RUN_VALUE_NAME);
+	RegCloseKey(hKey);
+	// ERROR_FILE_NOT_FOUND = value already absent, also success.
+	return rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND;
+}
 
 #elif defined(__WXMAC__) || defined(__WXOSX__)
 
-	// macOS: per-user LaunchAgent. Registered command is
-	// `/usr/bin/open -a <aMule.app>` rather than launching the bare
-	// Mach-O directly — sidesteps Gatekeeper / quarantine warnings
-	// when launchd activates us at login.
-	static const wxString PLIST_LABEL = wxT("org.amule.amule");
+// macOS: per-user LaunchAgent. The registered command is `/usr/bin/open -a <aMule.app>` rather than
+// the bare Mach-O, which sidesteps Gatekeeper / quarantine warnings when launchd activates us at
+// login.
+static const wxString PLIST_LABEL = wxT("org.amule.amule");
 
-	static wxString PlistPath()
-	{
-		return wxGetUserHome() + wxT("/Library/LaunchAgents/") + PLIST_LABEL + wxT(".plist");
-	}
+static wxString PlistPath()
+{
+	return wxGetUserHome() + wxT("/Library/LaunchAgents/") + PLIST_LABEL + wxT(".plist");
+}
 
-	wxString BackendReadTargetPath()
-	{
-		wxString path = PlistPath();
-		if (!wxFileName::FileExists(path)) {
-			return wxEmptyString;
-		}
+wxString BackendReadTargetPath()
+{
+	wxString path = PlistPath();
+	if (!wxFileName::FileExists(path)) {
+		return wxEmptyString;
+	}
 
-		wxFile f(path, wxFile::read);
-		if (!f.IsOpened()) {
-			return wxEmptyString;
-		}
-		wxString content;
-		f.ReadAll(&content, wxConvUTF8);
-		f.Close();
-
-		// ProgramArguments array layout we write below:
-		//   <string>/usr/bin/open</string>
-		//   <string>-a</string>
-		//   <string>/path/to/aMule.app</string>
-		// Take the third <string> as the registered target. Plist
-		// XML is simple enough that regex extraction is safer than
-		// pulling in a full plist parser dependency.
-		wxRegEx re(wxT("<string>(^<+)</string>"), wxRE_ADVANCED);
-		if (!re.IsValid()) {
+	wxFile f(path, wxFile::read);
+	if (!f.IsOpened()) {
+		return wxEmptyString;
+	}
+	wxString content;
+	f.ReadAll(&content, wxConvUTF8);
+	f.Close();
+
+	// The ProgramArguments array written below is /usr/bin/open, -a, then the .app path, so the
+	// third <string> is the registered target. Plist XML is simple enough that regex extraction
+	// beats a full parser dependency.
+	wxRegEx re(wxT("<string>(^<+)</string>"), wxRE_ADVANCED);
+	if (!re.IsValid()) {
+		return wxEmptyString;
+	}
+	wxString cursor = content;
+	for (int i = 0; i < 3; ++i) {
+		if (!re.Matches(cursor)) {
 			return wxEmptyString;
 		}
-		wxString cursor = content;
-		for (int i = 0; i < 3; ++i) {
-			if (!re.Matches(cursor)) {
-				return wxEmptyString;
-			}
-			if (i == 2) {
-				return re.GetMatch(cursor, 1);
-			}
-			size_t start = 0, len = 0;
-			re.GetMatch(&start, &len, 0);
-			cursor = cursor.Mid(start + len);
+		if (i == 2) {
+			return re.GetMatch(cursor, 1);
 		}
-		return wxEmptyString;
+		size_t start = 0, len = 0;
+		re.GetMatch(&start, &len, 0);
+		cursor = cursor.Mid(start + len);
 	}
+	return wxEmptyString;
+}
 
-	bool BackendWrite(const wxString &canonicalExe)
-	{
-		// Convert the canonical exe path to its containing .app
-		// bundle: `/Applications/aMule.app/Contents/MacOS/amule`
-		// → `/Applications/aMule.app`. Strip the last two path
-		// components plus the basename.
-		wxString appBundle = canonicalExe;
-		int idx = appBundle.Find(wxT(".app/"));
-		if (idx != wxNOT_FOUND) {
-			appBundle = appBundle.Mid(0, idx + 4);  // keep ".app"
-		}
-
-		wxString dir = wxGetUserHome() + wxT("/Library/LaunchAgents");
-		if (!wxFileName::DirExists(dir)) {
-			if (!wxFileName::Mkdir(dir, 0755, wxPATH_MKDIR_FULL)) {
-				return false;
-			}
-		}
+bool BackendWrite(const wxString &canonicalExe)
+{
+	// Convert the canonical exe path to its containing .app bundle:
+	// `/Applications/aMule.app/Contents/MacOS/amule` -> `/Applications/aMule.app`.
+	wxString appBundle = canonicalExe;
+	int idx = appBundle.Find(wxT(".app/"));
+	if (idx != wxNOT_FOUND) {
+		appBundle = appBundle.Mid(0, idx + 4); // keep ".app"
+	}
 
-		wxString xml;
-		xml << wxT("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-		xml << wxT("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" ");
-		xml << wxT("\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n");
-		xml << wxT("<plist version=\"1.0\">\n");
-		xml << wxT("<dict>\n");
-		xml << wxT("    <key>Label</key>\n");
-		xml << wxT("    <string>") << PLIST_LABEL << wxT("</string>\n");
-		xml << wxT("    <key>ProgramArguments</key>\n");
-		xml << wxT("    <array>\n");
-		xml << wxT("        <string>/usr/bin/open</string>\n");
-		xml << wxT("        <string>-a</string>\n");
-		xml << wxT("        <string>") << appBundle << wxT("</string>\n");
-		xml << wxT("    </array>\n");
-		xml << wxT("    <key>RunAtLoad</key>\n");
-		xml << wxT("    <true/>\n");
-		// KeepAlive=false so user-quit means quit. launchd would
-		// otherwise treat us as a service to be respawned, which
-		// fights the user's deliberate close.
-		xml << wxT("    <key>KeepAlive</key>\n");
-		xml << wxT("    <false/>\n");
-		xml << wxT("</dict>\n");
-		xml << wxT("</plist>\n");
-
-		wxFile f;
-		if (!f.Create(PlistPath(), true /* overwrite */, 0644)) {
+	wxString dir = wxGetUserHome() + wxT("/Library/LaunchAgents");
+	if (!wxFileName::DirExists(dir)) {
+		if (!wxFileName::Mkdir(dir, 0755, wxPATH_MKDIR_FULL)) {
 			return false;
 		}
-		bool ok = f.Write(xml, wxConvUTF8);
-		f.Close();
-		return ok;
 	}
 
-	bool BackendRemove()
-	{
-		wxString path = PlistPath();
-		if (!wxFileName::FileExists(path)) {
-			return true;
-		}
-		return wxRemoveFile(path);
+	wxString xml;
+	xml << wxT("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+	xml << wxT("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" ");
+	xml << wxT("\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n");
+	xml << wxT("<plist version=\"1.0\">\n");
+	xml << wxT("<dict>\n");
+	xml << wxT("    <key>Label</key>\n");
+	xml << wxT("    <string>") << PLIST_LABEL << wxT("</string>\n");
+	xml << wxT("    <key>ProgramArguments</key>\n");
+	xml << wxT("    <array>\n");
+	xml << wxT("        <string>/usr/bin/open</string>\n");
+	xml << wxT("        <string>-a</string>\n");
+	xml << wxT("        <string>") << appBundle << wxT("</string>\n");
+	xml << wxT("    </array>\n");
+	xml << wxT("    <key>RunAtLoad</key>\n");
+	xml << wxT("    <true/>\n");
+	// KeepAlive=false so a user quit means quit: launchd would otherwise treat us
+	// as a service to be respawned, fighting the user's deliberate close.
+	xml << wxT("    <key>KeepAlive</key>\n");
+	xml << wxT("    <false/>\n");
+	xml << wxT("</dict>\n");
+	xml << wxT("</plist>\n");
+
+	wxFile f;
+	if (!f.Create(PlistPath(), true /* overwrite */, 0644)) {
+		return false;
 	}
+	bool ok = f.Write(xml, wxConvUTF8);
+	f.Close();
+	return ok;
+}
 
-#else  // assumed Linux / *BSD with XDG-compliant desktop env
+bool BackendRemove()
+{
+	wxString path = PlistPath();
+	if (!wxFileName::FileExists(path)) {
+		return true;
+	}
+	return wxRemoveFile(path);
+}
 
-	// Linux: XDG Autostart spec. $XDG_CONFIG_HOME (falls back to
-	// ~/.config) is where the DE's "Startup Applications" GUI looks,
-	// so users can see and toggle the entry without touching a
-	// terminal. systemd user units don't show up in those GUIs.
-	// https://specifications.freedesktop.org/autostart-spec/latest/
+#else // assumed Linux / *BSD with XDG-compliant desktop env
 
-	static wxString XdgAutostartDir()
-	{
-		wxString xdg;
-		if (wxGetEnv(wxT("XDG_CONFIG_HOME"), &xdg) && !xdg.empty()) {
-			return xdg + wxT("/autostart");
-		}
-		return wxGetUserHome() + wxT("/.config/autostart");
+// Linux: XDG Autostart spec. $XDG_CONFIG_HOME (falling back to ~/.config) is where the DE's
+// "Startup Applications" GUI looks, so users can see and toggle the entry without a terminal --
+// systemd user units do not show up there. https://specifications.freedesktop.org/autostart-
+// spec/latest/
+
+static wxString XdgAutostartDir()
+{
+	wxString xdg;
+	if (wxGetEnv(wxT("XDG_CONFIG_HOME"), &xdg) && !xdg.empty()) {
+		return xdg + wxT("/autostart");
 	}
+	return wxGetUserHome() + wxT("/.config/autostart");
+}
+
+static wxString DesktopFilePath()
+{
+	return XdgAutostartDir() + wxT("/amule.desktop");
+}
 
-	static wxString DesktopFilePath()
-	{
-		return XdgAutostartDir() + wxT("/amule.desktop");
+wxString BackendReadTargetPath()
+{
+	wxString path = DesktopFilePath();
+	if (!wxFileName::FileExists(path)) {
+		return wxEmptyString;
 	}
 
-	wxString BackendReadTargetPath()
-	{
-		wxString path = DesktopFilePath();
-		if (!wxFileName::FileExists(path)) {
-			return wxEmptyString;
+	wxFile f(path, wxFile::read);
+	if (!f.IsOpened()) {
+		return wxEmptyString;
+	}
+	wxString content;
+	f.ReadAll(&content, wxConvUTF8);
+	f.Close();
+
+	// Parse the Exec= line. .desktop syntax allows field-code expansion (%U, %f) after the
+	// executable; the path is always the first whitespace-delimited token, and may be double-
+	// quoted for paths containing spaces.
+	wxStringTokenizer lines(content, wxT("\n"));
+	while (lines.HasMoreTokens()) {
+		wxString line = lines.GetNextToken().Trim(false).Trim(true);
+		if (!line.StartsWith(wxT("Exec="))) {
+			continue;
 		}
-
-		wxFile f(path, wxFile::read);
-		if (!f.IsOpened()) {
+		wxString value = line.Mid(5).Trim(false);
+		if (value.empty()) {
 			return wxEmptyString;
 		}
-		wxString content;
-		f.ReadAll(&content, wxConvUTF8);
-		f.Close();
-
-		// Parse the Exec= line. .desktop syntax allows the field-code
-		// expansion (%U, %f etc.) after the executable; the path is
-		// always the first whitespace-delimited token and may be
-		// quoted with double-quotes for paths containing spaces.
-		wxStringTokenizer lines(content, wxT("\n"));
-		while (lines.HasMoreTokens()) {
-			wxString line = lines.GetNextToken().Trim(false).Trim(true);
-			if (!line.StartsWith(wxT("Exec="))) {
-				continue;
-			}
-			wxString value = line.Mid(5).Trim(false);
-			if (value.empty()) {
-				return wxEmptyString;
-			}
-			if (value0 == wxT('"')) {
-				size_t closing = value.find(wxT('"'), 1);
-				if (closing != wxString::npos) {
-					return value.SubString(1, closing - 1);
-				}
-			}
-			size_t sp = value.find_first_of(wxT(" \t"));
-			if (sp != wxString::npos) {
-				return value.SubString(0, sp - 1);
+		if (value0 == wxT('"')) {
+			size_t closing = value.find(wxT('"'), 1);
+			if (closing != wxString::npos) {
+				return value.SubString(1, closing - 1);
 			}
-			return value;
 		}
-		return wxEmptyString;
-	}
-
-	bool BackendWrite(const wxString &executable)
-	{
-		wxString dir = XdgAutostartDir();
-		if (!wxFileName::DirExists(dir)) {
-			// Mkdir -p; the XDG dir may not exist yet on a fresh
-			// install or on minimal DEs that don't ship anything
-			// there by default.
-			if (!wxFileName::Mkdir(dir, 0755, wxPATH_MKDIR_FULL)) {
-				return false;
-			}
+		size_t sp = value.find_first_of(wxT(" \t"));
+		if (sp != wxString::npos) {
+			return value.SubString(0, sp - 1);
 		}
+		return value;
+	}
+	return wxEmptyString;
+}
 
-		// Quote the path so embedded spaces (e.g. "/home/user/My Apps/amule")
-		// survive the .desktop Exec= parser's tokenisation.
-		wxString quotedExec = wxT("\"") + executable + wxT("\"");
-
-		// Standard XDG Autostart fields. X-GNOME-Autostart-enabled
-		// is widely-recognised even outside GNOME and makes the
-		// entry trivially toggleable from the user's DE settings GUI
-		// without us having to rewrite the file.
-		wxString content;
-		content << wxT("Desktop Entry\n");
-		content << wxT("Type=Application\n");
-		content << wxT("Name=aMule\n");
-		content << wxT("Comment=Start aMule when the user logs in\n");
-		content << wxT("Exec=") << quotedExec << wxT("\n");
-		content << wxT("Terminal=false\n");
-		content << wxT("X-GNOME-Autostart-enabled=true\n");
-		content << wxT("Hidden=false\n");
-
-		wxFile f;
-		if (!f.Create(DesktopFilePath(), true /* overwrite */, 0644)) {
+bool BackendWrite(const wxString &executable)
+{
+	wxString dir = XdgAutostartDir();
+	if (!wxFileName::DirExists(dir)) {
+		// Mkdir -p: the XDG dir may not exist yet on a fresh install or on minimal
+		// DEs that ship nothing there.
+		if (!wxFileName::Mkdir(dir, 0755, wxPATH_MKDIR_FULL)) {
 			return false;
 		}
-		bool ok = f.Write(content, wxConvUTF8);
-		f.Close();
-		return ok;
 	}
 
-	bool BackendRemove()
-	{
-		wxString path = DesktopFilePath();
-		if (!wxFileName::FileExists(path)) {
-			return true;  // already absent → success
-		}
-		return wxRemoveFile(path);
+	// Quote the path so embedded spaces (e.g. "/home/user/My Apps/amule")
+	// survive the .desktop Exec= parser's tokenisation.
+	wxString quotedExec = wxT("\"") + executable + wxT("\"");
+
+	// Standard XDG Autostart fields. X-GNOME-Autostart-enabled is widely recognised even
+	// outside GNOME and makes the entry toggleable from the DE settings GUI without us
+	// rewriting the file.
+	wxString content;
+	content << wxT("Desktop Entry\n");
+	content << wxT("Type=Application\n");
+	content << wxT("Name=aMule\n");
+	content << wxT("Comment=Start aMule when the user logs in\n");
+	content << wxT("Exec=") << quotedExec << wxT("\n");
+	content << wxT("Terminal=false\n");
+	content << wxT("X-GNOME-Autostart-enabled=true\n");
+	content << wxT("Hidden=false\n");
+
+	wxFile f;
+	if (!f.Create(DesktopFilePath(), true /* overwrite */, 0644)) {
+		return false;
+	}
+	bool ok = f.Write(content, wxConvUTF8);
+	f.Close();
+	return ok;
+}
+
+bool BackendRemove()
+{
+	wxString path = DesktopFilePath();
+	if (!wxFileName::FileExists(path)) {
+		return true; // already absent → success
 	}
+	return wxRemoveFile(path);
+}
 
 #endif
 
-}  // namespace
+} // namespace

amule-3.0.1.tar.gz/src/AutostartManager.h -> amule-3.1.0.tar.gz/src/AutostartManager.h Changed

@@ -27,23 +27,20 @@
 
 #include <wx/string.h>
 
-// Cross-platform "start aMule when the user logs in" toggle. The
-// per-OS store of record is:
+// Cross-platform "start aMule when the user logs in" toggle. The per-OS store of record is:
 //
 //   Windows : HKCU\Software\Microsoft\Windows\CurrentVersion\Run\aMule
 //   Linux   : $XDG_CONFIG_HOME/autostart/amule.desktop (per XDG spec)
 //   macOS   : ~/Library/LaunchAgents/org.amule.amule.plist
 //
-// All three are per-user — no elevation required. Toggling reads/writes
-// the OS directly, never aMule.conf, so the OS is always the source of
-// truth (matches what the user sees in Task Manager / Login Items /
-// `systemctl --user list-unit-files` etc.).
+// All three are per-user -- no elevation required. Toggling reads and writes the OS directly, never
+// aMule.conf, so the OS is always the source of truth, matching what the user sees in Task Manager
+// / Login Items / `systemctl --user list-unit-files`.
 class AutostartManager
 {
 public:
-	// Returns true if an autostart entry for aMule exists in the
-	// OS's per-user store. Doesn't validate the registered path
-	// against the running binary (use SelfHealOnStartup() for that).
+	// True if an autostart entry for aMule exists in the OS's per-user store. Does not validate
+	// the registered path against the running binary -- use SelfHealOnStartup() for that.
 	static bool IsEnabled();
 
 	// Writes/overwrites the autostart entry to point at the running
@@ -54,20 +51,18 @@
 	// already disabled); returns true on success.
 	static bool Disable();
 
-	// Called once from CamuleApp::OnInit. If an autostart entry
-	// exists AND its registered path differs from the canonical
-	// path of the currently-running binary, rewrites it so the
-	// next login launches the right binary. Handles the
-	// "user moved the AppImage / .app / install dir" case without
-	// requiring them to re-toggle the checkbox.
+	// Called once from CamuleApp::OnInit. If an autostart entry exists AND its registered path
+	// differs from the canonical path of the running binary, rewrites it so the next login
+	// launches the right one. Handles the "user moved the AppImage / .app / install dir" case
+	// without making them re-toggle the checkbox.
 	//
-	// Does nothing if no entry exists — disabling autostart is
-	// always a deliberate user choice we don't second-guess.
+	// Does nothing if no entry exists -- disabling autostart is always a deliberate user
+	// choice.
 	static void SelfHealOnStartup();
 
-	// Resolves argv0 to its canonical absolute path (realpath()
-	// on POSIX, GetModuleFileNameW() on Windows). Used by both the
-	// Enable() write and the SelfHealOnStartup() comparison.
+	// Resolves argv0 to its canonical absolute path (realpath() on POSIX,
+	// GetModuleFileNameW() on Windows). Used by both the Enable() write and the
+	// SelfHealOnStartup() comparison.
 	static wxString GetCanonicalExecutablePath();
 };

amule-3.1.0.tar.gz/src/BanRecord.h Added

@@ -0,0 +1,181 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 BANRECORD_H
+#define BANRECORD_H
+
+#include "Types.h" // Needed for uint32, uint64
+#include "PeerAddressing.h"
+
+#include <protocol/ed2k/Constants.h> // Needed for CLIENTBANTIME
+
+#include <map>
+
+/**
+ * The addresses banned from the upload queue, and when each ban started.
+ *
+ * Every operation answers whether it *changed* the record, because the caller keeps a statistic
+ * alongside it and must move that counter exactly when the set of banned addresses moves. Doing
+ * this inline was what let the two drift apart: `m_bannedListip = tick` on an address already
+ * present overwrites without inserting, and `erase()` on one that is absent removes nothing, yet
+ * both reported success to a caller that then counted them.
+ *
+ * That is not a theoretical pairing. `CUpDownClient::SetSpammer(true)` calls `Ban()` with no
+ * `IsBanned()` check, so a client banned for aggressiveness and later flagged as a spammer reaches
+ * the add path twice for one banned address.
+ *
+ * The tick is a parameter rather than a call to `GetTickCount64()`, so a ban lapsing is a value
+ * passed in rather than four hours of waiting, which is what makes the expiry rules testable at
+ * all.
+ */
+class CBanRecord
+{
+public:
+	/**
+	 * How long a ban lasts, in milliseconds.
+	 *
+	 * An alias for the protocol constant rather than a second copy of the figure: expiry is
+	 * decided in here, and a duration written twice is a rule two places are free to disagree
+	 * about. The name exists so a test can express "one millisecond before the ban lapses"
+	 * without repeating the number either.
+	 *
+	 * One boundary is settled here that the two callers used to answer differently. The sweep
+	 * dropped an entry on `start + duration < now` while the lookup treated `start + duration >
+	 * now` as still banned, so an entry at exactly `start + duration` survived a sweep and was
+	 * then dropped by the next lookup. Both now lapse at that instant: a ban lasts for the
+	 * duration and not one tick longer, which is the reading its name gives. That is a
+	 * behaviour change, small and in one direction.
+	 */
+	// constexpr, not const: a plain static const member still needs an out-of-line definition
+	// the moment anything odr-uses it, and C++17 made only constexpr members implicitly inline.
+	// Every use today is arithmetic, which is a value computation, so it links; the first
+	// reference binding does not. ASSERT_EQUALS() is exactly that, since muleunit takes its
+	// arguments by const reference.
+	static constexpr uint64 BAN_DURATION_MS = CLIENTBANTIME;
+
+	/**
+	 * Ban @p ip, or refresh an existing ban.
+	 *
+	 * @return true only when the address was not already banned, so the caller increments once
+	 * per banned address rather than once per call. A refresh still extends the ban; it is the
+	 * count that must not follow it.
+	 *
+	 * Zero is refused outright. It is not an address, and `CUpDownClient`'s constructor sets
+	 * the address to zero when there is no socket -- so a single entry under that key would
+	 * make every such client read back as banned.
+	 */
+	bool Ban(uint32 ip, uint64 nowMs) { return Ban(CNetworkAddress::FromIPv4NetworkOrder(ip), nowMs); }
+
+	bool Ban(const CNetworkAddress &address, uint64 nowMs)
+	{
+		const auto ip = PeerAddressing::IndexKey(address);
+		if (!PeerAddressing::IsSecurityKey(ip)) {
+			return false;
+		}
+		const bool isNew = m_banned.find(ip) == m_banned.end();
+		m_bannedip = nowMs;
+		return isNew;
+	}
+
+	/**
+	 * Lift the ban on @p ip. @return true only when there was one to lift.
+	 */
+	bool Unban(uint32 ip) { return Unban(CNetworkAddress::FromIPv4NetworkOrder(ip)); }
+
+	bool Unban(const CNetworkAddress &address)
+	{
+		return PeerAddressing::IsSecurityKey(address) &&
+		       m_banned.erase(PeerAddressing::IndexKey(address)) != 0;
+	}
+
+	/**
+	 * Whether @p ip is banned as of @p nowMs. A lapsed ban is dropped here rather than reported
+	 * and left behind, so the record cannot answer false for an address it still holds. @p
+	 * dropped, when given, says whether this call removed such an entry -- the caller has no
+	 * other way to know it should decrement, since the removal happens inside a query.
+	 */
+	bool IsBanned(uint32 ip, uint64 nowMs, bool *dropped = nullptr) const
+	{
+		return IsBanned(CNetworkAddress::FromIPv4NetworkOrder(ip), nowMs, dropped);
+	}
+
+	bool IsBanned(const CNetworkAddress &address, uint64 nowMs, bool *dropped = nullptr) const
+	{
+		const auto ip = PeerAddressing::IndexKey(address);
+		if (dropped != nullptr) {
+			*dropped = false;
+		}
+		if (!PeerAddressing::IsSecurityKey(ip)) {
+			return false;
+		}
+		auto it = m_banned.find(ip);
+		if (it == m_banned.end()) {
+			return false;
+		}
+		if (it->second + BAN_DURATION_MS > nowMs) {
+			return true;
+		}
+		m_banned.erase(it);
+		if (dropped != nullptr) {
+			*dropped = true;
+		}
+		return false;
+	}
+
+	/**
+	 * Drop every ban that has lapsed as of @p nowMs, returning how many went, so the caller can
+	 * move its counter in one step. Needed because IsBanned() only reclaims an address somebody
+	 * asks about: without a sweep, a table of peers that never came back would grow for as long
+	 * as the process runs.
+	 */
+	std::size_t DropLapsed(uint64 nowMs)
+	{
+		std::size_t removed = 0;
+		auto it = m_banned.begin();
+		while (it != m_banned.end()) {
+			// Post-increment before erasing: the iterator being erased is
+			// invalidated, and the next one has to be in hand already.
+			auto current = it++;
+			if (current->second + BAN_DURATION_MS <= nowMs) {
+				m_banned.erase(current);
+				++removed;
+			}
+		}
+		return removed;
+	}
+
+	//! How many addresses are banned. The figure the caller's statistic is
+	//! meant to equal, which is what makes a test able to check the pairing.
+	std::size_t Size() const { return m_banned.size(); }
+
+	void Clear() { m_banned.clear(); }
+
+private:
+	// Mutable so IsBanned() can stay const while reclaiming a lapsed entry: dropping one
+	// changes no answer this record gives, and the alternative is a non-const query that every
+	// caller has to hold a mutable reference for.
+	mutable std::map<CNetworkAddress, uint64> m_banned;
+};
+
+#endif // BANRECORD_H

amule-3.0.1.tar.gz/src/BarShader.cpp -> amule-3.1.0.tar.gz/src/BarShader.cpp Changed

@@ -25,11 +25,12 @@
 
 #include <wx/dc.h>
 #include <wx/image.h>
-#include "BarShader.h"		// Interface declarations.
-#include <cstring>		// Needed for std::memcpy
+#include "BarShader.h" // Interface declarations.
+#include <cmath>       // Needed for std::lround
+#include <cstring>     // Needed for std::memcpy
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1800) 
-#include <algorithm> // for std::min and std::max 
+#if defined(_MSC_VER) && (_MSC_VER >= 1800)
+#include <algorithm> // for std::min and std::max
 #endif
 
 const double Pi = 3.14159265358979323846264338328;
@@ -38,78 +39,69 @@
 #define DEFAULT_DEPTH 10
 
 CBarShader::CBarShader(unsigned height, unsigned width)
-: m_Width( width ),
-  m_Height( height ),
-  m_FileSize( 1 ),
-  m_Modifiers( NULL ),
-  m_used3dlevel( DEFAULT_DEPTH ),
-  m_Content(width, 0)
+: m_Width(width)
+, m_Height(height)
+, m_FileSize(1)
+, m_Modifiers(NULL)
+, m_used3dlevel(DEFAULT_DEPTH)
+, m_Content(width, 0)
 {
 }
 
-
 CBarShader::~CBarShader()
 {
-	if ( m_Modifiers ) {
-		delete m_Modifiers;
-	}
+	delete m_Modifiers;
 }
 
-
 void CBarShader::SetHeight(unsigned height)
 {
-	if( m_Height != height ) {
+	if (m_Height != height) {
 		m_Height = height;
 
 		// Reset the modifiers
-		if ( m_Modifiers ) {
+		if (m_Modifiers) {
 			delete m_Modifiers;
 			m_Modifiers = NULL;
 		}
 	}
 }
 
-
 void CBarShader::SetWidth(int width)
 {
 	if (width > 0) {
 		m_Width = width;
-		Fill(CMuleColour(0,0,0));
+		Fill(CMuleColour(0, 0, 0));
 	}
 }
 
-
 void CBarShader::Set3dDepth(unsigned depth)
 {
-	if ( depth < 1 ) {
+	if (depth < 1) {
 		depth = 1;
-	} else if ( depth > 5 ) {
+	} else if (depth > 5) {
 		depth = 5;
 	}
 
-	if ( m_used3dlevel != depth ) {
+	if (m_used3dlevel != depth) {
 		m_used3dlevel = depth;
 
 		// Reset the modifiers
-		if ( m_Modifiers ) {
+		if (m_Modifiers) {
 			delete m_Modifiers;
 			m_Modifiers = NULL;
 		}
 	}
 }
 
-
 void CBarShader::BuildModifiers()
 {
 	wxASSERT(m_used3dlevel < 7);
 
-	if ( m_Modifiers ) {
-		delete m_Modifiers;
-	}
+	delete m_Modifiers;
 
 	unsigned depth = (7 - m_used3dlevel);
 	unsigned count = HALF(m_Height);
-	double piOverDepth = Pi/depth;
+	double piOverDepth = Pi / depth;
 	double base = piOverDepth * ((depth / 2.0) - 1);
 	double increment = piOverDepth / (count - 1);
 
@@ -118,8 +110,7 @@
 		m_Modifiersi = (double)(sin(base + i * increment));
 }
 
-
-void CBarShader::FillRange(uint64 start, uint64 end, const CMuleColour& colour)
+void CBarShader::FillRange(uint64 start, uint64 end, const CMuleColour &colour)
 {
 	wxASSERT(m_FileSize > 0);
 
@@ -127,9 +118,8 @@
 		return;
 	}
 
-	// precision for small files: end must be increased by one
-	// think of each byte as a visible block, then start points to
-	// the beginning of its block, but end points to the END of its block
+	// Precision for small files: end must be increased by one. Think of each byte as a visible
+	// block -- start points at the beginning of its block, end at the END of its block.
 	end++;
 
 	if (end > m_FileSize) {
@@ -137,7 +127,7 @@
 	}
 
 	unsigned firstPixel = start * m_Width / m_FileSize;
-	unsigned lastPixel  = end   * m_Width / m_FileSize;
+	unsigned lastPixel = end * m_Width / m_FileSize;
 	if (lastPixel == m_Width) {
 		lastPixel--;
 	}
@@ -145,7 +135,7 @@
 	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;
+	double lastCovered = end * f_Width / m_FileSize - lastPixel;
 	// all inside one pixel ?
 	if (firstPixel == lastPixel) {
 		m_ContentfirstPixel.BlendWith(colour, firstCovered + lastCovered - 1.0);
@@ -159,28 +149,26 @@
 	}
 }
 
-
-void CBarShader::Draw( wxDC* dc, int iLeft, int iTop, bool bFlat )
+void CBarShader::Draw(wxDC *dc, int iLeft, int iTop, bool bFlat)
 {
-	wxASSERT( dc );
+	wxASSERT(dc);
 
 	// Do we need to rebuild the modifiers?
-	if ( !bFlat && !m_Modifiers ) {
+	if (!bFlat && !m_Modifiers) {
 		BuildModifiers();
 	}
 
 	// Render the bar into a raw buffer
-	unsigned char * buf = (unsigned char *) malloc(
-		static_cast<size_t>(m_Width) *
-		static_cast<size_t>(m_Height) * 3u);
+	unsigned char *buf =
+		(unsigned char *)malloc(static_cast<size_t>(m_Width) * static_cast<size_t>(m_Height) * 3u);
 
 	if (bFlat) {
 		// draw flat bar
 		unsigned idx = 0;
 		for (unsigned x = 0; x < m_Width; x++) {
-			unsigned cRed   = m_Contentx.Red();
+			unsigned cRed = m_Contentx.Red();
 			unsigned cGreen = m_Contentx.Green();
-			unsigned cBlue  = m_Contentx.Blue();
+			unsigned cBlue = m_Contentx.Blue();
 			bufidx++ = cRed;
 			bufidx++ = cGreen;
 			bufidx++ = cBlue;
@@ -191,8 +179,7 @@
 			std::memcpy(buf + idx, buf, idx);
 		}
 		if (y < m_Height) {
-			std::memcpy(buf + idx, buf,
-				static_cast<size_t>(m_Height - y) * linelength);
+			std::memcpy(buf + idx, buf, static_cast<size_t>(m_Height - y) * linelength);
 		}
 	} else {
 		// draw rounded bar
@@ -200,12 +187,13 @@
 		unsigned idx = 0;
 		for (unsigned y = 0; y < Max; y++) {
 			for (unsigned x = 0; x < m_Width; x++) {
-				unsigned cRed   = (unsigned)(m_Contentx.Red()   * m_Modifiersy + .5f);
-				unsigned cGreen = (unsigned)(m_Contentx.Green() * m_Modifiersy + .5f);
-				unsigned cBlue  = (unsigned)(m_Contentx.Blue()  * m_Modifiersy + .5f);
-				cRed   = std::min(255u, cRed);
+				unsigned cRed = (unsigned)std::lround(m_Contentx.Red() * m_Modifiersy);
+				unsigned cGreen =
+					(unsigned)std::lround(m_Contentx.Green() * m_Modifiersy);
+				unsigned cBlue = (unsigned)std::lround(m_Contentx.Blue() * m_Modifiersy);
+				cRed = std::min(255u, cRed);
 				cGreen = std::min(255u, cGreen);
-				cBlue  = std::min(255u, cBlue);
+				cBlue = std::min(255u, cBlue);
 				bufidx++ = cRed;
 				bufidx++ = cGreen;
 				bufidx++ = cBlue;

amule-3.0.1.tar.gz/src/BarShader.h -> amule-3.1.0.tar.gz/src/BarShader.h Changed

@@ -26,128 +26,87 @@
 #ifndef BARSHADER_H
 #define BARSHADER_H
 
-#include "Types.h"	// Needed for uint16 and uint32
+#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.
- *
- * CBarShader represents the chunks of a file through the use of spans, which
- * cover a range in the file with a certain color. New spans can be added on
- * the fly and old spans are automatically removed, resized or merged when
- * necessary.
- *
- * CBarShader will try to minimize the number of spans when possible.
+ * Draws the chunk-based progress bars used in aMule. A file's chunks are represented as spans, each
+ * covering a range with a colour. New spans can be added on the fly; old ones are automatically
+ * removed, resized or merged as needed, and the number of spans is minimised where possible.
  */
 class CBarShader
 {
 public:
 	/**
-	 * Constructor.
-	 *
-	 * @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.
+	 * @param height The height of the area the span is drawn on.
+	 * @param width The width of the area the span is drawn on.
 	 */
 	CBarShader(unsigned height = 1, unsigned width = 1);
 
-	/**
-	 * Destructor.
-	 */
 	~CBarShader();
 
 	/**
-	 * Sets the width of the drawn bar.
-	 *
-	 * @param width The new width.
-	 *
-	 * Setting this sets the width the bar which is used when it
-	 * is drawn and resets the pixel buffer to the fill color.
+	 * Sets the width of the drawn bar, and resets the pixel buffer to the fill colour.
 	 */
 	void SetWidth(int width);
 
 	/**
 	 * Sets the height of the drawn bar.
-	 *
-	 * @param height The new height.
-	 *
-	 * Changes the height of the bar, used when it is drawn.
 	 */
 	void SetHeight(unsigned height);
 
 	/**
-	 * Sets the 3D-depth of the bar
-	 *
-	 * @param depth A value in the range from 1 to 5.
+	 * Sets the 3D depth of the bar. @param depth A value from 1 to 5.
 	 */
 	void Set3dDepth(unsigned depth);
 
 	/**
-	 * Sets a new filesize.
-	 *
-	 * @param fileSize The new filesize.
-	 *
-	 * Calling this function sets a new filesize, which is the virtual
-	 * length of the bar. This function must be called before any filling.
+	 * Sets a new filesize, which is the virtual length of the bar. Must be called before any
+	 * filling.
 	 */
-	void SetFileSize(uint64 fileSize)	{ m_FileSize = 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 colour The colour of the new span.
-	 *
-	 * Calling this function fill the specified range with the specified color.
-	 * Any spans completely 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.
+	 * Fills the range @a start, @a end) with @a colour. Any span the new one completely or
+	 * partially covers is removed or resized. If @a end is past the current filesize, the
+	 * filesize grows to it. @a end must be larger than @a start.
 	 */
-	void FillRange(uint64 start, uint64 end, const CMuleColour& colour);
+	void FillRange(uint64 start, uint64 end, const CMuleColour &colour);
 
 	/**
-	 * Fill the entire bar with a span of the specified color.
-	 *
-	 * @param colour The colour of the new span.
+	 * Fills the entire bar with a span of @a colour.
 	 */
-	void Fill(const CMuleColour& colour)
+	void Fill(const CMuleColour &colour)
 	{
 		m_Content.clear();
 		m_Content.resize(m_Width, colour);
 	}
 
 	/**
-	 * Draws the bar on the specified wxDC.
-	 *
-	 * @param dc The wxDC upon which the bar should be drawn.
-	 * @param iLeft The left position from where to start drawing.
-	 * @param iTop The top position from where to start drawing.
-	 * @param bFlat 3D effect is not applied if this is true.
-	 *
-	 * This functions draws the bar with the height and width specified
-	 * through either the constructor or with SetWidth() and SetHeight().
+	 * Draws the bar on @a dc at (@a iLeft, @a iTop), with the height and width set through the
+	 * constructor or SetWidth()/SetHeight(). @a bFlat suppresses the 3D effect.
 	 */
-	void Draw( wxDC* dc, int iLeft, int iTop, bool bFlat );
+	void Draw(wxDC *dc, int iLeft, int iTop, bool bFlat);
 
 private:
 	/**
-	 * Calculates the modifiers used to create 3d effect.
+	 * Calculates the modifiers used to create the 3d effect.
 	 */
 	void BuildModifiers();
 
 	//! The width of the drawn bar
-	unsigned	m_Width;
+	unsigned m_Width;
 	//! The height of the drawn bar
-	unsigned	m_Height;
+	unsigned m_Height;
 	//! The virtual filesize associated with the bar
-	uint64	m_FileSize;
+	uint64 m_FileSize;
 	//! Pointer to array of modifiers 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<CMuleColour> m_Content;

amule-3.0.1.tar.gz/src/BaseClient.cpp -> amule-3.1.0.tar.gz/src/BaseClient.cpp Changed

@@ -27,8 +27,8 @@
 #include <wx/mstream.h>
 #include <wx/tokenzr.h>
 
-#include "updownclient.h"	// Needed for CUpDownClient
-#include "SharedFileList.h"	// Needed for CSharedFileList
+#include "updownclient.h"   // Needed for CUpDownClient
+#include "SharedFileList.h" // Needed for CSharedFileList
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
@@ -42,40 +42,47 @@
 
 #include <tags/ClientTags.h>
 
-#include <zlib.h>		// Needed for inflateEnd
+#include <zlib.h> // Needed for inflateEnd
 
-#include <common/Format.h>	// Needed for CFormat
+#include <common/Format.h> // Needed for CFormat
 
-#include "SearchList.h"		// Needed for CSearchList
-#include "DownloadQueue.h"	// Needed for CDownloadQueue
-#include "UploadQueue.h"	// Needed for CUploadQueue
-#include "IPFilter.h"		// Needed for CIPFilter
-#include "ServerConnect.h"	// Needed for CServerConnect
-#include "ClientCredits.h"	// Needed for CClientCredits
-#include "ClientCreditsList.h"	// Needed for CClientCreditsList
-#include "Server.h"		// Needed for CServer
-#include "Preferences.h"	// Needed for CPreferences
-#include "MemFile.h"		// Needed for CMemFile
-#include "Packet.h"		// Needed for CPacket
-#include "Friend.h"		// Needed for CFriend
-#include "ClientList.h"		// Needed for CClientList
+#include "SearchList.h"        // Needed for CSearchList
+#include "DownloadQueue.h"     // Needed for CDownloadQueue
+#include "UploadQueue.h"       // Needed for CUploadQueue
+#include "IPFilter.h"          // Needed for CIPFilter
+#include "NetworkAddress.h"    // Needed for the IPv6 tag-edge rule
+#include "PeerAddressing.h"    // Needed for IsUsableTagIdentity
+#include "SecIdentPolicy.h"    // Needed for SecIdent version negotiation
+#include "ServerConnect.h"     // Needed for CServerConnect
+#include "ClientCredits.h"     // Needed for CClientCredits
+#include "ClientCreditsList.h" // Needed for CClientCreditsList
+#include "Server.h"            // Needed for CServer
+#include "Preferences.h"       // Needed for CPreferences
+#include "MemFile.h"           // Needed for CMemFile
+#include "Packet.h"            // Needed for CPacket
+#include "Friend.h"            // Needed for CFriend
+#include "PublicIPv6Corroboration.h"
+#include "ClientVersionString.h"
+#include "ClientList.h"       // Needed for CClientList
+#include "ChatSessionStore.h" // Needed for CChatSessionStore
 #ifndef AMULE_DAEMON
-#include "amuleDlg.h"		// Needed for CamuleDlg
-#include "CaptchaDialog.h"	// Needed for CCaptchaDialog
+#include "amuleDlg.h"      // Needed for CamuleDlg
+#include "CaptchaDialog.h" // Needed for CCaptchaDialog
 #include "CaptchaGenerator.h"
-#include "ChatWnd.h"		// Needed for CChatWnd
+#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
-#include "ListenSocket.h"	// Needed for CListenSocket
-#include "FriendList.h"		// Needed for CFriendList
-#include "Statistics.h"		// Needed for theStats
+#include "BrowseManager.h"
+#include "amule.h"           // Needed for theApp
+#include "PartFile.h"        // Needed for CPartFile
+#include "ClientTCPSocket.h" // Needed for CClientTCPSocket
+#include "ListenSocket.h"    // Needed for CListenSocket
+#include "FriendList.h"      // Needed for CFriendList
+#include "Statistics.h"      // Needed for theStats
 #include "ClientUDPSocket.h"
 #include "Logger.h"
-#include "DataToText.h"		// Needed for GetSoftName()
-#include "GuiEvents.h"		// Needed for Notify_
-#include "ServerList.h"		// For CServerList
+#include "DataToText.h" // Needed for GetSoftName()
+#include "GuiEvents.h"  // Needed for Notify_
+#include "ServerList.h" // For CServerList
 
 #include "kademlia/kademlia/Kademlia.h"
 #include "kademlia/kademlia/Prefs.h"
@@ -83,9 +90,7 @@
 #include "kademlia/kademlia/UDPFirewallTester.h"
 #include "kademlia/routing/RoutingZone.h"
 
-
-//#define __PACKET_DEBUG__
-
+// #define __PACKET_DEBUG__
 
 // some client testing variables
 static wxString crash_name = "Invalid User Name";
@@ -94,8 +99,7 @@
 //	members of CUpDownClient
 //	which are used by down and uploading functions
 
-
-CUpDownClient::CUpDownClient(CClientTCPSocket* sender)
+CUpDownClient::CUpDownClient(CClientTCPSocket *sender)
 {
 #ifdef __DEBUG__
 	m_socket = NULL;
@@ -106,45 +110,52 @@
 	Init();
 }
 
-CUpDownClient::CUpDownClient(uint16 in_port, uint32 in_userid, uint32 in_serverip, uint16 in_serverport, CPartFile* in_reqfile, bool ed2kID, bool checkfriend)
+CUpDownClient::CUpDownClient(uint16 in_port,
+	uint32 in_userid,
+	uint32 in_serverip,
+	uint16 in_serverport,
+	CPartFile *in_reqfile,
+	bool ed2kID,
+	bool checkfriend)
 {
 	m_socket = NULL;
 	Init();
 	m_nUserPort = in_port;
 
-	if(ed2kID && !IsLowID(in_userid)) {
-		SetUserIDHybrid( wxUINT32_SWAP_ALWAYS(in_userid) );
+	if (ed2kID && !IsLowID(in_userid)) {
+		SetUserIDHybrid(wxUINT32_SWAP_ALWAYS(in_userid));
 	} else {
-		SetUserIDHybrid( in_userid);
+		SetUserIDHybrid(in_userid);
 	}
 
-	//If highID and ED2K source, incoming ID and IP are equal..
-	//If highID and Kad source, incoming IP needs swap for the IP
+	// If highID and ED2K source, incoming ID and IP are equal..
+	// If highID and Kad source, incoming IP needs swap for the IP
 
 	if (!HasLowID()) {
 		if (ed2kID) {
-			m_nConnectIP = in_userid;
+			m_connectAddress = CNetworkAddress::FromIPv4NetworkOrder(in_userid);
 		} else {
-			m_nConnectIP = wxUINT32_SWAP_ALWAYS(in_userid);
+			m_connectAddress =
+				CNetworkAddress::FromIPv4NetworkOrder(wxUINT32_SWAP_ALWAYS(in_userid));
 		}
-		// Will be on right endianness now
-		m_FullUserIP = m_nConnectIP;
+		m_FullUserIP = m_connectAddress.ToIPv4NetworkOrderOrZero();
 	}
 
 	m_dwServerIP = in_serverip;
 	m_nServerPort = in_serverport;
-	SetRequestFile( in_reqfile );
+	SetRequestFile(in_reqfile);
 	ReGetClientSoft();
 
 	if (checkfriend) {
-		if ((m_Friend = theApp->friendlist->FindFriend(CMD4Hash(), m_dwUserIP, m_nUserPort)) != NULL){
-			m_Friend->LinkClient(CCLIENTREF(this, "CUpDownClient::CUpDownClient m_Friend->LinkClient"));
-		} else{
+		if ((m_Friend = theApp->friendlist->FindFriend(CMD4Hash(), GetIP(), m_nUserPort)) !=
+			nullptr) {
+			m_Friend->LinkClient(
+				CCLIENTREF(this, "CUpDownClient::CUpDownClient m_Friend->LinkClient"));
+		} else {
 			// avoid that an unwanted client instance keeps a friend slot
 			m_bFriendSlot = false;
 		}
 	}
-
 }
 
 void CUpDownClient::Init()
@@ -159,7 +170,7 @@
 	m_nKadState = KS_NONE;
 	m_nChatCaptchaState = CA_NONE;
 	m_cShowDR = 0;
-	m_reqfile = NULL;	 // No file required yet
+	m_reqfile = NULL; // No file required yet
 	m_nTransferredUp = 0;
 	m_cSendblock = 0;
 	m_cAsked = 0;
@@ -167,7 +178,9 @@
 	kBpsDown = 0.0;
 	bytesReceivedCycle = 0;
 	m_nServerPort = 0;
-	m_iFileListRequested = 0;
+	m_browseSearchId = 0;
+	m_browseEcInitiated = false;
+	m_browsePinned = false;
 	m_dwLastUpRequest = 0;
 	m_bEmuleProtocol = false;
 	m_bCompleteSource = false;
@@ -198,7 +211,8 @@
 	m_dwLastAskedForSources = 0;
 
 	m_SecureIdentState = IS_UNAVAILABLE;
-	m_dwLastSignatureIP = 0;
+	m_lastSignatureAddress = CNetworkAddress::Absent();
+	m_hasReceivedSignature = false;
 
 	m_byInfopacketsReceived = IP_NONE;
 
@@ -207,7 +221,7 @@
 	m_Friend = NULL;
 	m_iRating = 0;
 	m_nCurSessionUp = 0;
-	m_clientSoft=SO_UNKNOWN;
+	m_clientSoft = SO_UNKNOWN;
 
 	m_bRemoteQueueFull = false;
 	m_HasValidHash = false;
@@ -216,7 +230,7 @@
 	m_fHashsetRequesting = 0;
 	m_fSharedDirectories = 0;
 	m_lastPartAsked = 0xffff;
-	m_nUpCompleteSourcesCount= 0;
+	m_nUpCompleteSourcesCount = 0;
 	m_waitingPosition = 0;
 	m_score = 0;
 	m_lastRefreshedDLDisplay = 0;
@@ -236,8 +250,8 @@
 	m_fExtMultiPacket = 0;
 	m_fIsSpammer = 0;
 
-	m_dwUserIP = 0;
-	m_nConnectIP = 0;
+	m_userAddress = CNetworkAddress::Absent();
+	m_connectAddress = CNetworkAddress::Absent();
 	m_dwServerIP = 0;
 
 	m_fNeedOurPublicIP = false;
@@ -258,7 +272,7 @@
 	m_nSourceFrom = SF_NONE;
 
 	if (m_socket) {
-		SetIP(m_socket->GetPeerInt());
+		SetUserAddress(m_socket->GetPeerAddress());
 	} else {
 		SetIP(0);
 	}
@@ -267,10 +281,9 @@
 	m_lastClientSoft = (uint32)(-1);
 	m_lastClientVersion = 0;
 
-	m_MaxBlockRequests = STANDARD_BLOCKS_REQUEST; // Safe starting amount
-
 	m_last_block_start = 0;
 	m_lastaverage = 0;
+	m_minRTT = 0;
 
 	SetLastBuddyPingPongTime();
 	m_fRequestsCryptLayer = 0;
@@ -286,18 +299,16 @@
 	m_cCaptchasSent = 0;
 	m_cMessagesReceived = 0;
 	m_cMessagesSent = 0;
-
 }
 
-
 CUpDownClient::~CUpDownClient()
 {
-	#ifdef __DEBUG__
+#ifdef __DEBUG__
 	if (!connection_reason.IsEmpty()) {
-		AddDebugLogLineN(logClient, "Client to check for " + connection_reason + " was deleted without connection.");
+		AddDebugLogLineN(logClient,
+			"Client to check for " + connection_reason + " was deleted without connection.");
 	}
-	#endif
-
+#endif
 
 	if (m_lastClientSoft == SO_UNKNOWN) {
 		theStats::RemoveUnknownClient();
@@ -325,7 +336,6 @@
 	m_clientState = CS_DYING;
 }
 
-
 void CUpDownClient::ClearHelloProperties()
 {
 	m_nUDPPort = 0;
@@ -343,9 +353,13 @@
 	m_fSharedDirectories = 0;
 	m_bMultiPacket = 0;
 	m_fOsInfoSupport = 0;
-	m_fValueBasedTypeTags = 0;
 	SecIdentSupRec = 0;
 	m_byKadVersion = 0;
+	m_modCapabilities.Reset();
+	m_hasModIPv6 = false;
+	m_hasServingBuddyIPv6 = false;
+	memset(m_modIPv6, 0, sizeof(m_modIPv6));
+	memset(m_servingBuddyIPv6, 0, sizeof(m_servingBuddyIPv6));
 	m_fRequestsCryptLayer = 0;
 	m_fSupportsCryptLayer = 0;
 	m_fRequiresCryptLayer = 0;
@@ -354,20 +368,17 @@
 	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_fNoViewSharedFiles = true; // that's a sensible default to assume until we get the real value
 	m_bUnicodeSupport = false;
 }
 
-bool CUpDownClient::ProcessHelloPacket(const uint8_t* pachPacket, uint32 nSize)
+bool CUpDownClient::ProcessHelloPacket(const uint8_t *pachPacket, uint32 nSize)
 {
-	const CMemFile data(pachPacket,nSize);
+	const CMemFile data(pachPacket, nSize);
 	uint8 hashsize = data.ReadUInt8();
-	if ( 16 != hashsize ) {
-		/*
-		 * Hint: We can not accept other sizes here because:
-		 *       - the magic number is spread all over the source
-		 *       - the answer packet lacks the size field
-		 */
+	if (16 != hashsize) {
+		// Other sizes cannot be accepted here: the magic number is spread all over the source,
+		// and the answer packet lacks the size field.
 		throw wxString("Invalid Hello packet: Other userhash sizes than 16 are not implemented");
 	}
 	// eMule 0.42: reset all client properties; a client may not send a particular emule tag any longer
@@ -380,13 +391,14 @@
 {
 	// Because we are delaying the deletion, we might end up trying to delete
 	// it twice, however, this is normal and shouldn't trigger any failures
-	if ( m_clientState == CS_DYING ) {
+	if (m_clientState == CS_DYING) {
 		return;
 	}
 
 	// If called from background, post an event to process it in main thread
 	if (!wxThread::IsMain()) {
-		CoreNotify_Client_Delete(CCLIENTREF(this, "CUpDownClient::Safe_Delete CoreNotify_Client_Delete"));
+		CoreNotify_Client_Delete(
+			CCLIENTREF(this, "CUpDownClient::Safe_Delete CoreNotify_Client_Delete"));
 		return;
 	}
 
@@ -396,15 +408,15 @@
 	CClientRef ref(CCLIENTREF(this, "CUpDownClient::Safe_Delete reflocker"));
 
 	// Close the socket to avoid any more connections and related events
-	if ( m_socket ) {
+	if (m_socket) {
 		m_socket->Safe_Delete();
 		// Paranoia
 		SetSocket(NULL);
 	}
 
 	// Remove the client from the clientlist if we still have it
-	if ( theApp->clientlist ) {
-		theApp->clientlist->RemoveClient( this );
+	if (theApp->clientlist) {
+		theApp->clientlist->RemoveClient(this);
 	}
 
 	// Doing what RemoveClient used to do. Just to be sure...
@@ -417,20 +429,21 @@
 	}
 
 	// For security, remove it from the lists unconditionally.
-	Notify_SharedCtrlRemoveClient(ECID(), (CKnownFile*)NULL);
-	Notify_SourceCtrlRemoveSource(ECID(), (CPartFile*)NULL);
+	Notify_SharedCtrlRemoveClient(ECID(), (CKnownFile *)NULL);
+	Notify_SourceCtrlRemoveSource(ECID(), (CPartFile *)NULL);
+	theApp->ForgetECObject(ECID());
 
-	if (IsAICHReqPending()){
+	if (IsAICHReqPending()) {
 		m_fAICHRequested = FALSE;
 		CAICHHashSet::ClientAICHRequestFailed(this);
 	}
 
 	if (m_Friend) {
-		m_Friend->UnLinkClient();	// this notifies
+		m_Friend->UnLinkClient(); // this notifies
 		m_Friend = NULL;
 	}
 
-	if (m_iRating>0 || !m_strComment.IsEmpty()) {
+	if (m_iRating > 0 || !m_strComment.IsEmpty()) {
 		m_iRating = 0;
 		m_strComment.Clear();
 		if (m_reqfile) {
@@ -440,7 +453,7 @@
 
 	// Ensure that source-counts gets updated in case
 	// of a source not on the download-queue
-	SetRequestFile( NULL );
+	SetRequestFile(NULL);
 
 	SetUploadFileID(NULL);
 
@@ -449,189 +462,275 @@
 
 #ifdef DEBUG_ZOMBIE_CLIENTS
 	if (m_linked > 1) {
-		AddLogLineC(CFormat("Client %d still linked in %d places: %s") % ECID() % (m_linked - 1) % GetLinkedFrom());
+		// Normal level, same as the "last reference ... delete it" line this pairs with.
+		// Deferred deletion is the expected outcome of a source list being walked from a
+		// snapshot, not a fault; logging the first half as critical and the second as normal
+		// made every ordinary deferral read as an error (amule-org/amule#1086).
+		AddLogLineN(CFormat("Client %d: deletion deferred, still referenced in %d place(s): %s") %
+			    ECID() % (m_linked - 1) % GetLinkedFrom());
 		m_linkedDebug = true;
 	}
 #endif
 }
 
-
-bool CUpDownClient::ProcessHelloAnswer(const uint8_t* pachPacket, uint32 nSize)
+bool CUpDownClient::ProcessHelloAnswer(const uint8_t *pachPacket, uint32 nSize)
 {
-	const CMemFile data(pachPacket,nSize);
+	const CMemFile data(pachPacket, nSize);
 	bool bIsMule = ProcessHelloTypePacket(data);
 	m_bHelloAnswerPending = false;
 	return bIsMule;
 }
 
-bool CUpDownClient::ProcessHelloTypePacket(const CMemFile& data)
+bool CUpDownClient::ProcessHelloTypePacket(const CMemFile &data)
 {
 	uint32 dwEmuleTags = 0;
 
 	CMD4Hash hash = data.ReadHash();
-	SetUserHash( hash );
-	SetUserIDHybrid( data.ReadUInt32() );
+	SetUserHash(hash);
+	SetUserIDHybrid(data.ReadUInt32());
 	uint16 nUserPort = data.ReadUInt16(); // hmm clientport is sent twice - why?
 	uint32 tagcount = data.ReadUInt32();
-	for (uint32 i = 0;i < tagcount; i++){
+	for (uint32 i = 0; i < tagcount; i++) {
 		CTag temptag(data, true);
-		switch(temptag.GetNameID()){
-			case CT_NAME:
-				m_Username = temptag.GetStr();
-				break;
+		switch (temptag.GetNameID()) {
+		case CT_NAME:
+			m_Username = temptag.GetStr();
+			break;
 
-			case CT_VERSION:
-				m_nClientVersion = temptag.GetInt();
-				break;
+		case CT_VERSION:
+			m_nClientVersion = temptag.GetInt();
+			break;
 
-			case ET_MOD_VERSION:
-				if (temptag.IsStr()) {
-					m_strModVersion = temptag.GetStr();
-				} else if (temptag.IsInt()) {
-					m_strModVersion = CFormat("ModID=%u") % temptag.GetInt();
-				} else {
-					m_strModVersion = "ModID=<Unknown>";
-				}
+		case ET_MOD_VERSION:
+			if (temptag.IsStr()) {
+				m_strModVersion = temptag.GetStr();
+			} else if (temptag.IsInt()) {
+				m_strModVersion = CFormat("ModID=%u") % temptag.GetInt();
+			} else {
+				m_strModVersion = "ModID=<Unknown>";
+			}
 
-				break;
+			break;
 
-			case CT_PORT:
-				nUserPort = temptag.GetInt();
-				break;
+		case CT_PORT:
+			nUserPort = temptag.GetInt();
+			break;
 
-			case CT_EMULE_UDPPORTS:
-				// 16 KAD Port
-				// 16 UDP Port
-				SetKadPort((temptag.GetInt() >> 16) & 0xFFFF);
-				m_nUDPPort = temptag.GetInt() & 0xFFFF;
-				dwEmuleTags |= 1;
-				#ifdef __PACKET_DEBUG__
-				AddLogLineNS(CFormat("Hello type packet processing with eMule ports UDP=%i KAD=%i") % m_nUDPPort % m_nKadPort);
-				#endif
-				break;
+		case CT_EMULE_UDPPORTS:
+			// 16 KAD Port
+			// 16 UDP Port
+			SetKadPort((temptag.GetInt() >> 16) & 0xFFFF);
+			m_nUDPPort = temptag.GetInt() & 0xFFFF;
+			dwEmuleTags |= 1;
+#ifdef __PACKET_DEBUG__
+			AddLogLineNS(CFormat("Hello type packet processing with eMule ports UDP=%i KAD=%i") %
+				     m_nUDPPort % m_nKadPort);
+#endif
+			break;
 
-			case CT_EMULE_BUDDYIP:
-				// 32 BUDDY IP
-				m_nBuddyIP = temptag.GetInt();
-				#ifdef __PACKET_DEBUG__
-				AddLogLineNS(CFormat("Hello type packet processing with eMule BuddyIP=%u (%s)") % m_nBuddyIP % Uint32toStringIP(m_nBuddyIP));
-				#endif
-				break;
+		case CT_EMULE_BUDDYIP:
+			// 32 BUDDY IP
+			m_nBuddyIP = temptag.GetInt();
+#ifdef __PACKET_DEBUG__
+			AddLogLineNS(CFormat("Hello type packet processing with eMule BuddyIP=%u (%s)") %
+				     m_nBuddyIP % Uint32toStringIP(m_nBuddyIP));
+#endif
+			break;
 
-			case CT_EMULE_BUDDYUDP:
-				// 16 --Reserved for future use--
-				// 16 BUDDY Port
-				m_nBuddyPort = (uint16)temptag.GetInt();
-				#ifdef __PACKET_DEBUG__
-				AddLogLineNS(CFormat("Hello type packet processing with eMule BuddyPort=%u") % m_nBuddyPort);
-				#endif
-				break;
+		case CT_EMULE_BUDDYUDP:
+			// 16 --Reserved for future use--
+			// 16 BUDDY Port
+			m_nBuddyPort = (uint16)temptag.GetInt();
+#ifdef __PACKET_DEBUG__
+			AddLogLineNS(CFormat("Hello type packet processing with eMule BuddyPort=%u") %
+				     m_nBuddyPort);
+#endif
+			break;
 
-			case CT_EMULE_MISCOPTIONS1: {
-				//  3 AICH Version (0 = not supported)
-				//  1 Unicode
-				//  4 UDP version
-				//  4 Data compression version
-				//  4 Secure Ident
-				//  4 Source Exchange
-				//  4 Ext. Requests
-				//  4 Comments
-				//	 1 PeerCache supported
-				//	 1 No 'View Shared Files' supported
-				//	 1 MultiPacket
-				//  1 Preview
-				uint32 flags = temptag.GetInt();
-				m_fSupportsAICH			= (flags >> (4*7+1)) & 0x07;
-				m_bUnicodeSupport		= (flags >> 4*7) & 0x01;
-				m_byUDPVer				= (flags >> 4*6) & 0x0f;
-				m_byDataCompVer			= (flags >> 4*5) & 0x0f;
-				m_bySupportSecIdent		= (flags >> 4*4) & 0x0f;
-				m_bySourceExchange1Ver	= (flags >> 4*3) & 0x0f;
-				m_byExtendedRequestsVer	= (flags >> 4*2) & 0x0f;
-				m_byAcceptCommentVer	= (flags >> 4*1) & 0x0f;
-				m_fNoViewSharedFiles	= (flags >> 1*2) & 0x01;
-				m_bMultiPacket			= (flags >> 1*1) & 0x01;
-				m_fSupportsPreview		= (flags >> 1*0) & 0x01;
-				dwEmuleTags |= 2;
-				#ifdef __PACKET_DEBUG__
-				AddLogLineNS("Hello type packet processing with eMule Misc Options:");
-				AddLogLineNS(CFormat("m_byUDPVer = %i") % m_byUDPVer);
-				AddLogLineNS(CFormat("m_byDataCompVer = %i") % m_byDataCompVer);
-				AddLogLineNS(CFormat("m_bySupportSecIdent = %i") % m_bySupportSecIdent);
-				AddLogLineNS(CFormat("m_bySourceExchangeVer = %i") % m_bySourceExchange1Ver);
-				AddLogLineNS(CFormat("m_byExtendedRequestsVer = %i") % m_byExtendedRequestsVer);
-				AddLogLineNS(CFormat("m_byAcceptCommentVer = %i") % m_byAcceptCommentVer);
-				AddLogLineNS(CFormat("m_fNoViewSharedFiles = %i") % m_fNoViewSharedFiles);
-				AddLogLineNS(CFormat("m_bMultiPacket = %i") % m_bMultiPacket);
-				AddLogLineNS(CFormat("m_fSupportsPreview = %i") % m_fSharedDirectories);
-				AddLogLineNS("That's all.");
-				#endif
-				SecIdentSupRec +=  1;
-				break;
+		case CT_EMULE_MISCOPTIONS1: {
+			//  3 AICH Version (0 = not supported)
+			//  1 Unicode
+			//  4 UDP version
+			//  4 Data compression version
+			//  4 Secure Ident
+			//  4 Source Exchange
+			//  4 Ext. Requests
+			//  4 Comments
+			//	 1 PeerCache supported
+			//	 1 No 'View Shared Files' supported
+			//	 1 MultiPacket
+			//  1 Preview
+			uint32 flags = temptag.GetInt();
+			m_fSupportsAICH = (flags >> (4 * 7 + 1)) & 0x07;
+			m_bUnicodeSupport = (flags >> 4 * 7) & 0x01;
+			m_byUDPVer = (flags >> 4 * 6) & 0x0f;
+			m_byDataCompVer = (flags >> 4 * 5) & 0x0f;
+			m_bySupportSecIdent = (flags >> 4 * 4) & 0x0f;
+			m_bySourceExchange1Ver = (flags >> 4 * 3) & 0x0f;
+			m_byExtendedRequestsVer = (flags >> 4 * 2) & 0x0f;
+			m_byAcceptCommentVer = (flags >> 4 * 1) & 0x0f;
+			m_fNoViewSharedFiles = (flags >> 1 * 2) & 0x01;
+			m_bMultiPacket = (flags >> 1 * 1) & 0x01;
+			m_fSupportsPreview = (flags >> 1 * 0) & 0x01;
+			dwEmuleTags |= 2;
+#ifdef __PACKET_DEBUG__
+			AddLogLineNS("Hello type packet processing with eMule Misc Options:");
+			AddLogLineNS(CFormat("m_byUDPVer = %i") % m_byUDPVer);
+			AddLogLineNS(CFormat("m_byDataCompVer = %i") % m_byDataCompVer);
+			AddLogLineNS(CFormat("m_bySupportSecIdent = %i") % m_bySupportSecIdent);
+			AddLogLineNS(CFormat("m_bySourceExchangeVer = %i") % m_bySourceExchange1Ver);
+			AddLogLineNS(CFormat("m_byExtendedRequestsVer = %i") % m_byExtendedRequestsVer);
+			AddLogLineNS(CFormat("m_byAcceptCommentVer = %i") % m_byAcceptCommentVer);
+			AddLogLineNS(CFormat("m_fNoViewSharedFiles = %i") % m_fNoViewSharedFiles);
+			AddLogLineNS(CFormat("m_bMultiPacket = %i") % m_bMultiPacket);
+			AddLogLineNS(CFormat("m_fSupportsPreview = %i") % m_fSharedDirectories);
+			AddLogLineNS("That's all.");
+#endif
+			SecIdentSupRec += 1;
+			break;
+		}
+
+		case CT_EMULE_MISCOPTIONS2:
+			//  19 Reserved
+			//   1 Direct UDP Callback supported and available
+			//   1 Supports ChatCaptchas
+			//   1 Supports SourceExachnge2 Packets, ignores SX1 Packet Version
+			//   1 Requires CryptLayer
+			//   1 Requests CryptLayer
+			//   1 Supports CryptLayer
+			//   1 Reserved (ModBit)
+			//   1 Ext Multipacket (Hash+Size instead of Hash)
+			//   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;
+			m_fSupportsCaptcha = (temptag.GetInt() >> 11) & 0x01;
+			m_fSupportsSourceEx2 = (temptag.GetInt() >> 10) & 0x01;
+			m_fRequiresCryptLayer = (temptag.GetInt() >> 9) & 0x01;
+			m_fRequestsCryptLayer = (temptag.GetInt() >> 8) & 0x01;
+			m_fSupportsCryptLayer = (temptag.GetInt() >> 7) & 0x01;
+			// reserved 1
+			m_fExtMultiPacket = (temptag.GetInt() >> 5) & 0x01;
+			m_fSupportsLargeFiles = (temptag.GetInt() >> 4) & 0x01;
+			m_byKadVersion = (temptag.GetInt() >> 0) & 0x0f;
+			dwEmuleTags |= 8;
+
+			m_fRequestsCryptLayer &= m_fSupportsCryptLayer;
+			m_fRequiresCryptLayer &= m_fRequestsCryptLayer;
+
+#ifdef __PACKET_DEBUG__
+			AddLogLineNS("Hello type packet processing with eMule Misc Options 2:");
+			AddLogLineNS(CFormat("	m_fDirectUDPCallback	= %i") % m_fDirectUDPCallback);
+			AddLogLineNS(CFormat("	m_fSupportsCaptcha		= %i") % m_fSupportsCaptcha);
+			AddLogLineNS(CFormat("	m_fSupportsSourceEx2	= %i") % m_fSupportsSourceEx2);
+			AddLogLineNS(CFormat("	m_fRequiresCryptLayer	= %i") % m_fRequiresCryptLayer);
+			AddLogLineNS(CFormat("	m_fRequestsCryptLayer	= %i") % m_fRequestsCryptLayer);
+			AddLogLineNS(CFormat("	m_fSupportsCryptLayer	= %i") % m_fSupportsCryptLayer);
+			AddLogLineNS(CFormat("	m_fExtMultiPacket	= %i") % m_fExtMultiPacket);
+			AddLogLineNS(CFormat("	m_fSupportsLargeFiles	= %i") % m_fSupportsLargeFiles);
+			AddLogLineNS(CFormat("	KadVersion		= %u") % m_byKadVersion);
+			AddLogLineNS("That's all.");
+#endif
+			break;
+
+		// Special tag for Compat. Clients Misc options.
+		case CT_EMULECOMPAT_OPTIONS:
+			//  1 Operative System Info
+			m_fOsInfoSupport = (temptag.GetInt() >> 1 * 0) & 0x01;
+			break;
+
+		case CT_EMULE_VERSION:
+			//  8 Compatible Client ID
+			//  7 Mjr Version (Doesn't really matter..)
+			//  7 Min Version (Only need 0-99)
+			//  3 Upd Version (Only need 0-5)
+			//  7 Bld Version (Only need 0-99)
+			m_byCompatibleClient = (temptag.GetInt() >> 24);
+			m_nClientVersion = temptag.GetInt() & 0x00ffffff;
+			m_byEmuleVersion = 0x99;
+			m_fSharedDirectories = 1;
+			dwEmuleTags |= 4;
+			break;
+
+		// eMuleAI vendor capability tags. Recorded, never acted on: what aMule buys here is that
+		// an eMuleAI peer stops looking like a client sending malformed handshakes. The bit
+		// meanings are wire format and live in src/PeerCapabilities.h.
+		case CT_MOD_MISCOPTIONS:
+			//  1 Extended source exchange
+			//  1 Legacy uTP NAT traversal
+			//  1 IPv6
+			//  1 Serving-buddy pull
+			//  1 QUIC NAT traversal
+			// 27 Reserved -- masked off by SetFromWire, so nothing can be inferred from a peer
+			//    that sets them.
+			if (temptag.IsInt()) {
+				m_modCapabilities.SetFromWire((uint32)temptag.GetInt());
+				AddDebugLogLineN(logClient,
+					CFormat("Peer advertises vendor capabilities 0x%02X (%s)") %
+						m_modCapabilities.KnownBits() %
+						m_modCapabilities.GetDisplayText());
 			}
+			break;
 
-			case CT_EMULE_MISCOPTIONS2:
-				//  19 Reserved
-				//   1 Direct UDP Callback supported and available
-				//   1 Supports ChatCaptchas
-				//   1 Supports SourceExachnge2 Packets, ignores SX1 Packet Version
-				//   1 Requires CryptLayer
-				//   1 Requests CryptLayer
-				//   1 Supports CryptLayer
-				//   1 Reserved (ModBit)
-				//   1 Ext Multipacket (Hash+Size instead of Hash)
-				//   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;
-				m_fSupportsCaptcha	    = (temptag.GetInt() >> 11) & 0x01;
-				m_fSupportsSourceEx2	= (temptag.GetInt() >> 10) & 0x01;
-				m_fRequiresCryptLayer	= (temptag.GetInt() >>  9) & 0x01;
-				m_fRequestsCryptLayer	= (temptag.GetInt() >>  8) & 0x01;
-				m_fSupportsCryptLayer	= (temptag.GetInt() >>  7) & 0x01;
-				// reserved 1
-				m_fExtMultiPacket	= (temptag.GetInt() >>  5) & 0x01;
-				m_fSupportsLargeFiles   = (temptag.GetInt() >>  4) & 0x01;
-				m_byKadVersion		= (temptag.GetInt() >>  0) & 0x0f;
-				dwEmuleTags |= 8;
-
-				m_fRequestsCryptLayer &= m_fSupportsCryptLayer;
-				m_fRequiresCryptLayer &= m_fRequestsCryptLayer;
-
-				#ifdef __PACKET_DEBUG__
-				AddLogLineNS("Hello type packet processing with eMule Misc Options 2:");
-				AddLogLineNS(CFormat("	m_fDirectUDPCallback	= %i") % m_fDirectUDPCallback);
-				AddLogLineNS(CFormat("	m_fSupportsCaptcha		= %i") % m_fSupportsCaptcha);
-				AddLogLineNS(CFormat("	m_fSupportsSourceEx2	= %i") % m_fSupportsSourceEx2);
-				AddLogLineNS(CFormat("	m_fRequiresCryptLayer	= %i") % m_fRequiresCryptLayer);
-				AddLogLineNS(CFormat("	m_fRequestsCryptLayer	= %i") % m_fRequestsCryptLayer);
-				AddLogLineNS(CFormat("	m_fSupportsCryptLayer	= %i") % m_fSupportsCryptLayer);
-				AddLogLineNS(CFormat("	m_fExtMultiPacket	= %i") % m_fExtMultiPacket);
-				AddLogLineNS(CFormat("	m_fSupportsLargeFiles	= %i") % m_fSupportsLargeFiles);
-				AddLogLineNS(CFormat("	KadVersion		= %u") % m_byKadVersion);
-				AddLogLineNS("That's all.");
-				#endif
-				break;
+		case CT_MOD_IP_V6:
+			// 16 bytes, big-endian. aMule has no IPv6 stack yet, so this is stored for the
+			// dual-stack change and otherwise unused.
+			//
+			// Kept only when this edge can name it unambiguously: a tag carries no scope id,
+			// so a link-local address here and the same peer's socket address are two
+			// identities. See PeerAddressing::IsUsableTagIdentity.
+			if (temptag.IsHash() &&
+				PeerAddressing::IsUsableTagIdentity(
+					CNetworkAddress::FromIPv6Bytes(temptag.GetHash().GetHash()))) {
+				md4cpy(m_modIPv6, temptag.GetHash().GetHash());
+				m_hasModIPv6 = true;
+			}
+			break;
 
-			// Special tag for Compat. Clients Misc options.
-			case CT_EMULECOMPAT_OPTIONS:
-				//  1 Operative System Info
-				//	1 Value-based-type int tags (experimental!)
-				m_fValueBasedTypeTags	= (temptag.GetInt() >> 1*1) & 0x01;
-				m_fOsInfoSupport		= (temptag.GetInt() >> 1*0) & 0x01;
-				break;
+		case CT_EMULE_SERVINGBUDDYIPV6:
+			// 16 bytes, big-endian: the v6 counterpart of CT_EMULE_BUDDYIP above. aMule has no
+			// IPv6 stack yet, so like CT_MOD_IP_V6 this is stored for the dual-stack change and
+			// otherwise unused. Without it the buddy's v6 address arrives over Kad ("bi6") and
+			// is dropped in the hello.
+			// Same rule as CT_MOD_IP_V6: a buddy is an address aMule dials, so one it cannot
+			// name unambiguously is worse than none.
+			if (temptag.IsHash() &&
+				PeerAddressing::IsUsableTagIdentity(
+					CNetworkAddress::FromIPv6Bytes(temptag.GetHash().GetHash()))) {
+				md4cpy(m_servingBuddyIPv6, temptag.GetHash().GetHash());
+				m_hasServingBuddyIPv6 = true;
+			}
+			break;
 
-			case CT_EMULE_VERSION:
-				//  8 Compatible Client ID
-				//  7 Mjr Version (Doesn't really matter..)
-				//  7 Min Version (Only need 0-99)
-				//  3 Upd Version (Only need 0-5)
-				//  7 Bld Version (Only need 0-99)
-				m_byCompatibleClient = (temptag.GetInt() >> 24);
-				m_nClientVersion = temptag.GetInt() & 0x00ffffff;
-				m_byEmuleVersion = 0x99;
-				m_fSharedDirectories = 1;
-				dwEmuleTags |= 4;
-				break;
+		case CT_MOD_YOUR_IP:
+			// The address this peer says it saw us arrive from. Only the hash form is read:
+			// eMuleAI also accepts an integer form and sets its own public IPv4 from it, which
+			// lets a single unverified peer decide what this client believes its own address to
+			// be. emule-qt ignores the integer form, and this follows emule-qt.
+			//
+			// Even the hash form is not believed on one peer's word. It goes to a tracker that
+			// first checks the value is an address this machine actually holds -- so peers can
+			// only disambiguate between our own, never make us adopt a foreign one -- and then
+			// requires several distinct *observed* addresses to agree within a time window, keyed
+			// on where the packet actually came from rather than on the peer's self-declared user
+			// hash. Nothing consumes the result yet.
+			if (temptag.IsHash()) {
+				ObservedPublicIPv6().AddClaim(
+					GetConnectIP(), temptag.GetHash().GetHash(), ::GetTickCount64());
+			}
+			break;
+
+		default:
+			// An unrecognised tag is not a broken handshake. The switch has always fallen through
+			// silently for tags aMule does not know; the only thing added here is visibility for
+			// the vendor range, because a new CT_MOD_* tag arriving in the wild is worth knowing
+			// about.
+			if (temptag.GetNameID() >= 0xA0 && temptag.GetNameID() <= 0xAF) {
+				AddDebugLogLineN(logClient,
+					CFormat("Ignoring unknown vendor tag 0x%02X in hello from %s") %
+						temptag.GetNameID() % GetFullIP());
+			}
+			break;
 		}
 	}
 
@@ -640,67 +739,101 @@
 	m_nServerPort = data.ReadUInt16();
 	// Hybrid now has an extra uint32.. What is it for?
 	// Also, many clients seem to send an extra 6? These are not eDonkeys or Hybrids..
-	if ( data.GetLength() - data.GetPosition() == sizeof(uint32) ) {
+	if (data.GetLength() - data.GetPosition() == sizeof(uint32)) {
 		uint32 test = data.ReadUInt32();
-		/*if (test == 'KDLM') below kdlm is converted to ascii values.
-		This fixes a warning with gcc 3.4.
-		K=4b D=44 L=4c M=4d
-		*/
-		if (test == 0x4b444c4d) { //if it's == "KDLM"
-			m_bIsML=true;
-		} else{
+		// if (test == 'KDLM') below: kdlm is converted to ascii values, which fixes a warning
+		// with gcc 3.4. K=4b D=44 L=4c M=4d
+		if (test == 0x4b444c4d) { // if it's == "KDLM"
+			m_bIsML = true;
+		} else {
 			m_bIsHybrid = true;
 			m_fSharedDirectories = 1;
 		}
 	}
 
 	if (m_socket) {
-		SetIP(m_socket->GetPeerInt());
+		SetUserAddress(m_socket->GetPeerAddress());
 	} else {
 		throw wxString("Huh, socket failure. Avoided crash this time.");
 	}
 
 	if (thePrefs::AddServersFromClient()) {
-		CServer* addsrv = new CServer(m_nServerPort, Uint32toStringIP(m_dwServerIP));
+		CServer *addsrv = new CServer(m_nServerPort, Uint32toStringIP(m_dwServerIP));
 		addsrv->SetListName(addsrv->GetAddress());
 		if (!theApp->AddServer(addsrv)) {
-				delete addsrv;
+			delete addsrv;
 		}
 	}
 
-	//(a)If this is a highID user, store the ID in the Hybrid format.
-	//(b)Some older clients will not send a ID, these client are HighID users that are not connected to a server.
-	//(c)Kad users with a *.*.*.0 IPs will look like a lowID user they are actually a highID user.. They can be detected easily
-	//because they will send a ID that is the same as their IP..
-	if(!HasLowID() || m_nUserIDHybrid == 0 || m_nUserIDHybrid == m_dwUserIP )  {
-		SetUserIDHybrid(wxUINT32_SWAP_ALWAYS(m_dwUserIP));
+	// (a) If this is a highID user, store the ID in the Hybrid format. (b) Some older clients
+	// will not send an ID; those are HighID users not connected to a server. (c) Kad users
+	// with a *.*.*.0 IP look like a lowID user but are actually highID -- easily detected,
+	// because they send an ID that is the same as their IP.
+	if (!HasLowID() || m_nUserIDHybrid == 0 || m_nUserIDHybrid == GetIP()) {
+		SetUserIDHybrid(wxUINT32_SWAP_ALWAYS(GetIP()));
 	}
 
 	// get client credits
-	CClientCredits* pFoundCredits = theApp->clientcredits->GetCredit(m_UserHash);
-	if (credits == NULL){
+	CClientCredits *pFoundCredits = theApp->clientcredits->GetCredit(m_UserHash);
+	if (credits == NULL) {
 		credits = pFoundCredits;
-		if (!theApp->clientlist->ComparePriorUserhash(m_dwUserIP, m_nUserPort, pFoundCredits)){
-			AddDebugLogLineN( logClient, CFormat( "Client: %s (%s) Banreason: Userhash changed (Found in TrackedClientsList)" ) % GetUserName() % GetFullIP() );
+		if (!theApp->clientlist->ComparePriorUserhash(GetUserAddress(), m_nUserPort, pFoundCredits)) {
+			AddDebugLogLineN(logClient,
+				CFormat("Client: %s (%s) Banreason: Userhash changed (Found in "
+					"TrackedClientsList)") %
+					GetUserName() % GetFullIP());
 			Ban();
 		}
-	} else if (credits != pFoundCredits){
+	} else if (credits != pFoundCredits) {
 		// userhash change ok, however two hours "waittime" before it can be used
 		credits = pFoundCredits;
-		AddDebugLogLineN( logClient, CFormat( "Client: %s (%s) Banreason: Userhash changed" ) % GetUserName() % GetFullIP() );
+		AddDebugLogLineN(logClient,
+			CFormat("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(CCLIENTREF(this, "CUpDownClient::ProcessHelloTypePacket m_Friend->LinkClient"));
-	} else{
+	// A friend record can already be linked to this client from before the handshake, matched
+	// on address alone, and an address gets recycled. Now that the peer has said who it is, a
+	// record that turns out to be about somebody else has to let go: clearing only this
+	// client's side would leave that record pointing here and showing its friend as connected.
+	// Unlink first, because UnLinkClient() clears m_Friend as it goes.
+	CFriend *previous = m_Friend;
+	CFriend *found = theApp->friendlist->FindFriend(m_UserHash, GetIP(), m_nUserPort);
+	if (previous != nullptr && previous != found) {
+		previous->UnLinkClient();
+	}
+	m_Friend = found;
+	if (m_Friend != nullptr) {
+		m_Friend->LinkClient(
+			CCLIENTREF(this, "CUpDownClient::ProcessHelloTypePacket m_Friend->LinkClient"));
+	} else {
 		// avoid that an unwanted client instance keeps a friend slot
 		SetFriendSlot(false);
 	}
 
-
 	ReGetClientSoft();
 
+	// Everything worth remembering about this peer is populated by now: the name came out of
+	// the hello tags above, the address from the connection, and ReGetClientSoft() has just
+	// resolved the software and version. The credit record is the only thing that outlives the
+	// connection, so this is where a peer stops being anonymous in the history.
+	//
+	// The session count is taken once per client object rather than once per call: an outgoing
+	// connection processes a hello answer as well as a hello, and a count that rose per packet
+	// would measure traffic instead of visits.
+	if (credits != nullptr) {
+		credits->UpdateMeta(m_Username,
+			GetIP(),
+			m_nUserPort,
+			m_nKadPort,
+			m_nClientVersion,
+			m_clientSoft,
+			static_cast<uint8>(m_nSourceFrom),
+			GetObfuscationStatus(),
+			!m_metaSessionCounted);
+		m_metaSessionCounted = true;
+	}
+
 	m_byInfopacketsReceived |= IP_EDONKEYPROTPACK;
 
 	// check if at least CT_EMULEVERSION was received, all other tags are optional
@@ -710,20 +843,23 @@
 		m_byInfopacketsReceived |= IP_EMULEPROTPACK;
 	}
 
-	if (GetKadPort() && GetKadVersion() > 1) {
+	// GetIP() is zero for a peer with no ed2k wire form, and Kad speaks 32-bit
+	// addresses only: bootstrapping from zero asserts in a debug build, and in a
+	// release one sends KADEMLIA2_BOOTSTRAP_REQ to 0.0.0.0 while still arming the
+	// ten-second throttle, so a run of such peers starves Kad of real attempts.
+	if (GetIP() != 0 && GetKadPort() && GetKadVersion() > 1) {
 		Kademlia::CKademlia::Bootstrap(wxUINT32_SWAP_ALWAYS(GetIP()), GetKadPort());
 	}
 
 	return bIsMule;
 }
 
-
 bool CUpDownClient::SendHelloPacket()
 {
 	wxCHECK(m_socket != NULL, true);
 
 	// if IP is filtered, don't greet him but disconnect...
-	if (theApp->ipfilter->IsFiltered(m_socket->GetPeerInt())) {
+	if (theApp->ipfilter->IsFiltered(m_socket->GetPeerAddress())) {
 		if (Disconnected("IPFilter")) {
 			Safe_Delete();
 			return false;
@@ -735,11 +871,11 @@
 	data.WriteUInt8(16); // size of userhash
 	SendHelloTypePacket(&data);
 
-	CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_HELLO);
+	CPacket *packet = new CPacket(data, OP_EDONKEYPROT, OP_HELLO);
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
-	SendPacket(packet,true);
+	SendPacket(packet, true);
 	m_bHelloAnswerPending = true;
-	AddDebugLogLineN( logLocalClient, "Local Client: OP_HELLO to " + GetFullIP() );
+	AddDebugLogLineN(logLocalClient, "Local Client: OP_HELLO to " + GetFullIP());
 	return true;
 }
 
@@ -747,7 +883,7 @@
 {
 	wxCHECK2(m_socket != NULL, return);
 
-	CPacket* packet = NULL;
+	CPacket *packet = NULL;
 	CMemFile data;
 
 	data.WriteUInt8(CURRENT_VERSION_SHORT);
@@ -757,15 +893,14 @@
 		// Special MuleInfo packet for clients supporting it.
 		// This means aMule >= 2.0.0 and Hydranode
 
-		// Violently mark it as special Mule Info packet
-		// Sending this makes non-supporting-osinfo clients to refuse to read this
-		// packet. Anyway, this packet should NEVER get to non-supporting clients.
+		// Violently mark it as a special Mule Info packet. Sending this makes
+		// non-supporting-osinfo clients refuse to read it -- and it should NEVER reach one.
 
 		data.WriteUInt8(/*EMULE_PROTOCOL*/ 0xFF);
 
 		data.WriteUInt32(1); // One Tag (OS_INFO)
 
-		CTagString tag1(ET_OS_INFO,theApp->GetOSType());
+		CTagString tag1(ET_OS_INFO, theApp->GetOSType());
 		tag1.WriteTagToFile(&data);
 
 		m_OSInfo_sent = true; // So we don't send it again
@@ -782,20 +917,20 @@
 		// Tag number
 		data.WriteUInt32(9);
 
-		CTagInt32 tag1(ET_COMPRESSION,1);
+		CTagInt32 tag1(ET_COMPRESSION, 1);
 		tag1.WriteTagToFile(&data);
-		CTagInt32 tag2(ET_UDPVER,4);
+		CTagInt32 tag2(ET_UDPVER, 4);
 		tag2.WriteTagToFile(&data);
 		CTagInt32 tag3(ET_UDPPORT, thePrefs::GetEffectiveUDPPort());
 		tag3.WriteTagToFile(&data);
-		CTagInt32 tag4(ET_SOURCEEXCHANGE,3);
+		CTagInt32 tag4(ET_SOURCEEXCHANGE, 3);
 		tag4.WriteTagToFile(&data);
-		CTagInt32 tag5(ET_COMMENTS,1);
+		CTagInt32 tag5(ET_COMMENTS, 1);
 		tag5.WriteTagToFile(&data);
-		CTagInt32 tag6(ET_EXTENDEDREQUEST,2);
+		CTagInt32 tag6(ET_EXTENDEDREQUEST, 2);
 		tag6.WriteTagToFile(&data);
 
-		uint32 dwTagValue = (theApp->CryptoAvailable() ? 3 : 0);
+		uint32 dwTagValue = SecIdent::SupportedVersions(theApp->CryptoAvailable(), HasPeerIPv4());
 		// Kry - Needs the preview code from eMule
 		/*
 		// set 'Preview supported' only if 'View Shared Files' allowed
@@ -806,7 +941,7 @@
 		CTagInt32 tag7(ET_FEATURES, dwTagValue);
 		tag7.WriteTagToFile(&data);
 
-		CTagInt32 tag8(ET_COMPATIBLECLIENT,SO_AMULE);
+		CTagInt32 tag8(ET_COMPATIBLECLIENT, SO_AMULE);
 		tag8.WriteTagToFile(&data);
 
 		// Support for tag ET_MOD_VERSION
@@ -814,68 +949,68 @@
 		CTagString tag9(ET_MOD_VERSION, mod_name);
 		tag9.WriteTagToFile(&data);
 		// Maella end
-
 	}
 
 	packet = new CPacket(data, OP_EMULEPROT, (bAnswer ? OP_EMULEINFOANSWER : OP_EMULEINFO));
 
 	if (m_socket) {
 		theStats::AddUpOverheadOther(packet->GetPacketSize());
-		SendPacket(packet,true,true);
+		SendPacket(packet, true, true);
 
 #ifdef __DEBUG__
 		if (!bAnswer) {
 			if (!OSInfo) {
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_EMULEINFO to " + GetFullIP() );
+				AddDebugLogLineN(
+					logLocalClient, "Local Client: OP_EMULEINFO to " + GetFullIP());
 			} else {
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_EMULEINFO/OS_INFO to " + GetFullIP() );
+				AddDebugLogLineN(logLocalClient,
+					"Local Client: OP_EMULEINFO/OS_INFO to " + GetFullIP());
 			}
 		} else {
-			AddDebugLogLineN( logLocalClient, "Local Client: OP_EMULEINFOANSWER to " + GetFullIP() );
+			AddDebugLogLineN(
+				logLocalClient, "Local Client: OP_EMULEINFOANSWER to " + GetFullIP());
 		}
 #endif
 	}
 }
 
-bool CUpDownClient::ProcessMuleInfoPacket(const uint8_t* pachPacket, uint32 nSize)
+bool CUpDownClient::ProcessMuleInfoPacket(const uint8_t *pachPacket, uint32 nSize)
 {
 	uint8 protocol_version;
 
-	const CMemFile data(pachPacket,nSize);
+	const CMemFile data(pachPacket, nSize);
 
-	// The version number part of this packet will soon be useless since
-	// it is only able to go to v.99. Why the version is a uint8 and why
-	// it was not done as a tag like the eDonkey hello packet is not known.
-	// Therefore, sooner or later, we are going to have to switch over to
-	// using the eDonkey hello packet to set the version. No sense making
-	// a third value sent for versions.
+	// The version number part of this packet will soon be useless, since it can only go to
+	// v.99. Why the version is a uint8 rather than a tag like the eDonkey hello packet is not
+	// known -- sooner or later this has to switch to setting the version from the eDonkey
+	// hello packet instead.
 	uint8 mule_version = data.ReadUInt8();
 	protocol_version = data.ReadUInt8();
 	uint32 tagcount = data.ReadUInt32();
 	if (protocol_version == 0xFF) {
 		// OS Info supporting clients sending a recycled Mule info packet
-		for (uint32 i = 0;i < tagcount; i++){
+		for (uint32 i = 0; i < tagcount; i++) {
 			CTag temptag(data, true);
-			switch(temptag.GetNameID()){
-				case ET_OS_INFO:
-					// Special tag, only supporting clients (aMule/Hydranode)
-					// It was recycled from a mod's tag, so if the other side
-					// is not supporting OS Info, we're seriously fucked up :)
-					m_sClientOSInfo = temptag.GetStr();
-
-					// If we didn't send our OSInfo to this client, just send it
-					if (!m_OSInfo_sent) {
-						SendMuleInfoPacket(false,true);
-					}
+			switch (temptag.GetNameID()) {
+			case ET_OS_INFO:
+				// Special tag, only supporting clients (aMule/Hydranode). It was
+				// recycled from a mod's tag, so if the other side does not support OS
+				// Info, we are seriously stuck.
+				m_sClientOSInfo = temptag.GetStr();
+
+				// If we didn't send our OSInfo to this client, just send it
+				if (!m_OSInfo_sent) {
+					SendMuleInfoPacket(false, true);
+				}
 
-					UpdateStats();
+				UpdateStats();
 
-					break;
+				break;
 
 				// Your ad... er... I mean TAG, here
 
-				default:
-					break;
+			default:
+				break;
 			}
 		}
 	} else {
@@ -883,7 +1018,7 @@
 		m_byCompatibleClient = 0;
 		m_byEmuleVersion = mule_version;
 
-		if( m_byEmuleVersion == 0x2B ) {
+		if (m_byEmuleVersion == 0x2B) {
 			m_byEmuleVersion = 0x22;
 		}
 
@@ -891,108 +1026,107 @@
 			return false;
 		}
 
-		for (uint32 i = 0;i < tagcount; i++){
+		for (uint32 i = 0; i < tagcount; i++) {
 			CTag temptag(data, false);
-			switch(temptag.GetNameID()){
-				case ET_COMPRESSION:
-					// Bits 31- 8: 0 - reserved
-					// Bits  7- 0: data compression version
-					m_byDataCompVer = temptag.GetInt();
-					break;
-
-				case ET_UDPPORT:
-					// Bits 31-16: 0 - reserved
-					// Bits 15- 0: UDP port
-					m_nUDPPort = temptag.GetInt();
-					break;
-
-				case ET_UDPVER:
-					// Bits 31- 8: 0 - reserved
-					// Bits  7- 0: UDP protocol version
-					m_byUDPVer = temptag.GetInt();
-					break;
-
-				case ET_SOURCEEXCHANGE:
-					// Bits 31- 8: 0 - reserved
-					// Bits  7- 0: source exchange protocol version
-					m_bySourceExchange1Ver = temptag.GetInt();
-					break;
-
-				case ET_COMMENTS:
-					// Bits 31- 8: 0 - reserved
-					// Bits  7- 0: comments version
-					m_byAcceptCommentVer = temptag.GetInt();
-					break;
-
-				case ET_EXTENDEDREQUEST:
-					// Bits 31- 8: 0 - reserved
-					// Bits  7- 0: extended requests version
-					m_byExtendedRequestsVer = temptag.GetInt();
-					break;
-
-				case ET_COMPATIBLECLIENT:
-					// Bits 31- 8: 0 - reserved
-					// Bits  7- 0: compatible client ID
-					m_byCompatibleClient = temptag.GetInt();
-					break;
-
-				case ET_FEATURES:
-					// Bits 31- 8: 0 - reserved
-					// Bit	    7: Preview
-					// Bit   6- 0: secure identification
-					m_bySupportSecIdent = temptag.GetInt() & 3;
-					m_bSupportsPreview = (temptag.GetInt() & 128) > 0;
-					SecIdentSupRec +=  2;
-					break;
-
-				case ET_MOD_VERSION:
-					if (temptag.IsStr()) {
-						m_strModVersion = temptag.GetStr();
-					} else if (temptag.IsInt()) {
-						m_strModVersion = CFormat("ModID=%u") % temptag.GetInt();
-					} else {
-						m_strModVersion = "ModID=<Unknown>";
-					}
+			switch (temptag.GetNameID()) {
+			case ET_COMPRESSION:
+				// Bits 31- 8: 0 - reserved
+				// Bits  7- 0: data compression version
+				m_byDataCompVer = temptag.GetInt();
+				break;
+
+			case ET_UDPPORT:
+				// Bits 31-16: 0 - reserved
+				// Bits 15- 0: UDP port
+				m_nUDPPort = temptag.GetInt();
+				break;
+
+			case ET_UDPVER:
+				// Bits 31- 8: 0 - reserved
+				// Bits  7- 0: UDP protocol version
+				m_byUDPVer = temptag.GetInt();
+				break;
+
+			case ET_SOURCEEXCHANGE:
+				// Bits 31- 8: 0 - reserved
+				// Bits  7- 0: source exchange protocol version
+				m_bySourceExchange1Ver = temptag.GetInt();
+				break;
+
+			case ET_COMMENTS:
+				// Bits 31- 8: 0 - reserved
+				// Bits  7- 0: comments version
+				m_byAcceptCommentVer = temptag.GetInt();
+				break;
+
+			case ET_EXTENDEDREQUEST:
+				// Bits 31- 8: 0 - reserved
+				// Bits  7- 0: extended requests version
+				m_byExtendedRequestsVer = temptag.GetInt();
+				break;
 
-					break;
+			case ET_COMPATIBLECLIENT:
+				// Bits 31- 8: 0 - reserved
+				// Bits  7- 0: compatible client ID
+				m_byCompatibleClient = temptag.GetInt();
+				break;
+
+			case ET_FEATURES:
+				// Bits 31- 8: 0 - reserved
+				// Bit	    7: Preview
+				// Bit   6- 0: secure identification
+				m_bySupportSecIdent = temptag.GetInt() & 3;
+				m_bSupportsPreview = (temptag.GetInt() & 128) > 0;
+				SecIdentSupRec += 2;
+				break;
+
+			case ET_MOD_VERSION:
+				if (temptag.IsStr()) {
+					m_strModVersion = temptag.GetStr();
+				} else if (temptag.IsInt()) {
+					m_strModVersion = CFormat("ModID=%u") % temptag.GetInt();
+				} else {
+					m_strModVersion = "ModID=<Unknown>";
+				}
 
-				default:
-					AddDebugLogLineN( logPacketErrors,
-						CFormat( "Unknown Mule tag (%s) from client: %s" )
-							% temptag.GetFullInfo()
-							% GetClientFullInfo()
-					);
+				break;
 
-					break;
+			default:
+				AddDebugLogLineN(logPacketErrors,
+					CFormat("Unknown Mule tag (%s) from client: %s") %
+						temptag.GetFullInfo() % GetClientFullInfo());
+
+				break;
 			}
 		}
 
-		if( m_byDataCompVer == 0 ){
+		if (m_byDataCompVer == 0) {
 			m_bySourceExchange1Ver = 0;
 			m_byExtendedRequestsVer = 0;
 			m_byAcceptCommentVer = 0;
 			m_nUDPPort = 0;
 		}
 
-		//implicitly supported options by older clients
-		//in the future do not use version to guess about new features
-		if(m_byEmuleVersion < 0x25 && m_byEmuleVersion > 0x22) {
+		// implicitly supported options by older clients
+		// in the future do not use version to guess about new features
+		if (m_byEmuleVersion < 0x25 && m_byEmuleVersion > 0x22) {
 			m_byUDPVer = 1;
 		}
 
-		if(m_byEmuleVersion < 0x25 && m_byEmuleVersion > 0x21) {
+		if (m_byEmuleVersion < 0x25 && m_byEmuleVersion > 0x21) {
 			m_bySourceExchange1Ver = 1;
 		}
 
-		if(m_byEmuleVersion == 0x24) {
+		if (m_byEmuleVersion == 0x24) {
 			m_byAcceptCommentVer = 1;
 		}
 
-		// Shared directories are requested from eMule 0.28+ because eMule 0.27 has a bug in
-		// the OP_ASKSHAREDFILESDIR handler, which does not return the shared files for a
-		// directory which has a trailing backslash.
-		if(m_byEmuleVersion >= 0x28 && !m_bIsML) {// MLdonkey currently does not support shared directories
-				m_fSharedDirectories = 1;
+		// Shared directories are requested from eMule 0.28+ because eMule 0.27 has a bug in the
+		// OP_ASKSHAREDFILESDIR handler, which does not return the shared files for a directory
+		// with a trailing backslash.
+		if (m_byEmuleVersion >= 0x28 &&
+			!m_bIsML) { // MLdonkey currently does not support shared directories
+			m_fSharedDirectories = 1;
 		}
 
 		ReGetClientSoft();
@@ -1003,21 +1137,19 @@
 	return (protocol_version == 0xFF); // This was a OS_Info?
 }
 
-
 void CUpDownClient::SendHelloAnswer()
 {
 	wxCHECK2(m_socket != NULL, return);
 
 	CMemFile data(128);
 	SendHelloTypePacket(&data);
-	CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_HELLOANSWER);
+	CPacket *packet = new CPacket(data, OP_EDONKEYPROT, OP_HELLOANSWER);
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
-	AddDebugLogLineN( logLocalClient, "Local Client: OP_HELLOANSWER to " + GetFullIP() );
-	SendPacket(packet,true);
+	AddDebugLogLineN(logLocalClient, "Local Client: OP_HELLOANSWER to " + GetFullIP());
+	SendPacket(packet, true);
 }
 
-
-void CUpDownClient::SendHelloTypePacket(CMemFile* data)
+void CUpDownClient::SendHelloTypePacket(CMemFile *data)
 {
 	data->WriteHash(thePrefs::GetUserHash());
 	data->WriteUInt32(theApp->GetID());
@@ -1025,134 +1157,137 @@
 
 	uint32 tagcount = 6;
 
-	if( theApp->clientlist->GetBuddy() && theApp->IsFirewalled() ) {
+	if (theApp->clientlist->GetBuddy() && theApp->IsFirewalled()) {
 		tagcount += 2;
 	}
-	tagcount ++; // eMule misc flags 2 (kad version)
+	tagcount++; // eMule misc flags 2 (kad version)
+	if (LocalAdvertisedModMiscOptions() != 0) {
+		tagcount++;
+	}
 
-	#ifdef __GIT__
+#ifdef __GIT__
 	// Kry - This is the tagcount!!! Be sure to update it!!
 	// Last update: CT_EMULECOMPAT_OPTIONS included
 	data->WriteUInt32(tagcount + 1);
-	#else
-	data->WriteUInt32(tagcount);  // NO MOD_VERSION
-	#endif
-
+#else
+	data->WriteUInt32(tagcount); // NO MOD_VERSION
+#endif
 
-	CTagString tagname(CT_NAME,thePrefs::GetUserNick());
+	CTagString tagname(CT_NAME, thePrefs::GetUserNick());
 	tagname.WriteTagToFile(data, utf8strRaw);
 
-	CTagVarInt tagversion(CT_VERSION, EDONKEYVERSION, GetVBTTags() ? 0 : 32);
+	CTagVarInt tagversion(CT_VERSION, EDONKEYVERSION, 32);
 	tagversion.WriteTagToFile(data);
 	// eMule UDP Ports
 
 	uint32 kadUDPPort = 0;
 
-	if(Kademlia::CKademlia::IsConnected()) {
-		if (Kademlia::CKademlia::GetPrefs()->GetExternalKadPort() != 0 && Kademlia::CKademlia::GetPrefs()->GetUseExternKadPort() && Kademlia::CUDPFirewallTester::IsVerified()) {
+	if (Kademlia::CKademlia::IsConnected()) {
+		if (Kademlia::CKademlia::GetPrefs()->GetExternalKadPort() != 0 &&
+			Kademlia::CKademlia::GetPrefs()->GetUseExternKadPort() &&
+			Kademlia::CUDPFirewallTester::IsVerified()) {
 			kadUDPPort = Kademlia::CKademlia::GetPrefs()->GetExternalKadPort();
 		} else {
 			kadUDPPort = Kademlia::CKademlia::GetPrefs()->GetInternKadPort();
 		}
 	}
 
-	CTagVarInt tagUdpPorts(CT_EMULE_UDPPORTS, (kadUDPPort << 16) | ((uint32)thePrefs::GetEffectiveUDPPort()), GetVBTTags() ? 0 : 32);
+	CTagVarInt tagUdpPorts(
+		CT_EMULE_UDPPORTS, (kadUDPPort << 16) | ((uint32)thePrefs::GetEffectiveUDPPort()), 32);
 	tagUdpPorts.WriteTagToFile(data);
 
-	if( theApp->clientlist->GetBuddy() && theApp->IsFirewalled() ) {
-		CTagVarInt tagBuddyIP(CT_EMULE_BUDDYIP, theApp->clientlist->GetBuddy()->GetIP(), GetVBTTags() ? 0 : 32);
+	if (theApp->clientlist->GetBuddy() && theApp->IsFirewalled()) {
+		CTagVarInt tagBuddyIP(CT_EMULE_BUDDYIP, theApp->clientlist->GetBuddy()->GetIP(), 32);
 		tagBuddyIP.WriteTagToFile(data);
 
 		CTagVarInt tagBuddyPort(CT_EMULE_BUDDYUDP,
-//					( RESERVED												)
-					((uint32)theApp->clientlist->GetBuddy()->GetUDPPort()  )
-					, GetVBTTags() ? 0 : 32);
+			//					( RESERVED
+			//)
+			((uint32)theApp->clientlist->GetBuddy()->GetUDPPort()),
+			32);
 		tagBuddyPort.WriteTagToFile(data);
 	}
 
 	// aMule Version
 	CTagVarInt tagMuleVersion(CT_EMULE_VERSION,
-				(SO_AMULE	<< 24) |
-				make_full_ed2k_version(VERSION_MJR, VERSION_MIN, VERSION_UPDATE)
-				// | (RESERVED			     )
-				, GetVBTTags() ? 0 : 32);
+		(SO_AMULE << 24) | make_full_ed2k_version(VERSION_MJR, VERSION_MIN, VERSION_UPDATE)
+		// | (RESERVED			     )
+		,
+		32);
 	tagMuleVersion.WriteTagToFile(data);
 
-
 	// eMule Misc. Options #1
-	const uint32 uUdpVer			= 4;
-	const uint32 uDataCompVer		= 1;
-	const uint32 uSupportSecIdent		= theApp->CryptoAvailable() ? 3 : 0;
-	const uint32 uSourceExchangeVer		= 3;
-	const uint32 uExtendedRequestsVer	= 2;
-	const uint32 uAcceptCommentVer		= 1;
-	const uint32 uNoViewSharedFiles		= (thePrefs::CanSeeShares() == vsfaNobody) ? 1 : 0; // for backward compatibility this has to be a 'negative' flag
-	const uint32 uMultiPacket		= 1;
-	const uint32 uSupportPreview		= 0; // No network preview at all.
-	const uint32 uPeerCache			= 0; // No peercache for aMule, baby
-	const uint32 uUnicodeSupport		= 1;
-	const uint32 nAICHVer			= 1; // AICH is ENABLED right now.
+	const uint32 uUdpVer = 4;
+	const uint32 uDataCompVer = 1;
+	const uint32 uSupportSecIdent = SecIdent::SupportedVersions(theApp->CryptoAvailable(), HasPeerIPv4());
+	const uint32 uSourceExchangeVer = 3;
+	const uint32 uExtendedRequestsVer = 2;
+	const uint32 uAcceptCommentVer = 1;
+	const uint32 uNoViewSharedFiles =
+		(thePrefs::CanSeeShares() == vsfaNobody)
+			? 1
+			: 0; // for backward compatibility this has to be a 'negative' flag
+	const uint32 uMultiPacket = 1;
+	const uint32 uSupportPreview = 0; // No network preview at all.
+	const uint32 uPeerCache = 0;      // No peercache for aMule, baby
+	const uint32 uUnicodeSupport = 1;
+	const uint32 nAICHVer = 1; // AICH is ENABLED right now.
 
 	CTagVarInt tagMisOptions(CT_EMULE_MISCOPTIONS1,
-				(nAICHVer			<< ((4*7)+1)) |
-				(uUnicodeSupport		<< 4*7) |
-				(uUdpVer			<< 4*6) |
-				(uDataCompVer			<< 4*5) |
-				(uSupportSecIdent		<< 4*4) |
-				(uSourceExchangeVer		<< 4*3) |
-				(uExtendedRequestsVer		<< 4*2) |
-				(uAcceptCommentVer		<< 4*1) |
-				(uPeerCache			<< 1*3) |
-				(uNoViewSharedFiles		<< 1*2) |
-				(uMultiPacket			<< 1*1) |
-				(uSupportPreview		<< 1*0)
-				, GetVBTTags() ? 0 : 32);
+		(nAICHVer << ((4 * 7) + 1)) | (uUnicodeSupport << 4 * 7) | (uUdpVer << 4 * 6) |
+			(uDataCompVer << 4 * 5) | (uSupportSecIdent << 4 * 4) |
+			(uSourceExchangeVer << 4 * 3) | (uExtendedRequestsVer << 4 * 2) |
+			(uAcceptCommentVer << 4 * 1) | (uPeerCache << 1 * 3) | (uNoViewSharedFiles << 1 * 2) |
+			(uMultiPacket << 1 * 1) | (uSupportPreview << 1 * 0),
+		32);
 	tagMisOptions.WriteTagToFile(data);
 
 	// eMule Misc. Options #2
-	const uint32 uKadVersion		= KADEMLIA_VERSION;
-	const uint32 uSupportLargeFiles		= 1;
-	const uint32 uExtMultiPacket		= 1;
-	const uint32 uReserved			= 0; // mod bit
-	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 uKadVersion = KADEMLIA_VERSION;
+	const uint32 uSupportLargeFiles = 1;
+	const uint32 uExtMultiPacket = 1;
+	const uint32 uReserved = 0; // mod bit
+	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;
 #ifdef AMULE_DAEMON
-// captcha for daemon/remotegui not supported for now
-	const uint32 uSupportsCaptcha		= 0;
+	// captcha for daemon/remotegui not supported for now
+	const uint32 uSupportsCaptcha = 0;
 #else
-	const uint32 uSupportsCaptcha		= 1;
+	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;
+	// 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;
 
 	CTagVarInt tagMisOptions2(CT_EMULE_MISCOPTIONS2,
-//				(RESERVED				     )
-				(uDirectUDPCallback	<< 12) |
-				(uSupportsCaptcha	<< 11) |
-				(uSupportsSourceEx2	<< 10) |
-				(uRequiresCryptLayer	<<  9) |
-				(uRequestsCryptLayer	<<  8) |
-				(uSupportsCryptLayer	<<  7) |
-				(uReserved		<<  6) |
-				(uExtMultiPacket	<<  5) |
-				(uSupportLargeFiles	<<  4) |
-				(uKadVersion		<<  0)
-				, GetVBTTags() ? 0 : 32	);
+		//				(RESERVED				     )
+		(uDirectUDPCallback << 12) | (uSupportsCaptcha << 11) | (uSupportsSourceEx2 << 10) |
+			(uRequiresCryptLayer << 9) | (uRequestsCryptLayer << 8) | (uSupportsCryptLayer << 7) |
+			(uReserved << 6) | (uExtMultiPacket << 5) | (uSupportLargeFiles << 4) |
+			(uKadVersion << 0),
+		32);
 	tagMisOptions2.WriteTagToFile(data);
 
-	const uint32 nOSInfoSupport			= 1; // We support OS_INFO
-	const uint32 nValueBasedTypeTags	= 0; // Experimental, disabled
+	const uint32 nOSInfoSupport = 1; // We support OS_INFO
 
-	CTagVarInt tagMisCompatOptions(CT_EMULECOMPAT_OPTIONS,
-				(nValueBasedTypeTags	<< 1*1) |
-				(nOSInfoSupport			<< 1*0)
-				, GetVBTTags() ? 0 : 32);
+	CTagVarInt tagMisCompatOptions(CT_EMULECOMPAT_OPTIONS, (nOSInfoSupport << 1 * 0), 32);
 
 	tagMisCompatOptions.WriteTagToFile(data);
 
+	// eMuleAI vendor capabilities (CT_MOD_MISCOPTIONS).
+	const uint32 localModMiscOptions = LocalAdvertisedModMiscOptions();
+	if (localModMiscOptions != 0) {
+		CTagVarInt tagModMiscOptions(CT_MOD_MISCOPTIONS, localModMiscOptions, 32);
+		tagModMiscOptions.WriteTagToFile(data);
+	}
+
 #ifdef __GIT__
 	wxString mod_name(MOD_VERSION_LONG);
 	CTagString tagModName(ET_MOD_VERSION, mod_name);
@@ -1169,8 +1304,7 @@
 	data->WriteUInt16(nPort);
 }
 
-
-void CUpDownClient::ProcessMuleCommentPacket(const uint8_t* pachPacket, uint32 nSize)
+void CUpDownClient::ProcessMuleCommentPacket(const uint8_t *pachPacket, uint32 nSize)
 {
 	if (!m_reqfile) {
 		throw CInvalidPacket("Comment packet for unknown file");
@@ -1184,33 +1318,37 @@
 
 	uint8 rating = data.ReadUInt8();
 	if (rating > 5) {
-		AddDebugLogLineN( logClient, wxString("Invalid Rating for file '") << m_clientFilename << "' received: " << rating);
+		AddDebugLogLineN(logClient,
+			wxString("Invalid Rating for file '")
+				<< m_clientFilename << "' received: " << rating);
 		m_iRating = 0;
 	} else {
 		m_iRating = rating;
-		AddDebugLogLineN( logClient, wxString("Rating for file '") << m_clientFilename << "' received: " << m_iRating);
+		AddDebugLogLineN(logClient,
+			wxString("Rating for file '") << m_clientFilename << "' received: " << m_iRating);
 	}
 
-	// The comment is unicoded, with a uin32 len and safe read
-	// (won't break if string size is < than advertised len)
-	// Truncated to MAXFILECOMMENTLEN size
-	m_strComment = data.ReadString((GetUnicodeSupport() != utf8strNone), 4 /* bytes (it's a uint32)*/, true).Left(MAXFILECOMMENTLEN);
+	// The comment is unicoded, with a uint32 len and safe read (it will not break if the string
+	// size is smaller than the advertised len). Truncated to MAXFILECOMMENTLEN.
+	m_strComment =
+		data.ReadString((GetUnicodeSupport() != utf8strNone), 4 /* bytes (it's a uint32)*/, true)
+			.Left(MAXFILECOMMENTLEN);
 
-	AddDebugLogLineN( logClient, wxString("Description for file '") << m_clientFilename << "' received: " << m_strComment);
+	AddDebugLogLineN(logClient,
+		wxString("Description for file '") << m_clientFilename << "' received: " << m_strComment);
 
 	// Update file rating
 	m_reqfile->UpdateFileRatingCommentAvail();
 }
 
-
 void CUpDownClient::ClearDownloadBlockRequests()
 {
 	{
-		std::list<Requested_Block_Struct*>::iterator it = m_DownloadBlocks_list.begin();
+		std::list<Requested_Block_Struct *>::iterator it = m_DownloadBlocks_list.begin();
 		for (; it != m_DownloadBlocks_list.end(); ++it) {
-			Requested_Block_Struct* cur_block = *it;
+			Requested_Block_Struct *cur_block = *it;
 
-			if (m_reqfile){
+			if (m_reqfile) {
 				m_reqfile->RemoveBlockFromList(cur_block->StartOffset, cur_block->EndOffset);
 			}
 
@@ -1221,17 +1359,18 @@
 	}
 
 	{
-		std::list<Pending_Block_Struct*>::iterator it = m_PendingBlocks_list.begin();
+		std::list<Pending_Block_Struct *>::iterator it = m_PendingBlocks_list.begin();
 		for (; it != m_PendingBlocks_list.end(); ++it) {
-			Pending_Block_Struct* pending = *it;
+			Pending_Block_Struct *pending = *it;
 
 			if (m_reqfile) {
-				m_reqfile->RemoveBlockFromList(pending->block->StartOffset, pending->block->EndOffset);
+				m_reqfile->RemoveBlockFromList(
+					pending->block->StartOffset, pending->block->EndOffset);
 			}
 
 			delete pending->block;
 			// Not always allocated
-			if (pending->zStream){
+			if (pending->zStream) {
 				inflateEnd(pending->zStream);
 				delete pending->zStream;
 			}
@@ -1243,13 +1382,14 @@
 	}
 }
 
-
-bool CUpDownClient::Disconnected(const wxString& DEBUG_ONLY(strReason), bool bFromSocket)
+bool CUpDownClient::Disconnected(const wxString &DEBUG_ONLY(strReason), bool bFromSocket)
 {
-	//wxASSERT(theApp->clientlist->IsValidClient(this));
+	// wxASSERT(theApp->clientlist->IsValidClient(this));
 
 	if (HasBeenDeleted()) {
-		AddDebugLogLineN(logClient, "Disconnected() called for already deleted client on ip " + Uint32toStringIP(GetConnectIP()));
+		AddDebugLogLineN(logClient,
+			"Disconnected() called for already deleted client on ip " +
+				Uint32toStringIP(GetConnectIP()));
 		return false;
 	}
 
@@ -1258,18 +1398,25 @@
 		theApp->clientlist->RemoveDirectCallback(this);
 		m_dwDirectCallbackTimeout = 0;
 		theApp->clientlist->AddDeadSource(this);
-		AddDebugLogLineN(logClient, "Direct callback failed to client on ip " + Uint32toStringIP(GetConnectIP()));
+		AddDebugLogLineN(logClient,
+			"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
+		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
+		Kademlia::CUDPFirewallTester::SetUDPFWCheckResult(false,
+			false,
+			wxUINT32_SWAP_ALWAYS(GetConnectIP()),
+			0); // inform the tester that this test has failed
 	} else if (GetKadState() == KS_CONNECTED_BUDDY) {
 		AddDebugLogLineN(logClient, "Buddy client disconnected - " + strReason);
 	}
 
-	//If this is a KAD client object, just delete it!
+	// If this is a KAD client object, just delete it!
 	SetKadState(KS_NONE);
 
 	if (GetUploadState() == US_UPLOADING) {
@@ -1287,7 +1434,7 @@
 			// 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
@@ -1296,9 +1443,9 @@
 		CAICHHashSet::ClientAICHRequestFailed(this);
 	}
 
-	// The remote client does not have to answer with OP_HASHSETANSWER *immediately*
-	// after we've sent OP_HASHSETREQUEST. It may occur that a (buggy) remote client
-	// is sending use another OP_FILESTATUS which would let us change to DL-state to DS_ONQUEUE.
+	// The remote client does not have to answer with OP_HASHSETANSWER *immediately* after we
+	// sent OP_HASHSETREQUEST. A (buggy) remote client may send us another OP_FILESTATUS, which
+	// would change the DL-state to DS_ONQUEUE.
 	if (((GetDownloadState() == DS_REQHASHSET) || m_fHashsetRequesting) && (m_reqfile)) {
 		m_reqfile->SetHashSetNeeded(true);
 	}
@@ -1306,69 +1453,64 @@
 	SourceItemType source_type = UNAVAILABLE_SOURCE;
 	SourceItemType peer_type = UNAVAILABLE_SOURCE;
 
-	//check if this client is needed in any way, if not delete it
+	// check if this client is needed in any way, if not delete it
 	bool bDelete = true;
 	switch (m_nUploadState) {
-		case US_ONUPLOADQUEUE:
-			bDelete = false;
-			peer_type = AVAILABLE_SOURCE;
-			break;
+	case US_ONUPLOADQUEUE:
+		bDelete = false;
+		peer_type = AVAILABLE_SOURCE;
+		break;
 	};
 
 	switch (m_nDownloadState) {
-		case DS_ONQUEUE:
-			source_type = A4AF_SOURCE; // Will be checked.
-		/* fall through */
-		case DS_TOOMANYCONNS:
-		case DS_NONEEDEDPARTS:
-		case DS_LOWTOLOWIP:
-			bDelete = false;
-			break;
+	case DS_ONQUEUE:
+		source_type = A4AF_SOURCE; // Will be checked.
+	/* fall through */
+	case DS_TOOMANYCONNS:
+	case DS_NONEEDEDPARTS:
+	case DS_LOWTOLOWIP:
+		bDelete = false;
+		break;
 	};
 
 	switch (m_nUploadState) {
-		case US_CONNECTING:
-		case US_WAITCALLBACK:
-		case US_ERROR:
-			theApp->clientlist->AddDeadSource(this);
-			bDelete = true;
+	case US_CONNECTING:
+	case US_WAITCALLBACK:
+	case US_ERROR:
+		theApp->clientlist->AddDeadSource(this);
+		bDelete = true;
 	};
 
 	switch (m_nDownloadState) {
-		case DS_CONNECTING:
-		case DS_WAITCALLBACK:
-		case DS_ERROR:
-		case DS_BANNED:
-			theApp->clientlist->AddDeadSource(this);
-			bDelete = true;
+	case DS_CONNECTING:
+	case DS_WAITCALLBACK:
+	case DS_ERROR:
+	case DS_BANNED:
+		theApp->clientlist->AddDeadSource(this);
+		bDelete = true;
 	};
 
-
 	// We keep chat partners in any case
 	if (GetChatState() != MS_NONE) {
 		bDelete = false;
 		m_pendingMessage.Clear();
-		Notify_ChatConnResult(false,GUI_ID(GetIP(),GetUserPort()),"");
+		Notify_ChatConnResult(false, GUI_ID(GetIP(), GetUserPort()), "");
 	}
 
 	// Delete socket
 	if (!bFromSocket && m_socket) {
-		wxASSERT (theApp->listensocket->IsValidSocket(m_socket));
+		wxASSERT(theApp->listensocket->IsValidSocket(m_socket));
 		m_socket->Safe_Delete();
 	}
 
 	SetSocket(NULL);
 
-	if (m_iFileListRequested) {
-		AddLogLineC(CFormat(_("Failed to retrieve shared files from user '%s'")) % GetUserName() );
-		m_iFileListRequested = 0;
-	}
-
+	theApp->browsemanager->Fail(this);
 
 	if (bDelete) {
 		if (m_Friend) {
 			// Remove the friend linkage
-			m_Friend->UnLinkClient();	// this notifies
+			m_Friend->UnLinkClient(); // this notifies
 		}
 	} else {
 		Notify_SharedCtrlRefreshClient(ECID(), peer_type);
@@ -1379,68 +1521,141 @@
 		m_bHelloAnswerPending = false;
 		m_fSentOutOfPartReqs = 0;
 	}
-	AddDebugLogLineN(logClient, CFormat("--- %s client D:%d U:%d \"%s\"; Reason was %s")
-		% (bDelete ? "Deleted" : "Disconnected")
-		% m_nDownloadState % m_nUploadState % GetClientFullInfo() % strReason );
+	AddDebugLogLineN(logClient,
+		CFormat("--- %s client D:%d U:%d \"%s\"; Reason was %s") %
+			(bDelete ? "Deleted" : "Disconnected") % m_nDownloadState % m_nUploadState %
+			GetClientFullInfo() % strReason);
 
 	return bDelete;
 }
 
-//Returned bool is not if the TryToConnect is successful or not..
-//false means the client was deleted!
-//true means the client was not deleted!
+// The returned bool is not whether TryToConnect succeeded: false means the client was
+// deleted, true means it was not.
 bool CUpDownClient::TryToConnect(bool bIgnoreMaxCon)
 {
-	// Kad reviewed
-	if (theApp->listensocket->TooManySockets() && !bIgnoreMaxCon )  {
-		if (!(m_socket && m_socket->IsConnected())) {
-			if(Disconnected("Too many connections")) {
-				Safe_Delete();
-				return false;
-			}
-			return true;
+	const EContactResult result = TryToContact(bIgnoreMaxCon);
+	// Exactly what this returned before the outcomes were named: false where
+	// the caller must stop touching the client, true otherwise.
+	return result != EContactResult::ClientDeleted && result != EContactResult::ConnectNotStarted;
+}
+
+CNetworkAddress CUpDownClient::ContactAddress() const
+{
+	return PeerAddressing::ContactCheckAddress(
+		GetUserAddress(), GetConnectAddress(), HasLowID(), wxUINT32_SWAP_ALWAYS(m_nUserIDHybrid));
+}
+
+bool CUpDownClient::IsRedialAllowed() const
+{
+	// Every refusal CheckContactPreconditions() makes, asked without acting on the
+	// answer: a redial happens where that function never runs, so anything it would
+	// have caught has to be caught here instead.
+	if ((RequiresCryptLayer() && !thePrefs::IsClientCryptLayerSupported()) ||
+		(thePrefs::IsClientCryptLayerRequired() && !SupportsCryptLayer())) {
+		return false;
+	}
+	const CNetworkAddress contactAddress = ContactAddress();
+	if (!PeerAddressing::CanCheckContactAddress(contactAddress)) {
+		return false;
+	}
+	if (contactAddress.IsAbsent()) {
+		// The contact path tolerates absence, because a LowID peer is reached
+		// through a server or a buddy rather than dialled. A redial has no such
+		// route: Connect() would aim at the zero address.
+		return false;
+	}
+	return !theApp->ipfilter->IsFiltered(contactAddress) &&
+	       !theApp->clientlist->IsBannedClient(contactAddress) &&
+	       PeerAddressing::CanOpenConnection(contactAddress, IsConnected());
+}
+
+// Re-check the standing reasons to refuse this peer, disconnecting it on a hit:
+// incompatible obfuscation settings, a filtered IP, a banned IP. Returns Contacting when
+// the peer is clean -- "carry on" rather than "we sent something" -- and ClientDeleted or
+// Declined otherwise.
+//
+// Extracted so it can run on both routes to a peer: TryToContact, which is about to open a
+// connection, and the already-connected browse path, which is not. All three checks are
+// settings-derived and every one of those settings is changeable while a connection is
+// open, so a peer admitted before the filter list grew, or before "require obfuscation" was
+// switched on, keeps its socket. The max-sockets check is NOT here on purpose: it governs
+// opening a new socket, which a peer we are already connected to does not need.
+//
+// Keeping the Disconnected / Safe_Delete handling in one place matters more than the two
+// call sites: it can delete `this`.
+EContactResult CUpDownClient::CheckContactPreconditions()
+{
+	if ((RequiresCryptLayer() && !thePrefs::IsClientCryptLayerSupported()) ||
+		(thePrefs::IsClientCryptLayerRequired() && !SupportsCryptLayer())) {
+		if (Disconnected("CryptLayer-Settings (Obfuscation) incompatible")) {
+			Safe_Delete();
+			return EContactResult::ClientDeleted;
 		}
+		return EContactResult::Declined;
 	}
 
-	// Do not try to connect to source which are incompatible with our encryption setting (one requires it, and the other one doesn't supports it)
-	if ( (RequiresCryptLayer() && !thePrefs::IsClientCryptLayerSupported()) || (thePrefs::IsClientCryptLayerRequired() && !SupportsCryptLayer()) ){
-		if(Disconnected("CryptLayer-Settings (Obfuscation) incompatible")){
+	const CNetworkAddress contactAddress = ContactAddress();
+	if (!PeerAddressing::CanCheckContactAddress(contactAddress)) {
+		if (Disconnected("Contact security checks unavailable")) {
 			Safe_Delete();
-			return false;
-		} else {
-			return true;
+			return EContactResult::ClientDeleted;
 		}
+		return EContactResult::Declined;
 	}
-
-	// Ipfilter check
-	uint32 uClientIP = GetIP();
-	if (uClientIP == 0 && !HasLowID()) {
-		uClientIP = wxUINT32_SWAP_ALWAYS(m_nUserIDHybrid);
+	if (contactAddress.IsAbsent()) {
+		return EContactResult::Contacting;
+	}
+	// Although all received IPs (server sources, source exchange) and all incoming connection
+	// attempts are filtered, outgoing connection attempts have to be filtered here too, because
+	// the ip filter list may have been updated since.
+	if (theApp->ipfilter->IsFiltered(contactAddress)) {
+		AddDebugLogLineN(
+			logIPFilter, "Filtered ip " + contactAddress.ToWxString() + " on TryToConnect");
+		if (Disconnected("IPFilter")) {
+			Safe_Delete();
+			return EContactResult::ClientDeleted;
+		}
+		return EContactResult::Declined;
 	}
 
-	if (uClientIP) {
-		// Although we filter all received IPs (server sources, source exchange) and all incoming 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)) {
-			AddDebugLogLineN(logIPFilter, CFormat("Filtered ip %u (%s) on TryToConnect\n") % uClientIP % Uint32toStringIP(uClientIP));
-			if (Disconnected("IPFilter")) {
-				Safe_Delete();
-				return false;
-			}
-			return true;
+	// for safety: check again whether that IP is banned
+	if (theApp->clientlist->IsBannedClient(contactAddress)) {
+		AddDebugLogLineN(
+			logClient, "Refused to connect to banned client " + contactAddress.ToWxString());
+		if (Disconnected("Banned IP")) {
+			Safe_Delete();
+			return EContactResult::ClientDeleted;
 		}
+		return EContactResult::Declined;
+	}
+	if (!PeerAddressing::CanOpenConnection(contactAddress, IsConnected())) {
+		if (Disconnected("Outbound IPv6 connections unavailable")) {
+			Safe_Delete();
+			return EContactResult::ClientDeleted;
+		}
+		return EContactResult::Declined;
+	}
+	return EContactResult::Contacting;
+}
 
-		// for safety: check again whether that IP is banned
-		if (theApp->clientlist->IsBannedClient(uClientIP)) {
-			AddDebugLogLineN(logClient, "Refused to connect to banned client " + Uint32toStringIP(uClientIP));
-			if (Disconnected("Banned IP")) {
+EContactResult CUpDownClient::TryToContact(bool bIgnoreMaxCon)
+{
+	// Kad reviewed
+	if (theApp->listensocket->TooManySockets() && !bIgnoreMaxCon) {
+		if (!(m_socket && m_socket->IsConnected())) {
+			if (Disconnected("Too many connections")) {
 				Safe_Delete();
-				return false;
+				return EContactResult::ClientDeleted;
 			}
-			return true;
+			return EContactResult::Declined;
 		}
 	}
 
+	if (const EContactResult refused = CheckContactPreconditions();
+		refused != EContactResult::Contacting) {
+		return refused;
+	}
+
 	if (GetKadState() == KS_QUEUED_FWCHECK) {
 		SetKadState(KS_CONNECTING_FWCHECK);
 	} else if (GetKadState() == KS_QUEUED_FWCHECK_UDP) {
@@ -1449,7 +1664,7 @@
 
 	if (HasLowID()) {
 		if (!theApp->CanDoCallback(GetServerIP(), GetServerPort())) {
-			//We cannot do a callback!
+			// We cannot do a callback!
 			if (GetDownloadState() == DS_CONNECTING) {
 				SetDownloadState(DS_LOWTOLOWIP);
 			} else if (GetDownloadState() == DS_REQHASHSET) {
@@ -1457,27 +1672,34 @@
 				m_reqfile->SetHashSetNeeded(true);
 			}
 			if (GetUploadState() == US_CONNECTING) {
-				if(Disconnected("LowID->LowID and US_CONNECTING")) {
+				if (Disconnected("LowID->LowID and US_CONNECTING")) {
 					Safe_Delete();
-					return false;
+					return EContactResult::ClientDeleted;
 				}
 			}
-			return true;
-		}
-
-		//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->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())
-		    && !(SupportsDirectUDPCallback() && thePrefs::GetEffectiveUDPPort() != 0)) {
-			//This is a Kad firewalled source that we want to do a special callback because it has no buddyIP or buddyPort.
-			if( Kademlia::CKademlia::IsConnected() ) {
-				//We are connect to Kad
-				if( Kademlia::CKademlia::GetPrefs()->GetTotalSource() > 0 || Kademlia::CSearchManager::AlreadySearchingFor(Kademlia::CUInt128(GetBuddyID()))) {
-					//There are too many source lookups already or we are already searching this key.
+			// Nothing was sent and nothing will arrive: this peer cannot be
+			// reached while we cannot call back.
+			return EContactResult::Declined;
+		}
+
+		// We already know we are not firewalled here, as the condition above detected LowID->LowID
+		// and returned. If ANYTHING changes with the "if(!theApp->CanDoCallback(this))" above that
+		// lets you fall through with both the source and us firewalled, it must be rechecked
+		// before this check.
+		if (HasValidBuddyID() && !GetBuddyIP() && !GetBuddyPort() &&
+			!theApp->serverconnect->IsLocalServer(GetServerIP(), GetServerPort()) &&
+			!(SupportsDirectUDPCallback() && thePrefs::GetEffectiveUDPPort() != 0)) {
+			// This is a Kad firewalled source that we want to do a special callback because it
+			// has no buddyIP or buddyPort.
+			if (Kademlia::CKademlia::IsConnected()) {
+				// We are connect to Kad
+				if (Kademlia::CKademlia::GetPrefs()->GetTotalSource() > 0 ||
+					Kademlia::CSearchManager::AlreadySearchingFor(
+						Kademlia::CUInt128(GetBuddyID()))) {
+					// There are too many source lookups already or we are already
+					// searching this key.
 					SetDownloadState(DS_TOOMANYCONNSKAD);
-					return true;
+					return EContactResult::Declined;
 				}
 			}
 		}
@@ -1490,99 +1712,137 @@
 		m_socket = new CClientTCPSocket(this, thePrefs::GetProxyData());
 	} else {
 		ConnectionEstablished();
-		return true;
+		return EContactResult::Contacting;
 	}
 
-
-	if (HasLowID() && SupportsDirectUDPCallback() && thePrefs::GetEffectiveUDPPort() != 0 && GetConnectIP() != 0) { // LOWID with DirectCallback
+	if (HasLowID() && SupportsDirectUDPCallback() && thePrefs::GetEffectiveUDPPort() != 0 &&
+		GetConnectIP() != 0) { // LOWID with DirectCallback
 		if (m_dwDirectCallbackTimeout != 0) {
-			AddDebugLogLineN(logClient, "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->CanDoCallback(this) if any callback is possible at all
+			AddDebugLogLineN(logClient,
+				"ERROR: Trying Direct UDP Callback while already trying to connect to client "
+				"on ip " +
+					Uint32toStringIP(GetConnectIP()));
+			// Already on its way, with its own 45s deadline.
+			return EContactResult::Contacting;
+		}
+		// A direct callback is possible. Since no other parties are involved and only one extra
+		// packet of overhead is used, handle it like a normal connection try: no restrictions
+		// apply, and !theApp->CanDoCallback(this) above already checked whether any callback is
+		// possible at all.
 		m_dwDirectCallbackTimeout = ::GetTickCount64() + SEC2MS(45);
 		theApp->clientlist->AddDirectCallbackClient(this);
-		AddDebugLogLineN(logClient, CFormat("Direct Callback on port %u to client on ip %s") % GetKadPort() % Uint32toStringIP(GetConnectIP()));
+		AddDebugLogLineN(logClient,
+			CFormat("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.WriteUInt16(thePrefs::GetPort());   // needs to know our port
 		data.WriteHash(thePrefs::GetUserHash()); // and userhash
 		// our connection settings
 		data.WriteUInt8(Kademlia::CPrefs::GetMyConnectOptions(true, false));
-		AddDebugLogLineN(logClientUDP, "Sending OP_DIRECTCALLBACKREQ to " + Uint32_16toStringIP_Port(GetConnectIP(), GetKadPort()));
-		CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_DIRECTCALLBACKREQ);
+		AddDebugLogLineN(logClientUDP,
+			"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);
+		theApp->clientudp->SendPacket(packet,
+			GetConnectIP(),
+			GetKadPort(),
+			ShouldReceiveCryptUDPPackets(),
+			GetUserHash().GetHash(),
+			false,
+			0);
 	} else if (HasLowID()) { // LOWID
+		// Set where a packet actually goes out. Several of the paths below reach the end having
+		// sent nothing -- a source we are merely queued at, a peer that is not a download source, a
+		// Kad lookup that fails to start -- and reporting those as Contacting let a browse of them
+		// wait out the whole silence timeout instead of failing at once.
+		bool contacted = false;
 		if (GetDownloadState() == DS_CONNECTING) {
 			SetDownloadState(DS_WAITCALLBACK);
 		}
 		if (GetUploadState() == US_CONNECTING) {
-			if(Disconnected("LowID and US_CONNECTING")) {
+			if (Disconnected("LowID and US_CONNECTING")) {
 				Safe_Delete();
-				return false;
+				return EContactResult::ClientDeleted;
 			}
-			return true;
+			return EContactResult::Declined;
 		}
 
-		if (theApp->serverconnect->IsLocalServer(m_dwServerIP,m_nServerPort)) {
+		if (theApp->serverconnect->IsLocalServer(m_dwServerIP, m_nServerPort)) {
 			CMemFile data;
 			// AFAICS, this id must be reversed to be sent to clients
 			// But if I reverse it, we do a serve violation ;)
 			data.WriteUInt32(m_nUserIDHybrid);
-			CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_CALLBACKREQUEST);
+			CPacket *packet = new CPacket(data, OP_EDONKEYPROT, OP_CALLBACKREQUEST);
 			theStats::AddUpOverheadServer(packet->GetPacketSize());
-			AddDebugLogLineN(logLocalClient, "Local Client: OP_CALLBACKREQUEST to " + GetFullIP());
+			AddDebugLogLineN(
+				logLocalClient, "Local Client: OP_CALLBACKREQUEST to " + GetFullIP());
 			theApp->serverconnect->SendPacket(packet);
 			SetDownloadState(DS_WAITCALLBACK);
+			contacted = true;
 		} else {
 			if (GetUploadState() == US_NONE && (!GetRemoteQueueRank() || m_bReaskPending)) {
 
-				if( !HasValidBuddyID() ) {
+				if (!HasValidBuddyID()) {
 					theApp->downloadqueue->RemoveSource(this);
 					if (Disconnected("LowID and US_NONE and QR=0")) {
 						Safe_Delete();
-						return false;
+						return EContactResult::ClientDeleted;
 					}
-					return true;
+					return EContactResult::Declined;
 				}
 
-				if( !Kademlia::CKademlia::IsConnected() ) {
-					//We are not connected to Kad and this is a Kad Firewalled source..
+				if (!Kademlia::CKademlia::IsConnected()) {
+					// We are not connected to Kad and this is a Kad Firewalled source..
 					theApp->downloadqueue->RemoveSource(this);
-					if(Disconnected("Kad Firewalled source but not connected to Kad.")) {
+					if (Disconnected("Kad Firewalled source but not connected to Kad.")) {
 						Safe_Delete();
-						return false;
+						return EContactResult::ClientDeleted;
 					}
-					return true;
+					return EContactResult::Declined;
 				}
 
-			 if( GetDownloadState() == DS_WAITCALLBACK ) {
-					if( GetBuddyIP() && GetBuddyPort()) {
+				if (GetDownloadState() == DS_WAITCALLBACK) {
+					if (GetBuddyIP() && GetBuddyPort()) {
 						CMemFile bio(34);
 						bio.WriteUInt128(Kademlia::CUInt128(GetBuddyID()));
-						bio.WriteUInt128(Kademlia::CUInt128(m_reqfile->GetFileHash().GetHash()));
+						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 don't know which kadversion the buddy has, so we need to send unencrypted
-						theApp->clientudp->SendPacket(packet, GetBuddyIP(), GetBuddyPort(), false, NULL, true, 0);
-						AddDebugLogLineN(logClientKadUDP, CFormat("KadCallbackReq (size=%i) to %s") % packet->GetPacketSize() % Uint32_16toStringIP_Port(GetBuddyIP(), GetBuddyPort()));
+						CPacket *packet = new CPacket(
+							bio, OP_KADEMLIAHEADER, KADEMLIA_CALLBACK_REQ);
+						// 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);
+						AddDebugLogLineN(logClientKadUDP,
+							CFormat("KadCallbackReq (size=%i) to %s") %
+								packet->GetPacketSize() %
+								Uint32_16toStringIP_Port(
+									GetBuddyIP(), GetBuddyPort()));
 						theStats::AddUpOverheadKad(packet->GetRealPacketSize());
 						SetDownloadState(DS_WAITCALLBACKKAD);
+						contacted = true;
 					} else {
 						AddLogLineN(_("Searching buddy for lowid connection"));
-						//Create search to find buddy.
+						// Create search to find buddy.
 						Kademlia::CSearch *findSource = new Kademlia::CSearch;
 						findSource->SetSearchTypes(Kademlia::CSearch::FINDSOURCE);
 						findSource->SetTargetID(Kademlia::CUInt128(GetBuddyID()));
-						findSource->AddFileID(Kademlia::CUInt128(m_reqfile->GetFileHash().GetHash()));
-						if(Kademlia::CSearchManager::StartSearch(findSource)) {
-							//Started lookup..
+						findSource->AddFileID(Kademlia::CUInt128(
+							m_reqfile->GetFileHash().GetHash()));
+						if (Kademlia::CSearchManager::StartSearch(findSource)) {
+							// Started lookup..
 							SetDownloadState(DS_WAITCALLBACKKAD);
+							contacted = true;
 						} else {
-							//This should never happen..
+							// This should never happen..
 							wxFAIL;
 						}
 					}
@@ -1594,12 +1854,61 @@
 				}
 			}
 		}
+		if (!contacted) {
+			return EContactResult::Declined;
+		}
 	} else { // HIGHID
+#ifdef AMULE_UTP_TRANSPORT
+		IUtpContext *utp = theApp->clientudp->GetUtpContext();
+		// Only a port learned from this peer is a remote endpoint. Our own
+		// UDP port says nothing about where an unknown peer listens. The Kad
+		// half is preferred because it carries the verified external port when
+		// the peer has one, and both halves name the same UDP socket.
+		const uint16_t utpPort = GetKadPort() != 0 ? GetKadPort() : GetUDPPort();
+		// An armed context is not a sendable one: CMuleUDPSocket::SendTo()
+		// reports success on a closed socket, so the SYN would vanish and the
+		// TCP fallback below would be skipped.
+		const bool canSend = utp != nullptr && utp->IsAvailable() && theApp->clientudp->Ok();
+		// Refuse rather than downgrade: the stream handshake never runs over a
+		// transport, so uTP without frame obfuscation would send in the clear
+		// what TCP would have obfuscated. The two predicates differ, because
+		// the frame one also demands a known public IP.
+		const bool obfuscationSatisfied = !WantsStreamObfuscation() || ShouldReceiveCryptUDPPackets();
+		const SUtpDialFacts facts{ m_modCapabilities.SupportsNatTraversal(),
+			canSend,
+			true,
+			thePrefs::GetProxyData()->m_proxyEnable,
+			utpPort != 0 && IsGoodIP(GetConnectIP(), thePrefs::FilterLanIPs()),
+			obfuscationSatisfied };
+		// Connect() is a no-op on a live socket. Without the same guard the
+		// uTP path would attach a transport over a connection already in use.
+		if (!m_socket->IsOk() && DecideUtpDial(facts) == EUtpDialDecision::TryUtp) {
+			std::unique_ptr<IStreamTransport> transport;
+			if (utp->Dial(GetConnectIP(),
+				    utpPort,
+				    ShouldReceiveCryptUDPPackets(),
+				    HasValidHash() ? GetUserHash().GetHash() : nullptr,
+				    transport)) {
+				// Attached first: the socket refuses stream obfuscation once
+				// it is carried by a transport that obfuscates its own frames.
+				m_socket->AttachTransport(std::move(transport));
+				if (WantsStreamObfuscation()) {
+					m_socket->SetConnectionEncryption(
+						true, GetUserHash().GetHash(), false);
+				} else {
+					m_socket->SetConnectionEncryption(false, nullptr, false);
+				}
+				return EContactResult::Contacting;
+			}
+		}
+#endif
 		if (!Connect()) {
-			return false;
+			return EContactResult::ConnectNotStarted;
 		}
 	}
-	return true;
+	// A direct UDP callback, a LowID path that reported sending, or a HighID
+	// connect: something is on its way.
+	return EContactResult::Contacting;
 }
 
 bool CUpDownClient::Connect()
@@ -1608,7 +1917,7 @@
 
 	if (!m_socket->IsOk()) {
 		// Enable or disable crypting based on our and the remote clients preference
-		if (HasValidHash() && SupportsCryptLayer() && thePrefs::IsClientCryptLayerSupported() && (RequestsCryptLayer() || thePrefs::IsClientCryptLayerRequested())){
+		if (WantsStreamObfuscation()) {
 			m_socket->SetConnectionEncryption(true, GetUserHash().GetHash(), false);
 		} else {
 			m_socket->SetConnectionEncryption(false, NULL, false);
@@ -1616,7 +1925,8 @@
 		amuleIPV4Address tmp;
 		tmp.Hostname(GetConnectIP());
 		tmp.Service(GetUserPort());
-		AddDebugLogLineN(logClient, "Trying to connect to " + Uint32_16toStringIP_Port(GetConnectIP(),GetUserPort()));
+		AddDebugLogLineN(logClient,
+			"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
@@ -1626,22 +1936,57 @@
 	}
 }
 
+// Put the browse's ask on the wire, if this browse is still waiting for it.
+//
+// One implementation, two callers: ConnectionEstablished (the ask follows the connect) and
+// RequestSharedFileList (the peer was already on the line). Extracted rather than
+// duplicated because the packet is the smaller half of what has to happen -- the guard and
+// the clock below are the rest, and a copy that dropped either would spam the peer or
+// charge it for our connect time.
+//
+// The guard: ConnectionEstablished runs on every reconnect, and a browsed peer that is also
+// a download source reconnects often -- re-asking each time put unrequested packets on the
+// wire and an error line in the peer's log. It only makes the ask single-shot for a
+// DIRECTORY browse; a flat one stays askable.
+void CUpDownClient::SendSharedFilesRequest()
+{
+	if (!theApp->browsemanager->AwaitingDirectoryList(this)) {
+		return;
+	}
+	CPacket *packet =
+		new CPacket(m_fSharedDirectories ? OP_ASKSHAREDDIRS : OP_ASKSHAREDFILES, 0, OP_EDONKEYPROT);
+	theStats::AddUpOverheadOther(packet->GetPacketSize());
+	SendPacket(packet, true, true);
+	// Re-base the silence deadline: Store::Start already set one, but from the click, and the
+	// connect that got us here may have taken a while. Without this the peer is charged for our
+	// connect time and the browse can expire early -- most visibly on the
+	// ConnectionEstablished path.
+	theApp->browsemanager->OnRequestSent(this, ::GetTickCount64());
+#ifdef __DEBUG__
+	if (m_fSharedDirectories) {
+		AddDebugLogLineN(logLocalClient, "Local Client: OP_ASKSHAREDDIRS to " + GetFullIP());
+	} else {
+		AddDebugLogLineN(logLocalClient, "Local Client: OP_ASKSHAREDFILES to " + GetFullIP());
+	}
+#endif
+}
+
 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 */
+	// Kry - First thing, check if this client was just used to retrieve info. That is some
+	// debug thing for myself -- check the connection_reason definition.
 
 	m_hasbeenobfuscatinglately = (m_socket && m_socket->IsConnected() && m_socket->IsObfusicating());
 
-	#ifdef __DEBUG__
+#ifdef __DEBUG__
 	if (!connection_reason.IsEmpty()) {
-		AddLogLineN(CFormat("Got client info checking for %s: %s\nDisconnecting and deleting.") % connection_reason % GetClientFullInfo());
+		AddLogLineN(CFormat("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;
 	}
-	#endif
+#endif
 
 	// Check if we should use this client to retrieve our public IP
 	// Ignore local ip on GetPublicIP (could be wrong)
@@ -1650,31 +1995,33 @@
 	}
 
 	// was this a direct callback?
-	if (m_dwDirectCallbackTimeout != 0){
+	if (m_dwDirectCallbackTimeout != 0) {
 		theApp->clientlist->RemoveDirectCallback(this);
 		m_dwDirectCallbackTimeout = 0;
-		AddDebugLogLineN(logClient, "Direct Callback succeeded, connection established to " + Uint32toStringIP(GetConnectIP()));
+		AddDebugLogLineN(logClient,
+			"Direct Callback succeeded, connection established to " +
+				Uint32toStringIP(GetConnectIP()));
 	}
 
 	switch (GetKadState()) {
-		case KS_CONNECTING_FWCHECK:
-			SetKadState(KS_CONNECTED_FWCHECK);
-			break;
-		case KS_CONNECTING_BUDDY:
-		case KS_INCOMING_BUDDY:
-			SetKadState(KS_CONNECTED_BUDDY);
-			break;
-		case KS_CONNECTING_FWCHECK_UDP:
-			SetKadState(KS_FWCHECK_UDP);
-			SendFirewallCheckUDPRequest();
-			break;
-		default:
-			break;
+	case KS_CONNECTING_FWCHECK:
+		SetKadState(KS_CONNECTED_FWCHECK);
+		break;
+	case KS_CONNECTING_BUDDY:
+	case KS_INCOMING_BUDDY:
+		SetKadState(KS_CONNECTED_BUDDY);
+		break;
+	case KS_CONNECTING_FWCHECK_UDP:
+		SetKadState(KS_FWCHECK_UDP);
+		SendFirewallCheckUDPRequest();
+		break;
+	default:
+		break;
 	}
 
 	// ok we have a connection, lets see if we want anything from this client
 	if (GetChatState() == MS_CONNECTING) {
-		SetChatState( MS_CHATTING );
+		SetChatState(MS_CHATTING);
 	}
 
 	if (GetChatState() == MS_CHATTING) {
@@ -1682,77 +2029,65 @@
 		if (!m_pendingMessage.IsEmpty()) {
 			result = SendChatMessage(m_pendingMessage);
 		}
-		Notify_ChatConnResult(result,GUI_ID(GetIP(),GetUserPort()),m_pendingMessage);
+		Notify_ChatConnResult(result, GUI_ID(GetIP(), GetUserPort()), m_pendingMessage);
 		m_pendingMessage.Clear();
 	}
 
-	switch(GetDownloadState()) {
-		case DS_CONNECTING:
-		case DS_WAITCALLBACK:
-		case DS_WAITCALLBACKKAD:
-			m_bReaskPending = false;
-			SetDownloadState(DS_CONNECTED);
-			SendFileRequest();
+	switch (GetDownloadState()) {
+	case DS_CONNECTING:
+	case DS_WAITCALLBACK:
+	case DS_WAITCALLBACKKAD:
+		m_bReaskPending = false;
+		SetDownloadState(DS_CONNECTED);
+		SendFileRequest();
 	}
-	if (m_bReaskPending){
+	if (m_bReaskPending) {
 		m_bReaskPending = false;
 		if (GetDownloadState() != DS_NONE && GetDownloadState() != DS_DOWNLOADING) {
 			SetDownloadState(DS_CONNECTED);
 			SendFileRequest();
 		}
 	}
-	switch(GetUploadState()){
-		case US_CONNECTING:
-		case US_WAITCALLBACK:
-			if (theApp->uploadqueue->IsDownloading(this)) {
-				SetUploadState(US_UPLOADING);
-				CPacket* packet = new CPacket(OP_ACCEPTUPLOADREQ, 0, OP_EDONKEYPROT);
-				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-				SendPacket(packet,true);
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_ACCEPTUPLOADREQ to " + GetFullIP() );
-			}
-	}
-	if (m_iFileListRequested == 1) {
-		CPacket* packet = new CPacket(m_fSharedDirectories ? OP_ASKSHAREDDIRS : OP_ASKSHAREDFILES, 0, OP_EDONKEYPROT);
-		theStats::AddUpOverheadOther(packet->GetPacketSize());
-		SendPacket(packet,true,true);
-#ifdef __DEBUG__
-		if (m_fSharedDirectories) {
-			AddDebugLogLineN( logLocalClient, "Local Client: OP_ASKSHAREDDIRS to " + GetFullIP() );
-		} else {
-			AddDebugLogLineN( logLocalClient, "Local Client: OP_ASKSHAREDFILES to " + GetFullIP() );
+	switch (GetUploadState()) {
+	case US_CONNECTING:
+	case US_WAITCALLBACK:
+		if (theApp->uploadqueue->IsDownloading(this)) {
+			SetUploadState(US_UPLOADING);
+			CPacket *packet = new CPacket(OP_ACCEPTUPLOADREQ, 0, OP_EDONKEYPROT);
+			theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
+			SendPacket(packet, true);
+			AddDebugLogLineN(
+				logLocalClient, "Local Client: OP_ACCEPTUPLOADREQ to " + GetFullIP());
 		}
-#endif
 	}
+	SendSharedFilesRequest();
 
 	while (!m_WaitingPackets_list.empty()) {
-		CPacket* packet = m_WaitingPackets_list.front();
+		CPacket *packet = m_WaitingPackets_list.front();
 		m_WaitingPackets_list.pop_front();
 
 		SendPacket(packet);
 	}
 }
 
-
 int CUpDownClient::GetHashType() const
 {
-	if ( m_UserHash5 == 13  && m_UserHash14 == 110 ) {
+	if (m_UserHash5 == 13 && m_UserHash14 == 110) {
 		return SO_OLDEMULE;
 	}
 
-	if ( m_UserHash5 == 14  && m_UserHash14 == 111 ) {
+	if (m_UserHash5 == 14 && m_UserHash14 == 111) {
 		return SO_EMULE;
 	}
 
-	if ( m_UserHash5 == 'M' && m_UserHash14 == 'L' ) {
+	if (m_UserHash5 == 'M' && m_UserHash14 == 'L') {
 		return SO_MLDONKEY;
 	}
 
 	return SO_UNKNOWN;
 }
 
-
-void CUpDownClient::SetSocket(CClientTCPSocket* socket)
+void CUpDownClient::SetSocket(CClientTCPSocket *socket)
 {
 #ifdef __DEBUG__
 	if (m_socket == NULL && socket != NULL) {
@@ -1764,12 +2099,12 @@
 	m_socket = socket;
 }
 
-
 void CUpDownClient::ReGetClientSoft()
 {
 	if (m_Username.IsEmpty()) {
-		m_clientSoft=SO_UNKNOWN;
-		m_clientVerString = m_clientSoftString = m_clientVersionString = m_fullClientVerString = _("Unknown");
+		m_clientSoft = SO_UNKNOWN;
+		m_clientVerString = m_clientSoftString = m_clientVersionString = m_fullClientVerString =
+			_("Unknown");
 		UpdateStats();
 		return;
 	}
@@ -1781,7 +2116,7 @@
 		m_clientSoft = m_byCompatibleClient;
 		m_clientSoftString = GetSoftName(m_clientSoft);
 		// Special issues:
-		if(!GetClientModString().IsEmpty() && (m_clientSoft != SO_EMULE)) {
+		if (!GetClientModString().IsEmpty() && (m_clientSoft != SO_EMULE)) {
 			m_clientSoftString = GetClientModString();
 		}
 		// Isn't xMule annoying?
@@ -1789,22 +2124,20 @@
 			m_clientSoftString += CFormat(_(" (Fake eMule version %#x)")) % GetMuleVersion();
 		}
 		if ((m_clientSoft == SO_EMULE) &&
-			(
-				wxString(GetClientModString()).MakeLower().Find("xmule") != -1
-				|| GetUserName().Find("xmule.") != -1
-			)
-		) {
+			(wxString(GetClientModString()).MakeLower().Find("xmule") != -1 ||
+				GetUserName().Find("xmule.") != -1)) {
 			// FAKE eMule -a newer xMule faking is ident.
 			m_clientSoft = SO_LXMULE;
 			if (GetClientModString().IsEmpty() == false) {
 				m_clientSoftString = GetClientModString() + _(" (Fake eMule)");
 			} else {
-				m_clientSoftString = _("xMule (Fake eMule)"); // don't use GetSoftName, it's not lmule.
+				m_clientSoftString =
+					_("xMule (Fake eMule)"); // don't use GetSoftName, it's not lmule.
 			}
 		}
 		// Now, what if we don't know this SO_ID?
 		if (m_clientSoftString.IsEmpty()) {
-			if(m_bIsML) {
+			if (m_bIsML) {
 				m_clientSoft = SO_MLDONKEY;
 				m_clientSoftString = GetSoftName(m_clientSoft);
 			} else if (m_bIsHybrid) {
@@ -1812,80 +2145,65 @@
 				m_clientSoftString = GetSoftName(m_clientSoft);
 			} else if (m_byCompatibleClient != 0) {
 				m_clientSoft = SO_COMPAT_UNK;
-				#ifdef __DEBUG__
+#ifdef __DEBUG__
 				if (
 					// Exceptions:
-					(m_byCompatibleClient != 0xf0)	// Chinese leech mod
-					&& (1==1)						// Your ad here
-					) {
-					AddLogLineNS(CFormat("Compatible client found with ET_COMPATIBLECLIENT of %x") % m_byCompatibleClient);
+					(m_byCompatibleClient != 0xf0) // Chinese leech mod
+					// Placeholder kept so new exception conditions can be ANDed in.
+					// NOLINTNEXTLINE(misc-redundant-expression)
+					&& (1 == 1) // Your ad here
+				) {
+					AddLogLineNS(CFormat("Compatible client found with "
+							     "ET_COMPATIBLECLIENT of %x") %
+						     m_byCompatibleClient);
 				}
-				#endif
-				m_clientSoftString = CFormat("%s(%#x)") % GetSoftName(m_clientSoft) % m_byCompatibleClient;
+#endif
+				m_clientSoftString =
+					CFormat("%s(%#x)") % GetSoftName(m_clientSoft) % m_byCompatibleClient;
 			} else {
-				// If we step here, it might mean 2 things:
-				// a eMule
-				// a Compat Client that has sent no MuleInfo packet yet.
+				// Getting here might mean two things: an eMule, or a Compat Client
+				// that has sent no MuleInfo packet yet.
 				m_clientSoft = SO_EMULE;
 				m_clientSoftString = "eMule";
 			}
 		}
 
 		if (m_byEmuleVersion == 0) {
-			m_nClientVersion = MAKE_CLIENT_VERSION(0,0,0);
+			m_nClientVersion = MAKE_CLIENT_VERSION(0, 0, 0);
 		} else if (m_byEmuleVersion != 0x99) {
-			uint32 nClientMinVersion = (m_byEmuleVersion >> 4)*10 + (m_byEmuleVersion & 0x0f);
-			m_nClientVersion = MAKE_CLIENT_VERSION(0,nClientMinVersion,0);
+			uint32 nClientMinVersion = (m_byEmuleVersion >> 4) * 10 + (m_byEmuleVersion & 0x0f);
+			m_nClientVersion = MAKE_CLIENT_VERSION(0, nClientMinVersion, 0);
 			switch (m_clientSoft) {
-				case SO_AMULE:
-					m_clientVerString = CFormat(_("1.x (based on eMule v0.%u)")) % nClientMinVersion;
-					break;
-				case SO_LPHANT:
-					m_clientVerString = "< v0.05";
-					break;
-				default:
-					clientModString = GetClientModString();
-					m_clientVerString = CFormat("v0.%u") % nClientMinVersion;
-					break;
+			case SO_AMULE:
+				m_clientVerString =
+					CFormat(_("1.x (based on eMule v0.%u)")) % nClientMinVersion;
+				break;
+			case SO_LPHANT:
+				m_clientVerString = "< v0.05";
+				break;
+			default:
+				clientModString = GetClientModString();
+				m_clientVerString = CFormat("v0.%u") % nClientMinVersion;
+				break;
 			}
 		} else {
 			uint32 nClientMajVersion = (m_nClientVersion >> 17) & 0x7f;
 			uint32 nClientMinVersion = (m_nClientVersion >> 10) & 0x7f;
-			uint32 nClientUpVersion  = (m_nClientVersion >>  7) & 0x07;
+			uint32 nClientUpVersion = (m_nClientVersion >> 7) & 0x07;
 
-			m_nClientVersion = MAKE_CLIENT_VERSION(nClientMajVersion, nClientMinVersion, nClientUpVersion);
+			m_nClientVersion =
+				MAKE_CLIENT_VERSION(nClientMajVersion, nClientMinVersion, nClientUpVersion);
 
-			switch (m_clientSoft) {
-				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 = CFormat("v%u.%u.%u") % nClientMajVersion % nClientMinVersion % nClientUpVersion;
-					break;
-				case SO_LPHANT:
-					m_clientVerString = CFormat(" v%u.%.2u%c") % (nClientMajVersion-1) % nClientMinVersion % ('a' + nClientUpVersion);
-					break;
-				case SO_EMULEPLUS:
-					m_clientVerString = CFormat("v%u") % nClientMajVersion;
-					if(nClientMinVersion != 0) {
-						m_clientVerString += CFormat(".%u") % nClientMinVersion;
-					}
-					if(nClientUpVersion != 0) {
-						m_clientVerString += CFormat("%c") % ('a' + nClientUpVersion - 1);
-					}
-					break;
-				default:
-					clientModString = GetClientModString();
-					m_clientVerString = CFormat("v%u.%u%c") % nClientMajVersion % nClientMinVersion % ('a' + nClientUpVersion);
-					break;
-			}
+			if (m_clientSoft != SO_AMULE && m_clientSoft != SO_LXMULE &&
+				m_clientSoft != SO_HYDRANODE && m_clientSoft != SO_MLDONKEY &&
+				m_clientSoft != SO_NEW_MLDONKEY && m_clientSoft != SO_NEW2_MLDONKEY &&
+				m_clientSoft != SO_LPHANT && m_clientSoft != SO_EMULEPLUS) {
+				clientModString = GetClientModString();
+			}
+			// One renderer for every consumer: the history rows derive the same
+			// string from the stored numeric, and used to disagree with this one.
+			m_clientVerString = FormatClientVersion(
+				m_clientSoft, nClientMajVersion, nClientMinVersion, nClientUpVersion);
 		}
 	} else if (m_bIsHybrid) {
 		// seen:
@@ -1901,37 +2219,35 @@
 		uint32 nClientMinVersion;
 		uint32 nClientUpVersion;
 		if (m_nClientVersion > 100000) {
-			uint32 uMaj = m_nClientVersion/100000;
+			uint32 uMaj = m_nClientVersion / 100000;
 			nClientMajVersion = uMaj - 1;
-			nClientMinVersion = (m_nClientVersion - uMaj*100000) / 100;
+			nClientMinVersion = (m_nClientVersion - uMaj * 100000) / 100;
 			nClientUpVersion = m_nClientVersion % 100;
-		}
-		else if (m_nClientVersion > 10000) {
-			uint32 uMaj = m_nClientVersion/10000;
+		} else if (m_nClientVersion > 10000) {
+			uint32 uMaj = m_nClientVersion / 10000;
 			nClientMajVersion = uMaj - 1;
-			nClientMinVersion = (m_nClientVersion - uMaj*10000) / 10;
+			nClientMinVersion = (m_nClientVersion - uMaj * 10000) / 10;
 			nClientUpVersion = m_nClientVersion % 10;
-		}
-		else if (m_nClientVersion > 1000) {
-			uint32 uMaj = m_nClientVersion/1000;
+		} else if (m_nClientVersion > 1000) {
+			uint32 uMaj = m_nClientVersion / 1000;
 			nClientMajVersion = uMaj - 1;
-			nClientMinVersion = m_nClientVersion - uMaj*1000;
+			nClientMinVersion = m_nClientVersion - uMaj * 1000;
 			nClientUpVersion = 0;
-		}
-		else if (m_nClientVersion > 100) {
-			uint32 uMin = m_nClientVersion/10;
+		} else if (m_nClientVersion > 100) {
+			uint32 uMin = m_nClientVersion / 10;
 			nClientMajVersion = 0;
 			nClientMinVersion = uMin;
-			nClientUpVersion = m_nClientVersion - uMin*10;
-		}
-		else{
+			nClientUpVersion = m_nClientVersion - uMin * 10;
+		} else {
 			nClientMajVersion = 0;
 			nClientMinVersion = m_nClientVersion;
 			nClientUpVersion = 0;
 		}
-		m_nClientVersion = MAKE_CLIENT_VERSION(nClientMajVersion, nClientMinVersion, nClientUpVersion);
+		m_nClientVersion =
+			MAKE_CLIENT_VERSION(nClientMajVersion, nClientMinVersion, nClientUpVersion);
 		if (nClientUpVersion) {
-			m_clientVerString = CFormat("v%u.%u.%u") % nClientMajVersion % nClientMinVersion % nClientUpVersion;
+			m_clientVerString = CFormat("v%u.%u.%u") % nClientMajVersion % nClientMinVersion %
+					    nClientUpVersion;
 		} else {
 			m_clientVerString = CFormat("v%u.%u") % nClientMajVersion % nClientMinVersion;
 		}
@@ -1951,7 +2267,8 @@
 		m_clientSoft = SO_EDONKEY;
 		m_clientSoftString = GetSoftName(m_clientSoft);
 		m_nClientVersion *= 10;
-		m_clientVerString = CFormat("v%u.%u") % (m_nClientVersion / 100000) % ((m_nClientVersion / 1000) % 100);
+		m_clientVerString =
+			CFormat("v%u.%u") % (m_nClientVersion / 100000) % ((m_nClientVersion / 1000) % 100);
 	}
 
 	m_clientVersionString = m_clientVerString;
@@ -1965,31 +2282,151 @@
 
 void CUpDownClient::RequestSharedFileList()
 {
-	if (m_iFileListRequested == 0) {
-		AddDebugLogLineN( logClient, wxString( "Requesting shared files from " ) + GetUserName() );
-		m_iFileListRequested = 1;
-		TryToConnect(true);
+	if (theApp->browsemanager->SearchIdFor(this) != 0) {
+		AddDebugLogLineN(logClient,
+			CFormat("Requesting shared files from user %s (%u) is already in progress") %
+				GetUserName() % GetUserIDHybrid());
+		return;
+	}
+	AddDebugLogLineN(logClient, wxString("Requesting shared files from ") + GetUserName());
+
+	// Allocate the ID before the request goes out, for a local browse as much as an EC one. It
+	// used to be assigned when the first result arrived, so until then the browse was keyed on
+	// this client's pointer -- which left state behind that nothing pruned, and collided when
+	// an address was reused.
+	//
+	// Otherwise this peer keeps the ID it was browsed under before: AllocateEd2kId is a
+	// monotonic counter that never reissues, so an ID we were given stays ours, and reusing it
+	// keeps one tab and one result bucket per peer however many times the user asks.
+	// Allocating afresh each time left the previous registration, results and browse record
+	// behind with nothing to free them.
+	//
+	// The previous record has to go before the new one can take its place: Store::Start refuses
+	// an ID it still holds.
+	if (m_browsePinned) {
+		m_browsePinned = false;
 	} else {
-		AddDebugLogLineN( logClient, CFormat( "Requesting shared files from user %s (%u) is already in progress" ) % GetUserName() % GetUserIDHybrid() );
+		if (m_browseSearchId == 0) {
+			m_browseSearchId = theApp->searchlist->AllocateEd2kId();
+		} else {
+			theApp->browsemanager->Remove(m_browseSearchId);
+		}
+		// Chosen here, so this browse is ours -- otherwise the flag would
+		// still describe whoever asked for the previous one.
+		m_browseEcInitiated = false;
+	}
+	// Take the browse first: it is the thing that can refuse, and refusing after announcing a
+	// tab would leave one open against a browse nobody is running.
+	if (!theApp->browsemanager->Start(this, m_browseSearchId, ::GetTickCount64())) {
+		AddDebugLogLineN(logClient,
+			CFormat("Browse of user %s (%u) was not started") % GetUserName() %
+				GetUserIDHybrid());
+		return;
+	}
+	// Describe it before any result arrives, so it is listable as a browse of this peer rather
+	// than as a nameless search -- but only when the ID is ours to describe. A caller that
+	// pinned one has already registered it under the identity IT considers authoritative: the
+	// friend path keys on the friend's ECID, and re-registering here would overwrite that with
+	// this client's, which is a different number from the same counter.
+	if (!m_browseEcInitiated) {
+		theApp->searchlist->RegisterBrowseSearch(m_browseSearchId, GetUserName(), ECID());
+	}
+
+	// Open the "View Files" tab up front (monolithic) so a peer that denies or
+	// never answers still shows a tab that can flip to "failed".
+	Notify_Browse_Started(ECID(), GetUserName(), (uint64)m_browseSearchId);
+
+	// Already on the line: ask over the socket we have, and skip TryToContact entirely.
+	//
+	// TryToContact answers a reachability question -- can we reach this peer if we are not
+	// already talking to it -- and for a LowID peer it answers Declined before it ever looks at
+	// the socket. Two of those declines do not imply we are unreachable at all: a LowID peer on
+	// our own server with Kad open, and being connected to neither network, both of which leave
+	// an established socket working. A browse over such a socket was failed on the spot even
+	// though the ask would have gone out fine.
+	//
+	// Deliberately narrow: TryToContact keeps its behaviour for every other caller. Hoisting
+	// the connected case inside it would also turn a connected LowID source's DS_LOWTOLOWIP
+	// into a SendFileRequest(), which is a download-path change with no business riding along
+	// here.
+	//
+	// Note what this caller gives up: a connected peer used to reach TryToContact's `else`
+	// branch and so ConnectionEstablished(), which does far more than send the ask -- Kad
+	// fw-check transitions, the chat MS_CONNECTING -> MS_CHATTING flush, DS_WAITCALLBACK ->
+	// DS_CONNECTED plus SendFileRequest(), the upload OP_ACCEPTUPLOADREQ, and the
+	// waiting-packet drain. Not taking that branch is the point rather than a side effect.
+	if (IsConnected()) {
+		// Re-validate first. TryToContact does this before it looks at the socket, so skipping
+		// straight past it would let a peer that became unacceptable since the connection came up
+		// -- filtered, banned, or incompatible with an obfuscation setting switched on meanwhile
+		// -- be browsed and be sent a packet. ClientDeleted means `this` is gone; the browse died
+		// with it.
+		switch (CheckContactPreconditions()) {
+		case EContactResult::ClientDeleted:
+			return;
+		case EContactResult::Declined:
+		case EContactResult::ConnectNotStarted:
+			theApp->browsemanager->Fail(this);
+			return;
+		case EContactResult::Contacting:
+			break;
+		}
+		// The guard is checked here rather than left to the helper's silent return. The two
+		// callers want opposite things from it: on ConnectionEstablished a false guard is the
+		// reconnect suppression working, while here it would mean returning with the tab already
+		// announced, nothing on the wire and no terminal path -- the browse that waits out its
+		// deadline. Start() guarantees the state, so this is a can't-happen, and it has to be
+		// greppable as one: in the log a bare Fail() here is indistinguishable from an ordinary
+		// browse failure.
+		if (!theApp->browsemanager->AwaitingDirectoryList(this)) {
+			AddDebugLogLineC(logClient,
+				CFormat("Browse of user %s (%u): the request guard was unset immediately "
+					"after Start() -- browse abandoned") %
+					GetUserName() % GetUserIDHybrid());
+			wxFAIL;
+			theApp->browsemanager->Fail(this);
+			return;
+		}
+		SendSharedFilesRequest();
+		return;
 	}
-}
 
+	switch (TryToContact(true)) {
+	case EContactResult::ClientDeleted:
+		// Destroyed on the way out, through Disconnected(), which has already
+		// ended the browse. Nothing left that may be touched.
+		return;
+	case EContactResult::Declined:
+	case EContactResult::ConnectNotStarted:
+		// Nothing was sent, so no terminal path downstream will ever run. The deadline would catch
+		// it eventually; saying so now is both correct and cheaper. This used to be inferred from
+		// the client's side effects, because the bool could not distinguish "I tried" from "I
+		// decided not to" -- and the inference was wrong twice.
+		theApp->browsemanager->Fail(this);
+		return;
+	case EContactResult::Contacting:
+		break;
+	}
+}
 
-void CUpDownClient::ProcessSharedFileList(const uint8_t* pachPacket, uint32 nSize, wxString& pszDirectory)
+void CUpDownClient::ProcessSharedFileList(const uint8_t *pachPacket, uint32 nSize, wxString &pszDirectory)
 {
-	if (m_iFileListRequested > 0) {
-		m_iFileListRequested--;
-		theApp->searchlist->ProcessSharedFileList(pachPacket, nSize, this, NULL, pszDirectory);
+	if (theApp->browsemanager->SearchIdFor(this) == 0) {
+		return;
 	}
+	theApp->searchlist->ProcessSharedFileList(pachPacket, nSize, this, nullptr, pszDirectory);
+	// A listing arrived, so the browse is alive and one step further along. Both protocol forms
+	// report here, and completion is decided in one place from the count -- the flat form used
+	// to have nothing mark it at all.
+	theApp->browsemanager->OnListingReceived(this, ::GetTickCount64());
 }
 
-
 void CUpDownClient::ResetFileStatusInfo()
 {
 	m_nPartCount = 0;
 
-	if ( m_reqfile ) {
-		m_reqfile->UpdatePartsFrequency( this, false );
+	if (m_reqfile) {
+		m_reqfile->UpdatePartsFrequency(this, false);
 	}
 	m_downPartStatus.clear();
 
@@ -2004,7 +2441,6 @@
 		delete m_pReqFileAICHHash;
 		m_pReqFileAICHHash = NULL;
 	}
-
 }
 
 wxString CUpDownClient::GetUploadFileInfo()
@@ -2014,22 +2450,28 @@
 	sRet = wxString(CFormat(_("NickName: %s ID: %u")) % GetUserName() % GetUserIDHybrid()) + " ";
 	if (m_reqfile) {
 		sRet += CFormat(_("Requested: %s\n")) % m_reqfile->GetFileName();
-		sRet += CFormat(
-				wxPLURAL("Filestats for this session: Accepted %d of %d request, %s transferred\n", "Filestats for this session: Accepted %d of %d requests, %s transferred\n", m_reqfile->statistic.GetRequests())
-				) % m_reqfile->statistic.GetAccepts() % m_reqfile->statistic.GetRequests() % CastItoXBytes(m_reqfile->statistic.GetTransferred());
-		sRet += CFormat(
-				wxPLURAL("Filestats for all sessions: Accepted %d of %d request, %s transferred\n", "Filestats for all sessions: Accepted %d of %d requests, %s transferred\n", m_reqfile->statistic.GetAllTimeRequests())
-				) % m_reqfile->statistic.GetAllTimeAccepts() % m_reqfile->statistic.GetAllTimeRequests() % CastItoXBytes(m_reqfile->statistic.GetAllTimeTransferred());
+		sRet += CFormat(wxPLURAL(
+				"Filestats for this session: Accepted %d of %d request, %s transferred\n",
+				"Filestats for this session: Accepted %d of %d requests, %s transferred\n",
+				m_reqfile->statistic.GetRequests())) %
+			m_reqfile->statistic.GetAccepts() % m_reqfile->statistic.GetRequests() %
+			CastItoXBytes(m_reqfile->statistic.GetTransferred());
+		sRet += CFormat(wxPLURAL(
+				"Filestats for all sessions: Accepted %d of %d request, %s transferred\n",
+				"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n",
+				m_reqfile->statistic.GetAllTimeRequests())) %
+			m_reqfile->statistic.GetAllTimeAccepts() % m_reqfile->statistic.GetAllTimeRequests() %
+			CastItoXBytes(m_reqfile->statistic.GetAllTimeTransferred());
 	} else {
 		sRet += _("Requested unknown file");
 	}
 	return sRet;
 }
 
-// sends a packet, if needed it will establish a connection before
-// options used: ignore max connections, control packet, delete packet
-// !if the functions returns false it is _possible_ that this clientobject was deleted, because the connectiontry fails
-bool CUpDownClient::SafeSendPacket(CPacket* packet)
+// Sends a packet, establishing a connection first if needed. Options used: ignore max
+// connections, control packet, delete packet. If it returns false it is _possible_ that
+// this client object was deleted, because the connection try failed.
+bool CUpDownClient::SafeSendPacket(CPacket *packet)
 {
 	if (IsConnected()) {
 		SendPacket(packet, true);
@@ -2053,15 +2495,14 @@
 	CMemFile data;
 	data.WriteUInt8(theApp->clientcredits->GetPubKeyLen());
 	data.Write(theApp->clientcredits->GetPublicKey(), theApp->clientcredits->GetPubKeyLen());
-	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_PUBLICKEY);
+	CPacket *packet = new CPacket(data, OP_EMULEPROT, OP_PUBLICKEY);
 
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
-	AddDebugLogLineN( logLocalClient, "Local Client: OP_PUBLICKEY to " + GetFullIP() );
-	SendPacket(packet,true,true);
+	AddDebugLogLineN(logLocalClient, "Local Client: OP_PUBLICKEY to " + GetFullIP());
+	SendPacket(packet, true, true);
 	m_SecureIdentState = IS_SIGNATURENEEDED;
 }
 
-
 void CUpDownClient::SendSignaturePacket()
 {
 	// signate the public key of this client and send it
@@ -2076,34 +2517,38 @@
 		return; // We don't have his public key yet, will be back here later
 	}
 	// do we have a challenge value received (actually we should if we are in this function)
-	if (credits->m_dwCryptRndChallengeFrom == 0){
-		AddDebugLogLineN( logClient, wxString("Want to send signature but challenge value is invalid - User ") + GetUserName());
+	if (credits->m_dwCryptRndChallengeFrom == 0) {
+		AddDebugLogLineN(logClient,
+			wxString("Want to send signature but challenge value is invalid - User ") +
+				GetUserName());
 		return;
 	}
-	// v2
-	// we will use v1 as default, except if only v2 is supported
-	bool bUseV2;
-	if ( (m_bySupportSecIdent&1) == 1 )
-		bUseV2 = false;
-	else
-		bUseV2 = true;
+	// Only a real IPv4 endpoint can supply the unchanged SecureIdent v2 wire value.
+	uint32 peerIPv4 = 0;
+	const bool hasIPv4 = SecIdent::PeerIPv4(GetUserAddress(), peerIPv4);
+	const SecIdent::Version version = SecIdent::SignatureVersion(m_bySupportSecIdent, hasIPv4);
+	if (version == SecIdent::Unavailable) {
+		return; // No mutually usable version; do not send v1 to a v2-only peer.
+	}
+	const bool bUseV2 = version == SecIdent::V2;
 
 	uint8 byChaIPKind = 0;
 	uint32 ChallengeIP = 0;
-	if (bUseV2){
+	if (bUseV2) {
 		if (::IsLowID(theApp->GetED2KID())) {
 			// we cannot do not know for sure our public ip, so use the remote clients one
-			ChallengeIP = GetIP();
+			ChallengeIP = peerIPv4;
 			byChaIPKind = CRYPT_CIP_REMOTECLIENT;
 		} else {
 			ChallengeIP = theApp->GetED2KID();
-			byChaIPKind  = CRYPT_CIP_LOCALCLIENT;
+			byChaIPKind = CRYPT_CIP_LOCALCLIENT;
 		}
 	}
-	//end v2
+	// end v2
 	uint8_t achBuffer250;
 
-	uint8 siglen = theApp->clientcredits->CreateSignature(credits, achBuffer,  250, ChallengeIP, byChaIPKind );
+	uint8 siglen =
+		theApp->clientcredits->CreateSignature(credits, achBuffer, 250, ChallengeIP, byChaIPKind);
 	wxCHECK2(siglen != 0, return);
 
 	CMemFile data;
@@ -2113,23 +2558,23 @@
 		data.WriteUInt8(byChaIPKind);
 	}
 
-	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_SIGNATURE);
+	CPacket *packet = new CPacket(data, OP_EMULEPROT, OP_SIGNATURE);
 
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
-	AddDebugLogLineN( logLocalClient, "Local Client: OP_SIGNATURE to " + GetFullIP() );
-	SendPacket(packet,true,true);
+	AddDebugLogLineN(logLocalClient, "Local Client: OP_SIGNATURE to " + GetFullIP());
+	SendPacket(packet, true, true);
 	m_SecureIdentState = IS_ALLREQUESTSSEND;
 }
 
-
-void CUpDownClient::ProcessPublicKeyPacket(const uint8_t* pachPacket, uint32 nSize)
+void CUpDownClient::ProcessPublicKeyPacket(const uint8_t *pachPacket, uint32 nSize)
 {
 	theApp->clientlist->AddTrackClient(this);
 
 	wxCHECK2(m_socket != NULL, return);
 	wxCHECK2(credits != NULL, return);
 	if (pachPacket0 != nSize - 1) {
-		AddDebugLogLineN(logClient, CFormat("Inconsistent packet size (%d != %d)") % pachPacket0 % (nSize - 1));
+		AddDebugLogLineN(logClient,
+			CFormat("Inconsistent packet size (%d != %d)") % pachPacket0 % (nSize - 1));
 		return;
 	}
 	if (nSize == 0) {
@@ -2143,22 +2588,21 @@
 	if (!theApp->CryptoAvailable())
 		return;
 	// the function will handle everything (multiple key etc)
-	if (credits->SetSecureIdent(pachPacket+1, pachPacket0)){
+	if (credits->SetSecureIdent(pachPacket + 1, pachPacket0)) {
 		// if this client wants a signature, now we can send him one
-		if (m_SecureIdentState == IS_SIGNATURENEEDED){
+		if (m_SecureIdentState == IS_SIGNATURENEEDED) {
 			SendSignaturePacket();
-		}
-		else if (m_SecureIdentState == IS_KEYANDSIGNEEDED) {
+		} else if (m_SecureIdentState == IS_KEYANDSIGNEEDED) {
 			// something is wrong
-			AddDebugLogLineN( logClient, "Invalid State error: IS_KEYANDSIGNEEDED in ProcessPublicKeyPacket" );
+			AddDebugLogLineN(logClient,
+				"Invalid State error: IS_KEYANDSIGNEEDED in ProcessPublicKeyPacket");
 		}
 	} else {
-		AddDebugLogLineN( logClient, "Failed to use new received public key" );
+		AddDebugLogLineN(logClient, "Failed to use new received public key");
 	}
 }
 
-
-void CUpDownClient::ProcessSignaturePacket(const uint8_t* pachPacket, uint32 nSize)
+void CUpDownClient::ProcessSignaturePacket(const uint8_t *pachPacket, uint32 nSize)
 {
 	// here we spread the good guys from the bad ones ;)
 
@@ -2173,11 +2617,14 @@
 		return;
 	}
 
+	uint32 peerIPv4 = 0;
+	const bool hasIPv4 = SecIdent::PeerIPv4(GetUserAddress(), peerIPv4);
 	uint8 byChaIPKind;
-	if (pachPacket0 == nSize-1)
+	if (pachPacket0 == nSize - 1)
 		byChaIPKind = 0;
-	else if (pachPacket0 == nSize-2 && (m_bySupportSecIdent & 2) > 0) //v2
-		byChaIPKind = pachPacketnSize-1;
+	else if (pachPacket0 == nSize - 2 && (m_bySupportSecIdent & SecIdent::V2) > 0 &&
+		 hasIPv4) // v2 requires the IPv4 endpoint used by VerifyIdent
+		byChaIPKind = pachPacketnSize - 1;
 	else {
 		// Unknown or invalid format
 		AddDebugLogLineN(logClient, "Invalid or unknown challenge format - ignoring");
@@ -2188,30 +2635,40 @@
 		return;
 
 	// we accept only one signature per IP, to avoid floods which need a lot cpu time for cryptfunctions
-	if (m_dwLastSignatureIP == GetIP()){
-		AddDebugLogLineN( logClient, "received multiple signatures from one client" );
+	if (m_hasReceivedSignature && m_lastSignatureAddress == GetUserAddress()) {
+		AddDebugLogLineN(logClient, "received multiple signatures from one client");
 		return;
 	}
 	// also make sure this client has a public key
-	if (credits->GetSecIDKeyLen() == 0){
-		AddDebugLogLineN( logClient, "received signature for client without public key" );
+	if (credits->GetSecIDKeyLen() == 0) {
+		AddDebugLogLineN(logClient, "received signature for client without public key");
 		return;
 	}
 	// and one more check: did we ask for a signature and sent a challenge packet?
-	if (credits->m_dwCryptRndChallengeFor == 0){
-		AddDebugLogLineN( logClient, "received signature for client with invalid challenge value - User " + GetUserName() );
+	if (credits->m_dwCryptRndChallengeFor == 0) {
+		AddDebugLogLineN(logClient,
+			"received signature for client with invalid challenge value - User " + GetUserName());
 		return;
 	}
 
 	// cppcheck-suppress duplicateBranch
-	if (theApp->clientcredits->VerifyIdent(credits, pachPacket+1, pachPacket0, GetIP(), byChaIPKind ) ) {
+	if (theApp->clientcredits->VerifyIdent(
+		    credits, pachPacket + 1, pachPacket0, GetUserAddress(), byChaIPKind)) {
 		// result is saved in function above
-		AddDebugLogLineN( logClient, CFormat( "'%s' has passed the secure identification, V2 State: %i" ) % GetUserName() % byChaIPKind );
-	} else {
-		AddDebugLogLineN( logClient, CFormat( "'%s' has failed the secure identification, V2 State: %i" ) % GetUserName() % byChaIPKind );
+		AddDebugLogLineN(logClient,
+			CFormat("'%s' has passed the secure identification, V2 State: %i") % GetUserName() %
+				byChaIPKind);
+	} else {
+		AddDebugLogLineN(logClient,
+			CFormat("'%s' has failed the secure identification, V2 State: %i") % GetUserName() %
+				byChaIPKind);
 	}
 
-	m_dwLastSignatureIP = GetIP();
+	if (GetUserAddress().IsPresent()) {
+		// A signature we could not bind to an endpoint must not block the peer's next attempt.
+		m_lastSignatureAddress = GetUserAddress();
+		m_hasReceivedSignature = true;
+	}
 }
 
 void CUpDownClient::SendSecIdentStatePacket()
@@ -2220,86 +2677,82 @@
 
 	// check if we need public key and signature
 	uint8 nValue = 0;
-	if (theApp->CryptoAvailable()){
+	if (theApp->CryptoAvailable()) {
 		if (credits->GetSecIDKeyLen() == 0) {
 			nValue = IS_KEYANDSIGNEEDED;
-		} else if (m_dwLastSignatureIP != GetIP()) {
+		} else if (!m_hasReceivedSignature || m_lastSignatureAddress != GetUserAddress()) {
 			nValue = IS_SIGNATURENEEDED;
 		}
 	}
-	if (nValue == 0){
-		AddDebugLogLineN( logClient, "Not sending SecIdentState Packet, because State is Zero" );
+	if (nValue == 0) {
+		AddDebugLogLineN(logClient, "Not sending SecIdentState Packet, because State is Zero");
 		return;
 	}
 	// crypt: send random data to sign
-	uint32 dwRandom = rand()+1;
+	uint32 dwRandom = rand() + 1;
 	credits->m_dwCryptRndChallengeFor = dwRandom;
 
 	CMemFile data;
 	data.WriteUInt8(nValue);
 	data.WriteUInt32(dwRandom);
-	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_SECIDENTSTATE);
+	CPacket *packet = new CPacket(data, OP_EMULEPROT, OP_SECIDENTSTATE);
 
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
-	AddDebugLogLineN( logLocalClient, "Local Client: OP_SECIDENTSTATE to " + GetFullIP() );
-	SendPacket(packet,true,true);
+	AddDebugLogLineN(logLocalClient, "Local Client: OP_SECIDENTSTATE to " + GetFullIP());
+	SendPacket(packet, true, true);
 }
 
-
-void CUpDownClient::ProcessSecIdentStatePacket(const uint8_t* pachPacket, uint32 nSize)
+void CUpDownClient::ProcessSecIdentStatePacket(const uint8_t *pachPacket, uint32 nSize)
 {
-	if ( nSize != 5 ) {
+	if (nSize != 5) {
 		return;
 	}
 
 	wxCHECK2(credits, return);
 
-	CMemFile data(pachPacket,nSize);
+	CMemFile data(pachPacket, nSize);
 
-	switch ( data.ReadUInt8() ) {
-		case 0:
-			m_SecureIdentState = IS_UNAVAILABLE;
-			break;
-		case 1:
-			m_SecureIdentState = IS_SIGNATURENEEDED;
-			break;
-		case 2:
-			m_SecureIdentState = IS_KEYANDSIGNEEDED;
-			break;
-		default:
-			return;
+	switch (data.ReadUInt8()) {
+	case 0:
+		m_SecureIdentState = IS_UNAVAILABLE;
+		break;
+	case 1:
+		m_SecureIdentState = IS_SIGNATURENEEDED;
+		break;
+	case 2:
+		m_SecureIdentState = IS_KEYANDSIGNEEDED;
+		break;
+	default:
+		return;
 	}
 
 	credits->m_dwCryptRndChallengeFrom = data.ReadUInt32();
 }
 
-
 void CUpDownClient::InfoPacketsReceived()
 {
 	// indicates that both Information Packets has been received
 	// needed for actions, which process data from both packets
-	wxASSERT ( m_byInfopacketsReceived == IP_BOTH );
+	wxASSERT(m_byInfopacketsReceived == IP_BOTH);
 	m_byInfopacketsReceived = IP_NONE;
 
-	if (m_bySupportSecIdent){
+	if (SecIdent::SignatureVersion(m_bySupportSecIdent, HasPeerIPv4()) != SecIdent::Unavailable) {
 		SendSecIdentStatePacket();
 	}
 }
 
-
 bool CUpDownClient::CheckHandshakeFinished() const
 {
 	if (m_bHelloAnswerPending) {
 		// this triggers way too often.. need more time to look at this -> only create a warning
 		// The reason for this is that 2 clients are connecting to each other at the same time..
-		AddDebugLogLineN( logClient, "Handshake not finished while processing packet." );
+		AddDebugLogLineN(logClient, "Handshake not finished while processing packet.");
 		return false;
 	}
 
 	return true;
 }
 
-
 #ifdef __DEBUG__
 wxString CUpDownClient::GetClientFullInfo()
 {
@@ -2307,13 +2760,9 @@
 		ReGetClientSoft();
 	}
 
-	return CFormat( "Client %s on IP:Port %s:%d using %s %s %s" )
-		% ( m_Username.IsEmpty() ? wxString(_("Unknown")) : m_Username )
-		% GetFullIP()
-		% GetUserPort()
-		% m_clientSoftString
-		% m_clientVerString
-		% m_strModVersion;
+	return CFormat("Client %s on IP:Port %s:%d using %s %s %s") %
+	       (m_Username.IsEmpty() ? wxString(_("Unknown")) : m_Username) % GetFullIP() % GetUserPort() %
+	       m_clientSoftString % m_clientVerString % m_strModVersion;
 }
 #endif
 
@@ -2323,53 +2772,48 @@
 		ReGetClientSoft();
 	}
 
-	return CFormat( "'%s' (%s %s %s)" )
-		% ( m_Username.IsEmpty() ? wxString(_("Unknown")) : m_Username )
-		% m_clientSoftString
-		% m_clientVerString
-		% m_strModVersion;
+	return CFormat("'%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);
+	if (IsConnected()) {
+		CPacket *packet = new CPacket(OP_PUBLICIP_REQ, 0, OP_EMULEPROT);
 		theStats::AddUpOverheadOther(packet->GetPacketSize());
-		AddDebugLogLineN( logLocalClient, "Local Client: OP_PUBLICIP_REQ to " + GetFullIP());
-		SendPacket(packet,true);
+		AddDebugLogLineN(logLocalClient, "Local Client: OP_PUBLICIP_REQ to " + GetFullIP());
+		SendPacket(packet, true);
 		m_fNeedOurPublicIP = true;
 	}
 }
 
-void CUpDownClient::ProcessPublicIPAnswer(const uint8_t* pbyData, uint32 uSize)
+void CUpDownClient::ProcessPublicIPAnswer(const uint8_t *pbyData, uint32 uSize)
 {
 	if (uSize != 4) {
 		throw wxString("Wrong Packet size on Public IP answer");
 	}
 	uint32 dwIP = PeekUInt32(pbyData);
-	if (m_fNeedOurPublicIP == true){ // did we?
+	if (m_fNeedOurPublicIP == true) { // did we?
 		m_fNeedOurPublicIP = false;
 		// Ignore local ip on GetPublicIP (could be wrong)
-		if (theApp->GetPublicIP(true) == 0 && !IsLowID(dwIP) ) {
+		if (theApp->GetPublicIP(true) == 0 && !IsLowID(dwIP)) {
 			theApp->SetPublicIP(dwIP);
 		}
 	}
 }
 
-
 bool CUpDownClient::IsConnected() const
 {
 	return m_socket && m_socket->IsConnected();
 }
 
-bool CUpDownClient::SendPacket(CPacket* packet, bool delpacket, bool controlpacket)
+bool CUpDownClient::SendPacket(CPacket *packet, bool delpacket, bool controlpacket)
 {
-	if ( m_socket ) {
-		m_socket->SendPacket(packet, delpacket, controlpacket );
+	if (m_socket) {
+		m_socket->SendPacket(packet, delpacket, controlpacket);
 		return true;
 	} else {
-		AddLogLineN("CAUGHT DEAD SOCKET IN SENDPACKET()");
+		AddLogLineN(LOG_DIAGNOSTIC("CAUGHT DEAD SOCKET IN SENDPACKET()"));
 		return false;
 	}
 }
@@ -2377,18 +2821,19 @@
 float CUpDownClient::TickDownloadAndMeasure()
 {
 	// lfroen: in daemon it actually can happen
-		wxASSERT( m_socket );
+	wxASSERT(m_socket);
 
 	float kBpsClient = CalculateKBpsDown();
 
-	if ( m_socket ) {
+	if (m_socket) {
 		// Wake the socket if it suspended last tick because the global
-		// CDownloadBandwidthThrottler bucket was empty -- this is the
-		// per-tick poke that lets paused reads retry against the
-		// freshly refilled budget.
+		// CDownloadBandwidthThrottler bucket was empty -- this is the per-tick poke that lets
+		// paused reads retry against the freshly refilled budget.
 		m_socket->WakeIfPaused();
 	} else {
-		AddLogLineNS(CFormat("CAUGHT DEAD SOCKET IN TICKDOWNLOADANDMEASURE() WITH SPEED %f") % kBpsClient);
+		AddLogLineNS(CFormat(LOG_DIAGNOSTIC(
+				     "CAUGHT DEAD SOCKET IN TICKDOWNLOADANDMEASURE() WITH SPEED %f")) %
+			     kBpsClient);
 	}
 
 	return kBpsClient;
@@ -2396,27 +2841,37 @@
 
 void CUpDownClient::SetUserIDHybrid(uint32 nUserID)
 {
-	theApp->clientlist->UpdateClientID( this, nUserID );
+	theApp->clientlist->UpdateClientID(this, nUserID);
 
 	m_nUserIDHybrid = nUserID;
 }
 
-
-void CUpDownClient::SetIP( uint32 val )
+void CUpDownClient::SetIP(uint32 val)
 {
-	theApp->clientlist->UpdateClientIP( this, val );
-
-	m_dwUserIP = val;
-
-	m_nConnectIP = val;
+	SetUserAddress(CNetworkAddress::FromIPv4NetworkOrderOrAbsent(val));
+}
 
-	m_FullUserIP = val;
+bool CUpDownClient::HasPeerIPv4() const
+{
+	// The user address stays absent until the peer's hello, so an outbound connection has to
+	// ask the address it dialled, or it would advertise SecIdent v1 to an IPv4 peer.
+	uint32 peerIPv4 = 0;
+	return SecIdent::PeerIPv4(
+		GetUserAddress().IsPresent() ? GetUserAddress() : GetConnectAddress(), peerIPv4);
 }
 
+void CUpDownClient::SetUserAddress(const CNetworkAddress &address)
+{
+	const CNetworkAddress key = PeerAddressing::IndexKey(address);
+	theApp->clientlist->UpdateClientIP(this, key);
+	m_userAddress = key;
+	m_connectAddress = key;
+	m_FullUserIP = key.ToIPv4NetworkOrderOrZero();
+}
 
-void CUpDownClient::SetUserHash(const CMD4Hash& userhash)
+void CUpDownClient::SetUserHash(const CMD4Hash &userhash)
 {
-	theApp->clientlist->UpdateClientHash( this, userhash );
+	theApp->clientlist->UpdateClientHash(this, userhash);
 
 	m_UserHash = userhash;
 
@@ -2442,30 +2897,30 @@
 {
 	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 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.
+			// This can be caused by a 0.30x based client which sends the old style Hello packet
+			// and the mule info packet, but sends a secure ident state packet between them, after
+			// a hello but before we have the SUI capabilities. A misbehaving client, but it does
+			// no harm to use this SUI state: if they report no SUI it will not be used, and if
+			// they report using SUI on the mule info packet, it is fine to use it.
 
-			AddDebugLogLineN(logClient, "A client sent secure ident state before telling us the SUI capabilities");
+			AddDebugLogLineN(logClient,
+				"A client sent secure ident state before telling us the SUI capabilities");
 			AddDebugLogLineN(logClient, "Client info: " + GetClientFullInfo());
-			AddDebugLogLineN(logClient, "This client won't be disconnected, but it should be. :P");
+			AddDebugLogLineN(
+				logClient, "This client won't be disconnected, but it should be. :P");
 		}
 	}
 
 	return m_SecureIdentState;
 }
 
-
-bool CUpDownClient::SendChatMessage(const wxString& message)
+bool CUpDownClient::SendChatMessage(const wxString &message)
 {
 	if (GetChatCaptchaState() == CA_CAPTCHARECV) {
 		m_nChatCaptchaState = CA_SOLUTIONSENT;
 	} else if (GetChatCaptchaState() == CA_SOLUTIONSENT) {
-		wxFAIL; // we responded to a captcha but didn't hear from the client afterwards - hopefully it's just lag and this message will get through
+		wxFAIL; // we responded to a captcha but didn't hear from the client afterwards - hopefully
+			// it's just lag and this message will get through
 	} else {
 		m_nChatCaptchaState = CA_ACCEPTING;
 	}
@@ -2490,9 +2945,9 @@
 		SetChatState(MS_CHATTING);
 		CMemFile data;
 		data.WriteString(message, GetUnicodeSupport());
-		CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_MESSAGE);
+		CPacket *packet = new CPacket(data, OP_EDONKEYPROT, OP_MESSAGE);
 		theStats::AddUpOverheadOther(packet->GetPacketSize());
-		AddDebugLogLineN( logLocalClient, "Local Client: OP_MESSAGE to " + GetFullIP());
+		AddDebugLogLineN(logLocalClient, "Local Client: OP_MESSAGE to " + GetFullIP());
 		SendPacket(packet, true, true);
 		return true;
 	} else {
@@ -2506,9 +2961,9 @@
 
 /* Kad stuff */
 
-void CUpDownClient::SetBuddyID(const uint8_t* pucBuddyID)
+void CUpDownClient::SetBuddyID(const uint8_t *pucBuddyID)
 {
-	if( pucBuddyID == NULL ){
+	if (pucBuddyID == NULL) {
 		md4clr(m_achBuddyID);
 		m_bBuddyIDValid = false;
 		return;
@@ -2519,20 +2974,21 @@
 
 // Kad added by me
 
-bool CUpDownClient::SendBuddyPing() {
+bool CUpDownClient::SendBuddyPing()
+{
 	SetLastBuddyPingPongTime();
-	CPacket* buddyPing = new CPacket(OP_BUDDYPING, 0, OP_EMULEPROT);
+	CPacket *buddyPing = new CPacket(OP_BUDDYPING, 0, OP_EMULEPROT);
 	theStats::AddUpOverheadKad(buddyPing->GetPacketSize());
-	AddDebugLogLineN(logLocalClient,"Local Client: OP_BUDDYPING to " + GetFullIP());
+	AddDebugLogLineN(logLocalClient, "Local Client: OP_BUDDYPING to " + GetFullIP());
 	return SafeSendPacket(buddyPing);
 }
 
-
 /* Statistics */
 
 void CUpDownClient::UpdateStats()
 {
-	if (m_lastClientSoft != m_clientSoft || m_lastClientVersion != m_nClientVersion || m_lastOSInfo != m_sClientOSInfo) {
+	if (m_lastClientSoft != m_clientSoft || m_lastClientVersion != m_nClientVersion ||
+		m_lastOSInfo != m_sClientOSInfo) {
 		if (m_lastClientSoft == SO_UNKNOWN) {
 			theStats::RemoveUnknownClient();
 		} else if (m_lastClientSoft != (uint32)(-1)) {
@@ -2551,29 +3007,39 @@
 	}
 }
 
+// All five go through GetCurrentIdentState(), which is the one place that decides what a
+// missing credits object means (IS_NOTAVAILABLE). Testing `credits &&` here instead made
+// the boolean set unable to express that state: with credits still NULL -- its value from
+// construction until the peer's user hash resolves -- every predicate answered false,
+// including SUINotSupported(), while the accessor on the same object reported exactly
+// IS_NOTAVAILABLE.
+//
+// Only SUINotSupported() changes behaviour: for the other four the guard was redundant,
+// since a NULL credits yields IS_NOTAVAILABLE, which already compares unequal to the state
+// each asks about.
 bool CUpDownClient::IsIdentified() const
 {
-	return (credits && credits->GetCurrentIdentState(GetIP()) == IS_IDENTIFIED);
+	return GetCurrentIdentState() == IS_IDENTIFIED;
 }
 
 bool CUpDownClient::IsBadGuy() const
 {
-	return (credits && credits->GetCurrentIdentState(GetIP()) == IS_IDBADGUY);
+	return GetCurrentIdentState() == IS_IDBADGUY;
 }
 
 bool CUpDownClient::SUIFailed() const
 {
-	return (credits && credits->GetCurrentIdentState(GetIP()) == IS_IDFAILED);
+	return GetCurrentIdentState() == IS_IDFAILED;
 }
 
 bool CUpDownClient::SUINeeded() const
 {
-	return (credits && credits->GetCurrentIdentState(GetIP()) == IS_IDNEEDED);
+	return GetCurrentIdentState() == IS_IDNEEDED;
 }
 
 bool CUpDownClient::SUINotSupported() const
 {
-	return (credits && credits->GetCurrentIdentState(GetIP()) == IS_NOTAVAILABLE);
+	return GetCurrentIdentState() == IS_NOTAVAILABLE;
 }
 
 uint64 CUpDownClient::GetDownloadedTotal() const
@@ -2588,15 +3054,19 @@
 
 double CUpDownClient::GetScoreRatio() const
 {
-	return credits ? credits->GetScoreRatio(GetIP(), theApp->CryptoAvailable()) : 0;
+	return credits ? credits->GetScoreRatio(GetUserAddress(), theApp->CryptoAvailable()) : 0;
+}
+
+double CUpDownClient::GetCreditRatio() const
+{
+	return credits ? credits->GetCreditRatio() : 0;
 }
 
 const wxString CUpDownClient::GetServerName() const
 {
 	wxString ret;
 	wxString srvaddr = Uint32toStringIP(GetServerIP());
-	CServer* cserver = theApp->serverlist->GetServerByAddress(
-		srvaddr, GetServerPort());
+	CServer *cserver = theApp->serverlist->GetServerByAddress(srvaddr, GetServerPort());
 	if (cserver) {
 		ret = cserver->GetListName();
 	} else {
@@ -2606,30 +3076,39 @@
 	return ret;
 }
 
+bool CUpDownClient::WantsStreamObfuscation() const
+{
+	return HasValidHash() && SupportsCryptLayer() && thePrefs::IsClientCryptLayerSupported() &&
+	       (RequestsCryptLayer() || thePrefs::IsClientCryptLayerRequested());
+}
+
 bool CUpDownClient::ShouldReceiveCryptUDPPackets() const
 {
-	return (thePrefs::IsClientCryptLayerSupported() && SupportsCryptLayer() && theApp->GetPublicIP() != 0
-		&& HasValidHash() && (thePrefs::IsClientCryptLayerRequested() || RequestsCryptLayer()) );
+	return (thePrefs::IsClientCryptLayerSupported() && SupportsCryptLayer() &&
+		theApp->GetPublicIP() != 0 && HasValidHash() &&
+		(thePrefs::IsClientCryptLayerRequested() || RequestsCryptLayer()));
 }
 
 #ifdef AMULE_DAEMON
 
-void CUpDownClient::ProcessCaptchaRequest(CMemFile* WXUNUSED(data)) {}
+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)
+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)) {
+	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("Received captcha request from client (%s) with (%u) tags") % GetFullIP() % nTagCount);
+			AddDebugLogLineN(logClient,
+				CFormat("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);
@@ -2639,42 +3118,62 @@
 		// sanitize checks - we want a small captcha not a wallpaper
 		uint32 nSize = (uint32)(data->GetLength() - data->GetPosition());
 
-		if ( nSize > 128 && nSize < 4096 ) {
+		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 ) {
+			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);
+				CCaptchaDialog *dialog = new CCaptchaDialog(theApp->amuledlg, imgCaptcha, id);
 				dialog->Show();
 
 			} else {
-				AddDebugLogLineN(logClient, CFormat("Received captcha request from client, processing image failed or invalid pixel size (%s)") % GetFullIP());
+				AddDebugLogLineN(logClient,
+					CFormat("Received captcha request from client, processing image "
+						"failed or invalid pixel size (%s)") %
+						GetFullIP());
 			}
 		} else {
-			AddDebugLogLineN(logClient, CFormat("Received captcha request from client, size sanitize check failed (%u) (%s)") % nSize % GetFullIP());
+			AddDebugLogLineN(logClient,
+				CFormat("Received captcha request from client, size sanitize check failed "
+					"(%u) (%s)") %
+					nSize % GetFullIP());
 		}
 	} else {
-		AddDebugLogLineN(logClient, CFormat("Received captcha request from client, but don't accepting it at this time (%s)") % GetFullIP());
+		AddDebugLogLineN(logClient,
+			CFormat("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 );
+	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("Received captcha result from client, but not accepting it at this time (%s)") % GetFullIP());
+		AddDebugLogLineN(logClient,
+			CFormat("Received captcha result from client, but not accepting it at this time "
+				"(%s)") %
+				GetFullIP());
 	}
 }
 
+#endif // AMULE_DAEMON
+
+// Shared by both builds. The advanced spam filter (captcha + URL heuristic) is GUI-only --
+// CCaptchaGenerator lives in the monolithic target and the spam path touches the chat
+// window -- so it is compiled out on the daemon, which relays incoming messages to amulegui
+// with the message filter alone. By-value to match the header signature: the non-daemon
+// path reassigns `message` (captcha), so the parameter cannot be const-ref.
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
 void CUpDownClient::ProcessChatMessage(wxString message)
 {
 	if (IsMessageFiltered(message)) {
@@ -2682,70 +3181,104 @@
 		return;
 	}
 
+#ifndef AMULE_DAEMON
 	// 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
+		// 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
+					// 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)){
+						if (captcha.WriteCaptchaImage(memstr)) {
 							m_strCaptchaChallenge = captcha.GetCaptchaText();
 							m_nChatCaptchaState = CA_CHALLENGESENT;
 							m_cCaptchasSent++;
-							CMemFile fileAnswer((uint8_t*) memstr.GetOutputStreamBuffer()->GetBufferStart(), memstr.GetLength());
-							CPacket* packet = new CPacket(fileAnswer, OP_EMULEPROT, OP_CHATCAPTCHAREQ);
+							CMemFile fileAnswer(
+								(uint8_t *)memstr.GetOutputStreamBuffer()
+									->GetBufferStart(),
+								memstr.GetLength());
+							CPacket *packet = new CPacket(
+								fileAnswer, OP_EMULEPROT, OP_CHATCAPTCHAREQ);
 							theStats::AddUpOverheadOther(packet->GetPacketSize());
-							AddLogLineN(CFormat("sent Captcha %s (%d)") % m_strCaptchaChallenge % packet->GetPacketSize());
+							AddDebugLogLineN(logClient,
+								CFormat("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
+					// Client does not support captchas but we require them: tell
+					// them it is not going to work out with an answer message (it
+					// will not be shown and does not count as a sent message).
+					if (m_cCaptchasSent < 1) { // don't send this notifier more than once
 						m_cCaptchasSent++;
 						// always sent in english
-						SendChatMessage("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("Received message from client not supporting captchas, filtered and sent notifier (%s)") % GetClientFullInfo());
+						SendChatMessage("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("Received message from client not supporting "
+								"captchas, filtered and sent notifier (%s)") %
+								GetClientFullInfo());
 					} else {
-						AddDebugLogLineN(logClient, CFormat("Received message from client not supporting captchas, filtered, didn't send notifier (%s)") % GetClientFullInfo());
+						AddDebugLogLineN(logClient,
+							CFormat("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) {
+				// 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("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
+					AddDebugLogLineN(logClient,
+						CFormat("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);
+					CPacket *packet =
+						new CPacket(OP_CHATCAPTCHARES, 1, OP_EMULEPROT, false);
 					uint8_t statusResponse = 0; // status response
 					packet->CopyToDataBuffer(0, &statusResponse, 1);
 					theStats::AddUpOverheadOther(packet->GetPacketSize());
 					SafeSendPacket(packet);
 				} else { // wrong, cleanup and ignore
-					AddDebugLogLineN(logClient, CFormat("Captcha answer failed (%s)") % GetClientFullInfo());
+					AddDebugLogLineN(logClient,
+						CFormat("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);
-					uint8_t statusResponse = (m_cCaptchasSent < 3) ? 1 : 2; // status response
+					CPacket *packet =
+						new CPacket(OP_CHATCAPTCHARES, 1, OP_EMULEPROT, false);
+					uint8_t statusResponse =
+						(m_cCaptchasSent < 3) ? 1 : 2; // status response
 					packet->CopyToDataBuffer(0, &statusResponse, 1);
 					theStats::AddUpOverheadOther(packet->GetPacketSize());
 					SafeSendPacket(packet);
@@ -2755,54 +3288,72 @@
 		}
 	}
 
-	if (thePrefs::IsAdvancedSpamfilterEnabled() && !IsFriend()) { // friends are never spammer... (but what if two spammers are friends :P )
+	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
+			// First fixed criteria: a client that sends an URL in its first message before I
+			// respond has a 99.9% chance of being some poor guy advertising his leech mod, or
+			// selling you something.
 			if (GetMessagesSent() == 0) {
-				static wxArrayString urlindicators(wxStringTokenize("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", "|"));
+				static wxArrayString urlindicators(wxStringTokenize(
+					"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",
+					"|"));
 				for (size_t pos = urlindicators.GetCount(); pos--;) {
 					if (message.Find(urlindicatorspos) != wxNOT_FOUND) {
 						bIsSpam = true;
 						break;
 					}
 				}
-				// second fixed criteria: he sent me 4 or more messages and I didn't answer him once
+				// 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("'%s' has been marked as spammer") % GetUserName());
+			AddDebugLogLineN(
+				logClient, CFormat("'%s' has been marked as spammer") % GetUserName());
 			SetSpammer(true);
-			theApp->amuledlg->m_chatwnd->EndSession(GUI_ID(GetIP(),GetUserPort()));
+			theApp->amuledlg->m_chatwnd->EndSession(GUI_ID(GetIP(), GetUserPort()));
 			return;
 		}
 	}
-
+#endif // AMULE_DAEMON
 
 	wxString logMsg = CFormat(_("New message from '%s' (IP:%s)")) % GetUserName() % GetFullIP();
-	if(thePrefs::ShowMessagesInLog()) {
+	if (thePrefs::ShowMessagesInLog()) {
 		logMsg += ": " + message;
 	}
 	AddLogLineC(logMsg);
 	IncMessagesReceived();
 
+	// Record in the core store BEFORE the GUI notify. Both builds reach this line -- it is the
+	// single inbound choke point -- so this is what gives amulegui and amuleapi a transcript at
+	// all, and what lets the local GUI and every EC client agree on one. Placed after the
+	// filter / spammer branches above so a filtered message is not stored.
+	if (theApp->chatsessions) {
+		theApp->chatsessions->AddIncoming(GUI_ID(GetIP(), GetUserPort()), GetUserName(), message);
+	}
+
 	Notify_ChatProcessMsg(GUI_ID(GetIP(), GetUserPort()), GetUserName() + "|" + message);
 }
 
-bool CUpDownClient::IsMessageFiltered(const wxString& message)
+// Prefs-based and GUI-free, so it's shared by both builds -- the daemon's
+// read-only chat relay applies the same message filter the monolithic GUI does.
+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() ) {
+		} else if (thePrefs::MsgOnlySecure() && GetUserName().IsEmpty()) {
 			filtered = true;
 		} else if (thePrefs::MustFilterMessages()) {
 			filtered = thePrefs::IsMessageFiltered(message);
@@ -2814,50 +3365,48 @@
 	return filtered;
 }
 
-#endif
-
 void CUpDownClient::SendSharedDirectories()
 {
-		// This list will contain all (unique) folders.
-		PathList foldersToSend;
+	// 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_listi);
-		}
+	// 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_listi);
+	}
 
-		// ... 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);
-		}
+	// ... 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();
+	// Strip duplicates
+	foldersToSend.sort();
+	foldersToSend.unique();
 
-		// Build packet
-		CMemFile tempfile(80);
-		tempfile.WriteUInt32(foldersToSend.size() + 1);	// + 1 for the incomplete files
+	// Build packet
+	CMemFile tempfile(80);
+	tempfile.WriteUInt32(foldersToSend.size() + 1); // + 1 for the incomplete files
 
-		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() );
-		}
+	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());
+	// ... 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, "Local Client: OP_ASKSHAREDDIRSANS to " + GetFullIP() );
-		SendPacket(replypacket, true, true);
+	// Send the packet.
+	CPacket *replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDDIRSANS);
+	theStats::AddUpOverheadOther(replypacket->GetPacketSize());
+	AddDebugLogLineN(logLocalClient, "Local Client: OP_ASKSHAREDDIRSANS to " + GetFullIP());
+	SendPacket(replypacket, true, true);
 }
 
-void CUpDownClient::SendSharedFilesOfDirectory(const wxString& strReqDir)
+void CUpDownClient::SendSharedFilesOfDirectory(const wxString &strReqDir)
 {
 	CKnownFilePtrList list;
 
@@ -2865,7 +3414,7 @@
 		// 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);
+			CPartFile *pFile = theApp->downloadqueue->GetFileByIndex(i);
 			if (pFile == NULL || pFile->GetStatus(true) != PS_READY) {
 				continue;
 			}
@@ -2877,7 +3426,9 @@
 		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);
+			AddLogLineC(CFormat(_("User %s (%u) requested sharedfiles-list for not existing "
+					      "directory '%s' -> Ignored")) %
+				    GetUserName() % GetUserIDHybrid() % strReqDir);
 		}
 	}
 
@@ -2892,9 +3443,9 @@
 		list.pop_front();
 	}
 
-	CPacket* replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDFILESDIRANS);
+	CPacket *replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDFILESDIRANS);
 	theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-	AddDebugLogLineN( logLocalClient, "Local Client: OP_ASKSHAREDFILESDIRANS to " + GetFullIP() );
+	AddDebugLogLineN(logLocalClient, "Local Client: OP_ASKSHAREDFILESDIRANS to " + GetFullIP());
 	SendPacket(replypacket, true, true);
 }
 
@@ -2905,8 +3456,12 @@
 	if (!Kademlia::CKademlia::IsRunning()) {
 		SetKadState(KS_NONE);
 		return;
-	} else if (GetUploadState() != US_NONE || GetDownloadState() != DS_NONE || GetChatState() != MS_NONE || GetKadVersion() <= 5 || GetKadPort() == 0) {
-		Kademlia::CUDPFirewallTester::SetUDPFWCheckResult(false, true, wxUINT32_SWAP_ALWAYS(GetIP()), 0); // inform the tester that this test was cancelled
+	} else if (GetUploadState() != US_NONE || GetDownloadState() != DS_NONE ||
+		   GetChatState() != MS_NONE || GetKadVersion() <= 5 || GetKadPort() == 0) {
+		Kademlia::CUDPFirewallTester::SetUDPFWCheckResult(false,
+			true,
+			wxUINT32_SWAP_ALWAYS(GetIP()),
+			0); // inform the tester that this test was cancelled
 		SetKadState(KS_NONE);
 		return;
 	}
@@ -2915,23 +3470,26 @@
 	data.WriteUInt16(Kademlia::CKademlia::GetPrefs()->GetInternKadPort());
 	data.WriteUInt16(Kademlia::CKademlia::GetPrefs()->GetExternalKadPort());
 	data.WriteUInt32(Kademlia::CKademlia::GetPrefs()->GetUDPVerifyKey(GetConnectIP()));
-	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_FWCHECKUDPREQ);
+	CPacket *packet = new CPacket(data, OP_EMULEPROT, OP_FWCHECKUDPREQ);
 	theStats::AddUpOverheadKad(packet->GetPacketSize());
 	SafeSendPacket(packet);
 }
 
-void CUpDownClient::ProcessFirewallCheckUDPRequest(CMemFile* data)
+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)"), GetClientFullInfo());
+		// DebugLogWarning(_T("Ignored Kad Firewallrequest UDP because Kad is not running (%s)"),
+		// GetClientFullInfo());
 		return;
 	}
 
-	// first search if we know this IP already, if so the result might be biased and we need tell the requester
+	// first search if we know this IP already, if so the result might be biased and we need tell the
+	// requester
 	bool errorAlreadyKnown = false;
 	if (GetUploadState() != US_NONE || GetDownloadState() != DS_NONE || GetChatState() != MS_NONE) {
 		errorAlreadyKnown = true;
-	} else if (Kademlia::CKademlia::GetRoutingZone()->GetContact(wxUINT32_SWAP_ALWAYS(GetConnectIP()), 0, false) != NULL) {
+	} else if (Kademlia::CKademlia::GetRoutingZone()->GetContact(
+			   wxUINT32_SWAP_ALWAYS(GetConnectIP()), 0, false) != NULL) {
 		errorAlreadyKnown = true;
 	}
 
@@ -2939,27 +3497,40 @@
 	uint16_t remoteExternPort = data->ReadUInt16();
 	uint32_t senderKey = data->ReadUInt32();
 	if (remoteInternPort == 0) {
-		//DebugLogError(_T("UDP Firewallcheck requested with Intern Port == 0 (%s)"), GetClientFullInfo());
+		// DebugLogError(_T("UDP Firewallcheck requested with Intern Port == 0 (%s)"),
+		// GetClientFullInfo());
 		return;
 	}
-//	if (senderKey == 0)
-//		DebugLogWarning(_T("UDP Firewallcheck requested with SenderKey == 0 (%s)"), GetClientFullInfo());
+	//	if (senderKey == 0)
+	//		DebugLogWarning(_T("UDP Firewallcheck requested with SenderKey == 0 (%s)"),
+	// GetClientFullInfo());
 
 	CMemFile testPacket1;
 	testPacket1.WriteUInt8(errorAlreadyKnown ? 1 : 0);
 	testPacket1.WriteUInt16(remoteInternPort);
 	DebugSend(Kad2FirewallUDP, wxUINT32_SWAP_ALWAYS(GetConnectIP()), remoteInternPort);
-	Kademlia::CKademlia::GetUDPListener()->SendPacket(testPacket1, KADEMLIA2_FIREWALLUDP, wxUINT32_SWAP_ALWAYS(GetConnectIP()), remoteInternPort, Kademlia::CKadUDPKey(senderKey, theApp->GetPublicIP(false)), NULL);
+	Kademlia::CKademlia::GetUDPListener()->SendPacket(testPacket1,
+		KADEMLIA2_FIREWALLUDP,
+		wxUINT32_SWAP_ALWAYS(GetConnectIP()),
+		remoteInternPort,
+		Kademlia::CKadUDPKey(senderKey, theApp->GetPublicIP(false)),
+		NULL);
 
-	// if the client has a router with PAT (and therefore a different extern port than intern), test this port too
+	// if the client has a router with PAT (and therefore a different extern port than intern), test this
+	// port too
 	if (remoteExternPort != 0 && remoteExternPort != remoteInternPort) {
 		CMemFile testPacket2;
 		testPacket2.WriteUInt8(errorAlreadyKnown ? 1 : 0);
 		testPacket2.WriteUInt16(remoteExternPort);
 		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);
+		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)"), GetClientFullInfo());
+	// DebugLog(_T("Answered UDP Firewallcheck request (%s)"), GetClientFullInfo());
 }
 
 void CUpDownClient::SetConnectOptions(uint8_t options, bool encryption, bool callback)
@@ -2970,9 +3541,8 @@
 	SetDirectUDPCallbackSupport((options & 0x08) != 0 && callback);
 }
 
-
 #ifdef DEBUG_ZOMBIE_CLIENTS
-void CUpDownClient::Unlink(const wxString& from)
+void CUpDownClient::Unlink(const wxString &from)
 {
 	std::multiset<wxString>::iterator it = m_linkedFrom.find(from);
 	if (it != m_linkedFrom.end()) {
@@ -2981,7 +3551,8 @@
 	m_linked--;
 	if (!m_linked) {
 		if (m_linkedDebug) {
-			AddLogLineN(CFormat("Last reference to client %d %p unlinked, delete it.") % ECID() % this);
+			AddLogLineN(CFormat("Last reference to client %d %p unlinked, delete it.") % ECID() %
+				    this);
 		}
 		delete this;
 	}
@@ -2998,5 +3569,4 @@
 }
 #endif
 
-
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/BitVector.h -> amule-3.1.0.tar.gz/src/BitVector.h Changed

@@ -28,23 +28,22 @@
 
 #include "Types.h"
 
-//
 // Packed bit vector
-//
-class BitVector {
+class BitVector
+{
 public:
 	BitVector()
 	{
-		m_bits	= 0;
+		m_bits = 0;
 		m_bytes = 0;
 		m_allTrue = 0;
 		m_vector = NULL;
 	}
 
-	~BitVector() { clear();	}
+	~BitVector() { clear(); }
 
 	// number of bits
-	uint32 size() const	{ return m_bits; }
+	uint32 size() const { return m_bits; }
 
 	// is it empty?
 	bool empty() const { return m_bits == 0; }
@@ -82,7 +81,7 @@
 	// set number of bits to zero and free memory
 	void clear()
 	{
-		m_bits	= 0;
+		m_bits = 0;
 		m_bytes = 0;
 		m_allTrue = 0;
 		delete m_vector;
@@ -133,25 +132,36 @@
 	}
 
 	// set all bits to true
-	void SetAllTrue() { if (m_bytes) { memset(m_vector, 0xFF, m_bytes); } }
+	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
-	// Skip the copy when m_bytes == 0 -- after clear() that path leaves
-	// m_vector == NULL, and memcpy(NULL, src, 0) is C-standard UB even
-	// on real libcs that no-op it.  Matches SetAllTrue() above.
-	void SetBuffer(const void* src) { if (m_bytes) { memcpy(m_vector, src, m_bytes); } m_allTrue = 2; }
+	const void *GetBuffer() const { return m_vector; }
+	// Set buffer. Skip the copy when m_bytes == 0: after clear() that path leaves m_vector ==
+	// NULL, and memcpy(NULL, src, 0) is C-standard UB even on real libcs that no-op it. Matches
+	// SetAllTrue() above.
+	void SetBuffer(const void *src)
+	{
+		if (m_bytes) {
+			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
+	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};
 };

amule-3.1.0.tar.gz/src/BrowseLifecycle.cpp Added

@@ -0,0 +1,112 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "BrowseLifecycle.h"
+
+namespace browse
+{
+
+Action Tick(const Record &rec, std::uint64_t now)
+{
+	if (rec.state != State::InProgress) {
+		// Terminal already: whoever is tracking it should stop.
+		return Action::Drop;
+	}
+	// Completion wins over expiry. A browse whose last listing landed in the same tick its
+	// deadline passed succeeded; reporting that as a timeout would throw away results we are
+	// holding.
+	if (rec.outstanding == 0) {
+		return Action::Complete;
+	}
+	if (rec.deadline != 0 && rec.deadline < now) {
+		return Action::Expire;
+	}
+	return Action::None;
+}
+
+std::uint16_t BarValue(const Record &rec)
+{
+	if (rec.state != State::InProgress) {
+		return 0xffff;
+	}
+	if (rec.totalDirs > 0) {
+		int done = rec.totalDirs - (rec.outstanding > 0 ? rec.outstanding : 0);
+		if (done < 0) {
+			done = 0;
+		} else if (done > rec.totalDirs) {
+			done = rec.totalDirs;
+		}
+		return static_cast<std::uint16_t>(done * 100 / rec.totalDirs);
+	}
+	return 0;
+}
+
+Record ApplyAction(Record rec, Action action)
+{
+	if (rec.state != State::InProgress) {
+		return rec;
+	}
+	switch (action) {
+	case Action::Complete:
+		rec.state = State::Finished;
+		break;
+	case Action::Expire:
+		rec.state = State::Failed;
+		break;
+	case Action::None:
+	case Action::Drop:
+		break;
+	}
+	return rec;
+}
+
+Record OnDirectoryList(Record rec, int dirCount, std::uint64_t deadline)
+{
+	if (rec.state != State::InProgress) {
+		// A late or duplicate answer for a browse that already ended changes
+		// nothing; taking it would resurrect a terminal record.
+		return rec;
+	}
+	rec.outstanding = dirCount > 0 ? dirCount : 0;
+	rec.totalDirs = dirCount > 0 ? dirCount : 0;
+	rec.deadline = deadline;
+	return rec;
+}
+
+Record OnListingReceived(Record rec, std::uint64_t deadline)
+{
+	if (rec.state != State::InProgress) {
+		return rec;
+	}
+	if (rec.outstanding == kFlatBrowse) {
+		// The single answer a flat browse was waiting for.
+		rec.outstanding = 0;
+	} else if (rec.outstanding > 0) {
+		--rec.outstanding;
+	}
+	rec.deadline = deadline;
+	return rec;
+}
+
+} // namespace browse

amule-3.1.0.tar.gz/src/BrowseLifecycle.h Added

@@ -0,0 +1,138 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 BROWSELIFECYCLE_H
+#define BROWSELIFECYCLE_H
+
+#include <cstdint>
+
+/**
+ * The state machine behind a "View Files" browse, with no dependency on theApp, the client, or the
+ * clock. It lives apart from CBrowseManager so it can be driven directly by a test. That is not
+ * incidental: every defect in this area so far has been this machine going wrong in a place only a
+ * live peer of the right kind could reach -- a browse that completes without being marked finished,
+ * a peer we decline to contact, a terminal browse still sitting on the pending list -- and none of
+ * those were reachable from a unit test while the logic was spread across CUpDownClient,
+ * CSearchList and the packet handlers.
+ */
+namespace browse
+{
+
+//! Where a browse is in its life. Mirrors EBrowseStatus on the wire side.
+enum class State
+{
+	InProgress, //!< asked for; nothing terminal has happened yet
+	Finished,   //!< the peer sent its whole list
+	Failed      //!< denied, unreachable, disconnected, or given up on
+};
+
+//! What the periodic tick should do with a record.
+enum class Action
+{
+	None,     //!< still legitimately in flight
+	Complete, //!< everything asked for has arrived: mark it finished
+	Expire,   //!< nothing has arrived for too long: give up on it
+	Drop      //!< already terminal: stop tracking it
+};
+
+/**
+ * `outstanding` for a browse answered in a single packet (OP_ASKSHAREDFILES), as opposed to the
+ * directory-by-directory form (OP_ASKSHAREDDIRS). The distinction is the reason a successful flat
+ * browse used to hang: the directory form counts down to 0 and the packet handler marked it
+ * finished there, while the flat form had no counter to reach 0 and nothing marked it at all.
+ * Modelling "one answer expected" explicitly means both forms complete through the same rule.
+ */
+constexpr int kFlatBrowse = -1;
+
+/**
+ * How long a browse may sit with nothing arriving before it is given up on. Refreshed on every sign
+ * of progress -- the request going out, each directory landing -- so it bounds silence, not the
+ * total time a large share takes to stream in.
+ *
+ * A backstop, not the mechanism: a browse normally ends when the peer answers, denies, or the
+ * socket dies. This exists because TryToContact has several exits that contact nobody, and two
+ * attempts at enumerating them both came up short (amule-org/amule#1071). At 120 s it sits above
+ * the 40 s ed2k socket timeout, so it never preempts the ordinary paths.
+ */
+constexpr std::uint64_t kSilenceTimeoutMs = 120000;
+
+//! One browse, start to finish.
+struct Record
+{
+	//! Search ID this browse's results are filed under. Allocated when the
+	//! browse is asked for, so it is never 0 for a live record.
+	std::uint32_t searchId = 0;
+	State state = State::InProgress;
+	//! Directory listings still expected, or kFlatBrowse.
+	int outstanding = kFlatBrowse;
+	//! Directories the peer said it has; 0 until it answers, and always 0 for
+	//! a flat browse. Only used for the progress percent.
+	int totalDirs = 0;
+	//! Tick count after which silence means the browse is dead. Never 0 for a
+	//! record still in progress.
+	std::uint64_t deadline = 0;
+};
+
+/**
+ * What to do with `rec` at time `now`. Completion is checked before expiry: a browse whose last
+ * directory arrived in the same tick that its deadline passed has succeeded, not timed out.
+ */
+Action Tick(const Record &rec, std::uint64_t now);
+
+/**
+ * Progress bar value: 0..100 while running, or 0xffff once terminal, which is the sentinel the
+ * search list's bar already uses to mean "clear it". A browse with no directory count -- still
+ * connecting, or flat -- has no meaningful percent and reports 0 rather than guessing.
+ */
+std::uint16_t BarValue(const Record &rec);
+
+/**
+ * Apply `action` to `rec`, returning the record it leaves behind.
+ *
+ * A browse that has already ended stays ended. That is the whole rule, and it has to live here
+ * rather than at the call sites: the peer disconnecting immediately after sending its last
+ * directory is the ordinary case, not an edge one, and the disconnect path asks for a failure
+ * without knowing the browse just succeeded. Deciding it at each caller is how the invariant got
+ * broken five times before it had an owner.
+ *
+ * Action::Drop is not a state change and is handled by the caller, which knows what tracking means.
+ */
+Record ApplyAction(Record rec, Action action);
+
+/**
+ * The peer answered OP_ASKSHAREDDIRS with `dirCount` directories. `dirCount == 0` is a real answer,
+ * not a malformed one: the peer is telling us it has nothing to send, which completes the browse
+ * rather than leaving it waiting for listings that will never come.
+ */
+Record OnDirectoryList(Record rec, int dirCount, std::uint64_t deadline);
+
+/**
+ * One directory's worth of files arrived, either form, so the browse is alive and one step further
+ * along.
+ */
+Record OnListingReceived(Record rec, std::uint64_t deadline);
+
+} // namespace browse
+
+#endif // BROWSELIFECYCLE_H

amule-3.1.0.tar.gz/src/BrowseListModel.cpp Added

@@ -0,0 +1,346 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "BrowseListModel.h"
+
+#include "SearchFile.h"
+#include "SearchList.h"
+#include "SearchListCtrl.h"
+#include "amule.h"
+
+namespace
+{
+//! Canonical form of a peer's directory string: runs of separators collapsed to one, and a trailing
+//! separator dropped.
+//!
+//! The nodes are keyed by this string, so anything left un-normalised is a spelling that gets its
+//! own folder: "Shared/Movies", "Shared//Movies" and "Shared/Movies/" all name one directory, and
+//! keying them apart would draw a sibling row per spelling. A trailing separator additionally
+//! leaves the last segment empty, which is the blank row, and a string of nothing but separators
+//! normalises to empty, which is no directory at all.
+//!
+//! Which separator survives a mixed run is whichever came first; the peer's own choice is not
+//! knowable from the packet either way.
+//!
+//! Collapsing runs also rewrites the one string where a doubled separator means something: a UNC
+//! name arrives as "\\server\share" and is keyed as "\server\share". It is a label here and nothing
+//! resolves it, so this costs a backslash in a folder row rather than a wrong lookup.
+wxString NormalizeDirectory(const wxString &path)
+{
+	wxString normalized;
+	normalized.reserve(path.length());
+
+	bool lastWasSeparator = false;
+	for (const wxUniChar ch : path) {
+		const bool separator = (ch == '/' || ch == '\\');
+		if (separator && lastWasSeparator) {
+			continue;
+		}
+		normalized += ch;
+		lastWasSeparator = separator;
+	}
+
+	if (lastWasSeparator && !normalized.IsEmpty()) {
+		normalized.RemoveLast();
+	}
+	return normalized;
+}
+} // namespace
+
+CBrowseListModel::CBrowseListModel(CSearchListCtrl *owner)
+: CSearchListModel(owner)
+{
+}
+
+bool CBrowseListModel::IsFolder(const wxDataViewItem &item) const
+{
+	return item.IsOk() && m_folderAddresses.count(item.GetID()) != 0;
+}
+
+CBrowseFolderNode *CBrowseListModel::EnsureFolder(const wxString &path, size_t depth) const
+{
+	const auto existing = m_folders.find(path);
+	if (existing != m_folders.end()) {
+		return existing->second.get();
+	}
+
+	// Split off the last segment: whichever separator appears last is the one this peer uses,
+	// so a name containing the other one stays intact.
+	//
+	// Two bounds apply, and they stop different things. The depth argument caps this function's
+	// own recursion, which one long string drives. The node's depth caps the tree, which many
+	// strings drive between them: the early return above hands back a node with the parents it
+	// already has, so without it a peer could add a capped run per packet and nest for as long
+	// as it kept sending.
+	const size_t slash = path.find_last_of("/\\");
+	CBrowseFolderNode *parent = nullptr;
+	wxString name = path;
+	if (slash != wxString::npos && depth < MAX_FOLDER_DEPTH) {
+		// Already canonical, and so is every prefix of it: the callers normalise, so there
+		// is no run to collapse here and the last separator cannot be trailing.
+		const wxString parentPath = path.Left(slash);
+		if (parentPath.IsEmpty()) {
+			// A leading separator leaves no parent path, which is no directory at all
+			// -- this node is a root under its own last segment.
+			name = path.Mid(slash + 1);
+		} else {
+			CBrowseFolderNode *candidate = EnsureFolder(parentPath, depth + 1);
+			if (candidate->GetDepth() + 1 < MAX_FOLDER_DEPTH) {
+				parent = candidate;
+				name = path.Mid(slash + 1);
+			}
+		}
+	}
+
+	CBrowseFolderNode *node = m_folders.emplace(path, std::make_unique<CBrowseFolderNode>(name, parent))
+					  .first->second.get();
+	m_folderAddresses.insert(node);
+	if (!parent) {
+		m_rootFolders.push_back(node);
+	}
+	return node;
+}
+
+void CBrowseListModel::RebuildFolders() const
+{
+	// Once per change, not once per query. The control asks for the root's children several
+	// times per rebuild -- twice from OnIdleHook alone, to save and restore expansion around a
+	// Cleared() -- and this walks every result, which on a large share is the cost the browse
+	// throttle exists to keep down (issue #898).
+	const unsigned generation = GetContentGeneration();
+	const wxUIntPtr searchId = m_owner->GetSearchId();
+	if (m_foldersValid && m_foldersGeneration == generation && m_foldersSearchId == searchId) {
+		return;
+	}
+	m_foldersValid = true;
+	m_foldersGeneration = generation;
+	m_foldersSearchId = searchId;
+
+	for (auto &entry : m_folders) {
+		entry.second->m_files.clear();
+		entry.second->m_subfolders.clear();
+	}
+	m_looseFiles.clear();
+	m_fileParents.clear();
+
+	if (!m_owner->GetSearchId()) {
+		return;
+	}
+
+	const CSearchResultList &results = theApp->searchlist->GetSearchResults(m_owner->GetSearchId());
+	for (CSearchFile *file : results) {
+		if (file->GetParent() || !m_owner->ShouldShow(file)) {
+			continue;
+		}
+
+		// The one place a directory string is normalised, because this is the one place it
+		// becomes a key. GetParent() reads the answer back from m_fileParents rather than
+		// deriving it again.
+		const wxString directory = NormalizeDirectory(file->GetDirectory());
+		if (directory.IsEmpty()) {
+			m_looseFiles.push_back(file);
+			continue;
+		}
+
+		CBrowseFolderNode *folder = EnsureFolder(directory);
+		folder->m_files.push_back(file);
+		m_fileParents.emplace(file, folder);
+	}
+
+	// Relink the hierarchy as a second pass rather than while creating the nodes, because the
+	// links are cleared on every rebuild while the nodes outlive it: a folder created for an
+	// earlier refresh still has to be reattached.
+	//
+	// Unconditionally, empty or not: whether a folder is worth drawing depends on what is under
+	// it at any depth, which is not knowable until every link exists, so that question is asked
+	// at GetChildren() time instead.
+	for (const auto &entry : m_folders) {
+		CBrowseFolderNode *node = entry.second.get();
+		if (node->GetParent()) {
+			node->GetParent()->m_subfolders.push_back(node);
+		}
+	}
+}
+
+bool CBrowseListModel::HasContent(const CBrowseFolderNode *folder)
+{
+	if (!folder->m_files.empty()) {
+		return true;
+	}
+	for (const CBrowseFolderNode *sub : folder->m_subfolders) {
+		if (HasContent(sub)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+unsigned int CBrowseListModel::GetChildren(const wxDataViewItem &item, wxDataViewItemArray &children) const
+{
+	if (!item.IsOk()) {
+		RebuildFolders();
+
+		unsigned int count = 0;
+		for (CBrowseFolderNode *folder : m_rootFolders) {
+			// A folder whose results have all gone away, or are all filtered out, is
+			// not drawn -- its node stays allocated so that any item the control still
+			// holds remains readable.
+			if (HasContent(folder)) {
+				children.Add(ToItem(folder));
+				++count;
+			}
+		}
+		for (CSearchFile *file : m_looseFiles) {
+			children.Add(CSearchListModel::ToItem(file));
+			++count;
+		}
+		return count;
+	}
+
+	if (IsFolder(item)) {
+		// Here too, not only on the root branch: this is the path that reads the cached
+		// CSearchFile pointers, so it is the one that has to see a generation bump. The
+		// call is a comparison once the grouping is current.
+		RebuildFolders();
+
+		const CBrowseFolderNode *folder = ToFolder(item);
+		unsigned int count = 0;
+		for (CBrowseFolderNode *sub : folder->m_subfolders) {
+			if (HasContent(sub)) {
+				children.Add(ToItem(sub));
+				++count;
+			}
+		}
+		for (CSearchFile *file : folder->m_files) {
+			children.Add(CSearchListModel::ToItem(file));
+			++count;
+		}
+		return count;
+	}
+
+	// A result under a folder still groups its own alternative sources.
+	return CSearchListModel::GetChildren(item, children);
+}
+
+wxDataViewItem CBrowseListModel::GetParent(const wxDataViewItem &item) const
+{
+	if (!item.IsOk()) {
+		return wxDataViewItem();
+	}
+
+	if (IsFolder(item)) {
+		CBrowseFolderNode *parent = ToFolder(item)->GetParent();
+		return parent ? ToItem(parent) : wxDataViewItem();
+	}
+
+	CSearchFile *file = ToFile(item);
+	if (file->GetParent()) {
+		return CSearchListModel::GetParent(item);
+	}
+
+	// Read back from the grouping walk rather than re-derived from the directory string. This
+	// is the traversal path and wx asks per item, so it does no string work at all:
+	// RebuildFolders() knew the node when it filed the result, and a result the peer gave no
+	// directory is simply absent, which is the invisible root.
+	RebuildFolders();
+
+	const auto it = m_fileParents.find(file);
+	return it != m_fileParents.end() ? ToItem(it->second) : wxDataViewItem();
+}
+
+bool CBrowseListModel::IsContainer(const wxDataViewItem &item) const
+{
+	if (!item.IsOk()) {
+		return true; // invisible root
+	}
+	if (IsFolder(item)) {
+		return true;
+	}
+	return CSearchListModel::IsContainer(item);
+}
+
+bool CBrowseListModel::HasContainerColumns(const wxDataViewItem &item) const
+{
+	if (IsFolder(item)) {
+		return false;
+	}
+	return CSearchListModel::HasContainerColumns(item);
+}
+
+void CBrowseListModel::GetValue(wxVariant &variant, const wxDataViewItem &item, unsigned int col) const
+{
+	if (!IsFolder(item)) {
+		CSearchListModel::GetValue(variant, item, col);
+		return;
+	}
+
+	// Every column has a type the control will try to read, so a folder has
+	// to answer for all of them even though it only has a name.
+	switch (col) {
+	case COL_NAME:
+		variant = ToFolder(item)->GetName();
+		break;
+
+	case COL_RATING:
+		variant << wxDataViewIconText(wxEmptyString, wxIcon());
+		break;
+
+	default:
+		variant = wxEmptyString;
+		break;
+	}
+}
+
+bool CBrowseListModel::GetAttr(const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr) const
+{
+	if (!IsFolder(item)) {
+		return CSearchListModel::GetAttr(item, col, attr);
+	}
+
+	// The colours the base model picks encode a result's download state, which a
+	// folder does not have. Bold instead, so the grouping reads as structure.
+	attr.SetBold(true);
+	return true;
+}
+
+int CBrowseListModel::Compare(
+	const wxDataViewItem &item1, const wxDataViewItem &item2, unsigned int column, bool ascending) const
+{
+	const bool folder1 = IsFolder(item1);
+	const bool folder2 = IsFolder(item2);
+
+	if (folder1 != folder2) {
+		// Folders first, whatever the sort column and direction: they are the structure the
+		// results sit in, and interleaving them would read as an ordering accident.
+		return folder1 ? -1 : 1;
+	}
+
+	if (folder1) {
+		const int result = ToFolder(item1)->GetName().CmpNoCase(ToFolder(item2)->GetName());
+		return ascending ? result : -result;
+	}
+
+	return CSearchListModel::Compare(item1, item2, column, ascending);
+}
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/BrowseListModel.h Added

@@ -0,0 +1,220 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 BROWSELISTMODEL_H
+#define BROWSELISTMODEL_H
+
+#include "SearchListModel.h"
+
+#include <map>           // Needed for std::map (the folder registry)
+#include <memory>        // Needed for std::unique_ptr (stable folder node addresses)
+#include <set>           // Needed for std::set (the folder-address lookup)
+#include <unordered_map> // Needed for std::unordered_map (result -> its folder)
+
+/**
+ * A folder in a browsed peer's shared-file listing. Not a CSearchFile: it has no hash, no size and
+ * no sources, and every operation the search list offers on a result is meaningless for it. It
+ * exists only to be a wxDataViewItem the control can draw and expand.
+ */
+class CBrowseFolderNode
+{
+public:
+	CBrowseFolderNode(const wxString &name, CBrowseFolderNode *parent)
+	: m_name(name)
+	, m_parent(parent)
+	, m_depth(parent ? parent->m_depth + 1 : 0)
+	{
+	}
+
+	//! This folder's own name, not its path: the tree shows the rest.
+	const wxString &GetName() const noexcept { return m_name; }
+	CBrowseFolderNode *GetParent() const noexcept { return m_parent; }
+
+	//! Distance from a root. Held on the node rather than counted on demand because it is what
+	//! bounds the tree across directory strings, and the readers that walk it recurse: see
+	//! MAX_FOLDER_DEPTH.
+	size_t GetDepth() const noexcept { return m_depth; }
+
+	//! Sub-folders and the results filed directly here. Both are rebuilt
+	//! from scratch on every refresh; the nodes themselves outlive it.
+	std::vector<CBrowseFolderNode *> m_subfolders;
+	std::vector<CSearchFile *> m_files;
+
+private:
+	wxString m_name;
+	CBrowseFolderNode *m_parent;
+	size_t m_depth;
+};
+
+/**
+ * The model behind a browse tab: the same result list as a search, grouped under the directories
+ * the peer reported.
+ *
+ * Extends rather than alters CSearchListModel, because a browse is the only place folders exist --
+ * an ordinary Kad/eD2k search has no directory to group by, and nothing about its model should have
+ * to know that folders are a possibility.
+ *
+ * The directory strings nest. A peer names each shared directory by walking up from it for as long
+ * as the parent is also shared and joining that run (CSharedFileList::GetPublicSharedDirName), so
+ * what arrives is a relative path -- "Shared/Movies/Action" -- rather than a flat label or an
+ * absolute path. Splitting it back into segments reproduces the peer's own layout.
+ *
+ * Both separators are split on. The sender uses its own platform's wxFileName::GetPathSeparator(),
+ * so a Windows peer sends backslashes and a POSIX peer forward slashes, and nothing in the packet
+ * says which. A directory whose name genuinely contains the other platform's separator would split
+ * into segments that were never real folders; that is the trade eMule makes here too, and it costs
+ * a cosmetic mis-grouping rather than a wrong file.
+ *
+ * Peers that answer the older whole-list request send no directory at all (ClientTCPSocket,
+ * OP_ASKSHAREDFILESANSWER passes an empty string). Those results have no folder to sit under and
+ * stay at the top level, so browsing such a peer looks exactly like it did before folders existed.
+ *
+ * The incremental add path does not know about folders, and does not need to.
+ * CSearchListModel::FlushPending() announces every parentless result under the invisible root,
+ * which is not where this model puts them -- but incremental notifications are only enabled on
+ * __WXOSX__, and wxCocoaDataViewControl::Add() discards the items it is given and calls
+ * NSOutlineView reloadData, which re-reads the tree through GetChildren(). GTK and MSW take the
+ * Cleared() branch, which re-reads it too. Either way the grouping below is what the control ends
+ * up drawing.
+ */
+class CBrowseListModel : public CSearchListModel
+{
+public:
+	explicit CBrowseListModel(CSearchListCtrl *owner);
+
+	bool IsFolder(const wxDataViewItem &item) const wxOVERRIDE;
+
+	// wxDataViewModel interface. Each of these has to answer for folder items, which the base
+	// class would hand to ToFile() and read as a CSearchFile.
+	void GetValue(wxVariant &variant, const wxDataViewItem &item, unsigned int col) const wxOVERRIDE;
+	bool GetAttr(const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr) const wxOVERRIDE;
+	wxDataViewItem GetParent(const wxDataViewItem &item) const wxOVERRIDE;
+	bool IsContainer(const wxDataViewItem &item) const wxOVERRIDE;
+	//! False for a folder: it is a section header with a name and nothing
+	//! else, unlike a grouped result, which is a row in its own right.
+	bool HasContainerColumns(const wxDataViewItem &item) const wxOVERRIDE;
+	unsigned int GetChildren(const wxDataViewItem &item, wxDataViewItemArray &children) const wxOVERRIDE;
+	int Compare(const wxDataViewItem &item1,
+		const wxDataViewItem &item2,
+		unsigned int column,
+		bool ascending) const wxOVERRIDE;
+
+private:
+	static CBrowseFolderNode *ToFolder(const wxDataViewItem &item)
+	{
+		return static_cast<CBrowseFolderNode *>(item.GetID());
+	}
+	static wxDataViewItem ToItem(const CBrowseFolderNode *folder)
+	{
+		return wxDataViewItem(const_cast<CBrowseFolderNode *>(folder));
+	}
+
+	/**
+	 * Re-files the current results under their directories.
+	 *
+	 * Called from the const tree accessors, because the model deliberately keeps no copy of the
+	 * result set (see CSearchListModel) and the folders are derived from whatever it holds
+	 * right now.
+	 *
+	 * Nodes are keyed by their full path and never erased while the model lives: the control
+	 * may still be holding an item for a folder whose last result just went away, and that
+	 * pointer has to stay readable. A node with nothing under it is simply not reported as a
+	 * child.
+	 */
+	void RebuildFolders() const;
+
+	/**
+	 * Most nodes the tree is ever deep, counted end to end and not per directory string.
+	 *
+	 * The strings are whatever the peer put in the packets, each up to 64 KB
+	 * (CFileDataIO::ReadString defaults to a uint16 length) and checked by nothing between the
+	 * socket and here. Two separate costs follow, and they need two separate bounds.
+	 *
+	 * Per string, every segment is a recursion level in EnsureFolder() and a node keyed by its
+	 * own prefix, so one directory named with 65,535 separators is that many frames and the sum
+	 * of all those prefixes in live wxStrings. The depth argument to EnsureFolder() stops it.
+	 *
+	 * Across strings, chains compose: EnsureFolder() hands back an existing node with the
+	 * parents it already has, so a path bottoming out on one an earlier string created inherits
+	 * everything above it. Counting calls cannot see that -- a peer sending directories
+	 * shortest-first adds a capped run per packet and nests without limit. So a node also
+	 * carries its own depth (CBrowseFolderNode::GetDepth) and refuses to be attached past this,
+	 * which is the bound HasContent() and CSearchListCtrl::SetSubtreeExpanded() need: both
+	 * recurse over the tree rather than over any one string.
+	 *
+	 * A peer names a directory by joining the run of shared directories it belongs to
+	 * (CSharedFileList::GetPublicSharedDirName), so a real one is a handful of segments deep
+	 * and nothing legitimate comes near this. Where either bound bites, the remainder is left
+	 * as one folder name rather than split further.
+	 *
+	 * What this bounds is the recursion and the depth of the tree, which is the crash. It is
+	 * not a bound on memory: a capped string still leaves about MAX_FOLDER_DEPTH nodes, each
+	 * keyed by its own prefix of it, so a 64 KB directory name costs a few MB of live keys
+	 * rather than the GBs it would unbounded -- and that still scales with how many such
+	 * strings the peer sends.
+	 */
+	static const size_t MAX_FOLDER_DEPTH = 64;
+
+	//! Returns the node for @a path, creating it and every missing ancestor. @a path must be
+	//! canonical (see NormalizeDirectory), which every prefix this recurses onto then is too.
+	//! @a depth is this function's own recursion level; see MAX_FOLDER_DEPTH for why the node's
+	//! depth is checked as well.
+	CBrowseFolderNode *EnsureFolder(const wxString &path, size_t depth = 0) const;
+
+	//! Whether anything at all is under @a folder, at any depth. A folder
+	//! that only holds other empty folders is not worth a row.
+	static bool HasContent(const CBrowseFolderNode *folder);
+
+	//! Full path -> node. unique_ptr so that a rebuild inserting a new directory cannot move
+	//! the existing nodes: the control holds their addresses as item IDs, and so do the parent
+	//! links.
+	mutable std::map<wxString, std::unique_ptr<CBrowseFolderNode>> m_folders;
+
+	//! The nodes with no parent, in insertion order of first appearance.
+	mutable std::vector<CBrowseFolderNode *> m_rootFolders;
+
+	//! What the cached grouping above was built from; see RebuildFolders().
+	mutable bool m_foldersValid = false;
+	mutable unsigned m_foldersGeneration = 0;
+	mutable wxUIntPtr m_foldersSearchId = 0;
+
+	//! Every address in m_folders, for IsFolder(). The item is a bare void* with nothing to
+	//! distinguish it, so membership here is what makes the folder-or-result question
+	//! answerable at all.
+	mutable std::set<const void *> m_folderAddresses;
+
+	//! Results the peer reported with no directory. Top level, next to the
+	//! folders.
+	mutable std::vector<CSearchFile *> m_looseFiles;
+
+	//! Which folder RebuildFolders() filed each shown result under, recorded as it files them.
+	//! GetParent() is on the traversal path rather than the rebuild path and wx asks it per
+	//! item, so it resolves through this instead of re-deriving the key from the result's
+	//! directory string. Written by the grouping walk itself, so it cannot describe a different
+	//! grouping than the one drawn; a result with no directory is simply absent.
+	mutable std::unordered_map<const CSearchFile *, CBrowseFolderNode *> m_fileParents;
+};
+
+#endif // BROWSELISTMODEL_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/BrowseManager.cpp Added

@@ -0,0 +1,152 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "BrowseManager.h"
+
+#include "GuiEvents.h"
+#include "Logger.h"
+#include "updownclient.h"
+
+#include <common/Format.h>
+
+#include <wx/intl.h> // _()
+
+bool CBrowseManager::Start(CUpDownClient *client, std::uint32_t searchId, std::uint64_t now)
+{
+	const browse::Store::StartResult result = m_store.Start(client, searchId, now);
+	if (result.started) {
+		m_clientssearchId.Link(client CLIENT_DEBUGSTRING("CBrowseManager::Start"));
+	}
+	// Only now release whatever this peer was attached to before, so the reference map never
+	// holds two entries for one peer. Deliberately after the link: CClientRef::Unlink deletes
+	// at a refcount of zero, so releasing first would free `client` here if this map ever held
+	// the last reference. It does not today -- clientlist keeps one for any browsable peer --
+	// but that is another class's invariant, and this order does not need it.
+	Perform(result.displaced);
+	return result.started;
+}
+
+void CBrowseManager::OnRequestSent(CUpDownClient *client, std::uint64_t now)
+{
+	m_store.Touch(client, now);
+}
+
+void CBrowseManager::OnDirectoryList(CUpDownClient *client, int dirCount, std::uint64_t now)
+{
+	Perform(m_store.OnDirectoryList(client, dirCount, now));
+}
+
+void CBrowseManager::OnListingReceived(CUpDownClient *client, std::uint64_t now)
+{
+	Perform(m_store.OnListingReceived(client, now));
+}
+
+void CBrowseManager::Fail(CUpDownClient *client)
+{
+	Perform(m_store.Fail(client));
+}
+
+void CBrowseManager::Forget(CUpDownClient *client)
+{
+	// Ordered: the failure is reported while the reference that names the peer
+	// is still held, and only then released.
+	for (const browse::Outcome &outcome : m_store.Forget(client)) {
+		Perform(outcome);
+	}
+}
+
+void CBrowseManager::Remove(std::uint32_t searchId)
+{
+	m_store.Remove(searchId);
+	m_clients.erase(searchId);
+}
+
+void CBrowseManager::Process(std::uint64_t now)
+{
+	for (const browse::Outcome &outcome : m_store.Tick(now)) {
+		Perform(outcome);
+	}
+}
+
+void CBrowseManager::Perform(const browse::Outcome &outcome)
+{
+	// The ID travels with the effect, so there is no way for the two to disagree -- which is
+	// how a release went missing when the manager looked the ID up separately and the lookup
+	// excluded terminal browses.
+	switch (outcome.effect) {
+	case browse::Effect::Nothing:
+		break;
+	case browse::Effect::ReleaseClient:
+		// Terminal and announced; the peer is free to be reaped. The record
+		// stays until its search is freed.
+		m_clients.erase(outcome.searchId);
+		break;
+	case browse::Effect::AnnounceFailure: {
+		const auto it = m_clients.find(outcome.searchId);
+		AddLogLineC(CFormat(_("Failed to retrieve shared files from user '%s'")) %
+			    (it != m_clients.end() && it->second.IsLinked()
+					    ? it->second.GetClient()->GetUserName()
+					    : wxString()));
+		Announce(outcome.searchId);
+		break;
+	}
+	case browse::Effect::Announce:
+		Announce(outcome.searchId);
+		break;
+	}
+}
+
+void CBrowseManager::Announce(std::uint32_t searchId)
+{
+	// The GUI's tab marker, and nothing else: every other consumer -- the EC progress reply,
+	// the EC search listing, the monolithic bar -- reads this manager rather than holding a
+	// copy to be kept in step.
+	Notify_Browse_Status(static_cast<std::uint64_t>(searchId),
+		m_store.StateOf(searchId) == browse::State::Finished ? BROWSE_FINISHED : BROWSE_FAILED);
+}
+
+std::uint32_t CBrowseManager::SearchIdFor(const CUpDownClient *client) const
+{
+	return m_store.SearchIdFor(client);
+}
+
+bool CBrowseManager::AwaitingDirectoryList(const CUpDownClient *client) const
+{
+	return m_store.AwaitingDirectoryList(client);
+}
+
+bool CBrowseManager::Has(std::uint32_t searchId) const
+{
+	return m_store.Has(searchId);
+}
+
+browse::State CBrowseManager::StateOf(std::uint32_t searchId) const
+{
+	return m_store.StateOf(searchId);
+}
+
+std::uint16_t CBrowseManager::BarValue(std::uint32_t searchId) const
+{
+	return m_store.BarValue(searchId);
+}

amule-3.1.0.tar.gz/src/BrowseManager.h Added

@@ -0,0 +1,141 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 BROWSEMANAGER_H
+#define BROWSEMANAGER_H
+
+#include "BrowseLifecycle.h"
+#include "BrowseStore.h"
+#include "ClientRef.h"
+
+#include <cstdint>
+#include <map>
+
+class CUpDownClient;
+
+/**
+ * Owns every "View Files" browse the core is running.
+ *
+ * Before this existed a browse was four fields borrowed on CUpDownClient plus two maps on
+ * CSearchList plus a list on CClientList, and the same fact was written independently in seven
+ * files. Five separate defects were that one invariant broken somewhere different -- a successful
+ * browse never marked finished, a peer we declined to contact, a terminal browse re-examined on
+ * every tick forever. One owner is the point: the lifecycle is decided by browse::Tick and stored
+ * here, and every other subsystem reads it rather than keeping a copy that has to be made to agree.
+ *
+ * Core-only. Everything that touches browse state -- CUpDownClient, CClientTCPSocket, CSearchList,
+ * the EC handlers, and the monolithic search dialog's #ifndef CLIENT_GUI paths -- is core; amulegui
+ * learns a browse's state over EC instead.
+ */
+class CBrowseManager
+{
+public:
+	/**
+	 * Begin tracking a browse of `client` under `searchId`.
+	 *
+	 * The ID is allocated by the caller before the request goes out, for both the EC and the
+	 * local path, so a browse is addressable from the moment it exists. That is what lets this
+	 * map be keyed by ID: the old code had no ID for a local browse until its first result
+	 * arrived and keyed the interim state on the client pointer instead, which left entries
+	 * behind that nothing could prune and made two browses of different peers collide when an
+	 * address was reused.
+	 *
+	 * Refuses to start a second browse of a client that already has one, so the caller's own
+	 * "already in flight" check and this cannot disagree.
+	 */
+	bool Start(CUpDownClient *client, std::uint32_t searchId, std::uint64_t now);
+
+	/**
+	 * The ask is on the wire. Restarts the silence budget, because the click may have been a
+	 * connect ago and the peer's clock starts here.
+	 */
+	void OnRequestSent(CUpDownClient *client, std::uint64_t now);
+
+	//! The peer answered OP_ASKSHAREDDIRS with its directory count.
+	void OnDirectoryList(CUpDownClient *client, int dirCount, std::uint64_t now);
+
+	/**
+	 * One listing arrived, of either protocol form. Completes the browse when nothing more is
+	 * expected -- which is where the flat (single-answer) form used to be left hanging, because
+	 * only the directory form's packet handler marked anything.
+	 */
+	void OnListingReceived(CUpDownClient *client, std::uint64_t now);
+
+	//! Terminalize the browse of `client`, if it has one. Safe to call for a
+	//! client that never had one, which is most of them.
+	void Fail(CUpDownClient *client);
+
+	/**
+	 * The client is being destroyed: fail its browse if one is still running, then let go of
+	 * the reference. The record itself outlives the peer -- the search ID is still listed and
+	 * still has to answer for its state.
+	 */
+	void Forget(CUpDownClient *client);
+
+	/**
+	 * Release a browse for good, when its search is freed. Records are deliberately kept after
+	 * they terminate: every consumer asks here what a browse's state is, so a record dropped at
+	 * completion would send the listing back to guessing from whether results were retained --
+	 * which reports a failed browse as idle, forever.
+	 */
+	void Remove(std::uint32_t searchId);
+
+	//! Expire the silent, complete the finished, drop the terminal. Driven by
+	//! the core timer; `now` is injected so the policy stays testable.
+	void Process(std::uint64_t now);
+
+	//! Search ID of `client`'s browse, or 0. This is the "already browsing
+	//! this peer" test the EC handler joins on.
+	std::uint32_t SearchIdFor(const CUpDownClient *client) const;
+
+	//! See browse::Store::AwaitingDirectoryList.
+	bool AwaitingDirectoryList(const CUpDownClient *client) const;
+	bool Has(std::uint32_t searchId) const;
+	//! browse::State of `searchId`; InProgress for an unknown ID is never
+	//! reported -- callers gate on Has() first.
+	browse::State StateOf(std::uint32_t searchId) const;
+	//! 0..100 while running, 0xffff once terminal: the value space the search
+	//! list's bar and the EC progress reply already use.
+	std::uint16_t BarValue(std::uint32_t searchId) const;
+
+private:
+	//! Perform what the store asked for, on the browse named by `searchId`.
+	void Perform(const browse::Outcome &outcome);
+	//! Tell the GUI a browse reached its terminal state.
+	void Announce(std::uint32_t searchId);
+
+	//! Every rule about browses. Kept separate so it can be driven by a test:
+	//! it identifies peers by an opaque key and never reaches theApp.
+	browse::Store m_store;
+
+	/**
+	 * The references that keep browsed peers alive, keyed the same way. Not a second copy of
+	 * the browse -- the store owns that. This holds only lifetime, and entries leave it as soon
+	 * as the store says the peer is no longer needed, which is well before the record itself is
+	 * disposed of.
+	 */
+	std::map<std::uint32_t, CClientRef> m_clients;
+};
+
+#endif // BROWSEMANAGER_H

amule-3.1.0.tar.gz/src/BrowseStore.cpp Added

@@ -0,0 +1,218 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "BrowseStore.h"
+
+namespace browse
+{
+
+Store::StartResult Store::Start(ClientKey client, std::uint32_t searchId, std::uint64_t now)
+{
+	StartResult result;
+	if (client == nullptr || searchId == 0 || m_records.count(searchId) != 0) {
+		return result;
+	}
+	const auto existing = FindFor(client);
+	if (existing != m_records.end()) {
+		if (existing->second.rec.state == State::InProgress) {
+			// One live browse per peer -- the rule the EC handler's join
+			// depends on.
+			return result;
+		}
+		// Ended, but not yet released. Let go now, so exactly one record ever
+		// names a given peer.
+		existing->second.client = nullptr;
+		result.displaced = { existing->first, Effect::ReleaseClient };
+	}
+	Held held;
+	held.rec.searchId = searchId;
+	held.rec.state = State::InProgress;
+	held.rec.outstanding = kFlatBrowse;
+	held.rec.deadline = now + kSilenceTimeoutMs;
+	held.client = client;
+	m_recordssearchId = held;
+	result.started = true;
+	return result;
+}
+
+void Store::Touch(ClientKey client, std::uint64_t now)
+{
+	const auto it = FindFor(client);
+	if (it != m_records.end() && it->second.rec.state == State::InProgress) {
+		it->second.rec.deadline = now + kSilenceTimeoutMs;
+	}
+}
+
+Outcome Store::OnDirectoryList(ClientKey client, int dirCount, std::uint64_t now)
+{
+	const auto it = FindFor(client);
+	if (it == m_records.end()) {
+		return Outcome();
+	}
+	it->second.rec = browse::OnDirectoryList(it->second.rec, dirCount, now + kSilenceTimeoutMs);
+	// A peer answering "no directories" has said everything it means to, so
+	// this may complete the browse outright.
+	return { it->first, ApplyTo(it->second, ::browse::Tick(it->second.rec, now)) };
+}
+
+Outcome Store::OnListingReceived(ClientKey client, std::uint64_t now)
+{
+	const auto it = FindFor(client);
+	if (it == m_records.end()) {
+		return Outcome();
+	}
+	it->second.rec = browse::OnListingReceived(it->second.rec, now + kSilenceTimeoutMs);
+	// Both protocol forms complete here, from the outstanding count -- the
+	// only thing that knows whether anything is still expected.
+	return { it->first, ApplyTo(it->second, ::browse::Tick(it->second.rec, now)) };
+}
+
+Outcome Store::Fail(ClientKey client)
+{
+	const auto it = FindFor(client);
+	return it == m_records.end() ? Outcome() : Outcome{ it->first, ApplyTo(it->second, Action::Expire) };
+}
+
+Outcome Store::Finish(ClientKey client)
+{
+	const auto it = FindFor(client);
+	return it == m_records.end() ? Outcome()
+				     : Outcome{ it->first, ApplyTo(it->second, Action::Complete) };
+}
+
+std::vector<Outcome> Store::Forget(ClientKey client)
+{
+	std::vector<Outcome> out;
+	const auto it = FindFor(client);
+	if (it == m_records.end()) {
+		return out;
+	}
+	if (it->second.rec.state == State::InProgress) {
+		// Going away mid-browse is a failure, and has to be reported like any
+		// other rather than quietly vanishing.
+		out.push_back({ it->first, ApplyTo(it->second, Action::Expire) });
+	}
+	it->second.client = nullptr;
+	// Carries the ID whatever state the browse is in. Deriving it from the peer instead lost
+	// this for a browse that had already ended, which is most of them by the time their peer
+	// goes away.
+	out.push_back({ it->first, Effect::ReleaseClient });
+	return out;
+}
+
+void Store::Remove(std::uint32_t searchId)
+{
+	m_records.erase(searchId);
+}
+
+std::vector<Outcome> Store::Tick(std::uint64_t now)
+{
+	std::vector<Outcome> out;
+	for (auto &kv : m_records) {
+		const Effect effect = ApplyTo(kv.second, ::browse::Tick(kv.second.rec, now));
+		if (effect != Effect::Nothing) {
+			out.push_back({ kv.first, effect });
+		}
+	}
+	return out;
+}
+
+Effect Store::ApplyTo(Held &held, Action action)
+{
+	if (action == Action::Drop) {
+		// Terminal and already announced. Releasing the peer is all that is left; the
+		// record itself outlives it, because the search ID is still listed and every
+		// consumer asks here what state it is in. Dropping it now would send them back to
+		// guessing from whether results were retained, which reports a failed browse as
+		// idle, forever.
+		if (held.client == nullptr) {
+			return Effect::Nothing;
+		}
+		held.client = nullptr;
+		return Effect::ReleaseClient;
+	}
+	const State before = held.rec.state;
+	held.rec = ApplyAction(held.rec, action);
+	if (held.rec.state == before) {
+		// Refused, because it had already ended. Nothing to announce -- and nothing to log,
+		// which is what keeps the disconnect following a completed browse from being
+		// reported as a failure.
+		return Effect::Nothing;
+	}
+	return held.rec.state == State::Failed ? Effect::AnnounceFailure : Effect::Announce;
+}
+
+std::map<std::uint32_t, Store::Held>::iterator Store::FindFor(ClientKey client)
+{
+	if (client == nullptr) {
+		return m_records.end();
+	}
+	for (auto it = m_records.begin(); it != m_records.end(); ++it) {
+		if (it->second.client == client) {
+			return it;
+		}
+	}
+	return m_records.end();
+}
+
+std::map<std::uint32_t, Store::Held>::const_iterator Store::FindFor(ClientKey client) const
+{
+	// One implementation, so a change to how a peer is matched cannot land on only half the
+	// callers and leave const and non-const disagreeing about which record owns a peer.
+	return const_cast<Store *>(this)->FindFor(client);
+}
+
+std::uint32_t Store::SearchIdFor(ClientKey client) const
+{
+	const auto it = FindFor(client);
+	return (it != m_records.end() && it->second.rec.state == State::InProgress) ? it->first : 0;
+}
+
+bool Store::AwaitingDirectoryList(ClientKey client) const
+{
+	const auto it = FindFor(client);
+	// kFlatBrowse is the "nothing announced yet" state; the answer replaces it
+	// with a count, so a second answer finds it already gone.
+	return it != m_records.end() && it->second.rec.state == State::InProgress &&
+	       it->second.rec.outstanding == kFlatBrowse;
+}
+
+bool Store::Has(std::uint32_t searchId) const
+{
+	return m_records.find(searchId) != m_records.end();
+}
+
+State Store::StateOf(std::uint32_t searchId) const
+{
+	const auto it = m_records.find(searchId);
+	return it != m_records.end() ? it->second.rec.state : State::Failed;
+}
+
+std::uint16_t Store::BarValue(std::uint32_t searchId) const
+{
+	const auto it = m_records.find(searchId);
+	return it != m_records.end() ? browse::BarValue(it->second.rec) : 0xffff;
+}
+
+} // namespace browse

amule-3.1.0.tar.gz/src/BrowseStore.h Added

@@ -0,0 +1,175 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 BROWSESTORE_H
+#define BROWSESTORE_H
+
+#include "BrowseLifecycle.h"
+
+#include <cstdint>
+#include <map>
+#include <utility>
+#include <vector>
+
+namespace browse
+{
+
+/**
+ * What the owner must do about a change the store has just made. The store decides; the caller
+ * performs. That split is the point: the rules are then reachable from a test, which the manager
+ * holding them was not -- and both bugs found after the lifecycle was extracted were rules, not
+ * state machine (a terminal record erased instead of retained, a disconnect after success reported
+ * as a failure).
+ */
+enum class Effect
+{
+	Nothing,
+	//! The browse reached a terminal state; tell whoever is watching.
+	Announce,
+	//! ...and it failed, which is also worth a line in the log.
+	AnnounceFailure,
+	//! Terminal and announced already: let go of the peer. The RECORD stays, because the search
+	//! ID is still listed and still has to answer for its state; only Remove() disposes of it.
+	ReleaseClient
+};
+
+/**
+ * A change, and the browse it happened to. The two travel together because deriving the ID
+ * separately is how the effect got lost: the manager asked which browse a peer had, and the answer
+ * excluded the terminal ones -- exactly the records whose peer most needs releasing.
+ */
+struct Outcome
+{
+	std::uint32_t searchId = 0;
+	Effect effect = Effect::Nothing;
+};
+
+/**
+ * Every browse the core is tracking, and the rules about them. Clients are identified by an opaque
+ * key rather than held: lifetime is the owner's problem, and keeping it out here is what lets the
+ * rules be driven from a test with no client, no theApp and no clock.
+ */
+class Store
+{
+public:
+	//! Opaque stand-in for the peer. The owner maps it back to a real client.
+	using ClientKey = const void *;
+
+	/**
+	 * The answer to Start: whether it took, and any peer it displaced. A peer whose last browse
+	 * has ended may be browsed again straight away, before the tick that would have released
+	 * it. Two records would then name the same peer, and a lookup by peer could answer with
+	 * either -- so the old one lets go here, and says so, since its owner is holding a
+	 * reference on the strength of it.
+	 */
+	struct StartResult
+	{
+		bool started = false;
+		Outcome displaced;
+	};
+
+	/**
+	 * Track a browse of `client` under `searchId`.
+	 *
+	 * Refuses when that client already has one STILL RUNNING: there is a single exchange with a
+	 * peer to report on, so a second record could only ever describe the same browse. This is
+	 * the rule the EC handler's "join the browse already in flight" depends on being true.
+	 *
+	 * A browse that has ended is no obstacle, even before its peer has been released --
+	 * matching SearchIdFor, which also answers only for a running one. Disagreeing about that
+	 * left a peer un-rebrowsable for the second or so between its browse ending and the next
+	 * tick.
+	 *
+	 * Refuses an ID already tracked, whatever its state: a second record on one key would
+	 * replace the first and everything it still has to answer for. No caller reuses an ID --
+	 * both routes pass a freshly allocated one -- so this guards an invariant rather than a
+	 * case.
+	 */
+	StartResult Start(ClientKey client, std::uint32_t searchId, std::uint64_t now);
+
+	//! Push the silence deadline back; the peer has shown a sign of life.
+	void Touch(ClientKey client, std::uint64_t now);
+
+	Outcome OnDirectoryList(ClientKey client, int dirCount, std::uint64_t now);
+	Outcome OnListingReceived(ClientKey client, std::uint64_t now);
+
+	//! Terminalize `client`'s browse. Refused, silently, if it already ended.
+	Outcome Fail(ClientKey client);
+	Outcome Finish(ClientKey client);
+
+	/**
+	 * The peer is going away: fail a browse still running, then release it. Returns both
+	 * effects in order, so the caller reports the failure before dropping the reference it
+	 * needs to name the peer.
+	 */
+	std::vector<Outcome> Forget(ClientKey client);
+
+	//! Dispose of a record for good, with its search.
+	void Remove(std::uint32_t searchId);
+
+	//! Advance every record; returns what to do about each.
+	std::vector<Outcome> Tick(std::uint64_t now);
+
+	std::uint32_t SearchIdFor(ClientKey client) const;
+
+	/**
+	 * Whether `client`'s browse is still waiting to hear back.
+	 *
+	 * True from the request going out until the peer answers -- with its directory list, or, on
+	 * the flat protocol form, with the listing itself.
+	 *
+	 * For a directory browse that makes the answer single-shot, which is what the
+	 * OP_ASKSHAREDDIRSANS handler needs: its old guard was single-shot by accident (it compared
+	 * an outstanding count to 1), and widening it to "this peer has a browse" let a peer resend
+	 * the answer as often as it liked, each time re-asking for every directory and pushing the
+	 * silence deadline back.
+	 *
+	 * A FLAT browse has no directory round, so this stays true for its whole life and the
+	 * outbound ask can be repeated on a reconnect. That matches what the counter-based guard
+	 * did before, and is deliberate -- the first ask may never have arrived -- but it is not
+	 * the "once per browse" property the directory form gets, and should not be read as one.
+	 */
+	bool AwaitingDirectoryList(ClientKey client) const;
+	bool Has(std::uint32_t searchId) const;
+	State StateOf(std::uint32_t searchId) const;
+	std::uint16_t BarValue(std::uint32_t searchId) const;
+	std::size_t Size() const { return m_records.size(); }
+
+private:
+	struct Held
+	{
+		Record rec;
+		ClientKey client = nullptr;
+	};
+
+	Effect ApplyTo(Held &held, Action action);
+	std::map<std::uint32_t, Held>::iterator FindFor(ClientKey client);
+	std::map<std::uint32_t, Held>::const_iterator FindFor(ClientKey client) const;
+
+	std::map<std::uint32_t, Held> m_records;
+};
+
+} // namespace browse
+
+#endif // BROWSESTORE_H

amule-3.0.1.tar.gz/src/CCtypeAsciiScope.h -> amule-3.1.0.tar.gz/src/CCtypeAsciiScope.h Changed

@@ -25,32 +25,28 @@
 #include <cstdlib>
 #include <cstring>
 
-
-// RAII helper that pins LC_CTYPE to "C" for the duration of its scope
-// and restores the previous value on destruction.
+// RAII helper that pins LC_CTYPE to "C" for the duration of its scope and restores the previous
+// value on destruction.
 //
-// Used to neutralise locale-dependent case folding around code paths
-// that assume ASCII semantics. The motivating case is the Turkish
-// I/i divergence in tr_TR, where libc and wxString routines fold
+// Used to neutralise locale-dependent case folding around code paths that assume ASCII semantics.
+// The motivating case is the Turkish I/i divergence in tr_TR, where libc and wxString routines fold
 // ASCII 'I' to U+0131 (dotless i) instead of 'i'. That breaks:
 //
-//   - wxFileConfig's case-insensitive entry / group lookups (which
-//     bottom out at strcasecmp / wcscasecmp on POSIX), causing the
-//     sorted m_aEntries array to desync from its comparator across
-//     a locale switch and Write() to append duplicate keys (#852).
-//   - Lowercasing of ISO 3166-1 alpha-2 country codes used to build
-//     embedded flag bitmap names (e.g. "IT" -> "ıt"), causing the
-//     country flag to not render in the GUI.
+//   - wxFileConfig's case-insensitive entry / group lookups, which bottom out at strcasecmp /
+// wcscasecmp on POSIX, so the sorted m_aEntries array desyncs from its comparator across a locale
+// switch and Write() appends duplicate keys (#852).
+//   - Lowercasing of ISO 3166-1 alpha-2 country codes used to build embedded flag bitmap names
+// ("IT" -> "it"), so the country flag does not render.
 //
-// Only LC_CTYPE is touched, so LC_MESSAGES (translations), LC_TIME
-// (date formatting), LC_NUMERIC (numbers) and LC_COLLATE (sort orders
-// such as filenames in list controls) remain locale-aware.
+// Only LC_CTYPE is touched, so LC_MESSAGES (translations), LC_TIME (date formatting), LC_NUMERIC
+// (numbers) and LC_COLLATE (sort orders such as filenames in list controls) stay locale-aware.
 class CCtypeAsciiScope
 {
 public:
-	CCtypeAsciiScope() : m_saved(NULL)
+	CCtypeAsciiScope()
+	: m_saved(NULL)
 	{
-		const char* current = std::setlocale(LC_CTYPE, NULL);
+		const char *current = std::setlocale(LC_CTYPE, NULL);
 		if (current) {
 			m_saved = strdup(current);
 		}
@@ -65,11 +61,11 @@
 		}
 	}
 
-	CCtypeAsciiScope(const CCtypeAsciiScope&) = delete;
-	CCtypeAsciiScope& operator=(const CCtypeAsciiScope&) = delete;
+	CCtypeAsciiScope(const CCtypeAsciiScope &) = delete;
+	CCtypeAsciiScope &operator=(const CCtypeAsciiScope &) = delete;
 
 private:
-	char* m_saved;
+	char *m_saved;
 };
 
 #endif // CCTYPEASCIISCOPE_H

amule-3.0.1.tar.gz/src/CFile.cpp -> amule-3.1.0.tar.gz/src/CFile.cpp Changed

@@ -23,11 +23,13 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include "CFile.h"       // Interface declarations.
+#include "Logger.h"      // Needed for AddDebugLogLineC
+#include <common/Path.h> // Needed for CPath
+#include "config.h"      // Needed for HAVE_SYS_PARAM_H
 
-#include "CFile.h"			// Interface declarations.
-#include "Logger.h"			// Needed for AddDebugLogLineC
-#include <common/Path.h>		// Needed for CPath
-#include "config.h"			// Needed for HAVE_SYS_PARAM_H
+#include <exception> // Needed for std::exception_ptr
+#include <vector>    // Needed for the CopyFile stream buffer
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@@ -35,162 +37,170 @@
 
 // standard
 #if defined(__WINDOWS__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
-#	include <io.h>
-#	ifndef __SALFORDC__
-#		define   WIN32_LEAN_AND_MEAN
-#		define   NOSERVICE
-#		define   NOIME
-#		define   NOATOM
-#		define   NOGDI
-#		define   NOGDICAPMASKS
-#		define   NOMETAFILE
+#include <io.h>
+#ifndef __SALFORDC__
+#define WIN32_LEAN_AND_MEAN
+#define NOSERVICE
+#define NOIME
+#define NOATOM
+#define NOGDI
+#define NOGDICAPMASKS
+#define NOMETAFILE
 #ifndef NOMINMAX
-	#define   NOMINMAX
+#define NOMINMAX
+#endif
+#define NOMSG
+#define NOOPENFILE
+#define NORASTEROPS
+#define NOSCROLL
+#define NOSOUND
+#define NOSYSMETRICS
+#define NOTEXTMETRIC
+#define NOWH
+#define NOCOMM
+#define NOKANJI
+#define NOCRYPT
+#define NOMCX
 #endif
-#		define   NOMSG
-#		define   NOOPENFILE
-#		define   NORASTEROPS
-#		define   NOSCROLL
-#		define   NOSOUND
-#		define   NOSYSMETRICS
-#		define   NOTEXTMETRIC
-#		define   NOWH
-#		define   NOCOMM
-#		define   NOKANJI
-#		define   NOCRYPT
-#		define   NOMCX
-#	endif
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
-#	ifdef __GNUWIN32__
-#		include <windows.h>
-#	endif
+#ifdef __GNUWIN32__
+#include <windows.h>
+#endif
 #elif (defined(__WXPM__))
-#	include <io.h>
+#include <io.h>
 #elif (defined(__WXSTUBS__))
-	// Have to ifdef this for different environments
-#	include <io.h>
+// Have to ifdef this for different environments
+#include <io.h>
 #elif (defined(__WXMAC__))
 #if __MSL__ < 0x6000
-int access( const char *path, int mode ) { return 0 ; }
+int access(const char *path, int mode)
+{
+	return 0;
+}
 #else
-int _access( const char *path, int mode ) { return 0 ; }
+int _access(const char *path, int mode)
+{
+	return 0;
+}
 #endif
-char* mktemp( char * path ) { return path ;}
-#	include <stat.h>
+char *mktemp(char *path)
+{
+	return path;
+}
+#include <stat.h>
 #else
-#	error  "Please specify the header with file functions declarations."
-#endif  //Win/UNIX
+#error "Please specify the header with file functions declarations."
+#endif // Win/UNIX
 
 // there is no distinction between text and binary files under Unix, so define
 // O_BINARY as 0 if the system headers don't do it already
 #if defined(__UNIX__) && !defined(O_BINARY)
-#	define   O_BINARY    (0)
-#endif  //__UNIX__
-
+#define O_BINARY (0)
+#endif //__UNIX__
 
 // The following defines handle different names across platforms,
 // and ensures that we use 64b IO on windows (only 32b by default).
 #ifdef __WINDOWS__
-	#define FLUSH_FD(x)			_commit(x)
-	#define SEEK_FD(x, y, z)		_lseeki64(x, y, z)
-	#define TELL_FD(x)			_telli64(x)
-
-	#if (__MSVCRT_VERSION__ < 0x0601)
-		//#warning MSCVRT-Version smaller than 6.01
-		#define STAT_FD(x, y)		_fstati64(x, y)
-		#define STAT_STRUCT		struct _stati64
-	#else
-		#define STAT_FD(x, y)		_fstat64(x, y)
-		#define STAT_STRUCT		struct __stat64
-	#endif
+#define FLUSH_FD(x) _commit(x)
+#define SEEK_FD(x, y, z) _lseeki64(x, y, z)
+#define TELL_FD(x) _telli64(x)
+
+#if (__MSVCRT_VERSION__ < 0x0601)
+// #warning MSCVRT-Version smaller than 6.01
+#define STAT_FD(x, y) _fstati64(x, y)
+#define STAT_STRUCT struct _stati64
+#else
+#define STAT_FD(x, y) _fstat64(x, y)
+#define STAT_STRUCT struct __stat64
+#endif
 #else
 
 // We don't need to sync all meta-data, just the contents,
 // so use fdatasync when possible (see man fdatasync).
-	#if defined(_POSIX_SYNCHRONIZED_IO) && (_POSIX_SYNCHRONIZED_IO > 0)
-		#define FLUSH_FD(x)		fdatasync(x)
-	#else
-		#define FLUSH_FD(x)		fsync(x)
-	#endif
-
-	#define SEEK_FD(x, y, z)		lseek(x, y, z)
-	#define TELL_FD(x)			wxTell(x)
-	#define STAT_FD(x, y)			fstat(x, y)
-	#define STAT_STRUCT			struct stat
+#if defined(_POSIX_SYNCHRONIZED_IO) && (_POSIX_SYNCHRONIZED_IO > 0)
+#define FLUSH_FD(x) fdatasync(x)
+#else
+#define FLUSH_FD(x) fsync(x)
 #endif
 
+#define SEEK_FD(x, y, z) lseek(x, y, z)
+#define TELL_FD(x) wxTell(x)
+#define STAT_FD(x, y) fstat(x, y)
+#define STAT_STRUCT struct stat
+#endif
 
 // This function is used to check if a syscall failed, in that case
 // log an appropriate message containing the errno string.
-inline void syscall_check(
-	bool check,
-	const CPath& filePath,
-	const wxString& what)
+inline void syscall_check(bool check, const CPath &filePath, const wxString &what)
 {
 	if (!check) {
-		AddDebugLogLineC(logCFile,
-			CFormat("Error when %s (%s): %s")
-				% what % filePath % wxSysErrorMsg());
+		AddDebugLogLineC(
+			logCFile, CFormat("Error when %s (%s): %s") % what % filePath % wxSysErrorMsg());
 	}
 }
 
-
-CSeekFailureException::CSeekFailureException(const wxString& desc)
-	: CIOFailureException("SeekFailure", desc)
-{}
-
+CSeekFailureException::CSeekFailureException(const wxString &desc)
+: CIOFailureException("SeekFailure", desc)
+{
+}
 
 CFile::CFile()
-	: m_fd(fd_invalid), m_safeWrite(false),
-	  m_writeBufferPending(0), m_canBuffer(false)
-{}
-
+: m_fd(fd_invalid)
+, m_safeWrite(false)
+, m_writeBufferPending(0)
+, m_canBuffer(false)
+{
+}
 
-CFile::CFile(const CPath& fileName, OpenMode mode)
-	: m_fd(fd_invalid), m_writeBufferPending(0), m_canBuffer(false)
+CFile::CFile(const CPath &fileName, OpenMode mode)
+: m_fd(fd_invalid)
+, m_writeBufferPending(0)
+, m_canBuffer(false)
 {
 	Open(fileName, mode);
 }
 
-
-CFile::CFile(const wxString& fileName, OpenMode mode)
-	: m_fd(fd_invalid), m_writeBufferPending(0), m_canBuffer(false)
+CFile::CFile(const wxString &fileName, OpenMode mode)
+: m_fd(fd_invalid)
+, m_writeBufferPending(0)
+, m_canBuffer(false)
 {
 	Open(fileName, mode);
 }
 
-
 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!
+		// The dtor still runs if the writing was aborted. Do NOT replace the original file
+		// with the probably broken new one.
 		m_safeWrite = false;
-		Close();
+		// A destructor must not throw: the process would terminate. Buffered writes surface
+		// their errors here (e.g. ENOSPC), so callers that care must Close() explicitly.
+		try {
+			Close();
+		} catch (const CSafeIOException &e) {
+			AddDebugLogLineC(logCFile,
+				CFormat("Error closing %s: %s") % m_filePath.GetPrintable() % e.what());
+		}
 	}
 }
 
-
 int CFile::fd() const
 {
 	return m_fd;
 }
 
-
 bool CFile::IsOpened() const
 {
 	return m_fd != fd_invalid;
 }
 
-
-const CPath& CFile::GetFilePath() const
+const CPath &CFile::GetFilePath() const
 {
 	return m_filePath;
 }
 
-
-bool CFile::Create(const CPath& path, bool overwrite, int accessMode)
+bool CFile::Create(const CPath &path, bool overwrite, int accessMode)
 {
 	if (!overwrite && path.FileExists()) {
 		return false;
@@ -199,21 +209,19 @@
 	return Open(path, write, accessMode);
 }
 
-bool CFile::Create(const wxString& path, bool overwrite, int accessMode)
+bool CFile::Create(const wxString &path, bool overwrite, int accessMode)
 {
 	return Create(CPath(path), overwrite, accessMode);
 }
 
-
-bool CFile::Open(const wxString& fileName, OpenMode mode, int accessMode)
+bool CFile::Open(const wxString &fileName, OpenMode mode, int accessMode)
 {
 	MULE_VALIDATE_PARAMS(fileName.Length(), "CFile: Cannot open, empty path.");
 
 	return Open(CPath(fileName), mode, accessMode);
 }
 
-
-bool CFile::Open(const CPath& fileName, OpenMode mode, int accessMode)
+bool CFile::Open(const CPath &fileName, OpenMode mode, int accessMode)
 {
 	MULE_VALIDATE_PARAMS(fileName.IsOk(), "CFile: Cannot open, empty path.");
 
@@ -226,10 +234,9 @@
 	m_safeWrite = false;
 	m_filePath = fileName;
 	m_writeBufferPending = 0;
-	// Buffer writes for any mode that can actually write. Read-only
-	// stays unbuffered so a misuse (like writing to a read-opened
-	// file) still fails immediately at the doWrite call site,
-	// preserving FileDataIOTest's CFile.Constructor contract.
+	// Buffer writes for any mode that can actually write. Read-only stays unbuffered so a
+	// misuse still fails immediately at the doWrite call site, preserving FileDataIOTest's
+	// CFile.Constructor contract.
 	m_canBuffer = (mode != read);
 
 #ifdef __linux__
@@ -237,37 +244,36 @@
 #else
 	int flags = O_BINARY;
 #endif
-	switch ( mode ) {
-		case read:
-			flags |= O_RDONLY;
-			break;
-
-		case write_append:
-			if (fileName.FileExists())
-			{
-				flags |= O_WRONLY | O_APPEND;
-				break;
-			}
-			//else: fall through as write_append is the same as write if the
-			//      file doesn't exist
+	switch (mode) {
+	case read:
+		flags |= O_RDONLY;
+		break;
 
-		/* fall through */
-		case write:
-			flags |= O_WRONLY | O_CREAT | O_TRUNC;
+	case write_append:
+		if (fileName.FileExists()) {
+			flags |= O_WRONLY | O_APPEND;
 			break;
+		}
+		// else: fall through as write_append is the same as write if the
+		//       file doesn't exist
 
-		case write_safe:
-			flags |= O_WRONLY | O_CREAT | O_TRUNC;
-			m_filePath = m_filePath.AppendExt(".new");
-			m_safeWrite = true;
-			break;
+	/* fall through */
+	case write:
+		flags |= O_WRONLY | O_CREAT | O_TRUNC;
+		break;
 
-		case write_excl:
-			flags |= O_WRONLY | O_CREAT | O_EXCL;
-			break;
+	case write_safe:
+		flags |= O_WRONLY | O_CREAT | O_TRUNC;
+		m_filePath = m_filePath.AppendExt(".new");
+		m_safeWrite = true;
+		break;
+
+	case write_excl:
+		flags |= O_WRONLY | O_CREAT | O_EXCL;
+		break;
 
-		case read_write:
-			flags |= O_RDWR;
+	case read_write:
+		flags |= O_RDWR;
 		break;
 	}
 
@@ -284,7 +290,6 @@
 	return IsOpened();
 }
 
-
 void CFile::Reopen(OpenMode mode)
 {
 	std::lock_guard<std::recursive_mutex> lock(m_mutex);
@@ -294,16 +299,22 @@
 	}
 }
 
-
 bool CFile::Close()
 {
 	MULE_VALIDATE_STATE(IsOpened(), "CFile: Cannot close closed file.");
 
 	std::lock_guard<std::recursive_mutex> lock(m_mutex);
 
-	// Flush userspace write buffer to the fd before closing — otherwise
-	// any pending bytes from doWrite() would be silently dropped.
-	DrainWriteBuffer();
+	// Flush userspace write buffer to the fd before closing -- otherwise
+	// any pending bytes from doWrite() would be silently dropped. A failed drain still
+	// closes the fd, so the file is not leaked and a retried Close() cannot fail again.
+	std::exception_ptr drainError;
+	try {
+		DrainWriteBuffer();
+	} catch (const CIOFailureException &) {
+		drainError = std::current_exception();
+		m_writeBufferPending = 0;
+	}
 
 	bool closed = (close(m_fd) != -1);
 	syscall_check(closed, m_filePath, "closing file");
@@ -312,16 +323,20 @@
 
 	if (m_safeWrite) {
 		CPath filePathTemp(m_filePath);
-		m_filePath = m_filePath.RemoveExt();	// restore m_filePath for Reopen()
-		if (closed) {
+		m_filePath = m_filePath.RemoveExt(); // restore m_filePath for Reopen()
+		// A short write must not replace the original file.
+		if (closed && !drainError) {
 			closed = CPath::RenameFile(filePathTemp, m_filePath, true);
 		}
 	}
 
+	if (drainError) {
+		std::rethrow_exception(drainError);
+	}
+
 	return closed;
 }
 
-
 bool CFile::Flush()
 {
 	MULE_VALIDATE_STATE(IsOpened(), "CFile: Cannot flush closed file.");
@@ -337,30 +352,31 @@
 	return flushed;
 }
 
-
-sint64 CFile::doRead(void* buffer, size_t count) const
+sint64 CFile::doRead(void *buffer, size_t count) const
 {
 	MULE_VALIDATE_PARAMS(buffer, "CFile: Invalid buffer in read operation.");
 	MULE_VALIDATE_STATE(IsOpened(), "CFile: Cannot read from closed file.");
 
 	std::lock_guard<std::recursive_mutex> lock(m_mutex);
 
-	// Read-after-write (or interleaved read/write on a read_write file)
-	// must see preceding writes. For pure-read files the buffer is
-	// always empty so this is a single branch.
+	// Read-after-write (or interleaved read/write on a read_write file) must see preceding
+	// writes. For pure-read files the buffer is always empty, so this is a single branch.
 	DrainWriteBuffer();
 
 	size_t totalRead = 0;
 	while (totalRead < count) {
-		int current = ::read(m_fd, (char*)buffer + totalRead, count - totalRead);
+		// m_mutex is this CFile's own lock guarding its buffer and fd; holding it across the
+		// blocking read is intended, since it serialises access to this one file object rather
+		// than a shared global section.
+		// NOLINTNEXTLINE(clang-analyzer-unix.BlockInCriticalSection)
+		int current = ::read(m_fd, (char *)buffer + totalRead, count - totalRead);
 
 		if (current == -1) {
 			// Read error, nothing we can do other than abort.
 			throw CIOFailureException(wxString("Error reading from file: ") + wxSysErrorMsg());
 		} else if ((totalRead + current < count) && Eof()) {
-			// We may fail to read the specified count in a couple
-			// of situations: EOF and interrupts. The check for EOF
-			// is needed to avoid inf. loops.
+			// A short read happens on EOF and on interrupts. The EOF check avoids an
+			// infinite loop.
 			break;
 		}
 
@@ -370,7 +386,6 @@
 	return totalRead;
 }
 
-
 void CFile::DrainWriteBuffer() const
 {
 	if (m_writeBufferPending == 0) {
@@ -380,9 +395,7 @@
 	// Loop to handle partial writes (e.g. interrupted by a signal).
 	size_t total = 0;
 	while (total < m_writeBufferPending) {
-		ssize_t written = ::write(m_fd,
-			m_writeBuffer.get() + total,
-			m_writeBufferPending - total);
+		ssize_t written = ::write(m_fd, m_writeBuffer.get() + total, m_writeBufferPending - total);
 		if (written < 0) {
 			throw CIOFailureException(
 				wxString("Error flushing write buffer: ") + wxSysErrorMsg());
@@ -392,22 +405,16 @@
 	m_writeBufferPending = 0;
 }
 
-
-sint64 CFile::doWrite(const void* buffer, size_t nCount)
+sint64 CFile::doWrite(const void *buffer, size_t nCount)
 {
 	MULE_VALIDATE_PARAMS(buffer, "CFile: Invalid buffer in write operation.");
 	MULE_VALIDATE_STATE(IsOpened(), "CFile: Cannot write to closed file.");
 
 	std::lock_guard<std::recursive_mutex> lock(m_mutex);
 
-	// Read-only files: the kernel will reject the write with EBADF;
-	// surface that immediately by going direct, the same way the
-	// pre-buffering version did.
-	//
-	// Single payload that doesn't fit in the buffer at all also goes
-	// direct — no point splitting into 64 KB chunks just to copy
-	// through the buffer first. Drain pending bytes (if any) so
-	// ordering is preserved.
+	// Read-only files: the kernel rejects the write with EBADF, so go direct and surface that
+	// immediately, as the pre-buffering version did. A single payload too large for the buffer
+	// also goes direct, draining pending bytes first so ordering is preserved.
 	if (!m_canBuffer || nCount >= kWriteBufferSize) {
 		DrainWriteBuffer();
 		if (nCount == 0) {
@@ -415,8 +422,7 @@
 		}
 		sint64 result = ::write(m_fd, buffer, nCount);
 		if (result != (sint64)nCount) {
-			throw CIOFailureException(
-				wxString("Error writing to file: ") + wxSysErrorMsg());
+			throw CIOFailureException(wxString("Error writing to file: ") + wxSysErrorMsg());
 		}
 		return result;
 	}
@@ -430,9 +436,8 @@
 		DrainWriteBuffer();
 	}
 
-	// Lazy-allocate on first buffered write: a CFile that's opened
-	// write-capable but never written to (e.g. construct-then-close
-	// on an early error path) shouldn't pay for the buffer.
+	// Lazy-allocate on first buffered write: a CFile opened write-capable but never
+	// written to should not pay for the buffer.
 	if (!m_writeBuffer) {
 		m_writeBuffer.reset(new charkWriteBufferSize);
 	}
@@ -442,7 +447,6 @@
 	return (sint64)nCount;
 }
 
-
 sint64 CFile::doSeek(sint64 offset) const
 {
 	if (!IsOpened()) {
@@ -453,10 +457,9 @@
 
 	std::lock_guard<std::recursive_mutex> lock(m_mutex);
 
-	// Pending bytes belong at the pre-seek position; flush before
-	// changing the fd's offset so writes don't end up in the wrong
-	// place. (CSafeFile / known.met save uses Seek() to back-patch
-	// the header after writing the body, so this matters in practice.)
+	// Pending bytes belong at the pre-seek position, so flush before changing the fd's offset.
+	// CSafeFile / the known.met save Seek() back to patch the header after writing the body, so
+	// this matters in practice.
 	DrainWriteBuffer();
 
 	sint64 result = SEEK_FD(m_fd, offset, SEEK_SET);
@@ -470,7 +473,6 @@
 	}
 }
 
-
 uint64 CFile::GetPosition() const
 {
 	MULE_VALIDATE_STATE(IsOpened(), "Cannot get position in closed file.");
@@ -483,20 +485,20 @@
 
 	sint64 pos = TELL_FD(m_fd);
 	if (pos == wxInvalidOffset) {
-		throw CSeekFailureException(wxString("Failed to retrieve position in file: ") + wxSysErrorMsg());
+		throw CSeekFailureException(
+			wxString("Failed to retrieve position in file: ") + wxSysErrorMsg());
 	}
 
 	return pos;
 }
 
-
 uint64 CFile::GetLength() const
 {
 	MULE_VALIDATE_STATE(IsOpened(), "CFile: Cannot get length of closed file.");
 
 	std::lock_guard<std::recursive_mutex> lock(m_mutex);
 
-	// fstat reads inode metadata, not buffered bytes — drain so the
+	// fstat reads inode metadata, not buffered bytes -- drain so the
 	// reported size reflects pending buffered writes.
 	DrainWriteBuffer();
 
@@ -508,13 +510,11 @@
 	return buf.st_size;
 }
 
-
 uint64 CFile::GetAvailable() const
 {
-	// Lock around both calls so length/position are taken atomically;
-	// otherwise a concurrent write could land between and skew the
-	// reported "available" count. Recursive so the inner GetLength /
-	// GetPosition calls (which lock again) don't deadlock.
+	// Lock around both calls so length and position are taken atomically, or a concurrent write
+	// could land between them and skew the reported "available" count. Recursive, so the inner
+	// GetLength / GetPosition calls do not deadlock.
 	std::lock_guard<std::recursive_mutex> lock(m_mutex);
 
 	const uint64 length = GetLength();
@@ -529,24 +529,23 @@
 	return 0;
 }
 
-
 bool CFile::SetLength(uint64 new_len)
 {
 	MULE_VALIDATE_STATE(IsOpened(), "CFile: Cannot set length when no file is open.");
 
 	std::lock_guard<std::recursive_mutex> lock(m_mutex);
 
-	// ftruncate / chsize operate on the kernel-side size; drain the
-	// userspace buffer first so any pending bytes are part of the
-	// length-resolution decision (e.g. extend-then-write patterns).
+	// ftruncate / chsize operate on the kernel-side size; drain the userspace buffer first so
+	// pending bytes are part of the length-resolution decision (e.g. extend-then-write
+	// patterns).
 	DrainWriteBuffer();
 
 #ifdef __WINDOWS__
 #ifdef _MSC_VER
-// MSVC has a 64bit version
+	// MSVC has a 64bit version
 	bool result = _chsize_s(m_fd, new_len) == 0;
 #else
-// MingW has an old runtime without it
+	// MingW has an old runtime without it
 	bool result = chsize(m_fd, new_len) == 0;
 #endif
 #else
@@ -557,4 +556,62 @@
 
 	return result;
 }
+
+bool CFile::CloneFile(const CPath &src, const CPath &dst, bool overwrite)
+{
+	if (!overwrite && dst.FileExists()) {
+		return false;
+	}
+
+	CFile in;
+	if (!in.Open(src, CFile::read)) {
+		return false;
+	}
+
+	CFile out;
+	if (!out.Open(dst, CFile::write)) {
+		return false;
+	}
+
+	// Stream through a 1 MiB heap buffer. The previous implementation (wxCopyFile) used a hard-
+	// coded 4 KiB buffer, which throttled cross-filesystem copies over NFS / sshfs to a
+	// fraction of line speed (amule-org/amule#11). Heap-allocated, not a stack array: CopyFile
+	// can run on the completion worker thread, where musl caps the stack at 128 KiB.
+	const size_t bufferSize = 1u << 20;
+	std::vector<char> buffer(bufferSize);
+
+	try {
+		uint64 remaining = in.GetLength();
+		while (remaining) {
+			const size_t chunk =
+				(remaining < bufferSize) ? static_cast<size_t>(remaining) : bufferSize;
+			in.Read(buffer.data(), chunk);
+			out.Write(buffer.data(), chunk);
+			remaining -= chunk;
+		}
+		// Close rather than rely on the destructor: it flushes the trailing sub-buffer
+		// write and surfaces any deferred error, e.g. an ENOSPC that only shows up when the
+		// write buffer drains.
+		if (!out.Close()) {
+			CPath::RemoveFile(dst);
+			return false;
+		}
+	} catch (const CSafeIOException &e) {
+		AddDebugLogLineC(
+			logCFile, CFormat(wxT("Failed to copy %s to %s: %s")) % src % dst % e.what());
+		// Close before unlinking: Windows cannot remove an open file. Close may itself
+		// throw while draining, so guard it -- we are already on the failure path.
+		try {
+			if (out.IsOpened()) {
+				out.Close();
+			}
+		} catch (const CSafeIOException &) {
+			// best-effort
+		}
+		CPath::RemoveFile(dst);
+		return false;
+	}
+
+	return true;
+}
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/CFile.h -> amule-3.1.0.tar.gz/src/CFile.h Changed

@@ -26,24 +26,22 @@
 #ifndef CFILE_H
 #define CFILE_H
 
-#include <common/Path.h>	// Needed for CPath
-#include "SafeFile.h"		// Needed for CFileDataIO
+#include <common/Path.h> // Needed for CPath
+#include "SafeFile.h"    // Needed for CFileDataIO
 
-#include <wx/file.h>		// Needed for constants
+#include <wx/file.h> // Needed for constants
 
-#include <memory>		// Needed for std::unique_ptr
-#include <mutex>		// Needed for std::recursive_mutex
+#include <memory> // Needed for std::unique_ptr
+#include <mutex>  // Needed for std::recursive_mutex
 
-#ifdef _MSC_VER  // silly warnings about deprecated functions
-#pragma warning(disable:4996)
+#ifdef _MSC_VER // silly warnings about deprecated functions
+#pragma warning(disable : 4996)
 #endif
 
 /**
- * This class is a modified version of the wxFile class.
- *
- * In addition to implementing the CFileDataIO interface,
- * it offers improved support for UTF8 filenames and 64b
- * file-IO on both windows and unix-like systems.
+ * A modified version of wxFile. Besides implementing the CFileDataIO interface, it
+ * offers better support for UTF8 filenames and 64-bit file IO on both Windows and
+ * unix-like systems.
  *
  * @see wxFile
  */
@@ -51,160 +49,141 @@
 {
 public:
 	//! Standard values for file descriptor
-	enum { fd_invalid = -1, fd_stdin, fd_stdout, fd_stderr };
+	enum
+	{
+		fd_invalid = -1,
+		fd_stdin,
+		fd_stdout,
+		fd_stderr
+	};
 
 	/** @see wxFile::OpenMode */
-	enum OpenMode { read, write, read_write, write_append, write_excl, write_safe };
-
-
-	/**
-	 * Creates a closed file.
-	 */
+	enum OpenMode
+	{
+		read,
+		write,
+		read_write,
+		write_append,
+		write_excl,
+		write_safe
+	};
+
+	/** Creates a closed file. */
 	CFile();
 
 	/**
-	 * Constructor, calls Open on the specified file.
-	 *
-	 * To check if the file was successfully opened, a
-	 * call to IsOpened() is required.
+	 * Calls Open on the specified file. Check IsOpened() to see whether it succeeded.
 	 */
-	CFile(const CPath& path, OpenMode mode = read);
-	CFile(const wxString& path, OpenMode mode = read);
+	CFile(const CPath &path, OpenMode mode = read);
+	CFile(const wxString &path, OpenMode mode = read);
 
-	/**
-	 * Destructor, closes the file if opened.
-	 */
+	/** Closes the file if opened. */
 	virtual ~CFile();
 
-
 	/**
 	 * Opens a file.
 	 *
 	 * @param path The full or relative path to the file.
 	 * @param mode The opening mode.
-	 * @param accessMode The permissions in case a new file is created.
-	 * @return True if the file was opened, false otherwise.
-	 *
-	 * 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.
+	 * @param accessMode The permissions in case a new file is created. Defaults to
+	 * whatever CPreferences::GetFilePermissions gives.
+	 * @return True if the file was opened.
+	 *
+	 * The 'write' and 'write_append' modes create the file if it does not exist.
+	 * 'write_safe' appends ".new" to the file name and otherwise behaves like 'write',
+	 * renaming to the original name on close -- Close() has to be called by hand, the
+	 * destructor does not rename.
 	 */
-	bool Open(const CPath& path, OpenMode mode = read, int accessMode = wxS_DEFAULT);
-	bool Open(const wxString& path, OpenMode mode = read, int accessMode = wxS_DEFAULT);
+	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.
+	 * Reopens a file which was opened and closed before, under the filename last
+	 * opened. Throws on failure.
 	 *
 	 * @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 equivalent of calling open with OpenMode 'write'.
+	 * Equivalent to Open with OpenMode 'write'.
 	 *
-	 * @param overwrite Specifies if the target file should be overwritten,
-	 *                  in case that it already exists.
+	 * @param overwrite Whether an existing target file should be overwritten.
 	 *
 	 * @see CFile::Open
 	 */
-	bool Create(const CPath& path, bool overwrite = false, int accessMode = wxS_DEFAULT);
-	bool Create(const wxString& path, bool overwrite = false, int accessMode = wxS_DEFAULT);
+	bool Create(const CPath &path, bool overwrite = false, int accessMode = wxS_DEFAULT);
+	bool Create(const wxString &path, bool overwrite = false, int accessMode = wxS_DEFAULT);
 
 	/**
-	 * Closes the file.
+	 * Copies a file, streaming through a large buffer.
+	 *
+	 * Used for data-file copies that can cross filesystems (e.g. the Temp -> Incoming
+	 * move on download completion, when a rename fails because the two directories live
+	 * on different mounts). Unlike wxCopyFile's hard-coded 4 KiB buffer, this streams
+	 * through a 1 MiB buffer, which is what lets cross-filesystem copies over NFS /
+	 * sshfs reach line speed. See amule-org/amule#11.
+	 *
+	 * The silly name (vs. CopyFile) avoids the CopyFile #define set on MSW.
 	 *
-	 * Note that calling Close on an closed file
-	 * is an illegal operation.
+	 * @param overwrite If false and the destination exists, fails.
+	 * @return true on success. On failure the partial destination is removed, so a
+	 * failed copy never leaves a corrupt file behind.
 	 */
-	bool Close();
+	static bool CloneFile(const CPath &src, const CPath &dst, bool overwrite = false);
 
+	/** Closes the file. Calling it on a closed file is illegal. */
+	bool Close();
 
 	/**
-	 * Returns the file descriptor associated with the file.
-	 *
-	 * Note that direct manipulation of the descriptor should
-	 * be avoided! That's what this class is for.
+	 * Returns the file descriptor. Manipulating it directly should be avoided -- that
+	 * is what this class is for.
 	 */
-	int  fd() const;
+	int fd() const;
 
-	/**
-	 * Flushes data not yet written.
-	 *
-	 * Note that calling Flush on an closed file
-	 * is an illegal operation.
-	 */
+	/** Flushes data not yet written. Calling it on a closed file is illegal. */
 	bool Flush();
 
-
 	/**
-	 * @see CSafeFileIO::GetLength
-	 *
-	 * Note that calling GetLength on a closed file
-	 * is an illegal operation.
+	 * @see CSafeFileIO::GetLength. Calling it on a closed file is illegal.
 	 */
 	virtual uint64 GetLength() const;
 
-	/**
-	 * Resizes the file to the specified length.
-	 */
+	/** Resizes the file to the specified length. */
 	bool SetLength(uint64 newLength);
 
 	/**
-	 * @see CSafeFileIO::GetPosition
-	 *
-	 * Note that calling GetPosition on a closed file
-	 * is an illegal operation.
+	 * @see CSafeFileIO::GetPosition. Calling it on a closed file is illegal.
 	 */
 	virtual uint64 GetPosition() const;
 
-	/**
-	 * Returns the current available bytes to read on the file before EOF
-	 *
-	 */
+	/** Returns the bytes still available to read on the file before EOF. */
 	virtual uint64 GetAvailable() const;
 
-	/**
-	 * Returns the path of the currently opened file.
-	 *
-	 */
-	const CPath& GetFilePath() const;
-
+	/** Returns the path of the currently opened file. */
+	const CPath &GetFilePath() const;
 
-	/**
-	 * Returns true if the file is opened, false otherwise.
-	 */
+	/** Returns true if the file is opened. */
 	bool IsOpened() const;
 
 protected:
 	/** @see CFileDataIO::doRead **/
-	virtual sint64 doRead(void* buffer, size_t count) const;
+	virtual sint64 doRead(void *buffer, size_t count) const;
 	/** @see CFileDataIO::doWrite **/
-	virtual sint64 doWrite(const void* buffer, size_t count);
+	virtual sint64 doWrite(const void *buffer, size_t count);
 	/** @see CFileDataIO::doSeek **/
 	virtual sint64 doSeek(sint64 offset) const;
 
 private:
 	//! A CFile is neither copyable nor assignable.
 	//@{
-	CFile(const CFile&);
-	CFile& operator=(const CFile&);
+	CFile(const CFile &);
+	CFile &operator=(const CFile &);
 	//@}
 
-	//! Flush any data in the userspace write buffer to the kernel.
-	//! No-op when the buffer is empty (e.g. read-only files). Called
-	//! from any path that needs the file's on-disk state to reflect
-	//! preceding writes — Close, Flush, doSeek, doRead, GetPosition,
-	//! GetLength.
+	//! Flush any data in the userspace write buffer to the kernel. A no-op when the
+	//! buffer is empty. Called from any path that needs the on-disk state to reflect
+	//! preceding writes: Close, Flush, doSeek, doRead, GetPosition, GetLength.
 	void DrainWriteBuffer() const;
 
 	//! File descriptor or 'fd_invalid' if not opened
@@ -216,76 +195,54 @@
 	//! Are we using safe write mode?
 	bool m_safeWrite;
 
-	//! Userspace write buffer. CFile::doWrite was previously a thin
-	//! wrapper over ::write(), which made every CFileDataIO::WriteTag
-	//! call (and its many small WriteString / Write underneath) round-
-	//! trip through the kernel. CKnownFileList::Save() with hundreds
-	//! of thousands of files emitted ~26k write() syscalls per second
-	//! and stalled shutdown for many minutes (#562 — slrslr's report).
-	//! Buffering doWrite into 64 KB chunks collapses millions of
-	//! syscalls into a few thousand. Members are mutable so the const-
-	//! qualified read / seek / position / length paths can drain the
-	//! buffer transparently.
+	//! Userspace write buffer. CFile::doWrite was a thin wrapper over ::write(), so every
+	//! CFileDataIO::WriteTag call and its small writes underneath round-tripped through
+	//! the kernel: CKnownFileList::Save() with hundreds of thousands of files emitted
+	//! ~26k write() syscalls per second and stalled shutdown for minutes (#562).
+	//! Buffering into 64 KB chunks collapses millions of syscalls into a few thousand.
+	//! The members are mutable so the const-qualified read / seek / position / length
+	//! paths can drain transparently.
 	//!
-	//! Heap-allocated (lazy) rather than embedded as a fixed array,
-	//! because CFile is regularly stack-allocated inside worker-thread
-	//! call chains (e.g. CHashingTask → CAICHHashSet::SaveHashSet
-	//! stack-allocates two CFile-shaped objects). musl's default
-	//! pthread stack is 128 KiB; two embedded 64 KiB buffers consume
-	//! the whole stack and the next stack-using call (in practice the
-	//! wxString → char conversion inside wxFile::Exists) crosses the
-	//! guard page and SIGSEGVs. The unique_ptr brings sizeof(CFile)
-	//! back to ~32 bytes and pays the 64 KiB only on first write,
-	//! which means read-only opens stay free.
-	enum { kWriteBufferSize = 64 * 1024 };
+	//! Heap-allocated lazily rather than embedded as a fixed array, because CFile is
+	//! regularly stack-allocated inside worker-thread call chains. musl's default pthread
+	//! stack is 128 KiB, and two embedded 64 KiB buffers consume the whole stack, so the
+	//! next stack-using call crosses the guard page and SIGSEGVs. The unique_ptr brings
+	//! sizeof(CFile) back to ~32 bytes and pays the 64 KiB only on first write.
+	enum
+	{
+		kWriteBufferSize = 64 * 1024
+	};
 	mutable std::unique_ptr<char> m_writeBuffer;
 	mutable size_t m_writeBufferPending;
 
-	//! True when the file was opened in a write-capable mode and
-	//! buffering is safe. Read-only files bypass the buffer so that
-	//! a stray write() through doWrite still fails immediately at
-	//! the call site (preserves CFileDataIO's error contract — see
-	//! FileDataIOTest's CFile.Constructor "ASSERT_RAISES(...,
-	//! file.WriteUInt8(0))" for a read-only fd).
+	//! True when the file was opened in a write-capable mode and buffering is safe.
+	//! Read-only files bypass the buffer, so a stray write() through doWrite still fails
+	//! immediately at the call site, preserving CFileDataIO's error contract.
 	bool m_canBuffer;
 
-	//! Serializes access to the userspace write buffer + fd state.
-	//! Without it, paths that drain the buffer (Close, Flush, doSeek,
-	//! doRead, GetPosition, GetLength, SetLength) can race against
-	//! concurrent doWrite/drain calls: two threads both pass the
-	//! `pending != 0` check before either resets pending to 0, and
-	//! since ::write advances the fd offset atomically per call, the
-	//! same N bytes end up written at fd_pos AND fd_pos + N — the
-	//! second write clobbers whatever lived there (typically the
-	//! previously-written block's data).
+	//! Serializes access to the userspace write buffer and fd state. Without it, paths
+	//! that drain the buffer (Close, Flush, doSeek, doRead, GetPosition, GetLength,
+	//! SetLength) race against concurrent doWrite/drain calls: two threads both pass the
+	//! `pending != 0` check before either resets pending to 0, and since ::write advances
+	//! the fd offset atomically per call, the same N bytes land at fd_pos AND fd_pos + N.
 	//!
-	//! Hit in production on CPartFile::m_hpartfile: CPartFile::FlushBuffer
-	//! calls m_hpartfile.GetLength()/SetLength() and CPartFile::
-	//! GetNeededSpace() calls GetLength(), all from the main thread
-	//! without taking m_hpartfileMutex. Pre-#562 this was safe because
-	//! GetLength was just fstat — independent of fd position. After
-	//! #562 it drains the buffer, which is what triggers the race
-	//! against CPartFileWriteThread's FlushAt (held under
-	//! m_hpartfileMutex but contending against unlocked main-thread
-	//! drains). Manifests as 1-3 corrupt blocks per part, with AICH
-	//! recovering ~98% of each part.
+	//! Hit in production on CPartFile::m_hpartfile: FlushBuffer calls
+	//! GetLength()/SetLength() and GetNeededSpace() calls GetLength(), all from the main
+	//! thread without taking m_hpartfileMutex. Before #562 that was safe, since GetLength
+	//! was just fstat; afterwards it drains the buffer, racing CPartFileWriteThread's
+	//! FlushAt. Manifests as 1-3 corrupt blocks per part, with AICH recovering ~98%.
 	//!
-	//! Recursive so Open() → Close() (and Reopen → Open → Close) don't
-	//! deadlock. Cost is ~30-50 ns per public-method call versus the
-	//! ~1 µs floor of any I/O syscall it's serializing — well within
-	//! noise. Mutable because const-qualified methods (doRead, doSeek,
-	//! GetLength, GetPosition) need to lock it.
+	//! Recursive so Open() -> Close() does not deadlock, and cheap against the ~1 us floor
+	//! of the I/O syscalls it serializes. Mutable because the const-qualified methods need
+	//! to lock it.
 	mutable std::recursive_mutex m_mutex;
 };
 
-
-/**
- * This exception is thrown by CFile if a seek or tell fails.
- */
-struct CSeekFailureException : public CIOFailureException {
-	CSeekFailureException(const wxString& desc);
+/** Thrown by CFile when a seek or tell fails. */
+struct CSeekFailureException : public CIOFailureException
+{
+	CSeekFailureException(const wxString &desc);
 };
 
-
 #endif // CFILE_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/CMakeLists.txt -> amule-3.1.0.tar.gz/src/CMakeLists.txt Changed

@@ -1,10 +1,59 @@
 set (LIBS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libs")
+# Build-tree twin of LIBS_INCLUDE_DIR. ECCodes.h / ECTagTypes.h are generated
+# from their .abstract sources into libs/ec/cpp under the build tree and exist
+# nowhere else, so anything spelling the include as <ec/cpp/ECCodes.h> needs
+# this path alongside the source-tree one. Always add the two together.
+set (LIBS_BINARY_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libs")
 set (INCLUDE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
 set (SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set (EC_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libs/ec/cpp")
 
-# Embed every PNG under src/icons/ as a static byte-array table in a
-# generated C TU (see src/icons/embed_icons.py for the format).
+# Promote deprecation warnings to errors for our own source targets.
+# Applied here (not via CMAKE_CXX_FLAGS) so config-phase
+# check_include_file_cxx / find_package probes aren't affected: those
+# probes compile stubs against third-party headers (cryptopp, wx,
+# boost) that legitimately emit deprecation warnings; -Werror on
+# those would make cryptopp discovery fail at configure time.
+#
+# GCC and Clang are covered:
+#   -Wdeprecated-declarations  -> users of a deprecated API
+#   -Wdeprecated-copy          -> P0806 implicit copy special member
+#                                 when the class provides another one
+#   -Wdeprecated               -> broad umbrella (C++17 constexpr
+#                                 static-member redecl, throw() spec)
+#
+# -Wdeprecated-copy is a C++-only concept (copy special members), so it's
+# gated to COMPILE_LANGUAGE:CXX; passing it to the C compiler just produces
+# "not valid for C" noise on every C translation unit.
+#
+# The pragma-wraps landed in #341 keep cryptopp and vendored wx quiet
+# under -isystem-less discovery; without those wraps this gate would
+# fire on ~230 cryptopp header hits on macOS.
+add_compile_options (
+	-Wdeprecated
+	-Wdeprecated-declarations
+	-Werror=deprecated
+	-Werror=deprecated-declarations
+	$<$<COMPILE_LANGUAGE:CXX>:-Wdeprecated-copy>
+	$<$<COMPILE_LANGUAGE:CXX>:-Werror=deprecated-copy>
+)
+
+# Clang-only: promote -Winconsistent-missing-override to an error so a class
+# that marks some of its virtual overrides `override` but not others fails the
+# build at the PR that introduces the mismatch -- instead of emitting hundreds
+# of warnings across every TU that includes the header (a single header,
+# amule.h, produced 800+; issue #488). GCC has no equivalent for the
+# "some marked, some not" case (only the whole-tree -Wsuggest-override), so this
+# is gated to Clang/AppleClang; the Clang-based CI jobs (macOS, mingw-w64) catch
+# any regression. The warning is on by default under Clang, so only the
+# promotion to error is needed here.
+add_compile_options (
+	$<$<CXX_COMPILER_ID:Clang,AppleClang>:-Werror=inconsistent-missing-override>
+)
+
+# Embed every PNG under src/icons/ (plus each icon's optional
+# same-name SVG twin) as a static byte-array table in a generated
+# C TU (see src/icons/embed_icons.py for the format).
 # CamuleArtProvider then exposes the entries to wxArtProvider at
 # runtime — there's no longer any compile-time #include of icon
 # source data, which is why this PR also deletes the entire
@@ -18,8 +67,9 @@
 # was taken.
 find_package (Python3 COMPONENTS Interpreter)
 if (Python3_FOUND)
-	file (GLOB_RECURSE AMULE_ICON_PNGS CONFIGURE_DEPENDS
-		${CMAKE_CURRENT_SOURCE_DIR}/icons/*.png)
+	file (GLOB_RECURSE AMULE_ICON_FILES CONFIGURE_DEPENDS
+		${CMAKE_CURRENT_SOURCE_DIR}/icons/*.png
+		${CMAKE_CURRENT_SOURCE_DIR}/icons/*.svg)
 	add_custom_command (
 		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icons/icon_data.c
 		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/icons
@@ -28,7 +78,7 @@
 			${CMAKE_CURRENT_BINARY_DIR}/icons/icon_data.c
 		DEPENDS
 			${CMAKE_CURRENT_SOURCE_DIR}/icons/embed_icons.py
-			${AMULE_ICON_PNGS}
+			${AMULE_ICON_FILES}
 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/icons
 		COMMENT "Embedding ${CMAKE_CURRENT_SOURCE_DIR}/icons -> icon_data.c"
 	)
@@ -43,12 +93,20 @@
 	OUTPUT ${EC_INCLUDE_DIR}/ECCodes.h
 	COMMAND ${CMAKE_COMMAND} -DHEADER_FILE="${CMAKE_CURRENT_BINARY_DIR}/libs/ec/cpp/ECCodes.h" -P ${CMAKE_CURRENT_SOURCE_DIR}/libs/ec/abstracts/CMakeLists.txt
 	WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libs/ec/abstracts"
+	DEPENDS
+		${CMAKE_CURRENT_SOURCE_DIR}/libs/ec/abstracts/ECCodes.abstract
+		${CMAKE_CURRENT_SOURCE_DIR}/libs/ec/abstracts/License.abstract
+		${CMAKE_CURRENT_SOURCE_DIR}/libs/ec/abstracts/CMakeLists.txt
 )
 
 add_custom_command (
 	OUTPUT ${EC_INCLUDE_DIR}/ECTagTypes.h
 	COMMAND ${CMAKE_COMMAND} -DHEADER_FILE="${CMAKE_CURRENT_BINARY_DIR}/libs/ec/cpp/ECTagTypes.h" -P ${CMAKE_CURRENT_SOURCE_DIR}/libs/ec/abstracts/CMakeLists.txt
 	WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libs/ec/abstracts"
+	DEPENDS
+		${CMAKE_CURRENT_SOURCE_DIR}/libs/ec/abstracts/ECTagTypes.abstract
+		${CMAKE_CURRENT_SOURCE_DIR}/libs/ec/abstracts/License.abstract
+		${CMAKE_CURRENT_SOURCE_DIR}/libs/ec/abstracts/CMakeLists.txt
 )
 
 if (Python3_FOUND)
@@ -69,6 +127,16 @@
 	add_subdirectory (webserver)
 endif()
 
+# Pure-logic primitives (JWT / ETag / route patterns / JSON writer)
+# that the upcoming amuleapi binary and its unit tests link against.
+# Built unconditionally — no transitive cost for builds that don't
+# consume it (static lib, zero runtime overhead).
+add_subdirectory (libwebcommon)
+
+if (BUILD_AMULEAPI)
+	add_subdirectory (webapi)
+endif()
+
 if (INSTALL_SKINS)
 	add_subdirectory (skins)
 endif()
@@ -97,6 +165,7 @@
 		LoggerConsole.cpp
 		NetworkFunctions.cpp
 		OtherFunctions.cpp
+		SearchProgressReport.cpp
 		TextClient.cpp
 	)
 
@@ -137,6 +206,33 @@
 	)
 endif (BUILD_AMULECMD)
 
+if (APPLE)
+	# Info.plist fragments shared by the aMule and aMuleGUI bundles, which
+	# advertise the same URL schemes and document types. Set at file scope
+	# so a remote-GUI-only configure (BUILD_MONOLITHIC=NO) still has them.
+	#
+	# aMule did not define the .emulecollection format, so the type is
+	# *imported* rather than exported.
+	#
+	# The document type still ranks Default, not Alternate. Alternate reads
+	# like the honest choice for a format we did not create, but it means
+	# "secondary viewer": LaunchServices then binds no default application,
+	# and while `open file.emulecollection` and Finder's Open With both
+	# resolve aMule as the only candidate, a plain double-click does
+	# nothing at all. Default is the rank for "did not create the format
+	# but is its default opener", which is exactly our case.
+	#
+	# Declaring the type is what puts aMule in Finder's "Open With" list.
+	# Making it the default is the user's call there - unlike URL schemes,
+	# which have no Finder UI and so need LSSetDefaultHandlerForURLScheme.
+	set (AMULE_PLIST_URL_TYPES
+		"{\"CFBundleURLName\": \"eD2k URL\", \"CFBundleURLSchemes\": \"ed2k\"}, {\"CFBundleURLName\": \"Magnet URL\", \"CFBundleURLSchemes\": \"magnet\"}")
+	set (AMULE_PLIST_IMPORTED_TYPES
+		"{\"UTTypeIdentifier\": \"org.amule.emulecollection\", \"UTTypeDescription\": \"eMule Collection\", \"UTTypeConformsTo\": \"public.data\", \"UTTypeTagSpecification\": {\"public.filename-extension\": \"emulecollection\", \"public.mime-type\": \"application/x-emule-collection\"}}")
+	set (AMULE_PLIST_DOCUMENT_TYPES
+		"{\"CFBundleTypeName\": \"eMule Collection\", \"CFBundleTypeRole\": \"Viewer\", \"LSHandlerRank\": \"Default\", \"CFBundleTypeExtensions\": \"emulecollection\", \"LSItemContentTypes\": \"org.amule.emulecollection\", \"CFBundleTypeIconFile\": \"amule.icns\"}")
+endif()
+
 if (BUILD_DAEMON)
 	add_executable (amuled
 		${CORE_SOURCES}
@@ -150,6 +246,11 @@
 		)
 	endif()
 
+	if (ENABLE_UTP)
+		target_link_libraries (amuled PRIVATE Utp::Utp)
+		target_compile_definitions (amuled PRIVATE AMULE_UTP_TRANSPORT)
+	endif()
+
 	target_compile_definitions (amuled
 		PRIVATE AMULE_DAEMON
 		PRIVATE wxUSE_GUI=0
@@ -188,6 +289,20 @@
 		)
 	endif()
 
+	if (APPLE)
+		# ProtocolHandlerManager_mac.mm calls
+		# LSCopyDefaultHandlerForURLScheme /
+		# LSSetDefaultHandlerForURLScheme from ApplicationServices.
+		# amuled on macOS runs from the terminal (no .app bundle), so
+		# LSSetDefault… will always fail there — but the CLI
+		# --configure-protocols path still routes through this file,
+		# so we need the framework linked to satisfy the loader.
+		target_link_libraries (amuled
+			PRIVATE "-framework ApplicationServices"
+			PRIVATE "-framework Foundation"
+		)
+	endif()
+
 	install (TARGETS amuled
 		RUNTIME DESTINATION bin
 	)
@@ -236,6 +351,10 @@
 		CaptchaGenerator.cpp
 		PartFileConvert.cpp
 		PartFileConvertDlg.cpp
+		# Not in GUI_SOURCES: amulegui shares that list, and the startup
+		# splash covers local work (part-file load, shared-file scan,
+		# hashing) that only the monolithic build does.
+		SplashScreen.cpp
 	)
 
 	if (WIN32)
@@ -244,6 +363,11 @@
 		)
 	endif()
 
+	if (ENABLE_UTP)
+		target_link_libraries (amule PRIVATE Utp::Utp)
+		target_compile_definitions (amule PRIVATE AMULE_UTP_TRANSPORT)
+	endif()
+
 	target_link_libraries (amule
 		PRIVATE ec
 		PRIVATE muleappcommon
@@ -330,6 +454,36 @@
 			VERBATIM
 		)
 
+		# Declare aMule as a candidate handler for ed2k:// and magnet:
+		# URLs so LaunchServices considers the bundle eligible.
+		# Making aMule the *default* is a separate step
+		# (LSSetDefaultHandlerForURLScheme via ProtocolHandlerManager);
+		# this only advertises the capability. Without this key, calling
+		# LSSetDefault… from ProtocolHandlerManager returns
+		# kLSApplicationNotFoundErr because LaunchServices doesn't know
+		# we support the scheme.
+		add_custom_command (TARGET amule POST_BUILD
+			COMMAND /usr/bin/plutil -replace CFBundleURLTypes
+				-json "${AMULE_PLIST_URL_TYPES}"
+				"$<TARGET_BUNDLE_CONTENT_DIR:amule>/Info.plist"
+			COMMENT "Declaring aMule.app as ed2k:// and magnet: URL handler"
+			VERBATIM
+		)
+
+		# Declare .emulecollection as a document type aMule can open, so
+		# LaunchServices offers it in Finder's "Open With" and delivers the
+		# open-document Apple Event (wxApp::MacOpenFiles) on double-click.
+		add_custom_command (TARGET amule POST_BUILD
+			COMMAND /usr/bin/plutil -replace UTImportedTypeDeclarations
+				-json "${AMULE_PLIST_IMPORTED_TYPES}"
+				"$<TARGET_BUNDLE_CONTENT_DIR:amule>/Info.plist"
+			COMMAND /usr/bin/plutil -replace CFBundleDocumentTypes
+				-json "${AMULE_PLIST_DOCUMENT_TYPES}"
+				"$<TARGET_BUNDLE_CONTENT_DIR:amule>/Info.plist"
+			COMMENT "Declaring aMule.app as an .emulecollection handler"
+			VERBATIM
+		)
+
 		# Copy translation catalogs into the .app bundle so the in-tree
 		# build picks them up.  wxLocale's lookup prefix on macOS is
 		# wxStandardPaths::GetDataDir() + "/locale", which resolves to
@@ -382,6 +536,25 @@
 				)
 			endforeach()
 		endif()
+
+		# Mirror for amuleapi's static-frontend root. Resolves at
+		# runtime via LSCopyApplicationURLsForBundleIdentifier(
+		# "org.amule.aMule") + CFBundleCopyResourceURL("amuleapi-
+		# static"); see Api.cpp::ResolveDefaultStaticDir. Without this
+		# step a Mac user who installed via the .app bundle would get
+		# `404 no such endpoint` on GET / unless they hand-edited
+		# amuleapi.conf StaticRoot.
+		if (BUILD_AMULEAPI)
+			set (_apifs_src "${CMAKE_SOURCE_DIR}/src/webapi/static")
+			set (_apifs_dst
+				"$<TARGET_BUNDLE_CONTENT_DIR:amule>/Resources/amuleapi-static")
+			add_custom_command (TARGET amule POST_BUILD
+				COMMAND ${CMAKE_COMMAND} -E copy_directory
+					"${_apifs_src}" "${_apifs_dst}"
+				COMMENT "Bundling amuleapi static frontend into aMule.app"
+				VERBATIM
+			)
+		endif()
 	endif()
 
 	install (TARGETS amule
@@ -430,6 +603,17 @@
 		PRIVATE wxWidgets::NET
 	)
 
+	# KnownFile.cpp's std::atomic<uint64> EC generation counter (and
+	# Statistics.cpp's free-space pair) needs libatomic on 32-bit targets
+	# without a hardware 8-byte CAS (PPC32, ARMv5/v6, MIPS32). amulegui
+	# compiles COMMON_SOURCES but links muleappcommon / muleappgui, not
+	# muleappcore, so it does not inherit muleappcore's copy. LIBATOMIC is
+	# set at the top of the root CMakeLists.txt — empty on 64-bit, "atomic"
+	# on 32-bit.
+	if (LIBATOMIC)
+		target_link_libraries (amulegui PRIVATE ${LIBATOMIC})
+	endif()
+
 	if (HAVE_BFD)
 		target_link_libraries (amulegui
 			PRIVATE ${BFD_LIBRARY}
@@ -498,6 +682,35 @@
 			VERBATIM
 		)
 
+		# Declare aMuleGUI as a candidate ed2k:// / magnet: handler.
+		# The remote-GUI variant is a legitimate scheme handler in a
+		# remote-daemon setup — clicking a link on the laptop launches
+		# amulegui, which forwards the URL over EC to a remote amuled.
+		# Without this key macOS launches aMuleGUI for the URL but
+		# drops the URL delivery because the bundle metadata says the
+		# app doesn't advertise the scheme. Identical shape to the
+		# aMule.app patch above.
+		add_custom_command (TARGET amulegui POST_BUILD
+			COMMAND /usr/bin/plutil -replace CFBundleURLTypes
+				-json "${AMULE_PLIST_URL_TYPES}"
+				"$<TARGET_BUNDLE_CONTENT_DIR:amulegui>/Info.plist"
+			COMMENT "Declaring aMuleGUI.app as ed2k:// and magnet: URL handler"
+			VERBATIM
+		)
+
+		# And as an .emulecollection handler, for the same reason: the
+		# collection is parsed locally and its links go over EC.
+		add_custom_command (TARGET amulegui POST_BUILD
+			COMMAND /usr/bin/plutil -replace UTImportedTypeDeclarations
+				-json "${AMULE_PLIST_IMPORTED_TYPES}"
+				"$<TARGET_BUNDLE_CONTENT_DIR:amulegui>/Info.plist"
+			COMMAND /usr/bin/plutil -replace CFBundleDocumentTypes
+				-json "${AMULE_PLIST_DOCUMENT_TYPES}"
+				"$<TARGET_BUNDLE_CONTENT_DIR:amulegui>/Info.plist"
+			COMMENT "Declaring aMuleGUI.app as an .emulecollection handler"
+			VERBATIM
+		)
+
 		# Same translation-catalog bundling as the monolithic amule.app
 		# — wxLocale's lookup prefix on macOS is GetDataDir() + "/locale"
 		# which resolves to Contents/Resources/locale inside whichever
@@ -554,8 +767,16 @@
 		ED2KLink.cpp
 		Friend.cpp
 		GapList.cpp
+		# Here rather than in COMMON_SOURCES: nothing in the language table
+		# varies with the per-target defines, so amule, amuled and amulegui
+		# share one object instead of each compiling their own.
+		LanguageList.cpp
 		MagnetURI.cpp
 		MemFile.cpp
+		# Lives here rather than in muleappgui because InitCommon expands
+		# .emulecollection files passed on the command line, and that path
+		# is shared by amuled - which links muleappcommon only.
+		MuleCollection.cpp
 		NetworkFunctions.cpp
 		OtherFunctions.cpp
 		Packet.cpp
@@ -582,6 +803,7 @@
 		PUBLIC ${EC_INCLUDE_DIR}
 		PRIVATE ${INCLUDE_INCLUDE_DIR}
 		PRIVATE ${LIBS_INCLUDE_DIR}
+		PRIVATE ${LIBS_BINARY_INCLUDE_DIR}
 		PRIVATE ${ZLIB_INCLUDE_DIR}
 	)
 
@@ -641,6 +863,13 @@
 		${IPFILTERSCANNER}
 		${PARSER}
 		${SCANNER}
+		${IP2COUNTRY}
+		# Deliberately here rather than in muleappcommon: amule and amuled
+		# own amuleapi-passwords, amulegui does not (its config dir is on
+		# another machine), and muleappcore is exactly the amule+amuled
+		# pair. Keeping it out of amulegui also keeps Crypto++ out of it.
+		AmuleApiCredentials.cpp
+		kademlia/kademlia/AICHHashList.cpp
 		kademlia/kademlia/Entry.cpp
 		kademlia/kademlia/Indexed.cpp
 		kademlia/kademlia/SearchManager.cpp
@@ -655,6 +884,7 @@
 		RandomFunctions.cpp
 		RC4Encrypt.cpp
 		StateMachine.cpp
+		TerminationProcessAmuleApi.cpp
 		TerminationProcessAmuleweb.cpp
 		ThreadScheduler.cpp
 		UPnPBase.cpp
@@ -671,6 +901,7 @@
 		PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
 		PRIVATE ${INCLUDE_INCLUDE_DIR}
 		PRIVATE ${LIBS_INCLUDE_DIR}
+		PRIVATE ${LIBS_BINARY_INCLUDE_DIR}
 	)
 
 	if (ENABLE_UPNP)
@@ -682,14 +913,33 @@
 	target_link_libraries (muleappcore
 		PUBLIC wxWidgets::BASE
 		PRIVATE CRYPTOPP::CRYPTOPP
+		# webcommon owns the amuleapi credential format (hashing + the
+		# amuleapi-passwords file) and the EC token amuled hands the
+		# amuleapi it spawns, shared with the amuleapi binary so the two
+		# can never disagree about either. Built unconditionally, so this
+		# holds even for a -DBUILD_AMULEAPI=NO configure.
+		#
+		# PUBLIC, not PRIVATE: amule.cpp calls webcommon directly and is
+		# compiled into the amule / amuled executables rather than into
+		# this library, so those targets need the header path too. The
+		# objects already reached them transitively; only the includes
+		# did not.
+		PUBLIC webcommon
 	)
 
+	# The GeoIP resolver (IP2Country.cpp + geoip/MaxMindDBDatabase.cpp) now
+	# lives in the core library so the daemon can resolve country codes for
+	# the EC tag (#439 / #440), not just the GUI. It needs libmaxminddb.
+	if (ENABLE_IP2COUNTRY)
+		target_link_libraries (muleappcore PUBLIC MaxMindDB::Shared)
+	endif()
+
 	# DownloadBandwidthThrottler's std::atomic<int64_t> byte budget
 	# needs libatomic on 32-bit targets without a hardware 8-byte
 	# CAS (PPC32, ARMv5/v6, MIPS32). LIBATOMIC is set at the top
 	# of the root CMakeLists.txt — empty on 64-bit, "atomic" on
-	# 32-bit. Linked PUBLIC so amule / amuled / amulegui pick it
-	# up transitively.
+	# 32-bit. Linked PUBLIC so amule / amuled pick it up
+	# transitively.
 	if (LIBATOMIC)
 		target_link_libraries (muleappcore PUBLIC ${LIBATOMIC})
 	endif()
@@ -714,26 +964,25 @@
 
 if (NEED_LIB_MULEAPPGUI)
 	add_library (muleappgui STATIC
-		${IP2COUNTRY}
-		extern/wxWidgets/listctrl.cpp
+		CountryFlags.cpp
 		BarShader.cpp
 		ColorFrameCtrl.cpp
 		EditServerListDlg.cpp
 		FileDetailListCtrl.cpp
-		MuleCollection.cpp
+		InfoGridDialog.cpp
+		ListColumnStore.cpp
+		MuleBarRenderer.cpp
+		MuleIconTextRenderer.cpp
 		MuleColour.cpp
 		MuleGifCtrl.cpp
-		MuleListCtrl.cpp
+		MuleDataViewCtrl.cpp
+		MuleVirtualDataViewCtrl.cpp
 		MuleNotebook.cpp
 		MuleTextCtrl.cpp
-		muuli_wdr.cpp
+		MuleLogCtrl.cpp
+		PartBarLegendUI.cpp
 	)
 
-	if (ENABLE_IP2COUNTRY)
-		target_link_libraries (muleappgui
-			PUBLIC MaxMindDB::Shared
-		)
-	endif()
 
 	target_compile_definitions (muleappgui
 		PRIVATE WXUSINGDLL
@@ -743,6 +992,7 @@
 		PUBLIC ${amule_BINARY_DIR}
 		PUBLIC ${INCLUDE_INCLUDE_DIR}
 		PUBLIC ${LIBS_INCLUDE_DIR}
+		PUBLIC ${LIBS_BINARY_INCLUDE_DIR}
 		# The build-generated icon_data.c #includes "icon_data.h",
 		# which lives in src/icons/ — needs to be on the include
 		# path for the C compile. PUBLIC so it propagates to the
@@ -770,6 +1020,26 @@
 IF (NEED_LIB_MULESOCKET)
 	add_library (mulesocket STATIC
 		LibSocket.cpp
+		# The two text operations of CNetworkAddress (parse and format) are the
+		# only ones that still compile Boost.Asio, so the type is not
+		# header-only and every target touching an address has to link this TU.
+		#
+		# It lives here rather than in muleappcommon for two reasons, both about
+		# where asio already is. mulesocket is the last static library on every
+		# executable's link line, so a one-pass linker resolves these symbols
+		# for muleappcommon and mulecommon too -- putting them in muleappcommon
+		# instead breaks amulegui, which is scanned before mulesocket. And
+		# mulesocket already links ${Boost_LIBRARIES}, which on mingw-w64 is
+		# ws2_32;mswsock -- exactly what asio's winsock_init needs, and what
+		# targets that merely include NetworkAddress.h must not require.
+		NetworkAddress.cpp
+		# The one interface enumeration in the tree. Here rather than in
+		# muleappcommon because LibSocketAsio.cpp resolves a bind-to-interface
+		# name through it and mulesocket does not link muleappcommon, while
+		# every target that links muleappcommon links mulesocket too - so this
+		# is the placement that reaches amuled, amule, amulegui and the
+		# preferences dialog with a single copy.
+		NetworkInterfaces.cpp
 	)
 
 	target_compile_definitions (mulesocket
@@ -780,12 +1050,22 @@
 		PUBLIC ${amule_BINARY_DIR}
 		PUBLIC ${INCLUDE_INCLUDE_DIR}
 		PUBLIC ${LIBS_INCLUDE_DIR}
+		PUBLIC ${LIBS_BINARY_INCLUDE_DIR}
 	)
 
 	target_link_libraries (mulesocket
 		PRIVATE ${Boost_LIBRARIES}
 		PUBLIC wxWidgets::BASE
 	)
+	if (WIN32)
+		# GetAdaptersAddresses() in NetworkInterfaces.cpp enumerates the
+		# adapters that LibSocketAsio.cpp resolves a Windows FriendlyName
+		# against for bind-to-interface.
+		# PUBLIC (not PRIVATE): mulesocket is a static lib, so the dependency
+		# must propagate to every consumer that links it, not just to
+		# mulesocket itself.
+		target_link_libraries (mulesocket PUBLIC iphlpapi)
+	endif()
 endif()
 
 # On MinGW-built Windows targets, bundle the MSYS2 MinGW64 runtime DLLs

amule-3.0.1.tar.gz/src/CamuleArtProvider.cpp -> amule-3.1.0.tar.gz/src/CamuleArtProvider.cpp Changed

@@ -1,54 +1,123 @@
-//
-// CamuleArtProvider — see CamuleArtProvider.h for the contract.
-//
+// CamuleArtProvider -- see CamuleArtProvider.h for the contract.
 
 #include "CamuleArtProvider.h"
 
 #include "icons/icon_data.h"
 
 #include <wx/bitmap.h>
+#include <wx/bmpbndl.h> // Needed for wxBitmapBundle::FromSVG / FromBitmaps
 #include <wx/image.h>
 #include <wx/mstream.h>
 
-
 const wxString CamuleArtProvider::PREFIX = "amule:";
 
-
-wxBitmap CamuleArtProvider::CreateBitmap(const wxArtID& id,
-                                          const wxArtClient& WXUNUSED(client),
-                                          const wxSize& size)
+namespace
+{
+const struct AMuleIconEntry *FindIcon(const wxArtID &id)
 {
 	// Only resolve our own art ids; let other providers handle the rest.
-	if (!id.StartsWith(PREFIX)) {
-		return wxNullBitmap;
+	if (!id.StartsWith(CamuleArtProvider::PREFIX)) {
+		return nullptr;
+	}
+	return amule_find_icon(id.Mid(CamuleArtProvider::PREFIX.length()).utf8_str().data());
+}
+
+bool LoadPng(const struct AMuleIconEntry *entry, wxImage &image)
+{
+	wxMemoryInputStream stream(entry->png_data, entry->png_len);
+	return image.LoadFile(stream, wxBITMAP_TYPE_PNG);
+}
+
+// The icon's SVG twin as a bundle, or an invalid bundle when there is none or it does not parse.
+// wxDefaultSize takes the PNG twin's natural size, which FromSVG needs as its default.
+wxBitmapBundle SvgBundle(const struct AMuleIconEntry *entry, const wxSize &size)
+{
+#ifdef wxHAS_SVG
+	if (entry->svg_data != nullptr && entry->svg_len > 0) {
+		wxSize sizeDef(size);
+		wxImage probe;
+		if (sizeDef == wxDefaultSize && LoadPng(entry, probe)) {
+			sizeDef = probe.GetSize();
+		}
+		if (sizeDef != wxDefaultSize) {
+			return wxBitmapBundle::FromSVG(entry->svg_data, entry->svg_len, sizeDef);
+		}
 	}
+#else
+	wxUnusedVar(entry);
+	wxUnusedVar(size);
+#endif
+	return wxBitmapBundle();
+}
+} // namespace
 
-	const wxString short_name = id.Mid(PREFIX.length());
-	const struct AMuleIconEntry *entry =
-		amule_find_icon(short_name.utf8_str().data());
-	if (entry == NULL) {
+wxBitmap CamuleArtProvider::CreateBitmap(
+	const wxArtID &id, const wxArtClient &WXUNUSED(client), const wxSize &size)
+{
+	const struct AMuleIconEntry *entry = FindIcon(id);
+	if (entry == nullptr) {
 		return wxNullBitmap;
 	}
 
-	// Decode the embedded PNG bytes.  wxImage::LoadFile via a
-	// wxMemoryInputStream wins over wxBitmap::NewFromPNGData here
-	// because we need to optionally rescale below — Scale() is on
+	// Rendered from the SVG twin at the requested pixel size when there is one, so raster
+	// consumers (image lists, DC drawing) get the same artwork as bundle consumers.
+	const wxBitmapBundle svg = SvgBundle(entry, size);
+	if (svg.IsOk()) {
+		return svg.GetBitmap(size == wxDefaultSize ? svg.GetDefaultSize() : size);
+	}
+
+	// Decode the embedded PNG bytes. wxImage::LoadFile via a wxMemoryInputStream wins over
+	// wxBitmap::NewFromPNGData here because we may need to rescale below, and Scale() is on
 	// wxImage, not wxBitmap.
-	wxMemoryInputStream stream(entry->png_data, entry->png_len);
 	wxImage image;
-	if (!image.LoadFile(stream, wxBITMAP_TYPE_PNG)) {
+	if (!LoadPng(entry, image)) {
 		return wxNullBitmap;
 	}
 
-	// Honour an explicit size request from the caller.  GetBitmap()
-	// passes wxDefaultSize when the caller doesn't care; in that
-	// case the natural size from the PNG header wins.
-	if (size != wxDefaultSize
-	    && (size.GetWidth() != image.GetWidth()
-	        || size.GetHeight() != image.GetHeight())) {
-		image = image.Scale(size.GetWidth(), size.GetHeight(),
-		                    wxIMAGE_QUALITY_HIGH);
+	// Honour an explicit size request from the caller. GetBitmap() passes wxDefaultSize when
+	// the caller does not care; then the natural size from the PNG header wins.
+	if (size != wxDefaultSize &&
+		(size.GetWidth() != image.GetWidth() || size.GetHeight() != image.GetHeight())) {
+		image = image.Scale(size.GetWidth(), size.GetHeight(), wxIMAGE_QUALITY_HIGH);
 	}
 
 	return wxBitmap(image);
 }
+
+wxBitmapBundle CamuleArtProvider::CreateBitmapBundle(
+	const wxArtID &id, const wxArtClient &WXUNUSED(client), const wxSize &size)
+{
+	const struct AMuleIconEntry *entry = FindIcon(id);
+	if (entry == nullptr) {
+		return wxBitmapBundle();
+	}
+
+	// A malformed SVG, or one using features NanoSVG cannot render, yields a non-ok bundle;
+	// fall through to the PNG raster path below rather than returning nothing.
+	wxBitmapBundle svg = SvgBundle(entry, size);
+	if (svg.IsOk()) {
+		return svg;
+	}
+
+	// No SVG twin (or wx built without NanoSVG support): serve the PNG at the requested logical
+	// size plus a smooth 2x upscale, so DPI-aware widgets still get something better than
+	// stretched 1x art. The mask is turned into an alpha channel first, because high-quality
+	// scaling of a masked image smears the mask colour into the icon edges.
+	wxImage image;
+	if (!LoadPng(entry, image)) {
+		return wxBitmapBundle();
+	}
+	if (!image.HasAlpha()) {
+		image.InitAlpha();
+	}
+	// Target logical size: the caller's request, or the PNG's natural size when it does not
+	// care. Derive both the 1x and 2x renditions from the original image so each is a single
+	// high-quality resample -- building the 2x from an already rescaled 1x would resample
+	// twice.
+	const wxSize target = (size == wxDefaultSize) ? wxSize(image.GetWidth(), image.GetHeight()) : size;
+	wxImage image1x = (target.GetWidth() == image.GetWidth() && target.GetHeight() == image.GetHeight())
+				  ? image
+				  : image.Scale(target.GetWidth(), target.GetHeight(), wxIMAGE_QUALITY_HIGH);
+	wxImage image2x = image.Scale(target.GetWidth() * 2, target.GetHeight() * 2, wxIMAGE_QUALITY_HIGH);
+	return wxBitmapBundle::FromBitmaps(wxBitmap(image1x), wxBitmap(image2x));
+}

amule-3.0.1.tar.gz/src/CamuleArtProvider.h -> amule-3.1.0.tar.gz/src/CamuleArtProvider.h Changed

@@ -1,13 +1,14 @@
 //
-// CamuleArtProvider — wxArtProvider subclass exposing aMule's bundled
-// PNG icons through wxArtProvider::GetBitmap() / GetIcon().
+// CamuleArtProvider -- wxArtProvider subclass exposing aMule's bundled
+// icons through wxArtProvider::GetBitmap() / GetIcon() / GetBitmapBundle().
 //
 // The icon data itself lives in src/icons/icon_data.c (build-time
-// generated from src/icons/*.png by src/icons/embed_icons.py).
+// generated from src/icons/ by src/icons/embed_icons.py).
 // CamuleArtProvider just glues that lookup table to the wx art-id
-// system: art ids of the form "amule:<name>" map to the PNG entry of
-// the same name.  Examples: "amule:amule", "amule:sort_dn",
-// "amule:flag_us".
+// system: art ids of the form "amule:<name>" map to the entry of the
+// same name.  Examples: "amule:amule", "amule:sort_dn", "amule:flag_us".
+// An icon with an SVG twin is rendered from it on every path; the PNG is
+// the fallback for icons without one.
 //
 // Push one instance during app init (CamuleApp::OnInit and
 // CamuleRemoteGuiApp::OnInit do this) so every later
@@ -18,21 +19,25 @@
 #define SRC_CAMULE_ART_PROVIDER_H
 
 #include <wx/artprov.h>
+#include <wx/bmpbndl.h> // Needed for wxBitmapBundle
 
 class CamuleArtProvider : public wxArtProvider
 {
 public:
-	// Prefix every aMule art id starts with — e.g. "amule:sort_dn".
+	// Prefix every aMule art id starts with -- e.g. "amule:sort_dn".
 	static const wxString PREFIX;
 
 	// Build a full art id from a short icon name.  E.g.
 	// CamuleArtProvider::MakeId("sort_dn") -> "amule:sort_dn".
-	static wxString MakeId(const wxString& name) { return PREFIX + name; }
+	static wxString MakeId(const wxString &name) { return PREFIX + name; }
 
 protected:
-	wxBitmap CreateBitmap(const wxArtID& id,
-	                      const wxArtClient& client,
-	                      const wxSize& size) override;
+	wxBitmap CreateBitmap(const wxArtID &id, const wxArtClient &client, const wxSize &size) override;
+
+	// Bundle-aware lookup behind wxArtProvider::GetBitmapBundle(). PNG-only icons get the PNG
+	// plus a smooth 2x upscale.
+	wxBitmapBundle CreateBitmapBundle(
+		const wxArtID &id, const wxArtClient &client, const wxSize &size) override;
 };
 
 #endif // SRC_CAMULE_ART_PROVIDER_H

amule-3.0.1.tar.gz/src/CamuleFileConfig.h -> amule-3.1.0.tar.gz/src/CamuleFileConfig.h Changed

@@ -25,19 +25,15 @@
 
 #include "CCtypeAsciiScope.h"
 
-
-// wxFileConfig subclass that wraps every read / write / flush /
-// path-navigating call with CCtypeAsciiScope. amule.conf is parsed
-// and written through this subclass exclusively (see
-// amuleAppCommon::Initialize), so wxFileConfig's internal lookups
-// always run under a deterministic ASCII case-fold regardless of the
-// user's UI language.
+// wxFileConfig subclass that wraps every read / write / flush / path-navigating call with
+// CCtypeAsciiScope. amule.conf is parsed and written through this subclass exclusively (see
+// amuleAppCommon::Initialize), so wxFileConfig's internal lookups always run under a deterministic
+// ASCII case-fold regardless of the user's UI language.
 //
-// The Read / Has / Delete / Rename / SetPath overrides matter
-// because they all walk the same sorted m_aEntries / m_aSubgroups
-// arrays via CmpNoCase and would silently miss entries under a
-// non-C locale. The Write overrides are the ones that turn a missed
-// lookup into a *persistent* duplicate by appending a new entry.
+// The Read / Has / Delete / Rename / SetPath overrides matter because they all walk the same sorted
+// m_aEntries / m_aSubgroups arrays via CmpNoCase and would silently miss entries under a non-C
+// locale. The Write overrides are the ones that turn a missed lookup into a *persistent* duplicate
+// by appending a new entry.
 class CamuleFileConfig : public wxFileConfig
 {
 public:
@@ -49,83 +45,83 @@
 		return wxFileConfig::Flush(bCurrentOnly);
 	}
 
-	bool HasGroup(const wxString& strName) const override
+	bool HasGroup(const wxString &strName) const override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::HasGroup(strName);
 	}
 
-	bool HasEntry(const wxString& strName) const override
+	bool HasEntry(const wxString &strName) const override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::HasEntry(strName);
 	}
 
-	bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) override
+	bool DeleteEntry(const wxString &key, bool bGroupIfEmptyAlso = true) override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::DeleteEntry(key, bGroupIfEmptyAlso);
 	}
 
-	bool DeleteGroup(const wxString& szKey) override
+	bool DeleteGroup(const wxString &szKey) override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::DeleteGroup(szKey);
 	}
 
-	bool RenameEntry(const wxString& oldName, const wxString& newName) override
+	bool RenameEntry(const wxString &oldName, const wxString &newName) override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::RenameEntry(oldName, newName);
 	}
 
-	bool RenameGroup(const wxString& oldName, const wxString& newName) override
+	bool RenameGroup(const wxString &oldName, const wxString &newName) override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::RenameGroup(oldName, newName);
 	}
 
-	void SetPath(const wxString& strPath) override
+	void SetPath(const wxString &strPath) override
 	{
 		CCtypeAsciiScope scope;
 		wxFileConfig::SetPath(strPath);
 	}
 
 protected:
-	bool DoReadString(const wxString& key, wxString* pStr) const override
+	bool DoReadString(const wxString &key, wxString *pStr) const override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::DoReadString(key, pStr);
 	}
 
-	bool DoReadLong(const wxString& key, long* pl) const override
+	bool DoReadLong(const wxString &key, long *pl) const override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::DoReadLong(key, pl);
 	}
 
 #if wxUSE_BASE64
-	bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const override
+	bool DoReadBinary(const wxString &key, wxMemoryBuffer *buf) const override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::DoReadBinary(key, buf);
 	}
 #endif
 
-	bool DoWriteString(const wxString& key, const wxString& szValue) override
+	bool DoWriteString(const wxString &key, const wxString &szValue) override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::DoWriteString(key, szValue);
 	}
 
-	bool DoWriteLong(const wxString& key, long lValue) override
+	bool DoWriteLong(const wxString &key, long lValue) override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::DoWriteLong(key, lValue);
 	}
 
 #if wxUSE_BASE64
-	bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) override
+	bool DoWriteBinary(const wxString &key, const wxMemoryBuffer &buf) override
 	{
 		CCtypeAsciiScope scope;
 		return wxFileConfig::DoWriteBinary(key, buf);

amule-3.0.1.tar.gz/src/CanceledFileList.cpp -> amule-3.1.0.tar.gz/src/CanceledFileList.cpp Changed

@@ -22,8 +22,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "CanceledFileList.h"	// Interface declarations
+#include "CanceledFileList.h" // Interface declarations
 
 #include <common/DataFileVersion.h>
 #include "Preferences.h"
@@ -31,14 +30,12 @@
 #include "Logger.h"
 #include <common/Format.h>
 
-
 CCanceledFileList::CCanceledFileList()
-	: m_filename("canceled.met")
+: m_filename("canceled.met")
 {
 	Init();
 }
 
-
 bool CCanceledFileList::Init()
 {
 	CFile file;
@@ -64,8 +61,8 @@
 
 		uint32 RecordsNumber = file.ReadUInt32();
 		AddDebugLogLineN(logKnownFiles,
-			CFormat("Reading %i canceled files from file format 0x%02x.")
-			% RecordsNumber % version);
+			CFormat("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);
@@ -77,14 +74,13 @@
 		AddDebugLogLineN(logKnownFiles, "Finished reading canceled files");
 
 		return true;
-	} catch (const CSafeIOException& e) {
+	} catch (const CSafeIOException &e) {
 		AddLogLineC(CFormat(_("IO error while reading %s file: %s")) % m_filename % e.what());
 	}
 
 	return false;
 }
 
-
 void CCanceledFileList::Save()
 {
 	CFile file(thePrefs::GetConfigDir() + m_filename, CFile::write);
@@ -100,28 +96,26 @@
 		for (; it != m_canceledFileList.end(); ++it) {
 			file.Write(it->GetHash(), 16);
 		}
-	} catch (const CIOFailureException& e) {
+		// Explicit so a buffered write error is caught here, not in the destructor.
+		file.Close();
+	} catch (const CIOFailureException &e) {
 		AddLogLineC(CFormat(_("Error while saving %s file: %s")) % m_filename % e.what());
 	}
 }
 
-
-bool CCanceledFileList::IsCanceledFile(const CMD4Hash& hash) const
+bool CCanceledFileList::IsCanceledFile(const CMD4Hash &hash) const
 {
 	return !hash.IsEmpty() && m_canceledFileList.find(hash) != m_canceledFileList.end();
 }
 
-
-bool CCanceledFileList::Add(const CMD4Hash& hash)
+bool CCanceledFileList::Add(const CMD4Hash &hash)
 {
 	return m_canceledFileList.insert(hash).second;
 }
 
-
-bool CCanceledFileList::Remove(const CMD4Hash& hash)
+bool CCanceledFileList::Remove(const CMD4Hash &hash)
 {
 	return m_canceledFileList.erase(hash) > 0;
 }
 
-
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/CanceledFileList.h -> amule-3.1.0.tar.gz/src/CanceledFileList.h Changed

@@ -28,33 +28,30 @@
 #include <set>
 #include "MD4Hash.h"
 
-//
-// A list to keep track of canceled files, stored in canceled.met .
-// Only the file hash is stored.
-//
+// Tracks canceled files in canceled.met. Only the file hash is stored.
 class CCanceledFileList
 {
 public:
 	// Ctor, calls Init()
 	CCanceledFileList();
 	// Save list
-	void	Save();
+	void Save();
 	// Check if hash belongs to a canceled file
-	bool	IsCanceledFile(const CMD4Hash& hash) const;
+	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);
+	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);
+	bool Remove(const CMD4Hash &hash);
 
 private:
 	// The list
 	typedef std::set<CMD4Hash> CanceledFileList;
 	CanceledFileList m_canceledFileList;
 	// The filename "canceled.met"
-	wxString	m_filename;
+	wxString m_filename;
 
 	// Load list from file (if it exists)
-	bool	Init();
+	bool Init();
 };
 
 #endif // CANCELEDFILELIST_H

amule-3.1.0.tar.gz/src/CanonicalPeerIndex.h Added

@@ -0,0 +1,84 @@
+// This file is part of the aMule Project.
+// Copyright (c) 2026 aMule Team ( https://amule-org.github.io )
+// Licensed under the GNU General Public License, version 2 or later.
+
+#ifndef CANONICALPEERINDEX_H
+#define CANONICALPEERINDEX_H
+
+#include "PeerAddressing.h"
+
+#include <map>
+
+/**
+ * Address index shared by production and standalone tests.
+ *
+ * Reference is stored by value: CClientList uses CClientRef, retaining its existing
+ * ownership. Identity predicates select one client within a shared address bucket;
+ * port/hash policy stays with the caller. No mutable map access can bypass address
+ * normalization or insert an absent address. Iterators have std::multimap stability.
+ */
+template <typename Reference> class CCanonicalPeerIndex
+{
+	using Map = std::multimap<CNetworkAddress, Reference>;
+
+public:
+	using const_iterator = typename Map::const_iterator;
+	using Range = std::pair<const_iterator, const_iterator>;
+
+	void Insert(const CNetworkAddress &address, const Reference &reference)
+	{
+		if (PeerAddressing::IsIndexable(address)) {
+			m_entries.emplace(PeerAddressing::IndexKey(address), reference);
+		}
+	}
+
+	Range equal_range(const CNetworkAddress &address) const
+	{
+		return m_entries.equal_range(PeerAddressing::IndexKey(address));
+	}
+
+	template <typename Matches> bool Remove(const CNetworkAddress &address, Matches matches)
+	{
+		auto range = equal_range(address);
+		for (auto it = range.first; it != range.second; ++it) {
+			if (matches(it->second)) {
+				m_entries.erase(it);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	// Called before the owner changes its address. Keep a reference alive across
+	// removal, even when this index is its only owner.
+	template <typename Matches>
+	void Update(const CNetworkAddress &oldAddress,
+		const CNetworkAddress &newAddress,
+		Reference reference,
+		Matches matches)
+	{
+		if (PeerAddressing::IndexKey(oldAddress) == PeerAddressing::IndexKey(newAddress)) {
+			return;
+		}
+		Remove(oldAddress, matches);
+		Insert(newAddress, reference);
+	}
+
+	const_iterator begin() const { return m_entries.begin(); }
+	const_iterator end() const { return m_entries.end(); }
+	const_iterator lower_bound(const CNetworkAddress &address) const
+	{
+		return m_entries.lower_bound(PeerAddressing::IndexKey(address));
+	}
+	typename Map::size_type count(const CNetworkAddress &address) const
+	{
+		return m_entries.count(PeerAddressing::IndexKey(address));
+	}
+	typename Map::size_type size() const { return m_entries.size(); }
+	void clear() { m_entries.clear(); }
+
+private:
+	Map m_entries;
+};
+
+#endif // CANONICALPEERINDEX_H

amule-3.0.1.tar.gz/src/CaptchaDialog.cpp -> amule-3.1.0.tar.gz/src/CaptchaDialog.cpp Changed

@@ -22,33 +22,20 @@
 // 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 "CaptchaDialog.h" // Interface declarations
+#include "muuli_wdr.h"     // Needed for ID_CLOSEWND
 #include "GuiEvents.h"
 
-
-wxBEGIN_EVENT_TABLE(CCaptchaDialog,wxDialog)
+wxBEGIN_EVENT_TABLE(CCaptchaDialog, wxDialog)
 	EVT_BUTTON(wxID_OK, CCaptchaDialog::OnBnClose)
 wxEND_EVENT_TABLE()
 
-
-CCaptchaDialog::CCaptchaDialog(
-	wxWindow *parent,
-	const wxImage& captchaImage,
-	uint64 id)
-:
-wxDialog(
-	parent,
-	-1,
-	_("Enter Captcha"),
-	wxDefaultPosition,
-	wxDefaultSize,
-	wxDEFAULT_DIALOG_STYLE)
+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);
+	wxSizer *content = captchaDlg(this);
 	OnInitDialog();
 	content->SetSizeHints(this);
 	content->Show(this, true);
@@ -60,30 +47,31 @@
 	delete m_captchaBitmap;
 }
 
-void CCaptchaDialog::OnBnClose(wxCommandEvent& WXUNUSED(evt))
+void CCaptchaDialog::OnBnClose(wxCommandEvent &WXUNUSED(evt))
 {
 	Notify_ChatSendCaptcha(m_TextCtrl->GetLineText(0), m_id);
 	Destroy();
 }
 
-wxSizer * CCaptchaDialog::captchaDlg( wxWindow *parent )
+wxSizer *CCaptchaDialog::captchaDlg(wxWindow *parent)
 {
-    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer *item0 = new wxBoxSizer(wxVERTICAL);
 
-    wxStaticBitmap *item1 = new wxStaticBitmap( parent, -1, *m_captchaBitmap, wxDefaultPosition, wxSize(160,60) );
-    item0->Add( item1, wxSizerFlags().Center().Border(wxALL, 5) );
+	wxStaticBitmap *item1 =
+		new wxStaticBitmap(parent, -1, *m_captchaBitmap, wxDefaultPosition, wxSize(160, 60));
+	item0->Add(item1, wxSizerFlags().Center().Border(wxALL, 5));
 
-	m_TextCtrl = new wxTextCtrl( parent, -1, "", wxDefaultPosition, wxSize(80,20));
-    item0->Add( m_TextCtrl, wxSizerFlags().Center().Border(wxALL, 5) );
+	m_TextCtrl = new wxTextCtrl(parent, -1, "", wxDefaultPosition, wxSize(80, 20));
+	item0->Add(m_TextCtrl, wxSizerFlags().Center().Border(wxALL, 5));
 
-    wxButton *item3 = new wxButton( parent, wxID_OK  );
-    item3->SetDefault();
-    item0->Add( item3, wxSizerFlags().Center().Border(wxALL, 5) );
+	wxButton *item3 = new wxButton(parent, wxID_OK);
+	item3->SetDefault();
+	item0->Add(item3, wxSizerFlags().Center().Border(wxALL, 5));
 
-    parent->SetSizer( item0 );
-    item0->SetSizeHints( parent );
+	parent->SetSizer(item0);
+	item0->SetSizeHints(parent);
 
-    return item0;
+	return item0;
 }
 
 bool CCaptchaDialog::OnInitDialog()

amule-3.0.1.tar.gz/src/CaptchaDialog.h -> amule-3.1.0.tar.gz/src/CaptchaDialog.h Changed

@@ -25,17 +25,12 @@
 #ifndef CAPTCHADIALOG_H
 #define CAPTCHADIALOG_H
 
-#include <wx/dialog.h>		// Needed for wxDialog
+#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'.
- *
+ * Shows a peer's captcha image and takes the user's answer. A modal wxDialog whose return value is
+ * always '0'.
  */
 
 class CCaptchaDialog : public wxDialog
@@ -45,39 +40,33 @@
 	 * Constructor.
 	 *
 	 * @param parent The window that created the dialog.
-	 * @param client The client whose details we're showing.
+	 * @param captchaImage The image to show.
+	 * @param id The captcha's id.
 	 */
-	CCaptchaDialog(wxWindow*parent, const wxImage& captchaImage, uint64 id);
+	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.
+	 * 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
+	 * Ends the dialog, calling EndModal with return value 0. @param evt The close event, unused
+	 * right now.
 	 */
-	void OnBnClose(wxCommandEvent& evt);
+	void OnBnClose(wxCommandEvent &evt);
 
 	wxDECLARE_EVENT_TABLE();
 
 private:
+	wxSizer *captchaDlg(wxWindow *parent);
 
-	wxSizer * captchaDlg( wxWindow *parent );
-
-	class wxBitmap * m_captchaBitmap;
-	class wxTextCtrl * m_TextCtrl;
+	class wxBitmap *m_captchaBitmap;
+	class wxTextCtrl *m_TextCtrl;
 	uint64 m_id;
 };
 #endif // CAPTCHADIALOG_H

amule-3.0.1.tar.gz/src/CaptchaGenerator.cpp -> amule-3.1.0.tar.gz/src/CaptchaGenerator.cpp Changed

@@ -30,11 +30,11 @@
 #include <wx/dcmemory.h>
 #include <wx/font.h>
 
-
-#define LETTERSIZE  32
+#define LETTERSIZE 32
 #define CROWDEDSIZE 20
 
-// fairly simply captcha generator, might be improved is spammers think its really worth it solving captchas on aMule
+// fairly simply captcha generator, might be improved is spammers think its really worth it solving captchas
+// on aMule
 
 CCaptchaGenerator::CCaptchaGenerator(uint32 nLetterCount)
 {
@@ -46,7 +46,7 @@
 	static wxString schCaptchaContent = "ABCDEFGHJKLMNPQRSTUVWXYZ123456789";
 	m_strCaptchaText.Clear();
 	// Bitmap must be created with full depth, or it will fail on GTK
-	wxBitmap pimgResult(LETTERSIZE + (nLetterCount-1)*CROWDEDSIZE, 36);
+	wxBitmap pimgResult(LETTERSIZE + (nLetterCount - 1) * CROWDEDSIZE, 36);
 	wxMemoryDC dc(pimgResult);
 	dc.SetBackground(*wxWHITE_BRUSH);
 	dc.Clear();
@@ -63,7 +63,7 @@
 		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)));
+		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) {
@@ -79,7 +79,7 @@
 	// m_pimgCaptcha.SaveFile("captcha.bmp", wxBITMAP_TYPE_BMP);
 }
 
-bool CCaptchaGenerator::WriteCaptchaImage(wxMemoryOutputStream& file)
+bool CCaptchaGenerator::WriteCaptchaImage(wxMemoryOutputStream &file)
 {
 	return m_pimgCaptcha.SaveFile(file, wxBITMAP_TYPE_BMP);
 }

amule-3.0.1.tar.gz/src/CaptchaGenerator.h -> amule-3.1.0.tar.gz/src/CaptchaGenerator.h Changed

amule-3.0.1.tar.gz/src/CatDialog.cpp -> amule-3.1.0.tar.gz/src/CatDialog.cpp Changed

@@ -27,67 +27,60 @@
 #include <wx/colordlg.h>
 
 #ifdef __WINDOWS__
-	#include <io.h> // Do_not_auto_remove
+#include <io.h> // Do_not_auto_remove
 #endif
 
-#include "CatDialog.h"			// Interface declarations.
-#include "DownloadListCtrl.h"		// Needed for CDownloadListCtrl
-#include "TransferWnd.h"		// Needed for CTransferWnd
-#include "amuleDlg.h"			// Needed for CamuleDlg
-#include "SearchDlg.h"			// Needed for UpdateCatChoice
-#include <common/StringFunctions.h>	// Needed for MakeFoldername
-#include "OtherFunctions.h"		// Needed for CastChild
-#include "Preferences.h"		// Needed for CPreferences
-#include "amule.h"			// Needed for theApp
-#include "muuli_wdr.h"			// Needed for CategoriesEditWindow
-
-
-wxBEGIN_EVENT_TABLE(CCatDialog,wxDialog)
-	EVT_BUTTON(wxID_OK,		CCatDialog::OnBnClickedOk)
-	EVT_BUTTON(IDC_CATCOLOR,	CCatDialog::OnBnClickColor)
-	EVT_BUTTON(IDC_BROWSE,		CCatDialog::OnBnClickedBrowse)
+#include "CatDialog.h"              // Interface declarations.
+#include "DownloadListCtrl.h"       // Needed for CDownloadListCtrl
+#include "TransferWnd.h"            // Needed for CTransferWnd
+#include "amuleDlg.h"               // Needed for CamuleDlg
+#include "SearchDlg.h"              // Needed for UpdateCatChoice
+#include <common/StringFunctions.h> // Needed for MakeFoldername
+#include "OtherFunctions.h"         // Needed for CastChild
+#include "Preferences.h"            // Needed for CPreferences
+#include "amule.h"                  // Needed for theApp
+#include "muuli_wdr.h"              // Needed for CategoriesEditWindow
+
+wxBEGIN_EVENT_TABLE(CCatDialog, wxDialog)
+	EVT_BUTTON(wxID_OK, CCatDialog::OnBnClickedOk)
+	EVT_BUTTON(IDC_CATCOLOR, CCatDialog::OnBnClickColor)
+	EVT_BUTTON(IDC_BROWSE, CCatDialog::OnBnClickedBrowse)
 wxEND_EVENT_TABLE()
 
-/*
- * This class is used in both amule and amulegui. It cannot go into
- * libmuleappgui because of preferences. When the compiler must passes
- * here on the remote client, the variable glob_prefs has two different
- * types, in one case it is (CPreferences *), on the other case it is
- * (CPreferencesRem *). A proper fix involves a class hierarchy redesign.
+/**
+ * Used in both amule and amulegui. It cannot go into libmuleappgui because of preferences: on the
+ * remote client glob_prefs has a different type, (CPreferencesRem *) rather than (CPreferences *).
+ * A proper fix involves a class hierarchy redesign.
  */
-CCatDialog::CCatDialog(wxWindow* parent, bool allowbrowse, int index)
-:
-wxDialog(parent, -1, _("Category"),
-	wxDefaultPosition, wxDefaultSize,
-	wxDEFAULT_DIALOG_STYLE|wxSYSTEM_MENU)
+CCatDialog::CCatDialog(wxWindow *parent, bool allowbrowse, int index)
+: wxDialog(parent, -1, _("Category"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
-	wxSizer* content = CategoriesEditWindow(this, true);
+	wxSizer *content = CategoriesEditWindow(this, true);
 	content->Show(this, true);
 	Center();
 	m_category = NULL;
 
-	// Attempt to get the specified category, this may or may not succeed,
-	// we dont really care. If it fails (too high index or such), then we
-	// simply get NULL and create a new category
+	// Try to get the specified category; success does not matter. On failure (too high an
+	// index, say) we get NULL and create a new category.
 	if (index > -1) {
 		m_category = theApp->glob_prefs->GetCategory(index);
 	}
 
 	if (m_category) {
 		// Filling values by the specified category
-		CastChild(IDC_TITLE,	wxTextCtrl)->SetValue(m_category->title);
+		CastChild(IDC_TITLE, wxTextCtrl)->SetValue(m_category->title);
 		// We use the 'raw' filename, since the value is also passed to wxDirSelector
-		CastChild(IDC_INCOMING,	wxTextCtrl)->SetValue(m_category->path.GetRaw());
-		CastChild(IDC_COMMENT,	wxTextCtrl)->SetValue(m_category->comment);
-		CastChild(IDC_PRIOCOMBO,wxChoice)->SetSelection(m_category->prio);
+		CastChild(IDC_INCOMING, wxTextCtrl)->SetValue(m_category->path.GetRaw());
+		CastChild(IDC_COMMENT, wxTextCtrl)->SetValue(m_category->comment);
+		CastChild(IDC_PRIOCOMBO, wxChoice)->SetSelection(m_category->prio);
 
 		m_colour = CMuleColour(m_category->color);
 	} else {
 		// Default values for new categories
-		CastChild(IDC_TITLE,	wxTextCtrl)->SetValue(_("New Category"));
-		CastChild(IDC_INCOMING,	wxTextCtrl)->SetValue(thePrefs::GetIncomingDir().GetRaw());
-		CastChild(IDC_COMMENT,	wxTextCtrl)->SetValue("");
-		CastChild(IDC_PRIOCOMBO,wxChoice)->SetSelection(0);
+		CastChild(IDC_TITLE, wxTextCtrl)->SetValue(_("New Category"));
+		CastChild(IDC_INCOMING, wxTextCtrl)->SetValue(thePrefs::GetIncomingDir().GetRaw());
+		CastChild(IDC_COMMENT, wxTextCtrl)->SetValue("");
+		CastChild(IDC_PRIOCOMBO, wxChoice)->SetSelection(0);
 
 		m_colour = CMuleColour(rand() % 255, rand() % 255, rand() % 255);
 	}
@@ -99,11 +92,7 @@
 	}
 }
 
-
-CCatDialog::~CCatDialog()
-{
-}
-
+CCatDialog::~CCatDialog() {}
 
 wxBitmap CCatDialog::MakeBitmap()
 {
@@ -116,29 +105,24 @@
 	return bitmap;
 }
 
-
-void CCatDialog::OnBnClickedBrowse(wxCommandEvent& WXUNUSED(evt))
+void CCatDialog::OnBnClickedBrowse(wxCommandEvent &WXUNUSED(evt))
 {
 	wxString dir = CastChild(IDC_INCOMING, wxTextCtrl)->GetValue();
 
 	dir = wxDirSelector(
-		_("Choose a folder for incoming files"),
-		dir, wxDD_DEFAULT_STYLE, wxDefaultPosition, this);
+		_("Choose a folder for incoming files"), dir, wxDD_DEFAULT_STYLE, wxDefaultPosition, this);
 	if (!dir.IsEmpty()) {
 		CastChild(IDC_INCOMING, wxTextCtrl)->SetValue(dir);
 	}
 }
 
-
-void CCatDialog::OnBnClickedOk(wxCommandEvent& WXUNUSED(evt))
+void CCatDialog::OnBnClickedOk(wxCommandEvent &WXUNUSED(evt))
 {
 	wxString newname = CastChild(IDC_TITLE, wxTextCtrl)->GetValue();
 
 	// No empty names
 	if (newname.IsEmpty()) {
-		wxMessageBox(
-			_("You must specify a name for the category!"),
-			_("Info"), wxOK, this);
+		wxMessageBox(_("You must specify a name for the category!"), _("Info"), wxOK, this);
 		return;
 	}
 
@@ -146,31 +130,29 @@
 
 	// No empty dirs please
 	if (!newpath.IsOk()) {
-		wxMessageBox(
-			_("You must specify a path for the category!"),
-			_("Info"), wxOK, this);
+		wxMessageBox(_("You must specify a path for the category!"), _("Info"), wxOK, this);
 
 		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.
+	// Remote gui: pass the path unchecked, and do not try to create it on the wrong machine. It
+	// is checked on the server, which produces an error message.
 #ifndef CLIENT_GUI
 	if (!newpath.DirExists()) {
 		if (!CPath::MakeDir(newpath)) {
-			wxMessageBox(_("Failed to create incoming dir for category. Please specify a valid path!"),
-				_("Info"), wxOK, this);
+			wxMessageBox(
+				_("Failed to create incoming dir for category. Please specify a valid path!"),
+				_("Info"),
+				wxOK,
+				this);
 			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
-	// from remote gui, while local gui amule have dialog opened in this
-	// category.
+	// Check whether we are using an existing category and whether it has been removed
+	// meanwhile; otherwise create a new one. lfroen: the only way that happens is removing a
+	// category from the remote gui while a local gui amule has a dialog open on it.
 	int index = -1;
 	if (m_category) {
 		// Check if the original category still exists
@@ -189,19 +171,28 @@
 
 	if (!m_category) {
 		// New category, or the old one is gone
-		 theApp->glob_prefs->CreateCategory(
-			m_category, newname, newpath,
+		theApp->glob_prefs->CreateCategory(m_category,
+			newname,
+			newpath,
 			CastChild(IDC_COMMENT, wxTextCtrl)->GetValue(),
 			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_colour.GetULong(),
-		CastChild(IDC_PRIOCOMBO, wxChoice)->GetSelection());
+		theApp->glob_prefs->UpdateCategory(index,
+			newname,
+			newpath,
+			CastChild(IDC_COMMENT, wxTextCtrl)->GetValue(),
+			m_colour.GetULong(),
+			CastChild(IDC_PRIOCOMBO, wxChoice)->GetSelection());
 
 		theApp->amuledlg->m_transferwnd->UpdateCategory(index);
+		// UpdateCategory() may have asked for a shared-files re-walk, when the category's
+		// path changed. It is deliberately not run here: this dialog is modal and about to
+		// EndModal, and opening an app-modal progress dialog on top of one that is closing
+		// invites platform-specific misbehaviour. CTransferWnd runs it after ShowModal()
+		// returns instead, parented to the main window.
 		theApp->amuledlg->m_transferwnd->downloadlistctrl->Refresh();
 		theApp->amuledlg->m_searchwnd->UpdateCatChoice();
 	}
@@ -209,8 +200,7 @@
 	EndModal(wxID_OK);
 }
 
-
-void CCatDialog::OnBnClickColor(wxCommandEvent& WXUNUSED(evt))
+void CCatDialog::OnBnClickColor(wxCommandEvent &WXUNUSED(evt))
 {
 	wxColour newcol = wxGetColourFromUser(this, m_colour);
 	if (newcol.Ok()) {

amule-3.0.1.tar.gz/src/CatDialog.h -> amule-3.1.0.tar.gz/src/CatDialog.h Changed

@@ -26,8 +26,8 @@
 #ifndef CATDIALOG_H
 #define CATDIALOG_H
 
-#include <wx/dialog.h>		// Needed for wxDialog
-#include "Types.h"		// Needed for uint32
+#include <wx/dialog.h> // Needed for wxDialog
+#include "Types.h"     // Needed for uint32
 #include "OtherStructs.h"
 #include "MuleColour.h"
 
@@ -35,16 +35,13 @@
 class wxBitmap;
 
 /**
- * This dialog takes of displaying either existing or new categories, so that
- * the user can add or change them.
+ * Displays an existing or new category so the user can add or change it.
  *
- * It is a self-contained entity, and does not rely on the categories staying
- * the same while the dialog is visible, though it will overwrite any changes
- * made to the selected category in the mean time. Also, if the selected category
- * has been deleted then it will simply be readded.
+ * Self-contained: it does not rely on the categories staying the same while it is visible, though
+ * it overwrites any change made to the selected category meanwhile, and re-adds the selected
+ * category if it was deleted.
  *
- * It does however rely on the Transferwnd keeping its own list of categories up-
- * to-date.
+ * It does rely on Transferwnd keeping its own category list up to date.
  */
 class CCatDialog : public wxDialog
 {
@@ -53,49 +50,39 @@
 	 * Constructor.
 	 *
 	 * @param parent The parent of the new dialog.
-	 * @param catindex The category to be edited.
-	 *
-	 * The parameter catindex can be a valid index, in which case that category
-	 * will be selected, or it can be less than zero, in which case a new
-	 * category will be created.
+	 * @param catindex A valid index selects that category; less than zero creates a new one.
 	 */
-	CCatDialog(wxWindow* parent, bool allowbrowse, int catindex = -1 );
+	CCatDialog(wxWindow *parent, bool allowbrowse, int catindex = -1);
 
-	/**
-	 * Destructor.
-	 */
 	~CCatDialog();
 
 private:
 	/**
-	 * Helper function for making the color-preview.
-	 *
-	 * This function creates a single-color 16x16 image, using the
-	 * m_colour member variable.
+	 * Helper for the colour preview: a single-colour 16x16 image built from the m_colour
+	 * member.
 	 */
 	wxBitmap MakeBitmap();
 
 	//! Variable used to store the user-selected color.
-	CMuleColour			m_colour;
+	CMuleColour m_colour;
 
 	//! Pointer to category to be edited or NULL if we are adding a new category.
-	Category_Struct*	m_category;
-
+	Category_Struct *m_category;
 
 	/**
-	 * Event-handler for selecting incoming dir.
+	 * Event handler: select the incoming dir.
 	 */
-	void OnBnClickedBrowse(wxCommandEvent& evt);
+	void OnBnClickedBrowse(wxCommandEvent &evt);
 
 	/**
-	 * Event-handler for saving the changes.
+	 * Event handler: save the changes.
 	 */
-	void OnBnClickedOk(wxCommandEvent& evt);
+	void OnBnClickedOk(wxCommandEvent &evt);
 
 	/**
-	 * Event-handler for selecting category color.
+	 * Event handler: select the category colour.
 	 */
-	void OnBnClickColor(wxCommandEvent& evt);
+	void OnBnClickColor(wxCommandEvent &evt);
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.0.1.tar.gz/src/ChatSelector.cpp -> amule-3.1.0.tar.gz/src/ChatSelector.cpp Changed

@@ -27,113 +27,112 @@
 #include <wx/imaglist.h>
 #include <wx/datetime.h>
 
-#include <wx/artprov.h>           // Needed for wxArtProvider::GetBitmap
-#include "ChatSelector.h"	// Interface declarations
-#include "Preferences.h"	// Needed for CPreferences
-#include "amule.h"			// Needed for theApp
-#include "ClientRef.h"		// Needed for CClientRef
+#include <wx/artprov.h>   // Needed for wxArtProvider::GetBitmap
+#include "ChatSelector.h" // Interface declarations
+#include "Preferences.h"  // Needed for CPreferences
+#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
+#include "Constants.h" // Needed for MS_NONE
 
-//#warning Needed while not ported
+// #warning Needed while not ported
 #include "ClientList.h"
-#include <common/Format.h>		// Needed for CFormat
-
+#include <common/Format.h> // Needed for CFormat
 
 // Default colors,
-#define COLOR_BLACK wxTextAttr( wxColor(   0,   0,   0 ) )
-#define COLOR_BLUE  wxTextAttr( wxColor(   0,   0, 255 ) )
-#define COLOR_GREEN wxTextAttr( wxColor(   0, 102,   0 ) )
-#define COLOR_RED   wxTextAttr( wxColor( 255,   0,   0 ) )
-
-CChatSession::CChatSession(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name)
-: CMuleTextCtrl( parent, id, value, pos, size, style | wxTE_READONLY | wxTE_RICH | wxTE_MULTILINE, validator, name )
+#define COLOR_BLACK wxTextAttr(wxColor(0, 0, 0))
+#define COLOR_BLUE wxTextAttr(wxColor(0, 0, 255))
+#define COLOR_GREEN wxTextAttr(wxColor(0, 102, 0))
+#define COLOR_RED wxTextAttr(wxColor(255, 0, 0))
+
+CChatSession::CChatSession(wxWindow *parent,
+	wxWindowID id,
+	const wxString &value,
+	const wxPoint &pos,
+	const wxSize &size,
+	long style,
+	const wxValidator &validator,
+	const wxString &name)
+: CMuleTextCtrl(
+	  parent, id, value, pos, size, style | wxTE_READONLY | wxTE_RICH | wxTE_MULTILINE, validator, name)
 {
 	m_client_id = 0;
 	m_active = false;
 	SetBackgroundColour(*wxWHITE);
 }
 
-
 CChatSession::~CChatSession()
 {
-	//#warning EC NEEDED
-	#ifndef CLIENT_GUI
-	theApp->clientlist->SetChatState(m_client_id,MS_NONE);
-	#endif
+// #warning EC NEEDED
+#ifndef CLIENT_GUI
+	theApp->clientlist->SetChatState(m_client_id, MS_NONE);
+#endif
 }
 
-
-void CChatSession::AddText(const wxString& text, const wxTextAttr& style, bool newline)
+void CChatSession::AddText(const wxString &text, const wxTextAttr &style, bool newline)
 {
 	// Split multi-line messages into individual lines
-	wxStringTokenizer tokens( text, "\n" );
+	wxStringTokenizer tokens(text, "\n");
 
-	while ( tokens.HasMoreTokens() ) {
+	while (tokens.HasMoreTokens()) {
 		// Check if we should add a time-stamp
-		if ( GetNumberOfLines() > 1 ) {
+		if (GetNumberOfLines() > 1) {
 			// Check if the last line ended with a newline
-			wxString line = GetLineText( GetNumberOfLines() - 1 );
-			if ( line.IsEmpty() ) {
-				SetDefaultStyle( COLOR_BLACK );
+			wxString line = GetLineText(GetNumberOfLines() - 1);
+			if (line.IsEmpty()) {
+				SetDefaultStyle(COLOR_BLACK);
 
-				AppendText( " " + wxDateTime::Now().FormatISOTime() + " " );
+				AppendText(" " + wxDateTime::Now().Format("%X") + " ");
 			}
 		}
 
 		SetDefaultStyle(style);
 
-		AppendText( tokens.GetNextToken() );
+		AppendText(tokens.GetNextToken());
 
 		// Only add newlines after the last line if it is desired
-		if ( tokens.HasMoreTokens() || newline ) {
-			AppendText( "\n" );
+		if (tokens.HasMoreTokens() || newline) {
+			AppendText("\n");
 		}
 	}
 }
 
-
-
-
-CChatSelector::CChatSelector(wxWindow* parent, wxWindowID id, const wxPoint& pos, wxSize siz, long style)
+CChatSelector::CChatSelector(wxWindow *parent, wxWindowID id, const wxPoint &pos, wxSize siz, long style)
 : CMuleNotebook(parent, id, pos, siz, style)
 {
-	wxImageList* imagelist = new wxImageList(16,16);
+	wxImageList *imagelist = new wxImageList(16, 16);
 
 	// Chat icon -- default state
 	imagelist->Add(wxArtProvider::GetBitmap("amule:chat"));
 	// Close icon -- on mouseover
-	imagelist->Add(amuleSpecial(4));
+	imagelist->Add(ThemedCloseIcon(wxSize(16, 16)));
 
 	AssignImageList(imagelist);
 }
 
-CChatSession* CChatSelector::StartSession(uint64 client_id, const wxString& client_name, bool show)
+CChatSession *CChatSelector::StartSession(uint64 client_id, const wxString &client_name, bool show)
 {
 	// Check to see if we've already opened a session for this user
-	if ( GetPageByClientID( client_id ) ) {
-		if ( show ) {
-		  SetSelection( GetTabByClientID( client_id ) );
+	if (GetPageByClientID(client_id)) {
+		if (show) {
+			SetSelection(GetTabByClientID(client_id));
 		}
 
 		return NULL;
 	}
 
-	CChatSession* chatsession = new CChatSession(this);
+	CChatSession *chatsession = new CChatSession(this);
 
 	chatsession->m_client_id = client_id;
 
 	wxString text;
-	text = wxString(" *** ") + wxString(CFormat(_("Chat-Session Started: %s (%s:%u) - %s %s"))
-			% client_name
-			% Uint32toStringIP(IP_FROM_GUI_ID(client_id))
-			% PORT_FROM_GUI_ID(client_id)
-			% wxDateTime::Now().FormatISODate()
-			% wxDateTime::Now().FormatISOTime());
-
-	chatsession->AddText( text, COLOR_RED );
+	text = wxString(" *** ") +
+	       wxString(CFormat(_("Chat-Session Started: %s (%s:%u) - %s %s")) % client_name %
+			Uint32toStringIP(IP_FROM_GUI_ID(client_id)) % PORT_FROM_GUI_ID(client_id) %
+			FormatLocalDate(wxDateTime::Now()) % wxDateTime::Now().Format("%X"));
+
+	chatsession->AddText(text, COLOR_RED);
 	AddPage(chatsession, client_name, show, 0);
 
 	CUserEvents::ProcessEvent(CUserEvents::NewChatSession, &client_name);
@@ -141,13 +140,12 @@
 	return chatsession;
 }
 
-
-CChatSession* CChatSelector::GetPageByClientID(uint64 client_id)
+CChatSession *CChatSelector::GetPageByClientID(uint64 client_id)
 {
-	for ( unsigned int i = 0; i < (unsigned int ) GetPageCount(); i++ ) {
-		CChatSession* page = static_cast<CChatSession*>(GetPage(i));
+	for (unsigned int i = 0; i < (unsigned int)GetPageCount(); i++) {
+		CChatSession *page = static_cast<CChatSession *>(GetPage(i));
 
-		if( page->m_client_id == client_id ) {
+		if (page->m_client_id == client_id) {
 			return page;
 		}
 	}
@@ -155,13 +153,12 @@
 	return NULL;
 }
 
-
 int CChatSelector::GetTabByClientID(uint64 client_id)
 {
-	for ( unsigned int i = 0; i < (unsigned int) GetPageCount(); i++ ) {
-		CChatSession* page = static_cast<CChatSession*>(GetPage(i));
+	for (unsigned int i = 0; i < (unsigned int)GetPageCount(); i++) {
+		CChatSession *page = static_cast<CChatSession *>(GetPage(i));
 
-		if( page->m_client_id == client_id ) {
+		if (page->m_client_id == client_id) {
 			return i;
 		}
 	}
@@ -169,10 +166,9 @@
 	return -1;
 }
 
-
-bool CChatSelector::ProcessMessage(uint64 sender_id, const wxString& message)
+bool CChatSelector::ProcessMessage(uint64 sender_id, const wxString &message)
 {
-	CChatSession* session = GetPageByClientID(sender_id);
+	CChatSession *session = GetPageByClientID(sender_id);
 
 	// Try to get the name (core sent it?)
 	int separator = message.Find("|");
@@ -180,7 +176,7 @@
 	wxString client_message;
 	if (separator != -1) {
 		client_name = message.Left(separator);
-		client_message = message.Mid(separator+1);
+		client_message = message.Mid(separator + 1);
 	} else {
 		// No need to define client_name. If needed, will be build on tab creation.
 		client_message = message;
@@ -188,38 +184,55 @@
 
 	bool newtab = !session;
 
-	if ( !session ) {
+	if (!session) {
 		// This must be a message from a client that is not already chatting
 		if (client_name.IsEmpty()) {
-			// Core did not send us the name.
-			// This must NOT happen.
-			// Build a client name based on the ID
-			uint32 ip = IP_FROM_GUI_ID(sender_id);
-			client_name = CFormat("IP: %s Port: %u") % Uint32toStringIP(ip) % PORT_FROM_GUI_ID(sender_id);
+			// The core did not send us the name, which must NOT happen. Build a client
+			// name from the ID.
+			client_name = ChatPeerFallbackName(sender_id);
 		}
 
-		session = StartSession( sender_id, client_name, true );
+		session = StartSession(sender_id, client_name, true);
 	}
 
 	// Other client connected after disconnection or a new session
-	if ( !session->m_active ) {
+	if (!session->m_active) {
 		session->m_active = true;
 
-		session->AddText( _("*** Connected to Client ***"), COLOR_RED );
+		session->AddText(_("*** Connected to Client ***"), COLOR_RED);
 	}
 
 	// Page text is client name
-	session->AddText( GetPageText(GetTabByClientID(sender_id)), COLOR_BLUE, false );
-	session->AddText( ": " + client_message, COLOR_BLACK );
+	session->AddText(GetPageText(GetTabByClientID(sender_id)), COLOR_BLUE, false);
+	session->AddText(": " + client_message, COLOR_BLACK);
 
 	return newtab;
 }
 
-bool CChatSelector::SendMessage( const wxString& message, const wxString& client_name, uint64 to_id )
+void CChatSelector::AppendStoredMessage(
+	uint64 gui_id, const wxString &name, const wxString &text, bool outgoing)
+{
+	CChatSession *session = GetPageByClientID(gui_id);
+	if (!session) {
+		// show=false: a session can appear on its own -- opened by another client, or by a
+		// peer messaging us -- and must not pull the selection away from whatever the local
+		// user is doing.
+		session = StartSession(gui_id, name, false);
+		if (!session) {
+			return;
+		}
+	}
+	session->m_active = true;
+	session->AddText(
+		outgoing ? thePrefs::GetUserNick() : name, outgoing ? COLOR_GREEN : COLOR_BLUE, false);
+	session->AddText(": " + text, COLOR_BLACK);
+}
+
+bool CChatSelector::SendMessage(const wxString &message, const wxString &client_name, uint64 to_id)
 {
 	// Dont let the user send empty messages
 	// This is also a user-fix for people who mash the enter-key ...
-	if ( message.IsEmpty() ) {
+	if (message.IsEmpty()) {
 		return false;
 	}
 
@@ -237,32 +250,39 @@
 		return false;
 	}
 
-	CChatSession* ci = static_cast<CChatSession*>(GetPage(usedtab));
+	CChatSession *ci = static_cast<CChatSession *>(GetPage(usedtab));
 
 	ci->m_active = true;
 
-	//#warning EC needed here.
-
-	#ifndef CLIENT_GUI
+#ifdef CLIENT_GUI
+	// amulegui sends through the daemon and deliberately does NOT echo the line locally: the
+	// core records every outbound message in the chat session store, so the next
+	// EC_OP_GET_CHAT_SESSIONS poll returns it and renders it here. Echoing as well would print
+	// it twice, and printing it from the poll is also what keeps the ordering the core sees.
+	CECPacket req(EC_OP_CHAT_SEND);
+	req.AddTag(CECTag(EC_TAG_CHAT, message));
+	req.AddTag(CECTag(EC_TAG_CHAT_CLIENT_ID, ci->m_client_id));
+	theApp->m_connect->SendPacket(&req);
+#else
 	if (theApp->clientlist->SendChatMessage(ci->m_client_id, message)) {
-		ci->AddText( thePrefs::GetUserNick(), COLOR_GREEN, false );
-		ci->AddText( ": " + message, COLOR_BLACK );
+		ci->AddText(thePrefs::GetUserNick(), COLOR_GREEN, false);
+		ci->AddText(": " + message, COLOR_BLACK);
 	} else {
-		ci->AddText( _("*** Connecting to Client ***"), COLOR_RED );
+		ci->AddText(_("*** Connecting to Client ***"), COLOR_RED);
 	}
-	#endif
+#endif
 
 	return true;
 }
 
-//#warning Creteil?  I know you are here Creteil... follow the white rabbit.
+// #warning Creteil?  I know you are here Creteil... follow the white rabbit.
 /* Madcat - knock knock ...
-           ,-.,-.
-            \ \\ \
-             \ \\_\
-             /     \
-          __|    a a|
-        /`   `'. = y)=
+	   ,-.,-.
+	    \ \\ \
+	     \ \\_\
+	     /     \
+	  __|    a a|
+	/`   `'. = y)=
        /        `"`}
      _|    \       }
     { \     ),   //
@@ -270,29 +290,27 @@
    jgs (______)\_)_)
 */
 
-
-void CChatSelector::ConnectionResult(bool success, const wxString& message, uint64 id)
+void CChatSelector::ConnectionResult(bool success, const wxString &message, uint64 id)
 {
-	CChatSession* ci = GetPageByClientID(id);
-	if ( !ci ) {
+	CChatSession *ci = GetPageByClientID(id);
+	if (!ci) {
 		return;
 	}
 
-	if ( !success ) {
-		ci->AddText( _("*** Failed to Connect to client / Connection lost ***"), COLOR_RED );
+	if (!success) {
+		ci->AddText(_("*** Failed to Connect to client / Connection lost ***"), COLOR_RED);
 
 		ci->m_active = false;
 	} else {
 		// Kry - Woops, fix for the everlasting void message sending.
-		if ( !message.IsEmpty() ) {
-			ci->AddText( _("*** Connected to Client ***"), COLOR_RED );
-			ci->AddText( thePrefs::GetUserNick(), COLOR_GREEN, false );
-			ci->AddText( ": " + message, COLOR_BLACK );
+		if (!message.IsEmpty()) {
+			ci->AddText(_("*** Connected to Client ***"), COLOR_RED);
+			ci->AddText(thePrefs::GetUserNick(), COLOR_GREEN, false);
+			ci->AddText(": " + message, COLOR_BLACK);
 		}
 	}
 }
 
-
 void CChatSelector::EndSession(uint64 client_id)
 {
 	int usedtab;
@@ -309,50 +327,49 @@
 	DeletePage(usedtab);
 }
 
-
 // Refresh the tab associated with a client
-void CChatSelector::RefreshFriend(uint64 toupdate_id, const wxString& new_name)
+void CChatSelector::RefreshFriend(uint64 toupdate_id, const wxString &new_name)
 {
-	wxASSERT( toupdate_id );
+	wxASSERT(toupdate_id);
 
 	int tab = GetTabByClientID(toupdate_id);
 
 	if (tab != -1) {
 		// This client has a tab.
-		SetPageText(tab,new_name);
+		SetPageText(tab, new_name);
 	} else {
 		// This client has no tab (friend disconnecting, etc)
 		// 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 );
+	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
+bool CChatSelector::GetCurrentClient(CClientRef &) const
 {
 	return false;
 }
 #else
-bool CChatSelector::GetCurrentClient(CClientRef& clientref) const
+bool CChatSelector::GetCurrentClient(CClientRef &clientref) const
 {
 	// Get the chat session associated with the active tab
-	CChatSession* ci = static_cast<CChatSession*>(GetPage(GetSelection()));
+	CChatSession *ci = static_cast<CChatSession *>(GetPage(GetSelection()));
 
 	// Get the client that the session is open to
 	if (ci) {
-		CUpDownClient * client = theApp->clientlist->FindClientByIP(IP_FROM_GUI_ID(ci->m_client_id), PORT_FROM_GUI_ID(ci->m_client_id));
+		CUpDownClient *client = theApp->clientlist->FindClientByIP(
+			IP_FROM_GUI_ID(ci->m_client_id), PORT_FROM_GUI_ID(ci->m_client_id));
 		if (client) {
 			clientref.Link(client CLIENT_DEBUGSTRING("CChatSelector::GetCurrentClient"));
 			return true;

amule-3.0.1.tar.gz/src/ChatSelector.h -> amule-3.1.0.tar.gz/src/ChatSelector.h Changed

@@ -28,23 +28,29 @@
 
 #include "MuleTextCtrl.h"
 #include "MuleNotebook.h"
-#include "Types.h"				// Needed for uint16
+#include "Types.h" // Needed for uint16
 
 class CClientRef;
 class CFriend;
 
-
 /**
- * This class is used to display chat sessions.
+ * Displays chat sessions.
  */
 class CChatSession : public CMuleTextCtrl
 {
 public:
-	CChatSession(wxWindow *parent, wxWindowID id = -1, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr );
+	CChatSession(wxWindow *parent,
+		wxWindowID id = -1,
+		const wxString &value = "",
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
+		long style = 0,
+		const wxValidator &validator = wxDefaultValidator,
+		const wxString &name = wxTextCtrlNameStr);
 	~CChatSession();
 
-	uint64	m_client_id;
-	bool	m_active;
+	uint64 m_client_id;
+	bool m_active;
 
 	/**
 	 * Appends the specified text.
@@ -53,29 +59,38 @@
 	 * @param style The style of the new text.
 	 * @param newline If a newline should be added to the end of the line.
 	 *
-	 * If newline is false, then no newlines will be at the end of added text,
-	 * even if the passed string ends with newlines. Multiline strings are
-	 * broken into individual lines and each are timestamped with the same date.
+	 * With @a newline false the added text never ends in a newline, even if the passed string
+	 * does. Multiline strings are broken into individual lines, each timestamped with the same
+	 * date.
 	 */
-	void AddText( const wxString& text, const wxTextAttr& style, bool newline = true );
+	void AddText(const wxString &text, const wxTextAttr &style, bool newline = true);
 };
 
-
 class CChatSelector : public CMuleNotebook
 {
 public:
-	CChatSelector(wxWindow* parent, wxWindowID id, const wxPoint& pos, wxSize siz, long style);
-	virtual			~CChatSelector() {};
-	CChatSession*	StartSession(uint64 client_id, const wxString& client_name, bool show = true);
-	void			EndSession(uint64 client_id = 0);
-	CChatSession*	GetPageByClientID(uint64 client_id);
-	int				GetTabByClientID(uint64 client_id);
-	bool			ProcessMessage(uint64 sender_id, const wxString& message);
-	bool			SendMessage(const wxString& message, const wxString& client_name = "", 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;
+	CChatSelector(wxWindow *parent, wxWindowID id, const wxPoint &pos, wxSize siz, long style);
+	virtual ~CChatSelector() {};
+	CChatSession *StartSession(uint64 client_id, const wxString &client_name, bool show = true);
+	void EndSession(uint64 client_id = 0);
+	CChatSession *GetPageByClientID(uint64 client_id);
+	int GetTabByClientID(uint64 client_id);
+	bool ProcessMessage(uint64 sender_id, const wxString &message);
+
+	/**
+	 * Render one message the core's session store already holds.
+	 *
+	 * Distinct from ProcessMessage, which parses the "name|text" wire form and always announces
+	 * the message. This takes an already decoded message with its direction, and does NOT touch
+	 * the new-message blink -- the caller decides that, because replaying history on connect
+	 * must not light the Messages button up for messages already read elsewhere.
+	 */
+	void AppendStoredMessage(uint64 gui_id, const wxString &name, const wxString &text, bool outgoing);
+	bool SendMessage(const wxString &message, const wxString &client_name = "", 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-3.1.0.tar.gz/src/ChatSessionStore.cpp Added

@@ -0,0 +1,133 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "ChatSessionStore.h"
+
+#include "OtherFunctions.h" // IP_FROM_GUI_ID / PORT_FROM_GUI_ID
+
+#include <algorithm>
+#include <ctime>
+
+CChatSessionStore::Session &CChatSessionStore::Touch(uint64 gui_id, const wxString &name)
+{
+	const uint32 now = static_cast<uint32>(time(nullptr));
+
+	for (auto it = m_sessions.begin(); it != m_sessions.end(); ++it) {
+		if (it->gui_id != gui_id) {
+			continue;
+		}
+		// Only overwrite the name when the caller actually has one. An outbound message
+		// carries none, and a peer that has not sent its nick yet reports empty -- neither
+		// should erase a name we already learnt from an earlier inbound message.
+		if (!name.IsEmpty()) {
+			it->name = name;
+		}
+		it->last_activity = now;
+		// Move to front: activity order is what Sessions() returns and what
+		// eviction walks backwards through.
+		if (it != m_sessions.begin()) {
+			m_sessions.splice(m_sessions.begin(), m_sessions, it);
+		}
+		return m_sessions.front();
+	}
+
+	Session s;
+	s.gui_id = gui_id;
+	s.name = name;
+	s.ip = static_cast<uint32>(IP_FROM_GUI_ID(gui_id));
+	s.port = static_cast<uint16>(PORT_FROM_GUI_ID(gui_id));
+	s.last_activity = now;
+	m_sessions.push_front(std::move(s));
+	EvictSessionsIfNeeded();
+	return m_sessions.front();
+}
+
+uint32 CChatSessionStore::Append(Session &s, uint8 direction, const wxString &text)
+{
+	Message m;
+	// Pre-increment: id 0 is reserved as the "no cursor / nothing yet"
+	// sentinel every reader uses, so the first real message is 1.
+	m.id = ++m_lastMsgId;
+	m.direction = direction;
+	m.timestamp = static_cast<uint32>(time(nullptr));
+	m.text = text;
+	s.messages.push_back(std::move(m));
+	while (s.messages.size() > MAX_MESSAGES_PER_SESSION) {
+		s.messages.pop_front();
+	}
+	return m_lastMsgId;
+}
+
+uint32 CChatSessionStore::AddIncoming(uint64 gui_id, const wxString &name, const wxString &text)
+{
+	return Append(Touch(gui_id, name), DIR_IN, text);
+}
+
+uint32 CChatSessionStore::AddOutgoing(uint64 gui_id, const wxString &text)
+{
+	return Append(Touch(gui_id, wxEmptyString), DIR_OUT, text);
+}
+
+bool CChatSessionStore::CloseSession(uint64 gui_id)
+{
+	for (auto it = m_sessions.begin(); it != m_sessions.end(); ++it) {
+		if (it->gui_id == gui_id) {
+			m_sessions.erase(it);
+			return true;
+		}
+	}
+	return false;
+}
+
+const CChatSessionStore::Session *CChatSessionStore::Find(uint64 gui_id) const
+{
+	for (const Session &s : m_sessions) {
+		if (s.gui_id == gui_id) {
+			return &s;
+		}
+	}
+	return nullptr;
+}
+
+std::vector<const CChatSessionStore::Session *> CChatSessionStore::Sessions() const
+{
+	std::vector<const Session *> out;
+	out.reserve(m_sessions.size());
+	for (const Session &s : m_sessions) {
+		out.push_back(&s);
+	}
+	return out;
+}
+
+void CChatSessionStore::EvictSessionsIfNeeded()
+{
+	// Least recently active first, i.e. from the back. Note this drops a conversation whole
+	// rather than trimming it: a client tracking that GUI_ID sees it vanish from the session
+	// list and closes its tab, the same rule a session closed by another client follows.
+	while (m_sessions.size() > MAX_SESSIONS) {
+		m_sessions.pop_back();
+	}
+}
+
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/ChatSessionStore.h Added

@@ -0,0 +1,125 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 CHATSESSIONSTORE_H
+#define CHATSESSIONSTORE_H
+
+#include "Types.h" // uint64 / uint32 / uint8
+
+#include <deque>
+#include <list>
+#include <vector>
+
+#include <wx/string.h>
+
+// The core's record of who we are chatting with and what was said.
+//
+// Chat used to exist only inside the monolithic GUI's notebook tabs, which left nothing for EC to
+// serve and no way for two clients to agree on the transcript. This store moves the model into the
+// core so the local GUI, amulegui and amuleapi are three views of one conversation rather than
+// three private ones.
+//
+// Compiled into both `amule` and `amuled` -- no GUI dependency. Owned by CamuleApp, fed at the two
+// existing choke points (CUpDownClient::ProcessChatMessage inbound, CClientList::SendChatMessage
+// outbound).
+//
+// In-memory only: an amuled restart empties it, which is what the monolithic GUI already does (the
+// transcript dies with the notebook page). Persisting it is a self-contained follow-up that needs
+// no EC change.
+//
+// **Threading:** every mutator runs on the main thread, from the packet handlers and the EC request
+// handlers, exactly like CClientList. No locking, deliberately -- a mutex here would imply off-
+// thread callers that do not exist.
+class CChatSessionStore
+{
+public:
+	enum Direction : uint8
+	{
+		DIR_IN = 0,  //!< received from the peer
+		DIR_OUT = 1, //!< sent by us, from any client
+	};
+
+	struct Message
+	{
+		uint32 id = 0; //!< monotonic across the whole store, never reused
+		uint8 direction = DIR_IN;
+		uint32 timestamp = 0; //!< unix seconds, stamped by the core
+		wxString text;
+	};
+
+	struct Session
+	{
+		uint64 gui_id = 0; //!< GUI_ID(ip, port) -- the key
+		wxString name;     //!< peer display name; may be empty
+		uint32 ip = 0;
+		uint16 port = 0;
+		uint32 last_activity = 0; //!< unix seconds, drives session eviction
+		std::deque<Message> messages;
+
+		//! Highest message id in this session, 0 when it holds none.
+		uint32 LastMsgId() const { return messages.empty() ? 0 : messages.back().id; }
+	};
+
+	// Bounded so a chatty peer cannot grow the daemon without limit. Plain constants rather
+	// than preferences: nobody has asked to tune them, and a pref would need EC prefs plumbing
+	// to be reachable from a remote client.
+	static const size_t MAX_MESSAGES_PER_SESSION = 200;
+	static const size_t MAX_SESSIONS = 50;
+
+	// Record one message, creating the session when it is the first. `name` updates the stored
+	// display name when non-empty, so a peer that only reveals its nick later still ends up
+	// named. Returns the id assigned.
+	uint32 AddIncoming(uint64 gui_id, const wxString &name, const wxString &text);
+	uint32 AddOutgoing(uint64 gui_id, const wxString &text);
+
+	// Drop one session. Returns false when there was none, so the EC handler
+	// can answer 404-equivalent rather than silently succeeding.
+	bool CloseSession(uint64 gui_id);
+
+	const Session *Find(uint64 gui_id) const;
+
+	// Sessions in most-recently-active-first order -- the order a client wants
+	// to render, and the order eviction walks backwards through.
+	std::vector<const Session *> Sessions() const;
+
+	//! Store-wide highest id, so a client resumes with one cursor rather than one per session.
+	uint32 LastMsgId() const { return m_lastMsgId; }
+
+	size_t SessionCount() const { return m_sessions.size(); }
+
+private:
+	Session &Touch(uint64 gui_id, const wxString &name);
+	uint32 Append(Session &s, uint8 direction, const wxString &text);
+	void EvictSessionsIfNeeded();
+
+	// A list, not a map: the working set is at most MAX_SESSIONS, and the dominant operations
+	// are "walk in activity order" and "move to front", both O(1) here and both awkward on a
+	// map keyed by GUI_ID. Front is the most recently active session.
+	std::list<Session> m_sessions;
+	uint32 m_lastMsgId = 0;
+};
+
+#endif // CHATSESSIONSTORE_H
+
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/ChatWnd.cpp -> amule-3.1.0.tar.gz/src/ChatWnd.cpp Changed

@@ -23,70 +23,83 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include <common/MenuIDs.h>  // IDs for the chat-popup menu
+#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 "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 "ChatWnd.h" // Interface declarations
+
+#include "amule.h"          // Needed for theApp
+#include "amuleDlg.h"       // Needed for CamuleDlg
+#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
+#ifndef CLIENT_GUI
+#include "ChatSessionStore.h" // Needed for CChatSessionStore
+#include "ClientList.h"       // Needed for CClientList
+#endif
+#include "muuli_wdr.h" // Needed for messagePage
 #include "OtherFunctions.h"
+#include "ScopedPtr.h" // Needed for CScopedFlag
+#include "Constants.h" // Needed for MS_NONE
 
 wxBEGIN_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_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)
+	EVT_MULENOTEBOOK_PAGE_CLOSING(IDC_CHATSELECTOR, CChatWnd::OnChatClosing)
 	EVT_MULENOTEBOOK_ALL_PAGES_CLOSED(IDC_CHATSELECTOR, CChatWnd::OnAllPagesClosed)
 wxEND_EVENT_TABLE()
 
-
-CChatWnd::CChatWnd(wxWindow* pParent)
+CChatWnd::CChatWnd(wxWindow *pParent)
 : wxPanel(pParent, -1)
 {
-	wxSizer* content = messagePage(this, true);
+	wxSizer *content = messagePage(this, true);
 	content->Show(this, true);
 
-	chatselector = CastChild( IDC_CHATSELECTOR, CChatSelector );
+	chatselector = CastChild(IDC_CHATSELECTOR, CChatSelector);
 	// We want to use our own popup menu
 	chatselector->SetPopupHandler(this);
 	m_menu = NULL;
 
-	friendlistctrl = CastChild( ID_FRIENDLIST, CFriendListCtrl );
+	friendlistctrl = CastChild(ID_FRIENDLIST, CFriendListCtrl);
 }
 
-void CChatWnd::StartSession(CFriend* friend_client, bool setfocus)
+bool CChatWnd::StartSession(CFriend *friend_client, bool setfocus)
 {
+	// A tab is keyed on GUI_ID(ip, port). A friend can be known by hash alone -- added from an
+	// offline row whose credit record carries no address -- and keying its tab on zero would
+	// put every such friend in one tab, under whichever name opened it first, with nothing
+	// sendable from it. Refuse until a handshake supplies the address.
+	if (friend_client->GetName().IsEmpty() || friend_client->GetIP() == 0 ||
+		friend_client->GetPort() == 0) {
+		return false;
+	}
 
-	if ( !friend_client->GetName().IsEmpty() ) {
-		if (setfocus) {
-			theApp->amuledlg->SetActiveDialog(CamuleDlg::DT_CHAT_WND, this);
-		}
-		chatselector->StartSession(GUI_ID(friend_client->GetIP(), friend_client->GetPort()), friend_client->GetName(), true);
+	if (setfocus) {
+		theApp->amuledlg->SetActiveDialog(CamuleDlg::DT_CHAT_WND, this);
 	}
+	chatselector->StartSession(
+		GUI_ID(friend_client->GetIP(), friend_client->GetPort()), friend_client->GetName(), true);
 
 	// Check to enable the window controls if needed
 	CheckNewButtonsState();
+	return true;
 }
 
-
-void CChatWnd::OnNMRclickChatTab(wxMouseEvent& evt)
+void CChatWnd::OnNMRclickChatTab(wxMouseEvent &evt)
 {
 	// Only handle events from the chat-notebook
-	if (evt.GetEventObject() != (wxObject*)chatselector)
+	if (evt.GetEventObject() != (wxObject *)chatselector)
 		return;
 
 	if (chatselector->GetSelection() == -1) {
@@ -103,7 +116,7 @@
 
 		m_menu->AppendSeparator();
 
-		wxMenuItem * addFriend = m_menu->Append(MP_ADDFRIEND, _("Add to Friends"));
+		wxMenuItem *addFriend = m_menu->Append(MP_ADDFRIEND, _("Add to Friends"));
 
 		// Disable this client if it is already a friend
 		CClientRef client;
@@ -118,31 +131,27 @@
 	}
 }
 
-
-void CChatWnd::OnPopupClose(wxCommandEvent& WXUNUSED(evt))
+void CChatWnd::OnPopupClose(wxCommandEvent &WXUNUSED(evt))
 {
 	chatselector->DeletePage(chatselector->GetSelection());
 }
 
-
-void CChatWnd::OnPopupCloseAll(wxCommandEvent& WXUNUSED(evt))
+void CChatWnd::OnPopupCloseAll(wxCommandEvent &WXUNUSED(evt))
 {
 	chatselector->DeleteAllPages();
 }
 
-
-void CChatWnd::OnPopupCloseOthers(wxCommandEvent& WXUNUSED(evt))
+void CChatWnd::OnPopupCloseOthers(wxCommandEvent &WXUNUSED(evt))
 {
-	wxNotebookPage* current = chatselector->GetPage(chatselector->GetSelection());
+	wxNotebookPage *current = chatselector->GetPage(chatselector->GetSelection());
 
 	for (int i = chatselector->GetPageCount() - 1; i >= 0; i--) {
 		if (current != chatselector->GetPage(i))
-			chatselector->DeletePage( i );
+			chatselector->DeletePage(i);
 	}
 }
 
-
-void CChatWnd::OnAddFriend(wxCommandEvent& WXUNUSED(evt))
+void CChatWnd::OnAddFriend(wxCommandEvent &WXUNUSED(evt))
 {
 	// Get the client that the session is open to
 	CClientRef client;
@@ -153,33 +162,30 @@
 	}
 }
 
-
-void CChatWnd::OnBnClickedCsend(wxCommandEvent& WXUNUSED(evt))
+void CChatWnd::OnBnClickedCsend(wxCommandEvent &WXUNUSED(evt))
 {
 	wxString message = CastChild(IDC_CMESSAGE, wxTextCtrl)->GetValue();
 
 	SendMessage(message);
 }
 
-
-void CChatWnd::OnBnClickedCclose(wxCommandEvent& WXUNUSED(evt))
+void CChatWnd::OnBnClickedCclose(wxCommandEvent &WXUNUSED(evt))
 {
 	chatselector->EndSession();
 }
 
-
-void CChatWnd::OnAllPagesClosed(wxNotebookEvent& WXUNUSED(evt))
+void CChatWnd::OnAllPagesClosed(wxNotebookEvent &WXUNUSED(evt))
 {
 	CastChild(IDC_CMESSAGE, wxTextCtrl)->Clear();
 	// Check to disable the window controls
 	CheckNewButtonsState();
 }
 
-
-void CChatWnd::UpdateFriend(CFriend* toupdate)
+void CChatWnd::UpdateFriend(CFriend *toupdate)
 {
 	if (toupdate->GetLinkedClient().IsLinked()) {
-		chatselector->RefreshFriend(GUI_ID(toupdate->GetIP(), toupdate->GetPort()), toupdate->GetName());
+		chatselector->RefreshFriend(
+			GUI_ID(toupdate->GetIP(), toupdate->GetPort()), toupdate->GetName());
 	} else {
 		// drop Chat session
 		chatselector->EndSession(GUI_ID(toupdate->GetIP(), toupdate->GetPort()));
@@ -187,17 +193,15 @@
 	friendlistctrl->UpdateFriend(toupdate);
 }
 
-
-void CChatWnd::RemoveFriend(CFriend* todel)
+void CChatWnd::RemoveFriend(CFriend *todel)
 {
 	chatselector->EndSession(GUI_ID(todel->GetIP(), todel->GetPort()));
 	friendlistctrl->RemoveFriend(todel);
 }
 
-
-void CChatWnd::ProcessMessage(uint64 sender, const wxString& message)
+void CChatWnd::ProcessMessage(uint64 sender, const wxString &message)
 {
-	if ( !theApp->amuledlg->IsDialogVisible(CamuleDlg::DT_CHAT_WND) ) {
+	if (!theApp->amuledlg->IsDialogVisible(CamuleDlg::DT_CHAT_WND)) {
 		theApp->amuledlg->SetMessageBlink(true);
 	}
 	if (chatselector->ProcessMessage(sender, message)) {
@@ -206,17 +210,15 @@
 	}
 }
 
-
-void CChatWnd::ConnectionResult(bool success, const wxString& message, uint64 id)
+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)
+void CChatWnd::SendMessage(const wxString &message, const wxString &client_name, uint64 to_id)
 {
 
-	if (chatselector->SendMessage( message, client_name, to_id )) {
+	if (chatselector->SendMessage(message, client_name, to_id)) {
 		CastChild(IDC_CMESSAGE, wxTextCtrl)->Clear();
 	}
 
@@ -225,36 +227,35 @@
 	CastChild(IDC_CMESSAGE, wxTextCtrl)->SetFocus();
 }
 
-
 void CChatWnd::CheckNewButtonsState()
 {
+	// Both builds take this path now: amulegui sends over EC_OP_CHAT_SEND,
+	// so the compose box and Send button are no longer disabled for it.
 	switch (chatselector->GetPageCount()) {
-			case 0:
-				GetParent()->FindWindow(IDC_CSEND)->Enable(false);
-				GetParent()->FindWindow(IDC_CCLOSE)->Enable(false);
-				GetParent()->FindWindow(IDC_CMESSAGE)->Enable(false);
-				break;
-			case 1:
-				GetParent()->FindWindow(IDC_CSEND)->Enable(true);
-				GetParent()->FindWindow(IDC_CCLOSE)->Enable(true);
-				GetParent()->FindWindow(IDC_CMESSAGE)->Enable(true);
-				break;
-			default:
-				// Nothing to be done here. Keep current state, which should be enabled.
-				wxASSERT(GetParent()->FindWindow(IDC_CSEND)->IsEnabled());
-				wxASSERT(GetParent()->FindWindow(IDC_CCLOSE)->IsEnabled());
-				wxASSERT(GetParent()->FindWindow(IDC_CMESSAGE)->IsEnabled());
-				break;
+	case 0:
+		GetParent()->FindWindow(IDC_CSEND)->Enable(false);
+		GetParent()->FindWindow(IDC_CCLOSE)->Enable(false);
+		GetParent()->FindWindow(IDC_CMESSAGE)->Enable(false);
+		break;
+	case 1:
+		GetParent()->FindWindow(IDC_CSEND)->Enable(true);
+		GetParent()->FindWindow(IDC_CCLOSE)->Enable(true);
+		GetParent()->FindWindow(IDC_CMESSAGE)->Enable(true);
+		break;
+	default:
+		// Nothing to be done here. Keep current state, which should be enabled.
+		wxASSERT(GetParent()->FindWindow(IDC_CSEND)->IsEnabled());
+		wxASSERT(GetParent()->FindWindow(IDC_CCLOSE)->IsEnabled());
+		wxASSERT(GetParent()->FindWindow(IDC_CMESSAGE)->IsEnabled());
+		break;
 	}
 }
 
-
 bool CChatWnd::IsIdValid(uint64 id)
 {
 	return chatselector->GetTabByClientID(id) >= 0;
 }
 
-
 void CChatWnd::ShowCaptchaResult(uint64 id, bool ok)
 {
 	chatselector->ShowCaptchaResult(id, ok);
@@ -265,4 +266,63 @@
 	chatselector->EndSession(id);
 }
 
+void CChatWnd::StartSessionByID(uint64 gui_id, const wxString &name)
+{
+	// show=false: a session can appear on its own, opened by another client or by a peer
+	// messaging us, and must not pull the selection away from whatever the local user is doing.
+	chatselector->StartSession(gui_id, name, false);
+	CheckNewButtonsState();
+}
+
+void CChatWnd::AppendStoredMessage(
+	uint64 gui_id, const wxString &name, const wxString &text, bool outgoing, bool blink)
+{
+	chatselector->AppendStoredMessage(gui_id, name, text, outgoing);
+	// `blink` is false while replaying history on connect: a reconnect must not light the
+	// Messages button up for messages the user already read on another client. Only arrivals
+	// past the connect-time cursor blink.
+	if (blink && !theApp->amuledlg->IsDialogVisible(CamuleDlg::DT_CHAT_WND)) {
+		theApp->amuledlg->SetMessageBlink(true);
+	}
+	CheckNewButtonsState();
+}
+
+void CChatWnd::EndSessionFromCore(uint64 gui_id)
+{
+	// The core has already forgotten this session, so the tab must go without originating a
+	// close of its own. The guard keeps OnChatClosing from sending one when this DeletePage
+	// fires the page-closing event.
+	CScopedFlag closingGuard(m_inChatClosing);
+	chatselector->EndSession(gui_id);
+	CheckNewButtonsState();
+}
+
+void CChatWnd::OnChatClosing(wxBookCtrlEvent &evt)
+{
+	if (m_inChatClosing) {
+		// Re-entry from EndSessionFromCore (or from the notify that a close
+		// we just performed fired): the core already knows.
+		evt.Skip();
+		return;
+	}
+	CChatSession *session = static_cast<CChatSession *>(chatselector->GetPage(evt.GetSelection()));
+	if (!session || !session->m_client_id) {
+		evt.Skip();
+		return;
+	}
+	const uint64 gui_id = session->m_client_id;
+	CScopedFlag closingGuard(m_inChatClosing);
+#ifdef CLIENT_GUI
+	if (theApp->m_connect && theApp->m_connect->ServerSupportsChatSessions()) {
+		CECPacket req(EC_OP_CHAT_CLOSE_SESSION);
+		req.AddTag(CECTag(EC_TAG_CHAT_CLIENT_ID, gui_id));
+		theApp->m_connect->SendPacket(&req);
+	}
+#else
+	theApp->chatsessions->CloseSession(gui_id);
+	theApp->clientlist->SetChatState(gui_id, MS_NONE);
+#endif
+	evt.Skip();
+}
+
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ChatWnd.h -> amule-3.1.0.tar.gz/src/ChatWnd.h Changed

@@ -26,8 +26,8 @@
 #ifndef CHATWND_H
 #define CHATWND_H
 
-#include <wx/panel.h>		// Needed for wxPanel
-#include <wx/notebook.h>		// Needed for wxNotebookEvent
+#include <wx/panel.h>    // Needed for wxPanel
+#include <wx/notebook.h> // Needed for wxNotebookEvent
 #include "Types.h"
 
 class CFriend;
@@ -38,61 +38,97 @@
 class CChatWnd : public wxPanel
 {
 public:
-	CChatWnd(wxWindow* pParent = NULL);
+	CChatWnd(wxWindow *pParent = NULL);
 	~CChatWnd() {};
 
-	void StartSession(CFriend* friend_client, bool setfocus = true);
+	/**
+	 * Open (or raise) the chat tab for a friend. False when there is no address to key the tab
+	 * on, so the caller can say why nothing happened.
+	 */
+	bool StartSession(CFriend *friend_client, bool setfocus = true);
+
+	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 = "", uint64 to_id = 0);
+
+	bool IsIdValid(uint64 id);
+	void ShowCaptchaResult(uint64 id, bool ok);
+	void EndSession(uint64 id);
 
-	void	UpdateFriend(CFriend* toupdate);
-	void	RemoveFriend(CFriend* todel);
+	// --- Driven by the core's chat session store, over EC --- Open (or reuse) a tab for a
+	// session the core reports, without stealing the selection: a session can appear on its
+	// own, started by another client, while the user is doing something else.
+	void StartSessionByID(uint64 gui_id, const wxString &name);
 
-	void	ProcessMessage(uint64 sender, const wxString& message);
-	void	ConnectionResult(bool success, const wxString& message, uint64 id);
+	// Render one message the core already holds. `blink` is false while replaying history on
+	// connect -- a reconnect must not light the Messages button up for messages already read --
+	// and true for anything arriving afterwards.
+	void AppendStoredMessage(
+		uint64 gui_id, const wxString &name, const wxString &text, bool outgoing, bool blink);
 
-	void	SendMessage(const wxString& message, const wxString& client_name = "", uint64 to_id = 0);
+	// The core no longer has this session (closed by another client, or evicted). Closes the
+	// tab WITHOUT sending a close back: distinct from EndSession, which is the user's own
+	// close.
+	void EndSessionFromCore(uint64 gui_id);
 
-	bool	IsIdValid(uint64 id);
-	void	ShowCaptchaResult(uint64 id, bool ok);
-	void	EndSession(uint64 id);
+protected:
+	/**
+	 * The user closed a chat tab: tell the core to drop the session.
+	 *
+	 * Closing is global, exactly as for a search tab -- the core state goes away for every
+	 * client, which is why this is the only place that originates a close. `m_inChatClosing`
+	 * guards the re-entry: dropping the session fires MuleNotify::Chat_SessionRemoved, which
+	 * routes straight back into this tab's close path.
+	 */
+	void OnChatClosing(wxBookCtrlEvent &evt);
+
+	//! True while OnChatClosing is tearing a tab down; see EndSessionFromCore.
+	bool m_inChatClosing = false;
+
+public:
 
 protected:
 	/**
-	 * Event-handler for displaying the chat-popup menu.
+	 * Event handler: show the chat popup menu.
 	 */
-	void	OnNMRclickChatTab(wxMouseEvent& evt);
+	void OnNMRclickChatTab(wxMouseEvent &evt);
 	/**
-	 * Event-handler of the Close item on the popup-menu.
+	 * Event handler: the Close item on the popup menu.
 	 */
-	void	OnPopupClose(wxCommandEvent& evt);
+	void OnPopupClose(wxCommandEvent &evt);
 
 	/**
-	 * Event-handler of the CloseAll item on the popup-menu.
+	 * Event handler: the CloseAll item on the popup menu.
 	 */
-	void	OnPopupCloseAll(wxCommandEvent& evt);
+	void OnPopupCloseAll(wxCommandEvent &evt);
 
 	/**
-	 * Event-handler of the CloseOthers item on the popup-menu.
+	 * Event handler: the CloseOthers item on the popup menu.
 	 */
-	void	OnPopupCloseOthers(wxCommandEvent& evt);
+	void OnPopupCloseOthers(wxCommandEvent &evt);
 
 	/**
-	 * Event-handler of the AddFriend item on the popup-menu.
+	 * Event handler: the AddFriend item on the popup menu.
 	 */
-	void	OnAddFriend(wxCommandEvent& evt);
+	void OnAddFriend(wxCommandEvent &evt);
 
-	void	OnBnClickedCsend(wxCommandEvent& evt);
-	void	OnBnClickedCclose(wxCommandEvent& evt);
-	void	OnAllPagesClosed(wxNotebookEvent& evt);
-	void	CheckNewButtonsState();
+	void OnBnClickedCsend(wxCommandEvent &evt);
+	void OnBnClickedCclose(wxCommandEvent &evt);
+	void OnAllPagesClosed(wxNotebookEvent &evt);
+	void CheckNewButtonsState();
 
 	wxDECLARE_EVENT_TABLE();
 
 	//! Variable used to ensure that the popup menu doesn't get displayed twice.
-	wxMenu* m_menu;
+	wxMenu *m_menu;
 	//! Pointer to the control serving as the friend list
-	CFriendListCtrl* friendlistctrl;
+	CFriendListCtrl *friendlistctrl;
 	//! Pointer to the chat tabs.
-	CChatSelector*	chatselector;
+	CChatSelector *chatselector;
 };
 
 #endif

amule-3.1.0.tar.gz/src/ClientContextActions.cpp Added

@@ -0,0 +1,436 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "ClientContextActions.h" // Interface declarations
+
+#include <wx/menu.h>
+#include <wx/msgdlg.h>
+
+#include "Logger.h" // Needed for AddLogLineC
+#include <wx/textdlg.h>
+
+#include <common/MenuIDs.h>
+
+#include "amule.h"              // Needed for theApp
+#include "amuleDlg.h"           // Needed for CamuleDlg
+#include "ChatWnd.h"            // Needed for CChatWnd::SendMessage
+#include "ClientDetailDialog.h" // Needed for CClientDetailDialog
+#include "ClientList.h"         // Needed for CClientList::CreateForAddress
+#include "Friend.h"             // Needed for CFriend
+#include "FriendList.h"         // Needed for CFriendList
+#include "OtherFunctions.h"     // Needed for GUI_ID
+#include "SearchDlg.h"          // Needed for CSearchDlg::ActivateBrowseTabIfOpen
+
+wxMenu *BuildClientContextMenu(const CClientRef &client)
+{
+	// const_cast because the accessors this menu reads are non-const on
+	// CClientRef; nothing here modifies the peer.
+	CClientRef &c = const_cast<CClientRef &>(client);
+
+	wxMenu *menu = new wxMenu(_("Clients"));
+	menu->Append(MP_DETAIL, _("Show &Details"));
+	// Resolved, not read off the live client: see FriendForClient().
+	CFriend *known = FriendForClient(c);
+	menu->Append(MP_ADDFRIEND, known != nullptr ? _("Remove from friends") : _("Add to Friends"));
+	// Unfriending needs only the record; friending needs a hash or an address
+	// to store, and the action asks the same question through PeerIdentity.
+	menu->Enable(MP_ADDFRIEND, known != nullptr || PeerIdentity::FromClient(c).CanBeFriended());
+
+	menu->AppendCheckItem(MP_FRIENDSLOT, _("Establish Friend Slot"));
+	if (known != nullptr) {
+		menu->Enable(MP_FRIENDSLOT, true);
+		// The record's flag, which is the one the slot action writes and the
+		// one that survives the peer going offline.
+		menu->Check(MP_FRIENDSLOT, known->HasFriendSlot());
+	} else {
+		menu->Enable(MP_FRIENDSLOT, false);
+	}
+
+	menu->Append(MP_SHOWLIST, _("View Files"));
+	menu->Append(MP_SENDMESSAGE, _("Send message"));
+
+	// We need a valid IP if we are to message the client.
+	menu->Enable(MP_SENDMESSAGE, c.GetIP() != 0);
+	menu->Enable(MP_SHOWLIST, !c.HasDisabledSharedFiles());
+
+	return menu;
+}
+
+namespace
+{
+
+// Asks for the message and hands it to the chat window. Shared so the live and
+// stored-row paths cannot drift: all either has is a display name and a GUI_ID.
+void PromptAndSendChatMessage(const wxString &userName, uint64 userID)
+{
+	const wxString message = ::wxGetTextFromUser(_("Send message to user"), _("Message to send:"));
+	if (!message.IsEmpty()) {
+		theApp->amuledlg->m_chatwnd->SendMessage(message, userName, userID);
+	}
+}
+
+// Holds the friend list's write open for as long as it is in scope. Works in both builds:
+// CFriendListRem answers the same two calls with no-ops, because the daemon owns the file there.
+class FriendListBatch
+{
+public:
+	FriendListBatch() { theApp->friendlist->BeginBatch(); }
+	~FriendListBatch() { theApp->friendlist->EndBatch(); }
+	FriendListBatch(const FriendListBatch &) = delete;
+	FriendListBatch &operator=(const FriendListBatch &) = delete;
+};
+
+// Above this a bulk action asks before running. One row must never cost a click and a few is
+// plainly deliberate, but Clients -> Known lists every peer we have credit for, so a select-all
+// there is thousands of rows, each costing an outbound connection or a rewrite of the friend list.
+const size_t kBulkPeerActionPrompt = 10;
+
+// Only one friend slot exists, so a wider selection loses all but the first.
+void WarnIfMultipleFriendSlot(wxWindow *parent, size_t selected)
+{
+	if (selected > 1) {
+		wxMessageBox(_("You are not allowed to set more than one friend slot.\n Only one slot was "
+			       "assigned."),
+			_("Multiple selection"),
+			wxOK | wxICON_ERROR,
+			parent);
+	}
+}
+
+} // namespace
+
+wxMenu *BuildPeerContextMenu(const PeerIdentity &peer)
+{
+	// A peer we are connected to knows strictly more about itself than the stored record does,
+	// so defer to the existing builder whenever there is one rather than keeping two versions
+	// of these rules.
+	if (peer.client.IsLinked()) {
+		return BuildClientContextMenu(peer.client);
+	}
+
+	// Friendship and the friend slot are ours, not the peer's: both live in emfriends.met and
+	// apply next time it connects. FriendFor() reaches LookupFriend() rather than FindFriend(),
+	// which would adopt the hash onto an address-only record and save the file -- opening a
+	// menu must not write to disk.
+	CFriend *known = FriendFor(peer);
+
+	wxMenu *menu = new wxMenu(_("Clients"));
+	menu->Append(MP_DETAIL, _("Show &Details"));
+	menu->Append(MP_ADDFRIEND, known ? _("Remove from friends") : _("Add to Friends"));
+
+	menu->AppendCheckItem(MP_FRIENDSLOT, _("Establish Friend Slot"));
+	if (known) {
+		menu->Enable(MP_FRIENDSLOT, true);
+		menu->Check(MP_FRIENDSLOT, known->HasFriendSlot());
+	} else {
+		menu->Enable(MP_FRIENDSLOT, false);
+	}
+
+	menu->Append(MP_SHOWLIST, _("View Files"));
+	menu->Append(MP_SENDMESSAGE, _("Send message"));
+
+	// Both open a connection, so both need somewhere to open it to. Whether the peer forbids
+	// browsing is live state we do not have, and an unknown is not a refusal, so View Files
+	// stays offered on that count.
+	//
+	// Only browsing is out of amulegui's reach, because EC names a browse target by ECID and
+	// this peer has no daemon-side object; chat addresses by GUI_ID, which is the address
+	// itself. Unfriending needs only the record we have, friending needs an address to store.
+	menu->Enable(MP_ADDFRIEND, known != nullptr || peer.CanBeFriended());
+	menu->Enable(MP_SENDMESSAGE, peer.CanOpenConnection());
+	menu->Enable(MP_SHOWLIST, peer.CanOpenConnection() && PeerBrowseIsPossible(peer));
+
+	return menu;
+}
+
+// Whether this build can browse a peer it is not already connected to.
+//
+// Monolithic aMule owns its client list and can make one from an address; amulegui cannot, since EC
+// names a browse target by ECID and a peer that is neither connected nor a friend has no daemon-
+// side object to have one.
+//
+// Chat is deliberately NOT covered: EC_OP_CHAT_SEND takes a bare GUI_ID, built from the address
+// alone, so it works in both builds.
+bool PeerBrowseIsPossible(const PeerIdentity &peer)
+{
+#ifndef CLIENT_GUI
+	(void)peer;
+	return true;
+#else
+	// EC names a browse target by ECID. A connected peer has one as a client and a friend has
+	// one as a friend record, both of which CFriendListRem already browses; only a peer that is
+	// neither has nothing to name.
+	return peer.client.IsLinked() || PeerIsFriend(peer);
+#endif
+}
+
+bool PeerActionViewFiles(const PeerIdentity &peer)
+{
+	if (peer.client.IsLinked()) {
+		ClientActionViewFiles({ peer.client });
+		return true;
+	}
+	if (!peer.CanOpenConnection()) {
+		return false;
+	}
+#ifdef CLIENT_GUI
+	// A friend can be named on the wire by its ECID even when we are not
+	// connected to it, which is the one handle a stored row can have.
+	if (CFriend *known = FriendFor(peer)) {
+		theApp->friendlist->RequestSharedFileList(known);
+		return true;
+	}
+	// Otherwise there is nothing to name it with, so say so rather than
+	// leaving the caller to assume the browse was asked for.
+	return false;
+#else
+	// Only now is a client made and a connection opened: the user asked to browse, which cannot
+	// be answered from the stored record. Passing the hash lets the call reuse the client it
+	// made last time instead of stacking up a new one.
+	ClientActionViewFiles(
+		{ theApp->clientlist->CreateForAddress(peer.hash, peer.ip, peer.port, peer.name) });
+	return true;
+#endif
+}
+
+void PeerActionSendMessage(const PeerIdentity &peer)
+{
+	if (peer.client.IsLinked()) {
+		ClientActionSendMessage({ peer.client });
+		return;
+	}
+	if (!peer.CanOpenConnection()) {
+		return;
+	}
+	// The address is the whole target: monolithic looks the client up by it, and amulegui sends
+	// the GUI_ID over EC for the daemon to resolve. Either way CClientList::SendChatMessage()
+	// makes the client if there is none.
+	//
+	// The hash stands in for a missing name here, and only here: this label titles the chat tab
+	// and is not stored anywhere.
+	PromptAndSendChatMessage(
+		peer.name.IsEmpty() ? peer.hash.Encode() : peer.name, GUI_ID(peer.ip, peer.port));
+}
+
+CFriend *FriendForClient(const CClientRef &client)
+{
+	// Linkage first, then the client's own identity. The linkage alone is not enough:
+	// CFriendList::AddFriend(hash, ip, port, name) stores a record without calling
+	// LinkClient(), so a friend added from the dialog while its peer is connected is a friend
+	// that IsFriend() denies.
+	CClientRef &live = const_cast<CClientRef &>(client);
+	if (CFriend *linked = live.GetFriend()) {
+		return linked;
+	}
+	return theApp->friendlist->LookupFriend(live.GetUserHash(), live.GetIP(), live.GetUserPort());
+}
+
+CFriend *FriendFor(const PeerIdentity &peer)
+{
+	// One step for every caller, menu and action alike: deciding this per caller is how a menu
+	// entry and the thing it triggers end up disagreeing about whether a peer is already a
+	// friend, and an "Add" that removes.
+	if (peer.client.IsLinked()) {
+		return FriendForClient(peer.client);
+	}
+	return theApp->friendlist->LookupFriend(peer.hash, peer.ip, peer.port);
+}
+
+bool ConfirmBulkPeerAction(wxWindow *parent, size_t count, const wxString &message)
+{
+	if (count <= kBulkPeerActionPrompt) {
+		return true;
+	}
+	return wxMessageBox(message, _("Multiple selection"), wxYES_NO | wxICON_QUESTION, parent) == wxYES;
+}
+
+bool ConfirmFriendAction(wxWindow *parent, size_t count, bool addThem)
+{
+	const wxString message =
+		addThem ? wxString(CFormat(wxPLURAL("Add %u client to your friend list?",
+					   "Add %u clients to your friend list?",
+					   count)) %
+				   count)
+			: wxString(CFormat(wxPLURAL("Remove %u client from your friend list?",
+					   "Remove %u clients from your friend list?",
+					   count)) %
+				   count);
+	return ConfirmBulkPeerAction(parent, count, message);
+}
+
+void ReportFriendSkips(size_t skipped)
+{
+	if (skipped == 0) {
+		return;
+	}
+	AddLogLineC(CFormat(wxPLURAL("Could not add %u selected client to your friend list: no "
+				     "address is known for it.",
+			    "Could not add %u selected clients to your friend list: no address is "
+			    "known for them.",
+			    skipped)) %
+		    skipped);
+}
+
+bool ConfirmBrowseAction(wxWindow *parent, size_t count)
+{
+	// The connection line is stated unconditionally, because whether a browse dials is a
+	// property of each peer rather than of the list asking. A peer we hold no socket for is
+	// contacted: RequestSharedFileList() uses an existing connection only when IsConnected(),
+	// and otherwise calls TryToContact. Every one of these lists can hold such a peer, and no
+	// caller could answer it anyway -- each takes its count before the selection is resolved.
+	wxString message = CFormat(wxPLURAL("Request the shared files of %u client?",
+				   "Request the shared files of %u clients?",
+				   count)) %
+			   count;
+	message << wxT("\n\n") << _("A connection is opened to each of them.");
+	return ConfirmBulkPeerAction(parent, count, message);
+}
+
+void PeerActionSetFriendsForClients(wxWindow *parent, const std::vector<CClientRef> &clients, bool addThem)
+{
+	if (clients.empty()) {
+		return;
+	}
+	if (!ConfirmFriendAction(parent, clients.size(), addThem)) {
+		return;
+	}
+	// Through the same action the row-backed lists use, so the direction, the address
+	// requirement, the single write and the skip reporting are stated once rather than
+	// accumulated twice.
+	std::vector<PeerIdentity> peers;
+	peers.reserve(clients.size());
+	for (const CClientRef &client : clients) {
+		peers.push_back(PeerIdentity::FromClient(client));
+	}
+	ReportFriendSkips(PeerActionSetFriends(peers, addThem));
+}
+
+bool PeerIsFriend(const PeerIdentity &peer)
+{
+	return FriendFor(peer) != nullptr;
+}
+
+size_t PeerActionSetFriends(const std::vector<PeerIdentity> &peers, bool addThem)
+{
+	// One write for the whole run. CFriendList saves after every add and remove, so without
+	// this a large selection rewrites emfriends.met once per row, on the GUI thread, with the
+	// file growing as it goes.
+	//
+	// Scoped, not a bare pair of calls: a batch left open makes every later SaveList() a silent
+	// no-op, the one in ~CFriendList() included.
+	size_t skipped = 0;
+	FriendListBatch batch;
+	for (const PeerIdentity &peer : peers) {
+		CFriend *known = FriendFor(peer);
+		// One direction for the whole run, taken from the entry the user picked. Toggling
+		// per row means a selection holding both friends and strangers does the opposite of
+		// its own label to half of it, and removing a friend is the loss of something they
+		// curated.
+		if (addThem) {
+			if (known != nullptr) {
+				continue;
+			}
+			if (!peer.CanBeFriended()) {
+				// A friend is reached by address, and a record without one can
+				// never be dialled. Connected or not, the bar is the same, and the
+				// caller says how many were left out.
+				++skipped;
+				continue;
+			}
+			if (peer.client.IsLinked()) {
+				// The client-aware overload, which links the record to the live
+				// client. Storing the address alone leaves the friend looking
+				// offline for the rest of a session we are already talking through,
+				// and its friend slot unsettable, that entry being gated on
+				// linkage.
+				theApp->friendlist->AddFriend(peer.client);
+			} else {
+				theApp->friendlist->AddFriend(peer.hash, peer.ip, peer.port, peer.name);
+			}
+		} else if (known != nullptr) {
+			theApp->friendlist->RemoveFriend(known);
+		}
+	}
+	return skipped;
+}
+
+void PeerActionSetFriendSlot(wxWindow *parent, const PeerIdentity &peer, bool checked, size_t selected)
+{
+	// Resolve the friend the same way the menu decided whether to offer this entry: through the
+	// live client's linkage when there is one, and from the stored record otherwise. Resolving
+	// it differently is how the menu ends up describing one peer while the action runs on
+	// another. Either way the slot is a property of our own list, so it is settable on a peer
+	// that is not connected.
+	theApp->friendlist->SetFriendSlot(FriendFor(peer), checked);
+
+	WarnIfMultipleFriendSlot(parent, selected);
+}
+
+void ClientActionViewFiles(const std::vector<CClientRef> &clients)
+{
+	// Browse each selected peer, opening one result tab per peer. If a peer's listing is
+	// already open in the Search panel, switch to that tab rather than re-requesting, which
+	// would duplicate the results in it.
+	for (const CClientRef &client : clients) {
+		CClientRef &c = const_cast<CClientRef &>(client);
+		if (!(theApp->amuledlg && theApp->amuledlg->m_searchwnd &&
+			    theApp->amuledlg->m_searchwnd->ActivateBrowseTabIfOpen(c.ECID()))) {
+			c.RequestSharedFileList();
+		}
+	}
+}
+
+void ClientActionSetFriendSlot(wxWindow *parent, const std::vector<CClientRef> &clients, bool checked)
+{
+	if (clients.empty()) {
+		return;
+	}
+	theApp->friendlist->SetFriendSlot(FriendForClient(clients.front()), checked);
+
+	WarnIfMultipleFriendSlot(parent, clients.size());
+}
+
+void ClientActionSendMessage(const std::vector<CClientRef> &clients)
+{
+	if (clients.size() != 1) {
+		return;
+	}
+	CClientRef &source = const_cast<CClientRef &>(clients.front());
+
+	// These values are cached, since calling wxGetTextFromUser will start an
+	// event-loop, in which the client may be deleted.
+	const wxString userName = source.GetUserName();
+	const uint64 userID = GUI_ID(source.GetIP(), source.GetUserPort());
+
+	PromptAndSendChatMessage(userName, userID);
+}
+
+void ClientActionShowDetails(wxWindow *parent, const std::vector<CClientRef> &clients)
+{
+	if (clients.size() != 1) {
+		return;
+	}
+	CClientDetailDialog(parent, clients.front()).ShowModal();
+}
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/ClientContextActions.h Added

@@ -0,0 +1,146 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 CLIENTCONTEXTACTIONS_H
+#define CLIENTCONTEXTACTIONS_H
+
+#include <vector>
+
+#include "ClientRef.h"    // Needed for CClientRef
+#include "PeerIdentity.h" // Needed for PeerIdentity
+
+class CFriend;
+
+class wxMenu;
+class wxWindow;
+
+/**
+ * The right-click menu offered on a peer, and what its entries do. Free functions rather than a
+ * base class because the lists that offer this menu do not share a row type: the per-file lists
+ * hold an owning CClientRef per row, the global clients list holds a value snapshot and resolves
+ * the peer by ECID when something is actually done to it. All they have in common is the CClientRef
+ * they end up with, which is exactly what these take.
+ */
+
+/**
+ * Build the menu for `client`, with the entries every caller can act on. "Swap to this file" is not
+ * among them: it needs a file in context, so the per-file lists append it themselves. Caller owns
+ * the returned menu.
+ */
+wxMenu *BuildClientContextMenu(const CClientRef &client);
+
+/**
+ * The same menu for a peer we are not connected to. Everything on it works from the stored record:
+ * friending and the friend slot are persistent, and browsing or messaging opens a connection when
+ * the user picks them. Only the friend slot needs the peer to be a friend already, which is a
+ * property of our own list rather than of the connection.
+ */
+wxMenu *BuildPeerContextMenu(const PeerIdentity &peer);
+
+/**
+ * Whether this build can browse this particular peer. Always true in monolithic. In amulegui it
+ * depends on the peer: EC names a browse target by ECID, so a connected peer or a friend can be
+ * named, and one that is neither cannot. Chat is not covered by this and works in both builds,
+ * because EC_OP_CHAT_SEND addresses by GUI_ID.
+ */
+bool PeerBrowseIsPossible(const PeerIdentity &peer);
+
+//! The friend record for a live client, or nullptr. Linkage, then identity.
+CFriend *FriendForClient(const CClientRef &client);
+
+//! The friend record for this peer, or nullptr. Live linkage first.
+CFriend *FriendFor(const PeerIdentity &peer);
+
+//! Whether this peer is already on our friend list.
+bool PeerIsFriend(const PeerIdentity &peer);
+
+/**
+ * Browse a peer, opening a connection to it if we are not already talking. False when nothing was
+ * asked: amulegui cannot name a peer it has no ECID for, and the caller reports what it skipped
+ * rather than failing silently.
+ */
+bool PeerActionViewFiles(const PeerIdentity &peer);
+
+//! Message a peer we are not connected to, opening a connection to do it.
+void PeerActionSendMessage(const PeerIdentity &peer);
+
+/**
+ * Grant or revoke the friend slot for one peer. Resolves the friend record the same way the menu
+ * did, so the entry and the action cannot describe different peers. `selected` is the size of the
+ * selection, used only to warn that a wider one still got a single slot.
+ */
+void PeerActionSetFriendSlot(wxWindow *parent, const PeerIdentity &peer, bool checked, size_t selected);
+
+/**
+ * Friend or unfriend every peer given, writing the friend list once.
+ *
+ * One direction for the whole run rather than a per-row toggle: the menu entry is labelled from a
+ * single row, and a selection holding both friends and strangers would otherwise do the opposite of
+ * that label to half of it. Returns how many were left out for having no address to store, so the
+ * caller can say so rather than reporting a count it did not act on.
+ */
+size_t PeerActionSetFriends(const std::vector<PeerIdentity> &peers, bool addThem);
+
+//! Browse each peer's shared files, reusing an already-open tab per peer.
+void ClientActionViewFiles(const std::vector<CClientRef> &clients);
+
+/**
+ * Whether a bulk action over `count` rows should go ahead. True without asking for a small
+ * selection; larger ones are confirmed.
+ */
+bool ConfirmBulkPeerAction(wxWindow *parent, size_t count, const wxString &message);
+
+//! Asks before a wide friend action, wording it for the direction taken.
+bool ConfirmFriendAction(wxWindow *parent, size_t count, bool addThem);
+
+//! Says how many rows a friend action left out for having no address.
+void ReportFriendSkips(size_t skipped);
+
+/**
+ * Asks before browsing a wide selection. Always says a connection is opened to each peer: whether
+ * one is depends on the peer rather than on the list asking, and every list can hold a peer we hold
+ * no socket for.
+ */
+bool ConfirmBrowseAction(wxWindow *parent, size_t count);
+
+/**
+ * Friend or unfriend a selection of live clients. Confirms, then runs the same action the row-
+ * backed lists use, so both paths share one set of rules instead of accumulating their own.
+ */
+void PeerActionSetFriendsForClients(wxWindow *parent, const std::vector<CClientRef> &clients, bool addThem);
+
+/**
+ * Give the first selected peer the friend slot. Only one peer can hold it, so a multiple selection
+ * is applied to the first and the caller's window is told about it.
+ */
+void ClientActionSetFriendSlot(wxWindow *parent, const std::vector<CClientRef> &clients, bool checked);
+
+//! Prompt for a message and send it. Single selection only.
+void ClientActionSendMessage(const std::vector<CClientRef> &clients);
+
+//! Open the details dialog. Single selection only.
+void ClientActionShowDetails(wxWindow *parent, const std::vector<CClientRef> &clients);
+
+#endif // CLIENTCONTEXTACTIONS_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/ClientCredits.cpp -> amule-3.1.0.tar.gz/src/ClientCredits.cpp Changed

@@ -23,118 +23,122 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "ClientCredits.h"	// Interface declarations
+#include "ClientCredits.h" // Interface declarations
+#include "PeerAddressing.h"
 
 #include <cmath>
 
-#include "GetTickCount.h"	// Needed for GetTickCount64
-#include "Logger.h"			// Needed for Add(Debug)LogLine
+#include "GetTickCount.h" // Needed for GetTickCount64
+#include "Logger.h"       // Needed for Add(Debug)LogLine
 
 CreditStruct::CreditStruct()
-	: uploaded(0),
-	  downloaded(0),
-	  nLastSeen(0),
-	  nReserved3(0),
-	  nKeySize(0)
+: uploaded(0)
+, downloaded(0)
+, nLastSeen(0)
+, nReserved3(0)
+, nKeySize(0)
 {
 	memset(abySecureIdent, 0, MAXPUBKEYSIZE);
 }
 
-
-CClientCredits::CClientCredits(CreditStruct* in_credits)
+CClientCredits::CClientCredits(CreditStruct *in_credits)
 {
 	m_pCredits = in_credits;
 	InitalizeIdent();
 	m_dwUnSecureWaitTime = 0;
 	m_dwSecureWaitTime = 0;
-	m_dwWaitTimeIP = 0;
+	m_waitTimeAddress = CNetworkAddress::Absent();
 }
 
-
-CClientCredits::CClientCredits(const CMD4Hash& key)
+CClientCredits::CClientCredits(const CMD4Hash &key)
 {
 	m_pCredits = new CreditStruct();
 	m_pCredits->key = key;
 
 	InitalizeIdent();
 	m_dwUnSecureWaitTime = m_dwSecureWaitTime = ::GetTickCount64();
-	m_dwWaitTimeIP = 0;
+	m_waitTimeAddress = CNetworkAddress::Absent();
 }
 
-
 CClientCredits::~CClientCredits()
 {
 	delete m_pCredits;
 }
 
-
-void CClientCredits::AddDownloaded(uint32 bytes, uint32 dwForIP, bool cryptoavail)
+void CClientCredits::AddDownloaded(uint32 bytes, const CNetworkAddress &address, bool cryptoavail)
 {
-	switch (GetCurrentIdentState(dwForIP)) {
-		case IS_IDFAILED:
-		case IS_IDBADGUY:
-		case IS_IDNEEDED:
-			if (cryptoavail) {
-				return;
-			}
-			break;
-		case IS_NOTAVAILABLE:
-		case IS_IDENTIFIED:
-			break;
+	switch (GetCurrentIdentState(address)) {
+	case IS_IDFAILED:
+	case IS_IDBADGUY:
+	case IS_IDNEEDED:
+		if (cryptoavail) {
+			return;
+		}
+		break;
+	case IS_NOTAVAILABLE:
+	case IS_IDENTIFIED:
+		break;
 	}
 
 	m_pCredits->downloaded += bytes;
 }
 
-
-void CClientCredits::AddUploaded(uint32 bytes, uint32 dwForIP, bool cryptoavail)
+void CClientCredits::AddUploaded(uint32 bytes, const CNetworkAddress &address, bool cryptoavail)
 {
-	switch (GetCurrentIdentState(dwForIP)) {
-		case IS_IDFAILED:
-		case IS_IDBADGUY:
-		case IS_IDNEEDED:
-			if (cryptoavail) {
-				return;
-			}
-			break;
-		case IS_NOTAVAILABLE:
-		case IS_IDENTIFIED:
-			break;
+	switch (GetCurrentIdentState(address)) {
+	case IS_IDFAILED:
+	case IS_IDBADGUY:
+	case IS_IDNEEDED:
+		if (cryptoavail) {
+			return;
+		}
+		break;
+	case IS_NOTAVAILABLE:
+	case IS_IDENTIFIED:
+		break;
 	}
 
 	m_pCredits->uploaded += bytes;
 }
 
-
 uint64 CClientCredits::GetUploadedTotal() const
 {
 	return m_pCredits->uploaded;
 }
 
-
-uint64	CClientCredits::GetDownloadedTotal() const
+uint64 CClientCredits::GetDownloadedTotal() const
 {
 	return m_pCredits->downloaded;
 }
 
-
-float CClientCredits::GetScoreRatio(uint32 dwForIP, bool cryptoavail)
+float CClientCredits::GetScoreRatio(const CNetworkAddress &address, bool cryptoavail) const
 {
 	// check the client ident status
-	switch (GetCurrentIdentState(dwForIP)) {
-		case IS_IDFAILED:
-		case IS_IDBADGUY:
-		case IS_IDNEEDED:
-			if (cryptoavail) {
-				// bad guy - no credits for you
-				return 1.0f;
-			}
-			break;
-		case IS_NOTAVAILABLE:
-		case IS_IDENTIFIED:
-			break;
+	switch (GetCurrentIdentState(address)) {
+	case IS_IDFAILED:
+	case IS_IDBADGUY:
+	case IS_IDNEEDED:
+		if (cryptoavail) {
+			// bad guy - no credits for you
+			return 1.0f;
+		}
+		break;
+	case IS_NOTAVAILABLE:
+	case IS_IDENTIFIED:
+		break;
 	}
 
+	return GetCreditRatio();
+}
+
+// The credit modifier without the identity gate above: what the peer's transfer history alone
+// earns it. This is the display value, shown by every peer list and by the API. Scoring calls
+// GetScoreRatio, which gates it -- a peer that has not proved itself is worth 1.0 to the queue,
+// but saying so in a Ratio column would only repeat what the Ident column already shows, and it
+// would swing to 1.0 for the second or two a reconnecting peer spends in IS_IDNEEDED. It also
+// has no identity to check in the credit store, where the record outlives every connection.
+float CClientCredits::GetCreditRatio() const
+{
 	if (GetDownloadedTotal() < 1000000) {
 		return 1.0f;
 	}
@@ -160,112 +164,143 @@
 	return result;
 }
 
+void CClientCredits::UpdateMeta(const wxString &name,
+	uint32 ip,
+	uint16 port,
+	uint16 kadPort,
+	uint32 version,
+	uint8 clientSoft,
+	uint8 sourceFrom,
+	uint8 obfuscation,
+	bool countSession)
+{
+	const uint32 now = time(nullptr);
+	if (m_meta.firstSeen == 0) {
+		// First sighting since this peer got a credit record. For a peer we already had
+		// credits for before the metadata existed, "first" means the first time we could
+		// record it, not the start of the relationship -- nLastSeen is the only older
+		// evidence and it says nothing about when things began.
+		m_meta.firstSeen = now;
+	}
+	if (countSession) {
+		m_meta.sessions++;
+	}
+
+	// Last known wins: a peer that renamed itself or moved address is better described by what
+	// it looks like now than by what it looked like once. An empty name is not an update -- it
+	// means the handshake carried none.
+	if (!name.IsEmpty()) {
+		m_meta.name = name;
+	}
+	m_meta.lastIP = ip;
+	m_meta.lastPort = port;
+	m_meta.kadPort = kadPort;
+	m_meta.version = version;
+	m_meta.clientSoft = clientSoft;
+	m_meta.sourceFrom = sourceFrom;
+	m_meta.obfuscation = obfuscation;
+}
 
 void CClientCredits::SetLastSeen()
 {
 	m_pCredits->nLastSeen = time(NULL);
 }
 
-
 void CClientCredits::InitalizeIdent()
 {
-	if (m_pCredits->nKeySize == 0 ){
-		memset(m_abyPublicKey,0,80); // for debugging
+	if (m_pCredits->nKeySize == 0) {
+		memset(m_abyPublicKey, 0, 80); // for debugging
 		m_nPublicKeyLen = 0;
 		m_identState = IS_NOTAVAILABLE;
-	}
-	else{
+	} else {
 		m_nPublicKeyLen = m_pCredits->nKeySize;
 		memcpy(m_abyPublicKey, m_pCredits->abySecureIdent, m_nPublicKeyLen);
 		m_identState = IS_IDNEEDED;
 	}
 	m_dwCryptRndChallengeFor = 0;
 	m_dwCryptRndChallengeFrom = 0;
-	m_dwIdentIP = 0;
+	m_identAddress = CNetworkAddress::Absent();
 }
 
-
-void CClientCredits::Verified(uint32 dwForIP)
+bool CClientCredits::Verified(const CNetworkAddress &address)
 {
-	m_dwIdentIP = dwForIP;
+	if (address.IsAbsent()) {
+		return false; // No endpoint to bind the verified identity to.
+	}
+	m_identAddress = PeerAddressing::IndexKey(address);
 	// client was verified, copy the keyto store him if not done already
-	if (m_pCredits->nKeySize == 0){
+	if (m_pCredits->nKeySize == 0) {
 		m_pCredits->nKeySize = m_nPublicKeyLen;
 		memcpy(m_pCredits->abySecureIdent, m_abyPublicKey, m_nPublicKeyLen);
-		if (GetDownloadedTotal() > 0){
+		if (GetDownloadedTotal() > 0) {
 			// for security reason, we have to delete all prior credits here
 			// in order to save this client, set 1 byte
 			m_pCredits->downloaded = 1;
 			m_pCredits->uploaded = 1;
-			AddDebugLogLineN( logCredits, "Credits deleted due to new SecureIdent" );
+			AddDebugLogLineN(logCredits, "Credits deleted due to new SecureIdent");
 		}
 	}
 	m_identState = IS_IDENTIFIED;
+	return true;
 }
 
-
-bool CClientCredits::SetSecureIdent(const uint8_t* pachIdent, uint8 nIdentLen)
+bool CClientCredits::SetSecureIdent(const uint8_t *pachIdent, uint8 nIdentLen)
 { // verified Public key cannot change, use only if there is not public key yet
-	if (MAXPUBKEYSIZE < nIdentLen || m_pCredits->nKeySize != 0 ) {
+	if (MAXPUBKEYSIZE < nIdentLen || m_pCredits->nKeySize != 0) {
 		return false;
 	}
-	memcpy(m_abyPublicKey,pachIdent, nIdentLen);
+	memcpy(m_abyPublicKey, pachIdent, nIdentLen);
 	m_nPublicKeyLen = nIdentLen;
 	m_identState = IS_IDNEEDED;
 	return true;
 }
 
-
-EIdentState	CClientCredits::GetCurrentIdentState(uint32 dwForIP) const
+EIdentState CClientCredits::GetCurrentIdentState(const CNetworkAddress &address) const
 {
 	if (m_identState != IS_IDENTIFIED)
 		return m_identState;
-	else{
-		if (dwForIP == m_dwIdentIP)
+	else {
+		if (PeerAddressing::IndexKey(address) == m_identAddress)
 			return IS_IDENTIFIED;
 		else
 			return IS_IDBADGUY;
-			// mod note: clients which just reconnected after an IP change and have to ident yet will also have this state for 1-2 seconds
-			//		 so don't try to spam such clients with "bad guy" messages (besides: spam messages are always bad)
+		// mod note: clients that just reconnected after an IP change and have yet to ident
+		// also hold this state for 1-2 seconds, so do not spam them with "bad guy"
+		// messages. (Besides: spam messages are always bad.)
 	}
 }
 
-
-uint64 CClientCredits::GetSecureWaitStartTime(uint32 dwForIP)
+uint64 CClientCredits::GetSecureWaitStartTime(const CNetworkAddress &address)
 {
 	if (m_dwUnSecureWaitTime == 0 || m_dwSecureWaitTime == 0)
-		SetSecWaitStartTime(dwForIP);
+		SetSecWaitStartTime(address);
 
-	if (m_pCredits->nKeySize != 0){	// this client is a SecureHash Client
-		if (GetCurrentIdentState(dwForIP) == IS_IDENTIFIED){ // good boy
+	if (m_pCredits->nKeySize != 0) {                              // this client is a SecureHash Client
+		if (GetCurrentIdentState(address) == IS_IDENTIFIED) { // good boy
 			return m_dwSecureWaitTime;
-		}
-		else{	// not so good boy
-			if (dwForIP == m_dwWaitTimeIP){
+		} else { // not so good boy
+			if (PeerAddressing::IndexKey(address) == m_waitTimeAddress) {
 				return m_dwUnSecureWaitTime;
-			}
-			else{	// bad boy
-				// this can also happen if the client has not identified himself yet, but will do later - so maybe he is not a bad boy :) .
+			} else { // bad boy
+				// this can also happen if the client has not identified himself yet, but will
+				// do later - so maybe he is not a bad boy :) .
 
 				m_dwUnSecureWaitTime = ::GetTickCount64();
-				m_dwWaitTimeIP = dwForIP;
+				m_waitTimeAddress = PeerAddressing::IndexKey(address);
 				return m_dwUnSecureWaitTime;
 			}
 		}
-	}
-	else{	// not a SecureHash Client - handle it like before for now (no security checks)
+	} else { // not a SecureHash Client - handle it like before for now (no security checks)
 		return m_dwUnSecureWaitTime;
 	}
 }
 
-
-void CClientCredits::SetSecWaitStartTime(uint32 dwForIP)
+void CClientCredits::SetSecWaitStartTime(const CNetworkAddress &address)
 {
-	m_dwUnSecureWaitTime = m_dwSecureWaitTime = ::GetTickCount64()-1;
-	m_dwWaitTimeIP = dwForIP;
+	m_dwUnSecureWaitTime = m_dwSecureWaitTime = ::GetTickCount64() - 1;
+	m_waitTimeAddress = PeerAddressing::IndexKey(address);
 }
 
-
 void CClientCredits::ClearWaitStartTime()
 {
 	m_dwUnSecureWaitTime = 0;

amule-3.0.1.tar.gz/src/ClientCredits.h -> amule-3.1.0.tar.gz/src/ClientCredits.h Changed

@@ -26,29 +26,74 @@
 #ifndef CLIENTCREDITS_H
 #define CLIENTCREDITS_H
 
-#include "MD4Hash.h"	// Needed for CMD4Hash
+#include "MD4Hash.h" // Needed for CMD4Hash
+#include "NetworkAddress.h"
 
-#define	 MAXPUBKEYSIZE		80
+#define MAXPUBKEYSIZE 80
 
-#define CRYPT_CIP_REMOTECLIENT	10
-#define CRYPT_CIP_LOCALCLIENT	20
-#define CRYPT_CIP_NONECLIENT	30
+#define CRYPT_CIP_REMOTECLIENT 10
+#define CRYPT_CIP_LOCALCLIENT 20
+#define CRYPT_CIP_NONECLIENT 30
 
 class CreditStruct
 {
 public:
 	CreditStruct();
 
-	CMD4Hash	key;
-	uint64		uploaded;		// uploaded TO him
-	uint64		downloaded;	// downloaded from him
-	uint32		nLastSeen; //uint32 stores seconds on disk, shall be good until Y2106
-	uint16		nReserved3;
-	uint8		nKeySize;
-	uint8_t		abySecureIdentMAXPUBKEYSIZE;
+	CMD4Hash key;
+	uint64 uploaded;   // uploaded TO him
+	uint64 downloaded; // downloaded from him
+	uint32 nLastSeen;  // uint32 stores seconds on disk, shall be good until Y2106
+	uint16 nReserved3;
+	uint8 nKeySize;
+	uint8_t abySecureIdentMAXPUBKEYSIZE;
 };
 
-enum EIdentState{
+/**
+ * What we remember about a peer beyond its credits, for the clients history.
+ *
+ * Deliberately separate from CreditStruct: that one mirrors the fixed 119-byte on-disk record aMule
+ * has always written and eMule also reads, and it must stay exactly as it is. This travels in a
+ * trailer appended after those records, which older readers never look at (they consume `count`
+ * records and stop), so adding fields here cannot cost anyone their credit history.
+ *
+ * Every field is a last-known value, captured while the peer was connected. Nothing here is
+ * authoritative -- a peer can change name, address or client between sessions -- so it is for
+ * describing who someone was, not for identifying them. The hash remains the identity.
+ */
+class ClientMetaStruct
+{
+public:
+	wxString name;    //!< last nickname seen, capped on write
+	uint32 firstSeen; //!< first time we ever saw this peer
+	uint32 sessions;  //!< how many times we have seen it since
+	uint32 lastIP;    //!< last known address, also feeds GeoIP at display time
+	uint16 lastPort;
+	uint16 kadPort;
+	uint32 version;    //!< numeric client version, rendered as a string
+	uint8 clientSoft;  //!< eMule / aMule / MLDonkey / ...
+	uint8 sourceFrom;  //!< server, kad, passive, incoming
+	uint8 obfuscation; //!< obfuscation support/status
+
+	ClientMetaStruct()
+	: firstSeen(0)
+	, sessions(0)
+	, lastIP(0)
+	, lastPort(0)
+	, kadPort(0)
+	, version(0)
+	, clientSoft(0)
+	, sourceFrom(0)
+	, obfuscation(0)
+	{
+	}
+
+	//! Nothing worth persisting until we have actually met the peer once.
+	bool IsPopulated() const { return firstSeen != 0; }
+};
+
+enum EIdentState
+{
 	IS_NOTAVAILABLE,
 	IS_IDNEEDED,
 	IS_IDENTIFIED,
@@ -60,41 +105,69 @@
 {
 
 public:
-	CClientCredits(CreditStruct* in_credits);
-	CClientCredits(const CMD4Hash& key);
+	CClientCredits(CreditStruct *in_credits);
+	CClientCredits(const CMD4Hash &key);
 	~CClientCredits();
 
-	const CMD4Hash& GetKey() const			{return m_pCredits->key;}
-	const uint8_t*	GetSecureIdent() const	{return m_abyPublicKey;}
-	uint8	GetSecIDKeyLen() const			{return m_nPublicKeyLen;}
-	const CreditStruct* GetDataStruct() const	{return m_pCredits;}
-	void	ClearWaitStartTime();
-	void	AddDownloaded(uint32 bytes, uint32 dwForIP, bool cryptoavail);
-	void	AddUploaded(uint32 bytes, uint32 dwForIP, bool cryptoavail);
-	uint64	GetUploadedTotal() const;
-	uint64	GetDownloadedTotal() const;
-	float	GetScoreRatio(uint32 dwForIP, bool cryptoavail);
-	void	SetLastSeen();
-	bool	SetSecureIdent(const uint8_t* pachIdent, uint8 nIdentLen); // Public key cannot change, use only if there is not public key yet
-	uint32	m_dwCryptRndChallengeFor;
-	uint32	m_dwCryptRndChallengeFrom;
-	EIdentState	GetCurrentIdentState(uint32 dwForIP) const; // can be != m_identState
-	uint64	GetSecureWaitStartTime(uint32 dwForIP);
-	void	SetSecWaitStartTime(uint32 dwForIP);
-	void	Verified(uint32 dwForIP);
+	const CMD4Hash &GetKey() const { return m_pCredits->key; }
+	const uint8_t *GetSecureIdent() const { return m_abyPublicKey; }
+	uint8 GetSecIDKeyLen() const { return m_nPublicKeyLen; }
+	const CreditStruct *GetDataStruct() const { return m_pCredits; }
+	void ClearWaitStartTime();
+	void AddDownloaded(uint32 bytes, const CNetworkAddress &address, bool cryptoavail);
+	void AddUploaded(uint32 bytes, const CNetworkAddress &address, bool cryptoavail);
+	uint64 GetUploadedTotal() const;
+	uint64 GetDownloadedTotal() const;
+	//! The queue-scoring value: GetCreditRatio(), forced to 1.0 for a peer that fails
+	//! secure identification. Callers that only display the number want GetCreditRatio().
+	float GetScoreRatio(const CNetworkAddress &address, bool cryptoavail) const;
+	//! The credit modifier earned by transfer history alone, with no identity gate.
+	float GetCreditRatio() const;
+	void SetLastSeen();
+	bool SetSecureIdent(const uint8_t *pachIdent,
+		uint8 nIdentLen); // Public key cannot change, use only if there is not public key yet
+	uint32 m_dwCryptRndChallengeFor;
+	uint32 m_dwCryptRndChallengeFrom;
+	EIdentState GetCurrentIdentState(const CNetworkAddress &address) const; // can be != m_identState
+	uint64 GetSecureWaitStartTime(const CNetworkAddress &address);
+	void SetSecWaitStartTime(const CNetworkAddress &address);
+	bool Verified(const CNetworkAddress &address);
 	EIdentState GetIdentState() const { return m_identState; }
-	void	SetIdentState(EIdentState state) { m_identState = state; }
+	void SetIdentState(EIdentState state) { m_identState = state; }
+
+	const ClientMetaStruct &GetMeta() const { return m_meta; }
+	bool HasMeta() const { return m_meta.IsPopulated(); }
+	//! Load-time restore from the clients.met trailer.
+	void SetMeta(const ClientMetaStruct &meta) { m_meta = meta; }
+	/**
+	 * Record what a connected peer looks like right now.
+	 *
+	 * `countSession` is the caller's answer to "is this a new sighting?" -- the handshake can
+	 * be processed more than once for one connection, and a session count that grew per packet
+	 * would say nothing.
+	 */
+	void UpdateMeta(const wxString &name,
+		uint32 ip,
+		uint16 port,
+		uint16 kadPort,
+		uint32 version,
+		uint8 clientSoft,
+		uint8 sourceFrom,
+		uint8 obfuscation,
+		bool countSession);
 
 private:
-	EIdentState		m_identState;
-	void			InitalizeIdent();
-	CreditStruct*		m_pCredits;
-	uint8_t			m_abyPublicKey80;		// even keys which are not verified will be stored here, and - if verified - copied into the struct
-	uint8			m_nPublicKeyLen;
-	uint32			m_dwIdentIP;
-	uint64			m_dwSecureWaitTime;
-	uint64			m_dwUnSecureWaitTime;
-	uint32			m_dwWaitTimeIP;			   // client IP assigned to the waittime
+	ClientMetaStruct m_meta;
+	EIdentState m_identState;
+	void InitalizeIdent();
+	CreditStruct *m_pCredits;
+	uint8_t m_abyPublicKey80; // even keys which are not verified will be stored here, and - if verified
+				    // - copied into the struct
+	uint8 m_nPublicKeyLen;
+	CNetworkAddress m_identAddress;
+	uint64 m_dwSecureWaitTime;
+	uint64 m_dwUnSecureWaitTime;
+	CNetworkAddress m_waitTimeAddress; // canonical peer address assigned to the waittime
 };
 
 #endif // CLIENTCREDITS_H

amule-3.0.1.tar.gz/src/ClientCreditsList.cpp -> amule-3.1.0.tar.gz/src/ClientCreditsList.cpp Changed

@@ -23,28 +23,25 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "ClientCreditsList.h"	// Interface declarations
-
+#include "ClientCreditsList.h" // Interface declarations
+#include "SecIdentPolicy.h"
 
 #include <protocol/ed2k/Constants.h>
 #include <common/Macros.h>
 #include <common/DataFileVersion.h>
-#include <common/FileFunctions.h>	// Needed for GetFileSize
-
-
-#include "GetTickCount.h"	// Needed for GetTickCount64
-#include "Preferences.h"	// Needed for thePrefs
-#include "ClientCredits.h"	// Needed for CClientCredits
-#include "amule.h"		// Needed for theApp
-#include "CFile.h"		// Needed for CFile
-#include "Logger.h"		// Needed for Add(Debug)LogLine
-#include "CryptoPP_Inc.h"	// Needed for Crypto functions
-
+#include <common/FileFunctions.h> // Needed for GetFileSize
 
-#define CLIENTS_MET_FILENAME		"clients.met"
-#define CLIENTS_MET_BAK_FILENAME	"clients.met.bak"
-#define CRYPTKEY_FILENAME		"cryptkey.dat"
+#include "GetTickCount.h"  // Needed for GetTickCount64
+#include "Preferences.h"   // Needed for thePrefs
+#include "ClientCredits.h" // Needed for CClientCredits
+#include "amule.h"         // Needed for theApp
+#include "CFile.h"         // Needed for CFile
+#include "Logger.h"        // Needed for Add(Debug)LogLine
+#include "CryptoPP_Inc.h"  // Needed for Crypto functions
 
+#define CLIENTS_MET_FILENAME "clients.met"
+#define CLIENTS_MET_BAK_FILENAME "clients.met.bak"
+#define CRYPTKEY_FILENAME "cryptkey.dat"
 
 CClientCreditsList::CClientCreditsList()
 {
@@ -54,13 +51,40 @@
 	InitalizeCrypting();
 }
 
-
 CClientCreditsList::~CClientCreditsList()
 {
 	DeleteContents(m_mapClients);
 	delete static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey);
 }
 
+namespace
+{
+/**
+ * The clients.met metadata trailer.
+ *
+ * Appended after the fixed 119-byte credit records rather than folded into them, and the file
+ * version stays at CREDITFILE_VERSION on purpose. Bumping that version is what would break
+ * compatibility, not adding data: an older aMule meeting a version it does not know logs
+ * "Creditfile is outdated and will be replaced" and returns without loading a single record, and
+ * the next save then overwrites the file -- every credit gone, on nothing worse than running a
+ * previous build once. The same byte is also the format shared with the eMule lineage.
+ *
+ * The loader reads exactly `count` records and stops; it never checks the file length and never
+ * looks further. So anything after the last record is invisible to every reader that predates this,
+ * and they keep loading the credits they always did. The cost is that such a reader's *save* drops
+ * the trailer, losing the metadata but never the credits.
+ *
+ * The magic makes presence unambiguous, since absence is the normal state for a file last written
+ * by an older build.
+ */
+const char kMetaMagic8 = { 'A', 'M', 'U', 'L', 'E', 'M', 'D', '1' };
+const uint8 kMetaVersion = 1;
+//! Names are attacker-supplied; cap what we store rather than what we read. Counted in characters,
+//! because that is what wxString::Left() takes -- a multi-byte name can occupy more bytes on disk,
+//! which the uint16 length field has ample room for. Storage sanity, not a bound the format depends
+//! on.
+const size_t kMetaMaxNameChars = 64;
+} // namespace
 
 void CClientCreditsList::LoadList()
 {
@@ -75,7 +99,7 @@
 		file.Open(fileName, CFile::read);
 
 		if (file.ReadUInt8() != CREDITFILE_VERSION) {
-			AddDebugLogLineC( logCredits, "Creditfile is outdated and will be replaced" );
+			AddDebugLogLineC(logCredits, "Creditfile is outdated and will be replaced");
 			file.Close();
 			return;
 		}
@@ -85,114 +109,180 @@
 
 		bool bCreateBackup = TRUE;
 		if (bakFileName.FileExists()) {
-			// Ok, the backup exist, get the size
 			CFile hBakFile(bakFileName);
-			if ( hBakFile.GetLength() > file.GetLength()) {
-				// the size of the backup was larger then the
-				// org. file, something is wrong here, don't
-				// overwrite old backup..
+			if (hBakFile.GetLength() > file.GetLength()) {
+				// The backup was larger than the original file, so something is
+				// wrong here; do not overwrite the old backup.
 				bCreateBackup = FALSE;
 			}
 			// else: backup is smaller or the same size as org.
 			// file, proceed with copying of file
 		}
 
-		//else: the backup doesn't exist, create it
+		// else: the backup doesn't exist, create it
 		if (bCreateBackup) {
 			file.Close(); // close the file before copying
-			if (!CPath::CloneFile(fileName, bakFileName, true)) {
-				AddDebugLogLineC(logCredits,
-					CFormat("Could not create backup file '%s'") % fileName);
+			// Small same-directory config backup (clients.met -> clients.met.bak); the
+			// plain wxCopyFile path is the right fit, not the buffered CFile::CloneFile
+			// used for large, possibly cross-filesystem data-file copies.
+			if (!CPath::BackupFile(fileName, wxT(".bak"))) {
+				AddDebugLogLineC(
+					logCredits, CFormat("Could not create backup file '%s'") % fileName);
 			}
-			// reopen file
 			if (!file.Open(fileName, CFile::read)) {
-				AddDebugLogLineC( logCredits,
-					"Failed to load creditfile" );
+				AddDebugLogLineC(logCredits, "Failed to load creditfile");
 				return;
 			}
 
 			file.Seek(1);
 		}
 
-
 		uint32 count = file.ReadUInt32();
 
 		const uint32 dwExpired = time(NULL) - 12960000; // today - 150 day
 		uint32 cDeleted = 0;
-		for (uint32 i = 0; i < count; i++){
-			CreditStruct* newcstruct = new CreditStruct();
-
-			newcstruct->key					= file.ReadHash();
-			newcstruct->uploaded            = file.ReadUInt32();
-			newcstruct->downloaded          = file.ReadUInt32();
-			newcstruct->nLastSeen           = file.ReadUInt32();
-			newcstruct->uploaded            += static_cast<uint64>(file.ReadUInt32()) << 32;
-			newcstruct->downloaded          += static_cast<uint64>(file.ReadUInt32()) << 32;
-			newcstruct->nReserved3          = file.ReadUInt16();
-			newcstruct->nKeySize            = file.ReadUInt8();
+		for (uint32 i = 0; i < count; i++) {
+			CreditStruct *newcstruct = new CreditStruct();
+
+			newcstruct->key = file.ReadHash();
+			newcstruct->uploaded = file.ReadUInt32();
+			newcstruct->downloaded = file.ReadUInt32();
+			newcstruct->nLastSeen = file.ReadUInt32();
+			newcstruct->uploaded += static_cast<uint64>(file.ReadUInt32()) << 32;
+			newcstruct->downloaded += static_cast<uint64>(file.ReadUInt32()) << 32;
+			newcstruct->nReserved3 = file.ReadUInt16();
+			newcstruct->nKeySize = file.ReadUInt8();
 			file.Read(newcstruct->abySecureIdent, MAXPUBKEYSIZE);
 
-			if ( newcstruct->nKeySize > MAXPUBKEYSIZE ) {
-				// Oh dear, this is bad mojo, the file is most likely corrupt
-				// We can no longer assume that any of the clients in the file are valid
-				// and will have to discard it.
+			if (newcstruct->nKeySize > MAXPUBKEYSIZE) {
+				// This is bad mojo: the file is most likely corrupt, so none of the
+				// clients in it can be assumed valid and it has to be discarded.
 				delete newcstruct;
 
 				DeleteContents(m_mapClients);
 
-				AddDebugLogLineC( logCredits,
-					"WARNING: Corruptions found while reading Creditfile!" );
+				AddDebugLogLineC(
+					logCredits, "WARNING: Corruptions found while reading Creditfile!");
 				return;
 			}
 
-			if (newcstruct->nLastSeen < dwExpired){
+			if (newcstruct->nLastSeen < dwExpired) {
 				cDeleted++;
 				delete newcstruct;
 				continue;
 			}
 
-			CClientCredits* newcredits = new CClientCredits(newcstruct);
+			CClientCredits *newcredits = new CClientCredits(newcstruct);
 			m_mapClientsnewcredits->GetKey() = newcredits;
 		}
 
-		AddLogLineN(CFormat(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) {
-			AddLogLineN(CFormat(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) {
+
+		LoadMetaTrailer(file);
+	} catch (const CSafeIOException &e) {
 		AddDebugLogLineC(logCredits, "IO error while loading clients.met file: " + e.what());
 	}
 }
 
+void CClientCreditsList::LoadMetaTrailer(CFile &file)
+{
+	// Optional by construction: a file written by any older build simply ends after the last
+	// record. Everything here is best-effort -- the credits are already loaded and must survive
+	// whatever this finds, so a trailer that is absent, truncated or unrecognised is dropped
+	// rather than treated as corruption.
+	try {
+		const uint64 remaining = file.GetLength() - file.GetPosition();
+		if (remaining < sizeof(kMetaMagic) + 1 + 4) {
+			return;
+		}
+
+		char magicsizeof(kMetaMagic);
+		file.Read(magic, sizeof(magic));
+		if (memcmp(magic, kMetaMagic, sizeof(magic)) != 0) {
+			AddDebugLogLineN(logCredits, "Trailing data in clients.met is not a metadata block");
+			return;
+		}
+		const uint8 version = file.ReadUInt8();
+		if (version != kMetaVersion) {
+			// A newer aMule wrote it. Same reasoning as the file version: do not guess
+			// at a layout we do not know, just leave the metadata behind. The credits
+			// are unaffected either way.
+			AddDebugLogLineN(logCredits,
+				CFormat("clients.met metadata is version %u, expected %u -- ignoring") %
+					version % kMetaVersion);
+			return;
+		}
+
+		const uint32 entries = file.ReadUInt32();
+		uint32 restored = 0;
+		for (uint32 i = 0; i < entries; i++) {
+			const CMD4Hash key = file.ReadHash();
+			ClientMetaStruct meta;
+			meta.firstSeen = file.ReadUInt32();
+			meta.sessions = file.ReadUInt32();
+			meta.lastIP = file.ReadUInt32();
+			meta.lastPort = file.ReadUInt16();
+			meta.kadPort = file.ReadUInt16();
+			meta.version = file.ReadUInt32();
+			meta.clientSoft = file.ReadUInt8();
+			meta.sourceFrom = file.ReadUInt8();
+			meta.obfuscation = file.ReadUInt8();
+			meta.name = file.ReadString(true, sizeof(uint16));
+
+			// Entries whose credit record is gone -- expired by the 150-day prune
+			// above, or dropped by a save from a build that did not know about them --
+			// describe a client we no longer track.
+			ClientMap::iterator it = m_mapClients.find(key);
+			if (it != m_mapClients.end()) {
+				it->second->SetMeta(meta);
+				restored++;
+			}
+		}
+		AddDebugLogLineN(
+			logCredits, CFormat("Restored metadata for %u of %u clients") % restored % entries);
+	} catch (const CSafeIOException &e) {
+		// Truncated or malformed: the credits are already in hand, so this is
+		// the end of what we can use, not a failure.
+		AddDebugLogLineN(logCredits, "Could not read clients.met metadata: " + e.what());
+	}
+}
 
 void CClientCreditsList::SaveList()
 {
-	AddDebugLogLineN( logCredits, "Saved Credit list");
+	AddDebugLogLineN(logCredits, "Saved Credit list");
 	m_nLastSaved = ::GetTickCount64();
 
 	wxString name(thePrefs::GetConfigDir() + CLIENTS_MET_FILENAME);
 	CFile file;
 
-	if ( !file.Create(name, true) ) {
-		AddDebugLogLineC( logCredits, "Failed to create creditfile" );
+	if (!file.Create(name, true)) {
+		AddDebugLogLineC(logCredits, "Failed to create creditfile");
 		return;
 	}
 
-	if ( file.Open(name, CFile::write) ) {
+	if (file.Open(name, CFile::write)) {
 		try {
 			uint32 count = 0;
 
-			file.WriteUInt8( CREDITFILE_VERSION );
-			// Temporary place-holder for number of structs
-			file.WriteUInt32( 0 );
+			file.WriteUInt8(CREDITFILE_VERSION);
+			file.WriteUInt32(0);
 
 			ClientMap::iterator it = m_mapClients.begin();
-			for ( ; it != m_mapClients.end(); ++it ) {
-				CClientCredits* cur_credit = it->second;
+			for (; it != m_mapClients.end(); ++it) {
+				CClientCredits *cur_credit = it->second;
 
-				if ( cur_credit->GetUploadedTotal() || cur_credit->GetDownloadedTotal() ) {
-					const CreditStruct* const cstruct = cur_credit->GetDataStruct();
+				if (cur_credit->GetUploadedTotal() || cur_credit->GetDownloadedTotal()) {
+					const CreditStruct *const cstruct = cur_credit->GetDataStruct();
 					file.WriteHash(cstruct->key);
 					file.WriteUInt32(static_cast<uint32>(cstruct->uploaded));
 					file.WriteUInt32(static_cast<uint32>(cstruct->downloaded));
@@ -207,10 +297,15 @@
 				}
 			}
 
-			// Write the actual number of structs
-			file.Seek( 1 );
-			file.WriteUInt32( count );
-		} catch (const CIOFailureException& e) {
+			file.Seek(1);
+			file.WriteUInt32(count);
+
+			// Append the metadata after the records, where older readers never look.
+			// Seek to the end explicitly: the count fixup above left the position at
+			// byte 5.
+			file.Seek(0, wxFromEnd);
+			SaveMetaTrailer(file);
+		} catch (const CIOFailureException &e) {
 			AddDebugLogLineC(logCredits, "IO failure while saving clients.met: " + e.what());
 		}
 	} else {
@@ -218,15 +313,75 @@
 	}
 }
 
+void CClientCreditsList::SaveMetaTrailer(CFile &file)
+{
+	// Only clients we have actually met since this existed carry metadata, so on a file
+	// inherited from an older build this writes nothing at all and the result stays byte-
+	// identical to what that build produced.
+	uint32 entries = 0;
+	for (const auto &entry : m_mapClients) {
+		const CClientCredits *cur = entry.second;
+		// Mirrors the record loop's own filter: a client with no traffic is not written
+		// above, so metadata for it would have no record to attach to on the next load.
+		if (cur->HasMeta() && (cur->GetUploadedTotal() || cur->GetDownloadedTotal())) {
+			entries++;
+		}
+	}
+	if (entries == 0) {
+		return;
+	}
+
+	try {
+		file.Write(kMetaMagic, sizeof(kMetaMagic));
+		file.WriteUInt8(kMetaVersion);
+		file.WriteUInt32(entries);
+
+		for (const auto &entry : m_mapClients) {
+			CClientCredits *cur = entry.second;
+			if (!cur->HasMeta() || !(cur->GetUploadedTotal() || cur->GetDownloadedTotal())) {
+				continue;
+			}
+			const ClientMetaStruct &meta = cur->GetMeta();
+			file.WriteHash(cur->GetKey());
+			file.WriteUInt32(meta.firstSeen);
+			file.WriteUInt32(meta.sessions);
+			file.WriteUInt32(meta.lastIP);
+			file.WriteUInt16(meta.lastPort);
+			file.WriteUInt16(meta.kadPort);
+			file.WriteUInt32(meta.version);
+			file.WriteUInt8(meta.clientSoft);
+			file.WriteUInt8(meta.sourceFrom);
+			file.WriteUInt8(meta.obfuscation);
+			// Two length bytes because CFileDataIO supports 0, 2 or 4 and rejects
+			// anything else: a 1-byte prefix throws "Invalid length for string-length
+			// field" from inside the write, which the handler below would swallow,
+			// leaving a trailer truncated mid-entry. The cap is enforced here, not by
+			// the field width.
+			file.WriteString(meta.name.Left(kMetaMaxNameChars), utf8strRaw, sizeof(uint16));
+		}
+	} catch (const CIOFailureException &e) {
+		// The records are already on disk and intact; losing the trailer costs
+		// the metadata only, which is why it is written last.
+		AddDebugLogLineC(logCredits, "IO failure while saving clients.met metadata: " + e.what());
+	}
+}
 
-CClientCredits* CClientCreditsList::GetCredit(const CMD4Hash& key)
+void CClientCreditsList::GetAllCredits(std::vector<CClientCredits *> &result) const
 {
-	CClientCredits* result;
+	result.clear();
+	result.reserve(m_mapClients.size());
+	for (const auto &entry : m_mapClients) {
+		result.push_back(entry.second);
+	}
+}
 
-	ClientMap::iterator it = m_mapClients.find( key );
+CClientCredits *CClientCreditsList::GetCredit(const CMD4Hash &key)
+{
+	CClientCredits *result;
 
+	ClientMap::iterator it = m_mapClients.find(key);
 
-	if ( it == m_mapClients.end() ){
+	if (it == m_mapClients.end()) {
 		result = new CClientCredits(key);
 		m_mapClientsresult->GetKey() = result;
 	} else {
@@ -238,14 +393,12 @@
 	return result;
 }
 
-
 void CClientCreditsList::Process()
 {
 	if (::GetTickCount64() - m_nLastSaved > MIN2MS(13))
 		SaveList();
 }
 
-
 bool CClientCreditsList::CreateKeyPair()
 {
 	try {
@@ -260,17 +413,12 @@
 		privkey.DEREncode(*privkeysink);
 		privkeysink->MessageEnd();
 
-		// Do not delete these pointers or it will blow in your face.
-		// cryptopp semantics is giving ownership of these objects.
-		//
-		// delete privkeysink;
-		// delete fileSink;
+		// Do not delete these pointers: cryptopp takes ownership of them.
 
 		AddDebugLogLineN(logCredits, "Created new RSA keypair");
-	} catch(const CryptoPP::Exception& e) {
+	} catch (const CryptoPP::Exception &e) {
 		AddDebugLogLineC(logCredits,
-			wxString("Failed to create new RSA keypair: ") +
-			wxString(char2unicode(e.what())));
+			wxString("Failed to create new RSA keypair: ") + wxString(char2unicode(e.what())));
 		wxFAIL;
 		return false;
 	}
@@ -278,11 +426,10 @@
 	return true;
 }
 
-
 void CClientCreditsList::InitalizeCrypting()
 {
 	m_nMyPublicKeyLen = 0;
-	memset(m_abyMyPublicKey,0,80); // not really needed; better for debugging tho
+	memset(m_abyMyPublicKey, 0, 80); // not really needed; better for debugging tho
 	m_pSignkey = NULL;
 
 	if (!thePrefs::IsSecureIdentEnabled()) {
@@ -290,166 +437,185 @@
 	}
 
 	try {
-		// check if keyfile is there
 		if (wxFileExists(thePrefs::GetConfigDir() + CRYPTKEY_FILENAME)) {
 			off_t keySize = CPath::GetFileSize(thePrefs::GetConfigDir() + CRYPTKEY_FILENAME);
 
 			if (keySize == wxInvalidOffset) {
-				AddDebugLogLineC(logCredits, "Cannot access 'cryptkey.dat', please check permissions.");
+				AddDebugLogLineC(logCredits,
+					"Cannot access 'cryptkey.dat', please check permissions.");
 				return;
 			} else if (keySize == 0) {
 				AddDebugLogLineC(logCredits, "'cryptkey.dat' is empty, recreating keypair.");
 				CreateKeyPair();
 			}
 		} else {
-			AddLogLineN(_("No 'cryptkey.dat' file found, creating.") );
+			AddLogLineN(_("No 'cryptkey.dat' file found, creating."));
 			CreateKeyPair();
 		}
 
-		// load private key
-		CryptoPP::FileSource filesource(filename2char(thePrefs::GetConfigDir() + CRYPTKEY_FILENAME), true, new CryptoPP::Base64Decoder);
+		CryptoPP::FileSource filesource(filename2char(thePrefs::GetConfigDir() + CRYPTKEY_FILENAME),
+			true,
+			new CryptoPP::Base64Decoder);
 		m_pSignkey = new CryptoPP::RSASSA_PKCS1v15_SHA_Signer(filesource);
-		// calculate and store public key
-		CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey));
+		CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(
+			*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey));
 		CryptoPP::ArraySink asink(m_abyMyPublicKey, 80);
 		pubkey.GetMaterial().Save(asink);
 		m_nMyPublicKeyLen = asink.TotalPutLength();
 		asink.MessageEnd();
-	} catch (const CryptoPP::Exception& e) {
+	} catch (const CryptoPP::Exception &e) {
 		delete static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey);
 		m_pSignkey = NULL;
 
 		AddDebugLogLineC(logCredits,
 			wxString("Error while initializing encryption keys: ") +
-			wxString(char2unicode(e.what())));
+				wxString(char2unicode(e.what())));
 	}
 }
 
-
-uint8 CClientCreditsList::CreateSignature(CClientCredits* pTarget, uint8_t* pachOutput, uint8 nMaxSize, uint32 ChallengeIP, uint8 byChaIPKind, void* sigkey)
+uint8 CClientCreditsList::CreateSignature(CClientCredits *pTarget,
+	uint8_t *pachOutput,
+	uint8 nMaxSize,
+	uint32 ChallengeIP,
+	uint8 byChaIPKind,
+	void *sigkey)
 {
-	CryptoPP::RSASSA_PKCS1v15_SHA_Signer* signer =
+	CryptoPP::RSASSA_PKCS1v15_SHA_Signer *signer =
 		static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(sigkey);
 	// signer param is used for debug only
 	if (signer == NULL)
 		signer = static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey);
 
-	// create a signature of the public key from pTarget
-	wxASSERT( pTarget );
-	wxASSERT( pachOutput );
+	wxASSERT(pTarget);
+	wxASSERT(pachOutput);
 
-	if ( !CryptoAvailable() ) {
+	if (!CryptoAvailable()) {
 		return 0;
 	}
 
 	try {
 		CryptoPP::SecByteBlock sbbSignature(signer->SignatureLength());
 		CryptoPP::AutoSeededX917RNG<CryptoPP::DES_EDE3> rng;
-		uint8_t abyBufferMAXPUBKEYSIZE+9;
+		uint8_t abyBufferMAXPUBKEYSIZE + 9;
 		uint32 keylen = pTarget->GetSecIDKeyLen();
-		memcpy(abyBuffer,pTarget->GetSecureIdent(),keylen);
+		memcpy(abyBuffer, pTarget->GetSecureIdent(), keylen);
 		// 4 additional bytes random data send from this client
 		uint32 challenge = pTarget->m_dwCryptRndChallengeFrom;
-		wxASSERT ( challenge != 0 );
-		PokeUInt32(abyBuffer+keylen,challenge);
+		wxASSERT(challenge != 0);
+		PokeUInt32(abyBuffer + keylen, challenge);
 
 		uint16 ChIpLen = 0;
-		if ( byChaIPKind != 0){
+		if (byChaIPKind != 0) {
 			ChIpLen = 5;
-			PokeUInt32(abyBuffer+keylen+4, ChallengeIP);
-			PokeUInt8(abyBuffer+keylen+4+4,byChaIPKind);
+			PokeUInt32(abyBuffer + keylen + 4, ChallengeIP);
+			PokeUInt8(abyBuffer + keylen + 4 + 4, byChaIPKind);
 		}
-		signer->SignMessage(rng, abyBuffer ,keylen+4+ChIpLen , sbbSignature.begin());
+		signer->SignMessage(rng, abyBuffer, keylen + 4 + ChIpLen, sbbSignature.begin());
 		CryptoPP::ArraySink asink(pachOutput, nMaxSize);
 		asink.Put(sbbSignature.begin(), sbbSignature.size());
 
 		return asink.TotalPutLength();
-	} catch (const CryptoPP::Exception& e) {
-		AddDebugLogLineC(logCredits, wxString("Error while creating signature: ") + wxString(char2unicode(e.what())));
+	} catch (const CryptoPP::Exception &e) {
+		AddDebugLogLineC(logCredits,
+			wxString("Error while creating signature: ") + wxString(char2unicode(e.what())));
 		wxFAIL;
 
 		return 0;
 	}
 }
 
-
-bool CClientCreditsList::VerifyIdent(CClientCredits* pTarget, const uint8_t* pachSignature, uint8 nInputSize, uint32 dwForIP, uint8 byChaIPKind)
+bool CClientCreditsList::VerifyIdent(CClientCredits *pTarget,
+	const uint8_t *pachSignature,
+	uint8 nInputSize,
+	const CNetworkAddress &address,
+	uint8 byChaIPKind)
 {
-	wxASSERT( pTarget );
-	wxASSERT( pachSignature );
-	if ( !CryptoAvailable() ){
+	wxASSERT(pTarget);
+	wxASSERT(pachSignature);
+	// A verified identity is bound to the endpoint it was proved on, so there has to be one.
+	if (address.IsAbsent()) {
+		return false;
+	}
+	if (!CryptoAvailable()) {
 		pTarget->SetIdentState(IS_NOTAVAILABLE);
 		return false;
 	}
 	bool bResult;
 	try {
-		CryptoPP::StringSource ss_Pubkey((uint8_t*)pTarget->GetSecureIdent(),pTarget->GetSecIDKeyLen(),true,0);
+		CryptoPP::StringSource ss_Pubkey(
+			(uint8_t *)pTarget->GetSecureIdent(), pTarget->GetSecIDKeyLen(), true, 0);
 		CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(ss_Pubkey);
 		// 4 additional bytes random data send from this client +5 bytes v2
-		uint8_t abyBufferMAXPUBKEYSIZE+9;
-		memcpy(abyBuffer,m_abyMyPublicKey,m_nMyPublicKeyLen);
+		uint8_t abyBufferMAXPUBKEYSIZE + 9;
+		memcpy(abyBuffer, m_abyMyPublicKey, m_nMyPublicKeyLen);
 		uint32 challenge = pTarget->m_dwCryptRndChallengeFor;
-		wxASSERT ( challenge != 0 );
-		PokeUInt32(abyBuffer+m_nMyPublicKeyLen, challenge);
+		wxASSERT(challenge != 0);
+		PokeUInt32(abyBuffer + m_nMyPublicKeyLen, challenge);
 
 		// v2 security improvements (not supported by 29b, not used as default by 29c)
 		uint8 nChIpSize = 0;
-		if (byChaIPKind != 0){
+		if (byChaIPKind != 0) {
 			nChIpSize = 5;
 			uint32 ChallengeIP = 0;
 			switch (byChaIPKind) {
-				case CRYPT_CIP_LOCALCLIENT:
-					ChallengeIP = dwForIP;
-					break;
-				case CRYPT_CIP_REMOTECLIENT:
-					// Ignore local ip...
-					if (!theApp->GetPublicIP(true)) {
-						if (::IsLowID(theApp->GetED2KID())){
-							AddDebugLogLineN(logCredits, "Warning: Maybe SecureHash Ident fails because LocalIP is unknown");
-							// Fallback to local ip...
-							ChallengeIP = theApp->GetPublicIP();
-						} else {
-							ChallengeIP = theApp->GetED2KID();
-						}
-					} else {
+			case CRYPT_CIP_LOCALCLIENT:
+				// The only kind that signs the peer's own address, so the only one that
+				// needs it. v2 signs exactly four IPv4 bytes.
+				if (!SecIdent::PeerIPv4(address, ChallengeIP)) {
+					return false;
+				}
+				break;
+			case CRYPT_CIP_REMOTECLIENT:
+				// Ignore local ip...
+				if (!theApp->GetPublicIP(true)) {
+					if (::IsLowID(theApp->GetED2KID())) {
+						AddDebugLogLineN(logCredits,
+							"Warning: Maybe SecureHash Ident fails because "
+							"LocalIP is unknown");
+						// Fallback to local ip...
 						ChallengeIP = theApp->GetPublicIP();
+					} else {
+						ChallengeIP = theApp->GetED2KID();
 					}
-					break;
-				case CRYPT_CIP_NONECLIENT: // maybe not supported in future versions
-					ChallengeIP = 0;
-					break;
+				} else {
+					ChallengeIP = theApp->GetPublicIP();
+				}
+				break;
+			case CRYPT_CIP_NONECLIENT: // maybe not supported in future versions
+				ChallengeIP = 0;
+				break;
 			}
-			PokeUInt32(abyBuffer+m_nMyPublicKeyLen+4, ChallengeIP);
-			PokeUInt8(abyBuffer+m_nMyPublicKeyLen+4+4, byChaIPKind);
+			PokeUInt32(abyBuffer + m_nMyPublicKeyLen + 4, ChallengeIP);
+			PokeUInt8(abyBuffer + m_nMyPublicKeyLen + 4 + 4, byChaIPKind);
 		}
-		//v2 end
+		// v2 end
 
-		bResult = pubkey.VerifyMessage(abyBuffer, m_nMyPublicKeyLen+4+nChIpSize, pachSignature, nInputSize);
-	} catch (const CryptoPP::Exception& e) {
-		AddDebugLogLineC(logCredits, wxString("Error while verifying identity: ") + wxString(char2unicode(e.what())));
+		bResult = pubkey.VerifyMessage(
+			abyBuffer, m_nMyPublicKeyLen + 4 + nChIpSize, pachSignature, nInputSize);
+	} catch (const CryptoPP::Exception &e) {
+		AddDebugLogLineC(logCredits,
+			wxString("Error while verifying identity: ") + wxString(char2unicode(e.what())));
 		bResult = false;
 	}
 
-	if (!bResult){
+	if (!bResult) {
 		if (pTarget->GetIdentState() == IS_IDNEEDED)
 			pTarget->SetIdentState(IS_IDFAILED);
 	} else {
-		pTarget->Verified(dwForIP);
+		return pTarget->Verified(address);
 	}
 
 	return bResult;
 }
 
-
 bool CClientCreditsList::CryptoAvailable() const
 {
 	return m_nMyPublicKeyLen > 0 && m_pSignkey != NULL;
 }
 
-
 #ifdef _DEBUG
-bool CClientCreditsList::Debug_CheckCrypting(){
-	// create random key
+bool CClientCreditsList::Debug_CheckCrypting()
+{
 	CryptoPP::AutoSeededX917RNG<CryptoPP::DES_EDE3> rng;
 
 	CryptoPP::RSASSA_PKCS1v15_SHA_Signer priv(rng, 384);
@@ -462,30 +628,26 @@
 	asink.MessageEnd();
 	uint32 challenge = rand();
 	// create fake client which pretends to be this emule
-	CreditStruct* newcstruct = new CreditStruct();
+	CreditStruct *newcstruct = new CreditStruct();
 	CClientCredits newcredits(newcstruct);
-	newcredits.SetSecureIdent(m_abyMyPublicKey,m_nMyPublicKeyLen);
+	newcredits.SetSecureIdent(m_abyMyPublicKey, m_nMyPublicKeyLen);
 	newcredits.m_dwCryptRndChallengeFrom = challenge;
-	// create signature with fake priv key
 	uint8_t pachSignature200;
-	memset(pachSignature,0,200);
-	uint8 sigsize = CreateSignature(&newcredits,pachSignature,200,0,false, &priv);
-
+	memset(pachSignature, 0, 200);
+	uint8 sigsize = CreateSignature(&newcredits, pachSignature, 200, 0, false, &priv);
 
 	// next fake client uses the random created public key
-	CreditStruct* newcstruct2 = new CreditStruct();
+	CreditStruct *newcstruct2 = new CreditStruct();
 	CClientCredits newcredits2(newcstruct2);
 	newcredits2.m_dwCryptRndChallengeFor = challenge;
 
-	// if you uncomment one of the following lines the check has to fail
-	//abyPublicKey5 = 34;
-	//m_abyMyPublicKey5 = 22;
-	//pachSignature5 = 232;
+	// Uncommenting any of abyPublicKey5 = 34, m_abyMyPublicKey5 = 22 or
+	// pachSignature5 = 232 makes the check below fail, as it should.
 
-	newcredits2.SetSecureIdent(abyPublicKey,PublicKeyLen);
+	newcredits2.SetSecureIdent(abyPublicKey, PublicKeyLen);
 
-	//now verify this signature - if it's true everything is fine
-	return VerifyIdent(&newcredits2,pachSignature,sigsize,0,0);
+	// now verify this signature - if it's true everything is fine
+	return VerifyIdent(&newcredits2, pachSignature, sigsize, CNetworkAddress::FromIPv4NetworkOrder(0), 0);
 }
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ClientCreditsList.h -> amule-3.1.0.tar.gz/src/ClientCreditsList.h Changed

@@ -26,11 +26,14 @@
 #ifndef CLIENTCREDITSLIST_H
 #define CLIENTCREDITSLIST_H
 
-#include "MD4Hash.h"	// Needed for CMD4Hash
+#include "MD4Hash.h" // Needed for CMD4Hash
 
 #include <map>
+#include <vector>
 
+class CNetworkAddress;
 class CClientCredits;
+class CFile;
 
 class CClientCreditsList
 {
@@ -39,30 +42,61 @@
 	~CClientCreditsList();
 
 	// return signature size, 0 = Failed | use sigkey param for debug only
-	uint8	CreateSignature(CClientCredits* pTarget, uint8_t* pachOutput, uint8 nMaxSize, uint32 ChallengeIP, uint8 byChaIPKind, void* sigkey = NULL);
-	bool	VerifyIdent(CClientCredits* pTarget, const uint8_t* pachSignature, uint8 nInputSize, uint32 dwForIP, uint8 byChaIPKind);
+	uint8 CreateSignature(CClientCredits *pTarget,
+		uint8_t *pachOutput,
+		uint8 nMaxSize,
+		uint32 ChallengeIP,
+		uint8 byChaIPKind,
+		void *sigkey = NULL);
+	bool VerifyIdent(CClientCredits *pTarget,
+		const uint8_t *pachSignature,
+		uint8 nInputSize,
+		const CNetworkAddress &address,
+		uint8 byChaIPKind);
+
+	CClientCredits *GetCredit(const CMD4Hash &key);
+
+	/**
+	 * Every peer we have ever exchanged data with, for the clients history.
+	 *
+	 * A snapshot rather than access to the map: the caller wants to sort and display it, and
+	 * handing out iterators into the live store would make every future change to how credits
+	 * are held a change to its callers as well. Copying is affordable because this is read once
+	 * when the page is opened, not per refresh -- on a five-month-old node the store holds
+	 * around forty thousand records, and nothing about them changes between one poll and the
+	 * next.
+	 */
+	void GetAllCredits(std::vector<CClientCredits *> &result) const;
+
+	//! How many records the store holds, without materialising them.
+	size_t GetCreditCount() const { return m_mapClients.size(); }
+
+	void Process();
+	uint8 GetPubKeyLen() const { return m_nMyPublicKeyLen; }
+	const uint8_t *GetPublicKey() const { return m_abyMyPublicKey; }
+	bool CryptoAvailable() const;
+	void SaveList();
 
-	CClientCredits* GetCredit(const CMD4Hash& key);
-	void	Process();
-	uint8	GetPubKeyLen() const			{return m_nMyPublicKeyLen;}
-	const uint8_t*	GetPublicKey() const	{return m_abyMyPublicKey;}
-	bool	CryptoAvailable() const;
-	void	SaveList();
 protected:
-	void	LoadList();
-	void	InitalizeCrypting();
-	bool	CreateKeyPair();
+	void LoadList();
+	//! Optional metadata block after the credit records -- see the comment on
+	//! kMetaMagic for why it lives there rather than in the records.
+	void LoadMetaTrailer(CFile &file);
+	void SaveMetaTrailer(CFile &file);
+	void InitalizeCrypting();
+	bool CreateKeyPair();
 #ifdef _DEBUG
-	bool	Debug_CheckCrypting();
+	bool Debug_CheckCrypting();
 #endif
+
 private:
-	typedef std::map<CMD4Hash, CClientCredits*> ClientMap;
-	ClientMap	m_mapClients;
-	uint64		m_nLastSaved;
+	typedef std::map<CMD4Hash, CClientCredits *> ClientMap;
+	ClientMap m_mapClients;
+	uint64 m_nLastSaved;
 	// A void* to avoid having to include the large CryptoPP.h file
-	void*		m_pSignkey;
-	uint8_t		m_abyMyPublicKey80;
-	uint8		m_nMyPublicKeyLen;
+	void *m_pSignkey;
+	uint8_t m_abyMyPublicKey80;
+	uint8 m_nMyPublicKeyLen;
 };
 
 #endif // CLIENTCREDITSLIST_H

amule-3.0.1.tar.gz/src/ClientDetailDialog.cpp -> amule-3.1.0.tar.gz/src/ClientDetailDialog.cpp Changed

@@ -23,98 +23,130 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "ClientDetailDialog.h"	// Interface declarations
-#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 "muuli_wdr.h"		// Needed for ID_CLOSEWND
-#include "Preferences.h"	// Needed for thePrefs
+#include "ClientDetailDialog.h" // Interface declarations
+#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 "muuli_wdr.h"          // Needed for ID_CLOSEWND
+#include "Preferences.h"        // Needed for thePrefs
 
 // CClientDetailDialog dialog
 
-wxBEGIN_EVENT_TABLE(CClientDetailDialog,wxDialog)
-	EVT_BUTTON(ID_CLOSEWND,CClientDetailDialog::OnBnClose)
+wxBEGIN_EVENT_TABLE(CClientDetailDialog, wxDialog)
+	EVT_BUTTON(ID_CLOSEWND, CClientDetailDialog::OnBnClose)
 wxEND_EVENT_TABLE()
 
+ClientDetailInfo ClientDetailInfoFromClient(const CClientRef &client)
+{
+	CClientRef &c = const_cast<CClientRef &>(client);
+	ClientDetailInfo info;
+	info.userName = c.GetUserName();
+	info.userHash = c.GetUserHash();
+	info.softStr = c.GetSoftStr();
+	info.osInfo = c.GetClientOSInfo();
+	info.softVerStr = c.GetSoftVerStr();
+	info.fullIp = c.GetFullIP();
+	info.userPort = c.GetUserPort();
+	info.obfuscationStatus = c.GetObfuscationStatus();
+	info.uploadedTotal = c.GetUploadedTotal();
+	info.downloadedTotal = c.GetDownloadedTotal();
+
+	info.hasSession = true;
+	info.userIdHybrid = c.GetUserIDHybrid();
+	info.lowId = c.HasLowID();
+	info.serverIp = c.GetServerIP();
+	info.serverPort = c.GetServerPort();
+	info.serverName = c.GetServerName();
+	info.kadPort = c.GetKadPort();
+	info.modCapabilities = c.GetModCapabilitiesText();
+	info.uploadFile = c.GetUploadFile();
+	info.transferredDown = c.GetTransferredDown();
+	info.transferredUp = c.GetTransferredUp();
+	info.kBpsDown = c.GetKBpsDown();
+	info.uploadDatarate = c.GetUploadDatarate();
+	info.creditRatio = c.GetCreditRatio();
+	// 0 is what the getter returns for a peer with no credit record, which is not a modifier.
+	info.hasCreditRatio = info.creditRatio > 0.0;
+	info.secureIdentStatus = c.GetSecureIdentTextStatus();
+	info.uploadState = c.GetUploadState();
+	info.queueRank = c.GetUploadQueueWaitingPosition();
+	info.score = c.GetScore();
+	return info;
+}
 
-CClientDetailDialog::CClientDetailDialog(
-	wxWindow *parent,
-	const CClientRef& client)
-:
-wxDialog(
-	parent,
-	9997,
-	_("Client Details"),
-	wxDefaultPosition,
-	wxDefaultSize,
-	wxDEFAULT_DIALOG_STYLE)
+// Both constructors run the same setup; only where m_info came from differs.
+void CClientDetailDialog::Build()
 {
-	m_client = client;
-	wxSizer* content = clientDetails(this, true);
-	// The Close button uses ID_CLOSEWND rather than wxID_CANCEL, so
-	// wxDialog doesn't auto-bind Escape to it. Tell wxDialog to treat
-	// ID_CLOSEWND as the escape target so pressing Escape dismisses
-	// the dialog the same way clicking Close does.
+	wxSizer *content = clientDetails(this, true);
+	// The Close button uses ID_CLOSEWND rather than wxID_CANCEL, so wxDialog does not auto-bind
+	// Escape to it; name it as the escape target so Escape dismisses the dialog the way Close
+	// does.
 	SetEscapeId(ID_CLOSEWND);
 	OnInitDialog();
 	content->SetSizeHints(this);
 	content->Show(this, true);
 }
 
-CClientDetailDialog::~CClientDetailDialog()
+CClientDetailDialog::CClientDetailDialog(wxWindow *parent, const CClientRef &client)
+: wxDialog(parent, 9997, _("Client Details"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+{
+	m_info = ClientDetailInfoFromClient(client);
+	Build();
+}
+
+CClientDetailDialog::CClientDetailDialog(wxWindow *parent, const ClientDetailInfo &info)
+: wxDialog(parent, 9997, _("Client Details"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
+	m_info = info;
+	Build();
 }
 
-void CClientDetailDialog::OnBnClose(wxCommandEvent& WXUNUSED(evt))
+CClientDetailDialog::~CClientDetailDialog() {}
+
+void CClientDetailDialog::OnBnClose(wxCommandEvent &WXUNUSED(evt))
 {
 	EndModal(0);
 }
 
-bool CClientDetailDialog::OnInitDialog() {
-	// Username, Userhash
-	if (!m_client.GetUserName().IsEmpty()) {
-		CastChild(ID_DNAME, wxStaticText)->SetLabel(
-			m_client.GetUserName());
-		// if we have client name we have userhash
-		wxASSERT(!m_client.GetUserHash().IsEmpty());
-		CastChild(ID_DHASH, wxStaticText)->SetLabel(
-			m_client.GetUserHash().Encode());
+bool CClientDetailDialog::OnInitDialog()
+{
+	// The dash the session fields fall back to when there is no live peer behind this dialog.
+	// Not "0": a zero rate or a zero queue rank is a measurement, and these are the absence of
+	// one.
+	static const wxString kNoValue = "-";
+
+	// Username and hash are reported independently: a credit record keeps a hash long before it
+	// has a name, because the core only writes the name out at disconnect, so the two are not
+	// known together.
+	CastChild(ID_DNAME, wxStaticText)
+		->SetLabel(m_info.userName.IsEmpty() ? _("Unknown") : m_info.userName);
+	CastChild(ID_DHASH, wxStaticText)
+		->SetLabel(m_info.userHash.IsEmpty() ? _("Unknown") : m_info.userHash.Encode());
+
+	if (!m_info.osInfo.IsEmpty()) {
+		CastChild(ID_DSOFT, wxStaticText)->SetLabel(m_info.softStr + " (" + m_info.osInfo + ")");
 	} else {
-		CastChild(ID_DNAME, wxStaticText)->SetLabel(_("Unknown"));
-		CastChild(ID_DHASH, wxStaticText)->SetLabel(_("Unknown"));
+		CastChild(ID_DSOFT, wxStaticText)->SetLabel(m_info.softStr);
 	}
 
-	// Client Software
-	wxString OSInfo = m_client.GetClientOSInfo();
-	if (!OSInfo.IsEmpty()) {
-		CastChild(ID_DSOFT, wxStaticText)->SetLabel(
-			m_client.GetSoftStr()+" ("+OSInfo+")");
-	} else {
-		CastChild(ID_DSOFT, wxStaticText)->SetLabel(
-			m_client.GetSoftStr());
-	}
+	CastChild(ID_DVERSION, wxStaticText)->SetLabel(m_info.softVerStr);
+
+	CastChild(ID_DID, wxStaticText)
+		->SetLabel(m_info.hasSession ? wxString(CFormat("%u (%s)") % m_info.userIdHybrid %
+							(m_info.lowId ? _("LowID") : _("HighID")))
+					     : kNoValue);
 
-	// Client Version
-	CastChild(ID_DVERSION, wxStaticText)->SetLabel(
-		m_client.GetSoftVerStr());
-
-	// User ID
-	CastChild(ID_DID, wxStaticText)->SetLabel(
-		CFormat("%u (%s)") % m_client.GetUserIDHybrid() % (m_client.HasLowID() ? _("LowID") : _("HighID")));
-
-	// Client IP/Port
-	CastChild(ID_DIP, wxStaticText)->SetLabel(
-		CFormat("%s:%i") % m_client.GetFullIP() % m_client.GetUserPort());
-
-	// Server IP/Port/Name
-	if (m_client.GetServerIP()) {
-		wxString srvaddr = Uint32toStringIP(m_client.GetServerIP());
-		CastChild(ID_DSIP, wxStaticText)->SetLabel(
-			CFormat("%s:%i") % srvaddr % m_client.GetServerPort());
-		CastChild(ID_DSNAME, wxStaticText)->SetLabel(
-			m_client.GetServerName());
+	CastChild(ID_DIP, wxStaticText)
+		->SetLabel(m_info.fullIp.IsEmpty()
+				   ? kNoValue
+				   : wxString(CFormat("%s:%i") % m_info.fullIp % m_info.userPort));
+
+	if (m_info.serverIp) {
+		wxString srvaddr = Uint32toStringIP(m_info.serverIp);
+		CastChild(ID_DSIP, wxStaticText)->SetLabel(CFormat("%s:%i") % srvaddr % m_info.serverPort);
+		CastChild(ID_DSNAME, wxStaticText)->SetLabel(m_info.serverName);
 	} else {
 		CastChild(ID_DSIP, wxStaticText)->SetLabel(_("Unknown"));
 		CastChild(ID_DSNAME, wxStaticText)->SetLabel(_("Unknown"));
@@ -122,72 +154,99 @@
 
 	// Obfuscation
 	wxString buffer;
-	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;
+	switch (m_info.obfuscationStatus) {
+	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);
 
+	// Protocol extensions the peer claims -- not what this build can do with them: aMule
+	// implements none of these yet, so the line reads as "this peer would support X if we did".
+	//
+	// Label and value are both hidden when there is nothing to claim, rather than shown with a
+	// placeholder. Almost no peer on the network sets any of these bits, and a stored row has
+	// no hello to read at all, so the alternative is a row reading "None" or "-" for nearly
+	// every peer, permanently. Hiding both controls leaves no gap: the sizer skips a hidden
+	// pair, and Layout() below reflows what is left.
+	const bool hasCapabilities = m_info.hasSession && !m_info.modCapabilities.IsEmpty();
+	CastChild(IDT_MOD_CAPABILITIES_LABEL, wxStaticText)->Show(hasCapabilities);
+	wxStaticText *capabilities = CastChild(IDT_MOD_CAPABILITIES, wxStaticText);
+	capabilities->Show(hasCapabilities);
+	if (hasCapabilities) {
+		capabilities->SetLabel(m_info.modCapabilities);
+	}
+
 	// Kad
-	if (m_client.GetKadPort()) {
+	if (!m_info.hasSession) {
+		CastChild(IDT_KAD, wxStaticText)->SetLabel(kNoValue);
+	} else if (m_info.kadPort) {
 		CastChild(IDT_KAD, wxStaticText)->SetLabel(_("Connected"));
 	} else {
 		CastChild(IDT_KAD, wxStaticText)->SetLabel(_("Disconnected"));
 	}
 
 	// File Name
-	const CKnownFile* file = m_client.GetUploadFile();
-	if (file) {
-		wxString filename = MakeStringEscaped(file->GetFileName().TruncatePath(60));
+	if (m_info.uploadFile) {
+		wxString filename = MakeStringEscaped(m_info.uploadFile->GetFileName().TruncatePath(60));
 		CastChild(ID_DDOWNLOADING, wxStaticText)->SetLabel(filename);
 	} else {
-		CastChild(ID_DDOWNLOADING, wxStaticText)->SetLabel("-");
+		CastChild(ID_DDOWNLOADING, wxStaticText)->SetLabel(kNoValue);
 	}
 
 	// Upload
-	CastChild(ID_DDUP, wxStaticText)->SetLabel(
-		CastItoXBytes(m_client.GetTransferredDown()));
+	CastChild(ID_DDUP, wxStaticText)
+		->SetLabel(m_info.hasSession ? CastItoXBytes(m_info.transferredDown) : kNoValue);
 
 	// Download
-	CastChild(ID_DDOWN, wxStaticText)->SetLabel(
-		CastItoXBytes(m_client.GetTransferredUp()));
+	CastChild(ID_DDOWN, wxStaticText)
+		->SetLabel(m_info.hasSession ? CastItoXBytes(m_info.transferredUp) : kNoValue);
 
 	// Average Upload Rate
-	CastChild(ID_DAVUR, wxStaticText)->SetLabel(
-		CFormat(_("%.1f kB/s")) % m_client.GetKBpsDown());
+	CastChild(ID_DAVUR, wxStaticText)
+		->SetLabel(
+			m_info.hasSession ? wxString(CFormat(_("%.1f KiB/s")) % m_info.kBpsDown) : kNoValue);
 
 	// Average Download Rate
-	CastChild(ID_DAVDR, wxStaticText)->SetLabel(
-		CFormat(_("%.1f kB/s")) % (m_client.GetUploadDatarate() / 1024.0f));
-
-	// Total Upload
-	CastChild(ID_DUPTOTAL, wxStaticText)->SetLabel(
-		CastItoXBytes(m_client.GetDownloadedTotal()));
-
-	// Total Download
-	CastChild(ID_DDOWNTOTAL, wxStaticText)->SetLabel(
-		CastItoXBytes(m_client.GetUploadedTotal()));
-
-	// DL/UP Modifier
-	CastChild(ID_DRATIO, wxStaticText)->SetLabel(
-		CFormat("%.1f") % m_client.GetScoreRatio());
+	CastChild(ID_DAVDR, wxStaticText)
+		->SetLabel(m_info.hasSession ? wxString(CFormat(_("%.1f KiB/s")) %
+							((float)m_info.uploadDatarate / 1024.0f))
+					     : kNoValue);
+
+	// Lifetime credit, which a stored record knows as well as a live peer. The control ids read
+	// backwards against their labels -- ID_DUPTOTAL sits under "Downloaded (total):" -- so
+	// follow the labels, not the names.
+	CastChild(ID_DUPTOTAL, wxStaticText)->SetLabel(CastItoXBytes(m_info.downloadedTotal));
+	CastChild(ID_DDOWNTOTAL, wxStaticText)->SetLabel(CastItoXBytes(m_info.uploadedTotal));
+
+	// DL/UP modifier. Keyed on having one, not on hasSession: it is lifetime credit like the
+	// two totals above, so a stored record answers it as well as a live peer does.
+	CastChild(ID_DRATIO, wxStaticText)
+		->SetLabel(m_info.hasCreditRatio ? wxString(CFormat("%.2f") % m_info.creditRatio) : kNoValue);
 
 	// Secure Ident
-	CastChild(IDC_CDIDENT, wxStaticText)->SetLabel(
-		m_client.GetSecureIdentTextStatus());
+	CastChild(IDC_CDIDENT, wxStaticText)
+		->SetLabel(m_info.hasSession ? m_info.secureIdentStatus : kNoValue);
 
 	// Queue Score
-	if (m_client.GetUploadState() != US_NONE) {
-		CastChild(ID_QUEUERANK, wxStaticText)->SetLabel(
-			CFormat("%u") % m_client.GetUploadQueueWaitingPosition());
-		CastChild(ID_DSCORE, wxStaticText)->SetLabel(
-			CFormat("%u") % m_client.GetScore());
+	if (m_info.hasSession && m_info.uploadState != US_NONE) {
+		CastChild(ID_QUEUERANK, wxStaticText)->SetLabel(CFormat("%u") % m_info.queueRank);
+		CastChild(ID_DSCORE, wxStaticText)->SetLabel(CFormat("%u") % m_info.score);
 	} else {
-		CastChild(ID_QUEUERANK, wxStaticText)->SetLabel("-");
-		CastChild(ID_DSCORE, wxStaticText)->SetLabel("-");
+		CastChild(ID_QUEUERANK, wxStaticText)->SetLabel(kNoValue);
+		CastChild(ID_DSCORE, wxStaticText)->SetLabel(kNoValue);
 	}
 	Layout();

amule-3.0.1.tar.gz/src/ClientDetailDialog.h -> amule-3.1.0.tar.gz/src/ClientDetailDialog.h Changed

@@ -26,60 +26,115 @@
 #ifndef CLIENTDETAILDIALOG_H
 #define CLIENTDETAILDIALOG_H
 
-#include <wx/dialog.h>		// Needed for wxDialog
+#include <wx/dialog.h> // Needed for wxDialog
 
-#include "ClientRef.h"		// Needed for CClientRef
+#include "ClientRef.h" // Needed for CClientRef
+#include "MD4Hash.h"   // Needed for CMD4Hash
+#include "Types.h"     // Needed for uint8/uint16/uint32/uint64
+
+class CKnownFile;
 
 /**
- * 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'.
- *
+ * Everything CClientDetailDialog renders, separated from where it came from. A connected peer fills
+ * this from its live CUpDownClient. A row in the Known list fills the identity half from the stored
+ * record and leaves `hasSession` false, because the fields under it are session state that only a
+ * live connection has -- rendering them as zeroes would read as real measurements.
+ */
+struct ClientDetailInfo
+{
+	// Identity and lifetime credit. A stored row knows these as well as a live
+	// peer does; the credit totals are the point of keeping the row at all.
+	wxString userName;
+	CMD4Hash userHash;
+	wxString softStr;
+	wxString osInfo;
+	wxString softVerStr;
+	wxString fullIp;
+	uint16 userPort = 0;
+	uint8 obfuscationStatus = 0;
+	uint64 uploadedTotal = 0;
+	uint64 downloadedTotal = 0;
+
+	//! False when there is no live client behind this. Everything below is
+	//! session state and is shown as "-" instead.
+	bool hasSession = false;
+	uint32 userIdHybrid = 0;
+	bool lowId = false;
+	uint32 serverIp = 0;
+	uint16 serverPort = 0;
+	wxString serverName;
+	uint16 kadPort = 0;
+	//! Protocol extensions the peer claimed in its hello; a stored row has no hello to read.
+	//! Empty when it claimed none, which is the common case and hides the row rather than
+	//! filling it with a placeholder.
+	wxString modCapabilities;
+	const CKnownFile *uploadFile = nullptr;
+	uint64 transferredDown = 0;
+	uint64 transferredUp = 0;
+	float kBpsDown = 0.0f;
+	uint32 uploadDatarate = 0;
+	double creditRatio = 0.0;
+	//! The record carries a modifier at all. False against a daemon too old to send one, and
+	//! for a live peer with no credit record yet.
+	bool hasCreditRatio = false;
+	wxString secureIdentStatus;
+	uint8 uploadState = 0;
+	uint16 queueRank = 0;
+	uint32 score = 0;
+};
+
+//! Snapshot a live peer. The session half is filled.
+ClientDetailInfo ClientDetailInfoFromClient(const CClientRef &client);
+
+/**
+ * Shows the info about a client: ip, port, hash, name, client type and version,
+ * uploading/downloading data, credits, server and so on. A modal wxDialog whose return value is
+ * always '0'.
  */
 
 class CClientDetailDialog : public wxDialog
 {
 public:
 	/**
-	 * Constructor.
-	 *
-	 * @param parent The window that created the dialog.
-	 * @param client The client whose details we're showing.
+	 * Constructor for a live peer. @param parent The window that created the dialog. @param
+	 * client The client whose details are shown.
 	 */
-	CClientDetailDialog(wxWindow*parent, const CClientRef& client);
+	CClientDetailDialog(wxWindow *parent, const CClientRef &client);
 
 	/**
-	 * Destructor.
+	 * Constructor for a peer we hold a record of but are not talking to.
+	 *
+	 * Renders the identity and credit half and shows the session fields as "-". Takes no client
+	 * and opens no connection: showing details is a read-only act.
 	 *
-	 * Does nothing currently.
+	 * @param parent The window that created the dialog.
+	 * @param info The snapshot to render.
 	 */
+	CClientDetailDialog(wxWindow *parent, const ClientDetailInfo &info);
+
 	virtual ~CClientDetailDialog();
 
 protected:
-
 	/**
-	 * Creates all the data objects in the dialog, filling them accordingly.
-	 *
-	 * Called when the dialog object is created.
+	 * Creates all the data objects in the dialog, filling them accordingly. Called when the
+	 * dialog object is created.
 	 */
 	virtual bool OnInitDialog();
 
+	//! Shared tail of both constructors.
+	void Build();
+
 	/**
-	 * Ends the dialog, calling EndModal with return value 0
-	 *
-	 * @param evt The close event, unused right now
+	 * Ends the dialog, calling EndModal with return value 0. @param evt The close event, unused
+	 * right now.
 	 */
-	void OnBnClose(wxCommandEvent& evt);
+	void OnBnClose(wxCommandEvent &evt);
 
 	wxDECLARE_EVENT_TABLE();
 
 private:
-
 	//! The client whose data is drawn
-	CClientRef m_client;
+	ClientDetailInfo m_info;
 };
 #endif // CLIENTDETAILDIALOG_H
 // File_checked_for_headers

amule-3.1.0.tar.gz/src/ClientHistoryListCtrl.cpp Added

@@ -0,0 +1,488 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "ClientHistoryListCtrl.h" // Interface declarations
+
+#include <wx/datetime.h>
+
+#include <common/Format.h> // Needed for CFormat
+
+#include "amule.h"           // Needed for theApp
+#include "ClientList.h"      // Needed for CClientList::GetClientsByHash
+#include "DataToText.h"      // Needed for GetSoftName, OriginToText
+#include "MuleBarRenderer.h" // Needed for CMuleBarRenderer
+#include "OtherFunctions.h"  // Needed for CastItoXBytes, Uint32toStringIP
+#ifdef CLIENT_GUI
+#include "UpDownClientEC.h"
+#else
+#include "updownclient.h"
+#endif
+
+namespace
+{
+//! Same renderer the active list uses; see CClientRowListCtrl::GetItemBarFill.
+class CHistoryNameRenderer : public CMuleBarRenderer
+{
+public:
+	bool Render(wxRect cell, wxDC *dc, int WXUNUSED(state)) override
+	{
+		const ClientNameCell *data =
+			reinterpret_cast<const ClientNameCell *>(GetSpec().GetIdentity());
+		if (data != nullptr) {
+			DrawClientNameCell(*data, cell, dc);
+		}
+		return true;
+	}
+};
+} // namespace
+
+CClientHistoryListCtrl::CClientHistoryListCtrl(
+	wxWindow *parent, int id, const wxPoint &pos, wxSize size, int flags)
+: CClientRowListCtrl(parent, id, pos, size, flags)
+, m_loaded(false)
+{
+	const int colFlags = wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE;
+	AddBarColumn(_("Name"), COLUMN_HISTORY_NAME, "N", 200, colFlags, new CHistoryNameRenderer());
+	AddTextColumn(_("Software"), COLUMN_HISTORY_SOFTWARE, "S", 110, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Version"), COLUMN_HISTORY_VERSION, "V", 90, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("IP Address"), COLUMN_HISTORY_ADDRESS, "I", 140, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Origin"), COLUMN_HISTORY_ORIGIN, "O", 110, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("First seen"), COLUMN_HISTORY_FIRST_SEEN, "F", 130, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Last seen"), COLUMN_HISTORY_LAST_SEEN, "L", 130, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Sessions"), COLUMN_HISTORY_SESSIONS, "n", 80, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Upload Speed"), COLUMN_HISTORY_UP_SPEED, "U", 100, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Download Speed"), COLUMN_HISTORY_DOWN_SPEED, "D", 100, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Total Uploaded"), COLUMN_HISTORY_TOTAL_UP, "T", 110, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Total Downloaded"), COLUMN_HISTORY_TOTAL_DOWN, "t", 110, wxALIGN_LEFT, colFlags);
+	// Named for what the value is, not what it looks like: it is the credit modifier the
+	// detail dialog already labels this way, with a 2x on the downloaded side, so "Ratio"
+	// invited reading it as uploaded-vs-downloaded.
+	AddTextColumn(_("DL/UP modifier"), COLUMN_HISTORY_RATIO, "R", 120, wxALIGN_LEFT, colFlags);
+
+	AppendSpacerColumn(COLUMN_HISTORY_SPACER);
+
+	AssociateVirtualModel();
+
+	// Most-recently-seen first: on a store holding tens of thousands of
+	// records, the ones worth looking at are the ones from today.
+	ApplySorting(COLUMN_HISTORY_LAST_SEEN, 1);
+
+	m_columnStore.SetTableName("ClientHistory");
+	LoadColumnSettings();
+	InitColumnState();
+}
+
+CClientHistoryListCtrl::~CClientHistoryListCtrl() = default;
+
+const ClientHistoryRow *CClientHistoryListCtrl::RowFor(wxUIntPtr item) const
+{
+	// Stored as index+1 so that 0 stays available as "no item", which is what
+	// the base returns for an unknown row.
+	if (item == 0 || item > m_rows.size()) {
+		return nullptr;
+	}
+	return &m_rowsitem - 1;
+}
+
+void CClientHistoryListCtrl::SetRows(std::vector<ClientHistoryRow> &&rows)
+{
+	ClearItemData();
+	m_rows = std::move(rows);
+	m_loaded = true;
+
+	m_rowOfHash.clear();
+	m_rowOfHash.reserve(m_rows.size());
+	m_onlineRows.clear();
+	for (size_t i = 0; i < m_rows.size(); ++i) {
+		m_rowOfHashm_rowsi.hash = i;
+		if (m_rowsi.online) {
+			m_onlineRows.insert(i);
+		}
+	}
+
+	// One bulk load rather than an insert per row: the store can hold tens of
+	// thousands of records and AddItemData() sorts on every insert.
+	for (size_t i = 0; i < m_rows.size(); ++i) {
+		AppendItemData(static_cast<wxUIntPtr>(i + 1));
+	}
+	FinishBulkLoad();
+}
+
+size_t CClientHistoryListCtrl::AppendLiveRow(const CMD4Hash &hash, const LiveClient &live)
+{
+	ClientHistoryRow row;
+	row.hash = hash;
+	row.uploaded = live.uploaded;
+	row.downloaded = live.downloaded;
+	row.creditRatio = live.creditRatio;
+	row.hasCreditRatio = true;
+	row.upSpeed = live.upSpeed;
+	row.downSpeed = live.downSpeed;
+	row.name = live.name;
+	row.version = live.version;
+	row.ip = live.ip;
+	row.port = live.port;
+	row.clientSoft = live.clientSoft;
+	row.sourceFrom = live.sourceFrom;
+	row.nameCell = live.nameCell;
+	// The core wrote this peer's metadata when it said hello, stamping first-seen the first
+	// time a peer gets a record. The history snapshot predates that, so the value is not in our
+	// rows; it is simply "now". hasMeta stays false because the STORE did not hold this peer
+	// when we loaded, and the columns key on the values.
+	row.firstSeen = static_cast<uint32>(wxDateTime::GetTimeNow());
+	row.sessions = 1;
+	row.hasMeta = false;
+	row.identityKnown = !live.name.IsEmpty();
+	row.online = true;
+	if (row.nameCell.name.IsEmpty()) {
+		// Same fallback the stored rows use: the hash is all we know it by
+		// until the peer says otherwise.
+		row.nameCell.name = hash.Encode();
+	}
+
+	m_rows.push_back(row);
+	const size_t index = m_rows.size() - 1;
+	m_rowOfHashhash = index;
+	AppendItemData(static_cast<wxUIntPtr>(index + 1));
+	// Deliberately not added to m_onlineRows here: the caller owns that set for
+	// the duration of a reconcile and swaps it in at the end.
+	return index;
+}
+
+void CClientHistoryListCtrl::ReconcileLive(const std::unordered_map<CMD4Hash, LiveClient> &live)
+{
+	if (!m_loaded) {
+		return;
+	}
+
+	std::unordered_set<size_t> stillOnline;
+	stillOnline.reserve(live.size());
+	bool appended = false;
+
+	for (const auto &entry : live) {
+		const auto found = m_rowOfHash.find(entry.first);
+		if (found == m_rowOfHash.end()) {
+			// A peer we had never met when the tab was loaded.
+			stillOnline.insert(AppendLiveRow(entry.first, entry.second));
+			appended = true;
+			continue;
+		}
+
+		const size_t index = found->second;
+		ClientHistoryRow &row = m_rowsindex;
+		stillOnline.insert(index);
+
+		bool changed = !row.online || row.uploaded != entry.second.uploaded ||
+			       row.downloaded != entry.second.downloaded ||
+			       row.creditRatio != entry.second.creditRatio ||
+			       row.upSpeed != entry.second.upSpeed || row.downSpeed != entry.second.downSpeed;
+		row.online = true;
+		row.uploaded = entry.second.uploaded;
+		row.downloaded = entry.second.downloaded;
+		// Moves with the totals: the store's copy was computed when the tab loaded, and a
+		// transferring peer would otherwise show growing totals beside a frozen ratio.
+		row.creditRatio = entry.second.creditRatio;
+		row.hasCreditRatio = true;
+		row.upSpeed = entry.second.upSpeed;
+		row.downSpeed = entry.second.downSpeed;
+
+		// Identity, when the peer in front of us knows more than the record does. A record
+		// only gains a name when the core writes its metadata at disconnect, so a peer we
+		// have never finished a session with shows as its hash -- which used to resolve on
+		// the next load and now never would, the tab loading once.
+		//
+		// Guarded on the live name being known: a peer whose handshake has not completed
+		// has none, and an empty one must not overwrite a stored name. Beyond that the test
+		// covers every field the body copies -- the badges move while the name and address
+		// stay put, so a narrower test would freeze them.
+		if (!entry.second.name.IsEmpty() &&
+			(row.name != entry.second.name || row.version != entry.second.version ||
+				row.ip != entry.second.ip || row.port != entry.second.port ||
+				row.clientSoft != entry.second.clientSoft ||
+				row.sourceFrom != entry.second.sourceFrom ||
+				row.nameCell != entry.second.nameCell)) {
+			row.name = entry.second.name;
+			row.version = entry.second.version;
+			row.ip = entry.second.ip;
+			row.port = entry.second.port;
+			row.clientSoft = entry.second.clientSoft;
+			row.sourceFrom = entry.second.sourceFrom;
+			row.nameCell = entry.second.nameCell;
+			row.identityKnown = true;
+			changed = true;
+		}
+
+		// A record loaded before this peer had any metadata -- everything written before
+		// #902, which on a real store is nearly all of it. The core stamped first-seen at
+		// this peer's hello, as for one we had never met; a record that already carries one
+		// is left alone.
+		if (row.firstSeen == 0) {
+			row.firstSeen = static_cast<uint32>(wxDateTime::GetTimeNow());
+			if (row.sessions == 0) {
+				row.sessions = 1;
+			}
+			changed = true;
+		}
+
+		if (changed) {
+			RefreshItemData(static_cast<wxUIntPtr>(index + 1));
+		}
+	}
+
+	// Whoever was online last tick and is not in this one has gone. Found through the online
+	// set, so this costs the number of departures rather than a walk of the store.
+	for (const size_t index : m_onlineRows) {
+		if (stillOnline.count(index) == 0) {
+			m_rowsindex.online = false;
+			// Seen until this moment, which is what the core will write to the record
+			// at its own disconnect handling. Leaving the stored value would show the
+			// previous disconnect as the last contact.
+			m_rowsindex.lastSeen = static_cast<uint32>(wxDateTime::GetTimeNow());
+			// Nothing is moving for a peer that is gone.
+			m_rowsindex.upSpeed = 0;
+			m_rowsindex.downSpeed = 0.0;
+			RefreshItemData(static_cast<wxUIntPtr>(index + 1));
+		}
+	}
+	m_onlineRows.swap(stillOnline);
+
+	if (appended) {
+		// New rows have to enter the sort order; the patches above do not.
+		FinishBulkLoad();
+	}
+}
+
+bool CClientHistoryListCtrl::IsLiveSortColumn() const
+{
+	if (m_sort_orders.empty()) {
+		return false;
+	}
+	switch (m_sort_orders.front().first) {
+	case COLUMN_HISTORY_LAST_SEEN:
+	case COLUMN_HISTORY_UP_SPEED:
+	case COLUMN_HISTORY_DOWN_SPEED:
+	case COLUMN_HISTORY_TOTAL_UP:
+	case COLUMN_HISTORY_TOTAL_DOWN:
+	case COLUMN_HISTORY_RATIO:
+		return true;
+	default:
+		return false;
+	}
+}
+
+const ClientNameCell *CClientHistoryListCtrl::NameCellFor(wxUIntPtr item) const
+{
+	const ClientHistoryRow *row = RowFor(item);
+	return row != nullptr ? &row->nameCell : nullptr;
+}
+
+namespace
+{
+
+// Without metadata the hash is all we know a peer by, which is still more
+// useful than an empty cell.
+wxString DisplayNameFor(const ClientHistoryRow &row)
+{
+	return row.name.IsEmpty() ? row.hash.Encode() : row.name;
+}
+
+} // namespace
+
+bool CClientHistoryListCtrl::PeerForItem(wxUIntPtr data, PeerIdentity &out) const
+{
+	// Start clean: this is an out parameter and the fields below are only assigned when they
+	// are known, so anything left from a previous call would be read as belonging to this row.
+	out = PeerIdentity();
+	// Identity comes from the row, so a peer we are not connected to is still named: the hash,
+	// name, address and port the store kept are enough to friend it, and enough to open a
+	// connection if asked.
+	//
+	// The live client is attached when there is one, matched by user hash rather than ECID: a
+	// history row outlives the daemon process whose ECIDs would have named the peer.
+	const ClientHistoryRow *row = RowFor(data);
+	if (row == nullptr || row->hash.IsEmpty()) {
+		return false;
+	}
+	out.hash = row->hash;
+	// The record's own name, not the Name column's fallback. This one is written to disk by
+	// AddFriend() and set on the live client by CreateForAddress(), so a placeholder here would
+	// persist a hex hash as somebody's name. Empty is meaningful: CFriend renders it as "?"
+	// until the peer says otherwise.
+	out.name = row->name;
+	out.ip = row->ip;
+	out.port = row->port;
+
+	// The half of the details dialog a stored record can answer. The session
+	// half stays absent, which is what hasSession says.
+	out.detail.userName = row->name;
+	out.detail.userHash = row->hash;
+	out.detail.softStr = row->identityKnown ? GetSoftName(row->clientSoft) : wxString();
+	out.detail.softVerStr = row->version;
+	// Left empty when unknown, so the dialog says so rather than rendering a
+	// literal 0.0.0.0.
+	out.detail.fullIp = row->ip ? Uint32toStringIP(row->ip) : wxString();
+	out.detail.userPort = row->port;
+	out.detail.obfuscationStatus = row->obfuscation;
+	// Same direction the list's own Total Up / Total Down columns use.
+	out.detail.uploadedTotal = row->uploaded;
+	out.detail.downloadedTotal = row->downloaded;
+	out.detail.creditRatio = row->creditRatio;
+	out.detail.hasCreditRatio = row->hasCreditRatio;
+	out.detail.hasSession = false;
+	out.hasDetail = true;
+#ifdef CLIENT_GUI
+	if (theApp->clientlist != nullptr) {
+		for (const auto &entry : *theApp->clientlist) {
+			CUpDownClient *client = entry->GetClient();
+			if (client != nullptr && client->GetUserHash() == row->hash) {
+				out.client = *entry;
+				break;
+			}
+		}
+	}
+#else
+	for (const CClientRef &ref : theApp->clientlist->GetClientsByHash(row->hash)) {
+		out.client = ref;
+		break;
+	}
+#endif
+	return true;
+}
+
+wxString CClientHistoryListCtrl::GetItemColumnText(wxUIntPtr item, unsigned column) const
+{
+	const ClientHistoryRow *row = RowFor(item);
+	if (row == nullptr) {
+		return wxEmptyString;
+	}
+
+	switch (column) {
+	case COLUMN_HISTORY_NAME:
+		return DisplayNameFor(*row);
+
+	case COLUMN_HISTORY_SOFTWARE:
+		return row->identityKnown ? GetSoftName(row->clientSoft) : wxString();
+
+	case COLUMN_HISTORY_VERSION:
+		return row->version;
+
+	case COLUMN_HISTORY_ADDRESS:
+		if (row->ip == 0) {
+			return wxEmptyString;
+		}
+		return CFormat(wxT("%s:%u")) % Uint32toStringIP(row->ip) % row->port;
+
+	case COLUMN_HISTORY_ORIGIN:
+		// Translated here, not by OriginToText(): see CClientsListCtrl, which
+		// shares this column and had the same gap.
+		return row->identityKnown ? wxGetTranslation(OriginToText(row->sourceFrom)) : wxString();
+
+	case COLUMN_HISTORY_FIRST_SEEN:
+		return row->firstSeen == 0
+			       ? wxString()
+			       : FormatLocalDateTime(wxDateTime(static_cast<time_t>(row->firstSeen)));
+
+	case COLUMN_HISTORY_LAST_SEEN:
+		// A date is the wrong answer for a peer that is here now, and the stored
+		// last-seen for a connected peer is whenever it previously disconnected.
+		if (row->online) {
+			return _("Online now");
+		}
+		if (row->lastSeen == 0) {
+			return wxEmptyString;
+		}
+		return FormatLocalDateTime(wxDateTime(static_cast<time_t>(row->lastSeen)));
+
+	case COLUMN_HISTORY_SESSIONS:
+		if (row->sessions == 0) {
+			return wxEmptyString;
+		}
+		return CFormat(wxT("%u")) % row->sessions;
+
+	case COLUMN_HISTORY_UP_SPEED:
+		return row->upSpeed ? CastItoSpeed(row->upSpeed) : wxString();
+
+	case COLUMN_HISTORY_DOWN_SPEED:
+		return row->downSpeed > 0.001 ? CastItoSpeed(static_cast<uint32>(row->downSpeed * 1024))
+					      : wxString();
+
+	case COLUMN_HISTORY_TOTAL_UP:
+		return CastItoXBytes(row->uploaded);
+
+	case COLUMN_HISTORY_TOTAL_DOWN:
+		return CastItoXBytes(row->downloaded);
+
+	case COLUMN_HISTORY_RATIO:
+		// The core's credit modifier, not a ratio computed here: one definition, shared
+		// with the live list and the API. Blank only when the daemon never sent one.
+		if (!row->hasCreditRatio) {
+			return wxEmptyString;
+		}
+		return CFormat(wxT("%.2f")) % row->creditRatio;
+
+	default:
+		return wxEmptyString;
+	}
+}
+
+int CClientHistoryListCtrl::CompareItemData(
+	wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool WXUNUSED(alt), int modifier) const
+{
+	const ClientHistoryRow *r1 = RowFor(data1);
+	const ClientHistoryRow *r2 = RowFor(data2);
+	if (r1 == nullptr || r2 == nullptr) {
+		return 0;
+	}
+
+	switch (column) {
+	case COLUMN_HISTORY_FIRST_SEEN:
+		return modifier * CmpAny(r1->firstSeen, r2->firstSeen);
+	case COLUMN_HISTORY_LAST_SEEN:
+		// Peers that are here now sort as the most recent thing there is, so the column
+		// reads as "when was this peer last around" throughout instead of stranding the
+		// live ones at their stale timestamps.
+		if (r1->online != r2->online) {
+			return modifier * (r1->online ? 1 : -1);
+		}
+		return modifier * CmpAny(r1->lastSeen, r2->lastSeen);
+	case COLUMN_HISTORY_SESSIONS:
+		return modifier * CmpAny(r1->sessions, r2->sessions);
+	case COLUMN_HISTORY_UP_SPEED:
+		return modifier * CmpAny(r1->upSpeed, r2->upSpeed);
+	case COLUMN_HISTORY_DOWN_SPEED:
+		return modifier * CmpAny(r1->downSpeed, r2->downSpeed);
+	case COLUMN_HISTORY_TOTAL_UP:
+		return modifier * CmpAny(r1->uploaded, r2->uploaded);
+	case COLUMN_HISTORY_TOTAL_DOWN:
+		return modifier * CmpAny(r1->downloaded, r2->downloaded);
+	// Numerically, not as the rendered text the default arm compares: "10.00" sorts below
+	// "9.50" as a string. The column was blank on most rows before it carried the core's
+	// value, which is why nobody had hit it.
+	case COLUMN_HISTORY_RATIO:
+		return modifier * CmpAny(r1->creditRatio, r2->creditRatio);
+	default:
+		return modifier *
+		       GetItemColumnText(data1, column).CmpNoCase(GetItemColumnText(data2, column));
+	}
+}

amule-3.1.0.tar.gz/src/ClientHistoryListCtrl.h Added

@@ -0,0 +1,193 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 CLIENTHISTORYLISTCTRL_H
+#define CLIENTHISTORYLISTCTRL_H
+
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+#include "ClientRowListCtrl.h" // Needed for CClientRowListCtrl
+#include "MD4Hash.h"
+
+#define COLUMN_HISTORY_NAME 0
+#define COLUMN_HISTORY_SOFTWARE 1
+#define COLUMN_HISTORY_VERSION 2
+#define COLUMN_HISTORY_ADDRESS 3
+#define COLUMN_HISTORY_ORIGIN 4
+#define COLUMN_HISTORY_FIRST_SEEN 5
+#define COLUMN_HISTORY_LAST_SEEN 6
+#define COLUMN_HISTORY_SESSIONS 7
+#define COLUMN_HISTORY_UP_SPEED 8
+#define COLUMN_HISTORY_DOWN_SPEED 9
+#define COLUMN_HISTORY_TOTAL_UP 10
+#define COLUMN_HISTORY_TOTAL_DOWN 11
+#define COLUMN_HISTORY_RATIO 12
+//! Always empty. Absorbs the macOS trailing-column sizing.
+#define COLUMN_HISTORY_SPACER 13
+
+/**
+ * One row of the clients history.
+ *
+ * Deliberately a plain value rather than a pointer into the credit store: the monolithic build
+ * fills these from CClientCreditsList and amulegui from an EC reply, and a value type is the only
+ * thing both can produce. It also means the list holds nothing that can be freed underneath it --
+ * the history is a snapshot of something that only changes when a peer connects or leaves.
+ *
+ * Every field except the hash and the totals is optional. A record written before aMule kept per-
+ * peer metadata has no name, address or software, and a daemon too old to send it leaves them empty
+ * too; the list renders the gaps as blanks rather than pretending to know.
+ */
+struct ClientHistoryRow
+{
+	CMD4Hash hash;
+	wxString name;
+	wxString version;
+	uint64 uploaded = 0;
+	uint64 downloaded = 0;
+	//! Credit modifier from the core, never re-derived here. A daemon too old to send it
+	//! leaves hasCreditRatio false and the column blank, like every other optional field.
+	double creditRatio = 0.0;
+	bool hasCreditRatio = false;
+	uint32 lastSeen = 0;
+	uint32 firstSeen = 0;
+	uint32 sessions = 0;
+	//! Live transfer rates, blank for a peer that is not connected.
+	uint32 upSpeed = 0;
+	double downSpeed = 0.0;
+	uint32 ip = 0;
+	uint16 port = 0;
+	uint8 clientSoft = 0;
+	uint8 sourceFrom = 0;
+	uint8 obfuscation = 0;
+	bool hasMeta = false;
+	/**
+	 * Name, software and origin are known from somewhere real. Not the same as hasMeta, which
+	 * says the *store* holds metadata: a peer connected right now tells us who it is whether or
+	 * not the core has ever written a record for it. Columns describing identity key on this;
+	 * first-seen and session count still key on hasMeta, since only the store has those.
+	 */
+	bool identityKnown = false;
+	//! Country as the core resolved it, and whether it said anything at all. Same contract as
+	//! the live lists: told-by-core is authoritative even when empty, and only a build with its
+	//! own resolver falls back locally.
+	wxString country;
+	bool countryFromCore = false;
+	/**
+	 * This peer is connected right now. Established by user hash, never by ECID: an ECID
+	 * identifies a peer only within one daemon process, while the hash is what the credit store
+	 * is keyed on and is the same peer's identity across restarts. It is the only thing that
+	 * can connect a history row to the live client that is the same peer.
+	 */
+	bool online = false;
+	//! Everything the Name cell draws, built from the stored metadata. No download-state badge:
+	//! this row describes a peer we may not be talking to, and there is no live state to
+	//! report.
+	ClientNameCell nameCell;
+};
+
+/**
+ * Every peer we have ever exchanged data with. Rows are addressed by index into m_rows rather than
+ * by pointer, so sorting the control never invalidates them.
+ */
+class CClientHistoryListCtrl : public CClientRowListCtrl
+{
+public:
+	CClientHistoryListCtrl(wxWindow *parent, int id, const wxPoint &pos, wxSize size, int flags);
+	~CClientHistoryListCtrl();
+
+	/**
+	 * What a currently-connected peer contributes to its history row. A record for a peer that
+	 * is *not* connected cannot change -- the credit totals only move while a transfer is
+	 * running, and last-seen only at disconnect -- so the connected peers are the whole of what
+	 * can go stale between loads, and the sweep already walks exactly those.
+	 */
+	struct LiveClient
+	{
+		uint64 uploaded = 0;
+		uint64 downloaded = 0;
+		double creditRatio = 0.0;
+		uint32 upSpeed = 0;
+		double downSpeed = 0.0;
+		ClientNameCell nameCell;
+		wxString name;
+		wxString version;
+		uint32 ip = 0;
+		uint16 port = 0;
+		uint8 clientSoft = 0;
+		uint8 sourceFrom = 0;
+	};
+
+	//! Replace everything on show with a fresh snapshot.
+	void SetRows(std::vector<ClientHistoryRow> &&rows);
+
+	/**
+	 * Fold this tick's live peers into the rows.
+	 *
+	 * Costs one hash lookup per connected peer -- bounded by MaxConnections -- never a walk of
+	 * the store, which on a real node is tens of thousands of records. Peers that went away are
+	 * found through the set of rows currently marked online rather than by scanning for them.
+	 *
+	 * Does three things a load-on-switch list cannot: keeps the totals of a transferring peer
+	 * moving, clears "Online now" for one that left, and adds a row for a peer met since the
+	 * tab was opened.
+	 */
+	void ReconcileLive(const std::unordered_map<CMD4Hash, LiveClient> &live);
+	//! True once a snapshot has been supplied, so the page can tell "empty
+	//! history" from "not asked yet".
+	bool IsLoaded() const { return m_loaded; }
+
+protected:
+	wxString GetItemColumnText(wxUIntPtr item, unsigned column) const override;
+	/**
+	 * Last-seen, the transfer rates and the totals all move while the tab is open, so a row
+	 * sorted by one of them has to be able to move with it -- "Online now" sorts as the most
+	 * recent thing there is, so a peer that connects or leaves changes its own place in the
+	 * default order.
+	 */
+	bool IsLiveSortColumn() const override;
+	int CompareItemData(
+		wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool alt, int modifier) const override;
+	const ClientNameCell *NameCellFor(wxUIntPtr item) const override;
+	unsigned NameColumn() const override { return COLUMN_HISTORY_NAME; }
+	bool PeerForItem(wxUIntPtr data, PeerIdentity &out) const override;
+
+private:
+	const ClientHistoryRow *RowFor(wxUIntPtr item) const;
+	//! Append a row for a peer we have no record of yet, index it, and return
+	//! its position. Does not touch m_onlineRows -- ReconcileLive() owns that.
+	size_t AppendLiveRow(const CMD4Hash &hash, const LiveClient &live);
+
+	std::vector<ClientHistoryRow> m_rows;
+	//! Hash to position, so ReconcileLive() stays O(1) per peer.
+	std::unordered_map<CMD4Hash, size_t> m_rowOfHash;
+	//! Rows currently showing "Online now", so a peer that leaves is found
+	//! without scanning every row for one that is no longer connected.
+	std::unordered_set<size_t> m_onlineRows;
+	bool m_loaded;
+};
+
+#endif // CLIENTHISTORYLISTCTRL_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/ClientList.cpp -> amule-3.1.0.tar.gz/src/ClientList.cpp Changed

@@ -23,7 +23,9 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "ClientList.h"		// Interface declarations.
+#include "ClientList.h" // Interface declarations.
+
+#include "BrowseManager.h"
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Constants.h>
@@ -31,17 +33,19 @@
 #include <protocol/kad/Constants.h>
 #include <protocol/kad2/Client2Client/TCP.h>
 
-#include "amule.h"		// Needed for theApp
-#include "ClientTCPSocket.h"	// Needed for CClientTCPSocket
-#include "DownloadQueue.h"	// Needed for CDownloadQueue
-#include "UploadQueue.h"	// Needed for CUploadQueue
-#include "IPFilter.h"		// Needed for CIPFIlter
-#include "updownclient.h"	// Needed for CUpDownClient
-#include "Preferences.h"	// Needed for thePrefs
-#include "Statistics.h"		// Needed for theStats
+#include "amule.h"            // Needed for theApp
+#include "ChatSessionStore.h" // Needed for CChatSessionStore
+#include "ClientTCPSocket.h"  // Needed for CClientTCPSocket
+#include "DownloadQueue.h"    // Needed for CDownloadQueue
+#include "UploadQueue.h"      // Needed for CUploadQueue
+#include "IPFilter.h"         // Needed for CIPFIlter
+#include "updownclient.h"     // Needed for CUpDownClient
+#include "Preferences.h"      // Needed for thePrefs
+#include "Statistics.h"       // Needed for theStats
 #include "Logger.h"
-#include "GuiEvents.h"		// Needed for Notify_*
+#include "GuiEvents.h" // Needed for Notify_*
 #include "Packet.h"
+#include "UtpDialPolicy.h" // Needed for simultaneous uTP tie-breaking
 
 #include <common/Format.h>
 
@@ -51,40 +55,8 @@
 #include "kademlia/net/KademliaUDPListener.h"
 #include "kademlia/routing/Contact.h"
 
-
-/**
- * CDeletedClient Class
- *
- * This class / list is a bit overkill, but currently needed to avoid any
- * exploit possibility. It will keep track of certain clients attributes
- * for 2 hours, while the CUpDownClient object might be deleted already.
- * Currently saves: IP, Port, UserHash.
- */
-class CDeletedClient
-{
-public:
-	CDeletedClient(CUpDownClient* pClient)
-	{
-		m_dwInserted = ::GetTickCount64();
-		PortAndHash porthash = { pClient->GetUserPort(), pClient->GetCreditsHash()};
-		m_ItemsList.push_back(porthash);
-	}
-
-	struct PortAndHash
-	{
-		uint16 nPort;
-		void* pHash;
-	};
-
-	typedef std::list<PortAndHash> PaHList;
-	PaHList	m_ItemsList;
-	uint64	m_dwInserted;
-};
-
-
-
 CClientList::CClientList()
-	: m_deadSources( true )
+: m_deadSources(true)
 {
 	m_dwLastBannCleanUp = 0;
 	m_dwLastTrackedCleanUp = 0;
@@ -92,113 +64,168 @@
 	m_nBuddyStatus = Disconnected;
 }
 
-
 CClientList::~CClientList()
 {
-	DeleteContents(m_trackedClientsList);
-
 	wxASSERT(m_clientList.empty());
 }
 
+CUpDownClient *CClientList::FindReusableClient(const CMD4Hash &hash, uint32 ip, uint16 port)
+{
+	return FindReusableClient(hash, CNetworkAddress::FromIPv4NetworkOrderOrAbsent(ip), port);
+}
 
-void CClientList::AddClient( CUpDownClient* toadd )
+CUpDownClient *CClientList::FindReusableClient(
+	const CMD4Hash &hash, const CNetworkAddress &address, uint16 port)
 {
-	// Ensure that only new clients can be added to the list
-	if ( toadd->GetClientState() == CS_NEW ) {
-		// Update the client-state
-		toadd->m_clientState = CS_LISTED;
+	// Every client at this address, not just the first. FindClientByIP() stops at the first
+	// port match, which may be an unrelated client holding an address our peer used to have;
+	// rejecting that one without looking further would allocate a new object on every call.
+	auto range = m_ipList.equal_range(PeerAddressing::IndexKey(address));
+	for (; range.first != range.second; ++range.first) {
+		CUpDownClient *cur_client = range.first->second.GetClient();
+		if (cur_client->GetUserPort() != port) {
+			continue;
+		}
+		// Unidentified is a candidate: it is either this peer before its handshake, or a
+		// placeholder an earlier call made for it. An identified one is only this peer if
+		// the hashes agree.
+		if (cur_client->GetUserHash().IsEmpty() || cur_client->GetUserHash() == hash) {
+			return cur_client;
+		}
+	}
+	return nullptr;
+}
+
+CClientRef CClientList::CreateForAddress(const CMD4Hash &hash, uint32 ip, uint16 port, const wxString &name)
+{
+	// Reuse the client we already hold for this peer, so a repeated action
+	// does not stack up objects that no later lookup matches.
+	CUpDownClient *client = nullptr;
+	if (!hash.IsEmpty()) {
+		const SourceList byHash = GetClientsByHash(hash);
+		if (!byHash.empty()) {
+			client = byHash.front().GetClient();
+		}
+	}
+	if (client == nullptr) {
+		// An address alone identifies a peer only while nothing contradicts it. A stored
+		// address goes stale, and handing an unrelated client to CFriend::LinkClient()
+		// copies the stranger's hash into the friend record and saves it, losing the friend
+		// for good.
+		client = FindReusableClient(hash, ip, port);
+	}
+	if (client != nullptr) {
+		return CCLIENTREF(client, wxT("CClientList::CreateForAddress"));
+	}
+
+	if (ip == 0 || port == 0) {
+		// Nothing held for this peer and nowhere to dial: an invented client would only
+		// ever target 0.0.0.0, and AddClient() will not index a zero address, so the next
+		// lookup would miss it and make another. Callers ask IsLinked() rather than
+		// assuming they got one.
+		return CClientRef();
+	}
+
+	client = new CUpDownClient(port, ip, 0, 0, nullptr, true, true);
+	// The ctor only records the address to connect to, leaving GetIP() at 0. Seed it, or
+	// anything that reads the peer's IP back -- a friend record saving itself, a menu deciding
+	// whether it can message -- sees 0.0.0.0.
+	client->SetIP(ip);
+	client->SetUserName(name);
+	// The hash is deliberately NOT seeded. This client has never connected, so it carries no
+	// credits and reports zero for every lifetime total, while a hash is exactly what makes the
+	// Clients page treat it as a peer whose totals are known: it would publish those zeroes
+	// over the stored Total Up / Down of the row that asked for it, and mark that row online.
+	// The handshake sets the real hash when the peer answers.
+	AddClient(client);
+	return CCLIENTREF(client, wxT("CClientList::CreateForAddress"));
+}
 
-		//Notify_ClientCtrlAddClient( toadd );
+void CClientList::AddClient(CUpDownClient *toadd)
+{
+	if (toadd->GetClientState() == CS_NEW) {
+		toadd->m_clientState = CS_LISTED;
 
 		// We always add the ID/ptr pair, regardless of the actual ID value
-		m_clientList.insert( IDMapPair( toadd->GetUserIDHybrid(), CCLIENTREF(toadd, "CClientList::AddClient m_clientList.insert")) );
+		m_clientList.insert(IDMapPair(toadd->GetUserIDHybrid(),
+			CCLIENTREF(toadd, "CClientList::AddClient m_clientList.insert")));
 
-		// We only add the IP if it is valid
-		if ( toadd->GetIP() ) {
-			m_ipList.insert( IDMapPair( toadd->GetIP(), CCLIENTREF(toadd, "CClientList::AddClient m_ipList.insert") ) );
-		}
+		m_ipList.Insert(
+			toadd->GetUserAddress(), CCLIENTREF(toadd, "CClientList::AddClient m_ipList.insert"));
 
 		// We only add the hash if it is valid
-		if ( toadd->HasValidHash() ) {
-			m_hashList.insert( HashMapPair( toadd->GetUserHash(), CCLIENTREF(toadd, "CClientList::AddClient m_hashList.insert") ) );
+		if (toadd->HasValidHash()) {
+			m_hashList.insert(HashMapPair(toadd->GetUserHash(),
+				CCLIENTREF(toadd, "CClientList::AddClient m_hashList.insert")));
 		}
 
 		toadd->UpdateStats();
 	}
 }
 
-
-void CClientList::RemoveClient(CUpDownClient* client)
+void CClientList::RemoveClient(CUpDownClient *client)
 {
-	RemoveFromKadList( client );
-	RemoveDirectCallback( client );
+	RemoveFromKadList(client);
+	RemoveDirectCallback(client);
+	// Drop any browse of this client: the manager holds a reference, and the client is going
+	// away, so there is nothing left to report a result to. Guarded like the clientlist call in
+	// CUpDownClient::Safe_Delete: clients are still being reaped while the app tears itself
+	// down.
+	if (theApp->browsemanager) {
+		theApp->browsemanager->Forget(client);
+	}
 
-	if ( RemoveIDFromList( client ) ) {
-		// Also remove the ip and hash entries
-		RemoveIPFromList( client );
-		RemoveHashFromList( client );
+	if (RemoveIDFromList(client)) {
+		RemoveIPFromList(client);
+		RemoveHashFromList(client);
 	}
 }
 
-
-void CClientList::UpdateClientID( CUpDownClient* client, uint32 newID )
+void CClientList::UpdateClientID(CUpDownClient *client, uint32 newID)
 {
-	// Sanity check
-	if ( ( client->GetClientState() != CS_LISTED ) || ( client->GetUserIDHybrid() == newID ) )
+	if ((client->GetClientState() != CS_LISTED) || (client->GetUserIDHybrid() == newID))
 		return;
 
-	// First remove the ID entry
-	RemoveIDFromList( client );
+	RemoveIDFromList(client);
 
-	// Add the new entry
-	m_clientList.insert( IDMapPair( newID, CCLIENTREF(client, "CClientList::UpdateClientID") ) );
+	m_clientList.insert(IDMapPair(newID, CCLIENTREF(client, "CClientList::UpdateClientID")));
 }
 
-
-void CClientList::UpdateClientIP( CUpDownClient* client, uint32 newIP )
+void CClientList::UpdateClientIP(CUpDownClient *client, const CNetworkAddress &address)
 {
-	// Sanity check
-	if ( ( client->GetClientState() != CS_LISTED ) || ( client->GetIP() == newIP ) )
+	if (client->GetClientState() != CS_LISTED)
 		return;
 
-	// Remove the old IP entry
-	RemoveIPFromList( client );
-
-	if ( newIP ) {
-		m_ipList.insert( IDMapPair( newIP, CCLIENTREF(client, "CClientList::UpdateClientIP") ) );
-	}
+	m_ipList.Update(client->GetUserAddress(),
+		address,
+		CCLIENTREF(client, "CClientList::UpdateClientIP"),
+		client(const CClientRef &entry) { return entry.GetClient() == client; });
 }
 
-
-void CClientList::UpdateClientHash( CUpDownClient* client, const CMD4Hash& newHash )
+void CClientList::UpdateClientHash(CUpDownClient *client, const CMD4Hash &newHash)
 {
-	// Sanity check
-	if ( ( client->GetClientState() != CS_LISTED ) || ( client->GetUserHash() == newHash ) )
+	if ((client->GetClientState() != CS_LISTED) || (client->GetUserHash() == newHash))
 		return;
 
+	RemoveHashFromList(client);
 
-	// Remove the old entry
-	RemoveHashFromList( client );
-
-	// And add the new one if valid
-	if ( !newHash.IsEmpty() ) {
-		m_hashList.insert( HashMapPair( newHash, CCLIENTREF(client, "CClientList::UpdateClientHash") ) );
+	if (!newHash.IsEmpty()) {
+		m_hashList.insert(HashMapPair(newHash, CCLIENTREF(client, "CClientList::UpdateClientHash")));
 	}
 }
 
-
-bool CClientList::RemoveIDFromList( CUpDownClient* client )
+bool CClientList::RemoveIDFromList(CUpDownClient *client)
 {
 	bool result = false;
 
-	// First remove the ID entry
-	std::pair<IDMap::iterator, IDMap::iterator> range = m_clientList.equal_range( client->GetUserIDHybrid() );
+	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.GetClient() ) {
+	for (; range.first != range.second; ++range.first) {
+		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 );
+			m_clientList.erase(range.first);
 			result = true;
 
 			break;
@@ -208,72 +235,53 @@
 	return result;
 }
 
-
-void CClientList::RemoveIPFromList( CUpDownClient* client )
+void CClientList::RemoveIPFromList(CUpDownClient *client)
 {
-	// Check if we need to look for the IP entry
-	if ( !client->GetIP() ) {
-		return;
-	}
-
-	// Remove the IP entry
-	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.GetClient() ) {
-			/* erase() will invalidate the iterator, but we're not using it anymore
-			    anyway (notice the break;) */
-			m_ipList.erase( range.first );
-			break;
-		}
-	}
+	m_ipList.Remove(client->GetUserAddress(),
+		client(const CClientRef &entry) { return entry.GetClient() == client; });
 }
 
-void CClientList::RemoveHashFromList( CUpDownClient* client )
+void CClientList::RemoveHashFromList(CUpDownClient *client)
 {
-	// Nothing to remove
-	if ( !client->HasValidHash() ) {
+	if (!client->HasValidHash()) {
 		return;
 	}
 
-	// Find all items with the specified hash
-	std::pair<HashMap::iterator, HashMap::iterator> range = m_hashList.equal_range( client->GetUserHash() );
+	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.GetClient() ) {
+	for (; range.first != range.second; ++range.first) {
+		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 );
+			m_hashList.erase(range.first);
 			break;
 		}
 	}
 }
 
-
-CUpDownClient* CClientList::FindMatchingClient( CUpDownClient* client )
+CUpDownClient *CClientList::FindMatchingClient(CUpDownClient *client)
 {
 	typedef std::pair<IDMap::const_iterator, IDMap::const_iterator> IDMapIteratorPair;
 	wxCHECK(client, NULL);
 
-	const uint32 userIP = client->GetIP();
+	const CNetworkAddress userIP = PeerAddressing::IndexKey(client->GetUserAddress());
 	const uint32 userID = client->GetUserIDHybrid();
 	const uint16 userPort = client->GetUserPort();
 	const uint16 userKadPort = client->GetKadPort();
 
-
 	// LowID clients need a different set of checks
 	if (client->HasLowID()) {
 		// User is firewalled ... Must do two checks.
-		if (userIP && (userPort || userKadPort)) {
-			IDMapIteratorPair range = m_ipList.equal_range(userIP);
+		if (PeerAddressing::IsIndexable(userIP) && (userPort || userKadPort)) {
+			auto range = m_ipList.equal_range(userIP);
 
-			for ( ; range.first != range.second; ++range.first ) {
-				CUpDownClient* other = range.first->second.GetClient();
-				wxASSERT(userIP == other->GetIP());
+			for (; range.first != range.second; ++range.first) {
+				CUpDownClient *other = range.first->second.GetClient();
+				wxASSERT(userIP == other->GetUserAddress());
 
 				if (userPort && (userPort == other->GetUserPort())) {
 					return other;
-				  } else if (userKadPort && (userKadPort == other->GetKadPort())) {
+				} else if (userKadPort && (userKadPort == other->GetKadPort())) {
 					return other;
 				}
 			}
@@ -285,7 +293,7 @@
 			IDMapIteratorPair range = m_clientList.equal_range(userID);
 
 			for (; range.first != range.second; ++range.first) {
-				CUpDownClient* other = range.first->second.GetClient();
+				CUpDownClient *other = range.first->second.GetClient();
 				wxASSERT(userID == other->GetUserIDHybrid());
 
 				// For lowid, we also have to check the server
@@ -297,68 +305,62 @@
 			}
 		}
 	} else if (userPort || userKadPort) {
-		// Check by IP first, then by ID
-		struct { const IDMap& map; uint32 value; } toCheck = {
-			{ m_ipList, userIP }, { m_clientList, userID }
-		};
-
-		for (size_t i = 0; i < itemsof(toCheck); ++i) {
-			if (toChecki.value == 0) {
-				// We may not have both (or any) of these values.
-				continue;
-			}
-
-			IDMapIteratorPair range = toChecki.map.equal_range(toChecki.value);
-
+		// Check by address first, then by ID. Within each range all TCP-port
+		// matches take precedence over Kad-port matches, as in the IPv4 index.
+		const auto findByPort = userPort, userKadPort(const auto &range) -> CUpDownClient * {
 			if (userPort) {
-				IDMap::const_iterator it = range.first;
-				for (; it != range.second; ++it) {
+				for (auto it = range.first; it != range.second; ++it) {
 					if (userPort == it->second.GetUserPort()) {
 						return it->second.GetClient();
 					}
 				}
 			}
-
 			if (userKadPort) {
-				IDMap::const_iterator it = range.first;
-				for (; it != range.second; ++it) {
+				for (auto it = range.first; it != range.second; ++it) {
 					if (userKadPort == it->second.GetClient()->GetKadPort()) {
 						return it->second.GetClient();
 					}
 				}
 			}
+			return nullptr;
+		};
+
+		if (PeerAddressing::IsIndexable(userIP)) {
+			if (CUpDownClient *match = findByPort(m_ipList.equal_range(userIP))) {
+				return match;
+			}
+		}
+		if (userID) {
+			if (CUpDownClient *match = findByPort(m_clientList.equal_range(userID))) {
+				return match;
+			}
 		}
 	}
 
-
 	// If anything else fails, then we look at hashes
-	if ( client->HasValidHash() ) {
-		// Find all items with the specified hash
-		std::pair<HashMap::iterator, HashMap::iterator> range = m_hashList.equal_range( client->GetUserHash() );
+	if (client->HasValidHash()) {
+		std::pair<HashMap::iterator, HashMap::iterator> range =
+			m_hashList.equal_range(client->GetUserHash());
 
-		// Just return the first item if any
-		if ( range.first != range.second ) {
+		if (range.first != range.second) {
 			return range.first->second.GetClient();
 		}
 	}
 
-	// Nothing found, must be a new client
 	return NULL;
 }
 
-
 uint32 CClientList::GetClientCount() const
 {
 	return m_clientList.size();
 }
 
-
 void CClientList::DeleteAll()
 {
 	m_ipList.clear();
 	m_hashList.clear();
 
-	while ( !m_clientList.empty() ) {
+	while (!m_clientList.empty()) {
 		IDMap::iterator it = m_clientList.begin();
 
 		// Will call the removal of the item on this same class
@@ -367,40 +369,71 @@
 	}
 }
 
-
-bool CClientList::AttachToAlreadyKnown(CUpDownClient** client, CClientTCPSocket* sender)
+bool CClientList::AttachToAlreadyKnown(
+	CUpDownClient **client, CClientTCPSocket *sender, bool *senderDiscarded)
 {
-	CUpDownClient* tocheck = (*client);
+	CUpDownClient *tocheck = (*client);
 
-	CUpDownClient* found_client = FindMatchingClient( tocheck );
+	CUpDownClient *found_client = FindMatchingClient(tocheck);
 
-	if ( tocheck == found_client ) {
-		// We found the same client instance (client may have sent more than one OP_HELLO). do not delete that client!
+	if (tocheck == found_client) {
+		// We found the same client instance (client may have sent more than one OP_HELLO). do not
+		// delete that client!
 		return true;
 	}
 
-	if (found_client != NULL){
+	if (found_client != NULL) {
 		if (sender) {
 			if (found_client->GetSocket()) {
-				if (found_client->IsConnected()
-					&& (found_client->GetIP() != tocheck->GetIP() || found_client->GetUserPort() != tocheck->GetUserPort() ) )
-				{
-					// 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()){
-						AddDebugLogLineN(logClient, "Client: " + tocheck->GetUserName() + "(" + tocheck->GetFullIP() +  "), Banreason: Userhash invalid");
+				if (found_client->IsConnected() &&
+					(found_client->GetUserAddress() != tocheck->GetUserAddress() ||
+						found_client->GetUserPort() != tocheck->GetUserPort())) {
+					// 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()) {
+						AddDebugLogLineN(logClient,
+							"Client: " + tocheck->GetUserName() + "(" +
+								tocheck->GetFullIP() +
+								"), Banreason: Userhash invalid");
 						tocheck->Ban();
 						return false;
 					}
 
-					AddDebugLogLineN(logClient, "WARNING! Found matching client, to a currently connected client: "
-															+ tocheck->GetUserName() + "(" +  tocheck->GetFullIP()
-															+ ") and " + found_client->GetUserName() + "(" +  found_client->GetFullIP() + ")");
+					AddDebugLogLineN(logClient,
+						"WARNING! Found matching client, to a currently connected "
+						"client: " +
+							tocheck->GetUserName() + "(" + tocheck->GetFullIP() +
+							") and " + found_client->GetUserName() + "(" +
+							found_client->GetFullIP() + ")");
 					return false;
 				}
-				found_client->GetSocket()->Safe_Delete();
+				CClientTCPSocket *foundSocket = found_client->GetSocket();
+#ifdef AMULE_UTP_TRANSPORT
+				if (foundSocket->HasTransport() && sender->HasTransport() &&
+					foundSocket->IsUtpInbound() != sender->IsUtpInbound() &&
+					found_client->HasValidHash() && tocheck->HasValidHash()) {
+					const bool keepFound = ShouldKeepFoundUtp(foundSocket->IsUtpInbound(),
+						thePrefs::GetUserHash().GetHash(),
+						tocheck->GetUserHash().GetHash());
+					if (keepFound) {
+						// `client` aliases sender->m_client, so the survivor
+						// must not be written back: ~CClientTCPSocket() would
+						// then strip found_client of the socket just kept.
+						// Safe_Delete() leaves that member null, and the
+						// caller is told to stop touching the socket.
+						sender->Safe_Delete();
+						tocheck->Safe_Delete();
+						if (senderDiscarded != nullptr) {
+							*senderDiscarded = true;
+						}
+						return true;
+					}
+				}
+#endif
+				foundSocket->Safe_Delete();
 			}
-			found_client->SetSocket( sender );
-			tocheck->SetSocket( NULL );
+			found_client->SetSocket(sender);
+			tocheck->SetSocket(NULL);
 		}
 		*client = 0;
 		tocheck->Safe_Delete();
@@ -411,16 +444,18 @@
 	return false;
 }
 
+CUpDownClient *CClientList::FindClientByIP(uint32 clientip, uint16 port)
+{
+	return FindClientByIP(CNetworkAddress::FromIPv4NetworkOrderOrAbsent(clientip), port);
+}
 
-CUpDownClient* CClientList::FindClientByIP( uint32 clientip, uint16 port )
+CUpDownClient *CClientList::FindClientByIP(const CNetworkAddress &address, uint16 port)
 {
-	// Find all items with the specified ip
-	std::pair<IDMap::iterator, IDMap::iterator> range = m_ipList.equal_range( clientip );
+	auto range = m_ipList.equal_range(PeerAddressing::IndexKey(address));
 
-	for ( ; range.first != range.second; ++range.first ) {
-		CUpDownClient* cur_client = range.first->second.GetClient();
-		// Check if it's actually the client we want
-		if ( cur_client->GetUserPort() == port ) {
+	for (; range.first != range.second; ++range.first) {
+		CUpDownClient *cur_client = range.first->second.GetClient();
+		if (cur_client->GetUserPort() == port) {
 			return cur_client;
 		}
 	}
@@ -428,19 +463,21 @@
 	return NULL;
 }
 
+CUpDownClient *CClientList::FindClientByIP(uint32 clientip)
+{
+	return FindClientByIP(CNetworkAddress::FromIPv4NetworkOrderOrAbsent(clientip));
+}
 
-CUpDownClient* CClientList::FindClientByIP( uint32 clientip )
+CUpDownClient *CClientList::FindClientByIP(const CNetworkAddress &address)
 {
-	// Find all items with the specified ip
-	std::pair<IDMap::iterator, IDMap::iterator> range = m_ipList.equal_range( clientip );
+	auto range = m_ipList.equal_range(PeerAddressing::IndexKey(address));
 
 	return (range.first != range.second) ? range.first->second.GetClient() : NULL;
 }
 
-
-CUpDownClient* CClientList::FindClientByECID(uint32 ecid) const
+CUpDownClient *CClientList::FindClientByECID(uint32 ecid) const
 {
-	for (IDMap::const_iterator it =	m_clientList.begin(); it != m_clientList.end(); ++it) {
+	for (IDMap::const_iterator it = m_clientList.begin(); it != m_clientList.end(); ++it) {
 		if (it->second.ECID() == ecid) {
 			return it->second.GetClient();
 		}
@@ -449,76 +486,22 @@
 	return NULL;
 }
 
-
 bool CClientList::IsIPAlreadyKnown(uint32_t ip)
 {
-	// Find all items with the specified ip
-	std::pair<IDMap::iterator, IDMap::iterator> range = m_ipList.equal_range(ip);
-	return range.first != range.second;
+	return FindClientByIP(ip) != nullptr;
 }
 
-
-bool CClientList::ComparePriorUserhash(uint32 dwIP, uint16 nPort, void* pNewHash)
-{
-	std::map<uint32, CDeletedClient*>::iterator it = m_trackedClientsList.find( dwIP );
-
-	if ( it != m_trackedClientsList.end() ) {
-		CDeletedClient* pResult = it->second;
-
-		CDeletedClient::PaHList::iterator it2 = pResult->m_ItemsList.begin();
-		for ( ; it2 != pResult->m_ItemsList.end(); ++it2 ) {
-			if ( it2->nPort == nPort ) {
-				if ( it2->pHash != pNewHash) {
-					return false;
-				} else {
-					break;
-				}
-			}
-		}
-	}
-	return true;
-}
-
-
-void CClientList::AddTrackClient(CUpDownClient* toadd)
+bool CClientList::ComparePriorUserhash(const CNetworkAddress &address, uint16 nPort, void *pNewHash)
 {
-	std::map<uint32, CDeletedClient*>::iterator it = m_trackedClientsList.find( toadd->GetIP() );
-
-	if ( it != m_trackedClientsList.end() ) {
-		CDeletedClient* pResult = it->second;
-
-		pResult->m_dwInserted = ::GetTickCount64();
-
-		CDeletedClient::PaHList::iterator it2 = pResult->m_ItemsList.begin();
-		for ( ; it2 != pResult->m_ItemsList.end(); ++it2 ) {
-			if ( it2->nPort == toadd->GetUserPort() ) {
-				// already tracked, update
-				it2->pHash = toadd->GetCreditsHash();
-				return;
-			}
-		}
-
-		// New client for that IP, add an entry
-		CDeletedClient::PortAndHash porthash = { toadd->GetUserPort(), toadd->GetCreditsHash()};
-		pResult->m_ItemsList.push_back(porthash);
-	} else {
-		m_trackedClientsList toadd->GetIP()  = new CDeletedClient(toadd);
-	}
+	return m_trackedClientsList.Compare(address, nPort, pNewHash);
 }
 
-
-uint16 CClientList::GetClientsFromIP(uint32 dwIP)
+void CClientList::AddTrackClient(CUpDownClient *toadd)
 {
-	std::map<uint32, CDeletedClient*>::iterator it = m_trackedClientsList.find( dwIP );
-
-	if ( it != m_trackedClientsList.end() ) {
-		return it->second->m_ItemsList.size();
-	} else {
-		return 0;
-	}
+	m_trackedClientsList.Add(
+		toadd->GetUserAddress(), toadd->GetUserPort(), toadd->GetCreditsHash(), ::GetTickCount64());
 }
 
-
 void CClientList::Process()
 {
 	const uint64 cur_tick = ::GetTickCount64();
@@ -526,154 +509,153 @@
 	if (m_dwLastBannCleanUp + BAN_CLEANUP_TIME < cur_tick) {
 		m_dwLastBannCleanUp = cur_tick;
 
-		ClientMap::iterator it = m_bannedList.begin();
-		while ( it != m_bannedList.end() ) {
-			if ( it->second + CLIENTBANTIME < cur_tick ) {
-				ClientMap::iterator tmp = it++;
-
-				m_bannedList.erase( tmp );
-				theStats::RemoveBannedClient();
-			} else {
-				++it;
-			}
+		// One decrement per entry the sweep actually dropped. The record counts them
+		// because it is the only thing that knows which were lapsed.
+		const std::size_t dropped = m_bannedList.DropLapsed(cur_tick);
+		for (std::size_t i = 0; i < dropped; ++i) {
+			theStats::RemoveBannedClient();
 		}
 	}
 
-
-	if ( m_dwLastTrackedCleanUp + TRACKED_CLEANUP_TIME < cur_tick ) {
+	if (m_dwLastTrackedCleanUp + TRACKED_CLEANUP_TIME < cur_tick) {
 		m_dwLastTrackedCleanUp = cur_tick;
 
-		std::map<uint32, CDeletedClient*>::iterator it = m_trackedClientsList.begin();
-		while ( it != m_trackedClientsList.end() ) {
-			std::map<uint32, CDeletedClient*>::iterator cur_src = it++;
-
-			if ( cur_src->second->m_dwInserted + KEEPTRACK_TIME < cur_tick ) {
-				delete cur_src->second;
-				m_trackedClientsList.erase( cur_src );
-			}
-		}
+		m_trackedClientsList.DropLapsed(cur_tick, KEEPTRACK_TIME);
 	}
 
-	//We need to try to connect to the clients in m_KadList
-	//If connected, remove them from the list and send a message back to Kad so we can send a ACK.
-	//If we don't connect, we need to remove the client..
-	//The sockets timeout should delete this object.
+	// Try to connect to the clients in m_KadList. If connected, remove them from the list and
+	// send a message back to Kad so we can send an ACK; if not, the client is removed and the
+	// socket timeout deletes the object.
 
 	// buddy is just a flag that is used to make sure we are still connected or connecting to a buddy.
 	buddyState buddy = Disconnected;
 
 	CClientRefSet::iterator current_it = m_KadSources.begin();
 	while (current_it != m_KadSources.end()) {
-		CUpDownClient* cur_client = current_it->GetClient();
+		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.
-			//Setting the Kad state to KS_NONE causes it to be removed in the switch below.
+		if (!Kademlia::CKademlia::IsRunning()) {
+			// Clear out this list if we stop running Kad.
+			// Setting the Kad state to KS_NONE causes it to be removed in the switch below.
 			cur_client->SetKadState(KS_NONE);
 		}
 		switch (cur_client->GetKadState()) {
-			case KS_QUEUED_FWCHECK:
-			case KS_QUEUED_FWCHECK_UDP:
-				//Another client asked us to try to connect to them to check their firewalled status.
-				cur_client->TryToConnect(true);
-				break;
-
-			case KS_CONNECTING_FWCHECK:
-				//Ignore this state as we are just waiting for results.
-				break;
-
-			case KS_FWCHECK_UDP:
-			case KS_CONNECTING_FWCHECK_UDP:
-				// We want a UDP firewallcheck from this client and are just waiting to get connected to send the request
-				break;
-
-			case KS_CONNECTED_FWCHECK:
-				//We successfully connected to the client.
-				//We now send a ack to let them know.
-				if (cur_client->GetKadVersion() >= 7) {
-					// 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());
-					AddDebugLogLineN(logLocalClient, "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 {
-					AddDebugLogLineN(logClientKadUDP, "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.
+		case KS_QUEUED_FWCHECK:
+		case KS_QUEUED_FWCHECK_UDP:
+			// Another client asked us to try to connect to them to check their firewalled status.
+			cur_client->TryToConnect(true);
+			break;
+
+		case KS_CONNECTING_FWCHECK:
+			// Ignore this state as we are just waiting for results.
+			break;
+
+		case KS_FWCHECK_UDP:
+		case KS_CONNECTING_FWCHECK_UDP:
+			// We want a UDP firewallcheck from this client and are just waiting to get connected
+			// to send the request
+			break;
+
+		case KS_CONNECTED_FWCHECK:
+			// We successfully connected to the client.
+			// We now send a ack to let them know.
+			if (cur_client->GetKadVersion() >= 7) {
+				// The result is now sent over TCP instead of UDP, because UDP fails
+				// if our internal port is unreachable. We want the TCP test result
+				// regardless of UDP being firewalled; the new UDP state and test
+				// take care of the rest.
+				wxASSERT(cur_client->IsConnected());
+				AddDebugLogLineN(logLocalClient,
+					"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 {
+				AddDebugLogLineN(logClientKadUDP,
+					"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.
+			cur_client->SetKadState(KS_NONE);
+			break;
+
+		case KS_INCOMING_BUDDY:
+			// A firewalled client wants us to be his buddy. If we already have a buddy,
+			// set Kad state to KS_NONE and it is removed next cycle; if not, this
+			// client changes to KS_CONNECTED_BUDDY when it connects.
+			if (m_nBuddyStatus == Connected) {
 				cur_client->SetKadState(KS_NONE);
-				break;
+			}
+			break;
 
-			case KS_INCOMING_BUDDY:
-				//A firewalled client wants us to be his buddy.
-				//If we already have a buddy, we set Kad state to KS_NONE and it's removed in the next cycle.
-				//If not, this client will change to KS_CONNECTED_BUDDY when it connects.
-				if( m_nBuddyStatus == Connected ) {
-					cur_client->SetKadState(KS_NONE);
-				}
-				break;
-
-			case KS_QUEUED_BUDDY:
-				//We are firewalled and want to request this client to be a buddy.
-				//But first we check to make sure we are not already trying another client.
-				//If we are not already trying. We try to connect to this client.
-				//If we are already connected to a buddy, we set this client to KS_NONE and it's removed next cycle.
-				//If we are trying to connect to a buddy, we just ignore as the one we are trying may fail and we can then try this one.
-				if( m_nBuddyStatus == Disconnected ) {
-					buddy = Connecting;
-					m_nBuddyStatus = Connecting;
-					cur_client->SetKadState(KS_CONNECTING_BUDDY);
-					cur_client->TryToConnect(true);
-					Notify_ServerUpdateED2KInfo();
-				} else {
-					if( m_nBuddyStatus == Connected ) {
-						cur_client->SetKadState(KS_NONE);
-					}
-				}
-				break;
-
-			case KS_CONNECTING_BUDDY:
-				//We are trying to connect to this client.
-				//Although it should NOT happen, we make sure we are not already connected to a buddy.
-				//If we are we set to KS_NONE and it's removed next cycle.
-				//But if we are not already connected, make sure we set the flag to connecting so we know
-				//things are working correctly.
-				if( m_nBuddyStatus == Connected ) {
+		case KS_QUEUED_BUDDY:
+			// We are firewalled and want this client as a buddy, but only if we are not
+			// already trying another. Already connected to a buddy: set KS_NONE and it
+			// goes next cycle. Already trying one: ignore this client, since the
+			// attempt in flight may still fail.
+			if (m_nBuddyStatus == Disconnected) {
+				buddy = Connecting;
+				m_nBuddyStatus = Connecting;
+				cur_client->SetKadState(KS_CONNECTING_BUDDY);
+				cur_client->TryToConnect(true);
+				Notify_ServerUpdateED2KInfo();
+			} else {
+				if (m_nBuddyStatus == Connected) {
 					cur_client->SetKadState(KS_NONE);
-				} else {
-					wxASSERT( m_nBuddyStatus == Connecting );
-					buddy = Connecting;
 				}
-				break;
-
-			case KS_CONNECTED_BUDDY:
-				//A potential connected buddy client wanting to me in the Kad network
-				//We set our flag to connected to make sure things are still working correctly.
-				buddy = Connected;
-
-				//If m_nBuddyStatus is not connected already, we set this client as our buddy!
-				if( m_nBuddyStatus != Connected ) {
-					m_pBuddy.Link(cur_client CLIENT_DEBUGSTRING("CClientList::Process KS_CONNECTED_BUDDY m_pBuddy.Link"));
-					m_nBuddyStatus = Connected;
-					Notify_ServerUpdateED2KInfo();
-				}
-				if( m_pBuddy.GetClient() == cur_client && theApp->IsFirewalled() && cur_client->SendBuddyPingPong() ) {
-					cur_client->SendBuddyPing();
-				}
-				break;
+			}
+			break;
+
+		case KS_CONNECTING_BUDDY:
+			// We are trying to connect to this client. It should not happen, but make
+			// sure we are not already connected to a buddy -- if we are, set KS_NONE
+			// for next cycle -- and otherwise flag connecting.
+			if (m_nBuddyStatus == Connected) {
+				cur_client->SetKadState(KS_NONE);
+			} else {
+				wxASSERT(m_nBuddyStatus == Connecting);
+				buddy = Connecting;
+			}
+			break;
+
+		case KS_CONNECTED_BUDDY:
+			// A potential connected buddy client wanting to me in the Kad network
+			// We set our flag to connected to make sure things are still working correctly.
+			buddy = Connected;
+
+			// If m_nBuddyStatus is not connected already, we set this client as our buddy!
+			if (m_nBuddyStatus != Connected) {
+				m_pBuddy.Link(cur_client CLIENT_DEBUGSTRING(
+					"CClientList::Process KS_CONNECTED_BUDDY m_pBuddy.Link"));
+				m_nBuddyStatus = Connected;
+				Notify_ServerUpdateED2KInfo();
+			}
+			if (m_pBuddy.GetClient() == cur_client && theApp->IsFirewalled() &&
+				cur_client->SendBuddyPingPong()) {
+				cur_client->SendBuddyPing();
+			}
+			break;
 
-			default:
-				RemoveFromKadList(cur_client);
+		default:
+			RemoveFromKadList(cur_client);
 		}
 	}
 
-	//We either never had a buddy, or lost our buddy..
-	if( buddy == Disconnected ) {
-		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.
+	// We either never had a buddy, or lost our buddy..
+	if (buddy == Disconnected) {
+		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.Unlink();
@@ -682,158 +664,198 @@
 		}
 	}
 
-	if ( Kademlia::CKademlia::IsConnected() ) {
+	if (Kademlia::CKademlia::IsConnected()) {
 		// we only need a buddy if direct callback is not available
-		if(Kademlia::CKademlia::IsFirewalled() && Kademlia::CUDPFirewallTester::IsFirewalledUDP(true)) {
-			// TODO: Kad buddies won't work with RequireCrypt, so it is disabled for now, but should (and will)
-			// be fixed in later version
-			// Update: buddy connections themselves support obfuscation properly since eMule 0.49a and aMule SVN 2008-05-09
-			// (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()) {
+		if (Kademlia::CKademlia::IsFirewalled() &&
+			Kademlia::CUDPFirewallTester::IsFirewalledUDP(true)) {
+			// Kad buddies do not work with RequireCrypt, so it is disabled here. Buddy
+			// connections themselves have supported obfuscation since eMule 0.49a, but
+			// callback requests do not, so we could not answer one under RequireCrypt.
+			if (m_nBuddyStatus == Disconnected &&
+				Kademlia::CKademlia::GetPrefs()->GetFindBuddy() &&
+				!thePrefs::IsClientCryptLayerRequired()) {
 				AddDebugLogLineN(logKadMain, "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) ^ (Kademlia::CKademlia::GetPrefs()->GetKadID()))) {
-					//This search ID was already going. Most likely reason is that
-					//we found and lost our buddy very quickly and the last search hadn't
-					//had time to be removed yet. Go ahead and set this to happen again
-					//next time around.
+				// 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) ^
+						    (Kademlia::CKademlia::GetPrefs()->GetKadID()))) {
+					// This search ID was already going, most likely because we
+					// found and lost a buddy quickly and the last search has
+					// not been removed yet. Set it to happen again next time.
 					Kademlia::CKademlia::GetPrefs()->SetFindBuddy();
 				}
 			}
 		} else {
 			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() ) {
+				// If a buddy is not firewalled either, someone has fixed their
+				// firewall or stopped saturating their line, so set KS_NONE and let
+				// the next cycle clear it up.
+				if (!m_pBuddy.HasLowID()) {
 					m_pBuddy.GetClient()->SetKadState(KS_NONE);
 				}
 			}
 		}
 	} else {
 		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.
+			// We are not connected anymore. Just set this buddy to KS_NONE and things will be
+			// cleared out on next cycle.
 			m_pBuddy.GetClient()->SetKadState(KS_NONE);
 		}
 	}
 
 	CleanUpClientList();
 	ProcessDirectCallbackList();
+	theApp->browsemanager->Process(cur_tick);
 }
 
-
 void CClientList::AddBannedClient(uint32 dwIP)
 {
-	m_bannedListdwIP = ::GetTickCount64();
-	theStats::AddBannedClient();
+	AddBannedClient(CNetworkAddress::FromIPv4NetworkOrder(dwIP));
 }
 
+void CClientList::AddBannedClient(const CNetworkAddress &address)
+{
+	// Counted only when the address was not already banned. Ban() overwrote the tick on an
+	// address already present and counted it again, and CUpDownClient::SetSpammer(true) calls
+	// Ban() with no IsBanned() check, so a client banned for aggressiveness and later flagged
+	// as a spammer counted twice while UnBan() gave back one.
+	if (m_bannedList.Ban(address, ::GetTickCount64())) {
+		theStats::AddBannedClient();
+	}
+}
 
 bool CClientList::IsBannedClient(uint32 dwIP)
 {
-	ClientMap::iterator it = m_bannedList.find( dwIP );
+	return IsBannedClient(CNetworkAddress::FromIPv4NetworkOrder(dwIP));
+}
 
-	if ( it != m_bannedList.end() ) {
-		if ( it->second + CLIENTBANTIME > ::GetTickCount64() ) {
-			return true;
-		} else {
-			RemoveBannedClient(dwIP);
-		}
+bool CClientList::IsBannedClient(const CNetworkAddress &address)
+{
+	// A lapsed ban is dropped inside the lookup, so the decrement has to
+	// follow what the lookup did rather than the answer it gave.
+	bool dropped = false;
+	const bool banned = m_bannedList.IsBanned(address, ::GetTickCount64(), &dropped);
+	if (dropped) {
+		theStats::RemoveBannedClient();
 	}
-	return false;
+	return banned;
 }
 
-
 void CClientList::RemoveBannedClient(uint32 dwIP)
 {
-	m_bannedList.erase(dwIP);
-	theStats::RemoveBannedClient();
+	RemoveBannedClient(CNetworkAddress::FromIPv4NetworkOrder(dwIP));
 }
 
+void CClientList::RemoveBannedClient(const CNetworkAddress &address)
+{
+	// The mirror of the add path: erase() removed nothing when the address
+	// was not banned, and the count followed the call anyway.
+	if (m_bannedList.Unban(address)) {
+		theStats::RemoveBannedClient();
+	}
+}
 
 void CClientList::FilterQueues()
 {
-	// 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!
-		CUpDownClient* client = tmp->second.GetClient();
-		if ( theApp->ipfilter->IsFiltered(client->GetConnectIP())) {
+	for (AddressMap::const_iterator it = m_ipList.begin(); it != m_ipList.end();) {
+		AddressMap::const_iterator tmp = it++; // Don't change this to a ++it!
+		CUpDownClient *client = tmp->second.GetClient();
+		if (theApp->ipfilter->IsFiltered(tmp->first)) {
 			client->Disconnected("Filtered by IPFilter");
 			client->Safe_Delete();
 		}
 	}
 }
 
-
-CClientList::SourceList	CClientList::GetClientsByHash( const CMD4Hash& hash )
+CClientList::SourceList CClientList::GetClientsByHash(const CMD4Hash &hash)
 {
 	SourceList results;
 
-	// Find all items with the specified hash
-	std::pair<HashMap::iterator, HashMap::iterator> range = m_hashList.equal_range( hash );
+	std::pair<HashMap::iterator, HashMap::iterator> range = m_hashList.equal_range(hash);
 
-	for ( ; range.first != range.second; ++range.first)  {
-		results.push_back( range.first->second );
+	for (; range.first != range.second; ++range.first) {
+		results.push_back(range.first->second);
 	}
 
 	return results;
 }
 
+CClientList::SourceList CClientList::GetClientsByIP(unsigned long ip)
+{
+	return GetClientsByIP(CNetworkAddress::FromIPv4NetworkOrderOrAbsent(ip));
+}
 
-CClientList::SourceList	CClientList::GetClientsByIP( unsigned long ip )
+CClientList::SourceList CClientList::GetClientsByIP(const CNetworkAddress &address)
 {
 	SourceList results;
 
-	// Find all items with the specified hash
-	std::pair<IDMap::iterator, IDMap::iterator> range = m_ipList.equal_range( ip );
+	auto range = m_ipList.equal_range(PeerAddressing::IndexKey(address));
 
-	for ( ; range.first != range.second; range.first++ )  {
-		results.push_back( range.first->second );
+	for (; range.first != range.second; range.first++) {
+		results.push_back(range.first->second);
 	}
 
 	return results;
 }
 
-
-const CClientList::IDMap& CClientList::GetClientList()
+const CClientList::IDMap &CClientList::GetClientList()
 {
 	return m_clientList;
 }
 
-
-void CClientList::AddDeadSource(const CUpDownClient* client)
+void CClientList::AddDeadSource(const CUpDownClient *client)
 {
-	m_deadSources.AddDeadSource( client );
+	m_deadSources.AddDeadSource(client);
 }
 
-
-bool CClientList::IsDeadSource(const CUpDownClient* client)
+bool CClientList::IsDeadSource(const CUpDownClient *client)
 {
-	return m_deadSources.IsDeadSource( client );
+	return m_deadSources.IsDeadSource(client);
 }
 
-bool CClientList::SendChatMessage(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));
-	AddDebugLogLineN( logClient, "Trying to Send Message." );
+	if (client_id == 0) {
+		// Names no peer: every such message would allocate another client
+		// aimed at 0.0.0.0, since a zero address is never indexed.
+		return false;
+	}
+	CUpDownClient *client = FindClientByIP(IP_FROM_GUI_ID(client_id), PORT_FROM_GUI_ID(client_id));
+	AddDebugLogLineN(logClient, "Trying to Send Message.");
 	if (client) {
-		AddDebugLogLineN( logClient, "Sending." );
+		AddDebugLogLineN(logClient, "Sending.");
 	} else {
-		AddDebugLogLineC( logClient,
-			CFormat( "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);
+		AddDebugLogLineC(logClient,
+			CFormat("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));
+		// Through CreateForAddress(), which seeds GetIP() and reuses any client we already
+		// hold for this peer. Constructing one here directly leaves GetIP() at 0, so
+		// AddClient() keeps it out of the address index and the lookup above misses it next
+		// time: one unreachable client per message sent. Both builds arrive here, amulegui
+		// by way of EC_OP_CHAT_SEND.
+		CClientRef ref = CreateForAddress(
+			CMD4Hash(), IP_FROM_GUI_ID(client_id), PORT_FROM_GUI_ID(client_id), wxEmptyString);
+		if (!ref.IsLinked()) {
+			return false;
+		}
+		client = ref.GetClient();
+	}
+	// Record before sending, and regardless of the result: a false return from
+	// CUpDownClient::SendChatMessage means "queued while connecting", not "failed", so gating
+	// the store on it would drop exactly the messages a slow peer receives a moment later.
+	if (theApp->chatsessions) {
+		theApp->chatsessions->AddOutgoing(client_id, message);
 	}
 	return client->SendChatMessage(message);
 }
 
-void CClientList::SetChatState(uint64 client_id, uint8 state) {
-	CUpDownClient* client = FindClientByIP(IP_FROM_GUI_ID(client_id), PORT_FROM_GUI_ID(client_id));
+void CClientList::SetChatState(uint64 client_id, uint8 state)
+{
+	CUpDownClient *client = FindClientByIP(IP_FROM_GUI_ID(client_id), PORT_FROM_GUI_ID(client_id));
 	if (client) {
 		client->SetChatState(state);
 	}
@@ -841,7 +863,7 @@
 
 /* Kad stuff */
 
-bool CClientList::RequestTCP(Kademlia::CContact* contact, uint8_t connectOptions)
+bool CClientList::RequestTCP(Kademlia::CContact *contact, uint8_t connectOptions)
 {
 	uint32_t nContactIP = wxUINT32_SWAP_ALWAYS(contact->GetIPAddress());
 	// don't connect ourself
@@ -849,16 +871,17 @@
 		return false;
 	}
 
-	CUpDownClient* pNewClient = FindClientByIP(nContactIP, contact->GetTCPPort());
+	CUpDownClient *pNewClient = FindClientByIP(nContactIP, contact->GetTCPPort());
 
 	if (!pNewClient) {
-		//#warning Do we actually have to check friendstate here?
-		pNewClient = new CUpDownClient(contact->GetTCPPort(), contact->GetIPAddress(), 0, 0, NULL, false, true);
+		// #warning Do we actually have to check friendstate here?
+		pNewClient = new CUpDownClient(
+			contact->GetTCPPort(), contact->GetIPAddress(), 0, 0, NULL, false, true);
 	} else if (pNewClient->GetKadState() != KS_NONE) {
-		return false; // already busy with this client in some way (probably buddy stuff), don't mess with it
+		return false; // already busy with this client in some way (probably buddy stuff), don't mess
+			      // with it
 	}
 
-	//Add client to the lists to be processed.
 	pNewClient->SetKadPort(contact->GetUDPPort());
 	pNewClient->SetKadState(KS_QUEUED_FWCHECK);
 	if (contact->GetClientID() != 0) {
@@ -868,12 +891,11 @@
 		pNewClient->SetConnectOptions(connectOptions, true, false);
 	}
 	AddToKadList(pNewClient); // This was a direct adding, but I like to check duplicates
-	//This method checks if this is a dup already.
 	AddClient(pNewClient);
 	return true;
 }
 
-void CClientList::RequestBuddy(Kademlia::CContact* contact, uint8_t connectOptions)
+void CClientList::RequestBuddy(Kademlia::CContact *contact, uint8_t connectOptions)
 {
 	uint32_t nContactIP = wxUINT32_SWAP_ALWAYS(contact->GetIPAddress());
 	// Don't connect to ourself
@@ -881,17 +903,19 @@
 		return;
 	}
 
-	CUpDownClient* pNewClient = FindClientByIP(nContactIP, contact->GetTCPPort());
+	CUpDownClient *pNewClient = FindClientByIP(nContactIP, contact->GetTCPPort());
 	if (!pNewClient) {
-		pNewClient = new CUpDownClient(contact->GetTCPPort(), contact->GetIPAddress(), 0, 0, NULL, false, true );
+		pNewClient = new CUpDownClient(
+			contact->GetTCPPort(), contact->GetIPAddress(), 0, 0, NULL, false, true);
 	} 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
-		AddDebugLogLineN(logKadMain, "Kad TCP firewallcheck / Buddy request collision for IP " + Uint32toStringIP(nContactIP));
+		AddDebugLogLineN(logKadMain,
+			"Kad TCP firewallcheck / Buddy request collision for IP " +
+				Uint32toStringIP(nContactIP));
 		return;
 	}
 
-	//Add client to the lists to be processed.
 	pNewClient->SetKadPort(contact->GetUDPPort());
 	pNewClient->SetKadState(KS_QUEUED_BUDDY);
 	uint8_t ID16;
@@ -899,19 +923,20 @@
 	pNewClient->SetUserHash(CMD4Hash(ID));
 	pNewClient->SetConnectOptions(connectOptions, true, false);
 	AddToKadList(pNewClient);
-	//This method checks if this is a dup already.
 	AddClient(pNewClient);
 }
 
-bool CClientList::IncomingBuddy(Kademlia::CContact* contact, Kademlia::CUInt128* buddyID)
+bool CClientList::IncomingBuddy(Kademlia::CContact *contact, Kademlia::CUInt128 *buddyID)
 {
 	uint32_t nContactIP = wxUINT32_SWAP_ALWAYS(contact->GetIPAddress());
-	//If aMule already knows this client, abort this.. It could cause conflicts.
-	//Although the odds of this happening is very small, it could still happen.
+	// If aMule already knows this client, abort this.. It could cause conflicts.
+	// Although the odds of this happening is very small, it could still happen.
 	if (FindClientByIP(nContactIP, contact->GetTCPPort())) {
 		return false;
 	} else if (IsKadFirewallCheckIP(nContactIP)) { // doing a kad firewall check with this IP, abort
-		AddDebugLogLineN(logKadMain, "Kad TCP firewallcheck / Buddy request collision for IP " + Uint32toStringIP(nContactIP));
+		AddDebugLogLineN(logKadMain,
+			"Kad TCP firewallcheck / Buddy request collision for IP " +
+				Uint32toStringIP(nContactIP));
 		return false;
 	}
 
@@ -919,8 +944,8 @@
 		return false; // don't connect ourself
 	}
 
-	//Add client to the lists to be processed.
-	CUpDownClient* pNewClient = new CUpDownClient(contact->GetTCPPort(), contact->GetIPAddress(), 0, 0, NULL, false, true );
+	CUpDownClient *pNewClient =
+		new CUpDownClient(contact->GetTCPPort(), contact->GetIPAddress(), 0, 0, NULL, false, true);
 	pNewClient->SetKadPort(contact->GetUDPPort());
 	pNewClient->SetKadState(KS_INCOMING_BUDDY);
 	uint8_t ID16;
@@ -933,7 +958,7 @@
 	return true;
 }
 
-void CClientList::RemoveFromKadList(CUpDownClient* torem)
+void CClientList::RemoveFromKadList(CUpDownClient *torem)
 {
 	wxCHECK_RET(torem, "NULL pointer in RemoveFromKadList");
 
@@ -946,26 +971,28 @@
 	}
 }
 
-void CClientList::AddToKadList(CUpDownClient* toadd)
+void CClientList::AddToKadList(CUpDownClient *toadd)
 {
 	wxCHECK_RET(toadd, "NULL pointer in AddToKadList");
 
-	m_KadSources.insert(CCLIENTREF(toadd, "CClientList::AddToKadList")); // This will take care of duplicates.
+	m_KadSources.insert(
+		CCLIENTREF(toadd, "CClientList::AddToKadList")); // This will take care of duplicates.
 }
 
-bool CClientList::DoRequestFirewallCheckUDP(const Kademlia::CContact& contact)
+bool CClientList::DoRequestFirewallCheckUDP(const Kademlia::CContact &contact)
 {
 	// first make sure we don't know this IP already from somewhere
 	if (IsIPAlreadyKnown(wxUINT32_SWAP_ALWAYS(contact.GetIPAddress()))) {
 		return false;
 	}
-	// fine, just create the client object, set the state and wait
-	// TODO: We don't know the client's userhash, this means we cannot build an obfuscated connection, which
-	// again mean that the whole check won't work on "Require Obfuscation" setting, which is not a huge problem,
-	// 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);
+	// Just create the client object, set the state and wait. TODO: we do not know the client's
+	// userhash, so no obfuscated connection can be built and the check does not work under
+	// "Require Obfuscation". The only somewhat acceptable fix 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);
-	AddDebugLogLineN(logClient, "Selected client for UDP Firewallcheck: " + KadIPToString(contact.GetIPAddress()));
+	AddDebugLogLineN(
+		logClient, "Selected client for UDP Firewallcheck: " + KadIPToString(contact.GetIPAddress()));
 	AddToKadList(pNewClient);
 	AddClient(pNewClient);
 	wxASSERT(!pNewClient->SupportsDirectUDPCallback());
@@ -974,68 +1001,76 @@
 
 void CClientList::CleanUpClientList()
 {
-	// We remove clients which are not needed any more by time
-	// this check is also done on CUpDownClient::Disconnected, however it will not catch all
-	// cases (if a client changes the state without being connected
-	//
-	// Adding this check directly to every point where any state changes would be more effective,
-	// is however not compatible with the current code, because there are points where a client has
-	// no state for some code lines and the code is also not prepared that a client object gets
-	// invalid while working with it (aka setting a new state)
-	// so this way is just the easy and safe one to go (as long as amule is basically single threaded)
+	// Remove clients that are no longer needed, by time. CUpDownClient::Disconnected does this
+	// check too, but misses the cases where a client changes state without being connected.
+	// Doing it at every state change would be more effective but is not compatible with the
+	// current code: there are points where a client has no state for a few lines, and nothing
+	// is prepared for a client object going invalid while being worked on.
 	const uint64 cur_tick = ::GetTickCount64();
-	if (m_dwLastClientCleanUp + CLIENTLIST_CLEANUP_TIME < cur_tick ){
+	if (m_dwLastClientCleanUp + CLIENTLIST_CLEANUP_TIME < cur_tick) {
 		m_dwLastClientCleanUp = cur_tick;
-		DEBUG_ONLY( 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.GetClient();
+			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 - theStats::GetStartTime() < MIN2MS(10)) continue;
-			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)
-			{
-				DEBUG_ONLY( cDeleted++; )
+			if (pCurClient->GetSourceFrom() == SF_SOURCE_SEEDS &&
+				cur_tick - theStats::GetStartTime() < MIN2MS(10))
+				continue;
+			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) {
+				DEBUG_ONLY(cDeleted++;)
 				pCurClient->Disconnected("Removed during ClientList cleanup.");
 				pCurClient->Safe_Delete();
 #ifdef __DEBUG__
 			} else {
-				if (!(pCurClient->GetUploadState() == US_NONE || (pCurClient->GetUploadState() == US_BANNED && !pCurClient->IsBanned()))) {
+				if (!(pCurClient->GetUploadState() == US_NONE ||
+					    (pCurClient->GetUploadState() == US_BANNED &&
+						    !pCurClient->IsBanned()))) {
 					AddDebugLogLineN(logProxy,
-						CFormat("Debug: Not deleted client %p with up state: %i ")
-							% static_cast<void*>(pCurClient) % pCurClient->GetUploadState());
+						CFormat("Debug: Not deleted client %p with up state: %i ") %
+							static_cast<void *>(pCurClient) %
+							pCurClient->GetUploadState());
 				}
 				if (!(pCurClient->GetDownloadState() == DS_NONE)) {
 					AddDebugLogLineN(logProxy,
-						CFormat("Debug: Not deleted client %p with down state: %i ")
-							% static_cast<void*>(pCurClient) % pCurClient->GetDownloadState());
+						CFormat("Debug: Not deleted client %p with down state: %i ") %
+							static_cast<void *>(pCurClient) %
+							pCurClient->GetDownloadState());
 				}
 				if (!(pCurClient->GetChatState() == MS_NONE)) {
 					AddDebugLogLineN(logProxy,
-						CFormat("Debug: Not deleted client %p with chat state: %i ")
-							% static_cast<void*>(pCurClient) % pCurClient->GetChatState());
+						CFormat("Debug: Not deleted client %p with chat state: %i ") %
+							static_cast<void *>(pCurClient) %
+							pCurClient->GetChatState());
 				}
 				if (!(pCurClient->GetKadState() == KS_NONE)) {
 					AddDebugLogLineN(logProxy,
-						CFormat("Debug: Not deleted client %p with kad state: %i ip: %s")
-							% static_cast<void*>(pCurClient) % (int)pCurClient->GetKadState() % pCurClient->GetFullIP());
+						CFormat("Debug: Not deleted client %p with kad state: %i ip: "
+							"%s") %
+							static_cast<void *>(pCurClient) %
+							(int)pCurClient->GetKadState() %
+							pCurClient->GetFullIP());
 				}
 				if (!(pCurClient->GetSocket() == NULL)) {
 					AddDebugLogLineN(logProxy,
-						CFormat("Debug: Not deleted client %p: has socket") % static_cast<void*>(pCurClient));
+						CFormat("Debug: Not deleted client %p: has socket") %
+							static_cast<void *>(pCurClient));
 				}
 				AddDebugLogLineN(logProxy,
-					CFormat("Debug: Not deleted client %p with kad version: %i")
-						% static_cast<void*>(pCurClient) % pCurClient->GetKadVersion());
+					CFormat("Debug: Not deleted client %p with kad version: %i") %
+						static_cast<void *>(pCurClient) %
+						pCurClient->GetKadVersion());
 #endif
 			}
 		}
-		AddDebugLogLineN(logClient, CFormat("Cleaned ClientList, removed %i not used known clients") % cDeleted);
+		AddDebugLogLineN(logClient,
+			CFormat("Cleaned ClientList, removed %i not used known clients") % cDeleted);
 	}
 }
 
@@ -1056,7 +1091,9 @@
 bool CClientList::IsKadFirewallCheckIP(uint32 ip) const
 {
 	uint64 ticks = ::GetTickCount64();
-	for (IpAndTicksList::const_iterator it = m_firewallCheckRequests.begin(); it != m_firewallCheckRequests.end(); ++it) {
+	for (IpAndTicksList::const_iterator it = m_firewallCheckRequests.begin();
+		it != m_firewallCheckRequests.end();
+		++it) {
 		if (it->ip == ip && ticks - it->inserted < SEC2MS(180)) {
 			return true;
 		}
@@ -1064,15 +1101,18 @@
 	return false;
 }
 
-void CClientList::AddDirectCallbackClient(CUpDownClient* toAdd)
+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) {
+	for (DirectCallbackList::const_iterator it = m_currentDirectCallbacks.begin();
+		it != m_currentDirectCallbacks.end();
+		++it) {
 		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
+			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;
 		}
 	}
@@ -1083,13 +1123,12 @@
 {
 	// we do check if any direct callbacks have timed out by now
 	const uint64_t cur_tick = ::GetTickCount64();
-	for (DirectCallbackList::iterator it = m_currentDirectCallbacks.begin(); it != m_currentDirectCallbacks.end();) {
+	for (DirectCallbackList::iterator it = m_currentDirectCallbacks.begin();
+		it != m_currentDirectCallbacks.end();) {
 		DirectCallbackList::iterator it2 = it++;
-		CUpDownClient* curClient = it2->GetClient();
+		CUpDownClient *curClient = it2->GetClient();
 		if (curClient->GetDirectCallbackTimeout() < cur_tick) {
 			wxASSERT(curClient->GetDirectCallbackTimeout() != 0);
-			// TODO LOGREMOVE
-			//DebugLog(_T("DirectCallback timed out (%s)"), pCurClient->DbgGetClientInfo());
 			m_currentDirectCallbacks.erase(it2);
 			if (curClient->Disconnected("Direct Callback Timeout")) {
 				curClient->Safe_Delete();
@@ -1100,11 +1139,20 @@
 
 void CClientList::AddTrackCallbackRequests(uint32_t ip)
 {
+	AddTrackCallbackRequests(CNetworkAddress::FromIPv4NetworkOrderOrAbsent(ip));
+}
+
+void CClientList::AddTrackCallbackRequests(const CNetworkAddress &address)
+{
+	if (!PeerAddressing::CanRequestCallback(address)) {
+		return;
+	}
 	uint64_t now = ::GetTickCount64();
-	IpAndTicks add = { ip, now };
+	CallbackAddressAndTicks add = { PeerAddressing::RateLimitScope(address), now };
 	m_directCallbackRequests.push_front(add);
 	while (!m_directCallbackRequests.empty()) {
-		if (now - m_directCallbackRequests.back().inserted > MIN2MS(3)) {
+		if (now - m_directCallbackRequests.back().inserted >
+			PeerAddressing::kCallbackRequestThrottleMs) {
 			m_directCallbackRequests.pop_back();
 		} else {
 			break;
@@ -1114,9 +1162,18 @@
 
 bool CClientList::AllowCallbackRequest(uint32_t ip) const
 {
+	return AllowCallbackRequest(CNetworkAddress::FromIPv4NetworkOrderOrAbsent(ip));
+}
+
+bool CClientList::AllowCallbackRequest(const CNetworkAddress &address) const
+{
+	if (!PeerAddressing::CanRequestCallback(address)) {
+		return false;
+	}
 	uint64_t now = ::GetTickCount64();
-	for (IpAndTicksList::const_iterator it = m_directCallbackRequests.begin(); it != m_directCallbackRequests.end(); ++it) {
-		if (it->ip == ip && now - it->inserted < MIN2MS(3)) {
+	for (const auto &request : m_directCallbackRequests) {
+		if (PeerAddressing::IsCallbackRequestThrottled(
+			    address, request.address, now - request.inserted)) {
 			return false;
 		}
 	}
@@ -1133,5 +1190,4 @@
 	return GetBuddy()->GetUDPPort();
 }
 
-
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ClientList.h -> amule-3.1.0.tar.gz/src/ClientList.h Changed

@@ -26,20 +26,23 @@
 #ifndef CLIENTLIST_H
 #define CLIENTLIST_H
 
-#include "DeadSourceList.h"	// Needed for CDeadSourceList
+#include "DeadSourceList.h"
+#include "BanRecord.h" // Needed for CBanRecord // Needed for CDeadSourceList
 #include "ClientRef.h"
+#include "CanonicalPeerIndex.h"
+#include "TrackedClientRecord.h"
 
 #include <deque>
 #include <set>
 
 class CUpDownClient;
 class CClientTCPSocket;
-class CDeletedClient;
 class CMD4Hash;
-namespace Kademlia {
-	class CContact;
-	class CUInt128;
-}
+namespace Kademlia
+{
+class CContact;
+class CUInt128;
+} // namespace Kademlia
 
 enum buddyState
 {
@@ -48,403 +51,306 @@
 	Connected
 };
 
-
-#define BAN_CLEANUP_TIME	1200000 // 20 min
-
+#define BAN_CLEANUP_TIME 1200000 // 20 min
 
 /**
- * This class takes care of managing existing clients.
- *
- * This class tracks a number of attributes related to existing and deleted
- * clients. Among other things, it keeps track of existing, banned, dead and
- * dying clients, as well as offers support for matching new client-instances
- * against already exist clients to avoid duplicates.
+ * Manages existing clients: tracks existing, banned, dead and dying ones, and matches a new
+ * client instance against those already known so duplicates are avoided.
  */
 class CClientList
 {
 public:
-	/**
-	 * Constructor.
-	 */
 	CClientList();
 
-	/**
-	 * Destructor.
-	 */
 	~CClientList();
 
-
 	/**
 	 * Adds a client to the global list of clients.
-	 *
-	 * @param toadd The new client.
 	 */
-	void	AddClient( CUpDownClient* toadd );
+	void AddClient(CUpDownClient *toadd);
 
 	/**
-	 * Removes a client from the  client lists.
-	 *
-	 * @param client The client to be removed.
-	 *
-	 * To be called from CUpDownClient::Safe_Delete only.
+	 * The client at this address that could still be the peer with this hash, or nullptr. Skips
+	 * any that identifies as somebody else.
 	 */
-	void	RemoveClient( CUpDownClient* client );
-
+	CUpDownClient *FindReusableClient(const CMD4Hash &hash, uint32 ip, uint16 port);
+	CUpDownClient *FindReusableClient(const CMD4Hash &hash, const CNetworkAddress &address, uint16 port);
 
 	/**
-	 * Updates the recorded IP of the specified client.
+	 * A client for the peer at this address, added to the list.
 	 *
-	 * @param client The client to have its entry updated.
-	 * @param newIP The new IP address of the client.
+	 * For the actions that inherently mean "go talk to this peer" -- browsing its shared files,
+	 * opening a chat -- when we are not already connected to it and only hold its last known
+	 * address. Creating the object does not connect: the request the caller makes next is what
+	 * opens a connection.
 	 *
-	 * This function is to be called before the client actually changes its
-	 * IP-address, and will update the old entry with the new value. There
-	 * will only be added an entry if the new IP isn't zero.
+	 * Returns the client already held for this peer, matched by hash and failing that by
+	 * address, so repeating an action reuses the object the previous one made instead of
+	 * stacking up unreachable duplicates.
 	 */
-	void	UpdateClientIP( CUpDownClient* client, uint32 newIP );
+	CClientRef CreateForAddress(const CMD4Hash &hash, uint32 ip, uint16 port, const wxString &name);
 
 	/**
-	 * Updates the recorded ID of the specified client.
-	 *
-	 * @param client The client to have its entry updated.
-	 * @param newID The new ID of the client.
-	 *
-	 * This function is to be called before the client actually changes its
-	 * ID, and will update the old entry with the new value. Unlike the other
-	 * two functions, this function will always ensure that there is an entry
-	 * for the client, regardless of the value of newID.
+	 * Removes a client from the client lists. To be called from CUpDownClient::Safe_Delete only.
 	 */
-	void	UpdateClientID( CUpDownClient* client, uint32 newID );
+	void RemoveClient(CUpDownClient *client);
 
 	/**
-	 * Updates the recorded hash of the specified client.
-	 *
-	 * @param client The client to have its entry updated.
-	 * @param newHash The new user-hash.
-	 *
-	 * This function is to be called before the client actually changes its
-	 * user-hash, and will update the old entry with the new value. There will
-	 * only be added an entry if the new hash is valid.
+	 * Updates the recorded address before the client changes it.
+	 * Present addresses are indexed canonically; the uint32 adapter treats zero as absent.
 	 */
-	void	UpdateClientHash( CUpDownClient* client, const CMD4Hash& newHash );
+	void UpdateClientIP(CUpDownClient *client, const CNetworkAddress &address);
 
+	/**
+	 * Updates the recorded ID of the specified client, before it actually changes its ID.
+	 * Unlike the IP and hash versions, this always ensures there is an entry, whatever newID is.
+	 */
+	void UpdateClientID(CUpDownClient *client, uint32 newID);
 
 	/**
-	 * Returns the number of listed clients.
+	 * Updates the recorded hash of the specified client, before it actually changes its
+	 * user-hash. An entry is only added when the new hash is valid.
 	 */
-	uint32	GetClientCount() const;
+	void UpdateClientHash(CUpDownClient *client, const CMD4Hash &newHash);
 
+	/**
+	 * Returns the number of listed clients.
+	 */
+	uint32 GetClientCount() const;
 
 	/**
 	 * Deletes all tracked clients.
 	 */
-	void	DeleteAll();
-
+	void DeleteAll();
 
 	/**
-	 * Replaces a new client-instance with the an already existing client, if one such exist.
+	 * Replaces a new client instance with an already existing client, if one exists.
 	 *
-	 * @param client A pointer to the pointer of the new instance.
-	 * @param sender The socket associated with the new instance.
-	 *
-	 * Call this function when a new client-instance has been created. This function will then
-	 * compare it against all existing clients and see if we already have an instance matching
-	 * the new one. If that is the case, it will delete the new instance and set the pointer to
-	 * the existing one.
+	 * Call this when a new client instance has been created: it is compared against all existing
+	 * clients, and on a match the new instance is deleted and the pointer set to the existing
+	 * one.
 	 */
-	bool	AttachToAlreadyKnown( CUpDownClient** client, CClientTCPSocket* sender );
-
+	//! `senderDiscarded`, when given, reports that `sender` was destroyed here and
+	//! `*client` left null: the caller owns that socket and must stop using it.
+	bool AttachToAlreadyKnown(
+		CUpDownClient **client, CClientTCPSocket *sender, bool *senderDiscarded = nullptr);
 
 	/**
 	 * Finds a client with the specified ip and port.
-	 *
-	 * @param clientip The IP of the client to find.
-	 * @param port The port used by the client.
 	 */
-	CUpDownClient* FindClientByIP( uint32 clientip, uint16 port );
-
+	CUpDownClient *FindClientByIP(uint32 clientip, uint16 port);
+	CUpDownClient *FindClientByIP(const CNetworkAddress &address, 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.
+	 * Finds a client with the specified ip, returning the first if several share it.
 	 */
-	CUpDownClient* FindClientByIP( uint32 clientip );
-
+	CUpDownClient *FindClientByIP(uint32 clientip);
+	CUpDownClient *FindClientByIP(const CNetworkAddress &address);
 
 	/**
 	 * 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 ban time information
-	typedef std::map<uint32, uint64> ClientMap;
-
+	CUpDownClient *FindClientByECID(uint32 ecid) const;
 
 	/**
-	 * Adds a client to the list of tracked clients.
-	 *
-	 * @param toadd The client to track.
-	 *
-	 * This function is used to keep track of clients after they
-	 * have been deleted and makes it possible to spot port or hash
-	 * changes.
+	 * Adds a client to the list of tracked clients, so it stays known after deletion and port or
+	 * hash changes can be spotted.
 	 */
-	void	AddTrackClient(CUpDownClient* toadd);
-
-	/**
-	 * Returns the number of tracked client.
-	 *
-	 * @param dwIP The IP-address which of the clients.
-	 * @return The number of clients tracked at the specified IP.
-	 */
-	uint16	GetClientsFromIP(uint32 dwIP);
+	void AddTrackClient(CUpDownClient *toadd);
 
 	/**
 	 * Checks if a client has changed its user-hash.
-	 *
-	 * @param dwIP The IP of the client.
-	 * @param nPort The port of the client.
-	 * @param pNewHash The userhash associated with the client.
-	 *
 	 */
-	bool	ComparePriorUserhash( uint32 dwIP, uint16 nPort, void* pNewHash );
-
+	bool ComparePriorUserhash(const CNetworkAddress &address, uint16 nPort, void *pNewHash);
 
 	/**
 	 * Bans an IP address for 2 hours.
-	 *
-	 * @param dwIP The IP from which all clients will be banned.
 	 */
-	void	AddBannedClient(uint32 dwIP);
+	void AddBannedClient(uint32 dwIP);
+	void AddBannedClient(const CNetworkAddress &address);
 
 	/**
-	 * Checks if a client has been banned.
-	 *
-	 * @param dwIP The IP to check.
-	 * @return True if the IP is banned, false otherwise.
+	 * @return True if the IP is banned.
 	 */
-	bool	IsBannedClient(uint32 dwIP);
+	bool IsBannedClient(uint32 dwIP);
+	bool IsBannedClient(const CNetworkAddress &address);
 
 	/**
 	 * Unbans an IP address, if it has been banned.
-	 *
-	 * @param dwIP The IP address to unban.
 	 */
-	void	RemoveBannedClient(uint32 dwIP);
-
+	void RemoveBannedClient(uint32 dwIP);
+	void RemoveBannedClient(const CNetworkAddress &address);
 
 	/**
-	 * Main loop.
-	 *
-	 * This function takes care of cleaning the various lists and deleting
-	 * pending clients on the deletion-queue.
+	 * Main loop: cleans the various lists and deletes pending clients on the deletion queue.
 	 */
-	void	Process();
-
+	void Process();
 
 	/**
-	 * This function removes all clients filtered by the current IPFilter.
-	 *
-	 * Call this function after changing the current IPFiler list, to ensure
-	 * that no client-connections to illegal IPs exist. These would otherwise
-	 * be allowed to exist, bypassing the IPFilter.
+	 * Removes all clients filtered by the current IPFilter. Call after changing the IPFilter
+	 * list, or connections to illegal IPs would be left in place, bypassing the filter.
 	 */
-	void	FilterQueues();
-
+	void FilterQueues();
 
 	//! The type of the list used to store client-pointers for a couple of tasks.
 	typedef std::deque<CClientRef> SourceList;
 
-
 	/**
-	 * Returns a list of clients with the specified user-hash.
-	 *
-	 * @param hash The userhash to search for.
-	 *
-	 * This function will return a list of clients with the specified userhash,
-	 * provided that the hash is a valid non-empty userhash. Empty hashes will
-	 * simply result in nothing being found.
+	 * Returns the clients with the specified user-hash, provided it is a valid non-empty one.
+	 * An empty hash simply finds nothing.
 	 */
-	SourceList	GetClientsByHash( const CMD4Hash& hash );
+	SourceList GetClientsByHash(const CMD4Hash &hash);
 
 	/**
-	 * Returns a list of clients with the specified IP.
-	 *
-	 * @param ip The IP-address to search for.
-	 *
-	 * This function will return a list of clients with the specified IP,
-	 * provided that the IP is a non-zero value. A value of zero will not
-	 * result in any results.
+	 * Returns clients with the canonical address. Absence finds nothing;
+	 * the legacy integer adapter treats zero as absent.
 	 */
-	SourceList	GetClientsByIP( unsigned long ip );
-
+	SourceList GetClientsByIP(unsigned long ip);
+	SourceList GetClientsByIP(const CNetworkAddress &address);
 
-	//! The type of the lists used to store IPs and IDs.
+	//! The type of the list used to store legacy user IDs.
 	typedef std::multimap<uint32, CClientRef> IDMap;
-	//! The pairs of the IP/ID list.
+	//! The pairs of the user ID list.
 	typedef std::pair<uint32, CClientRef> IDMapPair;
 
-
 	/**
-	 * Returns a list of all clients.
-	 *
 	 * @return The complete list of clients.
 	 */
-	const IDMap& GetClientList();
-
+	const IDMap &GetClientList();
 
 	/**
 	 * Adds a source to the list of dead sources.
-	 *
-	 * @param client The source to be recorded as dead.
 	 */
-	void		AddDeadSource(const CUpDownClient* client);
+	void AddDeadSource(const CUpDownClient *client);
 
 	/**
-	 * Checks if a source is recorded as being dead.
-	 *
-	 * @param client The client to evaluate.
-	 * @return True if dead, false otherwise.
-	 *
-	 * Sources that are dead are not to be considered valid
-	 * sources and should not be added to partfiles.
+	 * @return True if the source is recorded as dead. A dead source is not a valid source and
+	 * must not be added to partfiles.
 	 */
-	bool		IsDeadSource(const CUpDownClient* client);
+	bool IsDeadSource(const CUpDownClient *client);
 
 	/**
-	 * Sends a message to a client, identified by a GUI_ID
-	 *
-	 * @return Success
+	 * Sends a message to a client, identified by a GUI_ID. @return Success
 	 */
-	 bool	SendChatMessage(uint64 client_id, const wxString& message);
+	bool SendChatMessage(uint64 client_id, const wxString &message);
 
 	/**
 	 * Stops a chat session with a client.
-	 *
 	 */
-	 void	SetChatState(uint64 client_id, uint8 state);
+	void SetChatState(uint64 client_id, uint8 state);
 
-	uint8	GetBuddyStatus() const {return m_nBuddyStatus;}
+	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() { return m_pBuddy.GetClient(); }
+	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);
-	void RemoveFromKadList(CUpDownClient* torem);
-	void AddToKadList(CUpDownClient* toadd);
-	bool DoRequestFirewallCheckUDP(const Kademlia::CContact& contact);
+	bool RequestTCP(Kademlia::CContact *contact, uint8_t connectOptions);
+	void RequestBuddy(Kademlia::CContact *contact, uint8_t connectOptions);
+	bool IncomingBuddy(Kademlia::CContact *contact, Kademlia::CUInt128 *buddyID);
+	void RemoveFromKadList(CUpDownClient *torem);
+	void AddToKadList(CUpDownClient *toadd);
+	bool DoRequestFirewallCheckUDP(const Kademlia::CContact &contact);
 
 	void AddKadFirewallRequest(uint32 ip);
 	bool IsKadFirewallCheckIP(uint32 ip) const;
 
 	// Direct Callback list
-	void	AddDirectCallbackClient(CUpDownClient *toAdd);
-	void	RemoveDirectCallback(CUpDownClient *toRemove) { m_currentDirectCallbacks.remove(CCLIENTREF(toRemove, "")); }
-	void	AddTrackCallbackRequests(uint32_t ip);
-	bool	AllowCallbackRequest(uint32_t ip) const;
+	void AddDirectCallbackClient(CUpDownClient *toAdd);
+	void RemoveDirectCallback(CUpDownClient *toRemove)
+	{
+		m_currentDirectCallbacks.remove(CCLIENTREF(toRemove, ""));
+	}
+	void AddTrackCallbackRequests(uint32_t ip);
+	void AddTrackCallbackRequests(const CNetworkAddress &address);
+	bool AllowCallbackRequest(uint32_t ip) const;
+	bool AllowCallbackRequest(const CNetworkAddress &address) const;
 
 protected:
-	/*
-	 * Avoids unwanted clients to be forever in the client list
-	 */
-	void	CleanUpClientList();
+	/* Avoids unwanted clients staying in the client list forever */
+	void CleanUpClientList();
 
-	void	ProcessDirectCallbackList();
+	void ProcessDirectCallbackList();
 
 private:
 	/**
-	 * Helperfunction which finds a client matching the specified client.
-	 *
-	 * @param client The client to search for.
-	 * @return The matching client or NULL.
-	 *
-	 * This functions searches through the list of clients and finds the first match
-	 * using the same checks as CUpDownClient::Compare, but without the overhead.
+	 * Finds the first client matching the specified one, or NULL. Uses the same checks as
+	 * CUpDownClient::Compare, but without the overhead.
 	 */
-	CUpDownClient* FindMatchingClient( CUpDownClient* client );
-
+	CUpDownClient *FindMatchingClient(CUpDownClient *client);
 
 	/**
 	 * Check if we already know this IP.
-	 *
-	 * This function is used to determine if the given IP address
-	 * is already known.
-	 *
-	 * @param ip The IP address to check.
 	 */
 	bool IsIPAlreadyKnown(uint32_t ip);
 
-
 	/**
-	 * Helperfunction which removes the client from the IP-list.
+	 * Removes the client from the IP-list.
 	 */
-	void	RemoveIPFromList( CUpDownClient* client );
+	void RemoveIPFromList(CUpDownClient *client);
 	/**
-	 * Helperfunction which removes the client from the ID-list.
+	 * Removes the client from the ID-list.
 	 */
-	bool	RemoveIDFromList( CUpDownClient* client );
+	bool RemoveIDFromList(CUpDownClient *client);
 	/**
-	 * Helperfunction which removes the client from the hash-list.
+	 * Removes the client from the hash-list.
 	 */
-	void	RemoveHashFromList( CUpDownClient* client );
-
+	void RemoveHashFromList(CUpDownClient *client);
 
 	//! The type of the list used to store user-hashes.
 	typedef std::multimap<CMD4Hash, CClientRef> HashMap;
 	//! The pairs of the Hash-list.
 	typedef std::pair<CMD4Hash, CClientRef> HashMapPair;
 
-
 	//! The map of clients with valid hashes
-	HashMap	m_hashList;
+	HashMap m_hashList;
 
-	//! The map of clients with valid IPs
-	IDMap	m_ipList;
+	//! Canonical peer addresses; absent peers have no entry.
+	typedef CCanonicalPeerIndex<CClientRef> AddressMap;
+	AddressMap m_ipList;
 
 	//! The full lists of clients
-	IDMap	m_clientList;
+	IDMap m_clientList;
 
-	//! This is the map of banned clients.
-	ClientMap m_bannedList;
+	//! The banned addresses, and the pairing rule for theStats' banned count: every operation
+	//! reports whether the set actually changed, and the counter follows that answer rather than
+	//! the call. See src/BanRecord.h.
+	CBanRecord m_bannedList;
 	//! This variable is used to keep track of the last time the banned-list was pruned.
-	uint64	m_dwLastBannCleanUp;
+	uint64 m_dwLastBannCleanUp;
 
 	//! This is the map of tracked clients.
-	std::map<uint32, CDeletedClient*> m_trackedClientsList;
+	CTrackedClientRecord m_trackedClientsList;
 	//! This keeps track of the last time the tracked-list was pruned.
-	uint64	m_dwLastTrackedCleanUp;
+	uint64 m_dwLastTrackedCleanUp;
 
 	//! This keeps track of the last time the client-list was pruned.
 	uint64 m_dwLastClientCleanUp;
 
 	//! List of unusable sources.
-	CDeadSourceList	m_deadSources;
+	CDeadSourceList m_deadSources;
 
 	/* Kad Stuff */
-	CClientRefSet	m_KadSources;
-	CClientRef		m_pBuddy;
+	CClientRefSet m_KadSources;
+	CClientRef m_pBuddy;
 	uint8 m_nBuddyStatus;
 
-	typedef struct {
+	typedef struct
+	{
 		uint32 ip;
 		uint64 inserted;
 	} IpAndTicks;
-	typedef std::list<IpAndTicks>	IpAndTicksList;
-	IpAndTicksList			m_firewallCheckRequests;
-
-	typedef CClientRefList	DirectCallbackList;
-	DirectCallbackList		m_currentDirectCallbacks;
-	IpAndTicksList			m_directCallbackRequests;
+	typedef std::list<IpAndTicks> IpAndTicksList;
+	IpAndTicksList m_firewallCheckRequests;
+
+	typedef CClientRefList DirectCallbackList;
+	DirectCallbackList m_currentDirectCallbacks;
+	struct CallbackAddressAndTicks
+	{
+		CNetworkAddress address;
+		uint64 inserted;
+	};
+	std::list<CallbackAddressAndTicks> m_directCallbackRequests;
 };
 
 #endif

amule-3.1.0.tar.gz/src/ClientListColumns.h Added

@@ -0,0 +1,53 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 CLIENTLISTCOLUMNS_H
+#define CLIENTLISTCOLUMNS_H
+
+// The column ids every CGenericClientListCtrl subclass builds its column table from. They used to
+// live in GenericClientListCtrl.h, which cannot be included without wx; splitting them out lets the
+// pure decisions keyed on a column id -- currently PartBarLegend.h's column-to-legend mapping -- be
+// compiled and tested without a GUI toolkit or a display.
+
+enum GenericColumnEnum
+{
+	ColumnUserName = 0,
+	ColumnUserDownloaded,
+	ColumnUserUploaded,
+	ColumnUserSpeedDown,
+	ColumnUserSpeedUp,
+	ColumnUserProgress,
+	ColumnUserAvailable,
+	ColumnUserVersion,
+	ColumnUserQueueRankLocal,
+	ColumnUserQueueRankRemote,
+	ColumnUserOrigin,
+	ColumnUserFileNameDownload,
+	ColumnUserFileNameUpload,
+	ColumnUserFileNameDownloadRemote,
+	ColumnUserSharedFiles,
+	ColumnInvalid
+};
+
+#endif // CLIENTLISTCOLUMNS_H

amule-3.1.0.tar.gz/src/ClientNameCell.cpp Added

amule-3.1.0.tar.gz/src/ClientNameCell.h Added

@@ -0,0 +1,106 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 CLIENTNAMECELL_H
+#define CLIENTNAMECELL_H
+
+#include <wx/gdicmn.h> // Needed for wxRect
+#include <wx/string.h>
+
+#include "Types.h"
+
+class CUpDownClient;
+class wxDC;
+
+/**
+ * Everything the User Name cell draws, as values.
+ *
+ * A snapshot rather than a client pointer because the two lists drawing this cell reach their peers
+ * differently: the per-file lists hold an owning CClientRef and could be asked at paint time, while
+ * the global clients list copies each peer's values once per sweep precisely so nothing it paints
+ * can be freed underneath it. A value type is the only input both can produce, and it keeps the
+ * drawing free of any lifetime question.
+ */
+struct ClientNameCell
+{
+	wxString name;
+	//! Two-letter code, or empty to draw no flag. Already through GetDisplayCountryCode(), so
+	//! empty means "draw nothing" whether the feature is off or the country is unknown.
+	wxString countryCode;
+	uint8 downloadState = 0; //!< DS_*
+	uint8 clientSoft = 0;    //!< SO_*
+	uint8 obfuscation = 0;   //!< OBST_*
+	//! An A4AF source is drawn grey whatever its download state says.
+	bool a4af = false;
+	/**
+	 * Draw the download-state badge. False for a row describing a peer we are not talking to --
+	 * the history list -- where there is no live state and a badge could only invent one.
+	 */
+	bool showState = true;
+	//! False when the software is simply not recorded, so it draws as unknown
+	//! rather than as whatever SO_* value zero happens to mean (eMule).
+	bool knownSoftware = true;
+	bool remoteQueueFull = false;
+	bool isFriend = false;
+	bool identified = false;
+	bool badGuy = false;
+	bool extProtocol = true;
+	//! Score ratio above 1, i.e. we owe this peer.
+	bool highCredits = false;
+
+	/**
+	 * Whole-struct comparison, so a caller deciding "has this cell changed" cannot test a
+	 * subset by accident.
+	 *
+	 * The badges move independently of the name: secure identification completes after the
+	 * hello, the credit ratio crosses 1 mid-session, obfuscation and bad-guy state can change.
+	 * A test written against name and address alone freezes all of them.
+	 */
+	bool operator==(const ClientNameCell &other) const
+	{
+		return name == other.name && countryCode == other.countryCode &&
+		       downloadState == other.downloadState && clientSoft == other.clientSoft &&
+		       obfuscation == other.obfuscation && a4af == other.a4af &&
+		       showState == other.showState && knownSoftware == other.knownSoftware &&
+		       remoteQueueFull == other.remoteQueueFull && isFriend == other.isFriend &&
+		       identified == other.identified && badGuy == other.badGuy &&
+		       extProtocol == other.extProtocol && highCredits == other.highCredits;
+	}
+	bool operator!=(const ClientNameCell &other) const { return !(*this == other); }
+};
+
+//! Snapshot a live peer. Safe to call only while `client` is known alive.
+ClientNameCell MakeClientNameCell(const CUpDownClient *client, bool a4af = false);
+
+/**
+ * Draw the badge cluster, the optional country flag and the name.
+ *
+ * Several badges deliberately stack at the same x: the download-state smiley advances, then
+ * software/credentials/encryption all overprint one slot, which is what the pre-wxDataView
+ * DrawClientItem() did and what the column widths are still sized for.
+ */
+void DrawClientNameCell(const ClientNameCell &cell, const wxRect &rect, wxDC *dc);
+
+#endif // CLIENTNAMECELL_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/ClientRef.cpp -> amule-3.1.0.tar.gz/src/ClientRef.cpp Changed

@@ -24,12 +24,12 @@
 //
 
 #include "ClientRef.h"
-#include "amule.h"				// Needed for theApp
+#include "amule.h" // Needed for theApp
 
 #ifdef CLIENT_GUI
-#include "UpDownClientEC.h"	// Needed for CUpDownClient
+#include "UpDownClientEC.h" // Needed for CUpDownClient
 #else
-#include "updownclient.h"	// Needed for CUpDownClient
+#include "updownclient.h" // Needed for CUpDownClient
 #endif
 
 #ifdef DEBUG_ZOMBIE_CLIENTS
@@ -40,8 +40,7 @@
 #define ASSIGN_MFROM(a)
 #endif
 
-
-CClientRef::CClientRef(const CClientRef& ref)
+CClientRef::CClientRef(const CClientRef &ref)
 {
 	m_client = ref.m_client;
 	ASSIGN_MFROM("copy ctor of " + ref.m_from);
@@ -50,8 +49,7 @@
 	}
 }
 
-
-CClientRef::CClientRef(CUpDownClient * client LINKED_FROM)
+CClientRef::CClientRef(CUpDownClient *client LINKED_FROM)
 {
 	m_client = client;
 	ASSIGN_MFROM(from);
@@ -60,8 +58,7 @@
 	}
 }
 
-
-void CClientRef::Link(CUpDownClient * client LINKED_FROM)
+void CClientRef::Link(CUpDownClient *client LINKED_FROM)
 {
 	Unlink();
 	m_client = client;
@@ -71,7 +68,6 @@
 	}
 }
 
-
 void CClientRef::Unlink()
 {
 	if (m_client) {
@@ -80,11 +76,10 @@
 	}
 }
 
-
 // in amulegui clients are never deleted except when they are marked as removed through EC
 #ifndef CLIENT_GUI
 
-CUpDownClient * CClientRef::GetClientChecked()
+CUpDownClient *CClientRef::GetClientChecked()
 {
 	if (m_client && m_client->HasBeenDeleted()) {
 		m_client->Unlink(MFROM);
@@ -93,8 +88,7 @@
 	return m_client;
 }
 
-
-CClientRef&	CClientRef::GetRef()
+CClientRef &CClientRef::GetRef()
 {
 	if (m_client && m_client->HasBeenDeleted()) {
 		m_client->Unlink(MFROM);
@@ -103,10 +97,9 @@
 	return *this;
 }
 
-
 void CClientRef::Safe_Delete()
 {
-	CUpDownClient * client = m_client;
+	CUpDownClient *client = m_client;
 	if (client) {
 		Unlink();
 		client->Safe_Delete();
@@ -114,77 +107,71 @@
 }
 #endif
 
+#define WRAPC(func) \
+	CClientRef::func() const \
+	{ \
+		return m_client->func(); \
+	}
 
-#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); }
+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)
+double WRAPC(GetCreditRatio)
+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); }
+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
+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 CClientRef::GetSecureIdentTextStatus() const
 {
 	wxString ret;
 	if (theApp->CryptoAvailable()) {
@@ -198,6 +185,12 @@
 			ret = _("Bad Guy");
 		} else if (m_client->IsIdentified()) {
 			ret = _("Verified - OK");
+		} else {
+			// Unreachable while the five predicates cover every EIdentState, but the
+			// only caller assigns this straight into the Client Details label, so an
+			// unmatched state would blank the field instead of leaving its _("N/A")
+			// placeholder. Keep the chain total, and reuse that same placeholder text.
+			ret = _("N/A");
 		}
 	} else {
 		ret = _("Not Available");
@@ -205,3 +198,10 @@
 	return ret;
 }
 
+// Not a WRAPC: the client exposes the capability word, and the display string is CPeerCapabilities'
+// own business. This forwards through the one accessor both CUpDownClient and its EC mirror
+// publish, so it compiles for all three apps without a CLIENT_GUI branch.
+wxString CClientRef::GetModCapabilitiesText() const
+{
+	return m_client->GetModCapabilities().GetDisplayText();
+}

amule-3.0.1.tar.gz/src/ClientRef.h -> amule-3.1.0.tar.gz/src/ClientRef.h Changed

@@ -26,13 +26,9 @@
 #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.
-//
+// Clients are stored in many places. To stop a pointer to a deleted client being referenced
+// later, clients are now stored only in this class, which reference-counts and deletes the client
+// after the last reference is unlinked. It also serves as an abstraction layer for CUpDownClient.
 
 #include <list>
 #include <set>
@@ -59,21 +55,28 @@
 #define CCLIENTREF(a, b) CClientRef(a)
 #endif
 
-class CClientRef {
+class CClientRef
+{
 
-	CUpDownClient * m_client;
+	CUpDownClient *m_client;
 #ifdef DEBUG_ZOMBIE_CLIENTS
-	wxString	m_from;
+	wxString m_from;
 #endif
 
 public:
-	CClientRef()	{ m_client = NULL; }
-	CClientRef(const CClientRef&);
-	CClientRef(CUpDownClient * client LINKED_FROM);
+	CClientRef() { m_client = NULL; }
+	CClientRef(const CClientRef &);
+	CClientRef(CUpDownClient *client LINKED_FROM);
 	CClientRef(const class CEC_UpDownClient_Tag *);
-	~CClientRef()	{ Unlink(); }
-	CClientRef& operator = (const CClientRef& ref)
+	~CClientRef() { Unlink(); }
+	CClientRef &operator=(const CClientRef &ref)
 	{
+		// Self-assignment would be a use-after-free: Link() Unlinks the current client
+		// first, and if this holds the last reference that deletes it, leaving ref.m_client
+		// dangling before it is re-Linked.
+		if (this == &ref) {
+			return *this;
+		}
 #ifdef DEBUG_ZOMBIE_CLIENTS
 		m_from = "assigned from " + ref.m_from;
 		Link(ref.m_client, m_from);
@@ -83,15 +86,14 @@
 		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; }
 
-// 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)
+	void swap(CClientRef &other)
 	{
-		CUpDownClient * c =	m_client;
+		CUpDownClient *c = m_client;
 		m_client = other.m_client;
 		other.m_client = c;
 #ifdef DEBUG_ZOMBIE_CLIENTS
@@ -99,95 +101,96 @@
 #endif
 	}
 
-	void Link(CUpDownClient * client LINKED_FROM);
+	void Link(CUpDownClient *client LINKED_FROM);
 	void Unlink();
-	bool IsLinked() const		{ return m_client != NULL; }
+	bool IsLinked() const { return m_client != NULL; }
 
 	// Return client, no matter if it was deleted
-	CUpDownClient * GetClient() const	{ return m_client; }
+	CUpDownClient *GetClient() const { return m_client; }
 	// Check if client was deleted, if yes unlink and return zero
-	CUpDownClient * GetClientChecked();
+	CUpDownClient *GetClientChecked();
 	// Check if client was deleted, if yes unlink
-	CClientRef&		GetRef();
+	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
-
+	// 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;
+	double GetCreditRatio() 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;
+	wxString GetModCapabilitiesText() 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);
-	}
+template <> inline void swap(CClientRef &a, CClientRef &b)
+{
+	a.swap(b);
 }
-
+} // namespace std
 
 typedef std::list<CClientRef> CClientRefList;
-typedef std::set<CClientRef>  CClientRefSet;
-
+typedef std::set<CClientRef> CClientRefSet;
 
 #endif
-

amule-3.1.0.tar.gz/src/ClientRowListCtrl.cpp Added

@@ -0,0 +1,235 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "ClientRowListCtrl.h" // Interface declarations
+
+#include <wx/menu.h>
+#include <wx/msgdlg.h>
+
+#include <common/Format.h> // Needed for CFormat
+#include <common/MenuIDs.h>
+
+#include "ClientContextActions.h" // Needed for BuildClientContextMenu, ClientAction*
+#include "Logger.h"               // Needed for AddLogLineC
+#include "MuleBarRenderer.h"      // Needed for CBarFillSpec
+
+wxBEGIN_EVENT_TABLE(CClientRowListCtrl, CMuleVirtualDataViewCtrl)
+	EVT_DATAVIEW_ITEM_ACTIVATED(wxID_ANY, CClientRowListCtrl::OnItemActivated)
+	EVT_DATAVIEW_ITEM_CONTEXT_MENU(wxID_ANY, CClientRowListCtrl::OnItemRightClicked)
+
+	EVT_MENU(MP_SHOWLIST, CClientRowListCtrl::OnViewFiles)
+	EVT_MENU(MP_ADDFRIEND, CClientRowListCtrl::OnAddFriend)
+	EVT_MENU(MP_FRIENDSLOT, CClientRowListCtrl::OnSetFriendslot)
+	EVT_MENU(MP_SENDMESSAGE, CClientRowListCtrl::OnSendMessage)
+	EVT_MENU(MP_DETAIL, CClientRowListCtrl::OnViewClientInfo)
+wxEND_EVENT_TABLE()
+
+CClientRowListCtrl::CClientRowListCtrl(wxWindow *parent, int id, const wxPoint &pos, wxSize size, int flags)
+: CMuleVirtualDataViewCtrl(parent, id, pos, size, flags)
+{
+}
+
+void CClientRowListCtrl::GetItemBarFill(wxUIntPtr data, unsigned column, CBarFillSpec &out) const
+{
+	if (column != NameColumn()) {
+		return;
+	}
+	const ClientNameCell *cell = NameCellFor(data);
+	if (cell == nullptr) {
+		return;
+	}
+	// The renderer needs the snapshot, not spans. Safe to hand out its address: the rows are
+	// only ever replaced wholesale, on the main thread, between paints.
+	out = CBarFillSpec(reinterpret_cast<wxUIntPtr>(cell), 0, {});
+}
+
+bool CClientRowListCtrl::MenuPeer(PeerIdentity &out) const
+{
+	return m_menuItemValid && PeerForItem(m_menuItem, out);
+}
+
+std::vector<PeerIdentity> CClientRowListCtrl::SelectedPeers() const
+{
+	std::vector<PeerIdentity> peers;
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		PeerIdentity peer;
+		if (PeerForItem(data, peer)) {
+			peers.push_back(std::move(peer));
+		}
+	}
+	return peers;
+}
+
+void CClientRowListCtrl::OnItemActivated(wxDataViewEvent &event)
+{
+	if (!event.GetItem().IsOk()) {
+		return;
+	}
+	ShowDetailsForSelection();
+}
+
+// Opening details is a read-only act: it never creates a client and never opens a connection. A
+// peer we are talking to is snapshotted live, since that knows strictly more; otherwise the row's
+// own record is rendered.
+void CClientRowListCtrl::ShowDetailsForSelection()
+{
+	// Counted first: resolving the selection to discover it holds more than one row costs a
+	// ClientDetailInfo and a client lookup per row, and the answer is then thrown away.
+	if (GetSelectedItemsCount() != 1) {
+		return;
+	}
+	const std::vector<PeerIdentity> peers = SelectedPeers();
+	if (peers.size() == 1) {
+		ShowDetailsFor(peers.front());
+	}
+}
+
+void CClientRowListCtrl::ShowDetailsFor(const PeerIdentity &peer)
+{
+	if (peer.client.IsLinked()) {
+		ClientActionShowDetails(this, { peer.client });
+	} else if (peer.hasDetail) {
+		CClientDetailDialog(this, peer.detail).ShowModal();
+	}
+}
+
+void CClientRowListCtrl::OnItemRightClicked(wxDataViewEvent &event)
+{
+	if (event.GetItem().IsOk()) {
+		wxDataViewItemArray selection;
+		GetSelections(selection);
+		if (selection.Index(event.GetItem()) == wxNOT_FOUND) {
+			UnselectAll();
+			Select(event.GetItem());
+		}
+	}
+
+	// A peer we are not connected to still gets a menu: friending and the friend slot are
+	// persistent and need no connection, while browsing and messaging open one when the user
+	// picks them. Only the row under the cursor is resolved -- the menu describes that one, and
+	// building the whole selection to read its first entry would resolve every other row for
+	// nothing.
+	if (!event.GetItem().IsOk()) {
+		return;
+	}
+	m_menuItem = ItemAt(GetModelRow(event.GetItem()));
+	PeerIdentity peer;
+	m_menuItemValid = PeerForItem(m_menuItem, peer);
+	if (!m_menuItemValid) {
+		return;
+	}
+
+	// The builder omits "Swap to this file": it acts on an A4AF source of one particular
+	// download, a per-file notion neither of these lists has.
+	wxMenu *menu = BuildPeerContextMenu(peer);
+	PopupMenu(menu, event.GetPosition());
+	delete menu;
+}
+
+// Both lists are multi-select and the connected-client paths act on the whole selection, so these
+// do too. But the history list is the entire credit store rather than the handful of peers we
+// happen to be talking to, and the menu is built for one row while the action runs on all of them,
+// so a large selection says so first.
+void CClientRowListCtrl::OnViewFiles(wxCommandEvent &WXUNUSED(event))
+{
+	// Counted from the control, not from resolving the rows: resolving is the
+	// cost the prompt exists to guard against, so it cannot come first.
+	const size_t count = GetSelectedItemsCount();
+	if (count == 0) {
+		return;
+	}
+	// Each one opens its own connection and its own browse tab.
+	if (!ConfirmBrowseAction(this, count)) {
+		return;
+	}
+	const std::vector<PeerIdentity> peers = SelectedPeers();
+	size_t skipped = 0;
+	for (const PeerIdentity &peer : peers) {
+		if (!PeerActionViewFiles(peer)) {
+			++skipped;
+		}
+	}
+	if (skipped > 0) {
+		// A mixed selection can contain peers this build cannot address.
+		// Saying so beats a browse that quietly covers only some of them.
+		AddLogLineC(CFormat(wxPLURAL("Could not ask %u selected client for its shared files.",
+				    "Could not ask %u selected clients for their shared files.",
+				    skipped)) %
+			    skipped);
+	}
+}
+
+void CClientRowListCtrl::OnAddFriend(wxCommandEvent &WXUNUSED(event))
+{
+	const size_t count = GetSelectedItemsCount();
+	if (count == 0) {
+		return;
+	}
+	// The direction comes from the entry the user picked, so what happens matches what it said.
+	// Toggling each row would remove the friends inside a selection whose menu read "Add to
+	// Friends", and below the prompt threshold that would happen without a word.
+	PeerIdentity menuPeer;
+	if (!MenuPeer(menuPeer)) {
+		return;
+	}
+	const bool addThem = !PeerIsFriend(menuPeer);
+	if (!ConfirmFriendAction(this, count, addThem)) {
+		return;
+	}
+	ReportFriendSkips(PeerActionSetFriends(SelectedPeers(), addThem));
+}
+
+void CClientRowListCtrl::OnSetFriendslot(wxCommandEvent &evt)
+{
+	// The row the menu was built for, not whatever the selection happens to be: the checkbox
+	// describes one peer, so the slot has to land on that one. The count comes from the control
+	// rather than from resolving every selected row, which is all the warning needs.
+	PeerIdentity peer;
+	if (!MenuPeer(peer)) {
+		return;
+	}
+	PeerActionSetFriendSlot(this, peer, evt.IsChecked(), GetSelectedItemsCount());
+}
+
+void CClientRowListCtrl::OnSendMessage(wxCommandEvent &WXUNUSED(event))
+{
+	// Single row only, as the connected-client path has always been, and the
+	// row the menu named rather than a re-resolved selection.
+	PeerIdentity peer;
+	if (!MenuPeer(peer)) {
+		return;
+	}
+	PeerActionSendMessage(peer);
+}
+
+void CClientRowListCtrl::OnViewClientInfo(wxCommandEvent &WXUNUSED(event))
+{
+	// The row the menu described, not the selection: a menu entry that is
+	// offered has to do something when it is picked.
+	PeerIdentity peer;
+	if (MenuPeer(peer)) {
+		ShowDetailsFor(peer);
+	}
+}
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/ClientRowListCtrl.h Added

@@ -0,0 +1,122 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 CLIENTROWLISTCTRL_H
+#define CLIENTROWLISTCTRL_H
+
+#include <vector>
+
+#include "ClientNameCell.h" // Needed for ClientNameCell
+#include "PeerIdentity.h"   // Needed for PeerIdentity
+#include "MuleVirtualDataViewCtrl.h"
+
+/**
+ * A list whose rows describe peers, with the behaviour that implies.
+ *
+ * The Clients page shows two such lists -- who we are talking to now, and everyone we have ever
+ * talked to -- and they want the same things: the Name cell drawn with its badge icons, the details
+ * dialog on double-click or Enter, and the peer context menu on right-click. What differs is only
+ * how a row names its peer: the active list keeps an ECID, the history keeps a user hash, because
+ * an ECID means nothing once the daemon that issued it has restarted.
+ *
+ * So that difference is all a subclass supplies. Everything built on top of it lives here once,
+ * which is also why the actions are reached through ClientContextActions rather than reimplemented:
+ * the per-file client lists in Downloads and Shared files run the same code from
+ * CGenericClientListCtrl.
+ *
+ * Rows hold values, never clients. A CClientRef would be owning, so a list holding one would keep
+ * every peer it ever showed alive; the peer is resolved only when something is actually done to it,
+ * and a row whose peer has since gone still names it well enough to act on from the record alone.
+ */
+class CClientRowListCtrl : public CMuleVirtualDataViewCtrl
+{
+public:
+	CClientRowListCtrl(wxWindow *parent, int id, const wxPoint &pos, wxSize size, int flags);
+
+protected:
+	//! The Name cell for a row, or nullptr if the row has none.
+	virtual const ClientNameCell *NameCellFor(wxUIntPtr item) const = 0;
+
+	//! Which model column the Name occupies, so the bar fill goes to the right one.
+	virtual unsigned NameColumn() const = 0;
+
+	/**
+	 * The peer behind one row, or false when the row names none usable.
+	 *
+	 * Identity comes from the row, so a peer we are not talking to is still named here --
+	 * `client` is simply unlinked for it. The two lists key on different things (ECID within a
+	 * process, user hash across restarts), which is why resolving one row stays per-list while
+	 * everything built on top of it is shared.
+	 *
+	 * Per row rather than per selection so the context menu, which describes a single row, can
+	 * resolve just that one. Resolving the whole selection to read its first entry costs a full
+	 * ClientDetailInfo and a client lookup for every other selected row, which is the entire
+	 * credit store after a select-all.
+	 */
+	virtual bool PeerForItem(wxUIntPtr data, PeerIdentity &out) const = 0;
+
+	/**
+	 * The peer the context menu was built for, resolved afresh. False when no menu has been
+	 * opened or the row has since gone.
+	 */
+	bool MenuPeer(PeerIdentity &out) const;
+
+	//! The peers behind the current selection, in display order.
+	std::vector<PeerIdentity> SelectedPeers() const;
+
+	void GetItemBarFill(wxUIntPtr data, unsigned column, CBarFillSpec &out) const override;
+
+	wxDECLARE_EVENT_TABLE();
+
+private:
+	void OnItemActivated(wxDataViewEvent &event);
+	void ShowDetailsForSelection();
+	//! Renders the details dialog for one peer, live client or stored record.
+	void ShowDetailsFor(const PeerIdentity &peer);
+	/**
+	 * The row the context menu was last built for, as item data.
+	 *
+	 * Single-row entries resolve this rather than re-reading the selection, so the entry and
+	 * the action can never describe different peers. Bulk entries still use the whole
+	 * selection, which is what they are for.
+	 *
+	 * Deliberately the row and not a resolved PeerIdentity: that holds an owning CClientRef,
+	 * and a member would keep a disconnected peer's CUpDownClient alive for the lifetime of the
+	 * control, which is exactly what this class holds values rather than clients to avoid.
+	 * Resolving again also cannot go stale: a row that has since gone simply fails to resolve
+	 * and the entry does nothing.
+	 */
+	wxUIntPtr m_menuItem = 0;
+	bool m_menuItemValid = false;
+
+	void OnItemRightClicked(wxDataViewEvent &event);
+	void OnViewFiles(wxCommandEvent &event);
+	void OnAddFriend(wxCommandEvent &event);
+	void OnSetFriendslot(wxCommandEvent &event);
+	void OnSendMessage(wxCommandEvent &event);
+	void OnViewClientInfo(wxCommandEvent &event);
+};
+
+#endif // CLIENTROWLISTCTRL_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/ClientTCPSocket.cpp -> amule-3.1.0.tar.gz/src/ClientTCPSocket.cpp Changed

@@ -22,7 +22,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "ClientTCPSocket.h"	// Interface declarations
+#include "ClientTCPSocket.h"
+
+#include <algorithm>
+
+#ifdef AMULE_UTP_TRANSPORT
+#include "UtpSocketTransport.h" // per-stream crypt parameters
+#endif                          // Interface declarations.
+
+#include "BrowseManager.h"
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
@@ -31,38 +39,38 @@
 #include <protocol/kad2/Client2Client/TCP.h>
 #include <common/EventIDs.h>
 
-#include "Preferences.h"	// Needed for thePrefs
-#include "Packet.h"		// Needed for CPacket
-#include "Statistics.h"		// Needed for theStats
-#include "Logger.h"		// Needed for logRemoteClient
-#include "updownclient.h"	// Needed for CUpDownClient
-#include <common/Format.h>	// Needed for CFormat
-#include "amule.h"		// Needed for theApp
-#include "SharedFileList.h"	// Needed for CSharedFileList
-#include "ClientList.h"		// Needed for CClientList
-#include "UploadQueue.h"	// Needed for CUploadQueue
-#include "ClientUDPSocket.h"	// Needed for CClientUDPSocket
-#include "PartFile.h"		// Needed for CPartFile
-#include "MemFile.h"		// Needed for CMemFile
+#include "Preferences.h"                // Needed for thePrefs
+#include "Packet.h"                     // Needed for CPacket
+#include "Statistics.h"                 // Needed for theStats
+#include "Logger.h"                     // Needed for logRemoteClient
+#include "updownclient.h"               // Needed for CUpDownClient
+#include <common/Format.h>              // Needed for CFormat
+#include "amule.h"                      // Needed for theApp
+#include "SharedFileList.h"             // Needed for CSharedFileList
+#include "ClientList.h"                 // Needed for CClientList
+#include "PeerAddressing.h"             // Needed for address admission policies
+#include "UploadQueue.h"                // Needed for CUploadQueue
+#include "ClientUDPSocket.h"            // Needed for CClientUDPSocket
+#include "PartFile.h"                   // Needed for CPartFile
+#include "MemFile.h"                    // Needed for CMemFile
 #include "kademlia/kademlia/Kademlia.h" // Needed for CKademlia::Kademlia
-#include "kademlia/kademlia/Prefs.h"	// Needed for CKademlia::CPrefs
-#include "DownloadQueue.h"	// Needed for CDownloadQueue
-#include "Server.h"		// Needed for CServer
-#include "ServerList.h"		// Needed for CServerList
-#include "ServerConnect.h"	// Needed for CServerConnect::IsServerIP (#778)
-#include "IPFilter.h"		// Needed for CIPFilter
-#include "ListenSocket.h"	// Needed for CListenSocket
-#include "GuiEvents.h"		// Needed for Notify_*
-
+#include "kademlia/kademlia/Prefs.h"    // Needed for CKademlia::CPrefs
+#include "DownloadQueue.h"              // Needed for CDownloadQueue
+#include "Server.h"                     // Needed for CServer
+#include "ServerList.h"                 // Needed for CServerList
+#include "ServerConnect.h"              // Needed for CServerConnect::IsServerIP (#778)
+#include "IPFilter.h"                   // Needed for CIPFilter
+#include "ListenSocket.h"               // Needed for CListenSocket
+#include "GuiEvents.h"                  // Needed for Notify_*
 
-//#define __PACKET_RECV_DUMP__
+// #define __PACKET_RECV_DUMP__
 
 //------------------------------------------------------------------------------
 // CClientTCPSocket
 //------------------------------------------------------------------------------
 
-CClientTCPSocket::CClientTCPSocket(CUpDownClient* in_client, const CProxyData *ProxyData)
-	: CEMSocket(ProxyData)
+CClientTCPSocket::CClientTCPSocket(CUpDownClient *in_client, const CProxyData *ProxyData)
+: CEMSocket(ProxyData)
 {
 	SetClient(in_client);
 	if (in_client) {
@@ -70,6 +78,7 @@
 	} else {
 		m_remoteip = 0;
 	}
+	m_remoteAddress = CNetworkAddress::FromIPv4NetworkOrderOrAbsent(m_remoteip);
 
 	ResetTimeOutTimer();
 
@@ -82,7 +91,7 @@
 CClientTCPSocket::~CClientTCPSocket()
 {
 	if (m_client) {
-		m_client->SetSocket( NULL );
+		m_client->SetSocket(NULL);
 	}
 	m_client = NULL;
 
@@ -91,19 +100,63 @@
 	}
 }
 
-bool CClientTCPSocket::InitNetworkData()
+#ifdef AMULE_UTP_TRANSPORT
+void CClientTCPSocket::ApplyUtpCryptParameters()
+{
+	if (!HasTransport() || m_client == nullptr) {
+		return;
+	}
+	// The same pair every other UDP send site passes together: whether this
+	// peer wants obfuscated datagrams, and the hash they are keyed on. Copied
+	// by the transport, because the client can be replaced while the stream
+	// outlives it.
+	static_cast<CUtpSocketTransport *>(GetTransport())
+		->SetCryptParameters(m_client->ShouldReceiveCryptUDPPackets(),
+			m_client->HasValidHash() ? m_client->GetUserHash().GetHash() : nullptr);
+}
+
+bool CClientTCPSocket::IsUtpInbound() const
+{
+	return HasTransport() && GetTransport()->IsInbound();
+}
+#endif
+
+bool CClientTCPSocket::InitNetworkData(AdmissionTransport transport)
 {
 	wxASSERT(!m_remoteip);
 	wxASSERT(!m_client);
-	m_remoteip = GetPeerInt();
-
-	MULE_CHECK(m_remoteip, false);
+	m_remoteAddress = GetPeerAddress().Unmapped();
+	m_remoteip = m_remoteAddress.ToIPv4NetworkOrderOrZero();
+
+	// An accept that produced no address at all is a socket-layer bug, not a peer we
+	// are declining: it was a wxCHECK before native IPv6 made a non-IPv4 address
+	// ordinary. Keep it loud in a debug build, and out of the refusals below, which
+	// would otherwise report it as the wrong thing entirely.
+	MULE_CHECK(m_remoteAddress.IsPresent(), false);
+
+	if (transport == AdmissionTransport::UTP && !PeerAddressing::CanAdmitUtpPeer(m_remoteAddress)) {
+		AddDebugLogLineN(logClient,
+			"Denied uTP connection from " + GetPeer() + " (uTP requires an IPv4 address)");
+		return false;
+	}
+#ifndef ENABLE_IPV6
+	if (transport == AdmissionTransport::TCP && m_remoteAddress.IsIPv6()) {
+		AddDebugLogLineN(
+			logClient, "Denied connection from " + GetPeer() + " (IPv6 admission is disabled)");
+		return false;
+	}
+#endif
+	if (!PeerAddressing::CanAdmitTcpPeer(m_remoteAddress)) {
+		AddDebugLogLineN(logClient,
+			"Denied connection from " + GetPeer() + " (address unavailable or unspecified)");
+		return false;
+	}
 
-	if (theApp->ipfilter->IsFiltered(m_remoteip)) {
-		AddDebugLogLineN(logClient, "Denied connection from " + GetPeer() + "(Filtered IP)");
+	if (theApp->ipfilter->IsFiltered(m_remoteAddress)) {
+		AddDebugLogLineN(logClient, "Denied connection from " + GetPeer() + " (Filtered IP)");
 		return false;
-	} else if (theApp->clientlist->IsBannedClient(m_remoteip)) {
-		AddDebugLogLineN(logClient, "Denied connection from " + GetPeer() + "(Banned IP)");
+	} else if (theApp->clientlist->IsBannedClient(m_remoteAddress)) {
+		AddDebugLogLineN(logClient, "Denied connection from " + GetPeer() + " (Banned IP)");
 		return false;
 	} else {
 		AddDebugLogLineN(logClient, "Accepted connection from " + GetPeer());
@@ -111,19 +164,14 @@
 	}
 }
 
-
 bool CClientTCPSocket::IsDownloadThrottled() const
 {
-	// Inbound peer connection whose source IP is the ed2k server we're
-	// currently connected (or trying to connect) to -- this is the
-	// server's HighID-callback probe, not real peer download traffic.
-	// Skip the global download throttler so a saturated peer-side
-	// budget doesn't delay the probe's read path past the server's
-	// verification timer (#778). Same shape as CServerSocket's
-	// permanent bypass (#393 / 356a59c96), just gated on IP-match
-	// instead of being unconditional.
-	if (m_remoteip != 0 && theApp->serverconnect
-		&& theApp->serverconnect->IsServerIP(m_remoteip)) {
+	// An inbound peer connection from the ed2k server we are connected (or connecting) to is
+	// the server's HighID-callback probe, not peer download traffic. Skip the global download
+	// throttler so a saturated peer-side budget cannot delay the probe past the server's
+	// verification timer (#778). Same shape as CServerSocket's permanent bypass, gated on IP-
+	// match instead of being unconditional.
+	if (m_remoteip != 0 && theApp->serverconnect && theApp->serverconnect->IsServerIP(m_remoteip)) {
 		return false;
 	}
 	return true;
@@ -134,21 +182,24 @@
 	timeout_timer = ::GetTickCount64();
 }
 
-
 bool CClientTCPSocket::CheckTimeOut()
 {
-	// 0.42x
 	uint64 uTimeout = GetTimeOut();
+#ifdef AMULE_UTP_TRANSPORT
+	if (HasTransport() && !GetTransport()->IsConnected()) {
+		// Give uTP a shorter handshake window than the normal TCP timeout, then use
+		// the same socket wrapper for the one-shot TCP fallback.
+		uTimeout = std::min<uint64>(uTimeout, CONNECTION_TIMEOUT / 2);
+	}
+#endif
 	if (m_client) {
 
 		if (m_client->GetKadState() == KS_CONNECTED_BUDDY) {
-			//We originally ignored the timeout here for buddies.
-			//This was a stupid idea on my part. There is now a ping/pong system
-			//for buddies. This ping/pong system now prevents timeouts.
-			//This release will allow lowID clients with KadVersion 0 to remain connected.
-			//But a soon future version needs to allow these older clients to time out to prevent dead connections from continuing.
-			//JOHNTODO: Don't forget to remove backward support in a future release.
-			if ( m_client->GetKadVersion() == 0 ) {
+			// The timeout used to be ignored for buddies; the ping/pong system now
+			// prevents those timeouts instead. lowID clients with KadVersion 0 are
+			// still allowed to stay connected, but a future version needs to let them
+			// time out so dead connections do not persist.
+			if (m_client->GetKadVersion() == 0) {
 				return false;
 			}
 
@@ -161,8 +212,13 @@
 	}
 
 	uint64 now = ::GetTickCount64();
-	if (now - timeout_timer > uTimeout){
+	if (now - timeout_timer > uTimeout) {
 		timeout_timer = now;
+#ifdef AMULE_UTP_TRANSPORT
+		if (TryUtpTcpFallback()) {
+			return true;
+		}
+#endif
 		Disconnect("Timeout");
 		return true;
 	}
@@ -170,21 +226,67 @@
 	return false;
 }
 
-
-void CClientTCPSocket::SetClient(CUpDownClient* pClient)
+void CClientTCPSocket::SetClient(CUpDownClient *pClient)
 {
 	m_client = pClient;
 	if (m_client) {
-		m_client->SetSocket( this );
+		m_client->SetSocket(this);
 	}
 }
 
+#ifdef AMULE_UTP_TRANSPORT
+bool CClientTCPSocket::TryUtpTcpFallback()
+{
+	if (m_client == nullptr || !HasTransport()) {
+		return false;
+	}
+	if (m_client->GetDownloadState() != DS_CONNECTING && m_client->GetUploadState() != US_CONNECTING) {
+		return false;
+	}
+	// Connect() is otherwise reached only through TryToContact(), which filters,
+	// re-checks bans, refuses an address it cannot dial, drops an obfuscation
+	// mismatch and sends a LowID peer down its callback path instead. An inbound
+	// stream reaches this too, so none of those checks is hypothetical.
+	if (m_client->HasLowID() || !m_client->IsRedialAllowed()) {
+		return false;
+	}
+	// A stream handshake that already started cannot be re-keyed: Connect() would
+	// reach SetConnectionEncryption()'s wxFAIL and leave the keystreams at their
+	// mid-stream position, so the peer would decode the new connection's first
+	// bytes from position zero. Only an inbound peer that runs the ed2k handshake
+	// inside frames we already obfuscate gets here, and TCP is the right answer
+	// for it -- just not on this socket.
+	if (StreamCryptInProgress()) {
+		return false;
+	}
+	if (m_utpFallbackAttempted) {
+		return false;
+	}
+	m_utpFallbackAttempted = true;
+	// Before the transport goes: this waits out a send running on the throttler
+	// thread, which would otherwise be inside the stream we are about to free,
+	// and clears what the dead stream left half-written.
+	QuiesceForRedial();
+	// Destroy only the failed uTP stream; keep the client and socket wrapper so
+	// the normal TCP Connect() path can reuse its identity.
+	DetachTransport().reset();
+	// The uTP window is spent. Give the TCP connect its own, rather than whatever
+	// remained of it -- the OnClose() route arrives here without CheckTimeOut()'s
+	// reset, so it would otherwise inherit an already-elapsed timer.
+	ResetTimeOutTimer();
+	return m_client->Connect();
+}
+#endif
 
 void CClientTCPSocket::OnClose(int nErrorCode)
 {
-	// 0.42x
 	wxASSERT(theApp->listensocket->IsValidSocket(this));
 	CEMSocket::OnClose(nErrorCode);
+#ifdef AMULE_UTP_TRANSPORT
+	if (TryUtpTcpFallback()) {
+		return;
+	}
+#endif
 	if (nErrorCode) {
 		Disconnect(CFormat("Closed: %u") % nErrorCode);
 	} else {
@@ -192,17 +294,15 @@
 	}
 }
 
-
-void CClientTCPSocket::Disconnect(const wxString& strReason)
+void CClientTCPSocket::Disconnect(const wxString &strReason)
 {
 	byConnected = ES_DISCONNECTED;
 	if (m_client) {
 		if (m_client->Disconnected(strReason, true)) {
-			// Somehow, Safe_Delete() is being called by Disconnected(),
-			// or any other function that sets m_client to NULL,
-			// so we must check m_client first.
+			// Safe_Delete() can be reached from Disconnected(), or anything else
+			// that sets m_client to NULL, so check m_client first.
 			if (m_client) {
-				m_client->SetSocket( NULL );
+				m_client->SetSocket(NULL);
 				m_client->Safe_Delete();
 			}
 		}
@@ -212,12 +312,11 @@
 	Safe_Delete();
 }
 
-
 void CClientTCPSocket::Safe_Delete()
 {
 	// More paranoia - make sure client is unlinked in any case
 	if (m_client) {
-		m_client->SetSocket( NULL );
+		m_client->SetSocket(NULL);
 		m_client = NULL;
 	}
 
@@ -226,7 +325,6 @@
 	Destroy();
 }
 
-
 void CClientTCPSocket::Safe_Delete_Client()
 {
 	if (m_client) {
@@ -235,1560 +333,1719 @@
 	}
 }
 
-
-bool CClientTCPSocket::ProcessPacket(const uint8_t* buffer, uint32 size, uint8 opcode)
+bool CClientTCPSocket::ProcessPacket(const uint8_t *buffer, uint32 size, uint8 opcode)
 {
-	#ifdef __PACKET_RECV_DUMP__
-	//printf("Rec: OPCODE %x \n",opcode);
+#ifdef __PACKET_RECV_DUMP__
 	DumpMem(buffer, size);
-	#endif
+#endif
 	if (!m_client && opcode != OP_HELLO) {
 		throw wxString("Asks for something without saying hello");
 	} else if (m_client && opcode != OP_HELLO && opcode != OP_HELLOANSWER) {
 		m_client->CheckHandshakeFinished();
 	}
 
-	switch(opcode) {
-		case OP_HELLOANSWER: {	// 0.43b
-			AddDebugLogLineN(logRemoteClient, "Remote Client: OP_HELLOANSWER from " + m_client->GetFullIP());
-			theStats::AddDownOverheadOther(size);
-			m_client->ProcessHelloAnswer(buffer, size);
-
-			// start secure identification, if
-			//  - we have received OP_EMULEINFO and OP_HELLOANSWER (old eMule)
-			//	- we have received eMule-OP_HELLOANSWER (new eMule)
-			if (m_client->GetInfoPacketsReceived() == IP_BOTH) {
-				m_client->InfoPacketsReceived();
-			}
+	switch (opcode) {
+	case OP_HELLOANSWER: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_HELLOANSWER from " + m_client->GetFullIP());
+		theStats::AddDownOverheadOther(size);
+		m_client->ProcessHelloAnswer(buffer, size);
+#ifdef AMULE_UTP_TRANSPORT
+		// The answer refreshes both the peer's hash and crypt preferences.
+		// Apply them before secure identification queues any reply.
+		ApplyUtpCryptParameters();
+#endif
+
+		// Start secure identification once both info packets have arrived:
+		// OP_EMULEINFO + OP_HELLOANSWER (old eMule), or eMule-OP_HELLOANSWER (new).
+		if (m_client->GetInfoPacketsReceived() == IP_BOTH) {
+			m_client->InfoPacketsReceived();
+		}
+
+		// Socket might die because of sending in InfoPacketsReceived, so check
+		if (m_client) {
+			m_client->ConnectionEstablished();
+		}
 
-			// Socket might die because of sending in InfoPacketsReceived, so check
-			if (m_client) {
-				m_client->ConnectionEstablished();
-			}
+		// Socket might die on ConnectionEstablished somehow. Check it.
+		if (m_client) {
+			Notify_SharedCtrlRefreshClient(m_client->ECID(), AVAILABLE_SOURCE);
+		}
 
-			// Socket might die on ConnectionEstablished somehow. Check it.
-			if (m_client) {
-				Notify_SharedCtrlRefreshClient( m_client->ECID() , AVAILABLE_SOURCE);
-			}
+		break;
+	}
+	case OP_HELLO: { // 0.43b
 
-			break;
+		theStats::AddDownOverheadOther(size);
+		bool bNewClient = !m_client;
+		if (bNewClient) {
+			m_client = new CUpDownClient(this);
 		}
-		case OP_HELLO: {	// 0.43b
-
-			theStats::AddDownOverheadOther(size);
-			bool bNewClient = !m_client;
-			if (bNewClient) {
-				// create new client to save standard information
-				m_client = new CUpDownClient(this);
-			}
 
-			// Do not move up!
-			AddDebugLogLineN(logRemoteClient, "Remote Client: OP_HELLO from " + m_client->GetFullIP() );
+		// Do not move up!
+		AddDebugLogLineN(logRemoteClient, "Remote Client: OP_HELLO from " + m_client->GetFullIP());
 
-			bool bIsMuleHello = false;
+		bool bIsMuleHello = false;
 
-			try{
-				bIsMuleHello = m_client->ProcessHelloPacket(buffer, size);
-			} catch(...) {
-				if (bNewClient && m_client) {
-					// Don't let CUpDownClient::Disconnected be processed for a client which is not in the list of clients.
-					m_client->Safe_Delete();
-					m_client = NULL;
-				}
-				throw;
+		try {
+			bIsMuleHello = m_client->ProcessHelloPacket(buffer, size);
+		} catch (...) {
+			if (bNewClient && m_client) {
+				// Don't let CUpDownClient::Disconnected be processed for a client which is
+				// not in the list of clients.
+				m_client->Safe_Delete();
+				m_client = NULL;
 			}
+			throw;
+		}
 
-			if (thePrefs::ParanoidFilter() && !IsLowID(m_client->GetUserIDHybrid()) && (GetRemoteIP() != wxUINT32_SWAP_ALWAYS(m_client->GetUserIDHybrid()))) {
-				wxString reason = "Client claims a different IP from the one we received the hello packet from: ";
-				reason += Uint32toStringIP(wxUINT32_SWAP_ALWAYS(m_client->GetUserIDHybrid())) + " / " + Uint32toStringIP(GetRemoteIP());
-				AddDebugLogLineN(logClient, reason);
-				if (bNewClient) {
-					m_client->Safe_Delete();
-					m_client = NULL;
-				}
-				Disconnect("Paranoid disconnecting: " + reason);
-				return false;
+		if (thePrefs::ParanoidFilter() && !IsLowID(m_client->GetUserIDHybrid()) &&
+			(GetRemoteIP() != wxUINT32_SWAP_ALWAYS(m_client->GetUserIDHybrid()))) {
+			wxString reason = "Client claims a different IP from the one we received the hello "
+					  "packet from: ";
+			reason += Uint32toStringIP(wxUINT32_SWAP_ALWAYS(m_client->GetUserIDHybrid())) +
+				  " / " + Uint32toStringIP(GetRemoteIP());
+			AddDebugLogLineN(logClient, reason);
+			if (bNewClient) {
+				m_client->Safe_Delete();
+				m_client = NULL;
 			}
+			Disconnect("Paranoid disconnecting: " + reason);
+			return false;
+		}
 
-			// if IP is filtered, dont reply but disconnect...
-			if (theApp->ipfilter->IsFiltered(m_client->GetIP())) {
-				if (bNewClient) {
-					m_client->Safe_Delete();
-					m_client = NULL;
-				}
-				Disconnect("IPFilter");
-				return false;
+		// if IP is filtered, dont reply but disconnect...
+		if (theApp->ipfilter->IsFiltered(m_client->GetUserAddress())) {
+			if (bNewClient) {
+				m_client->Safe_Delete();
+				m_client = NULL;
 			}
+			Disconnect("IPFilter");
+			return false;
+		}
 
-			wxASSERT(m_client);
+		wxASSERT(m_client);
 
-			// 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 ;)
-			if (theApp->clientlist->AttachToAlreadyKnown(&m_client,this)) {
-				// update the old client information
-				bIsMuleHello = m_client->ProcessHelloPacket(buffer, size);
-			} else {
-				theApp->clientlist->AddClient(m_client);
-				m_client->SetCommentDirty();
-			}
-			Notify_SharedCtrlRefreshClient( m_client->ECID(), AVAILABLE_SOURCE );
-			// send a response packet with standard information
-			if ((m_client->GetHashType() == SO_EMULE) && !bIsMuleHello) {
-				m_client->SendMuleInfoPacket(false);
+		// If we already know this client the socket is attached to the known one, the new
+		// client is deleted and m_client points at the known one; otherwise the freshly
+		// constructed one is kept.
+		bool senderDiscarded = false;
+		if (theApp->clientlist->AttachToAlreadyKnown(&m_client, this, &senderDiscarded)) {
+			if (senderDiscarded) {
+				// Simultaneous uTP dials, and the tie-break kept the other
+				// socket. This one is detached and on its way out.
+				return false;
 			}
+			bIsMuleHello = m_client->ProcessHelloPacket(buffer, size);
+		} else {
+			theApp->clientlist->AddClient(m_client);
+			m_client->SetCommentDirty();
+		}
+#ifdef AMULE_UTP_TRANSPORT
+		// After the attach above, which may have replaced the client this keys
+		// on. Outbound streams also refresh their parameters on HELLOANSWER.
+		ApplyUtpCryptParameters();
+#endif
+		Notify_SharedCtrlRefreshClient(m_client->ECID(), AVAILABLE_SOURCE);
+		if ((m_client->GetHashType() == SO_EMULE) && !bIsMuleHello) {
+			m_client->SendMuleInfoPacket(false);
+		}
 
-			// Client might die from Sending in SendMuleInfoPacket, so check
-			if ( m_client ) {
-				m_client->SendHelloAnswer();
-			}
+		// Client might die from Sending in SendMuleInfoPacket, so check
+		if (m_client) {
+			m_client->SendHelloAnswer();
+		}
 
-			// Kry - If the other side supports it, send OS_INFO
-			// Client might die from Sending in SendHelloAnswer, so check
-			if (m_client && m_client->GetOSInfoSupport()) {
-				m_client->SendMuleInfoPacket(false,true); // Send the OS Info tag on the recycled Mule Info
-			}
+		// Send OS_INFO if the other side supports it. Sending may kill the client,
+		// so it is re-checked.
+		if (m_client && m_client->GetOSInfoSupport()) {
+			m_client->SendMuleInfoPacket(
+				false, true); // Send the OS Info tag on the recycled Mule Info
+		}
 
-			// Client might die from Sending in SendMuleInfoPacket, so check
-			if ( m_client ) {
-				m_client->ConnectionEstablished();
-			}
+		// Client might die from Sending in SendMuleInfoPacket, so check
+		if (m_client) {
+			m_client->ConnectionEstablished();
+		}
 
-			// start secure identification, if
-			//	- we have received eMule-OP_HELLO (new eMule)
-			if (m_client && m_client->GetInfoPacketsReceived() == IP_BOTH) {
-					m_client->InfoPacketsReceived();
-			}
+		// start secure identification, if
+		//	- we have received eMule-OP_HELLO (new eMule)
+		if (m_client && m_client->GetInfoPacketsReceived() == IP_BOTH) {
+			m_client->InfoPacketsReceived();
+		}
 
+		break;
+	}
+	case OP_REQUESTFILENAME: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_REQUESTFILENAME from " + m_client->GetFullIP());
+
+		theStats::AddDownOverheadFileRequest(size);
+		// IP banned, no answer for this request
+		if (m_client->IsBanned()) {
 			break;
 		}
-		case OP_REQUESTFILENAME: {	// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_REQUESTFILENAME from " + m_client->GetFullIP() );
-
-			theStats::AddDownOverheadFileRequest(size);
-			// IP banned, no answer for this request
-			if (m_client->IsBanned()) {
-				break;
+		if (size >= 16) {
+			if (!m_client->GetWaitStartTime()) {
+				m_client->SetWaitStartTime();
 			}
-			if (size >= 16) {
-				if (!m_client->GetWaitStartTime()) {
-					m_client->SetWaitStartTime();
-				}
-				CMemFile data_in(buffer, size);
-				CMD4Hash reqfilehash = data_in.ReadHash();
-				CKnownFile *reqfile = theApp->sharedfiles->GetFileByID(reqfilehash);
-				if ( reqfile == NULL ) {
-					reqfile = theApp->downloadqueue->GetFileByID(reqfilehash);
-					if ( !( reqfile != NULL && reqfile->GetFileSize() > PARTSIZE ) ) {
-						break;
-					}
+			CMemFile data_in(buffer, size);
+			CMD4Hash reqfilehash = data_in.ReadHash();
+			CKnownFile *reqfile = theApp->sharedfiles->GetFileByID(reqfilehash);
+			if (reqfile == NULL) {
+				reqfile = theApp->downloadqueue->GetFileByID(reqfilehash);
+				if (!(reqfile != NULL && reqfile->GetFileSize() > PARTSIZE)) {
+					break;
 				}
-				// if we are downloading this file, this could be a new source
-				// no passive adding of files with only one part
-				if (reqfile->IsPartFile() && reqfile->GetFileSize() > PARTSIZE) {
-					if (thePrefs::GetMaxSourcePerFile() > static_cast<CPartFile*>(reqfile)->GetSourceCount()) {
-						theApp->downloadqueue->CheckAndAddKnownSource(static_cast<CPartFile*>(reqfile), m_client);
-					}
+			}
+			// if we are downloading this file, this could be a new source
+			// no passive adding of files with only one part
+			if (reqfile->IsPartFile() && reqfile->GetFileSize() > PARTSIZE) {
+				if (thePrefs::GetMaxSourcePerFile() >
+					static_cast<CPartFile *>(reqfile)->GetSourceCount()) {
+					theApp->downloadqueue->CheckAndAddKnownSource(
+						static_cast<CPartFile *>(reqfile), m_client);
 				}
+			}
 
-				// check to see if this is a new file they are asking for
-				if (m_client->GetUploadFileID() != reqfilehash) {
-						m_client->SetCommentDirty();
-				}
+			if (m_client->GetUploadFileID() != reqfilehash) {
+				m_client->SetCommentDirty();
+			}
 
-				m_client->SetUploadFileID(reqfile);
-				m_client->ProcessExtendedInfo(&data_in, reqfile);
+			m_client->SetUploadFileID(reqfile);
+			m_client->ProcessExtendedInfo(&data_in, reqfile);
 
-				// send filename etc
-				CMemFile data_out(128);
-				data_out.WriteHash(reqfile->GetFileHash());
+			CMemFile data_out(128);
+			data_out.WriteHash(reqfile->GetFileHash());
 
-				// Since it's for somebody else to see, we need to send the prettified
-				// filename, rather than the (possibly) mangled actual filename.
-				data_out.WriteString(reqfile->GetFileName().GetPrintable(), m_client->GetUnicodeSupport());
+			// Since it's for somebody else to see, we need to send the prettified
+			// filename, rather than the (possibly) mangled actual filename.
+			data_out.WriteString(
+				reqfile->GetFileName().GetPrintable(), m_client->GetUnicodeSupport());
 
-				CPacket* packet = new CPacket(data_out, OP_EDONKEYPROT, OP_REQFILENAMEANSWER);
-				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_REQFILENAMEANSWER to " + m_client->GetFullIP() );
-				SendPacket(packet,true);
+			CPacket *packet = new CPacket(data_out, OP_EDONKEYPROT, OP_REQFILENAMEANSWER);
+			theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
+			AddDebugLogLineN(logLocalClient,
+				"Local Client: OP_REQFILENAMEANSWER to " + m_client->GetFullIP());
+			SendPacket(packet, true);
 
-				// SendPacket might kill the socket, so check
-				if (m_client)
-					m_client->SendCommentInfo(reqfile);
+			// SendPacket might kill the socket, so check
+			if (m_client)
+				m_client->SendCommentInfo(reqfile);
 
-				break;
-			}
-			throw wxString("Invalid OP_REQUESTFILENAME packet size");
 			break;
 		}
-		case OP_SETREQFILEID: {	// 0.43b EXCEPT track of bad clients
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_SETREQFILEID from " + m_client->GetFullIP() );
+		throw wxString("Invalid OP_REQUESTFILENAME packet size");
+		break;
+	}
+	case OP_SETREQFILEID: { // 0.43b EXCEPT track of bad clients
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_SETREQFILEID from " + m_client->GetFullIP());
 
-			theStats::AddDownOverheadFileRequest(size);
+		theStats::AddDownOverheadFileRequest(size);
 
-			if (m_client->IsBanned()) {
-				break;
-			}
+		if (m_client->IsBanned()) {
+			break;
+		}
 
-			// DbT:FileRequest
-			if (size == 16) {
-				if (!m_client->GetWaitStartTime()) {
-					m_client->SetWaitStartTime();
-				}
+		if (size == 16) {
+			if (!m_client->GetWaitStartTime()) {
+				m_client->SetWaitStartTime();
+			}
 
-				const CMD4Hash fileID(buffer);
-				CKnownFile *reqfile = theApp->sharedfiles->GetFileByID(fileID);
-				if ( reqfile == NULL ) {
-					reqfile = theApp->downloadqueue->GetFileByID(fileID);
-					if ( !( reqfile  != NULL && reqfile->GetFileSize() > PARTSIZE ) ) {
-						CPacket* replypacket = new CPacket(OP_FILEREQANSNOFIL, 16, OP_EDONKEYPROT);
-						replypacket->Copy16ToDataBuffer(fileID.GetHash());
-						theStats::AddUpOverheadFileRequest(replypacket->GetPacketSize());
-						AddDebugLogLineN( logLocalClient, "Local Client: OP_FILERE to " + m_client->GetFullIP() );
-						SendPacket(replypacket, true);
-						break;
-					}
+			const CMD4Hash fileID(buffer);
+			CKnownFile *reqfile = theApp->sharedfiles->GetFileByID(fileID);
+			if (reqfile == NULL) {
+				reqfile = theApp->downloadqueue->GetFileByID(fileID);
+				if (!(reqfile != NULL && reqfile->GetFileSize() > PARTSIZE)) {
+					CPacket *replypacket =
+						new CPacket(OP_FILEREQANSNOFIL, 16, OP_EDONKEYPROT);
+					replypacket->Copy16ToDataBuffer(fileID.GetHash());
+					theStats::AddUpOverheadFileRequest(replypacket->GetPacketSize());
+					AddDebugLogLineN(logLocalClient,
+						"Local Client: OP_FILERE to " + m_client->GetFullIP());
+					SendPacket(replypacket, true);
+					break;
 				}
+			}
 
-				// check to see if this is a new file they are asking for
-				if (m_client->GetUploadFileID() != fileID) {
-					m_client->SetCommentDirty();
-				}
+			if (m_client->GetUploadFileID() != fileID) {
+				m_client->SetCommentDirty();
+			}
 
-				m_client->SetUploadFileID(reqfile);
-				// send filestatus
-				CMemFile data(16+16);
-				data.WriteHash(reqfile->GetFileHash());
-				if (reqfile->IsPartFile()) {
-					static_cast<CPartFile*>(reqfile)->WritePartStatus(&data);
-				} else {
-					data.WriteUInt16(0);
-				}
-				CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_FILESTATUS);
-				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_FILESTATUS to " + m_client->GetFullIP() );
-				SendPacket(packet, true);
-				break;
+			m_client->SetUploadFileID(reqfile);
+			CMemFile data(16 + 16);
+			data.WriteHash(reqfile->GetFileHash());
+			if (reqfile->IsPartFile()) {
+				static_cast<CPartFile *>(reqfile)->WritePartStatus(&data);
+			} else {
+				data.WriteUInt16(0);
 			}
-			throw wxString("Invalid OP_FILEREQUEST packet size");
+			CPacket *packet = new CPacket(data, OP_EDONKEYPROT, OP_FILESTATUS);
+			theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
+			AddDebugLogLineN(
+				logLocalClient, "Local Client: OP_FILESTATUS to " + m_client->GetFullIP());
+			SendPacket(packet, true);
 			break;
-			// DbT:End
 		}
+		throw wxString("Invalid OP_FILEREQUEST packet size");
+		break;
+	}
 
-		case OP_FILEREQANSNOFIL: {	// 0.43b protocol, lacks ZZ's download manager on swap
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_FILEREQANSNOFIL from " + m_client->GetFullIP() );
+	case OP_FILEREQANSNOFIL: { // 0.43b protocol, lacks ZZ's download manager on swap
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_FILEREQANSNOFIL from " + m_client->GetFullIP());
 
-			theStats::AddDownOverheadFileRequest(size);
-			if (size == 16) {
-				// if that client does not have my file maybe has another different
-				CPartFile* reqfile = theApp->downloadqueue->GetFileByID(CMD4Hash(buffer));
-				if ( reqfile) {
-					reqfile->AddDeadSource( m_client );
-				} else {
-					break;
-				}
+		theStats::AddDownOverheadFileRequest(size);
+		if (size == 16) {
+			// if that client does not have my file maybe has another different
+			CPartFile *reqfile = theApp->downloadqueue->GetFileByID(CMD4Hash(buffer));
+			if (reqfile) {
+				reqfile->AddDeadSource(m_client);
+			} else {
+				break;
+			}
 
-				// we try to swap to another file ignoring no needed parts files
-				switch (m_client->GetDownloadState()) {
-					case DS_CONNECTED:
-					case DS_ONQUEUE:
-					case DS_NONEEDEDPARTS:
-					if (!m_client->SwapToAnotherFile(true, true, true, NULL)) {
-						theApp->downloadqueue->RemoveSource(m_client);
-					}
-					break;
+			// we try to swap to another file ignoring no needed parts files
+			switch (m_client->GetDownloadState()) {
+			case DS_CONNECTED:
+			case DS_ONQUEUE:
+			case DS_NONEEDEDPARTS:
+				if (!m_client->SwapToAnotherFile(true, true, true, NULL)) {
+					theApp->downloadqueue->RemoveSource(m_client);
 				}
 				break;
 			}
-			throw wxString("Invalid OP_FILEREQUEST packet size");
 			break;
 		}
+		throw wxString("Invalid OP_FILEREQUEST packet size");
+		break;
+	}
 
-		case OP_REQFILENAMEANSWER: {	// 0.43b except check for bad clients
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_REQFILENAMEANSWER from " + m_client->GetFullIP() );
-
-			theStats::AddDownOverheadFileRequest(size);
-			CMemFile data(buffer, size);
-			CMD4Hash hash = data.ReadHash();
-			const CPartFile* file = theApp->downloadqueue->GetFileByID(hash);
-			m_client->ProcessFileInfo(&data, file);
-			break;
-		}
-
-		case OP_FILESTATUS: {		// 0.43b except check for bad clients
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_FILESTATUS from " + m_client->GetFullIP() );
-
-			theStats::AddDownOverheadFileRequest(size);
-			CMemFile data(buffer, size);
-			CMD4Hash hash = data.ReadHash();
-			const CPartFile* file = theApp->downloadqueue->GetFileByID(hash);
-			m_client->ProcessFileStatus(false, &data, file);
-			break;
-		}
+	case OP_REQFILENAMEANSWER: { // 0.43b except check for bad clients
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_REQFILENAMEANSWER from " + m_client->GetFullIP());
 
-		case OP_STARTUPLOADREQ: {
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_STARTUPLOADREQ from " + m_client->GetFullIP() );
+		theStats::AddDownOverheadFileRequest(size);
+		CMemFile data(buffer, size);
+		CMD4Hash hash = data.ReadHash();
+		const CPartFile *file = theApp->downloadqueue->GetFileByID(hash);
+		m_client->ProcessFileInfo(&data, file);
+		break;
+	}
 
-			theStats::AddDownOverheadFileRequest(size);
+	case OP_FILESTATUS: { // 0.43b except check for bad clients
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_FILESTATUS from " + m_client->GetFullIP());
 
-			if (!m_client->CheckHandshakeFinished()) {
-				break;
-			}
+		theStats::AddDownOverheadFileRequest(size);
+		CMemFile data(buffer, size);
+		CMD4Hash hash = data.ReadHash();
+		const CPartFile *file = theApp->downloadqueue->GetFileByID(hash);
+		m_client->ProcessFileStatus(false, &data, file);
+		break;
+	}
 
-			m_client->CheckForAggressive();
-			if ( m_client->IsBanned() ) {
-				break;
-			}
+	case OP_STARTUPLOADREQ: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_STARTUPLOADREQ from " + m_client->GetFullIP());
 
-			if (size == 16) {
-				const CMD4Hash fileID(buffer);
-				CKnownFile* reqfile = theApp->sharedfiles->GetFileByID(fileID);
-				if (reqfile) {
-					if (m_client->GetUploadFileID() != fileID) {
-						m_client->SetCommentDirty();
-					}
-					m_client->SetUploadFileID(reqfile);
-					m_client->SendCommentInfo(reqfile);
+		theStats::AddDownOverheadFileRequest(size);
 
-					// Socket might die because of SendCommentInfo, so check
-					if (m_client)
-						theApp->uploadqueue->AddClientToQueue(m_client);
-				}
-			}
+		if (!m_client->CheckHandshakeFinished()) {
 			break;
 		}
 
-		case OP_QUEUERANK: {	// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_QUEUERANK from " + m_client->GetFullIP() );
-
-			theStats::AddDownOverheadFileRequest(size);
-			CMemFile data(buffer, size);
-			uint32 rank = data.ReadUInt32();
-
-			m_client->SetRemoteQueueRank(rank);
+		m_client->CheckForAggressive();
+		if (m_client->IsBanned()) {
 			break;
 		}
 
-		case OP_ACCEPTUPLOADREQ: {	// 0.42e (xcept khaos stats)
-			AddDebugLogLineN( logRemoteClient, "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)) {
-				if (m_client->GetDownloadState() == DS_ONQUEUE ) {
-					m_client->SetDownloadState(DS_DOWNLOADING);
-					m_client->SetLastPartAsked(0xffff); // Reset current downloaded Chunk // Maella -Enhanced Chunk Selection- (based on jicxicmic)
-					m_client->SendBlockRequests();
-				}
-			} else {
-				if (!m_client->GetSentCancelTransfer()) {
-					CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
-					theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-					AddDebugLogLineN( logLocalClient, "Local Client: OP_CANCELTRANSFER to " + m_client->GetFullIP() );
-					m_client->SendPacket(packet,true,true);
-
-					// SendPacket can cause the socket to die, so check
-					if (m_client)
-						m_client->SetSentCancelTransfer(1);
+		if (size == 16) {
+			const CMD4Hash fileID(buffer);
+			CKnownFile *reqfile = theApp->sharedfiles->GetFileByID(fileID);
+			if (reqfile) {
+				if (m_client->GetUploadFileID() != fileID) {
+					m_client->SetCommentDirty();
 				}
+				m_client->SetUploadFileID(reqfile);
+				m_client->SendCommentInfo(reqfile);
 
+				// Socket might die because of SendCommentInfo, so check
 				if (m_client)
-					m_client->SetDownloadState((m_client->GetRequestFile()==NULL || m_client->GetRequestFile()->IsStopped()) ? DS_NONE : DS_ONQUEUE);
+					theApp->uploadqueue->AddClientToQueue(m_client);
 			}
-			break;
 		}
+		break;
+	}
 
-		case OP_REQUESTPARTS: {		// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_REQUESTPARTS from " + m_client->GetFullIP() );
+	case OP_QUEUERANK: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_QUEUERANK from " + m_client->GetFullIP());
 
-			theStats::AddDownOverheadFileRequest(size);
+		theStats::AddDownOverheadFileRequest(size);
+		CMemFile data(buffer, size);
+		uint32 rank = data.ReadUInt32();
 
-			m_client->ProcessRequestPartsPacket(buffer, size, false);
+		m_client->SetRemoteQueueRank(rank);
+		break;
+	}
 
-			break;
-		}
+	case OP_ACCEPTUPLOADREQ: { // 0.42e (xcept khaos stats)
+		AddDebugLogLineN(
+			logRemoteClient, "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)) {
+			if (m_client->GetDownloadState() == DS_ONQUEUE) {
+				m_client->SetDownloadState(DS_DOWNLOADING);
+				m_client->SetLastPartAsked(
+					0xffff); // Reset current downloaded Chunk // Maella -Enhanced Chunk
+						 // Selection- (based on jicxicmic)
+				m_client->SendBlockRequests();
+			}
+		} else {
+			if (!m_client->GetSentCancelTransfer()) {
+				CPacket *packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
+				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
+				AddDebugLogLineN(logLocalClient,
+					"Local Client: OP_CANCELTRANSFER to " + m_client->GetFullIP());
+				m_client->SendPacket(packet, true, true);
 
-		case OP_CANCELTRANSFER: {		// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_CANCELTRANSFER from " + m_client->GetFullIP() );
+				// SendPacket can cause the socket to die, so check
+				if (m_client)
+					m_client->SetSentCancelTransfer(1);
+			}
 
-			theStats::AddDownOverheadFileRequest(size);
-			theApp->uploadqueue->RemoveFromUploadQueue(m_client);
-			AddDebugLogLineN( logClient, m_client->GetUserName() + ": Upload session ended due canceled transfer.");
-			break;
+			if (m_client)
+				m_client->SetDownloadState((m_client->GetRequestFile() == NULL ||
+								   m_client->GetRequestFile()->IsStopped())
+								   ? DS_NONE
+								   : DS_ONQUEUE);
 		}
+		break;
+	}
 
-		case OP_END_OF_DOWNLOAD: { // 0.43b except check for bad clients
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_END_OF_DOWNLOAD from " + m_client->GetFullIP() );
+	case OP_REQUESTPARTS: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_REQUESTPARTS from " + m_client->GetFullIP());
 
-			theStats::AddDownOverheadFileRequest(size);
-			if (size>=16 && m_client->GetUploadFileID() == CMD4Hash(buffer)) {
-				theApp->uploadqueue->RemoveFromUploadQueue(m_client);
-				AddDebugLogLineN( logClient, m_client->GetUserName() + ": Upload session ended due ended transfer.");
-			}
-			break;
-		}
+		theStats::AddDownOverheadFileRequest(size);
 
-		case OP_HASHSETREQUEST: {		// 0.43b except check for bad clients
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_HASHSETREQUEST from " + m_client->GetFullIP() );
+		m_client->ProcessRequestPartsPacket(buffer, size, false);
 
+		break;
+	}
 
-			theStats::AddDownOverheadFileRequest(size);
-			if (size != 16) {
-				throw wxString("Invalid OP_HASHSETREQUEST packet size");
-			}
-			m_client->SendHashsetPacket(CMD4Hash(buffer));
-			break;
+	case OP_CANCELTRANSFER: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_CANCELTRANSFER from " + m_client->GetFullIP());
+
+		theStats::AddDownOverheadFileRequest(size);
+		theApp->uploadqueue->RemoveFromUploadQueue(m_client);
+		AddDebugLogLineN(
+			logClient, m_client->GetUserName() + ": Upload session ended due canceled transfer.");
+		break;
+	}
+
+	case OP_END_OF_DOWNLOAD: { // 0.43b except check for bad clients
+		AddDebugLogLineN(
+			logRemoteClient, "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);
+			AddDebugLogLineN(logClient,
+				m_client->GetUserName() + ": Upload session ended due ended transfer.");
 		}
+		break;
+	}
 
-		case OP_HASHSETANSWER: {		// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_HASHSETANSWER from " + m_client->GetFullIP() );
+	case OP_HASHSETREQUEST: { // 0.43b except check for bad clients
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_HASHSETREQUEST from " + m_client->GetFullIP());
 
-			theStats::AddDownOverheadFileRequest(size);
-			m_client->ProcessHashSet(buffer, size);
-			break;
+		theStats::AddDownOverheadFileRequest(size);
+		if (size != 16) {
+			throw wxString("Invalid OP_HASHSETREQUEST packet size");
 		}
+		m_client->SendHashsetPacket(CMD4Hash(buffer));
+		break;
+	}
 
-		case OP_SENDINGPART: {		// 0.47a
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_SENDINGPART from " + m_client->GetFullIP() );
+	case OP_HASHSETANSWER: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_HASHSETANSWER from " + m_client->GetFullIP());
 
-			if (	 m_client->GetRequestFile() &&
-				!m_client->GetRequestFile()->IsStopped() &&
-				(m_client->GetRequestFile()->GetStatus() == PS_READY || m_client->GetRequestFile()->GetStatus()==PS_EMPTY)) {
+		theStats::AddDownOverheadFileRequest(size);
+		m_client->ProcessHashSet(buffer, size);
+		break;
+	}
 
-				m_client->ProcessBlockPacket(buffer, size, false, false);
+	case OP_SENDINGPART: { // 0.47a
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_SENDINGPART from " + m_client->GetFullIP());
 
-				if (	m_client &&
-					( m_client->GetRequestFile()->IsStopped() ||
-					  m_client->GetRequestFile()->GetStatus() == PS_PAUSED ||
-					  m_client->GetRequestFile()->GetStatus() == PS_ERROR) ) {
-					if (!m_client->GetSentCancelTransfer()) {
-						CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
-						theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-						AddDebugLogLineN( logLocalClient, "Local Client: OP_CANCELTRANSFER to " + m_client->GetFullIP() );
-						m_client->SendPacket(packet,true,true);
+		if (m_client->GetRequestFile() && !m_client->GetRequestFile()->IsStopped() &&
+			(m_client->GetRequestFile()->GetStatus() == PS_READY ||
+				m_client->GetRequestFile()->GetStatus() == PS_EMPTY)) {
 
-						// Socket might die because of SendPacket, so check
-						if (m_client)
-							m_client->SetSentCancelTransfer(1);
-					}
+			m_client->ProcessBlockPacket(buffer, size, false, false);
 
-					if (m_client)
-						m_client->SetDownloadState(m_client->GetRequestFile()->IsStopped() ? DS_NONE : DS_ONQUEUE);
-				}
-			} else {
+			if (m_client && (m_client->GetRequestFile()->IsStopped() ||
+						m_client->GetRequestFile()->GetStatus() == PS_PAUSED ||
+						m_client->GetRequestFile()->GetStatus() == PS_ERROR)) {
 				if (!m_client->GetSentCancelTransfer()) {
-					CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
+					CPacket *packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 					theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-					AddDebugLogLineN( logLocalClient, "Local Client: OP_CANCELTRANSFER to " + m_client->GetFullIP() );
-					m_client->SendPacket(packet,true,true);
+					AddDebugLogLineN(logLocalClient,
+						"Local Client: OP_CANCELTRANSFER to " +
+							m_client->GetFullIP());
+					m_client->SendPacket(packet, true, true);
 
 					// Socket might die because of SendPacket, so check
-					m_client->SetSentCancelTransfer(1);
+					if (m_client)
+						m_client->SetSentCancelTransfer(1);
 				}
-				m_client->SetDownloadState((m_client->GetRequestFile()==NULL || m_client->GetRequestFile()->IsStopped()) ? DS_NONE : DS_ONQUEUE);
-			}
-			break;
-		}
 
-		case OP_OUTOFPARTREQS: {	// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_OUTOFPARTREQS from " + m_client->GetFullIP() );
-
-			theStats::AddDownOverheadFileRequest(size);
-			if (m_client->GetDownloadState() == DS_DOWNLOADING) {
-				m_client->SetDownloadState(DS_ONQUEUE);
+				if (m_client)
+					m_client->SetDownloadState(m_client->GetRequestFile()->IsStopped()
+									   ? DS_NONE
+									   : DS_ONQUEUE);
 			}
-			break;
-		}
-
-		case OP_CHANGE_CLIENT_ID: {	// Kad reviewed
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_CHANGE_CLIENT_ID from " + m_client->GetFullIP() );
+		} else {
+			if (!m_client->GetSentCancelTransfer()) {
+				CPacket *packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
+				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
+				AddDebugLogLineN(logLocalClient,
+					"Local Client: OP_CANCELTRANSFER to " + m_client->GetFullIP());
+				m_client->SendPacket(packet, true, true);
 
-			theStats::AddDownOverheadOther(size);
-			CMemFile data(buffer, size);
-			uint32 nNewUserID = data.ReadUInt32();
-			uint32 nNewServerIP = data.ReadUInt32();
-
-			if (IsLowID(nNewUserID)) { // client changed server and gots a LowID
-				CServer* pNewServer = theApp->serverlist->GetServerByIP(nNewServerIP);
-				if (pNewServer != NULL){
-					m_client->SetUserIDHybrid(nNewUserID); // update UserID only if we know the server
-					m_client->SetServerIP(nNewServerIP);
-					m_client->SetServerPort(pNewServer->GetPort());
-				}
-			} else if (nNewUserID == m_client->GetIP()) { // client changed server and gots a HighID(IP)
-				m_client->SetUserIDHybrid(wxUINT32_SWAP_ALWAYS(nNewUserID));
-				CServer* pNewServer = theApp->serverlist->GetServerByIP(nNewServerIP);
-				if (pNewServer != NULL){
-					m_client->SetServerIP(nNewServerIP);
-					m_client->SetServerPort(pNewServer->GetPort());
-				}
+				// Socket might die because of SendPacket, so check
+				m_client->SetSentCancelTransfer(1);
 			}
-
-			break;
+			m_client->SetDownloadState((m_client->GetRequestFile() == NULL ||
+							   m_client->GetRequestFile()->IsStopped())
+							   ? DS_NONE
+							   : DS_ONQUEUE);
 		}
+		break;
+	}
 
-		case OP_CHANGE_SLOT:{	// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_CHANGE_SLOT from " + m_client->GetFullIP() );
+	case OP_OUTOFPARTREQS: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_OUTOFPARTREQS from " + m_client->GetFullIP());
 
-			// sometimes sent by Hybrid
-			theStats::AddDownOverheadOther(size);
-			break;
+		theStats::AddDownOverheadFileRequest(size);
+		if (m_client->GetDownloadState() == DS_DOWNLOADING) {
+			m_client->SetDownloadState(DS_ONQUEUE);
 		}
+		break;
+	}
 
-		case OP_MESSAGE: {		// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_MESSAGE from " + m_client->GetFullIP() );
+	case OP_CHANGE_CLIENT_ID: { // Kad reviewed
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_CHANGE_CLIENT_ID from " + m_client->GetFullIP());
 
-			theStats::AddDownOverheadOther(size);
+		theStats::AddDownOverheadOther(size);
+		CMemFile data(buffer, size);
+		uint32 nNewUserID = data.ReadUInt32();
+		uint32 nNewServerIP = data.ReadUInt32();
 
-			if (size < 2) {
-				throw wxString("invalid message packet");
+		if (IsLowID(nNewUserID)) { // client changed server and gots a LowID
+			CServer *pNewServer = theApp->serverlist->GetServerByIP(nNewServerIP);
+			if (pNewServer != NULL) {
+				m_client->SetUserIDHybrid(
+					nNewUserID); // update UserID only if we know the server
+				m_client->SetServerIP(nNewServerIP);
+				m_client->SetServerPort(pNewServer->GetPort());
 			}
-			CMemFile message_file(buffer, size);
-			uint16 length = message_file.ReadUInt16();
-			if (length + 2u != size) {
-				throw wxString("invalid message packet");
+		} else if (nNewUserID == m_client->GetIP()) { // client changed server and gots a HighID(IP)
+			m_client->SetUserIDHybrid(wxUINT32_SWAP_ALWAYS(nNewUserID));
+			CServer *pNewServer = theApp->serverlist->GetServerByIP(nNewServerIP);
+			if (pNewServer != NULL) {
+				m_client->SetServerIP(nNewServerIP);
+				m_client->SetServerPort(pNewServer->GetPort());
 			}
+		}
 
-			// limit message length
-			static const uint16 MAX_CLIENT_MSG_LEN = 450;
+		break;
+	}
 
-			if (length > MAX_CLIENT_MSG_LEN) {
-				AddDebugLogLineN(logRemoteClient, CFormat("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;
-			}
+	case OP_CHANGE_SLOT: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_CHANGE_SLOT from " + m_client->GetFullIP());
 
-			wxString message = message_file.ReadOnlyString((m_client->GetUnicodeSupport() != utf8strNone), length);
-			m_client->ProcessChatMessage(message);
+		// sometimes sent by Hybrid
+		theStats::AddDownOverheadOther(size);
+		break;
+	}
 
-			break;
+	case OP_MESSAGE: { // 0.43b
+		AddDebugLogLineN(logRemoteClient, "Remote Client: OP_MESSAGE from " + m_client->GetFullIP());
+
+		theStats::AddDownOverheadOther(size);
+
+		if (size < 2) {
+			throw wxString("invalid message packet");
+		}
+		CMemFile message_file(buffer, size);
+		uint16 length = message_file.ReadUInt16();
+		if (length + 2u != size) {
+			throw wxString("invalid message packet");
 		}
 
-		case OP_ASKSHAREDFILES:	{	// 0.43b (well, er, it does the same, but in our own way)
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_ASKSHAREDFILES from " + m_client->GetFullIP() );
+		static const uint16 MAX_CLIENT_MSG_LEN = 450;
 
-			// client wants to know what we have in share, let's see if we allow him to know that
-			theStats::AddDownOverheadOther(size);
-			// IP banned, no answer for this request
-			if (m_client->IsBanned()) {
-				break;
-			}
+		if (length > MAX_CLIENT_MSG_LEN) {
+			AddDebugLogLineN(logRemoteClient,
+				CFormat("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;
+		}
 
-			if (thePrefs::CanSeeShares() == vsfaEverybody || (thePrefs::CanSeeShares() == vsfaFriends && m_client->IsFriend())) {
-				AddLogLineC(CFormat( _("User %s (%u) requested your sharedfiles-list -> Accepted"))
-					% m_client->GetUserName()
-					% m_client->GetUserIDHybrid() );
+		wxString message =
+			message_file.ReadOnlyString((m_client->GetUnicodeSupport() != utf8strNone), length);
+		m_client->ProcessChatMessage(message);
 
-				std::vector<CKnownFile*> list;
-				theApp->sharedfiles->CopyFileList(list);
+		break;
+	}
 
-				CMemFile tempfile(80);
-				tempfile.WriteUInt32(list.size());
-				for (unsigned i = 0; i < list.size(); ++i) {
-					if (!listi->IsLargeFile() || m_client->SupportsLargeFiles()) {
-						listi->CreateOfferedFilePacket(&tempfile, NULL, m_client);
-					}
-				}
+	case OP_ASKSHAREDFILES: { // 0.43b (well, er, it does the same, but in our own way)
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_ASKSHAREDFILES from " + m_client->GetFullIP());
 
-				// create a packet and send it
-				CPacket* replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDFILESANSWER);
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_ASKSHAREDFILESANSWER to " + m_client->GetFullIP() );
-				theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-				SendPacket(replypacket, true, true);
-			} else {
-				AddLogLineC(CFormat( _("User %s (%u) requested your sharedfiles-list -> Denied"))
-					% m_client->GetUserName()
-					% m_client->GetUserIDHybrid() );
+		// client wants to know what we have in share, let's see if we allow him to know that
+		theStats::AddDownOverheadOther(size);
+		// IP banned, no answer for this request
+		if (m_client->IsBanned()) {
+			break;
+		}
 
-				CPacket* replypacket = new CPacket(OP_ASKSHAREDDENIEDANS, 0, OP_EDONKEYPROT);
-				theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_ASKSHAREDDENIEDANS to " + m_client->GetFullIP() );
-				SendPacket(replypacket, true, true);
+		if (thePrefs::CanSeeShares() == vsfaEverybody ||
+			(thePrefs::CanSeeShares() == vsfaFriends && m_client->IsFriend())) {
+			AddLogLineC(CFormat(_("User %s (%u) requested your sharedfiles-list -> Accepted")) %
+				    m_client->GetUserName() % m_client->GetUserIDHybrid());
+
+			std::vector<CKnownFile *> list;
+			theApp->sharedfiles->CopyFileList(list);
+
+			CMemFile tempfile(80);
+			tempfile.WriteUInt32(list.size());
+			for (unsigned i = 0; i < list.size(); ++i) {
+				if (!listi->IsLargeFile() || m_client->SupportsLargeFiles()) {
+					listi->CreateOfferedFilePacket(&tempfile, NULL, m_client);
+				}
 			}
 
-			break;
+			CPacket *replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDFILESANSWER);
+			AddDebugLogLineN(logLocalClient,
+				"Local Client: OP_ASKSHAREDFILESANSWER to " + m_client->GetFullIP());
+			theStats::AddUpOverheadOther(replypacket->GetPacketSize());
+			SendPacket(replypacket, true, true);
+		} else {
+			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());
+			AddDebugLogLineN(logLocalClient,
+				"Local Client: OP_ASKSHAREDDENIEDANS to " + m_client->GetFullIP());
+			SendPacket(replypacket, true, true);
 		}
 
-		case OP_ASKSHAREDFILESANSWER: {	// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_ASKSHAREDFILESANSWER from " + m_client->GetFullIP() );
+		break;
+	}
 
-			theStats::AddDownOverheadOther(size);
-			wxString EmptyStr;
-			m_client->ProcessSharedFileList(buffer, size, EmptyStr);
+	case OP_ASKSHAREDFILESANSWER: { // 0.43b
+		AddDebugLogLineN(logRemoteClient,
+			"Remote Client: OP_ASKSHAREDFILESANSWER from " + m_client->GetFullIP());
+
+		theStats::AddDownOverheadOther(size);
+		wxString EmptyStr;
+		// The whole share in one packet. ProcessSharedFileList completes the browse from
+		// the outstanding count, so this form needs no terminal mark of its own.
+		m_client->ProcessSharedFileList(buffer, size, EmptyStr);
+		break;
+	}
+
+	case OP_ASKSHAREDDIRS: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_ASKSHAREDDIRS from " + m_client->GetFullIP());
+
+		theStats::AddDownOverheadOther(size);
+		wxASSERT(size == 0);
+		// IP banned, no answer for this request
+		if (m_client->IsBanned()) {
 			break;
 		}
+		if ((thePrefs::CanSeeShares() == vsfaEverybody) ||
+			((thePrefs::CanSeeShares() == vsfaFriends) && m_client->IsFriend())) {
+			AddLogLineC(
+				CFormat(_("User %s (%u) requested your shareddirectories-list -> Accepted")) %
+				m_client->GetUserName() % m_client->GetUserIDHybrid());
+			m_client->SendSharedDirectories();
+		} else {
+			AddLogLineC(
+				CFormat(_("User %s (%u) requested your shareddirectories-list -> Denied")) %
+				m_client->GetUserName() % m_client->GetUserIDHybrid());
 
-		case OP_ASKSHAREDDIRS: {		// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_ASKSHAREDDIRS from " + m_client->GetFullIP() );
+			CPacket *replypacket = new CPacket(OP_ASKSHAREDDENIEDANS, 0, OP_EDONKEYPROT);
+			theStats::AddUpOverheadOther(replypacket->GetPacketSize());
+			AddDebugLogLineN(logLocalClient,
+				"Local Client: OP_ASKSHAREDDENIEDANS to " + m_client->GetFullIP());
+			SendPacket(replypacket, true, true);
+		}
 
-			theStats::AddDownOverheadOther(size);
-			wxASSERT( size == 0 );
-			// IP banned, no answer for this request
-			if (m_client->IsBanned()) {
-				break;
-			}
-			if ((thePrefs::CanSeeShares()==vsfaEverybody) || ((thePrefs::CanSeeShares()==vsfaFriends) && m_client->IsFriend())) {
-				AddLogLineC(CFormat( _("User %s (%u) requested your shareddirectories-list -> Accepted") )
-					% m_client->GetUserName()
-					% m_client->GetUserIDHybrid() );
-				// send the list of shared directories
-				m_client->SendSharedDirectories();
-			} else {
-				AddLogLineC(CFormat( _("User %s (%u) requested your shareddirectories-list -> Denied") )
-					% m_client->GetUserName()
-					% m_client->GetUserIDHybrid() );
+		break;
+	}
 
-				CPacket* replypacket = new CPacket(OP_ASKSHAREDDENIEDANS, 0, OP_EDONKEYPROT);
-				theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_ASKSHAREDDENIEDANS to " + m_client->GetFullIP() );
-				SendPacket(replypacket, true, true);
-			}
+	case OP_ASKSHAREDFILESDIR: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_ASKSHAREDFILESDIR from " + m_client->GetFullIP());
 
+		theStats::AddDownOverheadOther(size);
+		// IP banned, no answer for this request
+		if (m_client->IsBanned()) {
 			break;
 		}
+		CMemFile data(buffer, size);
+
+		wxString strReqDir = data.ReadString((m_client->GetUnicodeSupport() != utf8strNone));
+		if (thePrefs::CanSeeShares() == vsfaEverybody ||
+			(thePrefs::CanSeeShares() == vsfaFriends && m_client->IsFriend())) {
+			AddLogLineC(CFormat(_("User %s (%u) requested your sharedfiles-list for directory "
+					      "'%s' -> accepted")) %
+				    m_client->GetUserName() % m_client->GetUserIDHybrid() % strReqDir);
+			if (data.GetPosition() != data.GetLength()) {
+				// eMule mods routinely append extra tag blocks at the end of OP
+				// packets so older clients can ignore them. Log and continue
+				// (#708).
+				AddDebugLogLineN(logRemoteClient,
+					CFormat("OP_ASKSHAREDFILESDIR: %u trailing byte(s) ignored from %s") %
+						(unsigned)(data.GetLength() - data.GetPosition()) %
+						m_client->GetFullIP());
+			}
+			m_client->SendSharedFilesOfDirectory(strReqDir);
+		} else {
+			AddLogLineC(CFormat(_("User %s (%u) requested your sharedfiles-list for directory "
+					      "'%s' -> denied")) %
+				    m_client->GetUserName() % m_client->GetUserIDHybrid() % strReqDir);
 
-		case OP_ASKSHAREDFILESDIR: {	// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_ASKSHAREDFILESDIR from " + m_client->GetFullIP() );
+			CPacket *replypacket = new CPacket(OP_ASKSHAREDDENIEDANS, 0, OP_EDONKEYPROT);
+			theStats::AddUpOverheadOther(replypacket->GetPacketSize());
+			AddDebugLogLineN(logLocalClient,
+				"Local Client: OP_ASKSHAREDDENIEDANS to " + m_client->GetFullIP());
+			SendPacket(replypacket, true, true);
+		}
+		break;
+	}
 
-			theStats::AddDownOverheadOther(size);
-			// IP banned, no answer for this request
-			if (m_client->IsBanned()) {
-				break;
-			}
-			CMemFile data(buffer, size);
+	case OP_ASKSHAREDDIRSANS: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_ASKSHAREDDIRSANS from " + m_client->GetFullIP());
 
-			wxString strReqDir = data.ReadString((m_client->GetUnicodeSupport() != utf8strNone));
-			if (thePrefs::CanSeeShares()==vsfaEverybody || (thePrefs::CanSeeShares()==vsfaFriends && m_client->IsFriend())) {
-				AddLogLineC(CFormat(_("User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted")) % m_client->GetUserName() % m_client->GetUserIDHybrid() % strReqDir);
-				if (data.GetPosition() != data.GetLength()) {
-					// eMule mods routinely append extra tag blocks at
-					// the end of OP packets specifically so older
-					// clients can ignore them. Log and continue (#708).
-					AddDebugLogLineN(logRemoteClient, CFormat(
-						"OP_ASKSHAREDFILESDIR: %u trailing byte(s) ignored from %s")
-						% (unsigned)(data.GetLength() - data.GetPosition())
-						% m_client->GetFullIP());
-				}
-				// send the list of shared files for the requested directory
-				m_client->SendSharedFilesOfDirectory(strReqDir);
-			} else {
-				AddLogLineC(CFormat(_("User %s (%u) requested your sharedfiles-list for directory '%s' -> denied")) % m_client->GetUserName() % m_client->GetUserIDHybrid() % strReqDir);
+		theStats::AddDownOverheadOther(size);
+		// Once per browse: a peer replaying its directory list would otherwise
+		// re-ask for every directory and keep the browse alive indefinitely.
+		if (theApp->browsemanager->AwaitingDirectoryList(m_client)) {
+			CMemFile data(buffer, size);
+			uint32 uDirs = data.ReadUInt32();
+			for (uint32 i = 0; i < uDirs; i++) {
+				wxString strDir =
+					data.ReadString((m_client->GetUnicodeSupport() != utf8strNone));
+				AddLogLineC(CFormat(_("User %s (%u) shares directory '%s'")) %
+					    m_client->GetUserName() % m_client->GetUserIDHybrid() % strDir);
 
-				CPacket* replypacket = new CPacket(OP_ASKSHAREDDENIEDANS, 0, OP_EDONKEYPROT);
+				CMemFile tempfile(80);
+				tempfile.WriteString(strDir, m_client->GetUnicodeSupport());
+				CPacket *replypacket =
+					new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDFILESDIR);
 				theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_ASKSHAREDDENIEDANS to " + m_client->GetFullIP() );
+				AddDebugLogLineN(logLocalClient,
+					"Local Client: OP_ASKSHAREDFILESDIR to " + m_client->GetFullIP());
 				SendPacket(replypacket, true, true);
 			}
-			break;
+			if (data.GetPosition() != data.GetLength()) {
+				// eMule mods routinely append extra tag blocks at the end of OP
+				// packets so older clients can ignore them. Log and continue
+				// (#708).
+				AddDebugLogLineN(logRemoteClient,
+					CFormat("OP_ASKSHAREDDIRSANS: %u trailing byte(s) ignored from %s") %
+						(unsigned)(data.GetLength() - data.GetPosition()) %
+						m_client->GetFullIP());
+			}
+			// Drives the progress percent, and completes the browse outright when the
+			// peer says it has none -- which used to set the counter to 0 with nothing
+			// marking it, leaving the browse at 0% forever.
+			theApp->browsemanager->OnDirectoryList(
+				m_client, static_cast<int>(uDirs), ::GetTickCount64());
+		} else {
+			AddLogLineC(CFormat(_("User %s (%u) sent unrequested shared dirs.")) %
+				    m_client->GetUserName() % m_client->GetUserIDHybrid());
 		}
+		break;
+	}
 
-		case OP_ASKSHAREDDIRSANS:{		// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_ASKSHAREDDIRSANS from " + m_client->GetFullIP() );
+	case OP_ASKSHAREDFILESDIRANS: { // 0.43b
+		AddDebugLogLineN(logRemoteClient,
+			"Remote Client: OP_ASKSHAREDFILESDIRANS from " + m_client->GetFullIP());
 
-			theStats::AddDownOverheadOther(size);
-			if (m_client->GetFileListRequested() == 1){
-				CMemFile data(buffer, size);
-				uint32 uDirs = data.ReadUInt32();
-				for (uint32 i = 0; i < uDirs; i++){
-					wxString strDir = data.ReadString((m_client->GetUnicodeSupport() != utf8strNone));
-					AddLogLineC(CFormat( _("User %s (%u) shares directory '%s'") )
-						% m_client->GetUserName()
-						% m_client->GetUserIDHybrid()
-						% strDir );
-
-					CMemFile tempfile(80);
-					tempfile.WriteString(strDir, m_client->GetUnicodeSupport());
-					CPacket* replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDFILESDIR);
-					theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-					AddDebugLogLineN( logLocalClient, "Local Client: OP_ASKSHAREDFILESDIR to " + m_client->GetFullIP() );
-					SendPacket(replypacket, true, true);
-				}
-				if (data.GetPosition() != data.GetLength()) {
-					// eMule mods routinely append extra tag blocks at
-					// the end of OP packets specifically so older
-					// clients can ignore them. Log and continue (#708).
-					AddDebugLogLineN(logRemoteClient, CFormat(
-						"OP_ASKSHAREDDIRSANS: %u trailing byte(s) ignored from %s")
-						% (unsigned)(data.GetLength() - data.GetPosition())
-						% m_client->GetFullIP());
-				}
-				m_client->SetFileListRequested(uDirs);
-			} else {
-				AddLogLineC(CFormat( _("User %s (%u) sent unrequested shared dirs.") )
-					% m_client->GetUserName()
-					% m_client->GetUserIDHybrid() );
-			}
-			break;
-		}
+		theStats::AddDownOverheadOther(size);
+		CMemFile data(buffer, size);
+		wxString strDir = data.ReadString((m_client->GetUnicodeSupport() != utf8strNone));
 
-		case OP_ASKSHAREDFILESDIRANS: {		// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_ASKSHAREDFILESDIRANS from " + m_client->GetFullIP() );
+		if (theApp->browsemanager->SearchIdFor(m_client) != 0) {
+			AddLogLineC(CFormat(_("User %s (%u) sent sharedfiles-list for directory '%s'")) %
+				    m_client->GetUserName() % m_client->GetUserIDHybrid() % strDir);
 
-			theStats::AddDownOverheadOther(size);
-			CMemFile data(buffer, size);
-			wxString strDir = data.ReadString((m_client->GetUnicodeSupport() != utf8strNone));
-
-			if (m_client->GetFileListRequested() > 0){
-				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) {
-					AddLogLineC(CFormat( _("User %s (%u) finished sending sharedfiles-list") )
-						% m_client->GetUserName()
-						% m_client->GetUserIDHybrid() );
-				}
-			} else {
-				AddLogLineC(CFormat( _("User %s (%u) sent unwanted sharedfiles-list") )
-					% m_client->GetUserName()
-					% m_client->GetUserIDHybrid() );
+			m_client->ProcessSharedFileList(
+				buffer + data.GetPosition(), size - data.GetPosition(), strDir);
+			if (theApp->browsemanager->SearchIdFor(m_client) == 0) {
+				AddLogLineC(CFormat(_("User %s (%u) finished sending sharedfiles-list")) %
+					    m_client->GetUserName() % m_client->GetUserIDHybrid());
 			}
-			break;
+		} else {
+			AddLogLineC(CFormat(_("User %s (%u) sent unwanted sharedfiles-list")) %
+				    m_client->GetUserName() % m_client->GetUserIDHybrid());
 		}
+		break;
+	}
 
-		case OP_ASKSHAREDDENIEDANS:
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_ASKSHAREDDENIEDANS from " + m_client->GetFullIP() );
+	case OP_ASKSHAREDDENIEDANS:
+		AddDebugLogLineN(logRemoteClient,
+			"Remote Client: OP_ASKSHAREDDENIEDANS from " + m_client->GetFullIP());
 
-			theStats::AddDownOverheadOther(size);
-			wxASSERT( size == 0 );
-			AddLogLineC(CFormat( _("User %s (%u) denied access to shared directories/files list") )
-				% m_client->GetUserName()
-				% m_client->GetUserIDHybrid() );
+		theStats::AddDownOverheadOther(size);
+		wxASSERT(size == 0);
+		AddLogLineC(CFormat(_("User %s (%u) denied access to shared directories/files list")) %
+			    m_client->GetUserName() % m_client->GetUserIDHybrid());
 
-			m_client->SetFileListRequested(0);
-			break;
+		theApp->browsemanager->Fail(m_client);
+		break;
 
-		default:
-			theStats::AddDownOverheadOther(size);
-			AddDebugLogLineN(logRemoteClient, CFormat("Edonkey packet: unknown opcode: %i %x from %s") % opcode % opcode % m_client->GetFullIP());
-			return false;
+	default:
+		theStats::AddDownOverheadOther(size);
+		AddDebugLogLineN(logRemoteClient,
+			CFormat("Edonkey packet: unknown opcode: %i %x from %s") % opcode % opcode %
+				m_client->GetFullIP());
+		return false;
 	}
 
 	return true;
 }
 
-
-bool CClientTCPSocket::ProcessExtPacket(const uint8_t* buffer, uint32 size, uint8 opcode)
+bool CClientTCPSocket::ProcessExtPacket(const uint8_t *buffer, uint32 size, uint8 opcode)
 {
-	#ifdef __PACKET_RECV_DUMP__
-	//printf("Rec: OPCODE %x \n",opcode);
-	DumpMem(buffer,size);
-	#endif
+#ifdef __PACKET_RECV_DUMP__
+	DumpMem(buffer, size);
+#endif
 
-	// 0.42e - except the catches on mem exception and file exception
 	if (!m_client) {
 		throw wxString("Unknown clients sends extended protocol packet");
 	}
 	/*
 	if (!client->CheckHandshakeFinished()) {
-		// Here comes an extended packet without finishing the handshake.
-		// IMHO, we should disconnect the client.
 		throw wxString("Client send extended packet before finishing handshake");
 	}
 	*/
-	switch(opcode) {
-		case OP_MULTIPACKET_EXT:
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_MULTIPACKET_EXT from " + m_client->GetFullIP());
-		/* fall through */
-		case OP_MULTIPACKET: {
-			if (opcode == OP_MULTIPACKET) AddDebugLogLineN( logRemoteClient, "Remote Client: OP_MULTIPACKET from " + m_client->GetFullIP() );
+	switch (opcode) {
+	case OP_MULTIPACKET_EXT:
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_MULTIPACKET_EXT from " + m_client->GetFullIP());
+	/* fall through */
+	case OP_MULTIPACKET: {
+		if (opcode == OP_MULTIPACKET)
+			AddDebugLogLineN(logRemoteClient,
+				"Remote Client: OP_MULTIPACKET from " + m_client->GetFullIP());
+
+		theStats::AddDownOverheadFileRequest(size);
+
+		if (m_client->IsBanned()) {
+			break;
+		}
 
-			theStats::AddDownOverheadFileRequest(size);
+		if (!m_client->CheckHandshakeFinished()) {
+			throw wxString("Client send OP_MULTIPACKET before finishing handshake");
+		}
 
-			if (m_client->IsBanned()) {
-				break;
-			}
+		CMemFile data_in(buffer, size);
+		CMD4Hash reqfilehash = data_in.ReadHash();
+		uint64 nSize = (opcode == OP_MULTIPACKET_EXT) ? data_in.ReadUInt64() : 0;
 
-			if (!m_client->CheckHandshakeFinished()) {
-				// Here comes an extended packet without finishing the handshake.
-				// IMHO, we should disconnect the client.
-				throw wxString("Client send OP_MULTIPACKET before finishing handshake");
+		bool file_not_found = false;
+		CKnownFile *reqfile = theApp->sharedfiles->GetFileByID(reqfilehash);
+		if (reqfile == NULL) {
+			reqfile = theApp->downloadqueue->GetFileByID(reqfilehash);
+			if (!(reqfile != NULL && reqfile->GetFileSize() > PARTSIZE)) {
+				AddDebugLogLineN(
+					logRemoteClient, "Remote client asked for a non-shared file");
+				file_not_found = true;
 			}
+		}
 
-			CMemFile data_in(buffer, size);
-			CMD4Hash reqfilehash = data_in.ReadHash();
-			uint64 nSize = (opcode == OP_MULTIPACKET_EXT) ? data_in.ReadUInt64() : 0;
+		if (!file_not_found && reqfile->IsLargeFile() && !m_client->SupportsLargeFiles()) {
+			AddDebugLogLineN(logRemoteClient,
+				"Remote client asked for a large file but doesn't support them");
+			file_not_found = true;
+		}
 
-			bool file_not_found = false;
-			CKnownFile* reqfile = theApp->sharedfiles->GetFileByID(reqfilehash);
-			if ( reqfile == NULL ){
-				reqfile = theApp->downloadqueue->GetFileByID(reqfilehash);
-				if ( !( reqfile != NULL && reqfile->GetFileSize() > PARTSIZE ) ) {
-					AddDebugLogLineN(logRemoteClient, "Remote client asked for a non-shared file");
-					file_not_found = true;
-				}
-			}
+		if (!file_not_found && nSize && (reqfile->GetFileSize() != nSize)) {
+			AddDebugLogLineN(
+				logRemoteClient, "Remote client asked for a file but specified wrong size");
+			file_not_found = true;
+		}
 
-			if (!file_not_found && reqfile->IsLargeFile() && !m_client->SupportsLargeFiles()) {
-				AddDebugLogLineN(logRemoteClient, "Remote client asked for a large file but doesn't support them");
-				file_not_found = true;
-			}
+		if (file_not_found) {
+			CPacket *replypacket = new CPacket(OP_FILEREQANSNOFIL, 16, OP_EDONKEYPROT);
+			replypacket->Copy16ToDataBuffer(reqfilehash.GetHash());
+			theStats::AddUpOverheadFileRequest(replypacket->GetPacketSize());
+			AddDebugLogLineN(logLocalClient,
+				"Local Client: OP_FILEREQANSNOFIL to " + m_client->GetFullIP());
+			SendPacket(replypacket, true);
+			break;
+		}
 
-			if (!file_not_found && nSize && (reqfile->GetFileSize() != nSize)) {
-				AddDebugLogLineN(logRemoteClient, "Remote client asked for a file but specified wrong size");
-				file_not_found = true;
+		if (!m_client->GetWaitStartTime()) {
+			m_client->SetWaitStartTime();
+		}
+		// if we are downloading this file, this could be a new source
+		// no passive adding of files with only one part
+		if (reqfile->IsPartFile() && reqfile->GetFileSize() > PARTSIZE) {
+			if (thePrefs::GetMaxSourcePerFile() >
+				static_cast<CPartFile *>(reqfile)->GetSourceCount()) {
+				theApp->downloadqueue->CheckAndAddKnownSource(
+					static_cast<CPartFile *>(reqfile), m_client);
 			}
-
-			if (file_not_found) {
-				CPacket* replypacket = new CPacket(OP_FILEREQANSNOFIL, 16, OP_EDONKEYPROT);
-				replypacket->Copy16ToDataBuffer(reqfilehash.GetHash());
-				theStats::AddUpOverheadFileRequest(replypacket->GetPacketSize());
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_FILEREQANSNOFIL to " + m_client->GetFullIP() );
-				SendPacket(replypacket, true);
-				break;
+		}
+		if (m_client->GetUploadFileID() != reqfilehash) {
+			m_client->SetCommentDirty();
+		}
+		m_client->SetUploadFileID(reqfile);
+		CMemFile data_out(128);
+		data_out.WriteHash(reqfile->GetFileHash());
+		while (data_in.GetLength() - data_in.GetPosition()) {
+			if (!m_client) {
+				throw wxString("Client suddenly disconnected");
 			}
+			uint8 opcode_in = data_in.ReadUInt8();
+			switch (opcode_in) {
+			case OP_REQUESTFILENAME: {
+				AddDebugLogLineN(logRemoteClient,
+					"Remote Client: OP_MULTIPACKET has OP_REQUESTFILENAME");
+				m_client->ProcessExtendedInfo(&data_in, reqfile);
+				data_out.WriteUInt8(OP_REQFILENAMEANSWER);
 
-			if (!m_client->GetWaitStartTime()) {
-				m_client->SetWaitStartTime();
+				// Since it's for somebody else to see, we need to send the prettified
+				// filename, rather than the (possibly) mangled actual filename
+				data_out.WriteString(
+					reqfile->GetFileName().GetPrintable(), m_client->GetUnicodeSupport());
+				break;
 			}
-			// if we are downloading this file, this could be a new source
-			// no passive adding of files with only one part
-			if (reqfile->IsPartFile() && reqfile->GetFileSize() > PARTSIZE) {
-				if (thePrefs::GetMaxSourcePerFile() > static_cast<CPartFile*>(reqfile)->GetSourceCount()) {
-					theApp->downloadqueue->CheckAndAddKnownSource(static_cast<CPartFile*>(reqfile), m_client);
+			case OP_AICHFILEHASHREQ: {
+				AddDebugLogLineN(logRemoteClient,
+					"Remote Client: OP_MULTIPACKET has OP_AICHFILEHASHANS");
+				if (m_client->IsSupportingAICH() &&
+					reqfile->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE &&
+					reqfile->GetAICHHashset()->HasValidMasterHash()) {
+					data_out.WriteUInt8(OP_AICHFILEHASHANS);
+					reqfile->GetAICHHashset()->GetMasterHash().Write(&data_out);
 				}
+				break;
 			}
-			// check to see if this is a new file they are asking for
-			if (m_client->GetUploadFileID() != reqfilehash) {
-				m_client->SetCommentDirty();
+			case OP_SETREQFILEID: {
+				AddDebugLogLineN(
+					logRemoteClient, "Remote Client: OP_MULTIPACKET has OP_SETREQFILEID");
+				data_out.WriteUInt8(OP_FILESTATUS);
+				if (reqfile->IsPartFile()) {
+					static_cast<CPartFile *>(reqfile)->WritePartStatus(&data_out);
+				} else {
+					data_out.WriteUInt16(0);
+				}
+				break;
 			}
-			m_client->SetUploadFileID(reqfile);
-			CMemFile data_out(128);
-			data_out.WriteHash(reqfile->GetFileHash());
-			while(data_in.GetLength()-data_in.GetPosition()) {
-				if (!m_client) {
-					throw wxString("Client suddenly disconnected");
+			// We still send the source packet separately..
+			// We could send it within this packet.. If agreeded, I will fix it..
+			case OP_REQUESTSOURCES2:
+			case OP_REQUESTSOURCES: {
+				AddDebugLogLineN(logRemoteClient,
+					"Remote Client: OP_MULTIPACKET has OP_REQUESTSOURCES(2)");
+				uint8 byRequestedVersion = 0;
+				uint16 byRequestedOptions = 0;
+				if (opcode_in ==
+					OP_REQUESTSOURCES2) { // SX2 requests contains additional data
+					byRequestedVersion = data_in.ReadUInt8();
+					byRequestedOptions = data_in.ReadUInt16();
 				}
-				uint8 opcode_in = data_in.ReadUInt8();
-				switch(opcode_in) {
-					case OP_REQUESTFILENAME: {
-						AddDebugLogLineN( logRemoteClient, "Remote Client: OP_MULTIPACKET has OP_REQUESTFILENAME" );
-						m_client->ProcessExtendedInfo(&data_in, reqfile);
-						data_out.WriteUInt8(OP_REQFILENAMEANSWER);
-
-						// Since it's for somebody else to see, we need to send the prettified
-						// filename, rather than the (possibly) mangled actual filename
-						data_out.WriteString(reqfile->GetFileName().GetPrintable(), m_client->GetUnicodeSupport());
-						break;
-					}
-					case OP_AICHFILEHASHREQ: {
-						AddDebugLogLineN( logRemoteClient, "Remote Client: OP_MULTIPACKET has OP_AICHFILEHASHANS" );
-						if (m_client->IsSupportingAICH() && reqfile->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE
-							&& reqfile->GetAICHHashset()->HasValidMasterHash())
-						{
-							data_out.WriteUInt8(OP_AICHFILEHASHANS);
-							reqfile->GetAICHHashset()->GetMasterHash().Write(&data_out);
-						}
-						break;
-					}
-					case OP_SETREQFILEID: {
-						AddDebugLogLineN( logRemoteClient, "Remote Client: OP_MULTIPACKET has OP_SETREQFILEID" );
-						data_out.WriteUInt8(OP_FILESTATUS);
-						if (reqfile->IsPartFile()) {
-							static_cast<CPartFile*>(reqfile)->WritePartStatus(&data_out);
-						} else {
-							data_out.WriteUInt16(0);
-						}
-						break;
-					}
-					//We still send the source packet separately..
-					//We could send it within this packet.. If agreeded, I will fix it..
-					case OP_REQUESTSOURCES2:
-					case OP_REQUESTSOURCES: {
-						AddDebugLogLineN( logRemoteClient, "Remote Client: OP_MULTIPACKET has OP_REQUESTSOURCES(2)" );
-						uint8 byRequestedVersion = 0;
-						uint16 byRequestedOptions = 0;
-						if (opcode_in == OP_REQUESTSOURCES2){ // SX2 requests contains additional data
-							byRequestedVersion = data_in.ReadUInt8();
-							byRequestedOptions = data_in.ReadUInt16();
-						}
 
-						//Although this shouldn't happen, it's a just in case to any Mods that mess with version numbers.
-
-						if (byRequestedVersion > 0 || m_client->GetSourceExchange1Version() > 1) {
-							uint64 dwTimePassed = ::GetTickCount64() - m_client->GetLastSrcReqTime() + CONNECTION_LATENCY;
-							bool bNeverAskedBefore = m_client->GetLastSrcReqTime() == 0;
-							if(
-									//if not complete and file is rare
-									(    reqfile->IsPartFile()
-									&& (bNeverAskedBefore || dwTimePassed > SOURCECLIENTREASKS)
-									&& static_cast<CPartFile*>(reqfile)->GetSourceCount() <= RARE_FILE
-									) ||
-									//OR if file is not rare or if file is complete
-									( (bNeverAskedBefore || dwTimePassed > SOURCECLIENTREASKS * MINCOMMONPENALTY) )
-									)
-							{
-								m_client->SetLastSrcReqTime();
-								CPacket* tosend = reqfile->CreateSrcInfoPacket(m_client, byRequestedVersion, byRequestedOptions);
-								if(tosend) {
-									theStats::AddUpOverheadSourceExchange(tosend->GetPacketSize());
-									AddDebugLogLineN( logLocalClient, "Local Client: OP_ANSWERSOURCES to " + m_client->GetFullIP() );
-									SendPacket(tosend, true);
-								}
-							}
+				// Although this shouldn't happen, it's a just in case to any Mods that mess
+				// with version numbers.
+
+				if (byRequestedVersion > 0 || m_client->GetSourceExchange1Version() > 1) {
+					uint64 dwTimePassed = ::GetTickCount64() -
+							      m_client->GetLastSrcReqTime() +
+							      CONNECTION_LATENCY;
+					bool bNeverAskedBefore = m_client->GetLastSrcReqTime() == 0;
+					if (
+						// if not complete and file is rare
+						(reqfile->IsPartFile() &&
+							(bNeverAskedBefore ||
+								dwTimePassed > SOURCECLIENTREASKS) &&
+							static_cast<CPartFile *>(reqfile)->GetSourceCount() <=
+								RARE_FILE) ||
+						// OR if file is not rare or if file is complete
+						((bNeverAskedBefore ||
+							dwTimePassed >
+								SOURCECLIENTREASKS * MINCOMMONPENALTY))) {
+						m_client->SetLastSrcReqTime();
+						CPacket *tosend = reqfile->CreateSrcInfoPacket(
+							m_client, byRequestedVersion, byRequestedOptions);
+						if (tosend) {
+							theStats::AddUpOverheadSourceExchange(
+								tosend->GetPacketSize());
+							AddDebugLogLineN(logLocalClient,
+								"Local Client: OP_ANSWERSOURCES to " +
+									m_client->GetFullIP());
+							SendPacket(tosend, true);
 						}
-						break;
 					}
 				}
-
+				break;
 			}
-			if( data_out.GetLength() > 16 ) {
-				CPacket* reply = new CPacket(data_out, OP_EMULEPROT, OP_MULTIPACKETANSWER);
-				theStats::AddUpOverheadFileRequest(reply->GetPacketSize());
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_MULTIPACKETANSWER to " + m_client->GetFullIP() );
-				SendPacket(reply, true);
 			}
-			break;
 		}
+		if (data_out.GetLength() > 16) {
+			CPacket *reply = new CPacket(data_out, OP_EMULEPROT, OP_MULTIPACKETANSWER);
+			theStats::AddUpOverheadFileRequest(reply->GetPacketSize());
+			AddDebugLogLineN(logLocalClient,
+				"Local Client: OP_MULTIPACKETANSWER to " + m_client->GetFullIP());
+			SendPacket(reply, true);
+		}
+		break;
+	}
 
-		case OP_MULTIPACKETANSWER: {	// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_MULTIPACKETANSWER from " + m_client->GetFullIP() );
-
-			theStats::AddDownOverheadFileRequest(size);
+	case OP_MULTIPACKETANSWER: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_MULTIPACKETANSWER from " + m_client->GetFullIP());
 
-			if (m_client->IsBanned()) {
-				break;
-			}
+		theStats::AddDownOverheadFileRequest(size);
 
-			if (m_client->GetKadPort() && m_client->GetKadVersion() > 1) {
-				Kademlia::CKademlia::Bootstrap(wxUINT32_SWAP_ALWAYS(m_client->GetIP()), m_client->GetKadPort());
-			}
+		if (m_client->IsBanned()) {
+			break;
+		}
 
-			if (!m_client->CheckHandshakeFinished()) {
-				// Here comes an extended packet without finishing the handshake.
-				// IMHO, we should disconnect the client.
-				throw wxString("Client send OP_MULTIPACKETANSWER before finishing handshake");
-			}
+		// See ProcessHelloTypePacket(): zero is not an address Kad can bootstrap
+		// from, and asking it to burns the throttle that paces real attempts.
+		if (m_client->GetIP() != 0 && m_client->GetKadPort() && m_client->GetKadVersion() > 1) {
+			Kademlia::CKademlia::Bootstrap(
+				wxUINT32_SWAP_ALWAYS(m_client->GetIP()), m_client->GetKadPort());
+		}
 
-			CMemFile data_in(buffer, size);
-			CMD4Hash reqfilehash = data_in.ReadHash();
-			const CPartFile *reqfile = theApp->downloadqueue->GetFileByID(reqfilehash);
-			//Make sure we are downloading this file.
-			if ( !reqfile ) {
-				throw wxString(" Wrong File ID: (OP_MULTIPACKETANSWER; reqfile==NULL)");
-			}
-			if ( !m_client->GetRequestFile() ) {
+		if (!m_client->CheckHandshakeFinished()) {
+			throw wxString("Client send OP_MULTIPACKETANSWER before finishing handshake");
+		}
 
-				throw wxString(" Wrong File ID: OP_MULTIPACKETANSWER; client->reqfile==NULL)");
+		CMemFile data_in(buffer, size);
+		CMD4Hash reqfilehash = data_in.ReadHash();
+		const CPartFile *reqfile = theApp->downloadqueue->GetFileByID(reqfilehash);
+		if (!reqfile) {
+			throw wxString(" Wrong File ID: (OP_MULTIPACKETANSWER; reqfile==NULL)");
+		}
+		if (!m_client->GetRequestFile()) {
+
+			throw wxString(" Wrong File ID: OP_MULTIPACKETANSWER; client->reqfile==NULL)");
+		}
+		if (reqfile != m_client->GetRequestFile()) {
+			throw wxString(" Wrong File ID: OP_MULTIPACKETANSWER; reqfile!=client->reqfile)");
+		}
+		while (data_in.GetLength() - data_in.GetPosition()) {
+			// Some of the cases down there can actually send a packet and lose the client
+			if (!m_client) {
+				throw wxString("Client suddenly disconnected");
 			}
-			if (reqfile != m_client->GetRequestFile()) {
-				throw wxString(" Wrong File ID: OP_MULTIPACKETANSWER; reqfile!=client->reqfile)");
+			uint8 opcode_in = data_in.ReadUInt8();
+			switch (opcode_in) {
+			case OP_REQFILENAMEANSWER: {
+				if (!m_client) {
+					throw wxString("Client suddenly disconnected");
+				} else {
+					m_client->ProcessFileInfo(&data_in, reqfile);
+				}
+				break;
 			}
-			while (data_in.GetLength()-data_in.GetPosition()) {
-				// Some of the cases down there can actually send a packet and lose the client
+			case OP_FILESTATUS: {
 				if (!m_client) {
 					throw wxString("Client suddenly disconnected");
+				} else {
+					m_client->ProcessFileStatus(false, &data_in, reqfile);
 				}
-				uint8 opcode_in = data_in.ReadUInt8();
-				switch(opcode_in) {
-					case OP_REQFILENAMEANSWER: {
-						if (!m_client) {
-							throw wxString("Client suddenly disconnected");
-						} else {
-							m_client->ProcessFileInfo(&data_in, reqfile);
-						}
-						break;
-					}
-					case OP_FILESTATUS: {
-						if (!m_client) {
-							throw wxString("Client suddenly disconnected");
-						} else {
-							m_client->ProcessFileStatus(false, &data_in, reqfile);
-						}
-						break;
-					}
-					case OP_AICHFILEHASHANS: {
-						if (!m_client) {
-							throw wxString("Client suddenly disconnected");
-						} else {
-							m_client->ProcessAICHFileHash(&data_in, reqfile);
-						}
-						break;
-					}
+				break;
+			}
+			case OP_AICHFILEHASHANS: {
+				if (!m_client) {
+					throw wxString("Client suddenly disconnected");
+				} else {
+					m_client->ProcessAICHFileHash(&data_in, reqfile);
 				}
+				break;
+			}
 			}
-
-			break;
 		}
 
-		case OP_EMULEINFO: {	// 0.43b
-			theStats::AddDownOverheadOther(size);
-
-			if (!m_client->ProcessMuleInfoPacket(buffer, size)) {
-				AddDebugLogLineN( logRemoteClient, "Remote Client: OP_EMULEINFO from " + m_client->GetFullIP() );
+		break;
+	}
 
-				// If it's not a OS Info packet, is an old client
-				// start secure identification, if
-				//  - we have received eD2K and eMule info (old eMule)
-				if (m_client->GetInfoPacketsReceived() == IP_BOTH) {
-					m_client->InfoPacketsReceived();
-				}
-				m_client->SendMuleInfoPacket(true);
-			} else {
-				AddDebugLogLineN( logRemoteClient, "Remote Client: OP_EMULEINFO is an OS_INFO" );
-			}
-			break;
-		}
-		case OP_EMULEINFOANSWER: {	// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_EMULEINFOANSWER from " + m_client->GetFullIP() );
-			theStats::AddDownOverheadOther(size);
+	case OP_EMULEINFO: { // 0.43b
+		theStats::AddDownOverheadOther(size);
 
-			m_client->ProcessMuleInfoPacket(buffer, size);
-			// start secure identification, if
-			//  - we have received eD2K and eMule info (old eMule)
+		if (!m_client->ProcessMuleInfoPacket(buffer, size)) {
+			AddDebugLogLineN(
+				logRemoteClient, "Remote Client: OP_EMULEINFO from " + m_client->GetFullIP());
 
+			// Not an OS Info packet, so an old client. Start secure identification if
+			// we have received both eD2K and eMule info (old eMule).
 			if (m_client->GetInfoPacketsReceived() == IP_BOTH) {
 				m_client->InfoPacketsReceived();
 			}
-
-			break;
+			m_client->SendMuleInfoPacket(true);
+		} else {
+			AddDebugLogLineN(logRemoteClient, "Remote Client: OP_EMULEINFO is an OS_INFO");
 		}
+		break;
+	}
+	case OP_EMULEINFOANSWER: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_EMULEINFOANSWER from " + m_client->GetFullIP());
+		theStats::AddDownOverheadOther(size);
 
-		case OP_SECIDENTSTATE:{		// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_SECIDENTSTATE from " + m_client->GetFullIP() );
+		m_client->ProcessMuleInfoPacket(buffer, size);
+		// start secure identification, if
+		//  - we have received eD2K and eMule info (old eMule)
 
-			if (!m_client->CheckHandshakeFinished()) {
-				// Here comes an extended packet without finishing the handshake.
-				// IMHO, we should disconnect the client.
-				throw wxString("Client send OP_SECIDENTSTATE before finishing handshake");
-			}
-			m_client->ProcessSecIdentStatePacket(buffer, size);
-			// ProcessSecIdentStatePacket() might cause the socket to die, so check
-			if (m_client) {
-				int SecureIdentState = m_client->GetSecureIdentState();
-				if (SecureIdentState == IS_SIGNATURENEEDED) {
-					m_client->SendSignaturePacket();
-				} else if (SecureIdentState == IS_KEYANDSIGNEEDED) {
-					m_client->SendPublicKeyPacket();
-					// SendPublicKeyPacket() might cause the socket to die, so check
-					if ( m_client ) {
-						m_client->SendSignaturePacket();
-					}
-				}
-			}
-			break;
+		if (m_client->GetInfoPacketsReceived() == IP_BOTH) {
+			m_client->InfoPacketsReceived();
 		}
 
-		case OP_PUBLICKEY: {		// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_PUBLICKEY from " + m_client->GetFullIP() );
+		break;
+	}
 
-			if (m_client->IsBanned() ){
-				break;
-			}
+	case OP_SECIDENTSTATE: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_SECIDENTSTATE from " + m_client->GetFullIP());
 
-			if (!m_client->CheckHandshakeFinished()) {
-				// Here comes an extended packet without finishing the handshake.
-				// IMHO, we should disconnect the client.
-				throw wxString("Client send OP_PUBLICKEY before finishing handshake");
+		if (!m_client->CheckHandshakeFinished()) {
+			throw wxString("Client send OP_SECIDENTSTATE before finishing handshake");
+		}
+		m_client->ProcessSecIdentStatePacket(buffer, size);
+		// ProcessSecIdentStatePacket() might cause the socket to die, so check
+		if (m_client) {
+			int SecureIdentState = m_client->GetSecureIdentState();
+			if (SecureIdentState == IS_SIGNATURENEEDED) {
+				m_client->SendSignaturePacket();
+			} else if (SecureIdentState == IS_KEYANDSIGNEEDED) {
+				m_client->SendPublicKeyPacket();
+				// SendPublicKeyPacket() might cause the socket to die, so check
+				if (m_client) {
+					m_client->SendSignaturePacket();
+				}
 			}
-
-			m_client->ProcessPublicKeyPacket(buffer, size);
-			break;
 		}
-		case OP_SIGNATURE:{			// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_SIGNATURE from " + m_client->GetFullIP() );
+		break;
+	}
 
-			if (!m_client->CheckHandshakeFinished()) {
-				// Here comes an extended packet without finishing the handshake.
-				// IMHO, we should disconnect the client.
-				throw wxString("Client send OP_COMPRESSEDPART before finishing handshake");
-			}
+	case OP_PUBLICKEY: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_PUBLICKEY from " + m_client->GetFullIP());
 
-			m_client->ProcessSignaturePacket(buffer, size);
+		if (m_client->IsBanned()) {
 			break;
 		}
-		case OP_SENDINGPART_I64:
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_SENDINGPART_I64 from " + m_client->GetFullIP() );
-		/* fall through */
-		case OP_COMPRESSEDPART_I64:
-			if (opcode == OP_COMPRESSEDPART_I64) AddDebugLogLineN( logRemoteClient, "Remote Client: OP_COMPRESSEDPART_I64 from " + m_client->GetFullIP() );
-		/* fall through */
-		case OP_COMPRESSEDPART: {	// 0.47a
-			if (opcode == OP_COMPRESSEDPART) AddDebugLogLineN( logRemoteClient, "Remote Client: OP_COMPRESSEDPART from " + m_client->GetFullIP() );
-
-			if (!m_client->CheckHandshakeFinished()) {
-				// Here comes an extended packet without finishing the handshake.
-				// IMHO, we should disconnect the client.
-				throw wxString("Client send OP_COMPRESSEDPART before finishing handshake");
-			}
-
-			if (m_client->GetRequestFile() && !m_client->GetRequestFile()->IsStopped() && (m_client->GetRequestFile()->GetStatus()==PS_READY || m_client->GetRequestFile()->GetStatus()==PS_EMPTY)) {
 
-				m_client->ProcessBlockPacket(buffer, size, (opcode != OP_SENDINGPART_I64), (opcode == OP_COMPRESSEDPART_I64) || (opcode == OP_SENDINGPART_I64));
+		if (!m_client->CheckHandshakeFinished()) {
+			throw wxString("Client send OP_PUBLICKEY before finishing handshake");
+		}
 
-				if (m_client && (
-					m_client->GetRequestFile()->IsStopped() ||
-					m_client->GetRequestFile()->GetStatus() == PS_PAUSED ||
-					m_client->GetRequestFile()->GetStatus() == PS_ERROR)) {
-					if (!m_client->GetSentCancelTransfer()) {
-						CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
-						theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-						AddDebugLogLineN( logLocalClient, "Local Client: OP_CANCELTRANSFER to " + m_client->GetFullIP() );
-						m_client->SendPacket(packet,true,true);
+		m_client->ProcessPublicKeyPacket(buffer, size);
+		break;
+	}
+	case OP_SIGNATURE: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_SIGNATURE from " + m_client->GetFullIP());
 
-						if (m_client) {
-							m_client->SetSentCancelTransfer(1);
-						}
-					}
+		if (!m_client->CheckHandshakeFinished()) {
+			throw wxString("Client send OP_COMPRESSEDPART before finishing handshake");
+		}
 
-					if ( m_client ) {
-						m_client->SetDownloadState(m_client->GetRequestFile()->IsStopped() ? DS_NONE : DS_ONQUEUE);
-					}
-				}
-			} else {
+		m_client->ProcessSignaturePacket(buffer, size);
+		break;
+	}
+	case OP_SENDINGPART_I64:
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_SENDINGPART_I64 from " + m_client->GetFullIP());
+	/* fall through */
+	case OP_COMPRESSEDPART_I64:
+		if (opcode == OP_COMPRESSEDPART_I64)
+			AddDebugLogLineN(logRemoteClient,
+				"Remote Client: OP_COMPRESSEDPART_I64 from " + m_client->GetFullIP());
+	/* fall through */
+	case OP_COMPRESSEDPART: { // 0.47a
+		if (opcode == OP_COMPRESSEDPART)
+			AddDebugLogLineN(logRemoteClient,
+				"Remote Client: OP_COMPRESSEDPART from " + m_client->GetFullIP());
+
+		if (!m_client->CheckHandshakeFinished()) {
+			throw wxString("Client send OP_COMPRESSEDPART before finishing handshake");
+		}
+
+		if (m_client->GetRequestFile() && !m_client->GetRequestFile()->IsStopped() &&
+			(m_client->GetRequestFile()->GetStatus() == PS_READY ||
+				m_client->GetRequestFile()->GetStatus() == PS_EMPTY)) {
+
+			m_client->ProcessBlockPacket(buffer,
+				size,
+				(opcode != OP_SENDINGPART_I64),
+				(opcode == OP_COMPRESSEDPART_I64) || (opcode == OP_SENDINGPART_I64));
+
+			if (m_client && (m_client->GetRequestFile()->IsStopped() ||
+						m_client->GetRequestFile()->GetStatus() == PS_PAUSED ||
+						m_client->GetRequestFile()->GetStatus() == PS_ERROR)) {
 				if (!m_client->GetSentCancelTransfer()) {
-					CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
+					CPacket *packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 					theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-					AddDebugLogLineN( logLocalClient, "Local Client: OP_CANCELTRANSFER to " + m_client->GetFullIP() );
-					m_client->SendPacket(packet,true,true);
+					AddDebugLogLineN(logLocalClient,
+						"Local Client: OP_CANCELTRANSFER to " +
+							m_client->GetFullIP());
+					m_client->SendPacket(packet, true, true);
 
-					if ( m_client ) {
+					if (m_client) {
 						m_client->SetSentCancelTransfer(1);
 					}
 				}
 
-				if ( m_client ) {
-					m_client->SetDownloadState((m_client->GetRequestFile()==NULL || m_client->GetRequestFile()->IsStopped()) ? DS_NONE : DS_ONQUEUE);
+				if (m_client) {
+					m_client->SetDownloadState(m_client->GetRequestFile()->IsStopped()
+									   ? DS_NONE
+									   : DS_ONQUEUE);
 				}
 			}
-			break;
+		} else {
+			if (!m_client->GetSentCancelTransfer()) {
+				CPacket *packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
+				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
+				AddDebugLogLineN(logLocalClient,
+					"Local Client: OP_CANCELTRANSFER to " + m_client->GetFullIP());
+				m_client->SendPacket(packet, true, true);
+
+				if (m_client) {
+					m_client->SetSentCancelTransfer(1);
+				}
+			}
+
+			if (m_client) {
+				m_client->SetDownloadState((m_client->GetRequestFile() == NULL ||
+								   m_client->GetRequestFile()->IsStopped())
+								   ? DS_NONE
+								   : DS_ONQUEUE);
+			}
 		}
-		case OP_REQUESTPARTS_I64: {
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_REQUESTPARTS_I64 from " + m_client->GetFullIP()  );
+		break;
+	}
+	case OP_REQUESTPARTS_I64: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_REQUESTPARTS_I64 from " + m_client->GetFullIP());
 
-			theStats::AddDownOverheadFileRequest(size);
+		theStats::AddDownOverheadFileRequest(size);
 
-			m_client->ProcessRequestPartsPacket(buffer, size, true);
+		m_client->ProcessRequestPartsPacket(buffer, size, true);
 
-			break;
+		break;
+	}
+	case OP_QUEUERANKING: { // 0.43b
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_QUEUERANKING from " + m_client->GetFullIP());
+
+		theStats::AddDownOverheadOther(size);
+
+		if (!m_client->CheckHandshakeFinished()) {
+			throw wxString("Client send OP_QUEUERANKING before finishing handshake");
 		}
-		case OP_QUEUERANKING: {		// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_QUEUERANKING from " + m_client->GetFullIP()  );
 
-			theStats::AddDownOverheadOther(size);
+		if (size != 12) {
+			throw wxString("Invalid size (OP_QUEUERANKING)");
+		}
 
-			if (!m_client->CheckHandshakeFinished()) {
-				// Here comes an extended packet without finishing the handshake.
-				// IMHO, we should disconnect the client.
-				throw wxString("Client send OP_QUEUERANKING before finishing handshake");
-			}
+		uint16 newrank = PeekUInt16(buffer);
+		m_client->SetRemoteQueueFull(false);
+		m_client->SetRemoteQueueRank(newrank);
+		break;
+	}
+	case OP_REQUESTSOURCES2:
+	case OP_REQUESTSOURCES: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_REQUESTSOURCES from " + m_client->GetFullIP());
 
-			if (size != 12) {
-				throw wxString("Invalid size (OP_QUEUERANKING)");
-			}
+		theStats::AddDownOverheadSourceExchange(size);
 
-			uint16 newrank = PeekUInt16(buffer);
-			m_client->SetRemoteQueueFull(false);
-			m_client->SetRemoteQueueRank(newrank);
-			break;
+		if (!m_client->CheckHandshakeFinished()) {
+			throw wxString("Client send OP_REQUESTSOURCES before finishing handshake");
 		}
-		case OP_REQUESTSOURCES2:
-		case OP_REQUESTSOURCES:{
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_REQUESTSOURCES from " + m_client->GetFullIP()  );
-
-			theStats::AddDownOverheadSourceExchange(size);
 
-			if (!m_client->CheckHandshakeFinished()) {
-				// Here comes an extended packet without finishing the handshake.
-				// IMHO, we should disconnect the client.
-				throw wxString("Client send OP_REQUESTSOURCES before finishing handshake");
-			}
+		uint8 byRequestedVersion = 0;
+		uint16 byRequestedOptions = 0;
+		CMemFile data_in(buffer, size);
+		if (opcode == OP_REQUESTSOURCES2) { // SX2 requests contains additional data
+			byRequestedVersion = data_in.ReadUInt8();
+			byRequestedOptions = data_in.ReadUInt16();
+		}
 
-			uint8 byRequestedVersion = 0;
-			uint16 byRequestedOptions = 0;
-			CMemFile data_in(buffer, size);
-			if (opcode == OP_REQUESTSOURCES2){ // SX2 requests contains additional data
-				byRequestedVersion = data_in.ReadUInt8();
-				byRequestedOptions = data_in.ReadUInt16();
+		if (byRequestedVersion > 0 || m_client->GetSourceExchange1Version() >= 1) {
+			if (size != 16) {
+				throw wxString("Invalid size (OP_QUEUERANKING)");
 			}
-
-			if (byRequestedVersion > 0 || m_client->GetSourceExchange1Version() >= 1) {
-				if(size != 16) {
-					throw wxString("Invalid size (OP_QUEUERANKING)");
-				}
-				//first check shared file list, then download list
-				const CMD4Hash fileID(buffer);
-				CKnownFile* file = theApp->sharedfiles->GetFileByID(fileID);
-				if(!file) {
-					file = theApp->downloadqueue->GetFileByID(fileID);
-				}
-				if(file) {
-					// There are some clients which do not follow the correct protocol procedure of sending
-					// the sequence OP_REQUESTFILENAME, OP_SETREQFILEID, OP_REQUESTSOURCES. If those clients
-					// are doing this, they will not get the optimal set of sources which we could offer if
-					// they would follow the above noted protocol sequence. They better do it the right way
-					// or they will get just a random set of sources because we do not know their download
-					// part status which may get cleared with the call of 'SetUploadFileID'.
-					m_client->SetUploadFileID(file);
-
-					uint64 dwTimePassed = ::GetTickCount64() - m_client->GetLastSrcReqTime() + CONNECTION_LATENCY;
-					bool bNeverAskedBefore = m_client->GetLastSrcReqTime() == 0;
-					if(
-					//if not complete and file is rare, allow once every 40 minutes
-					( file->IsPartFile() &&
-					static_cast<CPartFile*>(file)->GetSourceCount() <= RARE_FILE &&
-					(bNeverAskedBefore || dwTimePassed > SOURCECLIENTREASKS)
-					) ||
-					//OR if file is not rare or if file is complete, allow every 90 minutes
-					( (bNeverAskedBefore || dwTimePassed > SOURCECLIENTREASKS * MINCOMMONPENALTY) )
-					)
-					{
-						m_client->SetLastSrcReqTime();
-						CPacket* tosend = file->CreateSrcInfoPacket(m_client, byRequestedVersion, byRequestedOptions);
-						if(tosend) {
-							theStats::AddUpOverheadSourceExchange(tosend->GetPacketSize());
-							AddDebugLogLineN( logLocalClient, "Local Client: OP_ANSWERSOURCES to " + m_client->GetFullIP() );
-							SendPacket(tosend, true, true);
-						}
+			// first check shared file list, then download list
+			const CMD4Hash fileID(buffer);
+			CKnownFile *file = theApp->sharedfiles->GetFileByID(fileID);
+			if (!file) {
+				file = theApp->downloadqueue->GetFileByID(fileID);
+			}
+			if (file) {
+				// Some clients do not follow the OP_REQUESTFILENAME,
+				// OP_SETREQFILEID, OP_REQUESTSOURCES sequence. Those get a random
+				// set of sources rather than the optimal one, because we do not
+				// know their download part status -- which SetUploadFileID may
+				// clear.
+				m_client->SetUploadFileID(file);
+
+				uint64 dwTimePassed = ::GetTickCount64() - m_client->GetLastSrcReqTime() +
+						      CONNECTION_LATENCY;
+				bool bNeverAskedBefore = m_client->GetLastSrcReqTime() == 0;
+				if (
+					// if not complete and file is rare, allow once every 40 minutes
+					(file->IsPartFile() &&
+						static_cast<CPartFile *>(file)->GetSourceCount() <=
+							RARE_FILE &&
+						(bNeverAskedBefore || dwTimePassed > SOURCECLIENTREASKS)) ||
+					// OR if file is not rare or if file is complete, allow every 90
+					// minutes
+					((bNeverAskedBefore ||
+						dwTimePassed > SOURCECLIENTREASKS * MINCOMMONPENALTY))) {
+					m_client->SetLastSrcReqTime();
+					CPacket *tosend = file->CreateSrcInfoPacket(
+						m_client, byRequestedVersion, byRequestedOptions);
+					if (tosend) {
+						theStats::AddUpOverheadSourceExchange(
+							tosend->GetPacketSize());
+						AddDebugLogLineN(logLocalClient,
+							"Local Client: OP_ANSWERSOURCES to " +
+								m_client->GetFullIP());
+						SendPacket(tosend, true, true);
 					}
 				}
 			}
-			break;
 		}
-		case OP_ANSWERSOURCES: {
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_ANSWERSOURCES from " + m_client->GetFullIP()  );
+		break;
+	}
+	case OP_ANSWERSOURCES: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_ANSWERSOURCES from " + m_client->GetFullIP());
 
-			theStats::AddDownOverheadSourceExchange(size);
+		theStats::AddDownOverheadSourceExchange(size);
 
-			if (!m_client->CheckHandshakeFinished()) {
-				// Here comes an extended packet without finishing the handshake.
-				// IMHO, we should disconnect the client.
-				throw wxString("Client send OP_ANSWERSOURCES before finishing handshake");
-			}
+		if (!m_client->CheckHandshakeFinished()) {
+			throw wxString("Client send OP_ANSWERSOURCES before finishing handshake");
+		}
 
-			CMemFile data(buffer, size);
-			CMD4Hash hash = data.ReadHash();
-			CKnownFile* file = theApp->downloadqueue->GetFileByID(hash);
-			if(file){
-				if (file->IsPartFile()){
-					//set the client's answer time
-					m_client->SetLastSrcAnswerTime();
-					//and set the file's last answer time
-					static_cast<CPartFile*>(file)->SetLastAnsweredTime();
-					static_cast<CPartFile*>(file)->AddClientSources(&data, SF_SOURCE_EXCHANGE, m_client->GetSourceExchange1Version(), false, m_client);
-				}
+		CMemFile data(buffer, size);
+		CMD4Hash hash = data.ReadHash();
+		CKnownFile *file = theApp->downloadqueue->GetFileByID(hash);
+		if (file) {
+			if (file->IsPartFile()) {
+				m_client->SetLastSrcAnswerTime();
+				static_cast<CPartFile *>(file)->SetLastAnsweredTime();
+				static_cast<CPartFile *>(file)->AddClientSources(&data,
+					SF_SOURCE_EXCHANGE,
+					m_client->GetSourceExchange1Version(),
+					false,
+					m_client);
 			}
-			break;
 		}
-		case OP_ANSWERSOURCES2: {
-			//printf("Received OP_ANSWERSOURCES2\n");
-			theStats::AddDownOverheadSourceExchange(size);
+		break;
+	}
+	case OP_ANSWERSOURCES2: {
+		theStats::AddDownOverheadSourceExchange(size);
 
-			if (!m_client->CheckHandshakeFinished()) {
-				// Here comes an extended packet without finishing the handshake.
-				// IMHO, we should disconnect the client.
-				throw wxString("Client send OP_ANSWERSOURCES2 before finishing handshake");
-			}
+		if (!m_client->CheckHandshakeFinished()) {
+			throw wxString("Client send OP_ANSWERSOURCES2 before finishing handshake");
+		}
 
-			CMemFile data(buffer, size);
-			uint8 byVersion = data.ReadUInt8();
-			CMD4Hash hash = data.ReadHash();
-			CKnownFile* file = theApp->downloadqueue->GetFileByID(hash);
-			if (file){
-				if (file->IsPartFile()){
-					//set the client's answer time
-					m_client->SetLastSrcAnswerTime();
-					//and set the file's last answer time
-					static_cast<CPartFile*>(file)->SetLastAnsweredTime();
-					static_cast<CPartFile*>(file)->AddClientSources(&data, SF_SOURCE_EXCHANGE, byVersion, true, m_client);
-				}
+		CMemFile data(buffer, size);
+		uint8 byVersion = data.ReadUInt8();
+		CMD4Hash hash = data.ReadHash();
+		CKnownFile *file = theApp->downloadqueue->GetFileByID(hash);
+		if (file) {
+			if (file->IsPartFile()) {
+				m_client->SetLastSrcAnswerTime();
+				static_cast<CPartFile *>(file)->SetLastAnsweredTime();
+				static_cast<CPartFile *>(file)->AddClientSources(
+					&data, SF_SOURCE_EXCHANGE, byVersion, true, m_client);
 			}
-			break;
 		}
-		case OP_FILEDESC: {		// 0.43b
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_FILEDESC from " + m_client->GetFullIP()  );
+		break;
+	}
+	case OP_FILEDESC: { // 0.43b
+		AddDebugLogLineN(logRemoteClient, "Remote Client: OP_FILEDESC from " + m_client->GetFullIP());
 
-			theStats::AddDownOverheadFileRequest(size);
+		theStats::AddDownOverheadFileRequest(size);
 
-			if (!m_client->CheckHandshakeFinished()) {
-				// Here comes an extended packet without finishing the handshake.
-				// IMHO, we should disconnect the client.
-				throw wxString("Client send OP_FILEDESC before finishing handshake");
-			}
+		if (!m_client->CheckHandshakeFinished()) {
+			throw wxString("Client send OP_FILEDESC before finishing handshake");
+		}
 
-			m_client->ProcessMuleCommentPacket(buffer, size);
+		m_client->ProcessMuleCommentPacket(buffer, size);
+		break;
+	}
+
+	// Unsupported
+	case OP_REQUESTPREVIEW: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_REQUESTPREVIEW  from " + m_client->GetFullIP());
+		break;
+	}
+	// Unsupported
+	case OP_PREVIEWANSWER: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_PREVIEWANSWER from " + m_client->GetFullIP());
+		break;
+	}
+
+	case OP_PUBLICIP_ANSWER: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_PUBLICIP_ANSWER from " + m_client->GetFullIP());
+		theStats::AddDownOverheadOther(size);
+		m_client->ProcessPublicIPAnswer(buffer, size);
+		break;
+	}
+	case OP_PUBLICIP_REQ: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_PUBLICIP_REQ from " + m_client->GetFullIP());
+		theStats::AddDownOverheadOther(size);
+		// The answer carries four bytes, so a peer with no ed2k wire form has no
+		// answer to give. Zero is not one: it names nobody, and a peer that took it
+		// for its public address would advertise 0.0.0.0 to everyone else. Staying
+		// silent is what the field already means by absent.
+		if (m_client->GetIP() == 0) {
+			AddDebugLogLineN(logRemoteClient,
+				"Remote Client: OP_PUBLICIP_REQ unanswerable, no IPv4 form for " +
+					m_client->GetUserAddress().ToWxString());
 			break;
 		}
-
-		// Unsupported
-		case OP_REQUESTPREVIEW: {
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_REQUESTPREVIEW  from " + m_client->GetFullIP()  );
+		CPacket *pPacket = new CPacket(OP_PUBLICIP_ANSWER, 4, OP_EMULEPROT);
+		pPacket->CopyUInt32ToDataBuffer(m_client->GetIP());
+		theStats::AddUpOverheadOther(pPacket->GetPacketSize());
+		AddDebugLogLineN(
+			logLocalClient, "Local Client: OP_PUBLICIP_ANSWER to" + m_client->GetFullIP());
+		SendPacket(pPacket);
+		break;
+	}
+	case OP_AICHANSWER: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_AICHANSWER from " + m_client->GetFullIP());
+		theStats::AddDownOverheadOther(size);
+		m_client->ProcessAICHAnswer(buffer, size);
+		break;
+	}
+	case OP_AICHREQUEST: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_AICHREQUEST from " + m_client->GetFullIP());
+		theStats::AddDownOverheadOther(size);
+		// Each OP_AICHREQUEST triggers an O(N) walk of known2.met via ProcessAICHRequest ->
+		// CreatePartRecoveryData -> LoadHashSet. Unlimited, a hostile peer can hammer this
+		// with 16-byte packets and burn the seeder's disk and CPU, so treat repeats like
+		// the file-request paths.
+		m_client->CheckForAggressive();
+		if (m_client->IsBanned()) {
 			break;
 		}
-		// Unsupported
-		case OP_PREVIEWANSWER: {
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_PREVIEWANSWER from " + m_client->GetFullIP()  );
+		m_client->ProcessAICHRequest(buffer, size);
+		break;
+	}
+	case OP_AICHFILEHASHANS: {
+		// those should not be received normally, since we should only get those in MULTIPACKET
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_AICHFILEHASHANS from " + m_client->GetFullIP());
+		theStats::AddDownOverheadOther(size);
+		CMemFile data(buffer, size);
+		m_client->ProcessAICHFileHash(&data, NULL);
+		break;
+	}
+	case OP_AICHFILEHASHREQ: {
+		// those should not be received normally, since we should only get those in MULTIPACKET
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_AICHFILEHASHREQ from " + m_client->GetFullIP());
+		CMemFile data(buffer, size);
+		CMD4Hash hash = data.ReadHash();
+		CKnownFile *pPartFile = theApp->sharedfiles->GetFileByID(hash);
+		if (pPartFile == NULL) {
 			break;
 		}
 
-		case OP_PUBLICIP_ANSWER: {
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_PUBLICIP_ANSWER from " + m_client->GetFullIP()  );
-			theStats::AddDownOverheadOther(size);
-			m_client->ProcessPublicIPAnswer(buffer, size);
-			break;
+		if (m_client->IsSupportingAICH() &&
+			pPartFile->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE &&
+			pPartFile->GetAICHHashset()->HasValidMasterHash()) {
+			CMemFile data_out;
+			data_out.WriteHash(hash);
+			pPartFile->GetAICHHashset()->GetMasterHash().Write(&data_out);
+			CPacket *packet = new CPacket(data_out, OP_EMULEPROT, OP_AICHFILEHASHANS);
+			theStats::AddUpOverheadOther(packet->GetPacketSize());
+			AddDebugLogLineN(logLocalClient,
+				"Local Client: OP_AICHFILEHASHANS to" + m_client->GetFullIP());
+			SendPacket(packet);
 		}
-		case OP_PUBLICIP_REQ: {
-			AddDebugLogLineN( logRemoteClient, "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());
-			AddDebugLogLineN( logLocalClient, "Local Client: OP_PUBLICIP_ANSWER to" + m_client->GetFullIP());
-			SendPacket(pPacket);
+		break;
+	}
+	case OP_CALLBACK: {
+		AddDebugLogLineN(logRemoteClient, "Remote Client: OP_CALLBACK from " + m_client->GetFullIP());
+		theStats::AddDownOverheadFileRequest(size);
+		if (!Kademlia::CKademlia::IsRunning()) {
 			break;
 		}
-		case OP_AICHANSWER: {
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_AICHANSWER from " + m_client->GetFullIP()  );
-			theStats::AddDownOverheadOther(size);
-			m_client->ProcessAICHAnswer(buffer, size);
+		CMemFile data(buffer, size);
+		CUInt128 check = data.ReadUInt128();
+		check ^= Kademlia::CUInt128(true);
+		if (check != Kademlia::CKademlia::GetPrefs()->GetKadID()) {
 			break;
 		}
-		case OP_AICHREQUEST: {
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_AICHREQUEST from " + m_client->GetFullIP()  );
-			theStats::AddDownOverheadOther(size);
-			// Each OP_AICHREQUEST triggers an O(N) walk of known2.met
-			// via ProcessAICHRequest -> CreatePartRecoveryData ->
-			// LoadHashSet. Without rate-limiting, a hostile peer can
-			// hammer this with 16-byte packets and force the seeder to
-			// burn disk + CPU on each one. Treat repeated requests the
-			// same way the file-request paths do.
-			m_client->CheckForAggressive();
-			if ( m_client->IsBanned() ) {
+		CUInt128 fileid = data.ReadUInt128();
+		uint8_t fileid216;
+		fileid.ToByteArray(fileid2);
+		const CMD4Hash fileHash(fileid2);
+		if (theApp->sharedfiles->GetFileByID(fileHash) == NULL) {
+			if (theApp->downloadqueue->GetFileByID(fileHash) == NULL) {
 				break;
 			}
-			m_client->ProcessAICHRequest(buffer, size);
-			break;
 		}
-		case OP_AICHFILEHASHANS: {
-			// those should not be received normally, since we should only get those in MULTIPACKET
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_AICHFILEHASHANS from " + m_client->GetFullIP()  );
-			theStats::AddDownOverheadOther(size);
-			CMemFile data(buffer, size);
-			m_client->ProcessAICHFileHash(&data, NULL);
-			break;
+
+		uint32 ip = data.ReadUInt32();
+		uint16 tcp = data.ReadUInt16();
+		CUpDownClient *callback;
+		callback = theApp->clientlist->FindClientByIP(wxUINT32_SWAP_ALWAYS(ip), tcp);
+		if (callback == NULL) {
+			// #warning Do we actually have to check friend status here?
+			callback = new CUpDownClient(tcp, ip, 0, 0, NULL, false, false);
+			theApp->clientlist->AddClient(callback);
 		}
-		case OP_AICHFILEHASHREQ: {
-			// those should not be received normally, since we should only get those in MULTIPACKET
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_AICHFILEHASHREQ from " + m_client->GetFullIP()  );
-			CMemFile data(buffer, size);
-			CMD4Hash hash = data.ReadHash();
-			CKnownFile* pPartFile = theApp->sharedfiles->GetFileByID(hash);
-			if (pPartFile == NULL){
-				break;
-			}
+		callback->TryToConnect(true);
+		break;
+	}
 
-			if (m_client->IsSupportingAICH() && pPartFile->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE
-				&& pPartFile->GetAICHHashset()->HasValidMasterHash()) {
-				CMemFile data_out;
-				data_out.WriteHash(hash);
-				pPartFile->GetAICHHashset()->GetMasterHash().Write(&data_out);
-				CPacket* packet = new CPacket(data_out, OP_EMULEPROT, OP_AICHFILEHASHANS);
-				theStats::AddUpOverheadOther(packet->GetPacketSize());
-					AddDebugLogLineN( logLocalClient, "Local Client: OP_AICHFILEHASHANS to" + m_client->GetFullIP());
-				SendPacket(packet);
-			}
+	case OP_BUDDYPING: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_BUDDYPING from " + m_client->GetFullIP());
+		theStats::AddDownOverheadKad(size);
+
+		CUpDownClient *buddy = theApp->clientlist->GetBuddy();
+		if (buddy != m_client || m_client->GetKadVersion() == 0 ||
+			!m_client->AllowIncomeingBuddyPingPong()) {
+			// This ping was not from our buddy or wrong version or packet sent to fast. Ignore
 			break;
 		}
-		case OP_CALLBACK: {
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_CALLBACK from " + m_client->GetFullIP() );
-			theStats::AddDownOverheadFileRequest(size);
-			if(!Kademlia::CKademlia::IsRunning()) {
-				break;
-			}
-			CMemFile data(buffer, size);
-			CUInt128 check = data.ReadUInt128();
-			check ^= Kademlia::CUInt128(true);
-			if (check != Kademlia::CKademlia::GetPrefs()->GetKadID()) {
-				break;
-			}
-			CUInt128 fileid = data.ReadUInt128();
-			uint8_t fileid216;
-			fileid.ToByteArray(fileid2);
-			const CMD4Hash fileHash(fileid2);
-			if (theApp->sharedfiles->GetFileByID(fileHash) == NULL) {
-				if (theApp->downloadqueue->GetFileByID(fileHash) == NULL) {
-					break;
-				}
-			}
 
-			uint32 ip = data.ReadUInt32();
-			uint16 tcp = data.ReadUInt16();
-			CUpDownClient* callback;
-			callback = theApp->clientlist->FindClientByIP(wxUINT32_SWAP_ALWAYS(ip), tcp);
-			if( callback == NULL ) {
-				//#warning Do we actually have to check friend status here?
-				callback = new CUpDownClient(tcp,ip,0,0,NULL,false, false);
-				theApp->clientlist->AddClient(callback);
-			}
-			callback->TryToConnect(true);
+		m_client->SetLastBuddyPingPongTime();
+		CPacket *replypacket = new CPacket(OP_BUDDYPONG, 0, OP_EMULEPROT);
+		theStats::AddUpOverheadKad(replypacket->GetPacketSize());
+		AddDebugLogLineN(logLocalClient, "Local Client: OP_BUDDYPONG to " + m_client->GetFullIP());
+		SendPacket(replypacket);
+		break;
+	}
+	case OP_BUDDYPONG: {
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_BUDDYPONG from " + m_client->GetFullIP());
+		theStats::AddDownOverheadKad(size);
+
+		CUpDownClient *buddy = theApp->clientlist->GetBuddy();
+		if (buddy != m_client || m_client->GetKadVersion() == 0) {
+			// This pong was not from our buddy or wrong version. Ignore
 			break;
 		}
-
-		case OP_BUDDYPING: {
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_BUDDYPING from " + m_client->GetFullIP()  );
-			theStats::AddDownOverheadKad(size);
-
-			CUpDownClient* buddy = theApp->clientlist->GetBuddy();
-			if( buddy != m_client || m_client->GetKadVersion() == 0 || !m_client->AllowIncomeingBuddyPingPong() ) {
-				//This ping was not from our buddy or wrong version or packet sent to fast. Ignore
-				break;
-			}
-
-			m_client->SetLastBuddyPingPongTime();
-			CPacket* replypacket = new CPacket(OP_BUDDYPONG, 0, OP_EMULEPROT);
-			theStats::AddUpOverheadKad(replypacket->GetPacketSize());
-			AddDebugLogLineN(logLocalClient,"Local Client: OP_BUDDYPONG to " + m_client->GetFullIP());
-			SendPacket(replypacket);
+		m_client->SetLastBuddyPingPongTime();
+		// All this is for is to reset our socket timeout.
+		break;
+	}
+	case OP_REASKCALLBACKTCP: {
+		theStats::AddDownOverheadFileRequest(size);
+		CUpDownClient *buddy = theApp->clientlist->GetBuddy();
+		if (buddy != m_client) {
+			AddDebugLogLineN(logRemoteClient,
+				"Remote Client: OP_REASKCALLBACKTCP from " + m_client->GetFullIP() +
+					" which is not our buddy!");
+			// This callback was not from our buddy.. Ignore.
 			break;
 		}
-		case OP_BUDDYPONG: {
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_BUDDYPONG from " + m_client->GetFullIP()  );
-			theStats::AddDownOverheadKad(size);
-
-			CUpDownClient* buddy = theApp->clientlist->GetBuddy();
-			if( buddy != m_client || m_client->GetKadVersion() == 0 ) {
-				//This pong was not from our buddy or wrong version. Ignore
-				break;
-			}
-			m_client->SetLastBuddyPingPongTime();
-			//All this is for is to reset our socket timeout.
+		AddDebugLogLineN(
+			logRemoteClient, "Remote Client: OP_REASKCALLBACKTCP from " + m_client->GetFullIP());
+		CMemFile data_in(buffer, size);
+		uint32 destip = data_in.ReadUInt32();
+		if (destip == 0xFFFFFFFF) {
+			// eMuleAI and eMule-Qt send an IPv6 requester as this plus 16 address bytes. There is
+			// no IPv6 UDP to answer on, and reading it as IPv4 would aim at 255.255.255.255.
+			AddDebugLogLineN(logRemoteClient,
+				"Remote Client: OP_REASKCALLBACKTCP for an IPv6 requester from " +
+					m_client->GetFullIP() + ", ignored");
 			break;
 		}
-		case OP_REASKCALLBACKTCP: {
-			theStats::AddDownOverheadFileRequest(size);
-			CUpDownClient* buddy = theApp->clientlist->GetBuddy();
-			if (buddy != m_client) {
-				AddDebugLogLineN( logRemoteClient, "Remote Client: OP_REASKCALLBACKTCP from " + m_client->GetFullIP() + " which is not our buddy!" );
-				//This callback was not from our buddy.. Ignore.
-				break;
-			}
-			AddDebugLogLineN( logRemoteClient, "Remote Client: OP_REASKCALLBACKTCP from " + m_client->GetFullIP() );
-			CMemFile data_in(buffer, size);
-			uint32 destip = data_in.ReadUInt32();
-			uint16 destport = data_in.ReadUInt16();
-			CMD4Hash hash = data_in.ReadHash();
-			CKnownFile* reqfile = theApp->sharedfiles->GetFileByID(hash);
-
-			bool bSenderMultipleIpUnknown = false;
-			CUpDownClient* sender = theApp->uploadqueue->GetWaitingClientByIP_UDP(destip, destport, true, &bSenderMultipleIpUnknown);
-			if (!reqfile) {
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_FILENOTFOUND to " + m_client->GetFullIP() );
-				CPacket* response = new CPacket(OP_FILENOTFOUND,0,OP_EMULEPROT);
-				theStats::AddUpOverheadFileRequest(response->GetPacketSize());
-				if (sender) {
-					theApp->clientudp->SendPacket(response, destip, destport, sender->ShouldReceiveCryptUDPPackets(), sender->GetUserHash().GetHash(), false, 0);
-				} else {
-					theApp->clientudp->SendPacket(response, destip, destport, false, NULL, false, 0);
-				}
-				break;
+		uint16 destport = data_in.ReadUInt16();
+		CMD4Hash hash = data_in.ReadHash();
+		CKnownFile *reqfile = theApp->sharedfiles->GetFileByID(hash);
+
+		bool bSenderMultipleIpUnknown = false;
+		CUpDownClient *sender = theApp->uploadqueue->GetWaitingClientByIP_UDP(
+			CNetworkAddress::FromIPv4NetworkOrderOrAbsent(destip),
+			destport,
+			true,
+			&bSenderMultipleIpUnknown);
+		if (!reqfile) {
+			AddDebugLogLineN(
+				logLocalClient, "Local Client: OP_FILENOTFOUND to " + m_client->GetFullIP());
+			CPacket *response = new CPacket(OP_FILENOTFOUND, 0, OP_EMULEPROT);
+			theStats::AddUpOverheadFileRequest(response->GetPacketSize());
+			if (sender) {
+				theApp->clientudp->SendPacket(response,
+					destip,
+					destport,
+					sender->ShouldReceiveCryptUDPPackets(),
+					sender->GetUserHash().GetHash(),
+					false,
+					0);
+			} else {
+				theApp->clientudp->SendPacket(
+					response, destip, destport, false, NULL, false, 0);
 			}
+			break;
+		}
 
-			if (sender) {
-				//Make sure we are still thinking about the same file
-				if (hash == sender->GetUploadFileID()) {
-					sender->AddAskedCount();
-					sender->SetLastUpRequest();
-					//I messed up when I first added extended info to UDP
-					//I should have originally used the entire ProcessExtenedInfo the first time.
-					//So now I am forced to check UDPVersion to see if we are sending all the extended info.
-					//For now on, we should not have to change anything here if we change
-					//anything to the extended info data as this will be taken care of in ProcessExtendedInfo()
-					//Update extended info.
-					if (sender->GetUDPVersion() > 3) {
-						sender->ProcessExtendedInfo(&data_in, reqfile);
-					} else if (sender->GetUDPVersion() > 2) {
-						//Update our complete source counts.
-						uint16 nCompleteCountLast= sender->GetUpCompleteSourcesCount();
-						uint16 nCompleteCountNew = data_in.ReadUInt16();
-						sender->SetUpCompleteSourcesCount(nCompleteCountNew);
-						if (nCompleteCountLast != nCompleteCountNew) {
-							reqfile->UpdatePartsInfo();
-						}
+		if (sender) {
+			// Make sure we are still thinking about the same file
+			if (hash == sender->GetUploadFileID()) {
+				sender->AddAskedCount();
+				sender->SetLastUpRequest();
+				// UDPVersion has to be checked because the first version of
+				// extended UDP info did not go through ProcessExtendedInfo. Later
+				// changes to the extended info need no change here.
+				if (sender->GetUDPVersion() > 3) {
+					sender->ProcessExtendedInfo(&data_in, reqfile);
+				} else if (sender->GetUDPVersion() > 2) {
+					uint16 nCompleteCountLast = sender->GetUpCompleteSourcesCount();
+					uint16 nCompleteCountNew = data_in.ReadUInt16();
+					sender->SetUpCompleteSourcesCount(nCompleteCountNew);
+					if (nCompleteCountLast != nCompleteCountNew) {
+						reqfile->UpdatePartsInfo();
 					}
+				}
 
-					CMemFile data_out(128);
-					if(sender->GetUDPVersion() > 3) {
-						if (reqfile->IsPartFile()) {
-							static_cast<CPartFile*>(reqfile)->WritePartStatus(&data_out);
-						} else {
-							data_out.WriteUInt16(0);
-						}
+				CMemFile data_out(128);
+				if (sender->GetUDPVersion() > 3) {
+					if (reqfile->IsPartFile()) {
+						static_cast<CPartFile *>(reqfile)->WritePartStatus(&data_out);
+					} else {
+						data_out.WriteUInt16(0);
 					}
+				}
 
-					data_out.WriteUInt16(sender->GetUploadQueueWaitingPosition());
-					CPacket* response = new CPacket(data_out, OP_EMULEPROT, OP_REASKACK);
+				data_out.WriteUInt16(sender->GetUploadQueueWaitingPosition());
+				CPacket *response = new CPacket(data_out, OP_EMULEPROT, OP_REASKACK);
+				theStats::AddUpOverheadFileRequest(response->GetPacketSize());
+				AddDebugLogLineN(logLocalClient,
+					"Local Client UDP: OP_REASKACK to " + m_client->GetFullIP());
+				theApp->clientudp->SendPacket(response,
+					destip,
+					destport,
+					sender->ShouldReceiveCryptUDPPackets(),
+					sender->GetUserHash().GetHash(),
+					false,
+					0);
+			} else {
+				AddDebugLogLineN(logListenSocket,
+					"Client UDP socket; OP_REASKCALLBACKTCP; reqfile does not match");
+			}
+		} else {
+			if (!bSenderMultipleIpUnknown) {
+				if ((theStats::GetWaitingUserCount() + 50) > thePrefs::GetQueueSize()) {
+					AddDebugLogLineN(logLocalClient,
+						"Local Client: OP_QUEUEFULL to " + m_client->GetFullIP());
+					CPacket *response = new CPacket(OP_QUEUEFULL, 0, OP_EMULEPROT);
 					theStats::AddUpOverheadFileRequest(response->GetPacketSize());
-					AddDebugLogLineN( logLocalClient, "Local Client UDP: OP_REASKACK to " + m_client->GetFullIP()  );
-					theApp->clientudp->SendPacket(response, destip, destport, sender->ShouldReceiveCryptUDPPackets(), sender->GetUserHash().GetHash(), false, 0);
-				} else {
-					AddDebugLogLineN(logListenSocket, "Client UDP socket; OP_REASKCALLBACKTCP; reqfile does not match");
+					theApp->clientudp->SendPacket(
+						response, destip, destport, false, NULL, false, 0);
 				}
 			} else {
-				if (!bSenderMultipleIpUnknown){
-					if ((theStats::GetWaitingUserCount() + 50) > thePrefs::GetQueueSize()) {
-						AddDebugLogLineN( logLocalClient, "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 {
-					AddDebugLogLineN(logRemoteClient, CFormat("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, "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, "Remote Client: OP_CHATCAPTCHARES from " + m_client->GetFullIP());
-			theStats::AddDownOverheadOther(size);
-			if (size) {
-				m_client->ProcessCaptchaReqRes(buffer0);
+				AddDebugLogLineN(logRemoteClient,
+					CFormat("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_FWCHECKUDPREQ: { // Support required for Kadversion >= 6
-			AddDebugLogLineN(logRemoteClient, "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
-			AddDebugLogLineN(logRemoteClient, "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 {
-				AddDebugLogLineN(logListenSocket, "Received unrequested OP_KAD_FWTCPCHECK_ACK packet from " + m_client->GetFullIP());
+		break;
+	}
+	case OP_CHATCAPTCHAREQ: {
+		AddDebugLogLineN(
+			logRemoteClient, "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, "Remote Client: OP_CHATCAPTCHARES from " + m_client->GetFullIP());
+		theStats::AddDownOverheadOther(size);
+		if (size) {
+			m_client->ProcessCaptchaReqRes(buffer0);
+		}
+		break;
+	}
+	case OP_FWCHECKUDPREQ: { // Support required for Kadversion >= 6
+		AddDebugLogLineN(
+			logRemoteClient, "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
+		AddDebugLogLineN(logRemoteClient,
+			"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();
 			}
-			break;
+		} else {
+			AddDebugLogLineN(logListenSocket,
+				"Received unrequested OP_KAD_FWTCPCHECK_ACK packet from " +
+					m_client->GetFullIP());
 		}
-		default:
-			theStats::AddDownOverheadOther(size);
-			AddDebugLogLineN(logRemoteClient, CFormat("eMule packet : unknown opcode: %i %x from %s") % opcode % opcode % m_client->GetFullIP());
-			break;
+		break;
+	}
+	default:
+		theStats::AddDownOverheadOther(size);
+		AddDebugLogLineN(logRemoteClient,
+			CFormat("eMule packet : unknown opcode: %i %x from %s") % opcode % opcode %
+				m_client->GetFullIP());
+		break;
 	}
 
 	return true;
 }
 
-bool CClientTCPSocket::ProcessED2Kv2Packet(const uint8_t* buffer, uint32 size, uint8 opcode)
+bool CClientTCPSocket::ProcessED2Kv2Packet(const uint8_t *buffer, uint32 size, uint8 opcode)
 {
-	#ifdef __PACKET_RECV_DUMP__
-	//printf("Rec: OPCODE %x ED2Kv2\n",opcode);
-	DumpMem(buffer,size);
-	#endif
+#ifdef __PACKET_RECV_DUMP__
+	DumpMem(buffer, size);
+#endif
 
 	if (!m_client) {
 		throw wxString("Unknown clients sends extended ED2Kv2 protocol packet");
@@ -1796,35 +2053,32 @@
 
 	CMemFile data(buffer, size);
 	try {
-		switch(opcode) {
-			case OP_QUEUERANK: {
-				AddDebugLogLineN( logRemoteClient, "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());
-
-				theStats::AddDownOverheadFileRequest(size);
-				break;
-			}
+		switch (opcode) {
+		case OP_QUEUERANK: {
+			AddDebugLogLineN(logRemoteClient,
+				"Remote Client: ED2Kv2 OP_QUEUERANK from " + m_client->GetFullIP());
 
-			case OP_REQUESTPARTS: {
-				AddDebugLogLineN( logRemoteClient, "Remote Client: ED2Kv2 OP_REQUESTPARTS from " + m_client->GetFullIP() );
+			uint8 numtags = data.ReadUInt8();
+			wxASSERT(numtags == 1);
+			if (numtags) {
+			} // prevent GCC warning
 
-				m_client->ProcessRequestPartsPacketv2(data);
+			m_client->SetRemoteQueueRank(data.GetIntTagValue());
 
-				theStats::AddDownOverheadFileRequest(size);
-				break;
-			}
+			theStats::AddDownOverheadFileRequest(size);
+			break;
+		}
 
-			default:
-				theStats::AddDownOverheadOther(size);
-				AddDebugLogLineN(logRemoteClient, CFormat("ED2Kv2 packet : unknown opcode: %i %x from %s") % opcode % opcode % m_client->GetFullIP());
+		default:
+			theStats::AddDownOverheadOther(size);
+			AddDebugLogLineN(logRemoteClient,
+				CFormat("ED2Kv2 packet : unknown opcode: %i %x from %s") % opcode % opcode %
+					m_client->GetFullIP());
 		}
 	} catch (...) {
-		AddDebugLogLineN(logRemoteClient, CFormat("ED2Kv2 packet is corrupt at pos %i! opcode: %i %x from %s") % data.GetPosition() % opcode % opcode % m_client->GetFullIP());
+		AddDebugLogLineN(logRemoteClient,
+			CFormat("ED2Kv2 packet is corrupt at pos %i! opcode: %i %x from %s") %
+				data.GetPosition() % opcode % opcode % m_client->GetFullIP());
 		throw;
 	}
 
@@ -1836,45 +2090,41 @@
 	if (nErrorCode) {
 		OnError(nErrorCode);
 	} else if (!m_client) {
-		// and now? Disconnect? not?
-		AddDebugLogLineN( logClient, "Couldn't send hello packet (Client deleted!)" );
+		AddDebugLogLineN(logClient, "Couldn't send hello packet (Client deleted!)");
 	} else if (!m_client->SendHelloPacket()) {
-		// and now? Disconnect? not?
-		AddDebugLogLineN( logClient, "Couldn't send hello packet (Client deleted by SendHelloPacket!)" );
+		AddDebugLogLineN(
+			logClient, "Couldn't send hello packet (Client deleted by SendHelloPacket!)");
 	} else {
 		ResetTimeOutTimer();
 	}
 }
 
-
 void CClientTCPSocket::OnSend(int nErrorCode)
 {
 	ResetTimeOutTimer();
 	CEMSocket::OnSend(nErrorCode);
 }
 
-
 void CClientTCPSocket::OnReceive(int nErrorCode)
 {
 	ResetTimeOutTimer();
 	// We might have updated ipfilter
-	wxASSERT(m_remoteip);
+	wxASSERT(m_remoteAddress.IsPresent());
 
-	if (theApp->ipfilter->IsFiltered(m_remoteip)) {
+	if (theApp->ipfilter->IsFiltered(m_remoteAddress)) {
 		if (m_client) {
 			m_client->Safe_Delete();
 		}
 		Safe_Delete();
-		AddDebugLogLineN( logIPFilter, "A connected client was dropped by IPFilter on new packet received");
+		AddDebugLogLineN(
+			logIPFilter, "A connected client was dropped by IPFilter on new packet received");
 	} else {
 		CEMSocket::OnReceive(nErrorCode);
 	}
 }
 
-
 void CClientTCPSocket::OnError(int nErrorCode)
 {
-	//printf("* Called OnError for %p\n",this);
 	// 0.42e + Kry changes for handling of socket lost events
 	wxString strError;
 
@@ -1893,7 +2143,7 @@
 			strError += "closed connection.";
 		} else if (nErrorCode == 0xFEFF) {
 			strError += " caused a wxSOCKET_LOST event.";
-		}	else {
+		} else {
 			strError += "caused a socket blocking error.";
 		}
 	} else {
@@ -1902,15 +2152,19 @@
 			// 107  -> Transport endpoint is not connected
 			if (m_client) {
 				if (!m_client->GetUserName().IsEmpty()) {
-					strError = CFormat("OnError: Client '%s' (IP:%s) caused an error: %u. Disconnecting client!")
-						% m_client->GetUserName() % m_client->GetFullIP() % nErrorCode;
+					strError = CFormat("OnError: Client '%s' (IP:%s) caused an error: "
+							   "%u. Disconnecting client!") %
+						   m_client->GetUserName() % m_client->GetFullIP() %
+						   nErrorCode;
 				} else {
-					strError = CFormat("OnError: Unknown client (IP:%s) caused an error: %u. Disconnecting client!")
-						% m_client->GetFullIP() % nErrorCode;
+					strError = CFormat("OnError: Unknown client (IP:%s) caused an error: "
+							   "%u. Disconnecting client!") %
+						   m_client->GetFullIP() % nErrorCode;
 				}
 			} else {
-				strError = CFormat("OnError: A client caused an error or did something bad (error %u). Disconnecting client !")
-					% nErrorCode;
+				strError = CFormat("OnError: A client caused an error or did something bad "
+						   "(error %u). Disconnecting client !") %
+					   nErrorCode;
 			}
 		} else {
 			strError = "Error 107 (Transport endpoint is not connected)";
@@ -1920,20 +2174,15 @@
 	Disconnect(strError);
 }
 
-
-bool CClientTCPSocket::PacketReceived(CPacket* packet)
+bool CClientTCPSocket::PacketReceived(CPacket *packet)
 {
-	// 0.42e
 	bool bResult = false;
 	uint32 uRawSize = packet->GetPacketSize();
 
-	AddDebugLogLineN( logRemoteClient,
-		CFormat("Packet with protocol %x, opcode %x, size %u received from %s")
-			% packet->GetProtocol()
-			% packet->GetOpCode()
-			% packet->GetPacketSize()
-			% ( m_client ? m_client->GetFullIP() : "Unknown Client" )
-	);
+	AddDebugLogLineN(logRemoteClient,
+		CFormat("Packet with protocol %x, opcode %x, size %u received from %s") %
+			packet->GetProtocol() % packet->GetOpCode() % packet->GetPacketSize() %
+			(m_client ? m_client->GetFullIP() : "Unknown Client"));
 
 	wxString exception;
 
@@ -1948,65 +2197,68 @@
 				bResult = false;
 				process = false;
 			} else {
-				AddDebugLogLineN(logRemoteClient, CFormat("Packet unpacked, new protocol %x, opcode %x, size %u")
-					% packet->GetProtocol() % packet->GetOpCode() % packet->GetPacketSize());
+				AddDebugLogLineN(logRemoteClient,
+					CFormat("Packet unpacked, new protocol %x, opcode %x, size %u") %
+						packet->GetProtocol() % packet->GetOpCode() %
+						packet->GetPacketSize());
 			}
 		}
 
 		if (process) {
 			switch (packet->GetProtocol()) {
-				case OP_EDONKEYPROT:
-					bResult = ProcessPacket(packet->GetDataBuffer(),uRawSize,packet->GetOpCode());
-					break;
-				case OP_EMULEPROT:
-					bResult = ProcessExtPacket(packet->GetDataBuffer(), packet->GetPacketSize(), packet->GetOpCode());
-					break;
-				case OP_ED2KV2HEADER:
-					bResult = ProcessED2Kv2Packet(packet->GetDataBuffer(), packet->GetPacketSize(), packet->GetOpCode());
-					break;
-				case OP_ED2KV2PACKEDPROT:
-				case OP_PACKEDPROT:
-					// Packed inside packed?
-					wxFAIL;
-					break;
-				default: {
-					theStats::AddDownOverheadOther(uRawSize);
-					if (m_client) {
-						m_client->SetDownloadState(DS_ERROR);
-					}
-					Disconnect("Unknown protocol");
-					bResult = false;
+			case OP_EDONKEYPROT:
+				bResult =
+					ProcessPacket(packet->GetDataBuffer(), uRawSize, packet->GetOpCode());
+				break;
+			case OP_EMULEPROT:
+				bResult = ProcessExtPacket(packet->GetDataBuffer(),
+					packet->GetPacketSize(),
+					packet->GetOpCode());
+				break;
+			case OP_ED2KV2HEADER:
+				bResult = ProcessED2Kv2Packet(packet->GetDataBuffer(),
+					packet->GetPacketSize(),
+					packet->GetOpCode());
+				break;
+			case OP_ED2KV2PACKEDPROT:
+			case OP_PACKEDPROT:
+				// Packed inside packed?
+				wxFAIL;
+				break;
+			default: {
+				theStats::AddDownOverheadOther(uRawSize);
+				if (m_client) {
+					m_client->SetDownloadState(DS_ERROR);
 				}
+				Disconnect("Unknown protocol");
+				bResult = false;
+			}
 			}
 		}
-	} catch (const CEOFException& err) {
+	} catch (const CEOFException &err) {
 		exception = "EOF exception: " + err.what();
-	} catch (const CInvalidPacket& err) {
+	} catch (const CInvalidPacket &err) {
 		exception = "InvalidPacket exception: " + err.what();
-	} catch (const wxString& error) {
+	} catch (const wxString &error) {
 		exception = "error: " + (error.IsEmpty() ? wxString("Unknown error") : error);
 	}
 
 	if (!exception.IsEmpty()) {
-		AddDebugLogLineN( logPacketErrors,
-			CFormat("Caught %s\nOn packet with protocol %x, opcode %x, size %u\tClientData: %s\n")
-				% exception
-				% packet->GetProtocol()
-				% packet->GetOpCode()
-				% packet->GetPacketSize()
-				% ( m_client ? m_client->GetClientFullInfo() : "Unknown" )
-		);
+		AddDebugLogLineN(logPacketErrors,
+			CFormat("Caught %s\nOn packet with protocol %x, opcode %x, size %u\tClientData: "
+				"%s\n") %
+				exception % packet->GetProtocol() % packet->GetOpCode() %
+				packet->GetPacketSize() %
+				(m_client ? m_client->GetClientFullInfo() : "Unknown"));
 
 		if (m_client) {
 			m_client->SetDownloadState(DS_ERROR);
 		}
 
-		AddDebugLogLineN( logClient,
-			CFormat( "Client '%s' (IP: %s) caused an error (%s). Disconnecting client!" )
-				% ( m_client ? m_client->GetUserName() : wxString("Unknown") )
-				% ( m_client ? m_client->GetFullIP() : wxString("Unknown") )
-				% exception
-		);
+		AddDebugLogLineN(logClient,
+			CFormat("Client '%s' (IP: %s) caused an error (%s). Disconnecting client!") %
+				(m_client ? m_client->GetUserName() : wxString("Unknown")) %
+				(m_client ? m_client->GetFullIP() : wxString("Unknown")) % exception);
 
 		Disconnect("Caught exception on CClientTCPSocket::ProcessPacket\n");
 	}
@@ -2014,34 +2266,38 @@
 	return bResult;
 }
 
-
-SocketSentBytes CClientTCPSocket::SendControlData(uint32 maxNumberOfBytesToSend, uint32 overchargeMaxBytesToSend)
+SocketSentBytes CClientTCPSocket::SendControlData(
+	uint32 maxNumberOfBytesToSend, uint32 overchargeMaxBytesToSend)
 {
-    SocketSentBytes returnStatus = CEMSocket::SendControlData(maxNumberOfBytesToSend, overchargeMaxBytesToSend);
+	SocketSentBytes returnStatus =
+		CEMSocket::SendControlData(maxNumberOfBytesToSend, overchargeMaxBytesToSend);
 
-    if(returnStatus.success && (returnStatus.sentBytesControlPackets > 0 || returnStatus.sentBytesStandardPackets > 0)) {
-        ResetTimeOutTimer();
-    }
+	if (returnStatus.success &&
+		(returnStatus.sentBytesControlPackets > 0 || returnStatus.sentBytesStandardPackets > 0)) {
+		ResetTimeOutTimer();
+	}
 
-    return returnStatus;
+	return returnStatus;
 }
 
-
-SocketSentBytes CClientTCPSocket::SendFileAndControlData(uint32 maxNumberOfBytesToSend, uint32 overchargeMaxBytesToSend)
+SocketSentBytes CClientTCPSocket::SendFileAndControlData(
+	uint32 maxNumberOfBytesToSend, uint32 overchargeMaxBytesToSend)
 {
-	SocketSentBytes returnStatus = CEMSocket::SendFileAndControlData(maxNumberOfBytesToSend, overchargeMaxBytesToSend);
+	SocketSentBytes returnStatus =
+		CEMSocket::SendFileAndControlData(maxNumberOfBytesToSend, overchargeMaxBytesToSend);
 
-    if(returnStatus.success && (returnStatus.sentBytesControlPackets > 0 || returnStatus.sentBytesStandardPackets > 0)) {
-        ResetTimeOutTimer();
-    }
+	if (returnStatus.success &&
+		(returnStatus.sentBytesControlPackets > 0 || returnStatus.sentBytesStandardPackets > 0)) {
+		ResetTimeOutTimer();
+	}
 
-    return returnStatus;
+	return returnStatus;
 }
 
-
-void CClientTCPSocket::SendPacket(CPacket* packet, bool delpacket, bool controlpacket, uint32 actualPayloadSize)
+void CClientTCPSocket::SendPacket(
+	CPacket *packet, bool delpacket, bool controlpacket, uint32 actualPayloadSize)
 {
 	ResetTimeOutTimer();
-	CEMSocket::SendPacket(packet,delpacket,controlpacket, actualPayloadSize);
+	CEMSocket::SendPacket(packet, delpacket, controlpacket, actualPayloadSize);
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ClientTCPSocket.h -> amule-3.1.0.tar.gz/src/ClientTCPSocket.h Changed

@@ -23,20 +23,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-//
 // Handling incoming connections (up or downloadrequests)
-//
 
 #ifndef CLIENTTCPSOCKET_H
 #define CLIENTTCPSOCKET_H
 
-#include "EMSocket.h"		// Needed for CEMSocket
+#include "EMSocket.h" // Needed for CEMSocket
 
 class CProxyData;
 
-//------------------------------------------------------------------------------
 // CClientTCPSocket
-//------------------------------------------------------------------------------
 
 class CUpDownClient;
 class CPacket;
@@ -45,58 +41,80 @@
 class CClientTCPSocket : public CEMSocket
 {
 public:
-	CClientTCPSocket(CUpDownClient* in_client = NULL, const CProxyData *ProxyData = NULL);
+	enum class AdmissionTransport
+	{
+		TCP,
+		UTP
+	};
+
+	CClientTCPSocket(CUpDownClient *in_client = NULL, const CProxyData *ProxyData = NULL);
 	virtual ~CClientTCPSocket();
 
-	void		Disconnect(const wxString& strReason);
+	void Disconnect(const wxString &strReason);
 
-	bool		InitNetworkData();
+	bool InitNetworkData(AdmissionTransport transport);
+#ifdef AMULE_UTP_TRANSPORT
+	//! Hands this peer's obfuscation preference and hash to an attached stream.
+	void ApplyUtpCryptParameters();
+	bool IsUtpInbound() const;
+#endif
 
-	bool		CheckTimeOut();
+	bool CheckTimeOut();
 
-	void		Safe_Delete();
-	void		Safe_Delete_Client();
+	void Safe_Delete();
+	void Safe_Delete_Client();
 
-	void		OnConnect(int nErrorCode) override;
-	void		OnSend(int nErrorCode) override;
-	void		OnReceive(int nErrorCode) override;
+	void OnConnect(int nErrorCode) override;
+	void OnSend(int nErrorCode) override;
+	void OnReceive(int nErrorCode) override;
 
-	void		OnClose(int nErrorCode) override;
-	void		OnError(int nErrorCode) override;
+	void OnClose(int nErrorCode) override;
+	void OnError(int nErrorCode) override;
 
-	uint32		GetRemoteIP() const { return m_remoteip; }
+	uint32 GetRemoteIP() const { return m_remoteip; }
+	//! Accepted socket peer: mapped IPv4 is canonicalized to plain IPv4 at ingress;
+	//! native IPv6 retains its family and scope. Use IndexKey() for client identity.
+	const CNetworkAddress &GetRemoteAddress() const { return m_remoteAddress; }
 
-	CUpDownClient* GetClient() { return m_client; }
+	CUpDownClient *GetClient() { return m_client; }
 
-	void		SendPacket(CPacket* packet, bool delpacket = true, bool controlpacket = true, uint32 actualPayloadSize = 0) override;
-	SocketSentBytes SendControlData(uint32 maxNumberOfBytesToSend, uint32 overchargeMaxBytesToSend) override;
-	SocketSentBytes SendFileAndControlData(uint32 maxNumberOfBytesToSend, uint32 overchargeMaxBytesToSend) override;
+	void SendPacket(CPacket *packet,
+		bool delpacket = true,
+		bool controlpacket = true,
+		uint32 actualPayloadSize = 0) override;
+	SocketSentBytes SendControlData(
+		uint32 maxNumberOfBytesToSend, uint32 overchargeMaxBytesToSend) override;
+	SocketSentBytes SendFileAndControlData(
+		uint32 maxNumberOfBytesToSend, uint32 overchargeMaxBytesToSend) override;
 
-	// Bypass the global download bandwidth throttler when the inbound
-	// peer is actually the ed2k server's HighID-callback probe (#778).
-	// CServerSocket already opts out by overriding to false; this
-	// extends the same shape to inbound peer connections whose source
-	// IP matches the connected (or currently-connecting) server, so a
-	// saturated peer-side budget doesn't delay the probe past the
-	// server's verification timer and leave us in permanent LowID.
-	// Implemented out-of-line in the .cpp because we need theApp /
-	// CServerConnect, which the header can't see.
-	bool		IsDownloadThrottled() const override;
+	// Bypass the global download bandwidth throttler when the inbound peer is really the ed2k
+	// server's HighID-callback probe (#778). CServerSocket already opts out by overriding to
+	// false; this extends the same shape to inbound peer connections whose source IP matches
+	// the connected (or currently connecting) server, so a saturated peer-side budget does not
+	// delay the probe past the server's verification timer and leave us in permanent LowID.
+	// Implemented out of line in the .cpp because it needs theApp / CServerConnect, which the
+	// header cannot see.
+	bool IsDownloadThrottled() const override;
 
 protected:
-	bool		PacketReceived(CPacket* packet) override;
+	bool PacketReceived(CPacket *packet) override;
 
 private:
-	CUpDownClient*	m_client;
-
-	bool	ProcessPacket(const uint8_t* packet, uint32 size, uint8 opcode);
-	bool	ProcessExtPacket(const uint8_t* packet, uint32 size, uint8 opcode);
-	bool	ProcessED2Kv2Packet(const uint8_t* packet, uint32 size, uint8 opcode);
-	void	ResetTimeOutTimer();
-	void	SetClient(CUpDownClient* client);
-
-	uint64	timeout_timer;
-	uint32	m_remoteip;
+	CUpDownClient *m_client;
+#ifdef AMULE_UTP_TRANSPORT
+	bool TryUtpTcpFallback();
+	bool m_utpFallbackAttempted = false;
+#endif
+
+	bool ProcessPacket(const uint8_t *packet, uint32 size, uint8 opcode);
+	bool ProcessExtPacket(const uint8_t *packet, uint32 size, uint8 opcode);
+	bool ProcessED2Kv2Packet(const uint8_t *packet, uint32 size, uint8 opcode);
+	void ResetTimeOutTimer();
+	void SetClient(CUpDownClient *client);
+
+	uint64 timeout_timer;
+	uint32 m_remoteip;
+	CNetworkAddress m_remoteAddress; // Dial target, or the peer captured at accepted TCP ingress.
 };
 
 #endif // CLIENTTCPSOCKET_H

amule-3.0.1.tar.gz/src/ClientUDPSocket.cpp -> amule-3.1.0.tar.gz/src/ClientUDPSocket.cpp Changed

@@ -23,46 +23,109 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "ClientUDPSocket.h"	// Interface declarations
+#include "ClientUDPSocket.h" // Interface declarations
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Client2Client/TCP.h> // Sometimes we reply with TCP packets.
 #include <protocol/ed2k/Client2Client/UDP.h>
 #include <protocol/kad2/Client2Client/UDP.h>
 #include <common/EventIDs.h>
-#include <common/Format.h>	// Needed for CFormat
-
-#include "Preferences.h"		// Needed for CPreferences
-#include "PartFile.h"			// Needed for CPartFile
-#include "updownclient.h"		// Needed for CUpDownClient
-#include "UploadQueue.h"		// Needed for CUploadQueue
-#include "Packet.h"				// Needed for CPacket
-#include "SharedFileList.h"		// Needed for CSharedFileList
-#include "DownloadQueue.h"		// Needed for CDownloadQueue
-#include "Statistics.h"			// Needed for theStats
-#include "amule.h"				// Needed for theApp
-#include "ClientList.h"			// Needed for clientlist (buddy support)
-#include "ClientTCPSocket.h"	// Needed for CClientTCPSocket
-#include "MemFile.h"			// Needed for CMemFile
+#include <common/Format.h> // Needed for CFormat
+
+#include "Preferences.h"     // Needed for CPreferences
+#include "PartFile.h"        // Needed for CPartFile
+#include "updownclient.h"    // Needed for CUpDownClient
+#include "UploadQueue.h"     // Needed for CUploadQueue
+#include "Packet.h"          // Needed for CPacket
+#include "SharedFileList.h"  // Needed for CSharedFileList
+#include "DownloadQueue.h"   // Needed for CDownloadQueue
+#include "Statistics.h"      // Needed for theStats
+#include "amule.h"           // Needed for theApp
+#include "ClientList.h"      // Needed for clientlist (buddy support)
+#include "ClientTCPSocket.h" // Needed for CClientTCPSocket
+#include "MemFile.h"         // Needed for CMemFile
 #include "Logger.h"
 #include "kademlia/kademlia/Kademlia.h"
 #include "kademlia/utils/KadUDPKey.h"
 #include <zlib.h>
 #include "EncryptedDatagramSocket.h"
+#ifdef AMULE_UTP_TRANSPORT
+#include "UtpLibraryAdapter.h"
+#include "UtpStreamAcceptor.h"
+#endif
 
 //
 // CClientUDPSocket -- Extended eMule UDP socket
 //
 
-CClientUDPSocket::CClientUDPSocket(const amuleIPV4Address& address, const CProxyData* ProxyData)
-	: CMuleUDPSocket("Client UDP-Socket", ID_CLIENTUDPSOCKET_EVENT, address, ProxyData)
+CClientUDPSocket::CClientUDPSocket(const amuleIPV4Address &address, const CProxyData *ProxyData)
+: CMuleUDPSocket("Client UDP-Socket", ID_CLIENTUDPSOCKET_EVENT, address, ProxyData)
+#ifdef AMULE_UTP_TRANSPORT
+, m_utp(CreateUtpLibrary(), *this)
+#endif
 {
 	if (!thePrefs::IsUDPDisabled()) {
 		Open();
 	}
+#ifdef AMULE_UTP_TRANSPORT
+	// Arm the service before the first outbound dial, not only after ingress.
+	m_utp.Configure();
+	m_utp.SetAcceptor(&m_utpAcceptor);
+#endif
+}
+
+#ifdef AMULE_UTP_TRANSPORT
+void CClientUDPSocket::Close()
+{
+	wxASSERT(wxIsMainThread());
+	// The uTP context is not destroyed here. Close() and Open() are how a lost
+	// Kad connection is recovered, and libutp does not own this socket: it only
+	// asks us to send. Destroying the context would end every live uTP stream
+	// for a reconnect that leaves TCP peers untouched.
+	CMuleUDPSocket::Close();
+}
+
+CClientUDPSocket::~CClientUDPSocket()
+{
+	m_utp.Destroy();
 }
 
+void CClientUDPSocket::TickUtp()
+{
+	wxASSERT(wxIsMainThread());
+	m_utp.Tick();
+}
+
+void CClientUDPSocket::SendUtpDatagram(const uint8_t *payload,
+	size_t length,
+	uint32_t ip,
+	uint16_t port,
+	bool encrypt,
+	const uint8_t *userHash)
+{
+	wxASSERT(wxIsMainThread());
+	// The crypt parameters arrive with the datagram, carried down from the
+	// socket that produced it.
+	//
+	// They are not derived here, and deriving them here is what the removed
+	// FindClientByIP(ip, port) did wrong: it matched GetUserPort(), the ed2k
+	// TCP port, against the peer's UDP port, so with the aMule defaults of 4662
+	// and 4672 it never matched and the answer was "no encryption" by accident.
+	// Worse, it could match a different peer at the same address that happened
+	// to listen on a TCP port equal to the UDP port being dialled, keying the
+	// datagram on that client's hash so the real recipient could not decrypt.
+	//
+	// Counted here rather than inside QueueUtpDatagram(), which is deliberately
+	// free of the application's headers. The figure is the datagram that
+	// leaves: the payload, the two-byte 0xB2 envelope, and the crypt header
+	// when there is one. OnPacketReceived() counts the raw datagram before
+	// decryption, so without that last term aMule would under-report its own
+	// upload by eight bytes for every obfuscated datagram.
+	const std::uint64_t overhead = length + kUtpEnvelopeBytes + (encrypt ? kUtpCryptHeaderBytes : 0);
+	theStats::AddUpOverheadOther(overhead);
+	QueueUtpDatagram<CPacket>(*this, payload, length, ip, port, encrypt, userHash);
+}
+#endif
 
 void CClientUDPSocket::OnReceive(int errorCode)
 {
@@ -74,255 +137,464 @@
 	}
 }
 
-
-void CClientUDPSocket::OnPacketReceived(uint32 ip, uint16 port, uint8_t* buffer, size_t length)
+void CClientUDPSocket::OnPacketReceived(
+	const CNetworkAddress &address, uint16 port, uint8_t *buffer, size_t length)
 {
 	wxCHECK_RET(length >= 2, "Invalid packet.");
 
+	// Legacy encrypted/Kad packet handlers remain IPv4-only; keep the family boundary explicit.
+	uint32 ip;
+	if (!GetIPv4PacketAddress(address, ip, logClientUDP, "client")) {
+		return;
+	}
+
 	uint8_t *decryptedBuffer;
 	uint32_t receiverVerifyKey;
 	uint32_t senderVerifyKey;
-	int packetLen = CEncryptedDatagramSocket::DecryptReceivedClient(buffer, length, &decryptedBuffer, ip, &receiverVerifyKey, &senderVerifyKey);
+	int packetLen = CEncryptedDatagramSocket::DecryptReceivedClient(
+		buffer, length, &decryptedBuffer, ip, &receiverVerifyKey, &senderVerifyKey);
 
 	uint8_t protocol = decryptedBuffer0;
-	uint8_t opcode	 = decryptedBuffer1;
+	uint8_t opcode = decryptedBuffer1;
 
 	if (packetLen >= 1) {
 		try {
 			switch (protocol) {
-				case OP_EMULEPROT:
-					ProcessPacket(decryptedBuffer + 2, packetLen - 2, opcode, ip, port);
-					break;
+			case OP_EMULEPROT:
+				ProcessPacket(decryptedBuffer + 2, packetLen - 2, opcode, ip, port);
+				break;
 
-				case OP_KADEMLIAHEADER:
-					theStats::AddDownOverheadKad(length);
-					if (packetLen >= 2) {
-						Kademlia::CKademlia::ProcessPacket(decryptedBuffer, packetLen, wxUINT32_SWAP_ALWAYS(ip), port, (Kademlia::CPrefs::GetUDPVerifyKey(ip) == receiverVerifyKey), Kademlia::CKadUDPKey(senderVerifyKey, theApp->GetPublicIP(false)));
-					} else {
-						throw wxString("Kad packet too short");
-					}
-					break;
+			case OP_KADEMLIAHEADER:
+				theStats::AddDownOverheadKad(length);
+				if (packetLen >= 2) {
+					Kademlia::CKademlia::ProcessPacket(decryptedBuffer,
+						packetLen,
+						wxUINT32_SWAP_ALWAYS(ip),
+						port,
+						(Kademlia::CPrefs::GetUDPVerifyKey(ip) == receiverVerifyKey),
+						Kademlia::CKadUDPKey(
+							senderVerifyKey, theApp->GetPublicIP(false)));
+				} else {
+					throw wxString("Kad packet too short");
+				}
+				break;
 
-				case OP_KADEMLIAPACKEDPROT:
-					theStats::AddDownOverheadKad(length);
-					if (packetLen >= 2) {
-						uint32_t newSize = packetLen * 10 + 300; // Should be enough...
-						std::vector<uint8_t> unpack(newSize);
-						uLongf unpackedsize = newSize - 2;
-						uint16_t result = uncompress(&(unpack2), &unpackedsize, decryptedBuffer + 2, packetLen - 2);
-						if (result == Z_OK) {
-							AddDebugLogLineN(logClientKadUDP, "Correctly uncompressed Kademlia packet");
-							unpack0 = OP_KADEMLIAHEADER;
-							unpack1 = opcode;
-							Kademlia::CKademlia::ProcessPacket(&(unpack0), unpackedsize + 2, wxUINT32_SWAP_ALWAYS(ip), port, (Kademlia::CPrefs::GetUDPVerifyKey(ip) == receiverVerifyKey), Kademlia::CKadUDPKey(senderVerifyKey, theApp->GetPublicIP(false)));
-						} else {
-							AddDebugLogLineN(logClientKadUDP, "Failed to uncompress Kademlia packet");
-						}
+			case OP_KADEMLIAPACKEDPROT:
+				theStats::AddDownOverheadKad(length);
+				if (packetLen >= 2) {
+					uint32_t newSize = packetLen * 10 + 300; // Should be enough...
+					std::vector<uint8_t> unpack(newSize);
+					uLongf unpackedsize = newSize - 2;
+					uint16_t result = uncompress(&(unpack2),
+						&unpackedsize,
+						decryptedBuffer + 2,
+						packetLen - 2);
+					if (result == Z_OK) {
+						AddDebugLogLineN(logClientKadUDP,
+							"Correctly uncompressed Kademlia packet");
+						unpack0 = OP_KADEMLIAHEADER;
+						unpack1 = opcode;
+						Kademlia::CKademlia::ProcessPacket(&(unpack0),
+							unpackedsize + 2,
+							wxUINT32_SWAP_ALWAYS(ip),
+							port,
+							(Kademlia::CPrefs::GetUDPVerifyKey(ip) ==
+								receiverVerifyKey),
+							Kademlia::CKadUDPKey(
+								senderVerifyKey, theApp->GetPublicIP(false)));
 					} else {
-						throw wxString("Kad packet (compressed) too short");
+						AddDebugLogLineN(logClientKadUDP,
+							"Failed to uncompress Kademlia packet");
 					}
-					break;
+				} else {
+					throw wxString("Kad packet (compressed) too short");
+				}
+				break;
+
+			case OP_UDPRESERVEDPROT2:
+				// eMuleAI NAT traversal. Not an eD2k opcode: the byte after the
+				// protocol byte is a frame type, so it is dispatched here rather
+				// than through ProcessPacket(), whose second argument is an opcode.
+				//
+				// Counted as overhead like every sibling branch: these bytes cross
+				// the wire whether or not we can serve the frame, and leaving them
+				// out makes aMule's own figures disagree with what the link shows.
+				//
+				// This branch still reaches no *packet* accounting, which is what
+				// keeps a dropped frame from feeding a ban: CPacketTracking is only
+				// entered from the Kad listener, and an eMuleAI peer's NAT-T
+				// traffic would otherwise read as malformed. Statistics and bans are
+				// separate subsystems; only the second one must stay out of reach.
+				theStats::AddDownOverheadOther(length);
+				ProcessReservedProt2Frame(decryptedBuffer + 1, packetLen - 1, ip, port);
+				break;
 
-				default:
-					AddDebugLogLineN(logClientUDP, CFormat("Unknown opcode on received packet: 0x%x") % protocol);
+			default:
+				AddDebugLogLineN(logClientUDP,
+					CFormat("Unknown opcode on received packet: 0x%x") % protocol);
 			}
-		} catch (const wxString& DEBUG_ONLY(e)) {
+		} catch (const wxString &DEBUG_ONLY(e)) {
 			AddDebugLogLineN(logClientUDP, "Error while parsing UDP packet: " + e);
-		} catch (const CInvalidPacket& DEBUG_ONLY(e)) {
+		} catch (const CInvalidPacket &DEBUG_ONLY(e)) {
 			AddDebugLogLineN(logClientUDP, "Invalid UDP packet encountered: " + e.what());
-		} catch (const CEOFException& DEBUG_ONLY(e)) {
-			AddDebugLogLineN(logClientUDP, "Malformed packet encountered while parsing UDP packet: " + e.what());
+		} catch (const CEOFException &DEBUG_ONLY(e)) {
+			AddDebugLogLineN(logClientUDP,
+				"Malformed packet encountered while parsing UDP packet: " + e.what());
 		}
 	}
 }
 
-
-void CClientUDPSocket::ProcessPacket(uint8_t* packet, int16 size, int8 opcode, uint32 host, uint16 port)
+void CClientUDPSocket::ProcessReservedProt2Frame(
+	const uint8_t *frame, size_t frameLength, uint32 ip, uint16 port)
 {
-	switch (opcode) {
-		case OP_REASKCALLBACKUDP: {
-			AddDebugLogLineN( logClientUDP, "Client UDP socket; OP_REASKCALLBACKUDP" );
-			theStats::AddDownOverheadOther(size);
-			CUpDownClient* buddy = theApp->clientlist->GetBuddy();
-			if( buddy ) {
-				if( size < 17 || buddy->GetSocket() == NULL ) {
-					break;
-				}
-				if (!md4cmp(packet, buddy->GetBuddyID())) {
-					/*
-						The packet has an initial 16 bytes key for the buddy.
-						This is currently unused, so to make the transformation
-						we discard the first 10 bytes below and then overwrite
-						the other 6 with ip/port.
-					*/
-					CMemFile mem_packet(packet+10,size-10);
-					// Change the ip and port while leaving the rest untouched
-					mem_packet.Seek(0,wxFromStart);
-					mem_packet.WriteUInt32(host);
-					mem_packet.WriteUInt16(port);
-					CPacket* response = new CPacket(mem_packet, OP_EMULEPROT, OP_REASKCALLBACKTCP);
-					AddDebugLogLineN( logClientUDP, "Client UDP socket: send OP_REASKCALLBACKTCP" );
-					theStats::AddUpOverheadFileRequest(response->GetPacketSize());
-					buddy->GetSocket()->SendPacket(response);
-				}
+	const SReservedProt2Frame classified = ClassifyReservedProt2Frame(frame, frameLength);
+
+	switch (classified.disposition) {
+	case RP2_TRUNCATED:
+		// Nothing but the protocol byte arrived, so there is no type byte to read. Dropped
+		// without reading the window -- the guard is the point, this being the shortest
+		// datagram that can reach here.
+		if (m_truncatedFrameLog.ShouldLog(::GetTickCount64())) {
+			AddDebugLogLineN(logClientUDP,
+				CFormat("Dropping truncated NAT-T datagram from %s:%u (%u further "
+					"occurrences suppressed)") %
+					Uint32toStringIP(ip) % port %
+					m_truncatedFrameLog.TakeSuppressedCount());
+		}
+		return;
+
+	case RP2_UNKNOWN_TYPE:
+		// A frame type this protocol does not define. Dropped, and deliberately not counted
+		// anywhere: see the OP_UDPRESERVEDPROT2 comment in OnPacketReceived().
+		if (m_unknownFrameLog.ShouldLog(::GetTickCount64())) {
+			AddDebugLogLineN(logClientUDP,
+				CFormat("Dropping NAT-T frame of unknown type 0x%02X from %s:%u (%u further "
+					"occurrences suppressed)") %
+					classified.type % Uint32toStringIP(ip) % port %
+					m_unknownFrameLog.TakeSuppressedCount());
+		}
+		return;
+
+	case RP2_KNOWN_TYPE:
+		break;
+	}
+
+	// The registered types. Each is dropped in its own case rather than in a shared
+	// fallthrough, so the change that ships a transport replaces its own case and nothing else
+	// -- which is what the uTP case below now is. The other four belong to transports this
+	// build does not have, so a peer's attempt at one is a recognised frame aMule cannot serve
+	// rather than malformed traffic.
+	switch (classified.type) {
+	case OP_NATT_FRAME_UTP: {
+#ifdef AMULE_UTP_TRANSPORT
+		wxASSERT(wxIsMainThread());
+		// Classified before libutp sees it, because libutp answers a non-SYN frame
+		// that matches no connection with an unsolicited RST to whatever source
+		// address the datagram claimed (utp_internal.cpp, the flags != ST_SYN
+		// branch). That makes this host a reflector for a forged source, and tells
+		// a stranger who never connected that a uTP peer lives here. A SYN is the
+		// one kind that may arrive from someone we do not know; everything else has
+		// to come from an endpoint that already holds a socket.
+		const EUtpFrameKind kind = ClassifyUtpFrame(classified.payload, classified.payloadLength);
+		const bool fromKnownPeer = m_utp.HasRegisteredPeer(ip, port);
+		if (kind != EUtpFrameKind::Malformed && (kind == EUtpFrameKind::Syn || fromKnownPeer)) {
+			if (ProcessUtpFrame(m_utp, classified, ip, port)) {
+				return;
+			}
+		} else if (kind == EUtpFrameKind::Existing) {
+			// The genuinely unmatched case, which used to leave as an RST with no
+			// line anywhere because libutp had already reported it handled.
+			if (m_utpUnmatchedFrameLog.ShouldLog(::GetTickCount64())) {
+				AddDebugLogLineN(logClientUDP,
+					CFormat("Dropping uTP frame from %s:%u: no uTP socket for that "
+						"peer (%u further occurrences suppressed)") %
+						Uint32toStringIP(ip) % port %
+						m_utpUnmatchedFrameLog.TakeSuppressedCount());
 			}
 			break;
 		}
-		case OP_REASKFILEPING: {
-			AddDebugLogLineN( logClientUDP, "Client UDP socket: OP_REASKFILEPING" );
-			theStats::AddDownOverheadFileRequest(size);
+		// Reached only for a frame libutp would not even look at: shorter than a uTP
+		// header, or a version it does not implement.
+		if (m_utpMalformedFrameLog.ShouldLog(::GetTickCount64())) {
+			AddDebugLogLineN(logClientUDP,
+				CFormat("Dropping malformed uTP frame from %s:%u: too short or an "
+					"unsupported version (%u further occurrences suppressed)") %
+					Uint32toStringIP(ip) % port %
+					m_utpMalformedFrameLog.TakeSuppressedCount());
+		}
+#else
+		if (m_unservedFrameLog.ShouldLog(::GetTickCount64())) {
+			AddDebugLogLineN(logClientUDP,
+				CFormat("Ignoring uTP NAT-T frame from %s:%u: no uTP transport in this "
+					"build (%u further occurrences suppressed)") %
+					Uint32toStringIP(ip) % port %
+					m_unservedFrameLog.TakeSuppressedCount());
+		}
+#endif
+		break;
+	}
 
-			CMemFile data_in(packet, size);
-			CMD4Hash reqfilehash = data_in.ReadHash();
-			CKnownFile* reqfile = theApp->sharedfiles->GetFileByID(reqfilehash);
-			bool bSenderMultipleIpUnknown = false;
-			CUpDownClient* sender = theApp->uploadqueue->GetWaitingClientByIP_UDP(host, port, true, &bSenderMultipleIpUnknown);
+	case OP_NATT_FRAME_QUIC:
+		if (m_unservedFrameLog.ShouldLog(::GetTickCount64())) {
+			AddDebugLogLineN(logClientUDP,
+				CFormat("Ignoring QUIC NAT-T frame from %s:%u: no QUIC transport in this "
+					"build (%u further occurrences suppressed)") %
+					Uint32toStringIP(ip) % port %
+					m_unservedFrameLog.TakeSuppressedCount());
+		}
+		break;
+
+	case OP_NATT_FRAME_CAPS:
+	case OP_NATT_FRAME_CAPS_ACK:
+		// Answering the capability negotiation would claim a transport
+		// aMule does not have. Silence is the correct answer here.
+		if (m_unservedFrameLog.ShouldLog(::GetTickCount64())) {
+			AddDebugLogLineN(logClientUDP,
+				CFormat("Ignoring NAT-T capability frame 0x%02X from %s:%u: nothing to "
+					"negotiate (%u further occurrences suppressed)") %
+					classified.type % Uint32toStringIP(ip) % port %
+					m_unservedFrameLog.TakeSuppressedCount());
+		}
+		break;
+
+	case OP_NATT_FRAME_KEY:
+		if (m_unservedFrameLog.ShouldLog(::GetTickCount64())) {
+			AddDebugLogLineN(logClientUDP,
+				CFormat("Ignoring NAT-T key frame from %s:%u: no NAT traversal in this "
+					"build (%u further occurrences suppressed)") %
+					Uint32toStringIP(ip) % port %
+					m_unservedFrameLog.TakeSuppressedCount());
+		}
+		break;
+
+	default:
+		// Unreachable: ClassifyReservedProt2Frame only reports RP2_KNOWN_TYPE for the five
+		// cases above. Kept so that adding a type there without a case here fails loudly
+		// rather than silently taking the drop path.
+		wxFAIL;
+		break;
+	}
+}
 
-			if (!reqfile) {
-				CPacket* response = new CPacket(OP_FILENOTFOUND,0,OP_EMULEPROT);
+void CClientUDPSocket::ProcessPacket(uint8_t *packet, int16 size, int8 opcode, uint32 host, uint16 port)
+{
+	switch (opcode) {
+	case OP_REASKCALLBACKUDP: {
+		AddDebugLogLineN(logClientUDP, "Client UDP socket; OP_REASKCALLBACKUDP");
+		theStats::AddDownOverheadOther(size);
+		CUpDownClient *buddy = theApp->clientlist->GetBuddy();
+		if (buddy) {
+			if (size < 17 || buddy->GetSocket() == NULL) {
+				break;
+			}
+			if (!md4cmp(packet, buddy->GetBuddyID())) {
+				/* The packet starts with a 16-byte key for the buddy. It is currently
+				   unused, so the transformation discards the first 10 bytes below and
+				   overwrites the other 6 with ip/port. */
+				CMemFile mem_packet(packet + 10, size - 10);
+				// Change the ip and port while leaving the rest untouched
+				mem_packet.Seek(0, wxFromStart);
+				mem_packet.WriteUInt32(host);
+				mem_packet.WriteUInt16(port);
+				CPacket *response =
+					new CPacket(mem_packet, OP_EMULEPROT, OP_REASKCALLBACKTCP);
+				AddDebugLogLineN(logClientUDP, "Client UDP socket: send OP_REASKCALLBACKTCP");
 				theStats::AddUpOverheadFileRequest(response->GetPacketSize());
-				if (sender) {
-					SendPacket(response, host, port, sender->ShouldReceiveCryptUDPPackets(), sender->GetUserHash().GetHash(), false, 0);
-				} else {
-					SendPacket(response, host, port, false, NULL, false, 0);
-				}
+				buddy->GetSocket()->SendPacket(response);
+			}
+		}
+		break;
+	}
+	case OP_REASKFILEPING: {
+		AddDebugLogLineN(logClientUDP, "Client UDP socket: OP_REASKFILEPING");
+		theStats::AddDownOverheadFileRequest(size);
 
+		CMemFile data_in(packet, size);
+		CMD4Hash reqfilehash = data_in.ReadHash();
+		CKnownFile *reqfile = theApp->sharedfiles->GetFileByID(reqfilehash);
+		bool bSenderMultipleIpUnknown = false;
+		CUpDownClient *sender = theApp->uploadqueue->GetWaitingClientByIP_UDP(
+			CNetworkAddress::FromIPv4NetworkOrderOrAbsent(host),
+			port,
+			true,
+			&bSenderMultipleIpUnknown);
+
+		if (!reqfile) {
+			CPacket *response = new CPacket(OP_FILENOTFOUND, 0, OP_EMULEPROT);
+			theStats::AddUpOverheadFileRequest(response->GetPacketSize());
+			if (sender) {
+				SendPacket(response,
+					host,
+					port,
+					sender->ShouldReceiveCryptUDPPackets(),
+					sender->GetUserHash().GetHash(),
+					false,
+					0);
+			} else {
+				SendPacket(response, host, port, false, NULL, false, 0);
+			}
+
+			break;
+		}
+
+		if (sender) {
+			sender->CheckForAggressive();
+			if (sender->IsBanned()) {
+				// CheckForAggressive can call Ban() on score >= 10. Mirror the TCP
+				// file-request path at ClientTCPSocket.cpp:539 and short-circuit,
+				// so a freshly banned client cannot keep the seeder processing UDP
+				// file-info packets.
 				break;
 			}
 
-			if (sender){
-				sender->CheckForAggressive();
-				if (sender->IsBanned()) {
-					// CheckForAggressive can call Ban() on score >= 10.
-					// Mirror the TCP file-request path at
-					// ClientTCPSocket.cpp:539 and short-circuit so a
-					// freshly-banned client cannot keep the seeder
-					// processing UDP file-info packets.
-					break;
-				}
+			// Make sure we are still thinking about the same file
+			if (reqfilehash == sender->GetUploadFileID()) {
+				sender->AddAskedCount();
+				sender->SetUDPPort(port);
+				sender->SetLastUpRequest();
 
-				//Make sure we are still thinking about the same file
-				if (reqfilehash == sender->GetUploadFileID()) {
-					sender->AddAskedCount();
-					sender->SetUDPPort(port);
-					sender->SetLastUpRequest();
-
-					if (sender->GetUDPVersion() > 3) {
-						sender->ProcessExtendedInfo(&data_in, reqfile);
-					} else  if (sender->GetUDPVersion() > 2) {
-						uint16 nCompleteCountLast = sender->GetUpCompleteSourcesCount();
-						uint16 nCompleteCountNew = data_in.ReadUInt16();
-						sender->SetUpCompleteSourcesCount(nCompleteCountNew);
-						if (nCompleteCountLast != nCompleteCountNew) {
-							reqfile->UpdatePartsInfo();
-						}
+				if (sender->GetUDPVersion() > 3) {
+					sender->ProcessExtendedInfo(&data_in, reqfile);
+				} else if (sender->GetUDPVersion() > 2) {
+					uint16 nCompleteCountLast = sender->GetUpCompleteSourcesCount();
+					uint16 nCompleteCountNew = data_in.ReadUInt16();
+					sender->SetUpCompleteSourcesCount(nCompleteCountNew);
+					if (nCompleteCountLast != nCompleteCountNew) {
+						reqfile->UpdatePartsInfo();
 					}
+				}
 
-					CMemFile data_out(128);
-					if(sender->GetUDPVersion() > 3) {
-						if (reqfile->IsPartFile()) {
-							static_cast<CPartFile*>(reqfile)->WritePartStatus(&data_out);
-						} else {
-							data_out.WriteUInt16(0);
-						}
+				CMemFile data_out(128);
+				if (sender->GetUDPVersion() > 3) {
+					if (reqfile->IsPartFile()) {
+						static_cast<CPartFile *>(reqfile)->WritePartStatus(&data_out);
+					} else {
+						data_out.WriteUInt16(0);
 					}
+				}
 
-					data_out.WriteUInt16(sender->GetUploadQueueWaitingPosition());
-					CPacket* response = new CPacket(data_out, OP_EMULEPROT, OP_REASKACK);
+				data_out.WriteUInt16(sender->GetUploadQueueWaitingPosition());
+				CPacket *response = new CPacket(data_out, OP_EMULEPROT, OP_REASKACK);
+				theStats::AddUpOverheadFileRequest(response->GetPacketSize());
+				AddDebugLogLineN(logClientUDP,
+					"Client UDP socket: OP_REASKACK to " + sender->GetFullIP());
+				SendPacket(response,
+					host,
+					port,
+					sender->ShouldReceiveCryptUDPPackets(),
+					sender->GetUserHash().GetHash(),
+					false,
+					0);
+			} else {
+				AddDebugLogLineN(logClientUDP,
+					"Client UDP socket; ReaskFilePing; reqfile does not match");
+			}
+		} else {
+			if (!bSenderMultipleIpUnknown) {
+				if ((theStats::GetWaitingUserCount() + 50) > thePrefs::GetQueueSize()) {
+					CPacket *response = new CPacket(OP_QUEUEFULL, 0, OP_EMULEPROT);
 					theStats::AddUpOverheadFileRequest(response->GetPacketSize());
-					AddDebugLogLineN( logClientUDP, "Client UDP socket: OP_REASKACK to " + sender->GetFullIP());
-					SendPacket(response, host, port, sender->ShouldReceiveCryptUDPPackets(), sender->GetUserHash().GetHash(), false, 0);
-				} else {
-					AddDebugLogLineN( logClientUDP, "Client UDP socket; ReaskFilePing; reqfile does not match" );
+					SendPacket(response,
+						host,
+						port,
+						false,
+						NULL,
+						false,
+						0); // we cannot answer this one encrypted since we dont know
+						    // this client
 				}
 			} else {
-				if (!bSenderMultipleIpUnknown) {
-					if ((theStats::GetWaitingUserCount() + 50) > thePrefs::GetQueueSize()) {
-						CPacket* response = new CPacket(OP_QUEUEFULL,0,OP_EMULEPROT);
-						theStats::AddUpOverheadFileRequest(response->GetPacketSize());
-						SendPacket(response,host,port, false, NULL, false, 0); // we cannot answer this one encrypted since we dont know this client
-					}
-				} else {
-					AddDebugLogLineN(logClientUDP, CFormat("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("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: {
-			AddDebugLogLineN( logClientUDP, "Client UDP socket: OP_QUEUEFULL" );
-			theStats::AddDownOverheadOther(size);
-			CUpDownClient* sender = theApp->downloadqueue->GetDownloadClientByIP_UDP(host,port);
-			if (sender) {
-				sender->SetRemoteQueueFull(true);
-				sender->UDPReaskACK(0);
-			}
-			break;
+		break;
+	}
+	case OP_QUEUEFULL: {
+		AddDebugLogLineN(logClientUDP, "Client UDP socket: OP_QUEUEFULL");
+		theStats::AddDownOverheadOther(size);
+		CUpDownClient *sender = theApp->downloadqueue->GetDownloadClientByIP_UDP(host, port);
+		if (sender) {
+			sender->SetRemoteQueueFull(true);
+			sender->UDPReaskACK(0);
 		}
-		case OP_REASKACK: {
-			theStats::AddDownOverheadFileRequest(size);
-			CUpDownClient* sender = theApp->downloadqueue->GetDownloadClientByIP_UDP(host,port);
-			if (sender) {
-				CMemFile data_in(packet,size);
-				if ( sender->GetUDPVersion() > 3 ) {
-					sender->ProcessFileStatus(true, &data_in, sender->GetRequestFile());
-				}
-				uint16 nRank = data_in.ReadUInt16();
-				sender->SetRemoteQueueFull(false);
-				sender->UDPReaskACK(nRank);
+		break;
+	}
+	case OP_REASKACK: {
+		theStats::AddDownOverheadFileRequest(size);
+		CUpDownClient *sender = theApp->downloadqueue->GetDownloadClientByIP_UDP(host, port);
+		if (sender) {
+			CMemFile data_in(packet, size);
+			if (sender->GetUDPVersion() > 3) {
+				sender->ProcessFileStatus(true, &data_in, sender->GetRequestFile());
 			}
-			break;
+			uint16 nRank = data_in.ReadUInt16();
+			sender->SetRemoteQueueFull(false);
+			sender->UDPReaskACK(nRank);
 		}
-		case OP_FILENOTFOUND: {
-			AddDebugLogLineN( logClientUDP, "Client UDP socket: OP_FILENOTFOUND" );
-			theStats::AddDownOverheadFileRequest(size);
-			CUpDownClient* sender = theApp->downloadqueue->GetDownloadClientByIP_UDP(host,port);
-			if (sender){
-				sender->UDPReaskFNF(); // may delete 'sender'!
-				sender = NULL;
-			}
+		break;
+	}
+	case OP_FILENOTFOUND: {
+		AddDebugLogLineN(logClientUDP, "Client UDP socket: OP_FILENOTFOUND");
+		theStats::AddDownOverheadFileRequest(size);
+		CUpDownClient *sender = theApp->downloadqueue->GetDownloadClientByIP_UDP(host, port);
+		if (sender) {
+			sender->UDPReaskFNF(); // may delete 'sender'!
+			sender = NULL;
+		}
+		break;
+	}
+	case OP_DIRECTCALLBACKREQ: {
+		AddDebugLogLineN(logClientUDP, "Client UDP socket: OP_DIRECTCALLBACKREQ");
+		theStats::AddDownOverheadOther(size);
+		if (!theApp->clientlist->AllowCallbackRequest(host)) {
+			AddDebugLogLineN(logClientUDP,
+				"Ignored DirectCallback Request because this IP (" + Uint32toStringIP(host) +
+					") has sent too many requests within a short time");
 			break;
 		}
-		case OP_DIRECTCALLBACKREQ:
-		{
-			AddDebugLogLineN( logClientUDP, "Client UDP socket: OP_DIRECTCALLBACKREQ" );
-			theStats::AddDownOverheadOther(size);
-			if (!theApp->clientlist->AllowCallbackRequest(host)) {
-				AddDebugLogLineN(logClientUDP, "Ignored DirectCallback Request because this IP (" + Uint32toStringIP(host) + ") has sent too many requests within a short time");
-				break;
-			}
-			// do we accept callbackrequests at all?
-			if (Kademlia::CKademlia::IsRunning() && Kademlia::CKademlia::IsFirewalled()) {
-				theApp->clientlist->AddTrackCallbackRequests(host);
-				CMemFile data(packet, size);
-				uint16_t remoteTCPPort = data.ReadUInt16();
-				CMD4Hash userHash(data.ReadHash());
-				uint8_t connectOptions = data.ReadUInt8();
-				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->GetClient();
-						break;
-					}
-				}
-				if (requester == NULL) {
-					requester = new CUpDownClient(remoteTCPPort, host, 0, 0, NULL, true, true);
-					requester->SetUserHash(CMD4Hash(userHash));
-					theApp->clientlist->AddClient(requester);
+		// do we accept callbackrequests at all?
+		if (Kademlia::CKademlia::IsRunning() && Kademlia::CKademlia::IsFirewalled()) {
+			theApp->clientlist->AddTrackCallbackRequests(host);
+			CMemFile data(packet, size);
+			uint16_t remoteTCPPort = data.ReadUInt16();
+			CMD4Hash userHash(data.ReadHash());
+			uint8_t connectOptions = data.ReadUInt8();
+			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->GetClient();
+					break;
 				}
-				requester->SetConnectOptions(connectOptions, true, false);
-				requester->SetDirectUDPCallbackSupport(false);
-				requester->SetIP(host);
-				requester->SetUserPort(remoteTCPPort);
-				AddDebugLogLineN(logClientUDP, "Accepting incoming DirectCallback Request from " + Uint32toStringIP(host));
-				requester->TryToConnect();
-			} else {
-				AddDebugLogLineN(logClientUDP, "Ignored DirectCallback Request because we do not accept Direct Callbacks at all (" + Uint32toStringIP(host) + ")");
 			}
-			break;
+			if (requester == NULL) {
+				requester = new CUpDownClient(remoteTCPPort, host, 0, 0, NULL, true, true);
+				requester->SetUserHash(CMD4Hash(userHash));
+				theApp->clientlist->AddClient(requester);
+			}
+			requester->SetConnectOptions(connectOptions, true, false);
+			requester->SetDirectUDPCallbackSupport(false);
+			requester->SetIP(host);
+			requester->SetUserPort(remoteTCPPort);
+			AddDebugLogLineN(logClientUDP,
+				"Accepting incoming DirectCallback Request from " + Uint32toStringIP(host));
+			requester->TryToConnect();
+		} else {
+			AddDebugLogLineN(logClientUDP,
+				"Ignored DirectCallback Request because we do not accept Direct Callbacks at "
+				"all (" +
+					Uint32toStringIP(host) + ")");
 		}
-		default:
-			theStats::AddDownOverheadOther(size);
+		break;
+	}
+	default:
+		theStats::AddDownOverheadOther(size);
 	}
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ClientUDPSocket.h -> amule-3.1.0.tar.gz/src/ClientUDPSocket.h Changed

@@ -27,18 +27,71 @@
 #define CLIENTUDPSOCKET_H
 
 #include "MuleUDPSocket.h"
+#include "ReservedProtocolFrames.h" // Needed for CFrameLogThrottle
+
+#ifdef AMULE_UTP_TRANSPORT
+#include "UtpContext.h"
+#include "UtpStreamAcceptor.h"
+#endif
 
 class CClientUDPSocket : public CMuleUDPSocket
+#ifdef AMULE_UTP_TRANSPORT
+,
+			 private IUtpDatagramSink
+#endif
 {
 public:
 	CClientUDPSocket(const amuleIPV4Address &address, const CProxyData *ProxyData = NULL);
+#ifdef AMULE_UTP_TRANSPORT
+	~CClientUDPSocket() override;
+	void Close() override;
+	void TickUtp();
+	IUtpContext *GetUtpContext() { return &m_utp; }
+#endif
 
 protected:
-	void	OnReceive(int errorCode);
+	void OnReceive(int errorCode) override;
 
 private:
-	void	OnPacketReceived(uint32 ip, uint16 port, uint8_t* buffer, size_t length);
-	void	ProcessPacket(uint8_t* packet, int16 size, int8 opcode, uint32 host, uint16 port);
+#ifdef AMULE_UTP_TRANSPORT
+	void SendUtpDatagram(const uint8_t *payload,
+		size_t length,
+		uint32_t ip,
+		uint16_t port,
+		bool encrypt,
+		const uint8_t *userHash) override;
+	CUtpContext m_utp;
+	CUtpStreamAcceptor m_utpAcceptor;
+#endif
+	void OnPacketReceived(
+		const CNetworkAddress &address, uint16 port, uint8_t *buffer, size_t length) override;
+	void ProcessPacket(uint8_t *packet, int16 size, int8 opcode, uint32 host, uint16 port);
+
+	/**
+	 * OP_UDPRESERVEDPROT2: no opcode, a frame type byte instead.
+	 *
+	 * @param frame  points at the frame type byte.
+	 * @param frameLength  bytes available from there. Zero is a datagram that carried nothing
+	 * but the
+	 *                     protocol byte.
+	 */
+	void ProcessReservedProt2Frame(const uint8_t *frame, size_t frameLength, uint32 ip, uint16 port);
+
+	//! One unknown-frame line per minute, with a suppressed count. A peer speaking a frame type
+	//! this build does not know retries, so the useful information is that it happened plus how
+	//! often.
+	// One throttle per reason rather than one for the branch: a peer flooding
+	// any single kind of frame must not be able to silence the diagnostics for
+	// the others. The uTP case keeps its own because it is the line a developer
+	// is usually looking for, meaning libutp saw the datagram and disclaimed it.
+	CFrameLogThrottle m_truncatedFrameLog{ 60 * 1000 };
+	CFrameLogThrottle m_unknownFrameLog{ 60 * 1000 };
+	CFrameLogThrottle m_unservedFrameLog{ 60 * 1000 };
+	CFrameLogThrottle m_utpUnmatchedFrameLog{ 60 * 1000 };
+	// Separate from the unmatched one: a frame nobody can parse and a frame from
+	// a peer we have no socket for are different problems, and sharing a
+	// throttle would let a flood of one hide the other entirely.
+	CFrameLogThrottle m_utpMalformedFrameLog{ 60 * 1000 };
 };
 
 #endif // CLIENTUDPSOCKET_H

amule-3.1.0.tar.gz/src/ClientVersionString.cpp Added

@@ -0,0 +1,86 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// 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 "ClientVersionString.h"
+
+#include <common/Format.h>
+#include <protocol/ed2k/ClientSoftware.h>
+
+#include <wx/string.h>
+
+wxString FormatClientVersion(uint32 clientSoft, uint32 major, uint32 minor, uint32 update)
+{
+	switch (clientSoft) {
+	case SO_AMULE:
+	case SO_LXMULE:
+	case SO_HYDRANODE:
+	case SO_MLDONKEY:
+	case SO_NEW_MLDONKEY:
+	case SO_NEW2_MLDONKEY:
+		// The mule/mldonkey family versions itself with three numbers.
+		return CFormat(wxT("v%u.%u.%u")) % major % minor % update;
+
+	case SO_EDONKEYHYBRID:
+		// Three numbers as well, but it drops a zero update rather than
+		// printing it.
+		if (update == 0) {
+			return CFormat(wxT("v%u.%u")) % major % minor;
+		}
+		return CFormat(wxT("v%u.%u.%u")) % major % minor % update;
+
+	case SO_LPHANT:
+		// Counts its major one higher than the wire does, pads the minor to
+		// two digits, and letters the update from 'a'.
+		return CFormat(wxT(" v%u.%.2u%c")) % (major - 1) % minor % ('a' + update);
+
+	case SO_EMULEPLUS: {
+		// Omits whichever trailing components are zero, and letters the
+		// update from 'a' meaning 1 -- unlike eMule, where 'a' means 0.
+		wxString out = CFormat(wxT("v%u")) % major;
+		if (minor != 0) {
+			out += CFormat(wxT(".%u")) % minor;
+		}
+		if (update != 0) {
+			out += CFormat(wxT("%c")) % ('a' + update - 1);
+		}
+		return out;
+	}
+
+	default:
+		// eMule and everything modelled on it: the update is a letter, 'a' meaning 0. This
+		// is the case the history rows used to render as a digit.
+		return CFormat(wxT("v%u.%u%c")) % major % minor % ('a' + update);
+	}
+}
+
+wxString FormatPackedClientVersion(uint32 clientSoft, uint32 packedVersion)
+{
+	// MAKE_CLIENT_VERSION is a decimal composite, not a bitfield:
+	// major * 100000 + minor * 1000 + update * 100.
+	return FormatClientVersion(clientSoft,
+		packedVersion / 100000,
+		(packedVersion % 100000) / 1000,
+		(packedVersion % 1000) / 100);
+}

amule-3.1.0.tar.gz/src/ClientVersionString.h Added

@@ -0,0 +1,57 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// 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 CLIENTVERSIONSTRING_H
+#define CLIENTVERSIONSTRING_H
+
+#include "Types.h"
+
+class wxString;
+
+/**
+ * Render a client's version the way that client's own project writes it.
+ *
+ * The conventions differ per software and are not cosmetic: eMule spells its update component as a
+ * letter (0.70b, not 0.70.1), eMule Plus omits zero components, lPhant counts its major from one
+ * higher than the wire does, and the mule/mldonkey family really is three numbers.
+ *
+ * This exists because the rendering was reachable from two directions that had drifted apart. The
+ * handshake built the string from locals and got it right; the client-history rows re-derived it
+ * from the stored numeric with a fixed `v%u.%u.%u`, which silently dropped every convention above.
+ * The same peer could therefore be listed twice in one window under two different versions,
+ * depending only on whether it happened to be online (amule-org/amule#1127).
+ *
+ * `major`, `minor` and `update` are the decoded components, not the packed value
+ * MAKE_CLIENT_VERSION produces.
+ */
+wxString FormatClientVersion(uint32 clientSoft, uint32 major, uint32 minor, uint32 update);
+
+/**
+ * As above, from the packed form MAKE_CLIENT_VERSION produces and CreditStruct/ClientMetaStruct
+ * stores, which is a decimal composite rather than a bitfield.
+ */
+wxString FormatPackedClientVersion(uint32 clientSoft, uint32 packedVersion);
+
+#endif // CLIENTVERSIONSTRING_H

amule-3.1.0.tar.gz/src/ClientsListCtrl.cpp Added

@@ -0,0 +1,333 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "ClientsListCtrl.h" // Interface declarations
+
+#include <algorithm>
+#include <unordered_map>
+
+#include <common/Format.h> // Needed for CFormat
+
+#include "amule.h"              // Needed for theApp
+#include "ClientDetailDialog.h" // Needed for CClientDetailDialog
+#include "ClientList.h"         // Needed for CClientList::FindClientByECID
+#include "ClientRef.h"          // Needed for CClientRef
+#include "DataToText.h"         // Needed for GetSoftName, OriginToText
+#include "MuleBarRenderer.h"    // Needed for CBarFillSpec, CMuleBarRenderer
+#include "OtherFunctions.h"     // Needed for CastItoXBytes, CastItoSpeed
+#include "muuli_wdr.h"          // Needed for ID_CLIENTSLIST
+
+namespace
+{
+/**
+ * Renders the Name column.
+ *
+ * Same extension point the per-file client lists use (see CGenericClientListCtrl's renderer of the
+ * same name): CMuleBarRenderer is borrowed for its identity-carrying CBarFillSpec, not to draw a
+ * bar. The identity here is the row's own snapshot rather than a client, since that is what this
+ * list holds, and the drawing is DrawClientNameCell() either way.
+ */
+class CClientsNameRenderer : public CMuleBarRenderer
+{
+public:
+	bool Render(wxRect cell, wxDC *dc, int WXUNUSED(state)) override
+	{
+		const ClientNameCell *data =
+			reinterpret_cast<const ClientNameCell *>(GetSpec().GetIdentity());
+		if (data != nullptr) {
+			DrawClientNameCell(*data, cell, dc);
+		}
+		return true;
+	}
+};
+} // namespace
+
+CClientsListCtrl::CClientsListCtrl(
+	wxWindow *parent, int id, const wxPoint &pos, wxSize size, int flags, const wxString &tableName)
+: CClientRowListCtrl(parent, id, pos, size, flags)
+{
+	const int colFlags = wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE;
+	// Owns its drawing so the badge icons match the per-file client lists;
+	// still sorts and compares on the plain name text.
+	AddBarColumn(_("Name"), COLUMN_CLIENTS_NAME, "N", 200, colFlags, new CClientsNameRenderer());
+	AddTextColumn(_("Software"), COLUMN_CLIENTS_SOFTWARE, "S", 110, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Version"), COLUMN_CLIENTS_VERSION, "V", 90, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("IP Address"), COLUMN_CLIENTS_ADDRESS, "I", 140, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Origin"), COLUMN_CLIENTS_ORIGIN, "O", 110, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Files"), COLUMN_CLIENTS_FILES, "F", 220, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Upload Speed"), COLUMN_CLIENTS_UP_SPEED, "U", 100, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Download Speed"), COLUMN_CLIENTS_DOWN_SPEED, "D", 100, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Uploaded"), COLUMN_CLIENTS_SESSION_UP, "u", 100, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Downloaded"), COLUMN_CLIENTS_SESSION_DOWN, "d", 100, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Total Uploaded"), COLUMN_CLIENTS_TOTAL_UP, "T", 110, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Total Downloaded"), COLUMN_CLIENTS_TOTAL_DOWN, "t", 110, wxALIGN_LEFT, colFlags);
+	// Named for what the value is, not what it looks like: it is the credit modifier the
+	// detail dialog already labels this way, with a 2x on the downloaded side, so "Ratio"
+	// invited reading it as uploaded-vs-downloaded.
+	AddTextColumn(_("DL/UP modifier"), COLUMN_CLIENTS_RATIO, "R", 120, wxALIGN_LEFT, colFlags);
+
+	AppendSpacerColumn(COLUMN_CLIENTS_SPACER);
+
+	AssociateVirtualModel();
+
+	ApplySorting(COLUMN_CLIENTS_NAME, 0);
+
+	m_columnStore.SetTableName(tableName);
+	LoadColumnSettings();
+	InitColumnState();
+}
+
+CClientsListCtrl::~CClientsListCtrl() = default;
+
+const CClientsListCtrl::Row *CClientsListCtrl::RowFor(wxUIntPtr item) const
+{
+	// The item data is the peer's ECID. CECID hands out ++counter starting at
+	// 1, so it never collides with 0, which the base returns for "no item".
+	const auto it = m_rowOfEcid.find(static_cast<uint32>(item));
+	return it != m_rowOfEcid.end() ? &m_rowsit->second : nullptr;
+}
+
+void CClientsListCtrl::ReindexRows()
+{
+	m_rowOfEcid.clear();
+	m_rowOfEcid.reserve(m_rows.size());
+	for (size_t i = 0; i < m_rows.size(); ++i) {
+		m_rowOfEcidm_rowsi.ecid = i;
+	}
+}
+
+void CClientsListCtrl::SetClients(std::vector<Row> &&rows)
+{
+	// A peer with no ECID cannot be addressed as an item, and every live peer
+	// has one, so this only ever drops a row the sweep could not identify.
+	rows.erase(std::remove_if(rows.begin(), rows.end(), (const Row &row) { return row.ecid == 0; }),
+		rows.end());
+
+	// The common case by far: the same peers as last second, with new numbers. Overwrite the
+	// rows where they sit and refresh them. Rebuilding the model instead -- which is all this
+	// used to do -- discards the scroll position every time the poll lands, so a list a person
+	// is reading jumps back to the top once a second.
+	if (rows.size() == m_rows.size()) {
+		std::unordered_map<uint32, const Row *> incoming;
+		incoming.reserve(rows.size());
+		for (const Row &row : rows) {
+			incomingrow.ecid = &row;
+		}
+		bool sameSet = incoming.size() == m_rows.size();
+		for (const Row &row : m_rows) {
+			if (incoming.count(row.ecid) == 0) {
+				sameSet = false;
+				break;
+			}
+		}
+		if (sameSet) {
+			// Only the rows that actually moved. Refreshing all of them cost a repaint
+			// per visible row on every tick even when nothing had changed, which on a
+			// page that never sits still is most of the work it was doing (issue #920).
+			//
+			// Per row rather than a blanket Refresh() so the control's own viewport
+			// gate applies -- off-screen rows cost nothing -- and so a live sort column
+			// still gets the chance to reorder.
+			for (Row &row : m_rows) {
+				const Row &fresh = *incomingrow.ecid;
+				if (row == fresh) {
+					continue;
+				}
+				row = fresh;
+				RefreshItemData(static_cast<wxUIntPtr>(row.ecid));
+			}
+			return;
+		}
+	}
+
+	// A peer arrived or left, so the row set changed and the model has to be rebuilt. The
+	// selection is carried across by ECID and therefore still names the same peers afterwards,
+	// whatever order the sweep produced.
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	ClearItemData();
+	m_rows = std::move(rows);
+	ReindexRows();
+	for (const Row &row : m_rows) {
+		AppendItemData(static_cast<wxUIntPtr>(row.ecid));
+	}
+	FinishBulkLoad();
+	SetSelectedItemData(selected);
+}
+
+const ClientNameCell *CClientsListCtrl::NameCellFor(wxUIntPtr item) const
+{
+	const Row *row = RowFor(item);
+	return row != nullptr ? &row->nameCell : nullptr;
+}
+
+bool CClientsListCtrl::PeerForItem(wxUIntPtr data, PeerIdentity &out) const
+{
+	// Start clean: this is an out parameter and the fields below are only assigned when they
+	// are known, so anything left from a previous call would be read as belonging to this row.
+	out = PeerIdentity();
+	// By ECID: within one daemon process that names exactly this peer. A row is only ever as
+	// current as the last sweep, so a miss means the peer has gone.
+	//
+	// Every row here is a peer we are connected to, so identity is taken from the live client
+	// rather than from the row -- there is no case where one is known and the other is not.
+	const Row *row = RowFor(data);
+	if (row == nullptr || row->ecid == 0) {
+		return false;
+	}
+	CClientRef found;
+#ifdef CLIENT_GUI
+	// The container already holds a reference; copying it links another.
+	CClientRef *ref = theApp->clientlist->GetByID(row->ecid);
+	if (ref != nullptr && ref->GetClient() != nullptr) {
+		found = *ref;
+	}
+#else
+	CUpDownClient *client = theApp->clientlist->FindClientByECID(row->ecid);
+	if (client != nullptr) {
+		found = CCLIENTREF(client, wxT("CClientsListCtrl::PeerForItem"));
+	}
+#endif
+	if (!found.IsLinked()) {
+		return false;
+	}
+	out = PeerIdentity::FromClient(found);
+	return true;
+}
+
+wxString CClientsListCtrl::GetItemColumnText(wxUIntPtr item, unsigned column) const
+{
+	const Row *row = RowFor(item);
+	if (row == nullptr) {
+		return wxEmptyString;
+	}
+
+	switch (column) {
+	case COLUMN_CLIENTS_NAME:
+		if (!row->name.IsEmpty()) {
+			return row->name;
+		}
+		return Uint32toStringIP(row->ip);
+
+	case COLUMN_CLIENTS_SOFTWARE:
+		return row->software;
+
+	case COLUMN_CLIENTS_VERSION:
+		return row->version;
+
+	case COLUMN_CLIENTS_ADDRESS:
+		return CFormat(wxT("%s:%u")) % Uint32toStringIP(row->ip) % row->port;
+
+	case COLUMN_CLIENTS_ORIGIN:
+		// OriginToText() hands back the wxTRANSLATE() marker, which is only an extraction
+		// hint -- the lookup has to happen here, the way the download list's source column
+		// already does it.
+		return wxGetTranslation(OriginToText(row->sourceFrom));
+
+	case COLUMN_CLIENTS_FILES:
+		return row->files;
+
+	case COLUMN_CLIENTS_UP_SPEED:
+		return row->upSpeed ? CastItoSpeed(row->upSpeed) : wxString();
+
+	case COLUMN_CLIENTS_DOWN_SPEED:
+		return row->downSpeed > 0.001 ? CastItoSpeed(static_cast<uint32>(row->downSpeed * 1024))
+					      : wxString();
+
+	case COLUMN_CLIENTS_SESSION_UP:
+		return CastItoXBytes(row->sessionUp);
+
+	case COLUMN_CLIENTS_SESSION_DOWN:
+		return CastItoXBytes(row->sessionDown);
+
+	case COLUMN_CLIENTS_TOTAL_UP:
+		return CastItoXBytes(row->totalUp);
+
+	case COLUMN_CLIENTS_TOTAL_DOWN:
+		return CastItoXBytes(row->totalDown);
+
+	case COLUMN_CLIENTS_RATIO:
+		// The core's credit modifier (CClientCredits::GetCreditRatio), not a ratio worked
+		// out here: the Known tab and the API render the same number from the same source.
+		// A peer with no credit record yet reads 0, which is not a modifier the core can
+		// apply, so the cell stays blank.
+		if (row->creditRatio <= 0.0) {
+			return wxEmptyString;
+		}
+		return CFormat(wxT("%.2f")) % row->creditRatio;
+
+	default:
+		return wxEmptyString;
+	}
+}
+
+bool CClientsListCtrl::IsLiveSortColumn() const
+{
+	if (m_sort_orders.empty()) {
+		return false;
+	}
+	switch (m_sort_orders.front().first) {
+	case COLUMN_CLIENTS_UP_SPEED:
+	case COLUMN_CLIENTS_DOWN_SPEED:
+	case COLUMN_CLIENTS_SESSION_UP:
+	case COLUMN_CLIENTS_SESSION_DOWN:
+	case COLUMN_CLIENTS_TOTAL_UP:
+	case COLUMN_CLIENTS_TOTAL_DOWN:
+	case COLUMN_CLIENTS_RATIO:
+		return true;
+	default:
+		return false;
+	}
+}
+
+int CClientsListCtrl::CompareItemData(
+	wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool WXUNUSED(alt), int modifier) const
+{
+	const Row *r1 = RowFor(data1);
+	const Row *r2 = RowFor(data2);
+	if (r1 == nullptr || r2 == nullptr) {
+		return 0;
+	}
+
+	switch (column) {
+	case COLUMN_CLIENTS_UP_SPEED:
+		return modifier * CmpAny(r1->upSpeed, r2->upSpeed);
+	case COLUMN_CLIENTS_DOWN_SPEED:
+		return modifier * CmpAny(r1->downSpeed, r2->downSpeed);
+	case COLUMN_CLIENTS_SESSION_UP:
+		return modifier * CmpAny(r1->sessionUp, r2->sessionUp);
+	case COLUMN_CLIENTS_SESSION_DOWN:
+		return modifier * CmpAny(r1->sessionDown, r2->sessionDown);
+	case COLUMN_CLIENTS_TOTAL_UP:
+		return modifier * CmpAny(r1->totalUp, r2->totalUp);
+	case COLUMN_CLIENTS_TOTAL_DOWN:
+		return modifier * CmpAny(r1->totalDown, r2->totalDown);
+	// Numerically: the default arm compares the rendered text, where "10.00" sorts below
+	// "9.50". Same fix as the Known tab's Ratio column.
+	case COLUMN_CLIENTS_RATIO:
+		return modifier * CmpAny(r1->creditRatio, r2->creditRatio);
+	default:
+		return modifier *
+		       GetItemColumnText(data1, column).CmpNoCase(GetItemColumnText(data2, column));
+	}
+}

amule-3.1.0.tar.gz/src/ClientsListCtrl.h Added

@@ -0,0 +1,175 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 CLIENTSLISTCTRL_H
+#define CLIENTSLISTCTRL_H
+
+#include <unordered_map>
+#include <vector>
+
+#include "ClientRowListCtrl.h" // Needed for CClientRowListCtrl
+
+#define COLUMN_CLIENTS_NAME 0
+#define COLUMN_CLIENTS_SOFTWARE 1
+#define COLUMN_CLIENTS_VERSION 2
+#define COLUMN_CLIENTS_ADDRESS 3
+#define COLUMN_CLIENTS_ORIGIN 4
+#define COLUMN_CLIENTS_FILES 5
+#define COLUMN_CLIENTS_UP_SPEED 6
+#define COLUMN_CLIENTS_DOWN_SPEED 7
+#define COLUMN_CLIENTS_SESSION_UP 8
+#define COLUMN_CLIENTS_SESSION_DOWN 9
+#define COLUMN_CLIENTS_TOTAL_UP 10
+#define COLUMN_CLIENTS_TOTAL_DOWN 11
+#define COLUMN_CLIENTS_RATIO 12
+//! Always empty. Absorbs the macOS trailing-column sizing; see
+//! CMuleDataViewCtrl::AppendSpacerColumn().
+#define COLUMN_CLIENTS_SPACER 13
+
+/**
+ * Every peer we are currently talking to, once each.
+ *
+ * The per-file lists (CSourceListCtrl, CSharedFilePeersListCtrl) answer "who is on this file". This
+ * answers "who am I talking to", which is a different question: the same peer can be a source for
+ * one download and a requester for another, and only a per-client view can say so. Hence the file
+ * *count* column, which the per-file lists have no way to express.
+ *
+ * Rows hold values rather than clients. A CClientRef would be the obvious alternative and is the
+ * wrong tool -- those are owning (Unlink() deletes at the last release), so the list would keep
+ * every peer it ever saw alive and would never be told to let go, because the signal it is waiting
+ * for comes from the destructor its own reference is preventing. The one thing a row keeps of the
+ * peer itself is its ECID, which is a name to look it up by on demand rather than a claim that it
+ * still exists.
+ */
+class CClientsListCtrl : public CClientRowListCtrl
+{
+public:
+	/**
+	 * @param tableName Names this list's saved column widths. The Active page shows two of
+	 * these side by side and they are sized for different content, so they must not share one
+	 * entry.
+	 */
+	CClientsListCtrl(wxWindow *parent,
+		int id,
+		const wxPoint &pos,
+		wxSize size,
+		int flags,
+		const wxString &tableName);
+	~CClientsListCtrl();
+
+	/**
+	 * One row's worth of a peer, copied at sweep time. Values, not a pointer: the list is
+	 * painted asynchronously, after the sweep that produced it has returned, and a peer can be
+	 * freed in between -- which read back as a valid ECID beside a garbage name, a zero address
+	 * and a 2^48 byte count, and as values that never changed because dead objects do not
+	 * update. Copying is affordable: the set is bounded by MaxConnections and this runs once a
+	 * second only while the page is on screen.
+	 */
+	struct Row
+	{
+		//! Looks the peer up again when a row is acted on. Meaningless
+		//! across daemon restarts, which is fine: so is the row.
+		uint32 ecid = 0;
+		//! Everything the Name cell draws, snapshotted with the rest.
+		ClientNameCell nameCell;
+		wxString name;
+		wxString software;
+		wxString version;
+		uint32 ip = 0;
+		uint16 port = 0;
+		uint8 sourceFrom = 0;
+		//! The file(s) this peer is on, by name. A peer holds at most one download and one
+		//! upload, so this is one name or two -- which is what the column used to render as
+		//! the digits 0, 1 and 2.
+		wxString files;
+		uint32 upSpeed = 0;
+		double downSpeed = 0.0;
+		uint64 sessionUp = 0;
+		uint64 sessionDown = 0;
+		uint64 totalUp = 0;
+		uint64 totalDown = 0;
+		//! Credit modifier from the core, the same value the Known tab and the API show.
+		double creditRatio = 0.0;
+
+		/**
+		 * Whole-row comparison, so a caller asking "did this row change" cannot test a
+		 * subset by accident. ecid is excluded: rows are matched on it, so two rows being
+		 * compared always share one. Everything else is displayed, and anything that moves
+		 * has to reach the screen.
+		 */
+		bool operator==(const Row &other) const
+		{
+			return nameCell == other.nameCell && name == other.name &&
+			       software == other.software && version == other.version && ip == other.ip &&
+			       port == other.port && sourceFrom == other.sourceFrom && files == other.files &&
+			       upSpeed == other.upSpeed && downSpeed == other.downSpeed &&
+			       sessionUp == other.sessionUp && sessionDown == other.sessionDown &&
+			       totalUp == other.totalUp && totalDown == other.totalDown &&
+			       creditRatio == other.creditRatio;
+		}
+		bool operator!=(const Row &other) const { return !(*this == other); }
+	};
+
+	/**
+	 * Replace the rows with exactly the peers that are live right now. Takes the whole set
+	 * rather than individual adds and removes: the notifications that would drive those are
+	 * queued when raised off the main thread, so by delivery an added client may be a reused
+	 * allocation and a removed one already freed. Nothing is held between calls.
+	 */
+	void SetClients(std::vector<Row> &&rows);
+
+protected:
+	wxString GetItemColumnText(wxUIntPtr item, unsigned column) const override;
+	int CompareItemData(
+		wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool alt, int modifier) const override;
+	const ClientNameCell *NameCellFor(wxUIntPtr item) const override;
+	unsigned NameColumn() const override { return COLUMN_CLIENTS_NAME; }
+	bool PeerForItem(wxUIntPtr data, PeerIdentity &out) const override;
+
+	/**
+	 * Speeds and transfer totals move on every poll, so a row sorted by one of them has to be
+	 * able to move with it. Only those columns: answering yes unconditionally re-sorts on every
+	 * refresh, which with no sort column at all -- or a static one like the name -- reshuffles
+	 * equal rows once a second and reads as flicker.
+	 */
+	bool IsLiveSortColumn() const override;
+
+private:
+	const Row *RowFor(wxUIntPtr item) const;
+	//! Rebuild m_rowOfEcid from m_rows. Call after any change to the vector.
+	void ReindexRows();
+
+	std::vector<Row> m_rows;
+	/**
+	 * ECID to position in m_rows. Item data is the ECID, not the row position, so a selection
+	 * survives a rebuild: the sweep's order is not stable, so restoring a saved *index* would
+	 * hand the selection to whichever peer now sits there -- and the context menu acts on the
+	 * selection, so "Add to friends" could land on someone the user never picked. This map is
+	 * what keeps the identity lookup O(1) on the paint path, which asks per cell.
+	 */
+	std::unordered_map<uint32, size_t> m_rowOfEcid;
+};
+
+#endif // CLIENTSLISTCTRL_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/ClientsWnd.cpp Added

@@ -0,0 +1,457 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "ClientsWnd.h"
+
+#include "ClientVersionString.h" // Interface declarations
+
+#include <wx/sizer.h>
+
+#include <wx/notebook.h>
+#include <wx/splitter.h>
+#include <wx/stattext.h>
+
+#include "ClientsListCtrl.h"       // Needed for CClientsListCtrl
+#include "ClientHistoryListCtrl.h" // Needed for CClientHistoryListCtrl
+#include "muuli_wdr.h"             // Needed for ID_CLIENTSLIST
+
+#include <set>
+#include <unordered_map>
+
+#include <common/Format.h> // Needed for CFormat
+
+#include "amule.h" // Needed for theApp
+#ifdef GEOIP_GUI
+#include "CountryDisplay.h" // Needed for GetDisplayCountryCode
+#endif
+#include "PartFile.h" // Needed for CPartFile (CKnownFile::GetFileName)
+// CUpDownClient. MUST match the build's client class: the reduced EC client for amulegui, the full
+// one for monolithic. The two have different layouts, so the wrong header reads every member of a
+// live peer at the wrong offset -- blank names, a zero IP, then a crash. Same trap as
+// GenericClientListCtrl.
+#ifdef CLIENT_GUI
+#include "UpDownClientEC.h"
+#else
+#include "updownclient.h"
+#endif
+
+#ifndef CLIENT_GUI
+#include "ClientCredits.h"     // Needed for CClientCredits, ClientMetaStruct
+#include "ClientCreditsList.h" // Needed for CClientCreditsList
+#include "ClientList.h"        // Needed for CClientList::GetClientsByHash
+#endif
+
+CClientsWnd::CClientsWnd(wxWindow *parent)
+: wxPanel(parent, -1)
+#ifdef CLIENT_GUI
+, m_historyHandler(this)
+#endif
+{
+	// Two tabs rather than a split: the lists answer different questions -- "who am I talking
+	// to now" and "who have I ever talked to" -- and share most of their columns, so showing
+	// both at once would mostly duplicate headers.
+	wxNotebook *book = new wxNotebook(this, -1);
+	const long listStyle = wxDV_MULTIPLE | wxDV_ROW_LINES | wxDV_VERT_RULES;
+
+	// Split rather than one list: a peer is either giving us a file or taking one, and often
+	// both, so a single list has to render each row's direction into a column. Two panes state
+	// it structurally, and a peer swapping with us appears in both, once as a source and once
+	// as a destination.
+	wxSplitterWindow *split = new wxSplitterWindow(
+		book, ID_CLIENTSSPLITTER, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE | wxSP_3DSASH);
+	split->SetMinimumPaneSize(60);
+
+	wxPanel *downPanel = new wxPanel(split, -1);
+	downclientsctrl = new CClientsListCtrl(
+		downPanel, ID_CLIENTSLIST, wxDefaultPosition, wxDefaultSize, listStyle, "ClientsDown");
+	wxBoxSizer *downSizer = new wxBoxSizer(wxVERTICAL);
+	downSizer->Add(new wxStaticText(downPanel, -1, _("Downloading from")), 0, wxALL, 3);
+	downSizer->Add(downclientsctrl, 1, wxEXPAND);
+	downPanel->SetSizer(downSizer);
+
+	wxPanel *upPanel = new wxPanel(split, -1);
+	upclientsctrl = new CClientsListCtrl(
+		upPanel, ID_CLIENTSUPLIST, wxDefaultPosition, wxDefaultSize, listStyle, "ClientsUp");
+	wxBoxSizer *upSizer = new wxBoxSizer(wxVERTICAL);
+	upSizer->Add(new wxStaticText(upPanel, -1, _("Uploading to")), 0, wxALL, 3);
+	upSizer->Add(upclientsctrl, 1, wxEXPAND);
+	upPanel->SetSizer(upSizer);
+
+	split->SplitHorizontally(downPanel, upPanel);
+	// Even halves. The two sides carry comparable numbers of peers and neither
+	// is the subordinate detail pane the Transfers splitter's ratio assumes.
+	split->SetSashGravity(0.5);
+	book->AddPage(split, _("Active"), true);
+
+	// Only offered when there is a history to show. A daemon that does not advertise
+	// EC_TAG_CAN_CLIENT_HISTORY cannot answer the request, so the tab would sit permanently
+	// empty with nothing to say why. Decided once here, because amulegui rebuilds this dialog
+	// on every reconnect.
+#ifdef CLIENT_GUI
+	const bool historyAvailable =
+		theApp->m_connect != nullptr && theApp->m_connect->ServerSupportsClientHistory();
+#else
+	const bool historyAvailable = true;
+#endif
+	if (historyAvailable) {
+		historylistctrl = new CClientHistoryListCtrl(
+			book, ID_CLIENTHISTORYLIST, wxDefaultPosition, wxDefaultSize, listStyle);
+		book->AddPage(historylistctrl, _("Known"), false);
+	}
+
+	// Rebuilt on every switch to the Known tab rather than once, so a peer that has
+	// reconnected since you last looked shows its new totals and last-seen.
+	book->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, this(wxBookCtrlEvent &event) {
+		if (event.GetSelection() == 1 && historylistctrl != nullptr) {
+			EnsureHistoryLoaded();
+		}
+		event.Skip();
+	});
+
+	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+	sizer->Add(book, 1, wxEXPAND);
+	SetSizer(sizer);
+	sizer->SetSizeHints(this);
+	sizer->Fit(this);
+}
+
+namespace
+{
+//! The Name cell for a history row. One helper because the monolithic and EC
+//! paths build the same rows from different sources and must agree on this.
+void FillHistoryNameCell(ClientHistoryRow &row)
+{
+	row.nameCell.name = row.name.IsEmpty() ? row.hash.Encode() : row.name;
+	// No live peer behind this row, so no state badge and no friend/credit
+	// marks -- those describe a conversation in progress.
+	row.nameCell.showState = false;
+	row.identityKnown = row.hasMeta;
+	row.nameCell.knownSoftware = row.hasMeta;
+	row.nameCell.clientSoft = row.clientSoft;
+	row.nameCell.obfuscation = row.obfuscation;
+#ifdef GEOIP_GUI
+	// Same call the live lists make: amulegui takes the code the core resolved from the last
+	// address we saw the peer at, monolithic resolves it itself. Records with no metadata carry
+	// no address, and get no flag.
+	wxString code;
+	if (GetDisplayCountryCode(row.countryFromCore, row.country, row.ip, code)) {
+		row.nameCell.countryCode = code;
+	}
+#endif
+}
+} // namespace
+
+void CClientsWnd::EnsureHistoryLoaded()
+{
+#ifdef CLIENT_GUI
+	// Session 0 means the daemon never told us which process it is, so we
+	// cannot claim what we hold is still its store.
+	const uint64 session = theApp->m_connect != nullptr ? theApp->m_connect->GetServerSessionId() : 0;
+	if (m_historyLoaded && session != 0 && session == m_historySessionId) {
+		return;
+	}
+	m_historySessionId = session;
+#else
+	// Monolithic reads the store directly, and it is the same store for as
+	// long as the program runs.
+	if (m_historyLoaded) {
+		return;
+	}
+#endif
+	m_historyLoaded = true;
+	LoadHistory();
+}
+
+void CClientsWnd::LoadHistory()
+{
+#ifndef CLIENT_GUI
+	// Monolithic: the credit store is right here, so there is nothing to
+	// request and nothing to wait for.
+	if (theApp->clientcredits == nullptr) {
+		return;
+	}
+	std::vector<CClientCredits *> credits;
+	theApp->clientcredits->GetAllCredits(credits);
+
+	std::vector<ClientHistoryRow> rows;
+	rows.reserve(credits.size());
+	for (const CClientCredits *cur : credits) {
+		const CreditStruct *data = cur->GetDataStruct();
+		ClientHistoryRow row;
+		row.hash = data->key;
+		row.uploaded = cur->GetUploadedTotal();
+		row.downloaded = cur->GetDownloadedTotal();
+		row.creditRatio = cur->GetCreditRatio();
+		row.hasCreditRatio = true;
+		row.lastSeen = data->nLastSeen;
+		if (cur->HasMeta()) {
+			const ClientMetaStruct &meta = cur->GetMeta();
+			row.hasMeta = true;
+			row.name = meta.name;
+			row.firstSeen = meta.firstSeen;
+			row.sessions = meta.sessions;
+			row.ip = meta.lastIP;
+			row.port = meta.lastPort;
+			row.clientSoft = meta.clientSoft;
+			row.sourceFrom = meta.sourceFrom;
+			row.obfuscation = meta.obfuscation;
+			// Rendered the way the live list renders it, so one peer is not listed
+			// under two different versions depending on whether it is online.
+			row.version = FormatPackedClientVersion(meta.clientSoft, meta.version);
+		}
+		// Correlate with the live list by hash, not by ECID: those mean nothing outside one
+		// daemon process, whereas this is the identity the credit store itself is keyed on.
+		row.online = !theApp->clientlist->GetClientsByHash(row.hash).empty();
+		FillHistoryNameCell(row);
+		rows.push_back(row);
+	}
+	historylistctrl->SetRows(std::move(rows));
+#else
+	// amulegui: the credit store lives on the other side of the link, so ask for it. Against a
+	// daemon too old to know the request this comes back EC_OP_FAILED and the tab stays empty.
+	if (theApp->m_connect != nullptr && theApp->m_connect->ServerSupportsClientHistory()) {
+		CECPacket request(EC_OP_GET_CLIENT_HISTORY);
+		theApp->m_connect->SendRequest(&m_historyHandler, &request);
+	}
+#endif
+}
+
+#ifdef CLIENT_GUI
+void CClientsWnd::CHistoryHandler::HandlePacket(const CECPacket *packet)
+{
+	if (packet->GetOpCode() != EC_OP_CLIENT_HISTORY) {
+		// EC_OP_FAILED from a core that predates the request. Leave the tab as it
+		// is rather than blanking it.
+		return;
+	}
+
+	// The live peers, by hash: an ECID says nothing across daemon processes, while
+	// the user hash is the identity the credit store is keyed on.
+	std::set<CMD4Hash> onlineHashes;
+	if (theApp->clientlist != nullptr) {
+		for (const auto &entry : *theApp->clientlist) {
+			onlineHashes.insert(entry->GetClient()->GetUserHash());
+		}
+	}
+
+	std::vector<ClientHistoryRow> rows;
+	rows.reserve(packet->GetTagCount());
+	for (const CECTag &entry : *packet) {
+		const CECTag *tag = &entry;
+		if (tag->GetTagName() != EC_TAG_CLIENT) {
+			continue;
+		}
+		ClientHistoryRow row;
+		row.hash = tag->GetMD4Data();
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_UPLOAD_TOTAL)) {
+			row.uploaded = t->GetInt();
+		}
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_DOWNLOAD_TOTAL)) {
+			row.downloaded = t->GetInt();
+		}
+		// Absent from a daemon predating the tag on this payload; the column stays blank
+		// there rather than showing a number this side worked out for itself.
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_SCORE_RATIO)) {
+			row.creditRatio = t->GetDoubleData();
+			row.hasCreditRatio = true;
+		}
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_LAST_SEEN)) {
+			row.lastSeen = t->GetInt();
+		}
+		// Everything below is absent for a peer the core has no metadata for -- an older
+		// record, or a core that never kept any. The row still carries a hash, totals and a
+		// date.
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_FIRST_SEEN)) {
+			row.firstSeen = t->GetInt();
+			row.hasMeta = true;
+		}
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_SESSIONS)) {
+			row.sessions = t->GetInt();
+		}
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_NAME)) {
+			row.name = t->GetStringData();
+		}
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_USER_IP)) {
+			row.ip = t->GetInt();
+		}
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_USER_PORT)) {
+			row.port = t->GetInt();
+		}
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_SOFTWARE)) {
+			row.clientSoft = t->GetInt();
+		}
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_SOFT_VER_STR)) {
+			row.version = t->GetStringData();
+		}
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_FROM)) {
+			row.sourceFrom = t->GetInt();
+		}
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_OBFUSCATION_STATUS)) {
+			row.obfuscation = t->GetInt();
+		}
+		if (const CECTag *t = tag->GetTagByName(EC_TAG_CLIENT_COUNTRY)) {
+			row.country = t->GetStringData();
+			row.countryFromCore = true;
+		}
+		row.online = onlineHashes.count(row.hash) != 0;
+		FillHistoryNameCell(row);
+		rows.push_back(row);
+	}
+	if (m_owner->historylistctrl != nullptr) {
+		m_owner->historylistctrl->SetRows(std::move(rows));
+	}
+}
+#endif
+
+CClientsWnd::~CClientsWnd() = default;
+
+void CClientsWnd::UpdateAll()
+{
+	// Rebuild the row set from the live container rather than maintaining it from add/remove
+	// notifications.
+	//
+	// Those notifications are queued whenever they are raised off the main thread, which is
+	// what CUpDownClientListRem does -- so an add could arrive after its client's allocation
+	// had been reused, and a removal after the object was freed, leaving the list repainting a
+	// dangling pointer once a second until it crashed inside drawing. Holding CClientRefs
+	// instead would fix the lifetime and create a worse problem: they are owning, so the list
+	// would keep every peer it ever saw alive. Enumerating what is live has neither failure
+	// mode, and the set is bounded by MaxConnections.
+	//
+	// Each peer's values are copied here, while we know they are alive: the list is painted
+	// later.
+	std::vector<CClientsListCtrl::Row> downRows;
+	std::vector<CClientsListCtrl::Row> upRows;
+	// Every connected peer, for the history reconcile below -- not just the ones that pass the
+	// pane filter. A peer holding no file is still online, and the Known tab says so.
+	std::unordered_map<CMD4Hash, CClientHistoryListCtrl::LiveClient> live;
+	const bool wantLive = historylistctrl != nullptr && historylistctrl->IsLoaded();
+
+	auto snapshot = &downRows, &upRows, &live, wantLive(const CUpDownClient *c) {
+		if (c == nullptr) {
+			return;
+		}
+		// Built at most once per peer, and only if something asks for it. It is the most
+		// expensive thing here -- a country lookup and several string copies -- and used to
+		// be built twice per peer, once for the history entry and again for the pane row
+		// (issue #920).
+		ClientNameCell cell;
+		bool haveCell = false;
+		auto nameCell = &() -> const ClientNameCell & {
+			if (!haveCell) {
+				cell = MakeClientNameCell(c);
+				haveCell = true;
+			}
+			return cell;
+		};
+
+		if (wantLive && !c->GetUserHash().IsEmpty()) {
+			CClientHistoryListCtrl::LiveClient entry;
+			entry.uploaded = c->GetUploadedTotal();
+			entry.downloaded = c->GetDownloadedTotal();
+			entry.creditRatio = c->GetCreditRatio();
+			entry.upSpeed = c->GetUploadDatarate();
+			entry.downSpeed = c->GetKBpsDown();
+			entry.name = c->GetUserName();
+			entry.version = c->GetSoftVerStr();
+			entry.ip = c->GetIP();
+			entry.port = c->GetUserPort();
+			entry.clientSoft = static_cast<uint8>(c->GetClientSoft());
+			entry.sourceFrom = static_cast<uint8>(c->GetSourceFrom());
+			entry.nameCell = nameCell();
+			// A history row describes a peer we may not be talking to, so it
+			// carries no live download-state badge even when we are.
+			entry.nameCell.showState = false;
+			livec->GetUserHash() = entry;
+		}
+		// Which pane(s) this peer belongs in. A peer holds at most one file in each
+		// direction, and a peer swapping with us holds one of each, so it is listed twice
+		// rather than forced into a single row that has to explain itself. Membership is
+		// the relationship, not whether bytes are moving this second: a queued source is
+		// still someone we are downloading from.
+		const CKnownFile *requested = c->GetRequestFile();
+		const CKnownFile *uploading = c->GetUploadFile();
+		if (requested == nullptr && uploading == nullptr) {
+			return;
+		}
+		CClientsListCtrl::Row row;
+		row.ecid = c->ECID();
+		row.nameCell = nameCell();
+		row.name = c->GetUserName();
+		row.software = c->GetSoftStr();
+		row.version = c->GetSoftVerStr();
+		row.ip = c->GetIP();
+		row.port = c->GetUserPort();
+		row.sourceFrom = static_cast<uint8>(c->GetSourceFrom());
+		row.upSpeed = c->GetUploadDatarate();
+		row.downSpeed = c->GetKBpsDown();
+		row.sessionUp = c->GetTransferredUp();
+		row.sessionDown = c->GetTransferredDown();
+		row.totalUp = c->GetUploadedTotal();
+		row.totalDown = c->GetDownloadedTotal();
+		row.creditRatio = c->GetCreditRatio();
+
+		// The Files column names one file, not a list, because which file it is
+		// follows from which pane the row is in.
+		if (requested != nullptr) {
+			row.files = requested->GetFileName().GetPrintable();
+			downRows.push_back(row);
+		}
+		if (uploading != nullptr) {
+			row.files = uploading->GetFileName().GetPrintable();
+			upRows.push_back(row);
+		}
+	};
+
+#ifdef CLIENT_GUI
+	if (theApp->clientlist != nullptr) {
+		for (const auto &entry : *theApp->clientlist) {
+			snapshot(entry->GetClient());
+		}
+	}
+#else
+	if (theApp->clientlist != nullptr) {
+		for (const auto &entry : theApp->clientlist->GetClientList()) {
+			snapshot(entry.second.GetClient());
+		}
+	}
+#endif
+	downclientsctrl->SetClients(std::move(downRows));
+	upclientsctrl->SetClients(std::move(upRows));
+
+	// Fold this tick's peers into the history, so rows for connected peers keep up instead of
+	// standing at whatever they were when the tab was opened. One lookup per connected peer;
+	// stored records for everyone else cannot change.
+	if (wantLive) {
+		historylistctrl->ReconcileLive(live);
+	}
+
+	// Only ever a re-check: EnsureHistoryLoaded() returns immediately unless the daemon session
+	// changed, and the m_historyLoaded guard means sitting on the Active tab never triggers the
+	// first, expensive load. Without it a core that restarted while the Known tab was open
+	// would keep showing rows from a process that no longer exists.
+	if (m_historyLoaded) {
+		EnsureHistoryLoaded();
+	}
+}

amule-3.1.0.tar.gz/src/ClientsWnd.h Added

@@ -0,0 +1,122 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 CLIENTSWND_H
+#define CLIENTSWND_H
+
+#include <wx/panel.h>
+
+#ifdef CLIENT_GUI
+#include <ec/cpp/RemoteConnect.h> // Needed for CECPacketHandlerBase
+#endif
+
+class CClientsListCtrl;
+class CClientHistoryListCtrl;
+
+/**
+ * The Clients page: every peer we are currently talking to, once each. Built in code rather than
+ * through a muuli_wdr layout function -- it is lists and a splitter with no surrounding controls,
+ * so a generated layout would be sizers and nothing else.
+ */
+class CClientsWnd : public wxPanel
+{
+public:
+	CClientsWnd(wxWindow *parent);
+	~CClientsWnd();
+
+	//! Peers holding a file we are downloading.
+	CClientsListCtrl *downclientsctrl;
+	//! Peers we are sending a file to.
+	CClientsListCtrl *upclientsctrl;
+	//! Null when the core cannot answer for the history, in which case the
+	//! Known tab is not offered at all.
+	CClientHistoryListCtrl *historylistctrl = nullptr;
+
+	/**
+	 * Re-read every listed peer's values. Driven from the GUI timer rather than from the per-
+	 * file refresh signals: those carry an ECID and fire from a dozen sites, so a global list
+	 * hooked into them would be one missed call away from a row that stops moving. A sweep
+	 * costs only the rows on screen -- the control skips anything outside the viewport -- and
+	 * is called only while this page is the active one.
+	 */
+	void UpdateAll();
+
+	/**
+	 * Rebuild the history from the credit store.
+	 *
+	 * Called whenever the Known tab is shown, not once at startup. Two reasons it cannot be a
+	 * one-off: a peer already in the history that reconnects has new totals, a new last-seen
+	 * and one more session, and a peer met for the first time since the page was opened is
+	 * missing entirely. A stale snapshot would show "last seen" months ago for someone visibly
+	 * transferring in the Active tab next door.
+	 *
+	 * Rebuilding rather than patching individual rows: the credit store is the truth, a rebuild
+	 * is a vector fill and one sort, and it happens only when a person actually looks at the
+	 * tab.
+	 */
+	void LoadHistory();
+
+	/**
+	 * Load the history if what we hold is not already current.
+	 *
+	 * The reply is the most expensive thing this page asks for -- a full walk of the credit
+	 * store, which on a real node is tens of thousands of records -- and the sweep keeps the
+	 * rows current once they are here, so re-entering the tab does not need to ask again.
+	 *
+	 * "Current" is decided by daemon session, not by a plain once-flag: this dialog survives a
+	 * reconnect (CamuleRemoteGuiApp::FinishReconnect resets the containers, not the frame), so
+	 * a core that restarted underneath us leaves rows whose live state belongs to a process
+	 * that no longer exists. A session we cannot identify is treated as a new one, which costs
+	 * a reload rather than showing something stale.
+	 */
+	void EnsureHistoryLoaded();
+
+#ifdef CLIENT_GUI
+	/**
+	 * Receives the EC_OP_CLIENT_HISTORY reply. Nested so the panel keeps ownership of the rows
+	 * the reply becomes, and so a reply that arrives after the page is gone has nowhere to land
+	 * rather than somewhere stale.
+	 */
+	class CHistoryHandler : public CECPacketHandlerBase
+	{
+	public:
+		explicit CHistoryHandler(CClientsWnd *owner)
+		: m_owner(owner)
+		{
+		}
+		void HandlePacket(const CECPacket *packet) override;
+
+	private:
+		CClientsWnd *m_owner;
+	};
+	CHistoryHandler m_historyHandler;
+	//! Daemon session the history was loaded for; 0 until it has been.
+	uint64 m_historySessionId = 0;
+#endif
+	//! Whether the history has been loaded at all in this dialog's lifetime.
+	bool m_historyLoaded = false;
+};
+
+#endif // CLIENTSWND_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/ColorFrameCtrl.cpp -> amule-3.1.0.tar.gz/src/ColorFrameCtrl.cpp Changed

@@ -25,101 +25,96 @@
 
 #include <wx/dcclient.h>
 
-#include "ColorFrameCtrl.h"	// Interface declarations
+#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(*wxBLACK_BRUSH),
-    m_brushFrame(CMuleColour(0,255,255).GetBrush())
+CColorFrameCtrl::CColorFrameCtrl(wxWindow *parent, int id, int wid, int hei)
+: wxControl(parent, id, wxDefaultPosition, wxSize(wid, hei))
+, m_brushBack(*wxBLACK_BRUSH)
+, m_brushFrame(CMuleColour(0, 255, 255).GetBrush())
 {
-	SetSizeHints(wid,hei,wid,hei,0,0);
-	wxRect rc=GetClientRect();
-	m_rectClient.left=rc.x;
-	m_rectClient.top=rc.y;
-	m_rectClient.right=rc.x + wid;
-	m_rectClient.bottom=rc.y + hei;
+	SetSizeHints(wid, hei, wid, hei, 0, 0);
+	wxRect rc = GetClientRect();
+	m_rectClient.left = rc.x;
+	m_rectClient.top = rc.y;
+	m_rectClient.right = rc.x + wid;
+	m_rectClient.bottom = rc.y + hei;
 
-}  // CColorFrameCtrl
+} // CColorFrameCtrl
 
 /////////////////////////////////////////////////////////////////////////////
-CColorFrameCtrl::~CColorFrameCtrl()
-{
-} // ~CColorFrameCtrl
-
+CColorFrameCtrl::~CColorFrameCtrl() {} // ~CColorFrameCtrl
 
-wxBEGIN_EVENT_TABLE(CColorFrameCtrl,wxControl)
-  EVT_PAINT(CColorFrameCtrl::OnPaint)
-  EVT_SIZE(CColorFrameCtrl::OnSize)
+wxBEGIN_EVENT_TABLE(CColorFrameCtrl, wxControl)
+	EVT_PAINT(CColorFrameCtrl::OnPaint)
+	EVT_SIZE(CColorFrameCtrl::OnSize)
 wxEND_EVENT_TABLE()
 
 /////////////////////////////////////////////////////////////////////////////
 // CColorFrameCtrl message handlers
 
 /////////////////////////////////////////////////////////////////////////////
-void CColorFrameCtrl::SetFrameBrushColour(const wxColour& colour)
+void CColorFrameCtrl::SetFrameBrushColour(const wxColour &colour)
 {
 	m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID));
 
 	Refresh(FALSE);
-}  // SetFrameColor
-
+} // SetFrameColor
 
 /////////////////////////////////////////////////////////////////////////////
-void CColorFrameCtrl::SetBackgroundBrushColour(const wxColour& colour)
+void CColorFrameCtrl::SetBackgroundBrushColour(const wxColour &colour)
 {
 	m_brushBack = *(wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID));
 
 	// clear out the existing garbage, re-start with a clean plot
 	Refresh(FALSE);
-}  // SetBackgroundColor
-
+} // SetBackgroundColor
 
 ////////////////////////////////////////////////////////////////////////////
-void CColorFrameCtrl::OnPaint(wxPaintEvent& WXUNUSED(evt))
+void CColorFrameCtrl::OnPaint(wxPaintEvent &WXUNUSED(evt))
 {
-  wxPaintDC dc(this);
+	wxPaintDC dc(this);
 
-  wxRect rc;
-  rc.x=m_rectClient.left;
-  rc.y=m_rectClient.top;
-  rc.width=m_rectClient.right-m_rectClient.left;
-  rc.height=m_rectClient.bottom-m_rectClient.top;
+	wxRect rc;
+	rc.x = m_rectClient.left;
+	rc.y = m_rectClient.top;
+	rc.width = m_rectClient.right - m_rectClient.left;
+	rc.height = m_rectClient.bottom - m_rectClient.top;
 
-  dc.SetPen(*wxTRANSPARENT_PEN);
-  dc.SetBrush(m_brushBack);
-  dc.DrawRectangle(rc);
+	dc.SetPen(*wxTRANSPARENT_PEN);
+	dc.SetBrush(m_brushBack);
+	dc.DrawRectangle(rc);
 
-  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);
-  dc.DrawLine(rc.x+1,rc.y+rc.height-2,rc.x+1,rc.y+1);
+	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);
+	dc.DrawLine(rc.x + 1, rc.y + rc.height - 2, rc.x + 1, rc.y + 1);
 
-  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(*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);
+	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);
 
 } // OnPaint
 
 /////////////////////////////////////////////////////////////////////////////
-void CColorFrameCtrl::OnSize(wxSizeEvent& WXUNUSED(evt))
+void CColorFrameCtrl::OnSize(wxSizeEvent &WXUNUSED(evt))
 {
 
 	// NOTE: OnSize automatically gets called during the setup of the control
 	// Kry - Not on Mac.
 
-	wxRect rc=GetClientRect();
-	m_rectClient.left=rc.x;
-	m_rectClient.top=rc.y;
-	m_rectClient.right=rc.x + rc.width;
-	m_rectClient.bottom=rc.y + rc.height;
+	wxRect rc = GetClientRect();
+	m_rectClient.left = rc.x;
+	m_rectClient.top = rc.y;
+	m_rectClient.right = rc.x + rc.width;
+	m_rectClient.bottom = rc.y + rc.height;
 
 } // OnSize
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ColorFrameCtrl.h -> amule-3.1.0.tar.gz/src/ColorFrameCtrl.h Changed

@@ -26,33 +26,34 @@
 #ifndef COLORFRAMECTRL_H
 #define COLORFRAMECTRL_H
 
-#include <wx/brush.h>		// Needed for wxBrush
-#include <wx/control.h>		// Needed for wxControl
+#include <wx/brush.h>   // Needed for wxBrush
+#include <wx/control.h> // Needed for wxControl
 
-#include "Types.h"		// Needed for RECT
+#include "Types.h" // Needed for RECT
 
 class wxColour;
 
 /////////////////////////////////////////////////////////////////////////////
 // CColorFrameCtrl window
 
-class CColorFrameCtrl : public wxControl {
+class CColorFrameCtrl : public wxControl
+{
 
 public:
-	CColorFrameCtrl( wxWindow* parent, int id,int wid,int hei );
+	CColorFrameCtrl(wxWindow *parent, int id, int wid, int hei);
 	virtual ~CColorFrameCtrl();
 
-	void SetFrameBrushColour(const wxColour& colour);
-	void SetBackgroundBrushColour(const wxColour& colour);
-protected:
+	void SetFrameBrushColour(const wxColour &colour);
+	void SetBackgroundBrushColour(const wxColour &colour);
 
-	void OnPaint(wxPaintEvent& evt);
-	void OnSize(wxSizeEvent& evt);
+protected:
+	void OnPaint(wxPaintEvent &evt);
+	void OnSize(wxSizeEvent &evt);
 
 	wxDECLARE_EVENT_TABLE();
 
 	RECT m_rectClient;
-	wxBrush m_brushBack,m_brushFrame;
+	wxBrush m_brushBack, m_brushFrame;
 };
 
 /////////////////////////////////////////////////////////////////////////////

amule-3.0.1.tar.gz/src/CommentDialog.cpp -> amule-3.1.0.tar.gz/src/CommentDialog.cpp Changed

@@ -23,42 +23,38 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "CommentDialog.h"	// Interface declarations
+#include "CommentDialog.h" // Interface declarations
 #include "GuiEvents.h"
-#include "KnownFile.h"		// Needed for CKnownFile
-#include "muuli_wdr.h"		// Needed for commentDlg
+#include "KnownFile.h" // Needed for CKnownFile
+#include "muuli_wdr.h" // Needed for commentDlg
 
 #include <set>
 
 // CommentDialog dialog
 
-namespace {
-// Registry of open CCommentDialog instances. Iterated by
-// CCommentDialog::DropReferencesTo when a CKnownFile is destroyed, so
-// any dialog whose m_file matches can be dismissed before its modal
-// loop tries to deref the freed pointer (issue #755 / #748 family).
-//
-// All access is on the GUI main thread (modal dialogs only exist on
-// that thread), so no synchronisation is needed.
-std::set<CCommentDialog*>& OpenInstances()
+namespace
+{
+// Registry of open CCommentDialog instances. CCommentDialog::DropReferencesTo walks it when a
+// CKnownFile is destroyed, so any dialog whose m_file matches can be dismissed before its modal
+// loop derefs the freed pointer (issue #755 / #748 family). All access is on the GUI main thread,
+// modal dialogs only existing there, so no synchronisation is needed.
+std::set<CCommentDialog *> &OpenInstances()
 {
-	static std::set<CCommentDialog*> instances;
+	static std::set<CCommentDialog *> instances;
 	return instances;
 }
 } // namespace
 
-//IMPLEMENT_DYNAMIC(CCommentDialog, CDialog)
-CCommentDialog::CCommentDialog(wxWindow* parent,CKnownFile* file)
-: wxDialog(parent,-1,_("File Comments"),
-wxDefaultPosition,wxDefaultSize,wxDEFAULT_DIALOG_STYLE|wxSYSTEM_MENU)
+// IMPLEMENT_DYNAMIC(CCommentDialog, CDialog)
+CCommentDialog::CCommentDialog(wxWindow *parent, CKnownFile *file)
+: wxDialog(parent, -1, _("File Comments"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
 	m_file = file;
-	wxSizer* content=commentDlg(this,TRUE);
+	wxSizer *content = commentDlg(this, TRUE);
 	content->SetSizeHints(this);
-	content->Show(this,TRUE);
+	content->Show(this, TRUE);
 	Center();
-	ratebox = CastChild( IDC_RATELIST, wxChoice );
+	ratebox = CastChild(IDC_RATELIST, wxChoice);
 	OnInitDialog();
 	OpenInstances().insert(this);
 }
@@ -68,10 +64,10 @@
 	OpenInstances().erase(this);
 }
 
-void CCommentDialog::DropReferencesTo(const CKnownFile* file)
+void CCommentDialog::DropReferencesTo(const CKnownFile *file)
 {
-	// Pointer-value comparison only — `file` may already be freed.
-	for (CCommentDialog* d : OpenInstances()) {
+	// Pointer-value comparison only -- `file` may already be freed.
+	for (CCommentDialog *d : OpenInstances()) {
 		if (d->m_file == file) {
 			d->m_file = NULL;
 			// Self-dismiss: the dialog is showing data that no
@@ -81,26 +77,26 @@
 	}
 }
 
-wxBEGIN_EVENT_TABLE(CCommentDialog,wxDialog)
+wxBEGIN_EVENT_TABLE(CCommentDialog, wxDialog)
 	EVT_TEXT_ENTER(IDC_CMT_TEXT, CCommentDialog::OnBnClickedApply)
 	EVT_BUTTON(IDCOK, CCommentDialog::OnBnClickedApply)
 	EVT_BUTTON(IDC_FC_CLEAR, CCommentDialog::OnBnClickedClear)
 	EVT_BUTTON(IDCCANCEL, CCommentDialog::OnBnClickedCancel)
 wxEND_EVENT_TABLE()
 
-void CCommentDialog::OnBnClickedApply(wxCommandEvent& WXUNUSED(evt))
+void CCommentDialog::OnBnClickedApply(wxCommandEvent &WXUNUSED(evt))
 {
-	wxString comment = CastChild( IDC_CMT_TEXT, wxTextCtrl )->GetValue();
+	wxString comment = CastChild(IDC_CMT_TEXT, wxTextCtrl)->GetValue();
 	CoreNotify_KnownFile_Comment_Set(m_file, comment, (int8)ratebox->GetSelection());
 	EndModal(0);
 }
 
-void CCommentDialog::OnBnClickedClear(wxCommandEvent& WXUNUSED(evt))
+void CCommentDialog::OnBnClickedClear(wxCommandEvent &WXUNUSED(evt))
 {
 	CastChild(IDC_CMT_TEXT, wxTextCtrl)->SetValue("");
 }
 
-void CCommentDialog::OnBnClickedCancel(wxCommandEvent& WXUNUSED(evt))
+void CCommentDialog::OnBnClickedCancel(wxCommandEvent &WXUNUSED(evt))
 {
 	EndModal(0);
 }

amule-3.0.1.tar.gz/src/CommentDialog.h -> amule-3.1.0.tar.gz/src/CommentDialog.h Changed

@@ -26,8 +26,8 @@
 #ifndef COMMENTDIALOG_H
 #define COMMENTDIALOG_H
 
-#include <wx/dialog.h>		// Needed for wxDialog
-#include <wx/choice.h>		// Needed for wxChoice
+#include <wx/dialog.h> // Needed for wxDialog
+#include <wx/choice.h> // Needed for wxChoice
 
 class CKnownFile;
 
@@ -36,26 +36,26 @@
 class CCommentDialog : public wxDialog
 {
 public:
-	CCommentDialog(wxWindow* pParent, CKnownFile* file);   // standard constructor
+	CCommentDialog(wxWindow *pParent, CKnownFile *file); // standard constructor
 	virtual ~CCommentDialog();
 	virtual bool OnInitDialog();
+
 protected:
 	wxDECLARE_EVENT_TABLE();
+
 public:
-	void OnBnClickedApply(wxCommandEvent& evt);
-	void OnBnClickedClear(wxCommandEvent& evt);
-	void OnBnClickedCancel(wxCommandEvent& evt);
-	// Drop every reference to `file` from any open instance of this
-	// dialog before the CKnownFile is destroyed. Pointer-value
-	// comparison only (`file` may already be freed). Open dialogs
-	// whose m_file matches are dismissed because their state no
-	// longer corresponds to anything that exists on disk. Wired into
-	// MuleNotify::KnownFileBeingDestroyed (GuiEvents.cpp).
-	static void DropReferencesTo(const CKnownFile* file);
+	void OnBnClickedApply(wxCommandEvent &evt);
+	void OnBnClickedClear(wxCommandEvent &evt);
+	void OnBnClickedCancel(wxCommandEvent &evt);
+	// Drop every reference to `file` from any open instance of this dialog before the
+	// CKnownFile is destroyed. Pointer-value comparison only, `file` may already be freed. Open
+	// dialogs whose m_file matches are dismissed, their state no longer corresponding to
+	// anything on disk. Wired into MuleNotify::KnownFileBeingDestroyed (GuiEvents.cpp).
+	static void DropReferencesTo(const CKnownFile *file);
 
 private:
-	wxChoice* ratebox;
-	CKnownFile* m_file;
+	wxChoice *ratebox;
+	CKnownFile *m_file;
 };
 
 #endif // COMMENTDIALOG_H

amule-3.0.1.tar.gz/src/CommentDialogLst.cpp -> amule-3.1.0.tar.gz/src/CommentDialogLst.cpp Changed

@@ -23,90 +23,177 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "CommentDialogLst.h"           // Interface declarations
-#include "muuli_wdr.h"                  // Needed for commentLstDlg
-#include "PartFile.h"                   // Needed for CPartFile
-#include <common/Format.h>              // Needed for CFormat
-#include "MuleListCtrl.h"		// Needed for CMuleListCtrl
+#include "CommentDialogLst.h" // Interface declarations
+#include "muuli_wdr.h"        // Needed for commentLstDlg
+#include "PartFile.h"         // Needed for CAbstractFile / CPartFile
+#include <common/Format.h>    // Needed for CFormat
 #include "Preferences.h"
-#include "amule.h"                      // Needed for theApp
+#include "amule.h"    // Needed for theApp
+#include "amuleDlg.h" // Needed for CamuleDlg::m_imagelist and the Client_*_Smiley ids
 
 #include <set>
 
+// Timer id for the Kad-notes auto-refresh (routed to this dialog only).
+static const int ID_KADREFRESH_TIMER = wxID_HIGHEST + 501;
 
-
-wxBEGIN_EVENT_TABLE(CCommentDialogLst,wxDialog)
-	EVT_BUTTON(IDCOK,CCommentDialogLst::OnBnClickedApply)
-	EVT_BUTTON(IDCREF,CCommentDialogLst::OnBnClickedRefresh)
+wxBEGIN_EVENT_TABLE(CCommentDialogLst, wxDialog)
+	EVT_BUTTON(IDCOK, CCommentDialogLst::OnBnClickedApply)
+	EVT_BUTTON(IDCREF, CCommentDialogLst::OnBnClickedRefresh)
+	EVT_BUTTON(IDC_CMSEARCHKAD, CCommentDialogLst::OnBnClickedSearchKad)
+	EVT_TIMER(ID_KADREFRESH_TIMER, CCommentDialogLst::OnKadRefreshTimer)
+	EVT_LIST_COL_CLICK(IDC_LST, CCommentDialogLst::OnColumnClick)
 wxEND_EVENT_TABLE()
 
-namespace {
-// Registry of open CCommentDialogLst instances. See CCommentDialog.cpp
-// for the rationale — the broadcast handler in GuiEvents.cpp iterates
-// this on every CKnownFile destruction and dismisses any dialog whose
-// m_file has just been freed (UAF prevention; #755 / #748 family).
-std::set<CCommentDialogLst*>& OpenInstances()
+namespace
+{
+// Registry of open CCommentDialogLst instances. See CCommentDialog.cpp for the rationale -- the
+// broadcast handler in GuiEvents.cpp walks this on every CKnownFile destruction and dismisses any
+// dialog whose m_file has just been freed (UAF prevention; #755 / #748 family).
+std::set<CCommentDialogLst *> &OpenInstances()
 {
-	static std::set<CCommentDialogLst*> instances;
+	static std::set<CCommentDialogLst *> instances;
 	return instances;
 }
 } // namespace
 
-
-/*
- * Constructor
- */
-CCommentDialogLst::CCommentDialogLst(wxWindow*parent, CPartFile* file)
-:
-wxDialog(parent, -1, wxString(_("File Comments")),
-	wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
-m_file(file)
+CCommentDialogLst::CCommentDialogLst(wxWindow *parent, CAbstractFile *file)
+: wxDialog(parent,
+	  -1,
+	  wxString(_("File Comments")),
+	  wxDefaultPosition,
+	  wxDefaultSize,
+	  wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+, m_file(file)
+, m_sortColumn(-1)
+, m_sortDescending(false)
+, m_kadRefreshTimer(this, ID_KADREFRESH_TIMER)
+, m_kadRefreshTicks(0)
 {
-	wxSizer* content = commentLstDlg(this, true);
+	wxSizer *content = commentLstDlg(this, true);
 	content->Show(this, true);
 
-	m_list = CastChild(IDC_LST, CMuleListCtrl);
+	m_list = CastChild(IDC_LST, wxListCtrl);
+
+	// Borrowed, not owned: SetImageList() leaves the app's shared list alone,
+	// where AssignImageList() would delete it when this modal closes.
+	m_list->SetImageList(&theApp->amuledlg->m_imagelist, wxIMAGE_LIST_SMALL);
+
 	m_list->InsertColumn(0, _("Username"), wxLIST_FORMAT_LEFT, 130);
 	m_list->InsertColumn(1, _("File Name"), wxLIST_FORMAT_LEFT, 130);
 	m_list->InsertColumn(2, _("Rating"), wxLIST_FORMAT_LEFT, 80);
 	m_list->InsertColumn(3, _("Comment"), wxLIST_FORMAT_LEFT, 340);
-	m_list->SetSortFunc(SortProc);
 
 	UpdateList();
 	OpenInstances().insert(this);
 }
 
-
 CCommentDialogLst::~CCommentDialogLst()
 {
+	m_kadRefreshTimer.Stop();
 	OpenInstances().erase(this);
 	ClearList();
 }
 
-
-void CCommentDialogLst::DropReferencesTo(const CKnownFile* file)
+void CCommentDialogLst::DropReferencesTo(const CAbstractFile *file)
 {
-	for (CCommentDialogLst* d : OpenInstances()) {
-		// m_file is a CPartFile* — compare against the up-cast.
-		if (static_cast<const CKnownFile*>(d->m_file) == file) {
+	for (CCommentDialogLst *d : OpenInstances()) {
+		if (d->m_file == file) {
 			d->m_file = NULL;
 			d->EndModal(0);
 		}
 	}
 }
 
-
-void CCommentDialogLst::OnBnClickedApply(wxCommandEvent& WXUNUSED(evt))
+void CCommentDialogLst::OnBnClickedApply(wxCommandEvent &WXUNUSED(evt))
 {
 	EndModal(0);
 }
 
+void CCommentDialogLst::OnBnClickedRefresh(wxCommandEvent &WXUNUSED(evt))
+{
+	UpdateList();
+}
 
-void CCommentDialogLst::OnBnClickedRefresh(wxCommandEvent& WXUNUSED(evt))
+void CCommentDialogLst::OnBnClickedSearchKad(wxCommandEvent &WXUNUSED(evt))
 {
+	if (!m_file) {
+		return;
+	}
+
+#ifdef CLIENT_GUI
+	// amulegui has no local Kad; ask the daemon to run the lookup. Retrieved notes arrive
+	// through the normal partfile-comments update. Mark the search running optimistically --
+	// the daemon's real state overwrites this on the next update.
+	theApp->sharedfiles->SearchKadNotes(m_file);
+	m_file->SetKadCommentSearchRunning(true);
+#else
+	if (!m_file->RequestKadNoteSearch()) {
+		// Kad down, or a search (often the file's own source search) is already using this
+		// hash. The daemon log (logKadSearch) records the exact reason; reuse existing
+		// strings here to avoid new catalog entries.
+		FindWindow(IDC_CMSTATUS)
+			->SetLabel(theApp->IsConnectedKad()
+					   ? _("Could not start a Kad search")
+					   : _("Kad search can't be done if Kad is not running"));
+		FindWindow(IDC_CMSTATUS)->GetParent()->Layout();
+		return;
+	}
+#endif
+
+	// The lookup is asynchronous (up to ~45s). Disable the button, show progress,
+	// and poll: the timer refreshes the list as notes arrive and stops when done.
+	FindWindow(IDC_CMSEARCHKAD)->Disable();
+	FindWindow(IDC_CMSTATUS)->SetLabel(_("Searching Kad for comments..."));
+	FindWindow(IDC_CMSTATUS)->GetParent()->Layout();
+	m_kadRefreshTicks = 0;
+	m_kadRefreshTimer.Start(2000);
+}
+
+void CCommentDialogLst::OnKadRefreshTimer(wxTimerEvent &WXUNUSED(evt))
+{
+	// A Kad notes lookup lives at most SEARCHNOTES_LIFETIME (45s); cap at 60s so the
+	// timer can never hang even if the "running" flag is never observed to clear.
+	const bool timedOut = ++m_kadRefreshTicks > 30;
+
+	if (!m_file || timedOut || !m_file->IsKadCommentSearchRunning()) {
+		// Search finished (or the file went away): final refresh + restore the UI.
+		m_kadRefreshTimer.Stop();
+		if (FindWindow(IDC_CMSEARCHKAD)) {
+			FindWindow(IDC_CMSEARCHKAD)->Enable();
+		}
+		if (m_file) {
+#ifdef CLIENT_GUI
+			// If we bailed on the safety timeout, clear the optimistic flag so a
+			// later search can start (the daemon is authoritative otherwise).
+			if (timedOut) {
+				m_file->SetKadCommentSearchRunning(false);
+			}
+#endif
+			UpdateList();
+		}
+		return;
+	}
+
+	// Still running: show whatever notes have arrived so far, keep the label.
 	UpdateList();
+	FindWindow(IDC_CMSTATUS)->SetLabel(_("Searching Kad for comments..."));
+	FindWindow(IDC_CMSTATUS)->GetParent()->Layout();
 }
 
+namespace
+{
+//! Smiley for a rating as SFileRating carries it: -1 for absent, otherwise 0..5 the way
+//! GetRateString() reads it. Anything without a real rating gets no image rather than a "not rated"
+//! glyph, so the column stays quiet.
+int RatingImage(sint16 rating)
+{
+	if (rating <= 0) {
+		return -1;
+	}
+	const int image = Client_InvalidRating_Smiley + rating - 1;
+	return (image <= Client_ExcellentRating_Smiley) ? image : -1;
+}
+} // namespace
 
 void CCommentDialogLst::UpdateList()
 {
@@ -119,7 +206,14 @@
 		if (!thePrefs::IsCommentFiltered(it->Comment)) {
 			m_list->InsertItem(count, it->UserName);
 			m_list->SetItem(count, 1, it->FileName);
-			m_list->SetItem(count, 2, (it->Rating != -1) ? GetRateString(it->Rating) : wxString("on"));
+			// Ratings reach here as 0..5: the wire value is a uint8 that CUpDownClient
+			// clamps to 0 when it exceeds 5, and 0 is a comment with no rating. The old
+			// -1 branch, which drew a stray untranslated "on", could not be reached.
+			m_list->SetItem(count, 2, GetRateString(it->Rating));
+			const int ratingImage = RatingImage(it->Rating);
+			if (ratingImage >= 0) {
+				m_list->SetItemColumnImage(count, 2, ratingImage);
+			}
 			m_list->SetItem(count, 3, it->Comment);
 			m_list->SetItemPtrData(count, reinterpret_cast<wxUIntPtr>(new SFileRating(*it)));
 			++count;
@@ -139,32 +233,59 @@
 	m_file->UpdateFileRatingCommentAvail();
 }
 
-
 void CCommentDialogLst::ClearList()
 {
 	size_t count = m_list->GetItemCount();
 	for (size_t i = 0; i < count; ++i) {
-		delete reinterpret_cast<SFileRating*>(m_list->GetItemData(i));
+		delete reinterpret_cast<SFileRating *>(m_list->GetItemData(i));
 	}
 
 	m_list->DeleteAllItems();
 }
 
+void CCommentDialogLst::OnColumnClick(wxListEvent &evt)
+{
+	const int col = evt.GetColumn();
+	if (col < 0) {
+		// Clicked past the last column header.
+		return;
+	}
+
+	if (m_sortColumn == col) {
+		m_sortDescending = !m_sortDescending;
+	} else {
+		m_sortColumn = col;
+		m_sortDescending = false;
+	}
 
-int CCommentDialogLst::SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData)
+	// Column packed into the magnitude (1-based, so column 0 doesn't
+	// collide with a sign), direction into the sign.
+	m_list->SortItems(SortProc, m_sortDescending ? -(col + 1) : (col + 1));
+
+	// Plain wxListCtrl tracks no sort state of its own, so the header glyph has to be driven
+	// explicitly. All three ports draw it: macOS and GTK through the generic implementation
+	// wx/listctrl.h routes them to, Windows through wxMSW's own override.
+	m_list->ShowSortIndicator(col, !m_sortDescending);
+}
+
+int CCommentDialogLst::SortProc(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData)
 {
-	SFileRating* file1 = reinterpret_cast<SFileRating*>(item1);
-	SFileRating* file2 = reinterpret_cast<SFileRating*>(item2);
-
-	int mod = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
-
-	switch (sortData & CMuleListCtrl::COLUMN_MASK) {
-		case 0:		return mod * file1->UserName.Cmp(file2->UserName);
-		case 1:		return mod * file1->FileName.Cmp(file2->FileName);
-		case 2:		return mod * (file1->Rating - file2->Rating);
-		case 3:		return mod * file1->Comment.Cmp(file2->Comment);
-		default:
-			return 0;
+	SFileRating *file1 = reinterpret_cast<SFileRating *>(item1);
+	SFileRating *file2 = reinterpret_cast<SFileRating *>(item2);
+
+	const int mod = (sortData < 0) ? -1 : 1;
+
+	switch (mod * sortData - 1) {
+	case 0:
+		return mod * file1->UserName.Cmp(file2->UserName);
+	case 1:
+		return mod * file1->FileName.Cmp(file2->FileName);
+	case 2:
+		return mod * (file1->Rating - file2->Rating);
+	case 3:
+		return mod * file1->Comment.Cmp(file2->Comment);
+	default:
+		return 0;
 	}
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/CommentDialogLst.h -> amule-3.1.0.tar.gz/src/CommentDialogLst.h Changed

@@ -26,56 +26,81 @@
 #ifndef COMMENTDIALOGLST_H
 #define COMMENTDIALOGLST_H
 
-#include <wx/dialog.h>		// Needed for wxDialog	// Do_not_auto_remove
+#include <wx/dialog.h>   // Needed for wxDialog	// Do_not_auto_remove
+#include <wx/listctrl.h> // Needed for wxListEvent
 #include <wx/sizer.h>
+#include <wx/timer.h> // Needed for wxTimer
 
-class CMuleListCtrl;
+class wxListCtrl;
 class wxCommandEvent;
-class CPartFile;
-class CKnownFile;
+class CAbstractFile;
 
 /**
- * This dialog is used to display file-comments received from other clients.
+ * Displays file comments received from other clients, or community ratings/comments fetched from
+ * Kad, for a download, a shared file or a search result.
  */
 class CCommentDialogLst : public wxDialog
 {
 public:
-	CCommentDialogLst(wxWindow* pParent, CPartFile* file);
+	CCommentDialogLst(wxWindow *pParent, CAbstractFile *file);
 	~CCommentDialogLst();
 
 	/**
-	 * Sorter function for the CMuleListCtrl used to contain the lists.
+	 * Sorter for the wxListCtrl holding the lists. sortData packs the 0-based column in its
+	 * magnitude and the direction in its sign (see OnColumnClick) -- plain wxListCtrl has no
+	 * built-in notion of "current sort column/direction" the way CMuleListCtrl did.
 	 */
-	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData);
+	static int wxCALLBACK SortProc(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData);
 
 	/**
-	 * Drop every reference to `file` from any open instance of this
-	 * dialog before the CKnownFile / CPartFile is destroyed.
-	 * Pointer-value comparison only — `file` may already be freed.
-	 * Wired via MuleNotify::KnownFileBeingDestroyed (GuiEvents.cpp).
+	 * Drop every reference to `file` from any open instance of this dialog before it is
+	 * destroyed. Pointer-value comparison only -- `file` may already be freed. Wired via
+	 * MuleNotify::KnownFileBeingDestroyed (downloads and shared files) and
+	 * MuleNotify::SearchFileBeingDestroyed (search results) in GuiEvents.cpp.
 	 */
-	static void DropReferencesTo(const CKnownFile* file);
+	static void DropReferencesTo(const CAbstractFile *file);
 
 private:
-	void OnBnClickedApply(wxCommandEvent& evt);
-	void OnBnClickedRefresh(wxCommandEvent& evt);
+	void OnBnClickedApply(wxCommandEvent &evt);
+	void OnBnClickedRefresh(wxCommandEvent &evt);
+	void OnBnClickedSearchKad(wxCommandEvent &evt);
+
+	//! While a Kad notes lookup runs, periodically refresh the list and stop
+	//! once the daemon reports the search finished.
+	void OnKadRefreshTimer(wxTimerEvent &evt);
+
+	//! Click-to-sort on a column header: toggles direction on the same column, otherwise
+	//! switches to that column ascending. Reimplements, for this one dialog, the sort-toggle
+	//! behaviour CMuleListCtrl used to provide for free.
+	void OnColumnClick(wxListEvent &evt);
 
 	/**
-	 * Updates the contents of the comments/ratings list.
+	 * Updates the comments/ratings list.
 	 */
 	void UpdateList();
 
 	/**
-	 * Clears the contents of the comments/ratings list.
+	 * Clears the comments/ratings list.
 	 */
 	void ClearList();
 
-	//! The file to display comments for.
-	CPartFile* m_file;
+	//! The file to display comments for (download, shared file, or search result).
+	CAbstractFile *m_file;
 
 	//! The list containing comments/ratings.
-	CMuleListCtrl* m_list;
+	wxListCtrl *m_list;
+
+	//! Current sort column/direction, since plain wxListCtrl doesn't track
+	//! this itself. -1 means unsorted (initial state).
+	int m_sortColumn;
+	bool m_sortDescending;
+
+	//! Drives auto-refresh while a Kad notes lookup is in flight.
+	wxTimer m_kadRefreshTimer;
 
+	//! Safety bound on auto-refresh ticks, so the timer can never hang if the
+	//! "running" state is never observed to clear (e.g. daemon rejected it).
+	int m_kadRefreshTicks;
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.0.1.tar.gz/src/CompilerSpecific.h -> amule-3.1.0.tar.gz/src/CompilerSpecific.h Changed

amule-3.1.0.tar.gz/src/CompleteSourcesThrottle.h Added

@@ -0,0 +1,59 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 COMPLETESOURCESTHROTTLE_H
+#define COMPLETESOURCESTHROTTLE_H
+
+#include <cstdint>
+
+/**
+ * Whether an otherwise-throttled complete-sources recompute must run anyway.
+ *
+ * CKnownFile::UpdatePartsInfo() only recomputes every 60 s. One transition cannot wait that out:
+ * the upload list going empty. Every caller is driven by a peer event and there is no periodic
+ * sweep, so if the last requesting peer leaves inside the window, the throttled call is the last
+ * one that file will ever get and the counts keep their values for the life of the process.
+ *
+ * Non-zero is asked of all three exported fields, not just the scalar. They do not move together:
+ * Hi is a percentile of the peers' self-reported counts and is only ever floored at the scalar,
+ * never tied to it, so a mixed population -- the norm, since a peer without extended requests v2
+ * contributes 0 -- settles at scalar 0 with Hi non-zero. Guarding on the scalar alone let that Hi
+ * through, and the desktop column and Web UI detail panel both render "< Hi" whenever Lo is 0, so
+ * the file kept claiming sources it no longer had (issue #1065). Lo cannot diverge from the scalar,
+ * but it is included so the guard stays honest if the estimation is ever changed.
+ *
+ * Still false once all three have settled at 0, which is what stops an idle shared file re-entering
+ * the recompute on every later call.
+ *
+ * Free function in a header of its own so it can be unit-tested: CKnownFile itself reaches theApp
+ * and cannot be linked into a test.
+ */
+inline bool CompleteSourcesNeedRecompute(
+	bool uploadListEmpty, std::uint16_t count, std::uint16_t countLo, std::uint16_t countHi)
+{
+	return uploadListEmpty && (count != 0 || countLo != 0 || countHi != 0);
+}
+
+#endif // COMPLETESOURCESTHROTTLE_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/Constants.h -> amule-3.1.0.tar.gz/src/Constants.h Changed

@@ -41,7 +41,6 @@
 	vtClients = 3
 };
 
-
 // lfroen : custom events for core internal messages
 // 'cause - there's no wxCommand etc in wxBase
 enum Core_Event_ID
@@ -53,7 +52,6 @@
 	SERVER_DNS_DONE
 };
 
-
 //! These IDs are used when a download is initiated via the HTTPThread.
 enum HTTP_Download_File
 {
@@ -83,7 +81,8 @@
 };
 
 //! Types of stat graphs
-enum StatsGraphType {
+enum StatsGraphType
+{
 	GRAPH_INVALID = 0,
 	GRAPH_DOWN,
 	GRAPH_UP,
@@ -93,35 +92,36 @@
 
 // KnownFile constants
 
-#define	PS_READY			0
-#define	PS_EMPTY			1
-#define PS_WAITING_FOR_HASH		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_VERY_LOW			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)
-
+#define PS_READY 0
+#define PS_EMPTY 1
+#define PS_WAITING_FOR_HASH 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_VERY_LOW \
+	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 {
+enum ESourceFrom
+{
 	SF_NONE,
 	SF_LOCAL_SERVER,
 	SF_REMOTE_SERVER,
@@ -134,7 +134,8 @@
 };
 
 // downloadstate
-enum EDownloadState {
+enum EDownloadState
+{
 	DS_DOWNLOADING = 0,
 	DS_ONQUEUE,
 	DS_CONNECTED,
@@ -149,11 +150,12 @@
 	DS_BANNED,
 	DS_ERROR,
 	DS_NONE,
-	DS_REMOTEQUEUEFULL  // not used yet, except in statistics
+	DS_REMOTEQUEUEFULL // not used yet, except in statistics
 };
 
 // uploadstate
-enum EUploadState {
+enum EUploadState
+{
 	US_UPLOADING = 0,
 	US_ONUPLOADQUEUE,
 	US_WAITCALLBACK,
@@ -166,7 +168,8 @@
 };
 
 // Obfuscation status
-enum EObfuscationState {
+enum EObfuscationState
+{
 	OBST_UNDEFINED = 0,
 	OBST_ENABLED,
 	OBST_SUPPORTED,
@@ -175,7 +178,8 @@
 };
 
 // m_byChatstate
-enum {
+enum
+{
 	MS_NONE = 0,
 	MS_CHATTING,
 	MS_CONNECTING,
@@ -183,8 +187,9 @@
 };
 
 // partfile converter status codes
-enum ConvStatus {
-	CONV_OK			= 0,
+enum ConvStatus
+{
+	CONV_OK = 0,
 	CONV_QUEUE,
 	CONV_INPROGRESS,
 	CONV_OUTOFDISKSPACE,
@@ -195,6 +200,5 @@
 	CONV_ALREADYEXISTS
 };
 
-
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/CorruptionBlackBox.cpp -> amule-3.1.0.tar.gz/src/CorruptionBlackBox.cpp Changed

@@ -3,7 +3,8 @@
 //
 // Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
 // 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 )
+// 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
@@ -25,17 +26,17 @@
 //
 
 #include "CorruptionBlackBox.h"
-#include <protocol/ed2k/Constants.h>	// needed for PARTSIZE
-#include "updownclient.h"		// Needed for CUpDownClient
+#include <protocol/ed2k/Constants.h> // needed for PARTSIZE
+#include "updownclient.h"            // Needed for CUpDownClient
 #include "Logger.h"
-#include "amule.h"				// needed for theApp
+#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 "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
+#define CBB_BANTHRESHOLD 32 //% max corrupted data
 
 // Record to store information which piece of data was downloaded from which client
 
@@ -84,42 +85,41 @@
 
 	// convert pos to relative block pos
 	uint16 nPart = (uint16)(nStartPos / PARTSIZE);
-	uint32 nRelStartPos = nStartPos - nPart*PARTSIZE;
-	uint32 nRelEndPos = nEndPos - nPart*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);
+		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_RecordsnPart; // this creates the entry if it doesn't exist yet
+	// Keep things simple. We do not request data we already have, and we check whether received
+	// data exceeds block boundaries, so there should not be much overlap. Just stuff everything
+	// received into the list and join only adjacent blocks.
+	CRecordList &list = m_RecordsnPart; // 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("CorruptionBlackBox(%s): transferred: new record for part %d (%d - %d, %s)")
-			% m_partNumber % nPart % nRelStartPos % nRelEndPos % Uint32toStringIP(senderIP));
+		AddDebugLogLineN(logPartFile,
+			CFormat("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) {
+void CCorruptionBlackBox::VerifiedData(bool ok, uint16 nPart, uint32 nRelStartPos, uint32 nRelEndPos)
+{
 	if (nRelStartPos > nRelEndPos) {
 		wxFAIL;
 		return;
 	}
 
-	CRecordList & list = m_RecordsnPart;
+	CRecordList &list = m_RecordsnPart;
 #ifdef __DEBUG__
 	std::map<uint32, bool> mapDebug;
 	uint32 nDbgVerifiedBytes = 0;
@@ -127,8 +127,8 @@
 #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 &curStart = it->m_nStartPos;
+		uint32 &curEnd = it->m_nEndPos;
 		uint32 ip = it->m_dwIP;
 		uint32 data = 0;
 		if (curStart >= nRelStartPos && curStart <= nRelEndPos) {
@@ -161,14 +161,15 @@
 				data = curEnd - nRelStartPos + 1;
 				curEnd = nRelStartPos - 1;
 			}
-		// else no overlap
+			// else no overlap
 		}
 		if (data) {
 			if (ok) {
 				m_goodClientsip.m_downloaded += data;
 			} else {
 				// corrupted data records are always counted as at least blocksize or bigger
-				m_badClientsip.m_downloaded += (data > EMBLOCKSIZE) ? data : EMBLOCKSIZE;;
+				m_badClientsip.m_downloaded += (data > EMBLOCKSIZE) ? data : EMBLOCKSIZE;
+				;
 			}
 			DEBUG_ONLY(nDbgVerifiedBytes += data);
 			DEBUG_ONLY(mapDebugip = 1);
@@ -180,9 +181,11 @@
 		m_Records.erase(nPart);
 	}
 #ifdef __DEBUG__
-	AddDebugLogLineN(logPartFile, CFormat("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 ? "verified" : "corrupt")
-		% nPart % listsize1 % listsize2 % mapDebug.size());
+	AddDebugLogLineN(logPartFile,
+		CFormat("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 ? "verified" : "corrupt") % nPart % listsize1 % listsize2 % mapDebug.size());
 #endif
 }
 
@@ -195,7 +198,7 @@
 		uint32 ip = it->first;
 		uint64 bad = it->second.m_downloaded;
 		if (!bad) {
-			wxFAIL;		// this should not happen
+			wxFAIL; // this should not happen
 			continue;
 		}
 		uint64 good = 0;
@@ -207,14 +210,17 @@
 		int nCorruptPercentage = bad * 100 / (bad + good);
 
 		if (nCorruptPercentage > CBB_BANTHRESHOLD) {
-			CUpDownClient* pEvilClient = theApp->clientlist->FindClientByIP(ip);
+			CUpDownClient *pEvilClient = theApp->clientlist->FindClientByIP(ip);
 			wxString clientName;
 			if (pEvilClient != NULL) {
 				clientName = pEvilClient->GetClientShortInfo();
-				AddDebugLogLineN(logPartFile, CFormat("CorruptionBlackBox(%s): Banning: Found client which sent %d of %d corrupted data, %s")
-					% m_partNumber % bad % (good + bad) % pEvilClient->GetClientFullInfo());
+				AddDebugLogLineN(logPartFile,
+					CFormat("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
+				pEvilClient->Ban(); // Identified as sender of corrupt data
 				// Stop download right away
 				pEvilClient->SetDownloadState(DS_BANNED);
 				if (pEvilClient->Disconnected("Upload of corrupted data")) {
@@ -224,17 +230,25 @@
 				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);
+			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);
+			CUpDownClient *pSuspectClient = theApp->clientlist->FindClientByIP(ip);
 			if (pSuspectClient != NULL) {
-				AddDebugLogLineN(logPartFile, CFormat("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());
+				AddDebugLogLineN(logPartFile,
+					CFormat("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("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));
+				AddDebugLogLineN(logPartFile,
+					CFormat("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));
 			}
 		}
 	}
@@ -248,26 +262,29 @@
 	std::map<uint16, CRecordList>::iterator it = m_Records.begin();
 	for (; it != m_Records.end(); ++it) {
 		uint16 block = it->first;
-		CRecordList & list = it->second;
+		CRecordList &list = it->second;
 		for (CRecordList::iterator it2 = list.begin(); it2 != list.end(); ++it2) {
-			AddDebugLogLineN(logPartFile, CFormat("CBBD %6d %.16s %10d - %10d")
-				% block % Uint32toStringIP(it2->m_dwIP) % it2->m_nStartPos % it2->m_nEndPos);
+			AddDebugLogLineN(logPartFile,
+				CFormat("CBBD %6d %.16s %10d - %10d") % block %
+					Uint32toStringIP(it2->m_dwIP) % it2->m_nStartPos % it2->m_nEndPos);
 		}
 	}
 	if (!m_goodClients.empty()) {
 		AddDebugLogLineN(logPartFile, "CBB Dump good Clients");
 		CCBBClientMap::iterator it3 = m_goodClients.begin();
 		for (; it3 != m_goodClients.end(); ++it3) {
-			AddDebugLogLineN(logPartFile, CFormat("CBBD %.16s good %10d")
-				% Uint32toStringIP(it3->first) % it3->second.m_downloaded);
+			AddDebugLogLineN(logPartFile,
+				CFormat("CBBD %.16s good %10d") % Uint32toStringIP(it3->first) %
+					it3->second.m_downloaded);
 		}
 	}
 	if (!m_badClients.empty()) {
 		AddDebugLogLineN(logPartFile, "CBB Dump bad Clients");
 		CCBBClientMap::iterator it3 = m_badClients.begin();
 		for (; it3 != m_badClients.end(); ++it3) {
-			AddDebugLogLineN(logPartFile, CFormat("CBBD %.16s bad %10d")
-				% Uint32toStringIP(it3->first) % it3->second.m_downloaded);
+			AddDebugLogLineN(logPartFile,
+				CFormat("CBBD %.16s bad %10d") % Uint32toStringIP(it3->first) %
+					it3->second.m_downloaded);
 		}
 	}
 #endif

amule-3.0.1.tar.gz/src/CorruptionBlackBox.h -> amule-3.1.0.tar.gz/src/CorruptionBlackBox.h Changed

amule-3.1.0.tar.gz/src/CountryDisplay.h Added

@@ -0,0 +1,87 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 COUNTRYDISPLAY_H
+#define COUNTRYDISPLAY_H
+
+//
+// Which country code a list should display for one entry -- the rule shared by the peer list and
+// the server list, so the two cannot drift apart.
+//
+// The body below is deliberately NOT in a .cpp: the answer depends on ENABLE_IP2COUNTRY /
+// CLIENT_GUI, which are per-target compile definitions. CountryFlags.cpp -- the obvious neighbour
+// -- lives in muleappgui, one static library built once and linked into both binaries, so it sees
+// neither define and could only ever produce the amulegui answer. Compiling per includer is what
+// makes the monolithic build take the local-resolver path at all.
+//
+// The corollary: include this only from sources built once per variant (the list controls are),
+// never from a shared library like muleappgui, or one binary links two different definitions.
+//
+
+#include "amule.h" // Needed for theApp and GEOIP_GUI
+#if defined(GEOIP_GUI) && !defined(CLIENT_GUI)
+#include "IP2Country.h" // Needed for CIP2Country (monolithic local lookup)
+#endif
+
+#include <wx/string.h>
+
+/**
+ * The country code to display for one list entry.
+ *
+ * The core emits its country tag whenever its resolver is enabled -- even as an empty string for an
+ * address that resolved to nothing -- so a tag that arrived over EC is authoritative: @a fromCore
+ * true means the core knows, and an empty @a coreCode then means "unknown", not "GeoIP is off".
+ * Only a build with no such feed (monolithic aMule) falls back to its own resolver, which carries
+ * its enabled state itself.
+ *
+ * Deliberately no thePrefs::IsGeoIPEnabled() on top: on amulegui that pref only mirrors the core's,
+ * refreshed at prefs-sync time, so consulting it could never do more than disagree with the tag we
+ * were handed.
+ *
+ * @param fromCore Whether the core sent a country tag for this entry.
+ * @param coreCode The code it sent (meaningful only when @a fromCore).
+ * @param ip       Numeric address, for the monolithic local lookup. Numeric rather than dotted so
+ *                 it hits the resolver's cache -- the string overload is uncached and goes straight
+ *                 to the database, which on a paint path means a lookup per row per repaint.
+ * @param code     Receives the ISO 3166-1 alpha-2 code; may come back empty for an address that
+ *                 did not resolve.
+ * @return false when no country is known at all -- render neither icon nor text.
+ */
+inline bool GetDisplayCountryCode(bool fromCore, const wxString &coreCode, uint32 ip, wxString &code)
+{
+	if (fromCore) {
+		code = coreCode;
+		return true;
+	}
+#if defined(GEOIP_GUI) && !defined(CLIENT_GUI)
+	// Monolithic aMule resolves locally. amulegui only ever takes the EC path above, and
+	// compiling this branch out of it keeps it link-clean of CIP2Country.
+	if (theApp->GetIP2Country() && theApp->GetIP2Country()->IsEnabled()) {
+		code = theApp->GetIP2Country()->GetCountryCode(ip);
+		return true;
+	}
+#else
+	wxUnusedVar(ip);
+#endif
+	code.Clear();
+	return false;
+}
+
+#endif // COUNTRYDISPLAY_H

amule-3.1.0.tar.gz/src/CountryFlags.cpp Added

@@ -0,0 +1,86 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// Country flags are libmaxminddb-free: they map an ISO code to an embedded PNG via the art
+// provider, so this is compiled unconditionally into every GUI -- amulegui, which gets codes over
+// EC, and monolithic amule. Only the resolver producing the codes is gated on ENABLE_IP2COUNTRY.
+#include "CountryFlags.h"
+#include "Logger.h"          // For AddLogLine*
+#include <common/Format.h>   // For CFormat()
+#include "icons/icon_data.h" // For amule_get_all_icons()
+
+#include <wx/artprov.h> // For wxArtProvider::GetBitmap
+#include <wx/intl.h>
+
+#include <cstring> // For strncmp
+
+CCountryFlags::CCountryFlags() = default;
+
+void CCountryFlags::LoadFlags()
+{
+	// Walk the embedded icon table and pick out anything named "flag_<code>". The table is
+	// built by src/icons/embed_icons.py from src/icons/flags/<code>.png at compile time;
+	// CamuleArtProvider, registered in CamuleGuiApp::OnInit, hands back a decoded wxBitmap for
+	// each.
+	int icon_count = 0;
+	const struct AMuleIconEntry *icons = amule_get_all_icons(&icon_count);
+	const char flag_prefix = "flag_";
+	const size_t flag_prefix_len = sizeof(flag_prefix) - 1;
+
+	for (int i = 0; i < icon_count; ++i) {
+		const char *name = iconsi.name;
+		if (strncmp(name, flag_prefix, flag_prefix_len) != 0) {
+			continue;
+		}
+		const wxString code = wxString(name + flag_prefix_len, wxConvISO8859_1);
+		const wxString art_id = wxString::Format("amule:%s", name);
+		const wxImage flag = wxArtProvider::GetBitmap(art_id).ConvertToImage();
+
+		if (!flag.IsOk()) {
+			// Reuse the existing catalog string (avoid a new msgid).
+			AddLogLineC(CFormat(_("Failed to load country data for '%s'.")) % code);
+			continue;
+		}
+		if (code == "unknown") {
+			m_unknown = flag;
+		}
+		m_flagscode = flag;
+	}
+
+	AddDebugLogLineN(logGeneral,
+		CFormat("Loaded %d flag bitmaps.") %
+			m_flags.size()); // there's never just one - no plural needed
+}
+
+const wxImage &CCountryFlags::GetFlag(const wxString &code)
+{
+	if (!m_loaded) {
+		// First call happens during list drawing, well after the app's
+		// OnInit pushed CamuleArtProvider -- so the flag art resolves now.
+		LoadFlags();
+		m_loaded = true;
+	}
+	std::map<wxString, wxImage>::const_iterator it = m_flags.find(code);
+	if (it != m_flags.end()) {
+		return it->second;
+	}
+	// Empty or unrecognised code -> the "??" placeholder flag.
+	return m_unknown;
+}

amule-3.1.0.tar.gz/src/CountryFlags.h Added

@@ -0,0 +1,60 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+//
+// Country flags are from FAMFAMFAM (http://www.famfamfam.com) -- public domain,
+// named with the ISO 3166-1 alpha-2 country codes.
+//
+
+#ifndef COUNTRYFLAGS_H
+#define COUNTRYFLAGS_H
+
+#include <map>
+
+#include <wx/image.h>
+#include <wx/string.h>
+
+// GUI-only country flag cache: maps an ISO 3166-1 alpha-2 code (lowercase) to its flag bitmap.
+// Split out of CIP2Country so the resolver stays headless and usable in amuled (see IP2Country.h)
+// -- country *codes* travel over EC, and each GUI turns the code into a flag here. Owned by
+// CamuleGuiBase, so both the monolithic and remote GUIs share one instance.
+class CCountryFlags
+{
+public:
+	CCountryFlags();
+
+	// Flag image for an ISO code (lowercase). Returns the "unknown" (??)
+	// flag when the code is empty or has no bundled image.
+	const wxImage &GetFlag(const wxString &code);
+
+private:
+	// Lazily populate m_flags on the first GetFlag(). Deferred rather than done in the ctor
+	// because CamuleGuiBase constructs this before the app's OnInit has pushed
+	// CamuleArtProvider -- loading in the ctor would find no art and every flag would come back
+	// blank, the peers list showing the bare code. By first draw, OnInit has run and the
+	// provider is live.
+	void LoadFlags();
+
+	bool m_loaded = false;
+	std::map<wxString, wxImage> m_flags;
+	wxImage m_unknown;
+};
+
+#endif // COUNTRYFLAGS_H

amule-3.0.1.tar.gz/src/CryptoPP_Inc.h -> amule-3.1.0.tar.gz/src/CryptoPP_Inc.h Changed

@@ -28,20 +28,54 @@
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
 
 #ifndef CRYPTOPP_INCLUDE_PREFIX
-	#include "config.h"		// Needed for CRYPTOPP_INCLUDE_PREFIX
+#include "config.h" // Needed for CRYPTOPP_INCLUDE_PREFIX
 #endif
 
-#define noinline	noinline
+#define noinline noinline
 
-#define CRYPTO_HEADER(hdr)	<CRYPTOPP_INCLUDE_PREFIX/hdr>
+#define CRYPTO_HEADER(hdr) <CRYPTOPP_INCLUDE_PREFIX/hdr>
+
+// cryptopp's headers are heavy on C++03 patterns: virtual dtors that bring in the deprecated
+// implicit copy ctor (P0806 rule), and throw(...) dynamic exception specs formally removed in
+// C++17. On Homebrew macOS the cryptopp include directory reaches consumers via CPATH (an `-I`
+// alias) rather than as `-isystem`, so a strict deprecation-warning audit build (`-Wdeprecated-
+// declarations -Wdeprecated-copy -Wdeprecated`) surfaces ~200 warnings from cryptopp headers alone.
+// GCC's -Wdeprecated-copy does not decompose into the -with-user-provided-dtor sub-case, so this
+// only bites Clang builds today; the pragma is scoped to Clang-known sub-flags for that reason.
+// Local to cryptopp includes; nothing else in the translation unit is affected.
+#include "WarningsPush_CryptoPP.h"
 
 #include CRYPTO_HEADER(config.h)
 #include CRYPTO_HEADER(md4.h)
+#include CRYPTO_HEADER(md5.h)
 #include CRYPTO_HEADER(rsa.h)
+#include CRYPTO_HEADER(sha.h)
 #include CRYPTO_HEADER(base64.h)
 #include CRYPTO_HEADER(osrng.h)
 #include CRYPTO_HEADER(files.h)
 #include CRYPTO_HEADER(sha.h)
 #include CRYPTO_HEADER(des.h)
 
+// Opt-in AEAD block. Kept behind a macro because this header reaches most of the tree through
+// MD5Sum.h, and gcm/chachapoly are heavy: only the EC packet layer needs them. Defining
+// CRYPTOPP_INC_NEED_AEAD before including this header pulls them in under the same deprecation
+// pragmas as everything above, so there is still exactly one place that knows how to include
+// cryptopp safely.
+#ifdef CRYPTOPP_INC_NEED_AEAD
+#include CRYPTO_HEADER(aes.h)
+#include CRYPTO_HEADER(gcm.h)
+#include CRYPTO_HEADER(hmac.h)
+// ChaCha20-Poly1305 arrived in cryptopp 8.1, which is aMule's floor, so it is always compiled in.
+// The EC layer still *negotiates* it, because that is about what the peer can do, not what this
+// build has.
+#include CRYPTO_HEADER(chachapoly.h)
+#include CRYPTO_HEADER(xed25519.h)
+// Runtime CPU feature probes, for picking the cipher the hardware is fastest at. In the AEAD block
+// for the same reason as the rest: only the EC layer asks, and this header reaches most of the tree
+// through MD5Sum.h.
+#include CRYPTO_HEADER(cpu.h)
+#endif
+
+#include "WarningsPop.h"
+
 #endif /* CRYPTOPP_INC_H */

amule-3.0.1.tar.gz/src/DataToText.cpp -> amule-3.1.0.tar.gz/src/DataToText.cpp Changed

@@ -28,22 +28,31 @@
 #include "Constants.h"
 #include <protocol/ed2k/ClientSoftware.h>
 
-wxString PriorityToStr( int priority, bool isAuto )
+wxString PriorityToStr(int priority, bool isAuto)
 {
-	if ( isAuto ) {
-		switch ( priority ) {
-			case PR_LOW:		return _("Auto Lo");
-			case PR_NORMAL:		return _("Auto No");
-			case PR_HIGH:		return _("Auto Hi");
+	if (isAuto) {
+		switch (priority) {
+		case PR_LOW:
+			return _("Auto Lo");
+		case PR_NORMAL:
+			return _("Auto No");
+		case PR_HIGH:
+			return _("Auto Hi");
 		}
 	} else {
-		switch ( priority ) {
-			case PR_VERY_LOW:	return _("Very low");
-			case PR_LOW:		return _("Low");
-			case PR_NORMAL:		return _("Normal");
-			case PR_HIGH:		return _("High");
-			case PR_VERYHIGH:	return _("Very High");
-			case PR_POWERSHARE:	return _("Release");
+		switch (priority) {
+		case PR_VERY_LOW:
+			return _("Very low");
+		case PR_LOW:
+			return _("Low");
+		case PR_NORMAL:
+			return _("Normal");
+		case PR_HIGH:
+			return _("High");
+		case PR_VERYHIGH:
+			return _("Very High");
+		case PR_POWERSHARE:
+			return _("Release");
 		}
 	}
 
@@ -52,25 +61,39 @@
 	return _("Unknown");
 }
 
-
-wxString DownloadStateToStr( int state, bool queueFull )
+wxString DownloadStateToStr(int state, bool queueFull)
 {
-	switch ( state ) {
-		case DS_CONNECTING:		return  _("Connecting");
-		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 _("Downloading");
-		case DS_REQHASHSET:		return _("Receiving hashset");
-		case DS_NONEEDEDPARTS:		return _("No needed parts");
-		case DS_LOWTOLOWIP:		return _("Cannot connect LowID to LowID");
-		case DS_TOOMANYCONNS:		return _("Too many connections");
-		case DS_NONE:			return _("Unknown");
-		case DS_WAITCALLBACKKAD:	return _("Connecting via Kad");
-		case DS_TOOMANYCONNSKAD:	return _("Too many Kad connections");
-		case DS_BANNED:			return _("Banned");
-		case DS_ERROR:			return _("Connection Error");
-		case DS_REMOTEQUEUEFULL:	return _("Remote Queue Full");
+	switch (state) {
+	case DS_CONNECTING:
+		return _("Connecting");
+	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 _("Downloading");
+	case DS_REQHASHSET:
+		return _("Receiving hashset");
+	case DS_NONEEDEDPARTS:
+		return _("No needed parts");
+	case DS_LOWTOLOWIP:
+		return _("Cannot connect LowID to LowID");
+	case DS_TOOMANYCONNS:
+		return _("Too many connections");
+	case DS_NONE:
+		return _("Unknown");
+	case DS_WAITCALLBACKKAD:
+		return _("Connecting via Kad");
+	case DS_TOOMANYCONNSKAD:
+		return _("Too many Kad connections");
+	case DS_BANNED:
+		return _("Banned");
+	case DS_ERROR:
+		return _("Connection Error");
+	case DS_REMOTEQUEUEFULL:
+		return _("Remote Queue Full");
 	}
 
 	wxFAIL;
@@ -78,78 +101,94 @@
 	return _("Unknown");
 }
 
-
 const wxString GetSoftName(unsigned int software_ident)
 {
 	switch (software_ident) {
-		case SO_OLDEMULE:
-		case SO_EMULE:
-			return "eMule";
-		case SO_CDONKEY:
-			return "cDonkey";
-		case SO_LXMULE:
-			return "(l/x)Mule";
-		case SO_AMULE:
-			return "aMule";
-		case SO_SHAREAZA:
-		case SO_NEW_SHAREAZA:
-		case SO_NEW2_SHAREAZA:
-			return "Shareaza";
-		case SO_EMULEPLUS:
-			return "eMule+";
-		case SO_HYDRANODE:
-			return "HydraNode";
-		case SO_MLDONKEY:
-			return wxTRANSLATE("Old MLDonkey");
-		case SO_NEW_MLDONKEY:
-		case SO_NEW2_MLDONKEY:
-			return wxTRANSLATE("New MLDonkey");
-		case SO_LPHANT:
-			return "lphant";
-		case SO_EDONKEYHYBRID:
-			return "eDonkeyHybrid";
-		case SO_EDONKEY:
-			return "eDonkey";
-		case SO_UNKNOWN:
-			return wxTRANSLATE("Unknown");
-		case SO_COMPAT_UNK:
-			return wxTRANSLATE("eMule Compatible");
-		default:
-			return "";
+	case SO_OLDEMULE:
+	case SO_EMULE:
+		return "eMule";
+	case SO_CDONKEY:
+		return "cDonkey";
+	case SO_LXMULE:
+		return "(l/x)Mule";
+	case SO_AMULE:
+		return "aMule";
+	case SO_SHAREAZA:
+	case SO_NEW_SHAREAZA:
+	case SO_NEW2_SHAREAZA:
+		return "Shareaza";
+	case SO_EMULEPLUS:
+		return "eMule+";
+	case SO_HYDRANODE:
+		return "HydraNode";
+	case SO_MLDONKEY:
+		return wxTRANSLATE("Old MLDonkey");
+	case SO_NEW_MLDONKEY:
+	case SO_NEW2_MLDONKEY:
+		return wxTRANSLATE("New MLDonkey");
+	case SO_LPHANT:
+		return "lphant";
+	case SO_EDONKEYHYBRID:
+		return "eDonkeyHybrid";
+	case SO_EDONKEY:
+		return "eDonkey";
+	case SO_UNKNOWN:
+		return wxTRANSLATE("Unknown");
+	case SO_COMPAT_UNK:
+		return wxTRANSLATE("eMule Compatible");
+	default:
+		return "";
 	}
 }
 
-
 wxString OriginToText(unsigned int source_from)
 {
 	switch ((ESourceFrom)source_from) {
-		case SF_LOCAL_SERVER:		return wxTRANSLATE("Local Server");
-		case SF_REMOTE_SERVER:		return wxTRANSLATE("Remote Server");
-		case SF_KADEMLIA:		return wxTRANSLATE("Kad");
-		case SF_SOURCE_EXCHANGE:	return wxTRANSLATE("Source Exchange");
-		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_NONE:
-		default:		return wxTRANSLATE("Unknown");
+	case SF_LOCAL_SERVER:
+		return wxTRANSLATE("Local Server");
+	case SF_REMOTE_SERVER:
+		return wxTRANSLATE("Remote Server");
+	case SF_KADEMLIA:
+		return wxTRANSLATE("Kad");
+	case SF_SOURCE_EXCHANGE:
+		return wxTRANSLATE("Source Exchange");
+	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_NONE:
+	default:
+		return wxTRANSLATE("Unknown");
 	}
 }
 
-
 wxString GetConversionState(unsigned int state)
 {
 	switch (state) {
-		case CONV_OK			: return _("Completed");
-		case CONV_INPROGRESS		: return _("In progress");
-		case CONV_OUTOFDISKSPACE	: return _("ERROR: Out of disk space");
-		case CONV_PARTMETNOTFOUND	: return _("ERROR: Partmet not found");
-		case CONV_IOERROR		: return _("ERROR: IO error!");
-		case CONV_FAILED		: return _("ERROR: Failed!");
-		case CONV_QUEUE			: return _("Queued");
-		case CONV_ALREADYEXISTS		: return _("Already downloading");
-		case CONV_BADFORMAT		: return _("Unknown or bad tempfile format.");
-		default: return "?";
+	case CONV_OK:
+		return _("Completed");
+	case CONV_INPROGRESS:
+		return _("In progress");
+	case CONV_OUTOFDISKSPACE:
+		return _("ERROR: Out of disk space");
+	case CONV_PARTMETNOTFOUND:
+		return _("ERROR: Partmet not found");
+	case CONV_IOERROR:
+		return _("ERROR: IO error!");
+	case CONV_FAILED:
+		return _("ERROR: Failed!");
+	case CONV_QUEUE:
+		return _("Queued");
+	case CONV_ALREADYEXISTS:
+		return _("Already downloading");
+	case CONV_BADFORMAT:
+		return _("Unknown or bad tempfile format.");
+	default:
+		return "?";
 	}
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/DataToText.h -> amule-3.1.0.tar.gz/src/DataToText.h Changed

@@ -28,27 +28,22 @@
 class wxString;
 
 // Returns the textual representation of a priority value
-wxString PriorityToStr( int priority, bool isAuto );
+wxString PriorityToStr(int priority, bool isAuto);
 
 // Returns the textual representation of download states
-wxString DownloadStateToStr( int state, bool queueFull );
+wxString DownloadStateToStr(int state, bool queueFull);
 
-/**
- * @return Human-readable client software name.
- */
-const wxString GetSoftName( unsigned int software_ident );
+/// @return Human-readable client software name.
+const wxString GetSoftName(unsigned int software_ident);
 
 /**
  * Get "Source From" text, i.e. where we got the source from.
- *
  * @param source_from A ESourceFrom enum value.
  * @return Human-readable text for the ESourceFrom enum values.
  */
 wxString OriginToText(unsigned int source_from);
 
-/**
- * @return The textual representation of a partfile conversion state.
- */
+/// @return The textual representation of a partfile conversion state.
 wxString GetConversionState(unsigned int state);
 
 #endif /* DATATOTEXT_H */

amule-3.0.1.tar.gz/src/DeadSourceList.cpp -> amule-3.1.0.tar.gz/src/DeadSourceList.cpp Changed

@@ -27,17 +27,16 @@
 
 #include <common/Macros.h>
 
-#include "updownclient.h"		// Needed for CUpDownClient
+#include "updownclient.h" // Needed for CUpDownClient
 
-#define	CLEANUPTIME			MIN2MS(60)
+#define CLEANUPTIME MIN2MS(60)
 
-#define BLOCKTIME		(::GetTickCount64() + (m_bGlobalList ? MIN2MS(30) : MIN2MS(45)))
-#define BLOCKTIMEFW		(::GetTickCount64() + (m_bGlobalList ? MIN2MS(45) : MIN2MS(60)))
+#define BLOCKTIME (::GetTickCount64() + (m_bGlobalList ? MIN2MS(30) : MIN2MS(45)))
+#define BLOCKTIMEFW (::GetTickCount64() + (m_bGlobalList ? MIN2MS(45) : MIN2MS(60)))
 
 ///////////////////////////////////////////////////////////////////////////////////////
 //// CDeadSource
 
-
 CDeadSourceList::CDeadSource::CDeadSource(uint32 ID, uint16 Port, uint32 ServerIP, uint16 KadPort)
 {
 	m_ID = ID;
@@ -47,24 +46,21 @@
 	m_TimeStamp = 0;
 }
 
-
-void CDeadSourceList::CDeadSource::SetTimeout( uint64 t )
+void CDeadSourceList::CDeadSource::SetTimeout(uint64 t)
 {
 	m_TimeStamp = t;
 }
 
-
 uint64 CDeadSourceList::CDeadSource::GetTimeout() const
 {
 	return m_TimeStamp;
 }
 
-
-bool CDeadSourceList::CDeadSource::operator==(const CDeadSource& other) const
+bool CDeadSourceList::CDeadSource::operator==(const CDeadSource &other) const
 {
-	if ( m_ID == other.m_ID ) {
-		if ( m_Port == other.m_Port || m_KadPort == other.m_KadPort ) {
-			if ( IsLowID( m_ID ) ) {
+	if (m_ID == other.m_ID) {
+		if (m_Port == other.m_Port || m_KadPort == other.m_KadPort) {
+			if (IsLowID(m_ID)) {
 				return m_ServerIP == other.m_ServerIP;
 			} else {
 				return true;
@@ -75,7 +71,6 @@
 	return false;
 }
 
-
 ///////////////////////////////////////////////////////////////////////////////////////
 //// CDeadSourceList
 
@@ -85,33 +80,28 @@
 	m_bGlobalList = isGlobal;
 }
 
-
 uint32 CDeadSourceList::GetDeadSourcesCount() const
 {
 	return m_sources.size();
 }
 
-
-bool CDeadSourceList::IsDeadSource(const CUpDownClient* client)
+bool CDeadSourceList::IsDeadSource(const CUpDownClient *client)
 {
-	CDeadSource source(
-		client->GetUserIDHybrid(),
+	CDeadSource source(client->GetUserIDHybrid(),
 		client->GetUserPort(),
 		client->GetServerIP(),
-		client->GetKadPort()
-	);
-
+		client->GetKadPort());
 
-	DeadSourcePair range = m_sources.equal_range( client->GetUserIDHybrid() );
-	for ( ; range.first != range.second; range.first++ ) {
-		if ( range.first->second == source ) {
+	DeadSourcePair range = m_sources.equal_range(client->GetUserIDHybrid());
+	for (; range.first != range.second; range.first++) {
+		if (range.first->second == source) {
 			// Check if the entry is still valid
-			if ( range.first->second.GetTimeout() > GetTickCount64() ) {
+			if (range.first->second.GetTimeout() > GetTickCount64()) {
 				return true;
 			}
 
 			// The source is no longer dead, so remove it to reduce the size of the list
-			m_sources.erase( range.first );
+			m_sources.erase(range.first);
 			break;
 		}
 	}
@@ -119,47 +109,43 @@
 	return false;
 }
 
-
-void CDeadSourceList::AddDeadSource( const CUpDownClient* client )
+void CDeadSourceList::AddDeadSource(const CUpDownClient *client)
 {
-	CDeadSource source(
-		client->GetUserIDHybrid(),
+	CDeadSource source(client->GetUserIDHybrid(),
 		client->GetUserPort(),
 		client->GetServerIP(),
-		client->GetKadPort()
-	);
+		client->GetKadPort());
 
 	// Set the timeout for the new source
-	source.SetTimeout( client->HasLowID() ? BLOCKTIMEFW : BLOCKTIME );
+	source.SetTimeout(client->HasLowID() ? BLOCKTIMEFW : BLOCKTIME);
 
 	// Check if the source is already listed
-	DeadSourcePair range = m_sources.equal_range( client->GetUserIDHybrid() );
-	for ( ; range.first != range.second; range.first++ ) {
-		if ( range.first->second == source ) {
+	DeadSourcePair range = m_sources.equal_range(client->GetUserIDHybrid());
+	for (; range.first != range.second; range.first++) {
+		if (range.first->second == source) {
 			range.first->second = source;
 			return;
 		}
 	}
 
-	m_sources.insert( DeadSourceMap::value_type( client->GetUserIDHybrid(), source ) );
+	m_sources.insert(DeadSourceMap::value_type(client->GetUserIDHybrid(), source));
 
 	// Check if we should cleanup the list. This is
 	// done to avoid a buildup of stale entries.
-	if ( GetTickCount64() - m_dwLastCleanUp > CLEANUPTIME ) {
+	if (GetTickCount64() - m_dwLastCleanUp > CLEANUPTIME) {
 		CleanUp();
 	}
 }
 
-
 void CDeadSourceList::CleanUp()
 {
 	m_dwLastCleanUp = ::GetTickCount64();
 
 	DeadSourceIterator it = m_sources.begin();
-	for ( ; it != m_sources.end(); ) {
+	for (; it != m_sources.end();) {
 		DeadSourceIterator it1 = it++;
-		if ( it1->second.GetTimeout() < m_dwLastCleanUp ) {
-			m_sources.erase( it1 );
+		if (it1->second.GetTimeout() < m_dwLastCleanUp) {
+			m_sources.erase(it1);
 		}
 	}
 }

amule-3.0.1.tar.gz/src/DeadSourceList.h -> amule-3.1.0.tar.gz/src/DeadSourceList.h Changed

@@ -26,125 +26,102 @@
 #ifndef DEADSOURCELIST_H
 #define DEADSOURCELIST_H
 
-
 #include <map>
 
 #include "Types.h"
 
-
 class CUpDownClient;
 
-
 /**
- * This class keeps track of "invalid" sources.
+ * Tracks "invalid" sources.
  *
- * A dead source is a source that has been evaluated as being useles
- * which can be due to several reasons, such as not responding to
- * queries. This list then allows for those sources to be ignored
- * for an set amount of time in order to avoid the overhead of
- * trying to connect to them.
- *
- * This is important, since these sources would be removed and readded
- * repeatedly, causing extra overhead with no gain.
+ * A dead source is one evaluated as useless, for instance because it does not answer queries.
+ * Listing it lets it be ignored for a set time, avoiding the overhead of trying to connect -- which
+ * matters, since such sources would otherwise be removed and re-added repeatedly for no gain.
  */
 class CDeadSourceList
 {
 public:
 	/**
-	 * Constructor.
-	 *
-	 * @param isGlobal Specifies if the list is global or not, used for debugging.
+	 * @param isGlobal Whether the list is global; used for debugging.
 	 */
 	CDeadSourceList(bool isGlobal = false);
 
-
 	/**
 	 * Adds a client to the list of dead sources.
 	 */
-	void		AddDeadSource(const CUpDownClient* client);
+	void AddDeadSource(const CUpDownClient *client);
 
 	/**
-	 * Returns true if the client object is a dead source.
+	 * True if the client object is a dead source.
 	 */
-	bool		IsDeadSource(const CUpDownClient* client);
-
+	bool IsDeadSource(const CUpDownClient *client);
 
 	/**
-	 * Returns the number of sources.
+	 * The number of sources.
 	 */
-	uint32		GetDeadSourcesCount() const;
+	uint32 GetDeadSourcesCount() const;
 
 private:
 	/**
-	 * Removes too old entries from the list.
+	 * Removes entries that are too old.
 	 */
-	void		CleanUp();
-
+	void CleanUp();
 
 	/**
-	 * Record of dead source.
+	 * Record of a dead source.
 	 */
 	class CDeadSource
 	{
 	public:
 		/**
-		 * Constructor.
-		 *
-		 * @param ID The IP/ID of the recorded client.
+		 * @param ID The IP/ID of the recorded client. Must be specified.
 		 * @param Port The TCP port of the recorded client.
-		 * @param ServerIP The ip of the connected server.
-		 * @param KadPort The Kad port used by the client.
-		 *
-		 * Notes:
-		 *  * ID must be specified.
-		 *  * Either KadPort or Port must be specified.
-		 *  * For lowid sources, ServerIP must be specified.
-		 *
+		 * @param ServerIP The IP of the connected server. Must be specified for lowid
+		 * sources.
+		 * @param KadPort The Kad port used by the client. Either this or @a Port must be
+		 * specified.
 		 */
 		CDeadSource(uint32 ID, uint16 Port, uint32 ServerIP, uint16 KadPort);
 
-
 		/**
 		 * Equality operator.
 		 */
-		bool operator==(const CDeadSource& other) const;
-
+		bool operator==(const CDeadSource &other) const;
 
 		/**
-		 * Sets the timestamp for the time where this entry will expire.
+		 * Sets the timestamp at which this entry expires.
 		 */
-		void	SetTimeout( uint64 t );
+		void SetTimeout(uint64 t);
 
 		/**
-		 * Returns the timestamp of this entry.
+		 * The timestamp of this entry.
 		 */
-		uint64	GetTimeout() const;
+		uint64 GetTimeout() const;
 
 	private:
 		//! The ID/IP of the client.
-		uint32			m_ID;
+		uint32 m_ID;
 		//! The TCP port of the client
-		uint16			m_Port;
+		uint16 m_Port;
 		//! The Kad port of the client.
-		uint16			m_KadPort;
+		uint16 m_KadPort;
 		//! The IP of the server the client is connected to.
-		uint32			m_ServerIP;
+		uint32 m_ServerIP;
 		//! The timestamp of DOOM!
-		uint64			m_TimeStamp;
+		uint64 m_TimeStamp;
 	};
 
-
-	typedef std::multimap< uint32, CDeadSource > DeadSourceMap;
+	typedef std::multimap<uint32, CDeadSource> DeadSourceMap;
 	typedef DeadSourceMap::iterator DeadSourceIterator;
 	typedef std::pair<DeadSourceIterator, DeadSourceIterator> DeadSourcePair;
 	//! List of currently dead sources.
 	DeadSourceMap m_sources;
 
-
 	//! The timestamp of when the last cleanup was performed.
-	uint64	m_dwLastCleanUp;
+	uint64 m_dwLastCleanUp;
 	//! Specifies if the list is global or not.
-	bool	m_bGlobalList;
+	bool m_bGlobalList;
 };
 
 #endif

amule-3.0.1.tar.gz/src/DirectoryTreeCtrl.cpp -> amule-3.1.0.tar.gz/src/DirectoryTreeCtrl.cpp Changed

@@ -24,43 +24,42 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "DirectoryTreeCtrl.h"	// Interface declarations
+#include "DirectoryTreeCtrl.h" // Interface declarations
 
 #include <wx/app.h>
+#include <wx/artprov.h> // Needed for the "amule:folder"/"amule:folder_shared" art ids
 #include <wx/filename.h>
 #include <wx/imaglist.h>
+#include <wx/msgdlg.h> // Needed for wxMessageBox (was pulled in transitively via muuli_wdr.h's wx/wx.h)
 
 #include <common/StringFunctions.h>
 #include <common/FileFunctions.h>
-#include "amule.h"			// Needed for theApp
-#include "muuli_wdr.h"		// Needed for amuleSpecial
-
+#include "amule.h" // Needed for theApp
 
 wxBEGIN_EVENT_TABLE(CDirectoryTreeCtrl, wxTreeCtrl)
-	EVT_TREE_ITEM_RIGHT_CLICK(wxID_ANY,	CDirectoryTreeCtrl::OnRButtonDown)
-	EVT_TREE_ITEM_ACTIVATED(wxID_ANY,	CDirectoryTreeCtrl::OnItemActivated)
-	EVT_TREE_ITEM_EXPANDED(wxID_ANY,	CDirectoryTreeCtrl::OnItemExpanding)
+	EVT_TREE_ITEM_RIGHT_CLICK(wxID_ANY, CDirectoryTreeCtrl::OnRButtonDown)
+	EVT_TREE_ITEM_ACTIVATED(wxID_ANY, CDirectoryTreeCtrl::OnItemActivated)
+	EVT_TREE_ITEM_EXPANDED(wxID_ANY, CDirectoryTreeCtrl::OnItemExpanding)
 wxEND_EVENT_TABLE()
 
-
 class CItemData : public wxTreeItemData
 {
-	public:
-		CItemData(const CPath& pathComponent)
-			: m_path(pathComponent)
-		{
-		}
+public:
+	CItemData(const CPath &pathComponent)
+	: m_path(pathComponent)
+	{
+	}
 
-		~CItemData() {}
+	~CItemData() {}
 
-		const CPath& GetPathComponent() const { return m_path; }
-	private:
-		CPath	m_path;
-};
+	const CPath &GetPathComponent() const { return m_path; }
 
+private:
+	CPath m_path;
+};
 
-CDirectoryTreeCtrl::CDirectoryTreeCtrl(wxWindow* parent, int id, const wxPoint& pos, wxSize siz, int flags)
-	: wxTreeCtrl(parent,id,pos,siz,flags,wxDefaultValidator,"ShareTree")
+CDirectoryTreeCtrl::CDirectoryTreeCtrl(wxWindow *parent, int id, const wxPoint &pos, wxSize siz, int flags)
+: wxTreeCtrl(parent, id, pos, siz, flags, wxDefaultValidator, "ShareTree")
 {
 	m_IsInit = false;
 	HasChanged = false;
@@ -71,228 +70,222 @@
 #endif
 }
 
-
 wxFont CDirectoryTreeCtrl::GetRecursiveFont()
 {
-	// Cache: GetFont() can be a non-trivial wx call on some backends,
-	// and AddChildItem hits this once per tree item during the lazy
-	// expand pass.
+	// Cached: GetFont() is a non-trivial wx call on some backends, and AddChildItem
+	// hits this once per tree item during the lazy expand pass.
 	if (!m_fontRecursiveRoot.IsOk()) {
 		m_fontRecursiveRoot = GetFont().MakeBold().MakeItalic();
 	}
 	return m_fontRecursiveRoot;
 }
 
-
 void CDirectoryTreeCtrl::ApplyRecursiveMark(wxTreeItemId hItem, bool isRecursive)
 {
 	if (isRecursive) {
 		SetItemFont(hItem, GetRecursiveFont());
 	} else {
-		// Revert to the tree's default font. SetItemBold is the
-		// orthogonal axis (plain bold for explicit / inside-recursive
-		// shares); clearing the custom font here doesn't drop that
-		// attribute -- IsBold-based logic continues to work.
+		// Revert to the tree's default font. SetItemBold is the orthogonal axis, so
+		// clearing the custom font here does not drop it.
 		//
-		// Pass GetFont() rather than wxNullFont: on wxMSW 3.2,
-		// wxTreeCtrl::SetItemFont calls wxFont::WXAdjustToPPI() on
-		// the supplied font for DPI adjustment, and WXAdjustToPPI
-		// dereferences the font's refdata without a null check.
-		// wxNullFont has no refdata -> access violation. The tree's
-		// own font has valid refdata, so we route through it. (#827)
+		// Pass GetFont() rather than wxNullFont: on wxMSW 3.2 wxTreeCtrl::SetItemFont calls
+		// wxFont::WXAdjustToPPI(), which dereferences the font's refdata with no null
+		// check, and wxNullFont has none (#827).
 		SetItemFont(hItem, GetFont());
 	}
 }
 
+CDirectoryTreeCtrl::~CDirectoryTreeCtrl() {}
 
-CDirectoryTreeCtrl::~CDirectoryTreeCtrl()
+enum
 {
-}
-
-enum {
 	IMAGE_FOLDER = 0,
 	IMAGE_FOLDER_SUB_SHARED
 };
 
+void CDirectoryTreeCtrl::Rebuild()
+{
+	if (!m_IsInit) {
+		// Never built: leave it to the first Init(), which starts from the
+		// current state anyway. Keeps the initial drive scan lazy.
+		return;
+	}
+	DeleteAllItems();
+	m_IsInit = false;
+	Init();
+}
 
 void CDirectoryTreeCtrl::Init()
 {
-	// already done ?
 	if (m_IsInit) {
 		return;
 	}
 	m_IsInit = true;
 
-	// init image(s)
-	wxImageList* images = new wxImageList(16, 16);
-	images->Add(wxBitmap(amuleSpecial(1)));
-	images->Add(wxBitmap(amuleSpecial(2)));
-	// Gives wxTreeCtrl ownership of the list
+	wxImageList *images = new wxImageList(16, 16);
+	// wxImageList::Add() wants a flat wxBitmap, not a bundle -- it's a
+	// raster cache with no per-DPI resolution of its own.
+	images->Add(wxArtProvider::GetBitmap("amule:folder", wxART_OTHER, wxSize(16, 16)));
+	images->Add(wxArtProvider::GetBitmap("amule:folder_shared", wxART_OTHER, wxSize(16, 16)));
 	AssignImageList(images);
 
-
 	// Create an empty root item, which we can
 	// safely append when creating a full path.
-	m_root = AddRoot("", IMAGE_FOLDER, -1,
-					new CItemData(CPath()));
+	m_root = AddRoot("", IMAGE_FOLDER, -1, new CItemData(CPath()));
 
 	if (!m_IsRemote) {
-	#ifndef __WINDOWS__
+#ifndef __WINDOWS__
 		AddChildItem(m_root, CPath("/"));
-	#else
-		// this might take awhile, so change the cursor
+#else
 		::wxSetCursor(*wxHOURGLASS_CURSOR);
-		// retrieve bitmask of all drives available
 		uint32 drives = GetLogicalDrives();
 		drives >>= 1;
 		for (char drive = 'C'; drive <= 'Z'; drive++) {
 			drives >>= 1;
-			if (! (drives & 1)) { // skip non existent drives
+			if (!(drives & 1)) { // skip non existent drives
 				continue;
 			}
 			wxString driveStr = CFormat("%c:") % drive;
 			uint32 type = GetDriveType((driveStr + "\\").wc_str());
 
 			// skip removable/undefined drives, share only fixed or remote drives
-			if ((type == 3 || type == 4)   // fixed drive / remote drive
+			if ((type == 3 || type == 4) // fixed drive / remote drive
 				&& CPath::DirExists(driveStr)) {
 				AddChildItem(m_root, CPath(driveStr));
 			}
 		}
 		::wxSetCursor(*wxSTANDARD_CURSOR);
-	#endif
+#endif
 	}
 
 	HasChanged = false;
 
 	UpdateSharedDirectories();
+
+	// Remember what this paint was based on (see NeedsRepaintFor).
+	m_paintedRoots.clear();
+	for (SharedMap::const_iterator it = m_lstShared.begin(); it != m_lstShared.end(); ++it) {
+		m_paintedRoots.insert(it->second.GetRaw());
+	}
+	for (SharedMap::const_iterator it = m_lstSharedRecursive.begin(); it != m_lstSharedRecursive.end();
+		++it) {
+		m_paintedRoots.insert("R:" + it->second.GetRaw());
+	}
 }
 
+bool CDirectoryTreeCtrl::NeedsRepaintFor(const PathList &explicitDirs, const PathList &recursiveDirs) const
+{
+	if (!m_IsInit) {
+		// Nothing painted yet; the first Init() will use current state.
+		return false;
+	}
+	std::set<wxString> wanted;
+	for (const CPath &path : explicitDirs) {
+		wanted.insert(path.GetRaw());
+	}
+	for (const CPath &path : recursiveDirs) {
+		wanted.insert("R:" + path.GetRaw());
+	}
+	return wanted != m_paintedRoots;
+}
 
-void CDirectoryTreeCtrl::OnItemExpanding(wxTreeEvent& evt)
+void CDirectoryTreeCtrl::OnItemExpanding(wxTreeEvent &evt)
 {
 	wxTreeItemId hItem = evt.GetItem();
 
-	// Force reloading of the path
 	DeleteChildren(hItem);
 	AddSubdirectories(hItem, GetFullPath(hItem));
 
 	SortChildren(hItem);
 }
 
-
-void CDirectoryTreeCtrl::OnItemActivated(wxTreeEvent& evt)
+void CDirectoryTreeCtrl::OnItemActivated(wxTreeEvent &evt)
 {
 	if (m_IsRemote) {
 		return;
 	}
 	const wxTreeItemId hItem = evt.GetItem();
-	// A descendant of a recursive-share root cannot be individually
-	// un-shared via this UI: the apply task will re-flatten the root's
-	// subtree at commit time, so a left-click here would just un-bold
-	// the item visually and have the entry reappear after Apply. Block
-	// the action with a message so the user understands what to do
-	// (drop the recursive marker on the root, or right-click an
-	// ancestor) rather than silently appearing to ignore their click.
+	// A descendant of a recursive-share root cannot be individually un-shared from this UI: the
+	// apply task re-flattens the root's subtree at commit time, so a left-click here would only
+	// un-bold the item and have the entry reappear after Apply. Block it with a message saying
+	// what to do instead: drop the recursive marker on the root, or right-click an ancestor.
 	if (IsInsideRecursiveShare(GetFullPath(hItem))) {
-		wxMessageBox(
-			_("This directory is part of a recursive share. "
-			  "To remove it, un-share or modify the recursive "
-			  "share root above it."),
+		wxMessageBox(_("This directory is part of a recursive share. "
+			       "To remove it, un-share or modify the recursive "
+			       "share root above it."),
 			_("Cannot unshare inside a recursive share"),
-			wxOK | wxICON_INFORMATION, this);
+			wxOK | wxICON_INFORMATION,
+			this);
 		return;
 	}
 	CheckChanged(hItem, !IsBold(hItem), false);
 	HasChanged = true;
 }
 
-
-void CDirectoryTreeCtrl::OnRButtonDown(wxTreeEvent& evt)
+void CDirectoryTreeCtrl::OnRButtonDown(wxTreeEvent &evt)
 {
 	if (m_IsRemote) {
 		SelectItem(evt.GetItem()); // looks weird otherwise
 		return;
 	}
 
-	// Right-click is the "recursive share" gesture. Historically the
-	// handler eagerly walked the entire subtree (expanding every
-	// directory it had never opened, then marking each one as
-	// shared) which on large roots like /home produced multi-minute
-	// UI freezes with no progress indicator and no way to cancel —
-	// see issue #592.
+	// Right-click is the "recursive share" gesture. The handler used to eagerly walk the entire
+	// subtree, expanding every directory it had never opened, which on large roots like /home
+	// produced multi-minute UI freezes with no progress and no cancel (issue #592).
 	//
-	// We now record the intent on the right-clicked item only.
-	// PrefsUnifiedDlg::OnOk flattens the recursive-share roots into
-	// concrete subdirectory paths on a background thread with a
-	// progress dialog and a cancel button. Already-expanded
-	// descendants are still toggled visually here so the tree
-	// reflects what the user sees, but no new directory enumeration
-	// is performed; collapsed subtrees retain their current visual
-	// state and will be correctly bolded the next time they are
-	// expanded (AddChildItem checks IsInsideRecursiveShare).
+	// The intent is now recorded on the right-clicked item only, and PrefsUnifiedDlg::OnOk
+	// flattens the recursive roots into concrete subdirectory paths on a background thread with
+	// a progress dialog. Already-expanded descendants are still toggled visually, but nothing
+	// new is enumerated: collapsed subtrees keep their visual state and are bolded the next
+	// time they are expanded (AddChildItem checks IsInsideRecursiveShare).
 	const wxTreeItemId hItem = evt.GetItem();
 	const bool wasBold = IsBold(hItem);
 	const CPath fullPath = GetFullPath(hItem);
 
-	// A descendant of an existing recursive root is already covered
-	// by that root's expansion. Right-clicking it to add or remove
-	// its own recursive marker is meaningless -- either redundant
-	// (the descendant's subtree is already shared via the ancestor)
-	// or impotent (DelRecursiveShare on a non-root is a no-op).
-	// Block both with the same explanatory message.
+	// A descendant of an existing recursive root is already covered by that root, so its own
+	// recursive marker is either redundant or impotent (DelRecursiveShare on a non-root is a
+	// no-op). Block both with the same explanatory message.
 	if (IsInsideRecursiveShare(fullPath)) {
-		wxMessageBox(
-			_("This directory is part of a recursive share. "
-			  "To remove it, un-share or modify the recursive "
-			  "share root above it."),
+		wxMessageBox(_("This directory is part of a recursive share. "
+			       "To remove it, un-share or modify the recursive "
+			       "share root above it."),
 			_("Cannot modify inside a recursive share"),
-			wxOK | wxICON_INFORMATION, this);
+			wxOK | wxICON_INFORMATION,
+			this);
 		return;
 	}
 
 	if (wasBold) {
-		// Unshare. Clean both the recursive intent and any
-		// m_lstShared entries that live underneath this path —
-		// the latter is what removes the flat descendants that a
-		// previous Prefs session may have committed from a
-		// recursive share. Doing it as an in-memory map sweep
-		// catches subdirs that aren't currently rendered in the
-		// tree without having to expand them all from disk.
+		// Unshare. Clean both the recursive intent and any m_lstShared entries underneath
+		// this path -- the latter removes the flat descendants a previous Prefs session may
+		// have committed from a recursive share. An in-memory map sweep catches subdirs
+		// that are not currently rendered without expanding them from disk.
 		DelRecursiveShare(fullPath);
 		DelSharesUnder(fullPath);
 	} else {
 		AddRecursiveShare(fullPath);
 	}
 
-	// Walk only the *already-loaded* descendants so the in-tree
-	// visual stays consistent without forcing any disk I/O.
-	// CheckChanged inside this walk resets hItem's per-item font to
-	// match the new bold state (plain when unsharing, bold when
-	// sharing), so the recursive-off path needs no separate font
-	// revert.
+	// Walk only the ALREADY-LOADED descendants, so the in-tree visual stays consistent without
+	// forcing disk I/O. CheckChanged inside this walk resets hItem's per-item font to match the
+	// new bold state, so the recursive-off path needs no separate font revert.
 	MarkChildren(hItem, !wasBold, false);
 
 	if (!wasBold) {
-		// Overlay the bold-italic marker so the user can tell at a
-		// glance which item carries the recursive intent (vs the
-		// descendants which inherit it visually as plain bold).
-		// Must run *after* MarkChildren so CheckChanged's plain-bold
-		// per-item font on hItem doesn't clobber the italic marker.
+		// Overlay the bold-italic marker so the item carrying the recursive intent is
+		// distinguishable from descendants that inherit it as plain bold. After
+		// MarkChildren, or CheckChanged's plain-bold per-item font on hItem would clobber
+		// the italic.
 		ApplyRecursiveMark(hItem, true);
 	}
 	HasChanged = true;
 }
 
-
 void CDirectoryTreeCtrl::MarkChildren(wxTreeItemId hChild, bool mark, bool recursed)
 {
-	// Touch only the children that are *already* loaded into the
-	// tree control. We no longer enumerate collapsed subtrees here —
-	// that would re-introduce the unbounded directory walk OnRButton-
-	// Down used to do. Collapsed subtrees stay as-is and are
-	// re-evaluated on demand by AddChildItem (which consults the
-	// recursive-share intent) the next time the user expands them.
+	// Touch only the children ALREADY loaded into the tree control; enumerating collapsed
+	// subtrees would re-introduce the unbounded directory walk. They stay as they are and are
+	// re-evaluated on demand by AddChildItem the next time the user expands them.
 	wxTreeItemIdValue cookie;
 	wxTreeItemId hChild2 = GetFirstChild(hChild, cookie);
 	if (hChild2.IsOk()) {
@@ -311,37 +304,29 @@
 	CheckChanged(hChild, mark, recursed);
 }
 
-
-void CDirectoryTreeCtrl::AddChildItem(wxTreeItemId hBranch, const CPath& item)
+void CDirectoryTreeCtrl::AddChildItem(wxTreeItemId hBranch, const CPath &item)
 {
 	wxCHECK_RET(hBranch.IsOk(), "Attempted to add children to invalid item");
 
 	CPath fullPath = GetFullPath(hBranch).JoinPaths(item);
-	wxTreeItemId treeItem = AppendItem(hBranch, item.GetPrintable(),
-						IMAGE_FOLDER, -1,
-						new CItemData(item));
+	wxTreeItemId treeItem =
+		AppendItem(hBranch, item.GetPrintable(), 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.
+	// BUG: wxGenericTreeControl does not set text calculated sizes when the item is created in
+	// AppendItem. That asserts on Mac and possibly other systems, so the string has to be set
+	// again here.
 	SetItemText(treeItem, item.GetPrintable());
 
-	// Bold means "this directory is part of the pending share set",
-	// covering both the explicit-share case (m_lstShared) and the
-	// implicit case where the item is a descendant of a recursive-
-	// share root (m_lstSharedRecursive). The latter check is what
-	// keeps the tree visually consistent after a right-click whose
-	// recursive expansion is now deferred to commit time — the
-	// subtree gets bolded lazily as the user opens it.
+	// Bold means "this directory is part of the pending share set", covering both the explicit
+	// case (m_lstShared) and a descendant of a recursive-share root (m_lstSharedRecursive). The
+	// latter is what keeps the tree consistent after a right-click whose expansion is deferred
+	// to commit time: the subtree is bolded lazily as the user opens it.
 	const bool isRecursiveRoot = IsRecursiveShare(fullPath);
-	if (IsShared(fullPath) || isRecursiveRoot
-		|| IsInsideRecursiveShare(fullPath))
-	{
+	if (IsShared(fullPath) || isRecursiveRoot || IsInsideRecursiveShare(fullPath)) {
 		SetItemBold(treeItem, true);
 	}
-	// A recursive root gets bold-italic to distinguish it from
-	// plain explicit shares and from descendants covered by an
-	// inherited recursive expansion (which would otherwise all look
-	// identical in plain bold).
+	// A recursive root gets bold-italic, so it is distinguishable from plain
+	// explicit shares and from descendants covered by an inherited expansion.
 	if (isRecursiveRoot) {
 		ApplyRecursiveMark(treeItem, true);
 	}
@@ -356,14 +341,15 @@
 	}
 }
 
-
 CPath CDirectoryTreeCtrl::GetFullPath(wxTreeItemId hItem)
 {
-	{ wxCHECK_MSG(hItem.IsOk(), CPath(), "Invalid item in GetFullPath"); }
+	{
+		wxCHECK_MSG(hItem.IsOk(), CPath(), "Invalid item in GetFullPath");
+	}
 
 	CPath result;
 	for (; hItem.IsOk(); hItem = GetItemParent(hItem)) {
-		CItemData* data = dynamic_cast<CItemData*>(GetItemData(hItem));
+		CItemData *data = dynamic_cast<CItemData *>(GetItemData(hItem));
 		wxCHECK_MSG(data, CPath(), "Missing data-item in GetFullPath");
 
 		result = data->GetPathComponent().JoinPaths(result);
@@ -372,8 +358,7 @@
 	return result;
 }
 
-
-void CDirectoryTreeCtrl::AddSubdirectories(wxTreeItemId hBranch, const CPath& path)
+void CDirectoryTreeCtrl::AddSubdirectories(wxTreeItemId hBranch, const CPath &path)
 {
 	wxCHECK_RET(path.IsOk(), "Invalid path in AddSubdirectories");
 
@@ -387,8 +372,7 @@
 	}
 }
 
-
-bool CDirectoryTreeCtrl::HasSubdirectories(const CPath& folder)
+bool CDirectoryTreeCtrl::HasSubdirectories(const CPath &folder)
 {
 	// Prevent error-messages if we try to traverse somewhere we have no access.
 	wxLogNull logNo;
@@ -396,8 +380,7 @@
 	return CDirIterator(folder).HasSubDirs();
 }
 
-
-void CDirectoryTreeCtrl::GetSharedDirectories(PathList* list)
+void CDirectoryTreeCtrl::GetSharedDirectories(PathList *list)
 {
 	wxCHECK_RET(list, "Invalid list in GetSharedDirectories");
 
@@ -406,8 +389,7 @@
 	}
 }
 
-
-void CDirectoryTreeCtrl::SetSharedDirectories(PathList* list)
+void CDirectoryTreeCtrl::SetSharedDirectories(PathList *list)
 {
 	wxCHECK_RET(list, "Invalid list in SetSharedDirectories");
 
@@ -421,20 +403,16 @@
 	}
 }
 
-
-void CDirectoryTreeCtrl::GetRecursiveSharedDirectories(PathList* list)
+void CDirectoryTreeCtrl::GetRecursiveSharedDirectories(PathList *list)
 {
 	wxCHECK_RET(list, "Invalid list in GetRecursiveSharedDirectories");
 
-	for (SharedMap::iterator it = m_lstSharedRecursive.begin();
-		it != m_lstSharedRecursive.end(); ++it)
-	{
+	for (SharedMap::iterator it = m_lstSharedRecursive.begin(); it != m_lstSharedRecursive.end(); ++it) {
 		list->push_back(it->second);
 	}
 }
 
-
-void CDirectoryTreeCtrl::SetRecursiveSharedDirectories(PathList* list)
+void CDirectoryTreeCtrl::SetRecursiveSharedDirectories(PathList *list)
 {
 	wxCHECK_RET(list, "Invalid list in SetRecursiveSharedDirectories");
 
@@ -443,47 +421,47 @@
 		m_lstSharedRecursive.insert(SharedMapItem(GetKey(*it), *it));
 	}
 
-	// Mirror SetSharedDirectories: refresh the tree so a recursive
-	// root reloaded from shareddir-recursive.dat at prefs-open is
-	// rendered bold straight away rather than only after the user
-	// happens to expand its branch. PrefsUnifiedDlg calls this and
-	// SetSharedDirectories back-to-back; without this refresh, only
-	// the explicit set would have been visualised on first paint.
+	// Mirror SetSharedDirectories: refresh the tree so a recursive root reloaded from
+	// shareddir-recursive.dat at prefs-open is bold straight away rather than only once the
+	// user expands its branch. PrefsUnifiedDlg calls both back to back, and without this only
+	// the explicit set is visualised.
 	if (m_IsInit) {
 		UpdateSharedDirectories();
 	}
 }
 
-
-wxString CDirectoryTreeCtrl::GetKey(const CPath& path)
+wxString CDirectoryTreeCtrl::GetKey(const CPath &path)
 {
 	if (m_IsRemote) {
 		return path.GetRaw();
 	}
 
-	// Sanity check, see IsSameAs() in Path.cpp.  Skip wxGetCwd() when
-	// the path is already absolute — Normalize ignores cwd in that
-	// case, and wxGetCwd() emits a wxLogSysError for every call when
-	// the process's recorded CWD has been removed.
+	// Sanity check, see IsSameAs() in Path.cpp. Skip wxGetCwd() when the path is already
+	// absolute: Normalize ignores cwd then, and wxGetCwd() emits a wxLogSysError on every call
+	// once the process's recorded CWD is gone.
 	wxString cwd;
 	wxFileName fn(path.GetRaw());
 	if (!fn.IsAbsolute()) {
 		cwd = wxGetCwd();
 	}
-	// wxPATH_NORM_ALL is deprecated in wx3 — use explicit flags instead (excluding wxPATH_NORM_ENV_VARS)
-	const int flags = wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_CASE | wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG | wxPATH_NORM_SHORTCUT;
+	// wxPATH_NORM_ALL is deprecated in wx3 -- use explicit flags instead (excluding wxPATH_NORM_ENV_VARS)
+	const int flags = wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_CASE | wxPATH_NORM_ABSOLUTE |
+			  wxPATH_NORM_LONG | wxPATH_NORM_SHORTCUT;
 	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));
+			AppendItem(m_root,
+				it->second.GetPrintable(),
+				IMAGE_FOLDER,
+				-1,
+				new CItemData(it->second));
 		}
 		return;
 	}
@@ -494,12 +472,10 @@
 	wxTreeItemId hChild = GetFirstChild(GetRootItem(), cookie);
 
 	while (hChild.IsOk()) {
-		// Does this drive have shared subfolders?
 		if (HasSharedSubdirectory(GetFullPath(hChild))) {
 			SetHasSharedSubdirectory(hChild, true);
 		}
 
-		// Is this drive shared?
 		if (IsShared(GetFullPath(hChild))) {
 			SetItemBold(hChild, true);
 		}
@@ -508,41 +484,31 @@
 	}
 }
 
-
-bool CDirectoryTreeCtrl::HasSharedSubdirectory(const CPath& path)
+bool CDirectoryTreeCtrl::HasSharedSubdirectory(const CPath &path)
 {
-	// 1. An explicit-share entry lives below `path`. This is the
-	// original logic and covers the "user ticked /Pictures/2024"
-	// case where /Pictures should advertise that it contains a
-	// shared subdir.
+	// 1. An explicit-share entry lives below `path`: the "user ticked
+	// /Pictures/2024" case, where /Pictures should advertise a shared subdir.
 	{
 		SharedMap::iterator it =
-			m_lstShared.upper_bound(GetKey(path)
-				+ wxFileName::GetPathSeparator());
+			m_lstShared.upper_bound(GetKey(path) + wxFileName::GetPathSeparator());
 		if (it != m_lstShared.end() && it->second.StartsWith(path)) {
 			return true;
 		}
 	}
 
-	// 2. `path` itself is (or sits below) a recursive root. The
-	// recursive expansion implicitly shares every descendant of
-	// such a root, so by construction the folder has shared
-	// subdirs. Without this branch, recursive-only roots loaded
-	// from shareddir-recursive.dat would show plain bold without
-	// the "has shared subdirs" icon -- the m_lstShared check above
-	// returns false because the descendants live exclusively in
-	// the recursive expansion path, not in shareddir-explicit.dat.
+	// 2. `path` itself is, or sits below, a recursive root, which implicitly shares every
+	// descendant. Without this branch a recursive-only root loaded from shareddir-recursive.dat
+	// would show plain bold without the "has shared subdirs" icon, because its descendants live
+	// only in the recursive expansion.
 	if (IsRecursiveShare(path) || IsInsideRecursiveShare(path)) {
 		return true;
 	}
 
-	// 3. A recursive root sits below `path` (i.e. `path` is an
-	// ancestor of a marked root). Some descendant of `path` is
-	// shared via that root, so the icon should be on.
+	// 3. A recursive root sits below `path`, so some descendant is shared via that
+	// root and the icon should be on.
 	{
 		SharedMap::iterator it =
-			m_lstSharedRecursive.upper_bound(GetKey(path)
-				+ wxFileName::GetPathSeparator());
+			m_lstSharedRecursive.upper_bound(GetKey(path) + wxFileName::GetPathSeparator());
 		if (it != m_lstSharedRecursive.end() && it->second.StartsWith(path)) {
 			return true;
 		}
@@ -551,25 +517,19 @@
 	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, bool recursed)
 {
 	if (IsBold(hItem) != bChecked) {
 		SetItemBold(hItem, bChecked);
-		// Mirror the bold state into the per-item font. wxMSW honors
-		// a per-item font over TVIS_BOLD, so leaving a plain-font
-		// override in place would make a subsequent SetItemBold(true)
-		// render as plain (#827 fallout: after the recursive marker
-		// is cleared the per-item font becomes plain GetFont(); a
-		// later double-click would set TVIS_BOLD but display unbold).
-		// No-op on wxGTK/wxOSX where TVIS_BOLD overlays the per-item
-		// font.
+		// Mirror the bold state into the per-item font. wxMSW honours a per-item font over
+		// TVIS_BOLD, so leaving a plain-font override in place would make a later
+		// SetItemBold(true) render as plain (#827 fallout). No-op on wxGTK/wxOSX, where
+		// TVIS_BOLD overlays the per-item font.
 		SetItemFont(hItem, bChecked ? GetFont().Bold() : GetFont());
 
 		const CPath fullPath = GetFullPath(hItem);
@@ -578,27 +538,21 @@
 			AddShare(fullPath);
 		} else {
 			DelShare(fullPath);
-			// Double-clicking a recursive-share root must also drop
-			// the recursive intent, otherwise the expansion task at
-			// commit time would re-flatten the subtree and the user
-			// would see the files reappear in the shared list. Calls
-			// from MarkChildren on descendants of a recursive root
-			// are harmless no-ops here (only the root is keyed in
-			// m_lstSharedRecursive).
+			// Double-clicking a recursive-share root must also drop the recursive
+			// intent, or the expansion task would re-flatten the subtree at commit time
+			// and the files would reappear in the shared list. Calls from MarkChildren
+			// on descendants are harmless no-ops: only the root is keyed in
+			// m_lstSharedRecursive.
 			wasRecursive = IsRecursiveShare(fullPath);
 			DelRecursiveShare(fullPath);
 		}
 
 		if (!recursed) {
 			UpdateParentItems(hItem, bChecked);
-			// If we just dropped the recursive marker on this item,
-			// the already-rendered descendants are still painted
-			// bold via IsInsideRecursiveShare from the original
-			// AddChildItem pass. That state isn't re-evaluated on
-			// its own when the marker disappears, so the user sees
-			// a "ghost selection" of grayed-out-but-bold subdirs.
-			// Walk the descendants and unbold them to keep the tree
-			// visually consistent with the now-empty state.
+			// Dropping the recursive marker leaves the already-rendered descendants
+			// painted bold from the original AddChildItem pass, which nothing re-
+			// evaluates -- a "ghost selection" of bold subdirs. Walk them and unbold to
+			// match the now-empty state.
 			if (!bChecked && wasRecursive) {
 				MarkChildren(hItem, false, true);
 			}
@@ -606,16 +560,14 @@
 	}
 }
 
-
-bool CDirectoryTreeCtrl::IsShared(const CPath& path)
+bool CDirectoryTreeCtrl::IsShared(const CPath &path)
 {
 	wxCHECK_MSG(path.IsOk(), false, "Invalid path in IsShared");
 
 	return m_lstShared.find(GetKey(path)) != m_lstShared.end();
 }
 
-
-void CDirectoryTreeCtrl::AddShare(const CPath& path)
+void CDirectoryTreeCtrl::AddShare(const CPath &path)
 {
 	wxCHECK_RET(path.IsOk(), "Invalid path in AddShare");
 
@@ -626,48 +578,40 @@
 	m_lstShared.insert(SharedMapItem(GetKey(path), path));
 }
 
-
-void CDirectoryTreeCtrl::DelShare(const CPath& path)
+void CDirectoryTreeCtrl::DelShare(const CPath &path)
 {
 	wxCHECK_RET(path.IsOk(), "Invalid path in DelShare");
 
 	m_lstShared.erase(GetKey(path));
 }
 
-
-bool CDirectoryTreeCtrl::IsRecursiveShare(const CPath& path)
+bool CDirectoryTreeCtrl::IsRecursiveShare(const CPath &path)
 {
 	return m_lstSharedRecursive.find(GetKey(path)) != m_lstSharedRecursive.end();
 }
 
-
-bool CDirectoryTreeCtrl::IsInsideRecursiveShare(const CPath& path)
+bool CDirectoryTreeCtrl::IsInsideRecursiveShare(const CPath &path)
 {
-	// True iff `path` is a strict descendant of any recursive-share
-	// root. Used by AddChildItem to bold subtree items when the tree
-	// is expanded long after the right-click that set the intent.
+	// True iff `path` is a strict descendant of any recursive-share root. Used by AddChildItem
+	// to bold subtree items when the tree is expanded long after the right-click that set the
+	// intent.
 	if (m_lstSharedRecursive.empty() || !path.IsOk()) {
 		return false;
 	}
 	const wxString key = GetKey(path);
-	for (SharedMap::const_iterator it = m_lstSharedRecursive.begin();
-		it != m_lstSharedRecursive.end(); ++it)
-	{
+	for (SharedMap::const_iterator it = m_lstSharedRecursive.begin(); it != m_lstSharedRecursive.end();
+		++it) {
 		const wxString rootKey = it->first;
-		if (key.length() > rootKey.length()
-			&& key.StartsWith(rootKey)
-			&& (rootKey.empty()
-				|| rootKey.Last() == wxFileName::GetPathSeparator()
-				|| keyrootKey.length() == wxFileName::GetPathSeparator()))
-		{
+		if (key.length() > rootKey.length() && key.StartsWith(rootKey) &&
+			(rootKey.empty() || rootKey.Last() == wxFileName::GetPathSeparator() ||
+				keyrootKey.length() == wxFileName::GetPathSeparator())) {
 			return true;
 		}
 	}
 	return false;
 }
 
-
-void CDirectoryTreeCtrl::AddRecursiveShare(const CPath& path)
+void CDirectoryTreeCtrl::AddRecursiveShare(const CPath &path)
 {
 	wxCHECK_RET(path.IsOk(), "Invalid path in AddRecursiveShare");
 
@@ -675,25 +619,21 @@
 	m_lstSharedRecursive.insert(SharedMapItem(key, path));
 }
 
-
-void CDirectoryTreeCtrl::DelRecursiveShare(const CPath& path)
+void CDirectoryTreeCtrl::DelRecursiveShare(const CPath &path)
 {
 	wxCHECK_RET(path.IsOk(), "Invalid path in DelRecursiveShare");
 
 	m_lstSharedRecursive.erase(GetKey(path));
 }
 
-
-void CDirectoryTreeCtrl::DelSharesUnder(const CPath& root)
+void CDirectoryTreeCtrl::DelSharesUnder(const CPath &root)
 {
 	if (!root.IsOk() || m_lstShared.empty()) {
 		return;
 	}
 
-	// Compare on the normalized form, with a trailing separator so
-	// /home doesn't also match /home2. If the root happens to end in
-	// a separator already (e.g. the Windows drive root "C:\"), we
-	// use it as-is.
+	// Compare on the normalized form, with a trailing separator so /home does not also match
+	// /home2. A root that already ends in one (the Windows drive root "C:\") is used as-is.
 	wxString prefix = GetKey(root);
 	if (prefix.empty()) {
 		return;
@@ -702,9 +642,7 @@
 		prefix += wxFileName::GetPathSeparator();
 	}
 
-	for (SharedMap::iterator it = m_lstShared.begin();
-		it != m_lstShared.end(); )
-	{
+	for (SharedMap::iterator it = m_lstShared.begin(); it != m_lstShared.end();) {
 		if (it->first.StartsWith(prefix)) {
 			it = m_lstShared.erase(it);
 		} else {
@@ -713,7 +651,6 @@
 	}
 }
 
-
 void CDirectoryTreeCtrl::UpdateParentItems(wxTreeItemId hChild, bool add)
 {
 	wxTreeItemId parent = hChild;
@@ -736,7 +673,7 @@
 					// no, further parents have to be checked too
 					SetHasSharedSubdirectory(parent, false);
 				}
-			} else {  // should not happen (unmark child of which the parent is already unmarked
+			} else { // should not happen (unmark child of which the parent is already unmarked
 				break;
 			}
 		}

amule-3.0.1.tar.gz/src/DirectoryTreeCtrl.h -> amule-3.1.0.tar.gz/src/DirectoryTreeCtrl.h Changed

@@ -29,53 +29,60 @@
 #include <wx/treectrl.h>
 #include <vector>
 #include <map>
+#include <set> // painted-roots snapshot (stale-view detection)
 
 #include <common/Path.h>
 
-
 class CDirectoryTreeCtrl : public wxTreeCtrl
 {
 public:
 	typedef std::vector<CPath> PathList;
 
-	CDirectoryTreeCtrl(wxWindow* parent, int id, const wxPoint& pos, wxSize siz, int flags);
+	CDirectoryTreeCtrl(wxWindow *parent, int id, const wxPoint &pos, wxSize siz, int flags);
 	virtual ~CDirectoryTreeCtrl();
 
-	// get all explicitly-shared directories (single right-click is now
-	// "recursive", double-click is "this dir only"). Returns only the
-	// directories the user has individually marked.
-	void GetSharedDirectories(PathList* list);
+	// Get all explicitly shared directories. Single right-click is "recursive", double-click is
+	// "this dir only"; this returns only the directories the user marked individually.
+	void GetSharedDirectories(PathList *list);
 	// set list of explicitly-shared directories
-	void SetSharedDirectories(PathList* list);
+	void SetSharedDirectories(PathList *list);
 
-	// Recursive-share intents: roots the user wants to share together
-	// with every descendant. The actual descendant enumeration is now
-	// deferred to the PrefsUnifiedDlg apply path (formerly happened
-	// synchronously inside OnRButtonDown and froze the UI on large
-	// trees like /home).
-	void GetRecursiveSharedDirectories(PathList* list);
-	void SetRecursiveSharedDirectories(PathList* list);
+	// Recursive-share intents: roots the user wants to share along with every descendant. The
+	// descendant enumeration is deferred to the PrefsUnifiedDlg apply path, having once run
+	// synchronously inside OnRButtonDown and frozen the UI on large trees.
+	void GetRecursiveSharedDirectories(PathList *list);
+	void SetRecursiveSharedDirectories(PathList *list);
 
 	// User made any changes to list?
 	bool HasChanged;
 
-	// initialize control
+	//! Re-create an already built tree from the current shared roots. Needed when those change
+	//! underneath us: UpdateSharedDirectories only re-marks the root's immediate children, so
+	//! anything already expanded would keep the marks it was built with. Rebuilds straight away
+	//! rather than deferring to the next Init(), because the dialog can reopen directly on the
+	//! Directories page where no page-change event fires. A tree that was never built is left
+	//! alone.
+	void Rebuild();
+
+	//! True when the tree was painted from roots other than these, i.e. the view is stale and
+	//! needs rebuilding. The shared marks below the root's immediate children are applied when
+	//! a node is created, so refreshing the backing maps alone leaves already-expanded nodes
+	//! showing old state.
+	bool NeedsRepaintFor(const PathList &explicitDirs, const PathList &recursiveDirs) const;
+
 	void Init();
 
 private:
-	// add a new item
-	void AddChildItem(wxTreeItemId hBranch, const CPath& item);
-	// add subdirectory items
-	void AddSubdirectories(wxTreeItemId hBranch, const CPath& path);
+	void AddChildItem(wxTreeItemId hBranch, const CPath &item);
+	void AddSubdirectories(wxTreeItemId hBranch, const CPath &path);
 	// returns true if folder has at least one subdirectory
-	bool HasSubdirectories(const CPath& path);
+	bool HasSubdirectories(const CPath &path);
 	// 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, bool recursed);
 	// returns true if a subdirectory of strDir is shared
-	bool HasSharedSubdirectory(const CPath& path);
-	// set shared directories according to list
+	bool HasSharedSubdirectory(const CPath &path);
 	void UpdateSharedDirectories();
 	// when sharing a directory, make all parent directories red
 	void UpdateParentItems(wxTreeItemId hChild, bool add);
@@ -83,38 +90,39 @@
 	void SetHasSharedSubdirectory(wxTreeItemId hItem, bool add);
 
 	// share list access
-	bool IsShared(const CPath& path);
-	void AddShare(const CPath& path);
-	void DelShare(const CPath& path);
+	bool IsShared(const CPath &path);
+	void AddShare(const CPath &path);
+	void DelShare(const CPath &path);
 	void MarkChildren(wxTreeItemId hChild, bool mark, bool recursed);
 
 	// Recursive-share intent helpers. These aren't `const` because
 	// GetKey() may resolve cwd for relative paths via wxGetCwd().
-	bool IsRecursiveShare(const CPath& path);
-	bool IsInsideRecursiveShare(const CPath& path);
-	void AddRecursiveShare(const CPath& path);
-	void DelRecursiveShare(const CPath& path);
-	// Sweep all m_lstShared entries that are descendants of `root`.
-	// Used by OnRButtonDown's unshare path so that a recursive share
-	// whose flat descendants survived from a previous Prefs session
-	// (loaded from shareddir.dat) is fully removed by right-clicking
-	// the root again — without forcing the tree to expand every
-	// subdir in the UI just to find them.
-	void DelSharesUnder(const CPath& root);
-
-	void OnItemExpanding(wxTreeEvent& evt);
-	void OnRButtonDown(wxTreeEvent& evt);
-	void OnItemActivated(wxTreeEvent& evt);
+	bool IsRecursiveShare(const CPath &path);
+	bool IsInsideRecursiveShare(const CPath &path);
+	void AddRecursiveShare(const CPath &path);
+	void DelRecursiveShare(const CPath &path);
+	// Sweep all m_lstShared entries that are descendants of `root`. Used by OnRButtonDown's
+	// unshare path, so a recursive share whose flat descendants survived a previous Prefs
+	// session is fully removed by right-clicking the root again, without expanding every subdir
+	// to find them.
+	void DelSharesUnder(const CPath &root);
+
+	void OnItemExpanding(wxTreeEvent &evt);
+	void OnRButtonDown(wxTreeEvent &evt);
+	void OnItemActivated(wxTreeEvent &evt);
 
 	typedef std::pair<wxString, CPath> SharedMapItem;
 	typedef std::map<wxString, CPath> SharedMap;
 	SharedMap m_lstShared;
-	// Recursive-share roots. Keys are normalized paths just like
-	// m_lstShared so prefix-matching (IsInsideRecursiveShare) is
-	// consistent across the two maps.
+	// Recursive-share roots. Keys are normalized paths just like m_lstShared, so prefix-
+	// matching (IsInsideRecursiveShare) is consistent across the two maps.
 	SharedMap m_lstSharedRecursive;
+
+	//! Roots the currently-painted tree was built from, so a later open can
+	//! tell whether the view still reflects them.
+	std::set<wxString> m_paintedRoots;
 	// get map key from path (normalized path)
-	wxString GetKey(const CPath& path);
+	wxString GetKey(const CPath &path);
 
 	bool m_IsInit;
 	// Are we running the remote GUI, and from a remote location?
@@ -122,19 +130,13 @@
 
 	wxTreeItemId m_root;
 
-	// Font used to render recursive-share roots. Bold-italic, so the
-	// user can distinguish "this is the recursive root" from "this
-	// is a plain explicit share" or "this is a descendant covered by
-	// a recursive expansion" -- all three would otherwise look
-	// identical (plain bold). Constructed lazily on first paint via
-	// MakeRecursiveFont because the tree control's default font
-	// isn't fully resolved until after the ctor runs (on macOS
-	// especially, GetFont() inside the ctor returns a default-system
-	// font that's later overridden by the layout pass).
+	// Font for recursive-share roots. Bold-italic, so "this is the recursive root" is
+	// distinguishable from a plain explicit share and from a descendant covered by a recursive
+	// expansion -- all three would otherwise look identical. Constructed lazily on first paint,
+	// because the tree control's default font is not fully resolved until after the ctor runs.
 	wxFont GetRecursiveFont();
-	// Toggle the italic-bold marker on a single tree item. Called
-	// from AddChildItem on initial render and from the right-click
-	// toggle paths so the visual stays in sync with
+	// Toggle the italic-bold marker on a single tree item. Called from AddChildItem on initial
+	// render and from the right-click toggle paths, so the visual stays in sync with
 	// m_lstSharedRecursive on every transition.
 	void ApplyRecursiveMark(wxTreeItemId hItem, bool isRecursive);
 	wxFont m_fontRecursiveRoot;

amule-3.0.1.tar.gz/src/DownloadBandwidthThrottler.cpp -> amule-3.1.0.tar.gz/src/DownloadBandwidthThrottler.cpp Changed

@@ -11,22 +11,21 @@
 
 #include "DownloadBandwidthThrottler.h"
 
-#include <climits>
+#include "EMSocket.h" // Needed for CEMSocket::WakeIfPaused
 
+#include <climits>
 
-CDownloadBandwidthThrottler& CDownloadBandwidthThrottler::Get()
+CDownloadBandwidthThrottler &CDownloadBandwidthThrottler::Get()
 {
 	static CDownloadBandwidthThrottler s_instance;
 	return s_instance;
 }
 
-
 void CDownloadBandwidthThrottler::RefillBudget(uint32 maxDownloadKBps, uint32 tickPeriodMs)
 {
 	if (maxDownloadKBps == 0) {
-		// MaxDownload=0 means literal unlimited. Saturate the bucket so
-		// even if a Reserve() raced past the m_unlimited check it would
-		// still return the full request.
+		// MaxDownload=0 means literally unlimited. Saturate the bucket so even a Reserve()
+		// that raced past the m_unlimited check still returns the full request.
 		m_unlimited.store(true, std::memory_order_release);
 		m_bytesAvailable.store(INT64_MAX, std::memory_order_release);
 		return;
@@ -34,19 +33,16 @@
 
 	// uint64 intermediate so a MaxDownload up to the UI cap (1 000 000 KB/s)
 	// doesn't overflow uint32: 1 000 000 * 1024 * 300 = 3 * 10^11 > 2^32.
-	const int64_t budget =
-		(int64_t)maxDownloadKBps * 1024 * tickPeriodMs / 1000;
+	const int64_t budget = (int64_t)maxDownloadKBps * 1024 * tickPeriodMs / 1000;
 
 	m_unlimited.store(false, std::memory_order_release);
-	// Add this tick's budget to whatever leftover was unconsumed last
-	// tick, but cap the bucket at 2x budget so a long quiet period
-	// can't bank capacity that bursts well past the average cap.
-	// Strict overwrite (no carry-over) starves TCP: the receiver pauses
-	// reads when the bucket empties mid-tick, the seeder's TCP flow
-	// control reads that as "consumer overloaded" and slows down, and
-	// by the time the bucket refills the seeder isn't sending fast
-	// enough to consume the new budget. A small carry-over keeps
-	// reads flowing across tick boundaries.
+	// Add this tick's budget to whatever was left unconsumed last tick, but cap the bucket at
+	// 2x budget so a long quiet period cannot bank capacity that bursts well past the average
+	// cap. A strict overwrite with no carry-over starves TCP: the receiver pauses reads when
+	// the bucket empties mid-tick, the seeder's TCP flow control reads that as "consumer
+	// overloaded" and slows down, and by the time the bucket refills the seeder is not sending
+	// fast enough to consume the new budget. A small carry-over keeps reads flowing across tick
+	// boundaries.
 	int64_t current = m_bytesAvailable.load(std::memory_order_acquire);
 	if (current < 0) {
 		current = 0;
@@ -59,7 +55,6 @@
 	m_bytesAvailable.store(newBudget, std::memory_order_release);
 }
 
-
 uint32 CDownloadBandwidthThrottler::Reserve(uint32 wantBytes)
 {
 	if (m_unlimited.load(std::memory_order_acquire)) {
@@ -68,14 +63,11 @@
 
 	int64_t current = m_bytesAvailable.load(std::memory_order_acquire);
 	while (current > 0) {
-		const uint32 granted = (current < (int64_t)wantBytes)
-			? (uint32)current
-			: wantBytes;
-		if (m_bytesAvailable.compare_exchange_weak(
-				current,
-				current - granted,
-				std::memory_order_acq_rel,
-				std::memory_order_acquire)) {
+		const uint32 granted = (current < (int64_t)wantBytes) ? (uint32)current : wantBytes;
+		if (m_bytesAvailable.compare_exchange_weak(current,
+			    current - granted,
+			    std::memory_order_acq_rel,
+			    std::memory_order_acquire)) {
 			return granted;
 		}
 		// CAS failed; `current` was reloaded with the latest value.
@@ -83,6 +75,47 @@
 	return 0;
 }
 
+void CDownloadBandwidthThrottler::PauseUntilRefill(CEMSocket *socket)
+{
+	std::lock_guard<std::mutex> lock(m_pausedLock);
+	m_paused.insert(socket);
+}
+
+void CDownloadBandwidthThrottler::Forget(CEMSocket *socket)
+{
+	std::lock_guard<std::mutex> lock(m_pausedLock);
+	m_paused.erase(socket);
+	// Also while a wake pass is walking it, which is how a socket destroyed
+	// as a side effect of waking another never gets handed out.
+	m_waking.erase(socket);
+}
+
+void CDownloadBandwidthThrottler::WakePaused()
+{
+	{
+		std::lock_guard<std::mutex> lock(m_pausedLock);
+		// Move rather than copy: anything that suspends again during this pass accumulates
+		// in m_paused for the next tick instead of being retried now against a bucket it
+		// has just emptied.
+		m_waking.swap(m_paused);
+	}
+
+	// One at a time, each taken under the lock and woken outside it, because
+	// waking runs the whole receive path and can destroy other sockets.
+	for (;;) {
+		CEMSocket *socket = nullptr;
+		{
+			std::lock_guard<std::mutex> lock(m_pausedLock);
+			if (m_waking.empty()) {
+				return;
+			}
+			const std::set<CEMSocket *>::iterator it = m_waking.begin();
+			socket = *it;
+			m_waking.erase(it);
+		}
+		socket->WakeIfPaused();
+	}
+}
 
 void CDownloadBandwidthThrottler::Refund(uint32 bytes)
 {

amule-3.0.1.tar.gz/src/DownloadBandwidthThrottler.h -> amule-3.1.0.tar.gz/src/DownloadBandwidthThrottler.h Changed

@@ -15,55 +15,80 @@
 #include "Types.h"
 #include <atomic>
 #include <cstdint>
+#include <mutex>
+#include <set>
 
+class CEMSocket;
 
-// Global token bucket that enforces thePrefs::GetMaxDownload() as a literal
-// byte/sec cap across all downloading sockets.
+// Global token bucket that enforces thePrefs::GetMaxDownload() as a literal byte/sec cap across all
+// downloading sockets.
 //
-// Mirrors UploadBandwidthThrottler in role, but intentionally simpler:
-// download is a PULL model where the kernel tells us when bytes are ready
-// (asio OnReceive fires from the I/O thread), so there's no need for a
-// dedicated throttler thread + condvar like the upload side. A shared
-// atomic budget that every CEMSocket consults before each Read() is
+// Mirrors UploadBandwidthThrottler in role, but intentionally simpler: download is a PULL model
+// where the kernel tells us when bytes are ready, so there is no need for a dedicated throttler
+// thread and condvar -- a shared atomic budget every CEMSocket consults before each Read() is
 // enough.
 //
-// Replaces the old per-peer ratio controller (DownloadQueue::Process +
-// CUpDownClient::SetDownloadLimit), which never enforced MaxDownload as a
-// literal cap and instead nudged each peer's transfer rate by ~5%/tick
-// against its own current speed. With a single global bucket, fast peers
-// can claim unused capacity from slow peers within the same tick
-// (demand-aware redistribution); the only constraint is the global cap.
+// Replaces the old per-peer ratio controller, which never enforced MaxDownload as a literal cap and
+// instead nudged each peer's rate by ~5%/tick against its own current speed. With a single global
+// bucket, fast peers can claim unused capacity from slow ones within the same tick.
 class CDownloadBandwidthThrottler
 {
 public:
-	static CDownloadBandwidthThrottler& Get();
+	static CDownloadBandwidthThrottler &Get();
 
-	// Refill the bucket at the start of each DownloadQueue tick.
-	//   maxDownloadKBps == 0  -> unlimited mode (Reserve returns the full
-	//                            request, no decrement).
-	// Leftover from the previous tick is discarded: the cap is strict, not
-	// burst-friendly. A burst-friendly accumulating bucket would let a
-	// quiet period bank capacity and overshoot MaxDownload after data
-	// resumes -- that's exactly the surprise the PR is trying to remove.
+	// Refill the bucket at the start of each DownloadQueue tick; maxDownloadKBps == 0 is
+	// unlimited mode, where Reserve returns the full request. Leftover from the previous tick
+	// is discarded: the cap is strict, not burst-friendly, since an accumulating bucket would
+	// let a quiet period bank capacity and overshoot MaxDownload once data resumes.
 	void RefillBudget(uint32 maxDownloadKBps, uint32 tickPeriodMs);
 
-	// Reserve up to wantBytes from the shared budget. Returns the actual
-	// number of bytes the caller may read this round (in 0, wantBytes).
-	// Returning 0 means the bucket is exhausted; the caller should
-	// suspend reads (set pendingOnReceive on the socket) and wait for the
-	// next refill to wake it.
+	// Reserve up to wantBytes from the shared budget, returning how many bytes the caller may
+	// read this round, in 0, wantBytes. Returning 0 means the bucket is exhausted; the caller
+	// should suspend reads (set pendingOnReceive on the socket) and wait for the next refill to
+	// wake it.
 	uint32 Reserve(uint32 wantBytes);
 
-	// Refund unused bytes to the shared budget. Used when Reserve granted
-	// more than Read() actually returned (TCP partial reads, EOF, etc.) so
-	// the unused capacity stays available to other peers in the same tick.
+	// Refund unused bytes to the shared budget. Used when Reserve granted more than Read()
+	// actually returned (TCP partial reads, EOF) so the unused capacity stays available to
+	// other peers in the same tick.
 	void Refund(uint32 bytes);
 
+	// A socket that suspended its read because Reserve() came back empty, and the counterpart
+	// for one that goes away while suspended.
+	//
+	// The throttler is what stopped these reads, so it is what has to restart them. Leaving
+	// that to whoever happens to tick the socket means a socket nobody ticks -- one we are
+	// browsing rather than downloading from -- never reads again: its half-received packet
+	// never completes, and the peer looks like it answered nothing.
+	//
+	// Registration is on an empty bucket rather than on what the socket is doing, so under a
+	// saturated cap this also collects sockets a part file will wake anyway. Those get a
+	// second, cheap wake per tick.
+	void PauseUntilRefill(CEMSocket *socket);
+	void Forget(CEMSocket *socket);
+
+	// Restart the reads suspended before this call. Run once per tick after RefillBudget(), and
+	// OUTSIDE any lock the read path can reach: waking re-enters CEMSocket::OnReceive(), which
+	// parses packets and can run most of the core.
+	//
+	// Only the sockets already waiting when it starts are woken. One that exhausts the refilled
+	// bucket suspends again immediately, and waking it twice in the same pass would only spin
+	// the main loop until the next refill -- which cannot arrive while that loop is blocked.
+	void WakePaused();
+
 private:
 	CDownloadBandwidthThrottler() = default;
 
 	std::atomic<int64_t> m_bytesAvailable{ 0 };
-	std::atomic<bool>    m_unlimited{ true };
+	std::atomic<bool> m_unlimited{ true };
+
+	std::mutex m_pausedLock;
+	// Suspended, waiting for the next refill.
+	std::set<CEMSocket *> m_paused;
+	// Being woken by the pass currently running. Held separately so a socket that suspends
+	// again lands in m_paused and waits for the next tick, while one that is destroyed mid-pass
+	// is dropped from here by Forget() and never handed out.
+	std::set<CEMSocket *> m_waking;
 };
 
 #endif // DOWNLOADBANDWIDTHTHROTTLER_H

amule-3.0.1.tar.gz/src/DownloadClient.cpp -> amule-3.1.0.tar.gz/src/DownloadClient.cpp Changed

@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "updownclient.h"		// Needed for CUpDownClient
+#include "updownclient.h" // Needed for CUpDownClient
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
@@ -33,112 +33,96 @@
 #include <common/Constants.h>
 
 #include <zlib.h>
-#include <cmath>		// Needed for std:exp
-
-#include "ClientCredits.h"	// Needed for CClientCredits
-#include "ClientUDPSocket.h"	// Needed for CClientUDPSocket
-#include "DownloadQueue.h"	// Needed for CDownloadQueue
-#include "Preferences.h"	// Needed for thePrefs
-#include "Packet.h"		// Needed for CPacket
-#include "MemFile.h"		// Needed for CMemFile
-#include "ClientTCPSocket.h"// Needed for CClientTCPSocket
-#include "ListenSocket.h"	// Needed for CListenSocket
-#include "amule.h"		// Needed for theApp
-#include "PartFile.h"		// Needed for CPartFile
+#include <cmath> // Needed for std:exp
+
+#include "ClientCredits.h"   // Needed for CClientCredits
+#include "ClientUDPSocket.h" // Needed for CClientUDPSocket
+#include "DownloadQueue.h"   // Needed for CDownloadQueue
+#include "Preferences.h"     // Needed for thePrefs
+#include "Packet.h"          // Needed for CPacket
+#include "MemFile.h"         // Needed for CMemFile
+#include "ClientTCPSocket.h" // Needed for CClientTCPSocket
+#include "ListenSocket.h"    // Needed for CListenSocket
+#include "amule.h"           // Needed for theApp
+#include "PartFile.h"        // Needed for CPartFile
 #include "SharedFileList.h"
-#include "Statistics.h"		// Needed for theStats
+#include "Statistics.h" // Needed for theStats
 #include "Logger.h"
-#include "GuiEvents.h"		// Needed for Notify_*
-#include "UploadQueue.h"	// Needed for CUploadQueue
-
+#include "GuiEvents.h"   // Needed for Notify_*
+#include "UploadQueue.h" // Needed for CUploadQueue
 
 #ifdef __MULE_UNUSED_CODE__
 // This function is left as a reminder.
 // Changes here _must_ be reflected in CClientList::FindMatchingClient.
-bool CUpDownClient::Compare(const CUpDownClient* tocomp, bool bIgnoreUserhash) const
+bool CUpDownClient::Compare(const CUpDownClient *tocomp, bool bIgnoreUserhash) const
 {
 	if (!tocomp) {
-		// should we wxASSERT here?
 		return false;
 	}
 
-	//Compare only the user hash..
-	if(!bIgnoreUserhash && HasValidHash() && tocomp->HasValidHash()) {
-	    return GetUserHash() == tocomp->GetUserHash();
+	// Compare only the user hash..
+	if (!bIgnoreUserhash && HasValidHash() && tocomp->HasValidHash()) {
+		return GetUserHash() == tocomp->GetUserHash();
 	}
 
 	if (HasLowID()) {
-		//User is firewalled.. Must do two checks..
-		if (GetIP()!=0	&& GetIP() == tocomp->GetIP()) {
-			//The IP of both match
-			if (GetUserPort()!=0 && GetUserPort() == tocomp->GetUserPort()) {
-				//IP-UserPort matches
+		// User is firewalled.. Must do two checks..
+		if (GetIP() != 0 && GetIP() == tocomp->GetIP()) {
+			if (GetUserPort() != 0 && GetUserPort() == tocomp->GetUserPort()) {
 				return true;
 			}
-			if (GetKadPort()!=0	&& GetKadPort() == tocomp->GetKadPort()) {
-				//IP-KadPort Matches
+			if (GetKadPort() != 0 && GetKadPort() == tocomp->GetKadPort()) {
 				return true;
 			}
 		}
 
-		if (GetUserIDHybrid()!=0
-						&& GetUserIDHybrid() == tocomp->GetUserIDHybrid()
-						&& GetServerIP()!=0
-						&& GetServerIP() == tocomp->GetServerIP()
-						&& GetServerPort()!=0
-						&& GetServerPort() == tocomp->GetServerPort()) {
-			//Both have the same lowID, Same serverIP and Port..
+		if (GetUserIDHybrid() != 0 && GetUserIDHybrid() == tocomp->GetUserIDHybrid() &&
+			GetServerIP() != 0 && GetServerIP() == tocomp->GetServerIP() &&
+			GetServerPort() != 0 && GetServerPort() == tocomp->GetServerPort()) {
 			return true;
 		}
 
-		//Both IP, and Server do not match..
 		return false;
-    }
+	}
 
-	//User is not firewalled.
-	if (GetUserPort()!=0) {
-		//User has a Port, lets check the rest.
+	// User is not firewalled.
+	if (GetUserPort() != 0) {
 		if (GetIP() != 0 && tocomp->GetIP() != 0) {
-			//Both clients have a verified IP..
-			if(GetIP() == tocomp->GetIP() && GetUserPort() == tocomp->GetUserPort()) {
-				//IP and UserPort match..
+			// Both clients have a verified IP..
+			if (GetIP() == tocomp->GetIP() && GetUserPort() == tocomp->GetUserPort()) {
 				return true;
 			}
 		} else {
-			//One of the two clients do not have a verified IP
-			if (GetUserIDHybrid() == tocomp->GetUserIDHybrid() && GetUserPort() == tocomp->GetUserPort()) {
-				//ID and Port Match..
+			// One of the two clients do not have a verified IP
+			if (GetUserIDHybrid() == tocomp->GetUserIDHybrid() &&
+				GetUserPort() == tocomp->GetUserPort()) {
 				return true;
 			}
 		}
-    }
+	}
 
-	if(GetKadPort()!=0) {
-		//User has a Kad Port.
-		if(GetIP() != 0 && tocomp->GetIP() != 0) {
-			//Both clients have a verified IP.
-			if(GetIP() == tocomp->GetIP() && GetKadPort() == tocomp->GetKadPort()) {
-				//IP and KadPort Match..
+	if (GetKadPort() != 0) {
+		// User has a Kad Port.
+		if (GetIP() != 0 && tocomp->GetIP() != 0) {
+			// Both clients have a verified IP.
+			if (GetIP() == tocomp->GetIP() && GetKadPort() == tocomp->GetKadPort()) {
 				return true;
 			}
 		} else {
-			//One of the users do not have a verified IP.
-			if (GetUserIDHybrid() == tocomp->GetUserIDHybrid() && GetKadPort() == tocomp->GetKadPort()) {
-				//ID and KadProt Match..
+			// One of the users do not have a verified IP.
+			if (GetUserIDHybrid() == tocomp->GetUserIDHybrid() &&
+				GetKadPort() == tocomp->GetKadPort()) {
 				return true;
 			}
 		}
 	}
 
-	//No Matches..
 	return false;
 }
 #endif
 
-
 bool CUpDownClient::AskForDownload()
 {
-	// 0.42e
 	if (theApp->listensocket->TooManySockets()) {
 		if (!m_socket) {
 			if (GetDownloadState() != DS_TOOMANYCONNS) {
@@ -159,30 +143,25 @@
 	return TryToConnect();
 }
 
-
 void CUpDownClient::SendStartupLoadReq()
 {
-	// 0.42e
-	if (m_socket==NULL || m_reqfile==NULL) {
+	if (m_socket == NULL || m_reqfile == NULL) {
 		return;
 	}
 	SetDownloadState(DS_ONQUEUE);
 	CMemFile dataStartupLoadReq(16);
 	dataStartupLoadReq.WriteHash(m_reqfile->GetFileHash());
-	CPacket* packet = new CPacket(dataStartupLoadReq, OP_EDONKEYPROT, OP_STARTUPLOADREQ);
+	CPacket *packet = new CPacket(dataStartupLoadReq, OP_EDONKEYPROT, OP_STARTUPLOADREQ);
 	theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
 	AddDebugLogLineN(logLocalClient, "Local Client: OP_STARTUPLOADREQ to " + GetFullIP());
 	SendPacket(packet, true, true);
 }
 
-
 bool CUpDownClient::IsSourceRequestAllowed()
 {
-	//#warning REWRITE - Source swapping from eMule.
-	// 0.42e
 	uint64 dwTickCount = ::GetTickCount64() + CONNECTION_LATENCY;
 	uint64 nTimePassedClient = dwTickCount - GetLastSrcAnswerTime();
-	uint64 nTimePassedFile   = dwTickCount - m_reqfile->GetLastAnsweredTime();
+	uint64 nTimePassedFile = dwTickCount - m_reqfile->GetLastAnsweredTime();
 	bool bNeverAskedBefore = (GetLastAskedForSources() == 0);
 
 	uint32 uSources = m_reqfile->GetSourceCount();
@@ -191,37 +170,32 @@
 		ExtProtocolAvailable() && (SupportsSourceExchange2() || GetSourceExchange1Version() > 1) &&
 		// AND if we need more sources
 		thePrefs::GetMaxSourcePerFileSoft() > uSources &&
-		// AND if...
 		(
-		//source is not complete and file is very rare
-			( !m_bCompleteSource
-			&& (bNeverAskedBefore || nTimePassedClient > SOURCECLIENTREASKS)
-			&& (uSources <= RARE_FILE/5)
-			) ||
-			//source is not complete and file is rare
-			( !m_bCompleteSource
-			&& (bNeverAskedBefore || nTimePassedClient > SOURCECLIENTREASKS)
-			&& (uSources <= RARE_FILE || uSources - m_reqfile->GetValidSourcesCount() <= RARE_FILE / 2)
-			&& (nTimePassedFile > SOURCECLIENTREASKF)
-			) ||
+			// source is not complete and file is very rare
+			(!m_bCompleteSource &&
+				(bNeverAskedBefore || nTimePassedClient > SOURCECLIENTREASKS) &&
+				(uSources <= RARE_FILE / 5)) ||
+			// source is not complete and file is rare
+			(!m_bCompleteSource &&
+				(bNeverAskedBefore || nTimePassedClient > SOURCECLIENTREASKS) &&
+				(uSources <= RARE_FILE ||
+					uSources - m_reqfile->GetValidSourcesCount() <= RARE_FILE / 2) &&
+				(nTimePassedFile > SOURCECLIENTREASKF)) ||
 			// OR if file is not rare
-			( (bNeverAskedBefore || nTimePassedClient > (unsigned)(SOURCECLIENTREASKS * MINCOMMONPENALTY))
-			&& (nTimePassedFile > (unsigned)(SOURCECLIENTREASKF * MINCOMMONPENALTY))
-			)
-		)
-	);
+			((bNeverAskedBefore ||
+				 nTimePassedClient > (unsigned)(SOURCECLIENTREASKS * MINCOMMONPENALTY)) &&
+				(nTimePassedFile > (unsigned)(SOURCECLIENTREASKF * MINCOMMONPENALTY)))));
 }
 
-
 void CUpDownClient::SendFileRequest()
 {
 	wxCHECK_RET(m_reqfile, "Cannot request file when no reqfile is set");
 
-	CMemFile dataFileReq(16+16);
+	CMemFile dataFileReq(16 + 16);
 	dataFileReq.WriteHash(m_reqfile->GetFileHash());
 
 	if (SupportMultiPacket()) {
-		DEBUG_ONLY( wxString sent_opcodes; )
+		DEBUG_ONLY(wxString sent_opcodes;)
 
 		if (SupportExtMultiPacket()) {
 			dataFileReq.WriteUInt64(m_reqfile->GetFileSize());
@@ -230,8 +204,7 @@
 		AddDebugLogLineN(logClient, "Sending file request to client");
 
 		dataFileReq.WriteUInt8(OP_REQUESTFILENAME);
-		DEBUG_ONLY( sent_opcodes += "|RFNM|"; )
-		// Extended information
+		DEBUG_ONLY(sent_opcodes += "|RFNM|";)
 		if (GetExtendedRequestsVersion() > 0) {
 			m_reqfile->WritePartStatus(&dataFileReq);
 		}
@@ -239,53 +212,52 @@
 			m_reqfile->WriteCompleteSourcesCount(&dataFileReq);
 		}
 		if (m_reqfile->GetPartCount() > 1) {
-			DEBUG_ONLY( sent_opcodes += "|RFID|"; )
+			DEBUG_ONLY(sent_opcodes += "|RFID|";)
 			dataFileReq.WriteUInt8(OP_SETREQFILEID);
 		}
 		if (IsEmuleClient()) {
-			SetRemoteQueueFull( true );
+			SetRemoteQueueFull(true);
 			SetRemoteQueueRank(0);
 		}
 		if (IsSourceRequestAllowed()) {
-			if (SupportsSourceExchange2()){
-				DEBUG_ONLY( sent_opcodes += "|RSRC2|"; )
+			if (SupportsSourceExchange2()) {
+				DEBUG_ONLY(sent_opcodes += "|RSRC2|";)
 				dataFileReq.WriteUInt8(OP_REQUESTSOURCES2);
 				dataFileReq.WriteUInt8(SOURCEEXCHANGE2_VERSION);
 				const uint16 nOptions = 0; // 16 ... Reserved
 				dataFileReq.WriteUInt16(nOptions);
 			} else {
-				DEBUG_ONLY( sent_opcodes += "|RSRC|"; )
+				DEBUG_ONLY(sent_opcodes += "|RSRC|";)
 				dataFileReq.WriteUInt8(OP_REQUESTSOURCES);
 			}
 			m_reqfile->SetLastAnsweredTimeTimeout();
 			SetLastAskedForSources();
 		}
 		if (IsSupportingAICH()) {
-			DEBUG_ONLY( sent_opcodes += "|AFHR|"; )
+			DEBUG_ONLY(sent_opcodes += "|AFHR|";)
 			dataFileReq.WriteUInt8(OP_AICHFILEHASHREQ);
 		}
-		CPacket* packet = new CPacket(dataFileReq, OP_EMULEPROT, (SupportExtMultiPacket() ? OP_MULTIPACKET_EXT : OP_MULTIPACKET));
+		CPacket *packet = new CPacket(dataFileReq,
+			OP_EMULEPROT,
+			(SupportExtMultiPacket() ? OP_MULTIPACKET_EXT : OP_MULTIPACKET));
 		theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-		AddDebugLogLineN(logLocalClient, CFormat("Local Client: %s (%s) to %s")
-			% (SupportExtMultiPacket() ? "OP_MULTIPACKET_EXT" : "OP_MULTIPACKET") % sent_opcodes % GetFullIP());
+		AddDebugLogLineN(logLocalClient,
+			CFormat("Local Client: %s (%s) to %s") %
+				(SupportExtMultiPacket() ? "OP_MULTIPACKET_EXT" : "OP_MULTIPACKET") %
+				sent_opcodes % GetFullIP());
 		SendPacket(packet, true);
 	} else {
-		//This is extended information
-		if (GetExtendedRequestsVersion() > 0 ) {
+		if (GetExtendedRequestsVersion() > 0) {
 			m_reqfile->WritePartStatus(&dataFileReq);
 		}
-		if (GetExtendedRequestsVersion() > 1 ) {
+		if (GetExtendedRequestsVersion() > 1) {
 			m_reqfile->WriteCompleteSourcesCount(&dataFileReq);
 		}
-		CPacket* packet = new CPacket(dataFileReq, OP_EDONKEYPROT, OP_REQUESTFILENAME);
+		CPacket *packet = new CPacket(dataFileReq, OP_EDONKEYPROT, OP_REQUESTFILENAME);
 		theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-		AddDebugLogLineN( logLocalClient, "Local Client: OP_REQUESTFILENAME to " + GetFullIP() );
+		AddDebugLogLineN(logLocalClient, "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).
-		// if the remote client answers the OP_REQUESTFILENAME with OP_REQFILENAMEANSWER the file is shared by the remote client. if we
-		// know that the file is shared, we know also that the file is complete and don't need to request the file status.
-
 		// Sending the packet could have deleted the client, check m_reqfile
 		if (m_reqfile && (m_reqfile->GetPartCount() > 1)) {
 			CMemFile dataSetReqFileID(16);
@@ -297,7 +269,7 @@
 		}
 
 		if (IsEmuleClient()) {
-			SetRemoteQueueFull( true );
+			SetRemoteQueueFull(true);
 			SetRemoteQueueRank(0);
 		}
 
@@ -314,33 +286,34 @@
 
 			packetdata.WriteHash(m_reqfile->GetFileHash());
 
-			packet = new CPacket(packetdata, OP_EMULEPROT, SupportsSourceExchange2() ? OP_REQUESTSOURCES2 : OP_REQUESTSOURCES);
+			packet = new CPacket(packetdata,
+				OP_EMULEPROT,
+				SupportsSourceExchange2() ? OP_REQUESTSOURCES2 : OP_REQUESTSOURCES);
 
 			theStats::AddUpOverheadSourceExchange(packet->GetPacketSize());
-			AddDebugLogLineN( logLocalClient, "Local Client: OP_REQUESTSOURCES to " + GetFullIP() );
-			SendPacket(packet,true,true);
+			AddDebugLogLineN(logLocalClient, "Local Client: OP_REQUESTSOURCES to " + GetFullIP());
+			SendPacket(packet, true, true);
 			SetLastAskedForSources();
 		}
 
 		// Sending the packet could have deleted the client, check m_reqfile
 		if (m_reqfile && IsSupportingAICH()) {
-			packet = new CPacket(OP_AICHFILEHASHREQ,16,OP_EMULEPROT);
+			packet = new CPacket(OP_AICHFILEHASHREQ, 16, OP_EMULEPROT);
 			packet->Copy16ToDataBuffer((const char *)m_reqfile->GetFileHash().GetHash());
 			theStats::AddUpOverheadOther(packet->GetPacketSize());
-			AddDebugLogLineN(logLocalClient, "Local Client: OP_AICHFILEHASHREQ to " + GetFullIP());
-			SendPacket(packet,true,true);
+			AddDebugLogLineN(
+				logLocalClient, "Local Client: OP_AICHFILEHASHREQ to " + GetFullIP());
+			SendPacket(packet, true, true);
 		}
 	}
 }
 
-
-void CUpDownClient::ProcessFileInfo(const CMemFile* data, const CPartFile* file)
+void CUpDownClient::ProcessFileInfo(const CMemFile *data, const CPartFile *file)
 {
-	// 0.42e
-	if (file==NULL) {
+	if (file == NULL) {
 		throw wxString("ERROR: Wrong file ID (ProcessFileInfo; file==NULL)");
 	}
-	if (m_reqfile==NULL) {
+	if (m_reqfile == NULL) {
 		throw wxString("ERROR: Wrong file ID (ProcessFileInfo; m_reqfile==NULL)");
 	}
 	if (file != m_reqfile) {
@@ -349,27 +322,29 @@
 
 	m_clientFilename = data->ReadString((GetUnicodeSupport() != utf8strNone));
 
-	// 26-Jul-2003: removed requesting the file status for files <= PARTSIZE for better compatibility with ed2k protocol (eDonkeyHybrid).
-	// if the remote client answers the OP_REQUESTFILENAME with OP_REQFILENAMEANSWER the file is shared by the remote client. if we
-	// know that the file is shared, we know also that the file is complete and don't need to request the file status.
+	// The file status is not requested for files <= PARTSIZE, for compatibility with
+	// eDonkeyHybrid: an OP_REQFILENAMEANSWER already means the remote client shares the file,
+	// and so has it complete.
 	if (m_reqfile->GetPartCount() == 1) {
 		m_nPartCount = m_reqfile->GetPartCount();
 
-		m_reqfile->UpdatePartsFrequency( this, false );	// Decrement
-		m_downPartStatus.setsize( m_nPartCount, 1 );
-		m_reqfile->UpdatePartsFrequency( this, true );	// Increment
+		m_reqfile->UpdatePartsFrequency(this, false); // Decrement
+		m_downPartStatus.setsize(m_nPartCount, 1);
+		m_reqfile->UpdatePartsFrequency(this, true); // Increment
 
 		m_bCompleteSource = true;
 
 		UpdateDisplayedInfo();
-		// even if the file is <= PARTSIZE, we _may_ need the hashset for that file (if the file size == PARTSIZE)
+		// even if the file is <= PARTSIZE, we _may_ need the hashset for that file (if the file size
+		// == PARTSIZE)
 		if (m_reqfile->IsHashSetNeeded()) {
 			if (m_socket) {
-				CPacket* packet = new CPacket(OP_HASHSETREQUEST,16, OP_EDONKEYPROT);
+				CPacket *packet = new CPacket(OP_HASHSETREQUEST, 16, OP_EDONKEYPROT);
 				packet->Copy16ToDataBuffer((const char *)m_reqfile->GetFileHash().GetHash());
 				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-				AddDebugLogLineN(logLocalClient, "Local Client: OP_HASHSETREQUEST to " + GetFullIP());
-				SendPacket(packet,true,true);
+				AddDebugLogLineN(
+					logLocalClient, "Local Client: OP_HASHSETREQUEST to " + GetFullIP());
+				SendPacket(packet, true, true);
 				SetDownloadState(DS_REQHASHSET);
 				m_fHashsetRequesting = 1;
 				m_reqfile->SetHashSetNeeded(false);
@@ -383,12 +358,11 @@
 	}
 }
 
-void CUpDownClient::ProcessFileStatus(bool bUdpPacket, const CMemFile* data, const CPartFile* file)
+void CUpDownClient::ProcessFileStatus(bool bUdpPacket, const CMemFile *data, const CPartFile *file)
 {
-	// 0.42e
 	wxString strReqFileNull("ERROR: Wrong file ID (ProcessFileStatus; m_reqfile==NULL)");
 
-	if ( !m_reqfile || file != m_reqfile ){
+	if (!m_reqfile || file != m_reqfile) {
 		if (!m_reqfile) {
 			throw strReqFileNull;
 		}
@@ -397,48 +371,43 @@
 
 	uint16 nED2KPartCount = data->ReadUInt16();
 
-	m_reqfile->UpdatePartsFrequency( this, false );	// Decrement
+	m_reqfile->UpdatePartsFrequency(this, false); // Decrement
 	m_downPartStatus.clear();
 
 	bool bPartsNeeded = false;
-	if (!nED2KPartCount)
-	{
+	if (!nED2KPartCount) {
 		m_nPartCount = m_reqfile->GetPartCount();
-		m_downPartStatus.setsize( m_nPartCount, 1);
+		m_downPartStatus.setsize(m_nPartCount, 1);
 		bPartsNeeded = true;
 		m_bCompleteSource = true;
-	}
-	else
-	{
-		// Somehow this happened.
+	} else {
 		if (!m_reqfile) {
 			throw strReqFileNull;
 		}
-		if (m_reqfile->GetED2KPartCount() != nED2KPartCount)
-		{
+		if (m_reqfile->GetED2KPartCount() != nED2KPartCount) {
 			wxString strError;
-			strError << "ProcessFileStatus - wrong part number recv=" << nED2KPartCount <<
-				"  expected=" << m_reqfile->GetED2KPartCount() << " " <<
-				m_reqfile->GetFileHash().Encode();
+			strError << "ProcessFileStatus - wrong part number recv=" << nED2KPartCount
+				 << "  expected=" << m_reqfile->GetED2KPartCount() << " "
+				 << m_reqfile->GetFileHash().Encode();
 			m_nPartCount = 0;
 			throw strError;
 		}
 		m_nPartCount = m_reqfile->GetPartCount();
 
 		m_bCompleteSource = false;
-		m_downPartStatus.setsize( m_nPartCount, 0 );
+		m_downPartStatus.setsize(m_nPartCount, 0);
 		uint16 done = 0;
 
 		try {
 			while (done != m_nPartCount) {
 				uint8 toread = data->ReadUInt8();
 
-				for ( uint8 i = 0;i < 8; i++ ) {
-					bool status = ((toread>>i)&1)? 1:0;
+				for (uint8 i = 0; i < 8; i++) {
+					bool status = ((toread >> i) & 1) ? 1 : 0;
 					m_downPartStatus.set(done, status);
 
 					if (status) {
-						if (!m_reqfile->IsComplete(done)){
+						if (!m_reqfile->IsComplete(done)) {
 							bPartsNeeded = true;
 						}
 					}
@@ -448,15 +417,15 @@
 					}
 				}
 			}
-		} catch( ... ) {
+		} catch (...) {
 			// We want the counts to be updated, even if we fail to read everything
-			m_reqfile->UpdatePartsFrequency( this, true );	// Increment
+			m_reqfile->UpdatePartsFrequency(this, true); // Increment
 
 			throw;
 		}
 	}
 
-	m_reqfile->UpdatePartsFrequency( this, true );	// Increment
+	m_reqfile->UpdatePartsFrequency(this, true); // Increment
 
 	UpdateDisplayedInfo();
 
@@ -465,12 +434,14 @@
 		if (!bPartsNeeded) {
 			SetDownloadState(DS_NONEEDEDPARTS);
 		} else if (m_reqfile->IsHashSetNeeded()) {
-			//If we are using the eMule filerequest packets, this is taken care of in the Multipacket!
+			// If we are using the eMule filerequest packets, this is taken care of in the
+			// Multipacket!
 			if (m_socket) {
-				CPacket* packet = new CPacket(OP_HASHSETREQUEST,16, OP_EDONKEYPROT);
+				CPacket *packet = new CPacket(OP_HASHSETREQUEST, 16, OP_EDONKEYPROT);
 				packet->Copy16ToDataBuffer((const char *)m_reqfile->GetFileHash().GetHash());
 				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-				AddDebugLogLineN(logLocalClient, "Local Client: OP_HASHSETREQUEST to " + GetFullIP());
+				AddDebugLogLineN(
+					logLocalClient, "Local Client: OP_HASHSETREQUEST to " + GetFullIP());
 				SendPacket(packet, true, true);
 				SetDownloadState(DS_REQHASHSET);
 				m_fHashsetRequesting = 1;
@@ -478,12 +449,10 @@
 			} else {
 				wxFAIL;
 			}
-		}
-		else {
+		} else {
 			SendStartupLoadReq();
 		}
-	}
-	else {
+	} else {
 		if (!bPartsNeeded) {
 			SetDownloadState(DS_NONEEDEDPARTS);
 		} else {
@@ -493,22 +462,22 @@
 	m_reqfile->UpdatePartsInfo();
 }
 
-bool CUpDownClient::AddRequestForAnotherFile(CPartFile* file)
+bool CUpDownClient::AddRequestForAnotherFile(CPartFile *file)
 {
-	if ( m_A4AF_list.find( file ) == m_A4AF_list.end() ) {
+	if (m_A4AF_list.find(file) == m_A4AF_list.end()) {
 		// When we access a non-existing entry entry, it will be zeroed by default,
 		// so we have to set NeededParts. All in one go.
 		m_A4AF_listfile.NeededParts = true;
-		file->AddA4AFSource( this );
+		file->AddA4AFSource(this);
 		return true;
 	} else {
 		return false;
 	}
 }
 
-bool CUpDownClient::DeleteFileRequest(CPartFile* file)
+bool CUpDownClient::DeleteFileRequest(CPartFile *file)
 {
-	return (m_A4AF_list.erase( file ) > 0);
+	return (m_A4AF_list.erase(file) > 0);
 }
 
 void CUpDownClient::DeleteAllFileRequests()
@@ -516,14 +485,12 @@
 	m_A4AF_list.clear();
 }
 
-
 /* eMule 0.30c implementation, i give it a try (Creteil) BEGIN ... */
 void CUpDownClient::SetDownloadState(uint8 byNewState)
 {
 	if (m_nDownloadState != byNewState) {
 		if (m_reqfile) {
-			// Notify the client that this source has changed its state
-			m_reqfile->ClientStateChanged( m_nDownloadState, byNewState );
+			m_reqfile->ClientStateChanged(m_nDownloadState, byNewState);
 
 			if (byNewState == DS_DOWNLOADING) {
 				m_reqfile->AddDownloadingSource(this);
@@ -547,18 +514,18 @@
 			msReceivedPrev = 0;
 			if (byNewState == DS_NONE) {
 				if (m_reqfile) {
-					m_reqfile->UpdatePartsFrequency( this, false );	// Decrement
+					m_reqfile->UpdatePartsFrequency(this, false); // Decrement
 				}
 				m_downPartStatus.clear();
 				m_nPartCount = 0;
 			}
-			// (Old code disabled the per-socket download cap here on
-			// transition out of DS_DOWNLOADING. The cap is now a global
-			// budget in CDownloadBandwidthThrottler shared across all
-			// sockets, so there's no per-socket state to clear.)
+			// Old code disabled the per-socket download cap here on the transition out
+			// of DS_DOWNLOADING. The cap is now a global budget in
+			// CDownloadBandwidthThrottler shared across all sockets, so there is no
+			// per-socket state to clear.
 		}
 		m_nDownloadState = byNewState;
-		if(GetDownloadState() == DS_DOWNLOADING) {
+		if (GetDownloadState() == DS_DOWNLOADING) {
 			if (IsEmuleClient()) {
 				SetRemoteQueueFull(false);
 			}
@@ -569,16 +536,16 @@
 }
 /* eMule 0.30c implementation, i give it a try (Creteil) END ... */
 
-void CUpDownClient::ProcessHashSet(const uint8_t* packet, uint32 size)
+void CUpDownClient::ProcessHashSet(const uint8_t *packet, uint32 size)
 {
-	if ((!m_reqfile) || md4cmp(packet,m_reqfile->GetFileHash().GetHash())) {
+	if ((!m_reqfile) || md4cmp(packet, m_reqfile->GetFileHash().GetHash())) {
 		throw wxString("Wrong fileid sent (ProcessHashSet)");
 	}
 	if (!m_fHashsetRequesting) {
 		throw wxString("Received unsolicited hashset, ignoring it.");
 	}
-	CMemFile data(packet,size);
-	if (m_reqfile->LoadHashsetFromFile(&data,true)) {
+	CMemFile data(packet, size);
+	if (m_reqfile->LoadHashsetFromFile(&data, true)) {
 		m_fHashsetRequesting = 0;
 	} else {
 		m_reqfile->SetHashSetNeeded(true);
@@ -589,65 +556,79 @@
 
 void CUpDownClient::SendBlockRequests()
 {
-	uint64 current_time = ::GetTickCount64();
-	if (GetVBTTags()) {
-
-		// Ask new blocks only when all completed
-		if (!m_PendingBlocks_list.empty()) {
-			return;
-		}
-
-		if ((m_dwLastBlockReceived + SEC2MS(5)) > current_time) {
-			// We received last block in less than 5 secs? Let's request faster.
-			m_MaxBlockRequests = m_MaxBlockRequests << 1;
-			if ( m_MaxBlockRequests > 0x20) {
-				m_MaxBlockRequests = 0x20;
-			}
-		} else {
-			m_MaxBlockRequests = m_MaxBlockRequests >> 1;
-			if ( m_MaxBlockRequests < STANDARD_BLOCKS_REQUEST) {
-				m_MaxBlockRequests = STANDARD_BLOCKS_REQUEST;
-			}
-		}
-	}
-
-	m_dwLastBlockReceived = current_time;
+	m_dwLastBlockReceived = ::GetTickCount64();
 
 	if (!m_reqfile) {
 		return;
 	}
 
-	if (m_DownloadBlocks_list.empty()) {
-		// Barry - instead of getting 3, just get how many is needed
-		uint16 count = m_MaxBlockRequests - m_PendingBlocks_list.size();
-		std::vector<Requested_Block_Struct*> toadd;
-		if (m_reqfile->GetNextRequestedBlock(this, toadd, count)) {
-			for (int i = 0; i != count; i++) {
-				m_DownloadBlocks_list.push_back(toaddi);
+	// RTT/BDP-adaptive request-pipeline depth. The number of outstanding block requests needed
+	// to keep a link busy is the bandwidth-delay product, rate * RTT: on a LAN that is a
+	// fraction of a 180 KB block, so we stay shallow and avoid the burst/starve oscillation a
+	// deep pipeline provokes against a fast local peer; on a high-latency link it is large, so
+	// we go deep and hide the round-trip. Unlike a speed-only ladder this tells a fast LAN peer
+	// from a fast WAN one. m_minRTT is the min-filtered request->first-byte round-trip (see
+	// ProcessBlockPacket).
+	//
+	// The flat cap of 24 is deliberate: the WAN ceiling is the OS TCP socket-buffer autotune
+	// limit (~4 MB by default), which pins throughput near 40 MB/s at 100 ms RTT however deep
+	// the pipeline runs, and 24 blocks is already 4.3 MB of authorised in-flight data. A deeper
+	// pipe buys no throughput, and 24 still sits inside eMule's own pending range.
+	const float rttMs = (m_minRTT > 0) ? (float)m_minRTT : 1.0f;
+	const float bdpBlocks = ((float)GetKBpsDown() * 1024.0f) * (rttMs / 1000.0f) / (float)EMBLOCKSIZE;
+	// 2x overshoot plus margin: sizing the pipe to exactly the current BDP is self-limiting,
+	// since the measured rate is itself capped by the current pipe and can never grow past a
+	// low equilibrium. Over-provisioning lets the rate climb to the link's real ceiling, where
+	// the depth settles at the BDP.
+	size_t pendingCap = 2 * (size_t)bdpBlocks + STANDARD_BLOCKS_REQUEST;
+	if (pendingCap < STANDARD_BLOCKS_REQUEST) {
+		// The floor doubles as the slow-source guard: a trickle source, or one with
+		// no RTT sample yet, has a near-zero BDP and is never handed a deep pipe.
+		pendingCap = STANDARD_BLOCKS_REQUEST;
+	} else if (pendingCap > 24) {
+		pendingCap = 24; // OS-buffer ceiling (see above); still within eMule's pending range
+	}
+
+	// Smooth continuous refill: top the in-flight plus staged block count up to pendingCap by
+	// the exact shortfall each call, never in bursts. Bursty refill emits requests in clusters
+	// that overfill and then starve a fast peer's send queue. Requests still ride the wire 3 to
+	// an OP_REQUESTPARTS packet.
+	{
+		const size_t inSystem = m_PendingBlocks_list.size() + m_DownloadBlocks_list.size();
+		if (inSystem < pendingCap) {
+			uint16 count = (uint16)(pendingCap - inSystem);
+			std::vector<Requested_Block_Struct *> toadd;
+			if (m_reqfile->GetNextRequestedBlock(this, toadd, count)) {
+				for (uint16 i = 0; i < count; i++) {
+					m_DownloadBlocks_list.push_back(toaddi);
+				}
 			}
 		}
 	}
 
-	// Barry - Why are unfinished blocks requested again, not just new ones?
-
-	while (m_PendingBlocks_list.size() < m_MaxBlockRequests && !m_DownloadBlocks_list.empty()) {
-		Pending_Block_Struct* pblock = new Pending_Block_Struct;
+	while (m_PendingBlocks_list.size() < pendingCap && !m_DownloadBlocks_list.empty()) {
+		Pending_Block_Struct *pblock = new Pending_Block_Struct;
 		pblock->block = m_DownloadBlocks_list.front();
 		pblock->zStream = NULL;
 		pblock->totalUnzipped = 0;
 		pblock->fZStreamError = 0;
 		pblock->fRecovered = 0;
-		pblock->fQueued = 0;	// Block sits in our local queue, not yet asked over the wire.
+		pblock->fQueued = 0; // Block sits in our local queue, not yet asked over the wire.
+		pblock->sentTime = 0;
 		m_PendingBlocks_list.push_back(pblock);
 		m_DownloadBlocks_list.pop_front();
 	}
 
-
 	if (m_PendingBlocks_list.empty()) {
 
-		CUpDownClient* slower_client = NULL;
+		CUpDownClient *slower_client = NULL;
 
-		if (thePrefs::GetDropSlowSources()) {
+		bool nearCompletion =
+			m_reqfile->GetPartCount() > 4 &&
+			(m_reqfile->GetFileSize() > m_reqfile->GetCompletedSize()) &&
+			((m_reqfile->GetFileSize() - m_reqfile->GetCompletedSize()) <= (4 * PARTSIZE));
+
+		if (thePrefs::GetDropSlowSources() || (nearCompletion && thePrefs::GetEndgame())) {
 			slower_client = m_reqfile->GetSlowerDownloadingClient(m_lastaverage, this);
 		}
 
@@ -656,84 +637,90 @@
 		}
 
 		if (!slower_client->GetSentCancelTransfer()) {
-			CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
+			CPacket *packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 			theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-//			if (slower_client != this) {
-//				printf("Dropped client %p to allow client %p to download\n",slower_client, this);
-//			}
 			slower_client->ClearDownloadBlockRequests();
-			slower_client->SendPacket(packet,true,true);
+			slower_client->SendPacket(packet, true, true);
 			slower_client->SetSentCancelTransfer(1);
 		}
 
-		slower_client->SetDownloadState(DS_NONEEDEDPARTS);
+		if (slower_client == this && nearCompletion) {
+			// requeue instead of self-banishing at endgame
+			slower_client->SetDownloadState(DS_ONQUEUE);
+		} else {
+			slower_client->SetDownloadState(DS_NONEEDEDPARTS);
+		}
 
 		if (slower_client != this) {
-			// Re-request freed blocks.
-			AddDebugLogLineN( logLocalClient, "Local Client: OP_CANCELTRANSFER (faster source eager to transfer) to " + slower_client->GetFullIP() );
+			AddDebugLogLineN(logLocalClient,
+				"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;
-			std::vector<Requested_Block_Struct*> toadd;
+			uint16 count = (uint16)pendingCap;
+			std::vector<Requested_Block_Struct *> toadd;
 			if (m_reqfile->GetNextRequestedBlock(this, toadd, count)) {
 				for (int i = 0; i != count; i++) {
-					Pending_Block_Struct* pblock = new Pending_Block_Struct;
+					Pending_Block_Struct *pblock = new Pending_Block_Struct;
 					pblock->block = toaddi;
 					pblock->zStream = NULL;
 					pblock->totalUnzipped = 0;
 					pblock->fZStreamError = 0;
 					pblock->fRecovered = 0;
 					pblock->fQueued = 0;
+					pblock->sentTime = 0;
 					m_PendingBlocks_list.push_back(pblock);
 				}
 			} else {
-				// WTF, we just freed blocks.
-				wxFAIL_MSG("No free blocks to request after freeing some blocks");
+				// It's possible the freed blocks were not available on our source.
+				// Just drop ourselves gracefully instead of crashing.
+				if (!GetSentCancelTransfer()) {
+					CPacket *packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
+					theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
+					ClearDownloadBlockRequests();
+					SendPacket(packet, true, true);
+					SetSentCancelTransfer(1);
+				}
+				AddDebugLogLineN(logLocalClient,
+					"Local Client: OP_CANCELTRANSFER (freed blocks not available "
+					"here) to " +
+						GetFullIP());
+				if (nearCompletion) {
+					// requeue instead of self-banishing at endgame
+					SetDownloadState(DS_ONQUEUE);
+				} else {
+					SetDownloadState(DS_NONEEDEDPARTS);
+				}
 				return;
 			}
 		} else {
-			// Drop this one.
-			AddDebugLogLineN( logLocalClient, "Local Client: OP_CANCELTRANSFER (no free blocks) to " + GetFullIP() );
-			//#warning Kry - Would be nice to swap A4AF here.
+			AddDebugLogLineN(logLocalClient,
+				"Local Client: OP_CANCELTRANSFER (no free blocks) to " + GetFullIP());
+			// #warning Kry - Would be nice to swap A4AF here.
 			return;
 		}
 	}
 
-	// Collect up to N pending blocks that have not yet been written to a
-	// REQUESTPARTS packet (fQueued == 0).  N is the protocol's
-	// per-packet limit:
-	//
-	//   - Legacy OP_REQUESTPARTS / OP_REQUESTPARTS_I64 carry exactly 3
-	//     <start,end> pairs on the wire (see ProcessRequestPartsPacket
-	//     in UploadClient.cpp, which unconditionally reads 3 pairs).
-	//     Asking for more than 3 in one packet corrupts the wire format
-	//     and the sender ignores us, leaving the receiver stuck "On
-	//     queue".  Pad with zero-pairs if we have fewer than 3 unqueued
-	//     blocks.
+	// Collect up to 3 pending blocks not yet written to a REQUESTPARTS packet (fQueued == 0).
+	// OP_REQUESTPARTS / OP_REQUESTPARTS_I64 carry exactly 3 <start,end> pairs on the wire
+	// (ProcessRequestPartsPacket in UploadClient.cpp unconditionally reads 3), so asking for
+	// more in one packet corrupts the wire format and the sender ignores us; pad with zero-
+	// pairs instead.
 	//
-	//   - The aMule-only ED2Kv2 OP_REQUESTPARTS variant (gated by
-	//     GetVBTTags()) carries a leading uint8 block count and can
-	//     hold up to m_MaxBlockRequests blocks per packet.
-	//
-	// To take more than 3 blocks in flight on legacy peers we therefore
-	// emit one 3-block packet per call to SendBlockRequests() and let
-	// the caller's existing re-invocation loop (after each
-	// OP_SENDINGPART, OP_ACCEPTUPLOADREQ, etc.) issue further packets
-	// until m_PendingBlocks_list is fully queued.  This is the same
-	// pattern eMule 0.70 uses (eMule0.70b srchybrid/DownloadClient.cpp
-	// ::CreateBlockRequests + ::SendBlockRequests).
-	std::vector<Pending_Block_Struct*> toRequest;
+	// More than 3 blocks in flight means one 3-block packet per call, with the caller's re-
+	// invocation loop (after each OP_SENDINGPART, OP_ACCEPTUPLOADREQ, ...) issuing further
+	// packets until m_PendingBlocks_list is fully queued.
+	std::vector<Pending_Block_Struct *> toRequest;
 	bool bHasLongBlocks = false;
-	const size_t perPacketLimit = GetVBTTags() ? m_MaxBlockRequests : (size_t)STANDARD_BLOCKS_REQUEST;
+	const size_t perPacketLimit = STANDARD_BLOCKS_REQUEST;
 	toRequest.reserve(perPacketLimit);
 
-	for (std::list<Pending_Block_Struct*>::iterator it = m_PendingBlocks_list.begin();
-		 it != m_PendingBlocks_list.end() && toRequest.size() < perPacketLimit;
-		 ++it)
-	{
-		Pending_Block_Struct* pending = *it;
+	for (std::list<Pending_Block_Struct *>::iterator it = m_PendingBlocks_list.begin();
+		it != m_PendingBlocks_list.end() && toRequest.size() < perPacketLimit;
+		++it) {
+		Pending_Block_Struct *pending = *it;
 		if (pending->fQueued) {
-			continue;	// Already asked for over the wire; sender owes us bytes.
+			continue; // Already asked for over the wire; sender owes us bytes.
 		}
 
 		wxASSERT(pending->block->StartOffset <= pending->block->EndOffset);
@@ -742,9 +729,11 @@
 			if (!SupportsLargeFiles()) {
 				// Requesting a large block from a client that doesn't support large files?
 				if (!GetSentCancelTransfer()) {
-					CPacket* cancel_packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
+					CPacket *cancel_packet =
+						new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 					theStats::AddUpOverheadFileRequest(cancel_packet->GetPacketSize());
-					AddDebugLogLineN(logLocalClient, "Local Client: OP_CANCELTRANSFER to " + GetFullIP());
+					AddDebugLogLineN(logLocalClient,
+						"Local Client: OP_CANCELTRANSFER to " + GetFullIP());
 					SendPacket(cancel_packet, true, true);
 					SetSentCancelTransfer(1);
 				}
@@ -761,70 +750,49 @@
 		return;
 	}
 
-	CPacket* packet = NULL;
+	CPacket *packet = NULL;
 
-	if (GetVBTTags()) {
-		// ED2Kv2 packet: hash + nBlocks + per-block <start,end> tag pair.
-		const uint8 nBlocks = (uint8)toRequest.size();
-		CMemFile data(16 + 1 + nBlocks * ((2 + 4) * 2));
-		data.WriteHash(m_reqfile->GetFileHash());
-		data.WriteUInt8(nBlocks);
-		for (Pending_Block_Struct* pending : toRequest) {
+	// Always 3 blocks on the wire; pad missing entries with zero <start,end> pairs. The upload-
+	// side parser silently skips entries with end <= start, so the padding is inert.
+	const size_t kWireBlocks = STANDARD_BLOCKS_REQUEST;
+	const size_t offsetSize = bHasLongBlocks ? 8 : 4;
+	CMemFile data(16 + kWireBlocks * offsetSize * 2);
+	data.WriteHash(m_reqfile->GetFileHash());
+
+	for (size_t i = 0; i < kWireBlocks; ++i) {
+		uint64 start = 0;
+		if (i < toRequest.size()) {
+			Pending_Block_Struct *pending = toRequesti;
 			pending->fZStreamError = 0;
 			pending->fRecovered = 0;
 			pending->fQueued = 1;
-			CTagVarInt(/*Noname*/0, pending->block->StartOffset).WriteTagToFile(&data);
-			CTagVarInt(/*Noname*/0, pending->block->EndOffset).WriteTagToFile(&data);
+			pending->sentTime = ::GetTickCount64();
+			start = pending->block->StartOffset;
 		}
-		packet = new CPacket(data, OP_ED2KV2HEADER, OP_REQUESTPARTS);
-		AddDebugLogLineN(logLocalClient, CFormat("Local Client ED2Kv2: OP_REQUESTPARTS(%i) to %s")
-				% (int)nBlocks % GetFullIP());
-	} else {
-		// Legacy OP_REQUESTPARTS / OP_REQUESTPARTS_I64: always 3 blocks
-		// on the wire.  Pad missing entries with zero <start,end> pairs;
-		// the upload-side parser (UploadClient.cpp ProcessRequestPartsPacket)
-		// silently skips entries with end <= start, so zero pairs are inert.
-		const size_t kWireBlocks = STANDARD_BLOCKS_REQUEST;
-		const size_t offsetSize = bHasLongBlocks ? 8 : 4;
-		CMemFile data(16 + kWireBlocks * offsetSize * 2);
-		data.WriteHash(m_reqfile->GetFileHash());
-
-		for (size_t i = 0; i < kWireBlocks; ++i) {
-			uint64 start = 0;
-			if (i < toRequest.size()) {
-				Pending_Block_Struct* pending = toRequesti;
-				pending->fZStreamError = 0;
-				pending->fRecovered = 0;
-				pending->fQueued = 1;
-				start = pending->block->StartOffset;
-			}
-			if (bHasLongBlocks) {
-				data.WriteUInt64(start);
-			} else {
-				data.WriteUInt32((uint32)start);
-			}
+		if (bHasLongBlocks) {
+			data.WriteUInt64(start);
+		} else {
+			data.WriteUInt32((uint32)start);
 		}
-		for (size_t i = 0; i < kWireBlocks; ++i) {
-			uint64 end = 0;
-			if (i < toRequest.size()) {
-				end = toRequesti->block->EndOffset + 1;
-			}
-			if (bHasLongBlocks) {
-				data.WriteUInt64(end);
-			} else {
-				data.WriteUInt32((uint32)end);
-			}
+	}
+	for (size_t i = 0; i < kWireBlocks; ++i) {
+		uint64 end = 0;
+		if (i < toRequest.size()) {
+			end = toRequesti->block->EndOffset + 1;
+		}
+		if (bHasLongBlocks) {
+			data.WriteUInt64(end);
+		} else {
+			data.WriteUInt32((uint32)end);
 		}
-		packet = new CPacket(data,
-			(bHasLongBlocks ? OP_EMULEPROT : OP_EDONKEYPROT),
-			(bHasLongBlocks ? (uint8)OP_REQUESTPARTS_I64 : (uint8)OP_REQUESTPARTS));
-		AddDebugLogLineN(logLocalClient,
-			CFormat("Local Client: %s(%u of %u pending) to %s")
-				% (bHasLongBlocks ? "OP_REQUESTPARTS_I64" : "OP_REQUESTPARTS")
-				% (unsigned)toRequest.size()
-				% (unsigned)m_PendingBlocks_list.size()
-				% GetFullIP());
 	}
+	packet = new CPacket(data,
+		(bHasLongBlocks ? OP_EMULEPROT : OP_EDONKEYPROT),
+		(bHasLongBlocks ? (uint8)OP_REQUESTPARTS_I64 : (uint8)OP_REQUESTPARTS));
+	AddDebugLogLineN(logLocalClient,
+		CFormat("Local Client: %s(%u of %u pending) to %s") %
+			(bHasLongBlocks ? "OP_REQUESTPARTS_I64" : "OP_REQUESTPARTS") %
+			(unsigned)toRequest.size() % (unsigned)m_PendingBlocks_list.size() % GetFullIP());
 
 	if (packet) {
 		theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
@@ -833,24 +801,15 @@
 }
 
 /*
-Barry - Originally this only wrote to disk when a full 180k block
-had been received from a client, and only asked for data in
-180k blocks.
-
-This meant that on average 90k was lost for every connection
-to a client data source. That is a lot of wasted data.
-
-To reduce the lost data, packets are now written to a buffer
-and flushed to disk regularly regardless of size downloaded.
-
-This includes compressed packets.
-
-Data is also requested only where gaps are, not in 180k blocks.
-The requests will still not exceed 180k, but may be smaller to
-fill a gap.
-*/
-
-void CUpDownClient::ProcessBlockPacket(const uint8_t* packet, uint32 size, bool packed, bool largeblocks)
+ * Barry - Originally this only wrote to disk when a full 180k block had been received from a
+ * client, and only asked for data in 180k blocks, so on average 90k was lost for every connection
+ * to a client data source. To reduce that, packets are now written to a buffer and flushed to disk
+ * regularly regardless of size downloaded, compressed packets included. Data is also requested only
+ * where gaps are, not in 180k blocks: a request still never exceeds 180k, but may be smaller to fill
+ * a gap.
+ */
+
+void CUpDownClient::ProcessBlockPacket(const uint8_t *packet, uint32 size, bool packed, bool largeblocks)
 {
 	// Ignore if no data required
 	if (!(GetDownloadState() == DS_DOWNLOADING || GetDownloadState() == DS_NONEEDEDPARTS)) {
@@ -864,21 +823,16 @@
 	uint32 nBlockSize = 0;
 	uint32 lenUnzipped = 0;
 
-	// Update stats
 	m_dwLastBlockReceived = ::GetTickCount64();
 
 	try {
 
-		// Read data from packet
 		const CMemFile data(packet, size);
 
-		// Check that this data is for the correct file
 		if ((!m_reqfile) || data.ReadHash() != m_reqfile->GetFileHash()) {
 			throw wxString("Wrong fileid sent (ProcessBlockPacket)");
 		}
 
-		// Find the start & end positions, and size of this chunk of data
-
 		if (largeblocks) {
 			nStartPos = data.ReadUInt64();
 			header_size += 8;
@@ -902,35 +856,46 @@
 		}
 
 		// Check that packet size matches the declared data size + header size
-		if ( nEndPos == nStartPos || size != ((nEndPos - nStartPos) + header_size)) {
+		if (nEndPos == nStartPos || size != ((nEndPos - nStartPos) + header_size)) {
 			throw wxString("Corrupted or invalid DataBlock received (ProcessBlockPacket)");
 		}
-		theStats::AddDownloadFromSoft(GetClientSoft(),size - header_size);
+		theStats::AddDownloadFromSoft(GetClientSoft(), size - header_size);
 		bytesReceivedCycle += size - header_size;
 
-		credits->AddDownloaded(size - header_size, GetIP(), theApp->CryptoAvailable());
+		credits->AddDownloaded(size - header_size, GetUserAddress(), theApp->CryptoAvailable());
 
 		// Move end back one, should be inclusive
 		nEndPos--;
 
-		// Loop through to find the reserved block that this is within
-		std::list<Pending_Block_Struct*>::iterator it = m_PendingBlocks_list.begin();
+		std::list<Pending_Block_Struct *>::iterator it = m_PendingBlocks_list.begin();
 		for (; it != m_PendingBlocks_list.end(); ++it) {
-			Pending_Block_Struct* cur_block = *it;
+			Pending_Block_Struct *cur_block = *it;
 
-			if ((cur_block->block->StartOffset <= nStartPos) && (cur_block->block->EndOffset >= nStartPos)) {
-				// Found reserved block
+			if ((cur_block->block->StartOffset <= nStartPos) &&
+				(cur_block->block->EndOffset >= nStartPos)) {
 
 				if (cur_block->block->StartOffset == nStartPos) {
-					// This block just started transferring. Set the start time.
 					m_last_block_start = ::GetTickCount64();
+					// RTT sample: the matched request->first-byte round-trip
+					// for this block. Min-filtered so pipeline queuing delay
+					// never inflates the estimate; sizes the request pipeline.
+					if (cur_block->sentTime != 0) {
+						uint64 sample = m_last_block_start - cur_block->sentTime;
+						if (m_minRTT == 0 || sample < m_minRTT) {
+							m_minRTT = sample;
+						}
+						cur_block->sentTime = 0;
+					}
 				}
 
-				if (cur_block->fZStreamError){
+				if (cur_block->fZStreamError) {
 					AddDebugLogLineN(logZLib,
-						CFormat("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);
+						CFormat("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);
 					return;
 				}
 
@@ -941,22 +906,36 @@
 				// This will be 0 in these cases, or the length written otherwise
 				uint32 lenWritten = 0;
 
-				// Handle differently depending on whether packed or not
 				if (!packed) {
 					// security sanitize check
 					if (nEndPos > cur_block->block->EndOffset) {
-						AddDebugLogLineN(logRemoteClient, CFormat("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);
+						AddDebugLogLineN(logRemoteClient,
+							CFormat("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, (uint8_t*)(packet + header_size), nStartPos, nEndPos, cur_block->block, this);
+					lenWritten = m_reqfile->WriteToBuffer(size - header_size,
+						(uint8_t *)(packet + header_size),
+						nStartPos,
+						nEndPos,
+						cur_block->block,
+						this);
 				} else {
-					// Packed
-					wxASSERT( (long int)size > 0 );
-					// Create space to store unzipped data, the size is
-					// only an initial guess, will be resized in unzip()
-					// if not big enough
+					wxASSERT((long int)size > 0);
+					// Create space to store unzipped data. The size is only an
+					// initial guess and is resized in unzip() if not big
+					// enough.
 					lenUnzipped = (size * 2);
 					// Don't get too big
 					if (lenUnzipped > (BLOCKSIZE + 300)) {
@@ -964,81 +943,103 @@
 					}
 					uint8_t *unzipped = new uint8_tlenUnzipped;
 
-					// Try to unzip the packet
-					int result = unzip(cur_block, (uint8_t*)(packet + header_size), (size - header_size), &unzipped, &lenUnzipped);
+					int result = unzip(cur_block,
+						(uint8_t *)(packet + header_size),
+						(size - header_size),
+						&unzipped,
+						&lenUnzipped);
 
-					// no block can be uncompressed to >2GB, 'lenUnzipped' is obviously erroneous.
+					// no block can be uncompressed to >2GB, 'lenUnzipped' is obviously
+					// erroneous.
 					if (result == Z_OK && ((int)lenUnzipped >= 0)) {
 
-						// Write any unzipped data to disk
 						if (lenUnzipped > 0) {
-							wxASSERT( (int)lenUnzipped > 0 );
+							wxASSERT((int)lenUnzipped > 0);
 
-							// Use the current start and end positions for the uncompressed data
-							nStartPos = cur_block->block->StartOffset + cur_block->totalUnzipped - lenUnzipped;
-							nEndPos = cur_block->block->StartOffset + cur_block->totalUnzipped - 1;
+							// Use the current start and end positions for the
+							// uncompressed data
+							nStartPos = cur_block->block->StartOffset +
+								    cur_block->totalUnzipped - lenUnzipped;
+							nEndPos = cur_block->block->StartOffset +
+								  cur_block->totalUnzipped - 1;
 
-							if (nStartPos > cur_block->block->EndOffset || nEndPos > cur_block->block->EndOffset) {
+							if (nStartPos > cur_block->block->EndOffset ||
+								nEndPos > cur_block->block->EndOffset) {
 								AddDebugLogLineN(logZLib,
-									CFormat("Corrupted compressed packet for '%s' received (error 666)") % m_reqfile->GetFileName());
-								m_reqfile->RemoveBlockFromList(cur_block->block->StartOffset, cur_block->block->EndOffset);
+									CFormat("Corrupted compressed packet "
+										"for '%s' received (error "
+										"666)") %
+										m_reqfile->GetFileName());
+								m_reqfile->RemoveBlockFromList(
+									cur_block->block->StartOffset,
+									cur_block->block->EndOffset);
 							} else {
-								// Write uncompressed data to file
-								lenWritten = m_reqfile->WriteToBuffer( size - header_size,
-																	   unzipped,
-																	   nStartPos,
-																	   nEndPos,
-																	   cur_block->block,
-																	   this);
+								lenWritten = m_reqfile->WriteToBuffer(
+									size - header_size,
+									unzipped,
+									nStartPos,
+									nEndPos,
+									cur_block->block,
+									this);
 							}
 						}
 					} else {
 						wxString strZipError;
 						if (cur_block->zStream && cur_block->zStream->msg) {
-							strZipError = " - " + wxString::FromAscii(cur_block->zStream->msg);
+							strZipError =
+								" - " +
+								wxString::FromAscii(cur_block->zStream->msg);
 						}
 
 						AddDebugLogLineN(logZLib,
-							CFormat("Corrupted compressed packet for '%s' received (error %i): %s")
-								% m_reqfile->GetFileName() % result % strZipError);
+							CFormat("Corrupted compressed packet for '%s' "
+								"received (error %i): %s") %
+								m_reqfile->GetFileName() % result %
+								strZipError);
 
-						m_reqfile->RemoveBlockFromList(cur_block->block->StartOffset, cur_block->block->EndOffset);
+						m_reqfile->RemoveBlockFromList(cur_block->block->StartOffset,
+							cur_block->block->EndOffset);
 
-						// If we had an zstream error, there is no chance that we could recover from it nor that we
-						// could use the current zstream (which is in error state) any longer.
-						if (cur_block->zStream){
+						// After a zstream error there is no chance of
+						// recovering from it, nor of using the current
+						// zstream, which is in an error state, any longer.
+						if (cur_block->zStream) {
 							inflateEnd(cur_block->zStream);
 							delete cur_block->zStream;
 							cur_block->zStream = NULL;
 						}
 
-						// Although we can't further use the current zstream, there is no need to disconnect the sending
-						// client because the next zstream (a series of 10K-blocks which build a 180K-block) could be
-						// valid again. Just ignore all further blocks for the current zstream.
+						// No need to disconnect the sending client: the
+						// next zstream (a series of 10K blocks building a
+						// 180K block) may be valid again, so just ignore
+						// the rest of this one.
 						cur_block->fZStreamError = 1;
 						cur_block->totalUnzipped = 0; // bluecow's fix
 					}
-					delete  unzipped;
+					delete unzipped;
 				}
-				// These checks only need to be done if any data was written
 				if (lenWritten > 0) {
 					m_nTransferredDown += lenWritten;
 
-					// If finished reserved block
 					if (nEndPos == cur_block->block->EndOffset) {
 
 						// Save last average speed based on data and time.
 						// This should do bytes/sec.
-						uint64 average_time = (::GetTickCount64() - m_last_block_start);
+						uint64 average_time =
+							(::GetTickCount64() - m_last_block_start);
 
 						// Avoid divide by 0.
 						if (average_time == 0) {
 							average_time++;
 						}
 
-						m_lastaverage = ((cur_block->block->EndOffset - cur_block->block->StartOffset) * 1000) / average_time;
+						m_lastaverage = ((cur_block->block->EndOffset -
+									 cur_block->block->StartOffset) *
+									1000) /
+								average_time;
 
-						m_reqfile->RemoveBlockFromList(cur_block->block->StartOffset, cur_block->block->EndOffset);
+						m_reqfile->RemoveBlockFromList(cur_block->block->StartOffset,
+							cur_block->block->EndOffset);
 						delete cur_block->block;
 						// Not always allocated
 						if (cur_block->zStream) {
@@ -1048,38 +1049,39 @@
 						delete cur_block;
 						m_PendingBlocks_list.erase(it);
 
-						// Request next block
 						SendBlockRequests();
 					}
 				}
-				// Stop looping and exit method
 				return;
 			}
 		}
-	} catch (const CEOFException& e) {
+	} catch (const CEOFException &e) {
 		wxString error = wxString("Error reading ");
-		if (packed) error += CFormat("packed (LU: %i) largeblocks ") % lenUnzipped;
-		error += CFormat("data packet: RS: %i HS: %i SP: %i EP: %i BS: %i -> ")
-					% size % header_size % nStartPos % nEndPos % nBlockSize;
+		if (packed)
+			error += CFormat("packed (LU: %i) largeblocks ") % lenUnzipped;
+		error += CFormat("data packet: RS: %i HS: %i SP: %i EP: %i BS: %i -> ") % size % header_size %
+			 nStartPos % nEndPos % nBlockSize;
 		AddDebugLogLineC(logRemoteClient, error + e.what());
 		return;
 	}
 }
 
-int CUpDownClient::unzip(Pending_Block_Struct *block, uint8_t *zipped, uint32 lenZipped, uint8_t **unzipped, uint32 *lenUnzipped, int iRecursion)
+int CUpDownClient::unzip(Pending_Block_Struct *block,
+	uint8_t *zipped,
+	uint32 lenZipped,
+	uint8_t **unzipped,
+	uint32 *lenUnzipped,
+	int iRecursion)
 {
 	int err = Z_DATA_ERROR;
 
-	// Save some typing
 	z_stream *zS = block->zStream;
 
 	// Is this the first time this block has been unzipped
 	if (zS == NULL) {
-		// Create stream
 		block->zStream = new z_stream;
 		zS = block->zStream;
 
-		// Initialise stream values
 		zS->zalloc = (alloc_func)0;
 		zS->zfree = (free_func)0;
 		zS->opaque = (voidpf)0;
@@ -1088,15 +1090,13 @@
 		zS->next_out = (*unzipped);
 		zS->avail_out = (*lenUnzipped);
 
-		// Initialise the z_stream
 		err = inflateInit(zS);
 		if (err != Z_OK) {
 			return err;
 		}
 	}
 
-	// Use whatever input is provided
-	zS->next_in  = zipped;
+	zS->next_in = zipped;
 	zS->avail_in = lenZipped;
 
 	// Only set the output if not being called recursively
@@ -1105,13 +1105,11 @@
 		zS->avail_out = (*lenUnzipped);
 	}
 
-	// Try to unzip the data
 	err = inflate(zS, Z_SYNC_FLUSH);
 
 	// Is zip finished reading all currently available input and writing
 	// all generated output
 	if (err == Z_STREAM_END) {
-		// Finish up
 		err = inflateEnd(zS);
 		if (err != Z_OK) {
 			return err;
@@ -1126,16 +1124,15 @@
 		// Output array was not big enough,
 		// call recursively until there is enough space
 
-		// What size should we try next
 		uint32 newLength = (*lenUnzipped) *= 2;
 		if (newLength == 0) {
 			newLength = lenZipped * 2;
 		}
 		// Copy any data that was successfully unzipped to new array
 		uint8_t *temp = new uint8_tnewLength;
-		wxASSERT( zS->total_out - block->totalUnzipped <= newLength );
+		wxASSERT(zS->total_out - block->totalUnzipped <= newLength);
 		memcpy(temp, (*unzipped), (zS->total_out - block->totalUnzipped));
-		delete  (*unzipped);
+		delete (*unzipped);
 		(*unzipped) = temp;
 		(*lenUnzipped) = newLength;
 
@@ -1143,27 +1140,25 @@
 		zS->next_out = (*unzipped) + (zS->total_out - block->totalUnzipped);
 		zS->avail_out = (*lenUnzipped) - (zS->total_out - block->totalUnzipped);
 
-		// Try again
 		err = unzip(block, zS->next_in, zS->avail_in, unzipped, lenUnzipped, iRecursion + 1);
 	} else if ((err == Z_OK) && (zS->avail_in == 0)) {
-		// All available input has been processed, everything ok.
-		// Set the size to the amount unzipped in this call
-		// (including all recursive calls)
+		// All available input has been processed, everything ok. Set the size to the amount
+		// unzipped in this call, including all recursive calls.
 		(*lenUnzipped) = (zS->total_out - block->totalUnzipped);
 		block->totalUnzipped = zS->total_out;
 	} else {
 		// Should not get here unless input data is corrupt
 		wxString strZipError;
 
-		if ( zS->msg ) {
+		if (zS->msg) {
 			strZipError = CFormat(" %d '%s'") % err % wxString::FromAscii(zS->msg);
 		} else if (err != Z_OK) {
 			strZipError = CFormat(" %d") % err;
 		}
 
 		AddDebugLogLineN(logZLib,
-			CFormat("Unexpected zip error %s in file '%s'")
-				% strZipError % (m_reqfile ? m_reqfile->GetFileName() : CPath("?")));
+			CFormat("Unexpected zip error %s in file '%s'") % strZipError %
+				(m_reqfile ? m_reqfile->GetFileName() : CPath("?")));
 	}
 
 	if (err != Z_OK) {
@@ -1173,21 +1168,18 @@
 	return err;
 }
 
-
-// Speed is now updated only when data was received, calculated as
-// (data received) / (time since last reception)
-// and slightly filtered (10s average).
-// Result is quite precise now and makes the DownloadRateAdjust workaround obsolete.
+// Updated only when data was received: (data received) / (time since last
+// reception), lightly filtered over a 10 s average.
 
 float CUpDownClient::CalculateKBpsDown()
 {
-	const	float tAverage = 10.0;
-	uint64	msCur = GetTickCount64();
+	const float tAverage = 10.0;
+	uint64 msCur = GetTickCount64();
 
 	if (bytesReceivedCycle) {
 		float dt = (msCur - msReceivedPrev) / 1000.0; // time since last reception
-		if (dt < 0.01) {	// (safeguard against divide-by-zero)
-			dt = 0.01f;		//  diff should be 100ms actually
+		if (dt < 0.01) {                              // (safeguard against divide-by-zero)
+			dt = 0.01f;                           //  diff should be 100ms actually
 		}
 		float kBpsDownCur = bytesReceivedCycle / 1024.0 / dt;
 		if (dt >= tAverage) {
@@ -1195,23 +1187,21 @@
 		} else {
 			kBpsDown = (kBpsDown * (tAverage - dt) + kBpsDownCur * dt) / tAverage;
 		}
-		//AddDebugLogLineN(logLocalClient, CFormat("CalculateKBpsDown %p kbps %.1f kbpsCur %.1f dt %.3f rcv %d ")
-		//			% this % kBpsDown  % kBpsDownCur % dt % bytesReceivedCycle);
 		bytesReceivedCycle = 0;
 		msReceivedPrev = msCur;
 	}
 
 	m_cShowDR++;
-	if (m_cShowDR == 30){
+	if (m_cShowDR == 30) {
 		m_cShowDR = 0;
 		UpdateDisplayedInfo();
 	}
 	if (msCur - m_dwLastBlockReceived > DOWNLOADTIMEOUT) {
-		if (!GetSentCancelTransfer()){
-			CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
+		if (!GetSentCancelTransfer()) {
+			CPacket *packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 			theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-			AddDebugLogLineN( logLocalClient, "Local Client: OP_CANCELTRANSFER to " + GetFullIP() );
-			SendPacket(packet,true,true);
+			AddDebugLogLineN(logLocalClient, "Local Client: OP_CANCELTRANSFER to " + GetFullIP());
+			SendPacket(packet, true, true);
 			SetSentCancelTransfer(1);
 		}
 		SetDownloadState(DS_ONQUEUE);
@@ -1223,7 +1213,7 @@
 uint16 CUpDownClient::GetAvailablePartCount() const
 {
 	uint16 result = 0;
-	for (int i = 0;i != m_nPartCount;i++){
+	for (int i = 0; i != m_nPartCount; i++) {
 		if (IsPartAvailable(i))
 			result++;
 	}
@@ -1239,7 +1229,6 @@
 
 void CUpDownClient::UDPReaskACK(uint16 nNewQR)
 {
-	// 0.42e
 	m_bUDPPending = false;
 	SetRemoteQueueRank(nNewQR);
 	m_dwLastAskedTime = ::GetTickCount64();
@@ -1250,7 +1239,7 @@
 	m_bUDPPending = false;
 
 	// avoid premature deletion of 'this' client
-	if (GetDownloadState() != DS_DOWNLOADING){
+	if (GetDownloadState() != DS_DOWNLOADING) {
 		if (m_reqfile) {
 			m_reqfile->AddDeadSource(this);
 		}
@@ -1262,7 +1251,9 @@
 			}
 		}
 	} else {
-		AddDebugLogLineN( logRemoteClient, "UDP ANSWER FNF : " + GetUserName() + " - did not remove client because of current download state" );
+		AddDebugLogLineN(logRemoteClient,
+			"UDP ANSWER FNF : " + GetUserName() +
+				" - did not remove client because of current download state");
 	}
 }
 
@@ -1271,24 +1262,19 @@
 
 	wxASSERT(m_reqfile);
 
-	if(!m_reqfile || m_bUDPPending ) {
+	if (!m_reqfile || m_bUDPPending) {
 		return;
 	}
 
-	//#warning We should implement the quality tests for udp reliability
-	/*
-	if( m_nTotalUDPPackets > 3 && ((float)(m_nFailedUDPPackets/m_nTotalUDPPackets) > .3)) {
-		return;
-	}
-	*/
+	// #warning We should implement the quality tests for udp reliability
 
 	if (thePrefs::GetEffectiveUDPPort() == 0) {
 		return;
 	}
 
 	if (m_nUDPPort != 0 && !theApp->IsFirewalled() && !IsConnected()) {
-		//don't use udp to ask for sources
-		if(IsSourceRequestAllowed()) {
+		// don't use udp to ask for sources
+		if (IsSourceRequestAllowed()) {
 			return;
 		}
 
@@ -1299,9 +1285,8 @@
 
 		if (GetUDPVersion() > 3) {
 			if (m_reqfile->IsPartFile()) {
-				static_cast<CPartFile*>(m_reqfile)->WritePartStatus(&data);
-			}
-			else {
+				static_cast<CPartFile *>(m_reqfile)->WritePartStatus(&data);
+			} else {
 				data.WriteUInt16(0);
 			}
 		}
@@ -1310,11 +1295,17 @@
 			data.WriteUInt16(m_reqfile->m_nCompleteSourcesCount);
 		}
 
-		CPacket* response = new CPacket(data, OP_EMULEPROT, OP_REASKFILEPING);
-		AddDebugLogLineN( logClientUDP, "Client UDP socket: send OP_REASKFILEPING" );
+		CPacket *response = new CPacket(data, OP_EMULEPROT, OP_REASKFILEPING);
+		AddDebugLogLineN(logClientUDP, "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()) {
+		theApp->clientudp->SendPacket(response,
+			GetConnectIP(),
+			GetUDPPort(),
+			ShouldReceiveCryptUDPPackets(),
+			GetUserHash().GetHash(),
+			false,
+			0);
+	} else if (HasLowID() && GetBuddyIP() && GetBuddyPort() && HasValidBuddyID()) {
 
 		m_bUDPPending = true;
 
@@ -1325,7 +1316,7 @@
 
 		if (GetUDPVersion() > 3) {
 			if (m_reqfile->IsPartFile()) {
-				static_cast<CPartFile*>(m_reqfile)->WritePartStatus(&data);
+				static_cast<CPartFile *>(m_reqfile)->WritePartStatus(&data);
 			} else {
 				data.WriteUInt16(0);
 			}
@@ -1335,20 +1326,18 @@
 			data.WriteUInt16(m_reqfile->m_nCompleteSourcesCount);
 		}
 
-		CPacket* response = new CPacket(data, OP_EMULEPROT, OP_REASKCALLBACKUDP);
-		AddDebugLogLineN( logClientUDP, "Client UDP socket: send OP_REASKCALLBACKUDP" );
+		CPacket *response = new CPacket(data, OP_EMULEPROT, OP_REASKCALLBACKUDP);
+		AddDebugLogLineN(logClientUDP, "Client UDP socket: send OP_REASKCALLBACKUDP");
 		theStats::AddUpOverheadFileRequest(response->GetPacketSize());
-		theApp->clientudp->SendPacket(response, GetBuddyIP(), GetBuddyPort(), false, NULL, true, 0 );
+		theApp->clientudp->SendPacket(response, GetBuddyIP(), GetBuddyPort(), false, NULL, true, 0);
 	}
 }
 
-
-// Get the next part that is requested
 uint16 CUpDownClient::GetNextRequestedPart() const
 {
 	uint16 part = 0xffff;
 
-	std::list<Pending_Block_Struct*>::const_iterator it = m_PendingBlocks_list.begin();
+	std::list<Pending_Block_Struct *>::const_iterator it = m_PendingBlocks_list.begin();
 	for (; it != m_PendingBlocks_list.end(); ++it) {
 		part = (*it)->block->StartOffset / PARTSIZE;
 		if (part != m_lastDownloadingPart) {
@@ -1359,40 +1348,36 @@
 	return part;
 }
 
-
 void CUpDownClient::UpdateDisplayedInfo(bool force)
 {
 	uint64 curTick = ::GetTickCount64();
-	if (force || curTick-m_lastRefreshedDLDisplay > MINWAIT_BEFORE_DLDISPLAY_WINDOWUPDATE) {
-		// Check if we actually need to notify of changes
+	if (force || curTick - m_lastRefreshedDLDisplay > MINWAIT_BEFORE_DLDISPLAY_WINDOWUPDATE) {
 		bool update = m_reqfile && m_reqfile->ShowSources();
 
-		// Check A4AF files only if needed
-		if ( !update ) {
+		if (!update) {
 			A4AFList::iterator it = m_A4AF_list.begin();
-			for ( ; it != m_A4AF_list.end(); ++it ) {
-				if ( it->first->ShowSources() ) {
+			for (; it != m_A4AF_list.end(); ++it) {
+				if (it->first->ShowSources()) {
 					update = true;
 					break;
 				}
 			}
 		}
 
-		// And finnaly trigger an event if there's any reason
-		if ( update ) {
+		if (update) {
 			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;
+			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 );
+			Notify_SourceCtrlUpdateSource(ECID(), type);
 		}
 
 		// Shared files view
@@ -1409,7 +1394,8 @@
 	uint8 ret = OBST_UNDEFINED;
 	if (thePrefs::IsClientCryptLayerSupported()) {
 		if (SupportsCryptLayer()) {
-			if ((RequestsCryptLayer() || thePrefs::IsClientCryptLayerRequested()) && HasObfuscatedConnectionBeenEstablished()) {
+			if ((RequestsCryptLayer() || thePrefs::IsClientCryptLayerRequested()) &&
+				HasObfuscatedConnectionBeenEstablished()) {
 				ret = OBST_ENABLED;
 			} else {
 				ret = OBST_SUPPORTED;
@@ -1423,15 +1409,16 @@
 	return ret;
 }
 
-// IgnoreNoNeeded = will switch to files of which this source has no needed parts (if no better files found)
-// ignoreSuspensions = ignore timelimit for A4Af jumping
-// bRemoveCompletely = do not readd the file which the source is swapped from to the A4AF lists (needed if deleting or stopping a file)
-// toFile = Try to swap to this partfile only
+// IgnoreNoNeeded      switch to files this source has no needed parts of, if no better file is found
+// ignoreSuspensions   ignore the time limit for A4AF jumping
+// bRemoveCompletely   do not re-add the file the source is swapped from to the A4AF lists (needed
+//                     when deleting or stopping a file)
+// toFile              try to swap to this partfile only
 
-bool CUpDownClient::SwapToAnotherFile(bool bIgnoreNoNeeded, bool ignoreSuspensions, bool bRemoveCompletely, CPartFile* toFile)
+bool CUpDownClient::SwapToAnotherFile(
+	bool bIgnoreNoNeeded, bool ignoreSuspensions, bool bRemoveCompletely, CPartFile *toFile)
 {
-	// Fail if m_reqfile is invalid
-	if ( m_reqfile == NULL ) {
+	if (m_reqfile == NULL) {
 		return false;
 	}
 
@@ -1440,17 +1427,14 @@
 		return false;
 	}
 
-	// The iterator of the final target
 	A4AFList::iterator target = m_A4AF_list.end();
 
-	// Do we want to swap to a specific file?
-	if ( toFile != NULL ) {
-		A4AFList::iterator it = m_A4AF_list.find( toFile );
-		if ( it != m_A4AF_list.end() ) {
+	if (toFile != NULL) {
+		A4AFList::iterator it = m_A4AF_list.find(toFile);
+		if (it != m_A4AF_list.end()) {
 
 			// We force ignoring of timestamps
-			if ( IsValidSwapTarget( it, bIgnoreNoNeeded, true ) ) {
-				// Set the target
+			if (IsValidSwapTarget(it, bIgnoreNoNeeded, true)) {
 				target = it;
 			}
 		}
@@ -1460,24 +1444,22 @@
 		char priority = -1;
 
 		A4AFList::iterator it = m_A4AF_list.begin();
-		for ( ; it != m_A4AF_list.end(); ++it ) {
-			if ( IsValidSwapTarget( it, bIgnoreNoNeeded, ignoreSuspensions ) ) {
+		for (; it != m_A4AF_list.end(); ++it) {
+			if (IsValidSwapTarget(it, bIgnoreNoNeeded, ignoreSuspensions)) {
 				char cur_priority = it->first->GetDownPriority();
 
 				// We would prefer to get files with needed parts, thus rate them higher.
 				// However, this really only matters if bIgnoreNoNeeded is true.
-				if ( it->second.NeededParts )
-						cur_priority += 10;
+				if (it->second.NeededParts)
+					cur_priority += 10;
 
-				// Change target if the current file has a higher rate than the previous
-				if ( cur_priority > priority ) {
+				if (cur_priority > priority) {
 					priority = cur_priority;
 
-					// Set the new target
 					target = it;
 
 					// Break on the first High-priority file with needed parts
-					if ( priority == PR_HIGH + 10 ) {
+					if (priority == PR_HIGH + 10) {
 						break;
 					}
 				}
@@ -1485,32 +1467,34 @@
 		}
 	}
 
-	// Try to swap if we found a valid target
-	if ( target != m_A4AF_list.end() ) {
+	if (target != m_A4AF_list.end()) {
 
 		// 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;
+		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 ) ) {
+			if (SwapTo->RemoveA4AFSource(this)) {
 				Notify_SourceCtrlRemoveSource(ECID(), SwapTo);
 			}
 
-			m_reqfile->RemoveDownloadingSource( this );
+			m_reqfile->RemoveDownloadingSource(this);
 
 			// Do we want to remove it completely? Say if the old file is getting deleted
-			if ( !bRemoveCompletely ) {
-				m_reqfile->AddA4AFSource( this );
+			if (!bRemoveCompletely) {
+				m_reqfile->AddA4AFSource(this);
 
-				// Set the status of the old file
 				m_A4AF_listm_reqfile.NeededParts = (GetDownloadState() != DS_NONEEDEDPARTS);
 
 				// Avoid swapping to this file for a while
 				m_A4AF_listm_reqfile.timestamp = ::GetTickCount64();
 
-				Notify_SourceCtrlAddSource(m_reqfile, CCLIENTREF(this, "CUpDownClient::SwapToAnotherFile Notify_SourceCtrlAddSource 1"), A4AF_SOURCE);
+				Notify_SourceCtrlAddSource(m_reqfile,
+					CCLIENTREF(this,
+						"CUpDownClient::SwapToAnotherFile Notify_SourceCtrlAddSource "
+						"1"),
+					A4AF_SOURCE);
 			} else {
 				Notify_SourceCtrlRemoveSource(ECID(), m_reqfile);
 			}
@@ -1523,14 +1507,17 @@
 
 			m_reqfile->UpdatePartsInfo();
 
-			SetRequestFile( SwapTo );
+			SetRequestFile(SwapTo);
 
-			SwapTo->AddSource( this );
+			SwapTo->AddSource(this);
 
-			Notify_SourceCtrlAddSource(SwapTo, CCLIENTREF(this, "CUpDownClient::SwapToAnotherFile Notify_SourceCtrlAddSource 2"), UNAVAILABLE_SOURCE);
+			Notify_SourceCtrlAddSource(SwapTo,
+				CCLIENTREF(this,
+					"CUpDownClient::SwapToAnotherFile Notify_SourceCtrlAddSource 2"),
+				UNAVAILABLE_SOURCE);
 
 			// Remove the new reqfile from the list of other files
-			m_A4AF_list.erase( target );
+			m_A4AF_list.erase(target);
 
 			return true;
 		}
@@ -1539,14 +1526,13 @@
 	return false;
 }
 
-
-bool CUpDownClient::IsValidSwapTarget( A4AFList::iterator it, bool ignorenoneeded, bool ignoresuspended )
+bool CUpDownClient::IsValidSwapTarget(A4AFList::iterator it, bool ignorenoneeded, bool ignoresuspended)
 {
-	wxASSERT( it != m_A4AF_list.end() && it->first );
+	wxASSERT(it != m_A4AF_list.end() && it->first);
 
 	// Check if this file has been suspended
-	if ( !ignoresuspended ) {
-		if ( ::GetTickCount64() - it->second.timestamp >= PURGESOURCESWAPSTOP ) {
+	if (!ignoresuspended) {
+		if (::GetTickCount64() - it->second.timestamp >= PURGESOURCESWAPSTOP) {
 			// The wait-time has been exceeded and the file is now a valid target
 			it->second.timestamp = 0;
 		} else {
@@ -1556,32 +1542,29 @@
 	}
 
 	// Check if the client has needed parts
-	if ( !ignorenoneeded ) {
-		if ( !it->second.NeededParts ) {
+	if (!ignorenoneeded) {
+		if (!it->second.NeededParts) {
 			return false;
 		}
 	}
 
-	// Final checks to see if the client is a valid target
-	CPartFile* cur_file = it->first;
-	if ( ( cur_file != m_reqfile && !cur_file->IsStopped() ) &&
-	     ( cur_file->GetStatus() == PS_READY || cur_file->GetStatus() == PS_EMPTY ) &&
-		 ( cur_file->IsPartFile() ) )
-	{
+	CPartFile *cur_file = it->first;
+	if ((cur_file != m_reqfile && !cur_file->IsStopped()) &&
+		(cur_file->GetStatus() == PS_READY || cur_file->GetStatus() == PS_EMPTY) &&
+		(cur_file->IsPartFile())) {
 		return true;
 	} else {
 		return false;
 	}
 }
 
-
-void CUpDownClient::SetRequestFile(CPartFile* reqfile)
+void CUpDownClient::SetRequestFile(CPartFile *reqfile)
 {
-	if ( m_reqfile != reqfile ) {
+	if (m_reqfile != reqfile) {
 		// Decrement the source-count of the old request-file
-		if ( m_reqfile ) {
-			m_reqfile->ClientStateChanged( GetDownloadState(), -1 );
-			m_reqfile->UpdatePartsFrequency( this, false );
+		if (m_reqfile) {
+			m_reqfile->ClientStateChanged(GetDownloadState(), -1);
+			m_reqfile->UpdatePartsFrequency(this, false);
 		}
 
 		m_nPartCount = 0;
@@ -1589,22 +1572,24 @@
 
 		m_reqfile = reqfile;
 
-		if ( reqfile ) {
+		if (reqfile) {
 			// Increment the source-count of the new request-file
-			m_reqfile->ClientStateChanged( -1, GetDownloadState() );
+			m_reqfile->ClientStateChanged(-1, GetDownloadState());
 
 			m_nPartCount = reqfile->GetPartCount();
 		}
 	}
 }
 
-void CUpDownClient::SetReqFileAICHHash(CAICHHash* val){
-	if(m_pReqFileAICHHash != NULL && m_pReqFileAICHHash != val)
+void CUpDownClient::SetReqFileAICHHash(CAICHHash *val)
+{
+	if (m_pReqFileAICHHash != NULL && m_pReqFileAICHHash != val)
 		delete m_pReqFileAICHHash;
 	m_pReqFileAICHHash = val;
 }
 
-void CUpDownClient::SendAICHRequest(CPartFile* pForFile, uint16 nPart){
+void CUpDownClient::SendAICHRequest(CPartFile *pForFile, uint16 nPart)
+{
 	CAICHRequestedData request;
 	request.m_nPart = nPart;
 	request.m_pClient.Link(this CLIENT_DEBUGSTRING("CUpDownClient::SendAICHRequest"));
@@ -1615,55 +1600,62 @@
 	data.WriteHash(pForFile->GetFileHash());
 	data.WriteUInt16(nPart);
 	pForFile->GetAICHHashset()->GetMasterHash().Write(&data);
-	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_AICHREQUEST);
+	CPacket *packet = new CPacket(data, OP_EMULEPROT, OP_AICHREQUEST);
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
 	AddDebugLogLineN(logLocalClient, "Local Client: OP_AICHREQUEST to" + GetFullIP());
 	SafeSendPacket(packet);
 }
 
-void CUpDownClient::ProcessAICHAnswer(const uint8_t* packet, uint32 size)
+void CUpDownClient::ProcessAICHAnswer(const uint8_t *packet, uint32 size)
 {
-	if (m_fAICHRequested == FALSE){
+	if (m_fAICHRequested == FALSE) {
 		throw wxString("Received unrequested AICH Packet");
 	}
 	m_fAICHRequested = FALSE;
 
 	CMemFile data(packet, size);
-	if (size <= 16){
+	if (size <= 16) {
 		CAICHHashSet::ClientAICHRequestFailed(this);
 		return;
 	}
 
 	CMD4Hash hash = data.ReadHash();
-	CPartFile* pPartFile = theApp->downloadqueue->GetFileByID(hash);
+	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.GetClient() == 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, everything seems to be fine
-				AddDebugLogLineN(logAICHTransfer, "AICH Packet Answer: Succeeded to read and validate received recoverydata");
+		if ((pPartFile->GetAICHHashset()->GetStatus() == AICH_TRUSTED ||
+			    pPartFile->GetAICHHashset()->GetStatus() == AICH_VERIFIED) &&
+			ahMasterHash == pPartFile->GetAICHHashset()->GetMasterHash()) {
+			if (pPartFile->GetAICHHashset()->ReadRecoveryData(
+				    request.m_nPart * PARTSIZE, &data)) {
+				AddDebugLogLineN(logAICHTransfer,
+					"AICH Packet Answer: Succeeded to read and validate received "
+					"recoverydata");
 				CAICHHashSet::RemoveClientAICHRequest(this);
 				pPartFile->AICHRecoveryDataAvailable(request.m_nPart);
 				return;
 			} else {
-				AddDebugLogLineN(logAICHTransfer, "AICH Packet Answer: Succeeded to read and validate received recoverydata");
+				AddDebugLogLineN(logAICHTransfer,
+					"AICH Packet Answer: Failed to read and validate received "
+					"recoverydata");
 			}
 		} else {
-			AddDebugLogLineN( logAICHTransfer, "AICH Packet Answer: Masterhash differs from packethash or hashset has no trusted Masterhash" );
+			AddDebugLogLineN(logAICHTransfer,
+				"AICH Packet Answer: Masterhash differs from packethash or hashset has no "
+				"trusted Masterhash");
 		}
 	} else {
-		AddDebugLogLineN( logAICHTransfer, "AICH Packet Answer: requested values differ from values in packet" );
+		AddDebugLogLineN(
+			logAICHTransfer, "AICH Packet Answer: requested values differ from values in packet");
 	}
 
 	CAICHHashSet::ClientAICHRequestFailed(this);
 }
 
-
-void CUpDownClient::ProcessAICHRequest(const uint8_t* packet, uint32 size)
+void CUpDownClient::ProcessAICHRequest(const uint8_t *packet, uint32 size)
 {
 	if (size != 16 + 2 + CAICHHash::GetHashSize()) {
 		throw wxString("Received AICH Request Packet with wrong size");
@@ -1674,61 +1666,89 @@
 	CMD4Hash hash = data.ReadHash();
 	uint16 nPart = data.ReadUInt16();
 	CAICHHash ahMasterHash(&data);
-	CKnownFile* pKnownFile = theApp->sharedfiles->GetFileByID(hash);
-	if (pKnownFile != NULL){
-		if (pKnownFile->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE && pKnownFile->GetAICHHashset()->HasValidMasterHash()
-			&& pKnownFile->GetAICHHashset()->GetMasterHash() == ahMasterHash && pKnownFile->GetPartCount() > nPart
-			&& pKnownFile->GetFileSize() > EMBLOCKSIZE && pKnownFile->GetFileSize() - PARTSIZE*nPart > EMBLOCKSIZE)
-		{
+	CKnownFile *pKnownFile = theApp->sharedfiles->GetFileByID(hash);
+	if (pKnownFile != NULL) {
+		if (pKnownFile->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE &&
+			pKnownFile->GetAICHHashset()->HasValidMasterHash() &&
+			pKnownFile->GetAICHHashset()->GetMasterHash() == ahMasterHash &&
+			pKnownFile->GetPartCount() > nPart && pKnownFile->GetFileSize() > EMBLOCKSIZE &&
+			pKnownFile->GetFileSize() - PARTSIZE * nPart > EMBLOCKSIZE) {
 			CMemFile fileResponse;
 			fileResponse.WriteHash(pKnownFile->GetFileHash());
 			fileResponse.WriteUInt16(nPart);
 			pKnownFile->GetAICHHashset()->GetMasterHash().Write(&fileResponse);
-			if (pKnownFile->GetAICHHashset()->CreatePartRecoveryData(nPart*PARTSIZE, &fileResponse)){
+			if (pKnownFile->GetAICHHashset()->CreatePartRecoveryData(
+				    nPart * PARTSIZE, &fileResponse)) {
 				AddDebugLogLineN(logAICHTransfer,
-					CFormat("AICH Packet Request: Successfully created and send recoverydata for '%s' to %s")
-						% pKnownFile->GetFileName() % GetClientFullInfo());
+					CFormat("AICH Packet Request: Successfully created and send "
+						"recoverydata for '%s' to %s") %
+						pKnownFile->GetFileName() % GetClientFullInfo());
 
-				CPacket* packAnswer = new CPacket(fileResponse, OP_EMULEPROT, OP_AICHANSWER);
+				CPacket *packAnswer = new CPacket(fileResponse, OP_EMULEPROT, OP_AICHANSWER);
 				theStats::AddUpOverheadOther(packAnswer->GetPacketSize());
-				AddDebugLogLineN(logLocalClient, "Local Client: OP_AICHANSWER to" + GetFullIP());
+				AddDebugLogLineN(
+					logLocalClient, "Local Client: OP_AICHANSWER to" + GetFullIP());
 				SafeSendPacket(packAnswer);
 				return;
 			} else {
 				AddDebugLogLineN(logAICHTransfer,
-					CFormat("AICH Packet Request: Failed to create recoverydata for '%s' to %s")
-						% pKnownFile->GetFileName() % GetClientFullInfo());
+					CFormat("AICH Packet Request: Failed to create recoverydata for '%s' "
+						"to %s") %
+						pKnownFile->GetFileName() % GetClientFullInfo());
 			}
 		} else {
 			AddDebugLogLineN(logAICHTransfer,
-				CFormat("AICH Packet Request: Failed to create recoverydata - Hashset not ready or requested Hash differs from Masterhash for '%s' to %s")
-					% pKnownFile->GetFileName() % GetClientFullInfo());
+				CFormat("AICH Packet Request: Failed to create recoverydata - Hashset not "
+					"ready or requested Hash differs from Masterhash for '%s' to %s") %
+					pKnownFile->GetFileName() % GetClientFullInfo());
 		}
 	} else {
-		AddDebugLogLineN( logAICHTransfer, "AICH Packet Request: Failed to find requested shared file - " + GetClientFullInfo() );
+		AddDebugLogLineN(logAICHTransfer,
+			"AICH Packet Request: Failed to find requested shared file - " + GetClientFullInfo());
 	}
 
-	CPacket* packAnswer = new CPacket(OP_AICHANSWER, 16, OP_EMULEPROT);
+	CPacket *packAnswer = new CPacket(OP_AICHANSWER, 16, OP_EMULEPROT);
 	packAnswer->Copy16ToDataBuffer(hash.GetHash());
 	theStats::AddUpOverheadOther(packAnswer->GetPacketSize());
 	AddDebugLogLineN(logLocalClient, "Local Client: OP_AICHANSWER to" + GetFullIP());
 	SafeSendPacket(packAnswer);
 }
 
-void CUpDownClient::ProcessAICHFileHash(CMemFile* data, const CPartFile* file){
-	CPartFile* pPartFile;
-	if (file == NULL){
+void CUpDownClient::ProcessAICHFileHash(CMemFile *data, const CPartFile *file)
+{
+	CPartFile *pPartFile;
+	if (file == NULL) {
 		pPartFile = theApp->downloadqueue->GetFileByID(data->ReadHash());
 	} else {
-		pPartFile = const_cast<CPartFile*>(file);
+		pPartFile = const_cast<CPartFile *>(file);
 	}
 	CAICHHash ahMasterHash(data);
 
-	if(pPartFile != NULL && pPartFile == GetRequestFile()){
+	if (pPartFile != NULL && pPartFile == GetRequestFile()) {
 		SetReqFileAICHHash(new CAICHHash(ahMasterHash));
 		pPartFile->GetAICHHashset()->UntrustedHashReceived(ahMasterHash, GetConnectIP());
 	} else {
-		AddDebugLogLineN( logAICHTransfer, "ProcessAICHFileHash(): PartFile not found or Partfile differs from requested file, " + GetClientFullInfo() );
+		AddDebugLogLineN(logAICHTransfer,
+			"ProcessAICHFileHash(): PartFile not found or Partfile differs from requested "
+			"file, " +
+				GetClientFullInfo());
 	}
 }
 // File_checked_for_headers
+
+bool CUpDownClient::HasUsefulBlocksFor(CUpDownClient *other) const
+{
+	// Check part-level availability, not block-level.
+	// A block fits within a single part (180 KB << 9.28 MB).
+	for (const Requested_Block_Struct *block : m_DownloadBlocks_list) {
+		if (other->IsPartAvailable(block->StartOffset / PARTSIZE)) {
+			return true;
+		}
+	}
+	for (const Pending_Block_Struct *pblock : m_PendingBlocks_list) {
+		if (other->IsPartAvailable(pblock->block->StartOffset / PARTSIZE)) {
+			return true;
+		}
+	}
+	return false;
+}

amule-3.0.1.tar.gz/src/DownloadListCtrl.cpp -> amule-3.1.0.tar.gz/src/DownloadListCtrl.cpp Changed

@@ -23,626 +23,429 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "DownloadListCtrl.h"	// Interface declarations
+#include "DownloadListCtrl.h" // Interface declarations
 
-#include <protocol/ed2k/ClientSoftware.h>
+#include <common/Format.h> // Needed for CFormat
 #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 "CommentDialogLst.h"	// Needed for CCommentDialogLst
-#include "DataToText.h"		// Needed for PriorityToStr
+#include "amule.h"            // Needed for theApp
+#include "amuleDlg.h"         // Needed for CamuleDlg
+#include "CommentDialogLst.h" // Needed for CCommentDialogLst
+#include "DataToText.h"       // Needed for PriorityToStr
 #include "DownloadQueue.h"
-#include "FileDetailDialog.h"	// Needed for CFileDetailDialog
-#include "GuiEvents.h"		// Needed for CoreNotify_*
+#include "FileDetailDialog.h" // Needed for CFileDetailDialog
+#include "FileLaunch.h"       // Needed for FileLaunch::Open / Reveal
+#include "GuiEvents.h"        // Needed for CoreNotify_*, Notify_DownloadCtrlDoItemSelectionChanged
 #include "Logger.h"
-#include "muuli_wdr.h"		// Needed for ID_DLOADLIST
-#include "PartFile.h"		// Needed for CPartFile
+#include "MuleBarRenderer.h" // Needed for CBarFillSpec, CBarFillSpan, CMuleBarRenderer
+#include "PartBarLegendUI.h" // Needed for partbar::SourceAvailabilityColour, ToMuleColour
+#include "PartFile.h"        // Needed for CPartFile
 #include "Preferences.h"
-#include "SharedFileList.h"	// Needed for CSharedFileList
-#include "TerminationProcess.h"	// Needed for CTerminationProcess
-#include "TransferWnd.h"
+#include "SharedFileList.h" // Needed for CSharedFileList
 #include "SourceListCtrl.h"
+#include "Statistics.h" // Needed for theStats (free space), FREE_SPACE_UNKNOWN
+#include "TransferWnd.h"
+#include "muuli_wdr.h"      // Needed for ID_DLOADLIST
+#include "OtherFunctions.h" // Needed for FormatLocalDateTime
 
-class CPartFile;
-
-
-struct FileCtrlItem_Struct
+namespace
 {
-	FileCtrlItem_Struct()
-		: dwUpdated(0),
-		  status(NULL),
-		  m_fileValue(NULL)
-	{ }
+// Colours for the chunk/gap bar; matches every value DrawFileStatusBar used.
+const CMuleColour crHave(104, 104, 104);
+const CMuleColour crFlatHave(0, 0, 0);
 
-	~FileCtrlItem_Struct() {
-		delete status;
-	}
+const CMuleColour crPending(255, 208, 0);
+const CMuleColour crFlatPending(255, 255, 100);
 
-	CPartFile* GetFile() const {
-		return m_fileValue;
-	}
+const CMuleColour crProgress(0, 224, 0);
+const CMuleColour crFlatProgress(0, 150, 0);
 
-	void SetContents(CPartFile* file) {
-		m_fileValue = file;
-	}
+const CMuleColour crMissing(255, 0, 0);
 
-	uint64		dwUpdated;
-	wxBitmap*	status;
+/**
+ * Draws the Progress column: the chunk/gap bar, via the base class, plus two things Shared Files'
+ * bar never needed -- a completed-progress overlay strip and a live percentage label. Neither
+ * CGenericClientListCtrl bar draws text or a strip, so this stays a Downloads-only subclass rather
+ * than growing CBarFillSpec for everyone.
+ */
+class CDownloadBarRenderer : public CMuleBarRenderer
+{
+public:
+	bool Render(wxRect cell, wxDC *dc, int state) override
+	{
+		// Gates the whole cell -- bar, strip and percent text alike -- exactly
+		// as the pre-port ColumnProgress case did.
+		if (!thePrefs::ShowProgBar()) {
+			return true;
+		}
+		CMuleBarRenderer::Render(cell, dc, state);
+		DrawOverlay(cell, dc);
+		return true;
+	}
 
 private:
-	CPartFile*			m_fileValue;
-};
-
-#define m_ImageList theApp->amuledlg->m_imagelist
-
-enum ColumnEnum {
-	ColumnPart = 0,
-	ColumnFileName,
-	ColumnSize,
-	ColumnTransferred,
-	ColumnCompleted,
-	ColumnSpeed,
-	ColumnProgress,
-	ColumnSources,
-	ColumnPriority,
-	ColumnStatus,
-	ColumnTimeRemaining,
-	ColumnLastSeenComplete,
-	ColumnLastReception,
-	ColumnNumberOfColumns
-};
+	void DrawOverlay(wxRect cell, wxDC *dc) const
+	{
+		CPartFile *file = reinterpret_cast<CPartFile *>(GetSpec().GetIdentity());
+		if (!file || file->GetFileSize() == 0) {
+			return;
+		}
 
-wxBEGIN_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)
+		const bool bFlat = thePrefs::UseFlatBar();
+		const wxRect barRect = InsetForBar(cell, bFlat);
+
+		// The completed-progress strip only makes sense for a file still assembling from
+		// gaps and pending blocks: DrawFileStatusBar's completed and hashing branches
+		// already fill the bar solid, and while hashing that fill tracks hashed bytes
+		// rather than completed ones.
+		const bool showStrip = !file->IsCompleted() && file->GetStatus() != PS_COMPLETING &&
+				       file->GetHashingProgress() == 0;
+		if (showStrip && barRect.GetWidth() > 0) {
+			const int width = static_cast<int>((static_cast<double>(barRect.GetWidth()) /
+								   static_cast<double>(file->GetFileSize())) *
+							   static_cast<double>(file->GetCompletedSize()));
+			if (bFlat) {
+				// Deliberately no outline: master drew this strip into a fresh
+				// wxMemoryDC, whose default black pen gave it one incidentally.
+				// Transparent is the deterministic choice; wxBLACK_PEN would
+				// reproduce the old look.
+				dc->SetPen(*wxTRANSPARENT_PEN);
+				dc->SetBrush(crFlatProgress.GetBrush());
+				dc->DrawRectangle(barRect.x, barRect.y, width, 3);
+			} else {
+				dc->SetPen(*wxBLACK_PEN);
+				dc->DrawLine(barRect.x, barRect.y + 0, barRect.x + width, barRect.y + 0);
+				dc->DrawLine(barRect.x, barRect.y + 2, barRect.x + width, barRect.y + 2);
+				dc->SetPen(*(wxThePenList->FindOrCreatePen(crProgress, 1, wxPENSTYLE_SOLID)));
+				dc->DrawLine(barRect.x, barRect.y + 1, barRect.x + width, barRect.y + 1);
+			}
+		}
 
-	EVT_CHAR( CDownloadListCtrl::OnKeyPressed )
+		if (!thePrefs::ShowPercent()) {
+			return;
+		}
+		const uint16 hashingProgress = file->GetHashingProgress();
+		double percent = hashingProgress == 0 ? file->GetPercentCompleted()
+						      : 100.0 * hashingProgress * PARTSIZE /
+								static_cast<double>(file->GetFileSize());
+		if (file->IsCompleted()) {
+			percent = 100.0;
+		} else if (percent > 99.9) {
+			percent = 99.9;
+		}
+		const wxString buffer = CFormat("%.1f%%") % percent;
+		const int middlex = (2 * cell.GetX() + cell.GetWidth()) >> 1;
+		const int middley = (2 * cell.GetY() + cell.GetHeight()) >> 1;
+		wxCoord textwidth;
+		wxCoord textheight;
+		dc->GetTextExtent(buffer, &textwidth, &textheight);
+		const wxColour oldColour = dc->GetTextForeground();
+		// Ordinary progress bar: white percentage. Hashing (green/yellow
+		// bar): black percentage.
+		dc->SetTextForeground(hashingProgress == 0 ? *wxWHITE : *wxBLACK);
+		dc->DrawText(buffer, middlex - (textwidth >> 1), middley - (textheight >> 1));
+		dc->SetTextForeground(oldColour);
+	}
+};
+} // namespace
 
-	EVT_MENU( MP_CANCEL,			CDownloadListCtrl::OnCancelFile )
+wxBEGIN_EVENT_TABLE(CDownloadListCtrl, CMuleVirtualDataViewCtrl)
+	EVT_DATAVIEW_ITEM_ACTIVATED(wxID_ANY, CDownloadListCtrl::OnItemActivated)
+	EVT_DATAVIEW_ITEM_CONTEXT_MENU(wxID_ANY, CDownloadListCtrl::OnItemRightClicked)
+	EVT_DATAVIEW_SELECTION_CHANGED(wxID_ANY, CDownloadListCtrl::OnSelectionChanged)
 
-	EVT_MENU( MP_PAUSE,			CDownloadListCtrl::OnSetStatus )
-	EVT_MENU( MP_STOP,			CDownloadListCtrl::OnSetStatus )
-	EVT_MENU( MP_RESUME,			CDownloadListCtrl::OnSetStatus )
+	EVT_MENU(MP_CANCEL, CDownloadListCtrl::OnCancelFile)
 
-	EVT_MENU( MP_PRIOLOW,			CDownloadListCtrl::OnSetPriority )
-	EVT_MENU( MP_PRIONORMAL,		CDownloadListCtrl::OnSetPriority )
-	EVT_MENU( MP_PRIOHIGH,			CDownloadListCtrl::OnSetPriority )
-	EVT_MENU( MP_PRIOAUTO,			CDownloadListCtrl::OnSetPriority )
+	EVT_MENU(MP_PAUSE, CDownloadListCtrl::OnSetStatus)
+	EVT_MENU(MP_STOP, CDownloadListCtrl::OnSetStatus)
+	EVT_MENU(MP_RESUME, CDownloadListCtrl::OnSetStatus)
 
-	EVT_MENU( MP_SWAP_A4AF_TO_THIS,		CDownloadListCtrl::OnSwapSources )
-	EVT_MENU( MP_SWAP_A4AF_TO_THIS_AUTO,	CDownloadListCtrl::OnSwapSources )
-	EVT_MENU( MP_SWAP_A4AF_TO_ANY_OTHER,	CDownloadListCtrl::OnSwapSources )
+	EVT_MENU(MP_PRIOLOW, CDownloadListCtrl::OnSetPriority)
+	EVT_MENU(MP_PRIONORMAL, CDownloadListCtrl::OnSetPriority)
+	EVT_MENU(MP_PRIOHIGH, CDownloadListCtrl::OnSetPriority)
+	EVT_MENU(MP_PRIOAUTO, CDownloadListCtrl::OnSetPriority)
 
-	EVT_MENU_RANGE( MP_ASSIGNCAT, MP_ASSIGNCAT + 99, CDownloadListCtrl::OnSetCategory )
+	EVT_MENU(MP_SWAP_A4AF_TO_THIS, CDownloadListCtrl::OnSwapSources)
+	EVT_MENU(MP_SWAP_A4AF_TO_THIS_AUTO, CDownloadListCtrl::OnSwapSources)
+	EVT_MENU(MP_SWAP_A4AF_TO_ANY_OTHER, CDownloadListCtrl::OnSwapSources)
 
-	EVT_MENU( MP_CLEARCOMPLETED,		CDownloadListCtrl::OnClearCompleted )
+	EVT_MENU_RANGE(MP_ASSIGNCAT, MP_ASSIGNCAT + 99, CDownloadListCtrl::OnSetCategory)
 
-	EVT_MENU( MP_GETMAGNETLINK,		CDownloadListCtrl::OnGetLink )
-	EVT_MENU( MP_GETED2KLINK,		CDownloadListCtrl::OnGetLink )
+	EVT_MENU(MP_CLEARCOMPLETED, CDownloadListCtrl::OnClearCompleted)
 
-	EVT_MENU( MP_METINFO,			CDownloadListCtrl::OnViewFileInfo )
-	EVT_MENU( MP_VIEW,			CDownloadListCtrl::OnPreviewFile )
-	EVT_MENU( MP_VIEWFILECOMMENTS,		CDownloadListCtrl::OnViewFileComments )
+	EVT_MENU(MP_GETMAGNETLINK, CDownloadListCtrl::OnGetLink)
+	EVT_MENU(MP_GETED2KLINK, CDownloadListCtrl::OnGetLink)
+	EVT_MENU(MP_RAZORSTATS, CDownloadListCtrl::OnRazorStatsCheck)
 
-	EVT_MENU( MP_WS,			CDownloadListCtrl::OnGetFeedback )
+	EVT_MENU(MP_METINFO, CDownloadListCtrl::OnViewFileInfo)
+	EVT_MENU(MP_VIEW, CDownloadListCtrl::OnPreviewFile)
+	EVT_MENU(MP_SHOWINFOLDER, CDownloadListCtrl::OnShowInFolder)
+	EVT_MENU(MP_VIEWFILECOMMENTS, CDownloadListCtrl::OnViewFileComments)
 
+	EVT_MENU(MP_WS, CDownloadListCtrl::OnGetFeedback)
 wxEND_EVENT_TABLE()
 
-//! This listtype is used when gathering the selected items.
-typedef std::list<FileCtrlItem_Struct*>	ItemList;
-
-CDownloadListCtrl::CDownloadListCtrl(
-	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 )
+CDownloadListCtrl::CDownloadListCtrl(wxWindow *parent,
+	wxWindowID winid,
+	const wxPoint &pos,
+	const wxSize &size,
+	long style,
+	const wxString &name)
+: CMuleVirtualDataViewCtrl(parent, winid, pos, size, style, name)
 {
-	// Setting the sorter function.
-	SetSortFunc( SortProc );
-
-	// Set the table-name (for loading and saving preferences).
-	SetTableName( "Download" );
-
-	m_menu = NULL;
-
-	m_hilightBrush  = CMuleColour(wxSYS_COLOUR_HIGHLIGHT)/*.Blend(125)*/.GetBrush();
-
-	m_hilightUnfocusBrush = CMuleColour(CMuleColour::GetUnfocusedHighlight()).GetBrush();
-
-	InsertColumn( ColumnPart,			_("Part"),					wxLIST_FORMAT_LEFT,  30, "a" );
-	InsertColumn( ColumnFileName,		_("File Name"),				wxLIST_FORMAT_LEFT, 260, "N" );
-	InsertColumn( ColumnSize,			_("Size"),					wxLIST_FORMAT_LEFT,  60, "Z" );
-	InsertColumn( ColumnTransferred,	_("Transferred"),			wxLIST_FORMAT_LEFT,  65, "T" );
-	InsertColumn( ColumnCompleted,		_("Completed"),				wxLIST_FORMAT_LEFT,  65, "C" );
-	InsertColumn( ColumnSpeed,			_("Speed"),					wxLIST_FORMAT_LEFT,  65, "S" );
-	InsertColumn( ColumnProgress,		_("Progress"),				wxLIST_FORMAT_LEFT, 170, "P" );
-	InsertColumn( ColumnSources,		_("Sources"),				wxLIST_FORMAT_LEFT,  50, "u" );
-	InsertColumn( ColumnPriority,		_("Priority"),				wxLIST_FORMAT_LEFT,  55, "p" );
-	InsertColumn( ColumnStatus,			_("Status"),				wxLIST_FORMAT_LEFT,  70, "s" );
-	InsertColumn( ColumnTimeRemaining,  _("Time Remaining"),		wxLIST_FORMAT_LEFT, 110, "r" );
-	InsertColumn( ColumnLastSeenComplete, _("Last Seen Complete"),	wxLIST_FORMAT_LEFT, 220, "c" );
-	InsertColumn( ColumnLastReception,	_("Last Reception"),		wxLIST_FORMAT_LEFT, 220, "R" );
-
-	m_category = 0;
-	m_filecount = 0;
-	m_ItemSelectionChangePending = false;
-	LoadSettings();
-
-	//m_ready = true;
+	const int flags = wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE;
+	AddTextColumn(_("Part"), COLUMN_DL_PART, "a", 30, wxALIGN_LEFT, flags);
+	AddIconTextColumn(_("File Name"), COLUMN_DL_NAME, "N", 260, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Size"), COLUMN_DL_SIZE, "Z", 60, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Transferred"), COLUMN_DL_TRANSFERRED, "T", 65, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Completed"), COLUMN_DL_COMPLETED, "C", 65, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Speed"), COLUMN_DL_SPEED, "S", 65, wxALIGN_LEFT, flags);
+	AddBarColumn(_("Progress"), COLUMN_DL_PROGRESS, "P", 170, flags, new CDownloadBarRenderer());
+	AddTextColumn(_("Sources"), COLUMN_DL_SOURCES, "u", 50, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Priority"), COLUMN_DL_PRIORITY, "p", 55, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Status"), COLUMN_DL_STATUS, "s", 70, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Time Remaining"), COLUMN_DL_TIMEREMAINING, "r", 110, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Last Seen Complete"), COLUMN_DL_LASTSEENCOMPLETE, "c", 220, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Last Reception"), COLUMN_DL_LASTRECEPTION, "R", 220, wxALIGN_LEFT, flags);
+
+	AppendSpacerColumn(COLUMN_DL_SPACER);
+	AssociateVirtualModel();
+
+	// Default sort is by name, ascending; LoadColumnSettings() replaces it
+	// when the config has something saved.
+	ApplySorting(COLUMN_DL_NAME, 0);
+
+	m_columnStore.SetTableName("Download");
+	LoadColumnSettings();
+	InitColumnState();
 }
 
-// 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 "N,Z,T,C,S,P,u,p,s,r,c,R";
 }
 
-CDownloadListCtrl::~CDownloadListCtrl()
+wxString CDownloadListCtrl::GetRowLabel(const wxDataViewItem &item) const
 {
-	while ( !m_ListItems.empty() ) {
-		delete m_ListItems.begin()->second;
-		m_ListItems.erase( m_ListItems.begin() );
+	// Column 0 is the part number here, not the name -- unlike every other ported list, so the
+	// base's "column 0 is the label" default would make type-to-select match part numbers.
+	const wxUIntPtr data = ItemAt(GetModelRow(item));
+	if (!data) {
+		return wxEmptyString;
 	}
+	return GetItemColumnText(data, COLUMN_DL_NAME);
 }
 
-void CDownloadListCtrl::AddFile( CPartFile* file )
-{
-	wxASSERT( file );
-
-	// Avoid duplicate entries of files
-	if ( m_ListItems.find( file ) == m_ListItems.end() ) {
-		FileCtrlItem_Struct* newitem = new FileCtrlItem_Struct;
-		newitem->SetContents(file);
+CDownloadListCtrl::~CDownloadListCtrl() = default;
 
-		m_ListItems.insert( ListItemsPair( file, newitem ) );
+void CDownloadListCtrl::AddFile(CPartFile *file, bool deferView)
+{
+	wxASSERT(file);
+
+	if (m_files.insert(file).second) {
+		// During a bulk load (remote GUI first sync) the caller defers the display: showing
+		// and above all re-sorting the list on every one of thousands of files is O(n^2)
+		// and freezes the GUI (issue #414). ShowFileList() shows and sorts the whole list
+		// once afterwards.
+		if (deferView) {
+			return;
+		}
 
-		// Check if the new file is visible in the current category
-		if ( file->CheckShowItemInGivenCat( m_category ) ) {
-			ShowFile( file, true );
+		if (IsVisibleInCat(file, m_category)) {
+			ShowFile(file, true);
 			if (file->IsCompleted()) {
 				CastByID(ID_BTNCLRCOMPL, GetParent(), wxButton)->Enable(true);
 			}
-			SortList();
+			// During a batch update (a reconnect resync, issue #444) the row is still
+			// appended, but the per-item sort is deferred to EndBatchUpdate()'s single
+			// SortList(), keeping a large add O(n log n).
+			if (!m_batchUpdate) {
+				SortList();
+			}
 		}
 	}
 }
 
-void CDownloadListCtrl::RemoveFile( CPartFile* file )
+void CDownloadListCtrl::BeginBatchUpdate()
 {
-	wxASSERT( file );
-
-	// Ensure that any list-entries are removed
-	ShowFile( file, false );
-
-	// Find the associated list-item
-	ListItems::iterator it = m_ListItems.find( file );
-
-	if ( it != m_ListItems.end() ) {
-		delete it->second;
-
-		m_ListItems.erase( it );
-	}
+	// Coalesce a burst of AddFile()/UpdateItem() calls into a single repaint and suppress the
+	// per-item SortList; EndBatchUpdate() sorts once. Used when reconciling the list against a
+	// fresh snapshot after a reconnect (issue #444).
+	Freeze();
+	// Same reason as CSharedFilesCtrl::BeginBatchUpdate(): rows land unsorted and
+	// EndBatchUpdate() sorts once, while a live sort key makes macOS re-compare the whole list
+	// on every inserted row. See SuspendHeaderSort().
+	SuspendHeaderSort();
+	m_batchUpdate = true;
 }
 
-
-void CDownloadListCtrl::UpdateItem(const void* toupdate)
+void CDownloadListCtrl::EndBatchUpdate(bool doSort)
 {
-	// Retrieve all entries matching the source
-	ListIteratorPair rangeIt = m_ListItems.equal_range( toupdate );
-
-	// Visible lines, default to all because not all platforms
-	// support the GetVisibleLines function
-	long first = 0, last = GetItemCount();
-
-#ifndef __WINDOWS__
-	// Get visible lines if we need them
-	if ( rangeIt.first != rangeIt.second ) {
-		GetVisibleLines( &first, &last );
-	}
-#endif
-
-	for ( ListItems::iterator it = rangeIt.first; it != rangeIt.second; ++it ) {
-		FileCtrlItem_Struct* item = it->second;
-
-		long index = FindItem( -1, reinterpret_cast<wxUIntPtr>(item) );
-
-		// Determine if the file should be shown in the current category
-
-		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 );
-		}
-
-		if (file->IsCompleted() && show) {
-			CastByID(ID_BTNCLRCOMPL, GetParent(), wxButton)->Enable(true);
-		}
-	}
-}
-
-
-void CDownloadListCtrl::ShowFile( CPartFile* file, bool show )
-{
-	wxASSERT( file );
-
-	ListItems::iterator it = m_ListItems.find( file );
-
-	if ( it != m_ListItems.end() ) {
-		FileCtrlItem_Struct* item = it->second;
-
-		if ( show ) {
-			// Check if the file is already being displayed
-			long index = FindItem( -1, reinterpret_cast<wxUIntPtr>(item) );
-			if ( index == -1 ) {
-				long newitem = InsertItem( GetItemCount(), "" );
-
-				SetItemPtrData( newitem, reinterpret_cast<wxUIntPtr>(item) );
-
-				wxListItem myitem;
-				myitem.m_itemId = newitem;
-				myitem.SetBackgroundColour( GetBackgroundColour() );
-
-				SetItem(myitem);
-
-				RefreshItem( newitem );
-
-				ShowFilesCount( 1 );
-			}
-		} else {
-			// Try to find the file and remove it
-			long index = FindItem( -1, reinterpret_cast<wxUIntPtr>(item) );
-			if ( index > -1 ) {
-				DeleteItem( index );
-				ShowFilesCount( -1 );
-			}
-		}
+	m_batchUpdate = false;
+	// A poll that only updated rows in place (no new files) leaves the sort
+	// order untouched, so skip the O(n log n) SortList entirely (issue #615).
+	if (doSort) {
+		SortList();
 	}
+	RestoreHeaderSort();
+	Thaw();
 }
 
-void CDownloadListCtrl::ChangeCategory( int newCategory )
+void CDownloadListCtrl::RebuildVisibleList()
 {
+	// Batch counterpart to AddFile()'s per-item path: drop the visible rows and re-append every
+	// model item that passes the current category + text filter, then sort once. Mirrors
+	// CSharedFilesCtrl::ShowFileList().
 	Freeze();
 
-	bool hasCompletedDownloads = false;
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
 
-	// 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) {
+	ClearItemData();
 
-		CPartFile* file =  it->second->GetFile();
-
-		bool curVisibility = file->CheckShowItemInGivenCat( m_category );
-		bool newVisibility = file->CheckShowItemInGivenCat( newCategory );
+	bool hasCompletedDownloads = false;
+	int shown = 0;
+	uint64 totalSize = 0;
 
-		if (newVisibility && file->IsCompleted()) {
-			hasCompletedDownloads = true;
+	for (CPartFile *file : m_files) {
+		if (!IsVisibleInCat(file, m_category)) {
+			continue;
 		}
-
-		// 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 );
+		AppendItemData(reinterpret_cast<wxUIntPtr>(file));
+		++shown;
+		totalSize += file->GetFileSize();
+		if (file->IsCompleted()) {
+			hasCompletedDownloads = true;
 		}
 	}
 
+	FinishBulkLoad();
+	SetSelectedItemData(selected);
+
 	CastByID(ID_BTNCLRCOMPL, GetParent(), wxButton)->Enable(hasCompletedDownloads);
+	SetFilesCount(shown);
+	SetTotalSize(totalSize);
 
 	Thaw();
-
-	m_category = newCategory;
 }
 
-
-uint8 CDownloadListCtrl::GetCategory() const
+void CDownloadListCtrl::ShowFileList()
 {
-	return m_category;
+	// Used after a deferred bulk load (remote GUI first sync), where the
+	// model is populated but no rows are shown yet.
+	RebuildVisibleList();
 }
 
-
-/**
- * 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.
- */
-static ItemList GetSelectedItems( CDownloadListCtrl* list)
+void CDownloadListCtrl::RemoveFile(CPartFile *file)
 {
-	ItemList results;
-
-	long index = list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-
-	while ( index > -1 ) {
-		FileCtrlItem_Struct* item = reinterpret_cast<FileCtrlItem_Struct*>(list->GetItemData( index ));
-		results.push_back( item );
-
-		index = list->GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	}
-
-	return results;
-}
+	wxASSERT(file);
 
-
-void CDownloadListCtrl::OnCancelFile(wxCommandEvent& WXUNUSED(event))
-{
-	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_WAITING_FOR_HASH:
-				case PS_HASHING:
-				case PS_COMPLETING:
-				case PS_COMPLETE:
-					files.erase(it1);
-					break;
-			}
-		}
-	}
-	if (!files.empty()) {
-		wxString question;
-		if (files.size() == 1) {
-			question = _("Are you sure that you wish to delete the selected file?");
-		} else {
-			question = _("Are you sure that you wish to delete the selected files?");
-		}
-		if (wxMessageBox( question, _("Cancel"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this) == wxYES) {
-			for (ItemList::iterator it = files.begin(); it != files.end(); ++it) {
-				CPartFile* file = (*it)->GetFile();
-				if (file) {
-					CoreNotify_PartFile_Delete(file);
-				}
-			}
-		}
-	}
+	// Order matters: ShowFile() early-returns once `file` is no longer in m_files, so the erase
+	// has to come after it -- swapped, the row would stay in the model holding a pointer the
+	// caller is about to free.
+	ShowFile(file, false);
+	m_files.erase(file);
 }
 
-
-void CDownloadListCtrl::OnSetPriority( wxCommandEvent& event )
+void CDownloadListCtrl::UpdateItem(const void *toupdate)
 {
-	int priority = 0;
-	switch ( event.GetId() ) {
-		case MP_PRIOLOW:	priority = PR_LOW;	break;
-		case MP_PRIONORMAL:	priority = PR_NORMAL;	break;
-		case MP_PRIOHIGH:	priority = PR_HIGH;	break;
-		case MP_PRIOAUTO:	priority = PR_AUTO;	break;
-		default:
-			wxFAIL;
+	CPartFile *file = const_cast<CPartFile *>(static_cast<const CPartFile *>(toupdate));
+	if (m_files.find(file) == m_files.end()) {
+		return;
 	}
 
-	ItemList files = ::GetSelectedItems( this );
-
-	for ( ItemList::iterator it = files.begin(); it != files.end(); ++it ) {
-		CPartFile* file = (*it)->GetFile();
+	const wxUIntPtr data = reinterpret_cast<wxUIntPtr>(file);
+	const bool show = IsVisibleInCat(file, m_category);
 
-		if ( priority == PR_AUTO ) {
-			CoreNotify_PartFile_PrioAuto( file, true );
+	if (HasItemData(data)) {
+		if (show) {
+			// Repaints the row and, if sorted by a live column, schedules the
+			// throttled+idle-gated re-sort.
+			RefreshItemData(data);
 		} else {
-			CoreNotify_PartFile_PrioAuto( file, false );
-
-			CoreNotify_PartFile_PrioSet( file, priority, true );
+			// No longer shown in the current category.
+			ShowFile(file, false);
 		}
+	} else if (show) {
+		// Was hidden, but its new status means it belongs in the current
+		// category now.
+		ShowFile(file, true);
 	}
-}
-
-
-void CDownloadListCtrl::OnSwapSources( wxCommandEvent& event )
-{
-	ItemList files = ::GetSelectedItems( this );
-
-	for ( ItemList::iterator it = files.begin(); it != files.end(); ++it ) {
-		CPartFile* file = (*it)->GetFile();
-
-		switch ( event.GetId() ) {
-			case MP_SWAP_A4AF_TO_THIS:
-				CoreNotify_PartFile_Swap_A4AF( file );
-				break;
-
-			case MP_SWAP_A4AF_TO_THIS_AUTO:
-				CoreNotify_PartFile_Swap_A4AF_Auto( file );
-				break;
-
-			case MP_SWAP_A4AF_TO_ANY_OTHER:
-				CoreNotify_PartFile_Swap_A4AF_Others( file );
-				break;
-		}
-	}
-}
-
-
-void CDownloadListCtrl::OnSetCategory( wxCommandEvent& event )
-{
-	ItemList files = ::GetSelectedItems( this );
 
-	for ( ItemList::iterator it = files.begin(); it != files.end(); ++it ) {
-		CoreNotify_PartFile_SetCat( (*it)->GetFile(), event.GetId() - MP_ASSIGNCAT );
-		ShowFile((*it)->GetFile(), false);
+	if (file->IsCompleted() && show) {
+		CastByID(ID_BTNCLRCOMPL, GetParent(), wxButton)->Enable(true);
 	}
-	wxListEvent ev;
-	OnItemSelectionChanged(ev);	// clear clients that may have been shown
-
-	ChangeCategory( m_category );	// This only updates the visibility of the clear completed button
-	theApp->amuledlg->m_transferwnd->UpdateCatTabTitles();
 }
 
-
-void CDownloadListCtrl::OnSetStatus( wxCommandEvent& event )
+void CDownloadListCtrl::ShowFile(CPartFile *file, bool show)
 {
-	ItemList files = ::GetSelectedItems( this );
-
-	for ( ItemList::iterator it = files.begin(); it != files.end(); ++it ) {
-		CPartFile* file = (*it)->GetFile();
-
-		switch ( event.GetId() ) {
-			case MP_PAUSE:
-				CoreNotify_PartFile_Pause( file );
-				break;
-
-			case MP_RESUME:
-				CoreNotify_PartFile_Resume( file );
-				break;
-
-			case MP_STOP:
-				CoreNotify_PartFile_Stop( file );
-				break;
-		}
+	wxASSERT(file);
+	if (m_files.find(file) == m_files.end()) {
+		return;
 	}
-}
-
-
-void CDownloadListCtrl::OnClearCompleted( wxCommandEvent& WXUNUSED(event) )
-{
-	ClearCompleted();
-}
-
 
-void CDownloadListCtrl::OnGetLink(wxCommandEvent& event)
-{
-	ItemList files = ::GetSelectedItems( this );
-
-	wxString URIs;
-
-	for ( ItemList::iterator it = files.begin(); it != files.end(); ++it ) {
-		CPartFile* file = (*it)->GetFile();
-
-		if ( event.GetId() == MP_GETED2KLINK ) {
-			URIs += theApp->CreateED2kLink( file ) + "\n";
-		} else {
-			URIs += theApp->CreateMagnetLink( file ) + "\n";
+	const wxUIntPtr data = reinterpret_cast<wxUIntPtr>(file);
+	if (show) {
+		// Add the row unless it is already being displayed. Appended at the
+		// end (unsorted); the caller sorts once afterwards.
+		if (!HasItemData(data)) {
+			AppendItemDataNow(data);
+			ShowFilesCount(1);
+			SetTotalSize(m_shownSize + file->GetFileSize());
 		}
-	}
-
-	if ( !URIs.IsEmpty() ) {
-		theApp->CopyTextToClipboard( URIs.BeforeLast('\n') );
-	}
-}
-
-
-void CDownloadListCtrl::OnGetFeedback(wxCommandEvent& WXUNUSED(event))
-{
-	wxString feed;
-	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() % theApp->GetFullMuleVersion();
-		} else {
-			feed += "\n";
+	} else {
+		if (HasItemData(data)) {
+			RemoveItemData(data);
+			ShowFilesCount(-1);
+			SetTotalSize(m_shownSize - file->GetFileSize());
 		}
-		feed += (*it)->GetFile()->GetFeedback();
-	}
-
-	if (!feed.IsEmpty()) {
-		theApp->CopyTextToClipboard(feed);
-	}
-}
-
-void CDownloadListCtrl::OnViewFileInfo( wxCommandEvent& WXUNUSED(event) )
-{
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-
-	if (index >= 0) {
-		ShowFileDetailDialog(index);
-	}
-}
-
-
-void CDownloadListCtrl::OnViewFileComments( wxCommandEvent& WXUNUSED(event) )
-{
-	ItemList files = ::GetSelectedItems( this );
-
-	if ( files.size() == 1 ) {
-		CCommentDialogLst dialog( this, files.front()->GetFile() );
-		dialog.ShowModal();
 	}
 }
 
-void CDownloadListCtrl::OnPreviewFile( wxCommandEvent& WXUNUSED(event) )
+void CDownloadListCtrl::ChangeCategory(int newCategory)
 {
-	ItemList files = ::GetSelectedItems( this );
-
-	if ( files.size() == 1 ) {
-		PreviewFile(files.front()->GetFile());
-	}
+	// Same one-pass rebuild as the text filter: hiding the rows of the old category
+	// individually paid an O(n) row-index rebuild per removal, so switching category on a large
+	// queue froze the GUI just like filtering did (issue #669).
+	m_category = newCategory;
+	RebuildVisibleList();
 }
 
-void CDownloadListCtrl::OnItemActivated( wxListEvent& evt )
+bool CDownloadListCtrl::IsVisibleInCat(CPartFile *file, int category) const
 {
-	CPartFile* file = reinterpret_cast<FileCtrlItem_Struct*>(GetItemData(evt.GetIndex()))->GetFile();
-
-	if ((!file->IsPartFile() || file->IsCompleted()) && file->PreviewAvailable()) {
-		PreviewFile( file );
-	}
+	return file->CheckShowItemInGivenCat(category) && MatchesFilter(file->GetFileName().GetPrintable());
 }
 
-void CDownloadListCtrl::OnItemSelectionChanged( wxListEvent& )
+void CDownloadListCtrl::RebuildFilteredView()
 {
-	if (!m_ItemSelectionChangePending && !IsSorting()) {
-		m_ItemSelectionChangePending = true;
-		Notify_DownloadCtrlDoItemSelectionChanged();
-	}
+	// Filter hook from CMuleVirtualDataViewCtrl: m_files always holds every
+	// download, so the visible set is rebuilt from it in one pass.
+	RebuildVisibleList();
 }
 
-void CDownloadListCtrl::DoItemSelectionChanged()
+void CDownloadListCtrl::OnItemRightClicked(wxDataViewEvent &event)
 {
-	m_ItemSelectionChangePending = false;
-	CKnownFileVector filesVector;
-	filesVector.reserve(GetSelectedItemCount());
-
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-
-	while ( index > -1 ) {
-		CPartFile* file = reinterpret_cast<FileCtrlItem_Struct*>(GetItemData( index ))->GetFile();
-		if (file->IsPartFile()) {
-			filesVector.push_back(file);
+	if (event.GetItem().IsOk()) {
+		wxDataViewItemArray selection;
+		GetSelections(selection);
+		if (selection.Index(event.GetItem()) == wxNOT_FOUND) {
+			UnselectAll();
+			Select(event.GetItem());
 		}
-		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	}
 
-	std::sort(filesVector.begin(), filesVector.end());
-	theApp->amuledlg->m_transferwnd->clientlistctrl->ShowSources(filesVector);
-}
-
-void CDownloadListCtrl::OnMouseRightClick(wxListEvent& evt)
-{
-	long index = CheckSelection(evt);
-	if (index < 0) {
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	if (selected.empty()) {
 		return;
 	}
+	// Bound re-checked by the handlers that use it (OnPreviewFile, OnShowInFolder): PopupMenu
+	// runs a nested event loop, so the queue can mutate while the menu is open.
+	m_menuItem = selected.front();
+	CPartFile *file = reinterpret_cast<CPartFile *>(m_menuItem);
 
 	delete m_menu;
-	m_menu = NULL;
+	m_menu = new wxMenu(_("Downloads"));
 
-	FileCtrlItem_Struct* item = reinterpret_cast<FileCtrlItem_Struct*>(GetItemData( index ));
-	m_menu = new wxMenu( _("Downloads") );
-
-	wxMenu* priomenu = new wxMenu();
+	wxMenu *priomenu = new wxMenu();
 	priomenu->AppendCheckItem(MP_PRIOLOW, _("Low"));
 	priomenu->AppendCheckItem(MP_PRIONORMAL, _("Normal"));
 	priomenu->AppendCheckItem(MP_PRIOHIGH, _("High"));
@@ -654,612 +457,707 @@
 	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)"));
-	//-----------------------------------------------------
+	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);
-	//-----------------------------------------------------
+	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_SHOWINFOLDER, _("Show in file manager"));
 	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->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
+
+	// Same entry the search list offers, on the same gate: a partfile's hash is the completed
+	// file's and is known from the link, so the lookup works before a single byte has arrived.
+	// Hidden rather than greyed when no stats server is configured, because an empty preference
+	// means the feature is off rather than unavailable for this row.
+	const wxString &statsServer = thePrefs::GetStatsServerName();
+	if (!statsServer.IsEmpty()) {
+		m_menu->Append(MP_RAZORSTATS, CFormat(_("Get %s for this file")) % statsServer);
+		m_menu->AppendSeparator();
+	}
+
 	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") );
+			if (i == 0) {
+				cats->Append(MP_ASSIGNCAT, _("unassign"));
 			} else {
-				cats->Append( MP_ASSIGNCAT + i,
-					theApp->glob_prefs->GetCategory(i)->title );
+				cats->Append(MP_ASSIGNCAT + static_cast<int>(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) );
+	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);
+		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);
+		fileResumable = (fileStatus == PS_PAUSED) || (fileStatus == PS_ERROR) ||
+				(fileStatus == PS_INSUFFICIENT);
 		canCancel = fileStatus != PS_COMPLETE;
 	} else {
 		canStop = canPause = canCancel = fileResumable = false;
 	}
 
-	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() );
+	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());
 
 	wxString view;
-	if (file->IsPartFile() && !file->IsCompleted()) {
-		view = CFormat("%s %s") % _("Preview")
-				% file->GetPartMetFileName().RemoveExt();
-	} else if ( file->IsCompleted() ) {
+	if (file->IsPartFile()) {
+		view = CFormat("%s %s") % _("Preview") % file->GetPartMetFileName().RemoveExt();
+	} else {
 		view = _("&Open the file");
 	}
 	m_menu->SetLabel(MP_VIEW, view);
-	m_menu->Enable(MP_VIEW, file->PreviewAvailable());
+	const bool previewable = file->IsPartFile() ? file->PreviewAvailable() : true;
+	bool canOpen = false;
+	bool canReveal = false;
+	FileLaunch::GetAvailability(file, canOpen, canReveal);
+	m_menu->Enable(MP_VIEW, previewable && canOpen);
+	m_menu->Enable(MP_SHOWINFOLDER, canReveal);
 
 	FileRatingList ratingList;
-	item->GetFile()->GetRatingAndComments(ratingList);
-	m_menu->Enable(MP_VIEWFILECOMMENTS, !ratingList.empty());
+	file->GetRatingAndComments(ratingList);
+	// Enable when there are source comments to show, or when Kad is connected so the dialog's
+	// "Get from Kad" lookup can retrieve community notes (#434) even for a file that has no
+	// per-source comments yet.
+	m_menu->Enable(MP_VIEWFILECOMMENTS, !ratingList.empty() || theApp->IsConnectedKad());
 
-	m_menu->Check(  MP_SWAP_A4AF_TO_THIS_AUTO,	file->IsA4AFAuto() );
+	m_menu->Check(MP_SWAP_A4AF_TO_THIS_AUTO, file->IsA4AFAuto());
 
 	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);
 
-	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_MENU_EXTD, canPause);
 
-	m_menu->Enable( MP_MENU_EXTD, canPause );
-
-	bool autosort = thePrefs::AutoSortDownload(false);
-	PopupMenu(m_menu, evt.GetPoint());
-	thePrefs::AutoSortDownload(autosort);
+	PopupMenu(m_menu, event.GetPosition());
 
 	delete m_menu;
-	m_menu = NULL;
+	m_menu = nullptr;
 }
 
-
-void CDownloadListCtrl::OnMouseMiddleClick(wxListEvent& evt)
+void CDownloadListCtrl::OnCancelFile(wxCommandEvent &WXUNUSED(event))
 {
-	// Check if clicked item is selected. If not, unselect all and select it.
-	long index = CheckSelection(evt);
-	if (index >= 0) {
-		ShowFileDetailDialog(index);
+	std::vector<wxUIntPtr> files = GetSelectedItemData();
+	files.erase(std::remove_if(files.begin(),
+			    files.end(),
+			    (wxUIntPtr data) {
+				    switch (reinterpret_cast<CPartFile *>(data)->GetStatus()) {
+				    case PS_WAITING_FOR_HASH:
+				    case PS_HASHING:
+				    case PS_COMPLETING:
+				    case PS_COMPLETE:
+					    return true;
+				    default:
+					    return false;
+				    }
+			    }),
+		files.end());
+	if (files.empty()) {
+		return;
+	}
+
+	const wxString question =
+		files.size() == 1 ? wxString(_("Are you sure that you wish to delete the selected file?"))
+				  : wxString(_("Are you sure that you wish to delete the selected files?"));
+	if (wxMessageBox(question, _("Cancel"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this) == wxYES) {
+		for (wxUIntPtr data : files) {
+			CoreNotify_PartFile_Delete(reinterpret_cast<CPartFile *>(data));
+		}
 	}
 }
 
+void CDownloadListCtrl::OnSetPriority(wxCommandEvent &event)
+{
+	int priority = 0;
+	switch (event.GetId()) {
+	case MP_PRIOLOW:
+		priority = PR_LOW;
+		break;
+	case MP_PRIONORMAL:
+		priority = PR_NORMAL;
+		break;
+	case MP_PRIOHIGH:
+		priority = PR_HIGH;
+		break;
+	case MP_PRIOAUTO:
+		priority = PR_AUTO;
+		break;
+	default:
+		wxFAIL;
+	}
+
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CPartFile *file = reinterpret_cast<CPartFile *>(data);
+		if (priority == PR_AUTO) {
+			CoreNotify_PartFile_PrioAuto(file, true);
+		} else {
+			CoreNotify_PartFile_PrioAuto(file, false);
+			CoreNotify_PartFile_PrioSet(file, priority, true);
+		}
+	}
+}
 
-void CDownloadListCtrl::ShowFileDetailDialog(long index)
+void CDownloadListCtrl::OnSwapSources(wxCommandEvent &event)
 {
-	// 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(reinterpret_cast<FileCtrlItem_Struct*>(GetItemData(i))->GetFile());
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CPartFile *file = reinterpret_cast<CPartFile *>(data);
+		switch (event.GetId()) {
+		case MP_SWAP_A4AF_TO_THIS:
+			CoreNotify_PartFile_Swap_A4AF(file);
+			break;
+		case MP_SWAP_A4AF_TO_THIS_AUTO:
+			CoreNotify_PartFile_Swap_A4AF_Auto(file);
+			break;
+		case MP_SWAP_A4AF_TO_ANY_OTHER:
+			CoreNotify_PartFile_Swap_A4AF_Others(file);
+			break;
+		}
 	}
-	bool autosort = thePrefs::AutoSortDownload(false);
-	CFileDetailDialog(this, files, index).ShowModal();
-	thePrefs::AutoSortDownload(autosort);
 }
 
+void CDownloadListCtrl::OnSetCategory(wxCommandEvent &event)
+{
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CPartFile *file = reinterpret_cast<CPartFile *>(data);
+		CoreNotify_PartFile_SetCat(file, event.GetId() - MP_ASSIGNCAT);
+		ShowFile(file, false);
+	}
+	DoItemSelectionChanged(); // clear clients that may have been shown
 
-void CDownloadListCtrl::OnKeyPressed( wxKeyEvent& event )
+	ChangeCategory(m_category); // This only updates the visibility of the clear completed button
+	theApp->amuledlg->m_transferwnd->UpdateCatTabTitles();
+}
+
+void CDownloadListCtrl::OnSetStatus(wxCommandEvent &event)
 {
-	// Check if delete was pressed
-	switch (event.GetKeyCode()) {
-		case WXK_NUMPAD_DELETE:
-		case WXK_DELETE: {
-			wxCommandEvent evt;
-			OnCancelFile( evt );
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CPartFile *file = reinterpret_cast<CPartFile *>(data);
+		switch (event.GetId()) {
+		case MP_PAUSE:
+			CoreNotify_PartFile_Pause(file);
 			break;
-		}
-		case WXK_F2: {
-			ItemList files = ::GetSelectedItems( this );
-			if (files.size() == 1) {
-				CPartFile* file = files.front()->GetFile();
-
-				// 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);
-					}
-				}
-			}
+		case MP_RESUME:
+			CoreNotify_PartFile_Resume(file);
+			break;
+		case MP_STOP:
+			CoreNotify_PartFile_Stop(file);
 			break;
 		}
-		default:
-			event.Skip();
 	}
 }
 
+void CDownloadListCtrl::OnClearCompleted(wxCommandEvent &WXUNUSED(event))
+{
+	ClearCompleted();
+}
 
-void CDownloadListCtrl::OnDrawItem(
-	int item, wxDC* dc, const wxRect& rect, const wxRect& rectHL, bool highlighted)
+void CDownloadListCtrl::OnGetLink(wxCommandEvent &event)
 {
-	// Don't do any drawing if there's nobody to see it.
-	if ( !theApp->amuledlg->IsDialogVisible( CamuleDlg::DT_TRANSFER_WND ) ) {
-		return;
+	wxString URIs;
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CPartFile *file = reinterpret_cast<CPartFile *>(data);
+		if (event.GetId() == MP_GETED2KLINK) {
+			URIs += theApp->CreateED2kLink(file) + "\n";
+		} else {
+			URIs += theApp->CreateMagnetLink(file) + "\n";
+		}
 	}
+	if (!URIs.IsEmpty()) {
+		theApp->CopyTextToClipboard(URIs.BeforeLast('\n'));
+	}
+}
 
-	FileCtrlItem_Struct* content = reinterpret_cast<FileCtrlItem_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();
+void CDownloadListCtrl::OnGetFeedback(wxCommandEvent &WXUNUSED(event))
+{
+	wxString feed;
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		if (feed.IsEmpty()) {
+			feed = CFormat(_("Feedback from: %s (%s)\n\n")) % thePrefs::GetUserNick() %
+			       theApp->GetFullMuleVersion();
 		} else {
-			dc->SetBackground(m_hilightUnfocusBrush);
-			colour = m_hilightUnfocusBrush.GetColour();
+			feed += "\n";
 		}
-		dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
-		dc->SetPen( colour.Blend(65).GetPen() );
-	} else {
-		dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID)));
-		dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
-		dc->SetPen(*wxTRANSPARENT_PEN);
+		feed += reinterpret_cast<CPartFile *>(data)->GetFeedback();
+	}
+	if (!feed.IsEmpty()) {
+		theApp->CopyTextToClipboard(feed);
 	}
-	dc->SetBrush( dc->GetBackground() );
+}
 
-	dc->DrawRectangle( rectHL.x, rectHL.y, rectHL.width, rectHL.height );
+void CDownloadListCtrl::OnViewFileInfo(wxCommandEvent &WXUNUSED(event))
+{
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	if (!selected.empty()) {
+		ShowFileDetailDialog(RowOfData(selected.front()));
+	}
+}
 
-	dc->SetPen(*wxTRANSPARENT_PEN);
+void CDownloadListCtrl::OnViewFileComments(wxCommandEvent &WXUNUSED(event))
+{
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	if (selected.size() == 1) {
+		CCommentDialogLst dialog(this, reinterpret_cast<CPartFile *>(selected.front()));
+		dialog.ShowModal();
+	}
+}
 
-	if (!highlighted || !GetFocus() ) {
-		// If we have category, override textforeground with what category tells us.
-		CPartFile *file = content->GetFile();
-		if ( file->GetCategory() ) {
-			dc->SetTextForeground(CMuleColour(theApp->glob_prefs->GetCatColor(file->GetCategory())) );
-		}
+void CDownloadListCtrl::OnPreviewFile(wxCommandEvent &WXUNUSED(event))
+{
+	// The clicked row, matching how the menu's enabled state was decided. With several rows
+	// selected, taking the selection would act on a different file than the one the entry was
+	// enabled for.
+	if (m_menuItem != 0 && HasItemData(m_menuItem)) {
+		FileLaunch::Open(reinterpret_cast<CPartFile *>(m_menuItem), this);
 	}
+}
 
-	// Various constant values we use
-	const int iTextOffset = ( rect.GetHeight() - dc->GetCharHeight() ) / 2;
-	const int iOffset = 4;
+void CDownloadListCtrl::OnShowInFolder(wxCommandEvent &WXUNUSED(event))
+{
+	if (m_menuItem != 0 && HasItemData(m_menuItem)) {
+		FileLaunch::Reveal(reinterpret_cast<CPartFile *>(m_menuItem), this);
+	}
+}
 
-	wxRect cur_rec( iOffset, rect.y, 0, rect.height );
-	for (int i = 0; i < GetColumnCount(); i++) {
-		wxListItem listitem;
-		GetColumn(i, listitem);
+void CDownloadListCtrl::OnRazorStatsCheck(wxCommandEvent &WXUNUSED(event))
+{
+	// Bound re-checked for the reason OnShowInFolder gives: PopupMenu runs a
+	// nested event loop, so the queue can drop the row while the menu is open.
+	if (m_menuItem == 0 || !HasItemData(m_menuItem)) {
+		return;
+	}
+	const CPartFile *file = reinterpret_cast<CPartFile *>(m_menuItem);
+	theApp->amuledlg->LaunchUrl(thePrefs::GetStatsServerURL() + file->GetFileHash().Encode());
+}
 
-		if (listitem.GetWidth() > 2*iOffset) {
-			cur_rec.width = listitem.GetWidth() - 2*iOffset;
+void CDownloadListCtrl::OnItemActivated(wxDataViewEvent &event)
+{
+	if (!event.GetItem().IsOk()) {
+		return;
+	}
+	// Read the row straight off the event, the way GetRowLabel() does: touching the selection
+	// here would discard the user's multi-selection, and firing EVT_DATAVIEW_SELECTION_CHANGED
+	// as a side effect of a double-click would rebuild the sources panel for no reason.
+	const long row = GetModelRow(event.GetItem());
+	const wxUIntPtr data = ItemAt(row);
+	if (!data) {
+		return;
+	}
+	CPartFile *file = reinterpret_cast<CPartFile *>(data);
+
+	// One rule for both file tables: a completed file opens whatever type it is, an unfinished
+	// one only once enough of the media is on disk to play -- the classic eMule gesture, and
+	// what the menu's Preview entry offers for the same row. IsPartFile() is exactly "not
+	// complete", so finishing a download never narrows what a double-click does to it. Anything
+	// else opens the file-details modal.
+	if ((!file->IsPartFile() || file->PreviewAvailable()) && FileLaunch::CanOpen(file)) {
+		FileLaunch::Open(file, this);
+	} else {
+		ShowFileDetailDialog(row);
+	}
+}
 
-			// Make a copy of the current rectangle so we can apply specific tweaks
-			wxRect target_rec = cur_rec;
-			if ( i == ColumnProgress ) {
-				// Double the offset to make room for the cirle-marker
-				target_rec.x += iOffset;
-				target_rec.width -= iOffset;
-			} else {
-				// will ensure that text is about in the middle ;)
-				target_rec.y += iTextOffset;
-			}
+void CDownloadListCtrl::OnSelectionChanged(wxDataViewEvent &WXUNUSED(event))
+{
+	if (!m_ItemSelectionChangePending) {
+		m_ItemSelectionChangePending = true;
+		Notify_DownloadCtrlDoItemSelectionChanged();
+	}
+}
 
-			// Draw the item
-			DrawFileItem(dc, i, target_rec, content);
+void CDownloadListCtrl::DoItemSelectionChanged()
+{
+	m_ItemSelectionChangePending = false;
+	CKnownFileVector filesVector;
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	filesVector.reserve(selected.size());
+	for (wxUIntPtr data : selected) {
+		CPartFile *file = reinterpret_cast<CPartFile *>(data);
+		if (file->IsPartFile()) {
+			filesVector.push_back(file);
 		}
+	}
+	std::sort(filesVector.begin(), filesVector.end());
+	theApp->amuledlg->m_transferwnd->clientlistctrl->ShowSources(filesVector);
+}
 
-		// Increment to the next column
-		cur_rec.x += listitem.GetWidth();
+void CDownloadListCtrl::ShowFileDetailDialog(long row)
+{
+	if (row < 0) {
+		return;
+	}
+	// Make list of part files in control (CFileDetailDialog takes CKnownFile*;
+	// a CPartFile upcasts, and the dialog shows download rows from its state).
+	std::vector<CKnownFile *> files;
+	const long nrItems = ItemDataCount();
+	files.reserve(nrItems);
+	for (long i = 0; i < nrItems; i++) {
+		files.push_back(reinterpret_cast<CPartFile *>(ItemAt(i)));
 	}
+	CFileDetailDialog(this, files, static_cast<int>(row)).ShowModal();
 }
 
+bool CDownloadListCtrl::OnListKey(wxKeyEvent &event)
+{
+	switch (event.GetKeyCode()) {
+	case WXK_NUMPAD_DELETE:
+	case WXK_DELETE: {
+		wxCommandEvent evt;
+		OnCancelFile(evt);
+		return true;
+	}
+	case WXK_F2: {
+		const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+		if (selected.size() == 1) {
+			CPartFile *file = reinterpret_cast<CPartFile *>(selected.front());
+			// 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);
+				}
+			}
+		}
+		return true;
+	}
+	default:
+		return false;
+	}
+}
 
-void CDownloadListCtrl::DrawFileItem( wxDC* dc, int nColumn, const wxRect& rect, FileCtrlItem_Struct* item ) const
+wxString CDownloadListCtrl::GetItemColumnText(wxUIntPtr item, unsigned column) const
 {
-	wxDCClipper clipper( *dc, rect.GetX(), rect.GetY(), rect.GetWidth(), rect.GetHeight() );
+	CPartFile *file = reinterpret_cast<CPartFile *>(item);
 
-	const CPartFile* file = item->GetFile();
+	switch (column) {
+	case COLUMN_DL_PART:
+		if (file->IsPartFile() && !file->IsCompleted()) {
+			return CFormat("%03d") % file->GetPartMetNumber();
+		}
+		return wxEmptyString;
 
-	// Used to contain the contenst of cells that dont need any fancy drawing, just text.
-	wxString text;
+	case COLUMN_DL_NAME:
+		// The rating/comment smiley is the icon on this column, not part of
+		// the text -- see GetItemIcon().
+		return file->GetFileName().GetPrintable();
 
-	switch (nColumn) {
-		// Part Number
-		case ColumnPart: {
-			if (file->IsPartFile() && !file->IsCompleted()) {
-			  text = CFormat("%03d") % file->GetPartMetNumber();
-			}
-			break;
-		}
-		// 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;
-				}
+	case COLUMN_DL_SIZE:
+		return CastItoXBytes(file->GetFileSize());
 
-				wxASSERT(image >= Client_InvalidRating_Smiley);
-				wxASSERT(image <= Client_CommentOnly_Smiley);
+	case COLUMN_DL_TRANSFERRED:
+		return CastItoXBytes(file->GetTransferred());
 
-				int imgWidth = 16;
+	case COLUMN_DL_COMPLETED:
+		return CastItoXBytes(file->GetCompletedSize());
 
-				// 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());
+	case COLUMN_DL_SPEED:
+		if (file->GetTransferingSrcCount()) {
+			if (file->GetKBpsDown() >= 1024) {
+				return CFormat(_("%.1f MiB/s")) % (file->GetKBpsDown() / 1024.0);
 			}
-			break;
+			return CFormat(_("%.1f KiB/s")) % file->GetKBpsDown();
 		}
+		return wxEmptyString;
+
+	case COLUMN_DL_SOURCES: {
+		const uint16 sc = file->GetSourceCount();
+		const uint16 ncsc = file->GetNotCurrentSourcesCount();
+		wxString text = ncsc ? CFormat("%i/%i") % (sc - ncsc) % sc : CFormat("%i") % sc;
+		if (file->GetSrcA4AFCount()) {
+			text += CFormat("+%i") % file->GetSrcA4AFCount();
+		}
+		if (file->GetTransferingSrcCount()) {
+			text += CFormat(" (%i)") % file->GetTransferingSrcCount();
+		}
+		return text;
+	}
 
-		// Filesize
-		case ColumnSize:
-			text = CastItoXBytes( file->GetFileSize() );
-			break;
-
-		// Transferred
-		case ColumnTransferred:
-			text = CastItoXBytes( file->GetTransferred() );
-			break;
-
-		// Completed
-		case ColumnCompleted:
-			text = CastItoXBytes( file->GetCompletedSize() );
-			break;
+	case COLUMN_DL_PRIORITY:
+		return PriorityToStr(file->GetDownPriority(), file->IsAutoDownPriority());
 
-		// Speed
-		case ColumnSpeed:
-			if ( file->GetTransferingSrcCount() ) {
-				if (file->GetKBpsDown() >= 1024) {
-					text = CFormat(_("%.1f MB/s")) % (file->GetKBpsDown() / 1024.0);
-				} else {
-					text = CFormat(_("%.1f kB/s")) % file->GetKBpsDown();
-				}
-			}
-			break;
+	case COLUMN_DL_STATUS:
+		return file->getPartfileStatus();
 
-		// Progress
-		case ColumnProgress:{
-			if (thePrefs::ShowProgBar()) {
-				int iWidth  = rect.GetWidth() - 2;
-				int iHeight = rect.GetHeight() - 2;
-
-				// DO NOT DRAW IT ALL THE TIME
-				uint64 dwTicks = GetTickCount64();
-
-				wxMemoryDC cdcStatus;
-
-				if (item->dwUpdated < dwTicks || file->GetHashingProgress() > 0
-						|| !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 );
-				}
+	case COLUMN_DL_TIMEREMAINING: {
+		if ((file->GetStatus() != PS_COMPLETING) && file->IsPartFile()) {
+			const uint64 remainSize = file->GetFileSize() - file->GetCompletedSize();
+			const sint32 remainTime = file->getTimeRemaining();
+			wxString text =
+				(remainTime >= 0) ? CastSecondsToHM(remainTime) : wxString(_("Unknown"));
+			text += " (" + CastItoXBytes(remainSize) + ")";
+			return text;
+		}
+		return wxEmptyString;
+	}
 
-				dc->Blit( rect.GetX(), rect.GetY() + 1, iWidth, iHeight, &cdcStatus, 0, 0);
-
-				if (thePrefs::ShowPercent()) {
-					// Percentage of completing or hashing
-					uint16	hashingProgress = file->GetHashingProgress();
-					double	percent = hashingProgress == 0 ? file->GetPercentCompleted()
-										: 100.0 * hashingProgress * PARTSIZE / file->GetFileSize();
-					if (file->IsCompleted()) {
-						percent = 100.0;
-					} else if (percent > 99.9) {
-						percent = 99.9;
-					}
-					wxString buffer = CFormat("%.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();
-					// Ordinary progress bar: white percentage
-					// Hashing progressbar (green/yellow): black percentage
-					if (thePrefs::ShowProgBar() && hashingProgress == 0) {
-						dc->SetTextForeground(*wxWHITE);
-					} else {
-						dc->SetTextForeground(*wxBLACK);
-					}
-					dc->DrawText(buffer, middlex - (textwidth >> 1), middley - (textheight >> 1));
-					dc->SetTextForeground(AktColor);
-				}
-			}
+	case COLUMN_DL_LASTSEENCOMPLETE:
+		if (file->lastseencomplete) {
+			return FormatLocalDateTime(wxDateTime(file->lastseencomplete));
+		}
+		return _("Unknown");
 
-			break;
+	case COLUMN_DL_LASTRECEPTION: {
+		const time_t lastReceived = file->GetLastChangeDatetime();
+		if (lastReceived) {
+			return FormatLocalDateTime(wxDateTime(lastReceived));
 		}
+		return _("Unknown");
+	}
 
-		// Sources
-		case ColumnSources:	{
-			uint16 sc = file->GetSourceCount();
-			uint16 ncsc = file->GetNotCurrentSourcesCount();
-			if ( ncsc ) {
-				text = CFormat("%i/%i") % (sc - ncsc) % sc;
-			} else {
-				text = CFormat("%i") % sc;
-			}
+	default:
+		return wxEmptyString;
+	}
+}
 
-			if ( file->GetSrcA4AFCount() ) {
-				text += CFormat("+%i") % file->GetSrcA4AFCount();
-			}
+bool CDownloadListCtrl::GetItemIcon(wxUIntPtr item, unsigned column, wxIcon &icon) const
+{
+	if (column != COLUMN_DL_NAME) {
+		return false;
+	}
+	CPartFile *file = reinterpret_cast<CPartFile *>(item);
+	if (!file->HasRating() && !file->HasComment()) {
+		return false;
+	}
+	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);
+	icon = theApp->amuledlg->m_imagelist.GetIcon(image);
+	return true;
+}
 
-			if ( file->GetTransferingSrcCount() ) {
-				text += CFormat(" (%i)") % file->GetTransferingSrcCount();
-			}
+bool CDownloadListCtrl::GetItemAttr(wxUIntPtr item, unsigned WXUNUSED(column), wxDataViewItemAttr &attr) const
+{
+	const CPartFile *file = reinterpret_cast<const CPartFile *>(item);
 
-			break;
-		}
+	// Category 0 is "all"; a file in it has no category of its own to take a
+	// colour from, which is the test the pre-wxDataView code used too.
+	const uint8 cat = file->GetCategory();
+	if (!cat) {
+		return false;
+	}
 
-		// Priority
-		case ColumnPriority:
-			text = PriorityToStr( file->GetDownPriority(), file->IsAutoDownPriority() );
-			break;
+	// A category keeps colour 0 until the user picks one (Preferences writes "Color" as 0 for a
+	// new one), so 0 means unset rather than black. The old code painted those rows black,
+	// which predates the dark themes.
+	const uint32 colour = theApp->glob_prefs->GetCatColor(cat);
+	if (!colour) {
+		return false;
+	}
 
-		// File-status
-		case ColumnStatus:
-			text = file->getPartfileStatus();
-			break;
+	// Selected rows keep the system highlight colour: wx overrides a custom foreground while a
+	// row is selected, for the same readability reason the old OnDrawItem() skipped highlighted
+	// rows.
+	attr.SetColour(CMuleColour(colour));
+	return true;
+}
 
-		// Remaining
-		case ColumnTimeRemaining: {
-			if ((file->GetStatus() != PS_COMPLETING) && file->IsPartFile()) {
-				uint64 remainSize = file->GetFileSize() - file->GetCompletedSize();
-				sint32 remainTime = file->getTimeRemaining();
+void CDownloadListCtrl::GetItemBarFill(wxUIntPtr item, unsigned column, CBarFillSpec &out) const
+{
+	if (column != COLUMN_DL_PROGRESS || !thePrefs::ShowProgBar()) {
+		return;
+	}
+	CPartFile *file = reinterpret_cast<CPartFile *>(item);
+	if (file->GetFileSize() == 0) {
+		return;
+	}
 
-				if (remainTime >= 0) {
-					text = CastSecondsToHM(remainTime);
-				} else {
-					text = _("Unknown");
-				}
+	std::vector<CBarFillSpan> spans;
+	const bool bFlat = thePrefs::UseFlatBar();
 
-				text += " (" + CastItoXBytes(remainSize) + ")";
-			}
-			break;
+	if (file->IsCompleted() || file->GetStatus() == PS_COMPLETING) {
+		spans.push_back({ 0, file->GetFileSize() - 1, bFlat ? crFlatProgress : crProgress });
+		out = CBarFillSpec(item, file->GetFileSize(), std::move(spans));
+		return;
+	}
+
+	if (file->GetHashingProgress() > 0) {
+		uint64 left = file->GetHashingProgress() * PARTSIZE;
+		if (left < file->GetFileSize() - 1) {
+			spans.push_back(
+				{ left + 1, file->GetFileSize() - 1, bFlat ? crFlatPending : crPending });
+		} else {
+			left = file->GetFileSize() - 1;
 		}
+		spans.push_back({ 0, left, bFlat ? crFlatProgress : crProgress });
+		out = CBarFillSpec(item, file->GetFileSize(), std::move(spans));
+		return;
+	}
 
-		// Last seen completed
-		case ColumnLastSeenComplete: {
-			if ( file->lastseencomplete ) {
-				text = wxDateTime( file->lastseencomplete ).Format( _("%y/%m/%d %H:%M:%S") );
-			} else {
-				text = _("Unknown");
-			}
-			break;
+	const CGapList &gaplist = file->GetGapList();
+	uint64 lastGapEnd = 0;
+	for (CGapList::const_iterator it = gaplist.begin(); it != gaplist.end(); ++it) {
+		const uint64 start = it.start() / PARTSIZE;
+		if (it.start()) {
+			spans.push_back({ lastGapEnd + 1, it.start() - 1, bFlat ? crFlatHave : crHave });
+		}
+		lastGapEnd = it.end();
+		uint64 end = (it.end() / PARTSIZE) + 1;
+		if (end > file->GetPartCount()) {
+			end = file->GetPartCount();
 		}
 
-		// Last received
-		case ColumnLastReception: {
-			const time_t lastReceived = file->GetLastChangeDatetime();
-			if (lastReceived) {
-				text = wxDateTime(lastReceived).Format( _("%y/%m/%d %H:%M:%S") );
+		for (uint64 i = start; i < end; ++i) {
+			CMuleColour colour;
+			if (i < file->m_SrcpartFrequency.size() && file->m_SrcpartFrequencyi) {
+				// The same fade the shared-files bar draws. This used to be a
+				// linear ramp of its own, saturating one source later and written
+				// into the green channel through a local called "blue" while the
+				// blue channel stayed at 255, so the same file read as differently
+				// shared depending on which list you looked at.
+				colour = ToMuleColour(
+					partbar::SourceAvailabilityColour(file->m_SrcpartFrequencyi));
 			} else {
-				text = _("Unknown");
+				colour = crMissing;
 			}
+			if (file->IsStopped()) {
+				colour.Blend(50);
+			}
+			const uint64 gap_begin = (i == start ? it.start() : PARTSIZE * i);
+			const uint64 gap_end = (i == end - 1 ? it.end() : PARTSIZE * (i + 1) - 1);
+			spans.push_back({ gap_begin, gap_end, colour });
 		}
 	}
+	// Fill the last Have-part (between this gap and the last).
+	spans.push_back({ lastGapEnd + 1, file->GetFileSize() - 1, bFlat ? crFlatHave : crHave });
 
-	if ( !text.IsEmpty() ) {
-		dc->DrawText( text, rect.GetX(), rect.GetY() );
+	// Pending parts. Adjacent pending parts must be joined to avoid bright
+	// lines between them.
+	const CPartFile::CReqBlockPtrList requestedBlocks = file->GetRequestedBlockList();
+	uint64 lastStartOffset = 0;
+	uint64 lastEndOffset = 0;
+	CMuleColour pendingColour = bFlat ? crFlatPending : crPending;
+	if (file->IsStopped()) {
+		pendingColour.Blend(50);
 	}
-}
+	for (const Requested_Block_Struct *block : requestedBlocks) {
+		if (block->StartOffset > lastEndOffset + 1) {
+			spans.push_back({ lastStartOffset, lastEndOffset, pendingColour });
+			lastStartOffset = block->StartOffset;
+			lastEndOffset = block->EndOffset;
+		} else {
+			lastEndOffset = block->EndOffset;
+		}
+	}
+	spans.push_back({ lastStartOffset, lastEndOffset, pendingColour });
 
-wxString CDownloadListCtrl::GetTTSText(unsigned item) const
-{
-	return reinterpret_cast<FileCtrlItem_Struct*>(GetItemData(item))->GetFile()->GetFileName().GetPrintable();
+	out = CBarFillSpec(item, file->GetFileSize(), std::move(spans));
 }
 
-
-int CDownloadListCtrl::SortProc(wxUIntPtr param1, wxUIntPtr param2, wxIntPtr sortData)
+bool CDownloadListCtrl::IsLiveSortColumn() const
 {
-	FileCtrlItem_Struct* item1 = reinterpret_cast<FileCtrlItem_Struct*>(param1);
-	FileCtrlItem_Struct* item2 = reinterpret_cast<FileCtrlItem_Struct*>(param2);
-
-	int sortMod = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
-	sortData &= CMuleListCtrl::COLUMN_MASK;
-
-	// We modify the result so that it matches with ascending or descending
-	return sortMod * Compare( item1->GetFile(), item2->GetFile(), sortData);
+	if (m_sort_orders.empty()) {
+		return false;
+	}
+	switch (static_cast<int>(m_sort_orders.front().first)) {
+	case COLUMN_DL_TRANSFERRED:
+	case COLUMN_DL_COMPLETED:
+	case COLUMN_DL_SPEED:
+	case COLUMN_DL_PROGRESS:
+	case COLUMN_DL_SOURCES:
+	case COLUMN_DL_TIMEREMAINING:
+	case COLUMN_DL_LASTSEENCOMPLETE:
+	case COLUMN_DL_LASTRECEPTION:
+		return true;
+	default:
+		return false;
+	}
 }
 
-
-int CDownloadListCtrl::Compare( const CPartFile* file1, const CPartFile* file2, long lParamSort)
+int CDownloadListCtrl::CompareItemData(
+	wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool WXUNUSED(alt), int modifier) const
 {
-	int result = 0;
-
-	switch (lParamSort) {
-	// Sort by part number
-	case ColumnPart:
-		result = CmpAny(
-			file1->GetPartMetNumber(),
-			file2->GetPartMetNumber() );
-		break;
+	const CPartFile *file1 = reinterpret_cast<const CPartFile *>(data1);
+	const CPartFile *file2 = reinterpret_cast<const CPartFile *>(data2);
+	const int mod = modifier;
 
-	// Sort by filename
-	case ColumnFileName:
-		result = CmpAny(
-			file1->GetFileName(),
-			file2->GetFileName() );
-		break;
+	switch (column) {
+	case COLUMN_DL_PART:
+		return mod * CmpAny(file1->GetPartMetNumber(), file2->GetPartMetNumber());
 
-	// Sort by size
-	case ColumnSize:
-		result = CmpAny(
-			file1->GetFileSize(),
-			file2->GetFileSize() );
-		break;
+	case COLUMN_DL_NAME:
+		return mod * CmpAny(file1->GetFileName(), file2->GetFileName());
 
-	// Sort by transferred
-	case ColumnTransferred:
-		result = CmpAny(
-			file1->GetTransferred(),
-			file2->GetTransferred() );
-		break;
+	case COLUMN_DL_SIZE:
+		return mod * CmpAny(file1->GetFileSize(), file2->GetFileSize());
 
-	// Sort by completed
-	case ColumnCompleted:
-		result = CmpAny(
-			file1->GetCompletedSize(),
-			file2->GetCompletedSize() );
-		break;
+	case COLUMN_DL_TRANSFERRED:
+		return mod * CmpAny(file1->GetTransferred(), file2->GetTransferred());
 
-	// Sort by speed
-	case ColumnSpeed:
-		result = CmpAny(
-			file1->GetKBpsDown() * 1024,
-			file2->GetKBpsDown() * 1024 );
-		break;
+	case COLUMN_DL_COMPLETED:
+		return mod * CmpAny(file1->GetCompletedSize(), file2->GetCompletedSize());
 
-	// Sort by percentage completed
-	case ColumnProgress:
-		result = CmpAny(
-			file1->GetPercentCompleted(),
-			file2->GetPercentCompleted() );
-		break;
+	case COLUMN_DL_SPEED:
+		return mod * CmpAny(file1->GetKBpsDown(), file2->GetKBpsDown());
 
-	// Sort by number of sources
-	case ColumnSources:
-		result = CmpAny(
-			file1->GetSourceCount(),
-			file2->GetSourceCount() );
-		break;
+	case COLUMN_DL_PROGRESS:
+		return mod * CmpAny(file1->GetPercentCompleted(), file2->GetPercentCompleted());
 
-	// Sort by priority
-	case ColumnPriority:
-		result = CmpAny(
-			file1->GetDownPriority(),
-			file2->GetDownPriority() );
-		break;
+	case COLUMN_DL_SOURCES:
+		return mod * CmpAny(file1->GetSourceCount(), file2->GetSourceCount());
 
-	// Sort by status
-	case ColumnStatus:
-		result = CmpAny(
-			file1->getPartfileStatusRang(),
-			file2->getPartfileStatusRang() );
-		break;
+	case COLUMN_DL_PRIORITY:
+		return mod * CmpAny(file1->GetDownPriority(), file2->GetDownPriority());
 
-	// Sort by remaining time
-	case ColumnTimeRemaining:
+	case COLUMN_DL_STATUS:
+		return mod * CmpAny(file1->getPartfileStatusRang(), file2->getPartfileStatusRang());
+
+	case COLUMN_DL_TIMEREMAINING:
+		// -1 ("unknown") always sorts last, regardless of direction -- `mod`
+		// is deliberately not applied to this branch.
 		if (file1->getTimeRemaining() == -1) {
-			if (file2->getTimeRemaining() == -1) {
-				result = 0;
-			} else {
-				result = 1;
-			}
-		} else {
-			if (file2->getTimeRemaining() == -1) {
-				result = -1;
-			} else {
-				result = CmpAny(
-					file1->getTimeRemaining(),
-					file2->getTimeRemaining() );
-			}
+			return (file2->getTimeRemaining() == -1) ? 0 : 1;
 		}
-		break;
+		if (file2->getTimeRemaining() == -1) {
+			return -1;
+		}
+		return mod * CmpAny(file1->getTimeRemaining(), file2->getTimeRemaining());
 
-	// Sort by last seen complete
-	case ColumnLastSeenComplete:
-		result = CmpAny(
-			file1->lastseencomplete,
-			file2->lastseencomplete );
-		break;
+	case COLUMN_DL_LASTSEENCOMPLETE:
+		return mod * CmpAny(file1->lastseencomplete, file2->lastseencomplete);
 
-	// Sort by last reception
-	case ColumnLastReception:
-		result = CmpAny(
-			file1->GetLastChangeDatetime(),
-			file2->GetLastChangeDatetime() );
-		break;
-	}
+	case COLUMN_DL_LASTRECEPTION:
+		return mod * CmpAny(file1->GetLastChangeDatetime(), file2->GetLastChangeDatetime());
 
-	return result;
+	default:
+		return 0;
+	}
 }
 
 void CDownloadListCtrl::ClearCompleted()
 {
 	CastByID(ID_BTNCLRCOMPL, GetParent(), wxButton)->Enable(false);
 
-	// Search for completed files
 	ListOfUInts32 toClear;
-	for ( ListItems::iterator it = m_ListItems.begin(); it != m_ListItems.end(); ) {
-		FileCtrlItem_Struct* item = it->second; ++it;
-
-		CPartFile* file = item->GetFile();
-
+	for (CPartFile *file : m_files) {
 		if (file->IsCompleted() && file->CheckShowItemInGivenCat(m_category)) {
 			toClear.push_back(file->ECID());
 		}
@@ -1269,236 +1167,82 @@
 	}
 }
 
-
-void CDownloadListCtrl::ShowFilesCount( int diff )
+void CDownloadListCtrl::ShowFilesCount(int diff)
 {
-	m_filecount += diff;
+	SetFilesCount(m_filecount + diff);
+}
 
-	wxStaticText* label = CastByName( "downloadsLabel", GetParent(), wxStaticText );
+void CDownloadListCtrl::SetFilesCount(int count)
+{
+	m_filecount = count;
 
+	wxStaticText *label = CastByName("downloadsLabel", GetParent(), wxStaticText);
 	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);
-
-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
+void CDownloadListCtrl::SetTotalSize(uint64 total)
 {
-	static CBarShader s_ChunkBar(16);
-
-	s_ChunkBar.SetHeight(rect.height);
-	s_ChunkBar.SetWidth(rect.width);
-	s_ChunkBar.SetFileSize( file->GetFileSize() );
-	s_ChunkBar.Set3dDepth( thePrefs::Get3DDepth() );
+	m_shownSize = total;
 
-	if ( file->IsCompleted() || file->GetStatus() == PS_COMPLETING ) {
-		s_ChunkBar.Fill( bFlat ? crFlatProgress : crProgress );
-		s_ChunkBar.Draw(dc, rect.x, rect.y, bFlat);
+	// This label lives in the sources pane, a different window from the download list, so reach
+	// it via the transfer window rather than GetParent(). Guarded for the early calls before
+	// that window is fully constructed.
+	if (!theApp->amuledlg || !theApp->amuledlg->m_transferwnd) {
 		return;
-	} else if (file->GetHashingProgress() > 0) {
-		uint64 left = file->GetHashingProgress() * PARTSIZE;
-		if (left < file->GetFileSize() - 1) {
-			// Fill the amount not yet hashed with yellow
-			s_ChunkBar.FillRange(left + 1, file->GetFileSize() - 1, bFlat ? crFlatPending : crPending);
-		} else {
-			left = file->GetFileSize() - 1;
-		}
-	    // Fill the amount already hashed with green
-	    s_ChunkBar.FillRange(0, left, bFlat ? crFlatProgress : crProgress);
-		s_ChunkBar.Draw(dc, rect.x, rect.y, bFlat);
-		return;
-	}
-	// Part availability ( of missing parts )
-	const CGapList& gaplist = file->GetGapList();
-	CGapList::const_iterator it = gaplist.begin();
-	uint64 lastGapEnd = 0;
-	CMuleColour colour;
-
-	for (; it != gaplist.end(); ++it) {
-
-		// Start position
-		uint32 start = ( it.start() / PARTSIZE );
-		// fill the Have-Part (between this gap and the last)
-		if (it.start()) {
-		  s_ChunkBar.FillRange(lastGapEnd + 1, it.start() - 1,  bFlat ? crFlatHave : crHave);
-		}
-		lastGapEnd = it.end();
-		// End position
-		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() ) {
-			end = file->GetPartCount();
-		}
-
-		// Place each gap, one PART at a time
-		for ( uint64 i = start; i < end; ++i ) {
-			if ( i < file->m_SrcpartFrequency.size() && file->m_SrcpartFrequencyi) {
-				int blue = 210 - ( 22 * ( file->m_SrcpartFrequencyi - 1 ) );
-				colour.Set(0, ( blue < 0 ? 0 : blue ), 255 );
-			} else {
-				colour = crMissing;
-			}
-
-			if ( file->IsStopped() ) {
-				colour.Blend(50);
-			}
-
-			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,  colour);
-		}
-	}
-
-	// 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();
-	CPartFile::CReqBlockPtrList::const_iterator it2 = requestedblocks_list.begin();
-	// adjacing pending parts must be joined to avoid bright lines between them
-	uint64 lastStartOffset = 0;
-	uint64 lastEndOffset = 0;
-
-	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, colour);
-			lastStartOffset = (*it2)->StartOffset;
-			lastEndOffset   = (*it2)->EndOffset;
-		} else {
-			// adjacing, grow block
-			lastEndOffset   = (*it2)->EndOffset;
-		}
 	}
-
-	s_ChunkBar.FillRange(lastStartOffset, lastEndOffset, colour);
-
-
-	// Draw the progress-bar
-	s_ChunkBar.Draw( dc, rect.x, rect.y, bFlat );
-
-
-	// Green progressbar width
-	int width = (int)(( (float)rect.width / (float)file->GetFileSize() ) *
-			file->GetCompletedSize() );
-
-	if ( bFlat ) {
-		dc->SetBrush( crFlatProgress.GetBrush() );
-
-		dc->DrawRectangle( rect.x, rect.y, width, 3 );
-	} else {
-		// Draw the two black lines for 3d-effect
-		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( *(wxThePenList->FindOrCreatePen( crProgress , 1, wxPENSTYLE_SOLID ) ));
-		dc->DrawLine( rect.x, rect.y + 1, rect.x + width, rect.y + 1 );
+	wxStaticText *label = CastByName("downloadsTotalSize", theApp->amuledlg->m_transferwnd, wxStaticText);
+	if (label) {
+		label->SetLabel(CFormat(_("Total queue size: %s")) % CastItoXBytes(m_shownSize));
+		label->GetParent()->Layout();
 	}
 }
 
-#ifdef __WINDOWS__
-#	define QUOTE	"\""
-#else
-#	define QUOTE	"\'"
-#endif
-
-void CDownloadListCtrl::PreviewFile(CPartFile* file)
+void CDownloadListCtrl::UpdateFreeSpace()
 {
-	wxString command;
-	if (thePrefs::GetVideoPlayer().IsEmpty()) {
-		// Fall back to the platform's default file-association opener
-		// (xdg-open on Linux/BSD, open on macOS, default shell handler
-		// on Windows). The legacy `xterm -e mplayer` fallback assumed
-		// mplayer was installed; the OS-native helpers below are
-		// present out of the box on every supported platform and pick
-		// up the user's registered application for the file type. A
-		// custom player from Preferences -> Misc -> Video player still
-		// takes precedence.
-		// Command names (open / xdg-open) intentionally stay untranslated
-		// -- they're literal tool names the user would type on a shell.
-		// The Windows phrasing IS translatable since it's English prose.
-		wxString defaultPreview;
-#if defined(__WXMAC__) || defined(__APPLE__)
-		defaultPreview = "open";
-		command = "open " QUOTE "$file" QUOTE;
-#elif defined(__WXMSW__) || defined(_WIN32)
-		defaultPreview = _("the default Windows shell handler");
-		command = "cmd /c start \"\" " QUOTE "$file" QUOTE;
-#else
-		defaultPreview = "xdg-open";
-		command = "xdg-open " QUOTE "$file" QUOTE;
-#endif
-		wxMessageBox(CFormat(_(
-			"To prevent this warning to show up in every preview,\nset your preferred video player in preferences (default is %s).")) % defaultPreview,
-			_("File preview"), wxOK, this);
-	} else {
-		command = thePrefs::GetVideoPlayer();
+	if (!theApp->amuledlg || !theApp->amuledlg->m_transferwnd) {
+		return;
 	}
-
-	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->IsCompleted()) {
-		// Remove the .met and see if out video player specifiation uses the magic string
-		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 ...
-		partName = file->GetFileName().GetRaw();
-		partFile = file->GetFullName().GetRaw();
-	}
-
-	// Compatibility with old behaviour
-	if (!command.Replace("$file", "%PARTFILE")) {
-		if ((command.Find("%PARTFILE") == wxNOT_FOUND) && (command.Find("%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 << " " << QUOTE << "%PARTFILE" << QUOTE;
+	// Resolved once: this runs on the GUI timer, and the label outlives every call,
+	// belonging to the transfer window.
+	if (!m_freeSpaceLabel) {
+		m_freeSpaceLabel =
+			CastByName("downloadsFreeSpace", theApp->amuledlg->m_transferwnd, wxStaticText);
+		if (!m_freeSpaceLabel) {
+			return;
 		}
+		// Its own label so the "|" is not recoloured with the figure;
+		// resolved alongside it and equally long-lived.
+		m_freeSpaceSepLabel =
+			CastByName("downloadsFreeSpaceSep", theApp->amuledlg->m_transferwnd, wxStaticText);
 	}
 
-#ifndef __WINDOWS__
-	// We have to escape quote characters in the file name, otherwise arbitrary
-	// options could be passed to the player.
-	partFile.Replace(QUOTE, "\\" QUOTE);
-	partName.Replace(QUOTE, "\\" QUOTE);
-#endif
-
-	command.Replace("%PARTFILE", partFile);
-	command.Replace("%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;
-		AddLogLineC(CFormat( _("ERROR: Failed to execute external media-player! Command: `%s'") ) %
-			command );
+	const sint64 freeSpace = theStats::GetTempFreeSpace();
+
+	// What the queue still has to write, over every category. Completed files are already out
+	// of temp, and the bytes a part file holds are already off the free-space figure, so what
+	// is left to download is exactly what the filesystem still has to find room for. Paused and
+	// stopped files count too: they are space the queue will need as soon as they resume.
+	//
+	// Skipped when there is no figure to compare against -- nothing to warn about, and this
+	// walks the whole queue.
+	uint64 remaining = 0;
+	if (freeSpace != FREE_SPACE_UNKNOWN) {
+		for (CPartFile *file : m_files) {
+			if (file->IsCompleted()) {
+				continue;
+			}
+			const uint64 size = file->GetFileSize();
+			const uint64 done = file->GetCompletedSize();
+			if (done < size) {
+				remaining += size - done;
+			}
+		}
 	}
+
+	const bool warn = (freeSpace != FREE_SPACE_UNKNOWN) && (static_cast<uint64>(freeSpace) < remaining);
+	// Continues the "Total queue size:" label to its left.
+	CamuleDlg::SetFreeSpaceLabel(m_freeSpaceLabel, freeSpace, warn, m_freeSpaceSepLabel);
 }
+
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/DownloadListCtrl.h -> amule-3.1.0.tar.gz/src/DownloadListCtrl.h Changed

@@ -26,214 +26,233 @@
 #ifndef DOWNLOADLISTCTRL_H
 #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
-#include "MuleListCtrl.h"	// Needed for CMuleListCtrl
-
+#include "MuleVirtualDataViewCtrl.h" // Needed for CMuleVirtualDataViewCtrl
+
+#include <set> // Needed for std::set
+
+#define COLUMN_DL_PART 0
+#define COLUMN_DL_NAME 1
+#define COLUMN_DL_SIZE 2
+#define COLUMN_DL_TRANSFERRED 3
+#define COLUMN_DL_COMPLETED 4
+#define COLUMN_DL_SPEED 5
+#define COLUMN_DL_PROGRESS 6
+#define COLUMN_DL_SOURCES 7
+#define COLUMN_DL_PRIORITY 8
+#define COLUMN_DL_STATUS 9
+#define COLUMN_DL_TIMEREMAINING 10
+#define COLUMN_DL_LASTSEENCOMPLETE 11
+#define COLUMN_DL_LASTRECEPTION 12
+//! Always empty. Absorbs the macOS trailing-column sizing; see
+//! CMuleDataViewCtrl::AppendSpacerColumn().
+#define COLUMN_DL_SPACER 13
 
 class CPartFile;
-class wxBitmap;
-class wxRect;
-class wxDC;
-
-struct FileCtrlItem_Struct;
+class wxMenu;
+class wxStaticText;
 
 /**
- * This class is responsible for representing the download queue.
- *
- * 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.
+ * The download queue: the primary widget, where users inspect and manipulate their downloads.
  *
+ * Rows are addressed by CPartFile* identity, as CSharedFilesCtrl's are by CKnownFile*. The Progress
+ * column is the one graphic cell (a CBarShader chunk/gap bar plus a completed-progress overlay and
+ * percent text); see CDownloadBarRenderer in the .cpp.
  */
-class CDownloadListCtrl : public CMuleListCtrl
+class CDownloadListCtrl : public CMuleVirtualDataViewCtrl
 {
 public:
-	/**
-	 * Constructor.
-	 *
-	 * @see CMuleListCtrl::CMuleListCtrl for documentation of parameters.
-	 */
-	 CDownloadListCtrl(
-	            wxWindow *parent,
-                wxWindowID winid = -1,
-                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
-                long style = wxLC_ICON,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = "downloadlistctrl" );
+	CDownloadListCtrl(wxWindow *parent,
+		wxWindowID winid = wxID_ANY,
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
+		long style = 0,
+		const wxString &name = "downloadlistctrl");
+
+	~CDownloadListCtrl();
+
+	/// Adds a file to the list; it shows only if it matches the current category, and
+	/// duplicates are ignored. @a deferView creates the model entry alone, without showing or
+	/// sorting -- used for a bulk load (remote GUI first sync) where the caller shows and sorts
+	/// once afterwards via ShowFileList() instead of paying an O(n^2) per-item sort (issue
+	/// #414).
+	void AddFile(CPartFile *file, bool deferView = false);
+
+	/// Shows every model item in the current category and sorts once, inside Freeze()/Thaw().
+	/// The batch counterpart to AddFile()'s per-item path, used after a deferred bulk load.
+	/// Mirrors CSharedFilesCtrl::ShowFileList().
+	void ShowFileList();
+
+	// The live text filter (SetFilterText) is inherited from CMuleVirtualDataViewCtrl; here it
+	// is AND-ed with the current category, and the rebuild it triggers is RebuildFilteredView()
+	// below. Purely GUI-side, so it behaves the same in the monolithic app and the remote GUI.
+
+	/// Bracket a burst of AddFile()/UpdateItem() calls (a reconnect resync, issue #444, or any
+	/// poll that adds a batch of downloads, issue #615) so the list repaints once (Freeze) and
+	/// sorts once instead of per item. Existing rows are updated in place; new rows are
+	/// appended without a per-item sort. EndBatchUpdate() does the single SortList(), unless
+	/// doSort is false.
+	void BeginBatchUpdate();
+	void EndBatchUpdate(bool doSort = true);
+
+	/// Removes @a file from the list.
+	void RemoveFile(CPartFile *file);
+
+	/// Shows or hides @a file's own row, per @a show and whether it passes the category + text
+	/// filter.
+	void ShowFile(CPartFile *file, bool show);
+
+	/// Updates the state of @a toupdate, hiding or showing it for its state and the selected
+	/// category, and redrawing if needed. Always a CPartFile*, kept as const void* for source
+	/// compatibility with existing callers (GuiEvents.cpp's DownloadCtrlUpdateItem).
+	void UpdateItem(const void *toupdate);
+
+	uint8 GetCategory() const { return m_category; }
+
+	/// Changes the displayed category to @a newCategory and updates the shown files.
+	void ChangeCategory(int newCategory);
+
+	/// Clears all completed files from the list.
+	void ClearCompleted();
 
-	/**
-	 * Destructor.
-	 */
-	virtual	~CDownloadListCtrl();
+	/// Performs the client update when the item selection changes.
+	void DoItemSelectionChanged();
 
+	/// Refreshes the "Free space:" label from the core's figure for the filesystem holding the
+	/// part files, red once it no longer covers what is left to download. The warning is
+	/// measured against the whole queue, not the category on screen: there is one temp
+	/// directory for every category (a category chooses where a file lands when it finishes,
+	/// not where it downloads), so every queued file competes for the same space and a per-
+	/// category comparison would only warn once it was already too late. Driven by the GUI
+	/// timer rather than by list changes -- the figure moves on its own as the files grow.
+	void UpdateFreeSpace();
 
-	/**
-	 * Adds a file to the list, but it wont show unless it matches the current category.
-	 *
-	 * @param A valid pointer to a new partfile.
-	 *
-	 * Please note that duplicates wont be added.
-	 */
-	void AddFile( CPartFile* file );
+protected:
+	/// Return old column order.
+	wxString GetOldColumnOrder() const override;
 
-	/**
-	 * Removes the specified file from the list.
-	 *
-	 * @param file A valid pointer of the file to be removed.
-	 *
-	 * This function also removes any sources associated with the file.
-	 */
-	void RemoveFile( CPartFile* file );
+	/// Type-ahead matches the filename, not column 0: column 0 is the part number here, unlike
+	/// every other ported list, so the base's default (GetItemColumnText(item, 0)) would match
+	/// part numbers.
+	wxString GetRowLabel(const wxDataViewItem &item) const override;
 
-	/**
-	 * Shows or hides the sources of a specific file.
-	 *
-	 * @param file A valid pointer to the file to be shown/hidden.
-	 * @param show Whenever or not to show the file.
-	 *
-	 * If the file is hidden, then its sources will also be hidden.
-	 */
-	void ShowFile( CPartFile* file, bool show );
+	/// Text of one cell, pulled on demand for the cells being drawn.
+	wxString GetItemColumnText(wxUIntPtr item, unsigned column) const override;
 
+	/// Rating/comment smiley on the File Name column, nothing elsewhere.
+	bool GetItemIcon(wxUIntPtr item, unsigned column, wxIcon &icon) const override;
 
-	/**
-	 * Updates the state of the specified item, possibly causing a redrawing.
-	 *
-	 * @param toupdate The source or file to be updated.
-	 *
-	 * Calling this function with a file as the argument will ensure that the
-	 * file is hidden/shown depending on its state and the currently selected
-	 * category.
-	 */
-	void UpdateItem(const void* toupdate);
+	/// Paints a row in its category's colour, the behaviour the pre-wxDataView list had in
+	/// OnDrawItem() and the port dropped (issue #1346). Whole row rather than one column, so
+	/// `column` is unused: the old code set the DC foreground once before its column loop.
+	bool GetItemAttr(wxUIntPtr item, unsigned column, wxDataViewItemAttr &attr) const override;
 
-	/**
-	 * Returns the current category.
-	 */
-	uint8 GetCategory() const;
+	/// Chunk/gap-bar spans for the Progress column.
+	void GetItemBarFill(wxUIntPtr item, unsigned column, CBarFillSpec &out) const override;
 
-	/**
-	 * Changes the displayed category and updates the list of shown files.
-	 *
-	 * @param newCategory The new category to display.
-	 */
-	void ChangeCategory( int newCategory );
+	/// Live auto-sort: re-order when sorted by a column whose value changes as a download
+	/// progresses (transferred, completed, speed, progress, sources, time remaining, last seen
+	/// complete, last reception). Static columns do not auto-resort.
+	bool IsLiveSortColumn() const override;
 
+	/** Pause live auto-sort while the context menu is open. */
+	bool IsMenuOpen() const override { return m_menu != nullptr; }
 
-	/**
-	 * Clears all completed files from the list.
-	 */
-	void ClearCompleted();
+	/// Single-column comparison for the base's sort chain.
+	int CompareItemData(
+		wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool alt, int modifier) const override;
 
-	/**
-	 * Perform client update when item selection has changed.
-	 */
-	void	DoItemSelectionChanged();
-
-protected:
-	/// Return old column order.
-	wxString GetOldColumnOrder() const;
+	/// @see CMuleVirtualDataViewCtrl::RebuildFilteredView
+	void RebuildFilteredView() override;
 
 private:
-	/**
-	 * Updates the displayed number representing the amount of files currently shown.
-	 */
-	void ShowFilesCount( int diff );
+	/// Rebuilds the visible rows from the model in one pass, keeping the files that pass the
+	/// current category + text filter. Used whenever the visible set changes wholesale: a
+	/// category switch, a filter edit, or a deferred bulk load's first ShowFileList().
+	void RebuildVisibleList();
 
+	//! Whether @a file should be displayed in @a category: the category predicate AND-ed with
+	//! the text filter. Non-const because CPartFile::CheckShowItemInGivenCat() is not const.
+	bool IsVisibleInCat(CPartFile *file, int category) const;
 
-	/**
-	 * @see CMuleListCtrl::GetTTSText
-	 */
-	virtual wxString GetTTSText(unsigned item) const;
+	/// Updates the displayed count of files currently shown.
+	void ShowFilesCount(int diff);
 
+	/// Sets the displayed file count to an absolute value.
+	void SetFilesCount(int count);
 
-	/**
-	 * 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 file item.
-	 */
-	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;
+	/// Sets the "Total queue size:" label to the combined size of the shown files.
+	void SetTotalSize(uint64 total);
 
-	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData);
-	static int Compare( const CPartFile* file1, const CPartFile* file2, long lParamSort );
+	/// Delete/F2 key handling; see CMuleDataViewCtrl::OnListKey.
+	bool OnListKey(wxKeyEvent &event) override;
 
 	// Event-handlers for files
-	void	OnCancelFile( wxCommandEvent& event );
-	void	OnSetPriority( wxCommandEvent& event );
-	void	OnSwapSources( wxCommandEvent& event );
-	void	OnSetCategory( wxCommandEvent& event );
-	void	OnSetStatus( wxCommandEvent& event );
-	void	OnClearCompleted( wxCommandEvent& event );
-	void	OnGetLink( wxCommandEvent& event );
-	void	OnGetFeedback( wxCommandEvent& event );
-	void	OnViewFileInfo( wxCommandEvent& event );
-	void	OnViewFileComments( wxCommandEvent& event );
-	void	OnPreviewFile( wxCommandEvent& event );
-
-	// Misc event-handlers
-	void	OnItemActivated( wxListEvent& event );
-	void	OnMouseRightClick( wxListEvent& event );
-	void	OnMouseMiddleClick( wxListEvent& event );
-	void	OnKeyPressed( wxKeyEvent& event );
-	void	OnItemSelectionChanged( wxListEvent& event );
+	void OnCancelFile(wxCommandEvent &event);
+	void OnSetPriority(wxCommandEvent &event);
+	void OnSwapSources(wxCommandEvent &event);
+	void OnSetCategory(wxCommandEvent &event);
+	void OnSetStatus(wxCommandEvent &event);
+	void OnClearCompleted(wxCommandEvent &event);
+	void OnGetLink(wxCommandEvent &event);
+	void OnGetFeedback(wxCommandEvent &event);
+	void OnViewFileInfo(wxCommandEvent &event);
+	void OnViewFileComments(wxCommandEvent &event);
+	void OnPreviewFile(wxCommandEvent &event);
+	void OnShowInFolder(wxCommandEvent &event);
+	void OnRazorStatsCheck(wxCommandEvent &event);
 
 	/**
-	 * Executes the user-selected preview command on the specified file.
+	 * The item the context menu was built for, by identity rather than row.
 	 *
-	 * @file The file to be previewed.
-	 */
-	void PreviewFile(CPartFile* file);
-
-	/**
-	 * Show file detail dialog for item at index
+	 * The menu's enabled state is decided from this item, so the handlers act on it. A row
+	 * index would not survive the menu being open: PopupMenu runs a nested event loop, so
+	 * timers and EC updates keep mutating the list, and removing a row *above* this one shifts
+	 * every index below it -- the click would act on the neighbouring file. HasItemData() re-
+	 * checks that the item is still present before it is used.
 	 */
-	void ShowFileDetailDialog(long index);
+	wxUIntPtr m_menuItem = 0;
 
+	void OnItemActivated(wxDataViewEvent &event);
+	void OnItemRightClicked(wxDataViewEvent &event);
 
-	//! The type of list used to store items on the listctrl.
-	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.
-	typedef std::pair< ListItems::iterator, ListItems::iterator > ListIteratorPair;
+	/// Fires DoItemSelectionChanged(), which rebuilds the sources panel, unless a notification
+	/// is already pending -- m_ItemSelectionChangePending stops a burst of selection events (a
+	/// rubber-band over many rows) scheduling more than one.
+	void OnSelectionChanged(wxDataViewEvent &event);
+	//! Set while a DoItemSelectionChanged() notification is pending, so a
+	//! burst of selection events schedules only one.
+	bool m_ItemSelectionChangePending = false;
 
-	//! This list contains everything shown on the list. Sources are only to
-	//! be found on this list if they are being displayed, whereas files can
-	//! always be found on this list, even if they are currently hidden.
-	ListItems	m_ListItems;
+	/// Shows the file-detail dialog for the given row.
+	void ShowFileDetailDialog(long row);
 
+	//! Every known download, shown or hidden by the current category/filter.
+	//! RebuildVisibleList() walks this to decide what to show; AddFile() uses it to reject
+	//! duplicates.
+	std::set<CPartFile *> m_files;
 
 	//! 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;
+	wxMenu *m_menu = nullptr;
 
 	//! The currently displayed category
-	uint8 m_category;
+	uint8 m_category = 0;
 
-	//! Flag if change of item selection is pending
-	bool m_ItemSelectionChangePending;
+	//! True between BeginBatchUpdate()/EndBatchUpdate(): AddFile() appends
+	//! rows but defers the per-item SortList to one final sort (issue #444).
+	bool m_batchUpdate = false;
 
 	//! The number of displayed files
-	int m_filecount;
+	int m_filecount = 0;
 
-	wxDECLARE_EVENT_TABLE();
+	//! Combined size of the displayed files (drives the "Total queue size:" label)
+	uint64 m_shownSize = 0;
+
+	//! The "Free space:" label, resolved by name on first use. Lives in the
+	//! sources pane, so it cannot be reached through GetParent().
+	wxStaticText *m_freeSpaceLabel = nullptr;
+	wxStaticText *m_freeSpaceSepLabel = nullptr;
 
+	wxDECLARE_EVENT_TABLE();
 };
 
 #endif

amule-3.0.1.tar.gz/src/DownloadQueue.cpp -> amule-3.1.0.tar.gz/src/DownloadQueue.cpp Changed

@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "DownloadQueue.h"	// Interface declarations
+#include "DownloadQueue.h" // Interface declarations
 
 #include <protocol/Protocols.h>
 #include <protocol/kad/Constants.h>
@@ -33,45 +33,43 @@
 
 #include <wx/utils.h>
 
-#include "Server.h"		// Needed for CServer
-#include "Packet.h"		// Needed for CPacket
-#include "MemFile.h"		// Needed for CMemFile
-#include "ClientList.h"		// Needed for CClientList
-#include "updownclient.h"	// Needed for CUpDownClient
-#include "ServerList.h"		// Needed for CServerList
-#include "ServerConnect.h"	// Needed for CServerConnect
-#include "ED2KLink.h"		// Needed for CED2KFileLink
-#include "SearchList.h"		// Needed for CSearchFile
-#include "SharedFileList.h"	// Needed for CSharedFileList
-#include "PartFile.h"		// Needed for CPartFile
-#include "Preferences.h"	// Needed for thePrefs
-#include "amule.h"		// Needed for theApp
-#include "AsyncDNS.h"		// Needed for CAsyncDNS
+#include "Server.h"         // Needed for CServer
+#include "Packet.h"         // Needed for CPacket
+#include "MemFile.h"        // Needed for CMemFile
+#include "ClientList.h"     // Needed for CClientList
+#include "updownclient.h"   // Needed for CUpDownClient
+#include "ServerList.h"     // Needed for CServerList
+#include "ServerConnect.h"  // Needed for CServerConnect
+#include "ED2KLink.h"       // Needed for CED2KFileLink
+#include "SearchList.h"     // Needed for CSearchFile
+#include "SharedFileList.h" // Needed for CSharedFileList
+#include "PartFile.h"       // Needed for CPartFile
+#include "Preferences.h"    // Needed for thePrefs
+#include "amule.h"          // Needed for theApp
+#include "AsyncDNS.h"       // Needed for CAsyncDNS
 #include "DownloadBandwidthThrottler.h"
-#include "Statistics.h"		// Needed for theStats
+#include "Statistics.h" // Needed for theStats
 #include "Logger.h"
-#include <common/Format.h>	// Needed for CFormat
+#include <common/Format.h> // Needed for CFormat
 #include "IPFilter.h"
-#include <common/FileFunctions.h>	// Needed for CDirIterator
-#include "GuiEvents.h"		// Needed for Notify_*
+#include <common/FileFunctions.h> // Needed for CDirIterator
+#include "GuiEvents.h"            // Needed for Notify_*
 #include "UserEvents.h"
-#include "MagnetURI.h"		// Needed for CMagnetED2KConverter
-#include "ScopedPtr.h"		// Needed for CScopedPtr
-#include "PlatformSpecific.h"	// Needed for CanFSHandleLargeFiles
+#include "MagnetURI.h"        // Needed for CMagnetED2KConverter
+#include "ScopedPtr.h"        // Needed for CScopedPtr
+#include "PlatformSpecific.h" // Needed for CanFSHandleLargeFiles
 
 #include "kademlia/kademlia/Kademlia.h"
 
-// Max. file IDs per UDP packet
-// ----------------------------
-// 576 - 30 bytes of header (28 for UDP, 2 for "E3 9A" edonkey proto) = 546 bytes
-// 546 / 16 = 34
+// Max file IDs per UDP packet: 576 - 30 bytes of header (28 UDP, 2 "E3 9A" edonkey proto) = 546,
+// and 546 / 16 = 34.
 
-#define MAX_FILES_PER_UDP_PACKET	31	// 2+16*31 = 498 ... is still less than 512 bytes!!
-#define MAX_REQUESTS_PER_SERVER		35
+#define MAX_FILES_PER_UDP_PACKET 31 // 2+16*31 = 498 ... is still less than 512 bytes!!
+#define MAX_REQUESTS_PER_SERVER 35
 
 CDownloadQueue::CDownloadQueue()
 // Needs to be recursive that that is can own an observer assigned to itself
-	: m_mutex( wxMUTEX_RECURSIVE )
+: m_mutex(wxMUTEX_RECURSIVE)
 {
 	m_datarate = 0;
 	m_udpserver = 0;
@@ -91,11 +89,10 @@
 	SetLastKademliaFileRequest();
 }
 
-
 CDownloadQueue::~CDownloadQueue()
 {
-	if ( !m_filelist.empty() ) {
-		for ( FileQueue::size_type i = 0; i < m_filelist.size(); i++ ) {
+	if (!m_filelist.empty()) {
+		for (FileQueue::size_type i = 0; i < m_filelist.size(); i++) {
 			AddLogLineNS(CFormat(_("Saving PartFile %u of %u")) % (i + 1) % m_filelist.size());
 			delete m_filelisti;
 		}
@@ -103,14 +100,12 @@
 	}
 }
 
-
-void CDownloadQueue::LoadMetFiles(const CPath& path)
+void CDownloadQueue::LoadMetFiles(const CPath &path, const LoadProgressCb &progressCb)
 {
 	AddLogLineNS(CFormat(_("Loading temp files from %s.")) % path.GetPrintable());
 
 	std::vector<CPath> files;
 
-	// Locate part-files to be loaded
 	CDirIterator TempDir(path);
 	CPath fileName = TempDir.GetFirstFile(CDirIterator::File, "*.part.met");
 	while (fileName.IsOk()) {
@@ -123,62 +118,66 @@
 	// file is broken in case of crashes, or the like.
 	std::sort(files.begin(), files.end());
 
-	// Load part-files
-	for ( size_t i = 0; i < files.size(); i++ ) {
+	for (size_t i = 0; i < files.size(); i++) {
 		AddLogLineNS(CFormat(_("Loading PartFile %u of %u")) % (i + 1) % files.size());
+		if (progressCb) {
+			progressCb(i + 1, files.size());
+		}
 		fileName = filesi.GetFullName();
 		CPartFile *toadd = new CPartFile();
 		bool result = toadd->LoadPartFile(path, fileName) != 0;
 		if (!result) {
-			// Try from backup
 			result = toadd->LoadPartFile(path, fileName, true) != 0;
 		}
 		if (result && !IsFileExisting(toadd->GetFileHash())) {
 			{
 				wxMutexLocker lock(m_mutex);
 				m_filelist.push_back(toadd);
+				m_listGeneration.fetch_add(1, std::memory_order_relaxed);
 			}
 			NotifyObservers(EventType(EventType::INSERTED, toadd));
 			Notify_DownloadCtrlAddFile(toadd);
 		} else {
 			wxString msg;
 			if (result) {
-				msg << CFormat("WARNING: Duplicate partfile with hash '%s' found, skipping: %s")
-					% toadd->GetFileHash().Encode() % fileName;
+				msg << CFormat("WARNING: Duplicate partfile with hash '%s' found, skipping: "
+					       "%s") %
+						toadd->GetFileHash().Encode() % fileName;
 			} else {
-				// If result is false, then reading of both the primary and the backup .met failed
-				AddLogLineN(_("ERROR: Failed to load backup file. Search https://github.com/amule-org/amule/discussions for .part.met recovery solutions."));
+				// If result is false, then reading of both the primary and the backup .met
+				// failed
+				AddLogLineN(_("ERROR: Failed to load backup file. Search "
+					      "https://github.com/amule-org/amule/discussions for .part.met "
+					      "recovery solutions."));
 				msg << CFormat("ERROR: Failed to load PartFile '%s'") % fileName;
 			}
 			AddLogLineCS(msg);
 
-			// Delete the partfile object in the end.
 			delete toadd;
 		}
 	}
 	AddLogLineNS(_("All PartFiles Loaded."));
 
-	if ( GetFileCount() == 0 ) {
+	if (GetFileCount() == 0) {
 		AddLogLineN(_("No part files found"));
 	} else {
-		AddLogLineN(CFormat(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 );
+		CheckDiskspace(path);
 		Notify_ShowUpdateCatTabTitles();
 	}
 }
 
-
 uint16 CDownloadQueue::GetFileCount() const
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
 	return m_filelist.size();
 }
 
-
-void CDownloadQueue::CopyFileList(std::vector<CPartFile*>& out_list, bool includeCompleted) const
+void CDownloadQueue::CopyFileList(std::vector<CPartFile *> &out_list, bool includeCompleted) const
 {
 	wxMutexLocker lock(m_mutex);
 	uint32 reserve = m_filelist.size();
@@ -190,48 +189,45 @@
 		out_list.push_back(*it);
 	}
 	if (includeCompleted) {
-		for (FileList::const_iterator it = m_completedDownloads.begin(); it != m_completedDownloads.end(); ++it) {
+		for (FileList::const_iterator it = m_completedDownloads.begin();
+			it != m_completedDownloads.end();
+			++it) {
 			out_list.push_back(*it);
 		}
 	}
 }
 
-
-CServer* CDownloadQueue::GetUDPServer() const
+CServer *CDownloadQueue::GetUDPServer() const
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
 	return m_udpserver;
 }
 
-
-void CDownloadQueue::SetUDPServer( CServer* server )
+void CDownloadQueue::SetUDPServer(CServer *server)
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
 	m_udpserver = server;
 }
 
-
 void CDownloadQueue::SaveSourceSeeds()
 {
-	for ( uint16 i = 0; i < GetFileCount(); i++ ) {
-		GetFileByIndex( i )->SaveSourceSeeds();
+	for (uint16 i = 0; i < GetFileCount(); i++) {
+		GetFileByIndex(i)->SaveSourceSeeds();
 	}
 }
 
-
 void CDownloadQueue::LoadSourceSeeds()
 {
-	for ( uint16 i = 0; i < GetFileCount(); i++ ) {
-		GetFileByIndex( i )->LoadSourceSeeds();
+	for (uint16 i = 0; i < GetFileCount(); i++) {
+		GetFileByIndex(i)->LoadSourceSeeds();
 	}
 }
 
-
-void CDownloadQueue::AddSearchToDownload(CSearchFile* toadd, uint8 category)
+void CDownloadQueue::AddSearchToDownload(CSearchFile *toadd, uint8 category)
 {
-	if ( IsFileExisting(toadd->GetFileHash()) ) {
+	if (IsFileExisting(toadd->GetFileHash(), toadd->GetFileName().GetPrintable())) {
 		return;
 	}
 
@@ -239,47 +235,54 @@
 		if (!PlatformSpecific::CanFSHandleLargeFiles(thePrefs::GetTempDir())) {
 			AddLogLineC(_("Filesystem for Temp directory cannot handle large files."));
 			return;
-		} else if (!PlatformSpecific::CanFSHandleLargeFiles(theApp->glob_prefs->GetCatPath(category))) {
+		} else if (!PlatformSpecific::CanFSHandleLargeFiles(
+				   theApp->glob_prefs->GetCatPath(category))) {
 			AddLogLineC(_("Filesystem for Incoming directory cannot handle large files."));
 			return;
 		}
 	}
 
-	CPartFile* newfile = NULL;
+	CPartFile *newfile = NULL;
 	try {
 		newfile = new CPartFile(toadd);
-	} catch (const CInvalidPacket& WXUNUSED(e)) {
+	} catch (const CInvalidPacket &WXUNUSED(e)) {
 		AddDebugLogLineC(logDownloadQueue, "Search-result contained invalid tags, could not add");
 	}
 
-	if ( newfile && newfile->GetStatus() != PS_ERROR ) {
-		AddDownload( newfile, thePrefs::AddNewFilesPaused(), category );
-		// Add any possible sources
+	if (newfile && newfile->GetStatus() != PS_ERROR) {
+		AddDownload(newfile, thePrefs::AddNewFilesPaused(), category);
 		if (toadd->GetClientID() && toadd->GetClientPort()) {
-			CMemFile sources(1+4+2);
+			CMemFile sources(1 + 4 + 2);
 			sources.WriteUInt8(1);
 			sources.WriteUInt32(toadd->GetClientID());
 			sources.WriteUInt16(toadd->GetClientPort());
 			sources.Reset();
-			newfile->AddSources(sources, toadd->GetClientServerIP(), toadd->GetClientServerPort(), SF_SEARCH_RESULT, false);
+			newfile->AddSources(sources,
+				toadd->GetClientServerIP(),
+				toadd->GetClientServerPort(),
+				SF_SEARCH_RESULT,
+				false);
 		}
-		for (std::list<CSearchFile::ClientStruct>::const_iterator it = toadd->GetClients().begin(); it != toadd->GetClients().end(); ++it) {
-			CMemFile sources(1+4+2);
+		for (std::list<CSearchFile::ClientStruct>::const_iterator it = toadd->GetClients().begin();
+			it != toadd->GetClients().end();
+			++it) {
+			CMemFile sources(1 + 4 + 2);
 			sources.WriteUInt8(1);
 			sources.WriteUInt32(it->m_ip);
 			sources.WriteUInt16(it->m_port);
 			sources.Reset();
-			newfile->AddSources(sources, it->m_serverIP, it->m_serverPort, SF_SEARCH_RESULT, false);
+			newfile->AddSources(
+				sources, it->m_serverIP, it->m_serverPort, SF_SEARCH_RESULT, false);
 		}
 	} else {
 		delete newfile;
 	}
 }
 
-
 struct SFindBestPF
 {
-	void operator()(CPartFile* file) {
+	void operator()(CPartFile *file)
+	{
 		// Check if we should filter out other categories
 		int alphaorder = 0;
 
@@ -287,7 +290,9 @@
 			return;
 		} else if (file->GetStatus() != PS_PAUSED) {
 			return;
-		} else if (m_alpha && m_result && ((alphaorder = file->GetFileName().GetPrintable().CmpNoCase(m_result->GetFileName().GetPrintable())) > 0)) {
+		} else if (m_alpha && m_result &&
+			   ((alphaorder = file->GetFileName().GetPrintable().CmpNoCase(
+				     m_result->GetFileName().GetPrintable())) > 0)) {
 			return;
 		}
 
@@ -297,10 +302,10 @@
 			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)
+				// 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
 			}
 		}
 	}
@@ -308,35 +313,30 @@
 	//! The category to look for, or -1 if any category is good
 	int m_category;
 	//! If any acceptable files are found, this variable store their pointer
-	CPartFile* m_result;
+	CPartFile *m_result;
 	//! If we should order alphabetically
 	bool m_alpha;
 };
 
-
-void CDownloadQueue::StartNextFile(CPartFile* oldfile)
+void CDownloadQueue::StartNextFile(CPartFile *oldfile)
 {
-	if ( thePrefs::StartNextFile() ) {
+	if (thePrefs::StartNextFile()) {
 		SFindBestPF visitor = { -1, NULL, thePrefs::StartNextFileAlpha() };
 
 		{
 			wxMutexLocker lock(m_mutex);
 
 			if (thePrefs::StartNextFileSame()) {
-				// Get a download in the same category
 				visitor.m_category = oldfile->GetCategory();
 
 				visitor = std::for_each(m_filelist.begin(), m_filelist.end(), visitor);
 			}
 
 			if (visitor.m_result == NULL) {
-				// Get a download, regardless of category
 				visitor.m_category = -1;
 
 				visitor = std::for_each(m_filelist.begin(), m_filelist.end(), visitor);
 			}
-
-			// Alpha doesn't need special cases
 		}
 
 		if (visitor.m_result) {
@@ -345,8 +345,7 @@
 	}
 }
 
-
-void CDownloadQueue::AddDownload(CPartFile* file, bool paused, uint8 category)
+void CDownloadQueue::AddDownload(CPartFile *file, bool paused, uint8 category)
 {
 	wxCHECK_RET(!IsFileExisting(file->GetFileHash()), "Adding duplicate part-file");
 
@@ -358,74 +357,103 @@
 
 	{
 		wxMutexLocker lock(m_mutex);
-		m_filelist.push_back( file );
+		m_filelist.push_back(file);
+		m_listGeneration.fetch_add(1, std::memory_order_relaxed);
 		DoSortByPriority();
 	}
 
-	NotifyObservers( EventType( EventType::INSERTED, file ) );
+	NotifyObservers(EventType(EventType::INSERTED, file));
 	if (category < theApp->glob_prefs->GetCatCount()) {
 		file->SetCategory(category);
 	} else {
-		AddDebugLogLineN( logDownloadQueue, "Tried to add download into invalid category." );
+		AddDebugLogLineN(logDownloadQueue, "Tried to add download into invalid category.");
 	}
-	Notify_DownloadCtrlAddFile( file );
-	theApp->searchlist->UpdateSearchFileByHash(file->GetFileHash());	// Update file in the search dialog if it's still open
-	AddLogLineC(CFormat(_("Downloading %s")) % file->GetFileName() );
+	Notify_DownloadCtrlAddFile(file);
+	theApp->searchlist->UpdateSearchFileByHash(
+		file->GetFileHash()); // Update file in the search dialog if it's still open
+	AddLogLineC(CFormat(_("Downloading %s")) % file->GetFileName());
 }
 
-
-bool CDownloadQueue::IsFileExisting( const CMD4Hash& fileid ) const
+bool CDownloadQueue::IsFileExisting(const CMD4Hash &fileid, const wxString &requestedName)
 {
-	if (CKnownFile* file = theApp->sharedfiles->GetFileByID(fileid)) {
+	if (CKnownFile *file = theApp->sharedfiles->GetFileByID(fileid)) {
 		if (file->IsPartFile()) {
-			AddLogLineC(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.
 			CPath fullpath = file->GetFilePath().JoinPaths(file->GetFileName());
 			if (!fullpath.FileExists()) {
-				// The file is no longer available, unshare it
 				theApp->sharedfiles->RemoveFile(file);
 
 				return false;
 			}
 
-			AddLogLineC(CFormat( _("You already have the file '%s'") ) % fullpath);
+			// Files are matched by hash, so the already-present file can carry a
+			// different name than the one requested. Surface the requested name too
+			// when it differs, so the log can be correlated with the search result or
+			// ed2k link the download started from.
+			if (!requestedName.IsEmpty() && requestedName != file->GetFileName().GetPrintable()) {
+				AddLogLineC(CFormat(_("You already have the file '%s' (requested as '%s')")) %
+					    fullpath % requestedName);
+			} else {
+				AddLogLineC(CFormat(_("You already have the file '%s'")) % fullpath);
+			}
 		}
 
 		return true;
 	} else if ((file = GetFileByID(fileid))) {
-		AddLogLineC(CFormat( _("You are already trying to download the file %s") ) % file->GetFileName());
+		// GetFileByID() also returns finished downloads still lingering in
+		// m_completedDownloads, kept so a remote GUI can act on them. Such an entry is not
+		// an active download, so a file deleted from disk must not keep blocking a re-
+		// download -- a prior shares rescan removes it from the shared list and leaves only
+		// this entry, which had no such check.
+		CPartFile *part = static_cast<CPartFile *>(file);
+		if (part->IsCompleted()) {
+			CPath fullpath = part->GetFilePath().JoinPaths(part->GetFileName());
+			if (!fullpath.FileExists()) {
+				ClearCompleted(ListOfUInts32(1, part->ECID()));
+				return false;
+			}
+		}
+		AddLogLineC(
+			CFormat(_("You are already trying to download the file %s")) % file->GetFileName());
 		return true;
 	}
 
 	return false;
 }
 
-#define RARITY_FACTOR 4 // < 25%
+#define RARITY_FACTOR 4    // < 25%
 #define NORMALITY_FACTOR 2 // <50%
 // x > NORMALITY_FACTOR -> High availability.
 
 void CDownloadQueue::Process()
 {
-	// send src requests to local server
 	ProcessLocalRequests();
 	const uint64 curTick = ::GetTickCount64();
+
+	// Refill the global download bucket for this tick. The throttler is a single shared atomic
+	// budget every CEMSocket consults before each Read(), so fast peers can claim unused
+	// capacity from slow ones within a tick and the global cap is the only constraint; the
+	// previous per-peer ratio controller never enforced MaxDownload as a literal byte/sec cap.
+	// MaxDownload=0 is bypass mode.
+	//
+	// Both calls run before the lock, and the wake immediately after the refill, because the
+	// part-file walk below reads from every downloading socket synchronously while holding the
+	// lock. Refilling inside that block and waking after it hands the whole tick's budget to
+	// the peers we are downloading from, so a socket parked mid-packet -- the browse or chat
+	// answer this wake exists for -- finds an empty bucket every tick and never finishes
+	// reading.
+	CDownloadBandwidthThrottler::Get().RefillBudget(thePrefs::GetMaxDownload(), CORE_TIMER_PERIOD);
+	// Outside the lock on purpose: this re-enters CEMSocket::OnReceive(),
+	// which parses packets and can reach back into the download queue.
+	CDownloadBandwidthThrottler::Get().WakePaused();
+
 	{
 		wxMutexLocker lock(m_mutex);
 
-		// Refill the global download bucket for this tick. The previous
-		// per-peer ratio controller (50-200% adaptive against the
-		// observed aggregate datarate) never actually enforced
-		// MaxDownload as a literal byte/sec cap. The throttler is a
-		// single shared atomic budget that every CEMSocket consults
-		// before each Read(); fast peers can claim unused capacity
-		// from slow ones within the same tick (demand-aware
-		// redistribution), and the global cap is the only constraint.
-		// MaxDownload=0 (UNLIMITED) sets the throttler to bypass mode.
-		CDownloadBandwidthThrottler::Get().RefillBudget(
-			thePrefs::GetMaxDownload(), CORE_TIMER_PERIOD);
-
 		m_datarate = 0;
 		m_udcounter++;
 		uint32 cur_datarate = 0;
@@ -435,31 +463,30 @@
 
 		bool mustPreventSleep = false;
 
-		for ( FileQueue::size_type i = 0; i < m_filelist.size(); i++ ) {
-			CPartFile* file = m_filelisti;
+		for (FileQueue::size_type i = 0; i < m_filelist.size(); i++) {
+			CPartFile *file = m_filelisti;
 
 			CMutexUnlocker unlocker(m_mutex);
 
 			uint8 status = file->GetStatus();
-			mustPreventSleep |= !(status == PS_ERROR || status == PS_INSUFFICIENT || status == PS_PAUSED || status == PS_COMPLETE);
+			mustPreventSleep |= !(status == PS_ERROR || status == PS_INSUFFICIENT ||
+					      status == PS_PAUSED || status == PS_COMPLETE);
 
-			if (status == PS_READY || status == PS_EMPTY ){
-				cur_datarate += file->Process( cur_udcounter );
+			if (status == PS_READY || status == PS_EMPTY) {
+				cur_datarate += file->Process(cur_udcounter);
 			} else {
-				//This will make sure we don't keep old sources to paused and stopped files..
+				// This will make sure we don't keep old sources to paused and stopped files..
 				file->StopPausedFile();
 
 				// Drain leftover Phase 3 hash work for paused files: their
-				// Process() doesn't run (gated above), but pre-pause
-				// m_aChangedPart entries still need verification.
+				// Process() does not run, but pre-pause m_aChangedPart entries
+				// still need verification.
 				//
-				// PS_INSUFFICIENT is intentionally excluded — driving
-				// FlushBuffer for a disk-full file re-enters its disk-space
-				// check at PartFile.cpp:3083 every tick, which logs
-				// "Not enough free disk-space" and re-pauses on every call,
-				// producing tens of log lines per second.  The destructor
-				// sync-hash drain still covers leftover dirty parts of
-				// disk-full files at shutdown.
+				// PS_INSUFFICIENT is excluded on purpose: driving FlushBuffer for a
+				// disk-full file re-enters its disk-space check every tick, logging
+				// "Not enough free disk-space" and re-pausing tens of times a
+				// second. The destructor's sync-hash drain still covers their
+				// leftover dirty parts at shutdown.
 				if (status == PS_PAUSED && file->HasPendingHashWork()) {
 					file->FlushBuffer();
 				}
@@ -471,7 +498,8 @@
 		}
 
 		if (thePrefs::GetPreventSleepWhileDownloading()) {
-			if ((mustPreventSleep == false) && (theStats::GetSessionSentBytes() < theStats::GetSessionReceivedBytes())) {
+			if ((mustPreventSleep == false) &&
+				(theStats::GetSessionSentBytes() < theStats::GetSessionReceivedBytes())) {
 				// I can see right through your clever plan.
 				mustPreventSleep = true;
 			}
@@ -487,7 +515,6 @@
 			PlatformSpecific::AllowSleepMode();
 		}
 
-		// Set the source rarity thresholds
 		int nSourceGroups = m_sourcecountlist.size();
 		if (nSourceGroups) {
 			m_sourcecountlist.sort();
@@ -497,24 +524,27 @@
 				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_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 rare_cut_point = (nSourceGroups / RARITY_FACTOR);
-				for (int i = 0; i < rare_cut_point; ++ i) {
+				for (int i = 0; i < rare_cut_point; ++i) {
 					m_sourcecountlist.pop_front();
 				}
-				m_rareFileThreshold = (m_sourcecountlist.front() > 0) ? (m_sourcecountlist.front() - 1) : 1;
+				m_rareFileThreshold =
+					(m_sourcecountlist.front() > 0) ? (m_sourcecountlist.front() - 1) : 1;
 
 				// 50% of the non-rare ones, with the current #define values.
 				int common_cut_point = (nSourceGroups - rare_cut_point) / NORMALITY_FACTOR;
-				for (int i = 0; i < common_cut_point; ++ i) {
+				for (int i = 0; i < common_cut_point; ++i) {
 					m_sourcecountlist.pop_front();
 				}
-				m_commonFileThreshold = (m_sourcecountlist.front() > 0) ? (m_sourcecountlist.front() - 1) : 1;
+				m_commonFileThreshold =
+					(m_sourcecountlist.front() > 0) ? (m_sourcecountlist.front() - 1) : 1;
 			}
 		} else {
 			m_rareFileThreshold = RARE_FILE;
@@ -525,7 +555,7 @@
 
 		if (m_udcounter == 5) {
 			if (theApp->serverconnect->IsUDPSocketAvailable()) {
-				if( (curTick - m_lastudpstattime) > UDPSERVERSTATTIME) {
+				if ((curTick - m_lastudpstattime) > UDPSERVERSTATTIME) {
 					m_lastudpstattime = curTick;
 
 					CMutexUnlocker unlocker(m_mutex);
@@ -537,21 +567,19 @@
 		if (m_udcounter == 10) {
 			m_udcounter = 0;
 			if (theApp->serverconnect->IsUDPSocketAvailable()) {
-				if ( (curTick - m_lastudpsearchtime) > UDPSERVERREASKTIME) {
+				if ((curTick - m_lastudpsearchtime) > UDPSERVERREASKTIME) {
 					SendNextUDPPacket();
 				}
 			}
 		}
 
-		if ( (curTick - m_lastsorttime) > 10000 ) {
+		if ((curTick - m_lastsorttime) > 10000) {
 			DoSortByPriority();
 		}
-		// Check if any paused files can be resumed
 
 		CheckDiskspace(thePrefs::GetTempDir());
 	}
 
-
 	// Check for new links once per second.
 	if ((curTick - m_nLastED2KLinkCheck) >= 1000) {
 		theApp->AddLinksFromFile();
@@ -559,19 +587,19 @@
 	}
 }
 
-
-CPartFile* CDownloadQueue::GetFileByID(const CMD4Hash& filehash) const
+CPartFile *CDownloadQueue::GetFileByID(const CMD4Hash &filehash) const
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
-	for ( FileQueue::size_type i = 0; i < m_filelist.size(); ++i ) {
-		if ( filehash == m_filelisti->GetFileHash()) {
-			return m_filelist i ;
+	for (FileQueue::size_type i = 0; i < m_filelist.size(); ++i) {
+		if (filehash == m_filelisti->GetFileHash()) {
+			return m_filelisti;
 		}
 	}
 	// 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()) {
+	for (FileList::const_iterator it = m_completedDownloads.begin(); it != m_completedDownloads.end();
+		++it) {
+		if (filehash == (*it)->GetFileHash()) {
 			return *it;
 		}
 	}
@@ -579,21 +607,19 @@
 	return NULL;
 }
 
-
-CPartFile* CDownloadQueue::GetFileByIndex(unsigned int index)  const
+CPartFile *CDownloadQueue::GetFileByIndex(unsigned int index) const
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
-	if ( index < m_filelist.size() ) {
-		return m_filelist index ;
+	if (index < m_filelist.size()) {
+		return m_filelistindex;
 	}
 
 	wxFAIL;
 	return NULL;
 }
 
-
-bool CDownloadQueue::IsPartFile(const CKnownFile* file) const
+bool CDownloadQueue::IsPartFile(const CKnownFile *file) const
 {
 	wxMutexLocker lock(m_mutex);
 
@@ -606,26 +632,24 @@
 	return false;
 }
 
-
 void CDownloadQueue::OnConnectionState(bool bConnected)
 {
 	wxMutexLocker lock(m_mutex);
 
 	for (FileQueue::size_type i = 0; i < m_filelist.size(); ++i) {
-		if (	m_filelisti->GetStatus() == PS_READY ||
-			m_filelisti->GetStatus() == PS_EMPTY) {
+		if (m_filelisti->GetStatus() == PS_READY || m_filelisti->GetStatus() == PS_EMPTY) {
 			m_filelisti->SetActive(bConnected);
 		}
 	}
 }
 
-
-void CDownloadQueue::CheckAndAddSource(CPartFile* sender, CUpDownClient* source)
+void CDownloadQueue::CheckAndAddSource(CPartFile *sender, CUpDownClient *source)
 {
 	// if we block loopbacks at this point it should prevent us from connecting to ourself
-	if ( source->HasValidHash() ) {
-		if ( source->GetUserHash() == thePrefs::GetUserHash() ) {
-			AddDebugLogLineN( logDownloadQueue, "Tried to add source with matching hash to your own." );
+	if (source->HasValidHash()) {
+		if (source->GetUserHash() == thePrefs::GetUserHash()) {
+			AddDebugLogLineN(
+				logDownloadQueue, "Tried to add source with matching hash to your own.");
 			source->Safe_Delete();
 			return;
 		}
@@ -637,32 +661,32 @@
 	}
 
 	// Filter sources which are known to be dead/useless
-	if ( theApp->clientlist->IsDeadSource( source ) || sender->IsDeadSource(source) ) {
+	if (theApp->clientlist->IsDeadSource(source) || sender->IsDeadSource(source)) {
 		source->Safe_Delete();
 		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()))) {
+	// 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();
 		return;
 	}
 
-	// Find all clients with the same hash
-	if ( source->HasValidHash() ) {
-		CClientList::SourceList found = theApp->clientlist->GetClientsByHash( source->GetUserHash() );
+	if (source->HasValidHash()) {
+		CClientList::SourceList found = theApp->clientlist->GetClientsByHash(source->GetUserHash());
 
 		CClientList::SourceList::iterator it = found.begin();
-		for ( ; it != found.end(); ++it ) {
-			CKnownFile* file = it->GetRequestFile();
+		for (; it != found.end(); ++it) {
+			CKnownFile *file = it->GetRequestFile();
 
-			// Only check files on the download-queue
-			if ( file ) {
+			if (file) {
 				// Is the found source queued for something else?
-				if (  file != sender ) {
-					// Try to add a request for the other file
-					if ( it->GetClient()->AddRequestForAnotherFile(sender)) {
-						// Add it to downloadlistctrl
+				if (file != sender) {
+					if (it->GetClient()->AddRequestForAnotherFile(sender)) {
 						Notify_SourceCtrlAddSource(sender, *it, A4AF_SOURCE);
 					}
 				}
@@ -673,168 +697,182 @@
 		}
 	}
 
-
-
-	// Our new source is real new but maybe it is already uploading to us?
-	// If yes the known client will be attached to the var "source" and the old
-	// source-client will be deleted. However, if the request file of the known
-	// source is NULL, then we have to treat it almost like a new source and if
-	// it isn't NULL and not "sender", then we shouldn't move it, but rather add
-	// a request for the new file.
+	// The source may be new to us but already uploading to us. If so the known client is
+	// attached to `source` and the old source-client is deleted. A known source whose request
+	// file is NULL is treated almost like a new one; if it is neither NULL nor `sender`, add a
+	// request for the new file rather than moving it.
 	ESourceFrom nSourceFrom = source->GetSourceFrom();
-	if ( theApp->clientlist->AttachToAlreadyKnown(&source, 0) ) {
+	if (theApp->clientlist->AttachToAlreadyKnown(&source, 0)) {
 		// Already queued for another file?
-		if ( source->GetRequestFile() ) {
+		if (source->GetRequestFile()) {
 			// If we're already queued for the right file, then there's nothing to do
-			if ( sender != source->GetRequestFile() ) {
-				// Add the new file to the request list
-				source->AddRequestForAnotherFile( sender );
+			if (sender != source->GetRequestFile()) {
+				source->AddRequestForAnotherFile(sender);
 			}
 		} else {
 			// Source was known, but reqfile NULL.
-			source->SetRequestFile( sender );
+			source->SetRequestFile(sender);
 			source->SetSourceFrom(nSourceFrom);
-			sender->AddSource( source );
-			if ( source->GetFileRating() || !source->GetFileComment().IsEmpty() ) {
+			sender->AddSource(source);
+			if (source->GetFileRating() || !source->GetFileComment().IsEmpty()) {
 				sender->UpdateFileRatingCommentAvail();
 			}
 
-			Notify_SourceCtrlAddSource(sender, CCLIENTREF(source, "CDownloadQueue::CheckAndAddSource Notify_SourceCtrlAddSource 1"), UNAVAILABLE_SOURCE);
+			Notify_SourceCtrlAddSource(sender,
+				CCLIENTREF(source,
+					"CDownloadQueue::CheckAndAddSource Notify_SourceCtrlAddSource 1"),
+				UNAVAILABLE_SOURCE);
 		}
 	} else {
-		// Unknown client, add it to the clients list
-		source->SetRequestFile( sender );
+		source->SetRequestFile(sender);
 
 		theApp->clientlist->AddClient(source);
 
-		sender->AddSource( source );
-		if ( source->GetFileRating() || !source->GetFileComment().IsEmpty() ) {
+		sender->AddSource(source);
+		if (source->GetFileRating() || !source->GetFileComment().IsEmpty()) {
 			sender->UpdateFileRatingCommentAvail();
 		}
 
-		Notify_SourceCtrlAddSource(sender, CCLIENTREF(source, "CDownloadQueue::CheckAndAddSource Notify_SourceCtrlAddSource 2"), UNAVAILABLE_SOURCE);
+		Notify_SourceCtrlAddSource(sender,
+			CCLIENTREF(source, "CDownloadQueue::CheckAndAddSource Notify_SourceCtrlAddSource 2"),
+			UNAVAILABLE_SOURCE);
 	}
 }
 
-
-void CDownloadQueue::CheckAndAddKnownSource(CPartFile* sender,CUpDownClient* source)
+void CDownloadQueue::CheckAndAddKnownSource(CPartFile *sender, CUpDownClient *source)
 {
-	// Kad reviewed
 
 	if (sender->IsStopped()) {
 		return;
 	}
 
 	// Filter sources which are known to be dead/useless
-	if ( sender->IsDeadSource(source) ) {
+	if (sender->IsDeadSource(source)) {
 		return;
 	}
 
-	// "Filter LAN IPs" -- this may be needed here in case we are connected to the internet and are also connected
-	// to a LAN and some client from within the LAN connected to us. Though this situation may be supported in future
-	// by adding that client to the source list and filtering that client's LAN IP when sending sources to
-	// a client within the internet.
-	//
-	// "IPfilter" is not needed here, because that "known" client was already IPfiltered when receiving OP_HELLO.
+	// "Filter LAN IPs" is needed here for the case where we are on the internet and also on a
+	// LAN, and a client from within the LAN connects to us. "IPfilter" is not, because that
+	// known client was already IPfiltered when receiving OP_HELLO.
 	if (!source->HasLowID()) {
 		uint32 nClientIP = wxUINT32_SWAP_ALWAYS(source->GetUserIDHybrid());
-		if (!IsGoodIP(nClientIP, thePrefs::FilterLanIPs())) { // check for 0-IP, localhost and LAN addresses
-			AddDebugLogLineN(logIPFilter, "Ignored already known source with IP=%s" + Uint32toStringIP(nClientIP));
+		if (!IsGoodIP(nClientIP,
+			    thePrefs::FilterLanIPs())) { // check for 0-IP, localhost and LAN addresses
+			AddDebugLogLineN(logIPFilter,
+				"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()))) {
+	// 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()))) {
 		return;
 	}
 
-	CPartFile* file = source->GetRequestFile();
+	CPartFile *file = source->GetRequestFile();
 
 	// Check if the file is already queued for something else
-	if ( file ) {
-		if ( file != sender ) {
-			if ( source->AddRequestForAnotherFile( sender ) ) {
-				Notify_SourceCtrlAddSource( sender, CCLIENTREF(source, "CDownloadQueue::CheckAndAddKnownSource Notify_SourceCtrlAddSource 1"), A4AF_SOURCE );
+	if (file) {
+		if (file != sender) {
+			if (source->AddRequestForAnotherFile(sender)) {
+				Notify_SourceCtrlAddSource(sender,
+					CCLIENTREF(source,
+						"CDownloadQueue::CheckAndAddKnownSource "
+						"Notify_SourceCtrlAddSource 1"),
+					A4AF_SOURCE);
 			}
 		}
 	} else {
-		source->SetRequestFile( sender );
+		source->SetRequestFile(sender);
 
-		if ( source->GetFileRating() || !source->GetFileComment().IsEmpty() ) {
+		if (source->GetFileRating() || !source->GetFileComment().IsEmpty()) {
 			sender->UpdateFileRatingCommentAvail();
 		}
 
 		source->SetSourceFrom(SF_PASSIVE);
-		sender->AddSource( source );
-		Notify_SourceCtrlAddSource( sender, CCLIENTREF(source, "CDownloadQueue::CheckAndAddKnownSource Notify_SourceCtrlAddSource 2"), UNAVAILABLE_SOURCE);
+		sender->AddSource(source);
+		Notify_SourceCtrlAddSource(sender,
+			CCLIENTREF(source,
+				"CDownloadQueue::CheckAndAddKnownSource Notify_SourceCtrlAddSource 2"),
+			UNAVAILABLE_SOURCE);
 	}
 }
 
-
-bool CDownloadQueue::RemoveSource(CUpDownClient* toremove, bool	WXUNUSED(updatewindow), bool bDoStatsUpdate)
+bool CDownloadQueue::RemoveSource(CUpDownClient *toremove, bool WXUNUSED(updatewindow), bool bDoStatsUpdate)
 {
 	bool removed = false;
 	toremove->DeleteAllFileRequests();
 
-	for ( uint16 i = 0; i < GetFileCount(); i++ ) {
-		CPartFile* cur_file = GetFileByIndex( i );
+	for (uint16 i = 0; i < GetFileCount(); i++) {
+		CPartFile *cur_file = GetFileByIndex(i);
 
-		// Remove from source-list
-		if ( cur_file->DelSource( toremove ) ) {
+		if (cur_file->DelSource(toremove)) {
 
-			// Remove from sourcelist widget
 			Notify_SourceCtrlRemoveSource(toremove->ECID(), cur_file);
 
 			cur_file->RemoveDownloadingSource(toremove);
 			removed = true;
-			if ( bDoStatsUpdate ) {
+			if (bDoStatsUpdate) {
 				cur_file->UpdatePartsInfo();
 			}
 		}
 
-		// Remove from A4AF-list
-		cur_file->RemoveA4AFSource( toremove );
+		cur_file->RemoveA4AFSource(toremove);
 	}
 
-
-	if ( !toremove->GetFileComment().IsEmpty() || toremove->GetFileRating()>0) {
+	if (!toremove->GetFileComment().IsEmpty() || toremove->GetFileRating() > 0) {
 		toremove->GetRequestFile()->UpdateFileRatingCommentAvail();
 	}
 
-	toremove->SetRequestFile( NULL );
+	toremove->SetRequestFile(NULL);
 	toremove->SetDownloadState(DS_NONE);
 	toremove->ResetFileStatusInfo();
 
 	return removed;
 }
 
-
-void CDownloadQueue::RemoveFile(CPartFile* file, bool keepAsCompleted)
+void CDownloadQueue::RemoveFile(CPartFile *file, bool keepAsCompleted)
 {
-	RemoveLocalServerRequest( file );
+	RemoveLocalServerRequest(file);
 
-	NotifyObservers( EventType( EventType::REMOVED, file ) );
+	NotifyObservers(EventType(EventType::REMOVED, file));
 
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
-	EraseValue( m_filelist, file );
+	EraseValue(m_filelist, file);
+	m_listGeneration.fetch_add(1, std::memory_order_relaxed);
 
 	if (keepAsCompleted) {
 		m_completedDownloads.push_back(file);
+		m_listGeneration.fetch_add(1, std::memory_order_relaxed);
 	}
 }
 
-
-void CDownloadQueue::ClearCompleted(const ListOfUInts32 & ecids)
+void CDownloadQueue::ClearCompleted(const ListOfUInts32 &ecids)
 {
+	// This used to walk and erase m_completedDownloads with m_mutex unheld, unlike every other
+	// mutator, while CopyFileList reads that same list under the lock. It mattered less when
+	// the EC file-list reconcile ran unconditionally: a reconcile that raced an erase healed on
+	// the next poll. It matters now that the reconcile is skipped while the list generation is
+	// unchanged -- an erase observed as "already seen" is never reconciled, and the entry stays
+	// in the client's list for the life of the connection.
+	//
+	// Holding the lock across Notify_DownloadCtrlRemoveFile is safe: m_mutex is
+	// wxMUTEX_RECURSIVE, so a notify handler that re-enters the queue re-acquires it rather
+	// than deadlocking.
+	wxMutexLocker lock(m_mutex);
 	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;
+		for (FileList::iterator it = m_completedDownloads.begin(); it != m_completedDownloads.end();
+			++it) {
+			CPartFile *file = *it;
 			if (file->ECID() == ecid) {
 				m_completedDownloads.erase(it);
+				m_listGeneration.fetch_add(1, std::memory_order_relaxed);
 				// get a new EC ID so it is resent and cleared in remote gui
 				file->RenewECID();
 				Notify_DownloadCtrlRemoveFile(file);
@@ -844,16 +882,15 @@
 	}
 }
 
-
-CUpDownClient* CDownloadQueue::GetDownloadClientByIP_UDP(uint32 dwIP, uint16 nUDPPort) const
+CUpDownClient *CDownloadQueue::GetDownloadClientByIP_UDP(uint32 dwIP, uint16 nUDPPort) const
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
-	for ( FileQueue::size_type i = 0; i < m_filelist.size(); i++ ) {
-		const CKnownFile::SourceSet& set = m_filelisti->GetSourceList();
+	for (FileQueue::size_type i = 0; i < m_filelist.size(); i++) {
+		const CKnownFile::SourceSet &set = m_filelisti->GetSourceList();
 
-		for ( CKnownFile::SourceSet::const_iterator it = set.begin(); it != set.end(); ++it ) {
-			if ( it->GetIP() == dwIP && it->GetUDPPort() == nUDPPort ) {
+		for (CKnownFile::SourceSet::const_iterator it = set.begin(); it != set.end(); ++it) {
+			if (it->GetIP() == dwIP && it->GetUDPPort() == nUDPPort) {
 				return it->GetClient();
 			}
 		}
@@ -861,11 +898,10 @@
 	return NULL;
 }
 
-
 /**
  * Checks if the specified server is the one we are connected to.
  */
-static bool IsConnectedServer(const CServer* server)
+static bool IsConnectedServer(const CServer *server)
 {
 	if (server && theApp->serverconnect->GetCurrentServer()) {
 		wxString srvAddr = theApp->serverconnect->GetCurrentServer()->GetAddress();
@@ -877,24 +913,21 @@
 	return false;
 }
 
-
 bool CDownloadQueue::SendNextUDPPacket()
 {
-	if ( m_filelist.empty() || !theApp->serverconnect->IsUDPSocketAvailable() || !theApp->IsConnectedED2K()) {
+	if (m_filelist.empty() || !theApp->serverconnect->IsUDPSocketAvailable() ||
+		!theApp->IsConnectedED2K()) {
 		return false;
 	}
 
-	// Start monitoring the server and the files list
-	if ( !m_queueServers.IsActive() ) {
-		AddObserver( &m_queueFiles );
+	if (!m_queueServers.IsActive()) {
+		AddObserver(&m_queueFiles);
 
-		theApp->serverlist->AddObserver( &m_queueServers );
+		theApp->serverlist->AddObserver(&m_queueServers);
 	}
 
-
 	bool packetSent = false;
-	while ( !packetSent ) {
-		// Get max files ids per packet for current server
+	while (!packetSent) {
 		int filesAllowed = GetMaxFilesPerUDPServerPacket();
 
 		if (filesAllowed < 1 || !m_udpserver || IsConnectedServer(m_udpserver)) {
@@ -907,7 +940,6 @@
 			filesAllowed = GetMaxFilesPerUDPServerPacket();
 		}
 
-
 		// Check if we have asked all servers, in which case we are done
 		if (m_udpserver == NULL) {
 			DoStopUDPRequests();
@@ -917,27 +949,30 @@
 
 		// Memoryfile containing the hash of every file to request
 		// 28bytes allocation because 16b + 4b + 8b is the worse case scenario.
-		CMemFile hashlist( 28 );
+		CMemFile hashlist(28);
 
-		CPartFile* file = m_queueFiles.GetNext();
+		CPartFile *file = m_queueFiles.GetNext();
 
-		while ( file && filesAllowed ) {
+		while (file && filesAllowed) {
 			uint8 status = file->GetStatus();
 
-			if ( ( status == PS_READY || status == PS_EMPTY ) && file->GetSourceCount() < thePrefs::GetMaxSourcePerFileUDP() ) {
+			if ((status == PS_READY || status == PS_EMPTY) &&
+				file->GetSourceCount() < thePrefs::GetMaxSourcePerFileUDP()) {
 				if (file->IsLargeFile() && !m_udpserver->SupportsLargeFilesUDP()) {
-					AddDebugLogLineN(logDownloadQueue, "UDP Request for sources on a large file ignored: server doesn't support it");
+					AddDebugLogLineN(logDownloadQueue,
+						"UDP Request for sources on a large file ignored: server "
+						"doesn't support it");
 				} else {
 					++m_cRequestsSentToServer;
-					hashlist.WriteHash( file->GetFileHash() );
+					hashlist.WriteHash(file->GetFileHash());
 					// See the notes on TCP packet
-					if ( m_udpserver->GetUDPFlags() & SRV_UDPFLG_EXT_GETSOURCES2 ) {
+					if (m_udpserver->GetUDPFlags() & SRV_UDPFLG_EXT_GETSOURCES2) {
 						if (file->IsLargeFile()) {
 							wxASSERT(m_udpserver->SupportsLargeFilesUDP());
-							hashlist.WriteUInt32( 0 );
-							hashlist.WriteUInt64( file->GetFileSize() );
+							hashlist.WriteUInt32(0);
+							hashlist.WriteUInt64(file->GetFileSize());
 						} else {
-							hashlist.WriteUInt32( file->GetFileSize() );
+							hashlist.WriteUInt32(file->GetFileSize());
 						}
 					}
 					--filesAllowed;
@@ -945,22 +980,18 @@
 			}
 
 			// Avoid skipping a file if we can't send any more currently
-			if ( filesAllowed ) {
+			if (filesAllowed) {
 				file = m_queueFiles.GetNext();
 			}
 		}
 
-		// See if we have anything to send
-		if ( hashlist.GetLength() ) {
+		if (hashlist.GetLength()) {
 			packetSent = SendGlobGetSourcesUDPPacket(hashlist);
 		}
 
-		// Check if we've covered every file
-		if ( file == NULL ) {
-			// Reset the list of asked files so that the loop will start over
+		if (file == NULL) {
 			m_queueFiles.Reset();
 
-			// Unset the server so that the next server will be used
 			m_udpserver = NULL;
 		}
 	}
@@ -968,33 +999,29 @@
 	return true;
 }
 
-
 void CDownloadQueue::StopUDPRequests()
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
 	DoStopUDPRequests();
 }
 
-
 void CDownloadQueue::DoStopUDPRequests()
 {
 	// No need to observe when we wont be using the results
-	theApp->serverlist->RemoveObserver( &m_queueServers );
-	RemoveObserver( &m_queueFiles );
+	theApp->serverlist->RemoveObserver(&m_queueServers);
+	RemoveObserver(&m_queueFiles);
 
 	m_udpserver = 0;
 	m_lastudpsearchtime = ::GetTickCount64();
 }
 
-
 // Comparison function needed by sort. Returns true if file1 precedes file2
-static bool ComparePartFiles(const CPartFile* file1, const CPartFile* file2) {
+static bool ComparePartFiles(const CPartFile *file1, const CPartFile *file2)
+{
 	if (file1->GetDownPriority() != file2->GetDownPriority()) {
-		// To place high-priority files before low priority files we have to
-		// invert this test, since PR_LOW is lower than PR_HIGH, and since
-		// placing a PR_LOW file before a PR_HIGH file would mean that
-		// the PR_LOW file gets sources before the PR_HIGH file ...
+		// Inverted on purpose: PR_LOW is numerically lower than PR_HIGH, and
+		// placing a PR_LOW file first would give it sources before a PR_HIGH one.
 		return (file1->GetDownPriority() > file2->GetDownPriority());
 	} else {
 		int sourcesA = file1->GetSourceCount();
@@ -1003,56 +1030,51 @@
 		int notSourcesA = file1->GetNotCurrentSourcesCount();
 		int notSourcesB = file2->GetNotCurrentSourcesCount();
 
-		int cmp = CmpAny( sourcesA - notSourcesA, sourcesB - notSourcesB );
+		int cmp = CmpAny(sourcesA - notSourcesA, sourcesB - notSourcesB);
 
-		if ( cmp == 0 ) {
-			cmp = CmpAny( notSourcesA, notSourcesB );
+		if (cmp == 0) {
+			cmp = CmpAny(notSourcesA, notSourcesB);
 		}
 
 		return cmp < 0;
 	}
 }
 
-
 void CDownloadQueue::DoSortByPriority()
 {
 	m_lastsorttime = ::GetTickCount64();
-	sort( m_filelist.begin(), m_filelist.end(), ComparePartFiles );
+	sort(m_filelist.begin(), m_filelist.end(), ComparePartFiles);
 }
 
-
 void CDownloadQueue::ResetLocalServerRequests()
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
 	m_dwNextTCPSrcReq = 0;
 	m_localServerReqQueue.clear();
 
-	for ( FileQueue::size_type i = 0; i < m_filelist.size(); i++ ) {
+	for (FileQueue::size_type i = 0; i < m_filelist.size(); i++) {
 		m_filelisti->SetLocalSrcRequestQueued(false);
 	}
 }
 
-
-void CDownloadQueue::RemoveLocalServerRequest( CPartFile* file )
+void CDownloadQueue::RemoveLocalServerRequest(CPartFile *file)
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
-	EraseValue( m_localServerReqQueue, file );
+	EraseValue(m_localServerReqQueue, file);
 
 	file->SetLocalSrcRequestQueued(false);
 }
 
-
 void CDownloadQueue::ProcessLocalRequests()
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
-	bool bServerSupportsLargeFiles = theApp->serverconnect
-									&& theApp->serverconnect->GetCurrentServer()
-									&& theApp->serverconnect->GetCurrentServer()->SupportsLargeFilesTCP();
+	bool bServerSupportsLargeFiles = theApp->serverconnect && theApp->serverconnect->GetCurrentServer() &&
+					 theApp->serverconnect->GetCurrentServer()->SupportsLargeFilesTCP();
 
-	if ( (!m_localServerReqQueue.empty()) && (m_dwNextTCPSrcReq < ::GetTickCount64()) ) {
+	if ((!m_localServerReqQueue.empty()) && (m_dwNextTCPSrcReq < ::GetTickCount64())) {
 		CMemFile dataTcpFrame(22);
 		const int iMaxFilesPerTcpFrame = 15;
 		int iFiles = 0;
@@ -1060,10 +1082,10 @@
 			// find the file with the longest waitingtime
 			uint64 dwBestWaitTime = 0xFFFFFFFFFFFFFFFF;
 
-			std::list<CPartFile*>::iterator posNextRequest = m_localServerReqQueue.end();
-			std::list<CPartFile*>::iterator it = m_localServerReqQueue.begin();
-			while( it != m_localServerReqQueue.end() ) {
-				CPartFile* cur_file = (*it);
+			std::list<CPartFile *>::iterator posNextRequest = m_localServerReqQueue.end();
+			std::list<CPartFile *>::iterator it = m_localServerReqQueue.begin();
+			while (it != m_localServerReqQueue.end()) {
+				CPartFile *cur_file = (*it);
 				if (cur_file->GetStatus() == PS_READY || cur_file->GetStatus() == PS_EMPTY) {
 					uint8 nPriority = cur_file->GetDownPriority();
 					if (nPriority > PR_HIGH) {
@@ -1071,8 +1093,10 @@
 						nPriority = PR_HIGH;
 					}
 
-					if (cur_file->GetLastSearchTime() + (PR_HIGH-nPriority) < dwBestWaitTime ){
-						dwBestWaitTime = cur_file->GetLastSearchTime() + (PR_HIGH - nPriority);
+					if (cur_file->GetLastSearchTime() + (PR_HIGH - nPriority) <
+						dwBestWaitTime) {
+						dwBestWaitTime =
+							cur_file->GetLastSearchTime() + (PR_HIGH - nPriority);
 						posNextRequest = it;
 					}
 
@@ -1081,29 +1105,33 @@
 					it = m_localServerReqQueue.erase(it);
 					cur_file->SetLocalSrcRequestQueued(false);
 					AddDebugLogLineN(logDownloadQueue,
-						CFormat("Local server source request for file '%s' not sent because of status '%s'")
-							% cur_file->GetFileName() % cur_file->getPartfileStatus());
+						CFormat("Local server source request for file '%s' not sent "
+							"because of status '%s'") %
+							cur_file->GetFileName() %
+							cur_file->getPartfileStatus());
 				}
 			}
 
 			if (posNextRequest != m_localServerReqQueue.end()) {
-				CPartFile* cur_file = (*posNextRequest);
+				CPartFile *cur_file = (*posNextRequest);
 				cur_file->SetLocalSrcRequestQueued(false);
 				cur_file->SetLastSearchTime(::GetTickCount64());
 				m_localServerReqQueue.erase(posNextRequest);
 				iFiles++;
 
 				if (!bServerSupportsLargeFiles && cur_file->IsLargeFile()) {
-					AddDebugLogLineN(logDownloadQueue, "TCP Request for sources on a large file ignored: server doesn't support it");
+					AddDebugLogLineN(logDownloadQueue,
+						"TCP Request for sources on a large file ignored: server "
+						"doesn't support it");
 				} else {
 					AddDebugLogLineN(logDownloadQueue,
-						CFormat("Creating local sources request packet for '%s'") % cur_file->GetFileName());
-					// create request packet
+						CFormat("Creating local sources request packet for '%s'") %
+							cur_file->GetFileName());
 					CMemFile data(16 + (cur_file->IsLargeFile() ? 8 : 4));
 					data.WriteHash(cur_file->GetFileHash());
-					// Kry - lugdunum extended protocol on 17.3 to handle filesize properly.
-					// There is no need to check anything, old server ignore the extra 4 bytes.
-					// As of 17.9, servers accept a 0 32-bits size and then a 64bits size
+					// lugdunum's extended protocol handles filesize from 17.3
+					// on; older servers ignore the extra 4 bytes. From 17.9
+					// servers accept a 0 32-bit size followed by a 64-bit one.
 					if (cur_file->IsLargeFile()) {
 						wxASSERT(bServerSupportsLargeFiles);
 						data.WriteUInt32(0);
@@ -1112,7 +1140,10 @@
 						data.WriteUInt32(cur_file->GetFileSize());
 					}
 					uint8 byOpcode = 0;
-					if (thePrefs::IsClientCryptLayerSupported() && theApp->serverconnect->GetCurrentServer() != NULL && theApp->serverconnect->GetCurrentServer()->SupportsGetSourcesObfuscation()) {
+					if (thePrefs::IsClientCryptLayerSupported() &&
+						theApp->serverconnect->GetCurrentServer() != NULL &&
+						theApp->serverconnect->GetCurrentServer()
+							->SupportsGetSourcesObfuscation()) {
 						byOpcode = OP_GETSOURCES_OBFU;
 					} else {
 						byOpcode = OP_GETSOURCES;
@@ -1125,52 +1156,50 @@
 
 		int iSize = dataTcpFrame.GetLength();
 		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
-			CScopedPtr<CPacket> packet(new CPacket(new uint8_tiSize, dataTcpFrame.GetLength(), true, false));
+			// Build one 'packet' holding every buffered OP_GETSOURCES ED2K packet, to
+			// be sent in one TCP frame. Server credits: (16+4)*regularfiles +
+			// (16+4+8)*largefiles + 1.
+			CScopedPtr<CPacket> packet(
+				new CPacket(new uint8_tiSize, dataTcpFrame.GetLength(), true, false));
 			dataTcpFrame.Seek(0, wxFromStart);
 			dataTcpFrame.Read(packet->GetPacket(), iSize);
 			uint32 size = packet->GetPacketSize();
-			theApp->serverconnect->SendPacket(packet.release(), true);	// Deletes `packet'.
+			theApp->serverconnect->SendPacket(packet.release(), true); // Deletes `packet'.
 			AddDebugLogLineN(logDownloadQueue, "Sent local sources request packet.");
 			theStats::AddUpOverheadServer(size);
 		}
 
 		// next TCP frame with up to 15 source requests is allowed to be sent in..
-		m_dwNextTCPSrcReq = ::GetTickCount64() + SEC2MS(iMaxFilesPerTcpFrame*(16+4));
+		m_dwNextTCPSrcReq = ::GetTickCount64() + SEC2MS(iMaxFilesPerTcpFrame * (16 + 4));
 	}
-
 }
 
-
-void CDownloadQueue::SendLocalSrcRequest(CPartFile* sender)
+void CDownloadQueue::SendLocalSrcRequest(CPartFile *sender)
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
 	m_localServerReqQueue.push_back(sender);
 }
 
-
 void CDownloadQueue::ResetCatParts(uint8 cat)
 {
 	for (FileQueue::iterator it = m_filelist.begin(); it != m_filelist.end(); ++it) {
-		CPartFile* file = *it;
+		CPartFile *file = *it;
 		file->RemoveCategory(cat);
 	}
 	for (FileList::iterator it = m_completedDownloads.begin(); it != m_completedDownloads.end(); ++it) {
-		CPartFile* file = *it;
+		CPartFile *file = *it;
 		file->RemoveCategory(cat);
 	}
 }
 
-
 void CDownloadQueue::SetCatPrio(uint8 cat, uint8 newprio)
 {
-	for ( uint16 i = 0; i < GetFileCount(); i++ ) {
-		CPartFile* file = GetFileByIndex( i );
+	for (uint16 i = 0; i < GetFileCount(); i++) {
+		CPartFile *file = GetFileByIndex(i);
 
-		if ( !cat || file->GetCategory() == cat ) {
-			if ( newprio == PR_AUTO ) {
+		if (!cat || file->GetCategory() == cat) {
+			if (newprio == PR_AUTO) {
 				file->SetAutoDownPriority(true);
 			} else {
 				file->SetAutoDownPriority(false);
@@ -1180,42 +1209,48 @@
 	}
 }
 
-
 void CDownloadQueue::SetCatStatus(uint8 cat, int newstatus)
 {
-	std::list<CPartFile*> files;
+	std::list<CPartFile *> files;
 
 	{
 		wxMutexLocker lock(m_mutex);
 
-		for ( FileQueue::size_type i = 0; i < m_filelist.size(); ++i ) {
-			if ( m_filelisti->CheckShowItemInGivenCat(cat) ) {
-				files.push_back( m_filelisti );
+		for (FileQueue::size_type i = 0; i < m_filelist.size(); ++i) {
+			if (m_filelisti->CheckShowItemInGivenCat(cat)) {
+				files.push_back(m_filelisti);
 			}
 		}
 	}
 
-	std::list<CPartFile*>::iterator it = files.begin();
+	std::list<CPartFile *>::iterator it = files.begin();
 
-	for ( ; it != files.end(); ++it ) {
-		switch ( newstatus ) {
-			case MP_CANCEL:	(*it)->Delete();	break;
-			case MP_PAUSE:	(*it)->PauseFile();	break;
-			case MP_STOP:	(*it)->StopFile();	break;
-			case MP_RESUME:	(*it)->ResumeFile();	break;
+	for (; it != files.end(); ++it) {
+		switch (newstatus) {
+		case MP_CANCEL:
+			(*it)->Delete();
+			break;
+		case MP_PAUSE:
+			(*it)->PauseFile();
+			break;
+		case MP_STOP:
+			(*it)->StopFile();
+			break;
+		case MP_RESUME:
+			(*it)->ResumeFile();
+			break;
 		}
 	}
 }
 
-
 uint16 CDownloadQueue::GetDownloadingFileCount() const
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
 	uint16 count = 0;
-	for ( FileQueue::size_type i = 0; i < m_filelist.size(); i++ ) {
+	for (FileQueue::size_type i = 0; i < m_filelist.size(); i++) {
 		uint8 status = m_filelisti->GetStatus();
-		if ( status == PS_READY || status == PS_EMPTY ) {
+		if (status == PS_READY || status == PS_EMPTY) {
 			count++;
 		}
 	}
@@ -1223,14 +1258,13 @@
 	return count;
 }
 
-
 uint16 CDownloadQueue::GetPausedFileCount() const
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
 	uint16 count = 0;
-	for ( FileQueue::size_type i = 0; i < m_filelist.size(); i++ ) {
-		if ( m_filelisti->GetStatus() == PS_PAUSED ) {
+	for (FileQueue::size_type i = 0; i < m_filelist.size(); i++) {
+		if (m_filelisti->GetStatus() == PS_PAUSED) {
 			count++;
 		}
 	}
@@ -1238,11 +1272,10 @@
 	return count;
 }
 
-
-void CDownloadQueue::CheckDiskspace( const CPath& path )
+void CDownloadQueue::CheckDiskspace(const CPath &path)
 {
 	const uint64 curTick = ::GetTickCount64();
-	if ( curTick - m_lastDiskCheck < DISKSPACERECHECKTIME ) {
+	if (curTick - m_lastDiskCheck < DISKSPACERECHECKTIME) {
 		return;
 	}
 
@@ -1250,12 +1283,12 @@
 
 	uint64 min = 0;
 	// Check if the user has set an explicit limit
-	if ( thePrefs::IsCheckDiskspaceEnabled() ) {
+	if (thePrefs::IsCheckDiskspaceEnabled()) {
 		min = thePrefs::GetMinFreeDiskSpace();
 	}
 
 	// The very least acceptable diskspace is a single PART
-	if ( min < PARTSIZE ) {
+	if (min < PARTSIZE) {
 		min = PARTSIZE;
 	}
 
@@ -1263,46 +1296,39 @@
 	if (free == static_cast<uint64>(wxInvalidOffset)) {
 		return;
 	} else if (free < min) {
-		CUserEvents::ProcessEvent(
-			CUserEvents::OutOfDiskSpace,
-			"Temporary partition");
+		CUserEvents::ProcessEvent(CUserEvents::OutOfDiskSpace, "Temporary partition");
 	}
 
 	for (FileQueue::size_type i = 0; i < m_filelist.size(); ++i) {
-		CPartFile* file = m_filelisti;
+		CPartFile *file = m_filelisti;
 
-		switch ( file->GetStatus() ) {
-			case PS_ERROR:
-			case PS_COMPLETING:
-			case PS_COMPLETE:
-				continue;
+		switch (file->GetStatus()) {
+		case PS_ERROR:
+		case PS_COMPLETING:
+		case PS_COMPLETE:
+			continue;
 		}
 
-		if ( free >= min && file->GetInsufficient() ) {
+		if (free >= min && file->GetInsufficient()) {
 			// We'll try to resume files if there is enough free space
-			if ( free - file->GetNeededSpace() > min ) {
+			if (free - file->GetNeededSpace() > min) {
 				file->ResumeFile();
 			}
-		} else if ( free < min && !file->IsPaused() ) {
-			// No space left, stop the files.
-			file->PauseFile( true );
+		} else if (free < min && !file->IsPaused()) {
+			file->PauseFile(true);
 		}
 	}
 }
 
-
 int CDownloadQueue::GetMaxFilesPerUDPServerPacket() const
 {
-	if ( m_udpserver ) {
-		if ( m_udpserver->GetUDPFlags() & SRV_UDPFLG_EXT_GETSOURCES ) {
-			// get max. file ids per packet
-			if ( m_cRequestsSentToServer < MAX_REQUESTS_PER_SERVER ) {
-				return std::min(
-					MAX_FILES_PER_UDP_PACKET,
-					MAX_REQUESTS_PER_SERVER - m_cRequestsSentToServer
-				);
+	if (m_udpserver) {
+		if (m_udpserver->GetUDPFlags() & SRV_UDPFLG_EXT_GETSOURCES) {
+			if (m_cRequestsSentToServer < MAX_REQUESTS_PER_SERVER) {
+				return std::min(MAX_FILES_PER_UDP_PACKET,
+					MAX_REQUESTS_PER_SERVER - m_cRequestsSentToServer);
 			}
-		} else if ( m_cRequestsSentToServer < MAX_REQUESTS_PER_SERVER ) {
+		} else if (m_cRequestsSentToServer < MAX_REQUESTS_PER_SERVER) {
 			return 1;
 		}
 	}
@@ -1310,35 +1336,39 @@
 	return 0;
 }
 
-
-bool CDownloadQueue::SendGlobGetSourcesUDPPacket(CMemFile& data)
+bool CDownloadQueue::SendGlobGetSourcesUDPPacket(CMemFile &data)
 {
 	if (!m_udpserver) {
 		return false;
 	}
 
-	CPacket packet(data, OP_EDONKEYPROT, ((m_udpserver->GetUDPFlags() & SRV_UDPFLG_EXT_GETSOURCES2) ? OP_GLOBGETSOURCES2 : OP_GLOBGETSOURCES));
+	CPacket packet(data,
+		OP_EDONKEYPROT,
+		((m_udpserver->GetUDPFlags() & SRV_UDPFLG_EXT_GETSOURCES2) ? OP_GLOBGETSOURCES2
+									   : OP_GLOBGETSOURCES));
 
 	theStats::AddUpOverheadServer(packet.GetPacketSize());
-	theApp->serverconnect->SendUDPPacket(&packet,m_udpserver,false);
+	theApp->serverconnect->SendUDPPacket(&packet, m_udpserver, false);
 
 	return true;
 }
 
-
-void CDownloadQueue::AddToResolve(const CMD4Hash& fileid, const wxString& pszHostname, uint16 port, const wxString& hash, uint8 cryptoptions)
+void CDownloadQueue::AddToResolve(const CMD4Hash &fileid,
+	const wxString &pszHostname,
+	uint16 port,
+	const wxString &hash,
+	uint8 cryptoptions)
 {
 	// double checking
-	if ( !GetFileByID(fileid) ) {
+	if (!GetFileByID(fileid)) {
 		return;
 	}
 
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
 	Hostname_Entry entry = { fileid, pszHostname, port, hash, cryptoptions };
 	m_toresolve.push_front(entry);
 
-	// Check if there are other DNS lookups on queue
 	if (m_toresolve.size() == 1) {
 		// Check if it is a simple dot address
 		uint32 ip = StringIPtoUint32(pszHostname);
@@ -1346,7 +1376,7 @@
 		if (ip) {
 			OnHostnameResolved(ip);
 		} else {
-			CAsyncDNS* dns = new CAsyncDNS(pszHostname, DNS_SOURCE, theApp);
+			CAsyncDNS *dns = new CAsyncDNS(pszHostname, DNS_SOURCE, theApp);
 
 			if ((dns->Create() != wxTHREAD_NO_ERROR) || (dns->Run() != wxTHREAD_NO_ERROR)) {
 				dns->Delete();
@@ -1356,20 +1386,19 @@
 	}
 }
 
-
 void CDownloadQueue::OnHostnameResolved(uint32 ip)
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
-	wxASSERT( m_toresolve.size() );
+	wxASSERT(m_toresolve.size());
 
 	Hostname_Entry resolved = m_toresolve.front();
 	m_toresolve.pop_front();
 
-	if ( ip ) {
-		CPartFile* file = GetFileByID( resolved.fileid );
-		if ( file ) {
-			CMemFile sources(1+4+2);
+	if (ip) {
+		CPartFile *file = GetFileByID(resolved.fileid);
+		if (file) {
+			CMemFile sources(1 + 4 + 2);
 			sources.WriteUInt8(1); // No. Sources
 			sources.WriteUInt32(ip);
 			sources.WriteUInt16(resolved.port);
@@ -1380,7 +1409,7 @@
 				sourcehash.Decode(resolved.hash);
 				sources.WriteHash(sourcehash);
 			}
-			sources.Seek(0,wxFromStart);
+			sources.Seek(0, wxFromStart);
 
 			file->AddSources(sources, 0, 0, SF_LINK, true);
 		}
@@ -1395,7 +1424,7 @@
 		if (tmpIP) {
 			OnHostnameResolved(tmpIP);
 		} else {
-			CAsyncDNS* dns = new CAsyncDNS(entry.strHostname, DNS_SOURCE, theApp);
+			CAsyncDNS *dns = new CAsyncDNS(entry.strHostname, DNS_SOURCE, theApp);
 
 			if ((dns->Create() != wxTHREAD_NO_ERROR) || (dns->Run() != wxTHREAD_NO_ERROR)) {
 				dns->Delete();
@@ -1407,8 +1436,7 @@
 	}
 }
 
-
-bool CDownloadQueue::AddLink( const wxString& link, uint8 category )
+bool CDownloadQueue::AddLink(const wxString &link, uint8 category)
 {
 	wxString uri(link);
 
@@ -1428,8 +1456,7 @@
 	}
 }
 
-
-void CDownloadQueue::AddLinks( const wxArrayString& links, uint8 category )
+void CDownloadQueue::AddLinks(const wxArrayString &links, uint8 category)
 {
 	unsigned failed = 0;
 	for (size_t i = 0; i < links.GetCount(); ++i) {
@@ -1438,60 +1465,57 @@
 		}
 	}
 	if (failed > 0) {
-		theApp->ShowAlert(
-			CFormat(wxPLURAL("Could not add %u link (see log for details).",
-			                 "Could not add %u links (see log for details).", failed)) % failed,
-			_("ERROR"), wxOK | wxICON_ERROR);
+		theApp->ShowAlert(CFormat(wxPLURAL("Could not add %u link (see log for details).",
+					  "Could not add %u links (see log for details).",
+					  failed)) %
+					  failed,
+			_("ERROR"),
+			wxOK | wxICON_ERROR);
 	}
 }
 
-
-bool CDownloadQueue::AddED2KLink( const wxString& link, uint8 category )
+bool CDownloadQueue::AddED2KLink(const wxString &link, uint8 category)
 {
-	wxASSERT( !link.IsEmpty() );
+	wxASSERT(!link.IsEmpty());
 	wxString URI = link;
 
 	// Need the links to end with /, otherwise CreateLinkFromUrl crashes us.
-	if ( URI.Last() != '/' ) {
+	if (URI.Last() != '/') {
 		URI += "/";
 	}
 
 	try {
 		CScopedPtr<CED2KLink> uri(CED2KLink::CreateLinkFromUrl(URI));
 
-		return AddED2KLink( uri.get(), category );
-	} catch ( const wxString& err ) {
-		AddLogLineC(CFormat( _("Invalid eD2k link! ERROR: %s")) % err);
+		return AddED2KLink(uri.get(), category);
+	} catch (const wxString &err) {
+		AddLogLineC(CFormat(_("Invalid eD2k link! ERROR: %s")) % err);
 	}
 
 	return false;
 }
 
-
-bool CDownloadQueue::AddED2KLink( const CED2KLink* link, uint8 category )
+bool CDownloadQueue::AddED2KLink(const CED2KLink *link, uint8 category)
 {
-	switch ( link->GetKind() ) {
-		case CED2KLink::kFile:
-			return AddED2KLink( dynamic_cast<const CED2KFileLink*>( link ), category );
+	switch (link->GetKind()) {
+	case CED2KLink::kFile:
+		return AddED2KLink(dynamic_cast<const CED2KFileLink *>(link), category);
 
-		case CED2KLink::kServer:
-			return AddED2KLink( dynamic_cast<const CED2KServerLink*>( link ) );
+	case CED2KLink::kServer:
+		return AddED2KLink(dynamic_cast<const CED2KServerLink *>(link));
 
-		case CED2KLink::kServerList:
-			return AddED2KLink( dynamic_cast<const CED2KServerListLink*>( link ) );
+	case CED2KLink::kServerList:
+		return AddED2KLink(dynamic_cast<const CED2KServerListLink *>(link));
 
-		default:
-			return false;
+	default:
+		return false;
 	}
 }
 
-
-
-bool CDownloadQueue::AddED2KLink( const CED2KFileLink* link, uint8 category )
+bool CDownloadQueue::AddED2KLink(const CED2KFileLink *link, uint8 category)
 {
-	CPartFile* file = NULL;
-	if (IsFileExisting(link->GetHashKey())) {
-		// Must be a shared file if we are to add hashes or sources
+	CPartFile *file = NULL;
+	if (IsFileExisting(link->GetHashKey(), link->GetName())) {
 		if ((file = GetFileByID(link->GetHashKey())) == NULL) {
 			return false;
 		}
@@ -1500,8 +1524,10 @@
 			if (!PlatformSpecific::CanFSHandleLargeFiles(thePrefs::GetTempDir())) {
 				AddLogLineC(_("Filesystem for Temp directory cannot handle large files."));
 				return false;
-			} else if (!PlatformSpecific::CanFSHandleLargeFiles(theApp->glob_prefs->GetCatPath(category))) {
-				AddLogLineC(_("Filesystem for Incoming directory cannot handle large files."));
+			} else if (!PlatformSpecific::CanFSHandleLargeFiles(
+					   theApp->glob_prefs->GetCatPath(category))) {
+				AddLogLineC(
+					_("Filesystem for Incoming directory cannot handle large files."));
 				return false;
 			}
 		}
@@ -1517,7 +1543,7 @@
 	}
 
 	if (link->HasValidAICHHash()) {
-		CAICHHashSet* hashset = file->GetAICHHashset();
+		CAICHHashSet *hashset = file->GetAICHHashset();
 
 		if (!hashset->HasValidMasterHash() || (hashset->GetMasterHash() != link->GetAICHHash())) {
 			hashset->SetMasterHash(link->GetAICHHash(), AICH_VERIFIED);
@@ -1525,7 +1551,7 @@
 		}
 	}
 
-	const CED2KFileLink::CED2KLinkSourceList& list = link->m_sources;
+	const CED2KFileLink::CED2KLinkSourceList &list = link->m_sources;
 	CED2KFileLink::CED2KLinkSourceList::const_iterator it = list.begin();
 	for (; it != list.end(); ++it) {
 		AddToResolve(link->GetHashKey(), it->addr, it->port, it->hash, it->cryptoptions);
@@ -1534,57 +1560,63 @@
 	return true;
 }
 
-
-bool CDownloadQueue::AddED2KLink( const CED2KServerLink* link )
+bool CDownloadQueue::AddED2KLink(const CED2KServerLink *link)
 {
-	CServer *server = new CServer( link->GetPort(), Uint32toStringIP( link->GetIP() ) );
-
-	server->SetListName( Uint32toStringIP( link->GetIP() ) );
-
-	theApp->serverlist->AddServer(server);
+	CServer *server = new CServer(link->GetPort(), Uint32toStringIP(link->GetIP()));
 
-	Notify_ServerAdd(server);
+	server->SetListName(Uint32toStringIP(link->GetIP()));
 
+	if (!theApp->AddServer(server, true)) {
+		delete server;
+		return false;
+	}
 	return true;
 }
 
-
-bool CDownloadQueue::AddED2KLink( const CED2KServerListLink* link )
+bool CDownloadQueue::AddED2KLink(const CED2KServerListLink *link)
 {
-	theApp->serverlist->UpdateServerMetFromURL( link->GetAddress() );
+	theApp->serverlist->UpdateServerMetFromURL(link->GetAddress());
 
 	return true;
 }
 
-
-void CDownloadQueue::ObserverAdded( ObserverType* o )
+void CDownloadQueue::ObserverAdded(ObserverType *o)
 {
-	CObservableQueue<CPartFile*>::ObserverAdded( o );
+	CObservableQueue<CPartFile *>::ObserverAdded(o);
 
 	EventType::ValueList list;
 
 	{
 		wxMutexLocker lock(m_mutex);
-		list.reserve( m_filelist.size() );
-		list.insert( list.begin(), m_filelist.begin(), m_filelist.end() );
+		list.reserve(m_filelist.size());
+		list.insert(list.begin(), m_filelist.begin(), m_filelist.end());
 	}
 
-	NotifyObservers( EventType( EventType::INITIAL, &list ), o );
+	NotifyObservers(EventType(EventType::INITIAL, &list), o);
 }
 
-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)
+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)
 {
 	AddDebugLogLineN(logKadSearch, CFormat("Search result sources (type %i)") % type);
 
-	//Safety measure to make sure we are looking for these sources
-	CPartFile* temp = GetFileByKadFileSearchID(searchID);
-	if( !temp ) {
+	// Safety measure to make sure we are looking for these sources
+	CPartFile *temp = GetFileByKadFileSearchID(searchID);
+	if (!temp) {
 		AddDebugLogLineN(logKadSearch, "This is not the file we're looking for...");
 		return;
 	}
 
-	//Do we need more sources?
-	if(!(!temp->IsStopped() && thePrefs::GetMaxSourcePerFile() > temp->GetSourceCount())) {
+	// Do we need more sources?
+	if (!(!temp->IsStopped() && thePrefs::GetMaxSourcePerFile() > temp->GetSourceCount())) {
 		AddDebugLogLineN(logKadSearch, "No more sources needed for this file");
 		return;
 	}
@@ -1593,100 +1625,109 @@
 
 	if (theApp->ipfilter->IsFiltered(ED2KID)) {
 		AddDebugLogLineN(logKadSearch, "Source ip got filtered");
-		AddDebugLogLineN(logIPFilter, CFormat("IPfiltered source IP=%s received from Kademlia") % Uint32toStringIP(ED2KID));
+		AddDebugLogLineN(logIPFilter,
+			CFormat("IPfiltered source IP=%s received from Kademlia") % Uint32toStringIP(ED2KID));
 		return;
 	}
 
-	if( (ip == Kademlia::CKademlia::GetIPAddress() || ED2KID == theApp->GetED2KID()) && tcp == thePrefs::GetPort()) {
+	if ((ip == Kademlia::CKademlia::GetIPAddress() || ED2KID == theApp->GetED2KID()) &&
+		tcp == thePrefs::GetPort()) {
 		AddDebugLogLineN(logKadSearch, "Trying to add myself as source, ignore");
 		return;
 	}
 
-	CUpDownClient* ctemp = NULL;
+	CUpDownClient *ctemp = NULL;
 	switch (type) {
-		case 4:
-		case 1: {
-			// NonFirewalled users
-			if(!tcp) {
-				AddDebugLogLineN(logKadSearch, CFormat("Ignored source (IP=%s) received from Kademlia, no tcp port received") % Uint32toStringIP(ip));
-				return;
-			}
-			if (!IsGoodIP(ED2KID,thePrefs::FilterLanIPs())) {
-				AddDebugLogLineN(logKadSearch, CFormat("%s got filtered") % Uint32toStringIP(ED2KID));
-				AddDebugLogLineN(logIPFilter, CFormat("Ignored source (IP=%s) received from Kademlia, filtered") % Uint32toStringIP(ED2KID));
-				return;
-			}
-			ctemp = new CUpDownClient(tcp, ip, 0, 0, temp, false, true);
-			ctemp->SetSourceFrom(SF_KADEMLIA);
-			// not actually sent or needed for HighID sources
-			//ctemp->SetServerIP(serverip);
-			//ctemp->SetServerPort(serverport);
-			ctemp->SetKadPort(udp);
-			uint8_t cID16;
-			pcontactID->ToByteArray(cID);
-			ctemp->SetUserHash(CMD4Hash(cID));
-			break;
+	case 4:
+	case 1: {
+		// NonFirewalled users
+		if (!tcp) {
+			AddDebugLogLineN(logKadSearch,
+				CFormat("Ignored source (IP=%s) received from Kademlia, no tcp port "
+					"received") %
+					Uint32toStringIP(ip));
+			return;
 		}
-		case 2: {
-			// Don't use this type... Some clients will process it wrong..
-			break;
+		if (!IsGoodIP(ED2KID, thePrefs::FilterLanIPs())) {
+			AddDebugLogLineN(logKadSearch, CFormat("%s got filtered") % Uint32toStringIP(ED2KID));
+			AddDebugLogLineN(logIPFilter,
+				CFormat("Ignored source (IP=%s) received from Kademlia, filtered") %
+					Uint32toStringIP(ED2KID));
+			return;
 		}
-		case 5:
-		case 3: {
-			// This will be a firewalled client connected to Kad only.
-			// We set the clientID to 1 as a Kad user only has 1 buddy.
-			ctemp = new CUpDownClient(tcp, 1, 0, 0, temp, false, true);
-			// The only reason we set the real IP is for when we get a callback
-			// from this firewalled source, the compare method will match them.
-			ctemp->SetSourceFrom(SF_KADEMLIA);
-			ctemp->SetKadPort(udp);
-			uint8_t cID16;
-			pcontactID->ToByteArray(cID);
-			ctemp->SetUserHash(CMD4Hash(cID));
-			pbuddyID->ToByteArray(cID);
-			ctemp->SetBuddyID(cID);
-			ctemp->SetBuddyIP(buddyip);
-			ctemp->SetBuddyPort(buddyport);
+		ctemp = new CUpDownClient(tcp, ip, 0, 0, temp, false, true);
+		ctemp->SetSourceFrom(SF_KADEMLIA);
+		// Server IP and port are not actually sent or needed for HighID sources.
+		ctemp->SetKadPort(udp);
+		uint8_t cID16;
+		pcontactID->ToByteArray(cID);
+		ctemp->SetUserHash(CMD4Hash(cID));
+		break;
+	}
+	case 2: {
+		// Don't use this type... Some clients will process it wrong..
+		break;
+	}
+	case 5:
+	case 3: {
+		// This will be a firewalled client connected to Kad only.
+		// We set the clientID to 1 as a Kad user only has 1 buddy.
+		ctemp = new CUpDownClient(tcp, 1, 0, 0, temp, false, true);
+		// The only reason we set the real IP is for when we get a callback
+		// from this firewalled source, the compare method will match them.
+		ctemp->SetSourceFrom(SF_KADEMLIA);
+		ctemp->SetKadPort(udp);
+		uint8_t cID16;
+		pcontactID->ToByteArray(cID);
+		ctemp->SetUserHash(CMD4Hash(cID));
+		pbuddyID->ToByteArray(cID);
+		ctemp->SetBuddyID(cID);
+		ctemp->SetBuddyIP(buddyip);
+		ctemp->SetBuddyPort(buddyport);
+		break;
+	}
+	case 6: {
+		// firewalled source which supports direct UDP callback
+		// if we are firewalled ourself, the source is useless to us
+		if (theApp->IsFirewalled()) {
 			break;
 		}
-		case 6: {
-			// firewalled source which supports direct UDP callback
-			// if we are firewalled ourself, the source is useless to us
-			if (theApp->IsFirewalled()) {
-				break;
-			}
 
-			if ((byCryptOptions & 0x08) == 0){
-				AddDebugLogLineN(logKadSearch, CFormat("Received Kad source type 6 (direct callback) which has the direct callback flag not set (%s)") % Uint32toStringIP(ED2KID));
-				break;
-			}
-
-			ctemp = new CUpDownClient(tcp, 1, 0, 0, temp, false, true);
-			ctemp->SetSourceFrom(SF_KADEMLIA);
-			ctemp->SetKadPort(udp);
-			ctemp->SetIP(ED2KID); // need to set the IP address, which cannot be used for TCP but for UDP
-			uint8_t cID16;
-			pcontactID->ToByteArray(cID);
-			ctemp->SetUserHash(CMD4Hash(cID));
+		if ((byCryptOptions & 0x08) == 0) {
+			AddDebugLogLineN(logKadSearch,
+				CFormat("Received Kad source type 6 (direct callback) which has the direct "
+					"callback flag not set (%s)") %
+					Uint32toStringIP(ED2KID));
+			break;
 		}
+
+		ctemp = new CUpDownClient(tcp, 1, 0, 0, temp, false, true);
+		ctemp->SetSourceFrom(SF_KADEMLIA);
+		ctemp->SetKadPort(udp);
+		ctemp->SetIP(ED2KID); // need to set the IP address, which cannot be used for TCP but for UDP
+		uint8_t cID16;
+		pcontactID->ToByteArray(cID);
+		ctemp->SetUserHash(CMD4Hash(cID));
+	}
 	}
 
 	if (ctemp) {
-		// add encryption settings
 		ctemp->SetConnectOptions(byCryptOptions);
 
-		AddDebugLogLineN(logKadSearch, CFormat("Happily adding a source (%s) type %d") % Uint32_16toStringIP_Port(ED2KID, ctemp->GetUserPort()) % type);
+		AddDebugLogLineN(logKadSearch,
+			CFormat("Happily adding a source (%s) type %d") %
+				Uint32_16toStringIP_Port(ED2KID, ctemp->GetUserPort()) % type);
 		CheckAndAddSource(temp, ctemp);
 	}
 }
 
-CPartFile* CDownloadQueue::GetFileByKadFileSearchID(uint32 id) const
+CPartFile *CDownloadQueue::GetFileByKadFileSearchID(uint32 id) const
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
-	for ( FileQueue::size_type i = 0; i < m_filelist.size(); ++i ) {
-		if ( id == m_filelisti->GetKadFileSearchID()) {
-			return m_filelist i ;
+	for (FileQueue::size_type i = 0; i < m_filelist.size(); ++i) {
+		if (id == m_filelisti->GetKadFileSearchID()) {
+			return m_filelisti;
 		}
 	}

amule-3.0.1.tar.gz/src/DownloadQueue.h -> amule-3.1.0.tar.gz/src/DownloadQueue.h Changed

@@ -26,13 +26,13 @@
 #ifndef DOWNLOADQUEUE_H
 #define DOWNLOADQUEUE_H
 
-#include "MD4Hash.h"		// Needed for CMD4Hash
-#include "ObservableQueue.h"	// Needed for CObservableQueue
-#include "GetTickCount.h"	// Needed for GetTickCount64
-
+#include "MD4Hash.h"         // Needed for CMD4Hash
+#include "ObservableQueue.h" // Needed for CObservableQueue
+#include "GetTickCount.h"    // Needed for GetTickCount64
 
+#include <atomic> // Needed for std::atomic (m_listGeneration)
 #include <deque>
-
+#include <functional> // Needed for std::function (LoadProgressCb)
 
 class CSharedFileList;
 class CSearchFile;
@@ -47,331 +47,223 @@
 class CED2KServerListLink;
 class CPath;
 
-namespace Kademlia {
-	class CUInt128;
+namespace Kademlia
+{
+class CUInt128;
 }
 
-/**
- * The download queue houses all active downloads.
- *
- *
- * This class should be thread-safe.
- */
-class CDownloadQueue : public CObservableQueue<CPartFile*>
+/// The download queue: every active download. Should be thread-safe.
+class CDownloadQueue : public CObservableQueue<CPartFile *>
 {
 public:
-	/**
-	 * Constructor.
-	 */
 	CDownloadQueue();
 
-	/**
-	 * Destructor.
-	 */
 	~CDownloadQueue();
 
-	/** Loads met-files from the specified directory. */
-	void	LoadMetFiles(const CPath& path);
+	// Progress hook for the part-file load, mirroring CSharedFileList::ReloadYieldCb. Called
+	// once per part file with the index just loaded and the total, which -- unlike the shared-
+	// file scan -- is known before the loop starts, the directory being enumerated into a
+	// vector first.
+	using LoadProgressCb = std::function<void(size_t /*loaded*/, size_t /*total*/)>;
 
-	/**
-	 * Main worker function.
-	 */
-	void	Process();
+	void LoadMetFiles(const CPath &path, const LoadProgressCb &progressCb = nullptr);
 
+	/// Main worker function.
+	void Process();
 
-	/**
-	 * Returns a pointer to the file with the specified hash, or NULL.
-	 *
-	 * @param filehash The hash to search for.
-	 * @return The corresponding file or NULL.
-	 */
-	CPartFile* GetFileByID(const CMD4Hash& filehash) const;
+	/// The file with hash @a filehash, or NULL.
+	CPartFile *GetFileByID(const CMD4Hash &filehash) const;
 
-	/**
-	 * Returns the file at the specified position in the file-list, or NULL if invalid.
-	 *
-	 * @param A valid position in the file-list.
-	 * @return A valid pointer or NULL if the index was invalid.
-	 */
-	CPartFile* GetFileByIndex(unsigned int idx) const;
+	/// The file at index @a idx in the file-list, or NULL if out of range.
+	CPartFile *GetFileByIndex(unsigned int idx) const;
 
+	/// True if the file is already being shared or downloaded. @a requestedName is the name it
+	/// was requested under; when that differs from the name already held under the hash, it is
+	/// appended to the log line so the message can be matched to the download command.
+	bool IsFileExisting(const CMD4Hash &fileid, const wxString &requestedName = wxEmptyString);
 
-	/**
-	 * Returns true if the file is currently being shared or downloaded
-	 */
-	bool	IsFileExisting(const CMD4Hash& fileid) const;
+	/// True if @a file is on the download queue.
+	bool IsPartFile(const CKnownFile *file) const;
 
-	/**
-	 * Returns true if the specified file is on the download-queue.
-	 */
-	bool	IsPartFile(const CKnownFile* file) const;
-
-	/**
-	 * Updates the file's download active time
-	 */
+	/// Updates the files' download active time.
 	void OnConnectionState(bool bConnected);
 
-	/**
-	 * Starts a new download based on the specified search-result.
-	 *
-	 * @param toadd The search-result to add.
-	 * @param category The category to assign to the new download.
-	 *
-	 * The download will only be started if no identical files are either
-	 * being downloaded or shared currently.
-	 */
-	void	AddSearchToDownload(CSearchFile* toadd, uint8 category);
+	/// Starts a download from search result @a toadd in @a category, unless an identical file
+	/// is already being downloaded or shared.
+	void AddSearchToDownload(CSearchFile *toadd, uint8 category);
 
+	/// Adds existing partfile @a newfile to the queue in @a category, stopped if @a paused.
+	void AddDownload(CPartFile *newfile, bool paused, uint8 category);
 
-	/**
-	 * Adds an existing partfile to the queue.
-	 *
-	 * @param newfile The file to add.
-	 * @param paused If the file should be stopped when added.
-	 * @param category The category to assign to the file.
-	 */
-	void	AddDownload(CPartFile* newfile, bool paused, uint8 category);
-
+	/// Removes @a toremove from the queue, adding it to the completed list if @a
+	/// keepAsCompleted.
+	void RemoveFile(CPartFile *toremove, bool keepAsCompleted = false);
 
-	/**
-	 * 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, bool keepAsCompleted = false);
+	/// Saves the source-seeds of every file on the queue.
+	void SaveSourceSeeds();
 
+	/// Loads the source-seeds of every file on the queue.
+	void LoadSourceSeeds();
 
-	/**
-	 * Saves the source-seeds of every file on the queue.
-	 */
-	void	SaveSourceSeeds();
+	/// Adds a potential new source to @a sender, checked against the existing clients: it is
+	/// queued as appropriate, or deleted if it duplicates one. @a source may be deleted.
+	void CheckAndAddSource(CPartFile *sender, CUpDownClient *source);
 
-	/**
-	 * Loads the source-seeds of every file on the queue.
-	 */
-	void	LoadSourceSeeds();
+	/// Like CheckAndAddSource, but @a source is assumed valid and is not checked for being a
+	/// duplicate.
+	void CheckAndAddKnownSource(CPartFile *sender, CUpDownClient *source);
 
+	/// Removes @a toremove from both normal source lists, the A4AF lists and the downloadqueue
+	/// widget, and resets its requestfile. @a bDoStatsUpdate asks the affected files to update
+	/// their statistics; @a updatewindow is unused. True if the source was found and removed.
+	bool RemoveSource(CUpDownClient *toremove, bool updatewindow = true, bool bDoStatsUpdate = true);
 
-	/**
-	 * Adds a potiential new client to the specified file.
-	 *
-	 * @param sender The owner of the new source.
-	 * @param source The client in question, might be deleted!
-	 *
-	 * This function will check the new client against the already existing
-	 * clients. The source will then be queued as is appropriate, or deleted
-	 * if it is duplicate of an existing client.
-	 */
-	void    CheckAndAddSource(CPartFile* sender, CUpDownClient* source);
+	/// The queued client with this IP and UDP port, found through the file sources, or NULL.
+	CUpDownClient *GetDownloadClientByIP_UDP(uint32 dwIP, uint16 nUDPPort) const;
 
-	/**
-	 * This function adds already known source to the specified file.
-	 *
-	 * @param sender The owner of the new source.
-	 * @param source The client in question.
-	 *
-	 * This function acts like CheckAndAddSource, with the exception that no
-	 * checks are made to see if the client is a duplicate. It is assumed that
-	 * it is in fact a valid client.
-	 */
-	void    CheckAndAddKnownSource(CPartFile* sender, CUpDownClient* source);
+	/// Queues @a sender for source-requesting from the connected server.
+	void SendLocalSrcRequest(CPartFile *sender);
 
+	/// Removes @a pFile from the server-request queue.
+	void RemoveLocalServerRequest(CPartFile *pFile);
 
-	/**
-	 * Removes the specified client completely.
-	 *
-	 * @param toremove The client to be removed.
-	 * @param updatewindow NOT USED!
-	 * @param bDoStatsUdpate Specifies if the affected files should update their statistics.
-	 * @return True if the sources was found and removed.
-	 *
-	 * This function will remove the specified source from both normal source
-	 * lists, A4AF lists and the downloadqueue-widget. The requestfile of the
-	 * source is also reset.
-	 */
-	bool	RemoveSource(CUpDownClient* toremove, bool updatewindow = true, bool bDoStatsUpdate = true);
+	/// Resets all queued server-requests.
+	void ResetLocalServerRequests();
 
+	/// Starts the next paused file on the queue by priority, honouring categories when the
+	/// preference is on.
+	void StartNextFile(CPartFile *oldfile);
 
-	/**
-	 * Finds the queued client by IP and UDP-port, by looking at file-sources.
-	 *
-	 * @param dwIP The IP-address of the client.
-	 * @param nUDPPort The UDP-port of the client.
-	 * @return The matching client or NULL if none was found.
-	 */
-	CUpDownClient* GetDownloadClientByIP_UDP(uint32 dwIP, uint16 nUDPPort) const;
+	/// Resets the category of every file in category @a cat.
+	void ResetCatParts(uint8 cat);
 
+	/// Sets the priority of every file in category @a cat.
+	void SetCatPrio(uint8 cat, uint8 newprio);
 
-	/**
-	 * Queues the specified file for source-requestion from the connected server.
-	 */
-	void	SendLocalSrcRequest(CPartFile* sender);
+	/// Sets the status of every file in category @a cat.
+	void SetCatStatus(uint8 cat, int newstatus);
 
-	/**
-	 * Removes the specified server from the request-queue.
-	 */
-	void	RemoveLocalServerRequest(CPartFile* pFile);
+	/// Current number of queued files.
+	uint16 GetFileCount() const;
 
 	/**
-	 * Resets all queued server-requests.
-	 */
-	void	ResetLocalServerRequests();
-
-
-	/**
-	 * Starts the next paused file on the queue, going after priority.
-	 * Also checks for categories if enabled on preferences.
+	 * Changes whenever a file enters or leaves the list(s) this snapshots.
+	 *
+	 * A change token, not a count: a reload clears and re-adds, so it advances once per file.
+	 * All a caller may conclude is "same value means nothing entered or left". Comparing sizes
+	 * would be wrong -- an add and a remove between two polls is a net-zero size change that
+	 * still has to reconcile.
+	 *
+	 * Lets a caller that only needs "did membership change" skip the snapshot. CopyFileList is
+	 * O(n) and the EC file-list reconcile runs it on every poll for every connected client,
+	 * almost always to find nothing came or went.
+	 *
+	 * Read it BEFORE CopyFileList, never after. Read first and the value can only be older than
+	 * the snapshot; a change racing in between just makes the next poll redo the work. Read
+	 * after, and a change landing between the copy and the read is recorded as already seen,
+	 * and lost.
 	 */
-	void	StartNextFile(CPartFile* oldfile);
+	uint64 GetListGeneration() const { return m_listGeneration.load(std::memory_order_relaxed); }
 
+	void CopyFileList(std::vector<CPartFile *> &out_list, bool includeCompleted = false) const;
 
-	/**
-	 * Resets the category of all files with the specified category.
-	 */
-	void	ResetCatParts(uint8 cat);
+	/// Current number of downloading files.
+	uint16 GetDownloadingFileCount() const;
 
-	/**
-	 * Sets the priority of all files with the specified category.
-	 */
-	void	SetCatPrio(uint8 cat, uint8 newprio);
+	/// Current number of paused files.
+	uint16 GetPausedFileCount() const;
 
-	/**
-	 * Sets the status of all files with the specified category.
-	 */
-	void	SetCatStatus(uint8 cat, int newstatus);
+	/// Called when a DNS lookup finishes.
+	void OnHostnameResolved(uint32 ip);
 
-	/**
-	 * Returns the current number of queued files.
-	 */
-	uint16	GetFileCount() const;
+	/// Adds an ed2k or magnet link to the download queue.
+	bool AddLink(const wxString &link, uint8 category = 0);
 
-	/**
-	 * Makes a copy of the file list.
-	 */
-	void	CopyFileList(std::vector<CPartFile*>& out_list, bool includeCompleted = false) const;
+	/// Batch variant of AddLink. Per-link failures are still logged with the protocol reason,
+	/// plus one aggregated dialog at the end of the batch.
+	void AddLinks(const wxArrayString &links, uint8 category = 0);
 
-	/**
-	 * Returns the current number of downloading files.
-	 */
-	uint16	GetDownloadingFileCount() const;
-
-	/**
-	 * Returns the current number of paused files.
-	 */
-	uint16	GetPausedFileCount() const;
-
-
-	/**
-	 * This function is called when a DNS lookup is finished.
-	 */
-	void	OnHostnameResolved(uint32 ip);
+	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);
 
+	/// The server currently being queried by UDP packets.
+	CServer *GetUDPServer() const;
 
-	/**
-	 * Adds an ed2k or magnet link to download queue.
-	 */
-	bool	AddLink( const wxString& link, uint8 category = 0 );
-
-	/**
-	 * Batch variant of AddLink. Per-link failures are still logged with the
-	 * specific protocol reason; on top of that, a single aggregated dialog
-	 * is shown at the end of the batch (one popup for N failed links).
-	 */
-	void	AddLinks( const wxArrayString& links, uint8 category = 0 );
+	/// Sets the server to query over UDP.
+	void SetUDPServer(CServer *server);
 
-	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 );
-
-
-	/**
-	 * Returns the current server which is beening queried by UDP packets.
-	 */
-	CServer* GetUDPServer() const;
-
-	/**
-	 * Set the server to query through UDP packest.
-	 */
-	void	SetUDPServer( CServer* server );
-
-
-	/**
-	 * Stop the source-requests from non-connected servers.
-	 */
-	void	StopUDPRequests();
+	/// Stops source-requests from non-connected servers.
+	void StopUDPRequests();
 
 	/* Kad Stuff */
 
-	/**
-	 * Add a Kad source to a download
-	 */
-	 void	KademliaSearchFile(uint32_t searchID, const Kademlia::CUInt128* pcontactID, const Kademlia::CUInt128* pkadID, uint8_t type, uint32_t ip, uint16_t tcp, uint16_t udp, uint32_t buddyip, uint16_t buddyport, uint8_t byCryptOptions);
+	/// Adds a Kad source to a download.
+	void KademliaSearchFile(uint32_t searchID,
+		const Kademlia::CUInt128 *pcontactID,
+		const Kademlia::CUInt128 *pkadID,
+		uint8_t type,
+		uint32_t ip,
+		uint16_t tcp,
+		uint16_t udp,
+		uint32_t buddyip,
+		uint16_t buddyport,
+		uint8_t byCryptOptions);
 
-	CPartFile* GetFileByKadFileSearchID(uint32 id) const;
+	CPartFile *GetFileByKadFileSearchID(uint32 id) const;
 
-	bool	DoKademliaFileRequest();
+	bool DoKademliaFileRequest();
 
-	void	SetLastKademliaFileRequest()	{lastkademliafilerequest = ::GetTickCount64();}
+	void SetLastKademliaFileRequest() { lastkademliafilerequest = ::GetTickCount64(); }
 
-	uint32	GetRareFileThreshold() const { return m_rareFileThreshold; }
-	uint32	GetCommonFileThreshold() const { return m_commonFileThreshold; }
+	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);
+	/// Removes files from the list of completed downloads.
+	void ClearCompleted(const ListOfUInts32 &ecids);
 
 private:
-	/**
-	 * This function initializes new observers with the current contents of the queue.
-	 */
-	virtual void ObserverAdded( ObserverType* o );
+	/// Initialises a new observer with the current contents of the queue.
+	virtual void ObserverAdded(ObserverType *o);
 
-
-	/**
-	 * Helper-function, sorts the filelist so that high-priority files are first.
-	 */
-	void	DoSortByPriority();
+	/// Sorts the filelist so that high-priority files come first.
+	void DoSortByPriority();
 
 	/** Checks that there is enough free spaces for temp-files at that specified path. */
-	void	CheckDiskspace(const CPath& path);
-
-	/**
-	 * Stops performing UDP requests.
-	 */
-	void	DoStopUDPRequests();
+	void CheckDiskspace(const CPath &path);
 
+	/// Stops performing UDP requests.
+	void DoStopUDPRequests();
 
-	void	ProcessLocalRequests();
+	void ProcessLocalRequests();
 
-	bool	SendNextUDPPacket();
-	int		GetMaxFilesPerUDPServerPacket() const;
-	bool	SendGlobGetSourcesUDPPacket(CMemFile& data);
+	bool SendNextUDPPacket();
+	int GetMaxFilesPerUDPServerPacket() const;
+	bool SendGlobGetSourcesUDPPacket(CMemFile &data);
 
-	void	AddToResolve(const CMD4Hash& fileid, const wxString& pszHostname, uint16 port, const wxString& hash, uint8 cryptoptions);
+	void AddToResolve(const CMD4Hash &fileid,
+		const wxString &pszHostname,
+		uint16 port,
+		const wxString &hash,
+		uint8 cryptoptions);
 
 	//! The mutex associated with this class, mutable to allow for const functions.
 	mutable wxMutex m_mutex;
 
-
-	uint32		m_datarate;
-	uint64		m_lastDiskCheck;
-	uint64		m_lastudpsearchtime;
-	uint64		m_lastsorttime;
-	uint64		m_lastudpstattime;
-	uint64		m_nLastED2KLinkCheck;
-	uint8		m_cRequestsSentToServer;
-	uint64		m_dwNextTCPSrcReq;
-	uint8		m_udcounter;
-	CServer*	m_udpserver;
-
-
-	/**
-	 * Structure used to store sources with dynamic hostnames.
-	 */
+	uint32 m_datarate;
+	uint64 m_lastDiskCheck;
+	uint64 m_lastudpsearchtime;
+	uint64 m_lastsorttime;
+	uint64 m_lastudpstattime;
+	uint64 m_nLastED2KLinkCheck;
+	uint8 m_cRequestsSentToServer;
+	uint64 m_dwNextTCPSrcReq;
+	uint8 m_udcounter;
+	CServer *m_udpserver;
+
+	/// Stores a source with a dynamic hostname.
 	struct Hostname_Entry
 	{
 		//! The ID of the file the source provides.
@@ -386,31 +278,35 @@
 		uint8 cryptoptions;
 	};
 
-	std::deque<Hostname_Entry>	m_toresolve;
+	std::deque<Hostname_Entry> m_toresolve;
 
-	typedef std::deque<CPartFile*> FileQueue;
+	typedef std::deque<CPartFile *> FileQueue;
 	FileQueue m_filelist;
+	// See GetListGeneration(). Bumped under m_mutex wherever m_filelist OR m_completedDownloads
+	// gains or loses an entry -- CopyFileList draws from both when includeCompleted is set,
+	// which is how the EC reconcile calls it.
+	std::atomic<uint64> m_listGeneration{ 0 };
 
-	typedef std::list<CPartFile*> FileList;
-	FileList		m_localServerReqQueue;
+	typedef std::list<CPartFile *> FileList;
+	FileList m_localServerReqQueue;
 
 	//! List of downloads completed and still on display
-	FileList		m_completedDownloads;
+	FileList m_completedDownloads;
 
 	//! Observer used to keep track of which servers have yet to be asked for sources
-	CQueueObserver<CServer*>	m_queueServers;
+	CQueueObserver<CServer *> m_queueServers;
 
 	//! Observer used to keep track of which file to send UDP requests for
-	CQueueObserver<CPartFile*>	m_queueFiles;
+	CQueueObserver<CPartFile *> m_queueFiles;
 
 	/* Kad Stuff */
-	uint64		lastkademliafilerequest;
+	uint64 lastkademliafilerequest;
 
 	//! Threshold for rare files, dynamically based on the sources for each.
-	uint32		m_rareFileThreshold;
+	uint32 m_rareFileThreshold;
 
 	//! Threshold for common files, dynamically based on the sources for each.
-	uint32		m_commonFileThreshold;
+	uint32 m_commonFileThreshold;
 };
 
 #endif // DOWNLOADQUEUE_H

amule-3.0.1.tar.gz/src/ECFullResponseCache.cpp -> amule-3.1.0.tar.gz/src/ECFullResponseCache.cpp Changed

@@ -22,16 +22,15 @@
 
 #include <set>
 
-
 CECFullResponseCache::CECFullResponseCache(TagBuilder builder)
-	: m_builder(std::move(builder))
-{}
-
+: m_builder(std::move(builder))
+{
+}
 
-std::vector<std::shared_ptr<const std::vector<unsigned char> > >
-CECFullResponseCache::GetBlobs(const std::vector<FileRef> &files)
+std::vector<std::shared_ptr<const std::vector<unsigned char>>> CECFullResponseCache::GetBlobs(
+	const std::vector<FileRef> &files)
 {
-	std::vector<std::shared_ptr<const std::vector<unsigned char> > > result;
+	std::vector<std::shared_ptr<const std::vector<unsigned char>>> result;
 	result.reserve(files.size());
 
 	// First pass under the lock: collect cached entries that are still
@@ -45,28 +44,26 @@
 				result.push_back(it->second.bytes);
 			} else {
 				// Placeholder; filled in below
-				result.push_back(std::shared_ptr<const std::vector<unsigned char> >());
+				result.push_back(std::shared_ptr<const std::vector<unsigned char>>());
 				to_build.push_back(i);
 			}
 		}
 	}
 
-	// Build stale / missing entries outside the lock. Tag construction
-	// + serialization is the slow part — holding the cache mutex
-	// through it would serialise every concurrent reader on the first
-	// thread's rebuild.
+	// Build stale or missing entries outside the lock. Tag construction and serialization is
+	// the slow part -- holding the cache mutex through it would serialise every concurrent
+	// reader on the first thread's rebuild.
 	for (size_t i = 0; i < to_build.size(); ++i) {
 		const size_t idx = to_buildi;
 		const FileRef &ref = filesidx;
 
 		std::unique_ptr<CECTag> tag(m_builder(ref.file));
-		std::shared_ptr<const std::vector<unsigned char> > bytes(
+		std::shared_ptr<const std::vector<unsigned char>> bytes(
 			new std::vector<unsigned char>(CECMemSocket::SerializeTag(*tag)));
 
-		// Re-lock briefly to install. Two concurrent rebuilds for the
-		// same file are tolerated: each produces a logically
-		// equivalent blob, the last writer wins, both callers' result
-		// vectors point at a valid blob via the shared_ptr they
+		// Re-lock briefly to install. Two concurrent rebuilds for the same file are
+		// tolerated: each produces a logically equivalent blob, the last writer wins, and
+		// both callers' result vectors point at a valid blob via the shared_ptr they
 		// already took out.
 		{
 			std::lock_guard<std::mutex> lk(m_mutex);
@@ -80,7 +77,6 @@
 	return result;
 }
 
-
 void CECFullResponseCache::PruneOutsideOf(const std::vector<FileRef> &alive_files)
 {
 	std::set<uint32> alive;
@@ -89,8 +85,7 @@
 	}
 
 	std::lock_guard<std::mutex> lk(m_mutex);
-	for (std::map<uint32, Entry>::iterator it = m_entries.begin();
-		it != m_entries.end(); ) {
+	for (std::map<uint32, Entry>::iterator it = m_entries.begin(); it != m_entries.end();) {
 		if (!alive.count(it->first)) {
 			m_entries.erase(it++);
 		} else {

amule-3.0.1.tar.gz/src/ECFullResponseCache.h -> amule-3.1.0.tar.gz/src/ECFullResponseCache.h Changed

@@ -32,73 +32,62 @@
 
 #include "Types.h"
 
-
 /**
  * Per-file bytes cache for the FULL EC response paths.
  *
- * Backs the amulecmd `show shared` / `show DL` invocations: each one is
- * a fresh short-lived EC connection with no per-connection diff state,
- * so it always asks for `EC_DETAIL_FULL` and would otherwise force the
- * daemon to rebuild and serialize the entire shared-file / partfile
- * tag tree from scratch every time. On a 91 k-file shareset that's
- * ~10 s of CPU per invocation (issue #713).
+ * Backs the amulecmd `show shared` / `show DL` invocations: each is a fresh short-lived EC
+ * connection with no per-connection diff state, so it always asks for `EC_DETAIL_FULL` and would
+ * otherwise force the daemon to rebuild and serialize the entire shared-file / partfile tag tree
+ * from scratch. On a 91 k-file shareset that is ~10 s of CPU per invocation (issue #713).
  *
- * The cache stores one pre-serialized blob per file, keyed by ECID,
- * and freshness-stamped with the file's `m_ecGen` at the time of build.
- * On each request the daemon iterates the current snapshot of files,
- * reuses cached blobs whose gen is still current, and rebuilds only
- * the ones whose `m_ecGen` has advanced past the cached value
- * (the same per-file freshness primitive PR #727 introduced).
+ * One pre-serialized blob per file, keyed by ECID and freshness-stamped with the file's `m_ecGen`
+ * at build time. Each request walks the current snapshot, reuses blobs whose gen is still current,
+ * and rebuilds only those whose `m_ecGen` has advanced.
  *
- * A connection-side helper concatenates the per-file blobs with a
- * fresh opcode + children-count header and writes the result through
- * the real socket's `WriteBuffer` — per-connection compression (#728)
- * still applies because the cached bytes flow through the connection's
- * normal write path.
+ * A connection-side helper concatenates the blobs with a fresh opcode + children-count header and
+ * writes the result through the real socket's `WriteBuffer`, so per-connection compression (#728)
+ * still applies.
  *
- * The cached blobs use the canonical wire format chosen by
- * `CECMemSocket`: UTF-8 numbers + sentinel-extended children count, no
- * zlib. Both capability bits are advertised by every modern client, so
- * the cached form is reusable regardless of which connection ends up
- * emitting it.
+ * The blobs use the canonical wire format `CECMemSocket` chooses: UTF-8 numbers + sentinel-extended
+ * children count, no zlib. Every modern client advertises both capability bits, so a cached blob is
+ * reusable whichever connection emits it.
  */
-class CECFullResponseCache {
+class CECFullResponseCache
+{
 public:
-	/// Build a self-contained CECTag for the given file. Caller owns
-	/// the returned tag and is expected to throw it away after the
-	/// cache serializes it.
-	using TagBuilder = std::function<CECTag*(const void *file)>;
+	/// Build a self-contained CECTag for the given file. The caller owns the returned tag and
+	/// throws it away after the cache serializes it.
+	using TagBuilder = std::function<CECTag *(const void *file)>;
 
 	explicit CECFullResponseCache(TagBuilder builder);
 
 	/**
-	 * Snapshot the per-file blobs for the given (file pointer, ECID,
-	 * current m_ecGen) tuples. Rebuilds any stale entries inline.
-	 * Returns the blobs in the same order as the inputs so the caller
-	 * can write them straight to the wire.
+	 * Snapshot the per-file blobs for the given (file pointer, ECID, current m_ecGen) tuples,
+	 * rebuilding stale entries inline. Returns them in input order so the caller can write them
+	 * straight to the wire.
 	 *
-	 * Concurrent callers each get a consistent set of bytes — rebuilds
-	 * race-but-don't-corrupt (last write wins, both readers see a
-	 * valid blob).
+	 * Concurrent callers each get a consistent set of bytes -- rebuilds race but do not corrupt
+	 * (last write wins, both readers see a valid blob).
 	 */
-	struct FileRef {
-		const void *file;	// passed to the builder
+	struct FileRef
+	{
+		const void *file; // passed to the builder
 		uint32 ecid;
 		uint64 gen;
 	};
 
-	std::vector<std::shared_ptr<const std::vector<unsigned char> > >
-	GetBlobs(const std::vector<FileRef> &files);
+	std::vector<std::shared_ptr<const std::vector<unsigned char>>> GetBlobs(
+		const std::vector<FileRef> &files);
 
-	/// Drop cached entries for ECIDs not in the given set (called once
-	/// per request after GetBlobs to prune files that left the
-	/// shareset). Bounded memory.
+	/// Drop cached entries for ECIDs not in the given set, once per request after GetBlobs, so
+	/// files that left the shareset do not grow the cache.
 	void PruneOutsideOf(const std::vector<FileRef> &alive_files);
 
 private:
-	struct Entry {
+	struct Entry
+	{
 		uint64 gen;
-		std::shared_ptr<const std::vector<unsigned char> > bytes;
+		std::shared_ptr<const std::vector<unsigned char>> bytes;
 	};
 
 	std::mutex m_mutex;
@@ -106,5 +95,4 @@
 	TagBuilder m_builder;
 };
 
-
 #endif // EC_FULL_RESPONSE_CACHE_H

amule-3.1.0.tar.gz/src/ECIdDiff.h Added

@@ -0,0 +1,91 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 ECIDDIFF_H
+#define ECIDDIFF_H
+
+#include <algorithm>  // Needed for std::adjacent_find
+#include <cassert>    // Needed for assert
+#include <functional> // Needed for std::greater_equal
+#include <vector>
+
+#include "Types.h" // Needed for uint32
+
+/**
+ * Which ECIDs the client was told about last cycle and is no longer being told about, i.e. the ones
+ * needing an explicit `EC_TAG_FILE_REMOVED`.
+ *
+ * Both inputs must be sorted ascending and duplicate-free, which makes this a single linear pass
+ * over two contiguous arrays instead of a lookup per file. `Get_EC_Response_GetUpdate` gets that
+ * ordering for free: it walks the encoder map, which is kept sorted by ECID.
+ *
+ * Deliberately pure, and deliberately not taking a CECPacket. Getting this wrong fails silently in
+ * both directions -- a missed removal leaves an entry in the client's list forever, a spurious one
+ * deletes a file the user still has -- so it is worth being testable without an app, a daemon, or a
+ * connected client.
+ *
+ * @param previous ECIDs sent in the previous response.
+ * @param current  ECIDs being sent in this one.
+ * @param removed  Receives the difference, ascending. Cleared first.
+ */
+inline void ComputeRemovedIds(
+	const std::vector<uint32> &previous, const std::vector<uint32> &current, std::vector<uint32> &removed)
+{
+	// Preconditions, not defensive coding. Input that is out of order, or carries a duplicate,
+	// makes this quietly return the wrong set rather than fail -- and both wrong answers are
+	// invisible at runtime. Checking turns that into a debug-run abort.
+	//
+	// One pass covers both halves of the contract: adjacent_find looks for the first
+	// neighbouring pair that is not strictly increasing, which catches an equal pair as well as
+	// an out-of-order one.
+	//
+	// adjacent_find rather than is_sorted with a `<=` comparator, which is what this was.
+	// is_sorted requires a strict weak ordering and `<=` is not irreflexive, so a hardened
+	// standard library is entitled to -- and libstdc++ under _GLIBCXX_DEBUG does -- abort on
+	// the predicate itself. That would fire on the very build these checks exist to serve.
+	//
+	// assert() rather than wxASSERT, because this header is deliberately usable without an app:
+	// wx installs its assert handler from the wxApp constructor, so with no wxApp -- exactly
+	// the unit-test case -- wxASSERT is a silent no-op.
+	assert(std::adjacent_find(previous.begin(), previous.end(), std::greater_equal<uint32>()) ==
+		previous.end());
+	assert(std::adjacent_find(current.begin(), current.end(), std::greater_equal<uint32>()) ==
+		current.end());
+
+	removed.clear();
+	std::vector<uint32>::const_iterator cur = current.begin();
+	const std::vector<uint32>::const_iterator curEnd = current.end();
+	for (const uint32 prev : previous) {
+		// `previous` ascends too, so the cursor only moves forward across the whole call --
+		// this is O(previous + current), not O(previous * current).
+		while (cur != curEnd && *cur < prev) {
+			++cur;
+		}
+		if (cur == curEnd || *cur != prev) {
+			removed.push_back(prev);
+		}
+	}
+}
+
+#endif // ECIDDIFF_H

amule-3.0.1.tar.gz/src/ECSpecialCoreTags.cpp -> amule-3.1.0.tar.gz/src/ECSpecialCoreTags.cpp Changed

@@ -23,88 +23,114 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include <ec/cpp/ECTag.h>		// Needed for CECTag
-#include <ec/cpp/ECSpecialTags.h>	// Needed for special EC tag creator classes
-
+#include <ec/cpp/ECTag.h>         // Needed for CECTag
+#include <ec/cpp/ECSpecialTags.h> // Needed for special EC tag creator classes
+#include <tags/FileTags.h>        // Needed for FT_MEDIA_* metadata tag names
 
 // Since there are only constructors defined here,
 // removing everything from non-local builds.
 
 #include "amule.h"
-#include "Server.h"		// Needed for CServer
-#include "PartFile.h"		// Needed for CPartFile
-#include "ServerConnect.h"	// Needed for CServerConnect
-#include "updownclient.h"	// Needed for CUpDownClient
-#include "UploadQueue.h"	// Needed for CUploadQueue
+#ifdef ENABLE_IP2COUNTRY
+#include "IP2Country.h" // For CIP2Country (country tag serialisation, #439/#440)
+#endif
+#include "Server.h"        // Needed for CServer
+#include "PartFile.h"      // Needed for CPartFile
+#include "ServerConnect.h" // Needed for CServerConnect
+#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()))
+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()))
 {
 	wxString tmpStr;
 	uint32 tmpInt;
 	uint8 tmpShort;
 
 	switch (detail_level) {
-		case EC_DETAIL_INC_UPDATE:
-			// should not get here
-			wxFAIL;
-			break;
-		case EC_DETAIL_UPDATE:
-			if ((tmpInt = server->GetPing()) != 0) {
-				AddTag(CECTag(EC_TAG_SERVER_PING, tmpInt));
-			}
-			if ((tmpShort = (uint8)server->GetFailedCount()) != 0) {
-				AddTag(CECTag(EC_TAG_SERVER_FAILED, tmpShort));
-			}
-			break;
-		case EC_DETAIL_WEB:
-		case EC_DETAIL_FULL:
-			if ((tmpInt = server->GetPing()) != 0) {
-				AddTag(CECTag(EC_TAG_SERVER_PING, tmpInt));
-			}
-			if ((tmpShort = (uint8)server->GetPreferences()) != SRV_PR_NORMAL) {
-				AddTag(CECTag(EC_TAG_SERVER_PRIO, tmpShort));
-			}
-			if ((tmpShort = (uint8)server->GetFailedCount()) != 0) {
-				AddTag(CECTag(EC_TAG_SERVER_FAILED, tmpShort));
-			}
-			if ((tmpShort = (server->IsStaticMember() ? 1 : 0)) != 0) {
-				AddTag(CECTag(EC_TAG_SERVER_STATIC, tmpShort));
-			}
-			if (!(tmpStr = server->GetVersion()).IsEmpty()) {
-				AddTag(CECTag(EC_TAG_SERVER_VERSION, tmpStr));
-			}
-			if (!(tmpStr = server->GetDescription()).IsEmpty()) {
-				AddTag(CECTag(EC_TAG_SERVER_DESC, tmpStr));
-			}
-			if ((tmpInt = server->GetUsers()) != 0) {
-				AddTag(CECTag(EC_TAG_SERVER_USERS, tmpInt));
-			}
-			if ((tmpInt = server->GetMaxUsers()) != 0) {
-				AddTag(CECTag(EC_TAG_SERVER_USERS_MAX, tmpInt));
-			}
-			if ((tmpInt = server->GetFiles()) != 0) {
-				AddTag(CECTag(EC_TAG_SERVER_FILES, tmpInt));
-			}
-		/* fall through */
-		case EC_DETAIL_CMD:
-			if (!(tmpStr = server->GetListName()).IsEmpty()) {
-				AddTag(CECTag(EC_TAG_SERVER_NAME, tmpStr));
-			}
+	case EC_DETAIL_INC_UPDATE:
+		// should not get here
+		wxFAIL;
+		break;
+	case EC_DETAIL_UPDATE:
+		if ((tmpInt = server->GetPing()) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_PING, tmpInt));
+		}
+		if ((tmpShort = (uint8)server->GetFailedCount()) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_FAILED, tmpShort));
+		}
+		break;
+	case EC_DETAIL_WEB:
+	case EC_DETAIL_FULL:
+		if ((tmpInt = server->GetPing()) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_PING, tmpInt));
+		}
+		if ((tmpShort = (uint8)server->GetPreferences()) != SRV_PR_NORMAL) {
+			AddTag(CECTag(EC_TAG_SERVER_PRIO, tmpShort));
+		}
+		if ((tmpShort = (uint8)server->GetFailedCount()) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_FAILED, tmpShort));
+		}
+		if ((tmpShort = (server->IsStaticMember() ? 1 : 0)) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_STATIC, tmpShort));
+		}
+		if (!(tmpStr = server->GetVersion()).IsEmpty()) {
+			AddTag(CECTag(EC_TAG_SERVER_VERSION, tmpStr));
+		}
+		if (!(tmpStr = server->GetDescription()).IsEmpty()) {
+			AddTag(CECTag(EC_TAG_SERVER_DESC, tmpStr));
+		}
+		if ((tmpInt = server->GetUsers()) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_USERS, tmpInt));
+		}
+		if ((tmpInt = server->GetMaxUsers()) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_USERS_MAX, tmpInt));
+		}
+		if ((tmpInt = server->GetFiles()) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_FILES, tmpInt));
+		}
+		// Per-user publishing limits (issue #840). Sent from both server-tag builders --
+		// this one carries the initial list, the valuemap one below carries updates --
+		// since a tag in only one leaves the remote GUI's column permanently blank.
+		if ((tmpInt = server->GetSoftFiles()) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_FILES_SOFT, tmpInt));
+		}
+		if ((tmpInt = server->GetHardFiles()) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_FILES_HARD, tmpInt));
+		}
+		// Wire capability flags: diagnostics, hidden by default in release builds,
+		// but the remote GUI offers the same columns as the monolithic app.
+		if ((tmpInt = server->GetTCPFlags()) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_TCP_FLAGS, tmpInt));
+		}
+		if ((tmpInt = server->GetUDPFlags()) != 0) {
+			AddTag(CECTag(EC_TAG_SERVER_UDP_FLAGS, tmpInt));
+		}
+	/* fall through */
+	case EC_DETAIL_CMD:
+		if (!(tmpStr = server->GetListName()).IsEmpty()) {
+			AddTag(CECTag(EC_TAG_SERVER_NAME, tmpStr));
+		}
+#ifdef ENABLE_IP2COUNTRY
+		// Server host country ISO code (#440). WEB / FULL fall through to here,
+		// so this covers the webserver, amulecmd and remote-detail paths.
+		if (theApp->GetIP2Country() && theApp->GetIP2Country()->IsEnabled()) {
+			AddTag(CECTag(EC_TAG_SERVER_COUNTRY,
+				theApp->GetIP2Country()->GetCountryCode(server->GetFullIP())));
+		}
+#endif
 	}
 }
 
 // used for amulegui (EC_DETAIL_INC_UPDATE)
-CEC_Server_Tag::CEC_Server_Tag(const CServer *server, CValueMap *valuemap) :
-	CECTag(EC_TAG_SERVER, server->ECID())
+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);
@@ -118,32 +144,49 @@
 	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);
+	// Per-user publishing limits the server advertises (issue #840). Zero here
+	// means it has not told us yet, and the GUI renders that as blank.
+	AddTag(EC_TAG_SERVER_FILES_SOFT, server->GetSoftFiles(), valuemap);
+	AddTag(EC_TAG_SERVER_FILES_HARD, server->GetHardFiles(), valuemap);
+	AddTag(EC_TAG_SERVER_TCP_FLAGS, server->GetTCPFlags(), valuemap);
+	AddTag(EC_TAG_SERVER_UDP_FLAGS, server->GetUDPFlags(), valuemap);
+#ifdef ENABLE_IP2COUNTRY
+	// Server host country ISO code for the remote GUI (#440).
+	if (theApp->GetIP2Country() && theApp->GetIP2Country()->IsEnabled()) {
+		AddTag(EC_TAG_SERVER_COUNTRY,
+			theApp->GetIP2Country()->GetCountryCode(server->GetFullIP()),
+			valuemap);
+	}
+#endif
 }
 
-
-CEC_ConnState_Tag::CEC_ConnState_Tag(EC_DETAIL_LEVEL detail_level) : CECTag(EC_TAG_CONNSTATE,
-	(uint8)(
-			(theApp->IsConnectedED2K() ? 0x01 : 0x00)
-			|
-			(theApp->serverconnect->IsConnecting() ? 0x02 : 0x00)
-			|
-			(theApp->IsConnectedKad() ? 0x04 : 0x00)
-			|
-			(Kademlia::CKademlia::IsFirewalled() ? 0x08 : 0x00)
-			|
-			(Kademlia::CKademlia::IsRunning() ? 0x10 : 0x00)
-		))
+CEC_ConnState_Tag::CEC_ConnState_Tag(EC_DETAIL_LEVEL detail_level)
+: CECTag(EC_TAG_CONNSTATE,
+	  (uint8)((theApp->IsConnectedED2K() ? 0x01 : 0x00) |
+		  (theApp->serverconnect->IsConnecting() ? 0x02 : 0x00) |
+		  (theApp->IsConnectedKad() ? 0x04 : 0x00) |
+		  (Kademlia::CKademlia::IsFirewalled() ? 0x08 : 0x00) |
+		  (Kademlia::CKademlia::IsRunning() ? 0x10 : 0x00)))
 {
 	if (theApp->IsConnectedED2K()) {
-		if ( theApp->serverconnect->GetCurrentServer() ) {
+		if (theApp->serverconnect->GetCurrentServer()) {
 			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()));
+				AddTag(CECTag(
+					EC_TAG_SERVER, theApp->serverconnect->GetCurrentServer()->ECID()));
 			} else {
-				AddTag(CEC_Server_Tag(theApp->serverconnect->GetCurrentServer(), detail_level));
+				AddTag(CEC_Server_Tag(
+					theApp->serverconnect->GetCurrentServer(), detail_level));
 			}
 		}
 		AddTag(CECTag(EC_TAG_ED2K_ID, theApp->GetED2KID()));
+		// GetTicks() truncated to uint32 -- fine until 2106, and matching the uint32 id
+		// space of EC_TAG_ED2K_ID next to it. Sent only while connected, so no consumer has
+		// to tell "never connected" from "connected at the epoch".
+		if (theApp->GetED2KConnectedSince().IsValid()) {
+			AddTag(CECTag(EC_TAG_ED2K_CONNECTED_SINCE,
+				(uint32)theApp->GetED2KConnectedSince().GetTicks()));
+		}
 	} else if (theApp->serverconnect->IsConnecting()) {
 		AddTag(CECTag(EC_TAG_ED2K_ID, 0xffffffff));
 	}
@@ -153,11 +196,13 @@
 	if (Kademlia::CKademlia::IsRunning()) {
 		AddTag(CECTag(EC_TAG_KAD_ID, Kademlia::CKademlia::GetKadID()));
 	}
+	if (theApp->IsConnectedKad() && theApp->GetKadConnectedSince().IsValid()) {
+		AddTag(CECTag(EC_TAG_KAD_CONNECTED_SINCE, (uint32)theApp->GetKadConnectedSince().GetTicks()));
+	}
 }
 
 CEC_PartFile_Tag::CEC_PartFile_Tag(const CPartFile *file, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap)
-:
-CEC_SharedFile_Tag(file, detail_level, valuemap, EC_TAG_PARTFILE)
+: CEC_SharedFile_Tag(file, detail_level, valuemap, EC_TAG_PARTFILE)
 {
 	AddTag(EC_TAG_PARTFILE_STATUS, file->GetStatus(), valuemap);
 	AddTag(EC_TAG_PARTFILE_STOPPED, file->IsStopped(), valuemap);
@@ -167,15 +212,16 @@
 	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) || valuemap) {
+	if ((file->GetTransferingSrcCount() > 0) || (detail_level != EC_DETAIL_UPDATE) || valuemap) {
 
 		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(EC_TAG_PARTFILE_SPEED, (uint64_t)(file->GetKBpsDown() * 1024), valuemap);
 	}
 
-	AddTag(EC_TAG_PARTFILE_PRIO, (file->IsAutoDownPriority() ?
-		file->GetDownPriority() + 10 : file->GetDownPriority()), valuemap);
+	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);
@@ -189,19 +235,8 @@
 	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);
+	// Community ratings/comments + the Kad-notes running flag are serialized by
+	// the CEC_SharedFile_Tag base constructor (shared with plain shared files).
 
 	if (detail_level == EC_DETAIL_UPDATE) {
 		return;
@@ -211,15 +246,66 @@
 
 	// A4AF sources
 	CECEmptyTag a4afTag(EC_TAG_PARTFILE_A4AF_SOURCES);
-	const CKnownFile::SourceSet& a4afSources = file->GetA4AFList();
+	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, EC_DETAIL_LEVEL detail_level,
-									   CValueMap *valuemap, ec_tagname_t name)
+namespace
+{
+
+// Emit the FT_MEDIA_* tags a file actually carries, one by one.
+//
+// NOT gated on GetMetaDataVer(): that predicate answers "has this file been probed", and using it
+// to mean "all six fields are present" sends MEDIA_LENGTH=0 and MEDIA_BITRATE=0 for a file that
+// probed to a codec and no duration -- a raw elementary stream, a truncated capture -- which
+// renders as Length 0:00 / Bitrate 0 kbps where the honest answer is N/A. A displayed zero is a
+// claim; absence is not.
+//
+// Shared by the shared-file and search-result tag builders, which had diverged.
+void AddMediaTagsPresent(CECTag &target, const CAbstractFile *file, CValueMap *valuemap)
+{
+	// Present -> send the value. Absent but sent before -> send an explicit zero or empty so
+	// the remote drops it. Absent and never sent -> send nothing, so a field that never had a
+	// value is reported as absent rather than as a zero.
+	//
+	// The middle case is not optional: a tag that is not offered reads as UNCHANGED to a
+	// CValueMap peer, and both receivers are add-only, so omitting a CLEARED field leaves the
+	// stale value in place -- including one inherited from a search result, which is what the
+	// completion re-probe exists to correct.
+	const auto emitInt = &(ec_tagname_t ecId, uint32 value) {
+		if (value) {
+			target.AddTag(CECTag(ecId, value), valuemap);
+		} else if (valuemap && valuemap->HasTag(ecId)) {
+			target.AddTag(CECTag(ecId, static_cast<uint32>(0)), valuemap);
+		}
+	};
+	emitInt(EC_TAG_KNOWNFILE_MEDIA_LENGTH, file->GetIntTagValue(FT_MEDIA_LENGTH));
+	emitInt(EC_TAG_KNOWNFILE_MEDIA_BITRATE, file->GetIntTagValue(FT_MEDIA_BITRATE));
+	static const struct
+	{
+		uint8 ftId;
+		ec_tagname_t ecId;
+	} kStrTags = { { FT_MEDIA_CODEC, EC_TAG_KNOWNFILE_MEDIA_CODEC },
+		{ FT_MEDIA_ARTIST, EC_TAG_KNOWNFILE_MEDIA_ARTIST },
+		{ FT_MEDIA_ALBUM, EC_TAG_KNOWNFILE_MEDIA_ALBUM },
+		{ FT_MEDIA_TITLE, EC_TAG_KNOWNFILE_MEDIA_TITLE } };
+	for (const auto &entry : kStrTags) {
+		const wxString &value = file->GetStrTagValue(entry.ftId);
+		if (!value.IsEmpty()) {
+			target.AddTag(CECTag(entry.ecId, value), valuemap);
+		} else if (valuemap && valuemap->HasTag(entry.ecId)) {
+			target.AddTag(CECTag(entry.ecId, wxString()), valuemap);
+		}
+	}
+}
+
+} // namespace
+
+CEC_SharedFile_Tag::CEC_SharedFile_Tag(
+	const CKnownFile *file, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap, ec_tagname_t name)
 : CECTag(name, file->ECID())
 {
 	AddTag(EC_TAG_KNOWNFILE_REQ_COUNT, file->statistic.GetRequests(), valuemap);
@@ -233,137 +319,269 @@
 	AddTag(EC_TAG_KNOWNFILE_AICH_MASTERHASH, file->GetAICHMasterHash(), valuemap);
 
 	AddTag(EC_TAG_KNOWNFILE_PRIO,
-		(uint8)(file->IsAutoUpPriority() ? file->GetUpPriority() + 10 : file->GetUpPriority()), valuemap);
+		(uint8)(file->IsAutoUpPriority() ? file->GetUpPriority() + 10 : file->GetUpPriority()),
+		valuemap);
 
 	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);
 
+	if (name == EC_TAG_KNOWNFILE) {
+		AddTag(EC_TAG_KNOWNFILE_HASHED_PART_COUNT, file->GetHashingProgress(), valuemap);
+	}
 	AddTag(EC_TAG_KNOWNFILE_ON_QUEUE, file->GetQueuedCount(), valuemap);
 
+	// Live upload activity (issue #466), emitted before the UPDATE early-return so they refresh
+	// every tick like the download-side counts. Computed from m_ClientUploadList (core-only);
+	// amulegui receives them over EC.
+#ifndef CLIENT_GUI
+	AddTag(EC_TAG_KNOWNFILE_UPLOAD_SPEED, file->GetUploadDatarate(), valuemap);
+	AddTag(EC_TAG_KNOWNFILE_UPLOADING_COUNT, file->GetTransferringClientCount(), valuemap);
+#endif
+	AddTag(EC_TAG_KNOWNFILE_LAST_UPLOAD, (uint32)file->GetLastUpload(), valuemap);
+
+	// Community ratings/comments plus the on-demand Kad-notes running flag, shared by downloads
+	// and shared files via the virtual GetRatingAndComments. Emitted before the UPDATE early-
+	// return so the flag's start -> finish and notes streaming in are visible on every poll;
+	// the valuemap suppresses unchanged values, so idle files cost nothing after the first
+	// send.
+	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);
+	AddTag(EC_TAG_PARTFILE_KAD_COMMENT_SEARCHING, file->IsKadCommentSearchRunning(), valuemap);
+
 	if (detail_level == EC_DETAIL_UPDATE) {
-			return;
+		return;
 	}
 
-	AddTag(EC_TAG_PARTFILE_NAME,file->GetFileName().GetPrintable(), valuemap);
+	AddTag(EC_TAG_PARTFILE_NAME, file->GetFileName().GetPrintable(), valuemap);
 	AddTag(EC_TAG_PARTFILE_HASH, file->GetFileHash(), valuemap);
 	// Partfile branch used to go through CFormat + CPath::RemoveExt every
 	// call; the basename is now cached on CPartFile (lifetime-stable).
 	AddTag(EC_TAG_KNOWNFILE_FILENAME,
-		file->IsPartFile()	? static_cast<const CPartFile*>(file)->GetCachedPartMetBasename()
-							: file->GetFilePath().GetPrintable(),
+		file->IsPartFile() ? static_cast<const CPartFile *>(file)->GetCachedPartMetBasename()
+				   : file->GetFilePath().GetPrintable(),
 		valuemap);
+	// The on-disk directory, always -- the Temp dir for a partfile, the destination dir once
+	// completed. Unlike _FILENAME, which doubles as the ".part" basename, this never changes
+	// meaning across the completed transition, so the REST API can expose an unambiguous `path`
+	// (issue #417).
+	AddTag(EC_TAG_KNOWNFILE_PATH, file->GetFilePath().GetPrintable(), valuemap);
+
+	// When the file was completed / first shared (issue #466). Static once
+	// set, so it rides in the full-detail section rather than every tick.
+	AddTag(EC_TAG_KNOWNFILE_SHARED_SINCE, (uint32)file->GetDateShared(), valuemap);
 
 	AddTag(EC_TAG_PARTFILE_SIZE_FULL, file->GetFileSize(), valuemap);
 
-	// Cached path: ed2k:// link construction is the single hottest item on
-	// the EC dispatch chain for big shared-file libraries (#713 profile).
-	// The cache holds the rare-changing base form; the dynamic source
-	// suffix is appended live.
+	// Cached: ed2k:// link construction is the single hottest item on the EC dispatch chain for
+	// big shared-file libraries (#713). The cache holds the rare-changing base form; the
+	// dynamic source suffix is appended live.
 	AddTag(EC_TAG_PARTFILE_ED2K_LINK,
-			file->GetED2kLinkForEC(theApp->IsConnectedED2K() && !theApp->serverconnect->IsLowID()), valuemap);
+		file->GetED2kLinkForEC(theApp->IsConnectedED2K() && !theApp->serverconnect->IsLowID()),
+		valuemap);
 
 	AddTag(EC_TAG_KNOWNFILE_COMMENT, file->GetFileComment(), valuemap);
 	AddTag(EC_TAG_KNOWNFILE_RATING, file->GetFileRating(), valuemap);
+
+	// Audio/video media metadata (issue #418), emitted per FIELD -- see AddMediaTagsPresent for
+	// why the aggregate GetMetaDataVer() gate was wrong. From this shared base ctor, so /shared
+	// and /downloads both carry it.
+	AddMediaTagsPresent(*this, file, valuemap);
 }
 
-CEC_UpDownClient_Tag::CEC_UpDownClient_Tag(const CUpDownClient* client, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap) :
-	CECTag(EC_TAG_CLIENT, client->ECID())
+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()), 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);
+	AddDiffTag(this, EC_TAG_CLIENT_NAME, client->GetUserName(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_HASH, client->GetUserHash(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_USER_ID, client->GetUserIDHybrid(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_SCORE, client->GetScore(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_SOFTWARE, client->GetClientSoft(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_SOFT_VER_STR, client->GetSoftVerStr(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_USER_IP, client->GetIP(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_USER_PORT, client->GetUserPort(), valuemap);
+#ifdef ENABLE_IP2COUNTRY
+	// Peer country ISO code resolved core-side (#439). Emitted whenever GeoIP is enabled and
+	// supported, even empty for an IP that does not resolve, so a frontend can read tag-present
+	// as authoritative and tag-absent as "no daemon GeoIP".
+	if (theApp->GetIP2Country() && theApp->GetIP2Country()->IsEnabled()) {
+		// Numeric-IP overload: memoised, and it skips formatting the IP into a string on
+		// the hit path. This runs for every peer on every EC poll, and a peer's country
+		// cannot change while its IP does not. Returns a const reference, which AddDiffTag
+		// takes without a copy.
+		AddDiffTag(this,
+			EC_TAG_CLIENT_COUNTRY,
+			theApp->GetIP2Country()->GetCountryCode(client->GetFullIPNumeric()),
+			valuemap);
+	}
+#endif
+	AddDiffTag(this, EC_TAG_CLIENT_FROM, (uint64)client->GetSourceFrom(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_SERVER_IP, client->GetServerIP(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_SERVER_PORT, client->GetServerPort(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_SERVER_NAME, client->GetServerName(), valuemap);
 
 	// Transfers to Client
-	AddTag(CECTag(EC_TAG_CLIENT_UP_SPEED, client->GetUploadDatarate()), valuemap);
+	AddDiffTag(this, 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);
+		AddDiffTag(this, EC_TAG_CLIENT_DOWN_SPEED, (double)(client->GetKBpsDown()), valuemap);
 	}
-	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_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);
+	AddDiffTag(this, EC_TAG_CLIENT_UPLOAD_SESSION, client->GetSessionUp(), valuemap);
+	AddDiffTag(this, EC_TAG_PARTFILE_SIZE_XFER, client->GetTransferredDown(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_UPLOAD_TOTAL, client->GetUploadedTotal(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_DOWNLOAD_TOTAL, client->GetDownloadedTotal(), valuemap);
+
+	AddDiffTag(this, EC_TAG_CLIENT_UPLOAD_STATE, client->GetUploadState(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_DOWNLOAD_STATE, client->GetDownloadState(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_IDENT_STATE, (uint64)client->GetCurrentIdentState(), valuemap);
+	// Whether a socket to this peer is actually up, as opposed to a client object merely
+	// existing for it. A consumer inferring "online" from the ECID alone called a peer online
+	// from the moment we started TRYING to reach it.
+	AddDiffTag(this, EC_TAG_CLIENT_CONNECTED, client->IsConnected(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_EXT_PROTOCOL, client->ExtProtocolAvailable(), valuemap);
+	// Not needed at the moment; kept in case the columns return to the client view.
+	// EC_TAG_CLIENT_WAIT_TIME, _XFER_TIME, _QUEUE_TIME and _LAST_TIME.
+	AddDiffTag(this, EC_TAG_CLIENT_WAITING_POSITION, client->GetUploadQueueWaitingPosition(), valuemap);
+	AddDiffTag(this,
+		EC_TAG_CLIENT_REMOTE_QUEUE_RANK,
+		client->IsRemoteQueueFull() ? (uint16)0xffff : client->GetRemoteQueueRank(),
+		valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_OLD_REMOTE_QUEUE_RANK, client->GetOldRemoteQueueRank(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_OBFUSCATION_STATUS, client->GetObfuscationStatus(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_KAD_PORT, client->GetKadPort(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_FRIEND_SLOT, client->GetFriendSlot(), valuemap);
+	// Already masked to the five defined bits by CPeerCapabilities, so the
+	// remote GUI never has to know which bits are reserved.
+	AddDiffTag(this, EC_TAG_CLIENT_MOD_CAPABILITIES, client->GetModCapabilities().KnownBits(), valuemap);
 
 	if (detail_level == EC_DETAIL_UPDATE) {
 		return;
 	}
-	const CKnownFile* file = client->GetUploadFile();
+	const CKnownFile *file = client->GetUploadFile();
 	if (file) {
-		AddTag(CECTag(EC_TAG_PARTFILE_NAME, file->GetFileName().GetPrintable()), valuemap);
+		AddDiffTag(this, 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);
+	const CPartFile *pfile = client->GetRequestFile();
+	AddDiffTag(this, EC_TAG_CLIENT_REQUEST_FILE, pfile ? pfile->ECID() : 0, valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_REMOTE_FILENAME, client->GetClientFilename(), valuemap);
 
 	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);
+	// Friend status + DL/UP modifier (issue #423). IsFriend() is the friends-list membership,
+	// distinct from the FRIEND_SLOT reserved upload slot above; GetCreditRatio() is the GUI
+	// "DL/UP modifier" -- the ungated value, the same one the credit store sends for a peer
+	// that is not connected, so a row reads the same online and offline.
+	AddDiffTag(this, EC_TAG_CLIENT_IS_FRIEND, client->IsFriend(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_SCORE_RATIO, (double)client->GetCreditRatio(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_DISABLE_VIEW_SHARED, client->HasDisabledSharedFiles(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_VERSION, client->GetVersion(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_MOD_VERSION, client->GetClientModString(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_OS_INFO, client->GetClientOSInfo(), valuemap);
+	AddDiffTag(this, EC_TAG_CLIENT_AVAILABLE_PARTS, client->GetAvailablePartCount(), valuemap);
 	if (pfile) {
-		const BitVector & partStatus = client->GetPartStatus();
+		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_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);
+		AddDiffTag(this, EC_TAG_CLIENT_NEXT_REQUESTED_PART, client->GetNextRequestedPart(), valuemap);
+		AddTag(CECTag(EC_TAG_CLIENT_LAST_DOWNLOADING_PART, client->GetLastDownloadingPart()),
+			valuemap);
 	}
 	if (file) {
-		const BitVector & upPartStatus = client->GetUpPartStatus();
+		const BitVector &upPartStatus = client->GetUpPartStatus();
 		if (upPartStatus.size() == file->GetPartCount()) {
-			AddTag(CECTag(EC_TAG_CLIENT_UPLOAD_PART_STATUS, upPartStatus.SizeBuffer(), upPartStatus.GetBuffer()), valuemap);
+			AddTag(CECTag(EC_TAG_CLIENT_UPLOAD_PART_STATUS,
+				       upPartStatus.SizeBuffer(),
+				       upPartStatus.GetBuffer()),
+				valuemap);
 		}
 	}
 }
 
-//
 // Search reply
-//
-CEC_SearchFile_Tag::CEC_SearchFile_Tag(const CSearchFile *file, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap) : CECTag(EC_TAG_SEARCHFILE, file->ECID())
+CEC_SearchFile_Tag::CEC_SearchFile_Tag(
+	const CSearchFile *file, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap, uint32 searchID)
+: CECTag(EC_TAG_SEARCHFILE, file->ECID())
 {
+	// Multi-search union poll (amulegui): the owning search's ID, so the client routes this
+	// result to the right tab. Emitted unconditionally (no valuemap, before the UPDATE early-
+	// return) so a result object recreated on any poll can always be attributed. 0 means
+	// omitted.
+	if (searchID) {
+		AddTag(CECTag(EC_TAG_SEARCH_ID, searchID));
+	}
 	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);
 
+	// On-demand Kad community ratings/comments for this result, reusing the partfile tags.
+	// Emitted before the UPDATE early-return so the flag's start -> finish and the notes
+	// streaming in are visible on every poll.
+	//
+	// Deliberately WITHOUT the valuemap: unlike a download, a search result has no EC change-
+	// generation, and Get_EC_Response_Search_Results never resets the per-connection valuemap
+	// when amulegui recreates the result object. Diffing would send the comments container once
+	// per ECID for the connection's lifetime, so a result created before the notes arrived --
+	// the common case -- would be deduped out and the dialog would stay empty. The block is
+	// gated on the built list, so idle results cost nothing.
+	FileRatingList list;
+	file->GetRatingAndComments(list);
+	// Always emitted, and through the valuemap -- the same shape the download side uses for
+	// this tag.
+	//
+	// It used to be emitted only while the lookup was running or had notes, so "finished, found
+	// nothing" was signalled by the tag going away. That cannot survive the incremental union:
+	// a result whose only change is a tag no longer being built produces a childless tag, which
+	// the union drops as unchanged, so the transition was invisible to every incremental
+	// client. Through the valuemap the 1 -> 0 transition is itself a child tag, and a steady
+	// state still costs nothing.
+	AddTag(EC_TAG_PARTFILE_KAD_COMMENT_SEARCHING,
+		(uint64)(file->IsKadCommentSearchRunning() ? 1 : 0),
+		valuemap);
+	// The container itself stays gated on there being notes, and stays off the valuemap: an
+	// empty one must never be sent, because a client reads its absence as "no notes" rather
+	// than as "unchanged".
+	//
+	// One consequence, since it looks like a bug from the other end: a result that HAS notes is
+	// never elided by the multi-search union, because off-valuemap this child is re-emitted on
+	// every poll. That is the correct trade -- the alternative silently drops notes -- and few
+	// results carry any.
+	if (!list.empty()) {
+		CECEmptyTag sc(EC_TAG_PARTFILE_COMMENTS);
+		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);
+	}
+
 	if (detail_level == EC_DETAIL_UPDATE) {
-			return;
+		return;
 	}
 
 	AddTag(CECTag(EC_TAG_PARTFILE_NAME, file->GetFileName().GetPrintable()), valuemap);
@@ -372,22 +590,45 @@
 	if (file->GetParent()) {
 		AddTag(EC_TAG_SEARCH_PARENT, file->GetParent()->ECID(), valuemap);
 	}
+	// Browse ("View Files") source info: the peer this listing came from and the shared folder
+	// the file lives in. Set only on results filed from a peer's shared-file list, so ordinary
+	// server/Kad hits emit nothing here.
+	if (file->GetClientID()) {
+		AddTag(CECTag(EC_TAG_SEARCHFILE_CLIENT_ID, file->GetClientID()), valuemap);
+		AddTag(CECTag(EC_TAG_SEARCHFILE_CLIENT_PORT, file->GetClientPort()), valuemap);
+	}
+	if (!file->GetDirectory().IsEmpty()) {
+		AddTag(CECTag(EC_TAG_SEARCHFILE_DIRECTORY, file->GetDirectory()), valuemap);
+	}
 	if (file->HasRating()) {
 		AddTag(CECTag(EC_TAG_KNOWNFILE_RATING, (uint8)file->UserRating()), valuemap);
 	}
+	// Media metadata (issue #430). A hit carries FT_MEDIA_* tags only when the file is known or
+	// probed locally, so each EC_TAG_KNOWNFILE_MEDIA_* is emitted only when its value is
+	// present and results without media cost nothing.
+	AddMediaTagsPresent(*this, file, valuemap);
 }
 
-//
 // Friend
-//
-CEC_Friend_Tag::CEC_Friend_Tag(const CFriend* Friend, CValueMap* valuemap) : CECTag(EC_TAG_FRIEND, Friend->ECID())
+CEC_Friend_Tag::CEC_Friend_Tag(const CFriend *Friend, CValueMap *valuemap)
+: CECTag(EC_TAG_FRIEND, Friend->ECID())
 {
-	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_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);
+	// Echoed from the linked client so a consumer does not have to join against the client list
+	// -- and could not join reliably anyway, since a friend's client need not be in the list
+	// the consumer holds.
+	AddTag(EC_TAG_CLIENT_CONNECTED,
+		linkedClient.IsLinked() && linkedClient.GetClient()->IsConnected(),
+		valuemap);
+	// The slot is settable over EC but was never reported back, so every EC client read it as
+	// false and amulegui's "Establish Friend Slot" check mark could not follow the state it had
+	// just set. Same tag id in both directions.
+	AddTag(EC_TAG_FRIEND_FRIENDSLOT, Friend->HasFriendSlot(), valuemap);
 }
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ECSpecialMuleTags.cpp -> amule-3.1.0.tar.gz/src/ECSpecialMuleTags.cpp Changed

@@ -23,35 +23,37 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include <ec/cpp/ECTag.h>         // Needed for CECTag
+#include <ec/cpp/ECSpecialTags.h> // Needed for special EC tag creator classes
 
-
-#include <ec/cpp/ECTag.h>		// Needed for CECTag
-#include <ec/cpp/ECSpecialTags.h>	// Needed for special EC tag creator classes
-
+#include "config.h" // Needed for ENABLE_VERSION_CHECK
 #include "Preferences.h"
 #include "amule.h"
-#include "SharedFileList.h"		// for EnableDirectoryWatcher on the apply path
+#include "IP2Country.h"     // For CIP2Country status (#440 remote GeoIP config)
+#include "SharedFileList.h" // for EnableDirectoryWatcher on the apply path
 
-CEC_Category_Tag::CEC_Category_Tag(uint32 cat_index, EC_DETAIL_LEVEL detail_level) : CECTag(EC_TAG_CATEGORY, cat_index)
+CEC_Category_Tag::CEC_Category_Tag(uint32 cat_index, EC_DETAIL_LEVEL detail_level)
+: CECTag(EC_TAG_CATEGORY, cat_index)
 {
 	Category_Struct *cat = theApp->glob_prefs->GetCategory(cat_index);
 	switch (detail_level) {
-		case EC_DETAIL_UPDATE:
-		case EC_DETAIL_INC_UPDATE:
-		case EC_DETAIL_WEB:
-		case EC_DETAIL_FULL:
-			AddTag(CECTag(EC_TAG_CATEGORY_PATH, cat->path.GetRaw()));
-			AddTag(CECTag(EC_TAG_CATEGORY_COMMENT, cat->comment));
-			AddTag(CECTag(EC_TAG_CATEGORY_COLOR, (uint32)cat->color));
-			AddTag(CECTag(EC_TAG_CATEGORY_PRIO, cat->prio));
-		/* fall through */
-		case EC_DETAIL_CMD:
-			AddTag(CECTag(EC_TAG_CATEGORY_TITLE, cat->title));
-		}
+	case EC_DETAIL_UPDATE:
+	case EC_DETAIL_INC_UPDATE:
+	case EC_DETAIL_WEB:
+	case EC_DETAIL_FULL:
+		AddTag(CECTag(EC_TAG_CATEGORY_PATH, cat->path.GetRaw()));
+		AddTag(CECTag(EC_TAG_CATEGORY_COMMENT, cat->comment));
+		AddTag(CECTag(EC_TAG_CATEGORY_COLOR, (uint32)cat->color));
+		AddTag(CECTag(EC_TAG_CATEGORY_PRIO, cat->prio));
+	/* fall through */
+	case EC_DETAIL_CMD:
+		AddTag(CECTag(EC_TAG_CATEGORY_TITLE, cat->title));
+	}
 }
 
-CEC_Category_Tag::CEC_Category_Tag(uint32 cat_index, wxString name, wxString path,
-			wxString comment, uint32 color, uint8 prio) : CECTag(EC_TAG_CATEGORY, cat_index)
+CEC_Category_Tag::CEC_Category_Tag(
+	uint32 cat_index, wxString name, wxString path, wxString comment, uint32 color, uint8 prio)
+: CECTag(EC_TAG_CATEGORY, cat_index)
 {
 	AddTag(CECTag(EC_TAG_CATEGORY_PATH, path));
 	AddTag(CECTag(EC_TAG_CATEGORY_COMMENT, comment));
@@ -62,25 +64,43 @@
 
 bool CEC_Category_Tag::Apply()
 {
-	bool ret = theApp->glob_prefs->UpdateCategory(GetInt(), Name(), CPath(Path()), Comment(), Color(), Prio());
+	// The index arrives from an EC client and the protocol does not constrain it: the tag
+	// admits any uint8 while only GetCatCount() categories exist. Refused here rather than only
+	// inside UpdateCategory, because BOTH calls below index with it -- the failure branch reads
+	// GetCatPath(), guarded by a wxASSERT that vanishes in a release build. Unchecked,
+	// UpdateCategory indexed m_CatList out of range and took the daemon down with SIGABRT
+	// (#1227).
+	if (GetInt() >= theApp->glob_prefs->GetCatCount()) {
+		// The EC_OP_UPDATE_CATEGORY handler turns false into EC_OP_FAILED carrying the
+		// category and the client's own path, which is the rejection this case wants -- no
+		// new protocol surface needed.
+		return false;
+	}
+	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());
+		GetTagByName(EC_TAG_CATEGORY_PATH)
+			->SetStringData(theApp->glob_prefs->GetCatPath(GetInt()).GetRaw());
 	}
 	return ret;
 }
 
 bool CEC_Category_Tag::Create()
 {
-	Category_Struct * category = NULL;
-	bool ret = theApp->glob_prefs->CreateCategory(category, 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());
+		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)
+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)
 {
 	if (selection & EC_PREFS_CATEGORIES) {
 		if (theApp->glob_prefs->GetCatCount() > 1) {
@@ -99,6 +119,26 @@
 		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()));
+		// Capability signal: whether this build can perform version checks. Emitted as a
+		// bool by every 3.1+ daemon, so a client can tell "compiled out" (false) from an
+		// old daemon predating the tag (absent). Distinct from the CHECK_NEW_VERSION
+		// PREFERENCE above: update checking is active only when available AND the pref is
+		// set.
+#ifdef ENABLE_VERSION_CHECK
+		const bool versionCheckAvailable = true;
+#else
+		const bool versionCheckAvailable = false;
+#endif
+		user_prefs.AddTag(CECTag(EC_TAG_GENERAL_VERSION_CHECK_AVAILABLE, versionCheckAvailable));
+		// Capability signal: whether this build can do UPnP port forwarding (ENABLE_UPNP).
+		// The remote GUI greys the P2P-UPnP controls when the core cannot forward, instead
+		// of offering a dead toggle.
+#ifdef ENABLE_UPNP
+		const bool upnpAvailable = true;
+#else
+		const bool upnpAvailable = false;
+#endif
+		user_prefs.AddTag(CECTag(EC_TAG_GENERAL_UPNP_AVAILABLE, upnpAvailable));
 		AddTag(user_prefs);
 	}
 
@@ -128,6 +168,25 @@
 		if (thePrefs::GetNetworkKademlia()) {
 			connPrefs.AddTag(CECEmptyTag(EC_TAG_NETWORK_KADEMLIA));
 		}
+		connPrefs.AddTag(CECTag(EC_TAG_CONN_BIND_ADDRESS, thePrefs::GetAddress()));
+		connPrefs.AddTag(CECTag(EC_TAG_CONN_BIND_INTERFACE, thePrefs::GetNetworkInterface()));
+		// Proxy: the daemon routes P2P and its HTTP fetches through this, and the remote
+		// GUI must be able to read and set it. The password rides plainly (it is a
+		// plaintext credential, not a hash) so amulegui can show it; the amuleapi surface
+		// keeps it write-only.
+		const CProxyData *proxy = thePrefs::GetProxyData();
+		connPrefs.AddTag(CECTag(EC_TAG_PROXY_ENABLE, proxy->m_proxyEnable));
+		connPrefs.AddTag(CECTag(EC_TAG_PROXY_TYPE, static_cast<uint32>(proxy->m_proxyType)));
+		connPrefs.AddTag(CECTag(EC_TAG_PROXY_HOST, proxy->m_proxyHostName));
+		connPrefs.AddTag(CECTag(EC_TAG_PROXY_PORT, static_cast<uint16>(proxy->m_proxyPort)));
+		connPrefs.AddTag(CECTag(EC_TAG_PROXY_AUTH, proxy->m_enablePassword));
+		connPrefs.AddTag(CECTag(EC_TAG_PROXY_USER, proxy->m_userName));
+		connPrefs.AddTag(CECTag(EC_TAG_PROXY_PASSWORD, proxy->m_password));
+		// UPnP: the enable toggle forwards the P2P ports above, while UPnPTCPPort is the
+		// control point's own local port, not a forwarded one. Web-server and EC-port UPnP
+		// are deliberately not carried.
+		connPrefs.AddTag(CECTag(EC_TAG_CONN_UPNP_ENABLED, thePrefs::GetUPnPEnabled()));
+		connPrefs.AddTag(CECTag(EC_TAG_CONN_UPNP_TCP_PORT, thePrefs::GetUPnPTCPPort()));
 		AddTag(connPrefs);
 	}
 
@@ -149,6 +208,14 @@
 			msg_prefs.AddTag(CECEmptyTag(EC_TAG_MSGFILTER_BY_KEYWORD));
 		}
 		msg_prefs.AddTag(CECTag(EC_TAG_MSGFILTER_KEYWORDS, thePrefs::GetMessageFilterString()));
+		if (thePrefs::ShowMessagesInLog()) {
+			msg_prefs.AddTag(CECEmptyTag(EC_TAG_MSGFILTER_SHOW_IN_LOG));
+		}
+		if (thePrefs::FilterComments()) {
+			msg_prefs.AddTag(CECEmptyTag(EC_TAG_MSGFILTER_FILTER_COMMENTS));
+		}
+		msg_prefs.AddTag(
+			CECTag(EC_TAG_MSGFILTER_COMMENT_KEYWORDS, thePrefs::GetCommentFilterString()));
 		AddTag(msg_prefs);
 	}
 
@@ -177,6 +244,46 @@
 		}
 		rc_prefs.AddTag(CECTag(EC_TAG_WEBSERVER_REFRESH, thePrefs::GetWebPageRefresh()));
 		rc_prefs.AddTag(CECTag(EC_TAG_WEBSERVER_TEMPLATE, thePrefs::GetWebTemplate()));
+		rc_prefs.AddTag(CECTag(EC_TAG_AMULEAPI_PORT, thePrefs::GetAmuleApiPort()));
+		if (thePrefs::GetAmuleApiIsEnabled()) {
+			rc_prefs.AddTag(CECEmptyTag(EC_TAG_AMULEAPI_AUTORUN));
+		}
+		rc_prefs.AddTag(CECTag(EC_TAG_AMULEAPI_BIND, thePrefs::GetAmuleApiBindAddress()));
+
+		// amuleapi's credentials are stored salted and stretched in amuleapi-passwords, so unlike
+		// the webserver's there is no digest to put on the wire. Both tags therefore carry a REQUEST
+		// from a client and a STATE from the daemon:
+		//
+		//   admin absent          leave the stored password alone
+		//   admin present, empty  a password is set (daemon -> client)
+		//   admin present + hash  set the admin password to this
+		//
+		//   guest absent          guest access off; clear the credential
+		//   guest present, empty  guest access on, password unchanged
+		//   guest present + hash  guest access on with this password
+		//
+		// Guest has the same container-plus-optional-child shape as EC_TAG_WEBSERVER_GUEST, so
+		// absence can mean "off". Admin has no off state on purpose: clearing it from a stray prefs
+		// push would leave a non-loopback deployment with no way back in.
+		if (!thePrefs::GetAmuleApiPass().IsEmpty()) {
+			CECEmptyTag adminTag(EC_TAG_AMULEAPI_PASSWD);
+			CMD4Hash passhash;
+			wxCHECK2(passhash.Decode(thePrefs::GetAmuleApiPass()), /* Do nothing. */);
+			adminTag.AddTag(CECTag(EC_TAG_PASSWD_HASH, passhash));
+			rc_prefs.AddTag(adminTag);
+		} else if (thePrefs::GetAmuleApiAdminIsSet()) {
+			rc_prefs.AddTag(CECEmptyTag(EC_TAG_AMULEAPI_PASSWD));
+		}
+		if (thePrefs::GetAmuleApiGuestIsEnabled()) {
+			CECEmptyTag guestTag(EC_TAG_AMULEAPI_GUEST_PASSWD);
+			if (!thePrefs::GetAmuleApiGuestPass().IsEmpty()) {
+				CMD4Hash passhash;
+				wxCHECK2(
+					passhash.Decode(thePrefs::GetAmuleApiGuestPass()), /* Do nothing. */);
+				guestTag.AddTag(CECTag(EC_TAG_PASSWD_HASH, passhash));
+			}
+			rc_prefs.AddTag(guestTag);
+		}
 		AddTag(rc_prefs);
 	}
 
@@ -185,6 +292,8 @@
 		if (thePrefs::IsOnlineSignatureEnabled()) {
 			online_sig.AddTag(CECEmptyTag(EC_TAG_ONLINESIG_ENABLED));
 		}
+		online_sig.AddTag(CECTag(EC_TAG_ONLINESIG_DIRECTORY, thePrefs::GetOSDir().GetRaw()));
+		online_sig.AddTag(CECTag(EC_TAG_ONLINESIG_UPDATE, thePrefs::GetOSUpdate()));
 		AddTag(online_sig);
 	}
 
@@ -193,7 +302,8 @@
 		if (thePrefs::DeadServer()) {
 			srv_prefs.AddTag(CECEmptyTag(EC_TAG_SERVERS_REMOVE_DEAD));
 		}
-		srv_prefs.AddTag(CECTag(EC_TAG_SERVERS_DEAD_SERVER_RETRIES, (uint16)thePrefs::GetDeadserverRetries()));
+		srv_prefs.AddTag(
+			CECTag(EC_TAG_SERVERS_DEAD_SERVER_RETRIES, (uint16)thePrefs::GetDeadserverRetries()));
 		if (thePrefs::AutoServerlist()) {
 			srv_prefs.AddTag(CECEmptyTag(EC_TAG_SERVERS_AUTO_UPDATE));
 		}
@@ -240,6 +350,9 @@
 		if (thePrefs::GetPreviewPrio()) {
 			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_PREVIEW_PRIO));
 		}
+		if (thePrefs::GetEndgame()) {
+			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_ENDGAME));
+		}
 		if (thePrefs::GetNewAutoUp()) {
 			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_NEW_AUTO_UL_PRIO));
 		}
@@ -252,12 +365,19 @@
 		if (thePrefs::GetSrcSeedsOn()) {
 			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_SAVE_SOURCES));
 		}
-		if (thePrefs::GetExtractMetaData()) {
-			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_EXTRACT_METADATA));
-		}
 		if (thePrefs::GetAllocFullFile()) {
 			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_ALLOC_FULL_SIZE));
 		}
+		// mmap capability negotiation: advertise support (tag presence) plus the current
+		// value. Gated on the RUNTIME capability rather than #ifdef MMAP_SUPPORTED, so a
+		// remote GUI on a platform without mmap can still relay the value to a daemon that
+		// has it.
+		if (thePrefs::GetMMapSupported()) {
+			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_MMAP_SUPPORTED));
+			if (thePrefs::GetMMapEnabled()) {
+				filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_MMAP_ENABLED));
+			}
+		}
 		if (thePrefs::IsCheckDiskspaceEnabled()) {
 			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_CHECK_FREE_SPACE));
 		}
@@ -265,6 +385,14 @@
 		if (!thePrefs::CreateFilesSparse()) {
 			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_CREATE_NORMAL));
 		}
+		if (thePrefs::GetMediaMetadataEnabled()) {
+			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_MEDIA_METADATA_ENABLED));
+		}
+		filePrefs.AddTag(
+			CECTag(EC_TAG_FILES_MEDIA_FFPROBE_PATH, thePrefs::GetMediaMetadataFFProbePath()));
+		if (thePrefs::StartNextFileAlpha()) {
+			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_START_NEXT_ALPHA));
+		}
 		AddTag(filePrefs);
 	}
 
@@ -278,14 +406,24 @@
 			dirtag.AddTag(CECTag(EC_TAG_STRING, theApp->glob_prefs->shareddir_listi.GetRaw()));
 		}
 		dirPrefs.AddTag(dirtag);
-		dirPrefs.AddTag(CECTag(EC_TAG_DIRECTORIES_SHARE_HIDDEN, thePrefs::ShareHiddenFiles()));
-		dirPrefs.AddTag(CECTag(EC_TAG_DIRECTORIES_AUTO_RESCAN, thePrefs::AutoRescanSharedDirs()));
-		dirPrefs.AddTag(CECTag(EC_TAG_DIRECTORIES_FOLLOW_SYMLINKS, thePrefs::FollowSymlinksInShares()));
+		if (thePrefs::ShareHiddenFiles()) {
+			dirPrefs.AddTag(CECEmptyTag(EC_TAG_DIRECTORIES_SHARE_HIDDEN));
+		}
+		if (thePrefs::AutoRescanSharedDirs()) {
+			dirPrefs.AddTag(CECEmptyTag(EC_TAG_DIRECTORIES_AUTO_RESCAN));
+		}
+		if (thePrefs::FollowSymlinksInShares()) {
+			dirPrefs.AddTag(CECEmptyTag(EC_TAG_DIRECTORIES_FOLLOW_SYMLINKS));
+		}
+		dirPrefs.AddTag(
+			CECTag(EC_TAG_DIRECTORIES_EXCLUDE_PATTERNS, thePrefs::GetExcludeSharePatterns()));
+		dirPrefs.AddTag(
+			CECTag(EC_TAG_DIRECTORIES_EXCLUDE_REGEX, thePrefs::ExcludeSharePatternsUseRegex()));
 		AddTag(dirPrefs);
 	}
 
 	if (selection & EC_PREFS_STATISTICS) {
-		//#warning TODO
+		// #warning TODO
 	}
 
 	if (selection & EC_PREFS_SECURITY) {
@@ -318,6 +456,12 @@
 		if (thePrefs::IsClientCryptLayerRequired()) {
 			secPrefs.AddTag(CECEmptyTag(EC_TAG_SECURITY_OBFUSCATION_REQUIRED));
 		}
+		if (thePrefs::ParanoidFilter()) {
+			secPrefs.AddTag(CECEmptyTag(EC_TAG_IPFILTER_PARANOID));
+		}
+		if (thePrefs::UseIPFilterSystem()) {
+			secPrefs.AddTag(CECEmptyTag(EC_TAG_IPFILTER_SYSTEM));
+		}
 
 		AddTag(secPrefs);
 	}
@@ -330,7 +474,11 @@
 		}
 		cwPrefs.AddTag(CECTag(EC_TAG_CORETW_FILEBUFFER, thePrefs::GetFileBufferSize()));
 		cwPrefs.AddTag(CECTag(EC_TAG_CORETW_UL_QUEUE, thePrefs::GetQueueSize()));
-		cwPrefs.AddTag(CECTag(EC_TAG_CORETW_SRV_KEEPALIVE_TIMEOUT, thePrefs::GetServerKeepAliveTimeout()));
+		cwPrefs.AddTag(
+			CECTag(EC_TAG_CORETW_SRV_KEEPALIVE_TIMEOUT, thePrefs::GetServerKeepAliveTimeout()));
+		cwPrefs.AddTag(CECTag(EC_TAG_CORETW_KAD_MAX_SEARCHES, thePrefs::GetKadMaxSourceSearches()));
+		cwPrefs.AddTag(CECTag(EC_TAG_CORETW_KAD_REASK_MS, thePrefs::GetKadSourceReaskTime()));
+		cwPrefs.AddTag(CECTag(EC_TAG_CORETW_SOURCE_REASK_MS, thePrefs::GetSourceReaskTime()));
 		AddTag(cwPrefs);
 	}
 
@@ -339,17 +487,59 @@
 		kadPrefs.AddTag(CECTag(EC_TAG_KADEMLIA_UPDATE_URL, thePrefs::GetKadNodesUrl()));
 		AddTag(kadPrefs);
 	}
+
+	if (selection & EC_PREFS_IP2COUNTRY) {
+		CECEmptyTag ip2cPrefs(EC_TAG_PREFS_IP2COUNTRY);
+		// SUPPORTED tells a remote GUI whether THIS build has GeoIP compiled in at all;
+		// amulegui gates its whole GeoIP config panel on it. The settings below are plain
+		// prefs and always sent so the panel can populate.
+#ifdef GEOIP_GUI
+		ip2cPrefs.AddTag(CECTag(EC_TAG_IP2COUNTRY_SUPPORTED, true));
+#else
+		ip2cPrefs.AddTag(CECTag(EC_TAG_IP2COUNTRY_SUPPORTED, false));
+#endif
+		ip2cPrefs.AddTag(CECTag(EC_TAG_IP2COUNTRY_ENABLED, thePrefs::IsGeoIPEnabled()));
+		ip2cPrefs.AddTag(CECTag(EC_TAG_IP2COUNTRY_SOURCE, (uint8)thePrefs::GetGeoIPSource()));
+		ip2cPrefs.AddTag(CECTag(EC_TAG_IP2COUNTRY_CUSTOM_URL, thePrefs::GetGeoIPCustomUrl()));
+		ip2cPrefs.AddTag(
+			CECTag(EC_TAG_IP2COUNTRY_MAXMIND_LICENSE, thePrefs::GetGeoIPMaxMindLicense()));
+		ip2cPrefs.AddTag(CECTag(EC_TAG_IP2COUNTRY_AUTO_UPDATE, thePrefs::IsGeoIPAutoUpdate()));
+		// Read-only live status, filled only where a resolver exists, so a remote GUI can
+		// render the status line and disable buttons while a refresh runs. NULL on
+		// amulegui, which only receives these.
+#ifndef CLIENT_GUI
+		// Resolver-owning builds only: amulegui has no CIP2Country instance and does not
+		// link the resolver, so referencing its out-of-line methods here would break its
+		// link. The live status flows the other way there -- it RECEIVES these tags in
+		// Apply().
+		if (CIP2Country *ip2c = theApp->GetIP2Country()) {
+			ip2cPrefs.AddTag(CECTag(EC_TAG_IP2COUNTRY_DB_PATH, ip2c->GetDatabasePath()));
+			ip2cPrefs.AddTag(CECTag(EC_TAG_IP2COUNTRY_DB_LOADED, ip2c->IsEnabled()));
+			ip2cPrefs.AddTag(CECTag(EC_TAG_IP2COUNTRY_DOWNLOADING, ip2c->IsDownloading()));
+			ip2cPrefs.AddTag(CECTag(EC_TAG_IP2COUNTRY_LAST_RESULT, ip2c->GetLastResult()));
+			ip2cPrefs.AddTag(
+				CECTag(EC_TAG_IP2COUNTRY_LOADED_SOURCE, thePrefs::GetGeoIPLoadedSource()));
+		}
+#endif
+		// Transient "Update now" trigger set by amulegui's prefs panel, carried on the
+		// outgoing packet so the daemon's Apply() kicks off a manual refresh. Only ever set
+		// on amulegui, so the daemon's own outbound prefs never emit it.
+		if (thePrefs::IsGeoIPUpdateRequested()) {
+			ip2cPrefs.AddTag(CECTag(EC_TAG_IP2COUNTRY_UPDATE_NOW, true));
+		}
+		AddTag(ip2cPrefs);
+	}
 }
 
 /**
- * Applies a boolean value from the set_preferences request
+ * Applies a boolean value from the set_preferences request.
  *
- * @param use_tag	If true, an unset variable means "leave unchanged". If false, an unset variable means false.
- * @param thisTab	The TAG that contains the TAG with a boolean value
- * @param applyFunc	The function to use for applying the value
- * @param tagName	The name of the TAG that holds the boolean value
+ * @param use_tag If true, an unset variable means "leave unchanged"; if false, it means false.
+ * @param thisTab The TAG containing the TAG with a boolean value.
+ * @param applyFunc The function to apply the value with.
+ * @param tagName The name of the TAG holding the boolean value.
  */
-static void ApplyBoolean(bool use_tag, const CECTag *thisTab, void (applyFunc)(bool), int tagName)
+static void ApplyBoolean(bool use_tag, const CECTag *thisTab, void(applyFunc)(bool), int tagName)
 {
 	const CECTag *boolTag = thisTab->GetTagByName(tagName);
 	if (use_tag) {
@@ -362,9 +552,8 @@
 }
 
 /*
- * This will set all preferences except of categories, which are work as following:
- *  -> On remote gui they are loaded on startup, and then changed on-command
- *  -> Webserver doesn't supposed to change it.
+ * Sets every preference except the categories, which work as follows: the remote GUI loads them
+ * at startup and then changes them on command, and the webserver is not supposed to change them.
  */
 void CEC_Prefs_Packet::Apply() const
 {
@@ -384,11 +573,26 @@
 		if ((oneTag = thisTab->GetTagByName(EC_TAG_GENERAL_CHECK_NEW_VERSION)) != NULL) {
 			thePrefs::SetCheckNewVersion(oneTag->GetInt() != 0);
 		}
+#ifdef CLIENT_GUI
+		// Capability of the connected daemon: 3.1+ daemons always send this bool. A pre-3.1
+		// daemon omits it but still supports the NewVersionCheck preference, so absent
+		// means available (keep the checkbox) and only an explicit false hides it.
+		if (const CECTag *vc = thisTab->GetTagByName(EC_TAG_GENERAL_VERSION_CHECK_AVAILABLE)) {
+			thePrefs::SetVersionCheckAvailable(vc->GetInt() != 0);
+		} else {
+			thePrefs::SetVersionCheckAvailable(true);
+		}
+		// A pre-3.1 daemon omits this tag; treat "absent" as no UPnP so the
+		// controls stay disabled rather than dead (only explicit true enables).
+		if (const CECTag *up = thisTab->GetTagByName(EC_TAG_GENERAL_UPNP_AVAILABLE)) {
+			thePrefs::SetUPnPAvailable(up->GetInt() != 0);
+		} else {
+			thePrefs::SetUPnPAvailable(false);
+		}
+#endif
 	}
 
-	//
-	// webserver doesn't transmit all boolean values
-	//
+	// the webserver does not transmit all boolean values
 	bool use_tag = (GetDetailLevel() == EC_DETAIL_FULL);
 
 	if ((thisTab = GetTagByName(EC_TAG_PREFS_CONNECTIONS)) != NULL) {
@@ -424,6 +628,54 @@
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetReconnect, EC_TAG_CONN_RECONNECT);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetNetworkED2K, EC_TAG_NETWORK_ED2K);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetNetworkKademlia, EC_TAG_NETWORK_KADEMLIA);
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_CONN_BIND_ADDRESS)) != nullptr) {
+			thePrefs::SetAddress(oneTag->GetStringData());
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_CONN_BIND_INTERFACE)) != nullptr) {
+			thePrefs::SetNetworkInterface(oneTag->GetStringData());
+		}
+		// Proxy is a compound value; start from the current config and overwrite only the
+		// fields the packet actually carried, so a partial PATCH leaves the rest -- notably
+		// the write-only password -- untouched.
+		CProxyData proxy = *thePrefs::GetProxyData();
+		bool proxySet = false;
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_PROXY_ENABLE)) != nullptr) {
+			proxy.m_proxyEnable = oneTag->GetInt() != 0;
+			proxySet = true;
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_PROXY_TYPE)) != nullptr) {
+			proxy.m_proxyType = static_cast<CProxyType>(oneTag->GetInt());
+			proxySet = true;
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_PROXY_HOST)) != nullptr) {
+			proxy.m_proxyHostName = oneTag->GetStringData();
+			proxySet = true;
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_PROXY_PORT)) != nullptr) {
+			proxy.m_proxyPort = static_cast<unsigned short>(oneTag->GetInt());
+			proxySet = true;
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_PROXY_AUTH)) != nullptr) {
+			proxy.m_enablePassword = oneTag->GetInt() != 0;
+			proxySet = true;
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_PROXY_USER)) != nullptr) {
+			proxy.m_userName = oneTag->GetStringData();
+			proxySet = true;
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_PROXY_PASSWORD)) != nullptr) {
+			proxy.m_password = oneTag->GetStringData();
+			proxySet = true;
+		}
+		if (proxySet) {
+			thePrefs::SetProxyData(proxy);
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_CONN_UPNP_ENABLED)) != nullptr) {
+			thePrefs::SetUPnPEnabled(oneTag->GetInt() != 0);
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_CONN_UPNP_TCP_PORT)) != nullptr) {
+			thePrefs::SetUPnPTCPPort(static_cast<uint16>(oneTag->GetInt()));
+		}
 	}
 
 	if ((thisTab = GetTagByName(EC_TAG_PREFS_MESSAGEFILTER)) != NULL) {
@@ -435,6 +687,11 @@
 		if ((oneTag = thisTab->GetTagByName(EC_TAG_MSGFILTER_KEYWORDS)) != NULL) {
 			thePrefs::SetMessageFilterString(oneTag->GetStringData());
 		}
+		ApplyBoolean(use_tag, thisTab, thePrefs::SetShowMessagesInLog, EC_TAG_MSGFILTER_SHOW_IN_LOG);
+		ApplyBoolean(use_tag, thisTab, thePrefs::SetFilterComments, EC_TAG_MSGFILTER_FILTER_COMMENTS);
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_MSGFILTER_COMMENT_KEYWORDS)) != nullptr) {
+			thePrefs::SetCommentFilterString(oneTag->GetStringData());
+		}
 	}
 
 	if ((thisTab = GetTagByName(EC_TAG_PREFS_REMOTECTRL)) != NULL) {
@@ -442,13 +699,47 @@
 		if ((oneTag = thisTab->GetTagByName(EC_TAG_WEBSERVER_PORT)) != NULL) {
 			thePrefs::SetWSPort(oneTag->GetInt());
 		}
+		ApplyBoolean(use_tag, thisTab, thePrefs::SetAmuleApiIsEnabled, EC_TAG_AMULEAPI_AUTORUN);
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_AMULEAPI_PORT)) != nullptr) {
+			thePrefs::SetAmuleApiPort(static_cast<uint16>(oneTag->GetInt()));
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_AMULEAPI_BIND)) != nullptr) {
+			thePrefs::SetAmuleApiBindAddress(oneTag->GetStringData());
+		}
+		// See the emit side for the encoding. The pending-password prefs start empty and
+		// are cleared again by AmuleApiCredentials::ApplyPrefs, so "tag present but
+		// carrying no hash" correctly leaves the stored password untouched.
+		//
+		// The guest toggle goes through ApplyBoolean for the same reason
+		// EC_TAG_WEBSERVER_GUEST does: this method serves two callers with opposite
+		// conventions. amulegui sends the whole group at EC_DETAIL_UPDATE, where an absent
+		// tag means "off"; amuleapi's PATCH /preferences sends only the named fields at
+		// EC_DETAIL_FULL, where absent means "leave alone".
+		thePrefs::SetAmuleApiPass(wxEmptyString);
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_AMULEAPI_PASSWD)) != nullptr) {
+			thePrefs::SetAmuleApiAdminIsSet(true);
+			const CECTag *const adminHash = oneTag->GetTagByName(EC_TAG_PASSWD_HASH);
+			if (adminHash != nullptr) {
+				thePrefs::SetAmuleApiPass(adminHash->GetMD4Data().Encode());
+			}
+		}
+		thePrefs::SetAmuleApiGuestPass(wxEmptyString);
+		ApplyBoolean(
+			use_tag, thisTab, thePrefs::SetAmuleApiGuestIsEnabled, EC_TAG_AMULEAPI_GUEST_PASSWD);
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_AMULEAPI_GUEST_PASSWD)) != nullptr) {
+			const CECTag *const guestHash = oneTag->GetTagByName(EC_TAG_PASSWD_HASH);
+			if (guestHash != nullptr) {
+				thePrefs::SetAmuleApiGuestPass(guestHash->GetMD4Data().Encode());
+			}
+		}
 		if ((oneTag = thisTab->GetTagByName(EC_TAG_PASSWD_HASH)) != NULL) {
 			thePrefs::SetWSPass(oneTag->GetMD4Data().Encode());
 		}
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetWSIsLowUserEnabled, EC_TAG_WEBSERVER_GUEST);
 		if ((oneTag = thisTab->GetTagByName(EC_TAG_WEBSERVER_GUEST)) != NULL) {
 			if ((oneTag->GetTagByName(EC_TAG_PASSWD_HASH)) != NULL) {
-				thePrefs::SetWSLowPass(oneTag->GetTagByName(EC_TAG_PASSWD_HASH)->GetMD4Data().Encode());
+				thePrefs::SetWSLowPass(
+					oneTag->GetTagByName(EC_TAG_PASSWD_HASH)->GetMD4Data().Encode());
 			}
 		}
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetWebUseGzip, EC_TAG_WEBSERVER_USEGZIP);
@@ -462,6 +753,12 @@
 
 	if ((thisTab = GetTagByName(EC_TAG_PREFS_ONLINESIG)) != NULL) {
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetOnlineSignatureEnabled, EC_TAG_ONLINESIG_ENABLED);
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_ONLINESIG_DIRECTORY)) != nullptr) {
+			thePrefs::SetOSDir(CPath(oneTag->GetStringData()));
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_ONLINESIG_UPDATE)) != nullptr) {
+			thePrefs::SetOSUpdate(oneTag->GetInt());
+		}
 	}
 
 	if ((thisTab = GetTagByName(EC_TAG_PREFS_SERVERS)) != NULL) {
@@ -471,12 +768,20 @@
 		}
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetAutoServerlist, EC_TAG_SERVERS_AUTO_UPDATE);
 		// Here should come the URL list...
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetAddServersFromServer, EC_TAG_SERVERS_ADD_FROM_SERVER);
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetAddServersFromClient, EC_TAG_SERVERS_ADD_FROM_CLIENT);
+		ApplyBoolean(
+			use_tag, thisTab, thePrefs::SetAddServersFromServer, EC_TAG_SERVERS_ADD_FROM_SERVER);
+		ApplyBoolean(
+			use_tag, thisTab, thePrefs::SetAddServersFromClient, EC_TAG_SERVERS_ADD_FROM_CLIENT);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetScoreSystem, EC_TAG_SERVERS_USE_SCORE_SYSTEM);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetSmartIdCheck, EC_TAG_SERVERS_SMART_ID_CHECK);
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetSafeServerConnectEnabled, EC_TAG_SERVERS_SAFE_SERVER_CONNECT);
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetAutoConnectStaticOnly, EC_TAG_SERVERS_AUTOCONN_STATIC_ONLY);
+		ApplyBoolean(use_tag,
+			thisTab,
+			thePrefs::SetSafeServerConnectEnabled,
+			EC_TAG_SERVERS_SAFE_SERVER_CONNECT);
+		ApplyBoolean(use_tag,
+			thisTab,
+			thePrefs::SetAutoConnectStaticOnly,
+			EC_TAG_SERVERS_AUTOCONN_STATIC_ONLY);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetManualHighPrio, EC_TAG_SERVERS_MANUAL_HIGH_PRIO);
 		if ((oneTag = thisTab->GetTagByName(EC_TAG_SERVERS_UPDATE_URL)) != NULL) {
 			thePrefs::SetEd2kServersUrl(oneTag->GetStringData());
@@ -489,17 +794,33 @@
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetAddNewFilesPaused, EC_TAG_FILES_NEW_PAUSED);
 		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::SetEndgame, EC_TAG_FILES_ENDGAME);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetNewAutoUp, EC_TAG_FILES_NEW_AUTO_UL_PRIO);
 		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);
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetExtractMetaData, EC_TAG_FILES_EXTRACT_METADATA);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetAllocFullFile, EC_TAG_FILES_ALLOC_FULL_SIZE);
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetCheckDiskspaceEnabled, EC_TAG_FILES_CHECK_FREE_SPACE);
+		ApplyBoolean(
+			use_tag, thisTab, thePrefs::SetCheckDiskspaceEnabled, EC_TAG_FILES_CHECK_FREE_SPACE);
 		if ((oneTag = thisTab->GetTagByName(EC_TAG_FILES_MIN_FREE_SPACE)) != NULL) {
 			thePrefs::SetMinFreeDiskSpaceMB(oneTag->GetInt());
 		}
 		ApplyBoolean(use_tag, thisTab, thePrefs::CreateFilesNormal, EC_TAG_FILES_CREATE_NORMAL);
+		ApplyBoolean(use_tag,
+			thisTab,
+			thePrefs::SetMediaMetadataEnabled,
+			EC_TAG_FILES_MEDIA_METADATA_ENABLED);
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_FILES_MEDIA_FFPROBE_PATH)) != nullptr) {
+			thePrefs::SetMediaMetadataFFProbePath(oneTag->GetStringData());
+		}
+		ApplyBoolean(
+			use_tag, thisTab, thePrefs::SetStartNextFileAlpha, EC_TAG_FILES_START_NEXT_ALPHA);
+#ifdef CLIENT_GUI
+		// Remote GUI: mmap capability is whatever the daemon advertised in this
+		// preferences response (tag presence), not the GUI's own build.
+		thePrefs::SetMMapSupported(thisTab->GetTagByName(EC_TAG_FILES_MMAP_SUPPORTED) != nullptr);
+#endif
+		ApplyBoolean(use_tag, thisTab, thePrefs::SetMMapEnabled, EC_TAG_FILES_MMAP_ENABLED);
 	}
 
 	if ((thisTab = GetTagByName(EC_TAG_PREFS_DIRECTORIES)) != NULL) {
@@ -515,24 +836,52 @@
 				theApp->glob_prefs->shareddir_list.push_back(CPath(it->GetStringData()));
 			}
 		}
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetShareHiddenFiles, EC_TAG_DIRECTORIES_SHARE_HIDDEN);
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetAutoRescanSharedDirs, EC_TAG_DIRECTORIES_AUTO_RESCAN);
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetFollowSymlinksInShares, EC_TAG_DIRECTORIES_FOLLOW_SYMLINKS);
-		// Apply the new auto-rescan state immediately on amuled so a
-		// remote toggle from amulegui doesn't need a daemon restart to
-		// take effect.
+		ApplyBoolean(
+			use_tag, thisTab, thePrefs::SetShareHiddenFiles, EC_TAG_DIRECTORIES_SHARE_HIDDEN);
+		ApplyBoolean(
+			use_tag, thisTab, thePrefs::SetAutoRescanSharedDirs, EC_TAG_DIRECTORIES_AUTO_RESCAN);
+		ApplyBoolean(use_tag,
+			thisTab,
+			thePrefs::SetFollowSymlinksInShares,
+			EC_TAG_DIRECTORIES_FOLLOW_SYMLINKS);
+
+		// Shared-file exclusion filter. Each incoming tag is compared against the
+		// current value so a recompile and rescan happen only on a real change.
+		bool excludeChanged = false;
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_DIRECTORIES_EXCLUDE_PATTERNS)) != nullptr) {
+			if (oneTag->GetStringData() != thePrefs::GetExcludeSharePatterns()) {
+				thePrefs::SetExcludeSharePatterns(oneTag->GetStringData());
+				excludeChanged = true;
+			}
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_DIRECTORIES_EXCLUDE_REGEX)) != nullptr) {
+			const bool useRegex = oneTag->GetInt() != 0;
+			if (useRegex != thePrefs::ExcludeSharePatternsUseRegex()) {
+				thePrefs::SetExcludeSharePatternsUseRegex(useRegex);
+				excludeChanged = true;
+			}
+		}
+		if (excludeChanged) {
+			thePrefs::RecompileShareExcludeFilter();
+		}
+
+		// Apply the new auto-rescan state immediately on amuled so a remote toggle from
+		// amulegui does not need a daemon restart to take effect.
 		if (theApp->sharedfiles) {
 			theApp->sharedfiles->EnableDirectoryWatcher(thePrefs::AutoRescanSharedDirs());
+			// Same for a changed exclusion filter: re-walk so newly excluded files
+			// leave the shareset and un-excluded ones return. Scheduled rather than
+			// inline, since this runs inside the EC request handler.
+			if (excludeChanged) {
+				theApp->sharedfiles->RequestReload();
+			}
 		}
 	}
 
-	// EC_TAG_PREFS_STATISTICS arrives but is unhandled. The prior
-	// assignment to thisTab was dead-stored (caught on lint as
-	// clang-analyzer-deadcode.DeadStores) since thisTab is overwritten
-	// by the next if block. Keep the existence-check shape so future
-	// work has an obvious home.
+	// EC_TAG_PREFS_STATISTICS arrives but is unhandled. The existence check is kept
+	// so future work has an obvious home.
 	if (GetTagByName(EC_TAG_PREFS_STATISTICS) != NULL) {
-		//#warning TODO
+		// #warning TODO
 	}
 
 	if ((thisTab = GetTagByName(EC_TAG_PREFS_SECURITY)) != NULL) {
@@ -551,9 +900,20 @@
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetFilterLanIPs, EC_TAG_IPFILTER_FILTER_LAN);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetSecureIdentEnabled, EC_TAG_SECURITY_USE_SECIDENT);
 
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetClientCryptLayerSupported, EC_TAG_SECURITY_OBFUSCATION_SUPPORTED);
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetClientCryptLayerRequested, EC_TAG_SECURITY_OBFUSCATION_REQUESTED);
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetClientCryptLayerRequired,  EC_TAG_SECURITY_OBFUSCATION_REQUIRED);
+		ApplyBoolean(use_tag,
+			thisTab,
+			thePrefs::SetClientCryptLayerSupported,
+			EC_TAG_SECURITY_OBFUSCATION_SUPPORTED);
+		ApplyBoolean(use_tag,
+			thisTab,
+			thePrefs::SetClientCryptLayerRequested,
+			EC_TAG_SECURITY_OBFUSCATION_REQUESTED);
+		ApplyBoolean(use_tag,
+			thisTab,
+			thePrefs::SetClientCryptLayerRequired,
+			EC_TAG_SECURITY_OBFUSCATION_REQUIRED);
+		ApplyBoolean(use_tag, thisTab, thePrefs::SetParanoidFilter, EC_TAG_IPFILTER_PARANOID);
+		ApplyBoolean(use_tag, thisTab, thePrefs::SetIPFilterSystem, EC_TAG_IPFILTER_SYSTEM);
 	}
 
 	if ((thisTab = GetTagByName(EC_TAG_PREFS_CORETWEAKS)) != NULL) {
@@ -570,6 +930,15 @@
 		if ((oneTag = thisTab->GetTagByName(EC_TAG_CORETW_SRV_KEEPALIVE_TIMEOUT)) != NULL) {
 			thePrefs::SetServerKeepAliveTimeout(oneTag->GetInt());
 		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_CORETW_KAD_MAX_SEARCHES)) != nullptr) {
+			thePrefs::SetKadMaxSourceSearches(static_cast<uint16>(oneTag->GetInt()));
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_CORETW_KAD_REASK_MS)) != nullptr) {
+			thePrefs::SetKadSourceReaskTime(oneTag->GetInt());
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_CORETW_SOURCE_REASK_MS)) != nullptr) {
+			thePrefs::SetSourceReaskTime(oneTag->GetInt());
+		}
 	}
 
 	if ((thisTab = GetTagByName(EC_TAG_PREFS_KADEMLIA)) != NULL) {
@@ -578,6 +947,65 @@
 		}
 	}
 
+	if ((thisTab = GetTagByName(EC_TAG_PREFS_IP2COUNTRY)) != nullptr) {
+		// SUPPORTED is the core's capability flag, flowing daemon -> GUI only: amulegui
+		// records it to show or hide its GeoIP page. The daemon must NOT apply an incoming
+		// SUPPORTED, which would carry the GUI's own value, so this is CLIENT_GUI-only.
+#ifdef CLIENT_GUI
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_IP2COUNTRY_SUPPORTED)) != nullptr) {
+			thePrefs::SetGeoIPSupported(oneTag->GetInt() != 0);
+		}
+#endif
+		// Read-only live status mirrored for amulegui's panel (the daemon fills
+		// these; it sets-but-ignores its own copy -- it reads its live resolver).
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_IP2COUNTRY_DB_LOADED)) != nullptr) {
+			thePrefs::SetGeoIPStatusLoaded(oneTag->GetInt() != 0);
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_IP2COUNTRY_DOWNLOADING)) != nullptr) {
+			thePrefs::SetGeoIPStatusDownloading(oneTag->GetInt() != 0);
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_IP2COUNTRY_LAST_RESULT)) != nullptr) {
+			thePrefs::SetGeoIPStatusLastResult(oneTag->GetStringData());
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_IP2COUNTRY_LOADED_SOURCE)) != nullptr) {
+			thePrefs::SetGeoIPStatusLoadedSource(oneTag->GetStringData());
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_IP2COUNTRY_ENABLED)) != nullptr) {
+			thePrefs::SetGeoIPEnabled(oneTag->GetInt() != 0);
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_IP2COUNTRY_SOURCE)) != nullptr) {
+			thePrefs::SetGeoIPSource((CPreferences::GeoIPSource)oneTag->GetInt());
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_IP2COUNTRY_CUSTOM_URL)) != nullptr) {
+			thePrefs::SetGeoIPCustomUrl(oneTag->GetStringData());
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_IP2COUNTRY_MAXMIND_LICENSE)) != nullptr) {
+			thePrefs::SetGeoIPMaxMindLicense(oneTag->GetStringData());
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_IP2COUNTRY_AUTO_UPDATE)) != nullptr) {
+			thePrefs::SetGeoIPAutoUpdate(oneTag->GetInt() != 0);
+		}
+		// Apply live: on the daemon this creates, enables or disables the resolver for the
+		// new settings; a no-op on amulegui, which merely absorbs the settings for display.
+		// Do NOT auto-download here -- an explicit "Update now" below carries that intent,
+		// and doing both fires twice.
+		theApp->EnableIP2Country(false);
+#ifndef CLIENT_GUI
+		// Explicit "Update now" trigger from a remote GUI: re-download the DB from the
+		// just-applied source. Daemon and monolithic only, since amulegui sends this tag
+		// but never receives it and does not link the resolver.
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_IP2COUNTRY_UPDATE_NOW)) != nullptr &&
+			oneTag->GetInt() != 0) {
+			if (theApp->GetIP2Country()) {
+				// Remote trigger: no progress dialog -- the requesting amulegui
+				// cannot render EC download progress, and on a monolithic-app-as-
+				// backend the dialog would pop on the core.
+				theApp->GetIP2Country()->Update(true, false);
+			}
+		}
+#endif
+	}
+
 	theApp->glob_prefs->Save();
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ED2KLink.cpp -> amule-3.1.0.tar.gz/src/ED2KLink.cpp Changed

@@ -25,47 +25,65 @@
 
 #include <wx/wx.h>
 
-#include "ED2KLink.h"			// Interface declarations.
+#include "ED2KLink.h" // Interface declarations.
 
 #include <wx/string.h>
-#include <wx/regex.h>			// Needed for wxRegEx
-#include <wx/tokenzr.h>			// Needed for wxStringTokenizer
+#include <wx/regex.h>   // Needed for wxRegEx
+#include <wx/tokenzr.h> // Needed for wxStringTokenizer
 
 #include <protocol/ed2k/Constants.h>
 
-#include "MemFile.h"			// Needed for CMemFile
-#include "NetworkFunctions.h"	// Needed for Uint32toStringIP
-#include <common/Format.h>		// Needed for CFormat
+#include "MemFile.h"                // Needed for CMemFile
+#include "NetworkFunctions.h"       // Needed for Uint32toStringIP
+#include <common/Format.h>          // Needed for CFormat
+#include <common/StringFunctions.h> // Needed for UnescapeHTML, RestoreEncodedPipes
 
-
-CED2KLink::CED2KLink( LinkType type )
-	: m_type( type )
-{
-}
-
-
-CED2KLink::~CED2KLink()
+CED2KLink::CED2KLink(LinkType type)
+: m_type(type)
 {
 }
 
+CED2KLink::~CED2KLink() {}
 
 CED2KLink::LinkType CED2KLink::GetKind() const
 {
 	return m_type;
 }
 
+CED2KLink *CED2KLink::CreateLinkFromUrl(const wxString &link)
+{
+	try {
+		return ParseLink(link);
+	} catch (const wxString &) {
+		// Chromium blocks an ed2k:// URL carrying a literal '|', so links are published,
+		// copied and pasted with the delimiters percent-encoded. Retry rather than decode
+		// up front: a link that parses as given is never touched, so a filename holding a
+		// real "%7C" -- which is how a '|' in a name is spelled -- cannot be split into
+		// extra fields by this. Every caller reaches the parser, so handling it here keeps
+		// the command line, the paste box, the browser handler and the EC clients agreeing.
+		const wxString restored = RestoreEncodedPipes(link);
+		if (restored == link) {
+			throw;
+		}
+		return ParseLink(restored);
+	}
+}
 
-CED2KLink* CED2KLink::CreateLinkFromUrl(const wxString& link)
+CED2KLink *CED2KLink::ParseLink(const wxString &link)
 {
 	wxRegEx re_type("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("Not a valid ed2k-URI");
 	}
 
 	wxString type = re_type.GetMatch(link, 1).MakeLower();
-	{ wxCHECK(type.Length(), NULL); }
+	{
+		wxCHECK(type.Length(), NULL);
+	}
 
 	if (type == "file") {
 		return new CED2KFileLink(link);
@@ -78,12 +96,9 @@
 	}
 }
 
-
-/////////////////////////////////////////////
 // CED2KServerListLink implementation
-/////////////////////////////////////////////
-CED2KServerListLink::CED2KServerListLink(const wxString& link)
-	: CED2KLink( kServerList )
+CED2KServerListLink::CED2KServerListLink(const wxString &link)
+: CED2KLink(kServerList)
 {
 	wxRegEx re("ed2k://\\|serverlist\\|(.*)\\|/", wxRE_ICASE | wxRE_DEFAULT);
 	if (!re.Matches(link)) {
@@ -93,24 +108,19 @@
 	m_address = UnescapeHTML(re.GetMatch(link, 1));
 }
 
-
 wxString CED2KServerListLink::GetLink() const
 {
 	return "ed2k://|serverlist|" + m_address + "|/";
 }
 
-
-const wxString& CED2KServerListLink::GetAddress() const
+const wxString &CED2KServerListLink::GetAddress() const
 {
 	return m_address;
 }
 
-
-/////////////////////////////////////////////
 // CED2KServerLink implementation
-/////////////////////////////////////////////
-CED2KServerLink::CED2KServerLink(const wxString& link)
-	: CED2KLink( kServer )
+CED2KServerLink::CED2KServerLink(const wxString &link)
+: CED2KLink(kServer)
 {
 	wxRegEx re("ed2k://\\|server\\|(^\\|+)\\|(0-9+)\\|/", wxRE_ICASE | wxRE_DEFAULT);
 	if (!re.Matches(link)) {
@@ -122,48 +132,41 @@
 
 	unsigned long ul = StrToULong(port);
 	if (ul > 0xFFFF || ul == 0) {
-		throw wxString( "Bad port number" );
+		throw wxString("Bad port number");
 	}
 
 	m_port = static_cast<uint16>(ul);
 	m_ip = StringIPtoUint32(ip);
 }
 
-
 wxString CED2KServerLink::GetLink() const
 {
 	return wxString("ed2k://|server|") << Uint32toStringIP(m_ip) << "|" << m_port << "|/";
 }
 
-
 uint32 CED2KServerLink::GetIP() const
 {
 	return m_ip;
 }
 
-
 uint16 CED2KServerLink::GetPort() const
 {
 	return m_port;
 }
 
-
-/////////////////////////////////////////////
 // CED2KFileLink implementation
-/////////////////////////////////////////////
-CED2KFileLink::CED2KFileLink(const wxString& link)
-	: CED2KLink( kFile ),
-	  m_hashset(NULL),
-	  m_size(0),
-	  m_bAICHHashValid(false)
+CED2KFileLink::CED2KFileLink(const wxString &link)
+: CED2KLink(kFile)
+, m_hashset(NULL)
+, m_size(0)
+, m_bAICHHashValid(false)
 {
 	// Start tokenizing after the "ed2k:://|file|" part of the link
 	wxStringTokenizer tokens(link, "|", wxTOKEN_RET_EMPTY_ALL);
 
 	// Must at least be ed2k://|file|NAME|SIZE|HASH|/
-	if (tokens.CountTokens() < 5
-		|| tokens.GetNextToken() != "ed2k://"
-		|| tokens.GetNextToken() != "file") {
+	if (tokens.CountTokens() < 5 || tokens.GetNextToken() != "ed2k://" ||
+		tokens.GetNextToken() != "file") {
 		throw wxString("Not a valid file link");
 	}
 
@@ -171,9 +174,8 @@
 	// We don't want a path in the name.
 	m_name.Replace("/", "_");
 
-	// Note that StrToULong returns ULONG_MAX if the value is
-	// too large to be contained in a unsigned long, which means
-	// that this check is valid, as odd as it seems
+	// StrToULong returns ULONG_MAX if the value is too large for an unsigned long, which makes
+	// this check valid, odd as it seems.
 	wxString size = tokens.GetNextToken().Strip(wxString::both);
 	m_size = StrToULongLong(size);
 	if ((m_size == 0) || (m_size > MAX_FILE_SIZE)) {
@@ -198,36 +200,37 @@
 				wxStringTokenizer sourceTokens(token, ":");
 				wxString addr = sourceTokens.GetNextToken();
 				if (addr.IsEmpty()) {
-					throw wxString( "Empty address" );
+					throw wxString("Empty address");
 				}
 
 				wxString strport = sourceTokens.GetNextToken();
 				if (strport.IsEmpty()) {
-					throw wxString( "Empty port" );
+					throw wxString("Empty port");
 				}
 
 				unsigned port = StrToULong(strport);
 
 				// Sanity checking
 				if ((port == 0) || (port > 0xFFFF)) {
-					throw wxString( "Invalid Port" );
+					throw wxString("Invalid Port");
 				}
 
 				wxString sourcehash;
-				uint8 cryptoptions =0;
+				uint8 cryptoptions = 0;
 				wxString strcryptoptions = sourceTokens.GetNextToken();
 				if (!strcryptoptions.IsEmpty()) {
-					cryptoptions = (uint8) StrToULong(strcryptoptions);
+					cryptoptions = (uint8)StrToULong(strcryptoptions);
 					if ((cryptoptions & 0x80) > 0) {
 						// Source ready for encryption, hash included.
 						sourcehash = sourceTokens.GetNextToken();
 						if (sourcehash.IsEmpty()) {
-							throw wxString( "Empty sourcehash conflicts with cryptoptions flag 0x80" );
+							throw wxString("Empty sourcehash conflicts with "
+								       "cryptoptions flag 0x80");
 						}
 					}
 				}
 
-				SED2KLinkSource entry = { addr, (uint16) port, sourcehash, cryptoptions };
+				SED2KLinkSource entry = { addr, (uint16)port, sourcehash, cryptoptions };
 
 				m_sources.push_back(entry);
 			}
@@ -250,9 +253,9 @@
 			unsigned count = m_hashset->GetLength() / 16u - 1u;
 
 			if (count) {
-				m_hashset->Seek( 16, wxFromStart);
-				m_hashset->WriteUInt16( count );
-				m_hashset->Seek( 0, wxFromStart);
+				m_hashset->Seek(16, wxFromStart);
+				m_hashset->WriteUInt16(count);
+				m_hashset->Seek(0, wxFromStart);
 			} else {
 				delete m_hashset;
 				m_hashset = NULL;
@@ -260,7 +263,8 @@
 		} else if (field.StartsWith("h=")) {
 			wxString hash = field.AfterFirst('=').MakeUpper();
 
-			size_t decodedSize = DecodeBase32(hash, CAICHHash::GetHashSize(), m_AICHHash.GetRawHash());
+			size_t decodedSize =
+				DecodeBase32(hash, CAICHHash::GetHashSize(), m_AICHHash.GetRawHash());
 			if ((decodedSize != CAICHHash::GetHashSize()) || m_AICHHash.GetString() != hash) {
 				throw wxString("Invalid master-hash");
 			}
@@ -270,45 +274,38 @@
 	}
 }
 
-
 CED2KFileLink::~CED2KFileLink()
 {
 	delete m_hashset;
-	m_hashset =  NULL;
+	m_hashset = NULL;
 }
 
-
 wxString CED2KFileLink::GetLink() const
 {
 	return CFormat("ed2k://|file|%s|%u|%s|/") % m_name % m_size % m_hash.Encode();
 }
 
-
 wxString CED2KFileLink::GetName() const
 {
 	return m_name;
 }
 
-
 uint64 CED2KFileLink::GetSize() const
 {
 	return m_size;
 }
 
-
-const CMD4Hash& CED2KFileLink::GetHashKey() const
+const CMD4Hash &CED2KFileLink::GetHashKey() const
 {
 	return m_hash;
 }
 
-
 bool CED2KFileLink::HasValidAICHHash() const
 {
 	return m_bAICHHashValid;
 }
 
-
-const CAICHHash& CED2KFileLink::GetAICHHash() const
+const CAICHHash &CED2KFileLink::GetAICHHash() const
 {
 	return m_AICHHash;
 }

amule-3.0.1.tar.gz/src/ED2KLink.h -> amule-3.1.0.tar.gz/src/ED2KLink.h Changed

@@ -26,39 +26,47 @@
 #ifndef ED2KLINK_H
 #define ED2KLINK_H
 
-
-#include "MD4Hash.h"		// Needed for CMD4Hash
-#include "SHAHashSet.h"		// Needed for CAICHHash
-
-
+#include "MD4Hash.h"    // Needed for CMD4Hash
+#include "SHAHashSet.h" // Needed for CAICHHash
 
 class CMemFile;
 
-
 class CED2KLink
 {
 public:
-	typedef enum { kServerList, kServer , kFile , kInvalid } LinkType;
+	typedef enum
+	{
+		kServerList,
+		kServer,
+		kFile,
+		kInvalid
+	} LinkType;
 
-	static CED2KLink* CreateLinkFromUrl(const wxString& link);
+	/**
+	 * Parses a link, accepting percent-encoded '|' delimiters. Throws a wxString describing the
+	 * problem if the link is not one.
+	 */
+	static CED2KLink *CreateLinkFromUrl(const wxString &link);
 
 	LinkType GetKind() const;
 	virtual wxString GetLink() const = 0;
 
-	virtual	~CED2KLink();
+	virtual ~CED2KLink();
 
 protected:
-	CED2KLink( LinkType type );
+	CED2KLink(LinkType type);
 
 private:
-	LinkType	m_type;
-};
+	//! Parses a link exactly as given; CreateLinkFromUrl() drives the retry.
+	static CED2KLink *ParseLink(const wxString &link);
 
+	LinkType m_type;
+};
 
 class CED2KFileLink : public CED2KLink
 {
 	friend class CED2KLink;
-	CED2KFileLink(const wxString& link);
+	CED2KFileLink(const wxString &link);
 
 public:
 	virtual ~CED2KFileLink();
@@ -67,16 +75,16 @@
 
 	wxString GetName() const;
 	uint64 GetSize() const;
-	const CMD4Hash& GetHashKey() const;
+	const CMD4Hash &GetHashKey() const;
 
 	// AICH data
-	bool	HasValidAICHHash() const;
-	const CAICHHash&	GetAICHHash() const;
+	bool HasValidAICHHash() const;
+	const CAICHHash &GetAICHHash() const;
 
-	CMemFile* m_hashset;
+	CMemFile *m_hashset;
 
 	/**
-	 * Structure used to store sources found in file links.
+	 * Stores sources found in file links.
 	 */
 	struct SED2KLinkSource
 	{
@@ -94,22 +102,21 @@
 	CED2KLinkSourceList m_sources;
 
 private:
-	CED2KFileLink(); // Not defined
-	CED2KFileLink(const CED2KFileLink&); // Not defined
-	CED2KFileLink& operator=(const CED2KFileLink&); // Not defined
-
-	wxString	m_name;
-	uint64		m_size;
-	CMD4Hash	m_hash;
-	bool		m_bAICHHashValid;
-	CAICHHash	m_AICHHash;
+	CED2KFileLink();                                 // Not defined
+	CED2KFileLink(const CED2KFileLink &);            // Not defined
+	CED2KFileLink &operator=(const CED2KFileLink &); // Not defined
+
+	wxString m_name;
+	uint64 m_size;
+	CMD4Hash m_hash;
+	bool m_bAICHHashValid;
+	CAICHHash m_AICHHash;
 };
 
-
 class CED2KServerLink : public CED2KLink
 {
 	friend class CED2KLink;
-	CED2KServerLink(const wxString& link);
+	CED2KServerLink(const wxString &link);
 
 public:
 	virtual wxString GetLink() const;
@@ -118,33 +125,31 @@
 	uint16 GetPort() const;
 
 private:
-	CED2KServerLink(); // Not defined
-	CED2KServerLink(const CED2KServerLink&); // Not defined
-	CED2KServerLink& operator=(const CED2KServerLink&); // Not defined
+	CED2KServerLink();                                   // Not defined
+	CED2KServerLink(const CED2KServerLink &);            // Not defined
+	CED2KServerLink &operator=(const CED2KServerLink &); // Not defined
 
 	uint32 m_ip;
 	uint16 m_port;
 };
 
-
 class CED2KServerListLink : public CED2KLink
 {
 	friend class CED2KLink;
-	CED2KServerListLink(const wxString& link);
+	CED2KServerListLink(const wxString &link);
 
 public:
 	virtual wxString GetLink() const;
 
-	const wxString& GetAddress() const;
+	const wxString &GetAddress() const;
 
 private:
-	CED2KServerListLink(); // Not defined
-	CED2KServerListLink(const CED2KFileLink&); // Not defined
-	CED2KServerListLink& operator=(const CED2KFileLink&); // Not defined
+	CED2KServerListLink();                                 // Not defined
+	CED2KServerListLink(const CED2KFileLink &);            // Not defined
+	CED2KServerListLink &operator=(const CED2KFileLink &); // Not defined
 
 	wxString m_address;
 };
 
-
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ED2KLinkParser.cpp -> amule-3.1.0.tar.gz/src/ED2KLinkParser.cpp Changed

@@ -23,9 +23,9 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-const int versionMajor		= 1;
-const int versionMinor		= 5;
-const int versionRevision	= 1;
+const int versionMajor = 1;
+const int versionMinor = 5;
+const int versionRevision = 1;
 
 #include <cstdlib>
 #include <sstream>
@@ -33,9 +33,9 @@
 #include <fstream>
 
 #ifdef _WIN32
-	#include <winerror.h>
-	#include <shlobj.h>
-	#include <shlwapi.h>
+#include <winerror.h>
+#include <shlobj.h>
+#include <shlwapi.h>
 #endif
 
 #include "FileLock.h"
@@ -44,7 +44,7 @@
 
 using std::string;
 
-static string GetLinksFilePath(const string& configDir)
+static string GetLinksFilePath(const string &configDir)
 {
 	if (!configDir.empty()) {
 #ifdef _WIN32
@@ -64,14 +64,12 @@
 #endif
 	}
 
-
 #ifdef __APPLE__
 
-	// ~/Library/Application Support always exists on macOS >= 10.5 and
-	// is the user-domain equivalent of FSFindFolder(kUserDomain,
-	// kApplicationSupportFolderType, ...) that we used to call via the
-	// Carbon FSRef API (removed in 64-bit macOS).
-	const char* home = getenv("HOME");
+	// ~/Library/Application Support always exists on macOS >= 10.5 and is the user-domain
+	// equivalent of the FSFindFolder(kUserDomain, kApplicationSupportFolderType, ...) we used
+	// to call through the Carbon FSRef API, removed in 64-bit macOS.
+	const char *home = getenv("HOME");
 	std::string strDir = (home ? home : "");
 	return strDir + "/Library/Application Support/aMule/ED2KLinks";
 
@@ -104,32 +102,28 @@
 
 #else
 
-	// Mirror the macOS branch above: getenv may return NULL if HOME is
-	// unset (rare in practice, but constructing std::string(NULL) is
-	// undefined behaviour).
-	const char* home = getenv("HOME");
+	// Mirror the macOS branch above: getenv may return NULL if HOME is unset -- rare in
+	// practice, but constructing std::string(NULL) is undefined behaviour.
+	const char *home = getenv("HOME");
 	return string(home ? home : "") + "/.aMule/ED2KLinks";
 
 #endif
 }
 
 /**
- * Converts a hexadecimal number to a char.
- *
- * @param hex The hex-number, must be at most 2 digits long.
- * @return The resulting char or \0 if conversion failed.
+ * Converts a hexadecimal number of at most 2 digits to a char, or \0 if the conversion failed.
  */
-static char HexToDec( const string& hex )
+static char HexToDec(const string &hex)
 {
 	char result = 0;
 
-	for ( size_t i = 0; i < hex.length(); ++i ) {
-		char cur = toupper( hex.at(i) );
+	for (size_t i = 0; i < hex.length(); ++i) {
+		char cur = toupper(hex.at(i));
 		result *= 16;
 
-		if ( isdigit( cur ) ) {
+		if (isdigit(cur)) {
 			result += cur - '0';
-		} else if ( cur >= 'A' && cur <= 'F' ) {
+		} else if (cur >= 'A' && cur <= 'F') {
 			result += cur - 'A' + 10;
 		} else {
 			return '\0';
@@ -139,23 +133,19 @@
 	return result;
 }
 
-
 /**
- * This function converts all valid HTML escape-codes to their corresponding chars.
- *
- * @param str The string to unescape.
- * @return The unescaped version of the input string.
+ * Converts every valid HTML escape code in @a str to its corresponding char.
  */
-static string Unescape( const string& str )
+static string Unescape(const string &str)
 {
 	string result;
-	result.reserve( str.length() );
+	result.reserve(str.length());
 
-	for ( size_t i = 0; i < str.length(); ++i ) {
-		if ( str.at(i) == '%' && ( i + 2 < str.length() ) ) {
-			char unesc = HexToDec( str.substr( i + 1, 2 ) );
+	for (size_t i = 0; i < str.length(); ++i) {
+		if (str.at(i) == '%' && (i + 2 < str.length())) {
+			char unesc = HexToDec(str.substr(i + 1, 2));
 
-			if ( unesc ) {
+			if (unesc) {
 				i += 2;
 
 				result += unesc;
@@ -172,38 +162,36 @@
 	return result;
 }
 
-
 /**
- * Returns the string with whitespace stripped from both ends.
+ * The string with whitespace stripped from both ends.
  */
-static string strip( const string& str )
+static string strip(const string &str)
 {
 	size_t first = 0;
-	size_t last  = str.length() - 1;
+	size_t last = str.length() - 1;
 
 	// A simple but no very optimized way to narrow down the
 	// usable text within the string.
-	while ( first <= last ) {
-		if ( isspace( str.at(first) ) ) {
+	while (first <= last) {
+		if (isspace(str.at(first))) {
 			first++;
-		} else if ( isspace( str.at(last) ) ) {
+		} else if (isspace(str.at(last))) {
 			last--;
 		} else {
 			break;
 		}
 	};
 
-	return str.substr( first, 1 + last - first );
+	return str.substr(first, 1 + last - first);
 }
 
-
 /**
- * Returns true if the string is a valid number.
+ * True if the string is a valid number.
  */
-static bool isNumber( const string& str )
+static bool isNumber(const string &str)
 {
-	for ( size_t i = 0; i < str.length(); i++ ) {
-		if ( !isdigit( str.at(i) ) ) {
+	for (size_t i = 0; i < str.length(); i++) {
+		if (!isdigit(str.at(i))) {
 			return false;
 		}
 	}
@@ -211,16 +199,15 @@
 	return str.length() > 0;
 }
 
-
 /**
- * Returns true if the string is a valid Base16 representation of a MD4 Hash.
+ * True if the string is a valid Base16 representation of an MD4 hash.
  */
-static bool isMD4Hash( const string& str )
+static bool isMD4Hash(const string &str)
 {
-	for ( size_t i = 0; i < str.length(); i++ ) {
-		const char c = toupper( str.at(i) );
+	for (size_t i = 0; i < str.length(); i++) {
+		const char c = toupper(str.at(i));
 
-		if ( !isdigit( c ) && ( c < 'A' || c > 'F' ) ) {
+		if (!isdigit(c) && (c < 'A' || c > 'F')) {
 			return false;
 		}
 	}
@@ -228,39 +215,31 @@
 	return str.length() == 32;
 }
 
-
 /**
- * Returns a description of the current version of "ed2k".
+ * A description of the current version of "ed2k".
  */
 static string getVersion()
 {
 	std::ostringstream v;
 
-	v << "aMule ED2k link parser v"
-		<< versionMajor << "."
-		<< versionMinor << "."
-		<< versionRevision;
+	v << "aMule ED2k link parser v" << versionMajor << "." << versionMinor << "." << versionRevision;
 
 	return v.str();
 }
 
-
 /**
- * Helper-function for printing link-errors.
+ * Helper for printing link errors.
  */
-static void badLink( const string& type, const string& err, const string& uri )
+static void badLink(const string &type, const string &err, const string &uri)
 {
 	std::cout << "Invalid " << type << "-link, " + err << ":\n"
-		<< "\t" << uri << std::endl;
+		  << "\t" << uri << '\n';
 }
 
-
 /**
- * Writes a string to the ED2KLinks file.
- *
- * If errors are detected, it will terminate the program.
+ * Writes a string to the ED2KLinks file, terminating the program on error.
  */
-static void writeLink( const string& uri, const string& config_dir )
+static void writeLink(const string &uri, const string &config_dir)
 {
 	// Attempt to lock the ED2KLinks file
 	static CFileLock lock(GetLinksFilePath(config_dir));
@@ -268,61 +247,57 @@
 
 	if (!file.is_open()) {
 		string path = GetLinksFilePath(config_dir);
-		file.open( path.c_str(), std::ofstream::out | std::ofstream::app );
+		file.open(path.c_str(), std::ofstream::out | std::ofstream::app);
 
 		if (!file.is_open()) {
-			std::cout << "ERROR! Failed to open " << path << " for writing!" << std::endl;
+			std::cout << "ERROR! Failed to open " << path << " for writing!" << '\n';
 			exit(1);
 		}
 	}
 
-	file << uri << std::endl;
+	file << uri << '\n';
 
-	std::cout << "Link successfully queued." << std::endl;
+	std::cout << "Link successfully queued." << '\n';
 }
 
-
 /**
- * Writes the the specified URI to the ED2KLinks file if it is a valid file-link.
- *
- * @param uri The URI to check.
- * @return True if the URI was written, false otherwise.
+ * Writes @a uri to the ED2KLinks file if it is a valid file link, returning whether it was written.
  */
-static bool checkFileLink( const string& uri )
+static bool checkFileLink(const string &uri)
 {
-	if ( uri.substr( 0, 13 ) == "ed2k://|file|" ) {
+	if (uri.substr(0, 13) == "ed2k://|file|") {
 		size_t base_off = 12;
-		size_t name_off = uri.find( '|', base_off + 1 );
-		size_t size_off = uri.find( '|', name_off + 1 );
-		size_t hash_off = uri.find( '|', size_off + 1 );
+		size_t name_off = uri.find('|', base_off + 1);
+		size_t size_off = uri.find('|', name_off + 1);
+		size_t hash_off = uri.find('|', size_off + 1);
 
 		bool valid = true;
-		valid &= ( base_off < name_off );
-		valid &= ( name_off < size_off );
-		valid &= ( size_off < hash_off );
-		valid &= ( hash_off != string::npos );
+		valid &= (base_off < name_off);
+		valid &= (name_off < size_off);
+		valid &= (size_off < hash_off);
+		valid &= (hash_off != string::npos);
 
-		if ( !valid ) {
-			badLink( "file", "invalid link format", uri );
+		if (!valid) {
+			badLink("file", "invalid link format", uri);
 			return false;
 		}
 
-		string name = uri.substr( base_off + 1, name_off - base_off - 1 );
-		string size = uri.substr( name_off + 1, size_off - name_off - 1 );
-		string hash = uri.substr( size_off + 1, hash_off - size_off - 1 );
+		string name = uri.substr(base_off + 1, name_off - base_off - 1);
+		string size = uri.substr(name_off + 1, size_off - name_off - 1);
+		string hash = uri.substr(size_off + 1, hash_off - size_off - 1);
 
-		if ( name.empty() ) {
-			badLink( "file", "no name specified", uri );
+		if (name.empty()) {
+			badLink("file", "no name specified", uri);
 			return false;
 		}
 
-		if ( !isNumber( size ) ) {
-			badLink( "file", "invalid size", uri );
+		if (!isNumber(size)) {
+			badLink("file", "invalid size", uri);
 			return false;
 		}
 
-		if ( !isMD4Hash( hash ) ) {
-			badLink( "file", "invalid MD4 hash", uri );
+		if (!isMD4Hash(hash)) {
+			badLink("file", "invalid MD4 hash", uri);
 			return false;
 		}
 
@@ -332,40 +307,37 @@
 	return false;
 }
 
-
 /**
- * Writes the the specified URI to the ED2KLinks file if it is a valid server-link.
- *
- * @param uri The URI to check.
- * @return True if the URI was written, false otherwise.
+ * Writes @a uri to the ED2KLinks file if it is a valid server link, returning whether it was
+ * written.
  */
-static bool checkServerLink( const string& uri )
+static bool checkServerLink(const string &uri)
 {
-	if ( uri.substr( 0, 15 ) == "ed2k://|server|" ) {
+	if (uri.substr(0, 15) == "ed2k://|server|") {
 		size_t base_off = 14;
-		size_t host_off = uri.find( '|', base_off + 1 );
-		size_t port_off = uri.find( '|', host_off + 1 );
+		size_t host_off = uri.find('|', base_off + 1);
+		size_t port_off = uri.find('|', host_off + 1);
 
 		bool valid = true;
-		valid &= ( base_off < host_off );
-		valid &= ( host_off < port_off );
-		valid &= ( port_off != string::npos );
+		valid &= (base_off < host_off);
+		valid &= (host_off < port_off);
+		valid &= (port_off != string::npos);
 
-		if ( !valid || uri.at( port_off + 1 ) != '/' ) {
-			badLink( "server", "invalid link format", uri );
+		if (!valid || uri.at(port_off + 1) != '/') {
+			badLink("server", "invalid link format", uri);
 			return false;
 		}
 
-		string host = uri.substr( base_off + 1, host_off - base_off - 1 );
-		string port = uri.substr( host_off + 1, port_off - host_off - 1 );
+		string host = uri.substr(base_off + 1, host_off - base_off - 1);
+		string port = uri.substr(host_off + 1, port_off - host_off - 1);
 
-		if ( host.empty() ) {
-			badLink( "server", "no hostname specified", uri );
+		if (host.empty()) {
+			badLink("server", "no hostname specified", uri);
 			return false;
 		}
 
-		if ( !isNumber( port ) ) {
-			badLink( "server", "invalid port", uri );
+		if (!isNumber(port)) {
+			badLink("server", "invalid port", uri);
 			return false;
 		}
 
@@ -375,32 +347,29 @@
 	return false;
 }
 
-
 /**
- * Writes the the specified URI to the ED2KLinks file if it is a valid serverlist-link.
- *
- * @param uri The URI to check.
- * @return True if the URI was written, false otherwise.
+ * Writes @a uri to the ED2KLinks file if it is a valid serverlist link, returning whether it was
+ * written.
  */
-static bool checkServerListLink( const string& uri )
+static bool checkServerListLink(const string &uri)
 {
-	if ( uri.substr( 0, 19 ) == "ed2k://|serverlist|" ) {
+	if (uri.substr(0, 19) == "ed2k://|serverlist|") {
 		size_t base_off = 19;
-		size_t path_off = uri.find( '|', base_off + 1 );
+		size_t path_off = uri.find('|', base_off + 1);
 
 		bool valid = true;
-		valid &= ( base_off < path_off );
-		valid &= ( path_off != string::npos );
+		valid &= (base_off < path_off);
+		valid &= (path_off != string::npos);
 
-		if ( !valid ) {
-			badLink( "serverlist", "invalid link format", uri );
+		if (!valid) {
+			badLink("serverlist", "invalid link format", uri);
 			return false;
 		}
 
-		string path = uri.substr( base_off + 1, path_off - base_off - 1 );
+		string path = uri.substr(base_off + 1, path_off - base_off - 1);
 
-		if ( path.empty() ) {
-			badLink( "serverlist", "no hostname specified", uri );
+		if (path.empty()) {
+			badLink("serverlist", "no hostname specified", uri);
 			return false;
 		}
 
@@ -410,19 +379,18 @@
 	return false;
 }
 
-
 int main(int argc, char *argv)
 {
 	bool errors = false;
 	string config_path;
 	string category = "";
-	for ( int i = 1; i < argc; i++ ) {
-		string arg = strip( Unescape( string( argvi ) ) );
+	for (int i = 1; i < argc; i++) {
+		string arg = strip(Unescape(string(argvi)));
 
-		if ( arg.compare(0, 7, "magnet:" ) == 0 ) {
+		if (arg.compare(0, 7, "magnet:") == 0) {
 			string ed2k = CMagnetED2KConverter(arg);
-			if ( ed2k.empty() ) {
-				std::cerr << "Cannot convert magnet URI to ed2k:\n\t" << arg << std::endl;
+			if (ed2k.empty()) {
+				std::cerr << "Cannot convert magnet URI to ed2k:\n\t" << arg << '\n';
 				errors = true;
 				continue;
 			} else {
@@ -430,30 +398,30 @@
 			}
 		}
 
-		if ( arg.substr( 0, 8 ) == "ed2k://|" ) {
+		if (arg.substr(0, 8) == "ed2k://|") {
 			// Ensure the URI is valid
-			if ( arg.at( arg.length() - 1 ) != '/' ) {
+			if (arg.at(arg.length() - 1) != '/') {
 				arg += '/';
 			}
 
-			string type = arg.substr( 8, arg.find( '|', 9 ) - 8 );
+			string type = arg.substr(8, arg.find('|', 9) - 8);
 
-			if ( (type == "file") && checkFileLink( arg ) ) {
+			if ((type == "file") && checkFileLink(arg)) {
 				arg += category;
-				writeLink( arg, config_path );
-			} else if ( (type == "server") && checkServerLink( arg ) ) {
-				writeLink( arg, config_path );
-			} else if ( (type == "serverlist") && checkServerListLink( arg ) ) {
-				writeLink( arg, config_path );
+				writeLink(arg, config_path);
+			} else if ((type == "server") && checkServerLink(arg)) {
+				writeLink(arg, config_path);
+			} else if ((type == "serverlist") && checkServerListLink(arg)) {
+				writeLink(arg, config_path);
 			} else {
-				std::cout << "Unknown or invalid link-type:\n\t" << arg << std::endl;
+				std::cout << "Unknown or invalid link-type:\n\t" << arg << '\n';
 				errors = true;
 			}
 		} else if (arg == "-c" || arg == "--config-dir") {
 			if (i < argc - 1) {
 				config_path = argv++i;
 			} else {
-				std::cerr << "Missing mandatory argument for " << arg << std::endl;
+				std::cerr << "Missing mandatory argument for " << arg << '\n';
 				errors = true;
 			}
 		} else if (arg.substr(0, 2) == "-c") {
@@ -461,60 +429,61 @@
 		} else if (arg.substr(0, 13) == "--config-dir=") {
 			config_path = arg.substr(13);
 		} else if (arg == "-h" || arg == "--help") {
-			std::cout << getVersion()
-				<< "\n\n"
+			std::cout
+				<< getVersion() << "\n\n"
 				<< "Usage:\n"
 				<< "    --help, -h              Prints this help.\n"
-				<< "    --config-dir, -c        Specifies the aMule configuration directory.\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"
+				<< "    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;
+				<< '\n';
 
 		} else if (arg == "-v" || arg == "--version") {
-			std::cout << getVersion() << std::endl;
+			std::cout << getVersion() << '\n';
 		} else if (arg == "-t" || arg == "--category") {
 			if (i < argc - 1) {
-				if ((category == "" ) && (0 != atoi(argv++i))) {
+				if ((category == "") && (0 != atoi(argv++i))) {
 					category = ':';
 					category += argvi;
 				}
 			} else {
-				std::cerr << "Missing mandatory argument for " << arg << std::endl;
+				std::cerr << "Missing mandatory argument for " << arg << '\n';
 				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.size(); e++)
+				if (my_collection.Open(/* emulecollection file */ argv++i)) {
+					for (size_t e = 0; e < my_collection.size(); e++)
 						if (listOnly)
-							std::cout << my_collectione << std::endl;
+							std::cout << my_collectione << '\n';
 						else
-							writeLink( my_collectione, config_path );
+							writeLink(my_collectione, config_path);
 				} else {
-					std::cerr << "Invalid emulecollection file: " << argvi << std::endl;
+					std::cerr << "Invalid emulecollection file: " << argvi << '\n';
 					errors = true;
 				}
 			} else {
-				std::cerr << "Missing mandatory argument for " << arg << std::endl;
+				std::cerr << "Missing mandatory argument for " << arg << '\n';
 				errors = true;
 			}
 		} else {
-			std::cerr << "Bad parameter value:\n\t" << arg << "\n" << std::endl;
+			std::cerr << "Bad parameter value:\n\t" << arg << "\n" << '\n';
 			errors = true;
 		}
 	}
 
-	return ( errors ? 1 : 0 );
+	return (errors ? 1 : 0);
 }
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/EMSocket.cpp -> amule-3.1.0.tar.gz/src/EMSocket.cpp Changed

@@ -23,13 +23,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "EMSocket.h"		// Interface declarations.
+#include "EMSocket.h" // Interface declarations.
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Constants.h>
 
-#include "Packet.h"		// Needed for CPacket
+#include "Packet.h" // Needed for CPacket
 #include "amule.h"
 #include "DownloadBandwidthThrottler.h"
 #include "GetTickCount.h"
@@ -38,21 +37,19 @@
 #include "Preferences.h"
 #include "ScopedPtr.h"
 
-
 const uint32 MAX_PACKET_SIZE = 2000000;
 
 // cppcheck-suppress uninitMemberVar CEMSocket::pendingHeader
 CEMSocket::CEMSocket(const CProxyData *ProxyData)
-	: CEncryptedStreamSocket(MULE_SOCKET_NOWAIT, ProxyData)
+: CEncryptedStreamSocket(MULE_SOCKET_NOWAIT, ProxyData)
 {
 	// If an interface has been specified,
 	// then we need to bind to it.
 	if (!thePrefs::GetAddress().IsEmpty()) {
 		amuleIPV4Address host;
 
-		// No need to warn here, in case of failure to
-		// assign the hostname. That is already done
-		// in amule.cpp when starting ...
+		// No need to warn on a failure to assign the hostname; amule.cpp already does at
+		// startup.
 		if (host.Hostname(thePrefs::GetAddress())) {
 			SetLocal(host);
 		}
@@ -61,9 +58,8 @@
 	byConnected = ES_NOTCONNECTED;
 	m_uTimeOut = CONNECTION_TIMEOUT; // default timeout for ed2k sockets
 
-	// Download rate control: bucket is global
-	// (CDownloadBandwidthThrottler); only the per-socket pause flag
-	// lives here.
+	// Download rate control: the bucket is global (CDownloadBandwidthThrottler); only the per-
+	// socket pause flag lives here.
 	pendingOnReceive = false;
 
 	// Download partial header
@@ -78,47 +74,47 @@
 	sendblen = 0;
 	sent = 0;
 
-    m_currentPacket_is_controlpacket = false;
+	m_currentPacket_is_controlpacket = false;
 	m_currentPackageIsFromPartFile = false;
 
-    m_numberOfSentBytesCompleteFile = 0;
-    m_numberOfSentBytesPartFile = 0;
-    m_numberOfSentBytesControlPacket = 0;
+	m_numberOfSentBytesCompleteFile = 0;
+	m_numberOfSentBytesPartFile = 0;
+	m_numberOfSentBytesControlPacket = 0;
 
-    const uint64 now = ::GetTickCount64();
-    lastCalledSend = now;
-    lastSent = now-1000;
+	const uint64 now = ::GetTickCount64();
+	lastCalledSend = now;
+	lastSent = now - 1000;
 
-    m_bAccelerateUpload = false;
+	m_bAccelerateUpload = false;
 
-    m_actualPayloadSize = 0;
-    m_actualPayloadSizeSent = 0;
+	m_actualPayloadSize = 0;
+	m_actualPayloadSizeSent = 0;
 
-    m_bBusy = false;
-    m_hasSent = false;
+	m_bBusy = false;
+	m_hasSent = false;
 
 	lastFinishedStandard = 0;
 }
 
 CEMSocket::~CEMSocket()
 {
-    // need to be locked here to know that the other methods
-    // won't be in the middle of things
-    {
-	std::lock_guard<std::mutex> lock(m_sendLocker);
+	// need to be locked here to know that the other methods
+	// won't be in the middle of things
+	{
+		std::lock_guard<std::mutex> lock(m_sendLocker);
 		byConnected = ES_DISCONNECTED;
 	}
 
-    // now that we know no other method will keep adding to the queue
-    // we can remove ourself from the queue
+	// now that we know no other method will keep adding to the queue
+	// we can remove ourself from the queue
 	if (theApp->uploadBandwidthThrottler) {
-	    theApp->uploadBandwidthThrottler->RemoveFromAllQueues(this);
+		theApp->uploadBandwidthThrottler->RemoveFromAllQueues(this);
 	}
+	CDownloadBandwidthThrottler::Get().Forget(this);
 
-    ClearQueues();
+	ClearQueues();
 }
 
-
 void CEMSocket::ClearQueues()
 {
 	std::lock_guard<std::mutex> lock(m_sendLocker);
@@ -151,34 +147,61 @@
 	sent = 0;
 }
 
+void CEMSocket::QuiesceForRedial()
+{
+	// Same order as OnClose(), and for the same reasons. Park the state first so
+	// no other thread queues anything more, then leave the throttler -- which
+	// takes the lock it holds across SendControlData(), so this waits out a send
+	// already running on its thread -- and only then drop what the dead stream
+	// left behind. Without the wait, freeing the transport here races that send;
+	// without the queues going, a half-written packet from the old stream is
+	// replayed onto the new connection and the peer reads a bogus header.
+	{
+		std::lock_guard<std::mutex> lock(m_sendLocker);
+		byConnected = ES_DISCONNECTED;
+	}
+
+	// Unguarded, as in OnClose(): this runs while the app is up. The destructor
+	// guards the same call because it also runs during shutdown.
+	theApp->uploadBandwidthThrottler->RemoveFromAllQueues(this);
+	CDownloadBandwidthThrottler::Get().Forget(this);
+
+	ClearQueues();
+
+	// Reopened last: ES_DISCONNECTED is terminal for every send and receive path,
+	// so a socket left in it connects and then never speaks.
+	{
+		std::lock_guard<std::mutex> lock(m_sendLocker);
+		byConnected = ES_NOTCONNECTED;
+	}
+}
 
 void CEMSocket::OnClose(int WXUNUSED(nErrorCode))
 {
-    // need to be locked here to know that the other methods
-    // won't be in the middle of things
-    {
-	std::lock_guard<std::mutex> lock(m_sendLocker);
+	// need to be locked here to know that the other methods
+	// won't be in the middle of things
+	{
+		std::lock_guard<std::mutex> lock(m_sendLocker);
 		byConnected = ES_DISCONNECTED;
 	}
 
-    // now that we know no other method will keep adding to the queue
-    // we can remove ourself from the queue
-    theApp->uploadBandwidthThrottler->RemoveFromAllQueues(this);
+	// now that we know no other method will keep adding to the queue
+	// we can remove ourself from the queue
+	theApp->uploadBandwidthThrottler->RemoveFromAllQueues(this);
+	CDownloadBandwidthThrottler::Get().Forget(this);
 
 	ClearQueues();
 }
 
-
 void CEMSocket::OnReceive(int nErrorCode)
 {
-	if(nErrorCode) {
+	if (nErrorCode) {
 		if (LastError()) {
 			OnError(nErrorCode);
 			return;
 		}
 	}
 
-	// Check current connection state
 	if (byConnected == ES_DISCONNECTED) {
 		return;
 	} else {
@@ -209,26 +232,25 @@
 			readMax = CPacket::GetPacketSizeFromHeader(pendingHeader) - pendingPacketSize;
 		}
 
-		// Reserve from the global download budget only when we actually
-		// intend to read something. readMax can legitimately be 0 here
-		// for empty-payload packets (some ED2K control packets carry no
-		// payload past the header) -- the do-while iteration still has
-		// to fall through to the packet-processing block below to
-		// finalise the packet, so don't let Reserve(0) -> 0 -> early
-		// return short-circuit that path. Sockets that opt out of the
-		// download throttler via IsDownloadThrottled() (server control
-		// sockets) skip the reservation entirely and read whatever's
-		// available; their traffic doesn't count against the cap.
+		// Reserve from the global download budget only when we actually intend to read
+		// something. readMax can legitimately be 0 here for empty-payload packets, and the
+		// do-while iteration still has to fall through to the packet-processing block
+		// below, so Reserve(0) must not short-circuit that path. Sockets that opt out via
+		// IsDownloadThrottled() (server control sockets) skip the reservation and do not
+		// count against the cap.
 		const bool throttled = IsDownloadThrottled();
 		uint32 grantedBytes = 0;
 		ret = 0;
 		if (readMax) {
 			if (throttled) {
-				grantedBytes =
-					CDownloadBandwidthThrottler::Get().Reserve(readMax);
+				grantedBytes = CDownloadBandwidthThrottler::Get().Reserve(readMax);
 				if (grantedBytes == 0) {
-					// Bucket exhausted; resume on next tick refill.
+					// Bucket exhausted; resume on the next tick refill.
+					// Register for that wake-up rather than relying on
+					// something else to tick this socket: a socket we are only
+					// browsing belongs to no download, so nothing else would.
 					pendingOnReceive = true;
+					CDownloadBandwidthThrottler::Get().PauseUntilRefill(this);
 					return;
 				}
 				readMax = grantedBytes;
@@ -271,19 +293,18 @@
 
 				// 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;
+				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 {
@@ -292,203 +313,176 @@
 	} while (ret && pendingHeaderSize >= PACKET_HEADER_SIZE);
 }
 
-
 void CEMSocket::WakeIfPaused()
 {
 	if (pendingOnReceive) {
-		// Re-enter the read loop. OnReceive() will consult the global
-		// CDownloadBandwidthThrottler for fresh budget; if the bucket
-		// is still empty, pendingOnReceive stays set and we'll retry
-		// next tick.
+		// Re-enter the read loop. OnReceive() consults the global
+		// CDownloadBandwidthThrottler for fresh budget; if the bucket is still empty,
+		// pendingOnReceive stays set and we retry next tick.
 		OnReceive(0);
 	}
 }
 
-
 /**
- * Queues up the packet to be sent. Another thread will actually send the packet.
+ * Queues the packet up to be sent; another thread does the sending.
  *
- * If the packet is not a control packet, and if the socket decides that its queue is
- * full and forceAdd is false, then the socket is allowed to refuse to add the packet
- * to its queue. It will then return false and it is up to the calling thread to try
- * to call SendPacket for that packet again at a later time.
+ * A non-control packet may be refused when the socket decides its queue is full and @a forceAdd is
+ * false; the caller then has to try again later.
  *
- * @param packet address to the packet that should be added to the queue
- *
- * @param delpacket if true, the responsibility for deleting the packet after it has been sent
- *                  has been transferred to this object. If false, don't delete the packet after it
- *                  has been sent.
- *
- * @param controlpacket the packet is a controlpacket
- *
- * @param forceAdd this packet must be added to the queue, even if it is full. If this flag is true
- *                 then the method can not refuse to add the packet, and therefore not return false.
- *
- * @return true if the packet was added to the queue, false otherwise
+ * @param packet the packet to add to the queue.
+ * @param delpacket true transfers responsibility for deleting the packet once sent.
+ * @param controlpacket the packet is a control packet.
+ * @param forceAdd add the packet even if the queue is full, so the call cannot refuse.
+ * @return true if the packet was added to the queue.
  */
-void CEMSocket::SendPacket(CPacket* packet, bool delpacket, bool controlpacket, uint32 actualPayloadSize)
+void CEMSocket::SendPacket(CPacket *packet, bool delpacket, bool controlpacket, uint32 actualPayloadSize)
 {
-	//printf("* SendPacket called on socket %p\n", this);
 	std::lock_guard<std::mutex> lock(m_sendLocker);
 
 	if (byConnected == ES_DISCONNECTED) {
-		//printf("* Disconnected, drop packet\n");
-        if(delpacket) {
+		if (delpacket) {
 			delete packet;
-        }
-    } else {
-        if (!delpacket){
-            packet = new CPacket(*packet);
-	    }
-
-        if (controlpacket) {
-			//printf("* Adding a control packet\n");
-	        m_control_queue.push_back(packet);
-
-            // queue up for controlpacket
-            theApp->uploadBandwidthThrottler->QueueForSendingControlPacket(this, HasSent());
-	    } else {
-			//printf("* Adding a normal packet to the queue\n");
-            bool first = !((sendbuffer && !m_currentPacket_is_controlpacket) || !m_standard_queue.empty());
-            StandardPacketQueueEntry queueEntry = { actualPayloadSize, packet };
-		    m_standard_queue.push_back(queueEntry);
-
-            // reset timeout for the first time
-            if (first) {
-                lastFinishedStandard = ::GetTickCount64();
-                m_bAccelerateUpload = true;	// Always accelerate first packet in a block
-            }
-	    }
-    }
-}
+		}
+	} else {
+		if (!delpacket) {
+			packet = new CPacket(*packet);
+		}
 
+		if (controlpacket) {
+			m_control_queue.push_back(packet);
+
+			// queue up for controlpacket
+			theApp->uploadBandwidthThrottler->QueueForSendingControlPacket(this, HasSent());
+		} else {
+			bool first = !((sendbuffer && !m_currentPacket_is_controlpacket) ||
+				       !m_standard_queue.empty());
+			StandardPacketQueueEntry queueEntry = { actualPayloadSize, packet };
+			m_standard_queue.push_back(queueEntry);
+
+			// reset timeout for the first time
+			if (first) {
+				lastFinishedStandard = ::GetTickCount64();
+				m_bAccelerateUpload = true; // Always accelerate first packet in a block
+			}
+		}
+	}
+}
 
 uint64 CEMSocket::GetSentBytesCompleteFileSinceLastCallAndReset()
 {
-	std::lock_guard<std::mutex> lock( m_sendLocker );
+	std::lock_guard<std::mutex> lock(m_sendLocker);
 
 	uint64 sentBytes = m_numberOfSentBytesCompleteFile;
-    m_numberOfSentBytesCompleteFile = 0;
+	m_numberOfSentBytesCompleteFile = 0;
 
-    return sentBytes;
+	return sentBytes;
 }
 
-
 uint64 CEMSocket::GetSentBytesPartFileSinceLastCallAndReset()
 {
-	std::lock_guard<std::mutex> lock( m_sendLocker );
+	std::lock_guard<std::mutex> lock(m_sendLocker);
 
 	uint64 sentBytes = m_numberOfSentBytesPartFile;
-    m_numberOfSentBytesPartFile = 0;
+	m_numberOfSentBytesPartFile = 0;
 
-    return sentBytes;
+	return sentBytes;
 }
 
 uint64 CEMSocket::GetSentBytesControlPacketSinceLastCallAndReset()
 {
-	std::lock_guard<std::mutex> lock( m_sendLocker );
+	std::lock_guard<std::mutex> lock(m_sendLocker);
 
 	uint64 sentBytes = m_numberOfSentBytesControlPacket;
-    m_numberOfSentBytesControlPacket = 0;
+	m_numberOfSentBytesControlPacket = 0;
 
-    return sentBytes;
+	return sentBytes;
 }
 
 uint64 CEMSocket::GetSentPayloadSinceLastCallAndReset()
 {
-	std::lock_guard<std::mutex> lock( m_sendLocker );
+	std::lock_guard<std::mutex> lock(m_sendLocker);
 
 	uint64 sentBytes = m_actualPayloadSizeSent;
-    m_actualPayloadSizeSent = 0;
+	m_actualPayloadSizeSent = 0;
 
-    return sentBytes;
+	return sentBytes;
 }
 
-// Non-resetting peek at bytes sent since the last GetSentPayloadSinceLastCallAndReset() call.
-// Used by the disk I/O thread to get a fresh view of sent bytes without consuming the counter
-// that SendBlockData() drains every CORE_TIMER_PERIOD ms.
-// Lock order: must not be called while m_sendLocker is already held by the caller.
+// Non-resetting peek at bytes sent since the last GetSentPayloadSinceLastCallAndReset(). Used by
+// the disk I/O thread for a fresh view without consuming the counter SendBlockData() drains every
+// CORE_TIMER_PERIOD. Must not be called with m_sendLocker already held.
 uint64 CEMSocket::PeekSentPayload()
 {
-	std::lock_guard<std::mutex> lock( m_sendLocker );
+	std::lock_guard<std::mutex> lock(m_sendLocker);
 	return m_actualPayloadSizeSent;
 }
 
-
 bool CEMSocket::HasQueues(bool bOnlyStandardPackets) const
 {
-	return sendbuffer != NULL || !m_standard_queue.empty() || (!bOnlyStandardPackets && !m_control_queue.empty());
+	return sendbuffer != NULL || !m_standard_queue.empty() ||
+	       (!bOnlyStandardPackets && !m_control_queue.empty());
 }
 
-
 void CEMSocket::OnSend(int nErrorCode)
 {
-    if (nErrorCode){
+	if (nErrorCode) {
 		OnError(nErrorCode);
 		return;
 	}
 
 	CEncryptedStreamSocket::OnSend(0);
 
-	std::lock_guard<std::mutex> lock( m_sendLocker );
-    m_bBusy = false;
+	std::lock_guard<std::mutex> lock(m_sendLocker);
+	m_bBusy = false;
 
-    if (byConnected != ES_DISCONNECTED) {
+	if (byConnected != ES_DISCONNECTED) {
 		byConnected = ES_CONNECTED;
 
-	    if (m_currentPacket_is_controlpacket) {
-	        // queue up for control packet
-	    theApp->uploadBandwidthThrottler->QueueForSendingControlPacket(this, HasSent());
+		if (m_currentPacket_is_controlpacket) {
+			// queue up for control packet
+			theApp->uploadBandwidthThrottler->QueueForSendingControlPacket(this, HasSent());
 		}
-    }
+	}
 }
 
-
 /**
- * Try to put queued up data on the socket.
+ * Try to put queued-up data on the socket.
  *
- * Control packets have higher priority, and will be sent first, if possible.
- * Standard packets can be split up in several package containers. In that case
- * all the parts of a split package must be sent in a row, without any control packet
- * in between.
+ * Control packets have higher priority and are sent first where possible. A standard packet can be
+ * split across several containers; all parts of a split packet must then be sent in a row, with no
+ * control packet in between.
  *
- * @param maxNumberOfBytesToSend This is the maximum number of bytes that is allowed to be put on the socket
- *                               this call. The actual number of sent bytes will be returned from the method.
- *
- * @param onlyAllowedToSendControlPacket This call we only try to put control packets on the sockets.
- *                                       If there's a standard packet "in the way", and we think that this socket
- *                                       is no longer an upload slot, then it is ok to send the standard packet to
- *                                       get it out of the way. But it is not allowed to pick a new standard packet
- *                                       from the queue during this call. Several split packets are counted as one
- *                                       standard packet though, so it is ok to finish them all off if necessary.
- *
- * @return the actual number of bytes that were put on the socket.
+ * @param maxNumberOfBytesToSend the most bytes this call may put on the socket.
+ * @param onlyAllowedToSendControlPacket only try control packets. If a standard packet is in the
+ * way and this socket is thought to be no longer an upload slot, it may be sent to clear the way,
+ * but no new standard packet may be picked from the queue. Several split packets count as one, so
+ * they can all be finished off if necessary.
+ * @return the number of bytes actually put on the socket.
  */
-SocketSentBytes CEMSocket::Send(uint32 maxNumberOfBytesToSend, uint32 minFragSize, bool onlyAllowedToSendControlPacket)
+SocketSentBytes CEMSocket::Send(
+	uint32 maxNumberOfBytesToSend, uint32 minFragSize, bool onlyAllowedToSendControlPacket)
 {
 	std::lock_guard<std::mutex> lock(m_sendLocker);
 
-	//printf("* Attempt to send a packet on socket %p\n", this);
-
 	if (byConnected == ES_DISCONNECTED) {
-		//printf("* Disconnected socket %p\n", this);
-        SocketSentBytes returnVal = { false, 0, 0 };
-        return returnVal;
-    } else if (m_bBusy && onlyAllowedToSendControlPacket) {
-		//printf("* Busy socket %p\n", this);
-        SocketSentBytes returnVal = { true, 0, 0 };
-        return returnVal;
-    }
-
-    bool anErrorHasOccured = false;
-    uint32 sentStandardPacketBytesThisCall = 0;
-    uint32 sentControlPacketBytesThisCall = 0;
+		SocketSentBytes returnVal = { false, 0, 0 };
+		return returnVal;
+	} else if (m_bBusy && onlyAllowedToSendControlPacket) {
+		SocketSentBytes returnVal = { true, 0, 0 };
+		return returnVal;
+	}
 
-    if (byConnected == ES_CONNECTED && IsEncryptionLayerReady() && (!m_bBusy || onlyAllowedToSendControlPacket)) {
+	bool anErrorHasOccured = false;
+	// A stream that ended cleanly. Stops the loops like an error does, but is
+	// not one: the socket's own lost notification drives the disconnect.
+	bool streamIsGone = false;
+	uint32 sentStandardPacketBytesThisCall = 0;
+	uint32 sentControlPacketBytesThisCall = 0;
 
-		//printf("* Internal attemptto send on %p\n", this);
+	if (byConnected == ES_CONNECTED && IsEncryptionLayerReady() &&
+		(!m_bBusy || onlyAllowedToSendControlPacket)) {
 
-		if(minFragSize < 1) {
+		if (minFragSize < 1) {
 			minFragSize = 1;
 		}
 
@@ -499,27 +493,48 @@
 
 		lastCalledSend = now;
 
-
-		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.
-			  )
-			 ) {
-
-			// If we are currently not in the progress of sending a packet, we will need to find the next one to send
-			if(sendbuffer == NULL) {
-				CPacket* curPacket = NULL;
-				if(!m_control_queue.empty()) {
-					// There's a control packet to send
+		while (sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall <
+				maxNumberOfBytesToSend &&
+			anErrorHasOccured == false && // don't send more than allowed. Also, there should have
+						      // been no error in earlier loop
+			streamIsGone == false &&
+			(!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 in the
+							     // way). Proceed whatever
+							     // onlyAllowedToSendControlPacket says.
+				)) {
+
+			// If we are currently not in the progress of sending a packet, we will need to find
+			// the next one to send
+			if (sendbuffer == NULL) {
+				CPacket *curPacket = NULL;
+				if (!m_control_queue.empty()) {
 					m_currentPacket_is_controlpacket = true;
 					curPacket = m_control_queue.front();
 					m_control_queue.pop_front();
-				} else if(!m_standard_queue.empty() /*&& onlyAllowedToSendControlPacket == false*/) {
-					// There's a standard packet to send
+				} else if (!m_standard_queue
+						    .empty() /*&& onlyAllowedToSendControlPacket == false*/) {
 					m_currentPacket_is_controlpacket = false;
 					StandardPacketQueueEntry queueEntry = m_standard_queue.front();
 					m_standard_queue.pop_front();
@@ -529,12 +544,16 @@
 					// remember this for statistics purposes.
 					m_currentPackageIsFromPartFile = curPacket->IsFromPF();
 				} else {
-					// Just to be safe. Shouldn't happen?
-					// if we reach this point, then there's something wrong with the while condition above!
+					// Just to be safe; should not happen. Reaching this point
+					// means something is wrong with the while condition above.
 					wxFAIL;
-					AddDebugLogLineC(logGeneral, "EMSocket: Couldn't get a new packet! There's an error in the first while condition in EMSocket::Send()");
+					AddDebugLogLineC(logGeneral,
+						"EMSocket: Couldn't get a new packet! There's an error in "
+						"the first while condition in EMSocket::Send()");
 
-					SocketSentBytes returnVal = { true, sentStandardPacketBytesThisCall, sentControlPacketBytesThisCall };
+					SocketSentBytes returnVal = { true,
+						sentStandardPacketBytesThisCall,
+						sentControlPacketBytesThisCall };
 					return returnVal;
 				}
 
@@ -545,52 +564,81 @@
 				sent = 0;
 				delete curPacket;
 
-				CryptPrepareSendData((uint8_t*)sendbuffer, sendblen);
+				CryptPrepareSendData((uint8_t *)sendbuffer, sendblen);
 			}
 
-			// At this point we've got a packet to send in sendbuffer. Try to send it. Loop until entire packet
-			// is sent, or until we reach maximum bytes to send for this call, or until we get an error.
-			// NOTE! If send would block (returns WOULDBLOCK), we will return from this method INSIDE this loop.
+			// At this point sendbuffer holds a packet to send. Loop until the whole
+			// packet is sent, the maximum bytes for this call is reached, or an error
+			// occurs. NOTE: if a send would block (WOULDBLOCK), we return from this
+			// method INSIDE the loop.
 			while (sent < sendblen &&
-				   sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall < maxNumberOfBytesToSend &&
-				   (
-					onlyAllowedToSendControlPacket == false || // this means we are allowed to send both types of packets, so proceed
+				sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall <
+					maxNumberOfBytesToSend &&
+				(onlyAllowedToSendControlPacket ==
+						false || // this means we are allowed to send both types of
+							 // packets, so proceed
 					m_currentPacket_is_controlpacket ||
-					(bWasLongTimeSinceSend && (sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall) < minFragSize) ||
-					(sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall) % minFragSize != 0
-				   ) &&
-				   anErrorHasOccured == false) {
-				uint32 tosend = sendblen-sent;
-				if(!onlyAllowedToSendControlPacket || m_currentPacket_is_controlpacket) {
-					if (maxNumberOfBytesToSend >= sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall && tosend > maxNumberOfBytesToSend-(sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall))
-						tosend = maxNumberOfBytesToSend-(sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall);
-				} else if(bWasLongTimeSinceSend && (sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall) < minFragSize) {
-					if (minFragSize >= sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall && tosend > minFragSize-(sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall))
-						tosend = minFragSize-(sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall);
+					(bWasLongTimeSinceSend &&
+						(sentStandardPacketBytesThisCall +
+							sentControlPacketBytesThisCall) < minFragSize) ||
+					(sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall) %
+							minFragSize !=
+						0) &&
+				anErrorHasOccured == false && streamIsGone == false) {
+				uint32 tosend = sendblen - sent;
+				if (!onlyAllowedToSendControlPacket || m_currentPacket_is_controlpacket) {
+					if (maxNumberOfBytesToSend >=
+							sentStandardPacketBytesThisCall +
+								sentControlPacketBytesThisCall &&
+						tosend > maxNumberOfBytesToSend -
+								 (sentStandardPacketBytesThisCall +
+									 sentControlPacketBytesThisCall))
+						tosend = maxNumberOfBytesToSend -
+							 (sentStandardPacketBytesThisCall +
+								 sentControlPacketBytesThisCall);
+				} else if (bWasLongTimeSinceSend &&
+					   (sentStandardPacketBytesThisCall +
+						   sentControlPacketBytesThisCall) < minFragSize) {
+					if (minFragSize >= sentStandardPacketBytesThisCall +
+								   sentControlPacketBytesThisCall &&
+						tosend >
+							minFragSize - (sentStandardPacketBytesThisCall +
+									      sentControlPacketBytesThisCall))
+						tosend =
+							minFragSize - (sentStandardPacketBytesThisCall +
+									      sentControlPacketBytesThisCall);
 				} else {
-					uint32 nextFragMaxBytesToSent = GetNextFragSize(sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall, minFragSize);
-					if (nextFragMaxBytesToSent >= sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall && tosend > nextFragMaxBytesToSent-(sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall))
-						tosend = nextFragMaxBytesToSent-(sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall);
+					uint32 nextFragMaxBytesToSent =
+						GetNextFragSize(sentStandardPacketBytesThisCall +
+									sentControlPacketBytesThisCall,
+							minFragSize);
+					if (nextFragMaxBytesToSent >=
+							sentStandardPacketBytesThisCall +
+								sentControlPacketBytesThisCall &&
+						tosend > nextFragMaxBytesToSent -
+								 (sentStandardPacketBytesThisCall +
+									 sentControlPacketBytesThisCall))
+						tosend = nextFragMaxBytesToSent -
+							 (sentStandardPacketBytesThisCall +
+								 sentControlPacketBytesThisCall);
 				}
-				wxASSERT(tosend != 0 && tosend <= sendblen-sent);
+				wxASSERT(tosend != 0 && tosend <= sendblen - sent);
 
 				lastSent = ::GetTickCount64();
 
-				uint32 result = CEncryptedStreamSocket::Write(sendbuffer+sent,tosend);
+				uint32 result = CEncryptedStreamSocket::Write(sendbuffer + sent, tosend);
 
-				// Advance 'sent' before checking BlocksWrite().  BlocksWrite()
-				// reflects "any async_write currently in flight", not "did
-				// this Write() succeed".  A previous iteration's pending
-				// write may still be in flight when the current Write()
-				// succeeds, so BlocksWrite() returns true even though we
-				// just dispatched more data.  Advancing first prevents
-				// 'sent' from lagging and the same bytes being re-sent.
+				// Advance 'sent' before checking BlocksWrite(), which reflects "any
+				// async_write currently in flight" rather than "did this Write()
+				// succeed": a previous iteration's pending write may still be in
+				// flight when the current one succeeds, so advancing first keeps
+				// 'sent' from lagging and the same bytes from being re-sent.
 				if (result > 0) {
 					m_hasSent = true;
 					sent += result;
-					if(m_currentPacket_is_controlpacket == false) {
+					if (m_currentPacket_is_controlpacket == false) {
 						sentStandardPacketBytesThisCall += result;
-						if(m_currentPackageIsFromPartFile == true) {
+						if (m_currentPackageIsFromPartFile == true) {
 							m_numberOfSentBytesPartFile += result;
 						} else {
 							m_numberOfSentBytesCompleteFile += result;
@@ -603,24 +651,53 @@
 
 				if (BlocksWrite()) {
 					m_bBusy = true;
-					SocketSentBytes returnVal = { true, sentStandardPacketBytesThisCall, sentControlPacketBytesThisCall };
-					return returnVal; // Send() blocked, onsend will be called when ready to send again
+					SocketSentBytes returnVal = { true,
+						sentStandardPacketBytesThisCall,
+						sentControlPacketBytesThisCall };
+					return returnVal; // Send() blocked, onsend will be called when ready
+							  // to send again
 				} else if (LastError()) {
 					// Send() gave an error
 					anErrorHasOccured = true;
+				} else if (!IsOk()) {
+					// The stream is gone. A transport whose stream can end
+					// cleanly returns 0 here while blocked and error are both
+					// clear, and nothing in this loop advances on a retry, so
+					// without this arm it spins at full speed on the upload
+					// thread while holding m_sendLocker. Asked rather than
+					// inferred from that triple, because a healthy asio socket
+					// can show it for an instant if its send completion lands
+					// between Write() returning and BlocksWrite() being read.
+					// A clean end is not an error, so leave without claiming
+					// one and let the lost notification tear the socket down.
+					//
+					// Inert until the acceptor routes this call. IsOk() is not
+					// virtual anywhere in CLibSocket, CEncryptedStreamSocket or
+					// here, so it resolves statically to CLibSocket::IsOk(),
+					// whose m_OK is true for the whole life of a connected
+					// socket: this arm cannot fire for CClientTCPSocket or
+					// CServerSocket, which is why adding it changes nothing
+					// today. The uTP transport answers the same question on
+					// IStreamTransport, a separate hierarchy, so whatever wires
+					// a transport into CEMSocket must route IsOk() to it as
+					// well. Miss that and the arm stays dead after wiring, and
+					// the spin it exists to stop comes back silently.
+					m_bBusy = false;
+					streamIsGone = true;
+					break;
 				} else {
 					m_bBusy = false;
 				}
 			}
 
-			if (sent == sendblen){
+			if (sent == sendblen) {
 				// we are done sending the current packet. Delete it and set
 				// sendbuffer to NULL so a new packet can be fetched.
 				delete sendbuffer;
 				sendbuffer = NULL;
 				sendblen = 0;
 
-				if(!m_currentPacket_is_controlpacket) {
+				if (!m_currentPacket_is_controlpacket) {
 					m_actualPayloadSizeSent += m_actualPayloadSize;
 					m_actualPayloadSize = 0;
 
@@ -633,37 +710,31 @@
 		}
 	}
 
-	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
-		// that we only enter the queue once.
-		//printf("* Requeueing control packet on %p\n", this);
+	if (onlyAllowedToSendControlPacket &&
+		(!m_control_queue.empty() || (sendbuffer != NULL && m_currentPacket_is_controlpacket))) {
+		// Enter the control packet send queue. We may enter it several times for the same
+		// package, but that costs less overhead than ensuring we enter it only once.
 		theApp->uploadBandwidthThrottler->QueueForSendingControlPacket(this, HasSent());
 	}
 
-	//printf("* Finishing send debug on %p\n",this);
+	SocketSentBytes returnVal = {
+		!anErrorHasOccured, sentStandardPacketBytesThisCall, sentControlPacketBytesThisCall
+	};
 
-	SocketSentBytes returnVal = { !anErrorHasOccured, sentStandardPacketBytesThisCall, sentControlPacketBytesThisCall };
-
-    return returnVal;
+	return returnVal;
 }
 
-
 uint32 CEMSocket::GetNextFragSize(uint32 current, uint32 minFragSize)
 {
-    if(current % minFragSize == 0) {
-        return current;
-    } else {
-        return minFragSize*(current/minFragSize+1);
-    }
+	if (current % minFragSize == 0) {
+		return current;
+	} else {
+		return minFragSize * (current / minFragSize + 1);
+	}
 }
 
-
 /**
- * Decides the (minimum) amount the socket needs to send to prevent timeout.
- *
- * @author SlugFiller
+ * Decides the minimum amount the socket needs to send to prevent a timeout. @author SlugFiller
  */
 uint32 CEMSocket::GetNeededBytes()
 {
@@ -681,20 +752,22 @@
 		}
 
 		if (!((sendbuffer && !m_currentPacket_is_controlpacket) || !m_standard_queue.empty())) {
-			// No standard packet to send. Even if data needs to be sent to prevent timeout, there's nothing to send.
+			// No standard packet to send. Even if data needs to be sent to prevent timeout,
+			// there's nothing to send.
 			return 0;
 		}
 
 		if (((sendbuffer && !m_currentPacket_is_controlpacket)) && !m_control_queue.empty())
-			m_bAccelerateUpload = true;	// We might be trying to send a block request, accelerate packet
+			m_bAccelerateUpload =
+				true; // We might be trying to send a block request, accelerate packet
 
 		uint64 now = ::GetTickCount64();
 		sendgap = now - lastCalledSend;
 
-		timetotal = m_bAccelerateUpload?45000:90000;
+		timetotal = m_bAccelerateUpload ? 45000 : 90000;
 		timeleft = now - lastFinishedStandard;
 		if (sendbuffer && !m_currentPacket_is_controlpacket) {
-			sizeleft = sendblen-sent;
+			sizeleft = sendblen - sent;
 			sizetotal = sendblen;
 		} else {
 			sizeleft = sizetotal = m_standard_queue.front().packet->GetRealPacketSize();
@@ -703,38 +776,37 @@
 
 	if (timeleft >= timetotal)
 		return sizeleft;
-	timeleft = timetotal-timeleft;
-	if (timeleft*sizetotal >= timetotal*sizeleft) {
+	timeleft = timetotal - timeleft;
+	if (timeleft * sizetotal >= timetotal * sizeleft) {
 		// don't use 'GetTimeOut' here in case the timeout value is high,
 		if (sendgap > SEC2MS(20))
-			return 1;	// Don't let the socket itself time out - Might happen when switching from spread(non-focus) slot to trickle slot
+			return 1; // Don't let the socket itself time out - Might happen when switching from
+				  // spread(non-focus) slot to trickle slot
 		return 0;
 	}
-	uint64 decval = timeleft*sizetotal/timetotal;
+	uint64 decval = timeleft * sizetotal / timetotal;
 	if (!decval)
 		return sizeleft;
 	if (decval < sizeleft)
-		return sizeleft-decval+1;	// Round up
+		return sizeleft - decval + 1; // Round up
 	else
 		return 1;
 }
 
-
 /**
- * Removes all packets from the standard queue that don't have to be sent for the socket to be able to send a control packet.
- *
- * Before a socket can send a new packet, the current packet has to be finished. If the current packet is part of
- * a split packet, then all parts of that split packet must be sent before the socket can send a control packet.
+ * Removes every packet from the standard queue that need not be sent before the socket can send a
+ * control packet.
  *
- * This method keeps in standard queue only those packets that must be sent (rest of split packet), and removes everything
- * after it. The method doesn't touch the control packet queue.
+ * The current packet has to be finished first, and if it is part of a split packet then every part
+ * of that packet must go out before a control packet can. So this keeps only the rest of a split
+ * packet and removes everything after it. The control packet queue is untouched.
  */
 void CEMSocket::TruncateQueues()
 {
 	std::lock_guard<std::mutex> lock(m_sendLocker);
 
 	// Clear the standard queue totally
-    // Please note! There may still be a standardpacket in the sendbuffer variable!
+	// Please note! There may still be a standardpacket in the sendbuffer variable!
 	CStdPacketQueue::iterator it = m_standard_queue.begin();
 	for (; it != m_standard_queue.end(); ++it) {
 		delete it->packet;
@@ -743,13 +815,11 @@
 	m_standard_queue.clear();
 }
 
-
 uint64 CEMSocket::GetTimeOut() const
 {
 	return m_uTimeOut;
 }
 
-
 void CEMSocket::SetTimeOut(uint64 uTimeOut)
 {
 	m_uTimeOut = uTimeOut;

amule-3.0.1.tar.gz/src/EMSocket.h -> amule-3.1.0.tar.gz/src/EMSocket.h Changed

@@ -28,22 +28,20 @@
 
 #include <mutex>
 
-#include "EncryptedStreamSocket.h"				// Needed for CEncryptedStreamSocket
+#include "EncryptedStreamSocket.h" // Needed for CEncryptedStreamSocket
 
-#include "ThrottledSocket.h"	// Needed for ThrottledFileSocket
+#include "ThrottledSocket.h" // Needed for ThrottledFileSocket
 
 class CPacket;
 
-#define ERR_WRONGHEADER		0x01
-#define ERR_TOOBIG			0x02
+#define ERR_WRONGHEADER 0x01
+#define ERR_TOOBIG 0x02
 
-#define	ES_DISCONNECTED		0xFF
-#define	ES_NOTCONNECTED		0x00
-#define	ES_CONNECTED		0x01
-
-
-const uint32 PACKET_HEADER_SIZE	= 6;
+#define ES_DISCONNECTED 0xFF
+#define ES_NOTCONNECTED 0x00
+#define ES_CONNECTED 0x01
 
+const uint32 PACKET_HEADER_SIZE = 6;
 
 class CEMSocket : public CEncryptedStreamSocket, public ThrottledFileSocket
 {
@@ -51,127 +49,151 @@
 	CEMSocket(const CProxyData *ProxyData = NULL);
 	virtual ~CEMSocket();
 
-	virtual void	SendPacket(CPacket* packet, bool delpacket = true, bool controlpacket = true, uint32 actualPayloadSize = 0);
-	bool	IsConnected() { return byConnected==ES_CONNECTED;};
-	uint8	GetConState()	{return byConnected;}
-	// Re-trigger OnReceive if this socket suspended its read loop last
-	// tick because CDownloadBandwidthThrottler's bucket was empty.
-	// Called once per tick from CPartFile::Process via
-	// CUpDownClient::TickDownloadAndMeasure.
-	void	WakeIfPaused();
-
-	virtual uint64	GetTimeOut() const;
-	virtual void	SetTimeOut(uint64 uTimeOut);
-
-    uint64	GetLastCalledSend() override { return lastCalledSend; }
-
-    uint64	GetSentBytesCompleteFileSinceLastCallAndReset();
-    uint64	GetSentBytesPartFileSinceLastCallAndReset();
-    uint64	GetSentBytesControlPacketSinceLastCallAndReset();
-    uint64	GetSentPayloadSinceLastCallAndReset();
-    uint64	PeekSentPayload();   // Non-resetting peek — for disk I/O thread buffer check
-    void	TruncateQueues();
-
-    SocketSentBytes SendControlData(uint32 maxNumberOfBytesToSend, uint32 minFragSize) override { return Send(maxNumberOfBytesToSend, minFragSize, true); };
-    SocketSentBytes SendFileAndControlData(uint32 maxNumberOfBytesToSend, uint32 minFragSize) override { return Send(maxNumberOfBytesToSend, minFragSize, false); };
-
-    uint32	GetNeededBytes() override;
-    bool    HasSent() { return m_hasSent; }  // eMule ref: used by CUploadDiskIOThread to detect socket starvation
-    bool    HasQueues(bool bOnlyStandardPackets = false) const;
-    bool    IsBusyQuickCheck() const { return m_bBusy; }
-
-	// Whether OnReceive should gate reads through the global
-	// download bandwidth budget. Peer file-transfer sockets do;
-	// server-control sockets do not, since their traffic is tiny
-	// and latency-sensitive and would stall silently under a
-	// download cap tight enough to exhaust the throttler bucket.
-	virtual bool	IsDownloadThrottled() const { return true; }
-
-	//protected:
-	// these functions are public on our code because of the amuleDlg::socketHandler
-	void	OnError(int WXUNUSED(nErrorCode)) override { };
-	void	OnSend(int nErrorCode) override;
-	void	OnReceive(int nErrorCode) override;
-	void	OnConnect(int nErrorCode) override = 0;
-
-	// The Asio reactor's HandleRead dispatches peer FIN / RST via
-	// CLibSocket::OnLost(int), whose default is an empty no-op. Without
-	// an override on this path, the eD2k server socket (CServerSocket)
-	// and peer socket (CClientTCPSocket) never see the close event:
-	// CServerSocket stays at CS_CONNECTED after a server disappears
-	// (#905, #393), and peer sockets sit in CLOSE_WAIT forever as
-	// silent half-open sources. Forward to OnClose(int) so virtual
-	// dispatch reaches the per-class teardown that was already there
-	// for the (now-defunct) wxSocket close path.
+	virtual void SendPacket(CPacket *packet,
+		bool delpacket = true,
+		bool controlpacket = true,
+		uint32 actualPayloadSize = 0);
+	// The extra term is guarded so the TCP path keeps answering exactly as it
+	// did: byConnected is this class's own state machine, and only a stream the
+	// asio socket does not own can disagree with it.
+	bool IsConnected()
+	{
+		return byConnected == ES_CONNECTED && (!HasTransport() || CLibSocket::IsConnected());
+	};
+	uint8 GetConState() { return byConnected; }
+	// Re-trigger OnReceive if this socket suspended its read loop last tick because
+	// CDownloadBandwidthThrottler's bucket was empty.
+	//
+	// Two callers, once per tick each. CDownloadBandwidthThrottler::WakePaused() drives the
+	// sockets the bucket itself parked, the only wake a socket gets when it belongs to no
+	// download. CPartFile::Process(), via CUpDownClient::TickDownloadAndMeasure(), drives the
+	// downloading ones, and is the only wake for the two pendingOnReceive cases the throttler
+	// does not register: a read that would block, and a read that filled its grant with more
+	// still pending.
+	void WakeIfPaused();
+
+	virtual uint64 GetTimeOut() const;
+	virtual void SetTimeOut(uint64 uTimeOut);
+
+	uint64 GetLastCalledSend() override { return lastCalledSend; }
+
+	uint64 GetSentBytesCompleteFileSinceLastCallAndReset();
+	uint64 GetSentBytesPartFileSinceLastCallAndReset();
+	uint64 GetSentBytesControlPacketSinceLastCallAndReset();
+	uint64 GetSentPayloadSinceLastCallAndReset();
+	uint64 PeekSentPayload(); // Non-resetting peek -- for disk I/O thread buffer check
+	void TruncateQueues();
+
+	SocketSentBytes SendControlData(uint32 maxNumberOfBytesToSend, uint32 minFragSize) override
+	{
+		return Send(maxNumberOfBytesToSend, minFragSize, true);
+	};
+	SocketSentBytes SendFileAndControlData(uint32 maxNumberOfBytesToSend, uint32 minFragSize) override
+	{
+		return Send(maxNumberOfBytesToSend, minFragSize, false);
+	};
+
+	uint32 GetNeededBytes() override;
+	bool HasSent()
+	{
+		return m_hasSent;
+	} // eMule ref: used by CUploadDiskIOThread to detect socket starvation
+	bool HasQueues(bool bOnlyStandardPackets = false) const;
+	bool IsBusyQuickCheck() const { return m_bBusy; }
+
+	// Whether OnReceive should gate reads through the global download bandwidth budget. Peer
+	// file-transfer sockets do; server-control sockets do not, their traffic being tiny and
+	// latency-sensitive, and would stall silently under a download cap tight enough to exhaust
+	// the throttler bucket.
+	virtual bool IsDownloadThrottled() const { return true; }
+
+	// protected:
+	//  these functions are public on our code because of the amuleDlg::socketHandler
+	void OnError(int WXUNUSED(nErrorCode)) override {};
+	void OnSend(int nErrorCode) override;
+	void OnReceive(int nErrorCode) override;
+	void OnConnect(int nErrorCode) override = 0;
+
+	// The Asio reactor's HandleRead dispatches peer FIN / RST via CLibSocket::OnLost(int),
+	// whose default is an empty no-op. Without an override on this path, the eD2k server socket
+	// (CServerSocket) and peer socket (CClientTCPSocket) never see the close event:
+	// CServerSocket stays at CS_CONNECTED after a server disappears (#905, #393), and peer
+	// sockets sit in CLOSE_WAIT forever as silent half-open sources. Forward to OnClose(int) so
+	// virtual dispatch reaches the per-class teardown that was already there for the now-
+	// defunct wxSocket close path.
 	void OnLost(int nErrorCode) override { OnClose(nErrorCode); }
 
 protected:
+	virtual bool PacketReceived(CPacket *WXUNUSED(packet)) { return false; };
+	virtual void OnClose(int nErrorCode);
 
-	virtual bool	PacketReceived(CPacket* WXUNUSED(packet)) { return false; };
-	virtual void	OnClose(int nErrorCode);
+	//! Quiesce a socket whose stream is gone, so it can be dialled again: wait out
+	//! any send in flight on the throttler thread, drop the dead stream's queues,
+	//! and return to the pre-connection state. OnClose() leaves ES_DISCONNECTED,
+	//! which no send or receive path clears.
+	void QuiesceForRedial();
 
-	uint8	byConnected;
-	uint32	m_uTimeOut;
+	uint8 byConnected;
+	uint32 m_uTimeOut;
 
 private:
-    virtual SocketSentBytes Send(uint32 maxNumberOfBytesToSend, uint32 minFragSize, bool onlyAllowedToSendControlPacket);
-	void	ClearQueues();
+	virtual SocketSentBytes Send(
+		uint32 maxNumberOfBytesToSend, uint32 minFragSize, bool onlyAllowedToSendControlPacket);
+	void ClearQueues();
 
-    uint32	GetNextFragSize(uint32 current, uint32 minFragSize);
+	uint32 GetNextFragSize(uint32 current, uint32 minFragSize);
 
-	// Download rate control: the global cap is enforced by
-	// CDownloadBandwidthThrottler. pendingOnReceive is the only
-	// per-socket bit -- set when OnReceive() suspended its read loop
-	// because the throttler's bucket was empty, cleared on the next
-	// successful read or when WakeIfPaused() retries the loop.
-	bool	pendingOnReceive;
+	// Download rate control: the global cap is enforced by CDownloadBandwidthThrottler.
+	// pendingOnReceive is the only per-socket bit -- set when OnReceive() suspended its read
+	// loop because the throttler's bucket was empty, cleared on the next successful read or
+	// when WakeIfPaused() retries the loop.
+	bool pendingOnReceive;
 
 	// Download partial header
-	uint8	pendingHeaderPACKET_HEADER_SIZE;
-	uint32	pendingHeaderSize;
+	uint8 pendingHeaderPACKET_HEADER_SIZE;
+	uint32 pendingHeaderSize;
 
 	// Download partial packet
-	uint8*	pendingPacket;
-	uint32	pendingPacketSize;
+	uint8 *pendingPacket;
+	uint32 pendingPacketSize;
 
 	// Upload control
-	uint8*	sendbuffer;
-	uint32	sendblen;
-	uint32	sent;
+	uint8 *sendbuffer;
+	uint32 sendblen;
+	uint32 sent;
 
-	typedef std::list<CPacket*> CPacketQueue;
+	typedef std::list<CPacket *> CPacketQueue;
 	CPacketQueue m_control_queue;
 
 	struct StandardPacketQueueEntry
 	{
 		uint32 actualPayloadSize;
-		CPacket* packet;
+		CPacket *packet;
 	};
 
-	typedef	std::list<StandardPacketQueueEntry> CStdPacketQueue;
+	typedef std::list<StandardPacketQueueEntry> CStdPacketQueue;
 	CStdPacketQueue m_standard_queue;
 
-    bool m_currentPacket_is_controlpacket;
+	bool m_currentPacket_is_controlpacket;
 
-	std::mutex	m_sendLocker;
+	std::mutex m_sendLocker;
 
 	uint64 m_numberOfSentBytesCompleteFile;
-    uint64 m_numberOfSentBytesPartFile;
-    uint64 m_numberOfSentBytesControlPacket;
-    bool m_currentPackageIsFromPartFile;
+	uint64 m_numberOfSentBytesPartFile;
+	uint64 m_numberOfSentBytesControlPacket;
+	bool m_currentPackageIsFromPartFile;
 
-	bool	m_bAccelerateUpload;
-	uint64	lastCalledSend;
-	uint64	lastSent;
-	uint64	lastFinishedStandard;
+	bool m_bAccelerateUpload;
+	uint64 lastCalledSend;
+	uint64 lastSent;
+	uint64 lastFinishedStandard;
 
-    uint32 m_actualPayloadSize;
-    uint32 m_actualPayloadSizeSent;
+	uint32 m_actualPayloadSize;
+	uint32 m_actualPayloadSizeSent;
 
-    bool m_bBusy;
-    bool m_hasSent;
+	bool m_bBusy;
+	bool m_hasSent;
 };
 
-
 #endif // EMSOCKET_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/EditServerListDlg.cpp -> amule-3.1.0.tar.gz/src/EditServerListDlg.cpp Changed

@@ -23,64 +23,55 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include <wx/dialog.h>		// Needed for wxDialog	// Do_not_auto_remove
-#include <wx/sizer.h>		// Needed for wxBoxSizer
-#include <wx/file.h>		// Needed for wxFile
-#include <wx/log.h>		// Needed for wxLogSysError
+#include <wx/dialog.h> // Needed for wxDialog	// Do_not_auto_remove
+#include <wx/sizer.h>  // Needed for wxBoxSizer
+#include <wx/file.h>   // Needed for wxFile
+#include <wx/log.h>    // Needed for wxLogSysError
 #include <wx/textctrl.h>
 
-#include "EditServerListDlg.h"	// Interface declarations
+#include "EditServerListDlg.h" // Interface declarations
 
 wxBEGIN_EVENT_TABLE(EditServerListDlg, wxDialog)
-    EVT_BUTTON(wxID_OK, EditServerListDlg::OnOK)
+	EVT_BUTTON(wxID_OK, EditServerListDlg::OnOK)
 wxEND_EVENT_TABLE()
 
-
-EditServerListDlg::EditServerListDlg(wxWindow *parent,
-                                     const wxString& caption,
-                                     const wxString& message,
-				     const wxString& filename) : wxDialog(parent, -1, caption,
-								      wxDefaultPosition, wxSize(400,200),
-								      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+EditServerListDlg::EditServerListDlg(
+	wxWindow *parent, const wxString &caption, const wxString &message, const wxString &filename)
+: wxDialog(parent, -1, caption, wxDefaultPosition, wxSize(400, 200), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
-  m_file = filename;
+	m_file = filename;
 
-  wxBeginBusyCursor();
+	wxBeginBusyCursor();
 
-  wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
 
-  topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
+	topsizer->Add(CreateTextSizer(message), 0, wxALL, 10);
 
-  m_textctrl = new wxTextCtrl(this, -1, "",
-			      wxDefaultPosition,
-			      wxDefaultSize,
-			      wxTE_MULTILINE);
-  topsizer->Add( m_textctrl, wxSizerFlags(1).Expand().Border(wxLEFT|wxRIGHT, 15) );
+	m_textctrl = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
+	topsizer->Add(m_textctrl, wxSizerFlags(1).Expand().Border(wxLEFT | wxRIGHT, 15));
 
-  topsizer->Add( CreateButtonSizer( wxOK | wxCANCEL ), wxSizerFlags().Center().Border(wxALL, 10) );
+	topsizer->Add(CreateButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Center().Border(wxALL, 10));
 
-  SetAutoLayout( TRUE );
-  SetSizer( topsizer );
+	SetAutoLayout(TRUE);
+	SetSizer(topsizer);
 
-  Centre( wxBOTH );
+	Centre(wxBOTH);
 
-  if (wxFile::Exists(filename))
-	m_textctrl->LoadFile(filename);
+	if (wxFile::Exists(filename))
+		m_textctrl->LoadFile(filename);
 
-  m_textctrl->SetFocus();
+	m_textctrl->SetFocus();
 
-  wxEndBusyCursor();
+	wxEndBusyCursor();
 }
 
-EditServerListDlg::~EditServerListDlg()
-{
-}
+EditServerListDlg::~EditServerListDlg() {}
 
-void EditServerListDlg::OnOK(wxCommandEvent& WXUNUSED(event) )
+void EditServerListDlg::OnOK(wxCommandEvent &WXUNUSED(event))
 {
 	if (m_textctrl->SaveFile(m_file))
 		EndModal(1);
 	else
-		wxLogSysError("Can't write to file '" +  m_file + "'");
+		wxLogSysError("Can't write to file '" + m_file + "'");
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/EditServerListDlg.h -> amule-3.1.0.tar.gz/src/EditServerListDlg.h Changed

amule-3.0.1.tar.gz/src/EncryptedDatagramSocket.cpp -> amule-3.1.0.tar.gz/src/EncryptedDatagramSocket.cpp Changed

@@ -23,72 +23,45 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-/* Basic Obfuscated Handshake Protocol UDP:
-	see EncryptedStreamSocket.h
-
-****************************** ED2K Packets
-
-- Keycreation Client <-> Client:
-	- Client A (Outgoing connection):
-		Sendkey: Md5(<UserHashClientB 16><IPClientA 4><MagicValue91 1><RandomKeyPartClientA 2>)  23
-	- 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 save CPU time
-
-	- Handshake
-		-> The handshake is encrypted - except otherwise noted - by the Keys created above
-		-> 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 BitsUnencrypted><ED2K Marker 1Bit = 1><RandomKeyPart 2Unencrypted><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 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:
-	- Client A (Outgoing connection client -> server):
-		Sendkey: Md5(<BaseKey 4><MagicValueClientServer 1><RandomKeyPartClientA 2>)  7
-	- 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 save CPU time
-
-	- Handshake
-		-> The handshake is encrypted - except otherwise noted - by the Keys created above
-		-> 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 1Unencrypted><RandomKeyPart 2Unencrypted><MagicValue 4><PaddingLen 1><RandomBytes PaddingLen%16>
-
-	- Overhead: 8 Bytes per UDP Packet
-
-	- 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 compromise, turning in complete randomness (and nice design) but gaining a lower CPU usage
-
-****************************** KAD Packets
-
-- Keycreation Client <-> Client:
-	- Client A (Outgoing connection):
-		Sendkey: Md5(<KadID 16><RandomKeyPartClientA 2>)  18
-	- Client B (Incoming connection):
-		Receivekey: Md5(<KadID 16><RandomKeyPartClientA 2>)  18
-	- 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 currently not used for UDP meaning that PaddingLen will be 0, using PaddingLens up to 16 Bytes is acceptable however
-		Client A: <SemiRandomNotProtocolMarker 7 BitsUnencrypted><Kad Marker 1Bit = 0><RandomKeyPart 2Unencrypted><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 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
-*/
+/* Basic Obfuscated Handshake Protocol, UDP. See EncryptedStreamSocket.h.
+ *
+ * Common to all three: the first 1024 bytes are _NOT_ discarded for UDP keys, to save CPU time. The
+ * handshake is encrypted with the keys below unless noted. Padding is currently unused for UDP, so
+ * PaddingLen is 0, though lengths up to 16 bytes are acceptable.
+ *
+ * ED2K packets. Key creation client <-> client:
+ *     A (outgoing): Sendkey    = Md5(<UserHashClientB 16><IPClientA 4><MagicValue91 1>
+ *                                    <RandomKeyPartClientA 2>)  23
+ *     B (incoming): Receivekey = the same 23 bytes.
+ *     A sends: <SemiRandomNotProtocolMarker 7 bitsplain><ED2K Marker 1 bit = 1>
+ *              <RandomKeyPart 2plain><MagicValue 4><PaddingLen 1><RandomBytes PaddingLen%16>
+ *
+ * Server packets. Key creation client <-> server:
+ *     A (client -> server): Sendkey    = Md5(<BaseKey 4><MagicValueClientServer 1>
+ *                                            <RandomKeyPartClientA 2>)  7
+ *     B (incoming):         Receivekey = Md5(<BaseKey 4><MagicValueServerClient 1>
+ *                                            <RandomKeyPartClientA 2>)  7
+ *     A sends: <SemiRandomNotProtocolMarker 1plain><RandomKeyPart 2plain><MagicValue 4>
+ *              <PaddingLen 1><RandomBytes PaddingLen%16>
+ *     Overhead: 8 bytes per UDP packet.
+ *
+ * KAD packets. Key creation client <-> client:
+ *     A (outgoing): Sendkey    = Md5(<KadID 16><RandomKeyPartClientA 2>)  18
+ *     B (incoming): Receivekey = the same 18 bytes.
+ *     A sends: <SemiRandomNotProtocolMarker 7 bitsplain><Kad Marker 1 bit = 0>
+ *              <RandomKeyPart 2plain><MagicValue 4><PaddingLen 1><RandomBytes PaddingLen%16>
+ *              <ReceiverVerifyKey 2><SenderVerifyKey 2>
+ *     Overhead: 12 bytes per UDP packet.
+ *
+ * Security for basic obfuscation: random-looking packets, very limited protection against passive
+ * eavesdropping on single packets.
+ *
+ * The UDP handshake is, for obvious reasons, no handshake at all: a different encryption method, or
+ * better a different key, has to be negotiated over TCP. SemiRandomNotProtocolMarker is a byte
+ * whose value differs from every protocol header byte -- a compromise, giving up complete
+ * randomness and nice design for lower CPU usage. The Kad and ed2k markers are only indicators of
+ * which possibility to try first, and are not to be trusted.
+ */
 
 #include "EncryptedDatagramSocket.h"
 #include "amule.h"
@@ -104,23 +77,29 @@
 #include <common/MD5Sum.h>
 
 // random generator
-#include "CryptoPP_Inc.h"	// Needed for Crypto functions
-
-#define CRYPT_HEADER_WITHOUTPADDING		    8
-#define	MAGICVALUE_UDP						91
-#define MAGICVALUE_UDP_SYNC_CLIENT			0x395F2EC1
-#define MAGICVALUE_UDP_SYNC_SERVER			0x13EF24D5
-#define	MAGICVALUE_UDP_SERVERCLIENT			0xA5
-#define	MAGICVALUE_UDP_CLIENTSERVER			0x6B
-
-CEncryptedDatagramSocket::CEncryptedDatagramSocket(amuleIPV4Address &address, muleSocketFlags flags, const CProxyData *proxyData)
-	: CDatagramSocketProxy(address, flags, proxyData)
-{}
+#include "CryptoPP_Inc.h" // Needed for Crypto functions
+
+#define CRYPT_HEADER_WITHOUTPADDING 8
+#define MAGICVALUE_UDP 91
+#define MAGICVALUE_UDP_SYNC_CLIENT 0x395F2EC1
+#define MAGICVALUE_UDP_SYNC_SERVER 0x13EF24D5
+#define MAGICVALUE_UDP_SERVERCLIENT 0xA5
+#define MAGICVALUE_UDP_CLIENTSERVER 0x6B
+
+CEncryptedDatagramSocket::CEncryptedDatagramSocket(
+	amuleIPV4Address &address, muleSocketFlags flags, const CProxyData *proxyData)
+: CDatagramSocketProxy(address, flags, proxyData)
+{
+}
 
-CEncryptedDatagramSocket::~CEncryptedDatagramSocket()
-{}
+CEncryptedDatagramSocket::~CEncryptedDatagramSocket() {}
 
-int CEncryptedDatagramSocket::DecryptReceivedClient(uint8_t *bufIn, int bufLen, uint8_t **bufOut, uint32_t ip, uint32_t *receiverVerifyKey, uint32_t *senderVerifyKey)
+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;
@@ -138,22 +117,21 @@
 	}
 
 	switch (bufIn0) {
-		case OP_EMULEPROT:
-		case OP_KADEMLIAPACKEDPROT:
-		case OP_KADEMLIAHEADER:
-		case OP_UDPRESERVEDPROT1:
-		case OP_UDPRESERVEDPROT2:
-		case OP_PACKEDPROT:
-			return result; // no encrypted packet (see description on top)
-		default:
-			;
+	case OP_EMULEPROT:
+	case OP_KADEMLIAPACKEDPROT:
+	case OP_KADEMLIAHEADER:
+	case OP_UDPRESERVEDPROT1:
+	case OP_UDPRESERVEDPROT2:
+	case OP_PACKEDPROT:
+		return result; // no encrypted packet (see description on top)
+	default:;
 	}
 
 	// might be an encrypted packet, try to decrypt
 	CRC4EncryptableBuffer receivebuffer;
 	uint32_t value = 0;
-	// check the marker bit which type this packet could be and which key to test first, this is only an indicator since old clients have it set random
-	// see the header for marker bits explanation
+	// check the marker bit which type this packet could be and which key to test first, this is only an
+	// indicator since old clients have it set random see the header for marker bits explanation
 	uint8_t currentTry = ((bufIn0 & 0x03) == 3) ? 1 : (bufIn0 & 0x03);
 	uint8_t tries;
 	if (Kademlia::CKademlia::GetPrefs() == NULL) {
@@ -174,7 +152,8 @@
 			kad = true;
 			if (Kademlia::CKademlia::GetPrefs()) {
 				uint8_t keyData18;
-				Kademlia::CKademlia::GetPrefs()->GetKadID().StoreCryptValue((uint8_t *)&keyData);
+				Kademlia::CKademlia::GetPrefs()->GetKadID().StoreCryptValue(
+					(uint8_t *)&keyData);
 				memcpy(keyData + 16, bufIn + 1, 2); // random key part sent from remote client
 				md5.Calculate(keyData, sizeof(keyData));
 			}
@@ -201,30 +180,23 @@
 		}
 
 		receivebuffer.SetKey(md5, true);
-		receivebuffer.RC4Crypt(bufIn + 3, (uint8_t*)&value, sizeof(value));
+		receivebuffer.RC4Crypt(bufIn + 3, (uint8_t *)&value, sizeof(value));
 		ENDIAN_SWAP_I_32(value);
 
 		currentTry = (currentTry + 1) % 3;
-	} while (value != MAGICVALUE_UDP_SYNC_CLIENT && tries > 0); // try to decrypt as ed2k as well as kad packet if needed (max 3 rounds)
+	} while (value != MAGICVALUE_UDP_SYNC_CLIENT &&
+		 tries > 0); // try to decrypt as ed2k as well as kad packet if needed (max 3 rounds)
 
 	if (value == MAGICVALUE_UDP_SYNC_CLIENT) {
 		// yup this is an encrypted packet
-//		// debugoutput notices
-//		// the following cases are "allowed" but shouldn't happen given that there is only our implementation yet
-//		if (bKad && (pbyBufIn0 & 0x01) != 0)
-//			DebugLog(_T("Received obfuscated UDP packet from clientIP: %s with wrong key marker bits (kad packet, ed2k bit)"), ipstr(dwIP));
-//		else if (bKad && !bKadRecvKeyUsed && (pbyBufIn0 & 0x02) != 0)
-//			DebugLog(_T("Received obfuscated UDP packet from clientIP: %s with wrong key marker bits (kad packet, nodeid key, recvkey bit)"), ipstr(dwIP));
-//		else if (bKad && bKadRecvKeyUsed && (pbyBufIn0 & 0x02) == 0)
-//			DebugLog(_T("Received obfuscated UDP packet from clientIP: %s with wrong key marker bits (kad packet, recvkey key, nodeid bit)"), ipstr(dwIP));
 
 		uint8_t padLen;
-		receivebuffer.RC4Crypt(bufIn + 7, (uint8_t*)&padLen, 1);
+		receivebuffer.RC4Crypt(bufIn + 7, (uint8_t *)&padLen, 1);
 		result -= CRYPT_HEADER_WITHOUTPADDING;
 
 		if (result <= padLen) {
-			//DebugLogError(_T("Invalid obfuscated UDP packet from clientIP: %s, Paddingsize (%u) larger than received bytes"), ipstr(dwIP), byPadLen);
-			return bufLen; // pass through, let the Receivefunction do the errorhandling on this junk
+			return bufLen; // pass through, let the Receivefunction do the errorhandling on this
+				       // junk
 		}
 
 		if (padLen > 0) {
@@ -235,12 +207,16 @@
 
 		if (kad) {
 			if (result <= 8) {
-				//DebugLogError(_T("Obfuscated Kad packet with mismatching size (verify keys missing) received from clientIP: %s"), ipstr(dwIP));
-				return bufLen; // pass through, let the Receivefunction do the errorhandling on this junk;
+				return bufLen; // pass through, let the Receivefunction do the errorhandling
+					       // on this junk;
 			}
 			// read the verify keys
-			receivebuffer.RC4Crypt(bufIn + CRYPT_HEADER_WITHOUTPADDING + padLen, (uint8_t*)receiverVerifyKey, 4);
-			receivebuffer.RC4Crypt(bufIn + CRYPT_HEADER_WITHOUTPADDING + padLen + 4, (uint8_t*)senderVerifyKey, 4);
+			receivebuffer.RC4Crypt(bufIn + CRYPT_HEADER_WITHOUTPADDING + padLen,
+				(uint8_t *)receiverVerifyKey,
+				4);
+			receivebuffer.RC4Crypt(bufIn + CRYPT_HEADER_WITHOUTPADDING + padLen + 4,
+				(uint8_t *)senderVerifyKey,
+				4);
 			ENDIAN_SWAP_I_32(*receiverVerifyKey);
 			ENDIAN_SWAP_I_32(*senderVerifyKey);
 			result -= 8;
@@ -248,27 +224,31 @@
 
 		*bufOut = bufIn + (bufLen - result);
 
-		receivebuffer.RC4Crypt((uint8_t*)*bufOut, (uint8_t*)*bufOut, result);
+		receivebuffer.RC4Crypt((uint8_t *)*bufOut, (uint8_t *)*bufOut, result);
 		theStats::AddDownOverheadCrypt(bufLen - result);
 		return result; // done
 	} else {
-		//DebugLogWarning(_T("Obfuscated packet expected but magicvalue mismatch on UDP packet from clientIP: %s"), ipstr(dwIP));
 		return bufLen; // pass through, let the Receivefunction do the errorhandling on this junk
 	}
 }
 
-// Encrypt packet. Key used:
-// 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)
+// Encrypt a packet. Key used:
+//   clientHashOrKadID != NULL                                 -> clientHashOrKadID
+//   clientHashOrKadID == NULL && kad && receiverVerifyKey != 0 -> receiverVerifyKey
+//   otherwise                                                  -> 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);
 	wxASSERT(thePrefs::IsClientCryptLayerSupported());
 	wxASSERT(clientHashOrKadID != NULL || receiverVerifyKey != 0);
 	wxASSERT((receiverVerifyKey == 0 && senderVerifyKey == 0) || kad);
 
-	uint8_t padLen = 0;			// padding disabled for UDP currently
+	uint8_t padLen = 0; // padding disabled for UDP currently
 	const uint32_t cryptHeaderLen = padLen + CRYPT_HEADER_WITHOUTPADDING + (kad ? 8 : 0);
 	uint32_t cryptedLen = bufLen + cryptHeaderLen;
 	uint8_t *cryptedBuffer = new uint8_tcryptedLen;
@@ -278,31 +258,28 @@
 	CRC4EncryptableBuffer sendbuffer;
 	MD5Sum md5;
 	if (kad) {
-		if ((clientHashOrKadID == NULL || CMD4Hash(clientHashOrKadID).IsEmpty()) && receiverVerifyKey != 0) {
+		if ((clientHashOrKadID == NULL || CMD4Hash(clientHashOrKadID).IsEmpty()) &&
+			receiverVerifyKey != 0) {
 			kadRecvKeyUsed = true;
 			uint8_t keyData6;
 			PokeUInt32(keyData, receiverVerifyKey);
-			PokeUInt16(keyData+4, randomKeyPart);
+			PokeUInt16(keyData + 4, randomKeyPart);
 			md5.Calculate(keyData, sizeof(keyData));
-			//DEBUG_ONLY( DebugLog(_T("Creating obfuscated Kad packet encrypted by ReceiverKey (%u)"), nReceiverVerifyKey) );
-		}
-		else if (clientHashOrKadID != NULL && !CMD4Hash(clientHashOrKadID).IsEmpty()) {
+		} else if (clientHashOrKadID != NULL && !CMD4Hash(clientHashOrKadID).IsEmpty()) {
 			uint8_t keyData18;
 			md4cpy(keyData, clientHashOrKadID);
-			PokeUInt16(keyData+16, randomKeyPart);
+			PokeUInt16(keyData + 16, randomKeyPart);
 			md5.Calculate(keyData, sizeof(keyData));
-			//DEBUG_ONLY( DebugLog(_T("Creating obfuscated Kad packet encrypted by Hash/NodeID %s"), md4str(pachClientHashOrKadID)) );
-		}
-		else {
-			delete  cryptedBuffer;
+		} else {
+			delete cryptedBuffer;
 			wxFAIL;
 			return bufLen;
 		}
 	} else {
 		uint8_t keyData23;
 		md4cpy(keyData, clientHashOrKadID);
-		PokeUInt32(keyData+16, theApp->GetPublicIP());
-		PokeUInt16(keyData+21, randomKeyPart);
+		PokeUInt32(keyData + 16, theApp->GetPublicIP());
+		PokeUInt16(keyData + 21, randomKeyPart);
 		keyData20 = MAGICVALUE_UDP;
 		md5.Calculate(keyData, sizeof(keyData));
 	}
@@ -314,10 +291,14 @@
 	int i;
 	for (i = 0; i < 128; i++) {
 		semiRandomNotProtocolMarker = GetRandomUint8();
-		semiRandomNotProtocolMarker = kad ? (semiRandomNotProtocolMarker & 0xFE) : (semiRandomNotProtocolMarker | 0x01); // set the ed2k/kad marker bit
+		semiRandomNotProtocolMarker =
+			kad ? (semiRandomNotProtocolMarker & 0xFE)
+			    : (semiRandomNotProtocolMarker | 0x01); // set the ed2k/kad marker bit
 		if (kad) {
 			// set the ed2k/kad and nodeid/recvkey markerbit
-			semiRandomNotProtocolMarker = kadRecvKeyUsed ? ((semiRandomNotProtocolMarker & 0xFE) | 0x02) : (semiRandomNotProtocolMarker & 0xFC);
+			semiRandomNotProtocolMarker = kadRecvKeyUsed
+							      ? ((semiRandomNotProtocolMarker & 0xFE) | 0x02)
+							      : (semiRandomNotProtocolMarker & 0xFC);
 		} else {
 			// set the ed2k/kad marker bit
 			semiRandomNotProtocolMarker = (semiRandomNotProtocolMarker | 0x01);
@@ -325,15 +306,15 @@
 
 		bool bOk = false;
 		switch (semiRandomNotProtocolMarker) { // not allowed values
-			case OP_EMULEPROT:
-			case OP_KADEMLIAPACKEDPROT:
-			case OP_KADEMLIAHEADER:
-			case OP_UDPRESERVEDPROT1:
-			case OP_UDPRESERVEDPROT2:
-			case OP_PACKEDPROT:
-				break;
-			default:
-				bOk = true;
+		case OP_EMULEPROT:
+		case OP_KADEMLIAPACKEDPROT:
+		case OP_KADEMLIAHEADER:
+		case OP_UDPRESERVEDPROT1:
+		case OP_UDPRESERVEDPROT2:
+		case OP_PACKEDPROT:
+			break;
+		default:
+			bOk = true;
 		}
 
 		if (bOk) {
@@ -351,39 +332,46 @@
 	PokeUInt16(cryptedBuffer + 1, randomKeyPart);
 
 	uint32_t magicValue = ENDIAN_SWAP_32(MAGICVALUE_UDP_SYNC_CLIENT);
-	sendbuffer.RC4Crypt((uint8_t*)&magicValue, cryptedBuffer + 3, 4);
-	sendbuffer.RC4Crypt((uint8_t*)&padLen, cryptedBuffer + 7, 1);
+	sendbuffer.RC4Crypt((uint8_t *)&magicValue, cryptedBuffer + 3, 4);
+	sendbuffer.RC4Crypt((uint8_t *)&padLen, cryptedBuffer + 7, 1);
 
 	for (int j = 0; j < padLen; j++) {
-		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, cryptedBuffer + 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, cryptedBuffer + CRYPT_HEADER_WITHOUTPADDING + j, 1);
 	}
 
 	if (kad) {
 		ENDIAN_SWAP_I_32(receiverVerifyKey);
 		ENDIAN_SWAP_I_32(senderVerifyKey);
-		sendbuffer.RC4Crypt((uint8_t*)&receiverVerifyKey, cryptedBuffer + CRYPT_HEADER_WITHOUTPADDING + padLen, 4);
-		sendbuffer.RC4Crypt((uint8_t*)&senderVerifyKey, cryptedBuffer + CRYPT_HEADER_WITHOUTPADDING + padLen + 4, 4);
+		sendbuffer.RC4Crypt((uint8_t *)&receiverVerifyKey,
+			cryptedBuffer + CRYPT_HEADER_WITHOUTPADDING + padLen,
+			4);
+		sendbuffer.RC4Crypt((uint8_t *)&senderVerifyKey,
+			cryptedBuffer + CRYPT_HEADER_WITHOUTPADDING + padLen + 4,
+			4);
 	}
 
 	sendbuffer.RC4Crypt(*buf, cryptedBuffer + cryptHeaderLen, bufLen);
-	delete  *buf;
+	delete *buf;
 	*buf = cryptedBuffer;
 
 	theStats::AddUpOverheadCrypt(cryptedLen - bufLen);
 	return cryptedLen;
 }
 
-int CEncryptedDatagramSocket::DecryptReceivedServer(uint8_t* pbyBufIn, int nBufLen, uint8_t **ppbyBufOut, uint32_t dwBaseKey, uint32_t /*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) {
+	if (nResult <= CRYPT_HEADER_WITHOUTPADDING || !thePrefs::IsServerCryptLayerUDPEnabled() ||
+		dwBaseKey == 0) {
 		return nResult;
 	}
 
-	if(pbyBufIn0 == OP_EDONKEYPROT) {
+	if (pbyBufIn0 == OP_EDONKEYPROT) {
 		return nResult; // no encrypted packet (see description on top)
 	}
 
@@ -395,22 +383,23 @@
 
 	CRC4EncryptableBuffer receivebuffer;
 	MD5Sum md5(achKeyData, sizeof(achKeyData));
-	receivebuffer.SetKey(md5,true);
+	receivebuffer.SetKey(md5, true);
 
 	uint32_t dwValue;
-	receivebuffer.RC4Crypt(pbyBufIn + 3, (uint8_t*)&dwValue, sizeof(dwValue));
+	receivebuffer.RC4Crypt(pbyBufIn + 3, (uint8_t *)&dwValue, sizeof(dwValue));
 	ENDIAN_SWAP_I_32(dwValue);
 	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_t byPadLen;
-		receivebuffer.RC4Crypt(pbyBufIn + 7, (uint8_t*)&byPadLen, 1);
+		receivebuffer.RC4Crypt(pbyBufIn + 7, (uint8_t *)&byPadLen, 1);
 		byPadLen &= 15;
 		nResult -= CRYPT_HEADER_WITHOUTPADDING;
 
 		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
+			// 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) {
@@ -419,20 +408,21 @@
 
 		nResult -= byPadLen;
 		*ppbyBufOut = pbyBufIn + (nBufLen - nResult);
-		receivebuffer.RC4Crypt((uint8_t*)*ppbyBufOut, (uint8_t*)*ppbyBufOut, nResult);
+		receivebuffer.RC4Crypt((uint8_t *)*ppbyBufOut, (uint8_t *)*ppbyBufOut, nResult);
 
 		theStats::AddDownOverheadCrypt(nBufLen - nResult);
 		return nResult; // done
 	} else {
-		//DebugLogWarning(_T("Obfuscated packet expected but magicvalue mismatch on UDP packet from ServerIP: %s"), ipstr(dbgIP));
+		// DebugLogWarning(_T("Obfuscated packet expected but magicvalue mismatch on UDP packet from
+		// ServerIP: %s"), ipstr(dbgIP));
 		return nBufLen; // pass through, let the Receivefunction do the errorhandling on this junk
 	}
 }
 
-int CEncryptedDatagramSocket::EncryptSendServer(uint8_t** ppbyBuf, int nBufLen, uint32_t dwBaseKey)
+int CEncryptedDatagramSocket::EncryptSendServer(uint8_t **ppbyBuf, int nBufLen, uint32_t dwBaseKey)
 {
-	wxASSERT( thePrefs::IsServerCryptLayerUDPEnabled() );
-	wxASSERT( dwBaseKey != 0 );
+	wxASSERT(thePrefs::IsServerCryptLayerUDPEnabled());
+	wxASSERT(dwBaseKey != 0);
 
 	uint16_t nRandomKeyPart = GetRandomUint16();
 
@@ -461,21 +451,23 @@
 		bySemiRandomNotProtocolMarker = 0x01;
 	}
 
-	uint8_t byPadLen = 0;			// padding disabled for UDP currently
+	uint8_t byPadLen = 0; // padding disabled for UDP currently
 	uint32_t nCryptedLen = nBufLen + byPadLen + CRYPT_HEADER_WITHOUTPADDING;
-	uint8_t* pachCryptedBuffer = new uint8_tnCryptedLen;
+	uint8_t *pachCryptedBuffer = new uint8_tnCryptedLen;
 
 	pachCryptedBuffer0 = bySemiRandomNotProtocolMarker;
 	PokeUInt16(pachCryptedBuffer + 1, nRandomKeyPart);
 
 	uint32_t dwMagicValue = ENDIAN_SWAP_32(MAGICVALUE_UDP_SYNC_SERVER);
-	sendbuffer.RC4Crypt((uint8_t*)&dwMagicValue, pachCryptedBuffer + 3, 4);
+	sendbuffer.RC4Crypt((uint8_t *)&dwMagicValue, pachCryptedBuffer + 3, 4);
 
-	sendbuffer.RC4Crypt((uint8_t*)&byPadLen, pachCryptedBuffer + 7, 1);
+	sendbuffer.RC4Crypt((uint8_t *)&byPadLen, pachCryptedBuffer + 7, 1);
 
-	for (int j = 0; j < byPadLen; j++){
-		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);
+	for (int j = 0; j < byPadLen; j++) {
+		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-3.0.1.tar.gz/src/EncryptedDatagramSocket.h -> amule-3.1.0.tar.gz/src/EncryptedDatagramSocket.h Changed

@@ -32,16 +32,28 @@
 class CEncryptedDatagramSocket : public CDatagramSocketProxy
 {
 public:
-	CEncryptedDatagramSocket(amuleIPV4Address &address, muleSocketFlags flags = MULE_SOCKET_NONE, const CProxyData *proxyData = NULL);
+	CEncryptedDatagramSocket(amuleIPV4Address &address,
+		muleSocketFlags flags = MULE_SOCKET_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_t* pbyBufIn, int nBufLen, uint8_t** ppbyBufOut, uint32_t dwBaseKey, uint32_t dbgIP);
-	static int EncryptSendServer(uint8_t** ppbyBuf, int nBufLen, uint32_t dwBaseKey);
+	// 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_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-3.0.1.tar.gz/src/EncryptedStreamSocket.cpp -> amule-3.1.0.tar.gz/src/EncryptedStreamSocket.cpp Changed

@@ -23,64 +23,56 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-/* Basic Obfuscated Handshake Protocol Client <-> Client:
-	- 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 (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
-
-	- 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 A: <SemiRandomNotProtocolMarker 1Unencrypted><RandomKeyPart 4Unencrypted><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 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 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 authentication
-
-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 (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 1Unencrypted><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
-*/
+/* Basic Obfuscated Handshake Protocol, client <-> client.
+ *
+ * Key creation, client A (outgoing connection):
+ *     Sendkey    = Md5(<UserHashClientB 16><MagicValue34 1><RandomKeyPartClientA 4>)   21
+ *     Receivekey = Md5(<UserHashClientB 16><MagicValue203 1><RandomKeyPartClientA 4>)  21
+ * Client B (incoming connection): the two are swapped. The first 1024 bytes are discarded.
+ *
+ * Handshake: encrypted with the keys above unless noted, and blocking -- do not start sending an
+ * answer before the request is completely received, random bytes included. EncryptionMethod = 0 is
+ * Obfuscation, the only method supported right now.
+ *     A: <SemiRandomNotProtocolMarker 1plain><RandomKeyPart 4plain><MagicValue 4>
+ *        <EncryptionMethodsSupported 1><EncryptionMethodPreferred 1><PaddingLen 1>
+ *        <RandomBytes PaddingLen%max256>
+ *     B: <MagicValue 4><EncryptionMethodsSelected 1><PaddingLen 1><RandomBytes PaddingLen%max256>
+ * The basic handshake finishes here; a different EncryptionMethod may negotiate further details.
+ *
+ * Overhead: 18-48 (~33) bytes plus 2 x IP/TCP headers per connection. Security: a random-looking
+ * stream, very limited protection against passive eavesdropping on single connections.
+ *
+ * RandomKeyPart makes several connections between two clients look different but still random;
+ * without it the same key would be reused and RC4 would produce the same output. The key is an MD5
+ * hash, so knowing that part does not weaken it.
+ *
+ * Why DH key agreement is not used as the basic obfuscation key: it offers no substantial extra
+ * protection against passive connection-based protocol identification, costs about 200 bytes more
+ * overhead and more CPU, cannot tell junk from unencrypted data or from part of the key agreement
+ * before the handshake is finished without losing all randomness, and offers no substantial
+ * protection against eavesdropping without added authentication.
+ *
+ *
+ * Basic Obfuscated Handshake Protocol, client <-> server.
+ *
+ * RC4 key creation, client (outgoing connection):
+ *     Sendkey    = Md5(<S 96><MagicValue34 1>)   97
+ *     Receivekey = Md5(<S 96><MagicValue203 1>)  97
+ * Server (incoming connection): the two are swapped. The first 1024 bytes are discarded.
+ *
+ * Handshake: same rules as above.
+ *     Client: <SemiRandomNotProtocolMarker 1plain><G^A 96plain><RandomBytes 0-15plain>
+ *     Server: <G^B 96plain><MagicValue 4><EncryptionMethodsSupported 1>
+ *             <EncryptionMethodPreferred 1><PaddingLen 1><RandomBytes PaddingLen>
+ *     Client: <MagicValue 4><EncryptionMethodsSelected 1><PaddingLen 1><RandomBytes PaddingLen>
+ *             (delayed until the first payload, to save a frame)
+ * The basic handshake finishes here; a different EncryptionMethod may negotiate further details.
+ *
+ * Overhead: 206-251 (~229) bytes plus 2 x IP/TCP 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.
+ */
 #include "EncryptedStreamSocket.h"
+#include "StreamTransport.h"
 #include "amule.h"
 #include "Logger.h"
 #include "Preferences.h"
@@ -95,22 +87,108 @@
 #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 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
-};
+#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 };
 
 // winsock2.h already defines it
 #ifdef SOCKET_ERROR
@@ -118,7 +196,8 @@
 #endif
 #define SOCKET_ERROR (-1)
 
-CEncryptedStreamSocket::CEncryptedStreamSocket(muleSocketFlags flags, const CProxyData *proxyData) : CSocketClientProxy(flags, proxyData)
+CEncryptedStreamSocket::CEncryptedStreamSocket(muleSocketFlags flags, const CProxyData *proxyData)
+: CSocketClientProxy(flags, proxyData)
 {
 	m_StreamCryptState = thePrefs::IsClientCryptLayerSupported() ? ECS_UNKNOWN : ECS_NONE;
 	m_NegotiatingState = ONS_NONE;
@@ -133,13 +212,18 @@
 	m_bServerCrypt = false;
 }
 
-CEncryptedStreamSocket::~CEncryptedStreamSocket()
-{}
-
+CEncryptedStreamSocket::~CEncryptedStreamSocket() {}
 
 /* External interface */
 
-void CEncryptedStreamSocket::SetConnectionEncryption(bool bEnabled, const uint8_t* pTargetClientHash, bool bServerConnection)
+bool CEncryptedStreamSocket::TransportObfuscates() const
+{
+	const IStreamTransport *transport = GetTransport();
+	return transport != nullptr && transport->ObfuscatesStream();
+}
+
+void CEncryptedStreamSocket::SetConnectionEncryption(
+	bool bEnabled, const uint8_t *pTargetClientHash, bool bServerConnection)
 {
 	if (m_StreamCryptState != ECS_UNKNOWN && m_StreamCryptState != ECS_NONE) {
 		if (bEnabled) {
@@ -148,6 +232,13 @@
 		return;
 	}
 
+	if (bEnabled && TransportObfuscates()) {
+		// A second handshake inside frames the transport already obfuscates
+		// would encrypt the stream twice, and eMuleAI skips it on uTP too.
+		m_StreamCryptState = ECS_NONE;
+		return;
+	}
+
 	if (bEnabled && pTargetClientHash != NULL && !bServerConnection) {
 		m_StreamCryptState = ECS_PENDING;
 		// create obfuscation keys, see on top for key format
@@ -168,11 +259,10 @@
 		m_pfiReceiveBuffer.SetKey(md5);
 
 	} else if (bServerConnection && bEnabled) {
-		//printf("->Server crypt\n");
 		m_bServerCrypt = true;
 		m_StreamCryptState = ECS_PENDING_SERVER;
 	} else {
-		wxASSERT( !bEnabled );
+		wxASSERT(!bEnabled);
 		m_StreamCryptState = ECS_NONE;
 	}
 }
@@ -181,180 +271,167 @@
 
 // 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, uint32_t nBufLen)
+int CEncryptedStreamSocket::Write(const void *lpBuf, uint32_t nBufLen)
 {
-	//printf("Starting write for %s\n", (const char*) unicode2char(GetPeer()));
 	if (!IsEncryptionLayerReady()) {
 		wxFAIL;
 		return 0;
 	} else if (m_bServerCrypt && m_StreamCryptState == ECS_ENCRYPTING && !m_pfiSendBuffer.IsEmpty()) {
-		wxASSERT( m_NegotiatingState == ONS_BASIC_SERVER_DELAYEDSENDING );
+		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
 		int nRes = SendNegotiatingData(lpBuf, nBufLen, nBufLen);
-		wxASSERT( nRes != SOCKET_ERROR );
+		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
+		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) {
 		wxFAIL;
 	}
 
 	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
+		// 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)"), GetPeer());
 	}
 
-	//printf("Writing %i bytes of data\n", nBufLen);
 	return CSocketClientProxy::Write(lpBuf, nBufLen);
 }
 
-int CEncryptedStreamSocket::Read(void* lpBuf, uint32_t nBufLen)
+int CEncryptedStreamSocket::Read(void *lpBuf, uint32_t nBufLen)
 {
 	m_nObfusicationBytesReceived = CSocketClientProxy::Read(lpBuf, nBufLen);
 	m_bFullReceive = m_nObfusicationBytesReceived == (uint32)nBufLen;
 
-	//printf("Read %i bytes on %s, socket %p\n", m_nObfusicationBytesReceived, (const char*) unicode2char(GetPeer()), this);
-
 	if (m_nObfusicationBytesReceived == (uint32_t)SOCKET_ERROR || m_nObfusicationBytesReceived <= 0) {
 		return m_nObfusicationBytesReceived;
 	}
 
 	switch (m_StreamCryptState) {
-		case ECS_NONE: // disabled, just pass it through
-			return m_nObfusicationBytesReceived;
-		case ECS_PENDING:
-		case ECS_PENDING_SERVER:
-			//printf("Received %i bytes before sending?\n", m_nObfusicationBytesReceived);
-			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_t nRead = 1;
-			bool bNormalHeader = false;
-			switch (((uint8_t*)lpBuf)0) {
-				case OP_EDONKEYPROT:
-				case OP_PACKEDPROT:
-				case OP_EMULEPROT:
-					bNormalHeader = true;
-					break;
+	case ECS_NONE: // disabled, just pass it through
+		return m_nObfusicationBytesReceived;
+	case ECS_PENDING:
+	case ECS_PENDING_SERVER:
+		wxFAIL;
+		m_StreamCryptState = ECS_NONE;
+		return m_nObfusicationBytesReceived;
+	case ECS_UNKNOWN: {
+		uint32_t nRead = 1;
+		bool bNormalHeader = false;
+		switch (((uint8_t *)lpBuf)0) {
+		case OP_EDONKEYPROT:
+		case OP_PACKEDPROT:
+		case OP_EMULEPROT:
+			bNormalHeader = true;
+			break;
+		}
+
+		if (!bNormalHeader) {
+			StartNegotiation(false);
+			const uint32 nNegRes =
+				Negotiate((uint8_t *)lpBuf + nRead, m_nObfusicationBytesReceived - nRead);
+			if (nNegRes == (uint32_t)(-1)) {
+				return 0;
 			}
+			nRead += nNegRes;
+			if (nRead != (uint32_t)m_nObfusicationBytesReceived) {
+				// More data than the current negotiation step required, or a bug:
+				// this should never happen, since even a handshake that just
+				// finished here can have no data left -- the other client has not
+				// received our response yet.
+				OnError(ERR_ENCRYPTION);
+			}
+			return 0;
+		} else {
+			// doesn't seem to be encrypted
+			m_StreamCryptState = ECS_NONE;
 
-			if (!bNormalHeader) {
-				//printf("Not a normal header, negotiating encryption\n");
-				StartNegotiation(false);
-				const uint32 nNegRes = Negotiate((uint8_t*)lpBuf + nRead, m_nObfusicationBytesReceived - nRead);
-				if (nNegRes == (uint32_t)(-1)) {
+			// If we require an encrypted connection, cut it here. Rare against up-to-
+			// date eMule clients, which check for incompatibility before connecting
+			// where they can.
+			if (thePrefs::IsClientCryptLayerRequired()) {
+				// Even with Require enabled we still have to accept the unencrypted
+				// connections used for lowid/firewall checks by servers and by
+				// clients we selected ourselves; refusing them would always result
+				// in a lowid/firewalled status. The .ini option
+				// ClientCryptLayerRequiredStrict is the only exception, ignoring
+				// even test connections.
+				uint32_t ip = GetPeerInt();
+				if (thePrefs::IsClientCryptLayerRequiredStrict() ||
+					(!theApp->serverconnect->AwaitingTestFromIP(ip) &&
+						!theApp->clientlist->IsKadFirewallCheckIP(ip))) {
+					OnError(ERR_ENCRYPTION_NOTALLOWED);
 					return 0;
+				} else {
 				}
-				nRead += nNegRes;
-				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 didn't receive our response yet)
-					//DebugLogError(_T("CEncryptedStreamSocket: Client %s sent more data then expected while negotiating, disconnecting (1)"), GetPeer());
-					//printf("On error: encryption\n");
-					OnError(ERR_ENCRYPTION);
-				}
-				return 0;
-			} else {
-				// 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
-					// 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 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
-					uint32_t ip = GetPeerInt();
-					if (thePrefs::IsClientCryptLayerRequiredStrict() || (!theApp->serverconnect->AwaitingTestFromIP(ip)
-						&& !theApp->clientlist->IsKadFirewallCheckIP(ip)) )
-					{
-						OnError(ERR_ENCRYPTION_NOTALLOWED);
-						return 0;
-					} else {
-						//AddDebugLogLine(DLP_DEFAULT, false, _T("Incoming unencrypted firewallcheck connection permitted despite RequireEncryption setting  - %s"), GetPeer() );
-					}
-				}
-				return m_nObfusicationBytesReceived; // buffer was unchanged, we can just pass it through
 			}
+			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_t*)lpBuf, (uint8_t*)lpBuf, m_nObfusicationBytesReceived);
-			//DumpMem(lpBuf, m_nObfusicationBytesReceived, "Directly decrypted data:");
-			return m_nObfusicationBytesReceived;
-		case ECS_NEGOTIATING:{
-			//printf("Negotiating on data receive\n");
-			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_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)"), GetPeer());
-				OnError(ERR_ENCRYPTION);
-				return 0;
-			} 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"), GetPeer());
-				memmove(lpBuf, (uint8_t*)lpBuf + nRead, m_nObfusicationBytesReceived - nRead);
-				return m_nObfusicationBytesReceived - nRead;
-			} else {
-				//printf("-> Negotiation went probably ok\n");
-				return 0;
-			}
+	}
+	case ECS_ENCRYPTING:
+		// basic obfusication enabled and set, so decrypt and pass along
+		m_pfiReceiveBuffer.RC4Crypt((uint8_t *)lpBuf, (uint8_t *)lpBuf, m_nObfusicationBytesReceived);
+		return m_nObfusicationBytesReceived;
+	case ECS_NEGOTIATING: {
+		const uint32_t nRead = Negotiate((uint8_t *)lpBuf, m_nObfusicationBytesReceived);
+		if (nRead == (uint32_t)(-1)) {
+			return 0;
+		} else if (nRead != (uint32_t)m_nObfusicationBytesReceived &&
+			   m_StreamCryptState != ECS_ENCRYPTING) {
+			// More data than the current negotiation step required (or a bug), which
+			// should never happen.
+			OnError(ERR_ENCRYPTION);
+			return 0;
+		} else if (nRead != (uint32_t)m_nObfusicationBytesReceived &&
+			   m_StreamCryptState == ECS_ENCRYPTING) {
+			// We finished the handshake; on an outgoing connection it is allowed
+			// (though strange and unlikely) that the client also sent payload.
+			memmove(lpBuf, (uint8_t *)lpBuf + nRead, m_nObfusicationBytesReceived - nRead);
+			return m_nObfusicationBytesReceived - nRead;
+		} else {
+			return 0;
 		}
-		default:
-			wxFAIL;
-			return m_nObfusicationBytesReceived;
+	}
+	default:
+		wxFAIL;
+		return m_nObfusicationBytesReceived;
 	}
 }
 
 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(GetPeer()));
+	if (m_StreamCryptState == ECS_PENDING || m_StreamCryptState == ECS_PENDING_SERVER) {
+		if (TransportObfuscates()) {
+			// Attached after the state was set, so the refusal above was missed.
+			m_StreamCryptState = ECS_NONE;
+			return;
+		}
 		StartNegotiation(true);
 		return;
 	}
 
 	// check if we have negotiating data pending
 	if (!m_pfiSendBuffer.IsEmpty()) {
-		wxASSERT( m_StreamCryptState >= ECS_NEGOTIATING );
+		wxASSERT(m_StreamCryptState >= ECS_NEGOTIATING);
 		SendNegotiatingData(NULL, 0);
 	}
 }
 
-void CEncryptedStreamSocket::CryptPrepareSendData(uint8* pBuffer, uint32 nLen)
+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 an outgoing connection
-		//or if we try to send before receiving on an 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)"), GetPeer());
 	}
 	if (m_StreamCryptState == ECS_ENCRYPTING) {
-		//printf("Preparing crypt data on %s\n", (const char*) unicode2char(GetPeer()));
-		//DumpMem(pBuffer, nLen, "Before crypt prepare:\n");
 		m_pfiSendBuffer.RC4Crypt(pBuffer, pBuffer, nLen);
-		//DumpMem(pBuffer, nLen, "After crypt prepare:\n");
 	}
 }
 
@@ -362,26 +439,26 @@
 
 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)) );
+	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) {
-		//printf("Incoming connection negotiation on %s\n", (const char*) unicode2char(GetPeer()));
 		m_NegotiatingState = ONS_BASIC_CLIENTA_RANDOMPART;
 		m_StreamCryptState = ECS_NEGOTIATING;
 		m_nReceiveBytesWanted = 4;
 	} else if (m_StreamCryptState == ECS_PENDING) {
-		//printf("Socket is client.pending on negotiation\n");
 		CMemFile fileRequest(29);
 		const uint8_t bySemiRandomNotProtocolMarker = GetSemiRandomNotProtocolMarker();
 		fileRequest.WriteUInt8(bySemiRandomNotProtocolMarker);
 		fileRequest.WriteUInt32(m_nRandomKeyPart);
 		fileRequest.WriteUInt32(MAGICVALUE_SYNC);
-		const uint8_t 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_t byPadding = (uint8_t)(GetRandomUint8() % (thePrefs::GetCryptTCPPaddingLength() + 1));
@@ -396,17 +473,18 @@
 
 		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_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((uint8_t*)dh768_p, PRIMESIZE_BYTES);  // our fixed prime
+		m_cryptDHA.Randomize((CryptoPP::AutoSeededRandomPool &)GetRandomPool(),
+			DHAGREEMENT_A_BITS); // our random a
+		wxASSERT(m_cryptDHA.MinEncodedSize() <= DHAGREEMENT_A_BITS / 8);
+		CryptoPP::Integer cryptDHPrime((uint8_t *)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);
-		wxASSERT( m_cryptDHA.MinEncodedSize() <= PRIMESIZE_BYTES );
+		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_t aBufferPRIMESIZE_BYTES;
 		cryptDHGexpAmodP.Encode(aBuffer, PRIMESIZE_BYTES);
@@ -423,7 +501,9 @@
 		m_StreamCryptState = ECS_NEGOTIATING;
 		m_nReceiveBytesWanted = 96;
 
-		SendNegotiatingData(fileRequest.GetRawBuffer(), (uint32_t)fileRequest.GetLength(), (uint32_t)fileRequest.GetLength());
+		SendNegotiatingData(fileRequest.GetRawBuffer(),
+			(uint32_t)fileRequest.GetLength(),
+			(uint32_t)fileRequest.GetLength());
 	} else {
 		wxFAIL;
 		m_StreamCryptState = ECS_NONE;
@@ -431,25 +511,19 @@
 	}
 }
 
-int CEncryptedStreamSocket::Negotiate(const uint8* pBuffer, uint32 nLen)
+int CEncryptedStreamSocket::Negotiate(const uint8 *pBuffer, uint32 nLen)
 {
 	uint32_t nRead = 0;
-	// Hitting Negotiate() with m_nReceiveBytesWanted == 0 means the
-	// negotiation state machine has consumed everything it was expecting
-	// for the current step but somebody (the kernel buffer flushing on
-	// a teardown, late bytes from a server we're switching away from,
-	// etc.) still posted a Read on this socket while it's stuck in
-	// ECS_NEGOTIATING. wxASSERT used to abort debug builds and silently
-	// UB in release (entering the while loop below with bogus byte
-	// math). wxCHECK_MSG returns the same -1 sentinel both call sites
-	// already check for (see Read() at the ECS_NEGOTIATING case and the
-	// "non-normal header" branch), so the caller cleanly aborts the
-	// connection instead. #778.
-	wxCHECK_MSG(m_nReceiveBytesWanted > 0, -1,
+	// Reaching Negotiate() with m_nReceiveBytesWanted == 0 means the state machine has consumed
+	// everything the current step expected, but somebody still posted a Read while the socket
+	// sits in ECS_NEGOTIATING -- a kernel buffer flushing on teardown, late bytes from a server
+	// we are switching away from. wxCHECK_MSG returns the -1 sentinel both call sites already
+	// check for, so the caller cleanly aborts the connection instead of entering the loop with
+	// bogus byte math (#778).
+	wxCHECK_MSG(m_nReceiveBytesWanted > 0,
+		-1,
 		"CEncryptedStreamSocket::Negotiate: called with m_nReceiveBytesWanted == 0");
 
-	//DumpMem(pBuffer, nLen, "Negotiate buffer: ");
-
 	try {
 		while (m_NegotiatingState != ONS_COMPLETE && m_nReceiveBytesWanted > 0) {
 			if (m_nReceiveBytesWanted > 512) {
@@ -457,232 +531,219 @@
 				return 0;
 			}
 
-			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, "Recv Buffer: ");
+			const uint32_t nToRead = std::min(nLen - nRead, m_nReceiveBytesWanted);
 			m_pfiReceiveBuffer.Write(pBuffer + nRead, nToRead);
 			nRead += nToRead;
 			m_nReceiveBytesWanted -= nToRead;
-			if (m_nReceiveBytesWanted > 0)  {
+			if (m_nReceiveBytesWanted > 0) {
 				return nRead;
 			}
 
-			if (m_NegotiatingState != ONS_BASIC_CLIENTA_RANDOMPART && m_NegotiatingState != ONS_BASIC_SERVER_DHANSWER) {
+			if (m_NegotiatingState != ONS_BASIC_CLIENTA_RANDOMPART &&
+				m_NegotiatingState != ONS_BASIC_SERVER_DHANSWER) {
 				// We have the keys, decrypt
-				//printf("We have the keys, so decrypt away on %s\n", (const char*) unicode2char(GetPeer()));
 				m_pfiReceiveBuffer.Encrypt();
 			}
 
 			m_pfiReceiveBuffer.Seek(0);
 
 			switch (m_NegotiatingState) {
-				case ONS_NONE: // would be a bug
-					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(GetPeer()));
-					// This creates the send/receive keys.
+			case ONS_NONE: // would be a bug
+				wxFAIL;
+				return 0;
+			case ONS_BASIC_CLIENTA_RANDOMPART: {
+				// This creates the send/receive keys.
 
-					uint8_t achKeyData21;
-					md4cpy(achKeyData, thePrefs::GetUserHash().GetHash());
-					m_pfiReceiveBuffer.Read(achKeyData + 17, 4);
+				uint8_t achKeyData21;
+				md4cpy(achKeyData, thePrefs::GetUserHash().GetHash());
+				m_pfiReceiveBuffer.Read(achKeyData + 17, 4);
 
-					achKeyData16 = MAGICVALUE_REQUESTER;
+				achKeyData16 = MAGICVALUE_REQUESTER;
 
-					//DumpMem(achKeyData, sizeof(achKeyData), "ach:");
+				MD5Sum md5(achKeyData, sizeof(achKeyData));
+				m_pfiReceiveBuffer.SetKey(md5);
 
-					MD5Sum md5(achKeyData, sizeof(achKeyData));
-					//DumpMem(md5.GetRawHash(), 16, "Md5:");
-					m_pfiReceiveBuffer.SetKey(md5);
+				achKeyData16 = MAGICVALUE_SERVER;
+				md5.Calculate(achKeyData, sizeof(achKeyData));
+				m_pfiSendBuffer.SetKey(md5);
 
-					achKeyData16 = 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.
 
-					m_NegotiatingState = ONS_BASIC_CLIENTA_MAGICVALUE;
-					m_nReceiveBytesWanted = 4;
-					break;
+				uint32_t dwValue = m_pfiReceiveBuffer.ReadUInt32();
+
+				if (dwValue == MAGICVALUE_SYNC) {
+					// It worked one way or the other, so this is an encrypted
+					// stream. Set the receiver key.
+					m_NegotiatingState = ONS_BASIC_CLIENTA_METHODTAGSPADLEN;
+					m_nReceiveBytesWanted = 3;
+				} else {
+					OnError(ERR_ENCRYPTION);
+					return (-1);
+				}
+				break;
+			}
+			case ONS_BASIC_CLIENTA_METHODTAGSPADLEN: {
+				// Get encryption method and padding. Might fall back to the padding
+				// process, but the bytes will be ignored.
+
+				m_dbgbyEncryptionSupported = m_pfiReceiveBuffer.ReadUInt8();
+				m_dbgbyEncryptionRequested = m_pfiReceiveBuffer.ReadUInt8();
+
+				if (m_dbgbyEncryptionRequested != ENM_OBFUSCATION) {
 				}
-				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(GetPeer()));
-
-					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"), GetPeer()) );
-						// set the receiver key
-						//printf("Magic value works on %s\n", (const char*) unicode2char(GetPeer()));
-						m_NegotiatingState = ONS_BASIC_CLIENTA_METHODTAGSPADLEN;
-						m_nReceiveBytesWanted = 3;
-					} else {
-						//printf("Wrong magic value: 0x%x != 0x%x on %s\n",dwValue, MAGICVALUE_SYNC, (const char*)unicode2char(GetPeer()));
-						//DebugLogError(_T("CEncryptedStreamSocket: Received wrong magic value from clientIP %s on a supposly encrypted stream / Wrong Header"), GetPeer());
-						OnError(ERR_ENCRYPTION);
-						return (-1);
-					}
+
+				m_nReceiveBytesWanted = m_pfiReceiveBuffer.ReadUInt8();
+				m_NegotiatingState = ONS_BASIC_CLIENTA_PADDING;
+
+				if (m_nReceiveBytesWanted > 0) {
+					// No padding
 					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");
-//						AddDebugLogLine(DLP_LOW, false, _T("CEncryptedStreamSocket: Client %s preferred unsupported encryption method (%i)"), GetPeer(), m_dbgbyEncryptionRequested);
-					}
-
-					m_nReceiveBytesWanted = m_pfiReceiveBuffer.ReadUInt8();
-					m_NegotiatingState = ONS_BASIC_CLIENTA_PADDING;
-
-					if (m_nReceiveBytesWanted > 0) {
-						// No padding
-						break;
-					}
+			}
+			/* fall through */
+			case ONS_BASIC_CLIENTA_PADDING: {
+				// ignore the random bytes, send the response, set status complete
+				CMemFile fileResponse(26);
+				fileResponse.WriteUInt32(MAGICVALUE_SYNC);
+				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);
+
+				const uint8_t byPaddingLen =
+					theApp->serverconnect->AwaitingTestFromIP(GetPeerInt())
+						? 16
+						: (thePrefs::GetCryptTCPPaddingLength() + 1);
+				uint8_t byPadding = (uint8_t)(GetRandomUint8() % byPaddingLen);
+
+				fileResponse.WriteUInt8(byPadding);
+				for (int i = 0; i < byPadding; i++) {
+					fileResponse.WriteUInt8((uint8_t)rand());
 				}
-				/* fall through */
-				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_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);
-
-					const uint8_t byPaddingLen = theApp->serverconnect->AwaitingTestFromIP(GetPeerInt()) ? 16 : (thePrefs::GetCryptTCPPaddingLength() + 1);
-					uint8_t byPadding = (uint8_t)(GetRandomUint8() % byPaddingLen);
-
-					fileResponse.WriteUInt8(byPadding);
-					for (int i = 0; i < byPadding; i++) {
-						fileResponse.WriteUInt8((uint8_t)rand());
-					}
-					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)"), GetPeer()) );
-					break;
+				SendNegotiatingData(
+					fileResponse.GetRawBuffer(), (uint32_t)fileResponse.GetLength());
+				m_NegotiatingState = ONS_COMPLETE;
+				m_StreamCryptState = ECS_ENCRYPTING;
+				break;
+			}
+			case ONS_BASIC_CLIENTB_MAGICVALUE: {
+				if (m_pfiReceiveBuffer.ReadUInt32() != MAGICVALUE_SYNC) {
+					OnError(ERR_ENCRYPTION);
+					return (-1);
+				}
+				m_NegotiatingState = ONS_BASIC_CLIENTB_METHODTAGSPADLEN;
+				m_nReceiveBytesWanted = 2;
+				break;
+			}
+			case ONS_BASIC_CLIENTB_METHODTAGSPADLEN: {
+				m_dbgbyEncryptionMethodSet = m_pfiReceiveBuffer.ReadUInt8();
+				if (m_dbgbyEncryptionMethodSet != ENM_OBFUSCATION) {
+					OnError(ERR_ENCRYPTION);
+					return (-1);
 				}
-				case ONS_BASIC_CLIENTB_MAGICVALUE: {
-					//printf("Negotiating on magic value\n");
-					if (m_pfiReceiveBuffer.ReadUInt32() != MAGICVALUE_SYNC) {
-						//DebugLogError(_T("CEncryptedStreamSocket: EncryptedstreamSyncError: Client sent wrong Magic Value as answer, cannot complete handshake (%s)"), GetPeer());
-						OnError(ERR_ENCRYPTION);
-						return (-1);
-					}
-					m_NegotiatingState = ONS_BASIC_CLIENTB_METHODTAGSPADLEN;
-					m_nReceiveBytesWanted = 2;
+				m_nReceiveBytesWanted = m_pfiReceiveBuffer.ReadUInt8();
+				m_NegotiatingState = ONS_BASIC_CLIENTB_PADDING;
+				if (m_nReceiveBytesWanted > 0) {
 					break;
 				}
-				case ONS_BASIC_CLIENTB_METHODTAGSPADLEN: {
-					//printf("Negotiating on client B pad length\n");
-					m_dbgbyEncryptionMethodSet = m_pfiReceiveBuffer.ReadUInt8();
-					if (m_dbgbyEncryptionMethodSet != ENM_OBFUSCATION) {
-						//DebugLogError( _T("CEncryptedStreamSocket: Client %s set unsupported encryption method (%i), handshake failed"), GetPeer(), m_dbgbyEncryptionMethodSet);
-						OnError(ERR_ENCRYPTION);
-						return (-1);
-					}
-					m_nReceiveBytesWanted = m_pfiReceiveBuffer.ReadUInt8();
-					m_NegotiatingState = ONS_BASIC_CLIENTB_PADDING;
-					if (m_nReceiveBytesWanted > 0) {
-						break;
-					}
+			}
+			/* fall through */
+			case ONS_BASIC_CLIENTB_PADDING:
+				// ignore the random bytes, the handshake is complete
+				m_NegotiatingState = ONS_COMPLETE;
+				m_StreamCryptState = ECS_ENCRYPTING;
+				break;
+			case ONS_BASIC_SERVER_DHANSWER: {
+				wxASSERT(!m_cryptDHA.IsZero());
+				uint8_t aBufferPRIMESIZE_BYTES + 1;
+				m_pfiReceiveBuffer.Read(aBuffer, PRIMESIZE_BYTES);
+				CryptoPP::Integer cryptDHAnswer((uint8_t *)aBuffer, PRIMESIZE_BYTES);
+				CryptoPP::Integer cryptDHPrime(
+					(uint8_t *)dh768_p, PRIMESIZE_BYTES); // our fixed prime
+				CryptoPP::Integer cryptResult =
+					a_exp_b_mod_c(cryptDHAnswer, m_cryptDHA, cryptDHPrime);
+
+				m_cryptDHA = 0;
+				wxASSERT(cryptResult.MinEncodedSize() <= PRIMESIZE_BYTES);
+
+				// create the keys
+				cryptResult.Encode(aBuffer, PRIMESIZE_BYTES);
+				aBufferPRIMESIZE_BYTES = MAGICVALUE_REQUESTER;
+				MD5Sum md5(aBuffer, sizeof(aBuffer));
+				m_pfiSendBuffer.SetKey(md5);
+				aBufferPRIMESIZE_BYTES = MAGICVALUE_SERVER;
+				md5.Calculate(aBuffer, sizeof(aBuffer));
+				m_pfiReceiveBuffer.SetKey(md5);
+
+				m_NegotiatingState = ONS_BASIC_SERVER_MAGICVALUE;
+				m_nReceiveBytesWanted = 4;
+				break;
+			}
+			case ONS_BASIC_SERVER_MAGICVALUE: {
+				uint32_t dwValue = m_pfiReceiveBuffer.ReadUInt32();
+				if (dwValue == MAGICVALUE_SYNC) {
+					// It worked one way or the other, so this is an encrypted
+					// stream. Set the receiver key.
+					m_NegotiatingState = ONS_BASIC_SERVER_METHODTAGSPADLEN;
+					m_nReceiveBytesWanted = 3;
+				} else {
+					OnError(ERR_ENCRYPTION);
+					return (-1);
 				}
-				/* fall through */
-				case ONS_BASIC_CLIENTB_PADDING:
-					//printf("Negotiating on client B padding, handshake complete\n");
-					// ignore the random bytes, the handshake is complete
-					m_NegotiatingState = ONS_COMPLETE;
-					m_StreamCryptState = ECS_ENCRYPTING;
-					//DEBUG_ONLY( DebugLog(_T("CEncryptedStreamSocket: Finished Obufscation handshake with client %s (outgoing)"), GetPeer()) );
-					break;
-				case ONS_BASIC_SERVER_DHANSWER: {
-					wxASSERT( !m_cryptDHA.IsZero() );
-					uint8_t aBufferPRIMESIZE_BYTES + 1;
-					m_pfiReceiveBuffer.Read(aBuffer, PRIMESIZE_BYTES);
-					CryptoPP::Integer cryptDHAnswer((uint8_t*)aBuffer, PRIMESIZE_BYTES);
-					CryptoPP::Integer cryptDHPrime((uint8_t*)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);
-					aBufferPRIMESIZE_BYTES = MAGICVALUE_REQUESTER;
-					MD5Sum md5(aBuffer, sizeof(aBuffer));
-					m_pfiSendBuffer.SetKey(md5);
-					aBufferPRIMESIZE_BYTES = MAGICVALUE_SERVER;
-					md5.Calculate(aBuffer, sizeof(aBuffer));
-					m_pfiReceiveBuffer.SetKey(md5);
-
-					m_NegotiatingState = ONS_BASIC_SERVER_MAGICVALUE;
-					m_nReceiveBytesWanted = 4;
-					break;
+				break;
+			}
+			case ONS_BASIC_SERVER_METHODTAGSPADLEN:
+				m_dbgbyEncryptionSupported = m_pfiReceiveBuffer.ReadUInt8();
+				m_dbgbyEncryptionRequested = m_pfiReceiveBuffer.ReadUInt8();
+				if (m_dbgbyEncryptionRequested != ENM_OBFUSCATION) {
 				}
-				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"), GetPeer());
-						// set the receiver key
-						m_NegotiatingState = ONS_BASIC_SERVER_METHODTAGSPADLEN;
-						m_nReceiveBytesWanted = 3;
-					} else {
-						//DebugLogError(_T("CEncryptedStreamSocket: Received wrong magic value after DH-Agreement from Serverconnection"), GetPeer());
-						OnError(ERR_ENCRYPTION);
-						return (-1);
-					}
+				m_nReceiveBytesWanted = m_pfiReceiveBuffer.ReadUInt8();
+				m_NegotiatingState = ONS_BASIC_SERVER_PADDING;
+				if (m_nReceiveBytesWanted > 0) {
 					break;
 				}
-				case ONS_BASIC_SERVER_METHODTAGSPADLEN:
-					m_dbgbyEncryptionSupported = m_pfiReceiveBuffer.ReadUInt8();
-					m_dbgbyEncryptionRequested = m_pfiReceiveBuffer.ReadUInt8();
-					if (m_dbgbyEncryptionRequested != ENM_OBFUSCATION) {
-	//					AddDebugLogLine(DLP_LOW, false, _T("CEncryptedStreamSocket: Server %s preferred unsupported encryption method (%i)"), GetPeer(), m_dbgbyEncryptionRequested);
-					}
-					m_nReceiveBytesWanted = m_pfiReceiveBuffer.ReadUInt8();
-					m_NegotiatingState = ONS_BASIC_SERVER_PADDING;
-					if (m_nReceiveBytesWanted > 0) {
-						break;
-					}
-				/* fall through */
-				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_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_t byPadding = (uint8_t)(GetRandomUint8() % 16);
-					fileResponse.WriteUInt8(byPadding);
-
-					for (int i = 0; i < byPadding; i++) {
-						fileResponse.WriteUInt8((uint8_t)rand());
-					}
-
-					m_NegotiatingState = ONS_BASIC_SERVER_DELAYEDSENDING;
-					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"), GetPeer()) );
-					break;
+			/* fall through */
+			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_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_t byPadding = (uint8_t)(GetRandomUint8() % 16);
+				fileResponse.WriteUInt8(byPadding);
+
+				for (int i = 0; i < byPadding; i++) {
+					fileResponse.WriteUInt8((uint8_t)rand());
 				}
-				default:
-					wxFAIL;
+
+				m_NegotiatingState = ONS_BASIC_SERVER_DELAYEDSENDING;
+				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;
+				break;
+			}
+			default:
+				wxFAIL;
 			}
 			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");
 		wxFAIL;
 		OnError(ERR_ENCRYPTION);
 		m_pfiReceiveBuffer.ResetData();
@@ -690,13 +751,13 @@
 	}
 }
 
-int CEncryptedStreamSocket::SendNegotiatingData(const void* lpBuf, uint32_t nBufLen, uint32_t 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(GetPeer()));
-	uint8_t* pBuffer = NULL;
+	wxASSERT(m_StreamCryptState == ECS_NEGOTIATING || m_StreamCryptState == ECS_ENCRYPTING);
+	wxASSERT(nStartCryptFromByte <= nBufLen);
+	wxASSERT(m_NegotiatingState == ONS_BASIC_SERVER_DELAYEDSENDING || !bDelaySend);
+	uint8_t *pBuffer = NULL;
 	bool bProcess = false;
 	if (lpBuf != NULL) {
 		pBuffer = new uint8_tnBufLen;
@@ -709,10 +770,9 @@
 		}
 
 		if (nBufLen > nStartCryptFromByte) {
-			//printf("Crypting negotiation data on %s starting on byte %i\n", (const char*) unicode2char(GetPeer()), nStartCryptFromByte);
-			//DumpMem(lpBuf, nBufLen, "Pre-encryption:");
-			m_pfiSendBuffer.RC4Crypt((uint8*)lpBuf + nStartCryptFromByte, pBuffer + nStartCryptFromByte, nBufLen - nStartCryptFromByte);
-			//DumpMem(pBuffer, nBufLen, "Post-encryption:");
+			m_pfiSendBuffer.RC4Crypt((uint8 *)lpBuf + nStartCryptFromByte,
+				pBuffer + nStartCryptFromByte,
+				nBufLen - nStartCryptFromByte);
 		}
 
 		if (!m_pfiSendBuffer.IsEmpty()) {
@@ -734,19 +794,17 @@
 		// this call is for processing pending data
 		if (m_pfiSendBuffer.IsEmpty() || nStartCryptFromByte != 0) {
 			wxFAIL;
-			return 0;							// or not
+			return 0; // or not
 		}
 		nBufLen = (uint32)m_pfiSendBuffer.GetLength();
 		pBuffer = m_pfiSendBuffer.Detach();
 	}
 
-	wxASSERT( m_pfiSendBuffer.IsEmpty() );
+	wxASSERT(m_pfiSendBuffer.IsEmpty());
 
 	uint32_t result = 0;
 	if (!bDelaySend) {
-		//printf("Writing negotiation data on %s: ", (const char*) unicode2char(GetPeer()));
 		result = CSocketClientProxy::Write(pBuffer, nBufLen);
-		//printf("Wrote %i bytes\n",result);
 	}
 
 	if (result == (uint32_t)SOCKET_ERROR || bDelaySend) {
@@ -756,7 +814,6 @@
 	} else {
 		if (result < nBufLen) {
 			// Store the partial data pending
-			//printf("Partial negotiation pending on %s\n", (const char*) unicode2char(GetPeer()));
 			m_pfiSendBuffer.Write(pBuffer + result, nBufLen - result);
 		}
 		delete pBuffer;
@@ -764,7 +821,6 @@
 	}
 }
 
-
 uint8_t CEncryptedStreamSocket::GetSemiRandomNotProtocolMarker() const
 {
 	uint8_t bySemiRandomNotProtocolMarker = 0;
@@ -772,12 +828,12 @@
 	for (int i = 0; i < 128; i++) {
 		bySemiRandomNotProtocolMarker = GetRandomUint8();
 		switch (bySemiRandomNotProtocolMarker) { // not allowed values
-				case OP_EDONKEYPROT:
-				case OP_PACKEDPROT:
-				case OP_EMULEPROT:
-					break;
-				default:
-					bOk = true;
+		case OP_EDONKEYPROT:
+		case OP_PACKEDPROT:
+		case OP_EMULEPROT:
+			break;
+		default:
+			bOk = true;
 		}
 
 		if (bOk) {

amule-3.0.1.tar.gz/src/EncryptedStreamSocket.h -> amule-3.1.0.tar.gz/src/EncryptedStreamSocket.h Changed

@@ -23,42 +23,43 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-/* This class supports obfuscation and encryption for a *Mule tcp connection.
-   Right now only basic obfusication is supported, but this can be expanded, as their is a
-   dedicated handshake to negotiate the encryption method used.
+/* Obfuscation and encryption for a *Mule tcp connection. Only basic obfuscation is supported
+   right now, but a dedicated handshake negotiates the encryption method, so this can be expanded.
 
-   Please note, even if obfuscation uses encryption methods, it does not fulfill cryptographic standards since it
-   doesn't use secret (and for rc4 important: unique) keys
+   Note that obfuscation uses encryption methods but does not meet cryptographic standards, since
+   it uses no secret keys -- and, importantly for rc4, no unique ones.
 */
 
-#ifndef __ENCRYPTEDSTREAMSOCKET_H__
-#define __ENCRYPTEDSTREAMSOCKET_H__
+#ifndef ENCRYPTEDSTREAMSOCKET_H
+#define ENCRYPTEDSTREAMSOCKET_H
 
 #include <wx/wx.h>
 #include <wx/string.h>
 
 // cryptoPP used for DH integer calculations
-#include "CryptoPP_Inc.h"	// Needed for Crypto functions
+#include "CryptoPP_Inc.h" // Needed for Crypto functions
 #include "Proxy.h"
 #include "Types.h"
 
 #include "RC4Encrypt.h"
 
-#define ERR_WRONGHEADER			0x01
-#define ERR_TOOBIG			0x02
-#define ERR_ENCRYPTION			0x03
-#define ERR_ENCRYPTION_NOTALLOWED	0x04
-
-enum EStreamCryptState {
-	ECS_NONE = 0,			// Disabled or not available
-	ECS_UNKNOWN,			// Incoming connection, will test the first incoming data for encrypted protocol
-	ECS_PENDING,			// Outgoing connection, will start sending encryption protocol
-	ECS_PENDING_SERVER,		// Outgoing serverconnection, will start sending encryption protocol
-	ECS_NEGOTIATING,		// Encryption supported, handshake still uncompleted
-	ECS_ENCRYPTING			// Encryption enabled
+#define ERR_WRONGHEADER 0x01
+#define ERR_TOOBIG 0x02
+#define ERR_ENCRYPTION 0x03
+#define ERR_ENCRYPTION_NOTALLOWED 0x04
+
+enum EStreamCryptState
+{
+	ECS_NONE = 0,       // Disabled or not available
+	ECS_UNKNOWN,        // Incoming connection, will test the first incoming data for encrypted protocol
+	ECS_PENDING,        // Outgoing connection, will start sending encryption protocol
+	ECS_PENDING_SERVER, // Outgoing serverconnection, will start sending encryption protocol
+	ECS_NEGOTIATING,    // Encryption supported, handshake still uncompleted
+	ECS_ENCRYPTING      // Encryption enabled
 };
 
-enum ENegotiatingState {
+enum ENegotiatingState
+{
 	ONS_NONE,
 
 	ONS_BASIC_CLIENTA_RANDOMPART,
@@ -79,11 +80,11 @@
 	ONS_COMPLETE
 };
 
-enum EEncryptionMethods {
+enum EEncryptionMethods
+{
 	ENM_OBFUSCATION = 0x00
 };
 
-
 class CEncryptedStreamSocket : public CSocketClientProxy
 {
 public:
@@ -94,43 +95,57 @@
 
 	//! Indicates how many bytes were received including obfuscation,
 	//! so that the parent knows if the receive limit was reached
-	uint32_t GetRealReceivedBytes() const		{ return m_nObfusicationBytesReceived; }
+	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; }
+	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;
+	uint8_t m_dbgbyEncryptionSupported;
+	uint8_t m_dbgbyEncryptionRequested;
+	uint8_t m_dbgbyEncryptionMethodSet;
 
 protected:
-	int	Write(const void* lpBuf, uint32_t nBufLen);
-	int	Read(void* lpBuf, uint32_t 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);
 
-	void		CryptPrepareSendData(uint8_t* pBuffer, uint32_t nLen);
-	bool		IsEncryptionLayerReady();
-	uint8_t		GetSemiRandomNotProtocolMarker() const;
-
-	uint32_t		m_nObfusicationBytesReceived;
-	EStreamCryptState	m_StreamCryptState;
-	EEncryptionMethods	m_EncryptionMethod;
-	bool			m_bFullReceive;
-	bool			m_bServerCrypt;
+	void CryptPrepareSendData(uint8_t *pBuffer, uint32_t nLen);
+	bool IsEncryptionLayerReady();
+	//! True when the transport below obfuscates the stream already.
+	bool TransportObfuscates() const;
+	//! True once the stream handshake has started: its keystreams are mid-position, and
+	//! SetConnectionEncryption() refuses to re-key from here (it wxFAILs).
+	bool StreamCryptInProgress() const
+	{
+		return m_StreamCryptState != ECS_NONE && m_StreamCryptState != ECS_UNKNOWN;
+	}
+	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_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_t		m_nReceiveBytesWanted;
-	CRC4EncryptableBuffer	m_pfiSendBuffer;
-	uint32_t		m_nRandomKeyPart;
-	CryptoPP::Integer	m_cryptDHA;
+	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_t m_nReceiveBytesWanted;
+	CRC4EncryptableBuffer m_pfiSendBuffer;
+	uint32_t m_nRandomKeyPart;
+	CryptoPP::Integer m_cryptDHA;
 };
 
-#endif // __ENCRYPTEDSTREAMSOCKET_H__
+#endif // ENCRYPTEDSTREAMSOCKET_H

amule-3.0.1.tar.gz/src/ExternalConn.cpp -> amule-3.1.0.tar.gz/src/ExternalConn.cpp Changed

@@ -24,33 +24,47 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "config.h"				// Needed for VERSION
+#include "config.h" // Needed for VERSION
 
-#include <set>					// Needed for std::set (m_lastSentFileIds)
+#include <set>       // Needed for std::set (m_lastSentSharedFileIds)
+#include <list>      // Needed for std::list (multi-search LRU ring)
+#include <algorithm> // Needed for std::find (multi-search LRU ring)
 
-#include <ec/cpp/ECMuleSocket.h>		// Needed for CECSocket
+#include <ec/cpp/ECMuleSocket.h> // Needed for CECSocket
 
-#include <common/Format.h>			// Needed for CFormat
+#include <common/Format.h> // Needed for CFormat
 
 #include <common/ClientVersion.h>
 #include <common/MD5Sum.h>
+#include "libs/ec/cpp/ECCrypt.h"
 
-#include "ExternalConn.h"			// Interface declarations
-#include "ECFullResponseCache.h"		// Needed for s_ec*FullCache
-#include "updownclient.h"			// Needed for CUpDownClient
-#include "Server.h"				// Needed for CServer
-#include "ServerList.h"				// Needed for CServerList
-#include "PartFile.h"				// Needed for CPartFile
-#include "ServerConnect.h"			// Needed for CServerConnect
-#include "UploadQueue.h"			// Needed for CUploadQueue
-#include "amule.h"				// Needed for theApp
-#include "SearchList.h"				// Needed for GetSearchResults
+#include "ECIdDiff.h"            // Needed for ComputeRemovedIds
+#include "ExternalConn.h"        // Interface declarations
+#include "ECFullResponseCache.h" // Needed for s_ec*FullCache
+#include "updownclient.h"        // Needed for CUpDownClient
+#include "Server.h"              // Needed for CServer
+#include "ServerList.h"          // Needed for CServerList
+#include "PartFile.h"            // Needed for CPartFile
+#include "ServerConnect.h"       // Needed for CServerConnect
+#include "UploadQueue.h"         // Needed for CUploadQueue
+#include "AmuleApiCredentials.h"
+#include "BrowseManager.h"
+#include "amule.h"      // Needed for theApp
+#include "SearchList.h" // Needed for GetSearchResults
+#include "ClientVersionString.h"
+#include "MuleVersion.h" // Needed for GetShortMuleVersion()
 #include "ClientList.h"
-#include "Preferences.h"			// Needed for CPreferences
+#include "ChatSessionStore.h"
+#include "ClientCreditsList.h" // Needed for CClientCreditsList
+#include "ClientCredits.h"     // Needed for CClientCredits, ClientMetaStruct
+#ifdef ENABLE_IP2COUNTRY
+#include "IP2Country.h" // Needed for CIP2Country (history country codes)
+#endif
+#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 "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"
@@ -58,46 +72,68 @@
 #include "kademlia/kademlia/UDPFirewallTester.h"
 #include "Statistics.h"
 
-
 //-------------------- File_Encoder --------------------
 
-
-/*
- * Encode 'obtained parts' info to be sent to remote gui
- */
-class CKnownFile_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;
+
+	// Reconcile epoch, stamped by CFileEncoderMap::UpdateEncoders on every encoder
+	// whose file is still listed. Encoders left carrying an older stamp have lost their
+	// file and are swept.
+	uint64 m_seenEpoch;
+
+	// Whether `Get_EC_Response_GetUpdate` has already sent this file to the client
+	// carrying its identifying fields. False on a freshly-built encoder, which is what
+	// makes a re-created encoder re-send full detail without the caller having to erase
+	// anything.
+	//
+	// Deliberately specific to that one response path rather than a general "the client
+	// has this file": a path that has never sent the identity must not take the
+	// unchanged-file shortcut, or the client is left with a child-less tag it turns into
+	// a ghost entry. The two amuleweb handlers answer the same question from their own
+	// sets, because they iterate a CopyFileList snapshot rather than the encoder map.
+	bool m_sentOnUpdatePath;
+
 protected:
 	const CKnownFile *m_file;
+
 public:
-	CKnownFile_Encoder(const CKnownFile *file = 0) { m_file = file; }
+	CKnownFile_Encoder(const CKnownFile *file = nullptr)
+	: m_seenEpoch(0)
+	, m_sentOnUpdatePath(false)
+	{
+		m_file = file;
+	}
 
 	virtual ~CKnownFile_Encoder() {}
 
 	virtual void Encode(CECTag *parent_tag);
 
-	virtual void ResetEncoder()
-	{
-		m_enc_data.ResetEncoder();
-	}
+	virtual void ResetEncoder() { m_enc_data.ResetEncoder(); }
 
-	virtual void SetShared() { }
+	virtual void SetShared() {}
 	virtual bool IsShared() { return true; }
 	virtual bool IsPartFile_Encoder() { return false; }
-	const CKnownFile * GetFile() { return m_file; }
+	const CKnownFile *GetFile() { return m_file; }
+
+	uint64 GetSeenEpoch() const { return m_seenEpoch; }
+	void SetSeenEpoch(uint64 epoch) { m_seenEpoch = epoch; }
+
+	bool WasSentOnUpdatePath() const { return m_sentOnUpdatePath; }
+	void MarkSentOnUpdatePath() { m_sentOnUpdatePath = true; }
 };
 
 /*!
- * 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.
+ * PartStatus strings and gap lists are long, so send an RLE-encoded difference
+ * from the previous one rather than the full part-status string each time.
  *
- * PartFileEncoderData class is used for decode only,
- * while CPartFile_Encoder is used for encode only.
+ * PartFileEncoderData decodes only; CPartFile_Encoder encodes only.
  */
-class CPartFile_Encoder : public CKnownFile_Encoder {
+class CPartFile_Encoder : public CKnownFile_Encoder
+{
 	// blocks requested for download
 	RLE_Data m_req_status;
 	// gap list
@@ -110,10 +146,16 @@
 	bool m_shared;
 
 	// cast inherited member to CPartFile
-	const CPartFile * m_PartFile() { wxCHECK(m_file->IsCPartFile(), NULL); return static_cast<const CPartFile *>(m_file); }
+	const CPartFile *m_PartFile()
+	{
+		wxCHECK(m_file->IsCPartFile(), NULL);
+		return static_cast<const CPartFile *>(m_file);
+	}
+
 public:
 	// encoder side
-	CPartFile_Encoder(const CPartFile *file = 0) : CKnownFile_Encoder(file)
+	CPartFile_Encoder(const CPartFile *file = 0)
+	: CKnownFile_Encoder(file)
 	{
 		m_sourcenameID = 0;
 		m_shared = false;
@@ -132,69 +174,227 @@
 	virtual bool IsPartFile_Encoder() { return true; }
 };
 
-class CFileEncoderMap : public std::map<uint32, CKnownFile_Encoder*> {
+// The encoders for the files this connection has told its client about, held in ECID
+// order.
+//
+// A sorted vector rather than a std::map. The response walk touches every entry on
+// every poll and does very little per entry, so its cost was dominated by chasing
+// red-black-tree pointers around the heap -- a linear scan of a contiguous array is
+// something the prefetcher can follow, a tree traversal is not. Lookup becomes a
+// binary search, which is now the rarer operation.
+class CFileEncoderMap
+{
 	typedef std::set<uint32> IDSet;
+
 public:
+	typedef std::pair<uint32, CKnownFile_Encoder *> value_type;
+	typedef std::vector<value_type> Storage;
+	typedef Storage::iterator iterator;
+	typedef Storage::const_iterator const_iterator;
+
 	~CFileEncoderMap();
-	void UpdateEncoders();
+
+	iterator begin() { return m_entries.begin(); }
+	iterator end() { return m_entries.end(); }
+	size_t size() const { return m_entries.size(); }
+
+	// Binary search by ECID; end() when absent.
+	iterator find(uint32 id);
+
+	// The encoder for `id`, or NULL. Unlike std::map::operator this does not insert a
+	// default-constructed entry on a miss -- that entry would have held a NULL encoder,
+	// which the next reconcile would then have dereferenced.
+	CKnownFile_Encoder *operator(uint32 id);
+
+	// If freshEcids is non-null, receives the ECIDs whose encoder was (re-)created this
+	// call. A freshly-created encoder signals that the caller's per-ECID EC caches (the
+	// CObjTagMap valuemap, and the encoder's own sent-with-detail flag) are stale
+	// w.r.t. the client's view and must be dropped, so INC_UPDATE emissions re-send
+	// identifying fields.
+	void UpdateEncoders(IDSet *freshEcids = nullptr);
+
+private:
+	// Order entries, and order an entry against a bare ECID, so the same
+	// predicate serves both the sort and the binary search.
+	struct KeyLess
+	{
+		bool operator()(const value_type &a, const value_type &b) const { return a.first < b.first; }
+		bool operator()(const value_type &a, uint32 id) const { return a.first < id; }
+		bool operator()(uint32 id, const value_type &b) const { return id < b.first; }
+	};
+
+	// Entries created during a reconcile, merged in once the pass that made them is
+	// done. Appending here rather than inserting into the middle of m_entries keeps a
+	// first poll -- where every file is new -- from paying a memmove of the whole array
+	// per file.
+	Storage m_pending;
+	void FlushPending();
+
+	// Sorted ascending by ECID. The GET_UPDATE walk depends on that order:
+	// it appends each ECID it passes to the list the removal merge consumes.
+	Storage m_entries;
+
+	// The list generations this map was last reconciled against. When both still match,
+	// the lists have not gained or lost a file and the reconcile is a no-op.
+	// `m_haveListGen` distinguishes "never reconciled" from "reconciled when both
+	// counters happened to be zero", which is the state at startup.
+	uint64 m_lastSharedGen = 0;
+	uint64 m_lastDownloadGen = 0;
+	bool m_haveListGen = false;
+
+	// Monotonic reconcile counter; see UpdateEncoders. Two things make a stamp
+	// comparison safe: the map belongs to one CECServerSocket, so encoders are never
+	// shared across clients, and every UpdateEncoders call takes a fresh value before
+	// stamping anything, so no encoder can already carry the value the current call is
+	// about to use.
+	uint64 m_epoch = 0;
 };
 
 CFileEncoderMap::~CFileEncoderMap()
 {
 	// DeleteContents() causes infinite recursion here!
-	for (iterator it = begin(); it != end(); ++it) {
-		delete it->second;
+	for (const value_type &e : m_entries) {
+		delete e.second;
+	}
+	// Normally empty: every reconcile merges what it created before it
+	// returns. Covers a throw part-way through one.
+	for (const value_type &e : m_pending) {
+		delete e.second;
 	}
 }
 
+CFileEncoderMap::iterator CFileEncoderMap::find(uint32 id)
+{
+	const iterator it = std::lower_bound(m_entries.begin(), m_entries.end(), id, KeyLess());
+	return (it != m_entries.end() && it->first == id) ? it : m_entries.end();
+}
+
+CKnownFile_Encoder *CFileEncoderMap::operator(uint32 id)
+{
+	const iterator it = find(id);
+	return it == m_entries.end() ? nullptr : it->second;
+}
+
+void CFileEncoderMap::FlushPending()
+{
+	if (m_pending.empty()) {
+		return;
+	}
+	// Sort what arrived, then merge the two runs. Both are already ordered,
+	// so this is linear in the total rather than a re-sort of everything.
+	std::sort(m_pending.begin(), m_pending.end(), KeyLess());
+	const Storage::difference_type split = static_cast<Storage::difference_type>(m_entries.size());
+	m_entries.insert(m_entries.end(), m_pending.begin(), m_pending.end());
+	std::inplace_merge(m_entries.begin(), m_entries.begin() + split, m_entries.end(), KeyLess());
+	m_pending.clear();
+}
+
 // Check if encoder contains files that are no longer used
 // or if we have new files without encoder yet.
-void CFileEncoderMap::UpdateEncoders()
+void CFileEncoderMap::UpdateEncoders(IDSet *freshEcids)
 {
-	IDSet curr_files, dead_files;
+	// Nothing has entered or left either list since the last reconcile, so the encoder
+	// map already mirrors them and the whole pass below would end where it started. On a
+	// library that is not churning, that is every poll for every connected client.
+	//
+	// Read the counters BEFORE the snapshots, never after. Read first and the values can
+	// only be older than what CopyFileList goes on to see, so a file arriving in between
+	// is picked up one cycle late. Read after, and a change that landed between the copy
+	// and the read is recorded as already seen and never reconciled at all.
+	const uint64 sharedGen = theApp->sharedfiles->GetListGeneration();
+	const uint64 downloadGen = theApp->downloadqueue->GetListGeneration();
+	if (m_haveListGen && sharedGen == m_lastSharedGen && downloadGen == m_lastDownloadGen) {
+		return;
+	}
+
+	// Stamp every encoder whose file is still listed with this epoch; the sweep below
+	// then takes anything left behind. This used to build a set of the live ECIDs
+	// instead, costing a tree insertion per file plus a lookup per encoder in the sweep,
+	// on every poll, to find the handful of files that moved.
+	const uint64 epoch = ++m_epoch;
 	// Downloads
-	std::vector<CPartFile*> downloads;
+	std::vector<CPartFile *> downloads;
 	theApp->downloadqueue->CopyFileList(downloads, true);
 	for (uint32 i = downloads.size(); i--;) {
 		uint32 id = downloadsi->ECID();
-		curr_files.insert(id);
-		if (!count(id)) {
-			(*this)id = new CPartFile_Encoder(downloadsi);
+		iterator it = find(id);
+		if (it == end()) {
+			CKnownFile_Encoder *enc = new CPartFile_Encoder(downloadsi);
+			enc->SetSeenEpoch(epoch);
+			m_pending.emplace_back(id, enc);
+			if (freshEcids) {
+				freshEcids->insert(id);
+			}
+		} else {
+			it->second->SetSeenEpoch(epoch);
 		}
 	}
+	// Merge before the shares pass, not after both. A partfile appears in both lists,
+	// and the check below asks whether this reconcile has already reached it -- which it
+	// answers with find(). Leaving the new entries unmerged would hide them from that
+	// lookup and build a second encoder for the same ECID.
+	FlushPending();
 	// Shares
-	std::vector<CKnownFile*> shares;
+	std::vector<CKnownFile *> shares;
 	theApp->sharedfiles->CopyFileList(shares);
 	for (uint32 i = shares.size(); i--;) {
 		uint32 id = sharesi->ECID();
-		// Check if it is already there.
-		// The curr_files.count(id) is enough, the IsCPartFile() is just a speedup.
-		if (sharesi->IsCPartFile() && curr_files.count(id)) {
-			(*this)id->SetShared();
+		iterator it = find(id);
+		// Check if it is already there. Carrying this epoch means the downloads loop
+		// above already reached it, which is what the old `curr_files.count(id)`
+		// tested; the IsCPartFile() is just a speedup.
+		if (sharesi->IsCPartFile() && it != end() && it->second->GetSeenEpoch() == epoch) {
+			it->second->SetShared();
 			continue;
 		}
-		curr_files.insert(id);
-		if (!count(id)) {
-			(*this)id = new CKnownFile_Encoder(sharesi);
-		}
-	}
-	// 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);
+		if (it == end()) {
+			CKnownFile_Encoder *enc = new CKnownFile_Encoder(sharesi);
+			enc->SetSeenEpoch(epoch);
+			m_pending.emplace_back(id, enc);
+			if (freshEcids) {
+				freshEcids->insert(id);
+			}
+		} else {
+			it->second->SetSeenEpoch(epoch);
+		}
 	}
-}
+	FlushPending();
 
+	// Anything still carrying an older stamp has lost its file. Delete those encoders
+	// and close the gaps in one pass, preserving order. Collecting the dead into a set
+	// and erasing one at a time made every erase a fresh lookup.
+	iterator out = m_entries.begin();
+	for (iterator it = m_entries.begin(); it != m_entries.end(); ++it) {
+		if (it->second->GetSeenEpoch() != epoch) {
+			delete it->second;
+			continue;
+		}
+		if (out != it) {
+			*out = *it;
+		}
+		++out;
+	}
+	m_entries.erase(out, m_entries.end());
+
+	// Record what this pass reconciled against, so the next one can tell whether
+	// anything moved. Set here rather than next to the read above, so an exception
+	// part-way through leaves the map looking un-reconciled.
+	m_lastSharedGen = sharedGen;
+	m_lastDownloadGen = downloadGen;
+	m_haveListGen = true;
+
+	// The GET_UPDATE walk relies on this order to feed the removal merge, and getting it
+	// wrong loses or invents removals silently. Debug-only, and rejects duplicate ECIDs
+	// as well as misordering.
+	//
+	// adjacent_find rather than is_sorted: is_sorted requires a strict weak ordering,
+	// and the `<=` needed to reject equal neighbours is not irreflexive. Hardened
+	// standard libraries check exactly that and abort.
+	assert(std::adjacent_find(
+		       m_entries.begin(), m_entries.end(), (const value_type &a, const value_type &b) {
+			       return a.first >= b.first;
+		       }) == m_entries.end());
+}
 
 //-------------------- CECServerSocket --------------------
 
@@ -209,13 +409,19 @@
 
 	virtual void WriteDoneAndQueueEmpty();
 
-	void	ResetLog() { m_LoggerAccess.Reset(); }
+	void ResetLog() { m_LoggerAccess.Reset(); }
+
+	// True once this connection advertised EC_TAG_CAN_CHAT -- it speaks the
+	// chat session ops and may be sent EC_OP_CHAT_SESSIONS replies.
+	bool ChatActive() const { return m_chatActive; }
+
 private:
 	ECNotifier *m_ec_notifier;
 
 	const CECPacket *Authenticate(const CECPacket *);
 
-	enum {
+	enum
+	{
 		CONN_INIT,
 		CONN_SALT_SENT,
 		CONN_ESTABLISHED,
@@ -223,96 +429,365 @@
 	} m_conn_state;
 
 	uint64_t m_passwd_salt;
+
+	// The credential this connection authenticated with -- the configured EC password,
+	// or the ephemeral token the core issued to the amuleapi it spawned. Per-socket
+	// precisely because two clients may be using different credentials at once;
+	// ActivateAEAD() keys the session from this.
+	wxString m_authSecret;
+
+	// Transport encryption, chosen during EC_OP_AUTH_REQ and only turned on once the
+	// password verifies. Held here until then because a client that fails authentication
+	// must never get a working key.
+	uint8_t m_aeadCipher;
+	// Set when the client offered encryption (CAN_AEAD + a nonce) but sent no usable
+	// public key. Such a peer is provably new enough to send one, so the offer is
+	// malformed and the login is refused rather than degraded to clear.
+	bool m_aeadOfferMalformed;
+	std::vector<uint8_t> m_aeadServerNonce;
+	std::vector<uint8_t> m_aeadClientNonce;
+	std::vector<uint8_t> m_aeadTranscript;
+
+	// The X25519 shared secret, and the only thing the channel key is derived from. Our
+	// ephemeral private key is wiped as soon as this exists, and this is wiped once the
+	// keys are derived, so a peer that never gets past the password check leaves nothing
+	// behind.
+	std::vector<uint8_t> m_aeadShared;
+
+	/// Run the key exchange, pick a cipher, and add our half of the salt.
+	void NegotiateAEAD(const CECPacket *request, CECPacket *response);
+	/// Derive the keys and start sealing from the next packet on.
+	void ActivateAEAD();
+	/**
+	 * Check the client's key-confirmation tag from EC_OP_AUTH_PASSWD.
+	 *
+	 * Separate from the password check above and not a substitute for it: that
+	 * proves the client knows the credential, this proves the same client also ran
+	 * the key exchange we think it did. A relay passes the first and fails this.
+	 */
+	bool VerifyClientConfirm(const CECPacket *request, const wxString &secret) const;
+	/// Our proof to the client, for EC_OP_AUTH_OK.
+	std::vector<uint8_t> ServerConfirm(const wxString &secret) const;
 	CLoggerAccess m_LoggerAccess;
-	CFileEncoderMap	m_FileEncoder;
-	CObjTagMap		m_obj_tagmap;
+	CFileEncoderMap m_FileEncoder;
+	CObjTagMap m_obj_tagmap;
+
+public:
+	void ForgetObject(uint32 ecid) { m_obj_tagmap.EraseValueMap(ecid); }
+
+private:
 	CECPacket *ProcessRequest2(const CECPacket *request);
 
 	virtual bool IsAuthorized() { return m_conn_state == CONN_ESTABLISHED; }
 
 	// Bound on the WriteDoneAndQueueEmpty -> SendPacket -> OnOutput ->
-	// WriteDoneAndQueueEmpty recursion chain that drains the notifier
-	// queue. See WriteDoneAndQueueEmpty for the full reasoning.
-	int		m_notification_dispatch_depth;
-
-	// EC INC_UPDATE skip-unchanged state. `m_lastEcGenSeen*` values are
-	// the highest `CKnownFile::s_globalEcGen` already reflected in the
-	// client's view *for that particular request path* — files with a
-	// smaller `m_ecGen` did not change since the last response of that
-	// path and can be skipped this cycle. Three independent counters
-	// because the request paths interleave on different schedules:
-	//   * `m_lastEcGenSeen`        — `EC_OP_GET_UPDATE`        (amulegui)
-	//   * `m_lastEcGenSeenShared`  — `EC_OP_GET_SHARED_FILES`  (amuleweb)
-	//   * `m_lastEcGenSeenPart`    — `EC_OP_GET_DLOAD_QUEUE`   (amuleweb)
-	uint64		m_lastEcGenSeen;
-	uint64		m_lastEcGenSeenShared;
-	uint64		m_lastEcGenSeenPart;
-
-	// Client opted in to partial-update protocol at auth time (advertised
-	// `EC_TAG_CAN_PARTIAL_UPDATE`). When set, `Get_EC_Response_GetUpdate`
-	// skips unchanged files entirely and emits explicit `EC_TAG_FILE_REMOVED`
-	// markers for files that disappeared since the previous cycle; the
-	// client mirrors this by skipping its bulk deletion loop. When *not*
-	// set, the server falls back to emitting empty "alive marker" tags for
-	// unchanged files so old clients (which infer deletion from absence)
-	// keep working unchanged — see `Get_EC_Response_GetUpdate`.
-	bool		m_partialUpdateActive;
-	// Set of file ECIDs sent in the previous response for each EC
-	// request path. Diffed against the current snapshot to compute the
-	// removal list emitted to partial-update-capable clients. Tracked
-	// per-path because amulegui uses `EC_OP_GET_UPDATE` (mixed shared +
-	// partfile, served by `Get_EC_Response_GetUpdate`) while amuleweb
-	// drives two separate INC_UPDATE streams via `EC_OP_GET_SHARED_FILES`
-	// and `EC_OP_GET_DLOAD_QUEUE` (each served by its own handler).
-	std::set<uint32> m_lastSentFileIds;
+	// WriteDoneAndQueueEmpty recursion chain that drains the notifier queue. See
+	// WriteDoneAndQueueEmpty for the full reasoning.
+	int m_notification_dispatch_depth;
+
+	// EC INC_UPDATE skip-unchanged state. `m_lastEcGenSeen*` values are the highest
+	// `CKnownFile::s_globalEcGen` already reflected in the client's view *for that
+	// particular request path* -- files with a smaller `m_ecGen` did not change since
+	// that path's last response and are skipped. Three independent counters because the
+	// request paths interleave on different schedules: GET_UPDATE (amulegui),
+	// GET_SHARED_FILES and GET_DLOAD_QUEUE (both amuleweb).
+	uint64 m_lastEcGenSeen;
+	uint64 m_lastEcGenSeenShared;
+	uint64 m_lastEcGenSeenPart;
+
+	// Client opted in to the partial-update protocol at auth time (advertised
+	// `EC_TAG_CAN_PARTIAL_UPDATE`). When set, Get_EC_Response_GetUpdate skips unchanged
+	// files entirely and emits explicit EC_TAG_FILE_REMOVED markers; the client mirrors
+	// this by skipping its bulk deletion loop. When not set, the server emits empty
+	// "alive marker" tags for unchanged files so old clients, which infer deletion from
+	// absence, keep working.
+	bool m_partialUpdateActive;
+
+	// Client negotiated `EC_TAG_CAN_PARTIAL_SEARCH`: the multi-search results union may
+	// skip results whose exported fields are unchanged and report removals with explicit
+	// EC_TAG_FILE_REMOVED tombstones. Separate from m_partialUpdateActive on purpose --
+	// reusing that flag would break an older amuleGUI, which advertises it but still
+	// deletes any absent result.
+	bool m_partialSearchActive;
+	// Client opted in to the multi-search protocol at auth time (advertised
+	// `EC_TAG_CAN_MULTI_SEARCH`). When set, the EC search handlers allocate a distinct
+	// daemon-side search ID per EC_OP_SEARCH_START and address results/progress/stop by
+	// it. When not set, the legacy single-search path runs verbatim (0xffffffff sentinel
+	// bucket, wipe-on-start, parameterless stop) so old clients keep working.
+	bool m_multiSearchActive;
+	// Set when the client advertised `EC_TAG_CAN_SEARCH_PROGRESS_UNION`: an
+	// EC_OP_SEARCH_PROGRESS carrying no EC_TAG_SEARCH_ID reports every search this
+	// connection could hold a tab for, one child each. Only consulted together with
+	// m_multiSearchActive -- a single-search client's id-less request keeps meaning "the
+	// current search".
+	bool m_searchProgressUnionActive;
+	// Set when the client advertised EC_TAG_CAN_CHAT: it speaks the chat session ops
+	// (EC_OP_GET_CHAT_SESSIONS and friends). A client that omits the tag never sees the
+	// capability echoed and must never send those opcodes -- an unknown opcode asserts
+	// before the EC_OP_FAILED path.
+	bool m_chatActive;
+	// File ECIDs sent in the previous response for each EC request path, diffed against
+	// the current snapshot to compute the removal list emitted to partial-update-capable
+	// clients. Tracked per-path because amulegui uses EC_OP_GET_UPDATE while amuleweb
+	// drives two separate INC_UPDATE streams.
+	//
+	// `m_lastSentFileIds` is held sorted ascending in a vector rather than a std::set:
+	// Get_EC_Response_GetUpdate walks the encoder map, which is keyed by ECID, so the
+	// current IDs come out already in order and the diff is a linear merge over two
+	// contiguous arrays -- where the set cost a tree insertion per file to build and a
+	// lookup per file to diff, on every poll.
+	//
+	// The other two keep the set: their handlers iterate a CopyFileList snapshot, which
+	// is neither ECID-ordered nor necessarily the whole list.
+	std::vector<uint32> m_lastSentFileIds;
 	std::set<uint32> m_lastSentSharedFileIds;
 	std::set<uint32> m_lastSentPartFileIds;
 	// `EC_OP_SEARCH_RESULTS` at `EC_DETAIL_UPDATE` (amuleweb's polling
-	// path). amulegui takes the `EC_DETAIL_INC_UPDATE` overload which
-	// uses the always-bulk-delete `CRemoteContainer::ProcessUpdate` and
-	// needs no tombstones, so search-results tracking is amuleweb-only.
+	// path), which addresses one search at a time.
 	std::set<uint32> m_lastSentSearchIds;
 
-	// Set of file ECIDs already sent to the client with full detail
-	// (EC_DETAIL_INC_UPDATE / EC_DETAIL_UPDATE payload, not the legacy
-	// childless alive-marker or the partial-update skip-silently path).
-	// Used by `Get_EC_Response_Get{Update,SharedFiles,DownloadQueue}` to
-	// gate the `m_ecGen <= ec_threshold` shortcut: that shortcut produces
-	// a ghost entry on the client (empty CKnownFile from a child-less tag,
-	// or silent absence in partial-update mode) when the client has never
-	// received the ECID's metadata. Per-path because each handler has its
-	// own `m_lastEcGenSeen*` cadence — once the ECID is seen on one path,
-	// the client only has the data for that path's view. Same rationale
-	// as `m_lastSent*FileIds` above.
-	std::set<uint32> m_sentWithDetailIds;
+	// Result ECIDs last sent on the EC_DETAIL_INC_UPDATE union poll (amulegui), so
+	// Get_EC_Response_Search_Results_Union can emit EC_TAG_FILE_REMOVED for results that
+	// are gone instead of relying on absence. Separate from m_lastSentSearchIds, which
+	// belongs to amuleweb's per-search path.
+	//
+	// Only populated for clients that negotiated EC_TAG_CAN_PARTIAL_UPDATE: a legacy
+	// client keeps the bulk "anything missing == deleted" rule, so the union must keep
+	// re-sending every result and there is nothing to track.
+	std::set<uint32> m_lastSentSearchResultIds;
+
+	// Whether a file has already been sent to the client with full detail now lives as a
+	// flag on the encoder itself -- see CKnownFile_Encoder::WasSentOnUpdatePath. It used
+	// to be three per-path sets here, each costing a tree lookup per file on every poll
+	// to answer a question the encoder was already in a position to answer.
+	//
+	// Keeping it on the encoder also bounds it. The sets were only ever inserted into, so
+	// an ECID whose file went away stayed for the life of the connection. An encoder is
+	// destroyed with its file, and a re-created one starts at zero -- exactly the
+	// "re-send full detail" state wanted.
+	//
+	// The two amuleweb paths keep their sets, for the reason given on m_lastSentFileIds
+	// above.
 	std::set<uint32> m_sentWithDetailIdsShared;
 	std::set<uint32> m_sentWithDetailIdsPart;
 };
 
+namespace
+{
+//! Identifies this daemon process to EC clients (EC_TAG_SESSION_ID). Random
+//! rather than a counter or a pid so it cannot repeat across a restart.
+uint64 GetEcSessionId()
+{
+	static const uint64 s_sessionId = GetRandomUint64();
+	return s_sessionId;
+}
+} // namespace
 
 CECServerSocket::CECServerSocket(ECNotifier *notifier)
-:
-CECMuleSocket(true),
-m_conn_state(CONN_INIT),
-m_passwd_salt(GetRandomUint64()),
-m_notification_dispatch_depth(0),
-m_lastEcGenSeen(0),
-m_lastEcGenSeenShared(0),
-m_lastEcGenSeenPart(0),
-m_partialUpdateActive(false)
+: CECMuleSocket(true)
+, m_conn_state(CONN_INIT)
+, m_passwd_salt(GetRandomUint64())
+, m_aeadCipher(ECCrypt::Cipher_None)
+, m_aeadOfferMalformed(false)
+, m_notification_dispatch_depth(0)
+, m_lastEcGenSeen(0)
+, m_lastEcGenSeenShared(0)
+, m_lastEcGenSeenPart(0)
+, m_partialUpdateActive(false)
+, m_partialSearchActive(false)
+, m_multiSearchActive(false)
+, m_searchProgressUnionActive(false)
+, m_chatActive(false)
 {
 	wxASSERT(theApp->ECServerHandler);
 	theApp->ECServerHandler->AddSocket(this);
 	m_ec_notifier = notifier;
 }
 
-
 CECServerSocket::~CECServerSocket()
 {
 	wxASSERT(theApp->ECServerHandler);
 	theApp->ECServerHandler->RemoveSocket(this);
 }
 
+void CECServerSocket::NegotiateAEAD(const CECPacket *request, CECPacket *response)
+{
+	m_aeadCipher = ECCrypt::Cipher_None;
+	m_aeadOfferMalformed = false;
+	m_aeadServerNonce.clear();
+	m_aeadClientNonce.clear();
+	m_aeadTranscript.clear();
+	m_aeadShared.clear();
+
+	const CECTag *offer = request->GetTagByName(EC_TAG_CAN_AEAD);
+	const CECTag *clientNonceTag = request->GetTagByName(EC_TAG_AEAD_CLIENT_NONCE);
+	const CECTag *clientPubTag = request->GetTagByName(EC_TAG_AEAD_CLIENT_PUBKEY);
+	if (offer == nullptr || clientNonceTag == nullptr) {
+		// A client that predates this, or one told not to offer it.
+		return;
+	}
+	if (clientNonceTag->GetTagDataLen() != ECCrypt::NONCE_TAG_LEN) {
+		AddDebugLogLineN(logEC, "AEAD: client nonce has the wrong size, ignoring the offer");
+		return;
+	}
+	if (clientPubTag == nullptr || clientPubTag->GetTagDataLen() != ECCrypt::X25519_KEY_LEN) {
+		// Not an older client -- encryption has never shipped, so anything that offers
+		// it at all is new enough to send a key. A keyless offer is therefore malformed,
+		// or a middlebox stripped the key, and the login is refused rather than degraded.
+		m_aeadOfferMalformed = true;
+		AddDebugLogLineN(logEC, "AEAD: offer without a usable public key, refusing the login");
+		return;
+	}
+
+	const uint8_t *offered = (const uint8_t *)offer->GetTagData();
+	const uint16_t offeredLen = offer->GetTagDataLen();
+
+	// The client prefers Cipher_ChaCha20_Poly1305, probably because it has no hardware
+	// AES. If a third cipher is ever added, update all the logic below and
+	// SupportedCiphers() to match.
+	if (offeredLen && offered0 == ECCrypt::Cipher_ChaCha20_Poly1305 &&
+		ECCrypt::IsCipherSupported(ECCrypt::Cipher_ChaCha20_Poly1305))
+		m_aeadCipher = ECCrypt::Cipher_ChaCha20_Poly1305;
+	else {
+		// if the client didn't ask for ChaCha20, we will check our own list
+		// in preference order, so take our first mutual entry.
+		const std::vector<uint8_t> ours = ECCrypt::SupportedCiphers();
+		for (size_t i = 0; i < ours.size() && m_aeadCipher == ECCrypt::Cipher_None; ++i) {
+			for (uint16_t j = 0; j < offeredLen; ++j) {
+				if (offeredj == oursi) {
+					m_aeadCipher = oursi;
+					break;
+				}
+			}
+		}
+		if (m_aeadCipher == ECCrypt::Cipher_None) {
+			AddDebugLogLineN(logEC, "AEAD: no cipher in common with this client");
+			return;
+		}
+	}
+
+	m_aeadServerNonce = ECCrypt::RandomBytes(ECCrypt::NONCE_TAG_LEN);
+	if (m_aeadServerNonce.empty()) {
+		// Without usable randomness, stay in clear rather than derive a key
+		// from a predictable salt.
+		m_aeadCipher = ECCrypt::Cipher_None;
+		AddDebugLogLineN(logEC, "AEAD: no randomness available, staying in clear");
+		return;
+	}
+
+	// Our ephemeral half. Generated per connection and never stored: that is what makes
+	// a recording of this session unreadable later, even to someone who by then holds
+	// the EC password.
+	std::vector<uint8_t> ephPriv;
+	std::vector<uint8_t> ephPub;
+	if (!ECCrypt::GenerateX25519KeyPair(ephPriv, ephPub)) {
+		m_aeadCipher = ECCrypt::Cipher_None;
+		m_aeadServerNonce.clear();
+		AddDebugLogLineN(logEC, "AEAD: cannot generate a key pair, staying in clear");
+		return;
+	}
+
+	const uint8_t *clientPubData = (const uint8_t *)clientPubTag->GetTagData();
+	const std::vector<uint8_t> clientPub(clientPubData, clientPubData + clientPubTag->GetTagDataLen());
+
+	const bool agreed = ECCrypt::X25519Agree(ephPriv, clientPub, m_aeadShared);
+	// Done with the private half; wipe it here rather than letting it live in
+	// this socket for the rest of the handshake.
+	ECCrypt::SecureWipe(ephPriv);
+	if (!agreed) {
+		m_aeadCipher = ECCrypt::Cipher_None;
+		m_aeadServerNonce.clear();
+		m_aeadShared.clear();
+		AddDebugLogLineN(logEC, "AEAD: bad client public key, staying in clear");
+		return;
+	}
+
+	const uint8_t *clientNonceData = (const uint8_t *)clientNonceTag->GetTagData();
+	m_aeadClientNonce.assign(clientNonceData, clientNonceData + clientNonceTag->GetTagDataLen());
+
+	// Transcript: everything both sides exchanged, taken exactly as it reached us. If
+	// any of it was edited in flight our derivation differs from the client's and the
+	// first sealed packet fails, instead of dropping to whatever the attacker preferred.
+	const std::vector<uint8_t> offeredVec(offered, offered + offeredLen);
+	m_aeadTranscript = ECCrypt::BuildTranscript(
+		offeredVec, m_aeadCipher, m_aeadClientNonce, m_aeadServerNonce, clientPub, ephPub);
+
+	response->AddTag(CECTag(EC_TAG_AEAD_CIPHER, m_aeadCipher));
+	response->AddTag(
+		CECTag(EC_TAG_AEAD_SERVER_NONCE, m_aeadServerNonce.size(), m_aeadServerNonce.data()));
+	response->AddTag(CECTag(EC_TAG_AEAD_SERVER_PUBKEY, ephPub.size(), ephPub.data()));
+}
+
+namespace
+{
+/// The credential in the byte form both ends feed to ConfirmTag. Lower-cased
+/// because the client derives from `pass.Lower()` and a hex hash differing only
+/// in case would produce a different tag on each side.
+std::vector<uint8_t> CredentialBytes(const wxString &secret)
+{
+	const wxString lowered = secret.Lower();
+	const wxCharBuffer buf = lowered.utf8_str();
+	return std::vector<uint8_t>(
+		(const uint8_t *)buf.data(), (const uint8_t *)buf.data() + strlen(buf.data()));
+}
+} // namespace
+
+bool CECServerSocket::VerifyClientConfirm(const CECPacket *request, const wxString &secret) const
+{
+	const CECTag *tag = request->GetTagByName(EC_TAG_AEAD_CLIENT_CONFIRM);
+	if (tag == nullptr) {
+		AddDebugLogLineN(logEC, "AEAD: client sent no key confirmation");
+		return false;
+	}
+	if (!tag->IsCustom()) {
+		// GetTagData() asserts on a non-custom tag; a peer must not be able to
+		// trip that in a debug build by mistyping the confirm tag.
+		AddDebugLogLineN(logEC, "AEAD: client key confirmation has the wrong tag type");
+		return false;
+	}
+	const uint8_t *data = (const uint8_t *)tag->GetTagData();
+	const std::vector<uint8_t> got(data, data + tag->GetTagDataLen());
+	const std::vector<uint8_t> want =
+		ECCrypt::ConfirmTag(CredentialBytes(secret), m_aeadTranscript, "ec-confirm-client");
+	if (!ECCrypt::ConstantTimeEquals(got, want)) {
+		AddDebugLogLineN(logEC, "AEAD: client key confirmation does not match");
+		return false;
+	}
+	return true;
+}
+
+std::vector<uint8_t> CECServerSocket::ServerConfirm(const wxString &secret) const
+{
+	return ECCrypt::ConfirmTag(CredentialBytes(secret), m_aeadTranscript, "ec-confirm-server");
+}
+
+void CECServerSocket::ActivateAEAD()
+{
+	if (m_aeadCipher == ECCrypt::Cipher_None || m_aeadShared.empty()) {
+		return;
+	}
+	// Keyed from the ephemeral exchange and nothing else. It used to be keyed from
+	// whichever credential this connection authenticated with, which made a session
+	// recorded today readable by anyone who learns the password tomorrow. The credential
+	// still has to be proved, but it no longer opens the channel.
+	if (!SetupAEAD(m_aeadCipher,
+		    m_aeadShared,
+		    m_aeadServerNonce,
+		    m_aeadClientNonce,
+		    m_aeadTranscript,
+		    true)) {
+		ECCrypt::SecureWipe(m_aeadShared);
+		AddDebugLogLineN(logEC, "AEAD: key derivation failed, staying in clear");
+		return;
+	}
+	// The shared secret has done its job; nothing later needs it, and keeping
+	// it would put back exactly the long-lived value this change removes.
+	ECCrypt::SecureWipe(m_aeadShared);
+	// From the next packet on, which is EC_OP_AUTH_OK itself.
+	EnableAEADNow();
+	AddDebugLogLineN(logEC,
+		CFormat("AEAD: %s with %s and X25519") % GetPeer() % ECCrypt::CipherName(m_aeadCipher));
+}
 
 const CECPacket *CECServerSocket::OnPacketReceived(const CECPacket *packet, uint32 trueSize)
 {
@@ -327,17 +802,25 @@
 	}
 
 	if (m_conn_state != CONN_ESTABLISHED) {
-		// This is called twice:
-		// 1) send salt
-		// 2) verify password
+		// Called twice: once to send the salt, once to verify the password.
 		reply = Authenticate(packet);
 	} else {
+		if (IsCryptReady() && !WasLastPacketEncrypted()) {
+			// The session negotiated encryption, so every packet past the handshake
+			// must arrive sealed. A cleartext packet here is an injection attempt: our
+			// sealed replies stay confidential, but executing an unauthenticated
+			// cleartext command with this session's authority is not. The one
+			// legitimate clear packet, a terminal AUTH_FAIL, only arrives before
+			// CONN_ESTABLISHED.
+			AddDebugLogLineN(logEC, "EC: cleartext packet on an encrypted session, dropping");
+			CloseSocket();
+			return nullptr;
+		}
 		reply = ProcessRequest2(packet);
 	}
 	return reply;
 }
 
-
 void CECServerSocket::OnLost()
 {
 	AddLogLineN(_("External connection closed."));
@@ -348,49 +831,36 @@
 void CECServerSocket::WriteDoneAndQueueEmpty()
 {
 	if (!HaveNotificationSupport() || m_conn_state != CONN_ESTABLISHED) {
-		//printf("EC %p: WriteDoneAndQueueEmpty but notification disabled\n", this);
+		// printf("EC %p: WriteDoneAndQueueEmpty but notification disabled\n", this);
 		return;
 	}
 
 	// CECSocket::OnOutput drains the per-socket output queue, then calls
-	// WriteDoneAndQueueEmpty to pull the next notification packet. The
-	// chain runs synchronously on the main thread:
+	// WriteDoneAndQueueEmpty to pull the next notification packet. The chain runs
+	// synchronously on the main thread:
 	//
 	//   WriteDoneAndQueueEmpty -> SendPacket -> WritePacket + OnOutput
 	//     -> OnOutput drains queue -> WriteDoneAndQueueEmpty -> ...
 	//
-	// On a busy amuled (many peers / files generating notifications) the
-	// ECNotifier always has the next packet ready, so the recursion never
-	// bottoms out. The main thread stays inside this chain processing the
-	// notifier feed and never yields back to the wx event loop. That
-	// starves every other event -- including LibSocketLost from a
-	// half-closed EC peer, which is what CECServerSocket::OnLost needs
-	// to fire so it can tear the dead socket down.
-	//
-	// In the wedged-amuleweb scenario reported in #666, the peer is in
-	// kernel CLOSE-WAIT, writes silently succeed against the dead
-	// kernel buffer, and amuled spins indefinitely flushing the
-	// notifier to nowhere -- amulegui can't connect because the main
-	// thread is permanently occupied.
+	// On a busy amuled the ECNotifier always has the next packet ready, so the recursion
+	// never bottoms out: the main thread stays inside this chain and never yields back
+	// to the wx event loop, starving every other event -- including the LibSocketLost a
+	// half-closed EC peer needs to be torn down. With the peer in kernel CLOSE-WAIT,
+	// writes silently succeed against the dead buffer and amuled spins indefinitely.
 	//
-	// Cap the dispatch depth so the chain returns to the event loop
-	// every MAX_DEPTH packets. The pending asio LibSocketSend
-	// completions (or LibSocketLost, if the peer has gone away) get
-	// processed in between; on a healthy peer the loop simply resumes
-	// when OnSend re-enters via the next completion.
+	// Cap the dispatch depth so the chain returns to the event loop every MAX_DEPTH
+	// packets. Pending asio completions get processed in between; on a healthy peer the
+	// loop resumes when OnSend re-enters via the next one.
 	static const int MAX_DEPTH = 8;
 	if (m_notification_dispatch_depth >= MAX_DEPTH) {
 		return;
 	}
 
-	// ECNotifier::GetNextPacket returns a fresh new CECPacket(...) and
-	// the caller owns it; SendPacket(const CECPacket*) only serialises
-	// it into the per-socket output queue and never deletes.  Hand the
-	// raw pointer to a smart pointer so the CECPacket (and its CECTag
-	// tree) get freed at scope exit instead of leaking on every
-	// notification dispatch.  Pre-fix, the EC notification path was
-	// the dominant retained-bytes leak on long-running amuled with
-	// connected amulegui / amuleweb peers (#765).
+	// ECNotifier::GetNextPacket returns a fresh CECPacket and the caller owns it;
+	// SendPacket only serialises it into the per-socket output queue and never deletes.
+	// Hand the raw pointer to a smart pointer so the packet and its CECTag tree are freed
+	// at scope exit -- pre-fix this was the dominant retained-bytes leak on a
+	// long-running amuled with peers attached.
 	CSmartPtr<CECPacket> packet(m_ec_notifier->GetNextPacket(this));
 	if (!packet) {
 		return;
@@ -409,11 +879,19 @@
 //-------------------- ExternalConn --------------------
 
 ExternalConn::ExternalConn(amuleIPV4Address addr, wxString *msg)
+// Defaults are ten failures a minute, then five minutes out -- deliberately looser
+// than amuleapi's five, because an EC client retries on its own: amulegui reconnects
+// on a dropped link, so a saved password that has gone stale burns attempts with no
+// human in the loop. Ten still caps a guesser at nine attempts a minute. Read once at
+// construction, so changing them takes a restart.
+: m_authRateLimiter(CRateLimiter::Config{ thePrefs::ECAuthFailureWindowSeconds(),
+	  thePrefs::ECAuthFailureThreshold(),
+	  thePrefs::ECAuthLockoutSeconds() })
 {
 	wxString msgLocal;
 	m_ECServer = NULL;
 	// Are we allowed to accept External Connections?
-	if ( thePrefs::AcceptExternalConnections() ) {
+	if (thePrefs::AcceptExternalConnections()) {
 		// We must have a valid password, otherwise we will not allow EC connections
 		if (thePrefs::ECPassword().IsEmpty()) {
 			*msg += "External connections disabled due to empty password!\n";
@@ -443,7 +921,6 @@
 	m_ec_notifier = new ECNotifier();
 }
 
-
 ExternalConn::~ExternalConn()
 {
 	KillAllSockets();
@@ -451,6 +928,12 @@
 	delete m_ec_notifier;
 }
 
+void ExternalConn::ForgetObject(uint32 ecid)
+{
+	for (CECServerSocket *s : socket_list) {
+		s->ForgetObject(ecid);
+	}
+}
 
 void ExternalConn::AddSocket(CECServerSocket *s)
 {
@@ -458,19 +941,16 @@
 	socket_list.insert(s);
 }
 
-
 void ExternalConn::RemoveSocket(CECServerSocket *s)
 {
 	wxASSERT(s);
 	socket_list.erase(s);
 }
 
-
 void ExternalConn::KillAllSockets()
 {
 	AddDebugLogLineN(logGeneral,
-		CFormat("ExternalConn::KillAllSockets(): %d sockets to destroy.") %
-			socket_list.size());
+		CFormat("ExternalConn::KillAllSockets(): %d sockets to destroy.") % socket_list.size());
 	SocketSet::iterator it = socket_list.begin();
 	while (it != socket_list.end()) {
 		CECServerSocket *s = *(it++);
@@ -480,7 +960,6 @@
 	socket_list.clear();
 }
 
-
 void ExternalConn::ResetAllLogs()
 {
 	SocketSet::iterator it = socket_list.begin();
@@ -490,34 +969,33 @@
 	}
 }
 
+CExternalConnListener::CExternalConnListener(const amuleIPV4Address &adr, int flags, ExternalConn *conn)
+: CLibSocketServer(adr, flags, thePrefs::GetECNetworkInterface())
+, m_conn(conn)
+{
+}
 
 void CExternalConnListener::OnAccept()
 {
 	CECServerSocket *sock = new CECServerSocket(m_conn->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).
+	// Accept a new connection if one is pending, else exit. Accept(FALSE) is the
+	// non-blocking form, although if we got here there should ALWAYS be one pending.
 	if (AcceptWith(*sock, false)) {
-		// Apply EC keepalive on the freshly-accepted server-side
-		// socket so amuled detects a half-open EC client (gui
-		// process killed, network blip, FIN lost) symmetrically
-		// with what the client just enabled on its end. Without
-		// this, the kernel sits on the dead connection for the
-		// default ~2h TCP retransmit timeout, holding the
-		// CECServerSocket and its m_ec_notifier reference.
-		sock->ApplyEcKeepalive();
+		// Apply the EC socket options on the freshly-accepted server-side socket,
+		// symmetrically with what the client just enabled: keepalive, so amuled detects
+		// a half-open EC client instead of sitting on the dead connection for the ~2h TCP
+		// retransmit timeout while holding the CECServerSocket and its notifier
+		// reference; and TCP_NODELAY, which only removes the ~40 ms Nagle stall if it is
+		// set on this end too.
+		sock->ApplyEcSocketOptions();
 		AddLogLineN(_("New external connection accepted"));
 	} else {
 		delete sock;
 		AddLogLineN(_("ERROR: couldn't accept a new external connection"));
 	}
-
 }
 
-//
 // Authentication
-//
 const CECPacket *CECServerSocket::Authenticate(const CECPacket *request)
 {
 	CECPacket *response;
@@ -527,36 +1005,44 @@
 	}
 
 	// Password must be specified if we are to allow remote connections
-	if ( thePrefs::ECPassword().IsEmpty() ) {
+	if (thePrefs::ECPassword().IsEmpty()) {
 		AddLogLineC(_("External connection refused due to empty password in preferences!"));
 
 		return new CECPacket(EC_OP_AUTH_FAIL);
 	}
 
-	if ((m_conn_state == CONN_INIT) && (request->GetOpCode() == EC_OP_AUTH_REQ) ) {
+	if ((m_conn_state == CONN_INIT) && (request->GetOpCode() == EC_OP_AUTH_REQ)) {
 		// cppcheck-suppress unreadVariable
 		const CECTag *clientName = request->GetTagByName(EC_TAG_CLIENT_NAME);
 		// cppcheck-suppress unreadVariable
 		const CECTag *clientVersion = request->GetTagByName(EC_TAG_CLIENT_VERSION);
 
-		AddLogLineN(CFormat( _("Connecting client: %s %s") )
-			% ( clientName ? clientName->GetStringData() : wxString(_("Unknown")) )
-			% ( clientVersion ? clientVersion->GetStringData() : wxString(_("Unknown version")) ) );
+		AddLogLineN(
+			CFormat(_("Connecting client: %s %s")) %
+			(clientName ? clientName->GetStringData() : wxString(_("Unknown"))) %
+			(clientVersion ? clientVersion->GetStringData() : wxString(_("Unknown version"))));
 		const CECTag *protocol = request->GetTagByName(EC_TAG_PROTOCOL_VERSION);
 #ifdef EC_VERSION_ID
 		// For snapshot builds, both client and server must use GITDATE, and they must be the same
 		CMD4Hash vhash;
 		if (!vhash.Decode(EC_VERSION_ID)) {
 			response = new CECPacket(EC_OP_AUTH_FAIL);
-			response->AddTag(CECTag(EC_TAG_STRING, "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) {
+			response->AddTag(
+				CECTag(EC_TAG_STRING, "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) {
 			response = new CECPacket(EC_OP_AUTH_FAIL);
-			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Incorrect EC version ID, there might be binary incompatibility. Use core and remote from same snapshot.")));
+			response->AddTag(CECTag(EC_TAG_STRING,
+				wxTRANSLATE("Incorrect EC version ID, there might be binary incompatibility. "
+					    "Use core and remote from same snapshot.")));
 #else
-		// For release versions, we don't want to allow connections from any arbitrary snapshot client.
+		// For release versions, we don't want to allow connections from any arbitrary snapshot
+		// 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 development snapshot! *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();
@@ -564,61 +1050,90 @@
 				response = new CECPacket(EC_OP_AUTH_SALT);
 				response->AddTag(CECTag(EC_TAG_PASSWD_SALT, m_passwd_salt));
 				m_conn_state = CONN_SALT_SENT;
-				//
+				// Transport encryption. Pick the first cipher we can do from the
+				// client's list -- its order is its preference -- and answer with our
+				// half of the derivation salt. Keys are only derived once the password
+				// checks out, below.
+				NegotiateAEAD(request, response);
 				// So far ok, check capabilities of client
-				//
 				if (request->GetTagByName(EC_TAG_CAN_ZLIB)) {
 					m_my_flags |= EC_FLAG_ZLIB;
 				}
-				// Honour the client's prefer-no-ZLIB hint: when set, the
-				// client believes transit between us is fast (loopback /
-				// LAN) and per-packet deflate/inflate is wasted CPU. The
-				// decision lives on the client because only the client
-				// knows the IP it dialed; the server's peer-IP view
-				// would misclassify e.g. WireGuard tunnel endpoints as
-				// "local" when the underlying transit is anything but.
-				// CECSocket::WritePacket honours the resulting
-				// `m_isLocalPeer` flag per packet, falling back to ZLIB
-				// for payloads above `kLocalPeerZlibBypassMax` so very
-				// large responses still stay inside the receiver's
+				// Honour the client's prefer-no-ZLIB hint: the client believes transit
+				// between us is fast (loopback / LAN) and per-packet deflate is wasted
+				// CPU. The decision lives on the client because only the client knows
+				// the IP it dialed; the server's peer-IP view would misclassify a
+				// WireGuard tunnel endpoint as "local". CECSocket::WritePacket honours
+				// `m_isLocalPeer` per packet, falling back to ZLIB above
+				// kLocalPeerZlibBypassMax so large responses stay inside the receiver's
 				// 256 MB ReadHeader gate.
 				if (request->GetTagByName(EC_TAG_PREFER_NO_ZLIB)) {
 					SetLocalPeer(true);
 					AddDebugLogLineN(logEC,
-						CFormat("EC peer %s asked to skip ZLIB (loopback/LAN hint) — bypassing for small/medium packets")
-							% GetPeer());
+						CFormat("EC peer %s asked to skip ZLIB (loopback/LAN hint) - "
+							"bypassing for small/medium packets") %
+							GetPeer());
 				}
 				if (request->GetTagByName(EC_TAG_CAN_UTF8_NUMBERS)) {
 					m_my_flags |= EC_FLAG_UTF8_NUMBERS;
 				}
 				if (request->GetTagByName(EC_TAG_CAN_LARGE_TAG_COUNT)) {
-					// Client can decode the sentinel-extended children-
-					// count format in CECTag::WriteChildren (#199). Only
-					// new clients send this tag; old clients omit it
-					// and we keep the wire format capped at uint16.
+					// Client can decode the sentinel-extended children-count format
+					// in CECTag::WriteChildren. Old clients omit this tag and the
+					// wire format stays capped at uint16.
 					m_my_flags |= EC_FLAG_LARGE_TAG_COUNT;
 				}
 				if (request->GetTagByName(EC_TAG_CAN_PARTIAL_UPDATE)) {
 					// Client understands the partial-update protocol:
-					// `Get_EC_Response_GetUpdate` may omit unchanged
-					// files and emit explicit `EC_TAG_FILE_REMOVED`
-					// markers instead of relying on absence-implies-
-					// deletion. Old clients omit this tag and we keep
-					// the backward-compat alive-marker path active for
-					// them — see `Get_EC_Response_GetUpdate`.
+					// Get_EC_Response_GetUpdate may omit unchanged files and emit
+					// explicit EC_TAG_FILE_REMOVED markers instead of relying on
+					// absence. Old clients omit this tag and keep the
+					// alive-marker path.
 					m_partialUpdateActive = true;
 				}
+				if (request->GetTagByName(EC_TAG_CAN_PARTIAL_SEARCH)) {
+					// Client applies the same rule to search results. Old clients
+					// omit this tag and the union keeps re-sending every result of
+					// every open search on every poll.
+					m_partialSearchActive = true;
+				}
+				if (request->GetTagByName(EC_TAG_CAN_MULTI_SEARCH)) {
+					// Client understands the multi-search protocol: EC searches are
+					// addressed by a daemon-allocated EC_TAG_SEARCH_ID instead of
+					// the single 0xffffffff sentinel, so several can run at once.
+					// Old clients omit this tag and keep the sentinel path.
+					m_multiSearchActive = true;
+				}
+				if (request->GetTagByName(EC_TAG_CAN_SEARCH_PROGRESS_UNION)) {
+					// Client reads an id-less EC_OP_SEARCH_PROGRESS as "every open
+					// search", each reported as a child tag, so it polls once
+					// instead of once per search. Only honoured with multi-search:
+					// for a single-search client an id-less request still means
+					// "the current search", which amulecmd expects.
+					m_searchProgressUnionActive = true;
+				}
+				if (request->GetTagByName(EC_TAG_CAN_CHAT_SESSIONS)) {
+					// Client speaks the chat session ops. Its own tag, NOT
+					// EC_TAG_CAN_CHAT: that one is echoed by daemons which predate
+					// these opcodes, so a client gating on it would send
+					// EC_OP_GET_CHAT_SESSIONS to a core that asserts on it.
+					m_chatActive = true;
+				}
 				m_haveNotificationSupport = request->GetTagByName(EC_TAG_CAN_NOTIFY) != NULL;
-				AddDebugLogLineN(logEC, CFormat("Client capabilities: ZLIB: %s  UTF8 numbers: %s  Push notification: %s  Large tag count: %s  Partial update: %s" )
-					% ((m_my_flags & EC_FLAG_ZLIB) ? "yes" : "no")
-					% ((m_my_flags & EC_FLAG_UTF8_NUMBERS) ? "yes" : "no")
-					% (m_haveNotificationSupport ? "yes" : "no")
-					% ((m_my_flags & EC_FLAG_LARGE_TAG_COUNT) ? "yes" : "no")
-					% (m_partialUpdateActive ? "yes" : "no"));
+				AddDebugLogLineN(logEC,
+					CFormat("Client capabilities: ZLIB: %s  UTF8 numbers: %s  Push "
+						"notification: %s  Large tag count: %s  Partial update: %s") %
+						((m_my_flags & EC_FLAG_ZLIB) ? "yes" : "no") %
+						((m_my_flags & EC_FLAG_UTF8_NUMBERS) ? "yes" : "no") %
+						(m_haveNotificationSupport ? "yes" : "no") %
+						((m_my_flags & EC_FLAG_LARGE_TAG_COUNT) ? "yes" : "no") %
+						(m_partialUpdateActive ? "yes" : "no"));
 			} else {
 				response = new CECPacket(EC_OP_AUTH_FAIL);
-				response->AddTag(CECTag(EC_TAG_STRING, wxString(wxTRANSLATE("Invalid protocol version."))
-					+ wxString(CFormat("( %#.4x != %#.4x )") % proto_version % (uint16_t)EC_CURRENT_PROTOCOL_VERSION)));
+				response->AddTag(CECTag(EC_TAG_STRING,
+					wxString(wxTRANSLATE("Invalid protocol version.")) +
+						wxString(CFormat("( %#.4x != %#.4x )") % proto_version %
+							 (uint16_t)EC_CURRENT_PROTOCOL_VERSION)));
 			}
 		} else {
 			response = new CECPacket(EC_OP_AUTH_FAIL);
@@ -628,10 +1143,27 @@
 		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))
-						+ " " + thePrefs::ECPassword());
+		// Brute-force guard, ahead of every credential path. Keyed on the address alone
+		// rather than address+port, or each reconnect would look like a new client and
+		// reset the count -- which is what a guesser does anyway.
+		const std::string peerIp(wxString(GetIP()).ToStdString());
+		const CRateLimiter::Decision throttle =
+			theApp->ECServerHandler->AuthRateLimiter().Check(peerIp);
+		if (throttle.locked_out) {
+			// Say so explicitly instead of reusing "wrong password": a user who has just
+			// fixed their password deserves to know why it still fails, and it tells an
+			// attacker nothing they cannot infer from being refused.
+			const wxString err = CFormat(wxGetTranslation(wxTRANSLATE(
+						     "Too many failed connection attempts; try again "
+						     "in %d seconds."))) %
+					     (int)throttle.retry_after_seconds;
+			AddLogLineN(err + " " + GetPeer());
+			response = new CECPacket(EC_OP_AUTH_FAIL);
+			response->AddTag(CECTag(EC_TAG_STRING, err));
+		} else if (!passh.Decode(thePrefs::ECPassword())) {
+			wxString err =
+				wxTRANSLATE("Authentication failed: invalid hash specified as EC password.");
+			AddLogLineN(wxString(wxGetTranslation(err)) + " " + thePrefs::ECPassword());
 			response = new CECPacket(EC_OP_AUTH_FAIL);
 			response->AddTag(CECTag(EC_TAG_STRING, err));
 		} else {
@@ -640,24 +1172,158 @@
 
 			passh.Decode(MD5Sum(thePrefs::ECPassword().Lower() + saltHash).GetHash());
 
-			if (passwd && passwd->GetMD4Data() == passh) {
+			// Second accepted credential: the ephemeral token the core issued to the
+			// amuleapi it spawned, so that daemon never needs the password-equivalent value
+			// out of amule.conf. Empty when no token was issued, and an empty token must
+			// never authenticate anyone -- so the emptiness is tested here rather than
+			// relying on a digest of "".
+			const wxString &ecToken = theApp->GetEcToken();
+			CMD4Hash tokenh;
+			const bool tokenUsable = !ecToken.IsEmpty() &&
+						 tokenh.Decode(MD5Sum(ecToken.Lower() + saltHash).GetHash());
+
+			// Compare against both without short-circuiting. The naive `if (pw) ... else if
+			// (token) ...` leaks which credential matched through timing, and -- more
+			// usefully to an attacker -- whether a token is live at all. Both branches are
+			// evaluated and OR'd, so acceptance is one decision. The per-comparison timing
+			// is not itself a concern: the digests are salted per connection.
+			const bool matchedPassword = passwd && passwd->GetMD4Data() == passh;
+			const bool matchedToken = passwd && tokenUsable && passwd->GetMD4Data() == tokenh;
+			const bool credentialOk = matchedPassword || matchedToken;
+			// Which of the two it was. The client keys its confirmation from the credential
+			// it presented, so a token-authenticated peer has to be checked against the
+			// token and not the configured password.
+			const wxString authSecret = matchedPassword ? thePrefs::ECPassword() : ecToken;
+
+			// Whether that same client also ran the key exchange we completed. The password
+			// check cannot tell us: a relay forwards the challenge response untouched and
+			// passes it, but it has to run its own exchange with each of us, so its two
+			// transcripts differ and this tag cannot be right on both legs. Vacuously true
+			// on a session with no encryption.
+			const bool confirmOk = !credentialOk || m_aeadCipher == ECCrypt::Cipher_None ||
+					       VerifyClientConfirm(request, authSecret);
+
+			// Operator policy: refuse anything that did not negotiate encryption. Checked
+			// ahead of the password so the client gets the real reason rather than a
+			// misleading "wrong password". Deliberately flat rather than keyed on the peer
+			// address: only the client knows what it dialed.
+			if (m_aeadOfferMalformed) {
+				// The client offered encryption but sent no usable public key. Encryption
+				// has never shipped, so a peer that offers it at all is new enough to send
+				// a key: a keyless offer is malformed, or an on-path attacker stripping the
+				// key, not an older client.
+				const wxString err = wxTRANSLATE(
+					"Authentication failed: the client offered an encrypted External "
+					"Connection but sent no usable key.");
+				AddLogLineN(wxString(wxGetTranslation(err)) + " " + GetPeer());
+				response = new CECPacket(EC_OP_AUTH_FAIL);
+				response->AddTag(CECTag(EC_TAG_STRING, err));
+			} else if (thePrefs::ECRequireEncryption() && m_aeadCipher == ECCrypt::Cipher_None) {
+				const wxString err = wxTRANSLATE(
+					"Authentication failed: this aMule requires an encrypted External "
+					"Connection, and the client did not negotiate one.");
+				AddLogLineN(wxString(wxGetTranslation(err)) + " " + GetPeer());
+				response = new CECPacket(EC_OP_AUTH_FAIL);
+				response->AddTag(CECTag(EC_TAG_STRING, err));
+			} else if (credentialOk && !confirmOk) {
+				// Right credential, wrong handshake. Refused rather than continued in clear:
+				// a client that negotiated encryption and cannot confirm it is either being
+				// relayed or is not the client it claims to be.
+				ECCrypt::SecureWipe(m_aeadShared);
+				const wxString err = wxTRANSLATE(
+					"Authentication failed: the client could not confirm the encrypted "
+					"session.");
+				AddLogLineN(wxString(wxGetTranslation(err)) + " " + GetPeer());
+				response = new CECPacket(EC_OP_AUTH_FAIL);
+				response->AddTag(CECTag(EC_TAG_STRING, err));
+			} else if (passwd && credentialOk) {
+				// One of the two accepted credentials matched, so both ends hold the same
+				// secret and the keys will match. Switch on now rather than after the reply:
+				// EC_OP_AUTH_OK is then itself sealed, which proves to the client that its
+				// peer really does know the secret.
+				//
+				// Remember WHICH one for ActivateAEAD: the client keys its half from the
+				// credential it presented, so keying ours from the configured password
+				// regardless would break every token-authenticated session.
+				m_authSecret = authSecret;
+				// Clear the bucket: a legitimate user who mistyped a few times must not carry
+				// that streak into their next connection.
+				theApp->ECServerHandler->AuthRateLimiter().NoteSuccess(peerIp);
+				// Computed before ActivateAEAD wipes what it derives from -- the tag depends
+				// only on the transcript, but keeping the order explicit avoids that becoming
+				// a trap later.
+				const std::vector<uint8_t> serverConfirm = ServerConfirm(authSecret);
+				ActivateAEAD();
 				response = new CECPacket(EC_OP_AUTH_OK);
-				response->AddTag(CECTag(EC_TAG_SERVER_VERSION, VERSION));
-				// Echo the negotiated large-tag-count capability so
-				// the client mirrors EC_FLAG_LARGE_TAG_COUNT into its
-				// own m_my_flags. Without this echo, client wouldn't
-				// know the server supports the extended wire format
-				// and would never set the flag in its outgoing
-				// per-packet headers (#199).
+				// Short form rather than bare VERSION: on a development build VERSION is the
+				// literal "GIT", so every snapshot would identify itself identically. No
+				// change on a tagged release, where GITDATE is undefined.
+				response->AddTag(CECTag(EC_TAG_SERVER_VERSION, GetShortMuleVersion()));
+				// Our half of the proof. Travels inside the now-sealed AUTH_OK, so the client
+				// learns both that we hold the credential and that we hold the key, from one
+				// packet.
+				response->AddTag(CECTag(EC_TAG_AEAD_SERVER_CONFIRM,
+					serverConfirm.size(),
+					serverConfirm.data()));
+				// Echo the negotiated large-tag-count capability so the client mirrors
+				// EC_FLAG_LARGE_TAG_COUNT into its own m_my_flags. Without the echo it would
+				// never set the flag in its outgoing per-packet headers.
 				if (m_my_flags & EC_FLAG_LARGE_TAG_COUNT) {
 					response->AddTag(CECEmptyTag(EC_TAG_CAN_LARGE_TAG_COUNT));
 				}
+				// Identifies this daemon *process*. ECIDs come from a counter that restarts
+				// with the process, so after a daemon restart the same numbers are handed out
+				// again in whatever order files load this time -- and a client that kept its
+				// objects across the reconnect would pair them up by number and quietly
+				// describe one file with another's data. A client that sees a different value
+				// here starts over. Old clients ignore the tag; new clients against an old
+				// daemon start over every reconnect, which is correct if wasteful.
+				response->AddTag(CECTag(EC_TAG_SESSION_ID, GetEcSessionId()));
 				if (m_partialUpdateActive) {
-					// Confirm partial-update mode so the client switches
-					// off its bulk "missing == deleted" fallback and
-					// expects explicit `EC_TAG_FILE_REMOVED` markers.
+					// Confirm partial-update mode so the client switches off its bulk
+					// "missing == deleted" fallback and expects explicit
+					// `EC_TAG_FILE_REMOVED` markers.
 					response->AddTag(CECEmptyTag(EC_TAG_CAN_PARTIAL_UPDATE));
 				}
+				if (m_partialSearchActive) {
+					// Confirm the search half too. The client must not stop deleting on
+					// absence until it knows the daemon actually skips unchanged results:
+					// against an older daemon absence still means the result is gone.
+					response->AddTag(CECEmptyTag(EC_TAG_CAN_PARTIAL_SEARCH));
+				}
+				// Unconditional: this daemon answers EC_OP_GET_CLIENT_HISTORY, and a client
+				// that does not see the echo must not send the request -- against a daemon
+				// that predates it the unknown opcode asserts.
+				response->AddTag(CECEmptyTag(EC_TAG_CAN_CLIENT_HISTORY));
+				if (m_chatActive) {
+					// Confirm the chat session ops so the client starts
+					// polling EC_OP_GET_CHAT_SESSIONS.
+					response->AddTag(CECEmptyTag(EC_TAG_CAN_CHAT_SESSIONS));
+				}
+				if (m_multiSearchActive) {
+					// Confirm multi-search mode so the client addresses searches by
+					// `EC_TAG_SEARCH_ID` rather than the legacy single-search
+					// sentinel.
+					response->AddTag(CECEmptyTag(EC_TAG_CAN_MULTI_SEARCH));
+					if (m_searchProgressUnionActive) {
+						// Confirm the union form of EC_OP_SEARCH_PROGRESS: the client
+						// then sends one id-less request per poll instead of one per
+						// open tab. Nested inside the multi-search echo on purpose:
+						// the union addresses its children by search ID, which only
+						// exists in that mode.
+						response->AddTag(
+							CECEmptyTag(EC_TAG_CAN_SEARCH_PROGRESS_UNION));
+					}
+				}
+				// Confirm we serve EC_OP_GET/SET_SHARED_DIRS, so a remote GUI can present an
+				// editable shared-folders panel instead of one whose edits it could never
+				// deliver. Unconditional: the ops need no per-connection state.
+				response->AddTag(CECEmptyTag(EC_TAG_CAN_SHAREDDIRS_CONFIG));
+				// Confirm we serve EC_OP_SEARCH_LIST, so a remote GUI can enumerate searches
+				// it did not start itself. Unconditional, for the same reason. A client that
+				// gets no echo must not send the opcode at all -- it would land in
+				// ProcessRequest2's unknown-opcode branch and assert.
+				response->AddTag(CECEmptyTag(EC_TAG_CAN_SEARCH_LIST));
 			} else {
 				wxString err;
 				if (passwd) {
@@ -666,6 +1332,11 @@
 					err = wxTRANSLATE("Authentication failed: missing password.");
 				}
 
+				// Both branches are a failed credential attempt: a client that omits the hash
+				// entirely is guessing just as much as one that sends a wrong hash, and
+				// letting the omission go uncounted would be an unmetered path.
+				theApp->ECServerHandler->AuthRateLimiter().NoteFailure(peerIp);
+
 				response = new CECPacket(EC_OP_AUTH_FAIL);
 				response->AddTag(CECTag(EC_TAG_STRING, err));
 				AddLogLineN(wxGetTranslation(err));
@@ -673,7 +1344,8 @@
 		}
 	} else {
 		response = new CECPacket(EC_OP_AUTH_FAIL);
-		response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid request, please authenticate first.")));
+		response->AddTag(
+			CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid request, please authenticate first.")));
 	}
 
 	if (response->GetOpCode() == EC_OP_AUTH_OK) {
@@ -686,31 +1358,38 @@
 	} 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()));
+			AddLogLineN(CFormat(_("Sent error message \"%s\" to client.")) %
+				    wxGetTranslation(response->GetFirstTagSafe()->GetStringData()));
 		}
 		// Access denied!
-		AddLogLineN(CFormat(_("Unauthorized access attempt from %s. Connection closed.")) % GetPeer() );
+		AddLogLineN(
+			CFormat(_("Unauthorized access attempt from %s. Connection closed.")) % GetPeer());
 		m_conn_state = CONN_FAILED;
 	}
 
 	return response;
 }
 
-// Make a Logger tag (if there are any logging messages) and add it to the response
+// Make a Logger tag (if there are any logging messages) and add it to the response.
+// Max log lines packed into a single EC stats response, kept bounded so a large
+// first-sync backlog drains in a handful of polls without any one poll hauling
+// multiple MB: the log rides on the same response as the live stats, and the client
+// renders each poll's batch in one go. The wire format imposes no such limit.
+static const int EC_LOG_LINES_PER_MESSAGE = 5000;
+
 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
+		// Tag structure is fix: tag carries nothing, inside are the strings.
 		int entries = 0;
 		wxString line;
-		while (entries < 200 && LoggerAccess.GetString(line)) {
+		while (entries < EC_LOG_LINES_PER_MESSAGE && LoggerAccess.GetString(line)) {
 			tag.AddTag(CECTag(EC_TAG_STRING, line));
 			entries++;
 		}
 		response->AddTag(tag);
-		//printf("send Log tag %d %d\n", FirstEntry, entries);
+		// printf("send Log tag %d %d\n", FirstEntry, entries);
 	}
 }
 
@@ -719,68 +1398,250 @@
 	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()));
-		/* fall through */
-		case EC_DETAIL_WEB:
-		case EC_DETAIL_CMD:
-			response->AddTag(CECTag(EC_TAG_STATS_UL_SPEED, (uint32)theStats::GetUploadRate()));
-			response->AddTag(CECTag(EC_TAG_STATS_DL_SPEED, (uint32)(theStats::GetDownloadRate())));
-			response->AddTag(CECTag(EC_TAG_STATS_UL_SPEED_LIMIT, (uint32)(thePrefs::GetMaxUpload()*1024.0)));
-			response->AddTag(CECTag(EC_TAG_STATS_DL_SPEED_LIMIT, (uint32)(thePrefs::GetMaxDownload()*1024.0)));
-			response->AddTag(CECTag(EC_TAG_STATS_UL_QUEUE_LEN, /*(uint32)*/theStats::GetWaitingUserCount()));
-			response->AddTag(CECTag(EC_TAG_STATS_TOTAL_SRC_COUNT, /*(uint32)*/theStats::GetFoundSources()));
-			// User/Filecounts
-			{
-				uint32 totaluser = 0, totalfile = 0;
-				theApp->serverlist->GetUserFileStatus( totaluser, totalfile );
-				response->AddTag(CECTag(EC_TAG_STATS_ED2K_USERS, totaluser));
-				response->AddTag(CECTag(EC_TAG_STATS_KAD_USERS, Kademlia::CKademlia::GetKademliaUsers()));
-				response->AddTag(CECTag(EC_TAG_STATS_ED2K_FILES, totalfile));
-				response->AddTag(CECTag(EC_TAG_STATS_KAD_FILES, Kademlia::CKademlia::GetKademliaFiles()));
-				response->AddTag(CECTag(EC_TAG_STATS_KAD_NODES, CStatistics::GetKadNodes()));
-			}
-			// 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_ADDRESS, 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_FULL:
+	// Not an actual INC_UPDATE: amulegui only sets the stats package to
+	// EC_DETAIL_INC_UPDATE so 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()));
+		// Disk space for the Downloads and Shared Files panels. Only the core can answer:
+		// the GUI may be on another machine entirely, and even where it mounts the same
+		// share it can see a different size or quota. Both getters are cache-backed, so a
+		// stats poll never costs a filesystem round trip.
+		response->AddTag(CECTag(EC_TAG_STATS_TEMP_FREE_SPACE, (uint64)theStats::GetTempFreeSpace()));
+		response->AddTag(
+			CECTag(EC_TAG_STATS_INCOMING_FREE_SPACE, (uint64)theStats::GetIncomingFreeSpace()));
+#ifdef ENABLE_VERSION_CHECK
+		// Version-check result, relayed for amuleapi's /version "update" object. Present
+		// only once a check has completed. OUTDATED is an empty marker tag, present only
+		// when a newer release exists.
+		if (theApp->IsVersionCheckDone()) {
+			response->AddTag(
+				CECTag(EC_TAG_GENERAL_VERSION_CHECK_LATEST, theApp->GetVersionCheckLatest()));
+			response->AddTag(CECTag(EC_TAG_GENERAL_VERSION_CHECK_TIMESTAMP,
+				(uint64)theApp->GetVersionCheckTimestamp()));
+			if (theApp->IsVersionCheckOutdated()) {
+				response->AddTag(CECEmptyTag(EC_TAG_GENERAL_VERSION_CHECK_OUTDATED));
 			}
-		case EC_DETAIL_UPDATE:
-			break;
+		}
+#endif
+	/* fall through */
+	case EC_DETAIL_WEB:
+	case EC_DETAIL_CMD:
+		response->AddTag(CECTag(EC_TAG_STATS_UL_SPEED, (uint32)theStats::GetUploadRate()));
+		response->AddTag(CECTag(EC_TAG_STATS_DL_SPEED, (uint32)(theStats::GetDownloadRate())));
+		response->AddTag(
+			CECTag(EC_TAG_STATS_UL_SPEED_LIMIT, (uint32)(thePrefs::GetMaxUpload() * 1024.0)));
+		response->AddTag(
+			CECTag(EC_TAG_STATS_DL_SPEED_LIMIT, (uint32)(thePrefs::GetMaxDownload() * 1024.0)));
+		response->AddTag(
+			CECTag(EC_TAG_STATS_UL_QUEUE_LEN, /*(uint32)*/ theStats::GetWaitingUserCount()));
+		response->AddTag(
+			CECTag(EC_TAG_STATS_TOTAL_SRC_COUNT, /*(uint32)*/ theStats::GetFoundSources()));
+		// User/Filecounts
+		{
+			uint32 totaluser = 0, totalfile = 0;
+			theApp->serverlist->GetUserFileStatus(totaluser, totalfile);
+			response->AddTag(CECTag(EC_TAG_STATS_ED2K_USERS, totaluser));
+			response->AddTag(
+				CECTag(EC_TAG_STATS_KAD_USERS, Kademlia::CKademlia::GetKademliaUsers()));
+			response->AddTag(CECTag(EC_TAG_STATS_ED2K_FILES, totalfile));
+			response->AddTag(
+				CECTag(EC_TAG_STATS_KAD_FILES, Kademlia::CKademlia::GetKademliaFiles()));
+			response->AddTag(CECTag(EC_TAG_STATS_KAD_NODES, CStatistics::GetKadNodes()));
+		}
+		// 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_ADDRESS,
+				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:
+		break;
 	};
 
 	return response;
 }
 
-static CECPacket *Get_EC_Response_GetSharedFiles(const CECPacket *request, CFileEncoderMap &encoders,
+// Serialise the daemon's shared-directory configuration: one EC_TAG_SHAREDDIR per
+// configured root, with an EC_TAG_SHAREDDIR_RECURSIVE subtag on the roots whose
+// entire subtree is shared. Only the two *intent* lists travel -- shareddir.dat is
+// the runtime union the daemon regenerates itself, so sending it would invite a
+// remote client to edit a derived artefact.
+static CECPacket *Get_EC_Response_GetSharedDirs()
+{
+	CECPacket *response = new CECPacket(EC_OP_GET_SHARED_DIRS);
+
+	for (const CPath &dir : theApp->glob_prefs->shareddir_explicit_list) {
+		response->AddTag(CECTag(EC_TAG_SHAREDDIR, dir.GetRaw()));
+	}
+	for (const CPath &dir : theApp->glob_prefs->shareddir_recursive_list) {
+		CECTag dirTag(EC_TAG_SHAREDDIR, dir.GetRaw());
+		dirTag.AddTag(CECTag(EC_TAG_SHAREDDIR_RECURSIVE, (uint8)1));
+		response->AddTag(dirTag);
+	}
+
+	return response;
+}
+
+// Replace the shared-directory configuration with the client's list, persist both
+// intent files and rescan. Paths are validated here because a remote GUI cannot
+// browse this host's filesystem -- a typo would otherwise become a silently dead
+// share. Rejected paths are reported back individually with a numeric reason the
+// client translates, so the daemon's locale never leaks; every path that did
+// validate is still applied.
+namespace
+{
+
+// The client's resume cursor: it already holds everything up to this id.
+// Absent or 0 means "everything you still have".
+uint32 ChatCursorFrom(const CECPacket *request)
+{
+	const CECTag *tag = request->GetTagByName(EC_TAG_CHAT_MSG_ID);
+	return tag ? static_cast<uint32>(tag->GetInt()) : 0;
+}
+
+// One EC_TAG_CHAT_SESSION container: identity, plus every message newer than
+// `cursor`. A session with nothing new still encodes, with no message children --
+// that is how a late-connecting client learns it exists.
+CECTag EncodeChatSession(const CChatSessionStore::Session &session, uint32 cursor)
+{
+	CECTag tag(EC_TAG_CHAT_SESSION, session.gui_id);
+	tag.AddTag(CECTag(EC_TAG_CHAT_PEER_NAME, session.name));
+	tag.AddTag(CECTag(EC_TAG_CHAT_MSG_ID, session.LastMsgId()));
+
+	// Link the live peer and the friend entry when they exist, so a client can join
+	// against its own /clients and /friends views without a lookup of its own. Both are
+	// omitted when absent rather than sent as 0.
+	if (const CUpDownClient *client = theApp->clientlist->FindClientByIP(session.ip, session.port)) {
+		tag.AddTag(CECTag(EC_TAG_CLIENT, client->ECID()));
+		// Sent whenever the client is, so "we are talking to a peer that is actually
+		// reachable" is answerable without inferring it from the ECID being present --
+		// which is true from the first contact ATTEMPT, so a chat opened against an
+		// unroutable address read as online.
+		tag.AddTag(CECTag(EC_TAG_CLIENT_CONNECTED, client->IsConnected()));
+	}
+	if (const CFriend *f = theApp->friendlist->FindFriend(CMD4Hash(), session.ip, session.port)) {
+		tag.AddTag(CECTag(EC_TAG_FRIEND, f->ECID()));
+	}
+
+	for (const CChatSessionStore::Message &msg : session.messages) {
+		if (msg.id <= cursor) {
+			continue;
+		}
+		CECTag msgTag(EC_TAG_CHAT_MESSAGE, msg.text);
+		msgTag.AddTag(CECTag(EC_TAG_CHAT_MSG_ID, msg.id));
+		msgTag.AddTag(CECTag(EC_TAG_CHAT_DIRECTION, msg.direction));
+		msgTag.AddTag(CECTag(EC_TAG_CHAT_TIMESTAMP, msg.timestamp));
+		tag.AddTag(msgTag);
+	}
+	return tag;
+}
+
+// Resolve an EC_OP_CHAT_SEND target to a GUI_ID. One addressing mode: the target of a chat
+// IS an address, and every caller has it -- amulegui from the session it is replying in, the
+// API from the ip:port in its own client and friend rows. The ECID modes that used to sit
+// here resolved to this same GUI_ID and only saved the caller a lookup it does not need.
+bool ResolveChatTarget(const CECPacket *request, uint64 &out_gui_id)
+{
+	if (const CECTag *tag = request->GetTagByName(EC_TAG_CHAT_CLIENT_ID)) {
+		out_gui_id = tag->GetInt();
+		return out_gui_id != 0;
+	}
+	return false;
+}
+
+} // namespace
+
+static CECPacket *Get_EC_Response_SetSharedDirs(const CECPacket *request)
+{
+	CECPacket *response = new CECPacket(EC_OP_SET_SHARED_DIRS);
+
+	CPreferences::PathList explicitDirs;
+	CPreferences::PathList recursiveDirs;
+
+	for (const CECTag &tag : *request) {
+		if (tag.GetTagName() != EC_TAG_SHAREDDIR) {
+			continue;
+		}
+		const wxString rawPath = tag.GetStringData();
+		const CPath path(rawPath);
+		// EC_SHAREDDIR_ERR_*: 1 = missing or not a directory, 2 = unreadable.
+		uint8 reason = 0;
+		if (!path.IsOk() || !path.DirExists()) {
+			reason = 1;
+		} else if (!wxFileName::IsDirReadable(path.GetRaw())) {
+			reason = 2;
+		}
+		if (reason != 0) {
+			CECTag rejected(EC_TAG_SHAREDDIR_REJECTED, rawPath);
+			rejected.AddTag(CECTag(EC_TAG_SHAREDDIR_ERROR, reason));
+			response->AddTag(rejected);
+			continue;
+		}
+		const CECTag *recursiveTag = tag.GetTagByName(EC_TAG_SHAREDDIR_RECURSIVE);
+		if (recursiveTag != nullptr && recursiveTag->GetInt() != 0) {
+			recursiveDirs.push_back(path);
+		} else {
+			explicitDirs.push_back(path);
+		}
+	}
+
+	theApp->glob_prefs->shareddir_explicit_list = explicitDirs;
+	theApp->glob_prefs->shareddir_recursive_list = recursiveDirs;
+	// The union (shareddir.dat) has to be refreshed here too, not just the two intent
+	// lists. ReloadSharedFolders reconciles against the union on disk and drops any
+	// explicit root missing from it -- that is how it honours external edits -- so a
+	// stale union would make it trim the roots we just added.
+	CPreferences::PathList unionDirs = explicitDirs;
+	unionDirs.insert(unionDirs.end(), recursiveDirs.begin(), recursiveDirs.end());
+	theApp->glob_prefs->shareddir_list = unionDirs;
+	// Persist before reloading: FindSharedFiles starts by re-reading the
+	// intent files from disk, so the in-memory lists alone wouldn't stick.
+	theApp->glob_prefs->SaveSharedFolders();
+	// The lists above are written and persisted synchronously, so the reply still means
+	// "directories accepted and saved"; only the rescan is deferred to the next
+	// Process() tick.
+	theApp->sharedfiles->RequestReload();
+
+	return response;
+}
+
+static CECPacket *Get_EC_Response_GetSharedFiles(const CECPacket *request,
+	CFileEncoderMap &encoders,
 	uint64 &io_lastEcGenSeen,
-	bool partial_update_active, std::set<uint32> &io_lastSentFileIds,
+	bool partial_update_active,
+	std::set<uint32> &io_lastSentFileIds,
 	std::set<uint32> &io_sentWithDetailIds)
 {
 	wxASSERT(request->GetOpCode() == EC_OP_GET_SHARED_FILES);
@@ -794,54 +1655,53 @@
 
 	encoders.UpdateEncoders();
 
-	// Skip-unchanged + EC_TAG_FILE_REMOVED is wired only for the
-	// `EC_DETAIL_UPDATE` polling path that amuleweb uses (`EC_OP_GET_
-	// SHARED_FILES` re-issued each cycle with an encoder-retained diff
-	// state) and only when the client opted into the partial-update
-	// protocol at auth. `EC_DETAIL_FULL` callers (amulecmd `show shared`,
-	// any one-shot query) still get every alive file as a full tag.
-	const bool skip_unchanged_path =
-		partial_update_active && detail_level == EC_DETAIL_UPDATE;
-	const uint64 ec_snapshot = skip_unchanged_path
-		? CKnownFile::GetGlobalECGen() : 0;
+	// Skip-unchanged + EC_TAG_FILE_REMOVED is wired only for the EC_DETAIL_UPDATE
+	// polling path that amuleweb uses, and only when the client opted into the
+	// partial-update protocol at auth. EC_DETAIL_FULL callers (amulecmd `show shared`,
+	// any one-shot query) still get every alive file in full.
+	const bool skip_unchanged_path = partial_update_active && detail_level == EC_DETAIL_UPDATE;
+	const uint64 ec_snapshot = skip_unchanged_path ? CKnownFile::GetGlobalECGen() : 0;
 	const uint64 ec_threshold = io_lastEcGenSeen;
 
-	// Snapshot the shared-file list once. GetFileByIndex() does an O(N)
-	// std::advance over the underlying std::map and re-acquires list_mut
-	// on every call -- looping it N times is O(N^2) and pegs the main
-	// thread for tens of minutes on users with tens of thousands of
-	// shared files (issue #666).
-	std::vector<CKnownFile*> snapshot;
+	// Snapshot the shared-file list once. GetFileByIndex() does an O(N) std::advance
+	// over the underlying std::map and re-acquires list_mut on every call -- looping it
+	// N times is O(N^2) and pegs the main thread for tens of minutes on users with tens
+	// of thousands of shared files.
+	std::vector<CKnownFile *> snapshot;
 	theApp->sharedfiles->CopyFileList(snapshot);
 
 	// Snapshot the alive set for the partial-update removal diff below.
 	std::set<uint32> current_file_ids;
 
-	for (std::vector<CKnownFile*>::const_iterator it = snapshot.begin();
-		it != snapshot.end(); ++it) {
+	for (std::vector<CKnownFile *>::const_iterator it = snapshot.begin(); it != snapshot.end(); ++it) {
 		const CKnownFile *cur_file = *it;
 
-		if ( !cur_file || (!queryitems.empty() && !queryitems.count(cur_file->ECID())) ) {
+		if (!cur_file || (!queryitems.empty() && !queryitems.count(cur_file->ECID()))) {
 			continue;
 		}
 		const uint32 ecid = cur_file->ECID();
 		if (skip_unchanged_path) {
 			current_file_ids.insert(ecid);
-			if (cur_file->GetECGen() <= ec_threshold
-				&& io_sentWithDetailIds.count(ecid)) {
-				// Client already has the latest exported view of
-				// this file; absence here is "no change", not
-				// "deleted" — see `EC_TAG_FILE_REMOVED` emission
-				// below. The `io_sentWithDetailIds` gate prevents
-				// silently skipping ECIDs the client has never
-				// received with full detail (#808-class ghost).
+			if (cur_file->GetECGen() <= ec_threshold && io_sentWithDetailIds.count(ecid)) {
+				// Client already has the latest exported view of this file; absence
+				// here is "no change", not "deleted" -- see the EC_TAG_FILE_REMOVED
+				// emission below. The sent-with-detail gate prevents silently skipping
+				// ECIDs the client has never received in full.
 				continue;
 			}
 		}
 
 		CEC_SharedFile_Tag filetag(cur_file, detail_level);
 		CKnownFile_Encoder *enc = encodersecid;
-		if ( detail_level != EC_DETAIL_UPDATE ) {
+		if (!enc) {
+			// UpdateEncoders reads the list generations unlocked, so a file added on a
+			// worker thread between that read and this handler's own snapshot can be
+			// present here with no encoder built for it yet. Skip it this cycle -- it stays
+			// in current_file_ids, so it is not reported as removed -- and the next poll's
+			// reconcile builds it. Dereferencing NULL would crash amuled.
+			continue;
+		}
+		if (detail_level != EC_DETAIL_UPDATE) {
 			enc->ResetEncoder();
 		}
 		enc->Encode(&filetag);
@@ -855,7 +1715,8 @@
 		// One EC_TAG_FILE_REMOVED per file that was in the previous
 		// response but is no longer alive on the server.
 		for (std::set<uint32>::const_iterator it = io_lastSentFileIds.begin();
-			it != io_lastSentFileIds.end(); ++it) {
+			it != io_lastSentFileIds.end();
+			++it) {
 			if (!current_file_ids.count(*it)) {
 				response->AddTag(CECTag(EC_TAG_FILE_REMOVED, *it));
 			}
@@ -866,100 +1727,168 @@
 	return response;
 }
 
-static CECPacket *Get_EC_Response_GetUpdate(CFileEncoderMap &encoders, CObjTagMap &tagmap,
+/**
+ * The credit store, one tag per peer we have ever exchanged data with.
+ *
+ * Sent whole rather than incrementally: it changes only when a peer connects or
+ * disconnects, the client asks for it once when the page is opened, and every
+ * other EC bulk request works the same way. Metadata fields are emitted only
+ * when the store actually has them -- a record written before aMule kept that
+ * information carries a hash, totals and a last-seen date and nothing else.
+ */
+static CECPacket *Get_EC_Response_ClientHistory()
+{
+	CECPacket *response = new CECPacket(EC_OP_CLIENT_HISTORY);
+	if (!theApp->clientcredits) {
+		return response;
+	}
+
+	std::vector<CClientCredits *> credits;
+	theApp->clientcredits->GetAllCredits(credits);
+	for (const CClientCredits *cur : credits) {
+		const CreditStruct *data = cur->GetDataStruct();
+		CECTag entry(EC_TAG_CLIENT, data->key);
+		entry.AddTag(CECTag(EC_TAG_CLIENT_UPLOAD_TOTAL, cur->GetUploadedTotal()));
+		entry.AddTag(CECTag(EC_TAG_CLIENT_DOWNLOAD_TOTAL, cur->GetDownloadedTotal()));
+		// The same tag the live client payload carries, computed from the same totals, so a
+		// history row does not have to re-derive the formula to fill its Ratio column.
+		entry.AddTag(CECTag(EC_TAG_CLIENT_SCORE_RATIO, (double)cur->GetCreditRatio()));
+		entry.AddTag(CECTag(EC_TAG_CLIENT_LAST_SEEN, data->nLastSeen));
+
+		if (cur->HasMeta()) {
+			const ClientMetaStruct &meta = cur->GetMeta();
+			entry.AddTag(CECTag(EC_TAG_CLIENT_FIRST_SEEN, meta.firstSeen));
+			entry.AddTag(CECTag(EC_TAG_CLIENT_SESSIONS, meta.sessions));
+			if (!meta.name.IsEmpty()) {
+				entry.AddTag(CECTag(EC_TAG_CLIENT_NAME, meta.name));
+			}
+			entry.AddTag(CECTag(EC_TAG_CLIENT_USER_IP, meta.lastIP));
+			entry.AddTag(CECTag(EC_TAG_CLIENT_USER_PORT, meta.lastPort));
+			entry.AddTag(CECTag(EC_TAG_CLIENT_KAD_PORT, meta.kadPort));
+			entry.AddTag(CECTag(EC_TAG_CLIENT_SOFTWARE, meta.clientSoft));
+			// The same per-software rendering the live path uses. This used to be a generic
+			// major.minor.update built here, on the reasoning that only lPhant and eMule+
+			// have a bespoke format -- which overlooked plain eMule, whose update component
+			// is a letter, so every eMule in the history read as v0.70.1 rather than v0.70b.
+			entry.AddTag(CECTag(EC_TAG_CLIENT_SOFT_VER_STR,
+				FormatPackedClientVersion(meta.clientSoft, meta.version)));
+			entry.AddTag(CECTag(EC_TAG_CLIENT_FROM, meta.sourceFrom));
+			entry.AddTag(CECTag(EC_TAG_CLIENT_OBFUSCATION_STATUS, meta.obfuscation));
+#ifdef ENABLE_IP2COUNTRY
+			// Resolved here for the same reason live peers are: amulegui has no GeoIP
+			// database of its own, so a country it is not told is a country it cannot show.
+			// Emitted even when empty, so tag-present means "the daemon looked" and
+			// tag-absent means "the daemon has no GeoIP".
+			if (theApp->GetIP2Country() && theApp->GetIP2Country()->IsEnabled()) {
+				entry.AddTag(CECTag(EC_TAG_CLIENT_COUNTRY,
+					theApp->GetIP2Country()->GetCountryCode(meta.lastIP)));
+			}
+#endif
+		}
+		response->AddTag(entry);
+	}
+	return response;
+}
+
+static CECPacket *Get_EC_Response_GetUpdate(CFileEncoderMap &encoders,
+	CObjTagMap &tagmap,
 	uint64 &io_lastEcGenSeen,
-	bool partial_update_active, std::set<uint32> &io_lastSentFileIds,
-	std::set<uint32> &io_sentWithDetailIds)
+	bool partial_update_active,
+	std::vector<uint32> &io_lastSentFileIds)
 {
 	CECPacket *response = new CECPacket(EC_OP_SHARED_FILES);
 
-	// Snapshot the global EC generation now. Any file whose `m_ecGen`
-	// exceeds the caller's `m_lastEcGenSeen` has been touched by a
-	// `MarkECChanged()` hook since the last response for this client and
-	// is sent through the encoder; anything older is unchanged from the
-	// client's point of view and skipped. Reading the snapshot before the
-	// iteration means files that change mid-loop are picked up on the
-	// next request (their `m_ecGen` will exceed our snapshot).
+	// Snapshot the global EC generation now. Any file whose `m_ecGen` exceeds the
+	// caller's `m_lastEcGenSeen` has been touched by a MarkECChanged() hook since the
+	// last response for this client and is sent through the encoder. Reading the
+	// snapshot before the iteration means files that change mid-loop are picked up on
+	// the next request.
 	const uint64 ec_snapshot = CKnownFile::GetGlobalECGen();
 	const uint64 ec_threshold = io_lastEcGenSeen;
 
-	encoders.UpdateEncoders();
+	// Freshly-created encoders this cycle. Every entry is an ECID whose prior encoder
+	// was either destroyed or never existed, so the peer's mirrored state for it is
+	// empty and any INC_UPDATE the ctor would suppress against a cached value produces
+	// a hash-less tag the client rejects. Drop the cache so the file re-appears in full
+	// detail on this response; the encoder's sent-with-detail flag starts at zero.
+	std::set<uint32> freshEcids;
+	encoders.UpdateEncoders(&freshEcids);
+	for (uint32 ecid : freshEcids) {
+		tagmap.EraseValueMap(ecid);
+	}
 
-	// Snapshot the IDs of all files currently alive on the server. Used
-	// by the partial-update path below to diff against the previous cycle
-	// and synthesize `EC_TAG_FILE_REMOVED` markers.
-	std::set<uint32> current_file_ids;
+	// The IDs of all files currently alive on the server, ascending -- the encoder map
+	// is keyed by ECID, so iterating it below appends them in order. Used by the
+	// partial-update path to diff against the previous cycle and synthesize
+	// EC_TAG_FILE_REMOVED markers; a legacy client infers removal from absence instead.
+	//
+	// The ordering the merge needs is guaranteed by the container: CFileEncoderMap keeps
+	// its entries sorted by ECID and asserts that at the end of every reconcile.
+	std::vector<uint32> current_file_ids;
+	if (partial_update_active) {
+		current_file_ids.reserve(encoders.size());
+	}
 
 	for (CFileEncoderMap::iterator it = encoders.begin(); it != encoders.end(); ++it) {
 		const CKnownFile *cur_file = it->second->GetFile();
 		const uint32 ecid = cur_file->ECID();
-		current_file_ids.insert(ecid);
+		if (partial_update_active) {
+			current_file_ids.push_back(ecid);
+		}
 
-		if (cur_file->GetECGen() <= ec_threshold
-			&& io_sentWithDetailIds.count(ecid)) {
-			// Nothing exported has changed since the client's last
-			// view of this file AND the client has previously
-			// received this ECID with full detail. Two paths
-			// depending on whether the client negotiated partial-
-			// update at auth time:
+		if (cur_file->GetECGen() <= ec_threshold && it->second->WasSentOnUpdatePath()) {
+			// Nothing exported has changed since the client's last view of this file
+			// AND the client has previously received this ECID with full detail.
 			if (partial_update_active) {
-				// New protocol: skip the file entirely. The client
-				// only deletes when it sees an explicit
-				// `EC_TAG_FILE_REMOVED` (emitted below), so absence
-				// here is correctly interpreted as "no change".
+				// New protocol: skip the file entirely. The client only deletes when
+				// it sees an explicit EC_TAG_FILE_REMOVED, emitted below, so absence
+				// here is correctly read as "no change".
 				continue;
 			}
-			// Legacy clients (amulegui / amuleweb on master) treat
-			// any file missing from the response as deleted, then
-			// re-add it on the next full-sweep cycle — wedging the
-			// GUI on big libraries (#713). Emit a 5-byte alive
-			// marker (`EC_TAG_KNOWNFILE` / `EC_TAG_PARTFILE` with
-			// the ECID and no children); the client's
-			// `if (tag->HasChildTags()) ProcessItemUpdate(...)`
-			// already treats childless tags as a no-op update but
-			// still records the file as present.
-			const ec_tagname_t tagname = it->second->IsPartFile_Encoder()
-				? EC_TAG_PARTFILE : EC_TAG_KNOWNFILE;
+			// Legacy clients treat any file missing from the response as deleted, then
+			// re-add it on the next full-sweep cycle -- wedging the GUI on big libraries.
+			// Emit a 5-byte alive marker (EC_TAG_KNOWNFILE / EC_TAG_PARTFILE with the ECID
+			// and no children): the client's `if (tag->HasChildTags())` already treats a
+			// childless tag as a no-op update, but still records the file as present.
+			const ec_tagname_t tagname =
+				it->second->IsPartFile_Encoder() ? EC_TAG_PARTFILE : EC_TAG_KNOWNFILE;
 			response->AddTag(CECTag(tagname, ecid));
 			continue;
 		}
-		// Fall-through path: either m_ecGen > ec_threshold (file
-		// changed since the client's last view) OR the ECID is new
-		// to this client. In both cases the client needs the full
-		// payload — alive-markers / silent skip would produce a
-		// ghost entry (#808) when the metadata never reached the
-		// client.
+		// Fall-through: either the file changed since the client's last view, or the ECID
+		// is new to this client. In both cases the client needs the full payload -- an
+		// alive marker or a silent skip would produce a ghost entry whose metadata never
+		// reached the client.
 		CValueMap &valuemap = tagmap.GetValueMap(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.
+		// Completed cleared Partfiles are still stored as CPartfile but encoded as
+		// KnownFile, so check the encoder type rather than the file type.
 		if (it->second->IsPartFile_Encoder()) {
-			CEC_PartFile_Tag filetag(static_cast<const CPartFile*>(cur_file), EC_DETAIL_INC_UPDATE, &valuemap);
+			CEC_PartFile_Tag filetag(
+				static_cast<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 = static_cast<CPartFile_Encoder *>(encodersecid);
+			// `it->second` is this ECID's encoder already; looking it
+			// up again by key would be a second tree descent per file.
+			CPartFile_Encoder *enc = static_cast<CPartFile_Encoder *>(it->second);
 			enc->Encode(&filetag);
 			response->AddTag(filetag);
 		} else {
 			CEC_SharedFile_Tag filetag(cur_file, EC_DETAIL_INC_UPDATE, &valuemap);
-			CKnownFile_Encoder * enc = encodersecid;
-			enc->Encode(&filetag);
+			it->second->Encode(&filetag);
 			response->AddTag(filetag);
 		}
-		io_sentWithDetailIds.insert(ecid);
+		it->second->MarkSentOnUpdatePath();
 	}
 
 	if (partial_update_active) {
-		// Partial-update protocol: emit one `EC_TAG_FILE_REMOVED` per
-		// file that was in the previous response but is no longer
-		// alive on the server. Replaces the legacy client's bulk
-		// "anything missing == deleted" inference.
-		for (std::set<uint32>::const_iterator it = io_lastSentFileIds.begin();
-			it != io_lastSentFileIds.end(); ++it) {
-			if (!current_file_ids.count(*it)) {
-				response->AddTag(CECTag(EC_TAG_FILE_REMOVED, *it));
-			}
+		// Partial-update protocol: emit one EC_TAG_FILE_REMOVED per file that was in the
+		// previous response but is no longer alive on the server, replacing the legacy
+		// client's bulk "anything missing == deleted" inference.
+		std::vector<uint32> removed;
+		ComputeRemovedIds(io_lastSentFileIds, current_file_ids, removed);
+		for (uint32 ecid : removed) {
+			response->AddTag(CECTag(EC_TAG_FILE_REMOVED, ecid));
 		}
 		io_lastSentFileIds.swap(current_file_ids);
 	}
@@ -968,10 +1897,10 @@
 
 	// Add clients
 	CECEmptyTag clients(EC_TAG_CLIENT);
-	const CClientList::IDMap& clientList = theApp->clientlist->GetClientList();
+	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();
+		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.
@@ -984,10 +1913,10 @@
 
 	// Add servers
 	CECEmptyTag servers(EC_TAG_SERVER);
-	std::vector<const CServer*> serverlist = theApp->serverlist->CopySnapshot();
+	std::vector<const CServer *> serverlist = theApp->serverlist->CopySnapshot();
 	uint32 nrServers = serverlist.size();
 	for (uint32 i = 0; i < nrServers; i++) {
-		const CServer* cur_server = serverlisti;
+		const CServer *cur_server = serverlisti;
 		CValueMap &valuemap = tagmap.GetValueMap(cur_server->ECID());
 		servers.AddTag(CEC_Server_Tag(cur_server, &valuemap));
 	}
@@ -995,8 +1924,9 @@
 
 	// 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;
+	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));
 	}
@@ -1011,17 +1941,15 @@
 
 	EC_DETAIL_LEVEL detail_level = request->GetDetailLevel();
 
-	//
-	// request can contain list of queried items
-	// (not for incremental update of course)
+	// request can contain list of queried items (not for incremental update of course)
 	CTagSet<uint32, EC_TAG_CLIENT> queryitems(request);
 
-	const CClientRefList& clients = theApp->uploadqueue->GetUploadingList();
+	const CClientRefList &clients = theApp->uploadqueue->GetUploadingList();
 	CClientRefList::const_iterator it = clients.begin();
 	for (; it != clients.end(); ++it) {
-		CUpDownClient* cur_client = it->GetClient();
+		CUpDownClient *cur_client = it->GetClient();
 
-		if (!cur_client) {	// shouldn't happen
+		if (!cur_client) { // shouldn't happen
 			continue;
 		}
 		if (!queryitems.empty() && !queryitems.count(cur_client->ECID())) {
@@ -1039,10 +1967,11 @@
 	return response;
 }
 
-
-static CECPacket *Get_EC_Response_GetDownloadQueue(const CECPacket *request, CFileEncoderMap &encoders,
+static CECPacket *Get_EC_Response_GetDownloadQueue(const CECPacket *request,
+	CFileEncoderMap &encoders,
 	uint64 &io_lastEcGenSeen,
-	bool partial_update_active, std::set<uint32> &io_lastSentFileIds,
+	bool partial_update_active,
+	std::set<uint32> &io_lastSentFileIds,
 	std::set<uint32> &io_sentWithDetailIds)
 {
 	CECPacket *response = new CECPacket(EC_OP_DLOAD_QUEUE);
@@ -1054,51 +1983,46 @@
 
 	encoders.UpdateEncoders();
 
-	// Skip-unchanged + EC_TAG_FILE_REMOVED is wired only for the
-	// `EC_DETAIL_UPDATE` polling path that amuleweb uses, and only when
-	// the client opted into the partial-update protocol at auth. Other
-	// callers still get every alive file as a full tag.
-	const bool skip_unchanged_path =
-		partial_update_active && detail_level == EC_DETAIL_UPDATE;
-	const uint64 ec_snapshot = skip_unchanged_path
-		? CKnownFile::GetGlobalECGen() : 0;
+	// Skip-unchanged + EC_TAG_FILE_REMOVED is wired only for the EC_DETAIL_UPDATE
+	// polling path that amuleweb uses, and only when the client opted into the
+	// partial-update protocol at auth. Other callers get every alive file.
+	const bool skip_unchanged_path = partial_update_active && detail_level == EC_DETAIL_UPDATE;
+	const uint64 ec_snapshot = skip_unchanged_path ? CKnownFile::GetGlobalECGen() : 0;
 	const uint64 ec_threshold = io_lastEcGenSeen;
 
-	// Snapshot once to avoid re-locking downloadqueue's mutex on every
-	// iteration (see Get_EC_Response_GetSharedFiles for the matching
-	// shared-files fix in issue #666).
-	std::vector<CPartFile*> snapshot;
+	// Snapshot once to avoid re-locking downloadqueue's mutex on every iteration
+	// -- see Get_EC_Response_GetSharedFiles for the matching shared-files fix.
+	std::vector<CPartFile *> snapshot;
 	theApp->downloadqueue->CopyFileList(snapshot);
 
 	std::set<uint32> current_file_ids;
 
-	for (std::vector<CPartFile*>::const_iterator it = snapshot.begin();
-		it != snapshot.end(); ++it) {
+	for (std::vector<CPartFile *>::const_iterator it = snapshot.begin(); it != snapshot.end(); ++it) {
 		CPartFile *cur_file = *it;
 
-		if ( !queryitems.empty() && !queryitems.count(cur_file->ECID()) ) {
+		if (!queryitems.empty() && !queryitems.count(cur_file->ECID())) {
 			continue;
 		}
 		const uint32 ecid = cur_file->ECID();
 		if (skip_unchanged_path) {
 			current_file_ids.insert(ecid);
-			if (cur_file->GetECGen() <= ec_threshold
-				&& io_sentWithDetailIds.count(ecid)) {
-				// Client already has the latest exported view of
-				// this partfile; absence here is "no change",
-				// not "deleted" — see `EC_TAG_FILE_REMOVED`
-				// emission below. The `io_sentWithDetailIds`
-				// gate prevents silently skipping ECIDs the
-				// client has never received with full detail
-				// (#808-class ghost).
+			if (cur_file->GetECGen() <= ec_threshold && io_sentWithDetailIds.count(ecid)) {
+				// Client already has the latest exported view of this partfile; absence
+				// here is "no change", not "deleted" -- see the EC_TAG_FILE_REMOVED
+				// emission below. The sent-with-detail gate prevents silently skipping
+				// ECIDs the client has never received in full.
 				continue;
 			}
 		}
 
 		CEC_PartFile_Tag filetag(cur_file, detail_level);
 
-		CPartFile_Encoder * enc = static_cast<CPartFile_Encoder *>(encodersecid);
-		if ( detail_level != EC_DETAIL_UPDATE ) {
+		CPartFile_Encoder *enc = static_cast<CPartFile_Encoder *>(encodersecid);
+		if (!enc) {
+			// See the matching note in Get_EC_Response_GetSharedFiles.
+			continue;
+		}
+		if (detail_level != EC_DETAIL_UPDATE) {
 			enc->ResetEncoder();
 		}
 		enc->Encode(&filetag);
@@ -1111,7 +2035,8 @@
 
 	if (skip_unchanged_path) {
 		for (std::set<uint32>::const_iterator it = io_lastSentFileIds.begin();
-			it != io_lastSentFileIds.end(); ++it) {
+			it != io_lastSentFileIds.end();
+			++it) {
 			if (!current_file_ids.count(*it)) {
 				response->AddTag(CECTag(EC_TAG_FILE_REMOVED, *it));
 			}
@@ -1122,10 +2047,8 @@
 	return response;
 }
 
-
-// Build a CEC_SharedFile_Tag for the per-file cache. The output is
-// self-contained — the encoder is reset before each Encode call in
-// FULL mode (see Get_EC_Response_GetSharedFiles), so a local encoder
+// Build a CEC_SharedFile_Tag for the per-file cache. The output is self-contained --
+// the encoder is reset before each Encode call in FULL mode -- so a local encoder
 // suffices. Caller owns the returned tag.
 static CECTag *BuildSharedFileCacheTag(const void *file_v)
 {
@@ -1137,7 +2060,6 @@
 	return filetag;
 }
 
-
 // Same shape for partfiles.
 static CECTag *BuildPartFileCacheTag(const void *file_v)
 {
@@ -1149,16 +2071,13 @@
 	return filetag;
 }
 
-
-// Two daemon-wide caches. Each holds one pre-serialized blob per file
-// in its domain, freshness-stamped with the file's m_ecGen at build
-// time. A request rebuilds only entries whose file gen has advanced
-// past the cached gen — the same per-file freshness primitive the
-// INC_UPDATE path uses.
+// Two daemon-wide caches. Each holds one pre-serialized blob per file in its domain,
+// freshness-stamped with the file's m_ecGen at build time. A request rebuilds only
+// entries whose file gen has advanced past the cached gen -- the same per-file
+// freshness primitive the INC_UPDATE path uses.
 static CECFullResponseCache s_sharedFilesFullCache(BuildSharedFileCacheTag);
 static CECFullResponseCache s_downloadQueueFullCache(BuildPartFileCacheTag);
 
-
 static CECPacket *Get_EC_Response_PartFile_Cmd(const CECPacket *request)
 {
 	CECPacket *response = NULL;
@@ -1170,60 +2089,71 @@
 		wxASSERT(hashtag.GetTagName() == EC_TAG_PARTFILE);
 
 		CMD4Hash hash = hashtag.GetMD4Data();
-		CPartFile *pfile = theApp->downloadqueue->GetFileByID( hash );
+		CPartFile *pfile = theApp->downloadqueue->GetFileByID(hash);
 
-		if ( !pfile ) {
-			AddLogLineN(CFormat(_("Remote PartFile command failed: FileHash not found: %s")) % hash.Encode());
+		if (!pfile) {
+			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;
+			response->AddTag(CECTag(EC_TAG_STRING,
+				CFormat(wxString(wxTRANSLATE("FileHash not found: %s"))) % hash.Encode()));
+			// return response;
 			break;
 		}
 		switch (request->GetOpCode()) {
-			case EC_OP_PARTFILE_SWAP_A4AF_THIS:
-				CoreNotify_PartFile_Swap_A4AF(pfile);
-				break;
-			case EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO:
-				CoreNotify_PartFile_Swap_A4AF_Auto(pfile);
-				break;
-			case EC_OP_PARTFILE_SWAP_A4AF_OTHERS:
-				CoreNotify_PartFile_Swap_A4AF_Others(pfile);
-				break;
-			case EC_OP_PARTFILE_PAUSE:
-				pfile->PauseFile();
-				break;
-			case EC_OP_PARTFILE_RESUME:
-				pfile->ResumeFile();
-				pfile->SavePartFile();
-				break;
-			case EC_OP_PARTFILE_STOP:
-				pfile->StopFile();
-				break;
-			case EC_OP_PARTFILE_PRIO_SET: {
-					uint8 prio = hashtag.GetFirstTagSafe()->GetInt();
-					if ( prio == PR_AUTO ) {
-						pfile->SetAutoDownPriority(1);
-					} else {
-						pfile->SetAutoDownPriority(0);
-						pfile->SetDownPriority(prio);
-					}
-				}
-				break;
-			case EC_OP_PARTFILE_DELETE:
-				if ( thePrefs::StartNextFile() && (pfile->GetStatus() != PS_PAUSED) ) {
-					theApp->downloadqueue->StartNextFile(pfile);
-				}
-				pfile->Delete();
-				break;
+		case EC_OP_PARTFILE_SWAP_A4AF_THIS:
+			CoreNotify_PartFile_Swap_A4AF(pfile);
+			break;
+		case EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO:
+			CoreNotify_PartFile_Swap_A4AF_Auto(pfile);
+			break;
+		case EC_OP_PARTFILE_SET_A4AF_AUTO:
+			// Set, rather than flip. The op above cannot express "make it true": a caller
+			// that cannot see the current value cannot ask for a particular one, and a
+			// repeated request undoes itself. That is fine for the GUI menu item driving it,
+			// and wrong for an HTTP API, where a library may retry without the caller
+			// knowing. SetA4AFAuto() only marks the file EC-changed when the value actually
+			// moves, so re-sending the value it already holds costs nothing.
+			pfile->SetA4AFAuto(hashtag.GetFirstTagSafe()->GetInt() != 0);
+			break;
+		case EC_OP_PARTFILE_SWAP_A4AF_OTHERS:
+			CoreNotify_PartFile_Swap_A4AF_Others(pfile);
+			break;
+		case EC_OP_PARTFILE_PAUSE:
+			pfile->PauseFile();
+			break;
+		case EC_OP_PARTFILE_RESUME:
+			pfile->ResumeFile();
+			pfile->SavePartFile();
+			break;
+		case EC_OP_PARTFILE_STOP:
+			pfile->StopFile();
+			break;
+		case EC_OP_PARTFILE_PRIO_SET: {
+			uint8 prio = hashtag.GetFirstTagSafe()->GetInt();
+			if (prio == PR_AUTO) {
+				pfile->SetAutoDownPriority(1);
+			} else {
+				pfile->SetAutoDownPriority(0);
+				pfile->SetDownPriority(prio);
+			}
+		} break;
+		case EC_OP_PARTFILE_DELETE:
+			if (thePrefs::StartNextFile() && (pfile->GetStatus() != PS_PAUSED)) {
+				theApp->downloadqueue->StartNextFile(pfile);
+			}
+			pfile->Delete();
+			break;
 
-			case EC_OP_PARTFILE_SET_CAT:
-				pfile->SetCategory(hashtag.GetFirstTagSafe()->GetInt());
-				break;
+		case EC_OP_PARTFILE_SET_CAT:
+			pfile->SetCategory(hashtag.GetFirstTagSafe()->GetInt());
+			break;
 
-			default:
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("OOPS! OpCode processing error!")));
-				break;
+		default:
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(
+				CECTag(EC_TAG_STRING, wxTRANSLATE("OOPS! OpCode processing error!")));
+			break;
 		}
 	}
 	if (!response) {
@@ -1243,14 +2173,16 @@
 	wxString s_port = full_addr.Mid(full_addr.Find(':') + 1);
 
 	long port = StrToULong(s_port);
-	CServer* toadd = new CServer(port, s_ip);
+	CServer *toadd = new CServer(port, s_ip);
 	toadd->SetListName(name.IsEmpty() ? full_addr : name);
 
-	if ( theApp->AddServer(toadd, true) ) {
+	if (theApp->AddServer(toadd, true)) {
 		response = new CECPacket(EC_OP_NOOP);
 	} else {
 		response = new CECPacket(EC_OP_FAILED);
-		response->AddTag(CECTag(EC_TAG_STRING, _("Server not added")));
+		// wxTRANSLATE (not _()) so the wire string stays English: the API contract
+		// is English text / C-locale numbers, and webapi relays this verbatim.
+		response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Server not added")));
 		delete toadd;
 	}
 
@@ -1262,45 +2194,48 @@
 	CECPacket *response = NULL;
 	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);
+	if (srv_tag) {
+		srv = theApp->serverlist->GetServerByIPTCP(
+			srv_tag->GetIPv4Data().IP(), srv_tag->GetIPv4Data().m_port);
 		// server tag passed, but server not found
-		if ( !srv ) {
+		if (!srv) {
 			response = new CECPacket(EC_OP_FAILED);
 			response->AddTag(CECTag(EC_TAG_STRING,
-						CFormat(wxString(wxTRANSLATE("server not found: %s"))) % srv_tag->GetIPv4Data().StringIP()));
+				CFormat(wxString(wxTRANSLATE("server not found: %s"))) %
+					srv_tag->GetIPv4Data().StringIP()));
 			return response;
 		}
 	}
 	switch (request->GetOpCode()) {
-		case EC_OP_SERVER_DISCONNECT:
-			theApp->serverconnect->Disconnect();
+	case EC_OP_SERVER_DISCONNECT:
+		theApp->serverconnect->Disconnect();
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	case EC_OP_SERVER_REMOVE:
+		if (srv) {
+			theApp->serverlist->RemoveServer(srv);
 			response = new CECPacket(EC_OP_NOOP);
-			break;
-		case EC_OP_SERVER_REMOVE:
-			if ( srv ) {
-				theApp->serverlist->RemoveServer(srv);
+		} else {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(
+				CECTag(EC_TAG_STRING, wxTRANSLATE("need to define server to be removed")));
+		}
+		break;
+	case EC_OP_SERVER_CONNECT:
+		if (thePrefs::GetNetworkED2K()) {
+			if (srv) {
+				theApp->serverconnect->ConnectToServer(srv);
 				response = new CECPacket(EC_OP_NOOP);
 			} else {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING,
-							wxTRANSLATE("need to define server to be removed")));
-			}
-			break;
-		case EC_OP_SERVER_CONNECT:
-			if (thePrefs::GetNetworkED2K()) {
-				if ( srv ) {
-					theApp->serverconnect->ConnectToServer(srv);
-					response = new CECPacket(EC_OP_NOOP);
-				} else {
-					theApp->serverconnect->ConnectToAnyServer();
-					response = new CECPacket(EC_OP_NOOP);
-				}
-			} else {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("eD2k is disabled in preferences.")));
+				theApp->serverconnect->ConnectToAnyServer();
+				response = new CECPacket(EC_OP_NOOP);
 			}
-			break;
+		} else {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(
+				CECTag(EC_TAG_STRING, wxTRANSLATE("eD2k is disabled in preferences.")));
+		}
+		break;
 	}
 	if (!response) {
 		response = new CECPacket(EC_OP_FAILED);
@@ -1309,77 +2244,214 @@
 	return response;
 }
 
+// Allocate + register a browse ("View Files") search ID in the shared EC search ring.
+// Reuses the ed2k bottom-half allocator: a browse is just another addressable result
+// set, so it draws from the same disjoint id space and LRU eviction as a normal
+// search.
+//
+// The one invariant this file's kind reporting rests on: SearchType is cast straight
+// to uint8 for EC_TAG_SEARCH_LIFECYCLE_KIND, so its members have to carry the
+// EC_SEARCH_TYPE numbers -- stated where the compiler checks it, because a comment
+// saying so is what let a browse nearly be given 3.
+static_assert(static_cast<int>(LocalSearch) == EC_SEARCH_LOCAL,
+	"SearchType and EC_SEARCH_TYPE must agree: LocalSearch");
+static_assert(static_cast<int>(GlobalSearch) == EC_SEARCH_GLOBAL,
+	"SearchType and EC_SEARCH_TYPE must agree: GlobalSearch");
+static_assert(
+	static_cast<int>(KadSearch) == EC_SEARCH_KAD, "SearchType and EC_SEARCH_TYPE must agree: KadSearch");
+static_assert(static_cast<int>(BrowseSearch) == EC_SEARCH_BROWSE,
+	"SearchType and EC_SEARCH_TYPE must agree: BrowseSearch");
+
+static uint32 AllocateBrowseSearchId();
+// Undo an AllocateBrowseSearchId() whose browse never started. Drops the results and
+// the registry's own bookkeeping together: RemoveResults() alone leaves the dead id
+// as Current(), so id-less result polls target a freed bucket, and it keeps one of
+// the ring slots until it evicts a live search.
+static void ReleaseBrowseSearchId(uint32 id);
+
+// Reply to a browse request. Multi-search clients get the allocated search ID (and
+// the echoed optimistic ref) so amuleGUI can rekey its tab; legacy clients get the
+// historical empty acknowledgement.
+static CECPacket *BuildBrowseReply(uint32 browseId, const CECTag *reftag)
+{
+	if (browseId == 0) {
+		return new CECPacket(EC_OP_NOOP);
+	}
+	// EC_OP_STRINGS with both SEARCH_ID + SEARCH_REF is exactly what the search START
+	// reply sends, so amuleGUI's CSearchListRem::HandlePacket rekeys the optimistic
+	// browse tab and starts polling its progress via the same path.
+	CECPacket *reply = new CECPacket(EC_OP_STRINGS);
+	reply->AddTag(CECTag(EC_TAG_SEARCH_ID, browseId));
+	if (reftag) {
+		reply->AddTag(CECTag(EC_TAG_SEARCH_REF, static_cast<uint32>(reftag->GetInt())));
+	}
+	return reply;
+}
 
-static CECPacket *Get_EC_Response_Friend(const CECPacket *request)
+static CECPacket *Get_EC_Response_Friend(const CECPacket *request, bool multiSearch)
 {
 	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());
+			CUpDownClient *client = theApp->clientlist->FindClientByECID(subtag->GetInt());
 			if (client) {
-				theApp->friendlist->AddFriend(CCLIENTREF(client, "Get_EC_Response_Friend theApp->friendlist->AddFriend"));
+				theApp->friendlist->AddFriend(CCLIENTREF(
+					client, "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);
+			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());
+				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());
+			CFriend *Friend = theApp->friendlist->FindFriend(subtag->GetInt());
 			if (Friend) {
 				theApp->friendlist->RemoveFriend(Friend);
 			}
-			// Idempotent: the desired end state of REMOVE is "friend
-			// not in the list", which is already true if FindFriend
-			// returned null (transient sync skew between amulegui's
-			// local view and the daemon's m_FriendList). Returning
-			// EC_OP_FAILED here forces the GUI into a resend / hang
-			// loop on the stale ECID.
+			// Idempotent: the desired end state of REMOVE is "friend not in the list",
+			// already true if FindFriend returned null (transient sync skew between
+			// amulegui's local view and m_FriendList). Returning EC_OP_FAILED forces the GUI
+			// into a resend / hang loop on a stale ECID.
 			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());
+			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))) {
+		// Browse ("View Files") over EC. For a multi-search-capable client the daemon
+		// allocates a real, wire-safe search ID, registers it in the ring and pins it on
+		// the target client so ProcessSharedFileList files the returned listing under it;
+		// the reply carries that ID, echoing the GUI's optimistic EC_TAG_SEARCH_REF, so
+		// amuleGUI rekeys its browse tab. Legacy clients keep the old fire-and-forget
+		// EC_OP_NOOP.
+		//
+		// The ID is allocated per branch, once the target peer is known and only if it has
+		// no browse running -- see browseInFlightId below.
+		const CECTag *reftag = tag->GetTagByName(EC_TAG_SEARCH_REF);
+		// A browse failure needs the correlation token for the same reason a failed search
+		// start does: amuleGUI created its optimistic browse tab before sending and has no
+		// other way to tell which browse this verdict answers. "Client not found." is the
+		// ordinary case -- the peer gets reaped between the user seeing the row and
+		// clicking View Files.
+		auto browseFailure = reftag(const wxString &msg) {
+			CECPacket *fail = new CECPacket(EC_OP_FAILED);
+			fail->AddTag(CECTag(EC_TAG_STRING, msg));
+			if (reftag) {
+				fail->AddTag(
+					CECTag(EC_TAG_SEARCH_REF, static_cast<uint32>(reftag->GetInt())));
+			}
+			return fail;
+		};
+		// A browse of a peer that is already being browsed joins that browse instead of
+		// minting a second identity for it. CUpDownClient::RequestSharedFileList() declines
+		// to re-ask a peer that is still answering, so a freshly allocated ID would never
+		// be stamped with a lifecycle -- while PinBrowseSearchId has already repointed every
+		// later status write away from the first ID, leaving it BROWSE_IN_PROGRESS with
+		// nothing able to terminalize it. Returns 0 when the peer has no browse running.
+		auto browseInFlightId = (const CUpDownClient *peer) -> uint32 {
+			return peer != nullptr ? theApp->browsemanager->SearchIdFor(peer) : 0;
+		};
+		// Same reply as a fresh browse, pointing at the browse that is really running: no
+		// allocation (the second ID would be stranded), no RegisterBrowseSearch (it would
+		// restamp m_searchStartTimes), no repoint, no re-request. A legacy client still gets
+		// its historical EC_OP_NOOP.
+		auto joinBrowse = &(uint32 inFlightId) {
+			return BuildBrowseReply(multiSearch ? inFlightId : 0, reftag);
+		};
 		const CECTag *subtag = tag->GetTagByName(EC_TAG_FRIEND);
 		if (subtag) {
-			CFriend * Friend = theApp->friendlist->FindFriend(subtag->GetInt());
+			CFriend *Friend = theApp->friendlist->FindFriend(subtag->GetInt());
 			if (Friend) {
-				theApp->friendlist->RequestSharedFileList(Friend);
-				response = new CECPacket(EC_OP_NOOP);
+				// The linked client need not exist yet -- CFriendList::RequestSharedFileList
+				// creates it -- and without one there is by definition no browse to join.
+				const CClientRef &linked = Friend->GetLinkedClient();
+				const uint32 inFlight =
+					browseInFlightId(linked.IsLinked() ? linked.GetClient() : nullptr);
+				if (inFlight) {
+					response = joinBrowse(inFlight);
+				} else {
+					const uint32 browseId = multiSearch ? AllocateBrowseSearchId() : 0;
+					// Describe the browse before the results start arriving, so
+					// the search list can report it as one (kind + peer name)
+					// rather than as a nameless search of the scalar kind.
+					if (browseId) {
+						theApp->searchlist->RegisterBrowseSearch(
+							browseId, Friend->GetName(), subtag->GetInt());
+					}
+					const CFriendList::BrowseResult asked =
+						theApp->friendlist->RequestSharedFileList(Friend, browseId);
+					if (asked == CFriendList::BrowseResult::Started) {
+						response = BuildBrowseReply(browseId, reftag);
+					} else {
+						// Nothing was asked under this id, so nothing will
+						// answer or time out under it: release it, or the
+						// tab it names sits pending for the whole session.
+						if (browseId) {
+							ReleaseBrowseSearchId(browseId);
+						}
+						// The callee resolves its client by hash, which can
+						// find one the check above could not: that looked at
+						// the record's linkage, which is empty for a friend
+						// added by address. Ask again now that linking has
+						// happened, so a browse already running is joined
+						// rather than reported as a missing address.
+						const CClientRef &nowLinked = Friend->GetLinkedClient();
+						const uint32 running = browseInFlightId(
+							nowLinked.IsLinked() ? nowLinked.GetClient()
+									     : nullptr);
+						if (asked == CFriendList::BrowseResult::AlreadyRunning &&
+							running) {
+							response = joinBrowse(running);
+						} else {
+							response = browseFailure(wxTRANSLATE(
+								"No address known for that friend yet."));
+						}
+					}
+				}
 			} else {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Friend not found.")));
+				response = browseFailure(wxTRANSLATE("Friend not found."));
 			}
 		} else if ((subtag = tag->GetTagByName(EC_TAG_CLIENT))) {
-			CUpDownClient * client = theApp->clientlist->FindClientByECID(subtag->GetInt());
+			CUpDownClient *client = theApp->clientlist->FindClientByECID(subtag->GetInt());
 			if (client) {
-				client->RequestSharedFileList();
-				response = new CECPacket(EC_OP_NOOP);
+				const uint32 inFlight = browseInFlightId(client);
+				if (inFlight) {
+					response = joinBrowse(inFlight);
+				} else {
+					const uint32 browseId = multiSearch ? AllocateBrowseSearchId() : 0;
+					if (browseId) {
+						theApp->searchlist->RegisterBrowseSearch(
+							browseId, client->GetUserName(), client->ECID());
+					}
+					client->PinBrowseSearchId(browseId);
+					client->RequestSharedFileList();
+					response = BuildBrowseReply(browseId, reftag);
+				}
 			} else {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Client not found.")));
+				response = browseFailure(wxTRANSLATE("Client not found."));
 			}
 		} else {
-			response = new CECPacket(EC_OP_FAILED);
-			response->AddTag(CECTag(EC_TAG_STRING,
-				wxTRANSLATE("EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT.")));
+			response = browseFailure(
+				wxTRANSLATE("EC_TAG_FRIEND_SHARED requires EC_TAG_FRIEND or EC_TAG_CLIENT."));
 		}
 	}
 
@@ -1390,9 +2462,96 @@
 	return response;
 }
 
+namespace
+{
+// Global multi-search registry, shared across all EC connections (EC runs
+// synchronously on the main thread, so no locking is needed). Bounds the daemon's
+// retained EC searches to kMaxEcSearches, evicting the least-recently-touched --
+// which also stops a still-running Kad search via RemoveResults. Legacy clients
+// bypass this and keep the sentinel bucket.
+constexpr std::size_t kMaxEcSearches = 20;
+
+class CEcSearchRegistry
+{
+public:
+	// Register a just-started search as most-recently-used and current,
+	// evicting the least-recently-used if over capacity.
+	void Register(uint32 id)
+	{
+		Touch(id);
+		m_current = id;
+		while (m_lru.size() > kMaxEcSearches) {
+			uint32 victim = m_lru.back();
+			m_lru.pop_back();
+			// Frees the result bucket and stops a still-running Kad search.
+			theApp->searchlist->RemoveResults(victim);
+			if (m_current == victim) {
+				m_current = 0;
+			}
+		}
+	}
+
+	// Move an accessed search to most-recently-used.
+	void Touch(uint32 id)
+	{
+		m_lru.remove(id);
+		m_lru.push_front(id);
+	}
+
+	bool Has(uint32 id) const { return std::find(m_lru.begin(), m_lru.end(), id) != m_lru.end(); }
+
+	// Drop id from the ring/current without touching core search state. For a search
+	// this registry tracks, call alongside the caller's own unconditional
+	// CSearchList::RemoveResults, instead of Close(), when the id may or may not be one
+	// this registry knows about.
+	void Forget(uint32 id)
+	{
+		m_lru.remove(id);
+		if (m_current == id) {
+			m_current = 0;
+		}
+	}
+
+	// Most-recently-started search (0 = none); the no-arg default target.
+	uint32 Current() const { return m_current; }
+
+	// All active search IDs (MRU order). Used by the INC_UPDATE union poll
+	// so amulegui's single result container holds every open search at once.
+	const std::list<uint32> &ActiveIds() const { return m_lru; }
+
+private:
+	std::list<uint32> m_lru; // front = most-recently-used
+	uint32 m_current = 0;
+};
+
+CEcSearchRegistry s_ecSearches;
+} // namespace
+
+void RegisterRestoredSearch(uint32 searchID)
+{
+	s_ecSearches.Register(searchID);
+}
+
+static void ReleaseBrowseSearchId(uint32 id)
+{
+	theApp->searchlist->RemoveResults(id);
+	// Guarded like the stop path: only touch the registry for an id it tracks.
+	if (s_ecSearches.Has(id)) {
+		s_ecSearches.Forget(id);
+	}
+}
+
+static uint32 AllocateBrowseSearchId()
+{
+	uint32 id = theApp->searchlist->AllocateEd2kId();
+	s_ecSearches.Register(id);
+	return id;
+}
 
 static CECPacket *Get_EC_Response_Search_Results(const CECPacket *request,
-	bool partial_update_active, std::set<uint32> &io_lastSentSearchIds)
+	bool partial_update_active,
+	std::set<uint32> &io_lastSentSearchIds,
+	wxUIntPtr searchID)
 {
 	CECPacket *response = new CECPacket(EC_OP_SEARCH_RESULTS);
 
@@ -1401,47 +2560,54 @@
 	// request can contain list of queried items
 	CTagSet<uint32, EC_TAG_SEARCHFILE> queryitems(request);
 
-	// `EC_TAG_FILE_REMOVED` tombstoning is wired only for the
-	// `EC_DETAIL_UPDATE` polling path that amuleweb uses, and only when
-	// the client opted into the partial-update protocol at auth. The
-	// `EC_DETAIL_INC_UPDATE` dispatch (amulegui) takes the tagmap
-	// overload below; `EC_DETAIL_FULL` callers (amulecmd `search` and
-	// amuleweb's Phase-3 follow-up `req_full`, which defaults to FULL)
-	// remain unchanged. The `queryitems.empty()` check excludes
-	// per-ID subset queries: tombstoning is meaningful only when the
-	// client is polling the whole set.
+	// EC_TAG_FILE_REMOVED tombstoning is wired only for the EC_DETAIL_UPDATE polling
+	// path that amuleweb uses, and only when the client opted into the partial-update
+	// protocol at auth. The EC_DETAIL_INC_UPDATE dispatch (amulegui) takes the tagmap
+	// overload below; EC_DETAIL_FULL callers are unchanged. The queryitems.empty() check
+	// excludes per-ID subset queries: tombstoning is meaningful only when polling the
+	// whole set.
 	const bool tombstone_path =
-		partial_update_active
-		&& detail_level == EC_DETAIL_UPDATE
-		&& queryitems.empty();
+		partial_update_active && detail_level == EC_DETAIL_UPDATE && queryitems.empty();
+
+	// Result grouping: a caller that wants the same-hash/same-size/different-filename
+	// children (the expandable tree the GUI shows) opts in by adding an empty
+	// EC_TAG_SEARCH_PARENT flag to the request. Without it this path stays parents-only,
+	// so amulecmd and amuleweb are unchanged. Children carry their parent's ECID via
+	// EC_TAG_SEARCH_PARENT so the client can rebuild the tree.
+	const bool want_children = request->GetTagByName(EC_TAG_SEARCH_PARENT) != nullptr;
 
 	std::set<uint32> current_ids;
 
-	const CSearchResultList& list = theApp->searchlist->GetSearchResults(0xffffffff);
+	const CSearchResultList &list = theApp->searchlist->GetSearchResults(searchID);
 	CSearchResultList::const_iterator it = list.begin();
 	while (it != list.end()) {
-		CSearchFile* sf = *it++;
-		if ( !queryitems.empty() && !queryitems.count(sf->ECID()) ) {
+		CSearchFile *sf = *it++;
+		if (!queryitems.empty() && !queryitems.count(sf->ECID())) {
 			continue;
 		}
 		if (tombstone_path) {
 			current_ids.insert(sf->ECID());
 		}
 		response->AddTag(CEC_SearchFile_Tag(sf, detail_level));
+		if (want_children && sf->HasChildren()) {
+			for (CSearchFile *sfc : sf->GetChildren()) {
+				if (tombstone_path) {
+					current_ids.insert(sfc->ECID());
+				}
+				response->AddTag(CEC_SearchFile_Tag(sfc, detail_level));
+			}
+		}
 	}
 
 	if (tombstone_path) {
-		// One `EC_TAG_FILE_REMOVED` per result that was in the previous
-		// response but is no longer in the daemon's searchlist —
-		// typically because the user started a new search, which clears
-		// the list via `EC_OP_SEARCH_START` → `searchlist->RemoveResults`.
-		// Without these markers, amuleweb's
-		// `UpdatableItemsContainer::ProcessUpdate` takes the partial-
-		// update branch (it expects explicit deletions) and sees no
-		// signal to drop the old results, so they accumulate across
-		// searches (#31, regression from ee1d92b75).
+		// One EC_TAG_FILE_REMOVED per result that was in the previous response but is no
+		// longer in the daemon's searchlist -- typically because the user started a new
+		// search, which clears the list. Without these markers amuleweb's ProcessUpdate
+		// takes the partial-update branch, which expects explicit deletions, and sees no
+		// signal to drop the old results, so they accumulate across searches.
 		for (std::set<uint32>::const_iterator i = io_lastSentSearchIds.begin();
-			i != io_lastSentSearchIds.end(); ++i) {
+			i != io_lastSentSearchIds.end();
+			++i) {
 			if (!current_ids.count(*i)) {
 				response->AddTag(CECTag(EC_TAG_FILE_REMOVED, *i));
 			}
@@ -1451,21 +2617,21 @@
 	return response;
 }
 
-static CECPacket *Get_EC_Response_Search_Results(CObjTagMap &tagmap)
+static CECPacket *Get_EC_Response_Search_Results(CObjTagMap &tagmap, wxUIntPtr searchID)
 {
 	CECPacket *response = new CECPacket(EC_OP_SEARCH_RESULTS);
 
-	const CSearchResultList& list = theApp->searchlist->GetSearchResults(0xffffffff);
+	const CSearchResultList &list = theApp->searchlist->GetSearchResults(searchID);
 	CSearchResultList::const_iterator it = list.begin();
 	while (it != list.end()) {
-		CSearchFile* sf = *it++;
+		CSearchFile *sf = *it++;
 		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();
+			const CSearchResultList &children = sf->GetChildren();
 			for (size_t i = 0; i < children.size(); ++i) {
-				CSearchFile* sfc = children.at(i);
+				CSearchFile *sfc = children.at(i);
 				CValueMap &valuemap1 = tagmap.GetValueMap(sfc->ECID());
 				response->AddTag(CEC_SearchFile_Tag(sfc, EC_DETAIL_INC_UPDATE, &valuemap1));
 			}
@@ -1474,72 +2640,476 @@
 	return response;
 }
 
+// Multi-search INC_UPDATE union poll (amulegui): amulegui runs every open search
+// through a single result container, so emit the results of *all* active searches in
+// one reply, tagging each with its EC_TAG_SEARCH_ID. Only reached for
+// m_multiSearchActive clients.
+//
+// Enumerates CSearchList::GetKnownSearchIds() -- every search AND "View Files" browse
+// tab the core holds, started by the monolithic GUI or by any EC client -- rather
+// than s_ecSearches.ActiveIds(), which only ever holds EC-initiated searches. A
+// monolithic-started search's results would otherwise never reach amulegui even once
+// Get_EC_Response_Search_List learned to enumerate it: the two have to agree on the
+// same set, or a discovered tab appears and never fills. Browses need no second
+// source: every one reaches RegisterBrowseSearch before its request goes out.
+//
+// s_ecSearches keeps governing EC-client lifecycle and eviction only -- folding
+// monolithic searches into that 20-entry LRU would let unrelated EC traffic evict,
+// and so stop, a local user's own still-running Kad search.
+static CECPacket *Get_EC_Response_Search_Results_Union(
+	CObjTagMap &tagmap, bool partial_update_active, std::set<uint32> &io_lastSentResultIds)
+{
+	CECPacket *response = new CECPacket(EC_OP_SEARCH_RESULTS);
+	// Incremental: unchanged fields are diffed out via the per-connection valuemap, keyed
+	// by the globally-unique ECID. Safe because amulegui's container retains its items
+	// across searches, so a result is never re-created from a diffed tag.
+	//
+	// `current_ids` is every result the client is currently believed to hold, so the
+	// partial-update path below can synthesize removals by diffing against the previous
+	// cycle instead of relying on absence.
+	std::set<uint32> current_ids;
+
+	auto emitOne = &(CSearchFile *sf, uint32 sid) {
+		const uint32 ecid = sf->ECID();
+		current_ids.insert(ecid);
+		const bool known = io_lastSentResultIds.count(ecid) != 0;
+		CValueMap &valuemap = tagmap.GetValueMap(ecid);
+		// The owning search ID never changes for a result, so it only has to travel once
+		// per connection -- but only once removal is explicit. A legacy client deletes
+		// anything missing from the reply and would then re-create the item from a later
+		// diffed tag, which must still carry the ID to be attributable to a tab.
+		const uint32 attribute_sid = (partial_update_active && known) ? 0 : sid;
+		CEC_SearchFile_Tag tag(sf, EC_DETAIL_INC_UPDATE, &valuemap, attribute_sid);
+		if (partial_update_active && known && !tag.HasChildTags()) {
+			// Nothing about this result changed since the client's last view. Absence no
+			// longer implies deletion for this client, so the whole tag can go. This is what
+			// makes an idle search cost nothing: previously every result re-sent its envelope
+			// and its search ID on every poll, forever.
+			return;
+		}
+		response->AddTag(tag);
+	};
+
+	auto emitResultsFor = &(uint32 sid) {
+		const CSearchResultList &list = theApp->searchlist->GetSearchResults(sid);
+		for (CSearchFile *sf : list) {
+			emitOne(sf, sid);
+			if (sf->HasChildren()) {
+				for (CSearchFile *sfc : sf->GetChildren()) {
+					emitOne(sfc, sid);
+				}
+			}
+		}
+	};
+	// GetKnownSearchIds() covers browses too: RequestSharedFileList registers every one
+	// of them, by either route, before the request goes out, and RemoveResults drops the
+	// registration and the browse together.
+	for (const auto &entry : theApp->searchlist->GetKnownSearchIds()) {
+		emitResultsFor(entry.first);
+	}
+
+	if (partial_update_active) {
+		// One EC_TAG_FILE_REMOVED per result the client was told about that the core no
+		// longer holds -- a closed or evicted search, or a results list replaced by a new
+		// search on the same ID. Reuses the knownfile tombstone rather than inventing a
+		// second one: the meaning and the payload are identical.
+		for (uint32 id : io_lastSentResultIds) {
+			if (!current_ids.count(id)) {
+				response->AddTag(CECTag(EC_TAG_FILE_REMOVED, id));
+				// Drop the diff state with the result. ECIDs are handed out
+				// monotonically so reuse is not expected, but a stale valuemap
+				// would diff away the very fields a re-created result needs.
+				tagmap.EraseValueMap(id);
+			}
+		}
+		io_lastSentResultIds.swap(current_ids);
+	}
+	return response;
+}
+
+// Enumerates every search the core currently holds so a client that never started
+// any of them locally -- a freshly (re)connected amulegui, a stateless amuleapi
+// request, or a search typed into the monolithic GUI -- can discover what to ask
+// about and build tabs for it. One entry per known search: EC_TAG_SEARCH_ID as the
+// entry's own value, with name/kind/state as children. Only reached for
+// m_multiSearchActive clients: a legacy client has no concept of more than the single
+// sentinel search.
+//
+// Browses are enumerated here too, because a browse now carries a name, a recorded
+// kind and its peer's ECID (RegisterBrowseSearch), which is exactly what lets a
+// remote GUI rebuild it as a browse tab rather than a nameless search.
+// RegisterBrowseSearch writing m_searchStrings is what puts them in reach of
+// GetKnownSearchIds(); it is deliberate, not incidental.
+//
+// amuleapi decodes the two wire values written below from raw numeric literals, since
+// it cannot include SearchList.h. This file can see both CSearchList's enums and the
+// EC ones, so it is the one place that can catch a reorder at compile time.
+static_assert(CSearchList::SEARCH_LIFECYCLE_IDLE == 0 && CSearchList::SEARCH_LIFECYCLE_RUNNING == 1 &&
+		      CSearchList::SEARCH_LIFECYCLE_FINISHED == 2,
+	"CSearchList::SearchLifecycleState numeric values must stay in sync with "
+	"the wire values EC_TAG_SEARCH_LIFECYCLE_STATE carries and Api.cpp's "
+	"SearchLifecycleStateToString decodes");
+static_assert(static_cast<int>(LocalSearch) == static_cast<int>(EC_SEARCH_LOCAL) &&
+		      static_cast<int>(GlobalSearch) == static_cast<int>(EC_SEARCH_GLOBAL) &&
+		      static_cast<int>(KadSearch) == static_cast<int>(EC_SEARCH_KAD),
+	"CSearchList::SearchType must stay numerically aligned with EC_SEARCH_TYPE "
+	"since EC_TAG_SEARCH_LIFECYCLE_KIND carries a SearchType value that "
+	"amuleapi's SearchKindToString (Api.cpp) decodes against EC_SEARCH_*");
+
+static CECPacket *Get_EC_Response_Search_List()
+{
+	CECPacket *response = new CECPacket(EC_OP_SEARCH_LIST);
+
+	for (const auto &known : theApp->searchlist->GetKnownSearchIds()) {
+		uint32 sid = known.first;
+		CECTag entry(EC_TAG_SEARCH_ID, sid);
+		// known.second is the same string GetSearchStringById(sid) would
+		// look up -- already have it from this map entry, no need to re-find.
+		entry.AddTag(EC_TAG_SEARCH_NAME, known.second);
+		// A browse also carries the peer it is listing: without it a remote GUI cannot
+		// build a browse tab at all, since a tab with no ecid is by definition not a
+		// browse (CSearchListCtrl::IsBrowse).
+		const uint32 browsePeer = theApp->searchlist->GetBrowsePeerEcid(sid);
+		if (browsePeer) {
+			entry.AddTag(CECTag(EC_TAG_CLIENT, browsePeer));
+		}
+		entry.AddTag(EC_TAG_SEARCH_LIFECYCLE_KIND,
+			static_cast<uint64_t>(
+				static_cast<uint8>(theApp->searchlist->GetSearchLifecycleKindById(sid))));
+		entry.AddTag(EC_TAG_SEARCH_LIFECYCLE_STATE,
+			static_cast<uint64_t>(
+				static_cast<uint8>(theApp->searchlist->GetSearchLifecycleStateById(sid))));
+		// How many hits this search is holding. A client that adopts the whole listing and
+		// fetches results per tab on activation has no other way to label a tab it has not
+		// opened yet -- and eagerly fetching every search's results to learn one integer
+		// each is what the lazy fetch avoids.
+		entry.AddTag(CECTag(EC_TAG_SEARCH_RESULT_COUNT,
+			static_cast<uint32>(theApp->searchlist->GetSearchResults(sid).size())));
+		// And the percent, so a client discovering a *running* search reports the daemon's
+		// real ramp from first sight rather than 0 until the next poll. Both tags are
+		// already emitted on the per-id progress reply.
+		entry.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_PERCENT,
+			theApp->searchlist->GetSearchLifecyclePercentById(sid)));
+		response->AddTag(entry);
+	}
+
+	return response;
+}
+
+// Emit one search's progress into `out`: the reply packet itself for a request naming
+// a single EC_TAG_SEARCH_ID, or one child entry per search for the union form below.
+// Both callers share this function so the two shapes cannot drift.
+//
+// A browse ("View Files") ID is not a CSearchList search: report its lifecycle from
+// the persisted browse state (browsing / finished / failed) plus the bar, keyed by
+// search ID, and the running result count. Reading the persisted state -- rather than
+// the browsing client, which is transient and, for a browse that fails on disconnect,
+// reaped before the next poll -- means the terminal "failed" still reaches amuleGUI
+// so its tab marker flips. EC_TAG_SEARCH_BROWSE_STATUS is the discriminator.
+//
+// EC_TAG_SEARCH_STATUS MUST be added first in both branches: the GUI reads the
+// reply's (or the entry's) first tag via GetFirstTagSafe.
+static void AppendSearchProgress(CECTag &out, wxUIntPtr sid)
+{
+	if (theApp->browsemanager->Has(static_cast<uint32>(sid))) {
+		const browse::State bstate = theApp->browsemanager->StateOf(static_cast<uint32>(sid));
+		const uint8 browseStatus =
+			static_cast<uint8>(bstate == browse::State::InProgress ? BROWSE_IN_PROGRESS
+					   : bstate == browse::State::Finished ? BROWSE_FINISHED
+									       : BROWSE_FAILED);
+		// Bar value (0..100 running, 0xffff done/failed) so amuleGUI drives the browse
+		// tab's gauge via the same UpdateSearchProgress path as a search.
+		const uint16 bar = static_cast<uint16>(theApp->searchlist->GetSearchBarStatusById(sid));
+		out.AddTag(CECTag(EC_TAG_SEARCH_STATUS, bar));
+		out.AddTag(CECTag(EC_TAG_SEARCH_BROWSE_STATUS, browseStatus));
+		out.AddTag(CECTag(EC_TAG_SEARCH_ID, static_cast<uint32>(sid)));
+		// The peer's nickname, for a browse. Same tag and same source as the search list's,
+		// so a client polling progress can name what it is reporting on without a second
+		// round trip for the list.
+		out.AddTag(EC_TAG_SEARCH_NAME, theApp->searchlist->GetSearchStringById(sid));
+		out.AddTag(CECTag(EC_TAG_SEARCH_RESULT_COUNT,
+			static_cast<uint32>(theApp->searchlist->GetSearchResults(sid).size())));
+		// Also emit the standard lifecycle tags, mapped from the browse status, so amuleapi
+		// / amuleweb consume a browse through their existing SEARCH_PROGRESS handling with
+		// no special-casing: browsing -> RUNNING, finished/failed -> FINISHED. Percent is
+		// the dir-based bar value.
+		const bool browsing = browseStatus == BROWSE_IN_PROGRESS;
+		out.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_STATE,
+			static_cast<uint8>(browsing ? CSearchList::SEARCH_LIFECYCLE_RUNNING
+						    : CSearchList::SEARCH_LIFECYCLE_FINISHED)));
+		out.AddTag(CECTag(
+			EC_TAG_SEARCH_LIFECYCLE_PERCENT, static_cast<uint8>(bar == 0xffff ? 100 : bar)));
+		return;
+	}
+	// Per-ID lifecycle. STATE / PERCENT / RESULT_COUNT are addressed by the
+	// search ID.
+	const CSearchList::SearchLifecycleState st = theApp->searchlist->GetSearchLifecycleStateById(sid);
+	const uint8 pct = theApp->searchlist->GetSearchLifecyclePercentById(sid);
+	// EC_TAG_SEARCH_STATUS: the overloaded sentinel the GUI decodes in
+	// Search_Update_Progress -- a finished Kad search reports 0xfffe (clears the "!"
+	// marker and resets the bar), a finished ed2k search 0xffff, otherwise the running
+	// percent. Shared with the monolithic bar.
+	out.AddTag(CECTag(EC_TAG_SEARCH_STATUS, theApp->searchlist->GetSearchBarStatusById(sid)));
+	// Echo the ID so the client can confirm which search this is for.
+	out.AddTag(CECTag(EC_TAG_SEARCH_ID, static_cast<uint32>(sid)));
+	// ...and the query it was started with, so a progress reply is readable on its own:
+	// a client that polls progress per tab should not have to fetch the list as well
+	// just to label it.
+	out.AddTag(EC_TAG_SEARCH_NAME, theApp->searchlist->GetSearchStringById(sid));
+	out.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_STATE, static_cast<uint8>(st)));
+	// Per-id kind (not the scalar): a multi-search client polls each tab by id and needs
+	// THIS search's real type, e.g. to enable the Kad-only "More" button on the right
+	// tab.
+	out.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_KIND,
+		static_cast<uint8>(theApp->searchlist->GetSearchLifecycleKindById(sid))));
+	out.AddTag(CECTag(EC_TAG_SEARCH_RESULT_COUNT,
+		static_cast<uint32>(theApp->searchlist->GetSearchResults(sid).size())));
+	out.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_PERCENT, pct));
+}
+
+// Progress for every search this connection could hold a tab for, one child per
+// search, so a client with N open tabs polls once instead of N times.
+//
+// Enumerates searches *and* browse ids -- unlike Get_EC_Response_Search_List, which is
+// deliberately narrow because it drives tab *discovery*. Nothing is discovered here:
+// a client only ever looks up ids it already has tabs for.
+//
+// There is no EC_TAG_SEARCH_EXPIRED in the union. The per-id form needs it because a
+// reply about one id is otherwise indistinguishable from silence; here the whole set
+// is present, so a client treats any tab whose id is absent as expired -- which also
+// catches an LRU eviction the per-id form only notices when it polls that id.
+static CECPacket *Get_EC_Response_Search_Progress_Union(const CECPacket *request)
+{
+	CECPacket *response = new CECPacket(EC_OP_SEARCH_PROGRESS);
+
+	// The ids the client is actually tracking, when it names them. It costs nothing to
+	// carry and it keeps the LRU meaning what it meant before: Touch marks the searches
+	// a client still has open. Touching everything the daemon holds would make an
+	// abandoned search as protected as a live tab.
+	std::vector<uint32> wanted;
+	for (const CECTag &tag : *request) {
+		if (tag.GetTagName() == EC_TAG_SEARCH_ID) {
+			wanted.push_back(static_cast<uint32>(tag.GetInt()));
+		}
+	}
+
+	auto emitOne = &(wxUIntPtr sid) {
+		// Same guard as the per-id path: Touch() on an id the registry does not
+		// know would silently insert it, growing the ring past kMaxEcSearches.
+		if (s_ecSearches.Has(static_cast<uint32>(sid))) {
+			s_ecSearches.Touch(static_cast<uint32>(sid));
+		}
+		CECTag entry(EC_TAG_SEARCH_ID, static_cast<uint32>(sid));
+		AppendSearchProgress(entry, sid);
+		response->AddTag(entry);
+	};
+
+	if (!wanted.empty()) {
+		// Answer about the ids the client named, resolving each exactly as the per-id form
+		// does. Deliberately NOT a walk of the daemon's own maps filtered by these ids: a
+		// Kad search is addressed by an id with the high bit set, which is not the key
+		// those maps are stored under, so filtering silently dropped every Kad search and
+		// the client read that as expiry.
+		for (uint32 want : wanted) {
+			// The gate the per-id path uses -- the core's own knowledge, which covers
+			// browse ids too (see IsKnownSearchId). An id that fails it is left out, and
+			// its absence is how the client learns it expired.
+			if (want == 0 || !theApp->searchlist->IsKnownSearchId(want)) {
+				continue;
+			}
+			emitOne(want);
+		}
+		return response;
+	}
+
+	// No ids named: report everything the daemon holds. Used by a stateless caller that
+	// has no tracked set to enumerate. Browses included; see the union poll above.
+	for (const auto &known : theApp->searchlist->GetKnownSearchIds()) {
+		emitOne(known.first);
+	}
+
+	return response;
+}
+
 static CECPacket *Get_EC_Response_Search_Results_Download(const CECPacket *request)
 {
 	CECPacket *response = new CECPacket(EC_OP_STRINGS);
 	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);
+		// Read the category by name (both amulegui and amuleapi send it as
+		// EC_TAG_PARTFILE_CAT) rather than "first child", so an optional EC_TAG_SEARCHFILE
+		// selector below can ride alongside it.
+		uint8 category = 0;
+		if (const CECTag *catTag = tag.GetTagByName(EC_TAG_PARTFILE_CAT)) {
+			category = catTag->GetInt();
+		}
+		// Issue #431: an optional EC_TAG_SEARCHFILE child carries a search result's ECID,
+		// selecting one specific same-hash/different-name grouped result so it downloads
+		// under that chosen filename. Without it, download the first result matching the
+		// hash (the parent) -- the unchanged behaviour.
+		if (const CECTag *ecidTag = tag.GetTagByName(EC_TAG_SEARCHFILE)) {
+			theApp->searchlist->AddFileToDownloadByEcid(ecidTag->GetInt(), category);
+		} else {
+			theApp->searchlist->AddFileToDownloadByHash(tag.GetMD4Data(), category);
+		}
 	}
 	return response;
 }
 
-static CECPacket *Get_EC_Response_Search_Stop(const CECPacket *WXUNUSED(request))
+static CECPacket *Get_EC_Response_Search_Stop(const CECPacket *request, bool multiSearch)
+{
+	CECPacket *reply = new CECPacket(EC_OP_MISC_DATA);
+	if (multiSearch) {
+		// Per-ID stop. No ID means the most-recently-started search. Gate on the core's own
+		// knowledge (CSearchList::IsKnownSearchId), not s_ecSearches: a monolithic-started
+		// search is known to the core but was never Register()'d into that EC-only
+		// registry, so gating on the registry alone silently no-ops both Stop and Close
+		// for it.
+		const CECTag *idTag = request->GetTagByName(EC_TAG_SEARCH_ID);
+		uint32 sid = idTag ? static_cast<uint32>(idTag->GetInt()) : s_ecSearches.Current();
+		if (sid != 0 && theApp->searchlist->IsKnownSearchId(sid)) {
+			if (request->GetTagByName(EC_TAG_SEARCH_CLOSE)) {
+				// Tab close: stop activity, free results, drop from the ring. Free the
+				// core's state unconditionally -- that is what actually stops a running Kad
+				// search and erases the per-id maps, including m_searchStrings, which is
+				// what stops the search reappearing as a discovered tab. Only touch the
+				// registry's own bookkeeping for a search it tracks.
+				theApp->searchlist->RemoveResults(sid);
+				if (s_ecSearches.Has(sid)) {
+					s_ecSearches.Forget(sid);
+				}
+			} else {
+				// Stop button: halt activity but keep the results.
+				theApp->searchlist->StopSearchById(sid);
+			}
+		}
+	} else {
+		theApp->searchlist->StopSearch();
+	}
+	return reply;
+}
+
+static CECPacket *Get_EC_Response_Search_Request_More(const CECPacket *request, bool multiSearch)
 {
+	// "More" button (Kad-only): re-ask already-queried peers for a wider result
+	// frontier for one search. RequestMoreResults logs what actually happened,
+	// and that line is forwarded back over EC; the reply carries the other half,
+	// whether a LATER press could still widen the search.
 	CECPacket *reply = new CECPacket(EC_OP_MISC_DATA);
-	theApp->searchlist->StopSearch();
+	// Per-ID. No ID means the most-recently-started search. Gate on the core's own
+	// knowledge, not s_ecSearches -- see Get_EC_Response_Search_Stop: a
+	// monolithic-started Kad search's "More results" would otherwise do nothing.
+	const CECTag *idTag = request->GetTagByName(EC_TAG_SEARCH_ID);
+	uint32 sid =
+		idTag ? static_cast<uint32>(idTag->GetInt()) : (multiSearch ? s_ecSearches.Current() : 0);
+	bool reaskable = false;
+	if (sid != 0 && (!multiSearch || theApp->searchlist->IsKnownSearchId(sid))) {
+		reaskable = theApp->searchlist->RequestMoreResults(sid);
+	}
+	// Emitted on BOTH paths, including the unknown-id early-out above, which leaves it
+	// false -- a search the core does not hold is terminal by definition. That way an
+	// absent tag means exactly one thing: a daemon older than this reply, whose answer
+	// is unknown rather than "exhausted".
+	reply->AddTag(CECTag(EC_TAG_SEARCH_MORE_REASKABLE, static_cast<uint8>(reaskable ? 1 : 0)));
+	// Echo which search the verdict is about. The request may not have named one, and a
+	// client with several tabs open cannot attribute a bare reply to any of them -- the
+	// replies are not correlated any other way.
+	if (sid != 0) {
+		reply->AddTag(CECTag(EC_TAG_SEARCH_ID, sid));
+	}
 	return reply;
 }
 
-static CECPacket *Get_EC_Response_Search(const CECPacket *request)
+static CECPacket *Get_EC_Response_Search(const CECPacket *request, bool multiSearch)
 {
 	wxString response;
 
-	const CEC_Search_Tag *search_request = static_cast<const CEC_Search_Tag *>(request->GetFirstTagSafe());
-	theApp->searchlist->RemoveResults(0xffffffff);
+	const CEC_Search_Tag *search_request =
+		static_cast<const CEC_Search_Tag *>(request->GetFirstTagSafe());
 
 	CSearchList::CSearchParams params;
-	params.searchString	= search_request->SearchText();
-	params.typeText		= search_request->SearchFileType();
-	params.extension	= search_request->SearchExt();
-	params.minSize		= search_request->MinSize();
-	params.maxSize		= search_request->MaxSize();
-	params.availability	= search_request->Avail();
-
+	params.searchString = search_request->SearchText();
+	params.typeText = search_request->SearchFileType();
+	params.extension = search_request->SearchExt();
+	params.minSize = search_request->MinSize();
+	params.maxSize = search_request->MaxSize();
+	params.availability = search_request->Avail();
 
 	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;
-		/* fall through */
-		case EC_SEARCH_KAD:
-			if (core_search_type != GlobalSearch) { // Not a global search obviously
-				core_search_type = KadSearch;
-			}
-		/* fall through */
-		case EC_SEARCH_LOCAL: {
-			uint32 search_id = 0xffffffff;
-			wxString error = theApp->searchlist->StartNewSearch(&search_id, core_search_type, params);
-			if (!error.IsEmpty()) {
-				response = error;
-			} else {
-				response = wxTRANSLATE("Search in progress. Refetch results in a moment!");
-				op = EC_OP_STRINGS;
+	uint32 search_id = 0xffffffff;
+	bool started = false;
+
+	if (search_type == EC_SEARCH_WEB) {
+		response = wxTRANSLATE("WebSearch from remote interface makes no sense.");
+	} else if (search_type == EC_SEARCH_BROWSE) {
+		// Reported by the daemon, never accepted here: a browse is started by
+		// EC_OP_FRIEND, and the mapping below would otherwise fall through its final
+		// ternary and quietly start a local search.
+		response = wxTRANSLATE("A browse is not a search that can be started.");
+	} else {
+		SearchType core_search_type = (search_type == EC_SEARCH_GLOBAL) ? GlobalSearch
+					      : (search_type == EC_SEARCH_KAD)  ? KadSearch
+										: LocalSearch;
+
+		if (multiSearch) {
+			// START is additive -- it does not stop sibling searches. But ed2k
+			// (local/global) share a single in-flight slot and file their results under the
+			// scalar m_currentSearch, so starting a NEW ed2k search must finalize any
+			// in-flight one first, or its late UDP results land in the new search's bucket.
+			// A Kad search uses its own ID and machinery, so it must NOT disturb a running
+			// ed2k search -- doing so used to kill an in-flight global search, which then
+			// returned zero results.
+			if (core_search_type != KadSearch) {
+				theApp->searchlist->StopInFlightEd2kSearch();
+			}
+			// The daemon allocates the ID (no sentinel): ed2k gets a bottom-half ID; a Kad
+			// search self-allocates a top-half ID inside StartNewSearch, which overwrites
+			// this seed and we read the real ID back.
+			search_id = theApp->searchlist->AllocateEd2kId();
+		} else {
+			// Legacy single-search sentinel path (unchanged): wipe the one
+			// bucket and reuse 0xffffffff.
+			theApp->searchlist->RemoveResults(0xffffffff);
+			search_id = 0xffffffff;
+		}
+
+		wxString error = theApp->searchlist->StartNewSearch(&search_id, core_search_type, params);
+		if (!error.IsEmpty()) {
+			response = error;
+		} else {
+			response = wxTRANSLATE("Search in progress. Refetch results in a moment!");
+			op = EC_OP_STRINGS;
+			started = true;
+			if (multiSearch) {
+				// Register whatever ID the core settled on (the Kad ID for a Kad
+				// search) as most-recently-used + current, evicting the
+				// least-recently-used search if over the ring's cap.
+				s_ecSearches.Register(search_id);
 			}
-			break;
 		}
-		case EC_SEARCH_WEB:
-				response = wxTRANSLATE("WebSearch from remote interface makes no sense.");
-			break;
 	}
 
 	CECPacket *reply = new CECPacket(op);
 	// error or search in progress
 	reply->AddTag(CECTag(EC_TAG_STRING, response));
+	if (multiSearch && started) {
+		// Hand the daemon-allocated ID back so the client can address this
+		// search.
+		reply->AddTag(CECTag(EC_TAG_SEARCH_ID, search_id));
+	}
+	if (multiSearch) {
+		// Echo the client's correlation token (if any) on BOTH outcomes, not just success:
+		// the client created its optimistic tab before sending and has no other way to tell
+		// which start this verdict answers. On failure it needs the token to drop that
+		// phantom tab and release the discovery deferral -- otherwise the id sits in
+		// m_pendingSearchStarts until the user happens to close exactly that tab, with an
+		// EC_OP_SEARCH_LIST round trip every tick and discovery off in the meantime.
+		const CECTag *ref = request->GetTagByName(EC_TAG_SEARCH_REF);
+		if (ref) {
+			reply->AddTag(CECTag(EC_TAG_SEARCH_REF, static_cast<uint32>(ref->GetInt())));
+		}
+	}
 
 	return reply;
 }
@@ -1551,8 +3121,8 @@
 		const CECTag &tag = *it;
 		CMD4Hash hash = tag.GetMD4Data();
 		uint8 prio = tag.GetFirstTagSafe()->GetInt();
-		CKnownFile* cur_file = theApp->sharedfiles->GetFileByID(hash);
-		if ( !cur_file ) {
+		CKnownFile *cur_file = theApp->sharedfiles->GetFileByID(hash);
+		if (!cur_file) {
 			continue;
 		}
 		if (prio == PR_AUTO) {
@@ -1570,21 +3140,16 @@
 
 void CPartFile_Encoder::Encode(CECTag *parent)
 {
-	//
 	// Source part frequencies
-	//
 	CKnownFile_Encoder::Encode(parent);
 
-	//
 	// Gaps
-	//
-	const CGapList& gaplist = m_PartFile()->GetGapList();
+	const CGapList &gaplist = m_PartFile()->GetGapList();
 	const size_t gap_list_size = gaplist.size();
 	ArrayOfUInts64 gaps;
 	gaps.reserve(gap_list_size * 2);
 
-	for (CGapList::const_iterator curr_pos = gaplist.begin();
-			curr_pos != gaplist.end(); ++curr_pos) {
+	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());
 	}
@@ -1597,15 +3162,13 @@
 	}
 	delete gap_enc_data;
 
-	//
 	// Requested blocks
-	//
 	ArrayOfUInts64 req_buffer;
-	const CPartFile::CReqBlockPtrList& requestedblocks = m_PartFile()->GetRequestedBlockList();
+	const CPartFile::CReqBlockPtrList &requestedblocks = m_PartFile()->GetRequestedBlockList();
 	CPartFile::CReqBlockPtrList::const_iterator curr_pos2 = requestedblocks.begin();
 
-	for ( ; curr_pos2 != requestedblocks.end(); ++curr_pos2 ) {
-		Requested_Block_Struct* block = *curr_pos2;
+	for (; curr_pos2 != requestedblocks.end(); ++curr_pos2) {
+		Requested_Block_Struct *block = *curr_pos2;
 		req_buffer.push_back(block->StartOffset);
 		req_buffer.push_back(block->EndOffset);
 	}
@@ -1616,11 +3179,7 @@
 	}
 	delete req_enc_data;
 
-	//
-	// Source names
-	//
-	// First count occurrence of all source names
-	//
+	// Source names -- first count occurrence of all source names
 	CECEmptyTag sourceNames(EC_TAG_PARTFILE_SOURCE_NAMES);
 	typedef std::map<wxString, int> strIntMap;
 	strIntMap nameMap;
@@ -1638,10 +3197,9 @@
 			itm->second++;
 		}
 	}
-	//
 	// Go through our last list
-	//
-	for (SourcenameItemMap::iterator it1 = m_sourcenameItemMap.begin(); it1 != m_sourcenameItemMap.end();) {
+	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()) {
@@ -1663,9 +3221,7 @@
 			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);
@@ -1678,7 +3234,6 @@
 	if (sourceNames.HasChildTags()) {
 		parent->AddTag(sourceNames);
 	}
-
 }
 
 void CPartFile_Encoder::ResetEncoder()
@@ -1690,13 +3245,10 @@
 
 void CKnownFile_Encoder::Encode(CECTag *parent)
 {
-	//
-	// Source part frequencies
-	//
-	// Reference to the availability list
-	const ArrayOfUInts16& list = m_file->IsPartFile() ?
-		static_cast<const CPartFile*>(m_file)->m_SrcpartFrequency :
-		m_file->m_AvailPartFrequency;
+	// Source part frequencies. Reference to the availability list.
+	const ArrayOfUInts16 &list = m_file->IsPartFile()
+					     ? static_cast<const 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;
@@ -1714,50 +3266,64 @@
 	CECPacket *response = NULL;
 
 	switch (request->GetDetailLevel()) {
-		case EC_DETAIL_WEB:
-		case EC_DETAIL_FULL: {
-			double dTimestamp = 0.0;
-			if (request->GetTagByName(EC_TAG_STATSGRAPH_LAST) != NULL) {
-				dTimestamp = request->GetTagByName(EC_TAG_STATSGRAPH_LAST)->GetDoubleData();
-			}
-			uint16 nScale = request->GetTagByNameSafe(EC_TAG_STATSGRAPH_SCALE)->GetInt();
-			uint16 nMaxPoints = request->GetTagByNameSafe(EC_TAG_STATSGRAPH_WIDTH)->GetInt();
-			uint32 *graphData = NULL;
-			uint32 *connData = NULL;
-			uint64 sessionDl = 0, sessionUl = 0, sessionKad = 0;
-			double sessionTimespan = 0.0;
-			unsigned int numPoints = theApp->m_statistics->GetHistoryForGui(
-				nMaxPoints, (double)nScale, &dTimestamp, &graphData, &connData,
-				sessionDl, sessionUl, sessionKad, sessionTimespan);
-			if (numPoints) {
-				response = new CECPacket(EC_OP_STATSGRAPHS);
-				response->AddTag(CECTag(EC_TAG_STATSGRAPH_DATA, 4 * numPoints * sizeof(uint32), graphData));
-				// Per-point active uploads / active downloads. Older
-				// amulegui builds simply ignore the unknown tag.
-				response->AddTag(CECTag(EC_TAG_STATSGRAPH_DATA_CONN, 2 * numPoints * sizeof(uint32), connData));
-				delete  graphData;
-				delete  connData;
-				// Latest session totals — let amulegui compute the same
-				// kBytesReceived / sTimestamp session average monolithic
-				// shows, instead of falling back to a GUI-local integral.
-				response->AddTag(CECTag(EC_TAG_STATSGRAPH_SESSION_DL, sessionDl));
-				response->AddTag(CECTag(EC_TAG_STATSGRAPH_SESSION_UL, sessionUl));
-				response->AddTag(CECTag(EC_TAG_STATSGRAPH_SESSION_KAD, sessionKad));
-				response->AddTag(CECTag(EC_TAG_STATSGRAPH_SESSION_TIMESPAN, sessionTimespan));
-				response->AddTag(CECTag(EC_TAG_STATSGRAPH_LAST, dTimestamp));
-			} else {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("No points for graph.")));
-			}
-			break;
-		}
-		case EC_DETAIL_INC_UPDATE:
-		case EC_DETAIL_UPDATE:
-		case EC_DETAIL_CMD:
-			// No graphs
+	case EC_DETAIL_WEB:
+	case EC_DETAIL_FULL: {
+		double dTimestamp = 0.0;
+		if (request->GetTagByName(EC_TAG_STATSGRAPH_LAST) != NULL) {
+			dTimestamp = request->GetTagByName(EC_TAG_STATSGRAPH_LAST)->GetDoubleData();
+		}
+		uint16 nScale = request->GetTagByNameSafe(EC_TAG_STATSGRAPH_SCALE)->GetInt();
+		uint16 nMaxPoints = request->GetTagByNameSafe(EC_TAG_STATSGRAPH_WIDTH)->GetInt();
+		uint32 *graphData = NULL;
+		uint32 *connData = NULL;
+		uint64 sessionDl = 0, sessionUl = 0, sessionKad = 0;
+		double sessionTimespan = 0.0;
+		unsigned int numPoints = theApp->m_statistics->GetHistoryForGui(nMaxPoints,
+			(double)nScale,
+			&dTimestamp,
+			&graphData,
+			&connData,
+			sessionDl,
+			sessionUl,
+			sessionKad,
+			sessionTimespan);
+		if (numPoints) {
+			response = new CECPacket(EC_OP_STATSGRAPHS);
+			response->AddTag(
+				CECTag(EC_TAG_STATSGRAPH_DATA, 4 * numPoints * sizeof(uint32), graphData));
+			// Per-point active uploads / active downloads. Older
+			// amulegui builds simply ignore the unknown tag.
+			response->AddTag(CECTag(
+				EC_TAG_STATSGRAPH_DATA_CONN, 2 * numPoints * sizeof(uint32), connData));
+			delete graphData;
+			delete connData;
+			// Latest session totals -- let amulegui compute the same kBytesReceived /
+			// sTimestamp session average monolithic shows, instead of falling back to a
+			// GUI-local integral.
+			response->AddTag(CECTag(EC_TAG_STATSGRAPH_SESSION_DL, sessionDl));
+			response->AddTag(CECTag(EC_TAG_STATSGRAPH_SESSION_UL, sessionUl));
+			response->AddTag(CECTag(EC_TAG_STATSGRAPH_SESSION_KAD, sessionKad));
+			response->AddTag(CECTag(EC_TAG_STATSGRAPH_SESSION_TIMESPAN, sessionTimespan));
+			// How deep we can actually answer at the requested scale, so the client can cap
+			// its next request instead of guessing. Over-asking gets a record repeated rather
+			// than an error, and without timestamps on the wire the client cannot see it.
+			response->AddTag(
+				CECTag(EC_TAG_STATSGRAPH_DEPTH, (uint16)CStatistics::GetPointsPerRange()));
+			response->AddTag(CECTag(EC_TAG_STATSGRAPH_LAST, dTimestamp));
+		} else {
 			response = new CECPacket(EC_OP_FAILED);
-			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Your client is not configured for this detail level.")));
-			break;
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("No points for graph.")));
+		}
+		break;
+	}
+	case EC_DETAIL_INC_UPDATE:
+	case EC_DETAIL_UPDATE:
+	case EC_DETAIL_CMD:
+		// No graphs
+		response = new CECPacket(EC_OP_FAILED);
+		response->AddTag(CECTag(
+			EC_TAG_STRING, wxTRANSLATE("Your client is not configured for this detail level.")));
+		break;
 	}
 	if (!response) {
 		response = new CECPacket(EC_OP_FAILED);
@@ -1770,600 +3336,936 @@
 CECPacket *CECServerSocket::ProcessRequest2(const CECPacket *request)
 {
 
-	if ( !request ) {
+	if (!request) {
 		return 0;
 	}
 
 	CECPacket *response = NULL;
 
 	switch (request->GetOpCode()) {
-		//
-		// Misc commands
-		//
-		case EC_OP_SHUTDOWN:
-			if (!theApp->IsOnShutDown()) {
-				response = new CECPacket(EC_OP_NOOP);
-				AddLogLineC(_("External Connection: shutdown requested"));
+	// Misc commands
+	case EC_OP_SHUTDOWN:
+		if (!theApp->IsOnShutDown()) {
+			response = new CECPacket(EC_OP_NOOP);
+			AddLogLineC(_("External Connection: shutdown requested"));
 #ifndef AMULE_DAEMON
-				{
-					wxCloseEvent evt;
-					evt.SetCanVeto(false);
-					theApp->ShutDown(evt);
-				}
+			{
+				wxCloseEvent evt;
+				evt.SetCanVeto(false);
+				theApp->ShutDown(evt);
+			}
 #else
-				theApp->ExitMainLoop();
+			theApp->ExitMainLoop();
 #endif
-			} else {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Already shutting down.")));
-			}
-			break;
-		case EC_OP_ADD_LINK: {
-			// Aggregate the per-link results into a single response: until
-			// #206 was filed, every iteration overwrote the previous response,
-			// so a batch of N-1 successes followed by one failure looked like
-			// a total failure to the caller (and vice versa).
-			int successCount = 0;
-			int failCount = 0;
-			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) ) {
-					++successCount;
-				} else {
-					// Per-link error reasons are already printed by AddLink().
-					++failCount;
-				}
-			}
-			if (failCount == 0) {
-				response = new CECPacket(EC_OP_NOOP);
-			} else if (successCount == 0) {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid link or already on list.")));
-			} else {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING,
-					CFormat(wxString(wxTRANSLATE("%d of %d links failed (invalid or already on list).")))
-						% failCount % (failCount + successCount)));
-			}
-			break;
+		} else {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Already shutting down.")));
 		}
-		//
-		// Status requests
-		//
-		case EC_OP_STAT_REQ:
-			response = Get_EC_Response_StatRequest(request, m_LoggerAccess);
-			response->AddTag(CEC_ConnState_Tag(request->GetDetailLevel()));
-			break;
-		case EC_OP_GET_CONNSTATE:
-			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_FULL
-				&& CTagSet<uint32, EC_TAG_KNOWNFILE>(request).empty()
-				&& (m_my_flags & EC_FLAG_UTF8_NUMBERS)
-				&& (m_my_flags & EC_FLAG_LARGE_TAG_COUNT) ) {
-				// Per-file bytes cache. Daemon-wide map<ECID, bytes>
-				// keyed off CKnownFile::s_globalEcGen; rebuilds only
-				// per-file entries whose gen advanced since last use.
-				// Concatenated and written through the connection's
-				// socket with the same per-connection compression
-				// machinery WritePacket uses.
-				std::vector<CKnownFile*> snapshot;
-				theApp->sharedfiles->CopyFileList(snapshot);
-				std::vector<CECFullResponseCache::FileRef> refs;
-				refs.reserve(snapshot.size());
-				for (size_t i = 0; i < snapshot.size(); ++i) {
-					if (!snapshoti) continue;
-					CECFullResponseCache::FileRef r;
-					r.file = snapshoti;
-					r.ecid = snapshoti->ECID();
-					r.gen = snapshoti->GetECGen();
-					refs.push_back(r);
-				}
-				std::vector<std::shared_ptr<const std::vector<unsigned char> > > blobs
-					= s_sharedFilesFullCache.GetBlobs(refs);
-				s_sharedFilesFullCache.PruneOutsideOf(refs);
-				SendCachedBodyResponse(EC_OP_SHARED_FILES, blobs);
-				return NULL;
-			}
-			if ( request->GetDetailLevel() != EC_DETAIL_INC_UPDATE ) {
-				response = Get_EC_Response_GetSharedFiles(request, m_FileEncoder,
-					m_lastEcGenSeenShared,
-					m_partialUpdateActive, m_lastSentSharedFileIds,
-					m_sentWithDetailIdsShared);
-			}
-			break;
-		case EC_OP_GET_DLOAD_QUEUE:
-			if ( request->GetDetailLevel() == EC_DETAIL_FULL
-				&& CTagSet<uint32, EC_TAG_PARTFILE>(request).empty()
-				&& (m_my_flags & EC_FLAG_UTF8_NUMBERS)
-				&& (m_my_flags & EC_FLAG_LARGE_TAG_COUNT) ) {
-				std::vector<CPartFile*> snapshot;
-				theApp->downloadqueue->CopyFileList(snapshot);
-				std::vector<CECFullResponseCache::FileRef> refs;
-				refs.reserve(snapshot.size());
-				for (size_t i = 0; i < snapshot.size(); ++i) {
-					if (!snapshoti) continue;
-					CECFullResponseCache::FileRef r;
-					r.file = snapshoti;
-					r.ecid = snapshoti->ECID();
-					r.gen = snapshoti->GetECGen();
-					refs.push_back(r);
-				}
-				std::vector<std::shared_ptr<const std::vector<unsigned char> > > blobs
-					= s_downloadQueueFullCache.GetBlobs(refs);
-				s_downloadQueueFullCache.PruneOutsideOf(refs);
-				SendCachedBodyResponse(EC_OP_DLOAD_QUEUE, blobs);
-				return NULL;
-			}
-			if ( request->GetDetailLevel() != EC_DETAIL_INC_UPDATE ) {
-				response = Get_EC_Response_GetDownloadQueue(request, m_FileEncoder,
-					m_lastEcGenSeenPart,
-					m_partialUpdateActive, m_lastSentPartFileIds,
-					m_sentWithDetailIdsPart);
-			}
-			break;
-		//
-		// 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_GetUpdate(m_FileEncoder, m_obj_tagmap,
-					m_lastEcGenSeen,
-					m_partialUpdateActive, m_lastSentFileIds,
-					m_sentWithDetailIds);
-			}
-			break;
-		case EC_OP_GET_ULOAD_QUEUE:
-			response = Get_EC_Response_GetClientQueue(request, m_obj_tagmap, EC_OP_ULOAD_QUEUE);
-			break;
-		case EC_OP_PARTFILE_SWAP_A4AF_THIS:
-		case EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO:
-		case EC_OP_PARTFILE_SWAP_A4AF_OTHERS:
-		case EC_OP_PARTFILE_PAUSE:
-		case EC_OP_PARTFILE_RESUME:
-		case EC_OP_PARTFILE_STOP:
-		case EC_OP_PARTFILE_PRIO_SET:
-		case EC_OP_PARTFILE_DELETE:
-		case EC_OP_PARTFILE_SET_CAT:
-			response = Get_EC_Response_PartFile_Cmd(request);
-			break;
-		case EC_OP_SHAREDFILES_RELOAD:
-			theApp->sharedfiles->Reload();
-			response = new CECPacket(EC_OP_NOOP);
-			break;
-		case EC_OP_SHARED_SET_PRIO:
-			response = Get_EC_Response_Set_SharedFile_Prio(request);
-			break;
-		case EC_OP_RENAME_FILE: {
-			CMD4Hash fileHash = request->GetTagByNameSafe(EC_TAG_KNOWNFILE)->GetMD4Data();
-			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->knownfiles->FindKnownFileByID(fileHash);
-			}
-			if (!file) {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("File not found.")));
-				break;
-			}
-			if (newName.IsEmpty()) {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid file name.")));
-				break;
-			}
-
-			if (theApp->sharedfiles->RenameFile(file, CPath(newName))) {
-				response = new CECPacket(EC_OP_NOOP);
+		break;
+	case EC_OP_ADD_LINK: {
+		// Aggregate the per-link results into a single response: every iteration used to
+		// overwrite the previous one, so a batch of N-1 successes followed by one failure
+		// looked like a total failure, and vice versa.
+		int successCount = 0;
+		int failCount = 0;
+		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)) {
+				++successCount;
 			} else {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Unable to rename file.")));
+				// Per-link error reasons are already printed by AddLink().
+				++failCount;
 			}
-
-			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);
+		if (failCount == 0) {
 			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);
-			}
+		} else if (successCount == 0) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(
+				CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid link or already on list.")));
+		} else {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING,
+				CFormat(wxString(
+					wxTRANSLATE("%d of %d links failed (invalid or already on list)."))) %
+					failCount % (failCount + successCount)));
+		}
+		break;
+	}
+	// Status requests
+	case EC_OP_STAT_REQ:
+		response = Get_EC_Response_StatRequest(request, m_LoggerAccess);
+		response->AddTag(CEC_ConnState_Tag(request->GetDetailLevel()));
+		break;
+	case EC_OP_VERSION_CHECK:
+		// On-demand version check trigger (amuleapi's POST /version/check).
+		// Fire-and-forget: StartVersionCheck() kicks off the async fetch and the result is
+		// relayed later via the stats response. EC_OP_NOOP = accepted; EC_OP_FAILED =
+		// throttled or compiled out.
+#ifdef ENABLE_VERSION_CHECK
+		if (theApp->StartVersionCheck()) {
 			response = new CECPacket(EC_OP_NOOP);
-			break;
+		} else {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(
+				EC_TAG_STRING, wxTRANSLATE("Version check throttled; try again shortly.")));
 		}
-		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;
+#else
+		response = new CECPacket(EC_OP_FAILED);
+		response->AddTag(
+			CECTag(EC_TAG_STRING, wxTRANSLATE("Version check is not available on this daemon.")));
+#endif
+		break;
+	case EC_OP_GET_CONNSTATE:
+		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_FULL &&
+			CTagSet<uint32, EC_TAG_KNOWNFILE>(request).empty() &&
+			(m_my_flags & EC_FLAG_UTF8_NUMBERS) && (m_my_flags & EC_FLAG_LARGE_TAG_COUNT)) {
+			// Per-file bytes cache: a daemon-wide map<ECID, bytes> keyed off
+			// CKnownFile::s_globalEcGen, rebuilding only entries whose gen advanced since last
+			// use. Concatenated and written through the connection's socket with the same
+			// per-connection compression WritePacket uses.
+			std::vector<CKnownFile *> snapshot;
+			theApp->sharedfiles->CopyFileList(snapshot);
+			std::vector<CECFullResponseCache::FileRef> refs;
+			refs.reserve(snapshot.size());
+			for (size_t i = 0; i < snapshot.size(); ++i) {
+				if (!snapshoti)
+					continue;
+				CECFullResponseCache::FileRef r;
+				r.file = snapshoti;
+				r.ecid = snapshoti->ECID();
+				r.gen = snapshoti->GetECGen();
+				refs.push_back(r);
+			}
+			std::vector<std::shared_ptr<const std::vector<unsigned char>>> blobs =
+				s_sharedFilesFullCache.GetBlobs(refs);
+			s_sharedFilesFullCache.PruneOutsideOf(refs);
+			SendCachedBodyResponse(EC_OP_SHARED_FILES, blobs);
+			return NULL;
+		}
+		if (request->GetDetailLevel() != EC_DETAIL_INC_UPDATE) {
+			response = Get_EC_Response_GetSharedFiles(request,
+				m_FileEncoder,
+				m_lastEcGenSeenShared,
+				m_partialUpdateActive,
+				m_lastSentSharedFileIds,
+				m_sentWithDetailIdsShared);
+		}
+		break;
+	case EC_OP_GET_DLOAD_QUEUE:
+		if (request->GetDetailLevel() == EC_DETAIL_FULL &&
+			CTagSet<uint32, EC_TAG_PARTFILE>(request).empty() &&
+			(m_my_flags & EC_FLAG_UTF8_NUMBERS) && (m_my_flags & EC_FLAG_LARGE_TAG_COUNT)) {
+			std::vector<CPartFile *> snapshot;
+			theApp->downloadqueue->CopyFileList(snapshot);
+			std::vector<CECFullResponseCache::FileRef> refs;
+			refs.reserve(snapshot.size());
+			for (size_t i = 0; i < snapshot.size(); ++i) {
+				if (!snapshoti)
+					continue;
+				CECFullResponseCache::FileRef r;
+				r.file = snapshoti;
+				r.ecid = snapshoti->ECID();
+				r.gen = snapshoti->GetECGen();
+				refs.push_back(r);
+			}
+			std::vector<std::shared_ptr<const std::vector<unsigned char>>> blobs =
+				s_downloadQueueFullCache.GetBlobs(refs);
+			s_downloadQueueFullCache.PruneOutsideOf(refs);
+			SendCachedBodyResponse(EC_OP_DLOAD_QUEUE, blobs);
+			return NULL;
+		}
+		if (request->GetDetailLevel() != EC_DETAIL_INC_UPDATE) {
+			response = Get_EC_Response_GetDownloadQueue(request,
+				m_FileEncoder,
+				m_lastEcGenSeenPart,
+				m_partialUpdateActive,
+				m_lastSentPartFileIds,
+				m_sentWithDetailIdsPart);
+		}
+		break;
+	case EC_OP_GET_CLIENT_HISTORY:
+		response = Get_EC_Response_ClientHistory();
+		break;
+
+	// 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_GetUpdate(m_FileEncoder,
+				m_obj_tagmap,
+				m_lastEcGenSeen,
+				m_partialUpdateActive,
+				m_lastSentFileIds);
+		}
+		break;
+	case EC_OP_GET_ULOAD_QUEUE:
+		response = Get_EC_Response_GetClientQueue(request, m_obj_tagmap, EC_OP_ULOAD_QUEUE);
+		break;
+	case EC_OP_PARTFILE_SWAP_A4AF_THIS:
+	case EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO:
+	case EC_OP_PARTFILE_SET_A4AF_AUTO:
+	case EC_OP_PARTFILE_SWAP_A4AF_OTHERS:
+	case EC_OP_PARTFILE_PAUSE:
+	case EC_OP_PARTFILE_RESUME:
+	case EC_OP_PARTFILE_STOP:
+	case EC_OP_PARTFILE_PRIO_SET:
+	case EC_OP_PARTFILE_DELETE:
+	case EC_OP_PARTFILE_SET_CAT:
+		response = Get_EC_Response_PartFile_Cmd(request);
+		break;
+	case EC_OP_SHAREDFILES_RELOAD:
+		// Scheduled, not performed: the walk would otherwise run inline in
+		// this handler and every EC client would wait out the whole thing.
+		theApp->sharedfiles->RequestReload();
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	case EC_OP_GET_SHARED_DIRS:
+		response = Get_EC_Response_GetSharedDirs();
+		break;
+	case EC_OP_SET_SHARED_DIRS:
+		response = Get_EC_Response_SetSharedDirs(request);
+		break;
+	case EC_OP_SHARED_SET_PRIO:
+		response = Get_EC_Response_Set_SharedFile_Prio(request);
+		break;
+	case EC_OP_RENAME_FILE: {
+		CMD4Hash fileHash = request->GetTagByNameSafe(EC_TAG_KNOWNFILE)->GetMD4Data();
+		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->knownfiles->FindKnownFileByID(fileHash);
 		}
-
-		//
-		// Server commands
-		//
-		case EC_OP_SERVER_ADD:
-			response = Get_EC_Response_Server_Add(request);
-			break;
-		case EC_OP_SERVER_DISCONNECT:
-		case EC_OP_SERVER_CONNECT:
-		case EC_OP_SERVER_REMOVE:
-			response = Get_EC_Response_Server(request);
-			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 (
-					std::vector<const CServer*>::const_iterator it = servers.begin();
-					it != servers.end();
-					++it
-					) {
-					response->AddTag(CEC_Server_Tag(*it, detail_level));
-				}
-			}
-			break;
-		case EC_OP_SERVER_UPDATE_FROM_URL: {
-			wxString url = request->GetFirstTagSafe()->GetStringData();
-
-			// Save the new url, and update the UI (if not amuled).
-			Notify_ServersURLChanged(url);
-			thePrefs::SetEd2kServersUrl(url);
-
-			theApp->serverlist->UpdateServerMetFromURL(url);
-			response = new CECPacket(EC_OP_NOOP);
+		if (!file) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("File not found.")));
 			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);
+		if (newName.IsEmpty()) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid file name.")));
 			break;
 		}
-		//
-		// Friends
-		//
-		case EC_OP_FRIEND:
-			response = Get_EC_Response_Friend(request);
-			break;
 
-		//
-		// IPFilter
-		//
-		case EC_OP_IPFILTER_RELOAD:
-			NotifyAlways_IPFilter_Reload();
+		if (theApp->sharedfiles->RenameFile(file, CPath(newName))) {
 			response = new CECPacket(EC_OP_NOOP);
-			break;
+		} else {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Unable to rename file.")));
+		}
 
-		case EC_OP_IPFILTER_UPDATE: {
-			wxString url = request->GetFirstTagSafe()->GetStringData();
-			if (url.IsEmpty()) {
-				url = thePrefs::IPFilterURL();
+		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());
 			}
-			NotifyAlways_IPFilter_Update(url);
+		}
+		theApp->downloadqueue->ClearCompleted(toClear);
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	}
+	case EC_OP_CLIENT_SWAP_TO_ANOTHER_FILE: {
+		// Report what happened rather than answering NOOP either way. The swap is
+		// best-effort in the core -- it refuses a peer that is actively sending, and a peer
+		// that is not an A4AF source of the target has nowhere to go -- and a caller that
+		// cannot tell those apart from success can only guess.
+		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) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Client not found.")));
+		} else if (!file) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("File not found.")));
+		} else if (!client->SwapToAnotherFile(true, false, false, file)) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(
+				EC_TAG_STRING, wxTRANSLATE("Client could not be swapped to that file.")));
+		} else {
 			response = new CECPacket(EC_OP_NOOP);
-			break;
 		}
-		//
-		// Search
-		//
-		case EC_OP_SEARCH_START:
-			response = Get_EC_Response_Search(request);
-			break;
+		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;
+	}
+	case EC_OP_VERIFY_LOCAL_DATA: {
+		CMD4Hash hash = request->GetTagByNameSafe(EC_TAG_KNOWNFILE)->GetMD4Data();
+		CKnownFile *file = theApp->sharedfiles->GetFileByID(hash);
+		if (file) {
+			theApp->sharedfiles->VerifyLocalData(file);
+		}
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	}
+	case EC_OP_SHARED_FILE_SEARCH_KAD_NOTES: {
+		CMD4Hash hash = request->GetTagByNameSafe(EC_TAG_KNOWNFILE)->GetMD4Data();
+		// Notes are requested from the download-comments dialog or a search result: try the
+		// download queue first, then the shared list, then the current search results.
+		CAbstractFile *file = theApp->downloadqueue->GetFileByID(hash);
+		if (!file) {
+			file = theApp->sharedfiles->GetFileByID(hash);
+		}
+		if (!file) {
+			file = theApp->searchlist->GetSearchFileByID(hash);
+		}
+		if (file && file->RequestKadNoteSearch()) {
+			// One Kad NOTES lookup runs per hash, but the same file can be shown in several
+			// open search tabs (one CSearchFile each). RequestKadNoteSearch set the running
+			// flag only on the object it ran on; mirror it onto every same-hash search result
+			// so each tab shows the in-flight lookup. The flag is cleared on all of them when
+			// the CSearch ends.
+			std::vector<CSearchFile *> searchFiles;
+			theApp->searchlist->GetAllSearchFilesByID(hash, searchFiles);
+			for (CSearchFile *sf : searchFiles) {
+				sf->SetKadCommentSearchRunning(true);
+			}
+		}
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	}
 
-		case EC_OP_SEARCH_STOP:
-			response = Get_EC_Response_Search_Stop(request);
-			break;
+	// Server commands
+	case EC_OP_SERVER_ADD:
+		response = Get_EC_Response_Server_Add(request);
+		break;
+	case EC_OP_SERVER_DISCONNECT:
+	case EC_OP_SERVER_CONNECT:
+	case EC_OP_SERVER_REMOVE:
+		response = Get_EC_Response_Server(request);
+		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 (std::vector<const CServer *>::const_iterator it = servers.begin(); it != servers.end();
+			++it) {
+			response->AddTag(CEC_Server_Tag(*it, detail_level));
+		}
+	} break;
+	case EC_OP_SERVER_UPDATE_FROM_URL: {
+		wxString url = request->GetFirstTagSafe()->GetStringData();
+
+		// Save the new url, and update the UI (if not amuled).
+		Notify_ServersURLChanged(url);
+		thePrefs::SetEd2kServersUrl(url);
 
-		case EC_OP_SEARCH_RESULTS:
-			if ( request->GetDetailLevel() == EC_DETAIL_INC_UPDATE ) {
-				response = Get_EC_Response_Search_Results(m_obj_tagmap);
-			} else {
-				response = Get_EC_Response_Search_Results(request,
-					m_partialUpdateActive, m_lastSentSearchIds);
+		theApp->serverlist->UpdateServerMetFromURL(url);
+		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());
 			}
-			break;
-
-		case EC_OP_SEARCH_PROGRESS:
-			response = new CECPacket(EC_OP_SEARCH_PROGRESS);
-			response->AddTag(CECTag(EC_TAG_SEARCH_STATUS,
-				theApp->searchlist->GetSearchProgress()));
-			break;
+		}
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	}
+	// Friends
+	case EC_OP_FRIEND:
+		response = Get_EC_Response_Friend(request, m_multiSearchActive);
+		break;
+
+	// IPFilter
+	case EC_OP_IPFILTER_RELOAD:
+		NotifyAlways_IPFilter_Reload();
+		response = new CECPacket(EC_OP_NOOP);
+		break;
 
-		case EC_OP_DOWNLOAD_SEARCH_RESULT:
-			response = Get_EC_Response_Search_Results_Download(request);
-			break;
-		//
-		// Preferences
-		//
-		case EC_OP_GET_PREFERENCES:
-			response = new CEC_Prefs_Packet(request->GetTagByNameSafe(EC_TAG_SELECT_PREFS)->GetInt(), request->GetDetailLevel());
-			break;
-		case EC_OP_SET_PREFERENCES:
-			static_cast<const CEC_Prefs_Packet *>(request)->Apply();
-			theApp->glob_prefs->Save();
-			if (thePrefs::IsFilteringClients()) {
-				theApp->clientlist->FilterQueues();
+	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
+	case EC_OP_SEARCH_START:
+		response = Get_EC_Response_Search(request, m_multiSearchActive);
+		break;
+
+	case EC_OP_SEARCH_STOP:
+		response = Get_EC_Response_Search_Stop(request, m_multiSearchActive);
+		break;
+
+	case EC_OP_SEARCH_REQUEST_MORE:
+		response = Get_EC_Response_Search_Request_More(request, m_multiSearchActive);
+		break;
+
+	case EC_OP_SEARCH_LIST:
+		// Legacy (non-multi) clients have only the single sentinel search
+		// and no tab-per-id concept, so there is nothing to enumerate.
+		response = m_multiSearchActive ? Get_EC_Response_Search_List()
+					       : new CECPacket(EC_OP_SEARCH_LIST);
+		break;
+
+	case EC_OP_SEARCH_RESULTS: {
+		const bool incUpdate = (request->GetDetailLevel() == EC_DETAIL_INC_UPDATE);
+		// amulegui (multi + INC_UPDATE) polls all its searches at once: return
+		// the union, each result tagged with its search ID (see the handler).
+		if (m_multiSearchActive && incUpdate) {
+			response = Get_EC_Response_Search_Results_Union(
+				m_obj_tagmap, m_partialSearchActive, m_lastSentSearchResultIds);
+			break;
+		}
+		// Otherwise address a specific search by EC_TAG_SEARCH_ID (no ID means the
+		// most-recently-started search) -- amulecmd / amuleapi use FULL. Legacy (non-multi)
+		// clients keep the single 0xffffffff sentinel.
+		wxUIntPtr sid = 0xffffffff;
+		if (m_multiSearchActive) {
+			const CECTag *idTag = request->GetTagByName(EC_TAG_SEARCH_ID);
+			uint32 want = idTag ? static_cast<uint32>(idTag->GetInt()) : s_ecSearches.Current();
+			// Gate on the core's own knowledge (CSearchList::IsKnownSearchId), not
+			// s_ecSearches: that registry only ever holds EC-initiated searches, so gating on
+			// it reports a monolithic-started search as expired even while it is still
+			// running.
+			if (want == 0 || !theApp->searchlist->IsKnownSearchId(want)) {
+				// Evicted or never-known: tell the client it expired rather
+				// than returning a misleading empty result set.
+				response = new CECPacket(EC_OP_SEARCH_RESULTS);
+				response->AddTag(CECEmptyTag(EC_TAG_SEARCH_EXPIRED));
+				break;
 			}
-			if (thePrefs::IsFilteringServers()) {
-				theApp->serverlist->FilterServers();
+			// Only bump the EC-session LRU for a search the registry actually tracks --
+			// Touch() on an id it does not know would silently insert it (push_front has no
+			// "was it found" guard), growing the ring past kMaxEcSearches for ids Register()
+			// never admitted.
+			if (s_ecSearches.Has(want)) {
+				s_ecSearches.Touch(want);
 			}
-			if (!thePrefs::GetNetworkED2K() && theApp->IsConnectedED2K()) {
-				theApp->DisconnectED2K();
+			sid = want;
+		}
+		if (incUpdate) {
+			response = Get_EC_Response_Search_Results(m_obj_tagmap, sid);
+		} else {
+			response = Get_EC_Response_Search_Results(
+				request, m_partialUpdateActive, m_lastSentSearchIds, sid);
+		}
+		break;
+	}
+
+	case EC_OP_SEARCH_PROGRESS: {
+		// Union form, decided before anything is allocated. A client that advertised
+		// EC_TAG_CAN_SEARCH_PROGRESS_UNION always gets the union shape: naming ids narrows
+		// which searches come back, it does not opt back into the single-search reply.
+		// Gating on "no ids named" instead would answer such a client about its FIRST id
+		// only.
+		if (m_multiSearchActive && m_searchProgressUnionActive) {
+			response = Get_EC_Response_Search_Progress_Union(request);
+			break;
+		}
+		response = new CECPacket(EC_OP_SEARCH_PROGRESS);
+		wxUIntPtr sid = 0xffffffff;
+		if (m_multiSearchActive) {
+			const CECTag *idTag = request->GetTagByName(EC_TAG_SEARCH_ID);
+			uint32 want = idTag ? static_cast<uint32>(idTag->GetInt()) : s_ecSearches.Current();
+			// See the matching comment in the EC_OP_SEARCH_RESULTS case above: gate on the
+			// core's own knowledge, not the EC-only registry, so a monolithic-started
+			// search's progress isn't reported as expired.
+			if (want == 0 || !theApp->searchlist->IsKnownSearchId(want)) {
+				response->AddTag(CECEmptyTag(EC_TAG_SEARCH_EXPIRED));
+				// Echo the id this verdict is about. amulegui reads the whole progress
+				// reply under `if (idTag)` -- it has to, since it polls several searches
+				// and the replies are not correlated any other way -- so an EXPIRED
+				// carrying no id was silently unreadable: the tab for a search the core
+				// had already freed stayed open forever, its results dropped by the next
+				// union poll. `want` is safe to echo even for an unknown id: it is the
+				// value the client itself just asked about.
+				if (want != 0) {
+					response->AddTag(CECTag(EC_TAG_SEARCH_ID, want));
+				}
+				break;
 			}
-			if (!thePrefs::GetNetworkKademlia() && theApp->IsConnectedKad()) {
-				theApp->StopKad();
+			if (s_ecSearches.Has(want)) {
+				s_ecSearches.Touch(want);
 			}
-			response = new CECPacket(EC_OP_NOOP);
+			sid = want;
+			AppendSearchProgress(*response, sid);
 			break;
+		}
+		// EC_TAG_SEARCH_STATUS: unchanged overloaded sentinel for pre-3.1
+		// consumers (amulegui / amuleweb / amulecmd).
+		response->AddTag(CECTag(EC_TAG_SEARCH_STATUS, theApp->searchlist->GetSearchProgress()));
+		// New unambiguous lifecycle tags (3.1+). Modern consumers like
+		// amuleapi prefer these and skip the sentinel decode entirely.
+		response->AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_STATE,
+			static_cast<uint8>(theApp->searchlist->GetSearchLifecycleState())));
+		response->AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_KIND,
+			static_cast<uint8>(theApp->searchlist->GetSearchLifecycleKind())));
+		response->AddTag(CECTag(EC_TAG_SEARCH_RESULT_COUNT,
+			static_cast<uint32>(theApp->searchlist->GetCurrentSearchResultCount())));
+		// Unified 0..100 completion. Global = real server-queue percent;
+		// Kad = cosmetic time-ramp; FINISHED snaps any kind to 100.
+		response->AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_PERCENT,
+			static_cast<uint8>(theApp->searchlist->GetSearchLifecyclePercent())));
+		break;
+	}
+
+	case EC_OP_DOWNLOAD_SEARCH_RESULT:
+		response = Get_EC_Response_Search_Results_Download(request);
+		break;
+	// Preferences
+	case EC_OP_GET_PREFERENCES:
+		response = new CEC_Prefs_Packet(
+			request->GetTagByNameSafe(EC_TAG_SELECT_PREFS)->GetInt(), request->GetDetailLevel());
+		break;
+	case EC_OP_SET_PREFERENCES: {
+		static_cast<const CEC_Prefs_Packet *>(request)->Apply();
+		// Apply() left any amuleapi password the client sent sitting in the preferences as
+		// a pending request; this is what turns it into a stored, stretched record in
+		// amuleapi-passwords. Logged rather than returned as an EC error: the rest of the
+		// preferences applied fine.
+		wxString credentialError;
+		if (!AmuleApiCredentials::ApplyPrefs(credentialError)) {
+			AddLogLineC(CFormat(_("Could not save the amuleapi password: %s")) % credentialError);
+		}
+		theApp->glob_prefs->Save();
+		if (thePrefs::IsFilteringClients()) {
+			theApp->clientlist->FilterQueues();
+		}
+		if (thePrefs::IsFilteringServers()) {
+			theApp->serverlist->FilterServers();
+		}
+		if (!thePrefs::GetNetworkED2K() && theApp->IsConnectedED2K()) {
+			theApp->DisconnectED2K();
+		}
+		if (!thePrefs::GetNetworkKademlia() && theApp->IsConnectedKad()) {
+			theApp->StopKad();
+		}
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	}
 
-		case EC_OP_CREATE_CATEGORY:
-			if ( request->GetTagCount() == 1 ) {
-				CEC_Category_Tag tag(*static_cast<const 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 {
+	case EC_OP_CREATE_CATEGORY:
+		if (request->GetTagCount() == 1) {
+			CEC_Category_Tag tag(
+				*static_cast<const CEC_Category_Tag *>(request->GetFirstTagSafe()));
+			if (tag.Create()) {
 				response = new CECPacket(EC_OP_NOOP);
-			}
-			break;
-		case EC_OP_UPDATE_CATEGORY:
-			if ( request->GetTagCount() == 1 ) {
-				CEC_Category_Tag tag(*static_cast<const 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);
-			}
-			break;
-		case EC_OP_DELETE_CATEGORY:
-			if ( request->GetTagCount() == 1 ) {
-				uint32 cat = request->GetFirstTagSafe()->GetInt();
-				// this does not only update the gui, but actually deletes the cat
-				Notify_CategoryDelete(cat);
+				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);
-			break;
-
-		//
-		// Logging
-		//
-		case EC_OP_ADDLOGLINE:
-			// cppcheck-suppress duplicateBranch
-			if (request->GetTagByName(EC_TAG_LOG_TO_STATUS) != NULL) {
-				AddLogLineC(request->GetTagByNameSafe(EC_TAG_STRING)->GetStringData());
+		}
+		break;
+	case EC_OP_UPDATE_CATEGORY:
+		if (request->GetTagCount() == 1) {
+			CEC_Category_Tag tag(
+				*static_cast<const CEC_Category_Tag *>(request->GetFirstTagSafe()));
+			if (tag.GetInt() >= theApp->glob_prefs->GetCatCount()) {
+				// No such category. Deliberately WITHOUT EC_TAG_CATEGORY_PATH: on a failed
+				// update that tag means "everything but the path was applied, and here is
+				// the path kept instead", which clients answer as a success. Emitting it
+				// here would report a category that does not exist as updated. The index
+				// is whatever the client sent -- it used to be indexed straight into
+				// m_CatList.
+				response = new CECPacket(EC_OP_FAILED);
+				response->AddTag(CECTag(EC_TAG_CATEGORY, tag.GetInt()));
+				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("No such category.")));
+				// No Notify either: there is nothing to refresh, and the
+				// monolithic handler would index on this same value.
+				break;
+			}
+			if (tag.Apply()) {
+				response = new CECPacket(EC_OP_NOOP);
 			} else {
-				AddLogLineN(request->GetTagByNameSafe(EC_TAG_STRING)->GetStringData());
+				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);
-			break;
-		case EC_OP_ADDDEBUGLOGLINE:
-			// cppcheck-suppress duplicateBranch
-			if (request->GetTagByName(EC_TAG_LOG_TO_STATUS) != NULL) {
-				AddDebugLogLineC(logGeneral, request->GetTagByNameSafe(EC_TAG_STRING)->GetStringData());
+		}
+		break;
+	case EC_OP_DELETE_CATEGORY:
+		// Rejections answer EC_OP_FAILED, not the blanket EC_OP_NOOP this used to send:
+		// the guards downstream discard these silently, so a client could not tell a
+		// completed delete from a discarded one. Never attach EC_TAG_CATEGORY_PATH -- on a
+		// failed category command clients read it as success.
+		if (request->GetTagCount() != 1) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Malformed category request.")));
+		} else {
+			const uint32 cat = request->GetFirstTagSafe()->GetInt();
+			if (cat == 0) {
+				// The "all downloads" bucket, which CategoryDelete refuses.
+				response = new CECPacket(EC_OP_FAILED);
+				response->AddTag(CECTag(EC_TAG_CATEGORY, cat));
+				response->AddTag(CECTag(EC_TAG_STRING,
+					wxTRANSLATE("The default category cannot be deleted.")));
+			} else if (cat >= theApp->glob_prefs->GetCatCount()) {
+				response = new CECPacket(EC_OP_FAILED);
+				response->AddTag(CECTag(EC_TAG_CATEGORY, cat));
+				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("No such category.")));
 			} else {
-				AddDebugLogLineN(logGeneral, request->GetTagByNameSafe(EC_TAG_STRING)->GetStringData());
+				// this does not only update the gui, but actually deletes the cat
+				Notify_CategoryDelete(cat);
+				response = new CECPacket(EC_OP_NOOP);
 			}
-			response = new CECPacket(EC_OP_NOOP);
-			break;
-		case EC_OP_GET_LOG:
-			response = new CECPacket(EC_OP_LOG);
-			response->AddTag(CECTag(EC_TAG_STRING, theApp->GetLog(false)));
-			break;
-		case EC_OP_GET_DEBUGLOG:
-			response = new CECPacket(EC_OP_DEBUGLOG);
-			response->AddTag(CECTag(EC_TAG_STRING, theApp->GetDebugLog(false)));
+		}
+		break;
+
+	// Logging
+	case EC_OP_ADDLOGLINE:
+		// cppcheck-suppress duplicateBranch
+		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:
+		// cppcheck-suppress duplicateBranch
+		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:
+		response = new CECPacket(EC_OP_LOG);
+		response->AddTag(CECTag(EC_TAG_STRING, theApp->GetLog(false)));
+		break;
+	case EC_OP_GET_DEBUGLOG:
+		response = new CECPacket(EC_OP_DEBUGLOG);
+		response->AddTag(CECTag(EC_TAG_STRING, theApp->GetDebugLog(false)));
+		break;
+	case EC_OP_RESET_LOG:
+		theApp->GetLog(true);
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	case EC_OP_RESET_DEBUGLOG:
+		theApp->GetDebugLog(true);
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	case EC_OP_GET_LAST_LOG_ENTRY: {
+		wxString tmp = theApp->GetLog(false);
+		if (tmp.Last() == '\n') {
+			tmp.RemoveLast();
+		}
+		response = new CECPacket(EC_OP_LOG);
+		response->AddTag(CECTag(EC_TAG_STRING, tmp.AfterLast('\n')));
+	} break;
+	case EC_OP_GET_SERVERINFO:
+		response = new CECPacket(EC_OP_SERVERINFO);
+		response->AddTag(CECTag(EC_TAG_STRING, theApp->GetServerLog(false)));
+		break;
+	case EC_OP_CLEAR_SERVERINFO:
+		theApp->GetServerLog(true);
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	case EC_OP_GET_CHAT_MESSAGES: {
+		// Non-destructive backfill of ONE session's history, for a client opening a
+		// conversation it has no transcript for. The polling path is
+		// EC_OP_GET_CHAT_SESSIONS; this exists so opening an old tab does not have to
+		// replay the whole store.
+		const CECTag *idTag = request->GetTagByName(EC_TAG_CHAT_CLIENT_ID);
+		if (!idTag) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Missing chat session id")));
 			break;
-		case EC_OP_RESET_LOG:
-			theApp->GetLog(true);
-			response = new CECPacket(EC_OP_NOOP);
+		}
+		const CChatSessionStore::Session *session = theApp->chatsessions->Find(idTag->GetInt());
+		if (!session) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("No such chat session")));
 			break;
-		case EC_OP_RESET_DEBUGLOG:
-			theApp->GetDebugLog(true);
-			response = new CECPacket(EC_OP_NOOP);
+		}
+		response = new CECPacket(EC_OP_CHAT_MESSAGES);
+		response->AddTag(CECTag(EC_TAG_CHAT_MSG_ID, theApp->chatsessions->LastMsgId()));
+		response->AddTag(EncodeChatSession(*session, ChatCursorFrom(request)));
+		break;
+	}
+	case EC_OP_REFRESH_MEDIA_METADATA: {
+		// Re-extract media metadata: for one file when the request names a hash, otherwise
+		// for the whole share. Answers immediately with how many probes were queued -- the
+		// work happens on the media-probe worker.
+		//
+		// Disabled is not the same answer as "nothing was eligible", and both used to
+		// arrive as queued = 0. A caller cannot act on that: a share with no media in it
+		// legitimately queues nothing. Answered first, and as a failure, so REST turns it
+		// into an error naming the reason.
+		if (!thePrefs::GetMediaMetadataEnabled()) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING,
+				wxTRANSLATE("Media metadata extraction is disabled in preferences")));
 			break;
-		case EC_OP_GET_LAST_LOG_ENTRY:
-			{
-				wxString tmp = theApp->GetLog(false);
-				if (tmp.Last() == '\n') {
-					tmp.RemoveLast();
-				}
-				response = new CECPacket(EC_OP_LOG);
-				response->AddTag(CECTag(EC_TAG_STRING, tmp.AfterLast('\n')));
+		}
+		// Every EC_TAG_KNOWNFILE child, not just the first: the GUI sends one request for a
+		// whole selection rather than one packet per file, which would stall its own
+		// polling on the request fifo.
+		std::vector<CMD4Hash> hashes;
+		for (const CECTag &child : *request) {
+			if (child.GetTagName() == EC_TAG_KNOWNFILE) {
+				hashes.push_back(child.GetMD4Data());
+			}
+		}
+		unsigned queued = 0;
+		if (hashes.size() > 1) {
+			queued = theApp->sharedfiles->RefreshMediaMetadata(hashes);
+		} else if (!hashes.empty()) {
+			const CMD4Hash hash = hashes.front();
+			if (!theApp->sharedfiles->RefreshMediaMetadata(hash)) {
+				// The caller already resolved the hash against its own snapshot, so "no
+				// such file" is not the reason by the time this runs -- what is left is a
+				// file whose extension is not audio/video, or an in-progress download.
+				response = new CECPacket(EC_OP_FAILED);
+				response->AddTag(CECTag(EC_TAG_STRING,
+					wxTRANSLATE("File is not eligible for media metadata "
+						    "extraction (not an audio/video file, or an "
+						    "incomplete download)")));
+				break;
 			}
+			queued = 1;
+		} else {
+			queued = theApp->sharedfiles->RefreshAllMediaMetadata();
+		}
+		response = new CECPacket(EC_OP_NOOP);
+		response->AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_QUEUED, static_cast<uint32>(queued)));
+		break;
+	}
+	case EC_OP_GET_CHAT_SESSIONS: {
+		// The per-tick workhorse: the session list AND every message newer than the
+		// client's cursor in one roundtrip, so an idle connection costs one small packet
+		// and a busy one needs no follow-up query.
+		const uint32 cursor = ChatCursorFrom(request);
+		response = new CECPacket(EC_OP_CHAT_SESSIONS);
+		// Top-level cursor even when nothing came back, so a client can advance past
+		// messages that were evicted rather than re-asking for them forever.
+		response->AddTag(CECTag(EC_TAG_CHAT_MSG_ID, theApp->chatsessions->LastMsgId()));
+		for (const CChatSessionStore::Session *session : theApp->chatsessions->Sessions()) {
+			// Sessions with nothing new are still listed, with no message children: that is
+			// how a client that connected late learns the session exists, and how every
+			// client learns a session it is tracking was closed elsewhere.
+			response->AddTag(EncodeChatSession(*session, cursor));
+		}
+		break;
+	}
+	case EC_OP_CHAT_SEND: {
+		const CECTag *textTag = request->GetTagByName(EC_TAG_CHAT);
+		const wxString text = textTag ? textTag->GetStringData() : wxString();
+		if (text.IsEmpty()) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Empty chat message")));
 			break;
-		case EC_OP_GET_SERVERINFO:
-			response = new CECPacket(EC_OP_SERVERINFO);
-			response->AddTag(CECTag(EC_TAG_STRING, theApp->GetServerLog(false)));
+		}
+		uint64 gui_id = 0;
+		if (!ResolveChatTarget(request, gui_id)) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Unknown chat target")));
 			break;
-		case EC_OP_CLEAR_SERVERINFO:
-			theApp->GetServerLog(true);
-			response = new CECPacket(EC_OP_NOOP);
+		}
+		// Deliberately ignoring the bool: a false return means "queued while connecting",
+		// not "failed" -- the desktop optimistically prints *** Connecting to Client ***
+		// -- so turning it into EC_OP_FAILED would report an error for a message that
+		// arrives moments later.
+		theApp->clientlist->SendChatMessage(gui_id, text);
+		response = new CECPacket(EC_OP_NOOP);
+		response->AddTag(CECTag(EC_TAG_CHAT_CLIENT_ID, gui_id));
+		response->AddTag(CECTag(EC_TAG_CHAT_MSG_ID, theApp->chatsessions->LastMsgId()));
+		break;
+	}
+	case EC_OP_CHAT_CLOSE_SESSION: {
+		const CECTag *idTag = request->GetTagByName(EC_TAG_CHAT_CLIENT_ID);
+		if (!idTag) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Missing chat session id")));
 			break;
-		//
-		// Statistics
-		//
-		case EC_OP_GET_STATSGRAPHS:
-			response = GetStatsGraphs(request);
+		}
+		const uint64 gui_id = idTag->GetInt();
+		if (!theApp->chatsessions->CloseSession(gui_id)) {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("No such chat session")));
 			break;
-		case EC_OP_GET_STATSTREE: {
-			theApp->m_statistics->UpdateStatsTree();
-			response = new CECPacket(EC_OP_STATSTREE);
-			CECTag* tree = theStats::GetECStatTree(request->GetTagByNameSafe(EC_TAG_STATTREE_CAPPING)->GetInt());
-			if (tree) {
-				response->AddTag(*tree);
-				delete tree;
-			}
-			if (request->GetDetailLevel() == EC_DETAIL_WEB) {
-				response->AddTag(CECTag(EC_TAG_SERVER_VERSION, VERSION));
-				response->AddTag(CECTag(EC_TAG_USER_NICK, thePrefs::GetUserNick()));
+		}
+		theApp->clientlist->SetChatState(gui_id, MS_NONE);
+		// Closing is global, matching how closing a search tab destroys the core bucket for
+		// every client: the next EC_OP_CHAT_SESSIONS reply simply omits the session and
+		// each client drops its tab.
+		Notify_Chat_SessionRemoved(gui_id);
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	}
+	// Statistics
+	case EC_OP_GET_STATSGRAPHS:
+		response = GetStatsGraphs(request);
+		break;
+	case EC_OP_GET_STATSTREE: {
+		theApp->m_statistics->UpdateStatsTree();
+		response = new CECPacket(EC_OP_STATSTREE);
+		CECTag *tree =
+			theStats::GetECStatTree(request->GetTagByNameSafe(EC_TAG_STATTREE_CAPPING)->GetInt());
+		if (tree) {
+			response->AddTag(*tree);
+			delete tree;
+		}
+		if (request->GetDetailLevel() == EC_DETAIL_WEB) {
+			// Same short form as the AUTH_OK handshake above, so amuleweb
+			// and the GUI never see two spellings of one build.
+			response->AddTag(CECTag(EC_TAG_SERVER_VERSION, GetShortMuleVersion()));
+			response->AddTag(CECTag(EC_TAG_USER_NICK, thePrefs::GetUserNick()));
+		}
+		break;
+	}
+
+	// Kad
+	case EC_OP_KAD_START:
+		if (thePrefs::GetNetworkKademlia()) {
+			response = new CECPacket(EC_OP_NOOP);
+			if (!Kademlia::CKademlia::IsRunning()) {
+				Kademlia::CKademlia::Start();
+				theApp->ShowConnectionState();
 			}
-			break;
+		} 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->GetFirstTagSafe()->GetStringData();
+
+		// Save the new url, and update the UI (if not amuled).
+		Notify_NodesURLChanged(url);
+		thePrefs::SetKadNodesUrl(url);
 
-		//
-		// Kad
-		//
-		case EC_OP_KAD_START:
-			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->UpdateNotesDat(url);
+		response = new CECPacket(EC_OP_NOOP);
+		break;
+	}
+	case EC_OP_KAD_BOOTSTRAP_FROM_IP:
+		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);
-			break;
-		case EC_OP_KAD_UPDATE_FROM_URL: {
-			wxString url = request->GetFirstTagSafe()->GetStringData();
-
-			// Save the new url, and update the UI (if not amuled).
-			Notify_NodesURLChanged(url);
-			thePrefs::SetKadNodesUrl(url);
-
-			theApp->UpdateNotesDat(url);
-			response = new CECPacket(EC_OP_NOOP);
-			break;
+		} else {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(
+				CECTag(EC_TAG_STRING, wxTRANSLATE("Kad is disabled in preferences.")));
 		}
-		case EC_OP_KAD_BOOTSTRAP_FROM_IP:
-			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);
+		break;
+
+	// Networks. These requests are currently used only in the text client.
+	case EC_OP_CONNECT:
+		if (thePrefs::GetNetworkED2K()) {
+			response = new CECPacket(EC_OP_STRINGS);
+			if (theApp->IsConnectedED2K()) {
+				response->AddTag(
+					CECTag(EC_TAG_STRING, wxTRANSLATE("Already connected to eD2k.")));
 			} else {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Kad is disabled in preferences.")));
+				theApp->serverconnect->ConnectToAnyServer();
+				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Connecting to eD2k...")));
 			}
-			break;
-
-		//
-		// Networks
-		// These requests are currently used only in the text client
-		//
-		case EC_OP_CONNECT:
-			if (thePrefs::GetNetworkED2K()) {
+		}
+		if (thePrefs::GetNetworkKademlia()) {
+			if (!response) {
 				response = new CECPacket(EC_OP_STRINGS);
-				if (theApp->IsConnectedED2K()) {
-					response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Already connected to eD2k.")));
-				} else {
-					theApp->serverconnect->ConnectToAnyServer();
-					response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Connecting to eD2k...")));
-				}
 			}
-			if (thePrefs::GetNetworkKademlia()) {
-				if (!response) {
-					response = new CECPacket(EC_OP_STRINGS);
-				}
-				if (theApp->IsConnectedKad()) {
-					response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Already connected to Kad.")));
-				} else {
-					theApp->StartKad();
-					response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Connecting to Kad...")));
-				}
-			}
-			if (response) {
-				theApp->ShowConnectionState();
+			if (theApp->IsConnectedKad()) {
+				response->AddTag(
+					CECTag(EC_TAG_STRING, wxTRANSLATE("Already connected to Kad.")));
 			} else {
-				response = new CECPacket(EC_OP_FAILED);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("All networks are disabled.")));
+				theApp->StartKad();
+				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Connecting to Kad...")));
 			}
-			break;
-		case EC_OP_DISCONNECT:
-			if (theApp->IsConnected()) {
-				response = new CECPacket(EC_OP_STRINGS);
-				if (theApp->IsConnectedED2K()) {
-					theApp->serverconnect->Disconnect();
-					response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Disconnected from eD2k.")));
-				}
-				if (theApp->IsConnectedKad()) {
-					theApp->StopKad();
-					response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Disconnected from Kad.")));
-				}
-				theApp->ShowConnectionState();
-			} else {
-				response = new CECPacket(EC_OP_NOOP);
+		}
+		if (response) {
+			theApp->ShowConnectionState();
+		} else {
+			response = new CECPacket(EC_OP_FAILED);
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("All networks are disabled.")));
+		}
+		break;
+	case EC_OP_DISCONNECT:
+		if (theApp->IsConnected()) {
+			response = new CECPacket(EC_OP_STRINGS);
+			if (theApp->IsConnectedED2K()) {
+				theApp->serverconnect->Disconnect();
+				response->AddTag(
+					CECTag(EC_TAG_STRING, wxTRANSLATE("Disconnected from eD2k.")));
 			}
-			break;
+			if (theApp->IsConnectedKad()) {
+				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());
+		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?)")));
+		response->AddTag(
+			CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid opcode (wrong protocol version?)")));
 	}
 	return response;
 }
 
-/*
- * Here notification-based EC. Notification will be sorted by priority for possible throttling.
- */
+// Notification-based EC below. Notifications are sorted by priority for possible
+// throttling.
 
-/*
- * Core general status
- */
+// Core general status
 ECStatusMsgSource::ECStatusMsgSource()
 {
 	m_last_ed2k_status_sent = 0xffffffff;
@@ -2373,9 +4275,9 @@
 
 uint32 ECStatusMsgSource::GetEd2kStatus()
 {
-	if ( theApp->IsConnectedED2K() ) {
+	if (theApp->IsConnectedED2K()) {
 		return theApp->GetED2KID();
-	} else if ( theApp->serverconnect->IsConnecting() ) {
+	} else if (theApp->serverconnect->IsConnecting()) {
 		return 1;
 	} else {
 		return 0;
@@ -2384,11 +4286,11 @@
 
 uint32 ECStatusMsgSource::GetKadStatus()
 {
-	if ( theApp->IsConnectedKad() ) {
+	if (theApp->IsConnectedKad()) {
 		return 1;
-	} else if ( Kademlia::CKademlia::IsFirewalled() ) {
+	} else if (Kademlia::CKademlia::IsFirewalled()) {
 		return 2;
-	} else if ( Kademlia::CKademlia::IsRunning() ) {
+	} else if (Kademlia::CKademlia::IsRunning()) {
 		return 3;
 	}
 	return 0;
@@ -2396,9 +4298,8 @@
 
 CECPacket *ECStatusMsgSource::GetNextPacket()
 {
-	if ( (m_last_ed2k_status_sent != GetEd2kStatus()) ||
-		(m_last_kad_status_sent != GetKadStatus()) ||
-		(m_server != theApp->serverconnect->GetCurrentServer()) ) {
+	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();
@@ -2411,15 +4312,12 @@
 	return 0;
 }
 
-/*
- * Downloading files
-*/
+// Downloading files
 ECPartFileMsgSource::ECPartFileMsgSource()
 {
-	std::vector<CPartFile*> snapshot;
+	std::vector<CPartFile *> snapshot;
 	theApp->downloadqueue->CopyFileList(snapshot);
-	for (std::vector<CPartFile*>::const_iterator it = snapshot.begin();
-		it != snapshot.end(); ++it) {
+	for (std::vector<CPartFile *>::const_iterator it = snapshot.begin(); it != snapshot.end(); ++it) {
 		CPartFile *cur_file = *it;
 		PARTFILE_STATUS status = { true, false, false, false, true, cur_file };
 		m_dirty_statuscur_file->GetFileHash() = status;
@@ -2429,15 +4327,16 @@
 void ECPartFileMsgSource::SetDirty(const CPartFile *file)
 {
 	CMD4Hash filehash = file->GetFileHash();
-	if ( m_dirty_status.find(filehash) != m_dirty_status.end() ) {
-		m_dirty_statusfilehash.m_dirty = true;;
+	if (m_dirty_status.find(filehash) != m_dirty_status.end()) {
+		m_dirty_statusfilehash.m_dirty = true;
+		;
 	}
 }
 
 void ECPartFileMsgSource::SetNew(const CPartFile *file)
 {
 	CMD4Hash filehash = file->GetFileHash();
-	wxASSERT ( m_dirty_status.find(filehash) == m_dirty_status.end() );
+	wxASSERT(m_dirty_status.find(filehash) == m_dirty_status.end());
 	PARTFILE_STATUS status = { true, false, false, false, true, file };
 	m_dirty_statusfilehash = status;
 }
@@ -2445,7 +4344,7 @@
 void ECPartFileMsgSource::SetCompleted(const CPartFile *file)
 {
 	CMD4Hash filehash = file->GetFileHash();
-	wxASSERT ( m_dirty_status.find(filehash) != m_dirty_status.end() );
+	wxASSERT(m_dirty_status.find(filehash) != m_dirty_status.end());
 
 	m_dirty_statusfilehash.m_finished = true;
 }
@@ -2453,27 +4352,29 @@
 void ECPartFileMsgSource::SetRemoved(const CPartFile *file)
 {
 	CMD4Hash filehash = file->GetFileHash();
-	wxASSERT ( m_dirty_status.find(filehash) != m_dirty_status.end() );
+	wxASSERT(m_dirty_status.find(filehash) != m_dirty_status.end());
 
 	m_dirty_statusfilehash.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) {
+	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;
 
 			const CPartFile *partfile = it->second.m_file;
 
 			CECPacket *packet = new CECPacket(EC_OP_DLOAD_QUEUE);
-			if ( it->second.m_removed ) {
+			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);
+				CEC_PartFile_Tag tag(
+					partfile, it->second.m_new ? EC_DETAIL_FULL : EC_DETAIL_UPDATE);
 				packet->AddTag(tag);
 			}
 			m_dirty_statusfilehash.m_new = false;
@@ -2485,15 +4386,12 @@
 	return 0;
 }
 
-/*
- * Shared files - similar to downloading
- */
+// Shared files - similar to downloading
 ECKnownFileMsgSource::ECKnownFileMsgSource()
 {
-	std::vector<CKnownFile*> snapshot;
+	std::vector<CKnownFile *> snapshot;
 	theApp->sharedfiles->CopyFileList(snapshot);
-	for (std::vector<CKnownFile*>::const_iterator it = snapshot.begin();
-		it != snapshot.end(); ++it) {
+	for (std::vector<CKnownFile *>::const_iterator it = snapshot.begin(); it != snapshot.end(); ++it) {
 		const CKnownFile *cur_file = *it;
 		KNOWNFILE_STATUS status = { true, false, false, true, cur_file };
 		m_dirty_statuscur_file->GetFileHash() = status;
@@ -2503,15 +4401,16 @@
 void ECKnownFileMsgSource::SetDirty(const CKnownFile *file)
 {
 	CMD4Hash filehash = file->GetFileHash();
-	if ( m_dirty_status.find(filehash) != m_dirty_status.end() ) {
-		m_dirty_statusfilehash.m_dirty = true;;
+	if (m_dirty_status.find(filehash) != m_dirty_status.end()) {
+		m_dirty_statusfilehash.m_dirty = true;
+		;
 	}
 }
 
 void ECKnownFileMsgSource::SetNew(const CKnownFile *file)
 {
 	CMD4Hash filehash = file->GetFileHash();
-	wxASSERT ( m_dirty_status.find(filehash) == m_dirty_status.end() );
+	wxASSERT(m_dirty_status.find(filehash) == m_dirty_status.end());
 	KNOWNFILE_STATUS status = { true, false, false, true, file };
 	m_dirty_statusfilehash = status;
 }
@@ -2519,27 +4418,29 @@
 void ECKnownFileMsgSource::SetRemoved(const CKnownFile *file)
 {
 	CMD4Hash filehash = file->GetFileHash();
-	wxASSERT ( m_dirty_status.find(filehash) != m_dirty_status.end() );
+	wxASSERT(m_dirty_status.find(filehash) != m_dirty_status.end());
 
 	m_dirty_statusfilehash.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) {
+	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;
 
 			const CKnownFile *partfile = it->second.m_file;
 
 			CECPacket *packet = new CECPacket(EC_OP_SHARED_FILES);
-			if ( it->second.m_removed ) {
+			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);
+				CEC_SharedFile_Tag tag(
+					partfile, it->second.m_new ? EC_DETAIL_FULL : EC_DETAIL_UPDATE);
 				packet->AddTag(tag);
 			}
 			m_dirty_statusfilehash.m_new = false;
@@ -2551,30 +4452,26 @@
 	return 0;
 }
 
-/*
- * Notification about search status
-*/
-ECSearchMsgSource::ECSearchMsgSource()
-{
-}
+// Notification about search status
+ECSearchMsgSource::ECSearchMsgSource() {}
 
 CECPacket *ECSearchMsgSource::GetNextPacket()
 {
-	if ( m_dirty_status.empty() ) {
+	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++) {
+	for (std::map<CMD4Hash, SEARCHFILE_STATUS>::iterator it = m_dirty_status.begin();
+		it != m_dirty_status.end();
+		it++) {
 
-		if ( it->second.m_new ) {
+		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 ) {
+		} else if (it->second.m_dirty) {
 			response->AddTag(CEC_SearchFile_Tag(it->second.m_file, EC_DETAIL_UPDATE));
 		}
-
 	}
 
 	return response;
@@ -2587,7 +4484,7 @@
 
 void ECSearchMsgSource::SetDirty(const CSearchFile *file)
 {
-	if ( m_dirty_status.count(file->GetFileHash()) ) {
+	if (m_dirty_status.count(file->GetFileHash())) {
 		m_dirty_statusfile->GetFileHash().m_dirty = true;
 	} else {
 		m_dirty_statusfile->GetFileHash().m_new = true;
@@ -2602,20 +4499,14 @@
 	m_dirty_statusfile->GetFileHash().m_child_dirty = true;
 }
 
-/*
- * Notification about uploading clients
- */
+// Notification about uploading clients
 CECPacket *ECClientMsgSource::GetNextPacket()
 {
 	return 0;
 }
 
-//
 // Notification iface per-client
-//
-ECNotifier::ECNotifier()
-{
-}
+ECNotifier::ECNotifier() {}
 
 ECNotifier::~ECNotifier()
 {
@@ -2626,11 +4517,9 @@
 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_arrayi->GetNextPacket()) != 0 ) {
+	for (int i = 0; i < EC_STATUS_LAST_PRIO; i++) {
+		if ((packet = msg_source_arrayi->GetNextPacket()) != 0) {
 			break;
 		}
 	}
@@ -2639,32 +4528,28 @@
 
 CECPacket *ECNotifier::GetNextPacket(CECServerSocket *sock)
 {
-	//
-	// OnOutput is called for a first time before
-	// socket is registered
-	//
-	if ( m_msg_source.count(sock) ) {
+	// OnOutput is called for a first time before socket is registered
+	if (m_msg_source.count(sock)) {
 		ECUpdateMsgSource **notifier_array = m_msg_sourcesock;
-		if ( !notifier_array ) {
+		if (!notifier_array) {
 			return 0;
 		}
 		CECPacket *packet = GetNextPacket(notifier_array);
-		//printf("EC next update packet; opcode=%x\n",packet ? packet->GetOpCode() : 0xff);
+		// 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(const CPartFile *file)
 {
-	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
-		i != m_msg_source.end(); ++i) {
+	for (std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
+		i != m_msg_source.end();
+		++i) {
 		CECServerSocket *sock = i->first;
-		if ( sock->HaveNotificationSupport() ) {
+		if (sock->HaveNotificationSupport()) {
 			ECUpdateMsgSource **notifier_array = i->second;
 			static_cast<ECPartFileMsgSource *>(notifier_arrayEC_PARTFILE)->SetDirty(file);
 		}
@@ -2674,8 +4559,9 @@
 
 void ECNotifier::DownloadFile_RemoveFile(const CPartFile *file)
 {
-	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
-		i != m_msg_source.end(); ++i) {
+	for (std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
+		i != m_msg_source.end();
+		++i) {
 		ECUpdateMsgSource **notifier_array = i->second;
 		static_cast<ECPartFileMsgSource *>(notifier_arrayEC_PARTFILE)->SetRemoved(file);
 	}
@@ -2689,8 +4575,9 @@
 
 void ECNotifier::DownloadFile_AddFile(const CPartFile *file)
 {
-	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
-		i != m_msg_source.end(); ++i) {
+	for (std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
+		i != m_msg_source.end();
+		++i) {
 		ECUpdateMsgSource **notifier_array = i->second;
 		static_cast<ECPartFileMsgSource *>(notifier_arrayEC_PARTFILE)->SetNew(file);
 	}
@@ -2704,8 +4591,9 @@
 
 void ECNotifier::SharedFile_AddFile(const CKnownFile *file)
 {
-	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
-		i != m_msg_source.end(); ++i) {
+	for (std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
+		i != m_msg_source.end();
+		++i) {
 		ECUpdateMsgSource **notifier_array = i->second;
 		static_cast<ECKnownFileMsgSource *>(notifier_arrayEC_KNOWN)->SetNew(file);
 	}
@@ -2714,8 +4602,9 @@
 
 void ECNotifier::SharedFile_RemoveFile(const CKnownFile *file)
 {
-	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
-		i != m_msg_source.end(); ++i) {
+	for (std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
+		i != m_msg_source.end();
+		++i) {
 		ECUpdateMsgSource **notifier_array = i->second;
 		static_cast<ECKnownFileMsgSource *>(notifier_arrayEC_KNOWN)->SetRemoved(file);
 	}
@@ -2746,27 +4635,27 @@
 
 		m_msg_source.erase(sock);
 
-		for(int i = 0; i < EC_STATUS_LAST_PRIO; i++) {
+		for (int i = 0; i < EC_STATUS_LAST_PRIO; i++) {
 			delete notifier_arrayi;
 		}
-		delete  notifier_array;
+		delete notifier_array;
 	}
 }
 
 void ECNotifier::NextPacketToSocket()
 {
-	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
-		i != m_msg_source.end(); ++i) {
+	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() ) {
+		if (sock->HaveNotificationSupport() && !sock->DataPending()) {
 			ECUpdateMsgSource **notifier_array = i->second;
-			// Same ownership contract as WriteDoneAndQueueEmpty: the
-			// CECPacket from GetNextPacket is caller-owned and
-			// SendPacket only serialises it.  Wrap so it's freed at
-			// scope exit (#765).
+			// Same ownership contract as WriteDoneAndQueueEmpty: the CECPacket from
+			// GetNextPacket is caller-owned and SendPacket only serialises it, so wrap it to
+			// be freed at scope exit.
 			CSmartPtr<CECPacket> packet(GetNextPacket(notifier_array));
 			if (packet) {
-				//printf("EC sending update packet; opcode=%x\n",packet->GetOpCode());
+				// printf("EC sending update packet; opcode=%x\n",packet->GetOpCode());
 				sock->SendPacket(packet.get());
 			}
 		}

amule-3.0.1.tar.gz/src/ExternalConn.h -> amule-3.1.0.tar.gz/src/ExternalConn.h Changed

@@ -27,51 +27,65 @@
 #ifndef EXTERNALCONN_H
 #define EXTERNALCONN_H
 
-
 #include <ec/cpp/ECSpecialTags.h>
 
-#include "amuleIPV4Address.h"	// for amuleIPV4Address
-#include "RLE.h"	// for RLE
+#include <common/RateLimiter.h> // for CRateLimiter (EC auth brute-force guard)
+
+#include <list>    // for std::list (chat message buffer)
+#include <utility> // for std::pair (chat message buffer)
+
+#include "amuleIPV4Address.h" // for amuleIPV4Address
+#include "RLE.h"              // for RLE
 #include "DownloadQueue.h"
-#include "PartFile.h"			// for SourcenameItemMap
+#include "PartFile.h" // for SourcenameItemMap
+
+/**
+ * Registers a search restored from StoredSearches.met (CSearchList::LoadSearches(), issue #641
+ * Phase 3) with the EC multi-search registry, so EC_OP_SEARCH_LIST and the INC_UPDATE union poll
+ * surface it to a freshly connecting amuleGUI/amuleapi client exactly as they would a live search.
+ * The registry (s_ecSearches) is file-local to ExternalConn.cpp, hence this thin exported wrapper
+ * around its existing Register(id), which already takes an existing ID rather than allocating one.
+ */
+void RegisterRestoredSearch(uint32 searchID);
+
+template <class T, ec_tagname_t OP> class CTagSet : public std::set<T>
+{
+	void InSet(const CECTag *tag, uint32)
+	{
+		this->insert(tag->GetInt()); // don't remove this->
+	}
+	void InSet(const CECTag *tag, const CMD4Hash &)
+	{
+		this->insert(tag->GetMD4Data()); // don't remove this->
+	}
 
-template <class T, ec_tagname_t OP>
-class CTagSet : public std::set<T> {
-		void InSet(const CECTag *tag, uint32)
-		{
-			this->insert(tag->GetInt());		// don't remove this->
-		}
-		void InSet(const CECTag *tag, const CMD4Hash&)
-		{
-			this->insert(tag->GetMD4Data());	// don't remove this->
-		}
-	public:
-		CTagSet(const CECPacket *request) : std::set<T>()
-		{
-			for (CECPacket::const_iterator it = request->begin(); it != request->end(); ++it) {
-				const CECTag *tag = & *it;
-				if ( tag->GetTagName() == OP ) {
-					InSet(tag, T());
-				}
+public:
+	CTagSet(const CECPacket *request)
+	: std::set<T>()
+	{
+		for (CECPacket::const_iterator it = request->begin(); it != request->end(); ++it) {
+			const CECTag *tag = &*it;
+			if (tag->GetTagName() == OP) {
+				InSet(tag, T());
 			}
 		}
+	}
 };
 
+class CObjTagMap
+{
+	std::map<uint32, CValueMap> m_obj_map;
 
-class CObjTagMap {
-		std::map<uint32, CValueMap> m_obj_map;
-	public:
-		CValueMap &GetValueMap(uint32 ECID)
-		{
-			return m_obj_mapECID;
-		}
+public:
+	CValueMap &GetValueMap(uint32 ECID) { return m_obj_mapECID; }
 
-		size_t size()
-		{
-			return m_obj_map.size();
-		}
-};
+	// Drop the per-ECID field cache. Called when an encoder for this ECID is freshly
+	// (re-)created, so the next EC_DETAIL_INC_UPDATE emits every identifying field (hash / name
+	// / size) instead of suppressing them against a stale cache the peer no longer holds.
+	void EraseValueMap(uint32 ECID) { m_obj_map.erase(ECID); }
 
+	size_t size() { return m_obj_map.size(); }
+};
 
 class CECServerSocket;
 class ECNotifier;
@@ -80,14 +94,16 @@
 class CExternalConnListener : public CLibSocketServer
 {
 public:
-	CExternalConnListener(const amuleIPV4Address& adr, int flags, ExternalConn * conn)
-		: CLibSocketServer(adr, flags), m_conn(conn) {}
+	// Defined in ExternalConn.cpp: the EC listener binds to its own interface
+	// (thePrefs::GetECNetworkInterface(), empty = any), decoupled from the global P2P interface
+	// pin -- see issue #330.
+	CExternalConnListener(const amuleIPV4Address &adr, int flags, ExternalConn *conn);
 	void OnAccept();
+
 private:
-	ExternalConn * m_conn;
+	ExternalConn *m_conn;
 };
 
-
 class ExternalConn : public wxEvtHandler
 {
 private:
@@ -104,142 +120,162 @@
 	void AddSocket(CECServerSocket *s);
 	void RemoveSocket(CECServerSocket *s);
 	void KillAllSockets();
+	// Drop the incremental-update cache entry for an object that no longer exists.
+	void ForgetObject(uint32 ecid);
 	void ResetAllLogs();
+
+	// Brute-force protection for the password exchange, shared by every connection. It lives
+	// here rather than on CECServerSocket because a socket dies with its connection: per-socket
+	// buckets would reset on every reconnect, which is exactly what an attacker does between
+	// guesses. Not keyed on whether the listener is bound locally -- an SSH tunnel makes a
+	// remote attacker arrive from 127.0.0.1, so "local means trusted" would exempt the very
+	// setup people adopt for safety.
+	CRateLimiter &AuthRateLimiter() { return m_authRateLimiter; }
+
+private:
+	CRateLimiter m_authRateLimiter;
 };
 
-class ECUpdateMsgSource {
-	public:
-		virtual ~ECUpdateMsgSource()
-		{
-		}
-		virtual CECPacket *GetNextPacket() = 0;
+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;
-			const CPartFile *m_file;
-		} PARTFILE_STATUS;
-		std::map<CMD4Hash, PARTFILE_STATUS> m_dirty_status;
-	public:
-		ECPartFileMsgSource();
-
-		void SetDirty(const CPartFile *file);
-		void SetNew(const CPartFile *file);
-		void SetCompleted(const CPartFile *file);
-		void SetRemoved(const CPartFile *file);
-
-		virtual CECPacket *GetNextPacket();
+class ECPartFileMsgSource : public ECUpdateMsgSource
+{
+	typedef struct
+	{
+		bool m_new;
+		bool m_comment_changed;
+		bool m_removed;
+		bool m_finished;
+		bool m_dirty;
+		const CPartFile *m_file;
+	} PARTFILE_STATUS;
+	std::map<CMD4Hash, PARTFILE_STATUS> m_dirty_status;
+
+public:
+	ECPartFileMsgSource();
+
+	void SetDirty(const CPartFile *file);
+	void SetNew(const CPartFile *file);
+	void SetCompleted(const CPartFile *file);
+	void SetRemoved(const CPartFile *file);
 
+	virtual CECPacket *GetNextPacket();
 };
 
-class ECKnownFileMsgSource : public ECUpdateMsgSource {
-		typedef struct {
-			bool m_new;
-			bool m_comment_changed;
-			bool m_removed;
-			bool m_dirty;
-			const CKnownFile *m_file;
-		} KNOWNFILE_STATUS;
-		std::map<CMD4Hash, KNOWNFILE_STATUS> m_dirty_status;
-	public:
-		ECKnownFileMsgSource();
-
-		void SetDirty(const CKnownFile *file);
-		void SetNew(const CKnownFile *file);
-		void SetRemoved(const CKnownFile *file);
-
-		virtual CECPacket *GetNextPacket();
+class ECKnownFileMsgSource : public ECUpdateMsgSource
+{
+	typedef struct
+	{
+		bool m_new;
+		bool m_comment_changed;
+		bool m_removed;
+		bool m_dirty;
+		const CKnownFile *m_file;
+	} KNOWNFILE_STATUS;
+	std::map<CMD4Hash, KNOWNFILE_STATUS> m_dirty_status;
+
+public:
+	ECKnownFileMsgSource();
+
+	void SetDirty(const CKnownFile *file);
+	void SetNew(const CKnownFile *file);
+	void SetRemoved(const CKnownFile *file);
+
+	virtual CECPacket *GetNextPacket();
 };
 
-class ECClientMsgSource : public ECUpdateMsgSource {
-	public:
-		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;
+class ECStatusMsgSource : public ECUpdateMsgSource
+{
+	uint32 m_last_ed2k_status_sent;
+	uint32 m_last_kad_status_sent;
+	void *m_server;
+
+	uint32 GetEd2kStatus();
+	uint32 GetKadStatus();
 
-		uint32 GetEd2kStatus();
-		uint32 GetKadStatus();
-	public:
-		ECStatusMsgSource();
+public:
+	ECStatusMsgSource();
 
-		virtual CECPacket *GetNextPacket();
+	virtual CECPacket *GetNextPacket();
 };
 
-class ECSearchMsgSource : public ECUpdateMsgSource {
-		typedef struct {
-			bool m_new;
-			bool m_child_dirty;
-			bool m_dirty;
-			const CSearchFile *m_file;
-		} SEARCHFILE_STATUS;
-		std::map<CMD4Hash, SEARCHFILE_STATUS> m_dirty_status;
-	public:
-		ECSearchMsgSource();
+class ECSearchMsgSource : public ECUpdateMsgSource
+{
+	typedef struct
+	{
+		bool m_new;
+		bool m_child_dirty;
+		bool m_dirty;
+		const CSearchFile *m_file;
+	} SEARCHFILE_STATUS;
+	std::map<CMD4Hash, SEARCHFILE_STATUS> m_dirty_status;
+
+public:
+	ECSearchMsgSource();
 
-		void SetDirty(const CSearchFile *file);
-		void SetChildDirty(const CSearchFile *file);
+	void SetDirty(const CSearchFile *file);
+	void SetChildDirty(const CSearchFile *file);
 
-		void FlushStatus();
+	void FlushStatus();
 
-		virtual CECPacket *GetNextPacket();
+	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_sourceEC_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(const CPartFile *file);
-		void DownloadFile_RemoveFile(const CPartFile *file);
-		void DownloadFile_RemoveSource(const CPartFile *file);
-		void DownloadFile_AddFile(const CPartFile *file);
-		void DownloadFile_AddSource(const CPartFile *file);
-
-		void SharedFile_AddFile(const CKnownFile *file);
-		void SharedFile_RemoveFile(const CKnownFile *file);
-		void SharedFile_RemoveAllFiles();
+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_sourceEC_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(const CPartFile *file);
+	void DownloadFile_RemoveFile(const CPartFile *file);
+	void DownloadFile_RemoveSource(const CPartFile *file);
+	void DownloadFile_AddFile(const CPartFile *file);
+	void DownloadFile_AddSource(const CPartFile *file);
+
+	void SharedFile_AddFile(const CKnownFile *file);
+	void SharedFile_RemoveFile(const CKnownFile *file);
+	void SharedFile_RemoveAllFiles();
+};
 
 #endif // EXTERNALCONN_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ExternalConnector.cpp -> amule-3.1.0.tar.gz/src/ExternalConnector.cpp Changed

@@ -23,54 +23,56 @@
 //
 
 #include "ExternalConnector.h"
-#include "config.h"		// Needed for VERSION and readline detection
-#include <common/Format.h>	// Needed for CFormat
-#include <common/LocaleInit.h>	// Needed for aMuleInitLocale()
-#include <wx/tokenzr.h>		// For wxStringTokenizer
+
+#include <common/MuleDebug.h> // Needed for InstallFatalAbortHandler
+
+#include <common/FileFunctions.h> // RestrictToOwner
+#include "config.h"               // Needed for VERSION and readline detection
+#include <common/Format.h>        // Needed for CFormat
+#include <common/LocaleInit.h>    // Needed for aMuleInitLocale()
+#include <wx/tokenzr.h>           // For wxStringTokenizer
 
 // For readline
 #ifdef HAVE_LIBREADLINE
-	#if defined(HAVE_READLINE_READLINE_H)
-		#include <readline/readline.h>  // Do_not_auto_remove
-	#elif defined(HAVE_READLINE_H)
-		#include <readline.h> // Do_not_auto_remove
-	#endif /* !defined(HAVE_READLINE_H) */
-#endif /* HAVE_LIBREADLINE */
+#if defined(HAVE_READLINE_READLINE_H)
+#include <readline/readline.h> // Do_not_auto_remove
+#elif defined(HAVE_READLINE_H)
+#include <readline.h> // Do_not_auto_remove
+#endif                /* !defined(HAVE_READLINE_H) */
+#endif                /* HAVE_LIBREADLINE */
 
 // For history
 #ifdef HAVE_READLINE_HISTORY
-	#if defined(HAVE_READLINE_HISTORY_H)
-		#include <readline/history.h> // Do_not_auto_remove
-	#elif defined(HAVE_HISTORY_H)
-		#include <history.h> // Do_not_auto_remove
-	#endif /* defined(HAVE_READLINE_HISTORY_H) */
-#endif /* HAVE_READLINE_HISTORY */
-
-
-#include <ec/cpp/ECFileConfig.h>	// Needed for CECFileConfig
+#if defined(HAVE_READLINE_HISTORY_H)
+#include <readline/history.h> // Do_not_auto_remove
+#elif defined(HAVE_HISTORY_H)
+#include <history.h> // Do_not_auto_remove
+#endif               /* defined(HAVE_READLINE_HISTORY_H) */
+#endif               /* HAVE_READLINE_HISTORY */
+
+#include <ec/cpp/ECFileConfig.h> // Needed for CECFileConfig
 #include <common/MD5Sum.h>
-#include "Logger.h"				// for theLogger.SetVerbose
-#include "OtherFunctions.h"		// Needed for GetPassword()
-#include "MuleVersion.h"		// Needed for GetMuleVersion()
+#include "Logger.h"         // for theLogger.SetVerbose
+#include "OtherFunctions.h" // Needed for GetPassword()
+#include "MuleVersion.h"    // Needed for GetMuleVersion()
 
-#ifdef _MSC_VER  // silly warnings about deprecated functions
-#pragma warning(disable:4996)
+#ifdef _MSC_VER // silly warnings about deprecated functions
+#pragma warning(disable : 4996)
 #endif
 
 //-------------------------------------------------------------------
 
-CaMuleExternalConnector* CCommandTree::m_app;
+CaMuleExternalConnector *CCommandTree::m_app;
 
 CCommandTree::~CCommandTree()
 {
 	DeleteContents(m_subcommands);
 }
 
-
-CCommandTree* CCommandTree::AddCommand(CCommandTree* command)
+CCommandTree *CCommandTree::AddCommand(CCommandTree *command)
 {
 	command->m_parent = this;
-	const wxString& cmd = command->m_command;
+	const wxString &cmd = command->m_command;
 	CmdPos_t it;
 	for (it = m_subcommands.begin(); it != m_subcommands.end(); ++it) {
 		if ((*it)->m_command > cmd) {
@@ -81,8 +83,7 @@
 	return command;
 }
 
-
-int CCommandTree::FindCommandId(const wxString& command, wxString& args, wxString& cmdstr) const
+int CCommandTree::FindCommandId(const wxString &command, wxString &args, wxString &cmdstr) const
 {
 	wxString cmd = command.BeforeFirst(' ').Lower();
 	for (CmdPosConst_t it = m_subcommands.begin(); it != m_subcommands.end(); ++it) {
@@ -106,7 +107,6 @@
 	}
 }
 
-
 wxString CCommandTree::GetFullCommand() const
 {
 	wxString cmd = m_command;
@@ -120,8 +120,7 @@
 	return cmd;
 }
 
-
-void CCommandTree::PrintHelpFor(const wxString& command) const
+void CCommandTree::PrintHelpFor(const wxString &command) const
 {
 	wxString cmd = command.BeforeFirst(' ').Lower();
 	if (!cmd.IsEmpty()) {
@@ -132,7 +131,8 @@
 			}
 		}
 		if (m_parent) {
-			m_app->Show(CFormat(_("Unknown extension '%s' for the '%s' command.\n")) % command % GetFullCommand());
+			m_app->Show(CFormat(_("Unknown extension '%s' for the '%s' command.\n")) % command %
+				    GetFullCommand());
 		} else {
 			m_app->Show(CFormat(_("Unknown command '%s'.\n")) % command);
 		}
@@ -151,7 +151,8 @@
 			m_app->Show(_("\nThis command must have an argument.\n"));
 		}
 		if (m_cmd_id == CMD_ERR_INCOMPLETE) {
-			m_app->Show(_("\nThis command is incomplete, you must use one of the extensions below.\n"));
+			m_app->Show(_(
+				"\nThis command is incomplete, you must use one of the extensions below.\n"));
 		}
 		if (!m_subcommands.empty()) {
 			CmdPosConst_t it;
@@ -172,11 +173,15 @@
 			maxlen += 4;
 			for (it = m_subcommands.begin(); it != m_subcommands.end(); ++it) {
 				if (!((*it)->m_cmd_id >= 0 && (*it)->m_cmd_id & CMD_DEPRECATED) || m_parent) {
-					m_app->Show((*it)->m_command + wxString(' ', maxlen - (*it)->m_command.Length()) + wxGetTranslation((*it)->m_short) + "\n");
+					m_app->Show((*it)->m_command +
+						    wxString(' ', maxlen - (*it)->m_command.Length()) +
+						    wxGetTranslation((*it)->m_short) + "\n");
 				}
 			}
 			if (!m_parent) {
-				m_app->Show(CFormat(_("\nAll commands are case insensitive.\nType '%s <command>' to get detailed info on <command>.\n")) % "help");
+				m_app->Show(CFormat(_("\nAll commands are case insensitive.\nType '%s "
+						      "<command>' to get detailed info on <command>.\n")) %
+					    "help");
 			}
 		}
 	}
@@ -187,7 +192,7 @@
 
 #ifdef HAVE_LIBREADLINE
 
-const CmdList_t* CCommandTree::GetSubCommandsFor(const wxString& command, bool mayRestart) const
+const CmdList_t *CCommandTree::GetSubCommandsFor(const wxString &command, bool mayRestart) const
 {
 	if (command.IsEmpty()) {
 		return &m_subcommands;
@@ -208,20 +213,17 @@
 	return NULL;
 }
 
-
 // Forward-declare the completion function to make sure it's declaration
 // matches the library requirements.
 rl_compentry_func_t command_completion;
 
-
 // File-scope pointer to the application's command set.
-static CCommandTree * theCommands;
-
+static CCommandTree *theCommands;
 
 char *command_completion(const char *text, int state)
 {
-	static const CmdList_t*	curCommands;
-	static CmdPosConst_t	nextCommand;
+	static const CmdList_t *curCommands;
+	static CmdPosConst_t nextCommand;
 
 	if (state == 0) {
 		wxString lineBuffer(rl_line_buffer, wxConvLibc);
@@ -247,40 +249,41 @@
 	return NULL;
 }
 
-
 #endif /* HAVE_LIBREADLINE */
 
 //-------------------------------------------------------------------
 
 CaMuleExternalConnector::CaMuleExternalConnector()
-	: m_configFile(NULL),
-	  m_port(-1),
-	  m_ZLIB(false),
-	  m_forceZLIB(false),
-	  m_KeepQuiet(false),
-	  m_Verbose(false),
-	  m_interactive(false),
-	  m_commands(*this),
-	  m_appname(NULL),
-	  m_ECClient(NULL),
-	  m_InputLine(NULL),
-	  m_NeedsConfigSave(false),
-	  m_locale(NULL),
-	  m_strFullVersion(NULL),
-	  m_strOSDescription(NULL)
+: m_configFile(NULL)
+, m_port(-1)
+, m_ZLIB(false)
+, m_forceZLIB(false)
+, m_ECEncryption(true)
+, m_canMultiSearch(false)
+, m_canChat(false)
+, m_KeepQuiet(false)
+, m_Verbose(false)
+, m_noLogFile(false)
+, m_interactive(false)
+, m_commands(*this)
+, m_appname(NULL)
+, m_ECClient(NULL)
+, m_InputLine(NULL)
+, m_NeedsConfigSave(false)
+, m_locale(NULL)
+, m_strFullVersion(NULL)
+, m_strOSDescription(NULL)
 {
-	SetAppName("aMule");	// Do not change!
+	SetAppName("aMule"); // Do not change!
 }
 
 CaMuleExternalConnector::~CaMuleExternalConnector()
 {
 	delete m_configFile;
 	delete m_locale;
-	// new'd in ConnectAndRun, DestroySocket'd at the end of that
-	// method but never delete'd -- process-exit reclaimed it, LSan
-	// flags the ~3 KB one-shot leak (CRemoteConnect + CECSocket /
-	// CQueuedData buffers). Ctor sets this to NULL so the delete is
-	// a no-op when ConnectAndRun was never entered. #704.
+	// new'd in ConnectAndRun and DestroySocket'd at the end of it, but never delete'd --
+	// process exit reclaimed it and LSan flagged the ~3 KB one-shot leak (#704). The ctor sets
+	// this to NULL, so the delete is a no-op when ConnectAndRun was never entered.
 	delete m_ECClient;
 	free(m_strFullVersion);
 	free(m_strOSDescription);
@@ -290,21 +293,22 @@
 {
 	m_commands.AddCommand("Quit", CMD_ID_QUIT, wxTRANSLATE("Exits from the application."), "");
 	m_commands.AddCommand("Exit", CMD_ID_QUIT, wxTRANSLATE("Exits from the application."), "");
-	m_commands.AddCommand("Help", CMD_ID_HELP, wxTRANSLATE("Show help."),
-			      /* TRANSLATORS:
-				 Do not translate the word 'help', it is a command to the program! */
-			      wxTRANSLATE("To get help on a command, type 'help <command>'.\nTo get the full command list type 'help'.\n"));
+	m_commands.AddCommand("Help",
+		CMD_ID_HELP,
+		wxTRANSLATE("Show help."),
+		/* TRANSLATORS:
+		   Do not translate the word 'help', it is a command to the program! */
+		wxTRANSLATE("To get help on a command, type 'help <command>'.\nTo get the full command list "
+			    "type 'help'.\n"));
 }
 
 void CaMuleExternalConnector::Show(const wxString &s)
 {
-	if( !m_KeepQuiet ) {
-		// `utf8_str()` instead of `unicode2char()` so non-ASCII output
-		// (server messages, file names) doesn't collapse to `?` /
-		// U+FFFD when the connector is invoked in a `C` locale (#40).
-		// Connectors do call `setlocale(LC_ALL, "")` below, but in
-		// minimal container environments without `LANG`/`LC_ALL`
-		// exported, the C locale still falls back to `C`.
+	if (!m_KeepQuiet) {
+		// `utf8_str()` instead of `unicode2char()`, so non-ASCII output does not collapse
+		// to `?` in a `C` locale (#40). Connectors do call setlocale(LC_ALL, "") below, but
+		// in minimal containers without LANG or LC_ALL the C locale still falls back to
+		// `C`.
 		printf("%s", (const char *)s.utf8_str());
 #ifdef __WINDOWS__
 		fflush(stdout);
@@ -323,15 +327,15 @@
 	Show(CFormat(_("\nUse '%s' for command list\n\n")) % "Help");
 }
 
-void CaMuleExternalConnector::Process_Answer(const wxString& answer)
+void CaMuleExternalConnector::Process_Answer(const wxString &answer)
 {
 	wxStringTokenizer tokens(answer, "\n");
-	while ( tokens.HasMoreTokens() ) {
+	while (tokens.HasMoreTokens()) {
 		Show(" > " + tokens.GetNextToken() + "\n");
 	}
 }
 
-bool CaMuleExternalConnector::Parse_Command(const wxString& buffer)
+bool CaMuleExternalConnector::Parse_Command(const wxString &buffer)
 {
 	wxString cmd;
 	wxStringTokenizer tokens(buffer);
@@ -344,32 +348,32 @@
 		return false;
 	}
 	int cmd_ID = GetIDFromString(cmd);
-	if ( cmd_ID >= 0 ) {
+	if (cmd_ID >= 0) {
 		cmd_ID = ProcessCommand(cmd_ID);
 	}
 	wxString error;
 	switch (cmd_ID) {
-		case CMD_ID_HELP:
-			m_commands.PrintHelpFor(GetCmdArgs());
-			break;
-		case CMD_ERR_SYNTAX:
-			error = _("Syntax error!");
-			break;
-		case CMD_ERR_PROCESS_CMD:
-			Show(_("Error processing command - should never happen! Report bug, please\n"));
-			break;
-		case CMD_ERR_NO_PARAM:
-			error = _("This command should not have any parameters.");
-			break;
-		case CMD_ERR_MUST_HAVE_PARAM:
-			error = _("This command must have a parameter.");
-			break;
-		case CMD_ERR_INVALID_ARG:
-			error = _("Invalid argument.");
-			break;
-		case CMD_ERR_INCOMPLETE:
-			error = _("This is an incomplete command.");
-			break;
+	case CMD_ID_HELP:
+		m_commands.PrintHelpFor(GetCmdArgs());
+		break;
+	case CMD_ERR_SYNTAX:
+		error = _("Syntax error!");
+		break;
+	case CMD_ERR_PROCESS_CMD:
+		Show(_("Error processing command - should never happen! Report bug, please\n"));
+		break;
+	case CMD_ERR_NO_PARAM:
+		error = _("This command should not have any parameters.");
+		break;
+	case CMD_ERR_MUST_HAVE_PARAM:
+		error = _("This command must have a parameter.");
+		break;
+	case CMD_ERR_INVALID_ARG:
+		error = _("Invalid argument.");
+		break;
+	case CMD_ERR_INCOMPLETE:
+		error = _("This is an incomplete command.");
+		break;
 	}
 	if (!error.IsEmpty()) {
 		Show(error + '\n');
@@ -382,33 +386,32 @@
 	return cmd_ID == CMD_ID_QUIT;
 }
 
-void CaMuleExternalConnector::GetCommand(const wxString &prompt, char* buffer, size_t buffer_size)
+void CaMuleExternalConnector::GetCommand(const wxString &prompt, char *buffer, size_t buffer_size)
 {
 #ifdef HAVE_LIBREADLINE
-		char *text = readline(unicode2char(prompt + "$ "));
-		if (text && *text &&
-		    (m_InputLine == 0 || strcmp(text,m_InputLine) != 0)) {
-		  add_history (text);
-		}
-		if (m_InputLine)
-		  free(m_InputLine);
-		m_InputLine = text;
+	char *text = readline(unicode2char(prompt + "$ "));
+	if (text && *text && (m_InputLine == 0 || strcmp(text, m_InputLine) != 0)) {
+		add_history(text);
+	}
+	if (m_InputLine)
+		free(m_InputLine);
+	m_InputLine = text;
 #else
-		Show(prompt + "$ ");
-		const char *text = fgets(buffer, buffer_size, stdin);	// == buffer if ok, NULL if eof
+	Show(prompt + "$ ");
+	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 - 1) {
-				len = buffer_size - 1;
-			}
-			if (buffer != text) {
-				strncpy(buffer, text, len);
-			}
-			bufferlen = 0;
-		} else {
-			strncpy(buffer, "quit", buffer_size);
+	if (text) {
+		size_t len = strlen(text);
+		if (len > buffer_size - 1) {
+			len = buffer_size - 1;
 		}
+		if (buffer != text) {
+			strncpy(buffer, text, len);
+		}
+		bufferlen = 0;
+	} else {
+		strncpy(buffer, "quit", buffer_size);
+	}
 }
 
 void CaMuleExternalConnector::TextShell(const wxString &prompt)
@@ -424,21 +427,20 @@
 	} while ((!The_End) && (m_ECClient->IsSocketConnected()));
 }
 
-void CaMuleExternalConnector::ConnectAndRun(const wxString &ProgName, const wxString& ProgVersion)
+void CaMuleExternalConnector::ConnectAndRun(const wxString &ProgName, const wxString &ProgVersion)
 {
 	if (m_NeedsConfigSave) {
 		SaveConfigFile();
 		return;
 	}
 
-	#ifdef GITDATE
-		Show(CFormat(_("This is %s %s %s\n")) % wxString::FromAscii(m_appname) % VERSION % GITDATE);
-	#else
-		Show(CFormat(_("This is %s %s\n")) % wxString::FromAscii(m_appname) % VERSION);
-	#endif
+#ifdef GITDATE
+	Show(CFormat(_("This is %s %s %s\n")) % wxString::FromAscii(m_appname) % VERSION % GITDATE);
+#else
+	Show(CFormat(_("This is %s %s\n")) % wxString::FromAscii(m_appname) % VERSION);
+#endif
 
-	// HostName, Port and Password
-	if ( m_password.IsEmpty() ) {
+	if (m_password.IsEmpty()) {
 		m_password = GetPassword(true);
 		// MD5 hash for an empty string, according to rfc1321.
 		if (m_password.Encode() == "D41D8CD98F00B204E9800998ECF8427E") {
@@ -448,24 +450,30 @@
 
 	if (!m_password.IsEmpty()) {
 
-		// Create the socket
 		Show(_("\nCreating client...\n"));
 		m_ECClient = new CRemoteConnect(NULL);
-		m_ECClient->SetCapabilities(m_ZLIB, true, false);	// ZLIB, UTF8 numbers, notification
+		m_ECClient->SetCapabilities(m_ZLIB, true, false); // ZLIB, UTF8 numbers, notification
 		m_ECClient->SetForceZlib(m_forceZLIB);
-
-		// ConnectToCore is blocking since m_ECClient was initialized with NULL
-		if (!m_ECClient->ConnectToCore(m_host, m_port, "foobar", m_password.Encode(), ProgName, ProgVersion)) {
+		m_ECClient->SetCanAEAD(m_ECEncryption);
+		m_ECClient->SetCanMultiSearch(m_canMultiSearch);
+		m_ECClient->SetCanChatSessions(m_canChat);
+		// Bound the blocking EC connect so a wrong or unreachable host fails fast instead
+		// of hanging out the OS TCP connect timeout, which can be minutes. The GUI clients
+		// have their own async watchdog; 15 s matches its budget.
+		m_ECClient->SetConnectTimeout(15000);
+
+		// ConnectToCore is blocking, m_ECClient having been initialized with NULL. m_port
+		// is a long (the option parser's type) and the EC client takes an int; the value is
+		// range-checked when read, so the cast is deliberate.
+		if (!m_ECClient->ConnectToCore(
+			    m_host, static_cast<int>(m_port), m_password.Encode(), ProgName, ProgVersion)) {
 			// no connection => close gracefully
 			if (!m_ECClient->GetServerReply().IsEmpty()) {
-					Show(CFormat("%s\n") % m_ECClient->GetServerReply());
+				Show(CFormat("%s\n") % m_ECClient->GetServerReply());
 			}
 			Show(CFormat(_("Connection Failed. Unable to connect to %s:%d\n")) % m_host % m_port);
 		} else {
-			// Authenticate ourselves
-			// ConnectToCore() already authenticated for us.
-			//m_ECClient->ConnectionEstablished();
-			Show(m_ECClient->GetServerReply()+"\n");
+			Show(m_ECClient->GetServerReply() + "\n");
 			if (m_ECClient->IsSocketConnected()) {
 				if (m_interactive) {
 					ShowGreet();
@@ -480,70 +488,111 @@
 		}
 		m_ECClient->DestroySocket();
 	} else {
-		Show(_("Cannot connect with an empty password.\nYou must specify a password either in config file\nor on command-line, or enter one when asked.\n\nExiting...\n"));
+		Show(_("Cannot connect with an empty password.\nYou must specify a password either in config "
+		       "file\nor on command-line, or enter one when asked.\n\nExiting...\n"));
 	}
 }
 
-void CaMuleExternalConnector::OnInitCmdLine(wxCmdLineParser& parser, const char* appname)
+void CaMuleExternalConnector::OnInitCmdLine(wxCmdLineParser &parser, const char *appname)
 {
 	m_appname = appname;
 
-	parser.AddSwitch("", "help",
-		_("Show this help text."),
-		wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddOption("h", "host",
+	parser.AddSwitch("", "help", _("Show this help text."), wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddOption("h",
+		"host",
 		_("Host where aMule is running. (default: 127.0.0.1)"),
-		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddOption("p", "port",
-		_("aMule's port for External Connection. (default: 4712)"),
-		wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddOption("P", "password",
-		_("External Connection password."),
-		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddOption("f", "config-file",
-		_("Read configuration from file."),
-		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddSwitch("q", "quiet",
-		_("Do not print any output to stdout."),
+		wxCMD_LINE_VAL_STRING,
 		wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddSwitch("v", "verbose",
-		_("Be verbose - show also debug messages."),
+	parser.AddOption("p",
+		"port",
+		_("aMule's port for External Connection. (default: 4712)"),
+		wxCMD_LINE_VAL_NUMBER,
 		wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddOption("l", "locale",
+	if (UsesEcPasswordOption()) {
+		parser.AddOption("P",
+			"password",
+			_("External Connection password."),
+			wxCMD_LINE_VAL_STRING,
+			wxCMD_LINE_PARAM_OPTIONAL);
+	}
+	if (UsesConnectorConfigFile()) {
+		parser.AddOption("f",
+			"config-file",
+			_("Read configuration from file."),
+			wxCMD_LINE_VAL_STRING,
+			wxCMD_LINE_PARAM_OPTIONAL);
+	}
+	parser.AddSwitch("q", "quiet", _("Do not print any output to stdout."), wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddSwitch(
+		"v", "verbose", _("Be verbose - show also debug messages."), wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddOption("l",
+		"locale",
 		_("Sets program locale (language)."),
-		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddSwitch("w", "write-config",
-		_("Write command line options to config file."),
+		wxCMD_LINE_VAL_STRING,
+		wxCMD_LINE_PARAM_OPTIONAL);
+	if (UsesConnectorConfigFile()) {
+		parser.AddSwitch("w",
+			"write-config",
+			_("Write command line options to config file."),
+			wxCMD_LINE_PARAM_OPTIONAL);
+		parser.AddOption("",
+			"create-config-from",
+			_("Creates config file based on aMule's config file."),
+			wxCMD_LINE_VAL_STRING,
+			wxCMD_LINE_PARAM_OPTIONAL);
+	}
+	parser.AddSwitch("", "version", _("Print program version."), wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddSwitch("",
+		"disable-ec-encryption",
+		_("Do not encrypt the External Connect session. Encryption is on by default "
+		  "whenever the remote aMule supports it; turning it off leaves everything "
+		  "after the login readable and modifiable by anyone on the path."),
 		wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddOption("", "create-config-from",
-		_("Creates config file based on aMule's config file."),
-		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddSwitch("", "version",
-		_("Print program version."),
+	parser.AddSwitch("",
+		"force-zlib",
+		_("Force ZLIB compression regardless of dialed-IP locality (useful when the server is "
+		  "reachable over a VPN tunnel that resolves to a LAN IP)."),
 		wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddSwitch("", "force-zlib",
-		_("Force ZLIB compression regardless of dialed-IP locality (useful when the server is reachable over a VPN tunnel that resolves to a LAN IP)."),
+	// Parsed here so every connector shares one definition; only amuleapi wires
+	// the actual log tee (see CamuleapiApp::OnInit).
+	parser.AddOption("",
+		"log-file",
+		_("Append a copy of all console output to this log file "
+		  "(default: <config-dir>/amuleapi.log)."),
+		wxCMD_LINE_VAL_STRING,
+		wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddSwitch("",
+		"no-log-file",
+		_("Do not write a log file; print to the console only."),
 		wxCMD_LINE_PARAM_OPTIONAL);
 }
 
-bool CaMuleExternalConnector::OnCmdLineParsed(wxCmdLineParser& parser)
+bool CaMuleExternalConnector::OnCmdLineParsed(wxCmdLineParser &parser)
 {
 	if (parser.Found("version")) {
 		printf("%s %s\n", m_appname, (const char *)GetMuleVersion().utf8_str());
 		return false;
 	}
 
-	if (!parser.Found("config-file", &m_configFileName)) {
+	// The config *directory* is resolved either way -- subclasses without a
+	// connector config file still need somewhere to put their own.
+	if (!UsesConnectorConfigFile() || !parser.Found("config-file", &m_configFileName)) {
 		m_configFileName = "remote.conf";
 	}
-	m_configDir = GetConfigDir(m_configFileName);
+	// Portable detection is "does <cwd>/config/<probe> exist", so each connector probes for the
+	// file it actually owns rather than for remote.conf regardless.
+	m_configDir = GetConfigDir(PortableProbeFile());
 	m_configFileName = m_configDir + m_configFileName;
 
 	wxString aMuleConfigFile;
-	if (parser.Found("create-config-from", &aMuleConfigFile)) {
+	if (UsesConnectorConfigFile() && parser.Found("create-config-from", &aMuleConfigFile)) {
 		aMuleConfigFile = FinalizeFilename(aMuleConfigFile);
 		if (!::wxFileExists(aMuleConfigFile)) {
-			fprintf(stderr, "%s\n", (const char *)(wxString("FATAL ERROR: File does not exist: ") + aMuleConfigFile).utf8_str());
+			fprintf(stderr,
+				"%s\n",
+				(const char *)(wxString("FATAL ERROR: File does not exist: ") +
+					       aMuleConfigFile)
+					.utf8_str());
 			exit(1);
 		}
 		CECFileConfig aMuleConfig(aMuleConfigFile);
@@ -553,10 +602,12 @@
 		exit(0);
 	}
 
-	LoadConfigFile();
+	if (UsesConnectorConfigFile()) {
+		LoadConfigFile();
+	}
 
-	if ( !parser.Found("host", &m_host) ) {
-		if ( m_host.IsEmpty() ) {
+	if (!parser.Found("host", &m_host)) {
+		if (m_host.IsEmpty()) {
 			m_host = "127.0.0.1";
 		}
 	}
@@ -566,20 +617,25 @@
 		m_port = port;
 	}
 
-	wxString pass_plain;
-	if (parser.Found("password", &pass_plain)) {
-		if (!pass_plain.IsEmpty()) {
-			m_password.Decode(MD5Sum(pass_plain).GetHash());
-		} else {
-			m_password.Clear();
+	if (UsesEcPasswordOption()) {
+		wxString pass_plain;
+		if (parser.Found("password", &pass_plain)) {
+			if (!pass_plain.IsEmpty()) {
+				m_password.Decode(MD5Sum(pass_plain).GetHash());
+			} else {
+				m_password.Clear();
+			}
 		}
 	}
 
+	if (parser.Found("disable-ec-encryption")) {
+		m_ECEncryption = false;
+	}
 	if (parser.Found("force-zlib")) {
 		m_forceZLIB = true;
 	}
 
-	if (parser.Found("write-config")) {
+	if (UsesConnectorConfigFile() && parser.Found("write-config")) {
 		m_NeedsConfigSave = true;
 	}
 
@@ -592,12 +648,12 @@
 
 	m_KeepQuiet = parser.Found("quiet");
 	m_Verbose = parser.Found("verbose");
+	parser.Found("log-file", &m_logFile);
+	m_noLogFile = parser.Found("no-log-file");
 
-	// Wire --verbose to the console logger gate so AddDebugLogLine* output
-	// from this binary obeys the CLI flag the same way amuled obeys its
-	// VerboseDebug pref. LoadAmuleConfig may have already set the gate
-	// from /eMule/VerboseDebug above; --verbose acts as an explicit
-	// runtime override when present.
+	// Wire --verbose to the console logger gate, so AddDebugLogLine* output obeys the CLI flag
+	// the way amuled obeys its VerboseDebug pref. LoadAmuleConfig may already have set the
+	// gate; --verbose overrides it.
 	if (m_Verbose) {
 		theLogger.SetVerbose(true);
 	}
@@ -605,7 +661,7 @@
 	return true;
 }
 
-void CaMuleExternalConnector::LoadAmuleConfig(CECFileConfig& cfg)
+void CaMuleExternalConnector::LoadAmuleConfig(CECFileConfig &cfg)
 {
 	m_host = "127.0.0.1";
 	m_port = cfg.Read("/ExternalConnect/ECPort", 4712l);
@@ -614,28 +670,29 @@
 	theLogger.SetVerbose(cfg.Read("/eMule/VerboseDebug", 0l) != 0);
 }
 
-
 void CaMuleExternalConnector::LoadConfigFile()
 {
 	if (!m_configFile) {
 		m_configFile = new CECFileConfig(m_configFileName);
 	}
 	if (m_configFile) {
+		// Same reasoning as the core's amule.conf: this file stores the EC
+		// password, and the stored value is what authenticates.
+		RestrictToOwner(CPath(m_configFileName));
 		m_language = m_configFile->Read("/Locale", "");
-		// Match the default across amulecmd / amuleweb / amulegui.
-		// Use the literal loopback address rather than "localhost":
-		// on Windows, "localhost" lookups can fail intermittently
-		// (IPv4 vs IPv6 stack ordering, Hosts file shape, ...),
-		// reported on #822 — `Connection Failed. Unable to connect
-		// to localhost:4712`. 127.0.0.1 is portable across every
-		// supported OS and unambiguous. The OnCmdLineParsed runtime
-		// fallback below keeps the "no config file at all" path
-		// covered as a safety net. (#821, #822)
+		// Match the default across amulecmd / amuleweb / amulegui. The literal loopback
+		// address rather than "localhost": on Windows those lookups can fail intermittently
+		// (IPv4 vs IPv6 stack ordering, Hosts file shape), showing up as `Connection
+		// Failed. Unable to connect to localhost:4712` (#822). 127.0.0.1 is portable and
+		// unambiguous, and the OnCmdLineParsed fallback covers the "no config file at all"
+		// path.
 		m_host = m_configFile->Read("/EC/Host", "127.0.0.1");
 		m_port = m_configFile->Read("/EC/Port", 4712l);
 		m_configFile->ReadHash("/EC/Password", &m_password);
 		m_ZLIB = m_configFile->Read("/EC/ZLIB", 1l) != 0;
 		m_forceZLIB = m_configFile->Read("/EC/ForceZLIB", 0l) != 0;
+		// Defaults to 1: a config file predating this key gets encryption.
+		m_ECEncryption = m_configFile->Read("/EC/Encryption", 1l) != 0;
 	}
 }
 
@@ -652,59 +709,64 @@
 		m_configFile->Write("/EC/Host", m_host);
 		m_configFile->Write("/EC/Port", m_port);
 		m_configFile->WriteHash("/EC/Password", m_password);
-		// ZLIB was previously read in LoadConfigFile but never written
-		// here — toggling --disable-zlib at the command line would not
-		// persist, and any value in the config file silently reset to
-		// the 1 (enabled) default on every save. Persist it so the
-		// field actually round-trips. (#817)
+		// ZLIB was read in LoadConfigFile but never written here, so toggling --disable-
+		// zlib did not persist and any value in the config file silently reset to the
+		// enabled default on every save (#817).
 		m_configFile->Write("/EC/ZLIB", m_ZLIB ? 1l : 0l);
 		m_configFile->Write("/EC/ForceZLIB", m_forceZLIB ? 1l : 0l);
+		m_configFile->Write("/EC/Encryption", m_ECEncryption ? 1l : 0l);
 	}
 }
 
 bool CaMuleExternalConnector::OnInit()
 {
 #ifndef __WINDOWS__
-	#if wxUSE_ON_FATAL_EXCEPTION
-		// catch fatal exceptions
-		wxHandleFatalExceptions(true);
-	#endif
+#if wxUSE_ON_FATAL_EXCEPTION
+	wxHandleFatalExceptions(true);
+#endif
+	// wx covers SIGSEGV/SIGBUS/SIGILL/SIGFPE and never SIGABRT or SIGTRAP, so a glibc heap abort
+	// kills the connector binaries as silently as it killed amuled in amule-org/amule#1338.
+	// After wxHandleFatalExceptions() above, so the SIGILL handler has wx's to chain into.
+	InstallFatalAbortHandler();
 #endif
 
-	// Pull the libc locale from the environment (LANG / LC_ALL / etc.)
-	// before any wxString -> char* conversion runs via unicode2char().
-	// Otherwise the process stays on the default "C" locale and
-	// wxConvLibc collapses every non-ASCII codepoint to '?' on output.
-	// readline does its own setlocale on first read, so paths that go
-	// through readline appear to work; non-interactive paths (e.g.
-	// amulecmd -c "...") don't and need the explicit init here.
-	// The helper also forces LC_NUMERIC back to "C" so libc printf/scanf
-	// decimal handling stays portable.
+	// Pull the libc locale from the environment before any wxString -> char* conversion runs
+	// via unicode2char(). Otherwise the process stays on the default "C" locale and wxConvLibc
+	// collapses every non-ASCII codepoint to '?'. readline does its own setlocale on first
+	// read, so paths through it appear to work; non-interactive paths do not. The helper also
+	// forces LC_NUMERIC back to "C" so libc printf/scanf decimal handling stays portable.
 	aMuleInitLocale();
 
-	// If we didn't know that OnInit is called only once when creating the
-	// object, it could cause a memory leak. The two pointers below should
-	// be free()'d before assigning the new value.
+	// OnInit runs once per object; the two pointers below would otherwise need free()ing first.
 	// cppcheck-suppress publicAllocationError
 	m_strFullVersion = strdup((const char *)unicode2char(GetMuleVersion()));
 	m_strOSDescription = strdup((const char *)unicode2char(wxGetOsDescription()));
 
-	// Handle uncaught exceptions
 	InstallMuleExceptionHandler();
 
 	bool retval = wxApp::OnInit();
+
+	// Below wxApp::OnInit(), which is what runs OnInitCmdLine() and so sets m_appname: above it
+	// the name is still NULL and the banner would name no binary at all, which is the one thing
+	// it exists to say. amulecmd, amuleweb and amuleapi share a version string, so without the
+	// name a pasted report cannot be attributed. The handler is armed before this point and
+	// would report without a version line; that is strictly better than one that never has a
+	// name. Written from a signal handler, which cannot format, hence the fixed buffer.
+	// The casts matter: CFormat resolves char* to its pointer overload and would print the
+	// addresses, where const char* formats the string.
+	SetFatalAbortVersionLine((const char *)unicode2char(CFormat("%s %s on %s") % m_appname %
+							    (const char *)m_strFullVersion %
+							    (const char *)m_strOSDescription));
+
 	OnInitCommandSet();
 	InitCustomLanguages();
 	SetLocale(m_language);
 
 #ifdef HAVE_LIBREADLINE
-	// Allow conditional parsing of the ~/.inputrc file.
-	//
-	// OnInitCmdLine() is called from wxApp::OnInit() above,
-	// thus m_appname is already set.
-	// macOS libedit's rl_readline_name is char* (not const char*) and
-	// rl_completion_entry_function is Function* (not rl_compentry_func_t*).
-	// GNU readline on Linux has the correct const types.
+	// Allow conditional parsing of the ~/.inputrc file. OnInitCmdLine() is called from
+	// wxApp::OnInit() above, so m_appname is already set. macOS libedit's rl_readline_name is
+	// char* and rl_completion_entry_function is Function*, where GNU readline on Linux has the
+	// const types.
 #ifdef __WXMAC__
 	rl_readline_name = const_cast<char *>(m_appname);
 	theCommands = &m_commands;
@@ -719,13 +781,12 @@
 	return retval;
 }
 
-wxString CaMuleExternalConnector::SetLocale(const wxString& language)
+wxString CaMuleExternalConnector::SetLocale(const wxString &language)
 {
 	if (!language.IsEmpty()) {
 		m_language = language;
-		if (m_locale) {
-			delete m_locale;
-		}
+
+		delete m_locale;
 		m_locale = new wxLocale;
 		InitLocale(*m_locale, StrLang2wx(language));
 	}
@@ -733,13 +794,13 @@
 	return m_locale == NULL ? wxString() : m_locale->GetCanonicalName();
 }
 
-
 #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,
+		"\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 reporting the backtrace below as a\n");
 	fprintf(stderr, "GitHub issue, including as much information as possible regarding the\n");
@@ -753,20 +814,27 @@
 
 	print_backtrace(1); // 1 == skip this function.
 
-	fprintf(stderr, "\n--------------------------------------------------------------------------------\n");
+	fprintf(stderr,
+		"\n--------------------------------------------------------------------------------\n");
+
+	// wx's handler calls abort() as soon as this returns, so without this the SIGABRT handler
+	// adds a second, raw backtrace under a banner that blames the allocator. The symbolicated
+	// one above is the report; this keeps it the only one.
+	SuppressNextAbortBacktrace();
 }
 #endif
 
 #ifdef __WXDEBUG__
-void CaMuleExternalConnector::OnAssertFailure(const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg)
+void CaMuleExternalConnector::OnAssertFailure(
+	const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg)
 {
 #if !defined wxUSE_STACKWALKER || !wxUSE_STACKWALKER
-	// Wrap both ternary branches in wxString() so the conditional has a single
-	// pointer type — raw `msg ? msg : ""` is a const wxChar* / const char*
-	// mix that Alpine's GCC 14 (and stricter GCCs in general) rejects.
-	wxString errmsg = CFormat( "%s:%s:%d: Assertion '%s' failed. %s" ) % file % func % line % cond % ( msg ? wxString(msg) : wxString() );
+	// Wrap both ternary branches in wxString() so the conditional has a single pointer type --
+	// raw `msg ? msg : ""` is a const wxChar* / const char* mix that Alpine's GCC 14 rejects.
+	wxString errmsg = CFormat("%s:%s:%d: Assertion '%s' failed. %s") % file % func % line % cond %
+			  (msg ? wxString(msg) : wxString());
 
-	fprintf(stderr, "Assertion failed: %s\n", (const char*)unicode2char(errmsg));
+	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");

amule-3.0.1.tar.gz/src/ExternalConnector.h -> amule-3.1.0.tar.gz/src/ExternalConnector.h Changed

@@ -23,34 +23,32 @@
 //
 
 /*
- * This file must be included with wxUSE_GUI defined to zero or one.
- * Usually on console applications, this will be taken care of in
- * configure time. This is because wx classes will be compiled
- * differently in each case.
- *
+ * This file must be included with wxUSE_GUI defined to zero or one -- usually taken care of at
+ * configure time for console applications, because wx classes compile differently in each case.
  */
 
-#ifndef __EXTERNALCONNECTOR_H__
-#define __EXTERNALCONNECTOR_H__
+#ifndef EXTERNALCONNECTOR_H
+#define EXTERNALCONNECTOR_H
 
-#include <wx/app.h>			// For wxApp
-#include <wx/cmdline.h>		// For wxCmdLineEntryDesc
+#include <wx/app.h>     // For wxApp
+#include <wx/cmdline.h> // For wxCmdLineEntryDesc
 #include <ec/cpp/RemoteConnect.h>
 
 #include <wx/intl.h>
 
-#define CMD_DEPRECATED		0x1000
-#define CMD_OK			 0
-#define CMD_ID_QUIT		-1
-#define CMD_ID_HELP		-2
-#define CMD_ERR_SYNTAX		-3
-#define CMD_ERR_PROCESS_CMD	-4
-#define CMD_ERR_NO_PARAM	-5
-#define CMD_ERR_MUST_HAVE_PARAM	-6
-#define CMD_ERR_INVALID_ARG	-7
-#define CMD_ERR_INCOMPLETE	-8
-
-enum Params {
+#define CMD_DEPRECATED 0x1000
+#define CMD_OK 0
+#define CMD_ID_QUIT -1
+#define CMD_ID_HELP -2
+#define CMD_ERR_SYNTAX -3
+#define CMD_ERR_PROCESS_CMD -4
+#define CMD_ERR_NO_PARAM -5
+#define CMD_ERR_MUST_HAVE_PARAM -6
+#define CMD_ERR_INVALID_ARG -7
+#define CMD_ERR_INCOMPLETE -8
+
+enum Params
+{
 	CMD_PARAM_NEVER,
 	CMD_PARAM_OPTIONAL,
 	CMD_PARAM_ALWAYS
@@ -58,148 +56,241 @@
 
 class CCommandTree;
 
-typedef	std::list<const CCommandTree*>	CmdList_t;
-typedef	std::list<const CCommandTree*>::iterator	CmdPos_t;
-typedef	std::list<const CCommandTree*>::const_iterator	CmdPosConst_t;
+typedef std::list<const CCommandTree *> CmdList_t;
+typedef std::list<const CCommandTree *>::iterator CmdPos_t;
+typedef std::list<const CCommandTree *>::const_iterator CmdPosConst_t;
 
 class CaMuleExternalConnector;
 
-class CCommandTree {
- public:
-	CCommandTree(CaMuleExternalConnector& app)
-		: m_command(""), m_cmd_id(CMD_ERR_SYNTAX), m_short(""), m_verbose(""), m_params(CMD_PARAM_OPTIONAL), m_parent(NULL)
-		{
-			m_app = &app;
-		}
+class CCommandTree
+{
+public:
+	CCommandTree(CaMuleExternalConnector &app)
+	: m_command("")
+	, m_cmd_id(CMD_ERR_SYNTAX)
+	, m_short("")
+	, m_verbose("")
+	, m_params(CMD_PARAM_OPTIONAL)
+	, m_parent(NULL)
+	{
+		m_app = &app;
+	}
 
 	~CCommandTree();
 
-	CCommandTree*	AddCommand(const wxString& command, int cmd_id, const wxString& shortDesc, const wxString& longDesc, enum Params params = CMD_PARAM_OPTIONAL)
-		{
-			return AddCommand(new CCommandTree(command, cmd_id, shortDesc, longDesc, params));
-		}
+	CCommandTree *AddCommand(const wxString &command,
+		int cmd_id,
+		const wxString &shortDesc,
+		const wxString &longDesc,
+		enum Params params = CMD_PARAM_OPTIONAL)
+	{
+		return AddCommand(new CCommandTree(command, cmd_id, shortDesc, longDesc, params));
+	}
 
-	int	FindCommandId(const wxString& command, wxString& args, wxString& cmdstr) const;
+	int FindCommandId(const wxString &command, wxString &args, wxString &cmdstr) const;
 	wxString GetFullCommand() const;
-	void	PrintHelpFor(const wxString& command) const;
+	void PrintHelpFor(const wxString &command) const;
 
 #ifdef HAVE_LIBREADLINE
-	const CmdList_t*	GetSubCommandsFor(const wxString& command, bool mayRestart = true) const;
-	const wxString&		GetCommand() const { return m_command; }
+	const CmdList_t *GetSubCommandsFor(const wxString &command, bool mayRestart = true) const;
+	const wxString &GetCommand() const { return m_command; }
 #endif
 
- private:
-	CCommandTree(const wxString& command, int cmd_id, const wxString& shortDesc, const wxString& longDesc, enum Params params)
-		: m_command(command), m_cmd_id(cmd_id), m_short(shortDesc), m_verbose(longDesc), m_params(params), m_parent(NULL)
-		{}
+private:
+	CCommandTree(const wxString &command,
+		int cmd_id,
+		const wxString &shortDesc,
+		const wxString &longDesc,
+		enum Params params)
+	: m_command(command)
+	, m_cmd_id(cmd_id)
+	, m_short(shortDesc)
+	, m_verbose(longDesc)
+	, m_params(params)
+	, m_parent(NULL)
+	{
+	}
 
-	CCommandTree*	AddCommand(CCommandTree* cmdTree);
+	CCommandTree *AddCommand(CCommandTree *cmdTree);
 
-	wxString	m_command;
-	int		m_cmd_id;
-	wxString	m_short;
-	wxString	m_verbose;
-	enum Params	m_params;
-	const CCommandTree*	m_parent;
-	CmdList_t	m_subcommands;
+	wxString m_command;
+	int m_cmd_id;
+	wxString m_short;
+	wxString m_verbose;
+	enum Params m_params;
+	const CCommandTree *m_parent;
+	CmdList_t m_subcommands;
 
-	static CaMuleExternalConnector*	m_app;
+	static CaMuleExternalConnector *m_app;
 };
 
-
 class CECFileConfig;
 
 class CaMuleExternalConnector : public wxApp
 {
 public:
-	//
-	// Constructor & Destructor
-	//
+	// Constructor & destructor
 	CaMuleExternalConnector();
 	~CaMuleExternalConnector();
 
-	//
 	// Virtual functions
-	//
 	virtual void Pre_Shell() {}
 	virtual void Post_Shell() {}
 	virtual int ProcessCommand(int) { return -1; }
 	virtual void TextShell(const wxString &prompt);
 	virtual void LoadConfigFile();
 	virtual void SaveConfigFile();
-	virtual void LoadAmuleConfig(CECFileConfig& cfg);
+
+	/**
+	 * Whether this connector keeps its own remote.conf.
+	 *
+	 * True for amulecmd and amuleweb, which have no config file of their own. amuleapi returns
+	 * false: it owns amuleapi.conf, and reading remote.conf as well gave two files describing
+	 * the same EC connection, with the winner decided by load order. When false the base class
+	 * registers neither --config-file, --write-config nor --create-config-from, and loads
+	 * nothing -- the subclass is the only source of configuration.
+	 */
+	virtual bool UsesConnectorConfigFile() const { return true; }
+
+	/**
+	 * Whether this connector offers -P / --password on the command line.
+	 *
+	 * amuleapi returns false. A password passed there lands in argv, which any local user can
+	 * read out of ps, and amuleapi has two ways to get the credential that do not: the
+	 * ephemeral token the core writes when it spawns amuleapi, and EC/Password in its own
+	 * amuleapi.conf. Keeping the option registered would keep offering the one route that
+	 * leaks.
+	 *
+	 * amulecmd and amuleweb keep it. Both are commonly run by hand, and neither owns a config
+	 * file that could hold the value instead.
+	 */
+	virtual bool UsesEcPasswordOption() const { return true; }
+
+	/**
+	 * Filename whose presence in <cwd>/config marks a portable install. Defaults to this
+	 * connector's own config file (remote.conf). A subclass that keeps its settings elsewhere
+	 * overrides it: probing for a file the tool never reads or writes can only detect
+	 * portability by accident, when some other tool happens to have left one behind.
+	 */
+	virtual wxString PortableProbeFile() const { return "remote.conf"; }
+	virtual void LoadAmuleConfig(CECFileConfig &cfg);
 	virtual void OnInitCommandSet();
 	virtual bool OnInit();
 	virtual const wxString GetGreetingTitle() = 0;
 
-	//
 	// Other functions
-	//
 	void Show(const wxString &s);
-	void DebugShow(const wxString &s) { if (m_Verbose) Show(s); }
-	const wxString& GetCmdArgs() const { return m_cmdargs; }
-	const wxString& GetLastCmdStr() const { return m_lastcmdstr; }
-	int GetIDFromString(const wxString& buffer) { return m_commands.FindCommandId(buffer, m_cmdargs, m_lastcmdstr); }
-	void Process_Answer(const wxString& answer);
-	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 DebugShow(const wxString &s)
+	{
+		if (m_Verbose)
+			Show(s);
+	}
+	const wxString &GetCmdArgs() const { return m_cmdargs; }
+	const wxString &GetLastCmdStr() const { return m_lastcmdstr; }
+	int GetIDFromString(const wxString &buffer)
+	{
+		return m_commands.FindCommandId(buffer, m_cmdargs, m_lastcmdstr);
+	}
+	void Process_Answer(const wxString &answer);
+	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); }
 	bool IsServerPartialUpdateActive() const { return m_ECClient->ServerSupportsPartialUpdate(); }
-	void ConnectAndRun(const wxString &ProgName, const wxString& ProgVersion);
+	// True when an id-less EC_OP_SEARCH_PROGRESS returns every search as children, so a client
+	// polling N searches can do it in one round trip. Null-checked: the refresher can reach
+	// this between a drop and a reconnect, unlike the always-connected callers above.
+	bool IsServerSearchProgressUnionActive() const
+	{
+		return m_ECClient && m_ECClient->ServerSupportsSearchProgressUnion();
+	}
+	// True when amuled answers EC_OP_GET_CLIENT_HISTORY. Null-checked for the same reason as
+	// the union accessor above, and the check is load-bearing beyond that: a daemon predating
+	// the request reaches the unknown-opcode branch of ProcessRequest2(), which asserts rather
+	// than answering EC_OP_FAILED.
+	bool IsServerClientHistoryActive() const
+	{
+		return m_ECClient && m_ECClient->ServerSupportsClientHistory();
+	}
+	// True when amuled serves the chat session ops. Same load-bearing null check: a daemon
+	// predating them asserts on the unknown opcode instead of answering EC_OP_FAILED, so every
+	// chat request must be gated on this.
+	bool IsServerChatActive() const { return m_ECClient && m_ECClient->ServerSupportsChatSessions(); }
+	// Version string of the connected core, from the EC AUTH_OK handshake. Empty when not
+	// connected (m_ECClient null) or when the daemon is old enough to omit the
+	// EC_TAG_SERVER_VERSION tag.
+	wxString GetServerVersion() const { return m_ECClient ? m_ECClient->GetServerVersion() : wxString(); }
+	void ConnectAndRun(const wxString &ProgName, const wxString &ProgVersion);
 	void ShowGreet();
 
-	//
 	// Command line processing
-	//
-	void OnInitCmdLine(wxCmdLineParser& amuleweb_parser, const char* appname);
-	bool OnCmdLineParsed(wxCmdLineParser& 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);
+	void OnAssertFailure(
+		const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg);
 #endif
 
 protected:
 	// Set current locale, if language is not empty.
 	// returns canonical name of set (current) locale
-	virtual wxString SetLocale(const wxString& language);
-
-	CECFileConfig*	m_configFile;
-	wxString	m_configDir;
-	long		m_port;
-	wxString	m_host;
-	CMD4Hash	m_password;
-	bool		m_ZLIB;
-	// Force ZLIB regardless of dialed-IP locality (#728 follow-up).
-	// Set by `/EC/ForceZLIB=1` in the config or `--force-zlib` on the
-	// CLI. Use case: a WireGuard tunnel endpoint that resolves to an
-	// RFC1918 IP but whose transit is slow Internet — the locality
-	// check would otherwise strip ZLIB and the user loses the perf
-	// they actually want.
-	bool		m_forceZLIB;
-	bool		m_KeepQuiet;
-	bool		m_Verbose;
-	bool		m_interactive;
-	CCommandTree	m_commands;
-	const char *	m_appname;
+	virtual wxString SetLocale(const wxString &language);
+
+	CECFileConfig *m_configFile;
+	wxString m_configDir;
+	long m_port;
+	wxString m_host;
+	CMD4Hash m_password;
+	bool m_ZLIB;
+	// Force ZLIB regardless of dialed-IP locality, via `/EC/ForceZLIB=1` or `--force-zlib`. For
+	// a WireGuard endpoint that resolves to an RFC1918 IP but whose transit is slow Internet,
+	// where the locality check would otherwise strip ZLIB.
+	bool m_forceZLIB;
 
+	// Offer EC transport encryption. On by default: the daemon only encrypts what a client asks
+	// for, and only the client knows what address it dialed, so the decision has to live here
+	// rather than in the daemon -- the same reasoning the ZLIB locality hint already follows.
+	// This is the opt-OUT, reachable as --disable-ec-encryption or /EC/Encryption=0.
+	bool m_ECEncryption;
+	// Advertise the multi-search EC capability (EC_TAG_CAN_MULTI_SEARCH) so the daemon
+	// addresses searches by ID and several can run at once. Off by default; only a connector
+	// that reads EC_TAG_SEARCH_ID back and handles per-ID results (amulecmd) sets it true.
+	// amuleweb stays single-search.
+	bool m_canMultiSearch;
+	// Advertise EC_TAG_CAN_CHAT_SESSIONS so the daemon echoes it and this connector may use the
+	// chat session ops. Off by default; a connector that never reads chat leaves the daemon
+	// free of the work.
+	bool m_canChat;
+	bool m_KeepQuiet;
+	bool m_Verbose;
+	// --log-file / --no-log-file. Parsed for every connector; only amuleapi
+	// acts on them (installs a stdout/stderr tee into the file).
+	wxString m_logFile;
+	bool m_noLogFile;
+	bool m_interactive;
+	CCommandTree m_commands;
+	const char *m_appname;
 
 private:
-	wxString	m_configFileName;
-	wxString	m_cmdargs;
-	wxString	m_lastcmdstr;
-	CRemoteConnect*	m_ECClient;
-	char *		m_InputLine;
-	bool		m_NeedsConfigSave;
-	wxString	m_language;
-	wxLocale *	m_locale;
-	char *		m_strFullVersion;
-	char *		m_strOSDescription;
+	wxString m_configFileName;
+	wxString m_cmdargs;
+	wxString m_lastcmdstr;
+	CRemoteConnect *m_ECClient;
+	char *m_InputLine;
+	bool m_NeedsConfigSave;
+	wxString m_language;
+	wxLocale *m_locale;
+	char *m_strFullVersion;
+	char *m_strOSDescription;
 };
 
-#endif // __EXTERNALCONNECTOR_H__
+#endif // EXTERNALCONNECTOR_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/FileArea.cpp -> amule-3.1.0.tar.gz/src/FileArea.cpp Changed

@@ -23,32 +23,45 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include "config.h"
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
-#include <stdint.h>		// uintptr_t for pointer arithmetic in the
-				// SIGBUS handler -- `unsigned long` is 4 bytes on
-				// LLP64 and would silently truncate pointers.
+#include <stdint.h> // uintptr_t for pointer arithmetic in the
+		    // SIGBUS handler -- `unsigned long` is 4 bytes on
+		    // LLP64 and would silently truncate pointers.
 #endif
 
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
 
-#include "FileArea.h"		// Interface declarations.
-#include "FileAutoClose.h"	// Needed for CFileAutoClose
+#include "FileArea.h"      // Interface declarations.
+#include "FileAutoClose.h" // Needed for CFileAutoClose
 
-#ifndef ENABLE_MMAP
-#	define ENABLE_MMAP	0
-#endif
+#include <atomic> // std::atomic<bool> for the cross-thread MMapEnabled toggle
 
-#if ENABLE_MMAP && defined(HAVE_MMAP) && defined(HAVE_SYSCONF) && (defined(HAVE__SC_PAGESIZE) || defined(HAVE__SC_PAGE_SIZE))
-#	define USE_MMAP
-#endif
+// MMAP_SUPPORTED is set by cmake only when the whole mmap file-I/O path is available on this
+// platform (mmap / munmap / sysconf / _SC_PAGESIZE / sigaction). It gates the code below, the
+// preferences checkbox and the EC tag; whether mmap is actually USED is the runtime MMapEnabled
+// preference, which defaults to off.
 
-#ifdef USE_MMAP
+// Runtime switch for the mmap path. Written from the main thread when the preference changes, read
+// from the block-receive and upload-I/O threads at ReadAt()/StartWriteAt() time. A plain atomic
+// bool suffices: the decision is captured per CFileArea in m_mmap_buffer, so a concurrent flip only
+// changes the mode of SUBSEQUENT operations.
+//
+// The store uses release and the loads acquire, so the SIGSEGV/SIGBUS handler installed inside
+// SetMMapEnabled(true) is guaranteed visible to any I/O thread that observes the flag as enabled --
+// the handler is always up before the first faultable map.
+static std::atomic<bool> s_mmapEnabled{ false };
+
+bool CFileArea::GetMMapEnabled()
+{
+	return s_mmapEnabled.load(std::memory_order_acquire);
+}
+
+#ifdef MMAP_SUPPORTED
 
 #include <sys/mman.h>
 
@@ -58,16 +71,17 @@
 static const long gs_pageSize = sysconf(_SC_PAGE_SIZE);
 #endif
 
-#endif /* USE_MMAP */
+#endif /* MMAP_SUPPORTED */
 
-#if !defined(HAVE_SIGACTION) || !defined(SA_SIGINFO) || !defined(USE_MMAP) || defined(__UCLIBC__)
+#if !defined(HAVE_SIGACTION) || !defined(SA_SIGINFO) || !defined(MMAP_SUPPORTED) || defined(__UCLIBC__)
 
 class CFileAreaSigHandler
 {
 public:
 	static void Init() {};
-	static void Add(CFileArea&) {};
-	static void Remove(CFileArea&) {};
+	static void Add(CFileArea &) {};
+	static void Remove(CFileArea &) {};
+
 private:
 	CFileAreaSigHandler() {};
 };
@@ -78,8 +92,9 @@
 {
 public:
 	static void Init();
-	static void Add(CFileArea& area);
-	static void Remove(CFileArea& area);
+	static void Add(CFileArea &area);
+	static void Remove(CFileArea &area);
+
 private:
 	CFileAreaSigHandler() {};
 	static wxMutex mutex;
@@ -89,9 +104,9 @@
 	static void Handler(int sig, siginfo_t *info, void *ctx);
 };
 
-wxMutex          CFileAreaSigHandler::mutex;
-CFileArea *      CFileAreaSigHandler::first;
-bool             CFileAreaSigHandler::initialized = false;
+wxMutex CFileAreaSigHandler::mutex;
+CFileArea *CFileAreaSigHandler::first;
+bool CFileAreaSigHandler::initialized = false;
 struct sigaction CFileAreaSigHandler::old_segv;
 struct sigaction CFileAreaSigHandler::old_bus;
 
@@ -100,9 +115,7 @@
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
-// Handle signals.
-// The idea is to replace faulted memory with zeroes and mark
-// the error in proper CFileArea
+// Handle signals: replace faulted memory with zeroes and mark the error in the proper CFileArea.
 void CFileAreaSigHandler::Handler(int sig, siginfo_t *info, void *ctx)
 {
 	CFileArea *cur;
@@ -111,7 +124,8 @@
 		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)
+			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;
 		}
@@ -120,13 +134,18 @@
 	// mark error if found
 	if (cur && gs_pageSize > 0) {
 		cur->m_error = true;
-		char *start_addr = ((char *) info->si_addr) - (((uintptr_t) 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)
+		char *start_addr = ((char *)info->si_addr) - (((uintptr_t)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;
+	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)
@@ -142,16 +161,13 @@
 	if (initialized)
 		return;
 
-	// Set our new signal handler.
-	// Note that we safe old handlers (probably 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
+	// Save the old handlers (probably wx's) so they can be called when a signal is
+	// not handled as desired here. wx removes these when it restores its own.
 	struct sigaction sa;
 	memset(&sa, 0, sizeof(sa));
 	sigemptyset(&sa.sa_mask);
 	sa.sa_sigaction = Handler;
-	sa.sa_flags = SA_NODEFER|SA_SIGINFO;
+	sa.sa_flags = SA_NODEFER | SA_SIGINFO;
 	if (sigaction(SIGSEGV, &sa, &old_segv))
 		return;
 	if (sigaction(SIGBUS, &sa, &old_bus)) {
@@ -161,14 +177,14 @@
 	initialized = true;
 }
 
-void CFileAreaSigHandler::Add(CFileArea& area)
+void CFileAreaSigHandler::Add(CFileArea &area)
 {
 	wxMutexLocker lock(mutex);
 	area.m_next = first;
 	first = &area;
 }
 
-void CFileAreaSigHandler::Remove(CFileArea& area)
+void CFileAreaSigHandler::Remove(CFileArea &area)
 {
 	wxMutexLocker lock(mutex);
 	CFileArea **cur = &first;
@@ -183,12 +199,29 @@
 }
 #endif
 
-CFileArea::CFileArea()
-	: m_buffer(NULL), m_mmap_buffer(NULL), m_length(0), m_next(NULL), m_file(NULL), m_error(false)
+void CFileArea::SetMMapEnabled(bool enabled)
 {
-	CFileAreaSigHandler::Init();
+	// Install the SIGSEGV/SIGBUS recovery handler once, when mmap is first turned on, rather
+	// than per read/write, which would take a mutex on every block. Off builds -- and runs that
+	// never enable mmap -- never touch the signal-handler chain, keeping them clear of
+	// sanitizers and crash reporters. Init() is idempotent, and a no-op without MMAP_SUPPORTED.
+	// The install happens-before the release store, so a thread that later sees the flag set
+	// has the handler.
+	if (enabled) {
+		CFileAreaSigHandler::Init();
+	}
+	s_mmapEnabled.store(enabled, std::memory_order_release);
 }
 
+CFileArea::CFileArea()
+: m_buffer(NULL)
+, m_mmap_buffer(NULL)
+, m_length(0)
+, m_next(NULL)
+, m_file(NULL)
+, m_error(false)
+{
+}
 
 CFileArea::~CFileArea()
 {
@@ -198,14 +231,12 @@
 
 bool CFileArea::Close()
 {
-	if (m_buffer != NULL && m_mmap_buffer == NULL)
-	{
+	if (m_buffer != NULL && m_mmap_buffer == NULL) {
 		delete m_buffer;
 		m_buffer = NULL;
 	}
-#ifdef USE_MMAP
-	if (m_mmap_buffer)
-	{
+#ifdef MMAP_SUPPORTED
+	if (m_mmap_buffer) {
 		munmap(m_mmap_buffer, m_length);
 		// remove from list
 		CFileAreaSigHandler::Remove(*this);
@@ -220,20 +251,26 @@
 	return true;
 }
 
-
-void CFileArea::ReadAt(CFileAutoClose& file, uint64 offset, size_t count)
+void CFileArea::ReadAt(CFileAutoClose &file, uint64 offset, size_t count)
 {
 	Close();
 
-#ifdef USE_MMAP
+#ifdef MMAP_SUPPORTED
 	uint64 offEnd = offset + count;
-	if (gs_pageSize > 0 && offEnd < 0x100000000ull) {
-		uint64 offStart = offset & (~((uint64)gs_pageSize-1));
+	// The 4 GiB cap only matters where off_t (the mmap offset argument) is 32 bits: there a
+	// region ending at or after 4 GiB would truncate the offset and map the wrong bytes (forum
+	// 16444). Where off_t is 64 bits -- every modern aMule build (_FILE_OFFSET_BITS=64) -- mmap
+	// handles large offsets natively (verified against >4 GiB part files), so the cap is
+	// skipped and large files get mmap for their whole length. sizeof() folds at compile time,
+	// so this is free on 64-bit.
+	if (s_mmapEnabled.load(std::memory_order_acquire) && gs_pageSize > 0 &&
+		(sizeof(off_t) >= 8 || 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 = (uint8_t*) p;
+			m_mmap_buffer = (uint8_t *)p;
 			m_buffer = m_mmap_buffer + (offset - offStart);
 
 			// add to list to catch errors correctly
@@ -247,20 +284,21 @@
 	file.ReadAt(m_buffer, offset, count);
 }
 
-#ifdef USE_MMAP
-void CFileArea::StartWriteAt(CFileAutoClose& file, uint64 offset, size_t count)
+#ifdef MMAP_SUPPORTED
+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));
+	// 4 GiB cap only applies with a 32-bit off_t -- see ReadAt() above.
+	if (s_mmapEnabled.load(std::memory_order_acquire) && file.GetLength() >= offEnd && gs_pageSize > 0 &&
+		(sizeof(off_t) >= 8 || 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)
-		{
+		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 = (uint8_t*) p;
+			m_mmap_buffer = (uint8_t *)p;
 			m_buffer = m_mmap_buffer + (offset - offStart);
 
 			// add to list to catch errors correctly
@@ -272,20 +310,19 @@
 	m_buffer = new uint8_tcount;
 }
 #else
-void CFileArea::StartWriteAt(CFileAutoClose&, uint64, size_t count)
+void CFileArea::StartWriteAt(CFileAutoClose &, uint64, size_t count)
 {
 	Close();
 	m_buffer = new uint8_tcount;
 }
 #endif
 
-
-bool CFileArea::FlushAt(CFileAutoClose& file, uint64 offset, size_t count)
+bool CFileArea::FlushAt(CFileAutoClose &file, uint64 offset, size_t count)
 {
 	if (!m_buffer)
 		return false;
 
-#ifdef USE_MMAP
+#ifdef MMAP_SUPPORTED
 	if (m_mmap_buffer) {
 		if (msync(m_mmap_buffer, m_length, MS_SYNC))
 			return false;
@@ -305,4 +342,3 @@
 	if (err)
 		throw CIOFailureException("Read error, failed to read from file.");
 }
-

amule-3.0.1.tar.gz/src/FileArea.h -> amule-3.1.0.tar.gz/src/FileArea.h Changed

@@ -22,84 +22,83 @@
 #ifndef FILEAREA_H
 #define FILEAREA_H
 
-#include "Types.h"		// Needed for uint8_t
+#include "Types.h" // Needed for uint8_t
 
 class CFileAreaSigHandler;
 class CFileAutoClose;
 
 /**
- * This class is used to optimize file read/write using mapped memory
- * if supported.
+ * Optimizes file read/write using mapped memory where supported.
  */
 class CFileArea
 {
-friend class CFileAreaSigHandler;
+	friend class CFileAreaSigHandler;
+
 public:
 	/**
-	 * Creates a uninitialized file area.
+	 * Creates an uninitialized file area.
 	 */
 	CFileArea();
 
-
 	/**
-	 * Destructor, closes the file if opened.
+	 * Closes the file if opened.
 	 */
 	virtual ~CFileArea();
 
 	/**
 	 * Closes the file.
 	 */
-        bool Close();
+	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.
+	 * Initialises the buffer with @a count bytes of @a file from @a offset. The buffer is a
+	 * memory-mapped area or an allocated one, depending on the system.
 	 */
-	void ReadAt(CFileAutoClose& file, uint64 offset, size_t count);
+	void ReadAt(CFileAutoClose &file, uint64 offset, size_t count);
 
 	/**
-	 * Start a new write
+	 * Starts a new write.
 	 */
-	void StartWriteAt(CFileAutoClose& file, uint64 offset, size_t count);
+	void StartWriteAt(CFileAutoClose &file, uint64 offset, size_t count);
 
-        /**
+	/**
 	 * Flushes data not yet written.
 	 */
-	bool FlushAt(CFileAutoClose& file, uint64 offset, size_t count);
+	bool FlushAt(CFileAutoClose &file, uint64 offset, size_t count);
 
 	/**
-	 * Get buffer that contains data read or to write.
-	 * @return allocated buffer or NULL if not initialized
+	 * The buffer holding the data read or to be written, or NULL if not initialized.
 	 */
 	uint8_t *GetBuffer() const { return m_buffer; };
 
 	/**
-	 * Report error pending
+	 * Reports a pending error.
 	 */
 	void CheckError();
 
+	/**
+	 * Runtime switch for the mmap file-I/O path (the MMapEnabled preference). Read once per
+	 * operation at ReadAt()/StartWriteAt() time; an area already opened keeps its mode (see
+	 * m_mmap_buffer), so flipping this mid-transfer only affects later operations and is safe
+	 * with active downloads and uploads. No-op on builds without MMAP_SUPPORTED.
+	 */
+	static void SetMMapEnabled(bool enabled);
+	static bool GetMMapEnabled();
+
 private:
 	//! A CFileArea is neither copyable nor assignable.
 	//@{
-	CFileArea(const CFileArea&);
-	CFileArea& operator=(const CFileArea&);
+	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.
+	 * Buffer used for read/write operations: points inside m_mmap_buffer when mapped, otherwise
+	 * at an allocated buffer to be freed.
 	 */
 	uint8_t *m_buffer;
 	/**
-	 * Pointer to memory mapped area or NULL if not mapped.
+	 * Memory mapped area, or NULL if not mapped.
 	 */
 	uint8_t *m_mmap_buffer;
 	/**
@@ -107,15 +106,15 @@
 	 */
 	size_t m_length;
 	/**
-	 * Global chain
+	 * Global chain.
 	 */
-	CFileArea* m_next;
+	CFileArea *m_next;
 	/**
-	 * File handle to release
+	 * File handle to release.
 	 */
-	CFileAutoClose * m_file;
+	CFileAutoClose *m_file;
 	/**
-	 * true if error detected
+	 * True if an error was detected.
 	 */
 	bool m_error;
 };

amule-3.0.1.tar.gz/src/FileAutoClose.cpp -> amule-3.1.0.tar.gz/src/FileAutoClose.cpp Changed

@@ -24,26 +24,26 @@
 //
 
 #include "FileAutoClose.h"
-#include "GetTickCount.h"	// for TheTime
-#include "Logger.h"			// Needed for AddDebugLogLineN
+#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
+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)
-{}
+: m_mode(CFile::read)
+, m_autoClosed(false)
+, m_locked(0)
+, m_size(0)
+, m_lastAccess(TheTime)
+{
+}
 
-CFileAutoClose::CFileAutoClose(const CPath& path, CFile::OpenMode mode)
+CFileAutoClose::CFileAutoClose(const CPath &path, CFile::OpenMode mode)
 {
 	Open(path, mode);
 }
 
-bool CFileAutoClose::Open(const CPath& path, CFile::OpenMode mode)
+bool CFileAutoClose::Open(const CPath &path, CFile::OpenMode mode)
 {
 	m_mode = mode;
 	m_autoClosed = false;
@@ -53,7 +53,7 @@
 	return m_file.Open(path, mode);
 }
 
-bool CFileAutoClose::Create(const CPath& path, bool overwrite)
+bool CFileAutoClose::Create(const CPath &path, bool overwrite)
 {
 	m_mode = CFile::write;
 	m_autoClosed = false;
@@ -79,7 +79,7 @@
 	return m_file.SetLength(newLength);
 }
 
-const CPath& CFileAutoClose::GetFilePath() const
+const CPath &CFileAutoClose::GetFilePath() const
 {
 	return m_file.GetFilePath();
 }
@@ -89,14 +89,14 @@
 	return m_autoClosed || m_file.IsOpened();
 }
 
-void CFileAutoClose::ReadAt(void* buffer, uint64 offset, size_t count)
+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)
+void CFileAutoClose::WriteAt(const void *buffer, uint64 offset, size_t count)
 {
 	Reopen();
 	m_file.Seek(offset);
@@ -128,9 +128,9 @@
 	if (m_autoClosed) {
 		AddDebugLogLineN(logCFile, "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.
+		// On an open error m_autoClosed stays true, so a later attempt opens and throws
+		// again. Otherwise it would assert on an operation on a closed file and probably
+		// die.
 		m_autoClosed = false;
 	}
 	m_lastAccess = TheTime;
@@ -138,15 +138,14 @@
 
 bool CFileAutoClose::Release(bool now)
 {
-	if (!m_autoClosed
-			&& (now || TheTime - m_lastAccess >= ReleaseTime)
-			&& !m_locked
-			&& m_file.IsOpened()) {
+	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, "AutoClosed file " + GetFilePath().GetPrintable()
-			+ (now ? "(immediately)" : "(timed)"));
+		AddDebugLogLineN(logCFile,
+			"AutoClosed file " + GetFilePath().GetPrintable() +
+				(now ? "(immediately)" : "(timed)"));
 	}
 	return m_autoClosed;
 }

amule-3.0.1.tar.gz/src/FileAutoClose.h -> amule-3.1.0.tar.gz/src/FileAutoClose.h Changed

@@ -26,144 +26,103 @@
 #ifndef FILEAUTOCLOSE_H
 #define FILEAUTOCLOSE_H
 
-#include "CFile.h"			// Needed for CFile
+#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.
- *
+ * Wraps CFile so the file handle can be closed and reopened on use, keeping the number of open
+ * handles down.
  */
 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.
+	 * Calls Open on the specified file. Check IsOpened() to see whether it succeeded.
 	 */
-	CFileAutoClose(const CPath& path, CFile::OpenMode mode = CFile::read);
+	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.
+	 * Request auto closing of the file handle. @a now true closes immediately, false closes
+	 * when the timeout expires. True if the file has been, or already was, 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.
+	 * Opens the file at @a path in @a mode (see CFile). True if it was opened.
 	 */
-	bool Open(const CPath& path, CFile::OpenMode mode = CFile::read);
+	bool Open(const CPath &path, CFile::OpenMode mode = CFile::read);
 
 	/**
-	 * Calling Create is equivalent 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
+	 * Equivalent to Open with OpenMode 'write'. @a overwrite says whether an existing target
+	 * file should be overwritten. @see CFile::Open
 	 */
-	bool Create(const CPath& path, bool overwrite = false);
+	bool Create(const CPath &path, bool overwrite = false);
 
 	/**
-	 * Closes the file.
-	 *
-	 * Note that calling Close on an closed file
-	 * is an illegal operation.
+	 * Closes the file. Calling this on a closed file is illegal.
 	 */
 	bool Close();
 
 	/**
-	 * @see CSafeFileIO::GetLength
-	 *
-	 * Note that calling GetLength on a closed file
-	 * is an illegal operation.
+	 * @see CSafeFileIO::GetLength. Calling this on a closed file is illegal.
 	 */
 	uint64 GetLength() const;
 
 	/**
 	 * Resizes the file to the specified length.
-	 *
 	 */
 	bool SetLength(uint64 newLength);
 
 	/**
-	 * Returns the path of the currently opened file.
-	 *
+	 * The path of the currently opened file.
 	 */
-	const CPath& GetFilePath() const;
+	const CPath &GetFilePath() const;
 
 	/**
-	 * Returns true if the file is opened, false otherwise.
+	 * True if the file is opened.
 	 */
 	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
+	 * Reads @a count bytes into @a buffer from @a offset in the file. See CFileDataIO::Read.
 	 */
-	void ReadAt(void* buffer, uint64 offset, size_t count);
+	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
+	 * Writes @a count bytes from @a buffer at @a offset in the file. See CFileDataIO::Write.
 	 */
-	void WriteAt(const void* buffer, uint64 offset, size_t count);
+	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.
+	 * True when the file position is at or past the end of the file.
 	 */
 	bool Eof();
 
 	/**
-	 * Returns the file descriptor associated 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.
+	 * The file descriptor associated with the file. This defeats the purpose of the class, so
+	 * AutoClose is disabled once fd() is called. Required for FileArea's mmap. FileArea objects
+	 * are currently short-lived enough for that not to matter, but that might change.
 	 */
 	int fd();
 
 	/**
-	 * Reenables AutoClose disabled by fd() before.
+	 * Re-enables AutoClose after a previous fd() disabled it.
 	 */
 	void Unlock();
 
 private:
 	//! A CFileAutoClose is neither copyable nor assignable.
 	//@{
-	CFileAutoClose(const CFileAutoClose&);
-	CFileAutoClose& operator=(const CFileAutoClose&);
+	CFileAutoClose(const CFileAutoClose &);
+	CFileAutoClose &operator=(const CFileAutoClose &);
 	//@}
 
 	/**
-	 * Check if file was autoclosed, and reopen if needed.
+	 * Check whether the file was autoclosed, and reopen it if needed.
 	 */
 	void Reopen();
 
@@ -186,6 +145,5 @@
 	uint64 m_lastAccess;
 };
 
-
 #endif // FILEAUTOCLOSE_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/FileDetailDialog.cpp -> amule-3.1.0.tar.gz/src/FileDetailDialog.cpp Changed

@@ -8,10 +8,6 @@
 // or contributed by third-party developers are copyrighted by their
 // respective authors.
 //
-// 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
@@ -27,57 +23,57 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "muuli_wdr.h"		// Needed for ID_CLOSEWNDFD,...,IDC_APPLY
-#include "FileDetailDialog.h"	// Interface declarations
-#include "FileDetailListCtrl.h"	// Needed for CFileDetailListCtrl
-#include "CommentDialogLst.h"	// Needed for CCommentDialogLst
-#include "PartFile.h"		// Needed for CPartFile
-#include "amule.h"		// Needed for theApp
-#include "SharedFileList.h"	// Needed for CSharedFileList
+#include "muuli_wdr.h"          // Needed for ID_CLOSEWNDFD,...,IDC_APPLY
+#include "FileDetailDialog.h"   // Interface declarations
+#include "FileDetailListCtrl.h" // Needed for CFileDetailListCtrl
+#include "CommentDialogLst.h"   // Needed for CCommentDialogLst
+#include "PartFile.h"           // Needed for CPartFile
+#include "amule.h"              // Needed for theApp
+#include "SharedFileList.h"     // Needed for CSharedFileList
 #include "OtherFunctions.h"
-#include "MuleColour.h"
+#include "DataToText.h"    // Needed for PriorityToStr
+#include <tags/FileTags.h> // Needed for FT_MEDIA_* metadata tag names
 
 #include <set>
 
 #define ID_MY_TIMER 1652
 
-//IMPLEMENT_DYNAMIC(CFileDetailDialog, CDialog)
-wxBEGIN_EVENT_TABLE(CFileDetailDialog,wxDialog)
+wxBEGIN_EVENT_TABLE(CFileDetailDialog, wxDialog)
 	EVT_BUTTON(ID_CLOSEWNDFD, CFileDetailDialog::OnClosewnd)
 	EVT_BUTTON(IDC_BUTTONSTRIP, CFileDetailDialog::OnBnClickedButtonStrip)
 	EVT_BUTTON(IDC_TAKEOVER, CFileDetailDialog::OnBnClickedTakeOver)
-	EVT_LIST_ITEM_ACTIVATED(IDC_LISTCTRLFILENAMES, CFileDetailDialog::OnListClickedTakeOver)
+	EVT_DATAVIEW_ITEM_ACTIVATED(IDC_LISTCTRLFILENAMES, CFileDetailDialog::OnListClickedTakeOver)
 	EVT_BUTTON(IDC_CMTBT, CFileDetailDialog::OnBnClickedShowComment)
 	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)
+	EVT_TIMER(ID_MY_TIMER, CFileDetailDialog::OnTimer)
 wxEND_EVENT_TABLE()
 
-namespace {
-// Registry of open CFileDetailDialog instances. See CCommentDialog.cpp
-// for the rationale — the broadcast handler in GuiEvents.cpp iterates
-// this on every CKnownFile destruction. UAF would otherwise fire from
-// the 5-second update-timer's deref of m_file (issue #755, same family
-// as #748).
-std::set<CFileDetailDialog*>& OpenInstances()
+namespace
+{
+// Registry of open CFileDetailDialog instances; see CCommentDialog.cpp for the rationale. The
+// broadcast handler in GuiEvents.cpp walks this on every CKnownFile destruction, since the 5-second
+// update timer's deref of m_file would otherwise be a UAF (issue #755).
+std::set<CFileDetailDialog *> &OpenInstances()
 {
-	static std::set<CFileDetailDialog*> instances;
+	static std::set<CFileDetailDialog *> instances;
 	return instances;
 }
 } // namespace
 
-
-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_files(files),
-m_index(index),
-m_filenameChanged(false)
+CFileDetailDialog::CFileDetailDialog(wxWindow *parent, std::vector<CKnownFile *> &files, int index)
+: wxDialog(parent,
+	  -1,
+	  _("File Details"),
+	  wxDefaultPosition,
+	  wxDefaultSize,
+	  wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX)
+, m_files(files)
+, m_index(index)
+, m_filenameChanged(false)
 {
 	m_timer.SetOwner(this, ID_MY_TIMER);
 	m_timer.Start(5000);
@@ -93,39 +89,42 @@
 {
 	OpenInstances().erase(this);
 	m_timer.Stop();
+	// Drop the rows before freeing what they point at: the list control is a child window and
+	// outlives this body, and the base has to be told before the caller frees the item data.
+	// Nothing can currently paint or sort in between, but that is a property of wx's teardown
+	// rather than something to rest on.
+	if (CFileDetailListCtrl *list = CastChild(IDC_LISTCTRLFILENAMES, CFileDetailListCtrl)) {
+		list->ClearSources();
+	}
+	for (const auto &entry : m_sourcenames) {
+		delete entry.second;
+	}
 }
 
-void CFileDetailDialog::DropReferencesTo(const CKnownFile* file)
+void CFileDetailDialog::DropReferencesTo(const CKnownFile *file)
 {
-	for (CFileDetailDialog* d : OpenInstances()) {
-		// Strip the file from m_files first so Next/Prev navigation
-		// doesn't re-select it. m_files is a reference to the
-		// caller's vector (CDownloadListCtrl's stack-allocated list
-		// of selected files), so erasing here mutates the caller's
-		// state too — that's fine; the caller holds it only for the
-		// duration of the modal dialog and the dialog is what owns
-		// the visible UI sourcing from it.
-		for (std::vector<CPartFile*>::iterator it = d->m_files.begin();
-			it != d->m_files.end(); /* manual ++ */) {
-			if (static_cast<const CKnownFile*>(*it) == file) {
+	for (CFileDetailDialog *d : OpenInstances()) {
+		// Strip the file from m_files first, so Next/Prev navigation does not re-select it.
+		// m_files is a reference to the caller's vector, so this mutates the caller's state
+		// too -- fine, since it holds it only for the duration of the modal dialog.
+		for (std::vector<CKnownFile *>::iterator it = d->m_files.begin(); it != d->m_files.end();
+			/* manual ++ */) {
+			if (*it == file) {
 				ptrdiff_t offset = it - d->m_files.begin();
 				it = d->m_files.erase(it);
 				if (d->m_index > offset) {
 					--d->m_index;
 				} else if (d->m_index == offset) {
-					// The active file is the one being
-					// destroyed. The dialog will dismiss
-					// below, so the index value won't be
-					// read again.
+					// The active file is being destroyed. The dialog dismisses
+					// below, so the index is not read again.
 				}
 			} else {
 				++it;
 			}
 		}
-		// Dismiss if the active file vanished. Stop the update
-		// timer first so the next tick doesn't try to deref
-		// m_file before EndModal unwinds.
-		if (static_cast<const CKnownFile*>(d->m_file) == file) {
+		// Dismiss if the active file vanished. Stop the update timer first so the
+		// next tick cannot deref m_file before EndModal unwinds.
+		if (d->m_file == file) {
 			d->m_file = NULL;
 			d->m_timer.Stop();
 			d->EndModal(0);
@@ -133,12 +132,12 @@
 	}
 }
 
-void CFileDetailDialog::OnTimer(wxTimerEvent& WXUNUSED(evt))
+void CFileDetailDialog::OnTimer(wxTimerEvent &WXUNUSED(evt))
 {
 	UpdateData(false);
 }
 
-void CFileDetailDialog::OnClosewnd(wxCommandEvent& WXUNUSED(evt))
+void CFileDetailDialog::OnClosewnd(wxCommandEvent &WXUNUSED(evt))
 {
 	EndModal(0);
 }
@@ -146,52 +145,159 @@
 void CFileDetailDialog::UpdateData(bool resetFilename)
 {
 	wxString bufferS;
-	CastChild(IDC_FNAME,   wxStaticText)->SetLabel(MakeStringEscaped(m_file->GetFileName().TruncatePath(60)));
-	CastChild(IDC_METFILE, wxStaticText)->SetLabel(MakeStringEscaped(m_file->GetFullName().TruncatePath(60, true)));
+
+	// A file is "downloading" only while it is an incomplete partfile. CPartFile::IsPartFile()
+	// returns false once complete, even though the object may linger as a CPartFile until the
+	// next restart, so it is the authoritative test rather than the concrete type. Works in
+	// amulegui too.
+	CPartFile *part = m_file->IsPartFile() ? static_cast<CPartFile *>(m_file) : nullptr;
+
+	// --- Common fields (present on every CKnownFile) ---
+	CastChild(IDC_FNAME, wxStaticText)
+		->SetLabel(MakeStringEscaped(m_file->GetFileName().TruncatePath(60)));
+	// "met-File": the .part.met path for a partfile, else the on-disk full path.
+	CPath metPath = part ? part->GetFullName() : m_file->GetFilePath().JoinPaths(m_file->GetFileName());
+	CastChild(IDC_METFILE, wxStaticText)->SetLabel(MakeStringEscaped(metPath.TruncatePath(60, true)));
 
 	if (resetFilename) {
 		resetValueForFilenameTextEdit();
 	}
 
-	CastChild(IDC_FHASH,wxStaticText)->SetLabel(m_file->GetFileHash().Encode());
+	CastChild(IDC_FHASH, wxStaticText)->SetLabel(m_file->GetFileHash().Encode());
 	bufferS = CFormat("%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 = CFormat("%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 = CFormat(_("%.1f%% done")) % m_file->GetPercentCompleted();
-	CastChild(IDC_PROCCOMPL,wxControl)->SetLabel(bufferS);
-	bufferS = CFormat(_("%.2f kB/s")) % m_file->GetKBpsDown();
-	CastChild(IDC_DATARATE,wxControl)->SetLabel(bufferS);
-	bufferS = CFormat("%i") % m_file->GetSourceCount();
-	CastChild(IDC_SOURCECOUNT,wxControl)->SetLabel(bufferS);
-	bufferS = CFormat("%i") % m_file->GetTransferingSrcCount();
-	CastChild(IDC_SOURCECOUNT2,wxControl)->SetLabel(bufferS);
-	bufferS = CFormat("%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);
-
-	if (m_file->lastseencomplete==0) {
+	CastChild(IDC_FSIZE, wxControl)->SetLabel(bufferS);
+
+	// --- Download section (only an in-progress partfile; the panel is hidden
+	//     otherwise, so these getters are never called on a plain CKnownFile) ---
+	if (part) {
+		CastChild(IDC_PFSTATUS, wxControl)->SetLabel(part->getPartfileStatus());
+		bufferS = CFormat("%i (%i)") % part->GetPartCount() % part->GetHashCount();
+		CastChild(IDC_PARTCOUNT, wxControl)->SetLabel(bufferS);
+		CastChild(IDC_TRANSFERRED, wxControl)->SetLabel(CastItoXBytes(part->GetTransferred()));
+		CastChild(IDC_FD_STATS1, wxControl)->SetLabel(CastItoXBytes(part->GetLostDueToCorruption()));
+		CastChild(IDC_FD_STATS2, wxControl)->SetLabel(CastItoXBytes(part->GetGainDueToCompression()));
+		CastChild(IDC_FD_STATS3, wxControl)
+			->SetLabel(CastItoIShort(part->TotalPacketsSavedDueToICH()));
+		CastChild(IDC_COMPLSIZE, wxControl)->SetLabel(CastItoXBytes(part->GetCompletedSize()));
+		bufferS = CFormat(_("%.1f%% done")) % part->GetPercentCompleted();
+		CastChild(IDC_PROCCOMPL, wxControl)->SetLabel(bufferS);
+		bufferS = CFormat(_("%.2f KiB/s")) % part->GetKBpsDown();
+		CastChild(IDC_DATARATE, wxControl)->SetLabel(bufferS);
+		bufferS = CFormat("%i") % part->GetSourceCount();
+		CastChild(IDC_SOURCECOUNT, wxControl)->SetLabel(bufferS);
+		bufferS = CFormat("%i") % part->GetTransferingSrcCount();
+		CastChild(IDC_SOURCECOUNT2, wxControl)->SetLabel(bufferS);
+		bufferS = CFormat("%i (%.1f%%)") % part->GetAvailablePartCount() %
+			  ((part->GetAvailablePartCount() * 100.0) / part->GetPartCount());
+		CastChild(IDC_PARTAVAILABLE, wxControl)->SetLabel(bufferS);
+		bufferS = CastSecondsToHM(part->GetDlActiveTime());
+		CastChild(IDC_DLACTIVETIME, wxControl)->SetLabel(bufferS);
+
+		if (part->lastseencomplete == 0) {
+			bufferS = wxString(_("Unknown")).MakeLower();
+		} else {
+			wxDateTime last_seen(part->lastseencomplete);
+			bufferS = FormatLocalDateTime(last_seen);
+		}
+		CastChild(IDC_LASTSEENCOMPL, wxControl)->SetLabel(bufferS);
+	}
+
+	// --- Sharing section (present on every CKnownFile; the counters and share
+	//     timestamps ride over EC, so this populates in amulegui too) ---
+	bufferS =
+		CFormat("%u (%u)") % m_file->statistic.GetRequests() % m_file->statistic.GetAllTimeRequests();
+	CastChild(IDC_FD_SHARE_REQ, wxControl)->SetLabel(bufferS);
+	bufferS = CFormat("%u (%u)") % m_file->statistic.GetAccepts() % m_file->statistic.GetAllTimeAccepts();
+	CastChild(IDC_FD_SHARE_ACC, wxControl)->SetLabel(bufferS);
+	bufferS = CFormat("%s (%s)") % CastItoXBytes(m_file->statistic.GetTransferred()) %
+		  CastItoXBytes(m_file->statistic.GetAllTimeTransferred());
+	CastChild(IDC_FD_SHARE_XFER, wxControl)->SetLabel(bufferS);
+	double ratio = m_file->GetFileSize() ? (double)m_file->statistic.GetAllTimeTransferred() /
+						       (double)m_file->GetFileSize()
+					     : 0.0;
+	CastChild(IDC_FD_SHARE_RATIO, wxControl)->SetLabel(CFormat("%.2f") % ratio);
+	CastChild(IDC_FD_SHARE_COMPLSRC, wxControl)
+		->SetLabel(CFormat("%u") % m_file->m_nCompleteSourcesCount);
+	CastChild(IDC_FD_SHARE_ONQUEUE, wxControl)->SetLabel(CFormat("%u") % m_file->GetQueuedCount());
+	CastChild(IDC_FD_SHARE_UPPRIO, wxControl)
+		->SetLabel(PriorityToStr(m_file->GetUpPriority(), m_file->IsAutoUpPriority()));
+	bufferS = CFormat(_("%.2f KiB/s")) % (m_file->GetUploadDatarate() / 1024.0);
+	CastChild(IDC_FD_SHARE_UPSPEED, wxControl)->SetLabel(bufferS);
+	CastChild(IDC_FD_SHARE_UPCOUNT, wxControl)
+		->SetLabel(CFormat("%u") % m_file->GetTransferringClientCount());
+	if (m_file->GetDateShared() == 0) {
 		bufferS = wxString(_("Unknown")).MakeLower();
 	} else {
-		wxDateTime last_seen(m_file->lastseencomplete);
-		bufferS = last_seen.FormatISODate() + " " + last_seen.FormatISOTime();
+		wxDateTime ds(m_file->GetDateShared());
+		bufferS = FormatLocalDateTime(ds);
+	}
+	CastChild(IDC_FD_SHARE_SINCE, wxControl)->SetLabel(bufferS);
+	if (m_file->GetLastUpload() == 0) {
+		bufferS = wxString(_("Unknown")).MakeLower();
+	} else {
+		wxDateTime lu(m_file->GetLastUpload());
+		bufferS = FormatLocalDateTime(lu);
+	}
+	CastChild(IDC_FD_SHARE_LASTUP, wxControl)->SetLabel(bufferS);
+
+	// Media Info (issue #418): filled from FT_MEDIA_* when the file has probed metadata, labels
+	// left at their "N/A" default otherwise. Identical in the monolithic and remote builds, the
+	// remote proxy storing the same tags.
+	//
+	// Per field, NOT gated on GetMetaDataVer(): that answers "has this been probed", and a
+	// probed file can still have no duration. Filling every label on the aggregate would show
+	// Length 0:00 and Bitrate 0 kbps where the truthful answer is N/A.
+	if (uint32 len = m_file->GetIntTagValue(FT_MEDIA_LENGTH)) {
+		CastChild(IDC_FD_MEDIA_LENGTH, wxControl)->SetLabel(CastSecondsToHM(len));
+	}
+	if (uint32 br = m_file->GetIntTagValue(FT_MEDIA_BITRATE)) {
+		CastChild(IDC_FD_MEDIA_BITRATE, wxControl)->SetLabel(CFormat(wxT("%u kbps")) % br);
+	}
+	const struct
+	{
+		uint8 ftId;
+		int ctrlId;
+		bool formatAsCodec;
+	} kMediaLabels = { { FT_MEDIA_CODEC, IDC_FD_MEDIA_CODEC, true },
+		{ FT_MEDIA_ARTIST, IDC_FD_MEDIA_ARTIST, false },
+		{ FT_MEDIA_ALBUM, IDC_FD_MEDIA_ALBUM, false },
+		{ FT_MEDIA_TITLE, IDC_FD_MEDIA_TITLE, false } };
+	for (const auto &entry : kMediaLabels) {
+		const wxString &value = m_file->GetStrTagValue(entry.ftId);
+		if (!value.IsEmpty()) {
+			CastChild(entry.ctrlId, wxControl)
+				->SetLabel(entry.formatAsCodec ? FormatMediaCodec(value) : value);
+		}
+	}
+
+	// Section visibility, driven by the file's own state rather than by which list opened the
+	// dialog: download rows only for an in-progress partfile, sharing rows for any file that
+	// actually shares data.
+	bool showDownload = (part != nullptr);
+	bool showSharing = (part == nullptr) || (part->GetCompletedSize() > 0);
+	bool relayout = false;
+	wxWindow *dlPanel = FindWindow(IDC_FD_DOWNLOAD_PANEL);
+	if (dlPanel && dlPanel->IsShown() != showDownload) {
+		dlPanel->Show(showDownload);
+		relayout = true;
+	}
+	wxWindow *shPanel = FindWindow(IDC_FD_SHARING_PANEL);
+	if (shPanel && shPanel->IsShown() != showSharing) {
+		shPanel->Show(showSharing);
+		relayout = true;
+	}
+	if (relayout && GetSizer()) {
+		GetSizer()->Layout();
+		Fit();
 	}
 
-	CastChild(IDC_LASTSEENCOMPL,wxControl)->SetLabel(bufferS);
 	setEnableForApplyButton();
-	// disable "Show all comments" button if there are no comments
+	// "Show all comments" opens the ratings/comments dialog, which works for a shared file as
+	// well as an in-progress download since a Kad notes lookup only needs the file's hash and
+	// size. Enabled whenever there are comments already or Kad is connected (#434).
 	FileRatingList list;
 	m_file->GetRatingAndComments(list);
-	CastChild(IDC_CMTBT, wxControl)->Enable(!list.empty());
+	CastChild(IDC_CMTBT, wxControl)->Enable(!list.empty() || theApp->IsConnectedKad());
 	FillSourcenameList();
 	Layout();
 }
@@ -200,91 +306,96 @@
 
 void CFileDetailDialog::FillSourcenameList()
 {
-	CFileDetailListCtrl* pmyListCtrl;
-	int itempos;
-	int inserted = 0;
-	pmyListCtrl = CastChild(IDC_LISTCTRLFILENAMES, CFileDetailListCtrl );
-
-	// reset
-	for (int i=0;i<pmyListCtrl->GetItemCount();i++){
-		SourcenameItem *item = reinterpret_cast<SourcenameItem *>(pmyListCtrl->GetItemData(i));
-		item->count = 0;
+	CFileDetailListCtrl *pmyListCtrl = CastChild(IDC_LISTCTRLFILENAMES, CFileDetailListCtrl);
+
+	// The source-name list is a download-only view of how sources name the file. A plain shared
+	// file has none, so clear any rows a prior file left behind, freeing their item data, and
+	// bail before the partfile-only accessors below.
+	CPartFile *part = m_file->IsPartFile() ? static_cast<CPartFile *>(m_file) : nullptr;
+	if (!part) {
+		// Rows first, then the objects they point at -- same rule as the
+		// destructor and as the prune loop below.
+		pmyListCtrl->ClearSources();
+		for (const auto &entry : m_sourcenames) {
+			delete entry.second;
+		}
+		m_sourcenames.clear();
+		return;
 	}
 
-	// update
+	for (const auto &entry : m_sourcenames) {
+		entry.second->count = 0;
+	}
+	bool inserted = false;
+
 #ifdef CLIENT_GUI
-	const SourcenameItemMap &sources = m_file->GetSourcenameItemMap();
+	const SourcenameItemMap &sources = part->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);
+		auto found = m_sourcenames.find(cur_src.name);
+		if (found == m_sourcenames.end()) {
 			SourcenameItem *item = new SourcenameItem(cur_src.name, cur_src.count);
-			pmyListCtrl->SetItemPtrData(0, reinterpret_cast<wxUIntPtr>(item));
-			// background.. argh -- PA: was in old version - do we still need this?
-			wxListItem tmpitem;
-			tmpitem.m_itemId = itemid;
-			tmpitem.SetBackgroundColour(CMuleColour(wxSYS_COLOUR_LISTBOX));
-			pmyListCtrl->SetItem(tmpitem);
-			inserted++;
+			m_sourcenamescur_src.name = item;
+			pmyListCtrl->AddSource(item);
+			inserted = true;
 		} else {
-			SourcenameItem *item = reinterpret_cast<SourcenameItem *>(pmyListCtrl->GetItemData(itempos));
-			item->count = cur_src.count;
+			found->second->count = cur_src.count;
 		}
 	}
-#else // CLIENT_GUI
-	const CKnownFile::SourceSet& sources = m_file->GetSourceList();
+#else  // CLIENT_GUI
+	const CKnownFile::SourceSet &sources = part->GetSourceList();
 	CKnownFile::SourceSet::const_iterator it = sources.begin();
-	for ( ; it != sources.end(); ++it ) {
+	for (; it != sources.end(); ++it) {
 		const CClientRef &cur_src = *it;
-		if (cur_src.GetRequestFile() != m_file ||
-		    cur_src.GetClientFilename().Length() == 0) {
+		if (cur_src.GetRequestFile() != part || cur_src.GetClientFilename().Length() == 0) {
 			continue;
 		}
 
-		itempos = pmyListCtrl->FindItem(-1,cur_src.GetClientFilename());
-		if (itempos == -1) {
-			int itemid = pmyListCtrl->InsertItem(0, cur_src.GetClientFilename());
+		auto found = m_sourcenames.find(cur_src.GetClientFilename());
+		if (found == m_sourcenames.end()) {
 			SourcenameItem *item = new SourcenameItem(cur_src.GetClientFilename(), 1);
-			pmyListCtrl->SetItemPtrData(0, reinterpret_cast<wxUIntPtr>(item));
-			// background.. argh -- PA: was in old version - do we still need this?
-			wxListItem tmpitem;
-			tmpitem.m_itemId=itemid;
-			tmpitem.SetBackgroundColour(CMuleColour(wxSYS_COLOUR_LISTBOX));
-			pmyListCtrl->SetItem(tmpitem);
-			inserted++;
+			m_sourcenamescur_src.GetClientFilename() = item;
+			pmyListCtrl->AddSource(item);
+			inserted = true;
 		} else {
-			SourcenameItem *item = reinterpret_cast<SourcenameItem *>(pmyListCtrl->GetItemData(itempos));
-			item->count++;
+			found->second->count++;
 		}
 	}
 #endif // CLIENT_GUI
 
-	// remove 0'er and update counts
-	for (int i = 0; i < pmyListCtrl->GetItemCount(); ++i) {
-		SourcenameItem *item = reinterpret_cast<SourcenameItem *>(pmyListCtrl->GetItemData(i));
-		if (item->count == 0) {
-			delete item;
-			pmyListCtrl->DeleteItem(i);
-			i--;  // PA: one step back is enough, no need to go back to 0
+	// Drop entries no longer reported by any source, refresh the rest.
+	for (auto it2 = m_sourcenames.begin(); it2 != m_sourcenames.end();) {
+		if (it2->second->count == 0) {
+			pmyListCtrl->RemoveSource(it2->second);
+			delete it2->second;
+			it2 = m_sourcenames.erase(it2);
 		} else {
-			pmyListCtrl->SetItem(i, 1, CFormat("%i") % item->count);
+			pmyListCtrl->RefreshSource(it2->second);
+			++it2;
 		}
 	}
 
+	// Counts are zeroed above and rewritten in place, so while this runs the list is not
+	// ordered by the column it is sorted on -- and AddSource() places a new row with a binary
+	// search, which needs that ordering. An insertion therefore leaves rows in arbitrary
+	// positions and has to be repaired here.
+	//
+	// Only on insertion: a count that merely changed is what the live-sort preference governs,
+	// and sorting unconditionally would override it.
 	if (inserted) {
 		pmyListCtrl->SortList();
 	}
-	// no need to call Layout() here, it's called in UpdateData()
 }
 
-
-void CFileDetailDialog::OnBnClickedShowComment(wxCommandEvent& WXUNUSED(evt))
+void CFileDetailDialog::OnBnClickedShowComment(wxCommandEvent &WXUNUSED(evt))
 {
-	CCommentDialogLst(this,m_file).ShowModal();
+	// The dialog takes a CAbstractFile, so it works for a shared file as well as an in-progress
+	// download; its "Get from Kad" button drives the on-demand ratings/comments lookup.
+	if (m_file) {
+		CCommentDialogLst(this, m_file).ShowModal();
+	}
 }
 
-
 void CFileDetailDialog::resetValueForFilenameTextEdit()
 {
 	CastChild(IDC_FILENAME, wxTextCtrl)->SetValue(m_file->GetFileName().GetPrintable());
@@ -292,7 +403,6 @@
 	setEnableForApplyButton();
 }
 
-
 void CFileDetailDialog::setValueForFilenameTextEdit(const wxString &s)
 {
 	CastChild(IDC_FILENAME, wxTextCtrl)->SetValue(s);
@@ -300,41 +410,39 @@
 	setEnableForApplyButton();
 }
 
-
 void CFileDetailDialog::setEnableForApplyButton()
 {
-	bool enabled =
-		m_file->GetStatus() != PS_COMPLETE &&
-		m_file->GetStatus() != PS_COMPLETING &&
-		m_filenameChanged;
+	bool enabled = m_file->GetStatus() != PS_COMPLETE && m_file->GetStatus() != PS_COMPLETING &&
+		       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();
 }
 
-
-void CFileDetailDialog::OnTextFileNameChange(wxCommandEvent& WXUNUSED(evt))
+void CFileDetailDialog::OnTextFileNameChange(wxCommandEvent &WXUNUSED(evt))
 {
 	m_filenameChanged = true;
 	setEnableForApplyButton();
 }
 
-
-void CFileDetailDialog::OnBnClickedOk(wxCommandEvent& evt)
+void CFileDetailDialog::OnBnClickedOk(wxCommandEvent &evt)
 {
 	OnBnClickedApply(evt);
 	OnClosewnd(evt);
 }
 
-
-void CFileDetailDialog::OnBnClickedApply(wxCommandEvent& WXUNUSED(evt))
+void CFileDetailDialog::OnBnClickedApply(wxCommandEvent &WXUNUSED(evt))
 {
 	CPath fileName = CPath(CastChild(IDC_FILENAME, wxTextCtrl)->GetValue());
 
 	if (fileName.IsOk() && (fileName != m_file->GetFileName())) {
 		if (theApp->sharedfiles->RenameFile(m_file, fileName)) {
-			FindWindow(IDC_FNAME)->SetLabel(MakeStringEscaped(m_file->GetFileName().GetPrintable()));
-			FindWindow(IDC_METFILE)->SetLabel(m_file->GetFullName().GetPrintable());
+			FindWindow(IDC_FNAME)->SetLabel(
+				MakeStringEscaped(m_file->GetFileName().GetPrintable()));
+			CPath metPath = m_file->IsPartFile()
+						? static_cast<CPartFile *>(m_file)->GetFullName()
+						: m_file->GetFilePath().JoinPaths(m_file->GetFileName());
+			FindWindow(IDC_METFILE)->SetLabel(metPath.GetPrintable());
 
 			resetValueForFilenameTextEdit();
 
@@ -343,8 +451,7 @@
 	}
 }
 
-
-void CFileDetailDialog::OnBnClickedPrevFile(wxCommandEvent&)
+void CFileDetailDialog::OnBnClickedPrevFile(wxCommandEvent &)
 {
 	if (--m_index < 0) {
 		m_index = m_files.size() - 1;
@@ -353,30 +460,29 @@
 	UpdateData(true);
 }
 
-
-void CFileDetailDialog::OnBnClickedNextFile(wxCommandEvent&)
+void CFileDetailDialog::OnBnClickedNextFile(wxCommandEvent &)
 {
-	if (++m_index == (int) m_files.size()) {
+	if (++m_index == (int)m_files.size()) {
 		m_index = 0;
 	}
 	m_file = m_filesm_index;
 	UpdateData(true);
 }
 
-
 static bool IsDigit(const wxChar ch)
 {
 	switch (ch) {
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9': return true;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+		return true;
 	}
 	return false;
 }
@@ -384,30 +490,32 @@
 static bool IsWordSeparator(const wxChar ch)
 {
 	switch (ch) {
-		case '.':
-		case ',':
-		case '(':
-		case ')':
-		case '':
-		case '':
-		case '{':
-		case '}':
-		case '-':
-		case '"':
-		case ' ': return true;
+	case '.':
+	case ',':
+	case '(':
+	case ')':
+	case '':
+	case '':
+	case '{':
+	case '}':
+	case '-':
+	case '"':
+	case ' ':
+		return true;
 	}
 	return false;
 }
 
-static void ReplaceWord(wxString& str, const wxString& replaceFrom, const wxString& replaceTo, bool numbers = false)
+static void ReplaceWord(
+	wxString &str, const wxString &replaceFrom, const wxString &replaceTo, bool numbers = false)
 {
 	unsigned int i = 0;
 	unsigned int l = replaceFrom.Length();
 	while (i < str.Length()) {
 		if (str.Mid(i, l) == replaceFrom) {
-			if ((i == 0 || IsWordSeparator(str.GetChar(i-1))) &&
-				((i == str.Length() - l || IsWordSeparator(str.GetChar(i+l))) ||
-					(numbers && IsDigit(str.GetChar(i+l))))) {
+			if ((i == 0 || IsWordSeparator(str.GetChar(i - 1))) &&
+				((i == str.Length() - l || IsWordSeparator(str.GetChar(i + l))) ||
+					(numbers && IsDigit(str.GetChar(i + l))))) {
 				str.replace(i, l, replaceTo);
 			}
 			i += replaceTo.Length() - 1;
@@ -416,7 +524,7 @@
 	}
 }
 
-void CFileDetailDialog::OnBnClickedButtonStrip(wxCommandEvent& WXUNUSED(evt))
+void CFileDetailDialog::OnBnClickedButtonStrip(wxCommandEvent &WXUNUSED(evt))
 {
 	wxString filename;
 	filename = CastChild(IDC_FILENAME, wxTextCtrl)->GetValue();
@@ -429,20 +537,16 @@
 		ext.MakeLower();
 		// get rid of extension and replace . with space
 		filename.Truncate(extpos);
-		filename.Replace("."," ");
+		filename.Replace(".", " ");
 	}
 
 	// Replace Space-holders with Spaces
-	filename.Replace("_"," ");
-	filename.Replace("%20"," ");
+	filename.Replace("_", " ");
+	filename.Replace("%20", " ");
 
-	// Some additional formatting
 	filename.Replace("hYPNOTiC", "");
 	filename.MakeLower();
 	filename.Replace("xxx", "XXX");
-//	filename.Replace("xdmnx", "");
-//	filename.Replace("pmp", "");
-//	filename.Replace("dws", "");
 	filename.Replace("www pornreactor com", "");
 	filename.Replace("sharereactor", "");
 	filename.Replace("found via www filedonkey com", "");
@@ -462,8 +566,7 @@
 
 	// Make leading Caps
 	// and delete 1+ spaces
-	if (filename.Length()>1)
-	{
+	if (filename.Length() > 1) {
 		bool last_char_space = true;
 		bool last_char_wordseparator = true;
 		unsigned int i = 0;
@@ -496,7 +599,7 @@
 		} while (i < filename.Length());
 
 		if (last_char_space && i > 0) {
-			filename.Remove(i-1, 1);
+			filename.Remove(i - 1, 1);
 		}
 	}
 
@@ -509,20 +612,17 @@
 	setValueForFilenameTextEdit(filename);
 }
 
-void CFileDetailDialog::OnBnClickedTakeOver(wxCommandEvent& WXUNUSED(evt))
+void CFileDetailDialog::OnBnClickedTakeOver(wxCommandEvent &WXUNUSED(evt))
 {
-	CFileDetailListCtrl* pmyListCtrl;
-	pmyListCtrl = CastChild( IDC_LISTCTRLFILENAMES, CFileDetailListCtrl );
-	if (pmyListCtrl->GetSelectedItemCount() > 0) {
-		// 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));
-		}
+	CFileDetailListCtrl *pmyListCtrl = CastChild(IDC_LISTCTRLFILENAMES, CFileDetailListCtrl);
+	// The list only ever allows one selected row (CFileDetailListCtrl::OnSelectionChanged).
+	const std::vector<wxUIntPtr> selected = pmyListCtrl->GetSelectedItemData();
+	if (!selected.empty()) {
+		setValueForFilenameTextEdit(reinterpret_cast<SourcenameItem *>(selected.front())->name);
 	}
 }
 
-void CFileDetailDialog::OnListClickedTakeOver(wxListEvent& WXUNUSED(evt))
+void CFileDetailDialog::OnListClickedTakeOver(wxDataViewEvent &WXUNUSED(evt))
 {
 	wxCommandEvent ev;
 	OnBnClickedTakeOver(ev);

amule-3.0.1.tar.gz/src/FileDetailDialog.h -> amule-3.1.0.tar.gz/src/FileDetailDialog.h Changed

@@ -28,60 +28,69 @@
 
 #include <wx/dialog.h>
 #include <wx/event.h>
-#include <wx/listctrl.h>
 #include <wx/timer.h>
 
+#include <map>
 #include <vector>
 
 class CPartFile;
 class CKnownFile;
+class SourcenameItem;
+class wxDataViewEvent;
 
 // CFileDetailDialog dialog
 
 class CFileDetailDialog : public wxDialog
 {
 public:
-	CFileDetailDialog(wxWindow *parent, std::vector<CPartFile *> & files, int index);
+	// `files` may hold plain shared CKnownFiles, in-progress CPartFiles, or a mix (a partfile
+	// is also a shared file). Which rows the dialog shows is decided per file from its state,
+	// not from which list opened it.
+	CFileDetailDialog(wxWindow *parent, std::vector<CKnownFile *> &files, int index);
 	virtual ~CFileDetailDialog();
 
 	/**
-	 * Drop every reference to `file` from any open instance of this
-	 * dialog before the underlying CPartFile is destroyed. Stops the
-	 * update-timer's deref of `m_file`, walks `m_files` to scrub
-	 * matching entries, and dismisses the dialog if its currently
-	 * active file is the destroyed one. Pointer-value comparison
-	 * only — `file` may already be freed. Wired via
+	 * Drop every reference to `file` from any open instance of this dialog before the
+	 * underlying CPartFile is destroyed. Stops the update timer's deref of `m_file`, walks
+	 * `m_files` to scrub matching entries, and dismisses the dialog if its active file is the
+	 * destroyed one. Pointer-value comparison only -- `file` may already be freed. Wired via
 	 * MuleNotify::KnownFileBeingDestroyed (GuiEvents.cpp).
 	 */
-	static void DropReferencesTo(const CKnownFile* file);
+	static void DropReferencesTo(const CKnownFile *file);
 
 protected:
-	void OnTimer(wxTimerEvent& evt);
+	void OnTimer(wxTimerEvent &evt);
 	wxDECLARE_EVENT_TABLE();
 
 private:
 	void UpdateData(bool resetFilename);
-	std::vector<CPartFile *> & m_files;
-	CPartFile* m_file;
+	std::vector<CKnownFile *> &m_files;
+	CKnownFile *m_file;
 	int m_index;
 	wxTimer m_timer;
 	bool m_filenameChanged;
 
-	void OnClosewnd(wxCommandEvent& evt);
+	//! Source-name rows for the currently displayed partfile, keyed by name so
+	//! FillSourcenameList() can find-or-create by identity across ticks instead of searching
+	//! the list widget. Owns the SourcenameItem objects handed to CFileDetailListCtrl as item
+	//! data.
+	std::map<wxString, SourcenameItem *> m_sourcenames;
+
+	void OnClosewnd(wxCommandEvent &evt);
 	void FillSourcenameList();
 	void setEnableForApplyButton();
 	void setValueForFilenameTextEdit(const wxString &s);
 	void resetValueForFilenameTextEdit();
 
-	void OnBnClickedButtonStrip(wxCommandEvent& evt);
-	void OnBnClickedShowComment(wxCommandEvent& evt);
-	void OnBnClickedTakeOver(wxCommandEvent& evt);
-	void OnListClickedTakeOver(wxListEvent& evt);
-	void OnTextFileNameChange(wxCommandEvent& evt);
-	void OnBnClickedOk(wxCommandEvent& evt);
-	void OnBnClickedApply(wxCommandEvent& evt);
-	void OnBnClickedPrevFile(wxCommandEvent& evt);
-	void OnBnClickedNextFile(wxCommandEvent& evt);
+	void OnBnClickedButtonStrip(wxCommandEvent &evt);
+	void OnBnClickedShowComment(wxCommandEvent &evt);
+	void OnBnClickedTakeOver(wxCommandEvent &evt);
+	void OnListClickedTakeOver(wxDataViewEvent &evt);
+	void OnTextFileNameChange(wxCommandEvent &evt);
+	void OnBnClickedOk(wxCommandEvent &evt);
+	void OnBnClickedApply(wxCommandEvent &evt);
+	void OnBnClickedPrevFile(wxCommandEvent &evt);
+	void OnBnClickedNextFile(wxCommandEvent &evt);
 };
 
 #endif // FILEDETAILDIALOG_H

amule-3.0.1.tar.gz/src/FileDetailListCtrl.cpp -> amule-3.1.0.tar.gz/src/FileDetailListCtrl.cpp Changed

@@ -23,60 +23,101 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "muuli_wdr.h"		// Needed for ID_CLOSEWNDFD
-#include "FileDetailListCtrl.h"	// Interface declarations
+#include "FileDetailListCtrl.h" // Interface declarations
 
-#define wxLIST_STATE_DESELECTED 0x0000
+#include <common/Format.h> // Needed for CFormat
 
-wxBEGIN_EVENT_TABLE(CFileDetailListCtrl, CMuleListCtrl)
-	EVT_LIST_ITEM_SELECTED(IDC_LISTCTRLFILENAMES, CFileDetailListCtrl::OnSelect) // Care for single selection
-wxEND_EVENT_TABLE()
+#include "OtherFunctions.h" // Needed for CmpAny
+#include "PartFile.h"       // Needed for SourcenameItem
 
+wxBEGIN_EVENT_TABLE(CFileDetailListCtrl, CMuleVirtualDataViewCtrl)
+	EVT_DATAVIEW_SELECTION_CHANGED(wxID_ANY, CFileDetailListCtrl::OnSelectionChanged)
+wxEND_EVENT_TABLE()
 
-CFileDetailListCtrl::CFileDetailListCtrl(wxWindow * &parent, int id, const wxPoint & pos, wxSize siz, int flags):CMuleListCtrl(parent, id, pos, siz, flags)
+CFileDetailListCtrl::CFileDetailListCtrl(wxWindow *parent, int id, const wxPoint &pos, wxSize siz, int flags)
+: CMuleVirtualDataViewCtrl(parent, id, pos, siz, flags)
 {
-	// Set sorter function
-	SetSortFunc(SortProc);
+	const int columnFlags = wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE;
+	AddTextColumn(_("File Name"), COLUMN_FILEDETAIL_NAME, "N", 370, wxALIGN_LEFT, columnFlags);
+	AddTextColumn(_("Sources"), COLUMN_FILEDETAIL_SOURCES, "S", 70, wxALIGN_LEFT, columnFlags);
+
+	AppendSpacerColumn(COLUMN_FILEDETAIL_SPACER);
+	AssociateVirtualModel();
 
-	// Initial sorting: Sources descending
-	InsertColumn(0, _("File Name"), wxLIST_FORMAT_LEFT, 370);
-	InsertColumn(1, _("Sources"), wxLIST_FORMAT_LEFT, 70);
+	// Initial sorting: Sources descending, matching the pre-port default.
+	// LoadColumnSettings() replaces it once the config has something saved.
+	ApplySorting(COLUMN_FILEDETAIL_SOURCES, SORT_DES);
 
-	SetSorting(1, CMuleListCtrl::SORT_DES);
+	// This list gains persistence here: it is the one dataview list that never had it, so a
+	// user who widened "File Name" lost it the moment the dialog closed, and the sort reset to
+	// Sources-descending on every open. There is no GetOldColumnOrder() override because there
+	// is no pre-dataview config to migrate -- nothing was ever written under this name.
+	m_columnStore.SetTableName("FileDetail");
+	LoadColumnSettings();
+
+	InitColumnState();
+}
 
-	SortList();
+void CFileDetailListCtrl::AddSource(SourcenameItem *item)
+{
+	AddItemData(reinterpret_cast<wxUIntPtr>(item));
 }
 
-int CFileDetailListCtrl::SortProc(wxUIntPtr param1, wxUIntPtr param2, wxIntPtr sortData)
+void CFileDetailListCtrl::RefreshSource(SourcenameItem *item)
 {
-	// Comparison for different sortings
-	SourcenameItem *item1 = reinterpret_cast<SourcenameItem*>(param1);
-	SourcenameItem *item2 = reinterpret_cast<SourcenameItem*>(param2);
+	RefreshItemData(reinterpret_cast<wxUIntPtr>(item));
+}
 
-	int mod = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
+void CFileDetailListCtrl::RemoveSource(SourcenameItem *item)
+{
+	RemoveItemData(reinterpret_cast<wxUIntPtr>(item));
+}
 
-	switch (sortData & CMuleListCtrl::COLUMN_MASK) {
-		case 1: return mod * (item1->count - item2->count);			// Sources descending
-		case 0: return mod * item1->name.CmpNoCase(item2->name);	// Name descending
-		default: return 0;
+wxString CFileDetailListCtrl::GetItemColumnText(wxUIntPtr item, unsigned column) const
+{
+	const SourcenameItem *source = reinterpret_cast<const SourcenameItem *>(item);
+	switch (column) {
+	case COLUMN_FILEDETAIL_NAME:
+		return source->name;
+	case COLUMN_FILEDETAIL_SOURCES:
+		return CFormat("%i") % source->count;
+	default:
+		return wxEmptyString;
 	}
 }
 
+int CFileDetailListCtrl::CompareItemData(
+	wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool WXUNUSED(alt), int modifier) const
+{
+	const SourcenameItem *s1 = reinterpret_cast<const SourcenameItem *>(data1);
+	const SourcenameItem *s2 = reinterpret_cast<const SourcenameItem *>(data2);
 
-void CFileDetailListCtrl::OnSelect(wxListEvent& event)
+	switch (column) {
+	case COLUMN_FILEDETAIL_NAME:
+		return modifier * s1->name.CmpNoCase(s2->name);
+	case COLUMN_FILEDETAIL_SOURCES:
+		return modifier * CmpAny(s1->count, s2->count);
+	default:
+		return 0;
+	}
+}
+
+bool CFileDetailListCtrl::IsLiveSortColumn() const
 {
-	// Damn wxLC_SINGLE_SEL does not work! So we have to care for single selection ourselves:
-	long realpos = event.m_itemIndex;
-	long pos = -1;
-	do {
-		// Loop through all selected items
-		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();
+	// Only the source count moves on its own; a row's name is the key it was created under and
+	// never changes. Answering "yes" for the name column would schedule a re-sort on every
+	// refresh tick that could not reorder anything. Same shape as CServerListCtrl.
+	if (m_sort_orders.empty()) {
+		return false;
+	}
+	return static_cast<int>(m_sort_orders.front().first) == COLUMN_FILEDETAIL_SOURCES;
+}
+
+void CFileDetailListCtrl::OnSelectionChanged(wxDataViewEvent &event)
+{
+	if (GetSelectedItemsCount() > 1 && event.GetItem().IsOk()) {
+		UnselectAll();
+		Select(event.GetItem());
+	}
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/FileDetailListCtrl.h -> amule-3.1.0.tar.gz/src/FileDetailListCtrl.h Changed

@@ -26,22 +26,51 @@
 #ifndef FILEDETAILLISTCTRL_H
 #define FILEDETAILLISTCTRL_H
 
-#include "MuleListCtrl.h"	// Needed for CMuleListCtrl
+#include "MuleVirtualDataViewCtrl.h" // Needed for CMuleVirtualDataViewCtrl
 
-class CFileDetailListCtrl : public CMuleListCtrl
-{
+#define COLUMN_FILEDETAIL_NAME 0
+#define COLUMN_FILEDETAIL_SOURCES 1
+//! Always empty. Absorbs the macOS trailing-column sizing; see
+//! CMuleDataViewCtrl::AppendSpacerColumn().
+#define COLUMN_FILEDETAIL_SPACER 2
+
+class SourcenameItem;
 
+class CFileDetailListCtrl : public CMuleVirtualDataViewCtrl
+{
 public:
-	CFileDetailListCtrl(wxWindow * &parent, int id, const wxPoint & pos, wxSize siz, int flags);
+	// The parent is taken by value: it is only forwarded to the base, and a
+	// `wxWindow *&` cannot bind to the wxStaticBox this control now lives in.
+	CFileDetailListCtrl(wxWindow *parent, int id, const wxPoint &pos, wxSize siz, int flags);
 
-private:
-	struct SourcenameItem {
-		wxString	name;
-		long		count;
-	};
+	void AddSource(SourcenameItem *item);
+	void RefreshSource(SourcenameItem *item);
+	void RemoveSource(SourcenameItem *item);
+	void ClearSources() { ClearItemData(); }
 
-	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData);
-	void OnSelect(wxListEvent& event);
+protected:
+	/// Text of a cell, pulled on demand for the rows being drawn.
+	wxString GetItemColumnText(wxUIntPtr item, unsigned column) const override;
+
+	/// Name compare on column 0, source-count compare on column 1.
+	int CompareItemData(
+		wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool alt, int modifier) const override;
+
+	/**
+	 * The Sources column's value (a live source count) changes on every 5-second refresh timer
+	 * tick while the dialog is open, so a sources-sorted list needs the coalesced live re-sort.
+	 */
+	bool IsLiveSortColumn() const override;
+
+private:
+	/**
+	 * The base always constructs with wxDV_MULTIPLE, CMuleDataViewCtrl having no single-
+	 * selection mode, but this list is meant to have only one row selected -- the "take over
+	 * filename" actions assume it. Collapses the selection down to the just-clicked row
+	 * whenever more than one ends up selected, the wxDataViewCtrl equivalent of the old list's
+	 * own OnSelect() enforcement.
+	 */
+	void OnSelectionChanged(wxDataViewEvent &event);
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.1.0.tar.gz/src/FileLaunch.cpp Added

@@ -0,0 +1,401 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "FileLaunch.h" // Interface declarations
+
+#include <vector> // Needed for std::vector
+
+#include <wx/cmdline.h>  // Needed for wxCmdLineParser::ConvertStringToArgs
+#include <wx/filename.h> // Needed for wxFileName::IsFileExecutable
+#include <wx/msgdlg.h>   // Needed for wxMessageBox
+#include <wx/utils.h>    // Needed for wxExecute, wxLaunchDefaultApplication
+
+#include <common/Format.h> // Needed for CFormat
+
+#ifdef __WXMAC__
+#include "MacAppHelper.h" // Needed for mac_reveal_in_finder
+#endif
+
+#include "AppImageEnv.h" // Needed for GetSanitizedExecEnv
+#ifdef CLIENT_GUI
+#include "amule.h" // Needed for theApp->glob_prefs (ApplyPathMapping)
+#endif
+#include "KnownFile.h"          // Needed for CKnownFile
+#include "Logger.h"             // Needed for AddLogLineC
+#include "OtherFunctions.h"     // Needed for GetFiletype
+#include "PartFile.h"           // Needed for CPartFile
+#include "Preferences.h"        // Needed for thePrefs
+#include "TerminationProcess.h" // Needed for CTerminationProcess
+
+namespace
+{
+
+// Hand an argument vector to the desktop, with the AppImage-safe environment when we are inside a
+// bundle: AppRun prepends the bundle's lib/bin directories to the child's search paths, and a host
+// program that inherits them loads our older bundled libraries and dies on an undefined symbol
+// (#334).
+//
+// A vector rather than a command string on purpose: the path crosses untouched, so a name with
+// spaces or quotes needs no escaping and cannot be re-split by the shell-style parser wxExecute
+// applies to strings. The wide overload keeps non-ASCII names intact, which mb_str() would mangle
+// under a C locale.
+bool RunDetached(const wxString &description, const std::vector<wxString> &args)
+{
+	std::vector<wxWCharBuffer> buffers;
+	std::vector<const wchar_t *> argv;
+	buffers.reserve(args.size()); // no reallocation, so the pointers below stay valid
+	argv.reserve(args.size() + 1);
+	for (const wxString &arg : args) {
+		buffers.emplace_back(arg.wc_str());
+		argv.push_back(buffers.back().data());
+	}
+	argv.push_back(nullptr);
+
+	CTerminationProcess *process = new CTerminationProcess(description);
+	wxExecuteEnv execEnv;
+	const bool sanitized = AppImageEnv::GetSanitizedExecEnv(execEnv);
+	long ret = 0;
+	try {
+		ret = wxExecute(argv.data(), wxEXEC_ASYNC, process, sanitized ? &execEnv : nullptr);
+	} catch (...) {
+		// wxExecute throws, rather than returning an error, when the environment it has to
+		// hand the child is unusable -- a working directory that no longer exists, for one.
+		// Uncaught it unwinds out of the menu handler and wx terminates the application
+		// cleanly: no signal, no backtrace, no crash report.
+		delete process;
+		return false;
+	}
+	if (ret <= 0) {
+		delete process;
+		return false;
+	}
+	// True means the child was spawned, not that it did anything useful: an async wxExecute
+	// returns the pid as soon as the fork succeeds, so a failed exec (no xdg-open installed,
+	// say) is not reported here. macOS and Windows do surface a failure, since neither reaches
+	// the desktop opener this way.
+	return true;
+}
+
+// Log a launch failure, and put it in front of the user when the caller has no
+// second option to fall through to.
+void Fail(const wxString &message, wxWindow *parent, bool reportModally)
+{
+	AddLogLineC(message);
+	if (reportModally && parent != nullptr) {
+		wxMessageBox(message, _("File preview"), wxOK | wxICON_EXCLAMATION, parent);
+	}
+}
+
+// Hand the path to the user's configured player.
+//
+// The template is split into arguments ONCE, with wxCmdLineParser, and the placeholders are
+// substituted inside the resulting arguments -- so the path and the bare name each cross as a
+// single argv entry whatever they contain. The old code appended the path to a command string and
+// let wxExecute re-split it, so a remote-supplied filename could inject arguments: `x\'
+// --script=/tmp/evil.lua \'.avi` becomes a separate --script argument, and mpv and vlc execute
+// scripts given that way. Escaping the quotes was the previous defence and was itself bypassable;
+// not building a string removes the class.
+//
+// `reportModally` is for the caller that has nothing to fall back to: a failure it only logs is,
+// from the user's side, the same silent nothing this removes.
+bool LaunchWithPlayer(const wxString &player, const CPath &path, wxWindow *parent, bool reportModally)
+{
+	const wxString target = path.GetRaw();
+	const wxString name = path.GetFullName().GetRaw();
+
+	// ConvertStringToArgs defaults to DOS rules, which is wrong everywhere but Windows: it
+	// leaves single quotes literal and does not honour backslash escapes, so an existing `mpv
+	// -fs '%PARTFILE'` silently stops working. Windows genuinely needs DOS, since UNIX rules
+	// would eat the backslashes in C:\Program Files\...
+#ifdef __WINDOWS__
+	wxArrayString parts = wxCmdLineParser::ConvertStringToArgs(player, wxCMD_LINE_SPLIT_DOS);
+#else
+	wxArrayString parts = wxCmdLineParser::ConvertStringToArgs(player, wxCMD_LINE_SPLIT_UNIX);
+#endif
+	if (parts.IsEmpty()) {
+		Fail(CFormat(_("ERROR: Failed to execute external media-player! Command: '%s'")) % player,
+			parent,
+			reportModally);
+		return false;
+	}
+
+	// An absolute program path that is not a runnable file is worth catching here.
+	// IsFileExecutable covers both halves: a path that is absent, and one that exists without
+	// the exec bit. wxExecute cannot report it -- the async form returns the pid as soon as the
+	// fork succeeds and execvp then fails in the child, so the caller sees success while the
+	// user sees only wx's "execvp ... failed with error 2". That is the normal state of affairs
+	// inside a Flatpak, where a host player is simply not on the sandbox's filesystem.
+	//
+	// A bare command name is left alone: resolving it would mean reimplementing the PATH search
+	// the exec does anyway. Windows paths never match this test and do not need to:
+	// CreateProcess fails synchronously, so the error path below already reports it.
+	if (parts0.StartsWith("/") && !wxFileName::IsFileExecutable(parts0)) {
+		Fail(CFormat(_("The configured video player was not found: %s")) % parts0,
+			parent,
+			reportModally);
+		return false;
+	}
+
+	std::vector<wxString> argv;
+	argv.reserve(parts.GetCount() + 1);
+	bool substituted = false;
+	for (const wxString &part : parts) {
+		// One pass: a value that happens to contain a placeholder (a file named
+		// "x%PARTNAME.avi") must not have it expanded again by a later rule.
+		wxString arg;
+		arg.reserve(part.length());
+		for (size_t i = 0; i < part.length();) {
+			if (part.compare(i, 9, "%PARTFILE") == 0) {
+				arg += target;
+				i += 9;
+				substituted = true;
+			} else if (part.compare(i, 9, "%PARTNAME") == 0) {
+				arg += name;
+				i += 9;
+				substituted = true;
+			} else if (part.compare(i, 5, "$file") == 0) {
+				// The historic spelling of %PARTFILE.
+				arg += target;
+				i += 5;
+				substituted = true;
+			} else {
+				arg += parti;
+				++i;
+			}
+		}
+		argv.push_back(arg);
+	}
+	// No placeholder anywhere: the player takes the file as its last argument.
+	if (!substituted) {
+		argv.push_back(target);
+	}
+
+	if (!RunDetached(player, argv)) {
+		Fail(CFormat(_("ERROR: Failed to execute external media-player! Command: '%s'")) % player,
+			parent,
+			reportModally);
+		return false;
+	}
+	return true;
+}
+
+// The platform's "open this with whatever handles it" action.
+bool OpenWithDesktop(const CPath &path)
+{
+	const wxString target = path.GetRaw();
+#if defined(__WXMSW__) || defined(__WXMAC__)
+	// No AppImage on these platforms, so there is no environment to sanitize, and the portable
+	// call is both simpler and better behaved than spawning a shell -- it uses ShellExecute /
+	// LaunchServices directly.
+	try {
+		return wxLaunchDefaultApplication(target);
+	} catch (...) {
+		// See RunDetached: an escaping exception would end the session.
+		return false;
+	}
+#else
+	// Linux/BSD: xdg-open, via wxExecute so the AppImage-safe environment can be passed. Inside
+	// Flatpak this is the portal shim, which forwards to the host's handler.
+	return RunDetached(CFormat("xdg-open %s") % target, { "xdg-open", target });
+#endif
+}
+
+} // namespace
+
+namespace FileLaunch
+{
+
+bool ResolvePath(const CKnownFile *file, CPath &out)
+{
+	if (file == nullptr) {
+		return false;
+	}
+
+	const CPath &rawDirectory = file->GetFilePath();
+	if (!rawDirectory.IsOk()) {
+		// amulegui before the daemon has streamed EC_TAG_KNOWNFILE_PATH.
+		return false;
+	}
+
+#ifdef CLIENT_GUI
+	// Rewrite a remote daemon's path into this machine's, per the user's configured mappings
+	// (issue #843) -- the daemon's /downloads/incoming reachable here as
+	// D:\Downloads\aMule\incoming over a Samba mount, say. String substitution on the raw
+	// daemon path, before it becomes part of a CPath, since the remote side need not use this
+	// host's separator convention. Returns the input unchanged when no mapping's prefix
+	// matches, the empty mapping list included.
+	const CPath directory = CPath(theApp->glob_prefs->ApplyPathMapping(rawDirectory.GetRaw()));
+#else
+	// The monolithic app is its own core: never remapped, so no copy.
+	const CPath &directory = rawDirectory;
+#endif
+
+	// IsPartFile() is `status != PS_COMPLETE` on CPartFile and a constant false on CKnownFile,
+	// so a true answer also establishes the dynamic type -- the downcast below is guarded by
+	// the same test that selects this branch.
+	CPath name;
+	if (file->IsPartFile()) {
+		name = static_cast<const CPartFile *>(file)->GetPartMetFileName().RemoveExt();
+	} else {
+		name = file->GetFileName();
+	}
+	if (!name.IsOk()) {
+		return false;
+	}
+
+	out = directory.JoinPaths(name);
+	return true;
+}
+
+bool CanOpen(const CKnownFile *file)
+{
+	CPath path;
+	return ResolvePath(file, path) && path.FileExists();
+}
+
+void GetAvailability(const CKnownFile *file, bool &canOpen, bool &canReveal)
+{
+	CPath path;
+	canOpen = ResolvePath(file, path) && path.FileExists();
+	// Revealing a ".part" in the temp directory is not what the entry means.
+	canReveal = canOpen && !file->IsPartFile();
+}
+
+bool CanReveal(const CKnownFile *file)
+{
+	// A ".part" in the temp directory is not what "show in file manager" means.
+	if (file == nullptr || file->IsPartFile()) {
+		return false;
+	}
+	return CanOpen(file);
+}
+
+void Open(CKnownFile *file, wxWindow *parent)
+{
+	CPath path;
+	if (!ResolvePath(file, path) || !path.FileExists()) {
+		AddLogLineC(CFormat(_("Cannot open '%s': the file is not present on this computer.")) %
+			    (file != nullptr ? file->GetFileName().GetPrintable() : wxString()));
+		return;
+	}
+
+	const bool incomplete = file->IsPartFile();
+	const FileType type = GetFiletype(file->GetFileName());
+	const bool media = (type == ftVideo || type == ftAudio);
+	const wxString &player = thePrefs::GetVideoPlayer();
+
+	// An unfinished download is "NNNN.part" on disk, and no desktop registers a handler for
+	// that extension, so the platform opener would answer with its own "no application set to
+	// open this document" dialog. Previewing one only works by handing the path to a player, so
+	// when there is none, say so.
+	if (incomplete) {
+		if (player.IsEmpty()) {
+			if (parent != nullptr) {
+				wxMessageBox(
+					_("Previewing an unfinished download needs a video player: the "
+					  "partly-downloaded file has no type the system can open on its "
+					  "own. One can be set in Preferences -> General."),
+					_("File preview"),
+					wxOK | wxICON_INFORMATION,
+					parent);
+			}
+			return;
+		}
+		// Nothing to fall back to for a .part, so this one has to be seen.
+		LaunchWithPlayer(player, path, parent, true);
+		return;
+	}
+
+	// Completed: the configured player is for watching media, so it is used for media and
+	// deliberately not for anything else -- which is what used to send an archive to the video
+	// player. A player that could not be launched should not cost the user the action: for a
+	// finished file the desktop handler is a reasonable second choice, and inside a Flatpak
+	// that is the portal.
+	if (media && !player.IsEmpty() && LaunchWithPlayer(player, path, parent, false)) {
+		return;
+	}
+
+	if (!OpenWithDesktop(path)) {
+		AddLogLineC(CFormat(_("ERROR: Failed to open '%s' with the default application.")) %
+			    path.GetPrintable());
+	}
+}
+
+void Reveal(const CKnownFile *file, wxWindow *WXUNUSED(parent))
+{
+	CPath path;
+	if (!ResolvePath(file, path)) {
+		return;
+	}
+	if (!CanReveal(file)) {
+		// Gone between the menu being built and this click, or never eligible.
+		// Open's equivalent path logs, so this one does too.
+		AddLogLineC(
+			CFormat(_("ERROR: Failed to show '%s' in the file manager.")) % path.GetPrintable());
+		return;
+	}
+
+	bool ok = false;
+#if defined(__WXMAC__)
+	// NSWorkspace rather than spawning `open -R`: it selects the file in its folder, which is
+	// what "Show in Finder" means, and needs no subprocess, so nothing about the caller's
+	// environment can perturb it.
+	ok = mac_reveal_in_finder(path.GetRaw().utf8_str());
+#elif defined(__WXMSW__)
+	// Explorer wants the path glued to the switch by a comma, and it exits non-zero even on
+	// success -- so the return code says nothing, and this stays a quoted string rather than an
+	// argument vector.
+	const wxString command = "explorer /select,\"" + path.GetRaw() + "\"";
+	CTerminationProcess *process = new CTerminationProcess(command);
+	try {
+		// Explorer's own exit status is meaningless (non-zero even on success),
+		// so it is ignored -- but a failure to spawn it at all is reportable.
+		if (wxExecute(command, wxEXEC_ASYNC, process) <= 0) {
+			delete process;
+			ok = false;
+		} else {
+			ok = true;
+		}
+	} catch (...) {
+		// see RunDetached
+		delete process;
+		ok = false;
+	}
+#else
+	// No portable way to select the file; opening the containing folder is the part every
+	// desktop agrees on. Selecting it would mean the FileManager1 D-Bus interface, which not
+	// every file manager implements.
+	const wxString directory = path.GetPath().GetRaw();
+	ok = RunDetached(CFormat("xdg-open %s") % directory, { "xdg-open", directory });
+#endif
+
+	if (!ok) {
+		// Quiet beyond the log: the user is looking at the window that did not
+		// appear, so a modal adds nothing.
+		AddLogLineC(
+			CFormat(_("ERROR: Failed to show '%s' in the file manager.")) % path.GetPrintable());
+	}
+}
+
+} // namespace FileLaunch

amule-3.1.0.tar.gz/src/FileLaunch.h Added

@@ -0,0 +1,91 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 FILELAUNCH_H
+#define FILELAUNCH_H
+
+class CKnownFile;
+class CPath;
+class wxWindow;
+
+/**
+ * Handing a file to the desktop: opening it, and showing it in the file manager. Shared by the
+ * Downloads and Shared Files lists so the two cannot drift; both are compiled per-executable, and
+ * nothing here branches on the build variant.
+ *
+ * Availability is decided by whether the path exists on *this* host rather than by which binary is
+ * running. The monolithic app is the core, so its files are always local; amulegui drives a
+ * separate daemon and holds that daemon's path (EC_TAG_KNOWNFILE_PATH), which resolves here only
+ * when the two share a filesystem. Testing the path covers both, and also catches what the old
+ * build-variant gate missed: a local file that has since been moved or deleted.
+ *
+ * It cannot distinguish a remote daemon whose path happens to exist locally as a *different* file.
+ * That is accepted: the alternative refuses every legitimate shared-filesystem setup.
+ */
+namespace FileLaunch
+{
+
+/**
+ * Full on-disk path of `file` -- the ".part" in the temp directory while it is still downloading,
+ * the real name in its destination once complete.
+ *
+ * @return false when no path can be formed, which is normal in amulegui before the daemon has
+ * streamed one.
+ */
+bool ResolvePath(const CKnownFile *file, CPath &out);
+
+/// True when the file can be handed to the desktop: its path resolves and exists.
+bool CanOpen(const CKnownFile *file);
+
+/**
+ * Both menu answers from a single filesystem check.
+ *
+ * CanReveal() is CanOpen() plus one in-memory test, so asking separately stats the file twice. A
+ * context menu needs both, and the check has no upper bound on a network mount.
+ */
+void GetAvailability(const CKnownFile *file, bool &canOpen, bool &canReveal);
+
+/**
+ * True when the file's folder can be shown.
+ *
+ * Stricter than CanOpen: an incomplete download is a ".part" in the temp directory, and revealing
+ * that is never what the user meant.
+ */
+bool CanReveal(const CKnownFile *file);
+
+/**
+ * Open the file with the desktop's handler for its type.
+ *
+ * Media goes to the configured video player when one is set -- including an incomplete download,
+ * which is the preview case. Everything else goes to the platform opener regardless of that
+ * setting, so "Open" on an archive does not launch the video player.
+ */
+void Open(CKnownFile *file, wxWindow *parent);
+
+/// Show the file's folder in the desktop's file manager.
+void Reveal(const CKnownFile *file, wxWindow *parent);
+
+} // namespace FileLaunch
+
+#endif // FILELAUNCH_H

amule-3.0.1.tar.gz/src/FileLock.h -> amule-3.1.0.tar.gz/src/FileLock.h Changed

@@ -33,39 +33,29 @@
 #endif
 #include <string> // Do_not_auto_remove (g++-4.0.1 except win32)
 
-
 /**
- * This class provides an easy way to lock non-critical
- * files used by multiple applications. However, since
- * the implementation relies on fcntl, it may not work
- * on all filesystems (NFS) and thus locking is not
- * certain.
- *
- * Currently, this lock holds an exclusive lock on the
- * file in question. It is assumed that the file will
- * be read/written by all users.
+ * An easy way to lock non-critical files used by several applications. The implementation relies on
+ * fcntl, so it may not work on all filesystems (NFS) and locking is not certain.
  *
+ * The lock is exclusive: all users are assumed to read and write the file.
  */
 class CFileLock
 {
 public:
 	/**
-	 * Locks the lock-file for the specified file.
-	 *
-	 * The lock-file is a file named file + "_lock", and
-	 * will be created if it does not already exist. This
-	 * file is not removed afterwards.
+	 * Locks the lock-file for the specified file. The lock-file is named file + "_lock" and is
+	 * created if it does not exist. It is not removed afterwards.
 	 */
-	CFileLock(const std::string& file);
+	CFileLock(const std::string &file);
 
 	/** Releases the lock, if any is held. */
 	~CFileLock();
 
 private:
 	//! Not copyable.
-	CFileLock(const CFileLock&);
+	CFileLock(const CFileLock &);
 	//! Not assignable.
-	CFileLock& operator=(const CFileLock&);
+	CFileLock &operator=(const CFileLock &);
 
 	/** Locks or unlocks the lock-file, returning true on success. */
 	bool SetLock(bool doLock);
@@ -81,15 +71,14 @@
 	bool m_ok;
 };
 
-
-inline CFileLock::CFileLock(const std::string& file)
+inline CFileLock::CFileLock(const std::string &file)
 #ifdef _WIN32
-	: m_ok(false)
+: m_ok(false)
 {
 	hd = CreateFileA((file + "_lock").c_str(),
 		GENERIC_READ | GENERIC_WRITE,
-		FILE_SHARE_READ | FILE_SHARE_WRITE,		// share - shareable
-		NULL,									// security - not inheritable
+		FILE_SHARE_READ | FILE_SHARE_WRITE, // share - shareable
+		NULL,                               // security - not inheritable
 		CREATE_ALWAYS,
 		FILE_ATTRIBUTE_ARCHIVE,
 		NULL);
@@ -98,8 +87,8 @@
 	}
 }
 #else
-	: m_fd(-1),
-	  m_ok(false)
+: m_fd(-1)
+, m_ok(false)
 {
 	// File must be open with O_WRONLY to be able to set write-locks.
 	m_fd = ::open((file + "_lock").c_str(), O_CREAT | O_WRONLY, 0600);
@@ -109,7 +98,6 @@
 }
 #endif
 
-
 inline CFileLock::~CFileLock()
 {
 	if (m_ok) {
@@ -127,7 +115,6 @@
 #endif
 }
 
-
 inline bool CFileLock::SetLock(bool doLock)
 {
 #ifdef _WIN32

amule-3.1.0.tar.gz/src/FirstRunWizard.cpp Added

@@ -0,0 +1,752 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "FirstRunWizard.h"
+
+#ifndef AMULE_DAEMON
+
+#include "config.h" // Needed for ENABLE_UPNP
+
+#include <wx/wizard.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/statline.h>
+#include <wx/textctrl.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/spinctrl.h>
+#include <wx/button.h>
+#include <wx/dirdlg.h>
+#include <wx/msgdlg.h>
+#include <wx/valtext.h>
+
+#include "amule.h"                  // Needed for theApp / glob_prefs
+#include "AutostartManager.h"       // Needed for Integrations page autostart toggle
+#include "Preferences.h"            // Needed for thePrefs
+#include "ProtocolHandlerManager.h" // Needed for Integrations page URL-scheme toggles
+#include <common/Format.h>
+#include <common/Path.h> // Needed for CPath
+
+namespace
+{
+// A predefined connection profile, carrying two distinct pairs of kByte/s values:
+//   * the suggested rate LIMITS (uploadKBs / downloadKBs, 0 == unlimited), which fill the two spin
+//     controls and become MaxUpload / MaxDownload; and
+//   * the raw line CAPACITY (uploadCapKBs / downloadCapKBs), which becomes MaxGraphUploadRate /
+//     MaxGraphDownloadRate -- the value that scales the statistics graphs and feeds the
+//     dynamic-upload logic. Capacity is never 0, so a fast unlimited-limit line still gets
+//     sensibly scaled graphs.
+//
+// The upload limit is ~80% of raw upstream capacity, leaving ACK and protocol headroom; the
+// download limit is left unlimited.
+//
+// Each profile also carries its own peer limits (maxConnections / maxConnectionsPer5Sec /
+// maxSourcesPerFile). A slow uplink can only usefully feed a handful of peers, so a modest line
+// keeps fewer sources and connections rather than drowning in half-open overhead. They are scaled
+// to each line's upstream CAPACITY here rather than re-derived from the upload-limit field through
+// coarse buckets, which modern presets all sit above.
+struct ConnectionProfile
+{
+	const char *label;
+	int uploadKBs;      // upload limit (0 == unlimited)
+	int downloadKBs;    // download limit (0 == unlimited)
+	int uploadCapKBs;   // raw upstream line capacity
+	int downloadCapKBs; // raw downstream line capacity
+	int maxConnections;
+	int maxConnectionsPer5Sec;
+	int maxSourcesPerFile;
+};
+
+// Labels are wxTRANSLATE-marked (so xgettext extracts them) and
+// translated at display time with wxGetTranslation below.
+const ConnectionProfile s_profiles = {
+	{ wxTRANSLATE("Mobile / 4G-5G (20 / 5 Mbit)"), 500, 0, 625, 2500, 300, 20, 400 },
+	{ wxTRANSLATE("ADSL (24 / 1 Mbit)"), 100, 0, 125, 3000, 200, 20, 250 },
+	{ wxTRANSLATE("VDSL (50 / 10 Mbit)"), 1000, 0, 1250, 6250, 400, 25, 500 },
+	{ wxTRANSLATE("Cable (200 / 20 Mbit)"), 2000, 0, 2500, 25000, 500, 30, 600 },
+	{ wxTRANSLATE("Fibre 300 (300 / 100 Mbit)"), 10000, 0, 12500, 37500, 500, 40, 800 },
+	{ wxTRANSLATE("Fibre Gigabit (1000 / 1000 Mbit)"), 0, 0, 125000, 125000, 500, 50, 1000 },
+};
+
+const size_t s_profileCount = sizeof(s_profiles) / sizeof(s_profiles0);
+
+struct DerivedLimits
+{
+	int maxConnections;
+	int maxConnectionsPer5Sec;
+	int maxSourcesPerFile;
+};
+
+// Keep the connection count within the OS-aware ceiling: on legacy Windows the half-open-connection
+// limit makes a flat 500, plus a hot 50-per-5s, too aggressive.
+DerivedLimits ClampLimits(DerivedLimits d)
+{
+	const int recommended = thePrefs::GetRecommendedMaxConnections();
+	if (recommended > 0 && d.maxConnections > recommended) {
+		d.maxConnections = recommended;
+	}
+	return d;
+}
+
+// Recommended peer limits for the current upload setting. A preset carries its own per-line
+// numbers; a manually-entered upload limit ("Other") is still bucketed, but on a modern kByte/s
+// scale rather than the old <4/7/13/25/50 tiers, which today's uplinks all exceed. An unlimited (0)
+// upload limit is treated as a fast line. The caller clamps the result through ClampLimits().
+DerivedLimits DeriveLimits(int uploadKBs)
+{
+	const int up = (uploadKBs <= 0) ? 100000 : uploadKBs;
+	if (up < 50) {
+		return { 200, 20, 250 };
+	} else if (up < 200) {
+		return { 300, 20, 400 };
+	} else if (up < 1000) {
+		return { 400, 25, 500 };
+	} else if (up < 2500) {
+		return { 500, 30, 600 };
+	} else if (up < 10000) {
+		return { 500, 40, 800 };
+	}
+	return { 500, 50, 1000 };
+}
+
+// Resolve the limits for the current wizard state: the selected preset's own numbers when a profile
+// is active, otherwise the manually-derived bucket. Always clamped to the OS recommendation.
+DerivedLimits ResolveLimits(int profileSel, int uploadKBs)
+{
+	DerivedLimits d;
+	if (profileSel >= 0 && profileSel < (int)s_profileCount) {
+		const ConnectionProfile &p = s_profilesprofileSel;
+		d = { p.maxConnections, p.maxConnectionsPer5Sec, p.maxSourcesPerFile };
+	} else {
+		d = DeriveLimits(uploadKBs);
+	}
+	return ClampLimits(d);
+}
+
+enum
+{
+	ID_FRW_SPEED = wxID_HIGHEST + 1,
+	ID_FRW_UPLOAD,
+	ID_FRW_BROWSE_INCOMING,
+	ID_FRW_BROWSE_TEMP
+};
+
+class CFirstRunWizard : public wxWizard
+{
+public:
+	CFirstRunWizard(wxWindow *parent, bool needServerMet, bool needNodesDat);
+
+	// Runs the wizard modally. Returns true if the user pressed Finish.
+	bool RunIt() { return RunWizard(m_firstPage); }
+
+	// Pushes the collected choices into the live preferences, saves
+	// them, and reports which bootstrap downloads were requested.
+	void Apply(FirstRunWizard::Result &res);
+
+private:
+	wxWizardPageSimple *BuildNickPage();
+	wxWizardPageSimple *BuildConnectionPage();
+	wxWizardPageSimple *BuildNetworkPage();
+	wxWizardPageSimple *BuildBootstrapPage();
+	wxWizardPageSimple *BuildIntegrationsPage();
+	wxWizardPageSimple *BuildFoldersPage();
+
+	void UpdateDerivedLabel();
+
+	void OnSpeedChoice(wxCommandEvent &evt);
+	void OnUploadChanged(wxSpinEvent &evt);
+	void OnBrowseIncoming(wxCommandEvent &evt);
+	void OnBrowseTemp(wxCommandEvent &evt);
+
+	bool m_needServerMet;
+	bool m_needNodesDat;
+
+	wxWizardPageSimple *m_firstPage = NULL;
+
+	wxTextCtrl *m_nickCtrl = NULL;
+	wxChoice *m_speedCtrl = NULL;
+	wxSpinCtrl *m_uploadCtrl = NULL;
+	wxSpinCtrl *m_downloadCtrl = NULL;
+	wxStaticText *m_derivedLabel = NULL;
+	wxCheckBox *m_ed2kCtrl = NULL;
+	wxCheckBox *m_kadCtrl = NULL;
+	wxSpinCtrl *m_tcpPortCtrl = NULL;
+	wxSpinCtrl *m_udpPortCtrl = NULL;
+#ifdef ENABLE_UPNP
+	wxCheckBox *m_upnpCtrl = NULL;
+#endif
+	wxCheckBox *m_serverMetCtrl = NULL;
+	wxCheckBox *m_nodesDatCtrl = NULL;
+	wxCheckBox *m_autoUpdateServerCtrl = nullptr;
+	wxCheckBox *m_autostartCtrl = nullptr;
+	wxCheckBox *m_registerEd2kCtrl = nullptr;
+	wxCheckBox *m_registerMagnetCtrl = nullptr;
+	wxCheckBox *m_assocCollectionCtrl = nullptr;
+	wxTextCtrl *m_incomingCtrl = NULL;
+	wxTextCtrl *m_tempCtrl = NULL;
+};
+
+CFirstRunWizard::CFirstRunWizard(wxWindow *parent, bool needServerMet, bool needNodesDat)
+: wxWizard(parent, wxID_ANY, _("aMule first-run setup"))
+, m_needServerMet(needServerMet)
+, m_needNodesDat(needNodesDat)
+{
+	wxWizardPageSimple *nick = BuildNickPage();
+	wxWizardPageSimple *conn = BuildConnectionPage();
+	wxWizardPageSimple *net = BuildNetworkPage();
+	wxWizardPageSimple *boot = BuildBootstrapPage();
+	wxWizardPageSimple *integrations = BuildIntegrationsPage();
+	wxWizardPageSimple *folders = BuildFoldersPage();
+
+	wxWizardPageSimple::Chain(nick, conn);
+	wxWizardPageSimple::Chain(conn, net);
+	wxWizardPageSimple::Chain(net, boot);
+	wxWizardPageSimple::Chain(boot, integrations);
+	wxWizardPageSimple::Chain(integrations, folders);
+
+	m_firstPage = nick;
+
+	GetPageAreaSizer()->Add(nick);
+	UpdateDerivedLabel();
+}
+
+wxWizardPageSimple *CFirstRunWizard::BuildNickPage()
+{
+	wxWizardPageSimple *page = new wxWizardPageSimple(this);
+	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+
+	sizer->Add(new wxStaticText(page, wxID_ANY, _("Welcome to aMule!")), 0, wxBOTTOM, 8);
+	sizer->Add(new wxStaticText(page,
+			   wxID_ANY,
+			   _("This short setup will get you connected. You can change\n"
+			     "any of these settings later in Preferences.")),
+		0,
+		wxBOTTOM,
+		12);
+
+	sizer->Add(new wxStaticText(page, wxID_ANY, _("Choose a nickname other peers will see:")),
+		0,
+		wxBOTTOM,
+		4);
+	m_nickCtrl = new wxTextCtrl(page, wxID_ANY, thePrefs::GetUserNick());
+	sizer->Add(m_nickCtrl, 0, wxEXPAND);
+
+	page->SetSizer(sizer);
+	return page;
+}
+
+wxWizardPageSimple *CFirstRunWizard::BuildConnectionPage()
+{
+	wxWizardPageSimple *page = new wxWizardPageSimple(this);
+	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+
+	sizer->Add(new wxStaticText(page, wxID_ANY, _("Connection & bandwidth")), 0, wxBOTTOM, 8);
+	sizer->Add(new wxStaticText(page,
+			   wxID_ANY,
+			   _("Pick the option that best matches your Internet connection,\n"
+			     "or set the upload and download limits directly below.")),
+		0,
+		wxBOTTOM,
+		12);
+
+	sizer->Add(new wxStaticText(page, wxID_ANY, _("Connection speed:")), 0, wxBOTTOM, 4);
+	m_speedCtrl = new wxChoice(page, ID_FRW_SPEED);
+	for (size_t i = 0; i < s_profileCount; ++i) {
+		m_speedCtrl->Append(wxGetTranslation(s_profilesi.label));
+	}
+	m_speedCtrl->Append(_("Other / set manually"));
+	m_speedCtrl->SetSelection((int)s_profileCount); // "Other" until a profile is chosen
+	sizer->Add(m_speedCtrl, 0, static_cast<int>(wxEXPAND) | wxBOTTOM, 12);
+
+	wxFlexGridSizer *grid = new wxFlexGridSizer(2, 2, 6, 8);
+	grid->AddGrowableCol(1);
+
+	grid->Add(new wxStaticText(page, wxID_ANY, _("Upload limit (KiB/s, 0 = unlimited):")),
+		0,
+		wxALIGN_CENTER_VERTICAL);
+	m_uploadCtrl = new wxSpinCtrl(page, ID_FRW_UPLOAD);
+	m_uploadCtrl->SetRange(0, 100000);
+	m_uploadCtrl->SetValue(thePrefs::GetMaxUpload());
+	grid->Add(m_uploadCtrl, 0, wxEXPAND);
+
+	grid->Add(new wxStaticText(page, wxID_ANY, _("Download limit (KiB/s, 0 = unlimited):")),
+		0,
+		wxALIGN_CENTER_VERTICAL);
+	m_downloadCtrl = new wxSpinCtrl(page, wxID_ANY);
+	m_downloadCtrl->SetRange(0, 100000);
+	m_downloadCtrl->SetValue(thePrefs::GetMaxDownload());
+	grid->Add(m_downloadCtrl, 0, wxEXPAND);
+
+	sizer->Add(grid, 0, static_cast<int>(wxEXPAND) | wxBOTTOM, 12);
+
+	m_derivedLabel = new wxStaticText(page, wxID_ANY, wxEmptyString);
+	sizer->Add(m_derivedLabel, 0, wxEXPAND);
+
+	page->SetSizer(sizer);
+
+	m_speedCtrl->Bind(wxEVT_CHOICE, &CFirstRunWizard::OnSpeedChoice, this);
+	m_uploadCtrl->Bind(wxEVT_SPINCTRL, &CFirstRunWizard::OnUploadChanged, this);
+
+	return page;
+}
+
+wxWizardPageSimple *CFirstRunWizard::BuildNetworkPage()
+{
+	wxWizardPageSimple *page = new wxWizardPageSimple(this);
+	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+
+	sizer->Add(new wxStaticText(page, wxID_ANY, _("Networks & ports")), 0, wxBOTTOM, 8);
+	sizer->Add(
+		new wxStaticText(
+			page, wxID_ANY, _("aMule can use two networks. We recommend keeping both enabled.")),
+		0,
+		wxBOTTOM,
+		8);
+
+	// Network labels reuse existing catalog strings so translators do not get wizard-only
+	// duplicates; the guidance sentence above carries the "server-based / serverless"
+	// explanation. Use the project's "eD2k" spelling, an existing catalog string, rather than
+	// the Networks panel's mis-cased "ED2K".
+	m_ed2kCtrl = new wxCheckBox(page, wxID_ANY, _("eD2k"));
+	m_ed2kCtrl->SetValue(thePrefs::GetNetworkED2K());
+	sizer->Add(m_ed2kCtrl, 0, wxBOTTOM, 4);
+
+	m_kadCtrl = new wxCheckBox(page, wxID_ANY, _("Kademlia"));
+	m_kadCtrl->SetValue(thePrefs::GetNetworkKademlia());
+	sizer->Add(m_kadCtrl, 0, wxBOTTOM, 12);
+
+	wxFlexGridSizer *grid = new wxFlexGridSizer(2, 2, 6, 8);
+	grid->AddGrowableCol(1);
+
+	// Port labels mirror the existing Ports-panel wording, trailing spaces included, so the
+	// controls reuse the already-translated msgids instead of introducing wizard-only strings
+	// every translator must redo.
+	grid->Add(new wxStaticText(page, wxID_ANY, _("Standard TCP Port ")), 0, wxALIGN_CENTER_VERTICAL);
+	m_tcpPortCtrl = new wxSpinCtrl(page, wxID_ANY);
+	m_tcpPortCtrl->SetRange(1, 65535);
+	m_tcpPortCtrl->SetValue(thePrefs::GetPort());
+	grid->Add(m_tcpPortCtrl, 0, wxEXPAND);
+
+	grid->Add(new wxStaticText(page, wxID_ANY, _("Extended UDP port (Kad / global search) ")),
+		0,
+		wxALIGN_CENTER_VERTICAL);
+	m_udpPortCtrl = new wxSpinCtrl(page, wxID_ANY);
+	m_udpPortCtrl->SetRange(1, 65535);
+	m_udpPortCtrl->SetValue(thePrefs::GetUDPPort());
+	grid->Add(m_udpPortCtrl, 0, wxEXPAND);
+
+	sizer->Add(grid, 0, static_cast<int>(wxEXPAND) | wxBOTTOM, 12);
+
+#ifdef ENABLE_UPNP
+	sizer->Add(new wxStaticLine(page), 0, static_cast<int>(wxEXPAND) | wxBOTTOM, 8);
+	m_upnpCtrl = new wxCheckBox(page, wxID_ANY, _("Enable UPnP for router port forwarding"));
+	m_upnpCtrl->SetValue(true);
+	sizer->Add(m_upnpCtrl, 0, wxBOTTOM, 4);
+	sizer->Add(new wxStaticText(page,
+			   wxID_ANY,
+			   _("Lets aMule ask your router to forward the ports above so other\n"
+			     "peers can reach you (a \"HighID\"). Turn off if your router\n"
+			     "doesn't support UPnP or you forward ports manually.")),
+		0,
+		wxLEFT,
+		20);
+#endif
+
+	page->SetSizer(sizer);
+	return page;
+}
+
+wxWizardPageSimple *CFirstRunWizard::BuildBootstrapPage()
+{
+	wxWizardPageSimple *page = new wxWizardPageSimple(this);
+	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+
+	sizer->Add(new wxStaticText(page, wxID_ANY, _("Bootstrap files")), 0, wxBOTTOM, 8);
+
+	if (m_needServerMet || m_needNodesDat) {
+		sizer->Add(new wxStaticText(page,
+				   wxID_ANY,
+				   _("To get started, aMule needs to know about some peers.\n"
+				     "Select which lists to download now:")),
+			0,
+			wxBOTTOM,
+			8);
+
+		if (m_needServerMet) {
+			m_serverMetCtrl = new wxCheckBox(page, wxID_ANY, _("eD2k server list (server.met)"));
+			m_serverMetCtrl->SetValue(true);
+			sizer->Add(m_serverMetCtrl, 0, wxBOTTOM, 4);
+		}
+		if (m_needNodesDat) {
+			m_nodesDatCtrl = new wxCheckBox(page, wxID_ANY, _("Kad bootstrap nodes (nodes.dat)"));
+			m_nodesDatCtrl->SetValue(true);
+			sizer->Add(m_nodesDatCtrl, 0, wxBOTTOM, 4);
+		}
+	} else {
+		sizer->Add(new wxStaticText(page,
+				   wxID_ANY,
+				   _("Your peer lists are already in place - nothing to download.")),
+			0);
+	}
+
+	// Recurring refresh, distinct from the one-time download above: re-fetch the eD2k server
+	// list from the configured URL on every start (the AutoServerlist pref, off by default and
+	// otherwise only on the Server tab). Shown whether or not a bootstrap download is offered,
+	// and checked so a first-run user gets an up-to-date list without hunting for the setting.
+	m_autoUpdateServerCtrl = new wxCheckBox(page, wxID_ANY, _("Auto-update server list at startup"));
+	m_autoUpdateServerCtrl->SetValue(true);
+	sizer->Add(m_autoUpdateServerCtrl, 0, wxTOP, 8);
+
+	page->SetSizer(sizer);
+	return page;
+}
+
+wxWizardPageSimple *CFirstRunWizard::BuildIntegrationsPage()
+{
+	wxWizardPageSimple *page = new wxWizardPageSimple(this);
+	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+
+	sizer->Add(new wxStaticText(page, wxID_ANY, _("Integrations (optional)")), 0, wxBOTTOM, 8);
+	sizer->Add(new wxStaticText(page,
+			   wxID_ANY,
+			   _("Choose how aMule integrates with your system. You can\n"
+			     "change any of these later in Preferences.")),
+		0,
+		wxBOTTOM,
+		12);
+
+	// All three checkboxes reuse the exact strings from the Preferences panel so translators
+	// only see them once. The three backends all live in the OS, not in aMule.conf.
+	m_autostartCtrl = new wxCheckBox(page, wxID_ANY, _("Start aMule automatically when I log in"));
+	m_autostartCtrl->SetValue(AutostartManager::IsEnabled());
+	// Wider gap than the 4 used between rows: autostart is its own thing,
+	// and the three registration toggles below read as a group.
+	sizer->Add(m_autostartCtrl, 0, wxBOTTOM, 12);
+
+	// On macOS the un-register path is a no-op (LaunchServices blocks programmatic reset), so
+	// once aMule already holds the scheme registration the checkbox is not created at all
+	// rather than being dead. On Linux and Windows Disable works, so the box is always created
+	// and reflects live state.
+	bool magnetEnabled = ProtocolHandlerManager::IsEnabled(HandlerTarget::MagnetScheme);
+#ifdef __WXMAC__
+	const bool showEd2kBox = !ProtocolHandlerManager::IsEnabled(HandlerTarget::Ed2kScheme);
+	const bool showMagnetBox = !magnetEnabled;
+	const bool showAssocBox = !ProtocolHandlerManager::IsEnabled(HandlerTarget::CollectionFile);
+#else
+	const bool showEd2kBox = true;
+	const bool showMagnetBox = true;
+	const bool showAssocBox = true;
+#endif
+
+	if (showEd2kBox) {
+		m_registerEd2kCtrl = new wxCheckBox(page, wxID_ANY, _("Register aMule for ed2k:// links"));
+		// Default ON in the wizard (opt-in to the common case). If the
+		// user is already the current handler, honour that too.
+		m_registerEd2kCtrl->SetValue(true);
+		sizer->Add(m_registerEd2kCtrl, 0, wxBOTTOM, 4);
+	}
+
+	if (showMagnetBox) {
+		m_registerMagnetCtrl = new wxCheckBox(page, wxID_ANY, _("Register aMule for magnet: links"));
+		// Default OFF: aMule only handles the eD2k-compatible subset of magnets, so leaving
+		// this off avoids silently stealing BitTorrent magnet clicks. Preserves the current
+		// state if the user opted in elsewhere.
+		m_registerMagnetCtrl->SetValue(magnetEnabled);
+		sizer->Add(m_registerMagnetCtrl, 0, wxBOTTOM, 2);
+		// wxLEFT only: the 20 is the indent under the checkbox. Applying it to wxBOTTOM as
+		// well would leave a 20px gap before whatever comes next, five times the spacing
+		// every other row uses.
+		sizer->Add(new wxStaticText(page,
+				   wxID_ANY,
+				   _("Only eD2k-compatible magnets. Leave off if you use a BitTorrent "
+				     "client.")),
+			0,
+			wxLEFT,
+			20);
+		sizer->AddSpacer(4);
+	}
+
+	if (showAssocBox) {
+		// Third section break, so the page reads as autostart / link handling / file
+		// handling. 8 plus the 4 trailing the block above is the same 12 that follows
+		// autostart, and with the magnet block hidden the 4 after the ed2k row gets there
+		// just the same.
+		sizer->AddSpacer(8);
+		// String reused verbatim from the Preferences panel so translators
+		// only ever see it once.
+		m_assocCollectionCtrl =
+			new wxCheckBox(page, wxID_ANY, _("Open .emulecollection files with aMule"));
+		// Default ON: a collection is only useful opened in an eD2k
+		// client, and nothing else on a typical system claims the type.
+		m_assocCollectionCtrl->SetValue(true);
+		sizer->Add(m_assocCollectionCtrl, 0, wxBOTTOM, 4);
+	}
+
+	page->SetSizer(sizer);
+	return page;
+}
+
+wxWizardPageSimple *CFirstRunWizard::BuildFoldersPage()
+{
+	wxWizardPageSimple *page = new wxWizardPageSimple(this);
+	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+
+	sizer->Add(new wxStaticText(page, wxID_ANY, _("Folders (optional)")), 0, wxBOTTOM, 8);
+	sizer->Add(new wxStaticText(page,
+			   wxID_ANY,
+			   _("The defaults are fine for most people. Change them if you\n"
+			     "want downloads on a different (e.g. larger) disk.")),
+		0,
+		wxBOTTOM,
+		12);
+
+	// Folder labels and Browse buttons reuse the existing Directories-panel
+	// strings (PreferencesDirectoriesTab) instead of new wizard-only wording.
+	sizer->Add(new wxStaticText(page, wxID_ANY, _("Destination folder for downloads")), 0, wxBOTTOM, 4);
+	wxBoxSizer *incRow = new wxBoxSizer(wxHORIZONTAL);
+	m_incomingCtrl = new wxTextCtrl(page, wxID_ANY, thePrefs::GetIncomingDir().GetRaw());
+	incRow->Add(m_incomingCtrl, 1, static_cast<int>(wxALIGN_CENTER_VERTICAL) | wxRIGHT, 6);
+	incRow->Add(new wxButton(page, ID_FRW_BROWSE_INCOMING, _("Browse")), 0);
+	sizer->Add(incRow, 0, static_cast<int>(wxEXPAND) | wxBOTTOM, 4);
+
+	// Warn that everything dropped in the Incoming folder is shared, reusing
+	// the same hint shown on the Directories preferences panel.
+	sizer->Add(
+		new wxStaticText(page, wxID_ANY, _("(All files in this folder are shared with other peers)")),
+		0,
+		wxBOTTOM,
+		12);
+
+	sizer->Add(
+		new wxStaticText(page, wxID_ANY, _("Folder for temporary download files")), 0, wxBOTTOM, 4);
+	wxBoxSizer *tmpRow = new wxBoxSizer(wxHORIZONTAL);
+	m_tempCtrl = new wxTextCtrl(page, wxID_ANY, thePrefs::GetTempDir().GetRaw());
+	tmpRow->Add(m_tempCtrl, 1, static_cast<int>(wxALIGN_CENTER_VERTICAL) | wxRIGHT, 6);
+	tmpRow->Add(new wxButton(page, ID_FRW_BROWSE_TEMP, _("Browse")), 0);
+	sizer->Add(tmpRow, 0, wxEXPAND);
+
+	page->SetSizer(sizer);
+
+	page->Bind(wxEVT_BUTTON, &CFirstRunWizard::OnBrowseIncoming, this, ID_FRW_BROWSE_INCOMING);
+	page->Bind(wxEVT_BUTTON, &CFirstRunWizard::OnBrowseTemp, this, ID_FRW_BROWSE_TEMP);
+
+	return page;
+}
+
+void CFirstRunWizard::UpdateDerivedLabel()
+{
+	if (!m_derivedLabel || !m_uploadCtrl) {
+		return;
+	}
+	DerivedLimits d = ResolveLimits(m_speedCtrl->GetSelection(), m_uploadCtrl->GetValue());
+	m_derivedLabel->SetLabel(CFormat(_("Based on this, aMule will allow up to %i sources per file\n"
+					   "and %i client connections.")) %
+				 d.maxSourcesPerFile % d.maxConnections);
+}
+
+void CFirstRunWizard::OnSpeedChoice(wxCommandEvent &WXUNUSED(evt))
+{
+	int sel = m_speedCtrl->GetSelection();
+	if (sel >= 0 && sel < (int)s_profileCount) {
+		m_uploadCtrl->SetValue(s_profilessel.uploadKBs);
+		m_downloadCtrl->SetValue(s_profilessel.downloadKBs);
+		UpdateDerivedLabel();
+	}
+}
+
+void CFirstRunWizard::OnUploadChanged(wxSpinEvent &WXUNUSED(evt))
+{
+	// The user typed an upload value by hand -- detach the profile
+	// choice so it doesn't claim a preset that no longer matches.
+	m_speedCtrl->SetSelection((int)s_profileCount);
+	UpdateDerivedLabel();
+}
+
+void CFirstRunWizard::OnBrowseIncoming(wxCommandEvent &WXUNUSED(evt))
+{
+	wxString dir = ::wxDirSelector(_("Destination folder for downloads"),
+		m_incomingCtrl->GetValue(),
+		0,
+		wxDefaultPosition,
+		this);
+	if (!dir.IsEmpty()) {
+		m_incomingCtrl->SetValue(dir);
+	}
+}
+
+void CFirstRunWizard::OnBrowseTemp(wxCommandEvent &WXUNUSED(evt))
+{
+	wxString dir = ::wxDirSelector(
+		_("Folder for temporary download files"), m_tempCtrl->GetValue(), 0, wxDefaultPosition, this);
+	if (!dir.IsEmpty()) {
+		m_tempCtrl->SetValue(dir);
+	}
+}
+
+void CFirstRunWizard::Apply(FirstRunWizard::Result &res)
+{
+	// Nickname -- keep the existing default rather than allowing an
+	// empty nick.
+	wxString nick = m_nickCtrl->GetValue().Trim().Trim(false);
+	if (!nick.IsEmpty()) {
+		thePrefs::SetUserNick(nick);
+	}
+
+	// Bandwidth + the derived peer limits.
+	const int up = m_uploadCtrl->GetValue();
+	const int down = m_downloadCtrl->GetValue();
+	thePrefs::SetMaxUpload(up);
+	thePrefs::SetMaxDownload(down);
+
+	// Line capacity is a separate value from the limits above: it scales the statistics graphs
+	// and feeds the dynamic-upload logic. A still-selected preset supplies its raw capacity;
+	// otherwise the user typed values by hand, so it is estimated from the limits (upload
+	// limits sit ~80% below the raw rate, so cap = limit * 5 / 4). A 0 manual limit tells us
+	// nothing, so the existing capacity is kept rather than zeroed.
+	int upCap = 0;
+	int downCap = 0;
+	const int sel = m_speedCtrl->GetSelection();
+	if (sel >= 0 && sel < (int)s_profileCount) {
+		upCap = s_profilessel.uploadCapKBs;
+		downCap = s_profilessel.downloadCapKBs;
+	} else {
+		upCap = (up > 0) ? (up * 5 + 3) / 4 : (int)thePrefs::GetMaxGraphUploadRate();
+		downCap = (down > 0) ? down : (int)thePrefs::GetMaxGraphDownloadRate();
+	}
+	if (upCap > 0) {
+		thePrefs::SetMaxGraphUploadRate(upCap);
+	}
+	if (downCap > 0) {
+		thePrefs::SetMaxGraphDownloadRate(downCap);
+	}
+
+	DerivedLimits d = ResolveLimits(sel, up);
+	thePrefs::SetMaxConnections(d.maxConnections);
+	thePrefs::SetMaxConsPerFive(d.maxConnectionsPer5Sec);
+	thePrefs::SetMaxSourcesPerFile(d.maxSourcesPerFile);
+
+	// Networks + ports.
+	thePrefs::SetNetworkED2K(m_ed2kCtrl->GetValue());
+	thePrefs::SetNetworkKademlia(m_kadCtrl->GetValue());
+	thePrefs::SetPort((uint16)m_tcpPortCtrl->GetValue());
+	thePrefs::SetUDPPort((uint16)m_udpPortCtrl->GetValue());
+#ifdef ENABLE_UPNP
+	thePrefs::SetUPnPEnabled(m_upnpCtrl->GetValue());
+#endif
+
+	// Recurring server-list auto-update (see BuildBootstrapPage). Off by default
+	// in preferences; the wizard offers it opted-in.
+	if (m_autoUpdateServerCtrl) {
+		thePrefs::SetAutoServerlist(m_autoUpdateServerCtrl->GetValue());
+	}
+
+	// Folders -- only override the defaults if the user typed something.
+	wxString inc = m_incomingCtrl->GetValue().Trim().Trim(false);
+	if (!inc.IsEmpty()) {
+		thePrefs::SetIncomingDir(CPath(inc));
+	}
+	wxString tmp = m_tempCtrl->GetValue().Trim().Trim(false);
+	if (!tmp.IsEmpty()) {
+		thePrefs::SetTempDir(CPath(tmp));
+	}
+
+	// Integrations page. All three writes go straight to the OS (registry / mimeapps.list /
+	// LaunchServices / autostart store) and none touch aMule.conf, so glob_prefs->Save() below
+	// does not cover them. Enable/Disable silently: on a fresh install the "another handler is
+	// registered" prompt is normally irrelevant, and the user is already choosing aMule here.
+	if (m_autostartCtrl) {
+		if (m_autostartCtrl->GetValue()) {
+			AutostartManager::Enable();
+		} else {
+			AutostartManager::Disable();
+		}
+	}
+	if (m_registerEd2kCtrl) {
+		if (m_registerEd2kCtrl->GetValue()) {
+			ProtocolHandlerManager::Enable(HandlerTarget::Ed2kScheme);
+		} else {
+			ProtocolHandlerManager::Disable(HandlerTarget::Ed2kScheme);
+		}
+	}
+	if (m_assocCollectionCtrl) {
+		if (m_assocCollectionCtrl->GetValue()) {
+			ProtocolHandlerManager::Enable(HandlerTarget::CollectionFile);
+		} else {
+			ProtocolHandlerManager::Disable(HandlerTarget::CollectionFile);
+		}
+	}
+	if (m_registerMagnetCtrl) {
+		if (m_registerMagnetCtrl->GetValue()) {
+			ProtocolHandlerManager::Enable(HandlerTarget::MagnetScheme);
+		} else {
+			ProtocolHandlerManager::Disable(HandlerTarget::MagnetScheme);
+		}
+	}
+
+	// Record that the wizard ran to completion so it is not shown again. Only reached when the
+	// user pressed Finish, so a cancelled run leaves the flag false and the wizard reappears.
+	thePrefs::SetFirstRunWizardDone(true);
+
+	if (theApp->glob_prefs) {
+		theApp->glob_prefs->Save();
+	}
+
+	// Bootstrap downloads (only offered for files that are missing).
+	res.downloadServerMet = m_serverMetCtrl && m_serverMetCtrl->GetValue();
+	res.downloadNodesDat = m_nodesDatCtrl && m_nodesDatCtrl->GetValue();
+}
+
+} // anonymous namespace
+
+namespace FirstRunWizard
+{
+Result Run(wxWindow *parent, bool needServerMet, bool needNodesDat)
+{
+	Result res;
+
+	CFirstRunWizard wizard(parent, needServerMet, needNodesDat);
+	res.finished = wizard.RunIt();
+	if (res.finished) {
+		wizard.Apply(res);
+	} else {
+		// The user cancelled. Only Finish records FirstRunWizardDone, so without this the
+		// wizard would reappear on every launch with no way to dismiss it for good. Offers
+		// the same persistent "don't show again" choice the AppImage integration prompt
+		// uses; re-show is the safe default.
+		wxMessageDialog ask(parent,
+			_("Show this setup wizard again the next time you start aMule?"),
+			_("Setup not finished"),
+			wxYES_NO | wxICON_QUESTION);
+		if (ask.ShowModal() == wxID_NO) {
+			thePrefs::SetFirstRunWizardDone(true);
+			if (theApp->glob_prefs) {
+				theApp->glob_prefs->Save();
+			}
+		}
+	}
+	return res;
+}
+} // namespace FirstRunWizard
+
+#endif // !AMULE_DAEMON

amule-3.1.0.tar.gz/src/FirstRunWizard.h Added

@@ -0,0 +1,56 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 FIRSTRUNWIZARD_H
+#define FIRSTRUNWIZARD_H
+
+// The first-run setup wizard is a GUI-only feature; it is never built
+// into the headless daemon (AMULE_DAEMON, wxUSE_GUI=0).
+#ifndef AMULE_DAEMON
+
+class wxWindow;
+
+namespace FirstRunWizard
+{
+// Result of running the wizard: which network bootstrap files the user asked to download once the
+// network stack is up. The wizard itself applies and saves every preference it collects (nickname,
+// bandwidth, networks, ports, UPnP, folders), but the server.met / nodes.dat downloads depend on
+// the server list and sockets the caller initialises afterwards.
+struct Result
+{
+	bool finished = false;          // false if the user cancelled
+	bool downloadServerMet = false; // fetch eD2k server list (server.met)
+	bool downloadNodesDat = false;  // fetch Kad bootstrap nodes (nodes.dat)
+};
+
+// Show the modal first-run wizard. `parent` may be NULL, the wizard being shown before the main
+// window exists on a fresh install. `needServerMet` / `needNodesDat` seed the bootstrap page: they
+// reflect whether each file is currently missing, so we do not offer to download something already
+// present.
+Result Run(wxWindow *parent, bool needServerMet, bool needNodesDat);
+} // namespace FirstRunWizard
+
+#endif // !AMULE_DAEMON
+
+#endif // FIRSTRUNWIZARD_H

amule-3.1.0.tar.gz/src/FreeSpaceThread.cpp Added

@@ -0,0 +1,131 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "FreeSpaceThread.h" // Interface declarations
+
+#include <wx/filefn.h> // Needed for wxInvalidOffset
+
+#include "GetTickCount.h" // Needed for GetTickCount64()
+#include "Logger.h"       // Needed for AddDebugLogLineN
+#include "Statistics.h"   // Needed for FREE_SPACE_UNKNOWN and the publishers
+
+namespace
+{
+/**
+ * How stale a published figure may get. A display interval, not a cost budget: the panels report a
+ * disk filling up over minutes, so ten seconds is finer than anyone can act on, and the probe no
+ * longer runs anywhere that would notice a slower one.
+ */
+const uint64 kSampleIntervalMs = 10000;
+
+//! How often the worker wakes to check whether a sample is due. Shorter
+//! than the interval so shutdown doesn't wait out a sleeping thread.
+const int kTickMs = 1000;
+} // namespace
+
+CFreeSpaceThread::CFreeSpaceThread()
+: wxThread(wxTHREAD_JOINABLE)
+, m_condition(m_mutex)
+{
+	m_bRun = false;
+	wxMutexLocker lock(m_mutex);
+	if (Create() == wxTHREAD_NO_ERROR) {
+		Run();
+	}
+}
+
+void CFreeSpaceThread::EndThread()
+{
+	{
+		wxMutexLocker lock(m_mutex);
+		m_bRun = false;
+		m_condition.Signal();
+	}
+	// Returns as soon as the worker finishes the probe it is in, if any. A probe blocked on an
+	// unreachable mount holds the join for as long as that mount takes to fail -- the
+	// alternative, detaching, would leave a thread writing into statics the app is tearing
+	// down.
+	Wait();
+}
+
+void CFreeSpaceThread::SetPaths(const CPath &tempDir, const CPath &incomingDir)
+{
+	wxMutexLocker lock(m_mutex);
+	m_tempDir = tempDir;
+	m_incomingDir = incomingDir;
+}
+
+sint64 CFreeSpaceThread::Sample(const CPath &path)
+{
+	if (!path.IsOk()) {
+		return FREE_SPACE_UNKNOWN;
+	}
+	// wxInvalidOffset means the path could not be queried at all: it does not exist, or its
+	// mount is unreachable. Kept distinct from a real zero, which is a full disk and exactly
+	// what the Downloads panel warns about.
+	const sint64 free = CPath::GetFreeSpaceAt(path);
+	return (free == wxInvalidOffset) ? FREE_SPACE_UNKNOWN : free;
+}
+
+void *CFreeSpaceThread::Entry()
+{
+	m_bRun = true;
+	AddDebugLogLineN(logGeneral, wxT("Free space thread: started"));
+
+	// Zero means "never sampled", so both paths are probed on the first
+	// pass and the panels have a figure to show straight away.
+	uint64 lastTemp = 0;
+	uint64 lastIncoming = 0;
+
+	while (m_bRun) {
+		CPath tempDir;
+		CPath incomingDir;
+		{
+			wxMutexLocker lock(m_mutex);
+			if (m_bRun) {
+				m_condition.WaitTimeout(kTickMs);
+			}
+			if (!m_bRun) {
+				break;
+			}
+			tempDir = m_tempDir;
+			incomingDir = m_incomingDir;
+		}
+
+		// Timed separately so a slow incoming directory cannot hold temp back, and probed
+		// outside the lock so SetPaths() never waits on a filesystem.
+		const uint64 now = GetTickCount64();
+		if (lastTemp == 0 || now - lastTemp >= kSampleIntervalMs) {
+			lastTemp = now;
+			CStatistics::PublishTempFreeSpace(Sample(tempDir));
+		}
+		if (m_bRun && (lastIncoming == 0 || GetTickCount64() - lastIncoming >= kSampleIntervalMs)) {
+			lastIncoming = GetTickCount64();
+			CStatistics::PublishIncomingFreeSpace(Sample(incomingDir));
+		}
+	}
+
+	AddDebugLogLineN(logGeneral, wxT("Free space thread: stopped"));
+	return nullptr;
+}

amule-3.1.0.tar.gz/src/FreeSpaceThread.h Added

@@ -0,0 +1,94 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 FREESPACETHREAD_H
+#define FREESPACETHREAD_H
+
+#include <atomic>
+#include <wx/thread.h>
+
+#include "Types.h"       // Needed for uint64 / sint64
+#include <common/Path.h> // Needed for CPath (value members)
+
+/**
+ * Dedicated worker sampling the free space on the temp and incoming directories, published through
+ * CStatistics for the Downloads and Shared Files panels.
+ *
+ * Why its own thread: statvfs() / GetDiskFreeSpaceEx() blocks on the directory it is asked about.
+ * On a local disk that is microseconds, but either directory is commonly a network mount, where a
+ * cold autofs mount takes tens to hundreds of milliseconds and an unreachable server blocks for the
+ * mount's timeout, unbounded on a hard mount. The two callers are the GUI timer on the main thread
+ * and the EC stats reply on the core thread, so an inline probe puts that stall in front of the
+ * whole application.
+ *
+ * Nothing else in the core reaches those filesystems from the main loop: downloads write through
+ * CPartFileWriteThread and uploads read through CUploadDiskIOThread. This probe would have been the
+ * one exception.
+ *
+ * Isolated rather than queued onto CThreadScheduler for the same reason CMediaProbeThread is: that
+ * scheduler runs one task at a time and owns completion, allocation and hashing, so a probe blocked
+ * on a hung mount would not delay that queue but stop it -- and would couple unrelated filesystems,
+ * a hung incoming mount blocking the hashing of part files on a healthy local disk. Here a hung
+ * mount can only delay the next sample: the figure goes stale, the label empties, and nothing else
+ * notices.
+ */
+class CFreeSpaceThread : public wxThread
+{
+public:
+	CFreeSpaceThread();
+	// EndThread() (which joins the worker) must be called before the
+	// object is destroyed; the destructor itself has nothing to do.
+	~CFreeSpaceThread() = default;
+
+	//! Signal the worker to stop and join it.
+	void EndThread();
+
+	/**
+	 * Hands the worker the directories to sample. Called from the main thread, the only one
+	 * that may read thePrefs -- the paths can change while running (the preferences dialog),
+	 * and no worker in the tree touches preferences directly. Cheap enough to call on every
+	 * core tick, which is what keeps the snapshot current.
+	 */
+	void SetPaths(const CPath &tempDir, const CPath &incomingDir);
+
+	bool IsRunning() const { return m_bRun; }
+
+private:
+	void *Entry() override;
+
+	//! One blocking probe. FREE_SPACE_UNKNOWN if the path can't be queried.
+	static sint64 Sample(const CPath &path);
+
+	std::atomic<bool> m_bRun{ false };
+
+	wxMutex m_mutex;
+	wxCondition m_condition;
+
+	// Snapshots taken from thePrefs by the main thread; read by the
+	// worker. Both protected by m_mutex.
+	CPath m_tempDir;
+	CPath m_incomingDir;
+};
+
+#endif // FREESPACETHREAD_H

amule-3.0.1.tar.gz/src/Friend.cpp -> amule-3.1.0.tar.gz/src/Friend.cpp Changed

@@ -23,11 +23,9 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "Friend.h"			// Interface declarations.
-#include "SafeFile.h"		// Needed for CFileDataIO
-#include "GuiEvents.h"		// Needed for Notify_*
-
+#include "Friend.h"    // Interface declarations.
+#include "SafeFile.h"  // Needed for CFileDataIO
+#include "GuiEvents.h" // Needed for Notify_*
 
 void CFriend::Init()
 {
@@ -38,9 +36,13 @@
 	m_HasFriendSlot = false;
 }
 
-
-CFriend::CFriend( const CMD4Hash& userhash, uint32 tm_dwLastSeen, uint32 tm_dwLastUsedIP, uint32 tm_nLastUsedPort, uint32 tm_dwLastChatted, const wxString& tm_strName)
-	: m_UserHash(userhash)
+CFriend::CFriend(const CMD4Hash &userhash,
+	uint32 tm_dwLastSeen,
+	uint32 tm_dwLastUsedIP,
+	uint32 tm_nLastUsedPort,
+	uint32 tm_dwLastChatted,
+	const wxString &tm_strName)
+: m_UserHash(userhash)
 {
 	m_dwLastSeen = tm_dwLastSeen;
 	m_dwLastUsedIP = tm_dwLastUsedIP;
@@ -55,50 +57,75 @@
 	}
 }
 
-
 CFriend::CFriend(CClientRef client)
 {
-	m_HasFriendSlot = false;
+	// Init() first: it is the only thing that clears m_dwLastSeen and the last-used address,
+	// and LinkClient() copies those across only when the client carries a real value. Without
+	// this they start indeterminate and get written to emfriends.met on the next save.
+	Init();
 	LinkClient(client);
-
-	m_dwLastChatted = 0;
 }
 
-
 void CFriend::LinkClient(CClientRef client)
 {
 	wxASSERT(client.IsLinked());
 
 	// Link the friend to that client
-	if (m_LinkedClient != client) {		// do nothing if already linked to this client
+	if (m_LinkedClient != client) {          // do nothing if already linked to this client
 		if (m_LinkedClient.IsLinked()) { // What, is already linked?
 			UnLinkClient(false);
 		}
+		// The client may already belong to another record: reusing an existing client
+		// rather than always building a fresh one makes that reachable. Tell that record to
+		// let go, or it keeps a live reference and shows its friend as permanently
+		// connected.
+		CFriend *other = client.GetFriend();
+		if (other != nullptr && other != this) {
+			// Notified: that record is losing its client and its row has to stop
+			// showing it as connected, which is the visible half of the problem this
+			// fixes.
+			other->UnLinkClient();
+		}
 		m_LinkedClient = client;
 		m_LinkedClient.SetFriend(this);
-		// Apply the persistent friend-slot flag to the live client. This
-		// is the path that restores the slot when a friend reconnects
-		// after a disconnect (or after a daemon restart).
+		// Apply the persistent friend-slot flag to the live client. This is the path that
+		// restores the slot when a friend reconnects after a disconnect, or after a daemon
+		// restart.
+		//
+		// A client built from a stored address has not handshaked yet, so this can briefly
+		// grant the slot to whoever holds that address if it has since been recycled.
+		// Deferring until the hash is known is not the fix: this is the only pass that
+		// runs, because the handshake re-links the same client object and takes the branch
+		// above instead. ProcessHelloTypePacket revokes the slot when the hash does not
+		// match the record, which closes that window.
 		if (m_HasFriendSlot) {
 			m_LinkedClient.SetFriendSlot(true);
 		}
 	}
 
 	// always update (even if client stays the same)
-	if ( !client.GetUserName().IsEmpty() ) {
+	if (!client.GetUserName().IsEmpty()) {
 		m_strName = client.GetUserName();
 	} else if (m_strName.IsEmpty()) {
 		m_strName = "?";
 	}
-	m_UserHash = client.GetUserHash();
-	m_dwLastUsedIP = client.GetIP();
-	m_nLastUsedPort = client.GetUserPort();
+	// A client can be linked before it has connected: a browse/chat request builds one from the
+	// stored IP+port, and its identity is only negotiated during the handshake. Such a client
+	// reports an empty hash and a zero IP, so only copy fields carrying a real value --
+	// otherwise the friend's persisted IP/hash are overwritten with placeholders and it can no
+	// longer be reached or identified after a restart.
+	if (!client.GetUserHash().IsEmpty()) {
+		m_UserHash = client.GetUserHash();
+	}
+	if (client.GetIP() != 0) {
+		m_dwLastUsedIP = client.GetIP();
+		m_nLastUsedPort = client.GetUserPort();
+	}
 	m_dwLastSeen = time(NULL);
 	// This will update the Link status also on GUI.
 	Notify_ChatUpdateFriend(this);
 }
 
-
 void CFriend::UnLinkClient(bool notify)
 {
 	if (m_LinkedClient.IsLinked()) {
@@ -115,10 +142,9 @@
 	}
 }
 
-
-void CFriend::LoadFromFile(CFileDataIO* file)
+void CFriend::LoadFromFile(CFileDataIO *file)
 {
-	wxASSERT( file );
+	wxASSERT(file);
 
 	m_UserHash = file->ReadHash();
 	m_dwLastUsedIP = file->ReadUInt32();
@@ -127,46 +153,45 @@
 	m_dwLastChatted = file->ReadUInt32();
 
 	uint32 tagcount = file->ReadUInt32();
-	for ( uint32 j = 0; j != tagcount; j++) {
+	for (uint32 j = 0; j != tagcount; j++) {
 		CTag newtag(*file, true);
-		switch ( newtag.GetNameID() ) {
-			case FF_NAME:
-				if (m_strName.IsEmpty()) {
-					m_strName = newtag.GetStr();
-				}
-				break;
-			case FF_FRIENDSLOT:
-				m_HasFriendSlot = newtag.GetInt() != 0;
-				break;
+		switch (newtag.GetNameID()) {
+		case FF_NAME:
+			if (m_strName.IsEmpty()) {
+				m_strName = newtag.GetStr();
+			}
+			break;
+		case FF_FRIENDSLOT:
+			m_HasFriendSlot = newtag.GetInt() != 0;
+			break;
 		}
 	}
 }
 
-
-void CFriend::WriteToFile(CFileDataIO* file)
+void CFriend::WriteToFile(CFileDataIO *file)
 {
-	wxASSERT( file );
+	wxASSERT(file);
 	file->WriteHash(m_UserHash);
 	file->WriteUInt32(m_dwLastUsedIP);
 	file->WriteUInt16(m_nLastUsedPort);
 	file->WriteUInt32(m_dwLastSeen);
 	file->WriteUInt32(m_dwLastChatted);
 
-	uint32 tagcount = ( m_strName.IsEmpty() ? 0 : 2 ) + ( m_HasFriendSlot ? 1 : 0 );
+	uint32 tagcount = (m_strName.IsEmpty() ? 0 : 2) + (m_HasFriendSlot ? 1 : 0);
 	file->WriteUInt32(tagcount);
-	if ( !m_strName.IsEmpty() ) {
+	if (!m_strName.IsEmpty()) {
 		CTagString nametag(FF_NAME, m_strName);
 		nametag.WriteTagToFile(file, utf8strOptBOM);
 		nametag.WriteTagToFile(file);
 	}
-	if ( m_HasFriendSlot ) {
+	if (m_HasFriendSlot) {
 		CTagInt8 slottag(FF_FRIENDSLOT, 1);
 		slottag.WriteTagToFile(file);
 	}
 }
 
-
-bool CFriend::HasFriendSlot() {
+bool CFriend::HasFriendSlot() const
+{
 	return m_HasFriendSlot;
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/Friend.h -> amule-3.1.0.tar.gz/src/Friend.h Changed

@@ -26,66 +26,74 @@
 #ifndef FRIEND_H
 #define FRIEND_H
 
-
-#include <ec/cpp/ECID.h>	// Needed for CECID
+#include <ec/cpp/ECID.h> // Needed for CECID
 #include "MD4Hash.h"
-#include "ClientRef.h"		// Needed for CClientRef
+#include "ClientRef.h" // Needed for CClientRef
 
 class CFile;
 class CFileDataIO;
 
-#define	FF_NAME		0x01
-#define	FF_FRIENDSLOT	0x02
+#define FF_NAME 0x01
+#define FF_FRIENDSLOT 0x02
 
-class CFriend  : public CECID
+class CFriend : public CECID
 {
-friend class CFriendListRem;
+	friend class CFriendListRem;
+
 public:
-	CFriend()	{ Init(); }
+	CFriend() { Init(); }
 	~CFriend() {};
 
 	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() const			{ return !m_UserHash.IsEmpty(); }
-	const	CMD4Hash& GetUserHash() const { return m_UserHash; }
-
-	void SetName(const wxString& name) { m_strName = name; }
-
-	void	LinkClient(CClientRef client);
-	const CClientRef& GetLinkedClient() const { return m_LinkedClient; }
-	void	UnLinkClient(bool notify = true);
-
-	bool	HasFriendSlot();
-	void	SetPersistentFriendSlot(bool v)	{ m_HasFriendSlot = v; }
-
-	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);
+	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() const { return !m_UserHash.IsEmpty(); }
+	const CMD4Hash &GetUserHash() const { return m_UserHash; }
+
+	void SetName(const wxString &name) { m_strName = name; }
+
+	void LinkClient(CClientRef client);
+	const CClientRef &GetLinkedClient() const { return m_LinkedClient; }
+	void UnLinkClient(bool notify = true);
+
+	bool HasFriendSlot() const;
+	void SetPersistentFriendSlot(bool v) { m_HasFriendSlot = v; }
+
+	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:
-	void	Init();
+	void Init();
 
-	CClientRef	m_LinkedClient;
+	CClientRef m_LinkedClient;
 
-	CMD4Hash	m_UserHash;
-	uint32		m_dwLastUsedIP;
-	uint16		m_nLastUsedPort;
-	wxString	m_strName;
+	CMD4Hash m_UserHash;
+	uint32 m_dwLastUsedIP;
+	uint16 m_nLastUsedPort;
+	wxString m_strName;
 
-	// Persistent friend-slot flag. The live CUpDownClient's m_bFriendSlot
-	// is a per-session reflection of this; this is the source of truth
-	// across disconnects and daemon restarts.
-	bool		m_HasFriendSlot;
+	// Persistent friend-slot flag. The live CUpDownClient's m_bFriendSlot is a per-session
+	// reflection of this; this is the source of truth across disconnects and daemon restarts.
+	bool m_HasFriendSlot;
 
 	// write-only info, never used (kept in order not to break the save file)
-	uint32		m_dwLastSeen;
-	uint32		m_dwLastChatted;
+	uint32 m_dwLastSeen;
+	uint32 m_dwLastChatted;
 };
 
 #endif

amule-3.0.1.tar.gz/src/FriendList.cpp -> amule-3.1.0.tar.gz/src/FriendList.cpp Changed

@@ -23,33 +23,34 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include "FriendList.h" // Interface declarations.
 
-#include "FriendList.h" // Interface
+#include "BrowseManager.h"
 
 #include <common/DataFileVersion.h>
 
-#include "amule.h"			// Needed for theApp: let it first or fail under win32
-#include "ClientList.h"		// Needed for CClientList
-#include "updownclient.h"	// Needed for CUpDownClient
-#include "Friend.h"		// Needed for CFriend
+#include "amule.h"        // Needed for theApp: let it first or fail under win32
+#include "ClientList.h"   // Needed for CClientList
+#include "updownclient.h" // Needed for CUpDownClient
+#include "Friend.h"       // Needed for CFriend
 #include "CFile.h"
 #include "Logger.h"
 #include "GuiEvents.h"
-#include "Preferences.h"	// Needed for thePrefs
+#include "Preferences.h" // Needed for thePrefs
 
-CFriendList::CFriendList()
-{
-}
+CFriendList::CFriendList() {}
 
 CFriendList::~CFriendList()
 {
+	// Whatever happened, the list gets written. A batch left open would make SaveList() a no-op
+	// here, and losing emfriends.met on exit is the one outcome worth defending against twice.
+	m_batchDepth = 0;
 	SaveList();
 
 	DeleteContents(m_FriendList);
 }
 
-
-void CFriendList::AddFriend(CFriend* toadd, bool notify)
+void CFriendList::AddFriend(CFriend *toadd, bool notify)
 {
 	m_FriendList.push_back(toadd);
 	SaveList();
@@ -58,30 +59,31 @@
 	}
 }
 
-
-void CFriendList::AddFriend(const CMD4Hash& userhash, uint32 lastUsedIP, uint32 lastUsedPort, const wxString& name, uint32 lastSeen, uint32 lastChatted)
+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 );
+	CFriend *NewFriend = new CFriend(userhash, lastSeen, lastUsedIP, lastUsedPort, lastChatted, name);
 
+	AddFriend(NewFriend);
 }
 
-
-void CFriendList::AddFriend(const CClientRef& toadd)
+void CFriendList::AddFriend(const CClientRef &toadd)
 {
-	if ( toadd.IsFriend() ) {
+	if (toadd.IsFriend()) {
 		return;
 	}
 
-	CFriend* NewFriend = new CFriend( toadd );
+	CFriend *NewFriend = new CFriend(toadd);
 	toadd.SetFriend(NewFriend);
 
-	AddFriend(NewFriend, false);	// has already notified
+	AddFriend(NewFriend, false); // has already notified
 }
 
-
-void CFriendList::RemoveFriend(CFriend* toremove)
+void CFriendList::RemoveFriend(CFriend *toremove)
 {
 	if (toremove) {
 		CClientRef client = toremove->GetLinkedClient();
@@ -95,7 +97,8 @@
 
 		SaveList();
 
-		Notify_ChatRemoveFriend(toremove);	// this deletes the friend
+		theApp->ForgetECObject(toremove->ECID());
+		Notify_ChatRemoveFriend(toremove); // this deletes the friend
 	}
 }
 
@@ -109,11 +112,11 @@
 
 	CFile file;
 	try {
-		if ( file.Open(metfile) ) {
-			if ( file.ReadUInt8() /*header*/ == MET_HEADER ) {
+		if (file.Open(metfile)) {
+			if (file.ReadUInt8() /*header*/ == MET_HEADER) {
 				uint32 nRecordsNumber = file.ReadUInt32();
 				for (uint32 i = 0; i < nRecordsNumber; i++) {
-					CFriend* Record = new CFriend();
+					CFriend *Record = new CFriend();
 					Record->LoadFromFile(&file);
 					m_FriendList.push_back(Record);
 					Notify_ChatUpdateFriend(Record);
@@ -122,17 +125,39 @@
 		} else {
 			AddLogLineN(_("Failed to open friend list file 'emfriends.met' for reading!"));
 		}
-	} catch (const CInvalidPacket& e) {
-		AddDebugLogLineC(logGeneral, "Invalid entry in friend list, file may be corrupt: " + e.what());
-	} catch (const CSafeIOException& e) {
+	} catch (const CInvalidPacket &e) {
+		AddDebugLogLineC(
+			logGeneral, "Invalid entry in friend list, file may be corrupt: " + e.what());
+	} catch (const CSafeIOException &e) {
 		AddDebugLogLineC(logGeneral, "IO error while reading 'emfriends.met': " + e.what());
 	}
+}
 
+void CFriendList::BeginBatch()
+{
+	++m_batchDepth;
 }
 
+void CFriendList::EndBatch()
+{
+	if (m_batchDepth == 0) {
+		return;
+	}
+	if (--m_batchDepth == 0 && m_savePending) {
+		m_savePending = false;
+		SaveList();
+	}
+}
 
 void CFriendList::SaveList()
 {
+	if (m_batchDepth > 0) {
+		// Inside a batch: remember that a write is owed and let EndBatch()
+		// do it once, rather than rewriting the whole file per friend.
+		m_savePending = true;
+		return;
+	}
+
 	CFile file;
 	if (file.Create(thePrefs::GetConfigDir() + "emfriends.met", true)) {
 		try {
@@ -142,7 +167,7 @@
 			for (FriendList::iterator it = m_FriendList.begin(); it != m_FriendList.end(); ++it) {
 				(*it)->WriteToFile(&file);
 			}
-		} catch (const CIOFailureException& e) {
+		} catch (const CIOFailureException &e) {
 			AddDebugLogLineC(logGeneral, "IO failure while saving 'emfriends.met': " + e.what());
 		}
 	} else {
@@ -150,39 +175,44 @@
 	}
 }
 
-
-CFriend* CFriendList::FindFriend(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort)
+CFriend *CFriendList::LookupFriend(const CMD4Hash &userhash, uint32 dwIP, uint16 nPort) const
 {
-
-	for(FriendList::iterator it = m_FriendList.begin(); it != m_FriendList.end(); ++it) {
-
-		CFriend* cur_friend = *it;
+	for (CFriend *cur_friend : m_FriendList) {
 		// 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->HasHash() ) {
+		if (!userhash.IsEmpty() && cur_friend->HasHash()) {
 			// check for a friend which has the same userhash as the specified one
 			if (cur_friend->GetUserHash() == userhash) {
 				return cur_friend;
 			}
-		} else if (cur_friend->GetIP() == dwIP && cur_friend->GetPort() == nPort) {
-			if (!userhash.IsEmpty() && !cur_friend->HasHash() ) {
-				// Friend without hash (probably IP entered through dialog)
-				// -> save the hash
-				cur_friend->SetUserHash(userhash);
-				SaveList();
-			}
+		} else if (dwIP != 0 && cur_friend->GetIP() == dwIP && cur_friend->GetPort() == nPort) {
+			// A zero address is the absence of one, not a value to match on. Friends
+			// can be added from a record that never carried an IP, and without this
+			// every such record answers to the same query: a client would link to
+			// whichever was stored first and inherit its persistent friend slot.
 			return cur_friend;
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
+CFriend *CFriendList::FindFriend(const CMD4Hash &userhash, uint32 dwIP, uint16 nPort)
+{
+	CFriend *found = LookupFriend(userhash, dwIP, nPort);
+	// A match can only lack a hash when it was matched on address, so this
+	// is the "friend entered as IP:port, now seen connecting" case.
+	if (found != nullptr && !userhash.IsEmpty() && !found->HasHash()) {
+		found->SetUserHash(userhash);
+		SaveList();
+	}
+	return found;
+}
 
-CFriend* CFriendList::FindFriend(uint32 ecid)
+CFriend *CFriendList::FindFriend(uint32 ecid)
 {
 	for (FriendList::iterator it = m_FriendList.begin(); it != m_FriendList.end(); ++it) {
-		CFriend* cur_friend = *it;
+		CFriend *cur_friend = *it;
 		if (cur_friend->ECID() == ecid) {
 			return cur_friend;
 		}
@@ -191,47 +221,66 @@
 	return NULL;
 }
 
-
-bool CFriendList::IsAlreadyFriend( uint32 dwLastUsedIP, uint32 nLastUsedPort )
+bool CFriendList::IsAlreadyFriend(uint32 dwLastUsedIP, uint32 nLastUsedPort)
 {
-	return (FindFriend( CMD4Hash(), dwLastUsedIP, nLastUsedPort ) != NULL);
+	return (FindFriend(CMD4Hash(), dwLastUsedIP, nLastUsedPort) != NULL);
 }
 
-
 void CFriendList::RemoveAllFriendSlots()
 {
-	for(FriendList::iterator it = m_FriendList.begin(); it != m_FriendList.end(); ++it) {
-		CFriend* cur_friend = *it;
+	for (FriendList::iterator it = m_FriendList.begin(); it != m_FriendList.end(); ++it) {
+		CFriend *cur_friend = *it;
 		if (cur_friend->GetLinkedClient().IsLinked()) {
-				cur_friend->GetLinkedClient().SetFriendSlot(false);
+			cur_friend->GetLinkedClient().SetFriendSlot(false);
 		}
 	}
 }
 
-
-void CFriendList::RequestSharedFileList(CFriend* cur_friend)
+CFriendList::BrowseResult CFriendList::RequestSharedFileList(CFriend *cur_friend, uint32 browseSearchId)
 {
 	if (cur_friend) {
-		CUpDownClient* client = cur_friend->GetLinkedClient().GetClient();
+		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, "CFriendList::RequestSharedFileList"));
+			// Asked before deciding there is nothing to reach: this finds a client
+			// already held for the hash even when the record carries no address, and
+			// answers empty only when there is genuinely neither.
+			CClientRef ref = theApp->clientlist->CreateForAddress(cur_friend->GetUserHash(),
+				cur_friend->GetIP(),
+				cur_friend->GetPort(),
+				cur_friend->GetName());
+			if (!ref.IsLinked()) {
+				AddLogLineC(CFormat(_("No address known for friend '%s' yet, cannot browse "
+						      "them.")) %
+					    cur_friend->GetName());
+				return BrowseResult::Unreachable;
+			}
+			cur_friend->LinkClient(ref);
+			client = ref.GetClient();
 		}
+		// A browse already running for this peer will decline the request below, so say so
+		// rather than reporting a browse that never starts. Reusing an existing client
+		// makes this reachable where building a fresh one every time could not: the
+		// caller's id would otherwise name a browse nothing will ever answer or expire.
+		if (theApp->browsemanager->SearchIdFor(client) != 0) {
+			return BrowseResult::AlreadyRunning;
+		}
+		// Pin the EC-allocated browse ID before firing the request, so
+		// ProcessSharedFileList files the listing under it.
+		client->PinBrowseSearchId(browseSearchId);
 		client->RequestSharedFileList();
+		return BrowseResult::Started;
 	}
+	return BrowseResult::Unreachable;
 }
 
-
-void CFriendList::SetFriendSlot(CFriend* Friend, bool new_state)
+void CFriendList::SetFriendSlot(CFriend *Friend, bool new_state)
 {
 	if (!Friend) {
 		return;
 	}
-	// Persist the flag on the friend record so it survives the friend
-	// going offline (the live CUpDownClient::m_bFriendSlot is per-session
-	// state that dies with the client object on disconnect).
+	// Persist the flag on the friend record so it survives the friend going offline: the live
+	// CUpDownClient::m_bFriendSlot is per-session state that dies with the client object on
+	// disconnect.
 	Friend->SetPersistentFriendSlot(new_state);
 	if (new_state) {
 		// Only one friend can hold the slot at a time. Clear any other
@@ -250,22 +299,24 @@
 	SaveList();
 }
 
-
-void CFriendList::StartChatSession(CFriend* Friend)
+void CFriendList::StartChatSession(CFriend *Friend)
 {
 	if (Friend) {
-		CUpDownClient* client = Friend->GetLinkedClient().GetClient();
-		if (!client) {
-			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->LinkClient(CCLIENTREF(client, "CFriendList::StartChatSession"));
+		if (!Friend->GetLinkedClient().GetClient()) {
+			// Same order as browsing: ask first, so a hash we already hold a
+			// client for still resolves.
+			CClientRef ref = theApp->clientlist->CreateForAddress(
+				Friend->GetUserHash(), Friend->GetIP(), Friend->GetPort(), Friend->GetName());
+			if (!ref.IsLinked()) {
+				// Reported by the caller, which is also the one that knows
+				// whether the chat tab could be opened afterwards.
+				return;
+			}
+			Friend->LinkClient(ref);
 		}
 	} else {
 		AddLogLineC(_("CRITICAL - no client on StartChatSession"));
 	}
-
 }
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/FriendList.h -> amule-3.1.0.tar.gz/src/FriendList.h Changed

@@ -26,8 +26,7 @@
 #ifndef FRIENDLIST_H
 #define FRIENDLIST_H
 
-
-#include "Types.h"	// Needed for uint32
+#include "Types.h" // Needed for uint32
 
 class wxString;
 class CFriend;
@@ -36,46 +35,102 @@
 
 class CFriendList
 {
-	typedef std::list<CFriend*> FriendList;
+	typedef std::list<CFriend *> FriendList;
+
 public:
 	CFriendList();
 	~CFriendList();
 
-	bool		IsAlreadyFriend(uint32 dwLastUsedIP, uint32 nLastUsedPort);
-	void		SaveList();
-	void		LoadList();
-	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);
+	bool IsAlreadyFriend(uint32 dwLastUsedIP, uint32 nLastUsedPort);
+	/**
+	 * Writes emfriends.met, unless a batch is open.
+	 *
+	 * Every add and remove saves, so a bulk operation over a large selection rewrites the whole
+	 * file once per friend, on the GUI thread, with the file growing as it goes. Opening a
+	 * batch defers the write to the end of it, which is transparent to every existing caller.
+	 */
+	void SaveList();
+
+	//! Defer SaveList() until the matching EndBatch(). Nestable.
+	void BeginBatch();
+	void EndBatch();
+	void LoadList();
+	/**
+	 * Looks a friend up without altering the list.
+	 *
+	 * Use this whenever the answer only informs a decision, such as enabling a menu entry.
+	 * FindFriend() adopts the hash onto an address-only record and saves the file, which is
+	 * wrong as a side effect of a query.
+	 */
+	CFriend *LookupFriend(const CMD4Hash &userhash, uint32 dwIP, uint16 nPort) const;
+
+	/**
+	 * As LookupFriend(), but a match found by address that carries no hash yet adopts the one
+	 * passed in, and the list is saved.
+	 */
+	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);
+	// browseSearchId != 0 pins an EC-allocated browse ("View Files") search ID on the friend's
+	// client so ProcessSharedFileList files the listing under it.
+	//! What a browse request did, so a caller can tell the reasons apart.
+	enum class BrowseResult
+	{
+		Started,        //!< The request went out under the id given.
+		AlreadyRunning, //!< This peer is mid-browse; join that one instead.
+		Unreachable     //!< No client and no address to build one from.
+	};
 
-	void		SetFriendSlot(CFriend* Friend, bool new_state);
-	void		StartChatSession(CFriend* Friend);
-	void		RemoveAllFriendSlots();
+	/**
+	 * Asks a friend for its shared files.
+	 *
+	 * False when there is nobody to ask: no client is held for the friend and its record
+	 * carries no address to build one from. The caller owns any browse id it allocated and has
+	 * to release it, or the search sits pending forever with nothing to terminate it.
+	 */
+	BrowseResult RequestSharedFileList(CFriend *cur_friend, uint32 browseSearchId = 0);
+
+	void SetFriendSlot(CFriend *Friend, bool new_state);
+	void StartChatSession(CFriend *Friend);
+	void RemoveAllFriendSlots();
 
 	// Iterator class
-	class const_iterator {
+	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; };
+		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; }
+		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()); }
 
-
 private:
+	//! Nesting depth of BeginBatch()/EndBatch(), and whether one was skipped.
+	unsigned m_batchDepth = 0;
+	bool m_savePending = false;
+
 	FriendList m_FriendList;
 };

amule-3.0.1.tar.gz/src/FriendListCtrl.cpp -> amule-3.1.0.tar.gz/src/FriendListCtrl.cpp Changed

@@ -23,25 +23,28 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include "FriendListCtrl.h" // Interface declarations
 
-#include "FriendListCtrl.h"	// Interface declarations
+#include <vector> // Needed for std::vector (snapshot of selected friends)
 
 #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 "Friend.h"		// Needed for CFriend
+#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 "Friend.h"             // Needed for CFriend
+#include "SearchDlg.h"          // Needed for CSearchDlg (View Files browse tab)
 #include "muuli_wdr.h"
 #include "SafeFile.h"
-#include "FriendList.h"		// Needed for the friends list
+#include "FriendList.h" // Needed for the friends list
+#include "Logger.h"     // Needed for AddLogLineC
 
-wxBEGIN_EVENT_TABLE(CFriendListCtrl, CMuleListCtrl)
-	EVT_RIGHT_DOWN(CFriendListCtrl::OnRightClick)
-	EVT_LIST_ITEM_ACTIVATED(ID_FRIENDLIST, CFriendListCtrl::OnItemActivated)
+wxBEGIN_EVENT_TABLE(CFriendListCtrl, CMuleVirtualDataViewCtrl)
+	EVT_DATAVIEW_ITEM_CONTEXT_MENU(wxID_ANY, CFriendListCtrl::OnItemRightClicked)
+	EVT_DATAVIEW_ITEM_ACTIVATED(wxID_ANY, CFriendListCtrl::OnItemActivated)
 
 	EVT_MENU(MP_MESSAGE, CFriendListCtrl::OnSendMessage)
 	EVT_MENU(MP_REMOVEFRIEND, CFriendListCtrl::OnRemoveFriend)
@@ -49,210 +52,268 @@
 	EVT_MENU(MP_DETAIL, CFriendListCtrl::OnShowDetails)
 	EVT_MENU(MP_SHOWLIST, CFriendListCtrl::OnViewFiles)
 	EVT_MENU(MP_FRIENDSLOT, CFriendListCtrl::OnSetFriendslot)
-
-	EVT_CHAR(CFriendListCtrl::OnKeyPressed)
 wxEND_EVENT_TABLE()
 
-
-CFriendListCtrl::CFriendListCtrl(wxWindow* parent, int id, const wxPoint& pos, wxSize siz, int flags)
-: CMuleListCtrl(parent, id, pos, siz, flags)
+CFriendListCtrl::CFriendListCtrl(wxWindow *parent, int id, const wxPoint &pos, wxSize siz, int flags)
+: CMuleVirtualDataViewCtrl(parent, id, pos, siz, flags)
 {
-  // Column gets a one-letter name so CMuleListCtrl::SaveSettings has
-  // something to write under /eMule/TableWidthsFriend. Without it the
-  // base-class persistence path short-circuits at "if (!m_name.IsEmpty())"
-  // -- the dtor would never have a column to record.
-  InsertColumn(0, _("Username"), wxLIST_FORMAT_LEFT, siz.GetWidth() - 4, "N");
-  SetTableName("Friend");
-  LoadSettings();
+	AddTextColumn(_("Username"),
+		COLUMN_FRIEND_NAME,
+		"N",
+		siz.GetWidth() - 4,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+
+	// Absorbs the macOS trailing-column sizing; the model answers any column
+	// past the real one with an empty value.
+	AppendSpacerColumn(COLUMN_FRIEND_SPACER);
+	AssociateVirtualModel();
+
+	// One-letter name so CListColumnStore has something to write under
+	// /eMule/TableWidthsFriend.
+
+	ApplySorting(COLUMN_FRIEND_NAME, 0);
+
+	m_columnStore.SetTableName("Friend");
+	LoadColumnSettings();
+	InitColumnState();
 }
 
-CFriendListCtrl::~CFriendListCtrl()
-{
-}
+CFriendListCtrl::~CFriendListCtrl() {}
 
-
-void CFriendListCtrl::RemoveFriend(CFriend* toremove)
+void CFriendListCtrl::RemoveFriend(CFriend *toremove)
 {
 	if (!toremove) {
 		return;
 	}
 
-	sint32 itemnr = FindItem(-1, reinterpret_cast<wxUIntPtr>(toremove));
-
-	if ( itemnr == -1 )
-		return;
-
-	DeleteItem(itemnr);
+	const wxUIntPtr ptr = reinterpret_cast<wxUIntPtr>(toremove);
+	if (HasItemData(ptr)) {
+		RemoveItemData(ptr);
+	}
 }
 
-
-void CFriendListCtrl::UpdateFriend(CFriend* toupdate)
+void CFriendListCtrl::UpdateFriend(CFriend *toupdate)
 {
 	if (!toupdate) {
 		return;
 	}
 
-	sint32 itemnr = FindItem(-1, reinterpret_cast<wxUIntPtr>(toupdate));
-	if (itemnr == -1) {
-		itemnr = InsertItem(GetItemCount(), "");
-		SetItemPtrData(itemnr, reinterpret_cast<wxUIntPtr>(toupdate));
+	const wxUIntPtr ptr = reinterpret_cast<wxUIntPtr>(toupdate);
+	if (HasItemData(ptr)) {
+		// The cell is rendered from the friend on demand, so a refresh is just a repaint,
+		// plus a re-sort if the name changed under a name-sorted list.
+		RefreshItemData(ptr);
+	} else {
+		AddItemData(ptr);
 	}
+}
 
-	SetItem(itemnr, 0, toupdate->GetName());
-	// Linked friends stay visually distinguished in blue; unlinked
-	// ones must follow the system text color so they don't render
-	// invisible on dark themes (#640).
-	SetItemTextColour(itemnr, toupdate->GetLinkedClient().IsLinked()
-		? *wxBLUE
-		: wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+wxString CFriendListCtrl::GetItemColumnText(wxUIntPtr item, unsigned column) const
+{
+	if (column != COLUMN_FRIEND_NAME) {
+		return wxEmptyString;
+	}
+	return reinterpret_cast<const CFriend *>(item)->GetName();
 }
 
+bool CFriendListCtrl::GetItemAttr(wxUIntPtr item, unsigned WXUNUSED(column), wxDataViewItemAttr &attr) const
+{
+	// Linked friends stay visually distinguished in blue; unlinked ones fall back to the
+	// default system text colour so they do not render invisible on dark themes (#640).
+	const CFriend *cur_friend = reinterpret_cast<const CFriend *>(item);
+	if (cur_friend->GetLinkedClient().IsLinked()) {
+		attr.SetColour(*wxBLUE);
+		return true;
+	}
+	return false;
+}
 
-void CFriendListCtrl::OnItemActivated(wxListEvent& WXUNUSED(event))
+int CFriendListCtrl::CompareItemData(
+	wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool WXUNUSED(alt), int modifier) const
 {
-	int cursel = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	if (column != COLUMN_FRIEND_NAME) {
+		return 0;
+	}
+	const CFriend *f1 = reinterpret_cast<const CFriend *>(data1);
+	const CFriend *f2 = reinterpret_cast<const CFriend *>(data2);
+	return modifier * f1->GetName().CmpNoCase(f2->GetName());
+}
 
-	CFriend* cur_friend = reinterpret_cast<CFriend*>(GetItemData(cursel));
+void CFriendListCtrl::OnItemActivated(wxDataViewEvent &event)
+{
+	// Open a session with the activated row alone, whatever else was selected.
+	// event.GetItem()'s ID is the row-addressed model's row index, not the item data, so the
+	// friend has to be resolved through the selection rather than cast directly from the item.
+	if (event.GetItem().IsOk()) {
+		UnselectAll();
+		Select(event.GetItem());
+	}
 
-	/* ignore this one, it is not activated anymore :) */
-	if (cur_friend == NULL) {
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	if (selected.empty()) {
 		return;
 	}
 
-	theApp->amuledlg->m_chatwnd->StartSession(cur_friend);
-
+	MessageFriend(reinterpret_cast<CFriend *>(selected.front()));
 }
 
-
-void CFriendListCtrl::OnRightClick(wxMouseEvent& event)
+void CFriendListCtrl::OnItemRightClicked(wxDataViewEvent &event)
 {
-	int cursel = CheckSelection(event);
+	// Right-clicking a row outside the selection acts on that row alone.
+	if (event.GetItem().IsOk()) {
+		wxDataViewItemArray selection;
+		GetSelections(selection);
+		if (selection.Index(event.GetItem()) == wxNOT_FOUND) {
+			UnselectAll();
+			Select(event.GetItem());
+		}
+	}
 
-	CFriend* cur_friend = NULL;
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	CFriend *cur_friend = selected.empty() ? nullptr : reinterpret_cast<CFriend *>(selected.front());
 
-	wxMenu* menu = new wxMenu(_("Friends"));
+	wxMenu *menu = new wxMenu(_("Friends"));
 
-	if ( cursel != -1 ) {
-		cur_friend = reinterpret_cast<CFriend*>(GetItemData(cursel));
+	if (cur_friend) {
 		menu->Append(MP_DETAIL, _("Show &Details"));
 		menu->Enable(MP_DETAIL, cur_friend->GetLinkedClient().IsLinked());
 	}
 
 	menu->Append(MP_ADDFRIEND, _("Add a friend"));
 
-	if (cursel != (-1)) {
+	if (cur_friend) {
 		menu->Append(MP_REMOVEFRIEND, _("Remove Friend"));
 		menu->Append(MP_MESSAGE, _("Send &Message"));
 		menu->Append(MP_SHOWLIST, _("View Files"));
+		// No connection gate: the slot is a property of the CFriend record, not of a live
+		// session. CFriendList::SetFriendSlot persists it and only additionally pokes the
+		// live client when one is linked, and CFriend::LinkClient applies the stored flag
+		// when the friend reconnects -- so granting it in advance to an offline friend is
+		// the case it is most useful for.
 		menu->AppendCheckItem(MP_FRIENDSLOT, _("Establish Friend Slot"));
-		if (cur_friend->GetLinkedClient().IsLinked()) {
-			menu->Enable(MP_FRIENDSLOT, true);
-			menu->Check(MP_FRIENDSLOT, cur_friend->HasFriendSlot());
-		} else {
-			menu->Enable(MP_FRIENDSLOT, false);
-		}
+		menu->Check(MP_FRIENDSLOT, cur_friend->HasFriendSlot());
 	}
 
 	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 ) {
-		CFriend* cur_friend = reinterpret_cast<CFriend*>(GetItemData(index));
-		theApp->amuledlg->m_chatwnd->StartSession(cur_friend);
-		//#warning CORE/GUI!
-		#ifndef CLIENT_GUI
-		theApp->friendlist->StartChatSession(cur_friend);
-		#endif
-
-		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+void CFriendListCtrl::MessageFriend(CFriend *cur_friend)
+{
+	if (cur_friend == nullptr) {
+		return;
+	}
+// #warning CORE/GUI!
+#ifndef CLIENT_GUI
+	// Resolve the peer before opening the tab, not after: this finds a client we already hold
+	// for the friend's hash even when the record carries no address, and CFriend::LinkClient
+	// then writes that address back to the record, which is what the tab is keyed on.
+	theApp->friendlist->StartChatSession(cur_friend);
+#endif
+	if (!theApp->amuledlg->m_chatwnd->StartSession(cur_friend)) {
+		AddLogLineC(CFormat(_("No address known for friend '%s' yet, cannot message them.")) %
+			    cur_friend->GetName());
 	}
 }
 
+void CFriendListCtrl::OnSendMessage(wxCommandEvent &WXUNUSED(event))
+{
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		MessageFriend(reinterpret_cast<CFriend *>(data));
+	}
+}
 
-void CFriendListCtrl::OnRemoveFriend(wxCommandEvent& WXUNUSED(event))
+void CFriendListCtrl::OnRemoveFriend(wxCommandEvent &WXUNUSED(event))
 {
 	wxString question;
-	if (GetSelectedItemCount() == 1) {
+	if (GetSelectedItemsCount() == 1) {
 		question = _("Are you sure that you wish to delete the selected friend?");
 	} else {
 		question = _("Are you sure that you wish to delete the selected friends?");
 	}
 
-	if ( wxMessageBox( question, _("Cancel"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this) == wxYES ) {
-		long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	if (wxMessageBox(question, _("Cancel"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this) == wxYES) {
+		// Collect the selected friends first, then remove them. On amuleGUI RemoveFriend()
+		// is asynchronous -- it only sends an EC request, and the row is dropped when the
+		// daemon pushes the updated list -- so the removed friend is still selected when it
+		// returns. Re-querying the selection in the loop would keep finding the same friend
+		// and resend forever, in a tight loop that never yields to process the update.
+		const std::vector<wxUIntPtr> selected = GetSelectedItemData();
 
-		while( index != -1 ) {
-			CFriend* cur_friend = reinterpret_cast<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 );
+		for (wxUIntPtr data : selected) {
+			theApp->friendlist->RemoveFriend(reinterpret_cast<CFriend *>(data));
 		}
 	}
 }
 
-
-void CFriendListCtrl::OnAddFriend(wxCommandEvent& WXUNUSED(event))
+void CFriendListCtrl::OnAddFriend(wxCommandEvent &WXUNUSED(event))
 {
 	CAddFriend(this).ShowModal();
 }
 
-
-void CFriendListCtrl::OnShowDetails(wxCommandEvent& WXUNUSED(event))
+void CFriendListCtrl::OnShowDetails(wxCommandEvent &WXUNUSED(event))
 {
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-
-	while( index != -1 ) {
-		CFriend* cur_friend = reinterpret_cast<CFriend*>(GetItemData(index));
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CFriend *cur_friend = reinterpret_cast<CFriend *>(data);
 		if (cur_friend->GetLinkedClient().IsLinked()) {
 			CClientDetailDialog(this, cur_friend->GetLinkedClient()).ShowModal();
 		}
-		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	}
-
 }
 
-
-void CFriendListCtrl::OnViewFiles(wxCommandEvent& WXUNUSED(event))
+void CFriendListCtrl::OnViewFiles(wxCommandEvent &WXUNUSED(event))
 {
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-
-	while( index != -1 ) {
-		CFriend* cur_friend = reinterpret_cast<CFriend*>(GetItemData(index));
-		theApp->friendlist->RequestSharedFileList(cur_friend);
-		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CFriend *cur_friend = reinterpret_cast<CFriend *>(data);
+		// If this friend's listing is already open in the Search panel, switch to that tab
+		// rather than re-requesting, which would duplicate the results.
+		//
+		// Which ECID keys that tab depends on who opened it, so both are tried: the
+		// monolithic opens it from Notify_Browse_Started, carrying the browsed CLIENT's
+		// ECID, while amulegui opens it from SendBrowseRequest with only the FRIEND's -- a
+		// friend need not be linked to a client when the browse is asked for. Matching on
+		// the client alone never found amulegui's tab.
+		CSearchDlg *const searchwnd = theApp->amuledlg ? theApp->amuledlg->m_searchwnd : nullptr;
+		const CClientRef &linked = cur_friend->GetLinkedClient();
+		const uint32 clientEcid = linked.IsLinked() ? linked.ECID() : 0;
+		if (!(searchwnd && (searchwnd->ActivateBrowseTabIfOpen(clientEcid) ||
+					   searchwnd->ActivateBrowseTabIfOpen(cur_friend->ECID())))) {
+			theApp->friendlist->RequestSharedFileList(cur_friend);
+		}
 	}
-
 }
 
-
-void CFriendListCtrl::OnSetFriendslot(wxCommandEvent& event)
+void CFriendListCtrl::OnSetFriendslot(wxCommandEvent &event)
 {
-	// Get item
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	CFriend* cur_friend = reinterpret_cast<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"), wxOK | wxICON_ERROR, this);
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	if (selected.empty()) {
+		return;
 	}
-}
 
+	theApp->friendlist->SetFriendSlot(reinterpret_cast<CFriend *>(selected.front()), event.IsChecked());
+
+	if (selected.size() > 1) {
+		wxMessageBox(_("You are not allowed to set more than one friendslot.\n Only one slot was "
+			       "assigned."),
+			_("Multiple selection"),
+			wxOK | wxICON_ERROR,
+			this);
+	}
+}
 
-void CFriendListCtrl::OnKeyPressed(wxKeyEvent& event)
+bool CFriendListCtrl::OnListKey(wxKeyEvent &event)
 {
-	// Check if delete was pressed
+	// Delete removes the selected friends; everything else belongs to the
+	// control's own navigation.
 	if ((event.GetKeyCode() == WXK_DELETE) || (event.GetKeyCode() == WXK_NUMPAD_DELETE)) {
-		if (GetItemCount()) {
+		if (ItemDataCount()) {
 			wxCommandEvent evt;
-			evt.SetId( MP_REMOVEFRIEND );
-			OnRemoveFriend( evt );
+			evt.SetId(MP_REMOVEFRIEND);
+			OnRemoveFriend(evt);
 		}
-	} else {
-		event.Skip();
+		return true;
 	}
+	return false;
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/FriendListCtrl.h -> amule-3.1.0.tar.gz/src/FriendListCtrl.h Changed

@@ -26,37 +26,64 @@
 #ifndef FRIENDLISTCTRL_H
 #define FRIENDLISTCTRL_H
 
-#include "MuleListCtrl.h"
+#include "MuleVirtualDataViewCtrl.h" // Needed for CMuleVirtualDataViewCtrl
 #include "MD4Hash.h"
 
+#define COLUMN_FRIEND_NAME 0
+//! Always empty. Absorbs the macOS trailing-column sizing; see
+//! CMuleDataViewCtrl::AppendSpacerColumn().
+#define COLUMN_FRIEND_SPACER 1
+
 class wxString;
 class CFriend;
 
-class CFriendListCtrl : public CMuleListCtrl
+class CFriendListCtrl : public CMuleVirtualDataViewCtrl
 {
 public:
-	CFriendListCtrl(wxWindow* parent, int id, const wxPoint& pos, wxSize siz, int flags);
+	CFriendListCtrl(wxWindow *parent, int id, const wxPoint &pos, wxSize siz, int flags);
 	~CFriendListCtrl();
 
-	void		UpdateFriend(CFriend* toupdate);
-	void		RemoveFriend(CFriend* todel);
+	void UpdateFriend(CFriend *toupdate);
+	void RemoveFriend(CFriend *todel);
 
 protected:
+	/// Text of the one real column, pulled on demand for the rows being drawn.
+	wxString GetItemColumnText(wxUIntPtr item, unsigned column) const override;
+
+	/// Blue for a linked friend, default text colour for the rest.
+	bool GetItemAttr(wxUIntPtr item, unsigned column, wxDataViewItemAttr &attr) const override;
+
+	/// Case-insensitive name comparison for the base's sort chain.
+	int CompareItemData(
+		wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool alt, int modifier) const override;
+
+	/// The name is the only column, and it can change after insertion -- a friend arrives
+	/// before its name does -- so a refresh may need to move the row under a name sort.
+	bool IsLiveSortColumn() const override { return true; }
+
+	/**
+	 * Delete removes the selected friends; see CMuleDataViewCtrl::OnListKey.
+	 */
+	bool OnListKey(wxKeyEvent &event) override;
+
 	wxDECLARE_EVENT_TABLE();
 
-	void	OnRightClick(wxMouseEvent& event);
+	void OnItemRightClicked(wxDataViewEvent &event);
 
 private:
-	void	OnItemActivated(wxListEvent& event);
+	void OnItemActivated(wxDataViewEvent &event);
+
+	//! Open a chat with a friend, reporting the reason when there is no
+	//! address to reach them on yet. Shared by double-click and the menu.
+	void MessageFriend(CFriend *cur_friend);
 
 	// Menu Items
-	void	OnShowDetails(wxCommandEvent& event);
-	void	OnSendMessage(wxCommandEvent& event);
-	void	OnRemoveFriend(wxCommandEvent& event);
-	void	OnSetFriendslot(wxCommandEvent& event);
-	void	OnAddFriend(wxCommandEvent& event);
-	void	OnViewFiles(wxCommandEvent& event);
-	void	OnKeyPressed(wxKeyEvent& event);
+	void OnShowDetails(wxCommandEvent &event);
+	void OnSendMessage(wxCommandEvent &event);
+	void OnRemoveFriend(wxCommandEvent &event);
+	void OnSetFriendslot(wxCommandEvent &event);
+	void OnAddFriend(wxCommandEvent &event);
+	void OnViewFiles(wxCommandEvent &event);
 };
 
 #endif

amule-3.0.1.tar.gz/src/GapList.cpp -> amule-3.1.0.tar.gz/src/GapList.cpp Changed

@@ -22,16 +22,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include "Types.h"
-#include <protocol/ed2k/Constants.h>	// for PARTSIZE
+#include <protocol/ed2k/Constants.h> // for PARTSIZE
 #include "GapList.h"
 
 #include "Logger.h"
 #include <common/Format.h>
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1800) 
-#include <algorithm> // for std::min and std::max 
+#if defined(_MSC_VER) && (_MSC_VER >= 1800)
+#include <algorithm> // for std::min and std::max
 #endif
 
 void CGapList::Init(uint64 fileSize, bool isEmpty)
@@ -40,8 +39,7 @@
 	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
+	if (m_sizeLastPart == 0 && fileSize) { // that's only for pre-init in ctor
 		m_sizeLastPart = PARTSIZE;
 		m_iPartCount--;
 	}
@@ -58,15 +56,12 @@
 	m_totalGapSizeValid = true;
 }
 
-
 void CGapList::AddGap(uint64 gapstart, uint64 gapend)
 {
 	if (!ArgCheck(gapstart, gapend)) {
 		return;
 	}
 
-//	AddDebugLogLineN(logPartFile, CFormat("  AddGap: %5d - %5d") % gapstart % gapend);
-
 	// mark involved part(s) as incomplete
 	uint16 partlast = gapend / PARTSIZE;
 	for (uint16 part = gapstart / PARTSIZE; part <= partlast; part++) {
@@ -75,14 +70,13 @@
 	// 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)
+	// Find a place to start: the first gap ending >= our gap start - 1, the -1 so adjacent gaps
+	// can be joined.
 	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;
+		uint64 curGapEnd = it2->first;
 
 		if (curGapStart >= gapstart && curGapEnd <= gapend) {
 			// this gap is inside the new gap - delete
@@ -100,7 +94,7 @@
 		} else if (curGapStart <= gapstart && curGapEnd >= gapend) {
 			// new gap is already inside this gap - return
 			return;
-		// now all cases of overlap are ruled out
+			// 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;
@@ -111,7 +105,7 @@
 	if (it != m_gaplist.begin()) {
 		--it;
 	}
-	m_gaplist.insert(it, std::pair<uint64,uint64>(gapend, gapstart));
+	m_gaplist.insert(it, std::pair<uint64, uint64>(gapend, gapstart));
 }
 
 void CGapList::AddGap(uint16 part)
@@ -132,8 +126,6 @@
 		return;
 	}
 
-//	AddDebugLogLineN(logPartFile, CFormat("  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++) {
@@ -148,15 +140,16 @@
 	while (it != m_gaplist.end()) {
 		iterator it2 = it++;
 		uint64 curGapStart = it2->second;
-		uint64 curGapEnd   = it2->first;
+		uint64 curGapEnd = it2->first;
 
 		if (curGapStart >= partstart) {
 			if (curGapEnd <= partend) {
 				// our part fills this gap completely
 				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)
+				// The lower part of this gap is in the part, so shrink the 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;
@@ -167,16 +160,16 @@
 		} 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
+				// 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));
+				m_gaplist.insert(it3, std::pair<uint64, uint64>(partstart - 1, curGapStart));
 				// we're done
 				break;
 			} else if (curGapEnd >= partstart) {
@@ -186,7 +179,7 @@
 				if (it3 != m_gaplist.begin()) {
 					--it3;
 				}
-				m_gaplist.insert(it3, std::pair<uint64,uint64>(partstart - 1, curGapStart));
+				m_gaplist.insert(it3, std::pair<uint64, uint64>(partstart - 1, curGapStart));
 				// and delete the old one
 				m_gaplist.erase(it2);
 			}
@@ -232,7 +225,7 @@
 	ListType::const_iterator it = m_gaplist.lower_bound(uRangeStart);
 	for (; it != m_gaplist.end(); ++it) {
 		uint64 curGapStart = it->second;
-		uint64 curGapEnd   = it->first;
+		uint64 curGapEnd = it->first;
 
 		if (curGapStart <= uRangeStart && curGapEnd >= uRangeEnd) {
 			// total range is in this gap
@@ -252,7 +245,7 @@
 		}
 	}
 
-	wxASSERT( uTotalGapSize <= uRangeEnd - uRangeStart + 1 );
+	wxASSERT(uTotalGapSize <= uRangeEnd - uRangeStart + 1);
 	return uTotalGapSize;
 }
 
@@ -267,12 +260,12 @@
 	ListType::const_iterator it = m_gaplist.lower_bound(gapstart);
 	for (; it != m_gaplist.end(); ++it) {
 		uint64 curGapStart = it->second;
-		uint64 curGapEnd   = it->first;
+		uint64 curGapEnd = it->first;
 
-		if (  (curGapStart >= gapstart    && curGapEnd   <= gapend)
-			||(curGapStart >= gapstart    && curGapStart <= gapend)
-			||(curGapEnd   <= gapend      && curGapEnd   >= gapstart)
-			||(gapstart    >= curGapStart && gapend      <= curGapEnd)) {
+		if ((curGapStart >= gapstart && curGapEnd <= gapend) ||
+			(curGapStart >= gapstart && curGapStart <= gapend) ||
+			(curGapEnd <= gapend && curGapEnd >= gapstart) ||
+			(gapstart >= curGapStart && gapend <= curGapEnd)) {
 			return false;
 		}
 		if (curGapStart > gapend) {
@@ -284,19 +277,18 @@
 
 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).
+	// There is a bug in the ED2K protocol: for files of size n * PARTSIZE one part too many is
+	// transmitted in the availability bitfield. Allow completion detection of this dummy part,
+	// and always report it as complete so it does not get asked for.
 	if (part == m_iPartCount && m_sizeLastPart == PARTSIZE) {
 		return true;
 	}
-// Remaining error check
+	// Remaining error check
 	if (part >= m_iPartCount) {
 		wxFAIL;
 		return false;
 	}
-	ePartComplete status = (ePartComplete) m_partsCompletepart;
+	ePartComplete status = (ePartComplete)m_partsCompletepart;
 	if (status == unknown) {
 		uint64 partstart = part * PARTSIZE;
 		uint64 partend = partstart + GetPartSize(part) - 1;
@@ -317,7 +309,7 @@
 	// gaps shouldn't go past file anymore either
 	if (gapend >= m_filesize) {
 		wxFAIL;
-		gapend = m_filesize - 1;	// fix it
+		gapend = m_filesize - 1; // fix it
 	}
 	return true;
 }

amule-3.0.1.tar.gz/src/GapList.h -> amule-3.1.0.tar.gz/src/GapList.h Changed

@@ -27,12 +27,11 @@
 
 #include <map>
 
-class CGapList {
+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;
+	// The internal gap list. Each gap is a map entry: the key is the end, the 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
@@ -47,7 +46,8 @@
 	bool m_totalGapSizeValid;
 
 	// cache completeness of parts
-	enum ePartComplete {
+	enum ePartComplete
+	{
 		complete,
 		incomplete,
 		unknown
@@ -58,6 +58,7 @@
 	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 >:(
@@ -88,25 +89,31 @@
 
 	// Iterator class to loop through the gaps read-only
 	// Gaps are returned just as start/end value
-	class const_iterator {
+	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) { };
+		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; }
+		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; }
+		uint64 start() const { return (*m_it).second; }
 		// get end of gap pointed to
-		uint64 end() const { return (* m_it).first; }
+		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

amule-3.0.1.tar.gz/src/GenericClientListCtrl.cpp -> amule-3.1.0.tar.gz/src/GenericClientListCtrl.cpp Changed

@@ -26,113 +26,107 @@
 #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 <common/Format.h> // Needed for CFormat
+#include "amule.h"         // Needed for theApp
+#include "amuleDlg.h"      // Needed for CamuleDlg
+#include "SearchDlg.h"     // Needed for CSearchDlg (View Files browse tab)
+#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 GetTickCount64
-#include "GuiEvents.h"		// Needed for CoreNotify_*
-#ifdef ENABLE_IP2COUNTRY
-	#include "IP2Country.h"	// Needed for IP2Country
+#include "ClientDetailDialog.h"   // Needed for CClientDetailDialog
+#include "ClientContextActions.h" // Needed for BuildClientContextMenu, ClientAction*
+#include "ClientNameCell.h"       // Needed for MakeClientNameCell, DrawClientNameCell
+#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 "GuiEvents.h"            // Needed for CoreNotify_*
+#ifdef GEOIP_GUI
+#include "CountryFlags.h"   // Needed for CCountryFlags (flag bitmaps)
+#include "CountryDisplay.h" // Needed for GetDisplayCountryCode
 #endif
-#include "muuli_wdr.h"		// Needed for ID_DLOADLIST
-#include "PartFile.h"		// Needed for CPartFile
+#include "MuleBarRenderer.h" // Needed for CBarFillSpec, CBarFillSpan, CMuleBarRenderer
+#include "MuleColour.h"      // Needed for IsListBackgroundDark
+#include "muuli_wdr.h"       // Needed for ID_CLIENTCOUNT
+#include "PartBarLegendUI.h" // Needed for ShowPartBarLegend, ToMuleColour
+#include "PartFile.h"        // Needed for CPartFile
 #include "Preferences.h"
-#include "SharedFileList.h"	// Needed for CSharedFileList
-#include "ClientRef.h"		// Needed for CClientRef
+#include "SharedFileList.h" // Needed for CSharedFileList
+#include "ClientRef.h"      // Needed for CClientRef
+// CUpDownClient (country accessors, #439). MUST match the build's client class: the reduced EC
+// client for amulegui, the full one for monolithic. The wrong header gives this TU a different
+// CUpDownClient layout than the rest of the GUI, so member reads land at the wrong offset.
+#ifdef CLIENT_GUI
+#include "UpDownClientEC.h"
+#else
+#include "updownclient.h"
+#endif
 #include "FriendList.h"
 
-struct ClientCtrlItem_Struct
+namespace
 {
-	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;
+/**
+ * Renders the User Name column.
+ *
+ * Not a literal bar -- this reuses CMuleBarRenderer's identity-carrying
+ * CBarFillSpec/GetItemBarFill() extension point (see CBarFillSpec::GetIdentity()) to reach the
+ * row's ClientCtrlItem_Struct, the same way CDownloadBarRenderer reaches its CPartFile*. Registered
+ * via AddBarColumn() rather than growing a new column-registration entry point for a single, list-
+ * local column.
+ *
+ * The drawing itself lives in DrawClientNameCell(), shared with the global clients list so the two
+ * cannot drift apart.
+ */
+class CClientNameRenderer : public CMuleBarRenderer
+{
+public:
+	bool Render(wxRect cell, wxDC *dc, int WXUNUSED(state)) override
+	{
+		ClientCtrlItem_Struct *item =
+			reinterpret_cast<ClientCtrlItem_Struct *>(GetSpec().GetIdentity());
+		if (item == nullptr) {
+			return true;
+		}
+		// Read straight off the live CClientRef: this list holds an owning reference to
+		// every peer it shows, so the client is alive for as long as the row is.
+		DrawClientNameCell(
+			MakeClientNameCell(item->GetSource().GetClient(), item->GetType() == A4AF_SOURCE),
+			cell,
+			dc);
+		return true;
 	}
-
-	void SetType(SourceItemType type) { m_type = type; }
-
-	uint64		dwUpdated;
-	wxBitmap*	status;
-
-private:
-	CKnownFile*		m_owner;
-	CClientRef		m_sourceValue;
-	SourceItemType	m_type;
 };
+} // namespace
 
 #define m_ImageList theApp->amuledlg->m_imagelist
 
-wxBEGIN_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 )
+wxBEGIN_EVENT_TABLE(CGenericClientListCtrl, CMuleVirtualDataViewCtrl)
+	EVT_DATAVIEW_ITEM_ACTIVATED(wxID_ANY, CGenericClientListCtrl::OnItemActivated)
+	EVT_DATAVIEW_ITEM_CONTEXT_MENU(wxID_ANY, CGenericClientListCtrl::OnItemRightClicked)
+	EVT_MIDDLE_DOWN(CGenericClientListCtrl::OnMouseMiddleClick)
+
+	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)
+	EVT_MENU(MP_BARLEGEND, CGenericClientListCtrl::OnShowBarLegend)
 wxEND_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)
+CGenericClientListCtrl::CGenericClientListCtrl(const wxString &tablename,
+	wxWindow *parent,
+	wxWindowID winid,
+	const wxPoint &pos,
+	const wxSize &size,
+	long style,
+	const wxString &name)
+: CMuleVirtualDataViewCtrl(parent, winid, pos, size, style, name)
+, m_columndata(0, nullptr)
+, m_menu(nullptr)
+, m_clientcount(0)
+, m_showing(false)
 {
-	// 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_highlightBrush  = CMuleColour(wxSYS_COLOUR_HIGHLIGHT)/*.Blend(125)*/.GetBrush();
-
-	m_highlightUnfocusBrush = CMuleColour(CMuleColour::GetUnfocusedHighlight()).GetBrush();
-
-	m_clientcount = 0;
+	m_columnStore.SetTableName(tablename);
 }
 
 wxString CGenericClientListCtrl::TranslateCIDToName(GenericColumnEnum cid)
@@ -140,163 +134,214 @@
 	wxString name;
 
 	switch (cid) {
-		case ColumnUserName:
-			name = "N";
-			break;
-		case ColumnUserDownloaded:
-			name = "D";
-			break;
-		case ColumnUserUploaded:
-			name = "U";
-			break;
-		case ColumnUserSpeedDown:
-			name = "S";
-			break;
-		case ColumnUserSpeedUp:
-			name = "s";
-			break;
-		case ColumnUserProgress:
-			name = "P";
-			break;
-		case ColumnUserAvailable:
-			name = "A";
-			break;
-		case ColumnUserVersion:
-			name = "V";
-			break;
-		case ColumnUserQueueRankLocal:
-			name = "Q";
-			break;
-		case ColumnUserQueueRankRemote:
-			name = "q";
-			break;
-		case ColumnUserOrigin:
-			name = "O";
-			break;
-		case ColumnUserFileNameDownload:
-			name = "F";
-			break;
-		case ColumnUserFileNameUpload:
-			name = "f";
-			break;
-		case ColumnUserFileNameDownloadRemote:
-			name = "R";
-			break;
-		case ColumnUserSharedFiles:
-			name = "m";
-			break;
-		case ColumnInvalid:
-		default:
-			wxFAIL;
-			break;
+	case ColumnUserName:
+		name = "N";
+		break;
+	case ColumnUserDownloaded:
+		name = "D";
+		break;
+	case ColumnUserUploaded:
+		name = "U";
+		break;
+	case ColumnUserSpeedDown:
+		name = "S";
+		break;
+	case ColumnUserSpeedUp:
+		name = "s";
+		break;
+	case ColumnUserProgress:
+		name = "P";
+		break;
+	case ColumnUserAvailable:
+		name = "A";
+		break;
+	case ColumnUserVersion:
+		name = "V";
+		break;
+	case ColumnUserQueueRankLocal:
+		name = "Q";
+		break;
+	case ColumnUserQueueRankRemote:
+		name = "q";
+		break;
+	case ColumnUserOrigin:
+		name = "O";
+		break;
+	case ColumnUserFileNameDownload:
+		name = "F";
+		break;
+	case ColumnUserFileNameUpload:
+		name = "f";
+		break;
+	case ColumnUserFileNameDownloadRemote:
+		name = "R";
+		break;
+	case ColumnUserSharedFiles:
+		name = "m";
+		break;
+	case ColumnInvalid:
+	default:
+		wxFAIL;
+		break;
 	}
 
 	return name;
 }
 
+bool CGenericClientListCtrl::IsLiveSortColumn() const
+{
+	if (m_sort_orders.empty()) {
+		return false;
+	}
+	const int col = static_cast<int>(m_sort_orders.front().first);
+	if (col < 0 || col >= m_columndata.n_columns) {
+		return false;
+	}
+	switch (m_columndata.columnscol.cid) {
+	case ColumnUserDownloaded:
+	case ColumnUserUploaded:
+	case ColumnUserSpeedDown:
+	case ColumnUserSpeedUp:
+	case ColumnUserProgress:
+	case ColumnUserAvailable:
+	case ColumnUserQueueRankLocal:
+	case ColumnUserQueueRankRemote:
+		return true;
+	default:
+		return false;
+	}
+}
+
 void CGenericClientListCtrl::InitColumnData()
 {
 	if (!m_columndata.n_columns) {
 		throw wxString("CRITICAL: Initialization of the column data lacks subclass information");
 	}
 
+	const int baseFlags = wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE;
+
 	for (int i = 0; i < m_columndata.n_columns; ++i) {
-		InsertColumn( i, wxGetTranslation(m_columndata.columnsi.title), wxLIST_FORMAT_LEFT, m_columndata.columnsi.width, TranslateCIDToName(m_columndata.columnsi.cid));
+		const GenericColumnEnum cid = m_columndata.columnsi.cid;
+		const wxString title = wxGetTranslation(m_columndata.columnsi.title);
+		const wxString key = TranslateCIDToName(cid);
+		const int width = m_columndata.columnsi.width;
+
+		switch (cid) {
+		case ColumnUserName:
+			// See CClientNameRenderer: a composite icon-cluster + text cell,
+			// not a literal bar.
+			AddBarColumn(title, i, key, width, baseFlags, new CClientNameRenderer());
+			break;
+		case ColumnUserProgress:
+			AddBarColumn(title, i, key, width, baseFlags, CreateProgressBarRenderer());
+			break;
+		case ColumnUserAvailable:
+			// No Compare() case exists for this column, as in the pre-port behaviour,
+			// so SORTABLE is left off rather than showing a non-functional sort caret.
+			AddBarColumn(title, i, key, width, wxDATAVIEW_COL_RESIZABLE, nullptr);
+			break;
+		default:
+			AddTextColumn(title, i, key, width, wxALIGN_LEFT, baseFlags);
+			break;
+		}
 	}
 
-	LoadSettings();
+	// Absorbs the macOS trailing-column sizing, which would otherwise fall on the last real
+	// column and collapse it once the columns outgrow the control. n_columns is the id to use:
+	// the model already answers every column past its own table with an empty value.
+	AppendSpacerColumn(m_columndata.n_columns);
+
+	AssociateVirtualModel();
+	ApplySorting(0, 0);
+
+	LoadColumnSettings();
+	InitColumnState();
 }
 
 CGenericClientListCtrl::~CGenericClientListCtrl()
 {
-	while ( !m_ListItems.empty() ) {
+	delete m_menu;
+	while (!m_ListItems.empty()) {
 		delete m_ListItems.begin()->second;
-		m_ListItems.erase( m_ListItems.begin() );
+		m_ListItems.erase(m_ListItems.begin());
 	}
 }
-void CGenericClientListCtrl::RawAddSource(CKnownFile* owner, CClientRef source, SourceItemType type)
+
+void CGenericClientListCtrl::RawAddSource(CKnownFile *owner, CClientRef source, SourceItemType type)
 {
-	ClientCtrlItem_Struct* newitem = new ClientCtrlItem_Struct;
+	ClientCtrlItem_Struct *newitem = new ClientCtrlItem_Struct;
 	newitem->SetContents(owner, source, type);
 
-	m_ListItems.insert( ListItemsPair(source.ECID(), newitem) );
+	m_ListItems.insert(ListItemsPair(source.ECID(), newitem));
 
-	long item = InsertItem( GetItemCount(), "" );
-	SetItemPtrData( item, reinterpret_cast<wxUIntPtr>(newitem) );
-	SetItemBackgroundColour( item, GetBackgroundColour() );
+	// Append at the end, unsorted: ShowSources() sorts once at the end of a bulk
+	// add, and a single runtime add just shows at the bottom.
+	AppendItemDataNow(reinterpret_cast<wxUIntPtr>(newitem));
 }
 
-void CGenericClientListCtrl::AddSource(CKnownFile* owner, const CClientRef& source, SourceItemType type)
+void CGenericClientListCtrl::AddSource(CKnownFile *owner, const CClientRef &source, SourceItemType type)
 {
 	wxCHECK_RET(owner, "NULL owner in CGenericClientListCtrl::AddSource");
 	wxCHECK_RET(source.IsLinked(), "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;
+	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 ) {
+		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())) {
+			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 ) {
+		} 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 ) {
+	if (bFound) {
 		return;
 	}
 
-	if ( std::binary_search(m_knownfiles.begin(), m_knownfiles.end(), owner) ) {
+	if (std::binary_search(m_knownfiles.begin(), m_knownfiles.end(), owner)) {
 		RawAddSource(owner, source, type);
 
-		ShowSourcesCount( 1 );
+		ShowSourcesCount(1);
 	}
 }
 
-void CGenericClientListCtrl::RawRemoveSource( ListItems::iterator& it)
+void CGenericClientListCtrl::RawRemoveSource(ListItems::iterator &it)
 {
-	ClientCtrlItem_Struct* item = it->second;
+	ClientCtrlItem_Struct *item = it->second;
 
-	long index = FindItem( -1, reinterpret_cast<wxUIntPtr>(item) );
-
-	if ( index > -1 ) {
-		DeleteItem( index );
-	}
+	RemoveItemData(reinterpret_cast<wxUIntPtr>(item));
 
 	delete item;
 
-	// Remove it from the m_ListItems
-	m_ListItems.erase( it );
+	m_ListItems.erase(it);
 }
 
-void CGenericClientListCtrl::RemoveSource(uint32 source, const CKnownFile* owner)
+void CGenericClientListCtrl::RemoveSource(uint32 source, const CKnownFile *owner)
 {
 	// A NULL owner means remove it no matter what.
 	wxCHECK_RET(source, "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 */) {
+	for (ListItems::iterator it = rangeIt.first; it != rangeIt.second; /* no ++, it happens later */) {
 		ListItems::iterator tmp = it++;
 
-		if ( owner == NULL || owner == tmp->second->GetOwner() ) {
+		if (owner == nullptr || owner == tmp->second->GetOwner()) {
 
 			RawRemoveSource(tmp);
 
@@ -309,44 +354,30 @@
 
 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();
+	ListIteratorPair rangeIt = m_ListItems.equal_range(toupdate);
 
-	#ifndef __WINDOWS__
-		// Get visible lines if we need them
-		GetVisibleLines( &first, &last );
-	#endif
+	if (rangeIt.first != rangeIt.second) {
+		for (ListItems::iterator it = rangeIt.first; it != rangeIt.second; ++it) {
+			ClientCtrlItem_Struct *item = it->second;
 
-		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())) {
+			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 );
-			}
+			// Repaints the row and, if sorted by a live column, schedules
+			// the throttled+idle-gated re-sort.
+			RefreshItemData(reinterpret_cast<wxUIntPtr>(item));
 		}
 	}
 }
 
-void CGenericClientListCtrl::ShowSources( const CKnownFileVector& files )
+void CGenericClientListCtrl::ShowSources(const CKnownFileVector &files)
 {
 	Freeze();
 
@@ -359,23 +390,20 @@
 		}
 	}
 
-	// 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.
+	// This calls SetShowSources again for files that were in both vectors. That is an inline
+	// setter today, so preventing it would be wasteful -- revisit if that changes.
 
 	for (unsigned i = 0; i < files.size(); ++i) {
 		SetShowSources(filesi, 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 */) {
+	for (ListItems::iterator it = m_ListItems.begin(); it != m_ListItems.end();
+		/* no ++, it happens later */) {
 		ListItems::iterator tmp = it++;
-		ClientCtrlItem_Struct* item = tmp->second;
+		ClientCtrlItem_Struct *item = tmp->second;
 		if (!std::binary_search(files.begin(), files.end(), item->GetOwner())) {
-			// Remove it from the m_ListItems
 			RawRemoveSource(tmp);
 			--itemDiff;
 		}
@@ -386,7 +414,7 @@
 		// Only those that weren't showing already
 		if (!std::binary_search(m_knownfiles.begin(), m_knownfiles.end(), filesi)) {
 
-			CKnownFile* file = filesi;
+			CKnownFile *file = filesi;
 
 			wxASSERT_MSG(file, "NULL file in CGenericClientListCtrl::ShowSources");
 
@@ -395,46 +423,47 @@
 				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();
+					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 ) {
+					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;
+						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 ) {
+					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 );
+						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 ) {
+					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;
+						case US_UPLOADING:
+						case US_ONUPLOADQUEUE:
+							RawAddSource(file, *it, AVAILABLE_SOURCE);
+							++itemDiff;
+							break;
+						default:
+							// Any other state
+							RawAddSource(file, *it, UNAVAILABLE_SOURCE);
+							++itemDiff;
 						}
 					}
 				}
@@ -444,50 +473,38 @@
 
 	m_knownfiles = files;
 
-	ShowSourcesCount( itemDiff );
+	ShowSourcesCount(itemDiff);
 
 	SortList();
 
 	Thaw();
 }
 
-
-void CGenericClientListCtrl::RemoveKnownFile(CKnownFile* file)
+void CGenericClientListCtrl::RemoveKnownFile(CKnownFile *file)
 {
-	// Pure pointer-value comparison — `file` may already be freed by
-	// the destruction site that fired Notify_KnownFileBeingDestroyed.
-	// We must never dereference it; we only need its value as a key
-	// to drop from m_knownfiles and m_ListItems. See
-	// MuleNotify::KnownFileBeingDestroyed in GuiEvents.cpp.
-	if (file == NULL) {
+	// Pure pointer-value comparison: `file` may already be freed by the destruction site that
+	// fired Notify_KnownFileBeingDestroyed, so it is never dereferenced -- only used as a key
+	// to drop from m_knownfiles and m_ListItems.
+	if (file == nullptr) {
 		return;
 	}
 
-	// Drop the cached "currently showing sources for" entry. This is
-	// #755's crash site: without this, the next ShowSources() loop
-	// at GenericClientListCtrl.cpp:355-359 walks the dangling entry
-	// and writes 1 byte into the recycled heap region via
-	// SetShowSources(file, false).
-	CKnownFileVector::iterator kf =
-		std::find(m_knownfiles.begin(), m_knownfiles.end(), file);
+	// Drop the cached "currently showing sources for" entry. This is #755's crash site: without
+	// it the next ShowSources() loop walks the dangling entry and writes into the recycled heap
+	// region via SetShowSources(file, false).
+	CKnownFileVector::iterator kf = std::find(m_knownfiles.begin(), m_knownfiles.end(), file);
 	if (kf != m_knownfiles.end()) {
 		m_knownfiles.erase(kf);
 	}
 
-	// Strip any per-row state whose m_owner matches. We have to walk
-	// the multimap once because m_ListItems is keyed by client ECID,
-	// not by file. wxListCtrl rows associated with those items are
-	// removed in the same pass via DeleteItem.
-	for (ListItems::iterator it = m_ListItems.begin();
-		it != m_ListItems.end(); /* manual ++ */) {
-		ClientCtrlItem_Struct* item = it->second;
+	// Strip any per-row state whose m_owner matches. The multimap has to be walked
+	// once because m_ListItems is keyed by client ECID, not by file.
+	for (ListItems::iterator it = m_ListItems.begin(); it != m_ListItems.end(); /* manual ++ */) {
+		ClientCtrlItem_Struct *item = it->second;
 		if (item && item->GetOwner() == file) {
-			// Drop the wx row first while the multimap entry is
+			// Drop the model row first while the multimap entry is
 			// still valid, then erase the multimap entry.
-			long row = FindItem(-1, reinterpret_cast<wxUIntPtr>(item));
-			if (row != -1) {
-				DeleteItem(row);
-			}
+			RemoveItemData(reinterpret_cast<wxUIntPtr>(item));
 			delete item;
 			m_ListItems.erase(it++);
 		} else {
@@ -496,995 +513,605 @@
 	}
 }
 
-
-/**
- * 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 chosen types.
- */
-static ItemList GetSelectedItems( CGenericClientListCtrl* list )
+void CGenericClientListCtrl::ShowSourcesCount(int diff)
 {
-	ItemList results;
-
-	long index = list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-
-	while ( index > -1 ) {
-		ClientCtrlItem_Struct* item = reinterpret_cast<ClientCtrlItem_Struct*>(list->GetItemData( index ));
-
-		results.push_back( item );
+	m_clientcount += diff;
+	wxStaticText *label = CastByID(ID_CLIENTCOUNT, GetParent(), wxStaticText);
 
-		index = list->GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	if (label) {
+		label->SetLabel(CFormat("%i") % m_clientcount);
+		label->GetParent()->Layout();
 	}
-
-	return results;
 }
 
-void CGenericClientListCtrl::OnSwapSource( wxCommandEvent& WXUNUSED(event) )
+void CGenericClientListCtrl::OnSwapSource(wxCommandEvent &WXUNUSED(event))
 {
-	ItemList sources = ::GetSelectedItems( this );
-
-	for ( ItemList::iterator it = sources.begin(); it != sources.end(); ++it ) {
-		CKnownFile * kf = (*it)->GetOwner();
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		ClientCtrlItem_Struct *source = reinterpret_cast<ClientCtrlItem_Struct *>(data);
+		CKnownFile *kf = source->GetOwner();
 		if (!kf->IsPartFile()) {
 			wxFAIL_MSG("File is not a partfile when swapping sources");
 			continue;
 		}
-		(*it)->GetSource().SwapToAnotherFile( true, false, false,  dynamic_cast<CPartFile*>(kf));
+		source->GetSource().SwapToAnotherFile(true, false, false, dynamic_cast<CPartFile *>(kf));
 	}
 }
 
-
-void CGenericClientListCtrl::OnViewFiles( wxCommandEvent& WXUNUSED(event) )
+namespace
 {
-	ItemList sources = ::GetSelectedItems( this );
-
-	if ( sources.size() == 1 ) {
-		sources.front()->GetSource().RequestSharedFileList();
-	}
-}
-
-
-void CGenericClientListCtrl::OnAddFriend( wxCommandEvent& WXUNUSED(event) )
+//! The peers behind the current selection, as the shared actions want them.
+std::vector<CClientRef> SelectedClients(const std::vector<wxUIntPtr> &selected)
 {
-	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);
-		}
+	std::vector<CClientRef> clients;
+	clients.reserve(selected.size());
+	for (wxUIntPtr data : selected) {
+		clients.push_back(reinterpret_cast<ClientCtrlItem_Struct *>(data)->GetSource());
 	}
+	return clients;
 }
+} // namespace
 
-
-void CGenericClientListCtrl::OnSetFriendslot(wxCommandEvent& evt)
+void CGenericClientListCtrl::OnViewFiles(wxCommandEvent &WXUNUSED(event))
 {
-	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;
+	const std::vector<CClientRef> clients = SelectedClients(GetSelectedItemData());
+	if (clients.empty()) {
+		return;
 	}
-	if (it != sources.end()) {
-		wxMessageBox(_("You are not allowed to set more than one friend slot.\n Only one slot was assigned."), _("Multiple selection"), wxOK | wxICON_ERROR, this);
+	// One result tab per peer, and a connection to any of them we are not already talking to:
+	// this list holds queued and A4AF sources, which are peers whose queue we sit in without
+	// holding a socket.
+	if (!ConfirmBrowseAction(this, clients.size())) {
+		return;
 	}
+	ClientActionViewFiles(clients);
 }
 
-
-void CGenericClientListCtrl::OnSendMessage( wxCommandEvent& WXUNUSED(event) )
+void CGenericClientListCtrl::OnAddFriend(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);
-		}
+	// The direction comes from the first selected client, which is the row the menu was built
+	// for. Read from the live selection rather than a pointer stashed at popup time:
+	// PopupMenu() runs a nested event loop, a source removal during it deletes the
+	// ClientCtrlItem_Struct, and nothing clears that pointer.
+	const std::vector<CClientRef> clients = SelectedClients(GetSelectedItemData());
+	if (clients.empty()) {
+		return;
 	}
+	const bool addThem = !PeerIsFriend(PeerIdentity::FromClient(clients.front()));
+	PeerActionSetFriendsForClients(this, clients, addThem);
 }
 
-
-void CGenericClientListCtrl::OnViewClientInfo( wxCommandEvent& WXUNUSED(event) )
+void CGenericClientListCtrl::OnSetFriendslot(wxCommandEvent &evt)
 {
-	ItemList sources = ::GetSelectedItems( this );
-
-	if ( sources.size() == 1 ) {
-		CClientDetailDialog( this, sources.front()->GetSource() ).ShowModal();
-	}
+	ClientActionSetFriendSlot(this, SelectedClients(GetSelectedItemData()), evt.IsChecked());
 }
 
-
-void CGenericClientListCtrl::OnItemActivated( wxListEvent& evt )
+void CGenericClientListCtrl::OnSendMessage(wxCommandEvent &WXUNUSED(event))
 {
-	CClientDetailDialog( this, reinterpret_cast<ClientCtrlItem_Struct*>(GetItemData( evt.GetIndex()))->GetSource() ).ShowModal();
+	ClientActionSendMessage(SelectedClients(GetSelectedItemData()));
 }
 
+void CGenericClientListCtrl::OnViewClientInfo(wxCommandEvent &WXUNUSED(event))
+{
+	ClientActionShowDetails(this, SelectedClients(GetSelectedItemData()));
+}
 
-void CGenericClientListCtrl::OnMouseRightClick(wxListEvent& evt)
+void CGenericClientListCtrl::OnItemActivated(wxDataViewEvent &event)
 {
-	long index = CheckSelection(evt);
-	if (index < 0) {
+	if (!event.GetItem().IsOk()) {
 		return;
 	}
-
-	delete m_menu;
-	m_menu = NULL;
-
-	ClientCtrlItem_Struct* item = reinterpret_cast<ClientCtrlItem_Struct*>(GetItemData( index ));
-	CClientRef& client = item->GetSource();
-
-	m_menu = new wxMenu("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);
+	const wxUIntPtr data = ItemAt(GetModelRow(event.GetItem()));
+	if (!data) {
+		return;
 	}
-
-	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;
-
+	CClientDetailDialog(this, reinterpret_cast<ClientCtrlItem_Struct *>(data)->GetSource()).ShowModal();
 }
 
-
-void CGenericClientListCtrl::OnMouseMiddleClick(wxListEvent& evt)
+void CGenericClientListCtrl::OnMouseMiddleClick(wxMouseEvent &event)
 {
-	// Check if clicked item is selected. If not, unselect all and select it.
-	long index = CheckSelection(evt);
-	if ( index < 0 ) {
+	wxDataViewItem hitItem;
+	wxDataViewColumn *hitColumn = nullptr;
+	HitTest(event.GetPosition(), hitItem, hitColumn);
+	if (!hitItem.IsOk()) {
+		event.Skip();
 		return;
 	}
 
-	CClientDetailDialog(this, reinterpret_cast<ClientCtrlItem_Struct*>(GetItemData( index ))->GetSource()).ShowModal();
-}
+	wxDataViewItemArray selection;
+	GetSelections(selection);
+	if (selection.Index(hitItem) == wxNOT_FOUND) {
+		UnselectAll();
+		Select(hitItem);
+	}
 
+	const wxUIntPtr data = ItemAt(GetModelRow(hitItem));
+	if (!data) {
+		return;
+	}
+	CClientDetailDialog(this, reinterpret_cast<ClientCtrlItem_Struct *>(data)->GetSource()).ShowModal();
+}
 
-void CGenericClientListCtrl::OnKeyPressed( wxKeyEvent& event )
+int CGenericClientListCtrl::FindBarLegendColumn() const
 {
-	// No actions right now.
-	//switch (event.GetKeyCode()) {
-	//	default:
-			event.Skip();
-	//}
+	for (int i = 0; i < m_columndata.n_columns; ++i) {
+		if (partbar::LegendForColumn(m_columndata.columnsi.cid) == partbar::BarLegendKind::None) {
+			continue;
+		}
+		// A bar the user has hidden is not on screen to be explained. Model id and
+		// view position coincide here -- InitColumnState() requires it.
+		if (!IsColumnHidden(i)) {
+			return i;
+		}
+	}
+	return -1;
 }
 
+void CGenericClientListCtrl::ShowBarLegend(partbar::BarLegendKind kind, const wxString &columnTitle)
+{
+	// The dialog and its swatches live in PartBarLegendUI: since #1220 the shared-files list
+	// opens legends of its own, and two copies of a swatch are two things to keep in step with
+	// the palette.
+	ShowPartBarLegend(this, kind, columnTitle);
+}
 
-void CGenericClientListCtrl::OnDrawItem(
-	int item, wxDC* dc, const wxRect& rect, const wxRect& rectHL, bool highlighted)
+void CGenericClientListCtrl::OnShowBarLegend(wxCommandEvent &WXUNUSED(event))
 {
-	// Don't do any drawing if there's nobody to see it.
-	if ( !theApp->amuledlg->IsDialogVisible( GetParentDialog() ) ) {
+	// Resolved again rather than remembered from when the menu was built: the entry
+	// only exists on menus built while a bar column was on screen.
+	const int column = FindBarLegendColumn();
+	if (column < 0) {
 		return;
 	}
+	ShowBarLegend(partbar::LegendForColumn(m_columndata.columnscolumn.cid),
+		wxGetTranslation(m_columndata.columnscolumn.title));
+}
 
-	ClientCtrlItem_Struct* content = reinterpret_cast<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_highlightBrush);
-			colour = m_highlightBrush.GetColour();
-		} else {
-			dc->SetBackground(m_highlightUnfocusBrush);
-			colour = m_highlightUnfocusBrush.GetColour();
+void CGenericClientListCtrl::OnItemRightClicked(wxDataViewEvent &event)
+{
+	if (event.GetItem().IsOk()) {
+		wxDataViewItemArray selection;
+		GetSelections(selection);
+		if (selection.Index(event.GetItem()) == wxNOT_FOUND) {
+			UnselectAll();
+			Select(event.GetItem());
 		}
-		dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
-		dc->SetPen( colour.Blend(65).GetPen() );
-	} else {
-		dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID)));
-		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);
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	if (selected.empty()) {
+		return;
+	}
+	m_menuItem = selected.front();
+	ClientCtrlItem_Struct *item = reinterpret_cast<ClientCtrlItem_Struct *>(m_menuItem);
+	CClientRef &client = item->GetSource();
 
-		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;
+	delete m_menu;
+	m_menu = BuildClientContextMenu(client);
+
+	// Both are appended here rather than inside BuildClientContextMenu(): that builder is
+	// shared with the Clients tab, which has no file in context and draws no chunk bar.
+	//
+	// Swapping is a download notion -- it moves a source off whatever it is downloading and
+	// onto this file -- and the shared-files peer list shows clients downloading FROM us, so
+	// there is nothing to swap and the entry is omitted rather than shown dead. It is disabled
+	// for a non-A4AF source, where the peer is already on the file it would swap to: "not right
+	// now" rather than "never".
+	if (IsShowingDownloadSources()) {
+		m_menu->Append(MP_CHANGE2FILE, _("Swap to this file"));
+		m_menu->Enable(MP_CHANGE2FILE, item->GetType() == A4AF_SOURCE);
+	}
 
-			GenericColumnEnum cid = m_columndata.columnsi.cid;
+	// Asking the list which of its own columns has a legend keeps this true for
+	// any future subclass without naming one here.
+	if (FindBarLegendColumn() >= 0) {
+		m_menu->AppendSeparator();
+		m_menu->Append(MP_BARLEGEND, _("Colour legend"));
+	}
 
-			// Draw the item
-			DrawClientItem(dc, cid, target_rec, content, iTextOffset, imageListBitmapYOffset, imageListBitmapXSize);
-		}
+	PopupMenu(m_menu, event.GetPosition());
 
-		// Increment to the next column
-		cur_rec.x += columnWidth;
-	}
+	delete m_menu;
+	m_menu = nullptr;
 }
 
-void CGenericClientListCtrl::DrawClientItem(wxDC* dc, int nColumn, const wxRect& rect, ClientCtrlItem_Struct* item, int iTextOffset, int iBitmapOffset, int iBitmapXSize ) const
+wxString CGenericClientListCtrl::GetItemColumnText(wxUIntPtr data, unsigned column) 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 failback 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 << " - ";
-
-					point.x += countrydata.Flag.GetWidth() + 2 /*Padding*/;
-				}
-#endif // ENABLE_IP2COUNTRY
-				if (client.GetUserName().IsEmpty()) {
-					userName << "?";
-				} else {
-					userName << client.GetUserName();
-				}
-
-				dc->DrawText(userName, point.x, rect.GetY() + iTextOffset);
+	if (column >= static_cast<unsigned>(m_columndata.n_columns)) {
+		return wxEmptyString;
+	}
+	ClientCtrlItem_Struct *item = reinterpret_cast<ClientCtrlItem_Struct *>(data);
+	CClientRef &client = item->GetSource();
+	const bool notA4AF = item->GetType() != A4AF_SOURCE;
+
+	switch (m_columndata.columnscolumn.cid) {
+	case ColumnUserName:
+		// Not drawn through this path (see CClientNameRenderer), but still
+		// answered for type-ahead / accessible row label (#180).
+		return client.GetUserName().IsEmpty() ? wxString("?") : client.GetUserName();
+
+	case ColumnUserDownloaded:
+		return (notA4AF && client.GetTransferredDown()) ? CastItoXBytes(client.GetTransferredDown())
+								: wxString();
+
+	case ColumnUserUploaded:
+		return (notA4AF && client.GetTransferredUp()) ? CastItoXBytes(client.GetTransferredUp())
+							      : wxString();
+
+	case ColumnUserSpeedDown:
+		if (notA4AF && client.GetKBpsDown() > 0.001) {
+			if (client.GetKBpsDown() >= 1024) {
+				return CFormat(_("%.1f MiB/s")) % (client.GetKBpsDown() / 1024.0);
 			}
-			break;
+			return CFormat(_("%.1f KiB/s")) % client.GetKBpsDown();
+		}
+		return wxEmptyString;
 
-		case ColumnUserDownloaded:
-			if (item->GetType() != A4AF_SOURCE && client.GetTransferredDown()) {
-				buffer = CastItoXBytes(client.GetTransferredDown());
-				dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+	case ColumnUserSpeedUp:
+		// Datarate is in bytes.
+		if (notA4AF && client.GetUploadDatarate() >= 1024) {
+			if (client.GetUploadDatarate() >= 1048576) {
+				return CFormat(_("%.1f MiB/s")) % (client.GetUploadDatarate() / 1048576.0);
 			}
-			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) {
-				if (client.GetKBpsDown() >= 1024) {
-					buffer = CFormat(_("%.1f MB/s")) % (client.GetKBpsDown() / 1024.0);
-				} else {
-					buffer = CFormat(_("%.1f kB/s")) % client.GetKBpsDown();
-				}
-				dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			return CFormat(_("%.1f KiB/s")) % (client.GetUploadDatarate() / 1024.0);
+		}
+		return wxEmptyString;
+
+	case ColumnUserVersion:
+		return client.GetClientVerString();
+
+	case ColumnUserQueueRankRemote: {
+		if (notA4AF && client.GetDownloadState() == DS_ONQUEUE) {
+			if (client.IsRemoteQueueFull()) {
+				return _("Queue Full");
 			}
-			break;
-		case ColumnUserSpeedUp:
-			// Datarate is in bytes.
-			if (item->GetType() != A4AF_SOURCE && client.GetUploadDatarate() >= 1024) {
-				if (client.GetUploadDatarate() >= 1048576) {
-					buffer = CFormat(_("%.1f MB/s")) % (client.GetUploadDatarate() / 1048576.0);
-				} else {
-					buffer = CFormat(_("%.1f kB/s")) % (client.GetUploadDatarate() / 1024.0);
+			const uint16 rank = client.GetRemoteQueueRank();
+			if (rank) {
+				sint16 qrDiff = static_cast<sint16>(rank - client.GetOldRemoteQueueRank());
+				if (qrDiff == rank) {
+					qrDiff = 0;
 				}
-				dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+				return CFormat(_("On Queue: %u (%i)")) % rank % qrDiff;
 			}
-			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 ) {
-					uint64 dwTicks = GetTickCount64();
-
-					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 = "?";
-					}
-					buffer = CFormat("%s: %s") % _("A4AF") % a4af;
+			return _("On Queue");
+		}
+		if (notA4AF) {
+			return DownloadStateToStr(client.GetDownloadState(), client.IsRemoteQueueFull());
+		}
+		wxString buffer = _("Asked for another file");
+		if (client.GetRequestFile() && client.GetRequestFile()->GetFileName().IsOk()) {
+			buffer += CFormat(" (%s)") % client.GetRequestFile()->GetFileName();
+		}
+		return buffer;
+	}
 
-					int mid_x = (2*rect.GetX() + rect.GetWidth()) >> 1;
-					int mid_y = (2*rect.GetY() + rect.GetHeight()) >> 1;
+	case ColumnUserQueueRankLocal:
+		if (!notA4AF) {
+			return _("Asked for another file");
+		}
+		if (client.GetUploadState() == US_ONUPLOADQUEUE) {
+			const uint16 nRank = client.GetUploadQueueWaitingPosition();
+			return nRank == 0 ? wxString(_("Waiting for upload slot"))
+					  : wxString(CFormat(_("On Queue: %u")) % nRank);
+		}
+		if (client.GetUploadState() == US_UPLOADING) {
+			return _("Uploading");
+		}
+		return _("None");
 
-					wxCoord txtwidth, txtheight;
+	case ColumnUserOrigin:
+		return wxGetTranslation(OriginToText(client.GetSourceFrom()));
 
-					dc->GetTextExtent(buffer, &txtwidth, &txtheight);
+	case ColumnUserFileNameDownload:
+		if (const CPartFile *pf = client.GetRequestFile()) {
+			return pf->GetFileName().GetPrintable();
+		}
+		return "" + wxString(_("Unknown")) + "";
 
-					// Theme-aware text + border colour (was *wxBLACK / *wxBLACK_PEN
-					// which was invisible on dark themes -- the badge sits on
-					// the row stripe, not on a known light background).
-					const wxColour badgeColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-					dc->SetTextForeground(badgeColour);
-					dc->DrawText(buffer, wxMax(rect.GetX() + 2, mid_x - (txtwidth >> 1)), mid_y - (txtheight >> 1));
+	case ColumnUserFileNameUpload:
+		if (const CKnownFile *kf = client.GetUploadFile()) {
+			return kf->GetFileName().GetPrintable();
+		}
+		return "" + wxString(_("Unknown")) + "";
 
-					dc->SetPen(wxPen(badgeColour));
-					dc->SetBrush( *wxTRANSPARENT_BRUSH );
-					dc->DrawRectangle( rect.GetX(), rect.GetY() + 1, iWidth, iHeight );
-				}
-			}
-			break;
+	case ColumnUserFileNameDownloadRemote:
+		if (client.GetClientFilename().IsEmpty() || !notA4AF) {
+			return "" + wxString(_("Unknown")) + "";
+		}
+		return client.GetClientFilename();
 
-		case ColumnUserAvailable: {
-				if ( client.GetUpPartCount() ) {
-					DrawStatusBar( client, dc, rect );
-				}
-				break;
-			}
+	case ColumnUserSharedFiles:
+		return client.HasDisabledSharedFiles() ? _("No") : _("Yes");
 
-		case ColumnUserVersion: {
-				dc->DrawText(client.GetClientVerString(), rect.GetX(), rect.GetY() + iTextOffset);
-				break;
-			}
+	default:
+		return wxEmptyString;
+	}
+}
 
-		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;
-						}
-						// Queue rank change cue: down (good) = blue, up (bad) = red.
-						// Pure *wxBLUE / *wxRED were unreadable on dark themes;
-						// swap to a hand-tuned palette that contrasts on both.
-						const bool isDark = wxSystemSettings::GetAppearance().IsDark();
-						if ( qrDiff < 0 ) {
-							dc->SetTextForeground(isDark ? wxColour(120, 170, 255) : wxColour(0, 80, 200));
-						}
-						if ( qrDiff > 0 ) {
-							dc->SetTextForeground(isDark ? wxColour(255, 100, 100) : wxColour(220, 0, 0));
-						}
-						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(" (%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;
+bool CGenericClientListCtrl::GetItemAttr(wxUIntPtr data, unsigned column, wxDataViewItemAttr &attr) const
+{
+	if (column >= static_cast<unsigned>(m_columndata.n_columns)) {
+		return false;
+	}
+	ClientCtrlItem_Struct *item = reinterpret_cast<ClientCtrlItem_Struct *>(data);
+	CClientRef &client = item->GetSource();
+	const bool isDark = IsListBackgroundDark(this);
+
+	switch (m_columndata.columnscolumn.cid) {
+	case ColumnUserQueueRankRemote: {
+		if (item->GetType() == A4AF_SOURCE || client.GetDownloadState() != DS_ONQUEUE ||
+			client.IsRemoteQueueFull()) {
+			return false;
 		}
-		// 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 = "" + buffer + "";
-			}
-			dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
-			break;
+		const uint16 rank = client.GetRemoteQueueRank();
+		if (!rank) {
+			return false;
 		}
-		case ColumnUserFileNameUpload: {
-			const CKnownFile * kf = client.GetUploadFile();
-			if (kf) {
-				buffer = kf->GetFileName().GetPrintable();
-			} else {
-				buffer = _("Unknown");
-				buffer = "" + buffer + "";
-			}
-			dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
-			break;
+		sint16 qrDiff = static_cast<sint16>(rank - client.GetOldRemoteQueueRank());
+		if (qrDiff == static_cast<sint16>(rank)) {
+			qrDiff = 0;
 		}
-		case ColumnUserFileNameDownloadRemote: {
-			bool nameMismatch = false;
-			wxColour savedColour = dc->GetTextForeground();
-			if (client.GetClientFilename().IsEmpty() || item->GetType() == A4AF_SOURCE) {
-				buffer = _("Unknown");
-				buffer = "" + buffer + "";
-			} else {
-				buffer = client.GetClientFilename();
-				const CPartFile * pf = client.GetRequestFile();
-				if (pf && (pf->GetFileName().GetPrintable().CmpNoCase(buffer) != 0)) {
-					nameMismatch = true;
-					// "watch out: peer is advertising a different name for
-					// this hash" warning cue. Pure *wxRED was unreadable on
-					// dark themes.
-					const bool isDark = wxSystemSettings::GetAppearance().IsDark();
-					dc->SetTextForeground(isDark ? wxColour(255, 100, 100) : wxColour(220, 0, 0));
-				}
-			}
-			dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
-			if (nameMismatch) {
-				dc->SetTextForeground(savedColour);
-			}
-			break;
+		// Queue rank change cue: down (good) = blue, up (bad) = red. Pure
+		// *wxBLUE / *wxRED were unreadable on dark themes.
+		if (qrDiff < 0) {
+			attr.SetColour(isDark ? wxColour(120, 170, 255) : wxColour(0, 80, 200));
+			return true;
 		}
-		case ColumnUserSharedFiles: {
-			if(client.HasDisabledSharedFiles()) {
-				buffer = _("No");
-			} else {
-				buffer = _("Yes");
-			}
-			dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
-			break;
+		if (qrDiff > 0) {
+			attr.SetColour(isDark ? wxColour(255, 100, 100) : wxColour(220, 0, 0));
+			return true;
 		}
+		return false;
 	}
-}
 
-int CGenericClientListCtrl::SortProc(wxUIntPtr param1, wxUIntPtr param2, wxIntPtr sortData)
-{
-	ClientCtrlItem_Struct* item1 = reinterpret_cast<ClientCtrlItem_Struct*>(param1);
-	ClientCtrlItem_Struct* item2 = reinterpret_cast<ClientCtrlItem_Struct*>(param2);
-
-	int sortMod = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
-	sortData &= CMuleListCtrl::COLUMN_MASK;
-	int comp = 0;
-
-	// Two sources, some different possibilities
-	// Available 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);
+	case ColumnUserFileNameDownloadRemote: {
+		if (client.GetClientFilename().IsEmpty() || item->GetType() == A4AF_SOURCE) {
+			return false;
+		}
+		const CPartFile *pf = client.GetRequestFile();
+		if (pf && (pf->GetFileName().GetPrintable().CmpNoCase(client.GetClientFilename()) != 0)) {
+			// "watch out: peer is advertising a different name for this
+			// hash" warning cue. Pure *wxRED was unreadable on dark themes.
+			attr.SetColour(isDark ? wxColour(255, 100, 100) : wxColour(220, 0, 0));
+			return true;
+		}
+		return false;
 	}
 
-	// We modify the result so that it matches with ascending or descending
-	return sortMod * comp;
+	default:
+		return false;
+	}
 }
 
-int CGenericClientListCtrl::Compare(
-	const CClientRef& client1, const CClientRef& client2, long lParamSort)
+void CGenericClientListCtrl::GetItemBarFill(wxUIntPtr data, unsigned column, CBarFillSpec &out) const
 {
-	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;
-		}
+	if (column >= static_cast<unsigned>(m_columndata.n_columns)) {
+		return;
+	}
+	ClientCtrlItem_Struct *item = reinterpret_cast<ClientCtrlItem_Struct *>(data);
 
-		// 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();
-			}
+	switch (m_columndata.columnscolumn.cid) {
+	case ColumnUserName:
+		// CClientNameRenderer only needs the identity; it draws straight
+		// off the live CClientRef, not off spans.
+		out = CBarFillSpec(data, 0, {});
+		return;
 
-			// 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;
-					}
-				}
-			}
+	case ColumnUserProgress: {
+		// Gate mirrors DrawClientItem's ColumnUserProgress case: nothing is computed
+		// or drawn, the A4AF badge included, with the pref off.
+		if (!thePrefs::ShowProgBar()) {
+			return;
 		}
-
-		// 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;
+		CClientRef &client = item->GetSource();
+		CPartFile *reqfile = client.GetRequestFile();
+		const BitVector &partStatus = client.GetPartStatus();
+		const bool bFlat = thePrefs::UseFlatBar();
+
+		std::vector<CBarFillSpan> spans;
+		uint64 fileSize = 1;
+
+		if (reqfile && reqfile->GetPartCount() == partStatus.size()) {
+			fileSize = reqfile->GetFileSize();
+			const uint16 lastDownloadingPart = client.GetDownloadState() == DS_DOWNLOADING
+								   ? client.GetLastDownloadingPart()
+								   : 0xffff;
+			const uint16 nextRequestedPart = client.GetNextRequestedPart();
+			const bool stopped = reqfile->IsStopped();
+
+			for (uint32 i = 0; i < partStatus.size(); i++) {
+				const uint64 uStart = PARTSIZE * i;
+				const uint64 uEnd = uStart + reqfile->GetPartSize(static_cast<uint16>(i)) - 1;
+
+				// The order of these tests is the order the legend
+				// lists the states in (partbar::kSourceLegendOrder).
+				partbar::SourcePartState state;
+				if (!partStatus.get(i)) {
+					state = partbar::SourcePartState::Missing;
+				} else if (reqfile->IsComplete(static_cast<uint16>(i))) {
+					state = partbar::SourcePartState::Complete;
+				} else if (lastDownloadingPart == static_cast<uint16>(i)) {
+					state = partbar::SourcePartState::Downloading;
+				} else if (nextRequestedPart == static_cast<uint16>(i)) {
+					state = partbar::SourcePartState::NextRequested;
 				} else {
-					return 1;
+					state = partbar::SourcePartState::Needed;
 				}
-			} 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;
-					}
+				CMuleColour colour = ToMuleColour(partbar::SourcePartColour(state, bFlat));
+				if (stopped) {
+					// Not in the legend: a dimmed swatch out of context reads
+					// as a sixth state rather than the same five turned down.
+					colour.Blend(50);
 				}
+				spans.push_back({ uStart, uEnd, colour });
 			}
+		} else {
+			spans.push_back({ 0,
+				1,
+				ToMuleColour(partbar::SourcePartColour(
+					partbar::SourcePartState::Missing, bFlat)) });
 		}
 
-		// 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);
-		}
+		out = CBarFillSpec(data, fileSize, std::move(spans));
+		return;
+	}
 
-		case ColumnUserFileNameDownloadRemote: {
-			return CmpAny(client1.GetClientFilename(), client2.GetClientFilename());
+	case ColumnUserAvailable: {
+		CClientRef &client = item->GetSource();
+		const uint32 partCount = client.GetUpPartCount();
+		if (!partCount) {
+			// Matches DrawStatusBar's caller, which skips drawing (border
+			// included) entirely when there is nothing to show.
+			return;
 		}
-
-		case ColumnUserSharedFiles: {
-			return CmpAny(client1.HasDisabledSharedFiles(), client2.HasDisabledSharedFiles());
+		const bool bFlat = thePrefs::UseFlatBar();
+
+		std::vector<CBarFillSpan> spans;
+		for (uint64 i = 0; i < partCount; i++) {
+			const uint64 uStart = PARTSIZE * i;
+			const uint64 uEnd = uStart + PARTSIZE - 1;
+			spans.push_back({ uStart,
+				uEnd,
+				ToMuleColour(partbar::PeerPartColour(
+					client.IsUpPartAvailable(i) ? partbar::PeerPartState::Present
+								    : partbar::PeerPartState::Missing,
+					bFlat)) });
 		}
+		out = CBarFillSpec(data, static_cast<uint64>(partCount) * PARTSIZE, std::move(spans));
+		return;
+	}
 
-		default:
-			return 0;
+	default:
+		return;
 	}
 }
 
-
-void CGenericClientListCtrl::ShowSourcesCount( int diff )
+int CGenericClientListCtrl::CompareByCid(
+	GenericColumnEnum cid, const CClientRef &client1, const CClientRef &client2) const
 {
-	m_clientcount += diff;
-	wxStaticText* label = CastByID( ID_CLIENTCOUNT, GetParent(), wxStaticText );
-
-	if (label) {
-		label->SetLabel(CFormat("%i") % m_clientcount);
-		label->GetParent()->Layout();
-	}
-}
+	switch (cid) {
+	case ColumnUserName:
+		return CmpAny(client1.GetUserName(), client2.GetUserName());
 
-static const CMuleColour crBoth(0, 192, 0);
-static const CMuleColour crFlatBoth(0, 150, 0);
+	case ColumnUserDownloaded:
+		return CmpAny(client1.GetTransferredDown(), client2.GetTransferredDown());
 
-static const CMuleColour crNeither(240, 240, 240);
-static const CMuleColour crFlatNeither(224, 224, 224);
+	case ColumnUserUploaded:
+		return CmpAny(client1.GetTransferredUp(), client2.GetTransferredUp());
 
-static const CMuleColour crClientOnly(104, 104, 104);
-static const CMuleColour crFlatClientOnly(0, 0, 0);
+	case ColumnUserSpeedDown:
+		return CmpAny(client1.GetKBpsDown(), client2.GetKBpsDown());
 
-static const CMuleColour crPending(255, 208, 0);
-static const CMuleColour crNextPending(255, 255, 100);
+	case ColumnUserSpeedUp:
+		return CmpAny(client1.GetUploadDatarate(), client2.GetUploadDatarate());
 
-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 ( uint32 i = 0; i < partStatus.size(); i++ ) {
-			uint64 uStart = PARTSIZE * i;
-			uint64 uEnd = uStart + reqfile->GetPartSize(static_cast<uint16>(i)) - 1;
-
-			CMuleColour colour;
-			if (!partStatus.get(i)) {
-				// client does not have this part
-				// light grey
-				colour = bFlat ? crFlatNeither : crNeither;
-			} else if ( reqfile->IsComplete(static_cast<uint16>(i))) {
-				// completed part
-				// green
-				colour = bFlat ? crFlatBoth : crBoth;
-			} else if (lastDownloadingPart == static_cast<uint16>(i)) {
-				// downloading part
-				// yellow
-				colour = crPending;
-			} else if (nextRequestedPart == static_cast<uint16>(i)) {
-				// requested part
-				// light yellow
-				colour = crNextPending;
-			} else {
-				// client has this part, we need it
-				// black
-				colour = bFlat ? crFlatClientOnly : crClientOnly;
-			}
+	case ColumnUserProgress:
+		return CmpAny(client1.GetAvailablePartCount(), client2.GetAvailablePartCount());
 
-			if ( source.GetRequestFile()->IsStopped() ) {
-				colour.Blend(50);
-			}
-
-			s_StatusBar.FillRange(uStart, uEnd, colour);
+	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());
 		}
-	} else {
-		s_StatusBar.SetFileSize(1);
-		s_StatusBar.FillRange(0, 1, bFlat ? crFlatNeither : crNeither);
+		return cmp;
 	}
 
-	s_StatusBar.Draw(dc, rect.x, rect.y, bFlat);
-}
+	case ColumnUserQueueRankRemote: {
+		// This sorts by download state: Downloading, OnQueue, Connecting and so on. Asked
+		// For Another is always placed last, due to the type-precedence pre-check in
+		// CompareItemData().
+		if (client1.GetDownloadState() != client2.GetDownloadState()) {
+			return client1.GetDownloadState() - client2.GetDownloadState();
+		}
+		// Placing items on queue before items on full queues
+		if (client1.IsRemoteQueueFull()) {
+			return client2.IsRemoteQueueFull() ? 0 : 1;
+		}
+		if (client2.IsRemoteQueueFull()) {
+			return -1;
+		}
+		if (client1.GetRemoteQueueRank()) {
+			return client2.GetRemoteQueueRank()
+				       ? CmpAny(client1.GetRemoteQueueRank(), client2.GetRemoteQueueRank())
+				       : -1;
+		}
+		return client2.GetRemoteQueueRank() ? 1 : 0;
+	}
 
-static const CMuleColour crUnavailable(240, 240, 240);
-static const CMuleColour crFlatUnavailable(224, 224, 224);
+	case ColumnUserQueueRankLocal: {
+		if (client1.GetUploadState() != client2.GetUploadState()) {
+			return client1.GetUploadState() - client2.GetUploadState();
+		}
+		const uint16 rank1 = client1.GetUploadQueueWaitingPosition();
+		const uint16 rank2 = client2.GetUploadQueueWaitingPosition();
+		if (!rank1) {
+			return !rank2 ? 0 : 1;
+		}
+		if (!rank2) {
+			return -1;
+		}
+		return CmpAny(rank1, rank2);
+	}
 
-static const CMuleColour crAvailable(104, 104, 104);
-static const CMuleColour crFlatAvailable(0, 0, 0);
+	case ColumnUserOrigin:
+		return CmpAny(client1.GetSourceFrom(), client2.GetSourceFrom());
 
-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;
+	case ColumnUserFileNameDownload: {
+		wxString buffer1, buffer2;
+		if (const CPartFile *pf1 = client1.GetRequestFile()) {
+			buffer1 = pf1->GetFileName().GetPrintable();
+		}
+		if (const CPartFile *pf2 = client2.GetRequestFile()) {
+			buffer2 = pf2->GetFileName().GetPrintable();
+		}
+		return CmpAny(buffer1, buffer2);
 	}
-	static CBarShader s_StatusBar(16);
 
-	uint32 partCount = client.GetUpPartCount();
+	case ColumnUserFileNameUpload: {
+		wxString buffer1, buffer2;
+		if (const CKnownFile *kf1 = client1.GetUploadFile()) {
+			buffer1 = kf1->GetFileName().GetPrintable();
+		}
+		if (const CKnownFile *kf2 = client2.GetUploadFile()) {
+			buffer2 = kf2->GetFileName().GetPrintable();
+		}
+		return CmpAny(buffer1, buffer2);
+	}
 
-	// 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() );
+	case ColumnUserFileNameDownloadRemote:
+		return CmpAny(client1.GetClientFilename(), client2.GetClientFilename());
 
-	uint64 uEnd = 0;
-	for ( uint64 i = 0; i < partCount; i++ ) {
-		uint64 uStart = PARTSIZE * i;
-		uEnd = uStart + PARTSIZE - 1;
+	case ColumnUserSharedFiles:
+		return CmpAny(client1.HasDisabledSharedFiles(), client2.HasDisabledSharedFiles());
 
-		s_StatusBar.FillRange(uStart, uEnd, client.IsUpPartAvailable(i) ? (bFlat ? crFlatAvailable : crAvailable) : (bFlat ? crFlatUnavailable : crUnavailable));
+	// ColumnUserAvailable intentionally has no case: unsortable, matching the
+	// pre-port behaviour.
+	default:
+		return 0;
 	}
-	// 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);
+}
+
+int CGenericClientListCtrl::CompareItemData(
+	wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool WXUNUSED(alt), int modifier) const
+{
+	ClientCtrlItem_Struct *item1 = reinterpret_cast<ClientCtrlItem_Struct *>(data1);
+	ClientCtrlItem_Struct *item2 = reinterpret_cast<ClientCtrlItem_Struct *>(data2);
+
+	// Available sources first when we have both kinds. The order is fixed regardless of sort
+	// direction, so `modifier` is deliberately not applied. CompareItemsFull calls this once
+	// per level of a multi-column chain, which is harmless since it always agrees with itself.
+	const int typeOrder = item2->GetType() - item1->GetType();
+	if (typeOrder) {
+		return typeOrder;
 	}
 
-	dc->SetPen( old_pen );
-	dc->SetBrush( old_brush );
+	if (column >= static_cast<unsigned>(m_columndata.n_columns)) {
+		return 0;
+	}
+	return modifier *
+	       CompareByCid(m_columndata.columnscolumn.cid, item1->GetSource(), item2->GetSource());
 }
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/GenericClientListCtrl.h -> amule-3.1.0.tar.gz/src/GenericClientListCtrl.h Changed

@@ -25,236 +25,231 @@
 #ifndef GENERICCLIENTLISTCTRL_H
 #define GENERICCLIENTLISTCTRL_H
 
-#include <map>				// Needed for std::multimap
-#include <vector>			// Needed for std::vector
-#include <wx/brush.h>
+#include <map>    // Needed for std::multimap
+#include <vector> // Needed for std::vector
 
-#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
+#include "Types.h"                   // Needed for uint8
+#include "Constants.h"               // Needed for DownloadItemType
+#include "ClientRef.h"               // Needed for CClientRef (stored by value below)
+#include "MuleVirtualDataViewCtrl.h" // Needed for CMuleVirtualDataViewCtrl
+#include "PartBarLegend.h"           // Needed for GenericColumnEnum, partbar::BarLegendKind
+#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
+class CMuleBarRenderer;
+class wxMenu;
+
+/**
+ * One row: a client together with the file it is a source or peer of, and whether it is a current
+ * or A4AF source. Not just a cache-avoidance wrapper like the pre-port CDownloadListCtrl's
+ * FileCtrlItem_Struct -- genuinely necessary here, since one client (ECID) can be a source or peer
+ * of more than one file at once, so identity has to be the (client, owner, type) tuple, not the
+ * CClientRef alone. Public because CSourceBarRenderer, in the leaf's own .cpp, needs to read it
+ * back from a CBarFillSpec identity.
+ */
+struct ClientCtrlItem_Struct
+{
+	ClientCtrlItem_Struct()
+	: m_owner(nullptr)
+	, m_type(UNAVAILABLE_SOURCE)
+	{
+	}
+
+	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; }
+
+private:
+	CKnownFile *m_owner;
+	CClientRef m_sourceValue;
+	SourceItemType m_type;
 };
 
-struct CGenericClientListCtrlColumn {
+struct CGenericClientListCtrlColumn
+{
 	GenericColumnEnum cid;
 	wxString title;
 	int width;
 };
 
-struct GenericColumnInfo {
-	GenericColumnInfo(int n, CGenericClientListCtrlColumn* col) : n_columns(n), columns(col) { };
+struct GenericColumnInfo
+{
+	GenericColumnInfo(int n, CGenericClientListCtrlColumn *col)
+	: n_columns(n)
+	, columns(col) {};
 	int n_columns;
-	CGenericClientListCtrlColumn* columns;
+	CGenericClientListCtrlColumn *columns;
 };
 
-typedef std::vector<CKnownFile*> CKnownFileVector;
+typedef std::vector<CKnownFile *> CKnownFileVector;
 
 /**
- * This class is responsible for representing clients in a generic way.
+ * Represents clients in a generic way. Rows are addressed by ClientCtrlItem_Struct* identity --
+ * unlike every other ported list, that wrapper survives the port: a client (ECID) can be a source
+ * or peer of more than one file at once, so each row needs the client together with its owner file
+ * and A4AF/available type, not just the CClientRef alone.
  */
-
-class CGenericClientListCtrl : public CMuleListCtrl
+class CGenericClientListCtrl : public CMuleVirtualDataViewCtrl
 {
 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);
+	CGenericClientListCtrl(const wxString &tablename,
+		wxWindow *parent,
+		wxWindowID winid,
+		const wxPoint &pos,
+		const wxSize &size,
+		long style,
+		const wxString &name);
 
-	/**
-	 * Destructor.
-	 */
-	virtual	~CGenericClientListCtrl();
+	virtual ~CGenericClientListCtrl();
 
-	/**
-	 * Initializes the control. We need a 2-stage initialization so the derived class members can be called.
-	 */
-	 void InitColumnData();
+	/// Initializes the control. Two-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 );
+	/// Adds @a source as a source of @a owner, of @a type (current or A4AF). Added only if the
+	/// owner is shown; duplicates are ignored.
+	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 );
+	/// Removes the source with ID @a source from @a owner, or from every file when @a owner is
+	/// NULL.
+	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 );
+	/// Shows the clients of @a files. WARNING: the vector *MUST* be ordered 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.
-	 *
-	 */
+	/// Updates the state of client @a toupdate of @a type, possibly causing a redraw.
 	void UpdateItem(uint32 toupdate, SourceItemType type);
 
-	void SetShowing( bool status ) { m_showing = status; }
+	void SetShowing(bool status) { m_showing = status; }
 	bool GetShowing() const { return m_showing; }
 
 	/**
-	 * Drop every reference to `file` from this control before the
-	 * CKnownFile is destroyed. Called from
-	 * MuleNotify::KnownFileBeingDestroyed (see GuiEvents.cpp) for
-	 * every CKnownFile destruction site. The control walks
-	 * m_knownfiles by pointer-value comparison and erases matching
-	 * entries — does NOT dereference `file`, which by the time this
-	 * runs on the main thread is already freed. Also strips any
-	 * ClientCtrlItem_Struct rows whose m_owner matches.
+	 * Drop every reference to `file` from this control before the CKnownFile is destroyed.
 	 *
-	 * Without this, m_knownfiles would carry the dangling pointer
-	 * into the next ShowSources() call's `SetShowSources(_, false)`
-	 * loop and crash on the freed heap (issue #755).
+	 * Called from MuleNotify::KnownFileBeingDestroyed (see GuiEvents.cpp) for every CKnownFile
+	 * destruction site. The control walks m_knownfiles by pointer-value comparison and erases
+	 * matching entries -- it does NOT dereference `file`, which by the time this runs on the
+	 * main thread is already freed. It also strips any ClientCtrlItem_Struct rows whose m_owner
+	 * matches.
+	 *
+	 * Without this, m_knownfiles would carry the dangling pointer into the next ShowSources()
+	 * call's `SetShowSources(_, false)` loop and crash on the freed heap (issue #755).
 	 */
-	void RemoveKnownFile(CKnownFile* file);
+	void RemoveKnownFile(CKnownFile *file);
 
 protected:
 	// The columns with their attributes; MUST be defined by the derived class.
 	GenericColumnInfo m_columndata;
-	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData);
 
-private:
-	/**
-     *
-	 * Must be overridden by the derived class and return the dialog where this list is.
-     * @see CamuleDlg::DialogType
-	 *
-     */
-	virtual CamuleDlg::DialogType GetParentDialog() = 0;
+	/// Text of one cell, pulled on demand for the cells being drawn.
+	wxString GetItemColumnText(wxUIntPtr item, unsigned column) const override;
 
-	/**
-	 * Updates the displayed number representing the amount of clients currently shown.
-	 */
-	void ShowSourcesCount( int diff );
+	/// Per-row/per-column display attributes: the queue-rank-diff and
+	/// filename-mismatch colour cues DrawClientItem used to set on the wxDC.
+	bool GetItemAttr(wxUIntPtr item, unsigned column, wxDataViewItemAttr &attr) const override;
 
-	/**
-	 * Overloaded function needed for custom drawing of items.
-	 */
-	virtual void OnDrawItem( int item, wxDC* dc, const wxRect& rect, const wxRect& rectHL, bool highlighted );
+	/// Fill data for the Name column's composite icon+text renderer (see
+	/// CClientNameRenderer) and for a leaf's own bar column.
+	void GetItemBarFill(wxUIntPtr item, unsigned column, CBarFillSpec &out) const override;
 
-	/**
-	 * Draws a client item.
-	 */
-	void	DrawClientItem( wxDC* dc, int nColumn, const wxRect& rect, ClientCtrlItem_Struct* item, int iTextOffset, int iBitmapOffset, int iBitmapXSize ) const;
+	/// Single-column comparison for the base's sort chain, after the
+	/// type-precedence pre-check (A4AF sources always last).
+	int CompareItemData(
+		wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool alt, int modifier) const override;
 
-	/**
-	 * Draws the download status (chunk) bar for a client.
-	 */
-	void	DrawSourceStatusBar( const CClientRef& source, wxDC* dc, const wxRect& rect, bool  bFlat) const;
+	/// Live auto-sort: re-order when sorted by a column whose value changes during transfer
+	/// (speed, progress, up/downloaded, availability, queue rank). Static columns do not auto-
+	/// resort.
+	bool IsLiveSortColumn() const override;
 
-	/**
-	  * Draaws the file parts bar for a client.
-	  */
-	void	DrawStatusBar( const CClientRef& client, wxDC* dc, const wxRect& rect1 ) const;
+	/** Pause live auto-sort while the context menu is open. */
+	bool IsMenuOpen() const override { return m_menu != nullptr; }
 
-	/**
-	 * @see CMuleListCtrl::GetTTSText
-	 * Just a dummy
-	 */
-	virtual wxString GetTTSText(unsigned) const { return ""; }
+	//! Renderer for a leaf's own bar column (ColumnUserProgress for Sources,
+	//! ColumnUserAvailable for Peers). Sources overrides this to opt into the A4AF-badge-
+	//! drawing subclass; Peers' plain 2-state bar needs no subclass, so the default nullptr is
+	//! a plain CMuleBarRenderer.
+	virtual CMuleBarRenderer *CreateProgressBarRenderer() const { return nullptr; }
 
-	/**
-	 * Set "show sources" or "show peers" flag in Known File
-	 */
+private:
+	/// Must be overridden to return the dialog this list is in. @see CamuleDlg::DialogType
+	virtual CamuleDlg::DialogType GetParentDialog() = 0;
+
+	/// Updates the displayed count of clients currently shown.
+	void ShowSourcesCount(int diff);
+
+	/// Sets the "show sources" or "show peers" flag on a known file.
 	virtual void SetShowSources(CKnownFile *, bool) const = 0;
 
-	/**
-	 * Translate the CID to a unique string for saving column sizes
-	 * @see CMuleListCtrl::InsertColumn
-	 */
+	/// Translates the CID to a unique string for saving column sizes.
 	wxString TranslateCIDToName(GenericColumnEnum cid);
 
-	static int Compare( const CClientRef& client1, const CClientRef& client2, long lParamColumnSort);
+	int CompareByCid(GenericColumnEnum cid, const CClientRef &client1, const CClientRef &client2) const;
 
 	// 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 );
+	void OnSwapSource(wxCommandEvent &event);
+	void OnViewFiles(wxCommandEvent &event);
+	void OnAddFriend(wxCommandEvent &event);
+	void OnSetFriendslot(wxCommandEvent &event);
+	void OnSendMessage(wxCommandEvent &event);
+	void OnViewClientInfo(wxCommandEvent &event);
+	/// Opens the colour legend for this list's chunk-bar column. The bar has no other
+	/// explanation of what its colours mean (issue #1192), and the two variants of the column
+	/// -- ColumnUserProgress for Sources, ColumnUserAvailable for Peers -- have different
+	/// palettes, so the legend is chosen per cid (partbar::LegendForColumn).
+	void OnShowBarLegend(wxCommandEvent &event);
 
 	// Misc event-handlers
-	void	OnItemActivated( wxListEvent& event );
-	void	OnMouseRightClick( wxListEvent& event );
-	void	OnMouseMiddleClick( wxListEvent& event );
-	void	OnKeyPressed( wxKeyEvent& event );
+	void OnItemActivated(wxDataViewEvent &event);
+	void OnItemRightClicked(wxDataViewEvent &event);
+	/// Shows the client detail dialog for the row under the pointer. wxDataViewCtrl has no
+	/// dedicated middle-click item event, unlike wxListCtrl's EVT_LIST_ITEM_MIDDLE_CLICK, so
+	/// this is a raw mouse event resolved through HitTest() -- see
+	/// CDownloadListCtrl::OnItemActivated for why an event's item is resolved rather than read
+	/// off the selection.
+	void OnMouseMiddleClick(wxMouseEvent &event);
+
+	/// Index in m_columndata of the chunk-bar column this list shows, or -1 when there is none
+	/// on screen -- either the subclass declares no bar column, or the user has hidden the one
+	/// it declares. Found by asking partbar::LegendForColumn() about the list's own columns
+	/// rather than by naming cids here, so a subclass that gains or loses a bar column needs
+	/// nothing changed in this class.
+	int FindBarLegendColumn() const;
+
+	//! Pops up the legend of @a kind, titled with @a columnTitle. Swatches are filled from
+	//! partbar::SourcePartColour()/PeerPartColour(), the same functions GetItemBarFill() fills
+	//! the bar itself from.
+	void ShowBarLegend(partbar::BarLegendKind kind, const wxString &columnTitle);
+
+	/// The item the context menu was built for, by identity rather than row -- see the
+	/// identical field on CDownloadListCtrl for why (PopupMenu runs a nested event loop, so a
+	/// row index would not survive it).
+	wxUIntPtr m_menuItem = 0;
 
 	//! 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;
+	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;
+	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;
+	ListItems m_ListItems;
 
 	//! Pointer to the current menu object, used to avoid multiple menus.
-	wxMenu*		m_menu;
-	//! Cached brush object.
-	wxBrush	m_highlightBrush;
-	//! Cached brush object.
-	wxBrush	m_highlightUnfocusBrush;
+	wxMenu *m_menu;
 
 	//! The number of displayed sources
 	int m_clientcount;
@@ -266,8 +261,8 @@
 
 	bool m_showing;
 
-	void RawAddSource(CKnownFile* owner, CClientRef source, SourceItemType type);
-	void RawRemoveSource( ListItems::iterator& it );
+	void RawAddSource(CKnownFile *owner, CClientRef source, SourceItemType type);
+	void RawRemoveSource(ListItems::iterator &it);
 
 	virtual bool IsShowingDownloadSources() const = 0;
 };

amule-3.0.1.tar.gz/src/GetTickCount.cpp -> amule-3.1.0.tar.gz/src/GetTickCount.cpp Changed

@@ -26,24 +26,23 @@
 
 #include "GetTickCount.h" // Interface
 
-//seconds from app start-up, check GetTickCount.h
+// seconds from app start-up, check GetTickCount.h
 uint32 TheTime = 0;
 
 #ifdef __WINDOWS__
 
-void StartTickTimer(){};
+void StartTickTimer() {};
 
-void StopTickTimer(){};
+void StopTickTimer() {};
 
 /**
- * Returns the tickcount in milliseconds in 64bits.
+ * Returns the tickcount in milliseconds in 64 bits.
  */
 uint64 GetTickCount_64()
 {
-	// Use highres timer for all operations on Windows
-	// The Timer starts at system boot and runs (on a Intel Quad core)
-	// with 14 million ticks per second. So it won't overflow for
-	// 35000 years.
+	// Use the highres timer for all operations on Windows. It starts at system boot and runs at
+	// 14 million ticks per second on an Intel Quad core, so it will not overflow for 35000
+	// years.
 
 	// Convert hires ticks to milliseconds
 	static double tickFactor;
@@ -63,37 +62,34 @@
 
 #else
 
-#include <time.h>		// Needed for clock_gettime
+#include <time.h> // Needed for clock_gettime
 
-// in milliseconds, not seconds
-// avoids 32bit rollover error for differences above 50days
-// since 2**32 milliseconds = 50 days aprox
-uint64 GetTickCount64(void) {
+// In milliseconds, not seconds: avoids the 32-bit rollover error for differences above 50 days,
+// 2**32 milliseconds being roughly 50 days.
+uint64 GetTickCount64(void)
+{
 	struct timespec ts;
 	uint64 msecs;
 
-	// Fetch time (Y2038-safe)
-	// CLOCK_MONOTONIC: tick count is for timeouts / deltas, must not
-	// jump when wall clock is adjusted. Callers that need a Unix
-	// timestamp (CClientCredits::SetLastSeen, partfile source-seeds
-	// serialization, wxCas defaults) should use time(NULL) instead.
+	// Fetch time (Y2038-safe). CLOCK_MONOTONIC: the tick count is for timeouts and deltas and
+	// must not jump when the wall clock is adjusted. Callers needing a Unix timestamp
+	// (CClientCredits::SetLastSeen, partfile source-seeds serialization, wxCas defaults) should
+	// use time(NULL) instead.
 	clock_gettime(CLOCK_MONOTONIC, &ts);
-	msecs = (uint64) ts.tv_sec * 1000;
+	msecs = (uint64)ts.tv_sec * 1000;
 	msecs += ts.tv_nsec / 1000000;
 	return msecs;
 }
 
 /**
  * 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
- * increasingly heavy on CPU as the program uptime increases and more things
- * need to be done.
+ *
+ * gettimeofday() syscall based implementation. Each GetTickCount() call produces a new syscall, so
+ * it grows increasingly heavy on CPU as uptime increases and more things need doing.
  */
-	void StartTickTimer() {}
+void StartTickTimer() {}
 
-	void StopTickTimer() {}
+void StopTickTimer() {}
 
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/GetTickCount.h -> amule-3.1.0.tar.gz/src/GetTickCount.h Changed

amule-3.0.1.tar.gz/src/GuiEvents.cpp -> amule-3.1.0.tar.gz/src/GuiEvents.cpp Changed

@@ -24,20 +24,24 @@
 
 #include "GuiEvents.h"
 #include "amule.h"
-#include <common/MenuIDs.h>		// MP_PAUSE/STOP/RESUME/CANCEL + MP_PRIO* for the
+#ifndef CLIENT_GUI
+#include "ClientList.h"   // Needed for FindClientByECID (Browse_Started)
+#include "updownclient.h" // Needed for IsBrowseEcInitiated (Browse_Started)
+#endif
+#include <common/MenuIDs.h> // MP_PAUSE/STOP/RESUME/CANCEL + MP_PRIO* for the
 #ifndef AMULE_DAEMON
-#include "CommentDialog.h"		// CCommentDialog::DropReferencesTo
-#include "CommentDialogLst.h"		// CCommentDialogLst::DropReferencesTo
-#include "FileDetailDialog.h"		// CFileDetailDialog::DropReferencesTo
-#include "GenericClientListCtrl.h"	// CGenericClientListCtrl::RemoveKnownFile
-#include "TransferWnd.h"		// access to m_transferwnd->clientlistctrl
-#include "SharedFilesWnd.h"		// access to m_sharedfileswnd->peerslistctrl
+#include "CommentDialog.h"         // CCommentDialog::DropReferencesTo
+#include "CommentDialogLst.h"      // CCommentDialogLst::DropReferencesTo
+#include "FileDetailDialog.h"      // CFileDetailDialog::DropReferencesTo
+#include "GenericClientListCtrl.h" // CGenericClientListCtrl::RemoveKnownFile
+#include "TransferWnd.h"           // access to m_transferwnd->clientlistctrl
+#include "SharedFilesWnd.h"        // access to m_sharedfileswnd->peerslistctrl
 #endif
 #ifndef CLIENT_GUI
-#include "SHAHashSet.h"			// CAICHHashSet::DropReferencesTo
-#include "PartFileWriteThread.h"	// CPartFileWriteThread::DropReferencesTo
+#include "SHAHashSet.h"          // CAICHHashSet::DropReferencesTo
+#include "PartFileWriteThread.h" // CPartFileWriteThread::DropReferencesTo
 #endif
-					// CLIENT_GUI implementations of Download_Set_Cat_*
+// CLIENT_GUI implementations of Download_Set_Cat_*
 #include "PartFile.h"
 #include "DownloadQueue.h"
 #include "ServerList.h"
@@ -49,34 +53,32 @@
 #include "Friend.h"
 #include "Logger.h"
 
-#ifdef __WXMAC__
-#include "MacAppHelper.h"	// mac_set_accessory_mode
-#endif
-
 #ifndef AMULE_DAEMON
-#	include "ChatWnd.h"
-#	include "amuleDlg.h"
-#	include "ServerWnd.h"
-#	include "SearchDlg.h"
-#	include "TransferWnd.h"
-#	include "SharedFilesWnd.h"
-#	include "ServerListCtrl.h"
-#	include "SourceListCtrl.h"
-#	include "SharedFilesCtrl.h"
-#	include "DownloadListCtrl.h"
-#	include "muuli_wdr.h"
-#	include "SharedFilePeersListCtrl.h"
-#	ifndef CLIENT_GUI
-#		include "PartFileConvertDlg.h"
-#		include "PartFileConvert.h"
-#	endif
+#include "ChatWnd.h"
+#include "amuleDlg.h"
+#include "ClientRef.h" // Needed for CClientRef
+#include "ServerWnd.h"
+#include "SearchDlg.h"
+#include "SearchListModel.h" // Needed for CSearchListModel::DropReferencesTo
+#include "TransferWnd.h"
+#include "SharedFilesWnd.h"
+#include "ServerListCtrl.h"
+#include "SourceListCtrl.h"
+#include "SharedFilesCtrl.h"
+#include "DownloadListCtrl.h"
+#include "muuli_wdr.h"
+#include "SharedFilePeersListCtrl.h"
+#ifndef CLIENT_GUI
+#include "PartFileConvertDlg.h"
+#include "PartFileConvert.h"
+#endif
 #endif
 
 #ifndef CLIENT_GUI
-#	include "UploadQueue.h"
-#	include "EMSocket.h"
-#	include "ListenSocket.h"
-#	include "MuleUDPSocket.h"
+#include "UploadQueue.h"
+#include "EMSocket.h"
+#include "ListenSocket.h"
+#include "MuleUDPSocket.h"
 #endif
 
 #include <common/MacrosProgramSpecific.h>
@@ -86,877 +88,942 @@
 namespace MuleNotify
 {
 
-	void HandleNotification(const CMuleNotiferBase& ntf)
-	{
-		if (wxThread::IsMain()) {
+void HandleNotification(const CMuleNotiferBase &ntf)
+{
+	if (wxThread::IsMain()) {
 #ifdef AMULE_DAEMON
-			ntf.Notify();
+		ntf.Notify();
 #else
-			if (theApp->amuledlg) {
-				ntf.Notify();
-			}
-#endif
-		} else {
-			CMuleGUIEvent evt(ntf.Clone());
-			wxQueueEvent(wxTheApp, (evt).Clone());
+		if (theApp->amuledlg) {
+			ntf.Notify();
 		}
-	}
-
-
-	void HandleNotificationAlways(const CMuleNotiferBase& ntf)
-	{
+#endif
+	} else {
 		CMuleGUIEvent evt(ntf.Clone());
 		wxQueueEvent(wxTheApp, (evt).Clone());
 	}
+}
 
+void HandleNotificationAlways(const CMuleNotiferBase &ntf)
+{
+	// Tagged so the handler runs it even with no main window: this is the path the socket layer
+	// uses, and amulegui has no window until the EC connection it is carrying has been made.
+	CMuleGUIEvent evt(ntf.Clone(), true);
+	wxQueueEvent(wxTheApp, (evt).Clone());
+}
 
-	void Search_Add_Download(CSearchFile* file, uint8 category)
-	{
-		theApp->downloadqueue->AddSearchToDownload(file, category);
-	}
-
+void Search_Add_Download(CSearchFile *file, uint8 category)
+{
+	theApp->downloadqueue->AddSearchToDownload(file, category);
+}
 
-	void ShowUserCount(wxString NOT_ON_DAEMON(str))
-	{
+void ShowUserCount(wxString NOT_ON_DAEMON(str))
+{
 #ifndef AMULE_DAEMON
-		theApp->amuledlg->ShowUserCount(str);
+	theApp->amuledlg->ShowUserCount(str);
 #endif
-	}
+}
 
+// Fired by the core version check on the monolithic app so the outdated-version popup is driven
+// from the shared engine instead of a GUI-only CVersionCheck. A no-op on the daemon, and never
+// fired in amulegui, which runs its own check.
+//
+// `latest` is by value because MuleNotify stores every argument by value and invokes the handler
+// with it, so a const& parameter would leave that stored member a dangling reference.
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void VersionCheckResult(wxString NOT_ON_DAEMON(latest), bool NOT_ON_DAEMON(outdated))
+{
+#ifndef AMULE_DAEMON
+	if (outdated && theApp->amuledlg) {
+		theApp->amuledlg->ShowVersionAvailable(latest);
+	}
+#endif
+}
 
-	void Search_Update_Progress(uint32 NOT_ON_DAEMON(val))
-	{
+void Search_Update_Progress(uint32 NOT_ON_DAEMON(val))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_searchwnd) {
-			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);
-			}
-		}
+	if (theApp->amuledlg->m_searchwnd) {
+		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 {
+#ifdef CLIENT_GUI
+			// Remote GUI single-search fallback (old daemon without
+			// multi-search): drive the bar from the scalar value.
+			theApp->amuledlg->m_searchwnd->UpdateProgress(val);
+#else
+			// Monolithic: re-derive the bar from the VISIBLE tab's core lifecycle so a
+			// background search's progress never bleeds onto another tab's bar (val is
+			// the current search's scalar).
+			theApp->amuledlg->m_searchwnd->RefreshVisibleTabProgress();
 #endif
+		}
 	}
+#endif
+}
 
-
-	void DownloadCtrlUpdateItem(const void* item)
-	{
+void DownloadCtrlUpdateItem(const void *item)
+{
 #ifndef CLIENT_GUI
-		// Notify can fire from PartFile load during early OnInit (#268
-		// crash from a wx2.8.12 / pre-ASIO build) and from background
-		// threads during shutdown after `delete ECServerHandler`.
-		// Master's OnInit currently builds ECServerHandler before
-		// LoadMetFiles, so the early-init crash is fixed by ordering;
-		// guard the dereference anyway so future reorders or
-		// shutdown races can't reintroduce the segfault.
-		if (theApp->ECServerHandler && theApp->ECServerHandler->m_ec_notifier) {
-			theApp->ECServerHandler->m_ec_notifier->DownloadFile_SetDirty(static_cast<const CPartFile*>(item));
-		}
+	// Notify can fire from PartFile load during early OnInit and from background threads during
+	// shutdown after `delete ECServerHandler`. OnInit currently builds ECServerHandler before
+	// LoadMetFiles, so the early-init crash (#268) is fixed by ordering; the guard keeps a
+	// future reorder or shutdown race from reintroducing the segfault.
+	if (theApp->ECServerHandler && theApp->ECServerHandler->m_ec_notifier) {
+		theApp->ECServerHandler->m_ec_notifier->DownloadFile_SetDirty(
+			static_cast<const CPartFile *>(item));
+	}
 #endif
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
-			theApp->amuledlg->m_transferwnd->downloadlistctrl->UpdateItem(item);
-		}
-#endif
+	if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->UpdateItem(item);
 	}
+#endif
+}
 
-
-	void DownloadCtrlDoItemSelectionChanged()
-	{
+void DownloadCtrlDoItemSelectionChanged()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
-			theApp->amuledlg->m_transferwnd->downloadlistctrl->DoItemSelectionChanged();
-		}
-#endif
+	// Checks the dialog itself, unlike its siblings: this one is queued through
+	// DoNotifyAlways(), so the handler runs even with no main window -- the exemption that lets
+	// the socket layer through during connect. Everything else on that path never touches the
+	// GUI, so these two carry the test themselves.
+	if (theApp->amuledlg && theApp->amuledlg->m_transferwnd &&
+		theApp->amuledlg->m_transferwnd->downloadlistctrl) {
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->DoItemSelectionChanged();
 	}
+#endif
+}
 
-
-	void NodesURLChanged(wxString NOT_ON_DAEMON(url))
-	{
+void NodesURLChanged(wxString NOT_ON_DAEMON(url))
+{
 #ifndef AMULE_DAEMON
-		CastByID(IDC_NODESLISTURL, NULL, wxTextCtrl)->SetValue(url);
+	CastByID(IDC_NODESLISTURL, NULL, wxTextCtrl)->SetValue(url);
 #endif
-	}
+}
 
-	void ServersURLChanged(wxString NOT_ON_DAEMON(url))
-	{
+void ServersURLChanged(wxString NOT_ON_DAEMON(url))
+{
 #ifndef AMULE_DAEMON
-		CastByID(IDC_SERVERLISTURL, NULL, wxTextCtrl)->SetValue(url);
+	CastByID(IDC_SERVERLISTURL, NULL, wxTextCtrl)->SetValue(url);
 #endif
-	}
+}
 
-	void ShowGUI()
-	{
+void ShowGUI()
+{
 #ifndef AMULE_DAEMON
-		// Triggered from a duplicate-launch RAISE_DIALOG signal (the
-		// running instance picks it up via ED2KLinks polling) and
-		// from MacReopenApp when the user clicks the Dock icon. Cover
-		// every hidden state the main window can be in:
-		//   * Show(false) via the close-button HideOnClose path
-		//   * Iconize(true) via the minimize-to-tray path
-		//   * just behind another app's window
-#ifdef __WXMAC__
-		// If we're still in accessory mode (window was hidden via the
-		// tray), restore the regular Dock icon before the window
-		// comes back, otherwise activate-ignoring-other-apps lands on
-		// a Dock-less app and the focus shift is invisible.
-		mac_set_accessory_mode(false);
-#endif
-		theApp->amuledlg->Show(true);
-		theApp->amuledlg->Iconize(false);
-		theApp->amuledlg->Raise();
-#endif
+	// Triggered by a duplicate-launch RAISE_DIALOG signal, which the running instance picks up
+	// via ED2KLinks polling. It can arrive before the main window exists: the second launch
+	// only has to beat the first one to building its GUI.
+	if (theApp->amuledlg) {
+		theApp->amuledlg->RestoreMainWindow();
 	}
+#endif
+}
 
-	void SourceCtrlUpdateSource(uint32 NOT_ON_DAEMON(source), SourceItemType NOT_ON_DAEMON(type))
-	{
+void SourceCtrlUpdateSource(uint32 NOT_ON_DAEMON(source), SourceItemType NOT_ON_DAEMON(type))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
-			theApp->amuledlg->m_transferwnd->clientlistctrl->UpdateItem(source, type);
-		}
-#endif
+	if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
+		theApp->amuledlg->m_transferwnd->clientlistctrl->UpdateItem(source, type);
 	}
+#endif
+}
 
-	void SourceCtrlAddSource(CPartFile* NOT_ON_DAEMON(owner), CClientRef NOT_ON_DAEMON(source), SourceItemType NOT_ON_DAEMON(type))
-	{
+void SourceCtrlAddSource(
+	CPartFile *NOT_ON_DAEMON(owner), CClientRef NOT_ON_DAEMON(source), SourceItemType NOT_ON_DAEMON(type))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
-			theApp->amuledlg->m_transferwnd->clientlistctrl->AddSource(owner, source, type);
-		}
-#endif
+	if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
+		theApp->amuledlg->m_transferwnd->clientlistctrl->AddSource(owner, source, type);
 	}
+#endif
+}
 
-	void SourceCtrlRemoveSource(uint32 NOT_ON_DAEMON(source), const CPartFile* NOT_ON_DAEMON(owner))
-	{
+void SourceCtrlRemoveSource(uint32 NOT_ON_DAEMON(source), const CPartFile *NOT_ON_DAEMON(owner))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
-			theApp->amuledlg->m_transferwnd->clientlistctrl->RemoveSource(source, owner);
-		}
-#endif
+	if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
+		theApp->amuledlg->m_transferwnd->clientlistctrl->RemoveSource(source, owner);
 	}
+#endif
+}
 
-	void SharedCtrlAddClient(CKnownFile* NOT_ON_DAEMON(owner), CClientRef NOT_ON_DAEMON(source), SourceItemType NOT_ON_DAEMON(type))
-	{
+void SharedCtrlAddClient(CKnownFile *NOT_ON_DAEMON(owner),
+	CClientRef NOT_ON_DAEMON(source),
+	SourceItemType NOT_ON_DAEMON(type))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
-			theApp->amuledlg->m_sharedfileswnd->peerslistctrl->AddSource(owner, source, type);
-		}
-#endif
+	if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
+		theApp->amuledlg->m_sharedfileswnd->peerslistctrl->AddSource(owner, source, type);
 	}
+#endif
+}
 
-	void SharedCtrlRefreshClient(uint32 NOT_ON_DAEMON(client), SourceItemType NOT_ON_DAEMON(type))
-	{
+void SharedCtrlRefreshClient(uint32 NOT_ON_DAEMON(client), SourceItemType NOT_ON_DAEMON(type))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
-			theApp->amuledlg->m_sharedfileswnd->peerslistctrl->UpdateItem(client, type);
-		}
-#endif
+	if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
+		theApp->amuledlg->m_sharedfileswnd->peerslistctrl->UpdateItem(client, type);
 	}
+#endif
+}
 
-	void SharedCtrlRemoveClient(uint32 NOT_ON_DAEMON(source), const CKnownFile* NOT_ON_DAEMON(owner))
-	{
+void SharedCtrlRemoveClient(uint32 NOT_ON_DAEMON(source), const CKnownFile *NOT_ON_DAEMON(owner))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
-			theApp->amuledlg->m_sharedfileswnd->peerslistctrl->RemoveSource(source, owner);
-		}
-#endif
+	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))
-	{
+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
+	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))
-	{
+void ChatUpdateFriend(CFriend *NOT_ON_DAEMON(toupdate))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_chatwnd) {
-			theApp->amuledlg->m_chatwnd->UpdateFriend(toupdate);
-		}
-#endif
+	if (theApp->amuledlg->m_chatwnd) {
+		theApp->amuledlg->m_chatwnd->UpdateFriend(toupdate);
 	}
+#endif
+}
 
-	void ChatRemoveFriend(CFriend * toremove)
-	{
+void ChatRemoveFriend(CFriend *toremove)
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_chatwnd) {
-			theApp->amuledlg->m_chatwnd->RemoveFriend(toremove);
-		}
+	if (theApp->amuledlg->m_chatwnd) {
+		theApp->amuledlg->m_chatwnd->RemoveFriend(toremove);
+	}
 #endif
-		delete toremove;
+	delete toremove;
+}
+
+void SharedFilesUpdateItem(CKnownFile *NOT_ON_DAEMON(file))
+{
+#ifndef AMULE_DAEMON
+	if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->UpdateItem(file);
 	}
+#endif
+}
 
 #ifdef CLIENT_GUI
 
-	void PartFile_Swap_A4AF(CPartFile* file)
-	{
-		theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_SWAP_A4AF_THIS);
-	}
+void PartFile_Swap_A4AF(CPartFile *file)
+{
+	theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_SWAP_A4AF_THIS);
+}
 
-	void PartFile_Swap_A4AF_Auto(CPartFile* file)
-	{
-		theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO);
-	}
+void PartFile_Swap_A4AF_Auto(CPartFile *file)
+{
+	theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO);
+}
 
-	void PartFile_Swap_A4AF_Others(CPartFile* file)
-	{
-		theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_SWAP_A4AF_OTHERS);
-	}
+void PartFile_Swap_A4AF_Others(CPartFile *file)
+{
+	theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_SWAP_A4AF_OTHERS);
+}
 
-	void PartFile_Pause(CPartFile* file)
-	{
-		theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_PAUSE);
-	}
+void PartFile_Pause(CPartFile *file)
+{
+	theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_PAUSE);
+}
 
-	void PartFile_Resume(CPartFile* file)
-	{
-		theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_RESUME);
-	}
+void PartFile_Resume(CPartFile *file)
+{
+	theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_RESUME);
+}
 
-	void PartFile_Stop(CPartFile* file)
-	{
-		theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_STOP);
-	}
+void PartFile_Stop(CPartFile *file)
+{
+	theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_STOP);
+}
 
-	void PartFile_PrioAuto(CPartFile* file, bool val)
-	{
-		theApp->downloadqueue->AutoPrio(file, val);
-	}
+void PartFile_PrioAuto(CPartFile *file, bool val)
+{
+	theApp->downloadqueue->AutoPrio(file, val);
+}
 
-	void PartFile_PrioSet(CPartFile* file, uint8 newDownPriority, bool)
-	{
-		theApp->downloadqueue->Prio(file, newDownPriority);
-	}
+void PartFile_PrioSet(CPartFile *file, uint8 newDownPriority, bool)
+{
+	theApp->downloadqueue->Prio(file, newDownPriority);
+}
 
-	void PartFile_Delete(CPartFile* file)
-	{
-		theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_DELETE);
-	}
+void PartFile_Delete(CPartFile *file)
+{
+	theApp->downloadqueue->SendFileCommand(file, EC_OP_PARTFILE_DELETE);
+}
 
-	void PartFile_SetCat(CPartFile* file, uint32 val)
-	{
-		theApp->downloadqueue->Category(file, val);
-	}
+void PartFile_SetCat(CPartFile *file, uint32 val)
+{
+	theApp->downloadqueue->Category(file, val);
+}
 
-	void KnownFile_Up_Prio_Set(CKnownFile* file, uint8 val)
-	{
-		theApp->sharedfiles->SetFilePrio(file, val);
-	}
+void KnownFile_Up_Prio_Set(CKnownFile *file, uint8 val)
+{
+	theApp->sharedfiles->SetFilePrio(file, val);
+}
 
-	void KnownFile_Up_Prio_Auto(CKnownFile* file)
-	{
-		theApp->sharedfiles->SetFilePrio(file, PR_AUTO);
-	}
+void KnownFile_Up_Prio_Auto(CKnownFile *file)
+{
+	theApp->sharedfiles->SetFilePrio(file, PR_AUTO);
+}
 
-	void KnownFile_Comment_Set(CKnownFile* file, wxString comment, int8 rating)
-	{
-		theApp->sharedfiles->SetFileCommentRating(file, comment, rating);
-	}
+void KnownFile_Comment_Set(CKnownFile *file, wxString comment, int8 rating)
+{
+	theApp->sharedfiles->SetFileCommentRating(file, comment, rating);
+}
 
-	void Download_Set_Cat_Prio(uint8 cat, uint8 newprio)
-	{
-		// EC has no per-category bulk priority opcode. Mirror the daemon's
-		// CDownloadQueue::SetCatPrio predicate (all files if cat == 0, else
-		// exact category match) and send one EC_OP_PARTFILE_PRIO_SET per
-		// file using the existing per-file helpers. Without this stub being
-		// filled in, amulegui's category-tab right-click priority items
-		// silently no-op'd (#697 sibling of the status case below).
-		std::vector<CPartFile*> targets;
-		for (CDownQueueRem::iterator it = theApp->downloadqueue->begin();
-				it != theApp->downloadqueue->end(); ++it) {
-			CPartFile *file = it->second;
-			if (!cat || file->GetCategory() == cat) {
-				targets.push_back(file);
-			}
+void Download_Set_Cat_Prio(uint8 cat, uint8 newprio)
+{
+	// EC has no per-category bulk priority opcode. Mirror the daemon's
+	// CDownloadQueue::SetCatPrio predicate (all files if cat == 0, else exact category match)
+	// and send one EC_OP_PARTFILE_PRIO_SET per file. Unfilled, this stub made amulegui's
+	// category-tab right-click priority items silently no-op.
+	std::vector<CPartFile *> targets;
+	for (CDownQueueRem::iterator it = theApp->downloadqueue->begin(); it != theApp->downloadqueue->end();
+		++it) {
+		CPartFile *file = it->second;
+		if (!cat || file->GetCategory() == cat) {
+			targets.push_back(file);
 		}
-		for (std::vector<CPartFile*>::iterator it = targets.begin();
-				it != targets.end(); ++it) {
-			if (newprio == PR_AUTO) {
-				theApp->downloadqueue->AutoPrio(*it, true);
-			} else {
-				theApp->downloadqueue->Prio(*it, newprio);
-			}
+	}
+	for (std::vector<CPartFile *>::iterator it = targets.begin(); it != targets.end(); ++it) {
+		if (newprio == PR_AUTO) {
+			theApp->downloadqueue->AutoPrio(*it, true);
+		} else {
+			theApp->downloadqueue->Prio(*it, newprio);
 		}
 	}
+}
 
-	void Download_Set_Cat_Status(uint8 cat, int newstatus)
-	{
-		// EC has no per-category bulk status opcode. Mirror the daemon's
-		// CDownloadQueue::SetCatStatus: snapshot files that
-		// CheckShowItemInGivenCat() admits for this (cat, AllcatFilter)
-		// pair, then send one per-file EC command. Snapshot first so a
-		// late-arriving EC response can't mutate the queue mid-iteration.
-		// #697: previously empty -- tab-right-click Stop/Pause/Resume/
-		// Cancel silently no-op'd in amulegui (only the remote GUI, not
-		// the monolithic amule, hit this stub).
-		ec_tagname_t cmd = 0;
-		switch (newstatus) {
-			case MP_CANCEL:	cmd = EC_OP_PARTFILE_DELETE;	break;
-			case MP_PAUSE:	cmd = EC_OP_PARTFILE_PAUSE;	break;
-			case MP_STOP:	cmd = EC_OP_PARTFILE_STOP;	break;
-			case MP_RESUME:	cmd = EC_OP_PARTFILE_RESUME;	break;
-			default:	return;
-		}
-		std::vector<CPartFile*> targets;
-		for (CDownQueueRem::iterator it = theApp->downloadqueue->begin();
-				it != theApp->downloadqueue->end(); ++it) {
-			if (it->second->CheckShowItemInGivenCat(cat)) {
-				targets.push_back(it->second);
-			}
-		}
-		for (std::vector<CPartFile*>::iterator it = targets.begin();
-				it != targets.end(); ++it) {
-			theApp->downloadqueue->SendFileCommand(*it, cmd);
+void Download_Set_Cat_Status(uint8 cat, int newstatus)
+{
+	// EC has no per-category bulk status opcode. Mirror the daemon's
+	// CDownloadQueue::SetCatStatus: snapshot the files CheckShowItemInGivenCat() admits for
+	// this (cat, AllcatFilter) pair, then send one per-file EC command. Snapshot first so a
+	// late-arriving EC response cannot mutate the queue mid-iteration. Unfilled, this stub made
+	// tab-right-click Stop/Pause/Resume/Cancel silently no-op in amulegui.
+	ec_tagname_t cmd = 0;
+	switch (newstatus) {
+	case MP_CANCEL:
+		cmd = EC_OP_PARTFILE_DELETE;
+		break;
+	case MP_PAUSE:
+		cmd = EC_OP_PARTFILE_PAUSE;
+		break;
+	case MP_STOP:
+		cmd = EC_OP_PARTFILE_STOP;
+		break;
+	case MP_RESUME:
+		cmd = EC_OP_PARTFILE_RESUME;
+		break;
+	default:
+		return;
+	}
+	std::vector<CPartFile *> targets;
+	for (CDownQueueRem::iterator it = theApp->downloadqueue->begin(); it != theApp->downloadqueue->end();
+		++it) {
+		if (it->second->CheckShowItemInGivenCat(cat)) {
+			targets.push_back(it->second);
 		}
 	}
-
-	void Upload_Resort_Queue()
-	{
+	for (std::vector<CPartFile *>::iterator it = targets.begin(); it != targets.end(); ++it) {
+		theApp->downloadqueue->SendFileCommand(*it, cmd);
 	}
+}
+
+void Upload_Resort_Queue() {}
 
 #else
 
-	void SharedFilesShowFile(CKnownFile* NOT_ON_DAEMON(file))
-	{
+void SharedFilesShowFile(CKnownFile *NOT_ON_DAEMON(file))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
-			theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFile(file);
-		}
-#endif
+	if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFile(file);
 	}
+#endif
+}
 
-	void SharedFilesRemoveFile(CKnownFile* NOT_ON_DAEMON(file))
-	{
+void SharedFilesRemoveFile(CKnownFile *NOT_ON_DAEMON(file))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
-			theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->RemoveFile(file);
-		}
-#endif
+	if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->RemoveFile(file);
 	}
+#endif
+}
 
-	void SharedFilesRemoveAllFiles()
-	{
+void SharedFilesRemoveAllFiles()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_sharedfileswnd) {
-			theApp->amuledlg->m_sharedfileswnd->RemoveAllSharedFiles();
-		}
-#endif
+	if (theApp->amuledlg->m_sharedfileswnd) {
+		theApp->amuledlg->m_sharedfileswnd->RemoveAllSharedFiles();
 	}
+#endif
+}
 
-
-	void SharedFilesShowFileList()
-	{
+void SharedFilesShowFileList()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
-			theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFileList();
-		}
-#endif
+	if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFileList();
 	}
+#endif
+}
 
-
-	void SharedFilesUpdateItem(CKnownFile* NOT_ON_DAEMON(file))
-	{
+void SharedFilesBeginBulkUpdate()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
-			theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->UpdateItem(file);
-		}
-#endif
+	if (theApp->amuledlg && theApp->amuledlg->m_sharedfileswnd &&
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->BeginBulkUpdate();
 	}
+#endif
+}
 
-
-	void SharedFilesBeginBulkUpdate()
-	{
+void SharedFilesEndBulkUpdate()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg && theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
-			theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->BeginBulkUpdate();
-		}
-#endif
+	if (theApp->amuledlg && theApp->amuledlg->m_sharedfileswnd &&
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->EndBulkUpdate();
 	}
+#endif
+}
 
-
-	void SharedFilesEndBulkUpdate()
-	{
+void DownloadCtrlAddFile(CPartFile *file)
+{
+	// See DownloadCtrlUpdateItem above for the rationale; the
+	// notifier can be NULL during init or shutdown.
+	if (theApp->ECServerHandler && theApp->ECServerHandler->m_ec_notifier) {
+		theApp->ECServerHandler->m_ec_notifier->DownloadFile_AddFile(file);
+	}
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg && theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
-			theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->EndBulkUpdate();
-		}
-#endif
+	if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->AddFile(file);
 	}
+#endif
+}
 
-
-	void DownloadCtrlAddFile(CPartFile* file)
-	{
-		// See DownloadCtrlUpdateItem above for the rationale; the
-		// notifier can be NULL during init or shutdown.
-		if (theApp->ECServerHandler && theApp->ECServerHandler->m_ec_notifier) {
-			theApp->ECServerHandler->m_ec_notifier->DownloadFile_AddFile(file);
-		}
+void DownloadCtrlRemoveFile(CPartFile *file)
+{
+	if (theApp->ECServerHandler && theApp->ECServerHandler->m_ec_notifier) {
+		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->AddFile(file);
-		}
-#endif
+	if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->RemoveFile(file);
 	}
+#endif
+}
 
-	void DownloadCtrlRemoveFile(CPartFile* file)
-	{
-		if (theApp->ECServerHandler && theApp->ECServerHandler->m_ec_notifier) {
-			theApp->ECServerHandler->m_ec_notifier->DownloadFile_RemoveFile(file);
-		}
+void DownloadCtrlSort()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
-			theApp->amuledlg->m_transferwnd->downloadlistctrl->RemoveFile(file);
-		}
-#endif
+	// Checks the dialog itself, unlike its siblings: this one is queued through
+	// DoNotifyAlways(), so the handler runs even with no main window -- the exemption that lets
+	// the socket layer through during connect. Everything else on that path never touches the
+	// GUI, so these two carry the test themselves.
+	if (theApp->amuledlg && theApp->amuledlg->m_transferwnd &&
+		theApp->amuledlg->m_transferwnd->downloadlistctrl) {
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->SortList();
 	}
+#endif
+}
 
-	void DownloadCtrlSort()
-	{
+void ServerAdd(CServer *NOT_ON_DAEMON(server))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
-			theApp->amuledlg->m_transferwnd->downloadlistctrl->SortList();
-		}
-#endif
+	if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
+		theApp->amuledlg->m_serverwnd->serverlistctrl->AddServer(server);
 	}
+#endif
+}
 
-	void ServerAdd(CServer* NOT_ON_DAEMON(server))
-	{
+void ServerRemove(CServer *NOT_ON_DAEMON(server))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
-			theApp->amuledlg->m_serverwnd->serverlistctrl->AddServer(server);
-		}
+	if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
+		theApp->amuledlg->m_serverwnd->serverlistctrl->RemoveServer(server);
+	}
 #endif
+}
+
+void ServerRemoveDead()
+{
+	if (theApp->serverlist) {
+		theApp->serverlist->RemoveDeadServers();
 	}
+}
 
-	void ServerRemove(CServer* NOT_ON_DAEMON(server))
-	{
+void ServerRemoveAll()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
-			theApp->amuledlg->m_serverwnd->serverlistctrl->RemoveServer(server);
-		}
-#endif
+	if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
+		theApp->amuledlg->m_serverwnd->serverlistctrl->DeleteAllItems();
 	}
+#endif
+}
 
-	void ServerRemoveDead()
-	{
-		if (theApp->serverlist) {
-			theApp->serverlist->RemoveDeadServers();
-		}
+void ServerHighlight(CServer *NOT_ON_DAEMON(server), bool NOT_ON_DAEMON(highlight))
+{
+#ifndef AMULE_DAEMON
+	if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
+		theApp->amuledlg->m_serverwnd->serverlistctrl->HighlightServer(server, highlight);
 	}
+#endif
+}
 
-	void ServerRemoveAll()
-	{
+void ServerFreeze()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
-			theApp->amuledlg->m_serverwnd->serverlistctrl->DeleteAllItems();
-		}
-#endif
+	if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
+		theApp->amuledlg->m_serverwnd->serverlistctrl->Freeze();
 	}
+#endif
+}
 
-	void ServerHighlight(CServer* NOT_ON_DAEMON(server), bool NOT_ON_DAEMON(highlight))
-	{
+void ServerThaw()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
-			theApp->amuledlg->m_serverwnd->serverlistctrl->HighlightServer(server, highlight);
-		}
-#endif
+	if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
+		theApp->amuledlg->m_serverwnd->serverlistctrl->Thaw();
+		// A bulk (re)load just finished -- size the columns to their
+		// content once, now that every row is present.
+		theApp->amuledlg->m_serverwnd->serverlistctrl->FitColumnsToContent();
 	}
+#endif
+}
 
-	void ServerFreeze()
-	{
+void ServerUpdateED2KInfo()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
-			theApp->amuledlg->m_serverwnd->serverlistctrl->Freeze();
-		}
-#endif
+	if (theApp->amuledlg->m_serverwnd) {
+		theApp->amuledlg->m_serverwnd->UpdateED2KInfo();
 	}
+#endif
+}
 
-	void ServerThaw()
-	{
+void ServerUpdateKadKInfo()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
-			theApp->amuledlg->m_serverwnd->serverlistctrl->Thaw();
-		}
-#endif
+	if (theApp->amuledlg->m_serverwnd) {
+		theApp->amuledlg->m_serverwnd->UpdateKadInfo();
 	}
+#endif
+}
 
-	void ServerUpdateED2KInfo()
-	{
+void SearchCancel()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_serverwnd) {
-			theApp->amuledlg->m_serverwnd->UpdateED2KInfo();
-		}
-#endif
+	if (theApp->amuledlg->m_searchwnd) {
+		theApp->amuledlg->m_searchwnd->ResetControls();
 	}
+#endif
+}
 
-	void ServerUpdateKadKInfo()
-	{
+void SearchLocalEnd()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_serverwnd) {
-			theApp->amuledlg->m_serverwnd->UpdateKadInfo();
-		}
-#endif
+	if (theApp->amuledlg->m_searchwnd) {
+		theApp->amuledlg->m_searchwnd->LocalSearchEnd();
 	}
+#endif
+}
 
-
-	void SearchCancel()
-	{
+void KadSearchEnd(uint32 id)
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_searchwnd) {
-			theApp->amuledlg->m_searchwnd->ResetControls();
-		}
-#endif
+	if (theApp->amuledlg->m_searchwnd) {
+		theApp->amuledlg->m_searchwnd->KadSearchEnd(id);
 	}
+#endif
+	// Record this specific Kad search as finished (per-search completion for
+	// multi-search progress). Used on the daemon and monolithic builds.
+	theApp->searchlist->SetKadSearchFinished(id);
+}
 
-	void SearchLocalEnd()
-	{
+void Search_Update_Sources(CSearchFile *result)
+{
+	result->SetDownloadStatus();
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_searchwnd) {
-			theApp->amuledlg->m_searchwnd->LocalSearchEnd();
-		}
-#endif
+	if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+		theApp->amuledlg->m_searchwnd->UpdateResult(result);
 	}
+#endif
+}
 
-	void KadSearchEnd(uint32 NOT_ON_DAEMON(id))
-	{
+void Search_Add_Result(CSearchFile *NOT_ON_DAEMON(result))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_searchwnd) {
-			theApp->amuledlg->m_searchwnd->KadSearchEnd(id);
-		}
-#endif
-		theApp->searchlist->SetKadSearchFinished();
+	if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+		theApp->amuledlg->m_searchwnd->AddResult(result);
 	}
+#endif
+}
 
-	void Search_Update_Sources(CSearchFile* result)
-	{
-		result->SetDownloadStatus();
+void Browse_Status(uint64 NOT_ON_DAEMON(searchID), uint32 NOT_ON_DAEMON(status))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
-			theApp->amuledlg->m_searchwnd->UpdateResult(result);
-		}
-#endif
+	if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+		theApp->amuledlg->m_searchwnd->SetBrowseStatus((wxUIntPtr)searchID, status);
 	}
+#endif
+}
 
-	void Search_Add_Result(CSearchFile* NOT_ON_DAEMON(result))
-	{
+// `name` is taken by value because the notify functor stores each argument by the handler's
+// parameter type and deep-copies into it, so a const-ref parameter would dangle.
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void Chat_SessionRemoved(uint64 NOT_ON_DAEMON(gui_id))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
-			theApp->amuledlg->m_searchwnd->AddResult(result);
-		}
-#endif
+	if (theApp->amuledlg && theApp->amuledlg->m_chatwnd) {
+		// EndSessionFromCore, not EndSession: the core has already dropped this session, so
+		// the tab must close WITHOUT its page-closing handler originating a close of its
+		// own -- otherwise a close from one client makes every other client echo a
+		// redundant close back, which the daemon answers EC_OP_FAILED.
+		theApp->amuledlg->m_chatwnd->EndSessionFromCore(gui_id);
 	}
+#endif
+}
 
-
-	void ChatConnResult(bool NOT_ON_DAEMON(success), uint64 NOT_ON_DAEMON(id), wxString NOT_ON_DAEMON(message))
-	{
+void Search_Removed(wxUIntPtr NOT_ON_DAEMON(searchID))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_chatwnd) {
-			theApp->amuledlg->m_chatwnd->ConnectionResult(success, message, id);
-		}
-#endif
+	if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+		theApp->amuledlg->m_searchwnd->CloseSearchTab(searchID);
 	}
+#endif
+}
 
-	void ChatProcessMsg(uint64 NOT_ON_DAEMON(sender), wxString NOT_ON_DAEMON(message))
-	{
+// MuleNotify stores the notify args by value, so `name` is by value here like every other notify
+// handler taking a string.
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void Search_Added(wxUIntPtr NOT_ON_DAEMON(searchID), wxString NOT_ON_DAEMON(name), uint32 NOT_ON_DAEMON(kind))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_chatwnd) {
-			theApp->amuledlg->m_chatwnd->ProcessMessage(sender, message);
-		}
-#endif
+	if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+		theApp->amuledlg->m_searchwnd->OnSearchAdded(searchID, name, kind);
 	}
+#endif
+}
 
-
-	void ChatSendCaptcha(wxString NOT_ON_DAEMON(captcha), uint64 NOT_ON_DAEMON(to_id))
-	{
+void Browse_Started(uint32 NOT_ON_DAEMON(ecid), wxString NOT_ON_DAEMON(name), uint64 NOT_ON_DAEMON(searchID))
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_chatwnd) {
-			theApp->amuledlg->m_chatwnd->SendMessage(captcha, "", to_id);
-		}
+	if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+		// Reveal only what this user started. The notification carries no such flag and
+		// CMuleNotifier stops at three arguments, but the client it names already knows, so
+		// ask it rather than widen the notifier for one bool. CLIENT_GUI has neither the
+		// lookup nor a path that raises this notification.
+		bool reveal = true;
+#ifndef CLIENT_GUI
+		const CUpDownClient *browsed = theApp->clientlist->FindClientByECID(ecid);
+		reveal = !(browsed && browsed->IsBrowseEcInitiated());
 #endif
+		theApp->amuledlg->m_searchwnd->EnsureBrowseTab(ecid, name, (wxUIntPtr)searchID, reveal);
 	}
+#endif
+}
 
-
-	void ShowConnState(long NOT_ON_DAEMON(forceUpdate))
-	{
+void ChatConnResult(bool NOT_ON_DAEMON(success), uint64 NOT_ON_DAEMON(id), wxString NOT_ON_DAEMON(message))
+{
 #ifndef AMULE_DAEMON
-		theApp->amuledlg->ShowConnectionState(forceUpdate != 0);
-#endif
+	if (theApp->amuledlg->m_chatwnd) {
+		theApp->amuledlg->m_chatwnd->ConnectionResult(success, message, id);
 	}
+#endif
+}
 
-	void ShowUpdateCatTabTitles()
-	{
+// MuleNotify stores the notify args by value, so a `const wxString &` param would dangle -- keep
+// it by value like every other notify handler.
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void ChatProcessMsg(uint64 sender, wxString message)
+{
+	// No EC relay here any more: CUpDownClient::ProcessChatMessage records the message in the
+	// core store before this notify fires, and every EC client reads it from there. The built-
+	// in GUI below still handles its own local display.
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd) {
-			theApp->amuledlg->m_transferwnd->UpdateCatTabTitles();
-		}
+	if (theApp->amuledlg->m_chatwnd) {
+		theApp->amuledlg->m_chatwnd->ProcessMessage(sender, message);
+	}
 #endif
+}
+
+void ChatSendCaptcha(wxString NOT_ON_DAEMON(captcha), uint64 NOT_ON_DAEMON(to_id))
+{
+#ifndef AMULE_DAEMON
+	if (theApp->amuledlg->m_chatwnd) {
+		theApp->amuledlg->m_chatwnd->SendMessage(captcha, "", to_id);
 	}
+#endif
+}
 
-	void CategoryAdded()
-	{
+void ShowConnState(long)
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd) {
-			theApp->amuledlg->m_transferwnd->
-				AddCategory(theApp->glob_prefs->GetCategory(
-					theApp->glob_prefs->GetCatCount()-1));
-		}
+	theApp->amuledlg->ShowConnectionState();
 #endif
+}
+
+void ShowUpdateCatTabTitles()
+{
+#ifndef AMULE_DAEMON
+	if (theApp->amuledlg->m_transferwnd) {
+		theApp->amuledlg->m_transferwnd->UpdateCatTabTitles();
 	}
+#endif
+}
 
-	void CategoryUpdate(uint32 NOT_ON_DAEMON(cat))
-	{
+void CategoryAdded()
+{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd) {
-			theApp->amuledlg->m_transferwnd->UpdateCategory(cat);
-			theApp->amuledlg->m_transferwnd->downloadlistctrl->Refresh();
-			theApp->amuledlg->m_searchwnd->UpdateCatChoice();
-		}
+	if (theApp->amuledlg->m_transferwnd) {
+		theApp->amuledlg->m_transferwnd->AddCategory(
+			theApp->glob_prefs->GetCategory(theApp->glob_prefs->GetCatCount() - 1));
+	}
 #endif
+}
+
+void CategoryUpdate(uint32 NOT_ON_DAEMON(cat))
+{
+#ifndef AMULE_DAEMON
+	if (theApp->amuledlg->m_transferwnd) {
+		theApp->amuledlg->m_transferwnd->UpdateCategory(cat);
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->Refresh();
+		theApp->amuledlg->m_searchwnd->UpdateCatChoice();
 	}
+#endif
+}
 
-	void CategoryDelete(uint32 cat)
-	{
+void CategoryDelete(uint32 cat)
+{
 #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();
+	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);
-		}
-#endif
+	if (theApp->amuledlg->m_transferwnd) {
+		theApp->amuledlg->m_transferwnd->RemoveCategory(cat);
 	}
+#endif
+}
 
-
-	void PartFile_Swap_A4AF(CPartFile* file)
-	{
-		if ((file->GetStatus(false) == PS_READY || file->GetStatus(false) == PS_EMPTY)) {
-			CPartFile::SourceSet::const_iterator it = file->GetA4AFList().begin();
-			for ( ; it != file->GetA4AFList().end(); ) {
-				it++->SwapToAnotherFile(true, false, false, file);
-			}
+void PartFile_Swap_A4AF(CPartFile *file)
+{
+	if ((file->GetStatus(false) == PS_READY || file->GetStatus(false) == PS_EMPTY)) {
+		CPartFile::SourceSet::const_iterator it = file->GetA4AFList().begin();
+		for (; it != file->GetA4AFList().end();) {
+			it++->SwapToAnotherFile(true, false, false, file);
 		}
 	}
+}
 
-	void PartFile_Swap_A4AF_Auto(CPartFile* file)
-	{
-		file->SetA4AFAuto(!file->IsA4AFAuto());
-	}
+void PartFile_Swap_A4AF_Auto(CPartFile *file)
+{
+	file->SetA4AFAuto(!file->IsA4AFAuto());
+}
 
-	void PartFile_Swap_A4AF_Others(CPartFile* file)
-	{
-		if ((file->GetStatus(false) == PS_READY) || (file->GetStatus(false) == PS_EMPTY)) {
-			CPartFile::SourceSet::const_iterator it = file->GetSourceList().begin();
-			for( ; it != file->GetSourceList().end(); ) {
-				it++->SwapToAnotherFile(false, false, false, NULL);
-			}
+void PartFile_Swap_A4AF_Others(CPartFile *file)
+{
+	if ((file->GetStatus(false) == PS_READY) || (file->GetStatus(false) == PS_EMPTY)) {
+		CPartFile::SourceSet::const_iterator it = file->GetSourceList().begin();
+		for (; it != file->GetSourceList().end();) {
+			it++->SwapToAnotherFile(false, false, false, NULL);
 		}
 	}
+}
 
-	void PartFile_Pause(CPartFile* file)
-	{
-		file->PauseFile();
-		file->SavePartFile();
-	}
-
-	void PartFile_Resume(CPartFile* file)
-	{
-		file->ResumeFile();
-		file->SavePartFile();
-	}
-
-	void PartFile_Stop(CPartFile* file)
-	{
-		file->StopFile();
-		file->SavePartFile();
-	}
+void PartFile_Pause(CPartFile *file)
+{
+	file->PauseFile();
+	file->SavePartFile();
+}
 
-	void PartFile_PrioAuto(CPartFile* file, bool val)
-	{
-		file->SetAutoDownPriority(val);
-	}
+void PartFile_Resume(CPartFile *file)
+{
+	file->ResumeFile();
+	file->SavePartFile();
+}
 
-	void PartFile_PrioSet(CPartFile* file, uint8 newDownPriority, bool bSave)
-	{
-		file->SetDownPriority(newDownPriority, bSave);
-	}
+void PartFile_Stop(CPartFile *file)
+{
+	file->StopFile();
+	file->SavePartFile();
+}
 
-	void PartFile_Delete(CPartFile* file)
-	{
-		file->Delete();
-	}
+void PartFile_PrioAuto(CPartFile *file, bool val)
+{
+	file->SetAutoDownPriority(val);
+}
 
-	void PartFile_SetCat(CPartFile* file, uint32 val)
-	{
-		file->SetCategory(val);
-	}
+void PartFile_PrioSet(CPartFile *file, uint8 newDownPriority, bool bSave)
+{
+	file->SetDownPriority(newDownPriority, bSave);
+}
 
+void PartFile_Delete(CPartFile *file)
+{
+	file->Delete();
+}
 
-	void KnownFile_Up_Prio_Set(CKnownFile* file, uint8 val)
-	{
-		file->SetAutoUpPriority(false);
-		file->SetUpPriority(val);
-	}
+void PartFile_SetCat(CPartFile *file, uint32 val)
+{
+	file->SetCategory(val);
+}
 
-	void KnownFile_Up_Prio_Auto(CKnownFile* file)
-	{
-		file->SetAutoUpPriority(true);
-		file->UpdateAutoUpPriority();
-	}
+void KnownFile_Up_Prio_Set(CKnownFile *file, uint8 val)
+{
+	file->SetAutoUpPriority(false);
+	file->SetUpPriority(val);
+}
 
-	void KnownFile_Comment_Set(CKnownFile* file, wxString comment, int8 rating)
-	{
-		file->SetFileCommentRating(comment, rating);
-		SharedFilesUpdateItem(file);
-	}
+void KnownFile_Up_Prio_Auto(CKnownFile *file)
+{
+	file->SetAutoUpPriority(true);
+	file->UpdateAutoUpPriority();
+}
 
+void KnownFile_Comment_Set(CKnownFile *file, wxString comment, int8 rating)
+{
+	file->SetFileCommentRating(comment, rating);
+	SharedFilesUpdateItem(file);
+}
 
-	void Download_Set_Cat_Prio(uint8 cat, uint8 newprio)
-	{
-		theApp->downloadqueue->SetCatPrio(cat, newprio);
-	}
+void Download_Set_Cat_Prio(uint8 cat, uint8 newprio)
+{
+	theApp->downloadqueue->SetCatPrio(cat, newprio);
+}
 
-	void Download_Set_Cat_Status(uint8 cat, int newstatus)
-	{
-		theApp->downloadqueue->SetCatStatus(cat, newstatus);
-	}
+void Download_Set_Cat_Status(uint8 cat, int newstatus)
+{
+	theApp->downloadqueue->SetCatStatus(cat, newstatus);
+}
 
-	void Upload_Resort_Queue()
-	{
-		theApp->uploadqueue->ResortQueue();
-	}
+void Upload_Resort_Queue()
+{
+	theApp->uploadqueue->ResortQueue();
+}
 
-	void IPFilter_Reload()
-	{
-		theApp->ipfilter->Reload();
-	}
+void IPFilter_Reload()
+{
+	theApp->ipfilter->Reload();
+}
 
-	void IPFilter_Update(wxString url)
-	{
-		theApp->ipfilter->Update(url);
-	}
+void IPFilter_Update(wxString url)
+{
+	theApp->ipfilter->Update(url);
+}
 
-	void Client_Delete(CClientRef client)
-	{
-		client.Safe_Delete();
-	}
+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 ConvertUpdateProgress(float percent, wxString text, wxString header)
+{
+	CPartFileConvertDlg::UpdateProgress(percent, text, header);
+}
 
-	void ConvertRemoveJobInfo(unsigned id)
-	{
-		CPartFileConvertDlg::RemoveJobInfo(id);
-	}
+void ConvertUpdateJobInfo(ConvertInfo info)
+{
+	CPartFileConvertDlg::UpdateJobInfo(info);
+}
 
-	void ConvertClearInfos()
-	{
-		CPartFileConvertDlg::ClearInfo();
-	}
+void ConvertRemoveJobInfo(unsigned id)
+{
+	CPartFileConvertDlg::RemoveJobInfo(id);
+}
 
-	void ConvertRemoveJob(unsigned id)
-	{
-		CPartFileConvert::RemoveJob(id);
-	}
+void ConvertClearInfos()
+{
+	CPartFileConvertDlg::ClearInfo();
+}
 
-	void ConvertRetryJob(unsigned id)
-	{
-		CPartFileConvert::RetryJob(id);
-	}
+void ConvertRemoveJob(unsigned id)
+{
+	CPartFileConvert::RemoveJob(id);
+}
 
-	void ConvertReaddAllJobs()
-	{
-		CPartFileConvert::ReaddAllJobs();
-	}
-#endif	// #ifndef AMULE_DAEMON
+void ConvertRetryJob(unsigned id)
+{
+	CPartFileConvert::RetryJob(id);
+}
 
-#endif	// #ifndef CLIENT_GUI
+void ConvertReaddAllJobs()
+{
+	CPartFileConvert::ReaddAllJobs();
+}
+#endif // #ifndef AMULE_DAEMON
 
+#endif // #ifndef CLIENT_GUI
 
-// Broadcast called from every CKnownFile destruction site BEFORE
-// the `delete file`. Subscribers MUST only compare the file pointer
-// by value (==) to entries they already hold — never dereference it.
-// By the time a subscriber on the main thread processes this event
-// the bytes pointed at by `file` may already have been recycled.
+// Broadcast from every CKnownFile destruction site BEFORE the `delete file`. Subscribers MUST only
+// compare the file pointer by value, never dereference it: by the time a subscriber on the main
+// thread processes this event, the bytes pointed at may already have been recycled.
 //
-// Defined outside the CLIENT_GUI / non-CLIENT_GUI split so the same
-// function compiles into both `amule` and `amulegui`. The branches
-// inside select the right subscriber set per target.
+// Defined outside the CLIENT_GUI split so the same function compiles into both `amule` and
+// `amulegui`; the branches inside select the subscriber set.
 //
-// Sites that fire this:
-//   - CPartFile::Delete()                  (user cancel)
-//   - CKnownFileList::PruneDuplicates       (TTL eviction)
-//   - CKnownFileList::~CKnownFileList       (shutdown / via Clear())
-//   - CSharedFileList::Reload()             (rebuild)
-//   - CKnownFilesRem::DeleteItem            (amulegui EC_TAG_FILE_REMOVED)
-void KnownFileBeingDestroyed(CKnownFile* file)
+// Fired by CPartFile::Delete(), CKnownFileList::PruneDuplicates, ~CKnownFileList,
+// CSharedFileList::Reload() and CKnownFilesRem::DeleteItem.
+void KnownFileBeingDestroyed(CKnownFile *file)
 {
 #ifndef AMULE_DAEMON
 	// GUI subscribers (linked into `amule` and `amulegui`).
 	if (theApp->amuledlg) {
-		// #1: CGenericClientListCtrl in the transfer window's
-		// downloads pane caches selected files in m_knownfiles;
-		// stale entries crash on the next selection change
+		// #1: CGenericClientListCtrl in the transfer window's downloads pane caches
+		// selected files in m_knownfiles; stale entries crash on the next selection change
 		// (issue #755).
-		if (theApp->amuledlg->m_transferwnd
-			&& theApp->amuledlg->m_transferwnd->clientlistctrl) {
-			theApp->amuledlg->m_transferwnd->clientlistctrl
-				->RemoveKnownFile(file);
+		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
+			theApp->amuledlg->m_transferwnd->clientlistctrl->RemoveKnownFile(file);
 		}
 		// #2: CGenericClientListCtrl in the shared-files pane
 		// caches selected files the same way.
-		if (theApp->amuledlg->m_sharedfileswnd
-			&& theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
-			theApp->amuledlg->m_sharedfileswnd->peerslistctrl
-				->RemoveKnownFile(file);
+		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
+			theApp->amuledlg->m_sharedfileswnd->peerslistctrl->RemoveKnownFile(file);
 		}
-		// #3, #4, #5: open modal dialogs that captured the file
-		// pointer at construction time (CommentDialog,
-		// CommentDialogLst, FileDetailDialog). Each class keeps
-		// its own static registry of live instances so the
-		// broadcast can iterate without needing a friend.
+		// #3, #4, #5: open modal dialogs that captured the file pointer at construction
+		// (CommentDialog, CommentDialogLst, FileDetailDialog). Each keeps its own static
+		// registry of live instances, so the broadcast can iterate without needing a
+		// friend.
 		CCommentDialog::DropReferencesTo(file);
 		CCommentDialogLst::DropReferencesTo(file);
 		CFileDetailDialog::DropReferencesTo(file);
 	}
 #endif
 #ifdef CLIENT_GUI
-	// Remote-GUI subscriber: null CUpDownClient::m_uploadingfile /
-	// m_reqfile on every client that points at this file (the #748
-	// crash flow). Pointer-value comparison only.
+	// Remote-GUI subscriber: null CUpDownClient::m_uploadingfile / m_reqfile on every client
+	// that points at this file (the #748 crash flow). Pointer-value comparison only.
 	if (theApp->clientlist) {
 		theApp->clientlist->DropReferencesTo(file);
 	}
 #endif
 #ifndef CLIENT_GUI
-	// Daemon-side subscribers — drop pending requests/writes naming
-	// this file. Both lists are kept by background-thread machinery
-	// and would otherwise leave dangling pointers after the file is
-	// freed (see audit table in the PR description).
-	//
-	// #5: AICH static recovery-request list. Strip-by-pointer; the
-	// existing RequestAICHRecovery() guard at SHAHashSet.cpp:990 can
-	// be spoofed by allocator reuse, which this prevents.
+	// Daemon-side subscribers: drop pending requests and writes naming this file. Both lists
+	// are kept by background-thread machinery and would otherwise leave dangling pointers. #5
+	// is the AICH static recovery-request list: strip by pointer, since the existing
+	// RequestAICHRecovery() guard can be spoofed by allocator reuse.
 	CAICHHashSet::DropReferencesTo(file);
 	// #8: pending writes the CPartFileWriteThread hasn't drained yet.
 	// Without this, ~CPartFile would race the write loop.
@@ -966,5 +1033,21 @@
 #endif
 }
 
+void SearchFileBeingDestroyed(CSearchFile *file)
+{
+#ifndef AMULE_DAEMON
+	// GUI subscribers: a comments dialog opened on a search result must drop the pointer before
+	// the result is freed, since a new search or list rebuild deletes CSearchFile objects while
+	// a modal Kad-notes lookup may still be open.
+	CCommentDialogLst::DropReferencesTo(file);
+	// The search models hold arriving results between the notification and the idle that
+	// flushes them, and nothing unlinks a child from its parent's list, so this is the only
+	// signal that one of those pointers has stopped being one.
+	CSearchListModel::DropReferencesTo(file);
+#else
+	(void)file;
+#endif
 }
+
+} // namespace MuleNotify
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/GuiEvents.h -> amule-3.1.0.tar.gz/src/GuiEvents.h Changed

@@ -31,10 +31,11 @@
 
 #include "Types.h"
 #include "Constants.h"
-#define __need_convertinfo	// We need only the ConvertInfo struct from PartFileConvert.h
+#define NEED_CONVERTINFO // We need only the ConvertInfo struct from PartFileConvert.h
 #include "PartFileConvert.h"
 
 class CKnownFile;
+class CUpDownClient;
 class CSearchFile;
 class CPartFile;
 class CServer;
@@ -44,586 +45,614 @@
 class CLibSocketServer;
 class CMuleUDPSocket;
 
-
 wxDECLARE_EVENT(MULE_EVT_NOTIFY, wxEvent);
 
 /**
- * This namespaces contains a number of functions and classes
- * related to deferred function calls, allowing a notification
- * call to be delayed till it can be initiated from the main
+ * Deferred function calls, so a notification can be delayed until it can be initiated from the main
  * thread.
  */
 namespace MuleNotify
 {
-	/**
-	 * Creates a deep copy of the object passed.
-	 *
-	 * Note that this function should be overwritten as
-	 * needed. See the wxString version below.
-	 */
-	template <class ValueType>
-	inline ValueType DeepCopy(const ValueType& value)
-	{
-		return ValueType(value);
-	}
+/**
+ * Creates a deep copy of the object passed. Overwrite as needed; see the wxString version below.
+ */
+template <class ValueType> inline ValueType DeepCopy(const ValueType &value)
+{
+	return ValueType(value);
+}
 
-	/** Special DeepCopy for wxString, which uses reference counting. */
-	inline wxString DeepCopy(const wxString& value)
-	{
-		return wxString(value.c_str(), value.Length());
-	}
+/** Special DeepCopy for wxString, which uses reference counting. */
+inline wxString DeepCopy(const wxString &value)
+{
+	return wxString(value.c_str(), value.Length());
+}
+
+// Notification handlers. Do not call these directly; go through the Notify_* macros.
+
+void SharedFilesShowFile(CKnownFile *file);
+void SharedFilesRemoveFile(CKnownFile *file);
+void SharedFilesRemoveAllFiles();
+void SharedFilesShowFileList();
+void SharedFilesUpdateItem(CKnownFile *file);
+void SharedFilesBeginBulkUpdate();
+void SharedFilesEndBulkUpdate();
+
+void DownloadCtrlUpdateItem(const void *item);
+void SourceCtrlUpdateSource(uint32 source, SourceItemType type);
+void DownloadCtrlAddFile(CPartFile *file);
+void SourceCtrlAddSource(CPartFile *owner, CClientRef source, SourceItemType type);
+void DownloadCtrlRemoveFile(CPartFile *file);
+void SourceCtrlRemoveSource(uint32 source, const CPartFile *owner);
+void DownloadCtrlHideSource(CPartFile *file);
+void DownloadCtrlSort();
+void DownloadCtrlDoItemSelectionChanged();
+
+void SharedCtrlAddClient(CKnownFile *owner, CClientRef client, SourceItemType type);
+void SharedCtrlRefreshClient(uint32 client, SourceItemType type);
+void SharedCtrlRemoveClient(uint32 client, const CKnownFile *owner);
+
+// Broadcast: a CKnownFile (or CPartFile, which is-a CKnownFile) is about to be destroyed. Every
+// component holding a raw pointer outside the canonical owner containers (CKnownFileList /
+// CSharedFileList / CDownloadQueue / EC mirrors) must subscribe and drop its reference before the
+// delete returns.
+//
+// Subscribers must use ONLY pointer-value comparison, never dereference: by the time a subscriber
+// on the main thread sees the event the file has typically already been freed.
+//
+// Fired BEFORE the delete from ~CKnownFileList, PruneDuplicates, CPartFile::Delete(),
+// CSharedFileList::Reload() and CKnownFilesRem::DeleteItem.
+void KnownFileBeingDestroyed(CKnownFile *file);
+
+// Analogue of KnownFileBeingDestroyed for search results: fired from ~CSearchFile before the object
+// is freed, so an open comments dialog holding the result (a Kad-notes lookup can outlive the
+// search that produced it) drops its pointer instead of dangling. See
+// CCommentDialogLst::DropReferencesTo.
+void SearchFileBeingDestroyed(CSearchFile *file);
+
+// Fired from CSearchList::RemoveResults, once per search whose bucket is freed, so a tab still open
+// on it closes instead of outliving the results. Needed the moment closing a tab genuinely frees
+// the search: in a monolithic build the GUI and core share the same CSearchFile objects, which
+// CSearchListCtrl holds as raw pointers, so a tab left open over a freed bucket faults on the next
+// repaint, sort, scroll or click. It also gives the monolithic GUI the local counterpart of
+// amulegui's remote-driven tab close.
+void Search_Removed(wxUIntPtr searchID);
+
+// A chat session was dropped from the core store, by whichever client asked. The mirror of
+// Search_Removed, and closing follows the same rule: the core state is destroyed for everyone and
+// each client is TOLD, rather than left showing a tab the core no longer has. The monolithic GUI
+// closes its page here; EC clients learn it from the session's absence in the next
+// EC_OP_CHAT_SESSIONS reply.
+void Chat_SessionRemoved(uint64 gui_id);
+
+// Fired from CSearchList::StartNewSearch, once per search the core begins, whoever asked for it.
+// The mirror of Search_Removed: it lets the monolithic GUI show a tab for a search started by an EC
+// client, which it could not see at all before -- amulegui and amuleapi already discover each
+// other's searches over EC_OP_SEARCH_LIST (#703).
+//
+// The tab is created unselected: it appears on its own, so it must not pull the selection away from
+// whatever the local user is doing. `kind` is the new search's SearchType, used only to seed the
+// Kad "!" marker.
+void Search_Added(wxUIntPtr searchID, wxString name, uint32 kind);
+
+void ServerAdd(CServer *server);
+void ServerRemove(CServer *server);
+void ServerRemoveDead();
+void ServerRemoveAll();
+void ServerHighlight(CServer *server, bool highlight);
+void ServerRefresh(CServer *server);
+void ServerFreeze();
+void ServerThaw();
+void ServerUpdateED2KInfo();
+void ServerUpdateKadKInfo();
+
+void SearchCancel();
+void SearchLocalEnd();
+void KadSearchEnd(uint32 id);
+void Search_Update_Sources(CSearchFile *result);
+void Search_Add_Result(CSearchFile *result);
+// Browse ("View Files") lifecycle marker for a peer's shared-file tab, keyed by the tab's result-
+// routing search ID. status carries an EBrowseStatus value. Monolithic renders it directly; on the
+// daemon it is a no-op, amuleGUI reading the status over EC.
+void Browse_Status(uint64 searchID, uint32 status);
+// Open (or refresh) a browse tab for a peer up front, before any result arrives, so a denied or
+// offline peer still shows a tab that can flip to "failed". Keyed by the peer's ECID; searchID is
+// the result-routing key. Monolithic only.
+void Browse_Started(uint32 ecid, wxString name, uint64 searchID);
+
+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 ShowUpdateCatTabTitles();
+void ShowGUI();
+void VersionCheckResult(wxString latest, bool outdated);
+
+void CategoryAdded();
+void CategoryUpdate(uint32 cat);
+void CategoryDelete(uint32 cat);
+
+void NodesURLChanged(wxString url);
+void ServersURLChanged(wxString url);
 
+// Partfile conversion: Core -> GUI
+void ConvertUpdateProgress(float percent, wxString label, wxString header);
+void ConvertUpdateJobInfo(ConvertInfo info);
+void ConvertRemoveJobInfo(unsigned id);
+void ConvertClearInfos();
+// Partfile conversion: GUI -> Core
+void ConvertRemoveJob(unsigned id);
+void ConvertRetryJob(unsigned id);
+void ConvertReaddAllJobs();
 
-	////////////////////////////////////////////////////////////
-	// Notification handlers
-	//
-	// These functions should not be called directly, but
-	// through the Notify_*, etc. macros.
-	//
-
-	void SharedFilesShowFile(CKnownFile* file);
-	void SharedFilesRemoveFile(CKnownFile* file);
-	void SharedFilesRemoveAllFiles();
-	void SharedFilesShowFileList();
-	void SharedFilesUpdateItem(CKnownFile* file);
-	void SharedFilesBeginBulkUpdate();
-	void SharedFilesEndBulkUpdate();
-
-	void DownloadCtrlUpdateItem(const void* item);
-	void SourceCtrlUpdateSource(uint32 source, SourceItemType type);
-	void DownloadCtrlAddFile(CPartFile* file);
-	void SourceCtrlAddSource(CPartFile* owner, CClientRef source, SourceItemType type);
-	void DownloadCtrlRemoveFile(CPartFile* file);
-	void SourceCtrlRemoveSource(uint32 source, const CPartFile* owner);
-	void DownloadCtrlHideSource(CPartFile* file);
-	void DownloadCtrlSort();
-	void DownloadCtrlDoItemSelectionChanged();
-
-	void SharedCtrlAddClient(CKnownFile* owner, CClientRef client, SourceItemType type);
-	void SharedCtrlRefreshClient(uint32 client, SourceItemType type);
-	void SharedCtrlRemoveClient(uint32 client, const CKnownFile* owner);
-
-	// Broadcast: a CKnownFile (or CPartFile, which is-a CKnownFile) is
-	// about to be destroyed. Every component that holds a raw
-	// CKnownFile* / CPartFile* outside the canonical owner containers
-	// (CKnownFileList / CSharedFileList / CDownloadQueue / EC mirrors)
-	// must subscribe and drop its reference before the delete returns.
-	//
-	// Contract for subscribers: handle the event using ONLY pointer-
-	// value comparison (==), never dereference the pointer. By the
-	// time a subscriber on the main thread sees the event, the file
-	// has typically already been freed by the destruction site that
-	// fired the broadcast. The pointer value is meaningful as a
-	// stable key; the bytes it points at are not.
-	//
-	// Fired from every CKnownFile / CPartFile destruction site BEFORE
-	// the delete: CKnownFileList::~CKnownFileList, PruneDuplicates,
-	// CPartFile::Delete(), CSharedFileList::Reload() (when destroying
-	// stale entries during rebuild), and CKnownFilesRem::DeleteItem
-	// in the amulegui build.
-	void KnownFileBeingDestroyed(CKnownFile* file);
-
-	void ServerAdd(CServer* server);
-	void ServerRemove(CServer* server);
-	void ServerRemoveDead();
-	void ServerRemoveAll();
-	void ServerHighlight(CServer* server, bool highlight);
-	void ServerRefresh(CServer* server);
-	void ServerFreeze();
-	void ServerThaw();
-	void ServerUpdateED2KInfo();
-	void ServerUpdateKadKInfo();
-
-	void SearchCancel();
-	void SearchLocalEnd();
-	void KadSearchEnd(uint32 id);
-	void Search_Update_Sources(CSearchFile* result);
-	void Search_Add_Result(CSearchFile* result);
-
-	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 ShowUpdateCatTabTitles();
-	void ShowGUI();
-
-	void CategoryAdded();
-	void CategoryUpdate(uint32 cat);
-	void CategoryDelete(uint32 cat);
-
-	void NodesURLChanged(wxString url);
-	void ServersURLChanged(wxString url);
-
-	// Partfile conversion: Core -> GUI
-	void ConvertUpdateProgress(float percent, wxString label, wxString header);
-	void ConvertUpdateJobInfo(ConvertInfo info);
-	void ConvertRemoveJobInfo(unsigned id);
-	void ConvertClearInfos();
-	// Partfile conversion: GUI -> Core
-	void ConvertRemoveJob(unsigned id);
-	void ConvertRetryJob(unsigned id);
-	void ConvertReaddAllJobs();
-
-	//
-	// GUI -> core notification
-	//
-
-	void PartFile_Swap_A4AF(CPartFile* file);
-	void PartFile_Swap_A4AF_Auto(CPartFile* file);
-	void PartFile_Swap_A4AF_Others(CPartFile* file);
-	void PartFile_Pause(CPartFile* file);
-	void PartFile_Resume(CPartFile* file);
-	void PartFile_Stop(CPartFile* file);
-	void PartFile_PrioAuto(CPartFile* file, bool val);
-	void PartFile_PrioSet(CPartFile* file, uint8 newDownPriority, bool bSave);
-	void PartFile_Delete(CPartFile* file);
-	void PartFile_SetCat(CPartFile* file, uint32 val);
-
-	void KnownFile_Up_Prio_Set(CKnownFile* file, uint8 val);
-	void KnownFile_Up_Prio_Auto(CKnownFile* file);
-	void KnownFile_Comment_Set(CKnownFile* file, wxString comment, int8 rating);
-
-	void Search_Add_Download(CSearchFile* result, uint8 category);
-	void Search_Update_Progress(uint32 value);
-
-	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);
-
-	//
-	// core internal notifications
-	//
-
-	// ASIO sockets
-	void LibSocketConnect(CLibSocket * socket, int error);
-	void LibSocketSend(CLibSocket * socket, int error);
-	void LibSocketReceive(CLibSocket * socket, int error);
-	void LibSocketLost(CLibSocket * socket);
-	void LibSocketDestroy(CLibSocket * socket);
-	void ProxySocketEvent(CLibSocket * socket, int evt);
-	void ServerTCPAccept(CLibSocketServer * socketServer);
-	void UDPSocketSend(CMuleUDPSocket * socket);
-	void UDPSocketReceive(CMuleUDPSocket * socket);
-
-	//
-	// Notifications that always create an event
-	//
-	void IPFilter_Reload();
-	void IPFilter_Update(wxString url);
-
-	////////////////////////////////////////////////////////////
-	// Notification utilities
-
-	/**
-	 * The base class of the functions.
-	 *
-	 * This class allows the the notification call to be executed
-	 * without knowing the exact specifics of a given functor.
-	 */
-	class CMuleNotiferBase
-	{
-	public:
-		/** The constructor does nothing. */
-		CMuleNotiferBase() {};
-		/** The destructor is virtual since we will be deleting pointers to this type. */
-		virtual ~CMuleNotiferBase() {};
+// GUI -> core notification
 
-		/** Executes the actual notification call. */
-		virtual void Notify() const = 0;
-		/** Returns a copy of the functor (function + arguments). */
-		virtual CMuleNotiferBase* Clone() const = 0;
-	};
+void PartFile_Swap_A4AF(CPartFile *file);
+void PartFile_Swap_A4AF_Auto(CPartFile *file);
+void PartFile_Swap_A4AF_Others(CPartFile *file);
+void PartFile_Pause(CPartFile *file);
+void PartFile_Resume(CPartFile *file);
+void PartFile_Stop(CPartFile *file);
+void PartFile_PrioAuto(CPartFile *file, bool val);
+void PartFile_PrioSet(CPartFile *file, uint8 newDownPriority, bool bSave);
+void PartFile_Delete(CPartFile *file);
+void PartFile_SetCat(CPartFile *file, uint32 val);
 
+void KnownFile_Up_Prio_Set(CKnownFile *file, uint8 val);
+void KnownFile_Up_Prio_Auto(CKnownFile *file);
+void KnownFile_Comment_Set(CKnownFile *file, wxString comment, int8 rating);
 
-	/** Notification functor for functions taking no arguments. */
-	class CMuleNotifier0 : public CMuleNotiferBase
-	{
-	public:
-		typedef void (*FuncType)();
+void Search_Add_Download(CSearchFile *result, uint8 category);
+void Search_Update_Progress(uint32 value);
 
-		/** Creates a functor from the given function. */
-		CMuleNotifier0(FuncType func)
-			: m_func(func) {}
+void Download_Set_Cat_Prio(uint8 cat, uint8 newprio);
+void Download_Set_Cat_Status(uint8 cat, int newstatus);
 
-		/** @see CMuleNotifierBase::Notify */
-		virtual void Notify() const {
-			m_func();
-		}
+void Upload_Resort_Queue();
 
-		/** @see CMuleNotifierBase::Clone */
-		virtual CMuleNotiferBase* Clone() const {
-			return new CMuleNotifier0(m_func);
-		}
+void Client_Delete(CClientRef client);
 
-	private:
-		FuncType	m_func;
-	};
+// core internal notifications
 
+// ASIO sockets
+void LibSocketConnect(CLibSocket *socket, int error);
+void LibSocketSend(CLibSocket *socket, int error);
+void LibSocketReceive(CLibSocket *socket, int error);
+void LibSocketLost(CLibSocket *socket);
+// Offers an attached transport's queue on the main thread. Separate from
+// LibSocketSend because that one reports a completed write and reaches
+// CEMSocket::OnSend; this one asks for bytes to be handed to the library, which
+// nothing in that chain does.
+void LibSocketFlush(CLibSocket *socket);
+void LibSocketDestroy(CLibSocket *socket);
+void ProxySocketEvent(CLibSocket *socket, int evt);
+void ServerTCPAccept(CLibSocketServer *socketServer);
+void UDPSocketSend(CMuleUDPSocket *socket);
+void UDPSocketReceive(CMuleUDPSocket *socket);
 
-	/** Notification functor for functions taking 1 arguments. */
-	template <typename ARG>
-	class CMuleNotifier1 : public CMuleNotiferBase
-	{
-	public:
-		typedef void (*FuncType)(ARG);
-
-		/** Creates a functor from the given function and arguments. */
-		CMuleNotifier1(FuncType func, ARG arg)
-			: m_func(func),
-			  m_arg(DeepCopy(arg))
-		{}
-
-		/** @see CMuleNotifierBase::Notify */
-		virtual void Notify() const {
-			m_func(m_arg);
-		}
-
-		/** @see CMuleNotifierBase::Clone */
-		virtual CMuleNotiferBase* Clone() const {
-			return new CMuleNotifier1<ARG>(m_func, m_arg);
-		}
-
-	private:
-		FuncType	m_func;
-		ARG			m_arg;
-	};
-
-
-	/** Notification functor for functions taking 2 arguments. */
-	template <typename ARG_1, typename ARG_2>
-	class CMuleNotifier2 : public CMuleNotiferBase
-	{
-	public:
-		typedef void (*FuncType)(ARG_1, ARG_2);
-
-		/** Creates a functor from the given function and arguments. */
-		CMuleNotifier2(FuncType func, ARG_1 arg1, ARG_2 arg2)
-			: m_func(func),
-			  m_arg1(DeepCopy(arg1)),
-			  m_arg2(DeepCopy(arg2))
-		{}
-
-		/** @see CMuleNotifierBase:: Notify */
-		virtual void Notify() const {
-			m_func(m_arg1, m_arg2);
-		}
-
-		/** @see CMuleNotifierBase::Clone */
-		virtual CMuleNotiferBase* Clone() const {
-			return new CMuleNotifier2<ARG_1, ARG_2>(m_func, m_arg1, m_arg2);
-		}
-
-	private:
-		FuncType	m_func;
-		ARG_1		m_arg1;
-		ARG_2		m_arg2;
-	};
-
-
-	/** Notification functor for functions taking 3 arguments. */
-	template <typename ARG_1, typename ARG_2, typename ARG_3>
-	class CMuleNotifier3 : public CMuleNotiferBase
-	{
-	public:
-		typedef void (*FuncType)(ARG_1, ARG_2, ARG_3);
-
-		/** Creates a functor from the given function and arguments. */
-		CMuleNotifier3(FuncType func, ARG_1 arg1, ARG_2 arg2, ARG_3 arg3)
-			: m_func(func),
-			  m_arg1(DeepCopy(arg1)),
-			  m_arg2(DeepCopy(arg2)),
-			  m_arg3(DeepCopy(arg3))
-		{}
-
-		/** @see CMuleNotifierBase:: Notify */
-		virtual void Notify() const {
-			m_func(m_arg1, m_arg2, m_arg3);
-		}
-
-		/** @see CMuleNotifierBase::Clone */
-		virtual CMuleNotiferBase* Clone() const {
-			return new CMuleNotifier3<ARG_1, ARG_2, ARG_3>(m_func, m_arg1, m_arg2, m_arg3);
-		}
-
-	private:
-		FuncType	m_func;
-		ARG_1		m_arg1;
-		ARG_2		m_arg2;
-		ARG_3		m_arg3;
-	};
-
-
-	/**
-	 * This event is sent when a worker-thread makes use of a notify-macro.
-	 *
-	 * This insures that all notifications are executed on the main thread,
-	 * thereby improving overall threadsafety. The events are currently
-	 * sent to wxTheApp.
-	 */
-	class CMuleGUIEvent : public wxEvent
+// Notifications that always create an event
+void IPFilter_Reload();
+void IPFilter_Update(wxString url);
+
+////////////////////////////////////////////////////////////
+// Notification utilities
+
+/**
+ * Base class of the functions, so a notification can be executed without knowing the exact
+ * specifics of a given functor.
+ */
+class CMuleNotiferBase
+{
+public:
+	/** The constructor does nothing. */
+	CMuleNotiferBase() {};
+	/** The destructor is virtual since we will be deleting pointers to this type. */
+	virtual ~CMuleNotiferBase() {};
+
+	/** Executes the actual notification call. */
+	virtual void Notify() const = 0;
+	/** Returns a copy of the functor (function + arguments). */
+	virtual CMuleNotiferBase *Clone() const = 0;
+};
+
+/** Notification functor for functions taking no arguments. */
+class CMuleNotifier0 : public CMuleNotiferBase
+{
+public:
+	typedef void (*FuncType)();
+
+	/** Creates a functor from the given function. */
+	CMuleNotifier0(FuncType func)
+	: m_func(func)
 	{
-	public:
-		/** Takes ownership a notifier functor. */
-		CMuleGUIEvent(CMuleNotiferBase* ntf)
-			: wxEvent(-1, MULE_EVT_NOTIFY)
-			, m_functor(ntf)
-		{
-			wxASSERT(m_functor);
-		}
-
-		/** Destructor, frees the functor object. */
-		virtual ~CMuleGUIEvent() {
-			delete m_functor;
-		}
-
-		/** Executes the notification. */
-		void Notify() const {
-			m_functor->Notify();
-		}
-
-		/** @see wxEvent::Clone */
-		virtual wxEvent* Clone() const {
-			return new CMuleGUIEvent(m_functor->Clone());
-		}
-
-	private:
-		/** Not copyable. */
-		CMuleGUIEvent(const CMuleGUIEvent&);
-		/** Not assignable. */
-		CMuleGUIEvent& operator=(const CMuleGUIEvent&);
-
-		//! The actual functor object,
-		CMuleNotiferBase* m_functor;
-	};
-
-
-	/**
-	 * This function will execute or queue a given notification functor.
-	 *
-	 * If the caller is the main thread, the functor is executed immediately,
-	 * thus acting like a regular function call. OTOH, if the caller is a
-	 * worker thread, the functor is cloned and sent via an event to
-	 * wxTheApp.
-	 */
-	void HandleNotification(const CMuleNotiferBase& ntf);
-
-	/**
-	 * These functions take a function pointer and a set of arguments,
-	 * matching those of the function-pointer. A functor is created
-	 * from these and either executed immediately, or sent as an event
-	 * in the case of non-main threads calling the functions.
-	 *
-	 * Note that the return-value of the function must be void.
-	 *
-	 * IMPORTANT: Note that the functions passed to DoNotify must not
-	 * take arguments via references, since this causes the functors
-	 * to store references to the arguments, rather than a copy and
-	 * thus ends up with dangling references.
-	 */
-	//@{
-	inline void DoNotify(void (*func)()) {
-		HandleNotification(CMuleNotifier0(func));
 	}
-	template <typename A1A, typename A1B>
-	inline void DoNotify(void (*func)(A1A), A1B arg1) {
-		HandleNotification(CMuleNotifier1<A1A>(func, arg1));
-	}
-	template <typename A1A, typename A1B, typename A2A, typename A2B>
-	inline void DoNotify(void (*func)(A1A, A2A), A1B arg1, A2B arg2) {
-		HandleNotification(CMuleNotifier2<A1A, A2A>(func, arg1, arg2));
+
+	/** @see CMuleNotifierBase::Notify */
+	virtual void Notify() const { m_func(); }
+
+	/** @see CMuleNotifierBase::Clone */
+	virtual CMuleNotiferBase *Clone() const { return new CMuleNotifier0(m_func); }
+
+private:
+	FuncType m_func;
+};
+
+/** Notification functor for functions taking 1 arguments. */
+template <typename ARG> class CMuleNotifier1 : public CMuleNotiferBase
+{
+public:
+	typedef void (*FuncType)(ARG);
+
+	/** Creates a functor from the given function and arguments. */
+	CMuleNotifier1(FuncType func, ARG arg)
+	: m_func(func)
+	, m_arg(DeepCopy(arg))
+	{
 	}
-	template <typename A1A, typename A1B, typename A2A, typename A2B, typename A3A, typename A3B>
-	inline void DoNotify(void (*func)(A1A, A2A, A3A), A1B arg1, A2B arg2, A3B arg3) {
-		HandleNotification(CMuleNotifier3<A1A, A2A, A3A>(func, arg1, arg2, arg3));
+
+	/** @see CMuleNotifierBase::Notify */
+	virtual void Notify() const { m_func(m_arg); }
+
+	/** @see CMuleNotifierBase::Clone */
+	virtual CMuleNotiferBase *Clone() const { return new CMuleNotifier1<ARG>(m_func, m_arg); }
+
+private:
+	FuncType m_func;
+	ARG m_arg;
+};
+
+/** Notification functor for functions taking 2 arguments. */
+template <typename ARG_1, typename ARG_2> class CMuleNotifier2 : public CMuleNotiferBase
+{
+public:
+	typedef void (*FuncType)(ARG_1, ARG_2);
+
+	/** Creates a functor from the given function and arguments. */
+	CMuleNotifier2(FuncType func, ARG_1 arg1, ARG_2 arg2)
+	: m_func(func)
+	, m_arg1(DeepCopy(arg1))
+	, m_arg2(DeepCopy(arg2))
+	{
 	}
-	//@}
 
-	/**
-	 * The same as above, but these functions will always send an event,
-	 * even from the main thread.
-	 */
-	void HandleNotificationAlways(const CMuleNotiferBase& ntf);
+	/** @see CMuleNotifierBase:: Notify */
+	virtual void Notify() const { m_func(m_arg1, m_arg2); }
 
-	inline void DoNotifyAlways(void (*func)()) {
-		HandleNotificationAlways(CMuleNotifier0(func));
+	/** @see CMuleNotifierBase::Clone */
+	virtual CMuleNotiferBase *Clone() const
+	{
+		return new CMuleNotifier2<ARG_1, ARG_2>(m_func, m_arg1, m_arg2);
 	}
-	template <typename A1A, typename A1B>
-	inline void DoNotifyAlways(void (*func)(A1A), A1B arg1) {
-		HandleNotificationAlways(CMuleNotifier1<A1A>(func, arg1));
+
+private:
+	FuncType m_func;
+	ARG_1 m_arg1;
+	ARG_2 m_arg2;
+};
+
+/** Notification functor for functions taking 3 arguments. */
+template <typename ARG_1, typename ARG_2, typename ARG_3> class CMuleNotifier3 : public CMuleNotiferBase
+{
+public:
+	typedef void (*FuncType)(ARG_1, ARG_2, ARG_3);
+
+	/** Creates a functor from the given function and arguments. */
+	CMuleNotifier3(FuncType func, ARG_1 arg1, ARG_2 arg2, ARG_3 arg3)
+	: m_func(func)
+	, m_arg1(DeepCopy(arg1))
+	, m_arg2(DeepCopy(arg2))
+	, m_arg3(DeepCopy(arg3))
+	{
 	}
-	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));
+
+	/** @see CMuleNotifierBase:: Notify */
+	virtual void Notify() const { m_func(m_arg1, m_arg2, m_arg3); }
+
+	/** @see CMuleNotifierBase::Clone */
+	virtual CMuleNotiferBase *Clone() const
+	{
+		return new CMuleNotifier3<ARG_1, ARG_2, ARG_3>(m_func, m_arg1, m_arg2, m_arg3);
 	}
-	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));
+
+private:
+	FuncType m_func;
+	ARG_1 m_arg1;
+	ARG_2 m_arg2;
+	ARG_3 m_arg3;
+};
+
+/**
+ * Sent when a worker thread uses a notify macro, so every notification runs on the main thread. The
+ * events go to wxTheApp.
+ */
+class CMuleGUIEvent : public wxEvent
+{
+public:
+	/** Takes ownership a notifier functor. */
+	CMuleGUIEvent(CMuleNotiferBase *ntf, bool always = false)
+	: wxEvent(-1, MULE_EVT_NOTIFY)
+	, m_functor(ntf)
+	, m_always(always)
+	{
+		wxASSERT(m_functor);
 	}
+
+	/** Destructor, frees the functor object. */
+	virtual ~CMuleGUIEvent() { delete m_functor; }
+
+	/** Executes the notification. */
+	void Notify() const { m_functor->Notify(); }
+
+	/// True for a notification queued by HandleNotificationAlways(), i.e. one that has to run
+	/// whether or not there is a window. The two kinds share this event and its handler, so the
+	/// handler has to tell them apart. DoNotify() drives things the GUI displays, and
+	/// HandleNotification() already declines to run one with no main window. DoNotifyAlways()
+	/// drives the socket layer -- CoreNotify_LibSocketConnect and friends are how an asio
+	/// callback reaches the main thread -- and amulegui has no main window until an EC
+	/// connection is made, so dropping those would stop the connection ever completing.
+	bool IsAlways() const { return m_always; }
+
+	/** @see wxEvent::Clone */
+	virtual wxEvent *Clone() const { return new CMuleGUIEvent(m_functor->Clone(), m_always); }
+
+private:
+	/** Not copyable. */
+	CMuleGUIEvent(const CMuleGUIEvent &);
+	/** Not assignable. */
+	CMuleGUIEvent &operator=(const CMuleGUIEvent &);
+
+	//! Whether this one runs regardless of the GUI's state; see IsAlways().
+	bool m_always;
+
+	//! The actual functor object,
+	CMuleNotiferBase *m_functor;
+};
+
+/**
+ * Executes or queues a notification functor: run immediately on the main thread, cloned and sent as
+ * an event to wxTheApp from a worker thread.
+ */
+void HandleNotification(const CMuleNotiferBase &ntf);
+
+/**
+ * Take a function pointer and matching arguments, build a functor from them, and either run it
+ * immediately or send it as an event from a non-main thread. The function's return type must be
+ * void.
+ *
+ * IMPORTANT: the functions passed to DoNotify must not take arguments by reference -- the functor
+ * would store references rather than copies and end up dangling.
+ */
+//@{
+inline void DoNotify(void (*func)())
+{
+	HandleNotification(CMuleNotifier0(func));
+}
+template <typename A1A, typename A1B> inline void DoNotify(void (*func)(A1A), A1B arg1)
+{
+	HandleNotification(CMuleNotifier1<A1A>(func, arg1));
+}
+template <typename A1A, typename A1B, typename A2A, typename A2B>
+inline void DoNotify(void (*func)(A1A, A2A), A1B arg1, A2B arg2)
+{
+	HandleNotification(CMuleNotifier2<A1A, A2A>(func, arg1, arg2));
+}
+template <typename A1A, typename A1B, typename A2A, typename A2B, typename A3A, typename A3B>
+inline void DoNotify(void (*func)(A1A, A2A, A3A), A1B arg1, A2B arg2, A3B arg3)
+{
+	HandleNotification(CMuleNotifier3<A1A, A2A, A3A>(func, arg1, arg2, arg3));
 }
+//@}
 
+/// As above, but these 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));
+}
+} // namespace MuleNotify
 
 //! Placing CMuleGUIEvent in the global namespace.
 using MuleNotify::CMuleGUIEvent;
 
 //! The event-handler type that takes a CMuleGUIEvent.
-typedef void (wxEvtHandler::*MuleNotifyEventFunction)(CMuleGUIEvent&);
+typedef void (wxEvtHandler::*MuleNotifyEventFunction)(CMuleGUIEvent &);
 
 //! Event-handler for cross-thread GUI notification events.
 #define EVT_MULE_NOTIFY(func) \
 	wx__DECLARE_EVT0(MULE_EVT_NOTIFY, wxEVENT_HANDLER_CAST(MuleNotifyEventFunction, func))
 
-
-
-
 // SharedFilesCtrl
-#define Notify_SharedFilesShowFile(file)		MuleNotify::DoNotify(&MuleNotify::SharedFilesShowFile, file)
-#define Notify_SharedFilesRemoveFile(file)		MuleNotify::DoNotify(&MuleNotify::SharedFilesRemoveFile, file)
-#define Notify_SharedFilesRemoveAllItems()		MuleNotify::DoNotify(&MuleNotify::SharedFilesRemoveAllFiles)
-#define Notify_SharedFilesShowFileList()		MuleNotify::DoNotify(&MuleNotify::SharedFilesShowFileList)
-#define Notify_SharedFilesSort()			MuleNotify::DoNotify(&MuleNotify::SharedFilesSort)
-#define Notify_SharedFilesUpdateItem(file)		MuleNotify::DoNotify(&MuleNotify::SharedFilesUpdateItem, file)
-#define Notify_SharedFilesBeginBulkUpdate()		MuleNotify::DoNotify(&MuleNotify::SharedFilesBeginBulkUpdate)
-#define Notify_SharedFilesEndBulkUpdate()		MuleNotify::DoNotify(&MuleNotify::SharedFilesEndBulkUpdate)
+#define Notify_SharedFilesShowFile(file) MuleNotify::DoNotify(&MuleNotify::SharedFilesShowFile, file)
+#define Notify_SharedFilesRemoveFile(file) MuleNotify::DoNotify(&MuleNotify::SharedFilesRemoveFile, file)
+#define Notify_SharedFilesRemoveAllItems() MuleNotify::DoNotify(&MuleNotify::SharedFilesRemoveAllFiles)
+#define Notify_SharedFilesShowFileList() MuleNotify::DoNotify(&MuleNotify::SharedFilesShowFileList)
+#define Notify_SharedFilesSort() MuleNotify::DoNotify(&MuleNotify::SharedFilesSort)
+#define Notify_SharedFilesUpdateItem(file) MuleNotify::DoNotify(&MuleNotify::SharedFilesUpdateItem, file)
+#define Notify_SharedFilesBeginBulkUpdate() MuleNotify::DoNotify(&MuleNotify::SharedFilesBeginBulkUpdate)
+#define Notify_SharedFilesEndBulkUpdate() MuleNotify::DoNotify(&MuleNotify::SharedFilesEndBulkUpdate)
 
 // download ctrl
-#define Notify_DownloadCtrlUpdateItem(ptr)		MuleNotify::DoNotify(&MuleNotify::DownloadCtrlUpdateItem, ptr)
-#define Notify_DownloadCtrlAddFile(file)		MuleNotify::DoNotify(&MuleNotify::DownloadCtrlAddFile, file)
-#define Notify_DownloadCtrlRemoveFile(file)		MuleNotify::DoNotify(&MuleNotify::DownloadCtrlRemoveFile, file)
-#define Notify_DownloadCtrlSort()			MuleNotify::DoNotify(&MuleNotify::DownloadCtrlSort)
-#define Notify_DownloadCtrlDoItemSelectionChanged()	MuleNotify::DoNotifyAlways(&MuleNotify::DownloadCtrlDoItemSelectionChanged)
+#define Notify_DownloadCtrlUpdateItem(ptr) MuleNotify::DoNotify(&MuleNotify::DownloadCtrlUpdateItem, ptr)
+#define Notify_DownloadCtrlAddFile(file) MuleNotify::DoNotify(&MuleNotify::DownloadCtrlAddFile, file)
+#define Notify_DownloadCtrlRemoveFile(file) MuleNotify::DoNotify(&MuleNotify::DownloadCtrlRemoveFile, file)
+#define Notify_DownloadCtrlSort() MuleNotify::DoNotify(&MuleNotify::DownloadCtrlSort)
+#define Notify_DownloadCtrlDoItemSelectionChanged() \
+	MuleNotify::DoNotifyAlways(&MuleNotify::DownloadCtrlDoItemSelectionChanged)
 
 // 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)
+#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)
 
 // 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)
-
-// CKnownFile/CPartFile destruction broadcast — see MuleNotify::
+#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)
+
+// CKnownFile/CPartFile destruction broadcast -- see MuleNotify::
 // KnownFileBeingDestroyed doc-comment in this header.
-#define Notify_KnownFileBeingDestroyed(file)		MuleNotify::DoNotify(&MuleNotify::KnownFileBeingDestroyed, file)
+#define Notify_KnownFileBeingDestroyed(file) MuleNotify::DoNotify(&MuleNotify::KnownFileBeingDestroyed, file)
+
+// CSearchFile destruction broadcast -- see MuleNotify::SearchFileBeingDestroyed
+// doc-comment in this header.
+#define Notify_SearchFileBeingDestroyed(file) \
+	MuleNotify::DoNotify(&MuleNotify::SearchFileBeingDestroyed, file)
+
+// A search's result bucket was freed -- see MuleNotify::Search_Removed
+// doc-comment in this header.
+#define Notify_Search_Removed(id) MuleNotify::DoNotify(&MuleNotify::Search_Removed, id)
+
+// The core started a search -- see MuleNotify::Search_Added doc-comment in
+// this header.
+#define Notify_Search_Added(id, name, kind) MuleNotify::DoNotify(&MuleNotify::Search_Added, id, name, kind)
 
 // server
-#define Notify_ServerAdd(ptr)				MuleNotify::DoNotify(&MuleNotify::ServerAdd, ptr)
-#define Notify_ServerRemove(ptr)			MuleNotify::DoNotify(&MuleNotify::ServerRemove, ptr)
-#define Notify_ServerRemoveDead()			MuleNotify::DoNotify(&MuleNotify::ServerRemoveDead)
-#define Notify_ServerRemoveAll()			MuleNotify::DoNotify(&MuleNotify::ServerRemoveAll)
-#define Notify_ServerHighlight(ptr, val)		MuleNotify::DoNotify(&MuleNotify::ServerHighlight, ptr, val)
-#define Notify_ServerRefresh(ptr)			MuleNotify::DoNotify(&MuleNotify::ServerRefresh, ptr)
-#define Notify_ServerFreeze()				MuleNotify::DoNotify(&MuleNotify::ServerFreeze)
-#define Notify_ServerThaw()				MuleNotify::DoNotify(&MuleNotify::ServerThaw)
-#define Notify_ServerUpdateED2KInfo()			MuleNotify::DoNotify(&MuleNotify::ServerUpdateED2KInfo)
-#define Notify_ServerUpdateKadKInfo()			MuleNotify::DoNotify(&MuleNotify::ServerUpdateKadKInfo)
+#define Notify_ServerAdd(ptr) MuleNotify::DoNotify(&MuleNotify::ServerAdd, ptr)
+#define Notify_ServerRemove(ptr) MuleNotify::DoNotify(&MuleNotify::ServerRemove, ptr)
+#define Notify_ServerRemoveDead() MuleNotify::DoNotify(&MuleNotify::ServerRemoveDead)
+#define Notify_ServerRemoveAll() MuleNotify::DoNotify(&MuleNotify::ServerRemoveAll)
+#define Notify_ServerHighlight(ptr, val) MuleNotify::DoNotify(&MuleNotify::ServerHighlight, ptr, val)
+#define Notify_ServerRefresh(ptr) MuleNotify::DoNotify(&MuleNotify::ServerRefresh, ptr)
+#define Notify_ServerFreeze() MuleNotify::DoNotify(&MuleNotify::ServerFreeze)
+#define Notify_ServerThaw() MuleNotify::DoNotify(&MuleNotify::ServerThaw)
+#define Notify_ServerUpdateED2KInfo() MuleNotify::DoNotify(&MuleNotify::ServerUpdateED2KInfo)
+#define Notify_ServerUpdateKadKInfo() MuleNotify::DoNotify(&MuleNotify::ServerUpdateKadKInfo)
 
 // search
-#define Notify_SearchCancel()				MuleNotify::DoNotify(&MuleNotify::SearchCancel)
-#define Notify_SearchLocalEnd()				MuleNotify::DoNotify(&MuleNotify::SearchLocalEnd)
-#define Notify_KadSearchEnd(val)			MuleNotify::DoNotify(&MuleNotify::KadSearchEnd, val)
-#define Notify_Search_Update_Sources(ptr)		MuleNotify::DoNotify(&MuleNotify::Search_Update_Sources, ptr)
-#define Notify_Search_Add_Result(s)			MuleNotify::DoNotify(&MuleNotify::Search_Add_Result, s)
+#define Notify_SearchCancel() MuleNotify::DoNotify(&MuleNotify::SearchCancel)
+#define Notify_SearchLocalEnd() MuleNotify::DoNotify(&MuleNotify::SearchLocalEnd)
+#define Notify_KadSearchEnd(val) MuleNotify::DoNotify(&MuleNotify::KadSearchEnd, val)
+#define Notify_Search_Update_Sources(ptr) MuleNotify::DoNotify(&MuleNotify::Search_Update_Sources, ptr)
+#define Notify_Search_Add_Result(s) MuleNotify::DoNotify(&MuleNotify::Search_Add_Result, s)
+#define Notify_Browse_Status(ecid, status) MuleNotify::DoNotify(&MuleNotify::Browse_Status, ecid, status)
+#define Notify_Browse_Started(ecid, name, sid) \
+	MuleNotify::DoNotify(&MuleNotify::Browse_Started, ecid, name, sid)
 
 // chat
-#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)
+#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)
+// A chat session was closed -- see MuleNotify::Chat_SessionRemoved above.
+#define Notify_Chat_SessionRemoved(id) MuleNotify::DoNotify(&MuleNotify::Chat_SessionRemoved, id)
+#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_ShowUpdateCatTabTitles()			MuleNotify::DoNotify(&MuleNotify::ShowUpdateCatTabTitles)
-#define Notify_ShowGUI()				MuleNotify::DoNotify(&MuleNotify::ShowGUI)
+#define Notify_ShowConnState(val) MuleNotify::DoNotify(&MuleNotify::ShowConnState, val)
+#define Notify_ShowUserCount(str) MuleNotify::DoNotify(&MuleNotify::ShowUserCount, str)
+#define Notify_ShowUpdateCatTabTitles() MuleNotify::DoNotify(&MuleNotify::ShowUpdateCatTabTitles)
+#define Notify_ShowGUI() MuleNotify::DoNotify(&MuleNotify::ShowGUI)
+#define Notify_VersionCheckResult(latest, outdated) \
+	MuleNotify::DoNotify(&MuleNotify::VersionCheckResult, latest, outdated)
 
 // categories
-#define Notify_CategoryAdded()				MuleNotify::DoNotify(&MuleNotify::CategoryAdded)
-#define Notify_CategoryUpdate(cat)			MuleNotify::DoNotify(&MuleNotify::CategoryUpdate, cat)
-#define Notify_CategoryDelete(cat)			MuleNotify::DoNotify(&MuleNotify::CategoryDelete, cat)
+#define Notify_CategoryAdded() MuleNotify::DoNotify(&MuleNotify::CategoryAdded)
+#define Notify_CategoryUpdate(cat) MuleNotify::DoNotify(&MuleNotify::CategoryUpdate, cat)
+#define Notify_CategoryDelete(cat) MuleNotify::DoNotify(&MuleNotify::CategoryDelete, cat)
 
 // server.met/nodes.dat default urls
-#define Notify_NodesURLChanged(url)			MuleNotify::DoNotify(&MuleNotify::NodesURLChanged, url)
-#define Notify_ServersURLChanged(url)			MuleNotify::DoNotify(&MuleNotify::ServersURLChanged, url)
+#define Notify_NodesURLChanged(url) MuleNotify::DoNotify(&MuleNotify::NodesURLChanged, url)
+#define Notify_ServersURLChanged(url) MuleNotify::DoNotify(&MuleNotify::ServersURLChanged, url)
 
 // Partfile conversion: Core -> GUI
-#define Notify_ConvertUpdateProgress(val, text)		Notify_ConvertUpdateProgressFull(val, text, "")
-#define Notify_ConvertUpdateProgressFull(val, text, hdr) MuleNotify::DoNotify(&MuleNotify::ConvertUpdateProgress, val, text, hdr)
-#define Notify_ConvertUpdateJobInfo(info)		MuleNotify::DoNotify(&MuleNotify::ConvertUpdateJobInfo, info)
-#define Notify_ConvertRemoveJobInfo(id)			MuleNotify::DoNotify(&MuleNotify::ConvertRemoveJobInfo, id)
-#define Notify_ConvertClearInfos()			MuleNotify::DoNotify(&MuleNotify::ConvertClearInfos)
+#define Notify_ConvertUpdateProgress(val, text) Notify_ConvertUpdateProgressFull(val, text, "")
+#define Notify_ConvertUpdateProgressFull(val, text, hdr) \
+	MuleNotify::DoNotify(&MuleNotify::ConvertUpdateProgress, val, text, hdr)
+#define Notify_ConvertUpdateJobInfo(info) MuleNotify::DoNotify(&MuleNotify::ConvertUpdateJobInfo, info)
+#define Notify_ConvertRemoveJobInfo(id) MuleNotify::DoNotify(&MuleNotify::ConvertRemoveJobInfo, id)
+#define Notify_ConvertClearInfos() MuleNotify::DoNotify(&MuleNotify::ConvertClearInfos)
 // Partfile conversion: GUI -> Core
-#define Notify_ConvertRemoveJob(id)			MuleNotify::DoNotify(&MuleNotify::ConvertRemoveJob, id)
-#define Notify_ConvertRetryJob(id)			MuleNotify::DoNotify(&MuleNotify::ConvertRetryJob, id)
-#define Notify_ConvertReaddAllJobs()			MuleNotify::DoNotify(&MuleNotify::ConvertReaddAllJobs)
+#define Notify_ConvertRemoveJob(id) MuleNotify::DoNotify(&MuleNotify::ConvertRemoveJob, id)
+#define Notify_ConvertRetryJob(id) MuleNotify::DoNotify(&MuleNotify::ConvertRetryJob, id)
+#define Notify_ConvertReaddAllJobs() MuleNotify::DoNotify(&MuleNotify::ConvertReaddAllJobs)
 
-//
 // GUI -> core notification
-//
 
 // PartFile
-#define CoreNotify_PartFile_Swap_A4AF(ptr)		MuleNotify::DoNotify(&MuleNotify::PartFile_Swap_A4AF, ptr)
-#define CoreNotify_PartFile_Swap_A4AF_Auto(ptr)		MuleNotify::DoNotify(&MuleNotify::PartFile_Swap_A4AF_Auto, ptr)
-#define CoreNotify_PartFile_Swap_A4AF_Others(ptr)	MuleNotify::DoNotify(&MuleNotify::PartFile_Swap_A4AF_Others, ptr)
-#define CoreNotify_PartFile_Pause(ptr)			MuleNotify::DoNotify(&MuleNotify::PartFile_Pause, ptr)
-#define CoreNotify_PartFile_Resume(ptr)			MuleNotify::DoNotify(&MuleNotify::PartFile_Resume, ptr)
-#define CoreNotify_PartFile_Stop(ptr)			MuleNotify::DoNotify(&MuleNotify::PartFile_Stop, ptr)
-#define CoreNotify_PartFile_PrioAuto(ptr, val)		MuleNotify::DoNotify(&MuleNotify::PartFile_PrioAuto, ptr, val)
-#define CoreNotify_PartFile_PrioSet(p, v0, v1)		MuleNotify::DoNotify(&MuleNotify::PartFile_PrioSet, p, v0, v1)
-#define CoreNotify_PartFile_Delete(ptr)			MuleNotify::DoNotify(&MuleNotify::PartFile_Delete, ptr)
-#define CoreNotify_PartFile_SetCat(ptr, val)		MuleNotify::DoNotify(&MuleNotify::PartFile_SetCat, ptr, val)
+#define CoreNotify_PartFile_Swap_A4AF(ptr) MuleNotify::DoNotify(&MuleNotify::PartFile_Swap_A4AF, ptr)
+#define CoreNotify_PartFile_Swap_A4AF_Auto(ptr) \
+	MuleNotify::DoNotify(&MuleNotify::PartFile_Swap_A4AF_Auto, ptr)
+#define CoreNotify_PartFile_Swap_A4AF_Others(ptr) \
+	MuleNotify::DoNotify(&MuleNotify::PartFile_Swap_A4AF_Others, ptr)
+#define CoreNotify_PartFile_Pause(ptr) MuleNotify::DoNotify(&MuleNotify::PartFile_Pause, ptr)
+#define CoreNotify_PartFile_Resume(ptr) MuleNotify::DoNotify(&MuleNotify::PartFile_Resume, ptr)
+#define CoreNotify_PartFile_Stop(ptr) MuleNotify::DoNotify(&MuleNotify::PartFile_Stop, ptr)
+#define CoreNotify_PartFile_PrioAuto(ptr, val) MuleNotify::DoNotify(&MuleNotify::PartFile_PrioAuto, ptr, val)
+#define CoreNotify_PartFile_PrioSet(p, v0, v1) MuleNotify::DoNotify(&MuleNotify::PartFile_PrioSet, p, v0, v1)
+#define CoreNotify_PartFile_Delete(ptr) MuleNotify::DoNotify(&MuleNotify::PartFile_Delete, ptr)
+#define CoreNotify_PartFile_SetCat(ptr, val) MuleNotify::DoNotify(&MuleNotify::PartFile_SetCat, ptr, val)
 
 // 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, v0, v1)	MuleNotify::DoNotify(&MuleNotify::KnownFile_Comment_Set, ptr, v0, v1)
+#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, 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)
-#define CoreNotify_Search_Update_Progress(val)		MuleNotify::DoNotify(&MuleNotify::Search_Update_Progress, val)
+#define CoreNotify_Search_Add_Download(ptr, val) \
+	MuleNotify::DoNotify(&MuleNotify::Search_Add_Download, ptr, val)
+#define CoreNotify_Search_Update_Progress(val) MuleNotify::DoNotify(&MuleNotify::Search_Update_Progress, val)
 
 // download queue
-#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)
+#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)
+#define CoreNotify_Upload_Resort_Queue() MuleNotify::DoNotify(&MuleNotify::Upload_Resort_Queue)
 
 // client
-#define CoreNotify_Client_Delete(client)			MuleNotify::DoNotify(&MuleNotify::Client_Delete, client)
+#define CoreNotify_Client_Delete(client) MuleNotify::DoNotify(&MuleNotify::Client_Delete, client)
 
-//
 // core internal notifications
-//
 
 // ASIO sockets
-#define CoreNotify_LibSocketConnect(ptr, val)		MuleNotify::DoNotifyAlways(&MuleNotify::LibSocketConnect, ptr, val)
-#define CoreNotify_LibSocketSend(ptr, val)			MuleNotify::DoNotifyAlways(&MuleNotify::LibSocketSend, ptr, val)
-#define CoreNotify_LibSocketReceive(ptr, val)		MuleNotify::DoNotifyAlways(&MuleNotify::LibSocketReceive, ptr, val)
-#define CoreNotify_LibSocketLost(ptr)				MuleNotify::DoNotifyAlways(&MuleNotify::LibSocketLost, ptr)
-#define CoreNotify_LibSocketDestroy(ptr)			MuleNotify::DoNotifyAlways(&MuleNotify::LibSocketDestroy, ptr)
-#define CoreNotify_ServerTCPAccept(ptr)				MuleNotify::DoNotifyAlways(&MuleNotify::ServerTCPAccept, ptr)
-#define CoreNotify_UDPSocketSend(ptr)				MuleNotify::DoNotifyAlways(&MuleNotify::UDPSocketSend, ptr)
-#define CoreNotify_UDPSocketReceive(ptr)			MuleNotify::DoNotifyAlways(&MuleNotify::UDPSocketReceive, ptr)
-#define CoreNotify_ProxySocketEvent(ptr, val)		MuleNotify::DoNotifyAlways(&MuleNotify::ProxySocketEvent, ptr, val)
+#define CoreNotify_LibSocketConnect(ptr, val) \
+	MuleNotify::DoNotifyAlways(&MuleNotify::LibSocketConnect, ptr, val)
+#define CoreNotify_LibSocketSend(ptr, val) MuleNotify::DoNotifyAlways(&MuleNotify::LibSocketSend, ptr, val)
+#define CoreNotify_LibSocketReceive(ptr, val) \
+	MuleNotify::DoNotifyAlways(&MuleNotify::LibSocketReceive, ptr, val)
+#define CoreNotify_LibSocketLost(ptr) MuleNotify::DoNotifyAlways(&MuleNotify::LibSocketLost, ptr)
+#define CoreNotify_LibSocketFlush(ptr) MuleNotify::DoNotifyAlways(&MuleNotify::LibSocketFlush, ptr)
+#define CoreNotify_LibSocketDestroy(ptr) MuleNotify::DoNotifyAlways(&MuleNotify::LibSocketDestroy, ptr)
+#define CoreNotify_ServerTCPAccept(ptr) MuleNotify::DoNotifyAlways(&MuleNotify::ServerTCPAccept, ptr)
+#define CoreNotify_UDPSocketSend(ptr) MuleNotify::DoNotifyAlways(&MuleNotify::UDPSocketSend, ptr)
+#define CoreNotify_UDPSocketReceive(ptr) MuleNotify::DoNotifyAlways(&MuleNotify::UDPSocketReceive, ptr)
+#define CoreNotify_ProxySocketEvent(ptr, val) \
+	MuleNotify::DoNotifyAlways(&MuleNotify::ProxySocketEvent, ptr, val)
 
-
-//
 // 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)
+#define NotifyAlways_IPFilter_Reload() MuleNotify::DoNotifyAlways(&MuleNotify::IPFilter_Reload)
+#define NotifyAlways_IPFilter_Update(url) MuleNotify::DoNotifyAlways(&MuleNotify::IPFilter_Update, url)
 
-#endif // __GUIEVENTS_H__
+#endif // GUIEVENTS_H
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/HTTPDownload.cpp -> amule-3.1.0.tar.gz/src/HTTPDownload.cpp Changed

@@ -23,7 +23,6 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include <wx/filename.h>
 #include <wx/webrequest.h>
 
@@ -31,19 +30,19 @@
 #include <curl/curl.h>
 #endif
 
-#include "HTTPDownload.h"				// Interface declarations
-#include <common/StringFunctions.h>		// Needed for unicode2char
-#include "OtherFunctions.h"				// Needed for CastChild
-#include "Logger.h"						// Needed for AddLogLine*
-#include <common/Format.h>				// Needed for CFormat
-#include "InternalEvents.h"				// Needed for CMuleInternalEvent
+#include "HTTPDownload.h"           // Interface declarations
+#include <common/StringFunctions.h> // Needed for unicode2char
+#include "OtherFunctions.h"         // Needed for CastChild
+#include "Logger.h"                 // Needed for AddLogLine*
+#include <common/Format.h>          // Needed for CFormat
+#include "InternalEvents.h"         // Needed for CMuleInternalEvent
 #include "Preferences.h"
 #include "Proxy.h"
-
+#include "LibSocket.h" // BindRawSocketToInterface for the curl bind hook
 
 #ifndef AMULE_DAEMON
-#include "inetdownload.h"	// Needed for inetDownload
-#include "muuli_wdr.h"		// Needed for ID_CANCEL: Let it here or will fail on win32
+#include "inetdownload.h" // Needed for inetDownload
+#include "muuli_wdr.h"    // Needed for ID_CANCEL: Let it here or will fail on win32
 #include "MuleGifCtrl.h"
 
 typedef wxGauge wxGaugeControl;
@@ -54,9 +53,13 @@
 class CHTTPDownloadDialog : public wxDialog
 {
 public:
-	CHTTPDownloadDialog(CHTTPDownloadThread* owner)
-	  : wxDialog(wxTheApp->GetTopWindow(), -1, _("Downloading..."),
-			wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxSYSTEM_MENU)
+	CHTTPDownloadDialog(CHTTPDownloadThread *owner)
+	: wxDialog(wxTheApp->GetTopWindow(),
+		  -1,
+		  _("Downloading..."),
+		  wxDefaultPosition,
+		  wxDefaultSize,
+		  wxDEFAULT_DIALOG_STYLE)
 	{
 		downloadDlg(this, true)->Show(this, true);
 
@@ -64,21 +67,20 @@
 		m_progressbar->SetRange(100);
 
 		m_ani = CastChild(ID_ANIMATE, MuleGifCtrl);
-		m_ani->LoadData((const char*)inetDownload, sizeof(inetDownload));
+		m_ani->LoadData((const char *)inetDownload, sizeof(inetDownload));
 		m_ani->Start();
 
 		m_owner = owner;
 	}
 
-	~CHTTPDownloadDialog() {
-		StopDownload();
-	}
+	~CHTTPDownloadDialog() { StopDownload(); }
 
-	void UpdateGauge(int total, int current) {
-		CFormat label( "( %s / %s )" );
+	void UpdateGauge(int total, int current)
+	{
+		CFormat label("( %s / %s )");
 
 		const int safeCurrent = (current > 0) ? current : 0;
-		const int safeTotal   = (total   > 0) ? total   : 0;
+		const int safeTotal = (total > 0) ? total : 0;
 
 		label % CastItoXBytes(safeCurrent);
 		if (safeTotal > 0) {
@@ -89,10 +91,9 @@
 
 		CastChild(IDC_DOWNLOADSIZE, wxStaticText)->SetLabel(label.GetString());
 
-		// Only touch the gauge when we know the total. Without a known total
-		// we leave the gauge at its previous (valid) state — better than
-		// risking m_gaugePos > m_rangeMax, which trips an assertion in
-		// wxGauge::DoSetGauge on wxGTK (./src/gtk/gauge.cpp:90).
+		// Only touch the gauge when we know the total. Without one we leave the gauge at
+		// its previous valid state -- better than risking m_gaugePos > m_rangeMax, which
+		// trips an assertion in wxGauge::DoSetGauge on wxGTK (./src/gtk/gauge.cpp:90).
 		if (safeTotal > 0) {
 			if (safeTotal != m_progressbar->GetRange()) {
 				m_progressbar->SetRange(safeTotal);
@@ -105,12 +106,11 @@
 	}
 
 private:
-	// Unlink from the request owner and cancel it. Fire-and-forget: the
-	// owner will self-destroy when wxWebRequest reports State_Cancelled
-	// on the main loop. We must NOT delete the owner here — doing so
-	// while a request is in flight leaves the wxWebRequest backend
-	// calling into a dead sink.
-	void StopDownload() {
+	// Unlink from the request owner and cancel it. Fire-and-forget: the owner self-destroys
+	// when wxWebRequest reports State_Cancelled on the main loop. Deleting it here, with a
+	// request in flight, would leave the wxWebRequest backend calling into a dead sink.
+	void StopDownload()
+	{
 		if (m_owner) {
 			m_owner->DetachCompanion();
 			m_owner->Stop();
@@ -118,33 +118,32 @@
 		}
 	}
 
-	void OnBtnCancel(wxCommandEvent& WXUNUSED(evt)) {
+	void OnBtnCancel(wxCommandEvent &WXUNUSED(evt))
+	{
 		AddLogLineN(_("HTTP download cancelled"));
 		Show(false);
 		StopDownload();
 	}
 
-	void OnProgress(CMuleInternalEvent& evt) {
-		UpdateGauge(evt.GetExtraInt64(), evt.GetInt());
-	}
+	void OnProgress(CMuleInternalEvent &evt) { UpdateGauge(evt.GetExtraInt64(), evt.GetInt()); }
 
-	void OnShutdown(CMuleInternalEvent& WXUNUSED(evt)) {
-		// The thread is about to self-destroy — drop our raw pointer now
-		// so our own dtor (which runs later via wxPendingDelete) does not
-		// touch a freed CHTTPDownloadThread via StopDownload().
+	void OnShutdown(CMuleInternalEvent &WXUNUSED(evt))
+	{
+		// The thread is about to self-destroy -- drop our raw pointer now so our own dtor,
+		// which runs later via wxPendingDelete, does not touch a freed CHTTPDownloadThread
+		// via StopDownload().
 		m_owner = NULL;
 		Show(false);
 		Destroy();
 	}
 
-	CHTTPDownloadThread*	m_owner;	// not owned
-	MuleGifCtrl*		m_ani;
-	wxGaugeControl*		m_progressbar;
+	CHTTPDownloadThread *m_owner; // not owned
+	MuleGifCtrl *m_ani;
+	wxGaugeControl *m_progressbar;
 
 	wxDECLARE_EVENT_TABLE();
 };
 
-
 wxBEGIN_EVENT_TABLE(CHTTPDownloadDialog, wxDialog)
 	EVT_BUTTON(ID_HTTPCANCEL, CHTTPDownloadDialog::OnBtnCancel)
 	EVT_MULE_INTERNAL(wxEVT_HTTP_PROGRESS, -1, CHTTPDownloadDialog::OnProgress)
@@ -155,62 +154,188 @@
 wxDEFINE_EVENT(wxEVT_HTTP_SHUTDOWN, wxEvent);
 #endif
 
-
-// Apply the current proxy prefs to the shared wxWebSession.
+// Apply the current proxy prefs to the given wxWebSession.
 //
-// wxWebProxy / wxWebSession::SetProxy are wx 3.3+ only. On wx 3.2 there is
-// no programmatic way to set a proxy on wxWebRequest, so we rely on the
-// backend defaults: on Linux wxWebRequest is backed by libcurl, which
-// honours the standard http_proxy / https_proxy / all_proxy environment
-// variables. Users of the aMule Proxy pref on wx 3.2 are no worse off than
-// with the legacy wxHTTP::SetProxyMode(bool) path, which only toggled a
-// boolean and never actually consumed the host / port / auth fields either.
+// wxWebProxy / wxWebSession::SetProxy are wx 3.3+ only. On wx 3.2 there is no programmatic way to
+// set a proxy on wxWebRequest, so we rely on the backend defaults: libcurl honours http_proxy /
+// https_proxy / all_proxy. That leaves wx 3.2 users no worse off than the legacy
+// wxHTTP::SetProxyMode(bool) path, which only toggled a boolean and never consumed the host / port
+// / auth fields.
 //
-// SOCKS proxies are intentionally skipped even when SetProxy is available:
-// wx 3.3's wxWebProxy is HTTP-only. A libcurl backend would be required if
-// SOCKS support mattered — that is out of scope for this fix.
-static void ApplyProxyToDefaultSession()
+// SOCKS proxies are skipped even where SetProxy is available: wx 3.3's wxWebProxy is HTTP-only.
+static void ApplyProxyToSession(wxWebSession &session)
 {
 #if wxCHECK_VERSION(3, 3, 0)
-	wxWebSession& session = wxWebSession::GetDefault();
-	const CProxyData* pd = thePrefs::GetProxyData();
+	const CProxyData *pd = thePrefs::GetProxyData();
 	if (!pd || !pd->m_proxyEnable || pd->m_proxyType == PROXY_NONE) {
-		session.SetProxy(wxWebProxy::FromURL(wxString()));   // clear
+		session.SetProxy(wxWebProxy::FromURL(wxString())); // clear
 		return;
 	}
 	if (pd->m_proxyType != PROXY_HTTP) {
-		AddDebugLogLineN(logHTTP, "wxWebRequest: SOCKS proxies are not supported; startup HTTP will be made direct.");
+		AddDebugLogLineN(logHTTP,
+			"wxWebRequest: SOCKS proxies are not supported; startup HTTP will be made direct.");
 		session.SetProxy(wxWebProxy::FromURL(wxString()));
 		return;
 	}
 	wxString url;
 	if (pd->m_enablePassword && !pd->m_userName.IsEmpty()) {
-		url = CFormat("http://%s:%s@%s:%u")
-			% pd->m_userName % pd->m_password
-			% pd->m_proxyHostName % pd->m_proxyPort;
+		url = CFormat("http://%s:%s@%s:%u") % pd->m_userName % pd->m_password % pd->m_proxyHostName %
+		      pd->m_proxyPort;
 	} else {
-		url = CFormat("http://%s:%u")
-			% pd->m_proxyHostName % pd->m_proxyPort;
+		url = CFormat("http://%s:%u") % pd->m_proxyHostName % pd->m_proxyPort;
 	}
 	session.SetProxy(wxWebProxy::FromURL(url));
+#else
+	(void)session;
 #endif
 }
 
+// HTTP-on-curl is what lets us bind egress to an interface (via the sockopt hook below). Selected
+// on Linux and macOS but deliberately NOT on Windows:
+//
+//   Linux  : curl is already the default backend.
+//   macOS  : the default is the native URLSession backend, whose handle is not a CURL*, so curl is
+//            requested explicitly to get a bindable handle.
+//   Windows: the wxMSW libcurl backend is broken -- a forced curl request never progresses and
+//            hangs. WinHTTP works but has no interface-bind API, so HTTP stays on WinHTTP there
+//            and is not bound.
+//
+// P2P traffic is bound on all platforms regardless; only the Windows HTTP side-channels are left
+// unbound.
+#if wxUSE_WEBREQUEST_CURL && !defined(__WINDOWS__)
+#define AMULE_HTTP_CURL_BIND 1
+#endif
 
-CHTTPDownloadThread::CHTTPDownloadThread(const wxString& url, const wxString& filename, const wxString& oldfilename, HTTP_Download_File file_id,
-										bool showDialog, bool checkDownloadNewer)
-	: m_url(url),
-	  m_tempfile(filename),
-	  m_result(-1),
-	  m_response(0),
-	  m_error(0),
-	  m_file_id(file_id),
-	  m_companion(NULL),
-	  m_finishPosted(false)
+// Returns the session aMule HTTP should use, and reports through `isCurlBackend` whether it is
+// libcurl-backed. The caller may only treat wxWebRequest::GetNativeHandle() as a CURL* when curl
+// actually served the request: wxUSE_WEBREQUEST_CURL says only that curl is AVAILABLE, not that it
+// BACKS the default session. On macOS that default is NSURLSession, whose native handle is an
+// NSURLSessionTask*, and calling curl_easy_setopt() on it corrupts the Obj-C object and crashes on
+// startup (#601).
+static wxWebSession &GetAmuleWebSession(bool &isCurlBackend)
+{
+	isCurlBackend = false;
+#ifdef AMULE_HTTP_CURL_BIND
+	// Switch to the curl backend only when an interface is actually bound -- curl is just the
+	// means to make HTTP bindable. Forcing it otherwise would change the HTTP stack for users
+	// who do not use this feature, including macOS's native URLSession with its own TLS and
+	// proxy handling.
+	if (!thePrefs::GetNetworkInterface().IsEmpty() &&
+		wxWebSession::IsBackendAvailable(wxWebSessionBackendCURL)) {
+		// Proxy applied here, at construction, and never again -- see the note on the
+		// default session below. Function-local statics are initialised once and thread-
+		// safely, which matters because requests are created from CHTTPDownloadThread as
+		// well as the main thread.
+		static wxWebSession curlSession =  {
+			wxWebSession session = wxWebSession::New(wxWebSessionBackendCURL);
+			ApplyProxyToSession(session);
+			return session;
+		}();
+		if (curlSession.IsOpened()) {
+			isCurlBackend = true;
+			return curlSession;
+		}
+	}
+	// Default session. AMULE_HTTP_CURL_BIND already excludes Windows (WinHTTP), so the default
+	// backend here is curl on Linux and other *nix but NSURLSession on macOS -- only the former
+	// hands back a CURL* from GetNativeHandle().
+#ifndef __WXOSX__
+	isCurlBackend = true;
+#endif
+#endif
+	// Once per session, not once per request. WinHTTP builds its session handle on the first request
+	// and wx asserts if SetProxy() is called after that:
+	//
+	//   webrequest_winhttp.cpp:SetProxy: assert '!m_handle' failed.
+	//
+	// aMule makes several HTTP requests per session, so applying the proxy on each one meant every
+	// request after the first raised a modal assert during startup. The cost is that a proxy
+	// preference change takes effect on the next run rather than the next request, which is all the
+	// WinHTTP backend allows anyway.
+	static const bool defaultSessionProxyApplied =  {
+		ApplyProxyToSession(wxWebSession::GetDefault());
+		return true;
+	}();
+	(void)defaultSessionProxyApplied;
+
+	return wxWebSession::GetDefault();
+}
+
+#if defined(AMULE_HAVE_LIBCURL) && defined(AMULE_HTTP_CURL_BIND)
+// libcurl invokes this on the freshly-created socket, before connect(). Bind it to the configured
+// interface using aMule's own per-platform logic (the same SO_BINDTODEVICE / IP_BOUND_IF path the
+// P2P sockets use), so HTTP cannot leak past a bound interface. See amule-org/amule#173.
+extern "C" int amuleHttpSockoptCallback(void *, curl_socket_t curlfd, curlsocktype)
+{
+	const wxString &iface = thePrefs::GetNetworkInterface();
+	if (!iface.IsEmpty()) {
+		BindRawSocketToInterface(static_cast<uintptr_t>(curlfd), iface);
+	}
+	return CURL_SOCKOPT_OK;
+}
+#endif
+
+// Tune the libcurl handle backing an HTTP request: CURLOPT_NOSIGNAL so the synchronous-resolver
+// fallback does not raise SIGALRM in this multi-threaded process, CURLOPT_CONNECTTIMEOUT_MS so the
+// connect phase gives up after 30 s instead of the full OS resolver timeout, and
+// CURLOPT_SOCKOPTFUNCTION to bind egress when an interface is configured. Only call this when curl
+// actually backs the request (see GetAmuleWebSession).
+static void CustomizeCurlRequest(wxWebRequest &request)
+{
+#if defined(AMULE_HAVE_LIBCURL) && defined(AMULE_HTTP_CURL_BIND)
+	if (CURL *curl = static_cast<CURL *>(request.GetNativeHandle())) {
+		curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1L);
+		curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, 30000L);
+		// Stall guard: abort a transfer that averages under 1 byte/s for 60 s once
+		// connected. CURLOPT_CONNECTTIMEOUT only covers the connect phase, so without this
+		// a server that accepts the connection and then stops sending leaves a pending
+		// request forever -- which matters most for the unattended periodic version check.
+		// A total CURLOPT_TIMEOUT is avoided on purpose so large but legitimately slow
+		// downloads are not capped.
+		curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1L);
+		curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 60L);
+		if (!thePrefs::GetNetworkInterface().IsEmpty()) {
+			curl_easy_setopt(curl, CURLOPT_SOCKOPTFUNCTION, amuleHttpSockoptCallback);
+		}
+	}
+#else
+	(void)request;
+#endif
+}
+
+// Single entry point for all aMule HTTP: curl-backed session, proxy and interface bind, so every
+// HTTP channel is consistent and honours the bind-to-interface preference.
+wxWebRequest CreateAmuleWebRequest(wxEvtHandler *handler, const wxString &url)
+{
+	bool isCurlBackend = false;
+	// The proxy is applied when the session is first handed out, not here:
+	// setting it per request asserts on WinHTTP once a request has been made.
+	wxWebSession &session = GetAmuleWebSession(isCurlBackend);
+	wxWebRequest request = session.CreateRequest(handler, url);
+	if (request.IsOk() && isCurlBackend) {
+		CustomizeCurlRequest(request);
+	}
+	return request;
+}
+
+CHTTPDownloadThread::CHTTPDownloadThread(const wxString &url,
+	const wxString &filename,
+	const wxString &oldfilename,
+	HTTP_Download_File file_id,
+	bool showDialog,
+	bool checkDownloadNewer)
+: m_url(url)
+, m_tempfile(filename)
+, m_result(-1)
+, m_response(0)
+, m_error(0)
+, m_file_id(file_id)
+, m_companion(NULL)
+, m_finishPosted(false)
 {
 	if (showDialog) {
 #ifndef AMULE_DAEMON
-		CHTTPDownloadDialog* dialog = new CHTTPDownloadDialog(this);
+		CHTTPDownloadDialog *dialog = new CHTTPDownloadDialog(this);
 		dialog->Show(true);
 		m_companion = dialog;
 #endif
@@ -221,7 +346,9 @@
 	if (checkDownloadNewer && thePrefs::GetLastHTTPDownloadURL(file_id) == url) {
 		wxFileName origFile(oldfilename);
 		if (origFile.FileExists()) {
-			AddDebugLogLineN(logHTTP, CFormat("URL %s matches and file %s exists, only download if newer") % url % oldfilename);
+			AddDebugLogLineN(logHTTP,
+				CFormat("URL %s matches and file %s exists, only download if newer") % url %
+					oldfilename);
 			m_lastmodified = origFile.GetModificationTime();
 		}
 	}
@@ -239,36 +366,20 @@
 		return;
 	}
 
-	ApplyProxyToDefaultSession();
-
-	m_request = wxWebSession::GetDefault().CreateRequest(this, m_url);
+	// Curl-backed session, proxy and interface bind, all in one place. The threaded-resolver
+	// caveat still applies: the CONNECTTIMEOUT set inside bounds the visible delay before
+	// Failed fires, but not the cleanup-time pthread_join on libcurl's threaded resolver.
+	m_request = CreateAmuleWebRequest(this, m_url);
 	if (!m_request.IsOk()) {
 		AddLogLineC(CFormat(_("Failed to create HTTP request for %s")) % m_url);
 		FinishAndDestroy(HTTP_Error);
 		return;
 	}
 
-#if defined(AMULE_HAVE_LIBCURL) && wxUSE_WEBREQUEST_CURL
-	// When wx was built with the libcurl backend AND we found <curl/curl.h>
-	// at configure time, set CURLOPT_NOSIGNAL so the synchronous-resolver
-	// fallback doesn't raise SIGALRM in this multi-threaded process, and
-	// CURLOPT_CONNECTTIMEOUT_MS so the connect phase (incl. DNS) gives up
-	// after 30 s instead of waiting the full OS resolver timeout (~5 min).
-	// This does NOT close the cleanup-time pthread_join hang on libcurl's
-	// threaded resolver — that's bounded by the OS DNS timeout regardless
-	// — but it bounds the visible delay before the Failed event fires.
-	if (CURL* curl = static_cast<CURL*>(m_request.GetNativeHandle())) {
-		curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1L);
-		curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, 30000L);
-	}
-#endif
-
-	// Storage_File: wx streams the response body to an internal temp file
-	// and hands us the path on completion. We then rename it to the
-	// caller-supplied m_tempfile. Redirects (incl. HTTP→HTTPS) are
-	// followed by wx transparently — the whole recursive GetInputStream()
-	// redirect handler of the legacy code path is gone, which is the
-	// actual fix for the upstream startup crash (amule-project/amule#455).
+	// Storage_File: wx streams the response body to an internal temp file and hands us the path
+	// on completion, which we then rename to m_tempfile. Redirects, including HTTP to HTTPS,
+	// are followed transparently, so the legacy recursive GetInputStream() redirect handler is
+	// gone -- the actual fix for the upstream startup crash.
 	m_request.SetStorage(wxWebRequest::Storage_File);
 
 	if (m_lastmodified.IsValid()) {
@@ -280,115 +391,113 @@
 	m_request.Start();
 }
 
-
 // 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)
+wxString CHTTPDownloadThread::FormatDateHTTP(const wxDateTime &date)
 {
-	static const wxChar* s_months = { L"Jan", L"Feb", L"Mar", L"Apr", L"May", L"Jun", L"Jul", L"Aug", L"Sep", L"Oct", L"Nov", L"Dec" };
-	static const wxChar* s_dow = { L"Sun", L"Mon", L"Tue", L"Wed", L"Thu", L"Fri", L"Sat" };
-
-	return CFormat("%s, %02d %s %d %02d:%02d:%02d GMT") % s_dowdate.GetWeekDay(wxDateTime::UTC) % date.GetDay(wxDateTime::UTC) % s_monthsdate.GetMonth(wxDateTime::UTC) % date.GetYear(wxDateTime::UTC) % date.GetHour(wxDateTime::UTC) % date.GetMinute(wxDateTime::UTC) % date.GetSecond(wxDateTime::UTC);
+	static const wxChar *s_months = {
+		L"Jan", L"Feb", L"Mar", L"Apr", L"May", L"Jun", L"Jul", L"Aug", L"Sep", L"Oct", L"Nov", L"Dec"
+	};
+	static const wxChar *s_dow = { L"Sun", L"Mon", L"Tue", L"Wed", L"Thu", L"Fri", L"Sat" };
+
+	return CFormat("%s, %02d %s %d %02d:%02d:%02d GMT") % s_dowdate.GetWeekDay(wxDateTime::UTC) %
+	       date.GetDay(wxDateTime::UTC) % s_monthsdate.GetMonth(wxDateTime::UTC) %
+	       date.GetYear(wxDateTime::UTC) % date.GetHour(wxDateTime::UTC) %
+	       date.GetMinute(wxDateTime::UTC) % date.GetSecond(wxDateTime::UTC);
 }
 
-
-void CHTTPDownloadThread::OnStateEvent(wxWebRequestEvent& evt)
+void CHTTPDownloadThread::OnStateEvent(wxWebRequestEvent &evt)
 {
 	switch (evt.GetState()) {
-		case wxWebRequest::State_Active: {
-			// Periodic progress notification during the download.
-			if (m_companion) {
+	case wxWebRequest::State_Active: {
+		// Periodic progress notification during the download.
+		if (m_companion) {
 #ifndef AMULE_DAEMON
-				// GetBytesExpectedToReceive() returns wxInvalidOffset (-1)
-				// when the server omits Content-Length. Forwarding -1 into
-				// the dialog ends up in wxGauge::SetRange(-1), which flips
-				// m_rangeMax invalid and trips an assertion on the next
-				// repaint (./src/gtk/gauge.cpp:90). Clamp to 0 here so the
-				// dialog treats it as "unknown" (skips the range + value
-				// update) until a real total shows up.
-				wxFileOffset expected = m_request.GetBytesExpectedToReceive();
-				CMuleInternalEvent prog(wxEVT_HTTP_PROGRESS);
-				prog.SetInt((int)m_request.GetBytesReceived());
-				prog.SetExtraInt64(expected > 0 ? expected : 0);
-				wxQueueEvent(m_companion, (prog).Clone());
+			// GetBytesExpectedToReceive() returns wxInvalidOffset (-1) when the server
+			// omits Content-Length, and forwarding -1 reaches wxGauge::SetRange(-1),
+			// which flips m_rangeMax invalid and asserts on the next repaint. Clamp to
+			// 0 so the dialog treats it as "unknown".
+			wxFileOffset expected = m_request.GetBytesExpectedToReceive();
+			CMuleInternalEvent prog(wxEVT_HTTP_PROGRESS);
+			prog.SetInt((int)m_request.GetBytesReceived());
+			prog.SetExtraInt64(expected > 0 ? expected : 0);
+			wxQueueEvent(m_companion, (prog).Clone());
 #endif
-			}
-			break;
 		}
+		break;
+	}
 
-		case wxWebRequest::State_Completed: {
-			wxWebResponse response = evt.GetResponse();
-			m_response = response.IsOk() ? response.GetStatus() : 0;
-			m_error    = 0;
-
-			AddDebugLogLineN(logHTTP, CFormat("HTTP response %d for %s") % m_response % m_url);
-
-			if (m_response == 304) {
-				// Not Modified — nothing to write.
-				AddDebugLogLineN(logHTTP, "Skipped download because requested file is not newer.");
-				FinishAndDestroy(HTTP_Skipped);
-			} else if (m_response >= 200 && m_response < 300) {
-				// Success. wx wrote the body to its own temp file; move it
-				// to the caller-supplied m_tempfile. A plain rename may
-				// fail across filesystems (wx's temp dir vs the aMule
-				// config dir), so fall back to copy + delete.
-				const wxString wxTmp = response.GetDataFile();
-				if (wxTmp.IsEmpty() || !wxFileExists(wxTmp)) {
-					AddLogLineC(CFormat(_("HTTP download: empty response body for %s")) % m_url);
-					FinishAndDestroy(HTTP_Error);
-					break;
-				}
-				if (wxFileExists(m_tempfile)) {
-					wxRemoveFile(m_tempfile);
-				}
-				bool moved = wxRenameFile(wxTmp, m_tempfile);
-				if (!moved) {
-					moved = wxCopyFile(wxTmp, m_tempfile) && wxRemoveFile(wxTmp);
-				}
-				if (!moved) {
-					AddLogLineC(CFormat(_("Could not move downloaded file to %s")) % m_tempfile);
-					FinishAndDestroy(HTTP_Error);
-					break;
-				}
-				AddLogLineN(CFormat(_("Downloaded %s (%llu bytes)"))
-					% m_url % (unsigned long long)m_request.GetBytesReceived());
-				thePrefs::SetLastHTTPDownloadURL(m_file_id, m_url);
-				FinishAndDestroy(HTTP_Success);
-			} else {
-				AddLogLineC(CFormat(_("The URL %s returned: %i")) % m_url % m_response);
+	case wxWebRequest::State_Completed: {
+		const wxWebResponse &response = evt.GetResponse();
+		m_response = response.IsOk() ? response.GetStatus() : 0;
+		m_error = 0;
+
+		AddDebugLogLineN(logHTTP, CFormat("HTTP response %d for %s") % m_response % m_url);
+
+		if (m_response == 304) {
+			// Not Modified -- nothing to write.
+			AddDebugLogLineN(logHTTP, "Skipped download because requested file is not newer.");
+			FinishAndDestroy(HTTP_Skipped);
+		} else if (m_response >= 200 && m_response < 300) {
+			// Success. wx wrote the body to its own temp file; move it to the caller-
+			// supplied m_tempfile. A plain rename may fail across filesystems, so fall
+			// back to copy + delete.
+			const wxString wxTmp = response.GetDataFile();
+			if (wxTmp.IsEmpty() || !wxFileExists(wxTmp)) {
+				AddLogLineC(CFormat(_("HTTP download: empty response body for %s")) % m_url);
 				FinishAndDestroy(HTTP_Error);
+				break;
 			}
-			break;
-		}
-
-		case wxWebRequest::State_Failed: {
-			AddLogLineC(CFormat(_("HTTP download failed for %s: %s"))
-				% m_url % evt.GetErrorDescription());
+			if (wxFileExists(m_tempfile)) {
+				wxRemoveFile(m_tempfile);
+			}
+			bool moved = wxRenameFile(wxTmp, m_tempfile);
+			if (!moved) {
+				moved = wxCopyFile(wxTmp, m_tempfile) && wxRemoveFile(wxTmp);
+			}
+			if (!moved) {
+				AddLogLineC(CFormat(_("Could not move downloaded file to %s")) % m_tempfile);
+				FinishAndDestroy(HTTP_Error);
+				break;
+			}
+			AddLogLineN(CFormat(_("Downloaded %s (%llu bytes)")) % m_url %
+				    (unsigned long long)m_request.GetBytesReceived());
+			thePrefs::SetLastHTTPDownloadURL(m_file_id, m_url);
+			FinishAndDestroy(HTTP_Success);
+		} else {
+			AddLogLineC(CFormat(_("The URL %s returned: %i")) % m_url % m_response);
 			FinishAndDestroy(HTTP_Error);
-			break;
 		}
+		break;
+	}
 
-		case wxWebRequest::State_Cancelled: {
-			AddDebugLogLineN(logHTTP, CFormat("HTTP download cancelled: %s") % m_url);
-			FinishAndDestroy(HTTP_Error);
-			break;
-		}
+	case wxWebRequest::State_Failed: {
+		AddLogLineC(
+			CFormat(_("HTTP download failed for %s: %s")) % m_url % evt.GetErrorDescription());
+		FinishAndDestroy(HTTP_Error);
+		break;
+	}
 
-		case wxWebRequest::State_Unauthorized:
-			// We have no credentials to provide interactively; treat as
-			// a failure so the dispatcher reports an error to the user.
-			AddLogLineC(CFormat(_("HTTP 401 Unauthorized for %s")) % m_url);
-			m_request.Cancel();
-			FinishAndDestroy(HTTP_Error);
-			break;
+	case wxWebRequest::State_Cancelled: {
+		AddDebugLogLineN(logHTTP, CFormat("HTTP download cancelled: %s") % m_url);
+		FinishAndDestroy(HTTP_Error);
+		break;
+	}
 
-		case wxWebRequest::State_Idle:
-			// Initial state before Start(); nothing to do.
-			break;
+	case wxWebRequest::State_Unauthorized:
+		// We have no credentials to provide interactively; treat as
+		// a failure so the dispatcher reports an error to the user.
+		AddLogLineC(CFormat(_("HTTP 401 Unauthorized for %s")) % m_url);
+		m_request.Cancel();
+		FinishAndDestroy(HTTP_Error);
+		break;
+
+	case wxWebRequest::State_Idle:
+		// Initial state before Start(); nothing to do.
+		break;
 	}
 }
 
-
 void CHTTPDownloadThread::FinishAndDestroy(int result)
 {
 	if (m_finishPosted) {
@@ -424,25 +533,22 @@
 
 	AddDebugLogLineN(logHTTP, "HTTP download ended");
 
-	// Schedule our own destruction after the current event returns to
-	// the main loop. Must not be `delete this` — wxWebRequest may still
-	// be unwinding state after handing us the terminal event.
-	CallAfter(this{ delete this; });
+	// Schedule our own destruction after the current event returns to the main loop. Must not
+	// be `delete this` -- wxWebRequest may still be unwinding state after handing us the
+	// terminal event.
+	CallAfter(this { delete this; });
 }
 
-
 void CHTTPDownloadThread::DetachCompanion()
 {
 	m_companion = NULL;
 }
 
-
 void CHTTPDownloadThread::Stop()
 {
 	if (m_request.IsOk() && !m_finishPosted) {
-		// Fire-and-forget: wxWebRequest will schedule a State_Cancelled
-		// event on the main loop. Our OnStateEvent will run
-		// FinishAndDestroy at that point.
+		// Fire-and-forget: wxWebRequest will schedule a State_Cancelled event on the main
+		// loop, and our OnStateEvent will run FinishAndDestroy then.
 		m_request.Cancel();
 	} else if (!m_finishPosted) {
 		// Request never got off the ground (e.g. invalid URL, or Stop()
@@ -451,7 +557,6 @@
 	}
 }
 
-
 void CHTTPDownloadThread::StopAll()
 {
 	ThreadSet snapshot;
@@ -464,7 +569,6 @@
 	}
 }
 
-
 CHTTPDownloadThread::ThreadSet CHTTPDownloadThread::s_allThreads;
 wxMutex CHTTPDownloadThread::s_allThreadsMutex;

amule-3.0.1.tar.gz/src/HTTPDownload.h -> amule-3.1.0.tar.gz/src/HTTPDownload.h Changed

@@ -27,83 +27,87 @@
 #ifndef HTTPDOWNLOAD_H
 #define HTTPDOWNLOAD_H
 
-#include "GuiEvents.h"		// Needed for HTTP_Download_File
-#include <wx/datetime.h>	// Needed for wxDateTime
-#include <wx/event.h>		// Needed for wxEvtHandler
-#include <wx/webrequest.h>	// Needed for wxWebRequest
+#include "GuiEvents.h"     // Needed for HTTP_Download_File
+#include <wx/datetime.h>   // Needed for wxDateTime
+#include <wx/event.h>      // Needed for wxEvtHandler
+#include <wx/webrequest.h> // Needed for wxWebRequest
 #include <set>
 
 class wxWebRequestEvent;
 
+// Create an HTTP request through aMule's shared path: a curl-backed wxWebSession (uniform across
+// platforms), the current proxy pref applied, and egress bound to the configured network interface
+// when one is set. Used by every HTTP channel (this downloader and the version check) so they
+// behave consistently and honour bind-to-interface (amule-org/amule#173).
+wxWebRequest CreateAmuleWebRequest(wxEvtHandler *handler, const wxString &url);
 
-enum HTTPDownloadResult {
+enum HTTPDownloadResult
+{
 	HTTP_Success = 0,
 	HTTP_Error,
 	HTTP_Skipped
 };
 
-
-//
-// Startup HTTP downloader (version check, server.met, nodes.dat, ipfilter,
-// GeoIP). Historically a wxThread running wxHTTP on a worker thread, which
-// raced wxEpollDispatcher during redirect / teardown (see upstream PR #455).
-//
-// This implementation is event-driven on the main thread: owns a
-// wxWebRequest, binds wxEVT_WEBREQUEST_STATE, and self-destroys (via
-// wxPendingDelete) after Completed / Failed / Cancelled. No thread, no
-// nested event loops, no modal dialogs — so no reentrancy surface.
+// Startup HTTP downloader (version check, server.met, nodes.dat, ipfilter, GeoIP). Historically a
+// wxThread running wxHTTP on a worker thread, which raced wxEpollDispatcher during redirect /
+// teardown (see upstream PR #455).
 //
-// The legacy Create() / Run() / Stop() / Entry() / OnExit() names are kept
-// as thin stubs so the six existing call sites (new + Create + Run) do not
-// need to change. Once wx 3.3's wxWebRequestSync is a reasonable floor on
-// distro defaults, this whole class could be replaced with a synchronous
-// call on a worker thread with no wxSocket involvement — at that point the
-// stubs can be made real and this header collapsed.
+// This implementation is event-driven on the main thread: owns a wxWebRequest, binds
+// wxEVT_WEBREQUEST_STATE, and self-destroys (via wxPendingDelete) after Completed / Failed /
+// Cancelled. No thread, no nested event loops, no modal dialogs -- so no reentrancy surface.
 //
+// The legacy Create() / Run() / Stop() / Entry() / OnExit() names are kept as thin stubs so the six
+// existing call sites do not need to change. Once wx 3.3's wxWebRequestSync is a reasonable floor
+// on distro defaults, this class could be replaced with a synchronous call on a worker thread with
+// no wxSocket involvement, and the stubs made real.
 class CHTTPDownloadThread : public wxEvtHandler
 {
 public:
-	/** Note: wxChar* was historically used here to dodge thread-unsafe
-	 *  wxString refcounting; no longer strictly required on the main
-	 *  thread, but kept for API compatibility. */
-	CHTTPDownloadThread(const wxString& url, const wxString& filename, const wxString& oldfilename, HTTP_Download_File file_id,
-						bool showDialog, bool checkDownloadNewer);
+	/**
+	 * wxChar* was historically used here to dodge thread-unsafe wxString refcounting; no longer
+	 * strictly required on the main thread, but kept for API compatibility.
+	 */
+	CHTTPDownloadThread(const wxString &url,
+		const wxString &filename,
+		const wxString &oldfilename,
+		HTTP_Download_File file_id,
+		bool showDialog,
+		bool checkDownloadNewer);
 
 	static void StopAll();
 
-	// Legacy wxThread-style entry points retained as stubs for the six
-	// existing call sites. The request is already started from the ctor
-	// on the main thread, so Create()/Run() have nothing to do.
-	bool	Create()	{ return true; }
-	void	Run()		{ /* request started in ctor */ }
-	void	Stop();		// fire-and-forget cancel; terminal event follows
-	void	OnExit()	{ /* no-op: we self-destroy on terminal state */ }
+	// Legacy wxThread-style entry points retained as stubs for the six existing call sites. The
+	// request is already started from the ctor on the main thread, so Create()/Run() have
+	// nothing to do.
+	bool Create() { return true; }
+	void Run() { /* request started in ctor */ }
+	void Stop(); // fire-and-forget cancel; terminal event follows
+	void OnExit() { /* no-op: we self-destroy on terminal state */ }
 
-	// Called by the companion dialog before it tears itself down, so that
-	// subsequent terminal-state cleanup does not post events to a dead
-	// handler.
-	void	DetachCompanion();
+	// Called by the companion dialog before it tears itself down, so later terminal-state
+	// cleanup does not post events to a dead handler.
+	void DetachCompanion();
 
 private:
-	void	OnStateEvent(wxWebRequestEvent& evt);
-	void	FinishAndDestroy(int result);
+	void OnStateEvent(wxWebRequestEvent &evt);
+	void FinishAndDestroy(int result);
 
-	static wxString FormatDateHTTP(const wxDateTime& date);
+	static wxString FormatDateHTTP(const wxDateTime &date);
 
-	wxWebRequest		m_request;
-	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
-	HTTP_Download_File	m_file_id;
-	wxEvtHandler*		m_companion;
-	bool			m_finishPosted;	//! Guard against double-posting on terminal state
+	wxWebRequest m_request;
+	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
+	HTTP_Download_File m_file_id;
+	wxEvtHandler *m_companion;
+	bool m_finishPosted; //! Guard against double-posting on terminal state
 
-	typedef std::set<CHTTPDownloadThread *>	ThreadSet;
-	static ThreadSet	s_allThreads;
-	static wxMutex		s_allThreadsMutex;
+	typedef std::set<CHTTPDownloadThread *> ThreadSet;
+	static ThreadSet s_allThreads;
+	static wxMutex s_allThreadsMutex;
 };
 
 #endif // HTTPDOWNLOAD_H

amule-3.0.1.tar.gz/src/IP2Country.cpp -> amule-3.1.0.tar.gz/src/IP2Country.cpp Changed

@@ -23,64 +23,40 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-//
-// Country flags are from FAMFAMFAM (http://www.famfamfam.com)
-//
-// Flag icons - http://www.famfamfam.com
-//
-// These icons are public domain, and as such are free for any use (attribution appreciated but not required).
-//
-// Note that these flags are named using the ISO3166-1 alpha-2 country codes where appropriate.
-// A list of codes can be found at http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-//
-// If you find these icons useful, please donate via paypal to mjames@gmail.com
-// (or click the donate button available at http://www.famfamfam.com/lab/icons/silk)
-//
-// Contact: mjames@gmail.com
-//
-
-#include "config.h"		// Needed for ENABLE_IP2COUNTRY
+#include "config.h" // Needed for ENABLE_IP2COUNTRY
 
 #ifdef ENABLE_IP2COUNTRY
 
-#include "Preferences.h"	// For thePrefs
-#include "CFile.h"			// For CPath
+#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 "icons/icon_data.h"		// For amule_get_all_icons()
+#include "Logger.h"               // For AddLogLineM()
+#include <common/Format.h>        // For CFormat()
+#include "common/FileFunctions.h" // For UnpackArchive
 
-#include <wx/artprov.h>			// For wxArtProvider::GetBitmap
 #include <wx/intl.h>
-#include <wx/image.h>
-
-#include <cstring>			// For strncmp
 
 #include "IP2Country.h"
+
+#include "NetworkFunctions.h" // Uint32toStringIP
 #include "geoip/MaxMindDBDatabase.h"
-#include "PrefsUnifiedDlg.h"		// For NotifyIP2CountryUpdateFailedIfOpen
 
-CIP2Country::CIP2Country(const wxString& configDir)
-	: m_db(new CMaxMindDBDatabase()),
-	  m_TriedPreviousMonth(false),
-	  m_ManualUpdate(false)
+CIP2Country::CIP2Country(const wxString &configDir)
+: m_db(new CMaxMindDBDatabase())
+, m_TriedPreviousMonth(false)
+, m_ManualUpdate(false)
 {
 	m_DataBaseName = "geoip.mmdb";
 	m_DataBasePath = configDir + m_DataBaseName;
 
-	// One-shot migration: the v2.x file lived at GeoLite2-Country.mmdb.
-	// If that legacy file exists and the new canonical geoip.mmdb does
-	// not, move it across so an upgrading user doesn't lose flag display
-	// silently. If both exist (e.g. they followed the new docs while
-	// keeping the old file around) leave each alone.
+	// One-shot migration: the v2.x file lived at GeoLite2-Country.mmdb. If that exists and the
+	// canonical geoip.mmdb does not, move it across so an upgrading user does not silently lose
+	// flag display; if both exist, leave each alone.
 	const wxString legacyPath = configDir + "GeoLite2-Country.mmdb";
 	if (CPath::FileExists(legacyPath) && !CPath::FileExists(m_DataBasePath)) {
 		if (wxRenameFile(legacyPath, m_DataBasePath)) {
-			AddLogLineN(CFormat(_("Migrated existing GeoLite2-Country.mmdb to %s"))
-				% m_DataBasePath);
+			AddLogLineN(
+				CFormat(_("Migrated existing GeoLite2-Country.mmdb to %s")) % m_DataBasePath);
 		}
 	}
 }
@@ -92,12 +68,9 @@
 
 void CIP2Country::Enable()
 {
+	// Disable() clears the cache, so no separate invalidation here.
 	Disable();
 
-	if (m_CountryDataMap.empty()) {
-		LoadFlags();
-	}
-
 	if (!CPath::FileExists(m_DataBasePath)) {
 		Update();
 		return;
@@ -105,21 +78,33 @@
 
 	m_db->Open(m_DataBasePath);
 
-	// One-shot backfill: files written by builds older than the
-	// source-aware prefs have no LoadedSource recorded, which would
-	// leave the prefs status line attribution-less. Best-effort guess:
-	// attribute the existing file to the currently configured source
-	// so the status line shows *something* meaningful. The user can
-	// always click "Update now" to overwrite with the real source.
-	if (m_db->IsOpen() && thePrefs::GetGeoIPLoadedSource().IsEmpty()) {
+	// The Update() above is only reached when the file is MISSING, so a geoip.mmdb that exists
+	// but will not open (corrupt, or a legacy libGeoIP .dat) blocks its own replacement.
+	// Discard it and the next start takes the missing-file path. No Update() from here:
+	// DownloadFinished() calls Enable(), so retrying an unreadable file would loop forever.
+	if (!m_db->IsOpen()) {
+		AddLogLineC(CFormat(_("%s is not a readable MaxMindDB file - discarding it. "
+				      "A fresh copy will be downloaded on the next start, or now via "
+				      "Preferences -> IP2Country -> 'Update now'.")) %
+			    m_DataBaseName);
+		wxRemoveFile(m_DataBasePath);
+		return;
+	}
+
+	// One-shot backfill: files written by builds older than the source-aware prefs have no
+	// LoadedSource recorded, leaving the prefs status line without attribution. Best-effort
+	// guess: attribute the existing file to the configured source, which "Update now"
+	// overwrites with the real one.
+	if (thePrefs::GetGeoIPLoadedSource().IsEmpty()) {
 		thePrefs::SetGeoIPLoadedSource(thePrefs::GetGeoIPSource());
 	}
 }
 
-void CIP2Country::Update(bool manualUpdate)
+void CIP2Country::Update(bool manualUpdate, bool showProgress)
 {
 	m_TriedPreviousMonth = false;
 	m_ManualUpdate = manualUpdate;
+	m_showProgress = showProgress;
 	StartDownload(0);
 }
 
@@ -130,38 +115,43 @@
 		wxString msg;
 		switch (thePrefs::GetGeoIPSource()) {
 		case CPreferences::GeoIPSourceMaxMind:
-			msg = _(
-				"IP2Country: MaxMind selected as the GeoIP source but no License Key "
-				"configured. Open Preferences → IP2Country, paste your free MaxMind "
+			msg = _("IP2Country: MaxMind selected as the GeoIP source but no License Key "
+				"configured. Open Preferences -> IP2Country, paste your free MaxMind "
 				"License Key and click 'Update now'.");
 			break;
 		case CPreferences::GeoIPSourceCustom:
-			msg = _(
-				"IP2Country: Custom URL selected as the GeoIP source but no URL "
-				"configured. Open Preferences → IP2Country and supply a URL that "
+			msg = _("IP2Country: Custom URL selected as the GeoIP source but no URL "
+				"configured. Open Preferences -> IP2Country and supply a URL that "
 				"points to an .mmdb (or .gz / .tar.gz containing one).");
 			break;
 		default:
-			msg = _(
-				"IP2Country: failed to resolve a GeoIP download URL.");
+			msg = _("IP2Country: failed to resolve a GeoIP download URL.");
 			break;
 		}
 		AddLogLineC(msg);
 		if (m_ManualUpdate) {
-			PrefsUnifiedDlg::NotifyIP2CountryUpdateFailedIfOpen(msg);
+			NotifyUpdateFailed(msg);
 		}
 		m_ManualUpdate = false;
+		m_downloading = false;
+		m_lastResult = msg;
 		thePrefs::SetGeoIPEnabled(false);
 		return;
 	}
 	AddLogLineN(CFormat(_("Download new %s from %s")) % m_DataBaseName % url);
-	CHTTPDownloadThread *downloader = new CHTTPDownloadThread(url, m_DataBasePath + ".download", m_DataBasePath, HTTP_GeoIP, true, true);
+	m_downloading = true;
+	// showDialog = m_showProgress: shown for a local monolithic "Update now", suppressed for a
+	// remote trigger, where EC carries no progress and on a monolithic-app-as-backend the
+	// dialog would pop on the core. checkDownloadNewer stays true, honouring If-Modified.
+	CHTTPDownloadThread *downloader = new CHTTPDownloadThread(
+		url, m_DataBasePath + ".download", m_DataBasePath, HTTP_GeoIP, m_showProgress, true);
 	downloader->Create();
 	downloader->Run();
 }
 
 void CIP2Country::Disable()
 {
+	InvalidateCountryCache();
 	if (m_db) {
 		m_db->Close();
 	}
@@ -169,93 +159,97 @@
 
 void CIP2Country::DownloadFinished(uint32 result)
 {
-	// Snapshot + clear the manual flag up front so any early return
-	// below doesn't leave it set for the next StartDownload (e.g. a
-	// subsequent auto-update would inherit the popup behaviour).
+	// Snapshot and clear the manual flag up front, so an early return below cannot
+	// leave it set for the next StartDownload.
 	const bool manual = m_ManualUpdate;
 	m_ManualUpdate = false;
+	// The download finished; the DB-IP early-month retry below re-arms this.
+	m_downloading = false;
 
 	if (result == HTTP_Success) {
 		Disable();
-		// download succeeded. Switch over to new database.
 		wxString newDat = m_DataBasePath + ".download";
 
-		// Try to unpack the file, might be an archive
 		wxScopedCharBuffer dataBaseName = m_DataBaseName.utf8_str();
-		const char* geoip_files = {
-			dataBaseName,
-			NULL
-		};
+		const char *geoip_files = { dataBaseName, NULL };
 
 		if (UnpackArchive(CPath(newDat), geoip_files).second == EFT_Error) {
-			const wxString msg = CFormat(_("Download of %s file failed, aborting update.")) % m_DataBaseName;
+			const wxString msg =
+				CFormat(_("Download of %s file failed, aborting update.")) % m_DataBaseName;
 			AddLogLineC(msg);
 			if (manual) {
-				PrefsUnifiedDlg::NotifyIP2CountryUpdateFailedIfOpen(msg);
+				NotifyUpdateFailed(msg);
 			}
 			return;
 		}
 
 		if (wxFileExists(m_DataBasePath)) {
 			if (!wxRemoveFile(m_DataBasePath)) {
-				const wxString msg = CFormat(_("Failed to remove %s file, aborting update.")) % m_DataBaseName;
+				const wxString msg =
+					CFormat(_("Failed to remove %s file, aborting update.")) %
+					m_DataBaseName;
 				AddLogLineC(msg);
 				if (manual) {
-					PrefsUnifiedDlg::NotifyIP2CountryUpdateFailedIfOpen(msg);
+					NotifyUpdateFailed(msg);
 				}
 				return;
 			}
 		}
 
 		if (!wxRenameFile(newDat, m_DataBasePath)) {
-			const wxString msg = CFormat(_("Failed to rename %s file, aborting update.")) % m_DataBaseName;
+			const wxString msg =
+				CFormat(_("Failed to rename %s file, aborting update.")) % m_DataBaseName;
 			AddLogLineC(msg);
 			if (manual) {
-				PrefsUnifiedDlg::NotifyIP2CountryUpdateFailedIfOpen(msg);
+				NotifyUpdateFailed(msg);
 			}
 			return;
 		}
 
 		Enable();
 		if (IsEnabled()) {
-			AddLogLineN(CFormat(_("Successfully updated %s")) % m_DataBaseName);
-			// Record which source actually wrote the file so the prefs
-			// status line can attribute it correctly even after the
-			// user flips the source dropdown to a different provider
-			// they haven't downloaded from yet.
+			const wxString msg = CFormat(_("Successfully updated %s")) % m_DataBaseName;
+			AddLogLineN(msg);
+			m_lastResult = msg;
+			// Record which source actually wrote the file, so the prefs status line
+			// attributes it correctly even after the user flips the source dropdown to
+			// a provider they have not downloaded from yet.
 			thePrefs::SetGeoIPLoadedSource(thePrefs::GetGeoIPSource());
 		} else {
 			const wxString msg = CFormat(_("Error updating %s")) % m_DataBaseName;
 			AddLogLineC(msg);
+			m_lastResult = msg;
 			if (manual) {
-				PrefsUnifiedDlg::NotifyIP2CountryUpdateFailedIfOpen(msg);
+				NotifyUpdateFailed(msg);
 			}
 		}
 	} else if (result == HTTP_Skipped) {
-		AddLogLineN(CFormat(_("Skipped download of %s, because requested file is not newer.")) % m_DataBaseName);
+		const wxString msg =
+			CFormat(_("Skipped download of %s, because requested file is not newer.")) %
+			m_DataBaseName;
+		AddLogLineN(msg);
+		m_lastResult = msg;
 	} else {
-		// DB-IP early-month fallback: the new month's file frequently
-		// 404s for the first few days while DB-IP publishes it. Retry
-		// once with monthOffset=-1 so the previous (definitely-published)
-		// month carries the user through the gap. MaxMind / Custom URLs
-		// aren't month-templated, so the fallback is gated on source.
-		// Re-arm the manual flag so the retry's eventual outcome still
-		// surfaces a popup; we only cleared it as a one-shot guard.
-		if (thePrefs::GetGeoIPSource() == CPreferences::GeoIPSourceDBIP
-			&& !m_TriedPreviousMonth) {
+		// DB-IP early-month fallback: the new month's file frequently 404s for the first
+		// few days while DB-IP publishes it. Retry once with monthOffset=-1 so the
+		// previous, definitely published month carries the user through the gap. MaxMind /
+		// Custom URLs are not month-templated, so the fallback is gated on source. Re-arm
+		// the manual flag so the retry's outcome still surfaces a popup; it was cleared
+		// only as a one-shot guard.
+		if (thePrefs::GetGeoIPSource() == CPreferences::GeoIPSourceDBIP && !m_TriedPreviousMonth) {
 			m_TriedPreviousMonth = true;
 			m_ManualUpdate = manual;
-			AddLogLineN(_(
-				"DB-IP download failed for the current month - retrying with "
-				"the previous month's URL."));
+			AddLogLineN(_("DB-IP download failed for the current month - retrying with "
+				      "the previous month's URL."));
 			StartDownload(-1);
 			return;
 		}
-		const wxString msg = CFormat(_("Failed to download %s from %s")) % m_DataBaseName
-			% thePrefs::GetGeoIPResolvedDownloadUrl(m_TriedPreviousMonth ? -1 : 0);
+		const wxString msg = CFormat(_("Failed to download %s from %s")) % m_DataBaseName %
+				     thePrefs::GetGeoIPResolvedDownloadUrl(m_TriedPreviousMonth ? -1 : 0);
 		AddLogLineC(msg);
+		m_lastResult = msg;
 		if (manual) {
-			PrefsUnifiedDlg::NotifyIP2CountryUpdateFailedIfOpen(msg);
+			NotifyUpdateFailed(msg);
 		}
 		// if it failed and there is no database, turn it off
 		if (!wxFileExists(m_DataBasePath)) {
@@ -264,97 +258,83 @@
 	}
 }
 
-void CIP2Country::LoadFlags()
-{
-	// Walk the embedded icon table and pick out anything named
-	// "flag_<code>". The table is built by src/icons/embed_icons.py
-	// from src/icons/flags/<code>.png at compile time; CamuleArtProvider
-	// (registered in CamuleGuiApp::OnInit) hands us back a decoded
-	// wxBitmap for each.
-	int icon_count = 0;
-	const struct AMuleIconEntry *icons = amule_get_all_icons(&icon_count);
-	const char flag_prefix = "flag_";
-	const size_t flag_prefix_len = sizeof(flag_prefix) - 1;
-
-	for (int i = 0; i < icon_count; ++i) {
-		const char *name = iconsi.name;
-		if (strncmp(name, flag_prefix, flag_prefix_len) != 0) {
-			continue;
-		}
-		const char *code = name + flag_prefix_len;
-
-		CountryData countrydata;
-		countrydata.Name = wxString(code, wxConvISO8859_1);
-
-		const wxString art_id = wxString::Format("amule:%s", name);
-		countrydata.Flag = wxArtProvider::GetBitmap(art_id).ConvertToImage();
-
-		if (countrydata.Flag.IsOk()) {
-			m_CountryDataMapcountrydata.Name = countrydata;
-		} else {
-			AddLogLineC(CFormat(_("Failed to load country data for '%s'.")) % countrydata.Name);
-			continue;
-		}
-	}
-
-	AddDebugLogLineN(logGeneral, CFormat("Loaded %d flag bitmaps.") % m_CountryDataMap.size());  // there's never just one - no plural needed
-}
-
-
 CIP2Country::~CIP2Country()
 {
 	Disable();
 	delete m_db;
 }
 
+wxString CIP2Country::GetCountryCode(const wxString &ip)
+{
+	if (!IsEnabled()) {
+		return wxEmptyString;
+	}
+	return m_db->GetCountryCode(ip);
+}
 
-const CountryData& CIP2Country::GetCountryData(const wxString &ip)
+const wxString &CIP2Country::GetCountryCode(uint32 ip)
 {
-	// Should prevent the crash if the database does not exist
+	static const wxString empty;
 	if (!IsEnabled()) {
-		CountryDataMap::iterator it = m_CountryDataMap.find(wxString("unknown"));
-		it->second.Name = "?";
+		// Not cached: a disabled resolver has no answer to memoise, and caching the empty
+		// string here would need the enable path to invalidate anyway. Cheap enough --
+		// IsEnabled() is two pointer reads.
+		return empty;
+	}
+	const std::unordered_map<uint32, wxString>::const_iterator it = m_countryCache.find(ip);
+	if (it != m_countryCache.end()) {
 		return it->second;
 	}
-
-	wxString CCode = m_db->GetCountryCode(ip);
-	if (CCode.IsEmpty()) {
-		CCode = "unknown";
+	if (m_countryCache.size() >= kMaxCountryCacheEntries) {
+		m_countryCache.clear();
 	}
+	// Only now is the string form needed; Uint32toStringIP allocates.
+	return m_countryCache.emplace(ip, m_db->GetCountryCode(Uint32toStringIP(ip))).first->second;
+}
 
-	CountryDataMap::iterator it = m_CountryDataMap.find(CCode);
-	if (it == m_CountryDataMap.end()) {
-		// Show the code and ?? flag
-		it = m_CountryDataMap.find(wxString("unknown"));
-		wxASSERT(it != m_CountryDataMap.end());
-		if (CCode.IsEmpty()) {
-			it->second.Name = "?";
-		} else {
-			it->second.Name = CCode;
-		}
-	}
+void CIP2Country::InvalidateCountryCache()
+{
+	m_countryCache.clear();
+}
 
-	return it->second;
+void CIP2Country::NotifyUpdateFailed(const wxString &msg)
+{
+	if (m_updateFailedNotifier) {
+		m_updateFailedNotifier(msg);
+	}
 }
 
 #else
 
 #include "IP2Country.h"
 
-CIP2Country::CIP2Country(const wxString&)
+CIP2Country::CIP2Country(const wxString &)
 {
 	m_db = NULL;
 }
 
 CIP2Country::~CIP2Country() {}
 void CIP2Country::Enable() {}
+void CIP2Country::Disable() {}
+void CIP2Country::InvalidateCountryCache() {}
+
+const wxString &CIP2Country::GetCountryCode(uint32)
+{
+	static const wxString empty;
+	return empty;
+}
+void CIP2Country::Update(bool, bool) {}
 void CIP2Country::DownloadFinished(uint32) {}
-bool CIP2Country::IsEnabled() { return false; }
+void CIP2Country::StartDownload(int) {}
+void CIP2Country::NotifyUpdateFailed(const wxString &) {}
+bool CIP2Country::IsEnabled()
+{
+	return false;
+}
 
-const CountryData& CIP2Country::GetCountryData(const wxString &)
+wxString CIP2Country::GetCountryCode(const wxString &)
 {
-	static CountryData dummy;
-	return dummy;
+	return wxEmptyString;
 }
 
 #endif // ENABLE_IP2COUNTRY

amule-3.0.1.tar.gz/src/IP2Country.h -> amule-3.1.0.tar.gz/src/IP2Country.h Changed

@@ -23,7 +23,6 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 //
 // Country flags are from FAMFAMFAM (http://www.famfamfam.com)
 //
@@ -43,67 +42,122 @@
 #ifndef IP2COUNTRY_H
 #define IP2COUNTRY_H
 
-#include "Types.h"	// Needed for uint8, uint16 and uint32
+#include "Types.h" // Needed for uint8, uint16 and uint32
 
-#include <map>
+#include <functional>
+#include <unordered_map>
 
-#include <wx/image.h>
 #include <wx/string.h>
 
 class CMaxMindDBDatabase;
 
-
-typedef struct {
-	wxString Name;
-	wxImage  Flag;
-} CountryData;
-
-
-typedef std::map<wxString, CountryData> CountryDataMap;
-
-
-class CIP2Country {
+// Headless GeoIP resolver. Maps an IP to an ISO 3166-1 alpha-2 country code via the on-disk MaxMind
+// DB, and manages downloading and updating that DB from the user-configured source. Deliberately
+// free of any GUI dependency so it can live in the core and run headless in amuled: flag
+// presentation is a separate GUI concern (CCountryFlags), and manual-update failure popups are
+// delegated via SetUpdateFailedNotifier().
+class CIP2Country
+{
 public:
-	CIP2Country(const wxString& configDir);
+	CIP2Country(const wxString &configDir);
 	~CIP2Country();
-	const CountryData& GetCountryData(const wxString& ip);
+
+	// Resolve an IP to its ISO 3166-1 alpha-2 country code, lowercase. Empty when GeoIP is
+	// disabled, unsupported by the build, or the IP does not resolve.
+	wxString GetCountryCode(const wxString &ip);
+
+	// Same, from the numeric IP the callers already hold, and memoised.
+	//
+	// The returned reference is valid until the next call on this object, or any
+	// Enable()/Disable(): the cache is cleared wholesale on overflow and on either of those.
+	// Copy it if you need it to outlive the call, and in particular do not pass two of these
+	// into one expression.
+	//
+	// #439 moved this resolution from GUI paint into the core. Paint hid the cost: it ran only
+	// for visible rows, only while the list was on screen. The EC client tag now resolves EVERY
+	// peer on EVERY poll, headless, forever -- and a peer's country cannot change while its IP
+	// does not. Measured at ~7.5us per peer per poll, about 37% of the client tag build.
+	//
+	// Keyed on the numeric IP so the caller need not format a string first; the string is only
+	// built on a miss.
+	const wxString &GetCountryCode(uint32 ip);
+
 	void Enable();
 	void Disable();
 	// Refresh the on-disk MMDB from the configured source.
-	// manualUpdate=true is set by the prefs "Update now" button so that
-	// failures (no credential, bad URL, HTTP error) surface as a popup
-	// in addition to the network log; auto-update (startup) stays
-	// silent so users don't get a popup every cold boot if their
-	// chosen source is briefly down.
-	void Update(bool manualUpdate = false);
+	//
+	// manualUpdate=true is set by the prefs "Update now" button, so failures (no credential,
+	// bad URL, HTTP error) surface via the update-failed notifier as well as the network log;
+	// auto-update stays silent, or a briefly-down source would pop a dialog on every cold boot.
+	//
+	// showProgress=true renders the HTTP progress dialog, which suits a LOCAL monolithic
+	// "Update now". It is false for a REMOTE trigger: EC carries no download progress, and on a
+	// monolithic-app-as-backend the dialog would pop on the core rather than the remote GUI.
+	void Update(bool manualUpdate = false, bool showProgress = true);
 	bool IsEnabled();
 	void DownloadFinished(uint32 result);
 
-	// Path of the on-disk MMDB file. Exposed so the IP2Country
-	// preferences panel can show the status line ("Loaded — <path>"),
-	// without re-deriving the config-dir + filename convention.
-	const wxString& GetDatabasePath() const { return m_DataBasePath; }
+	// Path of the on-disk MMDB file. Exposed so the IP2Country preferences panel can show the
+	// status line ("Loaded -- <path>") without re-deriving the config-dir plus filename
+	// convention.
+	const wxString &GetDatabasePath() const { return m_DataBasePath; }
+	// Live status for the prefs panel, local and carried to amulegui over EC. IsDownloading()
+	// is true while a refresh is in flight; GetLastResult() is a short human string describing
+	// the last completed update.
+	bool IsDownloading() const { return m_downloading; }
+
+	const wxString &GetLastResult() const { return m_lastResult; }
+
+	// Optional hook so a GUI front-end can surface a *manual* update failure (the "Update now"
+	// button) as a popup. Left unset in headless builds (amuled), where the failure only
+	// reaches the network log.
+	void SetUpdateFailedNotifier(std::function<void(const wxString &)> notifier)
+	{
+		m_updateFailedNotifier = std::move(notifier);
+	}
 
 private:
-	CMaxMindDBDatabase* m_db;
-	CountryDataMap m_CountryDataMap;
+	// Drop every memoised resolution. Called wherever the answer could change underneath the
+	// cache: enable and disable, which between them also cover a completed database refresh. A
+	// headless daemon is the worst case without it -- entries resolved while GeoIP was off
+	// would stay empty forever, with no repaint to force a re-read and nobody watching.
+	void InvalidateCountryCache();
+
+	// Numeric IP -> ISO code. Bounded, because peers churn and an unbounded map on a long-lived
+	// daemon would grow without limit. On overflow the whole map is dropped rather than
+	// evicting cleverly: a rebuild costs one lookup per live peer, which is what a single poll
+	// cost before this existed. Not synchronised: like the rest of this class it is touched
+	// from the main thread only.
+	std::unordered_map<uint32, wxString> m_countryCache;
+	static const size_t kMaxCountryCacheEntries = 8192;
+
+	CMaxMindDBDatabase *m_db;
 	wxString m_DataBaseName;
 	wxString m_DataBasePath;
 
-	// DB-IP fallback retry tracking. The first attempt fetches the
-	// current month's URL; if that fails (commonly a 404 in the first
-	// few days of a month before DB-IP publishes the new dataset), the
-	// download callback retries with monthOffset=-1. Reset to false on
-	// every Update() entry.
+	// DB-IP fallback retry tracking. The first attempt fetches the current month's URL; on
+	// failure -- commonly a 404 in the first few days of a month, before DB-IP publishes the
+	// new dataset -- the download callback retries with monthOffset=-1. Reset on every Update()
+	// entry.
 	bool m_TriedPreviousMonth;
 
-	// Set by Update(true) (the "Update now" button) so the failure
-	// paths in StartDownload + DownloadFinished know to surface a
-	// popup, not just a log line.
+	// Set by Update(true), the "Update now" button, so the failure paths in StartDownload and
+	// DownloadFinished know to surface a popup rather than just a log line.
 	bool m_ManualUpdate;
 
-	void LoadFlags();
+	// GUI-supplied popup hook for manual-update failures; unset = headless.
+	std::function<void(const wxString &)> m_updateFailedNotifier;
+
+	// Live status (see IsDownloading / GetLastResult).
+	bool m_downloading = false;
+	wxString m_lastResult;
+
+	// Whether the in-flight download should render an HTTP progress dialog.
+	// Carried across the DB-IP previous-month retry in StartDownload. See Update().
+	bool m_showProgress = true;
+
 	void StartDownload(int monthOffset);
+	void NotifyUpdateFailed(const wxString &msg);
 };
 
 #endif // IP2COUNTRY_H

amule-3.0.1.tar.gz/src/IPFilter.cpp -> amule-3.1.0.tar.gz/src/IPFilter.cpp Changed

@@ -23,28 +23,27 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include <wx/stdpaths.h>		// Needed for GetDataDir
+#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 AddDebugLogLine{C,N}
-#include <common/Format.h>		// Needed for CFormat
-#include <common/StringFunctions.h>	// Needed for CSimpleTokenizer
-#include <common/FileFunctions.h>	// Needed for UnpackArchive
-#include <common/TextFile.h>		// Needed for CTextFile
-#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
-
+#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 AddDebugLogLine{C,N}
+#include <common/Format.h>          // Needed for CFormat
+#include <common/StringFunctions.h> // Needed for CSimpleTokenizer
+#include <common/FileFunctions.h>   // Needed for UnpackArchive
+#include <common/TextFile.h>        // Needed for CTextFile
+#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
 
 ////////////////////////////////////////////////////////////
 // CIPFilterEvent
@@ -52,58 +51,58 @@
 class CIPFilterEvent;
 wxDECLARE_EVENT(MULE_EVT_IPFILTER_LOADED, CIPFilterEvent);
 
-
 class CIPFilterEvent : public wxEvent
 {
 public:
-	CIPFilterEvent(CIPFilter::RangeIPs rangeIPs, CIPFilter::RangeLengths rangeLengths, CIPFilter::RangeNames rangeNames)
-		: wxEvent(wxID_ANY, MULE_EVT_IPFILTER_LOADED)
+	CIPFilterEvent(CIPFilter::RangeIPs rangeIPs,
+		CIPFilter::RangeLengths rangeLengths,
+		CIPFilter::RangeNames rangeNames,
+		CIPFilterIPv6Ranges ipv6Ranges,
+		unsigned ipv6AccessLevel)
+	: wxEvent(wxID_ANY, MULE_EVT_IPFILTER_LOADED)
 	{
 		// 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);
+		std::swap(m_ipv6Ranges, ipv6Ranges);
+		m_ipv6AccessLevel = ipv6AccessLevel;
 	}
 
 	/** @see wxEvent::Clone */
-	virtual wxEvent* Clone() const {
-		return new CIPFilterEvent(*this);
-	}
+	virtual wxEvent *Clone() const { return new CIPFilterEvent(*this); }
 
 	CIPFilter::RangeIPs m_rangeIPs;
 	CIPFilter::RangeLengths m_rangeLengths;
 	CIPFilter::RangeNames m_rangeNames;
+	CIPFilterIPv6Ranges m_ipv6Ranges;
+	unsigned m_ipv6AccessLevel;
 };
 
 wxDEFINE_EVENT(MULE_EVT_IPFILTER_LOADED, CIPFilterEvent);
 
+typedef void (wxEvtHandler::*MuleIPFilterEventFunction)(CIPFilterEvent &);
 
-typedef void (wxEvtHandler::*MuleIPFilterEventFunction)(CIPFilterEvent&);
-
-#define MuleIPFilterEventHandler(func) \
-	wxEVENT_HANDLER_CAST(MuleIPFilterEventFunction, func)
+#define MuleIPFilterEventHandler(func) wxEVENT_HANDLER_CAST(MuleIPFilterEventFunction, func)
 
 //! Event-handler for completed loading of the ipfilter files.
 #define EVT_MULE_IPFILTER_LOADED(func) \
 	wx__DECLARE_EVT0(MULE_EVT_IPFILTER_LOADED, MuleIPFilterEventHandler(func))
 
-
 ////////////////////////////////////////////////////////////
 // Thread task for loading the ipfilter.dat files.
 
 /**
- * This task loads the two ipfilter.dat files, a task that
- * can take quite a while on a slow system with a large dat-
- * file.
+ * Loads the two ipfilter.dat files, which can take a while on a slow system with a large dat file.
  */
 class CIPFilterTask : public CThreadTask
 {
 public:
-	CIPFilterTask(wxEvtHandler* owner)
-		: CThreadTask("Load IPFilter", "", ETP_Critical),
-		  m_storeDescriptions(false),
-		  m_owner(owner)
+	CIPFilterTask(wxEvtHandler *owner)
+	: CThreadTask("Load IPFilter", "", ETP_Critical)
+	, m_storeDescriptions(false)
+	, m_owner(owner)
 	{
 	}
 
@@ -111,8 +110,8 @@
 	void Entry()
 	{
 		AddLogLineN(_("Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."));
-		if ( !LoadFromFile(thePrefs::GetConfigDir() + "ipfilter.dat") &&
-		     thePrefs::UseIPFilterSystem() ) {
+		if (!LoadFromFile(thePrefs::GetConfigDir() + "ipfilter.dat") &&
+			thePrefs::UseIPFilterSystem()) {
 			// Load from system wide IP filter file
 			wxStandardPathsBase &spb(wxStandardPaths::Get());
 #ifdef __WINDOWS__
@@ -122,18 +121,17 @@
 #else
 			wxString dataDir(spb.GetDataDir().BeforeLast('/') + "/amule");
 #endif
-			wxString systemwideFile(JoinPaths(dataDir,"ipfilter.dat"));
+			wxString systemwideFile(JoinPaths(dataDir, "ipfilter.dat"));
 			LoadFromFile(systemwideFile);
 		}
 
-
 		LoadFromFile(thePrefs::GetConfigDir() + "ipfilter_static.dat");
+		m_ipv6Ranges.Resolve();
 
 		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.
+		// Reserve a little more so the vector does not have to resize later: a map
+		// range can need storing in several parts. The extra is freed at the end.
 		m_rangeIPs.reserve(size + 1000);
 		m_rangeLengths.reserve(size + 1000);
 		if (m_storeDescriptions) {
@@ -141,18 +139,15 @@
 		}
 		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
+				// Range "length" is included-end minus start, so length - 1.
+				// Encoded as 0 - 0x7fff for itself, and 0x8000 - 0xffff for 0xfff -
+				// 0x07ffffff: remove the msb, shift left 12 bits, add 0xfff, which
+				// covers 8 consecutive class A nets. Larger ranges, and theoretical
+				// ones with uneven ends, have to be split.
 				uint32 startIP = it.keyStart();
 				uint32 realLength = it.keyEnd() - it.keyStart() + 1;
 #ifdef __DEBUG__
-				std::string * descp = 0;
+				std::string *descp = 0;
 #endif
 				while (realLength) {
 					m_rangeIPs.push_back(startIP);
@@ -173,15 +168,16 @@
 					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)
+						// std::string has no ref counting, so swap it. It
+						// is used because it needs half the space of a
+						// 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();
+							descp = &*m_rangeNames.rbegin();
 							std::swap(*descp, it->Description);
 						}
 					}
@@ -191,33 +187,32 @@
 				}
 			}
 		}
-		// 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("Ranges in map: %d  blocked ranges in table: %d") % size % m_rangeIPs.size());
+		// The numbers usually differ: ranges not blocked because of their level are
+		// not added to the table, and some map ranges have to be split for it.
+		AddDebugLogLineN(logIPFilter,
+			CFormat("Ranges in map: %d  blocked ranges in table: %d") % size % m_rangeIPs.size());
 
-		CIPFilterEvent evt(m_rangeIPs, m_rangeLengths, m_rangeNames);
+		CIPFilterEvent evt(
+			m_rangeIPs, m_rangeLengths, m_rangeNames, std::move(m_ipv6Ranges), accessLevel);
 		wxQueueEvent(m_owner, (evt).Clone());
 	}
 
 	/**
-	 * This structure is used to contain the range-data in the rangemap.
+	 * Holds the range data in the rangemap.
 	 */
 	struct rangeObject
 	{
-		bool operator==( const rangeObject& other ) const {
-			return AccessLevel == other.AccessLevel;
-		}
+		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;
+		std::string Description;
 #endif
 
 		//! The AccessLevel for this filter.
-		uint8		AccessLevel;
+		uint8 AccessLevel;
 	};
 
 	//! The is the type of map used to store the IPs.
@@ -229,25 +224,18 @@
 	CIPFilter::RangeIPs m_rangeIPs;
 	CIPFilter::RangeLengths m_rangeLengths;
 	CIPFilter::RangeNames m_rangeNames;
+	CIPFilterIPv6Ranges m_ipv6Ranges;
 
-	wxEvtHandler*		m_owner;
+	wxEvtHandler *m_owner;
 	// temporary map for filter generation
-	IPMap				m_result;
+	IPMap m_result;
 
 	/**
-	 * Helper function.
-	 *
-	 * @param IPstart The start of the IP-range.
-	 * @param IPend The end of the IP-range, must be less than or equal to IPstart.
-	 * @param AccessLevel The AccessLevel of this range.
-	 * @param Description The associated description of this range.
-	 * @return true if the range was added, false if it was discarded.
-	 *
-	 * This function inserts the specified range into the IPMap. Invalid
-	 * ranges where the AccessLevel is not within the range 0..255, or
-	 * where IPEnd < IPstart not inserted.
+	 * Inserts the range @a IPStart, @a IPEnd into the IPMap with @a AccessLevel and @a
+	 * Description, returning whether it was added. An invalid range -- an AccessLevel outside
+	 * 0..255, or IPEnd < IPStart -- is discarded.
 	 */
-	bool AddIPRange(uint32 IPStart, uint32 IPEnd, uint16 AccessLevel, const char* DEBUG_ONLY(Description))
+	bool AddIPRange(uint32 IPStart, uint32 IPEnd, uint16 AccessLevel, const char *DEBUG_ONLY(Description))
 	{
 		if (AccessLevel < 256) {
 			if (IPStart <= IPEnd) {
@@ -268,13 +256,10 @@
 		return false;
 	}
 
-
 	/**
-	 * Loads a IP-list from the specified file, can be text or zip.
-	 *
-	 * @return True if the file was loaded, false otherwise.
-	 **/
-	int LoadFromFile(const wxString& file)
+	 * Loads an IP list from @a file, text or zip. Returns whether the file was loaded.
+	 */
+	int LoadFromFile(const wxString &file)
 	{
 		const CPath path = CPath(file);
 
@@ -282,21 +267,23 @@
 			return 0;
 		}
 
+		// An empty file is a valid "no ranges" list -- a user who cleared it, or an auto-
+		// update that has not populated it yet -- so treat it as 0 ranges rather than
+		// letting the format detector report "unknown format" (issue #580).
+		if (path.GetFileSize() == 0) {
+			return 0;
+		}
+
 #ifdef __DEBUG__
 		m_storeDescriptions = theLogger.IsEnabled(logIPFilter);
 #endif
 
-		const char* ipfilter_files = {
-			"ipfilter.dat",
-			"guardian.p2p",
-			"guarding.p2p",
-			NULL
-		};
-
-		// Try to unpack the file, might be an archive
+		const char *ipfilter_files = { "ipfilter.dat", "guardian.p2p", "guarding.p2p", NULL };
 
 		if (UnpackArchive(path, ipfilter_files).second != EFT_Text) {
-			AddLogLineC(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;
 		}
 
@@ -307,28 +294,52 @@
 			yyip_Line = 1;
 			yyiprestart(readFile.fp());
 			uint32 IPStart = 0;
-			uint32 IPEnd   = 0;
+			uint32 IPEnd = 0;
 			uint32 IPAccessLevel = 0;
-			char * IPDescription;
+			char *IPDescription;
 #ifdef __DEBUG__
 			uint64 time1 = GetTickCount64();
 #endif
-			while (yyiplex(IPStart, IPEnd, IPAccessLevel, IPDescription)) {
-				AddIPRange(IPStart, IPEnd, IPAccessLevel, IPDescription);
-				filtercount++;
+			CNetworkAddress ipv6Network;
+			uint32 ipv6Prefix = 0;
+			int token;
+			while ((token = yyiplex(IPStart,
+					IPEnd,
+					IPAccessLevel,
+					IPDescription,
+					ipv6Network,
+					ipv6Prefix))) {
+				if (token == 2) {
+					if (m_ipv6Ranges.Append(ipv6Network, ipv6Prefix, IPAccessLevel)) {
+						filtercount++;
+					}
+				} else {
+					AddIPRange(IPStart, IPEnd, IPAccessLevel, IPDescription);
+					filtercount++;
+				}
 			}
 #ifdef __DEBUG__
 			uint64 time2 = GetTickCount64();
-			AddDebugLogLineN(logIPFilter, CFormat("time for lexer: %.3f") % ((time2-time1) / 1000.0));
+			AddDebugLogLineN(
+				logIPFilter, CFormat("time for lexer: %.3f") % ((time2 - time1) / 1000.0));
 #endif
 		} else {
-			AddLogLineC(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;
 		}
 
-		wxString msg = CFormat(wxPLURAL("Loaded %u IP-range from '%s'.", "Loaded %u IP-ranges from '%s'.", filtercount)) % filtercount % file;
+		wxString msg = CFormat(wxPLURAL("Loaded %u IP-range from '%s'.",
+				       "Loaded %u IP-ranges from '%s'.",
+				       filtercount)) %
+			       filtercount % file;
 		if (yyip_Bad) {
-			msg << " " << ( CFormat(wxPLURAL("%u malformed line was discarded.", "%u malformed lines were discarded.", yyip_Bad)) % yyip_Bad );
+			msg << " "
+			    << (CFormat(wxPLURAL("%u malformed line was discarded.",
+					"%u malformed lines were discarded.",
+					yyip_Bad)) %
+				       yyip_Bad);
 		}
 		AddLogLineN(msg);
 
@@ -336,24 +347,18 @@
 	}
 };
 
-
 ////////////////////////////////////////////////////////////
 // CIPFilter
 
-
 wxBEGIN_EVENT_TABLE(CIPFilter, wxEvtHandler)
 	EVT_MULE_IPFILTER_LOADED(CIPFilter::OnIPFilterEvent)
 wxEND_EVENT_TABLE()
 
-
-
 /**
- * This function creates a text-file containing the specified text,
- * but only if the file does not already exist.
+ * Creates a text file containing the specified text, but only if the file does not already exist.
  */
-static bool CreateDummyFile(const wxString& filename, const wxString& text)
+static bool CreateDummyFile(const wxString &filename, const wxString &text)
 {
-	// Create template files
 	if (!wxFileExists(filename)) {
 		CTextFile file;
 
@@ -365,18 +370,17 @@
 	return false;
 }
 
-
-CIPFilter::CIPFilter() :
-	m_ready(false),
-	m_startKADWhenReady(false),
-	m_connectToAnyServerWhenReady(false)
+CIPFilter::CIPFilter()
+: m_ready(false)
+, m_startKADWhenReady(false)
+, m_connectToAnyServerWhenReady(false)
 {
 	// Setup dummy files for the curious user.
 	const wxString normalDat = thePrefs::GetConfigDir() + "ipfilter.dat";
 	const wxString normalMsg = wxString()
-		<< "# This file is used by aMule to store ipfilter lists downloaded\n"
-		<< "# through the auto-update functionality. Do not save ipfilter-\n"
-		<< "# ranges here that should not be overwritten by aMule.\n";
+				   << "# This file is used by aMule to store ipfilter lists downloaded\n"
+				   << "# through the auto-update functionality. Do not save ipfilter-\n"
+				   << "# ranges here that should not be overwritten by aMule.\n";
 
 	if (CreateDummyFile(normalDat, normalMsg)) {
 		// redownload if user deleted file
@@ -385,11 +389,11 @@
 
 	const wxString staticDat = thePrefs::GetConfigDir() + "ipfilter_static.dat";
 	const wxString staticMsg = wxString()
-		<< "# This file is used to store ipfilter-ranges that should\n"
-		<< "# not be overwritten by aMule. If you wish to keep a custom\n"
-		<< "# set of ipfilter-ranges that take precedence over ipfilter-\n"
-		<< "# ranges acquired through the auto-update functionality, then\n"
-		<< "# place them in this file. aMule will not change this file.";
+				   << "# This file is used to store ipfilter-ranges that should\n"
+				   << "# not be overwritten by aMule. If you wish to keep a custom\n"
+				   << "# set of ipfilter-ranges that take precedence over ipfilter-\n"
+				   << "# ranges acquired through the auto-update functionality, then\n"
+				   << "# place them in this file. aMule will not change this file.";
 
 	CreateDummyFile(staticDat, staticMsg);
 
@@ -400,22 +404,19 @@
 	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));
 }
 
-
 uint32 CIPFilter::BanCount() const
 {
 	wxMutexLocker lock(m_mutex);
 
-	return m_rangeIPs.size();
+	return m_rangeIPs.size() + m_ipv6Ranges.BanCount(m_ipv6AccessLevel);
 }
 
-
 bool CIPFilter::IsFiltered(uint32 IPTest, bool isServer)
 {
 	if ((!thePrefs::IsFilteringClients() && !isServer) || (!thePrefs::IsFilteringServers() && isServer)) {
@@ -424,7 +425,8 @@
 	if (!m_ready) {
 		// Somebody connected before we even started the networks.
 		// Filter is not up yet, so block him.
-		AddDebugLogLineN(logIPFilter, CFormat("Filtered IP %s because filter isn't ready yet.") % Uint32toStringIP(IPTest));
+		AddDebugLogLineN(logIPFilter,
+			CFormat("Filtered IP %s because filter isn't ready yet.") % Uint32toStringIP(IPTest));
 		if (isServer) {
 			theStats::AddFilteredServer();
 		} else {
@@ -459,9 +461,12 @@
 		}
 	}
 	if (found) {
-		AddDebugLogLineN(logIPFilter, CFormat("Filtered IP %s%s") % Uint32toStringIP(IPTest)
-			% (i < (int)m_rangeNames.size() ? (" (" + wxString(char2unicode(m_rangeNamesi.c_str())) + ")")
-											: wxString("")));
+		AddDebugLogLineN(logIPFilter,
+			CFormat("Filtered IP %s%s") % Uint32toStringIP(IPTest) %
+				(i < (int)m_rangeNames.size()
+						? (" (" + wxString(char2unicode(m_rangeNamesi.c_str())) +
+							  ")")
+						: wxString("")));
 		if (isServer) {
 			theStats::AddFilteredServer();
 		} else {
@@ -472,27 +477,58 @@
 	return false;
 }
 
+bool CIPFilter::IsFiltered(const CNetworkAddress &address, bool isServer)
+{
+	uint32 ipv4;
+	if (address.ToIPv4NetworkOrder(ipv4)) {
+		return IsFiltered(ipv4, isServer);
+	}
+	if ((!thePrefs::IsFilteringClients() && !isServer) || (!thePrefs::IsFilteringServers() && isServer)) {
+		return false;
+	}
+	wxMutexLocker lock(m_mutex);
+	// An address we cannot read counts as filtered: a security check that cannot run must refuse.
+	if (address.IsAbsent() || !m_ready || m_ipv6Ranges.IsFiltered(address, m_ipv6AccessLevel)) {
+		AddDebugLogLineN(logIPFilter, CFormat("Filtered IP %s") % address.ToWxString());
+		if (isServer) {
+			theStats::AddFilteredServer();
+		} else {
+			theStats::AddFilteredClient();
+		}
+		return true;
+	}
+	return false;
+}
 
-void CIPFilter::Update(const wxString& strURL)
+void CIPFilter::Update(const wxString &strURL)
 {
 	if (!strURL.IsEmpty()) {
 		m_URL = strURL;
+		// "Update from this URL" and "remember this URL" are one action, as they already
+		// are for the ed2k server list and the Kad node list. It belongs here rather than
+		// in the EC handler because this function is the single funnel for every caller --
+		// the EC op, the Preferences "Update now" button and the startup auto-update.
+		// Without it a URL used for a manual update is forgotten and the next auto-update
+		// falls back to the old one.
+		//
+		// Assign from m_URL, not strURL: the auto-update path hands us
+		// thePrefs::IPFilterURL() itself, so that would be a self-assignment.
+		thePrefs::SetIPFilterURL(m_URL);
 
 		wxString filename = thePrefs::GetConfigDir() + "ipfilter.download";
 		wxString oldfilename = thePrefs::GetConfigDir() + "ipfilter.dat";
-		CHTTPDownloadThread *downloader = new CHTTPDownloadThread(m_URL, filename, oldfilename, HTTP_IPFilter, true, true);
+		CHTTPDownloadThread *downloader =
+			new CHTTPDownloadThread(m_URL, filename, oldfilename, HTTP_IPFilter, true, true);
 
 		downloader->Create();
 		downloader->Run();
 	}
 }
 
-
 void CIPFilter::DownloadFinished(uint32 result)
 {
 	wxString datName = "ipfilter.dat";
 	if (result == HTTP_Success) {
-		// download succeeded. proceed with ipfilter loading
 		wxString newDat = thePrefs::GetConfigDir() + "ipfilter.download";
 		wxString oldDat = thePrefs::GetConfigDir() + datName;
 
@@ -505,27 +541,28 @@
 		} else {
 			AddLogLineN(CFormat(_("Successfully updated %s")) % datName);
 		}
-	// cppcheck-suppress duplicateBranch
+		// cppcheck-suppress duplicateBranch
 	} else if (result == HTTP_Skipped) {
-		AddLogLineN(CFormat(_("Skipped download of %s, because requested file is not newer.")) % datName);
+		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);
 	}
 
 	if (result == HTTP_Success) {
-		// Reload both ipfilter files on success
 		Reload();
 	}
 }
 
-
-void CIPFilter::OnIPFilterEvent(CIPFilterEvent& evt)
+void CIPFilter::OnIPFilterEvent(CIPFilterEvent &evt)
 {
 	{
 		wxMutexLocker lock(m_mutex);
 		std::swap(m_rangeIPs, evt.m_rangeIPs);
 		std::swap(m_rangeLengths, evt.m_rangeLengths);
 		std::swap(m_rangeNames, evt.m_rangeNames);
+		std::swap(m_ipv6Ranges, evt.m_ipv6Ranges);
+		m_ipv6AccessLevel = evt.m_ipv6AccessLevel;
 		m_ready = true;
 	}
 	if (theApp->IsOnShutDown()) {
@@ -539,10 +576,27 @@
 	if (thePrefs::IsFilteringServers()) {
 		theApp->serverlist->FilterServers();
 	}
-	// Now start networks we didn't start earlier
-	if (m_connectToAnyServerWhenReady || m_startKADWhenReady) {
-		AddLogLineC(_("Connecting"));
+	StartPendingNetworks();
+	theApp->ShowConnectionState(true); // refresh connection status
+	if (thePrefs::GetSrcSeedsOn()) {
+		theApp->downloadqueue->LoadSourceSeeds();
+	}
+	if (m_updateAfterLoading) {
+		m_updateAfterLoading = false;
+		Update(thePrefs::IPFilterURL());
+	}
+}
+
+void CIPFilter::StartPendingNetworks()
+{
+	if (!m_ready) {
+		// OnIPFilterEvent runs this again once loading finishes.
+		return;
+	}
+	if (!m_connectToAnyServerWhenReady && !m_startKADWhenReady) {
+		return;
 	}
+	AddLogLineC(_("Connecting"));
 	if (m_connectToAnyServerWhenReady) {
 		m_connectToAnyServerWhenReady = false;
 		theApp->serverconnect->ConnectToAnyServer();
@@ -551,15 +605,9 @@
 		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());
-	}
+	// Called from startup as well as from the handler, where the
+	// unconditional refresh below covers only the filtering above it.
+	theApp->ShowConnectionState(true);
 }
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/IPFilter.h -> amule-3.1.0.tar.gz/src/IPFilter.h Changed

@@ -26,82 +26,241 @@
 #ifndef IPFILTER_H
 #define IPFILTER_H
 
-#include <wx/event.h>	// Needed for wxEvent
+#include <wx/event.h> // Needed for wxEvent
+#include <wx/thread.h>
+#include <algorithm>
+#include <array>
+#include <string>
+#include <set>
+#include <vector>
 
-#include "Types.h"	// Needed for uint8, uint16 and uint32
+#include "Types.h" // Needed for uint8, uint16 and uint32
+#include "NetworkAddress.h"
+#include "PeerAddressing.h"
+
+/** Sorted, disjoint native IPv6 ranges, resolved during loading.
+ * Later entries override earlier ones, including above-threshold exemptions.
+ */
+class CIPFilterIPv6Ranges
+{
+public:
+	bool Add(const CNetworkAddress &address, unsigned bits, unsigned level)
+	{
+		if (!Append(address, bits, level)) {
+			return false;
+		}
+		Resolve();
+		return true;
+	}
+
+private:
+	friend class CIPFilterTask;
+
+	// Loading appends all files in precedence order before resolving once.
+	bool Append(const CNetworkAddress &address, unsigned bits, unsigned level)
+	{
+		if (!address.IsIPv6() || address.IsIPv4Mapped() || address.GetScopeId() != 0 || bits > 128 ||
+			level > 255) {
+			return false;
+		}
+		const auto network = address.TruncatedToPrefix(bits);
+		auto last = network.GetOctets();
+		for (unsigned bit = bits; bit < 128; ++bit) {
+			lastbit / 8 |= static_cast<uint8>(0x80u >> (bit % 8));
+		}
+		m_rules.push_back({ network.GetOctets(), last, network, bits, level });
+		++m_levelCountslevel;
+		m_resolved = false;
+		return true;
+	}
+
+	//! Whether the rules are in the sorted, disjoint form IsFiltered() searches.
+	bool IsResolved() const { return m_resolved; }
+
+	void Resolve()
+	{
+		struct Endpoint
+		{
+			CNetworkAddress::Octets address;
+			std::size_t rule;
+			bool start;
+		};
+		CNetworkAddress::Octets maximum;
+		maximum.fill(255);
+		std::vector<Endpoint> endpoints;
+		endpoints.reserve(m_rules.size() * 2);
+		for (std::size_t i = 0; i < m_rules.size(); ++i) {
+			endpoints.push_back({ m_rulesi.first, i, true });
+			if (m_rulesi.last != maximum) {
+				endpoints.push_back({ Next(m_rulesi.last), i, false });
+			}
+		}
+		std::sort(
+			endpoints.begin(), endpoints.end(), (const Endpoint &left, const Endpoint &right) {
+				return left.address < right.address;
+			});
+		std::set<std::size_t> active;
+		std::vector<Rule> resolved;
+		// Sweep grouped endpoints in O(n log n); the newest active rule wins.
+		for (std::size_t i = 0; i < endpoints.size();) {
+			const auto first = endpointsi.address;
+			do {
+				const auto &endpoint = endpointsi++;
+				if (endpoint.start) {
+					active.insert(endpoint.rule);
+				} else {
+					active.erase(endpoint.rule);
+				}
+			} while (i < endpoints.size() && endpointsi.address == first);
+			if (!active.empty()) {
+				auto rule = m_rules*active.rbegin();
+				rule.first = first;
+				rule.last = i < endpoints.size() ? Previous(endpointsi.address) : maximum;
+				resolved.push_back(rule);
+			}
+		}
+		m_rules.swap(resolved);
+		m_resolved = true;
+	}
+
+public:
+	bool IsFiltered(const CNetworkAddress &address, unsigned level) const
+	{
+		// The search below is a binary one, so appended rules have to have been
+		// resolved into the sorted, disjoint form first, or it reads past them.
+		wxASSERT(m_resolved);
+		if (!address.IsIPv6() || address.IsIPv4Mapped()) {
+			return false;
+		}
+		auto it = std::upper_bound(m_rules.begin(),
+			m_rules.end(),
+			address.GetOctets(),
+			(const CNetworkAddress::Octets &key, const Rule &rule) {
+				return key < rule.first;
+			});
+		if (it == m_rules.begin()) {
+			return false;
+		}
+		--it;
+		return address.GetOctets() <= it->last && it->level < level &&
+		       PeerAddressing::MatchesFilterPrefix(address, it->network, it->bits);
+	}
+
+	unsigned BanCount(unsigned level) const
+	{
+		unsigned count = 0;
+		for (unsigned i = 0; i < std::min(level, 256u); ++i) {
+			count += m_levelCountsi;
+		}
+		return count;
+	}
+
+private:
+	// Only called when a surviving fragment proves there is no endpoint overflow.
+	static CNetworkAddress::Octets Previous(CNetworkAddress::Octets bytes)
+	{
+		for (std::size_t i = bytes.size(); i > 0; --i) {
+			if (bytesi - 1-- != 0) {
+				break;
+			}
+		}
+		return bytes;
+	}
+
+	static CNetworkAddress::Octets Next(CNetworkAddress::Octets bytes)
+	{
+		for (std::size_t i = bytes.size(); i > 0; --i) {
+			if (++bytesi - 1 != 0) {
+				break;
+			}
+		}
+		return bytes;
+	}
+
+	struct Rule
+	{
+		CNetworkAddress::Octets first;
+		CNetworkAddress::Octets last;
+		CNetworkAddress network;
+		unsigned bits;
+		unsigned level;
+	};
+	std::vector<Rule> m_rules;
+	// Keep the public count of input rules independent of range splitting.
+	std::array<unsigned, 256> m_levelCounts{};
+	// An empty store is trivially in resolved form.
+	bool m_resolved = true;
+};
 
 class CIPFilterEvent;
 
 /**
- * This class represents a list of IPs that should not be accepted
- * as valid connection destinations nor sources. It provides an
- * interface to query whether or not a specific IP is filtered.
- *
- * Currently this class can handle IPRange files in the Peer-Guardian
- * format and the AntiP2P format, read from either text files or text
- * files compressed with the zip compression format.
+ * A list of IPs that must not be accepted as connection destinations or sources, with an interface
+ * to ask whether a given IP is filtered.
  *
- * This class is thread-safe.
+ * Handles IPRange files in the Peer-Guardian and AntiP2P formats, read from plain text files or
+ * from text files zip-compressed. Thread-safe.
  */
 class CIPFilter : public wxEvtHandler
 {
 public:
-	/**
-	 * Constructor.
-	 */
 	CIPFilter();
 
 	/**
-	 * Checks if a IP is filtered with the current list and AccessLevel.
-	 *
-	 * @param IP2test The IP-Address to test for.
-	 * @param isServer Whether this IP belongs to a server or a client. Needed for statistical purposes only.
-	 * @return True if it is filtered, false otherwise.
-	 *
-	 * Note: IP2Test must be in anti-host order (BE on LE platform, LE on BE platform).
+	 * True if @a IP2test is filtered by the current list and access level. @a isServer says
+	 * whether the IP belongs to a server or a client, for statistics only. @a IP2test must be
+	 * in anti-host order (BE on an LE platform, LE on a BE one).
 	 */
-	bool	IsFiltered( uint32 IP2test, bool isServer = false );
+	bool IsFiltered(uint32 IP2test, bool isServer = false);
+
+	/** Mapped IPv4 uses the legacy path; absent addresses are rejected. */
+	bool IsFiltered(const CNetworkAddress &address, bool isServer = false);
 
 	/**
-	 * Returns the number of banned ranges.
+	 * The number of stored IPv4 ranges plus below-threshold IPv6 rules.
+	 * Overlapping IPv6 rules are counted individually.
 	 */
-	uint32	BanCount() const;
+	uint32 BanCount() const;
 
 	/**
 	 * Reloads the ipfilter files, discarding the current list of ranges.
 	 */
-	void	Reload();
+	void Reload();
+
+	/**
+	 * Starts a download of the ipfilter list at @a strURL. Once it has downloaded, ipfilter.dat
+	 * is replaced with the new file and Reload is called.
+	 */
+	void Update(const wxString &strURL);
 
 	/**
-	 * Starts a download of the ipfilter-list at the specified URL.
-	 *
-	 * @param A valid URL.
-	 *
-	 * Once the file has been downloaded, the ipfilter.dat file
-	 * will be replaced with the new file and Reload will be called.
+	 * Called when a download completes.
 	 */
-	void	Update(const wxString& strURL);
+	void DownloadFinished(uint32 result);
 
 	/**
-	 * This function is called when a download is completed.
+	 * True once initial startup has finished; stays true while reloading later.
 	 */
-	void	DownloadFinished(uint32 result);
+	bool IsReady() const { return m_ready; }
 
 	/**
-	 * True once initial startup has finished (stays true while reloading later).
+	 * Tells the filter to start these networks once it has finished loading.
 	 */
-	bool	IsReady() const { return m_ready; }
+	void StartKADWhenReady() { m_startKADWhenReady = true; }
+	void ConnectToAnyServerWhenReady() { m_connectToAnyServerWhenReady = true; }
 
 	/**
-	 * These functions are called to tell the filter to start networks once it
-	 * has finished loading.
+	 * Starts whichever networks the two flags above requested, and clears them. Called from the
+	 * load-finished handler, and again once the flags have been set during startup: loading
+	 * runs on a worker thread, so it can finish -- and its event be dispatched -- before the
+	 * caller gets round to asking for a network. Doing nothing when no flag is set makes the
+	 * second call harmless.
 	 */
-	void	StartKADWhenReady() { m_startKADWhenReady = true; }
-	void	ConnectToAnyServerWhenReady() { m_connectToAnyServerWhenReady = true; }
+	void StartPendingNetworks();
 
 private:
 	/** Handles the result of loading the dat-files. */
-	void	OnIPFilterEvent(CIPFilterEvent&);
+	void OnIPFilterEvent(CIPFilterEvent &);
 
 	//! The URL from which the IP filter was downloaded
 	wxString m_URL;
@@ -115,9 +274,11 @@
 	// except if IP-Filter debugging is active.
 	typedef std::vector<std::string> RangeNames;
 	RangeNames m_rangeNames;
+	CIPFilterIPv6Ranges m_ipv6Ranges;
+	unsigned m_ipv6AccessLevel = 0;
 
 	//! Mutex used to ensure thread-safety of this class
-	mutable wxMutex	m_mutex;
+	mutable wxMutex m_mutex;
 
 	// false if loading (on startup only)
 	bool m_ready;

amule-3.0.1.tar.gz/src/IPFilterScanner.cpp -> amule-3.1.0.tar.gz/src/IPFilterScanner.cpp Changed

@@ -1,3 +1,4 @@
+// clang-format off
 #line 2 "IPFilterScanner.cpp"
 
 #line 4 "IPFilterScanner.cpp"
@@ -614,8 +615,8 @@
 	(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
+#define YY_NUM_RULES 7
+#define YY_END_OF_BUFFER 8
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -623,26 +624,33 @@
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept169 =
+static const flex_int16_t yy_accept224 =
     {   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
+        0,    6,    8,    7,    7,    5,    6,    6,    3,    6,
+        6,    6,    0,    5,    6,    6,    6,    3,    6,    6,
+        6,    3,    3,    6,    6,    6,    6,    6,    6,    3,
+        3,    6,    6,    6,    6,    6,    6,    3,    3,    6,
+        6,    6,    6,    6,    6,    6,    6,    3,    3,    6,
+        6,    6,    6,    6,    6,    6,    3,    3,    6,    6,
+        6,    1,    6,    6,    6,    3,    3,    6,    6,    1,
+        1,    6,    6,    6,    3,    3,    6,    6,    6,    1,
+        1,    6,    6,    3,    3,    6,    6,    6,    1,    1,
+        6,    6,    6,    3,    3,    3,    6,    6,    1,    1,
+
+        6,    6,    6,    3,    3,    3,    6,    6,    1,    1,
+        6,    6,    3,    3,    6,    6,    1,    1,    6,    6,
+        3,    3,    6,    6,    1,    1,    6,    6,    3,    3,
+        6,    6,    1,    1,    6,    6,    3,    3,    6,    6,
+        1,    1,    1,    6,    6,    3,    3,    6,    6,    6,
+        1,    1,    1,    4,    6,    3,    3,    6,    6,    6,
+        1,    1,    4,    4,    3,    3,    6,    2,    6,    1,
+        1,    4,    3,    2,    2,    6,    1,    1,    2,    2,
+        1,    1,    2,    2,    1,    1,    2,    2,    1,    1,
+        2,    2,    1,    1,    2,    2,    1,    2,    2,    2,
+
+        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+        2,    2,    0
     } ;
 
 static const YY_CHAR yy_ec256 =
@@ -651,14 +659,14 @@
         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,    5,    6,    7,    8,    9,    9,    9,
+        9,    9,    9,    9,    9,    9,    9,   10,    1,    1,
+        1,    1,    1,    1,   11,   11,   11,   11,   11,   11,
         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,   11,   11,   11,   11,
 
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+       11,   11,    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,
@@ -677,117 +685,160 @@
         1,    1,    1,    1,    1
     } ;
 
-static const YY_CHAR yy_meta10 =
+static const YY_CHAR yy_meta12 =
     {   0,
-        1,    1,    2,    1,    1,    1,    1,    1,    1
+        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
+        1
     } ;
 
-static const flex_int16_t yy_base173 =
+static const flex_int16_t yy_base229 =
     {   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
+        0,    3,  275,  374,   13,  374,  264,   16,  263,   21,
+       31,   33,    0,  374,  262,   43,    0,  261,    0,    0,
+        0,  258,   52,   54,  256,  255,    0,   58,   61,    0,
+       69,   72,   80,  254,  253,  252,  251,   88,  248,  247,
+      246,  245,   96,  244,   99,  243,  240,  102,  239,  105,
+      238,    0,  113,  236,  235,  232,  229,  226,  225,  223,
+      222,  220,  218,  116,  215,  119,  212,  127,  209,  205,
+      135,  203,  200,  197,  194,  193,  192,  144,  191,    0,
+      152,  160,  190,  168,  189,    0,  171,  186,  179,  185,
+      184,  187,  183,  182,  195,  181,  178,  177,  198,  176,
+
+        0,  201,  175,    0,  204,  174,  207,  173,  170,  167,
+      166,  164,  163,  162,  159,  158,  210,  156,  213,  155,
+      216,  154,  219,  151,  149,  148,  147,  146,  143,  142,
+      141,  140,  227,  139,  230,  138,  233,  134,  241,  133,
+      132,  249,  131,  130,  129,  126,  125,  123,  257,  122,
+        0,  260,  121,  268,  118,  276,  115,    0,  284,  112,
+      111,  110,  108,  107,  104,  101,   98,   94,   94,  287,
+       93,   92,   91,   89,  295,   87,   86,   85,    0,  304,
+      307,   84,  315,   83,   82,   79,  318,   78,  326,   77,
+       75,   74,   71,   68,  329,   66,   65,   64,   63,  337,
+
+       60,   57,  345,   51,    0,  348,   50,   49,   48,  351,
+       47,   46,   42,  354,   41,   40,   39,  362,   38,   37,
+       30,   28,  374,  371,   35,   34,   33,    0
     } ;
 
-static const flex_int16_t yy_def173 =
+static const flex_int16_t yy_def229 =
     {   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
+      224,  223,  223,  223,  223,  223,  225,  223,  226,  225,
+       10,  225,    5,  223,  225,  225,    8,  226,   10,   11,
+       12,  226,  226,  225,   24,   10,   16,   10,   24,   23,
+       23,   24,   24,   10,   24,   28,   29,   23,   31,   24,
+       32,   33,   24,   33,   24,   28,   29,   31,   31,   29,
+       32,   43,   43,   33,   24,   45,   38,   48,   24,   50,
+       53,  227,   53,   50,   45,   48,   48,   24,   50,  227,
+      227,   53,   24,   64,   38,   66,   68,   24,   68,   71,
+       71,   68,   64,   38,   66,   78,   64,   68,   71,   81,
+       82,   78,   82,   84,   38,   84,   24,   87,   81,   81,
+
+       92,   87,   82,   95,   38,   84,   87,   87,   89,   99,
+       24,  102,   38,  105,   24,  107,   99,   99,  107,  102,
+      105,  105,  102,  107,   89,  117,   24,  119,   38,  121,
+       24,  123,   89,  117,  123,  119,  121,  121,   24,  123,
+      133,   89,  133,   24,  135,   38,  137,  139,   24,  139,
+      142,   89,  133,   24,  135,   38,  137,  149,  149,  139,
+       89,  152,  154,  154,  156,  156,  159,  228,  159,  152,
+      152,  154,  156,  228,  228,  159,   89,  170,  175,  175,
+      170,  170,  175,  180,   89,  181,  180,  180,   89,  181,
+      183,  187,  189,  189,  187,  187,  189,  183,  195,  183,
+
+      195,  200,  183,  200,  203,  183,  200,  183,  206,  206,
+      206,  183,  210,  210,  210,  183,  214,  183,  214,  218,
+      218,  218,    0,  223,  223,  223,  223,  223
     } ;
 
-static const flex_int16_t yy_nxt242 =
+static const flex_int16_t yy_nxt386 =
     {   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
+      174,    5,    6,    7,    8,    6,    9,    7,    7,    7,
+        7,   10,   11,   12,   13,   14,   15,   17,   14,   18,
+       15,   15,   15,   15,   19,   20,   21,   24,   25,   26,
+       20,   21,   27,   70,   22,   15,  174,   15,  222,   28,
+       25,   21,   20,   21,   27,  174,  174,  219,  218,  174,
+      215,   29,   16,   30,  214,  174,  211,  210,  174,  207,
+       31,   23,   32,   16,   35,  174,   36,   35,  174,   37,
+       22,  201,  200,   70,  174,   38,  197,   39,   40,   70,
+       41,   42,  196,  195,   43,   70,  174,  190,   44,   22,
+      189,  188,   70,  182,  181,   15,   48,   52,  175,   22,
+
+       15,   70,  176,  175,   53,   55,   15,   56,   57,  173,
+       58,   59,   22,   60,   61,  172,   15,   62,  171,  170,
+       15,   63,   73,   22,   74,   75,   15,   76,   77,   70,
+      160,   15,   78,  157,  156,   79,   80,  155,  154,  153,
+       70,   15,   22,   81,   71,   86,   15,   70,  140,  139,
+      138,  137,   87,   70,  136,  135,  134,  133,   89,   15,
+       90,   91,   22,   15,   70,   92,  124,  123,   93,   94,
+      122,  121,  120,   95,  119,  118,   96,   97,  117,   98,
+       70,   15,   22,   15,   70,  108,  107,   99,  101,  106,
+       22,  103,   15,  100,   15,  102,  104,   22,   15,   88,
+
+       15,   85,   84,  105,  109,   83,  110,  111,   82,  112,
+      113,   15,  114,  115,   71,  116,  125,   15,  126,  127,
+       22,  128,  129,   15,  130,  131,   72,  132,  141,   71,
+       15,   69,  142,   68,   67,  143,  144,   66,  145,  146,
+       65,  147,  148,   64,   15,  149,   15,   22,   15,  150,
+      151,   21,   54,   15,   51,   50,   49,  152,  158,   47,
+       46,   45,   21,   34,   33,  159,  161,   23,  162,  163,
+       23,   16,   23,   16,  223,  223,  164,  165,  223,  223,
+      223,  223,  223,  223,  166,  167,  223,  223,  168,  223,
+      223,  223,  169,  177,  223,  178,  179,  223,  223,  223,
+
+      223,  223,  223,  180,  175,  174,  223,  223,  223,  223,
+      183,  223,  184,  185,  223,  186,  174,  223,  223,  223,
+      223,  223,  223,  187,  191,  223,  192,  193,  223,  223,
+      223,  223,  223,  223,  194,  198,  223,  199,  202,  223,
+      223,  223,  203,  223,  223,  204,  205,  223,  223,  223,
+      223,  223,  223,  206,  208,  223,  209,  212,  223,  213,
+      216,  223,  217,  220,  223,  223,  223,  223,  223,  223,
+      221,    4,    4,    3,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223
     } ;
 
-static const flex_int16_t yy_chk242 =
+static const flex_int16_t yy_chk386 =
     {   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
+      228,    1,    1,    2,    2,    2,    2,    2,    2,    2,
+        2,    2,    2,    2,    5,    5,    8,    8,    8,    8,
+        8,    8,    8,    8,    8,    8,    8,   10,   10,   10,
+       10,   10,   11,  227,  226,  225,  222,   11,  221,   11,
+       12,   12,   12,   12,   16,  220,  219,  217,  216,  215,
+      213,   16,   16,   23,  212,  211,  209,  208,  207,  204,
+       23,   23,   24,   24,   28,  202,   28,   29,  201,   29,
+       31,  199,  198,  197,  196,   31,  194,   31,   32,  193,
+       32,   33,  192,  191,   33,  190,  188,  186,   33,   38,
+      185,  184,  182,  178,  177,  176,   38,   43,  174,  173,
+
+      172,  171,  169,  168,   43,   45,  167,   45,   48,  166,
+       48,   50,  165,   50,   53,  164,  163,   53,  162,  161,
+      160,   53,   64,  157,   64,   66,  155,   66,   68,  153,
+      150,  148,   68,  147,  146,   68,   71,  145,  144,  143,
+      141,  140,  138,   71,   71,   78,  136,  134,  132,  131,
+      130,  129,   78,   81,  128,  127,  126,  125,   81,  124,
+       81,   82,  122,  120,  118,   82,  116,  115,   82,   84,
+      114,  113,  112,   84,  111,  110,   84,   87,  109,   87,
+       89,  108,  106,  103,  100,   98,   97,   89,   92,   96,
+       94,   93,   91,   90,   88,   92,   95,   85,   83,   79,
+
+       77,   76,   75,   95,   99,   74,   99,  102,   73,  102,
+      105,   72,  105,  107,   70,  107,  117,   69,  117,  119,
+       67,  119,  121,   65,  121,  123,   63,  123,  133,   62,
+       61,   60,  133,   59,   58,  133,  135,   57,  135,  137,
+       56,  137,  139,   55,   54,  139,   51,   49,   47,  139,
+      142,   46,   44,   42,   41,   40,   39,  142,  149,   37,
+       36,   35,   34,   26,   25,  149,  152,   22,  152,  154,
+       18,   15,    9,    7,    3,    0,  154,  156,    0,    0,
+        0,    0,    0,    0,  156,  159,    0,    0,  159,    0,
+        0,    0,  159,  170,    0,  170,  175,    0,    0,    0,
+
+        0,    0,    0,  175,  175,  180,    0,    0,    0,    0,
+      180,    0,  180,  181,    0,  181,  183,    0,    0,    0,
+        0,    0,    0,  183,  187,    0,  187,  189,    0,    0,
+        0,    0,    0,    0,  189,  195,    0,  195,  200,    0,
+        0,    0,  200,    0,    0,  200,  203,    0,    0,    0,
+        0,    0,    0,  203,  206,    0,  206,  210,    0,  210,
+      214,    0,  214,  218,    0,    0,    0,    0,    0,    0,
+      218,  224,  224,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -902,8 +953,8 @@
 	return true;
 }
 
-#line 906 "IPFilterScanner.cpp"
-#line 907 "IPFilterScanner.cpp"
+#line 956 "IPFilterScanner.cpp"
+#line 957 "IPFilterScanner.cpp"
 
 #define INITIAL 0
 
@@ -1126,7 +1177,7 @@
 #line 106 "IPFilterScanner.l"
 
 
-#line 1130 "IPFilterScanner.cpp"
+#line 1180 "IPFilterScanner.cpp"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1154,13 +1205,13 @@
 			while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
 				{
 				yy_current_state = (int) yy_defyy_current_state;
-				if ( yy_current_state >= 169 )
+				if ( yy_current_state >= 224 )
 					yy_c = yy_metayy_c;
 				}
 			yy_current_state = yy_nxtyy_baseyy_current_state + yy_c;
 			++yy_cp;
 			}
-		while ( yy_baseyy_current_state != 232 );
+		while ( yy_baseyy_current_state != 374 );
 
 yy_find_action:
 		yy_act = yy_acceptyy_current_state;
@@ -1188,6 +1239,32 @@
 YY_RULE_SETUP
 #line 108 "IPFilterScanner.l"
 {
+		/* Native IPv6 CIDR: <address>/<prefix>,<level>,<description>.
+		   Restrict the literal alphabet: no scopes, brackets or dotted tails. */
+		char *address = yytext;
+		while (*address == ' ' || *address == '\t' || *address == '\r') {
+			++address;
+		}
+		char *slash = strchr(address, '/');
+		*slash = 0;
+		char *acc = strchr(slash + 1, ',') + 1;
+		char *dsc = strchr(acc, ',') + 1;
+		CNetworkAddress parsed = CNetworkAddress::FromString(address);
+		if (!parsed.IsIPv6() || parsed.IsIPv4Mapped() ||
+			!ScanInt(slash + 1, IPv6Prefix) || IPv6Prefix > 128 ||
+			!ScanInt(acc, IPLevel)) {
+			yyip_Bad++;
+		} else {
+			IPv6Network = parsed.TruncatedToPrefix(IPv6Prefix);
+			IPDescription = dsc;
+			return 2;
+		}
+	}
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 131 "IPFilterScanner.l"
+{
 		/* PeerGuardian filter line
 		   <IPStart> - <IPEnd> , <AccessLevel> , <Description>
 		*/
@@ -1204,16 +1281,16 @@
 		}
 	}
 	YY_BREAK
-case 2:
+case 3:
 YY_RULE_SETUP
-#line 125 "IPFilterScanner.l"
+#line 148 "IPFilterScanner.l"
 {
 		/* Comment */
 	}
 	YY_BREAK
-case 3:
+case 4:
 YY_RULE_SETUP
-#line 129 "IPFilterScanner.l"
+#line 152 "IPFilterScanner.l"
 {
 		/* AntiP2P filter line
 		   <Description> : <IPStart> - <IPEnd>
@@ -1230,29 +1307,29 @@
 		}
 	}
 	YY_BREAK
-case 4:
-/* rule 4 can match eol */
+case 5:
+/* rule 5 can match eol */
 YY_RULE_SETUP
-#line 145 "IPFilterScanner.l"
+#line 168 "IPFilterScanner.l"
 {
 		yyip_Line++;
 	}
 	YY_BREAK
-case 5:
+case 6:
 YY_RULE_SETUP
-#line 149 "IPFilterScanner.l"
+#line 172 "IPFilterScanner.l"
 {
 		/* Bad line */
 		yyip_Bad++;
 		AddDebugLogLineN(logIPFilter, CFormat("error in line %d: %s") % yyip_Line % wxString(char2unicode(yytext)));
 	}
 	YY_BREAK
-case 6:
+case 7:
 YY_RULE_SETUP
-#line 155 "IPFilterScanner.l"
+#line 178 "IPFilterScanner.l"
 ECHO;
 	YY_BREAK
-#line 1256 "IPFilterScanner.cpp"
+#line 1332 "IPFilterScanner.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1550,7 +1627,7 @@
 		while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
 			{
 			yy_current_state = (int) yy_defyy_current_state;
-			if ( yy_current_state >= 169 )
+			if ( yy_current_state >= 224 )
 				yy_c = yy_metayy_c;
 			}
 		yy_current_state = yy_nxtyy_baseyy_current_state + yy_c;
@@ -1578,11 +1655,11 @@
 	while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
 		{
 		yy_current_state = (int) yy_defyy_current_state;
-		if ( yy_current_state >= 169 )
+		if ( yy_current_state >= 224 )
 			yy_c = yy_metayy_c;
 		}
 	yy_current_state = yy_nxtyy_baseyy_current_state + yy_c;
-	yy_is_jam = (yy_current_state == 168);
+	yy_is_jam = (yy_current_state == 223);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2260,6 +2337,6 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 155 "IPFilterScanner.l"
+#line 178 "IPFilterScanner.l"

amule-3.0.1.tar.gz/src/IPFilterScanner.h -> amule-3.1.0.tar.gz/src/IPFilterScanner.h Changed

amule-3.0.1.tar.gz/src/IPFilterScanner.l -> amule-3.1.0.tar.gz/src/IPFilterScanner.l Changed

@@ -105,6 +105,29 @@
 
 %%
 
+^{WS}0-9a-fA-F:+"/"{NO}{WS},{WS}{NO}{WS},.* {
+		/* Native IPv6 CIDR: <address>/<prefix>,<level>,<description>.
+		   Restrict the literal alphabet: no scopes, brackets or dotted tails. */
+		char *address = yytext;
+		while (*address == ' ' || *address == '\t' || *address == '\r') {
+			++address;
+		}
+		char *slash = strchr(address, '/');
+		*slash = 0;
+		char *acc = strchr(slash + 1, ',') + 1;
+		char *dsc = strchr(acc, ',') + 1;
+		CNetworkAddress parsed = CNetworkAddress::FromString(address);
+		if (!parsed.IsIPv6() || parsed.IsIPv4Mapped() ||
+			!ScanInt(slash + 1, IPv6Prefix) || IPv6Prefix > 128 ||
+			!ScanInt(acc, IPLevel)) {
+			yyip_Bad++;
+		} else {
+			IPv6Network = parsed.TruncatedToPrefix(IPv6Prefix);
+			IPDescription = dsc;
+			return 2;
+		}
+	}
+
 ^{WS}{IP}{WS}-{WS}{IP}{WS},{WS}{NO}{WS},.*		{
 		/* PeerGuardian filter line
 		   <IPStart> - <IPEnd> , <AccessLevel> , <Description>
@@ -146,7 +169,7 @@
 		yyip_Line++;
 	}
 
-^.			{
+^.*			{
 		/* Bad line */
 		yyip_Bad++;
 		AddDebugLogLineN(logIPFilter, CFormat("error in line %d: %s") % yyip_Line % wxString(char2unicode(yytext)));

amule-3.1.0.tar.gz/src/InfoGridDialog.cpp Added

@@ -0,0 +1,98 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "InfoGridDialog.h" // Interface declarations
+
+#include <wx/artprov.h>
+#include <wx/bmpbndl.h>
+#include <wx/dialog.h>
+#include <wx/sizer.h>
+#include <wx/statbmp.h>
+#include <wx/stattext.h>
+#include <wx/string.h>
+#include <wx/window.h>
+
+namespace
+{
+// GUI thread only. ShowModal() does not stop a click reaching the control that opened the dialog:
+// the event is queued and delivered once ShowModal() returns, so without this each click made while
+// the dialog was up opens another one on close.
+bool g_dialogOpen = false;
+} // namespace
+
+void ShowInfoGridDialog(wxWindow *parent,
+	const wxString &title,
+	const wxString &intro,
+	const std::function<void(wxWindow *, wxSizer *)> &fillGrid,
+	const wxString &introArt,
+	const wxColour &introColour)
+{
+	if (g_dialogOpen) {
+		return;
+	}
+	g_dialogOpen = true;
+
+	wxDialog dialog(parent, wxID_ANY, title);
+	wxFlexGridSizer *grid = new wxFlexGridSizer(2, wxSize(8, 6));
+	fillGrid(&dialog, grid);
+
+	wxBoxSizer *top = new wxBoxSizer(wxVERTICAL);
+	if (!intro.IsEmpty()) {
+		// A stock id can exist without the platform's provider supplying art
+		// for it, so fall back to the bare line rather than leaving a gap.
+		const wxBitmapBundle introBmp =
+			introArt.IsEmpty()
+				? wxBitmapBundle()
+				: wxArtProvider::GetBitmapBundle(introArt, wxART_MESSAGE_BOX, wxSize(16, 16));
+		wxStaticText *introText = new wxStaticText(&dialog, wxID_ANY, intro);
+		if (introColour.IsOk()) {
+			introText->SetForegroundColour(introColour);
+		}
+		if (!introBmp.IsOk()) {
+			top->Add(introText, 0, wxALL, 10);
+		} else {
+			wxBoxSizer *introRow = new wxBoxSizer(wxHORIZONTAL);
+			introRow->Add(new wxStaticBitmap(&dialog, wxID_ANY, introBmp),
+				wxSizerFlags().CenterVertical().Border(wxRIGHT, 6));
+			introRow->Add(introText, 0, wxALIGN_CENTRE_VERTICAL);
+			top->Add(introRow, 0, wxALL, 10);
+		}
+	}
+	top->Add(grid, 0, wxLEFT | wxRIGHT | wxBOTTOM, 10);
+	if (wxSizer *buttons = dialog.CreateButtonSizer(wxOK)) {
+		top->Add(buttons, wxSizerFlags().Right().Border(wxLEFT | wxRIGHT | wxBOTTOM, 10));
+	}
+
+	dialog.SetSizerAndFit(top);
+	dialog.CentreOnParent();
+	dialog.ShowModal();
+
+	// Cleared behind the queued clicks rather than here, so they are dispatched
+	// -- and rejected above -- before the flag drops.
+	if (parent) {
+		parent->CallAfter( { g_dialogOpen = false; });
+	} else {
+		g_dialogOpen = false;
+	}
+}

amule-3.1.0.tar.gz/src/InfoGridDialog.h Added

@@ -0,0 +1,54 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 INFOGRIDDIALOG_H
+#define INFOGRIDDIALOG_H
+
+#include <functional>
+
+#include <wx/colour.h>
+#include <wx/string.h>
+
+class wxWindow;
+class wxSizer;
+
+/**
+ * Show a small modal dialog: an optional intro line, a two-column grid the caller fills, and an OK
+ * button.
+ *
+ * Shared so the part-bar legends and the status-bar core-version details do not each carry a copy
+ * of the same scaffolding. `fillGrid` receives the dialog to parent widgets to, and the grid to add
+ * them to.
+ *
+ * `introArt` is an optional wxArtProvider id (wxART_WARNING, wxART_TICK_MARK, ...) drawn left of
+ * the intro line. Stock art, so it matches the platform and needs no bundled asset.
+ */
+void ShowInfoGridDialog(wxWindow *parent,
+	const wxString &title,
+	const wxString &intro,
+	const std::function<void(wxWindow *, wxSizer *)> &fillGrid,
+	const wxString &introArt = wxString(),
+	const wxColour &introColour = wxColour());
+
+#endif // INFOGRIDDIALOG_H

amule-3.1.0.tar.gz/src/InstanceLock.cpp Added

@@ -0,0 +1,257 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+//
+
+#include "InstanceLock.h"
+
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
+
+#ifdef __WINDOWS__
+#include <wx/filefn.h>
+#include <wx/snglinst.h>
+#include <wx/utils.h>
+#else
+#include <cerrno>
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#endif
+
+namespace
+{
+
+// Layout of the holder record, shared by both implementations:
+//   line 1  the writer's pid
+//   line 2  what it was: "amule", "amuled" or "amulegui"
+// A file with only the first line was written by an aMule predating the second, and leaves `kind`
+// empty, which every caller reads as "assume it can be raised".
+void ParseHolder(const char *text, int &pid, wxString &kind)
+{
+	pid = 0;
+	kind.clear();
+	if (text == nullptr) {
+		return;
+	}
+	char *rest = nullptr;
+	const long parsed = strtol(text, &rest, 10);
+	if (parsed > 0 && parsed <= INT_MAX) {
+		pid = static_cast<int>(parsed);
+	}
+	if (rest != nullptr) {
+		kind = wxString::FromUTF8(rest).Strip(wxString::both);
+	}
+}
+
+#ifdef __WINDOWS__
+
+void ReadHolderFile(const wxString &path, int &pid, wxString &kind)
+{
+	pid = 0;
+	kind.clear();
+	FILE *f = wxFopen(path, wxT("rb"));
+	if (f == nullptr) {
+		return;
+	}
+	char buf96 = { 0 };
+	const size_t got = fread(buf, 1, sizeof(buf) - 1, f);
+	(void)fclose(f);
+	bufgot = '\0';
+	ParseHolder(buf, pid, kind);
+}
+
+void WriteHolderFile(const wxString &path, const wxString &kind)
+{
+	FILE *f = wxFopen(path, wxT("wb"));
+	if (f == nullptr) {
+		return;
+	}
+	(void)fprintf(f, "%d\n%s\n", (int)wxGetProcessId(), (const char *)kind.utf8_str());
+	(void)fclose(f);
+}
+
+#endif // __WINDOWS__
+
+} // namespace
+
+InstanceLock::InstanceLock()
+#ifdef __WINDOWS__
+: m_wxImpl(NULL)
+, m_anotherRunning(false)
+, m_holderPid(0)
+#else
+: m_fd(-1)
+, m_holderPid(0)
+#endif
+{
+}
+
+InstanceLock::~InstanceLock()
+{
+	Release();
+}
+
+#ifdef __WINDOWS__
+
+InstanceLock::Result InstanceLock::Acquire(
+	const wxString &filename, const wxString &dir, const wxString &selfKind)
+{
+	Release();
+	m_path = dir + filename;
+	m_holderPid = 0;
+	m_holderKind.clear();
+
+	m_wxImpl = new wxSingleInstanceChecker();
+	if (!m_wxImpl->Create(filename, dir)) {
+		delete m_wxImpl;
+		m_wxImpl = NULL;
+		return LOCK_ERROR;
+	}
+	m_anotherRunning = m_wxImpl->IsAnotherRunning();
+
+	// The mutex answers "is another instance running" but says nothing about WHICH: amuled
+	// shares this name with the monolithic GUI, and only one of them has a window to raise.
+	// wxSingleInstanceChecker keeps no file, so the two facts POSIX writes into the lock file
+	// are written beside the mutex here.
+	//
+	// No liveness check is needed on this side: the OS releases a named mutex when its owner
+	// dies, so a held mutex proves a live holder, and a file left by a crash is overwritten by
+	// the next acquire.
+	if (m_anotherRunning) {
+		ReadHolderFile(m_path, m_holderPid, m_holderKind);
+		return LOCK_HELD;
+	}
+	WriteHolderFile(m_path, selfKind);
+	return LOCK_ACQUIRED;
+}
+
+void InstanceLock::Release()
+{
+	delete m_wxImpl;
+	m_wxImpl = NULL;
+	m_anotherRunning = false;
+	if (!m_path.IsEmpty()) {
+		(void)wxRemoveFile(m_path);
+	}
+}
+
+#else // POSIX
+
+InstanceLock::Result InstanceLock::Acquire(
+	const wxString &filename, const wxString &dir, const wxString &selfKind)
+{
+	// Idempotent-caller contract (see header). Drop any existing fd first without unlinking --
+	// the file is replaced by the open() below, and unlinking here would leave a window with no
+	// lock file on disk for a third instance to slip through.
+	if (m_fd != -1) {
+		(void)close(m_fd);
+		m_fd = -1;
+	}
+	m_path = dir + filename;
+
+	// Open (or create) the lock file. Unlike wxSingleInstanceChecker we do NOT use O_EXCL: the
+	// file's presence is not the signal, the kernel-held fcntl lock is.
+	m_fd = open(m_path.fn_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+	if (m_fd == -1) {
+		return LOCK_ERROR;
+	}
+
+	// Defense against a planted lock file with the wrong owner: a world-writable
+	// muleLock dropped into ~/.aMule/ is not one to touch.
+	struct stat st;
+	if (fstat(m_fd, &st) == 0 && st.st_uid != getuid()) {
+		(void)close(m_fd);
+		m_fd = -1;
+		return LOCK_ERROR;
+	}
+	(void)fchmod(m_fd, S_IRUSR | S_IWUSR);
+
+	struct flock fl;
+	fl.l_type = F_WRLCK;
+	fl.l_whence = SEEK_SET;
+	fl.l_start = 0;
+	fl.l_len = 0;
+	fl.l_pid = 0;
+
+	if (fcntl(m_fd, F_SETLK, &fl) == -1) {
+		int saved = errno;
+		// EACCES and EAGAIN both mean "prohibited by another process's lock" -- POSIX
+		// allows either and the platforms differ, so neither can be read as a permission
+		// problem. Record who the file SAYS owns it before closing, while we still have the
+		// fd. Whether that pid is alive is the caller's question, and the only thing
+		// separating "an aMule is running" from "something else has this file".
+		m_holderPid = 0;
+		if (saved == EAGAIN || saved == EACCES) {
+			char held64 = { 0 };
+			if (lseek(m_fd, 0, SEEK_SET) == 0) {
+				ssize_t got = read(m_fd, held, sizeof(held) - 1);
+				if (got > 0) {
+					heldgot = '\0';
+					ParseHolder(held, m_holderPid, m_holderKind);
+				}
+			}
+		}
+		(void)close(m_fd);
+		m_fd = -1;
+		if (saved == EAGAIN || saved == EACCES) {
+			return LOCK_HELD;
+		}
+		return LOCK_ERROR;
+	}
+
+	// Refresh the on-disk pid, and what we are, as a triage aid ("who owns muleLock?" via
+	// `cat`) and so a later launch can tell a raisable GUI holder from a headless daemon. The
+	// kernel -- not this integer -- is the source of truth. Under a PID-namespaced sandbox
+	// (Flatpak, docker) this is the sandbox-local pid and may match nothing on the host.
+	// Best-effort, like the write below. A (void) cast does not silence warn_unused_result on
+	// GCC, so the result is taken and dropped the same way.
+	int truncated = ftruncate(m_fd, 0);
+	(void)truncated;
+	char buf96;
+	int n = snprintf(buf, sizeof(buf), "%d\n%s\n", (int)getpid(), (const char *)selfKind.utf8_str());
+	if (n > 0) {
+		ssize_t rc = write(m_fd, buf, (size_t)n);
+		(void)rc;
+	}
+	return LOCK_ACQUIRED;
+}
+
+void InstanceLock::Release()
+{
+	if (m_fd == -1) {
+		return;
+	}
+	// Unlink first so a fresh start doesn't inherit stale content;
+	// close last so the fcntl lock is released atomically with removal.
+	(void)unlink(m_path.fn_str());
+	(void)close(m_fd);
+	m_fd = -1;
+	m_path.clear();
+}
+
+#endif // __WINDOWS__

amule-3.1.0.tar.gz/src/InstanceLock.h Added

@@ -0,0 +1,106 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+//
+
+#ifndef INSTANCELOCK_H
+#define INSTANCELOCK_H
+
+#include <wx/string.h>
+
+class wxSingleInstanceChecker;
+
+// Cross-instance detector for aMule.
+//
+// Replaces wxSingleInstanceChecker on POSIX because wx's stale-lock recovery falls back to
+// kill(pid, 0) for liveness, which false-negatives across Linux PID namespaces (Flatpak sandboxes,
+// container runtimes): every sandbox has its own PID 1..N, so the PID written by the first instance
+// always maps to a live process in the second's namespace, and IsAnotherRunning() returns false
+// because m_pidLocker == getpid() on both sides. Result: two aMule processes stomping on the same
+// config and downloads directory.
+//
+// This class uses fcntl(F_SETLK) directly: the kernel - not a PID compare - owns the truth about
+// who holds the lock, and it is namespace-independent. On process death (clean exit, crash,
+// SIGKILL) the kernel releases the lock, so a lock file left over from a crashed run self-heals on
+// the next start.
+//
+// On Windows the wxSingleInstanceChecker path is retained: it uses a named mutex, which is already
+// namespace-aware.
+
+class InstanceLock
+{
+public:
+	InstanceLock();
+	~InstanceLock();
+
+	enum Result
+	{
+		LOCK_ACQUIRED, // we own the lock; proceed with normal startup
+		LOCK_HELD,     // another live instance holds the lock
+		LOCK_ERROR     // could not open the lock file (bad path/perms)
+	};
+
+	// Try to acquire the lock. Idempotent: a prior lock has its fd closed first (the kernel
+	// drops the old lock), so calling twice on the same object is safe.
+	// CamuleAppCommon::RefreshSingleInstanceChecker() relies on that after the daemon fork().
+	//
+	// `selfKind` is recorded in the lock file beside the pid: "amule", "amuled" or "amulegui".
+	// amuled shares muleLock with the monolithic GUI, so a second launch that finds the lock
+	// held has to know whether the holder has a window to raise. A daemon has none, and a raise
+	// request posted to one is the same silence as no message at all.
+	Result Acquire(const wxString &filename, const wxString &dir, const wxString &selfKind);
+
+	// Release the lock and unlink the on-disk file. Also called from
+	// the destructor.
+	void Release();
+
+	// The pid recorded inside the lock file, read when Acquire() returned LOCK_HELD, or 0 when
+	// there was none. Diagnostic only: the kernel owns the truth about who holds the lock, and
+	// this only decides what to TELL the user.
+	//
+	// A live pid means an aMule is there to be raised. A dead one means the holder is not the
+	// aMule that wrote the file, which is the case that used to exit without a word.
+	int HolderPid() const { return m_holderPid; }
+
+	// What the holder recorded itself as, empty when the file predates this or was written by
+	// something that is not aMule. Empty means "assume it can be raised", the behaviour that
+	// shipped before.
+	const wxString &HolderKind() const { return m_holderKind; }
+
+	// Path of the lock file Acquire() last worked on, for the message.
+	const wxString &Path() const { return m_path; }
+
+private:
+#ifdef __WINDOWS__
+	wxSingleInstanceChecker *m_wxImpl;
+	bool m_anotherRunning;
+#else
+	int m_fd;
+#endif
+	// Shared by both implementations: the descriptive file beside the lock,
+	// and what the last Acquire() read out of it.
+	wxString m_path;
+	int m_holderPid;
+	wxString m_holderKind;
+};
+
+#endif // INSTANCELOCK_H

amule-3.0.1.tar.gz/src/InternalEvents.h -> amule-3.1.0.tar.gz/src/InternalEvents.h Changed

@@ -25,14 +25,12 @@
 #ifndef INTERNALEVENTS_H
 #define INTERNALEVENTS_H
 
+#include <wx/event.h> // Needed for wxEvent
 
-#include <wx/event.h>	// Needed for wxEvent
-
-#include <cstdint>		// int64_t for m_value -- `long` was 4 bytes on
-				// LLP64 (Win64) and silently truncated values
-				// like a wxFileOffset routed through SetExtraInt64
-				// (e.g. HTTPDownload's expected-bytes progress).
-
+#include <cstdint> // int64_t for m_value -- `long` was 4 bytes on
+		   // LLP64 (Win64) and silently truncated values
+		   // like a wxFileOffset routed through SetExtraInt64
+		   // (e.g. HTTPDownload's expected-bytes progress).
 
 wxDECLARE_EVENT(wxEVT_CORE_FINISHED_HTTP_DOWNLOAD, wxEvent);
 wxDECLARE_EVENT(wxEVT_CORE_SOURCE_DNS_DONE, wxEvent);
@@ -43,54 +41,38 @@
 {
 public:
 	CMuleInternalEvent(int event, int id = wxID_ANY)
-		: wxEvent(id, event),
-		  m_ptr(NULL),
-		  m_value(0),
-		  m_commandInt(0)
+	: wxEvent(id, event)
+	, m_ptr(NULL)
+	, m_value(0)
+	, m_commandInt(0)
 	{
 	}
 
-	wxEvent* Clone(void) const {
-		return new CMuleInternalEvent(*this);
-	}
+	wxEvent *Clone(void) const { return new CMuleInternalEvent(*this); }
 
-	void SetExtraInt64(int64_t value) {
-		m_value = value;
-	}
+	void SetExtraInt64(int64_t value) { m_value = value; }
 
-	int64_t GetExtraInt64() {
-		return m_value;
-	}
+	int64_t GetExtraInt64() { return m_value; }
 
-	void SetInt(int i) {
-		m_commandInt = i;
-	}
+	void SetInt(int i) { m_commandInt = i; }
 
-	long GetInt() const {
-		return m_commandInt;
-	}
+	long GetInt() const { return m_commandInt; }
 
-	void SetClientData(void *ptr) {
-		m_ptr = ptr;
-	}
+	void SetClientData(void *ptr) { m_ptr = ptr; }
 
-	void *GetClientData() {
-		return m_ptr;
-	}
+	void *GetClientData() { return m_ptr; }
 
 private:
-	void*	m_ptr;
-	int64_t	m_value;
-	int	m_commandInt;
+	void *m_ptr;
+	int64_t m_value;
+	int m_commandInt;
 };
 
-
-typedef void (wxEvtHandler::*MuleInternalEventFunction)(CMuleInternalEvent&);
+typedef void (wxEvtHandler::*MuleInternalEventFunction)(CMuleInternalEvent &);
 
 //! Event-handler for internal core events.
 #define EVT_MULE_INTERNAL(event, id, func) \
 	wx__DECLARE_EVT1(event, id, wxEVENT_HANDLER_CAST(MuleInternalEventFunction, func))
 
-
 #endif /* INTERNALEVENTS_H */
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/KadDlg.cpp -> amule-3.1.0.tar.gz/src/KadDlg.cpp Changed

@@ -41,55 +41,53 @@
 #include "kademlia/kademlia/Kademlia.h"
 #endif
 
-
 wxBEGIN_EVENT_TABLE(CKadDlg, wxPanel)
-	EVT_TEXT(ID_NODE_IP1, CKadDlg::OnFieldsChange)
-	EVT_TEXT(ID_NODE_IP2, CKadDlg::OnFieldsChange)
-	EVT_TEXT(ID_NODE_IP3, CKadDlg::OnFieldsChange)
-	EVT_TEXT(ID_NODE_IP4, CKadDlg::OnFieldsChange)
+	EVT_TEXT(ID_NODE_IP, CKadDlg::OnFieldsChange)
 	EVT_TEXT(ID_NODE_PORT, CKadDlg::OnFieldsChange)
 
-	EVT_TEXT_ENTER(IDC_NODESLISTURL ,CKadDlg::OnBnClickedUpdateNodeList)
+	EVT_TEXT_ENTER(IDC_NODESLISTURL, CKadDlg::OnBnClickedUpdateNodeList)
 
 	EVT_BUTTON(ID_NODECONNECT, CKadDlg::OnBnClickedBootstrapClient)
-	EVT_BUTTON(ID_KNOWNNODECONNECT, CKadDlg::OnBnClickedBootstrapKnown)
 	EVT_BUTTON(ID_KADDISCONNECT, CKadDlg::OnBnClickedDisconnectKad)
 	EVT_BUTTON(ID_UPDATEKADLIST, CKadDlg::OnBnClickedUpdateNodeList)
 wxEND_EVENT_TABLE()
 
-
-
-CKadDlg::CKadDlg(wxWindow* pParent)
-	: wxPanel(pParent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, "kadwnd" )
+CKadDlg::CKadDlg(wxWindow *pParent)
+: wxPanel(pParent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, "kadwnd")
 {
 	m_kad_scope = NULL;
 }
 
-
 void CKadDlg::Init()
 {
-	m_kad_scope = CastChild( "kadScope", COScopeCtrl );
+	m_kad_scope = CastChild("kadScope", COScopeCtrl);
 	m_kad_scope->SetRanges(0.0, thePrefs::GetStatsMax());
 	m_kad_scope->SetYUnits("Nodes");
 
-#ifndef __WINDOWS__
-	//
-	// 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();
+
+	UpdateConnectButton();
 }
 
+void CKadDlg::UpdateConnectButton()
+{
+	wxButton *button = CastChild(ID_KADDISCONNECT, wxButton);
+	wxCHECK_RET(button, "'ID_KADDISCONNECT' widget not found");
+
+	EConnButtonState state;
+	if (theApp->IsConnectedKad()) {
+		state = ConnButtonConnected;
+	} else if (theApp->IsKadRunning()) {
+		state = ConnButtonConnecting;
+	} else {
+		state = ConnButtonOff;
+	}
+
+	// _("Kad") matches the translatable tab label (muuli_wdr.cpp's
+	// NetDialog); see CServerWnd::UpdateED2KConnectButton's ED2K equivalent.
+	SetConnectButtonState(button, state, thePrefs::GetNetworkKademlia(), _("Kad"));
+}
 
 void CKadDlg::SetUpdatePeriod(int step)
 {
@@ -101,118 +99,129 @@
 	}
 }
 
-
 void CKadDlg::SetGraphColors()
 {
-	static const char aTrend = { 2,      1,        0        };
-	static const int aRes    = { IDC_C0, IDC_C0_3, IDC_C0_2 };
-
-	m_kad_scope->SetBackgroundColor(CStatisticsDlg::getColors(0));
-	m_kad_scope->SetGridColor(CStatisticsDlg::getColors(1));
-
-	for (size_t i = 0; i < 3; ++i) {
-		m_kad_scope->SetPlotColor(CStatisticsDlg::getColors(12 + i), aTrendi);
-
-		CColorFrameCtrl* ctrl = CastChild(aResi, CColorFrameCtrl);
-		ctrl->SetBackgroundBrushColour(CMuleColour(CStatisticsDlg::getColors(12 + i)));
-		ctrl->SetFrameBrushColour(*wxBLACK);
+	// Same shape as the download graph on the statistics panel -- three trends, the same three
+	// legend swatches -- driven by the Kad graph's own preference colours.
+	static const CStatisticsDlg::GraphColorSlot aSlot = { { 12, 2, IDC_C0, wxTRANSLATE("Current") },
+		{ 13, 1, IDC_C0_3, wxTRANSLATE("Running average") },
+		{ 14, 0, IDC_C0_2, wxTRANSLATE("Session average") } };
+
+	CStatisticsDlg::ApplyGraphFrameColors(m_kad_scope);
+	for (const CStatisticsDlg::GraphColorSlot &slot : aSlot) {
+		CStatisticsDlg::ApplyGraphSlot(this, m_kad_scope, slot);
 	}
 }
 
-
-void CKadDlg::UpdateGraph(const GraphUpdateInfo& update)
+void CKadDlg::UpdateGraph(const GraphUpdateInfo &update)
 {
-	std::vector<float *> v(3);
-	v0 = const_cast<float *>(&update.kadnodes0);
-	v1 = const_cast<float *>(&update.kadnodes1);
-	v2 = const_cast<float *>(&update.kadnodes2);
-	const std::vector<float *> &apfKad(v);
-	unsigned nodeCount = static_cast<unsigned>(update.kadnodes2);
-
+	// A hidden panel needs no update: the graph redraws from the statistics
+	// history and catches up by itself the next time it is painted.
 	if (!IsShownOnScreen()) {
-		m_kad_scope->DelayPoints();
-	} else {
-		// Check the current node-count to see if we should increase the graph height
-		if (m_kad_scope->GetUpperLimit() < update.kadnodes2) {
-			// Grow the limit by 50 sized increments.
-			m_kad_scope->SetRanges(0.0, ((nodeCount + 49) / 50) * 50);
-		}
+		return;
+	}
 
-		m_kad_scope->AppendPoints(update.timestamp, apfKad);
+	// Check the current node-count to see if we should increase the graph height
+	if (m_kad_scope->GetUpperLimit() < update.kadnodes2) {
+		const unsigned nodeCount = static_cast<unsigned>(update.kadnodes2);
+		// Grow the limit by 50 sized increments. The integer ceiling-to-50 is intentional: a
+		// whole number is what we want for the axis range.
+		// NOLINTNEXTLINE(bugprone-integer-division)
+		m_kad_scope->SetRanges(0.0, (float)(((nodeCount + 49) / 50) * 50));
 	}
-}
 
+	m_kad_scope->AppendPoints(update.timestamp);
+}
 
 void CKadDlg::UpdateNodeCount(unsigned nodeCount)
 {
-	wxStaticText* label = CastChild( "nodesListLabel", wxStaticText );
+	wxStaticText *label = CastChild("nodesListLabel", wxStaticText);
 	wxCHECK_RET(label, "Failed to find kad-nodes label");
 
 	label->SetLabel(CFormat(_("Nodes (%u)")) % nodeCount);
 	label->GetParent()->Layout();
 }
 
-
 // Enables or disables the node connect button depending on the contents of the text fields
-void CKadDlg::OnFieldsChange(wxCommandEvent& WXUNUSED(evt))
+void CKadDlg::OnFieldsChange(wxCommandEvent &WXUNUSED(evt))
 {
 	// These are the IDs of the search-fields
-	int textfields = { ID_NODE_IP1, ID_NODE_IP2, ID_NODE_IP3, ID_NODE_IP4, ID_NODE_PORT};
+	int textfields = { ID_NODE_IP, ID_NODE_PORT };
 
 	bool enable = true;
-	for ( uint16 i = 0; i < itemsof(textfields); i++ ) {
-		enable &= !CastChild(textfieldsi, wxTextCtrl)->GetValue().IsEmpty();
+	for (int textfield : textfields) {
+		enable &= !CastChild(textfield, wxTextCtrl)->GetValue().IsEmpty();
 	}
 
 	// Enable the node connect button if all fields contain text
-	FindWindowById(ID_NODECONNECT)->Enable( enable );
+	FindWindowById(ID_NODECONNECT)->Enable(enable);
 }
 
-
-void CKadDlg::OnBnClickedBootstrapClient(wxCommandEvent& WXUNUSED(evt))
+void CKadDlg::OnBnClickedBootstrapClient(wxCommandEvent &WXUNUSED(evt))
 {
 	if (FindWindowById(ID_NODECONNECT)->IsEnabled()) {
-		// Ip is reversed since StringIPtoUint32 returns anti-host and kad expects host order
-		uint32 ip = StringIPtoUint32(
-			dynamic_cast<wxTextCtrl*>(FindWindowById(ID_NODE_IP4))->GetValue() + "." +
-			dynamic_cast<wxTextCtrl*>(FindWindowById(ID_NODE_IP3))->GetValue() + "." +
-			dynamic_cast<wxTextCtrl*>(FindWindowById(ID_NODE_IP2))->GetValue() + "." +
-			dynamic_cast<wxTextCtrl*>(FindWindowById(ID_NODE_IP1))->GetValue() );
+		// Single "x.x.x.x" field (issue #402 review, matching the eD2k tab's
+		// IDC_IPADDRESS). Trim first: the field exists for easier copy-paste, and a paste
+		// commonly carries a leading or trailing space that would otherwise fail as
+		// "Invalid ip to bootstrap". Octets are reversed before StringIPtoUint32 because
+		// that function returns anti-host order and Kad expects host order -- the same
+		// trick the old four-field version used, built from one string instead of four
+		// controls. wxSplit's third parameter is an escape character, not meaningful for
+		// IPs, so it stays at its default.
+		wxArrayString octets = wxSplit(dynamic_cast<wxTextCtrl *>(FindWindowById(ID_NODE_IP))
+						       ->GetValue()
+						       .Trim(true)
+						       .Trim(false),
+			'.');
+		uint32 ip = 0;
+		if (octets.GetCount() == 4) {
+			ip = StringIPtoUint32(
+				octets3 + "." + octets2 + "." + octets1 + "." + octets0);
+		}
 
 		if (ip == 0) {
-			wxMessageBox(_("Invalid ip to bootstrap"), _("WARNING"), wxOK | wxICON_EXCLAMATION, this);
+			wxMessageBox(
+				_("Invalid ip to bootstrap"), _("WARNING"), wxOK | wxICON_EXCLAMATION, this);
 		} else {
 			unsigned long port;
-			if (dynamic_cast<wxTextCtrl*>(FindWindowById(ID_NODE_PORT))->GetValue().ToULong(&port)) {
+			if (dynamic_cast<wxTextCtrl *>(FindWindowById(ID_NODE_PORT))
+					->GetValue()
+					.ToULong(&port)) {
 				theApp->BootstrapKad(ip, port);
 			} else {
-				wxMessageBox(_("Invalid port to bootstrap"), _("WARNING"), wxOK | wxICON_EXCLAMATION, this);
+				wxMessageBox(_("Invalid port to bootstrap"),
+					_("WARNING"),
+					wxOK | wxICON_EXCLAMATION,
+					this);
 			}
 		}
 	} else {
-		wxMessageBox(_("Please fill all fields required"), _("Message"), wxOK | wxICON_INFORMATION, this);
+		wxMessageBox(
+			_("Please fill all fields required"), _("Message"), wxOK | wxICON_INFORMATION, this);
 	}
 }
 
-
-void CKadDlg::OnBnClickedBootstrapKnown(wxCommandEvent& WXUNUSED(evt))
-{
-	theApp->StartKad();
-}
-
-
-void CKadDlg::OnBnClickedDisconnectKad(wxCommandEvent& WXUNUSED(evt))
+void CKadDlg::OnBnClickedDisconnectKad(wxCommandEvent &WXUNUSED(evt))
 {
-	theApp->StopKad();
+	// Doubles as Connect/Cancel/Disconnect depending on the button's current state (see
+	// UpdateConnectButton()). StopKad() also covers "cancel while connecting"; there is no
+	// separate abort path.
+	if (theApp->IsConnectedKad() || theApp->IsKadRunning()) {
+		theApp->StopKad();
+	} else {
+		theApp->StartKad();
+	}
 }
 
-
-void CKadDlg::OnBnClickedUpdateNodeList(wxCommandEvent& WXUNUSED(evt))
+void CKadDlg::OnBnClickedUpdateNodeList(wxCommandEvent &WXUNUSED(evt))
 {
-	if ( wxMessageBox( wxString(_("Are you sure you want to download a new nodes.dat file?\n")) +
-						_("Doing so will remove your current nodes and restart Kademlia connection.")
-					, _("Continue?"), wxICON_EXCLAMATION | wxYES_NO | wxNO_DEFAULT, this) == wxYES ) {
-		wxString strURL = dynamic_cast<wxTextCtrl*>(FindWindowById(IDC_NODESLISTURL))->GetValue();
+	if (wxMessageBox(
+		    wxString(_("Are you sure you want to download a new nodes.dat file?\n")) +
+			    _("Doing so will remove your current nodes and restart Kademlia connection."),
+		    _("Continue?"),
+		    wxICON_EXCLAMATION | wxYES_NO | wxNO_DEFAULT,
+		    this) == wxYES) {
+		wxString strURL = dynamic_cast<wxTextCtrl *>(FindWindowById(IDC_NODESLISTURL))->GetValue();
 
 		thePrefs::SetKadNodesUrl(strURL);
 		theApp->UpdateNotesDat(strURL);

amule-3.0.1.tar.gz/src/KadDlg.h -> amule-3.1.0.tar.gz/src/KadDlg.h Changed

@@ -26,7 +26,7 @@
 #ifndef KADDLG_H
 #define KADDLG_H
 
-#include <wx/panel.h>		// Needed for wxPanel
+#include <wx/panel.h> // Needed for wxPanel
 
 class COScopeCtrl;
 class wxListEvent;
@@ -34,28 +34,31 @@
 class wxMouseEvent;
 typedef struct UpdateInfo GraphUpdateInfo;
 
-
 class CKadDlg : public wxPanel
 {
 public:
-	CKadDlg(wxWindow* pParent);
-	~CKadDlg() {};
+	CKadDlg(wxWindow *pParent);
+	~CKadDlg() = default;
 
 	void Init();
 	void SetUpdatePeriod(int step);
 	void SetGraphColors();
-	void UpdateGraph(const GraphUpdateInfo& update);
+	void UpdateGraph(const GraphUpdateInfo &update);
 	void UpdateNodeCount(unsigned nodes);
 
+	// Drives the pane's own Connect/Cancel/Disconnect toggle (ID_KADDISCONNECT) from Kad's
+	// current state. Called from CamuleDlg::ShowConnectionState() alongside the ED2K
+	// equivalent, and once from Init() for the initial paint.
+	void UpdateConnectButton();
+
 private:
-	COScopeCtrl* m_kad_scope;
+	COScopeCtrl *m_kad_scope;
 
 	// Event handlers
-	void		OnBnClickedBootstrapClient(wxCommandEvent& evt);
-	void		OnBnClickedBootstrapKnown(wxCommandEvent& evt);
-	void		OnBnClickedDisconnectKad(wxCommandEvent& evt);
-	void		OnBnClickedUpdateNodeList(wxCommandEvent& evt);
-	void		OnFieldsChange(wxCommandEvent& evt);
+	void OnBnClickedBootstrapClient(wxCommandEvent &evt);
+	void OnBnClickedDisconnectKad(wxCommandEvent &evt);
+	void OnBnClickedUpdateNodeList(wxCommandEvent &evt);
+	void OnFieldsChange(wxCommandEvent &evt);
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.0.1.tar.gz/src/KnownFile.cpp -> amule-3.1.0.tar.gz/src/KnownFile.cpp Changed

@@ -25,8 +25,10 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include <algorithm>   // std::remove_if
+#include "KnownFile.h" // Do_not_auto_remove
 
-#include "KnownFile.h"		// Do_not_auto_remove
+#include "CompleteSourcesThrottle.h" // CompleteSourcesNeedRecompute
 
 #include <protocol/kad/Constants.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
@@ -37,39 +39,52 @@
 #include <wx/config.h>
 
 #ifdef CLIENT_GUI
-#include "UpDownClientEC.h"	// Needed for CUpDownClient
+#include "UpDownClientEC.h" // Needed for CUpDownClient
 #else
-#include "updownclient.h"	// Needed for CUpDownClient
+#include "updownclient.h" // Needed for CUpDownClient
 #endif
 
-#include "MemFile.h"		// Needed for CMemFile
-#include "Packet.h"		// Needed for CPacket
-#include "Preferences.h"	// Needed for CPreferences
-#include "KnownFileList.h"	// Needed for CKnownFileList
-#include "amule.h"		// Needed for theApp
-#include "PartFile.h"		// Needed for SavePartFile
-#include "ClientList.h"	// Needed for clientlist (buddy support)
+#include "MemFile.h"       // Needed for CMemFile
+#include "Packet.h"        // Needed for CPacket
+#include "Preferences.h"   // Needed for CPreferences
+#include "KnownFileList.h" // Needed for CKnownFileList
+#include "amule.h"         // Needed for theApp
+#include "PartFile.h"      // Needed for SavePartFile
+#include "ClientList.h"    // Needed for clientlist (buddy support)
 #include "Logger.h"
-#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 "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
+#include "CryptoPP_Inc.h" // Needed for MD4
 
 #include <common/Format.h>
 
+#ifndef CLIENT_GUI
+#include "kademlia/kademlia/Kademlia.h"      // Needed for CKademlia (Kad state)
+#include "kademlia/kademlia/Search.h"        // Needed for CSearch::NOTES
+#include "kademlia/kademlia/SearchManager.h" // Needed for CSearchManager::PrepareLookup
+#include "kademlia/kademlia/Entry.h"         // Needed for Kademlia::CEntry (Kad notes)
+#include "DownloadQueue.h"                   // Needed for downloadqueue lookup
+#include "SearchList.h"                      // Needed for searchlist lookup
+#include "NetworkFunctions.h"                // Needed for Uint32toStringIP (Kad note author)
+#include <tags/FileTags.h>                   // Needed for TAG_FILERATING / TAG_DESCRIPTION
+#include "ThreadTasks.h"                     // Needed for CThreadScheduler and CVerifyLocalDataTask
+#endif
+
 CFileStatistic::CFileStatistic(CKnownFile *parent)
-	: fileParent(parent),
-	  requested(0),
-	  transferred(0),
-	  accepted(0),
-	  alltimerequested(0),
-	  alltimetransferred(0),
-	  alltimeaccepted(0)
-{}
+: fileParent(parent)
+, requested(0)
+, transferred(0)
+, accepted(0)
+, alltimerequested(0)
+, alltimetransferred(0)
+, alltimeaccepted(0)
+{
+}
 
 #ifndef CLIENT_GUI
 
@@ -79,7 +94,7 @@
 	alltimerequested++;
 	theApp->knownfiles->requested++;
 	if (fileParent && fileParent->IsPartFile()) {
-		static_cast<CPartFile*>(fileParent)->MarkStatsDirty();
+		static_cast<CPartFile *>(fileParent)->MarkStatsDirty();
 	}
 	if (fileParent) {
 		fileParent->MarkECChanged();
@@ -93,7 +108,7 @@
 	alltimeaccepted++;
 	theApp->knownfiles->accepted++;
 	if (fileParent && fileParent->IsPartFile()) {
-		static_cast<CPartFile*>(fileParent)->MarkStatsDirty();
+		static_cast<CPartFile *>(fileParent)->MarkStatsDirty();
 	}
 	if (fileParent) {
 		fileParent->MarkECChanged();
@@ -107,9 +122,12 @@
 	alltimetransferred += bytes;
 	theApp->knownfiles->transferred += bytes;
 	if (fileParent && fileParent->IsPartFile()) {
-		static_cast<CPartFile*>(fileParent)->MarkStatsDirty();
+		static_cast<CPartFile *>(fileParent)->MarkStatsDirty();
 	}
 	if (fileParent) {
+		// Upload-activity stamp (#466), the upload-side analogue of m_lastDateChanged. Here
+		// because this is the only point where sent bytes are attributed to the file.
+		fileParent->SetLastUpload(time(nullptr));
 		fileParent->MarkECChanged();
 	}
 	theApp->sharedfiles->UpdateItem(fileParent);
@@ -117,53 +135,88 @@
 
 #endif // CLIENT_GUI
 
-
 /* Static storage for the process-wide EC change generation counter.
  * See `CKnownFile::MarkECChanged()` doc in KnownFile.h. */
-std::atomic<uint64> CKnownFile::s_globalEcGen{0};
+std::atomic<uint64> CKnownFile::s_globalEcGen{ 0 };
 
-void CKnownFile::MarkECChanged()
+uint32 CKnownFile::GetMetaDataVer() const
 {
-	// Single atomic pre-increment + atomic store. Generation values are
-	// strictly ascending across all files and all threads; readers
-	// (`Get_EC_Response_GetUpdate`) compare against the highest gen they
-	// have already sent and ignore lesser ones.
-	m_ecGen.store(s_globalEcGen.fetch_add(1, std::memory_order_relaxed) + 1,
-		std::memory_order_relaxed);
+	// Derived from tag presence, with no separate m_uMetaDataVer field.
+	//
+	// ANY FT_MEDIA_* tag counts, not FT_MEDIA_LENGTH alone. The length-only test rested on a
+	// false premise -- that a successful probe always yields a duration. MediaProbe succeeds on
+	// a duration OR a codec, so a file ffprobe can identify but not time gets a codec and no
+	// length. That left the four consumers of this predicate disagreeing: the ed2k publisher
+	// checks each tag individually and advertised the codec to every peer, while Kad, EC and
+	// the file-detail dialog reported no metadata at all. It also drives the "already probed"
+	// gate in CSharedFileList, so those files were re-probed on every startup, forever.
+	//
+	// One pass over m_taglist rather than six Get*TagValue calls, each scanning it end to end:
+	// this runs per file per EC update, and the worst case is the common one -- a non-media
+	// file matches nothing.
+	for (const CTag &tag : m_taglist) {
+		switch (tag.GetNameID()) {
+		case FT_MEDIA_LENGTH:
+		case FT_MEDIA_BITRATE:
+			if (tag.IsInt() && tag.GetInt() > 0) {
+				return 1;
+			}
+			break;
+		case FT_MEDIA_CODEC:
+		case FT_MEDIA_ARTIST:
+		case FT_MEDIA_ALBUM:
+		case FT_MEDIA_TITLE:
+			if (tag.IsStr() && !tag.GetStr().IsEmpty()) {
+				return 1;
+			}
+			break;
+		default:
+			break;
+		}
+	}
+	return 0;
 }
 
+void CKnownFile::MarkECChanged()
+{
+	// Single atomic pre-increment + atomic store. Generation values ascend strictly across all
+	// files and threads; readers (Get_EC_Response_GetUpdate) compare against the highest gen
+	// they have already sent and ignore lesser ones.
+	m_ecGen.store(s_globalEcGen.fetch_add(1, std::memory_order_relaxed) + 1, std::memory_order_relaxed);
+}
 
 /* Abstract File (base class)*/
 
 CAbstractFile::CAbstractFile()
-	: m_iRating(0),
-	  m_hasComment(false),
-	  m_iUserRating(0),
-	  m_nFileSize(0)
-{}
-
-
-CAbstractFile::CAbstractFile(const CAbstractFile& other)
-	: m_abyFileHash(other.m_abyFileHash),
-	  m_strComment(other.m_strComment),
-	  m_iRating(other.m_iRating),
-	  m_hasComment(other.m_hasComment),
-	  m_iUserRating(other.m_iUserRating),
-	  m_taglist(other.m_taglist),
-	  m_kadNotes(),
-	  m_nFileSize(other.m_nFileSize),
-	  m_fileName(other.m_fileName)
+: m_iRating(0)
+, m_hasComment(false)
+, m_iUserRating(0)
+, m_kadCommentSearchRunning(false)
+, m_nFileSize(0)
 {
-/* // TODO: Currently it's not safe to duplicate the entries, but isn't needed either.
-	CKadEntryPtrList::const_iterator it = other.m_kadNotes.begin();
-	for (; it != other.m_kadNotes.end(); ++it) {
-		m_kadNotes.push_back(new Kademlia::CEntry(**it));
-	}
-*/
 }
 
+CAbstractFile::CAbstractFile(const CAbstractFile &other)
+: m_abyFileHash(other.m_abyFileHash)
+, m_strComment(other.m_strComment)
+, m_iRating(other.m_iRating)
+, m_hasComment(other.m_hasComment)
+, m_iUserRating(other.m_iUserRating)
+, m_taglist(other.m_taglist)
+, m_kadNotes()
+, m_kadCommentSearchRunning(false)
+, m_nFileSize(other.m_nFileSize)
+, m_fileName(other.m_fileName)
+{
+	/* // TODO: Currently it's not safe to duplicate the entries, but isn't needed either.
+		CKadEntryPtrList::const_iterator it = other.m_kadNotes.begin();
+		for (; it != other.m_kadNotes.end(); ++it) {
+			m_kadNotes.push_back(new Kademlia::CEntry(**it));
+		}
+	*/
+}
 
-void CAbstractFile::SetFileName(const CPath& fileName)
+void CAbstractFile::SetFileName(const CPath &fileName)
 {
 	m_fileName = fileName;
 }
@@ -171,7 +224,7 @@
 uint32 CAbstractFile::GetIntTagValue(uint8 tagname) const
 {
 	ArrayOfCTag::const_iterator it = m_taglist.begin();
-	for (; it != m_taglist.end(); ++it){
+	for (; it != m_taglist.end(); ++it) {
 		if (((*it).GetNameID() == tagname) && (*it).IsInt()) {
 			return (*it).GetInt();
 		}
@@ -179,11 +232,11 @@
 	return 0;
 }
 
-bool CAbstractFile::GetIntTagValue(uint8 tagname, uint32& ruValue) const
+bool CAbstractFile::GetIntTagValue(uint8 tagname, uint32 &ruValue) const
 {
 	ArrayOfCTag::const_iterator it = m_taglist.begin();
-	for (; it != m_taglist.end(); ++it){
-		if (((*it).GetNameID() == tagname) && (*it).IsInt()){
+	for (; it != m_taglist.end(); ++it) {
+		if (((*it).GetNameID() == tagname) && (*it).IsInt()) {
 			ruValue = (*it).GetInt();
 			return true;
 		}
@@ -191,10 +244,10 @@
 	return false;
 }
 
-uint32 CAbstractFile::GetIntTagValue(const wxString& tagname) const
+uint32 CAbstractFile::GetIntTagValue(const wxString &tagname) const
 {
 	ArrayOfCTag::const_iterator it = m_taglist.begin();
-	for (; it != m_taglist.end(); ++it){
+	for (; it != m_taglist.end(); ++it) {
 		if ((*it).IsInt() && ((*it).GetName() == tagname)) {
 			return (*it).GetInt();
 		}
@@ -202,10 +255,10 @@
 	return 0;
 }
 
-const wxString& CAbstractFile::GetStrTagValue(uint8 tagname) const
+const wxString &CAbstractFile::GetStrTagValue(uint8 tagname) const
 {
 	ArrayOfCTag::const_iterator it = m_taglist.begin();
-	for (; it != m_taglist.end(); ++it){
+	for (; it != m_taglist.end(); ++it) {
 		if ((*it).GetNameID() == tagname && (*it).IsStr()) {
 			return (*it).GetStr();
 		}
@@ -213,10 +266,10 @@
 	return EmptyString;
 }
 
-const wxString& CAbstractFile::GetStrTagValue(const wxString& tagname) const
+const wxString &CAbstractFile::GetStrTagValue(const wxString &tagname) const
 {
 	ArrayOfCTag::const_iterator it = m_taglist.begin();
-	for (; it != m_taglist.end(); ++it){
+	for (; it != m_taglist.end(); ++it) {
 		if ((*it).IsStr() && ((*it).GetName() == tagname)) {
 			return (*it).GetStr();
 		}
@@ -227,7 +280,7 @@
 const CTag *CAbstractFile::GetTag(uint8 tagname, uint8 tagtype) const
 {
 	ArrayOfCTag::const_iterator it = m_taglist.begin();
-	for (; it != m_taglist.end(); ++it){
+	for (; it != m_taglist.end(); ++it) {
 		if ((*it).GetNameID() == tagname && (*it).GetType() == tagtype) {
 			return &(*it);
 		}
@@ -235,10 +288,10 @@
 	return NULL;
 }
 
-const CTag *CAbstractFile::GetTag(const wxString& tagname, uint8 tagtype) const
+const CTag *CAbstractFile::GetTag(const wxString &tagname, uint8 tagtype) const
 {
 	ArrayOfCTag::const_iterator it = m_taglist.begin();
-	for (; it != m_taglist.end(); ++it){
+	for (; it != m_taglist.end(); ++it) {
 		if ((*it).GetType() == tagtype && (*it).GetName() == tagname) {
 			return &(*it);
 		}
@@ -249,7 +302,7 @@
 const CTag *CAbstractFile::GetTag(uint8 tagname) const
 {
 	ArrayOfCTag::const_iterator it = m_taglist.begin();
-	for (; it != m_taglist.end(); ++it){
+	for (; it != m_taglist.end(); ++it) {
 		if ((*it).GetNameID() == tagname) {
 			return &(*it);
 		}
@@ -257,10 +310,10 @@
 	return NULL;
 }
 
-const CTag *CAbstractFile::GetTag(const wxString& tagname) const
+const CTag *CAbstractFile::GetTag(const wxString &tagname) const
 {
 	ArrayOfCTag::const_iterator it = m_taglist.begin();
-	for (; it != m_taglist.end(); ++it){
+	for (; it != m_taglist.end(); ++it) {
 		if ((*it).GetName() == tagname) {
 			return &(*it);
 		}
@@ -272,13 +325,10 @@
 {
 	ArrayOfCTag::iterator it = m_taglist.begin();
 	for (; it != m_taglist.end(); ++it) {
-		if ( ( ((*it).GetNameID() != 0 &&
-			(*it).GetNameID() == rTag.GetNameID()) ||
-		       (!(*it).GetName().IsEmpty() &&
-			!rTag.GetName().IsEmpty() &&
-			(*it).GetName() == rTag.GetName()) ) &&
-		     (*it).GetType() == rTag.GetType())
-		{
+		if ((((*it).GetNameID() != 0 && (*it).GetNameID() == rTag.GetNameID()) ||
+			    (!(*it).GetName().IsEmpty() && !rTag.GetName().IsEmpty() &&
+				    (*it).GetName() == rTag.GetName())) &&
+			(*it).GetType() == rTag.GetType()) {
 			it = m_taglist.erase(it);
 			m_taglist.insert(it, rTag);
 			return;
@@ -287,48 +337,91 @@
 	m_taglist.push_back(rTag);
 }
 
+bool CAbstractFile::RemoveTag(uint8 tagname)
+{
+	// Matches on the numeric id alone, unlike AddTagUnique's (id, type) pair: the caller wants
+	// the field gone whatever width or encoding it was stored with, and a media tag inherited
+	// from a search result can arrive as a narrower integer type than a local probe writes.
+	//
+	// Erases EVERY match, not just the first. AddTagUnique replaces only when the type matches
+	// too, so two tags with one id and different types can legitimately coexist.
+	const size_t before = m_taglist.size();
+	m_taglist.erase(std::remove_if(m_taglist.begin(),
+				m_taglist.end(),
+				tagname(const CTag &tag) { return tag.GetNameID() == tagname; }),
+		m_taglist.end());
+	return m_taglist.size() != before;
+}
+
 #ifndef CLIENT_GUI
 void CAbstractFile::AddNote(Kademlia::CEntry *pEntry)
 {
 	CKadEntryPtrList::iterator it = m_kadNotes.begin();
 	for (; it != m_kadNotes.end(); ++it) {
-		Kademlia::CEntry* entry = *it;
-		if(entry->m_uIP == pEntry->m_uIP || entry->m_uSourceID == pEntry->m_uSourceID) {
+		Kademlia::CEntry *entry = *it;
+		if (entry->m_uIP == pEntry->m_uIP || entry->m_uSourceID == pEntry->m_uSourceID) {
 			delete pEntry;
 			return;
 		}
 	}
 	m_kadNotes.push_front(pEntry);
 }
+
+void CAbstractFile::GetKadNotesComments(FileRatingList &list) const
+{
+	// One entry per responding Kad node (stored by CSearch::ProcessResultNotes).
+	for (Kademlia::CEntry *entry : getNotes()) {
+		uint64_t rating = 0;
+		entry->GetIntTagValue(TAG_FILERATING, rating);
+		wxString comment = entry->GetStrTagValue(TAG_DESCRIPTION);
+		if (comment.IsEmpty() && rating == 0) {
+			continue;
+		}
+		wxString userName = entry->m_uIP ? Uint32toStringIP(entry->m_uIP) : wxString(_("Kad user"));
+		list.emplace_back(userName, entry->GetCommonFileName(), (sint16)rating, comment);
+	}
+}
+
+void CAbstractFile::GetRatingAndComments(FileRatingList &list) const
+{
+	// Base version: just the on-demand Kad notes, which is exactly what a search result
+	// carries. CPartFile overrides to prepend its connected-source comments.
+	list.clear();
+	GetKadNotesComments(list);
+}
 #else
-void CAbstractFile::AddNote(Kademlia::CEntry *)
+void CAbstractFile::AddNote(Kademlia::CEntry *) {}
+
+void CAbstractFile::GetKadNotesComments(FileRatingList &) const {}
+
+void CAbstractFile::GetRatingAndComments(FileRatingList &list) const
 {
+	// amulegui receives ratings/comments prebuilt over EC, cached in m_FileRatingList by the
+	// remote containers. One implementation serves downloads, shared files and search results.
+	list = m_FileRatingList;
 }
 #endif
 
-
 /* Known File */
 
 CKnownFile::CKnownFile()
-	: statistic(this)
+: statistic(this)
 {
 	Init();
 }
 
 CKnownFile::CKnownFile(uint32 ecid)
-	: CECID(ecid),
-	  statistic(this)
+: CECID(ecid)
+, statistic(this)
 {
 	Init();
 }
 
-
-//#warning Experimental: Construct a CKnownFile from a CSearchFile
+// #warning Experimental: Construct a CKnownFile from a CSearchFile
 CKnownFile::CKnownFile(const CSearchFile &searchFile)
-:
-	// This will copy the file hash
-	CAbstractFile(static_cast<const CAbstractFile &>(searchFile)),
-	statistic(this)
+: // This will copy the file hash
+	CAbstractFile(static_cast<const CAbstractFile &>(searchFile))
+, statistic(this)
 {
 	Init();
 
@@ -339,15 +432,12 @@
 	SetFileSize(searchFile.GetFileSize());
 }
 
-
 void CKnownFile::Init()
 {
-	// Stamp the EC generation immediately so any newly-constructed file
-	// (search-result import, partfile creation, hashed-and-added shared
-	// file) is naturally `> 0` from every existing connection's
-	// `m_lastEcGenSeen` perspective. Without this, the first INC_UPDATE
-	// cycle within the 60 s backstop window after a file is added would
-	// skip it because its default-zero gen looked unchanged.
+	// Stamp the EC generation immediately so a newly-constructed file is `> 0` from every
+	// existing connection's m_lastEcGenSeen. Without it the first INC_UPDATE cycle inside the
+	// 60 s backstop window after a file is added would skip it, its default-zero gen looking
+	// unchanged.
 	MarkECChanged();
 
 	m_showSources = false;
@@ -366,16 +456,15 @@
 	m_lastPublishTimeKadNotes = 0;
 	m_lastBuddyIP = 0;
 	m_lastDateChanged = 0;
-	// Sentinel "unknown": LoadFromFile fills this in from FT_LASTSEEN
-	// when present, else falls back to the file's own mtime
-	// (m_lastDateChanged) for migration -- so a known.met that
-	// predates this tag gets a useful aging signal on first save
-	// after upgrade rather than every record looking "fresh now"
-	// for the next TTL window. Fresh hashes (CHashingTask) bump
-	// this in CKnownFileList::Append's "newly added" branch.
+	m_lastUploadDatetime = 0;
+	m_dateShared = 0;
+	// Sentinel "unknown": LoadFromFile fills this from FT_LASTSEEN when present, else from the
+	// file's own mtime -- so a known.met predating the tag gets a useful aging signal on the
+	// first save after upgrade rather than every record looking "fresh now" for a TTL window.
+	// Fresh hashes bump this in CKnownFileList::Append.
 	m_lastSeen = 0;
 	m_bAutoUpPriority = thePrefs::GetNewAutoUp();
-	m_iUpPriority = ( m_bAutoUpPriority ) ? PR_HIGH : PR_NORMAL;
+	m_iUpPriority = (m_bAutoUpPriority) ? PR_HIGH : PR_NORMAL;
 	m_hashingProgress = 0;
 
 #ifndef CLIENT_GUI
@@ -383,7 +472,6 @@
 #endif
 }
 
-
 void CKnownFile::SetFileSize(uint64 nFileSize)
 {
 	CAbstractFile::SetFileSize(nFileSize);
@@ -391,54 +479,9 @@
 	m_pAICHHashSet->SetFileSize(nFileSize);
 #endif
 
-	// Examples of parthashs, hashsets and filehashs for different filesizes
-	// according the ed2k protocol
-	//----------------------------------------------------------------------
-	//
-	//File size: 3 bytes
-	//File hash: 2D55E87D0E21F49B9AD25F98531F3724
-	//Nr. hashs: 0
-	//
-	//
-	//File size: 1*PARTSIZE
-	//File hash: A72CA8DF7F07154E217C236C89C17619
-	//Nr. hashs: 2
-	//Hash  0: 4891ED2E5C9C49F442145A3A5F608299
-	//Hash  1: 31D6CFE0D16AE931B73C59D7E0C089C0	*special part hash*
-	//
-	//
-	//File size: 1*PARTSIZE + 1 byte
-	//File hash: 2F620AE9D462CBB6A59FE8401D2B3D23
-	//Nr. hashs: 2
-	//Hash  0: 121795F0BEDE02DDC7C5426D0995F53F
-	//Hash  1: C329E527945B8FE75B3C5E8826755747
-	//
-	//
-	//File size: 2*PARTSIZE
-	//File hash: A54C5E562D5E03CA7D77961EB9A745A4
-	//Nr. hashs: 3
-	//Hash  0: B3F5CE2A06BF403BFB9BFFF68BDDC4D9
-	//Hash  1: 509AA30C9EA8FC136B1159DF2F35B8A9
-	//Hash  2: 31D6CFE0D16AE931B73C59D7E0C089C0	*special part hash*
-	//
-	//
-	//File size: 3*PARTSIZE
-	//File hash: 5E249B96F9A46A18FC2489B005BF2667
-	//Nr. hashs: 4
-	//Hash  0: 5319896A2ECAD43BF17E2E3575278E72
-	//Hash  1: D86EF157D5E49C5ED502EDC15BB5F82B
-	//Hash  2: 10F2D5B1FCB95C0840519C58D708480F
-	//Hash  3: 31D6CFE0D16AE931B73C59D7E0C089C0	*special part hash*
-	//
-	//
-	//File size: 3*PARTSIZE + 1 byte
-	//File hash: 797ED552F34380CAFF8C958207E40355
-	//Nr. hashs: 4
-	//Hash  0: FC7FD02CCD6987DCF1421F4C0AF94FB8
-	//Hash  1: 2FE466AF8A7C06DA3365317B75A5ACFE
-	//Hash  2: 873D3BF52629F7C1527C6E8E473C1C30
-	//Hash  3: BCE50BEE7877BB07BB6FDA56BFE142FB
-	//
+	// Part hashes per the ed2k protocol. The boundary rule: a file whose size is an exact
+	// multiple of PARTSIZE carries one extra part hash, and that last one is always the MD4 of
+	// nothing, 31D6CFE0D16AE931B73C59D7E0C089C0 -- the *special part hash*.
 
 	// File size       Data parts      ED2K parts      ED2K part hashs
 	// ---------------------------------------------------------------
@@ -448,8 +491,8 @@
 	// PARTSIZE*2      2               3(!)            3(!)
 	// PARTSIZE*2+1    3               3               3
 
-	if (nFileSize == 0){
-		//wxFAIL; // Kry - Why commented out by lemonfan? it can never be 0
+	if (nFileSize == 0) {
+		// wxFAIL; // Kry - Why commented out by lemonfan? it can never be 0
 		m_iPartCount = 0;
 		m_iED2KPartCount = 0;
 		m_iED2KPartHashCount = 0;
@@ -477,31 +520,30 @@
 	}
 }
 
-
-void CKnownFile::AddUploadingClient(CUpDownClient* client)
+void CKnownFile::AddUploadingClient(CUpDownClient *client)
 {
 	m_ClientUploadList.insert(CCLIENTREF(client, "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.
-		}
+	case US_UPLOADING:
+	case US_ONUPLOADQUEUE:
+		type = AVAILABLE_SOURCE;
+		break;
+	default: {
+		// Any other state is UNAVAILABLE_SOURCE by default.
+	}
 	}
 
-	Notify_SharedCtrlAddClient(this, CCLIENTREF(client, "CKnownFile::AddUploadingClient Notify_SharedCtrlAddClient"), type);
+	Notify_SharedCtrlAddClient(
+		this, CCLIENTREF(client, "CKnownFile::AddUploadingClient Notify_SharedCtrlAddClient"), type);
 
 	UpdateAutoUpPriority();
-	// GetQueuedCount() = m_ClientUploadList.size() — exported via EC.
+	// GetQueuedCount() = m_ClientUploadList.size() -- exported via EC.
 	MarkECChanged();
 }
 
-
-void CKnownFile::RemoveUploadingClient(CUpDownClient* client)
+void CKnownFile::RemoveUploadingClient(CUpDownClient *client)
 {
 	if (m_ClientUploadList.erase(CCLIENTREF(client, ""))) {
 		Notify_SharedCtrlRemoveClient(client->ECID(), this);
@@ -510,12 +552,41 @@
 	}
 }
 
+#ifndef CLIENT_GUI
+void CKnownFile::VerifyLocalData() const
+{
+	CThreadScheduler::AddTask(new CVerifyLocalDataTask(GetFileHash()));
+}
+
+// Live upload activity summarised from m_ClientUploadList (issue #466). Core-only: the list is
+// populated on the daemon and amulegui receives the results over EC. The list holds uploading and
+// queued clients alike, so queued ones (datarate 0, state != US_UPLOADING) contribute nothing.
+uint32 CKnownFile::GetUploadDatarate() const
+{
+	uint32 total = 0;
+	for (const CClientRef &ref : m_ClientUploadList) {
+		total += ref.GetUploadDatarate();
+	}
+	return total;
+}
+
+uint16 CKnownFile::GetTransferringClientCount() const
+{
+	uint16 count = 0;
+	for (const CClientRef &ref : m_ClientUploadList) {
+		if (ref.GetUploadState() == US_UPLOADING) {
+			++count;
+		}
+	}
+	return count;
+}
+#endif // ! CLIENT_GUI
 
 #ifdef CLIENT_GUI
 
 CKnownFile::CKnownFile(const CEC_SharedFile_Tag *tag)
-	: CECID(tag->ID()),
-	  statistic(this)
+: CECID(tag->ID())
+, statistic(this)
 {
 	Init();
 
@@ -523,57 +594,59 @@
 	SetFileSize(tag->SizeFull());
 	m_AvailPartFrequency.insert(m_AvailPartFrequency.end(), m_iPartCount, 0);
 	m_queuedCount = 0;
+	m_uploadDatarateEC = 0;
+	m_transferringClientCountEC = 0;
 }
 
-CKnownFile::~CKnownFile()
-{}
-
-void CKnownFile::UpdateAutoUpPriority()
-{}
+CKnownFile::~CKnownFile() {}
 
+void CKnownFile::UpdateAutoUpPriority() {}
 
 #else // ! CLIENT_GUI
 
 CKnownFile::~CKnownFile()
 {
 	SourceSet::iterator it = m_ClientUploadList.begin();
-	for ( ; it != m_ClientUploadList.end(); ++it ) {
+	for (; it != m_ClientUploadList.end(); ++it) {
 		it->ClearUploadFileID();
 	}
 
 	delete m_pAICHHashSet;
 }
 
-
-void CKnownFile::SetFilePath(const CPath& filePath)
+void CKnownFile::SetFilePath(const CPath &filePath)
 {
+	// Only on a real change: MarkECChanged() below pushes the file into the next INC_UPDATE,
+	// and the shared-files walk re-stamps every known file on every reload (issue #1028).
+	if (m_filePath == filePath) {
+		return;
+	}
 	m_filePath = filePath;
 	// EC exports the path printable for non-partfiles (EC_TAG_KNOWNFILE_FILENAME).
 	MarkECChanged();
 }
 
-
 // needed for memfiles. its probably better to switch everything to CFile...
-bool CKnownFile::LoadHashsetFromFile(const CFileDataIO* file, bool checkhash)
+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){
+	for (uint16 i = 0; i < parts; ++i) {
 		CMD4Hash cur_hash = file->ReadHash();
 		m_hashlist.push_back(cur_hash);
 	}
 
 	// SLUGFILLER: SafeHash - always check for valid m_hashlist
-	if (!checkhash){
+	if (!checkhash) {
 		m_abyFileHash = checkid;
-		if (parts <= 1) {	// nothing to check
+		if (parts <= 1) { // nothing to check
 			return true;
 		}
 	} else {
-		if ( m_abyFileHash != checkid ) {
-			return false;	// wrong file?
+		if (m_abyFileHash != checkid) {
+			return false; // wrong file?
 		} else {
 			if (parts != GetED2KPartHashCount()) {
 				return false;
@@ -582,15 +655,11 @@
 	}
 	// SLUGFILLER: SafeHash
 
-	// trust noone ;-)
-	// lol, useless comment but made me lmao
-	// wtf you guys are weird.
-
 	if (!m_hashlist.empty()) {
 		CreateHashFromHashlist(m_hashlist, &checkid);
 	}
 
-	if ( m_abyFileHash == checkid ) {
+	if (m_abyFileHash == checkid) {
 		return true;
 	} else {
 		m_hashlist.clear();
@@ -598,151 +667,149 @@
 	}
 }
 
-
-bool CKnownFile::LoadTagsFromFile(const CFileDataIO* file)
+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()){
-			case FT_FILENAME:
-				if (GetFileName().IsOk()) {
-					// Unlike eMule, we actually prefer the second
-					// filename tag, since we use it to specify the
-					// 'universial' filename (see CPath::ToUniv).
-					CPath path = CPath::FromUniv(newtag.GetStr());
-
-					// May be invalid, if from older versions where
-					// unicoded filenames be saved as empty-strings.
-					if (path.IsOk()) {
-						SetFileName(path);
-					}
-				} else {
-					SetFileName(CPath(newtag.GetStr()));
+		switch (newtag.GetNameID()) {
+		case FT_FILENAME:
+			if (GetFileName().IsOk()) {
+				// Unlike eMule, we prefer the second filename tag: it holds the
+				// 'universal' filename (see CPath::ToUniv).
+				CPath path = CPath::FromUniv(newtag.GetStr());
+
+				// May be invalid, if from older versions where
+				// unicoded filenames be saved as empty-strings.
+				if (path.IsOk()) {
+					SetFileName(path);
 				}
-				break;
-
-			case FT_FILESIZE:
-				SetFileSize(newtag.GetInt());
-				m_AvailPartFrequency.clear();
-				m_AvailPartFrequency.insert(
-					m_AvailPartFrequency.begin(),
-					GetPartCount(), 0);
-				break;
+			} else {
+				SetFileName(CPath(newtag.GetStr()));
+			}
+			break;
 
-			case FT_ATTRANSFERRED:
-				statistic.SetAllTimeTransferred(statistic.GetAllTimeTransferred() + newtag.GetInt());
-				break;
+		case FT_FILESIZE:
+			SetFileSize(newtag.GetInt());
+			m_AvailPartFrequency.clear();
+			m_AvailPartFrequency.insert(m_AvailPartFrequency.begin(), GetPartCount(), 0);
+			break;
 
-			case FT_ATTRANSFERREDHI:
-				statistic.SetAllTimeTransferred(statistic.GetAllTimeTransferred() + (((uint64)newtag.GetInt()) << 32));
-				break;
+		case FT_ATTRANSFERRED:
+			statistic.SetAllTimeTransferred(statistic.GetAllTimeTransferred() + newtag.GetInt());
+			break;
 
-			case FT_ATREQUESTED:
-				statistic.SetAllTimeRequests(newtag.GetInt());
-				break;
+		case FT_ATTRANSFERREDHI:
+			statistic.SetAllTimeTransferred(
+				statistic.GetAllTimeTransferred() + (((uint64)newtag.GetInt()) << 32));
+			break;
 
-			case FT_ATACCEPTED:
-				statistic.SetAllTimeAccepts(newtag.GetInt());
-				break;
+		case FT_ATREQUESTED:
+			statistic.SetAllTimeRequests(newtag.GetInt());
+			break;
 
-			case FT_ULPRIORITY:
-				m_iUpPriority = newtag.GetInt();
-				if( m_iUpPriority == PR_AUTO ){
-					m_iUpPriority = PR_HIGH;
-					m_bAutoUpPriority = true;
-				} else {
-					if (	m_iUpPriority != PR_VERY_LOW &&
-						m_iUpPriority != PR_LOW &&
-						m_iUpPriority != PR_NORMAL &&
-						m_iUpPriority != PR_HIGH &&
-						m_iUpPriority != PR_VERYHIGH &&
-						m_iUpPriority != PR_POWERSHARE) {
-						m_iUpPriority = PR_NORMAL;
-					}
+		case FT_ATACCEPTED:
+			statistic.SetAllTimeAccepts(newtag.GetInt());
+			break;
 
-					m_bAutoUpPriority = false;
+		case FT_ULPRIORITY:
+			m_iUpPriority = newtag.GetInt();
+			if (m_iUpPriority == PR_AUTO) {
+				m_iUpPriority = PR_HIGH;
+				m_bAutoUpPriority = true;
+			} else {
+				if (m_iUpPriority != PR_VERY_LOW && m_iUpPriority != PR_LOW &&
+					m_iUpPriority != PR_NORMAL && m_iUpPriority != PR_HIGH &&
+					m_iUpPriority != PR_VERYHIGH && m_iUpPriority != PR_POWERSHARE) {
+					m_iUpPriority = PR_NORMAL;
 				}
-				break;
 
-			case FT_PERMISSIONS:
-			case FT_KADLASTPUBLISHKEY:
-			case FT_PARTFILENAME:
-				// Old tags, not used anymore. Just purge them.
-				break;
+				m_bAutoUpPriority = false;
+			}
+			break;
 
-			case FT_AICH_HASH: {
-				CAICHHash hash;
-				bool hashSizeOk =
-					hash.DecodeBase32(newtag.GetStr()) == CAICHHash::GetHashSize();
-				wxASSERT(hashSizeOk);
-				if (hashSizeOk) {
-					m_pAICHHashSet->SetMasterHash(hash, AICH_HASHSETCOMPLETE);
-					// EC exports GetAICHMasterHash() as a wxString tag.
-					MarkECChanged();
-				}
-				break;
+		case FT_PERMISSIONS:
+		case FT_KADLASTPUBLISHKEY:
+		case FT_PARTFILENAME:
+			// Old tags, not used anymore. Just purge them.
+			break;
+
+		case FT_AICH_HASH: {
+			CAICHHash hash;
+			bool hashSizeOk = hash.DecodeBase32(newtag.GetStr()) == CAICHHash::GetHashSize();
+			wxASSERT(hashSizeOk);
+			if (hashSizeOk) {
+				m_pAICHHashSet->SetMasterHash(hash, AICH_HASHSETCOMPLETE);
+				// EC exports GetAICHMasterHash() as a wxString tag.
+				MarkECChanged();
+			}
+			break;
+		}
+
+		case FT_KADLASTPUBLISHSRC:
+			SetLastPublishTimeKadSrc(newtag.GetInt(), 0);
+
+			if (GetLastPublishTimeKadSrc() > (uint32)time(NULL) + KADEMLIAREPUBLISHTIMES) {
+				// There may be a possibility of an older client that saved a random number
+				// here.. This will check for that..
+				SetLastPublishTimeKadSrc(0, 0);
 			}
+			break;
 
-			case FT_KADLASTPUBLISHSRC:
-				SetLastPublishTimeKadSrc( newtag.GetInt(), 0 );
+		case FT_KADLASTPUBLISHNOTES:
+			SetLastPublishTimeKadNotes(newtag.GetInt());
+			break;
 
-				if(GetLastPublishTimeKadSrc() > (uint32)time(NULL)+KADEMLIAREPUBLISHTIMES) {
-					//There may be a possibility of an older client that saved a random number here.. This will check for that..
-					SetLastPublishTimeKadSrc(0, 0);
-				}
-				break;
+		case FT_LASTSEEN:
+			m_lastSeen = newtag.GetInt();
+			break;
 
-			case FT_KADLASTPUBLISHNOTES:
-				SetLastPublishTimeKadNotes( newtag.GetInt() );
-				break;
+		case FT_LASTUPLOADED:
+			// Live upload-activity timestamp (issue #466). Absent on a
+			// known.met that predates the feature -> stays 0 (unknown).
+			m_lastUploadDatetime = static_cast<time_t>(newtag.GetInt());
+			break;
 
-			case FT_LASTSEEN:
-				m_lastSeen = newtag.GetInt();
-				break;
+		case FT_SHAREDSINCE:
+			m_dateShared = static_cast<time_t>(newtag.GetInt());
+			break;
 
-			default:
-				// Store them here and write them back on saving.
-				m_taglist.push_back(newtag);
+		default:
+			// Store them here and write them back on saving.
+			m_taglist.push_back(newtag);
 		}
 	}
 
 	return true;
 }
 
-
-bool CKnownFile::LoadDateFromFile(const CFileDataIO* file)
+bool CKnownFile::LoadDateFromFile(const CFileDataIO *file)
 {
 	m_lastDateChanged = file->ReadUInt32();
 
 	return true;
 }
 
-
-bool CKnownFile::LoadFromFile(const CFileDataIO* file)
+bool CKnownFile::LoadFromFile(const CFileDataIO *file)
 {
 	// SLUGFILLER: SafeHash - load first, verify later
 	bool ret1 = LoadDateFromFile(file);
-	bool ret2 = LoadHashsetFromFile(file,false);
+	bool ret2 = LoadHashsetFromFile(file, false);
 	bool ret3 = LoadTagsFromFile(file);
 	UpdatePartsInfo();
-	// Migration: a known.met written before FT_LASTSEEN was added
-	// leaves m_lastSeen at its Init() sentinel of 0. Fall back to
-	// the file's stored mtime as a proxy for "last known to be on
-	// disk at this name/date/size" -- accurate enough to drive the
-	// TTL prune on first save after upgrade rather than waiting a
-	// TTL window for all records to look "fresh now".
+	// Migration: a known.met written before FT_LASTSEEN leaves m_lastSeen at Init()'s sentinel
+	// of 0. Fall back to the file's stored mtime, accurate enough to drive the TTL prune on the
+	// first save after upgrade.
 	if (m_lastSeen == 0) {
-		m_lastSeen = (uint32) m_lastDateChanged;
+		m_lastSeen = (uint32)m_lastDateChanged;
 	}
 	// Final hash-count verification, needs to be done after the tags are loaded.
-	return ret1 && ret2 && ret3 && GetED2KPartHashCount()==GetHashCount();
+	return ret1 && ret2 && ret3 && GetED2KPartHashCount() == GetHashCount();
 	// SLUGFILLER: SafeHash
 }
 
-
-bool CKnownFile::WriteToFile(CFileDataIO* file)
+bool CKnownFile::WriteToFile(CFileDataIO *file)
 {
 	wxCHECK(!IsPartFile(), false);
 
@@ -757,22 +824,17 @@
 	for (int i = 0; i < parts; ++i)
 		file->WriteHash(m_hashlisti);
 
-	//tags
-	const int iFixedTags = 9;	// +1 for FT_LASTSEEN
+	// tags
+	const int iFixedTags = 9; // +1 for FT_LASTSEEN
 	uint32 tagcount = iFixedTags;
 	if (HasProperAICHHashSet()) {
 		tagcount++;
 	}
-	// Float meta tags are currently not written. All older eMule versions < 0.28a have
-	// a bug in the meta tag reading+writing code. To achieve maximum backward
-	// compatibility for met files with older eMule versions we just don't write float
-	// tags. This is OK, because we (eMule) do not use float tags. The only float tags
-	// we may have to handle is the '# Sent' tag from the Hybrid, which is pretty
-	// useless but may be received from us via the servers.
-	//
-	// The code for writing the float tags SHOULD BE ENABLED in SOME MONTHS (after most
-	// people are using the newer eMule versions which do not write broken float tags).
-	for (size_t j = 0; j < m_taglist.size(); ++j){
+	// Float meta tags are not written: every eMule before 0.28a has a bug reading and writing
+	// them, and skipping them gives maximum backward compatibility. It costs nothing -- aMule
+	// uses no float tags, the only one it may have to handle being the Hybrid's '# Sent', which
+	// is useless but can arrive via the servers.
+	for (size_t j = 0; j < m_taglist.size(); ++j) {
 		if (m_taglistj.IsInt() || m_taglistj.IsStr()) {
 			++tagcount;
 		}
@@ -782,7 +844,16 @@
 		++tagcount;
 	}
 
-	if (m_lastPublishTimeKadNotes){
+	if (m_lastPublishTimeKadNotes) {
+		++tagcount;
+	}
+
+	// Upload-activity tags (issue #466) -- only persisted once set.
+	if (m_lastUploadDatetime) {
+		++tagcount;
+	}
+
+	if (m_dateShared) {
 		++tagcount;
 	}
 
@@ -794,11 +865,10 @@
 	// compatibility with pre-2.2 and other clients.
 	CTagString nametag_unicode(FT_FILENAME, GetFileName().GetRaw());
 	// We write it with BOM to keep eMule compatibility
-	nametag_unicode.WriteTagToFile(file,utf8strOptBOM);
+	nametag_unicode.WriteTagToFile(file, utf8strOptBOM);
 
-	// The non-unicoded filename is written in an 'universial'
-	// format, which allows us to identify files, even if the
-	// system locale changes.
+	// The non-unicoded filename is written in a 'universal' format, so files stay identifiable
+	// across a system-locale change.
 	CTagString nametag(FT_FILENAME, CPath::ToUniv(GetFileName()));
 	nametag.WriteTagToFile(file);
 
@@ -830,26 +900,37 @@
 	CTagInt32 lastseentag(FT_LASTSEEN, m_lastSeen);
 	lastseentag.WriteTagToFile(file);
 
-	//AICH Filehash
+	// AICH Filehash
 	if (HasProperAICHHashSet()) {
 		CTagString aichtag(FT_AICH_HASH, m_pAICHHashSet->GetMasterHash().GetString());
 		aichtag.WriteTagToFile(file);
 	}
 
 	// Kad sources
-	if (m_lastPublishTimeKadSrc){
+	if (m_lastPublishTimeKadSrc) {
 		CTagInt32 kadLastPubSrc(FT_KADLASTPUBLISHSRC, m_lastPublishTimeKadSrc);
 		kadLastPubSrc.WriteTagToFile(file);
 	}
 
 	// Kad notes
-	if (m_lastPublishTimeKadNotes){
+	if (m_lastPublishTimeKadNotes) {
 		CTagInt32 kadLastPubNotes(FT_KADLASTPUBLISHNOTES, m_lastPublishTimeKadNotes);
 		kadLastPubNotes.WriteTagToFile(file);
 	}
 
-	//other tags
-	for (size_t j = 0; j < m_taglist.size(); ++j){
+	// Upload activity (issue #466)
+	if (m_lastUploadDatetime) {
+		CTagInt32 lastUpTag(FT_LASTUPLOADED, (uint32)m_lastUploadDatetime);
+		lastUpTag.WriteTagToFile(file);
+	}
+
+	if (m_dateShared) {
+		CTagInt32 sharedSinceTag(FT_SHAREDSINCE, (uint32)m_dateShared);
+		sharedSinceTag.WriteTagToFile(file);
+	}
+
+	// other tags
+	for (size_t j = 0; j < m_taglist.size(); ++j) {
 		if (m_taglistj.IsInt() || m_taglistj.IsStr()) {
 			m_taglistj.WriteTagToFile(file);
 		}
@@ -857,8 +938,7 @@
 	return true;
 }
 
-
-void CKnownFile::CreateHashFromHashlist(const ArrayOfCMD4Hash& hashes, CMD4Hash* Output)
+void CKnownFile::CreateHashFromHashlist(const ArrayOfCMD4Hash &hashes, CMD4Hash *Output)
 {
 	wxCHECK_RET(hashes.size(), "No input to hash from in CreateHashFromHashlist");
 
@@ -872,8 +952,8 @@
 	CreateHashFromInput(&buffer0, buffer.size(), Output, NULL);
 }
 
-
-void CKnownFile::CreateHashFromFile(CFileAutoClose& file, uint64 offset, uint32 Length, CMD4Hash* Output, CAICHHashTree* pShaHashOut)
+void CKnownFile::CreateHashFromFile(
+	CFileAutoClose &file, uint64 offset, uint32 Length, CMD4Hash *Output, CAICHHashTree *pShaHashOut)
 {
 	wxCHECK_RET(Length, "No input to hash from in CreateHashFromFile");
 
@@ -884,96 +964,97 @@
 	area.CheckError();
 }
 
-
-void CKnownFile::CreateHashFromInput(const uint8_t* input, uint32 Length, CMD4Hash* Output, CAICHHashTree* pShaHashOut )
+void CKnownFile::CreateHashFromInput(
+	const uint8_t *input, uint32 Length, CMD4Hash *Output, CAICHHashTree *pShaHashOut)
 {
 	wxASSERT_MSG(Output || pShaHashOut, "Nothing to do in CreateHashFromInput");
-	{ wxCHECK_RET(input, "No input to hash from in CreateHashFromInput"); }
+	{
+		wxCHECK_RET(input, "No input to hash from in CreateHashFromInput");
+	}
 	wxASSERT(Length <= PARTSIZE); // We never hash more than one PARTSIZE
 
 	CMemFile data(input, Length);
 
 	uint32 Required = Length;
-	uint8  X64*128;
+	uint8 X64 * 128;
 
-	uint32	posCurrentEMBlock = 0;
-	uint32	nIACHPos = 0;
+	uint32 posCurrentEMBlock = 0;
+	uint32 nIACHPos = 0;
 	CScopedPtr<CAICHHashAlgo> pHashAlg(CAICHHashSet::GetNewHashAlgo());
 
 	// This is all AICH.
 	while (Required >= 64) {
 		uint32 len = Required / 64;
-		if (len > sizeof(X)/(64 * sizeof(X0))) {
-			len = sizeof(X)/(64 * sizeof(X0));
+		if (len > sizeof(X) / (64 * sizeof(X0))) {
+			len = sizeof(X) / (64 * sizeof(X0));
 		}
 
 		data.Read(&X, len * 64);
 
 		// SHA hash needs 180KB blocks
 		if (pShaHashOut) {
-			if (nIACHPos + len*64 >= EMBLOCKSIZE) {
+			if (nIACHPos + len * 64 >= EMBLOCKSIZE) {
 				uint32 nToComplete = EMBLOCKSIZE - nIACHPos;
 				pHashAlg->Add(X, nToComplete);
-				wxASSERT( nIACHPos + nToComplete == EMBLOCKSIZE );
+				wxASSERT(nIACHPos + nToComplete == EMBLOCKSIZE);
 				pShaHashOut->SetBlockHash(EMBLOCKSIZE, posCurrentEMBlock, pHashAlg.get());
 				posCurrentEMBlock += EMBLOCKSIZE;
 				pHashAlg->Reset();
-				pHashAlg->Add(X+nToComplete,(len*64) - nToComplete);
-				nIACHPos = (len*64) - nToComplete;
-			}
-			else{
-				pHashAlg->Add(X, len*64);
-				nIACHPos += len*64;
+				pHashAlg->Add(X + nToComplete, (len * 64) - nToComplete);
+				nIACHPos = (len * 64) - nToComplete;
+			} else {
+				pHashAlg->Add(X, len * 64);
+				nIACHPos += len * 64;
 			}
 		}
 
-		Required -= len*64;
+		Required -= len * 64;
 	}
 	// bytes to read
 	Required = Length % 64;
-	if (Required != 0){
-		data.Read(&X,Required);
+	if (Required != 0) {
+		data.Read(&X, Required);
 
-		if (pShaHashOut != NULL){
-			if (nIACHPos + Required >= EMBLOCKSIZE){
+		if (pShaHashOut != NULL) {
+			if (nIACHPos + Required >= EMBLOCKSIZE) {
 				uint32 nToComplete = EMBLOCKSIZE - nIACHPos;
 				pHashAlg->Add(X, nToComplete);
-				wxASSERT( nIACHPos + nToComplete == EMBLOCKSIZE );
+				wxASSERT(nIACHPos + nToComplete == EMBLOCKSIZE);
 				pShaHashOut->SetBlockHash(EMBLOCKSIZE, posCurrentEMBlock, pHashAlg.get());
 				posCurrentEMBlock += EMBLOCKSIZE;
 				pHashAlg->Reset();
-				pHashAlg->Add(X+nToComplete, Required - nToComplete);
+				pHashAlg->Add(X + nToComplete, Required - nToComplete);
 				nIACHPos = Required - nToComplete;
-			}
-			else{
+			} else {
 				pHashAlg->Add(X, Required);
 				nIACHPos += Required;
 			}
 		}
 	}
-	if (pShaHashOut != NULL){
-		if(nIACHPos > 0){
+	if (pShaHashOut != NULL) {
+		if (nIACHPos > 0) {
 			pShaHashOut->SetBlockHash(nIACHPos, posCurrentEMBlock, pHashAlg.get());
 			posCurrentEMBlock += nIACHPos;
 		}
-		wxASSERT( posCurrentEMBlock == Length );
-		wxCHECK2( pShaHashOut->ReCalculateHash(pHashAlg.get(), false), );
+		wxASSERT(posCurrentEMBlock == Length);
+		wxCHECK2(pShaHashOut->ReCalculateHash(pHashAlg.get(), false), );
 	}
 
-	if (Output != NULL){
+	if (Output != NULL) {
 		CryptoPP::Weak::MD4 md4_hasher;
 		md4_hasher.CalculateDigest(Output->GetHash(), input, Length);
 	}
 }
 
-
-const CMD4Hash& CKnownFile::GetPartHash(uint16 part) const {
-	wxASSERT( part < m_hashlist.size() );
+const CMD4Hash &CKnownFile::GetPartHash(uint16 part) const
+{
+	wxASSERT(part < m_hashlist.size());
 
 	return m_hashlistpart;
 }
 
-CPacket* CKnownFile::CreateSrcInfoPacket(const CUpDownClient* forClient, uint8 byRequestedVersion, uint16 nRequestedOptions)
+CPacket *CKnownFile::CreateSrcInfoPacket(
+	const CUpDownClient *forClient, uint8 byRequestedVersion, uint16 nRequestedOptions)
 {
 	// Kad reviewed
 
@@ -981,8 +1062,9 @@
 		return NULL;
 	}
 
-	if (((static_cast<CKnownFile*>(forClient->GetRequestFile()) != this)
-		&& (forClient->GetUploadFile() != this)) || forClient->GetUploadFileID() != GetFileHash()) {
+	if (((static_cast<CKnownFile *>(forClient->GetRequestFile()) != this) &&
+		    (forClient->GetUploadFile() != this)) ||
+		forClient->GetUploadFileID() != GetFileHash()) {
 		wxString file1 = _("Unknown");
 		if (forClient->GetRequestFile() && forClient->GetRequestFile()->GetFileName().IsOk()) {
 			file1 = forClient->GetRequestFile()->GetFileName().GetPrintable();
@@ -993,16 +1075,20 @@
 		if (GetFileName().IsOk()) {
 			file2 = GetFileName().GetPrintable();
 		}
-		AddDebugLogLineN(logKnownFiles, "File mismatch on source packet (K) Sending: " + file1 + "  From: " + file2);
+		AddDebugLogLineN(logKnownFiles,
+			"File mismatch on source packet (K) Sending: " + file1 + "  From: " + file2);
 		return NULL;
 	}
 
-	const BitVector& rcvstatus = forClient->GetUpPartStatus();
+	const BitVector &rcvstatus = forClient->GetUpPartStatus();
 	bool SupportsUploadChunksState = !rcvstatus.empty();
-	//wxASSERT(rcvstatus.size() == GetPartCount()); // Obviously!
+	// wxASSERT(rcvstatus.size() == GetPartCount()); // Obviously!
 	if (rcvstatus.size() != GetPartCount()) {
 		// Yuck. Same file but different part count? Seriously fucked up.
-		AddDebugLogLineN(logKnownFiles, CFormat("Impossible situation: different partcounts for the same known file: %i (client) and %i (file)") % rcvstatus.size() % GetPartCount());
+		AddDebugLogLineN(logKnownFiles,
+			CFormat("Impossible situation: different partcounts for the same known file: %i "
+				"(client) and %i (file)") %
+				rcvstatus.size() % GetPartCount());
 		return NULL;
 	}
 
@@ -1010,7 +1096,7 @@
 
 	uint8 byUsedVersion;
 	bool bIsSX2Packet;
-	if (forClient->SupportsSourceExchange2() && byRequestedVersion > 0){
+	if (forClient->SupportsSourceExchange2() && byRequestedVersion > 0) {
 		// the client uses SourceExchange2 and requested the highest version he knows
 		// and we send the highest version we know, but of course not higher than his request
 		byUsedVersion = std::min(byRequestedVersion, (uint8)SOURCEEXCHANGE2_VERSION);
@@ -1019,13 +1105,16 @@
 
 		// we don't support any special SX2 options yet, reserved for later use
 		if (nRequestedOptions != 0) {
-			AddDebugLogLineN(logKnownFiles, CFormat("Client requested unknown options for SourceExchange2: %u") % nRequestedOptions);
+			AddDebugLogLineN(logKnownFiles,
+				CFormat("Client requested unknown options for SourceExchange2: %u") %
+					nRequestedOptions);
 		}
 	} else {
 		byUsedVersion = forClient->GetSourceExchange1Version();
 		bIsSX2Packet = false;
 		if (forClient->SupportsSourceExchange2()) {
-			AddDebugLogLineN(logKnownFiles, "Client which announced to support SX2 sent SX1 packet instead");
+			AddDebugLogLineN(logKnownFiles,
+				"Client which announced to support SX2 sent SX1 packet instead");
 		}
 	}
 
@@ -1036,28 +1125,27 @@
 	uint32 cDbgNoSrc = 0;
 
 	SourceSet::iterator it = m_ClientUploadList.begin();
-	for ( ; it != m_ClientUploadList.end(); ++it ) {
+	for (; it != m_ClientUploadList.end(); ++it) {
 		const CUpDownClient *cur_src = it->GetClient();
 
-		if (	cur_src->HasLowID() ||
-			cur_src == forClient ||
-			!(	cur_src->GetUploadState() == US_UPLOADING ||
+		if (cur_src->HasLowID() || cur_src == forClient ||
+			!(cur_src->GetUploadState() == US_UPLOADING ||
 				cur_src->GetUploadState() == US_ONUPLOADQUEUE)) {
 			continue;
 		}
 
 		bool bNeeded = false;
 
-		if ( SupportsUploadChunksState ) {
-			const BitVector& srcstatus = cur_src->GetUpPartStatus();
-			if ( !srcstatus.empty() ) {
-				//wxASSERT(srcstatus.size() == GetPartCount()); // Obviously!
+		if (SupportsUploadChunksState) {
+			const BitVector &srcstatus = cur_src->GetUpPartStatus();
+			if (!srcstatus.empty()) {
+				// wxASSERT(srcstatus.size() == GetPartCount()); // Obviously!
 				if (srcstatus.size() != GetPartCount()) {
 					continue;
 				}
-				if ( cur_src->GetUpPartCount() == forClient->GetUpPartCount() ) {
-					for (int x = 0; x < GetPartCount(); x++ ) {
-						if ( srcstatus.get(x) && !rcvstatus.get(x) ) {
+				if (cur_src->GetUpPartCount() == forClient->GetUpPartCount()) {
+					for (int x = 0; x < GetPartCount(); x++) {
+						if (srcstatus.get(x) && !rcvstatus.get(x)) {
 							// We know the receiving client needs
 							// a chunk from this client.
 							bNeeded = true;
@@ -1072,20 +1160,17 @@
 				bNeeded = true;
 			}
 		} else {
-			// remote client does not support upload chunk status,
-			// search sources which have at least one complete part
-			// we could even sort the list of sources by available
-			// chunks to return as much sources as possible which
-			// have the most available chunks. but this could be
-			// a noticeable performance problem.
-			const BitVector& srcstatus = cur_src->GetUpPartStatus();
-			if ( !srcstatus.empty() ) {
-				//wxASSERT(srcstatus.size() == GetPartCount());
+			// The remote client does not support upload chunk status, so search for
+			// sources with at least one complete part. Sorting the sources by available
+			// chunks would return more of them, at a noticeable performance cost.
+			const BitVector &srcstatus = cur_src->GetUpPartStatus();
+			if (!srcstatus.empty()) {
+				// wxASSERT(srcstatus.size() == GetPartCount());
 				if (srcstatus.size() != GetPartCount()) {
 					continue;
 				}
-				for (int x = 0; x < GetPartCount(); x++ ) {
-					if ( srcstatus.get(x) ) {
+				for (int x = 0; x < GetPartCount(); x++) {
+					if (srcstatus.get(x)) {
 						// this client has at least one chunk
 						bNeeded = true;
 						break;
@@ -1098,10 +1183,10 @@
 			}
 		}
 
-		if ( bNeeded ) {
+		if (bNeeded) {
 			nCount++;
 			uint32 dwID;
-			if(byUsedVersion >= 3) {
+			if (byUsedVersion >= 3) {
 				dwID = cur_src->GetUserIDHybrid();
 			} else {
 				dwID = cur_src->GetIP();
@@ -1112,19 +1197,21 @@
 			data.WriteUInt16(cur_src->GetServerPort());
 
 			if (byUsedVersion >= 2) {
-			    data.WriteHash(cur_src->GetUserHash());
+				data.WriteHash(cur_src->GetUserHash());
 			}
 
-			if (byUsedVersion >= 4){
+			if (byUsedVersion >= 4) {
 				// CryptSettings - SourceExchange V4
 				// 5 Reserved (!)
 				// 1 CryptLayer Required
 				// 1 CryptLayer Requested
 				// 1 CryptLayer Supported
-				const uint8 uSupportsCryptLayer	= cur_src->SupportsCryptLayer() ? 1 : 0;
-				const uint8 uRequestsCryptLayer	= cur_src->RequestsCryptLayer() ? 1 : 0;
-				const uint8 uRequiresCryptLayer	= cur_src->RequiresCryptLayer() ? 1 : 0;
-				const uint8 byCryptOptions = (uRequiresCryptLayer << 2) | (uRequestsCryptLayer << 1) | (uSupportsCryptLayer << 0);
+				const uint8 uSupportsCryptLayer = cur_src->SupportsCryptLayer() ? 1 : 0;
+				const uint8 uRequestsCryptLayer = cur_src->RequestsCryptLayer() ? 1 : 0;
+				const uint8 uRequiresCryptLayer = cur_src->RequiresCryptLayer() ? 1 : 0;
+				const uint8 byCryptOptions = (uRequiresCryptLayer << 2) |
+							     (uRequestsCryptLayer << 1) |
+							     (uSupportsCryptLayer << 0);
 				data.WriteUInt8(byCryptOptions);
 			}
 
@@ -1141,28 +1228,34 @@
 	data.Seek(bIsSX2Packet ? 17 : 16, wxFromStart);
 	data.WriteUInt16(nCount);
 
-	CPacket* result = new CPacket(data, OP_EMULEPROT, bIsSX2Packet ? OP_ANSWERSOURCES2 : OP_ANSWERSOURCES);
+	CPacket *result =
+		new CPacket(data, OP_EMULEPROT, bIsSX2Packet ? OP_ANSWERSOURCES2 : OP_ANSWERSOURCES);
 
-	if ( result->GetPacketSize() > 354 ) {
+	if (result->GetPacketSize() > 354) {
 		result->PackPacket();
 	}
 
 	return result;
 }
 
+void CKnownFile::CreateOfferedFilePacket(CMemFile *files, CServer *pServer, CUpDownClient *pClient)
+{
 
-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.
+	// Used both to offer files to the local server and to send shared files to another client.
+	// In each case we send our IP+Port only if we have a HighID.
 
 	wxCHECK_RET(!(pClient && pServer), "pClient and pServer cannot both be non-null");
 
-	SetPublishedED2K(true);
+	// Only a publish to the server means "published". The flag exists so
+	// CSharedFileList::SendListToServer() can tell which files it still owes the server, and it
+	// is cleared when a server connection is made (CServerConnect). Setting it while answering
+	// a peer's browse request -- which this same function serves, with pClient instead of
+	// pServer -- told the publisher those files were already offered, so they silently stopped
+	// being published until the next server (re)connect. It also woke the shared-files view
+	// once per file, for a browse that changes nothing the user can see (issue #898).
+	if (pServer) {
+		SetPublishedED2K(true);
+	}
 	files->WriteHash(GetFileHash());
 
 	uint32 nClientID = 0;
@@ -1170,10 +1263,10 @@
 
 	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
+#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) {
@@ -1184,7 +1277,7 @@
 				nClientPort = FILE_INCOMPLETE_PORT;
 			}
 		} else {
-			if (theApp->IsConnectedED2K() && !::IsLowID(theApp->GetED2KID())){
+			if (theApp->IsConnectedED2K() && !::IsLowID(theApp->GetED2KID())) {
 				nClientID = theApp->GetID();
 				nClientPort = thePrefs::GetPort();
 			}
@@ -1206,38 +1299,41 @@
 	// 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()));
+	if (!IsLargeFile()) {
+		tags.push_back(new CTagInt32(FT_FILESIZE, GetFileSize()));
 	} else {
-		if (!IsLargeFile()){
-			tags.push_back(new CTagInt32(FT_FILESIZE, GetFileSize()));
+		// 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 {
-			// 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)));
-				}
+			if (!pClient->SupportsLargeFiles()) {
+				wxFAIL;
+				tags.push_back(new CTagInt32(FT_FILESIZE, 0));
 			} else {
-				if (!pClient->SupportsLargeFiles()) {
-					wxFAIL;
-					tags.push_back(new CTagInt32(FT_FILESIZE, 0));
-				} else {
-					tags.push_back(new CTagInt64(FT_FILESIZE, GetFileSize()));
-				}
+				tags.push_back(new CTagInt64(FT_FILESIZE, GetFileSize()));
 			}
 		}
 	}
 
 	if (GetFileRating()) {
-		tags.push_back(new CTagVarInt(FT_FILERATING, GetFileRating(), (pClient && pClient->GetVBTTags()) ? 0 : 32));
+		uint32 ratingValue = GetFileRating();
+		if (pClient) {
+			// Servers relay the rating in a packed format (low byte = rating * 51). When we
+			// build a source-exchange packet for another client we must use that same format,
+			// otherwise remote clients decode it as 0. Servers themselves want the raw 0-5.
+			ratingValue *= (255 / 5);
+		}
+		tags.push_back(new CTagVarInt(FT_FILERATING, ratingValue, 32));
 	}
 
-	// NOTE: Archives and CD-Images are published+searched with file type "Pro"
+	// NOTE: Archives and disc 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
@@ -1248,24 +1344,42 @@
 		}
 	}
 	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
+		// String file type tags go to newer servers (in case no integer type exists for the
+		// file type, e.g. emulecollection), older servers, and 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.
+	// Media metadata (populated by MediaProbe at share-add time). Each tag is emitted only when
+	// nonzero / non-empty: older ed2k clients and servers ignore unknown tag IDs but should
+	// never be asked to parse a 0-valued FT_MEDIA_LENGTH. Fixed 32-bit encoding, as for every
+	// other client-bound tag here.
+	if (uint32 len = GetIntTagValue(FT_MEDIA_LENGTH)) {
+		tags.push_back(new CTagVarInt(FT_MEDIA_LENGTH, len, 32));
+	}
+	if (uint32 br = GetIntTagValue(FT_MEDIA_BITRATE)) {
+		tags.push_back(new CTagVarInt(FT_MEDIA_BITRATE, br, 32));
+	}
+	// Artist / album / title alongside the other three: this was the only publisher still
+	// sending three of the six, so a peer searching by artist could match a Kad-published copy
+	// of a file and not the ed2k-published one.
+	static const uint8 kMediaStrTags = {
+		FT_MEDIA_CODEC, FT_MEDIA_ARTIST, FT_MEDIA_ALBUM, FT_MEDIA_TITLE
+	};
+	for (const uint8 id : kMediaStrTags) {
+		const wxString &value = GetStrTagValue(id);
+		if (!value.IsEmpty()) {
+			tags.push_back(new CTagString(id, value));
+		}
+	}
 
 	EUtf8Str eStrEncode;
 
 	bool unicode_support =
 		// eservers that support UNICODE.
-		(pServer && (pServer->GetUnicodeSupport()))
-		||
+		(pServer && (pServer->GetUnicodeSupport())) ||
 		// clients that support unicode
 		(pClient && pClient->GetUnicodeSupport());
 	eStrEncode = unicode_support ? utf8strRaw : utf8strNone;
@@ -1276,17 +1390,16 @@
 	// 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))
-		||
+		(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())
-		||
+		(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;
+	for (TagPtrList::iterator it = tags.begin(); it != tags.end(); ++it) {
+		CTag *pTag = *it;
 		if (new_ed2k) {
 			pTag->WriteNewEd2kTag(files, eStrEncode);
 		} else {
@@ -1296,7 +1409,6 @@
 	}
 }
 
-
 // Updates priority of file if autopriority is activated
 void CKnownFile::UpdateAutoUpPriority()
 {
@@ -1319,25 +1431,25 @@
 	}
 }
 
-void CKnownFile::SetFileCommentRating(const wxString& strNewComment, int8 iNewRating)
+void CKnownFile::SetFileCommentRating(const wxString &strNewComment, int8 iNewRating)
 {
 	if (m_strComment != strNewComment || m_iRating != iNewRating) {
 		SetLastPublishTimeKadNotes(0);
 		wxString strCfgPath = "/" + m_abyFileHash.Encode() + "/";
 
-		wxConfigBase* cfg = wxConfigBase::Get();
+		wxConfigBase *cfg = wxConfigBase::Get();
 		if (strNewComment.IsEmpty() && iNewRating == 0) {
 			cfg->DeleteGroup(strCfgPath);
 		} else {
-			cfg->Write( strCfgPath + "Comment", strNewComment);
-			cfg->Write( strCfgPath + "Rate", (int)iNewRating);
+			cfg->Write(strCfgPath + "Comment", strNewComment);
+			cfg->Write(strCfgPath + "Rate", (int)iNewRating);
 		}
 
 		m_strComment = strNewComment;
 		m_iRating = iNewRating;
 
 		SourceSet::iterator it = m_ClientUploadList.begin();
-		for ( ; it != m_ClientUploadList.end(); ++it ) {
+		for (; it != m_ClientUploadList.end(); ++it) {
 			it->SetCommentDirty();
 		}
 		// EC exports both comment and rating.
@@ -1345,23 +1457,24 @@
 	}
 }
 
-
-void CKnownFile::SetUpPriority(uint8 iNewUpPriority, bool m_bsave){
+void CKnownFile::SetUpPriority(uint8 iNewUpPriority, bool m_bsave)
+{
 	if (m_iUpPriority != iNewUpPriority && IsPartFile()) {
-		static_cast<CPartFile*>(this)->MarkMetDirty();
+		static_cast<CPartFile *>(this)->MarkMetDirty();
 	}
 	if (m_iUpPriority != iNewUpPriority) {
 		MarkECChanged();
 	}
 	m_iUpPriority = iNewUpPriority;
-	if( IsPartFile() && m_bsave ) {
-		static_cast<CPartFile*>(this)->SavePartFile();
+	if (IsPartFile() && m_bsave) {
+		static_cast<CPartFile *>(this)->SavePartFile();
 	}
 }
 
-void CKnownFile::SetAutoUpPriority(bool flag){
+void CKnownFile::SetAutoUpPriority(bool flag)
+{
 	if (m_bAutoUpPriority != flag && IsPartFile()) {
-		static_cast<CPartFile*>(this)->MarkMetDirty();
+		static_cast<CPartFile *>(this)->MarkMetDirty();
 	}
 	if (m_bAutoUpPriority != flag) {
 		// EC exports prio with the auto flag folded in (+10 offset for auto).
@@ -1370,13 +1483,13 @@
 	m_bAutoUpPriority = flag;
 }
 
-void CKnownFile::SetPublishedED2K(bool val){
+void CKnownFile::SetPublishedED2K(bool val)
+{
 	if (m_PublishedED2K == val) {
-		// No-op state changes are a hot path during ClearED2KPublishInfo
-		// (which writes false to every shared file regardless of current
-		// state) — the GUI cascade is O(N) per call due to FindItem in
-		// CSharedFilesCtrl::UpdateItem, so unconditional notify here was
-		// O(N²) on a single-threaded main loop. See #302.
+		// No-op state changes are a hot path during ClearED2KPublishInfo, which writes
+		// false to every shared file regardless of current state. The GUI cascade is O(N)
+		// per call (FindItem in CSharedFilesCtrl::UpdateItem), so an unconditional notify
+		// here was O(N^2) on a single-threaded main loop. See #302.
 		return;
 	}
 	m_PublishedED2K = val;
@@ -1385,33 +1498,106 @@
 
 bool CKnownFile::PublishNotes()
 {
-	if(m_lastPublishTimeKadNotes > (uint32)time(NULL)) {
+	if (m_lastPublishTimeKadNotes > (uint32)time(NULL)) {
 		return false;
 	}
 
-	if(!GetFileComment().IsEmpty()) {
-		m_lastPublishTimeKadNotes = (uint32)time(NULL)+KADEMLIAREPUBLISHTIMEN;
+	if (!GetFileComment().IsEmpty()) {
+		m_lastPublishTimeKadNotes = (uint32)time(NULL) + KADEMLIAREPUBLISHTIMEN;
 		return true;
 	}
 
-	if(GetFileRating() != 0) {
-		m_lastPublishTimeKadNotes = (uint32)time(NULL)+KADEMLIAREPUBLISHTIMEN;
+	if (GetFileRating() != 0) {
+		m_lastPublishTimeKadNotes = (uint32)time(NULL) + KADEMLIAREPUBLISHTIMEN;
 		return true;
 	}
 
 	return false;
 }
 
+bool CAbstractFile::RequestKadNoteSearch()
+{
+#ifndef CLIENT_GUI
+	// Kad must be up; the notes lookup runs against the DHT.
+	if (!Kademlia::CKademlia::IsRunning() || !Kademlia::CKademlia::IsConnected()) {
+		AddLogLineN(CFormat(_("Kad note search for '%s' not started: Kad is not connected")) %
+			    GetFileName());
+		return false;
+	}
+
+	// One in-flight lookup per file at a time.
+	if (IsKadCommentSearchRunning()) {
+		AddLogLineN(
+			CFormat(_("Kad note search for '%s' not started: a note lookup is already running "
+				  "for this file")) %
+			GetFileName());
+		return false;
+	}
+
+	// The NOTES request builder reads the file size from the local shared list, download queue
+	// or current search results (mirroring eMule); a file in none of those cannot be looked up,
+	// so do not spawn a search that would immediately self-terminate.
+	if (!theApp->sharedfiles->GetFileByID(GetFileHash()) &&
+		!theApp->downloadqueue->GetFileByID(GetFileHash()) &&
+		!theApp->searchlist->GetSearchFileByID(GetFileHash())) {
+		AddLogLineN(CFormat(_("Kad note search for '%s' not started: file is not in the shared list, "
+				      "download queue or search results")) %
+			    GetFileName());
+		return false;
+	}
+
+	Kademlia::CUInt128 kadFileID;
+	kadFileID.SetValueBE(GetFileHash().GetHash());
+	// A Kad search is keyed by its target hash, and a downloading file already runs a source
+	// search on that hash (CSearch::FILE), so a notes lookup cannot start until it ends (<=45
+	// s). This is the common transient failure; tell the user to retry rather than fail
+	// opaquely.
+	if (Kademlia::CSearchManager::AlreadySearchingFor(kadFileID)) {
+		AddLogLineN(
+			CFormat(_("Kad note search for '%s' not started: another Kad search (e.g. a source "
+				  "search) is already using this file's hash - try again shortly")) %
+			GetFileName());
+		return false;
+	}
+
+	// Incoming notes are merged by CAbstractFile::AddNote, which dedups by source
+	// IP / ID, so refreshing does not accumulate duplicates.
+	if (!Kademlia::CSearchManager::PrepareLookup(Kademlia::CSearch::NOTES, true, kadFileID)) {
+		AddLogLineN(CFormat(_("Kad note search for '%s' not started: PrepareLookup failed")) %
+			    GetFileName());
+		return false;
+	}
+
+	SetKadCommentSearchRunning(true);
+	// For a shared/download file, bump its EC generation so the next incremental update re-
+	// serializes it with the running flag set: that is how amulegui and amuleapi observe the
+	// lookup starting (the cleared flag is emitted the same way in ~CSearch). A search result
+	// carries no EC generation; its flag rides the periodic search-results poll instead.
+	CKnownFile *knownFile = theApp->sharedfiles->GetFileByID(GetFileHash());
+	if (!knownFile) {
+		knownFile = theApp->downloadqueue->GetFileByID(GetFileHash());
+	}
+	if (knownFile) {
+		knownFile->MarkECChanged();
+	}
+	return true;
+#else
+	// amulegui has no local Kad; the GUI triggers the lookup over EC instead.
+	return false;
+#endif
+}
+
 bool CKnownFile::PublishSrc()
 {
 	uint32 lastBuddyIP = 0;
 
-	if( theApp->IsFirewalled() ) {
-		CUpDownClient* buddy = theApp->clientlist->GetBuddy();
-		if( buddy ) {
+	if (theApp->IsFirewalled()) {
+		CUpDownClient *buddy = theApp->clientlist->GetBuddy();
+		if (buddy) {
 			lastBuddyIP = theApp->clientlist->GetBuddy()->GetIP();
-			if( lastBuddyIP != m_lastBuddyIP ) {
-				SetLastPublishTimeKadSrc( (uint32)time(NULL)+KADEMLIAREPUBLISHTIMES, lastBuddyIP );
+			if (lastBuddyIP != m_lastBuddyIP) {
+				SetLastPublishTimeKadSrc(
+					(uint32)time(NULL) + KADEMLIAREPUBLISHTIMES, lastBuddyIP);
 				return true;
 			}
 		} else {
@@ -1419,13 +1605,12 @@
 		}
 	}
 
-	if(m_lastPublishTimeKadSrc > (uint32)time(NULL)) {
+	if (m_lastPublishTimeKadSrc > (uint32)time(NULL)) {
 		return false;
 	}
 
-	SetLastPublishTimeKadSrc((uint32)time(NULL)+KADEMLIAREPUBLISHTIMES,lastBuddyIP);
+	SetLastPublishTimeKadSrc((uint32)time(NULL) + KADEMLIAREPUBLISHTIMES, lastBuddyIP);
 	return true;
-
 }
 
 void CKnownFile::UpdatePartsInfo()
@@ -1434,8 +1619,28 @@
 	uint16 partcount = GetPartCount();
 	bool flag = (time(NULL) - m_nCompleteSourcesTime > 0);
 
+	// One transition must not wait out the throttle: the upload list going empty. Every caller
+	// here is driven by a peer event and there is no periodic sweep, so if the last requesting
+	// peer leaves inside the 60 s window the throttled call is the final one this file will
+	// ever get, and the count would keep its last value for the life of the process. That is
+	// the staleness this whole path is about, so the answer that is both certain and free -- no
+	// peers, no complete sources -- is not worth deferring.
+	//
+	// Guarded on the values actually being non-zero, so a file already settled at 0 does not
+	// re-enter the recompute on every later call. All three exported fields are asked, not just
+	// the scalar: Hi is a percentile of the peers' self-reported counts, floored at the scalar
+	// but never tied to it, so it can still be non-zero once the scalar has reached 0 -- and Hi
+	// is what the desktop column and the Web UI detail panel render (issue #1065). See
+	// CompleteSourcesNeedRecompute().
+	if (!flag && CompleteSourcesNeedRecompute(m_ClientUploadList.empty(),
+			     m_nCompleteSourcesCount,
+			     m_nCompleteSourcesCountLo,
+			     m_nCompleteSourcesCountHi)) {
+		flag = true;
+	}
+
 	// Ensure the frequency-list is ready
-	if ( m_AvailPartFrequency.size() != GetPartCount() ) {
+	if (m_AvailPartFrequency.size() != GetPartCount()) {
 		m_AvailPartFrequency.clear();
 		m_AvailPartFrequency.insert(m_AvailPartFrequency.begin(), GetPartCount(), 0);
 	}
@@ -1445,20 +1650,20 @@
 		count.reserve(m_ClientUploadList.size());
 
 		SourceSet::iterator it = m_ClientUploadList.begin();
-		for ( ; it != m_ClientUploadList.end(); ++it ) {
-			CUpDownClient* client = it->GetClient();
-			if ( !client->GetUpPartStatus().empty() && client->GetUpPartCount() == partcount ) {
+		for (; it != m_ClientUploadList.end(); ++it) {
+			CUpDownClient *client = it->GetClient();
+			if (!client->GetUpPartStatus().empty() && client->GetUpPartCount() == partcount) {
 				count.push_back(client->GetUpCompleteSourcesCount());
 			}
 		}
 
 		m_nCompleteSourcesCount = m_nCompleteSourcesCountLo = m_nCompleteSourcesCountHi = 0;
 
-		if( partcount > 0) {
+		if (partcount > 0) {
 			m_nCompleteSourcesCount = m_AvailPartFrequency0;
 		}
 		for (uint16 i = 1; i < partcount; ++i) {
-			if( m_nCompleteSourcesCount > m_AvailPartFrequencyi) {
+			if (m_nCompleteSourcesCount > m_AvailPartFrequencyi) {
 				m_nCompleteSourcesCount = m_AvailPartFrequencyi;
 			}
 		}
@@ -1469,50 +1674,39 @@
 			std::sort(count.begin(), count.end(), std::less<uint16>());
 
 			// calculate range
-			int i = n >> 1;			// (n / 2)
-			int j = (n * 3) >> 2;	// (n * 3) / 4
-			int k = (n * 7) >> 3;	// (n * 7) / 8
+			int i = n >> 1;       // (n / 2)
+			int j = (n * 3) >> 2; // (n * 3) / 4
+			int k = (n * 7) >> 3; // (n * 7) / 8
 
 			// For complete files, trust the people your uploading to more...
 
-			// For low guess and normal guess count
-			//	- If we see more sources then the guessed low and
-			//	normal, use what we see.
-			//	- If we see less sources then the guessed low,
-			//	adjust network accounts for 100%, we account for
-			//	0% with what we see and make sure we are still
-			//	above the normal.
-			// For high guess
-			//	Adjust 100% network and 0% what we see.
+			// Low and normal guesses: use what we see when it exceeds them; when we see
+			// fewer than the low guess, credit the network with 100% and what we see
+			// with 0%, keeping the result above normal. The high guess always credits
+			// the network with 100%.
 			if (n < 20) {
-				if ( counti < m_nCompleteSourcesCount ) {
+				if (counti < m_nCompleteSourcesCount) {
 					m_nCompleteSourcesCountLo = m_nCompleteSourcesCount;
 				} else {
 					m_nCompleteSourcesCountLo = counti;
 				}
-				m_nCompleteSourcesCount= m_nCompleteSourcesCountLo;
+				m_nCompleteSourcesCount = m_nCompleteSourcesCountLo;
 				m_nCompleteSourcesCountHi = countj;
-				if( m_nCompleteSourcesCountHi < m_nCompleteSourcesCount ) {
+				if (m_nCompleteSourcesCountHi < m_nCompleteSourcesCount) {
 					m_nCompleteSourcesCountHi = m_nCompleteSourcesCount;
 				}
 			} else {
-			// Many sources..
-			// For low guess
-			//	Use what we see.
-			// For normal guess
-			//	Adjust network accounts for 100%, we account for
-			//	0% with what we see and make sure we are still above the low.
-			// For high guess
-			//	Adjust network accounts for 100%, we account for 0%
-			//	with what we see and make sure we are still above the normal.
+				// Many sources. Low guess: use what we see. Normal and high
+				// guesses: credit the network with 100% and what we see with 0%,
+				// keeping each above the previous tier.
 
 				m_nCompleteSourcesCountLo = m_nCompleteSourcesCount;
 				m_nCompleteSourcesCount = countj;
-				if( m_nCompleteSourcesCount < m_nCompleteSourcesCountLo ) {
+				if (m_nCompleteSourcesCount < m_nCompleteSourcesCountLo) {
 					m_nCompleteSourcesCount = m_nCompleteSourcesCountLo;
 				}
-				m_nCompleteSourcesCountHi= countk;
-				if( m_nCompleteSourcesCountHi < m_nCompleteSourcesCount ) {
+				m_nCompleteSourcesCountHi = countk;
+				if (m_nCompleteSourcesCountHi < m_nCompleteSourcesCount) {
 					m_nCompleteSourcesCountHi = m_nCompleteSourcesCount;
 				}
 			}
@@ -1526,45 +1720,46 @@
 	Notify_SharedFilesUpdateItem(this);
 }
 
-
-void CKnownFile::UpdateUpPartsFrequency( CUpDownClient* client, bool increment )
+void CKnownFile::UpdateUpPartsFrequency(CUpDownClient *client, bool increment)
 {
-	if ( m_AvailPartFrequency.size() != GetPartCount() ) {
+	if (m_AvailPartFrequency.size() != GetPartCount()) {
 		m_AvailPartFrequency.clear();
 		m_AvailPartFrequency.insert(m_AvailPartFrequency.begin(), GetPartCount(), 0);
-		if ( !increment ) {
+		if (!increment) {
 			return;
 		}
 	}
 
-	const BitVector& freq = client->GetUpPartStatus();
+	const BitVector &freq = client->GetUpPartStatus();
 	unsigned int size = freq.size();
-	if ( size != m_AvailPartFrequency.size() ) {
+	if (size != m_AvailPartFrequency.size()) {
 		return;
 	}
 
-	if ( increment ) {
-		for ( unsigned int i = 0; i < size; ++i ) {
-			if ( freq.get(i) ) {
+	if (increment) {
+		for (unsigned int i = 0; i < size; ++i) {
+			if (freq.get(i)) {
 				m_AvailPartFrequencyi++;
 			}
 		}
 	} else {
-		for ( unsigned int i = 0; i < size; ++i ) {
-			if ( freq.get(i) ) {
+		for (unsigned int i = 0; i < size; ++i) {
+			if (freq.get(i)) {
 				m_AvailPartFrequencyi--;
 			}
 		}
 	}
 }
 
-void CKnownFile::ClearPriority() {
-	if ( !m_bAutoUpPriority ) return;
-	m_iUpPriority = ( m_bAutoUpPriority ) ? PR_HIGH : PR_NORMAL;
+void CKnownFile::ClearPriority()
+{
+	if (!m_bAutoUpPriority)
+		return;
+	m_iUpPriority = (m_bAutoUpPriority) ? PR_HIGH : PR_NORMAL;
 	UpdateAutoUpPriority();
 }
 
-static void GuessAndRemoveExt(CPath& name)
+static void GuessAndRemoveExt(CPath &name)
 {
 	wxString ext = name.GetExt();
 
@@ -1574,24 +1769,18 @@
 		if (name.GetExt() == "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 == "7z"   ||
-		   ext == "rm"   ||
-		   ext == "jpeg" ||
-		   ext == "mpeg"
-		   ) {
+		// might be an extension if length == 3
+		// and also remove some common non-three-character extensions
+	} else if (ext.Length() == 3 || ext == "7z" || ext == "rm" || ext == "jpeg" || ext == "mpeg") {
 		name = name.RemoveExt();
 	}
 }
 
-void CKnownFile::SetFileName(const CPath& filename)
+void CKnownFile::SetFileName(const CPath &filename)
 {
 	CAbstractFile::SetFileName(filename);
-	// Invalidate the cached EC ed2k link; SetFileName is the only event
-	// that affects the link body in normal operation. Lazy-rebuilt on
-	// the next GetCachedED2kLinkBase() call.
+	// Invalidate the cached EC ed2k link; SetFileName is the only event that affects the link
+	// body in normal operation. Lazy-rebuilt on the next GetCachedED2kLinkBase() call.
 	m_cachedED2kLinkBase.clear();
 	// EC exports the filename printable (EC_TAG_PARTFILE_NAME) and the
 	// ed2k:// link, which is filename-derived.
@@ -1603,15 +1792,13 @@
 	Kademlia::CSearchManager::GetWords(tmpName.GetPrintable(), &wordlist);
 }
 
-const wxString& CKnownFile::GetCachedED2kLinkBase() const
+const wxString &CKnownFile::GetCachedED2kLinkBase() const
 {
 	if (m_cachedED2kLinkBase.IsEmpty()) {
-		// theApp->CreateED2kLink with add_source=false produces just the
-		// base ed2k:// URI without the |sources,…| suffix. The expensive
-		// work (filename Cleanup, several CFormat substitutions) lives
-		// entirely in this build and is what we want to amortise across
-		// every EC GET_SHARED_FILES / GET_UPDATE response that touches
-		// this file.
+		// CreateED2kLink with add_source=false produces just the base ed2k:// URI. The
+		// expensive work (filename Cleanup, several CFormat substitutions) lives entirely
+		// in this build and is what we amortise across every EC GET_SHARED_FILES /
+		// GET_UPDATE response touching this file.
 		m_cachedED2kLinkBase = theApp->CreateED2kLink(this, false /*add_source*/);
 	}
 	return m_cachedED2kLinkBase;
@@ -1619,50 +1806,42 @@
 
 wxString CKnownFile::GetED2kLinkForEC(bool add_source) const
 {
-	const wxString& base = GetCachedED2kLinkBase();
+	const wxString &base = GetCachedED2kLinkBase();
 	if (!add_source) {
 		return base;
 	}
-	// Append the |sources,IP:port|/ suffix. Tiny CFormat — we don't cache
-	// this variant because IP / port / connection state can change
-	// independently of the file and the invalidation surface isn't worth
-	// it for one short CFormat. Mirrors the suffix branch of
-	// CamuleAppCommon::CreateED2kLink (kept consistent on purpose).
+	// Append the |sources,IP:port|/ suffix. Not cached: IP, port and connection state change
+	// independently of the file, and the invalidation surface is not worth it for one short
+	// CFormat. Mirrors the suffix branch of CamuleAppCommon::CreateED2kLink.
 	if (!theApp->IsConnected() || theApp->IsFirewalled()) {
-		// CreateED2kLink would log a warning here ("can't add yourself
-		// as a source ... while having a lowid"); the EC path is
-		// quiet — the caller already gated add_source on
-		// IsConnectedED2K && !IsLowID, so reaching here means the
-		// state shifted between those checks and now. Return the base.
+		// CreateED2kLink would log a warning here ("can't add yourself as a source ...
+		// while having a lowid"); the EC path stays quiet -- the caller already gated
+		// add_source on IsConnectedED2K && !IsLowID, so reaching here means the state
+		// shifted since. Return the base.
 		return base;
 	}
 	uint32 clientID = theApp->GetID();
-	return base + CFormat("|sources,%u.%u.%u.%u:%u|/")
-		% (clientID & 0xff)
-		% ((clientID >> 8) & 0xff)
-		% ((clientID >> 16) & 0xff)
-		% ((clientID >> 24) & 0xff)
-		% thePrefs::GetPort();
+	return base + CFormat("|sources,%u.%u.%u.%u:%u|/") % (clientID & 0xff) % ((clientID >> 8) & 0xff) %
+			      ((clientID >> 16) & 0xff) % ((clientID >> 24) & 0xff) % thePrefs::GetPort();
 }
 
 #endif // CLIENT_GUI
 
-//For File Comment //
+// For File Comment //
 void CKnownFile::LoadComment() const
 {
-	#ifndef CLIENT_GUI
+#ifndef CLIENT_GUI
 	wxString strCfgPath = "/" + m_abyFileHash.Encode() + "/";
 
-	wxConfigBase* cfg = wxConfigBase::Get();
+	wxConfigBase *cfg = wxConfigBase::Get();
 
-	m_strComment = cfg->Read( strCfgPath + "Comment", "");
-	m_iRating = cfg->Read( strCfgPath + "Rate", 0l);
-	#endif
+	m_strComment = cfg->Read(strCfgPath + "Comment", "");
+	m_iRating = cfg->Read(strCfgPath + "Rate", 0l);
+#endif
 
 	m_bCommentLoaded = true;
 }
 
-
 wxString CKnownFile::GetAICHMasterHash() const
 {
 #ifdef CLIENT_GUI
@@ -1676,28 +1855,38 @@
 #endif
 }
 
-
 bool CKnownFile::HasProperAICHHashSet() const
 {
 #ifdef CLIENT_GUI
 	return m_AICHMasterHash.Length() != 0;
 #else
-	return m_pAICHHashSet->HasValidMasterHash() &&
-		(m_pAICHHashSet->GetStatus() == AICH_HASHSETCOMPLETE ||
-		 m_pAICHHashSet->GetStatus() == AICH_VERIFIED);
+	return m_pAICHHashSet->HasValidMasterHash() && (m_pAICHHashSet->GetStatus() == AICH_HASHSETCOMPLETE ||
+							       m_pAICHHashSet->GetStatus() == AICH_VERIFIED);
 #endif
 }
 
+void CKnownFile::SetHashingProgress(uint16 val) const
+{
+	if (m_hashingProgress != val) {
+		m_hashingProgress = val;
+		const_cast<CKnownFile *>(this)->MarkECChanged();
+	}
+	Notify_SharedFilesUpdateItem(const_cast<CKnownFile *>(this));
+}
+
 wxString CKnownFile::GetFeedback() const
 {
-	return	  wxString(_("File name")) + ": " + GetFileName().GetPrintable() + "\n"
-		+ _("File size") + ": " + CastItoXBytes(GetFileSize()) + "\n"
-		+ _("Share ratio") + wxString(CFormat(": %.2f%%\n") % (((double)statistic.GetAllTimeTransferred() / (double)GetFileSize()) * 100.0))
-		+ _("Uploaded") + ": " + CastItoXBytes(statistic.GetTransferred()) + " (" + CastItoXBytes(statistic.GetAllTimeTransferred()) + ")\n"
-		+ _("Requested") + wxString(CFormat(": %u (%u)\n") % statistic.GetRequests() % statistic.GetAllTimeRequests())
-		+ _("Accepted") + wxString(CFormat(": %u (%u)\n") % statistic.GetAccepts() % statistic.GetAllTimeAccepts())
-		+ _("On Queue") + wxString(CFormat(": %u\n") % GetQueuedCount())
-		+ _("Complete sources") + wxString(CFormat(": %u\n") % m_nCompleteSourcesCount);
+	return wxString(_("File name")) + ": " + GetFileName().GetPrintable() + "\n" + _("File size") + ": " +
+	       CastItoXBytes(GetFileSize()) + "\n" + _("Share ratio") +
+	       wxString(CFormat(": %.2f%%\n") %
+			(((double)statistic.GetAllTimeTransferred() / (double)GetFileSize()) * 100.0)) +
+	       _("Uploaded") + ": " + CastItoXBytes(statistic.GetTransferred()) + " (" +
+	       CastItoXBytes(statistic.GetAllTimeTransferred()) + ")\n" + _("Requested") +
+	       wxString(CFormat(": %u (%u)\n") % statistic.GetRequests() % statistic.GetAllTimeRequests()) +
+	       _("Accepted") +
+	       wxString(CFormat(": %u (%u)\n") % statistic.GetAccepts() % statistic.GetAllTimeAccepts()) +
+	       _("On Queue") + wxString(CFormat(": %u\n") % GetQueuedCount()) + _("Complete sources") +
+	       wxString(CFormat(": %u\n") % m_nCompleteSourcesCount);
 }
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/KnownFile.h -> amule-3.1.0.tar.gz/src/KnownFile.h Changed

@@ -23,11 +23,9 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #ifndef KNOWNFILE_H
 #define KNOWNFILE_H
 
-
 #include "MD4Hash.h"
 #include "SHAHashSet.h"
 
@@ -35,55 +33,70 @@
 #include <common/Path.h>
 
 #include "kademlia/kademlia/Indexed.h"
-#include <ec/cpp/ECID.h>	// Needed for CECID
-#include <atomic>		// Needed for std::atomic (m_ecGen)
-
+#include <ec/cpp/ECID.h> // Needed for CECID
+#include <atomic>        // Needed for std::atomic (m_ecGen)
+#include <list>          // Needed for FileRatingList
 
 #ifdef CLIENT_GUI
 #include <ec/cpp/ECSpecialTags.h>
-#include "RLE.h"			// Needed for RLE_Data, PartFileEncoderData
+#include "RLE.h" // Needed for RLE_Data, PartFileEncoderData
 #endif
 
-#include "Constants.h"		// Needed for PS_*, PR_*
-#include "ClientRef.h"		// Needed for CClientRef
+#include "Constants.h" // Needed for PS_*, PR_*
+#include "ClientRef.h" // Needed for CClientRef
 
 class CFileDataIO;
 class CPacket;
 class CTag;
-
+class CUpDownClient;
 
 namespace Kademlia
 {
-	class CEntry;
+class CEntry;
 }
 
-
 typedef vector<CMD4Hash> ArrayOfCMD4Hash;
 
-
 typedef vector<CTag> ArrayOfCTag;
 
+// A single community rating/comment entry, from a connected ed2k client or from a Kad NOTES lookup.
+// Lives on CAbstractFile so downloads (CPartFile) and search results (CSearchFile) share it.
+class SFileRating
+{
+public:
+	wxString UserName;
+	wxString FileName;
+	sint16 Rating;
+	wxString Comment;
+
+public:
+	SFileRating(const wxString &u, const wxString &f, sint16 r, const wxString &c);
+	SFileRating(const CUpDownClient &client);
+};
+
+typedef std::list<SFileRating> FileRatingList;
 
 class CFileStatistic
 {
 	friend class CKnownFilesRem;
+
 public:
 	CFileStatistic(CKnownFile *parent);
-	void	AddRequest();
-	void	AddAccepted();
-	void    AddTransferred(uint64 bytes);
-	uint16	GetRequests() const			{return requested;}
-	uint16	GetAccepts() const			{return accepted;}
-	uint64  GetTransferred() const			{return transferred;}
-	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; };
-	uint64	GetAllTimeTransferred() const		{return alltimetransferred;}
-	void	SetAllTimeTransferred(uint64 new_value)	{ alltimetransferred = new_value; };
+	void AddRequest();
+	void AddAccepted();
+	void AddTransferred(uint64 bytes);
+	uint16 GetRequests() const { return requested; }
+	uint16 GetAccepts() const { return accepted; }
+	uint64 GetTransferred() const { return transferred; }
+	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; };
+	uint64 GetAllTimeTransferred() const { return alltimetransferred; }
+	void SetAllTimeTransferred(uint64 new_value) { alltimetransferred = new_value; };
 
 private:
-	CKnownFile* fileParent;
+	CKnownFile *fileParent;
 	uint16 requested;
 	uint64 transferred;
 	uint16 accepted;
@@ -93,80 +106,130 @@
 };
 
 /*
-                             CPartFile
-                           /
-                CKnownFile
-              /
+			     CPartFile
+			   /
+		CKnownFile
+	      /
 CAbstractFile
-              \
-                CSearchFile
+	      \
+		CSearchFile
 */
 class CAbstractFile
 {
 public:
 	CAbstractFile();
-	explicit CAbstractFile(const CAbstractFile& other);
+	explicit CAbstractFile(const CAbstractFile &other);
 	virtual ~CAbstractFile() {}
 
-	const CPath&	GetFileName() const	{ return m_fileName; }
-	const CMD4Hash&	GetFileHash() const	{ return m_abyFileHash; }
+	const CPath &GetFileName() const { return m_fileName; }
+	const CMD4Hash &GetFileHash() const { return m_abyFileHash; }
 
-	uint64	GetFileSize() const	{ return m_nFileSize;}
-	bool	IsLargeFile() const	{ return m_nFileSize > (uint64)OLD_MAX_FILE_SIZE; }
+	uint64 GetFileSize() const { return m_nFileSize; }
+	bool IsLargeFile() const { return m_nFileSize > (uint64)OLD_MAX_FILE_SIZE; }
 
-	virtual void SetFileSize(uint64 nFileSize)	{ m_nFileSize = nFileSize; }
-	virtual void SetFileName(const CPath& filename);
+	virtual void SetFileSize(uint64 nFileSize) { m_nFileSize = nFileSize; }
+	virtual void SetFileName(const CPath &filename);
 
 	/* Tags and Notes handling */
 	uint32 GetIntTagValue(uint8 tagname) const;
-	uint32 GetIntTagValue(const wxString& tagname) const;
-	bool GetIntTagValue(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, uint8 tagtype) const;
+	uint32 GetIntTagValue(const wxString &tagname) const;
+	bool GetIntTagValue(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, uint8 tagtype) const;
 	const CTag *GetTag(uint8 tagname) 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; }
+	// Drop the tag with this numeric id, if present. The counterpart to AddTagUnique: without
+	// it a re-probe can only add or replace, never clear, so a field the probe no longer finds
+	// keeps whatever value was there, including one inherited unverified from a search result.
+	bool RemoveTag(uint8 tagname);
+	const ArrayOfCTag &GetTags() const { return m_taglist; }
+	void AddNote(Kademlia::CEntry *pEntry);
+	const CKadEntryPtrList &getNotes() const { return m_kadNotes; }
+
+	// Append the community ratings/comments retrieved on demand from Kad (one entry per
+	// responding node) to `list`. Shared by downloads and search results; the source-client
+	// half of a download's comments is added by CPartFile. Core-only: on amulegui the notes
+	// ride the EC channel as a prebuilt list.
+	void GetKadNotesComments(FileRatingList &list) const;
+
+	// Collect the ratings/comments to display for this file. On the daemon the base version
+	// returns just the Kad notes, and CPartFile overrides it to prepend its connected-source
+	// comments. On amulegui every file type returns the same EC-streamed cache through the
+	// base.
+	virtual void GetRatingAndComments(FileRatingList &list) const;
+
+#ifdef CLIENT_GUI
+	// amulegui cache of the ratings/comments the daemon streams over EC. One implementation for
+	// downloads, shared files and search results: the remote containers fill it from the
+	// EC_TAG_PARTFILE_COMMENTS container, and the base GetRatingAndComments hands it back.
+	const FileRatingList &GetFileRatingList() const { 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));
+	}
+#endif
+
+	// Start an on-demand Kad NOTES lookup for this file's community ratings/comments. Works for
+	// any file the daemon can size locally: the shared list, the download queue, or the current
+	// search results. False if Kad is unavailable, a lookup is already running, or the file is
+	// not eligible. A no-op stub on amulegui, which triggers it over EC.
+	bool RequestKadNoteSearch();
+
+	// True while an on-demand Kad NOTES lookup for this file's comments/ratings
+	// is in flight. Set by RequestKadNoteSearch, cleared when the CSearch ends.
+	void SetKadCommentSearchRunning(bool running) { m_kadCommentSearchRunning = running; }
+	bool IsKadCommentSearchRunning() const { return m_kadCommentSearchRunning; }
 
 	/* Comment and rating */
-	virtual const wxString&	GetFileComment() const { return m_strComment; }
-	virtual int8	GetFileRating()		const { return m_iRating; }
+	virtual const wxString &GetFileComment() const { return m_strComment; }
+	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; }
+	bool HasComment() const { return m_hasComment; }
+	bool HasRating() const { return (m_iUserRating != 0); }
+	int8 UserRating() const { return m_iUserRating; }
+
+	// Recompute the cached "has rating/comment" markers from the current sources. No-op for a
+	// search result, which has none; CPartFile overrides to refresh its download-list
+	// indicator.
+	virtual void UpdateFileRatingCommentAvail() {}
 
 protected:
 	//! CAbstractFile is not assignable.
-	CAbstractFile& operator=(const CAbstractFile);
+	CAbstractFile &operator=(const CAbstractFile);
 
-	CMD4Hash	m_abyFileHash;
+	CMD4Hash m_abyFileHash;
 	// comment/rating are read from the config and cached in these variables,
 	// so make them 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;
+	mutable wxString m_strComment;
+	mutable int8 m_iRating;
+	bool m_hasComment;
+	int8 m_iUserRating;
+	ArrayOfCTag m_taglist;
 	CKadEntryPtrList m_kadNotes;
+	bool m_kadCommentSearchRunning;
+
+#ifdef CLIENT_GUI
+	//! amulegui cache of the ratings/comments streamed from the daemon over EC.
+	FileRatingList m_FileRatingList;
+#endif
 
 private:
-	uint64		m_nFileSize;
-	CPath		m_fileName;
+	uint64 m_nFileSize;
+	CPath m_fileName;
 };
 
-
 class CSearchFile;
 class CFile;
 
-
 class CKnownFile : public CAbstractFile, public CECID
 {
-friend class CHashingTask;
+	friend class CHashingTask;
+	friend class CVerifyLocalDataTask;
+
 public:
 	CKnownFile();
 	CKnownFile(uint32 ecid);
@@ -175,49 +238,46 @@
 	virtual ~CKnownFile();
 
 	/**
-	 * EC-change generation tracking. Each CKnownFile carries a monotonic
-	 * generation number that increments whenever any field exported via
-	 * `CEC_SharedFile_Tag` / `CEC_PartFile_Tag` mutates. Per-connection
-	 * INC_UPDATE handlers compare a file's `m_ecGen` against the
-	 * "highest gen they have already sent" and skip files that have not
-	 * changed since — turning the O(N) per-INC_UPDATE iteration on a 91k-
-	 * shareset node into O(files-actually-changed).
+	 * EC-change generation tracking. Each CKnownFile carries a monotonic generation number that
+	 * increments whenever any field exported via `CEC_SharedFile_Tag` / `CEC_PartFile_Tag`
+	 * mutates. Per-connection INC_UPDATE handlers compare a file's `m_ecGen` against the
+	 * highest gen they have already sent and skip files that have not changed since -- turning
+	 * the O(N) per-INC_UPDATE iteration on a 91k-shareset node into O(files-actually-changed).
 	 *
-	 * The counter is a single process-wide atomic, so every Mark…() call
-	 * yields a unique-and-strictly-ascending gen across all files and
-	 * threads. Per-file `m_ecGen` reads/writes are atomic for the
-	 * upload-disk-IO / hashing-thread call sites that flow through
+	 * The counter is a single process-wide atomic, so every Mark...() call yields a unique,
+	 * strictly ascending gen across all files and threads. Per-file `m_ecGen` reads and writes
+	 * are atomic for the upload-disk-IO / hashing-thread call sites that flow through
 	 * `CFileStatistic::Add{Request,Accepted,Transferred}()`.
 	 *
-	 * See ExternalConn / `Get_EC_Response_GetUpdate` for the consumer
-	 * side of this contract and #713 for context.
+	 * See ExternalConn / `Get_EC_Response_GetUpdate` for the consumer side of this contract,
+	 * and #713 for context.
 	 */
-	void		MarkECChanged();
-	uint64		GetECGen() const		{ return m_ecGen.load(std::memory_order_relaxed); }
-	static uint64	GetGlobalECGen()		{ return s_globalEcGen.load(std::memory_order_relaxed); }
+	void MarkECChanged();
+	uint64 GetECGen() const { return m_ecGen.load(std::memory_order_relaxed); }
+	static uint64 GetGlobalECGen() { return s_globalEcGen.load(std::memory_order_relaxed); }
 
-	void SetFilePath(const CPath& filePath);
-	const CPath& GetFilePath() const { return m_filePath; }
+	void SetFilePath(const CPath &filePath);
+	const CPath &GetFilePath() const { return m_filePath; }
 
 	// 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 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);
+	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);
 	time_t GetLastChangeDatetime() const { return m_lastDateChanged; }
 	void SetLastChangeDatetime(time_t t) { m_lastDateChanged = t; }
 
 	virtual void SetFileSize(uint64 nFileSize);
 
 	// local available part hashs
-	size_t	GetHashCount() const	{return m_hashlist.size();}
-	const CMD4Hash&	GetPartHash(uint16 part) const;
+	size_t GetHashCount() const { return m_hashlist.size(); }
+	const CMD4Hash &GetPartHash(uint16 part) const;
 
 	// nr. of part hashs according the file size wrt ED2K protocol
-	uint32	GetED2KPartHashCount() const { return m_iED2KPartHashCount; }
+	uint32 GetED2KPartHashCount() const { return m_iED2KPartHashCount; }
 
 	// nr. of 9MB parts (file data)
 	inline uint16 GetPartCount() const { return m_iPartCount; }
@@ -229,54 +289,94 @@
 	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);
-	void	UpdateAutoUpPriority();
+	uint8 GetUpPriority() const { return m_iUpPriority; }
+	void SetUpPriority(uint8 newUpPriority, bool bSave = true);
+	bool IsAutoUpPriority() const { return m_bAutoUpPriority; }
+	void SetAutoUpPriority(bool flag);
+	void UpdateAutoUpPriority();
 #ifdef CLIENT_GUI
-	uint16	GetQueuedCount() const { return m_queuedCount; }
+	uint16 GetQueuedCount() const { return m_queuedCount; }
+	// Live upload activity received over EC (issue #466). amulegui has no m_ClientUploadList,
+	// so these mirror the core getters below by returning the last values decoded in
+	// CKnownFilesRem::ProcessItemUpdate.
+	uint32 GetUploadDatarate() const { return m_uploadDatarateEC; }
+	uint16 GetTransferringClientCount() const { return m_transferringClientCountEC; }
 #else
-	uint16	GetQueuedCount() const { return (uint16) m_ClientUploadList.size(); }
+	uint16 GetQueuedCount() const { return (uint16)m_ClientUploadList.size(); }
+	// Live upload activity for this shared file (issue #466), summarised from
+	// m_ClientUploadList -- the upload-side analogue of the download speed and transferring-
+	// source counts. Core-only: amulegui receives these over EC rather than computing them.
+	uint32 GetUploadDatarate() const;          // sum of per-client upload speed (B/s)
+	uint16 GetTransferringClientCount() const; // clients currently US_UPLOADING
+	void VerifyLocalData() const;
 #endif
 
-	bool	LoadHashsetFromFile(const CFileDataIO* file, bool checkhash);
-	void	AddUploadingClient(CUpDownClient* client);
-	void	RemoveUploadingClient(CUpDownClient* client);
+	// Timestamp of the last time data was uploaded for this file, and when the file was
+	// completed or first shared (issue #466). Both persisted in known.met (FT_LASTUPLOADED /
+	// FT_SHAREDSINCE); 0 = unknown. Available in both builds so the EC round-trip carries them
+	// to amulegui.
+	time_t GetLastUpload() const { return m_lastUploadDatetime; }
+	void SetLastUpload(time_t t) { m_lastUploadDatetime = t; }
+	time_t GetDateShared() const { return m_dateShared; }
+	void SetDateShared(time_t t) { m_dateShared = t; }
 
-	// comment
-	const wxString&	GetFileComment()	const	{ if (!m_bCommentLoaded) LoadComment(); return m_strComment; }
-	int8	GetFileRating()			const	{ if (!m_bCommentLoaded) LoadComment(); return m_iRating; }
+	bool LoadHashsetFromFile(const CFileDataIO *file, bool checkhash);
+	void AddUploadingClient(CUpDownClient *client);
+	void RemoveUploadingClient(CUpDownClient *client);
 
-	void	SetFileCommentRating(const wxString& strNewComment, int8 iNewRating);
-	void	SetPublishedED2K( bool val );
-	bool	GetPublishedED2K() const	{return m_PublishedED2K;}
+	// 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 */
-	uint32	GetKadFileSearchID() const { return kadFileSearchID; }
+	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; }
+	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 function.
-	uint32	GetLastPublishTimeKadSrc() const { return m_lastPublishTimeKadSrc; }
-	void	SetLastPublishTimeKadSrc(uint32 time, uint32 buddyip) { m_lastPublishTimeKadSrc = time; m_lastBuddyIP = buddyip;}
+	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 GetLastPublishBuddy() const { return m_lastBuddyIP; }
+	void SetLastPublishTimeKadNotes(uint32 time) { m_lastPublishTimeKadNotes = time; }
+	uint32 GetLastPublishTimeKadNotes() const { return m_lastPublishTimeKadNotes; }
 
-	bool	PublishSrc();
-	bool	PublishNotes();
+	bool PublishSrc();
+	bool PublishNotes();
 
-	// TODO: This must be implemented if we ever want to have metadata.
-	uint32	GetMetaDataVer() const { return /*m_uMetaDataVer*/ 0; }
+	// Nonzero when this file has verified media metadata attached, probed by MediaProbe at
+	// share-add time. Derived from tag presence: a nonzero FT_MEDIA_LENGTH is the only source
+	// of this tag in aMule, so its presence is the "probed, with data worth publishing" signal
+	// Kad's publisher gates on.
+	uint32 GetMetaDataVer() const;
 
 	// file sharing
-	virtual	CPacket*	CreateSrcInfoPacket(const CUpDownClient* forClient, uint8 byRequestedVersion, uint16 nRequestedOptions);
-	void	CreateOfferedFilePacket(CMemFile* files, class CServer* pServer, CUpDownClient* pClient);
-
-	virtual void	UpdatePartsInfo();
+	virtual CPacket *CreateSrcInfoPacket(
+		const CUpDownClient *forClient, uint8 byRequestedVersion, uint16 nRequestedOptions);
+	void CreateOfferedFilePacket(CMemFile *files, class CServer *pServer, CUpDownClient *pClient);
 
+	virtual void UpdatePartsInfo();
 
 	CFileStatistic statistic;
 
@@ -290,52 +390,44 @@
 	SourceSet m_ClientUploadList;
 	ArrayOfUInts16 m_AvailPartFrequency;
 
-	/**
-	 * Returns a base-16 encoding of the master hash, or
-	 * an empty string if no such hash exists.
-	 */
+	/// Base-16 encoding of the master hash, or an empty string if there is none.
 	wxString GetAICHMasterHash() const;
 	/** Returns true if the AICH-Hashset is valid, and verified or complete. */
 	bool HasProperAICHHashSet() const;
 
-	/**
-	 * Updates the frequency of uploading parts from with the data the client provides.
-	 *
-	 * @param client The clients whose 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
-	 * 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 );
+	/// Updates the frequency list of uploading file parts from @a client's upparts-status,
+	/// incrementing or decrementing per @a increment. Clients should call it whenever they
+	/// update their upparts-status, and when they are added to or removed from the file.
+	void UpdateUpPartsFrequency(CUpDownClient *client, bool increment);
+
+	static void CreateHashFromHashlist(const ArrayOfCMD4Hash &hashes, CMD4Hash *Output);
 
-	static void CreateHashFromHashlist(const ArrayOfCMD4Hash& hashes, CMD4Hash* Output);
+	void ClearPriority();
 
-	void	ClearPriority();
+	time_t m_lastDateChanged;
 
-	time_t	m_lastDateChanged;
+	// Live upload activity (issue #466), persisted in known.met so it survives restarts.
+	// m_lastUploadDatetime is stamped whenever data is sent for this file; m_dateShared once,
+	// when the file is completed or first shared. 0 = unknown.
+	time_t m_lastUploadDatetime;
+	time_t m_dateShared;
 
-	// "Last time aMule saw this exact (name, date, size) match a real
-	// file." Refreshed by CKnownFileList::FindKnownFile and the
-	// "already on the list" branch in Append. Persisted via
-	// FT_LASTSEEN. Drives the TTL prune in CKnownFileList::Save --
-	// records whose lastSeen is older than the TTL window are dropped
-	// (both live and duplicate-list entries), capping known.met
-	// growth at a function of *recently active* unique hashes
-	// rather than lifetime-of-the-profile uniques.
-	uint32	GetLastSeen() const { return m_lastSeen; }
-	void	SetLastSeen(uint32 t) { m_lastSeen = t; }
+	// "Last time aMule saw this exact (name, date, size) match a real file." Refreshed by
+	// CKnownFileList::FindKnownFile and the "already on the list" branch in Append, persisted
+	// via FT_LASTSEEN. Drives the TTL prune in CKnownFileList::Save, capping known.met growth
+	// at a function of RECENTLY ACTIVE unique hashes rather than lifetime-of-the-profile ones.
+	uint32 GetLastSeen() const { return m_lastSeen; }
+	void SetLastSeen(uint32 t) { m_lastSeen = t; }
 
 	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; }
+	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; }
 
-	virtual	void SetHashingProgress(uint16) const {}	// does something for CPartFile only
-	uint16	GetHashingProgress() const	{ return m_hashingProgress; }
+	virtual void SetHashingProgress(uint16 val) const;
+	uint16 GetHashingProgress() const { return m_hashingProgress; }
 
 #ifdef CLIENT_GUI
 	CKnownFile(const CEC_SharedFile_Tag *);
@@ -343,81 +435,83 @@
 	RLE_Data m_partStatus;
 
 private:
-	uint8	m_iUpPriorityEC;
-	uint16	m_queuedCount;
+	uint8 m_iUpPriorityEC;
+	uint16 m_queuedCount;
+	uint32 m_uploadDatarateEC;
+	uint16 m_transferringClientCountEC;
 
 protected:
 	//! The AICH master-hash, if it is known.
-	wxString	m_AICHMasterHash;
+	wxString m_AICHMasterHash;
 #else
-	virtual void SetFileName(const CPath& filename);
+	virtual void SetFileName(const CPath &filename);
 
 	// AICH
-	CAICHHashSet* GetAICHHashset() const		{ return m_pAICHHashSet; }
-	void SetAICHHashset(CAICHHashSet* val)		{ m_pAICHHashSet = val; }
+	CAICHHashSet *GetAICHHashset() const { return m_pAICHHashSet; }
+	void SetAICHHashset(CAICHHashSet *val) { m_pAICHHashSet = val; }
 
 protected:
-	CAICHHashSet*	m_pAICHHashSet;
+	CAICHHashSet *m_pAICHHashSet;
 #endif
 
-	bool	LoadTagsFromFile(const CFileDataIO* file);
-	bool	LoadDateFromFile(const CFileDataIO* file);
-	void	LoadComment() const;
+	bool LoadTagsFromFile(const CFileDataIO *file);
+	bool LoadDateFromFile(const CFileDataIO *file);
+	void LoadComment() const;
 	ArrayOfCMD4Hash m_hashlist;
-	CPath	m_filePath;
-
-	static void CreateHashFromFile(class CFileAutoClose& file, uint64 offset, uint32 Length, CMD4Hash* Output, CAICHHashTree* pShaHashOut);
-	static void CreateHashFromInput(const uint8_t* input, uint32 Length, CMD4Hash* Output, CAICHHashTree* pShaHashOut);
-
-	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;
-	// Index of part being hashed, 0: no hashing in progress.
-	// The known file is const in the hashing thread, so rather drill this little hole by making it mutable
-	// than opening it all up.
-	mutable	uint16 m_hashingProgress;
+	CPath m_filePath;
+
+	static void CreateHashFromFile(class CFileAutoClose &file,
+		uint64 offset,
+		uint32 Length,
+		CMD4Hash *Output,
+		CAICHHashTree *pShaHashOut);
+	static void CreateHashFromInput(
+		const uint8_t *input, uint32 Length, CMD4Hash *Output, CAICHHashTree *pShaHashOut);
+
+	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;
+	// Index of the part being hashed, 0 for no hashing in progress. The known file is const in
+	// the hashing thread, so drill this little hole with mutable rather than opening it all up.
+	mutable uint16 m_hashingProgress;
 
 	/* Kad stuff */
 	Kademlia::WordList wordlist;
-	uint32	kadFileSearchID;
-	uint32	m_lastPublishTimeKadSrc;
-	uint32	m_lastPublishTimeKadNotes;
-	uint32	m_lastBuddyIP;
+	uint32 kadFileSearchID;
+	uint32 m_lastPublishTimeKadSrc;
+	uint32 m_lastPublishTimeKadNotes;
+	uint32 m_lastBuddyIP;
 
-	uint32	m_lastSeen;
+	uint32 m_lastSeen;
 
-	bool	m_showSources;
-	bool	m_showPeers;
+	bool m_showSources;
+	bool m_showPeers;
 
 public:
 	/**
 	 * Returns the ed2k:// link for this file, cached for EC response building.
 	 *
-	 * `CreateED2kLink` is hot in EC response construction (the GUI / web /
-	 * cmd clients call GET_SHARED_FILES at FULL or INC_UPDATE levels and
-	 * the listener rebuilds every shared-file tag every cycle). Its CFormat
-	 * + filename Cleanup work was the single biggest CPU consumer on EC
-	 * dispatch in profiling (see #713). Cache the "no sources" base form
-	 * here; the optional |sources,IP:port|/ suffix is a tiny CFormat
-	 * appended at request time and depends on dynamic state
-	 * (IsConnected / IsFirewalled / GetID / GetPort) that the cache cannot
-	 * hold.
+	 * `CreateED2kLink` is hot in EC response construction (the GUI / web / cmd clients call
+	 * GET_SHARED_FILES at FULL or INC_UPDATE levels and the listener rebuilds every shared-file
+	 * tag every cycle). Its CFormat + filename Cleanup work was the single biggest CPU consumer
+	 * on EC dispatch in profiling (see #713). Cache the "no sources" base form here; the
+	 * optional |sources,IP:port|/ suffix is a tiny CFormat appended at request time and depends
+	 * on dynamic state (IsConnected / IsFirewalled / GetID / GetPort) the cache cannot hold.
 	 *
-	 * Invalidated by `SetFileName` (the only user-facing event that
-	 * affects the link body — filename, size and hash are otherwise stable
-	 * across the lifetime of a CKnownFile / CPartFile).
+	 * Invalidated by `SetFileName`, the only user-facing event that affects the link body --
+	 * filename, size and hash are otherwise stable across the lifetime of a CKnownFile /
+	 * CPartFile.
 	 */
-	const wxString& GetCachedED2kLinkBase() const;
+	const wxString &GetCachedED2kLinkBase() const;
 
 	/**
-	 * Full ed2k:// link as needed by EC responses — cached base + the
-	 * source suffix when add_source is true. The caller decides
-	 * add_source from current ED2K connection state.
+	 * Full ed2k:// link as needed by EC responses: cached base plus the source suffix when
+	 * add_source is true. The caller decides add_source from current ED2K connection state.
 	 */
 	wxString GetED2kLinkForEC(bool add_source) const;
 
@@ -428,8 +522,8 @@
 	/** Common initializations for constructors. */
 	void Init();
 
-	// EC change-generation tracking — see public MarkECChanged() doc above.
-	std::atomic<uint64> m_ecGen{0};
+	// EC change-generation tracking -- see public MarkECChanged() doc above.
+	std::atomic<uint64> m_ecGen{ 0 };
 	static std::atomic<uint64> s_globalEcGen;
 };

amule-3.0.1.tar.gz/src/KnownFileList.cpp -> amule-3.1.0.tar.gz/src/KnownFileList.cpp Changed

@@ -23,61 +23,48 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "KnownFileList.h"	// Interface declarations
-#include "GuiEvents.h"		// Notify_KnownFileBeingDestroyed
+#include "KnownFileList.h" // Interface declarations
+#include "GuiEvents.h"     // Notify_KnownFileBeingDestroyed
 
 #include <common/DataFileVersion.h>
 
 #include <algorithm>
 #include <map>
-#include <memory>		// Do_not_auto_remove (lionel's Mac, 10.3)
+#include <memory> // Do_not_auto_remove (lionel's Mac, 10.3)
 #include <set>
 #include <vector>
-#include "DownloadQueue.h"	// Needed for theApp->downloadqueue access
-#include "PartFile.h"		// Needed for CPartFile
+#include "DownloadQueue.h" // Needed for theApp->downloadqueue access
+#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 "SearchList.h" // Needed for UpdateSearchFileByHash
 #include "SharedFileList.h"
 #include <common/Format.h>
-#include "Preferences.h"	// Needed for thePrefs
+#include "Preferences.h" // Needed for thePrefs
 
-// Max duplicate-list records retained per hash. Unique hashes always
-// keep their live m_knownFileMap entry; this caps only the historical
-// (name/date) variants in m_duplicateFileList. 8 covers daily-touch /
-// weekly-snapshot / monthly-backup cycles while bounding the on-disk
-// known.met at unique_hashes × (1 + cap).
+// Max duplicate-list records retained per hash. Unique hashes always keep their live m_knownFileMap
+// entry; this caps only the historical (name/date) variants in m_duplicateFileList. 8 covers daily-
+// touch / weekly-snapshot / monthly-backup cycles while bounding known.met at unique_hashes * (1 +
+// cap).
 #define KNOWN_DUPLICATE_HASH_CAP 8
 
-// TTL after which a record (live or duplicate) whose lastSeen hasn't
-// been refreshed gets dropped. A real file currently on disk has its
-// lastSeen bumped by FindKnownFile / IsOnDuplicates / Append every
-// share-scan; anything left stale for this long either lost its file
-// or had its mtime/name change in a way that won't recur (mtime is
-// monotone-forward in practice, so a duplicate captured at an older
-// mtime will not match again). 30 days catches most pathological
-// touch loops on the next save without losing legitimate intermittent
-// matches.
-#define KNOWN_DUPLICATE_TTL_SECS	(30 * 24 * 60 * 60)
-
+// TTL after which a record (live or duplicate) whose lastSeen has not been refreshed is dropped. A
+// file on disk has its lastSeen bumped by FindKnownFile / IsOnDuplicates / Append every share-scan;
+// anything stale this long either lost its file or had its mtime/name change in a way that will not
+// recur (mtime is monotone-forward in practice). 30 days catches most pathological touch loops
+// without losing intermittent matches.
+#define KNOWN_DUPLICATE_TTL_SECS (30 * 24 * 60 * 60)
 
 // This function is inlined for performance
 inline bool CKnownFileList::KnownFileMatches(
-	CKnownFile *knownFile,
-	const CPath& filename,
-	uint32 in_date,
-	uint64 in_size) const
+	CKnownFile *knownFile, const CPath &filename, uint32 in_date, uint64 in_size) const
 {
-	return
-		(knownFile->GetLastChangeDatetime() == (time_t)in_date) &&
-		(knownFile->GetFileSize() == in_size) &&
-		(knownFile->GetFileName() == filename);
+	return (knownFile->GetLastChangeDatetime() == (time_t)in_date) &&
+	       (knownFile->GetFileSize() == in_size) && (knownFile->GetFileName() == filename);
 }
 
-
 CKnownFileList::CKnownFileList()
 {
 	accepted = 0;
@@ -90,13 +77,11 @@
 	Init();
 }
 
-
 CKnownFileList::~CKnownFileList()
 {
 	Clear();
 }
 
-
 bool CKnownFileList::Init()
 {
 	CFile file;
@@ -122,19 +107,16 @@
 
 		wxMutexLocker sLock(list_mut);
 		uint32 RecordsNumber = file.ReadUInt32();
-		AddDebugLogLineN(logKnownFiles, CFormat("Reading %i known files from file format 0x%2.2x.")
-			% RecordsNumber % version);
-
-		// Keep the size-map index live during the load. Append() is O(log N)
-		// on every record, but on each MD4 hash collision (real-world
-		// libraries hit these whenever the same content was indexed under
-		// two paths/names) it falls back to IsOnDuplicates(name, date, size).
-		// Without a duplicate-size index, IsOnDuplicates scans
-		// m_duplicateFileList linearly, so the dedup cost grows with each
-		// duplicate appended — O(N^2) over the whole load. Prebuilding the
-		// (empty) index here lets Append maintain it incrementally, giving
-		// the O(log N) equal_range fast path on every collision check.
-		// Issue #562 startup gap, ~36 s on a 200 k-file library.
+		AddDebugLogLineN(logKnownFiles,
+			CFormat("Reading %i known files from file format 0x%2.2x.") % RecordsNumber %
+				version);
+
+		// Keep the size-map index live during the load. Append() is O(log N) per record,
+		// but on each MD4 hash collision it falls back to IsOnDuplicates(name, date, size),
+		// which without a duplicate-size index scans m_duplicateFileList linearly -- O(N^2)
+		// over the whole load. Prebuilding the empty index lets Append maintain it
+		// incrementally, so every collision check takes the equal_range fast path (issue
+		// #562, a ~36 s startup gap on a 200 k-file library).
 		PrepareIndex();
 		for (uint32 i = 0; i < RecordsNumber; i++) {
 			CScopedPtr<CKnownFile> record;
@@ -143,17 +125,18 @@
 					CFormat("Known file read: %s") % record->GetFileName());
 				Append(record.release());
 			} else {
-				AddLogLineC(_("Failed to load entry in known file list, file may be corrupt"));
+				AddLogLineC(
+					_("Failed to load entry in known file list, file may be corrupt"));
 			}
 		}
 		ReleaseIndex();
 		AddDebugLogLineN(logKnownFiles, "Finished reading known files");
 
 		return true;
-	} catch (const CInvalidPacket& e) {
+	} catch (const CInvalidPacket &e) {
 		ReleaseIndex();
 		AddLogLineC(_("Invalid entry in known file list, file may be corrupt: ") + e.what());
-	} catch (const CSafeIOException& e) {
+	} catch (const CSafeIOException &e) {
 		ReleaseIndex();
 		AddLogLineC(CFormat(_("IO error while reading %s file: %s")) % m_filename % e.what());
 	}
@@ -161,42 +144,31 @@
 	return false;
 }
 
-
 void CKnownFileList::Save()
 {
-	// Acquire the lock before opening the .new file. Save() is called
-	// from both the main thread (on shutdown / scheduled persist) and
-	// the hashing worker thread (CHashingTask::OnLastTask). If two
-	// callers raced past the open, both would create known.met.new at
-	// the same path, the first to Close() would rename it away, and
-	// the second's rename would fail with ENOENT -- producing the
-	// "Impossible to get permissions for file 'known.met.new'" /
-	// "couldn't be renamed 'known.met.new' -> 'known.met'" pair seen
-	// in #86. Holding list_mut around the whole save serialises the
-	// .new lifecycle. The list itself is read-only inside, so this
-	// doesn't widen the existing critical section meaningfully.
+	// Acquire the lock before opening the .new file. Save() is called from both the main thread
+	// and the hashing worker (CHashingTask::OnLastTask); if two callers raced past the open,
+	// both would create known.met.new at the same path, the first to Close() would rename it
+	// away, and the second's rename would fail with ENOENT (#86). Holding list_mut around the
+	// whole save serialises the .new lifecycle; the list is read-only inside, so the critical
+	// section is not meaningfully widened.
 	wxMutexLocker sLock(list_mut);
 
-	// Snapshot the in-use set under our own lock. Taking the snapshot
-	// before locking left a TOCTOU window where the main thread could
-	// add a CKnownFile to sharedfiles between snapshot and prune; the
-	// prune then deleted a file that sharedfiles still indexed,
-	// leaving a dangling pointer that the EC encoder map kept feeding
-	// to Get_EC_Response_GetUpdate -> use-after-free crash (#685).
+	// Snapshot the in-use set under our own lock. Taking it before locking left a TOCTOU window
+	// where the main thread could add a CKnownFile to sharedfiles between snapshot and prune;
+	// the prune then deleted a file sharedfiles still indexed, and the EC encoder map kept
+	// feeding the dangling pointer to Get_EC_Response_GetUpdate (#685).
 	//
-	// Brief overlap of knownfiles -> sharedfiles / downloadqueue locks
-	// is safe: no code path acquires those in the reverse order while
-	// holding the first. sharedfiles never calls into knownfiles under
-	// its own lock, and downloadqueue never calls into knownfiles at
-	// all.
-	std::unordered_set<CKnownFile*> inUse;
+	// Brief overlap of the knownfiles -> sharedfiles / downloadqueue locks is safe: nothing
+	// acquires those in the reverse order while holding the first.
+	std::unordered_set<CKnownFile *> inUse;
 	if (theApp && theApp->sharedfiles) {
-		std::vector<CKnownFile*> sharedSnapshot;
+		std::vector<CKnownFile *> sharedSnapshot;
 		theApp->sharedfiles->CopyFileList(sharedSnapshot);
 		inUse.insert(sharedSnapshot.begin(), sharedSnapshot.end());
 	}
 	if (theApp && theApp->downloadqueue) {
-		std::vector<CPartFile*> dqSnapshot;
+		std::vector<CPartFile *> dqSnapshot;
 		theApp->downloadqueue->CopyFileList(dqSnapshot, true);
 		inUse.insert(dqSnapshot.begin(), dqSnapshot.end());
 	}
@@ -211,9 +183,8 @@
 	AddDebugLogLineN(logKnownFiles, CFormat("start saving %s") % m_filename);
 
 	try {
-		// Kry - This is the version, but we don't know it till
-		// we know if any largefile is saved. This allows the list
-		// to be compatible with previous versions.
+		// Kry - This is the version, but we do not know it until we know whether any large
+		// file is saved. This keeps the list compatible with previous versions.
 		bool bContainsAnyLargeFiles = false;
 		file.WriteUInt8(0);
 
@@ -222,7 +193,7 @@
 		// Duplicates handling. Duplicates needs to be saved first,
 		// since it is the last entry that gets used.
 		KnownFileList::iterator itDup = m_duplicateFileList.begin();
-		for ( ; itDup != m_duplicateFileList.end(); ++itDup ) {
+		for (; itDup != m_duplicateFileList.end(); ++itDup) {
 			(*itDup)->WriteToFile(&file);
 			if ((*itDup)->IsLargeFile()) {
 				bContainsAnyLargeFiles = true;
@@ -240,53 +211,59 @@
 		file.Seek(0);
 		file.WriteUInt8(bContainsAnyLargeFiles ? MET_HEADER_WITH_LARGEFILES : MET_HEADER);
 		file.Close();
-	} catch (const CIOFailureException& e) {
+	} catch (const CIOFailureException &e) {
 		AddLogLineC(CFormat(_("Error while saving %s file: %s")) % m_filename % e.what());
 	}
 	AddDebugLogLineN(logKnownFiles, CFormat("finished saving %s") % m_filename);
 }
 
+size_t CKnownFileList::GetKnownFileCount() const
+{
+	wxMutexLocker sLock(list_mut);
+	return m_knownFileMap.size();
+}
 
-bool CKnownFileList::IsKnownFile(const CKnownFile* file) const
+bool CKnownFileList::IsKnownFile(const CKnownFile *file) const
 {
-	// Pointer-value scan over the canonical map; safe to call with a
-	// possibly-freed `file` pointer (no deref). Used by
-	// OnFinishedHashing / OnFinishedAICHHashing to validate the
-	// owner pointer survived hashing. m_knownFileMap is hash-keyed
-	// not pointer-keyed, so we walk it — linear in shareset size but
-	// invoked only on rare events (hash completion). For 100 k+
-	// sharesets this is the cost; a per-pointer index would speed
-	// it up but isn't justified for the call rate.
+	// Pointer-value scan over both lists; safe to call with a possibly-freed `file` pointer,
+	// since nothing is dereferenced. Used by OnFinishedHashing / OnFinishedAICHHashing to
+	// validate that the owner pointer survived hashing. Neither container is pointer-keyed, so
+	// both are walked: linear in shareset size, but only on hash completion, which is rare
+	// enough not to justify a per-pointer index.
 	wxMutexLocker sLock(list_mut);
-	for (CKnownFileMap::const_iterator it = m_knownFileMap.begin();
-		it != m_knownFileMap.end(); ++it) {
-		if (it->second == file) {
+	for (const auto &entry : m_knownFileMap) {
+		if (entry.second == file) {
+			return true;
+		}
+	}
+	// The duplicate list counts as alive: this asks whether the record still exists, not
+	// whether it is canonical. PromoteToCanonical moves a live record out of the map whenever
+	// the share scan finds a better copy for its hash, and an AICH result landing after that
+	// must not read as "owner was destroyed" -- the result would be dropped with a log line
+	// saying the opposite of what happened. A record that really was freed is erased from this
+	// list by PruneDuplicates under the same lock, so the freed case still answers false.
+	for (const CKnownFile *record : m_duplicateFileList) {
+		if (record == file) {
 			return true;
 		}
 	}
 	return false;
 }
 
-
 void CKnownFileList::Clear()
 {
 	wxMutexLocker sLock(list_mut);
 
-	// Fire Notify_KnownFileBeingDestroyed for every file we're about
-	// to delete, so subscribers (list ctrls, dialogs, AICH static
-	// list, write-thread flushList, EC client-side m_uploadingfile /
-	// m_reqfile fields, etc.) strip their references before the
-	// `delete`. Pointer-value comparison only; the objects are still
-	// alive at the time of the notify, but subscribers must not
-	// deref them on the main-thread dispatch (which may run after
-	// DeleteContents has freed them). See MuleNotify::
-	// KnownFileBeingDestroyed (GuiEvents.cpp).
-	for (CKnownFileMap::const_iterator it = m_knownFileMap.begin();
-		it != m_knownFileMap.end(); ++it) {
+	// Fire Notify_KnownFileBeingDestroyed for every file about to be deleted, so subscribers
+	// (list ctrls, dialogs, the AICH static list, the write thread's flushList, EC client-side
+	// m_uploadingfile / m_reqfile) strip their references before the delete. Pointer-value
+	// comparison only: the objects are alive at notify time, but subscribers must not deref
+	// them on the main-thread dispatch, which may run after DeleteContents has freed them.
+	for (CKnownFileMap::const_iterator it = m_knownFileMap.begin(); it != m_knownFileMap.end(); ++it) {
 		Notify_KnownFileBeingDestroyed(it->second);
 	}
-	for (KnownFileList::const_iterator it = m_duplicateFileList.begin();
-		it != m_duplicateFileList.end(); ++it) {
+	for (KnownFileList::const_iterator it = m_duplicateFileList.begin(); it != m_duplicateFileList.end();
+		++it) {
 		Notify_KnownFileBeingDestroyed(*it);
 	}
 
@@ -297,53 +274,42 @@
 	m_initialShareScanComplete = false;
 }
 
-
 void CKnownFileList::MarkInitialShareScanComplete()
 {
 	wxMutexLocker sLock(list_mut);
 	m_initialShareScanComplete = true;
 }
 
-
-void CKnownFileList::CollectLiveAICHRoots(
-	std::unordered_set<CAICHHash> & out)
+void CKnownFileList::CollectLiveAICHRoots(std::unordered_set<CAICHHash> &out)
 {
 	wxMutexLocker sLock(list_mut);
 	out.reserve(out.size() + m_knownFileMap.size() + m_duplicateFileList.size());
-	for (CKnownFileMap::const_iterator it = m_knownFileMap.begin();
-		it != m_knownFileMap.end(); ++it) {
-		const CKnownFile * f = it->second;
+	for (CKnownFileMap::const_iterator it = m_knownFileMap.begin(); it != m_knownFileMap.end(); ++it) {
+		const CKnownFile *f = it->second;
 		if (f && f->HasProperAICHHashSet()) {
 			out.insert(f->GetAICHHashset()->GetMasterHash());
 		}
 	}
-	// Duplicate-list records can also be the only owner of an AICH
-	// master hash, because a hash-collision demote in Append parks
-	// the previous record (including its hashset) on the duplicate
-	// list while the new record takes over m_knownFileMap. If we
-	// drop the duplicate's AICH from known2_64.met and then the
-	// duplicate later gets re-promoted (mtime restore) we'd
-	// silently lose its hashset; cheap to keep both sets here.
-	for (KnownFileList::const_iterator it = m_duplicateFileList.begin();
-		it != m_duplicateFileList.end(); ++it) {
-		const CKnownFile * f = *it;
+	// Duplicate-list records can also be the only owner of an AICH master hash, because a hash-
+	// collision demote in Append parks the previous record and its hashset on the duplicate
+	// list. Dropping the duplicate's AICH from known2_64.met would silently lose that hashset
+	// if the duplicate were later re-promoted by an mtime restore; keeping both sets is cheap.
+	for (KnownFileList::const_iterator it = m_duplicateFileList.begin(); it != m_duplicateFileList.end();
+		++it) {
+		const CKnownFile *f = *it;
 		if (f && f->HasProperAICHHashSet()) {
 			out.insert(f->GetAICHHashset()->GetMasterHash());
 		}
 	}
 }
 
-
-CKnownFile* CKnownFileList::FindKnownFile(
-	const CPath& filename,
-	time_t in_date,
-	uint64 in_size)
+CKnownFile *CKnownFileList::FindKnownFile(const CPath &filename, time_t in_date, uint64 in_size)
 {
 	wxMutexLocker sLock(list_mut);
-	const uint32 now = (uint32) time(NULL);
+	const uint32 now = (uint32)time(NULL);
 
 	if (m_knownSizeMap) {
-		const auto key = std::make_pair((uint32) in_size, (uint32) in_date);
+		const auto key = std::make_pair((uint32)in_size, (uint32)in_date);
 		std::pair<KnownFileSizeMap::const_iterator, KnownFileSizeMap::const_iterator> p;
 		p = m_knownSizeMap->equal_range(key);
 		for (KnownFileSizeMap::const_iterator it = p.first; it != p.second; ++it) {
@@ -354,8 +320,8 @@
 			}
 		}
 	} else {
-		for (CKnownFileMap::const_iterator it = m_knownFileMap.begin();
-			 it != m_knownFileMap.end(); ++it) {
+		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)) {
 				cur_file->SetLastSeen(now);
@@ -364,12 +330,11 @@
 		}
 	}
 
-	// Pin any duplicate-list match against this session's prune so a
-	// real on-disk file's record isn't dropped just because its hash
-	// is also held by a more-recent live entry (the dual-content-copy
-	// case: same hash in two shared paths -- one becomes m_Files_map,
-	// the other only ever appears here).
-	CKnownFile * dup = IsOnDuplicates(filename, in_date, in_size);
+	// Pin any duplicate-list match against this session's prune, so a real on-disk file's
+	// record is not dropped just because its hash is also held by a more-recent live entry --
+	// the dual-content-copy case, where the same hash sits in two shared paths and only one
+	// becomes m_Files_map.
+	CKnownFile *dup = IsOnDuplicates(filename, in_date, in_size);
 	if (dup) {
 		dup->SetLastSeen(now);
 		m_pinnedDuplicates.insert(dup);
@@ -377,14 +342,10 @@
 	return dup;
 }
 
-
-CKnownFile *CKnownFileList::IsOnDuplicates(
-	const CPath& filename,
-	uint32 in_date,
-	uint64 in_size) const
+CKnownFile *CKnownFileList::IsOnDuplicates(const CPath &filename, uint32 in_date, uint64 in_size) const
 {
 	if (m_duplicateSizeMap) {
-		const auto key = std::make_pair((uint32) in_size, (uint32) in_date);
+		const auto key = std::make_pair((uint32)in_size, (uint32)in_date);
 		std::pair<KnownFileSizeMap::const_iterator, KnownFileSizeMap::const_iterator> p;
 		p = m_duplicateSizeMap->equal_range(key);
 		for (KnownFileSizeMap::const_iterator it = p.first; it != p.second; ++it) {
@@ -395,7 +356,8 @@
 		}
 	} else {
 		for (KnownFileList::const_iterator it = m_duplicateFileList.begin();
-			 it != m_duplicateFileList.end(); ++it) {
+			it != m_duplicateFileList.end();
+			++it) {
 			CKnownFile *cur_file = *it;
 			if (KnownFileMatches(cur_file, filename, in_date, in_size)) {
 				return cur_file;
@@ -405,8 +367,7 @@
 	return NULL;
 }
 
-
-CKnownFile* CKnownFileList::FindKnownFileByID(const CMD4Hash& hash)
+CKnownFile *CKnownFileList::FindKnownFileByID(const CMD4Hash &hash)
 {
 	wxMutexLocker sLock(list_mut);
 
@@ -418,11 +379,87 @@
 		}
 	}
 	return NULL;
+}
 
+void CKnownFileList::EraseFromSizeMap(KnownFileSizeMap *sizeMap, CKnownFile *record)
+{
+	// Caller must hold list_mut.
+	//
+	// The key is recomputed from the record's CURRENT size and mtime, so a record whose either
+	// value changed while it was indexed cannot be found and the erase silently leaves the old
+	// entry behind. Every caller today either indexes a record it has not mutated or sets the
+	// new values before the first insert, but a future caller that mutates an already-indexed
+	// record has to erase under the old key first.
+	if (!sizeMap) {
+		return;
+	}
+	const auto key =
+		std::make_pair((uint32)record->GetFileSize(), (uint32)record->GetLastChangeDatetime());
+	const auto range = sizeMap->equal_range(key);
+	for (auto hit = range.first; hit != range.second; ++hit) {
+		if (hit->second == record) {
+			sizeMap->erase(hit);
+			return;
+		}
+	}
 }
 
+void CKnownFileList::InsertIntoSizeMap(KnownFileSizeMap *sizeMap, CKnownFile *record)
+{
+	// Caller must hold list_mut.
+	if (!sizeMap) {
+		return;
+	}
+	sizeMap->insert(std::make_pair(
+		std::make_pair((uint32)record->GetFileSize(), (uint32)record->GetLastChangeDatetime()),
+		record));
+}
+
+bool CKnownFileList::PromoteToCanonical(CKnownFile *file)
+{
+	if (!file) {
+		return false;
+	}
+
+	wxMutexLocker sLock(list_mut);
 
-bool CKnownFileList::SafeAddKFile(CKnownFile* toadd, bool afterHashing)
+	const CMD4Hash &tkey = file->GetFileHash();
+	const auto it = m_knownFileMap.find(tkey);
+	if (it == m_knownFileMap.end() || it->second == file) {
+		// Already canonical, or this hash has no live record at all -- a freshly hashed
+		// file becomes canonical through Append, so there is nothing to take over here.
+		return false;
+	}
+
+	CKnownFile *demoted = it->second;
+
+	// Same swap Append performs when a later known.met entry takes over a hash, minus the Kad
+	// withdrawal: `demoted` cannot be in the shared list (m_Files_map is hash-keyed and `file`
+	// holds that slot), and only CSharedFileList::AddFile publishes keywords, so it has none to
+	// remove.
+	m_duplicateFileList.push_back(demoted);
+	EraseFromSizeMap(m_knownSizeMap, demoted);
+	InsertIntoSizeMap(m_duplicateSizeMap, demoted);
+
+	// `file` moves the other way. It is on the duplicate list in the case this exists for, but
+	// not necessarily -- an already-canonical record short-circuits above.
+	m_duplicateFileList.remove(file);
+	EraseFromSizeMap(m_duplicateSizeMap, file);
+	InsertIntoSizeMap(m_knownSizeMap, file);
+	m_knownFileMaptkey = file;
+
+	// m_pinnedDuplicates keeps `file` on purpose: the pin records that this session matched the
+	// record against a real on-disk file, which stays true. It only ever guards duplicate-list
+	// records, so it costs nothing while `file` is canonical and protects it from the cap prune
+	// if a later Append demotes it.
+
+	AddDebugLogLineN(logKnownFiles,
+		CFormat("Duplicate '%s' is now the canonical record for its hash, replacing '%s'") %
+			file->GetFileName().GetPrintable() % demoted->GetFileName().GetPrintable());
+	return true;
+}
+
+bool CKnownFileList::SafeAddKFile(CKnownFile *toadd, bool afterHashing)
 {
 	bool ret;
 	{
@@ -435,66 +472,69 @@
 	return ret;
 }
 
-
 bool CKnownFileList::Append(CKnownFile *Record, bool afterHashing)
 {
 	if (Record->GetFileSize() > 0) {
 		// sanity check if the number of part hashes is correct here
 		if (Record->GetHashCount() != Record->GetED2KPartHashCount()) {
-			AddDebugLogLineC(logKnownFiles, CFormat("%s with size %d should have %d part hashes, but only %d are available")
-				% Record->GetFileName().GetPrintable() % Record->GetFileSize() % Record->GetED2KPartHashCount() % Record->GetHashCount());
+			AddDebugLogLineC(logKnownFiles,
+				CFormat("%s with size %d should have %d part hashes, but only %d are "
+					"available") %
+					Record->GetFileName().GetPrintable() % Record->GetFileSize() %
+					Record->GetED2KPartHashCount() % Record->GetHashCount());
 			return false;
 		}
-		const uint32 now = (uint32) time(NULL);
-		const CMD4Hash& tkey = Record->GetFileHash();
+		const uint32 now = (uint32)time(NULL);
+		const CMD4Hash &tkey = Record->GetFileHash();
 		CKnownFileMap::iterator it = m_knownFileMap.find(tkey);
 		if (it == m_knownFileMap.end()) {
-			// Only stamp lastSeen=now when this is a confirmed
-			// sighting of the file on disk (post-hash via
-			// CHashingTask, or any other afterHashing=true path).
-			// During known.met load Append is called with
-			// afterHashing=false; touching lastSeen here would
-			// overwrite either the FT_LASTSEEN tag we just loaded
-			// or the m_lastDateChanged fallback that
-			// CKnownFile::LoadFromFile substitutes when the tag
-			// is absent. The latter is the only thing that lets
-			// the TTL prune do useful migration work on an old
-			// known.met -- if we trample it, every loaded record
-			// looks "fresh" and TTL never evicts anything (this
-			// is exactly what bit ngosang on the first PR test).
+			// Only stamp lastSeen=now for a confirmed sighting of the file on disk
+			// (post-hash via CHashingTask, or any other afterHashing=true path). During
+			// known.met load Append runs with afterHashing=false, and touching lastSeen
+			// there would overwrite either the FT_LASTSEEN tag just loaded or the
+			// m_lastDateChanged fallback CKnownFile::LoadFromFile substitutes when the
+			// tag is absent. That fallback is the only thing letting the TTL prune do
+			// useful migration work on an old known.met: trample it and every loaded
+			// record looks fresh, so TTL never evicts anything.
 			if (afterHashing) {
 				Record->SetLastSeen(now);
+				// Shared-since (issue #466): stamped once, and only for a genuinely
+				// new file. Same afterHashing guard as lastSeen, so a known.met
+				// load never re-stamps and a file predating the feature keeps 0
+				// (unknown) rather than looking shared just now.
+				if (Record->GetDateShared() == 0) {
+					Record->SetDateShared(now);
+				}
 			}
 			m_knownFileMaptkey = Record;
-			if (m_knownSizeMap) {
-				m_knownSizeMap->insert(
-					std::make_pair(
-						std::make_pair((uint32) Record->GetFileSize(),
-							(uint32) Record->GetLastChangeDatetime()),
-						Record));
-			}
+			InsertIntoSizeMap(m_knownSizeMap, Record);
 			return true;
 		} else {
 			CKnownFile *existing = it->second;
-			if (KnownFileMatches(Record, existing->GetFileName(), existing->GetLastChangeDatetime(), existing->GetFileSize())) {
+			if (KnownFileMatches(Record,
+				    existing->GetFileName(),
+				    existing->GetLastChangeDatetime(),
+				    existing->GetFileSize())) {
 				// The file is already on the list, ignore it.
-				AddDebugLogLineN(logKnownFiles, CFormat("%s is already on the list") % Record->GetFileName().GetPrintable());
+				AddDebugLogLineN(logKnownFiles,
+					CFormat("%s is already on the list") %
+						Record->GetFileName().GetPrintable());
 				if (afterHashing) {
 					existing->SetLastSeen(now);
 				}
 				return false;
-			} else if (CKnownFile * dup = 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("%s is on the duplicates list") % Record->GetFileName().GetPrintable());
-				// Pin the duplicate only when this branch was hit
-				// because we just hashed a real on-disk file (the
-				// only case the comment above describes anyway).
-				// During load Append doesn't represent a fresh
-				// sighting -- pinning here would falsely protect
-				// stale records from the cap/TTL prune.
+			} else if (CKnownFile *dup = IsOnDuplicates(Record->GetFileName(),
+					   Record->GetLastChangeDatetime(),
+					   Record->GetFileSize())) {
+				// The file is on the duplicates list, ignore it. Should not happen,
+				// at least not after hashing -- why would it have been hashed?
+				AddDebugLogLineN(logKnownFiles,
+					CFormat("%s is on the duplicates list") %
+						Record->GetFileName().GetPrintable());
+				// Pin the duplicate only when this branch was reached by hashing a
+				// real on-disk file. During load Append is not a fresh sighting,
+				// and pinning would falsely protect stale records from the cap/TTL
+				// prune.
 				if (afterHashing) {
 					dup->SetLastSeen(now);
 					m_pinnedDuplicates.insert(dup);
@@ -502,9 +542,10 @@
 				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.
+					// We just hashed a "new" shared file and find it already
+					// known under a different name or date: probably renamed or
+					// touched. Copy over all properties from the existing known
+					// file and keep only name/date.
 					time_t newDate = Record->GetLastChangeDatetime();
 					CPath newName = Record->GetFileName();
 					CMemFile f;
@@ -512,61 +553,42 @@
 					f.Reset();
 					if (!Record->LoadFromFile(&f)) {
 						// this also shouldn't happen
-						AddDebugLogLineC(logKnownFiles, CFormat("error copying known file: existing: %s %d %d %d  Record: %s %d %d %d")
-							% existing->GetFileName().GetPrintable() % existing->GetFileSize() % existing->GetED2KPartHashCount() % existing->GetHashCount()
-							% Record->GetFileName().GetPrintable() % Record->GetFileSize() % Record->GetED2KPartHashCount() % Record->GetHashCount());
+						AddDebugLogLineC(logKnownFiles,
+							CFormat("error copying known file: existing: %s %d "
+								"%d %d  Record: %s %d %d %d") %
+								existing->GetFileName().GetPrintable() %
+								existing->GetFileSize() %
+								existing->GetED2KPartHashCount() %
+								existing->GetHashCount() %
+								Record->GetFileName().GetPrintable() %
+								Record->GetFileSize() %
+								Record->GetED2KPartHashCount() %
+								Record->GetHashCount());
 						return false;
 					}
 					Record->SetLastChangeDatetime(newDate);
 					Record->SetFileName(newName);
 				}
-				// The file is a duplicated hash. Add THE OLD ONE to the duplicates list.
-				// (This is used when reading the known file list where the duplicates are stored in front.)
+				// The file is a duplicated hash. Add THE OLD ONE to the duplicates
+				// list. (Used when reading the known file list, where the
+				// duplicates are stored in front.)
 				m_duplicateFileList.push_back(existing);
-				if (m_duplicateSizeMap) {
-					m_duplicateSizeMap->insert(
-						std::make_pair(
-							std::make_pair((uint32) existing->GetFileSize(),
-								(uint32) existing->GetLastChangeDatetime()),
-							existing));
-				}
+				InsertIntoSizeMap(m_duplicateSizeMap, existing);
 				if (theApp->sharedfiles) {
 					// Removing the old kad keywords created with the old filename
 					theApp->sharedfiles->RemoveKeywords(existing);
 				}
-				if (m_knownSizeMap) {
-					// existing is leaving m_knownFileMap for m_duplicateFileList;
-					// drop its size-map entry so FindKnownFile doesn't return a
-					// pointer that no longer belongs to the live map.
-					const auto existingKey = std::make_pair(
-						(uint32) existing->GetFileSize(),
-						(uint32) existing->GetLastChangeDatetime());
-					std::pair<KnownFileSizeMap::iterator,
-						KnownFileSizeMap::iterator> p =
-						m_knownSizeMap->equal_range(existingKey);
-					for (KnownFileSizeMap::iterator hit = p.first;
-						hit != p.second; ++hit) {
-						if (hit->second == existing) {
-							m_knownSizeMap->erase(hit);
-							break;
-						}
-					}
-					m_knownSizeMap->insert(
-						std::make_pair(
-							std::make_pair((uint32) Record->GetFileSize(),
-								(uint32) Record->GetLastChangeDatetime()),
-							Record));
-				}
-				// On the afterHashing path the copy-existing-tags
-				// block above pulled the prior FT_LASTSEEN into
-				// Record; refresh it so the new live entry isn't
-				// born aged-out of the TTL window. During load
-				// (afterHashing=false) keep Record's own loaded
-				// lastSeen instead -- demoting an entry to the
-				// duplicate list must not stamp the replacement
-				// as "fresh now" or the migration-driven TTL pass
-				// loses its signal (every live entry would look
-				// load-time-fresh and never be evicted).
+				// existing is leaving m_knownFileMap for m_duplicateFileList, so
+				// drop its size-map entry or FindKnownFile returns a pointer that
+				// no longer belongs to the live map.
+				EraseFromSizeMap(m_knownSizeMap, existing);
+				InsertIntoSizeMap(m_knownSizeMap, Record);
+				// On the afterHashing path the copy-existing-tags block above
+				// pulled the prior FT_LASTSEEN into Record, so refresh it or the
+				// new live entry is born aged out of the TTL window. During load
+				// keep Record's own loaded lastSeen: stamping the replacement as
+				// fresh would make every live entry look load-time-fresh, and the
+				// migration-driven TTL pass would never evict.
 				if (afterHashing) {
 					Record->SetLastSeen(now);
 				}
@@ -575,37 +597,27 @@
 			}
 		}
 	} else {
-		AddDebugLogLineN(logGeneral,
-			CFormat("%s is 0-size, not added") %
-			Record->GetFileName());
+		AddDebugLogLineN(logGeneral, CFormat("%s is 0-size, not added") % Record->GetFileName());
 
 		return false;
 	}
 }
 
-// Make a (size, mtime) index to speed up FindKnownFile. Size + mtime
-// modulo 2^32 is enough here — same precision the rest of the file
-// uses for FindKnownFile's inputs and KnownFileMatches' comparisons.
+// A (size, mtime) index to speed up FindKnownFile. Size plus mtime modulo 2^32
+// is the same precision FindKnownFile's inputs and KnownFileMatches use.
 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::make_pair(
-			std::make_pair((uint32) it->second->GetFileSize(),
-				(uint32) it->second->GetLastChangeDatetime()),
-			it->second));
+	for (const auto &entry : m_knownFileMap) {
+		InsertIntoSizeMap(m_knownSizeMap, entry.second);
 	}
 	m_duplicateSizeMap = new KnownFileSizeMap;
-	for (KnownFileList::const_iterator it = m_duplicateFileList.begin(); it != m_duplicateFileList.end(); ++it) {
-		m_duplicateSizeMap->insert(std::make_pair(
-			std::make_pair((uint32) (*it)->GetFileSize(),
-				(uint32) (*it)->GetLastChangeDatetime()),
-			*it));
+	for (CKnownFile *record : m_duplicateFileList) {
+		InsertIntoSizeMap(m_duplicateSizeMap, record);
 	}
 }
 
-
 void CKnownFileList::ReleaseIndex()
 {
 	delete m_knownSizeMap;
@@ -614,60 +626,32 @@
 	m_duplicateSizeMap = NULL;
 }
 
-
-void CKnownFileList::PruneDuplicates(
-	const std::unordered_set<CKnownFile*> & inUse)
+void CKnownFileList::PruneDuplicates(const std::unordered_set<CKnownFile *> &inUse)
 {
 	// Caller must hold list_mut.
 
-	// Gate on a full share-scan having run this session -- before that,
-	// inUse is empty and m_pinnedDuplicates hasn't been populated by
-	// FindKnownFile yet, so a prune here would drop records the next
-	// scan would have legitimately pinned. Set true by
-	// MarkInitialShareScanComplete() from CSharedFileList::Reload.
+	// Gate on a full share-scan having run this session: before that inUse is empty and
+	// FindKnownFile has not populated m_pinnedDuplicates, so a prune would drop records the
+	// next scan would legitimately have pinned. Set by MarkInitialShareScanComplete() from
+	// CSharedFileList::Reload.
 	if (!m_initialShareScanComplete) {
 		return;
 	}
 
-	const uint32 now = (uint32) time(NULL);
-	const uint32 ttlCutoff =
-		(now > KNOWN_DUPLICATE_TTL_SECS)
-			? (now - KNOWN_DUPLICATE_TTL_SECS) : 0;
+	const uint32 now = (uint32)time(NULL);
+	const uint32 ttlCutoff = (now > KNOWN_DUPLICATE_TTL_SECS) ? (now - KNOWN_DUPLICATE_TTL_SECS) : 0;
 
-	auto isProtected = &(CKnownFile * r) {
+	auto isProtected = &(CKnownFile *r) {
 		return inUse.count(r) > 0 || m_pinnedDuplicates.count(r) > 0;
 	};
 
-	auto eraseFromSizeMap = &(KnownFileSizeMap * sizeMap,
-			CKnownFile * dead) {
-		if (!sizeMap) {
-			return;
-		}
-		const auto key = std::make_pair(
-			(uint32) dead->GetFileSize(),
-			(uint32) dead->GetLastChangeDatetime());
-		std::pair<KnownFileSizeMap::iterator,
-			KnownFileSizeMap::iterator> p =
-			sizeMap->equal_range(key);
-		for (KnownFileSizeMap::iterator hit = p.first;
-			hit != p.second; ++hit) {
-			if (hit->second == dead) {
-				sizeMap->erase(hit);
-				return;
-			}
-		}
-	};
-
-	// Pass 1: live entries (m_knownFileMap) past TTL. A non-refreshed
-	// live entry means no share-scan in the last TTL window produced a
-	// (name, date, size) match -- the file is no longer accessible to
-	// us. The whole hash is dead; we'll also wipe its duplicates.
-	// std::set (not unordered_set) because CMD4Hash provides operator<
-	// but no std::hash specialization.
+	// Pass 1: live entries past TTL. A non-refreshed live entry means no share-scan in the last
+	// TTL window produced a (name, date, size) match, so the file is no longer accessible and
+	// the whole hash is dead, duplicates included. std::set rather than unordered_set because
+	// CMD4Hash provides operator< but no std::hash specialization.
 	std::set<CMD4Hash> deadHashes;
-	for (CKnownFileMap::const_iterator it = m_knownFileMap.begin();
-		it != m_knownFileMap.end(); ++it) {
-		CKnownFile * live = it->second;
+	for (CKnownFileMap::const_iterator it = m_knownFileMap.begin(); it != m_knownFileMap.end(); ++it) {
+		CKnownFile *live = it->second;
 		if (isProtected(live)) {
 			continue;
 		}
@@ -678,22 +662,19 @@
 
 	// Pass 2: duplicates -- drop if their hash is dead, or their own
 	// lastSeen is past TTL. Bucket survivors by hash for the cap pass.
-	std::map<CMD4Hash, std::vector<KnownFileList::iterator> > survivors;
+	std::map<CMD4Hash, std::vector<KnownFileList::iterator>> survivors;
 	size_t droppedDupTTL = 0;
-	for (KnownFileList::iterator it = m_duplicateFileList.begin();
-		it != m_duplicateFileList.end(); ) {
-		CKnownFile * record = *it;
+	for (KnownFileList::iterator it = m_duplicateFileList.begin(); it != m_duplicateFileList.end();) {
+		CKnownFile *record = *it;
 		if (isProtected(record)) {
 			survivorsrecord->GetFileHash().push_back(it);
 			++it;
 			continue;
 		}
-		const bool hashDead =
-			deadHashes.count(record->GetFileHash()) > 0;
-		const bool ownStale =
-			record->GetLastSeen() < ttlCutoff;
+		const bool hashDead = deadHashes.count(record->GetFileHash()) > 0;
+		const bool ownStale = record->GetLastSeen() < ttlCutoff;
 		if (hashDead || ownStale) {
-			eraseFromSizeMap(m_duplicateSizeMap, record);
+			EraseFromSizeMap(m_duplicateSizeMap, record);
 			KnownFileList::iterator victim = it++;
 			Notify_KnownFileBeingDestroyed(record);
 			delete record;
@@ -707,31 +688,25 @@
 
 	// Pass 3: drop the dead live entries (and their size-map index).
 	size_t droppedLive = 0;
-	for (std::set<CMD4Hash>::const_iterator it = deadHashes.begin();
-		it != deadHashes.end(); ++it) {
+	for (std::set<CMD4Hash>::const_iterator it = deadHashes.begin(); it != deadHashes.end(); ++it) {
 		CKnownFileMap::iterator kit = m_knownFileMap.find(*it);
 		if (kit == m_knownFileMap.end()) {
 			continue;
 		}
-		CKnownFile * dead = kit->second;
-
-		// Final paranoid re-check: even though Save() now snapshots
-		// inUse under our own lock, the snapshot's sharedfiles /
-		// downloadqueue locks were released before the prune body
-		// ran. A concurrent SafeAddKFile (main thread) or RemoveFile
-		// (UploadDiskIOThread) could have changed membership in
-		// between. Re-query under the owner's lock, immediately
-		// before delete, to make this point-in-time correct (#685).
-		if (theApp && theApp->sharedfiles &&
-			theApp->sharedfiles->GetFileByID(*it) != NULL) {
+		CKnownFile *dead = kit->second;
+
+		// Final re-check: Save() snapshots inUse under our own lock, but the snapshot's
+		// sharedfiles / downloadqueue locks were released before the prune body ran, so a
+		// concurrent SafeAddKFile or RemoveFile could have changed membership. Re-query
+		// under the owner's lock immediately before the delete (#685).
+		if (theApp && theApp->sharedfiles && theApp->sharedfiles->GetFileByID(*it) != NULL) {
 			continue;
 		}
-		if (theApp && theApp->downloadqueue &&
-			theApp->downloadqueue->GetFileByID(*it) != NULL) {
+		if (theApp && theApp->downloadqueue && theApp->downloadqueue->GetFileByID(*it) != NULL) {
 			continue;
 		}
 
-		eraseFromSizeMap(m_knownSizeMap, dead);
+		EraseFromSizeMap(m_knownSizeMap, dead);
 		Notify_KnownFileBeingDestroyed(dead);
 		delete dead;
 		m_knownFileMap.erase(kit);
@@ -740,18 +715,16 @@
 
 	// Pass 4: per-hash cap on whatever duplicate survivors remain.
 	size_t droppedDupCap = 0;
-	for (std::map<CMD4Hash,
-			std::vector<KnownFileList::iterator> >::iterator
-		bucket = survivors.begin();
-		bucket != survivors.end(); ++bucket) {
-		std::vector<KnownFileList::iterator> & iters = bucket->second;
+	for (std::map<CMD4Hash, std::vector<KnownFileList::iterator>>::iterator bucket = survivors.begin();
+		bucket != survivors.end();
+		++bucket) {
+		std::vector<KnownFileList::iterator> &iters = bucket->second;
 		if (iters.size() <= KNOWN_DUPLICATE_HASH_CAP) {
 			continue;
 		}
 
-		// Partition out protected entries first; the cap counts
-		// only the prunable remainder so protected records don't
-		// crowd legitimate survivors out.
+		// Partition out protected entries first, so the cap counts only the
+		// prunable remainder and protected records do not crowd out survivors.
 		std::vector<KnownFileList::iterator> prunable;
 		prunable.reserve(iters.size());
 		for (size_t i = 0; i < iters.size(); ++i) {
@@ -763,19 +736,16 @@
 			continue;
 		}
 
-		// Newest mtime survives the cap. Older mtimes for the same
-		// hash are unlikely to match again in practice (mtime is
-		// monotone-forward outside explicit-restore tooling).
-		std::sort(prunable.begin(), prunable.end(),
-			(const KnownFileList::iterator & a,
-				const KnownFileList::iterator & b) {
-				return (*a)->GetLastChangeDatetime()
-					> (*b)->GetLastChangeDatetime();
+		// Newest mtime survives the cap: older mtimes for the same hash are
+		// unlikely to match again, mtime being monotone-forward in practice.
+		std::sort(prunable.begin(),
+			prunable.end(),
+			(const KnownFileList::iterator &a, const KnownFileList::iterator &b) {
+				return (*a)->GetLastChangeDatetime() > (*b)->GetLastChangeDatetime();
 			});
-		for (size_t i = KNOWN_DUPLICATE_HASH_CAP;
-			i < prunable.size(); ++i) {
-			CKnownFile * dead = *prunablei;
-			eraseFromSizeMap(m_duplicateSizeMap, dead);
+		for (size_t i = KNOWN_DUPLICATE_HASH_CAP; i < prunable.size(); ++i) {
+			CKnownFile *dead = *prunablei;
+			EraseFromSizeMap(m_duplicateSizeMap, dead);
 			m_duplicateFileList.erase(prunablei);
 			Notify_KnownFileBeingDestroyed(dead);
 			delete dead;
@@ -785,12 +755,10 @@
 
 	if (droppedLive || droppedDupTTL || droppedDupCap) {
 		AddDebugLogLineN(logKnownFiles,
-			CFormat("known.met prune: dropped %u live + %u dup (TTL %u days) + %u dup (cap %u)")
-				% (unsigned)droppedLive
-				% (unsigned)droppedDupTTL
-				% (unsigned)(KNOWN_DUPLICATE_TTL_SECS / (24 * 60 * 60))
-				% (unsigned)droppedDupCap
-				% KNOWN_DUPLICATE_HASH_CAP);
+			CFormat("known.met prune: dropped %u live + %u dup (TTL %u days) + %u dup (cap %u)") %
+				(unsigned)droppedLive % (unsigned)droppedDupTTL %
+				(unsigned)(KNOWN_DUPLICATE_TTL_SECS / (24 * 60 * 60)) %
+				(unsigned)droppedDupCap % KNOWN_DUPLICATE_HASH_CAP);
 	}
 }

amule-3.0.1.tar.gz/src/KnownFileList.h -> amule-3.1.0.tar.gz/src/KnownFileList.h Changed

@@ -26,12 +26,10 @@
 #ifndef KNOWNFILELIST_H
 #define KNOWNFILELIST_H
 
-
 #include <unordered_set>
 
 #include "SharedFileList.h" // CKnownFileMap
 
-
 class CKnownFile;
 class CPath;
 class CAICHHash;
@@ -41,104 +39,115 @@
 public:
 	CKnownFileList();
 	~CKnownFileList();
-	bool	SafeAddKFile(CKnownFile* toadd, bool afterHashing = false);
-	bool	Init();
-	void	Save();
-	void	Clear();
-	CKnownFile* FindKnownFile(
-		const CPath& filename,
-		time_t in_date,
-		uint64 in_size);
-	CKnownFile* FindKnownFileByID(const CMD4Hash& hash);
-
-	// Returns true iff `file` is currently a member of the canonical
-	// known-file map. Pointer-value comparison only — `file` may
-	// already be freed when this is called, in which case the
-	// comparison reliably returns false without dereferencing it.
-	// Used by the async-task completion handlers (OnFinishedHashing,
-	// OnFinishedAICHHashing) to validate that an event's `owner`
-	// pointer is still live before dereffing it.
-	bool IsKnownFile(const CKnownFile* file) const;
-
-	void	PrepareIndex();
-	void	ReleaseIndex();
-
-	// Latch set by CSharedFileList::Reload once a full share-scan has
-	// finished in this session. PruneDuplicates only runs once this is
-	// true, so the cap-prune never fires before the pin set is
-	// populated by FindKnownFile-during-scan.
-	void	MarkInitialShareScanComplete();
-
-	// Snapshot the set of AICH master hashes that are still referenced
-	// by live and duplicate-list records. Used by CAICHSyncTask to
-	// prune orphaned hashsets out of known2_64.met (entries whose
-	// owning known.met record has been TTL-evicted by PruneDuplicates
-	// and no longer appears in either map). The set is populated under
-	// list_mut to get a consistent view; CAICHHash is hashable so
-	// callers can fast-test membership during the file walk.
-	void	CollectLiveAICHRoots(std::unordered_set<CAICHHash> & out);
+	bool SafeAddKFile(CKnownFile *toadd, bool afterHashing = false);
+	bool Init();
+	void Save();
+	void Clear();
+	CKnownFile *FindKnownFile(const CPath &filename, time_t in_date, uint64 in_size);
+	CKnownFile *FindKnownFileByID(const CMD4Hash &hash);
+
+	// Make `file` the record that hash-keyed lookups resolve to, and return whether that
+	// changed anything.
+	//
+	// m_knownFileMap holds exactly one record per hash: whichever known.met entry was loaded
+	// last, since Append demotes the earlier ones to m_duplicateFileList. For content that
+	// exists at several paths that record is not necessarily the copy the share scan found on
+	// disk, and once its own copy is deleted it is not on disk at all. FindKnownFileByID then
+	// hands out a record whose path cannot be opened, which is what broke "verify local data",
+	// the EC rename handler and the search "already known" flag for a deleted duplicate (issue
+	// #1265). The cap/TTL prune cannot heal it: it only evicts duplicate-list records, and
+	// keeps the dead live entry precisely because a same-hash record is shared.
+	//
+	// Called by the share scan for each file it actually shares, so the record backed by a file
+	// we just saw wins the hash.
+	bool PromoteToCanonical(CKnownFile *file);
+
+	// Returns true iff `file` is still one of this list's records, canonical or duplicate. It
+	// answers "does this record still exist", not "is it canonical": PromoteToCanonical demotes
+	// live records, so a map-only answer would report a live file as destroyed. Pointer-value
+	// comparison only -- `file` may already be freed, in which case this returns false without
+	// dereferencing it. Used by the async-task completion handlers to validate an event's
+	// `owner` pointer.
+	bool IsKnownFile(const CKnownFile *file) const;
+
+	/**
+	 * Number of entries loaded from known.met. Used at startup as an estimate of how many files
+	 * the shared-file scan is about to walk, since the real total is only known once the walk
+	 * finishes and counting first would mean traversing the tree twice. It is last session's
+	 * view of the same tree, so it is close for a stable share and merely approximate otherwise
+	 * -- callers must treat it as a hint, not a total.
+	 */
+	size_t GetKnownFileCount() const;
+
+	void PrepareIndex();
+	void ReleaseIndex();
+
+	// Latch set by CSharedFileList::Reload once a full share-scan has finished in this session.
+	// PruneDuplicates only runs once this is true, so the cap-prune never fires before the pin
+	// set is populated by FindKnownFile-during-scan.
+	void MarkInitialShareScanComplete();
+
+	// Snapshot the AICH master hashes still referenced by live and duplicate-list records. Used
+	// by CAICHSyncTask to prune orphaned hashsets out of known2_64.met -- entries whose owning
+	// known.met record was TTL-evicted and no longer appears in either map. Populated under
+	// list_mut for a consistent view.
+	void CollectLiveAICHRoots(std::unordered_set<CAICHHash> &out);
 
 	uint16 requested;
 	uint32 transferred;
 	uint16 accepted;
 
 private:
-	mutable wxMutex	list_mut;
+	mutable wxMutex list_mut;
 
-	bool	Append(CKnownFile*, bool afterHashing = false);
+	bool Append(CKnownFile *, bool afterHashing = false);
 
-	CKnownFile *IsOnDuplicates(
-		const CPath& filename,
-		uint32 in_date,
-		uint64 in_size) const;
+	CKnownFile *IsOnDuplicates(const CPath &filename, uint32 in_date, uint64 in_size) const;
 
 	bool KnownFileMatches(
-		CKnownFile *knownFile,
-		const CPath& filename,
-		uint32 in_date,
-		uint64 in_size) const;
-
-	// Drop duplicate-list records whose hash has more than
-	// KNOWN_DUPLICATE_HASH_CAP variants, keeping the newest by mtime.
-	// `inUse` is a snapshot of pointers currently held by
-	// CSharedFileList::m_Files_map: never pruned (would dangle the
-	// share-list pointer). m_pinnedDuplicates additionally protects
-	// records that FindKnownFile matched against a real on-disk file
-	// during this session even when AddFile rejected them as
-	// content-duplicates of an already-shared file.
-	void	PruneDuplicates(const std::unordered_set<CKnownFile*> & inUse);
-
-	typedef std::list<CKnownFile*> KnownFileList;
-	KnownFileList	m_duplicateFileList;
-	CKnownFileMap	m_knownFileMap;
+		CKnownFile *knownFile, const CPath &filename, uint32 in_date, uint64 in_size) const;
+
+	// Drop duplicate-list records whose hash has more than KNOWN_DUPLICATE_HASH_CAP variants,
+	// keeping the newest by mtime. `inUse` is a snapshot of pointers currently held by
+	// CSharedFileList::m_Files_map, which are never pruned. m_pinnedDuplicates additionally
+	// protects records FindKnownFile matched against a real on-disk file this session, even
+	// where AddFile rejected them as content-duplicates of an already-shared file.
+	void PruneDuplicates(const std::unordered_set<CKnownFile *> &inUse);
+
+	typedef std::list<CKnownFile *> KnownFileList;
+	KnownFileList m_duplicateFileList;
+	CKnownFileMap m_knownFileMap;
 	// The filename "known.met"
-	wxString	m_filename;
-	// Speed up shared files reload. The key is (size, mtime) rather than
-	// size alone: libraries that contain many files of the same size
-	// (small text files, fixed-quality JPEGs, fixed-bitrate audio/video)
-	// would otherwise collapse FindKnownFile()'s equal_range into a
-	// large bucket that the inner KnownFileMatches loop walks linearly,
-	// turning the whole shared-list reload into O(N^2) over the same-
-	// size files. Adding mtime to the key narrows the bucket aggressively
-	// in any realistic library — files added at different times have
-	// different mtimes — while keeping the per-entry cost identical
-	// (8 bytes of key vs the previous 4).
-	typedef std::multimap<std::pair<uint32, uint32>, CKnownFile*> KnownFileSizeMap;
-	KnownFileSizeMap * m_knownSizeMap;
-	KnownFileSizeMap * m_duplicateSizeMap;
-
-	// Duplicate-list records that FindKnownFile / IsOnDuplicates
-	// returned during this session — i.e. their (name, date, size)
-	// matched a real on-disk file. Pinned across the rest of the
-	// session so the cap-prune never drops a record that we know
-	// still represents a live file (avoids re-hashing on next
-	// restart). Cleared on Clear() / Init() so each session starts
-	// fresh.
-	std::unordered_set<CKnownFile*> m_pinnedDuplicates;
+	wxString m_filename;
+	// Speeds up the shared-files reload. The key is (size, mtime) rather than size alone: a
+	// library with many files of the same size would otherwise collapse FindKnownFile()'s
+	// equal_range into a large bucket that KnownFileMatches walks linearly, turning the reload
+	// into O(N^2) over the same-size files. Adding mtime narrows the bucket aggressively in any
+	// realistic library, at 8 bytes of key against the previous 4.
+	typedef std::multimap<std::pair<uint32, uint32>, CKnownFile *> KnownFileSizeMap;
+	KnownFileSizeMap *m_knownSizeMap;
+	KnownFileSizeMap *m_duplicateSizeMap;
+
+	// Drop `record`'s entry from one of the (size, mtime) indexes above. Each index mirrors a
+	// list, so a record moving between the live map and the duplicate list has to be moved here
+	// too, or FindKnownFile hands out a pointer that no longer belongs to the list it was
+	// indexed under. Takes the index rather than reading the member, because every caller moves
+	// a record in one specific direction.
+	void EraseFromSizeMap(KnownFileSizeMap *sizeMap, CKnownFile *record);
+
+	// Add `record` to one of the indexes above, keyed the same way EraseFromSizeMap looks it
+	// up. The two must agree on the key, so they live side by side.
+	void InsertIntoSizeMap(KnownFileSizeMap *sizeMap, CKnownFile *record);
+
+	// Duplicate-list records that FindKnownFile / IsOnDuplicates returned during this session,
+	// i.e. whose (name, date, size) matched a real on-disk file. Pinned for the rest of the
+	// session so the cap-prune never drops a record known to represent a live file, which would
+	// mean re-hashing on the next restart. Cleared on Clear() / Init().
+	std::unordered_set<CKnownFile *> m_pinnedDuplicates;
 
 	// Set to true by MarkInitialShareScanComplete() at the end of the
 	// first non-aborted CSharedFileList::Reload of the session.
-	bool	m_initialShareScanComplete;
+	bool m_initialShareScanComplete;
 };
 
 #endif // KNOWNFILELIST_H

amule-3.1.0.tar.gz/src/LanguageList.cpp Added

@@ -0,0 +1,125 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "LanguageList.h"
+
+#include "OtherFunctions.h" // Needed for StrLang2wx
+
+#include <common/Macros.h> // Needed for itemsof
+
+#include <wx/intl.h>
+
+/**
+ * The languages aMule has a translation for.
+ *
+ * The catalog column is the po/ basename, which is also the directory the catalog installs into. It
+ * is spelled out rather than derived from the wx language id because for three languages the two
+ * differ: wx canonicalises wxLANGUAGE_ESTONIAN to "et", wxLANGUAGE_KOREAN to "ko" and
+ * wxLANGUAGE_PORTUGUESE to "pt", while the catalogs live in et_EE, ko_KR and pt_PT.
+ */
+static const SLanguageEntry s_languages = {
+	{ wxLANGUAGE_DEFAULT, "", wxTRANSLATE("System default") },
+	{ wxLANGUAGE_ALBANIAN, "sq", wxTRANSLATE("Albanian") },
+	{ wxLANGUAGE_ARABIC, "ar", wxTRANSLATE("Arabic") },
+	{ wxLANGUAGE_ASTURIAN, "ast", wxTRANSLATE("Asturian") },
+	{ wxLANGUAGE_BASQUE, "eu", wxTRANSLATE("Basque") },
+	{ wxLANGUAGE_BULGARIAN, "bg", wxTRANSLATE("Bulgarian") },
+	{ wxLANGUAGE_CATALAN, "ca", wxTRANSLATE("Catalan") },
+	{ wxLANGUAGE_CHINESE_SIMPLIFIED, "zh_CN", wxTRANSLATE("Chinese (Simplified)") },
+	{ wxLANGUAGE_CHINESE_TRADITIONAL, "zh_TW", wxTRANSLATE("Chinese (Traditional)") },
+	{ wxLANGUAGE_CROATIAN, "hr", wxTRANSLATE("Croatian") },
+	{ wxLANGUAGE_CZECH, "cs", wxTRANSLATE("Czech") },
+	{ wxLANGUAGE_DANISH, "da", wxTRANSLATE("Danish") },
+	{ wxLANGUAGE_DUTCH, "nl", wxTRANSLATE("Dutch") },
+	{ wxLANGUAGE_ENGLISH_UK, "en_GB", wxTRANSLATE("English (U.K.)") },
+	// The .pot source language: the msgids are the translation, so no catalog ships.
+	{ wxLANGUAGE_ENGLISH_US, "", wxTRANSLATE("English (U.S.)") },
+	{ wxLANGUAGE_ESTONIAN, "et_EE", wxTRANSLATE("Estonian") },
+	{ wxLANGUAGE_FINNISH, "fi", wxTRANSLATE("Finnish") },
+	{ wxLANGUAGE_FRENCH, "fr", wxTRANSLATE("French") },
+	{ wxLANGUAGE_GALICIAN, "gl", wxTRANSLATE("Galician") },
+	{ wxLANGUAGE_GERMAN, "de", wxTRANSLATE("German") },
+	{ wxLANGUAGE_GREEK, "el", wxTRANSLATE("Greek") },
+	{ wxLANGUAGE_HEBREW, "he", wxTRANSLATE("Hebrew") },
+	{ wxLANGUAGE_HUNGARIAN, "hu", wxTRANSLATE("Hungarian") },
+	{ wxLANGUAGE_ITALIAN, "it", wxTRANSLATE("Italian") },
+	{ wxLANGUAGE_JAPANESE, "ja", wxTRANSLATE("Japanese") },
+	{ wxLANGUAGE_KOREAN, "ko_KR", wxTRANSLATE("Korean") },
+	{ wxLANGUAGE_LATVIAN, "lv", wxTRANSLATE("Latvian") },
+	{ wxLANGUAGE_LITHUANIAN, "lt", wxTRANSLATE("Lithuanian") },
+	{ wxLANGUAGE_NORWEGIAN_NYNORSK, "nn", wxTRANSLATE("Norwegian (Nynorsk)") },
+	{ wxLANGUAGE_POLISH, "pl", wxTRANSLATE("Polish") },
+	{ wxLANGUAGE_PORTUGUESE, "pt_PT", wxTRANSLATE("Portuguese") },
+	{ wxLANGUAGE_PORTUGUESE_BRAZILIAN, "pt_BR", wxTRANSLATE("Portuguese (Brazilian)") },
+	{ wxLANGUAGE_ROMANIAN, "ro", wxTRANSLATE("Romanian") },
+	{ wxLANGUAGE_RUSSIAN, "ru", wxTRANSLATE("Russian") },
+	{ wxLANGUAGE_SLOVENIAN, "sl", wxTRANSLATE("Slovenian") },
+	{ wxLANGUAGE_SPANISH, "es", wxTRANSLATE("Spanish") },
+	{ wxLANGUAGE_SWEDISH, "sv", wxTRANSLATE("Swedish") },
+	{ wxLANGUAGE_TURKISH, "tr", wxTRANSLATE("Turkish") },
+	{ wxLANGUAGE_UKRAINIAN, "uk", wxTRANSLATE("Ukrainian") },
+};
+
+const SLanguageEntry *GetLanguageList(std::size_t &count)
+{
+	count = itemsof(s_languages);
+
+	return s_languages;
+}
+
+int FindLanguageEntry(const wxString &languageID)
+{
+	const int wxId = StrLang2wx(languageID);
+
+	std::size_t count = 0;
+	const SLanguageEntry *languages = GetLanguageList(count);
+	for (std::size_t i = 0; i < count; ++i) {
+		// A stored value can spell the same language two ways. The picker writes the
+		// entry's own id, so Estonian is saved as "et", but a config written by hand,
+		// carried over from another install, or copied from the form amulecmd's -l option
+		// documents can carry the territory the catalog directory uses, "et_EE". Both name
+		// this entry, and matching only the first left the picker unable to find the
+		// current language and liable to reset it.
+		if (languagesi.wxId == wxId) {
+			return static_cast<int>(i);
+		}
+
+		if (*languagesi.catalog && StrLang2wx(languagesi.catalog) == wxId) {
+			return static_cast<int>(i);
+		}
+	}
+
+	return -1;
+}
+
+bool IsLanguageAvailable(const SLanguageEntry &entry, const wxArrayString &installed)
+{
+	// "System default" follows the OS and the source language is the msgids
+	// themselves, so neither has a catalog to look for.
+	if (!*entry.catalog) {
+		return true;
+	}
+
+	return installed.Index(entry.catalog) != wxNOT_FOUND;
+}

amule-3.1.0.tar.gz/src/LanguageList.h Added

@@ -0,0 +1,81 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 LANGUAGELIST_H
+#define LANGUAGELIST_H
+
+#include <wx/arrstr.h>
+#include <wx/string.h>
+
+#include <cstddef>
+
+/**
+ * One language offered by the Preferences language picker.
+ */
+struct SLanguageEntry
+{
+	//! wx language id. This is what ends up in the /eMule/Language config key,
+	//! spelled by wxLang2Str(), and what InitLocale() is handed on startup.
+	int wxId;
+	//! Catalog name: po/<catalog>.po in the source tree, installed as
+	//! <catalog>/LC_MESSAGES/amule.mo. Empty for the entries that ship no catalog.
+	//!
+	//! Stored rather than derived from wxId because the two disagree:
+	//! wxLocale::GetLanguageInfo(wxLANGUAGE_ESTONIAN)->CanonicalName is "et" while the catalog
+	//! directory is "et_EE". Deriving it silently loses Estonian, Korean and Portuguese.
+	const char *catalog;
+	//! English display name, run through wxGetTranslation() when shown.
+	const char *name;
+};
+
+/**
+ * The languages aMule ships a translation for.
+ *
+ * Add new languages here, with the po/<catalog>.po that carries them. LanguageListTest keeps this
+ * list and po/ in step.
+ *
+ * @param count Receives the number of entries.
+ * @return The entries, starting with "System default".
+ */
+const SLanguageEntry *GetLanguageList(std::size_t &count);
+
+/**
+ * Finds the entry a stored /eMule/Language value names.
+ *
+ * @param languageID The stored value, as written by wxLang2Str().
+ * @return Index into GetLanguageList(), or -1 when nothing matches.
+ */
+int FindLanguageEntry(const wxString &languageID);
+
+/**
+ * Tells whether an entry's translation is installed.
+ *
+ * @param entry The entry to check.
+ * @param installed Catalog names present on disk, from wxTranslations::GetAvailableTranslations().
+ * @return true when the entry can be offered. Entries without a catalog ("System default" and the
+ *         source language) are always available.
+ */
+bool IsLanguageAvailable(const SLanguageEntry &entry, const wxArrayString &installed);
+
+#endif /* LANGUAGELIST_H */

amule-3.0.1.tar.gz/src/LibSocket.cpp -> amule-3.1.0.tar.gz/src/LibSocket.cpp Changed

amule-3.0.1.tar.gz/src/LibSocket.h -> amule-3.1.0.tar.gz/src/LibSocket.h Changed

@@ -23,17 +23,17 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#ifndef LIBSOCKET_H
+#define LIBSOCKET_H
 
-#ifndef __LIBSOCKET_H__
-#define __LIBSOCKET_H__
-
+#include "StreamTransport.h" // IStreamTransport and its event sink
 #include "Types.h"
-#include <memory>		// shared_ptr for CAsioUDPSocketImpl ownership
+#include <memory> // shared_ptr for CAsioUDPSocketImpl ownership
 class amuleIPV4Address;
 
-
 // Socket flags (unused in ASIO implementation, just provide the names)
-enum {
+enum
+{
 	MULE_SOCKET_NONE,
 	MULE_SOCKET_NOWAIT_READ,
 	MULE_SOCKET_NOWAIT_WRITE,
@@ -49,198 +49,263 @@
 typedef int muleSocketFlags;
 
 // Socket events (used for proxy notification)
-enum {
+enum
+{
 	MULE_SOCKET_CONNECTION,
 	MULE_SOCKET_INPUT,
 	MULE_SOCKET_OUTPUT,
 	MULE_SOCKET_LOST
 };
 
-//
-// Abstraction class for library TCP socket
-// Can be a wxSocket or an ASIO socket
-//
+// Abstraction class for a library TCP socket: either a wxSocket or an ASIO socket.
 
-//
 // Client TCP socket
-//
-class CLibSocket
+class CLibSocket : public IStreamTransportEvents
 {
 	friend class CAsioSocketImpl;
 	friend class CAsioSocketServerImpl;
+
 public:
 	CLibSocket(int flags = 0);
 	virtual ~CLibSocket();
 
 	// wx Stuff
-	void	Notify(bool);
-	bool	Connect(const amuleIPV4Address& adr, bool wait);
-	bool	IsConnected() const;
-	bool	IsOk() const;
-	void	SetLocal(const amuleIPV4Address& local);
-	uint32	Read(void * buffer, uint32 nbytes);
-	uint32	Write(const void * buffer, uint32 nbytes);
-	void	Close();
-	void	Destroy();
+	void Notify(bool);
+	bool Connect(const amuleIPV4Address &adr, bool wait);
+	// Bound the synchronous connect to `ms` milliseconds (0 = no bound, the default). Only
+	// affects the blocking connect path used by the synchronous EC clients (amulecmd); the
+	// async path is unaffected.
+	void SetConnectTimeout(int ms);
+	bool IsConnected() const;
+	bool IsOk() const;
+	void SetLocal(const amuleIPV4Address &local);
+	uint32 Read(void *buffer, uint32 nbytes);
+	uint32 Write(const void *buffer, uint32 nbytes);
+	void Close();
+	void Destroy();
+
+	// Swap in a fresh asio socket impl on this same wrapper, so the socket can be re-connected
+	// after a loss WITHOUT recreating the CLibSocket -- and therefore without invalidating any
+	// pointer the app still holds to us, the remote GUI pinning its CRemoteConnect in every
+	// container. The outgoing impl is detached race-safely first (see LinkSocketImpl).
+	void ResetForReconnect();
 
 	// Get last error, 0 == no error
-	int		LastError() const;
+	int LastError() const;
 
 	// not supported
 	void SetFlags(int) {}
 	void Discard() {}
-	bool WaitOnConnect(long, long)	{ return true; }
-	bool WaitForWrite(long, long)	{ return true; }
-	bool WaitForRead(long, long)	{ return true; }
+	bool WaitOnConnect(long, long) { return true; }
+	bool WaitForWrite(long, long) { return true; }
+	bool WaitForRead(long, long) { return true; }
 
 	// new Stuff
 
 	// Check if socket is currently blocking for read or write
-	bool	BlocksRead() const;
-	bool	BlocksWrite() const;
+	bool BlocksRead() const;
+	bool BlocksWrite() const;
 
 	// Show we're ready for another event
-	void	EventProcessed();
+	void EventProcessed();
 
 	// Get IP of client
-	const wxChar * GetIP() const;
+	const wxChar *GetIP() const;
 
 	// True if Destroy() has been called for socket
-	bool	IsDestroying() const;
+	bool IsDestroying() const;
 
 	// Get/set proxy state
 	bool GetProxyState() const;
-	void SetProxyState(bool state, const amuleIPV4Address * adr = 0);
+	void SetProxyState(bool state, const amuleIPV4Address *adr = 0);
 
 	// Get peer address (better API than wx)
-	wxString	GetPeer();
-	uint32		GetPeerInt();
-
-	// Turn on TCP keepalive with per-socket timings so a half-open
-	// connection (peer gone, FIN/RST lost or never sent) gets torn
-	// down at the TCP layer instead of sitting idle forever. Used by
-	// the EC sockets on both ends — see CECMuleSocket / CECServerSocket.
-	// Idle seconds before the kernel starts probing, the interval
-	// between probes, and how many probes before declaring the peer
-	// dead.  Effective only on POSIX (TCP_KEEPIDLE / TCP_KEEPINTVL /
-	// TCP_KEEPCNT) and Windows (SIO_KEEPALIVE_VALS; only idle +
-	// interval are settable, count uses the system default). No-op if
-	// the underlying socket is not open.
+	wxString GetPeer();
+	// Socket ingress canonicalizes mapped IPv4; native IPv6 retains its scope.
+	CNetworkAddress GetPeerAddress();
+	// Legacy ed2k IPv4 narrowing; native IPv6 has no uint32 representation.
+	uint32 GetPeerInt();
+
+	// Turn on TCP keepalive with per-socket timings, so a half-open connection (peer gone,
+	// FIN/RST lost or never sent) is torn down at the TCP layer instead of sitting idle
+	// forever. Used by the EC sockets on both ends. Effective only on POSIX (TCP_KEEPIDLE /
+	// TCP_KEEPINTVL / TCP_KEEPCNT) and Windows (SIO_KEEPALIVE_VALS, where only idle and
+	// interval are settable). No-op if the underlying socket is not open.
 	void EnableTcpKeepalive(int idleSec, int probeIntervalSec, int probeCount);
 
+	// Turn off Nagle. Used by the EC sockets on both ends, where a packet's trailing small
+	// write would otherwise wait out the peer's delayed-ACK timer. No-op if the underlying
+	// socket is not open.
+	void EnableTcpNoDelay();
+
 	// Handlers
 	virtual void OnConnect(int) {}
 	virtual void OnSend(int) {}
 	virtual void OnReceive(int) {}
-	// Int argument is unused — exists to give the CLibSocket-layer
-	// hook a different signature from CECSocket::OnLost(), so a class
-	// that multi-inherits from both (CECMuleSocket) can override the
-	// CLibSocket-side hook unambiguously and forward to the EC-layer
-	// OnLost().  Without that disambiguation, the Asio reactor's
-	// EOF-on-read dispatch lands on the empty CLibSocket::OnLost{}
-	// instead of CRemoteConnect / CECServerSocket overrides.
+	// The int argument is unused: it exists to give the CLibSocket-layer hook a different
+	// signature from CECSocket::OnLost(), so a class multi-inheriting from both (CECMuleSocket)
+	// can override this one unambiguously and forward. Without that, the Asio reactor's EOF-on-
+	// read dispatch lands on the empty CLibSocket::OnLost{} instead of the real overrides.
 	virtual void OnLost(int) {}
 	virtual void OnProxyEvent(int) {}
 
+	/**
+	 * Hands this socket's stream over to a transport that is not asio.
+	 *
+	 * Every stream accessor below then answers from it. That has to be all of
+	 * them: none are virtual here, in CEncryptedStreamSocket or in CEMSocket,
+	 * so one left unrouted resolves statically to the asio socket and reports
+	 * on a stream nobody is using -- which is how CEMSocket::Send()'s !IsOk()
+	 * arm would stay dead after wiring.
+	 */
+	void AttachTransport(std::unique_ptr<IStreamTransport> transport);
+	std::unique_ptr<IStreamTransport> DetachTransport();
+
+	//! True while a transport owns this socket's stream.
+	bool HasTransport() const { return m_transport != nullptr; }
+
+	//! Turns stream events into the socket events aMule already raises.
+	//! Offers an attached transport's queue. Main thread only.
+	void FlushTransport();
+
+	//! The attached transport, or null. For owners that must configure it.
+	IStreamTransport *GetTransport() const { return m_transport.get(); }
+
+	void OnStreamConnected() override;
+	void OnStreamReadable() override;
+	void OnStreamWritable() override;
+	void OnStreamLost() override;
+	void OnFlushRequested() override;
+
 private:
 	// Replace the internal socket. Takes ownership of the passed shared_ptr.
-	void	LinkSocketImpl(std::shared_ptr<class CAsioSocketImpl>);
-
-	// shared_ptr so the asio impl can outlive this wrapper for as long as
-	// any in-flight async callback still holds a shared_from_this() ref.
-	// Required to fix the wake-from-sleep use-after-free crash (issue #384).
+	void LinkSocketImpl(std::shared_ptr<class CAsioSocketImpl>);
+
+	// Owned: outlives nothing and is closed by Destroy() before the asio
+	// wrapper goes, so a libutp callback cannot arrive after teardown.
+	std::unique_ptr<IStreamTransport> m_transport;
+	// GetIP() hands back a borrowed pointer, so the text has to outlive the
+	// call. Written once at attach; never from a const accessor.
+	wxString m_peerText;
+
+	// shared_ptr so the asio impl can outlive this wrapper for as long as any in-flight async
+	// callback still holds a shared_from_this() ref. Required to fix the wake-from-sleep use-
+	// after-free crash (issue #384).
 	std::shared_ptr<class CAsioSocketImpl> m_aSocket;
-	void LastCount();	// No. We don't have this. We return it directly with Read() and Write()
-	bool Error() const;	// Only use LastError
+	void LastCount();   // No. We don't have this. We return it directly with Read() and Write()
+	bool Error() const; // Only use LastError
 };
 
-
-//
 // TCP socket server
-//
 class CLibSocketServer
 {
 public:
-	CLibSocketServer(const amuleIPV4Address& adr, int flags);
+	CLibSocketServer(const amuleIPV4Address &adr, int flags);
+	// Bind the acceptor to a specific network interface (empty = any), independent of the
+	// global bind-to-interface pin set via SetSocketBindInterface(). Used by the EC listener so
+	// external-control traffic can live on a different interface than ed2k/Kad.
+	CLibSocketServer(const amuleIPV4Address &adr, int flags, const wxString &bindInterface);
 	virtual ~CLibSocketServer();
-	// Accepts an incoming connection request, and creates a new CLibSocket object which represents the server-side of the connection.
-	CLibSocket * Accept(bool wait = true);
+	// Accepts an incoming connection request, and creates a new CLibSocket object which represents the
+	// server-side of the connection.
+	CLibSocket *Accept(bool wait = true);
 	// Accept an incoming connection using the specified socket object.
-	bool	AcceptWith(CLibSocket & socket, bool wait);
+	bool AcceptWith(CLibSocket &socket, bool wait);
 
-	virtual	void OnAccept() {}
+	virtual void OnAccept() {}
 
-	bool	IsOk() const;
+	bool IsOk() const;
 
-	void	Close();
+	void Close();
 
 	// Not needed here
-	void	Discard() {}
-	bool	Notify(bool) { return true; }
+	void Discard() {}
+	bool Notify(bool) { return true; }
 
 	// new Stuff
 
 	// Do we have a socket available if AcceptWith() is called ?
-	bool	SocketAvailable();
+	bool SocketAvailable();
+
 private:
-	// shared_ptr for the same reason as CLibSocket::m_aSocket — pending
+	// shared_ptr for the same reason as CLibSocket::m_aSocket -- pending
 	// async_accept completions must keep the impl alive past wrapper death.
 	std::shared_ptr<class CAsioSocketServerImpl> m_aServer;
 };
 
-
-//
 // UDP socket
-//
 class CLibUDPSocket
 {
 	friend class CAsioUDPSocketImpl;
+
 public:
 	CLibUDPSocket(amuleIPV4Address &address, int flags);
 	virtual ~CLibUDPSocket();
 
 	// wx Stuff
-	bool	IsOk() const;
-	virtual uint32 RecvFrom(amuleIPV4Address& addr, void* buf, uint32 nBytes);
-	virtual uint32 SendTo(const amuleIPV4Address& addr, const void* buf, uint32 nBytes);
-	int		LastError() const;
-	void	Close();
-	void	Destroy();
-	void	SetClientData(class CMuleUDPSocket *);
+	bool IsOk() const;
+	virtual uint32 RecvFrom(CNetworkAddress &addr, uint16 &port, void *buf, uint32 nBytes);
+	virtual uint32 SendTo(const amuleIPV4Address &addr, const void *buf, uint32 nBytes);
+	int LastError() const;
+	void Close();
+	void Destroy();
+	void SetClientData(class CMuleUDPSocket *);
 
 	// Not needed here
-	bool	Notify(bool) { return true; }
+	bool Notify(bool) { return true; }
 
-	// Check if socket is currently blocking for write
-	// Well - we apparently have block in wx. At least we handle it in MuleUDPSocket.
-	// But this makes no sense. We send a packet to an IP in background.
-	// Either this works after some time, or not. But there is no block.
-	bool	BlocksWrite() const { return false; }
+	// Check whether the socket is currently blocking for write. We apparently have block in wx,
+	// at least we handle it in MuleUDPSocket, but it makes no sense: a packet is sent to an IP
+	// in the background, and either that works after some time or it does not. There is no
+	// block.
+	bool BlocksWrite() const { return false; }
 
 private:
-	// shared_ptr so the asio impl can outlive this wrapper for as long as
-	// any in-flight async callback still holds a shared_from_this() ref.
-	// Required to fix the wake-from-sleep use-after-free crash (issue #384).
+	// shared_ptr so the asio impl can outlive this wrapper for as long as any in-flight async
+	// callback still holds a shared_from_this() ref. Required to fix the wake-from-sleep use-
+	// after-free crash (issue #384).
 	std::shared_ptr<class CAsioUDPSocketImpl> m_aSocket;
-	void	LastCount();	// block this
-	bool	Error() const;	// Only use LastError
+	void LastCount();   // block this
+	bool Error() const; // Only use LastError
 };
 
-
-//
 // ASIO event loop
-//
 class CAsioService
 {
 public:
-    CAsioService();
-    ~CAsioService();
+	CAsioService();
+	~CAsioService();
 	void Stop();
+
 private:
 	static const int m_numberOfThreads;
-	class CAsioServiceThread * m_threads;
+	class CAsioServiceThread *m_threads;
+};
+
+// Set the network interface every socket binds its egress to (empty = system default). Pushed in by
+// the core from thePrefs::GetNetworkInterface() so this socket library stays independent of
+// CPreferences. Takes effect for sockets opened after the call.
+void SetSocketBindInterface(const wxString &iface);
+
+// Outcome of validating the configured bind interface, so the core can report
+// it once at startup instead of discovering it silently per socket.
+enum BindInterfaceStatus
+{
+	BindIface_Empty,      // no interface configured (default)
+	BindIface_OK,         // resolves and binds
+	BindIface_NotFound,   // name/index does not match any interface
+	BindIface_Denied,     // bind needs a privilege we don't have (Linux CAP_NET_RAW)
+	BindIface_Unsupported // platform can't bind, or another error
 };
 
+// Validate the configured bind interface on a throwaway socket. Lets the core warn the user (not
+// found, permission denied) before any real socket opens, rather than leaving traffic silently
+// unbound.
+BindInterfaceStatus TestSocketBindInterface(const wxString &iface);
 
+// Bind an already-open raw socket to the given interface, reusing the exact same per-platform logic
+// as aMule's own sockets -- for non-asio sockets such as libcurl's, via CURLOPT_SOCKOPTFUNCTION.
+// The fd is passed as uintptr_t so a Windows SOCKET survives without truncation.
+bool BindRawSocketToInterface(uintptr_t fd, const wxString &iface);
 
-#endif /* __LIBSOCKET_H__ */
+#endif /* LIBSOCKET_H */

amule-3.0.1.tar.gz/src/LibSocketAsio.cpp -> amule-3.1.0.tar.gz/src/LibSocketAsio.cpp Changed

@@ -23,11 +23,10 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "config.h"		// Needed for HAVE_BOOST_SOURCES
-
+#include "config.h" // Needed for HAVE_BOOST_SOURCES
 
 #ifdef _MSC_VER
-#define _WIN32_WINNT 0x0501	// Boost complains otherwise
+#define _WIN32_WINNT 0x0501 // Boost complains otherwise
 #endif
 
 // Windows requires that Boost headers are included before wx headers.
@@ -36,69 +35,95 @@
 #define BOOST_ALL_NO_LIB
 
 // Suppress warning caused by faulty boost/preprocessor/config/config.hpp in Boost 1.49
-#if defined __GNUC__ && ! defined __GXX_EXPERIMENTAL_CXX0X__ && __cplusplus < 201103L
-	#define BOOST_PP_VARIADICS 0
+#if defined __GNUC__ && !defined __GXX_EXPERIMENTAL_CXX0X__ && __cplusplus < 201103L
+#define BOOST_PP_VARIADICS 0
 #endif
 
-#include <algorithm>	// Needed for std::min - Boost up to 1.54 fails to compile with MSVC 2013 otherwise
+#include <algorithm> // Needed for std::min - Boost up to 1.54 fails to compile with MSVC 2013 otherwise
 #include <atomic>
 #include <chrono>
+#include <vector>
+
+#ifndef _WIN32
+#include <poll.h> // Bounded readability wait for the sync-read no-progress timeout
+#endif
 
-// Trip the compile if we accidentally pull a deprecated Asio API back in.
-#define BOOST_ASIO_NO_DEPRECATED
+#include "WarningsPush_Asio.h"
 #include <boost/asio.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <boost/version.hpp>
+#include "WarningsPop.h"
 
-//
-// Do away with building Boost.System, adding lib paths...
-// Just include the single file and be done.
-//
+// Do away with building Boost.System, adding lib paths... Just include the single file.
 #ifdef HAVE_BOOST_SOURCES
-#	include <boost/../libs/system/src/error_code.cpp>
+#include <boost/../libs/system/src/error_code.cpp>
 #else
-#	include <boost/system/error_code.hpp>
+#include <boost/system/error_code.hpp>
 #endif
 
 #include "LibSocket.h"
-#include <wx/thread.h>		// wxMutex
-#include <wx/intl.h>		// _()
-#include <common/Format.h>	// Needed for CFormat
+#include "NetworkAddressAsio.h"
+#include "StreamTransport.h" // IStreamTransport, for the attached-stream branches
+#include "GuiEvents.h"       // CoreNotify_LibSocket*, the transport event bridge
+#include <wx/thread.h>       // wxMutex
+#include <wx/intl.h>         // _()
+#include <common/Format.h>   // Needed for CFormat
 #include "Logger.h"
 #include "GuiEvents.h"
 #include "amuleIPV4Address.h"
 #include "MuleUDPSocket.h"
-#include "OtherFunctions.h"	// DeleteContents
+#include "NetworkInterfaces.h" // DetectNetworkInterfaces (bind-to-interface resolution)
+#include "OtherFunctions.h"    // DeleteContents
 #include "ScopedPtr.h"
 #include <common/Macros.h>
 
 #ifdef __WINDOWS__
-	// SIO_KEEPALIVE_VALS + struct tcp_keepalive for SetTcpKeepalive.
-	// winsock2.h is already brought in transitively by boost::asio.
-	#include <mstcpip.h>
+// SIO_KEEPALIVE_VALS + struct tcp_keepalive for SetTcpKeepalive.
+// winsock2.h is already brought in transitively by boost::asio.
+#include <mstcpip.h>
+// IP_UNICAST_IF / IPV6_UNICAST_IF are Vista+; define them if the SDK target
+// (see _WIN32_WINNT above) predates their headers. Values are ABI-stable.
+#ifndef IP_UNICAST_IF
+#define IP_UNICAST_IF 31
+#endif
+#ifndef IPV6_UNICAST_IF
+#define IPV6_UNICAST_IF 31
+#endif
 #else
-	#include <fcntl.h>		// FD_CLOEXEC
-	#include <netinet/tcp.h>	// TCP_KEEPIDLE / TCP_KEEPINTVL / TCP_KEEPCNT
-	#include <sys/socket.h>		// SO_KEEPALIVE
+#include <fcntl.h>       // FD_CLOEXEC
+#include <netinet/tcp.h> // TCP_KEEPIDLE / TCP_KEEPINTVL / TCP_KEEPCNT
+#include <sys/socket.h>  // SO_KEEPALIVE / SO_BINDTODEVICE
+#include <netinet/in.h>  // IP_BOUND_IF / IPPROTO_*
+#include <net/if.h>      // if_nametoindex / if_indextoname / IF_NAMESIZE
+#include <arpa/inet.h>   // htonl
+#include <unistd.h>      // close() for the startup bind probe
+#include <cstring>       // strlen() for SO_BINDTODEVICE
+#include <cerrno>        // errno / EPERM
 #endif
 
 using namespace boost::asio;
-using namespace boost::system;	// for error_code
+using namespace boost::system; // for error_code
 static io_context s_io_service;
 
+// The network interface to bind every socket to (empty = system default). Pushed in by the
+// core via SetSocketBindInterface() rather than read from thePrefs directly: mulesocket
+// must not depend on CPreferences, since EC-only tools (amulecmd, amuleweb) link this
+// library but not the full preferences.
+static wxString s_bindToInterface;
+
+void SetSocketBindInterface(const wxString &iface)
+{
+	s_bindToInterface = iface;
+}
+
+// Mark a freshly-created socket close-on-exec so subprocesses launched via wxExecute()
+// (preview-with-vlc, etc.) do not inherit and pin our listen / UDP file descriptors.
+// Without this, vlc keeps the bind alive after aMule exits and the next start fails with
+// "Address already in use" until vlc is killed.
 //
-// Mark a freshly-created socket close-on-exec so subprocesses launched
-// via wxExecute() (preview-with-vlc, etc.) don't inherit and pin our
-// listen / UDP file descriptors. Without this, vlc keeps the bind alive
-// after aMule exits, and the next aMule start fails with
-// "Address already in use" until the user kills vlc (#172).
-//
-// No-op on Windows: WinSock SOCKET handles are non-inheritable by
-// default unless the parent passes bInheritHandle=TRUE to CreateProcess,
-// which wxExecute does not do.
-//
-template <typename Handle>
-static inline void SetCloexecOnSocket(Handle native)
+// No-op on Windows: WinSock SOCKET handles are non-inheritable by default unless the parent
+// passes bInheritHandle=TRUE to CreateProcess.
+template <typename Handle> static inline void SetCloexecOnSocket(Handle native)
 {
 #ifndef __WINDOWS__
 	int flags = ::fcntl(native, F_GETFD, 0);
@@ -106,25 +131,19 @@
 		::fcntl(native, F_SETFD, flags | FD_CLOEXEC);
 	}
 #else
-	(void) native;
+	(void)native;
 #endif
 }
 
-
-// Turn on TCP keepalive with per-socket timings. Used by the EC sockets
-// to detect a half-open connection (peer gone, FIN/RST lost or never
-// sent — common after a network blip, OOM-kill, etc.) instead of
-// sitting idle until the default ~2h TCP retransmit timeout kicks in.
-//
-// POSIX: SO_KEEPALIVE plus the three TCP-layer timing knobs. Linux
-// names (TCP_KEEPIDLE / TCP_KEEPINTVL / TCP_KEEPCNT) are the canonical
-// set; macOS / *BSD use TCP_KEEPALIVE for the idle time and inherit
-// the system defaults for interval and count, which is acceptable as
-// a fallback.
+// Turn on TCP keepalive with per-socket timings. Used by the EC sockets to detect a
+// half-open connection (peer gone, FIN/RST lost or never sent -- common after a network
+// blip or an OOM-kill) instead of sitting idle until the default ~2h TCP retransmit
+// timeout.
 //
-// Windows: SIO_KEEPALIVE_VALS via WSAIoctl. The Windows surface only
-// exposes idle and interval; the probe count uses the system default
-// (typically 10 on modern Windows).
+// POSIX: SO_KEEPALIVE plus the three TCP-layer timing knobs. The Linux names are the
+// canonical set; macOS / *BSD use TCP_KEEPALIVE for the idle time and inherit the system
+// defaults for interval and count. Windows: SIO_KEEPALIVE_VALS via WSAIoctl, which exposes
+// only idle and interval; the probe count uses the system default.
 template <typename Handle>
 static inline void SetTcpKeepalive(Handle native, int idleSec, int intervalSec, int count)
 {
@@ -134,71 +153,274 @@
 	ka.keepalivetime = static_cast<ULONG>(idleSec) * 1000;
 	ka.keepaliveinterval = static_cast<ULONG>(intervalSec) * 1000;
 	DWORD bytesReturned = 0;
-	(void) count;	// SIO_KEEPALIVE_VALS doesn't expose count
-	::WSAIoctl(native, SIO_KEEPALIVE_VALS, &ka, sizeof(ka),
-		NULL, 0, &bytesReturned, NULL, NULL);
+	(void)count; // SIO_KEEPALIVE_VALS doesn't expose count
+	::WSAIoctl(native, SIO_KEEPALIVE_VALS, &ka, sizeof(ka), NULL, 0, &bytesReturned, NULL, NULL);
 #else
 	int yes = 1;
 	::setsockopt(native, SOL_SOCKET, SO_KEEPALIVE, &yes, sizeof(yes));
-	#ifdef TCP_KEEPIDLE
-		::setsockopt(native, IPPROTO_TCP, TCP_KEEPIDLE, &idleSec, sizeof(idleSec));
-	#elif defined(TCP_KEEPALIVE)
-		// macOS / *BSD spelling — idle-only, no separate INTVL/CNT knobs.
-		::setsockopt(native, IPPROTO_TCP, TCP_KEEPALIVE, &idleSec, sizeof(idleSec));
-	#endif
-	#ifdef TCP_KEEPINTVL
-		::setsockopt(native, IPPROTO_TCP, TCP_KEEPINTVL, &intervalSec, sizeof(intervalSec));
-	#else
-		(void) intervalSec;
-	#endif
-	#ifdef TCP_KEEPCNT
-		::setsockopt(native, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count));
-	#else
-		(void) count;
-	#endif
+#ifdef TCP_KEEPIDLE
+	::setsockopt(native, IPPROTO_TCP, TCP_KEEPIDLE, &idleSec, sizeof(idleSec));
+#elif defined(TCP_KEEPALIVE)
+	// macOS / *BSD spelling -- idle-only, no separate INTVL/CNT knobs.
+	::setsockopt(native, IPPROTO_TCP, TCP_KEEPALIVE, &idleSec, sizeof(idleSec));
+#endif
+#ifdef TCP_KEEPINTVL
+	::setsockopt(native, IPPROTO_TCP, TCP_KEEPINTVL, &intervalSec, sizeof(intervalSec));
+#else
+	(void)intervalSec;
+#endif
+#ifdef TCP_KEEPCNT
+	::setsockopt(native, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count));
+#else
+	(void)count;
+#endif
 #endif
 }
 
+#ifdef __WINDOWS__
+// Map a Windows adapter FriendlyName (what the prefs dropdown shows, e.g. "Ethernet",
+// "Wi-Fi") to its interface index. if_nametoindex() cannot do this on Windows -- it expects
+// the adapter's GUID-style name, not the friendly one. Returns 0 if not found, and the
+// caller then tries a bare numeric index. The friendly name comes out of the same
+// enumeration the preferences dialog filled the dropdown from, so a name offered there
+// resolves here.
+static unsigned int ResolveWindowsInterfaceIndex(const wxString &friendlyName)
+{
+	for (const NetworkInterface &iface : DetectNetworkInterfaces()) {
+		if (iface.name == friendlyName) {
+			return iface.index;
+		}
+	}
+	return 0;
+}
+#endif // __WINDOWS__
+
+#ifdef __WINDOWS__
+typedef SOCKET NativeSocketHandle;
+#else
+typedef int NativeSocketHandle;
+#endif
+
+// Resolve a bind-interface value to an interface index (0 if empty or not resolvable): a
+// POSIX name via if_nametoindex(), a Windows adapter FriendlyName via
+// GetAdaptersAddresses(), or a bare numeric index.
+static unsigned int ResolveBindInterfaceIndex(const wxString &ifname)
+{
+	if (ifname.IsEmpty()) {
+		return 0;
+	}
+	unsigned int idx = 0;
+#ifdef __WINDOWS__
+	idx = ResolveWindowsInterfaceIndex(ifname);
+#else
+	idx = if_nametoindex(static_cast<const char *>(ifname.utf8_str()));
+#endif
+	if (idx == 0) {
+		// Fall back to a bare interface index (also the manual Windows path).
+		unsigned long n = 0;
+		if (ifname.ToULong(&n) && n > 0 && n <= 0xFFFFFFFFul) {
+			idx = static_cast<unsigned int>(n);
+		}
+	}
+	return idx;
+}
+
+// Bind a raw socket's egress to a network interface. Unlike binding to a local IP
+// (SetLocal), this pins the *route*, so traffic cannot leak out via the default-route
+// interface -- the VPN-leak case.
+//
+// Each platform needs the option that is a real egress *constraint*:
+//   Linux         : SO_BINDTODEVICE. IP_UNICAST_IF is only a routing preference here --
+//                   verified: it silently falls back to the default route -- so it cannot
+//                   prevent leaks. SO_BINDTODEVICE may require CAP_NET_RAW on some
+//                   kernels, which the caller surfaces rather than pretending traffic is
+//                   contained.
+//   macOS / Darwin: IP_BOUND_IF / IPV6_BOUND_IF, a true constraint.
+//   Windows       : IP_UNICAST_IF / IPV6_UNICAST_IF, a real constraint there.
+//
+// Returns 0 on success or an errno-style code on failure; sets *notFound when the
+// interface cannot be resolved, which is distinct from a permission error.
+static int ApplyBindToInterface(NativeSocketHandle native, const wxString &ifname, bool isV6, bool *notFound)
+{
+	*notFound = false;
+	unsigned int idx = ResolveBindInterfaceIndex(ifname);
+	if (idx == 0) {
+		*notFound = true;
+		return -1;
+	}
+#ifdef __WINDOWS__
+	if (!isV6) {
+		DWORD v = htonl(idx); // IPv4 IP_UNICAST_IF wants the index in network byte order
+		if (::setsockopt(native,
+			    IPPROTO_IP,
+			    IP_UNICAST_IF,
+			    reinterpret_cast<const char *>(&v),
+			    sizeof(v)) != 0) {
+			return ::WSAGetLastError();
+		}
+	} else {
+		DWORD v = idx; // IPv6 wants host byte order
+		if (::setsockopt(native,
+			    IPPROTO_IPV6,
+			    IPV6_UNICAST_IF,
+			    reinterpret_cast<const char *>(&v),
+			    sizeof(v)) != 0) {
+			return ::WSAGetLastError();
+		}
+	}
+	return 0;
+#elif defined(__linux__)
+	// SO_BINDTODEVICE takes the interface *name*; derive the canonical name
+	// from the resolved index (also normalises a numeric-index entry).
+	(void)isV6; // family-agnostic
+	char devNameIF_NAMESIZE = { 0 };
+	if (if_indextoname(idx, devName) == NULL) {
+		*notFound = true;
+		return -1;
+	}
+	if (::setsockopt(native, SOL_SOCKET, SO_BINDTODEVICE, devName, strlen(devName)) != 0) {
+		return errno;
+	}
+	return 0;
+#elif defined(IP_BOUND_IF) // macOS / Darwin -- index in host byte order
+	int v = static_cast<int>(idx);
+	if (::setsockopt(native,
+		    isV6 ? IPPROTO_IPV6 : IPPROTO_IP,
+		    isV6 ? IPV6_BOUND_IF : IP_BOUND_IF,
+		    &v,
+		    sizeof(v)) != 0) {
+		return errno;
+	}
+	return 0;
+#else
+	(void)native;
+	(void)isV6;
+	return ENOTSUP;
+#endif
+}
+
+// Per-socket egress bind (reads the interface pushed in by the core). Kept on the debug
+// channel to avoid spamming the normal log on every connect -- the core reports the overall
+// outcome once at startup via TestSocketBindInterface.
+template <typename Handle> static void SetBoundInterface(Handle native, const wxString &ifname, bool isV6)
+{
+	if (ifname.IsEmpty()) {
+		return;
+	}
+	bool notFound = false;
+	int err = ApplyBindToInterface(static_cast<NativeSocketHandle>(native), ifname, isV6, &notFound);
+	if (err == 0) {
+		AddDebugLogLineF(logAsio, CFormat("Bind-to-interface: bound socket to '%s'") % ifname);
+	} else {
+		AddDebugLogLineC(logAsio,
+			CFormat("Bind-to-interface: could not bind socket to '%s' (%s)") % ifname %
+				(notFound ? "no such interface" : "error"));
+	}
+}
+
+// Bind an already-open raw socket (e.g. libcurl's HTTP socket) to the
+// configured interface, reusing the exact same logic as aMule's own sockets.
+bool BindRawSocketToInterface(uintptr_t fd, const wxString &iface)
+{
+	if (iface.IsEmpty()) {
+		return true;
+	}
+	bool notFound = false;
+	return ApplyBindToInterface(static_cast<NativeSocketHandle>(fd), iface, false, &notFound) == 0;
+}
+
+// Validate the configured interface once, on a throwaway socket, so the core can report the
+// real outcome at startup (found / not-found / permission denied) rather than discovering
+// it silently per socket.
+BindInterfaceStatus TestSocketBindInterface(const wxString &ifname)
+{
+	if (ifname.IsEmpty()) {
+		return BindIface_Empty;
+	}
+	if (ResolveBindInterfaceIndex(ifname) == 0) {
+		return BindIface_NotFound;
+	}
+#ifdef __WINDOWS__
+	SOCKET fd = ::socket(AF_INET, SOCK_DGRAM, 0);
+	if (fd == INVALID_SOCKET) {
+		return BindIface_OK; // resolved; can't probe, assume ok
+	}
+#else
+	int fd = ::socket(AF_INET, SOCK_DGRAM, 0);
+	if (fd < 0) {
+		return BindIface_OK;
+	}
+#endif
+	bool notFound = false;
+	int err = ApplyBindToInterface(fd, ifname, false, &notFound);
+#ifdef __WINDOWS__
+	::closesocket(fd);
+#else
+	::close(fd);
+#endif
+	if (err == 0) {
+		return BindIface_OK;
+	}
+	if (notFound) {
+		return BindIface_NotFound;
+	}
+#ifndef __WINDOWS__
+	if (err == EPERM || err == EACCES) {
+		return BindIface_Denied;
+	}
+#endif
+	return BindIface_Unsupported;
+}
 
 // Number of threads in the Asio thread pool
 const int CAsioService::m_numberOfThreads = 4;
 
-/**
- * ASIO Client TCP socket implementation
- */
+/** ASIO Client TCP socket implementation */
 
-class CamuleIPV4Endpoint : public ip::tcp::endpoint {
+class CamuleIPV4Endpoint : public ip::tcp::endpoint
+{
 public:
 	CamuleIPV4Endpoint() {}
 
-	CamuleIPV4Endpoint(const CamuleIPV4Endpoint & impl) : ip::tcp::endpoint(impl) {}
-	CamuleIPV4Endpoint(const ip::tcp::endpoint & ep) { * this = ep; }
-	CamuleIPV4Endpoint(const ip::udp::endpoint & ep) { address(ep.address()); port(ep.port()); }
+	CamuleIPV4Endpoint(const CamuleIPV4Endpoint &impl)
+	: ip::tcp::endpoint(impl)
+	{
+	}
+	// The user-provided copy ctor above suppresses the implicitly-declared copy-assignment
+	// operator under C++11+ (deprecated form); make the default one explicit so
+	// -Wdeprecated-copy stays quiet.
+	CamuleIPV4Endpoint &operator=(const CamuleIPV4Endpoint &) = default;
+	CamuleIPV4Endpoint(const ip::tcp::endpoint &ep) { *this = ep; }
+	CamuleIPV4Endpoint(const ip::udp::endpoint &ep)
+	{
+		address(ep.address());
+		port(ep.port());
+	}
 
-	const CamuleIPV4Endpoint& operator = (const ip::tcp::endpoint & ep)
+	const CamuleIPV4Endpoint &operator=(const ip::tcp::endpoint &ep)
 	{
-		* (ip::tcp::endpoint *) this = ep;
+		*(ip::tcp::endpoint *)this = ep;
 		return *this;
 	}
 };
 
 // See the comment above CAsioUDPSocketImpl for the rationale on enable_shared_from_this:
-// pending asio completion handlers must keep the impl alive past the wrapper's
-// death (and past the old 1-second-timer guard that did not survive the time
-// jump on wake-from-sleep — issue #384).
+// pending asio completion handlers must keep the impl alive past the wrapper's death (and
+// past the old 1-second-timer guard that did not survive the time jump on wake-from-sleep,
+// issue #384).
 class CAsioSocketImpl : public std::enable_shared_from_this<CAsioSocketImpl>
 {
-	// Buffer size posted with async_read_some.  256 KB lets a fast peer
-	// fill the buffer with several TCP segments at once on POSIX (epoll/
-	// kqueue), and is the IOCP-native WSARecv buffer on Windows.  Bigger
-	// keeps per-byte event-loop overhead small without blowing memory.
+	// Buffer size posted with async_read_some. 256 KB lets a fast peer fill the buffer with
+	// several TCP segments at once on POSIX (epoll/kqueue), and is the IOCP-native WSARecv
+	// buffer on Windows. Bigger keeps per-byte event-loop overhead small without blowing
+	// memory.
 	static constexpr uint32 READ_CHUNK = 256 * 1024;
 
 public:
 	// cppcheck-suppress uninitMemberVar m_readBufferPtr
-	CAsioSocketImpl(CLibSocket * libSocket) :
-		m_libSocket(libSocket),
-		m_strand(s_io_service)
+	CAsioSocketImpl(CLibSocket *libSocket)
+	: m_libSocket(libSocket)
+	, m_strand(s_io_service)
 	{
 		m_OK = false;
 		m_blocksRead = false;
@@ -206,9 +428,9 @@
 		m_ErrorCode = 0;
 		m_readBuffer = NULL;
 		m_readBufferSize = 0;
-		m_readPending = false;
+		m_readPending.store(false, std::memory_order_relaxed);
 		m_readBufferContent = 0;
-		m_eventPending = false;
+		m_eventPending.store(false, std::memory_order_relaxed);
 		m_port = 0;
 		m_sendBuffer.store(nullptr, std::memory_order_relaxed);
 		m_connected = false;
@@ -219,6 +441,12 @@
 		m_sync = false;
 		m_IP = L"?";
 		m_IPint = 0;
+		m_connectTimeoutMs = 0;
+		// No-progress bound for synchronous EC reads. amuled's control channel never
+		// legitimately goes 30 s without a byte mid-reply, so this only ever trips on a genuinely
+		// stalled / desynced peer (see ReadSync). Kept generous so slow-but-progressing large
+		// transfers cannot false-trip it.
+		m_syncReadTimeoutMs = 30000;
 		m_socket = new ip::tcp::socket(s_io_service);
 
 		// Set socket to non blocking
@@ -232,22 +460,23 @@
 		delete m_socket;
 	}
 
-	// Called by the wrapper's destructor (or by LinkSocketImpl when swapping
-	// us out) to detach the back-pointer so any callback that fires after
-	// the wrapper is gone no-ops its CoreNotify_* branch instead of
-	// dereferencing freed memory. Atomic so the wrapper-side (any thread)
-	// and the strand-side reads don't need an external lock.
-	void OnWrapperGone()
-	{
-		m_libSocket.store(nullptr, std::memory_order_release);
-	}
+	// Called by the wrapper's destructor (or by LinkSocketImpl when swapping us out) to detach
+	// the back-pointer so any callback that fires after the wrapper is gone no-ops its
+	// CoreNotify_* branch instead of dereferencing freed memory. Atomic so the wrapper-side
+	// (any thread) and the strand-side reads need no external lock.
+	void OnWrapperGone() { m_libSocket.store(nullptr, std::memory_order_release); }
 
-	void Notify(bool notify)
-	{
-		m_notify = notify;
-	}
+	void Notify(bool notify) { m_notify = notify; }
+
+	// Bound the synchronous connect (0 = no bound, the default). Only
+	// honoured on the sync connect path -- see Connect().
+	void SetConnectTimeout(int ms) { m_connectTimeoutMs = ms; }
+
+	// Bound how long a synchronous read may make no progress (0 = no bound). Applies to
+	// ReadSync; see there for why this cannot be an SO_RCVTIMEO.
+	void SetSyncReadTimeout(int ms) { m_syncReadTimeoutMs = ms; }
 
-	bool Connect(const amuleIPV4Address& adr, bool wait)
+	bool Connect(const amuleIPV4Address &adr, bool wait)
 	{
 		if (!m_proxyState) {
 			SetIp(adr);
@@ -255,38 +484,85 @@
 		m_port = adr.Service();
 		m_closed = false;
 		m_OK = false;
-		m_sync = !m_notify;		// set this once for the whole lifetime of the socket
+		m_sync = !m_notify; // set this once for the whole lifetime of the socket
 		AddDebugLogLineF(logAsio, CFormat("Connect %s %p") % m_IP % this);
 
+		// Pin outbound traffic to the configured network interface (VPN-leak fix, #173). This
+		// must apply even when no local IP is bound (no SetLocal call), so open the socket here
+		// to set the option before connect; asio's connect happily reuses an already-open socket.
+		if (!s_bindToInterface.IsEmpty()) {
+			error_code openEc;
+			if (!m_socket->is_open()) {
+				m_socket->open(ip::tcp::v4(), openEc);
+			}
+			if (!openEc) {
+				SetBoundInterface(m_socket->native_handle(), s_bindToInterface, false);
+			}
+		}
+
 		if (wait || m_sync) {
 			error_code ec;
-			m_socket->connect(adr.GetEndpoint(), ec);
+			if (m_connectTimeoutMs > 0) {
+				// Bounded synchronous connect: async_connect raced against a steady_timer,
+				// both driven here on the io_service. A synchronous EC connection may use
+				// the global s_io_service before the CAsioService thread pool is started,
+				// and if the synchronous operation leaves the io_context stopped it must be
+				// restarted before run() is called. Portable through asio with no per-OS
+				// socket-timeout handling: a wrong or unreachable host fails in
+				// m_connectTimeoutMs instead of hanging on the OS TCP connect timeout.
+				ec = boost::asio::error::would_block;
+				m_socket->async_connect(
+					adr.GetEndpoint(), &ec(const error_code &e) { ec = e; });
+				steady_timer timer(s_io_service);
+				timer.expires_after(std::chrono::milliseconds(m_connectTimeoutMs));
+				bool timedOut = false;
+				timer.async_wait(this, &timedOut(const error_code &e) {
+					// Fires only while the connect is still pending;
+					// closing the socket aborts it so run_one() returns.
+					if (e != boost::asio::error::operation_aborted) {
+						timedOut = true;
+						error_code ignore;
+						m_socket->close(ignore);
+					}
+				});
+				s_io_service.restart();
+				while (ec == boost::asio::error::would_block) {
+					if (s_io_service.run_one() == 0) {
+						break;
+					}
+				}
+				timer.cancel();
+				s_io_service.poll(); // drain the cancelled timer handler
+				if (timedOut) {
+					ec = boost::asio::error::timed_out;
+				}
+			} else {
+				m_socket->connect(adr.GetEndpoint(), ec);
+			}
 			m_OK = !ec;
 			m_connected = m_OK;
+			if (ec) {
+				m_ErrorCode = ec.value();
+			}
 			return m_OK;
 		} else {
 			auto self = shared_from_this();
 			m_socket->async_connect(adr.GetEndpoint(),
-				bind_executor(m_strand, self(const error_code& ec) { self->HandleConnect(ec); }));
+				bind_executor(
+					m_strand, self(const error_code &ec) { self->HandleConnect(ec); }));
 			// m_OK and return are false because we are not connected yet
 			return false;
 		}
 	}
 
-	bool IsConnected() const
-	{
-		return m_connected;
-	}
+	bool IsConnected() const { return m_connected; }
 
 	// For wxSocketClient, Ok won't return true unless the client is connected to a server.
-	bool IsOk() const
-	{
-		return m_OK;
-	}
+	bool IsOk() const { return m_OK; }
 
-	// Apply TCP keepalive timings to the underlying socket if it's open.
-	// Caller is expected to invoke this after a successful connect (client
-	// side) or accept (server side) so the kernel native_handle is live.
+	// Apply TCP keepalive timings to the underlying socket if it is open. The caller is
+	// expected to invoke this after a successful connect (client side) or accept (server side)
+	// so the kernel native_handle is live.
 	void EnableTcpKeepalive(int idleSec, int probeIntervalSec, int probeCount)
 	{
 		if (!m_socket || !m_socket->is_open()) {
@@ -295,40 +571,36 @@
 		SetTcpKeepalive(m_socket->native_handle(), idleSec, probeIntervalSec, probeCount);
 	}
 
-	bool IsDestroying() const
+	// Turn Nagle off. Same timing contract as EnableTcpKeepalive: the
+	// caller invokes this once the fd is live (after connect / accept).
+	void EnableTcpNoDelay()
 	{
-		return m_destroying.load(std::memory_order_acquire);
+		if (!m_socket || !m_socket->is_open()) {
+			return;
+		}
+		error_code ec;
+		m_socket->set_option(ip::tcp::no_delay(true), ec);
 	}
 
+	bool IsDestroying() const { return m_destroying.load(std::memory_order_acquire); }
+
 	// Returns the actual error code
-	int LastError() const
-	{
-		return m_ErrorCode;
-	}
+	int LastError() const { return m_ErrorCode; }
 
 	// Is reading blocked?
-	bool BlocksRead() const
-	{
-		return m_blocksRead;
-	}
+	bool BlocksRead() const { return m_blocksRead; }
 
 	// Is writing blocked?
-	bool BlocksWrite() const
-	{
-		return m_blocksWrite.load(std::memory_order_acquire);
-	}
-
-	// Problem: wx sends an event when data gets available, so first there is an event, then Read() is called
-	// Asio can read async with callback, so you first read, then you get an event.
-	// Strategy:
-	// - Read some data in background into a buffer
-	// - Callback posts event when something is there
-	// - Read data from buffer
-	// - If data is exhausted, start reading more in background
-	// - If not, post another event (making sure events don't pile up though)
-	uint32 Read(char * buf, uint32 bytesToRead)
+	bool BlocksWrite() const { return m_blocksWrite.load(std::memory_order_acquire); }
+
+	// wx sends an event when data becomes available, so first there is an event, then Read() is
+	// called; asio reads asynchronously with a callback, so you read first and then get an
+	// event. Strategy: read some data in the background into a buffer, have the callback post
+	// an event when something is there, read from the buffer, and either start another
+	// background read when it is exhausted or post another event (without piling them up).
+	uint32 Read(char *buf, uint32 bytesToRead)
 	{
-		if (bytesToRead == 0) {			// huh?
+		if (bytesToRead == 0) { // huh?
 			return 0;
 		}
 
@@ -341,21 +613,23 @@
 			return 0;
 		}
 
-		if (m_readPending					// Background read hasn't completed.
-			|| m_readBufferContent == 0) {	// shouldn't be if it's not pending
+		// Acquire, pairing with the release in HandleRead: seeing false here
+		// means the buffer state published alongside it is visible too.
+		if (m_readPending.load(std::memory_order_acquire) // Background read hasn't completed.
+			|| m_readBufferContent == 0) {            // shouldn't be if it's not pending
 
 			m_blocksRead = true;
 			AddDebugLogLineF(logAsio, CFormat("Read1 %s %d - Block") % m_IP % bytesToRead);
 			return 0;
 		}
 
-		m_blocksRead = false;	// shouldn't be needed
+		m_blocksRead = false; // shouldn't be needed
 
 		// Read from our buffer
 		uint32 readCache = std::min(m_readBufferContent, bytesToRead);
 		memcpy(buf, m_readBufferPtr, readCache);
-		m_readBufferContent	-= readCache;
-		m_readBufferPtr		+= readCache;
+		m_readBufferContent -= readCache;
+		m_readBufferPtr += readCache;
 
 		AddDebugLogLineF(logAsio, CFormat("Read2 %s %d - %d") % m_IP % bytesToRead % readCache);
 		if (m_readBufferContent) {
@@ -368,10 +642,9 @@
 		return readCache;
 	}
 
-
 	// Make a copy of the data and send it in background
 	// - unless a background send is already going on
-	uint32 Write(const void * buf, uint32 nbytes)
+	uint32 Write(const void *buf, uint32 nbytes)
 	{
 		if (m_sync) {
 			return WriteSync(buf, nbytes);
@@ -379,11 +652,12 @@
 
 		if (m_sendBuffer.load(std::memory_order_acquire)) {
 			m_blocksWrite.store(true, std::memory_order_relaxed);
-			AddDebugLogLineF(logAsio, CFormat("Write blocks %d %p %s") % nbytes % m_sendBuffer.load() % m_IP);
+			AddDebugLogLineF(logAsio,
+				CFormat("Write blocks %d %p %s") % nbytes % m_sendBuffer.load() % m_IP);
 			return 0;
 		}
 		AddDebugLogLineF(logAsio, CFormat("Write %d %s") % nbytes % m_IP);
-		char* newBuf = new charnbytes;
+		char *newBuf = new charnbytes;
 		memcpy(newBuf, buf, nbytes);
 		m_sendBuffer.store(newBuf, std::memory_order_release);
 		auto self = shared_from_this();
@@ -392,7 +666,6 @@
 		return nbytes;
 	}
 
-
 	void Close()
 	{
 		if (!m_closed) {
@@ -407,23 +680,32 @@
 		}
 	}
 
-
-	// See the parallel comment on CAsioUDPSocketImpl::Destroy(). The TCP path
-	// has identical wake-from-sleep risk; the fix is identical too — drop the
-	// 1-second-timer band-aid in favour of shared_from_this lifetime.
+	// See the parallel comment on CAsioUDPSocketImpl::Destroy(). The TCP path has identical
+	// wake-from-sleep risk, and the fix is identical too -- drop the 1-second-timer band-aid in
+	// favour of shared_from_this lifetime.
 	//
-	// TCP routes wrapper deletion through CoreNotify_LibSocketDestroy (rather
-	// than deleting inline like UDP) because TCP wrappers are reachable from
-	// many parts of the core; the GUI-thread delete preserves the existing
-	// thread affinity for that cleanup.
+	// TCP routes wrapper deletion through CoreNotify_LibSocketDestroy rather than deleting
+	// inline like UDP, because TCP wrappers are reachable from many parts of the core and the
+	// GUI-thread delete preserves that thread affinity.
 	void Destroy()
 	{
 		if (m_destroying.exchange(true, std::memory_order_acq_rel)) {
-			CLibSocket * w = m_libSocket.load(std::memory_order_acquire);
-			AddDebugLogLineC(logAsio, CFormat("Destroy() already dying socket %p %p %s") % w % this % m_IP);
+			// Not an error: the guard is here so callers can be sloppy, and several
+			// deliberately are. CClientTCPSocket::Safe_Delete() says "Destroy may be called
+			// several times" and calls it regardless, and StopConnectionTry() destroys sockets
+			// whose connect is still in flight -- when that connect later fails, OnConnect()
+			// destroys the same socket again. The wrapper is notified once, by whichever call
+			// won the exchange.
+			//
+			// Logged at 'F' rather than 'C' for that reason: AddDebugLogLineC survives a release
+			// build, so a critical line here reached every user's log on an ordinary peer
+			// disconnect.
+			CLibSocket *w = m_libSocket.load(std::memory_order_acquire);
+			AddDebugLogLineF(logAsio,
+				CFormat("Destroy() already dying socket %p %p %s") % w % this % m_IP);
 			return;
 		}
-		CLibSocket * wrapper = m_libSocket.load(std::memory_order_acquire);
+		CLibSocket *wrapper = m_libSocket.load(std::memory_order_acquire);
 		AddDebugLogLineF(logAsio, CFormat("Destroy() %p %p %s") % wrapper % this % m_IP);
 		Close();
 
@@ -431,8 +713,7 @@
 		auto teardown = self() {
 			// Null the back-pointer before notifying so any callback that
 			// fires after this point sees null and skips its CoreNotify_*.
-			CLibSocket * w = self->m_libSocket.exchange(nullptr,
-				std::memory_order_acq_rel);
+			CLibSocket *w = self->m_libSocket.exchange(nullptr, std::memory_order_acq_rel);
 			if (w) {
 				CoreNotify_LibSocketDestroy(w);
 			}
@@ -445,21 +726,18 @@
 		}
 	}
 
+	wxString GetPeer() { return m_IP; }
 
-	wxString GetPeer()
+	CNetworkAddress GetPeerAddress()
 	{
-		return m_IP;
+		return m_peerAddress.IsPresent() ? m_peerAddress
+						 : CNetworkAddress::FromIPv4NetworkOrderOrAbsent(m_IPint);
 	}
 
-	uint32 GetPeerInt()
-	{
-		return m_IPint;
-	}
+	uint32 GetPeerInt() { return m_IPint; }
 
-	//
-	// Bind socket to local endpoint if user wants to choose the local address
-	//
-	void SetLocal(const amuleIPV4Address& local)
+	// Bind socket to local endpoint if the user wants to choose the local address
+	void SetLocal(const amuleIPV4Address &local)
 	{
 		error_code ec;
 		if (!m_socket->is_open()) {
@@ -469,30 +747,29 @@
 				AddDebugLogLineC(logAsio, CFormat("Can't open socket : %s") % ec.message());
 			}
 		}
-		//
-		// We are using random (OS-defined) local ports.
-		// To set a constant output port, first call
-		// m_socket->set_option(socket_base::reuse_address(true));
-		// and then set the endpoint's port to it.
-		//
+		// We are using random (OS-defined) local ports. To set a constant output port, first
+		// call m_socket->set_option(socket_base::reuse_address(true)) and then set the
+		// endpoint's port to it.
 		CamuleIPV4Endpoint endpoint(local.GetEndpoint());
 		endpoint.port(0);
 		m_socket->bind(endpoint, ec);
 		if (ec) {
-			AddDebugLogLineC(logAsio, CFormat("Can't bind socket to local endpoint %s : %s")
-				% local.IPAddress() % ec.message());
+			AddDebugLogLineC(logAsio,
+				CFormat("Can't bind socket to local endpoint %s : %s") % local.IPAddress() %
+					ec.message());
 		} else {
-			AddDebugLogLineF(logAsio, CFormat("Bound socket to local endpoint %s") % local.IPAddress());
+			AddDebugLogLineF(
+				logAsio, CFormat("Bound socket to local endpoint %s") % local.IPAddress());
 		}
 	}
 
+	// Acquiring, not a plain store: it has to pick up the value the posting side wrote, so
+	// everything published before that post -- the filled buffer and the cleared m_readPending
+	// -- is visible to the Read() this notification is about to drive. A plain store leaves the
+	// reader free to see a stale read state and block on data that is already here.
+	void EventProcessed() { m_eventPending.exchange(false, std::memory_order_acquire); }
 
-	void EventProcessed()
-	{
-		m_eventPending = false;
-	}
-
-	void SetWrapSocket(CLibSocket * socket)
+	void SetWrapSocket(CLibSocket *socket)
 	{
 		m_libSocket.store(socket, std::memory_order_release);
 		// Also do some setting up
@@ -505,28 +782,29 @@
 	bool UpdateIP()
 	{
 		error_code ec;
-		amuleIPV4Address addr = CamuleIPV4Endpoint(m_socket->remote_endpoint(ec));
+		const auto endpoint = m_socket->remote_endpoint(ec);
 		if (SetError(ec)) {
 			AddDebugLogLineN(logAsio, CFormat("UpdateIP failed %p %s") % this % ec.message());
 			return false;
 		}
-		SetIp(addr);
-		m_port = addr.Service();
+		m_peerAddress = NetworkAddressAsio::FromIngressAddress(endpoint.address());
+		m_IPstring = wxString(m_peerAddress.ToString());
+		m_IP = m_IPstring.c_str();
+		// Keep the legacy ed2k value separate from the native peer address.
+		m_IPint = m_peerAddress.ToIPv4NetworkOrderOrZero();
+		m_port = endpoint.port();
 		AddDebugLogLineF(logAsio, CFormat("UpdateIP %s %d %p") % m_IP % m_port % this);
 		return true;
 	}
 
-	const wxChar * GetIP() const { return m_IP; }
+	const wxChar *GetIP() const { return m_IP; }
 	uint16 GetPort() const { return m_port; }
 
-	ip::tcp::socket & GetAsioSocket()
-	{
-		return * m_socket;
-	}
+	ip::tcp::socket &GetAsioSocket() { return *m_socket; }
 
 	bool GetProxyState() const { return m_proxyState; }
 
-	void SetProxyState(bool state, const amuleIPV4Address * adr)
+	void SetProxyState(bool state, const amuleIPV4Address *adr)
 	{
 		m_proxyState = state;
 		if (state) {
@@ -542,12 +820,9 @@
 	}
 
 private:
-	//
-	// Dispatch handlers
-	// Access to m_socket is all bundled in the thread running s_io_service to avoid
-	// concurrent access to the socket from several threads.
-	// So once things are running (after connect), all access goes through one of these handlers.
-	//
+	// Dispatch handlers. Access to m_socket is all bundled in the thread running s_io_service
+	// to avoid concurrent access from several threads, so once things are running (after
+	// connect) all access goes through one of these.
 	void DispatchClose()
 	{
 		error_code ec;
@@ -562,12 +837,10 @@
 	void DispatchBackgroundRead()
 	{
 		AddDebugLogLineF(logAsio, CFormat("DispatchBackgroundRead %s") % m_IP);
-		// Why async_read_some and not async_wait(wait_read): on Windows
-		// boost.asio implements async_wait via its select_reactor (a single
-		// select() loop in a dedicated thread) because IOCP has no native
-		// "ready notification" without a buffer.  async_read_some maps to
-		// WSARecv on Windows (IOCP-native) and to epoll/kqueue on POSIX, so
-		// it is the fast path on every platform.
+		// Why async_read_some and not async_wait(wait_read): on Windows boost.asio implements
+		// async_wait via its select_reactor, because IOCP has no native "ready notification"
+		// without a buffer. async_read_some maps to WSARecv on Windows (IOCP-native) and to
+		// epoll/kqueue on POSIX.
 		if (m_readBufferSize < READ_CHUNK) {
 			delete m_readBuffer;
 			m_readBuffer = new charREAD_CHUNK;
@@ -575,29 +848,37 @@
 		}
 		auto self = shared_from_this();
 		m_socket->async_read_some(buffer(m_readBuffer, m_readBufferSize),
-			bind_executor(m_strand, self(const error_code& ec, std::size_t n) { self->HandleRead(ec, n); }));
+			bind_executor(m_strand,
+				self(const error_code &ec, std::size_t n) { self->HandleRead(ec, n); }));
 	}
 
-	// The buffer pointer is passed explicitly so each HandleSend knows
-	// which buffer it owns and must delete.  m_sendBuffer only tracks the
-	// currently-in-flight write and is cleared by HandleSend when the send
-	// completes — it cannot be used to identify the buffer to free.
-	void DispatchWrite(char* sendBuffer, uint32 nbytes)
+	// The buffer pointer is passed explicitly so each HandleSend knows which buffer it owns and
+	// must delete. m_sendBuffer only tracks the currently-in-flight write and is cleared by
+	// HandleSend when the send completes, so it cannot identify the buffer to free.
+	void DispatchWrite(char *sendBuffer, uint32 nbytes)
 	{
 		auto self = shared_from_this();
-		async_write(*m_socket, buffer(sendBuffer, nbytes),
-			bind_executor(m_strand, self, sendBuffer(const error_code& ec, std::size_t n) { self->HandleSend(sendBuffer, ec, n); }));
+		async_write(*m_socket,
+			buffer(sendBuffer, nbytes),
+			bind_executor(m_strand, self, sendBuffer(const error_code &ec, std::size_t n) {
+				self->HandleSend(sendBuffer, ec, n);
+			}));
 	}
 
-	//
 	// Completion handlers for async requests
-	//
 
-	void HandleConnect(const error_code& err)
+	void HandleConnect(const error_code &err)
 	{
 		m_OK = !err;
+		if (m_OK) {
+			// A successful connect means the socket is healthy: clear any stale error left on
+			// this impl (e.g. an EBADF/aborted read that completed during the reconnect
+			// socket-swap). Otherwise SocketRealError() stays true and CECSocket::WritePacket
+			// refuses to send the EC login on the reused connection (#444).
+			m_ErrorCode = 0;
+		}
 		AddDebugLogLineF(logAsio, CFormat("HandleConnect %d %s") % m_OK % m_IP);
-		CLibSocket * wrapper = m_libSocket.load(std::memory_order_acquire);
+		CLibSocket *wrapper = m_libSocket.load(std::memory_order_acquire);
 		if (!wrapper) {
 			AddDebugLogLineF(logAsio, CFormat("HandleConnect: wrapper gone %s") % m_IP);
 		} else {
@@ -612,30 +893,32 @@
 		}
 	}
 
-	void HandleSend(char* sentBuffer, const error_code& err, size_t bytes_transferred)
+	void HandleSend(char *sentBuffer, const error_code &err, size_t bytes_transferred)
 	{
 		delete sentBuffer;
-		// Atomically clear m_sendBuffer only if it still points to the buffer
-		// we just finished sending.  A racing Write() on the throttler thread
-		// may have already swapped in a new buffer.
+		// Atomically clear m_sendBuffer only if it still points to the buffer we just finished
+		// sending. A racing Write() on the throttler thread may have already swapped in a new
+		// buffer.
 		m_sendBuffer.compare_exchange_strong(sentBuffer, nullptr, std::memory_order_release);
 
-		CLibSocket * wrapper = m_libSocket.load(std::memory_order_acquire);
+		CLibSocket *wrapper = m_libSocket.load(std::memory_order_acquire);
 		if (!wrapper) {
 			AddDebugLogLineF(logAsio, CFormat("HandleSend: wrapper gone %s") % m_IP);
 		} else {
 			if (SetError(err)) {
-				AddDebugLogLineN(logAsio, CFormat("HandleSend Error %d %s") % bytes_transferred % m_IP);
+				AddDebugLogLineN(logAsio,
+					CFormat("HandleSend Error %d %s") % bytes_transferred % m_IP);
 				PostLostEvent();
 			} else {
-				AddDebugLogLineF(logAsio, CFormat("HandleSend %d %s") % bytes_transferred % m_IP);
+				AddDebugLogLineF(
+					logAsio, CFormat("HandleSend %d %s") % bytes_transferred % m_IP);
 				m_blocksWrite.store(false, std::memory_order_release);
 				CoreNotify_LibSocketSend(wrapper, m_ErrorCode);
 			}
 		}
 	}
 
-	void HandleRead(const error_code & ec, size_t bytes_transferred)
+	void HandleRead(const error_code &ec, size_t bytes_transferred)
 	{
 		if (!m_libSocket.load(std::memory_order_acquire)) {
 			AddDebugLogLineF(logAsio, CFormat("HandleRead: wrapper gone %s") % m_IP);
@@ -659,70 +942,185 @@
 		m_readBufferPtr = m_readBuffer;
 		m_readBufferContent = (uint32)bytes_transferred;
 
-		m_readPending = false;
+		// Release, and after the buffer writes above on purpose. A reader that acquire-loads this
+		// as false is then guaranteed to see the content and pointer written before it.
+		//
+		// Plain stores let the two become visible out of order. The main thread would see the new
+		// content with the pending flag still set, take the "a background read is still running"
+		// branch in Read(), and return without serving data already sitting in the buffer -- and
+		// without arming anything. Since that branch is reached from an event already consumed,
+		// nothing looks again: the socket stays open with its bytes unread. Caught in the act on
+		// arm64, where the reordering is permitted:
+		//
+		//   handleRead(10)c=10 p=0   <- strand: content set, pending cleared
+		//   block(8)     c=10 p=1    <- main: new content, stale flag
+		m_readPending.store(false, std::memory_order_release);
 		m_blocksRead = false;
 		PostReadEvent(2);
 	}
 
-
-	//
 	// Other functions
-	//
 
 	void StartBackgroundRead()
 	{
-		m_readPending = true;
+		m_readPending.store(true, std::memory_order_relaxed);
 		m_readBufferContent = 0;
 		auto self = shared_from_this();
 		dispatch(m_strand, self() { self->DispatchBackgroundRead(); });
 	}
 
-	void PostReadEvent(int DEBUG_ONLY(from) )
+	void PostReadEvent(int DEBUG_ONLY(from))
 	{
-		if (!m_eventPending) {
+		// One atomic step, so exactly one caller can win the right to notify: a plain
+		// test-then-set lets the ASIO thread and the main thread both see it clear and post twice,
+		// or -- the damaging direction -- lets this thread see it set and skip while the main
+		// thread is about to clear it, leaving data buffered with nothing left to announce it.
+		//
+		// The exchange writes unconditionally, so even the skipping path releases everything
+		// written before it. EventProcessed acquires that same value, which stops the reader
+		// acting on a stale read state.
+		//
+		// Checked before the latch is taken, not after: with no wrapper there is nothing to
+		// deliver a notification, and taking the latch here would leave it set for the life of the
+		// socket and make every later post skip.
+		CLibSocket *wrapper = m_libSocket.load(std::memory_order_acquire);
+		if (!wrapper) {
+			AddDebugLogLineF(
+				logAsio, CFormat("Post read event %d %s - no wrapper") % from % m_IP);
+			return;
+		}
+
+		if (!m_eventPending.exchange(true, std::memory_order_acq_rel)) {
 			AddDebugLogLineF(logAsio, CFormat("Post read event %d %s") % from % m_IP);
-			m_eventPending = true;
-			CLibSocket * wrapper = m_libSocket.load(std::memory_order_acquire);
-			if (wrapper) {
-				CoreNotify_LibSocketReceive(wrapper, m_ErrorCode);
-			}
+			CoreNotify_LibSocketReceive(wrapper, m_ErrorCode);
 		}
 	}
 
 	void PostLostEvent()
 	{
-		CLibSocket * wrapper = m_libSocket.load(std::memory_order_acquire);
+		CLibSocket *wrapper = m_libSocket.load(std::memory_order_acquire);
 		if (wrapper && !m_destroying.load(std::memory_order_acquire) && !m_closed) {
 			CoreNotify_LibSocketLost(wrapper);
 		}
 	}
 
-	void SetError()
-	{
-		m_ErrorCode = 2;
-	}
+	void SetError() { m_ErrorCode = 2; }
 
-	bool SetError(const error_code & err)
+	bool SetError(const error_code &err)
 	{
 		m_ErrorCode = err.value();
 		return m_ErrorCode != errc::success;
 	}
 
-	//
 	// Synchronous sockets (amulecmd)
-	//
-	uint32 ReadSync(char * buf, uint32 bytesToRead)
+	uint32 ReadSync(char *buf, uint32 bytesToRead)
 	{
-		error_code ec;
-		uint32 received = read(*m_socket, buffer(buf, bytesToRead), ec);
-		SetError(ec);
-		if (ec) {
-			DispatchSyncLost();
+		if (m_syncReadTimeoutMs <= 0) {
+			// Timeout disabled -- legacy unbounded blocking read.
+			error_code ec;
+			uint32 received = read(*m_socket, buffer(buf, bytesToRead), ec);
+			SetError(ec);
+			if (ec) {
+				DispatchSyncLost();
+			}
+			return received;
+		}
+
+		// No-progress bounded read. Asio's synchronous read() falls back to an *unbounded*
+		// internal poll_read(-1) on EAGAIN, so SO_RCVTIMEO cannot bound it. Instead each read_some
+		// is gated behind a poll() carrying the remaining no-progress budget, which resets whenever
+		// bytes arrive: a slow-but-progressing large transfer never trips it, but a genuinely
+		// stalled or desynced peer does -- and is then reported as a lost peer, so the EC layer's
+		// reconnect path takes over instead of hanging forever holding the caller's EC mutex.
+		const auto fd = m_socket->native_handle();
+		uint32 received = 0;
+		while (received < bytesToRead) {
+			// Wait up to the remaining no-progress budget for readability. POSIX uses poll() --
+			// no FD_SETSIZE cap, and the EC socket can get a high fd after a reconnect under
+			// load; Windows uses select() because WSAPoll needs _WIN32_WINNT >= 0x0600 and this
+			// build targets 0x0501, and on Winsock fd_set is count-indexed so a single socket is
+			// always in range.
+			bool timed_out = false;
+			bool poll_failed = false;
+			int poll_errno = 0;
+#ifdef __WINDOWS__
+			fd_set rfds;
+			FD_ZERO(&rfds);
+			FD_SET(fd, &rfds);
+			struct timeval tv;
+			tv.tv_sec = m_syncReadTimeoutMs / 1000;
+			tv.tv_usec = (m_syncReadTimeoutMs % 1000) * 1000;
+			const int pr = ::select(0, &rfds, NULL, NULL, &tv);
+			timed_out = (pr == 0);
+			poll_failed = (pr == SOCKET_ERROR);
+			if (poll_failed) {
+				poll_errno = ::WSAGetLastError();
+			}
+#else
+			struct pollfd pfd;
+			pfd.fd = fd;
+			pfd.events = POLLIN;
+			pfd.revents = 0;
+			const int pr = ::poll(&pfd, 1, m_syncReadTimeoutMs);
+			timed_out = (pr == 0);
+			if (pr < 0) {
+				if (errno == EINTR) {
+					continue; // signal -- re-arm the budget
+				}
+				poll_failed = true;
+				poll_errno = errno;
+			}
+#endif
+			if (timed_out) {
+				// No data for the whole budget -- treat as a stalled peer so the EC layer
+				// reconnects or fails fast instead of hanging. This is fatal for the
+				// synchronous EC clients: the caller reports the peer lost and exits. Emitted
+				// unconditionally on stderr, NOT the debug-gated logAsio category, so it is
+				// visible in release builds right before the "External Connection lost -
+				// exiting." the EC layer prints next.
+				wxString msg =
+					CFormat(wxT("amule: synchronous socket read made no progress for %d "
+						    "ms (peer %s) - stalled or desynced peer; dropping the "
+						    "connection.")) %
+					m_syncReadTimeoutMs % m_IP;
+				fprintf(stderr, "%s\n", (const char *)unicode2char(msg));
+				fflush(stderr);
+				error_code ec = boost::asio::error::timed_out;
+				SetError(ec);
+				DispatchSyncLost();
+				return received;
+			}
+			if (poll_failed) {
+				error_code ec(poll_errno, system_category());
+				SetError(ec);
+				DispatchSyncLost();
+				return received;
+			}
+			// Readable: a blocking read_some now returns promptly (data or
+			// EOF), so it cannot re-introduce an unbounded wait.
+			error_code ec;
+			size_t n = m_socket->read_some(buffer(buf + received, bytesToRead - received), ec);
+			if (ec == boost::asio::error::would_block || ec == boost::asio::error::try_again) {
+				continue; // spurious readiness -- re-arm the budget
+			}
+			if (ec) {
+				SetError(ec);
+				DispatchSyncLost();
+				return received;
+			}
+			if (n == 0) {
+				// Orderly EOF from the peer.
+				error_code eof_ec = boost::asio::error::eof;
+				SetError(eof_ec);
+				DispatchSyncLost();
+				return received;
+			}
+			received += static_cast<uint32>(n); // progress -- budget re-arms
 		}
 		return received;
 	}
 
-	uint32 WriteSync(const void * buf, uint32 nbytes)
+	uint32 WriteSync(const void *buf, uint32 nbytes)
 	{
 		error_code ec;
 		uint32 sent = write(*m_socket, buffer(buf, nbytes), ec);
@@ -733,206 +1131,225 @@
 		return sent;
 	}
 
-	// Sync clients (amulecmd, amuleweb) don't have an async_read pending
-	// after auth, so the EOF that fires HandleRead → PostLostEvent for
-	// async clients never gets seen. Detection happens here instead, in
-	// ReadSync / WriteSync. PostLostEvent + wxQueueEvent would round-
-	// trip through the wx event loop — which amuleweb has (wxApp::OnRun)
-	// but amulecmd doesn't (its main thread is in fgets reading stdin,
-	// not in wxApp's event loop, so queued events are never processed).
-	// Direct synchronous dispatch through the same wrapper->OnLost(0)
-	// path the async reactor uses covers both: CECMuleSocket::OnLost(int)
-	// forwards to the EC-layer CECSocket::OnLost virtual, CRemoteConnect's
-	// override fires (NULL notifier → _exit fallback) and the headless
-	// EC client exits cleanly instead of serving stale data in limp mode.
+	// Sync clients (amulecmd, amuleweb) have no async_read pending after auth, so the EOF that
+	// fires HandleRead -> PostLostEvent for async clients is never seen. Detection happens here
+	// instead, in ReadSync / WriteSync. PostLostEvent + wxQueueEvent would round-trip through
+	// the wx event loop, which amuleweb has but amulecmd does not -- its main thread is in
+	// fgets reading stdin, so queued events are never processed. Direct synchronous dispatch
+	// through the same wrapper->OnLost(0) path the async reactor uses covers both, so the
+	// headless EC client exits cleanly rather than serving stale data in limp mode.
 	void DispatchSyncLost()
 	{
-		CLibSocket * wrapper = m_libSocket.load(std::memory_order_acquire);
+		CLibSocket *wrapper = m_libSocket.load(std::memory_order_acquire);
 		if (wrapper && !m_destroying.load(std::memory_order_acquire) && !m_closed) {
 			wrapper->OnLost(0);
 		}
 	}
 
-	//
-	// Access to even const & wxString is apparently not thread-safe.
-	// Locks are set/removed in wx and reference counts can go astray.
-	// So store our IP string in a wxString which is used nowhere.
-	// Store a pointer to its string buffer as well and use THAT everywhere.
-	//
-	void SetIp(const amuleIPV4Address& adr)
+	// Access to even a const & wxString is apparently not thread-safe: locks are set/removed in
+	// wx and reference counts can go astray. So the IP string is stored in a wxString used
+	// nowhere, and a pointer to its string buffer is what gets used everywhere.
+	void SetIp(const amuleIPV4Address &adr)
 	{
 		m_IPstring = adr.IPAddress();
 		m_IP = m_IPstring.c_str();
 		m_IPint = StringIPtoUint32(m_IPstring);
-	}
-
-	// Atomic so OnWrapperGone() (called from the wrapper's dtor on any
-	// thread) and the strand-side load in Destroy() can both touch it
-	// without an external lock.
-	std::atomic<CLibSocket *>	m_libSocket;
-	ip::tcp::socket	*	m_socket;
-										// remote IP
-	wxString		m_IPstring;			// as String (use nowhere because of threading!)
-	const wxChar *	m_IP;				// as char*  (use in debug logs)
-	uint32			m_IPint;			// as int
-	uint16			m_port;				// remote port
-	bool			m_OK;
-	int				m_ErrorCode;
-	bool			m_blocksRead;
-	char *			m_readBuffer;
-	uint32			m_readBufferSize;
-	char *			m_readBufferPtr;
-	bool			m_readPending;
-	uint32			m_readBufferContent;
-	bool			m_eventPending;
-	std::atomic<char*>	m_sendBuffer;	// atomic: shared between throttler thread (Write) and ASIO thread (HandleSend)
-	std::atomic<bool>	m_blocksWrite;	// atomic: shared between throttler thread (BlocksWrite) and ASIO thread (HandleSend)
-	io_context::strand	m_strand;		// handle synchronisation in io_service thread pool
-	bool			m_connected;
-	bool			m_closed;
-	std::atomic<bool>	m_destroying;	// set once Destroy() has been called
-	bool			m_proxyState;
-	bool			m_notify;			// set by Notify()
-	bool			m_sync;				// copied from !m_notify on Connect()
+		m_peerAddress = CNetworkAddress::Absent();
+	}
+
+	// Atomic so OnWrapperGone() (called from the wrapper's dtor on any thread) and the
+	// strand-side load in Destroy() can both touch it without an external lock.
+	std::atomic<CLibSocket *> m_libSocket;
+	ip::tcp::socket *m_socket;
+	// remote IP
+	wxString m_IPstring;           // as String (use nowhere because of threading!)
+	const wxChar *m_IP;            // as char*  (use in debug logs)
+	uint32 m_IPint;                // as int
+	CNetworkAddress m_peerAddress; // Native accepted TCP peer; absent before UpdateIP.
+	uint16 m_port;                 // remote port
+	bool m_OK;
+	int m_ErrorCode;
+	bool m_blocksRead;
+	char *m_readBuffer;
+	uint32 m_readBufferSize;
+	char *m_readBufferPtr;
+	// atomic: cleared on the ASIO thread (HandleRead) and read on the main thread (Read), and
+	// it is the flag that orders the whole read handoff -- see HandleRead for why plain stores
+	// were not enough.
+	std::atomic<bool> m_readPending;
+	uint32 m_readBufferContent;
+	// atomic: posted from the ASIO thread and cleared on the main thread, and
+	// it is the latch that decides whether a completed read gets announced
+	std::atomic<bool> m_eventPending;
+	std::atomic<char *>
+		m_sendBuffer; // atomic: shared between throttler thread (Write) and ASIO thread (HandleSend)
+	std::atomic<bool> m_blocksWrite; // atomic: shared between throttler thread (BlocksWrite) and ASIO
+					 // thread (HandleSend)
+	io_context::strand m_strand;     // handle synchronisation in io_service thread pool
+	bool m_connected;
+	bool m_closed;
+	std::atomic<bool> m_destroying; // set once Destroy() has been called
+	bool m_proxyState;
+	bool m_notify;           // set by Notify()
+	bool m_sync;             // copied from !m_notify on Connect()
+	int m_connectTimeoutMs;  // 0 = no bound; honoured on the sync connect path
+	int m_syncReadTimeoutMs; // no-progress bound for ReadSync (0 = unbounded)
 };
 
-
-/**
- * Library socket wrapper
- */
+/** Library socket wrapper */
 
 CLibSocket::CLibSocket(int /* flags */)
 {
-	// make_shared so the impl can later use shared_from_this() inside async
-	// callbacks. The TCP impl's ctor does not start any async ops, so no
-	// post-construction Init() call is needed; async work starts in Connect().
+	// make_shared so the impl can later use shared_from_this() inside async callbacks. The TCP
+	// impl's ctor does not start any async ops, so no post-construction Init() call is needed;
+	// async work starts in Connect().
 	m_aSocket = std::make_shared<CAsioSocketImpl>(this);
 }
 
-
 CLibSocket::~CLibSocket()
 {
-	AddDebugLogLineF(logAsio, CFormat("~CLibSocket() %p %p %s") % this % m_aSocket.get() % m_aSocket->GetIP());
-	// Detach the back-pointer first so any callbacks that fire after the
-	// wrapper is gone don't dereference us. The impl itself stays alive as
-	// long as any callback still holds a shared_from_this() ref; once the
-	// last drops, the impl destructs cleanly and frees the asio socket.
+	AddDebugLogLineF(
+		logAsio, CFormat("~CLibSocket() %p %p %s") % this % m_aSocket.get() % m_aSocket->GetIP());
+	// Detach the back-pointer first so any callbacks that fire after the wrapper is gone do not
+	// dereference us. The impl itself stays alive as long as any callback still holds a
+	// shared_from_this() ref; once the last drops, the impl destructs cleanly and frees the
+	// asio socket.
 	if (m_aSocket) {
 		m_aSocket->OnWrapperGone();
 	}
 }
 
-
-bool CLibSocket::Connect(const amuleIPV4Address& adr, bool wait)
+bool CLibSocket::Connect(const amuleIPV4Address &adr, bool wait)
 {
+	if (m_transport) {
+		// An accepted stream has a peer; dialling would open a second one.
+		return false;
+	}
 	return m_aSocket->Connect(adr, wait);
 }
 
-
 bool CLibSocket::IsConnected() const
 {
-	return m_aSocket->IsConnected();
+	return m_transport ? m_transport->IsConnected() : m_aSocket->IsConnected();
 }
 
-
 bool CLibSocket::IsOk() const
 {
-	return m_aSocket->IsOk();
+	return m_transport ? m_transport->IsOk() : m_aSocket->IsOk();
 }
 
-
 void CLibSocket::EnableTcpKeepalive(int idleSec, int probeIntervalSec, int probeCount)
 {
 	m_aSocket->EnableTcpKeepalive(idleSec, probeIntervalSec, probeCount);
 }
 
+void CLibSocket::EnableTcpNoDelay()
+{
+	m_aSocket->EnableTcpNoDelay();
+}
+
+void CLibSocket::SetConnectTimeout(int ms)
+{
+	m_aSocket->SetConnectTimeout(ms);
+}
 
 wxString CLibSocket::GetPeer()
 {
-	return m_aSocket->GetPeer();
+	return m_transport ? wxString(m_transport->GetPeerAddress().ToString()) : m_aSocket->GetPeer();
 }
 
+CNetworkAddress CLibSocket::GetPeerAddress()
+{
+	return m_transport ? m_transport->GetPeerAddress() : m_aSocket->GetPeerAddress();
+}
 
 uint32 CLibSocket::GetPeerInt()
 {
-	return m_aSocket->GetPeerInt();
+	// Narrowed only here: this accessor's type is the ed2k wire form.
+	return m_transport ? m_transport->GetPeerAddress().ToIPv4NetworkOrderOrZero()
+			   : m_aSocket->GetPeerInt();
 }
 
-
 void CLibSocket::Destroy()
 {
+	// First: closing can produce callbacks, which must not land on a
+	// half-destroyed wrapper.
+	if (m_transport) {
+		m_transport->Close();
+	}
 	m_aSocket->Destroy();
 }
 
+void CLibSocket::ResetForReconnect()
+{
+	// LinkSocketImpl() detaches the outgoing impl (OnWrapperGone, so any in-flight asio
+	// callback that still holds a shared_from_this() ref no-ops its notify branch) before
+	// swapping the fresh one in. The old impl then tears its socket down once the last pending
+	// handler drops.
+	LinkSocketImpl(std::make_shared<CAsioSocketImpl>(this));
+}
 
 bool CLibSocket::IsDestroying() const
 {
 	return m_aSocket->IsDestroying();
 }
 
-
 void CLibSocket::Notify(bool notify)
 {
 	m_aSocket->Notify(notify);
 }
 
-
-uint32 CLibSocket::Read(void * buffer, uint32 nbytes)
+uint32 CLibSocket::Read(void *buffer, uint32 nbytes)
 {
-	return m_aSocket->Read((char *) buffer, nbytes);
+	return m_transport ? m_transport->Read(buffer, nbytes) : m_aSocket->Read((char *)buffer, nbytes);
 }
 
-
-uint32 CLibSocket::Write(const void * buffer, uint32 nbytes)
+uint32 CLibSocket::Write(const void *buffer, uint32 nbytes)
 {
-	return m_aSocket->Write(buffer, nbytes);
+	return m_transport ? m_transport->Write(buffer, nbytes) : m_aSocket->Write(buffer, nbytes);
 }
 
-
 void CLibSocket::Close()
 {
+	if (m_transport) {
+		m_transport->Close();
+		return;
+	}
 	m_aSocket->Close();
 }
 
-
 int CLibSocket::LastError() const
 {
-	return m_aSocket->LastError();
+	return m_transport ? m_transport->LastError() : m_aSocket->LastError();
 }
 
-
-void CLibSocket::SetLocal(const amuleIPV4Address& local)
+void CLibSocket::SetLocal(const amuleIPV4Address &local)
 {
 	m_aSocket->SetLocal(local);
 }
 
-
-
 // new Stuff
 
 bool CLibSocket::BlocksRead() const
 {
-	return m_aSocket->BlocksRead();
+	return m_transport ? m_transport->BlocksRead() : m_aSocket->BlocksRead();
 }
 
-
 bool CLibSocket::BlocksWrite() const
 {
-	return m_aSocket->BlocksWrite();
+	return m_transport ? m_transport->BlocksWrite() : m_aSocket->BlocksWrite();
 }
 
-
 void CLibSocket::EventProcessed()
 {
 	m_aSocket->EventProcessed();
 }
 
-
 void CLibSocket::LinkSocketImpl(std::shared_ptr<class CAsioSocketImpl> socket)
 {
-	// Detach the back-pointer on the outgoing impl before swapping it out;
-	// any in-flight callback that still holds a shared_from_this() ref on
-	// it will then no-op its notify branch instead of touching us.
+	// Detach the back-pointer on the outgoing impl before swapping it out; any in-flight
+	// callback that still holds a shared_from_this() ref on it will then no-op its notify
+	// branch instead of touching us.
 	if (m_aSocket) {
 		m_aSocket->OnWrapperGone();
 	}
@@ -940,83 +1357,137 @@
 	m_aSocket->SetWrapSocket(this);
 }
 
+const wxChar *CLibSocket::GetIP() const
+{
+	// Taken at attach, not built here: this hands back a borrowed pointer, and
+	// building it on demand would mutate a member from a const accessor that
+	// the upload thread is free to call.
+	return m_transport ? m_peerText.c_str() : m_aSocket->GetIP();
+}
+
+void CLibSocket::AttachTransport(std::unique_ptr<IStreamTransport> transport)
+{
+	transport->SetEvents(this);
+	m_transport = std::move(transport);
+	// Fixed for the transport's lifetime, so GetIP() can hand out a pointer
+	// into it without building anything.
+	m_peerText = wxString(m_transport->GetPeerAddress().ToString());
+}
 
-const wxChar * CLibSocket::GetIP() const
+// Queued rather than called: CoreNotify_* marshals to the main thread, which
+// is what makes a flush request raised on the upload thread safe to answer.
+void CLibSocket::OnStreamConnected()
 {
-	return m_aSocket->GetIP();
+	CoreNotify_LibSocketConnect(this, 0);
 }
 
+void CLibSocket::OnStreamReadable()
+{
+	CoreNotify_LibSocketReceive(this, 0);
+}
+
+void CLibSocket::OnStreamWritable()
+{
+	CoreNotify_LibSocketSend(this, 0);
+}
+
+void CLibSocket::OnStreamLost()
+{
+	CoreNotify_LibSocketLost(this);
+}
+
+void CLibSocket::OnFlushRequested()
+{
+	// Not LibSocketSend: that reaches CEMSocket::OnSend, which reports a
+	// completed write and never offers the queue, so the peer is never
+	// answered.
+	CoreNotify_LibSocketFlush(this);
+}
+
+void CLibSocket::FlushTransport()
+{
+	if (m_transport) {
+		m_transport->Flush();
+	}
+}
 
 bool CLibSocket::GetProxyState() const
 {
 	return m_aSocket->GetProxyState();
 }
 
-
-void CLibSocket::SetProxyState(bool state, const amuleIPV4Address * adr)
+void CLibSocket::SetProxyState(bool state, const amuleIPV4Address *adr)
 {
 	m_aSocket->SetProxyState(state, adr);
 }
 
+/** ASIO TCP socket server */
 
-/**
- * ASIO TCP socket server
- */
-
-// See the parallel comment on CAsioUDPSocketImpl. Same lifetime fix applied
-// here so a pending async_accept completion can't fire on a freed acceptor
-// impl after the wrapper has been deleted.
+// See the parallel comment on CAsioUDPSocketImpl. Same lifetime fix applied here so a
+// pending async_accept completion cannot fire on a freed acceptor impl after the wrapper
+// has been deleted.
 class CAsioSocketServerImpl : public ip::tcp::acceptor,
-	public std::enable_shared_from_this<CAsioSocketServerImpl>
+			      public std::enable_shared_from_this<CAsioSocketServerImpl>
 {
 public:
-	CAsioSocketServerImpl(const amuleIPV4Address & adr, CLibSocketServer * libSocketServer)
-		: ip::tcp::acceptor(s_io_service),
-		  m_libSocketServer(libSocketServer),
-		  m_strand(s_io_service),
-		  m_address(adr)
+	CAsioSocketServerImpl(const amuleIPV4Address &adr,
+		CLibSocketServer *libSocketServer,
+		bool bindInterfaceOverride = false,
+		const wxString &bindInterface = wxEmptyString)
+	: ip::tcp::acceptor(s_io_service)
+	, m_libSocketServer(libSocketServer)
+	, m_strand(s_io_service)
+	, m_address(adr)
+	, m_bindInterfaceOverride(bindInterfaceOverride)
+	, m_bindInterface(bindInterface)
 	{
 		m_ok = false;
 		m_socketAvailable = false;
 	}
 
-	~CAsioSocketServerImpl()
-	{
-	}
+	~CAsioSocketServerImpl() {}
 
-	// Init() runs the bind/listen/StartAccept sequence after the managing
-	// shared_ptr is in place — StartAccept captures shared_from_this(), and
-	// that's only valid post-construction.
+	// Init() runs the bind/listen/StartAccept sequence after the managing shared_ptr is in
+	// place -- StartAccept captures shared_from_this(), which is only valid
+	// post-construction.
 	void Init()
 	{
 		try {
 			open(m_address.GetEndpoint().protocol());
 			SetCloexecOnSocket(native_handle());
+			// When an explicit per-server interface is set (EC listener), use it verbatim --
+			// empty means "any", NOT a fall-back to the global P2P pin. Otherwise inherit the
+			// global bind-to-interface setting.
+			SetBoundInterface(native_handle(),
+				m_bindInterfaceOverride ? m_bindInterface : s_bindToInterface,
+				false);
 			set_option(ip::tcp::acceptor::reuse_address(true));
 			bind(m_address.GetEndpoint());
 			listen();
 			StartAccept();
 			m_ok = true;
-			AddDebugLogLineN(logAsio, CFormat("CAsioSocketServerImpl bind to %s %d") % m_address.IPAddress() % m_address.Service());
-		} catch (const system_error& err) {
-			AddDebugLogLineC(logAsio, CFormat("CAsioSocketServerImpl bind to %s %d failed - %s") % m_address.IPAddress() % m_address.Service() % err.code().message());
+			AddDebugLogLineN(logAsio,
+				CFormat("CAsioSocketServerImpl bind to %s %d") % m_address.IPAddress() %
+					m_address.Service());
+		} catch (const system_error &err) {
+			AddDebugLogLineC(logAsio,
+				CFormat("CAsioSocketServerImpl bind to %s %d failed - %s") %
+					m_address.IPAddress() % m_address.Service() % err.code().message());
 		}
 	}
 
-	// Detach the back-pointer to the wrapper so any in-flight async_accept
-	// completion that fires after the wrapper has been deleted no-ops its
-	// CoreNotify_ServerTCPAccept branch instead of dereferencing freed memory.
-	void OnWrapperGone()
-	{
-		m_libSocketServer.store(nullptr, std::memory_order_release);
-	}
+	// Detach the back-pointer to the wrapper so any in-flight async_accept completion that
+	// fires after the wrapper has been deleted no-ops its CoreNotify_ServerTCPAccept branch
+	// instead of dereferencing freed memory.
+	void OnWrapperGone() { m_libSocketServer.store(nullptr, std::memory_order_release); }
 
-	// For wxSocketServer, Ok will return true if the server could bind to the specified address and is already listening for new connections.
+	// For wxSocketServer, Ok will return true if the server could bind to the specified address and is
+	// already listening for new connections.
 	bool IsOk() const { return m_ok; }
 
-	void Close() { close();	}
+	void Close() { close(); }
 
-	bool AcceptWith(CLibSocket & socket)
+	bool AcceptWith(CLibSocket &socket)
 	{
 		if (!m_socketAvailable) {
 			AddDebugLogLineF(logAsio, "AcceptWith: nothing there");
@@ -1044,11 +1515,11 @@
 			AddDebugLogLineF(logAsio, "AcceptWith: ok, getting another socket in background");
 		} else {
 			// we got another socket right away
-			m_socketAvailable = true;	// it is already true, but this improves readability
+			m_socketAvailable = true; // it is already true, but this improves readability
 			AddDebugLogLineF(logAsio, "AcceptWith: ok, another socket is available");
 			// aMule actually doesn't need a notification as it polls the listen socket.
 			// amuleweb does need it though
-			CLibSocketServer * w = m_libSocketServer.load(std::memory_order_acquire);
+			CLibSocketServer *w = m_libSocketServer.load(std::memory_order_acquire);
 			if (w) {
 				CoreNotify_ServerTCPAccept(w);
 			}
@@ -1060,25 +1531,25 @@
 	bool SocketAvailable() const { return m_socketAvailable; }
 
 private:
-
 	void StartAccept()
 	{
 		m_currentSocket = std::make_shared<CAsioSocketImpl>(nullptr);
 		auto self = shared_from_this();
 		async_accept(m_currentSocket->GetAsioSocket(),
-			bind_executor(m_strand, self(const error_code& ec) { self->HandleAccept(ec); }));
+			bind_executor(m_strand, self(const error_code &ec) { self->HandleAccept(ec); }));
 	}
 
-	void HandleAccept(const error_code& error)
+	void HandleAccept(const error_code &error)
 	{
 		if (error) {
 			AddDebugLogLineC(logAsio, CFormat("Error in HandleAccept: %s") % error.message());
 		} else {
 			if (m_currentSocket->UpdateIP()) {
-				AddDebugLogLineN(logAsio, CFormat("HandleAccept received a connection from %s:%d")
-					% m_currentSocket->GetIP() % m_currentSocket->GetPort());
+				AddDebugLogLineN(logAsio,
+					CFormat("HandleAccept received a connection from %s:%d") %
+						m_currentSocket->GetIP() % m_currentSocket->GetPort());
 				m_socketAvailable = true;
-				CLibSocketServer * w = m_libSocketServer.load(std::memory_order_acquire);
+				CLibSocketServer *w = m_libSocketServer.load(std::memory_order_acquire);
 				if (w) {
 					CoreNotify_ServerTCPAccept(w);
 				}
@@ -1101,23 +1572,34 @@
 	std::shared_ptr<CAsioSocketImpl> m_currentSocket;
 	// Is there a socket available?
 	bool m_socketAvailable;
-	io_context::strand	m_strand;		// handle synchronisation in io_service thread pool
-	// Bind address. Stored so Init() can run after construction (the
-	// shared-from-this contract needs make_shared to complete before any
-	// async ops start).
+	io_context::strand m_strand; // handle synchronisation in io_service thread pool
+	// Bind address. Stored so Init() can run after construction (the shared-from-this contract
+	// needs make_shared to complete before any async ops start).
 	amuleIPV4Address m_address;
+	// Per-server egress interface override. When m_bindInterfaceOverride is true,
+	// m_bindInterface is used verbatim (empty = any) instead of the process-global
+	// s_bindToInterface. Lets the EC listener bind to a different interface than ed2k/Kad.
+	bool m_bindInterfaceOverride;
+	wxString m_bindInterface;
 };
 
-
-CLibSocketServer::CLibSocketServer(const amuleIPV4Address& adr, int /* flags */)
+CLibSocketServer::CLibSocketServer(const amuleIPV4Address &adr, int /* flags */)
 {
-	// make_shared so the impl can use shared_from_this() inside its
-	// async_accept callbacks. Init() runs the bind/listen/StartAccept
-	// sequence after the managing shared_ptr is in place.
+	// make_shared so the impl can use shared_from_this() inside its async_accept callbacks.
+	// Init() runs the bind/listen/StartAccept sequence after the managing shared_ptr is in
+	// place.
 	m_aServer = std::make_shared<CAsioSocketServerImpl>(adr, this);
 	m_aServer->Init();
 }
 
+CLibSocketServer::CLibSocketServer(
+	const amuleIPV4Address &adr, int /* flags */, const wxString &bindInterface)
+{
+	// As above, but with an explicit per-server egress interface (empty = any)
+	// that overrides the process-global bind-to-interface pin.
+	m_aServer = std::make_shared<CAsioSocketServerImpl>(adr, this, true, bindInterface);
+	m_aServer->Init();
+}
 
 CLibSocketServer::~CLibSocketServer()
 {
@@ -1128,96 +1610,95 @@
 	// until the last in-flight async_accept completion drains.
 }
 
-
-// Accepts an incoming connection request, and creates a new CLibSocket object which represents the server-side of the connection.
-// Only used in CamuleApp::ListenSocketHandler() and we don't get there.
-CLibSocket * CLibSocketServer::Accept(bool /* wait */)
+// Accepts an incoming connection request, and creates a new CLibSocket object which represents the
+// server-side of the connection. Only used in CamuleApp::ListenSocketHandler() and we don't get there.
+CLibSocket *CLibSocketServer::Accept(bool /* wait */)
 {
 	wxFAIL;
 	return NULL;
 }
 
-
 // Accept an incoming connection using the specified socket object.
-bool CLibSocketServer::AcceptWith(CLibSocket & socket, bool WXUNUSED_UNLESS_DEBUG(wait) )
+bool CLibSocketServer::AcceptWith(CLibSocket &socket, bool WXUNUSED_UNLESS_DEBUG(wait))
 {
 	wxASSERT(!wait);
 	return m_aServer->AcceptWith(socket);
 }
 
-
 bool CLibSocketServer::IsOk() const
 {
 	return m_aServer->IsOk();
 }
 
-
 void CLibSocketServer::Close()
 {
 	m_aServer->Close();
 }
 
-
 bool CLibSocketServer::SocketAvailable()
 {
 	return m_aServer->SocketAvailable();
 }
 
+/** ASIO UDP socket implementation */
 
-/**
- * ASIO UDP socket implementation
- */
-
-// Wake-from-sleep crash (issue #384) was caused by asio completion handlers
-// firing on a freed CAsioUDPSocketImpl: pending async_receive_from ops survive
-// a long suspend, complete on wake, and re-enter HandleRead → StartBackgroundRead
-// after the impl has been destroyed by the post-resume socket-recreation path.
-// The old 1-second-timer guard in Destroy() did not survive the time jump.
+// A wake-from-sleep crash was caused by asio completion handlers firing on a freed
+// CAsioUDPSocketImpl: pending async_receive_from ops survive a long suspend, complete on
+// wake, and re-enter HandleRead -> StartBackgroundRead after the impl has been destroyed by
+// the post-resume socket-recreation path. The old 1-second-timer guard in Destroy() did not
+// survive the time jump.
 //
-// Fix: enable_shared_from_this. Each async callback captures
-// self = shared_from_this(), keeping the impl alive until the last in-flight
-// callback drops its ref. The wrapper's raw back-pointer m_libSocket is atomic
-// and nulled on the strand during Destroy(), so callbacks that fire after the
-// wrapper has been notified-destroyed silently no-op instead of dereferencing
-// freed memory.
+// Fix: enable_shared_from_this. Each async callback captures self = shared_from_this(),
+// keeping the impl alive until the last in-flight callback drops its ref. The wrapper's raw
+// back-pointer m_libSocket is atomic and nulled on the strand during Destroy(), so
+// callbacks that fire after the wrapper has been notified-destroyed silently no-op.
 class CAsioUDPSocketImpl : public std::enable_shared_from_this<CAsioUDPSocketImpl>
 {
 private:
 	// UDP data block
-	class CUDPData {
+	class CUDPData
+	{
 	public:
-		char * buffer;
+		char *buffer;
 		uint32 size;
 		amuleIPV4Address ipadr;
+		CNetworkAddress sourceAddress;
+		uint16 sourcePort = 0;
 
-		CUDPData(const void * src, uint32 _size, amuleIPV4Address adr) :
-			size(_size), ipadr(adr)
+		CUDPData(const void *src, uint32 _size, amuleIPV4Address adr)
+		: size(_size)
+		, ipadr(adr)
 		{
 			buffer = new charsize;
 			memcpy(buffer, src, size);
 		}
 
-		~CUDPData()
+		CUDPData(const void *src, uint32 _size, CNetworkAddress address, uint16 port)
+		: size(_size)
+		, sourceAddress(std::move(address))
+		, sourcePort(port)
 		{
-			delete buffer;
+			buffer = new charsize;
+			memcpy(buffer, src, size);
 		}
+
+		~CUDPData() { delete buffer; }
 	};
 
 public:
-	CAsioUDPSocketImpl(const amuleIPV4Address &address, int /* flags */, CLibUDPSocket * libSocket) :
-		m_libSocket(libSocket),
-		m_strand(s_io_service),
-		m_address(address)
+	CAsioUDPSocketImpl(const amuleIPV4Address &address, int /* flags */, CLibUDPSocket *libSocket)
+	: m_libSocket(libSocket)
+	, m_strand(s_io_service)
+	, m_address(address)
 	{
 		m_muleSocket = NULL;
 		m_socket = NULL;
 		m_readBuffer = new charCMuleUDPSocket::UDP_BUFFER_SIZE;
 		m_OK = true;
 		m_destroying.store(false, std::memory_order_relaxed);
-		// CreateSocket() must run after construction completes — it calls
-		// StartBackgroundRead() which captures shared_from_this(), and that
-		// requires a managing shared_ptr to already exist. The wrapper calls
-		// Init() right after make_shared.
+		// CreateSocket() must run after construction completes -- it calls StartBackgroundRead()
+		// which captures shared_from_this(), and that requires a managing shared_ptr to already
+		// exist. The wrapper calls Init() right after make_shared.
 	}
 
 	~CAsioUDPSocketImpl()
@@ -1230,36 +1711,29 @@
 
 	// Called by the wrapper after make_shared so StartBackgroundRead() can
 	// safely call shared_from_this().
-	void Init()
-	{
-		CreateSocket();
-	}
+	void Init() { CreateSocket(); }
 
-	// Called by the wrapper's destructor (or by the destroy chain) to detach
-	// the back-pointer so any still-in-flight callbacks no-op the notify path
-	// instead of touching the freed wrapper. Atomic so it's safe to call from
-	// any thread without an external lock.
-	void OnWrapperGone()
-	{
-		m_libSocket.store(nullptr, std::memory_order_release);
-	}
+	// Called by the wrapper's destructor (or by the destroy chain) to detach the back-pointer
+	// so any still-in-flight callbacks no-op the notify path instead of touching the freed
+	// wrapper. Atomic so it is safe to call from any thread without an external lock.
+	void OnWrapperGone() { m_libSocket.store(nullptr, std::memory_order_release); }
 
-	void SetClientData(CMuleUDPSocket * muleSocket)
+	void SetClientData(CMuleUDPSocket *muleSocket)
 	{
 		AddDebugLogLineF(logAsio, "UDP SetClientData");
 		m_muleSocket = muleSocket;
 	}
 
-	uint32 RecvFrom(amuleIPV4Address& addr, void* buf, uint32 nBytes)
+	uint32 RecvFrom(CNetworkAddress &addr, uint16 &port, void *buf, uint32 nBytes)
 	{
-		CUDPData * recdata;
+		CUDPData *recdata;
 		{
 			wxMutexLocker lock(m_receiveBuffersLock);
 			if (m_receiveBuffers.empty()) {
 				AddDebugLogLineN(logAsio, "UDP RecvFromError no data");
 				return 0;
 			}
-			recdata = * m_receiveBuffers.begin();
+			recdata = *m_receiveBuffers.begin();
 			m_receiveBuffers.pop_front();
 		}
 		uint32 read = recdata->size;
@@ -1269,25 +1743,23 @@
 			read = nBytes;
 		}
 		memcpy(buf, recdata->buffer, read);
-		addr = recdata->ipadr;
+		addr = recdata->sourceAddress;
+		port = recdata->sourcePort;
 		delete recdata;
 		return read;
 	}
 
-	uint32 SendTo(const amuleIPV4Address& addr, const void* buf, uint32 nBytes)
+	uint32 SendTo(const amuleIPV4Address &addr, const void *buf, uint32 nBytes)
 	{
 		// Collect data, make a copy of the buffer's content
-		CUDPData * recdata = new CUDPData(buf, nBytes, addr);
+		CUDPData *recdata = new CUDPData(buf, nBytes, addr);
 		AddDebugLogLineF(logAsio, CFormat("UDP SendTo %d to %s") % nBytes % addr.IPAddress());
 		auto self = shared_from_this();
 		dispatch(m_strand, self, recdata() { self->DispatchSendTo(recdata); });
 		return nBytes;
 	}
 
-	bool IsOk() const
-	{
-		return m_OK;
-	}
+	bool IsOk() const { return m_OK; }
 
 	void Close()
 	{
@@ -1299,41 +1771,35 @@
 		}
 	}
 
-	// Destroy() schedules a single strand task that closes the socket, nulls
-	// the back-pointer, and deletes the wrapper. The impl itself stays alive
-	// as long as any in-flight async callback holds a shared_from_this() ref
-	// — it dies cleanly when the last drains, with no risk of a pending
-	// completion firing on freed memory.
+	// Destroy() schedules a single strand task that closes the socket, nulls the back-pointer,
+	// and deletes the wrapper. The impl itself stays alive as long as any in-flight async
+	// callback holds a shared_from_this() ref, and dies cleanly when the last drains.
 	//
-	// Note: unlike the TCP path which posts CoreNotify_LibSocketDestroy to
-	// route the wrapper delete through the GUI thread, UDP deletes the
-	// wrapper directly. By contract the caller (CMuleUDPSocket) has already
-	// nulled its pointer before calling Destroy(), so nothing else is
-	// expected to reach the wrapper.
+	// Unlike the TCP path, which posts CoreNotify_LibSocketDestroy to route the wrapper delete
+	// through the GUI thread, UDP deletes the wrapper directly: by contract the caller has
+	// already nulled its pointer before calling Destroy(), so nothing else is expected to reach
+	// the wrapper.
 	void Destroy()
 	{
 		if (m_destroying.exchange(true, std::memory_order_acq_rel)) {
 			// Already destroying; no-op so callers can be sloppy about it.
 			return;
 		}
-		CLibUDPSocket * wrapper = m_libSocket.load(std::memory_order_acquire);
+		CLibUDPSocket *wrapper = m_libSocket.load(std::memory_order_acquire);
 		AddDebugLogLineF(logAsio, CFormat("Destroy() %p %p") % wrapper % this);
 
 		auto self = shared_from_this();
 		auto teardown = self() {
-			// Null the back-pointer before deleting the wrapper so any
-			// callback that fires after this point sees null and skips
-			// its notify branch.
-			CLibUDPSocket * w = self->m_libSocket.exchange(nullptr,
-				std::memory_order_acq_rel);
+			// Null the back-pointer before deleting the wrapper so any callback that fires after
+			// this point sees null and skips its notify branch.
+			CLibUDPSocket *w = self->m_libSocket.exchange(nullptr, std::memory_order_acq_rel);
 			if (self->m_socket) {
 				error_code ec;
 				self->m_socket->close(ec);
 			}
 			if (w) {
-				// Wrapper dtor drops its shared_ptr<impl>; we still hold
-				// 'self' here so the impl stays alive until all queued
-				// callbacks drain.
+				// Wrapper dtor drops its shared_ptr<impl>; we still hold 'self' here so
+				// the impl stays alive until all queued callbacks drain.
 				delete w;
 			}
 		};
@@ -1347,23 +1813,15 @@
 		}
 	}
 
-
 private:
-	//
-	// Dispatch handlers
-	// Access to m_socket is all bundled in the thread running s_io_service to avoid
-	// concurrent access to the socket from several threads.
-	// So once things are running (after connect), all access goes through one of these handlers.
-	//
+	// Dispatch handlers. Access to m_socket is all bundled in the thread running
+	// s_io_service to avoid concurrent access from several threads.
 	void DispatchClose()
 	{
-		// CreateSocket() leaves m_socket NULL on bind failure (e.g. EADDRINUSE
-		// during the post-resume recovery path, where the old socket's close
-		// hasn't yet been processed on the strand before the new bind runs).
-		// Without this guard the subsequent CMuleUDPSocket::DestroySocket()
-		// → Close() → DispatchClose chain dereferences the NULL m_socket
-		// and SIGSEGVs — exposed by #384 once the shared_from_this fix lets
-		// amuled survive the first wake-from-sleep.
+		// CreateSocket() leaves m_socket NULL on bind failure -- EADDRINUSE during the post-resume
+		// recovery path, where the old socket's close has not yet been processed on the strand
+		// before the new bind runs. Without this guard the subsequent DestroySocket() -> Close()
+		// -> DispatchClose chain dereferences the NULL m_socket and SIGSEGVs.
 		if (!m_socket) {
 			AddDebugLogLineF(logAsio, "UDP Close: socket already null (CreateSocket failed)");
 			return;
@@ -1377,22 +1835,24 @@
 		}
 	}
 
-	void DispatchSendTo(CUDPData * recdata)
+	void DispatchSendTo(CUDPData *recdata)
 	{
 		ip::udp::endpoint endpoint(recdata->ipadr.GetEndpoint().address(), recdata->ipadr.Service());
 
-		AddDebugLogLineF(logAsio, CFormat("UDP DispatchSendTo %d to %s:%d") % recdata->size
-			% endpoint.address().to_string() % endpoint.port());
+		AddDebugLogLineF(logAsio,
+			CFormat("UDP DispatchSendTo %d to %s:%d") % recdata->size %
+				endpoint.address().to_string() % endpoint.port());
 		auto self = shared_from_this();
-		m_socket->async_send_to(buffer(recdata->buffer, recdata->size), endpoint,
-			bind_executor(m_strand, self, recdata(const error_code& ec, std::size_t sent) { self->HandleSendTo(ec, sent, recdata); }));
+		m_socket->async_send_to(buffer(recdata->buffer, recdata->size),
+			endpoint,
+			bind_executor(m_strand, self, recdata(const error_code &ec, std::size_t sent) {
+				self->HandleSendTo(ec, sent, recdata);
+			}));
 	}
 
-	//
 	// Completion handlers for async requests
-	//
 
-	void HandleRead(const error_code & ec, size_t received)
+	void HandleRead(const error_code &ec, size_t received)
 	{
 		if (ec) {
 			AddDebugLogLineN(logAsio, CFormat("UDP HandleReadError %s") % ec.message());
@@ -1402,11 +1862,15 @@
 			AddDebugLogLineN(logAsio, "UDP HandleReadError no handler");
 		} else {
 
-			amuleIPV4Address ipadr = amuleIPV4Address(CamuleIPV4Endpoint(m_receiveEndpoint));
-			AddDebugLogLineF(logAsio, CFormat("UDP HandleRead %d %s:%d") % received % ipadr.IPAddress() % ipadr.Service());
+			const CNetworkAddress sourceAddress =
+				NetworkAddressAsio::FromIngressAddress(m_receiveEndpoint.address());
+			AddDebugLogLineF(logAsio,
+				CFormat("UDP HandleRead %d %s:%d") % received % sourceAddress.ToString() %
+					m_receiveEndpoint.port());
 
 			// create our read buffer
-			CUDPData * recdata = new CUDPData(m_readBuffer, received, ipadr);
+			CUDPData *recdata =
+				new CUDPData(m_readBuffer, received, sourceAddress, m_receiveEndpoint.port());
 			{
 				wxMutexLocker lock(m_receiveBuffersLock);
 				m_receiveBuffers.push_back(recdata);
@@ -1416,50 +1880,53 @@
 		StartBackgroundRead();
 	}
 
-	void HandleSendTo(const error_code & ec, size_t sent, CUDPData * recdata)
+	void HandleSendTo(const error_code &ec, size_t sent, CUDPData *recdata)
 	{
 		if (ec) {
 			AddDebugLogLineN(logAsio, CFormat("UDP HandleSendToError %s") % ec.message());
 		} else if (sent != recdata->size) {
-			AddDebugLogLineN(logAsio, CFormat("UDP HandleSendToError tosend: %d sent %d") % recdata->size % sent);
+			AddDebugLogLineN(logAsio,
+				CFormat("UDP HandleSendToError tosend: %d sent %d") % recdata->size % sent);
 		}
 		if (m_muleSocket == NULL) {
 			AddDebugLogLineN(logAsio, "UDP HandleSendToError no handler");
 		} else {
-			AddDebugLogLineF(logAsio, CFormat("UDP HandleSendTo %d to %s") % sent % recdata->ipadr.IPAddress());
+			AddDebugLogLineF(logAsio,
+				CFormat("UDP HandleSendTo %d to %s") % sent % recdata->ipadr.IPAddress());
 			CoreNotify_UDPSocketSend(m_muleSocket);
 		}
 		delete recdata;
 	}
 
-	//
 	// Other functions
-	//
 
 	void CreateSocket()
 	{
 		try {
 			delete m_socket;
 			ip::udp::endpoint endpoint(m_address.GetEndpoint().address(), m_address.Service());
-			// Open + bind in two steps so we can mark the fd close-on-exec
-			// before bind, matching the TCP acceptor path. Single-arg
-			// ctor + open() is the documented Asio idiom for "create
-			// without binding".
+			// Open + bind in two steps so the fd can be marked close-on-exec before bind,
+			// matching the TCP acceptor path. Single-arg ctor + open() is the documented Asio
+			// idiom for "create without binding".
 			m_socket = new ip::udp::socket(s_io_service);
 			m_socket->open(endpoint.protocol());
-			// SO_REUSEADDR so a post-suspend rebind (DestroySocket +
-			// CreateSocket in CMuleUDPSocket::OnReceive when a read
-			// callback returns an error) doesn't hit EADDRINUSE while
-			// the kernel still considers the previous binding live.
-			// Without this Kad and the ed2k client UDP stay broken
-			// until the user restarts amule — see #103.
+			// SO_REUSEADDR so a post-suspend rebind (DestroySocket + CreateSocket in
+			// CMuleUDPSocket::OnReceive when a read callback returns an error) does not hit
+			// EADDRINUSE while the kernel still considers the previous binding live. Without this
+			// Kad and the ed2k client UDP stay broken until the user restarts amule.
 			m_socket->set_option(socket_base::reuse_address(true));
 			SetCloexecOnSocket(m_socket->native_handle());
+			// Pin this UDP socket (ed2k client/server + Kad all funnel
+			// through here) to the configured interface (#173).
+			SetBoundInterface(m_socket->native_handle(), s_bindToInterface, false);
 			m_socket->bind(endpoint);
-			AddDebugLogLineN(logAsio, CFormat("Created UDP socket %s %d") % m_address.IPAddress() % m_address.Service());
+			AddDebugLogLineN(logAsio,
+				CFormat("Created UDP socket %s %d") % m_address.IPAddress() %
+					m_address.Service());
 			StartBackgroundRead();
-		} catch (const system_error& err) {
-			AddLogLineC(CFormat("Error creating UDP socket %s %d : %s") % m_address.IPAddress() % m_address.Service() % err.code().message());
+		} catch (const system_error &err) {
+			AddLogLineC(CFormat(_("Error creating UDP socket %s %d : %s")) %
+				    m_address.IPAddress() % m_address.Service() % err.code().message());
 			m_socket = NULL;
 			m_OK = false;
 		}
@@ -1467,119 +1934,105 @@
 
 	void StartBackgroundRead()
 	{
-		// Skip if Destroy() has already nulled the socket via the strand
-		// teardown lambda. Without this guard the impl's last self ref
-		// (held by the in-flight async_receive_from completion that
-		// brought us here) would try to re-queue a recv on a closed-and-
-		// nulled socket.
+		// Skip if Destroy() has already nulled the socket via the strand teardown lambda. Without
+		// this guard the impl's last self ref -- held by the in-flight completion that brought us
+		// here -- would try to re-queue a recv on a closed-and-nulled socket.
 		if (!m_socket || m_destroying.load(std::memory_order_acquire)) {
 			return;
 		}
 		auto self = shared_from_this();
-		m_socket->async_receive_from(buffer(m_readBuffer, CMuleUDPSocket::UDP_BUFFER_SIZE), m_receiveEndpoint,
-			bind_executor(m_strand, self(const error_code& ec, std::size_t n) { self->HandleRead(ec, n); }));
-	}
-
-	// Atomic so OnWrapperGone() (called from the wrapper's dtor on any
-	// thread) and the strand-side load in Destroy() can both touch it
-	// without an external lock.
-	std::atomic<CLibUDPSocket *>	m_libSocket;
-	ip::udp::socket *	m_socket;
-	CMuleUDPSocket *	m_muleSocket;
-	bool				m_OK;
-	std::atomic<bool>	m_destroying;	// set once Destroy() has been called
-	io_context::strand	m_strand;		// handle synchronisation in io_service thread pool
-	amuleIPV4Address	m_address;
+		m_socket->async_receive_from(buffer(m_readBuffer, CMuleUDPSocket::UDP_BUFFER_SIZE),
+			m_receiveEndpoint,
+			bind_executor(m_strand,
+				self(const error_code &ec, std::size_t n) { self->HandleRead(ec, n); }));
+	}
+
+	// Atomic so OnWrapperGone() (called from the wrapper's dtor on any thread) and the
+	// strand-side load in Destroy() can both touch it without an external lock.
+	std::atomic<CLibUDPSocket *> m_libSocket;
+	ip::udp::socket *m_socket;
+	CMuleUDPSocket *m_muleSocket;
+	bool m_OK;
+	std::atomic<bool> m_destroying; // set once Destroy() has been called
+	io_context::strand m_strand;    // handle synchronisation in io_service thread pool
+	amuleIPV4Address m_address;
 
 	// One fix receive buffer
-	char *				m_readBuffer;
+	char *m_readBuffer;
 	// and a list of dynamic buffers. UDP data may be coming in faster
 	// than the main loop can handle it.
-	std::list<CUDPData *>	m_receiveBuffers;
-	wxMutex				m_receiveBuffersLock;
+	std::list<CUDPData *> m_receiveBuffers;
+	wxMutex m_receiveBuffersLock;
 
 	// Address of last reception
-	ip::udp::endpoint	m_receiveEndpoint;
+	ip::udp::endpoint m_receiveEndpoint;
 };
 
-
-/**
- * Library UDP socket wrapper
- */
+/** Library UDP socket wrapper */
 
 CLibUDPSocket::CLibUDPSocket(amuleIPV4Address &address, int flags)
 {
-	// make_shared must run to completion (so a shared_ptr exists to manage
-	// the object) before Init() — Init triggers async_receive_from whose
-	// completion handler captures shared_from_this(), and that requires a
-	// managing shared_ptr to already be in place.
+	// make_shared must run to completion (so a shared_ptr exists to manage the object) before
+	// Init() -- Init triggers async_receive_from whose completion handler captures
+	// shared_from_this(), and that requires a managing shared_ptr to already be in place.
 	m_aSocket = std::make_shared<CAsioUDPSocketImpl>(address, flags, this);
 	m_aSocket->Init();
 }
 
-
 CLibUDPSocket::~CLibUDPSocket()
 {
 	AddDebugLogLineF(logAsio, CFormat("~CLibUDPSocket() %p %p") % this % m_aSocket.get());
-	// Detach the back-pointer first so any callbacks that fire after the
-	// wrapper is gone don't dereference us. The impl itself stays alive as
-	// long as any callback still holds a shared_from_this() ref; once the
-	// last drops, the impl destructs cleanly and frees the asio socket.
+	// Detach the back-pointer first so any callbacks that fire after the wrapper is gone do not
+	// dereference us. The impl itself stays alive as long as any callback still holds a
+	// shared_from_this() ref; once the last drops, the impl destructs cleanly and frees the
+	// asio socket.
 	if (m_aSocket) {
 		m_aSocket->OnWrapperGone();
 	}
 }
 
-
 bool CLibUDPSocket::IsOk() const
 {
 	return m_aSocket->IsOk();
 }
 
-
-uint32 CLibUDPSocket::RecvFrom(amuleIPV4Address& addr, void* buf, uint32 nBytes)
+uint32 CLibUDPSocket::RecvFrom(CNetworkAddress &addr, uint16 &port, void *buf, uint32 nBytes)
 {
-	return m_aSocket->RecvFrom(addr, buf, nBytes);
+	return m_aSocket->RecvFrom(addr, port, buf, nBytes);
 }
 
-
-uint32 CLibUDPSocket::SendTo(const amuleIPV4Address& addr, const void* buf, uint32 nBytes)
+uint32 CLibUDPSocket::SendTo(const amuleIPV4Address &addr, const void *buf, uint32 nBytes)
 {
 	return m_aSocket->SendTo(addr, buf, nBytes);
 }
 
-
-void CLibUDPSocket::SetClientData(CMuleUDPSocket * muleSocket)
+void CLibUDPSocket::SetClientData(CMuleUDPSocket *muleSocket)
 {
 	m_aSocket->SetClientData(muleSocket);
 }
 
-
 int CLibUDPSocket::LastError() const
 {
 	return !IsOk();
 }
 
-
 void CLibUDPSocket::Close()
 {
 	m_aSocket->Close();
 }
 
-
 void CLibUDPSocket::Destroy()
 {
 	m_aSocket->Destroy();
 }
 
+/** CAsioService - ASIO event loop thread */
 
-/**
- * CAsioService - ASIO event loop thread
- */
-
-class CAsioServiceThread : public wxThread {
+class CAsioServiceThread : public wxThread
+{
 public:
-	CAsioServiceThread() : wxThread(wxTHREAD_JOINABLE)
+	CAsioServiceThread()
+	: wxThread(wxTHREAD_JOINABLE)
 	{
 		static int count = 0;
 		m_threadNumber = ++count;
@@ -1587,10 +2040,10 @@
 		Run();
 	}
 
-	void * Entry()
+	void *Entry()
 	{
 		AddLogLineNS(CFormat(_("Asio thread %d started")) % m_threadNumber);
-		auto worker = make_work_guard(s_io_service);		// keep io_service running
+		auto worker = make_work_guard(s_io_service); // keep io_service running
 		s_io_service.run();
 		AddDebugLogLineN(logAsio, CFormat("Asio thread %d stopped") % m_threadNumber);
 
@@ -1601,19 +2054,17 @@
 	int m_threadNumber;
 };
 
-/**
- * The constructor starts the thread.
- */
+/** The constructor starts the thread. */
 CAsioService::CAsioService()
 {
+	// Synchronous users such as amuleweb connect to the EC server before starting their
+	// long-lived Asio worker pool. A completed run()/run_one() leaves the process-global
+	// io_context stopped, in which state new work is ignored until restart() is called.
+	s_io_service.restart();
 	m_threads = new CAsioServiceThreadm_numberOfThreads;
 }
 
-
-CAsioService::~CAsioService()
-{
-}
-
+CAsioService::~CAsioService() {}
 
 void CAsioService::Stop()
 {
@@ -1623,33 +2074,27 @@
 	s_io_service.stop();
 	// Wait for threads to exit
 	for (int i = 0; i < m_numberOfThreads; i++) {
-		CAsioServiceThread * t = m_threads + i;
+		CAsioServiceThread *t = m_threads + i;
 		t->Wait();
 	}
 	delete m_threads;
 	m_threads = 0;
 }
 
-
-
-
-
-/**
- * amuleIPV4Address
- */
+/** amuleIPV4Address */
 
 amuleIPV4Address::amuleIPV4Address()
-	: m_endpoint(new CamuleIPV4Endpoint())
+: m_endpoint(new CamuleIPV4Endpoint())
 {
 }
 
 amuleIPV4Address::amuleIPV4Address(const amuleIPV4Address &a)
-	: m_endpoint(new CamuleIPV4Endpoint(*a.m_endpoint))
+: m_endpoint(new CamuleIPV4Endpoint(*a.m_endpoint))
 {
 }
 
 amuleIPV4Address::amuleIPV4Address(const CamuleIPV4Endpoint &ep)
-	: m_endpoint(new CamuleIPV4Endpoint(ep))
+: m_endpoint(new CamuleIPV4Endpoint(ep))
 {
 }
 
@@ -1658,7 +2103,7 @@
 	delete m_endpoint;
 }
 
-amuleIPV4Address& amuleIPV4Address::operator=(const amuleIPV4Address &a)
+amuleIPV4Address &amuleIPV4Address::operator=(const amuleIPV4Address &a)
 {
 	if (this != &a) {
 		*m_endpoint = *a.m_endpoint;
@@ -1666,13 +2111,13 @@
 	return *this;
 }
 
-amuleIPV4Address& amuleIPV4Address::operator=(const CamuleIPV4Endpoint &ep)
+amuleIPV4Address &amuleIPV4Address::operator=(const CamuleIPV4Endpoint &ep)
 {
 	*m_endpoint = ep;
 	return *this;
 }
 
-bool amuleIPV4Address::Hostname(const wxString& name)
+bool amuleIPV4Address::Hostname(const wxString &name)
 {
 	if (name.IsEmpty()) {
 		return false;
@@ -1685,24 +2130,41 @@
 		m_endpoint->address(adr);
 		return true;
 	}
-	AddDebugLogLineN(logAsio, CFormat("Hostname(\"%s\") failed, not an IP address %s") % name % ec.message());
+	AddDebugLogLineN(
+		logAsio, CFormat("Hostname(\"%s\") failed, not an IP address %s") % name % ec.message());
 
-	// Try to resolve (sync). Normally not required. Unless you type in your hostname as "local IP address" or something.
+	// Try to resolve (sync). Normally not required, unless you type in your hostname as "local
+	// IP address" or something.
+	//
+	// Only IPv4 addresses, asked for explicitly: the resolve(host, service) overload passes a
+	// default-constructed flag set and leaves the family unrestricted, so getaddrinfo answers
+	// with AAAA records too, on any host. Their order is up to the platform resolver and IPv6
+	// routinely comes first, so taking the first result would store an IPv6 address in what the
+	// rest of aMule treats as a v4-only endpoint.
 	error_code ec2;
 	ip::tcp::resolver res(s_io_service);
-	// We only want to get IPV4 addresses.
-	ip::tcp::resolver::results_type endpoint_iterator = res.resolve(sname, "", ec2);
+	ip::tcp::resolver::results_type endpoint_iterator = res.resolve(ip::tcp::v4(), sname, "", ec2);
 	if (ec2) {
-		AddDebugLogLineN(logAsio, CFormat("Hostname(\"%s\") resolve failed: %s") % name % ec2.message());
+		AddDebugLogLineN(
+			logAsio, CFormat("Hostname(\"%s\") resolve failed: %s") % name % ec2.message());
 		return false;
 	}
-	if (endpoint_iterator == ip::tcp::resolver::results_type()) {
-		AddDebugLogLineN(logAsio, CFormat("Hostname(\"%s\") resolve failed: no address found") % name);
-		return false;
+	// Belt and braces: the AF_INET query above should only ever yield v4 entries, but the
+	// endpoint is v4-only by contract, so scan for one rather than trusting begin() the way the
+	// unrestricted query did.
+	for (const auto &entry : endpoint_iterator) {
+		if (entry.endpoint().address().is_v4()) {
+			m_endpoint->address(entry.endpoint().address());
+			AddDebugLogLineN(
+				logAsio, CFormat("Hostname(\"%s\") resolved to %s") % name % IPAddress());
+			return true;
+		}
 	}
-	m_endpoint->address(endpoint_iterator.begin()->endpoint().address());
-	AddDebugLogLineN(logAsio, CFormat("Hostname(\"%s\") resolved to %s") % name % IPAddress());
-	return true;
+	// A name that only has AAAA records lands here. aMule is IPv4-only end to end
+	// (amuleIPV4Address, the uint32 IPs, the EC listener), so failing is the honest answer --
+	// the caller reports it instead of dialling an address the socket layer cannot use.
+	AddDebugLogLineN(logAsio, CFormat("Hostname(\"%s\") resolve failed: no IPv4 address found") % name);
+	return false;
 }
 
 bool amuleIPV4Address::Service(uint16 service)
@@ -1729,9 +2191,8 @@
 	return CFormat("%s") % m_endpoint->address().to_string();
 }
 
-// "Set address to any of the addresses of the current machine."
-// This just sets the address to 0.0.0.0 .
-// wx does the same.
+// "Set address to any of the addresses of the current machine." This just sets the address
+// to 0.0.0.0, as wx does.
 bool amuleIPV4Address::AnyAddress()
 {
 	m_endpoint->address(ip::address_v4::any());
@@ -1739,110 +2200,115 @@
 	return true;
 }
 
-const CamuleIPV4Endpoint & amuleIPV4Address::GetEndpoint() const
+const CamuleIPV4Endpoint &amuleIPV4Address::GetEndpoint() const
 {
-	return * m_endpoint;
+	return *m_endpoint;
 }
 
-CamuleIPV4Endpoint & amuleIPV4Address::GetEndpoint()
+CamuleIPV4Endpoint &amuleIPV4Address::GetEndpoint()
 {
-	return * m_endpoint;
+	return *m_endpoint;
 }
 
-
-//
 // Notification stuff
-//
 namespace MuleNotify
 {
 
-	void LibSocketConnect(CLibSocket * socket, int error)
-	{
-		if (socket->IsDestroying()) {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketConnect Destroying %s %d") % socket->GetIP() % error);
-		} else if (socket->GetProxyState()) {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketConnect Proxy %s %d") % socket->GetIP() % error);
-			socket->OnProxyEvent(MULE_SOCKET_CONNECTION);
-		} else {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketConnect %s %d") %socket->GetIP() % error);
-			socket->OnConnect(error);
-		}
+void LibSocketConnect(CLibSocket *socket, int error)
+{
+	if (socket->IsDestroying()) {
+		AddDebugLogLineF(
+			logAsio, CFormat("LibSocketConnect Destroying %s %d") % socket->GetIP() % error);
+	} else if (socket->GetProxyState()) {
+		AddDebugLogLineF(logAsio, CFormat("LibSocketConnect Proxy %s %d") % socket->GetIP() % error);
+		socket->OnProxyEvent(MULE_SOCKET_CONNECTION);
+	} else {
+		AddDebugLogLineF(logAsio, CFormat("LibSocketConnect %s %d") % socket->GetIP() % error);
+		socket->OnConnect(error);
 	}
+}
 
-	void LibSocketSend(CLibSocket * socket, int error)
-	{
-		if (socket->IsDestroying()) {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketSend Destroying %s %d") % socket->GetIP() % error);
-		} else if (socket->GetProxyState()) {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketSend Proxy %s %d") % socket->GetIP() % error);
-			socket->OnProxyEvent(MULE_SOCKET_OUTPUT);
-		} else {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketSend %s %d") % socket->GetIP() % error);
-			socket->OnSend(error);
-		}
+void LibSocketSend(CLibSocket *socket, int error)
+{
+	if (socket->IsDestroying()) {
+		AddDebugLogLineF(
+			logAsio, CFormat("LibSocketSend Destroying %s %d") % socket->GetIP() % error);
+	} else if (socket->GetProxyState()) {
+		AddDebugLogLineF(logAsio, CFormat("LibSocketSend Proxy %s %d") % socket->GetIP() % error);
+		socket->OnProxyEvent(MULE_SOCKET_OUTPUT);
+	} else {
+		AddDebugLogLineF(logAsio, CFormat("LibSocketSend %s %d") % socket->GetIP() % error);
+		socket->OnSend(error);
 	}
+}
 
-	void LibSocketReceive(CLibSocket * socket, int error)
-	{
-		socket->EventProcessed();
-		if (socket->IsDestroying()) {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketReceive Destroying %s %d") % socket->GetIP() % error);
-		} else if (socket->GetProxyState()) {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketReceive Proxy %s %d") % socket->GetIP() % error);
-			socket->OnProxyEvent(MULE_SOCKET_INPUT);
-		} else {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketReceive %s %d") % socket->GetIP() % error);
-			socket->OnReceive(error);
-		}
+void LibSocketFlush(CLibSocket *socket)
+{
+	if (socket->IsDestroying()) {
+		return;
 	}
+	socket->FlushTransport();
+}
 
-	void LibSocketLost(CLibSocket * socket)
-	{
-		if (socket->IsDestroying()) {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketLost Destroying %s") % socket->GetIP());
-		} else if (socket->GetProxyState()) {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketLost Proxy %s") % socket->GetIP());
-			socket->OnProxyEvent(MULE_SOCKET_LOST);
-		} else {
-			AddDebugLogLineF(logAsio, CFormat("LibSocketLost %s") % socket->GetIP());
-			socket->OnLost(0);
-		}
+void LibSocketReceive(CLibSocket *socket, int error)
+{
+	socket->EventProcessed();
+	if (socket->IsDestroying()) {
+		AddDebugLogLineF(
+			logAsio, CFormat("LibSocketReceive Destroying %s %d") % socket->GetIP() % error);
+	} else if (socket->GetProxyState()) {
+		AddDebugLogLineF(logAsio, CFormat("LibSocketReceive Proxy %s %d") % socket->GetIP() % error);
+		socket->OnProxyEvent(MULE_SOCKET_INPUT);
+	} else {
+		AddDebugLogLineF(logAsio, CFormat("LibSocketReceive %s %d") % socket->GetIP() % error);
+		socket->OnReceive(error);
 	}
+}
 
-	void LibSocketDestroy(CLibSocket * socket)
-	{
-		AddDebugLogLineF(logAsio, CFormat("LibSocket_Destroy %s") % socket->GetIP());
-		delete socket;
+void LibSocketLost(CLibSocket *socket)
+{
+	if (socket->IsDestroying()) {
+		AddDebugLogLineF(logAsio, CFormat("LibSocketLost Destroying %s") % socket->GetIP());
+	} else if (socket->GetProxyState()) {
+		AddDebugLogLineF(logAsio, CFormat("LibSocketLost Proxy %s") % socket->GetIP());
+		socket->OnProxyEvent(MULE_SOCKET_LOST);
+	} else {
+		AddDebugLogLineF(logAsio, CFormat("LibSocketLost %s") % socket->GetIP());
+		socket->OnLost(0);
 	}
+}
 
-	void ProxySocketEvent(CLibSocket * socket, int evt)
-	{
-		AddDebugLogLineF(logAsio, CFormat("ProxySocketEvent %s %d") % socket->GetIP() % evt);
-		socket->OnProxyEvent(evt);
-	}
+void LibSocketDestroy(CLibSocket *socket)
+{
+	AddDebugLogLineF(logAsio, CFormat("LibSocket_Destroy %s") % socket->GetIP());
+	delete socket;
+}
 
-	void ServerTCPAccept(CLibSocketServer * socketServer)
-	{
-		AddDebugLogLineF(logAsio, "ServerTCP_Accept");
-		socketServer->OnAccept();
-	}
+void ProxySocketEvent(CLibSocket *socket, int evt)
+{
+	AddDebugLogLineF(logAsio, CFormat("ProxySocketEvent %s %d") % socket->GetIP() % evt);
+	socket->OnProxyEvent(evt);
+}
 
-	void UDPSocketSend(CMuleUDPSocket * socket)
-	{
-		AddDebugLogLineF(logAsio, "UDPSocketSend");
-		socket->OnSend(0);
-	}
+void ServerTCPAccept(CLibSocketServer *socketServer)
+{
+	AddDebugLogLineF(logAsio, "ServerTCP_Accept");
+	socketServer->OnAccept();
+}
 
-	void UDPSocketReceive(CMuleUDPSocket * socket)
-	{
-		AddDebugLogLineF(logAsio, "UDPSocketReceive");
-		socket->OnReceive(0);
-	}
+void UDPSocketSend(CMuleUDPSocket *socket)
+{
+	AddDebugLogLineF(logAsio, "UDPSocketSend");
+	socket->OnSend(0);
+}
 
+void UDPSocketReceive(CMuleUDPSocket *socket)
+{
+	AddDebugLogLineF(logAsio, "UDPSocketReceive");
+	socket->OnReceive(0);
+}
 
 } // namespace MuleNotify
 
-//
 // Initialize MuleBoostVersion
-//
 wxString MuleBoostVersion = CFormat("%d.%d") % (BOOST_VERSION / 100000) % (BOOST_VERSION / 100 % 1000);

amule-3.1.0.tar.gz/src/ListColumnStore.cpp Added

@@ -0,0 +1,287 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "ListColumnStore.h"
+
+#include <wx/config.h>
+#include <wx/tokenzr.h>
+
+#include <common/StringFunctions.h> // Needed for StrToLong
+
+#include "Types.h" // Needed for EmptyString
+
+namespace
+{
+// The config format that predates this store wrote CMuleListCtrl::MLOrder values verbatim, so
+// reading one back means translating those bits rather than assuming they match what this store
+// writes today. Spelled out here instead of including MuleListCtrl.h: the store serves both list
+// bases and must not adopt either one's vocabulary (see CListColumnStore::SortFlag).
+const unsigned long kLegacySortDescending = 0x1000;
+const unsigned long kLegacySortAlternate = 0x2000;
+const unsigned long kLegacySortMask = kLegacySortDescending | kLegacySortAlternate;
+} // namespace
+
+void CListColumnStore::RegisterColumn(int index, int defaultWidth, const wxString &name)
+{
+#ifdef __DEBUG__
+	// Check for valid names
+	wxASSERT_MSG(
+		name.Find(':') == wxNOT_FOUND, "Column name \"" + name + "\" contains invalid characters!");
+	wxASSERT_MSG(
+		name.Find(',') == wxNOT_FOUND, "Column name \"" + name + "\" contains invalid characters!");
+
+	// Check for uniqueness of names.
+	for (const ColNameEntry &entry : m_column_names) {
+		if (name == entry.name) {
+			wxFAIL_MSG("Column name \"" + name + "\" is not unique!");
+		}
+	}
+
+	// ... and of indices. Every lookup here (GetColumnName, GetColumnDefaultWidth,
+	// GetColumnIndex) matches on index and returns the first entry that does, so a second
+	// registration of the same index is not an alternative -- it is dead weight that shadows
+	// nothing and reports nothing.
+	for (const ColNameEntry &entry : m_column_names) {
+		if (index == entry.index) {
+			wxFAIL_MSG(wxString::Format(
+				"Column index %d is already registered as \"%s\"!", index, entry.name));
+		}
+	}
+#endif
+	// Kept sorted by index. Entries are NOT renumbered around an insert: index is the caller's
+	// own column id -- a stable #define for the wxDataViewCtrl lists, the wxListCtrl column
+	// position for the legacy ones -- and every lookup above matches the value the caller
+	// passes back in. Shifting stored indices would break that correspondence, and since a key
+	// maps to a column through it, the on-disk TableWidths*/TableOrdering* entries would start
+	// addressing the wrong columns.
+	ColNameList::iterator it = m_column_names.begin();
+	while (it != m_column_names.end() && it->index < index) {
+		++it;
+	}
+	m_column_names.insert(it, ColNameEntry(index, defaultWidth, name));
+}
+
+const wxString &CListColumnStore::GetColumnName(int index) const
+{
+	for (const ColNameEntry &entry : m_column_names) {
+		if (entry.index == index) {
+			return entry.name;
+		}
+	}
+	return EmptyString;
+}
+
+int CListColumnStore::GetColumnDefaultWidth(int index) const
+{
+	for (const ColNameEntry &entry : m_column_names) {
+		if (entry.index == index) {
+			return entry.defaultWidth;
+		}
+	}
+	return -1; // wxLIST_AUTOSIZE
+}
+
+int CListColumnStore::GetColumnIndex(const wxString &name) const
+{
+	for (const ColNameEntry &entry : m_column_names) {
+		if (entry.name == name) {
+			return entry.index;
+		}
+	}
+	return -1;
+}
+
+int CListColumnStore::GetCachedWidth(int index) const
+{
+	return (index >= 0 && index < (int)m_column_sizes.size()) ? m_column_sizesindex : 0;
+}
+
+void CListColumnStore::SetCachedWidth(int index, int width)
+{
+	if (index >= (int)m_column_sizes.size()) {
+		m_column_sizes.resize(index + 1, 0);
+	}
+	m_column_sizesindex = width;
+}
+
+int CListColumnStore::GetNewColumnIndex(int oldindex, const wxString &oldColumnOrder) const
+{
+	wxStringTokenizer oldcolumns(oldColumnOrder, ",", wxTOKEN_RET_EMPTY_ALL);
+	while (oldcolumns.HasMoreTokens()) {
+		wxString name = oldcolumns.GetNextToken();
+		if (oldindex == 0) {
+			return GetColumnIndex(name);
+		}
+		--oldindex;
+	}
+	return -1;
+}
+
+void CListColumnStore::SaveSettings(const IColumnWidthProvider &widget, const CSortingList &sortOrders) const
+{
+	if (!HasTableName()) {
+		return;
+	}
+	wxConfigBase *cfg = wxConfigBase::Get();
+
+	// Save sorting, column and order
+	wxString sortOrder;
+	for (CSortingList::const_iterator it = sortOrders.begin(); it != sortOrders.end();) {
+		wxString columnName = GetColumnName(static_cast<int>(it->first));
+		if (!columnName.IsEmpty()) {
+			sortOrder += columnName;
+			sortOrder += ":";
+			sortOrder += it->second & SORT_DESCENDING ? "1" : "0";
+			sortOrder += ":";
+			sortOrder += it->second & SORT_ALTERNATE ? "1" : "0";
+			if (++it != sortOrders.end()) {
+				sortOrder += ",";
+			}
+		} else {
+			++it;
+		}
+	}
+	cfg->Write("/eMule/TableOrdering" + m_name, sortOrder);
+
+	// Save column widths. ATM this is also used to signify hidden columns.
+	wxString buffer;
+	for (int i = 0; i < widget.GetColumnCount(); ++i) {
+		wxString columnName = GetColumnName(i);
+		if (!columnName.IsEmpty()) {
+			if (!buffer.IsEmpty()) {
+				buffer << ",";
+			}
+			int currentwidth = widget.GetColumnWidth(i);
+			int savedsize = (m_column_sizes.size() && (i < (int)m_column_sizes.size()))
+						? m_column_sizesi
+						: 0;
+			buffer << columnName << ":" << ((currentwidth > 0) ? currentwidth : (-1 * savedsize));
+		}
+	}
+	cfg->Write("/eMule/TableWidths" + m_name, buffer);
+}
+
+bool CListColumnStore::ParseOldConfigEntries(const wxString &sortOrders,
+	const wxString &columnWidths,
+	IColumnWidthProvider &widget,
+	const wxString &oldColumnOrder,
+	CSortingList &outSortOrders)
+{
+	// Set sort order (including sort column)
+	wxStringTokenizer tokens(sortOrders, ",");
+	while (tokens.HasMoreTokens()) {
+		wxString token = tokens.GetNextToken();
+
+		long column = 0;
+		unsigned long order = 0;
+
+		if (token.BeforeFirst(' ').Strip(wxString::both).ToLong(&column)) {
+			if (token.AfterFirst(' ').Strip(wxString::both).ToULong(&order)) {
+				column = GetNewColumnIndex(static_cast<int>(column), oldColumnOrder);
+				// Sanity checking, to avoid asserting if column count changes.
+				if (column >= 0 && column < widget.GetColumnCount()) {
+					// Sanity checking, to avoid asserting if data-format changes.
+					if ((order & ~kLegacySortMask) == 0) {
+						outSortOrders.emplace_back(column,
+							(order & kLegacySortDescending ? SORT_DESCENDING
+										       : 0) |
+								(order & kLegacySortAlternate ? SORT_ALTERNATE
+											      : 0));
+					}
+				}
+			}
+		}
+	}
+
+	// Set column widths
+	bool restoredWidth = false;
+	int counter = 0;
+	wxStringTokenizer tokenizer(columnWidths, ",");
+	while (tokenizer.HasMoreTokens()) {
+		long idx = GetNewColumnIndex(counter++, oldColumnOrder);
+		long width = StrToLong(tokenizer.GetNextToken());
+		if (idx >= 0) {
+			widget.SetColumnWidth(static_cast<int>(idx), static_cast<int>(width));
+			restoredWidth = true;
+		}
+	}
+
+	return restoredWidth;
+}
+
+bool CListColumnStore::LoadSettings(
+	IColumnWidthProvider &widget, const wxString &oldColumnOrder, CSortingList &outSortOrders)
+{
+	outSortOrders.clear();
+	bool restoredWidth = false;
+	if (!HasTableName()) {
+		return false;
+	}
+	wxConfigBase *cfg = wxConfigBase::Get();
+
+	wxString sortOrders = cfg->Read("/eMule/TableOrdering" + m_name, "");
+	wxString columnWidths = cfg->Read("/eMule/TableWidths" + m_name, "");
+
+	if (columnWidths.Find(':') == wxNOT_FOUND) {
+		// Old-style config entries...
+		return ParseOldConfigEntries(sortOrders, columnWidths, widget, oldColumnOrder, outSortOrders);
+	}
+
+	// Sort orders are stored primary, secondary, ... The caller applies them via SetSorting(),
+	// which treats the *last* call as primary, so hand them back in reverse.
+	wxStringTokenizer tokens(sortOrders, ",");
+	std::list<wxString> tokenList;
+	while (tokens.HasMoreTokens()) {
+		tokenList.push_front(tokens.GetNextToken());
+	}
+	for (const wxString &token : tokenList) {
+		wxString name = token.BeforeFirst(':');
+		long order = StrToLong(token.AfterFirst(':').BeforeLast(':'));
+		long alt = StrToLong(token.AfterLast(':'));
+		int col = GetColumnIndex(name);
+		if (col >= 0) {
+			outSortOrders.emplace_back(
+				col, (order ? SORT_DESCENDING : 0) | (alt ? SORT_ALTERNATE : 0));
+		}
+	}
+
+	// Column widths
+	wxStringTokenizer tkz(columnWidths, ",");
+	while (tkz.HasMoreTokens()) {
+		wxString token = tkz.GetNextToken();
+		wxString name = token.BeforeFirst(':');
+		long width = StrToLong(token.AfterFirst(':'));
+		int col = GetColumnIndex(name);
+		if (col >= 0) {
+			if (col >= (int)m_column_sizes.size()) {
+				m_column_sizes.resize(col + 1, 0);
+			}
+			m_column_sizescol = static_cast<int>(abs(width));
+			widget.SetColumnWidth(col, static_cast<int>((width > 0) ? width : 0));
+			restoredWidth = true;
+		}
+	}
+
+	return restoredWidth;
+}

amule-3.1.0.tar.gz/src/ListColumnStore.h Added

@@ -0,0 +1,194 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 LISTCOLUMNSTORE_H
+#define LISTCOLUMNSTORE_H
+
+#include <wx/string.h>
+
+#include <list>
+#include <utility>
+#include <vector>
+
+/**
+ * Width at or below which a column counts as hidden. wxGTK reserves a few pixels for the header
+ * grip and will not shrink a column below that, so "hidden" cannot mean literally zero there.
+ * Shared by every list that offers the header's show/hide menu, so the threshold and the width
+ * written to the config stay in agreement.
+ */
+#ifdef __WXGTK__
+constexpr int COL_SIZE_MIN = 10;
+#elif defined(__WINDOWS__) || defined(__WXMAC__) || defined(__WXCOCOA__)
+constexpr int COL_SIZE_MIN = 0;
+#else
+#error Need to define COL_SIZE_MIN for your OS
+#endif
+
+/**
+ * The subset of a list widget's column API that column persistence needs. CMuleListCtrl already
+ * implements this exact signature set by inheriting wxGenericListCtrl, so it satisfies the
+ * interface for free. A wxDataViewCtrl-backed list only has to forward these three calls to its own
+ * columns (GetColumnCount() / GetColumn(i)->GetWidth() / SetWidth()) to reuse CListColumnStore
+ * unchanged.
+ */
+class IColumnWidthProvider
+{
+public:
+	virtual ~IColumnWidthProvider() = default;
+	virtual int GetColumnCount() const = 0;
+	virtual int GetColumnWidth(int col) const = 0;
+	virtual bool SetColumnWidth(int col, int width) = 0;
+};
+
+/**
+ * Owns a list control's column-persistence state -- the stable, translation-independent name and
+ * default width per column, the last-known width cache, and (de)serialization to and from wxConfig
+ * -- independently of which widget renders the columns.
+ *
+ * Extracted from CMuleListCtrl (see the #675/#180 phase 2 discussion): the persisted format and
+ * config keys ("/eMule/TableOrdering<name>", "/eMule/TableWidths<name>") are unchanged, so existing
+ * user settings keep working. Sort-order *mutation* deliberately stays out of this class --
+ * applying a loaded sort order can have widget-specific side effects (CMuleListCtrl::SetSorting()
+ * also triggers a re-sort and validates against AltSortAllowed()), so LoadSettings() only decodes
+ * the stored order and hands it back to the caller.
+ */
+class CListColumnStore
+{
+public:
+	/**
+	 * The sort flags this store reads and writes.
+	 *
+	 * Deliberately its own, not borrowed from either list base: the two use different bit
+	 * values for the same idea (CMuleListCtrl 0x1000/0x2000, CMuleDataViewCtrl 0x1/0x2), so a
+	 * store that spoke one of them silently dropped descending and alternate sorting for every
+	 * list built on the other -- saving them as "not set" and restoring them as ascending. The
+	 * store owns the serialised format; each base converts to and from it at the call, which is
+	 * the only place the two vocabularies meet.
+	 *
+	 * These values are not interchangeable with either base's flags even where the numbers
+	 * happen to line up. Convert; never pass through.
+	 */
+	enum SortFlag
+	{
+		//! Sort this column in descending order.
+		SORT_DESCENDING = 0x1,
+		//! Sort this column by its alternate criterion.
+		SORT_ALTERNATE = 0x2,
+		//! Every bit this store defines; anything else is malformed.
+		SORT_FLAG_MASK = SORT_DESCENDING | SORT_ALTERNATE
+	};
+
+	//! A column index paired with this store's SortFlag bits.
+	typedef std::pair<unsigned, unsigned> CColPair;
+	typedef std::list<CColPair> CSortingList;
+
+	/**
+	 * Sets the persistence key prefix. Mirrors CMuleListCtrl::SetTableName(): an empty name
+	 * means "do not persist".
+	 */
+	void SetTableName(const wxString &name) { m_name = name; }
+	bool HasTableName() const { return !m_name.IsEmpty(); }
+
+	/**
+	 * Registers a column's persistence name and default width at the given index, from the
+	 * list's InsertColumn() equivalent. In debug builds it also asserts the name is free of ':'
+	 * and ',' (the serialization format's own delimiters) and not already registered -- this
+	 * store is the only thing that can check uniqueness now.
+	 */
+	void RegisterColumn(int index, int defaultWidth, const wxString &name);
+
+	//! Forgets all registered columns (mirrors CMuleListCtrl::ClearAll()).
+	void ClearColumns() { m_column_names.clear(); }
+
+	const wxString &GetColumnName(int index) const;
+	int GetColumnDefaultWidth(int index) const;
+	int GetColumnIndex(const wxString &name) const;
+
+	/**
+	 * Last-known width cache for a hidden column, keyed by column index. Used by the hide/show-
+	 * via-menu interaction (CMuleListCtrl::OnMenuSelected): the width is cached here when a
+	 * column is hidden, so it can be restored when the column is shown again in the same
+	 * session. 0 if never cached.
+	 */
+	int GetCachedWidth(int index) const;
+	void SetCachedWidth(int index, int width);
+
+	/**
+	 * Writes the current column widths and visibility, plus the given sort order, to wxConfig
+	 * under this store's table name. No-op if no table name has been set.
+	 */
+	void SaveSettings(const IColumnWidthProvider &widget, const CSortingList &sortOrders) const;
+
+	/**
+	 * Reads column widths and visibility and sort order back from wxConfig, applying widths
+	 * directly through the given widget and returning the decoded sort order (in the primary-
+	 * last order CMuleListCtrl::LoadSettings() has always built, ready for the caller's own
+	 * SetSorting()). No-op, and clears outSortOrders, if no table name has been set.
+	 *
+	 * @param oldColumnOrder Pre-2.2.2 column order, comma-separated, as
+	 * CMuleListCtrl::GetOldColumnOrder() provides; empty to skip that migration path.
+	 * @return true when at least one stored column width was applied, i.e. this profile has a
+	 * saved layout. Callers use it to decide whether an auto-fit would be helping a fresh
+	 * profile or destroying a width the user chose.
+	 */
+	bool LoadSettings(
+		IColumnWidthProvider &widget, const wxString &oldColumnOrder, CSortingList &outSortOrders);
+
+private:
+	int GetNewColumnIndex(int oldindex, const wxString &oldColumnOrder) const;
+	bool ParseOldConfigEntries(const wxString &sortOrders,
+		const wxString &columnWidths,
+		IColumnWidthProvider &widget,
+		const wxString &oldColumnOrder,
+		CSortingList &outSortOrders);
+
+	class ColNameEntry
+	{
+	public:
+		int index;
+		int defaultWidth;
+		wxString name;
+		ColNameEntry(int _index, int _defaultWidth, const wxString &_name)
+		: index(_index)
+		, defaultWidth(_defaultWidth)
+		, name(_name)
+		{
+		}
+	};
+	typedef std::list<ColNameEntry> ColNameList;
+
+	//! The persistence key prefix. Empty means "don't persist".
+	wxString m_name;
+
+	//! Column names, sorted by column index.
+	ColNameList m_column_names;
+
+	//! Cache of the columns' sizes (used to remember a hidden column's
+	//! last width, per CMuleListCtrl::SaveSettings' original comment).
+	typedef std::vector<int> ColSizeVector;
+	ColSizeVector m_column_sizes;
+};
+
+#endif // LISTCOLUMNSTORE_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/ListenSocket.cpp -> amule-3.1.0.tar.gz/src/ListenSocket.cpp Changed

@@ -23,31 +23,26 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "ListenSocket.h"	// Interface declarations
+#include "ListenSocket.h" // Interface declarations
 
 #include <common/EventIDs.h>
 
-#include "ClientTCPSocket.h"	// Needed for CClientRequestSocket
-#include "Logger.h"			// Needed for AddLogLineM
-#include "Statistics.h"		// Needed for theStats
-#include "Preferences.h"	// Needed for CPreferences
-#include "amule.h"		// Needed for theApp
-#include "ServerConnect.h"	// Needed for CServerConnect
+#include "ClientTCPSocket.h" // Needed for CClientRequestSocket
+#include "Logger.h"          // Needed for AddLogLineM
+#include "Statistics.h"      // Needed for theStats
+#include "Preferences.h"     // Needed for CPreferences
+#include "amule.h"           // Needed for theApp
+#include "ServerConnect.h"   // Needed for CServerConnect
 
-//-----------------------------------------------------------------------------
 // CListenSocket
-//-----------------------------------------------------------------------------
-//
-// This is the socket that listens to incoming connections in aMule's TCP port
-// As soon as a connection is detected, it creates a new socket of type
-// CClientTCPSocket to handle (accept) the connection.
 //
+// The socket listening for incoming connections on aMule's TCP port. On detecting a connection it
+// creates a CClientTCPSocket to accept and handle it.
 
 CListenSocket::CListenSocket(amuleIPV4Address &addr, const CProxyData *ProxyData)
-:
-// wxSOCKET_NOWAIT    - means non-blocking i/o
-// wxSOCKET_REUSEADDR - means we can reuse the socket immediately (wx-2.5.3)
-CSocketServerProxy(addr, MULE_SOCKET_NOWAIT|MULE_SOCKET_REUSEADDR, ProxyData)
+: // wxSOCKET_NOWAIT    - means non-blocking i/o
+  // wxSOCKET_REUSEADDR - means we can reuse the socket immediately (wx-2.5.3)
+	CSocketServerProxy(addr, MULE_SOCKET_NOWAIT | MULE_SOCKET_REUSEADDR, ProxyData)
 {
 	// 0.42e - vars not used by us
 	m_pending = false;
@@ -62,11 +57,10 @@
 
 		AddLogLineNS(_("ListenSocket: Ok."));
 	} else {
-		AddLogLineCS(_("ERROR: Could not listen to TCP port.") );
+		AddLogLineCS(_("ERROR: Could not listen to TCP port."));
 	}
 }
 
-
 CListenSocket::~CListenSocket()
 {
 	shutdown = true;
@@ -83,25 +77,23 @@
 	KillAllSockets();
 }
 
-
 void CListenSocket::OnAccept()
 {
-	m_pending = theApp->IsRunning();	// just do nothing if we are shutting down
-	// If the client is still at maxconnections,
-	// this will allow it to go above it ...
-	// But if you don't, you will get a lowID on all servers.
+	m_pending = theApp->IsRunning(); // just do nothing if we are shutting down
+	// If the client is still at maxconnections this allows it to go above the limit -- but
+	// without that, you get a lowID on all servers.
 	while (m_pending && (theApp->serverconnect->IsConnecting() || !TooManySockets())) {
 		if (!SocketAvailable()) {
 			m_pending = false;
 		} else {
 			// Create a new socket to deal with the connection
-			CClientTCPSocket* newclient = new CClientTCPSocket();
+			CClientTCPSocket *newclient = new CClientTCPSocket();
 			// Accept the connection and give it to the newly created socket
 			if (!AcceptWith(*newclient, false)) {
 				newclient->Safe_Delete();
 				m_pending = false;
 			} else {
-				if (!newclient->InitNetworkData()) {
+				if (!newclient->InitNetworkData(CClientTCPSocket::AdmissionTransport::TCP)) {
 					// IP or port were not returned correctly
 					// from the accepted address, or filtered.
 					newclient->Safe_Delete();
@@ -124,14 +116,20 @@
 	// 042e + Kry changes for Destroy
 	m_OpenSocketsInterval = 0;
 	SocketSet::iterator it = socket_list.begin();
-	while ( it != socket_list.end() ) {
-		CClientTCPSocket* cur_socket = *it++;
+	while (it != socket_list.end()) {
+		CClientTCPSocket *cur_socket = *it++;
 		if (!cur_socket->IsDestroying()) {
 			cur_socket->CheckTimeOut();
 		}
 	}
 
-	if (m_pending) {
+	// SocketAvailable() as well as m_pending: the socket layer arms one async accept at a time
+	// and only re-arms it from AcceptWith(), so a connection it accepted but we then declined
+	// to take -- OnAccept() bails out when the app is not running yet -- leaves the acceptor
+	// idle with m_pending clear. Nothing would ever call AcceptWith() again and the listen
+	// socket would stay deaf for the rest of the session, with the kernel still completing
+	// handshakes into a backlog no one reads. Taking it here re-arms the acceptor.
+	if (m_pending || SocketAvailable()) {
 		OnAccept();
 	}
 }
@@ -140,30 +138,30 @@
 {
 	// 0.42e
 	memset(m_ConnectionStates, 0, 3 * sizeof(m_ConnectionStates0));
-	for (SocketSet::iterator it = socket_list.begin(); it != socket_list.end(); ) {
-		CClientTCPSocket* cur_socket = *it++;
+	for (SocketSet::iterator it = socket_list.begin(); it != socket_list.end();) {
+		CClientTCPSocket *cur_socket = *it++;
 		switch (cur_socket->GetConState()) {
-			case ES_DISCONNECTED:
-				m_ConnectionStates0++;
-				break;
-			case ES_NOTCONNECTED:
-				m_ConnectionStates1++;
-				break;
-			case ES_CONNECTED:
-				m_ConnectionStates2++;
-				break;
+		case ES_DISCONNECTED:
+			m_ConnectionStates0++;
+			break;
+		case ES_NOTCONNECTED:
+			m_ConnectionStates1++;
+			break;
+		case ES_CONNECTED:
+			m_ConnectionStates2++;
+			break;
 		}
 	}
 }
 
-void CListenSocket::AddSocket(CClientTCPSocket* toadd)
+void CListenSocket::AddSocket(CClientTCPSocket *toadd)
 {
 	wxASSERT(toadd);
 	socket_list.insert(toadd);
 	theStats::AddActiveConnection();
 }
 
-void CListenSocket::RemoveSocket(CClientTCPSocket* todel)
+void CListenSocket::RemoveSocket(CClientTCPSocket *todel)
 {
 	wxASSERT(todel);
 	socket_list.erase(todel);
@@ -172,11 +170,10 @@
 
 void CListenSocket::KillAllSockets()
 {
-	// 0.42e reviewed - they use delete, but our safer is Destroy...
-	// But I bet it would be better to call Safe_Delete on the socket.
-	// Update: no... Safe_Delete MARKS for deletion. We need to delete it.
-	for (SocketSet::iterator it = socket_list.begin(); it != socket_list.end(); ) {
-		CClientTCPSocket* cur_socket = *it++;
+	// 0.42e reviewed -- they use delete, but Destroy is safer. Not Safe_Delete: that only MARKS
+	// for deletion, and we need to delete it.
+	for (SocketSet::iterator it = socket_list.begin(); it != socket_list.end();) {
+		CClientTCPSocket *cur_socket = *it++;
 		if (cur_socket->GetClient()) {
 			cur_socket->Safe_Delete_Client();
 		} else {
@@ -188,48 +185,48 @@
 
 bool CListenSocket::TooManySockets(bool bIgnoreInterval)
 {
-	if (GetOpenSockets() > thePrefs::GetMaxConnections()
-		|| (!bIgnoreInterval && m_OpenSocketsInterval > (thePrefs::GetMaxConperFive() * GetMaxConperFiveModifier()))) {
+	if (GetOpenSockets() > thePrefs::GetMaxConnections() ||
+		(!bIgnoreInterval && m_OpenSocketsInterval >
+					     (thePrefs::GetMaxConperFive() * GetMaxConperFiveModifier()))) {
 		return true;
 	} else {
 		return false;
 	}
 }
 
-bool CListenSocket::IsValidSocket(CClientTCPSocket* totest)
+bool CListenSocket::IsValidSocket(CClientTCPSocket *totest)
 {
 	// 0.42e
 	return socket_list.find(totest) != socket_list.end();
 }
 
-
 void CListenSocket::UpdateConnectionsStatus()
 {
 	// 0.42e xcept for the khaos stats
-	if( theApp->IsConnected() ) {
+	if (theApp->IsConnected()) {
 		totalconnectionchecks++;
 		float percent;
-		percent = (float)(totalconnectionchecks-1)/(float)totalconnectionchecks;
-		if( percent > .99f ) {
+		percent = (float)(totalconnectionchecks - 1) / (float)totalconnectionchecks;
+		if (percent > .99f) {
 			percent = .99f;
 		}
-		averageconnections = (averageconnections*percent) + (float)GetOpenSockets()*(1.0f-percent);
+		averageconnections =
+			(averageconnections * percent) + (float)GetOpenSockets() * (1.0f - percent);
 	}
 }
 
-
 float CListenSocket::GetMaxConperFiveModifier()
 {
 	float SpikeSize = GetOpenSockets() - averageconnections;
-	if ( SpikeSize < 1 ) {
+	if (SpikeSize < 1) {
 		return 1;
 	}
 
 	float SpikeTolerance = 2.5f * thePrefs::GetMaxConperFive();
-	if ( SpikeSize > SpikeTolerance ) {
+	if (SpikeSize > SpikeTolerance) {
 		return 0;
 	}
 
-	return 1.0f - (SpikeSize/SpikeTolerance);
+	return 1.0f - (SpikeSize / SpikeTolerance);
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ListenSocket.h -> amule-3.1.0.tar.gz/src/ListenSocket.h Changed

@@ -23,14 +23,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-//
 // Handling incoming connections (up or downloadrequests)
-//
 
 #ifndef LISTENSOCKET_H
 #define LISTENSOCKET_H
 
-#include "Proxy.h"		// Needed for CProxyData, CSocketServerProxy
+#include "Proxy.h" // Needed for CProxyData, CSocketServerProxy
 
 #include <set>
 
@@ -42,38 +40,36 @@
 public:
 	CListenSocket(amuleIPV4Address &addr, const CProxyData *ProxyData = NULL);
 	~CListenSocket();
-	void	OnAccept();
-	void	Process();
-	void	RemoveSocket(CClientTCPSocket* todel);
-	void	AddSocket(CClientTCPSocket* toadd);
-	uint32	GetOpenSockets()		{return socket_list.size();}
-	void	KillAllSockets();
-	bool	TooManySockets(bool bIgnoreInterval = false);
-	bool    IsValidSocket(CClientTCPSocket* totest);
-	void	AddConnection();
-	void	RecalculateStats();
-	void	UpdateConnectionsStatus();
+	void OnAccept();
+	void Process();
+	void RemoveSocket(CClientTCPSocket *todel);
+	void AddSocket(CClientTCPSocket *toadd);
+	uint32 GetOpenSockets() { return socket_list.size(); }
+	void KillAllSockets();
+	bool TooManySockets(bool bIgnoreInterval = false);
+	bool IsValidSocket(CClientTCPSocket *totest);
+	void AddConnection();
+	void RecalculateStats();
+	void UpdateConnectionsStatus();
 
-	float	GetMaxConperFiveModifier();
-	uint32	GetTotalConnectionChecks()	{ return totalconnectionchecks; }
-	float	GetAverageConnections()		{ return averageconnections; }
+	float GetMaxConperFiveModifier();
+	uint32 GetTotalConnectionChecks() { return totalconnectionchecks; }
+	float GetAverageConnections() { return averageconnections; }
 
-	bool	OnShutdown() { return shutdown;}
+	bool OnShutdown() { return shutdown; }
 
 private:
-
 	typedef std::set<CClientTCPSocket *> SocketSet;
 	SocketSet socket_list;
 
 	bool shutdown;
 	bool m_pending;
 
-	uint16	m_OpenSocketsInterval;
-	uint16	m_ConnectionStates3;
-	uint32	totalconnectionchecks;
-	float	averageconnections;
+	uint16 m_OpenSocketsInterval;
+	uint16 m_ConnectionStates3;
+	uint32 totalconnectionchecks;
+	float averageconnections;
 };
 
-
 #endif // LISTENSOCKET_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/Logger.cpp -> amule-3.1.0.tar.gz/src/Logger.cpp Changed

@@ -23,6 +23,8 @@
 //
 
 #include "Logger.h"
+
+#include <common/MuleDebug.h> // Needed for ReserveCrashFd
 #include "amule.h"
 #include "Preferences.h"
 #include <common/Macros.h>
@@ -33,67 +35,64 @@
 #include <wx/sstream.h>
 #include <wx/filename.h>
 
-
 wxDEFINE_EVENT(MULE_EVT_LOGLINE, wxEvent);
 
-CDebugCategory g_debugcats = {
-	CDebugCategory( logGeneral,		"General" ),
-	CDebugCategory( logHasher,		"Hasher" ),
-	CDebugCategory( logClient,		"ED2k Client" ),
-	CDebugCategory( logLocalClient,		"Local Client Protocol" ),
-	CDebugCategory( logRemoteClient,	"Remote Client Protocol" ),
-	CDebugCategory( logPacketErrors,	"Packet Parsing Errors" ),
-	CDebugCategory( logCFile,		"CFile" ),
-	CDebugCategory( logFileIO,		"FileIO" ),
-	CDebugCategory( logZLib,		"ZLib" ),
-	CDebugCategory( logAICHThread,		"AICH-Hasher" ),
-	CDebugCategory( logAICHTransfer,	"AICH-Transfer" ),
-	CDebugCategory( logAICHRecovery,	"AICH-Recovery" ),
-	CDebugCategory( logListenSocket,	"ListenSocket" ),
-	CDebugCategory( logCredits,		"Credits" ),
-	CDebugCategory( logClientUDP,		"ClientUDPSocket" ),
-	CDebugCategory( logDownloadQueue,	"DownloadQueue" ),
-	CDebugCategory( logIPFilter,		"IPFilter" ),
-	CDebugCategory( logKnownFiles,		"KnownFileList" ),
-	CDebugCategory( logPartFile,		"PartFiles" ),
-	CDebugCategory( logSHAHashSet,		"SHAHashSet" ),
-	CDebugCategory( logServer,		"Servers" ),
-	CDebugCategory( logProxy,		"Proxy" ),
-	CDebugCategory( logSearch,		"Searching" ),
-	CDebugCategory( logServerUDP,		"ServerUDP" ),
-	CDebugCategory( logClientKadUDP,	"Client Kademlia UDP" ),
-	CDebugCategory( logKadSearch,		"Kademlia Search" ),
-	CDebugCategory( logKadRouting,		"Kademlia Routing" ),
-	CDebugCategory( logKadIndex,		"Kademlia Indexing" ),
-	CDebugCategory( logKadMain,		"Kademlia Main Thread" ),
-	CDebugCategory( logKadPrefs,		"Kademlia Preferences" ),
-	CDebugCategory( logPfConvert,		"PartFileConvert" ),
-	CDebugCategory( logMuleUDP,		"MuleUDPSocket" ),
-	CDebugCategory( logThreads,		"ThreadScheduler" ),
-	CDebugCategory( logUPnP,		"Universal Plug and Play" ),
-	CDebugCategory( logKadUdpFwTester,	"Kademlia UDP Firewall Tester" ),
-	CDebugCategory( logKadPacketTracking,	"Kademlia Packet Tracking" ),
-	CDebugCategory( logKadEntryTracking,	"Kademlia Entry Tracking" ),
-	CDebugCategory( logEC,			"External Connect" ),
-	CDebugCategory( logHTTP,		"HTTP" ),
-	CDebugCategory( logAsio,		"Asio Sockets" )
-};
-
+CDebugCategory g_debugcats = { CDebugCategory(logGeneral, "General"),
+	CDebugCategory(logHasher, "Hasher"),
+	CDebugCategory(logClient, "ED2k Client"),
+	CDebugCategory(logLocalClient, "Local Client Protocol"),
+	CDebugCategory(logRemoteClient, "Remote Client Protocol"),
+	CDebugCategory(logPacketErrors, "Packet Parsing Errors"),
+	CDebugCategory(logCFile, "CFile"),
+	CDebugCategory(logFileIO, "FileIO"),
+	CDebugCategory(logZLib, "ZLib"),
+	CDebugCategory(logAICHThread, "AICH-Hasher"),
+	CDebugCategory(logAICHTransfer, "AICH-Transfer"),
+	CDebugCategory(logAICHRecovery, "AICH-Recovery"),
+	CDebugCategory(logListenSocket, "ListenSocket"),
+	CDebugCategory(logCredits, "Credits"),
+	CDebugCategory(logClientUDP, "ClientUDPSocket"),
+	CDebugCategory(logDownloadQueue, "DownloadQueue"),
+	CDebugCategory(logIPFilter, "IPFilter"),
+	CDebugCategory(logKnownFiles, "KnownFileList"),
+	CDebugCategory(logPartFile, "PartFiles"),
+	CDebugCategory(logSHAHashSet, "SHAHashSet"),
+	CDebugCategory(logServer, "Servers"),
+	CDebugCategory(logProxy, "Proxy"),
+	CDebugCategory(logSearch, "Searching"),
+	CDebugCategory(logServerUDP, "ServerUDP"),
+	CDebugCategory(logClientKadUDP, "Client Kademlia UDP"),
+	CDebugCategory(logKadSearch, "Kademlia Search"),
+	CDebugCategory(logKadRouting, "Kademlia Routing"),
+	CDebugCategory(logKadIndex, "Kademlia Indexing"),
+	CDebugCategory(logKadMain, "Kademlia Main Thread"),
+	CDebugCategory(logKadPrefs, "Kademlia Preferences"),
+	CDebugCategory(logPfConvert, "PartFileConvert"),
+	CDebugCategory(logMuleUDP, "MuleUDPSocket"),
+	CDebugCategory(logThreads, "ThreadScheduler"),
+	CDebugCategory(logUPnP, "Universal Plug and Play"),
+	CDebugCategory(logKadUdpFwTester, "Kademlia UDP Firewall Tester"),
+	CDebugCategory(logKadPacketTracking, "Kademlia Packet Tracking"),
+	CDebugCategory(logKadEntryTracking, "Kademlia Entry Tracking"),
+	CDebugCategory(logKadNodeTracking, "Kademlia Node Tracking"),
+	CDebugCategory(logEC, "External Connect"),
+	CDebugCategory(logHTTP, "HTTP"),
+	CDebugCategory(logAsio, "Asio Sockets"),
+	CDebugCategory(logMediaProbe, "Media Probe"),
+	CDebugCategory(logVerifyLocalData, "Verify Local Data") };
 
 const int categoryCount = itemsof(g_debugcats);
 
-
-
 #ifdef __DEBUG__
-bool CLogger::IsEnabled( DebugType type ) const
+bool CLogger::IsEnabled(DebugType type) const
 {
 	int index = (int)type;
 
-	if ( index >= 0 && index < categoryCount ) {
-		const CDebugCategory& cat = g_debugcats index ;
-		wxASSERT( type == cat.GetType() );
+	if (index >= 0 && index < categoryCount) {
+		const CDebugCategory &cat = g_debugcatsindex;
+		wxASSERT(type == cat.GetType());
 
-		return ( cat.IsEnabled() && thePrefs::GetVerbose() );
+		return (cat.IsEnabled() && thePrefs::GetVerbose());
 	}
 
 	wxFAIL;
@@ -101,30 +100,26 @@
 }
 #endif
 
-
-void CLogger::SetEnabled( DebugType type, bool enabled )
+void CLogger::SetEnabled(DebugType type, bool enabled)
 {
 	int index = (int)type;
 
-	if ( index >= 0 && index < categoryCount ) {
-		CDebugCategory& cat = g_debugcats index ;
-		wxASSERT( type == cat.GetType() );
+	if (index >= 0 && index < categoryCount) {
+		CDebugCategory &cat = g_debugcatsindex;
+		wxASSERT(type == cat.GetType());
 
-		cat.SetEnabled( enabled );
+		cat.SetEnabled(enabled);
 	} else {
 		wxFAIL;
 	}
 }
 
-
 void CLogger::SetVerbose(bool verbose)
 {
 	thePrefs::SetVerbose(verbose);
 }
 
-
-void CLogger::AddLogLine(
-	const wxString& DEBUG_ONLY(file),
+void CLogger::AddLogLine(const wxString &DEBUG_ONLY(file),
 	int DEBUG_ONLY(line),
 	bool critical,
 	DebugType type,
@@ -133,7 +128,7 @@
 	bool toGUI)
 {
 	wxString msg(str);
-// handle Debug messages
+	// handle Debug messages
 	if (type != logStandard) {
 		if (!critical && !IsEnabled(type)) {
 			return;
@@ -144,8 +139,8 @@
 		}
 		int index = (int)type;
 
-		if ( index >= 0 && index < categoryCount ) {
-			const CDebugCategory& cat = g_debugcats index ;
+		if (index >= 0 && index < categoryCount) {
+			const CDebugCategory &cat = g_debugcatsindex;
 			wxASSERT(type == cat.GetType());
 
 			msg = cat.GetName() + ": " + msg;
@@ -156,7 +151,8 @@
 
 #ifdef __DEBUG__
 	if (line) {
-		msg = file.AfterLast(wxFileName::GetPathSeparator()).AfterLast('/') << "(" << line << "): " + msg;
+		msg = file.AfterLast(wxFileName::GetPathSeparator()).AfterLast('/')
+		      << "(" << line << "): " + msg;
 	}
 #endif
 
@@ -170,50 +166,44 @@
 	}
 }
 
-
 void CLogger::AddLogLine(
-	const wxString &file,
-	int line,
-	bool critical,
-	DebugType type,
-	const std::ostringstream &msg)
+	const wxString &file, int line, bool critical, DebugType type, const std::ostringstream &msg)
 {
 	AddLogLine(file, line, critical, type, wxString(char2unicode(msg.str().c_str())));
 }
 
-
-const CDebugCategory& CLogger::GetDebugCategory( int index )
+const CDebugCategory &CLogger::GetDebugCategory(int index)
 {
-	// wxCHECK rather than wxASSERT so a release build returns a safe
-	// fallback on out-of-range instead of reading past the array; the
-	// debug-build behaviour (assert + abort) is unchanged.
-	wxCHECK_MSG( index >= 0 && index < categoryCount, g_debugcats0,
-		"CLogger::GetDebugCategory: index out of range" );
+	// wxCHECK rather than wxASSERT so a release build returns a safe fallback on out-of-range
+	// instead of reading past the array; the debug-build assert + abort is unchanged.
+	wxCHECK_MSG(index >= 0 && index < categoryCount,
+		g_debugcats0,
+		"CLogger::GetDebugCategory: index out of range");
 
-	return g_debugcats index ;
+	return g_debugcatsindex;
 }
 
-
 unsigned int CLogger::GetDebugCategoryCount()
 {
 	return categoryCount;
 }
 
-
-bool CLogger::OpenLogfile(const wxString & name)
+bool CLogger::OpenLogfile(const wxString &name)
 {
 	applog = new wxFFileOutputStream(name);
 	bool ret = applog->Ok();
 	if (ret) {
 		FlushApplog();
 		m_LogfileName = name;
+		// A daemon's stderr is /dev/null, so the abort handler needs a real file to write to.
+		// Reserved rather than looked up on demand: it runs from a signal handler.
+		m_crashFd = ReserveCrashFd(m_crashFd, applog->GetFile()->fp());
 	} else {
 		CloseLogfile();
 	}
 	return ret;
 }
 
-
 void CLogger::CloseLogfile()
 {
 	delete applog;
@@ -221,84 +211,96 @@
 	m_LogfileName.Clear();
 }
 
-
-void CLogger::OnLoggingEvent(class CLoggingEvent& evt)
+void CLogger::OnLoggingEvent(class CLoggingEvent &evt)
 {
 	DoLines(evt.Message(), evt.IsCritical(), evt.ToStdout(), evt.ToGUI());
 }
 
-
-void CLogger::DoLines(const wxString & lines, bool critical, bool toStdout, bool toGUI)
+void CLogger::DoLines(const wxString &lines, bool critical, bool toStdout, bool toGUI)
 {
 	// Remove newspace at end
 	wxString bufferline = lines.Strip(wxString::trailing);
 
-	// Create the timestamp
 	wxString stamp = wxDateTime::Now().FormatISODate() + " " + wxDateTime::Now().FormatISOTime()
 #ifdef CLIENT_GUI
-					+ " (remote-GUI): ";
+			 + " (remote-GUI): ";
 #else
-					+ ": ";
+			 + ": ";
 #endif
 
 	// critical lines get a ! prepended, ordinary lines a blank
 	// logfile-only lines get a . to prevent transmission on EC
 	wxString prefix = !toGUI ? "." : (critical ? "!" : " ");
 
-	if ( bufferline.IsEmpty() ) {
+	if (bufferline.IsEmpty()) {
 		// If it's empty we just write a blank line with no timestamp.
 		DoLine(" \n", toStdout, toGUI);
 	} else {
 		// Split multi-line messages into individual lines
-		wxStringTokenizer tokens( bufferline, "\n" );
-		while ( tokens.HasMoreTokens() ) {
+		wxStringTokenizer tokens(bufferline, "\n");
+		while (tokens.HasMoreTokens()) {
 			wxString fullline = prefix + stamp + tokens.GetNextToken() + "\n";
 			DoLine(fullline, toStdout, toGUI);
 		}
 	}
 }
 
-
-void CLogger::DoLine(const wxString & line, bool toStdout, bool GUI_ONLY(toGUI))
+void CLogger::DoLine(const wxString &line, bool toStdout, bool GUI_ONLY(toGUI))
 {
 	{
 		wxMutexLocker lock(m_lineLock);
 		++m_count;
 
-		// write to logfile
 		m_ApplogBuf += line;
 		FlushApplog();
 
-		// write to Stdout
 		if (m_StdoutLog || toStdout) {
-			// `utf8_str()` instead of `unicode2char()` so non-ASCII
-			// log content (filenames, server messages, etc.) survives
-			// in stdout regardless of the process locale. `unicode2char`
-			// uses `wxConvLibc`, which collapses non-ASCII to `?` /
-			// U+FFFD when running in the default `C` locale -- common
-			// in headless / containerized deployments where amuled is
-			// invoked without `LANG`/`LC_ALL` set and never calls
-			// `setlocale(LC_ALL, "")` itself (#40). The on-disk log
-			// path already uses `wxConvUTF8` via `FlushApplog`, so
-			// switching the stdout sink to `utf8_str()` makes the two
-			// sinks consistently UTF-8.
-			printf("%s", (const char*)line.utf8_str());
+			// `utf8_str()` instead of `unicode2char()`, so non-ASCII log content
+			// survives in stdout regardless of the process locale: `unicode2char` uses
+			// `wxConvLibc`, which collapses non-ASCII to `?` in the default `C` locale
+			// -- common in headless deployments where amuled runs without LANG or
+			// LC_ALL and never calls setlocale (#40). The on-disk log already writes
+			// UTF-8, so the two sinks now agree.
+			printf("%s", (const char *)line.utf8_str());
+			// stdout is block-buffered when it is not a TTY (pipe, file, Docker without -t).
+			fflush(stdout);
 		}
 	}
 #ifndef AMULE_DAEMON
-	// write to Listcontrol
 	if (toGUI) {
 		theApp->AddGuiLogLine(line);
 	}
 #endif
 }
 
-
 void CLogger::EmergencyLog(const wxString &message, bool closeLog)
 {
-	// Same UTF-8 sink as DoLine's stdout path (#40).
-	fprintf(stderr, "%s", (const char*)message.utf8_str());
-	m_ApplogBuf += message;
+	// Same UTF-8 sink as DoLine's stdout path (#40). Written verbatim: the console has no
+	// marker convention, and this is the copy most likely to survive whatever is going wrong.
+	fprintf(stderr, "%s", (const char *)message.utf8_str());
+
+	// The logfile copy needs the same one-character severity marker DoLine puts on every line.
+	// A remote GUI reads this log back over EC and strips one leading character per line
+	// unconditionally, so appending emergency output raw meant that strip ate a real character
+	// -- "Assertion failed" reaching the GUI as "ssertion failed". Marker "!", since this only
+	// ever carries critical output, and on each line rather than only the first.
+	//
+	// Done with an explicit pass rather than wxStringTokenizer: this text is crash and assert
+	// output, where the blank lines between the banners and the backtrace are deliberate
+	// structure and the tokenizer would eat them. One reserve and one append also keeps the
+	// work close to what it was, which matters on a path where the next instruction may never
+	// run.
+	wxString prefixed;
+	prefixed.reserve(message.length() + 16);
+	bool atLineStart = true;
+	for (const wxUniChar ch : message) {
+		if (atLineStart) {
+			prefixed += '!';
+		}
+		prefixed += ch;
+		atLineStart = (ch == '\n');
+	}
+	m_ApplogBuf += prefixed;
 	FlushApplog();
 	if (closeLog && applog) {
 		applog->Close();
@@ -306,7 +308,6 @@
 	}
 }
 
-
 void CLogger::FlushApplog()
 {
 	if (applog) { // Wait with output until logfile is actually opened
@@ -323,10 +324,7 @@
 	EVT_MULE_LOGGING(CLogger::OnLoggingEvent)
 wxEND_EVENT_TABLE()
 
-
-CLoggerTarget::CLoggerTarget()
-{
-}
+CLoggerTarget::CLoggerTarget() {}
 
 void CLoggerTarget::DoLogText(const wxString &msg)
 {
@@ -355,7 +353,6 @@
 	Reset();
 }
 
-
 void CLoggerAccess::Reset()
 {
 	delete m_logfile;
@@ -364,36 +361,31 @@
 	m_ready = false;
 }
 
-
 CLoggerAccess::~CLoggerAccess()
 {
 	delete m_buffer;
 	delete m_logfile;
 }
 
-
-//
-// read a line of text from the logfile if available
-// (can't believe there's no library function for this >:( )
-//
+// 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) {
-			// wxFFileInputStream wraps a stdio FILE* whose EOF flag is
-			// sticky: once GetC() returns wxEOF, subsequent reads keep
-			// returning wxEOF even when amuled has appended more lines
-			// to the logfile in the meantime. Re-seek to the current
-			// position; this calls fseek() which clears the FILE*'s
-			// EOF indicator and resets the wxInputStream error state,
-			// so the next poll picks up newly appended log lines.
-			// Without this, EC clients (amuleGUI, amuleweb) display
-			// the log content captured at connection time and never
-			// see anything emitted afterwards (#215).
+			// wxFFileInputStream wraps a stdio FILE* whose EOF flag is sticky: once
+			// GetC() returns wxEOF, later reads keep returning it even after amuled has
+			// appended more lines. The old fix re-seeked to the current position to
+			// clear it, but wx 3.3 short-circuits a seek to the current offset, so EOF
+			// is never cleared and EC clients stop seeing new lines after the batch
+			// captured at connect time. Reopening gives a stream with no EOF set, and
+			// seeking back resumes at the first newly appended byte.
 			wxFileOffset pos = m_logfile->TellI();
 			if (pos != wxInvalidOffset) {
-				m_logfile->SeekI(pos);
+				delete m_logfile;
+				m_logfile = new wxFFileInputStream(theLogger.GetLogfileName());
+				m_logfile->SeekI(pos, wxFromStart);
 			}
 			break;
 		}
@@ -415,8 +407,7 @@
 	return m_ready;
 }
 
-
-bool CLoggerAccess::GetString(wxString & s)
+bool CLoggerAccess::GetString(wxString &s)
 {
 	if (!HasString()) {
 		return false;

amule-3.0.1.tar.gz/src/Logger.h -> amule-3.1.0.tar.gz/src/Logger.h Changed

@@ -29,7 +29,6 @@
 #include <wx/event.h>
 #include <iosfwd>
 
-
 enum DebugType
 {
 	//! Standard warning, not debug
@@ -108,125 +107,87 @@
 	logKadPacketTracking,
 	//! Warnings/Errors related to Kad entry tracking.
 	logKadEntryTracking,
+	//! Kad node tracking: identity rotation, problematic nodes and bans.
+	logKadNodeTracking,
 	//! Full log of external connection packets
 	logEC,
 	//! Warnings/Errors related to HTTP traffic
 	logHTTP,
 	//! Warnings/Errors related to Boost Asio networking
-	logAsio
+	logAsio,
+	//! Media-metadata probing (ffprobe) subsystem.
+	logMediaProbe,
+	//! Warnings/Errors related to Verify Local Data subsystem
+	logVerifyLocalData
 	// IMPORTANT NOTE: when you add values to this enum, update the g_debugcats
 	// array in Logger.cpp!
 };
 
-
-
-/**
- * Container-class for the debugging categories.
- */
+/// Container class for the debugging categories.
 class CDebugCategory
 {
 public:
-	/**
-	 * Constructor.
-	 *
-	 * @param type The actual debug-category type.
-	 * @param name The user-readable 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		{ return m_enabled; }
-
-	/**
-	 * Enables/Disables the category.
-	 */
-	void SetEnabled( bool enabled )	{ m_enabled = enabled; }
-
-
-	/**
-	 * Returns the user-readable name.
-	 */
-	const wxString& GetName() const	{ return m_name; }
-
-	/**
-	 * Returns the actual type.
-	 */
-	DebugType GetType() const	{ return m_type; }
+	/// @param type The debug-category type.
+	/// @param name The user-readable name.
+	CDebugCategory(DebugType type, const wxString &name)
+	: m_name(name)
+	, m_type(type)
+	, m_enabled(false)
+	{
+	}
+
+	/// True if the category is enabled.
+	bool IsEnabled() const { return m_enabled; }
+
+	/// Enables or disables the category.
+	void SetEnabled(bool enabled) { m_enabled = enabled; }
+
+	/// The user-readable name.
+	const wxString &GetName() const { return m_name; }
+
+	/// The category type.
+	DebugType GetType() const { return m_type; }
 
 private:
 	//! The user-readable name.
-	wxString	m_name;
+	wxString m_name;
 	//! The actual type.
-	DebugType	m_type;
+	DebugType m_type;
 	//! Whenever or not the category is enabled.
-	bool		m_enabled;
+	bool m_enabled;
 };
 
-
-/**
- * Functions for logging operations.
- */
-class CLogger: public wxEvtHandler
+/// Functions for logging operations.
+class CLogger : public wxEvtHandler
 {
 public:
-	/**
-	 * Returns true if debug-messages should be generated for a specific category.
-	 */
+	/// True if debug messages should be generated for this category.
 #ifdef __DEBUG__
-	bool IsEnabled( DebugType ) const;
+	bool IsEnabled(DebugType) const;
 #else
-	bool IsEnabled( DebugType ) const	{ return false; }
+	bool IsEnabled(DebugType) const { return false; }
 #endif
 
-	/**
-	 * Enables or disables debug-messages for a specific category.
-	 */
-	void SetEnabled( DebugType type, bool enabled );
-
-	/**
-	 * Sets the global verbose-debug flag that gates IsEnabled() per category.
-	 *
-	 * The amuled / monolithic build stores this in thePrefs; the
-	 * console-binary build (amuleweb, amulecmd, etc.) maintains its own
-	 * static since it doesn't link CPreferences. ExternalConnector calls
-	 * this with the value of /eMule/VerboseDebug after loading amule.conf
-	 * and again after parsing the --verbose CLI flag so both paths drive
-	 * the same gate.
-	 */
+	/// Enables or disables debug messages for a category.
+	void SetEnabled(DebugType type, bool enabled);
+
+	/// Sets the global verbose-debug flag that gates IsEnabled() per category. The amuled /
+	/// monolithic build stores this in thePrefs; the console binaries (amuleweb, amulecmd) keep
+	/// their own static, not linking CPreferences. ExternalConnector calls this with
+	/// /eMule/VerboseDebug after loading amule.conf and again after parsing --verbose, so both
+	/// paths drive the same gate.
 	void SetVerbose(bool verbose);
 
-	/**
-	 * Returns true if logging to stdout is enabled
-	 */
-	bool IsEnabledStdoutLog() const		{ return m_StdoutLog; }
-
-	/**
-	 * Enables or disables logging to stdout.
-	 */
-	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
-	 * @param critical If true, then the message will be made visible directly to the user.
-	 * @param type The debug-category, the name of which will be prepended to the line.
-	 * @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.
-	 */
-	void AddLogLine(
-		const wxString &file,
+	/// True if logging to stdout is enabled.
+	bool IsEnabledStdoutLog() const { return m_StdoutLog; }
+
+	/// Enables or disables logging to stdout.
+	void SetEnabledStdoutLog(bool enabled) { m_StdoutLog = enabled; }
+
+	/// Logs @a str prefixed with the name of @a type (except for logStandard). @a critical
+	/// makes the message visible directly to the user. Thread-safe: from the main thread the
+	/// event is sent straight to the application, otherwise it is queued in the event loop.
+	void AddLogLine(const wxString &file,
 		int line,
 		bool critical,
 		DebugType type,
@@ -236,229 +197,212 @@
 
 	// for UPnP
 	void AddLogLine(
-		const wxString &file,
-		int line,
-		bool critical,
-		DebugType type,
-		const std::ostringstream &msg);
+		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);
+	void AddLogLine(const wxString &file, int line, bool critical, const std::ostringstream &msg);
 
-
-	/**
-	 * Emergency log for crashes.
-	 */
+	/// Emergency log for crashes.
 	void EmergencyLog(const wxString &message, bool closeLog = true);
 
-	/**
-	 * Returns a category specified by index.
-	 */
-	const CDebugCategory&	GetDebugCategory( int index );
+	/// The category at @a index.
+	const CDebugCategory &GetDebugCategory(int index);
 
-	/**
-	 * Returns the number of debug-categories.
-	 */
+	/// Number of debug categories.
 	unsigned int GetDebugCategoryCount();
 
-	/**
-	 * Open Logfile, true on success
-	 */
-	bool OpenLogfile(const wxString & name);
+	/// Opens the logfile; true on success.
+	bool OpenLogfile(const wxString &name);
 
-	/**
-	 * Close Logfile
-	 */
+	/// Closes the logfile.
 	void CloseLogfile();
 
-	/**
-	 * Get name of Logfile
-	 */
-	const wxString & GetLogfileName() const {
-		return m_LogfileName;
-	}
+	/// Name of the logfile.
+	const wxString &GetLogfileName() const { return m_LogfileName; }
+
+	/// Descriptor reserved for the crash path, or -1 before the first open. Survives a
+	/// close-and-reopen of the logfile; see ReserveCrashFd().
+	int CrashFd() const { return m_crashFd; }
 
-	/**
-	 * Event handler
-	 */
-	void OnLoggingEvent(class CLoggingEvent& evt);
+	/// Event handler.
+	void OnLoggingEvent(class CLoggingEvent &evt);
 
-	/**
-	 * Construct
-	 */
-	CLogger() {
+	CLogger()
+	{
 		applog = NULL;
 		m_StdoutLog = false;
 		m_count = 0;
 	}
 
 private:
-	class wxFFileOutputStream* applog;	// the logfile
+	class wxFFileOutputStream *applog; // the logfile
 	wxString m_LogfileName;
+	int m_crashFd = -1;
 	wxString m_ApplogBuf;
 	bool m_StdoutLog;
-	int  m_count;			// output line counter
+	int m_count; // output line counter
 	wxMutex m_lineLock;
 
-	/**
-	 * Write all waiting log info to the logfile
-	 */
+	/// Writes all waiting log info to the logfile.
 	void FlushApplog();
 
-	/**
-	 * Really output a single line
-	 */
-	void DoLine(const wxString & line, bool toStdout, bool toGUI);
+	/// Outputs a single line.
+	void DoLine(const wxString &line, bool toStdout, bool toGUI);
 
-	/**
-	 * Really output several lines
-	 */
-	void DoLines(const wxString & lines, bool critical, bool toStdout, bool toGUI);
+	/// Outputs several lines.
+	void DoLines(const wxString &lines, bool critical, bool toStdout, bool toGUI);
 
 	wxDECLARE_EVENT_TABLE();
 };
 
 extern CLogger theLogger;
 
-/**
- * This class forwards log-lines from wxWidgets to CLogger.
- */
+/// Forwards log lines from wxWidgets to CLogger.
 class CLoggerTarget : public wxLog
 {
 public:
 	CLoggerTarget();
 
-	/**
-	 * @see wxLog::DoLogText
-	 */
+	/// @see wxLog::DoLogText
 	void DoLogText(const wxString &msg);
 };
 
-
 wxDECLARE_EVENT(MULE_EVT_LOGLINE, wxEvent);
 
 /** This event is sent when a log-line is queued. */
 class CLoggingEvent : public wxEvent
 {
 public:
-	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())
+	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())
 	{
 	}
 
-	const wxString& Message() const {
-		return m_msg;
-	}
+	const wxString &Message() const { return m_msg; }
 
-	bool IsCritical() const {
-		return m_critical;
-	}
+	bool IsCritical() const { return m_critical; }
 
-	bool ToStdout() const {
-		return m_stdout;
-	}
+	bool ToStdout() const { return m_stdout; }
 
-	bool ToGUI() const {
-		return m_GUI;
-	}
+	bool ToGUI() const { return m_GUI; }
 
-	wxEvent* Clone() const {
-		return new CLoggingEvent(m_critical, m_stdout, m_GUI, m_msg);
-	}
+	wxEvent *Clone() const { return new CLoggingEvent(m_critical, m_stdout, m_GUI, m_msg); }
 
 private:
-	bool		m_critical;
-	bool		m_stdout;
-	bool		m_GUI;
-	wxString	m_msg;
+	bool m_critical;
+	bool m_stdout;
+	bool m_GUI;
+	wxString m_msg;
 };
 
-
-typedef void (wxEvtHandler::*MuleLogEventFunction)(CLoggingEvent&);
+typedef void (wxEvtHandler::*MuleLogEventFunction)(CLoggingEvent &);
 
 //! Event-handler for log-line events dispatched to GUI / stdout sinks.
 #define EVT_MULE_LOGGING(func) \
 	wx__DECLARE_EVT0(MULE_EVT_LOGLINE, wxEVENT_HANDLER_CAST(MuleLogEventFunction, func))
 
-
 // access the logfile for EC
 class CLoggerAccess
 {
 private:
-	class wxFFileInputStream * m_logfile;
-	class wxCharBuffer * m_buffer;
+	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)
-	//
+	// Reset (used when the logfile is cleared)
 	void Reset();
-	//
-	// get a String (if there is one)
-	//
-	bool GetString(wxString & s);
-	//
-	// is a String available ?
-	//
+	// get a string (if there is one)
+	bool GetString(wxString &s);
+	// is a string available?
 	bool HasString();
 };
 
+/**
+ * Marks a log string that is deliberately not wrapped in _().
+ *
+ * Both expand to the string unchanged, so neither reaches xgettext and neither costs anything at
+ * runtime; they exist so the reason is greppable and an untranslated literal is not mistaken for an
+ * oversight (issue #866).
+ *
+ * LOG_DIAGNOSTIC: an internal fault or trace whose value is being readable in a bug report someone
+ * pastes in. Translating it would make those reports harder to search.
+ *
+ * LOG_PRELOCALE: emitted before Localize_mule() has run, so no catalog is loaded and gettext would
+ * return the original text anyway. See the ordering note in CamuleApp::OnInit().
+ */
+#define LOG_DIAGNOSTIC(str) str
+#define LOG_PRELOCALE(str) str
 
 /**
- * These macros should be used when logging. The
- * AddLogLineM macro will simply call one of the
- * two CLogger::AddLogLine functions depending on
- * 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.
+ * Logging macros. AddLogLineM calls one of the two CLogger::AddLogLine overloads depending on
+ * parameters; AddDebugLogLine* logs only if the message is critical or the debug type is enabled in
+ * the preferences. AddLogLineMS also always prints to stdout.
  */
 #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)
-	#define AddDebugLogLineF(...) do {} while (false)
-	#define AddLogLineF(...) do {} while (false)
+#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)
+#define AddDebugLogLineF(...) \
+	do { \
+	} while (false)
+#define AddLogLineF(...) \
+	do { \
+	} while (false)
 #else
 // Macros for 'N'on critical logging
-	#ifdef __DEBUG__
-		#define AddDebugLogLineN(type, string) if (theLogger.IsEnabled(type)) theLogger.AddLogLine(__TFILE__, __LINE__, false, type, string)
-	#else
-		#define AddDebugLogLineN(type, string)	do {} while (false)
-	#endif
-	#define AddLogLineN(string) theLogger.AddLogLine(__TFILE__, __LINE__, false, logStandard, string)
-	#define AddLogLineNS(string) theLogger.AddLogLine(__TFILE__, __LINE__, false, logStandard, string, true)
+#ifdef __DEBUG__
+#define AddDebugLogLineN(type, string) \
+	if (theLogger.IsEnabled(type)) \
+	theLogger.AddLogLine(__TFILE__, __LINE__, false, type, string)
+#else
+#define AddDebugLogLineN(type, string) \
+	do { \
+	} while (false)
+#endif
+#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)
+#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
-	#ifdef __DEBUG__
-		#define AddDebugLogLineF(type, string) if (theLogger.IsEnabled(type)) theLogger.AddLogLine(__TFILE__, __LINE__, false, type, string, false, false)
-	#else
-		#define AddDebugLogLineF(type, string)	do {} while (false)
-	#endif
-	#define AddLogLineF(string) theLogger.AddLogLine(__TFILE__, __LINE__, false, logStandard, string, false, false)
+#ifdef __DEBUG__
+#define AddDebugLogLineF(type, string) \
+	if (theLogger.IsEnabled(type)) \
+	theLogger.AddLogLine(__TFILE__, __LINE__, false, type, string, false, false)
+#else
+#define AddDebugLogLineF(type, string) \
+	do { \
+	} while (false)
+#endif
+#define AddLogLineF(string) \
+	theLogger.AddLogLine(__TFILE__, __LINE__, false, logStandard, string, false, false)
 #endif
 
 #endif

amule-3.0.1.tar.gz/src/LoggerConsole.cpp -> amule-3.1.0.tar.gz/src/LoggerConsole.cpp Changed

@@ -23,20 +23,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include <sstream>
-#include <common/StringFunctions.h>	// for char2unicode()
+#include <common/StringFunctions.h> // for char2unicode()
 
-#include "Logger.h"				// for Add(Debug)LogLineM()
+#include "Logger.h" // for Add(Debug)LogLineM()
 
 wxDEFINE_EVENT(MULE_EVT_LOGLINE, wxEvent);
 
 #ifdef __DEBUG__
 
-// Console-binary verbose-debug gate. Driven by /eMule/VerboseDebug from
-// amule.conf (read by CaMuleExternalConnector::LoadAmuleConfig) and the
-// --verbose CLI flag, both of which call CLogger::SetVerbose below.
-// Default off, matching amuled's behaviour when VerboseDebug is unset.
+// Console-binary verbose-debug gate. Driven by /eMule/VerboseDebug from amule.conf (read by
+// CaMuleExternalConnector::LoadAmuleConfig) and by the --verbose CLI flag, both of which call
+// CLogger::SetVerbose below. Default off, matching amuled when VerboseDebug is unset.
 static bool s_consoleVerbose = false;
 
 bool CLogger::IsEnabled(DebugType /*type*/) const
@@ -47,12 +45,14 @@
 // Dummy functions for EC logging
 #include "ec/cpp/ECLog.h"
 
-bool ECLogIsEnabled() { return false; }
+bool ECLogIsEnabled()
+{
+	return false;
+}
 void DoECLogLine(const wxString &) {}
 
 #endif /* __DEBUG__ */
 
-
 void CLogger::SetVerbose(bool verbose)
 {
 #ifdef __DEBUG__
@@ -62,19 +62,12 @@
 #endif
 }
 
-
-void CLogger::AddLogLine(
-	const wxString &file,
-	int line,
-	bool critical,
-	const std::ostringstream &msg)
+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,
+void CLogger::AddLogLine(const wxString &file,
 	int line,
 	bool critical,
 	DebugType /* type */,
@@ -88,24 +81,19 @@
 	}
 	printf("%s(%d): %s%s\n",
 		(const char *)unicode2char(file),
-		line, s.c_str(), (const char *)unicode2char(str));
+		line,
+		s.c_str(),
+		(const char *)unicode2char(str));
 }
 
-
 void CLogger::AddLogLine(
-	const wxString &file,
-	int line,
-	bool critical,
-	DebugType /*type*/,
-	const std::ostringstream &msg)
+	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());
+	printf("%s(%d): %s%s\n", (const char *)unicode2char(file), line, s.c_str(), msg.str().c_str());
 }
 
 CLogger theLogger;

amule-3.0.1.tar.gz/src/MD4Hash.h -> amule-3.1.0.tar.gz/src/MD4Hash.h Changed

@@ -25,10 +25,9 @@
 #ifndef CMD4HASH_H
 #define CMD4HASH_H
 
+#include "ArchSpecific.h" // Needed for Raw{Peek,Poke}UInt64()
 
-#include "ArchSpecific.h"	// Needed for Raw{Peek,Poke}UInt64()
-
-#include <common/MuleDebug.h>		// Needed for MULE_VALIDATE_PARAMS
+#include <common/MuleDebug.h> // Needed for MULE_VALIDATE_PARAMS
 
 #ifdef USE_WX_EXTENSIONS
 #include <common/StringFunctions.h>
@@ -36,78 +35,52 @@
 
 #include <string>
 
-
 const size_t MD4HASH_LENGTH = 16;
 
-
 /**
- * Container-class for the MD4 hashes used in aMule.
+ * Container class for the MD4 hashes used in aMule.
  *
- * This is a safe representation of the MD4 hashes used in aMule. By transparently
- * wrapping the char array used to store the hash, we get the advantages of
- * assignment, equality and non-equality operators, plus other nifty features.
- *
- * Please remember that the hashes are arrays with length 16 WITHOUT a zero-terminator!
+ * Transparently wraps the char array the hash is stored in, so assignment, equality and other
+ * operators come for free. The hashes are arrays of length 16 WITHOUT a zero terminator.
  */
 class CMD4Hash
 {
 public:
 	/**
-	 * Default constructor.
-	 *
-	 * The default constructor creates an empty hash of length 16.
-	 * Each field of the char array has an initial value of zero.
+	 * Creates an empty hash of length 16, every field zero.
 	 */
-	CMD4Hash() {
-		Clear();
-	}
+	CMD4Hash() { Clear(); }
 
 	/**
-	 * Cast a unsigned char array to a CMD4Hash.
-	 *
-	 * @param hash The array to be cast.
-	 *
-	 * Please note that the array must either be a NULL pointer or be at least
-	 * 16 chars long, not including any possible zero-terminator!
+	 * Casts an unsigned char array to a CMD4Hash. @a hash must either be NULL or at least 16
+	 * chars long, not counting any zero terminator.
 	 */
-	explicit CMD4Hash(const unsigned char hash) {
-		SetHash(hash);
-	}
+	explicit CMD4Hash(const unsigned char hash) { SetHash(hash); }
 
 	/**
-	 * Equality operator.
-	 *
-	 * Returns true if all fields of both hashes are the same.
+	 * True if all fields of both hashes are the same.
 	 */
-	bool operator == (const CMD4Hash& other_hash) const {
-		return (
-			( RawPeekUInt64( m_hash      ) == RawPeekUInt64( other_hash.m_hash      ) ) &&
-			( RawPeekUInt64( m_hash + 8  ) == RawPeekUInt64( other_hash.m_hash + 8  ) )
-		);
+	bool operator==(const CMD4Hash &other_hash) const
+	{
+		return ((RawPeekUInt64(m_hash) == RawPeekUInt64(other_hash.m_hash)) &&
+			(RawPeekUInt64(m_hash + 8) == RawPeekUInt64(other_hash.m_hash + 8)));
 	}
 
 	/**
-	 * Non-equality operator
-	 *
-	 * Returns true if there is any difference between the two hashes.
+	 * True if the two hashes differ in any field.
 	 */
-	bool operator != (const CMD4Hash& other_hash) const {
-		return !(*this == other_hash);
-	}
+	bool operator!=(const CMD4Hash &other_hash) const { return !(*this == other_hash); }
 
 	/**
-	 * Less than operator.
-	 *
-	 * @return True if the hash is less than other_hash, false otherwise.
-	 *
-	 * The purpose of this function is to enable the usage of CMD4Hashes in
-	 * sorted STL containers like std::map.
+	 * True if this hash sorts before @a other_hash, so CMD4Hashes can be used in sorted STL
+	 * containers like std::map.
 	 */
-	bool operator  < (const CMD4Hash& other_hash) const {
-		for ( size_t i = 0; i < MD4HASH_LENGTH; ++i ) {
-			if ( m_hashi < other_hash.m_hashi ) {
+	bool operator<(const CMD4Hash &other_hash) const
+	{
+		for (size_t i = 0; i < MD4HASH_LENGTH; ++i) {
+			if (m_hashi < other_hash.m_hashi) {
 				return true;
-			} else if ( other_hash.m_hashi < m_hashi ) {
+			} else if (other_hash.m_hashi < m_hashi) {
 				return false;
 			}
 		}
@@ -115,51 +88,32 @@
 		return false;
 	}
 
-
 	/**
-	 * Returns true if the hash is empty.
-	 *
-	 * @return True if all fields are zero, false otherwise.
-	 *
-	 * This functions checks the contents of the hash and returns true
-	 * only if each field of the array contains the value zero.
-	 * To achieve an empty hash, the function Clear() can be used.
+	 * True if every field of the hash is zero. Clear() produces such a hash.
 	 */
-	bool IsEmpty() const {
-		return (
-			!RawPeekUInt64( m_hash      ) &&
-			!RawPeekUInt64( m_hash + 8  )
-		);
-	}
+	bool IsEmpty() const { return (!RawPeekUInt64(m_hash) && !RawPeekUInt64(m_hash + 8)); }
 
 	/**
-	 * Resets the contents of the hash.
-	 *
-	 * This functions sets the value of each field of the hash to zero.
-	 * IsEmpty() will return true after a call to this function.
+	 * Sets every field of the hash to zero, so IsEmpty() then returns true.
 	 */
-	void Clear() {
-		RawPokeUInt64( m_hash,			0 );
-		RawPokeUInt64( m_hash + 8,		0 );
+	void Clear()
+	{
+		RawPokeUInt64(m_hash, 0);
+		RawPokeUInt64(m_hash + 8, 0);
 	}
 
-
 	/**
-	 * Decodes a 32 char long hexadecimal representation of a MD4 hash.
-	 *
-	 * @param hash The hash representation to be converted. Length must be 32.
-	 * @return Return value specifies if the hash was successfully decoded.
-	 *
-	 * This function converts a hexadecimal representation of a MD4
-	 * hash and stores it in the m_hash data-member.
+	 * Decodes a 32-char hexadecimal representation of an MD4 hash into m_hash. Returns whether
+	 * it decoded.
 	 */
 
-	bool Decode(const std::string& hash) {
+	bool Decode(const std::string &hash)
+	{
 		if (hash.length() != MD4HASH_LENGTH * 2) {
 			return false;
 		}
 
-		for ( size_t i = 0; i < MD4HASH_LENGTH * 2; i++ ) {
+		for (size_t i = 0; i < MD4HASH_LENGTH * 2; i++) {
 			unsigned char word = toupper(hashi);
 
 			if ((word >= '0') && (word <= '9')) {
@@ -172,103 +126,100 @@
 			}
 
 			if (i % 2 == 0) {
-				m_hashi/2 = word << 4;
+				m_hashi / 2 = word << 4;
 			} else {
-				m_hashi/2 += word;
+				m_hashi / 2 += word;
 			}
 		}
 
 		return true;
 	}
 
-	#ifdef USE_WX_EXTENSIONS
-	bool Decode(const wxString& hash) {
-		return Decode(std::string(unicode2char(hash)));
-	}
-	#endif
+#ifdef USE_WX_EXTENSIONS
+	bool Decode(const wxString &hash) { return Decode(std::string(unicode2char(hash))); }
+#endif
 
 	/**
-	 * Creates a 32 char long hexadecimal representation of a MD4 hash.
-	 *
-	 * @return Hexadecimal representation of the m_hash data-member.
-	 *
-	 * This function creates a hexadecimal representation of the MD4
-	 * hash stored in the m_hash data-member and returns it.
+	 * The 32-char hexadecimal representation of the hash in m_hash.
 	 */
-	std::string EncodeSTL() const {
+	std::string EncodeSTL() const
+	{
 		std::string Base16Buff;
 
-		for ( size_t i = 0; i < MD4HASH_LENGTH*2; i++ ) {
-			size_t x = ( i % 2 == 0 ) ? ( m_hashi/2 >> 4 ) : ( m_hashi/2 & 0xf );
+		for (size_t i = 0; i < MD4HASH_LENGTH * 2; i++) {
+			size_t x = (i % 2 == 0) ? (m_hashi / 2 >> 4) : (m_hashi / 2 & 0xf);
 
-			if ( x <  10 ) {
-				Base16Buff += (char)( x + '0' );
+			if (x < 10) {
+				Base16Buff += (char)(x + '0');
 			} else {
-				Base16Buff += (char)(  x + ( 'A' - 10 ));
+				Base16Buff += (char)(x + ('A' - 10));
 			}
 		}
 
 		return Base16Buff;
 	}
 
-	#ifdef USE_WX_EXTENSIONS
-	wxString Encode() const {
-		return char2unicode(EncodeSTL().c_str());
-	}
-	#endif
+#ifdef USE_WX_EXTENSIONS
+	wxString Encode() const { return char2unicode(EncodeSTL().c_str()); }
+#endif
 
 	/**
-	 * Explicitly set the hash-array to the contents of a unsigned char array.
-	 *
-	 * @param hash The array to be assigned.
-	 *
-	 * The hash must either be a NULL pointer or be of length 16.
+	 * Explicitly sets the hash array from @a hash, which must be NULL or of length 16.
 	 */
-	void SetHash(const unsigned char hash) {
-		if ( hash ) {
-			RawPokeUInt64( m_hash,		RawPeekUInt64( hash ) );
-			RawPokeUInt64( m_hash + 8,	RawPeekUInt64( hash + 8 ) );
+	void SetHash(const unsigned char hash)
+	{
+		if (hash) {
+			RawPokeUInt64(m_hash, RawPeekUInt64(hash));
+			RawPokeUInt64(m_hash + 8, RawPeekUInt64(hash + 8));
 		} else {
 			Clear();
 		}
 	}
 
 	/**
-	 * Explicit access to the hash-array.
-	 *
-	 * @return Pointer to the hash array.
+	 * Pointer to the hash array.
 	 */
-	unsigned char* GetHash() {
-		return m_hash;
-	}
-	const unsigned char* GetHash() const {
-		return m_hash;
-	}
+	unsigned char *GetHash() { return m_hash; }
+	const unsigned char *GetHash() const { return m_hash; }
 
 	/**
-	 * Explic access to values in the hash-array.
-	 *
-	 * @param i An index less than the length of an MD4 hash.
-	 * @return The value (or its reference) at the given index.
+	 * The value at index @a i of the hash array, or a reference to it.
 	 */
-	unsigned char operator(size_t i) const {
+	unsigned char operator(size_t i) const
+	{
 		MULE_VALIDATE_PARAMS(i < MD4HASH_LENGTH, "Invalid index in CMD4Hash::operator");
 		return m_hashi;
 	}
 
-	unsigned char& operator(size_t i) {
+	unsigned char &operator(size_t i)
+	{
 		MULE_VALIDATE_PARAMS(i < MD4HASH_LENGTH, "Invalid index in CMD4Hash::operator");
 		return m_hashi;
 	}
 
 private:
-	//! The raw MD4-hash.
-	//!
-	//! The raw representation of the MD4-hash. In most cases, you should
-	//! try to avoid direct access and instead use the member functions.
-	unsigned char m_hashMD4HASH_LENGTH;
+	//! The raw MD4 hash. In most cases prefer the member functions to direct access. Value-
+	//! initialised so the buffer is never read uninitialised even if a future ctor forgets to
+	//! set it; the analyzer also cannot see through the RawPokeUInt64 pokes in Clear()/SetHash,
+	//! so this keeps it quiet too.
+	unsigned char m_hashMD4HASH_LENGTH = {};
 };
 
+namespace std
+{
+//! Lets a hash key an unordered container, for the O(1) lookups a per-tick reconcile needs. MD4
+//! output is already uniformly distributed, so two of its words mixed make a better bucket index
+//! than anything computed over them.
+template <> struct hash<CMD4Hash>
+{
+	size_t operator()(const CMD4Hash &value) const noexcept
+	{
+		const size_t low = static_cast<size_t>(RawPeekUInt64(value.GetHash()));
+		const size_t high = static_cast<size_t>(RawPeekUInt64(value.GetHash() + 8));
+		return low ^ (high << 1);
+	}
+};
+} // namespace std
 
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/MacAppHelper.h -> amule-3.1.0.tar.gz/src/MacAppHelper.h Changed

@@ -18,13 +18,32 @@
 extern "C" {
 #endif
 
-// Toggles NSApp's activation policy. Passing true switches the app to
-// NSApplicationActivationPolicyAccessory (no Dock icon, menu-bar /
-// NSStatusItem only); false restores NSApplicationActivationPolicyRegular
-// (normal Dock icon). Used to remove the Dock thumbnail when the main
+// Toggles NSApp's activation policy. True switches the app to
+// NSApplicationActivationPolicyAccessory (no Dock icon, menu-bar / NSStatusItem only); false
+// restores NSApplicationActivationPolicyRegular. Used to remove the Dock thumbnail when the main
 // window is hidden via "minimize to tray".
 void mac_set_accessory_mode(bool accessory);
 
+// Drops the inset row style from the NSTableView (or NSOutlineView) backing the passed wxWindow
+// handle, restoring the flush one. macOS 11 made the inset style the default: it draws a selected
+// row as a rounded pill, and reserves padding at both ends of every row whether or not the row is
+// selected. The padding comes out of the cell the label is drawn in, so a list whose width is
+// derived from its longest label ellipsises that label however wide the column is made. Does
+// nothing if the handle is not backed by a table view, or below macOS 11.
+void mac_set_table_view_flush(void *windowHandle);
+
+// Returns the vertical centre of the tab buttons of the NSTabView backing the passed wxWindow
+// handle, in the coordinates of the tab view's superview (top-left origin, points). Negative if
+// the handle is not a tab view or it has no tab buttons.
+double mac_tab_view_buttons_mid_y(void *windowHandle);
+
+// Reveals `path` in Finder, selected in its containing folder.
+//
+// Goes through NSWorkspace rather than spawning `open -R`: LaunchServices does the work out of
+// process, so there is no subprocess to inherit anything from aMule, and the file ends up selected
+// rather than merely having its folder opened. False when the path is gone.
+bool mac_reveal_in_finder(const char *path);
+
 #ifdef __cplusplus
 }
 #endif

amule-3.0.1.tar.gz/src/MacAppHelper.mm -> amule-3.1.0.tar.gz/src/MacAppHelper.mm Changed

@@ -13,6 +13,54 @@
 
 #include "MacAppHelper.h"
 
+extern "C" void mac_set_table_view_flush(void *windowHandle)
+{
+	if (!windowHandle) {
+		return;
+	}
+
+	// wxOSX hands back whichever view it made the peer from: the scroll
+	// view for a scrolled control, the table itself otherwise.
+	NSView *view = (NSView *)windowHandle;
+	NSTableView *table = nil;
+	if (view isKindOfClass:NSScrollView class) {
+		NSView *doc = (NSScrollView *)view documentView;
+		if (doc isKindOfClass:NSTableView class) {
+			table = (NSTableView *)doc;
+		}
+	} else if (view isKindOfClass:NSTableView class) {
+		table = (NSTableView *)view;
+	}
+
+	if (!table) {
+		return;
+	}
+	if (@available(macOS 11.0, *)) {
+		table.style = NSTableViewStyleFullWidth;
+	}
+}
+
+extern "C" double mac_tab_view_buttons_mid_y(void *windowHandle)
+{
+	NSView *view = (NSView *)windowHandle;
+	if (!view isKindOfClass:NSTabView class || view.superview == nil) {
+		return -1;
+	}
+	NSTabView *tabView = (NSTabView *)view;
+	tabView layoutSubtreeIfNeeded;
+
+	// The buttons are a private segmented-control subview; its frame is the only public way to
+	// learn where AppKit placed them.
+	for (NSView *sub in tabView.subviews) {
+		if (sub isKindOfClass:NSSegmentedControl class) {
+			NSView *parent = tabView.superview;
+			NSRect r = sub convertRect:sub.bounds toView:parent;
+			return parent.isFlipped ? NSMidY(r) : NSHeight(parent.bounds) - NSMidY(r);
+		}
+	}
+	return -1;
+}
+
 extern "C" void mac_set_accessory_mode(bool accessory)
 {
 	NSApp setActivationPolicy:
@@ -20,11 +68,26 @@
 		          : NSApplicationActivationPolicyRegular;
 
 	if (!accessory) {
-		// Restoring from Accessory: switching policy gives us a
-		// Dock icon back but doesn't make the app active, so any
-		// subsequent Show(true)/Raise() lands behind whichever app
-		// currently holds focus. Activate explicitly so our window
-		// comes to the foreground.
+		// Restoring from Accessory: switching policy gives us a Dock icon back but does not
+		// make the app active, so any later Show(true)/Raise() lands behind whichever app
+		// currently holds focus. Activate explicitly so our window comes to the foreground.
 		NSApp activateIgnoringOtherApps:YES;
 	}
 }
+
+bool mac_reveal_in_finder(const char *path)
+{
+	if (path == nullptr) {
+		return false;
+	}
+	@autoreleasepool {
+		NSString *file = NSString stringWithUTF8String:path;
+		if (file == nil) {
+			return false;
+		}
+		// selectFile: with an empty root opens the enclosing folder and selects
+		// the file in it, which is the behaviour "Show in Finder" implies.
+		return NSWorkspace sharedWorkspace selectFile:file
+							inFileViewerRootedAtPath:@"" ? true : false;
+	}
+}

amule-3.0.1.tar.gz/src/MagnetURI.cpp -> amule-3.1.0.tar.gz/src/MagnetURI.cpp Changed

@@ -25,34 +25,36 @@
 
 #include "MagnetURI.h"
 
-
 #ifdef USE_STD_STRING
-#	ifdef _T
-#		undef	_T
-#	endif
-#	ifdef _C
-#		undef _C
-#	endif
-#	define	_T(str)	str
-#	define	_C(ch)	ch
+#ifdef _T
+#undef _T
+#endif
+#ifdef _C
+#undef _C
+#endif
+#define _T(str) str
+#define _C(ch) ch
 #else
-	// wx/chartype.h defines _T
-#	define	_C(ch)	wxChar(ch)
+// wx/chartype.h defines _T
+#define _C(ch) wxChar(ch)
 #endif
 
-
-CMagnetURI::CMagnetURI(const STRING& uri)
+CMagnetURI::CMagnetURI(const STRING &uri)
 {
 	if (uri.compare(0, 7, _T("magnet:")) == 0) {
 		size_t start = uri.find(_C('?'));
-		if (start == STRING::npos) start = uri.length();
+		if (start == STRING::npos)
+			start = uri.length();
 		while (start < uri.length() - 1) {
 			size_t end = uri.find(_C('&'), start + 1);
-			if (end == STRING::npos) end = uri.length();
+			if (end == STRING::npos)
+				end = uri.length();
 			size_t pos = uri.find(_C('='), start + 1);
-			if (pos == STRING::npos) pos = uri.length();
+			if (pos == STRING::npos)
+				pos = uri.length();
 			if (pos < end) {
-				m_fields.push_back(Field_Type(uri.substr(start + 1, pos - start - 1), uri.substr(pos + 1, end - pos - 1)));
+				m_fields.push_back(Field_Type(uri.substr(start + 1, pos - start - 1),
+					uri.substr(pos + 1, end - pos - 1)));
 			}
 			start = end;
 		}
@@ -76,7 +78,7 @@
 	return retval;
 }
 
-CMagnetURI::Value_List CMagnetURI::GetField(const STRING& name) const
+CMagnetURI::Value_List CMagnetURI::GetField(const STRING &name) const
 {
 	Value_List retval;
 
@@ -88,7 +90,6 @@
 	return retval;
 }
 
-
 bool CMagnetED2KConverter::CanConvertToED2K() const
 {
 	bool has_urn = false;
@@ -101,17 +102,41 @@
 		}
 		if (it->first.compare(_T("xt")) == 0) {
 			if ((it->second.compare(0, 9, _T("urn:ed2k:")) == 0) ||
-			    (it->second.compare(0, 13, _T("urn:ed2khash:")) == 0))
-			{
+				(it->second.compare(0, 13, _T("urn:ed2khash:")) == 0)) {
 				has_urn = true;
 				continue;
 			}
 		}
-		if (has_urn && has_xl) break;
+		if (has_urn && has_xl)
+			break;
 	}
 	return has_urn && has_xl;
 }
 
+namespace
+{
+
+// A base32-encoded AICH master hash is always 32 characters from A-Z2-7 (RFC 4648, no padding --
+// 20 raw bytes need exactly ceil(160/5) = 32 symbols). ED2KLink.cpp's parser throws on anything
+// else, so a magnet carrying a junk or truncated urn:aich: must have it dropped here rather than
+// embedded -- otherwise a perfectly valid ed2k hash would be rejected wholesale just because the
+// AICH tagalong was malformed. A plain char-range check, with no CAICHHash dependency, so it works
+// in both build modes.
+bool IsWellFormedAich(const STRING &s)
+{
+	if (s.length() != 32) {
+		return false;
+	}
+	for (size_t i = 0; i < s.length(); ++i) {
+		if (!((si >= _C('A') && si <= _C('Z')) || (si >= _C('2') && si <= _C('7')))) {
+			return false;
+		}
+	}
+	return true;
+}
+
+} // namespace
+
 STRING CMagnetED2KConverter::GetED2KLink() const
 {
 	if (CanConvertToED2K()) {
@@ -128,17 +153,30 @@
 			dn = _T("FileName.ext");
 		}
 		Value_List urn_list = GetField(_T("xt"));
-		// Use the first ed2k-hash found.
+		STRING aich;
+		// Use the first ed2k hash found, and separately the first AICH urn if the magnet
+		// carries one (amule-org/amule#331). Both loop over the same xt list, since either
+		// can come in any order relative to the other.
 		for (Value_List::iterator it = urn_list.begin(); it != urn_list.end(); ++it) {
-			if (it->compare(0, 9, _T("urn:ed2k:")) == 0) {
+			if (hash.empty() && it->compare(0, 9, _T("urn:ed2k:")) == 0) {
 				hash = it->substr(9);
-				break;
-			} else if (it->compare(0, 13, _T("urn:ed2khash:")) == 0) {
+			} else if (hash.empty() && it->compare(0, 13, _T("urn:ed2khash:")) == 0) {
 				hash = it->substr(13);
-				break;
+			} else if (aich.empty() && it->compare(0, 9, _T("urn:aich:")) == 0) {
+				aich = it->substr(9);
 			}
 		}
-		return STRING(_T("ed2k://|file|")).append(dn).append(1, _C('|')).append(len).append(1, _C('|')).append(hash).append(_T("|/"));
+		STRING link = STRING(_T("ed2k://|file|"))
+				      .append(dn)
+				      .append(1, _C('|'))
+				      .append(len)
+				      .append(1, _C('|'))
+				      .append(hash)
+				      .append(1, _C('|'));
+		if (IsWellFormedAich(aich)) {
+			link.append(_T("h=")).append(aich).append(1, _C('|'));
+		}
+		return link.append(_T("/"));
 	} else {
 		return STRING();
 	}

amule-3.0.1.tar.gz/src/MagnetURI.h -> amule-3.1.0.tar.gz/src/MagnetURI.h Changed

@@ -27,48 +27,52 @@
 #define MAGNETURI_H
 
 #ifdef USE_STD_STRING
-#	include <string>
-#	define STRING	std::string
+#include <string>
+#define STRING std::string
 #else
-#	include <wx/string.h>
-#	define STRING	wxString
+#include <wx/string.h>
+#define STRING wxString
 #endif
 
-#include <list>		// Needed for std::list
-#include <utility>	// Needed for std::pair
+#include <list>    // Needed for std::list
+#include <utility> // Needed for std::pair
 
 class CMagnetURI
 {
-      public:
-	typedef	std::list<STRING>	Value_List;
+public:
+	typedef std::list<STRING> Value_List;
 
 	CMagnetURI() {}
-	CMagnetURI(const STRING& uri);
+	CMagnetURI(const STRING &uri);
 
-	void		AddField(const STRING& name, const STRING& value)	{ m_fields.push_back(Field_Type(name, value)); }
-	Value_List	GetField(const STRING& name) const;
-	void		Clear()							{ m_fields.clear(); }
-	STRING		GetLink() const;
-	operator STRING() const							{ return GetLink(); }
+	void AddField(const STRING &name, const STRING &value)
+	{
+		m_fields.push_back(Field_Type(name, value));
+	}
+	Value_List GetField(const STRING &name) const;
+	void Clear() { m_fields.clear(); }
+	STRING GetLink() const;
+	operator STRING() const { return GetLink(); }
 
-      protected:
-	typedef std::pair<STRING, STRING>	Field_Type;
-	typedef std::list<Field_Type>		List_Type;
+protected:
+	typedef std::pair<STRING, STRING> Field_Type;
+	typedef std::list<Field_Type> List_Type;
 
-	List_Type	m_fields;
+	List_Type m_fields;
 };
 
 class CMagnetED2KConverter : private CMagnetURI
 {
-      public:
-	CMagnetED2KConverter(const STRING& uri)
-		: CMagnetURI(uri)
-		{}
+public:
+	CMagnetED2KConverter(const STRING &uri)
+	: CMagnetURI(uri)
+	{
+	}
 
-	bool	CanConvertToED2K() const;
-	STRING	GetED2KLink() const;
+	bool CanConvertToED2K() const;
+	STRING GetED2KLink() const;
 
-	operator STRING() const		{ return GetED2KLink(); }
+	operator STRING() const { return GetED2KLink(); }
 };
 
 #endif /* MAGNETURI_H */

amule-3.1.0.tar.gz/src/MediaProbe.cpp Added

@@ -0,0 +1,853 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "MediaProbe.h"
+
+#include <map>
+#include <cmath>
+#include <cstdlib>
+#include <mutex>
+#include <string>
+#include <vector>
+
+#include <wx/arrstr.h>
+#include <wx/ffile.h>
+#include <wx/filename.h>
+#include <wx/stdpaths.h>
+#include <wx/stopwatch.h>
+#include <wx/tokenzr.h>
+#include <wx/utils.h> // Needed for wxMilliSleep / wxGetenv
+
+#include <common/Format.h>
+
+#include "AppImageEnv.h" // Needed for GetSanitizedExecEnv
+#include "Logger.h"
+#include "libs/common/Path.h"
+
+// Native child-process primitives for the bounded, killable probe runner. wxExecute/wxProcess async
+// bookkeeping is bound to the main-thread event loop (its SIGCHLD reaper fires
+// wxProcess::OnTerminate there), so polling it from the probe worker races that loop -- a use-
+// after-free. Managing ffprobe with native primitives keeps the whole lifecycle on this thread.
+#ifdef __WXMSW__
+#include <windows.h>
+#else
+#include <csignal>
+#include <fcntl.h>
+#include <spawn.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#ifdef __APPLE__
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#else
+extern char **environ;
+#endif
+#endif
+
+namespace MediaProbe
+{
+
+namespace
+{
+
+// Return values for RunBoundedFFProbe: a child exit code (>= 0), or one of:
+constexpr int kSpawnFailed = -1;    // couldn't launch the binary at all
+constexpr int kKilled = -2;         // overran timeoutMs, or keepRunning went false
+constexpr int kOutputTooLarge = -3; // reply exceeded the read budget; see the slurp
+
+// Spawn `exe argv...`, capturing stdout to a temp file, bounded by `timeoutMs` wall-clock. The wait
+// loop also polls `keepRunning`, so worker shutdown kills the child at once. Real argv, no shell,
+// so paths need no escaping. See the include-block note for why this bypasses wxExecute/wxProcess
+// entirely.
+int RunBoundedFFProbe(const wxString &exe,
+	const wxArrayString &argv,
+	unsigned timeoutMs,
+	const std::atomic<bool> &keepRunning,
+	wxArrayString &stdoutLines)
+{
+	const wxString tmpPath = wxFileName::CreateTempFileName(wxT("amule-mediaprobe"));
+	if (tmpPath.IsEmpty()) {
+		return kSpawnFailed;
+	}
+
+	int exitCode = kSpawnFailed;
+
+#ifdef __WXMSW__
+	SECURITY_ATTRIBUTES sa;
+	sa.nLength = sizeof(sa);
+	sa.bInheritHandle = TRUE;
+	sa.lpSecurityDescriptor = nullptr;
+	HANDLE hOut = ::CreateFileW(tmpPath.wc_str(),
+		GENERIC_WRITE,
+		FILE_SHARE_READ,
+		&sa,
+		CREATE_ALWAYS,
+		FILE_ATTRIBUTE_TEMPORARY,
+		nullptr);
+	if (hOut == INVALID_HANDLE_VALUE) {
+		wxRemoveFile(tmpPath);
+		return kSpawnFailed;
+	}
+
+	// Kill-on-close job so terminating it takes down the whole process tree, the Windows
+	// equivalent of the POSIX process-group kill. ffprobe.exe forks nothing, but a wrapper-
+	// style path would, and TerminateProcess would orphan it.
+	HANDLE hJob = ::CreateJobObjectW(nullptr, nullptr);
+	if (hJob != nullptr) {
+		JOBOBJECT_EXTENDED_LIMIT_INFORMATION jeli;
+		::ZeroMemory(&jeli, sizeof(jeli));
+		jeli.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
+		::SetInformationJobObject(hJob, JobObjectExtendedLimitInformation, &jeli, sizeof(jeli));
+	}
+
+	// Quote each token for the single command-line string CreateProcess wants.
+	wxString cmdLine = wxT("\"") + exe + wxT("\"");
+	for (const wxString &a : argv) {
+		cmdLine += wxT(" \"") + a + wxT("\"");
+	}
+	std::vector<wchar_t> cmdBuf(cmdLine.wc_str(), cmdLine.wc_str() + cmdLine.length() + 1);
+
+	STARTUPINFOW si;
+	::ZeroMemory(&si, sizeof(si));
+	si.cb = sizeof(si);
+	si.dwFlags = STARTF_USESTDHANDLES;
+	si.hStdInput = ::GetStdHandle(STD_INPUT_HANDLE);
+	si.hStdOutput = hOut;
+	si.hStdError = hOut;
+
+	PROCESS_INFORMATION pi;
+	::ZeroMemory(&pi, sizeof(pi));
+
+	// Start suspended so the child is in the job before it runs (and thus
+	// before it can spawn a grandchild that escapes the job), then resume.
+	const BOOL ok = ::CreateProcessW(nullptr,
+		cmdBuf.data(),
+		nullptr,
+		nullptr,
+		TRUE,
+		CREATE_NO_WINDOW | CREATE_SUSPENDED,
+		nullptr,
+		nullptr,
+		&si,
+		&pi);
+	::CloseHandle(hOut);
+	if (!ok) {
+		if (hJob != nullptr) {
+			::CloseHandle(hJob);
+		}
+		wxRemoveFile(tmpPath);
+		return kSpawnFailed;
+	}
+	if (hJob != nullptr) {
+		::AssignProcessToJobObject(hJob, pi.hProcess);
+	}
+	::ResumeThread(pi.hThread);
+
+	wxStopWatch sw;
+	for (;;) {
+		if (::WaitForSingleObject(pi.hProcess, 25) == WAIT_OBJECT_0) {
+			DWORD code = 0;
+			::GetExitCodeProcess(pi.hProcess, &code);
+			exitCode = static_cast<int>(code);
+			break;
+		}
+		if (!keepRunning || static_cast<unsigned>(sw.Time()) >= timeoutMs) {
+			// Kill the whole job (wrapper + real ffprobe); fall back to the bare
+			// process if the job could not be created.
+			if (hJob != nullptr) {
+				::TerminateJobObject(hJob, 1);
+			} else {
+				::TerminateProcess(pi.hProcess, 1);
+			}
+			::WaitForSingleObject(pi.hProcess, INFINITE);
+			exitCode = kKilled;
+			break;
+		}
+	}
+	::CloseHandle(pi.hProcess);
+	::CloseHandle(pi.hThread);
+	if (hJob != nullptr) {
+		::CloseHandle(hJob);
+	}
+#else
+	std::vector<std::string> storage;
+	storage.reserve(argv.GetCount() + 1);
+	storage.emplace_back(exe.fn_str());
+	for (const wxString &a : argv) {
+		storage.emplace_back(a.fn_str());
+	}
+	std::vector<char *> cargv;
+	cargv.reserve(storage.size() + 1);
+	for (std::string &s : storage) {
+		cargv.push_back(const_cast<char *>(s.c_str()));
+	}
+	cargv.push_back(nullptr);
+
+	// ffprobe is a host program, so it must not inherit the bundle's library paths: inside an
+	// AppImage our libraries are older than the host's and the loader rejects the mismatch
+	// (#1463). The wxExecute call sites strip them the same way.
+	wxExecuteEnv execEnv;
+	std::vector<std::string> envStorage;
+	std::vector<char *> cenvp;
+	char **envp = environ;
+	if (AppImageEnv::GetSanitizedExecEnv(execEnv)) {
+		envStorage.reserve(execEnv.env.size());
+		for (const auto &var : execEnv.env) {
+			envStorage.emplace_back((var.first + wxT("=") + var.second).fn_str());
+		}
+		cenvp.reserve(envStorage.size() + 1);
+		for (std::string &s : envStorage) {
+			cenvp.push_back(const_cast<char *>(s.c_str()));
+		}
+		cenvp.push_back(nullptr);
+		envp = cenvp.data();
+	}
+
+	const std::string tmpNative(tmpPath.fn_str());
+
+	posix_spawn_file_actions_t fa;
+	posix_spawn_file_actions_init(&fa);
+	// stdout -> temp file, stderr -> /dev/null (we parse stdout only).
+	posix_spawn_file_actions_addopen(
+		&fa, STDOUT_FILENO, tmpNative.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0600);
+	posix_spawn_file_actions_addopen(&fa, STDERR_FILENO, "/dev/null", O_WRONLY, 0);
+
+	// Own process group so a kill takes out the whole tree: ffprobe forks nothing, but a
+	// wrapper-style path (snap's /snap/bin/ffprobe, a flatpak-run shim) is a shell that execs
+	// the real binary as a child. setpgroup(0) makes the child a group leader, and the kill
+	// path below signals -pid.
+	posix_spawnattr_t attr;
+	posix_spawnattr_init(&attr);
+	posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETPGROUP);
+	posix_spawnattr_setpgroup(&attr, 0);
+
+	pid_t pid = 0;
+	const int rc = posix_spawnp(&pid, cargv0, &fa, &attr, cargv.data(), envp);
+	posix_spawnattr_destroy(&attr);
+	posix_spawn_file_actions_destroy(&fa);
+	if (rc != 0) {
+		wxRemoveFile(tmpPath);
+		return kSpawnFailed;
+	}
+
+	wxStopWatch sw;
+	for (;;) {
+		int status = 0;
+		const pid_t r = waitpid(pid, &status, WNOHANG);
+		if (r == pid) {
+			exitCode = WIFEXITED(status) ? WEXITSTATUS(status) : kKilled;
+			break;
+		}
+		if (r == -1) { // vanished / already reaped
+			exitCode = kKilled;
+			break;
+		}
+		if (!keepRunning || static_cast<unsigned>(sw.Time()) >= timeoutMs) {
+			kill(-pid, SIGKILL);      // whole group: wrapper + real ffprobe
+			waitpid(pid, &status, 0); // reap the leader; init reaps the rest
+			exitCode = kKilled;
+			break;
+		}
+		wxMilliSleep(25);
+	}
+#endif
+
+	// Slurp captured stdout. On a kill the file is partial or empty, but the caller treats
+	// kKilled as failure and never reads stdoutLines then.
+	//
+	// Bounded, because container tags are attacker-chosen text of arbitrary length: uncapped, a
+	// crafted 100 MB title is slurped whole into a wxString and copied again by the tokenizer
+	// and the unescaper before kMaxTagChars ever applies. A legitimate five-field reply is a
+	// few hundred bytes, and anything past the cap is treated as a failed probe rather than
+	// truncated.
+	const wxFileOffset kMaxProbeOutputBytes = 1024 * 1024;
+	if (exitCode >= 0) {
+		wxFFile f(tmpPath, wxT("rb"));
+		wxString content;
+		if (f.IsOpened() && f.Length() > kMaxProbeOutputBytes) {
+			AddDebugLogLineN(logMediaProbe,
+				CFormat(wxT("MediaProbe: ffprobe output too large (%lld bytes), ignoring")) %
+					static_cast<long long>(f.Length()));
+			// Its own sentinel, not kSpawnFailed: ffprobe ran fine, so
+			// reporting "failed (code -1)" would name the wrong thing.
+			exitCode = kOutputTooLarge;
+		} else if (f.IsOpened() && f.ReadAll(&content, wxConvUTF8)) {
+			wxStringTokenizer tok(content, wxT("\r\n"), wxTOKEN_STRTOK);
+			while (tok.HasMoreTokens()) {
+				stdoutLines.Add(tok.GetNextToken());
+			}
+		}
+	}
+	wxRemoveFile(tmpPath);
+	return exitCode;
+}
+
+} // anonymous namespace
+
+namespace
+{
+
+// Wall-clock bound for one `-version` invocation. A working ffprobe answers in milliseconds; one
+// that has not by now is wedged (a stale network mount, a wrapper blocked on a lock) and must not
+// hold up whoever asked.
+constexpr unsigned kDetectTimeoutMs = 3000;
+
+// True if `binary` runs cleanly enough to print its own -version output. Serves both as the "is
+// ffprobe on PATH" probe and as the "does this path work" one.
+//
+// Goes through RunBoundedFFProbe because that puts a deadline on a binary that never returns and is
+// callable off the main thread; wxExecute is neither (see the include-block note above). Bare
+// `ffprobe` still resolves through PATH: posix_spawnp and CreateProcess with a null application
+// name both search it.
+bool CanRun(const wxString &binary)
+{
+	// Detection is never cancelled part-way; only the timeout bounds it.
+	const std::atomic<bool> keepRunning{ true };
+	wxArrayString argv, out;
+	argv.Add(wxT("-version"));
+	return RunBoundedFFProbe(binary, argv, kDetectTimeoutMs, keepRunning, out) == 0;
+}
+
+// Well-known install locations, tried in order; one entry per install-manager, since we want the
+// first existing binary rather than every possible location. ARM64 Homebrew before Intel, matching
+// what a bare PATH lookup finds first.
+wxArrayString WellKnownPaths()
+{
+	wxArrayString paths;
+#if defined(__WXMAC__)
+	paths.Add(wxT("/opt/homebrew/bin/ffprobe"));
+	paths.Add(wxT("/usr/local/bin/ffprobe"));
+	paths.Add(wxT("/opt/local/bin/ffprobe")); // MacPorts
+#elif defined(__WXMSW__)
+	// WinGet's per-app dir carries the package version, so there is no leaf to hardcode --
+	// WinGet users are found by the `where.exe` PATH probe instead. Chocolatey and scoop have
+	// stable roots.
+	paths.Add(wxT("C:\\ffmpeg\\bin\\ffprobe.exe"));
+	paths.Add(wxT("C:\\ProgramData\\chocolatey\\bin\\ffprobe.exe"));
+	if (const wxChar *home = wxGetenv(wxT("USERPROFILE"))) {
+		paths.Add(wxString(home) + wxT("\\scoop\\apps\\ffmpeg\\current\\bin\\ffprobe.exe"));
+	}
+#else
+	// Snap and Flatpak users typically launch ffprobe out of their sandbox root; the snap case
+	// is covered explicitly, flatpak users point the preference at their wrapper manually.
+	paths.Add(wxT("/usr/bin/ffprobe"));
+	paths.Add(wxT("/usr/local/bin/ffprobe"));
+	paths.Add(wxT("/snap/bin/ffprobe"));
+#endif
+	return paths;
+}
+
+} // anonymous namespace
+
+wxString AutoDetectPath()
+{
+	// Fast path: bare `ffprobe` on PATH, which is what most Linux and BSD installs give for
+	// free. On macOS and Windows this often fails even when ffprobe IS installed, because GUI-
+	// launched processes get a minimal PATH (launchd's lacks /opt/homebrew; Windows GUI apps
+	// can miss choco/scoop).
+	if (CanRun(wxT("ffprobe"))) {
+		return wxT("ffprobe");
+	}
+
+	for (const wxString &candidate : WellKnownPaths()) {
+		if (wxFileName::FileExists(candidate) && CanRun(candidate)) {
+			return candidate;
+		}
+	}
+
+	return wxEmptyString;
+}
+
+wxString DetectedPath(bool redetect)
+{
+	// Detection describes the machine, not a user choice, so it is derived at runtime and never
+	// written to the config file. Memoised because it costs at least one subprocess and cannot
+	// change under a running daemon without someone installing ffmpeg -- which `redetect` is
+	// for.
+	//
+	// The lock is held across the detection itself so two callers cannot race two scans; worst
+	// case that is one subprocess spawn's worth of blocking.
+	static std::mutex mutex;
+	static bool done = false;
+	static wxString cached;
+
+	std::lock_guard<std::mutex> lock(mutex);
+	if (done && !redetect) {
+		return cached;
+	}
+	cached = AutoDetectPath();
+	done = true;
+
+	if (cached.IsEmpty()) {
+		// Not a debug line: the operator asked for metadata extraction and is getting none,
+		// and on a headless daemon this is the only place that can say why. Fires once per
+		// process -- the memo above guarantees it.
+		AddLogLineN(_("Media metadata: no ffprobe binary found. Install ffmpeg, or set the "
+			      "ffprobe path in preferences; length, bitrate and codec will not be "
+			      "extracted."));
+	} else {
+		AddDebugLogLineN(
+			logMediaProbe, CFormat(wxT("MediaProbe: auto-detected ffprobe at %s")) % cached);
+	}
+	return cached;
+}
+
+namespace
+{
+
+// ffprobe emits float durations with a locale-independent `.` separator, so a
+// plain strtod suffices -- no locale-sensitive wxString::ToDouble() here.
+bool ParseSeconds(const wxString &value, uint32 &out)
+{
+	if (value.IsEmpty()) {
+		return false;
+	}
+	// Named local: `value.utf8_str().data()` twice would be two separate temporaries, each dead
+	// at the end of its own full-expression, so the comparison below would read a freed pointer
+	// and compare it against one from a different object -- which happens to work only because
+	// the allocator hands back the same block.
+	const wxScopedCharBuffer buf = value.utf8_str();
+	const char *const str = buf.data();
+	char *end = nullptr;
+	const double d = std::strtod(str, &end);
+	if (end == str || d < 0.0) {
+		return false;
+	}
+	// Cap at uint32 range (~136 years -- plenty).
+	if (d > static_cast<double>(0xFFFFFFFFu)) {
+		out = 0xFFFFFFFFu;
+	} else {
+		// Sub-second precision has no consumer in the FT_MEDIA_LENGTH tag.
+		out = static_cast<uint32>(std::llround(d));
+	}
+	return true;
+}
+
+// ffprobe emits format.bit_rate as bits/second; the tag wire format
+// is kbps.
+bool ParseBitrateKbps(const wxString &value, uint32 &out)
+{
+	if (value.IsEmpty() || value == wxT("N/A")) {
+		return false;
+	}
+	// Named local, for the reason given in ParseSeconds above.
+	const wxScopedCharBuffer buf = value.utf8_str();
+	const char *const str = buf.data();
+	char *end = nullptr;
+	const unsigned long long bps = std::strtoull(str, &end, 10);
+	if (end == str) {
+		return false;
+	}
+	const unsigned long long kbps = bps / 1000ULL;
+	if (kbps > 0xFFFFFFFFULL) {
+		out = 0xFFFFFFFFu;
+	} else {
+		out = static_cast<uint32>(kbps);
+	}
+	return true;
+}
+
+} // anonymous namespace
+
+const wxChar *ProbeEntries()
+{
+	// Per stream: codec_name and codec_type (so a video track's codec beats an audio one and
+	// subtitle/data streams never win), attached_pic, and its own artist/title/album. Per
+	// format: duration, bit_rate and the same three tags.
+	return wxT("format=duration,bit_rate"
+		   ":format_tags=artist,title,album"
+		   ":stream=codec_name,codec_type"
+		   ":stream_disposition=attached_pic"
+		   ":stream_tags=artist,title,album");
+}
+
+namespace
+{
+
+// One stream, accumulated from the `streams.stream.<n>.*` keys.
+struct ProbeStream
+{
+	wxString codec;
+	wxString type;
+	bool attached_pic = false;
+	wxString artist, album, title;
+};
+
+// Unwrap a `flat` value: quoted, with \n \r \\ and \" escaped. Anything
+// unquoted (ffprobe emits bare integers for dispositions) is returned as-is.
+wxString UnflattenValue(const wxString &raw)
+{
+	if (raw.length() < 2 || raw0 != wxT('"') || raw.Last() != wxT('"')) {
+		return raw;
+	}
+	const wxString body = raw.Mid(1, raw.length() - 2);
+	wxString out;
+	out.reserve(body.length());
+	for (size_t i = 0; i < body.length(); ++i) {
+		if (bodyi != wxT('\\') || i + 1 >= body.length()) {
+			out += bodyi;
+			continue;
+		}
+		switch (body++i.GetValue()) {
+		case wxT('n'):
+			out += wxT('\n');
+			break;
+		case wxT('r'):
+			out += wxT('\r');
+			break;
+		case wxT('\\'):
+			out += wxT('\\');
+			break;
+		case wxT('"'):
+			out += wxT('"');
+			break;
+		default:
+			// Not an escape ffprobe produces; keep both characters rather
+			// than silently eating the backslash.
+			out += wxT('\\');
+			out += bodyi;
+			break;
+		}
+	}
+	return out;
+}
+
+// Longest tag value we keep. Generous for a real artist/album/title; the point is to bound what a
+// crafted file can make this node store and publish, not to fit any real metadata. These values go
+// into known.met, into the log line, and into every offered-file packet sent to every server and
+// client.
+const size_t kMaxTagChars = 256;
+
+// Clean one tag value before it is allowed any further: bound the length and drop control
+// characters.
+//
+// The cap is what keeps oversized text out of known.met, out of the log line and off the wire;
+// without it the only bound anywhere was the wire format's 0xFFFF truncation, a packet-integrity
+// guard rather than a policy. How much is READ is bounded separately, at the slurp in
+// RunBoundedFFProbe.
+//
+// Control characters are dropped because the value reaches a log line (and through it GET
+// /api/v1/logs/amule) and several list controls, where a raw newline lets one field impersonate
+// several.
+wxString SanitiseTagValue(const wxString &value)
+{
+	wxString out;
+	out.reserve(value.length() < kMaxTagChars ? value.length() : kMaxTagChars);
+	for (const wxUniChar c : value) {
+		if (out.length() >= kMaxTagChars) {
+			break;
+		}
+		// Keep printable characters and ordinary spaces; drop C0/C1 controls
+		// and DEL. Non-ASCII is kept as-is -- these are UTF-8 tags.
+		const wxUint32 v = c.GetValue();
+		if (v == 0x09 || v == 0x20 || (v > 0x1F && v != 0x7F && !(v >= 0x80 && v <= 0x9F))) {
+			out += c;
+		}
+	}
+	out.Trim(true).Trim(false);
+	return out;
+}
+
+// ffprobe prints the container's own key case -- Matroska yields format.tags.ARTIST and
+// format.tags.ALBUM beside a lower-case format.tags.title, in one file -- while matching the
+// requested names case-insensitively. So the parser has to as well.
+void AssignTag(const wxString &key, const wxString &value, wxString &artist, wxString &album, wxString &title)
+{
+	const wxString lower = key.Lower();
+	// Sanitised here rather than at each call site: this is the one door every
+	// container tag comes through.
+	if (lower == wxT("artist")) {
+		artist = SanitiseTagValue(value);
+	} else if (lower == wxT("album")) {
+		album = SanitiseTagValue(value);
+	} else if (lower == wxT("title")) {
+		title = SanitiseTagValue(value);
+	}
+}
+
+} // namespace
+
+bool ParseProbeOutput(const wxArrayString &lines, MediaInfo &out)
+{
+	MediaInfo info;
+	bool got_duration = false;
+
+	// Keyed by the stream index ffprobe puts in the key, so ordering comes from the data rather
+	// than from the order lines happen to arrive in; the map also hands the streams back in
+	// index order for the selection below.
+	std::map<unsigned long, ProbeStream> streams;
+	wxString formatArtist, formatAlbum, formatTitle;
+
+	for (const wxString &line : lines) {
+		// Split on the first '=' only. Values are quoted and escaped by the
+		// `flat` writer, so a '=' inside one cannot end the key.
+		const int eq = line.Find(wxT('='));
+		if (eq == wxNOT_FOUND) {
+			continue;
+		}
+		const wxString key = line.Mid(0, eq);
+		const wxString value = UnflattenValue(line.Mid(eq + 1));
+
+		if (key.StartsWith(wxT("format."))) {
+			const wxString field = key.Mid(7);
+			if (field == wxT("duration")) {
+				// A parsed ZERO is not a duration; see the note below.
+				got_duration =
+					ParseSeconds(value, info.length_seconds) && info.length_seconds > 0;
+			} else if (field == wxT("bit_rate")) {
+				(void)ParseBitrateKbps(value, info.bitrate_kbps);
+			} else if (field.StartsWith(wxT("tags."))) {
+				AssignTag(field.Mid(5), value, formatArtist, formatAlbum, formatTitle);
+			}
+			continue;
+		}
+
+		if (!key.StartsWith(wxT("streams.stream."))) {
+			continue;
+		}
+		wxString rest = key.Mid(15);
+		const wxString indexText = rest.BeforeFirst(wxT('.'));
+		unsigned long index = 0;
+		if (indexText.IsEmpty() || !indexText.ToULong(&index)) {
+			continue;
+		}
+		const wxString field = rest.AfterFirst(wxT('.'));
+		ProbeStream &cur = streamsindex;
+		if (field == wxT("codec_name")) {
+			cur.codec = value;
+		} else if (field == wxT("codec_type")) {
+			cur.type = value;
+		} else if (field == wxT("disposition.attached_pic")) {
+			cur.attached_pic = (value == wxT("1"));
+		} else if (field.StartsWith(wxT("tags."))) {
+			AssignTag(field.Mid(5), value, cur.artist, cur.album, cur.title);
+		}
+	}
+
+	// First video track's codec, else the first audio track's. Subtitle and data
+	// streams never win, so we don't advertise "subrip" as a file's codec.
+	wxString videoCodec, audioCodec;
+	// Tags of the stream that supplied audioCodec: the fallback source for Ogg/Opus, where
+	// Vorbis comments belong to the logical stream and the format section carries nothing at
+	// all.
+	wxString streamArtist, streamAlbum, streamTitle;
+	// Real (non-artwork) audio streams; the fallback below requires exactly one.
+	unsigned audioStreamCount = 0;
+
+	for (const auto &entry : streams) {
+		const ProbeStream &st = entry.second;
+		// Cover art (ID3 APIC, FLAC PICTURE, MOV covr, Matroska image attachments) is
+		// reported as an ordinary video stream, and is the only non-content stream claiming
+		// codec_type=video. Without this an MP3 with artwork advertises "mjpeg" as the
+		// file's codec -- to every peer, since the tag goes out on the wire. FFmpeg's own
+		// "real video" selector is the same test.
+		if (st.attached_pic || st.codec.IsEmpty()) {
+			continue;
+		}
+		if (st.type == wxT("video")) {
+			if (videoCodec.IsEmpty()) {
+				videoCodec = st.codec;
+			}
+		} else if (st.type == wxT("audio")) {
+			++audioStreamCount;
+			if (audioCodec.IsEmpty()) {
+				audioCodec = st.codec;
+				streamArtist = st.artist;
+				streamAlbum = st.album;
+				streamTitle = st.title;
+			}
+		}
+	}
+
+	if (!videoCodec.IsEmpty()) {
+		info.codec = videoCodec;
+	} else if (!audioCodec.IsEmpty()) {
+		info.codec = audioCodec;
+	}
+
+	info.artist = formatArtist;
+	info.album = formatAlbum;
+	info.title = formatTitle;
+	// Stream tags are consulted only for a file with exactly one audio stream, no video and an
+	// Ogg-family codec, and only where the format section gave nothing. Vorbis comments belong
+	// to the single logical stream there, which is why the fallback exists at all. Anywhere
+	// else stream tags are track LABELS ("Deutsch", "Espanol"), and publishing one as the
+	// file's title sends it to every peer over ed2k and Kad; on a one-track file nothing
+	// structural tells a label from a title (a single .mka muxed with --track-name 0:Deutsch
+	// passes every other test here), so the scope is by codec rather than by "not a video". The
+	// other containers lose nothing: they report in the format section.
+	const bool streamTagCodec = (audioCodec == wxT("vorbis") || audioCodec == wxT("opus") ||
+				     audioCodec == wxT("flac") || audioCodec == wxT("speex"));
+	if (audioStreamCount == 1 && videoCodec.IsEmpty() && streamTagCodec) {
+		if (info.artist.IsEmpty()) {
+			info.artist = streamArtist;
+		}
+		if (info.album.IsEmpty()) {
+			info.album = streamAlbum;
+		}
+		if (info.title.IsEmpty()) {
+			info.title = streamTitle;
+		}
+	}
+
+	// A zero duration is not a duration (see the format.duration branch), so a container
+	// ffprobe can open and time as zero while reporting no codec would otherwise be a
+	// successful probe carrying an all-empty MediaInfo -- which the authoritative apply step
+	// treats as grounds to clear every media tag the file had.
+	if (!got_duration && info.codec.IsEmpty()) {
+		return false;
+	}
+	out = info;
+	return true;
+}
+
+ProbeOutcome Probe(const wxString &ffprobePath,
+	const CPath &file,
+	MediaInfo &out,
+	unsigned timeoutMs,
+	const std::atomic<bool> &keepRunning,
+	bool bulk,
+	bool logFailure)
+{
+	if (ffprobePath.IsEmpty()) {
+		return ProbeOutcome::Unavailable;
+	}
+
+	// A job is queued only once hashing has finished, but nothing re-checks between the queue
+	// and the worker picking the job up, and that gap widens whenever the probe queue backs up.
+	// One stat beats announcing a probe of a file deleted in the meantime and then forking on
+	// it purely to fail.
+	if (!file.FileExists()) {
+		// A share with stale known.met entries hits this on every refresh, so it
+		// has to say what happened: without a line it is indistinguishable from a
+		// file ffprobe rejected, while still consuming a naming-budget slot.
+		AddDebugLogLineN(logMediaProbe,
+			CFormat(wxT("MediaProbe: %s vanished before probing, skipping")) %
+				file.GetPrintable());
+		if (logFailure) {
+			AddLogLineN(CFormat(_("Media metadata: %s is gone, nothing to extract")) %
+				    file.GetPrintable());
+		}
+		return ProbeOutcome::Vanished;
+	}
+
+	// -show_entries constrains the output to what we care about; see
+	// ProbeEntries() for the field list.
+	//
+	// -of flat, and NOT the more readable `default` writer, because this request
+	// pulls attacker-controlled text into the output: a container tag is arbitrary
+	// UTF-8 and may contain newlines (Vorbis comments and Matroska tags allow them
+	// outright). `default` does not escape its values, so each embedded newline
+	// becomes another key=value line inside the tag's own section -- a title of
+	// "Song\nduration=99999999" injects a duration line after the real one, and
+	// this parser is last-write-wins. That forged value would be published as
+	// FT_MEDIA_LENGTH to every server and Kad node. A crafted line can move the
+	// section boundaries too.
+	//
+	// `flat` escapes \n, \r, \\ and " in values, and its dotted keys carry the
+	// section AND the stream index, so attribution comes from the key rather than
+	// from delimiter lines a value could also forge.
+	//
+	// -v error silences informational chatter.
+	wxArrayString argv;
+	argv.Add(wxT("-v"));
+	argv.Add(wxT("error"));
+	argv.Add(wxT("-show_entries"));
+	argv.Add(ProbeEntries());
+	argv.Add(wxT("-of"));
+	argv.Add(wxT("flat"));
+	argv.Add(file.GetRaw());
+
+	// Info level, not debug: media metadata is a feature the user explicitly
+	// enables and points at a binary, so it needs feedback that the binary worked
+	// and which file was probed. Emitted immediately before the spawn, so it fires
+	// once per ffprobe execution rather than once per queued job.
+	if (!bulk) {
+		AddLogLineN(CFormat(_("Extracting media metadata with ffprobe: %s")) % file.GetPrintable());
+	}
+
+	// Bounded + killable: this runs on the dedicated CMediaProbeThread, so a
+	// slow or hung ffprobe can only delay other probes, never completions, and
+	// cannot wedge the worker or the shutdown join.
+	wxArrayString stdout_lines;
+	const int rc = RunBoundedFFProbe(ffprobePath, argv, timeoutMs, keepRunning, stdout_lines);
+	// Failures are info level and are named even in bulk. They are rare, and now
+	// that a failed file is marked and not retried each one is reported once and
+	// then never again; a count with no filenames withholds the only thing the
+	// user needs to act on.
+	if (rc == kKilled) {
+		if (logFailure) {
+			AddLogLineN(CFormat(_("Media metadata: ffprobe timed out or was cancelled for %s")) %
+				    file.GetPrintable());
+		}
+		return ProbeOutcome::Cancelled;
+	}
+	if (rc == kOutputTooLarge) {
+		// ffprobe itself succeeded; what it produced was implausible for the five
+		// fields asked for, which means the file carries a tag crafted to be
+		// enormous. Named separately so this is not reported as a failure of the
+		// binary.
+		if (logFailure) {
+			AddLogLineN(CFormat(_("Media metadata: ignoring implausibly large ffprobe output "
+					      "for %s")) %
+				    file.GetPrintable());
+		}
+		return ProbeOutcome::OutputTooLarge;
+	}
+	// Distinguished from a non-zero exit on purpose: this one is about the binary
+	// rather than the file, so it must not be recorded against the file and needs
+	// a message that sends the user to their ffprobe setting.
+	if (rc == kSpawnFailed) {
+		if (logFailure) {
+			AddLogLineN(CFormat(_("Media metadata: could not run ffprobe (%s) -- check the "
+					      "media metadata settings")) %
+				    ffprobePath);
+		}
+		return ProbeOutcome::Unavailable;
+	}
+	if (rc != 0) {
+		if (logFailure) {
+			AddLogLineN(CFormat(_("Media metadata: ffprobe failed (code %d) for %s")) % rc %
+				    file.GetPrintable());
+		}
+		return ProbeOutcome::UnreadableFile;
+	}
+
+	MediaInfo info;
+	if (!ParseProbeOutput(stdout_lines, info)) {
+		// Neither a duration nor a codec came back, so there is nothing worth
+		// advertising -- report a failed probe rather than attaching empty tags.
+		// Named in the log because it is the most likely way a file fails (ffprobe
+		// exits 0), and the file is otherwise silently re-probed on every reload.
+		if (logFailure) {
+			AddLogLineN(CFormat(_("Media metadata: ffprobe found nothing usable in %s")) %
+				    file.GetPrintable());
+		}
+		return ProbeOutcome::NoUsableMetadata;
+	}
+
+	AddDebugLogLineN(logMediaProbe,
+		CFormat(wxT("MediaProbe: extracted %s -> length=%us bitrate=%ukbps codec=%s")) %
+			file.GetPrintable() % info.length_seconds % info.bitrate_kbps % info.codec);
+	out = info;
+	return ProbeOutcome::Extracted;
+}
+
+} // namespace MediaProbe

amule-3.1.0.tar.gz/src/MediaProbe.h Added

@@ -0,0 +1,154 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 MEDIAPROBE_H
+#define MEDIAPROBE_H
+
+#include <wx/arrstr.h> // Needed for wxArrayString
+#include <atomic>
+
+#include <wx/string.h>
+
+#include "Types.h"
+
+class CPath;
+
+// Media metadata extracted from a shared file, advertised alongside search results via
+// FT_MEDIA_LENGTH / _BITRATE / _CODEC on the CKnownFile. Populated by ffprobe; fields default to 0
+// or empty so downstream code can gate on nonzero-ness cheaply.
+struct MediaInfo
+{
+	// FT_MEDIA_LENGTH -- seconds, uint32 on the wire.
+	uint32 length_seconds = 0;
+	// FT_MEDIA_BITRATE -- kilobits per second, uint32 on the wire.
+	uint32 bitrate_kbps = 0;
+	// FT_MEDIA_CODEC -- free-form codec name as ffprobe reports it ("h264", "aac", "vorbis").
+	// Displayed as-is; FormatMediaCodec() maps a few common FOURCCs to friendlier UI labels.
+	wxString codec;
+	// FT_MEDIA_ARTIST / _ALBUM / _TITLE -- container tags, empty when the file carries none.
+	// Read from the format section, falling back to the stream's own tags only for an audio-
+	// only file; see ParseProbeOutput.
+	wxString artist;
+	wxString album;
+	wxString title;
+};
+
+namespace MediaProbe
+{
+
+// Parse ffprobe's output into a MediaInfo. Split out of Probe() so the parsing rules -- which carry
+// all the container-specific subtleties -- are testable without spawning a process or shipping
+// media fixtures. Returns false when nothing usable was parsed (neither a duration nor a codec),
+// which the caller reports as a failed probe so no empty tags are attached.
+bool ParseProbeOutput(const wxArrayString &lines, MediaInfo &out);
+
+// The `-show_entries` argument Probe() passes, exposed so a test feeds the parser output produced
+// by this exact request rather than a hand-written approximation of it.
+const wxChar *ProbeEntries();
+
+// Locate an ffprobe binary. Tries `ffprobe` on PATH first, via a quick `-version` invocation, then
+// a per-platform list of well-known install locations (Homebrew / MacPorts, scoop / chocolatey /
+// winget, distro bin paths). Empty when nothing was found.
+//
+// Runs synchronously and spawns at least one child process, each bounded by its own timeout. Cheap
+// in the ordinary cases, but still a subprocess walk, so prefer DetectedPath() below, which pays
+// for it once. Safe to call from any thread.
+wxString AutoDetectPath();
+
+// AutoDetectPath() memoised for the life of the process, and the entry point everything but the
+// detection itself should use.
+//
+// The result describes the machine rather than a user choice, so it is derived at runtime and never
+// persisted: an empty `ffprobe_path` preference means "ask this", not "feature off". `redetect`
+// forces a fresh scan and replaces the cache, for the Preferences "Detect" button.
+//
+// Logs the outcome exactly once: a visible line when nothing was found, the only notice a headless
+// operator gets that extraction is inert, and a debug line naming the binary when something was.
+// Safe to call from any thread.
+wxString DetectedPath(bool redetect = false);
+
+// Probe a single file. Returns true on success and populates `out`; false on any failure -- binary
+// missing, unreadable or non-media file, ffprobe hard error, malformed output. Failures emit a
+// debug line but never surface anything user-facing: a file the probe cannot read is still shared,
+// without media tags.
+//
+// The probe spawns ffprobe as a child and waits for it with a `timeoutMs` wall-clock bound, killing
+// it on expiry. `keepRunning` is polled during the wait, so worker shutdown kills the child at once
+// and the caller's join can complete. Both bounds mean a slow or hung ffprobe can never wedge the
+// worker.
+//
+// Callers MUST run this off the main thread: it blocks for the duration of the child, typically
+// 30-100 ms and at most `timeoutMs`.
+
+//! Why a probe produced no metadata. The distinction matters because one of these is a statement
+//! about the FILE and the rest about the environment: only the first justifies recording "this file
+//! cannot be probed" and skipping it on later scans. Marking on the others would let a mistyped
+//! ffprobe path, a spun-down disk or a shutdown mid-scan brand every file it touched as permanently
+//! unprobeable (issue #1116).
+enum class ProbeOutcome
+{
+	Extracted,        //!< usable metadata came back
+	NoUsableMetadata, //!< ffprobe ran and exited 0, and there was nothing in it
+	UnreadableFile,   //!< ffprobe ran and exited non-zero: it could not read this file
+	OutputTooLarge,   //!< ffprobe ran, but the file's tags are implausibly large
+	Unavailable,      //!< the binary could not be launched at all
+	Cancelled,        //!< timed out, or shutdown cancelled the drain
+	Vanished,         //!< the file was gone by the time the worker got to it
+};
+
+//! True for the outcomes that are a verdict on the file rather than on the
+//! machine it runs on, and so may be recorded against the file.
+inline bool IsFileVerdict(ProbeOutcome outcome)
+{
+	// UnreadableFile counts: a non-zero exit is how a WORKING ffprobe rejects a file it cannot
+	// parse, which is the ordinary broken-download case and the one users report as retried
+	// forever. A binary that cannot be launched is a different code path (kSpawnFailed), so a
+	// missing or mistyped path never arrives here.
+	//
+	// The gap: a non-zero exit cannot distinguish "ffprobe read this file and it is broken"
+	// from "ffprobe could not open it". FileExists() is a stat, so a file present but
+	// unreadable -- no read permission, or a network mount hiccupping -- reaches a perfectly
+	// good ffprobe, exits non-zero, and is recorded as unprobeable. An SMB or NFS share can
+	// lose a whole library's metadata to one bad moment that way.
+	//
+	// Separating the two means reading ffprobe's stderr, which currently goes to /dev/null.
+	// Until then a media refresh is the way back: it ignores the marks and clears them on
+	// success.
+	return outcome == ProbeOutcome::NoUsableMetadata || outcome == ProbeOutcome::UnreadableFile ||
+	       outcome == ProbeOutcome::OutputTooLarge;
+}
+
+//! \param bulk true when the caller is draining a batch of queued probes, in which case the per-
+//! file "extracting" announcement is suppressed and the caller reports one summary -- otherwise a
+//! large media library produces one line per file. A genuine single-file event still speaks.
+//! \param logFailure whether a failure may name its file. Failures are worth naming even in bulk,
+//! since a count alone is not actionable, but a broken ffprobe fails EVERY file, so the caller caps
+//! how many it names.
+ProbeOutcome Probe(const wxString &ffprobePath,
+	const CPath &file,
+	MediaInfo &out,
+	unsigned timeoutMs,
+	const std::atomic<bool> &keepRunning,
+	bool bulk = false,
+	bool logFailure = true);
+
+} // namespace MediaProbe
+
+#endif // MEDIAPROBE_H

amule-3.1.0.tar.gz/src/MediaProbeThread.cpp Added

@@ -0,0 +1,292 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "MediaProbeThread.h"
+
+#include <wx/app.h> // Needed for wxTheApp / wxQueueEvent
+
+#include "Logger.h"
+#include "MediaProbe.h"  // Needed for MediaProbe::Probe / MediaInfo
+#include "ThreadTasks.h" // Needed for CMediaProbeEvent
+
+namespace
+{
+// Wall-clock ceiling for a single ffprobe run. A local media file probes in tens of milliseconds;
+// anything approaching this is a hung invocation the worker kills rather than blocking on. It also
+// bounds how long a shutdown can wait on an in-flight probe.
+constexpr unsigned kProbeTimeoutMs = 30000;
+} // namespace
+
+CMediaProbeThread::CMediaProbeThread()
+: wxThread(wxTHREAD_JOINABLE)
+, m_condition(m_mutex)
+{
+	m_bRun = false;
+	m_bWorkPending = false;
+	wxMutexLocker lock(m_mutex);
+	if (Create() == wxTHREAD_NO_ERROR) {
+		Run();
+	}
+}
+
+void CMediaProbeThread::EndThread()
+{
+	{
+		wxMutexLocker lock(m_mutex);
+		m_bRun = false;
+		m_bWorkPending = true;
+		m_condition.Signal();
+	}
+	Wait();
+}
+
+void CMediaProbeThread::QueueProbe(
+	const CMD4Hash &hash, const CPath &fullPath, const wxString &ffprobePath, bool bulk)
+{
+	MediaProbeJob job;
+	job.hash = hash;
+	job.path = fullPath;
+	job.ffprobePath = ffprobePath;
+	job.bulk = bulk;
+
+	wxMutexLocker lock(m_mutex);
+	m_jobList.push_back(job);
+	m_bWorkPending = true;
+	m_condition.Signal();
+}
+
+void *CMediaProbeThread::Entry()
+{
+	m_bRun = true;
+	AddDebugLogLineN(logMediaProbe, wxT("Media probe thread: started"));
+
+	// Accumulated across the drains of one bulk operation; see the summary at
+	// the end of the loop for why they cannot be per-drain.
+	unsigned bulkProbed = 0;
+	unsigned bulkFailed = 0;
+	// Failures are named even in bulk, because a count alone cannot be acted on -- but a broken
+	// or mistyped ffprobe fails EVERY media file, so an uncapped rule turns one
+	// misconfiguration into one line per file. Name the first few of an operation and count the
+	// rest.
+	unsigned bulkNamed = 0;
+	unsigned bulkUnnamed = 0;
+	// Vanished files are counted apart from failures: the two get separate closing lines
+	// because "failed" is not true of a file that simply is not there any more.
+	unsigned bulkGoneUnnamed = 0;
+	static const unsigned kMaxNamedFailures = 10;
+
+	for (;;) {
+		std::list<MediaProbeJob> workList;
+		{
+			wxMutexLocker lock(m_mutex);
+			if (m_bRun && !m_bWorkPending) {
+				m_condition.WaitTimeout(500);
+			}
+			m_bWorkPending = false;
+			// On shutdown, drop any queued probes: metadata is best-effort, and unlike
+			// the hash thread there is no pending-count gate that anything waits on.
+			if (!m_bRun) {
+				break;
+			}
+			workList.swap(m_jobList);
+		}
+
+		// Bulk-ness rides on the job, set by whoever scheduled it. It used to be
+		// `workList.size() > 1`, which asked the wrong question: the worker swaps the whole
+		// pending list out as soon as it is signalled, so a batch's size reflects the
+		// timing of that wake and nothing else. During one share scan some drains hold a
+		// single job and some dozens, so which files printed a per-file line was decided by
+		// the scheduler (issue #1116).
+		unsigned probed = 0;
+		unsigned failed = 0;
+		bool anyBulk = false;
+
+		for (const MediaProbeJob &job : workList) {
+			// Shut down promptly rather than draining a long backlog.
+			if (!m_bRun) {
+				break;
+			}
+			// An empty path means the user never pinned one, so fall back to what this
+			// machine has. DetectedPath() memoises, so only the first job pays for the
+			// scan; when it finds nothing every job lands here and is dropped without a
+			// word, the one line explaining why having been logged by that first call.
+			const wxString exe =
+				job.ffprobePath.IsEmpty() ? MediaProbe::DetectedPath() : job.ffprobePath;
+			if (exe.IsEmpty()) {
+				continue;
+			}
+			// Part of a bulk operation either because it was scheduled that way, or
+			// because one is still draining: the tail of a share import arrives a file
+			// at a time, long after the walk that found it, and the scheduler can no
+			// longer tell those files from a single file dropped into a shared
+			// directory. The worker can, being still in the same operation. Without
+			// this a large first import ends with a handful of per-file lines for no
+			// reason the user can see.
+			const bool jobBulk = job.bulk || bulkProbed > 0;
+			const bool mayName = !jobBulk || bulkNamed < kMaxNamedFailures;
+			MediaInfo info;
+			const MediaProbe::ProbeOutcome outcome = MediaProbe::Probe(
+				exe, job.path, info, kProbeTimeoutMs, m_bRun, jobBulk, mayName);
+			// A file that was gone before ffprobe ran is not an extraction that failed
+			// -- nothing was extracted from and no verdict was reached -- so it is
+			// counted in neither total. It still names itself above. Counting it as a
+			// failure put a number in the summary that nothing in the log accounted
+			// for, on every refresh of a share with stale entries.
+			if (outcome == MediaProbe::ProbeOutcome::Vanished) {
+				// Before the `continue`: an operation made up ENTIRELY of vanished
+				// files still has to end. Without this anyBulk stays false,
+				// bulkProbed stays 0, the flush block below never runs and the
+				// naming budget is never reset -- so one refresh over a share whose
+				// files have moved would silence every failure for the rest of the
+				// process.
+				anyBulk = anyBulk || jobBulk;
+				if (jobBulk) {
+					if (mayName) {
+						++bulkNamed;
+					} else {
+						++bulkGoneUnnamed;
+					}
+				}
+				continue;
+			}
+			++probed;
+			if (outcome == MediaProbe::ProbeOutcome::Extracted) {
+				// Marshal the result to the main thread, which resolves the hash to
+				// the CKnownFile and attaches the FT_MEDIA_* tags; doing that here
+				// would race the publish paths that read m_taglist.
+				CMediaProbeEvent evt(job.hash, info);
+				wxQueueEvent(wxTheApp, evt.Clone());
+			} else {
+				++failed;
+				if (jobBulk) {
+					if (mayName) {
+						++bulkNamed;
+					} else {
+						++bulkUnnamed;
+					}
+				}
+				// Tell the main thread, so a file the probe has actually JUDGED can
+				// be marked unprobeable and stop being re-queued on every reload.
+				// Only a verdict about the file counts: a missing ffprobe, a
+				// timeout or a vanished file says nothing about it, and marking on
+				// those would let one mistyped path brand a whole library
+				// permanently.
+				MediaInfo empty;
+				CMediaProbeEvent evt(job.hash,
+					empty,
+					/*succeeded=*/false,
+					/*markUnprobeable=*/MediaProbe::IsFileVerdict(outcome));
+				wxQueueEvent(wxTheApp, evt.Clone());
+			}
+			anyBulk = anyBulk || jobBulk;
+		}
+
+		// One line for the whole OPERATION, not one per drain. The worker takes whatever is
+		// queued each time it wakes, so a single share scan is drained in several batches
+		// -- which used to produce several summaries ("from 7 files", "from 33 files",
+		// "from 42 files") for what the user experienced as one action (issue #1116). The
+		// counts accumulate across consecutive bulk drains and are reported once, when
+		// nothing is left queued.
+		if (anyBulk) {
+			bulkProbed += probed;
+			bulkFailed += failed;
+		}
+		bool queueEmpty;
+		{
+			wxMutexLocker lock(m_mutex);
+			queueEmpty = m_jobList.empty();
+		}
+		// An empty queue is NOT the end of the operation while files are still being
+		// hashed. A first import feeds this worker one file at a time -- hashing reads the
+		// whole file, a probe reads a header -- so the queue is empty after nearly every
+		// job, and flushing on that alone would print "Finished ... from 1 shared file"
+		// once per file. The same hashing queue that tells the scheduler this is a mass
+		// operation tells us it is not over yet; a reload has nothing hashing and flushes
+		// as soon as the probes drain.
+		//
+		// > 0, not > 1: while ANY file is still being hashed the import has more probes
+		// coming, and flushing on the last one leaves it outside the summary it belongs to.
+		// Costs at most one extra 500 ms wake.
+		const bool stillImporting = CThreadScheduler::GetPendingCount(wxT("Hashing")) > 0;
+		// bulkNamed / bulkGoneUnnamed in the guard, not just bulkProbed: an operation can
+		// consist only of vanished files and still has to reach the reset below. The
+		// summary itself is printed only when something was actually probed.
+		if (queueEmpty && !stillImporting &&
+			(bulkProbed > 0 || bulkNamed > 0 || bulkGoneUnnamed > 0)) {
+			if (bulkProbed > 0) {
+				if (bulkFailed > 0) {
+					AddLogLineN(
+						CFormat(wxPLURAL(
+							"Finished extracting media metadata from %u shared "
+							"file (%u failed)",
+							"Finished extracting media metadata from %u shared "
+							"files (%u failed)",
+							bulkProbed)) %
+						bulkProbed % bulkFailed);
+				} else {
+					AddLogLineN(
+						CFormat(wxPLURAL("Finished extracting media metadata from %u "
+								 "shared file",
+							"Finished extracting media metadata from %u shared "
+							"files",
+							bulkProbed)) %
+						bulkProbed);
+				}
+				if (bulkUnnamed > 0) {
+					// Say what was withheld rather than letting the count and the
+					// named lines silently disagree.
+					AddLogLineN(
+						CFormat(wxPLURAL(
+							"%u further file failed media metadata extraction "
+							"(not listed individually)",
+							"%u further files failed media metadata extraction "
+							"(not listed individually)",
+							bulkUnnamed)) %
+						bulkUnnamed);
+				}
+			}
+			if (bulkGoneUnnamed > 0) {
+				// Symmetric with the withheld-failures line above: past the cap a
+				// vanished file was counted nowhere and printed nowhere, so a
+				// refresh over a share that has moved named ten and said nothing
+				// about the rest. Its own line, because a file that is gone did not
+				// fail to extract.
+				AddLogLineN(CFormat(wxPLURAL("%u further shared file is gone (not listed "
+							     "individually)",
+						    "%u further shared files are gone (not listed "
+						    "individually)",
+						    bulkGoneUnnamed)) %
+					    bulkGoneUnnamed);
+			}
+			bulkProbed = 0;
+			bulkFailed = 0;
+			bulkNamed = 0;
+			bulkUnnamed = 0;
+			bulkGoneUnnamed = 0;
+		}
+	}
+
+	AddDebugLogLineN(logMediaProbe, wxT("Media probe thread: stopped"));
+	return nullptr;
+}

amule-3.1.0.tar.gz/src/MediaProbeThread.h Added

@@ -0,0 +1,104 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 MEDIAPROBETHREAD_H
+#define MEDIAPROBETHREAD_H
+
+#include <list>
+#include <atomic>
+#include <wx/thread.h>
+#include <wx/string.h>
+
+#include "MD4Hash.h"     // Needed for CMD4Hash
+#include <common/Path.h> // Needed for CPath (value member of MediaProbeJob)
+
+// One queued ffprobe job. Everything is snapshotted by value at enqueue
+// time so the worker never touches shared CKnownFile / thePrefs state.
+struct MediaProbeJob
+{
+	CMD4Hash hash;        // resolved back to the CKnownFile on the main thread
+	CPath path;           // file to probe
+	wxString ffprobePath; // ffprobe binary
+	// Part of a mass operation (a share scan, a whole-share refresh) rather than a single user-
+	// visible file. Set by the scheduler, NOT inferred from how many jobs happen to be queued:
+	// the worker swaps the entire pending list out on each wake, so a batch size says only when
+	// the worker last woke. Deciding it that way meant one arbitrary file per scan printed a
+	// per-file line while the rest were summarised, which reads as if that file were special
+	// (issue #1116).
+	bool bulk = false;
+};
+
+// Dedicated worker for ffprobe media-metadata extraction (#280).
+//
+// Why its own thread: media probing shells out to ffprobe via wxExecute, which can block for a long
+// time (or, on a headless daemon, hang) and must never stall the core. CMediaProbeTask used to run
+// on the shared CThreadScheduler alongside CHashingTask / CCompletionTask, so a single hung ffprobe
+// wedged every download completion. On a dedicated, isolated worker a slow or hung probe can only
+// delay other probes. A wall-clock timeout in MediaProbe::Probe bounds each probe so even this
+// thread cannot wedge.
+//
+// Mirrors CPartFileHashThread: a single joinable worker draining a job queue and posting a
+// CMediaProbeEvent back to the main thread.
+class CMediaProbeThread : public wxThread
+{
+public:
+	CMediaProbeThread();
+	// EndThread() (which joins the worker) must be called before the
+	// object is destroyed; the destructor itself has nothing to do.
+	~CMediaProbeThread() = default;
+
+	// Signal the worker to stop and join it. Queued, not-yet-started probes are dropped --
+	// metadata is best-effort. An in-flight probe's ffprobe child is killed promptly (Probe
+	// polls the run flag), so the join returns without waiting on a slow or hung ffprobe.
+	void EndThread();
+
+	// Enqueue a probe. Thread-safe; returns immediately.
+	void QueueProbe(
+		const CMD4Hash &hash, const CPath &fullPath, const wxString &ffprobePath, bool bulk = false);
+
+	bool IsRunning() const { return m_bRun; }
+
+	// How many probes are still queued. The worker reports only at the end of a drain, so this
+	// is what a caller polls to say "refreshing, N left" -- and what the refresh entry points
+	// use to tell a scheduled file from one the gates dropped, since MaybeScheduleMediaProbe
+	// returns nothing.
+	size_t PendingCount() const
+	{
+		wxMutexLocker lock(const_cast<wxMutex &>(m_mutex));
+		return m_jobList.size();
+	}
+
+private:
+	void *Entry() override;
+
+	std::atomic<bool> m_bRun{ false };
+	bool m_bWorkPending; // sticky wake flag, protected by m_mutex
+
+	wxMutex m_mutex;
+	wxCondition m_condition;
+
+	std::list<MediaProbeJob> m_jobList; // protected by m_mutex
+};
+
+#endif // MEDIAPROBETHREAD_H

amule-3.0.1.tar.gz/src/MemFile.cpp -> amule-3.1.0.tar.gz/src/MemFile.cpp Changed

@@ -23,45 +23,43 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "MemFile.h"	// Interface declarations
-
+#include "MemFile.h" // Interface declarations
 
 CMemFile::CMemFile(unsigned int growthRate)
 {
-	m_buffer		= NULL;
-	m_BufferSize	= 0;
-	m_fileSize		= 0;
-	m_growthRate	= growthRate;
-	m_position		= 0;
-	m_delete		= true;
-	m_readonly		= false;
+	m_buffer = NULL;
+	m_BufferSize = 0;
+	m_fileSize = 0;
+	m_growthRate = growthRate;
+	m_position = 0;
+	m_delete = true;
+	m_readonly = false;
 }
 
-
-CMemFile::CMemFile(uint8* buffer, size_t bufferSize)
+CMemFile::CMemFile(uint8 *buffer, size_t bufferSize)
 {
 	MULE_VALIDATE_PARAMS(buffer, "CMemFile: Attempted to attach invalid buffer.");
 
-	m_buffer		= buffer;
-	m_BufferSize	= bufferSize;
-	m_fileSize		= bufferSize;
-	m_growthRate	= 0;
-	m_position		= 0;
-	m_delete		= false;
-	m_readonly		= false;
+	m_buffer = buffer;
+	m_BufferSize = bufferSize;
+	m_fileSize = bufferSize;
+	m_growthRate = 0;
+	m_position = 0;
+	m_delete = false;
+	m_readonly = false;
 }
 
-CMemFile::CMemFile(const uint8* buffer, size_t bufferSize)
+CMemFile::CMemFile(const uint8 *buffer, size_t bufferSize)
 {
 	MULE_VALIDATE_PARAMS(buffer, "CMemFile: Attempted to attach invalid buffer.");
 
-	m_buffer		= const_cast<uint8*>(buffer);
-	m_BufferSize	= bufferSize;
-	m_fileSize		= bufferSize;
-	m_growthRate	= 0;
-	m_position		= 0;
-	m_delete		= false;
-	m_readonly		= true;
+	m_buffer = const_cast<uint8 *>(buffer);
+	m_BufferSize = bufferSize;
+	m_fileSize = bufferSize;
+	m_growthRate = 0;
+	m_position = 0;
+	m_delete = false;
+	m_readonly = true;
 }
 
 CMemFile::~CMemFile()
@@ -71,13 +69,11 @@
 	}
 }
 
-
 uint64 CMemFile::GetPosition() const
 {
 	return m_position;
 }
 
-
 void CMemFile::SetLength(size_t newLen)
 {
 	MULE_VALIDATE_STATE(!m_readonly, "CMemFile: Attempted to change length on a read-only buffer.");
@@ -93,13 +89,11 @@
 	m_fileSize = newLen;
 }
 
-
 uint64 CMemFile::GetLength() const
 {
 	return m_fileSize;
 }
 
-
 void CMemFile::enlargeBuffer(size_t size)
 {
 	MULE_VALIDATE_PARAMS(size >= m_BufferSize, "CMemFile: Attempted to shrink buffer.");
@@ -115,7 +109,7 @@
 		newsize = size;
 	}
 
-	uint8 *tmp = (uint8*)realloc(m_buffer, newsize);
+	uint8 *tmp = (uint8 *)realloc(m_buffer, newsize);
 	if (tmp) {
 		m_buffer = tmp;
 		m_BufferSize = newsize;
@@ -124,8 +118,7 @@
 	MULE_VALIDATE_STATE(tmp, "CMemFile: Failed to (re)allocate buffer");
 }
 
-
-sint64 CMemFile::doRead(void* buffer, size_t count) const
+sint64 CMemFile::doRead(void *buffer, size_t count) const
 {
 	MULE_VALIDATE_PARAMS(buffer, "CMemFile: Attempting to read to invalid buffer");
 
@@ -144,8 +137,7 @@
 	return count;
 }
 
-
-sint64 CMemFile::doWrite(const void* buffer, size_t count)
+sint64 CMemFile::doWrite(const void *buffer, size_t count)
 {
 	MULE_VALIDATE_PARAMS(buffer, "CMemFile: Attempting to write to invalid buffer");
 	MULE_VALIDATE_STATE(!m_readonly, "CMemFile: Attempted to write to a read-only buffer.");
@@ -155,7 +147,8 @@
 		enlargeBuffer(m_position + count);
 	}
 
-	MULE_VALIDATE_STATE(m_position + count <= m_BufferSize, "CMemFile: Buffer not resized to needed size.");
+	MULE_VALIDATE_STATE(
+		m_position + count <= m_BufferSize, "CMemFile: Buffer not resized to needed size.");
 
 	memcpy(m_buffer + m_position, buffer, count);
 	m_position += count;
@@ -167,7 +160,6 @@
 	return count;
 }
 
-
 sint64 CMemFile::doSeek(sint64 offset) const
 {
 	MULE_VALIDATE_PARAMS(offset >= 0, "CMemFile: Invalid seek, position, must be positive.");
@@ -175,14 +167,13 @@
 	return m_position = offset;
 }
 
-
 void CMemFile::ResetData()
 {
 	wxCHECK_RET(!m_readonly, "Trying to reset read-only buffer");
 
 	memset(m_buffer, 0, m_BufferSize);
-	m_fileSize	= 0;
-	m_position	= 0;
+	m_fileSize = 0;
+	m_position = 0;
 }
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/MemFile.h -> amule-3.1.0.tar.gz/src/MemFile.h Changed

@@ -26,23 +26,16 @@
 #ifndef MEMFILE_H
 #define MEMFILE_H
 
-#include "SafeFile.h"	// Needed for CFileDataIO
-
+#include "SafeFile.h" // Needed for CFileDataIO
 
 /**
- * CMemFile handles virtual files stored in memory.
- *
- * This class allows for manipulation of binary data in memory such
- * as data sent over networks. Using this class rather than writing
- * the stream onto a struct confers the following advantages:
- *  - Contents may be read dynamically in case of various versions
- *    of the same packet.
- *  - Endian correction is handled transparently. When reading and
- *    writing values, CMemFile converts to and from little-endian,
- *    so that no explicit endian conversions are necessary.
- *  - Strings of dynamic length can be read.
+ * Virtual files stored in memory.
  *
- * Most of these advantages also hold for writing packets.
+ * Allows binary data in memory, such as data sent over networks, to be manipulated. Over writing
+ * the stream onto a struct it gains: contents that can be read dynamically for various versions of
+ * the same packet, transparent endian correction (CMemFile converts to and from little-endian, so
+ * no explicit conversions are needed), and strings of dynamic length. Most of that holds for
+ * writing packets too.
  *
  * @see CFileDataIO
  */
@@ -52,19 +45,10 @@
 	/**
 	 * Creates a dynamic file object.
 	 *
-	 * @param growthRate The growth-rate of the buffer.
-	 *
-	 * The growth-rate specified by how much the buffer-size will
-	 * be increased when the memfile runs out of space. Normally
-	 * this means that the amount of re-allocations is cut down
-	 * at the expense of slightly higher mem-usage.
-	 *
-	 * If the size of the entire file to be written is known
-	 * in advance, one can avoid needless re-allocations by
-	 * specifying the exact length as the growth-rate.
-	 *
-	 * If the growth-rate is set to zero, the memfile will allocate
-	 * exactly the needed amount of memory and no more when resizing.
+	 * @param growthRate How much the buffer grows by when the memfile runs out of space. A
+	 * larger value cuts down reallocations at the cost of slightly higher memory use. If the
+	 * size of the whole file is known in advance, pass it as the growth rate to avoid needless
+	 * reallocations. Zero makes the memfile allocate exactly the amount needed and no more.
 	 */
 	CMemFile(unsigned int growthRate = 1024);
 
@@ -74,45 +58,27 @@
 	 * @param buffer A pre-existing buffer.
 	 * @param bufferSize The size of the buffer.
 	 *
-	 * A buffer attached to a memfile is assumed to already contain
-	 * data and therefore the file-size is set to match the size of
-	 * of the buffer.
-	 *
-	 * Note that while it is valid to resize the buffer to a length
-	 * between zero and 'bufferSize', it is not valid to resize it
-	 * to a length greater than the length specified in the
-	 * constructor. This also holds for writes that would increase
-	 * the length.
-	 *
-	 * The buffer is _not_ freed by CMemFile upon destruction.
-	 *
-	 * If the buffer is a const uint8*, the memfile is read-only.
+	 * The buffer is assumed to already contain data, so the file size is set to match its size.
+	 * Resizing to a length between zero and 'bufferSize' is valid; resizing past it, or writing
+	 * past it, is not. The buffer is _not_ freed by CMemFile on destruction. A const uint8*
+	 * buffer makes the memfile read-only.
 	 */
-	CMemFile(uint8* buffer, size_t bufferSize);
-	CMemFile(const uint8* buffer, size_t bufferSize);
+	CMemFile(uint8 *buffer, size_t bufferSize);
+	CMemFile(const uint8 *buffer, size_t bufferSize);
 
 	/** Destructor. */
 	virtual ~CMemFile();
 
-
 	/** @see CFileDataIO::GetPosition */
 	virtual uint64 GetPosition() const;
 
 	/** @see CFileDataIO::GetLength */
 	virtual uint64 GetLength() const;
 
-
 	/**
-	 * Changes the length of the file, possibly resizing the buffer.
-	 *
-	 * @param newLen The new length of the file.
-	 *
-	 * If the current position is greater than the new length, it
-	 * will be set to the end of the file.
-	 *
-	 * Note that changing the length of a file with an attached buffer
-	 * to a value greater than the actual buffer size is an illegal
-	 * operation.
+	 * Changes the length of the file, possibly resizing the buffer. If the current position is
+	 * past @a newLen, it is moved to the end of the file. Growing a file with an attached
+	 * buffer past the buffer's actual size is illegal.
 	 */
 	virtual void SetLength(size_t newLen);
 
@@ -122,7 +88,7 @@
 	virtual void Reset() const { doSeek(0); }
 
 	/**
-	 * Returns the bytes available to read before EOF
+	 * Bytes available to read before EOF.
 	 */
 	virtual sint64 GetAvailable() const { return GetLength() - GetPosition(); }
 
@@ -132,14 +98,14 @@
 	virtual void ResetData();
 
 	// Sometimes it's useful to get the buffer and do stuff with it.
-	uint8* GetRawBuffer() const { return m_buffer; }
+	uint8 *GetRawBuffer() const { return m_buffer; }
 
 protected:
 	/** @see CFileDataIO::doRead */
-	virtual sint64 doRead(void* buffer, size_t count) const;
+	virtual sint64 doRead(void *buffer, size_t count) const;
 
 	/** @see CFileDataIO::doWrite */
-	virtual sint64 doWrite(const void* buffer, size_t count);
+	virtual sint64 doWrite(const void *buffer, size_t count);
 
 	/** @see CFileDataIO::doSeek */
 	virtual sint64 doSeek(sint64 offset) const;
@@ -147,8 +113,8 @@
 private:
 	//! A CMemFile is neither copyable nor assignable.
 	//@{
-	CMemFile(const CMemFile&);
-	CMemFile& operator=(const CMemFile&);
+	CMemFile(const CMemFile &);
+	CMemFile &operator=(const CMemFile &);
 	//@}
 
 	/** Enlarges the buffer to at least 'size' length. */
@@ -159,15 +125,15 @@
 	//! The current position in the file.
 	mutable size_t m_position;
 	//! The actual size of the buffer.
-	size_t	m_BufferSize;
+	size_t m_BufferSize;
 	//! The size of the virtual file, may be less than the buffer-size.
-	size_t	m_fileSize;
+	size_t m_fileSize;
 	//! If true, the buffer will be freed upon termination.
-	bool	m_delete;
+	bool m_delete;
 	//! read-only mark.
-	bool	m_readonly;
+	bool m_readonly;
 	//! The actual buffer.
-	uint8*	m_buffer;
+	uint8 *m_buffer;
 };
 
 #endif // MEMFILE_H

amule-3.1.0.tar.gz/src/MuleBarRenderer.cpp Added

@@ -0,0 +1,103 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+
+#include "MuleBarRenderer.h" // Interface declarations
+
+#include "Preferences.h" // Needed for thePrefs::UseFlatBar(), CPreferences::Get3DDepth()
+
+wxIMPLEMENT_DYNAMIC_CLASS(CBarFillSpec, wxObject);
+// Non-"wx"-prefixed spelling -- see the comment on the DECLARE_VARIANT_OBJECT
+// use in MuleBarRenderer.h.
+IMPLEMENT_VARIANT_OBJECT(CBarFillSpec)
+
+CMuleBarRenderer::CMuleBarRenderer()
+: wxDataViewCustomRenderer("CBarFillSpec", wxDATAVIEW_CELL_INERT, wxALIGN_LEFT)
+{
+}
+
+bool CMuleBarRenderer::SetValue(const wxVariant &value)
+{
+	m_spec << value;
+	return true;
+}
+
+bool CMuleBarRenderer::GetValue(wxVariant &value) const
+{
+	value << m_spec;
+	return true;
+}
+
+wxSize CMuleBarRenderer::GetSize() const
+{
+	// The generic backend passes the real cell rect to Render() and treats this only as a best-
+	// width hint, but the native macOS backend takes GetSize() as the cell size itself
+	// (wxCustomRendererObject::cellSize), so a constant here paints a fixed-width bar inside an
+	// arbitrarily wide column. Report the owning column's current width to keep both backends
+	// in step; the literal is the fallback for before the renderer is attached.
+	int width = 40;
+	if (const wxDataViewColumn *column = GetOwner()) {
+		width = std::max(width, column->GetWidth());
+	}
+	// Height is deliberately wxDefaultCoord: wxDataViewCustomRendererBase::WXCallRender() only
+	// applies its vertical alignment -- which shrinks the rect it hands Render() down to
+	// GetSize().y -- when the height is >= 0. Reporting a concrete height means a taller row
+	// (the generic backend pads rows past the text extent) draws the bar at the top with a gap
+	// under it. Opting out leaves the bar the full cell.
+	return wxSize(width, wxDefaultCoord);
+}
+
+bool CMuleBarRenderer::Render(wxRect cell, wxDC *dc, int WXUNUSED(state))
+{
+	if (cell.GetWidth() <= 0 || cell.GetHeight() <= 0) {
+		return true;
+	}
+
+	const bool bFlat = thePrefs::UseFlatBar();
+
+	// Round bar has a black border; the bar itself is inset by one pixel on
+	// each side -- matches every pre-port CBarShader caller.
+	const wxRect barRect = InsetForBar(cell, bFlat);
+	if (barRect.GetWidth() <= 0 || barRect.GetHeight() <= 0) {
+		return true;
+	}
+
+	m_bar.SetWidth(barRect.GetWidth());
+	m_bar.SetHeight(barRect.GetHeight());
+	m_bar.Set3dDepth(CPreferences::Get3DDepth());
+	m_bar.SetFileSize(m_spec.GetFileSize());
+
+	if (!m_spec.GetSpans().empty()) {
+		for (const CBarFillSpan &span : m_spec.GetSpans()) {
+			m_bar.FillRange(span.start, span.end, span.colour);
+		}
+		m_bar.Draw(dc, barRect.x, barRect.y, bFlat);
+	}
+
+	if (!bFlat) {
+		wxDCPenChanger pen(*dc, *wxBLACK_PEN);
+		wxDCBrushChanger brush(*dc, *wxTRANSPARENT_BRUSH);
+		dc->DrawRectangle(BorderRectForBar(cell));
+	}
+	return true;
+}

amule-3.1.0.tar.gz/src/MuleBarRenderer.h Added

@@ -0,0 +1,180 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+
+#ifndef MULEBARRENDERER_H
+#define MULEBARRENDERER_H
+
+#include <wx/dataview.h>
+#include <wx/variant.h> // Needed for wxDECLARE_VARIANT_OBJECT -- not reliably pulled in
+			// transitively by <wx/dataview.h> across wx versions/ports
+
+#include "BarShader.h"  // Needed for CBarShader
+#include "MuleColour.h" // Needed for CMuleColour
+#include "Types.h"      // Needed for uint64
+
+#include <vector>
+
+/**
+ * One coloured span of a CBarShader-style bar, in byte-offset (virtual filesize) space -- exactly
+ * what CBarShader::FillRange() takes.
+ */
+struct CBarFillSpan
+{
+	uint64 start = 0;
+	uint64 end = 0;
+	CMuleColour colour;
+
+	bool operator==(const CBarFillSpan &other) const
+	{
+		return start == other.start && end == other.end && colour.IsSameAs(other.colour);
+	}
+};
+
+/**
+ * The payload a bar-drawing column cell carries through a wxVariant, from a
+ * CMuleVirtualDataViewCtrl::GetItemBarFill() implementation to CMuleBarRenderer::Render().
+ * Deliberately just data: turning a file's source or availability information into spans is per-
+ * list business logic and stays in the list, the same split GetItemColumnText() already has. A
+ * CBarFillSpec knows nothing about where its spans came from.
+ */
+class CBarFillSpec : public wxObject
+{
+public:
+	CBarFillSpec() = default;
+	CBarFillSpec(wxUIntPtr identity, uint64 fileSize, std::vector<CBarFillSpan> spans)
+	: m_identity(identity)
+	, m_fileSize(fileSize)
+	, m_spans(std::move(spans))
+	{
+	}
+
+	/**
+	 * The row's own item-data pointer, carried through only so a renderer subclass can cast it
+	 * back to its domain type for extra per-list drawing (CDownloadBarRenderer -> CPartFile*,
+	 * say). Safe to dereference only synchronously inside Render(): GetValueByRow() is the sole
+	 * producer of a CBarFillSpec and only runs for rows currently in the model, so liveness
+	 * holds for that call -- this is not a cache key and must never be stored past one Render()
+	 * call.
+	 */
+	wxUIntPtr GetIdentity() const { return m_identity; }
+	uint64 GetFileSize() const { return m_fileSize; }
+	const std::vector<CBarFillSpan> &GetSpans() const { return m_spans; }
+
+	bool operator==(const CBarFillSpec &other) const
+	{
+		return m_fileSize == other.m_fileSize && m_spans == other.m_spans;
+	}
+
+private:
+	wxUIntPtr m_identity = 0;
+	uint64 m_fileSize = 0;
+	std::vector<CBarFillSpan> m_spans;
+
+	wxDECLARE_DYNAMIC_CLASS(CBarFillSpec);
+};
+
+// Declared at namespace scope with the non-"wx"-prefixed macro, not the in-class
+// wxDECLARE_VARIANT_OBJECT() used for wxDataViewIconText and friends: wxWidgets 3.2, the CI's Linux
+// package, only has DECLARE_VARIANT_OBJECT/IMPLEMENT_VARIANT_OBJECT, whose expansion is a pair of
+// free-function declarations rather than friend declarations -- placing them inside the class body
+// compiles as ill-formed member operators on 3.2. Neither operator touches CBarFillSpec's private
+// members, so free functions need no special access and this works on every wx version. Confirmed
+// by a build failure against 3.2 that a green build against Homebrew's wx 3.3.3 locally did not
+// catch.
+DECLARE_VARIANT_OBJECT(CBarFillSpec)
+
+/**
+ * Renders a CBarShader chunk bar in a wxDataViewCtrl cell.
+ *
+ * List-agnostic: every list feeds it the same CBarFillSpec shape through GetItemBarFill(), so one
+ * renderer instance, registered via CMuleDataViewCtrl::AppendBarColumn(), serves any list that
+ * wants a bar column. It matches the flat/3D and border-drawing behaviour every existing CBarShader
+ * caller already has, since those come from a global preference (thePrefs::UseFlatBar()) rather
+ * than anything list-specific.
+ *
+ * The CBarShader is a renderer member, not a per-Render() local: SetWidth()/SetHeight() reset its
+ * content buffer, so it must not be resized more than once per paint, and rebuilding one from
+ * scratch per cell per repaint would be wasteful -- the same reason the pre-port code kept it as a
+ * function-local static.
+ */
+class CMuleBarRenderer : public wxDataViewCustomRenderer
+{
+public:
+	CMuleBarRenderer();
+
+	bool SetValue(const wxVariant &value) override;
+	bool GetValue(wxVariant &value) const override;
+
+	bool Render(wxRect cell, wxDC *dc, int state) override;
+	wxSize GetSize() const override;
+
+protected:
+	//! For a subclass that draws more than the chunk bar (CDownloadBarRenderer's completed-
+	//! strip and percent text, say) and needs back the data SetValue() already unpacked.
+	const CBarFillSpec &GetSpec() const { return m_spec; }
+
+	/**
+	 * The area a bar may paint in, one pixel clear of the row above and below, and inset by one
+	 * pixel a side in round (non-flat) mode to leave room for the black border. A subclass
+	 * overlay, such as a completed-progress strip, must draw into this same rect and not the
+	 * raw cell, or it will not line up with the bar underneath it.
+	 *
+	 * Pre-port every caller inset the rect it handed the bar by a pixel top and bottom before
+	 * drawing (CSharedFilesCtrl::OnDrawItem and its equivalents), and the 3D border went on
+	 * that inset rect, not on the cell. Only the inner `!bFlat` step survived the port into
+	 * this class; while GetSize() reported the text height the clamp in WXCallRender() happened
+	 * to supply the missing gap, so nothing showed until the bar started filling its cell
+	 * (issue #880). Without it, flat bars in adjacent rows touch and read as one block, and 3D
+	 * borders double up into a single thick line.
+	 */
+	static wxRect InsetForBar(wxRect cell, bool bFlat)
+	{
+		cell.y++;
+		cell.height -= 2;
+		if (!bFlat) {
+			// Round bar has a black border; the bar sits a pixel inside it.
+			cell.x++;
+			cell.y++;
+			cell.width -= 2;
+			cell.height -= 2;
+		}
+		return cell;
+	}
+
+	//! The rect the 3D border is stroked on: the cell less the separating
+	//! pixel, so the border does not sit where the gap belongs.
+	static wxRect BorderRectForBar(wxRect cell)
+	{
+		cell.y++;
+		cell.height -= 2;
+		return cell;
+	}
+
+private:
+	CBarFillSpec m_spec;
+	CBarShader m_bar;
+};
+
+#endif // MULEBARRENDERER_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/MuleCollection.cpp -> amule-3.1.0.tar.gz/src/MuleCollection.cpp Changed

@@ -31,160 +31,283 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include "MuleCollection.h"
 
+#include <cstring>
 #include <fstream>
-#include <iostream>
 #include <sstream>
 
+#ifndef USE_STD_STRING
+#include <wx/file.h>
+#endif
+
+namespace
+{
+/**
+ * Upper bound on a collection file we are willing to read into memory. The format caps itself at
+ * 1024 entries, so anything this large is either corrupt or not a collection at all.
+ */
+const size_t MAX_COLLECTION_BYTES = 4 * 1024 * 1024;
+
+/**
+ * Upper bound on a single length-prefixed blob inside the header. Without it a twelve-byte crafted
+ * file can ask us to allocate 4 GiB.
+ */
+const uint32_t MAX_BLOB_BYTES = 64 * 1024;
+
+/**
+ * Rejects anything that would break the one-link-per-line contract the ED2KLinks file relies on, or
+ * the pipe-delimited eD2k URI grammar itself. Filenames are UTF-8, so the comparison has to be done
+ * on unsigned chars: with a signed char every byte from 0x80 up would look like a control character
+ * and legitimate non-ASCII names would be thrown away.
+ */
+bool IsSafeLinkField(const std::string &field)
+{
+	for (const char ch : field) {
+		const unsigned char c = static_cast<unsigned char>(ch);
+		if (c < 0x20 || c == 0x7F || c == '|') {
+			return false;
+		}
+	}
+	return true;
+}
+
+/**
+ * True when the buffer opens with a collection version header. The caller has already checked that
+ * at least four bytes are available.
+ */
+bool LooksLikeBinary(const char *data)
+{
+	uint32_t version = 0;
+	memcpy(&version, data, sizeof(version));
+	// TODO: byte-sex, as in ReadInt().
+	return version == 0x01 || version == 0x02;
+}
+} // namespace
+
+bool CMuleCollection::OpenBuffer(const char *data, size_t len)
+{
+	vCollection.clear();
+
+	if (data == nullptr || len == 0) {
+		return false;
+	}
+
+	// Skip a UTF-8 byte-order mark. Text collections are hand-made lists of links, and a
+	// Windows editor saves them with a BOM by default; without this the first link fails its
+	// "starts with ed2k://|file|" check and a single-entry collection looks empty. A binary
+	// collection never starts with one.
+	if (len >= 3 && static_cast<unsigned char>(data0) == 0xEF &&
+		static_cast<unsigned char>(data1) == 0xBB && static_cast<unsigned char>(data2) == 0xBF) {
+		data += 3;
+		len -= 3;
+		if (len == 0) {
+			return false;
+		}
+	}
+
+	const std::string buffer(data, len);
+	std::istringstream infile(buffer, std::ios::in | std::ios::binary);
+
+	// The two formats are told apart by the leading four bytes and only one parser ever runs: a
+	// binary collection starts with a version of 1 or 2, a text one with "ed2k://", which as a
+	// little-endian uint32 is 0x6b326465.
+	//
+	// Never try the text parser as a fallback for a binary file. It scans for anything that
+	// looks like a link, so a hostile collection could smuggle one inside a filename field,
+	// have the binary parser correctly reject the entry, and still see it harvested from the
+	// raw bytes on the second pass.
+	std::vector<std::string> parsed;
+	const bool isBinary = (len >= sizeof(uint32_t)) && (LooksLikeBinary(data));
+
+	if (isBinary) {
+		if (ParseBinary(infile, parsed) && !parsed.empty()) {
+			vCollection.swap(parsed);
+			return true;
+		}
+		return false;
+	}
+
+	if (ParseText(infile, parsed) && !parsed.empty()) {
+		vCollection.swap(parsed);
+		return true;
+	}
+
+	return false;
+}
 
 bool CMuleCollection::Open(const std::string &File)
 {
-	return OpenBinary(File) || OpenText(File);
+	std::ifstream infile;
+
+	infile.open(File.c_str(), std::ifstream::in | std::ifstream::binary);
+	if (!infile.is_open()) {
+		return false;
+	}
+
+	infile.seekg(0, std::ios::end);
+	const std::streamoff length = infile.tellg();
+	if (length <= 0 || length > static_cast<std::streamoff>(MAX_COLLECTION_BYTES)) {
+		return false;
+	}
+	infile.seekg(0, std::ios::beg);
+
+	std::vector<char> buffer(static_cast<size_t>(length));
+	infile.read(&buffer0, static_cast<std::streamsize>(length));
+	if (!infile) {
+		return false;
+	}
+
+	return OpenBuffer(&buffer0, buffer.size());
 }
 
+#ifndef USE_STD_STRING
+bool CMuleCollection::Open(const wxString &File)
+{
+	// wxFile is what makes this overload worth having: it opens wide paths on Windows and
+	// converts with wxConvFileName on POSIX, where handing a locale-narrowed path to
+	// std::ifstream silently fails to open.
+	wxFile file;
+	if (!file.Open(File, wxFile::read)) {
+		return false;
+	}
+
+	const wxFileOffset length = file.Length();
+	if (length <= 0 || length > static_cast<wxFileOffset>(MAX_COLLECTION_BYTES)) {
+		return false;
+	}
+
+	std::vector<char> buffer(static_cast<size_t>(length));
+	if (file.Read(&buffer0, buffer.size()) != static_cast<ssize_t>(buffer.size())) {
+		return false;
+	}
+
+	return OpenBuffer(&buffer0, buffer.size());
+}
+#endif // !USE_STD_STRING
 
-template <typename intType>
-intType CMuleCollection::ReadInt(std::ifstream& infile)
+template <typename intType> intType CMuleCollection::ReadInt(std::istream &infile)
 {
 	intType integer = 0;
-	infile.read(reinterpret_cast<char *>(&integer),sizeof(intType));
+	infile.read(reinterpret_cast<char *>(&integer), sizeof(intType));
 	// TODO: byte-sex
 	return integer;
 }
 
-std::string CMuleCollection::ReadString(std::ifstream& infile, int TagType = 0x02)
+std::string CMuleCollection::ReadString(std::istream &infile, int TagType)
 {
 	if (TagType >= 0x11 && TagType <= 0x20) {
 		std::vector<char> buffer(TagType - 0x10);
 		infile.read(&buffer0, TagType - 0x10);
-		return buffer.empty() ?
-			std::string() :
-			std::string (buffer.begin(), buffer.end());
+		return buffer.empty() ? std::string() : std::string(buffer.begin(), buffer.end());
 	}
 	if (TagType == 0x02) {
 		uint16_t TagStringSize = ReadInt<uint16_t>(infile);
-		std::vector<char> buffer (TagStringSize);
+		if (TagStringSize == 0) {
+			return std::string();
+		}
+		std::vector<char> buffer(TagStringSize);
 		infile.read(&buffer0, TagStringSize);
-		return buffer.empty() ?
-			std::string() :
-			std::string (buffer.begin(), buffer.end());
+		return std::string(buffer.begin(), buffer.end());
 	}
 	return std::string();
 }
 
-bool CMuleCollection::OpenBinary(const std::string &File)
+bool CMuleCollection::ParseBinary(std::istream &infile, std::vector<std::string> &out)
 {
-	std::ifstream infile;
-
-	infile.open(File.c_str(), std::ifstream::in|std::ifstream::binary);
-	if(!infile.is_open()) {
-		return false;
-	}
-
 	uint32_t cVersion = ReadInt<uint32_t>(infile);
 
-	if (!infile.good() ||
-	    ( cVersion != 0x01 && cVersion != 0x02)) {
-			infile.close();
-			return false;
+	if (!infile.good() || (cVersion != 0x01 && cVersion != 0x02)) {
+		return false;
 	}
 
 	uint32_t hTagCount = ReadInt<uint32_t>(infile);
-	if (!infile.good() ||
-	    hTagCount > 3) {
-		infile.close();
+	if (!infile.good() || hTagCount > 3) {
 		return false;
 	}
 
-	for (size_t hTi = 0; hTi < hTagCount;hTi++) {
-		 int hTagType = infile.get();
+	for (uint32_t hTi = 0; hTi < hTagCount; hTi++) {
+		int hTagType = infile.get();
 
 		// hTagFormat == 1 -> FT-value is given
 		uint16_t hTagFormat = ReadInt<uint16_t>(infile);
 		if (hTagFormat != 0x0001) {
-			infile.close();
 			return false;
 		}
 
 		int hTag = infile.get();
 		if (!infile.good()) {
-			infile.close();
 			return false;
 		}
 		switch (hTag) {
 		// FT_FILENAME
 		case 0x01: {
-			/*std::string fileName =*/ ReadString(infile, hTagType);
+			/*std::string fileName =*/ReadString(infile, hTagType);
 			break;
 		}
 		// FT_COLLECTIONAUTHOR
 		case 0x31: {
-			/*std::string CollectionAuthor =*/ ReadString(infile, hTagType);
+			/*std::string CollectionAuthor =*/ReadString(infile, hTagType);
 			break;
 		}
 		// FT_COLLECTIONAUTHORKEY
 		case 0x32: {
 			uint32_t hTagBlobSize = ReadInt<uint32_t>(infile);
-			if (!infile.good()) {
-				infile.close();
+			// The size comes straight from the file, so bound it before it becomes an
+			// allocation -- otherwise twelve crafted bytes ask for 4 GiB and the
+			// bad_alloc escapes Open().
+			if (!infile.good() || hTagBlobSize > MAX_BLOB_BYTES) {
 				return false;
 			}
-			std::vector<char> CollectionAuthorKey(hTagBlobSize);
-			infile.read(&CollectionAuthorKey0, hTagBlobSize);
+			if (hTagBlobSize > 0) {
+				std::vector<char> CollectionAuthorKey(hTagBlobSize);
+				infile.read(&CollectionAuthorKey0, hTagBlobSize);
+			}
 			break;
 		}
 		// UNDEFINED TAG
 		default:
-			if (!infile.good()) {
-				infile.close();
-				return false;
-			}
-			break;
+			// An unknown header tag carries an unknown payload, so we cannot skip past
+			// it and every later read would be misaligned. Bail rather than parse
+			// garbage -- the same choice the per-file tag loop below already makes.
+			return false;
+		}
+		if (!infile.good()) {
+			return false;
 		}
 	}
 
 	uint32_t cFileCount = ReadInt<uint32_t>(infile);
 
-	/*
-	softlimit is set to 1024 to avoid problems with big uint32_t values
-	I don't believe anyone would want to use an emulecollection file
-	to store more than 1024 files, but just raise below value in case
-	you know someone who does.
-	*/
+	/* The soft limit of 1024 avoids problems with big uint32_t values. Nobody is likely to store
+	   more than 1024 files in an emulecollection, but raise it if you know someone who does. */
 
-	if(!infile.good() ||
-	   cFileCount > 1024) {
-		infile.close();
+	if (!infile.good() || cFileCount > 1024) {
 		return false;
 	}
 
-	vCollection.reserve(cFileCount);
+	out.reserve(cFileCount);
 
-	for (size_t cFi = 0; cFi < cFileCount; ++cFi) {
+	for (uint32_t cFi = 0; cFi < cFileCount; ++cFi) {
 		uint32_t fTagCount = ReadInt<uint32_t>(infile);
 
-		if (!infile.good() ||
-		    fTagCount > 6) {
-			infile.close();
+		if (!infile.good() || fTagCount > 6) {
 			return false;
 		}
 
 		std::string fileHash = std::string(32, '0');
+		bool haveHash = false;
 		uint64_t fileSize = 0;
 		std::string fileName;
 		std::string rootHash;
-		for(size_t fTi = 0; fTi < fTagCount; ++fTi) {
+		for (uint32_t fTi = 0; fTi < fTagCount; ++fTi) {
 			int fTagType = infile.get();
 			if (!infile.good()) {
-				infile.close();
 				return false;
 			}
 
 			int fTag = infile.get();
 			if (!infile.good()) {
-				infile.close();
 				return false;
 			}
 
@@ -193,11 +316,16 @@
 			case 0x28: {
 				std::vector<char> bFileHash(16);
 				infile.read(&bFileHash0, 16);
-				std::string hex = "0123456789abcdef";
+				if (!infile.good()) {
+					return false;
+				}
+				const std::string hex = "0123456789abcdef";
 				for (int pos = 0; pos < 16; pos++) {
-					fileHashpos*2 = hex((bFileHashpos >> 4) & 0xF);
-					fileHash(pos*2) + 1 = hex(bFileHashpos) & 0x0F;
+					const unsigned char b = static_cast<unsigned char>(bFileHashpos);
+					fileHashpos * 2 = hex(b >> 4) & 0x0F;
+					fileHash(pos * 2) + 1 = hexb & 0x0F;
 				}
+				haveHash = true;
 				break;
 			}
 			// FT_AICH_FILEHASH
@@ -207,7 +335,7 @@
 			}
 			// FT_FILESIZE
 			case 0x02: {
-				switch(fTagType) {
+				switch (fTagType) {
 				case 0x83: {
 					fileSize = ReadInt<uint32_t>(infile);
 					break;
@@ -225,87 +353,80 @@
 					break;
 				}
 				default: // Invalid file structure
-					infile.close();
 					return false;
-					break;
 				}
 				break;
 			}
 			// FT_FILENAME
 			case 0x01: {
-				fileName = ReadString(infile, fTagType^0x80);
+				fileName = ReadString(infile, fTagType ^ 0x80);
 				break;
 			}
 			// FT_FILECOMMENT
 			case 0xF6: {
-				/* std::string FileComment =*/ ReadString(infile, fTagType^0x80);
+				/* std::string FileComment =*/ReadString(infile, fTagType ^ 0x80);
 				break;
 			}
 			// FT_FILERATING
 			case 0xF7: {
 				if (fTagType == 0x89) { // TAGTYPE_UINT8
-					// uint8_t FileRating =
-						infile.get();
+							// uint8_t FileRating =
+					infile.get();
 
 				} else {
-					infile.close();
 					return false;
 				}
 				break;
 			}
 			// UNDEFINED TAG
 			default:
-				infile.close();
 				return false;
-				break;
 			}
-			if( !infile.good() ) {
-				infile.close();
+			if (!infile.good()) {
 				return false;
 			}
 		}
 
-		if (!fileName.empty() && fileSize > 0) {
+		// Without a hash the synthesised link is syntactically valid but names the all-zero
+		// file id, which queues a download that can never find a source or complete. Skip
+		// the entry instead. The field checks keep a hostile filename from carrying a
+		// newline, which would forge extra lines once the link reaches the ED2KLinks file,
+		// or a pipe, which would forge extra fields.
+		if (!fileName.empty() && fileSize > 0 && haveHash && IsSafeLinkField(fileName)) {
+			if (!rootHash.empty() && !IsSafeLinkField(rootHash)) {
+				rootHash.clear();
+			}
 			std::stringstream link;
 			// ed2k://|file|fileName|fileSize|fileHash|/
-			link	<< "ed2k://|file|" << fileName
-				<< "|" << fileSize
-				<< "|" << fileHash;
+			link << "ed2k://|file|" << fileName << "|" << fileSize << "|" << fileHash;
 			if (!rootHash.empty()) {
 				link << "|h=" << rootHash;
 			}
 			link << "|/";
-			vCollection.push_back(link.str());
+			out.push_back(link.str());
 		}
 	}
-	infile.close();
 
 	return true;
 }
 
-
-bool CMuleCollection::OpenText(const std::string &File)
+bool CMuleCollection::ParseText(std::istream &infile, std::vector<std::string> &out)
 {
 	std::string line;
-	std::ifstream infile;
-
-	infile.open(File.c_str(), std::ifstream::in|std::ifstream::binary);
-	if (!infile.is_open()) {
-		return false;
-	}
 
 	while (getline(infile, line, (char)10 /* LF */)) {
-		size_t last = line.size()-1;
-		if ((1 < last) && ((char)13 /* CR */ == line.at(last))) {
-			line.erase(last);
+		// An empty line used to underflow the length arithmetic here and index far past the
+		// end of the string, throwing out of Open() uncaught. Blank lines are ordinary in
+		// hand-written collections, and a corrupt binary file falls through to this parser
+		// and produces them routinely.
+		if (!line.empty() && (char)13 /* CR */ == lineline.size() - 1) {
+			line.erase(line.size() - 1);
 		}
-		if (line.size() > 50 &&
-		    line.substr(0, 13) == "ed2k://|file|" &&
-		    line.substr(line.size() - 2) == "|/") {
-			vCollection.push_back(line);
+		if (line.size() > 50 && line.compare(0, 13, "ed2k://|file|") == 0 &&
+			line.compare(line.size() - 2, 2, "|/") == 0) {
+			out.push_back(line);
 		}
 	}
-	infile.close();
 
-	return !vCollection.empty();
+	return !out.empty();
 }

amule-3.0.1.tar.gz/src/MuleCollection.h -> amule-3.1.0.tar.gz/src/MuleCollection.h Changed

@@ -23,16 +23,24 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#ifndef MULECOLLECTION_H
+#define MULECOLLECTION_H
 
-#ifndef __MULECOLLECTION_H__
-#define __MULECOLLECTION_H__
-
+#include <istream>
 #include <string>
 #include <vector>
 
 #include "Types.h"
 
-
+/**
+ * Reads an .emulecollection file and exposes the eD2k links it contains.
+ *
+ * Collection files are opened straight from a file manager, so the input is arbitrary user data
+ * rather than something aMule wrote: every size read from the file is bounded, every parse failure
+ * leaves the object empty, and the links handed back are guaranteed to be well-formed single-line
+ * eD2k URIs. That last point matters because callers feed them into the ED2KLinks IPC file, where
+ * an embedded newline would let a collection inject extra lines.
+ */
 class CMuleCollection
 {
 private:
@@ -42,21 +50,41 @@
 	CMuleCollection() {};
 	~CMuleCollection() {};
 
+	/**
+	 * Parses a collection held in memory. Both file-based overloads funnel through here; it is
+	 * also the entry point the unit tests drive, since most interesting inputs are malformed
+	 * and awkward to keep on disk.
+	 *
+	 * @return true if at least one usable link was found.
+	 */
+	bool OpenBuffer(const char *data, size_t len);
+
+	/**
+	 * Opens a collection by path.
+	 *
+	 * The narrow-string overload cannot represent every path on Windows and mangles non-ASCII
+	 * ones under a non-UTF-8 locale on POSIX; it exists for the standalone `ed2k` helper, built
+	 * without wxWidgets. Code that has a wxString should use that overload instead.
+	 */
 	bool Open(const std::string &File);
+#ifndef USE_STD_STRING
+	bool Open(const wxString &File);
+#endif
 
-	size_t			size() const			{ return vCollection.size(); }
-	std::string&		operator(size_t index)	{ return vCollectionindex; }
-	const std::string&	operator(size_t index) const	{ return vCollectionindex; }
+	size_t size() const { return vCollection.size(); }
+	std::string &operator(size_t index) { return vCollectionindex; }
+	const std::string &operator(size_t index) const { return vCollectionindex; }
 
 private:
-	bool OpenBinary(const std::string &File);
-	bool OpenText(const std::string &File);
+	// Each parser fills a caller-supplied vector and may only publish it on success, so a
+	// collection that goes bad halfway through cannot leave partial results behind for the
+	// other parser to adopt.
+	bool ParseBinary(std::istream &infile, std::vector<std::string> &out);
+	bool ParseText(std::istream &infile, std::vector<std::string> &out);
 
-	template <typename intType>
-	intType ReadInt(std::ifstream& infile);
+	template <typename intType> intType ReadInt(std::istream &infile);
 
-	std::string ReadString(std::ifstream& infile, int TagType);
+	std::string ReadString(std::istream &infile, int TagType);
 };
 
-#endif // __MULECOLLECTION_H__
-
+#endif // MULECOLLECTION_H

amule-3.0.1.tar.gz/src/MuleColour.cpp -> amule-3.1.0.tar.gz/src/MuleColour.cpp Changed

@@ -32,26 +32,27 @@
 #define USE_MULE_PEN_CACHE 1
 #define USE_MULE_BRUSH_CACHE 1
 
-std::map<uint32_t, wxPen*> wxPenCache;
-std::map<uint32_t, wxBrush*> wxBrushCache;
+std::map<uint32_t, wxPen *> wxPenCache;
+std::map<uint32_t, wxBrush *> wxBrushCache;
 
-const wxPen& CMuleColour::GetPen(int width, wxPenStyle style) const
+const wxPen &CMuleColour::GetPen(int width, wxPenStyle style) const
 {
 #if USE_MULE_PEN_CACHE
-	wxPen* result = NULL;
+	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);
+		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);
+			result =
+				wxThePenList->FindOrCreatePen(wxColour(m_red, m_green, m_blue), width, style);
 			m_cachedpen = result;
-			wxPenCache.insert(std::pair<uint32_t, wxPen*>(hash, result));
+			wxPenCache.insert(std::pair<uint32_t, wxPen *>(hash, result));
 		}
 	}
 
@@ -61,23 +62,23 @@
 #endif
 }
 
-const wxBrush& CMuleColour::GetBrush(wxBrushStyle style) const
+const wxBrush &CMuleColour::GetBrush(wxBrushStyle style) const
 {
 #if USE_MULE_BRUSH_CACHE
-	wxBrush* result = NULL;
+	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);
+		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));
+			wxBrushCache.insert(std::pair<uint32_t, wxBrush *>(hash, result));
 		}
 	}

amule-3.0.1.tar.gz/src/MuleColour.h -> amule-3.1.0.tar.gz/src/MuleColour.h Changed

@@ -27,23 +27,54 @@
 
 #include <wx/colour.h>
 #include <wx/settings.h>
-#include <wx/pen.h>   // needed for wxPenStyle enum values
-#include <wx/brush.h> // needed for wxBrushStyle enum values
-#include <wx/font.h>  // needed for wxFontStyle enum values
+#include <wx/pen.h>    // needed for wxPenStyle enum values
+#include <wx/brush.h>  // needed for wxBrushStyle enum values
+#include <wx/font.h>   // needed for wxFontStyle enum values
+#include <wx/window.h> // Needed for wxWindow::GetBackgroundColour (IsListBackgroundDark)
 #include "Types.h"
+#include <cmath> // Needed for std::lround
 
 class wxPen;
 class wxBrush;
 
+// Palette selector for custom-drawn text in list controls. Reads the control's actual background
+// instead of wxSystemSettings::GetAppearance().IsDark(), because native Win32 wxListCtrl
+// (SysListView32) keeps its white background even when the OS reports dark mode via
+// AppsUseLightTheme=0. Foreground colours chosen from IsDark() then render as light text on a
+// still-white list (issue #274, the Windows 11 dark-mode search-tab bug). GTK and macOS do
+// propagate dark backgrounds to lists, so there this luminance test degrades to the same answer as
+// IsDark().
+static inline bool IsListBackgroundDark(const wxWindow *w)
+{
+	const wxColour bg = w->GetBackgroundColour();
+	return (bg.Red() * 299 + bg.Green() * 587 + bg.Blue() * 114) / 1000 < 128;
+}
+
 class CMuleColour
 {
 public:
+	enum ColourComponent
+	{
+		COLOUR_R = 1,
+		COLOUR_G = 2,
+		COLOUR_B = 4
+	};
 
-	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(uint8_t r, uint8_t g, uint8_t b) { Init(); Set(r,g,b); }
+	CMuleColour()
+	{
+		Init();
+		Set(0, 0, 0);
+	}
+	CMuleColour(const wxColour &colour)
+	{
+		Init();
+		Set(colour.Red(), colour.Green(), colour.Blue());
+	}
+	CMuleColour(uint8_t r, uint8_t g, uint8_t b)
+	{
+		Init();
+		Set(r, g, b);
+	}
 	CMuleColour(unsigned long rgb)
 	{
 		Init();
@@ -53,36 +84,48 @@
 	CMuleColour(wxSystemColour colour)
 	{
 		Init();
-		const wxColour& wxcolour = wxSystemSettings::GetColour(colour);
+		const wxColour &wxcolour = wxSystemSettings::GetColour(colour);
 		Set(wxcolour.Red(), wxcolour.Green(), wxcolour.Blue());
 	}
 
-	void Init() {
+	void Init()
+	{
 		m_cachedpen = NULL;
 		m_cachedbrush = NULL;
 	}
 
-
-	void Set(uint8_t red, uint8_t green, uint8_t blue) { m_red = red; m_green = green; m_blue = blue; }
+	void Set(uint8_t red, uint8_t green, uint8_t blue)
+	{
+		m_red = red;
+		m_green = green;
+		m_blue = blue;
+	}
 
 	inline uint8_t Red() const { return m_red; }
 	inline uint8_t Green() const { return m_green; }
 	inline uint8_t Blue() const { return m_blue; }
 
-	const CMuleColour& Blend(uint8_t percentage, ColourComponent flags = (ColourComponent)(COLOUR_R | COLOUR_G | COLOUR_B) )
+	const CMuleColour &Blend(
+		uint8_t 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));
+		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)
+	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);
+		unsigned int red = (unsigned int)std::lround(Red() + (colour.Red() * covered));
+		unsigned int green = (unsigned int)std::lround(Green() + (colour.Green() * covered));
+		unsigned int blue = (unsigned int)std::lround(Blue() + (colour.Blue() * covered));
 		Set((red < 255) ? red : 255, (green < 255) ? green : 255, (blue < 255) ? blue : 255);
 		return *this;
 	}
@@ -91,30 +134,28 @@
 
 	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);
+	bool IsSameAs(const CMuleColour &colour) const
+	{
+		return (Red() == colour.Red()) && (Green() == colour.Green()) && (Blue() == colour.Blue());
 	}
 
-	const wxPen& GetPen(int width = 1, wxPenStyle style = wxPENSTYLE_SOLID) const;
-	const wxBrush& GetBrush(wxBrushStyle style = wxBRUSHSTYLE_SOLID) const;
+	operator wxColour() const { return wxColor(m_red, m_green, m_blue); }
+
+	const wxPen &GetPen(int width = 1, wxPenStyle style = wxPENSTYLE_SOLID) const;
+	const wxBrush &GetBrush(wxBrushStyle style = wxBRUSHSTYLE_SOLID) const;
 
-	// wxSYS_COLOUR_BTNSHADOW happens to equal SYS_COLOUR_LISTBOX on
-	// some Mate/Cinnamon themes (TraditionalOk, Menta) and on KDE
-	// builds without kde-gtk-config, which makes the wxListCtrl
-	// unfocused-selection paint render invisible (#640). Returning
-	// a 50/50 mix of HIGHLIGHT and LISTBOX keeps the selection
-	// readable across all themes while still looking distinctly
+	// wxSYS_COLOUR_BTNSHADOW happens to equal SYS_COLOUR_LISTBOX on some Mate/Cinnamon themes
+	// (TraditionalOk, Menta) and on KDE builds without kde-gtk-config, which makes the
+	// wxListCtrl unfocused-selection paint render invisible (#640). A 50/50 mix of HIGHLIGHT
+	// and LISTBOX keeps the selection readable across all themes while still looking distinctly
 	// "not the focused one".
 	static wxColour GetUnfocusedHighlight()
 	{
 		const wxColour hl = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
 		const wxColour lb = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
-		return wxColour(
-			(hl.Red()   + lb.Red())   / 2,
+		return wxColour((hl.Red() + lb.Red()) / 2,
 			(hl.Green() + lb.Green()) / 2,
-			(hl.Blue()  + lb.Blue())  / 2);
+			(hl.Blue() + lb.Blue()) / 2);
 	}
 
 private:
@@ -122,8 +163,8 @@
 	uint8_t m_green;
 	uint8_t m_blue;
 
-	mutable wxPen* m_cachedpen;
-	mutable wxBrush* m_cachedbrush;
+	mutable wxPen *m_cachedpen;
+	mutable wxBrush *m_cachedbrush;
 };
 
 #endif

amule-3.1.0.tar.gz/src/MuleDataViewCtrl.cpp Added

@@ -0,0 +1,746 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+
+#include "MuleDataViewCtrl.h" // Interface declarations
+
+#include <wx/menu.h> // Needed for wxMenu (header show/hide menu)
+
+#include <algorithm> // Needed for std::find, std::sort, std::min, std::max
+#include <vector>    // Needed for std::vector
+
+#include <common/MenuIDs.h> // Needed for MP_LISTCOL_1 .. MP_LISTCOL_15
+
+#include "GetTickCount.h"         // Needed for GetTickCount64()
+#include "MuleBarRenderer.h"      // Needed for CMuleBarRenderer
+#include "MuleIconTextRenderer.h" // Needed for CMuleIconTextRenderer
+
+namespace
+{
+//! How long a pause resets the accumulated type-ahead string, in ms.
+const uint64 kTypeAheadResetMs = 1500;
+} // namespace
+
+wxBEGIN_EVENT_TABLE(CMuleDataViewCtrl, wxDataViewCtrl)
+	EVT_DATAVIEW_COLUMN_HEADER_CLICK(wxID_ANY, CMuleDataViewCtrl::OnColumnHeaderClick)
+	EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(wxID_ANY, CMuleDataViewCtrl::OnColumnHeaderRightClick)
+	EVT_MENU_RANGE(MP_LISTCOL_1, MP_LISTCOL_20, CMuleDataViewCtrl::OnColumnMenuSelected)
+	EVT_IDLE(CMuleDataViewCtrl::OnIdle)
+	EVT_CHAR(CMuleDataViewCtrl::OnChar)
+	EVT_KEY_DOWN(CMuleDataViewCtrl::OnKeyDown)
+	EVT_CONTEXT_MENU(CMuleDataViewCtrl::OnContextMenuKey)
+wxEND_EVENT_TABLE()
+
+CMuleDataViewCtrl::CMuleDataViewCtrl(wxWindow *parent,
+	wxWindowID winid,
+	const wxPoint &pos,
+	const wxSize &size,
+	long style,
+	const wxString &name)
+: wxDataViewCtrl(parent, winid, pos, size, style | wxDV_MULTIPLE | wxDV_ROW_LINES, wxDefaultValidator, name)
+, m_widthAdapter(this)
+{
+	// amuleDlg sets wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED), so only windows carrying
+	// this style are sent idle events at all -- without it OnIdle() never runs.
+	SetExtraStyle(GetExtraStyle() | wxWS_EX_PROCESS_IDLE);
+}
+
+CMuleDataViewCtrl::~CMuleDataViewCtrl() = default;
+
+int CMuleDataViewCtrl::ColumnWidthAdapter::GetColumnWidth(int col) const
+{
+	if (m_ctrl->IsColumnHidden(col)) {
+		return 0;
+	}
+	const int width = m_ctrl->GetColumn(col)->GetWidth();
+	if (width > 0) {
+		return width;
+	}
+	// A visible column should never report zero -- the spacer appended on macOS exists so the
+	// trailing-column sizing lands there instead. This is the backstop: CListColumnStore reads
+	// a width <= 0 as hidden and persists it negative, so a stray zero would hide a real column
+	// on the next launch, then do the same to whichever column became last, losing one per
+	// restart.
+	const int cached = m_ctrl->m_columnStore.GetCachedWidth(col);
+	return (cached > 0) ? cached : m_ctrl->m_columnStore.GetColumnDefaultWidth(col);
+}
+
+void CMuleDataViewCtrl::AppendSpacerColumn(unsigned modelColumn)
+{
+#ifdef __WXOSX__
+	// Resizable is load-bearing: macOS hands the leftover space to the last *resizable* column,
+	// so a fixed spacer cannot shrink and the collapse falls through to the last real column
+	// instead.
+	AppendTextColumn(
+		wxEmptyString, modelColumn, wxDATAVIEW_CELL_INERT, 1, wxALIGN_LEFT, wxDATAVIEW_COL_RESIZABLE);
+	m_hasSpacer = true;
+#else
+	(void)modelColumn;
+#endif
+}
+
+void CMuleDataViewCtrl::AppendBarColumn(
+	const wxString &title, unsigned modelColumn, int width, int flags, CMuleBarRenderer *renderer)
+{
+	wxDataViewColumn *column = new wxDataViewColumn(
+		title, renderer ? renderer : new CMuleBarRenderer(), modelColumn, width, wxALIGN_LEFT, flags);
+	AppendColumn(column);
+}
+
+void CMuleDataViewCtrl::AddTextColumn(const wxString &label,
+	unsigned modelColumn,
+	const wxString &key,
+	int width,
+	wxAlignment align,
+	int flags,
+	wxDataViewCellMode mode)
+{
+	AppendTextColumn(label, modelColumn, mode, width, align, flags);
+	m_columnStore.RegisterColumn(static_cast<int>(modelColumn), width, key);
+}
+
+void CMuleDataViewCtrl::AddIconTextColumn(const wxString &label,
+	unsigned modelColumn,
+	const wxString &key,
+	int width,
+	wxAlignment align,
+	int flags,
+	wxDataViewCellMode mode)
+{
+	// CMuleIconTextRenderer rather than wx's, which reserves the icon slot on
+	// every row whether or not that row has an icon -- see the class comment.
+	CMuleIconTextRenderer *renderer = new CMuleIconTextRenderer();
+	renderer->SetMode(mode);
+	// Supply the vertical half of the alignment when the caller has not. wx's own text renderer
+	// resolves a missing vertical component to centred, but a custom renderer gets exactly what
+	// it is given, so a plain wxALIGN_LEFT top-aligns the text while the icon beside it is
+	// centred (#867). wxALIGN_TOP is 0 and so indistinguishable from "unspecified", which is
+	// why this tests the two bits that do carry intent.
+	const bool hasVertical = (align & (wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL)) != 0;
+	renderer->SetAlignment(hasVertical ? align : (align | wxALIGN_CENTRE_VERTICAL));
+	AppendColumn(new wxDataViewColumn(label, renderer, modelColumn, width, align, flags));
+	m_columnStore.RegisterColumn(static_cast<int>(modelColumn), width, key);
+}
+
+void CMuleDataViewCtrl::AddBarColumn(const wxString &label,
+	unsigned modelColumn,
+	const wxString &key,
+	int width,
+	int flags,
+	CMuleBarRenderer *renderer)
+{
+	AppendBarColumn(label, modelColumn, width, flags, renderer);
+	m_columnStore.RegisterColumn(static_cast<int>(modelColumn), width, key);
+}
+
+unsigned CMuleDataViewCtrl::RealColumnCount() const
+{
+	const unsigned columns = GetColumnCount();
+	if (m_hasSpacer && columns > 0) {
+		return columns - 1;
+	}
+	return columns;
+}
+
+void CMuleDataViewCtrl::InitColumnState()
+{
+	// Every appended column must sit at the view position matching its model id. Several things
+	// here index by one and are read as the other: FitColumnsToContent() walks a single index
+	// as both, m_columnHidden and the header menu are keyed by view position, and
+	// RegisterColumn() by model id. They agree only because the two orders have always
+	// coincided, so inserting a column mid-list silently sizes and hides the wrong ones.
+	// Asserted rather than documented: the failure looks like a rendering bug at runtime.
+	for (unsigned i = 0; i < RealColumnCount(); ++i) {
+		wxASSERT_MSG(GetColumn(i)->GetModelColumn() == i,
+			"column ids must be declared in the order the columns are appended");
+	}
+
+#ifdef __WXOSX__
+	// Forgetting the spacer costs the last column: macOS gives the leftover width to the last
+	// *resizable* one, which collapses to nothing as soon as the columns outgrow the control,
+	// and nothing shows until somebody narrows the list far enough.
+	wxASSERT_MSG(m_hasSpacer, "every list must AppendSpacerColumn() before InitColumnState()");
+#endif
+
+	m_columnHidden.resize(RealColumnCount(), false);
+	ResetKnownWidths();
+}
+
+void CMuleDataViewCtrl::ResetKnownWidths()
+{
+	m_lastKnownWidths.clear();
+	for (unsigned i = 0; i < RealColumnCount(); ++i) {
+		m_lastKnownWidths.push_back(GetColumn(i)->GetWidth());
+	}
+	// A programmatic change is not a drag in progress, so nothing is pending either --
+	// otherwise the next quiet idle would report a resize the user never made.
+	m_widthsSettling = false;
+}
+
+bool CMuleDataViewCtrl::IsColumnHidden(int col) const
+{
+	return (col >= 0) && (static_cast<size_t>(col) < m_columnHidden.size()) && m_columnHiddencol;
+}
+
+void CMuleDataViewCtrl::SetColumnHidden(int col, bool hidden, int width)
+{
+	if (col < 0 || static_cast<unsigned>(col) >= RealColumnCount()) {
+		return;
+	}
+	if (static_cast<size_t>(col) >= m_columnHidden.size()) {
+		m_columnHidden.resize(RealColumnCount(), false);
+	}
+
+	m_columnHiddencol = hidden;
+	wxDataViewColumn *column = GetColumn(static_cast<unsigned>(col));
+	column->SetHidden(hidden);
+	if (!hidden && width > COL_SIZE_MIN) {
+		column->SetWidth(width);
+	}
+}
+
+void CMuleDataViewCtrl::UpdateExpanderColumn()
+{
+	// The expander belongs on the leftmost visible column: hiding the column that currently
+	// owns it would take any group triangles with it, and re-showing a column to its left has
+	// to take them back.
+	for (unsigned i = 0; i < RealColumnCount(); ++i) {
+		if (!IsColumnHidden(static_cast<int>(i))) {
+			wxDataViewColumn *column = GetColumn(i);
+			if (GetExpanderColumn() != column) {
+				SetExpanderColumn(column);
+			}
+			return;
+		}
+	}
+}
+
+int CMuleDataViewCtrl::CompareItems(const wxDataViewItem &item1, const wxDataViewItem &item2) const
+{
+	for (const CColPair &entry : m_sort_orders) {
+		const unsigned column = entry.first;
+		const unsigned order = entry.second;
+		const int modifier = (order & SORT_DES) ? -1 : 1;
+		const bool alt = (order & SORT_ALT) != 0;
+
+		const int result = CompareByColumn(item1, item2, column, alt, modifier);
+		if (result != 0) {
+			return result;
+		}
+	}
+	return 0;
+}
+
+void CMuleDataViewCtrl::ShowSortCaret(unsigned column, unsigned order, SortTrigger trigger)
+{
+	if (column >= RealColumnCount()) {
+		return;
+	}
+
+	for (unsigned i = 0; i < RealColumnCount(); ++i) {
+		if (i != column && GetColumn(i)->IsSortKey()) {
+			GetColumn(i)->UnsetAsSortKey();
+		}
+	}
+
+	bool ascending = !(order & SORT_DES);
+
+#ifdef __WXGTK__
+	// Two GTK quirks stack up here, and they cancel out only on the click path -- which is why
+	// the caret used to come back up the wrong way round after a restart and correct itself on
+	// the first header click.
+	//
+	// The first is the glyph: with gtk-alternative-sort-arrows off (the default) GTK draws
+	// GTK_SORT_ASCENDING as "pan-down-symbolic", so an A-Z sort gets a DOWN arrow, the opposite
+	// of macOS and MSW.
+	//
+	// The second is that GTK sorts on its own: wx makes every sortable column call
+	// gtk_tree_view_column_set_sort_column_id(), which leaves GTK's handler connected, so on
+	// the button release -- after this control has handled the press and set the caret -- GTK
+	// flips the order it finds and writes it back. Two inversions, so a clicked header ends up
+	// looking right.
+	//
+	// Nothing restores a saved sort, so hand wx the flipped value there and both paths agree.
+	// Only the arrow is affected: rows are ordered from m_sort_orders.
+	if (trigger == SortTrigger::Programmatic) {
+		ascending = !ascending;
+	}
+#else
+	wxUnusedVar(trigger);
+#endif
+
+	GetColumn(column)->SetSortOrder(ascending);
+}
+
+void CMuleDataViewCtrl::SuspendHeaderSort()
+{
+	if (m_headerSortSuspended) {
+		return;
+	}
+	m_headerSortSuspended = true;
+	for (unsigned i = 0; i < RealColumnCount(); ++i) {
+		if (GetColumn(i)->IsSortKey()) {
+			GetColumn(i)->UnsetAsSortKey();
+		}
+	}
+}
+
+void CMuleDataViewCtrl::RestoreHeaderSort()
+{
+	if (!m_headerSortSuspended) {
+		return;
+	}
+	m_headerSortSuspended = false;
+	if (!m_sort_orders.empty()) {
+		const CColPair &primary = m_sort_orders.front();
+		ShowSortCaret(primary.first, primary.second);
+	}
+}
+
+void CMuleDataViewCtrl::ApplySorting(unsigned column, unsigned order, SortTrigger trigger)
+{
+	// Push to the front: the most recently clicked column is primary, the
+	// rest stay as tie-breakers, matching CMuleListCtrl::SetSorting().
+	for (CSortingList::iterator it = m_sort_orders.begin(); it != m_sort_orders.end(); ++it) {
+		if (it->first == column) {
+			m_sort_orders.erase(it);
+			break;
+		}
+	}
+	m_sort_orders.emplace_front(column, order);
+
+	ShowSortCaret(column, order, trigger);
+
+	OnSortingChanged();
+}
+
+namespace
+{
+// This control's sort bits and CListColumnStore's are different values for the same two ideas, so
+// every crossing converts -- see the note in MuleListCtrl.cpp for what passing them through
+// unconverted costs. The numbers currently coincide; that is incidental and must not be relied on.
+unsigned ToStoreFlags(unsigned order)
+{
+	return (order & CMuleDataViewCtrl::SORT_DES ? CListColumnStore::SORT_DESCENDING : 0) |
+	       (order & CMuleDataViewCtrl::SORT_ALT ? CListColumnStore::SORT_ALTERNATE : 0);
+}
+
+unsigned FromStoreFlags(unsigned storeFlags)
+{
+	return (storeFlags & CListColumnStore::SORT_DESCENDING ? CMuleDataViewCtrl::SORT_DES : 0) |
+	       (storeFlags & CListColumnStore::SORT_ALTERNATE ? CMuleDataViewCtrl::SORT_ALT : 0);
+}
+} // namespace
+
+void CMuleDataViewCtrl::LoadColumnSettings()
+{
+	if (!m_columnStore.HasTableName()) {
+		return;
+	}
+
+	CListColumnStore::CSortingList decoded;
+	m_hasPersistedWidths = m_columnStore.LoadSettings(m_widthAdapter, GetOldColumnOrder(), decoded);
+
+	// Restored widths can leave the default expander column hidden.
+	UpdateExpanderColumn();
+
+	// LoadSettings() returns the orders primary-LAST, because each SetSorting() call pushes to
+	// the front, so the last one processed ends up primary; ApplySorting() has the same
+	// semantics, so replaying in order reproduces it. Only replace what the list installed for
+	// itself when the config has something stored: a profile with no saved TableOrdering
+	// decodes to an empty list, and clearing unconditionally would throw away the list's own
+	// default (as CServerListCtrl's name sort).
+	if (!decoded.empty()) {
+		m_sort_orders.clear();
+		for (const CListColumnStore::CColPair &pair : decoded) {
+			ApplySorting(pair.first, FromStoreFlags(pair.second));
+		}
+	}
+
+	// A list that installs no default of its own (CSearchListCtrl) still has to end up with a
+	// sort chain: with none, CompareItems() answers 0 for every pair and nothing is ordered.
+	// CMuleListCtrl::LoadSettings() guaranteed at least one entry; keep that guarantee.
+	if (m_sort_orders.empty()) {
+		ApplySorting(0, 0);
+	}
+}
+
+void CMuleDataViewCtrl::SaveColumnSettings()
+{
+	if (!m_columnStore.HasTableName()) {
+		return;
+	}
+	CListColumnStore::CSortingList stored;
+	for (const CColPair &pair : m_sort_orders) {
+		stored.emplace_back(pair.first, ToStoreFlags(pair.second));
+	}
+
+	m_columnStore.SaveSettings(m_widthAdapter, stored);
+}
+
+void CMuleDataViewCtrl::OnColumnHeaderClick(wxDataViewEvent &event)
+{
+	wxDataViewColumn *col = event.GetDataViewColumn();
+	if (!col) {
+		event.Skip();
+		return;
+	}
+	const unsigned column = static_cast<unsigned>(col->GetModelColumn());
+
+	// Mirrors CMuleListCtrl::OnColumnLClick's cycle: the same column clicked again flips
+	// ascending<->descending, and once descending, a further click on an alt-eligible column
+	// flips to ascending with the alt criterion toggled instead of clearing the sort.
+	unsigned sort_order = 0;
+	if (!m_sort_orders.empty() && m_sort_orders.front().first == column) {
+		sort_order = m_sort_orders.front().second;
+		if (sort_order & SORT_DES) {
+			if (AltSortAllowed(column)) {
+				sort_order = (~sort_order) & SORT_ALT;
+			} else {
+				sort_order = 0;
+			}
+		} else {
+			sort_order = SORT_DES | (sort_order & SORT_ALT);
+		}
+	} else {
+		// Clicking back to a column that is still in the chain resumes the
+		// direction it was last sorted by, rather than starting over.
+		for (const CColPair &entry : m_sort_orders) {
+			if (entry.first == column) {
+				sort_order = entry.second;
+				break;
+			}
+		}
+	}
+
+	ApplySorting(column, sort_order, SortTrigger::HeaderClick);
+	SaveColumnSettings();
+}
+
+void CMuleDataViewCtrl::OnColumnHeaderRightClick(wxDataViewEvent &event)
+{
+	// Show/hide menu, as CMuleListCtrl::OnColumnRClick offered on every
+	// list built on the old base.
+	wxMenu menu;
+	// Truncating here hides a column from the menu with no other symptom, so
+	// say so rather than let it pass: the range is meant to cover every list.
+	const unsigned menuSlots = MP_LISTCOL_20 - MP_LISTCOL_1 + 1;
+	wxASSERT_MSG(RealColumnCount() <= menuSlots,
+		"more columns than MP_LISTCOL_* slots -- the extra ones cannot be shown or hidden");
+	const unsigned columns = std::min<unsigned>(RealColumnCount(), menuSlots);
+	for (unsigned i = 0; i < columns; ++i) {
+		menu.AppendCheckItem(static_cast<int>(i) + MP_LISTCOL_1, GetColumn(i)->GetTitle());
+		menu.Check(static_cast<int>(i) + MP_LISTCOL_1, !IsColumnHidden(static_cast<int>(i)));
+	}
+
+	PopupMenu(&menu);
+	event.Skip();
+}
+
+void CMuleDataViewCtrl::OnColumnMenuSelected(wxCommandEvent &evt)
+{
+	const int col = evt.GetId() - MP_LISTCOL_1;
+	if (col < 0 || static_cast<unsigned>(col) >= RealColumnCount()) {
+		return;
+	}
+
+	if (!IsColumnHidden(col)) {
+		// Remember the width so re-showing restores what the user had.
+		m_columnStore.SetCachedWidth(col, GetColumn(static_cast<unsigned>(col))->GetWidth());
+		SetColumnHidden(col, true, 0);
+	} else {
+		const int cached = m_columnStore.GetCachedWidth(col);
+		SetColumnHidden(col, false, cached > 0 ? cached : m_columnStore.GetColumnDefaultWidth(col));
+	}
+	UpdateExpanderColumn();
+	OnColumnVisibilityChanged();
+	SaveColumnSettings();
+}
+
+void CMuleDataViewCtrl::OnIdle(wxIdleEvent &event)
+{
+	event.Skip();
+
+	// No portable wxDataViewCtrl "column resized" event exists to hook directly (unlike
+	// wxListCtrl's EVT_LIST_COL_END_DRAG), so a drag-resize is detected by comparing against
+	// the last-seen widths.
+	bool changed = false;
+	for (int i = 0;
+		i < static_cast<int>(RealColumnCount()) && i < static_cast<int>(m_lastKnownWidths.size());
+		++i) {
+		const int width = GetColumn(i)->GetWidth();
+		if (width != m_lastKnownWidthsi) {
+			m_lastKnownWidthsi = width;
+			changed = true;
+		}
+	}
+
+	// Act when the drag ends, not on every step. Idle fires as long as the mouse moves, so a
+	// change on this tick means the pointer is still dragging and the width that matters is the
+	// one it stops at. Firing per observed change ran a wxConfig write, and for a search list a
+	// full column-sync across every other open tab, for each pixel of travel (issue #1022).
+	if (changed) {
+		m_widthsSettling = true;
+	} else if (m_widthsSettling) {
+		m_widthsSettling = false;
+		OnColumnWidthsChanged();
+	}
+
+	OnIdleHook();
+}
+
+void CMuleDataViewCtrl::OnChar(wxKeyEvent &evt)
+{
+	// The list gets first refusal on every key. Before the WXK_START test on purpose:
+	// WXK_DELETE is 127, well below it, so a delete-key handler after that test would never see
+	// it, while WXK_NUMPAD_DELETE would be skipped to the backend instead.
+	if (OnListKey(evt)) {
+		return;
+	}
+
+	int key = evt.GetKeyCode();
+	if (key == 0) {
+		// GetKeyCode() returns 0 for characters it cannot map; the unicode key is the fallback.
+		// GetUnicodeKey() returns wxChar -- a signed char in wx's UTF-8 build but wchar_t in the
+		// wide build, so an unsigned-char cast would truncate the wide case.
+		// NOLINTNEXTLINE(bugprone-signed-char-misuse)
+		key = evt.GetUnicodeKey();
+	} else if (key >= WXK_START) {
+		// Navigation keys belong to the backend's own cursor handling.
+		evt.Skip();
+		return;
+	}
+
+	if (evt.AltDown() || evt.ControlDown() || evt.MetaDown()) {
+		// Cmd/Ctrl+A: only wxGTK's backend selects all by itself, so do it here for all
+		// three. A control-modified 'a' arrives as SOH on most ports, but not universally,
+		// so accept the letter too.
+		const int plain = wxTolower(evt.GetKeyCode());
+		if (evt.CmdDown() && (evt.GetKeyCode() == 0x01 || plain == 'a')) {
+			SelectAll();
+			return;
+		}
+		evt.Skip();
+		return;
+	}
+
+	const uint64 now = GetTickCount64();
+	if (m_ttsTime + kTypeAheadResetMs < now) {
+		m_ttsText.Clear();
+	}
+	m_ttsTime = now;
+	m_ttsText.Append(wxTolower(static_cast<wxChar>(key)));
+
+	wxDataViewItemArray ordered;
+	GetDisplayOrder(ordered);
+	const size_t count = ordered.GetCount();
+	if (count == 0) {
+		return;
+	}
+
+	// A fresh single keystroke starts one past the current match so that
+	// tapping the same letter cycles; further keystrokes refine in place.
+	size_t start = 0;
+	for (size_t i = 0; i < count; ++i) {
+		if (orderedi.GetID() == m_ttsItem) {
+			start = i;
+			if (m_ttsText.length() == 1) {
+				++start;
+			}
+			break;
+		}
+	}
+
+	for (size_t i = 0; i < count; ++i) {
+		const wxDataViewItem item = ordered(start + i) % count;
+		if (GetRowLabel(item).Lower().StartsWith(m_ttsText)) {
+			m_ttsItem = item.GetID();
+			UnselectAll();
+			Select(item);
+			SetCurrentItem(item);
+			EnsureVisible(item);
+			return;
+		}
+	}
+	// No match: the accumulated text is kept (so a typo can be corrected by
+	// continuing to type) but the selection stays where it is.
+}
+
+void CMuleDataViewCtrl::OnContextMenuKey(wxContextMenuEvent &evt)
+{
+	if (evt.GetPosition() != wxDefaultPosition) {
+		// A real right-click is turned into wxEVT_DATAVIEW_ITEM_CONTEXT_MENU by every port;
+		// this handler exists for the keyboard-origin case (Shift+F10 / the Applications
+		// key on MSW and GTK, both of which fire this separate, dataview-agnostic event
+		// instead).
+		//
+		// Skipping is load-bearing on macOS, where that port raises the dataview event FROM
+		// this one in wxDataViewCtrl::OnContextMenu(). Our handler runs first, so
+		// swallowing a mouse-origin event would leave right-click with no context menu at
+		// all.
+		evt.Skip();
+		return;
+	}
+
+	RaiseItemContextMenu();
+}
+
+void CMuleDataViewCtrl::RaiseItemContextMenu()
+{
+	const wxDataViewItem item = GetCurrentItem();
+	if (item.IsOk()) {
+		// GetItemRect() answers an empty rect for a row that is not on screen, and the menu
+		// would then open in the control's top-left corner rather than at the row it acts
+		// on -- reachable by clicking a row and scrolling away before pressing the key.
+		// Bringing it into view also shows what the menu applies to, and does not scroll
+		// when the row is already visible.
+		EnsureVisible(item);
+	}
+
+	wxDataViewEvent menuEvent(wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, this, item);
+	const wxRect rect = item.IsOk() ? GetItemRect(item) : wxRect(GetClientSize());
+	menuEvent.SetPosition(rect.GetLeft(), rect.GetBottom());
+	ProcessWindowEvent(menuEvent);
+}
+
+void CMuleDataViewCtrl::OnKeyDown(wxKeyEvent &evt)
+{
+#ifdef __WXOSX__
+	// wx's Cocoa backend has no keyboard-triggered path to wxEVT_DATAVIEW_ITEM_CONTEXT_MENU. It
+	// does handle wxEVT_CONTEXT_MENU -- that is how a right-click becomes a dataview event
+	// there -- but nothing on this port raises that event from a keystroke, and there is no
+	// AXShowMenu implementation for any control on it (wxWidgets/wxWidgets#13010, open since
+	// 2011), so VoiceOver's VO+Shift+M never reaches wx either. Ctrl+Return was tried and
+	// rejected: NSOutlineView's keyDown: treats bare Return as "activate the row" before this
+	// handler sees it, Control held or not.
+	if (evt.ShiftDown() && evt.GetKeyCode() == WXK_F10) {
+		RaiseItemContextMenu();
+		return;
+	}
+
+	// NSOutlineView scrolls the view for these keys without touching the selection or the
+	// cursor, so on this platform they are ours to implement -- shifted, where GTK and MSW
+	// extend the selection, and unshifted too.
+	//
+	// Unshifted was left to the platform at first, scroll-without-select being the macOS
+	// convention, but it reads as broken: the cursor stays put, so the next arrow key jumps the
+	// view straight back and the page key looks like it did nothing. Moving the cursor with the
+	// view is what the other two ports do.
+	{
+		const bool extend = evt.ShiftDown();
+		switch (evt.GetKeyCode()) {
+		case WXK_PAGEUP:
+			MoveByPage(PageMotion::PageUp, extend);
+			return;
+		case WXK_PAGEDOWN:
+			MoveByPage(PageMotion::PageDown, extend);
+			return;
+		case WXK_HOME:
+			MoveByPage(PageMotion::Home, extend);
+			return;
+		case WXK_END:
+			MoveByPage(PageMotion::End, extend);
+			return;
+		default:
+			break;
+		}
+	}
+#endif
+	evt.Skip();
+}
+
+#ifdef __WXOSX__
+void CMuleDataViewCtrl::MoveByPage(PageMotion motion, bool extend)
+{
+	wxDataViewItemArray ordered;
+	GetDisplayOrder(ordered);
+	const size_t rowCount = ordered.GetCount();
+	if (rowCount == 0) {
+		return;
+	}
+
+	const wxDataViewItem currentItem = GetCurrentItem();
+	const int last = static_cast<int>(rowCount) - 1;
+	const bool forward = (motion == PageMotion::PageDown) || (motion == PageMotion::End);
+
+	int current = forward ? -1 : static_cast<int>(rowCount);
+	if (currentItem.IsOk()) {
+		const int found = ordered.Index(currentItem);
+		if (found != wxNOT_FOUND) {
+			current = found;
+		}
+	}
+
+	int target = 0;
+	switch (motion) {
+	case PageMotion::Home:
+		target = 0;
+		break;
+	case PageMotion::End:
+		target = last;
+		break;
+	default: {
+		// GetCountPerPage() is implemented by the native macOS backend. GetItemRect() is
+		// not a substitute: it returns an empty rect for rows not on screen, and the
+		// resulting zero height collapses a page to a single row.
+		int rows = GetCountPerPage();
+		if (rows <= 0) {
+			rows = 10;
+		} else {
+			// Leave one row of overlap, as the other ports scroll.
+			rows = std::max(1, rows - 1);
+		}
+		const int delta = (motion == PageMotion::PageDown) ? rows : -rows;
+		target = std::min(last, std::max(0, current + delta));
+		break;
+	}
+	}
+
+	const wxDataViewItem targetItem = orderedtarget;
+
+	wxDataViewItemArray selection;
+	if (extend) {
+		// Grow the existing selection to cover everything between where the
+		// cursor was and where it lands, so repeated presses keep extending.
+		GetSelections(selection);
+		const int from = std::min(current < 0 ? target : current, target);
+		const int to = std::max(current > last ? target : current, target);
+		for (int i = std::max(0, from); i <= std::min(last, to); ++i) {
+			if (selection.Index(orderedi) == wxNOT_FOUND) {
+				selection.Add(orderedi);
+			}
+		}
+	} else {
+		// Unshifted: the row landed on becomes the selection, as an arrow
+		// key would leave it.
+		selection.Add(targetItem);
+	}
+
+	SetSelections(selection);
+	// The cursor, not just the selection: it is what the arrow keys move from next, and leaving
+	// it behind is what made an unshifted page key look like it had done nothing as soon as one
+	// was pressed.
+	SetCurrentItem(targetItem);
+	EnsureVisible(targetItem);
+}
+#endif // __WXOSX__

amule-3.1.0.tar.gz/src/MuleDataViewCtrl.h Added

@@ -0,0 +1,369 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+
+#ifndef MULEDATAVIEWCTRL_H
+#define MULEDATAVIEWCTRL_H
+
+#include <wx/dataview.h>
+
+#include "ListColumnStore.h" // Needed for CListColumnStore, IColumnWidthProvider, COL_SIZE_MIN
+#include "Types.h"           // Needed for uint64
+
+#include <list>
+#include <utility>
+#include <vector>
+
+class CMuleBarRenderer;
+
+/**
+ * Shared behaviour for aMule's wxDataViewCtrl-backed lists.
+ *
+ * The wxDataViewCtrl counterpart of CMuleListCtrl: the chrome every list needs and no list should
+ * implement twice -- column widths and their persistence, the show/hide menu, the multi-column sort
+ * chain, type-ahead selection, and the per-platform compensation the ports have had to grow.
+ *
+ * It owns no data. A subclass supplies its rows through GetDisplayOrder(), their label through
+ * GetRowLabel(), and how two of them compare on a column through CompareByColumn(); everything else
+ * here is written in terms of those three.
+ *
+ * Lists with a flat, row-addressed model should derive from CMuleVirtualDataViewCtrl instead, which
+ * adds the item-identity bookkeeping on top of this.
+ */
+class CMuleDataViewCtrl : public wxDataViewCtrl
+{
+public:
+	CMuleDataViewCtrl(wxWindow *parent,
+		wxWindowID winid = wxID_ANY,
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
+		long style = 0,
+		const wxString &name = "muledataviewctrl");
+
+	~CMuleDataViewCtrl() override;
+
+	//! Sort-order bits, matching CMuleListCtrl so the persisted config stays
+	//! wire-compatible across both list families.
+	enum
+	{
+		SORT_DES = 0x1,
+		SORT_ALT = 0x2,
+		SORTING_MASK = 0x3
+	};
+
+	/// What asked for a sort, which decides how the header caret is drawn. Only wxGTK cares,
+	/// and only because it takes a second run at the caret on its own after a header click --
+	/// see ShowSortCaret().
+	enum class SortTrigger
+	{
+		Programmatic, //!< aMule chose the order: startup, defaults, list sync
+		HeaderClick   //!< the user clicked the header
+	};
+
+	/// Whether a column is hidden. Tracked here rather than derived from the control: a hidden
+	/// wxDataViewColumn keeps reporting its previous width, so width alone cannot answer, and
+	/// the width is what CListColumnStore persists (as a negative entry carrying the size to
+	/// restore).
+	bool IsColumnHidden(int col) const;
+	//! Hide or show a column; width is the one to restore when showing.
+	void SetColumnHidden(int col, bool hidden, int width);
+
+	/// Columns the user owns, excluding the macOS spacer (see the constructor), which must stay
+	/// out of the header menu, the persisted widths and any cross-list synchronisation.
+	unsigned RealColumnCount() const;
+
+protected:
+	typedef std::pair<unsigned, unsigned> CColPair;
+	typedef std::list<CColPair> CSortingList;
+
+	// --- what a subclass must provide -------------------------------------
+
+	/// The rows as displayed, addressed by position. Built once per operation (a keystroke, a
+	/// page key) rather than probed per row: a list that derives its order has to walk its data
+	/// to answer at all, so per-row access would repeat that walk for every row.
+	/// Implementations must include the children of expanded containers, since callers measure
+	/// against what is on screen.
+	virtual void GetDisplayOrder(wxDataViewItemArray &ordered) const = 0;
+
+	//! Text a row is matched against when the user types to select.
+	virtual wxString GetRowLabel(const wxDataViewItem &item) const = 0;
+
+	/// Single-column comparison, without the chain or the direction: the caller applies
+	/// `modifier` (-1 when descending) to the result.
+	virtual int CompareByColumn(const wxDataViewItem &item1,
+		const wxDataViewItem &item2,
+		unsigned column,
+		bool alt,
+		int modifier) const = 0;
+
+	//! Whether a column offers a secondary "alt" sort criterion.
+	virtual bool AltSortAllowed(unsigned WXUNUSED(column)) const { return false; }
+
+	//! Column-name string for migrating pre-CListColumnStore config entries.
+	virtual wxString GetOldColumnOrder() const { return wxEmptyString; }
+
+	/// First refusal on every key, before type-ahead or the backend sees it. Return true to
+	/// swallow it; the default claims nothing.
+	virtual bool OnListKey(wxKeyEvent &WXUNUSED(evt)) { return false; }
+
+	//! Called once per idle after the base has done its own housekeeping.
+	virtual void OnIdleHook() {}
+
+	//! Called after a column is shown or hidden from the header menu.
+	virtual void OnColumnVisibilityChanged() {}
+
+	/**
+	 * A drag-resize has been detected from idle (wxDataViewCtrl has no portable end-of-drag
+	 * event, so widths are polled).
+	 *
+	 * The default persists them. wxListCtrl had EVT_LIST_COL_END_DRAG to hook, and when these
+	 * lists moved to wxDataViewCtrl the poll replaced it but was never wired to the store, so a
+	 * resized column was only saved if the user happened to sort or toggle a column afterwards.
+	 * An override must call the base, or resizing stops being remembered for that list.
+	 *
+	 * Fired once per drag, when the widths stop moving -- not once per pixel. The poll runs on
+	 * idle, which fires continuously while the mouse does, so acting on every observed change
+	 * made a single drag do its work hundreds of times: a wxConfig write each time here, and in
+	 * CSearchListCtrl a width-set on every column of every other open search tab, each forcing
+	 * a header relayout and repaint. That is what made resizing flicker and spike the CPU, the
+	 * more so the more tabs were open (issue #1022).
+	 */
+	virtual void OnColumnWidthsChanged() { SaveColumnSettings(); }
+
+	//! Called after the sort chain changes; the list re-orders its rows here.
+	virtual void OnSortingChanged() {}
+
+	// --- services for subclasses ------------------------------------------
+
+	//! Full chain comparison: primary column first, then the tie-breakers.
+	int CompareItems(const wxDataViewItem &item1, const wxDataViewItem &item2) const;
+
+	//! Pushes a column to the front of the sort chain and applies the caret.
+	void ApplySorting(unsigned column, unsigned order, SortTrigger trigger = SortTrigger::Programmatic);
+
+	/// Draws the header caret for `order` on `column` and clears it elsewhere. Split out of
+	/// ApplySorting() for the lists that keep the sort chain in step by hand (CSearchListCtrl
+	/// mirrors one list's order onto the others) and must not re-enter the chain bookkeeping.
+	void ShowSortCaret(unsigned column, unsigned order, SortTrigger trigger = SortTrigger::Programmatic);
+
+	/**
+	 * Drops the header's sort key for the duration of a bulk append, and puts it back
+	 * afterwards.
+	 *
+	 * The caret is drawn by marking a column as the control's sort key, which the native
+	 * backends read as an instruction to keep the view ordered themselves -- and macOS acts on
+	 * it per insertion: every RowInserted() has NSOutlineView re-query the data source and re-
+	 * run our Compare(), so appending N rows costs O(N^2) even though each append is O(1) on
+	 * our side. Suspending the key for the burst leaves the rows in arrival order (the caller
+	 * sorts once at the end anyway) and the comparisons never happen.
+	 *
+	 * Balanced calls; nesting is not supported. Restoring re-draws the caret from
+	 * m_sort_orders, so a sort change during the burst is honoured.
+	 */
+	void SuspendHeaderSort();
+	void RestoreHeaderSort();
+
+	void LoadColumnSettings();
+	void SaveColumnSettings();
+
+	/// True when LoadColumnSettings() restored at least one stored width, i.e. this profile has
+	/// a layout the user has already influenced. An auto-fit must not run then: it would
+	/// overwrite a width that was deliberately dragged. That mattered little while drag-resizes
+	/// were never saved, but they are now, so a fit-on-load would discard the choice one launch
+	/// later.
+	bool HasPersistedColumnWidths() const { return m_hasPersistedWidths; }
+
+	//! Keeps the expander on the leftmost visible column.
+	void UpdateExpanderColumn();
+
+	/// Appends the trailing spacer column on macOS. Call it after the subclass' own columns and
+	/// before LoadColumnSettings(): macOS sizes the last *resizable* column to the leftover
+	/// space, collapsing it to nothing once the columns are wider than the control, so a spacer
+	/// takes that role instead of a column the user cares about. @a modelColumn is an always-
+	/// empty column the subclass' model must answer for.
+	void AppendSpacerColumn(unsigned modelColumn);
+
+	/// Appends a column rendered by a CMuleBarRenderer (a CBarShader chunk bar), for lists that
+	/// used to paint one with direct wxDC calls in an owner-drawn OnDrawItem(). The subclass
+	/// supplies the per-row fill data through CMuleVirtualDataViewCtrl::GetItemBarFill(). @a
+	/// renderer lets a subclass draw more than the plain chunk bar (CDownloadListCtrl's
+	/// CDownloadBarRenderer adds a completed-progress overlay and percent text); null
+	/// constructs a plain one.
+	void AppendBarColumn(const wxString &title,
+		unsigned modelColumn,
+		int width,
+		int flags = wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE,
+		CMuleBarRenderer *renderer = nullptr);
+
+	/**
+	 * Append a column and register it for persistence, in one call.
+	 *
+	 * A column's width has to reach two places that never meet: wx, which uses it as the
+	 * initial on-screen width, and CListColumnStore, which keeps it as the default to restore a
+	 * column to when it is un-hidden with no width cached. Passing it separately to
+	 * AppendTextColumn() and RegisterColumn() meant writing the same number twice with nothing
+	 * keeping the two honest -- the legacy CMuleListCtrl::InsertColumn() took both in one call
+	 * and could not drift.
+	 *
+	 * @a key is the persistence key: a single letter, written to TableWidths<list> /
+	 * TableOrdering<list> in the config. It is the on-disk format, so changing one resets that
+	 * column's saved width and forgets its sort.
+	 *
+	 * @a mode is last, rather than in wx's position ahead of the width, because width has no
+	 * default and a parameter before it could not have one either -- every caller would have to
+	 * spell out INERT. Every column is inert today; the parameter exists so that an editable
+	 * one later need not drop back to Append* plus a hand-written RegisterColumn().
+	 *
+	 * Named Add* rather than overloading wx's Append*: an overload with a different signature
+	 * would still bind to the wx method wherever a call was missed, compiling cleanly and
+	 * persisting nothing. A distinct name makes "still calls Append*" a signal grep can check.
+	 */
+	void AddTextColumn(const wxString &label,
+		unsigned modelColumn,
+		const wxString &key,
+		int width,
+		wxAlignment align = wxALIGN_LEFT,
+		int flags = wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE,
+		wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT);
+
+	/// AddTextColumn() for a column whose cells carry an icon beside the text.
+	void AddIconTextColumn(const wxString &label,
+		unsigned modelColumn,
+		const wxString &key,
+		int width,
+		wxAlignment align = wxALIGN_LEFT,
+		int flags = wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE,
+		wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT);
+
+	/// AddTextColumn() for a CMuleBarRenderer column; see AppendBarColumn().
+	void AddBarColumn(const wxString &label,
+		unsigned modelColumn,
+		const wxString &key,
+		int width,
+		int flags = wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE,
+		CMuleBarRenderer *renderer = nullptr);
+
+	/// Sizes the per-column state and snapshots the current widths. Call after the columns
+	/// exist and after LoadColumnSettings(): it preserves any hidden flags already restored
+	/// through the width adapter.
+	void InitColumnState();
+
+	/// Adapts this control to IColumnWidthProvider for CListColumnStore. A separate object
+	/// rather than multiple inheritance: wxDataViewCtrl's own GetColumnCount() is virtual and
+	/// returns unsigned, which is not override-compatible with the interface's int.
+	class ColumnWidthAdapter : public IColumnWidthProvider
+	{
+	public:
+		explicit ColumnWidthAdapter(CMuleDataViewCtrl *ctrl)
+		: m_ctrl(ctrl)
+		{
+		}
+		int GetColumnCount() const override { return static_cast<int>(m_ctrl->RealColumnCount()); }
+		//! A hidden column reads as zero-width, which is how
+		//! CListColumnStore already persists hidden state.
+		int GetColumnWidth(int col) const override;
+		bool SetColumnWidth(int col, int width) override
+		{
+			m_ctrl->SetColumnHidden(col, width <= COL_SIZE_MIN, width);
+			return true;
+		}
+
+	private:
+		CMuleDataViewCtrl *m_ctrl;
+	};
+
+	CListColumnStore m_columnStore;
+	ColumnWidthAdapter m_widthAdapter;
+	CSortingList m_sort_orders;
+	//! Set between SuspendHeaderSort() and RestoreHeaderSort().
+	bool m_headerSortSuspended = false;
+	bool m_hasPersistedWidths = false;
+
+	void OnColumnHeaderClick(wxDataViewEvent &event);
+	void OnColumnHeaderRightClick(wxDataViewEvent &event);
+	void OnColumnMenuSelected(wxCommandEvent &evt);
+	void OnIdle(wxIdleEvent &event);
+	void OnChar(wxKeyEvent &evt);
+	void OnKeyDown(wxKeyEvent &evt);
+	void OnContextMenuKey(wxContextMenuEvent &evt);
+
+	//! Synthesises wxEVT_DATAVIEW_ITEM_CONTEXT_MENU for the current item, positioned at its row
+	//! rather than the mouse -- shared by every keyboard-triggered path (OnContextMenuKey, and
+	//! OSX's Shift+F10 in OnKeyDown).
+	void RaiseItemContextMenu();
+
+	/**
+	 * Re-baselines the widths the idle poll compares against.
+	 *
+	 * Call after changing a column width programmatically, so the poll reads the result as the
+	 * status quo rather than as a user drag. Takes the widths the control actually ended up
+	 * with, which is not always what was asked for -- GTK clamps a column to a minimum derived
+	 * from its header and contents, so a narrow request comes back wider.
+	 *
+	 * Without it a programmatic width change is indistinguishable from a drag, and any list
+	 * that rebroadcasts on OnColumnWidthsChanged() feeds its own echo: CSearchListCtrl mirrors
+	 * widths to the other search tabs, each of which then saw "its" widths change and mirrored
+	 * them back. Two tabs whose clamped minimums differ never agree, so the pair oscillated
+	 * indefinitely, repainting on every hop, long after the mouse was released (issue #1022).
+	 */
+	void ResetKnownWidths();
+
+private:
+	//! Per-column hidden state, indexed like the control's columns.
+	std::vector<bool> m_columnHidden;
+
+	//! Last-seen widths, for detecting a drag-resize (no portable event).
+	std::vector<int> m_lastKnownWidths;
+
+	//! Whether the widths moved since the last idle, i.e. a drag is still in progress.
+	//! OnColumnWidthsChanged() fires when this goes back to false, not while it is true.
+	bool m_widthsSettling = false;
+
+	//! True once AppendSpacerColumn() has run (macOS only).
+	bool m_hasSpacer = false;
+
+	// Type-ahead state.
+	wxString m_ttsText;
+	uint64 m_ttsTime = 0;
+	void *m_ttsItem = nullptr;
+
+#ifdef __WXOSX__
+	enum class PageMotion
+	{
+		PageUp,
+		PageDown,
+		Home,
+		End
+	};
+	/// Moves the cursor by a page, or to the start/end of the list, and brings it into view.
+	/// GTK and MSW get this from their backends; NSOutlineView scrolls without moving cursor or
+	/// selection, which leaves the next arrow key jumping back to wherever the cursor was left.
+	/// @a extend grows the selection to the row landed on, as Shift does on the other ports,
+	/// rather than replacing it.
+	void MoveByPage(PageMotion motion, bool extend);
+#endif
+
+	wxDECLARE_EVENT_TABLE();
+};
+
+#endif // MULEDATAVIEWCTRL_H

amule-3.0.1.tar.gz/src/MuleGifCtrl.cpp -> amule-3.1.0.tar.gz/src/MuleGifCtrl.cpp Changed

@@ -22,16 +22,13 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include <wx/mstream.h>
 #include <wx/gifdecod.h>
 #include <wx/dcbuffer.h>
 
-
 #include "MuleGifCtrl.h"
 #include "Types.h"
 
-
 wxBEGIN_EVENT_TABLE(MuleGifCtrl, wxControl)
 	EVT_TIMER(GIFTIMERID, MuleGifCtrl::OnTimer)
 	EVT_PAINT(MuleGifCtrl::OnPaint)
@@ -41,18 +38,15 @@
 class MuleGIFDecoder : public wxGIFDecoder
 {
 public:
-	MuleGIFDecoder()
-	{
-		m_nframe = 0;
-	}
+	MuleGIFDecoder() { m_nframe = 0; }
 
-	~MuleGIFDecoder() { }
+	~MuleGIFDecoder() {}
 
 	void GoFirstFrame() { m_nframe = 0; }
 	void GoNextFrame() { (m_nframe < GetFrameCount() - 1) ? m_nframe++ : m_nframe = 0; }
 	void GoLastFrame() { m_nframe = GetFrameCount() - 1; }
 
-	void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
+	void ConvertToImage(wxImage *image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
 
 	long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
 
@@ -60,22 +54,19 @@
 	uint32_t m_nframe;
 };
 
-MuleGifCtrl::MuleGifCtrl(
-	wxWindow *parent,
+MuleGifCtrl::MuleGifCtrl(wxWindow *parent,
 	wxWindowID id,
-	const wxPoint& pos,
-	const wxSize& size,
+	const wxPoint &pos,
+	const wxSize &size,
 	long style,
-	const wxValidator& validator,
-	const wxString& name)
-:
-wxControl(parent, id, pos, size, style, validator, name),
-m_decoder(NULL),
-m_timer(this, GIFTIMERID)
+	const wxValidator &validator,
+	const wxString &name)
+: wxControl(parent, id, pos, size, style, validator, name)
+, m_decoder(NULL)
+, m_timer(this, GIFTIMERID)
 {
 }
 
-
 MuleGifCtrl::~MuleGifCtrl()
 {
 	m_timer.Stop();
@@ -85,8 +76,7 @@
 	}
 }
 
-
-bool MuleGifCtrl::LoadData(const char* data, int size)
+bool MuleGifCtrl::LoadData(const char *data, int size)
 {
 	if (m_decoder) {
 		m_timer.Stop();
@@ -96,7 +86,7 @@
 
 	wxMemoryInputStream stream(data, size);
 	m_decoder = new MuleGIFDecoder();
-	if ( m_decoder->LoadGIF(stream) != wxGIF_OK ) {
+	if (m_decoder->LoadGIF(stream) != wxGIF_OK) {
 		delete m_decoder;
 		m_decoder = NULL;
 		return false;
@@ -104,13 +94,12 @@
 
 	m_decoder->GoFirstFrame();
 	wxImage frame;
-	m_decoder->ConvertToImage( &frame );
+	m_decoder->ConvertToImage(&frame);
 	m_frame = wxBitmap(frame);
 
 	return true;
 }
 
-
 void MuleGifCtrl::Start()
 {
 	if (m_decoder && m_decoder->IsAnimation()) {
@@ -121,20 +110,17 @@
 	}
 }
 
-
 void MuleGifCtrl::Stop()
 {
 	m_timer.Stop();
 }
 
-
 wxSize MuleGifCtrl::GetBestSize()
 {
 	return m_decoder->GetAnimationSize();
 }
 
-
-void MuleGifCtrl::OnTimer(wxTimerEvent& WXUNUSED(event))
+void MuleGifCtrl::OnTimer(wxTimerEvent &WXUNUSED(event))
 {
 	if (m_decoder) {
 		if (m_decoder->IsAnimation()) {
@@ -153,20 +139,18 @@
 	}
 }
 
-
-void MuleGifCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
+void MuleGifCtrl::OnPaint(wxPaintEvent &WXUNUSED(event))
 {
 	wxBufferedPaintDC dc(this);
 
 	wxSize clientsize = GetClientSize();
 	wxSize gifsize = m_decoder->GetAnimationSize();
-	int x = (clientsize.GetWidth()-gifsize.GetWidth())/2;
-	int y = (clientsize.GetHeight()-gifsize.GetHeight())/2;
+	int x = (clientsize.GetWidth() - gifsize.GetWidth()) / 2;
+	int y = (clientsize.GetHeight() - gifsize.GetHeight()) / 2;
 
 	dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID)));
 	dc.Clear();
 	dc.DrawBitmap(m_frame, x, y, true);
 }
 
-
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/MuleGifCtrl.h -> amule-3.1.0.tar.gz/src/MuleGifCtrl.h Changed

@@ -22,35 +22,25 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #ifndef MULEGIFCTRL_H
 #define MULEGIFCTRL_H
 
-
 #include <wx/control.h>
 #include <wx/timer.h>
 
-
 const int GIFTIMERID = 271283;
 
-
 class MuleGIFDecoder;
 class wxBitmap;
 
-
 /**
- * MuleGifCtrl is a simple widget for displaying a gif animation.
- * It is based on the animation classes by Julian Smart and
- * Guillermo Rodriguez Garcia, but is specialized for the reduced
- * requirements of the aMule project. It provides flicker-free
- * redrawing using wxBufferedPaintDC.
+ * A simple widget for displaying a gif animation, based on the animation classes by Julian Smart
+ * and Guillermo Rodriguez Garcia but specialized for aMule's reduced requirements. Redrawing is
+ * flicker-free, via wxBufferedPaintDC.
  *
- * To reduce complexity, several things have been hardcoded, though
- * they can easily be changed:
- *  - The animation will continue to loop until Stop() is called.
- *  - The gif image is assumed to be transparent.
- *  - Start will start the animation from the first frame and wont
- *     continue a stopped animation.
+ * Several things are hardcoded to keep it simple, though they are easy to change: the animation
+ * loops until Stop() is called, the gif is assumed to be transparent, and Start() begins at the
+ * first frame rather than continuing a stopped animation.
  */
 class MuleGifCtrl : public wxControl
 {
@@ -64,40 +54,29 @@
 
 public:
 	/**
-	 * Constructor. See wxWindow class documentation for more information.
+	 * See the wxWindow class documentation for more information.
 	 */
-	MuleGifCtrl(
-		wxWindow *parent, wxWindowID id,
-		const wxPoint& pos = wxDefaultPosition,
-		const wxSize& size = wxDefaultSize,
+	MuleGifCtrl(wxWindow *parent,
+		wxWindowID id,
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
 		long style = 0,
-		const wxValidator& validator = wxDefaultValidator,
-		const wxString& name = wxControlNameStr);
+		const wxValidator &validator = wxDefaultValidator,
+		const wxString &name = wxControlNameStr);
 
-	/**
-	 * Destructor
-	 */
 	virtual ~MuleGifCtrl();
 
 	/**
-	 * This loads the gif image from a char-array with a specific size.
-	 *
-	 * @param data The array containing the image.
-	 * @param size The size of the array.
-	 * @return Returns true if the data was loaded, false otherwise.
-	 *
-	 * This sets the current animation and displays the first frame. If another
-	 * animation was loaded, it will be unloaded and the animation stopped.
+	 * Loads a gif image from a char array of @a size bytes, returning whether it loaded.
 	 *
-	 * To convert a image to a format readable by this function, you can
-	 * use the utility hexdump. Look at inetdownload.h for how to format
-	 * the output.
+	 * Sets the current animation and displays its first frame; any animation already loaded is
+	 * unloaded and stopped. To convert an image into a form this can read, use hexdump -- see
+	 * inetdownload.h for how to format the output.
 	 */
-	bool LoadData(const char* data, int size);
+	bool LoadData(const char *data, int size);
 
 	/**
-	 * This function starts playing the animation provided that a animation is
-	 * set and it's not a static image.
+	 * Starts playing the animation, provided one is set and it is not a static image.
 	 */
 	void Start();
 
@@ -107,9 +86,7 @@
 	void Stop();
 
 	/**
-	 * Returns the preferred size of the widget.
-	 *
-	 * @return Preferred size, which is the size of the animation.
+	 * The preferred size of the widget, which is the size of the animation.
 	 */
 	virtual wxSize GetBestSize();
 
@@ -117,21 +94,18 @@
 	/**
 	 * Timer function that selects the next frame in an animation.
 	 */
-	void OnTimer( wxTimerEvent& event );
+	void OnTimer(wxTimerEvent &event);
 
 	/**
-	 * Function for drawing the animation.
-	 *
-	 * This functions draws the current frame, which is changed in OnTimer(),
-	 * using a wxBufferedPaintDC. By doing so and also catching the
-	 * ERASE_BACKGROUND events we avoid flickering on redraws.
+	 * Draws the current frame, changed in OnTimer(), through a wxBufferedPaintDC. That, plus
+	 * catching the ERASE_BACKGROUND events, avoids flicker on redraws.
 	 */
-	void OnPaint( wxPaintEvent& event );
+	void OnPaint(wxPaintEvent &event);
 
 	/**
-	 * This function is used to avoid flicker when redrawing.
+	 * Avoids flicker when redrawing.
 	 */
-	void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
+	void OnErase(wxEraseEvent &WXUNUSED(event)) {}
 
 	//! Enables the event functions OnErase(), OnTimer() and OnPaint().
 	wxDECLARE_EVENT_TABLE();

amule-3.1.0.tar.gz/src/MuleIconTextRenderer.cpp Added

@@ -0,0 +1,81 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "MuleIconTextRenderer.h" // Interface declarations
+
+#include <wx/dc.h>   // Needed for wxDC (not pulled in by dataview.h on GTK)
+#include <wx/icon.h> // Needed for wxIcon
+
+#include <algorithm> // Needed for std::max
+
+CMuleIconTextRenderer::CMuleIconTextRenderer()
+: wxDataViewCustomRenderer("wxDataViewIconText", wxDATAVIEW_CELL_INERT, wxALIGN_LEFT)
+{
+}
+
+bool CMuleIconTextRenderer::SetValue(const wxVariant &value)
+{
+	m_value << value;
+	return true;
+}
+
+bool CMuleIconTextRenderer::GetValue(wxVariant &value) const
+{
+	value << m_value;
+	return true;
+}
+
+bool CMuleIconTextRenderer::Render(wxRect cell, wxDC *dc, int state)
+{
+	int xoffset = 0;
+
+	const wxIcon &icon = m_value.GetIcon();
+	if (icon.IsOk()) {
+		// Centred vertically: the icon is a fixed size while the row height
+		// follows the font, so the two rarely match.
+		const int y = cell.y + std::max(0, (cell.height - icon.GetHeight()) / 2);
+		dc->DrawIcon(icon, cell.x, y);
+		xoffset = icon.GetWidth() + kIconTextGap;
+	}
+
+	// A row with no icon passes xoffset 0 and starts at the cell edge -- the
+	// whole point of not using wx's renderer here.
+	RenderText(m_value.GetText(), xoffset, cell, dc, state);
+	return true;
+}
+
+wxSize CMuleIconTextRenderer::GetSize() const
+{
+	// Measured from a non-empty string when the cell has no text: an empty extent would report
+	// zero height, and on the native macOS backend this height is what the row is sized from.
+	const wxString &text = m_value.GetText();
+	wxSize size = GetTextExtent(text.IsEmpty() ? wxString("Xg") : text);
+
+	const wxIcon &icon = m_value.GetIcon();
+	if (icon.IsOk()) {
+		size.x += icon.GetWidth() + kIconTextGap;
+		size.y = std::max(size.y, icon.GetHeight());
+	}
+	return size;
+}

amule-3.1.0.tar.gz/src/MuleIconTextRenderer.h Added

@@ -0,0 +1,63 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 MULEICONTEXTRENDERER_H
+#define MULEICONTEXTRENDERER_H
+
+#include <wx/dataview.h> // Needed for wxDataViewCustomRenderer, wxDataViewIconText
+
+/**
+ * Draws a wxDataViewIconText cell, but only reserves room for the icon on the rows that actually
+ * have one.
+ *
+ * wx's own icon+text renderer reserves the icon slot unconditionally, so in a column where the icon
+ * is the exception rather than the rule -- a rating smiley on the handful of files that carry one
+ * -- every other row's text is indented past an empty gap. On the native macOS cell the reserved
+ * width is not even adjustable: wxImageTextCell hardcodes a 5px leading shift, a 5px icon-to-text
+ * gap and a 16x16 icon as private ivars, none of them reachable from C++.
+ *
+ * Text is drawn through wxDataViewCustomRenderer::RenderText(), so ellipsizing, the selected-row
+ * foreground colour and RTL layout stay exactly as the stock renderers do them; only the icon
+ * placement is ours.
+ */
+class CMuleIconTextRenderer : public wxDataViewCustomRenderer
+{
+public:
+	CMuleIconTextRenderer();
+
+	bool SetValue(const wxVariant &value) override;
+	bool GetValue(wxVariant &value) const override;
+
+	bool Render(wxRect cell, wxDC *dc, int state) override;
+	wxSize GetSize() const override;
+
+private:
+	//! Gap between the icon and the text. No leading inset: the icon starts at
+	//! the cell edge, which is what keeps an icon row aligned with a bare one.
+	static const int kIconTextGap = 4;
+
+	wxDataViewIconText m_value;
+};
+
+#endif // MULEICONTEXTRENDERER_H

amule-3.1.0.tar.gz/src/MuleLogCtrl.cpp Added

@@ -0,0 +1,242 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "MuleLogCtrl.h"
+
+#include <wx/settings.h>
+
+#include <cstdlib> // std::abs
+
+namespace
+{
+// Perceived brightness (ITU-R BT.601 luma), 0 (black) .. 255 (white).
+int Luminance(const wxColour &c)
+{
+	return (c.Red() * 299 + c.Green() * 587 + c.Blue() * 114) / 1000;
+}
+
+// Whether two colours are far enough apart in brightness for text painted in one over the other to
+// be legible. The threshold is deliberately generous: a false "too close" only forgoes the theme's
+// exact foreground for a guaranteed-readable black or white.
+bool Contrasts(const wxColour &a, const wxColour &b)
+{
+	return std::abs(Luminance(a) - Luminance(b)) >= 64;
+}
+} // namespace
+
+CMuleLogCtrl::CMuleLogCtrl(wxWindow *parent,
+	wxWindowID id,
+	const wxPoint &pos,
+	const wxSize &size,
+	long style,
+	const wxString &name)
+: wxStyledTextCtrl(parent, id, pos, size, style, name)
+, m_inBatch(false)
+, m_batchTailing(false)
+, m_scrollPending(false)
+, m_lastAutoScrollLine(-1)
+{
+	// Store text as UTF-8 so AppendText()'s wxString conversion and the byte
+	// positions used for styling agree (GetLength() is a byte count).
+	SetCodePage(wxSTC_CP_UTF8);
+
+	// Look like a plain log pane, not a code editor: no line-number / symbol /
+	// fold margins.
+	for (int margin = 0; margin < 3; ++margin) {
+		SetMarginWidth(margin, 0);
+	}
+	// Zeroing the numbered margins above also removes the only inset Scintilla had, so text
+	// rendered hard against the control's frame (issue #702). These are the text-area margins,
+	// a separate concept, so they restore the padding without bringing the code-editor gutters
+	// back. DIP-scaled so the gap keeps its size on HiDPI, and visibly larger than Scintilla's
+	// own 1px default, which is what made the text look flush.
+	const int textMargin = FromDIP(5);
+	SetMarginLeft(textMargin);
+	SetMarginRight(textMargin);
+
+	// Scintilla has no vertical counterpart to the text-area margins, so the first line
+	// otherwise sits directly on the frame. extraAscent feeds lineHeight, so this is line
+	// spacing rather than a one-off top gap -- which is what we want: the log tails to the
+	// bottom, so a fixed band at the viewport top would only show above a partially scrolled
+	// line.
+	SetExtraAscent(FromDIP(2));
+
+	// No caret: this pane is read-only, so there is no insertion point for one to mark.
+	// Scintilla draws it regardless, at the very left of the text area, which went unnoticed
+	// while the text started there too -- but once the margins inset the text the caret was
+	// left sitting on the frame (issue #702). Selection highlighting is independent of caret
+	// visibility.
+	SetCaretStyle(wxSTC_CARETSTYLE_INVISIBLE);
+
+	// Word-wrap long lines, as the old wxTE_RICH2 pane did, so nothing is clipped off the right
+	// edge; with wrapping on there is no horizontal scrollbar to show. Wrapping is why
+	// AtBottom() and the tail-scroll reason in display lines rather than document lines.
+	SetWrapMode(wxSTC_WRAP_WORD);
+	SetUseHorizontalScrollBar(false);
+
+	// Theme-aware colours, matching the old wxTE_RICH2, which used the system window colours --
+	// so dark themes keep working. Scintilla does not follow the system appearance on its own,
+	// so re-apply on every theme change.
+	SetupStyles();
+	Bind(wxEVT_SYS_COLOUR_CHANGED, &CMuleLogCtrl::OnSysColourChanged, this);
+
+	SetReadOnly(true);
+}
+
+void CMuleLogCtrl::SetupStyles()
+{
+	wxColour fg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+	const wxColour bg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+
+	// On macOS the window/text system colours are appearance-aware and resolved to RGB at call
+	// time, and in some configurations come back with too little contrast, painting the whole
+	// log invisible (issue #569). Windows and GTK return static, well-contrasted values. When
+	// the pair is unreadable, keep the theme's background but force a legible foreground from
+	// its brightness.
+	if (!Contrasts(fg, bg)) {
+		fg = Luminance(bg) < 128 ? *wxWHITE : *wxBLACK;
+	}
+
+	StyleSetForeground(wxSTC_STYLE_DEFAULT, fg);
+	StyleSetBackground(wxSTC_STYLE_DEFAULT, bg);
+	StyleSetFont(wxSTC_STYLE_DEFAULT, wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+	// Propagate the default style to all styles, then make critical lines bold. This also re-
+	// themes existing text on a live appearance change: the style bytes (Style_Normal /
+	// Style_Critical) are kept, only their colours change.
+	StyleClearAll();
+	StyleSetBold(Style_Critical, true);
+}
+
+void CMuleLogCtrl::OnSysColourChanged(wxSysColourChangedEvent &event)
+{
+	SetupStyles();
+	event.Skip();
+}
+
+bool CMuleLogCtrl::AtBottom()
+{
+	// Compare in DISPLAY lines: GetFirstVisibleLine()/LinesOnScreen() count wrapped rows while
+	// GetLineCount() counts document lines, so with wrapping on the two must be reconciled. The
+	// total is the first display row of the last doc line plus how many rows it wraps to,
+	// generous by one so "sitting at the end" always re-tails on append.
+	const int lastDoc = GetLineCount() - 1;
+	const int displayLines = VisibleFromDocLine(lastDoc) + WrapCount(lastDoc);
+	return GetFirstVisibleLine() + LinesOnScreen() >= displayLines - 1;
+}
+
+void CMuleLogCtrl::ScrollToBottom()
+{
+	// Request only -- OnInternalIdle() is the sole scroller. Keeping every scroll in one place
+	// stops the tail-scroll from racing the idle re-scroll loop: that loop tells a manual
+	// scroll from an append by watching the first-visible line, and a direct ScrollToEnd() here
+	// would move it and be misread as the user scrolling, aborting the catch-up mid-load (issue
+	// #547). Deferring also waits until the pane is on screen.
+	if (!IsShownOnScreen()) {
+		// No reliable first-visible baseline while hidden; let the first scroll
+		// after the pane appears run unconditionally.
+		m_lastAutoScrollLine = -1;
+	}
+	m_scrollPending = true;
+}
+
+void CMuleLogCtrl::OnInternalIdle()
+{
+	wxStyledTextCtrl::OnInternalIdle();
+
+	// Sole scroller for every tail-scroll: live line, batch, or deferred while hidden.
+	// IsShownOnScreen() is evaluated only while a scroll is pending, so the common idle path
+	// stays a single bool test.
+	if (!m_scrollPending || !IsShownOnScreen()) {
+		return;
+	}
+
+	// With word-wrap on, Scintilla lays out wrapped lines incrementally over several idles, so
+	// a single ScrollToEnd() the moment the pane appears lands short, against a display-line
+	// count that does not yet include the unwrapped tail (issue #547). Re-scroll each idle
+	// until the position stops moving. Appends do not move the first-visible line, so if it has
+	// moved away from where our last auto-scroll left it the user scrolled -- bail and reset,
+	// so a manual scroll is never fought and a later return to the bottom re-tails.
+	if (m_lastAutoScrollLine != -1 && GetFirstVisibleLine() != m_lastAutoScrollLine) {
+		m_scrollPending = false;
+		m_lastAutoScrollLine = -1;
+		return;
+	}
+	ScrollToEnd();
+	const int firstVisible = GetFirstVisibleLine();
+	if (firstVisible == m_lastAutoScrollLine) {
+		m_scrollPending = false; // stable: layout settled at the bottom
+	}
+	m_lastAutoScrollLine = firstVisible;
+}
+
+void CMuleLogCtrl::AppendLogLine(const wxString &line, bool critical)
+{
+	const bool tail = m_inBatch ? false : AtBottom();
+
+	if (!m_inBatch) {
+		SetReadOnly(false);
+	}
+
+	const int start = GetLength();
+	AppendText(line);
+	// Style the bytes just appended (StartStyling/SetStyling work on the style
+	// buffer, not the text, so read-only state is irrelevant here).
+	StartStyling(start);
+	SetStyling(GetLength() - start, critical ? Style_Critical : Style_Normal);
+
+	if (!m_inBatch) {
+		SetReadOnly(true);
+		if (tail) {
+			ScrollToBottom();
+		}
+	}
+}
+
+void CMuleLogCtrl::ClearLog()
+{
+	SetReadOnly(false);
+	ClearAll();
+	SetReadOnly(true);
+}
+
+void CMuleLogCtrl::BeginBatch()
+{
+	// No Freeze()/Thaw(): Scintilla does not auto-scroll on append, so lines added below the
+	// fold cause no repaint until the tail-scroll, requested by EndBatch() and applied on the
+	// next idle. Freezing would only leave the scroll extent stale at Thaw.
+	m_batchTailing = AtBottom();
+	m_inBatch = true;
+	SetReadOnly(false);
+}
+
+void CMuleLogCtrl::EndBatch()
+{
+	SetReadOnly(true);
+	m_inBatch = false;
+	if (m_batchTailing) {
+		ScrollToBottom();
+	}
+}
+
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/MuleLogCtrl.h Added

@@ -0,0 +1,103 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 MULELOGCTRL_H
+#define MULELOGCTRL_H
+
+#include <wx/stc/stc.h>
+
+// A read-only, append-only log view backed by wxStyledTextCtrl (Scintilla).
+//
+// Replaces the wxTE_RICH2 log panes (aMule Log, aMuleGUI Log, server info). RichEdit holds the
+// whole document and reflows O(n) on scroll, so the tens of thousands of lines a remote-GUI first
+// sync can dump made scrolling crawl and left the view mispainted, only the tail visible until a
+// manual scroll (issues #445, #547). Scintilla renders only the visible lines, so scroll and full-
+// history retention stay O(visible) at any size, and unlike a virtual list it keeps character-level
+// selection and find.
+class CMuleLogCtrl : public wxStyledTextCtrl
+{
+public:
+	CMuleLogCtrl(wxWindow *parent,
+		wxWindowID id = wxID_ANY,
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
+		long style = 0,
+		const wxString &name = "CMuleLogCtrl");
+
+	// Append one already-newline-terminated line. `critical` renders it bold (errors/warnings).
+	// Auto-scrolls to the end only when the view was already at the bottom, so a user who
+	// scrolled up to read history is left in place.
+	void AppendLogLine(const wxString &line, bool critical = false);
+
+	// Remove all text.
+	void ClearLog();
+
+	// Bracket a burst of AppendLogLine() calls (one stats poll's backlog): the control stays
+	// writable for the whole run, and the single tail-scroll is deferred to EndBatch(), decided
+	// by whether the view was at the bottom when the batch began.
+	void BeginBatch();
+	void EndBatch();
+
+	// Sole scroller for every tail-scroll. ScrollToBottom() only flags one as pending; this
+	// applies it -- waiting until the pane is on screen (a hidden control cannot be scrolled
+	// reliably), and re-applying across idles until the layout, which Scintilla wraps
+	// incrementally, settles at the true bottom. Overriding at this level means every log/info
+	// pane inherits it.
+	void OnInternalIdle() override;
+
+private:
+	bool AtBottom();
+	void ScrollToBottom();
+
+	// Paint the default text/background colours and font from the current system theme. Native
+	// wxTextCtrl (the pre-Scintilla log widget) tracked the theme automatically; Scintilla does
+	// not, so we set the colours by hand -- here, and again on every theme change (see
+	// OnSysColourChanged). Guards against a foreground/background pair with too little contrast
+	// to read: on macOS the window/text system colours are appearance-aware and can resolve
+	// near-identical, painting the log invisible (issue #569).
+	void SetupStyles();
+
+	// Re-theme on a live light/dark switch (Scintilla snapshots colours; it will
+	// not follow the appearance on its own).
+	void OnSysColourChanged(wxSysColourChangedEvent &event);
+
+	// Scintilla style ids: 0 is the default text style, 1 adds bold.
+	enum
+	{
+		Style_Normal = 0,
+		Style_Critical = 1
+	};
+
+	bool m_inBatch;
+	bool m_batchTailing;
+	// A tail-scroll has been requested; OnInternalIdle() applies it (deferring
+	// while the pane is hidden, and re-applying until the layout settles).
+	bool m_scrollPending;
+	// First-visible line left by the last auto-scroll while m_scrollPending is being resolved,
+	// so the idle loop can tell when the (possibly wrapping) layout has settled and when the
+	// user has scrolled away. -1 = none yet.
+	int m_lastAutoScrollLine;
+};
+
+#endif // MULELOGCTRL_H

amule-3.0.1.tar.gz/src/MuleNotebook.cpp -> amule-3.1.0.tar.gz/src/MuleNotebook.cpp Changed

@@ -25,8 +25,11 @@
 
 #include <wx/menu.h>
 #include <wx/intl.h>
+#include <wx/artprov.h>  // Needed for wxArtProvider
+#include <wx/image.h>    // Needed for wxImage
+#include <wx/settings.h> // Needed for wxSystemSettings
 
-#include "MuleNotebook.h"	// Interface declarations
+#include "MuleNotebook.h" // Interface declarations
 
 #include <common/MenuIDs.h>
 
@@ -35,9 +38,9 @@
 wxBEGIN_EVENT_TABLE(CMuleNotebook, wxNotebook)
 	EVT_RIGHT_DOWN(CMuleNotebook::OnRMButton)
 
-	EVT_MENU(MP_CLOSE_TAB,		CMuleNotebook::OnPopupClose)
-	EVT_MENU(MP_CLOSE_ALL_TABS,	CMuleNotebook::OnPopupCloseAll)
-	EVT_MENU(MP_CLOSE_OTHER_TABS,	CMuleNotebook::OnPopupCloseOthers)
+	EVT_MENU(MP_CLOSE_TAB, CMuleNotebook::OnPopupClose)
+	EVT_MENU(MP_CLOSE_ALL_TABS, CMuleNotebook::OnPopupCloseAll)
+	EVT_MENU(MP_CLOSE_OTHER_TABS, CMuleNotebook::OnPopupCloseOthers)
 
 	// Madcat - tab closing engine
 	EVT_LEFT_DOWN(CMuleNotebook::OnMouseButton)
@@ -47,43 +50,64 @@
 	EVT_MOTION(CMuleNotebook::OnMouseMotion)
 wxEND_EVENT_TABLE()
 
+wxBitmap ThemedCloseIcon(const wxSize &size)
+{
+	wxBitmap bmp = wxArtProvider::GetBitmap(wxART_CLOSE, wxART_OTHER, size);
+	if (!bmp.IsOk() || !wxSystemSettings::GetAppearance().IsDark()) {
+		return bmp;
+	}
+	// src/msw/artmsw.cpp handles no wxART_CLOSE, so MSW falls through to artstd.cpp's
+	// art/close.xpm -- an X hardcoded to black, which vanishes against a dark tab. GTK maps
+	// the id to the icon theme's window-close and already answers in the right colour, so
+	// there the replacement below finds nothing to do.
+	wxImage img = bmp.ConvertToImage();
+	if (img.HasMask()) {
+		// Mask to alpha first: Replace() matches on colour, so with the mask still in place
+		// it would repaint the transparent pixels too and yield a solid white block.
+		img.InitAlpha();
+	}
+	img.Replace(0, 0, 0, 255, 255, 255);
+	// Carry the scale factor across: the wxImage round-trip drops it, and a 2x icon rebuilt
+	// as 1x draws at twice the size on a HiDPI display.
+	return wxBitmap(img, -1, bmp.GetScaleFactor());
+}
 
-CMuleNotebook::CMuleNotebook( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name )
-	: wxNotebook(parent, id, pos, size, style, name)
+CMuleNotebook::CMuleNotebook(wxWindow *parent,
+	wxWindowID id,
+	const wxPoint &pos,
+	const wxSize &size,
+	long style,
+	const wxString &name)
+: wxNotebook(parent, id, pos, size, style, name)
 {
 	m_popup_enable = true;
 	m_popup_widget = NULL;
 }
 
-
 CMuleNotebook::~CMuleNotebook()
 {
-	// Ensure that all notifications gets sent
 	DeleteAllPages();
 }
 
-
 bool CMuleNotebook::DeletePage(int nPage)
 {
-	wxCHECK_MSG((nPage >= 0) && (nPage < (int)GetPageCount()), false,
+	wxCHECK_MSG((nPage >= 0) && (nPage < (int)GetPageCount()),
+		false,
 		"Trying to delete invalid page-index in CMuleNotebook::DeletePage");
 
-	// Send out close event
-	wxNotebookEvent evt( wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, GetId(), nPage );
+	wxNotebookEvent evt(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, GetId(), nPage);
 	evt.SetEventObject(this);
-	ProcessEvent( evt );
+	ProcessEvent(evt);
 
-	// and finally remove the actual page
-	bool result = wxNotebook::DeletePage( nPage );
+	bool result = wxNotebook::DeletePage(nPage);
 
-	// Ensure a valid selection
-	if ( GetPageCount() && (int)GetSelection() >= (int)GetPageCount() ) {
-		SetSelection( GetPageCount() - 1 );
+	if (GetPageCount() && (int)GetSelection() >= (int)GetPageCount()) {
+		SetSelection(GetPageCount() - 1);
 	}
 
-	// Send a page change event to work around wx problem when newly selected page
-	// 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).
+	// Send a page change event to work around a wx problem when the newly selected page is
+	// identical with the 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()) {
 		// Select the tab that took the place of the one we just deleted.
 		size_t page = nPage;
@@ -91,27 +115,25 @@
 		if (page == GetPageCount()) {
 			page--;
 		}
-		wxNotebookEvent event( wxEVT_NOTEBOOK_PAGE_CHANGED, GetId(), page );
+		wxNotebookEvent event(wxEVT_NOTEBOOK_PAGE_CHANGED, GetId(), page);
 		event.SetEventObject(this);
-		ProcessEvent( event );
+		ProcessEvent(event);
 	} else {
-	// Send an event when no pages are left open
-		wxNotebookEvent event( wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED, GetId() );
+		wxNotebookEvent event(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED, GetId());
 		event.SetEventObject(this);
-		ProcessEvent( event );
+		ProcessEvent(event);
 	}
 
 	return result;
 }
 
-
 bool CMuleNotebook::DeleteAllPages()
 {
 	Freeze();
 
 	bool result = true;
-	while ( GetPageCount() ) {
-		result &= DeletePage( 0 );
+	while (GetPageCount()) {
+		result &= DeletePage(0);
 	}
 
 	Thaw();
@@ -119,30 +141,25 @@
 	return result;
 }
 
-
-void CMuleNotebook::EnablePopup( bool enable )
+void CMuleNotebook::EnablePopup(bool enable)
 {
 	m_popup_enable = enable;
 }
 
-
-void CMuleNotebook::SetPopupHandler( wxWindow* widget )
+void CMuleNotebook::SetPopupHandler(wxWindow *widget)
 {
 	m_popup_widget = widget;
 }
 
-
-//#warning wxMac does not support selection by right-clicking on tabs!
-void CMuleNotebook::OnRMButton(wxMouseEvent& event)
+// #warning wxMac does not support selection by right-clicking on tabs!
+void CMuleNotebook::OnRMButton(wxMouseEvent &event)
 {
-	// Cases where we shouldn't be showing a popup-menu.
-	if ( !GetPageCount() || !m_popup_enable ) {
+	if (!GetPageCount() || !m_popup_enable) {
 		event.Skip();
 		return;
 	}
 
-
-// For some reason, gtk1 does a rather poor job when using the HitTest
+	// For some reason, gtk1 does a rather poor job when using the HitTest
 	wxPoint eventPoint = event.GetPosition();
 
 	int tab = HitTest(eventPoint);
@@ -153,64 +170,59 @@
 		return;
 	}
 
-	// Should we send the event to a specific widget?
-	if ( m_popup_widget ) {
+	if (m_popup_widget) {
 		wxMouseEvent evt = event;
 
-		// Map the coordinates onto the parent
 		wxPoint point = evt.GetPosition();
-		point = ClientToScreen( point );
-		point = m_popup_widget->ScreenToClient( point );
+		point = ClientToScreen(point);
+		point = m_popup_widget->ScreenToClient(point);
 
 		evt.m_x = point.x;
 		evt.m_y = point.y;
 
-		// Synchronous dispatch: the parent's handler is expected to
-		// call PopupMenu(), which on wxGTK relies on the pointer
-		// grab from the current right-button-down event still being
-		// active. AddPendingEvent queues the event for delivery on
-		// the next event-loop cycle, and in amulegui the 1 Hz EC
-		// poll-timer adds enough latency between the queue insert
-		// and dispatch that the user's button-up arrives first
-		// ~80 % of the time -- PopupMenu then opens and is
-		// immediately dismissed by the late button-up, looking
-		// like the menu "doesn't latch".  ProcessEvent runs the
-		// handler inline while the grab is fresh (#680).
-		m_popup_widget->GetEventHandler()->ProcessEvent( evt );
+		// Synchronous dispatch: the parent's handler is expected to call PopupMenu(), which
+		// on wxGTK relies on the pointer grab from the current right-button-down event
+		// still being active. AddPendingEvent queues the event for the next event-loop
+		// cycle, and in amulegui the 1 Hz EC poll timer adds enough latency between the
+		// queue insert and dispatch that the user's button-up arrives first ~80 % of the
+		// time -- PopupMenu then opens and is immediately dismissed, looking like the menu
+		// "does not latch". ProcessEvent runs the handler inline while the grab is fresh
+		// (#680).
+		m_popup_widget->GetEventHandler()->ProcessEvent(evt);
 	} else {
 		wxMenu menu(_("Close"));
 		menu.Append(MP_CLOSE_TAB, wxString(_("Close tab")));
 		menu.Append(MP_CLOSE_ALL_TABS, wxString(_("Close all tabs")));
 		menu.Append(MP_CLOSE_OTHER_TABS, wxString(_("Close other tabs")));
 
-		PopupMenu( &menu, event.GetPosition() );
+		// Pop up at the pointer. On wxGTK the right-click lands on the tab strip, which
+		// sits outside the client area PopupMenu() positions against, so
+		// event.GetPosition() offset the menu upward by the tab-strip height. The default
+		// position uses the cursor instead.
+		PopupMenu(&menu);
 	}
 }
 
-
-void CMuleNotebook::OnPopupClose(wxCommandEvent& WXUNUSED(evt))
+void CMuleNotebook::OnPopupClose(wxCommandEvent &WXUNUSED(evt))
 {
-	DeletePage( GetSelection() );
+	DeletePage(GetSelection());
 }
 
-
-void CMuleNotebook::OnPopupCloseAll(wxCommandEvent& WXUNUSED(evt))
+void CMuleNotebook::OnPopupCloseAll(wxCommandEvent &WXUNUSED(evt))
 {
 	DeleteAllPages();
 }
 
-
-void CMuleNotebook::OnPopupCloseOthers(wxCommandEvent& WXUNUSED(evt))
+void CMuleNotebook::OnPopupCloseOthers(wxCommandEvent &WXUNUSED(evt))
 {
-	wxNotebookPage* current = GetPage( GetSelection() );
+	wxNotebookPage *current = GetPage(GetSelection());
 
-	for ( int i = GetPageCount() - 1; i >= 0; i-- ) {
-		if ( current != GetPage( i ) )
-			DeletePage( i );
+	for (int i = GetPageCount() - 1; i >= 0; i--) {
+		if (current != GetPage(i))
+			DeletePage(i);
 	}
 }
 
-
 void CMuleNotebook::OnMouseButton(wxMouseEvent &event)
 {
 	if (GetImageList() == NULL) {
@@ -223,23 +235,22 @@
 	event.GetPosition(&xpos, &ypos);
 
 	long flags = 0;
-	int tab = HitTest(wxPoint(xpos,ypos),&flags);
+	int tab = HitTest(wxPoint(xpos, ypos), &flags);
 	static int tab_down_icon = -1;
 	static int tab_down_label = -1;
 
-	if (event.LeftDown() &&  (flags == wxNB_HITTEST_ONICON)) {
+	if (event.LeftDown() && (flags == wxNB_HITTEST_ONICON)) {
 		tab_down_icon = tab;
-	}
-	else if (event.MiddleDown() && (flags == wxNB_HITTEST_ONLABEL)) {
+	} else if (event.MiddleDown() && (flags == wxNB_HITTEST_ONLABEL)) {
 		tab_down_label = tab;
-	}
-	else if (event.LeftDown() || event.MiddleDown()) {
+	} else if (event.LeftDown() || event.MiddleDown()) {
 		tab_down_icon = -1;
 		tab_down_label = -1;
 	}
-	
-	if (((tab != -1) &&  (((flags == wxNB_HITTEST_ONICON) && event.LeftUp() && (tab == tab_down_icon)) ||
-			((flags == wxNB_HITTEST_ONLABEL) && event.MiddleUp() && (tab == tab_down_label))))) {
+
+	if (((tab != -1) && (((flags == wxNB_HITTEST_ONICON) && event.LeftUp() && (tab == tab_down_icon)) ||
+				    ((flags == wxNB_HITTEST_ONLABEL) && event.MiddleUp() &&
+					    (tab == tab_down_label))))) {
 		// User did click on a 'x' or middle click on the label
 		tab_down_icon = -1;
 		tab_down_label = -1;
@@ -250,7 +261,6 @@
 	}
 }
 
-
 void CMuleNotebook::OnMouseMotion(wxMouseEvent &event)
 {
 	if (GetImageList() == NULL) {
@@ -260,17 +270,22 @@
 	}
 
 	long flags = 0;
-	int tab = HitTest(wxPoint(event.m_x,event.m_y),&flags);
-
-	// Clear the highlight for all tabs.
-	for (int i=0;i<(int)GetPageCount();++i) {
-		SetPageImage(i, 0);
+	int tab = HitTest(wxPoint(event.m_x, event.m_y), &flags);
+	const bool onIcon = (tab != -1) && (flags == wxNB_HITTEST_ONICON);
+
+	// Write only the images that actually change. SetPageImage() is a TCM_SETITEM on MSW, which
+	// invalidates the tab it names, so setting every page on every motion event kept the whole
+	// tab bar repainting for as long as the pointer moved over it -- with enough tabs open that
+	// reads as flicker (issue #951). The highlight itself changes at most twice per crossing of
+	// a close icon.
+	for (int i = 0; i < (int)GetPageCount(); ++i) {
+		const int image = (onIcon && i == tab) ? 1 : 0;
+		if (GetPageImage(i) != image) {
+			SetPageImage(i, image);
+		}
 	}
 
-	if ((tab != -1) &&  (flags == wxNB_HITTEST_ONICON)) {
-		// Mouse is over a 'x'
-		SetPageImage(tab, 1);
-	} else {
+	if (!onIcon) {
 		// Is not a 'x'. Send this event up.
 		event.Skip();
 	}

amule-3.0.1.tar.gz/src/MuleNotebook.h -> amule-3.1.0.tar.gz/src/MuleNotebook.h Changed

@@ -28,119 +28,116 @@
 
 #include <wx/notebook.h>
 
-
 wxDECLARE_EVENT(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, wxEvent);
 wxDECLARE_EVENT(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED, wxEvent);
 
 #define EVT_MULENOTEBOOK_PAGE_CLOSING(id, fn) \
-	wx__DECLARE_EVT1(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, id, \
+	wx__DECLARE_EVT1(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, \
+		id, \
 		wxEVENT_HANDLER_CAST(wxNotebookEventFunction, fn))
 #define EVT_MULENOTEBOOK_ALL_PAGES_CLOSED(id, fn) \
-	wx__DECLARE_EVT1(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED, id, \
+	wx__DECLARE_EVT1(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED, \
+		id, \
 		wxEVENT_HANDLER_CAST(wxNotebookEventFunction, fn))
 
-
 class wxWindow;
 
+class wxBitmap;
+class wxSize;
+
+/**
+ * The stock close icon for a tab, recoloured when the desktop is dark.
+ *
+ * wx has no themed close icon on MSW, so the icon would otherwise stay black
+ * against a dark tab (issue #1399).
+ */
+wxBitmap ThemedCloseIcon(const wxSize &size);
 
 /**
- * This is an NoteBook control which adds additional features above what is
- * provided by the wxNoteBook widget. Currently it includes:
- *  - Use of images on the tabs for closing the pages.
- *  - A popup-menu for closing one or more pages.
- *  - Events triggered when pages are closed.
+ * A wxNotebook with a few extra features: images on the tabs for closing pages, a popup menu for
+ * closing one or more pages, and events triggered when pages are closed.
  */
 class CMuleNotebook : public wxNotebook
 {
 public:
 	/**
-	 * Constructor.
-	 *
 	 * @see wxNotebook::wxNotebook
 	 */
-	CMuleNotebook( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook" );
+	CMuleNotebook(wxWindow *parent,
+		wxWindowID id,
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
+		long style = 0,
+		const wxString &name = "notebook");
 
-	/**
-	 * Destructor.
-	 */
 	virtual ~CMuleNotebook();
 
 	/**
-	 * Deletes the page and triggers an event.
-	 *
-	 * @param nPage The page to be removed.
+	 * Deletes page @a nPage and triggers an event.
 	 */
 	virtual bool DeletePage(int nPage);
 
 	/**
-	 * Deletes and triggers and event for every page.
+	 * Deletes every page, triggering an event for each.
 	 */
 	virtual bool DeleteAllPages();
 
-
 	/**
-	 * Enables or disables the displaying of a popup-menu.
-	 *
-	 * @param enabled The new setting.
+	 * Enables or disables the display of a popup menu.
 	 */
-	void EnablePopup( bool enable );
+	void EnablePopup(bool enable);
 
 	/**
-	 * Sets an external widget to handle the popup-event.
-	 *
-	 * @param widget The widget which would receive the event or NULL to disable.
-	 *
-	 * Setting the handler to a non-NULL pointer means that upon right-clicks, a
-	 * right click event will be sent to that widget, so that it can create a
-	 * popup-menu. The coordinates will be fixed to fit onto the specified widget,
-	 * so no mapping is needed.
+	 * Sets an external widget to handle the popup event, or NULL to disable. With one set, a
+	 * right click sends a right-click event to that widget so it can create a popup menu; the
+	 * coordinates are fixed to fit it, so no mapping is needed.
 	 */
-	void SetPopupHandler( wxWindow* widget );
+	void SetPopupHandler(wxWindow *widget);
 
 protected:
 	/**
-	 * Event handler for left or middle mouse button to press or release (for closing pages)
+	 * Left or middle mouse button press or release, for closing pages.
 	 */
 	void OnMouseButton(wxMouseEvent &event);
 
 	/**
-	 * Event handler for mouse motion (for highlighting the 'x')
+	 * Mouse motion, for highlighting the 'x'.
 	 */
 	void OnMouseMotion(wxMouseEvent &event);
 
 	/**
-	 * Event-handler for right-clicks that takes care of displaying the popup-menu.
+	 * Right clicks, which display the popup menu.
 	 */
-	void OnRMButton(wxMouseEvent& event);
+	void OnRMButton(wxMouseEvent &event);
 
 	/**
-	 * Event-handler of the Close item on the popup-menu.
+	 * The Close item on the popup menu.
 	 */
-	void OnPopupClose(wxCommandEvent& evt);
+	void OnPopupClose(wxCommandEvent &evt);
 
 	/**
-	 * Event-handler of the CloseAll item on the popup-menu.
+	 * The CloseAll item on the popup menu.
 	 */
-	void OnPopupCloseAll(wxCommandEvent& evt);
+	void OnPopupCloseAll(wxCommandEvent &evt);
 
 	/**
-	 * Event-handler of the CloseOthers item on the popup-menu.
+	 * The CloseOthers item on the popup menu.
 	 */
-	void OnPopupCloseOthers(wxCommandEvent& evt);
+	void OnPopupCloseOthers(wxCommandEvent &evt);
 
 	//! Keeps track of the popup-menu being enabled or not.
-	bool		m_popup_enable;
+	bool m_popup_enable;
 
 	//! The pointer to the widget which would receive right-click events or NULL.
-	wxWindow*	m_popup_widget;
+	wxWindow *m_popup_widget;
 
 	wxDECLARE_EVENT_TABLE();
 };
 
 #ifdef __WINDOWS__
-	#define MULE_NOTEBOOK_TAB_HEIGHT 26
+#define MULE_NOTEBOOK_TAB_HEIGHT 26
 #else
-	#define MULE_NOTEBOOK_TAB_HEIGHT 40
+#define MULE_NOTEBOOK_TAB_HEIGHT 40
 #endif
 
 #endif

amule-3.0.1.tar.gz/src/MuleTextCtrl.cpp -> amule-3.1.0.tar.gz/src/MuleTextCtrl.cpp Changed

@@ -27,75 +27,78 @@
 #include <wx/intl.h>
 #include <wx/dataobj.h>
 #include <wx/clipbrd.h>
+#include <wx/settings.h>
 
 /**
- * These are the IDs used to identify the different menu-items.
+ * IDs identifying the different menu items.
  *
- * Please note that I make use of predefined wxIDs for the first two, but not
- * for Paste. This is because wxMenu poses some restrictions on what can be
- * done with items using those IDs, and by default, Paste is enabled even if
- * there's nothing to paste!
+ * The first two use predefined wxIDs, but Paste does not: wxMenu restricts what can be done with
+ * items using those IDs, and by default Paste is enabled even when there is nothing to paste.
  */
 enum CMTC_Events
 {
 	//! Cut text, uses provided ID
-	CMTCE_Cut	= wxID_CUT,
+	CMTCE_Cut = wxID_CUT,
 	//! Copy text, uses provided ID
-	CMTCE_Copy	= wxID_COPY,
+	CMTCE_Copy = wxID_COPY,
 	//! Paste text, uses custom ID
-	CMTCE_Paste = wxID_HIGHEST + 666,	// Random satanic ID
-	//! Clear text, uses custom ID
+	CMTCE_Paste = wxID_HIGHEST + 666, // Random satanic ID
+					  //! Clear text, uses custom ID
 	CMTCE_Clear,
 	//! Select All text, uses custom ID
 	CMTCE_SelAll
 };
 
-
 wxBEGIN_EVENT_TABLE(CMuleTextCtrl, wxTextCtrl)
 #ifndef __WXGTK__
-	EVT_RIGHT_DOWN	(CMuleTextCtrl::OnRightDown)
+	EVT_RIGHT_DOWN(CMuleTextCtrl::OnRightDown)
 
-	EVT_MENU	(CMTCE_Paste,	CMuleTextCtrl::OnPaste)
-	EVT_MENU	(CMTCE_Clear,	CMuleTextCtrl::OnClear)
-	EVT_MENU	(CMTCE_SelAll,	CMuleTextCtrl::OnSelAll)
+	EVT_MENU(CMTCE_Paste, CMuleTextCtrl::OnPaste)
+	EVT_MENU(CMTCE_Clear, CMuleTextCtrl::OnClear)
+	EVT_MENU(CMTCE_SelAll, CMuleTextCtrl::OnSelAll)
 #endif
+	EVT_SET_FOCUS(CMuleTextCtrl::OnSetFocus)
+	EVT_KILL_FOCUS(CMuleTextCtrl::OnKillFocus)
 wxEND_EVENT_TABLE()
 
-
-CMuleTextCtrl::CMuleTextCtrl(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name)
- :  wxTextCtrl( parent, id, value, pos, size, style, validator, name)
+CMuleTextCtrl::CMuleTextCtrl(wxWindow *parent,
+	wxWindowID id,
+	const wxString &value,
+	const wxPoint &pos,
+	const wxSize &size,
+	long style,
+	const wxValidator &validator,
+	const wxString &name)
+: wxTextCtrl(parent, id, value, pos, size, style, validator, name)
 {
 }
 
-
-void CMuleTextCtrl::OnRightDown( wxMouseEvent& evt )
+void CMuleTextCtrl::OnRightDown(wxMouseEvent &evt)
 {
 	// If this control doesn't have focus, then set it
-	if ( FindFocus() != this )
+	if (FindFocus() != this)
 		SetFocus();
 
 	wxMenu popup_menu;
 
-	popup_menu.Append( CMTCE_Cut, _("Cut") );
-	popup_menu.Append( CMTCE_Copy, _("Copy") );
-	popup_menu.Append( CMTCE_Paste, _("Paste") );
-	popup_menu.Append( CMTCE_Clear, _("Clear") );
+	popup_menu.Append(CMTCE_Cut, _("Cut"));
+	popup_menu.Append(CMTCE_Copy, _("Copy"));
+	popup_menu.Append(CMTCE_Paste, _("Paste"));
+	popup_menu.Append(CMTCE_Clear, _("Clear"));
 
 	popup_menu.AppendSeparator();
 
-	popup_menu.Append( CMTCE_SelAll, _("Select All") );
-
+	popup_menu.Append(CMTCE_SelAll, _("Select All"));
 
-	// wxMenu will automatically enable/disable the Cut and Copy items,
-	// however, were are a little more pricky about the Paste item than they
-	// are, so we enable/disable it on our own, depending on whenever or not
-	// there's actually something to paste
+	// wxMenu enables and disables the Cut and Copy items automatically, but we are pickier
+	// about Paste than it is, so we drive that one ourselves from whether there is actually
+	// something to paste.
 	bool canpaste = false;
-	if ( CanPaste() ) {
-		if ( wxTheClipboard->Open() ) {
-			if ( wxTheClipboard->IsSupported( wxDF_TEXT ) ) {
+	if (CanPaste()) {
+		if (wxTheClipboard->Open()) {
+			if (wxTheClipboard->IsSupported(wxDF_TEXT)) {
 				wxTextDataObject data;
-				wxTheClipboard->GetData( data );
+				wxTheClipboard->GetData(data);
 
 				canpaste = !data.GetText().IsEmpty();
 			}
@@ -103,39 +106,34 @@
 		}
 	}
 
+	popup_menu.Enable(CMTCE_Paste, canpaste);
+	popup_menu.Enable(CMTCE_Clear, IsEditable() && !GetValue().IsEmpty());
 
-	popup_menu.Enable( CMTCE_Paste,		canpaste );
-	popup_menu.Enable( CMTCE_Clear,		IsEditable() && !GetValue().IsEmpty() );
-
-	PopupMenu( &popup_menu, evt.GetX(), evt.GetY() );
+	PopupMenu(&popup_menu, evt.GetX(), evt.GetY());
 }
 
-
-void CMuleTextCtrl::OnPaste( wxCommandEvent& WXUNUSED(evt) )
+void CMuleTextCtrl::OnPaste(wxCommandEvent &WXUNUSED(evt))
 {
 	Paste();
 }
 
-
-void CMuleTextCtrl::OnSelAll( wxCommandEvent& WXUNUSED(evt) )
+void CMuleTextCtrl::OnSelAll(wxCommandEvent &WXUNUSED(evt))
 {
 	// Move the pointer to the front
-	SetInsertionPoint( 0 );
+	SetInsertionPoint(0);
 
 	// Selects everything
-	SetSelection( -1, -1 );
+	SetSelection(-1, -1);
 }
 
-
-void CMuleTextCtrl::OnClear( wxCommandEvent& WXUNUSED(evt) )
+void CMuleTextCtrl::OnClear(wxCommandEvent &WXUNUSED(evt))
 {
 	Clear();
 }
 
-
 #ifdef __WXMAC__
-//#warning Remove this when wxMAC has been fixed.
-// https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1189859&group_id=9863
+// #warning Remove this when wxMAC has been fixed.
+//  https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1189859&group_id=9863
 void CMuleTextCtrl::Clear()
 {
 	if (IsMultiLine()) {
@@ -148,4 +146,52 @@
 }
 #endif
 
+void CMuleTextCtrl::SetPlaceholder(const wxString &hint)
+{
+	m_placeholder = hint;
+	m_normalColour = GetForegroundColour();
+	m_hasPlaceholder = true;
+	if (FindFocus() != this && IsEmpty()) {
+		ApplyPlaceholder();
+	}
+}
+
+void CMuleTextCtrl::RefreshPlaceholder()
+{
+	if (m_hasPlaceholder && !m_showingPlaceholder && FindFocus() != this && IsEmpty()) {
+		ApplyPlaceholder();
+	}
+}
+
+void CMuleTextCtrl::ApplyPlaceholder()
+{
+	m_showingPlaceholder = true;
+	SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
+	// ChangeValue() (not SetValue()) so no EVT_TEXT fires for the hint.
+	ChangeValue(m_placeholder);
+}
+
+void CMuleTextCtrl::RemovePlaceholder()
+{
+	m_showingPlaceholder = false;
+	ChangeValue(wxEmptyString);
+	SetForegroundColour(m_normalColour);
+}
+
+void CMuleTextCtrl::OnSetFocus(wxFocusEvent &evt)
+{
+	if (m_showingPlaceholder) {
+		RemovePlaceholder();
+	}
+	evt.Skip();
+}
+
+void CMuleTextCtrl::OnKillFocus(wxFocusEvent &evt)
+{
+	if (m_hasPlaceholder && !m_showingPlaceholder && IsEmpty()) {
+		ApplyPlaceholder();
+	}
+	evt.Skip();
+}
+
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/MuleTextCtrl.h -> amule-3.1.0.tar.gz/src/MuleTextCtrl.h Changed

@@ -26,35 +26,51 @@
 #define MULETEXTCTRL_H
 
 #include <wx/textctrl.h>
-
+#include <wx/colour.h>
 
 class wxCommandEvent;
 class wxMouseEvent;
-
+class wxFocusEvent;
 
 /**
- * This class is a slightly improved wxTextCtrl that supports the traditional
- * popup-menu usually provided by text-ctrls. It provides the following options:
- *  - Cut
- *  - Copy
- *  - Paste
- *  - Clear
- *  - Select All
- *
- * Other than that, it acts exactly like an ordinary wxTextCtrl.
+ * A slightly improved wxTextCtrl that offers the traditional text-control popup menu -- Cut, Copy,
+ * Paste, Clear, Select All. Otherwise it acts exactly like an ordinary wxTextCtrl.
  */
 class CMuleTextCtrl : public wxTextCtrl
 {
 public:
 	/**
-	 * Constructor is identical to the wxTextCtrl one.
+	 * Identical to the wxTextCtrl constructor.
+	 */
+	CMuleTextCtrl(wxWindow *parent,
+		wxWindowID id,
+		const wxString &value = "",
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
+		long style = 0,
+		const wxValidator &validator = wxDefaultValidator,
+		const wxString &name = wxTextCtrlNameStr);
+
+	virtual ~CMuleTextCtrl() {};
+
+	/**
+	 * Enable a grey placeholder shown while the control is empty and unfocused, cleared
+	 * automatically on focus or typing. Works on all platforms, unlike wxTextCtrl::SetHint(),
+	 * which does nothing for multi-line controls under GTK/MSW.
 	 */
-	CMuleTextCtrl(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr);
+	void SetPlaceholder(const wxString &hint);
 
 	/**
-	 * Destructor, which currently does nothing.
+	 * True while the placeholder text is being displayed, i.e. the user has not entered
+	 * anything. Callers reading the value should treat this as an empty control.
 	 */
-	virtual ~CMuleTextCtrl() {};
+	bool IsShowingPlaceholder() const { return m_showingPlaceholder; }
+
+	/**
+	 * Re-show the placeholder if the control is empty and unfocused. Call after
+	 * programmatically clearing the value.
+	 */
+	void RefreshPlaceholder();
 
 #ifdef __WXMAC__
 	/**
@@ -65,35 +81,42 @@
 
 protected:
 	/**
-	 * This function takes care of creating the popup-menu.
-	 *
-	 * Please note that by using the RIGHT_DOWN event, I'm disabling the second
-	 * type of selection that the wxTextCtrl supports. However, I frankly only
-	 * noticed that second selection type while implementing this, so I doubt
-	 * that anyone will be missing it ...
+	 * Creates the popup menu. Using the RIGHT_DOWN event disables the second kind of selection
+	 * wxTextCtrl supports, which is obscure enough that nobody is likely to miss it.
 	 */
-	void OnRightDown( wxMouseEvent& evt );
+	void OnRightDown(wxMouseEvent &evt);
 
 	/**
-	 * This function takes care of pasting text.
-	 *
-	 * Please note that it is only needed because wxMenu disallows enabling and
-	 * disabling of items that use the predefined wxID_PASTE id. This is the
-	 * only one of the already provided commands we need to override, since the
-	 * others already work just fine.
+	 * Pastes text. Only needed because wxMenu disallows enabling and disabling of items using
+	 * the predefined wxID_PASTE id; the other provided commands work as they are.
 	 */
-	void OnPaste( wxCommandEvent& evt );
+	void OnPaste(wxCommandEvent &evt);
 
 	/**
-	 * This functions takes care of selecting all text.
+	 * Selects all text.
 	 */
-	void OnSelAll( wxCommandEvent& evt );
+	void OnSelAll(wxCommandEvent &evt);
 
 	/**
-	 * This functions takes care of clearing the text.
+	 * Clears the text.
 	 */
-	void OnClear( wxCommandEvent& evt );
+	void OnClear(wxCommandEvent &evt);
+
+	/**
+	 * Placeholder focus handlers: clear the hint when the control gains focus, restore it on
+	 * blur if the user left the control empty.
+	 */
+	void OnSetFocus(wxFocusEvent &evt);
+	void OnKillFocus(wxFocusEvent &evt);
+
+private:
+	void ApplyPlaceholder();
+	void RemovePlaceholder();
 
+	wxString m_placeholder;
+	wxColour m_normalColour;
+	bool m_hasPlaceholder = false;
+	bool m_showingPlaceholder = false;
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.0.1.tar.gz/src/MuleThread.h -> amule-3.1.0.tar.gz/src/MuleThread.h Changed

@@ -27,23 +27,22 @@
 
 #include <wx/thread.h>
 
-
 class CMuleThread : public wxThread
 {
 public:
 	//! @see wxThread::wxThread
 	CMuleThread(wxThreadKind kind = wxTHREAD_DETACHED)
-		: wxThread(kind),
-		m_stop(false) {}
+	: wxThread(kind)
+	, m_stop(false)
+	{
+	}
 
 	/**
 	 * Stops the thread.
 	 *
-	 * For detached threads, this function is equivalent
-	 * to Delete, but is also usable for joinable threads,
-	 * where Delete should not be used, due to crashes
-	 * experienced in that case. In the case of joinable
-	 * threads, Wait is called rather than Delete.
+	 * For detached threads this is equivalent to Delete, but it is also usable for joinable
+	 * threads, where Delete should not be used because of crashes experienced in that case;
+	 * those call Wait instead.
 	 *
 	 * @see wxThread::Delete
 	 */
@@ -60,14 +59,14 @@
 	//! Returns true if Delete or Stop has been called.
 	virtual bool TestDestroy()
 	{
-		// m_stop is checked last, because some functionality is
-		// dependent upon wxThread::TestDestroy() being called,
-		// for instance Pause().
+		// m_stop is checked last, because some functionality depends on
+		// wxThread::TestDestroy() being called -- Pause(), for instance.
 		return wxThread::TestDestroy() || m_stop;
 	}
+
 private:
 	//! Is set if Stop is called.
-	bool	m_stop;
+	bool m_stop;
 };
 
 #endif

amule-3.0.1.tar.gz/src/MuleTrayIcon.cpp -> amule-3.1.0.tar.gz/src/MuleTrayIcon.cpp Changed

@@ -31,33 +31,25 @@
 #include <common/ClientVersion.h>
 #include <common/Constants.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 "Server.h"			// Needed for CServer
-#include "Statistics.h"		// Needed for theStats
-#include "NetworkFunctions.h"	// Needed for Uint32toStringIP
-#include "OtherFunctions.h"	// Needed for CastItoXBytes / CastSecondsToHM
-#include <common/Format.h>	// Needed for CFormat
-#include <common/MenuIDs.h>	// Needed to access menu item constants
-
-#ifdef __WXMAC__
-#include "MacAppHelper.h"	// mac_set_accessory_mode
-#endif
+#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 "Server.h"           // Needed for CServer
+#include "Statistics.h"       // Needed for theStats
+#include "NetworkFunctions.h" // Needed for Uint32toStringIP
+#include "OtherFunctions.h"   // Needed for CastItoXBytes / CastSecondsToHM
+#include <common/Format.h>    // Needed for CFormat
+#include <common/MenuIDs.h>   // Needed to access menu item constants
 
 #ifdef WITH_LIBAYATANA_APPINDICATOR
-// gtk_window_present is the xdg-activation-aware way to request
-// focus on Wayland — wxFrame::Raise() alone doesn't reach the
-// compositor's activation path there. Needed early so DoShow()
-// below can call it.
+// gtk_window_present is the xdg-activation-aware way to request focus on Wayland --
+// wxFrame::Raise() alone does not reach the compositor's activation path there. Needed early so
+// DoShow() below can call it.
 #include <gtk/gtk.h>
 #endif
 
-
-// =====================================================================
-// Common action handlers — invoked from either backend.
-// =====================================================================
+// Common action handlers -- invoked from either backend.
 
 void CMuleTrayIcon::DoConnectDisconnect()
 {
@@ -67,71 +59,36 @@
 
 void CMuleTrayIcon::DoShowHide()
 {
-	// Treat an iconized window as not-visible: minimized-to-Dock on
-	// Mac, taskbar-iconized on Windows, and Iconize() on Linux all
-	// keep IsShown()==true even though the user can't actually see
-	// the frame. Acting on plain IsShown() would make the tray menu
-	// offer "Hide aMule" in those states, and clicking would make
-	// the window vanish entirely (no Dock thumbnail / no taskbar
-	// entry) — destructive UX. Treat iconized as "not visible" so
-	// the menu offers "Show aMule" and clicking restores the frame.
-	const bool visible = theApp->amuledlg->IsShown() && !theApp->amuledlg->IsTrayLogicallyIconized();
+	// Treat an iconized window as not-visible: minimized-to-Dock on Mac, taskbar-iconized on
+	// Windows and Iconize() on Linux all keep IsShown()==true even though the user cannot see
+	// the frame. On plain IsShown() the menu would offer "Hide aMule" in those states, and
+	// clicking would make the window vanish entirely, with no Dock thumbnail and no taskbar
+	// entry.
+	const bool visible = theApp->amuledlg->IsVisibleToUser();
 	if (visible) {
-#ifdef __WXMAC__
-		// Drop the Dock icon while the window is hidden; the tray
-		// icon (NSStatusItem) is the only recovery surface in this
-		// state. Restored when the user un-hides via the tray click
-		// or menu.
-		mac_set_accessory_mode(true);
-#endif
-		theApp->amuledlg->Show(false);
+		theApp->amuledlg->HideToTray();
 	} else {
-#ifdef __WXMAC__
-		mac_set_accessory_mode(false);
-#endif
-		// Clear the iconized bit on every platform — the window
-		// might be hidden (Show(false) via HideOnClose / minimize-to-
-		// tray) or just iconized to the OS dock/taskbar; in either
-		// case the user wants a normal restored frame. Without this
-		// Show(true) on a still-iconized window would leave it as a
-		// taskbar entry / Dock thumbnail without un-minimizing.
-		// Iconize(false) is idempotent on a non-iconized window —
-		// don't gate on IsIconized() because wxGTK can report a
-		// stale value during the tray-restore transition.
-		theApp->amuledlg->Iconize(false);
-		theApp->amuledlg->Show(true);
-		theApp->amuledlg->Raise();
+		theApp->amuledlg->RestoreMainWindow();
 	}
 #ifdef WITH_LIBAYATANA_APPINDICATOR
-	// Refresh so the menu label flips to "Hide aMule" / "Show aMule"
-	// to match the new window state. SNI menu is static between
-	// state changes — without this poke the label would lag a click.
+	// The SNI menu is static between state changes, so without this poke the
+	// "Hide aMule" / "Show aMule" label would lag a click behind.
 	RebuildMenu();
 #endif
 }
 
 void CMuleTrayIcon::DoShow()
 {
-#ifdef __WXMAC__
-	mac_set_accessory_mode(false);
-#endif
-	theApp->amuledlg->Iconize(false);
-	theApp->amuledlg->Show(true);
-	theApp->amuledlg->Raise();
+	theApp->amuledlg->RestoreMainWindow();
 #ifdef WITH_LIBAYATANA_APPINDICATOR
-	// Ask the compositor to bring our window forward. The timestamp
-	// matters on Wayland: GNOME Shell's focus-stealing-prevention
-	// treats GDK_CURRENT_TIME (0) as suspicious and shows an
-	// "app is ready" notification instead of granting focus. Pull
-	// the timestamp of the actual menu-click event via
-	// gtk_get_current_event_time() so the compositor sees this as
-	// a fresh user gesture and honours the request directly. If
-	// no event is currently being processed (returns
-	// GDK_CURRENT_TIME) we still pass it through — the worst case
-	// is the focus-denial notification, which is itself clickable.
-	if (GtkWidget* gtkw = static_cast<GtkWidget*>(theApp->amuledlg->GetHandle())) {
-		gtk_window_present_with_time(GTK_WINDOW(gtkw),
-			gtk_get_current_event_time());
+	// Ask the compositor to bring our window forward. The timestamp matters on Wayland: GNOME
+	// Shell's focus-stealing prevention treats GDK_CURRENT_TIME (0) as suspicious and shows an
+	// "app is ready" notification instead of granting focus, so pull the timestamp of the
+	// actual menu-click event and the request reads as a fresh user gesture. With no event
+	// being processed the call returns GDK_CURRENT_TIME and we pass it through anyway -- worst
+	// case is that notification, which is itself clickable.
+	if (GtkWidget *gtkw = static_cast<GtkWidget *>(theApp->amuledlg->GetHandle())) {
+		gtk_window_present_with_time(GTK_WINDOW(gtkw), gtk_get_current_event_time());
 	}
 	RebuildMenu();
 #endif
@@ -139,10 +96,7 @@
 
 void CMuleTrayIcon::DoHide()
 {
-#ifdef __WXMAC__
-	mac_set_accessory_mode(true);
-#endif
-	theApp->amuledlg->Show(false);
+	theApp->amuledlg->HideToTray();
 #ifdef WITH_LIBAYATANA_APPINDICATOR
 	RebuildMenu();
 #endif
@@ -151,10 +105,9 @@
 void CMuleTrayIcon::DoExit()
 {
 	if (theApp->amuledlg->IsEnabled()) {
-		// Mark as quitting so OnClose skips HideOnClose, but still
-		// pass force=false (Close()) so the confirm-exit prompt can
-		// run if enabled. If the user answers No there, the prompt
-		// vetoes and clears the IsQuitting flag.
+		// Mark as quitting so OnClose skips HideOnClose, but still pass force=false so the
+		// confirm-exit prompt can run; answering No there vetoes and clears the IsQuitting
+		// flag.
 		theApp->SetQuitting();
 		theApp->amuledlg->Close();
 	}
@@ -162,7 +115,10 @@
 
 void CMuleTrayIcon::DoSetUploadLimit(long kBytesPerSec)
 {
-	thePrefs::SetMaxUpload(kBytesPerSec < 0 ? UNLIMITED : (uint16)kBytesPerSec);
+	// uint32, not uint16: the preference, its setter and its getter are all uint32, and a
+	// 16-bit cast here silently wrapped anything above 65535 KiB/s -- a preset of 125000
+	// applied as 59464, with nothing logged either side.
+	thePrefs::SetMaxUpload(kBytesPerSec < 0 ? UNLIMITED : (uint32)kBytesPerSec);
 #ifdef CLIENT_GUI
 	theApp->glob_prefs->SendToRemote();
 #endif
@@ -170,39 +126,76 @@
 
 void CMuleTrayIcon::DoSetDownloadLimit(long kBytesPerSec)
 {
-	thePrefs::SetMaxDownload(kBytesPerSec < 0 ? UNLIMITED : (uint16)kBytesPerSec);
+	// See the note in DoSetUploadLimit.
+	thePrefs::SetMaxDownload(kBytesPerSec < 0 ? UNLIMITED : (uint32)kBytesPerSec);
 #ifdef CLIENT_GUI
 	theApp->glob_prefs->SendToRemote();
 #endif
 }
 
+// The limit presets both tray backends offer, and their labels. The appindicator backend builds
+// GtkWidgets and the wx backend a wxMenu, but what goes in them is identical, and writing it out
+// twice is how the GTK side ended up showing "Unlimited" and "KiB/s" untranslated.
+//
+// The presets are fractions of the configured line capacity rather than of the current limit:
+// scaling from the limit would mean the menu could only ever lower it, with no way back up from a
+// throttled state.
+namespace
+{
+// Divisors applied to the line capacity, descending. Not fifths: an even ladder covers only one
+// order of magnitude, so on a fast line every entry lands high and there is no way to throttle hard
+// from the tray, while on a slow one they bunch near the top. Spread out, one setting works for a 4
+// Mbit line and a 200 Mbit one alike.
+const unsigned int TRAY_SPEED_DIVISORS = { 1, 2, 4, 10, 50 };
+const int TRAY_SPEED_PRESETS = (int)(sizeof(TRAY_SPEED_DIVISORS) / sizeof(TRAY_SPEED_DIVISORS0));
+
+// What to assume when the user has set their capacity to "unlimited": there is
+// nothing to take fractions of otherwise.
+const uint32 TRAY_FALLBACK_CAPACITY = 100;
+
+/// Fills @a speeds with the presets in descending order, highest first.
+void GetTraySpeedPresets(uint32 capacity, unsigned int (&speeds)TRAY_SPEED_PRESETS)
+{
+	if (capacity == UNLIMITED) {
+		capacity = TRAY_FALLBACK_CAPACITY;
+	}
+	// Keep the smallest entry at 1 KiB/s or more: a preset of 0 would read as a limit and act
+	// as "unlimited", the opposite of what picking the bottom of the list means.
+	const uint32 smallest = TRAY_SPEED_DIVISORSTRAY_SPEED_PRESETS - 1;
+	if (capacity < smallest) {
+		capacity = smallest;
+	}
+	for (int i = 0; i < TRAY_SPEED_PRESETS; i++) {
+		speedsi = (unsigned int)(capacity / TRAY_SPEED_DIVISORSi);
+	}
+}
+
+/// The menu label for one preset, e.g. "2500 KiB/s".
+wxString TraySpeedLabel(unsigned int kBytesPerSec)
+{
+	return CFormat("%u %s") % kBytesPerSec % _("KiB/s");
+}
+} // namespace
 
-// =====================================================================
-// Backend selection — see MuleTrayIcon.h for rationale.
-// =====================================================================
+// Backend selection -- see MuleTrayIcon.h for rationale.
 
 #ifdef WITH_LIBAYATANA_APPINDICATOR
 
-// ---------------------------------------------------------------------
-//  StatusNotifierItem (SNI) backend via libayatana-appindicator3.
-//
-//  This is what GNOME Shell with the AppIndicators extension (Ubuntu's
-//  default), KDE Plasma, Sway/Hyprland with waybar, and most other
-//  modern Linux desktops actually render. The legacy GtkStatusIcon API
-//  that wxTaskBarIcon talks was dropped in GNOME 3.26 (2017) and never
-//  implemented in wlroots-based compositors, so without this backend
-//  the tray icon is silently invisible on most current distros.
-// ---------------------------------------------------------------------
+// StatusNotifierItem (SNI) backend via libayatana-appindicator3. What GNOME Shell with the
+// AppIndicators extension, KDE Plasma and wlroots compositors with waybar actually render. The
+// legacy GtkStatusIcon API wxTaskBarIcon talks was dropped in GNOME 3.26 and never implemented on
+// wlroots, so without this backend the tray icon is silently invisible on most current distros.
 
 #include <libayatana-appindicator/app-indicator.h>
 #include <gtk/gtk.h>
 
-namespace {
+namespace
+{
 
-// All menu items reach the C++ side through this single callback. The
-// item carries two int "action" + "arg" fields via g_object_set_data,
-// so we don't need a separate static function per menu entry.
-enum TrayAction {
+// All menu items reach the C++ side through this single callback: the item carries int "action" and
+// "arg" fields via g_object_set_data, so no separate static function per entry is needed.
+enum TrayAction
+{
 	TRAY_ACTION_CONNECT_DISCONNECT = 1,
 	TRAY_ACTION_SHOW_HIDE,
 	TRAY_ACTION_SHOW,
@@ -212,94 +205,132 @@
 	TRAY_ACTION_SET_DOWNLOAD_LIMIT,
 };
 
-void on_menu_item_activated(GtkMenuItem* item, gpointer user_data)
+// Left-click on the indicator. SNI hosts call org.kde.StatusNotifierItem.Activate for the primary
+// button, and libayatana-appindicator forwards it as this signal. The x/y of the click come from
+// AppIndicatorClass::activate_event and are not needed here.
+void on_indicator_activate(AppIndicator *, gint, gint, gpointer user_data)
+{
+	CMuleTrayIcon *tray = static_cast<CMuleTrayIcon *>(user_data);
+	// Toggle rather than always-show, matching the Windows tray, where a
+	// single left click has flipped show/hide since 3.0.1.
+	tray->DoShowHide();
+}
+
+void on_menu_item_activated(GtkMenuItem *item, gpointer user_data)
 {
-	CMuleTrayIcon* tray = static_cast<CMuleTrayIcon*>(user_data);
-	intptr_t action = reinterpret_cast<intptr_t>(
-		g_object_get_data(G_OBJECT(item), "action"));
-	intptr_t arg = reinterpret_cast<intptr_t>(
-		g_object_get_data(G_OBJECT(item), "arg"));
+	CMuleTrayIcon *tray = static_cast<CMuleTrayIcon *>(user_data);
+	intptr_t action = reinterpret_cast<intptr_t>(g_object_get_data(G_OBJECT(item), "action"));
+	intptr_t arg = reinterpret_cast<intptr_t>(g_object_get_data(G_OBJECT(item), "arg"));
 
 	switch (action) {
-		case TRAY_ACTION_CONNECT_DISCONNECT: tray->DoConnectDisconnect(); break;
-		case TRAY_ACTION_SHOW_HIDE:          tray->DoShowHide(); break;
-		case TRAY_ACTION_SHOW:               tray->DoShow(); break;
-		case TRAY_ACTION_HIDE:               tray->DoHide(); break;
-		case TRAY_ACTION_EXIT:               tray->DoExit(); break;
-		case TRAY_ACTION_SET_UPLOAD_LIMIT:   tray->DoSetUploadLimit((long)arg); break;
-		case TRAY_ACTION_SET_DOWNLOAD_LIMIT: tray->DoSetDownloadLimit((long)arg); break;
+	case TRAY_ACTION_CONNECT_DISCONNECT:
+		tray->DoConnectDisconnect();
+		break;
+	case TRAY_ACTION_SHOW_HIDE:
+		tray->DoShowHide();
+		break;
+	case TRAY_ACTION_SHOW:
+		tray->DoShow();
+		break;
+	case TRAY_ACTION_HIDE:
+		tray->DoHide();
+		break;
+	case TRAY_ACTION_EXIT:
+		tray->DoExit();
+		break;
+	case TRAY_ACTION_SET_UPLOAD_LIMIT:
+		tray->DoSetUploadLimit((long)arg);
+		break;
+	case TRAY_ACTION_SET_DOWNLOAD_LIMIT:
+		tray->DoSetDownloadLimit((long)arg);
+		break;
 	}
 }
 
-GtkWidget* make_action_item(const char* label, TrayAction action,
-                            long arg, gpointer user_data)
+GtkWidget *make_action_item(const char *label, TrayAction action, long arg, gpointer user_data)
 {
-	GtkWidget* item = gtk_menu_item_new_with_label(label);
-	g_object_set_data(G_OBJECT(item), "action",
-		reinterpret_cast<gpointer>(static_cast<intptr_t>(action)));
-	g_object_set_data(G_OBJECT(item), "arg",
-		reinterpret_cast<gpointer>(static_cast<intptr_t>(arg)));
-	g_signal_connect(item, "activate",
-		G_CALLBACK(on_menu_item_activated), user_data);
+	GtkWidget *item = gtk_menu_item_new_with_label(label);
+	g_object_set_data(
+		G_OBJECT(item), "action", reinterpret_cast<gpointer>(static_cast<intptr_t>(action)));
+	g_object_set_data(G_OBJECT(item), "arg", reinterpret_cast<gpointer>(static_cast<intptr_t>(arg)));
+	g_signal_connect(item, "activate", G_CALLBACK(on_menu_item_activated), user_data);
 	return item;
 }
 
-GtkWidget* make_speed_submenu(uint32 max_speed, TrayAction action,
-                              gpointer user_data)
+GtkWidget *make_speed_submenu(uint32 max_speed, TrayAction action, gpointer user_data)
 {
-	GtkWidget* submenu = gtk_menu_new();
+	GtkWidget *submenu = gtk_menu_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(submenu),
-		make_action_item("Unlimited", action, -1, user_data));
-	for (int i = 0; i < 5; i++) {
-		unsigned int spd = (unsigned int)((double)max_speed / 5) * (5 - i);
-		char label64;
-		g_snprintf(label, sizeof(label), "%u kB/s", spd);
+		make_action_item(wxString(_("Unlimited")).utf8_str(), action, -1, user_data));
+	unsigned int speedsTRAY_SPEED_PRESETS;
+	GetTraySpeedPresets(max_speed, speeds);
+	for (int i = 0; i < TRAY_SPEED_PRESETS; i++) {
 		gtk_menu_shell_append(GTK_MENU_SHELL(submenu),
-			make_action_item(label, action, (long)spd, user_data));
+			make_action_item(
+				TraySpeedLabel(speedsi).utf8_str(), action, (long)speedsi, user_data));
 	}
 	gtk_widget_show_all(submenu);
 	return submenu;
 }
 
-// Append a non-clickable "info" label to the menu. SNI menus support
-// disabled items, but rendering varies between desktops — KDE shows
-// them grey, GNOME-with-AppIndicators shows them in the menu's normal
-// style. Either way they're not interactive.
-void append_info(GtkWidget* menu, const wxString& text)
+// Append a non-clickable "info" label. SNI menus support disabled items, though rendering varies
+// between desktops -- KDE greys them, GNOME shows them in the normal style. Either way they are not
+// interactive.
+void append_info(GtkWidget *menu, const wxString &text)
 {
-	GtkWidget* item = gtk_menu_item_new_with_label(
-		(const char*)text.utf8_str());
+	GtkWidget *item = gtk_menu_item_new_with_label((const char *)text.utf8_str());
 	gtk_widget_set_sensitive(item, FALSE);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 }
 
 } // anonymous namespace
 
-
 CMuleTrayIcon::CMuleTrayIcon()
-	: m_indicator(nullptr)
-	, m_menu(nullptr)
-	, m_lastIconState(-1)
+: m_indicator(nullptr)
+, m_menu(nullptr)
+, m_lastIconState(-1)
 {
-	// `org.amule.aMule` is both the AppStream/.desktop id and the icon
-	// name installed under share/icons/hicolor/*/apps/. AppIndicator3
-	// looks the icon up via the standard XDG icon-theme path.
+	// `org.amule.aMule` is both the AppStream/.desktop id and the icon name installed under
+	// share/icons/hicolor/*/apps/; AppIndicator3 looks it up via the standard XDG icon-theme
+	// path.
+	//
+	// AyatanaIndicators split the library into libayatana-appindicator-glib and started
+	// deprecating the GTK-based libayatana-appindicator3-0.1. Migrating is future work: -glib
+	// is not yet packaged on Ubuntu, Fedora, openSUSE or Debian, so switching today would lock
+	// out every major distro. Silence the warning locally so a project-wide -Werror=deprecated-
+	// declarations stays useful.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 	m_indicator = app_indicator_new(
-		"org.amule.aMule",
-		"org.amule.aMule",
-		APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-
-	// ACTIVE = visible. The user already opted in by enabling the tray
-	// icon in Preferences, so showing it immediately is the expected
-	// behaviour; SetTrayIcon below only updates the menu's
-	// Connect/Disconnect label and never re-hides the indicator.
-	// (We deliberately don't use APP_INDICATOR_STATUS_ATTENTION for
-	// the disconnected state — that requires a separately-set
-	// attention icon via app_indicator_set_attention_icon_full(), and
-	// without it some SNI hosts render the indicator as invisible.)
+		"org.amule.aMule", "org.amule.aMule", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+#pragma GCC diagnostic pop
+
+	// ACTIVE = visible: the user already opted in by enabling the tray icon, and SetTrayIcon
+	// below only updates the menu label, never re-hiding the indicator.
+	// APP_INDICATOR_STATUS_ATTENTION is deliberately not used for the disconnected state -- it
+	// needs a separately-set attention icon, and without one some SNI hosts render the
+	// indicator as invisible.
 	app_indicator_set_status(m_indicator, APP_INDICATOR_STATUS_ACTIVE);
 	app_indicator_set_title(m_indicator, "aMule");
 
+	// Left-click opens the main window instead of the menu, where the installed library can
+	// tell us about it. libayatana-appindicator only grew an Activate handler in 0.6.0; before
+	// that the primary click was not exposed at all.
+	//
+	// Looked up at RUNTIME rather than behind a build-time version check, because the two
+	// genuinely differ: a distro may ship a newer library than we built against, and our
+	// AppImage and Flatpak bundle their own. On an older library the lookup returns 0, nothing
+	// is connected, and the panel keeps opening the menu; the library answers the Activate
+	// D-Bus call with an error so the host falls back to it.
+	//
+	// APP_INDICATOR_TYPE, not G_OBJECT_TYPE(m_indicator): the latter is a raw dereference and
+	// app_indicator_new can return NULL. The GObject setters above only warn on NULL, so this
+	// must not be the line that crashes.
+	g_type_class_ref(APP_INDICATOR_TYPE);
+	if (m_indicator && g_signal_lookup("activate", APP_INDICATOR_TYPE)) {
+		g_signal_connect(m_indicator, "activate", G_CALLBACK(on_indicator_activate), this);
+	}
+
 	RebuildMenu();
 }
 
@@ -309,66 +340,78 @@
 		g_object_unref(m_indicator);
 		m_indicator = nullptr;
 	}
-	// m_menu is owned by the indicator (set_menu took the floating ref)
-	// so we don't unref it explicitly.
+	// m_menu is owned by the indicator (set_menu took the floating ref).
 }
 
 void CMuleTrayIcon::SetTrayIcon(int Icon, uint32 /*percent*/)
 {
-	// SNI doesn't support per-frame icon overlays — the percent bar
-	// from the legacy backend is dropped on this path. We reflect the
-	// connection state purely through the menu (the Connect /
-	// Disconnect item label flips), not via the indicator's status,
-	// because flipping ACTIVE↔ATTENTION can hide the indicator on
-	// some hosts when no attention icon is configured.
+	// SNI has no per-frame icon overlays, so the legacy backend's percent bar is dropped here.
+	// Connection state shows through the menu label rather than the indicator's status, because
+	// flipping ACTIVE/ATTENTION can hide the indicator on hosts with no attention icon
+	// configured.
 	if (Icon != m_lastIconState) {
 		m_lastIconState = Icon;
-		// Rebuild so Connect/Disconnect label reflects current state.
 		RebuildMenu();
 	}
 }
 
-void CMuleTrayIcon::SetTrayToolTip(const wxString& Tip)
+void CMuleTrayIcon::SetTrayToolTip(const wxString &Tip)
 {
-	// SNI doesn't surface tooltips on hover (compositors disagree on
-	// whether to render them). Use it as the accessible title — screen
-	// readers and KDE's hover popup pick it up.
-	app_indicator_set_title(m_indicator, (const char*)Tip.utf8_str());
+	// SNI does not surface tooltips on hover (compositors disagree on rendering them), so use
+	// it as the accessible title: screen readers and KDE's hover popup pick it up.
+	app_indicator_set_title(m_indicator, (const char *)Tip.utf8_str());
 }
 
 void CMuleTrayIcon::RebuildMenu()
 {
-	// Static layout, rebuilt only on connection-state changes
-	// (driven by SetTrayIcon below). app_indicator_set_menu posts a
-	// dbusmenu LayoutUpdated D-Bus signal which some SNI hosts react
-	// to with a brief icon redraw — so refreshing on a 2 s timer
-	// would visibly flicker. Keeping the menu lean (action items
-	// only, no live stats) means we rebuild only when state actually
-	// changes, eliminating the flicker. Live values like download /
-	// upload speed are visible in the main aMule window.
-	GtkWidget* menu = gtk_menu_new();
-
-	// ---- Version banner ------------------------------------------
+	// Static layout, rebuilt only on connection-state changes. app_indicator_set_menu posts a
+	// dbusmenu LayoutUpdated signal that some SNI hosts answer with a brief icon redraw, so a 2
+	// s refresh timer would visibly flicker. Keeping the menu to action items only means it
+	// rebuilds only when state changes; live speeds are in the main window.
+	GtkWidget *menu = gtk_menu_new();
+
 	append_info(menu, MOD_VERSION_LONG);
 
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-		gtk_separator_menu_item_new());
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
 
-	// ---- Client information submenu ------------------------------
-	// Snapshot at the moment of the last connection-state change.
-	// Skips truly-live fields (uptime, totals, queued clients) so the
-	// menu can stay static between state changes — putting those in
-	// would force a periodic rebuild and bring back the flicker.
+	// Show / Hide. On Wayland we cannot detect that the window was iconized by the OS minimize
+	// button (xdg-shell delivers no event), so a single toggle entry would mislabel itself
+	// there; show two deterministic entries instead. Elsewhere the toggle is reliable and the
+	// label-aware entry stays.
+	if (CamuleAppCommon::IsWaylandSession()) {
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu),
+			make_action_item((const char *)wxString(_("Show aMule")).utf8_str(),
+				TRAY_ACTION_SHOW,
+				0,
+				this));
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu),
+			make_action_item((const char *)wxString(_("Hide aMule")).utf8_str(),
+				TRAY_ACTION_HIDE,
+				0,
+				this));
+	} else {
+		// Treat iconized as not visible -- see DoShowHide for rationale.
+		const bool visible = theApp->amuledlg && theApp->amuledlg->IsShown() &&
+				     !theApp->amuledlg->IsTrayLogicallyIconized();
+		const wxString label = visible ? wxString(_("Hide aMule")) : wxString(_("Show aMule"));
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu),
+			make_action_item((const char *)label.utf8_str(), TRAY_ACTION_SHOW_HIDE, 0, this));
+	}
+
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
+
+	// Client information submenu. Snapshot at the last connection-state change. Truly live
+	// fields (uptime, totals, queued clients) are skipped so the menu can stay static;
+	// including them would force a periodic rebuild and bring back the flicker.
 	{
-		GtkWidget* sub = gtk_menu_new();
+		GtkWidget *sub = gtk_menu_new();
 
 		// ED2k status
 		{
 			wxString s = _("eD2k: ");
 			if (theApp->IsConnectedED2K()) {
-				s += theApp->IsFirewalled()
-					? wxString(_("Connected (LowID)"))
-					: wxString(_("Connected (HighID)"));
+				s += theApp->IsFirewalled() ? wxString(_("Connected (LowID)"))
+							    : wxString(_("Connected (HighID)"));
 			} else {
 				s += _("Disconnected");
 			}
@@ -379,9 +422,8 @@
 		{
 			wxString s = _("Kad: ");
 			if (theApp->IsConnectedKad()) {
-				s += theApp->IsFirewalledKad()
-					? wxString(_("Connected (firewalled)"))
-					: wxString(_("Connected"));
+				s += theApp->IsFirewalledKad() ? wxString(_("Connected (firewalled)"))
+							       : wxString(_("Connected"));
 			} else {
 				s += _("Disconnected");
 			}
@@ -391,54 +433,48 @@
 		// Server identity (only meaningful while connected)
 		{
 			wxString name = _("Server: ");
-			wxString ip   = _("Server IP: ");
+			wxString ip = _("Server IP: ");
 			if (theApp->serverconnect->GetCurrentServer()) {
 				name += theApp->serverconnect->GetCurrentServer()->GetListName();
-				ip   += theApp->serverconnect->GetCurrentServer()->GetFullIP();
+				ip += theApp->serverconnect->GetCurrentServer()->GetFullIP();
 			} else {
 				name += _("Not connected");
-				ip   += _("Not connected");
+				ip += _("Not connected");
 			}
 			append_info(sub, name);
 			append_info(sub, ip);
 		}
 
-		// Public IP — populated post-connect
-		append_info(sub, CFormat(_("IP: %s"))
-			% (theApp->GetPublicIP()
-				? Uint32toStringIP(theApp->GetPublicIP())
-				: wxString(_("Unknown"))));
+		// Public IP -- populated post-connect
+		append_info(sub,
+			CFormat(_("IP: %s")) % (theApp->GetPublicIP()
+							       ? Uint32toStringIP(theApp->GetPublicIP())
+							       : wxString(_("Unknown"))));
 
-		// Listen ports — change only on prefs save
-		append_info(sub, thePrefs::GetPort()
-			? wxString(CFormat(_("TCP port: %d")) % thePrefs::GetPort())
-			: wxString(_("TCP port: Not ready")));
+		// Listen ports -- change only on prefs save
+		append_info(sub,
+			thePrefs::GetPort() ? wxString(CFormat(_("TCP port: %d")) % thePrefs::GetPort())
+					    : wxString(_("TCP port: Not ready")));
 
-		append_info(sub, thePrefs::GetEffectiveUDPPort()
-			? wxString(CFormat(_("UDP port: %d")) % thePrefs::GetEffectiveUDPPort())
-			: wxString(_("UDP port: Not ready")));
+		append_info(sub,
+			thePrefs::GetEffectiveUDPPort()
+				? wxString(CFormat(_("UDP port: %d")) % thePrefs::GetEffectiveUDPPort())
+				: wxString(_("UDP port: Not ready")));
 
 		gtk_widget_show_all(sub);
-		GtkWidget* item = gtk_menu_item_new_with_label(
-			(const char*)wxString(_("Client Information")).utf8_str());
+		GtkWidget *item = gtk_menu_item_new_with_label(
+			(const char *)wxString(_("Client Information")).utf8_str());
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), sub);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	}
 
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-		gtk_separator_menu_item_new());
-
-	// ---- Action items --------------------------------------------
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
 
 	// Upload limit submenu
 	{
 		uint32 max_ul = thePrefs::GetMaxGraphUploadRate();
-		if (max_ul == UNLIMITED) max_ul = 100;
-		else if (max_ul < 10)    max_ul = 10;
-
-		GtkWidget* sub = make_speed_submenu(max_ul,
-			TRAY_ACTION_SET_UPLOAD_LIMIT, this);
-		GtkWidget* item = gtk_menu_item_new_with_label(_("Upload limit").utf8_str());
+		GtkWidget *sub = make_speed_submenu(max_ul, TRAY_ACTION_SET_UPLOAD_LIMIT, this);
+		GtkWidget *item = gtk_menu_item_new_with_label(_("Upload limit").utf8_str());
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), sub);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	}
@@ -446,145 +482,103 @@
 	// Download limit submenu
 	{
 		uint32 max_dl = thePrefs::GetMaxGraphDownloadRate();
-		if (max_dl == UNLIMITED) max_dl = 100;
-		else if (max_dl < 10)    max_dl = 10;
-
-		GtkWidget* sub = make_speed_submenu(max_dl,
-			TRAY_ACTION_SET_DOWNLOAD_LIMIT, this);
-		GtkWidget* item = gtk_menu_item_new_with_label(_("Download limit").utf8_str());
+		GtkWidget *sub = make_speed_submenu(max_dl, TRAY_ACTION_SET_DOWNLOAD_LIMIT, this);
+		GtkWidget *item = gtk_menu_item_new_with_label(_("Download limit").utf8_str());
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), sub);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	}
 
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-		gtk_separator_menu_item_new());
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
 
-	// Connect / Disconnect — label depends on current connection state.
+	// Connect / Disconnect -- label depends on current connection state.
 	{
-		const wxString label = theApp->IsConnected()
-			? wxString(_("Disconnect")) : wxString(_("Connect"));
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-			make_action_item((const char*)label.utf8_str(),
-				TRAY_ACTION_CONNECT_DISCONNECT, 0, this));
-	}
-
-	// Show / Hide. On a Wayland session we can't reliably detect that
-	// the window has been iconized by the OS minimize button (xdg-shell
-	// doesn't deliver the event), so a single toggle entry would mis-
-	// label itself in that state. Show two deterministic entries
-	// instead — click Show to bring the window back, click Hide to
-	// hide it. On X11 / macOS / Windows the toggle is reliable, so
-	// the single label-aware entry stays.
-	if (CamuleAppCommon::IsWaylandSession()) {
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-			make_action_item((const char*)wxString(_("Show aMule")).utf8_str(),
-				TRAY_ACTION_SHOW, 0, this));
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-			make_action_item((const char*)wxString(_("Hide aMule")).utf8_str(),
-				TRAY_ACTION_HIDE, 0, this));
-	} else {
-		// Treat iconized as not visible — see DoShowHide for rationale.
-		const bool visible = theApp->amuledlg
-			&& theApp->amuledlg->IsShown()
-			&& !theApp->amuledlg->IsTrayLogicallyIconized();
-		const wxString label = visible ? wxString(_("Hide aMule"))
-		                               : wxString(_("Show aMule"));
+		const wxString label =
+			theApp->IsConnected() ? wxString(_("Disconnect")) : wxString(_("Connect"));
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-			make_action_item((const char*)label.utf8_str(),
-				TRAY_ACTION_SHOW_HIDE, 0, this));
+			make_action_item(
+				(const char *)label.utf8_str(), TRAY_ACTION_CONNECT_DISCONNECT, 0, this));
 	}
 
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-		gtk_separator_menu_item_new());
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
 
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-		make_action_item((const char*)wxString(_("Exit")).utf8_str(),
-			TRAY_ACTION_EXIT, 0, this));
+		make_action_item((const char *)wxString(_("Exit")).utf8_str(), TRAY_ACTION_EXIT, 0, this));
 
 	gtk_widget_show_all(menu);
 
-	// app_indicator_set_menu sinks the floating ref and unrefs any
-	// previously-set menu, so we can replace it on every rebuild
-	// without leaking.
+	// app_indicator_set_menu sinks the floating ref and unrefs any previous menu,
+	// so rebuilding does not leak.
 	app_indicator_set_menu(m_indicator, GTK_MENU(menu));
 	m_menu = menu;
 }
 
+#else // !WITH_LIBAYATANA_APPINDICATOR
 
-#else  // !WITH_LIBAYATANA_APPINDICATOR
+// Legacy wxTaskBarIcon backend. Correct on Windows (NOTIFYICONDATA), macOS (NSStatusItem) and X11
+// desktops that still consume GtkStatusIcon; on Wayland the icon goes nowhere, which is what the
+// libayatana-appindicator3 backend above is for.
 
-// ---------------------------------------------------------------------
-//  Legacy wxTaskBarIcon backend. Works correctly on Windows
-//  (NOTIFYICONDATA), macOS (NSStatusItem), and on X11 desktops that
-//  still consume GtkStatusIcon. On modern Wayland desktops the icon
-//  goes nowhere — build with libayatana-appindicator3 to fix that.
-// ---------------------------------------------------------------------
+#include <algorithm> // Needed for std::max / std::min
 
-#include <wx/artprov.h>           // Needed for wxArtProvider::GetIcon
+#include <wx/artprov.h> // Needed for wxArtProvider::GetBitmap
 
 #include <wx/menu.h>
 
-#include "StatisticsDlg.h"	// Needed for CStatisticsDlg::getColors()
+#include "StatisticsDlg.h" // Needed for CStatisticsDlg::getColors()
 
-
-/****************************************************/
-/******************* Event Table ********************/
-/****************************************************/
+// Event table
 
 wxBEGIN_EVENT_TABLE(CMuleTrayIcon, wxTaskBarIcon)
 #ifdef __WINDOWS__
-	// Windows convention: single-left click on the tray icon toggles
-	// the primary action (show/hide the main window). NSStatusItem
-	// on macOS opens the menu on single-click via its own default,
-	// so leave that path alone.
+	// Windows convention: a single left click toggles show/hide of the main window.
+	// NSStatusItem opens the menu on single-click by its own default, so that path is left
+	// alone.
 	EVT_TASKBAR_LEFT_UP(CMuleTrayIcon::SwitchShow)
 #endif
 	EVT_TASKBAR_LEFT_DCLICK(CMuleTrayIcon::SwitchShow)
-	EVT_MENU( TRAY_MENU_EXIT, CMuleTrayIcon::Close)
-	EVT_MENU( TRAY_MENU_CONNECT, CMuleTrayIcon::ServerConnection)
-	EVT_MENU( TRAY_MENU_DISCONNECT, CMuleTrayIcon::ServerConnection)
-	EVT_MENU( TRAY_MENU_HIDE, CMuleTrayIcon::ShowHide)
-	EVT_MENU( TRAY_MENU_SHOW, CMuleTrayIcon::ShowHide)
-	EVT_MENU( UPLOAD_ITEM1, CMuleTrayIcon::SetUploadSpeed)
-	EVT_MENU( UPLOAD_ITEM2, CMuleTrayIcon::SetUploadSpeed)
-	EVT_MENU( UPLOAD_ITEM3, CMuleTrayIcon::SetUploadSpeed)
-	EVT_MENU( UPLOAD_ITEM4, CMuleTrayIcon::SetUploadSpeed)
-	EVT_MENU( UPLOAD_ITEM5, CMuleTrayIcon::SetUploadSpeed)
-	EVT_MENU( UPLOAD_ITEM6, CMuleTrayIcon::SetUploadSpeed)
-	EVT_MENU( DOWNLOAD_ITEM1, CMuleTrayIcon::SetDownloadSpeed)
-	EVT_MENU( DOWNLOAD_ITEM2, CMuleTrayIcon::SetDownloadSpeed)
-	EVT_MENU( DOWNLOAD_ITEM3, CMuleTrayIcon::SetDownloadSpeed)
-	EVT_MENU( DOWNLOAD_ITEM4, CMuleTrayIcon::SetDownloadSpeed)
-	EVT_MENU( DOWNLOAD_ITEM5, CMuleTrayIcon::SetDownloadSpeed)
-	EVT_MENU( DOWNLOAD_ITEM6, CMuleTrayIcon::SetDownloadSpeed)
+	EVT_MENU(TRAY_MENU_EXIT, CMuleTrayIcon::Close)
+	EVT_MENU(TRAY_MENU_CONNECT, CMuleTrayIcon::ServerConnection)
+	EVT_MENU(TRAY_MENU_DISCONNECT, CMuleTrayIcon::ServerConnection)
+	EVT_MENU(TRAY_MENU_HIDE, CMuleTrayIcon::ShowHide)
+	EVT_MENU(TRAY_MENU_SHOW, CMuleTrayIcon::ShowHide)
+	EVT_MENU(UPLOAD_ITEM1, CMuleTrayIcon::SetUploadSpeed)
+	EVT_MENU(UPLOAD_ITEM2, CMuleTrayIcon::SetUploadSpeed)
+	EVT_MENU(UPLOAD_ITEM3, CMuleTrayIcon::SetUploadSpeed)
+	EVT_MENU(UPLOAD_ITEM4, CMuleTrayIcon::SetUploadSpeed)
+	EVT_MENU(UPLOAD_ITEM5, CMuleTrayIcon::SetUploadSpeed)
+	EVT_MENU(UPLOAD_ITEM6, CMuleTrayIcon::SetUploadSpeed)
+	EVT_MENU(DOWNLOAD_ITEM1, CMuleTrayIcon::SetDownloadSpeed)
+	EVT_MENU(DOWNLOAD_ITEM2, CMuleTrayIcon::SetDownloadSpeed)
+	EVT_MENU(DOWNLOAD_ITEM3, CMuleTrayIcon::SetDownloadSpeed)
+	EVT_MENU(DOWNLOAD_ITEM4, CMuleTrayIcon::SetDownloadSpeed)
+	EVT_MENU(DOWNLOAD_ITEM5, CMuleTrayIcon::SetDownloadSpeed)
+	EVT_MENU(DOWNLOAD_ITEM6, CMuleTrayIcon::SetDownloadSpeed)
 wxEND_EVENT_TABLE()
 
+// Constructor / destructor
 
-/****************************************************/
-/************ Constructor / Destructor **************/
-/****************************************************/
-
-static long GetSpeedFromString(wxString label){
+static long GetSpeedFromString(wxString label)
+{
 	long temp;
-	label.Replace(_("kB/s"),"",TRUE);
+	label.Replace(_("KiB/s"), "", TRUE);
 	label.Trim(FALSE);
 	label.Trim(TRUE);
 	label.ToLong(&temp);
 	return temp;
 }
 
-void CMuleTrayIcon::SetUploadSpeed(wxCommandEvent& event){
+void CMuleTrayIcon::SetUploadSpeed(wxCommandEvent &event)
+{
 
-	wxObject* obj=event.GetEventObject();
-	if (obj!=NULL) {
+	wxObject *obj = event.GetEventObject();
+	if (obj != NULL) {
 		wxMenu *menu = dynamic_cast<wxMenu *>(obj);
 		if (menu) {
-			wxMenuItem* item=menu->FindItem(event.GetId());
-			if (item!=NULL) {
-				if (item->GetItemLabelText()==(_("Unlimited"))) {
+			wxMenuItem *item = menu->FindItem(event.GetId());
+			if (item != NULL) {
+				if (item->GetItemLabelText() == (_("Unlimited"))) {
 					DoSetUploadLimit(-1);
-				}
-				else {
+				} else {
 					DoSetUploadLimit(GetSpeedFromString(item->GetItemLabelText()));
 				}
 			}
@@ -592,18 +586,18 @@
 	}
 }
 
-void CMuleTrayIcon::SetDownloadSpeed(wxCommandEvent& event){
+void CMuleTrayIcon::SetDownloadSpeed(wxCommandEvent &event)
+{
 
-	wxObject* obj=event.GetEventObject();
-	if (obj!=NULL) {
+	wxObject *obj = event.GetEventObject();
+	if (obj != NULL) {
 		wxMenu *menu = dynamic_cast<wxMenu *>(obj);
 		if (menu) {
-			wxMenuItem* item=menu->FindItem(event.GetId());
-			if (item!=NULL) {
-				if (item->GetItemLabelText()==(_("Unlimited"))) {
+			wxMenuItem *item = menu->FindItem(event.GetId());
+			if (item != NULL) {
+				if (item->GetItemLabelText() == (_("Unlimited"))) {
 					DoSetDownloadLimit(-1);
-				}
-				else {
+				} else {
 					DoSetDownloadLimit(GetSpeedFromString(item->GetItemLabelText()));
 				}
 			}
@@ -611,141 +605,109 @@
 	}
 }
 
-
-void CMuleTrayIcon::ServerConnection(wxCommandEvent& WXUNUSED(event))
+void CMuleTrayIcon::ServerConnection(wxCommandEvent &WXUNUSED(event))
 {
 	DoConnectDisconnect();
 }
 
-
-void CMuleTrayIcon::ShowHide(wxCommandEvent& WXUNUSED(event))
+void CMuleTrayIcon::ShowHide(wxCommandEvent &WXUNUSED(event))
 {
 	DoShowHide();
 }
 
-
-void CMuleTrayIcon::Close(wxCommandEvent& WXUNUSED(event))
+void CMuleTrayIcon::Close(wxCommandEvent &WXUNUSED(event))
 {
 	DoExit();
 }
 
-
 CMuleTrayIcon::CMuleTrayIcon()
 {
 	Old_Icon = -1;
 	Old_SpeedSize = 0xFFFF; // must be > any possible one.
-
-	// Create the background icons (speed improvement)
-	HighId_Icon_size = wxArtProvider::GetIcon("amule:tray_high").GetHeight();
-	LowId_Icon_size = wxArtProvider::GetIcon("amule:tray_low").GetHeight();
-	Disconnected_Icon_size = wxArtProvider::GetIcon("amule:tray_disconnected").GetHeight();
 }
 
-CMuleTrayIcon::~CMuleTrayIcon()
-{
-}
+CMuleTrayIcon::~CMuleTrayIcon() {}
 
-
-/****************************************************/
-/***************** Public Functions *****************/
-/****************************************************/
+// Public functions
 
 void CMuleTrayIcon::SetTrayIcon(int Icon, uint32 percent)
 {
-	int Bar_ySize = 0;
+	wxASSERT(Icon >= 0 && Icon < (int)WXSIZEOF(BaseImage));
 
-	switch (Icon) {
+	if (!BaseImageIcon.IsOk()) {
+		const char *artId = "amule:tray_disconnected";
+		switch (Icon) {
 		case TRAY_ICON_HIGHID:
-			// Most likely case, test first
-			Bar_ySize = HighId_Icon_size;
+			artId = "amule:tray_high";
 			break;
 		case TRAY_ICON_LOWID:
-			Bar_ySize = LowId_Icon_size;
-			break;
-		case TRAY_ICON_DISCONNECTED:
-			Bar_ySize = Disconnected_Icon_size;
+			artId = "amule:tray_low";
 			break;
 		default:
-			wxFAIL;
-	}
-
-	// Lookup this values for speed improvement: don't draw if not needed
-	int NewSize = (Bar_ySize * percent) / 100;
-
-	if ((Old_Icon != Icon) || (Old_SpeedSize != NewSize)) {
-
-		if ((Old_SpeedSize > NewSize) || (Old_Icon != Icon)) {
-			// We have to rebuild the icon, because bar is lower now.
-			switch (Icon) {
-				case TRAY_ICON_HIGHID:
-					// Most likely case, test first
-					CurrentIcon = wxArtProvider::GetIcon("amule:tray_high");
-					break;
-				case TRAY_ICON_LOWID:
-					CurrentIcon = wxArtProvider::GetIcon("amule:tray_low");
-					break;
-				case TRAY_ICON_DISCONNECTED:
-					CurrentIcon = wxArtProvider::GetIcon("amule:tray_disconnected");
-					break;
-				default:
-					wxFAIL;
+			break;
+		}
+		wxImage image = wxArtProvider::GetBitmap(artId, wxART_OTHER).ConvertToImage();
+		if (!image.IsOk()) {
+			return;
+		}
+		// Artwork that predates alpha marks its transparency with pure red. Turn that into
+		// a real alpha channel once, here, so everything below works on one representation.
+		if (!image.HasAlpha()) {
+			image.SetMaskColour(255, 0, 0);
+			image.InitAlpha();
+		}
+		BaseImageIcon = image;
+	}
+
+	const wxImage &base = BaseImageIcon;
+	const int width = base.GetWidth();
+	const int height = base.GetHeight();
+	const int barHeight = (height * (int)percent) / 100;
+
+	if ((Old_Icon == Icon) && (Old_SpeedSize == barHeight)) {
+		return;
+	}
+	Old_Icon = Icon;
+	Old_SpeedSize = barHeight;
+
+	// Always compose onto a copy of the untouched artwork. Composing onto the icon we produced
+	// last time loses transparency a little more each round -- an icon converted back to a
+	// bitmap returns its transparent pixels as black, so a rising transfer rate ends up with a
+	// solid black background.
+	//
+	// The bar is written into the image rather than drawn with a wxDC because wxMSW's DC writes
+	// the colour channels and leaves alpha alone: a bar drawn over transparent pixels keeps
+	// alpha 0 and never appears.
+	wxImage composed = base.Copy();
+	if (barHeight > 0) {
+		const wxColour barColour = CStatisticsDlg::getColors(11);
+		// Two pixels wide, in the last two columns, growing from the bottom. It used to sit
+		// two columns further in, which newer artwork fills, so the bar landed on the
+		// drawing instead of beside it.
+		const int barLeft = std::max(0, width - 2);
+		const int barRight = std::min(width, barLeft + 2);
+		for (int y = height - barHeight; y < height; ++y) {
+			for (int x = barLeft; x < barRight; ++x) {
+				composed.SetRGB(x, y, barColour.Red(), barColour.Green(), barColour.Blue());
+				composed.SetAlpha(x, y, wxALPHA_OPAQUE);
 			}
 		}
-
-		Old_Icon = Icon;
-		Old_SpeedSize = NewSize;
-
-		// Do whatever to the icon before drawing it (percent)
-
-		wxBitmap TempBMP;
-		TempBMP.CopyFromIcon(CurrentIcon);
-
-		TempBMP.SetMask(NULL);
-
-		IconWithSpeed.SelectObject(TempBMP);
-
-
-		// Speed bar is: centered, taking 80% of the icon height, and
-		// right-justified taking a 10% of the icon width.
-
-		// X
-		int Bar_xSize = 4;
-		int Bar_xPos = CurrentIcon.GetWidth() - 5;
-
-		IconWithSpeed.SetBrush(*(wxTheBrushList->FindOrCreateBrush(CStatisticsDlg::getColors(11))));
-		IconWithSpeed.SetPen(*wxTRANSPARENT_PEN);
-
-		IconWithSpeed.DrawRectangle(Bar_xPos + 1, Bar_ySize - NewSize, Bar_xSize -2 , NewSize);
-
-		// Unselect the icon.
-		IconWithSpeed.SelectObject(wxNullBitmap);
-
-		// Do transparency
-
-		// Set a new mask with transparency set to red.
-		wxMask* new_mask = new wxMask(TempBMP, wxColour(0xFF, 0x00, 0x00));
-
-		TempBMP.SetMask(new_mask);
-		CurrentIcon.CopyFromBitmap(TempBMP);
-
-		UpdateTray();
 	}
+
+	CurrentIcon.CopyFromBitmap(wxBitmap(composed));
+	UpdateTray();
 }
 
-void CMuleTrayIcon::SetTrayToolTip(const wxString& Tip)
+void CMuleTrayIcon::SetTrayToolTip(const wxString &Tip)
 {
 	CurrentTip = Tip;
 	UpdateTray();
 }
 
-
-/****************************************************/
-/**************** Private Functions *****************/
-/****************************************************/
+// Private functions
 
 void CMuleTrayIcon::UpdateTray()
 {
-	// Icon update and Tip update
 #ifndef __WXCOCOA__
 	if (IsOk())
 #endif
@@ -754,8 +716,7 @@
 	}
 }
 
-
-wxMenu* CMuleTrayIcon::CreatePopupMenu()
+wxMenu *CMuleTrayIcon::CreatePopupMenu()
 {
 	float kBpsUp = theStats::GetUploadRate() / 1024.0;
 	float kBpsDown = theStats::GetDownloadRate() / 1024.0;
@@ -764,53 +725,59 @@
 	bool showMBpsUp = (MBpsUp >= 1);
 	bool showMBpsDown = (MBpsDown >= 1);
 
-	// Dynamically creates the menu to show the user.
 	wxMenu *traymenu = new wxMenu();
 	traymenu->SetTitle(_("aMule Tray Menu"));
 
-	// Build the Top string name
 	wxString label = MOD_VERSION_LONG;
 	traymenu->Append(TRAY_MENU_INFO, label);
 	traymenu->AppendSeparator();
+
+	// Treat iconized as not visible -- see DoShowHide for rationale.
+	if (theApp->amuledlg->IsShown() && !theApp->amuledlg->IsTrayLogicallyIconized()) {
+		traymenu->Append(TRAY_MENU_HIDE, _("Hide aMule"));
+	} else {
+		traymenu->Append(TRAY_MENU_SHOW, _("Show aMule"));
+	}
+
+	traymenu->AppendSeparator();
+
 	label = wxString(_("Speed limits:")) + " ";
 
-	// Check for upload limits
 	unsigned int max_upload = thePrefs::GetMaxUpload();
-	if ( max_upload == UNLIMITED ) {
+	if (max_upload == UNLIMITED) {
 		label += _("UL: None");
-	}
-	else {
+	} else {
 		label += CFormat(_("UL: %u")) % max_upload;
 	}
 	label += ", ";
 
-	// Check for download limits
 	unsigned int max_download = thePrefs::GetMaxDownload();
-	if ( max_download == UNLIMITED ) {
+	if (max_download == UNLIMITED) {
 		label += _("DL: None");
-	}
-	else {
+	} else {
 		label += CFormat(_("DL: %u")) % max_download;
 	}
 
 	traymenu->Append(TRAY_MENU_INFO, label);
-	label = CFormat(_("Download speed: %.1f%s"))
-			% (showMBpsDown ? MBpsDown : kBpsDown) % (showMBpsDown ? _(" MB/s") : ((kBpsDown > 0) ? _(" kB/s") : ""));
+	label = CFormat(_("Download speed: %.1f%s")) % (showMBpsDown ? MBpsDown : kBpsDown) %
+		(showMBpsDown ? _(" MiB/s") : ((kBpsDown > 0) ? _(" KiB/s") : ""));
 	traymenu->Append(TRAY_MENU_INFO, label);
-	label = CFormat(_("Upload speed: %.1f%s"))
-			% (showMBpsUp ? MBpsUp : kBpsUp) % (showMBpsUp ? _(" MB/s") : ((kBpsUp > 0) ? _(" kB/s") : ""));
+	label = CFormat(_("Upload speed: %.1f%s")) % (showMBpsUp ? MBpsUp : kBpsUp) %
+		(showMBpsUp ? _(" MiB/s") : ((kBpsUp > 0) ? _(" KiB/s") : ""));
 	traymenu->Append(TRAY_MENU_INFO, label);
 	traymenu->AppendSeparator();
 
 	// Client Info
-	wxMenu* ClientInfoMenu = new wxMenu();
+	wxMenu *ClientInfoMenu = new wxMenu();
 	ClientInfoMenu->SetTitle(_("Client Information"));
 
 	// User nick-name
 	{
-		wxString temp = CFormat(_("Nickname: %s")) % ( thePrefs::GetUserNick().IsEmpty() ? wxString(_("No Nickname Selected!")) : thePrefs::GetUserNick() );
+		wxString temp = CFormat(_("Nickname: %s")) %
+				(thePrefs::GetUserNick().IsEmpty() ? wxString(_("No Nickname Selected!"))
+								   : thePrefs::GetUserNick());
 
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp);
 	}
 
 	// Client ID
@@ -822,30 +789,32 @@
 		} else {
 			temp += _("Not connected");
 		}
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp);
 	}
 
 	// Current Server and Server IP
 	{
 		wxString temp_name = _("ServerName: ");
-		wxString temp_ip   = _("ServerIP: ");
+		wxString temp_ip = _("ServerIP: ");
 
-		if ( theApp->serverconnect->GetCurrentServer() ) {
+		if (theApp->serverconnect->GetCurrentServer()) {
 			temp_name += theApp->serverconnect->GetCurrentServer()->GetListName();
-			temp_ip   += theApp->serverconnect->GetCurrentServer()->GetFullIP();
+			temp_ip += theApp->serverconnect->GetCurrentServer()->GetFullIP();
 		} else {
 			temp_name += _("Not connected");
-			temp_ip   += _("Not Connected");
+			temp_ip += _("Not Connected");
 		}
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp_name);
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp_ip);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp_name);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp_ip);
 	}
 
 	// IP Address
 	{
-		wxString temp = CFormat(_("IP: %s")) % ( (theApp->GetPublicIP()) ? Uint32toStringIP(theApp->GetPublicIP()) : wxString(_("Unknown")) );
+		wxString temp = CFormat(_("IP: %s")) %
+				((theApp->GetPublicIP()) ? Uint32toStringIP(theApp->GetPublicIP())
+							 : wxString(_("Unknown")));
 
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp);
 	}
 
 	// TCP PORT
@@ -854,9 +823,9 @@
 		if (thePrefs::GetPort()) {
 			temp = CFormat(_("TCP port: %d")) % thePrefs::GetPort();
 		} else {
-			temp=_("TCP port: Not ready");
+			temp = _("TCP port: Not ready");
 		}
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp);
 	}
 
 	// UDP PORT
@@ -865,145 +834,108 @@
 		if (thePrefs::GetEffectiveUDPPort()) {
 			temp = CFormat(_("UDP port: %d")) % thePrefs::GetEffectiveUDPPort();
 		} else {
-			temp=_("UDP port: Not ready");
+			temp = _("UDP port: Not ready");
 		}
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp);
 	}
 
 	// Online Signature
 	{
 		wxString temp;
 		if (thePrefs::IsOnlineSignatureEnabled()) {
-			temp=_("Online Signature: Enabled");
-		}
-		else {
-			temp=_("Online Signature: Disabled");
+			temp = _("Online Signature: Enabled");
+		} else {
+			temp = _("Online Signature: Disabled");
 		}
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp);
 	}
 
 	// Uptime
 	{
 		wxString temp = CFormat(_("Uptime: %s")) % CastSecondsToHM(theStats::GetUptimeSeconds());
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp);
 	}
 
 	// Number of shared files
 	{
 		wxString temp = CFormat(_("Shared files: %d")) % theStats::GetSharedFileCount();
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp);
 	}
 
 	// Number of queued clients
 	{
 		wxString temp = CFormat(_("Queued clients: %d")) % theStats::GetWaitingUserCount();
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp);
 	}
 
 	// Total Downloaded
 	{
 		wxString temp = CastItoXBytes(theStats::GetTotalReceivedBytes());
 		temp = CFormat(_("Total DL: %s")) % temp;
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp);
 	}
 
 	// Total Uploaded
 	{
 		wxString temp = CastItoXBytes(theStats::GetTotalSentBytes());
 		temp = CFormat(_("Total UL: %s")) % temp;
-		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
+		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM, temp);
 	}
 
-	traymenu->Append(TRAY_MENU_CLIENTINFO,ClientInfoMenu->GetTitle(),ClientInfoMenu);
+	traymenu->Append(TRAY_MENU_CLIENTINFO, ClientInfoMenu->GetTitle(), ClientInfoMenu);
 
-	// Separator
 	traymenu->AppendSeparator();
 
 	// Upload Speed sub-menu
-	wxMenu* UploadSpeedMenu = new wxMenu();
+	wxMenu *UploadSpeedMenu = new wxMenu();
 	UploadSpeedMenu->SetTitle(_("Upload limit"));
 
 	// Download Speed sub-menu
-	wxMenu* DownloadSpeedMenu = new wxMenu();
+	wxMenu *DownloadSpeedMenu = new wxMenu();
 	DownloadSpeedMenu->SetTitle(_("Download limit"));
 
-	// Upload Speed sub-menu
 	{
 		UploadSpeedMenu->Append(UPLOAD_ITEM1, _("Unlimited"));
 
-		uint32 max_ul_speed = thePrefs::GetMaxGraphUploadRate();
-
-		if ( max_ul_speed == UNLIMITED ) {
-			max_ul_speed = 100;
-		}
-		else if ( max_ul_speed < 10 ) {
-			max_ul_speed = 10;
-		}
-
-		for ( int i = 0; i < 5; i++ ) {
-			unsigned int tempspeed = (unsigned int)((double)max_ul_speed / 5) * (5 - i);
-			wxString temp = CFormat("%u %s") % tempspeed % _("kB/s");
-			UploadSpeedMenu->Append((int)UPLOAD_ITEM1+i+1,temp);
+		unsigned int speedsTRAY_SPEED_PRESETS;
+		GetTraySpeedPresets(thePrefs::GetMaxGraphUploadRate(), speeds);
+		for (int i = 0; i < TRAY_SPEED_PRESETS; i++) {
+			UploadSpeedMenu->Append((int)UPLOAD_ITEM1 + i + 1, TraySpeedLabel(speedsi));
 		}
 	}
-	traymenu->Append(0,UploadSpeedMenu->GetTitle(),UploadSpeedMenu);
+	traymenu->Append(0, UploadSpeedMenu->GetTitle(), UploadSpeedMenu);
 
-	// Download Speed sub-menu
 	{
 		DownloadSpeedMenu->Append(DOWNLOAD_ITEM1, _("Unlimited"));
 
-		uint32 max_dl_speed = thePrefs::GetMaxGraphDownloadRate();
-
-		if ( max_dl_speed == UNLIMITED ) {
-			max_dl_speed = 100;
-		}
-		else if ( max_dl_speed < 10 ) {
-			max_dl_speed = 10;
-		}
-
-		for ( int i = 0; i < 5; i++ ) {
-			unsigned int tempspeed = (unsigned int)((double)max_dl_speed / 5) * (5 - i);
-			wxString temp = CFormat("%d %s") % tempspeed % _("kB/s");
-			DownloadSpeedMenu->Append((int)DOWNLOAD_ITEM1+i+1,temp);
+		unsigned int speedsTRAY_SPEED_PRESETS;
+		GetTraySpeedPresets(thePrefs::GetMaxGraphDownloadRate(), speeds);
+		for (int i = 0; i < TRAY_SPEED_PRESETS; i++) {
+			DownloadSpeedMenu->Append((int)DOWNLOAD_ITEM1 + i + 1, TraySpeedLabel(speedsi));
 		}
 	}
 
-	traymenu->Append(0,DownloadSpeedMenu->GetTitle(),DownloadSpeedMenu);
-	// Separator
+	traymenu->Append(0, DownloadSpeedMenu->GetTitle(), DownloadSpeedMenu);
 	traymenu->AppendSeparator();
 
 	if (theApp->IsConnected()) {
-		//Disconnection Speed item
 		traymenu->Append(TRAY_MENU_DISCONNECT, _("Disconnect"));
 	} else {
-		//Connect item
 		traymenu->Append(TRAY_MENU_CONNECT, _("Connect"));
 	}
 
-	// Separator
-	traymenu->AppendSeparator();
-
-	// Treat iconized as not visible — see DoShowHide for rationale.
-	if (theApp->amuledlg->IsShown() && !theApp->amuledlg->IsTrayLogicallyIconized()) {
-		traymenu->Append(TRAY_MENU_HIDE, _("Hide aMule"));
-	} else {
-		traymenu->Append(TRAY_MENU_SHOW, _("Show aMule"));
-	}
-
-	// Separator
 	traymenu->AppendSeparator();
 
-	// Exit item
 	traymenu->Append(TRAY_MENU_EXIT, _("Exit"));
 
 	return traymenu;
 }
 
-void CMuleTrayIcon::SwitchShow(wxTaskBarIconEvent&)
+void CMuleTrayIcon::SwitchShow(wxTaskBarIconEvent &)
 {
 	DoShowHide();
 }
 
-#endif  // !WITH_LIBAYATANA_APPINDICATOR
+#endif // !WITH_LIBAYATANA_APPINDICATOR
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/MuleTrayIcon.h -> amule-3.1.0.tar.gz/src/MuleTrayIcon.h Changed

@@ -40,11 +40,12 @@
 	TBN_NEWVERSION
 };
 
-#include "Types.h"	// Needed for uint32
+#include "Types.h" // Needed for uint32
 
 class wxString;
 
-enum {
+enum
+{
 	TRAY_ICON_DISCONNECTED,
 	TRAY_ICON_LOWID,
 	TRAY_ICON_HIGHID
@@ -52,16 +53,14 @@
 
 // Backend selection:
 //
-// Linux with libayatana-appindicator3 → SNI (StatusNotifierItem)
-//   backend that talks D-Bus directly. This is what GNOME Shell (with
-//   the AppIndicators extension Ubuntu ships by default), KDE Plasma,
-//   Sway/wlroots, and every other modern desktop actually consume.
+// Linux with libayatana-appindicator3 -> SNI (StatusNotifierItem) backend talking D-Bus directly.
+// This is what GNOME Shell (with the AppIndicators extension Ubuntu ships by default), KDE Plasma,
+// Sway/wlroots and every other modern desktop actually consume.
 //
-// Everywhere else (Windows, macOS, Linux build without the dep) →
-//   wxTaskBarIcon, which on those platforms hits a working native API
-//   (Win32 NOTIFYICONDATA, NSStatusItem). On Linux without the dep
-//   wxTaskBarIcon falls through to the legacy GtkStatusIcon API which
-//   GNOME 3.26+ silently dropped — distros really should ship the dep.
+// Everywhere else (Windows, macOS, Linux build without the dep) -> wxTaskBarIcon, which on those
+// platforms hits a working native API (Win32 NOTIFYICONDATA, NSStatusItem). On Linux without the
+// dep it falls through to the legacy GtkStatusIcon API that GNOME 3.26+ silently dropped -- distros
+// really should ship the dep.
 #ifdef WITH_LIBAYATANA_APPINDICATOR
 struct _AppIndicator;
 struct _GtkWidget;
@@ -70,18 +69,16 @@
 #else
 #include <wx/taskbar.h>
 #include <wx/icon.h>
-#include <wx/dcmemory.h>
+#include <wx/image.h>
 class wxMenu;
 #endif
 
-
 /**
- * The mule tray icon class is responsible for drawing the mule systray icon
- * and reacting to the user input on it.
+ * Draws the mule systray icon and reacts to user input on it.
  */
 class CMuleTrayIcon
 #ifndef WITH_LIBAYATANA_APPINDICATOR
-	: public wxTaskBarIcon
+: public wxTaskBarIcon
 #endif
 {
 public:
@@ -91,65 +88,62 @@
 	/**
 	 * Set the Tray icon.
 	 * @param Icon  TRAY_ICON_HIGHID / LOWID / DISCONNECTED
-	 * @param percent  download-speed bar percentage (legacy backend only;
-	 *                 ignored by the SNI backend, which switches between
-	 *                 three static state icons instead)
+	 * @param percent  download-speed bar percentage. Legacy backend only; the SNI backend
+	 * switches
+	 *                 between three static state icons instead.
 	 */
 	void SetTrayIcon(int Icon, uint32 percent);
 
 	/**
 	 * Set the Tray tooltip.
 	 */
-	void SetTrayToolTip(const wxString& Tip);
+	void SetTrayToolTip(const wxString &Tip);
 
-	// Action handlers — invoked by the GTK menu (Ayatana backend) or by
+	// Action handlers -- invoked by the GTK menu (Ayatana backend) or by
 	// the wxMenu event table (wxTaskBarIcon backend).
 	void DoConnectDisconnect();
 	void DoShowHide();
-	// Deterministic non-toggling variants used by the SNI menu on
-	// Wayland, where window-iconize state isn't reliably detectable
-	// so a single toggle would mislabel itself when the user clicks
-	// the OS minimize button.
+	// Deterministic non-toggling variants used by the SNI menu on Wayland, where window-iconize
+	// state is not reliably detectable, so a single toggle would mislabel itself when the user
+	// clicks the OS minimize button.
 	void DoShow();
 	void DoHide();
 	void DoExit();
-	void DoSetUploadLimit(long kBytesPerSec);   // UNLIMITED for no cap
+	void DoSetUploadLimit(long kBytesPerSec); // UNLIMITED for no cap
 	void DoSetDownloadLimit(long kBytesPerSec);
 
 #ifdef WITH_LIBAYATANA_APPINDICATOR
-	// SNI menus are built once and held; callers re-invoke this to
-	// refresh the "Show aMule"/"Hide aMule" label after the main
-	// window's visibility changes outside the tray click path
-	// (e.g. close-button HideOnClose, minimize-to-tray).
+	// SNI menus are built once and held; callers re-invoke this to refresh the "Show
+	// aMule"/"Hide aMule" label after the main window's visibility changes outside the tray
+	// click path (close-button HideOnClose, minimize-to-tray).
 	void RebuildMenu();
 #endif
 
 private:
-
 #ifdef WITH_LIBAYATANA_APPINDICATOR
-	AppIndicator* m_indicator;
-	GtkWidget*    m_menu;
-	int           m_lastIconState;
+	AppIndicator *m_indicator;
+	GtkWidget *m_menu;
+	int m_lastIconState;
 #else
-	virtual wxMenu* CreatePopupMenu();
+	virtual wxMenu *CreatePopupMenu();
 	void UpdateTray();
 
-	void SwitchShow(wxTaskBarIconEvent&);
-	void SetUploadSpeed(wxCommandEvent&);
-	void SetDownloadSpeed(wxCommandEvent&);
-	void ServerConnection(wxCommandEvent&);
-	void ShowHide(wxCommandEvent&);
-	void Close(wxCommandEvent&);
+	void SwitchShow(wxTaskBarIconEvent &);
+	void SetUploadSpeed(wxCommandEvent &);
+	void SetDownloadSpeed(wxCommandEvent &);
+	void ServerConnection(wxCommandEvent &);
+	void ShowHide(wxCommandEvent &);
+	void Close(wxCommandEvent &);
 
 	int Old_Icon;
 	int Old_SpeedSize;
 
-	int Disconnected_Icon_size;
-	int LowId_Icon_size;
-	int HighId_Icon_size;
+	// The unmodified artwork for each state, indexed by TRAY_ICON_*, loaded once. SetTrayIcon()
+	// composes the speed bar onto a copy of one of these rather than onto the icon it drew last
+	// time -- see the comment there.
+	wxImage BaseImage3;
 
 	wxIcon CurrentIcon;
-	wxMemoryDC IconWithSpeed;
 	wxString CurrentTip;
 
 	wxDECLARE_EVENT_TABLE();
@@ -158,5 +152,5 @@
 
 #endif // DAEMON
 
-#endif //MULETRAYICON_H
+#endif // MULETRAYICON_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/MuleUDPSocket.cpp -> amule-3.1.0.tar.gz/src/MuleUDPSocket.cpp Changed

@@ -25,16 +25,16 @@
 #include <wx/wx.h>
 #include <algorithm>
 
-#include "MuleUDPSocket.h"              // Interface declarations
+#include "MuleUDPSocket.h" // Interface declarations
 
 #include <protocol/ed2k/Constants.h>
 
-#include "amule.h"                      // Needed for theApp
-#include "GetTickCount.h"               // Needed for GetTickCount64()
-#include "Packet.h"                     // Needed for CPacket
-#include <common/StringFunctions.h>     // Needed for unicode2char
-#include "Proxy.h"                      // Needed for CDatagramSocketProxy
-#include "Logger.h"                     // Needed for AddDebugLogLine{C,N}
+#include "amule.h"                  // Needed for theApp
+#include "GetTickCount.h"           // Needed for GetTickCount64()
+#include "Packet.h"                 // Needed for CPacket
+#include <common/StringFunctions.h> // Needed for unicode2char
+#include "Proxy.h"                  // Needed for CDatagramSocketProxy
+#include "Logger.h"                 // Needed for AddDebugLogLine{C,N}
 #include "UploadBandwidthThrottler.h"
 #include "EncryptedDatagramSocket.h"
 #include "OtherFunctions.h"
@@ -42,19 +42,17 @@
 #include "ClientList.h"
 #include "Preferences.h"
 
-
-CMuleUDPSocket::CMuleUDPSocket(const wxString& name, int id, const amuleIPV4Address& address, const CProxyData* ProxyData)
-:
-m_busy(false),
-m_name(name),
-m_id(id),
-m_addr(address),
-m_proxy(ProxyData),
-m_socket(NULL)
+CMuleUDPSocket::CMuleUDPSocket(
+	const wxString &name, int id, const amuleIPV4Address &address, const CProxyData *ProxyData)
+: m_busy(false)
+, m_name(name)
+, m_id(id)
+, m_addr(address)
+, m_proxy(ProxyData)
+, m_socket(NULL)
 {
 }
 
-
 CMuleUDPSocket::~CMuleUDPSocket()
 {
 	theApp->uploadBandwidthThrottler->RemoveFromAllQueues(this);
@@ -63,7 +61,6 @@
 	DestroySocket();
 }
 
-
 void CMuleUDPSocket::CreateSocket()
 {
 	wxCHECK_RET(!m_socket, "Socket already opened.");
@@ -76,11 +73,13 @@
 		AddDebugLogLineC(logMuleUDP, "Failed to create valid " + m_name);
 		DestroySocket();
 	} else {
-		AddLogLineN(wxString("Created ") << m_name << " at port " << m_addr.Service());
+		// One template rather than concatenation: translators need to be able to reorder
+		// the name and the port. m_name is a construction-time identifier ("Server UDP-
+		// Socket"), left untranslated on purpose.
+		AddLogLineN(CFormat(_("Created %s at port %u")) % m_name % m_addr.Service());
 	}
 }
 
-
 void CMuleUDPSocket::DestroySocket()
 {
 	if (m_socket) {
@@ -91,7 +90,6 @@
 	}
 }
 
-
 void CMuleUDPSocket::Open()
 {
 	wxMutexLocker lock(m_mutex);
@@ -99,7 +97,6 @@
 	CreateSocket();
 }
 
-
 void CMuleUDPSocket::Close()
 {
 	wxMutexLocker lock(m_mutex);
@@ -107,7 +104,6 @@
 	DestroySocket();
 }
 
-
 void CMuleUDPSocket::OnSend(int errorCode)
 {
 	if (errorCode) {
@@ -125,14 +121,14 @@
 	theApp->uploadBandwidthThrottler->QueueForSendingControlPacket(this);
 }
 
-
 void CMuleUDPSocket::OnReceive(int errorCode)
 {
-	AddDebugLogLineN(logMuleUDP, CFormat("Got UDP callback for read: Error %i Socket state %i")
-		% errorCode % Ok());
+	AddDebugLogLineN(logMuleUDP,
+		CFormat("Got UDP callback for read: Error %i Socket state %i") % errorCode % Ok());
 
 	char bufferUDP_BUFFER_SIZE;
-	amuleIPV4Address addr;
+	CNetworkAddress addr;
+	uint16 port = 0;
 	unsigned length = 0;
 	bool error = false;
 	int lastError = 0;
@@ -147,50 +143,58 @@
 			return;
 		}
 
-
-		length = m_socket->RecvFrom(addr, buffer, UDP_BUFFER_SIZE);
+		length = m_socket->RecvFrom(addr, port, buffer, UDP_BUFFER_SIZE);
 		lastError = m_socket->LastError();
 		error = lastError != 0;
 	}
 
-	const uint32 ip = StringIPtoUint32(addr.IPAddress());
-	const uint16 port = addr.Service();
+	// The encrypted/Kad packet handlers still require the legacy IPv4 representation; retain it
+	// only at those explicit protocol boundaries. The socket callback carries the full address.
+	const uint32 ip = addr.ToIPv4NetworkOrderOrZero();
+	const wxString source(addr.ToString());
 	if (error) {
 		OnReceiveError(lastError, ip, port);
 	} else if (length < 2) {
 		// 2 bytes (protocol and opcode) is the smallets possible packet.
 		AddDebugLogLineN(logMuleUDP, m_name + ": Invalid Packet received");
-	} else if (!ip) {
+	} else if (addr.IsAbsent() || addr.IsUnspecified()) {
 		// wxFAIL;
-		AddLogLineNS("Unknown ip receiving a UDP packet! Ignoring: '" + addr.IPAddress() + "'");
+		AddDebugLogLineN(logMuleUDP, "Unknown ip receiving a UDP packet! Ignoring: '" + source + "'");
 	} else if (!port) {
 		// wxFAIL;
-		AddLogLineNS("Unknown port receiving a UDP packet! Ignoring");
-	} else if (theApp->clientlist->IsBannedClient(ip)) {
-		AddDebugLogLineN(logMuleUDP, m_name + ": Dropped packet from banned IP " + addr.IPAddress());
+		AddDebugLogLineN(logMuleUDP, "Unknown port receiving a UDP packet! Ignoring");
+	} else if (theApp->clientlist->IsBannedClient(addr)) {
+		AddDebugLogLineN(logMuleUDP, m_name + ": Dropped packet from banned IP " + source);
 	} else {
-		AddDebugLogLineN(logMuleUDP, (m_name + ": Packet received (")
-			<< addr.IPAddress() << ":" << port << "): "
-			<< length << "b");
-		OnPacketReceived(ip, port, (uint8_t*)buffer, length);
+		AddDebugLogLineN(logMuleUDP,
+			(m_name + ": Packet received (") << source << ":" << port << "): " << length << "b");
+		OnPacketReceived(addr, port, (uint8_t *)buffer, length);
 	}
 }
 
-
 void CMuleUDPSocket::OnReceiveError(int DEBUG_ONLY(errorCode), uint32 WXUNUSED(ip), uint16 WXUNUSED(port))
 {
 	AddDebugLogLineN(logMuleUDP, (m_name + ": Error while reading: ") << errorCode);
 }
 
+bool CMuleUDPSocket::GetIPv4PacketAddress(
+	const CNetworkAddress &address, uint32_t &ip, DebugType logType, const wxString &packetKind) const
+{
+	ip = address.ToIPv4NetworkOrderOrZero();
+	if (ip) {
+		return true;
+	}
+	AddDebugLogLineN(
+		logType, "Ignoring " + packetKind + " UDP packet from " + wxString(address.ToString()));
+	return false;
+}
 
 void CMuleUDPSocket::OnDisconnected(int WXUNUSED(errorCode))
 {
-	/* Due to bugs in wxWidgets, UDP sockets will sometimes
-	 * be closed. This is caused by the fact that wx treats
-	 * zero-length datagrams as EOF, which is only the case
-	 * when dealing with streaming sockets.
+	/* Due to bugs in wxWidgets, UDP sockets will sometimes be closed. This is caused by wx
+	 * treating zero-length datagrams as EOF, which is only the case for streaming sockets.
 	 *
-	 * This has been reported as patch #1885472:
+	 * Reported as patch #1885472:
 	 * http://sourceforge.net/tracker/index.php?func=detail&aid=1885472&group_id=9863&atid=309863
 	 */
 	AddDebugLogLineC(logMuleUDP, m_name + "Socket died, recreating.");
@@ -198,8 +202,13 @@
 	CreateSocket();
 }
 
-
-void CMuleUDPSocket::SendPacket(CPacket* packet, uint32 IP, uint16 port, bool bEncrypt, const uint8* pachTargetClientHashORKadID, bool bKad, uint32 nReceiverVerifyKey)
+void CMuleUDPSocket::SendPacket(CPacket *packet,
+	uint32 IP,
+	uint16 port,
+	bool bEncrypt,
+	const uint8 *pachTargetClientHashORKadID,
+	bool bKad,
+	uint32 nReceiverVerifyKey)
 {
 	wxCHECK_RET(packet, "Invalid packet.");
 	/*wxCHECK_RET(port, "Invalid port.");
@@ -211,23 +220,27 @@
 	}
 
 	if (!Ok()) {
-		AddDebugLogLineN(logMuleUDP, (m_name + ": Packet discarded, socket not Ok (")
-			<< Uint32_16toStringIP_Port(IP, port) << "): " << packet->GetPacketSize() << "b");
+		AddDebugLogLineN(logMuleUDP,
+			(m_name + ": Packet discarded, socket not Ok (")
+				<< Uint32_16toStringIP_Port(IP, port) << "): " << packet->GetPacketSize()
+				<< "b");
 		delete packet;
 
 		return;
 	}
 
-	AddDebugLogLineN(logMuleUDP, (m_name + ": Packet queued (")
-		<< Uint32_16toStringIP_Port(IP, port) << "): " << packet->GetPacketSize() << "b");
+	AddDebugLogLineN(logMuleUDP,
+		(m_name + ": Packet queued (")
+			<< Uint32_16toStringIP_Port(IP, port) << "): " << packet->GetPacketSize() << "b");
 
 	UDPPack newpending;
 	newpending.IP = IP;
 	newpending.port = port;
 	newpending.packet = packet;
 	newpending.time = GetTickCount64();
-	newpending.bEncrypt = bEncrypt && (pachTargetClientHashORKadID != NULL || (bKad && nReceiverVerifyKey != 0))
-							&& thePrefs::IsClientCryptLayerSupported();
+	newpending.bEncrypt = bEncrypt &&
+			      (pachTargetClientHashORKadID != NULL || (bKad && nReceiverVerifyKey != 0)) &&
+			      thePrefs::IsClientCryptLayerSupported();
 	newpending.bKad = bKad;
 	newpending.nReceiverVerifyKey = nReceiverVerifyKey;
 	if (newpending.bEncrypt && pachTargetClientHashORKadID != NULL) {
@@ -244,7 +257,6 @@
 	theApp->uploadBandwidthThrottler->QueueForSendingControlPacket(this);
 }
 
-
 bool CMuleUDPSocket::Ok()
 {
 	wxMutexLocker lock(m_mutex);
@@ -252,32 +264,36 @@
 	return m_socket && m_socket->IsOk();
 }
 
-
 SocketSentBytes CMuleUDPSocket::SendControlData(uint32 maxNumberOfBytesToSend, uint32 WXUNUSED(minFragSize))
 {
 	wxMutexLocker lock(m_mutex);
 	uint32 sentBytes = 0;
 	while (!m_queue.empty() && !m_busy && (sentBytes < maxNumberOfBytesToSend)) {
 		UDPPack item = m_queue.front();
-		CPacket* packet = item.packet;
+		CPacket *packet = item.packet;
 		if (GetTickCount64() - item.time < UDPMAXQUEUETIME) {
 			uint32_t len = packet->GetPacketSize() + 2;
-			uint8_t *sendbuffer = new uint8_t len;
+			uint8_t *sendbuffer = new uint8_tlen;
 			memcpy(sendbuffer, packet->GetUDPHeader(), 2);
 			memcpy(sendbuffer + 2, packet->GetDataBuffer(), packet->GetPacketSize());
 
 			if (item.bEncrypt && (theApp->GetPublicIP() > 0 || item.bKad)) {
-				len = CEncryptedDatagramSocket::EncryptSendClient(&sendbuffer, len, item.pachTargetClientHashORKadID, item.bKad, item.nReceiverVerifyKey, (item.bKad ? Kademlia::CPrefs::GetUDPVerifyKey(item.IP) : 0));
+				len = CEncryptedDatagramSocket::EncryptSendClient(&sendbuffer,
+					len,
+					item.pachTargetClientHashORKadID,
+					item.bKad,
+					item.nReceiverVerifyKey,
+					(item.bKad ? Kademlia::CPrefs::GetUDPVerifyKey(item.IP) : 0));
 			}
 
 			if (SendTo(sendbuffer, len, item.IP, item.port)) {
 				sentBytes += len;
 				m_queue.pop_front();
 				delete packet;
-				delete  sendbuffer;
+				delete sendbuffer;
 			} else {
 				// TODO: Needs better error handling, see SentTo
-				delete  sendbuffer;
+				delete sendbuffer;
 				break;
 			}
 		} else {
@@ -293,7 +309,6 @@
 	return returnVal;
 }
 
-
 bool CMuleUDPSocket::SendTo(uint8_t *buffer, uint32_t length, uint32_t ip, uint16_t port)
 {
 	// Just pretend that we sent the packet in order to avoid infinite loops.
@@ -311,21 +326,20 @@
 	bool sent = false;
 	m_socket->SendTo(addr, buffer, length);
 	if (m_socket->BlocksWrite()) {
-		// Socket is busy and can't send this data right now,
-		// so we just return not sent and set the wouldblock
-		// flag so it gets resent when socket is ready.
+		// The socket is busy and cannot send this data now, so return not-sent and set the
+		// wouldblock flag, and it is resent when the socket is ready.
 		m_busy = true;
 	} else if (uint32 error = m_socket->LastError()) {
 		// An error which we can't handle happened, so we drop
 		// the packet rather than risk entering an infinite loop.
-		AddLogLineN(("WARNING! " + m_name + ": Packet to ")
-			<< Uint32_16toStringIP_Port(ip, port)
-			<< " discarded due to error (" << error << ") while sending.");
+		AddLogLineN(
+			CFormat(_("WARNING! %s: Packet to %s discarded due to error (%s) while sending.")) %
+			m_name % Uint32_16toStringIP_Port(ip, port) % error);
 		sent = true;
 	} else {
-		AddDebugLogLineN(logMuleUDP, (m_name + ": Packet sent (")
-			<< Uint32_16toStringIP_Port(ip, port) << "): "
-			<< length << "b");
+		AddDebugLogLineN(logMuleUDP,
+			(m_name + ": Packet sent (")
+				<< Uint32_16toStringIP_Port(ip, port) << "): " << length << "b");
 		sent = true;
 	}

amule-3.0.1.tar.gz/src/MuleUDPSocket.h -> amule-3.1.0.tar.gz/src/MuleUDPSocket.h Changed

@@ -25,27 +25,24 @@
 #ifndef MULEUDPSOCKET_H
 #define MULEUDPSOCKET_H
 
+#include "Types.h"            // Needed for uint16 and uint32
+#include "ThrottledSocket.h"  // Needed for ThrottledControlSocket
+#include "amuleIPV4Address.h" // Needed for amuleIPV4Address
+#include "NetworkAddress.h"   // Needed for typed packet source addresses
+#include "Logger.h"           // Needed for DebugType
 
-#include "Types.h"				// Needed for uint16 and uint32
-#include "ThrottledSocket.h"	// Needed for ThrottledControlSocket
-#include "amuleIPV4Address.h"	// Needed for amuleIPV4Address
-
-#include <wx/thread.h>		// Needed for wxMutex
+#include <wx/thread.h> // Needed for wxMutex
 
 class CEncryptedDatagramSocket;
 class CProxyData;
 class CPacket;
 
-/***
- * This class provides a UBT governed UDP-socket.
- *
- * The CMuleUDPSocket are created with the NOWAIT option and
- * handle both INPUT and OUTPUT events.
+/**
+ * A UBT-governed UDP socket.
  *
- * The following additional features are provided compared to CDatagramSocketProxy:
- *  - Goverened by the UBT.
- *  - Automatic sending/receiving of packets.
- *  - Fallover recovery for when a socket becomes invalid (error 4).
+ * Created with the NOWAIT option, handling both INPUT and OUTPUT events. Over CDatagramSocketProxy
+ * it adds UBT governance, automatic sending and receiving of packets, and fallover recovery for
+ * when a socket becomes invalid (error 4).
  *
  * @see ThrottledControlSocket
  * @see CEncryptedDatagramSocket
@@ -59,33 +56,31 @@
 	 *
 	 * @param name Name used when logging events.
 	 * @param id The ID used for events.
-	 * @param address The address where the socket will listen.
+	 * @param address The address the socket will listen on.
 	 * @param ProxyData ProxyData associated with the socket.
 	 */
-	CMuleUDPSocket(const wxString& name, int id, const amuleIPV4Address& address, const CProxyData* ProxyData = NULL);
+	CMuleUDPSocket(const wxString &name,
+		int id,
+		const amuleIPV4Address &address,
+		const CProxyData *ProxyData = NULL);
 
 	/**
-	 * Destructor, safely closes the socket if opened.
+	 * Safely closes the socket if opened.
 	 */
 	virtual ~CMuleUDPSocket();
 
-
 	/**
-	 * Opens the socket.
-	 *
-	 * The socket is bound to the address specified in
-	 * the constructor.
+	 * Opens the socket, bound to the address given to the constructor.
 	 */
 	void Open();
 
 	/**
-	 * Closes the socket.
-	 *
-	 * The socket can be reopened by calling Open. Closing a
-	 * already closed socket is an illegal operation.
+	 * Closes the socket. It can be reopened with Open(); closing an already closed socket is
+	 * illegal.
 	 */
-	void Close();
-
+	// Gating virtual would make class layout depend on a define in this widely included header.
+	// The only other subclass, CServerUDPSocket, declares no Close().
+	virtual void Close();
 
 	/** This function is called by aMule when the socket may send. */
 	virtual void OnSend(int errorCode);
@@ -97,107 +92,105 @@
 	virtual void OnDisconnected(int errorCode);
 
 	/**
-	 * Queues a packet for sending.
+	 * Queues a packet for sending, taking ownership of it.
 	 *
 	 * @param packet The packet to send.
 	 * @param IP The target IP address.
 	 * @param port The target port.
-	 * @param bEncrypt If the packet must be encrypted
-	 * @param port The target port.
-	 * @param pachTargetClientHashORKadID The client hash or Kad ID
-	 * @param bKad
-	 * @param nReceiverVerifyKey
-	 *
-	 * Note that CMuleUDPSocket takes ownership of the packet.
+	 * @param bEncrypt Whether the packet must be encrypted.
+	 * @param pachTargetClientHashORKadID The client hash or Kad ID.
 	 */
-	void	SendPacket(CPacket* packet, uint32 IP, uint16 port, bool bEncrypt, const uint8* pachTargetClientHashORKadID, bool bKad, uint32 nReceiverVerifyKey);
-
+	void SendPacket(CPacket *packet,
+		uint32 IP,
+		uint16 port,
+		bool bEncrypt,
+		const uint8 *pachTargetClientHashORKadID,
+		bool bKad,
+		uint32 nReceiverVerifyKey);
 
 	/**
-	 * Returns true if the socket is Ok, false otherwise.
-	 *
-	 * @see wxSocketBase::Ok
+	 * True if the socket is Ok. @see wxSocketBase::Ok
 	 */
-	bool	Ok();
+	bool Ok();
 
 	/** Read buffer size */
 	static const unsigned UDP_BUFFER_SIZE = 16384;
 
 protected:
 	/**
-	 * This function is called when a packet has been received.
+	 * Called when a packet has been received.
 	 *
-	 * @param addr The address from where data was received.
-	 * @param buffer The data that has been received.
+	 * @param addr The address the data came from.
+	 * @param buffer The data received.
 	 * @param length The length of the data buffer.
 	 */
-	virtual void OnPacketReceived(uint32 ip, uint16 port, uint8_t* buffer, size_t length) = 0;
-
+	virtual void OnPacketReceived(
+		const CNetworkAddress &address, uint16 port, uint8_t *buffer, size_t length) = 0;
 
 	/** See ThrottledControlSocket::SendControlData */
-	SocketSentBytes  SendControlData(uint32 maxNumberOfBytesToSend, uint32 minFragSize);
+	SocketSentBytes SendControlData(uint32 maxNumberOfBytesToSend, uint32 minFragSize);
+
+	bool GetIPv4PacketAddress(const CNetworkAddress &address,
+		uint32_t &ip,
+		DebugType logType,
+		const wxString &packetKind) const;
 
 private:
 	/**
 	 * Sends a packet to the specified address.
 	 *
 	 * @param buffer The data to be sent.
-	 * @param length the length of the data buffer.
-	 * @param ip The target ip address.
+	 * @param length The length of the data buffer.
+	 * @param ip The target IP address.
 	 * @param port The target port.
 	 */
-	bool	SendTo(uint8_t *buffer, uint32_t length, uint32_t ip, uint16_t port);
-
+	bool SendTo(uint8_t *buffer, uint32_t length, uint32_t ip, uint16_t port);
 
 	/**
-	 * Creates a new socket.
-	 *
-	 * Calling this function when a socket already exists
-	 * is an illegal operation.
+	 * Creates a new socket. Calling this when one already exists is illegal.
 	 */
-	void	CreateSocket();
+	void CreateSocket();
 
 	/**
 	 * Destroys the current socket, if any.
 	 */
-	void	DestroySocket();
-
+	void DestroySocket();
 
 	//! Specifies if the last write attempt would cause the socket to block.
-	bool					m_busy;
+	bool m_busy;
 	//! The name of the socket, used for debugging messages.
-	wxString				m_name;
+	wxString m_name;
 	//! The socket-ID, used for event-handling.
-	int						m_id;
+	int m_id;
 	//! The address at which the socket is currently bound.
-	amuleIPV4Address		m_addr;
+	amuleIPV4Address m_addr;
 	//! Proxy settings used by the socket ...
-	const CProxyData*		m_proxy;
+	const CProxyData *m_proxy;
 	//! Mutex needed due to the use of the UBT.
-	wxMutex					m_mutex;
+	wxMutex m_mutex;
 	//! The currently opened socket, if any.
-	CEncryptedDatagramSocket*	m_socket;
+	CEncryptedDatagramSocket *m_socket;
 
 	//! Storage struct used for queueing packets.
 	struct UDPPack
 	{
 		//! The packet, which at this point is owned by CMuleUDPSocket.
-		CPacket*	packet;
+		CPacket *packet;
 		//! The timestamp of when the packet was queued.
-		uint64		time;
+		uint64 time;
 		//! Target IP address.
-		uint32		IP;
+		uint32 IP;
 		//! Target port.
-		uint16		port;
+		uint16 port;
 		//! If the packet is encrypted.
-		bool	bEncrypt;
+		bool bEncrypt;
 		//! Is it a kad packet?
-		bool	bKad;
+		bool bKad;
 		// The verification key for RC4 encryption.
 		uint32 nReceiverVerifyKey;
 		// Client hash or kad ID.
 		uint8 pachTargetClientHashORKadID16;
-	} ;
+	};
 
 	//! The queue of packets waiting to be sent.
 	std::list<UDPPack> m_queue;

amule-3.0.1.tar.gz/src/MuleVersion.h -> amule-3.1.0.tar.gz/src/MuleVersion.h Changed

@@ -25,121 +25,140 @@
 #ifndef MULEVERSION_H
 #define MULEVERSION_H
 
-#include "config.h"		// Needed for VERSION
+#include "config.h" // Needed for VERSION
 
 #define MULEVERSION_RETVAL_BEGIN	wxString ver(
 #define MULEVERSION_RETVAL_END		);
-#define MULEVERSION_BOOST_VERSION	ver += " and Boost " + MuleBoostVersion;
-#define MULEVERSION_ADD_BEGIN		ver +=
-#define MULEVERSION_ADD_END		;
-#define MULEVERSION_RETURN_RESULT	return ver;
+#define MULEVERSION_BOOST_VERSION ver += " and Boost " + MuleBoostVersion;
+#define MULEVERSION_ADD_BEGIN ver +=
+#define MULEVERSION_ADD_END ;
+#define MULEVERSION_RETURN_RESULT return ver;
 
 /**
- * Version of Boost aMule is compiled with.
- *
- * Defined in LibSocketAsio.cpp.
+ * Version of Boost aMule is compiled with. Defined in LibSocketAsio.cpp.
  */
 extern wxString MuleBoostVersion;
 
-
 /**
- * Returns a description of the version of aMule being used.
+ * The build's version in the short form exchanged over EC and shown in the UI.
+ *
+ * `VERSION` alone cannot identify a development build: on any untagged build it is the literal
+ * string "GIT", so every snapshot reports the same value and two revisions look identical. The
+ * revision lives in GITDATE, which CMake sets from `git describe`.
  *
- * @return A detailed description of the aMule version, including wx information.
+ * On a tagged release CMake unsets GITDATE (config.h.cm renders `#undef GITDATE`), so this returns
+ * exactly VERSION -- e.g. "3.0.1" -- and the appended part compiles away. Only development builds
+ * gain the suffix, e.g. "GIT rev. 3.0.1-773-g500293ba3".
  *
- * Use this rather than just using the VERSION or CURRENT_VERSION_LONG
- * constants, when displaying information to the user. The purpose is to
- * help with debugging.
+ * Deliberately shorter than GetMuleVersion(): that one describes the whole build for debugging (wx
+ * toolkit, Boost, debug flag) and is far too long for a status-bar field or a protocol tag. Both
+ * the core that reports this over EC and the client that compares it against its own build call
+ * this, so the two can never disagree.
+ */
+inline wxString GetShortMuleVersion()
+{
+	return wxString(VERSION)
+#ifdef GITDATE
+	       + " " GITDATE
+#endif
+		;
+}
+
+/**
+ * A description of the aMule version in use, including wx information.
+ *
+ * Prefer this to the VERSION or CURRENT_VERSION_LONG constants when showing information to the
+ * user: it is meant to help with debugging.
  */
 inline wxString GetMuleVersion()
 {
 	MULEVERSION_RETVAL_BEGIN
-		VERSION
-		" compiled with "
+	VERSION
+	" compiled with "
 
 // Figure out the toolkit used by wxWidgets...
 #if defined(__WXGTK__)
-#	if defined(__WXGTK3__)
-#		define MULEVERSION_WXTOOLKIT	"GTK3"
-#	elif defined(__WXGTK2__)
-#		define MULEVERSION_WXTOOLKIT	"GTK2"
-#	else
-#		define MULEVERSION_WXTOOLKIT	"GTK"
-#	endif
+#if defined(__WXGTK3__)
+#define MULEVERSION_WXTOOLKIT "GTK3"
+#elif defined(__WXGTK2__)
+#define MULEVERSION_WXTOOLKIT "GTK2"
+#else
+#define MULEVERSION_WXTOOLKIT "GTK"
+#endif
 #elif defined(__WXOSX__)
-#	if defined(__WXOSX_CARBON__)
-#		define MULEVERSION_WXTOOLKIT	"OSX Carbon"
-#	elif defined(__WXOSX_COCOA__)
-#		define MULEVERSION_WXTOOLKIT	"OSX Cocoa"
-#	elif defined(__WXOSX_IPHONE__)
-#		define MULEVERSION_WXTOOLKIT	"OSX iPhone"
-#	else
-#		define MULEVERSION_WXTOOLKIT	"OSX"
-#	endif
+#if defined(__WXOSX_CARBON__)
+#define MULEVERSION_WXTOOLKIT "OSX Carbon"
+#elif defined(__WXOSX_COCOA__)
+#define MULEVERSION_WXTOOLKIT "OSX Cocoa"
+#elif defined(__WXOSX_IPHONE__)
+#define MULEVERSION_WXTOOLKIT "OSX iPhone"
+#else
+#define MULEVERSION_WXTOOLKIT "OSX"
+#endif
 #elif defined(__WXCOCOA__)
-#		define MULEVERSION_WXTOOLKIT	"Cocoa"
+#define MULEVERSION_WXTOOLKIT "Cocoa"
 #elif defined(__WXMAC__)
-#		define MULEVERSION_WXTOOLKIT	"Mac"
+#define MULEVERSION_WXTOOLKIT "Mac"
 #elif defined(__WXMSW__) || defined(__WINDOWS__)
-#	if defined(__VISUALC__)
-#		define MULEVERSION_WXTOOLKIT	"MSW VC"
-#	elif defined(__WXMICROWIN__)
-#		define MULEVERSION_WXTOOLKIT	"MicroWin"
-#	else
-#		define MULEVERSION_WXTOOLKIT	"MSW"
-#	endif
+#if defined(__VISUALC__)
+#define MULEVERSION_WXTOOLKIT "MSW VC"
+#elif defined(__WXMICROWIN__)
+#define MULEVERSION_WXTOOLKIT "MicroWin"
+#else
+#define MULEVERSION_WXTOOLKIT "MSW"
+#endif
 #elif defined(__NANOX__)
-#		define MULEVERSION_WXTOOLKIT	"NanoX"
+#define MULEVERSION_WXTOOLKIT "NanoX"
 #elif defined(__WXMOTIF__)
-#		define MULEVERSION_WXTOOLKIT	"Motif"
+#define MULEVERSION_WXTOOLKIT "Motif"
 #elif defined(__WXMGL__)
-#		define MULEVERSION_WXTOOLKIT	"MGL"
+#define MULEVERSION_WXTOOLKIT "MGL"
 #elif defined(__WXPM__)
-#		define MULEVERSION_WXTOOLKIT	"PM"
+#define MULEVERSION_WXTOOLKIT "PM"
 #elif defined(__WXDFB__)
-#		define MULEVERSION_WXTOOLKIT	"DirectFB"
+#define MULEVERSION_WXTOOLKIT "DirectFB"
 #elif defined(__WXX11__)
-#		define MULEVERSION_WXTOOLKIT	"X11"
+#define MULEVERSION_WXTOOLKIT "X11"
 #endif
 
 // ...and describe it.
 #if defined(__WXBASE__)
-		"wxBase"
-#	ifdef MULEVERSION_WXTOOLKIT
-		"(" MULEVERSION_WXTOOLKIT ")"
-#	endif
+	"wxBase"
+#ifdef MULEVERSION_WXTOOLKIT
+	"(" MULEVERSION_WXTOOLKIT ")"
+#endif
 #elif defined(__WXUNIVERSAL__)
-		"wxUniversal"
-#	ifdef MULEVERSION_WXTOOLKIT
-		"(" MULEVERSION_WXTOOLKIT ")"
-#	endif
+	"wxUniversal"
+#ifdef MULEVERSION_WXTOOLKIT
+	"(" MULEVERSION_WXTOOLKIT ")"
+#endif
+#else
+#ifdef MULEVERSION_WXTOOLKIT
+	"wx" MULEVERSION_WXTOOLKIT
 #else
-#	ifdef MULEVERSION_WXTOOLKIT
-		"wx" MULEVERSION_WXTOOLKIT
-#	else
-		"wxWidgets"
-#	endif
+	"wxWidgets"
+#endif
 #endif
 
-		// wxWidgets version
-		" v" wxSTRINGIZE_T(wxMAJOR_VERSION) "." wxSTRINGIZE_T(wxMINOR_VERSION) "." wxSTRINGIZE_T(wxRELEASE_NUMBER)
-	MULEVERSION_RETVAL_END
+	// wxWidgets version
+	" v" wxSTRINGIZE_T(wxMAJOR_VERSION) "." wxSTRINGIZE_T(wxMINOR_VERSION) "." wxSTRINGIZE_T(
+		wxRELEASE_NUMBER) MULEVERSION_RETVAL_END
 
-	// Describe Boost version, if compiled with Boost.Asio
-	MULEVERSION_BOOST_VERSION
+		// Describe Boost version, if compiled with Boost.Asio
+		MULEVERSION_BOOST_VERSION
 
 #if defined(__DEBUG__) || defined(GITDATE)
-	MULEVERSION_ADD_BEGIN
-#	ifdef __DEBUG__
+		MULEVERSION_ADD_BEGIN
+#ifdef __DEBUG__
 		" (Debugging)"
-#	endif
-#	ifdef GITDATE
+#endif
+#ifdef GITDATE
 		" (Snapshot: " GITDATE ")"
-#	endif
-	MULEVERSION_ADD_END
+#endif
+		MULEVERSION_ADD_END
 #endif
 
-	MULEVERSION_RETURN_RESULT
+		MULEVERSION_RETURN_RESULT
 }
 
 #undef MULEVERSION_RETVAL_BEGIN

amule-3.1.0.tar.gz/src/MuleVirtualDataViewCtrl.cpp Added

@@ -0,0 +1,680 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+
+#include "MuleVirtualDataViewCtrl.h" // Interface declarations
+
+#include <algorithm> // Needed for std::sort, std::lower_bound, std::remove
+
+#include <wx/utils.h> // Needed for wxGetMouseState()
+
+#include "Preferences.h" // Needed for thePrefs::LiveListSort()
+
+namespace
+{
+//! Retry cadence while the user is interacting, in ms.
+const int kResortRetryMs = 250;
+const int kResortTimerId = wxID_HIGHEST + 1201;
+} // namespace
+
+wxBEGIN_EVENT_TABLE(CMuleVirtualDataViewCtrl, CMuleDataViewCtrl)
+	EVT_TIMER(kResortTimerId, CMuleVirtualDataViewCtrl::OnResortTimer)
+	EVT_KEY_DOWN(CMuleVirtualDataViewCtrl::OnArrowKey)
+wxEND_EVENT_TABLE()
+
+/**
+ * The row-addressed view onto the control's item vector.
+ *
+ * Deliberately minimal: it holds no data of its own and answers every question by indexing into
+ * the owner's m_items. Nothing here is virtual for subclasses to touch -- they see the
+ * wxUIntPtr-based hooks instead.
+ */
+// wxDataViewVirtualListModel, not wxDataViewIndexListModel: despite the name, only the former is
+// virtual in the generic backend (MSW). An index-list model gets a real wxDataViewTreeNode per row
+// hanging off a root branch, and each branch caches the sort order it was last sorted under.
+// Marking our columns sortable to get the header caret sets the window's sort order without wx
+// ever sorting anything -- the list owns its own order -- so the branch cache and the window
+// disagree, and the next RowChanged() trips the sortOrder assert in PutChildInSortOrder()
+// (datavgen.cpp, 3.2 and 3.3 alike). A virtual list model has no tree nodes, so that code is never
+// reached. A no-op on macOS, where wx typedefs wxDataViewVirtualListModel to
+// wxDataViewIndexListModel -- which is why the assert is Windows-only.
+class CMuleVirtualDataViewCtrl::VirtualModel : public wxDataViewVirtualListModel
+{
+public:
+	explicit VirtualModel(CMuleVirtualDataViewCtrl *owner)
+	: m_owner(owner)
+	{
+	}
+
+	unsigned int GetColumnCount() const override { return m_owner->GetColumnCount(); }
+
+	//! Taken from the column's own renderer, so a list can mix plain text and
+	//! icon+text columns without telling the model about it separately.
+	wxString GetColumnType(unsigned int col) const override
+	{
+		if (col >= m_owner->GetColumnCount()) {
+			return "string";
+		}
+		return m_owner->GetColumn(col)->GetRenderer()->GetVariantType();
+	}
+
+	void GetValueByRow(wxVariant &variant, unsigned row, unsigned col) const override
+	{
+		const wxString type = GetColumnType(col);
+		const bool iconText = (type == "wxDataViewIconText");
+		const bool barFill = (type == "CBarFillSpec");
+		if (row >= m_owner->m_items.size() || col >= m_owner->RealColumnCount()) {
+			// Out of range, or the trailing spacer column, which is always
+			// empty by construction.
+			if (iconText) {
+				variant << wxDataViewIconText(wxEmptyString, wxIcon());
+			} else if (barFill) {
+				variant << CBarFillSpec();
+			} else {
+				variant = wxString();
+			}
+			return;
+		}
+
+		const wxUIntPtr data = m_owner->m_itemsrow;
+		if (barFill) {
+			CBarFillSpec spec;
+			m_owner->GetItemBarFill(data, col, spec);
+			variant << spec;
+			return;
+		}
+
+		const wxString text = m_owner->GetItemColumnText(data, col);
+		if (!iconText) {
+			variant = text;
+			return;
+		}
+		wxIcon icon;
+		m_owner->GetItemIcon(data, col, icon);
+		variant << wxDataViewIconText(text, icon);
+	}
+
+	bool SetValueByRow(const wxVariant &, unsigned, unsigned) override { return false; }
+
+	/**
+	 * Keeps wx's own sorting in step with ours instead of letting it invent an order.
+	 *
+	 * The columns are sortable so the header caret is drawn, which also means wx sorts on a
+	 * header click -- and wxDataViewModel::Compare() defaults to comparing the rendered
+	 * strings, so "10" would land before "9" and the list's own comparator would never be
+	 * consulted. Answering in terms of the row order the control already holds makes wx's sort
+	 * reproduce m_items exactly, which the type-ahead and page keys rely on.
+	 *
+	 * The ascending flag is ignored on purpose. SortList() has already put m_items in the
+	 * requested direction, so honouring it here would invert a second time and the list would
+	 * snap back to where it started -- the order only appearing to change on the very first
+	 * click.
+	 */
+	int Compare(const wxDataViewItem &item1,
+		const wxDataViewItem &item2,
+		unsigned int WXUNUSED(column),
+		bool WXUNUSED(ascending)) const override
+	{
+		return static_cast<int>(GetRow(item1)) - static_cast<int>(GetRow(item2));
+	}
+
+	bool HasDefaultCompare() const override { return true; }
+
+	bool GetAttrByRow(unsigned row, unsigned col, wxDataViewItemAttr &attr) const override
+	{
+		if (row >= m_owner->m_items.size()) {
+			return false;
+		}
+		return m_owner->GetItemAttr(m_owner->m_itemsrow, col, attr);
+	}
+
+private:
+	CMuleVirtualDataViewCtrl *m_owner;
+};
+
+CMuleVirtualDataViewCtrl::CMuleVirtualDataViewCtrl(wxWindow *parent,
+	wxWindowID winid,
+	const wxPoint &pos,
+	const wxSize &size,
+	long style,
+	const wxString &name)
+: CMuleDataViewCtrl(parent, winid, pos, size, style, name)
+, m_virtualModel(new VirtualModel(this))
+{
+	m_resortTimer.SetOwner(this, kResortTimerId);
+}
+
+CMuleVirtualDataViewCtrl::~CMuleVirtualDataViewCtrl()
+{
+	m_virtualModel->DecRef();
+}
+
+void CMuleVirtualDataViewCtrl::AssociateVirtualModel()
+{
+	AssociateModel(m_virtualModel);
+}
+
+long CMuleVirtualDataViewCtrl::RowOfData(wxUIntPtr data) const
+{
+	const auto it = m_rowOf.find(data);
+	return (it == m_rowOf.end()) ? -1 : it->second;
+}
+
+bool CMuleVirtualDataViewCtrl::GetVisibleRowRange(long &firstRow, long &lastRow) const
+{
+	const wxDataViewItem top = GetTopItem();
+	const int perPage = GetCountPerPage();
+	if (!top.IsOk() || perPage <= 0) {
+		return false;
+	}
+
+	firstRow = static_cast<long>(m_virtualModel->GetRow(top));
+	lastRow = firstRow + perPage - 1;
+	return true;
+}
+
+bool CMuleVirtualDataViewCtrl::IsItemDataSelected(wxUIntPtr data) const
+{
+	const long row = RowOfData(data);
+	if (row < 0) {
+		return false;
+	}
+	return IsSelected(m_virtualModel->GetItem(static_cast<unsigned>(row)));
+}
+
+wxUIntPtr CMuleVirtualDataViewCtrl::ItemAt(long row) const
+{
+	if (row < 0 || static_cast<size_t>(row) >= m_items.size()) {
+		return 0;
+	}
+	return m_itemsstatic_cast<size_t>(row);
+}
+
+void CMuleVirtualDataViewCtrl::RebuildRowIndex()
+{
+	m_rowOf.clear();
+	m_rowOf.reserve(m_items.size());
+	for (size_t i = 0; i < m_items.size(); ++i) {
+		m_rowOfm_itemsi = static_cast<long>(i);
+	}
+}
+
+int CMuleVirtualDataViewCtrl::CompareItemsFull(wxUIntPtr data1, wxUIntPtr data2) const
+{
+	// Walks the sort chain the base maintains: primary column first, then
+	// the tie-breakers left by earlier header clicks.
+	for (const CColPair &entry : m_sort_orders) {
+		const int modifier = (entry.second & SORT_DES) ? -1 : 1;
+		const bool alt = (entry.second & SORT_ALT) != 0;
+		const int result = CompareItemData(data1, data2, entry.first, alt, modifier);
+		if (result != 0) {
+			return result;
+		}
+	}
+	return 0;
+}
+
+long CMuleVirtualDataViewCtrl::InsertPos(wxUIntPtr data) const
+{
+	// With no sort chain every comparison is equal and lower_bound answers begin(), putting
+	// every arrival at the front so the list fills in reverse. CMuleListCtrl::GetInsertPos()
+	// appends when it has no sorter; match it.
+	if (m_sort_orders.empty()) {
+		return static_cast<long>(m_items.size());
+	}
+
+	const auto at =
+		std::lower_bound(m_items.begin(), m_items.end(), data, this(wxUIntPtr lhs, wxUIntPtr rhs) {
+			return CompareItemsFull(lhs, rhs) < 0;
+		});
+	return static_cast<long>(std::distance(m_items.begin(), at));
+}
+
+std::vector<wxUIntPtr> CMuleVirtualDataViewCtrl::GetSelectedItemData() const
+{
+	wxDataViewItemArray selection;
+	const_cast<CMuleVirtualDataViewCtrl *>(this)->GetSelections(selection);
+
+	std::vector<wxUIntPtr> data;
+	data.reserve(selection.GetCount());
+	for (size_t i = 0; i < selection.GetCount(); ++i) {
+		const unsigned row = m_virtualModel->GetRow(selectioni);
+		if (row < m_items.size()) {
+			data.push_back(m_itemsrow);
+		}
+	}
+	return data;
+}
+
+void CMuleVirtualDataViewCtrl::SetSelectedItemData(const std::vector<wxUIntPtr> &data)
+{
+	wxDataViewItemArray selection;
+	for (wxUIntPtr item : data) {
+		const long row = RowOfData(item);
+		if (row >= 0) {
+			selection.Add(m_virtualModel->GetItem(static_cast<unsigned>(row)));
+		}
+	}
+	SetSelections(selection);
+}
+
+void CMuleVirtualDataViewCtrl::AddItemData(wxUIntPtr data)
+{
+	if (!data || HasItemData(data)) {
+		return;
+	}
+	const long pos = InsertPos(data);
+
+	// Selection is re-resolved rather than kept: a wxDataViewItem from a row-addressed model
+	// would silently point at a different row once everything below the insertion shifts down.
+	// Rows above it do not move, and an empty selection has nothing to preserve, so both skip
+	// the round-trip -- it is O(selection) and this path runs per arriving item.
+	const bool shifts = (static_cast<size_t>(pos) < m_items.size());
+	const std::vector<wxUIntPtr> selected =
+		(shifts && HasSelection()) ? GetSelectedItemData() : std::vector<wxUIntPtr>();
+
+	m_items.insert(m_items.begin() + pos, data);
+	RebuildRowIndex();
+	m_virtualModel->RowInserted(static_cast<unsigned>(pos));
+
+	if (!selected.empty()) {
+		SetSelectedItemData(selected);
+	}
+}
+
+void CMuleVirtualDataViewCtrl::AppendItemData(wxUIntPtr data)
+{
+	if (!data || HasItemData(data)) {
+		return;
+	}
+	m_items.push_back(data);
+	m_rowOfdata = static_cast<long>(m_items.size()) - 1;
+}
+
+void CMuleVirtualDataViewCtrl::AppendItemDataNow(wxUIntPtr data)
+{
+	if (!data || HasItemData(data)) {
+		return;
+	}
+	m_items.push_back(data);
+	m_rowOfdata = static_cast<long>(m_items.size()) - 1;
+	// Appending at the end leaves every other row where it was, so no
+	// selection round-trip is needed here.
+	m_virtualModel->RowInserted(static_cast<unsigned>(m_items.size()) - 1);
+}
+
+void CMuleVirtualDataViewCtrl::RemoveItemDataBatch(const std::vector<wxUIntPtr> &data)
+{
+	wxArrayInt rows;
+	for (wxUIntPtr item : data) {
+		const long row = RowOfData(item);
+		if (row >= 0) {
+			rows.Add(static_cast<int>(row));
+		}
+	}
+	if (rows.IsEmpty()) {
+		return;
+	}
+
+	std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	for (wxUIntPtr item : data) {
+		selected.erase(std::remove(selected.begin(), selected.end(), item), selected.end());
+	}
+
+	// Erase from the highest row down so the earlier indices stay valid.
+	wxArrayInt ordered(rows);
+	ordered.Sort((int *a, int *b) { return *b - *a; });
+	for (size_t i = 0; i < ordered.GetCount(); ++i) {
+		m_items.erase(m_items.begin() + orderedi);
+	}
+	RebuildRowIndex();
+	// One notification for the whole set, and sent before the caller frees
+	// anything these point at.
+	m_virtualModel->RowsDeleted(rows);
+
+	SetSelectedItemData(selected);
+}
+
+void CMuleVirtualDataViewCtrl::FinishBulkLoad()
+{
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	// The row the user is looking at, remembered by its data. Reset() below says the model was
+	// replaced, and every backend answers that by dropping the view to the top -- so a list
+	// that rebuilds whenever a row joins it scrolled itself home under anyone reading further
+	// down.
+	long firstRow = 0;
+	long lastRow = 0;
+	wxUIntPtr anchor = GetVisibleRowRange(firstRow, lastRow) ? ItemAt(firstRow) : 0;
+	if (!anchor) {
+		// The rebuild cleared the list first, so the live query has nothing to answer with
+		// and ClearItemData()'s note is the only record of where the user was.
+		anchor = m_bulkAnchor;
+	}
+	m_bulkAnchor = 0;
+
+	SortItems();
+
+	// Reset() here, unlike SortList(): AppendItemData() adds rows without telling the control,
+	// which is what makes a bulk load cheap, so this is the only notification that the rows
+	// exist. A repaint would draw a list the control still believes is its former length.
+	m_virtualModel->Reset(static_cast<unsigned>(m_items.size()));
+
+	SetSelectedItemData(selected);
+	ScrollDataToTop(anchor);
+}
+
+void CMuleVirtualDataViewCtrl::ScrollDataToTop(wxUIntPtr data)
+{
+	if (!data) {
+		return;
+	}
+	const long row = RowOfData(data);
+	if (row < 0) {
+		return;
+	}
+	// Reset() left the view at the top, so a row that sorted there is already where
+	// it belongs -- the common case on a list nobody has scrolled.
+	if (row == 0) {
+		return;
+	}
+
+	// Two calls, because EnsureVisible() scrolls the shortest distance that makes its target
+	// visible. The view is at the top after Reset(), so asking for the anchor alone would stop
+	// as soon as it appeared at the BOTTOM edge. Bringing the last row of the anchor's page
+	// into view scrolls past it, and the second call comes back up, leaving the anchor on the
+	// top line.
+	const int perPage = GetCountPerPage();
+	if (perPage > 1 && !m_items.empty()) {
+		const long last = static_cast<long>(m_items.size()) - 1;
+		const long bottom = std::min(row + perPage - 1, last);
+		if (bottom > row) {
+			EnsureVisible(m_virtualModel->GetItem(static_cast<unsigned>(bottom)));
+		}
+	}
+	EnsureVisible(m_virtualModel->GetItem(static_cast<unsigned>(row)));
+}
+
+void CMuleVirtualDataViewCtrl::RemoveItemData(wxUIntPtr data)
+{
+	const long pos = RowOfData(data);
+	if (pos < 0) {
+		return;
+	}
+	std::vector<wxUIntPtr> selected = HasSelection() ? GetSelectedItemData() : std::vector<wxUIntPtr>();
+	selected.erase(std::remove(selected.begin(), selected.end(), data), selected.end());
+
+	m_items.erase(m_items.begin() + pos);
+	RebuildRowIndex();
+	// Told before the caller frees whatever `data` points at: the control
+	// must not be left holding a row for an object that no longer exists.
+	m_virtualModel->RowDeleted(static_cast<unsigned>(pos));
+
+	if (!selected.empty()) {
+		SetSelectedItemData(selected);
+	}
+}
+
+void CMuleVirtualDataViewCtrl::RefreshItemData(wxUIntPtr data)
+{
+	const long row = RowOfData(data);
+	if (row < 0) {
+		return;
+	}
+
+	// Only rows the user can see are worth telling the control about: values are pulled per
+	// cell as they are drawn, so a row that is off screen -- or in a list on a panel that is
+	// not showing -- renders current data the moment it is scrolled into view. wxDataViewCtrl
+	// reaches the same conclusion, but only at the very end of
+	// wxDataViewMainWindow::DoItemChanged(): before intersecting the row against the client
+	// rect it invalidates every column's cached best width and dispatches a
+	// wxEVT_DATAVIEW_ITEM_VALUE_CHANGED nothing listens for. Measured on an 11,000-row download
+	// list, that prologue cost ~20us per row and ~300 ms of every one-second poll, charged for
+	// the lists on all four panels (issue #867). The vendored generic wxListCtrl tested the
+	// visible range first and returned; this restores that ordering.
+	//
+	// Skipping the notification for a row that really is visible would leave a stale cell on
+	// screen, so both unknowns resolve towards refreshing: a backend that cannot report its
+	// viewport, and the partially visible last row.
+	long firstRow = 0;
+	long lastRow = 0;
+	const bool offScreen = !IsShownOnScreen() || (GetVisibleRowRange(firstRow, lastRow) &&
+							     (row < firstRow || row > lastRow + 1));
+	if (!offScreen) {
+		m_virtualModel->RowChanged(static_cast<unsigned>(row));
+	}
+
+	// The value that changed may be the one the list is sorted by, in which case the row has to
+	// move. Scheduled rather than done here: an update burst refreshes many rows, and re-
+	// sorting on each would be quadratic.
+	if (thePrefs::LiveListSort() && IsLiveSortColumn()) {
+		m_resortPending = true;
+		ScheduleResort();
+	}
+}
+
+void CMuleVirtualDataViewCtrl::ClearItemData()
+{
+	// Remembered before the rows go, for the clear-then-refill rebuild the clients list does on
+	// every arrival and departure: by the time FinishBulkLoad() runs, the control has been told
+	// it holds nothing and cannot say what was on top. Harmless for a clear that is really a
+	// clear, since restoring skips anything it cannot find.
+	long firstRow = 0;
+	long lastRow = 0;
+	if (GetVisibleRowRange(firstRow, lastRow)) {
+		m_bulkAnchor = ItemAt(firstRow);
+	}
+
+	m_items.clear();
+	m_rowOf.clear();
+	m_virtualModel->Reset(0);
+}
+
+void CMuleVirtualDataViewCtrl::SortItems()
+{
+	std::sort(m_items.begin(), m_items.end(), this(wxUIntPtr lhs, wxUIntPtr rhs) {
+		return CompareItemsFull(lhs, rhs) < 0;
+	});
+	RebuildRowIndex();
+}
+
+void CMuleVirtualDataViewCtrl::SortList()
+{
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+
+	// The cursor is addressed by row, like the selection, and unlike the selection nothing else
+	// puts it back. A repaint leaves it pointing at whatever item has since moved into that
+	// row, so the next arrow key steps from the wrong place, a shifted page key extends from
+	// the wrong anchor, and the focus ring can rest on an unselected row.
+	const wxDataViewItem currentItem = GetCurrentItem();
+	const wxUIntPtr currentData =
+		currentItem.IsOk() ? ItemAt(static_cast<long>(m_virtualModel->GetRow(currentItem))) : 0;
+
+	SortItems();
+
+	// Repaint, rather than Reset(). A sort reorders rows, it does not replace them, and the
+	// count is the same on both sides of the std::sort above. Reset() says the model was
+	// replaced, which makes every backend rebuild its view from scratch -- and a rebuilt view
+	// starts at the top, so an auto-sort threw a user reading further down back to row 0.
+	// Nothing needs telling: rows are addressed by index and their values are pulled per cell
+	// as they are drawn.
+	Refresh();
+
+	// The control's selection is a set of rows, and the rows now mean
+	// different items, so it is re-applied from the item data either way.
+	SetSelectedItemData(selected);
+
+	// Only while the row it lands on is already on screen. Measured on GTK with wx 3.3.3:
+	// SetCurrentItem() to a visible row leaves the viewport alone, but to one off screen it
+	// clamps the view onto the cursor -- and with no row ever clicked the cursor sits at row 0,
+	// so restoring it after a sort dragged the list back to the top, the very thing this
+	// function exists to stop.
+	if (currentData != 0) {
+		const long row = RowOfData(currentData);
+		long firstRow = 0;
+		long lastRow = 0;
+		if (row >= 0 && GetVisibleRowRange(firstRow, lastRow) && row >= firstRow && row <= lastRow) {
+			SetCurrentItem(m_virtualModel->GetItem(static_cast<unsigned>(row)));
+		}
+	}
+}
+
+void CMuleVirtualDataViewCtrl::GetDisplayOrder(wxDataViewItemArray &ordered) const
+{
+	// m_items is already the display order, so this is a straight copy.
+	ordered.Clear();
+	ordered.Alloc(m_items.size());
+	for (size_t i = 0; i < m_items.size(); ++i) {
+		ordered.Add(m_virtualModel->GetItem(static_cast<unsigned>(i)));
+	}
+}
+
+wxString CMuleVirtualDataViewCtrl::GetRowLabel(const wxDataViewItem &item) const
+{
+	const unsigned row = m_virtualModel->GetRow(item);
+	if (row >= m_items.size()) {
+		return wxEmptyString;
+	}
+	return GetItemColumnText(m_itemsrow, 0);
+}
+
+int CMuleVirtualDataViewCtrl::CompareByColumn(const wxDataViewItem &item1,
+	const wxDataViewItem &item2,
+	unsigned column,
+	bool alt,
+	int modifier) const
+{
+	const unsigned row1 = m_virtualModel->GetRow(item1);
+	const unsigned row2 = m_virtualModel->GetRow(item2);
+	if (row1 >= m_items.size() || row2 >= m_items.size()) {
+		return 0;
+	}
+	return CompareItemData(m_itemsrow1, m_itemsrow2, column, alt, modifier);
+}
+
+void CMuleVirtualDataViewCtrl::OnSortingChanged()
+{
+	SortList();
+}
+
+void CMuleVirtualDataViewCtrl::SetFilterText(const wxString &text)
+{
+	const wxString lower = text.Lower();
+	if (lower == m_filterText) {
+		return;
+	}
+	m_filterText = lower;
+	RebuildFilteredView();
+}
+
+bool CMuleVirtualDataViewCtrl::MatchesFilter(const wxString &name) const
+{
+	if (m_filterText.IsEmpty()) {
+		return true;
+	}
+	// m_filterText is already lower-cased by SetFilterText().
+	return name.Lower().Contains(m_filterText);
+}
+
+void CMuleVirtualDataViewCtrl::ScheduleResort()
+{
+	if (m_resortScheduled) {
+		return; // one CallAfter coalesces the whole update burst
+	}
+	m_resortScheduled = true;
+	CallAfter(&CMuleVirtualDataViewCtrl::MaybeResortNow);
+}
+
+void CMuleVirtualDataViewCtrl::MaybeResortNow()
+{
+	m_resortScheduled = false;
+	if (!m_resortPending) {
+		return;
+	}
+	// The user may have switched to a static column since this was scheduled.
+	if (!IsLiveSortColumn()) {
+		m_resortPending = false;
+		return;
+	}
+	// Nobody is looking at this list, so sorting it now buys nothing. The remote GUI keeps
+	// every list fed from the same poll whether or not its panel is on screen, so without this
+	// a single reply re-sorts the downloads, shared-files, sources and peers lists in full,
+	// once or twice a second, of which at most one is visible. Measured on a 1228-row shared
+	// list: 156 sorts in a 150-poll session, 143 of them while hidden.
+	//
+	// Deferred rather than dropped: m_resortPending stays set, so the next update after the
+	// panel comes back sorts it, and the poll that marks rows dirty runs continuously while
+	// connected.
+	if (!IsShownOnScreen()) {
+		return;
+	}
+
+	// Hold off while interacting; the retry timer polls (only during
+	// interaction) until idle.
+	if (IsInteracting()) {
+		if (!m_resortTimer.IsRunning()) {
+			m_resortTimer.Start(kResortRetryMs, wxTIMER_ONE_SHOT);
+		}
+		return;
+	}
+	m_resortPending = false;
+	SortList();
+}
+
+void CMuleVirtualDataViewCtrl::OnResortTimer(wxTimerEvent &WXUNUSED(evt))
+{
+	MaybeResortNow();
+}
+
+bool CMuleVirtualDataViewCtrl::IsInteracting() const
+{
+	// A context menu is open, or the user is holding the mouse (click /
+	// drag-select): defer the reorder so rows don't slide under the pointer.
+	if (IsMenuOpen()) {
+		return true;
+	}
+	return wxGetMouseState().LeftIsDown();
+}
+
+void CMuleVirtualDataViewCtrl::OnArrowKey(wxKeyEvent &evt)
+{
+	const int key = evt.GetKeyCode();
+	if (key != WXK_LEFT && key != WXK_RIGHT) {
+		// Skip() so the base class still gets PageUp/PageDown/Home/End.
+		evt.Skip();
+		return;
+	}
+
+	// Swallowed. Left and right belong to the tree control: they expand and collapse, and a
+	// flat list has nothing to expand. Handed to the native control they do something worse
+	// than nothing here -- on macOS the name column repaints without each row's value being re-
+	// supplied, so every row draws the last row's text until something forces a full repaint.
+	//
+	// Scrolling sideways would be the useful alternative and is not available: the only
+	// portable lever is EnsureVisible(item, column), which needs to know which columns are off
+	// screen, and GetItemRect() reports a column's position in the full layout rather than in
+	// the viewport -- the same coordinates before and after a scroll. Doing it properly means
+	// reading the native scroll position per platform.
+	//
+	// Deliberately not on CMuleDataViewCtrl: the search list is a real tree where these keys
+	// expand and collapse result variants.
+}

amule-3.1.0.tar.gz/src/MuleVirtualDataViewCtrl.h Added

@@ -0,0 +1,275 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+
+#ifndef MULEVIRTUALDATAVIEWCTRL_H
+#define MULEVIRTUALDATAVIEWCTRL_H
+
+#include "MuleBarRenderer.h"  // Needed for CBarFillSpec
+#include "MuleDataViewCtrl.h" // Needed for CMuleDataViewCtrl
+
+#include <wx/timer.h> // Needed for wxTimer (deferred live re-sort)
+
+#include <unordered_map>
+#include <vector>
+
+/**
+ * A CMuleDataViewCtrl holding a flat, model-owned list of items.
+ *
+ * The wxDataViewCtrl counterpart of CMuleVirtualListCtrl, and virtual in the same sense: the
+ * control materialises nothing per row. Rows are addressed by index through a
+ * wxDataViewVirtualListModel, and cell text is pulled from the subclass on demand for the cells
+ * actually drawn.
+ *
+ * Two consequences are worth knowing before deriving from this. The list owns the order: sorting is
+ * done here, over m_items, rather than by wx calling wxDataViewModel::Compare() -- the columns are
+ * marked sortable so the header caret appears, but wx is never asked to reorder anything.
+ *
+ * And item identity is not row identity. A wxDataViewItem from a row-addressed model encodes the
+ * row number, so removing a row silently moves what any previously-held item refers to. Everything
+ * below therefore speaks in wxUIntPtr item data, and selection is preserved across mutations by re-
+ * resolving that data to rows -- never by holding wxDataViewItems.
+ */
+class CMuleVirtualDataViewCtrl : public CMuleDataViewCtrl
+{
+public:
+	CMuleVirtualDataViewCtrl(wxWindow *parent,
+		wxWindowID winid = wxID_ANY,
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
+		long style = 0,
+		const wxString &name = "mulevirtualdataviewctrl");
+
+	~CMuleVirtualDataViewCtrl() override;
+
+	//! Inserts in sorted position and tells the control about that row only.
+	void AddItemData(wxUIntPtr data);
+	//! Appends without sorting; pair with FinishBulkLoad().
+	void AppendItemData(wxUIntPtr data);
+	/**
+	 * Appends one item and shows it immediately, without sorting. For the single add that has
+	 * to appear while a popup menu is up: the batch path defers its work, and idle events do
+	 * not run inside a modal loop, so the row would otherwise not appear until the menu closed.
+	 */
+	void AppendItemDataNow(wxUIntPtr data);
+	//! Sorts and refreshes once, after a run of AppendItemData(). Keeps the
+	//! row the user was looking at at the top of the viewport.
+	void FinishBulkLoad();
+	//! Drops the row, keeping the selection on the items that remain.
+	void RemoveItemData(wxUIntPtr data);
+	/**
+	 * Drops many rows as one operation. A loop of RemoveItemData() costs an index rebuild and a
+	 * selection round-trip per item; this pays each once, and tells the control about the whole
+	 * set in a single notification.
+	 */
+	void RemoveItemDataBatch(const std::vector<wxUIntPtr> &data);
+	//! Repaints just this row, re-sorting only if it moved under the sort.
+	void RefreshItemData(wxUIntPtr data);
+	void ClearItemData();
+	//! Name-compatible with the wxListCtrl API the ported lists were written
+	//! against, so their callers don't have to change.
+	bool DeleteAllItems()
+	{
+		ClearItemData();
+		return true;
+	}
+
+	bool HasItemData(wxUIntPtr data) const { return m_rowOf.count(data) != 0; }
+	long RowOfData(wxUIntPtr data) const;
+	/**
+	 * The rows the control currently has on screen, as the inclusive range firstRow, lastRow.
+	 * lastRow is the last *fully* visible row, so a caller that must not miss a drawn pixel has
+	 * to allow for one more below it.
+	 *
+	 * Returns false when the backend cannot report its viewport -- the wxDataViewCtrl base
+	 * answers GetTopItem()/GetCountPerPage() with "don't know" and only the ports override
+	 * them. The range is then meaningless and the caller has to fall back to whatever is safe
+	 * for it. Which way that falls is not symmetric: treating a visible row as off screen
+	 * leaves a stale cell in front of the user, whereas treating an off-screen row as visible
+	 * only costs the work it saved.
+	 */
+	bool GetVisibleRowRange(long &firstRow, long &lastRow) const;
+	/**
+	 * Whether this item is part of the selection. Answers the one question without
+	 * materialising the whole selection the way GetSelectedItemData() has to -- worth the
+	 * separate entry point on the per-item update paths, which ask it once per changed row.
+	 */
+	bool IsItemDataSelected(wxUIntPtr data) const;
+	wxUIntPtr ItemAt(long row) const;
+	/**
+	 * Scroll so that @p data sits at the top of the viewport again. Anchored to the row's data
+	 * rather than to a wxDataViewItem: in a virtual list an item is a row number, which names a
+	 * different row once a sort has moved things, so it cannot survive the rebuild. Does
+	 * nothing for 0 or for data no longer in the list, which is what a row that has since gone
+	 * away should do.
+	 */
+	void ScrollDataToTop(wxUIntPtr data);
+	long ItemDataCount() const { return static_cast<long>(m_items.size()); }
+
+	/**
+	 * Resolves a wxDataViewItem from an event (an activation or context-menu event, say) back
+	 * to its row, through the wxDataViewVirtualListModel AssociateVirtualModel() installed. A
+	 * wxDataViewItem's ID *is* the row number for this model, but that detail is model-
+	 * internal; going through GetRow() rather than casting the ID directly is what stays
+	 * correct if that ever changes.
+	 */
+	long GetModelRow(const wxDataViewItem &item) const
+	{
+		return static_cast<long>(static_cast<const wxDataViewListModel *>(GetModel())->GetRow(item));
+	}
+
+	//! Cheap "is anything selected" test, avoiding a full selection copy.
+	bool HasSelection() const
+	{
+		return const_cast<CMuleVirtualDataViewCtrl *>(this)->GetSelectedItemsCount() > 0;
+	}
+
+	//! Item data of every selected row, in display order.
+	std::vector<wxUIntPtr> GetSelectedItemData() const;
+	//! Selects exactly these items, ignoring any that are no longer present.
+	void SetSelectedItemData(const std::vector<wxUIntPtr> &data);
+
+	//! Re-sorts the whole list, preserving the selection.
+	void SortList();
+
+	/**
+	 * Live text filter. Setting it calls RebuildFilteredView(), which the list implements by
+	 * re-populating itself from its own data source -- the filter is purely a GUI-side view,
+	 * exactly as on CMuleVirtualListCtrl.
+	 */
+	void SetFilterText(const wxString &text);
+
+protected:
+	// --- what a subclass must provide -------------------------------------
+
+	//! Text for a cell. Called only for cells being drawn.
+	virtual wxString GetItemColumnText(wxUIntPtr data, unsigned column) const = 0;
+
+	/**
+	 * Icon for a cell in a column appended as an icon+text column. Return false to draw text
+	 * alone.
+	 */
+	virtual bool GetItemIcon(
+		wxUIntPtr WXUNUSED(data), unsigned WXUNUSED(column), wxIcon &WXUNUSED(icon)) const
+	{
+		return false;
+	}
+
+	//! Per-row display attributes (bold, colour). Return false for default.
+	virtual bool GetItemAttr(
+		wxUIntPtr WXUNUSED(data), unsigned WXUNUSED(column), wxDataViewItemAttr &WXUNUSED(attr)) const
+	{
+		return false;
+	}
+
+	/**
+	 * Fill data for a cell in a column appended with CMuleDataViewCtrl::AppendBarColumn(). The
+	 * default leaves `out` empty, which CMuleBarRenderer draws as an empty bar -- fine for any
+	 * column that never asks for one.
+	 */
+	virtual void GetItemBarFill(
+		wxUIntPtr WXUNUSED(data), unsigned WXUNUSED(column), CBarFillSpec &WXUNUSED(out)) const
+	{
+	}
+
+	//! Single-column comparison of two items; the caller applies `modifier`.
+	virtual int CompareItemData(
+		wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool alt, int modifier) const = 0;
+
+	/**
+	 * Whether the active sort column's values change while the list is up, so a refreshed row
+	 * may have to move. Gated by thePrefs::LiveListSort() exactly as CMuleVirtualListCtrl gates
+	 * it.
+	 */
+	virtual bool IsLiveSortColumn() const { return false; }
+
+	//! True while a context menu is up, so a reorder can be deferred.
+	virtual bool IsMenuOpen() const { return false; }
+
+	//! Re-populate the list for the current filter text.
+	virtual void RebuildFilteredView() {}
+
+	//! Whether `name` passes the current filter (case-insensitive contains).
+	bool MatchesFilter(const wxString &name) const;
+
+	// --- CMuleDataViewCtrl hooks ------------------------------------------
+
+	void GetDisplayOrder(wxDataViewItemArray &ordered) const override;
+	wxString GetRowLabel(const wxDataViewItem &item) const override;
+	int CompareByColumn(const wxDataViewItem &item1,
+		const wxDataViewItem &item2,
+		unsigned column,
+		bool alt,
+		int modifier) const override;
+	void OnSortingChanged() override;
+
+	//! Associates the internal model; call once the columns are appended.
+	void AssociateVirtualModel();
+
+private:
+	class VirtualModel;
+	friend class VirtualModel;
+
+	//! Full sort-chain comparison of two items.
+	int CompareItemsFull(wxUIntPtr data1, wxUIntPtr data2) const;
+	//! Where `data` belongs under the current sort.
+	long InsertPos(wxUIntPtr data) const;
+	//! Orders m_items and refreshes the row index, telling the control
+	//! nothing -- the caller decides what notification its situation needs.
+	void SortItems();
+
+	//! m_rowOf is a cache of m_items; every structural change rebuilds it.
+	void RebuildRowIndex();
+
+	/**
+	 * Coalesces live re-sorts. A burst of RefreshItemData() calls schedules exactly one
+	 * reorder, and it is held off while the user is interacting so rows do not slide out from
+	 * under the pointer -- the same treatment CMuleVirtualListCtrl gives it.
+	 */
+	void ScheduleResort();
+	void MaybeResortNow();
+	void OnResortTimer(wxTimerEvent &evt);
+	//! Swallows left/right in a flat list, which has no expand/collapse for
+	//! them to do and misrepaints when the native control handles them.
+	void OnArrowKey(wxKeyEvent &evt);
+
+	bool IsInteracting() const;
+
+	VirtualModel *m_virtualModel;
+
+	wxString m_filterText;
+	bool m_resortPending = false;
+	bool m_resortScheduled = false;
+	wxTimer m_resortTimer;
+
+	//! The rows, in display order. The single source of truth for ordering.
+	std::vector<wxUIntPtr> m_items;
+	std::unordered_map<wxUIntPtr, long> m_rowOf;
+	//! Top row remembered across a ClearItemData() + refill + FinishBulkLoad()
+	//! rebuild, which is the only sequence where the control cannot be asked.
+	wxUIntPtr m_bulkAnchor = 0;
+
+	wxDECLARE_EVENT_TABLE();
+};
+
+#endif // MULEVIRTUALDATAVIEWCTRL_H

amule-3.1.0.tar.gz/src/NetworkAddress.cpp Added

@@ -0,0 +1,113 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// The only translation unit in the ed2k core that compiles Boost.Asio for the sake of an address.
+//
+// CNetworkAddress stores its own octets so that the 155 TUs merely passing an address around no
+// longer pull asio's include closure (and, on Windows, no longer need ws2_32 to link) -- the full
+// argument is in NetworkAddress.h. But two of its operations are text handling, and text handling
+// is where a hand-rolled implementation goes wrong quietly: RFC 4291 zero compression has a
+// canonical form with real rules (longest run, leftmost on a tie, never a single group),
+// IPv4-mapped addresses print with a dotted-quad tail, and a literal may carry a %scope suffix.
+// Restating that here would be a parser and a formatter to maintain, so both stay asio's job and
+// pay for themselves in this one file.
+
+#include "NetworkAddressAsio.h"
+
+#include <boost/system/error_code.hpp>
+
+CNetworkAddress CNetworkAddress::FromString(const std::string &text)
+{
+	if (text.empty()) {
+		return Absent();
+	}
+	boost::system::error_code ec;
+	const boost::asio::ip::address address = boost::asio::ip::make_address(text, ec);
+	if (ec) {
+		return Absent();
+	}
+	return NetworkAddressAsio::FromAsioAddress(address);
+}
+
+std::string CNetworkAddress::ToString() const
+{
+	if (IsAbsent()) {
+		return "<absent>";
+	}
+	return NetworkAddressAsio::ToAsioAddress(*this).to_string();
+}
+
+wxString CNetworkAddress::ToWxString() const
+{
+	return wxString::FromUTF8(ToString().c_str());
+}
+
+namespace NetworkAddressAsio
+{
+
+boost::asio::ip::address ToAsioAddress(const CNetworkAddress &address)
+{
+	if (address.IsIPv4()) {
+		const CNetworkAddress::Octets &octets = address.GetOctets();
+		// asio's address_v4 takes its four octets in the same wire order CNetworkAddress
+		// stores them in, so this is a copy and not a swap -- neither of the two 32-bit
+		// conventions is involved.
+		const boost::asio::ip::address_v4::bytes_type v4Bytes = {
+			{ octets0, octets1, octets2, octets3 }
+		};
+		return boost::asio::ip::address(boost::asio::ip::address_v4(v4Bytes));
+	}
+	// An absent address reaches here only as a broken precondition, and asio has no value for
+	// it: the caller was told to test IsPresent() first. Give it :: rather than 0.0.0.0 so that
+	// a caller which ignored that contract gets an address of the family it asked about instead
+	// of silently binding the IPv4 wildcard.
+	boost::asio::ip::address_v6::bytes_type v6Bytes;
+	const CNetworkAddress::Octets &octets = address.GetOctets();
+	for (std::size_t i = 0; i < v6Bytes.size(); ++i) {
+		v6Bytesi = octetsi;
+	}
+	return boost::asio::ip::address(boost::asio::ip::address_v6(v6Bytes, address.GetScopeId()));
+}
+
+CNetworkAddress FromAsioAddress(const boost::asio::ip::address &address)
+{
+	if (address.is_v4()) {
+		// to_uint() is asio's host-order (numeric) accessor, which is the same
+		// convention FromIPv4HostOrder() names -- so no swap here either.
+		return CNetworkAddress::FromIPv4HostOrder(address.to_v4().to_uint());
+	}
+	const boost::asio::ip::address_v6 v6 = address.to_v6();
+	const boost::asio::ip::address_v6::bytes_type v6Bytes = v6.to_bytes();
+	CNetworkAddress::Octets octets;
+	for (std::size_t i = 0; i < octets.size(); ++i) {
+		octetsi = v6Bytesi;
+	}
+	// IPv6FromOctets() rather than FromIPv6Bytes(): :: is a legitimate asio address (it is the
+	// wildcard every dual-stack listener binds), and the all-zero-means-absent rule belongs to
+	// the wire-tag edge, not here.
+	return CNetworkAddress::IPv6FromOctets(octets, v6.scope_id());
+}
+
+} // namespace NetworkAddressAsio
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/NetworkAddress.h Added

@@ -0,0 +1,759 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 NETWORKADDRESS_H
+#define NETWORKADDRESS_H
+
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <functional>
+#include <string>
+
+#include <wx/string.h>
+
+namespace NetworkAddressPolicy
+{
+struct IPv6ExcludedPrefix
+{
+	std::array<std::uint8_t, 16> bytes;
+	unsigned bits;
+	const char *name;
+};
+
+// inline, because constexpr at namespace scope implies const and therefore internal linkage.
+// IsGloballyRoutableIPv6() is an inline member that uses this, so without inline every
+// translation unit gets its own entity: ill-formed with no diagnostic required, and a separate
+// copy of the table in each of the ~155 units that will include this header once callers exist.
+inline constexpr IPv6ExcludedPrefix kIPv6ExcludedPrefixes = { { {}, 128, "Unspecified" },
+	{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }, 128, "Loopback" },
+	{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff }, 96, "IPv4-mapped" },
+	// ::a.b.c.d, the deprecated IPv4-compatible form (RFC 4291). Its page also holds the
+	// unspecified address and the loopback, which have their own /128 entries above; the
+	// matcher stops at the first hit, so those keep the more specific name.
+	{ {}, 96, "IPv4-compatible" },
+	{ { 0x00, 0x64, 0xff, 0x9b }, 96, "Well-known NAT64" },
+	{ { 0x00, 0x64, 0xff, 0x9b, 0x00, 0x01 }, 48, "Local-use NAT64" },
+	{ { 0x01, 0x00 }, 64, "Discard-only" },
+	// The whole IETF Protocol Assignments block, rather than the handful of sub-blocks that
+	// have been carved out of it so far. None of 2001::/23 is globally routable unicast, and
+	// IANA keeps adding to it -- Teredo, ORCHID, benchmarking, AMT, ORCHIDv2 in 2014, Drone
+	// Remote ID in 2023 -- so a list of children is a list that goes stale. This entry
+	// replaces the separate Teredo (2001::/32) and ORCHIDv2 (2001:20::/28) ones and covers
+	// the rest for good. Documentation (2001:db8::/32) is outside the /23 and stays below.
+	{ { 0x20, 0x01 }, 23, "IETF Protocol Assignments" },
+	{ { 0x20, 0x01, 0x0d, 0xb8 }, 32, "Documentation" },
+	{ { 0x20, 0x02 }, 16, "6to4" },
+	{ { 0x5f, 0x00 }, 16, "Segment routing SIDs" },
+	{ { 0xfc }, 7, "Unique-local" },
+	{ { 0xfe, 0x80 }, 10, "Link-local" },
+	{ { 0xfe, 0xc0 }, 10, "Deprecated site-local" },
+	{ { 0xff }, 8, "Multicast" } };
+
+inline bool MatchesPrefix(
+	const std::array<std::uint8_t, 16> &address, const IPv6ExcludedPrefix &prefix) noexcept
+{
+	// Whole bytes first, then the one partial byte. The bit-at-a-time form was up to 128
+	// iterations per prefix on a path the callers below sit in front of obfuscation-key
+	// derivation, and every entry in the table is walked before an address is declared
+	// routable.
+	const unsigned wholeBytes = prefix.bits / 8u;
+	for (unsigned i = 0; i < wholeBytes; ++i) {
+		if (addressi != prefix.bytesi) {
+			return false;
+		}
+	}
+	const unsigned remainder = prefix.bits % 8u;
+	if (remainder == 0) {
+		return true;
+	}
+	const std::uint8_t mask = static_cast<std::uint8_t>(0xFFu << (8u - remainder));
+	return (addresswholeBytes & mask) == (prefix.byteswholeBytes & mask);
+}
+} // namespace NetworkAddressPolicy
+
+/**
+ * The internal, family-agnostic address type.
+ *
+ * aMule stores IP addresses as bare @c uint32 across Kademlia, the client list and the
+ * IP filter. That representation cannot hold an IPv6 address, and it carries two
+ * further defects a plain widening would silently inherit:
+ *
+ *  - **Byte order is not in the type.** A @c uint32 IP in this tree is in one of two
+ *    conventions depending on the call site, bridged by scattered
+ *    @c wxUINT32_SWAP_ALWAYS calls. Which one a value is in is documented in comments
+ *    at best.
+ *  - **Zero doubles as "no address".** A client whose address is genuinely unknown is
+ *    indistinguishable from one at @c 0.0.0.0.
+ *
+ * This type fixes both by construction: there is no implicit conversion to or from
+ * @c uint32, every narrowing and widening goes through a named function whose name
+ * states the byte order, and absence is a state of the object rather than a magic
+ * value.
+ *
+ * ## Why this header pulls in no socket library
+ *
+ * The address used to be stored as an @c asio::ip::address, borrowing asio's v4/v6
+ * variant rather than restating it. Cheap to write and expensive to compile: this
+ * header is reached by eighteen public headers -- updownclient.h, ClientList.h,
+ * IPFilter.h, DownloadQueue.h among them -- so asio ended up in the include closure of
+ * 155 of the 254 translation units in src/, and it took two whole platforms down with
+ * it:
+ *
+ *  - Asio's @c ip/address.hpp pulls @c asio/detail/winsock_init.hpp, whose static
+ *    initialiser references @c WSAStartup / @c WSACleanup. All 155 TUs therefore
+ *    needed @c ws2_32 at link time, and the targets that do not link it failed on
+ *    mingw-w64 -- for an address type that never opens a socket.
+ *  - It is a large closure (about 1200 headers) compiled 155 times over for what is,
+ *    in the end, sixteen bytes and a family tag.
+ *
+ * So the storage is now those sixteen bytes and that family tag, spelled out here.
+ * Only the two operations that genuinely need a library -- parsing a textual address
+ * and formatting one -- still use asio, from NetworkAddress.cpp, where exactly one TU
+ * pays for them. Nothing about IPv6 text handling is hand-rolled: RFC 4291 zero
+ * compression, the IPv4-mapped dotted-quad tail and scope-id suffixes stay asio's job.
+ * A caller that needs the asio value itself -- the socket backend, and only it -- gets
+ * it from NetworkAddressAsio.h.
+ *
+ * ## The two 32-bit conventions
+ *
+ * For the address @c 192.0.2.1:
+ *
+ * | Convention | Value | Used by |
+ * | --- | --- | --- |
+ * | host order (numeric) | @c 0xC0000201 | Kademlia (`KadIPToString`) |
+ * | network order | @c 0x010200C0 | ed2k core (`Uint32toStringIP`) |
+ *
+ * "Network order" is this type's name for what the rest of aMule's comments call
+ * *anti-host order*: the four octets packed with the first octet in the numerically
+ * least significant byte. On a little-endian host that is what you get by loading four
+ * network-order bytes straight into a @c uint32, which is how it arises in practice --
+ * an ed2k packet field read by CFileDataIO. The two conventions are exact byte
+ * reversals of each other on every platform, which is why @c wxUINT32_SWAP_ALWAYS
+ * converts between them unconditionally.
+ *
+ * Neither convention is the storage order. Internally the address is always its octets
+ * in wire order, most significant first, so the v4 and v6 cases need no separate code
+ * path and the comparison rule below is one lexicographic compare rather than a family
+ * switch.
+ *
+ * ## Comparison rule
+ *
+ * One rule, applied everywhere:
+ *
+ *  1. An absent address sorts before every present one, and equals only another absent
+ *     address.
+ *  2. IPv4 sorts before IPv6.
+ *  3. Within a family, addresses sort by their octets, most significant first.
+ *
+ * IPv4-mapped forms are **not** normalised: @c ::ffff:192.0.2.1 is an IPv6 address, so
+ * it is neither equal to nor adjacent to the IPv4 address @c 192.0.2.1. That keeps the
+ * ordering total with no two distinct addresses comparing equal, which is what makes
+ * the type safe as a container key. Callers that want the two treated alike say so by
+ * calling Unmapped() first.
+ */
+class CNetworkAddress
+{
+public:
+	/** How many octets an address of either family occupies. */
+	static constexpr std::size_t OCTET_COUNT = 16;
+
+	/** The sixteen octets an IPv6 address occupies, in wire order. */
+	using Octets = std::array<std::uint8_t, OCTET_COUNT>;
+
+	/**
+	 * Which family a present address belongs to, or that there is none.
+	 *
+	 * Absence is a case of this enum rather than a wrapping std::optional so the object
+	 * stays trivially copyable and one word smaller, and so the three-way switch the
+	 * comparison rule needs is a switch on one field instead of a nested optional test.
+	 */
+	enum class Family : std::uint8_t
+	{
+		None,
+		IPv4,
+		IPv6
+	};
+
+	/** Constructs an absent address -- @b not @c 0.0.0.0. */
+	CNetworkAddress() = default;
+
+	/** An explicitly absent address, for call sites where the name reads better. */
+	static CNetworkAddress Absent() { return CNetworkAddress(); }
+
+	/**
+	 * Builds an IPv4 address from a 32-bit value in host (numeric) order, i.e.
+	 * @c 192.0.2.1 is @c 0xC0000201. This is the Kademlia convention.
+	 */
+	static CNetworkAddress FromIPv4HostOrder(std::uint32_t ip)
+	{
+		CNetworkAddress result;
+		result.m_family = Family::IPv4;
+		result.m_octets0 = static_cast<std::uint8_t>((ip >> 24) & 0xFFu);
+		result.m_octets1 = static_cast<std::uint8_t>((ip >> 16) & 0xFFu);
+		result.m_octets2 = static_cast<std::uint8_t>((ip >> 8) & 0xFFu);
+		result.m_octets3 = static_cast<std::uint8_t>(ip & 0xFFu);
+		return result;
+	}
+
+	/**
+	 * Builds an IPv4 address from a 32-bit value in network order, i.e. @c 192.0.2.1 is
+	 * @c 0x010200C0. This is the ed2k convention, called "anti-host order" elsewhere.
+	 */
+	static CNetworkAddress FromIPv4NetworkOrder(std::uint32_t ip)
+	{
+		return FromIPv4HostOrder(SwapOctets(ip));
+	}
+
+	/**
+	 * The conversion boundary for a 32-bit ed2k-order address field in which zero is
+	 * overloaded to mean "no address".
+	 *
+	 * This is the lossy direction and the only place the overload is allowed to live. A
+	 * caller holding such a field cannot tell @c 0.0.0.0 from "unknown", so this
+	 * resolves the ambiguity once, at the edge, in favour of absence -- which is what
+	 * the @c if (ip) tests it replaces already did. Use it only where the old code
+	 * actually tested the value against zero; where zero was simply a value,
+	 * FromIPv4NetworkOrder() keeps behaviour identical.
+	 */
+	static CNetworkAddress FromIPv4NetworkOrderOrAbsent(std::uint32_t ip)
+	{
+		return ip == 0 ? Absent() : FromIPv4NetworkOrder(ip);
+	}
+
+	/** As FromIPv4NetworkOrderOrAbsent(), for the Kad host-order convention. */
+	static CNetworkAddress FromIPv4HostOrderOrAbsent(std::uint32_t ip)
+	{
+		return ip == 0 ? Absent() : FromIPv4HostOrder(ip);
+	}
+
+	/**
+	 * Builds an IPv6 address from its octets, with no interpretation of their value at
+	 * all -- the all-zero octets give the unspecified address @c :: , which is a real
+	 * address here and not absence.
+	 *
+	 * This is the raw widening, for callers that already know they hold an address: the
+	 * asio bridge reconstructing one, and AnyIPv6() below. A caller decoding a wire tag
+	 * wants FromIPv6Bytes() instead, which applies that edge's absence rule.
+	 */
+	static CNetworkAddress IPv6FromOctets(const Octets &octets, unsigned long scopeId = 0)
+	{
+		CNetworkAddress result;
+		result.m_family = Family::IPv6;
+		result.m_octets = octets;
+		result.m_scopeId = scopeId;
+		return result;
+	}
+
+	/**
+	 * The IPv6 wildcard, @c :: -- present, IPv6 and unspecified.
+	 *
+	 * Named rather than left to IPv6FromOctets({}) because the call sites that want it
+	 * are binding a listening socket to "every local address", and there @c :: is a
+	 * decision about reachability, not sixteen zero bytes. It also keeps them from
+	 * reaching for the asio-typed wildcard in AddressFamilyPolicyAsio.h, which would put
+	 * asio back in their closure.
+	 */
+	static CNetworkAddress AnyIPv6() { return IPv6FromOctets(Octets{}); }
+
+	/**
+	 * Builds an IPv6 address from sixteen big-endian bytes -- the form the
+	 * @c CT_MOD_IP_V6 hello tag and the Kad @c "ip6" tag carry.
+	 *
+	 * @return The address, or an @b absent address when @a bytes is NULL or the sixteen
+	 *         bytes are all zero. The all-zero value is @c :: , which is what a peer
+	 *         with no IPv6 address sends when it emits the tag anyway; treating it as an
+	 *         address would have aMule dialling the unspecified address.
+	 */
+	static CNetworkAddress FromIPv6Bytes(const std::uint8_t *bytes)
+	{
+		if (bytes == nullptr) {
+			return Absent();
+		}
+		Octets raw;
+		bool allZero = true;
+		for (std::size_t i = 0; i < raw.size(); ++i) {
+			rawi = bytesi;
+			if (bytesi != 0) {
+				allZero = false;
+			}
+		}
+		if (allZero) {
+			return Absent();
+		}
+		return IPv6FromOctets(raw);
+	}
+
+	/**
+	 * Parses a textual address, IPv4 or IPv6.
+	 *
+	 * Defined in NetworkAddress.cpp: one of the two operations that still go through
+	 * asio, so the accepted syntax stays a library's idea of an address literal rather
+	 * than this file's.
+	 *
+	 * @return The address, or an @b absent address if @a text is not a valid literal.
+	 *         Never yields @c 0.0.0.0 on failure, unlike StringIPtoUint32().
+	 */
+	static CNetworkAddress FromString(const std::string &text);
+
+	bool IsPresent() const noexcept { return m_family != Family::None; }
+	bool IsAbsent() const noexcept { return m_family == Family::None; }
+
+	/** True for a present address whose every octet is zero (@c 0.0.0.0 or @c ::). */
+	bool IsUnspecified() const noexcept
+	{
+		if (IsAbsent()) {
+			return false;
+		}
+		// The unused tail of an IPv4 address is always zero (see m_octets), so
+		// one loop over all sixteen answers for both families.
+		for (const std::uint8_t octet : m_octets) {
+			if (octet != 0) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	bool IsIPv4() const noexcept { return m_family == Family::IPv4; }
+	bool IsIPv6() const noexcept { return m_family == Family::IPv6; }
+
+	/** True only for an IPv6 address in the @c ::ffff:a.b.c.d form. */
+	bool IsIPv4Mapped() const noexcept
+	{
+		if (!IsIPv6()) {
+			return false;
+		}
+		// The prefix is RFC 4291 section 2.5.5.2: eighty zero bits, then 0xffff. Tested
+		// against the octets rather than via asio's address_v6::is_v4_mapped(), which asio
+		// deprecated after 1.66 and has since removed -- and which this header no longer has.
+		for (int i = 0; i < 10; ++i) {
+			if (m_octetsi != 0) {
+				return false;
+			}
+		}
+		return m_octets10 == 0xff && m_octets11 == 0xff;
+	}
+
+	/**
+	 * The address as its sixteen octets in wire order.
+	 *
+	 * For an IPv6 address these are the address. For IPv4 the four octets sit in the
+	 * first four positions and the rest are zero, which is @b not the IPv4-mapped form
+	 * -- so do not hand these to something expecting sixteen IPv6 octets without
+	 * checking the family first. For an absent address they are all zero, which is
+	 * exactly the conflation this type exists to prevent, so check IsPresent() too.
+	 *
+	 * This exists so callers doing bit arithmetic on an address -- prefix matching in
+	 * IPFilterMatch.h, chiefly -- can do it without a library and without this header
+	 * growing one. Where the caller wants the guardrails, ToIPv6Bytes() below states the
+	 * family requirement in its return value.
+	 */
+	const Octets &GetOctets() const noexcept { return m_octets; }
+
+	/**
+	 * The interface scope of an IPv6 address, or zero when it has none. Carried because
+	 * it is part of the address's identity: @c fe80::1%eth0 and @c fe80::1%eth1 are two
+	 * different destinations, so folding them together would break the total order this
+	 * type promises.
+	 */
+	unsigned long GetScopeId() const noexcept { return m_scopeId; }
+
+	/**
+	 * The same address with any IPv4-mapped IPv6 form collapsed to plain IPv4.
+	 * Everything else, including absence, is returned unchanged. Call this deliberately
+	 * at sites that must treat the mapped and native forms as one address; the
+	 * comparison operators never do it for you.
+	 */
+	/**
+	 * A hash over exactly what operator== compares.
+	 *
+	 * A member rather than a loose function so it cannot drift from the comparison, and
+	 * supplied at all because a caller writing their own would reach for the object's bytes:
+	 * sizeof is 32 against 25 bytes of members, and no member initialiser touches the seven
+	 * bytes of tail padding, so a byte-wise hash disagrees with operator== for values that
+	 * compare equal.
+	 */
+	std::size_t HashValue() const noexcept
+	{
+		std::size_t result = static_cast<std::size_t>(m_family);
+		for (const std::uint8_t octet : m_octets) {
+			result = result * 131u + octet;
+		}
+		return result * 131u + static_cast<std::size_t>(m_scopeId);
+	}
+
+	//! The same address with no interface scope. A prefix is not interface-scoped.
+	CNetworkAddress WithoutScope() const
+	{
+		CNetworkAddress result = *this;
+		result.m_scopeId = 0;
+		return result;
+	}
+
+	CNetworkAddress Unmapped() const
+	{
+		if (IsIPv4Mapped()) {
+			return FromIPv4HostOrder(EmbeddedIPv4HostOrder());
+		}
+		return *this;
+	}
+
+	/**
+	 * Narrows to a 32-bit IPv4 value in host (numeric) order.
+	 *
+	 * @param out Assigned only on success, so a caller that ignores the result cannot
+	 *            end up with a fabricated address.
+	 * @return False if the address is absent, or is an IPv6 address that is not
+	 *         IPv4-mapped. Such an address has no 32-bit form, and this deliberately
+	 *         fails rather than truncating or hashing it.
+	 */
+	bool ToIPv4HostOrder(std::uint32_t &out) const noexcept
+	{
+		if (IsIPv4()) {
+			out = PackOctets(m_octets0, m_octets1, m_octets2, m_octets3);
+			return true;
+		}
+		if (IsIPv4Mapped()) {
+			out = EmbeddedIPv4HostOrder();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Narrows to a 32-bit IPv4 value in network order (ed2k / "anti-host" order). Same
+	 * failure contract as ToIPv4HostOrder().
+	 */
+	bool ToIPv4NetworkOrder(std::uint32_t &out) const noexcept
+	{
+		std::uint32_t hostOrder = 0;
+		if (!ToIPv4HostOrder(hostOrder)) {
+			return false;
+		}
+		out = SwapOctets(hostOrder);
+		return true;
+	}
+
+	/**
+	 * Narrows back to an ed2k-order field that uses zero for "no address", for handing
+	 * to an edge this refactor has not reached yet.
+	 *
+	 * @return Zero for an absent address, and also for an address with no 32-bit form.
+	 *         Prefer ToIPv4NetworkOrder() wherever the caller can act on the difference:
+	 *         this one cannot report it.
+	 */
+	std::uint32_t ToIPv4NetworkOrderOrZero() const noexcept
+	{
+		std::uint32_t value = 0;
+		ToIPv4NetworkOrder(value);
+		return value;
+	}
+
+	/**
+	 * Writes an IPv6 address out as sixteen big-endian bytes -- the form the
+	 * @c CT_MOD_IP_V6 hello tag and the Kad @c "ip6" tag carry.
+	 *
+	 * @param out Sixteen bytes, written only on success, so a caller that ignores the
+	 *            result cannot emit a half-filled address.
+	 * @return False for an absent or IPv4 address. An IPv4-mapped one is written as the
+	 *         mapped IPv6 address it is: that is what the peer asked for.
+	 */
+	bool ToIPv6Bytes(std::uint8_t *out) const noexcept
+	{
+		if (out == nullptr || !IsIPv6()) {
+			return false;
+		}
+		// One copy of a constant length, not a loop bounded by m_octets.size(). The two are
+		// the same sixteen bytes, but only the constant states the postcondition above in a
+		// form a reader -- or a static analyser -- can check without first proving what size()
+		// returns. The Clang Static Analyzer could not: it explored the zero-iteration path
+		// through the old loop and concluded this function returns true having written nothing,
+		// which surfaced as garbage-value reports in all four callers that read the buffer back
+		// (IPFilterMatch.h, NatRendezvousProtocol.h and, through CMD4Hash, ArchSpecific.h).
+		std::memcpy(out, m_octets.data(), OCTET_COUNT);
+		return true;
+	}
+
+	/**
+	 * Whether this is an IPv4 address that can stand for this host on the public
+	 * internet: present, IPv4 (or the mapped form of one), and outside every range the
+	 * address itself declares unroutable -- the unspecified address, loopback, the three
+	 * RFC1918 private blocks, link-local, carrier-grade NAT, the documentation and
+	 * benchmark blocks, multicast and the reserved top of the space.
+	 *
+	 * The IPv6 sibling below exists so an address is never advertised to a peer that
+	 * cannot reach it. This one exists for a second and sharper reason: aMule's UDP
+	 * obfuscation bakes the *sender's* own public address into the key --
+	 * EncryptedDatagramSocket.cpp derives it as MD5(<receiver user hash 16><sender IP
+	 * 4><0x5B><random 2>) -- while the receiver derives its half from the source address
+	 * of the datagram it actually got. The two only agree when the sender's idea of its
+	 * own address is the one the peer sees. Encrypt with 127.0.1.1 in that field and
+	 * every frame decrypts to noise at the far end, with nothing logged on either side,
+	 * because a failed obfuscation looks exactly like a peer that never obfuscated. So
+	 * "do I have an address a stranger could reply to" has to be answered before the key
+	 * is derived, not assumed from non-zero.
+	 */
+	bool IsGloballyRoutableIPv4() const noexcept
+	{
+		const CNetworkAddress plain = Unmapped();
+		if (!plain.IsIPv4() || plain.IsUnspecified()) {
+			return false;
+		}
+		const std::uint8_t a = plain.m_octets0;
+		const std::uint8_t b = plain.m_octets1;
+
+		if (a == 0) {
+			return false; // 0.0.0.0/8, "this network" (RFC 1122).
+		}
+		if (a == 10) {
+			return false; // 10.0.0.0/8, private (RFC 1918).
+		}
+		if (a == 100 && (b & 0xC0) == 0x40) {
+			return false; // 100.64.0.0/10, carrier-grade NAT (RFC 6598).
+		}
+		if (a == 127) {
+			// 127.0.0.0/8. The whole block, not just 127.0.0.1: a Debian host names itself
+			// 127.0.1.1 in /etc/hosts, and that is precisely the value CamuleApp::GetPublicIP()
+			// hands back when it falls through to m_localip.
+			return false;
+		}
+		if (a == 169 && b == 254) {
+			return false; // 169.254.0.0/16, link-local (RFC 3927).
+		}
+		if (a == 172 && (b & 0xF0) == 16) {
+			return false; // 172.16.0.0/12, private (RFC 1918).
+		}
+		if (a == 192 && b == 0 && plain.m_octets2 == 0) {
+			return false; // 192.0.0.0/24, IETF protocol assignments.
+		}
+		if (a == 192 && b == 0 && plain.m_octets2 == 2) {
+			return false; // 192.0.2.0/24, TEST-NET-1 documentation (RFC 5737).
+		}
+		if (a == 192 && b == 88 && plain.m_octets2 == 99) {
+			return false; // 192.88.99.0/24, IPv6 relay anycast (RFC 3068).
+		}
+		if (a == 192 && b == 168) {
+			return false; // 192.168.0.0/16, private (RFC 1918).
+		}
+		if (a == 198 && (b & 0xFE) == 18) {
+			return false; // 198.18.0.0/15, benchmarking (RFC 2544).
+		}
+		if (a == 198 && b == 51 && plain.m_octets2 == 100) {
+			return false; // 198.51.100.0/24, TEST-NET-2 (RFC 5737).
+		}
+		if (a == 203 && b == 0 && plain.m_octets2 == 113) {
+			return false; // 203.0.113.0/24, TEST-NET-3 (RFC 5737).
+		}
+		// 224.0.0.0/4 multicast and 240.0.0.0/4 reserved, which together are
+		// everything from 224 up. Neither is a unicast source address.
+		return a < 224;
+	}
+
+	/**
+	 * Whether this is an IPv6 address worth telling a peer about: present, IPv6, not
+	 * mapped, and globally routable as far as the address itself can say -- so not the
+	 * unspecified address, not loopback, not link-local and not a unique-local address.
+	 * Advertising any of those is worse than advertising nothing: the peer cannot reach
+	 * them and spends a connect attempt finding out.
+	 */
+	bool IsGloballyRoutableIPv6() const noexcept
+	{
+		if (!IsIPv6()) {
+			return false;
+		}
+		for (const auto &prefix : NetworkAddressPolicy::kIPv6ExcludedPrefixes) {
+			if (NetworkAddressPolicy::MatchesPrefix(m_octets, prefix)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * The network address of the prefix this address falls in: the same address with
+	 * every bit below @a prefixBits cleared.
+	 *
+	 * Used where a limit or a rule applies to a block rather than to a host -- an IPv6
+	 * subscriber is delegated a prefix, not an address, so a per-address budget under
+	 * IPv6 counts to one forever (see PeerAddressing.h).
+	 *
+	 * The width is the effective family's, so an IPv4-mapped address is treated as the IPv4
+	 * address it carries and the result comes back in IPv4 form. The interface scope is
+	 * dropped at every width: a prefix is not interface-scoped, and returning it at one width
+	 * but not the next would make the same two addresses one value at /64 and two at /128.
+	 *
+	 * @param prefixBits Counted from the most significant bit of the address in its own
+	 *                   family: 0..32 for IPv4, 0..128 for IPv6. A value at or above the
+	 *                   family's width returns the address with its scope dropped, and
+	 *                   otherwise unchanged.
+	 * @return The prefix's network address. An absent address is returned unchanged --
+	 *         there is no prefix to compute and none is invented.
+	 */
+	CNetworkAddress TruncatedToPrefix(unsigned prefixBits) const
+	{
+		if (IsAbsent()) {
+			return *this;
+		}
+		// Normalising to the effective family is the fix. Truncating the stored octets of a
+		// mapped address zeroed the embedded ones away entirely: ::ffff:203.0.113.5 at /24
+		// came back as ::, so every mapped peer landed in one bucket of the per-prefix budget
+		// this exists to feed. Taking the width from the same subject only shortcuts the
+		// truncation below, which now reaches the same answer either way.
+		const CNetworkAddress subject = Unmapped();
+		const unsigned width = subject.IsIPv4() ? 32u : 128u;
+		if (prefixBits >= width) {
+			// Scope dropped here too. The truncating path below drops it deliberately, and
+			// returning it only on this branch made fe80::1%7 and fe80::1%9 one value at
+			// /64 and two at /128, which is a discontinuity at the boundary.
+			return subject.WithoutScope();
+		}
+		Octets bytes = subject.m_octets;
+		for (std::size_t i = 0; i < bytes.size(); ++i) {
+			const unsigned bitsBefore = static_cast<unsigned>(i) * 8u;
+			if (prefixBits >= bitsBefore + 8u) {
+				continue; // Wholly inside the prefix.
+			}
+			if (prefixBits <= bitsBefore) {
+				bytesi = 0; // Wholly outside it.
+			} else {
+				bytesi = static_cast<std::uint8_t>(
+					bytesi & (0xFFu << (bitsBefore + 8u - prefixBits)));
+			}
+		}
+		if (subject.IsIPv4()) {
+			return FromIPv4HostOrder(PackOctets(bytes0, bytes1, bytes2, bytes3));
+		}
+		// The scope id is deliberately not carried over: a prefix is not interface-scoped, and
+		// keeping it would make the same prefix seen on two interfaces into two prefixes.
+		return IPv6FromOctets(bytes);
+	}
+
+	/**
+	 * Textual form, or @c "<absent>" when there is no address. Defined in
+	 * NetworkAddress.cpp for the reason given on FromString(): the RFC 4291 canonical
+	 * form is a library's job, not this header's.
+	 */
+	std::string ToString() const;
+
+	wxString ToWxString() const;
+
+	// Comparison. See the class comment for the single rule these implement.
+	//
+	// All four reduce to comparing (family, octets, scope id) in that order, because the
+	// storage was chosen to make them: the octets are already in most-significant-first
+	// order, so std::array's lexicographic compare *is* rule 3, and an IPv4 address's unused
+	// tail is always zero so it needs no separate case.
+	bool operator==(const CNetworkAddress &other) const noexcept
+	{
+		return m_family == other.m_family && m_octets == other.m_octets &&
+		       m_scopeId == other.m_scopeId;
+	}
+	bool operator!=(const CNetworkAddress &other) const noexcept { return !(*this == other); }
+
+	bool operator<(const CNetworkAddress &other) const noexcept
+	{
+		if (IsAbsent() || other.IsAbsent()) {
+			// Absent sorts first; two absents are equal, so neither is less.
+			return IsAbsent() && other.IsPresent();
+		}
+		if (m_family != other.m_family) {
+			return m_family == Family::IPv4; // IPv4 before IPv6
+		}
+		if (m_octets != other.m_octets) {
+			return m_octets < other.m_octets;
+		}
+		// Same octets: order by scope id so two distinct addresses never tie.
+		return m_scopeId < other.m_scopeId;
+	}
+	bool operator>(const CNetworkAddress &other) const noexcept { return other < *this; }
+	bool operator<=(const CNetworkAddress &other) const noexcept { return !(other < *this); }
+	bool operator>=(const CNetworkAddress &other) const noexcept { return !(*this < other); }
+
+	/**
+	 * Reverses the four octets of a 32-bit IPv4 value, converting between the host-order
+	 * and network-order conventions in either direction. Equivalent to
+	 * @c wxUINT32_SWAP_ALWAYS, spelled out here so this header stays free of wxWidgets
+	 * and can be unit tested on its own.
+	 */
+	static std::uint32_t SwapOctets(std::uint32_t value) noexcept
+	{
+		return ((value & 0x000000FFu) << 24) | ((value & 0x0000FF00u) << 8) |
+		       ((value & 0x00FF0000u) >> 8) | ((value & 0xFF000000u) >> 24);
+	}
+
+private:
+	/** Four octets, most significant first, into a host-order 32-bit value. */
+	static std::uint32_t PackOctets(
+		std::uint8_t a, std::uint8_t b, std::uint8_t c, std::uint8_t d) noexcept
+	{
+		return (static_cast<std::uint32_t>(a) << 24) | (static_cast<std::uint32_t>(b) << 16) |
+		       (static_cast<std::uint32_t>(c) << 8) | static_cast<std::uint32_t>(d);
+	}
+
+	/**
+	 * The IPv4 address embedded in an IPv4-mapped IPv6 address, in host order.
+	 * @pre IsIPv4Mapped().
+	 */
+	std::uint32_t EmbeddedIPv4HostOrder() const noexcept
+	{
+		return PackOctets(m_octets12, m_octets13, m_octets14, m_octets15);
+	}
+
+	/**
+	 * The octets, in wire order (most significant first) whatever the family.
+	 *
+	 * An IPv4 address occupies the first four and leaves the rest zero. That invariant is
+	 * what lets the comparison operators, IsUnspecified() and TruncatedToPrefix() treat
+	 * both families with one loop, so every factory above must preserve it: never write
+	 * past index 3 for an IPv4 address.
+	 */
+	Octets m_octets{};
+
+	//! Zero for an IPv4 or absent address; only IPv6 addresses carry a scope.
+	unsigned long m_scopeId = 0;
+
+	//! None when unset. Never conflated with the all-zero address.
+	Family m_family = Family::None;
+};
+
+/**
+ * Hashing, over exactly the three members operator== compares.
+ *
+ * Supplied because the class is framed as a container key and a caller writing their own would
+ * reach for the object's bytes: sizeof is 32 against 25 bytes of members, and no member
+ * initialiser touches the seven bytes of tail padding, so a byte-wise hash disagrees with
+ * operator== for values that compare equal.
+ */
+namespace std
+{
+template <> struct hash<CNetworkAddress>
+{
+	std::size_t operator()(const CNetworkAddress &address) const noexcept { return address.HashValue(); }
+};
+} // namespace std
+
+#endif // NETWORKADDRESS_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/NetworkAddressAsio.h Added

@@ -0,0 +1,87 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 NETWORKADDRESSASIO_H
+#define NETWORKADDRESSASIO_H
+
+#include "NetworkAddress.h"
+
+#include <boost/asio/ip/address.hpp>
+
+/**
+ * The one bridge between CNetworkAddress and Boost.Asio.
+ *
+ * CNetworkAddress deliberately stores its own sixteen octets rather than an asio address, so that
+ * the 155 translation units merely passing an address around stop compiling asio's ~1200-header
+ * closure and stop needing @c ws2_32 at link time (see the class comment in NetworkAddress.h). The
+ * socket backend still has to hand a real @c asio::ip::address to a real socket, so the conversion
+ * lives here -- in a header that says asio in its name, included only by the TUs actually opening
+ * sockets.
+ *
+ * Include this from a TU that talks to asio. Do @b not include it from a public header: that re-
+ * establishes exactly the coupling this file exists to confine, and nothing will warn you until
+ * macOS and mingw-w64 CI do.
+ */
+
+/**
+ * Both conversions are namespaced rather than free at global scope. They take a
+ * boost::asio::ip::address, which would make an unqualified pair argument-dependent lookup
+ * candidates for every call in a TU that mentions an asio address -- and the call sites this type
+ * is for will include this header widely. Nothing collides today; the namespace is cheap now and
+ * awkward once those call sites exist.
+ */
+namespace NetworkAddressAsio
+{
+
+/**
+ * Widens a CNetworkAddress into the asio value a socket call needs.
+ *
+ * @pre @a address.IsPresent(). Absence has no asio equivalent -- asio's own default-constructed
+ *      address is @c 0.0.0.0, exactly the conflation CNetworkAddress exists to prevent, so an
+ *      absent address must be handled by the caller rather than silently becoming the wildcard.
+ */
+boost::asio::ip::address ToAsioAddress(const CNetworkAddress &address);
+
+/**
+ * Narrows an asio address into a CNetworkAddress, preserving the family, the octets and the IPv6
+ * scope id exactly.
+ *
+ * Every asio address is a present address: no value of the argument yields absence, @c 0.0.0.0
+ * included. A caller wanting asio's all-zero address treated as "no address" must test for that
+ * itself, at the edge where it knows the overload applies.
+ */
+CNetworkAddress FromAsioAddress(const boost::asio::ip::address &address);
+
+/** Publish a socket ingress address with one identity for plain and mapped IPv4.
+ * Native IPv6, including its scope, is preserved. The general bridge above stays lossless.
+ */
+inline CNetworkAddress FromIngressAddress(const boost::asio::ip::address &address)
+{
+	return FromAsioAddress(address).Unmapped();
+}
+
+} // namespace NetworkAddressAsio
+
+#endif // NETWORKADDRESSASIO_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/NetworkFunctions.cpp -> amule-3.1.0.tar.gz/src/NetworkFunctions.cpp Changed

@@ -24,12 +24,11 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "NetworkFunctions.h"	// Interface declaration
+#include "NetworkFunctions.h" // Interface declaration
 #include "amuleIPV4Address.h"
-#include <common/Macros.h>	// Needed for itemsof()
+#include <common/Macros.h> // Needed for itemsof()
 
-
-bool StringIPtoUint32(const wxString &strIP, uint32& Ip)
+bool StringIPtoUint32(const wxString &strIP, uint32 &Ip)
 {
 	// The current position in the current field, used to detect malformed fields (x.y..z).
 	unsigned digit = 0;
@@ -43,16 +42,16 @@
 	// Stores the work-value of the IP, reference is not changed unless the str was valid
 	uint32 tmp_ip = 0;
 
-	wxString str = strIP.Strip( wxString::both );
+	wxString str = strIP.Strip(wxString::both);
 	for (size_t i = 0; i < str.Length(); i++) {
-		wxChar c = str.GetChar( i );
+		wxChar c = str.GetChar(i);
 
-		if ( c >= '0' && c <= '9' && (value >> 8) == 0) {
-			value = ( value * 10 ) + ( c - '0' );
+		if (c >= '0' && c <= '9' && (value >> 8) == 0) {
+			value = (value * 10) + (c - '0');
 			++digit;
-		} else if ( c == '.' ) {
-			if ( digit && (value >> 8) == 0) {
-				tmp_ip = tmp_ip | value << ( field * 8 );
+		} else if (c == '.') {
+			if (digit && (value >> 8) == 0) {
+				tmp_ip = tmp_ip | value << (field * 8);
 
 				// Rest the current field values
 				value = digit = 0;
@@ -66,7 +65,7 @@
 	}
 
 	// Only set the referenced value if it was a valid IP
-	if ( field == 3 && digit && (value >> 8) == 0) {
+	if (field == 3 && digit && (value >> 8) == 0) {
 		Ip = tmp_ip | value << 24;
 		return true;
 	}
@@ -74,7 +73,6 @@
 	return false;
 }
 
-
 uint32 StringHosttoUint32(const wxString &Host)
 {
 	if (Host.IsEmpty()) {
@@ -83,7 +81,7 @@
 	amuleIPV4Address solver;
 	if (solver.Hostname(Host)) {
 		uint32 result = StringIPtoUint32(solver.IPAddress());
-		if (result != (uint32)-1) {	// should not happen
+		if (result != (uint32)-1) { // should not happen
 			return result;
 		}
 	}
@@ -91,45 +89,42 @@
 	return 0;
 }
 
-
-struct filter_st {
-	uint32 addr;		// Address in anti-host order.
-	uint32 mask;		// Mask in anti-host order.
+struct filter_st
+{
+	uint32 addr; // Address in anti-host order.
+	uint32 mask; // Mask in anti-host order.
 };
 
-
 static filter_st reserved_ranges = {
-//	Here are the reserved blocks from RFC 3330 at http://www.rfc-editor.org/rfc/rfc3330.txt
-//
-//                                         Address Block      Present Use                                     Reference
-//---------------------------------------------------------------------------------------------------------------------
-	{ 0x00000000, 0x000000ff },	// 0.0.0.0/8          "This" Network                          RFC1700, page 4
-	// According to RFC3330, 14.* and 24.* must be parsed as normal IPs.
-	// { 0x0000000e, 0x000000ff },	// 14.0.0.0/8         Public-Data Networks                  RFC1700, page 181
-	// { 0x00000018, 0x000000ff },	// 24.0.0.0/8         Cable Television Networks                              --
-	{ 0x00000027, 0x000000ff },	// 39.0.0.0/8         Reserved but subject to allocation              RFC1797
-	{ 0x0000007f, 0x000000ff },	// 127.0.0.0/8        Loopback                                RFC1700, page 5
-	{ 0x00000080, 0x0000ffff },	// 128.0.0.0/16       Reserved but subject to allocation                     --
-	{ 0x0000fea9, 0x0000ffff },	// 169.254.0.0/16     Link Local                                             --
-	{ 0x0000ffbf, 0x0000ffff },	// 191.255.0.0/16     Reserved but subject to allocation                     --
-	{ 0x000000c0, 0x00ffffff },	// 192.0.0.0/24       Reserved but subject to allocation                     --
-	{ 0x000200c0, 0x00ffffff },	// 192.0.2.0/24       Test-Net
-	{ 0x006358c0, 0x00ffffff },	// 192.88.99.0/24     6to4 Relay Anycast                              RFC3068
-	{ 0x000012c6, 0x0000feff },	// 198.18.0.0/15      Network Interconnect Device Benchmark Testing   RFC2544
-	{ 0x00ffffdf, 0x00ffffff },	// 223.255.255.0/24   Reserved but subject to allocation                     --
-	{ 0x000000e0, 0x000000f0 },	// 224.0.0.0/4        Multicast                                       RFC3171
-	{ 0x000000f0, 0x000000f0 }	// 240.0.0.0/4        Reserved for Future Use                 RFC1700, page 4
+	// Reserved blocks from RFC 3330 (http://www.rfc-editor.org/rfc/rfc3330.txt):
+	//                                         Address Block      Present Use Reference
+	//-----------------------------------------------------------------------------------------
+	{ 0x00000000, 0x000000ff }, // 0.0.0.0/8          "This" Network RFC1700, page 4
+	// Per RFC 3330, 14.* and 24.* must be parsed as normal IPs:
+	// { 0x0000000e, 0x000000ff },	// 14.0.0.0/8   Public-Data Networks    RFC1700, page 181
+	// { 0x00000018, 0x000000ff },	// 24.0.0.0/8   Cable Television Networks
+	{ 0x00000027, 0x000000ff }, // 39.0.0.0/8         Reserved but subject to allocation RFC1797
+	{ 0x0000007f, 0x000000ff }, // 127.0.0.0/8        Loopback RFC1700, page 5
+	{ 0x00000080, 0x0000ffff }, // 128.0.0.0/16       Reserved but subject to allocation --
+	{ 0x0000fea9, 0x0000ffff }, // 169.254.0.0/16     Link Local --
+	{ 0x0000ffbf, 0x0000ffff }, // 191.255.0.0/16     Reserved but subject to allocation --
+	{ 0x000000c0, 0x00ffffff }, // 192.0.0.0/24       Reserved but subject to allocation --
+	{ 0x000200c0, 0x00ffffff }, // 192.0.2.0/24       Test-Net
+	{ 0x006358c0, 0x00ffffff }, // 192.88.99.0/24     6to4 Relay Anycast RFC3068
+	{ 0x000012c6,
+		0x0000feff }, // 198.18.0.0/15      Network Interconnect Device Benchmark Testing   RFC2544
+	{ 0x00ffffdf, 0x00ffffff }, // 223.255.255.0/24   Reserved but subject to allocation --
+	{ 0x000000e0, 0x000000f0 }, // 224.0.0.0/4        Multicast RFC3171
+	{ 0x000000f0, 0x000000f0 }  // 240.0.0.0/4        Reserved for Future Use RFC1700, page 4
 };
 
-
 // Private-Use Networks RFC1918
 static filter_st lan_ranges = {
-	{ 0x0000000a, 0x000000ff },	// 10.0.0.0/8
-	{ 0x000010ac, 0x0000f0ff },	// 172.16.0.0/12
-	{ 0x0000a8c0, 0x0000ffff }	// 192.168.0.0/16
+	{ 0x0000000a, 0x000000ff }, // 10.0.0.0/8
+	{ 0x000010ac, 0x0000f0ff }, // 172.16.0.0/12
+	{ 0x0000a8c0, 0x0000ffff }  // 192.168.0.0/16
 };
 
-
 bool IsGoodIP(uint32 ip, bool filterLAN) noexcept
 {
 	for (unsigned int i = 0; i < itemsof(reserved_ranges); ++i) {
@@ -151,16 +146,13 @@
 	return false;
 }
 
-
 bool IsLoopbackIP(uint32_t ip) noexcept
 {
-	// 127.0.0.0/8 in anti-host order — the first octet (127 = 0x7f) sits
-	// in the low byte of the uint32 (matches the encoding used by
-	// StringIPtoUint32 / IsLanIP).
+	// 127.0.0.0/8 in anti-host order -- the first octet (127 = 0x7f) sits in the low byte of
+	// the uint32, matching the encoding StringIPtoUint32 / IsLanIP use.
 	return (ip & 0x000000ff) == 0x0000007f;
 }
 
-
 bool IsLinkLocalIP(uint32_t ip) noexcept
 {
 	// 169.254.0.0/16 in anti-host order: 169 = 0xa9 in the low byte,

amule-3.0.1.tar.gz/src/NetworkFunctions.h -> amule-3.1.0.tar.gz/src/NetworkFunctions.h Changed

@@ -27,134 +27,95 @@
 #ifndef NETWORK_FUNCTIONS_H
 #define NETWORK_FUNCTIONS_H
 
-#include "Types.h"		// Needed for uint16 and uint32
-#include <common/Format.h>	// Needed for CFormat
+#include "Types.h"         // Needed for uint16 and uint32
+#include <common/Format.h> // Needed for CFormat
 
 // Network ip/host handling functions
 // These functions take IPs in anti-host order
 
 inline wxString Uint32toStringIP(uint32 ip)
 {
-	return CFormat("%u.%u.%u.%u") % (uint8)ip % (uint8)(ip>>8) % (uint8)(ip>>16) % (uint8)(ip>>24);
+	return CFormat("%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 CFormat("%u.%u.%u.%u:%u") % (uint8)ip % (uint8)(ip>>8) % (uint8)(ip>>16) % (uint8)(ip>>24) % port;
+	return CFormat("%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("%u.%u.%u.%u") % (uint8_t)(ip >> 24) % (uint8_t)(ip >> 16) % (uint8_t)(ip >> 8) % (uint8_t)ip;
+	return CFormat("%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("%u.%u.%u.%u:%u") % (uint8_t)(ip >> 24) % (uint8_t)(ip >> 16) % (uint8_t)(ip >> 8) % (uint8_t)ip % port;
+	return CFormat("%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.
+ * Parses a string IP of the form "a.b.c.d" into @a Ip, returning whether it parsed. Whitespace
+ * around the address is ignored and the result is saved in anti-host order.
  *
- * @param strIP A string-ip in the format "a.b.c.d".
- * @param Ip The value to save the result in.
- * @return True if the string was parsed, false otherwise.
- *
- * When parsing the IP address, whitespace before or after the
- * ip-address is ignored and the resulting IP is saved in
- * anti-host order.
- *
- * The reason for the existence of this function is the fact that
- * the standard inet_aton function treats numbers with 0 prefixed
- * as octals, which is desirable.
- *
- * Note: The reference value will not be changed unless the string
- *       contains a valid IP address.
+ * This exists because the standard inet_aton treats a 0-prefixed number as octal. @a Ip is left
+ * unchanged unless the string holds a valid IP address.
  */
-bool	StringIPtoUint32(const wxString &strIP, uint32& Ip);
-
+bool StringIPtoUint32(const wxString &strIP, uint32 &Ip);
 
 /**
- * Parses a String-IP and returns the IP or 0 if it was invalid.
- *
- * @param strIP A string-ip in the format "a.b.c.d".
- * @return The resulting IP-address or zero if invalid (or 0.0.0.0).
- *
- * The IP will be saved in anti-host order.
+ * Parses a string IP of the form "a.b.c.d" and returns it in anti-host order, or zero if it was
+ * invalid (or 0.0.0.0).
  */
 inline uint32 StringIPtoUint32(const wxString &strIP)
 {
 	uint32 ip = 0;
-	StringIPtoUint32( strIP, ip );
+	StringIPtoUint32(strIP, ip);
 
 	return ip;
 }
 
-
 /**
- * Parses a String-IHost and returns the IP or 0 if it was invalid.
- *
- * @param Host A string with the Host to convert.
- * @return The resulting IP-address or zero if invalid (or 0.0.0.0).
- *
- * The IP will be saved in anti-host order.
+ * Parses a host string and returns its IP in anti-host order, or zero if it was invalid (or
+ * 0.0.0.0).
  */
 uint32 StringHosttoUint32(const wxString &Host);
 
-
 /**
- * Checks for invalid IP-values.
- *
- * @param IP the IP-address to check.
- * @param filterLAN Specifies if LAN IP-ranges should be filtered.
- * @return True if it was valid, false otherwise.
- *
- * Note: IP must be in anti-host order (BE on LE platform, LE on BE platform).
+ * True if @a IP is a valid address. @a filterLAN also rejects the LAN ranges. @a IP must be in
+ * anti-host order (BE on an LE platform, LE on a BE one).
  */
-bool IsGoodIP( uint32 IP, bool filterLAN ) noexcept;
-
+bool IsGoodIP(uint32 IP, bool filterLAN) noexcept;
 
 inline bool IsGoodIPPort(uint32 nIP, uint16 nPort) noexcept
 {
-	return IsGoodIP(nIP, true) && nPort!=0;
+	return IsGoodIP(nIP, true) && nPort != 0;
 }
 
-#define HIGHEST_LOWID_ED2K_KAD		16777216
-
+#define HIGHEST_LOWID_ED2K_KAD 16777216
 
 inline bool IsLowID(uint32 id)
 {
 	return (id < HIGHEST_LOWID_ED2K_KAD);
 }
 
-
 /**
- * Checks for LAN IPs.
- *
- * @param ip The IP-address to check.
- * @return True if it was a LAN IP, false otherwise.
- *
- * @note IP must be in anti-host order.
+ * True if @a ip is a LAN address. Anti-host order.
  */
 bool IsLanIP(uint32_t ip) noexcept;
 
-
 /**
- * Checks for the IPv4 loopback range 127.0.0.0/8.
- *
- * @param ip The IP-address to check (anti-host order, same convention as
- *           StringIPtoUint32 and IsLanIP).
- * @return True if it is a loopback address.
+ * True if @a ip is in the IPv4 loopback range 127.0.0.0/8. Anti-host order, the same convention as
+ * StringIPtoUint32 and IsLanIP.
  */
 bool IsLoopbackIP(uint32_t ip) noexcept;
 
-
 /**
- * Checks for the IPv4 link-local range 169.254.0.0/16 (RFC3927 / zeroconf).
- *
- * @param ip The IP-address to check (anti-host order).
- * @return True if it is a link-local address.
+ * True if @a ip is in the IPv4 link-local range 169.254.0.0/16 (RFC3927 / zeroconf). Anti-host
+ * order.
  */
 bool IsLinkLocalIP(uint32_t ip) noexcept;

amule-3.1.0.tar.gz/src/NetworkInterfaces.cpp Added

@@ -0,0 +1,264 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "NetworkInterfaces.h"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <utility>
+
+#ifdef __WINDOWS__
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <iphlpapi.h>
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <ifaddrs.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <arpa/inet.h> // inet_ntop
+#include <unistd.h>    // close() for the per-address flag probe
+// Every POSIX target other than Linux that this project builds for keeps the per-address IPv6 flags
+// behind SIOCGIFAFLAG_IN6 instead of a /proc file. The header is BSD-family only, so it is reached
+// by name rather than by "not Linux", which would break the first time somebody builds on Solaris.
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
+	defined(__DragonFly__)
+#include <sys/ioctl.h>
+#include <netinet6/in6_var.h> // SIOCGIFAFLAG_IN6 / IN6_IFF_TENTATIVE
+#endif
+#endif
+
+namespace
+{
+
+typedef std::array<std::uint8_t, 16> Ipv6Bytes;
+
+#if !defined(__WINDOWS__) && defined(__linux__)
+
+//! IFA_F_TENTATIVE, spelled out rather than pulled from <linux/if_addr.h>: that header is not
+//! reliably reachable from userspace across the libc implementations this project builds against,
+//! and the value is ABI-stable.
+const unsigned int LINUX_IFA_F_TENTATIVE = 0x40;
+
+/**
+ * Per-address IPv6 flags, as the kernel reports them.
+ *
+ * getifaddrs() lists which IPv6 addresses exist but not what state each one is in, and on Linux
+ * this file is the only place the flags are exposed. Without it an address still running duplicate
+ * address detection is indistinguishable from a finished one.
+ *
+ * An address missing from this list is treated as flagless rather than skipped: a container or a
+ * stripped-down root may not mount /proc, and losing the whole enumeration there would be worse
+ * than losing the DAD distinction.
+ */
+std::vector<std::pair<Ipv6Bytes, unsigned int>> ReadIfInet6Flags()
+{
+	std::vector<std::pair<Ipv6Bytes, unsigned int>> result;
+
+	std::FILE *file = std::fopen("/proc/net/if_inet6", "r");
+	if (file == nullptr) {
+		return result;
+	}
+
+	// One line per address: 32 hex digits, then index, prefix length, scope
+	// and flags in hex, then the device name.
+	char address40 = { 0 };
+	char device64 = { 0 };
+	unsigned int index = 0;
+	unsigned int prefix = 0;
+	unsigned int scope = 0;
+	unsigned int flags = 0;
+	while (std::fscanf(file, "%39s %x %x %x %x %63s", address, &index, &prefix, &scope, &flags, device) ==
+		6) {
+		if (std::strlen(address) != 32) {
+			continue;
+		}
+		Ipv6Bytes bytes = {};
+		bool parsed = true;
+		for (std::size_t i = 0; i < bytes.size() && parsed; ++i) {
+			char octet3 = { addressi * 2, addressi * 2 + 1, '\0' };
+			char *end = nullptr;
+			const unsigned long value = std::strtoul(octet, &end, 16);
+			if (end != octet + 2) {
+				parsed = false;
+				break;
+			}
+			bytesi = static_cast<std::uint8_t>(value);
+		}
+		if (parsed) {
+			result.emplace_back(bytes, flags);
+		}
+	}
+
+	std::fclose(file);
+	return result;
+}
+
+#endif // !__WINDOWS__ && __linux__
+
+} // namespace
+
+std::vector<NetworkInterface> DetectNetworkInterfaces()
+{
+	std::vector<NetworkInterface> result;
+
+	// Find the entry for @a name, appending one if this is the first time we have seen it.
+	// Needed because the POSIX enumeration lists one node per address family, so a dual-stack
+	// interface appears more than once.
+	auto entryFor = &result(const wxString &name) -> NetworkInterface & {
+		for (NetworkInterface &iface : result) {
+			if (iface.name == name) {
+				return iface;
+			}
+		}
+		result.emplace_back();
+		result.back().name = name;
+		return result.back();
+	};
+
+#ifdef __WINDOWS__
+	ULONG size = 15000;
+	std::vector<uint8_t> buf(size);
+	// Unicast addresses are deliberately NOT skipped here: they are what
+	// fills the "bind to IP" drop-down.
+	const ULONG flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER;
+	PIP_ADAPTER_ADDRESSES aa = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(&buf0);
+	ULONG ret = ::GetAdaptersAddresses(AF_UNSPEC, flags, nullptr, aa, &size);
+	if (ret == ERROR_BUFFER_OVERFLOW) {
+		buf.resize(size);
+		aa = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(&buf0);
+		ret = ::GetAdaptersAddresses(AF_UNSPEC, flags, nullptr, aa, &size);
+	}
+	if (ret == NO_ERROR) {
+		for (PIP_ADAPTER_ADDRESSES p = aa; p != nullptr; p = p->Next) {
+			if (p->IfType == IF_TYPE_SOFTWARE_LOOPBACK || p->FriendlyName == nullptr) {
+				continue;
+			}
+			NetworkInterface &iface = entryFor(wxString(p->FriendlyName));
+			// An IPv6-only adapter reports its index in Ipv6IfIndex and
+			// leaves IfIndex zero, so both have to be consulted.
+			if (iface.index == 0) {
+				iface.index = p->IfIndex != 0 ? p->IfIndex : p->Ipv6IfIndex;
+			}
+			for (PIP_ADAPTER_UNICAST_ADDRESS ua = p->FirstUnicastAddress; ua != nullptr;
+				ua = ua->Next) {
+				const sockaddr *sa = ua->Address.lpSockaddr;
+				if (sa == nullptr) {
+					continue;
+				}
+				if (sa->sa_family == AF_INET) {
+					char textINET_ADDRSTRLEN = { 0 };
+					const sockaddr_in *sin = reinterpret_cast<const sockaddr_in *>(sa);
+					if (::inet_ntop(AF_INET, &sin->sin_addr, text, sizeof(text)) !=
+						nullptr) {
+						iface.ipv4.Add(wxString::FromUTF8(text));
+					}
+				} else if (sa->sa_family == AF_INET6) {
+					// Anything but Preferred is an address we cannot claim:
+					// Tentative is still in duplicate address detection,
+					// Duplicate lost it, Invalid and Deprecated are on their
+					// way out.
+					if (ua->DadState != IpDadStatePreferred) {
+						continue;
+					}
+					const sockaddr_in6 *sin6 = reinterpret_cast<const sockaddr_in6 *>(sa);
+					Ipv6Bytes bytes = {};
+					std::memcpy(bytes.data(), &sin6->sin6_addr, bytes.size());
+					iface.ipv6.push_back(bytes);
+				}
+			}
+		}
+	}
+#else
+	struct ifaddrs *ifaces = nullptr;
+	if (getifaddrs(&ifaces) == 0) {
+#ifdef __linux__
+		const std::vector<std::pair<Ipv6Bytes, unsigned int>> inet6Flags = ReadIfInet6Flags();
+#elif defined(SIOCGIFAFLAG_IN6)
+		// One socket for the whole walk: the ioctl needs a handle of the right family, and
+		// opening one per address would turn an enumeration into a syscall storm.
+		const int flagSocket = ::socket(AF_INET6, SOCK_DGRAM, 0);
+#endif
+		for (struct ifaddrs *p = ifaces; p != nullptr; p = p->ifa_next) {
+			if (p->ifa_name == nullptr || (p->ifa_flags & IFF_LOOPBACK)) {
+				continue;
+			}
+			NetworkInterface &iface = entryFor(wxString::FromUTF8(p->ifa_name));
+			if (iface.index == 0) {
+				iface.index = ::if_nametoindex(p->ifa_name);
+			}
+			if (p->ifa_addr == nullptr) {
+				continue;
+			}
+			if (p->ifa_addr->sa_family == AF_INET) {
+				char textINET_ADDRSTRLEN = { 0 };
+				const sockaddr_in *sin = reinterpret_cast<const sockaddr_in *>(p->ifa_addr);
+				if (::inet_ntop(AF_INET, &sin->sin_addr, text, sizeof(text)) != nullptr) {
+					iface.ipv4.Add(wxString::FromUTF8(text));
+				}
+			} else if (p->ifa_addr->sa_family == AF_INET6) {
+				const sockaddr_in6 *sin6 =
+					reinterpret_cast<const sockaddr_in6 *>(p->ifa_addr);
+				Ipv6Bytes bytes = {};
+				std::memcpy(bytes.data(), &sin6->sin6_addr, bytes.size());
+#ifdef __linux__
+				bool tentative = false;
+				for (const auto &entry : inet6Flags) {
+					if (entry.first == bytes) {
+						tentative = (entry.second & LINUX_IFA_F_TENTATIVE) != 0;
+						break;
+					}
+				}
+				if (tentative) {
+					continue;
+				}
+#elif defined(SIOCGIFAFLAG_IN6)
+				if (flagSocket >= 0) {
+					struct in6_ifreq request;
+					std::memset(&request, 0, sizeof(request));
+					std::strncpy(
+						request.ifr_name, p->ifa_name, sizeof(request.ifr_name) - 1);
+					std::memcpy(&request.ifr_addr, sin6, sizeof(request.ifr_addr));
+					if (::ioctl(flagSocket, SIOCGIFAFLAG_IN6, &request) == 0 &&
+						(request.ifr_ifru.ifru_flags6 &
+							(IN6_IFF_TENTATIVE | IN6_IFF_DUPLICATED)) != 0) {
+						continue;
+					}
+				}
+#endif
+				iface.ipv6.push_back(bytes);
+			}
+		}
+#if !defined(__linux__) && defined(SIOCGIFAFLAG_IN6)
+		if (flagSocket >= 0) {
+			::close(flagSocket);
+		}
+#endif
+		freeifaddrs(ifaces);
+	}
+#endif
+	return result;
+}

amule-3.1.0.tar.gz/src/NetworkInterfaces.h Added

@@ -0,0 +1,75 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 NETWORKINTERFACES_H
+#define NETWORKINTERFACES_H
+
+#include <array>
+#include <cstdint>
+#include <vector>
+
+#include <wx/arrstr.h>
+#include <wx/string.h>
+
+/**
+ * One of this machine's network interfaces, with the addresses assigned to it.
+ *
+ * Name and addresses arrive together from the platform APIs, so they are reported together:
+ * splitting them would mean walking the interface list twice and risking two different answers.
+ */
+struct NetworkInterface
+{
+	//! Exactly what goes into the "bind to interface" preference and is later resolved back to
+	//! an index in LibSocketAsio.cpp: a POSIX interface name (en0, eth0, tun0) or, on Windows,
+	//! an adapter friendly name (Ethernet, Wi-Fi).
+	wxString name;
+
+	//! The OS interface index, or 0 when the platform did not report one. Windows adapter
+	//! friendly names cannot be fed to if_nametoindex(), which wants the GUID-style name, so
+	//! the index has to come out of the same enumeration that produced the friendly name.
+	unsigned int index = 0;
+
+	//! Assigned IPv4 addresses, printable, for the "bind to IP" drop-downs.
+	wxArrayString ipv4;
+
+	//! Assigned IPv6 addresses, 16 bytes each, big-endian as they travel on the wire. Addresses
+	//! still running duplicate address detection are excluded: until DAD finishes the address
+	//! may belong to somebody else on the link, which is the case DAD exists to catch.
+	std::vector<std::array<std::uint8_t, 16>> ipv6;
+};
+
+/**
+ * Enumerate this machine's usable network interfaces.
+ *
+ * Loopback is skipped; callers that want 127.0.0.1 offer it unconditionally rather than only when
+ * the loopback interface happens to enumerate. An interface that is down right now -- a VPN tunnel,
+ * a laptop on another network -- simply does not appear, which is why the preference controls stay
+ * editable rather than being restricted to this list.
+ *
+ * Walks the interface list on every call. Callers on a path a remote peer can drive must cache the
+ * result instead of calling it per event.
+ */
+std::vector<NetworkInterface> DetectNetworkInterfaces();
+
+#endif // NETWORKINTERFACES_H

amule-3.0.1.tar.gz/src/OScopeCtrl.cpp -> amule-3.1.0.tar.gz/src/OScopeCtrl.cpp Changed

@@ -23,520 +23,602 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include <algorithm>
 #include <cmath>
-#include <wx/dcmemory.h>
-#include <wx/dcclient.h>
+#include <memory>
 #include <wx/dcbuffer.h>
+#include <wx/dcclient.h>
+#include <wx/geometry.h> // Needed for wxPoint2DDouble
+#if wxUSE_GRAPHICS_CONTEXT
+#include <wx/graphics.h>
+#endif
 
 #include <common/Format.h>
 
-#include "amule.h"		// Needed for theApp
-#include "amuleDlg.h"		// Needed for CamuleDlg
-#include "Logger.h"		// Needed for AddLogLineM
-#include "OScopeCtrl.h"		// Interface declarations
-#include "OtherFunctions.h"	// Needed for CastSecondsToHM
+#include "amule.h"          // Needed for theApp
+#include "OScopeCtrl.h"     // Interface declarations
+#include "OtherFunctions.h" // Needed for CastSecondsToHM
 #include "Statistics.h"
 
-
-wxBEGIN_EVENT_TABLE(COScopeCtrl,wxControl)
+wxBEGIN_EVENT_TABLE(COScopeCtrl, wxControl)
 	EVT_PAINT(COScopeCtrl::OnPaint)
 	EVT_SIZE(COScopeCtrl::OnSize)
+	EVT_MOTION(COScopeCtrl::OnMouseMove)
+	EVT_LEAVE_WINDOW(COScopeCtrl::OnMouseLeave)
 wxEND_EVENT_TABLE()
 
-
-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)
+namespace
 {
-	// since plotting is based on a LineTo for each new point
-	// we need a starting point (i.e. a "previous" point)
-	// use 0.0 as the default first point.
-	// these are public member variables, and can be changed outside
-	// (after construction).
-
-	// G.Hayduk: NTrends is the number of trends that will be drawn on
-	// the plot. First 15 plots have predefined colors, but others will
-	// be drawn with white, unless you call SetPlotColor
-	nTrends = cntTrends;
-	pdsTrends = new PlotData_tnTrends;
-
-	PlotData_t* ppds = pdsTrends;
-	for(unsigned i=0; i<nTrends; ++i, ++ppds){
-		ppds->crPlot = (i<15 ? crPreseti : *wxWHITE);
-		ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxPENSTYLE_SOLID));
-		ppds->fPrev = ppds->fLowerLimit = ppds->fUpperLimit = 0.0;
-	}
-
-	bRecreateGraph = bRecreateGrid = bRecreateAll = bStopped = false;
-	m_onPaint = false;
-	nDelayedPoints = 0;
-	sLastTimestamp = 0.0;
-	sLastPeriod = 1.0;
-	nShiftPixels = 1;
-	nYDecimals = nDecimals;
-	m_bgColour  = wxColour(  0,   0,   0) ;  // see also SetBackgroundColor
-	m_gridColour  = wxColour(  0, 255, 255) ;  // see also SetGridColor
-	brushBack = *wxBLACK_BRUSH;
-
-	strXUnits = "X";  // can also be set with SetXUnits
-	strYUnits = "Y";  // can also be set with SetYUnits
-
-	nXGrids = 6;
-	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());
-}
+// CStatistics::GetHistory always writes three arrays, whatever the caller
+// asked to plot, so the buffers handed to it are never shorter than this.
+const unsigned kHistoryTrends = 3;
+
+// Trend whose area is shaded. GetHistory puts the instantaneous value in the third array, the spiky
+// curve that shades well; the other two are averages that would shade as near-solid blocks.
+const unsigned kShadedTrend = 2;
 
+// Alpha of the shading where it meets its curve. It fades to nothing at
+// the bottom of the plot.
+const unsigned char kShadeAlpha = 0x48;
 
-COScopeCtrl::~COScopeCtrl()
+// Ink for text drawn over the graph background, which the user chooses.
+wxColour ContrastInk(const wxColour &bg)
 {
-	delete  pdsTrends;
+	const double luma = 0.299 * bg.Red() + 0.587 * bg.Green() + 0.114 * bg.Blue();
+	return luma < 128.0 ? wxColour(0xF0, 0xF0, 0xF0) : wxColour(0x20, 0x20, 0x20);
 }
 
+// G.Hayduk: the first 15 trends have predefined colours, further ones are drawn in white unless
+// SetPlotColor is called. In practice every graph overrides all of its colours from the preferences
+// during Init().
+const wxColour crPreset16 = { 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) };
+} // namespace
+
+COScopeCtrl::COScopeCtrl(int cntTrends, int nDecimals, StatsGraphType type, wxWindow *parent)
+: wxControl(parent, -1, wxDefaultPosition, wxDefaultSize)
+, graph_type(type)
+, m_trends(std::max<unsigned>((unsigned)cntTrends, 1))
+, m_nYGrids(5)
+, m_nShiftPixels(1)
+, m_nYDecimals((unsigned)nDecimals)
+, m_bgColour(0, 0, 0)       // see also SetBackgroundColor
+, m_gridColour(0, 255, 255) // see also SetGridColor
+, m_bStopped(false)
+, m_sLastTimestamp(0.0)
+, m_sLastPeriod(1.0)
+, m_ptHover(wxDefaultPosition)
+{
+	for (unsigned i = 0; i < m_trends.size(); ++i) {
+		m_trendsi.crPlot = (i < 15 ? crPreseti : *wxWHITE);
+		m_trendsi.fLowerLimit = m_trendsi.fUpperLimit = 0.0;
+	}
+
+	SetCursor(wxCursor(wxCURSOR_CROSS));
+
+	m_strYUnits = "Y"; // can also be set with SetYUnits
+
+	// Everything inside the client area is painted by OnPaint.
+	SetBackgroundStyle(wxBG_STYLE_PAINT);
+}
 
 void COScopeCtrl::SetRange(float fLower, float fUpper, unsigned iTrend)
 {
-	PlotData_t* ppds = pdsTrends+iTrend;
-	if ((ppds->fLowerLimit == fLower) && (ppds->fUpperLimit == fUpper))
+	if (iTrend >= m_trends.size()) {
+		return;
+	}
+	PlotData_t &trend = m_trendsiTrend;
+	if (trend.fLowerLimit == fLower && trend.fUpperLimit == fUpper) {
 		return;
-	ppds->fLowerLimit = fLower;
-	ppds->fUpperLimit = fUpper;
-	ppds->fVertScale = (float)m_rectPlot.GetHeight() / (fUpper-fLower);
-	ppds->yPrev = GetPlotY(ppds->fPrev, ppds);
-
-	if (iTrend == 0) {
-		InvalidateCtrl();
-	} else {
-		InvalidateGraph();
 	}
+	trend.fLowerLimit = fLower;
+	trend.fUpperLimit = fUpper;
+	Refresh(false);
 }
 
-
 void COScopeCtrl::SetRanges(float fLower, float fUpper)
 {
-	for (unsigned iTrend = 0; iTrend < nTrends; ++iTrend) {
+	for (unsigned iTrend = 0; iTrend < m_trends.size(); ++iTrend) {
 		SetRange(fLower, fUpper, iTrend);
 	}
 }
 
-
-void COScopeCtrl::SetYUnits(const wxString& strUnits, const wxString& strMin, const wxString& strMax)
+void COScopeCtrl::SetYUnits(const wxString &strUnits, const wxString &strMin, const wxString &strMax)
 {
-	strYUnits = strUnits;
-	strYMin = strMin;
-	strYMax = strMax;
-	InvalidateGrid();
+	m_strYUnits = strUnits;
+	m_strYMin = strMin;
+	m_strYMax = strMax;
+	Refresh(false);
 }
 
-
-void COScopeCtrl::SetGridColor(const wxColour& cr)
+void COScopeCtrl::SetGridColor(const wxColour &cr)
 {
-
 	if (cr == m_gridColour) {
 		return;
 	}
-
 	m_gridColour = cr;
-	InvalidateGrid() ;
+	Refresh(false);
 }
 
-
-void COScopeCtrl::SetPlotColor(const wxColour& cr, unsigned iTrend)
+void COScopeCtrl::SetPlotColor(const wxColour &cr, unsigned iTrend)
 {
-	PlotData_t* ppds = pdsTrends+iTrend;
-	if (ppds->crPlot == cr)
+	if (iTrend >= m_trends.size() || m_trendsiTrend.crPlot == cr) {
 		return;
-	ppds->crPlot = cr;
-	ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxPENSTYLE_SOLID));
-	InvalidateGraph();
+	}
+	m_trendsiTrend.crPlot = cr;
+	Refresh(false);
 }
 
-
-void COScopeCtrl::SetBackgroundColor(const wxColour& cr)
+void COScopeCtrl::SetTrendLabel(const wxString &label, unsigned iTrend)
 {
-
-	if (m_bgColour == cr) {
+	if (iTrend >= m_trends.size()) {
 		return;
 	}
-
-	m_bgColour = cr;
-	brushBack= *(wxTheBrushList->FindOrCreateBrush(cr, wxBRUSHSTYLE_SOLID));
-	InvalidateCtrl() ;
+	m_trendsiTrend.strLabel = label;
 }
 
-
-void COScopeCtrl::RecreateGrid()
+void COScopeCtrl::SetBackgroundColor(const wxColour &cr)
 {
-	// There is a lot of drawing going on here - particularly in terms of
-	// drawing the grid.  Don't panic, this is all being drawn (only once)
-	// to a bitmap.  The result is then BitBlt'd to the control whenever needed.
-	bRecreateGrid = false;
-	if (m_rectClient.GetWidth() == 0 || m_rectClient.GetHeight() == 0) {
+	if (cr == m_bgColour) {
 		return;
 	}
+	m_bgColour = cr;
+	Refresh(false);
+}
 
-	wxMemoryDC dcGrid(m_bmapGrid);
-
-	wxPen solidPen = *(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxPENSTYLE_SOLID));
-	wxString strTemp;
-
-	// fill the grid background
-	dcGrid.SetBrush(brushBack);
-	dcGrid.SetPen(*wxTRANSPARENT_PEN);
-	dcGrid.DrawRectangle(m_rectClient);
+void COScopeCtrl::AppendPoints(double sTimestamp)
+{
+	// The sample is already in CStatistics' history by now, and the next paint reads it back
+	// from there, so there is nothing to accumulate -- just ask for that paint.
+	m_sLastTimestamp = sTimestamp;
+	Refresh(false);
+}
 
-	// adjust the plot rectangle dimensions
-	// assume 6 pixels per character (this may need to be adjusted)
-	m_rectPlot.x	= m_rectClient.GetLeft() + 6*7+4;
-	// draw the plot rectangle
-	dcGrid.SetPen(solidPen);
-	dcGrid.DrawRectangle(m_rectPlot.x - 1, m_rectPlot.y - 1, m_rectPlot.GetWidth() + 2, m_rectPlot.GetHeight() + 2);
-	dcGrid.SetPen(wxNullPen);
+void COScopeCtrl::Reset(double sNewPeriod)
+{
+	const bool bWasStopped = m_bStopped;
+	m_bStopped = false;
+	if (m_sLastPeriod != sNewPeriod || bWasStopped) {
+		m_sLastPeriod = sNewPeriod;
+		Refresh(false);
+	}
+}
 
-	// create some fonts (horizontal and vertical)
-	wxFont axisFont(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false);
-	dcGrid.SetFont(axisFont);
+void COScopeCtrl::Stop()
+{
+	m_bStopped = true;
+	Refresh(false);
+}
 
-	// y max
-	dcGrid.SetTextForeground(m_gridColour);
-	if( strYMax.IsEmpty() ) {
-		strTemp = wxString::Format("%.*f", nYDecimals, pdsTrends 0 .fUpperLimit);
-	} else {
-		strTemp = strYMax;
-	}
-	wxCoord sizX,sizY;
-	dcGrid.GetTextExtent(strTemp,&sizX,&sizY);
-	dcGrid.DrawText(strTemp,m_rectPlot.GetLeft()-4-sizX,m_rectPlot.GetTop()-7);
-	// y min
-	if( strYMin.IsEmpty() ) {
-		strTemp = wxString::Format("%.*f", nYDecimals, pdsTrends 0 .fLowerLimit) ;
-	} else {
-		strTemp = strYMin;
+wxString COScopeCtrl::GetYMaxLabel() const
+{
+	if (!m_strYMax.IsEmpty()) {
+		return m_strYMax;
 	}
-	dcGrid.GetTextExtent(strTemp,&sizX,&sizY);
-	dcGrid.DrawText(strTemp,m_rectPlot.GetLeft()-4-sizX, m_rectPlot.GetBottom());
+	return wxString::Format("%.*f", (int)m_nYDecimals, m_trends0.fUpperLimit);
+}
 
-	// x units
-	strTemp = CastSecondsToHM((m_rectPlot.GetWidth()/nShiftPixels) * (int)floor(sLastPeriod+0.5));
-		// floor(x + 0.5) is a way of doing round(x) that works with gcc < 3 ...
-	if (bStopped) {
-		strXUnits = CFormat( _("Disabled %s") ) % strTemp;
-	} else {
-		strXUnits = strTemp;
+wxString COScopeCtrl::GetYMinLabel() const
+{
+	if (!m_strYMin.IsEmpty()) {
+		return m_strYMin;
 	}
+	return wxString::Format("%.*f", (int)m_nYDecimals, m_trends0.fLowerLimit);
+}
 
-	dcGrid.GetTextExtent(strXUnits,&sizX,&sizY);
-	dcGrid.DrawText(strXUnits,(m_rectPlot.GetLeft() + m_rectPlot.GetRight())/2-sizX/2,m_rectPlot.GetBottom()+4);
+wxString COScopeCtrl::GetXUnitsLabel(const wxRect &rectPlot) const
+{
+	// floor(x + 0.5) rounds the period to whole seconds.
+	const uint32 sSpan =
+		(uint32)(rectPlot.GetWidth() / m_nShiftPixels) * (uint32)std::floor(m_sLastPeriod + 0.5);
+	const wxString strSpan = CastSecondsToHM(sSpan);
 
-	// y units
-	if (!strYUnits.IsEmpty()) {
-		dcGrid.GetTextExtent(strYUnits,&sizX,&sizY);
-		dcGrid.DrawText(strYUnits, m_rectPlot.GetLeft()-4-sizX, (m_rectPlot.GetTop()+m_rectPlot.GetBottom())/2-sizY/2);
+	if (m_bStopped) {
+		return CFormat(_("Disabled %s")) % strSpan;
 	}
-	// no more drawing to this bitmap is needed until the setting are changed
+	return strSpan;
+}
 
-	if (bRecreateGraph) {
-		RecreateGraph(false);
+wxRect COScopeCtrl::ComputePlotRect(wxDC &dc) const
+{
+	const wxRect rectClient = GetClientRect();
+	const int pad = FromDIP(4);
+	const int lineHeight = dc.GetCharHeight();
+
+	// The left gutter has to hold whichever of the three y axis labels is widest. The old code
+	// assumed 6 pixels per character and reserved room for seven: too much at small values, too
+	// little past five digits.
+	int gutter = std::max(dc.GetTextExtent(GetYMaxLabel()).x, dc.GetTextExtent(GetYMinLabel()).x);
+	if (!m_strYUnits.IsEmpty()) {
+		gutter = std::max(gutter, dc.GetTextExtent(m_strYUnits).x);
 	}
 
-	// finally, force the plot area to redraw
-	Refresh(false);
+	wxRect rectPlot;
+	rectPlot.x = rectClient.GetLeft() + gutter + 2 * pad;
+	rectPlot.y = rectClient.GetTop() + lineHeight / 2 + pad;
+	rectPlot.SetRight(rectClient.GetRight() - 2 * pad);
+	rectPlot.SetBottom(rectClient.GetBottom() - lineHeight - 2 * pad);
+	return rectPlot;
 }
 
-
-void COScopeCtrl::AppendPoints(double sTimestamp, const std::vector<float *> &apf)
+void COScopeCtrl::DrawGrid(wxDC &dc, const wxRect &rectPlot)
 {
-	sLastTimestamp = sTimestamp;
-
-	if (nDelayedPoints) {
-		// Ensures that delayed points get added before the new point.
-		// We do this by simply drawing the history up to and including
-		// the new point.
-		int n = std::min(m_rectPlot.GetWidth(), nDelayedPoints + 1);
-		nDelayedPoints = 0;
-		PlotHistory(n, true, false);
-	} else {
-		ShiftGraph(1);
-		DrawPoints(apf, 1);
+	const int pad = FromDIP(4);
+
+	// Frame, just outside the plot area so it never overlaps a curve.
+	wxRect rectFrame = rectPlot;
+	rectFrame.Inflate(1, 1);
+	dc.SetPen(wxPen(m_gridColour, 1));
+	dc.SetBrush(*wxTRANSPARENT_BRUSH);
+	dc.DrawRectangle(rectFrame);
+
+	// Horizontal rules. Kept on the plain wxDC rather than the graphics context on purpose:
+	// these are axis-aligned hairlines and stay crisp only if they are not anti-aliased.
+	dc.SetPen(wxPen(m_gridColour, 1, wxPENSTYLE_LONG_DASH));
+	for (unsigned j = 1; j <= m_nYGrids; ++j) {
+		const int y = rectPlot.GetTop() + (int)((unsigned)rectPlot.GetHeight() * j / (m_nYGrids + 1));
+		dc.DrawLine(rectPlot.GetLeft(), y, rectPlot.GetRight(), y);
 	}
 
-	Refresh(false);
-}
+	dc.SetTextForeground(m_gridColour);
 
+	wxString label = GetYMaxLabel();
+	wxSize extent = dc.GetTextExtent(label);
+	dc.DrawText(label, rectPlot.GetLeft() - pad - extent.x, rectPlot.GetTop() - extent.y / 2);
 
-void COScopeCtrl::OnPaint(wxPaintEvent& WXUNUSED(evt))
-{
-	m_onPaint = true;
+	label = GetYMinLabel();
+	extent = dc.GetTextExtent(label);
+	dc.DrawText(label, rectPlot.GetLeft() - pad - extent.x, rectPlot.GetBottom() - extent.y / 2);
 
-	// 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
-	wxBufferedPaintDC dc(this);
+	if (!m_strYUnits.IsEmpty()) {
+		extent = dc.GetTextExtent(m_strYUnits);
+		dc.DrawText(m_strYUnits,
+			rectPlot.GetLeft() - pad - extent.x,
+			(rectPlot.GetTop() + rectPlot.GetBottom() - extent.y) / 2);
+	}
+
+	label = GetXUnitsLabel(rectPlot);
+	extent = dc.GetTextExtent(label);
+	dc.DrawText(
+		label, (rectPlot.GetLeft() + rectPlot.GetRight() - extent.x) / 2, rectPlot.GetBottom() + pad);
+}
 
-	if (bRecreateAll) {
+void COScopeCtrl::DrawCurves(wxDC &dc, wxGraphicsContext *gc, const wxRect &rectPlot)
+{
+	// A paint can reach us before the application has finished starting up.
+	if (theApp == nullptr || theApp->m_statistics == nullptr) {
 		return;
 	}
 
-	if (bRecreateGrid) {
-		RecreateGrid();  // this will also recreate the graph if that flag is set
-	} else if (bRecreateGraph) {
-		RecreateGraph(true);
+	const unsigned cntPoints = (unsigned)rectPlot.GetWidth() / m_nShiftPixels + 1;
+	const unsigned cntTrends = std::max<unsigned>((unsigned)m_trends.size(), kHistoryTrends);
+
+	std::vector<std::vector<float>> samples(cntTrends, std::vector<float>(cntPoints, 0.0f));
+	std::vector<float *> apf(cntTrends);
+	for (unsigned i = 0; i < cntTrends; ++i) {
+		apfi = samplesi.data();
 	}
 
-	if (nDelayedPoints) {				// we've just come out of hiding, so catch up
-		int n = std::min(m_rectPlot.GetWidth(), nDelayedPoints);
-		nDelayedPoints = 0;				// (this is more efficient than plotting in the
-		PlotHistory(n, true, false);	// background because the bitmap is shifted only
-	}									// once for all delayed points together)
+	// A stopped graph keeps showing the window that ended with the last
+	// sample it saw instead of sliding towards the present.
+	const double sFinal = m_bStopped ? m_sLastTimestamp : -1.0;
+	const unsigned cntFilled =
+		theApp->m_statistics->GetHistory(cntPoints, m_sLastPeriod, sFinal, apf, graph_type);
+	if (cntFilled < 2) {
+		return;
+	}
 
-	// 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);
+	// GetHistory returns the samples newest first, so index 0 is the point
+	// at the right hand edge and the curve is walked leftwards from there.
+	const double lineWidth = FromDIP(3) / 2.0;
+	auto xAt = &(unsigned i) { return rectPlot.GetRight() - (double)i * m_nShiftPixels; };
+
+#if wxUSE_GRAPHICS_CONTEXT
+	if (gc) {
+		gc->SetAntialiasMode(wxANTIALIAS_DEFAULT);
+		gc->Clip(rectPlot.x, rectPlot.y, rectPlot.GetWidth(), rectPlot.GetHeight());
+
+		// Shading first, so every curve stays legible on top of it.
+		if (IsShaded()) {
+			wxGraphicsPath area = gc->CreatePath();
+			area.MoveToPoint(xAt(0), rectPlot.GetBottom());
+			for (unsigned i = 0; i < cntFilled; ++i) {
+				area.AddLineToPoint(xAt(i),
+					GetPlotY(sampleskShadedTrendi, m_trendskShadedTrend, rectPlot));
+			}
+			area.AddLineToPoint(xAt(cntFilled - 1), rectPlot.GetBottom());
+			area.CloseSubpath();
+
+			// Anchor the gradient to the curve's own peak, not to the top of the plot:
+			// that would tie the shading's opacity to how much of the y range the graph
+			// happens to use. The Kad graph grows its range to fit, so its curve rides
+			// near the top and shades fine, while a transfer rate well under the
+			// configured maximum sits low, where a plot-anchored gradient has already
+			// faded to nothing.
+			double yPeak = rectPlot.GetBottom();
+			for (unsigned i = 0; i < cntFilled; ++i) {
+				yPeak = std::min(yPeak,
+					GetPlotY(sampleskShadedTrendi, m_trendskShadedTrend, rectPlot));
+			}
 
-	// Overwrites the plot section of the image
-	dc.DrawBitmap(m_bmapPlot, m_rectPlot.x, m_rectPlot.y, false);
+			const wxColour &cr = m_trendskShadedTrend.crPlot;
+			if (yPeak < rectPlot.GetBottom() - 1.0) {
+				gc->SetBrush(gc->CreateLinearGradientBrush(0.0,
+					yPeak,
+					0.0,
+					rectPlot.GetBottom(),
+					wxColour(cr.Red(), cr.Green(), cr.Blue(), kShadeAlpha),
+					wxColour(cr.Red(), cr.Green(), cr.Blue(), wxALPHA_TRANSPARENT)));
+			} else {
+				// Curve flat on the baseline: nothing to grade over.
+				gc->SetBrush(wxBrush(wxColour(cr.Red(), cr.Green(), cr.Blue(), kShadeAlpha)));
+			}
+			gc->SetPen(*wxTRANSPARENT_PEN);
+			gc->FillPath(area);
+		}
 
-	// draw the dotted lines.
-	// This is done last because wxMAC doesn't support the wxOR logical
-	// operation, preventing us from simply blitting the plot on top of
-	// the grid bitmap.
+		for (unsigned iTrend = 0; iTrend < m_trends.size(); ++iTrend) {
+			wxGraphicsPath path = gc->CreatePath();
+			path.MoveToPoint(xAt(0), GetPlotY(samplesiTrend0, m_trendsiTrend, rectPlot));
+			for (unsigned i = 1; i < cntFilled; ++i) {
+				path.AddLineToPoint(
+					xAt(i), GetPlotY(samplesiTrendi, m_trendsiTrend, rectPlot));
+			}
 
-	dc.SetPen(*(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxPENSTYLE_LONG_DASH)));
-	for (unsigned j = 1; j < (nYGrids + 1); ++j) {
-		unsigned GridPos = (m_rectPlot.GetHeight())*j/( nYGrids + 1 ) + m_rectPlot.GetTop();
+			gc->SetPen(gc->CreatePen(wxGraphicsPenInfo(m_trendsiTrend.crPlot, lineWidth)
+							 .Join(wxJOIN_ROUND)
+							 .Cap(wxCAP_ROUND)));
+			gc->StrokePath(path);
+		}
 
-		dc.DrawLine(m_rectPlot.GetLeft(), GridPos, m_rectPlot.GetRight(), GridPos);
+		gc->ResetClip();
+		DrawHover(gc, rectPlot, samples, cntFilled);
+		return;
+	}
+#else
+	(void)gc;
+#endif
+
+	// Fallback for a wxWidgets built without a graphics context: aliased
+	// hairlines, i.e. what the graphs looked like before this renderer.
+	dc.SetClippingRegion(rectPlot);
+	std::vector<wxPoint> points(cntFilled);
+	for (unsigned iTrend = 0; iTrend < m_trends.size(); ++iTrend) {
+		for (unsigned i = 0; i < cntFilled; ++i) {
+			pointsi = wxPoint(
+				(int)xAt(i), (int)GetPlotY(samplesiTrendi, m_trendsiTrend, rectPlot));
+		}
+		dc.SetPen(wxPen(m_trendsiTrend.crPlot, 1));
+		dc.DrawLines((int)cntFilled, points.data());
 	}
+	dc.DestroyClippingRegion();
 }
 
-
-void COScopeCtrl::OnSize(wxSizeEvent& WXUNUSED(evt))
+wxString COScopeCtrl::FormatValue(float value) const
 {
-	// This gets called repeatedly as the user resizes the app;
-	// we use the timer mechanism through InvalidateCtrl to avoid unnecessary redrawing
-	// NOTE: OnSize automatically gets called during the setup of the control
-	if(GetClientRect() == m_rectClient) {
-		return;
-	}
-
-	m_rectClient = GetClientRect();
-	if (m_rectClient.GetWidth() < 1 || m_rectClient.GetHeight() < 1) {
-		return;
+	// The rate graphs hand their readout to CastItoSpeed so it picks the unit, as every other
+	// speed in the GUI does -- a hover on a fast download reads "2.13 MiB/s" rather than
+	// "2179.4 KiB/s". It wants bytes per second; the graphs plot KiB/s.
+	//
+	// Keyed on the graph rather than on m_strYUnits, because those units are _("KiB/s"):
+	// comparing against the literal would stop matching in every locale but English.
+	if (graph_type == GRAPH_DOWN || graph_type == GRAPH_UP) {
+		return CastItoSpeed((uint32)(value * 1024.0f));
 	}
 
-	// the "left" coordinate and "width" will be modified in
-	// InvalidateCtrl to be based on the y axis scaling
-	m_rectPlot.SetLeft(20);
-	m_rectPlot.SetTop(10);
-	m_rectPlot.SetRight(std::max<int>(m_rectPlot.GetLeft() + 1, m_rectClient.GetRight() - 40));
-	m_rectPlot.SetBottom(std::max<int>(m_rectPlot.GetTop() + 1, m_rectClient.GetBottom() - 25));
-
-	PlotData_t* ppds = pdsTrends;
-	for(unsigned iTrend=0; iTrend<nTrends; ++iTrend, ++ppds) {
-		ppds->fVertScale = (float)m_rectPlot.GetHeight() / (ppds->fUpperLimit-ppds->fLowerLimit);
-		ppds->yPrev = GetPlotY(ppds->fPrev, ppds);
+	wxString formatted = wxString::Format("%.*f", (int)m_nYDecimals, value);
+	if (!m_strYUnits.IsEmpty()) {
+		formatted << " " << m_strYUnits;
 	}
+	return formatted;
+}
 
-	if (!m_bmapGrid.IsOk() || (m_rectClient != wxSize(m_bmapGrid.GetWidth(), m_bmapGrid.GetHeight()))) {
-		m_bmapGrid.Create(m_rectClient.GetWidth(), m_rectClient.GetHeight());
-	}
-	if (!m_bmapPlot.IsOk() || (m_rectPlot != wxSize(m_bmapPlot.GetWidth(), m_bmapPlot.GetHeight()))) {
-		m_bmapPlot.Create(m_rectPlot.GetWidth(), m_rectPlot.GetHeight());
+bool COScopeCtrl::IsShaded() const
+{
+	if (kShadedTrend >= m_trends.size()) {
+		return false;
 	}
 
-	InvalidateCtrl();
+	// On the rate graphs and the Kad graph the three trends are three views of one quantity --
+	// current value, running average, session average -- so shading the current one states that
+	// quantity's magnitude. The connections graph plots three unrelated counts, with no primary
+	// among them.
+	return graph_type != GRAPH_CONN;
 }
 
-
-void COScopeCtrl::ShiftGraph(unsigned cntPoints)
+double COScopeCtrl::GetPlotY(float value, const PlotData_t &trend, const wxRect &rectPlot) const
 {
-	wxMemoryDC dcPlot(m_bmapPlot);
-
-	unsigned cntPixelOffset = cntPoints*nShiftPixels;
-	if (cntPixelOffset >= (unsigned)m_rectPlot.GetWidth()) {
-		cntPixelOffset = m_rectPlot.GetWidth();
-	} else {
-		dcPlot.Blit(0, 0, m_rectPlot.GetWidth(), m_rectPlot.GetHeight(), &dcPlot,
-			cntPixelOffset, 0);	// scroll graph to the left
+	// Half a pen width of headroom keeps a curve pinned to the top or the
+	// bottom of the range from painting over the frame.
+	const double halfPen = FromDIP(3) / 4.0;
+	const double yTop = rectPlot.GetTop() + halfPen;
+	const double yBottom = rectPlot.GetBottom() - halfPen;
+
+	const float fSpan = trend.fUpperLimit - trend.fLowerLimit;
+	if (fSpan <= 0.0f) {
+		return yBottom;
 	}
 
-	// clear a rectangle over the right side of plot prior to adding the new points
-	dcPlot.SetPen(*wxTRANSPARENT_PEN);
-	dcPlot.SetBrush(brushBack);	// fill with background color
-	dcPlot.DrawRectangle(m_rectPlot.GetWidth()-cntPixelOffset, 0,
-		cntPixelOffset, m_rectPlot.GetHeight());
+	const double fraction = (value - trend.fLowerLimit) / fSpan;
+	return std::min(std::max(rectPlot.GetBottom() - fraction * rectPlot.GetHeight(), yTop), yBottom);
 }
 
-
-unsigned COScopeCtrl::GetPlotY(float fPlot, PlotData_t* ppds)
+void COScopeCtrl::OnPaint(wxPaintEvent &WXUNUSED(evt))
 {
-	if (fPlot <= ppds->fLowerLimit) {
-		return m_rectPlot.GetBottom();
-	} else if (fPlot >= ppds->fUpperLimit) {
-		return m_rectPlot.GetTop() + 1;
-	} else {
-		return m_rectPlot.GetBottom() - (unsigned)((fPlot - ppds->fLowerLimit) * ppds->fVertScale);
-	}
-}
+	wxAutoBufferedPaintDC dc(this);
 
+	dc.SetBackground(wxBrush(m_bgColour));
+	dc.Clear();
 
-void COScopeCtrl::DrawPoints(const std::vector<float *> &apf, unsigned cntPoints)
-{
-	// this appends a new set of data points to a graph; all of the plotting is
-	// directed to the memory based bitmap associated with dcPlot
-	// the will subsequently be BitBlt'd to the client in OnPaint
-	// draw the next line segment
-	unsigned y, yPrev;
-	unsigned cntPixelOffset = std::min((unsigned)(m_rectPlot.GetWidth()-1), (cntPoints-1)*nShiftPixels);
-	PlotData_t* ppds = pdsTrends;
-
-	wxMemoryDC dcPlot(m_bmapPlot);
-
-	for (unsigned iTrend=0; iTrend<nTrends; ++iTrend, ++ppds) {
-		const float* pf = apfiTrend + cntPoints - 1;
-		yPrev = ppds->yPrev;
-		dcPlot.SetPen(ppds->penPlot);
-
-		for (int x = m_rectPlot.GetRight() - cntPixelOffset; x <= m_rectPlot.GetRight(); x+=nShiftPixels) {
-			y = GetPlotY(*pf--, ppds);
-
-			// Map onto the smaller bitmap
-			dcPlot.DrawLine(x - nShiftPixels - m_rectPlot.GetX(),
-					yPrev - m_rectPlot.GetY(),
-					x - m_rectPlot.GetX(),
-					y - m_rectPlot.GetY());
-
-			yPrev = y;
-		}
-		ppds->fPrev = *(pf+1);
-		ppds->yPrev = yPrev;
+	// Axis labels are conventionally a step below the UI font.
+	dc.SetFont(GetFont().Smaller());
+
+	const wxRect rectPlot = ComputePlotRect(dc);
+	if (rectPlot.GetWidth() < 2 || rectPlot.GetHeight() < 2) {
+		return;
 	}
-}
 
+	// Everything drawn straight onto the wxDC has to be done before the graphics context is
+	// created from it: the two share one surface, and only the most recently created may write
+	// to it.
+	DrawGrid(dc, rectPlot);
+
+#if wxUSE_GRAPHICS_CONTEXT
+	// Created here rather than inside DrawCurves because wxGraphicsContext has no overload
+	// taking the wxDC base class, and this is the last place that knows which kind of paint DC
+	// we hold.
+	std::unique_ptr<wxGraphicsContext> gc(wxGraphicsContext::Create(dc));
+	DrawCurves(dc, gc.get(), rectPlot);
+#else
+	DrawCurves(dc, nullptr, rectPlot);
+#endif
+}
 
-void COScopeCtrl::PlotHistory(unsigned cntPoints, bool bShiftGraph, bool bRefresh)
+void COScopeCtrl::DrawHover(wxGraphicsContext *gc,
+	const wxRect &rectPlot,
+	const std::vector<std::vector<float>> &samples,
+	unsigned cntFilled)
 {
-	wxASSERT(graph_type != GRAPH_INVALID);
-
-	if (graph_type != GRAPH_INVALID) {
-		unsigned i;
-		unsigned cntFilled;
-		std::vector<float *> apf(nTrends);
-		try {
-			for (i = 0; i < nTrends; ++i) {
-				apfi = new floatcntPoints;
-			}
-			double sFinal = (bStopped ? sLastTimestamp : -1.0);
-			cntFilled = theApp->m_statistics->GetHistory(cntPoints, sLastPeriod, sFinal, apf, graph_type);
-			if (cntFilled >1  ||  (bShiftGraph && cntFilled!=0)) {
-				if (bShiftGraph) {  // delayed points - we have an fPrev
-					ShiftGraph(cntFilled);
-				} else {  // fresh graph, we need to preset fPrev, yPrev
-					PlotData_t* ppds = pdsTrends;
-					for(i=0; i<nTrends; ++i, ++ppds)
-						ppds->yPrev = GetPlotY(ppds->fPrev = *(apfi + cntFilled - 1), ppds);
-					cntFilled--;
-				}
-				DrawPoints(apf, cntFilled);
-				if (bRefresh)
-					Refresh(false);
-			}
-			for (i = 0; i < nTrends; ++i) {
-				delete  apfi;
-			}
-		} catch(std::bad_alloc) {
-			// Failed memory allocation
-			AddLogLineC(wxString(
-				"Error: COScopeCtrl::PlotHistory: Insuficient memory, cntPoints == ") <<
-				cntPoints << ".");
-			for (i = 0; i < nTrends; ++i) {
-				delete  apfi;
-			}
-		}
-	} else {
-		// No history (yet) for Kad.
+#if wxUSE_GRAPHICS_CONTEXT
+	if (m_ptHover == wxDefaultPosition || !rectPlot.Contains(m_ptHover)) {
+		return;
 	}
-}
 
+	// Snap to the sample under the cursor. One sample is m_nShiftPixels
+	// wide, so this is the pixel the cursor is on in all current graphs.
+	unsigned iSample = (unsigned)((rectPlot.GetRight() - m_ptHover.x + (int)m_nShiftPixels / 2) /
+				      (int)m_nShiftPixels);
+	if (iSample >= cntFilled) {
+		return;
+	}
 
-void COScopeCtrl::RecreateGraph(bool bRefresh)
-{
-	bRecreateGraph = false;
-	nDelayedPoints = 0;
+	const wxColour ink = ContrastInk(m_bgColour);
+	const double x = rectPlot.GetRight() - (double)iSample * m_nShiftPixels;
+	const double markerRadius = FromDIP(4) / 2.0 + 1.0;
+
+	// Crosshair.
+	gc->SetPen(gc->CreatePen(wxGraphicsPenInfo(wxColour(ink.Red(), ink.Green(), ink.Blue(), 0x60), 1.0)));
+	wxGraphicsPath crosshair = gc->CreatePath();
+	crosshair.MoveToPoint(x, rectPlot.GetTop());
+	crosshair.AddLineToPoint(x, rectPlot.GetBottom());
+	gc->StrokePath(crosshair);
+
+	// One marker per trend, ringed in the background colour so markers
+	// that land on top of each other stay separable.
+	for (unsigned iTrend = 0; iTrend < m_trends.size(); ++iTrend) {
+		const double y = GetPlotY(samplesiTrendiSample, m_trendsiTrend, rectPlot);
+		gc->SetPen(gc->CreatePen(wxGraphicsPenInfo(m_bgColour, 2.0)));
+		gc->SetBrush(wxBrush(m_trendsiTrend.crPlot));
+		gc->DrawEllipse(x - markerRadius, y - markerRadius, markerRadius * 2, markerRadius * 2);
+	}
 
-	wxMemoryDC dcPlot(m_bmapPlot);
-	dcPlot.SetBackground(brushBack);
-	dcPlot.Clear();
+	// Readout. The header is how far back in time this sample is, in the same units as the x
+	// axis label. Deliberately not the word "Current" for the newest sample: one of the trends
+	// is already called that.
+	const uint32 sAgo = (uint32)iSample * (uint32)std::floor(m_sLastPeriod + 0.5);
+	const wxString strHeader = CFormat("-%s") % CastSecondsToHM(sAgo);
 
-	PlotHistory(m_rectPlot.GetWidth(), false, bRefresh);
-}
+	std::vector<wxString> aLabel, aValue;
+	for (unsigned iTrend = 0; iTrend < m_trends.size(); ++iTrend) {
+		aLabel.push_back(m_trendsiTrend.strLabel);
+		aValue.push_back(FormatValue(samplesiTrendiSample));
+	}
 
+	const wxFont font = GetFont();
+	gc->SetFont(font, ink);
+
+	double wLabel = 0.0, wValue = 0.0, lineHeight = 0.0, w = 0.0, h = 0.0, d = 0.0, e = 0.0;
+	gc->GetTextExtent(strHeader, &w, &h, &d, &e);
+	lineHeight = h;
+	double wHeader = w;
+	for (unsigned i = 0; i < aLabel.size(); ++i) {
+		gc->GetTextExtent(aLabeli, &w, &h, &d, &e);
+		wLabel = std::max(wLabel, w);
+		lineHeight = std::max(lineHeight, h);
+		gc->GetTextExtent(aValuei, &w, &h, &d, &e);
+		wValue = std::max(wValue, w);
+	}
 
-void COScopeCtrl::Reset(double sNewPeriod)
-{
-	bool bStoppedPrev = bStopped;
-	bStopped = false;
-	if (sLastPeriod != sNewPeriod  ||  bStoppedPrev) {
-		sLastPeriod = sNewPeriod;
-		InvalidateCtrl();
+	const double pad = FromDIP(6);
+	const double gap = FromDIP(12);
+	const double dot = FromDIP(6);
+	const double boxW = std::max(wHeader, dot + pad / 2 + wLabel + gap + wValue) + 2 * pad;
+	const double cntLines = (double)(aLabel.size() + 1);
+	const double boxH = cntLines * lineHeight + cntLines * 2.0 + 2 * pad;
+
+	// Prefer the right of the crosshair, flip when that would overflow.
+	double boxX = x + gap;
+	if (boxX + boxW > rectPlot.GetRight()) {
+		boxX = x - gap - boxW;
 	}
+	boxX = std::max(boxX, (double)rectPlot.GetLeft());
+	double boxY = std::min(
+		std::max(m_ptHover.y - boxH / 2, (double)rectPlot.GetTop()), rectPlot.GetBottom() - boxH);
+
+	gc->SetBrush(wxBrush(wxColour(m_bgColour.Red(), m_bgColour.Green(), m_bgColour.Blue(), 0xE6)));
+	gc->SetPen(gc->CreatePen(wxGraphicsPenInfo(wxColour(ink.Red(), ink.Green(), ink.Blue(), 0x50), 1.0)));
+	gc->DrawRoundedRectangle(boxX, boxY, boxW, boxH, FromDIP(4));
+
+	double textY = boxY + pad;
+	gc->DrawText(strHeader, boxX + pad, textY);
+	textY += lineHeight + 2.0;
+
+	for (unsigned i = 0; i < aLabel.size(); ++i) {
+		gc->SetBrush(wxBrush(m_trendsi.crPlot));
+		gc->SetPen(*wxTRANSPARENT_PEN);
+		gc->DrawEllipse(boxX + pad, textY + (lineHeight - dot) / 2, dot, dot);
+
+		gc->DrawText(aLabeli, boxX + pad + dot + pad / 2, textY);
+		gc->GetTextExtent(aValuei, &w, &h, &d, &e);
+		gc->DrawText(aValuei, boxX + boxW - pad - w, textY);
+		textY += lineHeight + 2.0;
+	}
+#else
+	(void)gc;
+	(void)rectPlot;
+	(void)samples;
+	(void)cntFilled;
+#endif
 }
 
-
-void COScopeCtrl::Stop()
+void COScopeCtrl::OnMouseMove(wxMouseEvent &evt)
 {
-	bStopped = true;
-	bRecreateGraph = false;
-	RecreateGrid();
+	const wxPoint pt = evt.GetPosition();
+	if (pt != m_ptHover) {
+		m_ptHover = pt;
+		Refresh(false);
+	}
+	evt.Skip();
 }
 
-
-void COScopeCtrl::InvalidateCtrl(bool bInvalidateGraph, bool bInvalidateGrid)
+void COScopeCtrl::OnMouseLeave(wxMouseEvent &evt)
 {
-	bRecreateGraph |= bInvalidateGraph;
-	bRecreateGrid |= bInvalidateGrid;
-	// 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
+	if (m_ptHover != wxDefaultPosition) {
+		m_ptHover = wxDefaultPosition;
+		Refresh(false);
 	}
+	evt.Skip();
 }
 
-
-void COScopeCtrl::OnTimer(wxTimerEvent& WXUNUSED(evt))
-/*	The timer is used to consolidate redrawing of the graphs:  when the user resizes
-	the application, we get multiple calls to OnSize.  If he changes several parameters
-	in the Preferences, we get several individual SetXYZ calls.  If we were to try to
-	recreate the graphs for each such event, performance would be sluggish, but with
-	the timer, each event (if they come in quick succession) simply restarts the timer
-	until there is a little pause and OnTimer actually gets called and does its work.
-*/
+void COScopeCtrl::OnSize(wxSizeEvent &WXUNUSED(evt))
 {
-	if( !theApp->amuledlg || !theApp->amuledlg->SafeState()) {
-		return;
-	}
-	bRecreateAll = false;
-	Refresh();
+	// The plot is laid out from the client size on every paint, so a resize only has to
+	// invalidate the whole control -- a partial repaint would leave the old axis labels behind.
+	Refresh(false);
 }
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/OScopeCtrl.h -> amule-3.1.0.tar.gz/src/OScopeCtrl.h Changed

@@ -26,101 +26,115 @@
 #ifndef OSCOPECTRL_H
 #define OSCOPECTRL_H
 
-#ifndef NULL
-#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/control.h> // Needed for wxControl
 #include <wx/colour.h>
 
-#include "Constants.h"		// Needed for StatsGraphType
+#include "Constants.h" // Needed for StatsGraphType
 
-class wxMemoryDC;
+class wxDC;
+// Only ever held as a pointer here, so this stays valid in a wxWidgets
+// built without wxUSE_GRAPHICS_CONTEXT, where the class does not exist.
+class wxGraphicsContext;
 
-/////////////////////////////////////////////////////////////////////////////
 // COScopeCtrl window
+//
+// A scrolling line graph for the Statistics and Networks->Kad panels. All four graphs in the GUI
+// are instances of this control, so anything changed here applies to every one of them.
+//
+// The control keeps no copy of the plotted samples: every paint asks CStatistics::GetHistory for as
+// many points as the plot area is wide and redraws the whole curve. That is what lets the curves be
+// drawn through a wxGraphicsContext (anti-aliased, resolution independent) -- the previous
+// incremental design scrolled a cached bitmap sideways and appended one segment per sample, which
+// cannot carry anti-aliased content without smearing it, and pinned the graph to the logical, non-
+// HiDPI resolution.
 
 class COScopeCtrl : public wxControl
 {
-	friend class CStatisticsDlg;
-
 public:
-	COScopeCtrl(int NTrends, int nDecimals, StatsGraphType type, wxWindow* parent = NULL);
-	~COScopeCtrl();
+	COScopeCtrl(int NTrends, int nDecimals, StatsGraphType type, wxWindow *parent = nullptr);
 
 	void SetRange(float dLower, float dUpper, unsigned iTrend = 0);
 	void SetRanges(float dLower, float dUpper);
-	void SetYUnits(const wxString& string,
-		const wxString& YMin = "", const wxString& YMax = "");
-	void SetBackgroundColor(const wxColour& color);
-	void SetGridColor(const wxColour& color);
-	void SetPlotColor(const wxColour& color, unsigned iTrend = 0);
-	float GetUpperLimit()		{ return pdsTrends0.fUpperLimit; }
-	void Reset(double sNewPeriod);
+	void SetYUnits(const wxString &string, const wxString &YMin = "", const wxString &YMax = "");
+	void SetBackgroundColor(const wxColour &color);
+	void SetGridColor(const wxColour &color);
+	void SetPlotColor(const wxColour &color, unsigned iTrend = 0);
+	// Name shown for this trend in the hover tooltip, i.e. the same text
+	// the legend beside the graph carries.
+	void SetTrendLabel(const wxString &label, unsigned iTrend = 0);
+	float GetUpperLimit() const { return m_trends0.fUpperLimit; }
+
+	// Freeze the graph at the last sample (statistics update delay set to 0).
 	void Stop();
-	void RecreateGraph(bool bRefresh=true);
-	void RecreateGrid();
-	void AppendPoints(double sTimestamp, const std::vector<float *> &apf);
-	void DelayPoints()		{ nDelayedPoints++; }
+	// Resume, and adopt a new seconds-per-sample period.
+	void Reset(double sNewPeriod);
+	// A new sample has been recorded: it is already in the history, so this
+	// only has to ask for a repaint.
+	void AppendPoints(double sTimestamp);
+	// Repaint after something that changes the shape of the curve without
+	// adding a sample, e.g. a new running-average window.
+	void InvalidateGraph() { Refresh(false); }
 
 	StatsGraphType graph_type;
 
-public:
-	unsigned nTrends;
-	unsigned nXGrids;
-	unsigned nYGrids;
-	unsigned nShiftPixels;         // amount to shift with each new point
-	unsigned nYDecimals;
-
-	wxString strXUnits;
-	wxString strYUnits, strYMin, strYMax;
+private:
+	struct PlotData_t
+	{
+		wxColour crPlot;
+		wxString strLabel;
+		float fLowerLimit;
+		float fUpperLimit;
+	};
+
+	void OnPaint(wxPaintEvent &evt);
+	void OnSize(wxSizeEvent &evt);
+	void OnMouseMove(wxMouseEvent &evt);
+	void OnMouseLeave(wxMouseEvent &evt);
+
+	// Splits the client area into the plot rectangle and the label gutters,
+	// measuring the axis labels rather than assuming a character width.
+	wxRect ComputePlotRect(wxDC &dc) const;
+	void DrawGrid(wxDC &dc, const wxRect &rectPlot);
+	// gc is created by the caller, which is where the concrete paint DC type is still known; it
+	// is null if this wxWidgets has no graphics context, and the curves then fall back to plain
+	// wxDC polylines.
+	void DrawCurves(wxDC &dc, wxGraphicsContext *gc, const wxRect &rectPlot);
+	// Crosshair, per-trend markers and the value readout at the hovered
+	// sample. samples is what DrawCurves has just plotted.
+	void DrawHover(wxGraphicsContext *gc,
+		const wxRect &rectPlot,
+		const std::vector<std::vector<float>> &samples,
+		unsigned cntFilled);
+	// Formats the y axis labels; empty strings fall back to the trend range.
+	wxString GetYMaxLabel() const;
+	wxString GetYMinLabel() const;
+	wxString GetXUnitsLabel(const wxRect &rectPlot) const;
+	// y for one sample, clamped into the plot area with room for the pen.
+	double GetPlotY(float value, const PlotData_t &trend, const wxRect &rectPlot) const;
+	// Whether this graph shades the area under its instantaneous trend.
+	bool IsShaded() const;
+	// One sample as the hover readout shows it, scaled and given its unit.
+	wxString FormatValue(float value) const;
+
+	std::vector<PlotData_t> m_trends;
+	unsigned m_nYGrids;
+	unsigned m_nShiftPixels; // horizontal distance between two samples
+	unsigned m_nYDecimals;
+
+	wxString m_strYUnits, m_strYMin, m_strYMax;
 	wxColour m_bgColour;
 	wxColour m_gridColour;
 
-	typedef struct PlotDataStruct {
-		wxColour crPlot;	       // data plot color
-		wxPen  penPlot;
-		unsigned yPrev;
-		float fPrev;
-		float fLowerLimit;         // lower bounds
-		float fUpperLimit;         // upper bounds
-		float fVertScale;
-	} PlotData_t ;
+	bool m_bStopped;
+	double m_sLastTimestamp;
+	double m_sLastPeriod;
 
+	// Cursor position while it is over the control, wxDefaultPosition
+	// otherwise. Drives the hover readout.
+	wxPoint m_ptHover;
 
-protected:
 	wxDECLARE_EVENT_TABLE();
-	PlotData_t *pdsTrends;
-
-	wxRect	m_rectClient;
-	wxRect	m_rectPlot;
-	wxBrush	brushBack;
-	wxBitmap m_bmapGrid;
-	wxBitmap m_bmapPlot;
-
-	void InvalidateGraph()	{ InvalidateCtrl(true, false); }
-	void InvalidateGrid()	{ InvalidateCtrl(false, true); }
-
-private:
-	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);
-	void ShiftGraph(unsigned cntPoints);
-	void PlotHistory(unsigned cntPoints, bool bShiftGraph, bool bRefresh);
-	void DrawPoints(const std::vector<float *> &apf, unsigned cntPoints);
-	unsigned GetPlotY(float fPlot, PlotData_t* ppds);
-	void InvalidateCtrl(bool bInvalidateGraph = true, bool bInvalidateGrid = true);
 };
 
 #endif // OSCOPECTRL_H

amule-3.0.1.tar.gz/src/Observable.h -> amule-3.1.0.tar.gz/src/Observable.h Changed

@@ -26,70 +26,55 @@
 #ifndef OBSERVABLE_H
 #define OBSERVABLE_H
 
-
 #include <set>
 
-#include "OtherFunctions.h"		// Needed for CMutexUnlocker
-
+#include "OtherFunctions.h" // Needed for CMutexUnlocker
 
 template <typename TEST> class CObservable;
 
-
 /**
- * This class implements the observable part of an Observer/Observable pattern.
+ * The observable part of an Observer/Observable pattern.
  *
- * The EventType parameter is used to specify a protocol for the event-type used
- * by a particular Observer/Observable set and allows for any level of
- * information passing to be used, depending on the context.
+ * The EventType parameter specifies a protocol for the event type used by a particular
+ * Observer/Observable set, allowing any level of information passing, depending on the context.
  *
- * In order to simplify matters for subclasses, both the Observer and the
- * Observable class keep track of which objects are observing what, so that
- * instances can safely be created and destroyed without having to manually
- * keep the observers and observables in sync.
+ * To simplify matters for subclasses, both the Observer and the Observable class track which
+ * objects are observing what, so instances can be created and destroyed safely without keeping the
+ * observers and observables manually in sync.
  */
-template <typename EventType>
-class CObserver
+template <typename EventType> class CObserver
 {
 	friend class CObservable<EventType>;
+
 public:
 	typedef CObservable<EventType> ObservableType;
 
 	/**
-	 * Destructor.
-	 *
-	 * All observables which has this object registered are notified
-	 * as to avoid dangling pointers. This will not result in actual
-	 * events.
+	 * Notifies every observable this object is registered with, to avoid dangling pointers. No
+	 * actual events result.
 	 */
 	virtual ~CObserver();
 
-
 protected:
 	/**
-	 * This function is called when an observed subject publishes an event.
-	 *
-	 * @param o The publisher of the event.
+	 * Called when an observed subject publishes an event. @param o The publisher of the event.
 	 * @param e The actual event.
 	 */
-	virtual void ReceiveNotification( const ObservableType* o, const EventType& e ) = 0;
-
+	virtual void ReceiveNotification(const ObservableType *o, const EventType &e) = 0;
 
 private:
 	//! Mutex used to make access to the list of observed objects thread safe.
 	wxMutex m_mutex;
 
-	typedef std::set<ObservableType*> ObservableSetType;
+	typedef std::set<ObservableType *> ObservableSetType;
 	//! List of objects being observed.
 	ObservableSetType m_list;
 };
 
-
-
 /**
- * This class implements the Observable part of the Observer/Observable pattern.
+ * The Observable part of the Observer/Observable pattern.
  */
-template <typename EventType>
-class CObservable
+template <typename EventType> class CObservable
 {
 	friend class CObserver<EventType>;
 
@@ -97,211 +82,165 @@
 	//! The observer-type accepted by this class
 	typedef CObserver<EventType> ObserverType;
 
-
-	/**
-	 * Destructor.
-	 */
 	virtual ~CObservable();
 
-
 	/**
-	 * This function subscribes an observer to events from this observable.
-	 *
-	 * @param o The observer that wishes to observe this object.
-	 * @return True if it successfully subscribed, false otherwise.
-	 *
-	 * If the subscription was successful, ObserverAdded() will be called
-	 * on "o", allowing the subclass to initialize the the observer's state.
+	 * Subscribes observer @a o to events from this observable. Returns true on success, in
+	 * which case ObserverAdded() is called on @a o so the subclass can initialize its state.
 	 */
-	bool AddObserver( ObserverType* o );
+	bool AddObserver(ObserverType *o);
 
 	/**
-	 * This function removes an observer from the list of subscribers.
-	 *
-	 * @param o The observer to unsubscribe from this observable.
-	 * @return True if the observer was removed, false otherwise.
-	 *
-	 * ObserverRemoved() will be called for the observer "o", allowing
-	 * the subclass to take steps to avoid outdated data being kept.
+	 * Removes observer @a o from the list of subscribers. Returns true if it was removed, in
+	 * which case ObserverRemoved() is called on it so the subclass can avoid keeping outdated
+	 * data.
 	 */
-	bool RemoveObserver( ObserverType* o );
+	bool RemoveObserver(ObserverType *o);
 
 protected:
 	/**
-	 * This function notifies all or an specific observer of an event.
-	 *
-	 * @param e The event to be published.
-	 * @param o A specific subscribing observer or NULL for all subscribers.
-	 *
-	 * The purpose of the second parameter is to allow notifications of
-	 * specific observers when the ObserverAdded() or ObserverRemoved()
-	 * functions are called and it should not be used outside of these
-	 * functions.
+	 * Notifies all subscribers of event @a e, or just observer @a o when one is given. The
+	 * second parameter exists for the notifications ObserverAdded() and ObserverRemoved() make,
+	 * and should not be used elsewhere.
 	 */
-	void NotifyObservers( const EventType& e, ObserverType* o = NULL );
-
+	void NotifyObservers(const EventType &e, ObserverType *o = NULL);
 
 	/**
-	 * This function removes all observers from this object.
-	 *
-	 * ObserverRemoved is called on each observer.
+	 * Removes every observer from this object, calling ObserverRemoved on each.
 	 */
 	void RemoveAllObservers();
 
-
 	/**
-	 * This function is called when an observer has been added to the observable.
+	 * Called when an observer has been added to the observable.
 	 */
-	virtual void ObserverAdded( ObserverType* ) {};
-
+	virtual void ObserverAdded(ObserverType *) {};
 
 	/**
-	 * This function is called when observers are removed from the observable.
-	 *
-	 * Exceptions to this are:
-	 *  - When the Observable is being destroyed.
-	 *  - When the Observer is being destroyed.
+	 * Called when observers are removed from the observable, except while the Observable or the
+	 * Observer is being destroyed.
 	 */
-	virtual void ObserverRemoved( ObserverType* ) {};
-
+	virtual void ObserverRemoved(ObserverType *) {};
 
 private:
 	//! Mutex used to ensure thread-safety of the basic operations.
 	wxMutex m_mutex;
 
-	typedef std::set<ObserverType*> ObserverSetType;
+	typedef std::set<ObserverType *> ObserverSetType;
 	typedef typename ObserverSetType::iterator myIteratorType;
 
 	//! Set of all observers subscribing to this observable.
 	ObserverSetType m_list;
 };
 
-
-
-
 ///////////////////////////////////////////////////////////////////////////////
 
-
-
-
-template <typename EventType>
-CObserver<EventType>::~CObserver()
+template <typename EventType> CObserver<EventType>::~CObserver()
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
-	while ( !m_list.empty() ) {
-		ObservableType* o = *m_list.begin();
+	while (!m_list.empty()) {
+		ObservableType *o = *m_list.begin();
 
 		{
 			wxMutexLocker oLock(o->m_mutex);
-			o->m_list.erase( this );
+			o->m_list.erase(this);
 		}
 
-		m_list.erase( m_list.begin() );
+		m_list.erase(m_list.begin());
 	}
 }
 
-
-template <typename EventType>
-CObservable<EventType>::~CObservable()
+template <typename EventType> CObservable<EventType>::~CObservable()
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
-	while ( !m_list.empty() ) {
-		ObserverType* o = *m_list.begin();
+	while (!m_list.empty()) {
+		ObserverType *o = *m_list.begin();
 
 		{
 			wxMutexLocker oLock(o->m_mutex);
-			o->m_list.erase( this );
+			o->m_list.erase(this);
 		}
 
-		m_list.erase( m_list.begin() );
+		m_list.erase(m_list.begin());
 	}
 }
 
-
-template <typename EventType>
-bool CObservable<EventType>::AddObserver( CObserver<EventType>* o )
+template <typename EventType> bool CObservable<EventType>::AddObserver(CObserver<EventType> *o)
 {
-	wxASSERT( o );
+	wxASSERT(o);
 
 	{
 		wxMutexLocker lock(m_mutex);
-		if ( !m_list.insert( o ).second ) {
+		if (!m_list.insert(o).second) {
 			return false;
 		}
 	}
 
 	{
 		wxMutexLocker oLock(o->m_mutex);
-		o->m_list.insert( this );
+		o->m_list.insert(this);
 	}
 
-	ObserverAdded( o );
+	ObserverAdded(o);
 
 	return true;
 }
 
-
-template <typename EventType>
-bool CObservable<EventType>::RemoveObserver( CObserver<EventType>* o )
+template <typename EventType> bool CObservable<EventType>::RemoveObserver(CObserver<EventType> *o)
 {
-	wxASSERT( o );
+	wxASSERT(o);
 
 	{
 		wxMutexLocker lock(m_mutex);
-		if ( !m_list.erase( o ) ) {
+		if (!m_list.erase(o)) {
 			return false;
 		}
 	}
 
 	{
 		wxMutexLocker oLock(o->m_mutex);
-		o->m_list.erase( this );
+		o->m_list.erase(this);
 	}
 
-	ObserverRemoved( o );
+	ObserverRemoved(o);
 
 	return true;
 }
 
-
 template <typename EventType>
-void CObservable<EventType>::NotifyObservers( const EventType& e, ObserverType* o )
+void CObservable<EventType>::NotifyObservers(const EventType &e, ObserverType *o)
 {
 	wxMutexLocker lock(m_mutex);
 
-	if ( o ) {
-		o->ReceiveNotification( this, e );
+	if (o) {
+		o->ReceiveNotification(this, e);
 	} else {
 		myIteratorType it = m_list.begin();
-		for ( ; it != m_list.end(); ) {
+		for (; it != m_list.end();) {
 			CMutexUnlocker unlocker(m_mutex);
-			(*it++)->ReceiveNotification( this, e );
+			(*it++)->ReceiveNotification(this, e);
 		}
 	}
 }
 
-
-template <typename EventType>
-void CObservable<EventType>::RemoveAllObservers()
+template <typename EventType> void CObservable<EventType>::RemoveAllObservers()
 {
 	wxMutexLocker lock(m_mutex);
 
-	while ( !m_list.empty() ) {
-		ObserverType* o = *m_list.begin();
-		m_list.erase( m_list.begin() );
+	while (!m_list.empty()) {
+		ObserverType *o = *m_list.begin();
+		m_list.erase(m_list.begin());
 		CMutexUnlocker unlocker(m_mutex);
 
 		{
 			wxMutexLocker oLock(o->m_mutex);
-			o->m_list.erase( this );
+			o->m_list.erase(this);
 		}
 
-		ObserverRemoved( o );
+		ObserverRemoved(o);
 	}
 }
 
-
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ObservableQueue.h -> amule-3.1.0.tar.gz/src/ObservableQueue.h Changed

@@ -28,11 +28,7 @@
 
 #include "Observable.h"
 
-
-
-template <typename ValueType>
-class CQueueObserver;
-
+template <typename ValueType> class CQueueObserver;
 
 /**
  * This class defines the protocol used by the CObservableQueue class.
@@ -46,8 +42,7 @@
  * elements in a container object over a longer period of time, which
  * would normally result in problems with changes accomulating in the list.
  */
-template <typename ValueType>
-class CQueueEvent
+template <typename ValueType> class CQueueEvent
 {
 public:
 	//! The type of list used by this protocol to store values.
@@ -57,7 +52,8 @@
 	//! Note: If more than one instance of a value has been added, removed or
 	//! updated, then the resulting events should reflect this fact by
 	//! including the same of instances as has been changed.
-	enum Type {
+	enum Type
+	{
 		//! Signals a QueueObserver that it has been added to a queue.
 		STARTING,
 		//! Signals a QueueObserver that it has been removed from a queue.
@@ -74,56 +70,28 @@
 		INITIAL
 	};
 
+	CQueueEvent(Type event);
 
-	/**
-	 * Constructor for misc events.
-	 */
-	CQueueEvent( Type event );
+	// Does not take ownership of the list.
+	CQueueEvent(Type event, const ValueList *list);
 
+	CQueueEvent(Type event, const ValueType &value);
 
-	/**
-	 * Constructor for events regarding multiple values.
-	 *
-	 * Note: CQueueEvent does not take ownership of the specified list.
-	 */
-	CQueueEvent( Type event, const ValueList* list );
-
-
-	/**
-	 * Constructor for events regarding a single value
-	 */
-	CQueueEvent( Type event, const ValueType& value );
+	Type GetEvent() const { return m_type; }
 
-
-	/**
-	 * Returns the event-type.
-	 */
-	Type GetEvent() const {
-		return m_type;
-	}
-
-	/**
-	 * Returns the number of available values passed with the event.
-	 */
 	size_t GetCount() const;
 
-	/**
-	 * Returns a copy of the ith value.
-	 */
-	ValueType GetValue( size_t i ) const;
-
+	ValueType GetValue(size_t i) const;
 
 private:
 	//! Pointer to a list of values. May be NULL.
-	const ValueList* m_list;
+	const ValueList *m_list;
 	//! Pointer to a single value. May be NULL.
-	const ValueType* m_value;
+	const ValueType *m_value;
 	//! The actual event-type.
 	Type m_type;
 };
 
-
-
 /**
  * This class forms the superclass for observable queues or lists.
  *
@@ -143,8 +111,7 @@
  * a list or queue, regardless of changes in actual order of the items
  * and regardless of changes to the contents.
  */
-template <typename ValueType>
-class CObservableQueue : public CObservable< CQueueEvent<ValueType> >
+template <typename ValueType> class CObservableQueue : public CObservable<CQueueEvent<ValueType>>
 {
 public:
 	/**
@@ -155,24 +122,21 @@
 	virtual ~CObservableQueue();
 
 protected:
-	typedef CQueueEvent< ValueType > EventType;
-	typedef CObserver< EventType > ObserverType;
+	typedef CQueueEvent<ValueType> EventType;
+	typedef CObserver<EventType> ObserverType;
 	typedef typename EventType::ValueList ValueList;
 
-
 	/**
 	 * Sends a STARTING event to new observers.
 	 */
-	virtual void ObserverAdded( ObserverType* );
+	virtual void ObserverAdded(ObserverType *);
 
 	/**
 	 * Sends a STOPPING event to removed observers.
 	 */
-	virtual void ObserverRemoved( ObserverType* );
+	virtual void ObserverRemoved(ObserverType *);
 };
 
-
-
 /**
  * This class is an automatically synchronized queue connected with an ObservableQueue.
  *
@@ -197,26 +161,22 @@
  * * With the exception of the same item being removed and then re-added, in
  *   which case the CQueueObserver class will consider it a new item.
  */
-template <typename ValueType>
-class CQueueObserver : public CObserver< CQueueEvent<ValueType> >
+template <typename ValueType> class CQueueObserver : public CObserver<CQueueEvent<ValueType>>
 {
 public:
 	typedef CQueueEvent<ValueType> EventType;
-	typedef typename CObserver< EventType >::ObservableType ObservableType;
+	typedef typename CObserver<EventType>::ObservableType ObservableType;
 	typedef typename EventType::ValueList ValueList;
 
-
 	/**
 	 * Constructor.
 	 */
 	CQueueObserver();
 
-
 	/**
 	 * Overloaded notification function.
 	 */
-	virtual void ReceiveNotification( const ObservableType*, const EventType& e );
-
+	virtual void ReceiveNotification(const ObservableType *, const EventType &e);
 
 	/**
 	 * Returns the next element from the queue.
@@ -254,63 +214,52 @@
 	Queue m_queue;
 
 	//! Used to check that we are only subscribed to one queue at a time
-	const ObservableType* m_owner;
+	const ObservableType *m_owner;
 };
 
-
-
-
 ///////////////////////////////////////////////////
 
-
-
-
 template <typename ValueType>
-CQueueEvent<ValueType>::CQueueEvent( Type event )
-	: m_list( NULL  ),
-	  m_value( NULL ),
-	  m_type( event )
+CQueueEvent<ValueType>::CQueueEvent(Type event)
+: m_list(NULL)
+, m_value(NULL)
+, m_type(event)
 {
-
 }
 
-
 template <typename ValueType>
-CQueueEvent<ValueType>::CQueueEvent( Type event, const ValueList* list )
-	: m_list( list  ),
-	  m_value( NULL ),
-	  m_type( event )
+CQueueEvent<ValueType>::CQueueEvent(Type event, const ValueList *list)
+: m_list(list)
+, m_value(NULL)
+, m_type(event)
 {
-	wxASSERT( list );
+	wxASSERT(list);
 }
 
-
 template <typename ValueType>
-CQueueEvent<ValueType>::CQueueEvent( Type event, const ValueType& value )
-	: m_list( NULL  ),
-	  m_value( &value ),
-	  m_type( event )
+CQueueEvent<ValueType>::CQueueEvent(Type event, const ValueType &value)
+: m_list(NULL)
+, m_value(&value)
+, m_type(event)
 {
 }
 
-
-template <typename ValueType>
-size_t CQueueEvent<ValueType>::GetCount() const {
-	if ( m_list ) {
+template <typename ValueType> size_t CQueueEvent<ValueType>::GetCount() const
+{
+	if (m_list) {
 		return m_list->size();
-	} else if ( m_value ) {
+	} else if (m_value) {
 		return 1;
 	} else {
 		return 0;
 	}
 }
 
-
-template <typename ValueType>
-ValueType CQueueEvent<ValueType>::GetValue( size_t i ) const {
-	if ( m_list ) {
-		return (*m_list).at( i );
-	} else if ( m_value && i == 0 ) {
+template <typename ValueType> ValueType CQueueEvent<ValueType>::GetValue(size_t i) const
+{
+	if (m_list) {
+		return (*m_list).at(i);
+	} else if (m_value && i == 0) {
 		return *m_value;
 	} else {
 		wxFAIL;
@@ -318,62 +267,49 @@
 	}
 }
 
-
-
-
-template <typename ValueType>
-CObservableQueue<ValueType>::~CObservableQueue()
+template <typename ValueType> CObservableQueue<ValueType>::~CObservableQueue()
 {
 	this->RemoveAllObservers();
 }
 
-
-template <typename ValueType>
-void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
+template <typename ValueType> void CObservableQueue<ValueType>::ObserverAdded(ObserverType *o)
 {
-	this->NotifyObservers( EventType( EventType::STARTING ), o );
+	this->NotifyObservers(EventType(EventType::STARTING), o);
 }
 
-
-template <typename ValueType>
-void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
+template <typename ValueType> void CObservableQueue<ValueType>::ObserverRemoved(ObserverType *o)
 {
-	this->NotifyObservers( EventType( EventType::STOPPING ), o );
+	this->NotifyObservers(EventType(EventType::STOPPING), o);
 }
 
-
-
-
-template <typename ValueType>
-CQueueObserver<ValueType>::CQueueObserver()
+template <typename ValueType> CQueueObserver<ValueType>::CQueueObserver()
 {
 	m_owner = NULL;
 }
 
-
 template <typename ValueType>
-void CQueueObserver<ValueType>::ReceiveNotification( const ObservableType* o, const EventType& e )
+void CQueueObserver<ValueType>::ReceiveNotification(const ObservableType *o, const EventType &e)
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
-	if ( e.GetEvent() == EventType::INSERTED || e.GetEvent() == EventType::INITIAL ) {
-		for ( size_t i = 0; i < e.GetCount(); i++ ) {
-			m_queue.insert( e.GetValue( i ) );
+	if (e.GetEvent() == EventType::INSERTED || e.GetEvent() == EventType::INITIAL) {
+		for (size_t i = 0; i < e.GetCount(); i++) {
+			m_queue.insert(e.GetValue(i));
 		}
-	} else if ( e.GetEvent() == EventType::REMOVED ) {
-		for ( size_t i = 0; i < e.GetCount(); i++ ) {
-			QueueIterator it = m_queue.find( e.GetValue( i ) );
+	} else if (e.GetEvent() == EventType::REMOVED) {
+		for (size_t i = 0; i < e.GetCount(); i++) {
+			QueueIterator it = m_queue.find(e.GetValue(i));
 
-			if ( it != m_queue.end() ) {
-				m_queue.erase( it );
+			if (it != m_queue.end()) {
+				m_queue.erase(it);
 			}
 		}
-	} else if ( e.GetEvent() == EventType::CLEARED ) {
+	} else if (e.GetEvent() == EventType::CLEARED) {
 		m_queue.clear();
-	} else if ( e.GetEvent() == EventType::STOPPING ) {
+	} else if (e.GetEvent() == EventType::STOPPING) {
 		m_queue.clear();
 		m_owner = NULL;
-	} else if ( e.GetEvent() == EventType::STARTING ) {
+	} else if (e.GetEvent() == EventType::STARTING) {
 		wxASSERT(m_owner == NULL);
 		m_owner = o;
 	} else {
@@ -381,15 +317,13 @@
 	}
 }
 
-
-template <typename ValueType>
-ValueType CQueueObserver<ValueType>::GetNext()
+template <typename ValueType> ValueType CQueueObserver<ValueType>::GetNext()
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
 	if (!m_queue.empty()) {
 		ValueType v = *m_queue.begin();
-		m_queue.erase( m_queue.begin() );
+		m_queue.erase(m_queue.begin());
 
 		return v;
 	}
@@ -397,39 +331,31 @@
 	return ValueType();
 }
 
-
-template <typename ValueType>
-size_t CQueueObserver<ValueType>::GetRemaining() const
+template <typename ValueType> size_t CQueueObserver<ValueType>::GetRemaining() const
 {
-	wxMutexLocker lock( m_mutex );
+	wxMutexLocker lock(m_mutex);
 
 	return m_queue.size();
 }
 
-
-template <typename ValueType>
-bool CQueueObserver<ValueType>::IsActive() const
+template <typename ValueType> bool CQueueObserver<ValueType>::IsActive() const
 {
 	return (m_owner != NULL);
 }
 
-
-template <typename ValueType>
-void CQueueObserver<ValueType>::Reset()
+template <typename ValueType> void CQueueObserver<ValueType>::Reset()
 {
-	ObservableType* owner;
+	ObservableType *owner;
 
 	{
 		wxMutexLocker lock(m_mutex);
 		m_queue.clear();
-		owner = const_cast<ObservableType*>( m_owner );
+		owner = const_cast<ObservableType *>(m_owner);
 	}
 
-	owner->RemoveObserver( this );
-	owner->AddObserver( this );
+	owner->RemoveObserver(this);
+	owner->AddObserver(this);
 }
 
-
-
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/OtherFunctions.cpp -> amule-3.1.0.tar.gz/src/OtherFunctions.cpp Changed

@@ -28,75 +28,75 @@
 
 #include <tags/FileTags.h>
 
-#include <wx/filename.h>			// Needed for wxFileName
-#include <wx/log.h>				// Needed for wxLogNull
-#include "config.h"				// Needed for a number of defines
+#include <wx/filename.h> // Needed for wxFileName
+#include <wx/log.h>      // Needed for wxLogNull
+#include "config.h"      // Needed for a number of defines
 
-#include <wx/stdpaths.h>			// Do_not_auto_remove
+#include <wx/stdpaths.h> // Do_not_auto_remove
+#include <wx/regex.h>    // Needed for CompareLatestReleaseVersion tag parse
+#include <wx/tokenzr.h>  // Needed for CompareLatestReleaseVersion tokenizer
 #include <common/StringFunctions.h>
 #include <common/ClientVersion.h>
+#include <common/MediaCodecName.h> // Needed for MediaCodecLabel
 #include <common/MD5Sum.h>
 #include <common/Path.h>
 #include "Logger.h"
-#include "BitVector.h"				// Needed for BitVector
+#include "BitVector.h" // Needed for BitVector
 
-#include "OtherFunctions.h"			// Interface declarations
+#include "OtherFunctions.h" // Interface declarations
 
+#include <clocale> // Needed for setlocale
 #include <map>
 
 #ifdef __WXBASE__
-	#include <cerrno>
+#include <cerrno>
 #else
-	#include <wx/utils.h>
+#include <wx/utils.h>
 #endif
 
-
-
-
-// Formats a filesize in bytes to make it suitable for displaying
-wxString CastItoXBytes( uint64 count )
+// Formats a filesize in bytes for display. IEC units, because the arithmetic below is binary: every
+// step divides by 1024, so a figure labelled "GB" was really gibibytes and read about 7% high
+// against anything measuring in powers of 1000 (issue #930).
+wxString CastItoXBytes(uint64 count)
 {
 
 	if (count < 1024)
-		return wxString(CFormat("%u ") % count) + wxPLURAL("byte", "bytes", count) ;
+		return wxString(CFormat("%u ") % count) + wxPLURAL("byte", "bytes", count);
 	else if (count < 1048576)
-		return wxString(CFormat("%u ") % (count >> 10)) + _("kB") ;
+		return wxString(CFormat("%u ") % (count >> 10)) + _("KiB");
 	else if (count < 1073741824)
-		return wxString(CFormat("%.2f ") % ((float)(uint32)count/1048576)) + _("MB") ;
+		return wxString(CFormat("%.2f ") % ((float)(uint32)count / 1048576)) + _("MiB");
 	else if (count < 1099511627776LL)
-		return wxString(CFormat("%.3f ") % ((float)((uint32)(count/1024))/1048576)) + _("GB") ;
+		return wxString(CFormat("%.3f ") % ((float)((uint32)(count / 1024)) / 1048576)) + _("GiB");
 	else
-		return wxString(CFormat("%.3f ") % ((float)count/1099511627776LL)) + _("TB") ;
+		return wxString(CFormat("%.3f ") % ((float)count / 1099511627776.0f)) + _("TiB");
 }
 
-
 wxString CastItoIShort(uint64 count)
 {
 
 	if (count < 1000)
 		return CFormat("%u") % count;
 	else if (count < 1000000)
-		return wxString(CFormat("%.0f") % ((float)(uint32)count/1000)) + _("k") ;
+		return wxString(CFormat("%.0f") % ((float)(uint32)count / 1000)) + _("k");
 	else if (count < 1000000000)
-		return wxString(CFormat("%.2f") % ((float)(uint32)count/1000000)) + _("M") ;
+		return wxString(CFormat("%.2f") % ((float)(uint32)count / 1000000)) + _("M");
 	else if (count < 1000000000000LL)
-		return wxString(CFormat("%.2f") % ((float)((uint32)(count/1000))/1000000)) + _("G") ;
+		return wxString(CFormat("%.2f") % ((float)((uint32)(count / 1000)) / 1000000)) + _("G");
 	else
-		return wxString(CFormat("%.2f") % ((float)count/1.0e12f)) + _("T");
+		return wxString(CFormat("%.2f") % ((float)count / 1.0e12f)) + _("T");
 }
 
-
 wxString CastItoSpeed(uint32 bytes)
 {
 	if (bytes < 1024)
 		return wxString(CFormat("%u ") % bytes) + wxPLURAL("byte/sec", "bytes/sec", bytes);
 	else if (bytes < 1048576)
-		return wxString(CFormat("%.2f ") % (bytes / 1024.0)) + _("kB/s");
+		return wxString(CFormat("%.2f ") % (bytes / 1024.0)) + _("KiB/s");
 	else
-		return wxString(CFormat("%.2f ") % (bytes / 1048576.0)) + _("MB/s");
+		return wxString(CFormat("%.2f ") % (bytes / 1048576.0)) + _("MiB/s");
 }
 
-
 // Make a time value in seconds suitable for displaying
 wxString CastSecondsToHM(uint32 count, uint16 msecs)
 {
@@ -104,213 +104,198 @@
 		if (!msecs) {
 			return CFormat("%02u %s") % count % _("secs");
 		} else {
-			return CFormat("%.3f %s")
-				% (count + ((float)msecs/1000)) % _("secs");
+			return CFormat("%.3f %s") % (count + ((float)msecs / 1000)) % _("secs");
 		}
 	} else if (count < 3600) {
-		return CFormat("%u:%02u %s")
-			% (count/60) % (count % 60) % _("mins");
+		return CFormat("%u:%02u %s") % (count / 60) % (count % 60) % _("mins");
 	} else if (count < 86400) {
-		return CFormat("%u:%02u %s")
-			% (count/3600) % ((count % 3600)/60) % _("hours");
+		return CFormat("%u:%02u %s") % (count / 3600) % ((count % 3600) / 60) % _("hours");
 	} else {
-		return CFormat("%u %s %02u:%02u %s")
-			% (count/86400) % _("Days")
-			% ((count % 86400)/3600) % ((count % 3600)/60) % _("hours");
+		return CFormat("%u %s %02u:%02u %s") % (count / 86400) % _("days") %
+		       ((count % 86400) / 3600) % ((count % 3600) / 60) % _("hours");
 	}
 }
 
+wxString LabelWithColon(const wxString &label)
+{
+	/* TRANSLATORS:
+	   Punctuation for a "label: value" pair. %s is the already-translated
+	   label. Place the colon as your language requires -- e.g. "%s :" with a
+	   space in French, "%s:" without one in Russian and English. */
+	return CFormat(_("%s:")) % label;
+}
 
-// Codec FOURCC -> human-readable name. Mapping inspired by eMule AI's
-// MediaInfo.cpp (GPL v2+). Implementation rewritten for wx + a small
-// initial set; extend as needed. Unknown / unrecognised codec IDs
-// pass through unchanged so something useful still shows in the UI.
-wxString FormatMediaCodec(const wxString& raw)
+wxString FormatLocalDateTime(const wxDateTime &when)
 {
-	if (raw.IsEmpty()) {
-		return wxEmptyString;
-	}
-	struct CodecEntry { const wxChar *fcc; const wxChar *display; };
-	static const CodecEntry kMap = {
-		// Video
-		{ wxT("H264"), wxT("H.264")          },
-		{ wxT("X264"), wxT("x264")           },
-		{ wxT("AVC1"), wxT("H.264")          },
-		{ wxT("HEVC"), wxT("H.265 / HEVC")   },
-		{ wxT("HVC1"), wxT("H.265 / HEVC")   },
-		{ wxT("XVID"), wxT("Xvid")           },
-		{ wxT("DIVX"), wxT("DivX")           },
-		{ wxT("DX50"), wxT("DivX 5")         },
-		{ wxT("DIV3"), wxT("DivX 3")         },
-		{ wxT("DIV4"), wxT("DivX 4")         },
-		{ wxT("FMP4"), wxT("MPEG-4")         },
-		{ wxT("MP4V"), wxT("MPEG-4")         },
-		{ wxT("MPG4"), wxT("MS MPEG-4 v1")   },
-		{ wxT("MP42"), wxT("MS MPEG-4 v2")   },
-		{ wxT("MP43"), wxT("MS MPEG-4 v3")   },
-		{ wxT("WMV1"), wxT("WMV 7")          },
-		{ wxT("WMV2"), wxT("WMV 8")          },
-		{ wxT("WMV3"), wxT("WMV 9")          },
-		{ wxT("MJPG"), wxT("Motion JPEG")    },
-		{ wxT("VP90"), wxT("VP9")            },
-		{ wxT("VP80"), wxT("VP8")            },
-		{ wxT("AV01"), wxT("AV1")            },
-		// Audio
-		{ wxT("MP3"),  wxT("MP3")            },
-		{ wxT("AAC"),  wxT("AAC")            },
-		{ wxT("AC3"),  wxT("AC-3")           },
-		{ wxT("FLAC"), wxT("FLAC")           },
-		{ wxT("OPUS"), wxT("Opus")           },
-		{ wxT("VORB"), wxT("Vorbis")         },
-		{ wxT("WMA1"), wxT("WMA 1")          },
-		{ wxT("WMA2"), wxT("WMA 2")          },
-	};
+	// %x %X: both halves come from LC_TIME, so a locale that writes the day first, or separates
+	// with dots, or wants a 12-hour clock, gets what it writes -- and every timestamp in the
+	// interface agrees, because they all arrive here.
+	return when.Format("%x %X");
+}
 
-	const wxString upper = raw.Upper();
-	for (const auto& entry : kMap) {
-		if (upper == entry.fcc) {
-			return entry.display;
-		}
-	}
-	return raw;
+wxString FormatLocalDate(const wxDateTime &when)
+{
+	return when.Format("%x");
 }
 
+wxString FormatMediaCodec(const wxString &raw)
+{
+	return wxString::FromUTF8(MediaCodecLabel(std::string(raw.utf8_str())).c_str());
+}
 
 // Examines a filename and determines the filetype
-FileType GetFiletype(const CPath& filename)
+FileType GetFiletype(const CPath &filename)
 {
 	// FIXME: WTF do we have two such functions in the first place?
 	switch (GetED2KFileTypeID(filename)) {
-		case ED2KFT_AUDIO:	return ftAudio;
-		case ED2KFT_VIDEO:	return ftVideo;
-		case ED2KFT_IMAGE:	return ftPicture;
-		case ED2KFT_PROGRAM:	return ftProgram;
-		case ED2KFT_DOCUMENT:	return ftText;
-		case ED2KFT_ARCHIVE:	return ftArchive;
-		case ED2KFT_CDIMAGE:	return ftCDImage;
-		default:		return ftAny;
+	case ED2KFT_AUDIO:
+		return ftAudio;
+	case ED2KFT_VIDEO:
+		return ftVideo;
+	case ED2KFT_IMAGE:
+		return ftPicture;
+	case ED2KFT_PROGRAM:
+		return ftProgram;
+	case ED2KFT_DOCUMENT:
+		return ftText;
+	case ED2KFT_ARCHIVE:
+		return ftArchive;
+	case ED2KFT_CDIMAGE:
+		return ftCDImage;
+	default:
+		return ftAny;
 	}
 }
 
-
 // Returns the (translated) description associated with a FileType
 wxString GetFiletypeDesc(FileType type, bool translated)
 {
-	switch ( type ) {
-		case ftVideo:
-			if (translated) {
-				return _("Videos");
-			} else {
-				return "Videos";
-			}
-			break;
-		case ftAudio:
-			if (translated) {
-				return _("Audio");
-			} else {
-				return "Audio";
-			}
-			break;
-		case ftArchive:
-			if (translated) {
-				return _("Archives");
-			} else {
-				return "Archives";
-			}
-			break;
-		case ftCDImage:
-			if (translated) {
-				return _("CD-Images");
-			} else {
-				return "CD-Images";
-			}
-			break;
-		case ftPicture:
-			if (translated) {
-				return _("Pictures");
-			} else {
-				return "Pictures";
-			}
-			break;
-		case ftText:
-			if (translated) {
-				return _("Texts");
-			} else {
-				return "Texts";
-			}
-			break;
-		case ftProgram:
-			if (translated) {
-				return _("Programs");
-			} else {
-				return "Programs";
-			}
-			break;
-		default:
-			if (translated) {
-				return _("Any");
-			} else {
-				return "Any";
-			}
-			break;
+	switch (type) {
+	case ftVideo:
+		if (translated) {
+			return _("Videos");
+		} else {
+			return "Videos";
+		}
+		break;
+	case ftAudio:
+		if (translated) {
+			return _("Audio");
+		} else {
+			return "Audio";
+		}
+		break;
+	case ftArchive:
+		if (translated) {
+			return _("Archives");
+		} else {
+			return "Archives";
+		}
+		break;
+	case ftCDImage:
+		if (translated) {
+			return _("Disc images");
+		} else {
+			return "Disc images";
+		}
+		break;
+	case ftPicture:
+		if (translated) {
+			return _("Pictures");
+		} else {
+			return "Pictures";
+		}
+		break;
+	case ftText:
+		if (translated) {
+			return _("Texts");
+		} else {
+			return "Texts";
+		}
+		break;
+	case ftProgram:
+		if (translated) {
+			return _("Programs");
+		} else {
+			return "Programs";
+		}
+		break;
+	default:
+		if (translated) {
+			return _("Any");
+		} else {
+			return "Any";
+		}
+		break;
 	}
 }
 
-// Returns the Typename, examining the extension of the given filename
-
-wxString GetFiletypeByName(const CPath& filename, bool translated)
+wxString GetFiletypeByName(const CPath &filename, bool translated)
 {
 	return GetFiletypeDesc(GetFiletype(filename), translated);
 }
 
-
 // Return the text associated with a rating of a file
 wxString GetRateString(uint16 rate)
 {
-	switch ( rate ) {
-		case 0: return _("Not rated");
-		case 1: return _("Invalid / Corrupt / Fake");
-		case 2: return _("Poor");
-		case 3: return _("Fair");
-		case 4: return _("Good");
-		case 5: return _("Excellent");
-		default: return _("Not rated");
+	switch (rate) {
+	case 0:
+		return _("Not rated");
+	case 1:
+		return _("Invalid / Corrupt / Fake");
+	case 2:
+		return _("Poor");
+	case 3:
+		return _("Fair");
+	case 4:
+		return _("Good");
+	case 5:
+		return _("Excellent");
+	default:
+		return _("Not rated");
 	}
 }
 
-
 /**
- * Return the size in bytes of the given size-type
- *
- * @param type The type (as an int) where: 0 = Byte, 1 = KB, 2 = MB, 3 = GB
- *
- * @return The amount of Bytes the provided size-type represents
- *
- * Values over GB aren't handled since the amount of Bytes 1TB represents
- * is over the uint32 capacity
+ * The size in bytes the given size-type represents. @param type 0 = Byte, 1 = KB, 2 = MB, 3 = GB.
+ * Values over GB are not handled, since 1 TB in bytes exceeds uint32.
  */
 uint32 GetTypeSize(uint8 type)
 {
-	enum {Bytes, KB, MB, GB};
+	enum
+	{
+		Bytes,
+		KB,
+		MB,
+		GB
+	};
 	int size;
 
-	switch(type) {
-		case Bytes: size = 1; break;
-		case KB: size = 1024; break;
-		case MB: size = 1048576; break;
-		case GB: size = 1073741824; break;
-		default: size = -1; break;
+	switch (type) {
+	case Bytes:
+		size = 1;
+		break;
+	case KB:
+		size = 1024;
+		break;
+	case MB:
+		size = 1048576;
+		break;
+	case GB:
+		size = 1073741824;
+		break;
+	default:
+		size = -1;
+		break;
 	}
 	return size;
 }
 
-
 // Base16 chars for encode an decode functions
 static wxChar base16Chars17 = L"0123456789ABCDEF";
 static wxChar base32Chars33 = L"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
 #define BASE16_LOOKUP_MAX 23
-static wxChar base16LookupBASE16_LOOKUP_MAX2 = {
-	{ '0', 0x0 },
+static wxChar base16LookupBASE16_LOOKUP_MAX2 = { { '0', 0x0 },
 	{ '1', 0x1 },
 	{ '2', 0x2 },
 	{ '3', 0x3 },
@@ -332,23 +317,14 @@
 	{ 'C', 0xC },
 	{ 'D', 0xD },
 	{ 'E', 0xE },
-	{ 'F', 0xF }
-};
-
+	{ 'F', 0xF } };
 
-// Returns a BASE16 encoded byte array
-//
-// In
-//   buffer: Pointer to byte array
-//   bufLen: Length of buffer array
-//
-// Return
-//   wxString object with BASE16 encoded byte array
-wxString EncodeBase16(const unsigned char* buffer, unsigned int bufLen)
+// Returns a BASE16 encoded byte array.
+wxString EncodeBase16(const unsigned char *buffer, unsigned int bufLen)
 {
 	wxString Base16Buff;
 
-	for(unsigned int i = 0; i < bufLen; ++i) {
+	for (unsigned int i = 0; i < bufLen; ++i) {
 		Base16Buff += base16Charsbufferi >> 4;
 		Base16Buff += base16Charsbufferi & 0xf;
 	}
@@ -356,52 +332,37 @@
 	return Base16Buff;
 }
 
-
-// Decodes a BASE16 string into a byte array
-//
-// In
-//   base16Buffer: String containing BASE16
-//   base16BufLen: Length BASE16 coded string's length
-//
-// Out
-//   buffer: byte array containing decoded string
+// Decodes a BASE16 string into `buffer`.
 unsigned int DecodeBase16(const wxString &base16Buffer, unsigned int base16BufLen, uint8_t *buffer)
 {
 	if (base16BufLen & 1) {
 		return 0;
 	}
 	unsigned int ret = base16BufLen >> 1;
-	memset( buffer, 0,  ret);
-	for(unsigned int i = 0; i < base16BufLen; ++i) {
+	memset(buffer, 0, ret);
+	for (unsigned int i = 0; i < base16BufLen; ++i) {
 		int lookup = toupper(base16Bufferi) - '0';
 		// Check to make sure that the given word falls inside a valid range
-		uint8_t word = (lookup < 0 || lookup >= BASE16_LOOKUP_MAX) ?
-			0xFF : base16Lookuplookup1;
-		if (word == 0xFF) return 0;
+		uint8_t word = (lookup < 0 || lookup >= BASE16_LOOKUP_MAX) ? 0xFF : base16Lookuplookup1;
+		if (word == 0xFF)
+			return 0;
 		unsigned idx = i >> 1;
 		bufferidx = (i & 1) ? // odd or even?
-			(bufferidx | word) : (word << 4);
+				      (bufferidx | word)
+				      : (word << 4);
 	}
 
 	return ret;
 }
 
-
-// Returns a BASE32 encoded byte array
-//
-// In
-//   buffer: Pointer to byte array
-//   bufLen: Length of buffer array
-//
-// Return
-//   wxString object with BASE32 encoded byte array
-wxString EncodeBase32(const unsigned char* buffer, unsigned int bufLen)
+// Returns a BASE32 encoded byte array.
+wxString EncodeBase32(const unsigned char *buffer, unsigned int bufLen)
 {
 	wxString Base32Buff;
 	unsigned int i, index;
 	unsigned char word;
 
-	for(i = 0, index = 0; i < bufLen;) {
+	for (i = 0, index = 0; i < bufLen;) {
 		// Is the current word going to span a byte boundary?
 		if (index > 3) {
 			word = (bufferi & (0xFF >> index));
@@ -418,23 +379,13 @@
 				++i;
 			}
 		}
-		Base32Buff += (char) base32Charsword;
+		Base32Buff += (char)base32Charsword;
 	}
 
 	return Base32Buff;
 }
 
-
-// Decodes a BASE32 string into a byte array
-//
-// In
-//   base32Buffer: String containing BASE32
-//   base32BufLen: Length BASE32 coded string's length
-//
-// Out
-//   buffer: byte array containing decoded string
-// Return
-//   nDecodeLen:
+// Decodes a BASE32 string into `buffer`, returning the decoded length.
 unsigned int DecodeBase32(const wxString &base32Buffer, unsigned int base32BufLen, unsigned char *buffer)
 {
 	size_t nInputLen = base32Buffer.Length();
@@ -451,23 +402,19 @@
 
 	uint32 nBits = 0;
 	int nCount = 0;
-	for (size_t i = 0; i < nInputLen; ++i)
-	{
+	for (size_t i = 0; i < nInputLen; ++i) {
 		if (base32Bufferi >= 'A' && base32Bufferi <= 'Z') {
-			nBits |= ( base32Bufferi - 'A' );
-		}
-		else if (base32Bufferi >= 'a' && base32Bufferi <= 'z') {
-			nBits |= ( base32Bufferi - 'a' );
-		}
-		else if (base32Bufferi >= '2' && base32Bufferi <= '7') {
-			nBits |= ( base32Bufferi - '2' + 26 );
+			nBits |= (base32Bufferi - 'A');
+		} else if (base32Bufferi >= 'a' && base32Bufferi <= 'z') {
+			nBits |= (base32Bufferi - 'a');
+		} else if (base32Bufferi >= '2' && base32Bufferi <= '7') {
+			nBits |= (base32Bufferi - '2' + 26);
 		} else {
 			return 0;
 		}
 		nCount += 5;
-		if (nCount >= 8)
-		{
-			*buffer++ = (uint8_t)( nBits >> (nCount - 8) );
+		if (nCount >= 8) {
+			*buffer++ = (uint8_t)(nBits >> (nCount - 8));
 			nCount -= 8;
 		}
 		nBits <<= 5;
@@ -476,39 +423,35 @@
 	return nDecodeLen;
 }
 
-
 /*
- * base64.c
- *
- * Base64 encoding/decoding command line filter
+ * base64.c -- Base64 encoding/decoding command line filter
  *
  * Copyright (c) 2002-2011 Matthias Gaertner
- * Adapted to use wxWidgets by
- * Copyright (c) 2005-2011 Marcelo Roberto Jimenez ( phoenix@amule.org )
- *
+ * Adapted to use wxWidgets by Copyright (c) 2005-2011 Marcelo Roberto Jimenez ( phoenix@amule.org )
  */
 static const wxString to_b64(
 	/*   0000000000111111111122222222223333333333444444444455555555556666 */
 	/*   0123456789012345678901234567890123456789012345678901234567890123 */
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
 
-
 /* Option variables */
 static bool g_fUseCRLF = false;
 static unsigned int g_nCharsPerLine = 72;
 static wxString strHeaderLine;
 
-
-void SetBase64Header(const wxString& header) { strHeaderLine = header; }
+void SetBase64Header(const wxString &header)
+{
+	strHeaderLine = header;
+}
 
 wxString EncodeBase64(const char *pbBufferIn, unsigned int bufLen)
 {
 	wxString pbBufferOut;
 	wxString strHeader;
 
-	if( !strHeaderLine.IsEmpty() ) {
+	if (!strHeaderLine.IsEmpty()) {
 		strHeader = "-----BEGIN " + strHeaderLine + "-----";
-		if( g_fUseCRLF ) {
+		if (g_fUseCRLF) {
 			strHeader += "\r";
 		}
 		strHeader += "\n";
@@ -519,55 +462,54 @@
 	unsigned int NewLineSize = g_fUseCRLF ? 2 : 1;
 
 	// Allocate enough space in the output buffer to speed up things
-	pbBufferOut.Alloc(
-		strHeader.Len() * 2 +		// header/footer
-		(bufLen * 4) / 3 + 1 +		// Number of codes
-		nDiv           * NewLineSize +	// Number of new lines
-		(nRem ? 1 : 0) * NewLineSize );	// Last line
+	pbBufferOut.Alloc(strHeader.Len() * 2 +          // header/footer
+			  (bufLen * 4) / 3 + 1 +         // Number of codes
+			  nDiv * NewLineSize +           // Number of new lines
+			  (nRem ? 1 : 0) * NewLineSize); // Last line
 	pbBufferOut = strHeader;
 
 	unsigned long nChars = 0;
-	const unsigned char *pIn = (unsigned char*)pbBufferIn;
-	while( nDiv > 0 ) {
-		pbBufferOut += to_b64 (pIn0 >> 2) & 0x3f;
+	const unsigned char *pIn = (unsigned char *)pbBufferIn;
+	while (nDiv > 0) {
+		pbBufferOut += to_b64(pIn0 >> 2) & 0x3f;
 		pbBufferOut += to_b64((pIn0 << 4) & 0x30) | ((pIn1 >> 4) & 0xf);
 		pbBufferOut += to_b64((pIn1 << 2) & 0x3c) | ((pIn2 >> 6) & 0x3);
-		pbBufferOut += to_b64  pIn2 & 0x3f;
+		pbBufferOut += to_b64pIn2 & 0x3f;
 		pIn += 3;
 		nDiv--;
 		nChars += 4;
-		if( nChars >= g_nCharsPerLine && g_nCharsPerLine != 0 ) {
+		if (nChars >= g_nCharsPerLine && g_nCharsPerLine != 0) {
 			nChars = 0;
-			if( g_fUseCRLF ) {
+			if (g_fUseCRLF) {
 				pbBufferOut += "\r";
 			}
 			pbBufferOut += "\n";
 		}
 	}
-	switch( nRem ) {
+	switch (nRem) {
 	case 2:
-		pbBufferOut += to_b64 (pIn0 >> 2) & 0x3f;
+		pbBufferOut += to_b64(pIn0 >> 2) & 0x3f;
 		pbBufferOut += to_b64((pIn0 << 4) & 0x30) | ((pIn1 >> 4) & 0xf);
-		pbBufferOut += to_b64 (pIn1 << 2) & 0x3c;
+		pbBufferOut += to_b64(pIn1 << 2) & 0x3c;
 		pbBufferOut += "=";
 		nChars += 4;
-		if( nChars >= g_nCharsPerLine && g_nCharsPerLine != 0 ) {
+		if (nChars >= g_nCharsPerLine && g_nCharsPerLine != 0) {
 			nChars = 0;
-			if( g_fUseCRLF ) {
+			if (g_fUseCRLF) {
 				pbBufferOut += "\r";
 			}
 			pbBufferOut += "\n";
 		}
 		break;
 	case 1:
-		pbBufferOut += to_b64 (pIn0 >> 2) & 0x3f;
-		pbBufferOut += to_b64 (pIn0 << 4) & 0x30;
+		pbBufferOut += to_b64(pIn0 >> 2) & 0x3f;
+		pbBufferOut += to_b64(pIn0 << 4) & 0x30;
 		pbBufferOut += "=";
 		pbBufferOut += "=";
 		nChars += 4;
-		if( nChars >= g_nCharsPerLine && g_nCharsPerLine != 0 ) {
+		if (nChars >= g_nCharsPerLine && g_nCharsPerLine != 0) {
 			nChars = 0;
-			if( g_fUseCRLF ) {
+			if (g_fUseCRLF) {
 				pbBufferOut += "\r";
 			}
 			pbBufferOut += "\n";
@@ -575,18 +517,18 @@
 		break;
 	}
 
-	if( nRem > 0 ) {
-		if( nChars > 0 ) {
-			if( g_fUseCRLF ) {
+	if (nRem > 0) {
+		if (nChars > 0) {
+			if (g_fUseCRLF) {
 				pbBufferOut += "\r";
 			}
 			pbBufferOut += "\n";
 		}
 	}
 
-	if( !strHeaderLine.IsEmpty() ) {
+	if (!strHeaderLine.IsEmpty()) {
 		pbBufferOut += "-----END " + strHeaderLine + "-----";
-		if( g_fUseCRLF ) {
+		if (g_fUseCRLF) {
 			pbBufferOut += "\r";
 		}
 		pbBufferOut += "\n";
@@ -595,10 +537,9 @@
 	return pbBufferOut;
 }
 
-
 unsigned int DecodeBase64(const wxString &base64Buffer, unsigned int base64BufLen, unsigned char *buffer)
 {
-	int z = 0;  // 0 Normal, 1 skip MIME separator (---) to end of line
+	int z = 0; // 0 Normal, 1 skip MIME separator (---) to end of line
 	unsigned int nData = 0;
 	unsigned int i = 0;
 
@@ -607,33 +548,26 @@
 		nData = 1;
 	}
 
-	for(unsigned int j = 0; j < base64BufLen; ++j) {
+	for (unsigned int j = 0; j < base64BufLen; ++j) {
 		wxChar c = base64Bufferj;
 		wxChar bits = 'z';
-		if( z > 0 ) {
-			if(c == '\n') {
+		if (z > 0) {
+			if (c == '\n') {
 				z = 0;
 			}
-		}
-		else if(c >= 'A' && c <= 'Z') {
+		} else if (c >= 'A' && c <= 'Z') {
 			bits = c - 'A';
-		}
-		else if(c >= 'a' && c <= 'z') {
+		} else if (c >= 'a' && c <= 'z') {
 			bits = c - 'a' + (wxChar)26;
-		}
-		else if(c >= '0' && c <= '9') {
+		} else if (c >= '0' && c <= '9') {
 			bits = c - '0' + (wxChar)52;
-		}
-		else if(c == '+') {
+		} else if (c == '+') {
 			bits = (wxChar)62;
-		}
-		else if(c == '/') {
+		} else if (c == '/') {
 			bits = (wxChar)63;
-		}
-		else if(c == '-') {
+		} else if (c == '-') {
 			z = 1;
-		}
-		else if(c == '=') {
+		} else if (c == '=') {
 			break;
 		} else {
 			bits = 'y';
@@ -644,18 +578,18 @@
 		if (bits < (wxChar)64) {
 			switch (nData++) {
 			case 0:
-				bufferi+0 = (bits << 2) & 0xfc;
+				bufferi + 0 = (bits << 2) & 0xfc;
 				break;
 			case 1:
-				bufferi+0 |= (bits >> 4) & 0x03;
-				bufferi+1 = (bits << 4) & 0xf0;
+				bufferi + 0 |= (bits >> 4) & 0x03;
+				bufferi + 1 = (bits << 4) & 0xf0;
 				break;
 			case 2:
-				bufferi+1 |= (bits >> 2) & 0x0f;
-				bufferi+2 = (bits << 6) & 0xc0;
+				bufferi + 1 |= (bits >> 2) & 0x0f;
+				bufferi + 2 = (bits << 6) & 0xc0;
 				break;
 			case 3:
-				bufferi+2 |= bits & 0x3f;
+				bufferi + 2 |= bits & 0x3f;
 				break;
 			}
 			if (nData == 4) {
@@ -670,389 +604,622 @@
 		nData = 0;
 		i = 0;
 	} else {
-		bufferi+nData = 0;
+		bufferi + nData = 0;
 	}
 
 	return i + nData;
 }
 
-
 // Returns the text associated with a category type
 wxString GetCatTitle(AllCategoryFilter cat)
 {
 	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 "?";
+	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 _("Disc images");
+	case acfPictures:
+		return _("Pictures");
+	case acfText:
+		return _("Text");
+	case acfActive:
+		return _("Active");
+	default:
+		return "?";
 	}
 }
 
-
 typedef std::map<wxString, EED2KFileTypeClass> SED2KFileTypeMap;
 typedef SED2KFileTypeMap::value_type SED2KFileTypeMapElement;
 static SED2KFileTypeMap ED2KFileTypesMap;
 
-
-class CED2KFileTypes{
+class CED2KFileTypes
+{
 public:
 	CED2KFileTypes()
 	{
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".669",   ED2KFT_AUDIO));		// 8 channel tracker module
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".aa",    ED2KFT_AUDIO));		// Audible Audiobook File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".aac",   ED2KFT_AUDIO));		// Advanced Audio Coding File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".aax",   ED2KFT_AUDIO));		// Audible Enhanced Audiobook File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ac3",   ED2KFT_AUDIO));		// Audio Codec 3 File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".aif",   ED2KFT_AUDIO));		// Audio Interchange File Format
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".aifc",  ED2KFT_AUDIO));		// Audio Interchange File Format
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".aiff",  ED2KFT_AUDIO));		// Audio Interchange File Format
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".amf",   ED2KFT_AUDIO));		// DSMI Advanced Module Format
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".amr",   ED2KFT_AUDIO));		// Adaptive Multi-Rate Codec File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ams",   ED2KFT_AUDIO));		// Extreme Tracker Module
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ape",   ED2KFT_AUDIO));		// Monkey's Audio Lossless Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".au",    ED2KFT_AUDIO));		// Audio File (Sun, Unix)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".aud",   ED2KFT_AUDIO));		// General Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".audio", ED2KFT_AUDIO));		// General Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".caf",   ED2KFT_AUDIO));		// Apple Core Audio Format File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cda",   ED2KFT_AUDIO));		// CD Audio Track
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dbm",   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dff",   ED2KFT_AUDIO));		// DSDIFF Audio File (high-res)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dmf",   ED2KFT_AUDIO));		// Delusion Digital Music File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dsf",   ED2KFT_AUDIO));		// DSD Stream Audio File (high-res)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dsm",   ED2KFT_AUDIO));		// Digital Sound Module
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dts",   ED2KFT_AUDIO));		// DTS Encoded Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".far",   ED2KFT_AUDIO));		// Farandole Composer Module
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".flac",  ED2KFT_AUDIO));		// Free Lossless Audio Codec File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".it",    ED2KFT_AUDIO));		// Impulse Tracker Module
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m1a",   ED2KFT_AUDIO));		// MPEG-1 Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m2a",   ED2KFT_AUDIO));		// MPEG-2 Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m4a",   ED2KFT_AUDIO));		// MPEG-4 Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m4b",   ED2KFT_AUDIO));		// MPEG-4 Audiobook File (M4A audio with chapters)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mdl",   ED2KFT_AUDIO));		// DigiTrakker Module
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".med",   ED2KFT_AUDIO));		// Amiga MED Sound File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mid",   ED2KFT_AUDIO));		// MIDI File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".midi",  ED2KFT_AUDIO));		// MIDI File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mka",   ED2KFT_AUDIO));		// Matroska Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mod",   ED2KFT_AUDIO));		// Amiga Music Module File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mol",   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mp1",   ED2KFT_AUDIO));		// MPEG-1 Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mp2",   ED2KFT_AUDIO));		// MPEG-2 Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mp3",   ED2KFT_AUDIO));		// MPEG-1/2 Audio Layer 3 File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpa",   ED2KFT_AUDIO));		// MPEG Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpc",   ED2KFT_AUDIO));		// Musepack Compressed Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpp",   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mtm",   ED2KFT_AUDIO));		// MultiTracker Module
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".nst",   ED2KFT_AUDIO));		// NoiseTracker
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".oga",   ED2KFT_AUDIO));		// Ogg Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ogg",   ED2KFT_AUDIO));		// Ogg Vorbis Compressed Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".okt",   ED2KFT_AUDIO));		// Oktalyzer Module (Amiga)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".opus",  ED2KFT_AUDIO));		// Opus Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".psm",   ED2KFT_AUDIO));		// Protracker Studio Module
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ptm",   ED2KFT_AUDIO));		// PolyTracker Module
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ra",    ED2KFT_AUDIO));		// Real Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rmi",   ED2KFT_AUDIO));		// MIDI File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".s3m",   ED2KFT_AUDIO));		// Scream Tracker 3 Module
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".snd",   ED2KFT_AUDIO));		// Audio File (Sun, Unix)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".stm",   ED2KFT_AUDIO));		// Scream Tracker 2 Module
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ult",   ED2KFT_AUDIO));		// UltraTracker
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".umx",   ED2KFT_AUDIO));		// Unreal Music Package
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wav",   ED2KFT_AUDIO));		// WAVE Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".weba",  ED2KFT_AUDIO));		// WebM Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wma",   ED2KFT_AUDIO));		// Windows Media Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wow",   ED2KFT_AUDIO));		// Grave Composer audio tracker
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wv",    ED2KFT_AUDIO));		// WavPack Lossless Audio File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xm",    ED2KFT_AUDIO));		// Fasttracker 2 Extended Module
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".3g2",   ED2KFT_VIDEO));		// 3GPP Multimedia File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".3gp",   ED2KFT_VIDEO));		// 3GPP Multimedia File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".3gp2",  ED2KFT_VIDEO));		// 3GPP Multimedia File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".3gpp",  ED2KFT_VIDEO));		// 3GPP Multimedia File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".asf",   ED2KFT_VIDEO));		// Advanced Systems Format (MS)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".amv",   ED2KFT_VIDEO));		// Anime Music Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".avi",   ED2KFT_VIDEO));		// Audio Video Interleave File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bik",   ED2KFT_VIDEO));		// BINK Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".divx",  ED2KFT_VIDEO));		// DivX-Encoded Movie File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dvr-ms",ED2KFT_VIDEO));		// Microsoft Digital Video Recording
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".f4v",   ED2KFT_VIDEO));		// Flash MP4 Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".flc",   ED2KFT_VIDEO));		// FLIC Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".fli",   ED2KFT_VIDEO));		// FLIC Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".flic",  ED2KFT_VIDEO));		// FLIC Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".flv",   ED2KFT_VIDEO));		// Flash Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".h264",  ED2KFT_VIDEO));		// H.264 Raw Video Stream
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".h265",  ED2KFT_VIDEO));		// H.265 Raw Video Stream
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".hdmov", ED2KFT_VIDEO));		// High-Definition QuickTime Movie
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".hevc",  ED2KFT_VIDEO));		// HEVC Raw Video Stream
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ifo",   ED2KFT_VIDEO));		// DVD-Video Disc Information File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m1v",   ED2KFT_VIDEO));		// MPEG-1 Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m2t",   ED2KFT_VIDEO));		// MPEG-2 Video Transport Stream
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m2ts",  ED2KFT_VIDEO));		// MPEG-2 Video Transport Stream
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m2v",   ED2KFT_VIDEO));		// MPEG-2 Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m4v",   ED2KFT_VIDEO));		// MPEG-4 Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mkv",   ED2KFT_VIDEO));		// Matroska Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mov",   ED2KFT_VIDEO));		// QuickTime Movie File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".movie", ED2KFT_VIDEO));		// QuickTime Movie File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mp1v",  ED2KFT_VIDEO));		// MPEG-1 Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mp2v",  ED2KFT_VIDEO));		// MPEG-2 Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mp4",   ED2KFT_VIDEO));		// MPEG-4 Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpe",   ED2KFT_VIDEO));		// MPEG-1 Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpeg",  ED2KFT_VIDEO));		// MPEG Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpg",   ED2KFT_VIDEO));		// MPEG Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mps",   ED2KFT_VIDEO));		// MPEG Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpv",   ED2KFT_VIDEO));		// MPEG Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpv1",  ED2KFT_VIDEO));		// MPEG-1 Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpv2",  ED2KFT_VIDEO));		// MPEG-2 Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mts",   ED2KFT_VIDEO));		// AVCHD Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mxf",   ED2KFT_VIDEO));		// Material Exchange Format File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ogm",   ED2KFT_VIDEO));		// Ogg Media File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ogv",   ED2KFT_VIDEO));		// Ogg Theora Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pva",   ED2KFT_VIDEO));		// MPEG Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".qt",    ED2KFT_VIDEO));		// QuickTime Movie
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ram",   ED2KFT_VIDEO));		// Real Audio Media
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ratdvd",ED2KFT_VIDEO));		// RatDVD Disk Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rm",    ED2KFT_VIDEO));		// Real Media File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rmm",   ED2KFT_VIDEO));		// Real Media File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rmvb",  ED2KFT_VIDEO));		// Real Video Variable Bit Rate File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rv",    ED2KFT_VIDEO));		// Real Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rv9",   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".smil",  ED2KFT_VIDEO));		// SMIL Presentation File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".smk",   ED2KFT_VIDEO));		// Smacker Compressed Movie File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".swf",   ED2KFT_VIDEO));		// Macromedia Flash Movie
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tp",    ED2KFT_VIDEO));		// Video Transport Stream File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ts",    ED2KFT_VIDEO));		// Video Transport Stream File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vid",   ED2KFT_VIDEO));		// General Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".video", ED2KFT_VIDEO));		// General Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vivo",  ED2KFT_VIDEO));		// VivoActive Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vob",   ED2KFT_VIDEO));		// DVD Video Object File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vp6",   ED2KFT_VIDEO));		// TrueMotion VP6 Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".webm",  ED2KFT_VIDEO));		// WebM Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wm",    ED2KFT_VIDEO));		// Windows Media Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wmv",   ED2KFT_VIDEO));		// Windows Media Video File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xvid",  ED2KFT_VIDEO));		// Xvid-Encoded Video File
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".apng",  ED2KFT_IMAGE));		// Animated PNG File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".arw",   ED2KFT_IMAGE));		// Sony Alpha RAW Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".avif",  ED2KFT_IMAGE));		// AV1 Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bmp",   ED2KFT_IMAGE));		// Bitmap Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cr2",   ED2KFT_IMAGE));		// Canon RAW 2 Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cr3",   ED2KFT_IMAGE));		// Canon RAW 3 Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dcx",   ED2KFT_IMAGE));		// FAXserve Fax Document
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dng",   ED2KFT_IMAGE));		// Digital Negative RAW Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".emf",   ED2KFT_IMAGE));		// Enhanced Windows Metafile
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".gif",   ED2KFT_IMAGE));		// Graphical Interchange Format File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".heic",  ED2KFT_IMAGE));		// High Efficiency Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".heif",  ED2KFT_IMAGE));		// High Efficiency Image Format File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ico",   ED2KFT_IMAGE));		// Icon File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".j2k",   ED2KFT_IMAGE));		// JPEG 2000 Code Stream
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jfif",  ED2KFT_IMAGE));		// JPEG File Interchange Format
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jp2",   ED2KFT_IMAGE));		// JPEG 2000 Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jpe",   ED2KFT_IMAGE));		// JPEG Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jpeg",  ED2KFT_IMAGE));		// JPEG Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jpg",   ED2KFT_IMAGE));		// JPEG Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jxl",   ED2KFT_IMAGE));		// JPEG XL Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".nef",   ED2KFT_IMAGE));		// Nikon Electronic Format RAW Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".orf",   ED2KFT_IMAGE));		// Olympus RAW Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pct",   ED2KFT_IMAGE));		// PICT Picture File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pcx",   ED2KFT_IMAGE));		// Paintbrush Bitmap Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pic",   ED2KFT_IMAGE));		// PICT Picture File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pict",  ED2KFT_IMAGE));		// PICT Picture File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".png",   ED2KFT_IMAGE));		// Portable Network Graphic
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".psd",   ED2KFT_IMAGE));		// Photoshop Document
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".psp",   ED2KFT_IMAGE));		// Paint Shop Pro Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".raf",   ED2KFT_IMAGE));		// Fujifilm RAW Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rw2",   ED2KFT_IMAGE));		// Panasonic RAW Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".svg",   ED2KFT_IMAGE));		// Scalable Vector Graphics File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tga",   ED2KFT_IMAGE));		// Targa Graphic
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tif",   ED2KFT_IMAGE));		// Tagged Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tiff",  ED2KFT_IMAGE));		// Tagged Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wbmp",  ED2KFT_IMAGE));		// Wireless Application Protocol Bitmap Format
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".webp",  ED2KFT_IMAGE));		// Weppy Photo File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wmf",   ED2KFT_IMAGE));		// Windows Metafile
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wmp",   ED2KFT_IMAGE));		// Windows Media Photo File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xcf",   ED2KFT_IMAGE));		// GIMP Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xif",   ED2KFT_IMAGE));		// ScanSoft Pagis Extended Image Format File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xpm",   ED2KFT_IMAGE));		// X-Windows Pixmap
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".7z",    ED2KFT_ARCHIVE));	// 7-Zip Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ace",   ED2KFT_ARCHIVE));	// WinAce Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".alz",   ED2KFT_ARCHIVE));	// ALZip Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".arc",   ED2KFT_ARCHIVE));	// Compressed File Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".arj",   ED2KFT_ARCHIVE));	// ARJ Compressed File Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bz2",   ED2KFT_ARCHIVE));	// Bzip Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cab",   ED2KFT_ARCHIVE));	// Cabinet File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cb7",   ED2KFT_ARCHIVE));	// Comic Book 7-Zip Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cba",   ED2KFT_ARCHIVE));	// Comic Book ACE Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cbr",   ED2KFT_ARCHIVE));	// Comic Book RAR Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cbt",   ED2KFT_ARCHIVE));	// Comic Book Tarball
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cbz",   ED2KFT_ARCHIVE));	// Comic Book ZIP Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".gz",    ED2KFT_ARCHIVE));	// Gnu Zipped File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".hqx",   ED2KFT_ARCHIVE));	// BinHex 4.0 Encoded File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".lha",   ED2KFT_ARCHIVE));	// LHARC Compressed Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".lz",    ED2KFT_ARCHIVE));	// Lzip Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".lz4",   ED2KFT_ARCHIVE));	// LZ4 Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".lzh",   ED2KFT_ARCHIVE));	// LZH Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".lzma",  ED2KFT_ARCHIVE));	// LZMA Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pak",   ED2KFT_ARCHIVE));	// PAK (Packed) File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".par",   ED2KFT_ARCHIVE));	// Parchive Index File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".par2",  ED2KFT_ARCHIVE));	// Parchive 2 Index File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rar",   ED2KFT_ARCHIVE));	// WinRAR Compressed Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".sea",   ED2KFT_ARCHIVE));	// Self-Extracting Archive (Mac)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".sit",   ED2KFT_ARCHIVE));	// Stuffit Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".sitx",  ED2KFT_ARCHIVE));	// Stuffit X Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tar",   ED2KFT_ARCHIVE));	// Consolidated Unix File Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tbz2",  ED2KFT_ARCHIVE));	// Tar BZip 2 Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tgz",   ED2KFT_ARCHIVE));	// Gzipped Tar File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tlz",   ED2KFT_ARCHIVE));	// Tar LZMA Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".txz",   ED2KFT_ARCHIVE));	// Tar XZ Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".uc2",   ED2KFT_ARCHIVE));	// UltraCompressor 2 Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xz",    ED2KFT_ARCHIVE));	// XZ Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".z",     ED2KFT_ARCHIVE));	// Unix Compressed File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".zip",   ED2KFT_ARCHIVE));	// Zipped File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".zoo",   ED2KFT_ARCHIVE));	// Zoo Archive
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".zst",   ED2KFT_ARCHIVE));	// Zstandard Compressed File
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".apk",   ED2KFT_PROGRAM));	// Android Application Package
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".app",   ED2KFT_PROGRAM));	// macOS Application Bundle
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".appimage", ED2KFT_PROGRAM));	// Linux AppImage Application
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".appx",  ED2KFT_PROGRAM));	// Windows App Package
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bat",   ED2KFT_PROGRAM));	// Batch File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cmd",   ED2KFT_PROGRAM));	// Command File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".com",   ED2KFT_PROGRAM));	// COM File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cpl",   ED2KFT_PROGRAM));	// Windows Control Panel Applet
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".deb",   ED2KFT_PROGRAM));	// Debian Software Package
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".exe",   ED2KFT_PROGRAM));	// Executable File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".flatpak", ED2KFT_PROGRAM));	// Flatpak Application Package
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".hta",   ED2KFT_PROGRAM));	// HTML Application
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jar",   ED2KFT_PROGRAM));	// Java Archive (application/library)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".js",    ED2KFT_PROGRAM));	// Java Script
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jse",   ED2KFT_PROGRAM));	// Encoded  Java Script
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".msc",   ED2KFT_PROGRAM));	// Microsoft Common Console File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".msi",   ED2KFT_PROGRAM));	// Microsoft Installer Package
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".msix",  ED2KFT_PROGRAM));	// Windows App Package
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ps1",   ED2KFT_PROGRAM));	// PowerShell Script
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".psd1",  ED2KFT_PROGRAM));	// PowerShell Data File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".psm1",  ED2KFT_PROGRAM));	// PowerShell Module File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rpm",   ED2KFT_PROGRAM));	// RPM Software Package
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".scr",   ED2KFT_PROGRAM));	// Windows Screensaver Executable
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".sh",    ED2KFT_PROGRAM));	// Unix Shell Script
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".snap",  ED2KFT_PROGRAM));	// Snap Application Package
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vbe",   ED2KFT_PROGRAM));	// Encoded Visual Basic Script File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vbs",   ED2KFT_PROGRAM));	// Visual Basic Script File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wsf",   ED2KFT_PROGRAM));	// Windows Script File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wsh",   ED2KFT_PROGRAM));	// Windows Scripting Host File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xpi",   ED2KFT_PROGRAM));	// Mozilla browser extension package
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".b5t",   ED2KFT_CDIMAGE));	// BlindWrite 5 Disc Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".b6t",   ED2KFT_CDIMAGE));	// BlindWrite 6 Disc Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bin",   ED2KFT_CDIMAGE));	// CD Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bwa",   ED2KFT_CDIMAGE));	// BlindWrite Disk Information File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bwi",   ED2KFT_CDIMAGE));	// BlindWrite CD/DVD Disc Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bws",   ED2KFT_CDIMAGE));	// BlindWrite Sub Code File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bwt",   ED2KFT_CDIMAGE));	// BlindWrite 4 Disk Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ccd",   ED2KFT_CDIMAGE));	// CloneCD Disk Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cdi",   ED2KFT_CDIMAGE));	// DiscJuggler Disc Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cue",   ED2KFT_CDIMAGE));	// Cue Sheet File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".daa",   ED2KFT_CDIMAGE));	// PowerISO Disc Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dmg",   ED2KFT_CDIMAGE));	// Mac OS X Disk Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".img",   ED2KFT_CDIMAGE));	// Disk Image Data File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".iso",   ED2KFT_CDIMAGE));	// Disc Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".isz",   ED2KFT_CDIMAGE));	// Compressed ISO Disc Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mdf",   ED2KFT_CDIMAGE));	// Media Disc Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mds",   ED2KFT_CDIMAGE));	// Media Descriptor File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mdx",   ED2KFT_CDIMAGE));	// DAEMON Tools Disc Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".nrg",   ED2KFT_CDIMAGE));	// Nero CD/DVD Image File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".qcow2", ED2KFT_CDIMAGE));	// QEMU Copy-On-Write Disk Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".sub",   ED2KFT_CDIMAGE));	// CloneCD subchannel data file
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".toast", ED2KFT_CDIMAGE));	// Toast Disc Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".uif",   ED2KFT_CDIMAGE));	// MagicISO Disc Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vcd",   ED2KFT_CDIMAGE));	// Virtual CD Disc Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vdi",   ED2KFT_CDIMAGE));	// VirtualBox Virtual Disk Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vhd",   ED2KFT_CDIMAGE));	// Virtual Hard Disk Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vhdx",  ED2KFT_CDIMAGE));	// Hyper-V Virtual Hard Disk Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vmdk",  ED2KFT_CDIMAGE));	// VMware Virtual Disk Image
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wim",   ED2KFT_CDIMAGE));	// Windows Imaging Format File
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".azw",   ED2KFT_DOCUMENT));	// EBook File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".azw3",  ED2KFT_DOCUMENT));	// Amazon Kindle KF8 E-Book
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".chm",   ED2KFT_DOCUMENT));	// Compiled HTML Help File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".css",   ED2KFT_DOCUMENT));	// Cascading Style Sheet
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".csv",   ED2KFT_DOCUMENT));	// Comma-Separated Values File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".diz",   ED2KFT_DOCUMENT));	// Description in Zip File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".djvu",  ED2KFT_DOCUMENT));	// DjVu Document
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".doc",   ED2KFT_DOCUMENT));	// Document File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".docm",  ED2KFT_DOCUMENT));	// Microsoft Word Macro-Enabled Document
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".docx",  ED2KFT_DOCUMENT));	// Microsoft Word Document (OOXML)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dot",   ED2KFT_DOCUMENT));	// Document Template File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dotx",  ED2KFT_DOCUMENT));	// Microsoft Word Template (OOXML)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".epub",  ED2KFT_DOCUMENT));	// EBook File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".fb2",   ED2KFT_DOCUMENT));	// FictionBook 2 E-Book
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".hlp",   ED2KFT_DOCUMENT));	// Help File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".htm",   ED2KFT_DOCUMENT));	// HTML File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".html",  ED2KFT_DOCUMENT));	// HTML File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".json",  ED2KFT_DOCUMENT));	// JSON File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".key",   ED2KFT_DOCUMENT));	// Apple Keynote Presentation
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".kfx",   ED2KFT_DOCUMENT));	// Amazon Kindle KFX E-Book
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".markdown", ED2KFT_DOCUMENT));	// Markdown Document
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".md",    ED2KFT_DOCUMENT));	// Markdown Document
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mobi",  ED2KFT_DOCUMENT));	// EBook File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".nfo",   ED2KFT_DOCUMENT));	// Warez Information File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".numbers", ED2KFT_DOCUMENT));	// Apple Numbers Spreadsheet
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".odp",   ED2KFT_DOCUMENT));	// OpenDocument Presentation
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ods",   ED2KFT_DOCUMENT));	// OpenDocument Spreadsheet
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".odt",   ED2KFT_DOCUMENT));	// OpenDocument File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".otp",   ED2KFT_DOCUMENT));	// OpenDocument Presentation Template
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ott",   ED2KFT_DOCUMENT));	// OpenDocument Template File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ots",   ED2KFT_DOCUMENT));	// OpenDocument Spreadsheet Template
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".oxps",  ED2KFT_DOCUMENT));	// OpenXPS Document
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pages", ED2KFT_DOCUMENT));	// Apple Pages Document
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pdf",   ED2KFT_DOCUMENT));	// Portable Document Format File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".potx",  ED2KFT_DOCUMENT));	// Microsoft PowerPoint Template (OOXML)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pps",   ED2KFT_DOCUMENT));	// PowerPoint Slide Show
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ppsx",  ED2KFT_DOCUMENT));	// Microsoft PowerPoint Slide Show (OOXML)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ppt",   ED2KFT_DOCUMENT));	// PowerPoint Presentation
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pptm",  ED2KFT_DOCUMENT));	// Microsoft PowerPoint Macro-Enabled Presentation
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pptx",  ED2KFT_DOCUMENT));	// Microsoft PowerPoint Presentation (OOXML)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ps",    ED2KFT_DOCUMENT));	// PostScript File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rtf",   ED2KFT_DOCUMENT));	// Rich Text Format File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".stc",   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Spreadsheet Template
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".sti",   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Presentation Template
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".stw",   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Document Template File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".sxc",   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Spreadsheet
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".sxi",   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Presentation
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".sxw",   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Document File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tex",   ED2KFT_DOCUMENT));	// LaTeX Source Document
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".text",  ED2KFT_DOCUMENT));	// General Text File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".txt",   ED2KFT_DOCUMENT));	// Text File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wri",   ED2KFT_DOCUMENT));	// Windows Write Document
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xls",   ED2KFT_DOCUMENT));	// Microsoft Excel Spreadsheet
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xlsm",  ED2KFT_DOCUMENT));	// Microsoft Excel Macro-Enabled Spreadsheet
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xlsx",  ED2KFT_DOCUMENT));	// Microsoft Excel Spreadsheet (OOXML)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xlt",   ED2KFT_DOCUMENT));	// Microsoft Excel Template
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xltx",  ED2KFT_DOCUMENT));	// Microsoft Excel Template (OOXML)
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xml",   ED2KFT_DOCUMENT));	// XML File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xps",   ED2KFT_DOCUMENT));	// XML Paper Specification Document
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".yaml",  ED2KFT_DOCUMENT));	// YAML File
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".yml",   ED2KFT_DOCUMENT));	// YAML File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".669", ED2KFT_AUDIO)); // 8 channel tracker module
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".aa", ED2KFT_AUDIO)); // Audible Audiobook File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".aac", ED2KFT_AUDIO)); // Advanced Audio Coding File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".aax", ED2KFT_AUDIO)); // Audible Enhanced Audiobook File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ac3", ED2KFT_AUDIO)); // Audio Codec 3 File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".aif", ED2KFT_AUDIO)); // Audio Interchange File Format
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".aifc", ED2KFT_AUDIO)); // Audio Interchange File Format
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".aiff", ED2KFT_AUDIO)); // Audio Interchange File Format
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".amf", ED2KFT_AUDIO)); // DSMI Advanced Module Format
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".amr", ED2KFT_AUDIO)); // Adaptive Multi-Rate Codec File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ams", ED2KFT_AUDIO)); // Extreme Tracker Module
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ape", ED2KFT_AUDIO)); // Monkey's Audio Lossless Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".au", ED2KFT_AUDIO)); // Audio File (Sun, Unix)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".aud", ED2KFT_AUDIO)); // General Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".audio", ED2KFT_AUDIO)); // General Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".caf", ED2KFT_AUDIO)); // Apple Core Audio Format File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cda", ED2KFT_AUDIO)); // CD Audio Track
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".dbm", ED2KFT_AUDIO));
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".dff", ED2KFT_AUDIO)); // DSDIFF Audio File (high-res)
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".dmf", ED2KFT_AUDIO)); // Delusion Digital Music File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".dsf", ED2KFT_AUDIO)); // DSD Stream Audio File (high-res)
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".dsm", ED2KFT_AUDIO)); // Digital Sound Module
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".dts", ED2KFT_AUDIO)); // DTS Encoded Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".far", ED2KFT_AUDIO)); // Farandole Composer Module
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".flac", ED2KFT_AUDIO)); // Free Lossless Audio Codec File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".it", ED2KFT_AUDIO)); // Impulse Tracker Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m1a", ED2KFT_AUDIO)); // MPEG-1 Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m2a", ED2KFT_AUDIO)); // MPEG-2 Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m4a", ED2KFT_AUDIO)); // MPEG-4 Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".m4b", ED2KFT_AUDIO)); // MPEG-4 Audiobook File (M4A audio with chapters)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mdl", ED2KFT_AUDIO)); // DigiTrakker Module
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".med", ED2KFT_AUDIO)); // Amiga MED Sound File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mid", ED2KFT_AUDIO));  // MIDI File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".midi", ED2KFT_AUDIO)); // MIDI File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mka", ED2KFT_AUDIO)); // Matroska Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".mod", ED2KFT_AUDIO)); // Amiga Music Module File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mol", ED2KFT_AUDIO));
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mp1", ED2KFT_AUDIO)); // MPEG-1 Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mp2", ED2KFT_AUDIO)); // MPEG-2 Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".mp3", ED2KFT_AUDIO)); // MPEG-1/2 Audio Layer 3 File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpa", ED2KFT_AUDIO)); // MPEG Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".mpc", ED2KFT_AUDIO)); // Musepack Compressed Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpp", ED2KFT_AUDIO));
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mtm", ED2KFT_AUDIO)); // MultiTracker Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".nst", ED2KFT_AUDIO)); // NoiseTracker
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".oga", ED2KFT_AUDIO)); // Ogg Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ogg", ED2KFT_AUDIO)); // Ogg Vorbis Compressed Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".okt", ED2KFT_AUDIO)); // Oktalyzer Module (Amiga)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".opus", ED2KFT_AUDIO)); // Opus Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".psm", ED2KFT_AUDIO)); // Protracker Studio Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ptm", ED2KFT_AUDIO)); // PolyTracker Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ra", ED2KFT_AUDIO));  // Real Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rmi", ED2KFT_AUDIO)); // MIDI File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".s3m", ED2KFT_AUDIO)); // Scream Tracker 3 Module
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".snd", ED2KFT_AUDIO)); // Audio File (Sun, Unix)
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".stm", ED2KFT_AUDIO)); // Scream Tracker 2 Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ult", ED2KFT_AUDIO)); // UltraTracker
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".umx", ED2KFT_AUDIO)); // Unreal Music Package
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wav", ED2KFT_AUDIO));  // WAVE Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".weba", ED2KFT_AUDIO)); // WebM Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".wma", ED2KFT_AUDIO)); // Windows Media Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".wow", ED2KFT_AUDIO)); // Grave Composer audio tracker
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".wv", ED2KFT_AUDIO)); // WavPack Lossless Audio File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".xm", ED2KFT_AUDIO)); // Fasttracker 2 Extended Module
+
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".3g2", ED2KFT_VIDEO)); // 3GPP Multimedia File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".3gp", ED2KFT_VIDEO)); // 3GPP Multimedia File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".3gp2", ED2KFT_VIDEO)); // 3GPP Multimedia File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".3gpp", ED2KFT_VIDEO)); // 3GPP Multimedia File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".asf", ED2KFT_VIDEO)); // Advanced Systems Format (MS)
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".amv", ED2KFT_VIDEO)); // Anime Music Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".avi", ED2KFT_VIDEO)); // Audio Video Interleave File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bik", ED2KFT_VIDEO)); // BINK Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".divx", ED2KFT_VIDEO)); // DivX-Encoded Movie File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".dvr-ms", ED2KFT_VIDEO)); // Microsoft Digital Video Recording
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".f4v", ED2KFT_VIDEO)); // Flash MP4 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".flc", ED2KFT_VIDEO));  // FLIC Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".fli", ED2KFT_VIDEO));  // FLIC Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".flic", ED2KFT_VIDEO)); // FLIC Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".flv", ED2KFT_VIDEO));  // Flash Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".h264", ED2KFT_VIDEO)); // H.264 Raw Video Stream
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".h265", ED2KFT_VIDEO)); // H.265 Raw Video Stream
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".hdmov", ED2KFT_VIDEO)); // High-Definition QuickTime Movie
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".hevc", ED2KFT_VIDEO)); // HEVC Raw Video Stream
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ifo", ED2KFT_VIDEO)); // DVD-Video Disc Information File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m1v", ED2KFT_VIDEO)); // MPEG-1 Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".m2t", ED2KFT_VIDEO)); // MPEG-2 Video Transport Stream
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".m2ts", ED2KFT_VIDEO)); // MPEG-2 Video Transport Stream
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m2v", ED2KFT_VIDEO)); // MPEG-2 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".m4v", ED2KFT_VIDEO)); // MPEG-4 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mkv", ED2KFT_VIDEO)); // Matroska Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".mov", ED2KFT_VIDEO)); // QuickTime Movie File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".movie", ED2KFT_VIDEO)); // QuickTime Movie File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mp1v", ED2KFT_VIDEO)); // MPEG-1 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mp2v", ED2KFT_VIDEO)); // MPEG-2 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mp4", ED2KFT_VIDEO));  // MPEG-4 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpe", ED2KFT_VIDEO));  // MPEG-1 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpeg", ED2KFT_VIDEO)); // MPEG Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpg", ED2KFT_VIDEO));  // MPEG Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mps", ED2KFT_VIDEO));  // MPEG Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpv", ED2KFT_VIDEO));  // MPEG Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpv1", ED2KFT_VIDEO)); // MPEG-1 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mpv2", ED2KFT_VIDEO)); // MPEG-2 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mts", ED2KFT_VIDEO));  // AVCHD Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".mxf", ED2KFT_VIDEO)); // Material Exchange Format File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ogm", ED2KFT_VIDEO)); // Ogg Media File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ogv", ED2KFT_VIDEO)); // Ogg Theora Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pva", ED2KFT_VIDEO)); // MPEG Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".qt", ED2KFT_VIDEO));  // QuickTime Movie
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ram", ED2KFT_VIDEO)); // Real Audio Media
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ratdvd", ED2KFT_VIDEO));              // RatDVD Disk Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rm", ED2KFT_VIDEO));  // Real Media File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rmm", ED2KFT_VIDEO)); // Real Media File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".rmvb", ED2KFT_VIDEO)); // Real Video Variable Bit Rate File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rv", ED2KFT_VIDEO)); // Real Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rv9", ED2KFT_VIDEO));
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".smil", ED2KFT_VIDEO)); // SMIL Presentation File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".smk", ED2KFT_VIDEO)); // Smacker Compressed Movie File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".swf", ED2KFT_VIDEO)); // Macromedia Flash Movie
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".tp", ED2KFT_VIDEO)); // Video Transport Stream File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ts", ED2KFT_VIDEO)); // Video Transport Stream File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".vid", ED2KFT_VIDEO)); // General Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".video", ED2KFT_VIDEO)); // General Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".vivo", ED2KFT_VIDEO)); // VivoActive Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".vob", ED2KFT_VIDEO)); // DVD Video Object File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".vp6", ED2KFT_VIDEO)); // TrueMotion VP6 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".webm", ED2KFT_VIDEO)); // WebM Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".wm", ED2KFT_VIDEO)); // Windows Media Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".wmv", ED2KFT_VIDEO)); // Windows Media Video File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".xvid", ED2KFT_VIDEO)); // Xvid-Encoded Video File
+
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".apng", ED2KFT_IMAGE)); // Animated PNG File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".arw", ED2KFT_IMAGE)); // Sony Alpha RAW Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".avif", ED2KFT_IMAGE)); // AV1 Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bmp", ED2KFT_IMAGE));  // Bitmap Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cr2", ED2KFT_IMAGE));  // Canon RAW 2 Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cr3", ED2KFT_IMAGE));  // Canon RAW 3 Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".dcx", ED2KFT_IMAGE)); // FAXserve Fax Document
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".dng", ED2KFT_IMAGE)); // Digital Negative RAW Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".emf", ED2KFT_IMAGE)); // Enhanced Windows Metafile
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".gif", ED2KFT_IMAGE)); // Graphical Interchange Format File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".heic", ED2KFT_IMAGE)); // High Efficiency Image File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".heif", ED2KFT_IMAGE)); // High Efficiency Image Format File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ico", ED2KFT_IMAGE)); // Icon File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".j2k", ED2KFT_IMAGE)); // JPEG 2000 Code Stream
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".jfif", ED2KFT_IMAGE)); // JPEG File Interchange Format
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".jp2", ED2KFT_IMAGE)); // JPEG 2000 Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jpe", ED2KFT_IMAGE));  // JPEG Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jpeg", ED2KFT_IMAGE)); // JPEG Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jpg", ED2KFT_IMAGE));  // JPEG Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".jxl", ED2KFT_IMAGE));  // JPEG XL Image File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".nef", ED2KFT_IMAGE)); // Nikon Electronic Format RAW Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".orf", ED2KFT_IMAGE)); // Olympus RAW Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pct", ED2KFT_IMAGE)); // PICT Picture File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".pcx", ED2KFT_IMAGE)); // Paintbrush Bitmap Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pic", ED2KFT_IMAGE));  // PICT Picture File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pict", ED2KFT_IMAGE)); // PICT Picture File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".png", ED2KFT_IMAGE)); // Portable Network Graphic
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".psd", ED2KFT_IMAGE)); // Photoshop Document
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".psp", ED2KFT_IMAGE)); // Paint Shop Pro Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".raf", ED2KFT_IMAGE)); // Fujifilm RAW Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".rw2", ED2KFT_IMAGE)); // Panasonic RAW Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".svg", ED2KFT_IMAGE)); // Scalable Vector Graphics File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tga", ED2KFT_IMAGE));  // Targa Graphic
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tif", ED2KFT_IMAGE));  // Tagged Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tiff", ED2KFT_IMAGE)); // Tagged Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".wbmp", ED2KFT_IMAGE)); // Wireless Application Protocol Bitmap Format
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".webp", ED2KFT_IMAGE)); // Weppy Photo File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".wmf", ED2KFT_IMAGE));  // Windows Metafile
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".wmp", ED2KFT_IMAGE)); // Windows Media Photo File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xcf", ED2KFT_IMAGE)); // GIMP Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".xif", ED2KFT_IMAGE)); // ScanSoft Pagis Extended Image Format File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xpm", ED2KFT_IMAGE)); // X-Windows Pixmap
+
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".7z", ED2KFT_ARCHIVE)); // 7-Zip Compressed File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ace", ED2KFT_ARCHIVE)); // WinAce Compressed File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".alz", ED2KFT_ARCHIVE)); // ALZip Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".arc", ED2KFT_ARCHIVE)); // Compressed File Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".arj", ED2KFT_ARCHIVE)); // ARJ Compressed File Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".bz2", ED2KFT_ARCHIVE)); // Bzip Compressed File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cab", ED2KFT_ARCHIVE)); // Cabinet File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".cb7", ED2KFT_ARCHIVE)); // Comic Book 7-Zip Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".cba", ED2KFT_ARCHIVE)); // Comic Book ACE Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".cbr", ED2KFT_ARCHIVE)); // Comic Book RAR Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".cbt", ED2KFT_ARCHIVE)); // Comic Book Tarball
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".cbz", ED2KFT_ARCHIVE)); // Comic Book ZIP Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".gz", ED2KFT_ARCHIVE)); // Gnu Zipped File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".hqx", ED2KFT_ARCHIVE)); // BinHex 4.0 Encoded File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".lha", ED2KFT_ARCHIVE)); // LHARC Compressed Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".lz", ED2KFT_ARCHIVE)); // Lzip Compressed File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".lz4", ED2KFT_ARCHIVE)); // LZ4 Compressed File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".lzh", ED2KFT_ARCHIVE)); // LZH Compressed File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".lzma", ED2KFT_ARCHIVE)); // LZMA Compressed File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".pak", ED2KFT_ARCHIVE)); // PAK (Packed) File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".par", ED2KFT_ARCHIVE)); // Parchive Index File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".par2", ED2KFT_ARCHIVE)); // Parchive 2 Index File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".rar", ED2KFT_ARCHIVE)); // WinRAR Compressed Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".sea", ED2KFT_ARCHIVE)); // Self-Extracting Archive (Mac)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".sit", ED2KFT_ARCHIVE)); // Stuffit Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".sitx", ED2KFT_ARCHIVE)); // Stuffit X Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".tar", ED2KFT_ARCHIVE)); // Consolidated Unix File Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".tbz2", ED2KFT_ARCHIVE)); // Tar BZip 2 Compressed File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".tgz", ED2KFT_ARCHIVE)); // Gzipped Tar File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".tlz", ED2KFT_ARCHIVE)); // Tar LZMA Compressed File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".txz", ED2KFT_ARCHIVE)); // Tar XZ Compressed File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".uc2", ED2KFT_ARCHIVE)); // UltraCompressor 2 Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xz", ED2KFT_ARCHIVE)); // XZ Compressed File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".z", ED2KFT_ARCHIVE)); // Unix Compressed File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".zip", ED2KFT_ARCHIVE)); // Zipped File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".zoo", ED2KFT_ARCHIVE)); // Zoo Archive
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".zst", ED2KFT_ARCHIVE)); // Zstandard Compressed File
+
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".apk", ED2KFT_PROGRAM)); // Android Application Package
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".app", ED2KFT_PROGRAM)); // macOS Application Bundle
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".appimage", ED2KFT_PROGRAM)); // Linux AppImage Application
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".appx", ED2KFT_PROGRAM)); // Windows App Package
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bat", ED2KFT_PROGRAM)); // Batch File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cmd", ED2KFT_PROGRAM)); // Command File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".com", ED2KFT_PROGRAM)); // COM File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".cpl", ED2KFT_PROGRAM)); // Windows Control Panel Applet
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".deb", ED2KFT_PROGRAM)); // Debian Software Package
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".exe", ED2KFT_PROGRAM)); // Executable File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".flatpak", ED2KFT_PROGRAM)); // Flatpak Application Package
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".hta", ED2KFT_PROGRAM)); // HTML Application
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".jar", ED2KFT_PROGRAM)); // Java Archive (application/library)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".js", ED2KFT_PROGRAM)); // Java Script
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".jse", ED2KFT_PROGRAM)); // Encoded  Java Script
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".msc", ED2KFT_PROGRAM)); // Microsoft Common Console File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".msi", ED2KFT_PROGRAM)); // Microsoft Installer Package
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".msix", ED2KFT_PROGRAM)); // Windows App Package
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ps1", ED2KFT_PROGRAM)); // PowerShell Script
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".psd1", ED2KFT_PROGRAM)); // PowerShell Data File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".psm1", ED2KFT_PROGRAM)); // PowerShell Module File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".rpm", ED2KFT_PROGRAM)); // RPM Software Package
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".scr", ED2KFT_PROGRAM)); // Windows Screensaver Executable
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".sh", ED2KFT_PROGRAM)); // Unix Shell Script
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".snap", ED2KFT_PROGRAM)); // Snap Application Package
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".vbe", ED2KFT_PROGRAM)); // Encoded Visual Basic Script File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".vbs", ED2KFT_PROGRAM)); // Visual Basic Script File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".wsf", ED2KFT_PROGRAM)); // Windows Script File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".wsh", ED2KFT_PROGRAM)); // Windows Scripting Host File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".xpi", ED2KFT_PROGRAM)); // Mozilla browser extension package
+
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".b5t", ED2KFT_CDIMAGE)); // BlindWrite 5 Disc Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".b6t", ED2KFT_CDIMAGE)); // BlindWrite 6 Disc Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".bin", ED2KFT_CDIMAGE)); // CD Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".bwa", ED2KFT_CDIMAGE)); // BlindWrite Disk Information File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".bwi", ED2KFT_CDIMAGE)); // BlindWrite CD/DVD Disc Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".bws", ED2KFT_CDIMAGE)); // BlindWrite Sub Code File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".bwt", ED2KFT_CDIMAGE)); // BlindWrite 4 Disk Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ccd", ED2KFT_CDIMAGE)); // CloneCD Disk Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".cdi", ED2KFT_CDIMAGE)); // DiscJuggler Disc Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".cue", ED2KFT_CDIMAGE)); // Cue Sheet File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".daa", ED2KFT_CDIMAGE)); // PowerISO Disc Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".dmg", ED2KFT_CDIMAGE)); // Mac OS X Disk Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".img", ED2KFT_CDIMAGE)); // Disk Image Data File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".iso", ED2KFT_CDIMAGE)); // Disc Image File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".isz", ED2KFT_CDIMAGE)); // Compressed ISO Disc Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".mdf", ED2KFT_CDIMAGE)); // Media Disc Image File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".mds", ED2KFT_CDIMAGE)); // Media Descriptor File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".mdx", ED2KFT_CDIMAGE)); // DAEMON Tools Disc Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".nrg", ED2KFT_CDIMAGE)); // Nero CD/DVD Image File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".qcow2", ED2KFT_CDIMAGE)); // QEMU Copy-On-Write Disk Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".sub", ED2KFT_CDIMAGE)); // CloneCD subchannel data file
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".toast", ED2KFT_CDIMAGE)); // Toast Disc Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".uif", ED2KFT_CDIMAGE)); // MagicISO Disc Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".vcd", ED2KFT_CDIMAGE)); // Virtual CD Disc Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".vdi", ED2KFT_CDIMAGE)); // VirtualBox Virtual Disk Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".vhd", ED2KFT_CDIMAGE)); // Virtual Hard Disk Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".vhdx", ED2KFT_CDIMAGE)); // Hyper-V Virtual Hard Disk Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".vmdk", ED2KFT_CDIMAGE)); // VMware Virtual Disk Image
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".wim", ED2KFT_CDIMAGE)); // Windows Imaging Format File
+
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".azw", ED2KFT_DOCUMENT)); // EBook File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".azw3", ED2KFT_DOCUMENT)); // Amazon Kindle KF8 E-Book
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".chm", ED2KFT_DOCUMENT)); // Compiled HTML Help File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".css", ED2KFT_DOCUMENT)); // Cascading Style Sheet
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".csv", ED2KFT_DOCUMENT)); // Comma-Separated Values File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".diz", ED2KFT_DOCUMENT)); // Description in Zip File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".djvu", ED2KFT_DOCUMENT)); // DjVu Document
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".doc", ED2KFT_DOCUMENT));  // Document File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".docm", ED2KFT_DOCUMENT)); // Microsoft Word Macro-Enabled Document
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".docx", ED2KFT_DOCUMENT)); // Microsoft Word Document (OOXML)
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".dot", ED2KFT_DOCUMENT)); // Document Template File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".dotx", ED2KFT_DOCUMENT)); // Microsoft Word Template (OOXML)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".epub", ED2KFT_DOCUMENT)); // EBook File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".fb2", ED2KFT_DOCUMENT)); // FictionBook 2 E-Book
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".hlp", ED2KFT_DOCUMENT));  // Help File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".htm", ED2KFT_DOCUMENT));  // HTML File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".html", ED2KFT_DOCUMENT)); // HTML File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".json", ED2KFT_DOCUMENT)); // JSON File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".key", ED2KFT_DOCUMENT)); // Apple Keynote Presentation
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".kfx", ED2KFT_DOCUMENT)); // Amazon Kindle KFX E-Book
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".markdown", ED2KFT_DOCUMENT));           // Markdown Document
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".md", ED2KFT_DOCUMENT)); // Markdown Document
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".mobi", ED2KFT_DOCUMENT)); // EBook File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".nfo", ED2KFT_DOCUMENT)); // Warez Information File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".numbers", ED2KFT_DOCUMENT)); // Apple Numbers Spreadsheet
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".odp", ED2KFT_DOCUMENT)); // OpenDocument Presentation
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ods", ED2KFT_DOCUMENT)); // OpenDocument Spreadsheet
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".odt", ED2KFT_DOCUMENT)); // OpenDocument File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".otp", ED2KFT_DOCUMENT)); // OpenDocument Presentation Template
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ott", ED2KFT_DOCUMENT)); // OpenDocument Template File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".ots", ED2KFT_DOCUMENT)); // OpenDocument Spreadsheet Template
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".oxps", ED2KFT_DOCUMENT)); // OpenXPS Document
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".pages", ED2KFT_DOCUMENT)); // Apple Pages Document
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".pdf", ED2KFT_DOCUMENT)); // Portable Document Format File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".potx", ED2KFT_DOCUMENT)); // Microsoft PowerPoint Template (OOXML)
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".pps", ED2KFT_DOCUMENT)); // PowerPoint Slide Show
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".ppsx", ED2KFT_DOCUMENT)); // Microsoft PowerPoint Slide Show (OOXML)
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".ppt", ED2KFT_DOCUMENT)); // PowerPoint Presentation
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".pptm", ED2KFT_DOCUMENT)); // Microsoft PowerPoint Macro-Enabled Presentation
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".pptx", ED2KFT_DOCUMENT)); // Microsoft PowerPoint Presentation (OOXML)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".ps", ED2KFT_DOCUMENT)); // PostScript File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".rtf", ED2KFT_DOCUMENT)); // Rich Text Format File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".stc", ED2KFT_DOCUMENT)); // OpenOffice.org 1.0 Spreadsheet Template
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".sti", ED2KFT_DOCUMENT)); // OpenOffice.org 1.0 Presentation Template
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".stw", ED2KFT_DOCUMENT)); // OpenOffice.org 1.0 Document Template File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".sxc", ED2KFT_DOCUMENT)); // OpenOffice.org 1.0 Spreadsheet
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".sxi", ED2KFT_DOCUMENT)); // OpenOffice.org 1.0 Presentation
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".sxw", ED2KFT_DOCUMENT)); // OpenOffice.org 1.0 Document File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".tex", ED2KFT_DOCUMENT)); // LaTeX Source Document
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".text", ED2KFT_DOCUMENT)); // General Text File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".txt", ED2KFT_DOCUMENT)); // Text File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".wri", ED2KFT_DOCUMENT)); // Windows Write Document
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".xls", ED2KFT_DOCUMENT)); // Microsoft Excel Spreadsheet
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".xlsm", ED2KFT_DOCUMENT)); // Microsoft Excel Macro-Enabled Spreadsheet
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".xlsx", ED2KFT_DOCUMENT)); // Microsoft Excel Spreadsheet (OOXML)
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".xlt", ED2KFT_DOCUMENT)); // Microsoft Excel Template
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(
+			".xltx", ED2KFT_DOCUMENT)); // Microsoft Excel Template (OOXML)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".xml", ED2KFT_DOCUMENT)); // XML File
+		ED2KFileTypesMap.insert(
+			SED2KFileTypeMapElement(".xps", ED2KFT_DOCUMENT)); // XML Paper Specification Document
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".yaml", ED2KFT_DOCUMENT)); // YAML File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(".yml", ED2KFT_DOCUMENT));  // YAML File
 	}
 };
 
-
 // get the list initialized *before* any code is accessing it
 CED2KFileTypes theED2KFileTypes;
 
-EED2KFileType GetED2KFileTypeID(const CPath& fileName)
+bool IsMediaProbeCandidate(const CPath &fileName)
+{
+	const EED2KFileType type = GetED2KFileTypeID(fileName);
+	return type == ED2KFT_AUDIO || type == ED2KFT_VIDEO;
+}
+
+EED2KFileType GetED2KFileTypeID(const CPath &fileName)
 {
 	const wxString ext = fileName.GetExt().Lower();
 	if (ext.IsEmpty()) {
@@ -1067,84 +1234,100 @@
 	}
 }
 
-
 // Returns the ed2k file type term which is to be used in server searches
 wxString GetED2KFileTypeSearchTerm(EED2KFileType iFileID)
 {
-	if (iFileID == ED2KFT_AUDIO)		return ED2KFTSTR_AUDIO;
-	if (iFileID == ED2KFT_VIDEO)		return ED2KFTSTR_VIDEO;
-	if (iFileID == ED2KFT_IMAGE)		return ED2KFTSTR_IMAGE;
-	if (iFileID == ED2KFT_DOCUMENT)		return ED2KFTSTR_DOCUMENT;
-	if (iFileID == ED2KFT_PROGRAM)		return ED2KFTSTR_PROGRAM;
-	// NOTE: Archives and CD-Images are published with file type "Pro"
-	if (iFileID == ED2KFT_ARCHIVE)		return ED2KFTSTR_PROGRAM;
-	if (iFileID == ED2KFT_CDIMAGE)		return ED2KFTSTR_PROGRAM;
+	if (iFileID == ED2KFT_AUDIO)
+		return ED2KFTSTR_AUDIO;
+	if (iFileID == ED2KFT_VIDEO)
+		return ED2KFTSTR_VIDEO;
+	if (iFileID == ED2KFT_IMAGE)
+		return ED2KFTSTR_IMAGE;
+	if (iFileID == ED2KFT_DOCUMENT)
+		return ED2KFTSTR_DOCUMENT;
+	if (iFileID == ED2KFT_PROGRAM)
+		return ED2KFTSTR_PROGRAM;
+	// NOTE: Archives and disc images are published with file type "Pro"
+	if (iFileID == ED2KFT_ARCHIVE)
+		return ED2KFTSTR_PROGRAM;
+	if (iFileID == ED2KFT_CDIMAGE)
+		return ED2KFTSTR_PROGRAM;
 
 	return "";
 }
 
-
 // Returns a file type which is used eMule internally only, examining the extension of the given filename
-wxString GetFileTypeByName(const CPath& fileName)
+wxString GetFileTypeByName(const CPath &fileName)
 {
 	EED2KFileType iFileType = GetED2KFileTypeID(fileName);
 	switch (iFileType) {
-		case ED2KFT_AUDIO:	return ED2KFTSTR_AUDIO;
-		case ED2KFT_VIDEO:	return ED2KFTSTR_VIDEO;
-		case ED2KFT_IMAGE:	return ED2KFTSTR_IMAGE;
-		case ED2KFT_DOCUMENT:	return ED2KFTSTR_DOCUMENT;
-		case ED2KFT_PROGRAM:	return ED2KFTSTR_PROGRAM;
-		case ED2KFT_ARCHIVE:	return ED2KFTSTR_ARCHIVE;
-		case ED2KFT_CDIMAGE:	return ED2KFTSTR_CDIMAGE;
-		default:		return "";
+	case ED2KFT_AUDIO:
+		return ED2KFTSTR_AUDIO;
+	case ED2KFT_VIDEO:
+		return ED2KFTSTR_VIDEO;
+	case ED2KFT_IMAGE:
+		return ED2KFTSTR_IMAGE;
+	case ED2KFT_DOCUMENT:
+		return ED2KFTSTR_DOCUMENT;
+	case ED2KFT_PROGRAM:
+		return ED2KFTSTR_PROGRAM;
+	case ED2KFT_ARCHIVE:
+		return ED2KFTSTR_ARCHIVE;
+	case ED2KFT_CDIMAGE:
+		return ED2KFTSTR_CDIMAGE;
+	default:
+		return "";
 	}
 }
 
-
 // Returns the ed2k file type integer ID which is to be used for publishing+searching
 EED2KFileType GetED2KFileTypeSearchID(EED2KFileType iFileID)
 {
 	switch (iFileID) {
-		case ED2KFT_AUDIO:	return ED2KFT_AUDIO;
-		case ED2KFT_VIDEO:	return ED2KFT_VIDEO;
-		case ED2KFT_IMAGE:	return ED2KFT_IMAGE;
-		case ED2KFT_DOCUMENT:	return ED2KFT_DOCUMENT;
-		case ED2KFT_PROGRAM:	return ED2KFT_PROGRAM;
-		// NOTE: Archives and CD-Images are published+searched with file type "Pro"
-		// NOTE: If this gets changed, the function 'GetED2KFileTypeSearchTerm' also needs to get updated!
-		case ED2KFT_ARCHIVE:	return ED2KFT_PROGRAM;
-		case ED2KFT_CDIMAGE:	return ED2KFT_PROGRAM;
-		default:		return  ED2KFT_ANY;
+	case ED2KFT_AUDIO:
+		return ED2KFT_AUDIO;
+	case ED2KFT_VIDEO:
+		return ED2KFT_VIDEO;
+	case ED2KFT_IMAGE:
+		return ED2KFT_IMAGE;
+	case ED2KFT_DOCUMENT:
+		return ED2KFT_DOCUMENT;
+	case ED2KFT_PROGRAM:
+		return ED2KFT_PROGRAM;
+	// NOTE: Archives and disc images are published+searched with file type "Pro"
+	// NOTE: If this gets changed, the function 'GetED2KFileTypeSearchTerm' also needs to get updated!
+	case ED2KFT_ARCHIVE:
+		return ED2KFT_PROGRAM;
+	case ED2KFT_CDIMAGE:
+		return ED2KFT_PROGRAM;
+	default:
+		return ED2KFT_ANY;
 	}
 }
 
-
 /**
- * Dumps a buffer to a wxString
+ * Dumps a buffer to a wxString.
  */
-wxString DumpMemToStr(const void *buff, int n, const wxString& msg, bool ok)
+wxString DumpMemToStr(const void *buff, int n, const wxString &msg, bool ok)
 {
 	const unsigned char *p = (const unsigned char *)buff;
-	int lines = (n + 15)/ 16;
+	int lines = (n + 15) / 16;
 
 	wxString result;
-	// Allocate aproximetly what is needed
-	result.Alloc( ( lines + 1 ) * 80 );
-	if ( !msg.IsEmpty() ) {
-		result += msg + " - ok=" + ( ok ? "true, " : "false, " );
+	result.Alloc((lines + 1) * 80);
+	if (!msg.IsEmpty()) {
+		result += msg + " - ok=" + (ok ? "true, " : "false, ");
 	}
 
 	result += CFormat("%d bytes\n") % n;
-	for ( int i = 0; i < lines; ++i) {
-		// Show address
+	for (int i = 0; i < lines; ++i) {
 		result += CFormat("%08x  ") % (i * 16);
 
-		// Show two columns of hex-values
-		for ( int j = 0; j < 2; ++j) {
-			for ( int k = 0; k < 8; ++k) {
+		for (int j = 0; j < 2; ++j) {
+			for (int k = 0; k < 8; ++k) {
 				int pos = 16 * i + 8 * j + k;
 
-				if ( pos < n ) {
+				if (pos < n) {
 					result += CFormat("%02x ") % ppos;
 				} else {
 					result += "   ";
@@ -1153,14 +1336,13 @@
 			result += " ";
 		}
 		result += "|";
-		// Show a column of ascii-values
-		for ( int k = 0; k < 16; ++k) {
+		for (int k = 0; k < 16; ++k) {
 			int pos = 16 * i + k;
 
-			if ( pos < n ) {
-				if ( isspace( ppos ) ) {
+			if (pos < n) {
+				if (isspace(ppos)) {
 					result += " ";
-				} else if ( !isgraph( ppos ) ) {
+				} else if (!isgraph(ppos)) {
 					result += ".";
 				} else {
 					result += (wxChar)ppos;
@@ -1176,35 +1358,82 @@
 	return result;
 }
 
-
 /**
- * Dumps a buffer to stdout
+ * Dumps a buffer to stdout.
  */
-void DumpMem(const void *buff, int n, const wxString& msg, bool ok)
+void DumpMem(const void *buff, int n, const wxString &msg, bool ok)
 {
-	printf("%s\n", (const char*)unicode2char(DumpMemToStr( buff, n, msg, ok )) );
+	printf("%s\n", (const char *)unicode2char(DumpMemToStr(buff, n, msg, ok)));
 }
 
-
 //
 // Dump mem in dword format
 void DumpMem_DW(const uint32 *ptr, int count)
 {
-	for(int i = 0; i < count; i++) {
+	for (int i = 0; i < count; i++) {
 		printf("%08x ", ptri);
-		if ( (i % 4) == 3) printf("\n");
+		if ((i % 4) == 3)
+			printf("\n");
 	}
 	printf("\n");
 }
 
+CVersionCompareResult CompareLatestReleaseVersion(const wxString &json)
+{
+	CVersionCompareResult result;
+
+	// Extract the `tag_name` string. /releases/latest excludes pre-releases, so the tag names a
+	// stable release, and a regex on the one well-known field is robust against whitespace and
+	// field order without a full JSON parser.
+	wxRegEx tagRe(wxT("\"tag_name\":space:*::space:*\"(^\"+)\""));
+	if (!tagRe.IsValid() || !tagRe.Matches(json)) {
+		return result; // ParseError
+	}
+	wxString tag = tagRe.GetMatch(json, 1);
+
+	// Tolerate an optional leading v/V (aMule tags are bare semver, but be
+	// defensive in case a future maintainer switches to vX.Y.Z).
+	if (tag.StartsWith(wxT("v")) || tag.StartsWith(wxT("V"))) {
+		tag = tag.Mid(1);
+	}
+	// Strip any pre-release / build-metadata suffix so the integer compare
+	// sees only MAJOR.MINOR.UPDATE.
+	size_t suffixPos = tag.find_first_of(wxT("-+"));
+	if (suffixPos != wxString::npos) {
+		tag = tag.Mid(0, suffixPos);
+	}
+	if (tag.IsEmpty()) {
+		return result; // ParseError
+	}
+
+	long fields = { 0, 0, 0 };
+	wxStringTokenizer tkz(tag, wxT("."));
+	for (int i = 0; i < 3 && tkz.HasMoreTokens(); ++i) {
+		// Tags with fewer than three components (e.g. "3.1") are valid;
+		// the missing fields stay 0.
+		if (!tkz.GetNextToken().ToLong(&fieldsi)) {
+			return result; // ParseError
+		}
+	}
+
+	result.major = fields0;
+	result.minor = fields1;
+	result.update = fields2;
+	result.latest = wxString::Format(wxT("%ld.%ld.%ld"), fields0, fields1, fields2);
+
+	const long curVer = make_full_ed2k_version(VERSION_MJR, VERSION_MIN, VERSION_UPDATE);
+	const long newVer = make_full_ed2k_version(
+		static_cast<int>(fields0), static_cast<int>(fields1), static_cast<int>(fields2));
+	result.state = (curVer < newVer) ? CVersionCompareResult::Outdated : CVersionCompareResult::UpToDate;
+	return result;
+}
 
 wxString GetConfigDir(const wxString &configFileBase)
 {
 	wxString configPath;
 
-	// "Portable aMule" - Use aMule from an external USB drive
-	// Check for ./config/amule.conf (or whatever gets passed as configFile)
-	// and use this configuration if found
+	// "Portable aMule", run from an external USB drive: check for ./config/amule.conf, or
+	// whatever gets passed as configFile, and use that configuration if found.
 	const wxString configDir = JoinPaths(wxFileName::GetCwd(), "config");
 	const wxString configFile = JoinPaths(configDir, configFileBase);
 
@@ -1221,23 +1450,22 @@
 	return configPath;
 }
 
-
 /*************************** Locale specific stuff ***************************/
 
 #ifndef __WINDOWS__
-#	define	SETWINLANG(LANG, SUBLANG)
+#define SETWINLANG(LANG, SUBLANG)
 #else
-#	define	SETWINLANG(LANG, SUBLANG) \
+#define SETWINLANG(LANG, SUBLANG) \
 	info.WinLang = LANG; \
 	info.WinSublang = SUBLANG;
 #endif
 
 #define CUSTOMLANGUAGE(wxid, iso, winlang, winsublang, dir, desc) \
-	info.Language = wxid;		\
-	info.CanonicalName = iso;	\
-	info.LayoutDirection = dir;	\
-	info.Description = desc;	\
-	SETWINLANG(winlang, winsublang)	\
+	info.Language = wxid; \
+	info.CanonicalName = iso; \
+	info.LayoutDirection = dir; \
+	info.Description = desc; \
+	SETWINLANG(winlang, winsublang) \
 	wxLocale::AddLanguage(info);
 
 void InitCustomLanguages()
@@ -1245,50 +1473,43 @@
 	wxLanguageInfo info;
 }
 
-
-void InitLocale(wxLocale& locale, int language)
+void InitLocale(wxLocale &locale, int language)
 {
 	locale.Init(language, wxLOCALE_LOAD_DEFAULT);
 
+#ifdef __WXMAC__
+	// Init() also sets LC_NUMERIC. Under a decimal-comma locale (LANG=it_IT.UTF-8 from a terminal)
+	// macOS 27 AppKit then aborts laying out the window. A Finder launch has no LANG and stays C.
+	std::setlocale(LC_NUMERIC, "C");
+#endif
+
 #if defined(__WXMAC__) || defined(__WINDOWS__)
-	// On macOS, GetDataDir() returns <bundle>/Contents/SharedSupport, while
-	// .mo catalogs live under <bundle>/Contents/Resources alongside the
-	// other bundle resources -- which is what GetResourcesDir() returns.
-	// On Windows both methods return the directory containing the .exe,
-	// so this is equivalent there.
+	// On macOS, GetDataDir() returns <bundle>/Contents/SharedSupport while the .mo catalogs
+	// live under <bundle>/Contents/Resources, which is what GetResourcesDir() returns. On
+	// Windows both return the .exe's directory.
 	locale.AddCatalogLookupPathPrefix(JoinPaths(wxStandardPaths::Get().GetResourcesDir(), "locale"));
 #elif defined(__WXGTK__) || defined(__UNIX__)
-	// On Linux/*BSD, .mo catalogs are installed under
-	//   ${CMAKE_INSTALL_PREFIX}/share/locale/<lang>/LC_MESSAGES/amule.mo
-	// (see po/CMakeLists.txt -- DESTINATION ${CMAKE_INSTALL_LOCALEDIR}).
+	// On Linux/*BSD the .mo catalogs are installed under
+	// ${CMAKE_INSTALL_PREFIX}/share/locale/<lang>/LC_MESSAGES/amule.mo, while libintl's default
+	// lookup path is baked in at wxGTK's build time. For a system install that builds the
+	// binary and wxGTK against the same prefix, the two match and translations work unaided.
 	//
-	// libintl's default lookup path is baked in at wxGTK's build time.
-	// For system installs that build the binary and wxGTK against the
-	// same prefix (typical Debian/Fedora/Arch packages), the default
-	// path matches and translations work without explicit help.
+	// In a Flatpak they do not: the bundle installs under prefix=/app while the wxGTK in the
+	// GNOME runtime was built against prefix=/usr, so libintl looks under /usr/share/locale and
+	// our catalogs sit untouched at /app/share/locale -- every gettext() lookup misses and the
+	// UI runs in English regardless of LANG.
 	//
-	// In a Flatpak however, the bundle installs under prefix=/app while
-	// the wxGTK shipped inside the GNOME runtime was built against
-	// prefix=/usr -- so libintl looks for amule.mo under /usr/share/locale,
-	// and our catalogs sit at /app/share/locale, untouched. Net result:
-	// every gettext() lookup misses and the UI runs in English regardless
-	// of LANG. See amule-org/amule#18 (DaRkViVi verified the path
-	// mismatch on Fedora 44: ls /app/share/locale shows it/, ls
-	// /usr/share/locale/it/LC_MESSAGES/amule.mo is missing).
-	//
-	// Explicitly registering ${install_prefix}/share/locale as a wxLocale
-	// lookup prefix makes the binary self-sufficient: it tells libintl to
-	// also look under its own runtime install prefix, which matches the
-	// install path on Flatpak and is a harmless no-op on system installs
-	// (libintl already finds the catalog under /usr/share/locale).
-	locale.AddCatalogLookupPathPrefix(JoinPaths(JoinPaths(wxStandardPaths::Get().GetInstallPrefix(), "share"), "locale"));
+	// Registering ${install_prefix}/share/locale as a wxLocale lookup prefix makes the binary
+	// self-sufficient: it matches the Flatpak install path and is a harmless no-op on system
+	// installs.
+	locale.AddCatalogLookupPathPrefix(
+		JoinPaths(JoinPaths(wxStandardPaths::Get().GetInstallPrefix(), "share"), "locale"));
 #endif
 
 	locale.AddCatalog(PACKAGE);
 }
 
-
-int StrLang2wx(const wxString& language)
+int StrLang2wx(const wxString &language)
 {
 	// get rid of possible encoding and modifier
 	wxString lang(language.BeforeFirst('.').BeforeFirst('@'));
@@ -1297,14 +1518,10 @@
 		const wxLanguageInfo *lng = wxLocale::FindLanguageInfo(lang);
 		if (lng) {
 			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.
-			//
-			// wx maps "Traditional Chinese" to "Chinese" however. This must me corrected:
+			// Traditional Chinese (zh_TW, zh_HK, zh_MO) is represented by zh_TW, and
+			// Simplified Chinese (zh_CN, zh_SG, zh_MY) by zh_CN, in both cases because
+			// most users are there. wx maps "Traditional Chinese" to plain "Chinese",
+			// which has to be corrected:
 			if (langID == wxLANGUAGE_CHINESE) {
 				langID = wxLANGUAGE_CHINESE_TRADITIONAL;
 			}
@@ -1317,7 +1534,6 @@
 	}
 }
 
-
 wxString wxLang2Str(const int lang)
 {
 	if (lang != wxLANGUAGE_DEFAULT) {
@@ -1341,19 +1557,19 @@
 #ifndef __WINDOWS__
 	pass_plain = char2unicode(getpass("Enter password for mule connection: "));
 #else
-	//#warning This way, pass enter is not hidden on windows. Bad thing.
+	// #warning This way, pass enter is not hidden on windows. Bad thing.
 	char temp_str512;
-	// Though fflush() on an input stream is undefined behaviour by the standard,
-	// the MSVCRT version does seem to clear the input buffers.
+	// Though fflush() on an input stream is undefined behaviour by the standard, the MSVCRT version
+	// does seem to clear the input buffers.
 	// cppcheck-suppress fflushOnInputStream
 	fflush(stdin);
 	printf("Enter password for mule connection: \n");
 	fflush(stdout);
 	fgets(temp_str, 512, stdin);
-	temp_strstrlen(temp_str)-1 = '\0';
+	temp_strstrlen(temp_str) - 1 = '\0';
 	pass_plain = char2unicode(temp_str);
 #endif
-	wxCHECK2(password.Decode(MD5Sum(pass_plain).GetHash()), /* Do nothing. */ );
+	wxCHECK2(password.Decode(MD5Sum(pass_plain).GetHash()), /* Do nothing. */);
 	if (!allowEmptyPassword) {
 		// MD5 hash for an empty string, according to rfc1321.
 		if (password.Encode() == "D41D8CD98F00B204E9800998ECF8427E") {
@@ -1365,8 +1581,7 @@
 	return password;
 }
 
-
-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};
+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-3.0.1.tar.gz/src/OtherFunctions.h -> amule-3.1.0.tar.gz/src/OtherFunctions.h Changed

@@ -26,44 +26,34 @@
 #ifndef OTHERFUNCTIONS_H
 #define OTHERFUNCTIONS_H
 
-#include <wx/intl.h>		// Needed for wxLANGUAGE_ constants
+#include <common/Format.h>    // Needed for CFormat
+#include "NetworkFunctions.h" // Needed for Uint32toStringIP
+#include <wx/datetime.h>      // Needed for wxDateTime
+#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 "MD4Hash.h"		// Needed for CMD4Hash
-
-#include <algorithm>		// Needed for std::for_each	// Do_not_auto_remove (mingw-gcc-3.4.5)
+#include "Types.h"       // Needed for uint16, uint32 and uint64
+#include "Preferences.h" // Needed for AllCategoryFilter enumeration
+#include "MD4Hash.h"     // Needed for CMD4Hash
 
+#include <algorithm> // Needed for std::for_each	// Do_not_auto_remove (mingw-gcc-3.4.5)
 
 class CPath;
 
-
-/**
- * Helper function.
- *
- * @param ArgA The base value.
- * @param ArgB The value to compare ArgA against.
- * @return See below.
- *
- * Use this function to safely compare two arguments of a type that supports
- * the "<" operator. It works like strcmp and returns a negative value if ArgA
- * is less than ArgB, zero if ArgA is equal to ArgB and a positive value if
- * ArgA is greater than ArgB.
- */
-template <class TYPE>
-int CmpAny(const TYPE& ArgA, const TYPE& ArgB)
+/// Compares two values of a type supporting "<", like strcmp: negative if @a ArgA is less than @a
+/// ArgB, zero if equal, positive if greater.
+template <class TYPE> int CmpAny(const TYPE &ArgA, const TYPE &ArgB)
 {
-	if ( ArgA < ArgB ) {
+	if (ArgA < ArgB) {
 		return -1;
-	} else if ( ArgB < ArgA ) {
-		return  1;
+	} else if (ArgB < ArgA) {
+		return 1;
 	} else {
-		return  0;
+		return 0;
 	}
 }
 
 //! Overloaded version of CmpAny for use with wxStrings.
-inline int CmpAny(const wxString& ArgA, const wxString& ArgB)
+inline int CmpAny(const wxString &ArgA, const wxString &ArgB)
 {
 	if (ArgA.IsEmpty() && !ArgB.IsEmpty()) {
 		return -1;
@@ -72,26 +62,19 @@
 	} else if (ArgA.IsEmpty() && ArgB.IsEmpty()) {
 		return 0;
 	} else {
-		return ArgA.CmpNoCase( ArgB );
+		return ArgA.CmpNoCase(ArgB);
 	}
 }
 
 //! Overloaded version of CmpAny for use with C-Strings (Unicoded).
-inline int CmpAny(const wxChar* ArgA, const wxChar* ArgB)
+inline int CmpAny(const wxChar *ArgA, const wxChar *ArgB)
 {
-	return CmpAny(wxString( ArgA ), wxString( ArgB ));
+	return CmpAny(wxString(ArgA), wxString(ArgB));
 }
 
-
-/**
- * Removes the first instance of a value from a STL-like list: list, vector or deque.
- *
- * @param list The list to manipulate.
- * @param item The value to search for and remove.
- * @return The number of instances removed.
- */
-template <typename LIST, typename ITEM>
-unsigned int EraseFirstValue( LIST& list, const ITEM& item )
+/// Removes the first instance of @a item from a STL-like list, vector or deque. Returns how many
+/// were removed.
+template <typename LIST, typename ITEM> unsigned int EraseFirstValue(LIST &list, const ITEM &item)
 {
 	typename LIST::iterator it = list.begin();
 
@@ -106,23 +89,16 @@
 	return false;
 }
 
-
-/**
- * Removes all instances of a value from a STL-like list: list, vector or deque.
- *
- * @param list The list to manipulate.
- * @param item The value to search for and remove.
- * @return The number of instances removed.
- */
-template <typename LIST, typename ITEM>
-unsigned int EraseValue( LIST& list, const ITEM& item )
+/// Removes every instance of @a item from a STL-like list, vector or deque. Returns how many were
+/// removed.
+template <typename LIST, typename ITEM> unsigned int EraseValue(LIST &list, const ITEM &item)
 {
 	typename LIST::iterator it = list.begin();
 	unsigned int count = 0;
 
-	for ( ; it != list.end(); ) {
-		if ( *it == item ) {
-			it = list.erase( it );
+	for (; it != list.end();) {
+		if (*it == item) {
+			it = list.erase(it);
 			count++;
 		} else {
 			++it;
@@ -132,27 +108,21 @@
 	return count;
 }
 
-
 //! Used by DeleteContents
 struct SDoDelete
 {
 	// Used for lists, vectors, deques, etc.
-	template <typename TYPE>
-	void operator()(TYPE* ptr) {
-		delete ptr;
-	}
+	template <typename TYPE> void operator()(TYPE *ptr) { delete ptr; }
 
 	// Used for maps, hashmaps, rangemaps, etc.
-	template <typename FIRST, typename SECOND>
-	void operator()(const std::pair<FIRST, SECOND>& pair) {
+	template <typename FIRST, typename SECOND> void operator()(const std::pair<FIRST, SECOND> &pair)
+	{
 		delete pair.second;
 	}
 };
 
-
 /** Frees the contents of a list or map like stl container, clearing it afterwards. */
-template <typename STL_CONTAINER>
-void DeleteContents(STL_CONTAINER& container)
+template <typename STL_CONTAINER> void DeleteContents(STL_CONTAINER &container)
 {
 	// Ensure that the actual container wont contain dangling pointers during
 	// this operation, to ensure that the destructors can't access them.
@@ -162,68 +132,33 @@
 	std::for_each(copy.begin(), copy.end(), SDoDelete());
 }
 
-
-/**
- * Copies elements from the range first, first + n) to the range result, result + n).
- */
+/// Copies elements from first, first + n) to result, result + n).
 template <class InputIterator, class OutputIterator>
 OutputIterator STLCopy_n(InputIterator first, size_t n, OutputIterator result)
 {
 	return std::copy(first, first + n, result);
 }
 
+/// Accesses a child of the calling widget, replacing wxStaticCast(FindWindow(<IdOrName>), <type>).
+/// Shorter, and the dynamic_cast reports a widget that changed type instead of quietly handing back
+/// a bad pointer.
+#define CastChild(IdOrName, type) dynamic_cast<type *>(FindWindow(IdOrName))
 
-/**
- * Helperfunction for accessing a child of the calling widget.
- *
- * @param IdOrName The ID or the Name of the widget to find.
- * @param type The widget-type to cast the found widget to.
- *
- * Use this function as a replacement for the following constructs:
- *  - wxStaticCast( FindWindow( <IdOrName> ), <type> )
- *  - (<type>*)FindWindow( <IdOrName> )
- *
- * It has the advantage of validating the cast in debug builds and being much
- * shorter than than manually typing wxStaticCast + FindWindow. This mean that
- * we will be alerted in case of widget changing type, instead of getting just
- * getting bad mojo due to casting a pointer to the wrong type.
- */
-#define CastChild( IdOrName, type )			dynamic_cast<type*>( FindWindow( IdOrName ) )
-
-
-/**
- * Helperfunction for accessing the child of a any widget by ID.
- *
- * @param ID The ID of the widget to find.
- * @param parent The parent of the widget to find, or NULL to search from the top.
- * @param type The type to cast the widget to.
- *
- * @see CastChild()
- */
-#define CastByID( ID, parent, type )		dynamic_cast<type*>( wxWindow::FindWindowById( (ID), (parent) ) )
-
-
-/**
- * Helperfunction for accessing the child of a any widget by Name.
- *
- * @param Name The Name of the widget to find.
- * @param parent The parent of the widget to find, or NULL to search from the top.
- * @param type The type to cast the widget to.
- *
- * @see CastChild()
- */
-#define CastByName( Name, parent, type )	dynamic_cast<type*>( wxWindow::FindWindowByName( (Name), (parent) ) )
+/// Accesses any widget's child by ID; @a parent NULL searches from the top. @see CastChild()
+#define CastByID(ID, parent, type) dynamic_cast<type *>(wxWindow::FindWindowById((ID), (parent)))
 
+/// Accesses any widget's child by Name; @a parent NULL searches from the top. @see CastChild()
+#define CastByName(Name, parent, type) dynamic_cast<type *>(wxWindow::FindWindowByName((Name), (parent)))
 
 // From Gnucleus project found by Tarod
 // Base16/Base32/Base64 Encode/Decode functions
-wxString EncodeBase16(const unsigned char* buffer, unsigned int bufLen);
+wxString EncodeBase16(const unsigned char *buffer, unsigned int bufLen);
 unsigned int DecodeBase16(const wxString &base16Buffer, unsigned int base16BufLen, unsigned char *buffer);
-wxString EncodeBase32(const unsigned char* buffer, unsigned int bufLen);
+wxString EncodeBase32(const unsigned char *buffer, unsigned int bufLen);
 unsigned int DecodeBase32(const wxString &base32Buffer, unsigned int base32BufLen, unsigned char *buffer);
-wxString EncodeBase64(const char* buffer, unsigned int bufLen);
+wxString EncodeBase64(const char *buffer, unsigned int bufLen);
 unsigned int DecodeBase64(const wxString &base64Buffer, unsigned int base64BufLen, unsigned char *buffer);
-void SetBase64Header(const wxString& header);
+void SetBase64Header(const wxString &header);
 
 // Converts the number of bytes to human readable form.
 wxString CastItoXBytes(uint64 count);
@@ -233,34 +168,65 @@
 wxString CastItoSpeed(uint32 bytes);
 // Converts an amount of seconds to human readable time.
 wxString CastSecondsToHM(uint32 seconds, uint16 msecs = 0);
-// Maps an ed2k FT_MEDIA_CODEC FOURCC / format string to a friendlier
-// display name (e.g. "H264" -> "H.264", "XVID" -> "Xvid"). Unknown
-// values pass through unchanged. Used by SearchListCtrl to render the
-// Codec column.
-wxString FormatMediaCodec(const wxString& raw);
+/**
+ * Punctuation for a "label: value" pair, applied to an already-translated label.
+ *
+ * Where the colon sits is a property of the language, not of the layout: Russian typography forbids
+ * a space before it, French requires one. Building the string in C++ ("label" + ": ") puts that
+ * choice out of a translator's reach (amule-org/amule#1294). One catalog entry settles the
+ * convention for every label at once, and lets the bare label stay shared with the list columns and
+ * menus that already translate it, rather than each dialog minting a colon-suffixed twin.
+ */
+wxString LabelWithColon(const wxString &label);
+
+/**
+ * A timestamp written the way the user's locale writes one.
+ *
+ * "%x %X", so the day/month order, the separators and the 12- or 24-hour clock all come from
+ * LC_TIME rather than from us. Every timestamp the interface shows goes through here, so the
+ * choice is made once instead of per call site -- which is how they came to disagree with each
+ * other (amule-org/amule#925).
+ *
+ * Not for the log or for anything on the wire. An ISO 8601 stamp sorts lexicographically, cannot
+ * be read day-first or month-first by mistake and survives being pasted into a bug report by
+ * someone in another locale, all of which matter more there than looking familiar does.
+ */
+wxString FormatLocalDateTime(const wxDateTime &when);
+// Date-only form of the above, for a column too narrow to carry both.
+wxString FormatLocalDate(const wxDateTime &when);
+// Maps an ed2k FT_MEDIA_CODEC FOURCC / format string to a friendlier display
+// name ("H264" -> "H.264", "XVID" -> "Xvid"); unknown values pass through.
+//! Codec FOURCC to its display label, e.g. "h264" to "H.264". Thin wrapper over
+//! MediaCodecLabel() (common/MediaCodecName.h), which amuleapi calls directly.
+wxString FormatMediaCodec(const wxString &raw);
 // Returns the amount of Bytes the provided size-type represents
 uint32 GetTypeSize(uint8 type);
 // Returns the string associated with a file-rating value.
 wxString GetRateString(uint16 rate);
 
-
 // The following functions are used to identify and/or name the type of a file
-enum FileType { ftAny, ftVideo, ftAudio, ftArchive, ftCDImage, ftPicture, ftText, ftProgram };
+enum FileType
+{
+	ftAny,
+	ftVideo,
+	ftAudio,
+	ftArchive,
+	ftCDImage,
+	ftPicture,
+	ftText,
+	ftProgram
+};
 // Examins a filename and returns the enumerated value associated with it, or ftAny if unknown extension
-FileType GetFiletype(const CPath& filename);
+FileType GetFiletype(const CPath &filename);
 // Returns the description of a filetype: Movies, Audio, Pictures and so on...
 wxString GetFiletypeDesc(FileType type, bool translated = true);
 // Shorthand for GetFiletypeDesc(GetFiletype(filename))
-wxString GetFiletypeByName(const CPath& filename, bool translated = true);
-
+wxString GetFiletypeByName(const CPath &filename, bool translated = true);
 
 // Returns the name associated with a category value.
 wxString GetCatTitle(AllCategoryFilter cat);
 
-
-///////////////////////////////////////////////////////////////////////////////
 // ED2K File Type
-//
 
 enum EED2KFileType
 {
@@ -277,149 +243,165 @@
 class EED2KFileTypeClass
 {
 public:
-	EED2KFileTypeClass()
-	{
-		s_t = ED2KFT_ANY;
-	}
-	EED2KFileTypeClass(EED2KFileType t)
-	{
-		s_t = t;
-	}
-	EED2KFileType GetType() const
-	{
-		return s_t;
-	}
+	EED2KFileTypeClass() { s_t = ED2KFT_ANY; }
+	EED2KFileTypeClass(EED2KFileType t) { s_t = t; }
+	EED2KFileType GetType() const { return s_t; }
 
 private:
 	EED2KFileType s_t;
 };
 
-EED2KFileType GetED2KFileTypeID(const CPath& fileName);
+EED2KFileType GetED2KFileTypeID(const CPath &fileName);
+
+//! True when a file's name marks it as something ffprobe could extract media metadata from -- audio
+//! or video by extension.
+//!
+//! Lives in muleappcommon because the core and the GUI must agree on it: the scheduler uses it to
+//! decide what to probe, and the shared-files view to decide whether to offer the action at all.
+//! Two copies of the rule would eventually disagree, and the symptom would be a menu entry that is
+//! enabled and silently does nothing.
+//!
+//! Says nothing about whether the file is COMPLETE. An in-progress download is in the shared list
+//! as a partfile with nothing readable on disk, and callers test that separately.
+bool IsMediaProbeCandidate(const CPath &fileName);
 wxString GetED2KFileTypeSearchTerm(EED2KFileType iFileID);
-wxString GetFileTypeByName(const CPath& fileName);
+wxString GetFileTypeByName(const CPath &fileName);
 EED2KFileType GetED2KFileTypeSearchID(EED2KFileType iFileID);
 ///////////////////////////////////////////////////////////////////////////////
 
-// md4cmp -- replacement for memcmp(hash1,hash2,16)
-// Like 'memcmp' this function returns 0, if hash1==hash2, and !0, if hash1!=hash2.
-// NOTE: Do *NOT* use that function for determining if hash1<hash2 or hash1>hash2.
-inline int md4cmp(const void* hash1, const void* hash2)
+// md4cmp -- replacement for memcmp(hash1, hash2, 16): 0 if equal, non-zero otherwise. Do NOT use it
+// to decide whether hash1 < hash2.
+inline int md4cmp(const void *hash1, const void *hash2)
 {
 	return memcmp(hash1, hash2, 16);
 }
 
-
 // md4clr -- replacement for memset(hash,0,16)
-inline void md4clr(void* hash)
+inline void md4clr(void *hash)
 {
 	memset(hash, 0, 16);
 }
 
-
 // md4cpy -- replacement for memcpy(dst,src,16)
-inline void md4cpy(void* dst, const void* src)
+inline void md4cpy(void *dst, const void *src)
 {
 	memcpy(dst, src, 16);
 }
 
-
 // DumpMem ... Dumps mem ;)
-wxString DumpMemToStr(const void *buff, int n, const wxString& msg = "", bool ok = true);
-void DumpMem(const void *buff, int n, const wxString& msg = "", bool ok = true);
+wxString DumpMemToStr(const void *buff, int n, const wxString &msg = "", bool ok = true);
+void DumpMem(const void *buff, int n, const wxString &msg = "", bool ok = true);
 void DumpMem_DW(const uint32 *ptr, int count);
 
 // Returns special source ID for GUI.
 // It's actually IP<<16+Port
-#define GUI_ID(x,y) (uint64)((((uint64)x)<<16) + (uint64)y)
+#define GUI_ID(x, y) (uint64)((((uint64)x) << 16) + (uint64)y)
 // And so...
 #define PORT_FROM_GUI_ID(x) (x & 0xFFFF)
 #define IP_FROM_GUI_ID(x) (x >> 16)
 
+// Label for a chat peer the core has no nickname for, built from its GUI_ID. Deliberately NOT
+// translated: the same label is rendered by the monolithic chat selector, by amulegui and by
+// amuleapi's /chats, and the API contract fixes it as English. Translating the GUI copies alone
+// would show one conversation under two names depending on which client you opened.
+inline wxString ChatPeerFallbackName(uint64 gui_id)
+{
+	return CFormat(wxT("IP: %s Port: %u")) % Uint32toStringIP(IP_FROM_GUI_ID(gui_id)) %
+	       PORT_FROM_GUI_ID(gui_id);
+}
 
-
-inline long int make_full_ed2k_version(int a, int b, int c) {
+inline long int make_full_ed2k_version(int a, int b, int c)
+{
 	return ((a << 17) | (b << 10) | (c << 7));
 }
 
+// Outcome of comparing the latest published release against this build.
+struct CVersionCompareResult
+{
+	enum State
+	{
+		ParseError, // tag_name missing or unparseable
+		UpToDate,   // running version is >= the latest release
+		Outdated,   // a newer release exists
+	} state = ParseError;
+
+	// Parsed components of the latest release tag (0 on ParseError).
+	long major = 0;
+	long minor = 0;
+	long update = 0;
+	// "major.minor.update" convenience string; empty on ParseError.
+	wxString latest;
+};
 
-wxString GetConfigDir(const wxString &configFile);
+// Parse the `tag_name` from a GitHub /releases/latest JSON body and compare it against this
+// binary's compiled VERSION_MJR/MIN/UPDATE. Pure and wxBase-only (no GUI, no preferences), so the
+// daemon check (CamuleApp::CheckNewVersion), the GUI check (CVersionCheck) and amuleapi all share
+// one implementation.
+CVersionCompareResult CompareLatestReleaseVersion(const wxString &json);
 
+wxString GetConfigDir(const wxString &configFile);
 
-/**
- * Adds aMule's custom languages to db.
- */
+/// Adds aMule's custom languages to db.
 void InitCustomLanguages();
 
-/**
- * Initializes locale
- */
-void InitLocale(wxLocale& locale, int language);
+/// Initializes the locale.
+void InitLocale(wxLocale &locale, int language);
 
-/**
- * Converts a string locale definition to a wxLANGUAGE id.
- */
-int StrLang2wx(const wxString& language);
+/// Converts a string locale definition to a wxLANGUAGE id.
+int StrLang2wx(const wxString &language);
 
-/**
- * Converts a wxLANGUAGE id to a string locale name.
- */
+/// Converts a wxLANGUAGE id to a string locale name.
 wxString wxLang2Str(const int lang);
 
-/**
- * Generate MD5Hash of prompt input
- */
+/// Generates the MD5 hash of prompted input.
 CMD4Hash GetPassword(bool allowEmptyPassword = false);
 
-
 #if wxUSE_THREADS
 
 #include <wx/thread.h>
 
 /**
- * Automatically unlocks a mutex on construction and locks it on destruction.
- *
- * This class is the complement of wxMutexLocker.  It is intended to be used
- * when a mutex, which is locked for a period of time, needs to be
- * temporarily unlocked for a bit.  For example:
+ * Unlocks a mutex on construction and locks it on destruction: the complement of wxMutexLocker,
+ * for temporarily releasing a mutex held across a longer span.
  *
  *	wxMutexLocker lock(mutex);
- *
- *	// ... do stuff that requires that the mutex is locked ...
- *
+ *	// ... work that needs the mutex locked ...
  *	{
  *		CMutexUnlocker unlocker(mutex);
- *		// ... do stuff that requires that the mutex is unlocked ...
+ *		// ... work that needs it unlocked ...
  *	}
- *
- *	// ... do more stuff that requires that the mutex is locked ...
- *
+ *	// ... more work that needs it locked ...
  */
 class CMutexUnlocker
 {
 public:
-    // unlock the mutex in the ctor
-    CMutexUnlocker(wxMutex& mutex)
-        : m_isOk(false), m_mutex(mutex)
-        { m_isOk = ( m_mutex.Unlock() == wxMUTEX_NO_ERROR ); }
+	// unlock the mutex in the ctor
+	CMutexUnlocker(wxMutex &mutex)
+	: m_isOk(false)
+	, m_mutex(mutex)
+	{
+		m_isOk = (m_mutex.Unlock() == wxMUTEX_NO_ERROR);
+	}
 
-    // returns true if mutex was successfully unlocked in ctor
-    bool IsOk() const
-        { return m_isOk; }
+	// returns true if mutex was successfully unlocked in ctor
+	bool IsOk() const { return m_isOk; }
 
-    // lock the mutex in dtor
-    ~CMutexUnlocker()
-        { if ( IsOk() ) m_mutex.Lock(); }
+	// lock the mutex in dtor
+	~CMutexUnlocker()
+	{
+		if (IsOk())
+			m_mutex.Lock();
+	}
 
 private:
-    // no assignment operator nor copy ctor
-    CMutexUnlocker(const CMutexUnlocker&);
-    CMutexUnlocker& operator=(const CMutexUnlocker&);
+	// no assignment operator nor copy ctor
+	CMutexUnlocker(const CMutexUnlocker &);
+	CMutexUnlocker &operator=(const CMutexUnlocker &);
 
-    bool     m_isOk;
-    wxMutex& m_mutex;
+	bool m_isOk;
+	wxMutex &m_mutex;
 };
 #endif /* wxUSE_THREADS */
 
-
 #endif // OTHERFUNCTIONS_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/OtherStructs.h -> amule-3.1.0.tar.gz/src/OtherStructs.h Changed

@@ -31,15 +31,15 @@
 // Defined in <zlib.h>
 struct z_stream_s;
 
-
 //			SERVER TO CLIENT
 #if defined(_MSC_VER) || defined(__SUNPRO_CC)
 #pragma pack(1)
 #endif
-struct Header_Struct{
-	int8	eDonkeyID;
-	int32	packetlength;
-	int8	command;
+struct Header_Struct
+{
+	int8 eDonkeyID;
+	int32 packetlength;
+	int8 command;
 }
 #if defined(_MSC_VER) || defined(__SUNPRO_CC)
 ;
@@ -51,9 +51,10 @@
 #if defined(_MSC_VER) || defined(__SUNPRO_CC)
 #pragma pack(1)
 #endif
-struct UDP_Header_Struct {
-	int8	eDonkeyID;
-	int8	command;
+struct UDP_Header_Struct
+{
+	int8 eDonkeyID;
+	int8 command;
 }
 #if defined(_MSC_VER) || defined(__SUNPRO_CC)
 ;
@@ -66,12 +67,13 @@
 ;
 #pragma pack(1)
 #endif
-struct Requested_Block_Struct{
-	uint64	StartOffset;
-	uint64	EndOffset;
-	uint32	packedsize;
-	unsigned char	FileID16;
-	uint32  transferred; // Barry - This counts bytes completed
+struct Requested_Block_Struct
+{
+	uint64 StartOffset;
+	uint64 EndOffset;
+	uint32 packedsize;
+	unsigned char FileID16;
+	uint32 transferred; // Barry - This counts bytes completed
 }
 #if defined(_MSC_VER) || defined(__SUNPRO_CC)
 ;
@@ -80,19 +82,24 @@
 __attribute__((__packed__));
 #endif
 
-struct Pending_Block_Struct{
-	Requested_Block_Struct*	block;
-	struct z_stream_s*       zStream;       // Barry - Used to unzip packets
-	uint32		totalUnzipped; // Barry - This holds the total unzipped bytes for all packets so far
-	uint32		fZStreamError : 1,
-				fRecovered    : 1,
-				fQueued       : 1; // 0 = block sits in m_PendingBlocks_list waiting to be asked over the wire,
-				                   // 1 = block has been written to an OP_REQUESTPARTS packet and the sender owes us bytes for it.
-				                   // Lets m_MaxBlockRequests act as the local queue depth while each wire packet still
-				                   // carries the protocol-mandated 3 blocks (eMule 0.70 SendBlockRequests pattern).
+struct Pending_Block_Struct
+{
+	Requested_Block_Struct *block;
+	struct z_stream_s *zStream; // Barry - Used to unzip packets
+	uint32 totalUnzipped;       // Barry - This holds the total unzipped bytes for all packets so far
+	uint32 fZStreamError : 1, fRecovered : 1,
+		fQueued : 1; // 0 = block sits in m_PendingBlocks_list waiting to be asked over the wire,
+			     // 1 = block has been written to an OP_REQUESTPARTS packet and the
+			     // sender owes us bytes for it. Lets the pending list act as the local
+			     // queue depth while each wire packet still carries the protocol-mandated
+			     // 3 blocks (eMule 0.70 SendBlockRequests pattern).
+	// Tick when this block's request went on the wire; reset to 0 once its first byte arrives.
+	// Used for the per-source min-RTT / BDP depth estimate.
+	uint64 sentTime;
 };
 
-struct Gap_Struct{
+struct Gap_Struct
+{
 	uint64 start;
 	uint64 end;
 };
@@ -100,10 +107,11 @@
 #if defined(_MSC_VER) || defined(__SUNPRO_CC)
 #pragma pack(1)
 #endif
-struct ServerMet_Struct {
-	uint32	ip;
-	uint16	port;
-	uint32	tagcount;
+struct ServerMet_Struct
+{
+	uint32 ip;
+	uint16 port;
+	uint32 tagcount;
 }
 #if defined(_MSC_VER) || defined(__SUNPRO_CC)
 ;
@@ -112,22 +120,24 @@
 __attribute__((__packed__));
 #endif
 
-struct TransferredData {
-	uint32	datalen;
-	uint32	timestamp;
+struct TransferredData
+{
+	uint32 datalen;
+	uint32 timestamp;
 };
 
-
-//Kry import of 0.30d
-// Maella -Enhanced Chunk Selection- (based on jicxicmic)
+// Kry import of 0.30d
+//  Maella -Enhanced Chunk Selection- (based on jicxicmic)
 #if defined(_MSC_VER) || defined(__SUNPRO_CC)
 #pragma pack(1)
 #endif
-struct Chunk {
-	uint16 part;      // Index of the chunk
-		union {
-			uint16 frequency; // Availability of the chunk
-			uint16 rank;      // Download priority factor (highest = 0, lowest = 0xffff)
+struct Chunk
+{
+	uint16 part; // Index of the chunk
+	union
+	{
+		uint16 frequency; // Availability of the chunk
+		uint16 rank;      // Download priority factor (highest = 0, lowest = 0xffff)
 	};
 }
 #if defined(_MSC_VER) || defined(__SUNPRO_CC)
@@ -139,13 +149,12 @@
 
 struct Category_Struct
 {
-	CPath		path;
-	wxString	title;
-	wxString	comment;
-	uint32		color;
-	uint8		prio;
+	CPath path;
+	wxString title;
+	wxString comment;
+	uint32 color;
+	uint8 prio;
 };
 
-
 #endif // OTHERSTRUCTS_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/Packet.cpp -> amule-3.1.0.tar.gz/src/Packet.cpp Changed

@@ -23,34 +23,35 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include <zlib.h>		// Needed for uLongf
+#include <zlib.h> // Needed for uLongf
 
-#include "Packet.h"				// Interface declarations
+#include "Packet.h" // Interface declarations
 
 #include <protocol/Protocols.h>
 
-#include "Logger.h"			// Needed for AddDebugLogLineN
-#include "MemFile.h"			// Needed for CMemFile
-#include "OtherStructs.h"		// Needed for Header_Struct
-#include "ArchSpecific.h"		// Needed for ENDIAN_*
+#include "Logger.h"       // Needed for AddDebugLogLineN
+#include "MemFile.h"      // Needed for CMemFile
+#include "OtherStructs.h" // Needed for Header_Struct
+#include "ArchSpecific.h" // Needed for ENDIAN_*
 
 // Copy constructor
 CPacket::CPacket(CPacket &p)
 {
-	size		= p.size;
-	opcode		= p.opcode;
-	prot		= p.prot;
-	m_bSplitted	= p.m_bSplitted;
+	size = p.size;
+	opcode = p.opcode;
+	prot = p.prot;
+	m_bSplitted = p.m_bSplitted;
 	m_bLastSplitted = p.m_bLastSplitted;
-	m_bPacked	= p.m_bPacked;
-	m_bFromPF	= p.m_bFromPF;
+	m_bPacked = p.m_bPacked;
+	m_bFromPF = p.m_bFromPF;
 	memcpy(head, p.head, sizeof head);
-	tempbuffer	= NULL;
+	tempbuffer = NULL;
 	if (p.completebuffer) {
-		completebuffer	= new uint8_tsize + 10;;
-		pBuffer	= completebuffer + sizeof(Header_Struct);
+		completebuffer = new uint8_tsize + 10;
+		;
+		pBuffer = completebuffer + sizeof(Header_Struct);
 	} else {
-		completebuffer	= NULL;
+		completebuffer = NULL;
 		if (p.pBuffer) {
 			pBuffer = new uint8_tsize;
 		} else {
@@ -58,53 +59,53 @@
 		}
 	}
 	if (pBuffer)
-		memcpy( pBuffer, p.pBuffer, size );
+		memcpy(pBuffer, p.pBuffer, size);
 }
 
 CPacket::CPacket(uint8 protocol)
 {
-	size		= 0;
-	opcode		= 0;
-	prot		= protocol;
-	m_bSplitted	= false;
+	size = 0;
+	opcode = 0;
+	prot = protocol;
+	m_bSplitted = false;
 	m_bLastSplitted = false;
-	m_bPacked	= false;
-	m_bFromPF	= false;
+	m_bPacked = false;
+	m_bFromPF = false;
 	memset(head, 0, sizeof head);
-	tempbuffer	= NULL;
-	completebuffer	= NULL;
-	pBuffer	= NULL;
+	tempbuffer = NULL;
+	completebuffer = NULL;
+	pBuffer = NULL;
 }
 
 // only used for receiving packets
-CPacket::CPacket(uint8_t* rawHeader, uint8_t *buf)
+CPacket::CPacket(uint8_t *rawHeader, uint8_t *buf)
 {
 	memset(head, 0, sizeof head);
-	Header_Struct* header = reinterpret_cast<Header_Struct*>(rawHeader);
-	size		= ENDIAN_SWAP_32(header->packetlength) - 1;
-	opcode		= header->command;
-	prot		= header->eDonkeyID;
-	m_bSplitted	= false;
+	Header_Struct *header = reinterpret_cast<Header_Struct *>(rawHeader);
+	size = ENDIAN_SWAP_32(header->packetlength) - 1;
+	opcode = header->command;
+	prot = header->eDonkeyID;
+	m_bSplitted = false;
 	m_bLastSplitted = false;
-	m_bPacked	= false;
-	m_bFromPF	= false;
-	tempbuffer	= NULL;
-	completebuffer	= NULL;
-	pBuffer	= buf;
+	m_bPacked = false;
+	m_bFromPF = false;
+	tempbuffer = NULL;
+	completebuffer = NULL;
+	pBuffer = buf;
 }
 
-CPacket::CPacket(const CMemFile& datafile, uint8 protocol, uint8 ucOpcode)
+CPacket::CPacket(const CMemFile &datafile, uint8 protocol, uint8 ucOpcode)
 {
-	size		= datafile.GetLength();
-	opcode		= ucOpcode;
-	prot		= protocol;
-	m_bSplitted	= false;
+	size = datafile.GetLength();
+	opcode = ucOpcode;
+	prot = protocol;
+	m_bSplitted = false;
 	m_bLastSplitted = false;
-	m_bPacked	= false;
-	m_bFromPF	= false;
+	m_bPacked = false;
+	m_bFromPF = false;
 	memset(head, 0, sizeof head);
 	tempbuffer = NULL;
-	completebuffer = new uint8_tsize + sizeof(Header_Struct)/*Why this 4?*/;
+	completebuffer = new uint8_tsize + sizeof(Header_Struct) /*Why this 4?*/;
 	pBuffer = completebuffer + sizeof(Header_Struct);
 
 	// Write contents of MemFile to buffer (while keeping original position in file)
@@ -116,15 +117,15 @@
 
 CPacket::CPacket(int8 in_opcode, uint32 in_size, uint8 protocol, bool bFromPF)
 {
-	size		= in_size;
-	opcode		= in_opcode;
-	prot		= protocol;
-	m_bSplitted	= false;
+	size = in_size;
+	opcode = in_opcode;
+	prot = protocol;
+	m_bSplitted = false;
 	m_bLastSplitted = false;
-	m_bPacked	= false;
-	m_bFromPF	= bFromPF;
+	m_bPacked = false;
+	m_bFromPF = bFromPF;
 	memset(head, 0, sizeof head);
-	tempbuffer	= NULL;
+	tempbuffer = NULL;
 	if (in_size) {
 		completebuffer = new uint8_tin_size + sizeof(Header_Struct) + 4 /*Why this 4?*/;
 		pBuffer = completebuffer + sizeof(Header_Struct);
@@ -136,120 +137,124 @@
 }
 
 // only used for splitted packets!
-CPacket::CPacket(uint8_t* pPacketPart, uint32 nSize, bool bLast, bool bFromPF)
+CPacket::CPacket(uint8_t *pPacketPart, uint32 nSize, bool bLast, bool bFromPF)
 {
-	size		= nSize - sizeof(Header_Struct);
-	opcode		= 0;
-	prot		= 0;
-	m_bSplitted	= true;
-	m_bLastSplitted	= bLast;
-	m_bPacked	= false;
-	m_bFromPF	= bFromPF;
+	size = nSize - sizeof(Header_Struct);
+	opcode = 0;
+	prot = 0;
+	m_bSplitted = true;
+	m_bLastSplitted = bLast;
+	m_bPacked = false;
+	m_bFromPF = bFromPF;
 	memset(head, 0, sizeof head);
-	tempbuffer	= NULL;
-	completebuffer	= pPacketPart;
-	pBuffer		= NULL;
+	tempbuffer = NULL;
+	completebuffer = pPacketPart;
+	pBuffer = NULL;
 }
 
 CPacket::~CPacket()
 {
-	// Never deletes pBuffer when completebuffer is not NULL
+	// Never deletes pBuffer when completebuffer is not NULL. Not a redundant null-guard: pBuffer
+	// aliases into completebuffer when that is set, so exactly one of the two owns the allocation.
+	// NOLINTNEXTLINE(readability-delete-null-pointer)
 	if (completebuffer) {
-		delete  completebuffer;
-	} else if (pBuffer) {
-	// On the other hand, if completebuffer is NULL and pBuffer is not NULL
-		delete  pBuffer;
+		delete completebuffer;
+	} else {
+		// If completebuffer is NULL, pBuffer is ours to free (delete on a
+		// null pBuffer is a no-op).
+		delete pBuffer;
 	}
 
-	if (tempbuffer) {
-		delete  tempbuffer;
-	}
+	delete tempbuffer;
 }
 
-uint32 CPacket::GetPacketSizeFromHeader(const uint8_t* rawHeader)
+uint32 CPacket::GetPacketSizeFromHeader(const uint8_t *rawHeader)
 {
-	const Header_Struct* header = reinterpret_cast<const Header_Struct*>(rawHeader);
+	const Header_Struct *header = reinterpret_cast<const 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 uint8_t* data, unsigned int n)
+void CPacket::CopyToDataBuffer(unsigned int offset, const uint8_t *data, unsigned int n)
 {
 	wxASSERT(offset + n <= size + 1);
 	memcpy(pBuffer + offset, data, n);
 }
 
-uint8_t* CPacket::GetPacket() {
+uint8_t *CPacket::GetPacket()
+{
 	if (completebuffer) {
 		if (!m_bSplitted) {
 			memcpy(completebuffer, GetHeader(), sizeof(Header_Struct));
 		}
 		return completebuffer;
 	} else {
-		if (tempbuffer){
-			delete  tempbuffer;
+		if (tempbuffer) {
+			delete tempbuffer;
 			tempbuffer = NULL;
 		}
 		tempbuffer = new uint8_tsize + sizeof(Header_Struct) + 4 /* why this 4?*/;
-		memcpy(tempbuffer    , GetHeader(), sizeof(Header_Struct));
-		memcpy(tempbuffer + sizeof(Header_Struct), pBuffer    , size);
+		memcpy(tempbuffer, GetHeader(), sizeof(Header_Struct));
+		memcpy(tempbuffer + sizeof(Header_Struct), pBuffer, size);
 		return tempbuffer;
 	}
 }
 
-uint8_t* CPacket::DetachPacket() {
+uint8_t *CPacket::DetachPacket()
+{
 	if (completebuffer) {
 		if (!m_bSplitted) {
 			memcpy(completebuffer, GetHeader(), sizeof(Header_Struct));
 		}
-		uint8_t* result = completebuffer;
+		uint8_t *result = completebuffer;
 		completebuffer = pBuffer = NULL;
 		return result;
-	} else{
-		if (tempbuffer){
+	} else {
+		if (tempbuffer) {
 			delete tempbuffer;
 			tempbuffer = NULL;
 		}
-		tempbuffer = new uint8_tsize+sizeof(Header_Struct)+4 /* Why this 4?*/;
-		memcpy(tempbuffer,GetHeader(),sizeof(Header_Struct));
-		memcpy(tempbuffer+sizeof(Header_Struct),pBuffer,size);
-		uint8_t* result = tempbuffer;
+		tempbuffer = new uint8_tsize + sizeof(Header_Struct) + 4 /* Why this 4?*/;
+		memcpy(tempbuffer, GetHeader(), sizeof(Header_Struct));
+		memcpy(tempbuffer + sizeof(Header_Struct), pBuffer, size);
+		uint8_t *result = tempbuffer;
 		tempbuffer = 0;
 		return result;
 	}
 }
 
-uint8_t* CPacket::GetHeader() {
-	wxASSERT( !m_bSplitted );
+uint8_t *CPacket::GetHeader()
+{
+	wxASSERT(!m_bSplitted);
 
-	Header_Struct* header = reinterpret_cast<Header_Struct*>(head);
+	Header_Struct *header = reinterpret_cast<Header_Struct *>(head);
 	header->command = opcode;
-	header->eDonkeyID =  prot;
+	header->eDonkeyID = prot;
 	header->packetlength = ENDIAN_SWAP_32(size + 1);
 
 	return head;
 }
 
-uint8_t* CPacket::GetUDPHeader() {
-	wxASSERT( !m_bSplitted );
+uint8_t *CPacket::GetUDPHeader()
+{
+	wxASSERT(!m_bSplitted);
 
 	memset(head, 0, 6);
-	UDP_Header_Struct* header = reinterpret_cast<UDP_Header_Struct*>(head);
-	header->eDonkeyID =  prot;
+	UDP_Header_Struct *header = reinterpret_cast<UDP_Header_Struct *>(head);
+	header->eDonkeyID = prot;
 	header->command = opcode;
 
 	return head;
 }
 
-
 void CPacket::PackPacket()
 {
 	wxASSERT(!m_bSplitted);
 
 	uLongf newsize = size + 300;
-	uint8_t* output = new uint8_tnewsize;
+	uint8_t *output = new uint8_tnewsize;
 
 	uint16 result = compress2(output, &newsize, pBuffer, size, Z_BEST_COMPRESSION);
 
@@ -271,29 +276,28 @@
 	size = newsize;
 }
 
-
-bool CPacket::UnPackPacket(uint32 uMaxDecompressedSize) {
-	wxASSERT( prot == OP_PACKEDPROT || prot == OP_ED2KV2PACKEDPROT);
+bool CPacket::UnPackPacket(uint32 uMaxDecompressedSize)
+{
+	wxASSERT(prot == OP_PACKEDPROT || prot == OP_ED2KV2PACKEDPROT);
 	// OP_ED2KV2PACKEDPROT is experimental aMule test code,
 	// this should not happen yet. Leave a warning in the log.
 	if (prot == OP_ED2KV2PACKEDPROT) {
-		AddDebugLogLineN(logPacketErrors,
-			"Received OP_ED2KV2PACKEDPROT.");
+		AddDebugLogLineN(logPacketErrors, "Received OP_ED2KV2PACKEDPROT.");
 	}
 
 	uint32 nNewSize = size * 10 + 300;
 
-	if (nNewSize > uMaxDecompressedSize){
+	if (nNewSize > uMaxDecompressedSize) {
 		nNewSize = uMaxDecompressedSize;
 	}
 
-	uint8_t* unpack = new uint8_tnNewSize;
+	uint8_t *unpack = new uint8_tnNewSize;
 	uLongf unpackedsize = nNewSize;
 	uint16 result = uncompress(unpack, &unpackedsize, pBuffer, size);
 
 	if (result == Z_OK) {
-		wxASSERT( completebuffer == NULL );
-		wxASSERT( pBuffer != NULL );
+		wxASSERT(completebuffer == NULL);
+		wxASSERT(pBuffer != NULL);
 
 		size = unpackedsize;
 		delete pBuffer;
@@ -306,16 +310,14 @@
 	return false;
 }
 
-
-void CPacket::Copy16ToDataBuffer(const void* data)
+void CPacket::Copy16ToDataBuffer(const void *data)
 {
 	md4cpy(pBuffer, data);
 }
 
-
 void CPacket::CopyUInt32ToDataBuffer(uint32 data, unsigned int offset)
 {
 	wxCHECK_RET(offset <= size - sizeof(uint32), "Bad offset in CopyUInt32ToDataBuffer.");
-	PokeUInt32( pBuffer + offset, data );
+	PokeUInt32(pBuffer + offset, data);
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/Packet.h -> amule-3.1.0.tar.gz/src/Packet.h Changed

@@ -27,7 +27,7 @@
 #ifndef PACKET_H
 #define PACKET_H
 
-#include "Types.h"		// Needed for int8, int32, uint8 and uint32
+#include "Types.h" // Needed for int8, int32, uint8 and uint32
 
 class CMemFile;
 class wxString;
@@ -37,55 +37,59 @@
 //			PACKET CLASS
 // TODO some parts could need some work to make it more efficient
 
-class CPacket {
+class CPacket
+{
 public:
 	CPacket(CPacket &p);
 	CPacket(uint8 protocol);
-	CPacket(uint8_t* header, uint8_t *buf); // only used for receiving packets
-	CPacket(const CMemFile& datafile, uint8 protocol, uint8 ucOpcode);
+	CPacket(uint8_t *header, uint8_t *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(uint8_t* pPacketPart, uint32 nSize, bool bLast, bool bFromPF = true); // only used for splitted packets!
+	CPacket(uint8_t *pPacketPart,
+		uint32 nSize,
+		bool bLast,
+		bool bFromPF = true); // only used for splitted packets!
 
 	~CPacket();
 
-	uint8_t*		GetHeader();
-	uint8_t*		GetUDPHeader();
-	uint8_t*		GetPacket();
-	uint8_t*		DetachPacket();
-	uint32			GetRealPacketSize() const	{ return size + 6; }
-	static uint32		GetPacketSizeFromHeader(const uint8_t* rawHeader);
-	bool			IsSplitted()		{ return m_bSplitted; }
-	bool			IsLastSplitted()	{ return m_bLastSplitted; }
-	void			PackPacket();
-	bool			UnPackPacket(uint32 uMaxDecompressedSize = 50000);
+	uint8_t *GetHeader();
+	uint8_t *GetUDPHeader();
+	uint8_t *GetPacket();
+	uint8_t *DetachPacket();
+	uint32 GetRealPacketSize() const { return size + 6; }
+	static uint32 GetPacketSizeFromHeader(const uint8_t *rawHeader);
+	bool IsSplitted() { return m_bSplitted; }
+	bool IsLastSplitted() { return m_bLastSplitted; }
+	void PackPacket();
+	bool UnPackPacket(uint32 uMaxDecompressedSize = 50000);
 	// -khaos--+++> Returns either -1, 0 or 1.  -1 is unset, 0 is from complete file, 1 is from part file
-	bool			IsFromPF()		{ return m_bFromPF; }
+	bool IsFromPF() { return m_bFromPF; }
 
-	uint8			GetOpCode() const	{ return opcode; }
-	void			SetOpCode(uint8 oc)	{ opcode = oc; }
-	uint32			GetPacketSize() const	{ return size; }
-	uint8			GetProtocol() const	{ return prot; }
-	void			SetProtocol(uint8 p)	{ prot = p; }
-	const uint8_t*	GetDataBuffer(void) const { return pBuffer; }
-	void			Copy16ToDataBuffer(const void* data);
-	void			CopyToDataBuffer(unsigned int offset, const uint8_t* data, unsigned int n);
-	void			CopyUInt32ToDataBuffer(uint32 data, unsigned int offset = 0);
+	uint8 GetOpCode() const { return opcode; }
+	void SetOpCode(uint8 oc) { opcode = oc; }
+	uint32 GetPacketSize() const { return size; }
+	uint8 GetProtocol() const { return prot; }
+	void SetProtocol(uint8 p) { prot = p; }
+	const uint8_t *GetDataBuffer(void) const { return pBuffer; }
+	void Copy16ToDataBuffer(const void *data);
+	void CopyToDataBuffer(unsigned int offset, const uint8_t *data, unsigned int n);
+	void CopyUInt32ToDataBuffer(uint32 data, unsigned int offset = 0);
 
 private:
 	//! CPacket is not assignable.
-	CPacket& operator=(const CPacket&);
+	CPacket &operator=(const CPacket &);
 
-	uint32		size;
-	uint8		opcode;
-	uint8		prot;
-	bool		m_bSplitted;
-	bool		m_bLastSplitted;
-	bool		m_bPacked;
-	bool		m_bFromPF;
-	uint8_t		head6;
-	uint8_t*	tempbuffer;
-	uint8_t*	completebuffer;
-	uint8_t*	pBuffer;
+	uint32 size;
+	uint8 opcode;
+	uint8 prot;
+	bool m_bSplitted;
+	bool m_bLastSplitted;
+	bool m_bPacked;
+	bool m_bFromPF;
+	uint8_t head6;
+	uint8_t *tempbuffer;
+	uint8_t *completebuffer;
+	uint8_t *pBuffer;
 };
 
 #endif // PACKET_H

amule-3.0.1.tar.gz/src/Parser.cpp -> amule-3.1.0.tar.gz/src/Parser.cpp Changed

amule-3.0.1.tar.gz/src/Parser.hpp -> amule-3.1.0.tar.gz/src/Parser.hpp Changed

amule-3.1.0.tar.gz/src/PartBarLegend.h Added

@@ -0,0 +1,352 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 PARTBARLEGEND_H
+#define PARTBARLEGEND_H
+
+// The palette of the chunk-bar columns -- the two in the client lists and the source-availability
+// one in the shared-files list -- and the legends the row context menu opens to explain them.
+//
+// The point of this header is that there is exactly one copy of each colour. A legend that restated
+// the palette, in words or in swatches filled from a second set of constants, would be free to
+// drift away from the pixels it claims to explain, and nothing would fail when it did. Here the
+// renderer and the legend both read SourcePartColour()/PeerPartColour(), so a colour can only
+// change for both at once.
+//
+// "One copy of each colour" is a rule about definitions, not about values. Two constants may hold
+// the same RGB when they mean different things and never appear in the same legend -- kNextPending
+// and kFlatHashPending do -- so the no-two-rows-alike invariant is scoped PER LEGEND: within one
+// legend a repeated colour is a distinction the reader cannot see; across two it is a coincidence.
+//
+// It pulls in nothing but <cstddef>/<cstdint>, ClientListColumns.h and PartBarSpans.h -- itself wx-
+// free -- so what a legend lists, in which order, in which colour, and which legend a column gets
+// is all reachable from a unit test with no wx, no app and no display session. What is left needing
+// a display is the drawing itself.
+
+#include <cstddef>
+#include <cstdint>
+
+#include "ClientListColumns.h" // Needed for GenericColumnEnum
+#include "PartBarSpans.h"      // Needed for BarMode
+
+namespace partbar
+{
+
+//! One bar colour, as plain components. Deliberately not CMuleColour, which
+//! cannot be constructed without wx; the GUI converts on use.
+struct BarColour
+{
+	std::uint8_t red;
+	std::uint8_t green;
+	std::uint8_t blue;
+};
+
+constexpr bool operator==(const BarColour &a, const BarColour &b)
+{
+	return a.red == b.red && a.green == b.green && a.blue == b.blue;
+}
+
+constexpr bool operator!=(const BarColour &a, const BarColour &b)
+{
+	return !(a == b);
+}
+
+// The palette itself. Two variants of each fill: the flat one is used when thePrefs::UseFlatBar()
+// is set, which drops the gradient the shaded bar draws and so needs more contrasty values.
+constexpr BarColour kBoth{ 0, 192, 0 };
+constexpr BarColour kFlatBoth{ 0, 150, 0 };
+
+constexpr BarColour kNeither{ 240, 240, 240 };
+constexpr BarColour kFlatNeither{ 224, 224, 224 };
+
+constexpr BarColour kClientOnly{ 104, 104, 104 };
+constexpr BarColour kFlatClientOnly{ 0, 0, 0 };
+
+// The two request cues have no flat variant: they are already flat colours,
+// and the shaded bar draws them unshaded too.
+constexpr BarColour kPending{ 255, 208, 0 };
+constexpr BarColour kNextPending{ 255, 255, 100 };
+
+constexpr BarColour kUnavailable{ 240, 240, 240 };
+constexpr BarColour kFlatUnavailable{ 224, 224, 224 };
+
+constexpr BarColour kAvailable{ 104, 104, 104 };
+constexpr BarColour kFlatAvailable{ 0, 0, 0 };
+
+// The part of a shared file not yet re-hashed, drawn flat. Byte-identical to kNextPending and
+// deliberately a separate constant: one is a request cue in a client list, the other is unread
+// bytes of a local file, and merging them would mean a change to either bar silently moved the
+// other.
+constexpr BarColour kFlatHashPending{ 255, 255, 100 };
+
+// The shared-files availability bar. A part no source holds is its own state,
+// not the dark end of the fade, so it keeps its own constant.
+constexpr BarColour kZeroSources{ 255, 0, 0 };
+
+//! Source count at which the fade reaches its dark end. Adding an eleventh source darkens nothing.
+//! This is AVAIL_FULL in src/webapi/static/js/components.js, and the two surfaces have to agree on
+//! it or the same file looks differently shared in the GUI and in a browser.
+constexpr unsigned kAvailFull = 10;
+
+//! The endpoints of the fade: one source, and kAvailFull or more. Shared with the Web UI's light
+//! theme as --piece-avail-lo / --piece-avail, which the test reads from there, so the two surfaces
+//! cannot drift.
+//!
+//! The dark end is deeper than the pair adopted in #1282, which travelled about a third less than
+//! the ramp it replaced and compressed the middle of the scale, making neighbouring source counts
+//! hard to tell apart.
+constexpr BarColour kAvailFew{ 166, 212, 238 };
+constexpr BarColour kAvailMany{ 13, 59, 102 };
+
+//! Steps between the two endpoints, so kAvailFull is stated once.
+constexpr int kAvailFadeSteps = static_cast<int>(kAvailFull) - 1;
+
+/**
+ * One channel of the blend, @p k steps of kAvailFadeSteps from @p lo to @p hi.
+ *
+ * round(lo + (hi - lo) * k / 9) without floating point: doubling numerator and denominator and
+ * adding half the denominator turns C++ truncating division into rounding. The numerator's minimum
+ * is hi * 9, which is positive, so the truncation is a floor and the identity holds.
+ *
+ * Nothing here can land on a half. lo * 9 + (hi - lo) * k over a denominator of 9 has a fractional
+ * part in ninths, and 1/2 is not one of them, so the rounding mode never matters -- Math.round in
+ * components.js:404-407, std::lround and banker's rounding all produce these same numbers. That is
+ * why the browser and the GUI agree by construction rather than by convention.
+ */
+constexpr std::uint8_t AvailabilityFadeChannel(int lo, int hi, int k)
+{
+	return static_cast<std::uint8_t>(
+		(2 * (lo * kAvailFadeSteps + (hi - lo) * k) + kAvailFadeSteps) / (2 * kAvailFadeSteps));
+}
+
+//! How far along the fade @p sources sits, saturating at kAvailFull.
+constexpr int AvailabilityFadeStep(unsigned sources)
+{
+	return sources >= kAvailFull ? kAvailFadeSteps : static_cast<int>(sources) - 1;
+}
+
+/**
+ * Bar colour for a part @p sources peers hold, for @p sources >= 1.
+ *
+ * Takes the source count and nothing else. That arity is deliberate: it is what stops the shared-
+ * files list and the downloads list from drifting apart again, because neither can pass its own
+ * endpoints without adding a parameter, and a changed signature is something a reviewer sees.
+ *
+ * @p sources == 0 is not on this fade at all -- see kZeroSources.
+ */
+constexpr BarColour SourceAvailabilityColour(unsigned sources)
+{
+	return BarColour{ AvailabilityFadeChannel(
+				  kAvailFew.red, kAvailMany.red, AvailabilityFadeStep(sources)),
+		AvailabilityFadeChannel(kAvailFew.green, kAvailMany.green, AvailabilityFadeStep(sources)),
+		AvailabilityFadeChannel(kAvailFew.blue, kAvailMany.blue, AvailabilityFadeStep(sources)) };
+}
+
+/**
+ * The five fills the Sources bar (ColumnUserProgress) distinguishes, in the order GetItemBarFill()
+ * tests them -- which is also the order the legend lists them in, so a reader can follow one
+ * against the other.
+ */
+enum class SourcePartState
+{
+	Missing = 0,   //!< the source does not have this part
+	Complete,      //!< the source has it and the file is complete here
+	Downloading,   //!< being downloaded from this source right now
+	NextRequested, //!< the next part that will be asked of this source
+	Needed         //!< the source has it and it is still missing here
+};
+
+/**
+ * The two fills the Peers bar (ColumnUserAvailable) distinguishes. A peer of one of our shared
+ * files is either holding a part or not; none of the request-state cues above apply, which is why
+ * the two columns cannot share one legend and, since #1192, no longer share one header label
+ * either.
+ */
+enum class PeerPartState
+{
+	Present = 0, //!< this peer already has the part
+	Missing      //!< this peer does not have it
+};
+
+//! Colour the Sources bar fills a part with, given its state and whether the
+//! flat-bar preference is on. The renderer calls this; so does the legend.
+constexpr BarColour SourcePartColour(SourcePartState state, bool flat)
+{
+	return state == SourcePartState::Missing         ? (flat ? kFlatNeither : kNeither)
+	       : state == SourcePartState::Complete      ? (flat ? kFlatBoth : kBoth)
+	       : state == SourcePartState::Downloading   ? kPending
+	       : state == SourcePartState::NextRequested ? kNextPending
+							 : (flat ? kFlatClientOnly : kClientOnly);
+}
+
+//! Colour the Peers bar fills a part with. Same contract as above.
+constexpr BarColour PeerPartColour(PeerPartState state, bool flat)
+{
+	return state == PeerPartState::Present ? (flat ? kFlatAvailable : kAvailable)
+					       : (flat ? kFlatUnavailable : kUnavailable);
+}
+
+/**
+ * What the source-availability bar can say about one part, as its legend lists it. The two blue
+ * rows are the ends of a continuum rather than two discrete fills, so the legend explains a
+ * gradient by naming where it starts and where it stops; the red is not on that gradient at all.
+ */
+enum class AvailabilityPartState
+{
+	ZeroSources = 0, //!< no source holds this part
+	FewSources,      //!< one source: the light end of the fade
+	ManySources      //!< kAvailFull or more: the dark end
+};
+
+/**
+ * What the same cell says while a re-hash is running. Unrelated to the above: availability is a
+ * fact about the swarm, this is progress through local data that happens to occupy the same column.
+ */
+enum class HashingPartState
+{
+	Hashed = 0,  //!< already read back and hashed
+	NotYetHashed //!< still to be read
+};
+
+/**
+ * Colour the source-availability bar fills a part with.
+ *
+ * @p flat is accepted and ignored, on purpose. The renderer took the flat-bar preference and never
+ * consulted it for this bar, so inventing a second set of values here would have the legend
+ * explaining a distinction the bar does not draw. The parameter stays for the shape it shares with
+ * its siblings, and the suite asserts both arguments give the same colour.
+ */
+constexpr BarColour AvailabilityPartColour(AvailabilityPartState state, bool)
+{
+	return state == AvailabilityPartState::ZeroSources  ? kZeroSources
+	       : state == AvailabilityPartState::FewSources ? SourceAvailabilityColour(1)
+							    : SourceAvailabilityColour(kAvailFull);
+}
+
+//! Colour the hashing bar fills a part with. Hashed reuses the palette's green
+//! rather than the private one the shared-files bar used to carry.
+constexpr BarColour HashingPartColour(HashingPartState state, bool flat)
+{
+	return state == HashingPartState::Hashed ? (flat ? kFlatBoth : kBoth)
+						 : (flat ? kFlatHashPending : kPending);
+}
+
+//! Which legend, if any, explains a column's cells.
+enum class BarLegendKind
+{
+	None = 0,           //!< the column draws no chunk bar
+	SourceParts,        //!< ColumnUserProgress, five states
+	PeerParts,          //!< ColumnUserAvailable, two states
+	SharedAvailability, //!< the shared-files bar, source counts
+	SharedHashing       //!< the same cell, re-hash progress
+};
+
+//! The legend a column's colours are explained by. BarLegendKind::None means the column draws no
+//! bar, so a list showing only such columns offers no legend at all.
+constexpr BarLegendKind LegendForColumn(GenericColumnEnum cid)
+{
+	return cid == ColumnUserProgress    ? BarLegendKind::SourceParts
+	       : cid == ColumnUserAvailable ? BarLegendKind::PeerParts
+					    : BarLegendKind::None;
+}
+
+/**
+ * The shared-files list's bar column, as a type of its own.
+ *
+ * That list identifies its columns with plain #defines (src/SharedFilesCtrl.h:31-46) whose numbers
+ * overlap GenericColumnEnum's: COLUMN_SHARED_PART is 8, which is also ColumnUserQueueRankLocal.
+ * Passing one where the other is wanted therefore compiled, silently, and returned a legend for the
+ * wrong thing. A distinct scoped enum has no conversion to the other, so that call is now a compile
+ * error -- and no existing call site had to change, this being an overload rather than a
+ * replacement.
+ *
+ * A deliberate static_cast still gets through; types cannot stop that, and the suite pins what it
+ * produces instead.
+ */
+enum class SharedFilesBarColumn
+{
+	SourceAvailability //!< COLUMN_SHARED_PART, the only bar column in that list
+};
+
+/**
+ * The legend explaining the shared-files bar, given what that row's bar is drawing.
+ *
+ * One column, two legends. The cell shows source availability most of the time and re-hash progress
+ * while a hash runs, and neither explains the other, so the mode has to reach the selector. It
+ * arrives as a value -- ModeFor() in PartBarSpans.h turns two integers into it -- which keeps this
+ * header free of row state and the whole thing constexpr.
+ */
+constexpr BarLegendKind LegendForColumn(SharedFilesBarColumn column, BarMode mode)
+{
+	return column != SharedFilesBarColumn::SourceAvailability ? BarLegendKind::None
+	       : mode == BarMode::Availability                    ? BarLegendKind::SharedAvailability
+	       : mode == BarMode::Hashing                         ? BarLegendKind::SharedHashing
+								  : BarLegendKind::None;
+}
+
+/**
+ * The legend for a shared-files row, straight from the two integers the file reports.
+ *
+ * The row context menu has exactly this decision to make and nothing else: which of the one
+ * column's two legends the clicked file wants, or none at all. Composed here rather than at the
+ * call site because the composition is the part a headless run can check -- opening the dialog is
+ * not.
+ */
+constexpr BarLegendKind LegendForSharedFilesRow(std::uint64_t hashedPartCount, std::size_t partCount)
+{
+	return LegendForColumn(SharedFilesBarColumn::SourceAvailability, ModeFor(hashedPartCount, partCount));
+}
+
+//! Rows of the Sources legend, top to bottom.
+constexpr SourcePartState kSourceLegendOrder = { SourcePartState::Missing,
+	SourcePartState::Complete,
+	SourcePartState::Downloading,
+	SourcePartState::NextRequested,
+	SourcePartState::Needed };
+
+constexpr std::size_t kSourceLegendSize = sizeof(kSourceLegendOrder) / sizeof(kSourceLegendOrder0);
+
+//! Rows of the Peers legend, top to bottom.
+constexpr PeerPartState kPeerLegendOrder = { PeerPartState::Present, PeerPartState::Missing };
+
+constexpr std::size_t kPeerLegendSize = sizeof(kPeerLegendOrder) / sizeof(kPeerLegendOrder0);
+
+//! Rows of the source-availability legend, top to bottom: the distinct state
+//! first, then the fade from its light end to its dark one.
+constexpr AvailabilityPartState kAvailabilityLegendOrder = { AvailabilityPartState::ZeroSources,
+	AvailabilityPartState::FewSources,
+	AvailabilityPartState::ManySources };
+
+constexpr std::size_t kAvailabilityLegendSize =
+	sizeof(kAvailabilityLegendOrder) / sizeof(kAvailabilityLegendOrder0);
+
+//! Rows of the hashing legend, top to bottom.
+constexpr HashingPartState kHashingLegendOrder = { HashingPartState::Hashed,
+	HashingPartState::NotYetHashed };
+
+constexpr std::size_t kHashingLegendSize = sizeof(kHashingLegendOrder) / sizeof(kHashingLegendOrder0);
+
+} // namespace partbar
+
+#endif // PARTBARLEGEND_H

amule-3.1.0.tar.gz/src/PartBarLegendUI.cpp Added

@@ -0,0 +1,232 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "PartBarLegendUI.h" // Interface declarations
+
+#include <wx/dcmemory.h> // Needed for wxMemoryDC (legend swatches)
+#include <wx/intl.h>     // Needed for _()
+#include <wx/sizer.h>    // Needed for wxSizer
+#include <wx/statbmp.h>  // Needed for wxStaticBitmap
+#include <wx/stattext.h> // Needed for wxStaticText
+#include <wx/window.h>   // Needed for wxWindow
+
+#include "InfoGridDialog.h" // Needed for ShowInfoGridDialog
+#include "Preferences.h"    // Needed for thePrefs::UseFlatBar
+
+namespace
+{
+
+//! Swatch size in both directions. One constant, so the gradient covers exactly
+//! the area a flat swatch fills and the rows line up.
+constexpr int kSwatchSide = 16;
+
+//! The two cells of one legend row, once, whatever the swatch was drawn by.
+void AddSwatchRow(wxWindow *parent, wxSizer *grid, const wxBitmap &swatch, const wxString &label)
+{
+	grid->Add(new wxStaticBitmap(parent, wxID_ANY, swatch), 0, wxALIGN_CENTRE_VERTICAL);
+	grid->Add(new wxStaticText(parent, wxID_ANY, label), 0, wxALIGN_CENTRE_VERTICAL);
+}
+
+wxString SourcePartStateLabel(partbar::SourcePartState state)
+{
+	switch (state) {
+	case partbar::SourcePartState::Missing:
+		return _("This source does not have the part");
+	case partbar::SourcePartState::Complete:
+		return _("You and this source both have the part");
+	case partbar::SourcePartState::Downloading:
+		return _("Being downloaded from this source now");
+	case partbar::SourcePartState::NextRequested:
+		return _("The next part that will be asked of this source");
+	case partbar::SourcePartState::Needed:
+		return _("This source has the part and you still need it");
+	}
+	return wxEmptyString;
+}
+
+wxString PeerPartStateLabel(partbar::PeerPartState state)
+{
+	switch (state) {
+	case partbar::PeerPartState::Present:
+		return _("This peer already has the part");
+	case partbar::PeerPartState::Missing:
+		return _("This peer does not have the part");
+	}
+	return wxEmptyString;
+}
+
+// "other" is load-bearing. CKnownFile::UpdateAvailablePartsCount() fills m_AvailPartFrequency from
+// the GetUpPartStatus() of remote clients only; our own copy is never counted. On the shared-files
+// list we hold every part by definition, so a red block does not mean the part is gone -- it means
+// no peer we know of has it too.
+wxString AvailabilityPartStateLabel(partbar::AvailabilityPartState state)
+{
+	switch (state) {
+	case partbar::AvailabilityPartState::ZeroSources:
+		return _("No other source has this part");
+	case partbar::AvailabilityPartState::FewSources:
+		return _("One other source has this part");
+	case partbar::AvailabilityPartState::ManySources:
+		// Formatted from kAvailFull rather than spelled out: the number is where the fade
+		// stops darkening, and a label naming a different one would be wrong in a way no
+		// reader could tell from the bar.
+		return wxString::Format(_("%u or more other sources have this part"), partbar::kAvailFull);
+	}
+	return wxEmptyString;
+}
+
+wxString HashingPartStateLabel(partbar::HashingPartState state)
+{
+	switch (state) {
+	case partbar::HashingPartState::Hashed:
+		return _("Already read back and hashed");
+	case partbar::HashingPartState::NotYetHashed:
+		return _("Still to be read");
+	}
+	return wxEmptyString;
+}
+
+//! The line above the grid, saying what one block of the bar stands for.
+wxString LegendIntro(partbar::BarLegendKind kind)
+{
+	switch (kind) {
+	case partbar::BarLegendKind::SourceParts:
+		return _("One block per part of the file being downloaded.");
+	case partbar::BarLegendKind::PeerParts:
+		return _("One block per part of the shared file.");
+	case partbar::BarLegendKind::SharedAvailability:
+		return _(
+			"One block per part of the shared file, coloured by how many other sources have it.");
+	case partbar::BarLegendKind::SharedHashing:
+		return _("One block per part of the shared file, showing how far the re-hash has read.");
+	case partbar::BarLegendKind::None:
+		break;
+	}
+	return wxEmptyString;
+}
+
+//! Fills the grid of the legend @a kind explains, under bar preference @a flat.
+void FillLegendGrid(wxWindow *dlg, wxSizer *grid, partbar::BarLegendKind kind, bool flat)
+{
+	switch (kind) {
+	case partbar::BarLegendKind::SourceParts:
+		for (const partbar::SourcePartState state : partbar::kSourceLegendOrder) {
+			AddLegendRow(dlg,
+				grid,
+				partbar::SourcePartColour(state, flat),
+				SourcePartStateLabel(state));
+		}
+		return;
+
+	case partbar::BarLegendKind::PeerParts:
+		for (const partbar::PeerPartState state : partbar::kPeerLegendOrder) {
+			AddLegendRow(
+				dlg, grid, partbar::PeerPartColour(state, flat), PeerPartStateLabel(state));
+		}
+		return;
+
+	case partbar::BarLegendKind::SharedAvailability: {
+		for (const partbar::AvailabilityPartState state : partbar::kAvailabilityLegendOrder) {
+			AddLegendRow(dlg,
+				grid,
+				partbar::AvailabilityPartColour(state, flat),
+				AvailabilityPartStateLabel(state));
+		}
+		// The two blue rows above are the ends of a continuum, not two fills the bar picks
+		// between, so one more row shows the ramp itself. Its endpoints are those same two
+		// rows -- read from the legend order rather than from the fade, so the swatch
+		// cannot illustrate a range the rows above it do not name.
+		const partbar::BarColour from =
+			partbar::AvailabilityPartColour(partbar::AvailabilityPartState::FewSources, flat);
+		const partbar::BarColour to =
+			partbar::AvailabilityPartColour(partbar::AvailabilityPartState::ManySources, flat);
+		AddSwatchRow(dlg,
+			grid,
+			MakeGradientLegendSwatch(from, to),
+			_("In between, darkening as other sources are added"));
+		return;
+	}
+
+	case partbar::BarLegendKind::SharedHashing:
+		for (const partbar::HashingPartState state : partbar::kHashingLegendOrder) {
+			AddLegendRow(dlg,
+				grid,
+				partbar::HashingPartColour(state, flat),
+				HashingPartStateLabel(state));
+		}
+		return;
+
+	case partbar::BarLegendKind::None:
+		return;
+	}
+}
+
+} // namespace
+
+wxBitmap MakeLegendSwatch(const partbar::BarColour &colour)
+{
+	wxBitmap bitmap(kSwatchSide, kSwatchSide);
+	wxMemoryDC dc(bitmap);
+
+	dc.SetBrush(ToMuleColour(colour).GetBrush());
+	dc.DrawRectangle(0, 0, kSwatchSide, kSwatchSide);
+
+	return bitmap;
+}
+
+wxBitmap MakeGradientLegendSwatch(const partbar::BarColour &from, const partbar::BarColour &to)
+{
+	wxBitmap bitmap(kSwatchSide, kSwatchSide);
+	wxMemoryDC dc(bitmap);
+
+	// wxEAST: left to right, matching the bar, which fills a file from its first part on the
+	// left. No pen is set, so unlike the flat swatches this one has no border -- a border would
+	// read as a fill of its own next to the pale left end.
+	dc.GradientFillLinear(
+		wxRect(0, 0, kSwatchSide, kSwatchSide), ToMuleColour(from), ToMuleColour(to), wxEAST);
+
+	return bitmap;
+}
+
+void AddLegendRow(wxWindow *parent, wxSizer *grid, const partbar::BarColour &colour, const wxString &label)
+{
+	AddSwatchRow(parent, grid, MakeLegendSwatch(colour), label);
+}
+
+void ShowPartBarLegend(wxWindow *parent, partbar::BarLegendKind kind, const wxString &columnTitle)
+{
+	if (kind == partbar::BarLegendKind::None) {
+		return;
+	}
+
+	// Read once and captured, not asked again inside the lambda: every swatch in one dialog has
+	// to answer the same preference, and the grid is filled while a nested event loop is not
+	// yet running anyway.
+	const bool flat = thePrefs::UseFlatBar();
+
+	ShowInfoGridDialog(
+		parent, columnTitle, LegendIntro(kind), kind, flat(wxWindow *dlg, wxSizer *grid) {
+			FillLegendGrid(dlg, grid, kind, flat);
+		});
+}

amule-3.1.0.tar.gz/src/PartBarLegendUI.h Added

@@ -0,0 +1,90 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 PARTBARLEGENDUI_H
+#define PARTBARLEGENDUI_H
+
+// The wx side of the chunk-bar legends: the dialog the row context menus open, and the one
+// conversion from the palette's plain components to CMuleColour.
+//
+// Separate from PartBarLegend.h on purpose. That header states which legend a column gets, which
+// rows it lists, in which order and in which colour, and states all of it without wx so a headless
+// run can check it. This file draws what that one decided, and drawing is the part no test in this
+// tree can look at. Keeping the two apart is what stops the unverifiable half from dragging the
+// verifiable half out of reach.
+//
+// It lives here rather than in GenericClientListCtrl.cpp -- where it was, in an anonymous namespace
+// -- because since #1220 the shared-files list opens legends too, and a second copy of a swatch is
+// a second thing to keep in step with the palette.
+
+#include <wx/bitmap.h>
+#include <wx/string.h>
+
+#include "MuleColour.h"    // Needed for CMuleColour
+#include "PartBarLegend.h" // Needed for partbar::BarColour, partbar::BarLegendKind
+
+class wxSizer;
+class wxWindow;
+
+//! The palette's components as the drawing code wants them. One conversion, so
+//! a bar and the swatch explaining it cannot pick different ones.
+inline CMuleColour ToMuleColour(const partbar::BarColour &colour)
+{
+	return CMuleColour(colour.red, colour.green, colour.blue);
+}
+
+/**
+ * A 16x16 swatch of one bar colour, drawn the way CCatDialog::MakeBitmap() draws the category
+ * colour: a wxMemoryDC over a wxBitmap, default pen, so the fill keeps a border and the two pale
+ * greys stay visible on a light dialog.
+ */
+wxBitmap MakeLegendSwatch(const partbar::BarColour &colour);
+
+/**
+ * The same swatch, faded from @a from on the left to @a to on the right.
+ *
+ * Both endpoints are arguments and neither is known here: the availability legend passes the very
+ * colours its own FewSources and ManySources rows show, which are the fade's ends as
+ * PartBarLegend.h defines them and its suite pins them. Nothing is left to get wrong except the
+ * gradient itself, which is one toolkit call and cannot be checked without a display.
+ */
+wxBitmap MakeGradientLegendSwatch(const partbar::BarColour &from, const partbar::BarColour &to);
+
+//! One swatch-and-text row of a legend.
+void AddLegendRow(wxWindow *parent, wxSizer *grid, const partbar::BarColour &colour, const wxString &label);
+
+/**
+ * Pops up the legend of @a kind, titled with @a columnTitle.
+ *
+ * Swatches are filled from partbar::SourcePartColour(), PeerPartColour(), AvailabilityPartColour()
+ * and HashingPartColour() -- the same functions the GetItemBarFill() implementations fill the bars
+ * from, under the bar preference in force right now, so a swatch cannot disagree with the pixels it
+ * explains.
+ *
+ * BarLegendKind::None shows nothing: a caller that could not work out what its cell was drawing has
+ * nothing to explain.
+ */
+void ShowPartBarLegend(wxWindow *parent, partbar::BarLegendKind kind, const wxString &columnTitle);
+
+#endif // PARTBARLEGENDUI_H

amule-3.1.0.tar.gz/src/PartBarSpans.h Added

@@ -0,0 +1,119 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 PARTBARSPANS_H
+#define PARTBARSPANS_H
+
+// Which byte range each part of a file occupies in a chunk bar, and which of the two things the
+// shared-files bar is drawing.
+//
+// Extracted because the arithmetic was wrong and nothing could see it. The three bar columns
+// computed their own spans, and CSharedFilesCtrl computed them differently from the other two -- an
+// end one byte past where CBarShader wants it (src/BarShader.cpp:113-124 treats end as inclusive
+// and increments it itself). Invisible at MiB scale and unassertable while it lived inside a method
+// needing a CKnownFile and a wxDC.
+//
+// Header-only, wx-free and constexpr on purpose, like PartBarLegend.h: the geometry and the mode
+// choice are decided from two integers, so a headless run can check them.
+
+#include <cstddef>
+#include <cstdint>
+
+namespace partbar
+{
+
+//! One part's byte range, both ends inclusive, as CBarShader::FillRange reads
+//! them.
+struct Span
+{
+	std::uint64_t start = 0;
+	std::uint64_t end = 0;
+};
+
+constexpr bool operator==(const Span &a, const Span &b)
+{
+	return a.start == b.start && a.end == b.end;
+}
+
+constexpr bool operator!=(const Span &a, const Span &b)
+{
+	return !(a == b);
+}
+
+//! What the shared-files bar is drawing for one row. The two are unrelated: one is availability
+//! across the swarm, the other is local re-hash progress that happens to occupy the same cell.
+enum class BarMode
+{
+	None = 0,     //!< nothing to draw; the file reports no parts
+	Availability, //!< source count per part
+	Hashing       //!< re-hash progress over local data
+};
+
+/**
+ * The byte range of part @p index.
+ *
+ * @param index     zero-based part index, expected < partCount.
+ * @param partSize  bytes per part (PARTSIZE at every call site).
+ * @param fileSize  total bytes; the last part is short whenever the file does not divide evenly,
+ *                  and its end is clamped to the last byte rather than running past it.
+ *
+ * Ends are inclusive and adjacent spans do not overlap, so span(i).end is exactly span(i+1).start -
+ * 1. That property is what the old arithmetic broke.
+ */
+constexpr Span SpanFor(std::size_t index, std::uint64_t partSize, std::uint64_t fileSize)
+{
+	const std::uint64_t start = partSize * static_cast<std::uint64_t>(index);
+	const std::uint64_t past = start + partSize;
+	return Span{ start, (past < fileSize ? past : fileSize) - 1 };
+}
+
+/**
+ * Which mode the bar is in.
+ *
+ * A file reporting no parts draws nothing at all, whatever progress says: the caller has no span to
+ * fill, and a hashing bar over zero parts would be a bar over nothing. Progress above zero
+ * otherwise means a re-hash is running.
+ */
+constexpr BarMode ModeFor(std::uint64_t hashedPartCount, std::size_t partCount)
+{
+	return partCount == 0 ? BarMode::None
+			      : (hashedPartCount > 0 ? BarMode::Hashing : BarMode::Availability);
+}
+
+/**
+ * How many parts of @p partCount are already hashed, clamped.
+ *
+ * CHashingTask reports part + 1 (src/ThreadTasks.cpp:179, :693), so a completed pass reports one
+ * past the last part and the raw number cannot be used as an index or a span count.
+ */
+constexpr std::size_t HashedPartsClamped(std::uint64_t hashedPartCount, std::size_t partCount)
+{
+	return hashedPartCount > static_cast<std::uint64_t>(partCount)
+		       ? partCount
+		       : static_cast<std::size_t>(hashedPartCount);
+}
+
+} // namespace partbar
+
+#endif // PARTBARSPANS_H

amule-3.0.1.tar.gz/src/PartFile.cpp -> amule-3.1.0.tar.gz/src/PartFile.cpp Changed

@@ -25,10 +25,10 @@
 
 #include <wx/wx.h>
 
-#include "PartFile.h"		// Interface declarations.
-#include "PartFileWriteThread.h"	// Needed for PB_READY etc.
-#include "PartFileHashThread.h"		// Needed for QueueHashCheck
-#include "config.h"		// Needed for VERSION
+#include "PartFile.h"            // Interface declarations.
+#include "PartFileWriteThread.h" // Needed for PB_READY etc.
+#include "PartFileHashThread.h"  // Needed for QueueHashCheck
+#include "config.h"              // Needed for VERSION
 #include <protocol/kad/Constants.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
 #include <protocol/Protocols.h>
@@ -37,77 +37,72 @@
 #include <tags/FileTags.h>
 
 #include <wx/utils.h>
-#include <wx/tokenzr.h>		// Needed for wxStringTokenizer
+#include <wx/tokenzr.h> // Needed for wxStringTokenizer
 
 #ifndef AMULE_DAEMON
-#include <wx/notifmsg.h>	// Needed for wxNotificationMessage
+#include <wx/notifmsg.h> // Needed for wxNotificationMessage
 #endif
 
-#include "KnownFileList.h"	// Needed for CKnownFileList
+#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
+#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
+#include "UpDownClientEC.h" // Needed for CUpDownClient
 #else
-#include "updownclient.h"	// Needed for CUpDownClient
+#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
-#include "amule.h"		// Needed for theApp
-#include "ED2KLink.h"		// Needed for CED2KLink
-#include "Packet.h"		// Needed for CTag
-#include "SearchList.h"		// Needed for CSearchFile
-#include "ClientList.h"		// Needed for clientlist
-#include "Statistics.h"		// Needed for theStats
+#include "MemFile.h"       // Needed for CMemFile
+#include "Preferences.h"   // Needed for CPreferences
+#include "DownloadQueue.h" // Needed for CDownloadQueue
+#include "amule.h"         // Needed for theApp
+#include "ED2KLink.h"      // Needed for CED2KLink
+#include "Packet.h"        // Needed for CTag
+#include "SearchList.h"    // Needed for CSearchFile
+#include "ClientList.h"    // Needed for clientlist
+#include "Statistics.h"    // Needed for theStats
 #include "Logger.h"
-#include <common/Format.h>	// Needed for CFormat
-#include <common/FileFunctions.h>	// Needed for GetLastModificationTime
-#include "ThreadTasks.h"	// Needed for CHashingTask/CCompletionTask/CAllocateFileTask
-#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 <common/Format.h>        // Needed for CFormat
+#include <common/FileFunctions.h> // Needed for GetLastModificationTime
+#include "ThreadTasks.h"          // Needed for CHashingTask/CCompletionTask/CAllocateFileTask
+#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"
-
+#include "kademlia/kademlia/Entry.h"   // Needed for Kademlia::CEntry (Kad notes)
+#include "kademlia/kademlia/Indexed.h" // Needed for CKadEntryPtrList
 
 SFileRating::SFileRating(const wxString &u, const wxString &f, sint16 r, const wxString &c)
-:
-UserName(u),
-FileName(f),
-Rating(r),
-Comment(c)
+: UserName(u)
+, FileName(f)
+, Rating(r)
+, Comment(c)
 {
 }
 
-
 #ifndef CLIENT_GUI
 SFileRating::SFileRating(const CUpDownClient &client)
-:
-UserName(client.GetUserName()),
-FileName(client.GetClientFilename()),
-Rating(client.GetFileRating()),
-Comment(client.GetFileComment())
+: UserName(client.GetUserName())
+, FileName(client.GetClientFilename())
+, Rating(client.GetFileRating())
+, Comment(client.GetFileComment())
 {
 }
 #endif
 
-
 // PartFileBufferedData is defined in PartFile.h
 
-
 typedef std::list<Chunk> ChunkList;
 
-
 #ifndef CLIENT_GUI
 
 CPartFile::CPartFile()
@@ -115,7 +110,111 @@
 	Init();
 }
 
-CPartFile::CPartFile(CSearchFile* searchresult)
+namespace
+{
+
+// Parse the ed2k string-named "length" tag -- "h:mm:ss" or "m:ss" -- into seconds.
+// FT_MEDIA_LENGTH is a uint32 everywhere else in the tree, so the string form has to be
+// converted rather than stored raw.
+bool ParseEd2kLengthSeconds(const wxString &text, uint32 &out)
+{
+	// Split into at most three fields, leading unit first, so "h:mm:ss" and "m:ss" both
+	// fall out of the same loop. A trailing colon leaves an empty final token and is
+	// rejected rather than read as a zero.
+	wxArrayString fields;
+	wxString rest = text;
+	for (;;) {
+		wxString token = rest.BeforeFirst(wxT(':'));
+		const bool more = rest.Find(wxT(':')) != wxNOT_FOUND;
+		token.Trim(true).Trim(false);
+		fields.Add(token);
+		if (!more) {
+			break;
+		}
+		rest = rest.AfterFirst(wxT(':'));
+		if (fields.GetCount() > 3) {
+			return false;
+		}
+	}
+	if (fields.IsEmpty() || fields.GetCount() > 3) {
+		return false;
+	}
+
+	uint32 total = 0;
+	for (size_t i = 0; i < fields.GetCount(); ++i) {
+		unsigned long part = 0;
+		if (fieldsi.IsEmpty() || !fieldsi.ToULong(&part)) {
+			return false;
+		}
+		// Only the leading field is an open-ended count; everything after it is a minute or
+		// second and cannot exceed 59. Capped so a malformed "1:75:00" is dropped rather
+		// than silently re-interpreted, and so the accumulation below cannot overflow.
+		const bool leading = (i == 0);
+		if (!leading && part > 59) {
+			return false;
+		}
+		if (leading && part > 59999) {
+			return false;
+		}
+		total = total * 60 + static_cast<uint32>(part);
+	}
+	out = total;
+	return true;
+}
+
+// Store one inherited media tag under its canonical NUMERIC id.
+//
+// Both encodings a hit can carry end up here: the ed2k string-named form ("Artist",
+// "bitrate", "length" as h:mm:ss) and the numeric-id form. That matters because every
+// media consumer in the tree looks tags up by numeric id -- CAbstractFile::GetStrTagValue
+// matches on GetNameID() -- so a tag pushed under its string name was written to the
+// part file, carried for the lifetime of the download, and read by nobody.
+//
+// Integer width is deliberately not checked. The ed2k publisher forces 32 bits, but Kad
+// picks the narrowest type that fits the value, so a three-minute song arrives as a
+// uint8 and an episode as a uint16 -- an exact `type == TAGTYPE_UINT32` test rejected
+// essentially every real length from Kad.
+//
+// Every path out of here stores a CTagInt32 or a CTagString, never the source tag
+// verbatim. That normalisation is what makes the id-only lookups downstream safe, in
+// particular CSearch::PreparePacketForTags, whose Kad republish reads `pTag->GetInt()`
+// with no IsInt() guard: storing a caller's tag unchanged here would let a string-typed
+// FT_MEDIA_LENGTH go out to every peer as garbage.
+bool InheritMediaTag(CAbstractFile &file, uint8 id, const CTag &tag)
+{
+	if (id == FT_MEDIA_LENGTH) {
+		uint32 seconds = 0;
+		if (tag.IsInt()) {
+			seconds = tag.GetInt();
+		} else if (!tag.IsStr() || !ParseEd2kLengthSeconds(tag.GetStr(), seconds)) {
+			// Unparseable is dropped rather than stored raw; this also
+			// covers the "0: 0" / "0:0" placeholders some clients send.
+			return false;
+		}
+		if (!seconds) {
+			return false;
+		}
+		file.AddTagUnique(CTagInt32(FT_MEDIA_LENGTH, seconds));
+		return true;
+	}
+	if (id == FT_MEDIA_BITRATE) {
+		if (!tag.IsInt() || !tag.GetInt()) {
+			return false;
+		}
+		file.AddTagUnique(CTagInt32(FT_MEDIA_BITRATE, tag.GetInt()));
+		return true;
+	}
+	// The four string-valued fields: codec, artist, album, title.
+	if (!tag.IsStr() || tag.GetStr().IsEmpty()) {
+		return false;
+	}
+	file.AddTagUnique(CTagString(id, tag.GetStr()));
+	return true;
+}
+
+} // namespace
+
+CPartFile::CPartFile(CSearchFile *searchresult)
 {
 	Init();
 
@@ -123,91 +222,124 @@
 	SetFileName(searchresult->GetFileName());
 	SetFileSize(searchresult->GetFileSize());
 
-	for (unsigned int i = 0; i < searchresult->m_taglist.size(); ++i){
-		const CTag& pTag = searchresult->m_taglisti;
+	for (unsigned int i = 0; i < searchresult->m_taglist.size(); ++i) {
+		const CTag &pTag = searchresult->m_taglisti;
 
 		bool bTagAdded = false;
 		if (pTag.GetNameID() == 0 && !pTag.GetName().IsEmpty() && (pTag.IsStr() || pTag.IsInt())) {
-			static const struct {
-				wxString	pszName;
-				uint8	nType;
-			} _aMetaTags =
-				{
-					{ FT_ED2K_MEDIA_ARTIST,  2 },
-					{ FT_ED2K_MEDIA_ALBUM,   2 },
-					{ FT_ED2K_MEDIA_TITLE,   2 },
-					{ FT_ED2K_MEDIA_LENGTH,  2 },
-					{ FT_ED2K_MEDIA_BITRATE, 3 },
-					{ FT_ED2K_MEDIA_CODEC,   2 }
-				};
-
-			for (unsigned int t = 0; t < itemsof(_aMetaTags); ++t) {
-				if (	pTag.GetType() == _aMetaTagst.nType &&
-					(pTag.GetName() == _aMetaTagst.pszName)) {
-					// skip string tags with empty string values
-					if (pTag.IsStr() && pTag.GetStr().IsEmpty()) {
-						break;
-					}
-
-					// skip "length" tags with "0: 0" values
-					if (pTag.GetName() == FT_ED2K_MEDIA_LENGTH) {
-						if (pTag.GetStr().IsSameAs("0: 0") ||
-							pTag.GetStr().IsSameAs("0:0")) {
-							break;
-						}
-					}
-
-					// skip "bitrate" tags with '0' values
-					if ((pTag.GetName() == FT_ED2K_MEDIA_BITRATE) && !pTag.GetInt()) {
-						break;
-					}
+			// The ed2k string-named encoding. These used to be pushed under their string
+			// names, which no media consumer ever looks up -- stored, written to disk,
+			// carried for the whole download, read by nobody.
+			static const struct
+			{
+				wxString pszName;
+				uint8 nID;
+			} _aMetaTags = { { FT_ED2K_MEDIA_ARTIST, FT_MEDIA_ARTIST },
+				{ FT_ED2K_MEDIA_ALBUM, FT_MEDIA_ALBUM },
+				{ FT_ED2K_MEDIA_TITLE, FT_MEDIA_TITLE },
+				{ FT_ED2K_MEDIA_LENGTH, FT_MEDIA_LENGTH },
+				{ FT_ED2K_MEDIA_BITRATE, FT_MEDIA_BITRATE },
+				{ FT_ED2K_MEDIA_CODEC, FT_MEDIA_CODEC } };
 
-					AddDebugLogLineN( logPartFile,
+			for (const auto &meta : _aMetaTags) {
+				if (pTag.GetName() != meta.pszName) {
+					continue;
+				}
+				if (InheritMediaTag(*this, meta.nID, pTag)) {
+					AddDebugLogLineN(logPartFile,
 						"CPartFile::CPartFile(CSearchFile*): added tag " +
-						pTag.GetFullInfo() );
-					m_taglist.push_back(pTag);
+							pTag.GetFullInfo());
 					bTagAdded = true;
-					break;
 				}
+				break;
 			}
-		} else if (pTag.GetNameID() != 0 && pTag.GetName().IsEmpty() && (pTag.IsStr() || pTag.IsInt())) {
-			static const struct {
-				uint8	nID;
-				uint8	nType;
-			} _aMetaTags =
-				{
-					{ FT_FILETYPE,		2 },
-					{ FT_FILEFORMAT,	2 }
-				};
-			for (unsigned int t = 0; t < itemsof(_aMetaTags); ++t) {
-				if (pTag.GetType() == _aMetaTagst.nType && pTag.GetNameID() == _aMetaTagst.nID) {
-					// skip string tags with empty string values
+		} else if (pTag.GetNameID() != 0 && pTag.GetName().IsEmpty() &&
+			   (pTag.IsStr() || pTag.IsInt())) {
+			// FT_FILETYPE / FT_FILEFORMAT keep their exact-type match: they
+			// are not media tags and nothing compresses them.
+			static const struct
+			{
+				uint8 nID;
+				uint8 nType;
+			} _aPlainTags = { { FT_FILETYPE, 2 }, { FT_FILEFORMAT, 2 } };
+			for (const auto &plain : _aPlainTags) {
+				if (pTag.GetType() == plain.nType && pTag.GetNameID() == plain.nID) {
 					if (pTag.IsStr() && pTag.GetStr().IsEmpty()) {
 						break;
 					}
-
-					AddDebugLogLineN( logPartFile,
+					AddDebugLogLineN(logPartFile,
 						"CPartFile::CPartFile(CSearchFile*): added tag " +
-						pTag.GetFullInfo() );
+							pTag.GetFullInfo());
 					m_taglist.push_back(pTag);
 					bTagAdded = true;
 					break;
 				}
 			}
+			// Media metadata advertised by the source, so a download carries FT_MEDIA_*
+			// immediately -- visible while downloading and persisted on completion -- without
+			// needing a local ffprobe. All six, and through the same helper as the string-named
+			// branch above, so both encodings converge on one set of rules.
+			static const uint8 _aMediaIDs = { FT_MEDIA_LENGTH,
+				FT_MEDIA_BITRATE,
+				FT_MEDIA_CODEC,
+				FT_MEDIA_ARTIST,
+				FT_MEDIA_ALBUM,
+				FT_MEDIA_TITLE };
+			for (const uint8 mediaID : _aMediaIDs) {
+				if (pTag.GetNameID() != mediaID) {
+					continue;
+				}
+				if (InheritMediaTag(*this, mediaID, pTag)) {
+					AddDebugLogLineN(logPartFile,
+						"CPartFile::CPartFile(CSearchFile*): added tag " +
+							pTag.GetFullInfo());
+					bTagAdded = true;
+				}
+				break;
+			}
+		}
+
+		if (pTag.GetNameID() == FT_AICH_HASH && pTag.IsStr()) {
+			// The AICH root hash a search result carried, from an ed2k server or from Kad. Set
+			// as the master hash rather than stored as a tag: the tag copies above all end at
+			// m_taglist, and nothing reads an AICH hash back out of there. This is the whole
+			// point of carrying the hash on a result -- a download that starts already knowing
+			// its root hash never has to collect one from a pool of peers before it can recover
+			// a corrupt part.
+			//
+			// AICH_TRUSTED, not AICH_VERIFIED, and the difference matters. Nothing vouches for
+			// a search result: it is whatever the server or the Kad node chose to answer.
+			// AICH_VERIFIED is terminal -- UntrustedHashReceived() refuses to correct it -- so
+			// one wrong hash would break this download's recovery for good, persist to
+			// part.met, reload as verified on every later start, and go back out in our own
+			// ed2k and magnet links. AICH_TRUSTED is used for recovery exactly the same way
+			// and stays correctable by peer consensus, which is the whole difference between a
+			// hash we were told and a hash we can stand behind.
+			CAICHHash hash;
+			if (hash.DecodeBase32(pTag.GetStr()) == CAICHHash::GetHashSize()) {
+				m_pAICHHashSet->SetMasterHash(hash, AICH_TRUSTED);
+				MarkECChanged();
+				AddDebugLogLineN(logPartFile,
+					"CPartFile::CPartFile(CSearchFile*): took master AICH hash "
+					"from the search result");
+				bTagAdded = true;
+			} else {
+				AddDebugLogLineN(logPartFile,
+					"CPartFile::CPartFile(CSearchFile*): undecodable AICH hash on "
+					"the search result, ignored");
+			}
 		}
 
 		if (!bTagAdded) {
-			AddDebugLogLineN( logPartFile,
-				"CPartFile::CPartFile(CSearchFile*): ignored tag " +
-				pTag.GetFullInfo() );
+			AddDebugLogLineN(logPartFile,
+				"CPartFile::CPartFile(CSearchFile*): ignored tag " + pTag.GetFullInfo());
 		}
 	}
 
 	CreatePartFile();
 }
 
-
-CPartFile::CPartFile(const CED2KFileLink* fileLink)
+CPartFile::CPartFile(const CED2KFileLink *fileLink)
 {
 	Init();
 
@@ -219,27 +351,26 @@
 
 	if (fileLink->m_hashset) {
 		if (!LoadHashsetFromFile(fileLink->m_hashset, true)) {
-			AddDebugLogLineC(logPartFile, "eD2K link contained invalid hashset: " + fileLink->GetLink());
+			AddDebugLogLineC(
+				logPartFile, "eD2K link contained invalid hashset: " + fileLink->GetLink());
 		}
 	}
 }
 
-
 CPartFile::~CPartFile()
 {
 	// Gate Phase 3 below; see m_inDestructor comment in PartFile.h.
 	m_inDestructor = true;
-	AddDebugLogLineN(logPartFile, CFormat(
-		"~CPartFile entered, m_inDestructor set: '%s'") % GetFileName());
+	AddDebugLogLineN(
+		logPartFile, CFormat("~CPartFile entered, m_inDestructor set: '%s'") % GetFileName());
 
-	// Wait for any in-flight HashJobs targeting this file to finish.
-	// CPartFileHashThread reads m_hpartfile via HashSinglePart; we must
-	// not close the file out from under it. m_inDestructor was set above
-	// so Phase 3 will not enqueue anything new.
+	// Wait for any in-flight HashJobs targeting this file to finish. CPartFileHashThread
+	// reads m_hpartfile via HashSinglePart; we must not close the file out from under it.
+	// m_inDestructor was set above so Phase 3 will not enqueue anything new.
 	if (m_pendingHashes > 0) {
-		AddDebugLogLineN(logPartFile, CFormat(
-			"~CPartFile waiting for %d pending hash job(s) of '%s'")
-			% (int)m_pendingHashes % GetFileName());
+		AddDebugLogLineN(logPartFile,
+			CFormat("~CPartFile waiting for %d pending hash job(s) of '%s'") %
+				(int)m_pendingHashes % GetFileName());
 		while (m_pendingHashes > 0) {
 			wxMilliSleep(10);
 		}
@@ -247,33 +378,25 @@
 
 	// if it's not opened, it was completed or deleted
 	if (m_hpartfile.IsOpened()) {
-		// FlushBuffer drains buffered writes / harvests Phase 2's
-		// PB_WRITTEN items into m_aChangedPart. Phase 3 itself returns
-		// early due to m_inDestructor.
+		// FlushBuffer drains buffered writes / harvests Phase 2's PB_WRITTEN items into
+		// m_aChangedPart. Phase 3 itself returns early due to m_inDestructor.
 		FlushBuffer();
 
 		// Sync-hash any parts still flagged dirty in m_aChangedPart.
 		//
-		// Why this is needed: in normal operation Phase 3 enqueues
-		// dirty parts to CPartFileHashThread asynchronously. But at
-		// shutdown the hash thread is torn down before downloadqueue
-		// (see CamuleApp::OnExit ordering), so async enqueue isn't
-		// available here — and a forced-quit during an active download
-		// can leave many parts harvested-but-not-yet-hashed
-		// (m_aChangedPart-true but never enqueued because the
-		// quiescent guard never opened during the receive burst).
+		// In normal operation Phase 3 enqueues dirty parts to CPartFileHashThread
+		// asynchronously. But at shutdown the hash thread is torn down before downloadqueue,
+		// so async enqueue is not available here -- and a forced-quit during an active
+		// download can leave many parts harvested-but-not-yet-hashed, because the quiescent
+		// guard never opened during the receive burst.
 		//
-		// Without this, .met would be saved with gaplist marking
-		// those parts complete and m_corrupted_list empty, so on
-		// next launch they would be treated as implicitly verified
-		// (the existing "verified iff IsComplete && !IsCorruptedPart"
-		// invariant) — even though they were never hashed.
+		// Without this, .met would be saved with the gaplist marking those parts complete and
+		// m_corrupted_list empty, so on next launch they would be treated as implicitly
+		// verified even though they were never hashed.
 		//
-		// Run the verification synchronously on the main thread.
-		// Slow shutdown is acceptable for the rare cancel-mid-download
-		// case; the common paths (natural completion, pause/resume,
-		// idle drain) keep m_aChangedPart drained throughout the
-		// session, so the loop usually has nothing to do.
+		// Run synchronously on the main thread. Slow shutdown is acceptable for the rare
+		// cancel-mid-download case; the common paths keep m_aChangedPart drained throughout
+		// the session, so the loop usually has nothing to do.
 		if (m_aChangedPart.size() == GetPartCount()) {
 			uint16 verified = 0, corrupt = 0;
 			for (uint16 i = 0; i < GetPartCount(); ++i) {
@@ -287,42 +410,37 @@
 					continue;
 				}
 
-				// Lock m_hpartfileMutex against CPartFileWriteThread:
-				// Phase 1 of FlushBuffer above may have queued writes
-				// that the write thread is still draining concurrently
-				// with this sync-hash loop. See m_hpartfileMutex.
+				// Lock m_hpartfileMutex against CPartFileWriteThread: Phase 1 of
+				// FlushBuffer above may have queued writes the write thread is still
+				// draining concurrently with this sync-hash loop.
 				bool ok;
 				{
 					std::lock_guard<std::mutex> lock(m_hpartfileMutex);
 					ok = HashSinglePart(i);
 				}
 				if (ok) {
-					// Part is good. If it was carried in
-					// m_corrupted_list from before, drop it so the
-					// .met save below records the new clean state.
+					// Part is good. If it was carried in m_corrupted_list from before,
+					// drop it so the .met save below records the new clean state.
 					if (IsCorruptedPart(i)) {
 						EraseFirstValue(m_corrupted_list, i);
 					}
 					++verified;
 				} else {
-					// Part is bad. Re-open the gap and record in
-					// m_corrupted_list so next launch knows to
-					// re-download + retry.
+					// Part is bad. Re-open the gap and record in m_corrupted_list so the
+					// next launch knows to re-download and retry.
 					AddGap(i);
 					if (!IsCorruptedPart(i)) {
 						m_corrupted_list.push_back(i);
 					}
-					m_iLostDueToCorruption +=
-						(uint64)GetPartSize(i);
+					m_iLostDueToCorruption += (uint64)GetPartSize(i);
 					++corrupt;
 				}
 			}
 			if (verified > 0 || corrupt > 0) {
-				AddDebugLogLineN(logPartFile, CFormat(
-					"~CPartFile sync-hashed %u remaining dirty part(s) "
-					"(%u verified, %u corrupt) for '%s'")
-					% (verified + corrupt) % verified % corrupt
-					% GetFileName());
+				AddDebugLogLineN(logPartFile,
+					CFormat("~CPartFile sync-hashed %u remaining dirty part(s) "
+						"(%u verified, %u corrupt) for '%s'") %
+						(verified + corrupt) % verified % corrupt % GetFileName());
 			}
 		}
 
@@ -348,9 +466,10 @@
 		m_fullname = thePrefs::GetTempDir().JoinPaths(m_partmetfilename);
 	} while (m_fullname.FileExists());
 
-	m_CorruptionBlackBox->SetPartFileInfo(GetFileName().GetPrintable(), m_partmetfilename.RemoveAllExt().GetPrintable());
+	m_CorruptionBlackBox->SetPartFileInfo(
+		GetFileName().GetPrintable(), m_partmetfilename.RemoveAllExt().GetPrintable());
 
-	m_gaplist.Init(GetFileSize(), true);	// Init empty
+	m_gaplist.Init(GetFileSize(), true); // Init empty
 
 	m_PartPath = m_fullname.RemoveExt();
 	bool fileCreated;
@@ -380,17 +499,18 @@
 	SetActive(theApp->IsConnected());
 }
 
-
-uint8 CPartFile::LoadPartFile(const CPath& in_directory, const CPath& filename, bool from_backup, bool getsizeonly)
+uint8 CPartFile::LoadPartFile(
+	const CPath &in_directory, const CPath &filename, bool from_backup, bool getsizeonly)
 {
 	bool isnewstyle = false;
-	uint8 version,partmettype=PMT_UNKNOWN;
+	uint8 version, partmettype = PMT_UNKNOWN;
 
-	std::map<uint16, Gap_Struct*> gap_map; // Slugfiller
+	std::map<uint16, Gap_Struct *> gap_map; // Slugfiller
 	transferred = 0;
 
 	m_partmetfilename = filename;
-	m_CorruptionBlackBox->SetPartFileInfo(GetFileName().GetPrintable(), m_partmetfilename.RemoveAllExt().GetPrintable());
+	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();
@@ -399,55 +519,52 @@
 	CPath curMetFilename = m_fullname;
 	if (from_backup) {
 		curMetFilename = curMetFilename.AppendExt(PARTMET_BAK_EXT);
-		AddLogLineN(CFormat( _("Trying to load backup of met-file from %s") )
-			% curMetFilename );
+		AddLogLineN(CFormat(_("Trying to load backup of met-file from %s")) % curMetFilename);
 	}
 
 	try {
 		CFile metFile(curMetFilename, CFile::read);
 		if (!metFile.IsOpened()) {
-			AddLogLineN(CFormat( _("ERROR: Failed to open part.met file: %s ==> %s") )
-				% curMetFilename
-				% GetFileName() );
+			AddLogLineN(CFormat(_("ERROR: Failed to open part.met file: %s ==> %s")) %
+				    curMetFilename % GetFileName());
 
 			return false;
 		} else if (metFile.GetLength() == 0) {
-			AddLogLineN(CFormat( _("ERROR: part.met file is 0 size: %s ==> %s") )
-				% m_partmetfilename
-				% GetFileName() );
+			AddLogLineN(CFormat(_("ERROR: part.met file is 0 size: %s ==> %s")) %
+				    m_partmetfilename % GetFileName());
 
 			return false;
 		}
 
 		version = metFile.ReadUInt8();
-		if (version != PARTFILE_VERSION && version != PARTFILE_SPLITTEDVERSION && version != PARTFILE_VERSION_LARGEFILE){
+		if (version != PARTFILE_VERSION && version != PARTFILE_SPLITTEDVERSION &&
+			version != PARTFILE_VERSION_LARGEFILE) {
 			metFile.Close();
-			//if (version == 83) return ImportShareazaTempFile(...)
-			AddLogLineN(CFormat( _("ERROR: Invalid part.met file version: %s ==> %s") )
-				% m_partmetfilename
-				% GetFileName() );
+			// if (version == 83) return ImportShareazaTempFile(...)
+			AddLogLineN(CFormat(_("ERROR: Invalid part.met file version: %s ==> %s")) %
+				    m_partmetfilename % GetFileName());
 			return false;
 		}
 
 		isnewstyle = (version == PARTFILE_SPLITTEDVERSION);
 		partmettype = isnewstyle ? PMT_SPLITTED : PMT_DEFAULTOLD;
 
-		if (version == PARTFILE_VERSION) {// Do we still need this check ?
-			uint8 test4;									// It will fail for certain files.
+		if (version == PARTFILE_VERSION) { // Do we still need this check ?
+			uint8 test4;             // It will fail for certain files.
 			metFile.Seek(24, wxFromStart);
-			metFile.Read(test,4);
+			metFile.Read(test, 4);
 
 			metFile.Seek(1, wxFromStart);
-			if (test0==0 && test1==0 && test2==2 && test3==1) {
-				isnewstyle=true;	// edonkeys so called "old part style"
-				partmettype=PMT_NEWOLD;
+			if (test0 == 0 && test1 == 0 && test2 == 2 && test3 == 1) {
+				isnewstyle = true; // edonkeys so called "old part style"
+				partmettype = PMT_NEWOLD;
 			}
 		}
 
 		if (isnewstyle) {
 			uint32 temp = metFile.ReadUInt32();
 
-			if (temp==0) {	// 0.48 partmets - different again
+			if (temp == 0) { // 0.48 partmets - different again
 				LoadHashsetFromFile(&metFile, false);
 			} else {
 				metFile.Seek(2, wxFromStart);
@@ -463,191 +580,194 @@
 		uint32 tagcount = metFile.ReadUInt32();
 
 		for (uint32 j = 0; j < tagcount; ++j) {
-			CTag newtag(metFile,true);
-			if (	!getsizeonly ||
-				(getsizeonly &&
-					(newtag.GetNameID() == FT_FILESIZE ||
-					 newtag.GetNameID() == FT_FILENAME))) {
-				switch(newtag.GetNameID()) {
-					case FT_FILENAME: {
-						if (!GetFileName().IsOk()) {
-							// If it's not empty, we already loaded the unicoded one
-							SetFileName(CPath(newtag.GetStr()));
-						}
-						break;
-					}
-					case FT_LASTSEENCOMPLETE: {
-						lastseencomplete = newtag.GetInt();
-						break;
-					}
-					case FT_FILESIZE: {
-						SetFileSize(newtag.GetInt());
-						break;
-					}
-					case FT_TRANSFERRED: {
-						transferred = newtag.GetInt();
-						break;
+			CTag newtag(metFile, true);
+			if (!getsizeonly || (getsizeonly && (newtag.GetNameID() == FT_FILESIZE ||
+								    newtag.GetNameID() == FT_FILENAME))) {
+				switch (newtag.GetNameID()) {
+				case FT_FILENAME: {
+					if (!GetFileName().IsOk()) {
+						// If it's not empty, we already loaded the unicoded one
+						SetFileName(CPath(newtag.GetStr()));
 					}
-					case FT_FILETYPE:{
-						//#warning needs setfiletype string
-						//SetFileType(newtag.GetStr());
-						break;
-					}
-					case FT_CATEGORY: {
-						m_category = newtag.GetInt();
-						if (m_category > theApp->glob_prefs->GetCatCount() - 1 ) {
-							m_category = 0;
-						}
-						break;
+					break;
+				}
+				case FT_LASTSEENCOMPLETE: {
+					lastseencomplete = newtag.GetInt();
+					break;
+				}
+				case FT_FILESIZE: {
+					SetFileSize(newtag.GetInt());
+					break;
+				}
+				case FT_TRANSFERRED: {
+					transferred = newtag.GetInt();
+					break;
+				}
+				case FT_FILETYPE: {
+					// #warning needs setfiletype string
+					// SetFileType(newtag.GetStr());
+					break;
+				}
+				case FT_CATEGORY: {
+					m_category = newtag.GetInt();
+					if (m_category > theApp->glob_prefs->GetCatCount() - 1) {
+						m_category = 0;
 					}
-					case FT_OLDDLPRIORITY:
-					case FT_DLPRIORITY: {
-						if (!isnewstyle){
-							m_iDownPriority = newtag.GetInt();
-							if( m_iDownPriority == PR_AUTO ){
-								m_iDownPriority = PR_HIGH;
-								SetAutoDownPriority(true);
-							}
-							else{
-								if (	m_iDownPriority != PR_LOW &&
-									m_iDownPriority != PR_NORMAL &&
-									m_iDownPriority != PR_HIGH)
-									m_iDownPriority = PR_NORMAL;
-								SetAutoDownPriority(false);
-							}
+					break;
+				}
+				case FT_OLDDLPRIORITY:
+				case FT_DLPRIORITY: {
+					if (!isnewstyle) {
+						m_iDownPriority = newtag.GetInt();
+						if (m_iDownPriority == PR_AUTO) {
+							m_iDownPriority = PR_HIGH;
+							SetAutoDownPriority(true);
+						} else {
+							if (m_iDownPriority != PR_LOW &&
+								m_iDownPriority != PR_NORMAL &&
+								m_iDownPriority != PR_HIGH)
+								m_iDownPriority = PR_NORMAL;
+							SetAutoDownPriority(false);
 						}
-						break;
-					}
-					case FT_STATUS: {
-						m_paused = (newtag.GetInt() == 1);
-						m_stopped = m_paused;
-						break;
 					}
-					case FT_OLDULPRIORITY:
-					case FT_ULPRIORITY: {
-						if (!isnewstyle){
-							SetUpPriority(newtag.GetInt(), false);
-							if( GetUpPriority() == PR_AUTO ){
-								SetUpPriority(PR_HIGH, false);
-								SetAutoUpPriority(true);
-							} else {
-								SetAutoUpPriority(false);
-							}
+					break;
+				}
+				case FT_STATUS: {
+					m_paused = (newtag.GetInt() == 1);
+					m_stopped = m_paused;
+					break;
+				}
+				case FT_OLDULPRIORITY:
+				case FT_ULPRIORITY: {
+					if (!isnewstyle) {
+						SetUpPriority(newtag.GetInt(), false);
+						if (GetUpPriority() == PR_AUTO) {
+							SetUpPriority(PR_HIGH, false);
+							SetAutoUpPriority(true);
+						} else {
+							SetAutoUpPriority(false);
 						}
-						break;
 					}
-					case FT_KADLASTPUBLISHSRC:{
-						SetLastPublishTimeKadSrc(newtag.GetInt(), 0);
-						if(GetLastPublishTimeKadSrc() > (uint32)time(NULL)+KADEMLIAREPUBLISHTIMES) {
-							//There may be a possibility of an older client that saved a random number here.. This will check for that..
-							SetLastPublishTimeKadSrc(0,0);
-						}
-						break;
+					break;
+				}
+				case FT_KADLASTPUBLISHSRC: {
+					SetLastPublishTimeKadSrc(newtag.GetInt(), 0);
+					if (GetLastPublishTimeKadSrc() >
+						(uint32)time(NULL) + KADEMLIAREPUBLISHTIMES) {
+						// There may be a possibility of an older client that saved a
+						// random number here.. This will check for that..
+						SetLastPublishTimeKadSrc(0, 0);
 					}
-					case FT_KADLASTPUBLISHNOTES:{
-						SetLastPublishTimeKadNotes(newtag.GetInt());
-						break;
+					break;
+				}
+				case FT_KADLASTPUBLISHNOTES: {
+					SetLastPublishTimeKadNotes(newtag.GetInt());
+					break;
+				}
+				// old tags: as long as they are not needed, take the chance to purge them
+				case FT_PERMISSIONS:
+				case FT_KADLASTPUBLISHKEY:
+				case FT_PARTFILENAME:
+					break;
+				case FT_DL_ACTIVE_TIME:
+					if (newtag.IsInt()) {
+						m_nDlActiveTime = newtag.GetInt();
 					}
-					// old tags: as long as they are not needed, take the chance to purge them
-					case FT_PERMISSIONS:
-					case FT_KADLASTPUBLISHKEY:
-					case FT_PARTFILENAME:
-						break;
-					case FT_DL_ACTIVE_TIME:
-						if (newtag.IsInt()) {
-							m_nDlActiveTime = newtag.GetInt();
-						}
-						break;
-					case FT_CORRUPTEDPARTS: {
-						wxASSERT(m_corrupted_list.empty());
-						wxString strCorruptedParts(newtag.GetStr());
-						wxStringTokenizer tokenizer(strCorruptedParts, ",");
-						while ( tokenizer.HasMoreTokens() ) {
-							wxString token = tokenizer.GetNextToken();
-							unsigned long uPart;
-							if (token.ToULong(&uPart)) {
-								if (uPart < GetPartCount() && !IsCorruptedPart(uPart)) {
-									m_corrupted_list.push_back(uPart);
-								}
+					break;
+				case FT_CORRUPTEDPARTS: {
+					wxASSERT(m_corrupted_list.empty());
+					const wxString &strCorruptedParts(newtag.GetStr());
+					wxStringTokenizer tokenizer(strCorruptedParts, ",");
+					while (tokenizer.HasMoreTokens()) {
+						wxString token = tokenizer.GetNextToken();
+						unsigned long uPart;
+						if (token.ToULong(&uPart)) {
+							if (uPart < GetPartCount() &&
+								!IsCorruptedPart(uPart)) {
+								m_corrupted_list.push_back(uPart);
 							}
 						}
-						break;
-					}
-					case FT_AICH_HASH:{
-						CAICHHash hash;
-						bool hashSizeOk =
-							hash.DecodeBase32(newtag.GetStr()) == CAICHHash::GetHashSize();
-						wxASSERT(hashSizeOk);
-						if (hashSizeOk) {
-							m_pAICHHashSet->SetMasterHash(hash, AICH_VERIFIED);
-							// EC exports GetAICHMasterHash().
-							MarkECChanged();
-						}
-						break;
-					}
-					case FT_ATTRANSFERRED:{
-						statistic.SetAllTimeTransferred(statistic.GetAllTimeTransferred() + (uint64)newtag.GetInt());
-						break;
 					}
-					case FT_ATTRANSFERREDHI:{
-						statistic.SetAllTimeTransferred(statistic.GetAllTimeTransferred() + (((uint64)newtag.GetInt()) << 32));
-						break;
-					}
-					case FT_ATREQUESTED:{
-						statistic.SetAllTimeRequests(newtag.GetInt());
-						break;
-					}
-					case FT_ATACCEPTED:{
-						statistic.SetAllTimeAccepts(newtag.GetInt());
-						break;
+					break;
+				}
+				case FT_AICH_HASH: {
+					CAICHHash hash;
+					bool hashSizeOk = hash.DecodeBase32(newtag.GetStr()) ==
+							  CAICHHash::GetHashSize();
+					wxASSERT(hashSizeOk);
+					if (hashSizeOk) {
+						m_pAICHHashSet->SetMasterHash(hash, AICH_VERIFIED);
+						// EC exports GetAICHMasterHash().
+						MarkECChanged();
 					}
-					default: {
-						// Start Changes by Slugfiller for better exception handling
+					break;
+				}
+				case FT_ATTRANSFERRED: {
+					statistic.SetAllTimeTransferred(
+						statistic.GetAllTimeTransferred() + (uint64)newtag.GetInt());
+					break;
+				}
+				case FT_ATTRANSFERREDHI: {
+					statistic.SetAllTimeTransferred(statistic.GetAllTimeTransferred() +
+									(((uint64)newtag.GetInt()) << 32));
+					break;
+				}
+				case FT_ATREQUESTED: {
+					statistic.SetAllTimeRequests(newtag.GetInt());
+					break;
+				}
+				case FT_ATACCEPTED: {
+					statistic.SetAllTimeAccepts(newtag.GetInt());
+					break;
+				}
+				default: {
+					// Start Changes by Slugfiller for better exception handling
 
-						wxCharBuffer tag_ansi_name = newtag.GetName().ToAscii();
-						char gap_mark = tag_ansi_name.data() ? tag_ansi_name0u : 0;
-						if ( newtag.IsInt() && (newtag.GetName().Length() > 1) &&
-							((gap_mark == FT_GAPSTART) ||
-							 (gap_mark == FT_GAPEND))) {
-							Gap_Struct *gap = NULL;
-							unsigned long int gapkey;
-							if (newtag.GetName().Mid(1).ToULong(&gapkey)) {
-								if ( gap_map.find( gapkey ) == gap_map.end() ) {
-									gap = new Gap_Struct;
-									gap_mapgapkey = gap;
-									gap->start = (uint64)-1;
-									gap->end = (uint64)-1;
-								} else {
-									gap = gap_map gapkey ;
-								}
-								if (gap_mark == FT_GAPSTART) {
-									gap->start = newtag.GetInt();
-								}
-								if (gap_mark == FT_GAPEND) {
-									gap->end = newtag.GetInt()-1;
-								}
+					wxCharBuffer tag_ansi_name = newtag.GetName().ToAscii();
+					char gap_mark = tag_ansi_name.data() ? tag_ansi_name0u : 0;
+					if (newtag.IsInt() && (newtag.GetName().Length() > 1) &&
+						((gap_mark == FT_GAPSTART) || (gap_mark == FT_GAPEND))) {
+						Gap_Struct *gap = NULL;
+						unsigned long int gapkey;
+						if (newtag.GetName().Mid(1).ToULong(&gapkey)) {
+							if (gap_map.find(gapkey) == gap_map.end()) {
+								gap = new Gap_Struct;
+								gap_mapgapkey = gap;
+								gap->start = (uint64)-1;
+								gap->end = (uint64)-1;
 							} else {
-								AddDebugLogLineN(logPartFile, "Wrong gap map key while reading met file!");
-								wxFAIL;
+								gap = gap_mapgapkey;
+							}
+							if (gap_mark == FT_GAPSTART) {
+								gap->start = newtag.GetInt();
+							}
+							if (gap_mark == FT_GAPEND) {
+								gap->end = newtag.GetInt() - 1;
 							}
-							// End Changes by Slugfiller for better exception handling
 						} else {
-							m_taglist.push_back(newtag);
+							AddDebugLogLineN(logPartFile,
+								"Wrong gap map key while reading met file!");
+							wxFAIL;
 						}
+						// End Changes by Slugfiller for better exception handling
+					} else {
+						m_taglist.push_back(newtag);
 					}
 				}
+				}
 			} else {
 				// Nothing. Else, nothing.
 			}
 		}
 
 		// load the hashsets from the hybridstylepartmet
-		if (isnewstyle && !getsizeonly && (metFile.GetPosition()<metFile.GetLength()) ) {
+		if (isnewstyle && !getsizeonly && (metFile.GetPosition() < metFile.GetLength())) {
 			metFile.Seek(1, wxFromCurrent);
 
-			uint16 parts=GetPartCount();	// assuming we will get all hashsets
+			uint16 parts = GetPartCount(); // assuming we will get all hashsets
 
-			for (uint16 i = 0; i < parts && (metFile.GetPosition()+16<metFile.GetLength()); ++i){
+			for (uint16 i = 0; i < parts && (metFile.GetPosition() + 16 < metFile.GetLength());
+				++i) {
 				CMD4Hash cur_hash = metFile.ReadHash();
 				m_hashlist.push_back(cur_hash);
 			}
@@ -660,37 +780,31 @@
 				m_hashlist.clear();
 			}
 		}
-	} catch (const CInvalidPacket& e) {
-		AddLogLineC(CFormat(_("Error: %s (%s) is corrupt (bad tags: %s), unable to load file."))
-			% m_partmetfilename
-			% GetFileName()
-			% e.what());
+	} catch (const CInvalidPacket &e) {
+		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) {
-		AddDebugLogLineC(logPartFile, CFormat( "IO failure while loading '%s': %s" )
-			% m_partmetfilename
-			% e.what() );
+	} catch (const CIOFailureException &e) {
+		AddDebugLogLineC(logPartFile,
+			CFormat("IO failure while loading '%s': %s") % m_partmetfilename % e.what());
 		return false;
-	} catch (const CEOFException& WXUNUSED(e)) {
-		AddLogLineC(CFormat( _("ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file.") )
-			% m_partmetfilename
-			% GetFileName() );
+	} catch (const CEOFException &WXUNUSED(e)) {
+		AddLogLineC(CFormat(_("ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file.")) %
+			    m_partmetfilename % GetFileName());
 		AddLogLineC(_("Trying to recover file info..."));
 
-		// Safe file is that who have
-		// - FileSize
+		// A safe file has a FileSize
 		if (GetFileSize()) {
 			// We have filesize, try other needed info
 
-			// Do we need to check gaps? I think not,
-			// because they are checked below. Worst
-			// scenario will only mark file as 0 bytes downloaded.
+			// Gaps are checked below; the worst case here is the file being marked
+			// as 0 bytes downloaded.
 
 			// -Filename
 			if (!GetFileName().IsOk()) {
 				// Not critical, let's put a random filename.
-				AddLogLineC(_(
-					"Recovering no-named file - will try to recover it as RecoveredFile.dat"));
+				AddLogLineC(_("Recovering no-named file - will try to recover it as "
+					      "RecoveredFile.dat"));
 				SetFileName(CPath("RecoveredFile.dat"));
 			}
 
@@ -705,18 +819,16 @@
 		return partmettype;
 	}
 	// Init Gaplist
-	m_gaplist.Init(GetFileSize(), false);	// Init full, then add gaps
+	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 ) {
-		Gap_Struct* gap = it->second;
+	std::map<uint16, Gap_Struct *>::iterator it = gap_map.begin();
+	for (; it != gap_map.end(); ++it) {
+		Gap_Struct *gap = it->second;
 		// SLUGFILLER: SafeHash - revised code, and extra safety
-		if (	(gap->start != (uint64)-1) &&
-			(gap->end != (uint64)-1) &&
-			gap->start <= gap->end &&
+		if ((gap->start != (uint64)-1) && (gap->end != (uint64)-1) && gap->start <= gap->end &&
 			gap->start < GetFileSize()) {
 			if (gap->end >= GetFileSize()) {
-				gap->end = GetFileSize()-1; // Clipping
+				gap->end = GetFileSize() - 1; // Clipping
 			}
 			m_gaplist.AddGap(gap->start, gap->end); // All tags accounted for, use safe adding
 		}
@@ -724,16 +836,14 @@
 		// SLUGFILLER: SafeHash
 	}
 
-	//check if this is a backup
-	if ( m_fullname.GetExt().MakeLower() == "backup") {
+	// check if this is a backup
+	if (m_fullname.GetExt().MakeLower() == "backup") {
 		m_fullname = m_fullname.RemoveExt();
 	}
 
 	// open permanent handle
-	if ( !m_hpartfile.Open(m_PartPath, CFile::read_write)) {
-		AddLogLineN(CFormat( _("Failed to open %s (%s)") )
-			% m_fullname
-			% GetFileName() );
+	if (!m_hpartfile.Open(m_PartPath, CFile::read_write)) {
+		AddLogLineN(CFormat(_("Failed to open %s (%s)")) % m_fullname % GetFileName());
 		return false;
 	}
 
@@ -742,15 +852,18 @@
 	try {
 		// SLUGFILLER: SafeHash - final safety, make sure any missing part of the file is gap
 		if (m_hpartfile.GetLength() < GetFileSize())
-			AddGap(m_hpartfile.GetLength(), GetFileSize()-1);
+			AddGap(m_hpartfile.GetLength(), GetFileSize() - 1);
 		// Goes both ways - Partfile should never be too large
 		if (m_hpartfile.GetLength() > GetFileSize()) {
-			AddDebugLogLineC(logPartFile, CFormat( "Partfile \"%s\" is too large! Truncating %llu bytes." ) % GetFileName() % (m_hpartfile.GetLength() - GetFileSize()));
+			AddDebugLogLineC(logPartFile,
+				CFormat("Partfile \"%s\" is too large! Truncating %llu bytes.") %
+					GetFileName() % (m_hpartfile.GetLength() - GetFileSize()));
 			m_hpartfile.SetLength(GetFileSize());
 		}
 		// SLUGFILLER: SafeHash
-	} catch (const CIOFailureException& e) {
-		AddDebugLogLineC(logPartFile, CFormat( "Error while accessing partfile \"%s\": %s" ) % GetFileName() % e.what());
+	} catch (const CIOFailureException &e) {
+		AddDebugLogLineC(logPartFile,
+			CFormat("Error while accessing partfile \"%s\": %s") % GetFileName() % e.what());
 		SetStatus(PS_ERROR);
 	}
 
@@ -758,7 +871,7 @@
 	m_hpartfile.Release(true);
 
 	// check hashcount, file status etc
-	if (GetHashCount() != GetED2KPartHashCount()){
+	if (GetHashCount() != GetED2KPartHashCount()) {
 		m_hashsetneeded = true;
 		ClearMetDirty();
 		ClearStatsDirty();
@@ -784,9 +897,8 @@
 			// 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()) {
-				AddLogLineN(CFormat( _("WARNING: %s might be corrupted (%i)") )
-					% m_PartPath
-					% (m_lastDateChanged - file_date) );
+				AddLogLineN(CFormat(_("WARNING: %s might be corrupted (%i)")) % m_PartPath %
+					    (m_lastDateChanged - file_date));
 				// rehash
 				SetStatus(PS_WAITING_FOR_HASH);
 
@@ -803,12 +915,10 @@
 		m_iLostDueToCorruption = transferred - completedsize;
 	}
 
-	// In-memory state now matches the just-loaded .part.met.  Setters
-	// invoked during tag parsing (SetUpPriority, SetAutoUpPriority,
-	// SetAutoDownPriority, SetStatus, etc.) may have set m_metDirty;
-	// drop it so the first FlushBuffer tick after load does not rewrite
-	// the .met with byte-identical content.  Also seed m_lastMetSaveTick
-	// from load time so the stats-heartbeat is measured from now.
+	// In-memory state now matches the just-loaded .part.met. Setters invoked during tag
+	// parsing may have set m_metDirty; drop it so the first FlushBuffer tick after load does
+	// not rewrite the .met with byte-identical content. Also seed m_lastMetSaveTick so the
+	// heartbeat measures from now.
 	ClearMetDirty();
 	ClearStatsDirty();
 	m_lastMetSaveTick = ::GetTickCount64();
@@ -816,14 +926,13 @@
 	return true;
 }
 
-
 bool CPartFile::SavePartFile(bool Initial)
 {
 	switch (status) {
-		case PS_WAITING_FOR_HASH:
-		case PS_HASHING:
-		case PS_COMPLETE:
-			return false;
+	case PS_WAITING_FOR_HASH:
+	case PS_HASHING:
+	case PS_COMPLETE:
+		return false;
 	}
 
 	/* Don't write anything to disk if less than 100 KB of free space is left. */
@@ -834,33 +943,21 @@
 
 	// Atomic-rename save.
 	//
-	// Old sequence (per partfile, every save tick):
-	//   1. CPath::BackupFile(m_fullname, ".backup") -- full content copy
-	//      of .part.met into .part.met.backup as an in-flight intermediate.
-	//   2. CPath::RemoveFile(m_fullname).
-	//   3. Write new .part.met from scratch.
-	//   4. CPath::RemoveFile(".backup") on success.
-	//   5. CPath::BackupFile(m_fullname, PARTMET_BAK_EXT) -- full content
-	//      copy of the freshly-written .part.met into .part.met.bak as the
-	//      long-term recovery backup.
-	//
-	// Three full-size content copies per save plus a delete/create dance on
-	// the live .part.met. On a sharer with hundreds of dirty partfiles per
-	// timer tick the aggregate runs the main thread continuously through
-	// disk I/O (see issue #669) -- write() syscalls are microseconds each,
-	// but the loop length itself is the bottleneck.
+	// The old sequence made three full-size content copies per save -- a backup copy, a
+	// write-from-scratch, and a second backup copy -- plus a delete/create dance on the live
+	// .part.met. On a sharer with hundreds of dirty partfiles per timer tick the aggregate
+	// runs the main thread continuously through disk I/O: write() syscalls are microseconds
+	// each, but the loop length itself is the bottleneck.
 	//
 	// New sequence:
 	//   1. Write new content into .part.met.tmp.
-	//   2. rename(.part.met, .part.met.bak) -- O(1) metadata op, promotes
-	//      the previous .part.met to long-term backup.
-	//   3. rename(.part.met.tmp, .part.met) -- atomic install of new
-	//      content, POSIX rename guarantees the target is either fully
-	//      old-content or fully new-content at every observable moment.
+	//   2. rename(.part.met, .part.met.bak) -- O(1), promoting the previous .part.met to
+	//      the long-term backup.
+	//   3. rename(.part.met.tmp, .part.met) -- atomic install; POSIX rename guarantees the
+	//      target is either fully old or fully new content at every observable moment.
 	//
-	// One content write plus two metadata renames. ~3x reduction in
-	// per-save disk work, and stronger crash safety because the live
-	// .part.met is never absent or partial.
+	// One content write plus two metadata renames, and stronger crash safety because the
+	// live .part.met is never absent or partial.
 	const CPath tmpName = m_fullname.AppendExt(".tmp");
 	const CPath bakName = m_fullname.AppendExt(PARTMET_BAK_EXT);
 
@@ -888,66 +985,68 @@
 		for (int x = 0; x < parts; ++x) {
 			file.WriteHash(m_hashlistx);
 		}
-		// tags
-		#define FIXED_TAGS 15
-		uint32 tagcount = m_taglist.size() + FIXED_TAGS + (m_gaplist.size()*2);
+// tags
+#define FIXED_TAGS 15
+		uint32 tagcount = m_taglist.size() + FIXED_TAGS + (m_gaplist.size() * 2);
 		if (!m_corrupted_list.empty()) {
 			++tagcount;
 		}
 
-		if (m_pAICHHashSet->HasValidMasterHash() && (m_pAICHHashSet->GetStatus() == AICH_VERIFIED)){
+		if (m_pAICHHashSet->HasValidMasterHash() && (m_pAICHHashSet->GetStatus() == AICH_VERIFIED)) {
 			++tagcount;
 		}
 
-		if (GetLastPublishTimeKadSrc()){
+		if (GetLastPublishTimeKadSrc()) {
 			++tagcount;
 		}
 
-		if (GetLastPublishTimeKadNotes()){
+		if (GetLastPublishTimeKadNotes()) {
 			++tagcount;
 		}
 
-		if (GetDlActiveTime()){
+		if (GetDlActiveTime()) {
 			++tagcount;
 		}
 
 		file.WriteUInt32(tagcount);
 
-		//#warning Kry - Where are lost by corruption and gained by compression?
+		// #warning Kry - Where are lost by corruption and gained by compression?
 
-		// 0 (unicoded part file name)
-		// We write it with BOM to keep eMule compatibility. Note that the 'printable' filename is saved,
-		// as presently the filename does not represent an actual file.
-		CTagString(	FT_FILENAME,	GetFileName().GetPrintable()).WriteTagToFile( &file, utf8strOptBOM );
-		CTagString(	FT_FILENAME,	GetFileName().GetPrintable()).WriteTagToFile( &file );                         // 1
-
-		CTagIntSized(	FT_FILESIZE,	GetFileSize(), IsLargeFile() ? 64 : 32).WriteTagToFile( &file );// 2
-		CTagIntSized(	FT_TRANSFERRED,	transferred, IsLargeFile() ? 64 : 32).WriteTagToFile( &file );   // 3
-		CTagInt32(	FT_STATUS,	(m_paused?1:0)).WriteTagToFile( &file );                        // 4
-
-		if ( IsAutoDownPriority() ) {
-			CTagInt32( FT_DLPRIORITY,	(uint8)PR_AUTO	).WriteTagToFile( &file );	// 5
-			CTagInt32( FT_OLDDLPRIORITY,	(uint8)PR_AUTO	).WriteTagToFile( &file );	// 6
+		// 0 (unicoded part file name). Written with BOM to keep eMule compatibility. The
+		// 'printable' filename is saved, as the filename does not presently represent an
+		// actual file.
+		CTagString(FT_FILENAME, GetFileName().GetPrintable()).WriteTagToFile(&file, utf8strOptBOM);
+		CTagString(FT_FILENAME, GetFileName().GetPrintable()).WriteTagToFile(&file); // 1
+
+		CTagIntSized(FT_FILESIZE, GetFileSize(), IsLargeFile() ? 64 : 32).WriteTagToFile(&file);  // 2
+		CTagIntSized(FT_TRANSFERRED, transferred, IsLargeFile() ? 64 : 32).WriteTagToFile(&file); // 3
+		CTagInt32(FT_STATUS, (m_paused ? 1 : 0)).WriteTagToFile(&file);                           // 4
+
+		if (IsAutoDownPriority()) {
+			CTagInt32(FT_DLPRIORITY, (uint8)PR_AUTO).WriteTagToFile(&file);    // 5
+			CTagInt32(FT_OLDDLPRIORITY, (uint8)PR_AUTO).WriteTagToFile(&file); // 6
 		} else {
-			CTagInt32( FT_DLPRIORITY,	m_iDownPriority	).WriteTagToFile( &file );	// 5
-			CTagInt32( FT_OLDDLPRIORITY,	m_iDownPriority	).WriteTagToFile( &file );	// 6
+			CTagInt32(FT_DLPRIORITY, m_iDownPriority).WriteTagToFile(&file);    // 5
+			CTagInt32(FT_OLDDLPRIORITY, m_iDownPriority).WriteTagToFile(&file); // 6
 		}
 
-		CTagInt32( FT_LASTSEENCOMPLETE,	lsc			).WriteTagToFile( &file );	// 7
+		CTagInt32(FT_LASTSEENCOMPLETE, lsc).WriteTagToFile(&file); // 7
 
-		if ( IsAutoUpPriority() ) {
-			CTagInt32( FT_ULPRIORITY,	(uint8)PR_AUTO	).WriteTagToFile( &file );	// 8
-			CTagInt32( FT_OLDULPRIORITY,	(uint8)PR_AUTO	).WriteTagToFile( &file );	// 9
+		if (IsAutoUpPriority()) {
+			CTagInt32(FT_ULPRIORITY, (uint8)PR_AUTO).WriteTagToFile(&file);    // 8
+			CTagInt32(FT_OLDULPRIORITY, (uint8)PR_AUTO).WriteTagToFile(&file); // 9
 		} else {
-			CTagInt32( FT_ULPRIORITY,	GetUpPriority() ).WriteTagToFile( &file );	// 8
-			CTagInt32( FT_OLDULPRIORITY,	GetUpPriority() ).WriteTagToFile( &file );	// 9
+			CTagInt32(FT_ULPRIORITY, GetUpPriority()).WriteTagToFile(&file);    // 8
+			CTagInt32(FT_OLDULPRIORITY, GetUpPriority()).WriteTagToFile(&file); // 9
 		}
 
-		CTagInt32(FT_CATEGORY,       m_category).WriteTagToFile( &file );                       // 10
-		CTagInt32(FT_ATTRANSFERRED,   statistic.GetAllTimeTransferred() & 0xFFFFFFFF).WriteTagToFile( &file );// 11
-		CTagInt32(FT_ATTRANSFERREDHI, statistic.GetAllTimeTransferred() >>32).WriteTagToFile( &file );// 12
-		CTagInt32(FT_ATREQUESTED,    statistic.GetAllTimeRequests()).WriteTagToFile( &file );	// 13
-		CTagInt32(FT_ATACCEPTED,     statistic.GetAllTimeAccepts()).WriteTagToFile( &file );	// 14
+		CTagInt32(FT_CATEGORY, m_category).WriteTagToFile(&file); // 10
+		CTagInt32(FT_ATTRANSFERRED, statistic.GetAllTimeTransferred() & 0xFFFFFFFF)
+			.WriteTagToFile(&file); // 11
+		CTagInt32(FT_ATTRANSFERREDHI, statistic.GetAllTimeTransferred() >> 32)
+			.WriteTagToFile(&file);                                                  // 12
+		CTagInt32(FT_ATREQUESTED, statistic.GetAllTimeRequests()).WriteTagToFile(&file); // 13
+		CTagInt32(FT_ATACCEPTED, statistic.GetAllTimeAccepts()).WriteTagToFile(&file);   // 14
 
 		// corrupt part infos
 		if (!m_corrupted_list.empty()) {
@@ -960,30 +1059,32 @@
 				}
 				strCorruptedParts += CFormat("%u") % uCorruptedPart;
 			}
-			wxASSERT( !strCorruptedParts.IsEmpty() );
+			wxASSERT(!strCorruptedParts.IsEmpty());
 
-			CTagString( FT_CORRUPTEDPARTS, strCorruptedParts ).WriteTagToFile( &file); // 11?
+			CTagString(FT_CORRUPTEDPARTS, strCorruptedParts).WriteTagToFile(&file); // 11?
 		}
 
-		//AICH Filehash
-		if (m_pAICHHashSet->HasValidMasterHash() && (m_pAICHHashSet->GetStatus() == AICH_VERIFIED)){
-			CTagString aichtag(FT_AICH_HASH, m_pAICHHashSet->GetMasterHash().GetString() );
+		// AICH Filehash
+		if (m_pAICHHashSet->HasValidMasterHash() && (m_pAICHHashSet->GetStatus() == AICH_VERIFIED)) {
+			CTagString aichtag(FT_AICH_HASH, m_pAICHHashSet->GetMasterHash().GetString());
 			aichtag.WriteTagToFile(&file); // 12?
 		}
 
-		if (GetLastPublishTimeKadSrc()){
-			CTagInt32(FT_KADLASTPUBLISHSRC, GetLastPublishTimeKadSrc()).WriteTagToFile(&file); // 15?
+		if (GetLastPublishTimeKadSrc()) {
+			CTagInt32(FT_KADLASTPUBLISHSRC, GetLastPublishTimeKadSrc())
+				.WriteTagToFile(&file); // 15?
 		}
 
-		if (GetLastPublishTimeKadNotes()){
-			CTagInt32(FT_KADLASTPUBLISHNOTES, GetLastPublishTimeKadNotes()).WriteTagToFile(&file); // 16?
+		if (GetLastPublishTimeKadNotes()) {
+			CTagInt32(FT_KADLASTPUBLISHNOTES, GetLastPublishTimeKadNotes())
+				.WriteTagToFile(&file); // 16?
 		}
 
-		if (GetDlActiveTime()){
+		if (GetDlActiveTime()) {
 			CTagInt32(FT_DL_ACTIVE_TIME, GetDlActiveTime()).WriteTagToFile(&file); // 17
 		}
 
-		for (uint32 j = 0; j < (uint32)m_taglist.size();++j) {
+		for (uint32 j = 0; j < (uint32)m_taglist.size(); ++j) {
 			m_taglistj.WriteTagToFile(&file);
 		}
 
@@ -995,23 +1096,21 @@
 			// gap start = first missing byte but gap ends = first non-missing byte
 			// in edonkey but I think its easier to user the real limits
 			tagName0 = FT_GAPSTART;
-			CTagIntSized(tagName, it.start(),	IsLargeFile() ? 64 : 32).WriteTagToFile( &file );
+			CTagIntSized(tagName, it.start(), IsLargeFile() ? 64 : 32).WriteTagToFile(&file);
 
 			tagName0 = 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) {
-		AddLogLineNS(CFormat( _("ERROR while saving partfile: %s (%s ==> %s)") )
-			% error
-			% m_partmetfilename
-			% GetFileName() );
+	} catch (const wxString &error) {
+		AddLogLineNS(CFormat(_("ERROR while saving partfile: %s (%s ==> %s)")) % error %
+			     m_partmetfilename % GetFileName());
 
 		file.Close();
 		CPath::RemoveFile(tmpName);
 		return false;
-	} catch (const CIOFailureException& e) {
+	} catch (const CIOFailureException &e) {
 		AddLogLineCS(_("IO failure while saving partfile: ") + e.what());
 
 		file.Close();
@@ -1021,26 +1120,24 @@
 
 	file.Close();
 
-	// Sanity-check the tmp before committing it as the new .part.met.
-	// If the write somehow produced a zero-length file (no exception, but
-	// disk full, fs quota, etc.) the existing .part.met must stay intact.
+	// Sanity-check the tmp before committing it as the new .part.met. If the write somehow
+	// produced a zero-length file -- no exception, but disk full or quota -- the existing
+	// .part.met must stay intact.
 	sint64 tmpLength = tmpName.GetFileSize();
 	if (tmpLength == wxInvalidOffset || tmpLength == 0) {
-		theApp->ShowAlert( CFormat(
-			_("Wrote 0/unknown bytes to '%s' -- preserving existing .part.met."))
-			% tmpName,
-			_("Message"), wxOK);
+		theApp->ShowAlert(
+			CFormat(_("Wrote 0/unknown bytes to '%s' -- preserving existing .part.met.")) %
+				tmpName,
+			_("Message"),
+			wxOK);
 		CPath::RemoveFile(tmpName);
 		return false;
 	}
 
-	// Two-rename atomic install.
-	//   - The previous .part.met (if any) is promoted to .part.met.bak,
-	//     overwriting any older backup. The recovery path in
-	//     LoadPartFile(from_backup=true) reads this on next start if the
-	//     live .part.met goes missing.
-	//   - The freshly-written .part.met.tmp is renamed over the live name,
-	//     atomically.
+	// Two-rename atomic install: the previous .part.met is promoted to .part.met.bak,
+	// overwriting any older backup, which LoadPartFile reads on the next start if the live
+	// .part.met goes missing; then the freshly-written .part.met.tmp is renamed over the
+	// live name, atomically.
 	if (m_fullname.FileExists()) {
 		CPath::RenameFile(m_fullname, bakName, true /* overwrite */);
 	}
@@ -1052,24 +1149,17 @@
 	return true;
 }
 
-
 void CPartFile::SaveSourceSeeds()
 {
-	#define MAX_SAVED_SOURCES 10
+#define MAX_SAVED_SOURCES 10
 
-	// Kry - Sources seeds
-	// Based on a Feature request, this saves the last MAX_SAVED_SOURCES
-	// sources of the file, giving a 'seed' for the next run.
-	// We save the last sources because:
-	// 1 - They could be the hardest to get
-	// 2 - They will more probably be available
-	// However, if we have downloading sources, they have preference because
-	// we probably have more credits on them.
-	// Anyway, source exchange will get us the rest of the sources
-	// This feature is currently used only on rare files (< 20 sources)
-	//
+	// Kry - Sources seeds. Saves the last MAX_SAVED_SOURCES sources of the file as a 'seed'
+	// for the next run: they could be the hardest to get, and are more probably still
+	// available. Downloading sources take preference, since we probably have more credits on
+	// them, and source exchange gets us the rest. Currently used only on rare files (< 20
+	// sources).
 
-	if (GetSourceCount()>20) {
+	if (GetSourceCount() > 20) {
 		return;
 	}
 
@@ -1077,7 +1167,7 @@
 	int n_sources = 0;
 
 	CClientRefList::iterator it = m_downloadingSourcesList.begin();
-	for( ; it != m_downloadingSourcesList.end() && n_sources < MAX_SAVED_SOURCES; ++it) {
+	for (; it != m_downloadingSourcesList.end() && n_sources < MAX_SAVED_SOURCES; ++it) {
 		if (!it->HasLowID()) {
 			source_seeds.push_back(*it);
 			++n_sources;
@@ -1088,7 +1178,7 @@
 		// Not enough downloading sources to fill the list, going to sources list
 		if (GetSourceCount() > 0) {
 			SourceSet::reverse_iterator rit = m_SrcList.rbegin();
-			for ( ; ((rit != m_SrcList.rend()) && (n_sources<MAX_SAVED_SOURCES)); ++rit) {
+			for (; ((rit != m_SrcList.rend()) && (n_sources < MAX_SAVED_SOURCES)); ++rit) {
 				if (!rit->HasLowID()) {
 					source_seeds.push_back(*rit);
 					++n_sources;
@@ -1107,8 +1197,7 @@
 	CFile file;
 	file.Create(seedsPath, true);
 	if (!file.IsOpened()) {
-		AddLogLineN(CFormat( _("Failed to save part.met.seeds file for %s") )
-			% m_fullname);
+		AddLogLineN(CFormat(_("Failed to save part.met.seeds file for %s")) % m_fullname);
 		return;
 	}
 
@@ -1118,34 +1207,33 @@
 
 		CClientRefList::iterator it2 = source_seeds.begin();
 		for (; it2 != source_seeds.end(); ++it2) {
-			CUpDownClient* cur_src = it2->GetClient();
+			CUpDownClient *cur_src = it2->GetClient();
 			file.WriteUInt32(cur_src->GetUserIDHybrid());
 			file.WriteUInt16(cur_src->GetUserPort());
 			file.WriteHash(cur_src->GetUserHash());
 			// CryptSettings - See SourceExchange V4
-			const uint8 uSupportsCryptLayer	= cur_src->SupportsCryptLayer() ? 1 : 0;
-			const uint8 uRequestsCryptLayer	= cur_src->RequestsCryptLayer() ? 1 : 0;
-			const uint8 uRequiresCryptLayer	= cur_src->RequiresCryptLayer() ? 1 : 0;
-			const uint8 byCryptOptions = (uRequiresCryptLayer << 2) | (uRequestsCryptLayer << 1) | (uSupportsCryptLayer << 0);
+			const uint8 uSupportsCryptLayer = cur_src->SupportsCryptLayer() ? 1 : 0;
+			const uint8 uRequestsCryptLayer = cur_src->RequestsCryptLayer() ? 1 : 0;
+			const uint8 uRequiresCryptLayer = cur_src->RequiresCryptLayer() ? 1 : 0;
+			const uint8 byCryptOptions = (uRequiresCryptLayer << 2) | (uRequestsCryptLayer << 1) |
+						     (uSupportsCryptLayer << 0);
 			file.WriteUInt8(byCryptOptions);
 		}
 
-		/* v2: Added to keep track of too old seeds */
-		/* according to https://docs.wxwidgets.org/3.2/classwx_date_time.html#a99263946a9a2ece83421411081c02378
-		 * GetTicks() won't work after Jan 19, 2038, and suggest to use GetValue() instead and convert from ms
-		 * to seconds.
-		 * Since GetValue() returns a wxLongLong which is tagged obsolete, just use time(NULL)*/
-		file.WriteUInt32((uint32) time(NULL));
-
-		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) {
-		AddDebugLogLineC( logPartFile, CFormat( "Error saving partfile's seeds file (%s - %s): %s" )
-				% m_partmetfilename
-				% GetFileName()
-				% e.what() );
+		// v2: added to keep track of too-old seeds. Per
+		// https://docs.wxwidgets.org/3.2/classwx_date_time.html GetTicks() stops working after
+		// Jan 19 2038 and GetValue() is suggested instead, converting ms to seconds; since
+		// GetValue() returns a wxLongLong tagged obsolete, just use time(NULL).
+		file.WriteUInt32((uint32)time(NULL));
+
+		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) {
+		AddDebugLogLineC(logPartFile,
+			CFormat("Error saving partfile's seeds file (%s - %s): %s") % m_partmetfilename %
+				GetFileName() % e.what());
 
 		n_sources = 0;
 		file.Close();
@@ -1166,10 +1254,10 @@
 
 	CFile file(seedsPath, CFile::read);
 	if (!file.IsOpened()) {
-		// Exists but can't be opened. Should not happen. Probably permission problem, try to remove it.
-		AddLogLineN(CFormat( _("Can't read seeds file for Partfile %s (%s)") )
-			% m_partmetfilename
-			% GetFileName() );
+		// Exists but can't be opened. Should not happen. Probably permission problem, try to remove
+		// it.
+		AddLogLineN(CFormat(_("Can't read seeds file for Partfile %s (%s)")) % m_partmetfilename %
+			    GetFileName());
 		CPath::RemoveFile(seedsPath);
 		return;
 	}
@@ -1187,7 +1275,7 @@
 
 		sources_data.WriteUInt16(src_count);
 
-		for (int i = 0; i< src_count; ++i) {
+		for (int i = 0; i < src_count; ++i) {
 			uint32 dwID = file.ReadUInt32();
 			uint16 nPort = file.ReadUInt16();
 
@@ -1200,7 +1288,6 @@
 				sources_data.WriteHash(file.ReadHash());
 				sources_data.WriteUInt8(file.ReadUInt8());
 			}
-
 		}
 
 		if (!file.Eof()) {
@@ -1210,7 +1297,7 @@
 
 			// Time frame is 2 hours. More than enough to compile
 			// your new aMule version!.
-			if ((timeFromFile + MIN2S(120)) >= (uint32) time(NULL)) {
+			if ((timeFromFile + MIN2S(120)) >= (uint32)time(NULL)) {
 				valid_sources = true;
 			}
 
@@ -1222,14 +1309,13 @@
 
 		if (valid_sources) {
 			sources_data.Seek(0);
-			AddClientSources(&sources_data, SF_SOURCE_SEEDS, bUseSX2Format ? 4 : 1, bUseSX2Format);
+			AddClientSources(
+				&sources_data, SF_SOURCE_SEEDS, bUseSX2Format ? 4 : 1, bUseSX2Format);
 		}
 
-	} catch (const CSafeIOException& e) {
-		AddLogLineN(CFormat( _("Error reading partfile's seeds file (%s - %s): %s") )
-				% m_partmetfilename
-				% GetFileName()
-				% e.what() );
+	} catch (const CSafeIOException &e) {
+		AddLogLineN(CFormat(_("Error reading partfile's seeds file (%s - %s): %s")) %
+			    m_partmetfilename % GetFileName() % e.what());
 		badSeedsFile = true;
 	}
 
@@ -1240,98 +1326,111 @@
 	}
 }
 
-void CPartFile::PartFileHashFinished(CKnownFile* result)
+void CPartFile::PartFileHashFinished(CKnownFile *result)
 {
 	m_lastDateChanged = result->m_lastDateChanged;
 	bool errorfound = false;
-	if (GetED2KPartHashCount() == 0){
-		if (IsComplete(0, GetFileSize()-1)){
-			if (result->GetFileHash() != GetFileHash()){
+	// Parts that pass their per-part hash during download but fail this final full-file
+	// re-hash -- a block rewritten after the part completed, say -- are collected here so
+	// AICH recovery can be attempted once the file is back in a downloadable state, rather
+	// than only re-gapping the whole part.
+	std::vector<uint16> corruptParts;
+	if (GetED2KPartHashCount() == 0) {
+		if (IsComplete(0, GetFileSize() - 1)) {
+			if (result->GetFileHash() != GetFileHash()) {
 				// cppcheck-suppress zerodiv
-				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)
-					)
-					% 1
-					% 0
-					% GetFileName()
-					% result->GetFileHash().Encode()
-					% GetFileHash().Encode() );
-				AddGap(0, GetFileSize()-1);
+				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)) %
+					    1 % 0 % GetFileName() % result->GetFileHash().Encode() %
+					    GetFileHash().Encode());
+				AddGap(0, GetFileSize() - 1);
 				errorfound = true;
 			}
 		}
-	}
-	else{
-		for (size_t i = 0; i < m_hashlist.size(); ++i){
-			// Kry - trel_ar's completed parts check on rehashing.
-			// Very nice feature, if a file is completed but .part.met don't believe it,
-			// update it.
+	} else {
+		for (size_t i = 0; i < m_hashlist.size(); ++i) {
+			// Kry - trel_ar's completed-parts check on rehashing: if a file is
+			// complete but .part.met does not believe it, update it.
 
-			if (!( i < result->GetHashCount() && (result->GetPartHash(i) == GetPartHash(i)))){
+			if (!(i < result->GetHashCount() && (result->GetPartHash(i) == GetPartHash(i)))) {
 				if (IsComplete(i)) {
 					CMD4Hash wronghash;
-					if ( i < result->GetHashCount() )
+					if (i < result->GetHashCount())
 						wronghash = result->GetPartHash(i);
 
-					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())
-						)
-						% ( i + 1 )
-						% GetED2KPartHashCount()
-						% GetFileName()
-						% wronghash.Encode()
-						% GetPartHash(i).Encode() );
+					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())) %
+						(i + 1) % GetED2KPartHashCount() % GetFileName() %
+						wronghash.Encode() % GetPartHash(i).Encode());
 
 					AddGap(i);
 					errorfound = true;
+					const uint16 part = (uint16)i;
+					// Mirror the mid-download corruption path: flag the part in
+					// m_corrupted_list. It is not needed for the AICH block
+					// recovery below, but it primes the ICH fallback for when no
+					// trusted AICH hashset is available, and since m_corrupted_list
+					// is persisted to the .met it keeps the corrupt state across a
+					// restart mid-recovery.
+					if (!IsCorruptedPart(part)) {
+						m_corrupted_list.push_back(part);
+					}
+					corruptParts.push_back(part);
 				}
 			} else {
-				if (!IsComplete(i)){
-					AddLogLineN(CFormat( _("Found completed part (%i) in %s") )
-						% ( i + 1 )
-						% GetFileName() );
+				if (!IsComplete(i)) {
+					AddLogLineN(CFormat(_("Found completed part (%i) in %s")) % (i + 1) %
+						    GetFileName());
 
 					FillGap(i);
 					uint64 partStart = i * PARTSIZE;
-					uint64 partEnd   = partStart + GetPartSize(i) - 1;
+					uint64 partEnd = partStart + GetPartSize(i) - 1;
 					RemoveBlockFromList(partStart, partEnd);
 				}
 			}
 		}
 	}
 
-	if (	!errorfound &&
-		result->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE &&
+	if (!errorfound && result->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE &&
 		status == PS_COMPLETING) {
 		delete m_pAICHHashSet;
 		m_pAICHHashSet = result->GetAICHHashset();
 		result->SetAICHHashset(NULL);
 		m_pAICHHashSet->SetOwner(this);
-	}
-	else if (status == PS_COMPLETING) {
+	} else if (status == PS_COMPLETING) {
 		AddDebugLogLineN(logPartFile,
-			CFormat("Failed to store new AICH Hashset for completed file: %s")
-				% GetFileName());
+			CFormat("Failed to store new AICH Hashset for completed file: %s") % GetFileName());
 	}
 
-
 	delete result;
-	if (!errorfound){
-		if (status == PS_COMPLETING){
+	if (!errorfound) {
+		if (status == PS_COMPLETING) {
 			CompleteFile(true);
 			return;
+		} else {
+			AddLogLineN(CFormat(_("Finished rehashing %s")) % GetFileName());
 		}
-		else {
-			AddLogLineN(CFormat( _("Finished rehashing %s") ) % GetFileName());
-		}
-	}
-	else{
+	} else {
 		SetStatus(PS_READY);
 		SavePartFile();
+		// A part can pass its per-part hash during download yet fail this final full-file
+		// re-hash -- a block rewritten after the part completed, as happens when endgame
+		// source rotation splices a block across two sources. AddGap() above re-opens the
+		// whole 9.28 MB part; when a trusted AICH hashset is available, recover it at 180 KB
+		// block granularity instead, so only the actually-corrupt blocks are re-downloaded.
+		// RequestAICHRecovery is a no-op without a trusted hashset, so non-AICH files keep the
+		// whole-part re-download.
+		for (std::vector<uint16>::const_iterator it = corruptParts.begin(); it != corruptParts.end();
+			++it) {
+			RequestAICHRecovery(*it);
+		}
 		return;
 	}
 	SetStatus(PS_READY);
@@ -1355,9 +1454,9 @@
 
 bool CPartFile::IsAlreadyRequested(uint64 start, uint64 end)
 {
-	std::list<Requested_Block_Struct*>::iterator it = m_requestedblocks_list.begin();
+	std::list<Requested_Block_Struct *>::iterator it = m_requestedblocks_list.begin();
 	for (; it != m_requestedblocks_list.end(); ++it) {
-		Requested_Block_Struct* cur_block =  *it;
+		Requested_Block_Struct *cur_block = *it;
 
 		if ((start <= cur_block->EndOffset) && (end >= cur_block->StartOffset)) {
 			return true;
@@ -1433,7 +1532,6 @@
 	return false;
 }
 
-
 void CPartFile::FillGap(uint64 start, uint64 end)
 {
 	m_gaplist.FillGap(start, end);
@@ -1450,26 +1548,24 @@
 	UpdateDisplayedInfo();
 }
 
-
 void CPartFile::UpdateCompletedInfos()
 {
 	uint64 allgaps = m_gaplist.GetGapSize();
 
-	percentcompleted = (1.0 - (double)allgaps/GetFileSize()) * 100.0;
+	percentcompleted = (1.0 - (double)allgaps / GetFileSize()) * 100.0;
 	completedsize = GetFileSize() - allgaps;
 }
 
-
-void CPartFile::WritePartStatus(CMemFile* file)
+void CPartFile::WritePartStatus(CMemFile *file)
 {
 	uint16 parts = GetED2KPartCount();
 	file->WriteUInt16(parts);
 	uint16 done = 0;
-	while (done != parts){
+	while (done != parts) {
 		uint8 towrite = 0;
-		for (uint32 i = 0;i != 8;++i) {
+		for (uint32 i = 0; i != 8; ++i) {
 			if (IsComplete(done)) {
-				towrite |= (1<<i);
+				towrite |= (1 << i);
 			}
 			++done;
 			if (done == parts) {
@@ -1480,158 +1576,204 @@
 	}
 }
 
-void CPartFile::WriteCompleteSourcesCount(CMemFile* file)
+void CPartFile::WriteCompleteSourcesCount(CMemFile *file)
 {
 	file->WriteUInt16(m_nCompleteSourcesCount);
 }
 
 uint32 CPartFile::Process(uint8 m_icounter)
 {
-	// Partfiles have ~20 EC-exported fields that change frequently and
-	// independently (status, speed, transfer counters, source counts, gap
-	// list, hashed-part count, …). Per-field hooks have diminishing
-	// returns when the file is actively transferring anyway, so use a
-	// coarse mark here — Process() runs once per second per partfile and
-	// the file genuinely has new state every tick during active download.
-	MarkECChanged();
+	// Partfiles have ~20 EC-exported fields that change frequently and independently.
+	// Per-field hooks have diminishing returns when the file is actively transferring
+	// anyway, so the mark here stays coarse -- but it is not unconditional. "Process() ran"
+	// is not the same as "this file has new state": a queued download with no sources ticks
+	// once a second and every exported value comes back identical, and marking it anyway
+	// made Get_EC_Response_GetUpdate's change test pass for every non-paused download, every
+	// poll. With 11,000 of them that is the whole download list re-encoded and re-sent once
+	// a second, and the same again on the client.
+	//
+	// Everything else in CEC_PartFile_Tag is event-driven and marks itself where it changes.
+	// This covers what only Process() can move.
+	//
+	// GetDlActiveTime() is deliberately absent. It is wall-clock derived, and every
+	// PS_READY/PS_EMPTY file is activated the moment the client connects, so it advances
+	// every second whether or not the download is doing anything -- including it would
+	// answer "changed" always and leave this test doing nothing. The cost is that an idle
+	// download's active time reaches a remote GUI only when something real changes; it is
+	// read in one place.
+	const std::array<uint64, 12> ecTickState = { GetStatus(),
+		GetSourceCount(),
+		GetNotCurrentSourcesCount(),
+		GetTransferingSrcCount(),
+		GetSrcA4AFCount(),
+		GetTransferred(),
+		GetCompletedSize(),
+		// Quantised exactly as the tag sends it, so a speed wobble too
+		// small to change the wire value doesn't count as a change.
+		(uint64)(GetKBpsDown() * 1024),
+		GetAvailablePartCount(),
+		m_nCompleteSourcesCount,
+		// The last two are already implied by the ones above -- a block arriving moves
+		// GetTransferred(), and availability reaching complete moves GetAvailablePartCount()
+		// on the same pass. They are listed anyway because that is a coupling, not a
+		// guarantee: neither stamp marks EC-dirty of its own accord, so relying on the
+		// neighbour would leave the field to go stale the day either one moves.
+		(uint64)lastseencomplete,
+		(uint64)GetLastChangeDatetime() };
+	if (ecTickState != m_ecTickState) {
+		m_ecTickState = ecTickState;
+		MarkECChanged();
+	}
 
 	uint16 old_trans;
 	uint64 dwCurTick = ::GetTickCount64();
 
-	// Flush on buffer-full, time-limit, or pending hash drain.
-	// HasPendingHashWork() bypass drains Phase 3 at Process()-tick
-	// rate (~100 ms) instead of every 60 s when the file is idle.
-	if (	(m_nTotalBufferData > thePrefs::GetFileBufferSize()) ||
-		(dwCurTick > (m_nLastBufferFlushTime + BUFFER_TIME_LIMIT)) ||
-		HasPendingHashWork()) {
+	// Flush on buffer-full, time-limit, or pending hash drain. The HasPendingHashWork()
+	// bypass drains Phase 3 at Process()-tick rate (~100 ms) instead of every 60 s when the
+	// file is idle.
+	if ((m_nTotalBufferData > thePrefs::GetFileBufferSize()) ||
+		(dwCurTick > (m_nLastBufferFlushTime + BUFFER_TIME_LIMIT)) || HasPendingHashWork()) {
 		FlushBuffer();
 	}
 
-
 	// check if we want new sources from server --> MOVED for 16.40 version
-	old_trans=transferingsrc;
+	old_trans = transferingsrc;
 	transferingsrc = 0;
 	kBpsDown = 0.0;
 
 	if (m_icounter < 10) {
-		// Update only downloading sources.
-		CClientRefList::iterator it = m_downloadingSourcesList.begin();
-		for( ; it != m_downloadingSourcesList.end(); ) {
-			CUpDownClient *cur_src = it++->GetClient();
-			if(cur_src->GetDownloadState() == DS_DOWNLOADING) {
+		// Update only downloading sources. The list is copied to a temporary vector to
+		// prevent iterator invalidation -- TickDownloadAndMeasure() can trigger
+		// DropSlowSources, which removes clients synchronously.
+		std::vector<CClientRef> temp_list(
+			m_downloadingSourcesList.begin(), m_downloadingSourcesList.end());
+		for (CClientRef &ref : temp_list) {
+			CUpDownClient *cur_src = ref.GetClient();
+			if (cur_src && cur_src->GetDownloadState() == DS_DOWNLOADING) {
 				++transferingsrc;
 				kBpsDown += cur_src->TickDownloadAndMeasure();
 			}
 		}
 	} else {
-		// Update all sources (including downloading sources)
-		for ( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ) {
-			CUpDownClient* cur_src = it++->GetClient();
+		// Update all sources, including downloading ones. Copied to a temporary
+		// vector to prevent iterator invalidation, as above.
+		std::vector<CClientRef> temp_list(m_SrcList.begin(), m_SrcList.end());
+		for (CClientRef &ref : temp_list) {
+			CUpDownClient *cur_src = ref.GetClient();
+			if (!cur_src) {
+				continue;
+			}
 			switch (cur_src->GetDownloadState()) {
-				case DS_DOWNLOADING: {
-					++transferingsrc;
-					kBpsDown += cur_src->TickDownloadAndMeasure();
-					break;
-				}
-				case DS_BANNED: {
-					break;
-				}
-				case DS_ERROR: {
-					break;
+			case DS_DOWNLOADING: {
+				++transferingsrc;
+				kBpsDown += cur_src->TickDownloadAndMeasure();
+				break;
+			}
+			case DS_BANNED: {
+				break;
+			}
+			case DS_ERROR: {
+				break;
+			}
+			case DS_LOWTOLOWIP: {
+				if (cur_src->HasLowID() && !theApp->CanDoCallback(cur_src->GetServerIP(),
+								   cur_src->GetServerPort())) {
+					// If we are almost maxed on sources, slowly remove these
+					// clients to see if we can find a better source.
+					if (((dwCurTick - lastpurgetime) > 30000) &&
+						(GetSourceCount() >=
+							(thePrefs::GetMaxSourcePerFile() * .8))) {
+						RemoveSource(cur_src);
+						lastpurgetime = dwCurTick;
+						break;
+					}
+				} else {
+					cur_src->SetDownloadState(DS_ONQUEUE);
 				}
-				case DS_LOWTOLOWIP: {
-					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) &&
-							(GetSourceCount() >= (thePrefs::GetMaxSourcePerFile()*.8))) {
+
+				break;
+			}
+			case DS_NONEEDEDPARTS: {
+				// we try to purge noneeded source, even without reaching the limit
+				if ((dwCurTick - lastpurgetime) > 40000) {
+					if (!cur_src->SwapToAnotherFile(false, false, false, NULL)) {
+						// however we only delete them if reaching the limit
+						if (GetSourceCount() >=
+							(thePrefs::GetMaxSourcePerFile() * .8)) {
 							RemoveSource(cur_src);
 							lastpurgetime = dwCurTick;
-							break;
+							break; // Johnny-B - nothing more to do here (good
+							       // eye!)
 						}
 					} else {
-						cur_src->SetDownloadState(DS_ONQUEUE);
-					}
-
-					break;
-				}
-				case DS_NONEEDEDPARTS: {
-					// we try to purge noneeded source, even without reaching the limit
-					if((dwCurTick - lastpurgetime) > 40000) {
-						if(!cur_src->SwapToAnotherFile(false , false, false , NULL)) {
-							//however we only delete them if reaching the limit
-							if (GetSourceCount() >= (thePrefs::GetMaxSourcePerFile()*.8 )) {
-								RemoveSource(cur_src);
-								lastpurgetime = dwCurTick;
-								break; //Johnny-B - nothing more to do here (good eye!)
-							}
-						} else {
-							lastpurgetime = dwCurTick;
-							break;
-						}
-					}
-					// doubled reasktime for no needed parts - save connections and traffic
-					if (	!((!cur_src->GetLastAskedTime()) ||
-						 (dwCurTick - cur_src->GetLastAskedTime()) > FILEREASKTIME*2)) {
+						lastpurgetime = dwCurTick;
 						break;
 					}
-					// Recheck this client to see if still NNP..
-					// Set to DS_NONE so that we force a TCP reask next time..
-					cur_src->SetDownloadState(DS_NONE);
-
+				}
+				// doubled reasktime for no needed parts - save connections and traffic
+				if (!((!cur_src->GetLastAskedTime()) ||
+					    (dwCurTick - cur_src->GetLastAskedTime()) >
+						    thePrefs::GetSourceReaskTime() * 2)) {
 					break;
 				}
-				case DS_ONQUEUE: {
-					if( cur_src->IsRemoteQueueFull()) {
-						if(	((dwCurTick - lastpurgetime) > 60000) &&
-							(GetSourceCount() >= (thePrefs::GetMaxSourcePerFile()*.8 )) ) {
-							RemoveSource( cur_src );
-							lastpurgetime = dwCurTick;
-							break; //Johnny-B - nothing more to do here (good eye!)
-						}
-					}
+				// Recheck this client to see if still NNP..
+				// Set to DS_NONE so that we force a TCP reask next time..
+				cur_src->SetDownloadState(DS_NONE);
 
-					// Give up to 1 min for UDP to respond..
-					// If we are within on min on TCP, do not try..
-					if (	theApp->IsConnected() &&
-						(	(!cur_src->GetLastAskedTime()) ||
-							(dwCurTick - cur_src->GetLastAskedTime()) > FILEREASKTIME-20000)) {
-						cur_src->UDPReaskForDownload();
+				break;
+			}
+			case DS_ONQUEUE: {
+				if (cur_src->IsRemoteQueueFull()) {
+					if (((dwCurTick - lastpurgetime) > 60000) &&
+						(GetSourceCount() >=
+							(thePrefs::GetMaxSourcePerFile() * .8))) {
+						RemoveSource(cur_src);
+						lastpurgetime = dwCurTick;
+						break; // Johnny-B - nothing more to do here (good eye!)
 					}
-
-					// No break here, since the next case takes care of asking for downloads.
 				}
-				/* fall through */
-				case DS_CONNECTING:
-				case DS_TOOMANYCONNS:
-				case DS_NONE:
-				case DS_WAITCALLBACK:
-				case DS_WAITCALLBACKKAD:	{
-					if (	theApp->IsConnected() &&
-						(	(!cur_src->GetLastAskedTime()) ||
-							(dwCurTick - cur_src->GetLastAskedTime()) > FILEREASKTIME)) {
-						if (!cur_src->AskForDownload()) {
-							// I left this break here just as a reminder
-							// just in case re rearange things..
-							break;
-						}
+
+				// Give up to 1 min for UDP to respond..
+				// If we are within on min on TCP, do not try..
+				if (theApp->IsConnected() &&
+					((!cur_src->GetLastAskedTime()) ||
+						(dwCurTick - cur_src->GetLastAskedTime()) >
+							thePrefs::GetSourceReaskTime() - 20000)) {
+					cur_src->UDPReaskForDownload();
+				}
+
+				// No break here, since the next case takes care of asking for downloads.
+			}
+			/* fall through */
+			case DS_CONNECTING:
+			case DS_TOOMANYCONNS:
+			case DS_NONE:
+			case DS_WAITCALLBACK:
+			case DS_WAITCALLBACKKAD: {
+				if (theApp->IsConnected() &&
+					((!cur_src->GetLastAskedTime()) ||
+						(dwCurTick - cur_src->GetLastAskedTime()) >
+							thePrefs::GetSourceReaskTime())) {
+					if (!cur_src->AskForDownload()) {
+						// I left this break here just as a reminder
+						// just in case re rearange things..
+						break;
 					}
-					break;
 				}
+				break;
+			}
 			}
 		}
 
 		/* eMule 0.30c implementation, i give it a try (Creteil) BEGIN ... */
 		if (IsA4AFAuto() && ((!m_LastNoNeededCheck) || (dwCurTick - m_LastNoNeededCheck > 900000))) {
 			m_LastNoNeededCheck = dwCurTick;
-			for ( SourceSet::iterator it = m_A4AFsrclist.begin(); it != m_A4AFsrclist.end(); ) {
+			for (SourceSet::iterator it = m_A4AFsrclist.begin(); it != m_A4AFsrclist.end();) {
 				CUpDownClient *cur_source = it++->GetClient();
-				uint8 download_state=cur_source->GetDownloadState();
-				if( download_state != DS_DOWNLOADING
-				&& cur_source->GetRequestFile()
-				&& ((!cur_source->GetRequestFile()->IsA4AFAuto()) || download_state == DS_NONEEDEDPARTS))
-				{
+				uint8 download_state = cur_source->GetDownloadState();
+				if (download_state != DS_DOWNLOADING && cur_source->GetRequestFile() &&
+					((!cur_source->GetRequestFile()->IsA4AFAuto()) ||
+						download_state == DS_NONEEDEDPARTS)) {
 					cur_source->SwapToAnotherFile(false, false, false, this);
 				}
 			}
@@ -1640,15 +1782,19 @@
 
 		// swap No needed partfiles if possible
 
-		if (((old_trans==0) && (transferingsrc>0)) || ((old_trans>0) && (transferingsrc==0))) {
+		if (((old_trans == 0) && (transferingsrc > 0)) ||
+			((old_trans > 0) && (transferingsrc == 0))) {
 			SetStatus(status);
 		}
 
 		// Kad source search
-		if( GetMaxSourcePerFileUDP() > GetSourceCount()){
-			//Once we can handle lowID users in Kad, we remove the second IsConnected
-			if (theApp->downloadqueue->DoKademliaFileRequest() && (Kademlia::CKademlia::GetTotalFile() < KADEMLIATOTALFILE) && (dwCurTick > m_LastSearchTimeKad) &&  Kademlia::CKademlia::IsConnected() && theApp->IsConnected() && !IsStopped()){
-				//Kademlia
+		if (GetMaxSourcePerFileUDP() > GetSourceCount()) {
+			// Once we can handle lowID users in Kad, we remove the second IsConnected
+			if (theApp->downloadqueue->DoKademliaFileRequest() &&
+				(Kademlia::CKademlia::GetTotalFile() < thePrefs::GetKadMaxSourceSearches()) &&
+				(dwCurTick > m_LastSearchTimeKad) && Kademlia::CKademlia::IsConnected() &&
+				theApp->IsConnected() && !IsStopped()) {
+				// Kademlia
 				theApp->downloadqueue->SetLastKademliaFileRequest();
 
 				if (GetKadFileSearchID()) {
@@ -1658,30 +1804,32 @@
 				}
 
 				Kademlia::CUInt128 kadFileID(GetFileHash().GetHash());
-				Kademlia::CSearch* pSearch = Kademlia::CSearchManager::PrepareLookup(Kademlia::CSearch::FILE, true, kadFileID);
-				AddDebugLogLineN(logKadSearch, CFormat("Preparing a Kad Search for '%s'") % GetFileName());
+				Kademlia::CSearch *pSearch = Kademlia::CSearchManager::PrepareLookup(
+					Kademlia::CSearch::FILE, true, kadFileID);
+				AddDebugLogLineN(logKadSearch,
+					CFormat("Preparing a Kad Search for '%s'") % GetFileName());
 				if (pSearch) {
-					AddDebugLogLineN(logKadSearch, CFormat("Kad lookup started for '%s'") % GetFileName());
-					if(m_TotalSearchesKad < 7) {
+					AddDebugLogLineN(logKadSearch,
+						CFormat("Kad lookup started for '%s'") % GetFileName());
+					if (m_TotalSearchesKad < 7) {
 						m_TotalSearchesKad++;
 					}
-					m_LastSearchTimeKad = dwCurTick + (KADEMLIAREASKTIME*m_TotalSearchesKad);
+					m_LastSearchTimeKad = dwCurTick + (thePrefs::GetKadSourceReaskTime() *
+										  m_TotalSearchesKad);
 					SetKadFileSearchID(pSearch->GetSearchID());
 				}
 			}
 		} else {
-			if(GetKadFileSearchID()) {
+			if (GetKadFileSearchID()) {
 				Kademlia::CSearchManager::StopSearch(GetKadFileSearchID(), true);
 			}
 		}
 
 		// check if we want new sources from server
-		if (	!m_localSrcReqQueued &&
-			(	(!m_lastsearchtime) ||
-				(dwCurTick - m_lastsearchtime) > SERVERREASKTIME) &&
-			theApp->IsConnectedED2K() &&
-			thePrefs::GetMaxSourcePerFileSoft() > GetSourceCount() &&
-			!m_stopped ) {
+		if (!m_localSrcReqQueued &&
+			((!m_lastsearchtime) || (dwCurTick - m_lastsearchtime) > SERVERREASKTIME) &&
+			theApp->IsConnectedED2K() && thePrefs::GetMaxSourcePerFileSoft() > GetSourceCount() &&
+			!m_stopped) {
 			m_localSrcReqQueued = true;
 			theApp->downloadqueue->SendLocalSrcRequest(this);
 		}
@@ -1696,7 +1844,7 @@
 		m_count = 0;
 		UpdateAutoDownPriority();
 		UpdateDisplayedInfo();
-		if(m_bPercentUpdated == false) {
+		if (m_bPercentUpdated == false) {
 			UpdateCompletedInfos();
 		}
 		m_bPercentUpdated = false;
@@ -1705,15 +1853,20 @@
 	// release file handle if unused for some time
 	m_hpartfile.Release();
 
-	return (uint32)(kBpsDown*1024.0);
+	return (uint32)(kBpsDown * 1024.0);
 }
 
-bool CPartFile::CanAddSource(uint32 userid, uint16 port, uint32 serverip, uint16 serverport, uint8* pdebug_lowiddropped, bool ed2kID)
+bool CPartFile::CanAddSource(uint32 userid,
+	uint16 port,
+	uint32 serverip,
+	uint16 serverport,
+	uint8 *pdebug_lowiddropped,
+	bool ed2kID)
 {
 
-	//The incoming ID could have the userid in the Hybrid format..
+	// The incoming ID could have the userid in the Hybrid format..
 	uint32 hybridID = 0;
-	if( ed2kID ) {
+	if (ed2kID) {
 		if (IsLowID(userid)) {
 			hybridID = userid;
 		} else {
@@ -1726,47 +1879,46 @@
 		}
 	}
 
-	// A LowID of zero has no callback semantics — server LowID
-	// assignments start at 1, so an OP_CALLBACKREQUEST aimed at LowID
-	// 0 can't be routed to anything. Source-exchange and server source
-	// lists skip the IsGoodIP filter for LowID ids, so such entries
-	// otherwise sail through, become a CUpDownClient, and burn ~60 s
-	// of idle-socket time inside listensocket's pool before
-	// CClientTCPSocket::CheckTimeOut cleans them up (#786).
+	// A LowID of zero has no callback semantics -- server LowID assignments start at 1, so
+	// an OP_CALLBACKREQUEST aimed at LowID 0 cannot be routed to anything. Source-exchange
+	// and server source lists skip the IsGoodIP filter for LowID ids, so such entries
+	// otherwise sail through, become a CUpDownClient, and burn ~60 s of idle-socket time in
+	// the listen pool.
 	//
-	// HighID 0 (IP 0.0.0.0) is intentionally left to the upstream
-	// IsGoodIP filter that already gates both callers; this guard is
-	// scoped narrowly to the LowID case.
+	// HighID 0 (IP 0.0.0.0) is left to the upstream IsGoodIP filter that already gates both
+	// callers; this guard is scoped narrowly to the LowID case.
 	if (IsLowID(hybridID) && hybridID == 0) {
 		return false;
 	}
 
 	// MOD Note: Do not change this part - Merkur
 	if (theApp->IsConnectedED2K()) {
-		if(::IsLowID(theApp->GetED2KID())) {
-			if(theApp->GetED2KID() == userid && theApp->serverconnect->GetCurrentServer()->GetIP() == serverip && theApp->serverconnect->GetCurrentServer()->GetPort() == serverport ) {
+		if (::IsLowID(theApp->GetED2KID())) {
+			if (theApp->GetED2KID() == userid &&
+				theApp->serverconnect->GetCurrentServer()->GetIP() == serverip &&
+				theApp->serverconnect->GetCurrentServer()->GetPort() == serverport) {
 				return false;
 			}
-			if(theApp->GetPublicIP() == userid) {
+			if (theApp->GetPublicIP() == userid) {
 				return false;
 			}
 		} else {
-			if(theApp->GetED2KID() == userid && thePrefs::GetPort() == port) {
+			if (theApp->GetED2KID() == userid && thePrefs::GetPort() == port) {
 				return false;
 			}
 		}
 	}
 
 	if (Kademlia::CKademlia::IsConnected()) {
-		if(!Kademlia::CKademlia::IsFirewalled()) {
-			if(Kademlia::CKademlia::GetIPAddress() == hybridID && thePrefs::GetPort() == port) {
+		if (!Kademlia::CKademlia::IsFirewalled()) {
+			if (Kademlia::CKademlia::GetIPAddress() == hybridID && thePrefs::GetPort() == port) {
 				return false;
 			}
 		}
 	}
 
-	//This allows *.*.*.0 clients to not be removed if Ed2kID == false
-	if ( IsLowID(hybridID) && theApp->IsFirewalled()) {
+	// This allows *.*.*.0 clients to not be removed if Ed2kID == false
+	if (IsLowID(hybridID) && theApp->IsFirewalled()) {
 		if (pdebug_lowiddropped) {
 			(*pdebug_lowiddropped)++;
 		}
@@ -1776,7 +1928,8 @@
 	return true;
 }
 
-void CPartFile::AddSources(CMemFile& sources,uint32 serverip, uint16 serverport, unsigned origin, bool bWithObfuscationAndHash)
+void CPartFile::AddSources(
+	CMemFile &sources, uint32 serverip, uint16 serverport, unsigned origin, bool bWithObfuscationAndHash)
 {
 	uint8 count = sources.ReadUInt8();
 	uint8 debug_lowiddropped = 0;
@@ -1784,36 +1937,50 @@
 	CMD4Hash achUserHash;
 
 	if (m_stopped) {
-		// since we may received multiple search source UDP results we have to "consume" all data of that packet
+		// since we may received multiple search source UDP results we have to "consume" all data of
+		// that packet
 		AddDebugLogLineN(logPartFile, "Trying to add sources for a stopped file");
-		sources.Seek(count*(4+2), wxFromCurrent);
+		sources.Seek(count * (4 + 2), wxFromCurrent);
 		return;
 	}
 
-	for (int i = 0;i != count;++i) {
+	for (int i = 0; i != count; ++i) {
 		uint32 userid = sources.ReadUInt32();
-		uint16 port   = sources.ReadUInt16();
+		uint16 port = sources.ReadUInt16();
 
 		uint8 byCryptOptions = 0;
-		if (bWithObfuscationAndHash){
+		if (bWithObfuscationAndHash) {
 			byCryptOptions = sources.ReadUInt8();
 			if ((byCryptOptions & 0x80) > 0) {
 				achUserHash = sources.ReadHash();
 			}
 
-			if ((thePrefs::IsClientCryptLayerRequested() && (byCryptOptions & 0x01/*supported*/) > 0 && (byCryptOptions & 0x80) == 0)
-				|| (thePrefs::IsClientCryptLayerSupported() && (byCryptOptions & 0x02/*requested*/) > 0 && (byCryptOptions & 0x80) == 0)) {
-				AddDebugLogLineN(logPartFile, CFormat("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) {
-				AddDebugLogLineN(logPartFile, CFormat("Server provided UserHash for source %u, even if it wasn't expected to (or local obfuscationsettings changed during serverconnect") % userid);
+			if ((thePrefs::IsClientCryptLayerRequested() &&
+				    (byCryptOptions & 0x01 /*supported*/) > 0 &&
+				    (byCryptOptions & 0x80) == 0) ||
+				(thePrefs::IsClientCryptLayerSupported() &&
+					(byCryptOptions & 0x02 /*requested*/) > 0 &&
+					(byCryptOptions & 0x80) == 0)) {
+				AddDebugLogLineN(logPartFile,
+					CFormat("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) {
+				AddDebugLogLineN(logPartFile,
+					CFormat("Server provided UserHash for source %u, even if it wasn't "
+						"expected to (or local obfuscationsettings changed during "
+						"serverconnect") %
+						userid);
 			}
 		}
 
-
 		// "Filter LAN IPs" and "IPfilter" the received sources IP addresses
 		if (!IsLowID(userid)) {
 			// check for 0-IP, localhost and optionally for LAN addresses
-			if ( !IsGoodIP(userid, thePrefs::FilterLanIPs()) ) {
+			if (!IsGoodIP(userid, thePrefs::FilterLanIPs())) {
 				continue;
 			}
 			if (theApp->ipfilter->IsFiltered(userid)) {
@@ -1825,9 +1992,10 @@
 			continue;
 		}
 
-		if(thePrefs::GetMaxSourcePerFile() > GetSourceCount()) {
+		if (thePrefs::GetMaxSourcePerFile() > GetSourceCount()) {
 			++debug_possiblesources;
-			CUpDownClient* newsource = new CUpDownClient(port,userid,serverip,serverport,this, true, true);
+			CUpDownClient *newsource =
+				new CUpDownClient(port, userid, serverip, serverport, this, true, true);
 
 			newsource->SetSourceFrom((ESourceFrom)origin);
 			newsource->SetConnectOptions(byCryptOptions, true, false);
@@ -1836,12 +2004,12 @@
 				newsource->SetUserHash(achUserHash);
 			}
 
-			theApp->downloadqueue->CheckAndAddSource(this,newsource);
+			theApp->downloadqueue->CheckAndAddSource(this, newsource);
 		} else {
 			AddDebugLogLineN(logPartFile, "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);
+			// 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);
 			if (GetKadFileSearchID()) {
 				Kademlia::CSearchManager::StopSearch(GetKadFileSearchID(), false);
 			}
@@ -1852,7 +2020,7 @@
 
 void CPartFile::UpdatePartsInfo()
 {
-	if( !IsPartFile() ) {
+	if (!IsPartFile()) {
 		CKnownFile::UpdatePartsInfo();
 		return;
 	}
@@ -1862,44 +2030,43 @@
 	bool flag = (time(NULL) - m_nCompleteSourcesTime > 0);
 
 	// Ensure the frequency-list is ready
-	if ( m_SrcpartFrequency.size() != GetPartCount() ) {
+	if (m_SrcpartFrequency.size() != GetPartCount()) {
 		m_SrcpartFrequency.clear();
 		m_SrcpartFrequency.insert(m_SrcpartFrequency.begin(), GetPartCount(), 0);
 	}
 
 	// Find number of available parts
 	uint16 availablecounter = 0;
-	for ( uint16 i = 0; i < partcount; ++i ) {
-		if ( m_SrcpartFrequencyi )
+	for (uint16 i = 0; i < partcount; ++i) {
+		if (m_SrcpartFrequencyi)
 			++availablecounter;
 	}
 
-	if ( ( availablecounter == partcount ) && ( m_availablePartsCount < partcount ) ) {
+	if ((availablecounter == partcount) && (m_availablePartsCount < partcount)) {
 		lastseencomplete = time(NULL);
 		MarkMetDirty();
 	}
 
 	m_availablePartsCount = availablecounter;
 
-	if ( flag ) {
+	if (flag) {
 		ArrayOfUInts16 count;
 
 		count.reserve(GetSourceCount());
 
-		for ( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it ) {
-			CUpDownClient* client = it->GetClient();
-			if ( !client->GetUpPartStatus().empty() && client->GetUpPartCount() == partcount ) {
+		for (SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it) {
+			CUpDownClient *client = it->GetClient();
+			if (!client->GetUpPartStatus().empty() && client->GetUpPartCount() == partcount) {
 				count.push_back(client->GetUpCompleteSourcesCount());
 			}
 		}
 
 		m_nCompleteSourcesCount = m_nCompleteSourcesCountLo = m_nCompleteSourcesCountHi = 0;
 
-		for (uint16 i = 0; i < partcount; ++i)	{
-			if( !i )	{
+		for (uint16 i = 0; i < partcount; ++i) {
+			if (!i) {
 				m_nCompleteSourcesCount = m_SrcpartFrequencyi;
-			}
-			else if( m_nCompleteSourcesCount > m_SrcpartFrequencyi) {
+			} else if (m_nCompleteSourcesCount > m_SrcpartFrequencyi) {
 				m_nCompleteSourcesCount = m_SrcpartFrequencyi;
 			}
 		}
@@ -1910,59 +2077,47 @@
 			std::sort(count.begin(), count.end(), std::less<uint16>());
 
 			// calculate range
-			int32 i= n >> 1;		// (n / 2)
-			int32 j= (n * 3) >> 2;	// (n * 3) / 4
-			int32 k= (n * 7) >> 3;	// (n * 7) / 8
-
-			//When still a part file, adjust your guesses by 20% to what you see..
+			int32 i = n >> 1;       // (n / 2)
+			int32 j = (n * 3) >> 2; // (n * 3) / 4
+			int32 k = (n * 7) >> 3; // (n * 7) / 8
 
+			// When still a part file, adjust your guesses by 20% to what you see..
 
 			if (n < 5) {
-				//Not many sources, so just use what you see..
-				// welcome to 'plain stupid code'
-				// m_nCompleteSourcesCount;
-				m_nCompleteSourcesCountLo= m_nCompleteSourcesCount;
-				m_nCompleteSourcesCountHi= m_nCompleteSourcesCount;
+				// Not many sources, so just use what we see.
+				m_nCompleteSourcesCountLo = m_nCompleteSourcesCount;
+				m_nCompleteSourcesCountHi = m_nCompleteSourcesCount;
 			} else if (n < 20) {
-				// For low guess and normal guess count
-				//	 If we see more sources then the guessed low and normal, use what we see.
-				//	 If we see less sources then the guessed low, adjust network accounts for 80%,
-				//  we account for 20% with what we see and make sure we are still above the normal.
-				// For high guess
-				//  Adjust 80% network and 20% what we see.
-				if ( counti < m_nCompleteSourcesCount ) {
+				// For the low and normal guesses: if we see more sources than
+				// guessed, use what we see; if fewer than the low guess, the network
+				// accounts for 80% and what we see for 20%, kept above the normal
+				// guess. The high guess is 80% network, 20% observed.
+				if (counti < m_nCompleteSourcesCount) {
 					m_nCompleteSourcesCountLo = m_nCompleteSourcesCount;
 				} else {
 					m_nCompleteSourcesCountLo =
-						(uint16)((float)(counti*.8) +
-							 (float)(m_nCompleteSourcesCount*.2));
+						(uint16)((float)(counti * .8) +
+							 (float)(m_nCompleteSourcesCount * .2));
 				}
 				m_nCompleteSourcesCount = m_nCompleteSourcesCountLo;
-				m_nCompleteSourcesCountHi =
-					(uint16)((float)(countj*.8) +
-						 (float)(m_nCompleteSourcesCount*.2));
-				if( m_nCompleteSourcesCountHi < m_nCompleteSourcesCount ) {
+				m_nCompleteSourcesCountHi = (uint16)((float)(countj * .8) +
+								     (float)(m_nCompleteSourcesCount * .2));
+				if (m_nCompleteSourcesCountHi < m_nCompleteSourcesCount) {
 					m_nCompleteSourcesCountHi = m_nCompleteSourcesCount;
 				}
 			} else {
-				// Many sources
-				// ------------
-				// For low guess
-				//	 Use what we see.
-				// For normal guess
-				//	 Adjust network accounts for 80%, we account for 20% with what
-				//  we see and make sure we are still above the low.
-				// For high guess
-				//  Adjust network accounts for 80%, we account for 20% with what
-				//  we see and make sure we are still above the normal.
-
-				m_nCompleteSourcesCountLo= m_nCompleteSourcesCount;
-				m_nCompleteSourcesCount= (uint16)((float)(countj*.8)+(float)(m_nCompleteSourcesCount*.2));
-				if( m_nCompleteSourcesCount < m_nCompleteSourcesCountLo ) {
+				// Many sources. Low guess: use what we see. Normal and high guesses:
+				// 80% network, 20% observed, each kept above the one below it.
+
+				m_nCompleteSourcesCountLo = m_nCompleteSourcesCount;
+				m_nCompleteSourcesCount = (uint16)((float)(countj * .8) +
+								   (float)(m_nCompleteSourcesCount * .2));
+				if (m_nCompleteSourcesCount < m_nCompleteSourcesCountLo) {
 					m_nCompleteSourcesCount = m_nCompleteSourcesCountLo;
 				}
-				m_nCompleteSourcesCountHi= (uint16)((float)(countk*.8)+(float)(m_nCompleteSourcesCount*.2));
-				if( m_nCompleteSourcesCountHi < m_nCompleteSourcesCount ) {
+				m_nCompleteSourcesCountHi = (uint16)((float)(countk * .8) +
+								     (float)(m_nCompleteSourcesCount * .2));
+				if (m_nCompleteSourcesCountHi < m_nCompleteSourcesCount) {
 					m_nCompleteSourcesCountHi = m_nCompleteSourcesCount;
 				}
 			}
@@ -1973,33 +2128,23 @@
 }
 
 // Maella -Enhanced Chunk Selection- (based on jicxicmic)
-bool CPartFile::GetNextRequestedBlock(CUpDownClient* sender,
-							std::vector<Requested_Block_Struct*>& toadd, uint16& count)
+bool CPartFile::GetNextRequestedBlock(
+	CUpDownClient *sender, std::vector<Requested_Block_Struct *> &toadd, uint16 &count)
 {
 
-	// The purpose of this function is to return a list of blocks (~180KB) to
-	// download. To avoid a prematurely stop of the downloading, all blocks that
-	// are requested from the same source must be located within the same
-	// chunk (=> part ~9MB).
-	//
-	// The selection of the chunk to download is one of the CRITICAL parts of the
-	// edonkey network. The selection algorithm must insure the best spreading
-	// of files.
+	// Returns a list of blocks (~180KB) to download. To avoid prematurely stopping the
+	// download, all blocks requested from the same source must lie within the same chunk
+	// (part, ~9MB).
 	//
-	// The selection is based on 4 criteria:
-	//  1.  Frequency of the chunk (availability), very rare chunks must be downloaded
-	//      as quickly as possible to become a new available source.
-	//  2.  Parts used for preview (first + last chunk), preview or check a
-	//      file (e.g. movie, mp3)
-	//  3.  Request state (downloading in process), try to ask each source for another
-	//      chunk. Spread the requests between all sources.
-	//  4.  Completion (shortest-to-complete), partially retrieved chunks should be
-	//      completed before starting to download other one.
+	// Chunk selection is one of the CRITICAL parts of the edonkey network: the algorithm has
+	// to ensure the best spreading of files. It weighs four criteria -- chunk frequency
+	// (rare chunks first, so they become newly available), preview parts (first + last
+	// chunk), request state (spread requests across sources), and completion (finish
+	// partially retrieved chunks first).
 	//
-	// The frequency criterion defines three zones: very rare (<10%), rare (<50%)
-	// and common (>30%). Inside each zone, the criteria have a specific weight, used
-	// to calculate the priority of chunks. The chunk(s) with the highest
-	// priority (highest=0, lowest=0xffff) is/are selected first.
+	// Frequency defines three zones -- very rare (<10%), rare (<50%), common (>50%) -- and
+	// inside each the criteria carry different weights. The chunk(s) with the highest
+	// priority (highest=0, lowest=0xffff) go first:
 	//
 	//          very rare   (preview)       rare                      common
 	//    0% <---- +0 pt ----> 10% <----- +10000 pt -----> 50% <---- +20000 pt ----> 100%
@@ -2017,15 +2162,12 @@
 	// 30000..3xxxx  requested rare chunks + requested preview chunks
 	// 40000..4xxxx  requested common chunks (priority to the least complete)
 	//
-	// This algorithm usually selects first the rarest chunk(s). However, partially
-	// complete chunk(s) that is/are close to completion may overtake the priority
-	// (priority inversion).
-	// For the common chunks, the algorithm tries to spread the download between
-	// the sources
-	//
+	// So the rarest chunks usually go first, except that a chunk close to completion can
+	// overtake them (priority inversion). For common chunks the algorithm tries to spread
+	// the download between sources.
 
 	// Check input parameters
-	if ( sender->GetPartStatus().empty() ) {
+	if (sender->GetPartStatus().empty()) {
 		return false;
 	}
 	// Define and create the list of the chunks to download
@@ -2034,11 +2176,11 @@
 
 	// Main loop
 	uint16 newBlockCount = 0;
-	while(newBlockCount != count) {
+	while (newBlockCount != count) {
 		// Create a request block structure if a chunk has been previously selected
-		if(sender->GetLastPartAsked() != 0xffff) {
-			Requested_Block_Struct* pBlock = new Requested_Block_Struct;
-			if(GetNextEmptyBlockInPart(sender->GetLastPartAsked(), pBlock) == true) {
+		if (sender->GetLastPartAsked() != 0xffff) {
+			Requested_Block_Struct *pBlock = new Requested_Block_Struct;
+			if (GetNextEmptyBlockInPart(sender->GetLastPartAsked(), pBlock) == true) {
 				// Keep a track of all pending requested blocks
 				m_requestedblocks_list.push_back(pBlock);
 				// Update list of blocks to return
@@ -2055,13 +2197,14 @@
 		}
 
 		// Check if a new chunk must be selected (e.g. download starting, previous chunk complete)
-		if(sender->GetLastPartAsked() == 0xffff) {
+		if (sender->GetLastPartAsked() == 0xffff) {
 			// Quantify all chunks (create list of chunks to download)
 			// This is done only one time and only if it is necessary (=> CPU load)
-			if(chunksList.empty()) {
+			if (chunksList.empty()) {
 				// Identify the locally missing part(s) that this source has
-				for(uint16 i=0; i < partCount; ++i) {
-					if(sender->IsPartAvailable(i) == true && GetNextEmptyBlockInPart(i, NULL) == true) {
+				for (uint16 i = 0; i < partCount; ++i) {
+					if (sender->IsPartAvailable(i) == true &&
+						GetNextEmptyBlockInPart(i, NULL) == true) {
 						// Create a new entry for this chunk and add it to the list
 						Chunk newEntry;
 						newEntry.part = i;
@@ -2071,133 +2214,142 @@
 				}
 
 				// Check if any blocks(s) could be downloaded
-				if(chunksList.empty()) {
+				if (chunksList.empty()) {
 					break; // Exit main loop while()
 				}
 
 				// Define the bounds of the three zones (very rare, rare)
 				// more depending on available sources
-				uint8 modif=10;
-				if (GetSourceCount()>800) {
-					modif=2;
-				} else if (GetSourceCount()>200) {
-					modif=5;
-				}
-				uint16 limit= modif*GetSourceCount()/ 100;
-				if (limit==0) {
-					limit=1;
+				uint8 modif = 10;
+				if (GetSourceCount() > 800) {
+					modif = 2;
+				} else if (GetSourceCount() > 200) {
+					modif = 5;
+				}
+				uint16 limit = modif * GetSourceCount() / 100;
+				if (limit == 0) {
+					limit = 1;
 				}
 				const uint16 veryRareBound = limit;
-				const uint16 rareBound = 2*limit;
+				const uint16 rareBound = 2 * limit;
 
 				// Cache Preview state (Criterion 2)
 				FileType type = GetFiletype(GetFileName());
 				const bool isPreviewEnable =
-					thePrefs::GetPreviewPrio() &&
-					(type == ftArchive || type == ftVideo);
+					thePrefs::GetPreviewPrio() && (type == ftArchive || type == ftVideo);
 
 				// Collect and calculate criteria for all chunks
-				for (ChunkList::iterator it = chunksList.begin(); it != chunksList.end(); ++it) {
-					Chunk& cur_chunk = *it;
+				for (ChunkList::iterator it = chunksList.begin(); it != chunksList.end();
+					++it) {
+					Chunk &cur_chunk = *it;
 
 					// Offsets of chunk
 					const uint64 uStart = cur_chunk.part * PARTSIZE;
-					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
-					//          download the two last parts.
+					const uint64 uEnd = uStart + GetPartSize(cur_chunk.part) - 1;
+					// Criterion 2. Parts used for preview: the first part and the
+					// last part(s) -- when the last part is very small the two last
+					// parts are both needed.
 					bool critPreview = false;
-					if(isPreviewEnable == true) {
-						if(cur_chunk.part == 0) {
+					if (isPreviewEnable == true) {
+						if (cur_chunk.part == 0) {
 							critPreview = true; // First chunk
-						} else if(cur_chunk.part == partCount-1) {
+						} else if (cur_chunk.part == partCount - 1) {
 							critPreview = true; // Last chunk
-						} else if(cur_chunk.part == partCount-2) {
+						} else if (cur_chunk.part == partCount - 2) {
 							// Last chunk - 1 (only if last chunk is too small)
 							const uint32 sizeOfLastChunk = GetFileSize() - uEnd;
-							if(sizeOfLastChunk < PARTSIZE/3) {
+							if (sizeOfLastChunk < PARTSIZE / 3) {
 								critPreview = true; // Last chunk - 1
 							}
 						}
 					}
 
-					// Criterion 3. Request state (downloading in process from other source(s))
-					// => CPU load
-					const bool critRequested =
-						cur_chunk.frequency > veryRareBound &&
-						IsAlreadyRequested(uStart, uEnd);
+					// Criterion 3. Request state (downloading in progress from another
+					// source)
+					const bool critRequested = cur_chunk.frequency > veryRareBound &&
+								   IsAlreadyRequested(uStart, uEnd);
 
-					// Criterion 4. Completion
-					// PARTSIZE instead of GetPartSize() favours the last chunk - but that may be intentional
+					// Criterion 4. Completion. PARTSIZE instead of GetPartSize() favours
+					// the last chunk -- that may be intentional.
 					uint32 partSize = PARTSIZE - m_gaplist.GetGapSize(cur_chunk.part);
-					const uint16 critCompletion = (uint16)(partSize/(PARTSIZE/100)); // in %
+					const uint16 critCompletion =
+						(uint16)(partSize / (PARTSIZE / 100)); // in %
 
 					// Calculate priority with all criteria
-					if(cur_chunk.frequency <= veryRareBound) {
+					if (cur_chunk.frequency <= veryRareBound) {
 						// 0..xxxx unrequested + requested very rare chunks
-						cur_chunk.rank = (25 * cur_chunk.frequency) + // Criterion 1
-						((critPreview == true) ? 0 : 1) + // Criterion 2
-						(100 - critCompletion); // Criterion 4
-					} else if(critPreview == true) {
+						cur_chunk.rank =
+							(25 * cur_chunk.frequency) +      // Criterion 1
+							((critPreview == true) ? 0 : 1) + // Criterion 2
+							(100 - critCompletion);           // Criterion 4
+					} else if (critPreview == true) {
 						// 10000..10100  unrequested preview chunks
 						// 30000..30100  requested preview chunks
-						cur_chunk.rank = ((critRequested == false) ? 10000 : 30000) + // Criterion 3
-						(100 - critCompletion); // Criterion 4
-					} else if(cur_chunk.frequency <= rareBound) {
+						cur_chunk.rank =
+							((critRequested == false) ? 10000
+										  : 30000) + // Criterion 3
+							(100 - critCompletion);              // Criterion 4
+					} else if (cur_chunk.frequency <= rareBound) {
 						// 10101..1xxxx  unrequested rare chunks
 						// 30101..3xxxx  requested rare chunks
-						cur_chunk.rank = (25 * cur_chunk.frequency) +                 // Criterion 1
-						((critRequested == false) ? 10101 : 30101) + // Criterion 3
-						(100 - critCompletion); // Criterion 4
+						cur_chunk.rank =
+							(25 * cur_chunk.frequency) + // Criterion 1
+							((critRequested == false) ? 10101
+										  : 30101) + // Criterion 3
+							(100 - critCompletion);              // Criterion 4
 					} else {
 						// common chunk
-						if(critRequested == false) { // Criterion 3
+						if (critRequested == false) { // Criterion 3
 							// 20000..2xxxx  unrequested common chunks
-							cur_chunk.rank = 20000 + // Criterion 3
-							(100 - critCompletion); // Criterion 4
+							cur_chunk.rank =
+								20000 +                 // Criterion 3
+								(100 - critCompletion); // Criterion 4
 						} else {
-							// 40000..4xxxx  requested common chunks
-							// Remark: The weight of the completion criterion is inversed
-							//         to spead the requests over the completing chunks.
-							//         Without this, the chunk closest to completion will
-							//         received every new sources.
-							cur_chunk.rank = 40000 + // Criterion 3
-							(critCompletion); // Criterion 4
+							// 40000..4xxxx requested common chunks. The weight of
+							// the completion criterion is INVERSED here, to
+							// spread the requests over the completing chunks --
+							// without it the chunk closest to completion would
+							// receive every new source.
+							cur_chunk.rank = 40000 +           // Criterion 3
+									 (critCompletion); // Criterion 4
 						}
 					}
 				}
 			}
 
 			// Select the next chunk to download
-			if(!chunksList.empty()) {
+			if (!chunksList.empty()) {
 				// Find and count the chunk(s) with the highest priority
 				uint16 chunkCount = 0; // Number of found chunks with same priority
-				uint16 rank = 0xffff; // Highest priority found
+				uint16 rank = 0xffff;  // Highest priority found
 
 				// Collect and calculate criteria for all chunks
-				for (ChunkList::iterator it = chunksList.begin(); it != chunksList.end(); ++it) {
-					const Chunk& cur_chunk = *it;
-					if(cur_chunk.rank < rank) {
+				for (ChunkList::iterator it = chunksList.begin(); it != chunksList.end();
+					++it) {
+					const Chunk &cur_chunk = *it;
+					if (cur_chunk.rank < rank) {
 						chunkCount = 1;
 						rank = cur_chunk.rank;
-					} else if(cur_chunk.rank == rank) {
+					} else if (cur_chunk.rank == rank) {
 						++chunkCount;
 					}
 				}
 
 				// Use a random access to avoid that everybody tries to download the
 				// same chunks at the same time (=> spread the selected chunk among clients)
-				uint16 randomness = 1 + (int) (((float)(chunkCount-1))*rand()/(RAND_MAX+1.0));
+				uint16 randomness =
+					1 + (int)(((float)(chunkCount - 1)) * rand() / (RAND_MAX + 1.0));
 
-				for (ChunkList::iterator it = chunksList.begin(); it != chunksList.end(); ++it) {
-					const Chunk& cur_chunk = *it;
-					if(cur_chunk.rank == rank) {
+				for (ChunkList::iterator it = chunksList.begin(); it != chunksList.end();
+					++it) {
+					const Chunk &cur_chunk = *it;
+					if (cur_chunk.rank == rank) {
 						randomness--;
-						if(randomness == 0) {
+						if (randomness == 0) {
 							// Selection process is over
 							sender->SetLastPartAsked(cur_chunk.part);
-							// Remark: this list might be reused up to *count times
+							// Remark: this list might be reused up to *count
+							// times
 							chunksList.erase(it);
 							break; // exit loop for()
 						}
@@ -2216,12 +2368,11 @@
 }
 // Maella end
 
-
-void  CPartFile::RemoveBlockFromList(uint64 start,uint64 end)
+void CPartFile::RemoveBlockFromList(uint64 start, uint64 end)
 {
-	std::list<Requested_Block_Struct*>::iterator it = m_requestedblocks_list.begin();
+	std::list<Requested_Block_Struct *>::iterator it = m_requestedblocks_list.begin();
 	while (it != m_requestedblocks_list.end()) {
-		std::list<Requested_Block_Struct*>::iterator it2 = it++;
+		std::list<Requested_Block_Struct *>::iterator it2 = it++;
 
 		if ((*it2)->StartOffset <= start && (*it2)->EndOffset >= end) {
 			m_requestedblocks_list.erase(it2);
@@ -2229,13 +2380,11 @@
 	}
 }
 
-
 void CPartFile::RemoveAllRequestedBlocks(void)
 {
 	m_requestedblocks_list.clear();
 }
 
-
 void CPartFile::CompleteFile(bool bIsHashingDone)
 {
 	if (GetKadFileSearchID()) {
@@ -2244,7 +2393,8 @@
 
 	theApp->downloadqueue->RemoveLocalServerRequest(this);
 
-	AddDebugLogLineN( logPartFile, wxString( "CPartFile::CompleteFile: Hash " ) + ( bIsHashingDone ? "done" : "not done" ) );
+	AddDebugLogLineN(logPartFile,
+		wxString("CPartFile::CompleteFile: Hash ") + (bIsHashingDone ? "done" : "not done"));
 
 	if (!bIsHashingDone) {
 		SetStatus(PS_COMPLETING);
@@ -2255,16 +2405,12 @@
 		return;
 	} else {
 		StopFile();
-		m_is_A4AF_auto=false;
+		m_is_A4AF_auto = false;
 		SetStatus(PS_COMPLETING);
-		// guess I was wrong about not need to spawn a thread ...
-		// It is if the temp and incoming dirs are on different
-		// partitions/drives and the file is large...oz
-		//
+		// Spawn a thread: the temp and incoming dirs may be on different
+		// partitions and the file may be large. oz
 
 		PerformFileComplete();
-
-
 	}
 	if (thePrefs::ShowCatTabInfos()) {
 		Notify_ShowUpdateCatTabTitles();
@@ -2272,13 +2418,12 @@
 	UpdateDisplayedInfo(true);
 }
 
-
-void CPartFile::CompleteFileEnded(bool errorOccured, const CPath& newname)
+void CPartFile::CompleteFileEnded(bool errorOccured, const CPath &newname)
 {
 	if (errorOccured) {
 		m_paused = true;
 		SetStatus(PS_ERROR);
-		AddLogLineC(CFormat( _("Unexpected error while completing %s. File paused") )% GetFileName() );
+		AddLogLineC(CFormat(_("Unexpected error while completing %s. File paused")) % GetFileName());
 	} else {
 		m_fullname = newname;
 
@@ -2290,6 +2435,11 @@
 		m_paused = false;
 		ClearPriority();
 
+		// Shared-since (issue #466): a just-completed download becomes available now. Stamp
+		// only if unset so a re-complete / re-add does not move the date.
+		if (GetDateShared() == 0) {
+			SetDateShared(time(nullptr));
+		}
 
 		// Remove from list of canceled files in case it was canceled once upon a time
 		if (theApp->canceledfiles->Remove(GetFileHash())) {
@@ -2306,7 +2456,8 @@
 		theApp->sharedfiles->SafeAddKFile(this);
 		UpdateDisplayedInfo(true);
 
-		// republish that file to the ed2k-server to update the 'FT_COMPLETE_SOURCES' counter on the server.
+		// republish that file to the ed2k-server to update the 'FT_COMPLETE_SOURCES' counter on the
+		// server.
 		theApp->sharedfiles->RepublishFile(this);
 
 		// Ensure that completed shows the correct value
@@ -2315,12 +2466,12 @@
 		// clear the blackbox to free up memory
 		m_CorruptionBlackBox->Free();
 
-		AddLogLineC(CFormat( _("Finished downloading: %s") ) % GetFileName() );
+		AddLogLineC(CFormat(_("Finished downloading: %s")) % GetFileName());
 #ifndef AMULE_DAEMON
 		if (thePrefs::ShowNotifications()) {
-			wxNotificationMessage *notification = new wxNotificationMessage ();
+			wxNotificationMessage *notification = new wxNotificationMessage();
 			notification->SetTitle("aMule");
-			notification->SetMessage(CFormat( _("Finished downloading:\n%s") ) % GetFileName() );
+			notification->SetMessage(CFormat(_("Finished downloading:\n%s")) % GetFileName());
 			notification->SetFlags(wxICON_INFORMATION);
 			notification->Show(7);
 			delete notification;
@@ -2331,15 +2482,18 @@
 	theApp->downloadqueue->StartNextFile(this);
 }
 
-
 void CPartFile::PerformFileComplete()
 {
 	// add this file to the suspended uploads list
 	theApp->uploadqueue->SuspendUpload(GetFileHash(), false);
 	FlushBuffer();
 
-	// close permanent handle
+	// Close the permanent handle under m_hpartfileMutex: CUploadDiskIOThread reads this
+	// handle from a worker thread via ReadData, which holds the same mutex around its
+	// Seek+Read, so closing without it can land between the two. Holding it also makes
+	// ReadData's IsOpened check decisive.
 	if (m_hpartfile.IsOpened()) {
+		std::lock_guard<std::mutex> lock(m_hpartfileMutex);
 		m_hpartfile.Close();
 	}
 
@@ -2347,18 +2501,17 @@
 	CThreadScheduler::AddTask(new CCompletionTask(this));
 }
 
-
-void  CPartFile::RemoveAllSources(bool bTryToSwap)
+void CPartFile::RemoveAllSources(bool bTryToSwap)
 {
-	for( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end();) {
-		CUpDownClient* cur_src = it++->GetClient();
+	for (SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end();) {
+		CUpDownClient *cur_src = it++->GetClient();
 		if (bTryToSwap) {
 			if (!cur_src->SwapToAnotherFile(true, true, true, NULL)) {
-				RemoveSource(cur_src,true,false);
+				RemoveSource(cur_src, true, false);
 				// If it was not swapped, it's not on any file anymore, and should die
 			}
 		} else {
-			RemoveSource(cur_src,true,false);
+			RemoveSource(cur_src, true, false);
 		}
 	}
 
@@ -2366,10 +2519,10 @@
 
 	/* eMule 0.30c implementation, i give it a try (Creteil) BEGIN ... */
 	// 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++->GetClient();
-			if ( cur_src->DeleteFileRequest( this ) ) {
+	if (!m_A4AFsrclist.empty()) {
+		for (SourceSet::iterator it = m_A4AFsrclist.begin(); it != m_A4AFsrclist.end();) {
+			CUpDownClient *cur_src = it++->GetClient();
+			if (cur_src->DeleteFileRequest(this)) {
 				Notify_SourceCtrlRemoveSource(cur_src->ECID(), this);
 			}
 		}
@@ -2379,18 +2532,20 @@
 	UpdateFileRatingCommentAvail();
 }
 
-
 void CPartFile::Delete()
 {
 	AddLogLineN(CFormat(_("Deleting file: %s")) % GetFileName());
-	// Notify every subscriber that holds a raw CKnownFile* / CPartFile*
-	// to this object — list ctrls, comment dialogs, file-detail dialog,
-	// AICH static request list, write/hash threads, and on amulegui
-	// the CUpDownClient::m_uploadingfile / m_reqfile fields. Subscribers
-	// strip their references using pointer-value comparison only (this
-	// object is still live when the notify fires; by the time main-
-	// thread queued subscribers run, this object may already have been
-	// freed). See MuleNotify::KnownFileBeingDestroyed (GuiEvents.cpp).
+
+	// This function ends in `delete this`, so the object is already on its way out: set the
+	// same gate ~CPartFile uses, so FlushBuffer cannot enqueue further hash jobs (or
+	// re-share the file) while we tear it down below.
+	m_inDestructor = true;
+	// Notify every subscriber that holds a raw CKnownFile* / CPartFile* to this object --
+	// list ctrls, comment dialogs, the file-detail dialog, the AICH static request list, the
+	// write/hash threads, and on amulegui the CUpDownClient::m_uploadingfile / m_reqfile
+	// fields. Subscribers strip their references using pointer-value comparison only: this
+	// object is still live when the notify fires, but by the time queued main-thread
+	// subscribers run it may already have been freed.
 	Notify_KnownFileBeingDestroyed(this);
 	// Barry - Need to tell any connected clients to stop sending the file
 	StopFile(true);
@@ -2411,9 +2566,29 @@
 		theApp->canceledfiles->Save();
 	}
 	AddDebugLogLineN(logPartFile, "\tAdded to canceled file list");
-	theApp->searchlist->UpdateSearchFileByHash(GetFileHash());	// Update file in the search dialog if it's still open
+	theApp->searchlist->UpdateSearchFileByHash(
+		GetFileHash()); // Update file in the search dialog if it's still open
 
+	// Wait for any in-flight HashJob targeting this file before closing the handle and
+	// unlinking the .part below. CPartFileHashThread reads m_hpartfile inside
+	// HashSinglePart; pulling the file out from under it crashes the worker.
+	//
+	// ~CPartFile performs the same wait, but only from the `delete this` at the end of this
+	// function -- after the close and the unlink, far too late to help. The enqueue gate was
+	// set at the top, so the count only falls here.
+	if (m_pendingHashes > 0) {
+		AddDebugLogLineN(logPartFile,
+			CFormat("Delete() waiting for %d pending hash job(s) of '%s'") %
+				(int)m_pendingHashes % GetFileName());
+		while (m_pendingHashes > 0) {
+			wxMilliSleep(10);
+		}
+	}
+
+	// Same reasoning as PerformFileComplete: the upload reader holds
+	// m_hpartfileMutex around its Seek+Read, so the close takes it too.
 	if (m_hpartfile.IsOpened()) {
+		std::lock_guard<std::mutex> lock(m_hpartfileMutex);
 		m_hpartfile.Close();
 	}
 
@@ -2456,16 +2631,18 @@
 	delete this;
 }
 
-
 bool CPartFile::HashSinglePart(uint16 partnumber)
 {
 	if ((GetHashCount() <= partnumber) && (GetPartCount() > 1)) {
-		AddLogLineC(CFormat( _("WARNING: Unable to hash downloaded part - hashset incomplete for '%s'") )
-				% GetFileName() );
+		AddLogLineC(
+			CFormat(_("WARNING: Unable to hash downloaded part - hashset incomplete for '%s'")) %
+			GetFileName());
 		m_hashsetneeded = true;
 		return true;
 	} else if ((GetHashCount() <= partnumber) && GetPartCount() != 1) {
-		AddLogLineC(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 {
@@ -2473,46 +2650,51 @@
 		uint64 offset = PARTSIZE * partnumber;
 		uint32 length = GetPartSize(partnumber);
 
-		// Drift defense: gap-tracking advances on receive, but bytes
-		// only hit disk via the buffered write path; a write failure
-		// (ENOSPC, EIO, transient I/O error) followed by a SavePartFile
-		// and an unclean shutdown leaves the .met persisted with the
-		// optimistic gap state, while the partfile is shorter than
-		// the gap-list claims. Reading past EOF would throw and trip
-		// PS_ERROR, requiring manual recovery (truncate -s <fullsize>).
-		// Detect the divergence pre-read and reopen the gap so the
-		// missing bytes are re-fetched cleanly. Also covers external
-		// truncation, partial backup restore, and FS corruption.
+		// Drift defence: gap-tracking advances on receive, but bytes only hit disk via the
+		// buffered write path. A write failure (ENOSPC, EIO, a transient I/O error) followed
+		// by a SavePartFile and an unclean shutdown leaves the .met persisted with the
+		// optimistic gap state while the partfile is shorter than the gap list claims --
+		// reading past EOF then throws and trips PS_ERROR, requiring manual recovery. Detect
+		// the divergence pre-read and reopen the gap so the missing bytes are re-fetched. Also
+		// covers external truncation, a partial backup restore, and FS corruption.
 		const uint64 partfileLen = m_hpartfile.GetLength();
 		if (partfileLen < offset + length) {
-			AddLogLineC(CFormat(_(
-				"Part %u of '%s' marked complete but partfile is shorter than expected "
-				"(have %llu bytes, need %llu); reopening gap for re-download."))
-				% partnumber % GetFileName()
-				% (unsigned long long)partfileLen
-				% (unsigned long long)(offset + length));
+			AddLogLineC(
+				CFormat(_("Part %u of '%s' marked complete but partfile is shorter than "
+					  "expected "
+					  "(have %llu bytes, need %llu); reopening gap for re-download.")) %
+				partnumber % GetFileName() % (unsigned long long)partfileLen %
+				(unsigned long long)(offset + length));
 			AddGap(offset, offset + length - 1);
 			return false;
 		}
 
 		try {
 			CreateHashFromFile(m_hpartfile, offset, length, &hashresult, NULL);
-		} catch (const CIOFailureException& e) {
-			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());
+		} catch (const CIOFailureException &e) {
+			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;
-		} catch (const CEOFException& e) {
-			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());
+		} catch (const CEOFException &e) {
+			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)) {
-				AddDebugLogLineN(logPartFile, CFormat( "%s: Expected hash of part %d: %s") % GetFileName() % partnumber % GetPartHash(partnumber).Encode() );
-				AddDebugLogLineN(logPartFile, CFormat( "%s: Actual   hash of part %d: %s") % GetFileName() % partnumber % hashresult.Encode() );
+				AddDebugLogLineN(logPartFile,
+					CFormat("%s: Expected hash of part %d: %s") % GetFileName() %
+						partnumber % GetPartHash(partnumber).Encode());
+				AddDebugLogLineN(logPartFile,
+					CFormat("%s: Actual   hash of part %d: %s") % GetFileName() %
+						partnumber % hashresult.Encode());
 				return false;
 			} else {
 				return true;
@@ -2525,31 +2707,28 @@
 			}
 		}
 	}
-
 }
 
 bool CPartFile::IsCorruptedPart(uint16 partnumber)
 {
-	return std::find(m_corrupted_list.begin(), m_corrupted_list.end(), partnumber)
-		!= m_corrupted_list.end();
+	return std::find(m_corrupted_list.begin(), m_corrupted_list.end(), partnumber) !=
+	       m_corrupted_list.end();
 }
 
-
-void CPartFile::SetDownPriority(uint8 np, bool bSave, bool bRefresh )
+void CPartFile::SetDownPriority(uint8 np, bool bSave, bool bRefresh)
 {
-	if ( m_iDownPriority != np ) {
+	if (m_iDownPriority != np) {
 		m_iDownPriority = np;
 		MarkMetDirty();
 		// EC exports the priority value via EC_TAG_PARTFILE_PRIO.
 		MarkECChanged();
-		if ( bRefresh )
+		if (bRefresh)
 			UpdateDisplayedInfo(true);
-		if ( bSave )
+		if (bSave)
 			SavePartFile();
 	}
 }
 
-
 bool CPartFile::HasPendingHashWork() const
 {
 	if (m_iWrites > 0) {
@@ -2560,29 +2739,25 @@
 			return true;
 		}
 	}
-	// Completion-pending: gaplist is closed and the file is in active
-	// state but writes haven't all been harvested yet — keep firing
-	// FlushBuffer at Process tick rate so the trailing CompleteFile
-	// check runs once the worker thread drains. Without this, a slow
-	// worker that completes the gap-closing write after the last
-	// FlushBuffer would leave us waiting for BUFFER_TIME_LIMIT (60 s).
-	if (m_gaplist.IsComplete()
-		&& (status == PS_EMPTY || status == PS_READY)
-		&& !m_BufferedData_list.empty()) {
+	// Completion-pending: the gaplist is closed and the file is in an active state but
+	// writes have not all been harvested yet -- keep firing FlushBuffer at Process tick rate
+	// so the trailing CompleteFile check runs once the worker drains. Without this, a slow
+	// worker that completes the gap-closing write after the last FlushBuffer would leave us
+	// waiting 60 s.
+	if (m_gaplist.IsComplete() && (status == PS_EMPTY || status == PS_READY) &&
+		!m_BufferedData_list.empty()) {
 		return true;
 	}
 	return false;
 }
 
-
 void CPartFile::StopFile(bool bCancel)
 {
 	// Kry - Need to set it here to get into SetStatus(status) correctly
 	m_stopped = true;
-	// EC exports IsStopped() via EC_TAG_PARTFILE_STOPPED. Process() is
-	// gated to PS_READY/PS_EMPTY (see DownloadQueue::Process), so a
-	// stopped partfile no longer auto-marks each tick — the user action
-	// must mark explicitly or amulegui/amuleweb never see the new state.
+	// EC exports IsStopped() via EC_TAG_PARTFILE_STOPPED. Process() is gated to
+	// PS_READY/PS_EMPTY, so a stopped partfile no longer auto-marks each tick -- the user
+	// action must mark explicitly or remote clients never see it.
 	MarkECChanged();
 
 	// Barry - Need to tell any connected clients to stop sending the file
@@ -2602,32 +2777,30 @@
 	UpdateDisplayedInfo(true);
 }
 
-
 void CPartFile::StopPausedFile()
 {
 	if (!IsStopped()) {
 		// Once an hour, remove any sources for files which are no longer active downloads
 		switch (GetStatus()) {
-			case PS_PAUSED:
-			case PS_INSUFFICIENT:
-			case PS_ERROR:
-				if (time(NULL) - m_iLastPausePurge > (60*60)) {
-					m_iLastPausePurge = time(NULL);
-					StopFile();
-				}
-				kBpsDown = 0.0;
+		case PS_PAUSED:
+		case PS_INSUFFICIENT:
+		case PS_ERROR:
+			if (time(NULL) - m_iLastPausePurge > (60 * 60)) {
+				m_iLastPausePurge = time(NULL);
+				StopFile();
+			}
+			kBpsDown = 0.0;
 		}
 	}
 	// release file handle if unused for some time
 	m_hpartfile.Release();
 }
 
-
 void CPartFile::PauseFile(bool bInsufficient)
 {
 	SetActive(false);
 
-	if ( status == PS_COMPLETE || status == PS_COMPLETING ) {
+	if (status == PS_COMPLETE || status == PS_COMPLETING) {
 		return;
 	}
 
@@ -2641,15 +2814,16 @@
 
 	theApp->downloadqueue->RemoveLocalServerRequest(this);
 
-	CPacket packet( OP_CANCELTRANSFER, 0, OP_EDONKEYPROT );
-	for( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ) {
-		CUpDownClient* cur_src = it++->GetClient();
+	CPacket packet(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
+	for (SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end();) {
+		CUpDownClient *cur_src = it++->GetClient();
 		if (cur_src->GetDownloadState() == DS_DOWNLOADING) {
 			if (!cur_src->GetSentCancelTransfer()) {
-				theStats::AddUpOverheadOther( packet.GetPacketSize() );
-				AddDebugLogLineN( logLocalClient, "Local Client: OP_CANCELTRANSFER to " + cur_src->GetFullIP() );
-				cur_src->SendPacket( &packet, false, true );
-				cur_src->SetSentCancelTransfer( true );
+				theStats::AddUpOverheadOther(packet.GetPacketSize());
+				AddDebugLogLineN(logLocalClient,
+					"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
@@ -2657,7 +2831,6 @@
 		}
 	}
 
-
 	m_insufficient = bInsufficient;
 	if (!m_paused) {
 		MarkMetDirty();
@@ -2666,30 +2839,27 @@
 	}
 	m_paused = true;
 
-
 	kBpsDown = 0.0;
 	transferingsrc = 0;
 
 	SetStatus(status);
 }
 
-
 void CPartFile::ResumeFile()
 {
-	if ( status == PS_COMPLETE || status == PS_COMPLETING ) {
+	if (status == PS_COMPLETE || status == PS_COMPLETING) {
 		return;
 	}
 
-	if ( m_insufficient && !CheckFreeDiskSpace() ) {
+	if (m_insufficient && !CheckFreeDiskSpace()) {
 		// Still not enough free discspace
 		return;
 	}
 
 	if (m_paused) {
 		MarkMetDirty();
-		// EC exports IsStopped() / GetStatus(); Process() resumes
-		// auto-marking after we leave the paused state but the
-		// transition itself needs to be visible immediately.
+		// EC exports IsStopped() / GetStatus(); Process() resumes auto-marking after we leave
+		// the paused state but the transition itself needs to be visible immediately.
 		MarkECChanged();
 	}
 	m_paused = false;
@@ -2708,8 +2878,7 @@
 	UpdateDisplayedInfo(true);
 }
 
-
-bool CPartFile::CheckFreeDiskSpace( uint64 neededSpace )
+bool CPartFile::CheckFreeDiskSpace(uint64 neededSpace)
 {
 	uint64 free = CPath::GetFreeSpaceAt(GetFilePath());
 	if (free == static_cast<uint64>(wxInvalidOffset)) {
@@ -2718,27 +2887,24 @@
 	}
 
 	// The very least acceptable diskspace is a single PART
-	if ( free < PARTSIZE ) {
+	if (free < PARTSIZE) {
 		// Always fail in this case, since we risk losing data if we try to
 		// write on a full partition.
 		return false;
 	}
 
 	// All other checks are only made if the user has enabled them
-	if ( thePrefs::IsCheckDiskspaceEnabled() ) {
+	if (thePrefs::IsCheckDiskspaceEnabled()) {
 		neededSpace += thePrefs::GetMinFreeDiskSpace();
 
-		// Due to the the existence of sparse files, we cannot assume that
-		// writes within the file doesn't cause new blocks to be allocated.
-		// Therefore, we have to simply stop writing the moment the limit has
-		// been exceeded.
+		// Sparse files mean a write within the file can still allocate new blocks,
+		// so the only safe rule is to stop writing the moment the limit is exceeded.
 		return free >= neededSpace;
 	}
 
 	return true;
 }
 
-
 void CPartFile::SetLastAnsweredTime()
 {
 	m_ClientSrcAnswered = ::GetTickCount64();
@@ -2749,19 +2915,20 @@
 	m_ClientSrcAnswered = 2 * CONNECTION_LATENCY + ::GetTickCount64() - SOURCECLIENTREASKS;
 }
 
-CPacket *CPartFile::CreateSrcInfoPacket(const CUpDownClient* forClient, uint8 byRequestedVersion, uint16 nRequestedOptions)
+CPacket *CPartFile::CreateSrcInfoPacket(
+	const CUpDownClient *forClient, uint8 byRequestedVersion, uint16 nRequestedOptions)
 {
 
-	if ( m_SrcList.empty() ) {
+	if (m_SrcList.empty()) {
 		return NULL;
 	}
 
-	if(!IsPartFile())  {
+	if (!IsPartFile()) {
 		return CKnownFile::CreateSrcInfoPacket(forClient, byRequestedVersion, nRequestedOptions);
 	}
 
-	if (((forClient->GetRequestFile() != this)
-		&& (forClient->GetUploadFile() != this)) || forClient->GetUploadFileID() != GetFileHash()) {
+	if (((forClient->GetRequestFile() != this) && (forClient->GetUploadFile() != this)) ||
+		forClient->GetUploadFileID() != GetFileHash()) {
 		wxString file1 = _("Unknown");
 		if (forClient->GetRequestFile() && forClient->GetRequestFile()->GetFileName().IsOk()) {
 			file1 = forClient->GetRequestFile()->GetFileName().GetPrintable();
@@ -2772,22 +2939,26 @@
 		if (GetFileName().IsOk()) {
 			file2 = GetFileName().GetPrintable();
 		}
-		AddDebugLogLineN(logPartFile, "File mismatch on source packet (P) Sending: " + file1 + "  From: " + file2);
+		AddDebugLogLineN(logPartFile,
+			"File mismatch on source packet (P) Sending: " + file1 + "  From: " + file2);
 		return NULL;
 	}
 
-	if ( !(GetStatus() == PS_READY || GetStatus() == PS_EMPTY)) {
+	if (!(GetStatus() == PS_READY || GetStatus() == PS_EMPTY)) {
 		return NULL;
 	}
 
-	const BitVector& reqstatus = forClient->GetPartStatus();
+	const BitVector &reqstatus = forClient->GetPartStatus();
 	bool KnowNeededParts = !reqstatus.empty();
-	//wxASSERT(rcvstatus.size() == GetPartCount()); // Obviously!
+	// wxASSERT(rcvstatus.size() == GetPartCount()); // Obviously!
 	if (KnowNeededParts && (reqstatus.size() != GetPartCount())) {
 		// Yuck. Same file but different part count? Seriously fucked up.
 		// This happens rather often with reqstatus.size() == 0. Don't log then.
 		if (reqstatus.size()) {
-			AddDebugLogLineN(logKnownFiles, CFormat("Impossible situation: different partcounts: %i (client) and %i (file) for %s") % reqstatus.size() % GetPartCount() % GetFileName());
+			AddDebugLogLineN(logKnownFiles,
+				CFormat("Impossible situation: different partcounts: %i (client) and %i "
+					"(file) for %s") %
+					reqstatus.size() % GetPartCount() % GetFileName());
 		}
 		return NULL;
 	}
@@ -2796,7 +2967,7 @@
 
 	uint8 byUsedVersion;
 	bool bIsSX2Packet;
-	if (forClient->SupportsSourceExchange2() && byRequestedVersion > 0){
+	if (forClient->SupportsSourceExchange2() && byRequestedVersion > 0) {
 		// the client uses SourceExchange2 and requested the highest version he knows
 		// and we send the highest version we know, but of course not higher than his request
 		byUsedVersion = std::min(byRequestedVersion, (uint8)SOURCEEXCHANGE2_VERSION);
@@ -2805,13 +2976,16 @@
 
 		// we don't support any special SX2 options yet, reserved for later use
 		if (nRequestedOptions != 0) {
-			AddDebugLogLineN(logKnownFiles, CFormat("Client requested unknown options for SourceExchange2: %u") % nRequestedOptions);
+			AddDebugLogLineN(logKnownFiles,
+				CFormat("Client requested unknown options for SourceExchange2: %u") %
+					nRequestedOptions);
 		}
 	} else {
 		byUsedVersion = forClient->GetSourceExchange1Version();
 		bIsSX2Packet = false;
 		if (forClient->SupportsSourceExchange2()) {
-			AddDebugLogLineN(logKnownFiles, "Client which announced to support SX2 sent SX1 packet instead");
+			AddDebugLogLineN(logKnownFiles,
+				"Client which announced to support SX2 sent SX1 packet instead");
 		}
 	}
 
@@ -2820,25 +2994,26 @@
 	data.WriteHash(m_abyFileHash);
 	data.WriteUInt16(nCount);
 	bool bNeeded;
-	for (SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it ) {
+	for (SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it) {
 		bNeeded = false;
-		CUpDownClient* cur_src = it->GetClient();
+		CUpDownClient *cur_src = it->GetClient();
 
 		int state = cur_src->GetDownloadState();
-		int valid = ( state == DS_DOWNLOADING ) || ( state == DS_ONQUEUE && !cur_src->IsRemoteQueueFull() );
+		int valid =
+			(state == DS_DOWNLOADING) || (state == DS_ONQUEUE && !cur_src->IsRemoteQueueFull());
 
-		if ( cur_src->HasLowID() || !valid ) {
+		if (cur_src->HasLowID() || !valid) {
 			continue;
 		}
 
 		// only send source which have needed parts for this client if possible
-		const BitVector& srcstatus = cur_src->GetPartStatus();
-		if ( !srcstatus.empty() ) {
-			//wxASSERT(srcstatus.size() == GetPartCount()); // Obviously!
+		const BitVector &srcstatus = cur_src->GetPartStatus();
+		if (!srcstatus.empty()) {
+			// wxASSERT(srcstatus.size() == GetPartCount()); // Obviously!
 			if (srcstatus.size() != GetPartCount()) {
 				continue;
 			}
-			if ( KnowNeededParts ) {
+			if (KnowNeededParts) {
 				// only send sources which have needed parts for this client
 				for (int x = 0; x < GetPartCount(); ++x) {
 					if (srcstatus.get(x) && !reqstatus.get(x)) {
@@ -2847,13 +3022,13 @@
 					}
 				}
 			} else {
-				// if we don't know the need parts for this client,
-				// return any source currently a client sends it's
-				// file status only after it has at least one complete part
+				// If we do not know the needed parts for this client, return any source: a
+				// client sends its file status only after it has at least one complete
+				// part.
 				if (srcstatus.size() != GetPartCount()) {
 					continue;
 				}
-				for (int x = 0; x < GetPartCount(); ++x){
+				for (int x = 0; x < GetPartCount(); ++x) {
 					if (srcstatus.get(x)) {
 						bNeeded = true;
 						break;
@@ -2861,10 +3036,10 @@
 				}
 			}
 		}
-		if(bNeeded) {
+		if (bNeeded) {
 			++nCount;
 			uint32 dwID;
-			if(forClient->GetSourceExchange1Version() > 2) {
+			if (forClient->GetSourceExchange1Version() > 2) {
 				dwID = cur_src->GetUserIDHybrid();
 			} else {
 				dwID = wxUINT32_SWAP_ALWAYS(cur_src->GetUserIDHybrid());
@@ -2875,19 +3050,21 @@
 			data.WriteUInt16(cur_src->GetServerPort());
 
 			if (byUsedVersion >= 2) {
-			    data.WriteHash(cur_src->GetUserHash());
+				data.WriteHash(cur_src->GetUserHash());
 			}
 
-			if (byUsedVersion >= 4){
+			if (byUsedVersion >= 4) {
 				// CryptSettings - SourceExchange V4
 				// 5 Reserved (!)
 				// 1 CryptLayer Required
 				// 1 CryptLayer Requested
 				// 1 CryptLayer Supported
-				const uint8 uSupportsCryptLayer	= cur_src->SupportsCryptLayer() ? 1 : 0;
-				const uint8 uRequestsCryptLayer	= cur_src->RequestsCryptLayer() ? 1 : 0;
-				const uint8 uRequiresCryptLayer	= cur_src->RequiresCryptLayer() ? 1 : 0;
-				const uint8 byCryptOptions = (uRequiresCryptLayer << 2) | (uRequestsCryptLayer << 1) | (uSupportsCryptLayer << 0);
+				const uint8 uSupportsCryptLayer = cur_src->SupportsCryptLayer() ? 1 : 0;
+				const uint8 uRequestsCryptLayer = cur_src->RequestsCryptLayer() ? 1 : 0;
+				const uint8 uRequiresCryptLayer = cur_src->RequiresCryptLayer() ? 1 : 0;
+				const uint8 byCryptOptions = (uRequiresCryptLayer << 2) |
+							     (uRequestsCryptLayer << 1) |
+							     (uSupportsCryptLayer << 0);
 				data.WriteUInt8(byCryptOptions);
 			}
 
@@ -2902,7 +3079,8 @@
 	data.Seek(bIsSX2Packet ? 17 : 16, wxFromStart);
 	data.WriteUInt16(nCount);
 
-	CPacket* result = new CPacket(data, OP_EMULEPROT, bIsSX2Packet ? OP_ANSWERSOURCES2 : OP_ANSWERSOURCES);
+	CPacket *result =
+		new CPacket(data, OP_EMULEPROT, bIsSX2Packet ? OP_ANSWERSOURCES2 : OP_ANSWERSOURCES);
 
 	// 16+2+501*(4+2+4+2+16) = 14046 bytes max.
 	if (result->GetPacketSize() > 354) {
@@ -2912,7 +3090,11 @@
 	return result;
 }
 
-void CPartFile::AddClientSources(CMemFile* sources, unsigned nSourceFrom, uint8 uClientSXVersion, bool bSourceExchange2, const CUpDownClient* /*pClient*/)
+void CPartFile::AddClientSources(CMemFile *sources,
+	unsigned nSourceFrom,
+	uint8 uClientSXVersion,
+	bool bSourceExchange2,
+	const CUpDownClient * /*pClient*/)
 {
 	// Kad reviewed
 
@@ -2925,17 +3107,19 @@
 	if (!bSourceExchange2) {
 		nCount = sources->ReadUInt16();
 
-		// Check if the data size matches the 'nCount' for v1 or v2 and eventually correct the source
-		// exchange version while reading the packet data. Otherwise we could experience a higher
-		// chance in dealing with wrong source data, userhashs and finally duplicate sources.
+		// Check if the data size matches the 'nCount' for v1 or v2 and eventually correct the
+		// source exchange version while reading the packet data. Otherwise we could experience
+		// a higher chance of wrong source data, userhashes and finally duplicate sources.
 		uint32 uDataSize = sources->GetLength() - sources->GetPosition();
 
-		if ((uint32)(nCount*(4+2+4+2)) == uDataSize) { //Checks if version 1 packet is correct size
-			if(uClientSXVersion != 1) {
+		if ((uint32)(nCount * (4 + 2 + 4 + 2)) ==
+			uDataSize) { // Checks if version 1 packet is correct size
+			if (uClientSXVersion != 1) {
 				return;
 			}
 			uPacketSXVersion = 1;
-		} else if ((uint32)(nCount*(4+2+4+2+16)) == uDataSize) { // Checks if version 2&3 packet is correct size
+		} else if ((uint32)(nCount * (4 + 2 + 4 + 2 + 16)) ==
+			   uDataSize) { // Checks if version 2&3 packet is correct size
 			if (uClientSXVersion == 2) {
 				uPacketSXVersion = 2;
 			} else if (uClientSXVersion > 2) {
@@ -2943,47 +3127,53 @@
 			} else {
 				return;
 			}
-		} else if (nCount*(4+2+4+2+16+1) == uDataSize) {
-			if (uClientSXVersion != 4 ) {
+		} else if (nCount * (4 + 2 + 4 + 2 + 16 + 1) == uDataSize) {
+			if (uClientSXVersion != 4) {
 				return;
 			}
 			uPacketSXVersion = 4;
 		} else {
-			// 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.
-			AddDebugLogLineN(logClient, CFormat("Received invalid source exchange packet (v%u) of data size %u for %s") % uClientSXVersion % uDataSize % GetFileName());
+			// 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.
+			AddDebugLogLineN(logClient,
+				CFormat("Received invalid source exchange packet (v%u) of data size %u for "
+					"%s") %
+					uClientSXVersion % uDataSize % GetFileName());
 			return;
 		}
 	} else {
-		// for SX2:
-		// 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, since it can't be a "misunderstanding" anymore
-		if (uClientSXVersion > SOURCEEXCHANGE2_VERSION || uClientSXVersion == 0 ){
-			AddDebugLogLineN(logPartFile, CFormat("Invalid source exchange type version: %i") % uClientSXVersion);
+		// For SX2: we only check that the version is known to us and do a quick sanitize
+		// check on a known version. Other than SX1, the packet is ignored if any error
+		// appears, since it cannot be a "misunderstanding" any more.
+		if (uClientSXVersion > SOURCEEXCHANGE2_VERSION || uClientSXVersion == 0) {
+			AddDebugLogLineN(logPartFile,
+				CFormat("Invalid source exchange type version: %i") % uClientSXVersion);
 			return;
 		}
 
-		// all known versions use the first 2 bytes as count and unknown version are already filtered above
+		// all known versions use the first 2 bytes as count and unknown version are already filtered
+		// above
 		nCount = sources->ReadUInt16();
 		uint32 uDataSize = (uint32)(sources->GetLength() - sources->GetPosition());
 		bool bError = false;
-		switch (uClientSXVersion){
-			case 1:
-				bError = nCount*(4+2+4+2) != uDataSize;
-				break;
-			case 2:
-			case 3:
-				bError = nCount*(4+2+4+2+16) != uDataSize;
-				break;
-			case 4:
-				bError = nCount*(4+2+4+2+16+1) != uDataSize;
-				break;
-			default:
-				wxFAIL;
+		switch (uClientSXVersion) {
+		case 1:
+			bError = nCount * (4 + 2 + 4 + 2) != uDataSize;
+			break;
+		case 2:
+		case 3:
+			bError = nCount * (4 + 2 + 4 + 2 + 16) != uDataSize;
+			break;
+		case 4:
+			bError = nCount * (4 + 2 + 4 + 2 + 16 + 1) != uDataSize;
+			break;
+		default:
+			wxFAIL;
 		}
 
-		if (bError){
+		if (bError) {
 			wxFAIL;
 			AddDebugLogLineN(logPartFile, "Invalid source exchange data size.");
 			return;
@@ -2991,7 +3181,7 @@
 		uPacketSXVersion = uClientSXVersion;
 	}
 
-	for (uint16 i = 0;i != nCount;++i) {
+	for (uint16 i = 0; i != nCount; ++i) {
 
 		uint32 dwID = sources->ReadUInt32();
 		uint16 nPort = sources->ReadUInt16();
@@ -3008,7 +3198,8 @@
 			byCryptOptions = sources->ReadUInt8();
 		}
 
-		//Clients send ID's the the Hyrbid format so highID clients with *.*.*.0 won't be falsely switched to a lowID..
+		// Clients send ID's the the Hyrbid format so highID clients with *.*.*.0 won't be falsely
+		// switched to a lowID..
 		uint32 dwIDED2K;
 		if (uPacketSXVersion >= 3) {
 			dwIDED2K = wxUINT32_SWAP_ALWAYS(dwID);
@@ -3020,26 +3211,33 @@
 		if (!IsLowID(dwID)) {
 			if (!IsGoodIP(dwIDED2K, thePrefs::FilterLanIPs())) {
 				// check for 0-IP, localhost and optionally for LAN addresses
-				AddDebugLogLineN(logIPFilter, CFormat("Ignored source (IP=%s) received via %s - bad IP") % Uint32toStringIP(dwIDED2K) % OriginToText(nSourceFrom));
+				AddDebugLogLineN(logIPFilter,
+					CFormat("Ignored source (IP=%s) received via %s - bad IP") %
+						Uint32toStringIP(dwIDED2K) % OriginToText(nSourceFrom));
 				continue;
 			}
 			if (theApp->ipfilter->IsFiltered(dwIDED2K)) {
-				AddDebugLogLineN(logIPFilter, CFormat("Ignored source (IP=%s) received via %s - IPFilter") % Uint32toStringIP(dwIDED2K) % OriginToText(nSourceFrom));
+				AddDebugLogLineN(logIPFilter,
+					CFormat("Ignored source (IP=%s) received via %s - IPFilter") %
+						Uint32toStringIP(dwIDED2K) % OriginToText(nSourceFrom));
 				continue;
 			}
-			if (theApp->clientlist->IsBannedClient(dwIDED2K)){
+			if (theApp->clientlist->IsBannedClient(dwIDED2K)) {
 				continue;
 			}
 		}
 
 		// additionally check for LowID and own IP
 		if (!CanAddSource(dwID, nPort, dwServerIP, nServerPort, NULL, false)) {
-			AddDebugLogLineN(logIPFilter, CFormat("Ignored source (IP=%s) received via source exchange") % Uint32toStringIP(dwIDED2K));
+			AddDebugLogLineN(logIPFilter,
+				CFormat("Ignored source (IP=%s) received via source exchange") %
+					Uint32toStringIP(dwIDED2K));
 			continue;
 		}
 
-		if(thePrefs::GetMaxSourcePerFile() > GetSourceCount()) {
-			CUpDownClient* newsource = new CUpDownClient(nPort,dwID,dwServerIP,nServerPort,this, (uPacketSXVersion < 3), true);
+		if (thePrefs::GetMaxSourcePerFile() > GetSourceCount()) {
+			CUpDownClient *newsource = new CUpDownClient(
+				nPort, dwID, dwServerIP, nServerPort, this, (uPacketSXVersion < 3), true);
 			if (uPacketSXVersion > 1) {
 				newsource->SetUserHash(userHash);
 			}
@@ -3049,9 +3247,9 @@
 			}
 
 			newsource->SetSourceFrom((ESourceFrom)nSourceFrom);
-			theApp->downloadqueue->CheckAndAddSource(this,newsource);
+			theApp->downloadqueue->CheckAndAddSource(this, newsource);
 
-	} else {
+		} else {
 			break;
 		}
 	}
@@ -3063,13 +3261,13 @@
 		return;
 	}
 	if (GetSourceCount() <= theApp->downloadqueue->GetRareFileThreshold()) {
-		if ( GetDownPriority() != PR_HIGH )
+		if (GetDownPriority() != PR_HIGH)
 			SetDownPriority(PR_HIGH, false, false);
 	} else if (GetSourceCount() < theApp->downloadqueue->GetCommonFileThreshold()) {
-		if ( GetDownPriority() != PR_NORMAL )
+		if (GetDownPriority() != PR_NORMAL)
 			SetDownPriority(PR_NORMAL, false, false);
 	} else {
-		if ( GetDownPriority() != PR_LOW )
+		if (GetDownPriority() != PR_LOW)
 			SetDownPriority(PR_LOW, false, false);
 	}
 }
@@ -3079,50 +3277,47 @@
 
 int CPartFile::GetCommonFilePenalty()
 {
-	//TODO: implement, but never return less than MINCOMMONPENALTY!
+	// TODO: implement, but never return less than MINCOMMONPENALTY!
 	return MINCOMMONPENALTY;
 }
 
 /* Barry - Replaces BlockReceived()
 
-	Originally this only wrote to disk when a full 180k block
-	had been received from a client, and only asked for data in
-	180k blocks.
-
-	This meant that on average 90k was lost for every connection
-	to a client data source. That is a lot of wasted data.
-
-	To reduce the lost data, packets are now written to a buffer
-	and flushed to disk regularly regardless of size downloaded.
-	This includes compressed packets.
-
-	Data is also requested only where gaps are, not in 180k blocks.
-	The requests will still not exceed 180k, but may be smaller to
-	fill a gap.
+   Originally this only wrote to disk when a full 180k block had been received from a
+   client, and only asked for data in 180k blocks. That meant about 90k was lost for
+   every connection to a client data source -- a lot of wasted data.
+
+   To reduce it, packets are now written to a buffer and flushed to disk regularly
+   regardless of size downloaded, compressed packets included. Data is also requested
+   only where gaps are, not in 180k blocks: the requests still do not exceed 180k, but
+   may be smaller to fill a gap.
 */
 
-// 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, uint8_t* data, uint64 start, uint64 end, Requested_Block_Struct *block, const CUpDownClient* client)
+// Kry - transize is 32bits, no packet can be more than that (this is the compressed
+// size). Even 32bits is too much imho. As for the return size, look at lenData below.
+uint32 CPartFile::WriteToBuffer(uint32 transize,
+	uint8_t *data,
+	uint64 start,
+	uint64 end,
+	Requested_Block_Struct *block,
+	const CUpDownClient *client)
 {
 	// Increment transferred bytes counter for this file
 	transferred += transize;
 
-	// This is needed a few times
-	// Kry - should not need a uint64 here - no block is larger than
-	// 2GB even after uncompressed.
-	uint32 lenData = (uint32) (end - start + 1);
+	// This is needed a few times. Kry - should not need a uint64 here: no block is larger
+	// than 2GB even after uncompressing.
+	uint32 lenData = (uint32)(end - start + 1);
 
-	if(lenData > transize) {
-		m_iGainDueToCompression += lenData-transize;
+	if (lenData > transize) {
+		m_iGainDueToCompression += lenData - transize;
 	}
 
 	// Occasionally packets are duplicated, no point writing it twice
 	if (IsComplete(start, end)) {
 		AddDebugLogLineN(logPartFile,
-			CFormat("File '%s' has already been written from %u to %u")
-				% GetFileName() % start % end);
+			CFormat("File '%s' has already been written from %u to %u") % GetFileName() % start %
+				end);
 		return 0;
 	}
 
@@ -3130,25 +3325,32 @@
 	const uint64 nStartChunk = start / PARTSIZE;
 	const uint64 nEndChunk = end / PARTSIZE;
 	if (IsComplete(nStartChunk)) {
-		AddDebugLogLineN(logPartFile, CFormat("Received data touches already hashed chunk - ignored (start): %u-%u; File=%s") % start % end % GetFileName());
+		AddDebugLogLineN(logPartFile,
+			CFormat("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("Received data touches already hashed chunk - ignored (end): %u-%u; File=%s") % start % end % GetFileName());
+			AddDebugLogLineN(logPartFile,
+				CFormat("Received data touches already hashed chunk - ignored (end): %u-%u; "
+					"File=%s") %
+					start % end % GetFileName());
 			return 0;
 		} else {
-			AddDebugLogLineN(logPartFile, CFormat("Received data crosses chunk boundaries: %u-%u; File=%s") % start % end % GetFileName());
+			AddDebugLogLineN(logPartFile,
+				CFormat("Received data crosses chunk boundaries: %u-%u; File=%s") % start %
+					end % GetFileName());
 		}
 	}
 
 	// log transferinformation in our "blackbox"
 	m_CorruptionBlackBox->TransferredData(start, end, client->GetIP());
 
-	// Stamp for FlushBuffer's Phase 3 quiescent guard, and for the
-	// download-list "Last Reception" column. The latter must stamp on
-	// real data arrival, not on every periodic FlushBuffer call, or
-	// idle/paused/stalled files will all read "now" and the column
-	// stops being useful for spotting hopeless downloads.
+	// Stamp for FlushBuffer's Phase 3 quiescent guard, and for the download-list "Last
+	// Reception" column. The latter must stamp on real data arrival, not on every periodic
+	// FlushBuffer call, or idle/paused/stalled files all read "now" and the column stops
+	// being useful.
 	m_nLastBlockReceivedTick = GetTickCount64();
 	m_lastDateChanged = wxDateTime::GetTimeNow();
 
@@ -3158,9 +3360,9 @@
 	// Add to the queue in the correct position (most likely the end)
 	bool added = false;
 
-	std::list<PartFileBufferedData*>::iterator it = m_BufferedData_list.begin();
+	std::list<PartFileBufferedData *>::iterator it = m_BufferedData_list.begin();
 	for (; it != m_BufferedData_list.end(); ++it) {
-		PartFileBufferedData* queueItem = *it;
+		PartFileBufferedData *queueItem = *it;
 
 		if (item->end <= queueItem->end) {
 			if (it != m_BufferedData_list.begin()) {
@@ -3186,7 +3388,7 @@
 	// Update the flushed mark on the requested block
 	// The loop here is unfortunate but necessary to detect deleted blocks.
 
-	std::list<Requested_Block_Struct*>::iterator it2 = m_requestedblocks_list.begin();
+	std::list<Requested_Block_Struct *>::iterator it2 = m_requestedblocks_list.begin();
 	for (; it2 != m_requestedblocks_list.end(); ++it2) {
 		if (*it2 == item->block) {
 			item->block->transferred += lenData;
@@ -3207,33 +3409,35 @@
 
 	uint32 partCount = GetPartCount();
 	// Persistent tracking of parts needing hash verification (eMule ref: m_aChangedPart).
-	// Survives across FlushBuffer() calls so parts written by the background thread
-	// get hashed once all writes are complete.
+	// Survives across FlushBuffer() calls so parts written by the background thread get
+	// hashed once all writes are complete.
 	if (m_aChangedPart.size() != partCount) {
 		m_aChangedPart.resize(partCount, false);
 	}
 
-	// No empty-buffer early-return: Phase 3 below still needs to run
-	// when m_aChangedPart has dirty entries left from earlier writes
-	// (e.g. paused/idle download). Phase 1+2 are no-ops on empty list.
+	// No empty-buffer early-return: Phase 3 below still needs to run when m_aChangedPart has
+	// dirty entries left from earlier writes (e.g. paused/idle download). Phase 1+2 are
+	// no-ops on an empty list.
 	if (!m_BufferedData_list.empty()) {
-		// Ensure file is big enough to write data to (the last item will be the furthest from the start)
+		// Ensure file is big enough to write data to (the last item will be the furthest from the
+		// start)
 		if (!CheckFreeDiskSpace(m_nTotalBufferData)) {
 			// Not enough free space to write the last item, bail
-			AddLogLineC(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 );
+			PauseFile(true);
 			return;
 		}
 	}
 
-	// eMule ref: PartFile.cpp:4102-4127 — Phase 1: queue PB_READY items to the write thread
-	CPartFileWriteThread* pThread = theApp->partFileWriteThread;
+	// eMule ref: PartFile.cpp:4102-4127 -- Phase 1: queue PB_READY items to the write thread
+	CPartFileWriteThread *pThread = theApp->partFileWriteThread;
 	if (pThread && pThread->IsRunning()) {
-		for (std::list<PartFileBufferedData*>::iterator it = m_BufferedData_list.begin();
-			 it != m_BufferedData_list.end(); ++it)
-		{
-			PartFileBufferedData* item = *it;
+		for (std::list<PartFileBufferedData *>::iterator it = m_BufferedData_list.begin();
+			it != m_BufferedData_list.end();
+			++it) {
+			PartFileBufferedData *item = *it;
 			if (item->flushed == PB_READY) {
 				item->flushed = PB_PENDING;
 				++m_iWrites;
@@ -3242,19 +3446,20 @@
 		}
 	}
 
-	// eMule ref: PartFile.cpp:4129-4145 — Phase 2: harvest completed writes
-	for (std::list<PartFileBufferedData*>::iterator it = m_BufferedData_list.begin();
-		 it != m_BufferedData_list.end(); )
-	{
-		PartFileBufferedData* item = *it;
+	// eMule ref: PartFile.cpp:4129-4145 -- Phase 2: harvest completed writes
+	for (std::list<PartFileBufferedData *>::iterator it = m_BufferedData_list.begin();
+		it != m_BufferedData_list.end();) {
+		PartFileBufferedData *item = *it;
 
 		switch (item->flushed) {
 		case PB_READY:
-			// Write thread not running — fall back to synchronous write
+			// Write thread not running -- fall back to synchronous write
 			{
 				wxASSERT((item->end - item->start) < 0xFFFFFFFF);
 				uint32 lenData = (uint32)(item->end - item->start + 1);
-				for (uint32 curpart = (item->start/PARTSIZE); curpart <= (item->end/PARTSIZE); ++curpart) {
+				for (uint32 curpart = (item->start / PARTSIZE);
+					curpart <= (item->end / PARTSIZE);
+					++curpart) {
 					wxASSERT(curpart < partCount);
 					m_aChangedPartcurpart = true;
 				}
@@ -3265,8 +3470,9 @@
 						item->area.FlushAt(m_hpartfile, item->start, lenData);
 					}
 					m_nTotalBufferData -= lenData;
-				} catch (const CIOFailureException& e) {
-					AddDebugLogLineC(logPartFile, "Error while saving part-file: " + e.what());
+				} catch (const CIOFailureException &e) {
+					AddDebugLogLineC(
+						logPartFile, "Error while saving part-file: " + e.what());
 					SetStatus(PS_ERROR);
 					DeleteContents(m_BufferedData_list);
 					m_nTotalBufferData = 0;
@@ -3279,22 +3485,24 @@
 			continue;
 
 		case PB_PENDING:
-			// Still in flight on the write thread — skip
+			// Still in flight on the write thread -- skip
 			++it;
 			continue;
 
 		case PB_ERROR:
-			// Write thread reported error — retry next time
+			// Write thread reported error -- retry next time
 			item->flushed = PB_READY;
 			AddDebugLogLineC(logPartFile, "Write thread reported error, will retry");
 			++it;
 			continue;
 
 		case PB_WRITTEN:
-			// Successfully written by the write thread — harvest
+			// Successfully written by the write thread -- harvest
 			{
 				uint32 lenData = (uint32)(item->end - item->start + 1);
-				for (uint32 curpart = (item->start/PARTSIZE); curpart <= (item->end/PARTSIZE); ++curpart) {
+				for (uint32 curpart = (item->start / PARTSIZE);
+					curpart <= (item->end / PARTSIZE);
+					++curpart) {
 					wxASSERT(curpart < partCount);
 					m_aChangedPartcurpart = true;
 				}
@@ -3307,7 +3515,6 @@
 		}
 	}
 
-
 	try {
 		// Partfile should never be too large. IsOpened() guard: StopPausedFile() Release()s
 		// the fd, and StopFile() reaches here via PauseFile -- GetLength() asserts on a closed fd.
@@ -3315,44 +3522,32 @@
 			// it's "last chance" correction. the real bugfix has to be applied 'somewhere' else
 			m_hpartfile.SetLength(GetFileSize());
 		}
-	} catch (const CIOFailureException& e) {
+	} catch (const CIOFailureException &e) {
 		AddDebugLogLineC(logPartFile,
-			CFormat("Error while truncating part-file (%s): %s")
-				% m_PartPath % e.what());
+			CFormat("Error while truncating part-file (%s): %s") % m_PartPath % e.what());
 		SetStatus(PS_ERROR);
 	}
 
-
-
-	// Destructor / shutdown gate (see m_inDestructor in PartFile.h).
-	// Hoisted above the m_iWrites check below so the first-share early
-	// path also respects it.
+	// Destructor / shutdown gate (see m_inDestructor in PartFile.h). Hoisted above the
+	// m_iWrites check below so the first-share early path also respects it.
 	if (m_inDestructor || !theApp || !theApp->IsRunning()) {
 		return;
 	}
 
-	// First-share early path (#761). SafeAddKFile fires from
-	// OnAsyncHashComplete and is gated on status == PS_EMPTY -- so it
-	// only ever runs once per partfile lifetime, when the first part
-	// is verified. The bulk-drain gates below (m_iWrites > 0 and the
-	// 1 s quiescent window) sit engaged across an entire active
-	// download, which means a continuously-downloading file never
-	// gets that first verification and stays invisible in "Shared
-	// files" until the user pauses or it completes. Bypass both gates
-	// to enqueue exactly one safe candidate.
+	// First-share early path. SafeAddKFile fires from OnAsyncHashComplete and is gated on
+	// status == PS_EMPTY, so it only ever runs once per partfile lifetime, when the first
+	// part is verified. The bulk-drain gates below (m_iWrites > 0 and the 1 s quiescent
+	// window) sit engaged across an entire active download, so a continuously-downloading
+	// file never gets that first verification and stays invisible in "Shared files" until
+	// the user pauses. Bypass both gates to enqueue exactly one safe candidate.
 	//
-	// Safety: m_aChangedPartN && IsComplete(N) means Phase 2 has
-	// already observed at least one PB_WRITTEN for N and the gaplist
-	// has no holes in N. But FillGap runs at queue time in
-	// WriteToBuffer (line 3160), so a queued PB_PENDING/PB_READY for
-	// the same part can still exist -- hashing then would read
-	// pre-write bytes. Scan m_BufferedData_list for overlap to skip
-	// any such part.
-	if (status == PS_EMPTY
-		&& GetHashCount() == GetED2KPartHashCount()
-		&& !m_hashsetneeded
-		&& m_pendingHashes == 0
-		&& !m_gaplist.IsComplete()) {
+	// Safety: m_aChangedPartN && IsComplete(N) means Phase 2 has observed at least one
+	// PB_WRITTEN for N and the gaplist has no holes in N. But FillGap runs at queue time in
+	// WriteToBuffer, so a queued PB_PENDING/PB_READY for the same part can still exist and
+	// hashing would read pre-write bytes. Scan m_BufferedData_list for overlap to skip any
+	// such part.
+	if (status == PS_EMPTY && GetHashCount() == GetED2KPartHashCount() && !m_hashsetneeded &&
+		m_pendingHashes == 0 && !m_gaplist.IsComplete()) {
 		for (uint32 partNumber = 0; partNumber < partCount; ++partNumber) {
 			if (!m_aChangedPartpartNumber) {
 				continue;
@@ -3361,10 +3556,9 @@
 				continue;
 			}
 			const uint64 partStart = (uint64)partNumber * PARTSIZE;
-			const uint64 partEnd = std::min<uint64>(
-				partStart + PARTSIZE - 1, GetFileSize() - 1);
+			const uint64 partEnd = std::min<uint64>(partStart + PARTSIZE - 1, GetFileSize() - 1);
 			bool pendingWrite = false;
-			for (const PartFileBufferedData* item : m_BufferedData_list) {
+			for (const PartFileBufferedData *item : m_BufferedData_list) {
 				if (item->flushed == PB_WRITTEN) {
 					continue;
 				}
@@ -3379,58 +3573,43 @@
 			}
 			m_aChangedPartpartNumber = false;
 			++m_pendingHashes;
-			theApp->partFileHashThread->QueueHashCheck(this, partNumber,
-				fromAICHRecoveryDataAvailable);
-			AddDebugLogLineN(logPartFile, CFormat(
-				"First-share: enqueued part %u of '%s' for hash") % partNumber % GetFileName());
+			theApp->partFileHashThread->QueueHashCheck(
+				this, partNumber, fromAICHRecoveryDataAvailable);
+			AddDebugLogLineN(logPartFile,
+				CFormat("First-share: enqueued part %u of '%s' for hash") % partNumber %
+					GetFileName());
 			break;
 		}
 	}
 
-	// Check each part of the file.
-	// Skip hash verification if writes are still in flight — data isn't on disk yet.
-	// Hashing will run on the next FlushBuffer() call once all writes complete.
+	// Check each part of the file. Skip hash verification if writes are still in flight --
+	// data is not on disk yet. Hashing runs on the next FlushBuffer() call once all writes
+	// complete.
 	if (m_iWrites > 0) {
 		return;
 	}
 
-	// Skip Phase 3 at gaplist completion: CCompletionTask re-reads
-	// the file for the ED2K root + AICH tree, subsuming Phase 3's
-	// per-part MD4. Running both is duplicate work and (for fresh
-	// downloads where every part is dirty) a 30-60 s main-thread
-	// freeze.
+	// Skip Phase 3 at gaplist completion: CCompletionTask re-reads the file for the ED2K
+	// root + AICH tree, subsuming Phase 3's per-part MD4. Running both is duplicate work
+	// and, for a fresh download where every part is dirty, a 30-60 s main-thread freeze.
 	if (m_gaplist.IsComplete()) {
-		const uint32 dirty = (uint32)std::count(
-			m_aChangedPart.begin(), m_aChangedPart.end(), true);
+		const uint32 dirty = (uint32)std::count(m_aChangedPart.begin(), m_aChangedPart.end(), true);
 		if (dirty > 0) {
-			AddDebugLogLineN(logPartFile, CFormat(
-				"Phase 3 skipped at gaplist completion: cleared %u dirty parts of '%s'")
-				% dirty % GetFileName());
+			AddDebugLogLineN(logPartFile,
+				CFormat("Phase 3 skipped at gaplist completion: cleared %u dirty parts of "
+					"'%s'") %
+					dirty % GetFileName());
 		}
 		std::fill(m_aChangedPart.begin(), m_aChangedPart.end(), false);
 	} else {
-		// Quiescent guard: defer per-part hashing until 1 s of no new
-		// blocks, so the synchronous read+MD4 doesn't fire mid-burst.
-		const uint64 kHashQuiescentMs = 1000;
-		const uint64 nowTick = GetTickCount64();
-		if (m_nLastBlockReceivedTick != 0 &&
-			(nowTick - m_nLastBlockReceivedTick) < kHashQuiescentMs) {
-			return;
-		}
-
-		// Async enqueue: hand each dirty part to CPartFileHashThread,
-		// which runs HashSinglePart on its own thread and posts a
-		// CPartFileHashResultEvent back to CamuleApp's main-thread
-		// handler — OnAsyncHashComplete then runs the AICH-recovery /
-		// SafeAddKFile branches below.  Main-thread cost here is just
-		// queue inserts (microseconds per part), so even a 3000-part
-		// dirty list enqueues in milliseconds with zero hashing freeze.
+		// Async enqueue: hand each dirty completed part to CPartFileHashThread, which runs
+		// HashSinglePart on its own thread and posts a CPartFileHashResultEvent back to the
+		// main-thread handler. OnAsyncHashComplete then runs the AICH-recovery / SafeAddKFile
+		// branches below. Main-thread cost here is just queue inserts, so even a 3000-part
+		// dirty list enqueues in milliseconds with no hashing freeze.
 		//
-		// PR #454 rejected an async-hash thread because read-for-hash
-		// competed with CPartFileWriteThread's writes during active
-		// download.  The quiescent guard above (1 s no receives)
-		// guarantees writes have drained before we enqueue, so the
-		// contention case can't arise.
+		// Disk write safety: the m_iWrites <= 0 gate above already guarantees
+		// CPartFileWriteThread has flushed every pending write to disk.
 		uint32 enqueued = 0;
 		for (uint32 partNumber = 0; partNumber < partCount; ++partNumber) {
 			if (!m_aChangedPartpartNumber) {
@@ -3438,62 +3617,51 @@
 			}
 			m_aChangedPartpartNumber = false;
 
-			// Mirror the synchronous verify loop at line 286: a write
-			// that touches a part marks it dirty, but the part may still
-			// have gaps. Hashing an incomplete part would read past the
-			// highest written offset and EOF. Future writes to this part
-			// will re-set the dirty bit; once gap-complete, the next
-			// pass enqueues it.
+			// Mirror the synchronous verify loop: a write that touches a part marks it dirty,
+			// but the part may still have gaps, and hashing an incomplete part would read past
+			// the highest written offset and EOF. Future writes re-set the dirty bit; once
+			// gap-complete, the next pass enqueues it.
 			if (!IsComplete(partNumber)) {
 				continue;
 			}
 			++m_pendingHashes;
-			theApp->partFileHashThread->QueueHashCheck(this, partNumber,
-				fromAICHRecoveryDataAvailable);
+			theApp->partFileHashThread->QueueHashCheck(
+				this, partNumber, fromAICHRecoveryDataAvailable);
 			++enqueued;
 		}
 		if (enqueued > 0) {
-			AddDebugLogLineN(logPartFile, CFormat(
-				"Phase 3 enqueued %u parts to hash thread for '%s'")
-				% enqueued % GetFileName());
-		}
-	}  // close gaplistComplete else-branch (async enqueue)
-
-	// Update met file -- only when something has actually changed since
-	// the last save.  Two tiers:
-	//   1. Hard state (gap list, status, priority, category, etc.) sets
-	//      m_metDirty.  Saved at the next FlushBuffer tick (~60 s).
-	//   2. Soft stats (AllTimeRequests / AllTimeAccepts /
-	//      AllTimeTransferred) set m_statsDirty only.  Saved at the
-	//      STATS_HEARTBEAT_MS cadence so a popular sharer does not
-	//      rewrite its .met on every served chunk.  The heartbeat is
-	//      measured from the last successful save, so a regular dirty
-	//      save automatically resets it.
-	// If neither bit is dirty, no save fires.  An idle seeder with no
-	// activity at all writes nothing until shutdown.
+			AddDebugLogLineN(logPartFile,
+				CFormat("Phase 3 enqueued %u parts to hash thread for '%s'") % enqueued %
+					GetFileName());
+		}
+	} // close gaplistComplete else-branch (async enqueue)
+
+	// Update the met file, only when something has actually changed since the last save. Two
+	// tiers: hard state (gap list, status, priority, category) sets m_metDirty and is saved
+	// at the next FlushBuffer tick (~60 s); soft stats (AllTimeRequests / Accepts /
+	// Transferred) set m_statsDirty only, and are saved at the STATS_HEARTBEAT_MS cadence so
+	// a popular sharer does not rewrite its .met on every served chunk. The heartbeat is
+	// measured from the last successful save, so a regular dirty save resets it. With
+	// neither bit dirty, no save fires at all.
 	const uint64 STATS_HEARTBEAT_MS = 10 * 60 * 1000;
 	if (IsMetDirty() ||
-		(IsStatsDirty() &&
-		 (::GetTickCount64() - m_lastMetSaveTick > STATS_HEARTBEAT_MS))) {
+		(IsStatsDirty() && (::GetTickCount64() - m_lastMetSaveTick > STATS_HEARTBEAT_MS))) {
 		SavePartFile();
 	}
 
 	// Final PB_WRITTEN harvest. The Phase 2 loop above can race with
-	// CPartFileWriteThread::Entry(), which decrements m_iWrites and
-	// then sets PB_WRITTEN: an item Phase 2 saw as PB_PENDING (and
-	// left in the list) can transition to PB_WRITTEN before the
-	// trailing check below runs. Without this sweep, the gap-closing
-	// write at file completion would leave m_BufferedData_list
-	// non-empty, fail the trailing check, and the download would stick
-	// at 99.9% until the next BUFFER_TIME_LIMIT (60 s) tick.
-	for (std::list<PartFileBufferedData*>::iterator it = m_BufferedData_list.begin();
-		 it != m_BufferedData_list.end(); )
-	{
-		PartFileBufferedData* item = *it;
+	// CPartFileWriteThread::Entry(), which decrements m_iWrites and then sets PB_WRITTEN: an
+	// item Phase 2 saw as PB_PENDING can transition to PB_WRITTEN before the trailing check
+	// below runs. Without this sweep, the gap-closing write at completion would leave
+	// m_BufferedData_list non-empty, fail the trailing check, and stick the download at
+	// 99.9% for another 60 s.
+	for (std::list<PartFileBufferedData *>::iterator it = m_BufferedData_list.begin();
+		it != m_BufferedData_list.end();) {
+		PartFileBufferedData *item = *it;
 		if (item->flushed == PB_WRITTEN) {
 			uint32 lenData = (uint32)(item->end - item->start + 1);
-			for (uint32 curpart = (item->start/PARTSIZE);
-				 curpart <= (item->end/PARTSIZE); ++curpart) {
+			for (uint32 curpart = (item->start / PARTSIZE); curpart <= (item->end / PARTSIZE);
+				++curpart) {
 				wxASSERT(curpart < partCount);
 				m_aChangedPartcurpart = true;
 			}
@@ -3506,42 +3674,31 @@
 	}
 
 	if (theApp->IsRunning()) { // may be called during shutdown!
-		// CompleteFile is not idempotent — each call kicks off a fresh
-		// CHashingTask. Must guard:
-		//   - status PS_EMPTY or PS_READY: skip if already
-		//     PS_COMPLETING / PS_HASHING / PS_WAITING_FOR_HASH / PS_ERROR
-		//     (otherwise StopFile→FlushBuffer and PerformFileComplete→
-		//     FlushBuffer in the post-CompleteFile path would re-fire
-		//     and spawn duplicate hash tasks). Both PS_EMPTY and
-		//     PS_READY are normal in-flight states: PS_READY is set on
-		//     load (LoadPartFile, line ~757) when any part is already
-		//     complete, and in OnAsyncHashComplete after a successful
-		//     part hash. So a resumed download is PS_READY from the
-		//     moment .met is loaded — gating on PS_EMPTY alone made
-		//     CompleteFile fail to fire on every resume-then-finish.
-		//   - m_pendingHashes <= 0: don't kick off CCompletionTask while
-		//     CPartFileHashThread is still reading m_hpartfile via
-		//     HashSinglePart — PerformFileComplete closes the file and
-		//     the worker would fault. The last OnAsyncHashComplete (when
-		//     pendingHashes drops to 0) re-runs this same check and
-		//     fires CompleteFile then.
-		if ((status == PS_EMPTY || status == PS_READY)
-			&& m_gaplist.IsComplete()
-			&& m_iWrites <= 0
-			&& m_BufferedData_list.empty()
-			&& m_pendingHashes <= 0) {
+		// CompleteFile is not idempotent -- each call kicks off a fresh CHashingTask -- so two
+		// guards:
+		//
+		//   - status PS_EMPTY or PS_READY: skip if already PS_COMPLETING / PS_HASHING /
+		//     PS_WAITING_FOR_HASH / PS_ERROR, or StopFile and PerformFileComplete would re-fire
+		//     and spawn duplicate hash tasks. Both PS_EMPTY and PS_READY are normal in-flight
+		//     states -- PS_READY is set on load when any part is already complete -- so a
+		//     resumed download is PS_READY from the moment .met is loaded, and gating on
+		//     PS_EMPTY alone made CompleteFile miss every resume-then-finish.
+		//
+		//   - m_pendingHashes <= 0: do not start CCompletionTask while CPartFileHashThread is
+		//     still reading m_hpartfile. PerformFileComplete closes the file and the worker
+		//     would fault; the last OnAsyncHashComplete re-runs this check and fires then.
+		if ((status == PS_EMPTY || status == PS_READY) && m_gaplist.IsComplete() && m_iWrites <= 0 &&
+			m_BufferedData_list.empty() && m_pendingHashes <= 0) {
 			CompleteFile(false);
 		}
 	}
 }
 
-
 // Receives a HashSinglePart result from CPartFileHashThread (via the
-// CPartFileHashResultEvent dispatched on CamuleApp).  Runs the same
-// success/failure / AICH-recovery logic the original synchronous Phase 3
-// did, just with the boolean result already computed by the worker.
-void CPartFile::OnAsyncHashComplete(uint16 partNumber, bool ok,
-	bool fromAICHRecoveryDataAvailable)
+// CPartFileHashResultEvent dispatched on CamuleApp). Runs the same success/failure /
+// AICH-recovery logic the original synchronous Phase 3 did, just with the boolean result
+// already computed by the worker.
+void CPartFile::OnAsyncHashComplete(uint16 partNumber, bool ok, bool fromAICHRecoveryDataAvailable)
 {
 	if (m_inDestructor || !theApp || !theApp->IsRunning()) {
 		return;
@@ -3552,20 +3709,17 @@
 
 	const uint32 partRange = GetPartSize(partNumber) - 1;
 
-	// Track whether this part's outcome changes persistent state.
-	// Only those branches need a SavePartFile flush; the success path
-	// for an already-complete part touches in-memory bookkeeping only
-	// (VerifiedData, m_corrupted_list, status), which is fine to
-	// persist on the next FlushBuffer-driven SavePartFile.  Avoids
-	// hammering the .met file on the main thread once per part —
-	// that's what made the GUI freeze on async-hash drain.
+	// Track whether this part's outcome changes persistent state. Only those branches need a
+	// SavePartFile flush; the success path for an already-complete part touches in-memory
+	// bookkeeping only, which is fine to persist on the next FlushBuffer-driven save. Avoids
+	// hammering the .met file on the main thread once per part, which is what froze the GUI
+	// on async-hash drain.
 	bool stateChanged = false;
 
 	if (IsComplete(partNumber)) {
 		if (!ok) {
-			AddLogLineC(CFormat(
-				_("Downloaded part %i is corrupt in file: %s") )
-				% partNumber % GetFileName());
+			AddLogLineC(CFormat(_("Downloaded part %i is corrupt in file: %s")) % partNumber %
+				    GetFileName());
 			AddGap(partNumber);
 			if (!IsCorruptedPart(partNumber)) {
 				m_corrupted_list.push_back(partNumber);
@@ -3579,16 +3733,15 @@
 			stateChanged = true;
 		} else {
 			if (!m_hashsetneeded) {
-				AddDebugLogLineN(logPartFile, CFormat(
-					"Finished part %u of '%s'") % partNumber % GetFileName());
+				AddDebugLogLineN(logPartFile,
+					CFormat("Finished part %u of '%s'") % partNumber % GetFileName());
 			}
 
 			m_CorruptionBlackBox->VerifiedData(true, partNumber, 0, partRange);
 
-			// If this part was carried as corrupted in the .met from a
-			// prior session, removing it from m_corrupted_list IS a
-			// persistent state change — without a save, next launch
-			// would still flag it as needing recovery.
+			// If this part was carried as corrupted in the .met from a prior session, removing
+			// it from m_corrupted_list IS a persistent state change -- without a save, the next
+			// launch would still flag it for recovery.
 			if (IsCorruptedPart(partNumber)) {
 				EraseFirstValue(m_corrupted_list, partNumber);
 				stateChanged = true;
@@ -3603,20 +3756,17 @@
 			}
 		}
 	} else if (IsCorruptedPart(partNumber) &&
-		(thePrefs::IsICHEnabled() || fromAICHRecoveryDataAvailable)) {
+		   (thePrefs::IsICHEnabled() || fromAICHRecoveryDataAvailable)) {
 		if (ok) {
 			++m_iTotalPacketsSavedDueToICH;
 			uint64 uMissingInPart = m_gaplist.GetGapSize(partNumber);
 			FillGap(partNumber);
-			RemoveBlockFromList(PARTSIZE * partNumber,
-				(PARTSIZE * partNumber + partRange));
+			RemoveBlockFromList(PARTSIZE * partNumber, (PARTSIZE * partNumber + partRange));
 			m_CorruptionBlackBox->VerifiedData(true, partNumber, 0, partRange);
 			EraseFirstValue(m_corrupted_list, partNumber);
 
-			AddLogLineC(CFormat(
-				_("ICH: Recovered corrupted part %i for %s -> Saved bytes: %s") )
-				% partNumber % GetFileName()
-				% CastItoXBytes(uMissingInPart));
+			AddLogLineC(CFormat(_("ICH: Recovered corrupted part %i for %s -> Saved bytes: %s")) %
+				    partNumber % GetFileName() % CastItoXBytes(uMissingInPart));
 
 			if (GetHashCount() == GetED2KPartHashCount() && !m_hashsetneeded) {
 				if (status == PS_EMPTY) {
@@ -3632,49 +3782,59 @@
 		SavePartFile();
 	}
 
-	// Now that this part's hash has been processed, the file may be
-	// ready for completion. Mirrors the trailing CompleteFile check in
-	// FlushBuffer — accept both PS_EMPTY and PS_READY (resumed
-	// downloads are PS_READY from load), but still skip PS_COMPLETING
-	// so a duplicate CompleteFile / CHashingTask isn't spawned.
-	if ((status == PS_EMPTY || status == PS_READY)
-		&& m_gaplist.IsComplete()
-		&& m_iWrites <= 0
-		&& m_BufferedData_list.empty()
-		&& m_pendingHashes <= 0) {
+	// Now that this part's hash has been processed, the file may be ready for completion.
+	// Mirrors the trailing CompleteFile check in FlushBuffer -- accept both PS_EMPTY and
+	// PS_READY, but still skip PS_COMPLETING so a duplicate CompleteFile / CHashingTask is
+	// not spawned.
+	if ((status == PS_EMPTY || status == PS_READY) && m_gaplist.IsComplete() && m_iWrites <= 0 &&
+		m_BufferedData_list.empty() && m_pendingHashes <= 0) {
 		CompleteFile(false);
 	}
 }
 
-
 // read data for upload, return false on error
-bool CPartFile::ReadData(CFileArea & area, uint64 offset, uint32 toread)
+bool CPartFile::ReadData(CFileArea &area, uint64 offset, uint32 toread, bool *handleClosed)
 {
+	if (handleClosed != nullptr) {
+		*handleClosed = false;
+	}
+
 	// Sanity check
 	if (offset + toread > GetFileSize()) {
-		AddDebugLogLineN(logPartFile, CFormat("tried to read %d bytes past eof of %s")
-			% (offset + toread - GetFileSize()) % GetFileName());
+		AddDebugLogLineN(logPartFile,
+			CFormat("tried to read %d bytes past eof of %s") % (offset + toread - GetFileSize()) %
+				GetFileName());
 		wxFAIL;
 		return false;
 	}
 
-	// Lock m_hpartfileMutex against the write/hash threads. ReadAt
-	// is Seek+Read on the underlying CFileAutoClose; CFile's internal
-	// recursive_mutex (#576) serialises the individual syscalls but
-	// not the Seek+Read composition. CPartFileWriteThread::Entry holds
-	// m_hpartfileMutex around its Seek+Write -- without the matching
-	// lock here, the upload reader (CUploadDiskIOThread::Entry calls
-	// this from a worker thread) can interleave its Seek with a write
-	// thread's Seek+Write, leaving fd_pos at the upload's seek target.
-	// The write thread's Write then lands at the wrong offset, and
-	// the read returns bytes from the post-write position. See #586.
+	// Lock m_hpartfileMutex against the write/hash threads. ReadAt is Seek+Read on the
+	// underlying CFileAutoClose; CFile's internal recursive_mutex serialises the individual
+	// syscalls but not the Seek+Read composition. CPartFileWriteThread::Entry holds
+	// m_hpartfileMutex around its Seek+Write -- without the matching lock here, the upload
+	// reader can interleave its Seek with a write thread's Seek+Write, leaving fd_pos at the
+	// upload's seek target. The write then lands at the wrong offset, and the read returns
+	// bytes from the post-write position.
 	std::lock_guard<std::mutex> lock(m_hpartfileMutex);
+
+	// PerformFileComplete closes this handle under the same mutex once the file is finished,
+	// while the upload reader may still have block requests queued for it. Report that
+	// rather than seeking a closed handle: the throw would be indistinguishable from a real
+	// IO error, and the caller drops the client on those. Flagged separately from the bare
+	// false above, which is an asserted bug. Checked under the lock so the answer cannot
+	// change.
+	if (!m_hpartfile.IsOpened()) {
+		if (handleClosed != nullptr) {
+			*handleClosed = true;
+		}
+		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;
@@ -3686,7 +3846,7 @@
 
 	SourceSet::iterator it = m_SrcList.begin();
 	for (; it != m_SrcList.end(); ++it) {
-		CUpDownClient* cur_src = it->GetClient();
+		CUpDownClient *cur_src = it->GetClient();
 
 		if (!cur_src->GetFileComment().IsEmpty()) {
 			if (thePrefs::IsCommentFiltered(cur_src->GetFileComment())) {
@@ -3711,18 +3871,16 @@
 
 	if ((prevComment != m_hasComment) || (prevRating != m_iUserRating)) {
 		UpdateDisplayedInfo();
-		// EC exports EC_TAG_PARTFILE_COMMENTS (rating + comments tag
-		// tree). Sources can deliver new comments at any time via
-		// OP_MESSAGE; without a mark here amulegui would only refresh
-		// when something else on the file changes.
+		// EC exports EC_TAG_PARTFILE_COMMENTS (rating + comments tag tree). Sources can
+		// deliver new comments at any time via OP_MESSAGE; without a mark here amulegui would
+		// only refresh when something else changes.
 		MarkECChanged();
 	}
 }
 
-
 void CPartFile::SetCategory(uint8 cat)
 {
-	wxASSERT( cat < theApp->glob_prefs->GetCatCount() );
+	wxASSERT(cat < theApp->glob_prefs->GetCatCount());
 
 	if (m_category != cat) {
 		MarkMetDirty();
@@ -3733,15 +3891,15 @@
 	SavePartFile();
 }
 
-bool CPartFile::RemoveSource(CUpDownClient* toremove, bool updatewindow, bool bDoStatsUpdate)
+bool CPartFile::RemoveSource(CUpDownClient *toremove, bool updatewindow, bool bDoStatsUpdate)
 {
-	wxASSERT( toremove );
+	wxASSERT(toremove);
 
-	bool result = theApp->downloadqueue->RemoveSource( toremove, updatewindow, bDoStatsUpdate );
+	bool result = theApp->downloadqueue->RemoveSource(toremove, updatewindow, bDoStatsUpdate);
 
 	// Check if the client should be deleted, but not if the client is already dying
-	if ( !toremove->GetSocket() && !toremove->HasBeenDeleted() ) {
-		if ( toremove->Disconnected("RemoveSource - purged") ) {
+	if (!toremove->GetSocket() && !toremove->HasBeenDeleted()) {
+		if (toremove->Disconnected("RemoveSource - purged")) {
 			toremove->Safe_Delete();
 		}
 	}
@@ -3749,40 +3907,37 @@
 	return result;
 }
 
-void CPartFile::AddDownloadingSource(CUpDownClient* client)
+void CPartFile::AddDownloadingSource(CUpDownClient *client)
 {
-	CClientRefList::iterator it =
-		std::find(m_downloadingSourcesList.begin(), m_downloadingSourcesList.end(), CCLIENTREF(client, ""));
+	CClientRefList::iterator it = std::find(
+		m_downloadingSourcesList.begin(), m_downloadingSourcesList.end(), CCLIENTREF(client, ""));
 	if (it == m_downloadingSourcesList.end()) {
 		m_downloadingSourcesList.push_back(CCLIENTREF(client, "CPartFile::AddDownloadingSource"));
 	}
 }
 
-
-void CPartFile::RemoveDownloadingSource(CUpDownClient* client)
+void CPartFile::RemoveDownloadingSource(CUpDownClient *client)
 {
-	CClientRefList::iterator it =
-		std::find(m_downloadingSourcesList.begin(), m_downloadingSourcesList.end(), CCLIENTREF(client, ""));
+	CClientRefList::iterator it = std::find(
+		m_downloadingSourcesList.begin(), m_downloadingSourcesList.end(), CCLIENTREF(client, ""));
 	if (it != m_downloadingSourcesList.end()) {
 		m_downloadingSourcesList.erase(it);
 	}
 }
 
-
 uint64 CPartFile::GetNeededSpace()
 {
 	try {
 		uint64 length = m_hpartfile.GetLength();
 
 		if (length > GetFileSize()) {
-			return 0;	// Shouldn't happen, but just in case
+			return 0; // Shouldn't happen, but just in case
 		}
 
 		return GetFileSize() - length;
-	} catch (const CIOFailureException& e) {
+	} catch (const CIOFailureException &e) {
 		AddDebugLogLineC(logPartFile,
-			CFormat("Error while retrieving file-length (%s): %s")
-				% m_PartPath % e.what());
+			CFormat("Error while retrieving file-length (%s): %s") % m_PartPath % e.what());
 		SetStatus(PS_ERROR);
 		return 0;
 	}
@@ -3792,7 +3947,7 @@
 {
 	// 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 );
+	wxASSERT(in != PS_PAUSED && in != PS_INSUFFICIENT);
 
 	if (status != in) {
 		MarkMetDirty();
@@ -3800,50 +3955,49 @@
 	status = in;
 
 	if (theApp->IsRunning()) {
-		UpdateDisplayedInfo( true );
+		UpdateDisplayedInfo(true);
 
-		if ( thePrefs::ShowCatTabInfos() ) {
+		if (thePrefs::ShowCatTabInfos()) {
 			Notify_ShowUpdateCatTabTitles();
 		}
 		Notify_DownloadCtrlSort();
 	}
 }
 
-
 void CPartFile::RequestAICHRecovery(uint16 nPart)
 {
 
-	if (	!m_pAICHHashSet->HasValidMasterHash() ||
-		(m_pAICHHashSet->GetStatus() != AICH_TRUSTED && m_pAICHHashSet->GetStatus() != AICH_VERIFIED)){
-		AddDebugLogLineN( logAICHRecovery, "Unable to request AICH Recoverydata because we have no trusted Masterhash" );
+	if (!m_pAICHHashSet->HasValidMasterHash() || (m_pAICHHashSet->GetStatus() != AICH_TRUSTED &&
+							     m_pAICHHashSet->GetStatus() != AICH_VERIFIED)) {
+		AddDebugLogLineN(logAICHRecovery,
+			"Unable to request AICH Recoverydata because we have no trusted Masterhash");
 		return;
 	}
 	if (GetPartSize(nPart) <= EMBLOCKSIZE)
 		return;
-	if (CAICHHashSet::IsClientRequestPending(this, nPart)){
-		AddDebugLogLineN( logAICHRecovery, "RequestAICHRecovery: Already a request for this part pending");
+	if (CAICHHashSet::IsClientRequestPending(this, nPart)) {
+		AddDebugLogLineN(
+			logAICHRecovery, "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)){
-		AddDebugLogLineN( logAICHRecovery, "Found PartRecoveryData in memory");
+	if (m_pAICHHashSet->IsPartDataAvailable(nPart * PARTSIZE)) {
+		AddDebugLogLineN(logAICHRecovery, "Found PartRecoveryData in memory");
 		AICHRecoveryDataAvailable(nPart);
 		return;
 	}
 
-	wxASSERT( nPart < GetPartCount() );
+	wxASSERT(nPart < GetPartCount());
 	// find some random client which support AICH to ask for the blocks
 	// first lets see how many we have at all, we prefer high id very much
 	uint32 cAICHClients = 0;
 	uint32 cAICHLowIDClients = 0;
-	for ( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it) {
-		CUpDownClient* pCurClient = it->GetClient();
-		if (	pCurClient->IsSupportingAICH() &&
-			pCurClient->GetReqFileAICHHash() != NULL &&
-			!pCurClient->IsAICHReqPending()
-			&& (*pCurClient->GetReqFileAICHHash()) == m_pAICHHashSet->GetMasterHash())
-		{
+	for (SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it) {
+		CUpDownClient *pCurClient = it->GetClient();
+		if (pCurClient->IsSupportingAICH() && pCurClient->GetReqFileAICHHash() != NULL &&
+			!pCurClient->IsAICHReqPending() &&
+			(*pCurClient->GetReqFileAICHHash()) == m_pAICHHashSet->GetMasterHash()) {
 			if (pCurClient->HasLowID()) {
 				++cAICHLowIDClients;
 			} else {
@@ -3851,8 +4005,10 @@
 			}
 		}
 	}
-	if ((cAICHClients | cAICHLowIDClients) == 0){
-		AddDebugLogLineN( logAICHRecovery, "Unable to request AICH Recoverydata because found no client who supports it and has the same hash as the trusted one");
+	if ((cAICHClients | cAICHLowIDClients) == 0) {
+		AddDebugLogLineN(logAICHRecovery,
+			"Unable to request AICH Recoverydata because found no client who supports it and has "
+			"the same hash as the trusted one");
 		return;
 	}
 	uint32 nSeclectedClient;
@@ -3861,40 +4017,39 @@
 	} else {
 		nSeclectedClient = (rand() % cAICHLowIDClients) + 1;
 	}
-	CUpDownClient* pClient = NULL;
-	for ( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it) {
-		CUpDownClient* pCurClient = it->GetClient();
-		if (pCurClient->IsSupportingAICH() && pCurClient->GetReqFileAICHHash() != NULL && !pCurClient->IsAICHReqPending()
-			&& (*pCurClient->GetReqFileAICHHash()) == m_pAICHHashSet->GetMasterHash())
-		{
-			if (cAICHClients > 0){
+	CUpDownClient *pClient = NULL;
+	for (SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it) {
+		CUpDownClient *pCurClient = it->GetClient();
+		if (pCurClient->IsSupportingAICH() && pCurClient->GetReqFileAICHHash() != NULL &&
+			!pCurClient->IsAICHReqPending() &&
+			(*pCurClient->GetReqFileAICHHash()) == m_pAICHHashSet->GetMasterHash()) {
+			if (cAICHClients > 0) {
 				if (!pCurClient->HasLowID())
 					nSeclectedClient--;
-			}
-			else{
-				wxASSERT( pCurClient->HasLowID());
+			} else {
+				wxASSERT(pCurClient->HasLowID());
 				nSeclectedClient--;
 			}
-			if (nSeclectedClient == 0){
+			if (nSeclectedClient == 0) {
 				pClient = pCurClient;
 				break;
 			}
 		}
 	}
-	if (pClient == NULL){
+	if (pClient == NULL) {
 		wxFAIL;
 		return;
 	}
 
-	AddDebugLogLineN( logAICHRecovery, CFormat( "Requesting AICH Hash (%s) form client %s" ) % ( cAICHClients ? "HighId" : "LowID" ) % pClient->GetClientFullInfo() );
+	AddDebugLogLineN(logAICHRecovery,
+		CFormat("Requesting AICH Hash (%s) form client %s") % (cAICHClients ? "HighId" : "LowID") %
+			pClient->GetClientFullInfo());
 	pClient->SendAICHRequest(this, nPart);
-
 }
 
-
 void CPartFile::AICHRecoveryDataAvailable(uint16 nPart)
 {
-	if (GetPartCount() < nPart){
+	if (GetPartCount() < nPart) {
 		wxFAIL;
 		return;
 	}
@@ -3903,59 +4058,63 @@
 	uint32 length = GetPartSize(nPart);
 	// if the part was already ok, it would now be complete
 	if (IsComplete(nPart)) {
-		AddDebugLogLineN(logAICHRecovery, CFormat("Processing AICH Recovery data: The part (%u) is already complete, canceling") % nPart);
+		AddDebugLogLineN(logAICHRecovery,
+			CFormat("Processing AICH Recovery data: The part (%u) is already complete, "
+				"canceling") %
+				nPart);
 		return;
 	}
 
-
-
-	CAICHHashTree* pVerifiedHash = m_pAICHHashSet->m_pHashTree.FindHash(nPart*PARTSIZE, length);
-	if (pVerifiedHash == NULL || !pVerifiedHash->GetHashValid()){
-		AddDebugLogLineC( logAICHRecovery, "Processing AICH Recovery data: Unable to get verified hash from hashset (should never happen)" );
+	CAICHHashTree *pVerifiedHash = m_pAICHHashSet->m_pHashTree.FindHash(nPart * PARTSIZE, length);
+	if (pVerifiedHash == NULL || !pVerifiedHash->GetHashValid()) {
+		AddDebugLogLineC(logAICHRecovery,
+			"Processing AICH Recovery data: Unable to get verified hash from hashset (should "
+			"never happen)");
 		wxFAIL;
 		return;
 	}
-	CAICHHashTree htOurHash(pVerifiedHash->GetNDataSize(), pVerifiedHash->GetIsLeftBranch(), pVerifiedHash->GetNBaseSize());
+	CAICHHashTree htOurHash(pVerifiedHash->GetNDataSize(),
+		pVerifiedHash->GetIsLeftBranch(),
+		pVerifiedHash->GetNBaseSize());
 	try {
-		// Lock m_hpartfileMutex against the write/hash/upload threads.
-		// CreateHashFromFile is a sequence of Seek+Read inside the
-		// CFileAutoClose wrapper, and CFile's recursive_mutex (#576)
-		// serialises individual syscalls but not the composition.
-		// Without the matching lock here, the AICH-recovery read can
-		// interleave with a concurrent Seek+Write from
-		// CPartFileWriteThread, fd_pos lands in the wrong place, the
-		// recovery hash is computed over the wrong bytes -- and the
-		// recovered part gets accepted as good even though it is not.
-		// See #586.
+		// Lock m_hpartfileMutex against the write/hash/upload threads. CreateHashFromFile is a
+		// sequence of Seek+Read inside the CFileAutoClose wrapper, and CFile's recursive_mutex
+		// serialises individual syscalls but not the composition. Without the matching lock
+		// here, the AICH-recovery read can interleave with a concurrent Seek+Write from
+		// CPartFileWriteThread, fd_pos lands in the wrong place, the recovery hash is computed
+		// over the wrong bytes -- and the recovered part gets accepted as good even though it
+		// is not.
 		std::lock_guard<std::mutex> lock(m_hpartfileMutex);
 		CreateHashFromFile(m_hpartfile, PARTSIZE * nPart, length, NULL, &htOurHash);
-	} catch (const CIOFailureException& e) {
+	} catch (const CIOFailureException &e) {
 		AddDebugLogLineC(logAICHRecovery,
-			CFormat("IO failure while hashing part-file '%s': %s")
-				% m_hpartfile.GetFilePath() % e.what());
+			CFormat("IO failure while hashing part-file '%s': %s") % m_hpartfile.GetFilePath() %
+				e.what());
 		SetStatus(PS_ERROR);
 		return;
 	}
 
-	if (!htOurHash.GetHashValid()){
-		AddDebugLogLineN( logAICHRecovery, "Processing AICH Recovery data: Failed to retrieve AICH Hashset of corrupt part" );
+	if (!htOurHash.GetHashValid()) {
+		AddDebugLogLineN(logAICHRecovery,
+			"Processing AICH Recovery data: Failed to retrieve AICH Hashset of corrupt part");
 		wxFAIL;
 		return;
 	}
 
-	// now compare the hash we just did, to the verified hash and readd all blocks which are ok
+	// now compare the hash we just did, to the verified hash and read all blocks which are ok
 	uint32 nRecovered = 0;
-	for (uint32 pos = 0; pos < length; pos += EMBLOCKSIZE){
+	for (uint32 pos = 0; pos < length; pos += EMBLOCKSIZE) {
 		const uint32 nBlockSize = min<uint32>(EMBLOCKSIZE, length - pos);
-		CAICHHashTree* pVerifiedBlock = pVerifiedHash->FindHash(pos, nBlockSize);
-		CAICHHashTree* pOurBlock = htOurHash.FindHash(pos, nBlockSize);
-		if ( pVerifiedBlock == NULL || pOurBlock == NULL || !pVerifiedBlock->GetHashValid() || !pOurBlock->GetHashValid()){
+		CAICHHashTree *pVerifiedBlock = pVerifiedHash->FindHash(pos, nBlockSize);
+		CAICHHashTree *pOurBlock = htOurHash.FindHash(pos, nBlockSize);
+		if (pVerifiedBlock == NULL || pOurBlock == NULL || !pVerifiedBlock->GetHashValid() ||
+			!pOurBlock->GetHashValid()) {
 			wxFAIL;
 			continue;
 		}
-		if (pOurBlock->GetHash() == pVerifiedBlock->GetHash()){
-			FillGap(PARTSIZE*nPart+pos, PARTSIZE*nPart + pos + (nBlockSize-1));
-			RemoveBlockFromList(PARTSIZE*nPart, PARTSIZE*nPart + (nBlockSize-1));
+		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);
@@ -3972,7 +4131,10 @@
 		// make sure that MD4 agrees to this fact too
 		if (!HashSinglePart(nPart)) {
 			AddDebugLogLineN(logAICHRecovery,
-				CFormat("Processing AICH Recovery data: The part (%u) got completed while recovering - but MD4 says it corrupt! Setting hashset to error state, deleting part") % nPart);
+				CFormat("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(nPart);
@@ -3980,7 +4142,9 @@
 			return;
 		} else {
 			AddDebugLogLineN(logAICHRecovery,
-				CFormat("Processing AICH Recovery data: The part (%u) got completed while recovering and MD4 agrees") % nPart);
+				CFormat("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
@@ -4004,27 +4168,23 @@
 	SavePartFile();
 
 	// make sure the user appreciates our great recovering work :P
-	AddDebugLogLineC( logAICHRecovery, CFormat(
-		"AICH successfully recovered %s of %s from part %u for %s" )
-		% CastItoXBytes(nRecovered)
-		% CastItoXBytes(length)
-		% nPart
-		% GetFileName() );
+	AddDebugLogLineC(logAICHRecovery,
+		CFormat("AICH successfully recovered %s of %s from part %u for %s") %
+			CastItoXBytes(nRecovered) % CastItoXBytes(length) % nPart % GetFileName());
 }
 
-
-void CPartFile::ClientStateChanged( int oldState, int newState )
+void CPartFile::ClientStateChanged(int oldState, int newState)
 {
-	if ( oldState == newState )
+	if (oldState == newState)
 		return;
 
 	// If the state is -1, then it's an entirely new item
-	if ( oldState != -1 ) {
+	if (oldState != -1) {
 		// Was the old state a valid state?
-		if ( oldState == DS_ONQUEUE || oldState == DS_DOWNLOADING ) {
+		if (oldState == DS_ONQUEUE || oldState == DS_DOWNLOADING) {
 			m_validSources--;
 		} else {
-			if ( oldState == DS_CONNECTED /* || oldState == DS_REMOTEQUEUEFULL  */ ) {
+			if (oldState == DS_CONNECTED /* || oldState == DS_REMOTEQUEUEFULL  */) {
 				m_validSources--;
 			}
 
@@ -4033,12 +4193,12 @@
 	}
 
 	// If the state is -1, then the source is being removed
-	if ( newState != -1 ) {
+	if (newState != -1) {
 		// Was the old state a valid state?
-		if ( newState == DS_ONQUEUE || newState == DS_DOWNLOADING ) {
+		if (newState == DS_ONQUEUE || newState == DS_DOWNLOADING) {
 			++m_validSources;
 		} else {
-			if ( newState == DS_CONNECTED /* || newState == DS_REMOTEQUEUEFULL  */ ) {
+			if (newState == DS_CONNECTED /* || newState == DS_REMOTEQUEUEFULL  */) {
 				++m_validSources;
 			}
 
@@ -4047,8 +4207,7 @@
 	}
 }
 
-
-bool CPartFile::AddSource( CUpDownClient* client )
+bool CPartFile::AddSource(CUpDownClient *client)
 {
 	if (m_SrcList.insert(CCLIENTREF(client, "CPartFile::AddSource")).second) {
 		theStats::AddFoundSource();
@@ -4059,8 +4218,7 @@
 	}
 }
 
-
-bool CPartFile::DelSource( CUpDownClient* client )
+bool CPartFile::DelSource(CUpDownClient *client)
 {
 	if (m_SrcList.erase(CCLIENTREF(client, ""))) {
 		theStats::RemoveSourceOrigin(client->GetSourceFrom());
@@ -4071,66 +4229,72 @@
 	}
 }
 
-
-void CPartFile::UpdatePartsFrequency( CUpDownClient* client, bool increment )
+void CPartFile::UpdatePartsFrequency(CUpDownClient *client, bool increment)
 {
-	const BitVector& freq = client->GetPartStatus();
+	const BitVector &freq = client->GetPartStatus();
 
-	if ( m_SrcpartFrequency.size() != GetPartCount() ) {
+	if (m_SrcpartFrequency.size() != GetPartCount()) {
 		m_SrcpartFrequency.clear();
 		m_SrcpartFrequency.insert(m_SrcpartFrequency.begin(), GetPartCount(), 0);
 
-		if ( !increment ) {
+		if (!increment) {
 			return;
 		}
 	}
 
 	unsigned int size = freq.size();
-	if ( size != m_SrcpartFrequency.size() ) {
+	if (size != m_SrcpartFrequency.size()) {
 		return;
 	}
 
-	if ( increment ) {
-		for ( unsigned int i = 0; i < size; i++ ) {
-			if ( freq.get(i) ) {
+	if (increment) {
+		for (unsigned int i = 0; i < size; i++) {
+			if (freq.get(i)) {
 				m_SrcpartFrequencyi++;
 			}
 		}
 	} else {
-		for ( unsigned int i = 0; i < size; i++ ) {
-			if ( freq.get(i) ) {
+		for (unsigned int i = 0; i < size; i++) {
+			if (freq.get(i)) {
 				m_SrcpartFrequencyi--;
 			}
 		}
 	}
 }
 
-void CPartFile::GetRatingAndComments(FileRatingList & list) const
+void CPartFile::GetRatingAndComments(FileRatingList &list) const
 {
 	list.clear();
 	// This can be pre-processed, but is it worth the CPU?
 	CPartFile::SourceSet::const_iterator it = m_SrcList.begin();
-	for ( ; it != m_SrcList.end(); ++it ) {
+	for (; it != m_SrcList.end(); ++it) {
 		CUpDownClient *cur_src = it->GetClient();
-		if (cur_src->GetFileComment().Length()>0 || cur_src->GetFileRating()>0) {
+		if (cur_src->GetFileComment().Length() > 0 || cur_src->GetFileRating() > 0) {
 			// AddDebugLogLineN(logPartFile, wxString("found a comment for ") << GetFileName());
 			list.push_back(SFileRating(*cur_src));
 		}
 	}
+
+	// Append community ratings/comments retrieved on demand from Kad. Shared with search
+	// results via the CAbstractFile helper (one entry per responding node, stored by
+	// CSearch::ProcessResultNotes -> AddNote).
+	GetKadNotesComments(list);
 }
 
-#else   // CLIENT_GUI
+#else // CLIENT_GUI
 
-CPartFile::CPartFile(const CEC_PartFile_Tag *tag) : CKnownFile(tag)
+CPartFile::CPartFile(const CEC_PartFile_Tag *tag)
+: CKnownFile(tag)
 {
 	Init();
 
 	SetFileName(CPath(tag->FileName()));
 	m_abyFileHash = tag->FileHash();
 	SetFileSize(tag->SizeFull());
-	m_gaplist.Init(GetFileSize(), true);	// Init empty
+	m_gaplist.Init(GetFileSize(), true); // Init empty
 	m_partmetfilename = CPath(tag->PartMetName());
-	m_fullname = m_partmetfilename;		// We have only the met number, so show it without path in the detail dialog.
+	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);
 
@@ -4142,51 +4306,40 @@
 	m_isShared = false;
 }
 
-/*
- * Remote gui specific code
- */
-CPartFile::~CPartFile()
-{
-}
+// Remote gui specific code
+CPartFile::~CPartFile() {}
 
-void CPartFile::GetRatingAndComments(FileRatingList & list) const
-{
-	list = m_FileRatingList;
-}
+// GetRatingAndComments on amulegui is inherited from CAbstractFile (returns the
+// EC-streamed m_FileRatingList) -- no CPartFile override needed here.
 
 void CPartFile::SetCategory(uint8 cat)
 {
 	m_category = cat;
 }
 
-
-bool CPartFile::AddSource(CUpDownClient* client)
+bool CPartFile::AddSource(CUpDownClient *client)
 {
 	return m_SrcList.insert(CCLIENTREF(client, "CPartFile::AddSource")).second != 0;
 }
 
-
-bool CPartFile::DelSource(CUpDownClient* client)
+bool CPartFile::DelSource(CUpDownClient *client)
 {
 	return m_SrcList.erase(CCLIENTREF(client, "")) != 0;
 }
 
-
 #endif // !CLIENT_GUI
 
-
 void CPartFile::UpdateDisplayedInfo(bool force)
 {
 	uint64 curTick = ::GetTickCount64();
 
 	// Wait 1.5s between each redraw
-	if (force || curTick-m_lastRefreshedDLDisplay > MINWAIT_BEFORE_DLDISPLAY_WINDOWUPDATE) {
+	if (force || curTick - m_lastRefreshedDLDisplay > MINWAIT_BEFORE_DLDISPLAY_WINDOWUPDATE) {
 		Notify_DownloadCtrlUpdateItem(this);
 		m_lastRefreshedDLDisplay = curTick;
 	}
 }
 
-
 void CPartFile::Init()
 {
 	m_lastsearchtime = 0;
@@ -4200,7 +4353,7 @@
 	transferred = 0;
 	m_iLastPausePurge = time(NULL);
 
-	if(thePrefs::GetNewAutoDown()) {
+	if (thePrefs::GetNewAutoDown()) {
 		m_iDownPriority = PR_HIGH;
 		m_bAutoDownPriority = true;
 	} else {
@@ -4215,9 +4368,9 @@
 	m_hashsetneeded = true;
 	m_count = 0;
 	percentcompleted = 0;
-	completedsize=0;
+	completedsize = 0;
 	lastseencomplete = 0;
-	m_availablePartsCount=0;
+	m_availablePartsCount = 0;
 	m_ClientSrcAnswered = 0;
 	m_LastNoNeededCheck = 0;
 	m_iRating = 0;
@@ -4257,36 +4410,36 @@
 	wxString mybuffer;
 
 	if ((status == PS_HASHING) || (status == PS_WAITING_FOR_HASH)) {
-		mybuffer=_("Hashing");
+		mybuffer = _("Hashing");
 	} else if (status == PS_ALLOCATING) {
 		mybuffer = _("Allocating");
 	} else {
 		switch (GetStatus()) {
-			case PS_COMPLETING:
-				mybuffer=_("Completing");
-				break;
-			case PS_COMPLETE:
-				mybuffer=_("Complete");
-				break;
-			case PS_PAUSED:
-				mybuffer=_("Paused");
-				break;
-			case PS_ERROR:
-				mybuffer=_("Erroneous");
-				break;
-			case PS_INSUFFICIENT:
-				mybuffer = _("Insufficient disk space");
-				break;
-			default:
-				if (GetTransferingSrcCount()>0) {
-					mybuffer=_("Downloading");
-				}	else {
-					mybuffer=_("Waiting");
-				}
-				break;
+		case PS_COMPLETING:
+			mybuffer = _("Completing");
+			break;
+		case PS_COMPLETE:
+			mybuffer = _("Complete");
+			break;
+		case PS_PAUSED:
+			mybuffer = _("Paused");
+			break;
+		case PS_ERROR:
+			mybuffer = _("Erroneous");
+			break;
+		case PS_INSUFFICIENT:
+			mybuffer = _("Insufficient disk space");
+			break;
+		default:
+			if (GetTransferingSrcCount() > 0) {
+				mybuffer = _("Downloading");
+			} else {
+				mybuffer = _("Waiting");
+			}
+			break;
 		}
-		if (m_stopped && (GetStatus()!=PS_COMPLETE)) {
-			mybuffer=_("Stopped");
+		if (m_stopped && (GetStatus() != PS_COMPLETE)) {
+			mybuffer = _("Stopped");
 		}
 	}
 
@@ -4296,47 +4449,47 @@
 int CPartFile::getPartfileStatusRang() const
 {
 
-	int tempstatus=0;
-	if (GetTransferingSrcCount()==0) tempstatus=1;
+	int tempstatus = 0;
+	if (GetTransferingSrcCount() == 0)
+		tempstatus = 1;
 	switch (GetStatus()) {
-		case PS_HASHING:
-		case PS_WAITING_FOR_HASH:
-			tempstatus=3;
-			break;
-		case PS_COMPLETING:
-			tempstatus=4;
-			break;
-		case PS_COMPLETE:
-			tempstatus=5;
-			break;
-		case PS_PAUSED:
-			tempstatus=2;
-			break;
-		case PS_ERROR:
-			tempstatus=6;
-			break;
+	case PS_HASHING:
+	case PS_WAITING_FOR_HASH:
+		tempstatus = 3;
+		break;
+	case PS_COMPLETING:
+		tempstatus = 4;
+		break;
+	case PS_COMPLETE:
+		tempstatus = 5;
+		break;
+	case PS_PAUSED:
+		tempstatus = 2;
+		break;
+	case PS_ERROR:
+		tempstatus = 6;
+		break;
 	}
 	return tempstatus;
 }
 
-
 wxString CPartFile::GetFeedback() const
 {
 	wxString retval = CKnownFile::GetFeedback();
 	if (GetStatus() != PS_COMPLETE) {
-		retval += CFormat("%s: %s (%.2f%%)\n%s: %u\n")
-			% _("Downloaded") % CastItoXBytes(GetCompletedSize()) % GetPercentCompleted() % _("Sources") % GetSourceCount();
+		retval += CFormat("%s: %s (%.2f%%)\n%s: %u\n") % _("Downloaded") %
+			  CastItoXBytes(GetCompletedSize()) % GetPercentCompleted() % _("Sources") %
+			  GetSourceCount();
 	}
 	return retval + _("Status") + ": " + getPartfileStatus() + "\n";
 }
 
-
 sint32 CPartFile::getTimeRemaining() const
 {
 	if (GetKBpsDown() < 0.001)
 		return -1;
 	else
-		return((GetFileSize()-GetCompletedSize()) / ((int)(GetKBpsDown()*1024.0)));
+		return ((GetFileSize() - GetCompletedSize()) / ((int)(GetKBpsDown() * 1024.0)));
 }
 
 bool CPartFile::PreviewAvailable()
@@ -4344,8 +4497,7 @@
 	const uint64 minSizeForPreview = 256 * 1024;
 	FileType type = GetFiletype(GetFileName());
 
-	return (type == ftVideo || type == ftAudio) &&
-	       GetFileSize() >= minSizeForPreview &&
+	return (type == ftVideo || type == ftAudio) && GetFileSize() >= minSizeForPreview &&
 	       IsComplete(0, minSizeForPreview);
 }
 
@@ -4360,64 +4512,59 @@
 	bool show = true;
 
 	switch (thePrefs::GetAllcatFilter()) {
-		case acfAllOthers:
-			show = GetCategory() == 0 || inCategory > 0;
-			break;
-		case acfIncomplete:
-			show = IsPartFile();
-			break;
-		case acfCompleted:
-			show = !IsPartFile();
-			break;
-		case acfWaiting:
-			show =
-				(GetStatus() == PS_READY || GetStatus() == PS_EMPTY) &&
-				GetTransferingSrcCount() == 0;
-			break;
-		case acfDownloading:
-			show =
-				(GetStatus() == PS_READY || GetStatus() == PS_EMPTY) &&
-				GetTransferingSrcCount() > 0;
-			break;
-		case acfErroneous:
-			show = GetStatus() == PS_ERROR;
-			break;
-		case acfPaused:
-			show = GetStatus() == PS_PAUSED && !IsStopped();
-			break;
-		case acfStopped:
-			show = IsStopped();
-			break;
-		case acfVideo:
-			show = GetFiletype(GetFileName()) == ftVideo;
-			break;
-		case acfAudio:
-			show = GetFiletype(GetFileName()) == ftAudio;
-			break;
-		case acfArchive:
-			show = GetFiletype(GetFileName()) == ftArchive;
-			break;
-		case acfCDImages:
-			show = GetFiletype(GetFileName()) == ftCDImage;
-			break;
-		case acfPictures:
-			show = GetFiletype(GetFileName()) == ftPicture;
-			break;
-		case acfText:
-			show = GetFiletype(GetFileName()) == ftText;
-			break;
-		case acfActive:
-			show = !IsStopped() && GetStatus() != PS_PAUSED;
-			break;
-		default:
-			show = true;
-			break;
+	case acfAllOthers:
+		show = GetCategory() == 0 || inCategory > 0;
+		break;
+	case acfIncomplete:
+		show = IsPartFile();
+		break;
+	case acfCompleted:
+		show = !IsPartFile();
+		break;
+	case acfWaiting:
+		show = (GetStatus() == PS_READY || GetStatus() == PS_EMPTY) && GetTransferingSrcCount() == 0;
+		break;
+	case acfDownloading:
+		show = (GetStatus() == PS_READY || GetStatus() == PS_EMPTY) && GetTransferingSrcCount() > 0;
+		break;
+	case acfErroneous:
+		show = GetStatus() == PS_ERROR;
+		break;
+	case acfPaused:
+		show = GetStatus() == PS_PAUSED && !IsStopped();
+		break;
+	case acfStopped:
+		show = IsStopped();
+		break;
+	case acfVideo:
+		show = GetFiletype(GetFileName()) == ftVideo;
+		break;
+	case acfAudio:
+		show = GetFiletype(GetFileName()) == ftAudio;
+		break;
+	case acfArchive:
+		show = GetFiletype(GetFileName()) == ftArchive;
+		break;
+	case acfCDImages:
+		show = GetFiletype(GetFileName()) == ftCDImage;
+		break;
+	case acfPictures:
+		show = GetFiletype(GetFileName()) == ftPicture;
+		break;
+	case acfText:
+		show = GetFiletype(GetFileName()) == ftText;
+		break;
+	case acfActive:
+		show = !IsStopped() && GetStatus() != PS_PAUSED;
+		break;
+	default:
+		show = true;
+		break;
 	}
 
 	return show;
 }
 
-
 void CPartFile::RemoveCategory(uint8 cat)
 {
 	if (m_category == cat) {
@@ -4429,7 +4576,6 @@
 	}
 }
 
-
 void CPartFile::SetActive(bool bActive)
 {
 	time_t tNow = time(NULL);
@@ -4447,7 +4593,6 @@
 	}
 }
 
-
 uint32 CPartFile::GetDlActiveTime() const
 {
 	uint32 nDlActiveTime = m_nDlActiveTime;
@@ -4457,73 +4602,62 @@
 	return nDlActiveTime;
 }
 
-
 uint16 CPartFile::GetPartMetNumber() const
 {
 	long nr;
 	return m_partmetfilename.RemoveAllExt().GetRaw().ToLong(&nr) ? nr : 0;
 }
 
-
 void CPartFile::SetHashingProgress(uint16 part) const
 {
 	if (m_hashingProgress != part) {
 		m_hashingProgress = part;
-		// EC exports the hashed-part count via
-		// EC_TAG_PARTFILE_HASHED_PART_COUNT. Hashing runs outside
-		// Process()'s PS_READY/PS_EMPTY gate, so the per-tick mark
-		// doesn't fire — explicit mark here keeps amulegui's
-		// progress bar live during hashing.
-		const_cast<CPartFile*>(this)->MarkECChanged();
+		// EC exports the hashed-part count via EC_TAG_PARTFILE_HASHED_PART_COUNT. Hashing runs
+		// outside Process()'s PS_READY/PS_EMPTY gate, so the per-tick mark does not fire.
+		const_cast<CPartFile *>(this)->MarkECChanged();
 	}
 	Notify_DownloadCtrlUpdateItem(this);
+	Notify_SharedFilesUpdateItem(const_cast<CPartFile *>(this));
 }
 
-
 #ifndef CLIENT_GUI
 
 uint8 CPartFile::GetStatus(bool ignorepause) const
 {
-	if (	(!m_paused && !m_insufficient) ||
-		status == PS_ERROR ||
-		status == PS_COMPLETING ||
-		status == PS_COMPLETE ||
-		ignorepause) {
+	if ((!m_paused && !m_insufficient) || status == PS_ERROR || status == PS_COMPLETING ||
+		status == PS_COMPLETE || ignorepause) {
 		return status;
-	} else if ( m_insufficient ) {
+	} else if (m_insufficient) {
 		return PS_INSUFFICIENT;
 	} else {
 		return PS_PAUSED;
 	}
 }
 
-void CPartFile::AddDeadSource(const CUpDownClient* client)
+void CPartFile::AddDeadSource(const CUpDownClient *client)
 {
-	m_deadSources.AddDeadSource( client );
+	m_deadSources.AddDeadSource(client);
 }
 
-
-bool CPartFile::IsDeadSource(const CUpDownClient* client)
+bool CPartFile::IsDeadSource(const CUpDownClient *client)
 {
-	return m_deadSources.IsDeadSource( client );
+	return m_deadSources.IsDeadSource(client);
 }
 
-const wxString& CPartFile::GetCachedPartMetBasename() const
+const wxString &CPartFile::GetCachedPartMetBasename() const
 {
 	if (m_cachedPartMetBasename.IsEmpty()) {
-		// One-shot evaluate: the partmet filename (e.g. "012.part.met")
-		// is set when the partfile is created and is stable for life,
-		// so cache after first use. The wxString cast collapses the
-		// CFormat round-trip that the EC tag constructor used to do
-		// per request.
+		// One-shot evaluate: the partmet filename is set when the partfile is created and is
+		// stable for life, so cache after first use. The wxString cast collapses the CFormat
+		// round trip the EC tag ctor used to do.
 		m_cachedPartMetBasename = m_partmetfilename.RemoveExt().GetPrintable();
 	}
 	return m_cachedPartMetBasename;
 }
 
-void CPartFile::SetFileName(const CPath& fileName)
+void CPartFile::SetFileName(const CPath &fileName)
 {
-	CKnownFile* pFile = theApp->sharedfiles->GetFileByID(GetFileHash());
+	CKnownFile *pFile = theApp->sharedfiles->GetFileByID(GetFileHash());
 
 	bool is_shared = (pFile && pFile == this);
 
@@ -4546,14 +4680,12 @@
 	UpdateDisplayedInfo(true);
 }
 
-
 uint16 CPartFile::GetMaxSources() const
 {
 	// This is just like this, while we don't import the private max sources per file
 	return thePrefs::GetMaxSourcePerFile();
 }
 
-
 uint16 CPartFile::GetMaxSourcePerFileSoft() const
 {
 	unsigned int temp = ((unsigned int)GetMaxSources() * 9L) / 10;
@@ -4574,23 +4706,31 @@
 
 #define DROP_FACTOR 2
 
-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++->GetClient();
+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++->GetClient();
 		if ((cur_src->GetDownloadState() == DS_DOWNLOADING) && (cur_src != caller)) {
-			uint32 factored_bytes_per_second = static_cast<uint32>(
-				(cur_src->GetKBpsDown() * 1024) * DROP_FACTOR);
-			if ( factored_bytes_per_second< speed) {
-//				printf("Selecting source %p to drop: %d < %d\n", cur_src, factored_bytes_per_second, speed);
-//				printf("End slower source calculation\n");
+			// Ensure the slow client has blocks that the caller actually has
+			// available to download
+			if (!cur_src->HasUsefulBlocksFor(caller)) {
+				continue;
+			}
+			uint32 factored_bytes_per_second =
+				static_cast<uint32>((cur_src->GetKBpsDown() * 1024) * DROP_FACTOR);
+			if (factored_bytes_per_second < speed) {
+				//				printf("Selecting source %p to drop: %d <
+				//%d\n", cur_src, factored_bytes_per_second, speed);
+				// printf("End slower source calculation\n");
 				return cur_src;
 			} else {
-//				printf("Not selecting source %p to drop: %d > %d\n", cur_src, factored_bytes_per_second, speed);
+				//				printf("Not selecting source %p to drop: %d >
+				//%d\n", cur_src, factored_bytes_per_second, speed);
 			}
 		}
 	}
-//	printf("End slower source calculation\n");
+	//	printf("End slower source calculation\n");
 	return NULL;
 }

amule-3.0.1.tar.gz/src/PartFile.h -> amule-3.1.0.tar.gz/src/PartFile.h Changed

@@ -26,15 +26,15 @@
 #ifndef PARTFILE_H
 #define PARTFILE_H
 
-
-#include "KnownFile.h"		// Needed for CKnownFile
-#include "FileAutoClose.h"	// Needed for CFileAutoClose
-#include "FileArea.h"		// Needed for CFileArea (PartFileBufferedData)
-#include <atomic>			// Needed for std::atomic (m_iWrites)
-#include <mutex>			// Needed for std::mutex (m_hpartfileMutex)
-
-#include "OtherStructs.h"	// Needed for Requested_Block_Struct
-#include "DeadSourceList.h"	// Needed for CDeadSourceList
+#include "KnownFile.h"     // Needed for CKnownFile
+#include "FileAutoClose.h" // Needed for CFileAutoClose
+#include "FileArea.h"      // Needed for CFileArea (PartFileBufferedData)
+#include <array>           // Needed for std::array (m_ecTickState)
+#include <atomic>          // Needed for std::atomic (m_iWrites)
+#include <mutex>           // Needed for std::mutex (m_hpartfileMutex)
+
+#include "OtherStructs.h"   // Needed for Requested_Block_Struct
+#include "DeadSourceList.h" // Needed for CDeadSourceList
 #include "GapList.h"
 
 class CSearchFile;
@@ -42,16 +42,15 @@
 class CFileDataIO;
 class CED2KFileLink;
 
-//#define BUFFER_SIZE_LIMIT	500000 // Max bytes before forcing a flush
-#define BUFFER_TIME_LIMIT	60000   // Max milliseconds before forcing a flush
+// #define BUFFER_SIZE_LIMIT	500000 // Max bytes before forcing a flush
+#define BUFFER_TIME_LIMIT 60000 // Max milliseconds before forcing a flush
 
-// 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.
-#define   PARTMET_BAK_EXT ".bak"
+// eMule and aMule used to build incompatible backup files: aMule wrote ".BAK", eMule ".bak".
+#define PARTMET_BAK_EXT ".bak"
 
-enum EPartFileFormat {
-	PMT_UNKNOWN	= 0,
+enum EPartFileFormat
+{
+	PMT_UNKNOWN = 0,
 	PMT_DEFAULTOLD,
 	PMT_SPLITTED,
 	PMT_NEWOLD,
@@ -59,369 +58,361 @@
 	PMT_BADFORMAT
 };
 
-
-class SFileRating
-{
-public:
-	wxString UserName;
-	wxString FileName;
-	sint16   Rating;
-	wxString Comment;
-public:
-	SFileRating(const wxString &u, const wxString &f, sint16 r, const wxString &c);
-	SFileRating(const CUpDownClient &client);
-};
-
-typedef std::list<SFileRating> FileRatingList;
-
 class SourcenameItem
 {
 public:
-	wxString	name;
-	int			count;
+	wxString name;
+	int count;
+
 public:
 	SourcenameItem(const wxString &n = EmptyString, int c = 0)
-	:
-	name(n), count(c) {}
+	: name(n)
+	, count(c)
+	{
+	}
 };
 
-typedef std::map<uint32,SourcenameItem> SourcenameItemMap;
-
+typedef std::map<uint32, SourcenameItem> SourcenameItemMap;
 
 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
-	uint8 flushed;					// eMule ref: 0=ready 1=pending 2=error 3=written
-
-	PartFileBufferedData(CFileAutoClose& file, uint8_t * data, uint64 _start, uint64 _end, Requested_Block_Struct *_block)
-		: start(_start), end(_end), block(_block), flushed(0)
+	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
+	uint8 flushed;                 // eMule ref: 0=ready 1=pending 2=error 3=written
+
+	PartFileBufferedData(CFileAutoClose &file,
+		uint8_t *data,
+		uint64 _start,
+		uint64 _end,
+		Requested_Block_Struct *_block)
+	: start(_start)
+	, end(_end)
+	, block(_block)
+	, flushed(0)
 	{
-		area.StartWriteAt(file, start, end-start+1);
-		memcpy(area.GetBuffer(), data, end-start+1);
+		area.StartWriteAt(file, start, end - start + 1);
+		memcpy(area.GetBuffer(), data, end - start + 1);
 	}
 };
 
-
-class CPartFile : public CKnownFile {
+class CPartFile : public CKnownFile
+{
 	friend class CPartFileWriteThread;
 	friend class CPartFileHashThread;
+
 public:
-	typedef std::list<Requested_Block_Struct*> CReqBlockPtrList;
+	typedef std::list<Requested_Block_Struct *> CReqBlockPtrList;
 
 	CPartFile();
 #ifdef CLIENT_GUI
 	CPartFile(const CEC_PartFile_Tag *tag);
 #else
-	virtual void	SetFileName(const CPath& filename);
+	virtual void SetFileName(const CPath &filename);
 #endif
-	CPartFile(CSearchFile* searchresult);  //used when downloading a new file
-	CPartFile(const CED2KFileLink* fileLink);
+	CPartFile(CSearchFile *searchresult); // used when downloading a new file
+	CPartFile(const CED2KFileLink *fileLink);
 	virtual ~CPartFile();
 
-	virtual bool LoadFromFile(const CFileDataIO* WXUNUSED(file)) { return false; }
-	bool	WriteToFile(CFileDataIO* WXUNUSED(file))	{ return false; }
+	virtual bool LoadFromFile(const CFileDataIO *WXUNUSED(file)) { return false; }
+	bool WriteToFile(CFileDataIO *WXUNUSED(file)) { return false; }
 
 	// 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
+	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(uint8 m_icounter);
-	uint8	LoadPartFile(const CPath& in_directory, const CPath& filename, bool from_backup = false, bool getsizeonly = false);
-	bool	SavePartFile(bool Initial = false);
+	uint32 Process(uint8 m_icounter);
+	uint8 LoadPartFile(const CPath &in_directory,
+		const CPath &filename,
+		bool from_backup = false,
+		bool getsizeonly = false);
+	bool SavePartFile(bool Initial = false);
 
 	// Mark/clear the in-memory dirty bit for the .part.met file.  See
 	// m_metDirty in the private section for the dirty-flag contract.
-	void	MarkMetDirty()			{ m_metDirty = true; }
-	void	ClearMetDirty()			{ m_metDirty = false; }
-	bool	IsMetDirty() const		{ return m_metDirty; }
-
-	// Soft-dirty bit for upload-stat counters (AllTimeRequests,
-	// AllTimeAccepts, AllTimeTransferred).  Flipped by CFileStatistic's
-	// AddRequest / AddAccepted / AddTransferred so a popular sharer does
-	// not re-dirty the partfile on every served chunk.  See m_statsDirty
-	// in the private section.
-	void	MarkStatsDirty()		{ m_statsDirty = true; }
-	void	ClearStatsDirty()		{ m_statsDirty = false; }
-	bool	IsStatsDirty() const		{ return m_statsDirty; }
-	void	PartFileHashFinished(CKnownFile* result);
-	bool	HashSinglePart(uint16 partnumber); // true = ok , false = corrupted
-
-	bool    CheckShowItemInGivenCat(int inCategory);
-
-	bool	IsComplete(uint64 start, uint64 end)	{ return m_gaplist.IsComplete(start, end); }
-	bool	IsComplete(uint16 part)			{ return m_gaplist.IsComplete(part); }
-
-	void	UpdateCompletedInfos();
-
-	bool	GetNextRequestedBlock(CUpDownClient* sender, std::vector<Requested_Block_Struct*>& toadd, uint16& count);
-	void	WritePartStatus(CMemFile* file);
-	void	WriteCompleteSourcesCount(CMemFile* file);
-	static bool	CanAddSource(uint32 userid, uint16 port, uint32 serverip, uint16 serverport, uint8* pdebug_lowiddropped = NULL, bool ed2kID = true);
-	void	AddSources(CMemFile& sources, uint32 serverip, uint16 serverport, unsigned origin, bool bWithObfuscationAndHash);
+	void MarkMetDirty() { m_metDirty = true; }
+	void ClearMetDirty() { m_metDirty = false; }
+	bool IsMetDirty() const { return m_metDirty; }
+
+	// Soft-dirty bit for upload-stat counters (AllTimeRequests, AllTimeAccepts,
+	// AllTimeTransferred), flipped by CFileStatistic so a popular sharer does not re-dirty the
+	// partfile on every served chunk. See m_statsDirty.
+	void MarkStatsDirty() { m_statsDirty = true; }
+	void ClearStatsDirty() { m_statsDirty = false; }
+	bool IsStatsDirty() const { return m_statsDirty; }
+	void PartFileHashFinished(CKnownFile *result);
+	bool HashSinglePart(uint16 partnumber); // true = ok , false = corrupted
+
+	bool CheckShowItemInGivenCat(int inCategory);
+
+	bool IsComplete(uint64 start, uint64 end) { return m_gaplist.IsComplete(start, end); }
+	bool IsComplete(uint16 part) { return m_gaplist.IsComplete(part); }
+
+	void UpdateCompletedInfos();
+
+	bool GetNextRequestedBlock(
+		CUpDownClient *sender, std::vector<Requested_Block_Struct *> &toadd, uint16 &count);
+	void WritePartStatus(CMemFile *file);
+	void WriteCompleteSourcesCount(CMemFile *file);
+	static bool CanAddSource(uint32 userid,
+		uint16 port,
+		uint32 serverip,
+		uint16 serverport,
+		uint8 *pdebug_lowiddropped = NULL,
+		bool ed2kID = true);
+	void AddSources(CMemFile &sources,
+		uint32 serverip,
+		uint16 serverport,
+		unsigned origin,
+		bool bWithObfuscationAndHash);
 #ifdef CLIENT_GUI
-	uint8	GetStatus() const { return status; }
-	uint8	GetStatus(bool /*ignorepause = false*/) const { return status; }
+	uint8 GetStatus() const { return status; }
+	uint8 GetStatus(bool /*ignorepause = false*/) const { return status; }
 #else
-	uint8	GetStatus(bool ignorepause = false) const;
+	uint8 GetStatus(bool ignorepause = false) const;
 #endif
-	virtual void	UpdatePartsInfo();
-	const CPath& GetPartMetFileName() const { return m_partmetfilename; }
-
-	/**
-	 * Cached partmet basename (filename without `.met` extension) as a
-	 * wxString. Used by EC GET_SHARED_FILES / GET_UPDATE for the
-	 * EC_TAG_KNOWNFILE_FILENAME tag of partfiles — that path went through
-	 * `CFormat("%s") % GetPartMetFileName().RemoveExt()` on every call,
-	 * which allocates a CPath (two wxStrings via DeepCopy) plus a CFormat
-	 * round-trip per file per EC cycle. The basename never changes after
-	 * the partfile is created, so this is a populate-once cache.
-	 */
-	const wxString& GetCachedPartMetBasename() const;
-	uint16	GetPartMetNumber() const;
-	uint64	GetTransferred() const		{ return transferred; }
-	const CPath& GetFullName() const	{ return m_fullname; }
-	float	GetKBpsDown() const			{ return kBpsDown; }
-	double	GetPercentCompleted() const	{ return percentcompleted; }
+	virtual void UpdatePartsInfo();
+	const CPath &GetPartMetFileName() const { return m_partmetfilename; }
+
+	/// Cached partmet basename (filename without the `.met` extension). Used by EC
+	/// GET_SHARED_FILES / GET_UPDATE for a partfile's EC_TAG_KNOWNFILE_FILENAME tag -- that
+	/// path went through `CFormat("%s") % GetPartMetFileName().RemoveExt()` on every call,
+	/// allocating a CPath (two wxStrings via DeepCopy) plus a CFormat round-trip per file per
+	/// EC cycle. The basename never changes after the partfile is created, so this is a
+	/// populate-once cache.
+	const wxString &GetCachedPartMetBasename() const;
+	uint16 GetPartMetNumber() const;
+	uint64 GetTransferred() const { return transferred; }
+	const CPath &GetFullName() const { return m_fullname; }
+	float GetKBpsDown() const { return kBpsDown; }
+	double GetPercentCompleted() const { return percentcompleted; }
 
 #ifndef CLIENT_GUI
-	uint16	GetSourceCount() const		{ return (uint16)m_SrcList.size(); }
-	uint16	GetSrcA4AFCount() const		{ return (uint16)m_A4AFsrclist.size(); }
+	uint16 GetSourceCount() const { return (uint16)m_SrcList.size(); }
+	uint16 GetSrcA4AFCount() const { return (uint16)m_A4AFsrclist.size(); }
 #else
-	uint16	m_source_count, m_a4af_source_count;
-	uint16	GetSourceCount() const		{ return m_source_count; }
-	uint16	GetSrcA4AFCount() const		{ return m_a4af_source_count; }
+	uint16 m_source_count, m_a4af_source_count;
+	uint16 GetSourceCount() const { return m_source_count; }
+	uint16 GetSrcA4AFCount() const { return m_a4af_source_count; }
 #endif
-	uint16	GetTransferingSrcCount() const	{ return transferingsrc; }
-	uint16  GetNotCurrentSourcesCount()	const	{ return m_notCurrentSources; };
-	uint16	GetValidSourcesCount() const	{ return m_validSources; };
+	uint16 GetTransferingSrcCount() const { return transferingsrc; }
+	uint16 GetNotCurrentSourcesCount() const { return m_notCurrentSources; };
+	uint16 GetValidSourcesCount() const { return m_validSources; };
 
-	uint64	GetNeededSpace();
+	uint64 GetNeededSpace();
 
 	virtual wxString GetFeedback() const;
 
 	wxString getPartfileStatus() const; //<<--9/21/02
-	sint32	getTimeRemaining() const; //<<--9/21/02
-	time_t	lastseencomplete;
-	int	getPartfileStatusRang() const;
+	sint32 getTimeRemaining() const;    //<<--9/21/02
+	time_t lastseencomplete;
+	int getPartfileStatusRang() const;
 
 	// Barry - Added as replacement for BlockReceived to buffer data before writing to disk
-	uint32	WriteToBuffer(uint32 transize, uint8_t *data, uint64 start, uint64 end, Requested_Block_Struct *block, const CUpDownClient* client);
-	void	FlushBuffer(bool fromAICHRecoveryDataAvailable = false);
+	uint32 WriteToBuffer(uint32 transize,
+		uint8_t *data,
+		uint64 start,
+		uint64 end,
+		Requested_Block_Struct *block,
+		const CUpDownClient *client);
+	void FlushBuffer(bool fromAICHRecoveryDataAvailable = false);
+
+	// True when m_aChangedPart has dirty entries and the write thread is idle. CDownloadQueue
+	// uses this to drive FlushBuffer for paused or insufficient files, which Process() does not
+	// run for.
+	bool HasPendingHashWork() const;
+
+	// Called from CamuleApp's wxEVT_PARTFILE_HASH_RESULT handler when CPartFileHashThread
+	// reports a HashSinglePart result for this file. Runs the Phase 3 success/failure logic:
+	// AICH recovery on a bad part, SafeAddKFile on a good complete one.
+	void OnAsyncHashComplete(uint16 partNumber, bool ok, bool fromAICHRecoveryDataAvailable);
 
-	// True when m_aChangedPart has dirty entries and the write thread
-	// is idle. CDownloadQueue uses this to drive FlushBuffer for
-	// paused/insufficient files (Process() doesn't run for them).
-	bool	HasPendingHashWork() const;
+	// Barry - Added to prevent list containing deleted blocks on shutdown
+	void RemoveAllRequestedBlocks(void);
+
+	void RemoveBlockFromList(uint64 start, uint64 end);
+	void RemoveAllSources(bool bTryToSwap);
+	void Delete();
+	void StopFile(bool bCancel = false);
+	void PauseFile(bool bInsufficient = false);
+	void ResumeFile();
+
+	virtual CPacket *CreateSrcInfoPacket(
+		const CUpDownClient *forClient, uint8 byRequestedVersion, uint16 nRequestedOptions);
+	void AddClientSources(CMemFile *sources,
+		unsigned nSourceFrom,
+		uint8 uClientSXVersion,
+		bool bSourceExchange2,
+		const CUpDownClient *pClient = NULL);
+
+	bool PreviewAvailable();
+	uint16 GetAvailablePartCount() const { return m_availablePartsCount; }
+	uint64 GetLastAnsweredTime() const { return m_ClientSrcAnswered; }
+	void SetLastAnsweredTime();
+	void SetLastAnsweredTimeTimeout();
+	uint64 GetLostDueToCorruption() const { return m_iLostDueToCorruption; }
+	uint64 GetGainDueToCompression() const { return m_iGainDueToCompression; }
+	uint32 TotalPacketsSavedDueToICH() const { return m_iTotalPacketsSavedDueToICH; }
+	bool IsStopped() const { return m_stopped; }
+	bool IsPaused() const { return m_paused; }
+	void UpdateFileRatingCommentAvail();
+
+	int GetCommonFilePenalty();
+	void UpdateDisplayedInfo(bool force = false);
+
+	uint8 GetCategory() const { return m_category; }
+	void SetCategory(uint8 cat);
+	void RemoveCategory(uint8 cat);
+
+	void SetDownPriority(uint8 newDownPriority, bool bSave = true, bool bRefresh = true);
+	bool IsAutoDownPriority() const { return m_bAutoDownPriority; }
+	// EC exports the priority with the auto flag folded in via EC_TAG_PARTFILE_PRIO; mark the
+	// change so remote clients see it without waiting for the next Process() tick -- and at all
+	// when the file is paused or stopped, where Process() does not run.
+	void SetAutoDownPriority(bool flag)
+	{
+		if (m_bAutoDownPriority != flag) {
+			MarkMetDirty();
+			MarkECChanged();
+		}
+		m_bAutoDownPriority = flag;
+	}
+	void UpdateAutoDownPriority();
+	uint8 GetDownPriority() const { return m_iDownPriority; }
+	void SetActive(bool bActive);
+	uint32 GetDlActiveTime() const;
+	bool GetInsufficient() const { return m_insufficient; }
 
-	// Called from CamuleApp's wxEVT_PARTFILE_HASH_RESULT handler when
-	// CPartFileHashThread reports a HashSinglePart result for this
-	// file. Runs the original Phase 3 success/failure logic (AICH
-	// recovery on bad part, SafeAddKFile on good complete part).
-	void	OnAsyncHashComplete(uint16 partNumber, bool ok,
-		bool fromAICHRecoveryDataAvailable);
+	void CompleteFileEnded(bool errorOccured, const CPath &newname);
 
-	// Barry - Added to prevent list containing deleted blocks on shutdown
-	void	RemoveAllRequestedBlocks(void);
-
-	void	RemoveBlockFromList(uint64 start,uint64 end);
-	void	RemoveAllSources(bool bTryToSwap);
-	void	Delete();
-	void	StopFile(bool bCancel = false);
-	void	PauseFile(bool bInsufficient = false);
-	void	ResumeFile();
-
-	virtual	CPacket* CreateSrcInfoPacket(const CUpDownClient* forClient, uint8 byRequestedVersion, uint16 nRequestedOptions);
-	void    AddClientSources(CMemFile* sources, unsigned nSourceFrom, uint8 uClientSXVersion, bool bSourceExchange2, const CUpDownClient* pClient = NULL);
-
-	bool	PreviewAvailable();
-	uint16	GetAvailablePartCount() const	{ return m_availablePartsCount; }
-	uint64	GetLastAnsweredTime() const	{ return m_ClientSrcAnswered; }
-	void	SetLastAnsweredTime();
-	void	SetLastAnsweredTimeTimeout();
-	uint64	GetLostDueToCorruption() const	{ return m_iLostDueToCorruption; }
-	uint64	GetGainDueToCompression() const	{ return m_iGainDueToCompression; }
-	uint32	TotalPacketsSavedDueToICH()const{ return m_iTotalPacketsSavedDueToICH; }
-	bool	IsStopped() const		{ return m_stopped; }
-	bool	IsPaused() const		{ return m_paused; }
-	void	UpdateFileRatingCommentAvail();
-
-	int	GetCommonFilePenalty();
-	void	UpdateDisplayedInfo(bool force = false);
-
-	uint8	GetCategory() const { return m_category; }
-	void	SetCategory(uint8 cat);
-	void	RemoveCategory(uint8 cat);
-
-	void	SetDownPriority(uint8 newDownPriority, bool bSave = true, bool bRefresh = true);
-	bool	IsAutoDownPriority() const	{ return m_bAutoDownPriority; }
-	// EC exports the priority with the auto flag folded in via
-	// EC_TAG_PARTFILE_PRIO; mark the change so amulegui/amuleweb see
-	// it without waiting for the next Process() tick (and at all when
-	// the file is paused/stopped — Process() doesn't run then).
-	void	SetAutoDownPriority(bool flag)	{ if (m_bAutoDownPriority != flag) { MarkMetDirty(); MarkECChanged(); } m_bAutoDownPriority = flag; }
-	void	UpdateAutoDownPriority();
-	uint8	GetDownPriority() const		{ return m_iDownPriority; }
-	void	SetActive(bool bActive);
-	uint32	GetDlActiveTime() const;
-	bool	GetInsufficient() const		{ return m_insufficient; }
-
-	void	CompleteFileEnded(bool errorOccured, const CPath& newname);
-
-	bool	RemoveSource(CUpDownClient* toremove, bool updatewindow = true, bool bDoStatsUpdate = true);
-
-	void	RequestAICHRecovery(uint16 nPart);
-	void	AICHRecoveryDataAvailable(uint16 nPart);
+	bool RemoveSource(CUpDownClient *toremove, bool updatewindow = true, bool bDoStatsUpdate = true);
 
-	/**
-	 * This function is used to update source-counts.
-	 *
-	 * @param oldState The old state of the client, or -1 to ignore.
-	 * @param newState The new state of the client, or -1 to ignore.
-	 *
-	 * Call this function for a client belonging to this file, which has changed
-	 * its state. The value -1 can be used to make the function ignore one of
-	 * the two states.
-	 *
-	 * AddSource and DelSource takes care of calling this function when a source is
-	 * removed, so there's no need to call this function when calling either of those.
-	 */
-	void	ClientStateChanged( int oldState, int newState );
+	void RequestAICHRecovery(uint16 nPart);
+	void AICHRecoveryDataAvailable(uint16 nPart);
 
-	bool	AddSource( CUpDownClient* client );
-	bool	DelSource( CUpDownClient* client );
+	/// Updates source counts for a client of this file that changed state. @a oldState or @a
+	/// newState may be -1 to ignore that side. AddSource and DelSource call this themselves, so
+	/// there is no need to call it around either.
+	void ClientStateChanged(int oldState, int newState);
 
-	/**
-	 * Updates the frequency of available parts from with the data the client provides.
-	 *
-	 * @param client The clients whose available parts should be considered.
-	 * @param increment If true, the counts are incremented, otherwise they are decremented.
-	 *
-	 * This functions updates the frequency list of file-parts, using the clients
-	 * parts-status. This function should be called by clients every time they update their
-	 * parts-status, or when they are added or removed from the file.
-	 */
-	void	UpdatePartsFrequency( CUpDownClient* client, bool increment );
+	bool AddSource(CUpDownClient *client);
+	bool DelSource(CUpDownClient *client);
 
-	ArrayOfUInts16	m_SrcpartFrequency;
+	/// Updates the frequency list of file parts from @a client's parts-status, incrementing or
+	/// decrementing per @a increment. Clients should call it whenever they update their parts-
+	/// status, and when they are added to or removed from the file.
+	void UpdatePartsFrequency(CUpDownClient *client, bool increment);
 
-	const SourceSet& GetSourceList()	const { return m_SrcList; }
-	const SourceSet& GetA4AFList()		const { return m_A4AFsrclist; }
-	void	ClearA4AFList()				{ m_A4AFsrclist.clear(); }
+	ArrayOfUInts16 m_SrcpartFrequency;
 
-	const CReqBlockPtrList	GetRequestedBlockList() const { return m_requestedblocks_list; }
+	const SourceSet &GetSourceList() const { return m_SrcList; }
+	const SourceSet &GetA4AFList() const { return m_A4AFsrclist; }
+	void ClearA4AFList() { m_A4AFsrclist.clear(); }
 
-	const CGapList& GetGapList() const { return m_gaplist; }
+	const CReqBlockPtrList GetRequestedBlockList() const { return m_requestedblocks_list; }
 
-	/**
-	 * Adds a source to the list of dead sources.
-	 *
-	 * @param client The source to be recorded as dead for this file.
-	 */
-	void		AddDeadSource(const CUpDownClient* client);
+	const CGapList &GetGapList() const { return m_gaplist; }
 
-	/**
-	 * Set the current progress of hashing and display it in the download list control.
-	 *
-	 * @param part Number of part currently being hashed. 0 for no hashing in progress.
-	 */
-	virtual	void SetHashingProgress(uint16 part) const;
+	/// Records @a client as a dead source for this file.
+	void AddDeadSource(const CUpDownClient *client);
 
-	/**
-	 * Checks if a source is recorded as being dead for this file.
-	 *
-	 * @param client The client to evaluate.
-	 * @return True if dead, false otherwise.
-	 *
-	 * Sources that are dead are not to be considered valid
-	 * sources and should not be added to the partfile.
-	 */
-	bool		IsDeadSource(const CUpDownClient* client);
+	/// Sets the current hashing progress and displays it in the download list control. @a part
+	/// is the part being hashed, 0 for no hashing in progress.
+	virtual void SetHashingProgress(uint16 part) const;
+
+	/// True if @a client is recorded as a dead source for this file. Dead sources are not valid
+	/// sources and must not be added to the partfile.
+	bool IsDeadSource(const CUpDownClient *client);
 
 	/* Kad Stuff */
-	uint16	GetMaxSources() const;
-	uint16	GetMaxSourcePerFileSoft() const;
-	uint16	GetMaxSourcePerFileUDP() const;
+	uint16 GetMaxSources() const;
+	uint16 GetMaxSourcePerFileSoft() const;
+	uint16 GetMaxSourcePerFileUDP() const;
 
-	void GetRatingAndComments(FileRatingList & list) const;
+#ifndef CLIENT_GUI
+	// Daemon override: prepend the connected-source comments to the Kad notes. On amulegui the
+	// inherited CAbstractFile version returns the EC-streamed cache, so no override is needed
+	// there.
+	void GetRatingAndComments(FileRatingList &list) const;
+#endif
+
+	void AllocationFinished();
 
-	void	AllocationFinished();
 private:
 #ifndef CLIENT_GUI
 	// partfile handle (opened on demand)
-	CFileAutoClose	m_hpartfile;
+	CFileAutoClose m_hpartfile;
 	//! A local list of sources that are invalid for this file.
-	CDeadSourceList	m_deadSources;
+	CDeadSourceList m_deadSources;
 
-	class CCorruptionBlackBox* m_CorruptionBlackBox;
+	class CCorruptionBlackBox *m_CorruptionBlackBox;
 #endif
 
-	uint16	m_notCurrentSources;
-
-	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);
-	void	CreatePartFile(bool isImporting = false);
-	void	Init();
-
-	bool	CheckFreeDiskSpace( uint64 neededSpace = 0 );
-
-	bool	IsCorruptedPart(uint16 partnumber);
-
-	uint32	m_iLastPausePurge;
-	uint16	m_count;
-	uint16	transferingsrc;
-	uint64  completedsize;
-	uint64	transferred;
-
-	uint64	m_iLostDueToCorruption;
-	uint64	m_iGainDueToCompression;
-	uint32  m_iTotalPacketsSavedDueToICH;
-	float	kBpsDown;
-	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
-	// Cache for EC EC_TAG_KNOWNFILE_FILENAME — see GetCachedPartMetBasename().
-	// Populate-once: m_partmetfilename never changes for the lifetime of
-	// the partfile (the basename is the partfile's allocation number).
+	uint16 m_notCurrentSources;
+
+	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);
+	void CreatePartFile(bool isImporting = false);
+	void Init();
+
+	bool CheckFreeDiskSpace(uint64 neededSpace = 0);
+
+	bool IsCorruptedPart(uint16 partnumber);
+
+	uint32 m_iLastPausePurge;
+	uint16 m_count;
+	uint16 transferingsrc;
+	uint64 completedsize;
+	uint64 transferred;
+
+	uint64 m_iLostDueToCorruption;
+	uint64 m_iGainDueToCompression;
+	uint32 m_iTotalPacketsSavedDueToICH;
+	float kBpsDown;
+	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
+	// Cache for EC EC_TAG_KNOWNFILE_FILENAME -- see GetCachedPartMetBasename(). Populate-once:
+	// m_partmetfilename never changes for the lifetime of the partfile, the basename being the
+	// partfile's allocation number.
 	mutable wxString m_cachedPartMetBasename;
-	bool	m_paused;
-	bool	m_stopped;
-	bool	m_insufficient;
-	uint8   m_iDownPriority;
-	bool    m_bAutoDownPriority;
-	uint8	status;
-	uint64	lastpurgetime;
-	uint64	m_LastNoNeededCheck;
+	bool m_paused;
+	bool m_stopped;
+	bool m_insufficient;
+	uint8 m_iDownPriority;
+	bool m_bAutoDownPriority;
+	uint8 status;
+	uint64 lastpurgetime;
+	uint64 m_LastNoNeededCheck;
 	CGapList m_gaplist;
 	CReqBlockPtrList m_requestedblocks_list;
-	double	percentcompleted;
+	double percentcompleted;
 	std::list<uint16> m_corrupted_list;
-	uint16	m_availablePartsCount;
-	uint64	m_ClientSrcAnswered;
-	bool	m_bPercentUpdated;
+	uint16 m_availablePartsCount;
+	uint64 m_ClientSrcAnswered;
+	bool m_bPercentUpdated;
 
-	void	PerformFileComplete();
+	void PerformFileComplete();
 
-	uint64		m_lastRefreshedDLDisplay;
+	uint64 m_lastRefreshedDLDisplay;
 
 	// Buffered data to be written
-	std::list<class PartFileBufferedData*> m_BufferedData_list;
+	std::list<class PartFileBufferedData *> m_BufferedData_list;
 
 	uint32 m_nTotalBufferData;
 	uint64 m_nLastBufferFlushTime;
-	std::atomic<int32> m_iWrites;	// eMule ref: count of items queued to write thread (not yet PB_WRITTEN)
-	std::vector<bool> m_aChangedPart;	// eMule ref: persistent tracking of parts needing hash verification
+	std::atomic<int32> m_iWrites; // eMule ref: count of items queued to write thread (not yet PB_WRITTEN)
+	std::vector<bool> m_aChangedPart; // eMule ref: persistent tracking of parts needing hash verification
 
 	// GetTickCount() at last WriteToBuffer; FlushBuffer's Phase 3
 	// quiescent guard reads this to defer hashing during active receive.
@@ -431,139 +422,141 @@
 	// during destruction (avoids re-sharing a partfile being deleted).
 	bool m_inDestructor = false;
 
-	// Tick (GetTickCount) of the last successful SavePartFile.
-	// Used together with m_statsDirty to throttle soft-stat persistence
-	// to the STATS_HEARTBEAT_MS cadence (see FlushBuffer).
+	// Tick (GetTickCount) of the last successful SavePartFile. Used with m_statsDirty to
+	// throttle soft-stat persistence to the STATS_HEARTBEAT_MS cadence (see FlushBuffer).
 	uint64 m_lastMetSaveTick = 0;
 
-	// Soft-dirty bit for upload-stat counters that increment every time
-	// a peer requests / accepts / transfers a chunk
-	// (CFileStatistic::AddRequest / AddAccepted / AddTransferred).
-	// Promoted to a save only on the STATS_HEARTBEAT_MS cadence so a
-	// popular sharer does not write its .met on every served chunk -- a
-	// pure seeder with active uploads would otherwise re-dirty every
-	// partfile on every block served.  Cleared on a successful save.
+	// Soft-dirty bit for upload-stat counters that increment every time a peer requests,
+	// accepts or transfers a chunk. Promoted to a save only on the STATS_HEARTBEAT_MS cadence,
+	// since a pure seeder with active uploads would otherwise re-dirty every partfile on every
+	// block served. Cleared on a successful save.
 	bool m_statsDirty = false;
 
-	// True when in-memory partfile state has diverged from the on-disk
-	// .part.met since the last successful save.  Gates the periodic
-	// FlushBuffer-driven SavePartFile so idle/seeding partfiles do not
-	// rewrite their .met every 60 s with byte-identical content.
+	// True when in-memory partfile state has diverged from the on-disk .part.met since the last
+	// successful save. Gates the periodic FlushBuffer-driven SavePartFile, so idle partfiles do
+	// not rewrite their .met every 60 s with byte-identical content.
 	//
-	// Set by MarkMetDirty() at every mutation of a field that ends up
-	// in the .met (gap list, status, priorities, category, AICH state,
-	// corrupted list, lastseencomplete, filename).  Cleared by a
-	// successful SavePartFile().  Stat counters (transferred,
-	// AllTimeRequests, etc.) and download active time deliberately do
-	// NOT mark dirty -- they persist on the next hard-state change or
-	// at shutdown via the destructor's explicit save, and a session's
-	// counters surviving across a crash is best-effort by design.
+	// Set by MarkMetDirty() at every mutation of a field that ends up in the .met (gap list,
+	// status, priorities, category, AICH state, corrupted list, lastseencomplete, filename),
+	// and cleared by a successful SavePartFile(). Stat counters and download active time
+	// deliberately do NOT mark dirty: they persist on the next hard-state change or at
+	// shutdown, and a session's counters surviving a crash is best-effort by design.
 	//
-	// Initialised false: the load path constructs CPartFile in a state
-	// matching the just-read .met, so nothing to flush.  LoadPartFile
-	// explicitly ClearMetDirty()s before each successful return to
-	// undo any MarkMetDirty()s incidentally produced by setters during
-	// tag parsing.  New-download path calls SavePartFile(true) which
-	// writes the initial .met and clears the flag.
+	// Initialised false, the load path constructing CPartFile in a state matching the just-read
+	// .met. LoadPartFile explicitly ClearMetDirty()s before each successful return, to undo
+	// MarkMetDirty()s produced incidentally by setters during tag parsing.
 	bool m_metDirty = false;
 
-	// Count of HashJobs in flight on CPartFileHashThread targeting
-	// this file. Incremented before enqueue, decremented by the worker
-	// after HashSinglePart and event-post complete. ~CPartFile waits
-	// for this to reach 0 so the worker is never reading m_hpartfile
-	// while the destructor is closing it.
-	std::atomic<int32> m_pendingHashes{0};
-
-	// Serialises access to m_hpartfile across the main thread,
-	// CPartFileWriteThread and CPartFileHashThread. With ENABLE_MMAP=OFF
-	// (the default), CFileAutoClose::ReadAt / WriteAt both implement
-	// positional I/O as Seek+Read / Seek+Write on the same OS fd, so
-	// concurrent hash reads and disk writes would race on the fd's
-	// file position and corrupt one or the other. Held by:
-	//   * CPartFileWriteThread::Entry around pBuffer->area.FlushAt(...)
-	//   * CPartFileHashThread::Entry around HashSinglePart(...)
-	//   * ~CPartFile's sync-hash drain around HashSinglePart(...)
-	//   * FlushBuffer Phase 2's PB_READY synchronous fallback around
-	//     item->area.FlushAt(...)
+	// Count of HashJobs in flight on CPartFileHashThread for this file. Incremented before
+	// enqueue, decremented by the worker after HashSinglePart and the event post complete.
+	// ~CPartFile waits for it to reach 0, so the worker is never reading m_hpartfile while the
+	// destructor closes it.
+	std::atomic<int32> m_pendingHashes{ 0 };
+
+	// Serialises access to m_hpartfile across the main thread, CPartFileWriteThread and
+	// CPartFileHashThread. With ENABLE_MMAP=OFF (the default), CFileAutoClose::ReadAt / WriteAt
+	// are Seek+Read / Seek+Write on the same OS fd, so concurrent hash reads and disk writes
+	// would race on the file position. Held by CPartFileWriteThread::Entry,
+	// CPartFileHashThread::Entry, ~CPartFile's sync-hash drain, and FlushBuffer Phase 2's
+	// PB_READY synchronous fallback.
 	std::mutex m_hpartfileMutex;
 
-	uint8	m_category;
-	uint32	m_nDlActiveTime;
-	time_t  m_tActivated;
-	bool	m_is_A4AF_auto;
+	/// The EC-exported values Process() can move in a single tick, as of the last tick that
+	/// moved any of them. Lets the per-tick mark tell a file that actually did something from
+	/// one that merely got a second older -- see the comment on the comparison in Process().
+	/// Ordered to match the capture there; the values only exist to be compared, so a plain
+	/// array avoids naming ten fields twice.
+	std::array<uint64, 12> m_ecTickState{};
+
+	uint8 m_category;
+	uint32 m_nDlActiveTime;
+	time_t m_tActivated;
+	bool m_is_A4AF_auto;
 
-	SourceSet	m_SrcList;
-	SourceSet	m_A4AFsrclist;
-	bool		m_hashsetneeded;
-	uint64		m_lastsearchtime;
-	bool		m_localSrcReqQueued;
+	SourceSet m_SrcList;
+	SourceSet m_A4AFsrclist;
+	bool m_hashsetneeded;
+	uint64 m_lastsearchtime;
+	bool m_localSrcReqQueued;
 
 #ifdef CLIENT_GUI
-	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;
+	// Ratings/comments cache + accessors live on CAbstractFile now (shared with
+	// shared files and search results).
+
+	uint32 m_kbpsDown;
+	uint8 m_iDownPriorityEC;
+	bool m_isShared;
 	SourcenameItemMap m_SourcenameItemMap;
 
-	ListOfUInts32	m_A4AFClientIDs;
-	ListOfUInts32 & GetA4AFClientIDs()			{ return m_A4AFClientIDs; }
+	ListOfUInts32 m_A4AFClientIDs;
+	ListOfUInts32 &GetA4AFClientIDs() { return m_A4AFClientIDs; }
+
 public:
-	bool	IsShared() const					{ return m_isShared; }
-	SourcenameItemMap &GetSourcenameItemMap()	{ return m_SourcenameItemMap; }
+	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; }
+	bool IsHashSetNeeded() const { return m_hashsetneeded; }
+	void SetHashSetNeeded(bool value) { m_hashsetneeded = value; }
 
-	uint64  GetCompletedSize() const			{ return completedsize; }
-	void	SetCompletedSize(uint64 size)		{ completedsize = size; }
+	uint64 GetCompletedSize() const { return completedsize; }
+	void SetCompletedSize(uint64 size) { completedsize = size; }
 
-	bool IsLocalSrcRequestQueued() const		{ return m_localSrcReqQueued; }
-	void SetLocalSrcRequestQueued(bool value)	{ m_localSrcReqQueued = value; }
+	bool IsLocalSrcRequestQueued() const { return m_localSrcReqQueued; }
+	void SetLocalSrcRequestQueued(bool value) { m_localSrcReqQueued = value; }
 
-	void AddA4AFSource(CUpDownClient* src)		{ m_A4AFsrclist.insert(CCLIENTREF(src, "A4AFSource")); }
-	bool RemoveA4AFSource(CUpDownClient* src)	{ return (m_A4AFsrclist.erase(CCLIENTREF(src, "")) > 0); }
+	void AddA4AFSource(CUpDownClient *src) { m_A4AFsrclist.insert(CCLIENTREF(src, "A4AFSource")); }
+	bool RemoveA4AFSource(CUpDownClient *src) { return (m_A4AFsrclist.erase(CCLIENTREF(src, "")) > 0); }
 
-	uint64 GetLastSearchTime() const			{ return m_lastsearchtime; }
-	void SetLastSearchTime(uint64 time)			{ m_lastsearchtime = time; }
+	uint64 GetLastSearchTime() const { return m_lastsearchtime; }
+	void SetLastSearchTime(uint64 time) { m_lastsearchtime = time; }
 
-	void AddDownloadingSource(CUpDownClient* client);
+	void AddDownloadingSource(CUpDownClient *client);
 
-	void RemoveDownloadingSource(CUpDownClient* client);
+	void RemoveDownloadingSource(CUpDownClient *client);
 	void SetStatus(uint8 in);
 	void StopPausedFile();
 
 	// sivka / Tarod Imported from eMule 0.30c (Creteil) ...
 	// EC exports the flag via EC_TAG_PARTFILE_A4AFAUTO; mark on change.
-	void SetA4AFAuto(bool in)		{ if (m_is_A4AF_auto != in) { MarkECChanged(); } m_is_A4AF_auto = in; }
-	bool IsA4AFAuto() const			{ return m_is_A4AF_auto; }
+	void SetA4AFAuto(bool in)
+	{
+		if (m_is_A4AF_auto != in) {
+			MarkECChanged();
+		}
+		m_is_A4AF_auto = in;
+	}
+	bool IsA4AFAuto() const { return m_is_A4AF_auto; }
 
 	// Kry -Sources seeds
 	void SaveSourceSeeds();
 	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);
+	/**
+	 * Reads part-file data into @a area, @a toread bytes from absolute offset @a offset.
+	 *
+	 * @param handleClosed Set when the read failed only because the completion path had already
+	 * closed the file. That is the one recoverable failure; every other one is a real error and
+	 * must not be silently swallowed by the caller.
+	 * @return true on success, false on any failure.
+	 */
+	bool ReadData(class CFileArea &area, uint64 offset, uint32 toread, bool *handleClosed = nullptr);
 
 private:
 	/* downloading sources list */
 	CClientRefList m_downloadingSourcesList;
 
 	/* Kad Stuff */
-	uint64	m_LastSearchTimeKad;
-	uint8	m_TotalSearchesKad;
+	uint64 m_LastSearchTimeKad;
+	uint8 m_TotalSearchesKad;
 
-friend class CKnownFilesRem;
-friend class CPartFileConvert;
+	friend class CKnownFilesRem;
+	friend class CPartFileConvert;
 };
 
 #endif // PARTFILE_H

amule-3.0.1.tar.gz/src/PartFileConvert.cpp -> amule-3.1.0.tar.gz/src/PartFileConvert.cpp Changed

@@ -41,36 +41,46 @@
 
 static unsigned s_nextJobId = 0;
 
-
-struct ConvertJob {
-	unsigned	id;
-	CPath		folder;
-	CPath		filename;
-	wxString	filehash;
-	ConvStatus	state;
-	uint32_t	size;
-	uint32_t	spaceneeded;
-	uint8		partmettype;
-	bool		removeSource;
-	ConvertJob(const CPath& file, bool deleteSource, ConvStatus status)
-		: id(s_nextJobId++), folder(file), state(status), size(0), spaceneeded(0), partmettype(PMT_UNKNOWN), removeSource(deleteSource)
-		{}
+struct ConvertJob
+{
+	unsigned id;
+	CPath folder;
+	CPath filename;
+	wxString filehash;
+	ConvStatus state;
+	uint32_t size;
+	uint32_t spaceneeded;
+	uint8 partmettype;
+	bool removeSource;
+	ConvertJob(const CPath &file, bool deleteSource, ConvStatus status)
+	: id(s_nextJobId++)
+	, folder(file)
+	, state(status)
+	, size(0)
+	, spaceneeded(0)
+	, partmettype(PMT_UNKNOWN)
+	, removeSource(deleteSource)
+	{
+	}
 };
 
 ConvertInfo::ConvertInfo(ConvertJob *job)
-	: id(job->id),
-	  folder(job->folder), filename(job->filename), filehash(job->filehash),
-	  state(job->state), size(job->size), spaceneeded(job->spaceneeded)
-{}
-
-
-wxThread*		CPartFileConvert::s_convertPfThread = NULL;
-std::list<ConvertJob*>	CPartFileConvert::s_jobs;
-ConvertJob*		CPartFileConvert::s_pfconverting = NULL;
-wxMutex			CPartFileConvert::s_mutex;
+: id(job->id)
+, folder(job->folder)
+, filename(job->filename)
+, filehash(job->filehash)
+, state(job->state)
+, size(job->size)
+, spaceneeded(job->spaceneeded)
+{
+}
 
+wxThread *CPartFileConvert::s_convertPfThread = NULL;
+std::list<ConvertJob *> CPartFileConvert::s_jobs;
+ConvertJob *CPartFileConvert::s_pfconverting = NULL;
+wxMutex CPartFileConvert::s_mutex;
 
-int CPartFileConvert::ScanFolderToAdd(const CPath& folder, bool deletesource)
+int CPartFileConvert::ScanFolderToAdd(const CPath &folder, bool deletesource)
 {
 	int count = 0;
 	CDirIterator finder(folder);
@@ -100,13 +110,13 @@
 	return count;
 }
 
-void CPartFileConvert::ConvertToeMule(const CPath& file, bool deletesource)
+void CPartFileConvert::ConvertToeMule(const CPath &file, bool deletesource)
 {
 	if (!file.FileExists()) {
 		return;
 	}
 
-	ConvertJob* newjob = new ConvertJob(file, deletesource, CONV_QUEUE);
+	ConvertJob *newjob = new ConvertJob(file, deletesource, CONV_QUEUE);
 
 	wxMutexLocker lock(s_mutex);
 
@@ -122,18 +132,19 @@
 	if (!s_convertPfThread) {
 		s_convertPfThread = new CPartFileConvert();
 
-		switch ( s_convertPfThread->Create() ) {
-			case wxTHREAD_NO_ERROR:
-				AddDebugLogLineN( logPfConvert, "A new thread has been created." );
-				break;
-			case wxTHREAD_RUNNING:
-				AddDebugLogLineC( logPfConvert, "Error, attempt to create an already running thread!" );
-				break;
-			case wxTHREAD_NO_RESOURCE:
-				AddDebugLogLineC( logPfConvert, "Error, attempt to create a thread without resources!" );
-				break;
-			default:
-				AddDebugLogLineC( logPfConvert, "Error, unknown error attempting to create a thread!" );
+		switch (s_convertPfThread->Create()) {
+		case wxTHREAD_NO_ERROR:
+			AddDebugLogLineN(logPfConvert, "A new thread has been created.");
+			break;
+		case wxTHREAD_RUNNING:
+			AddDebugLogLineC(logPfConvert, "Error, attempt to create an already running thread!");
+			break;
+		case wxTHREAD_NO_RESOURCE:
+			AddDebugLogLineC(
+				logPfConvert, "Error, attempt to create a thread without resources!");
+			break;
+		default:
+			AddDebugLogLineC(logPfConvert, "Error, unknown error attempting to create a thread!");
 		}
 
 		// The thread shouldn't hog the CPU, as it will already be hogging the HD
@@ -161,13 +172,13 @@
 {
 	int imported = 0;
 
-	for (;;)
-	{
+	for (;;) {
 		// search next queued job and start it
 		{
 			wxMutexLocker lock(s_mutex);
 			s_pfconverting = NULL;
-			for (std::list<ConvertJob*>::iterator it = s_jobs.begin(); it != s_jobs.end(); ++it) {
+			for (std::list<ConvertJob *>::iterator it = s_jobs.begin(); it != s_jobs.end();
+				++it) {
 				if ((*it)->state == CONV_QUEUE) {
 					s_pfconverting = *it;
 					break;
@@ -195,7 +206,8 @@
 
 			Notify_ConvertUpdateJobInfo(s_pfconverting);
 
-			AddLogLineC(CFormat(_("Importing %s: %s")) % s_pfconverting->folder % GetConversionState(s_pfconverting->state));
+			AddLogLineC(CFormat(_("Importing %s: %s")) % s_pfconverting->folder %
+				    GetConversionState(s_pfconverting->state));
 
 			if (TestDestroy()) {
 				wxMutexLocker lock(s_mutex);
@@ -221,12 +233,12 @@
 	return NULL;
 }
 
-ConvStatus CPartFileConvert::performConvertToeMule(const CPath& fileName)
+ConvStatus CPartFileConvert::performConvertToeMule(const CPath &fileName)
 {
 	wxString filepartindex;
 
-	CPath folder	= fileName.GetPath();
-	CPath partfile	= fileName.GetFullName();
+	CPath folder = fileName.GetPath();
+	CPath partfile = fileName.GetFullName();
 	CPath newfilename;
 
 	CDirIterator finder(folder);
@@ -237,14 +249,14 @@
 
 	Notify_ConvertUpdateProgress(4, _("Retrieving basic information from download info file"));
 
-	CPartFile* file = new CPartFile();
+	CPartFile *file = new CPartFile();
 	s_pfconverting->partmettype = file->LoadPartFile(folder, partfile, false, true);
 
 	switch (s_pfconverting->partmettype) {
-		case PMT_UNKNOWN:
-		case PMT_BADFORMAT:
-			delete file;
-			return CONV_BADFORMAT;
+	case PMT_UNKNOWN:
+	case PMT_BADFORMAT:
+		delete file;
+		return CONV_BADFORMAT;
 	}
 
 	CPath oldfile = folder.JoinPaths(partfile.RemoveExt());
@@ -265,7 +277,7 @@
 
 	if (s_pfconverting->partmettype == PMT_SPLITTED) {
 		unsigned fileindex;
-		char *ba = new char PARTSIZE;
+		char *ba = new charPARTSIZE;
 
 		try {
 			CFile inputfile;
@@ -280,7 +292,8 @@
 				filePath.GetFullName().RemoveExt().GetExt().ToULong(&l);
 				fileindex = static_cast<uint32>(l);
 				filePath = finder.GetNextFile();
-				if (fileindex > maxindex) maxindex = fileindex;
+				if (fileindex > maxindex)
+					maxindex = fileindex;
 			}
 			float stepperpart;
 			{
@@ -304,7 +317,7 @@
 			if (freespace != wxInvalidOffset) {
 				if (static_cast<uint64>(freespace) < maxindex * PARTSIZE) {
 					delete file;
-					delete  ba;
+					delete ba;
 					return CONV_OUTOFDISKSPACE;
 				}
 			}
@@ -315,7 +328,7 @@
 
 			Notify_ConvertUpdateProgress(8, _("Creating destination file"));
 
-			file->m_hpartfile.SetLength( s_pfconverting->spaceneeded );
+			file->m_hpartfile.SetLength(s_pfconverting->spaceneeded);
 
 			unsigned curindex = 0;
 			CPath filename = finder.GetFirstFile(CDirIterator::File, filepartindex + ".*.part");
@@ -323,7 +336,9 @@
 				// stats
 				++curindex;
 
-				Notify_ConvertUpdateProgress(10 + (curindex * stepperpart), CFormat(_("Loading data from old download file (%u of %u)")) % curindex % partfilecount);
+				Notify_ConvertUpdateProgress(10 + (curindex * stepperpart),
+					CFormat(_("Loading data from old download file (%u of %u)")) %
+						curindex % partfilecount);
 
 				unsigned long l = 0;
 				filename.GetFullName().RemoveExt().GetExt().ToULong(&l);
@@ -341,7 +356,10 @@
 				inputfile.Read(ba, toReadWrite);
 				inputfile.Close();
 
-				Notify_ConvertUpdateProgress(10 + (curindex * stepperpart), CFormat(_("Saving data block into new single download file (%u of %u)")) % curindex % partfilecount);
+				Notify_ConvertUpdateProgress(10 + (curindex * stepperpart),
+					CFormat(_("Saving data block into new single download file (%u of "
+						  "%u)")) %
+						curindex % partfilecount);
 
 				// write the buffered data
 				file->m_hpartfile.WriteAt(ba, chunkstart, toReadWrite);
@@ -349,7 +367,7 @@
 				filename = finder.GetNextFile();
 			}
 			delete ba;
-		} catch (const CSafeIOException& e) {
+		} catch (const CSafeIOException &e) {
 			AddDebugLogLineC(logPfConvert, "IO error while converting partfiles: " + e.what());
 
 			delete ba;
@@ -360,7 +378,8 @@
 		file->m_hpartfile.Close();
 	}
 	// import an external common format partdownload
-	else //if (pfconverting->partmettype==PMT_DEFAULTOLD || pfconverting->partmettype==PMT_NEWOLD || Shareaza  )
+	else // if (pfconverting->partmettype==PMT_DEFAULTOLD || pfconverting->partmettype==PMT_NEWOLD ||
+	     // Shareaza  )
 	{
 		if (!s_pfconverting->removeSource) {
 			wxMutexLocker lock(s_mutex);
@@ -395,14 +414,13 @@
 		} else if (s_pfconverting->removeSource) {
 			ret = CPath::RenameFile(oldfile, newfilename.RemoveExt());
 		} else {
-			ret = CPath::CloneFile(oldfile, newfilename.RemoveExt(), false);
+			ret = CFile::CloneFile(oldfile, newfilename.RemoveExt(), false);
 		}
 		if (!ret) {
 			file->Delete();
-			//delete file;
+			// delete file;
 			return CONV_FAILED;
 		}
-
 	}
 
 	Notify_ConvertUpdateProgress(94, _("Retrieving source downloadfile information"));
@@ -411,13 +429,13 @@
 	if (s_pfconverting->removeSource) {
 		CPath::RenameFile(folder.JoinPaths(partfile), newfilename);
 	} else {
-		CPath::CloneFile(folder.JoinPaths(partfile), newfilename, false);
+		CFile::CloneFile(folder.JoinPaths(partfile), newfilename, false);
 	}
 
 	file->m_hashlist.clear();
 
 	if (!file->LoadPartFile(thePrefs::GetTempDir(), file->GetPartMetFileName(), false)) {
-		//delete file;
+		// delete file;
 		file->Delete();
 		return CONV_BADFORMAT;
 	}
@@ -457,7 +475,7 @@
 void CPartFileConvert::RemoveJob(unsigned id)
 {
 	wxMutexLocker lock(s_mutex);
-	for (std::list<ConvertJob*>::iterator it = s_jobs.begin(); it != s_jobs.end(); ++it) {
+	for (std::list<ConvertJob *>::iterator it = s_jobs.begin(); it != s_jobs.end(); ++it) {
 		if ((*it)->id == id && (*it)->state != CONV_INPROGRESS) {
 			ConvertJob *job = *it;
 			s_jobs.erase(it);
@@ -471,7 +489,7 @@
 void CPartFileConvert::RetryJob(unsigned id)
 {
 	wxMutexLocker lock(s_mutex);
-	for (std::list<ConvertJob*>::iterator it = s_jobs.begin(); it != s_jobs.end(); ++it) {
+	for (std::list<ConvertJob *>::iterator it = s_jobs.begin(); it != s_jobs.end(); ++it) {
 		if ((*it)->id == id && (*it)->state != CONV_INPROGRESS && (*it)->state != CONV_OK) {
 			(*it)->state = CONV_QUEUE;
 			Notify_ConvertUpdateJobInfo(*it);
@@ -484,7 +502,7 @@
 void CPartFileConvert::ReaddAllJobs()
 {
 	wxMutexLocker lock(s_mutex);
-	for (std::list<ConvertJob*>::iterator it = s_jobs.begin(); it != s_jobs.end(); ++it) {
+	for (std::list<ConvertJob *>::iterator it = s_jobs.begin(); it != s_jobs.end(); ++it) {
 		Notify_ConvertUpdateJobInfo(*it);
 	}
 }

amule-3.0.1.tar.gz/src/PartFileConvert.h -> amule-3.1.0.tar.gz/src/PartFileConvert.h Changed

@@ -24,12 +24,12 @@
 //
 
 #ifndef PARTFILECONVERT_H
-#if !defined __need_convertinfo
-#	define PARTFILECONVERT_H
+#if !defined NEED_CONVERTINFO
+#define PARTFILECONVERT_H
 #endif
 
-#if !defined __have_convertinfo && (defined __need_convertinfo || defined PARTFILECONVERT_H)
-#define __have_convertinfo
+#if !defined HAVE_CONVERTINFO && (defined NEED_CONVERTINFO || defined PARTFILECONVERT_H)
+#define HAVE_CONVERTINFO
 
 #include "Constants.h"
 #include "Types.h"
@@ -37,19 +37,20 @@
 
 struct ConvertJob;
 
-struct ConvertInfo {
-	unsigned	id;
-	CPath		folder;
-	CPath		filename;
-	wxString	filehash;
-	ConvStatus	state;
-	uint32_t	size;
-	uint32_t	spaceneeded;
+struct ConvertInfo
+{
+	unsigned id;
+	CPath folder;
+	CPath filename;
+	wxString filehash;
+	ConvStatus state;
+	uint32_t size;
+	uint32_t spaceneeded;
 	ConvertInfo(ConvertJob *);
 };
 
 #endif /* convertinfo */
-#undef __need_convertinfo
+#undef NEED_CONVERTINFO
 
 #ifdef PARTFILECONVERT_H
 
@@ -58,25 +59,28 @@
 class CPartFileConvert : private wxThread
 {
 public:
-	static int	ScanFolderToAdd(const CPath& folder, bool deletesource = false);
-	static void	ConvertToeMule(const CPath& file, bool deletesource = false);
-	static void	StartThread();
-	static void	StopThread();
+	static int ScanFolderToAdd(const CPath &folder, bool deletesource = false);
+	static void ConvertToeMule(const CPath &file, bool deletesource = false);
+	static void StartThread();
+	static void StopThread();
 
-	static void	RemoveJob(unsigned id);
-	static void	RetryJob(unsigned id);
-	static void	ReaddAllJobs();
+	static void RemoveJob(unsigned id);
+	static void RetryJob(unsigned id);
+	static void ReaddAllJobs();
 
 private:
-	CPartFileConvert() : wxThread(wxTHREAD_DETACHED) {}
+	CPartFileConvert()
+	: wxThread(wxTHREAD_DETACHED)
+	{
+	}
 
-	static ConvStatus	performConvertToeMule(const CPath& file);
-	virtual ExitCode	Entry();
+	static ConvStatus performConvertToeMule(const CPath &file);
+	virtual ExitCode Entry();
 
-	static wxMutex			s_mutex;
-	static wxThread*		s_convertPfThread;
-	static std::list<ConvertJob*>	s_jobs;
-	static ConvertJob*		s_pfconverting;
+	static wxMutex s_mutex;
+	static wxThread *s_convertPfThread;
+	static std::list<ConvertJob *> s_jobs;
+	static ConvertJob *s_pfconverting;
 };
 
 #endif

amule-3.0.1.tar.gz/src/PartFileConvertDlg.cpp -> amule-3.1.0.tar.gz/src/PartFileConvertDlg.cpp Changed

@@ -37,63 +37,66 @@
 #include <wx/stdpaths.h>
 #include "muuli_wdr.h"
 
-CPartFileConvertDlg*	CPartFileConvertDlg::s_convert_gui = NULL;
-
+CPartFileConvertDlg *CPartFileConvertDlg::s_convert_gui = NULL;
 
 #ifndef __WINDOWS__
 /* XPM */
-static const char * convert_xpm = {
-"16 16 9 1",
-" 	c None",
-".	c #B20000",
-"+	c #FF0000",
-"@	c #FF7F7F",
-"#	c #008000",
-"$	c #33B200",
-"%	c #10E500",
-"&	c #59FE4C",
-"*	c #FFB2B2",
-"        .       ",
-"       .+.      ",
-"      .+@+.     ",
-"     .+@+.      ",
-".   .+@+.#######",
-".. .+@+.  #$%%&#",
-".+.+@+.    #$%%#",
-".@+@+.    #$%$%#",
-".@@+.    #$%$#$#",
-".*@@+.  #$%$# ##",
-".......#$%$#   #",
-"      #$%$#     ",
-"     #$%$#      ",
-"    #$%$#       ",
-"     #$#        ",
-"      #         "};
+static const char *convert_xpm = { "16 16 9 1",
+	" 	c None",
+	".	c #B20000",
+	"+	c #FF0000",
+	"@	c #FF7F7F",
+	"#	c #008000",
+	"$	c #33B200",
+	"%	c #10E500",
+	"&	c #59FE4C",
+	"*	c #FFB2B2",
+	"        .       ",
+	"       .+.      ",
+	"      .+@+.     ",
+	"     .+@+.      ",
+	".   .+@+.#######",
+	".. .+@+.  #$%%&#",
+	".+.+@+.    #$%%#",
+	".@+@+.    #$%$%#",
+	".@@+.    #$%$#$#",
+	".*@@+.  #$%$# ##",
+	".......#$%$#   #",
+	"      #$%$#     ",
+	"     #$%$#      ",
+	"    #$%$#       ",
+	"     #$#        ",
+	"      #         " };
 #endif /* ! __WINDOWS__ */
 
 // Modeless Dialog Implementation
 // CPartFileConvertDlg dialog
 
 wxBEGIN_EVENT_TABLE(CPartFileConvertDlg, wxDialog)
-	EVT_BUTTON(IDC_ADDITEM,		CPartFileConvertDlg::OnAddFolder)
-	EVT_BUTTON(IDC_RETRY,		CPartFileConvertDlg::RetrySel)
-	EVT_BUTTON(IDC_CONVREMOVE,	CPartFileConvertDlg::RemoveSel)
-	EVT_BUTTON(wxID_CANCEL,		CPartFileConvertDlg::OnCloseButton)
+	EVT_BUTTON(IDC_ADDITEM, CPartFileConvertDlg::OnAddFolder)
+	EVT_BUTTON(IDC_RETRY, CPartFileConvertDlg::RetrySel)
+	EVT_BUTTON(IDC_CONVREMOVE, CPartFileConvertDlg::RemoveSel)
+	EVT_BUTTON(wxID_CANCEL, CPartFileConvertDlg::OnCloseButton)
 	EVT_CLOSE(CPartFileConvertDlg::OnClose)
 wxEND_EVENT_TABLE()
 
-CPartFileConvertDlg::CPartFileConvertDlg(wxWindow* parent)
-	: wxDialog(parent, -1, _("Import partfiles"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
+CPartFileConvertDlg::CPartFileConvertDlg(wxWindow *parent)
+: wxDialog(parent,
+	  -1,
+	  _("Import partfiles"),
+	  wxDefaultPosition,
+	  wxDefaultSize,
+	  wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
 	convertDlg(this, true, true);
 
 	m_joblist = CastChild(IDC_JOBLIST, wxListCtrl);
 	m_pb_current = CastChild(IDC_CONV_PB_CURRENT, wxGauge);
 
-	m_joblist->InsertColumn(0, _("File name"),	wxLIST_FORMAT_LEFT, 200);
-	m_joblist->InsertColumn(1, _("State"),		wxLIST_FORMAT_LEFT, 100);
-	m_joblist->InsertColumn(2, _("Size"),		wxLIST_FORMAT_LEFT, 100);
-	m_joblist->InsertColumn(3, _("Filehash"),	wxLIST_FORMAT_LEFT, 100);
+	m_joblist->InsertColumn(0, _("File name"), wxLIST_FORMAT_LEFT, 200);
+	m_joblist->InsertColumn(1, _("State"), wxLIST_FORMAT_LEFT, 100);
+	m_joblist->InsertColumn(2, _("Size"), wxLIST_FORMAT_LEFT, 100);
+	m_joblist->InsertColumn(3, _("Filehash"), wxLIST_FORMAT_LEFT, 100);
 
 	SetIcon(wxICON(convert));
 
@@ -108,7 +111,7 @@
 
 // Static methods
 
-void CPartFileConvertDlg::ShowGUI(wxWindow* parent)
+void CPartFileConvertDlg::ShowGUI(wxWindow *parent)
 {
 	if (s_convert_gui) {
 		s_convert_gui->Show(true);
@@ -134,17 +137,19 @@
 	if (s_convert_gui) {
 		s_convert_gui->m_pb_current->SetValue((int)percent);
 		wxString buffer = CFormat("%.2f %%") % percent;
-		wxStaticText* percentlabel = dynamic_cast<wxStaticText*>(s_convert_gui->FindWindow(IDC_CONV_PROZENT));
+		wxStaticText *percentlabel =
+			dynamic_cast<wxStaticText *>(s_convert_gui->FindWindow(IDC_CONV_PROZENT));
 		percentlabel->SetLabel(buffer);
 
 		if (!text.IsEmpty()) {
-			dynamic_cast<wxStaticText*>(s_convert_gui->FindWindow(IDC_CONV_PB_LABEL))->SetLabel(text);
+			dynamic_cast<wxStaticText *>(s_convert_gui->FindWindow(IDC_CONV_PB_LABEL))
+				->SetLabel(text);
 		}
 
 		percentlabel->GetParent()->Layout();
 
 		if (!header.IsEmpty()) {
-			dynamic_cast<wxStaticBoxSizer*>(IDC_CURJOB)->GetStaticBox()->SetLabel(header);
+			dynamic_cast<wxStaticBoxSizer *>(IDC_CURJOB)->GetStaticBox()->SetLabel(header);
 		}
 	}
 }
@@ -152,31 +157,38 @@
 void CPartFileConvertDlg::ClearInfo()
 {
 	if (s_convert_gui) {
-		dynamic_cast<wxStaticBoxSizer*>(IDC_CURJOB)->GetStaticBox()->SetLabel(_("Waiting..."));
-		dynamic_cast<wxStaticText*>(s_convert_gui->FindWindow(IDC_CONV_PROZENT))->SetLabel("");
+		dynamic_cast<wxStaticBoxSizer *>(IDC_CURJOB)->GetStaticBox()->SetLabel(_("Waiting..."));
+		dynamic_cast<wxStaticText *>(s_convert_gui->FindWindow(IDC_CONV_PROZENT))->SetLabel("");
 		s_convert_gui->m_pb_current->SetValue(0);
-		dynamic_cast<wxStaticText*>(s_convert_gui->FindWindow(IDC_CONV_PB_LABEL))->SetLabel("");
+		dynamic_cast<wxStaticText *>(s_convert_gui->FindWindow(IDC_CONV_PB_LABEL))->SetLabel("");
 	}
 }
 
-void CPartFileConvertDlg::UpdateJobInfo(ConvertInfo& info)
+void CPartFileConvertDlg::UpdateJobInfo(ConvertInfo &info)
 {
 	if (s_convert_gui) {
 		// search jobitem in listctrl
 		long item_nr = s_convert_gui->m_joblist->FindItem(-1, info.id);
 		// if it does not exist, add it
 		if (item_nr == -1) {
-			item_nr = s_convert_gui->m_joblist->InsertItem(s_convert_gui->m_joblist->GetItemCount(), info.folder.GetPrintable());
+			item_nr = s_convert_gui->m_joblist->InsertItem(
+				s_convert_gui->m_joblist->GetItemCount(), info.folder.GetPrintable());
 			if (item_nr != -1) {
 				s_convert_gui->m_joblist->SetItemData(item_nr, info.id);
 			}
 		}
 		// update columns
 		if (item_nr != -1) {
-			s_convert_gui->m_joblist->SetItem(item_nr, 0, info.filename.IsOk() ? info.folder.GetPrintable() : info.filename.GetPrintable() );
-			s_convert_gui->m_joblist->SetItem(item_nr, 1, GetConversionState(info.state) );
+			s_convert_gui->m_joblist->SetItem(item_nr,
+				0,
+				info.filename.IsOk() ? info.folder.GetPrintable()
+						     : info.filename.GetPrintable());
+			s_convert_gui->m_joblist->SetItem(item_nr, 1, GetConversionState(info.state));
 			if (info.size > 0) {
-				s_convert_gui->m_joblist->SetItem(item_nr, 2, CFormat(_("%s (Disk: %s)")) % CastItoXBytes(info.size) % CastItoXBytes(info.spaceneeded));
+				s_convert_gui->m_joblist->SetItem(item_nr,
+					2,
+					CFormat(_("%s (Disk: %s)")) % CastItoXBytes(info.size) %
+						CastItoXBytes(info.spaceneeded));
 			} else {
 				s_convert_gui->m_joblist->SetItem(item_nr, 2, "");
 			}
@@ -197,17 +209,21 @@
 
 // CPartFileConvertDlg message handlers
 
-void CPartFileConvertDlg::OnAddFolder(wxCommandEvent& WXUNUSED(event))
+void CPartFileConvertDlg::OnAddFolder(wxCommandEvent &WXUNUSED(event))
 {
 	// TODO: use MuleRemoteDirSelector
 	wxString folder = ::wxDirSelector(
 		_("Please choose a folder to search for temporary downloads! (subfolders will be included)"),
-		wxStandardPaths::Get().GetDocumentsDir(), wxDD_DEFAULT_STYLE,
-		wxDefaultPosition, this);
+		wxStandardPaths::Get().GetDocumentsDir(),
+		wxDD_DEFAULT_STYLE,
+		wxDefaultPosition,
+		this);
 	if (!folder.IsEmpty()) {
-		int reply = wxMessageBox(_("Do you want the source files of successfully imported downloads be deleted?"),
-					 _("Remove sources?"),
-					 wxYES_NO | wxCANCEL | wxICON_QUESTION, this);
+		int reply = wxMessageBox(
+			_("Do you want the source files of successfully imported downloads be deleted?"),
+			_("Remove sources?"),
+			wxYES_NO | wxCANCEL | wxICON_QUESTION,
+			this);
 		if (reply != wxCANCEL) {
 			// TODO: use notification
 			CPartFileConvert::ScanFolderToAdd(CPath(folder), (reply == wxYES));
@@ -215,33 +231,31 @@
 	}
 }
 
-void CPartFileConvertDlg::OnClose(wxCloseEvent& WXUNUSED(event))
+void CPartFileConvertDlg::OnClose(wxCloseEvent &WXUNUSED(event))
 {
 	CloseGUI();
 }
 
-void CPartFileConvertDlg::OnCloseButton(wxCommandEvent& WXUNUSED(event))
+void CPartFileConvertDlg::OnCloseButton(wxCommandEvent &WXUNUSED(event))
 {
 	CloseGUI();
 }
 
-void CPartFileConvertDlg::RemoveSel(wxCommandEvent& WXUNUSED(event))
+void CPartFileConvertDlg::RemoveSel(wxCommandEvent &WXUNUSED(event))
 {
-	if (m_joblist->GetSelectedItemCount() == 0) return;
-
-	// Collect every selected job id before issuing any removal. The
-	// notification is delivered synchronously on the main thread, so
-	// each Notify_ConvertRemoveJob() reaches CPartFileConvertDlg::
-	// RemoveJobInfo() and DeleteItem()s the row before this function
-	// returns -- which invalidates the next GetNextItem() walk when
-	// the last surviving selected row was the last row overall
-	// (wxGenericListCtrl::GetNextItem asserts "ret < max" because
+	if (m_joblist->GetSelectedItemCount() == 0)
+		return;
+
+	// Collect every selected job id before issuing any removal. The notification is delivered
+	// synchronously on the main thread, so each Notify_ConvertRemoveJob() reaches
+	// CPartFileConvertDlg::RemoveJobInfo() and DeleteItem()s the row before this function
+	// returns -- which invalidates the next GetNextItem() walk when the last surviving selected
+	// row was the last row overall (wxGenericListCtrl::GetNextItem asserts "ret < max" because
 	// item_nr is now past the shrunken end).
 	std::vector<wxUIntPtr> ids;
 	ids.reserve(m_joblist->GetSelectedItemCount());
-	for (long item_nr = m_joblist->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	     item_nr != -1;
-	     item_nr = m_joblist->GetNextItem(item_nr, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) {
+	for (long item_nr = m_joblist->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); item_nr != -1;
+		item_nr = m_joblist->GetNextItem(item_nr, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) {
 		ids.push_back(m_joblist->GetItemData(item_nr));
 	}
 	for (wxUIntPtr id : ids) {
@@ -249,9 +263,10 @@
 	}
 }
 
-void CPartFileConvertDlg::RetrySel(wxCommandEvent& WXUNUSED(event))
+void CPartFileConvertDlg::RetrySel(wxCommandEvent &WXUNUSED(event))
 {
-	if (m_joblist->GetSelectedItemCount() == 0) return;
+	if (m_joblist->GetSelectedItemCount() == 0)
+		return;
 
 	long item_nr = m_joblist->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	while (item_nr != -1) {

amule-3.0.1.tar.gz/src/PartFileConvertDlg.h -> amule-3.1.0.tar.gz/src/PartFileConvertDlg.h Changed

@@ -37,26 +37,26 @@
 public:
 	CPartFileConvertDlg(wxWindow *parent);
 
-	static void	ShowGUI(wxWindow *parent);
-	static void	UpdateProgress(float percent, wxString text = "", wxString header = "");
-	static void	UpdateJobInfo(ConvertInfo& info);
-	static void	RemoveJobInfo(unsigned id);
-	static void	ClearInfo();
-	static void	CloseGUI();
+	static void ShowGUI(wxWindow *parent);
+	static void UpdateProgress(float percent, wxString text = "", wxString header = "");
+	static void UpdateJobInfo(ConvertInfo &info);
+	static void RemoveJobInfo(unsigned id);
+	static void ClearInfo();
+	static void CloseGUI();
 
 protected:
-	wxGauge*	m_pb_current;
-	wxListCtrl*	m_joblist;
+	wxGauge *m_pb_current;
+	wxListCtrl *m_joblist;
 
-	void	OnAddFolder(wxCommandEvent& event);
-	void	OnClose(wxCloseEvent& event);
-	void	OnCloseButton(wxCommandEvent& event);
-	void	RetrySel(wxCommandEvent& event);
-	void	RemoveSel(wxCommandEvent& event);
+	void OnAddFolder(wxCommandEvent &event);
+	void OnClose(wxCloseEvent &event);
+	void OnCloseButton(wxCommandEvent &event);
+	void RetrySel(wxCommandEvent &event);
+	void RemoveSel(wxCommandEvent &event);
 
 	wxDECLARE_EVENT_TABLE();
 
-	static CPartFileConvertDlg*	s_convert_gui;
+	static CPartFileConvertDlg *s_convert_gui;
 };
 
 #endif /* PARTFILECONVERTDLG_H */

amule-3.0.1.tar.gz/src/PartFileHashThread.cpp -> amule-3.1.0.tar.gz/src/PartFileHashThread.cpp Changed

@@ -25,21 +25,19 @@
 
 #include "PartFileHashThread.h"
 
-#include <common/Format.h>		// Needed for CFormat
+#include <common/Format.h> // Needed for CFormat
 
-#include "amule.h"			// Needed for theApp
-#include "GetTickCount.h"		// Needed for GetTickCount64
+#include "amule.h"        // Needed for theApp
+#include "GetTickCount.h" // Needed for GetTickCount64
 #include "Logger.h"
 #include "PartFile.h"
 
-
 // Custom event registration
 DEFINE_LOCAL_EVENT_TYPE(wxEVT_PARTFILE_HASH_RESULT)
 
-
 CPartFileHashThread::CPartFileHashThread()
-	: wxThread(wxTHREAD_JOINABLE)
-	, m_condition(m_mutex)
+: wxThread(wxTHREAD_JOINABLE)
+, m_condition(m_mutex)
 {
 	m_bRun = false;
 	m_bWorkPending = false;
@@ -50,13 +48,11 @@
 	}
 }
 
-
 CPartFileHashThread::~CPartFileHashThread()
 {
 	// EndThread() must have been called before destruction.
 }
 
-
 void CPartFileHashThread::EndThread()
 {
 	{
@@ -68,9 +64,8 @@
 	Wait();
 }
 
-
-void CPartFileHashThread::QueueHashCheck(CPartFile* pFile, uint16 partNumber,
-	bool fromAICHRecoveryDataAvailable)
+void CPartFileHashThread::QueueHashCheck(
+	CPartFile *pFile, uint16 partNumber, bool fromAICHRecoveryDataAvailable)
 {
 	HashJob job;
 	job.pFile = pFile;
@@ -83,24 +78,27 @@
 	m_bWorkPending = true;
 	m_condition.Signal();
 
-	AddDebugLogLineN(logPartFile, CFormat(
-		"Hash thread: enqueued part %u for '%s' (queue size %u)")
-		% partNumber % pFile->GetFileName() % (uint32)m_jobList.size());
+	AddDebugLogLineN(logPartFile,
+		CFormat("Hash thread: enqueued part %u for '%s' (queue size %u)") % partNumber %
+			pFile->GetFileName() % (uint32)m_jobList.size());
 }
 
-
-void* CPartFileHashThread::Entry()
+void *CPartFileHashThread::Entry()
 {
 	m_bRun = true;
 
 	AddDebugLogLineN(logPartFile, wxT("Hash thread: started"));
 
-	while (m_bRun)
-	{
-		// Move queued jobs to a local work list under the lock.
-		// Mirrors CPartFileWriteThread's pattern: minimise lock hold
-		// time so the main thread can keep enqueueing.
+	// Loop until EndThread() clears m_bRun, then drain one final batch before returning.
+	// Dropping a queued job would skip its --m_pendingHashes, the only decrement, and
+	// ~CPartFile blocks on `while (m_pendingHashes > 0)` -- so a dropped job hangs shutdown.
+	// Draining also means the part is actually hashed rather than left unverified, its
+	// m_aChangedPart entry having been cleared at enqueue. Mirrors CPartFileWriteThread.
+	for (;;) {
+		// Move queued jobs to a local work list under the lock, minimising hold time
+		// so the main thread can keep enqueueing.
 		std::list<HashJob> workList;
+		bool keepRunning;
 		{
 			wxMutexLocker lock(m_mutex);
 			if (m_bRun && !m_bWorkPending) {
@@ -108,57 +106,60 @@
 			}
 			m_bWorkPending = false;
 			workList.swap(m_jobList);
+			// Captured under the lock with the swap; the batch we just
+			// took is drained whatever m_bRun does next.
+			keepRunning = m_bRun;
 		}
 
-		for (std::list<HashJob>::iterator it = workList.begin();
-			 it != workList.end() && m_bRun; ++it)
-		{
+		// No m_bRun check in the loop condition: a batch, once taken, is always processed
+		// in full, so a shutdown never abandons a job -- which would leave m_pendingHashes
+		// stuck and hang ~CPartFile.
+		for (std::list<HashJob>::iterator it = workList.begin(); it != workList.end(); ++it) {
 			const uint64 startTick = GetTickCount64();
 
-			// CPartFile::m_pendingHashes was incremented before enqueue
-			// and is the gate that ~CPartFile waits on, so the file
-			// pointer is guaranteed valid here.
+			// CPartFile::m_pendingHashes was incremented before enqueue and is the gate
+			// ~CPartFile waits on, so the file pointer is valid here.
 			//
-			// Lock m_hpartfileMutex against CPartFileWriteThread: with
-			// ENABLE_MMAP=OFF, HashSinglePart's CFileArea::ReadAt does
-			// Seek+Read on the same fd that the write thread does
-			// Seek+Write on for FlushAt; concurrent execution races
-			// on the fd's file position. The quiescent guard at
-			// enqueue time only gates dispatch — it does not prevent
-			// writes from resuming while the hash thread is still
-			// chewing through a backlog (e.g. user pause → drain →
-			// resume mid-drain). See CPartFile::m_hpartfileMutex.
+			// Lock m_hpartfileMutex against CPartFileWriteThread: with ENABLE_MMAP=OFF,
+			// HashSinglePart's CFileArea::ReadAt does Seek+Read on the same fd the
+			// write thread does Seek+Write on, and the two race on the file position.
+			// The quiescent guard at enqueue time only gates dispatch; it does not stop
+			// writes resuming while the hash thread is still working through a backlog.
 			bool ok;
 			{
 				std::lock_guard<std::mutex> lock(it->pFile->m_hpartfileMutex);
 				ok = it->pFile->HashSinglePart(it->partNumber);
 			}
-			//uint32 shall be enough time to hash a file
+			// uint32 shall be enough time to hash a file
 			const uint32 elapsedMs = GetTickCount64() - startTick;
 
-			AddDebugLogLineN(logPartFile, CFormat(
-				"Hash thread: part %u %s in %u ms for '%s'")
-				% it->partNumber
-				% (ok ? wxT("ok") : wxT("CORRUPT"))
-				% elapsedMs
-				% it->pFile->GetFileName());
+			AddDebugLogLineN(logPartFile,
+				CFormat("Hash thread: part %u %s in %u ms for '%s'") % it->partNumber %
+					(ok ? wxT("ok") : wxT("CORRUPT")) % elapsedMs %
+					it->pFile->GetFileName());
 			// Silence the unused-variable warning in release builds, where
-			// AddDebugLogLineN above compiles to a no-op.  Caught on lint
-			// as clang-analyzer-deadcode.DeadStores.
+			// AddDebugLogLineN above compiles to a no-op. Caught on lint as clang-
+			// analyzer-deadcode.DeadStores.
 			wxUnusedVar(elapsedMs);
 
-			// Post result back to the main thread.  Carries fileHash
-			// (not pointer) so the handler can drop the event safely if
-			// the file was removed between enqueue and dispatch.
-			CPartFileHashResultEvent evt(it->fileHash, it->partNumber, ok,
-				it->fromAICHRecoveryDataAvailable);
+			// Post the result back to the main thread. Carries fileHash rather than a
+			// pointer, so the handler can drop the event safely if the file was removed
+			// between enqueue and dispatch.
+			CPartFileHashResultEvent evt(
+				it->fileHash, it->partNumber, ok, it->fromAICHRecoveryDataAvailable);
 			theApp->AddPendingEvent(evt);
 
-			// Decrement m_pendingHashes here (after work is fully done
-			// AND event posted) so ~CPartFile's wait on the counter
-			// includes the event-post step.
+			// Decrement m_pendingHashes here, after the work is fully done AND the
+			// event posted, so ~CPartFile's wait on the counter includes the event-post
+			// step.
 			--it->pFile->m_pendingHashes;
 		}
+
+		// Exit only after the batch above is fully processed, so every
+		// job's --m_pendingHashes runs and ~CPartFile's wait can complete.
+		if (!keepRunning) {
+			break;
+		}
 	}
 
 	AddDebugLogLineN(logPartFile, wxT("Hash thread: exiting"));

amule-3.0.1.tar.gz/src/PartFileHashThread.h -> amule-3.1.0.tar.gz/src/PartFileHashThread.h Changed

@@ -27,39 +27,36 @@
 #define PARTFILEHASHTHREAD_H
 
 #include <list>
+#include <atomic>
 #include <wx/event.h>
 #include <wx/thread.h>
 
-#include "MD4Hash.h"		// Needed for CMD4Hash
+#include "MD4Hash.h" // Needed for CMD4Hash
 
 class CPartFile;
 
-// Async per-part MD4 verifier.  Mirrors CPartFileWriteThread's structure:
-// a single dedicated worker that pops jobs from a queue, runs the work
-// synchronously on its own thread, and posts a result event back to the
-// main thread.
+// Async per-part MD4 verifier. Mirrors CPartFileWriteThread's structure: a single dedicated worker
+// that pops jobs from a queue, runs the work synchronously on its own thread, and posts a result
+// event back to the main thread.
 //
-// Why off-main: HashSinglePart reads ~9.28 MB from disk and runs MD4 — on
-// a slow disk that's 100-200 ms per part, above CORE_TIMER_PERIOD.  Doing
-// it on the main thread starves OnCoreTimer (UI redraws, asio dispatch)
-// during pause/resume drain and at any moment several dirty parts have
+// Why off-main: HashSinglePart reads ~9.28 MB from disk and runs MD4 -- on a slow disk that is
+// 100-200 ms per part, above CORE_TIMER_PERIOD. On the main thread it starves OnCoreTimer (UI
+// redraws, asio dispatch) during a pause/resume drain, and whenever several dirty parts have
 // accumulated.
 //
-// Why no throughput regression vs PR #454 (which rejected an async-hash
-// thread): the caller's quiescent guard ensures we only enqueue 1 s after
-// the last receive, so the worker's read for hashing never competes with
-// CPartFileWriteThread's write for the same disk.
+// Why no throughput regression against PR #454, which rejected an async-hash thread: the caller's
+// quiescent guard only enqueues 1 s after the last receive, so the worker's read for hashing never
+// competes with CPartFileWriteThread's write for the same disk.
 struct HashJob
 {
 	CPartFile *pFile;
-	uint16     partNumber;
-	CMD4Hash   fileHash;	// captured at enqueue, used for result-event
-				// dispatch lookup so a deleted file's events
-				// can be dropped safely.
-	bool       fromAICHRecoveryDataAvailable;
+	uint16 partNumber;
+	CMD4Hash fileHash; // captured at enqueue, used for result-event
+			   // dispatch lookup so a deleted file's events
+			   // can be dropped safely.
+	bool fromAICHRecoveryDataAvailable;
 };
 
-
 class CPartFileHashThread : public wxThread
 {
 public:
@@ -67,62 +64,58 @@
 	~CPartFileHashThread();
 
 	void EndThread();
-	void QueueHashCheck(CPartFile* pFile, uint16 partNumber,
-		bool fromAICHRecoveryDataAvailable = false);
+	void QueueHashCheck(CPartFile *pFile, uint16 partNumber, bool fromAICHRecoveryDataAvailable = false);
 	bool IsRunning() const { return m_bRun; }
 
 private:
-	void* Entry() override;
+	void *Entry() override;
 
-	volatile bool   m_bRun;
-	bool            m_bWorkPending;	// sticky wake flag
+	std::atomic<bool> m_bRun{ false };
+	bool m_bWorkPending; // sticky wake flag
 
-	wxMutex         m_mutex;
-	wxCondition     m_condition;
+	wxMutex m_mutex;
+	wxCondition m_condition;
 
-	std::list<HashJob> m_jobList;	// protected by m_mutex
+	std::list<HashJob> m_jobList; // protected by m_mutex
 };
 
-
-// Custom event posted from worker to main thread when a single
-// HashSinglePart finishes.  Carries the file's CMD4Hash (used for
-// safe lookup in CDownloadQueue — the file may have been deleted
-// between enqueue and dispatch), the part number, and the result.
+// Custom event posted from the worker to the main thread when a single HashSinglePart finishes.
+// Carries the file's CMD4Hash -- used for safe lookup in CDownloadQueue, the file may have been
+// deleted between enqueue and dispatch -- the part number, and the result.
 extern const wxEventType wxEVT_PARTFILE_HASH_RESULT;
 
 class CPartFileHashResultEvent : public wxEvent
 {
 public:
-	CPartFileHashResultEvent(const CMD4Hash& fileHash, uint16 partNumber,
-		bool ok, bool fromAICHRecoveryDataAvailable)
-		: wxEvent(0, wxEVT_PARTFILE_HASH_RESULT)
-		, m_fileHash(fileHash)
-		, m_partNumber(partNumber)
-		, m_ok(ok)
-		, m_fromAICHRecoveryDataAvailable(fromAICHRecoveryDataAvailable)
-	{}
-
-	wxEvent* Clone() const override { return new CPartFileHashResultEvent(*this); }
-
-	const CMD4Hash& FileHash() const { return m_fileHash; }
+	CPartFileHashResultEvent(
+		const CMD4Hash &fileHash, uint16 partNumber, bool ok, bool fromAICHRecoveryDataAvailable)
+	: wxEvent(0, wxEVT_PARTFILE_HASH_RESULT)
+	, m_fileHash(fileHash)
+	, m_partNumber(partNumber)
+	, m_ok(ok)
+	, m_fromAICHRecoveryDataAvailable(fromAICHRecoveryDataAvailable)
+	{
+	}
+
+	wxEvent *Clone() const override { return new CPartFileHashResultEvent(*this); }
+
+	const CMD4Hash &FileHash() const { return m_fileHash; }
 	uint16 PartNumber() const { return m_partNumber; }
 	bool Ok() const { return m_ok; }
 	bool FromAICHRecoveryDataAvailable() const { return m_fromAICHRecoveryDataAvailable; }
 
 private:
 	CMD4Hash m_fileHash;
-	uint16   m_partNumber;
-	bool     m_ok;
-	bool     m_fromAICHRecoveryDataAvailable;
+	uint16 m_partNumber;
+	bool m_ok;
+	bool m_fromAICHRecoveryDataAvailable;
 };
 
-
-typedef void (wxEvtHandler::*CPartFileHashResultEventFunction)(CPartFileHashResultEvent&);
+typedef void (wxEvtHandler::*CPartFileHashResultEventFunction)(CPartFileHashResultEvent &);
 
 #define EVT_PARTFILE_HASH_RESULT(func) \
 	wx__DECLARE_EVT0(wxEVT_PARTFILE_HASH_RESULT, \
-		(wxObjectEventFunction)(CPartFileHashResultEventFunction)& func)
-
+		(wxObjectEventFunction)(CPartFileHashResultEventFunction) & func)
 
 #endif // PARTFILEHASHTHREAD_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/PartFileWriteThread.cpp -> amule-3.1.0.tar.gz/src/PartFileWriteThread.cpp Changed

@@ -25,15 +25,15 @@
 
 #include "PartFileWriteThread.h"
 
-#include "PartFile.h"		// Needed for CPartFile, PartFileBufferedData
-#include "CFile.h"			// Needed for CIOFailureException
+#include "PartFile.h" // Needed for CPartFile, PartFileBufferedData
+#include "CFile.h"    // Needed for CIOFailureException
 #include "Logger.h"
-#include <common/Format.h>	// Needed for CFormat
+#include <common/Format.h> // Needed for CFormat
 
-// eMule ref: CPartFileWriteThread::CPartFileWriteThread() — line 41
+// eMule ref: CPartFileWriteThread::CPartFileWriteThread()
 CPartFileWriteThread::CPartFileWriteThread()
-	: wxThread(wxTHREAD_JOINABLE)
-	, m_condition(m_mutex)
+: wxThread(wxTHREAD_JOINABLE)
+, m_condition(m_mutex)
 {
 	m_bRun = false;
 	m_bWorkPending = false;
@@ -44,14 +44,12 @@
 	}
 }
 
-
 CPartFileWriteThread::~CPartFileWriteThread()
 {
 	// EndThread() must have been called before destruction.
 }
 
-
-// eMule ref: CPartFileWriteThread::EndThread() — line 62
+// eMule ref: CPartFileWriteThread::EndThread()
 void CPartFileWriteThread::EndThread()
 {
 	{
@@ -63,10 +61,9 @@
 	Wait();
 }
 
-
-// eMule ref: CPartFileWriteThread::WakeUpCall() — line 230
 // Called by the main thread to queue a write item.
-void CPartFileWriteThread::QueueWrite(CPartFile* pFile, PartFileBufferedData* pBuffer)
+// eMule ref: CPartFileWriteThread::WakeUpCall()
+void CPartFileWriteThread::QueueWrite(CPartFile *pFile, PartFileBufferedData *pBuffer)
 {
 	wxMutexLocker lock(m_mutex);
 	m_flushList.push_back(ToWrite{ pFile, pBuffer });
@@ -74,26 +71,19 @@
 	m_condition.Signal();
 }
 
-
-void CPartFileWriteThread::DropReferencesTo(const CKnownFile* file)
+void CPartFileWriteThread::DropReferencesTo(const CKnownFile *file)
 {
-	// Pointer-value strip of any pending write item whose pFile
-	// matches `file`. Called from MuleNotify::KnownFileBeingDestroyed
-	// before CPartFile is freed by CPartFile::Delete() — without this
-	// the write loop would deref the dangling pFile on the next tick.
-	//
-	// CPartFile inherits from CKnownFile (single inheritance, same
-	// address); the cast in the compare is no-deref.
+	// Pointer-value strip of any pending write item whose pFile matches `file`. Called from
+	// MuleNotify::KnownFileBeingDestroyed before CPartFile is freed, or the write loop would
+	// deref the dangling pFile on the next tick. CPartFile inherits from CKnownFile at the same
+	// address, so the cast never derefs.
 	//
-	// We do NOT delete pBuffer here. PartFileBufferedData ownership
-	// stays with CPartFile::m_BufferedData_list; QueueWrite() only
-	// added a reference here. `~CPartFile` (via DeleteContents on
-	// m_BufferedData_list, PartFile.cpp:334) frees the buffer; if
-	// we also deleted it, that would double-free.
+	// pBuffer is NOT deleted here: ownership stays with CPartFile::m_BufferedData_list, which
+	// ~CPartFile frees, so deleting it here too would double-free.
 	wxMutexLocker lock(m_mutex);
-	for (std::list<ToWrite>::iterator it = m_flushList.begin();
-		it != m_flushList.end(); /* manual ++ */) {
-		if (static_cast<const CKnownFile*>(it->pFile) == file) {
+	for (std::list<ToWrite>::iterator it = m_flushList.begin(); it != m_flushList.end();
+		/* manual ++ */) {
+		if (static_cast<const CKnownFile *>(it->pFile) == file) {
 			it = m_flushList.erase(it);
 		} else {
 			++it;
@@ -101,22 +91,22 @@
 	}
 }
 
-
-
-// eMule ref: CPartFileWriteThread::RunInternal() — line 69
-// Replaces IOCP + overlapped WriteFile with synchronous CFileArea::FlushAt().
-// The thread is dedicated to writes, so blocking on disk I/O is acceptable —
-// the key win is that the main thread no longer stalls.
-void* CPartFileWriteThread::Entry()
+// Replaces eMule's IOCP + overlapped WriteFile with synchronous CFileArea::FlushAt(). The thread is
+// dedicated to writes, so blocking on disk I/O is fine -- the win is that the main thread no longer
+// stalls.
+void *CPartFileWriteThread::Entry()
 {
 	m_bRun = true;
 
-	while (m_bRun)
-	{
-		// Move queued items to a local work list under the lock.
-		// This minimises lock hold time — main thread can keep queueing
-		// while we process the local list.
+	// Loop until EndThread() clears m_bRun, then drain one final batch before returning. A
+	// shutdown signal must never drop queued writes: WriteToBuffer FillGap()s each range at
+	// queue time and the gaplist is persisted, so a dropped write would leave the .met claiming
+	// bytes that never reached disk -- a silently corrupt part on the next launch.
+	for (;;) {
+		// Move queued items to a local work list under the lock, so the main thread
+		// can keep queueing while we process it.
 		std::list<ToWrite> workList;
+		bool keepRunning;
 		{
 			wxMutexLocker lock(m_mutex);
 			if (m_bRun && !m_bWorkPending) {
@@ -124,58 +114,61 @@
 			}
 			m_bWorkPending = false;
 			workList.swap(m_flushList);
+			// Captured under the lock together with the swap, so the
+			// batch we just took is drained whatever m_bRun does next.
+			keepRunning = m_bRun;
 		}
 
-		// Process all queued writes synchronously.
-		// eMule ref: WriteBuffers() — line 122
-		for (std::list<ToWrite>::iterator it = workList.begin();
-			 it != workList.end() && m_bRun; ++it)
-		{
-			PartFileBufferedData* pBuffer = it->pBuffer;
+		// Process all queued writes synchronously. No m_bRun check in the loop condition: a
+		// batch, once taken, is always written in full so a shutdown never abandons it
+		// half-drained.
+		// eMule ref: WriteBuffers() -- line 122
+		for (std::list<ToWrite>::iterator it = workList.begin(); it != workList.end(); ++it) {
+			PartFileBufferedData *pBuffer = it->pBuffer;
 			uint32 lenData = (uint32)(pBuffer->end - pBuffer->start + 1);
 
-			// Synchronous write via CFileArea (replaces eMule's overlapped WriteFile).
-			// CFileArea::FlushAt() writes the buffered data at the given offset.
+			// Synchronous write via CFileArea::FlushAt(), which writes the buffered
+			// data at the given offset.
 			//
-			// Lock m_hpartfileMutex against CPartFileHashThread (see
-			// CPartFile::m_hpartfileMutex): with ENABLE_MMAP=OFF the
-			// underlying CFileAutoClose::WriteAt does Seek+Write on the
-			// shared fd, and HashSinglePart on the hash thread does
-			// Seek+Read on the same fd; the two race on file position
-			// without the lock.
+			// Lock m_hpartfileMutex against CPartFileHashThread: with ENABLE_MMAP=OFF
+			// the underlying CFileAutoClose::WriteAt does Seek+Write on the shared fd
+			// while HashSinglePart does Seek+Read on the same one, and the two race on
+			// the file position without it.
 			//
-			// FlushAt can also throw CIOFailureException on a disk-full /
-			// EIO / permission failure.  Catching it here keeps the
-			// worker thread alive: an unhandled exception in Entry()
-			// propagates through wxThreadInternal::PthreadStart() to
-			// wxApp::OnUnhandledException(), which std::set_terminate's
-			// MuleDebug aborts the process.  On caught failure we mark
-			// the buffered item PB_ERROR so the main thread can retry on
-			// the next FlushBuffer (where CheckFreeDiskSpace will pause
-			// the file if disk is genuinely exhausted).
+			// FlushAt can throw CIOFailureException on a disk-full, EIO or permission
+			// failure. Catching it keeps the worker alive: an unhandled exception in
+			// Entry() reaches wxApp::OnUnhandledException(), whose terminate handler
+			// aborts the process. On failure the item is marked PB_ERROR so the main
+			// thread retries on the next FlushBuffer.
 			bool writeOk = true;
 			try {
 				std::lock_guard<std::mutex> lock(it->pFile->m_hpartfileMutex);
 				pBuffer->area.FlushAt(it->pFile->m_hpartfile, pBuffer->start, lenData);
-			} catch (const CIOFailureException& e) {
-				AddDebugLogLineC(logPartFile, CFormat(
-					"Write thread: I/O failure on '%s' at offset %llu (%u bytes): %s")
-					% it->pFile->GetFileName() % pBuffer->start % lenData % e.what());
+			} catch (const CIOFailureException &e) {
+				AddDebugLogLineC(logPartFile,
+					CFormat("Write thread: I/O failure on '%s' at offset %llu (%u "
+						"bytes): %s") %
+						it->pFile->GetFileName() % pBuffer->start % lenData %
+						e.what());
 				writeOk = false;
 			}
 
-			// eMule ref: WriteCompletionRoutine line 179 — decrement in write thread
+			// eMule ref: WriteCompletionRoutine line 179 -- decrement in write thread
 			// so main thread can check m_iWrites at any time.
 			--it->pFile->m_iWrites;
 
-			// Mark buffer as written / errored so the main thread can harvest
-			// it.  PB_ERROR is handled in FlushBuffer Phase 2 (resets to
-			// PB_READY for retry; if the disk is genuinely full the next
-			// FlushBuffer's CheckFreeDiskSpace pauses the file before the
-			// retry loops).
-			// eMule ref: WriteCompletionRoutine — line 182
+			// Mark the buffer written or errored so the main thread can harvest it.
+			// PB_ERROR is handled in FlushBuffer Phase 2, which resets it to PB_READY
+			// for retry -- and if the disk is genuinely full, CheckFreeDiskSpace pauses
+			// the file before the retry loops.
 			pBuffer->flushed = writeOk ? PB_WRITTEN : PB_ERROR;
 		}
+
+		// Exit only after the batch above is on disk, so EndThread()
+		// genuinely drains rather than dropping in-flight writes.
+		if (!keepRunning) {
+			break;
+		}
 	}
 
 	return NULL;

amule-3.0.1.tar.gz/src/PartFileWriteThread.h -> amule-3.1.0.tar.gz/src/PartFileWriteThread.h Changed

@@ -27,6 +27,7 @@
 #define PARTFILEWRITETHREAD_H
 
 #include <list>
+#include <atomic>
 
 #include <wx/thread.h>
 
@@ -36,20 +37,20 @@
 
 // eMule ref: PartFile.h:104-108
 // Part file buffer write status
-#define PB_READY   0
+#define PB_READY 0
 #define PB_PENDING 1
-#define PB_ERROR   2
+#define PB_ERROR 2
 #define PB_WRITTEN 3
 
 // eMule ref: PartFileWriteThread.h:21-25
 struct ToWrite
 {
-	CPartFile           *pFile;
+	CPartFile *pFile;
 	PartFileBufferedData *pBuffer;
 };
 
-// Port of eMule's CPartFileWriteThread (PartFileWriteThread.h:35-67).
-// Windows primitives replaced with wxWidgets equivalents:
+// Port of eMule's CPartFileWriteThread (PartFileWriteThread.h:35-67). Windows primitives
+// replaced with wxWidgets equivalents:
 //   CWinThread             -> wxThread (joinable)
 //   IOCP + overlapped I/O  -> synchronous CFileArea::FlushAt() on this thread
 //   GetQueuedCompletionStatus -> wxCondition::WaitTimeout()
@@ -61,28 +62,27 @@
 	CPartFileWriteThread();
 	~CPartFileWriteThread();
 
-	void EndThread();                  // eMule ref: PartFileWriteThread.cpp:62
-	void QueueWrite(CPartFile* pFile, PartFileBufferedData* pBuffer);
+	void EndThread(); // eMule ref: PartFileWriteThread.cpp:62
+	void QueueWrite(CPartFile *pFile, PartFileBufferedData *pBuffer);
 	bool IsRunning() const { return m_bRun; }
 
-	// Pointer-value strip of any pending writes whose pFile == `file`.
-	// Called by MuleNotify::KnownFileBeingDestroyed before the
-	// CPartFile is freed. Takes m_mutex so the write loop can't race
-	// with the strip. Pending PartFileBufferedData entries are
-	// deleted here because the partfile they were meant for is
-	// gone — the bytes are dropped, matching the cancel semantics.
-	void DropReferencesTo(const CKnownFile* file);
+	// Pointer-value strip of any pending writes whose pFile == `file`. Called by
+	// MuleNotify::KnownFileBeingDestroyed before the CPartFile is freed. Takes m_mutex so the
+	// write loop cannot race with the strip. Pending PartFileBufferedData entries are deleted
+	// here because the partfile they were meant for is gone -- the bytes are dropped, matching
+	// the cancel semantics.
+	void DropReferencesTo(const CKnownFile *file);
 
 private:
-	void* Entry() override;
+	void *Entry() override;
 
-	volatile bool   m_bRun;
-	bool            m_bWorkPending;    // sticky wake flag
+	std::atomic<bool> m_bRun{ false };
+	bool m_bWorkPending; // sticky wake flag
 
-	wxMutex         m_mutex;
-	wxCondition     m_condition;
+	wxMutex m_mutex;
+	wxCondition m_condition;
 
-	std::list<ToWrite> m_flushList;    // protected by m_mutex
+	std::list<ToWrite> m_flushList; // protected by m_mutex
 };
 
 #endif // PARTFILEWRITETHREAD_H

amule-3.1.0.tar.gz/src/PeerAddressing.h Added

@@ -0,0 +1,452 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 PEERADDRESSING_H
+#define PEERADDRESSING_H
+
+#include "NetworkAddress.h"
+
+#include <cstdint>
+
+/**
+ * What identifies a peer, once a peer can be IPv6.
+ *
+ * These value policies support peer-address widening at production call sites.
+ * Socket ingress already canonicalizes mapped IPv4; local unmapping here stays defensive.
+ *
+ * Three separate questions live here, and they deliberately give different answers for the same
+ * address:
+ *
+ *  - **Identity.** Two peers are the same peer iff they have the same index key. Aggregating
+ *    distinct hosts here would merge them. Keeping absence separate from 0.0.0.0 is hardening,
+ *    not a fix for an observed bug: a client constructed without a socket carries address 0, so
+ *    an entry under that key would read back as banned for every such client -- but no path is
+ *    known to insert it, since every Ban() call site reaches an address-bearing client. #1314
+ *    guards the write side; see CBanRecord::Ban().
+ *  - **Rate limiting.** A budget is per *subscriber*, which under IPv6 is not per address.
+ *    Aggregating is the point here, and the amount of aggregation is a decision, not a detail.
+ *  - **Routing an inbound datagram.** Some subsystems cannot represent an IPv6 peer at all --
+ *    Kad by design, ed2k UDP obfuscation by protocol. Those boundaries are reported, never
+ *    crossed with a fabricated address.
+ *
+ * Nothing here fabricates an address. Every function that cannot answer for an address says so;
+ * an absent address stays absent all the way through.
+ */
+namespace PeerAddressing
+{
+
+/**
+ * The key a peer is indexed under.
+ *
+ * IPv4-mapped forms are collapsed to plain IPv4 here, once. A peer that connects as @c 192.0.2.1
+ * and later as @c ::ffff:192.0.2.1 is one peer over one family, and giving it two identities would
+ * let it hold two queue slots, two ban states and two credit records. CNetworkAddress deliberately
+ * does not normalise on comparison -- that keeps its ordering total -- so the normalisation is
+ * spelled out at the one place identity is decided.
+ *
+ * Everything else is returned unchanged, absence included: this never invents a key for a peer that
+ * has no address.
+ */
+inline CNetworkAddress IndexKey(const CNetworkAddress &address)
+{
+	return address.Unmapped();
+}
+
+/** A security key must identify a host; mapped IPv4 zero is unspecified too. */
+inline bool IsSecurityKey(const CNetworkAddress &address) noexcept
+{
+	const auto key = IndexKey(address);
+	return key.IsPresent() && !key.IsUnspecified();
+}
+
+/**
+ * Whether a peer with this address can be recorded in an address index.
+ *
+ * The same rule as a security key: an index entry has to name a host, and neither absence nor the
+ * unspecified address does. Indexing a peer under a key the ban record refuses would let the two
+ * disagree about the same peer.
+ */
+inline bool IsIndexable(const CNetworkAddress &address) noexcept
+{
+	return IsSecurityKey(address);
+}
+
+/**
+ * Programmatic filter-prefix matching, independent of the IPv4 filter-file parser.
+ * Width is in the canonical family, or IPv6 width for a mapped prefix. Host bits in the
+ * prefix are ignored. Prefixes are interface-independent, including at /128.
+ * A prefix matches only inside its own family: ::/0 covers every IPv6 address and no IPv4 one.
+ * An unspecified network base is valid (e.g. ::/0), but never a matching host.
+ */
+inline bool MatchesFilterPrefix(
+	const CNetworkAddress &address, const CNetworkAddress &prefix, unsigned bits) noexcept
+{
+	// ::ffff:10.0.0.0/104 is written in IPv6 width; 96 of those bits are the mapping itself.
+	if (prefix.IsIPv4Mapped() && bits >= 96) {
+		bits -= 96;
+	}
+	const auto key = IndexKey(address);
+	const auto network = IndexKey(prefix);
+	if (!IsSecurityKey(key) || network.IsAbsent() || key.IsIPv4() != network.IsIPv4() ||
+		bits > (key.IsIPv4() ? 32u : 128u)) {
+		return false;
+	}
+	return key.TruncatedToPrefix(bits) == network.TruncatedToPrefix(bits);
+}
+
+/** Inclusive, interface-independent filter range; reversed/mixed-family ranges fail. */
+inline bool MatchesFilterRange(
+	const CNetworkAddress &address, const CNetworkAddress &first, const CNetworkAddress &last) noexcept
+{
+	const auto key = IndexKey(address).WithoutScope();
+	const auto lower = IndexKey(first).WithoutScope();
+	const auto upper = IndexKey(last).WithoutScope();
+	if (!IsSecurityKey(key) || lower.IsAbsent() || upper.IsAbsent() || key.IsIPv4() != lower.IsIPv4() ||
+		key.IsIPv4() != upper.IsIPv4()) {
+		return false;
+	}
+	return lower <= key && key <= upper;
+}
+
+/**
+ * Whether this peer can be named in an ed2k wire field or an on-disk record that holds a 32-bit
+ * address.
+ *
+ * The ed2k protocol carries a peer's address as 32 bits: source exchange, the server protocol, the
+ * relayed callback, the @c .part.met.seeds file. A native IPv6 peer has no such form, so it cannot
+ * be published or persisted through them -- and must be @b omitted rather than written as a zero,
+ * which would publish "0.0.0.0" to every peer that asked for sources.
+ *
+ * The unspecified address is refused for the same reason, whether it arrives as @c 0.0.0.0 or as
+ * @c ::ffff:0.0.0.0 : it narrows successfully, to zero, which is the value the paragraph above
+ * says must never be written. Having a 32-bit form and being nameable in one are not the same
+ * question, and this predicate answers the second.
+ *
+ * Widening those formats is a protocol change and needs its own capability bit, so this predicate
+ * is the boundary until one exists.
+ */
+inline bool HasEd2kWireForm(const CNetworkAddress &address) noexcept
+{
+	std::uint32_t narrowed = 0;
+	if (!address.ToIPv4NetworkOrder(narrowed)) {
+		return false;
+	}
+	// The narrowing succeeding is not enough. 0.0.0.0 has a 32-bit form and ::ffff:0.0.0.0
+	// narrows to the same value, and writing either into these fields is the exact failure
+	// this predicate exists to prevent: a zero published as a source to every peer that asks,
+	// and persisted for the next start to dial. Absence is the correct answer for a peer we
+	// cannot name, so a value that names nobody is refused here rather than written out.
+	return narrowed != 0;
+}
+
+/**
+ * Whether an inbound ed2k UDP datagram from this peer can be de-obfuscated.
+ *
+ * This build's key is MD5 over 23 bytes -- user hash, a 32-bit address, MAGICVALUE_UDP, a random
+ * pair -- see CEncryptedDatagramSocket::DecryptReceivedClient(), where the receiver derives it from
+ * the sender's address, and EncryptSendClient() at the keyData23 block, where the sender derives
+ * it from its own public IPv4. There is no IPv6 input to that layout, so a native IPv6 peer has no
+ * address to feed it and this build cannot obfuscate with one.
+ *
+ * That is a limit of what is implemented here, not of the protocol. emule-qt's ipv6-spec.md 3.4
+ * defines a second layout for exactly this case -- 35 bytes, the same fields with the 16 IPv6 bytes
+ * in network order in place of the 4 -- chosen from the source family rather than negotiated, which
+ * leaves IPv4 bit-identical. It cannot be probed for: both layouts are valid key material, so a
+ * wrong guess decrypts garbage that fails the magic-value check, indistinguishable from a peer that
+ * did not obfuscate at all.
+ *
+ * Two traps in that layout. The magic byte sits at offset 32, not 20, because it follows the
+ * address. eMuleAI v1.6 writes it at 20 and then copies the 16 address bytes over 16 to 31
+ * (EncryptedDatagramSocket.cpp:227 and :338), so the magic is clobbered and byte 32 is never
+ * written at all, putting a byte of stack in the key: that end cannot reproduce its own key, let
+ * alone agree with a conforming one. And the IPv4 field is a host-order uint32 written in native
+ * byte order, a historical quirk that breaks every existing IPv4 peer if it is "corrected".
+ *
+ * Implementing it depends on ingress normalisation landing first. A mapped IPv4 sender has to
+ * become plain IPv4 before this question is asked, or the receiver picks the 35-byte layout for a
+ * peer that keyed on 4 bytes and fails silently.
+ *
+ * Feeding the current derivation a zero would produce a wrong key, the packet would fail its
+ * magic-value check and be handled as junk, and nothing would record why. So the boundary is
+ * reported here instead.
+ */
+inline bool SupportsEd2kUdpObfuscation(const CNetworkAddress &address) noexcept
+{
+	return HasEd2kWireForm(address);
+}
+
+/** How far an inbound datagram from a given peer can be routed. */
+enum class EUdpRoute
+{
+	//! Not a usable endpoint: absent/unspecified address, or zero port.
+	Reject,
+	//! Full service. Everything ed2k and Kad can do for a 32-bit peer.
+	Ed2kAndKad,
+	//! ed2k only. Kad keeps its documented IPv4 interface.
+	Ed2kOnly
+};
+
+/** A UDP peer's address and advertised or observed UDP port. */
+struct UdpEndpoint
+{
+	CNetworkAddress address;
+	std::uint16_t port = 0;
+};
+
+/**
+ * Classifies an inbound datagram's endpoint for future call sites.
+ *
+ * This value policy is not wired into production handlers yet. Kad retains its IPv4 conversion
+ * boundary; native IPv6 can only select the ed2k route.
+ *
+ * Reject does not distinguish absent from unspecified: the caller holds the address and can say
+ * which in its log, exactly as CMuleUDPSocket already does.
+ */
+inline EUdpRoute ClassifyUdpPeer(const UdpEndpoint &endpoint) noexcept
+{
+	const CNetworkAddress address = IndexKey(endpoint.address);
+	if (endpoint.port == 0 || address.IsAbsent() || address.IsUnspecified()) {
+		return EUdpRoute::Reject;
+	}
+	return SupportsEd2kUdpObfuscation(address) ? EUdpRoute::Ed2kAndKad : EUdpRoute::Ed2kOnly;
+}
+
+/**
+ * Whether a client's advertised UDP port names it as the sender of a datagram that arrived from @p
+ * source, comparing both the address and UDP port.
+ *
+ * A peer advertises two ports and they are not the same number: the ed2k TCP port it accepts
+ * connections on, and the UDP port it accepts datagrams on. A lookup that identifies the sender of
+ * a datagram by the first of those matches nothing at all in the field, and does so silently -- it
+ * looks exactly like "we do not know this peer", which is also the honest answer for a stranger.
+ * Naming the port dimension in one predicate is what keeps the two apart at the call sites.
+ *
+ * Zero on either side is @b unknown, not a port, and never matches. A client we know by address
+ * carries a zero UDP port when it never advertised one, and treating that as a value to compare
+ * would make every such client a candidate for a datagram whose source port is also zero. Behind a
+ * carrier NAT one address is many peers, so that match would name an arbitrary one of them -- and
+ * the rendezvous relay vouches for whoever this lookup returns. It fails closed instead, which
+ * costs nothing: a peer that advertised no UDP port could not have been matched by an exact
+ * comparison either.
+ */
+inline bool MatchesUdpSource(const UdpEndpoint &advertised, const UdpEndpoint &source) noexcept
+{
+	return ClassifyUdpPeer(advertised) != EUdpRoute::Reject &&
+	       ClassifyUdpPeer(source) != EUdpRoute::Reject && advertised.port == source.port &&
+	       IndexKey(advertised.address) == IndexKey(source.address);
+}
+
+/**
+ * How much of an IPv6 address a rate limit is counted against.
+ *
+ * A /64 is the smallest prefix an IPv6 subscriber is normally delegated, so it is the smallest unit
+ * that behaves like "one customer". Larger aggregation (/56, /48) would put unrelated subscribers
+ * of one provider in a single bucket, where one of them could exhaust the budget for the others.
+ * The eMuleQt /128 alternative is consciously rejected: rotating addresses within a delegated /64
+ * would evade per-host accounting. This /64 policy is accounting only, never identity, index, ban
+ * or routing policy.
+ *
+ * It applies to globally routable addresses only, because those are the ones a subscriber is
+ * delegated. See RateLimitScope() for what the rest are counted against and why.
+ */
+constexpr unsigned kIPv6RateLimitPrefixBits = 64;
+
+//! How long one callback request from a scope throttles the next; also the list's eviction age.
+constexpr std::uint64_t kCallbackRequestThrottleMs = 3 * 60 * 1000;
+
+/**
+ * The address a per-peer rate limit is counted against.
+ *
+ * IPv4 counts per address, which is what the 32-bit throttles did, so an IPv4 peer's budget is
+ * unchanged. IPv6 counts per /64.
+ *
+ * That asymmetry is the whole decision. An IPv4 address is roughly a host, so per-address is per-
+ * host. An IPv6 /128 is not: a subscriber delegated a /64 can source every request from a fresh
+ * address, so a per-/128 limit counts to one forever and throttles nothing at all. Applying the
+ * IPv4 shape unchanged would therefore have been the same as removing the limit for IPv6.
+ *
+ * A mapped IPv4 address shares the IPv4 budget -- a peer must not double its allowance by
+ * respelling its address -- and absence has no budget, because it identifies nobody.
+ */
+// The scope id is dropped: a budget aggregates, where identity (IndexKey) keeps interfaces apart.
+/**
+ * Whether a /64 of this address names one subscriber.
+ *
+ * Almost everywhere it does: global unicast, unique-local and 6to4 all subnet at /64 under an
+ * allocation one party holds. The exceptions are prefixes whose /64 is shared by construction, and
+ * aggregating those would hand a budget meant for one customer to a whole population: every
+ * link-local address on every link sits under fe80::/64, every host behind one NAT64 translator
+ * under its pool, and every client of one Teredo server under a /64 built from that server's
+ * address. Four aMule hosts on an IPv6-only LAN is the concrete case -- the fourth would never get
+ * an upload slot. Those are counted per address instead, which is the strictest reading and cannot
+ * be evaded, since there is no prefix to rotate within that anyone owns.
+ *
+ * Deliberately not NetworkAddress::IsGloballyRoutableIPv6(): that answers "may this be published",
+ * so it also excludes documentation and unique-local space, where a /64 is a normal delegation.
+ */
+inline bool AggregatesAtDelegatedPrefix(const CNetworkAddress &address) noexcept
+{
+	static constexpr NetworkAddressPolicy::IPv6ExcludedPrefix kSharedPrefixes = {
+		{ {}, 128, "Unspecified" },
+		{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }, 128, "Loopback" },
+		{ {}, 96, "IPv4-compatible" },
+		{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff }, 96, "IPv4-mapped" },
+		{ { 0x00, 0x64, 0xff, 0x9b }, 96, "Well-known NAT64" },
+		{ { 0x00, 0x64, 0xff, 0x9b, 0x00, 0x01 }, 48, "Local-use NAT64" },
+		// The first 64 bits carry the Teredo server's address, so one /64 is one
+		// server's whole client population.
+		{ { 0x20, 0x01, 0x00, 0x00 }, 32, "Teredo" },
+		{ { 0xfe, 0x80 }, 10, "Link-local" },
+		{ { 0xfe, 0xc0 }, 10, "Deprecated site-local" },
+		{ { 0xff }, 8, "Multicast" }
+	};
+	if (!address.IsIPv6()) {
+		return false;
+	}
+	for (const auto &prefix : kSharedPrefixes) {
+		if (NetworkAddressPolicy::MatchesPrefix(address.GetOctets(), prefix)) {
+			return false;
+		}
+	}
+	return true;
+}
+
+inline CNetworkAddress RateLimitScope(const CNetworkAddress &address)
+{
+	const CNetworkAddress unmapped = address.Unmapped();
+	if (!unmapped.IsIPv6()) {
+		// IPv4, or absent. Either way this is already the scope.
+		return unmapped;
+	}
+	if (!AggregatesAtDelegatedPrefix(unmapped)) {
+		return unmapped;
+	}
+	return unmapped.TruncatedToPrefix(kIPv6RateLimitPrefixBits);
+}
+
+/**
+ * Contact admission supports every present, non-unspecified address family. Absence retains legacy
+ * LowID/server-ID handling; it is not fabricated IPv4 zero.
+ */
+inline bool CanCheckContactAddress(const CNetworkAddress &address) noexcept
+{
+	return address.IsAbsent() || (address.IsPresent() && !IndexKey(address).IsUnspecified());
+}
+
+/**
+ * The address an outbound contact is filtered and ban-checked at, from the canonical user
+ * address. A HighID peer not yet greeted is reached at its connect address. Absent means no check
+ * can run yet (LowID, reached by callback), and the contact must not be treated as filtered.
+ */
+inline CNetworkAddress ContactCheckAddress(const CNetworkAddress &userAddress,
+	const CNetworkAddress &connectAddress,
+	bool hasLowID,
+	std::uint32_t userIDNetworkOrder) noexcept
+{
+	if (userAddress.IsPresent() || hasLowID) {
+		return userAddress;
+	}
+	if (connectAddress.IsPresent()) {
+		return connectAddress;
+	}
+	return CNetworkAddress::FromIPv4NetworkOrderOrAbsent(userIDNetworkOrder);
+}
+
+/** Callback wire formats remain IPv4-only, independently of contact security support. */
+inline bool CanRequestCallback(const CNetworkAddress &address) noexcept
+{
+	return HasEd2kWireForm(address);
+}
+
+/** An unconnected socket can only be opened when the contact has a legacy IPv4 form. */
+inline bool CanOpenConnection(const CNetworkAddress &address, bool socketConnected) noexcept
+{
+	return socketConnected || HasEd2kWireForm(address);
+}
+
+/** TCP admission and security keying answer the same question. */
+inline bool CanAdmitTcpPeer(const CNetworkAddress &address) noexcept
+{
+	return IsSecurityKey(address);
+}
+
+/** The current uTP framing remains IPv4-only until its IPv6 wire format is implemented. */
+inline bool CanAdmitUtpPeer(const CNetworkAddress &address) noexcept
+{
+	return HasEd2kWireForm(address);
+}
+
+/** Production callback throttle seam; the exact three-minute boundary remains allowed. */
+inline bool IsCallbackRequestThrottled(
+	const CNetworkAddress &address, const CNetworkAddress &previous, std::uint64_t elapsed) noexcept
+{
+	return IsSecurityKey(address) && IsSecurityKey(previous) &&
+	       RateLimitScope(address) == RateLimitScope(previous) && elapsed < kCallbackRequestThrottleMs;
+}
+
+/**
+ * Whether this address alone establishes that the peer accepts inbound connections.
+ *
+ * Answers only for native IPv6, and only for globally routable addresses.
+ *
+ * LowID is an IPv4 concept: it is inferred from the ed2k ID a server issued, and it means "behind
+ * something that will not accept an inbound connection". An IPv6 peer has no ed2k ID, so the ID
+ * carries no information about it -- and a peer whose ID field is zero would otherwise be read as
+ * firewalled and sent down the callback path, which for an IPv6 peer cannot work: the callback goes
+ * through an ed2k server or a Kad buddy, both of which speak 32-bit addresses.
+ *
+ * A link-local, unique-local, loopback or unspecified address proves nothing -- aMule cannot dial
+ * it from here -- so those keep the existing rule rather than overriding it.
+ */
+inline bool IsDirectlyReachable(const CNetworkAddress &address) noexcept
+{
+	return address.IsGloballyRoutableIPv6();
+}
+
+/**
+ * Whether an address arriving in a wire tag may be kept as a peer's identity.
+ *
+ * A tag carries sixteen bytes and no scope id; the same peer seen from a socket carries one. So a
+ * link-local peer is fe80::1 here and fe80::1%3 there -- two identities for one peer, with nothing
+ * at this edge able to reconcile them. Dropping the scope from IndexKey() is not the alternative:
+ * fe80::1%3 and fe80::1%9 are different peers on different interfaces, and merging them would be
+ * worse than splitting one.
+ *
+ * Global routability answers it: loopback, NAT64 and the unspecified address cannot name a peer
+ * across hosts either. Unique-local is the one excluded on the other ground -- a ULA is globally
+ * unique by construction and names a peer fine, but nothing here can dial one, and whether the
+ * dual-stack change serves site-local peers is a decision for it. Absence is honest until then.
+ *
+ * Same body as IsDirectlyReachable() above by choice rather than coincidence: this adopts the
+ * stricter of the two rules. Loosening one is not a reason to loosen the other.
+ */
+inline bool IsUsableTagIdentity(const CNetworkAddress &address) noexcept
+{
+	return address.IsGloballyRoutableIPv6();
+}
+
+} // namespace PeerAddressing
+
+#endif // PEERADDRESSING_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/PeerCapabilities.h Added

@@ -0,0 +1,283 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 PEERCAPABILITIES_H
+#define PEERCAPABILITIES_H
+
+#include <cstddef>
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include <wx/intl.h>   // Needed for wxTRANSLATE() and wxGetTranslation()
+#include <wx/string.h> // Needed for wxString
+
+/**
+ * eMuleAI vendor capability bits, carried in the CT_MOD_MISCOPTIONS (0xAA) handshake tag.
+ *
+ * These positions are wire format. They mirror eMuleAI's UModMiscOptions union field for field,
+ * least significant bit first, because that is the order the reference implementation lays that
+ * union out on the wire.
+ *
+ * A one-bit offset here has no runtime signal. aMule would claim a transport it does not have, the
+ * peer would open a handshake, and that handshake would simply never complete -- nothing logs,
+ * nothing fails, the source is just quietly unusable. PeerCapabilitiesTest pins each value as a
+ * literal word so a renumbering cannot pass.
+ */
+enum EModMiscOptions : uint32_t
+{
+	//! Extended source exchange with variable source info.
+	MOD_MISCOPT_EXTENDED_XS = 1u << 0,
+	//! Legacy uTP NAT traversal (simple UDP traversal through NATs).
+	MOD_MISCOPT_NAT_TRAVERSAL = 1u << 1,
+	//! IPv6 support.
+	MOD_MISCOPT_IPV6 = 1u << 2,
+	//! Vendor buddy-info pull.
+	MOD_MISCOPT_SERVING_BUDDY_PULL = 1u << 3,
+	//! QUIC NAT-T data transport.
+	MOD_MISCOPT_NAT_TRAVERSAL_QUIC = 1u << 4
+};
+
+//! Bits 0-4 are defined. Bits 5-31 are reserved and travel as zero in both directions: they are
+//! masked out of what a peer sends, so no capability can be inferred from them, and never set in
+//! what aMule sends.
+//!
+//! "Reserved" means reserved to aMule, not unallocated on the wire. The 0xAA word is not eMuleAI's
+//! alone: emule-qt allocates bit 5 in it (MODMISC_EXTXS_SKIPTAGS, extended source exchange without
+//! the tag preamble) and bit 10 (MODMISC_HTTPCACHE, HTTP cache sourcing). This mask drops both, so
+//! a peer that sets either reaches m_bits with it cleared.
+//!
+//! That is right while aMule acts on neither -- a bit it cannot use is a bit it must not relay --
+//! and wrong the moment it wants to gate on one, because a dropped bit reads as absent rather than
+//! as unknown, which is a different claim. Widening this mask is the change that has to happen
+//! first: no query site can recover a bit that was cleared here. A new bit needs an EModMiscOptions
+//! entry, a widened mask, an entry in the display table below, and the literal position pinned in
+//! PeerCapabilitiesTest.
+constexpr uint32_t MOD_MISCOPT_KNOWN_MASK = 0x0000001Fu;
+
+/**
+ * What a peer told us it can do. Read-only as far as this change is concerned: aMule records the
+ * peer's claims so later changes in this set can act on them, and advertises nothing new itself.
+ * See LocalAdvertisedModMiscOptions().
+ */
+class CPeerCapabilities
+{
+public:
+	CPeerCapabilities() = default;
+
+	//! Decode a CT_MOD_MISCOPTIONS word. Reserved bits are discarded here,
+	//! once, rather than at each query site.
+	void SetFromWire(uint32_t bits) { m_bits = bits & MOD_MISCOPT_KNOWN_MASK; }
+
+	//! The peer's recorded capability bits, already limited to the known set
+	//! by SetFromWire(). For display and logging, not for re-encoding.
+	uint32_t KnownBits() const { return m_bits; }
+
+	void Reset() { m_bits = 0; }
+	bool IsEmpty() const { return m_bits == 0; }
+
+	bool Has(EModMiscOptions bit) const { return (m_bits & bit) != 0; }
+
+	void Set(EModMiscOptions bit, bool enabled)
+	{
+		if (enabled) {
+			m_bits |= bit;
+		} else {
+			m_bits &= ~static_cast<uint32_t>(bit);
+		}
+	}
+
+	bool SupportsExtendedSourceExchange() const { return Has(MOD_MISCOPT_EXTENDED_XS); }
+	bool SupportsNatTraversal() const { return Has(MOD_MISCOPT_NAT_TRAVERSAL); }
+	bool SupportsIPv6() const { return Has(MOD_MISCOPT_IPV6); }
+	bool SupportsServingBuddyPull() const { return Has(MOD_MISCOPT_SERVING_BUDDY_PULL); }
+	bool SupportsNatTraversalQuic() const { return Has(MOD_MISCOPT_NAT_TRAVERSAL_QUIC); }
+
+	/**
+	 * The capability word as a comma-separated list, for client details.
+	 *
+	 * Empty when the peer claims nothing, and the caller decides what that looks like: the
+	 * client details dialog hides its row rather than printing a word for it. A peer that sent
+	 * no CT_MOD_MISCOPTIONS tag and one that sent an all-zero word are the same state and read
+	 * the same way, because eMuleAI omits the tag when the word is zero, exactly as aMule does.
+	 *
+	 * The names are spelled out as prose rather than abbreviated, so they are translated like
+	 * the rest of the dialog. They carry no protocol meaning and nothing reads them back: the
+	 * bit identity is pinned by PeerCapabilitiesTest, which asserts each position as a literal
+	 * word, and the pairing of bit to name by the display test. So rewording or translating one
+	 * cannot move a bit.
+	 *
+	 * They are marked with wxTRANSLATE and translated at use rather than written as _(),
+	 * because the table is static: _() in its initialiser would translate once, on first call,
+	 * possibly before the locale is loaded, and would never follow a language change
+	 * afterwards.
+	 *
+	 * Lives here rather than on CUpDownClient because the core client and the remote GUI's EC
+	 * mirror both need it, and two copies of this table would drift the moment a bit is added.
+	 */
+	wxString GetDisplayText() const
+	{
+		// One table on purpose: bit and name in the same row, so a bit
+		// cannot be added in one place and forgotten in the other.
+		wxString text;
+		for (const auto &entry : Table()) {
+			if (Has(entry.bit)) {
+				if (!text.IsEmpty()) {
+					text += ", ";
+				}
+				text += wxGetTranslation(entry.name);
+			}
+		}
+		return text;
+	}
+
+	/**
+	 * The same bits as stable API tokens, in bit order.
+	 *
+	 * The /api/v1 surface spells every other multi-state field as an enumerated token, and an
+	 * integer there would make each consumer carry its own copy of the table below --
+	 * reimplemented in JS for the Web UI and again in every third-party client, each free to
+	 * drift from this file. A peer claims any combination of the bits rather than one state,
+	 * which is why this is a list rather than a single token.
+	 *
+	 * Unlike the display text these are not translated and never change: they are wire
+	 * vocabulary, and a consumer matches them literally.
+	 */
+	std::vector<std::string> GetApiTokens() const
+	{
+		std::vector<std::string> tokens;
+		for (const auto &entry : Table()) {
+			if (Has(entry.bit)) {
+				tokens.emplace_back(entry.token);
+			}
+		}
+		return tokens;
+	}
+
+	//! Bit, display name and API token in one row.
+	struct SCapabilityName
+	{
+		EModMiscOptions bit;
+		const char *name;
+		const char *token;
+	};
+
+	/**
+	 * One table on purpose, and now carrying three things rather than two: a bit cannot be
+	 * added to the enum and then forgotten in the display row, the API row, or either
+	 * separately. A second table keyed on the same enum is exactly the drift this arrangement
+	 * exists to prevent.
+	 */
+	static const std::vector<SCapabilityName> &Table()
+	{
+		static const std::vector<SCapabilityName> names = {
+			{ MOD_MISCOPT_EXTENDED_XS,
+				wxTRANSLATE("Extended source exchange"),
+				"extended_source_exchange" },
+			{ MOD_MISCOPT_NAT_TRAVERSAL,
+				wxTRANSLATE("NAT traversal (uTP)"),
+				"nat_traversal_utp" },
+			{ MOD_MISCOPT_IPV6, wxTRANSLATE("IPv6"), "ipv6" },
+			{ MOD_MISCOPT_SERVING_BUDDY_PULL,
+				wxTRANSLATE("Buddy info pull"),
+				"serving_buddy_pull" },
+			{ MOD_MISCOPT_NAT_TRAVERSAL_QUIC,
+				wxTRANSLATE("NAT traversal (QUIC)"),
+				"nat_traversal_quic" },
+		};
+		return names;
+	}
+
+private:
+	uint32_t m_bits = 0;
+};
+
+/**
+ * The CT_MOD_MISCOPTIONS word aMule puts in its own handshake.
+ *
+ * Zero, so no tag is emitted, because sending it costs more than it buys today.
+ *
+ * The cost: eMuleAI marks any sender of this tag as an unofficial-opcode client and bans one that
+ * carries no readable ET_MOD_VERSION string. aMule emits that string only under __GIT__, which a
+ * tagged release suppresses.
+ *
+ * What it buys: the tag reaches only peers already connected over TCP, where uTP adds no
+ * reachability. It does gate what eMuleAI tells us about other sources -- it sets bit 0x80 of the
+ * source-exchange connect-options byte only for a recipient that advertised here -- but aMule does
+ * not read that bit yet, so nothing is lost until it does.
+ *
+ * Turning a bit on means emitting the tag and counting it, which the hello already does, and
+ * settling the ET_MOD_VERSION question first.
+ */
+constexpr uint32_t LocalAdvertisedModMiscOptions()
+{
+	return 0;
+}
+
+/**
+ * Decode the 128-bit address carried by the "ip6" and "bi6" Kad tags.
+ *
+ * The wire form is exactly 32 hexadecimal characters, most significant byte first, upper or lower
+ * case -- the reference implementation writes them with its 128-bit hex formatter and reads them
+ * back with its MD4-hash parser, so the length is fixed and not a prefix. Anything else is a
+ * malformed tag, not a shorter address, and the caller must ignore it.
+ *
+ * @param text the tag's string value; may be NULL.
+ * @param length its length in characters.
+ * @param out receives 16 bytes, big-endian. Untouched unless true is returned.
+ * @return true when the whole run decoded.
+ */
+inline bool DecodeIPv6HexTag(const char *text, size_t length, uint8_t *out)
+{
+	if (text == nullptr || out == nullptr || length != 32) {
+		return false;
+	}
+
+	uint8_t decoded16;
+	for (size_t i = 0; i < 16; ++i) {
+		uint8_t byte = 0;
+		for (size_t nibbleIndex = 0; nibbleIndex < 2; ++nibbleIndex) {
+			const char c = text(i * 2) + nibbleIndex;
+			uint8_t nibble;
+			if (c >= '0' && c <= '9') {
+				nibble = static_cast<uint8_t>(c - '0');
+			} else if (c >= 'a' && c <= 'f') {
+				nibble = static_cast<uint8_t>(c - 'a' + 10);
+			} else if (c >= 'A' && c <= 'F') {
+				nibble = static_cast<uint8_t>(c - 'A' + 10);
+			} else {
+				return false;
+			}
+			byte = static_cast<uint8_t>((byte << 4) | nibble);
+		}
+		decodedi = byte;
+	}
+
+	for (size_t i = 0; i < 16; ++i) {
+		outi = decodedi;
+	}
+	return true;
+}
+
+#endif // PEERCAPABILITIES_H

amule-3.1.0.tar.gz/src/PeerIdentity.h Added

@@ -0,0 +1,120 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 PEERIDENTITY_H
+#define PEERIDENTITY_H
+
+#include "ClientDetailDialog.h" // Needed for ClientDetailInfo
+#include "ClientRef.h"          // Needed for CClientRef
+#include "MD4Hash.h"            // Needed for CMD4Hash
+#include "Types.h"              // Needed for uint16/uint32
+
+/**
+ * A peer a row names, whether or not we are talking to it right now. The identity fields come from
+ * the row and are enough to act on a peer that is offline: to friend it, or to open a connection
+ * when the user asks for one. `client` is linked only when the peer happens to be connected.
+ */
+struct PeerIdentity
+{
+	CMD4Hash hash;
+	wxString name;
+	uint32 ip = 0;
+	uint16 port = 0;
+	CClientRef client;
+
+	/**
+	 * What the details dialog should show when `client` is not linked. Only a list that keeps
+	 * enough of a record to render it fills this in; `hasDetail` says whether it did. A live
+	 * peer needs none of it -- the dialog snapshots the client instead, which knows strictly
+	 * more.
+	 */
+	ClientDetailInfo detail;
+
+	/**
+	 * Whether a connection to this peer can be opened at all: either we are already talking to
+	 * it, or we hold an address to dial.
+	 */
+	bool CanOpenConnection() const { return client.IsLinked() || (ip != 0 && port != 0); }
+
+	/**
+	 * The peer a live client describes. Lets a list that holds clients rather than rows reach
+	 * the same actions, so a behaviour written for one path is not written twice for the other.
+	 */
+	static PeerIdentity FromClient(const CClientRef &live)
+	{
+		CClientRef &c = const_cast<CClientRef &>(live);
+		PeerIdentity peer;
+		peer.hash = c.GetUserHash();
+		peer.name = c.GetUserName();
+		peer.ip = c.GetIP();
+		peer.port = c.GetUserPort();
+		peer.client = live;
+		return peer;
+	}
+
+	/**
+	 * Whether a live client carries an address a friend record could use. The one place that
+	 * answers this for a client, so the menu that offers an action and the action itself cannot
+	 * read it differently.
+	 */
+	static bool Addressable(const CClientRef &live)
+	{
+		CClientRef &c = const_cast<CClientRef &>(live);
+		return c.GetIP() != 0 && c.GetUserPort() != 0;
+	}
+
+	/**
+	 * Whether a friend record can be stored for this peer.
+	 *
+	 * A hash is enough on its own. CFriendList::LookupFriend matches on the hash whenever both
+	 * the query and the record carry one, and ProcessHelloTypePacket looks the peer up at every
+	 * handshake, so a hash-only record is recognised the moment the peer reappears:
+	 * CFriend::LinkClient then fills in the address and applies the stored friend slot. Until
+	 * then the record is inert rather than wrong, because CanOpenConnection() gates browse and
+	 * message on having an address.
+	 *
+	 * This matters most for the rows that need it. A credit record carries no per-peer metadata
+	 * until the peer has handshaked once since that metadata existed, and ClientsWnd only fills
+	 * a row's ip and port from metadata, so on an established clients.met the address-less rows
+	 * are the older ones -- the ones the Known list exists to surface.
+	 *
+	 * The address requirement belongs to the hash-less record, which is why CAddFriend demands
+	 * ip and port: entered by address, it has no other identifier.
+	 *
+	 * For a peer we are connected to the live client is the source of truth, not the row. A row
+	 * only learns an address once the peer has told us its name, so a connected peer with an
+	 * empty nickname has one the row does not, and CFriend's client constructor copies it from
+	 * the client anyway.
+	 */
+	bool CanBeFriended() const
+	{
+		if (!hash.IsEmpty()) {
+			return true;
+		}
+		return client.IsLinked() ? Addressable(client) : (ip != 0 && port != 0);
+	}
+	bool hasDetail = false;
+};
+
+#endif // PEERIDENTITY_H

amule-3.0.1.tar.gz/src/PlatformSpecific.cpp -> amule-3.1.0.tar.gz/src/PlatformSpecific.cpp Changed

@@ -32,26 +32,24 @@
 #include <winbase.h>
 #include <winioctl.h>
 #ifndef FSCTL_SET_SPARSE
-#	define FSCTL_SET_SPARSE		CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)
+#define FSCTL_SET_SPARSE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)
 #endif
 #ifndef FSCTL_SET_ZERO_DATA
-#	define FSCTL_SET_ZERO_DATA	CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA)
+#define FSCTL_SET_ZERO_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA)
 #endif
 
 // Create a message from a Windows error code
 static wxString SystemError()
 {
-	WCHAR * lpMsgBuf = NULL;
+	WCHAR *lpMsgBuf = NULL;
 
-	FormatMessageW(
-		FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+	FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
 		NULL,
 		GetLastError(),
 		0, // Default language
-		(LPWSTR) &lpMsgBuf,
+		(LPWSTR)&lpMsgBuf,
 		0,
-		NULL
-	);
+		NULL);
 
 	wxString ret(lpMsgBuf);
 	LocalFree(lpMsgBuf);
@@ -59,27 +57,30 @@
 }
 
 // Create a file in sparse mode
-bool PlatformSpecific::CreateSparseFile(const CPath& name, uint64_t size)
+bool PlatformSpecific::CreateSparseFile(const CPath &name, uint64_t size)
 {
-	DWORD dwReturnedBytes=0;
+	DWORD dwReturnedBytes = 0;
 
 	HANDLE hd = CreateFileW(name.GetRaw().c_str(),
 		GENERIC_READ | GENERIC_WRITE,
-		0,       // share - not shareable
-		NULL,    // security - not inheritable
+		0,    // share - not shareable
+		NULL, // security - not inheritable
 		CREATE_ALWAYS,
 		FILE_ATTRIBUTE_ARCHIVE,
 		NULL);
 	if (hd == INVALID_HANDLE_VALUE) {
-		AddDebugLogLineC(logPartFile, CFormat("converting %s to sparse failed (OPEN): %s ") % name % SystemError());
+		AddDebugLogLineC(logPartFile,
+			CFormat("converting %s to sparse failed (OPEN): %s ") % name % SystemError());
 		return false;
 	}
 
 	if (!DeviceIoControl(hd, FSCTL_SET_SPARSE, NULL, 0, NULL, 0, &dwReturnedBytes, NULL)) {
-		AddDebugLogLineC(logPartFile, CFormat("converting %s to sparse failed (SET_SPARSE): %s ") % name % SystemError());
+		AddDebugLogLineC(logPartFile,
+			CFormat("converting %s to sparse failed (SET_SPARSE): %s ") % name % SystemError());
 	} else {
 		// FILE_ZERO_DATA_INFORMATION is not defined here
-		struct {
+		struct
+		{
 			uint64 FileOffset;
 			uint64 BeyondFinalZero;
 		} fzdi;
@@ -89,20 +90,29 @@
 		largo.QuadPart = size;
 
 		// zero the data
-		if (!DeviceIoControl(hd, FSCTL_SET_ZERO_DATA, (LPVOID) &fzdi, sizeof(fzdi), NULL, 0, &dwReturnedBytes, NULL)) {
-			AddDebugLogLineC(logPartFile, CFormat("converting %s to sparse failed (ZERO): %s") % name % SystemError());
+		if (!DeviceIoControl(hd,
+			    FSCTL_SET_ZERO_DATA,
+			    (LPVOID)&fzdi,
+			    sizeof(fzdi),
+			    NULL,
+			    0,
+			    &dwReturnedBytes,
+			    NULL)) {
+			AddDebugLogLineC(logPartFile,
+				CFormat("converting %s to sparse failed (ZERO): %s") % name % SystemError());
 		} else if (!SetFilePointerEx(hd, largo, NULL, FILE_BEGIN) || !SetEndOfFile(hd)) {
-			AddDebugLogLineC(logPartFile, CFormat("converting %s to sparse failed (SEEK): %s") % name % SystemError());
+			AddDebugLogLineC(logPartFile,
+				CFormat("converting %s to sparse failed (SEEK): %s") % name % SystemError());
 		}
 	}
 	CloseHandle(hd);
 	return true;
 }
 
-#else  // non Windows systems don't need all this
+#else // non Windows systems don't need all this
 #include "CFile.h"
 
-bool PlatformSpecific::CreateSparseFile(const CPath& name, uint64_t WXUNUSED(size))
+bool PlatformSpecific::CreateSparseFile(const CPath &name, uint64_t WXUNUSED(size))
 {
 	CFile f;
 	return f.Create(name.GetRaw(), true) && f.Close();
@@ -119,12 +129,12 @@
 {
 	int maxconn = -1;
 	// Try to get the max connection value in the registry
-	wxRegKey key( "HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Services\\VxD\\MSTCP\\MaxConnections" );
+	wxRegKey key("HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Services\\VxD\\MSTCP\\MaxConnections");
 	wxString value;
-	if ( key.Exists() ) {
+	if (key.Exists()) {
 		value = key.QueryDefaultValue();
 	}
-	if ( !value.IsEmpty() && value.IsNumber() ) {
+	if (!value.IsEmpty() && value.IsNumber()) {
 		long mc;
 		value.ToLong(&mc);
 		maxconn = (int)mc;
@@ -148,12 +158,11 @@
 }
 #endif
 
-
 #ifdef __WINDOWS__
 #include <winbase.h>
 #include <shlwapi.h>
 
-static PlatformSpecific::EFSType doGetFilesystemType(const CPath& path)
+static PlatformSpecific::EFSType doGetFilesystemType(const CPath &path)
 {
 	wxWritableWCharBuffer pathRaw(path.GetRaw().wchar_str());
 	LPWSTR volume = pathRaw;
@@ -165,7 +174,14 @@
 	DWORD maximumComponentLength = 0;
 	DWORD filesystemFlags = 0;
 	WCHAR filesystemNameBuffer128;
-	if (!GetVolumeInformationW(volume, NULL, 0, NULL, &maximumComponentLength, &filesystemFlags, filesystemNameBuffer, 128)) {
+	if (!GetVolumeInformationW(volume,
+		    NULL,
+		    0,
+		    NULL,
+		    &maximumComponentLength,
+		    &filesystemFlags,
+		    filesystemNameBuffer,
+		    128)) {
 		return PlatformSpecific::fsOther;
 	}
 	if (wxStrnicmp(filesystemNameBuffer, "FAT", 3) == 0) {
@@ -181,11 +197,11 @@
 #include <string.h>
 #include <mntent.h>
 #ifndef _PATH_MOUNTED
-#	define _PATH_MOUNTED	"/etc/mtab"
+#define _PATH_MOUNTED "/etc/mtab"
 #endif
 #include <common/StringFunctions.h>
 
-static PlatformSpecific::EFSType doGetFilesystemType(const CPath& path)
+static PlatformSpecific::EFSType doGetFilesystemType(const CPath &path)
 {
 	struct mntent *entry = NULL;
 	PlatformSpecific::EFSType retval = PlatformSpecific::fsOther;
@@ -235,11 +251,11 @@
 #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)
+static PlatformSpecific::EFSType doGetFilesystemType(const CPath &path)
 {
 	struct mnttab entryStatic;
 	struct mnttab *entry = &entryStatic;
@@ -261,7 +277,8 @@
 					} 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.
+						// 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;
@@ -278,7 +295,7 @@
 #else
 
 // No way to determine filesystem type, no restrictions apply.
-static inline PlatformSpecific::EFSType doGetFilesystemType(const CPath& WXUNUSED(path))
+static inline PlatformSpecific::EFSType doGetFilesystemType(const CPath &WXUNUSED(path))
 {
 	return PlatformSpecific::fsOther;
 }
@@ -288,13 +305,13 @@
 #include <map>
 #include <wx/thread.h>
 
-PlatformSpecific::EFSType PlatformSpecific::GetFilesystemType(const CPath& path)
+PlatformSpecific::EFSType PlatformSpecific::GetFilesystemType(const CPath &path)
 {
-	typedef std::map<wxString, EFSType>	FSMap;
+	typedef std::map<wxString, EFSType> FSMap;
 	// Caching previous results, to speed up further checks.
-	static FSMap	s_fscache;
+	static FSMap s_fscache;
 	// Lock used to ensure the integrity of the cache.
-	static wxMutex	s_lock;
+	static wxMutex s_lock;
 
 	wxCHECK_MSG(path.IsOk(), fsOther, "Invalid path in GetFilesystemType()");
 
@@ -308,70 +325,70 @@
 	return s_fscachepath.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;
+#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);
+#ifdef __WINDOWS__
+		SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED);
+		m_preventingSleepMode = true;
+
+// IOPMAssertionCreate arrived in Leopard (10.5) but is deprecated from Snow Leopard (10.6). See
+// http://developer.apple.com/library/mac/#qa/qa1340/_index.html and
+// http://www.cimgf.com/2009/10/14/the-journey-to-disabling-sleep-with-iokit/
+#elif defined(__WXMAC__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 // 10.6 only
+		CFStringRef reasonForActivity = CFSTR("aMule is transferring files");
+		IOReturn success = IOPMAssertionCreateWithName(kIOPMAssertionTypePreventUserIdleSystemSleep,
+			kIOPMAssertionLevelOn,
+			reasonForActivity,
+			&assertionID);
+		if (success == kIOReturnSuccess) {
+			// Correctly vetoed, flag so we don't do it again.
 			m_preventingSleepMode = true;
+		} else {
+			// May be should be better to trace in log?
+		}
 
-		// IOPMAssertionCreate has been introduced in Leopard (10.5) but deprecated starting from Snow Leopard(10.6)
-		// For more details see:
-		// - http://developer.apple.com/library/mac/#qa/qa1340/_index.html
-		// - http://www.cimgf.com/2009/10/14/the-journey-to-disabling-sleep-with-iokit/
-		#elif defined(__WXMAC__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060	// 10.6 only
-			CFStringRef reasonForActivity= CFSTR("Prevent Display Sleep");
-			IOReturn success = IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep,
-												kIOPMAssertionLevelOn, reasonForActivity, &assertionID);
-			if (success == kIOReturnSuccess) {
-				// Correctly vetoed, flag so we don't do it again.
-				m_preventingSleepMode = true;
-			} else {
-				// May be should be better to trace in log?
-			}
-
-		#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
+#elif defined(__WXMAC__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 // 10.5 only
+		IOReturn success = IOPMAssertionCreate(
+			kIOPMAssertionTypeNoIdleSleep, 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.
+#ifdef __WINDOWS__
+		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;
-		#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
+		} else {
+			// ??
+		}
+#else
+		// Not implemented
+#endif
 	}
 }

amule-3.0.1.tar.gz/src/PlatformSpecific.h -> amule-3.1.0.tar.gz/src/PlatformSpecific.h Changed

@@ -28,120 +28,96 @@
 #include <common/Path.h>
 #include "Types.h"
 
-
-namespace PlatformSpecific {
-
+namespace PlatformSpecific
+{
 
 /**
- * Create sparse file.
- *
- * This function will create the named file sparse if possible.
- *
- * @param name The file to be created (sparse if possible).
- * @param size The desired size of the file.
- * @return true, if creating the file succeeded, false otherwise.
+ * Creates @a name, sparse if the platform allows it, of @a size bytes. Returns whether the file was
+ * created.
  */
-bool CreateSparseFile(const CPath& name, uint64_t size);
-
+bool CreateSparseFile(const CPath &name, uint64_t size);
 
 /**
- * Returns the max number of connections the current OS can handle.
- *
- * Currently anything but windows will return the default value (-1);
+ * The max number of connections the current OS can handle. Anything but Windows returns the default
+ * value (-1).
  */
 #ifdef __WINDOWS__
 int GetMaxConnections();
 #else
-inline int GetMaxConnections() { return -1; }
+inline int GetMaxConnections()
+{
+	return -1;
+}
 #endif
 
-
 /**
- * File system types returned by GetFilesystemType
+ * File system types returned by GetFilesystemType.
  */
-enum EFSType {
-	fsFAT,		//! File Allocation Table
-	fsNTFS,		//! New Technology File System
-	fsHFS,		//! Hierarchical File System
-	fsHPFS,		//! High Performance File System
-	fsMINIX,	//! Minix file system
-	fsOther		//! Unknown, other
+enum EFSType
+{
+	fsFAT,   //! File Allocation Table
+	fsNTFS,  //! New Technology File System
+	fsHFS,   //! Hierarchical File System
+	fsHPFS,  //! High Performance File System
+	fsMINIX, //! Minix file system
+	fsOther  //! Unknown, other
 };
 
 /**
- * Find out the filesystem type of the given path.
- *
- * @param path The path for which the filesystem type should be checked.
- * @return The filesystem type of the given path.
- *
- * This function returns fsOther on unknown or network file systems (because the
- * real filesystem type cannot be determined).
+ * The filesystem type of @a path, or fsOther for an unknown or network file system, whose real type
+ * cannot be determined.
  */
-EFSType GetFilesystemType(const CPath& path);
-
+EFSType GetFilesystemType(const CPath &path);
 
 /**
- * Checks if the filesystem can handle special chars.
- *
- * @param path The path for which the file system should be checked.
- * @return true if the underlying filesystem can handle special chars.
- *
- * This function checks if the file system of the given path can handle
- * special chars e.g. ':' in file names. This function will always return
- * false on MSW, since Windows cannot handle those characters on any file system.
- *
- * Based on http://en.wikipedia.org/wiki/Comparison_of_file_systems
+ * True if the filesystem at @a path can handle special chars such as ':' in file names. Always
+ * false on MSW, since Windows cannot handle those characters on any file system. Based on
+ * http://en.wikipedia.org/wiki/Comparison_of_file_systems
  */
 #ifdef __WINDOWS__
-inline bool CanFSHandleSpecialChars(const CPath& WXUNUSED(path)) { return false; }
+inline bool CanFSHandleSpecialChars(const CPath &WXUNUSED(path))
+{
+	return false;
+}
 #else
 // Other filesystem types may be added
-inline bool CanFSHandleSpecialChars(const CPath& path)
+inline bool CanFSHandleSpecialChars(const CPath &path)
 {
 	switch (GetFilesystemType(path)) {
-		case fsFAT:
-		case fsNTFS:
-		case fsHFS:
-			return false;
-		default:
-			return true;
+	case fsFAT:
+	case fsNTFS:
+	case fsHFS:
+		return false;
+	default:
+		return true;
 	}
 }
 #endif
 
-
 /**
- * Check if the filesystem can handle large files.
- *
- * @param path The path for which the filesystem should be checked.
- * @return true if the underlying filesystem can handle large files.
- *
- * This function checks if the file system of the given path can handle
- * large files (>4GB).
- *
- * Based on http://en.wikipedia.org/wiki/Comparison_of_file_systems
+ * True if the filesystem at @a path can handle large files (>4GB). Based on
+ * http://en.wikipedia.org/wiki/Comparison_of_file_systems
  */
-inline bool CanFSHandleLargeFiles(const CPath& path)
+inline bool CanFSHandleLargeFiles(const CPath &path)
 {
 	switch (GetFilesystemType(path)) {
-		case fsFAT:
-		case fsHFS:
-		case fsHPFS:
-		case fsMINIX:
-			return false;
-		default:
-			return true;
+	case fsFAT:
+	case fsHFS:
+	case fsHPFS:
+	case fsMINIX:
+		return false;
+	default:
+		return true;
 	}
 }
 
 /**
- * Disable / enable computer's energy saving "standby" mode.
- *
+ * Disable or enable the computer's energy-saving "standby" mode.
  */
 #if defined __WINDOWS__ || defined __WXMAC__
-	#define PLATFORMSPECIFIC_CAN_PREVENT_SLEEP_MODE 1
+#define PLATFORMSPECIFIC_CAN_PREVENT_SLEEP_MODE 1
 #else
-	#define PLATFORMSPECIFIC_CAN_PREVENT_SLEEP_MODE 0
+#define PLATFORMSPECIFIC_CAN_PREVENT_SLEEP_MODE 0
 #endif
 
 void PreventSleepMode();

amule-3.0.1.tar.gz/src/Preferences.cpp -> amule-3.1.0.tar.gz/src/Preferences.cpp Changed

@@ -29,39 +29,44 @@
 #include <protocol/ed2k/Constants.h>
 #include <common/Constants.h>
 #include <common/DataFileVersion.h>
+#include <common/Path.h> // Needed for StripSeparators (path-mapping prefixes)
 
 #include <wx/config.h>
 #include <wx/dir.h>
+#include <wx/regex.h> // Needed for wxRegEx (shared-file exclusion filter)
 #include <wx/stdpaths.h>
 #include <wx/stopwatch.h>
 #include <wx/tokenzr.h>
-#include <wx/utils.h>				// Needed for wxBusyCursor
 
 #include "amule.h"
-#include "config.h"				// Needed for PACKAGE_STRING
+#include "FileArea.h" // Needed to push MMapEnabled into CFileArea
+#include "config.h"   // Needed for PACKAGE_STRING
 
 #include "CFile.h"
-#include <common/FileFunctions.h>		// CDirIterator for recursive-root walk
+#include <common/FileFunctions.h> // CDirIterator for recursive-root walk
 #include <common/MD5Sum.h>
-#include <set>					// reconcile sets in ReloadSharedFolders
+#include <set> // reconcile sets in ReloadSharedFolders
 #include "Logger.h"
-#include <common/Format.h>			// Needed for CFormat
-#include <common/TextFile.h>			// Needed for CTextFile
+#include <common/Format.h>   // Needed for CFormat
+#include <common/TextFile.h> // Needed for CTextFile
 #include <common/ClientVersion.h>
 
 #include "UserEvents.h"
 
 #ifndef AMULE_DAEMON
+#include <wx/translation.h> // Needed for wxTranslations
 #include <wx/valgen.h>
+#include "LanguageList.h"
 #include "muuli_wdr.h"
 #include "StatisticsDlg.h"
 #include "MuleColour.h"
+#include <vector> // Needed for the language picker's entry list
 #endif
 
 #ifndef CLIENT_GUI
 #include "RandomFunctions.h"
-#include "PlatformSpecific.h"		// Needed for PlatformSpecific::GetMaxConnections()
-#include "SharedFileList.h"			// Needed for theApp->sharedfiles->Reload()
+#include "PlatformSpecific.h" // Needed for PlatformSpecific::GetMaxConnections()
+#include "SharedFileList.h"   // Needed for theApp->sharedfiles->Reload()
 #endif
 
 // Needed for IP filtering prefs
@@ -73,223 +78,246 @@
 #define DEFAULT_UDP_PORT 4672
 
 // Static variables
-unsigned long		CPreferences::s_colorscntStatColors;
-unsigned long		CPreferences::s_colors_refcntStatColors;
+unsigned long CPreferences::s_colorscntStatColors;
+unsigned long CPreferences::s_colors_refcntStatColors;
 
-CPreferences::CFGMap	CPreferences::s_CfgList;
-CPreferences::CFGList	CPreferences::s_MiscList;
+CPreferences::CFGMap CPreferences::s_CfgList;
+CPreferences::CFGList CPreferences::s_MiscList;
 
-wxString	CPreferences::s_configDir;
+wxString CPreferences::s_configDir;
+bool CPreferences::s_firstRun = false;
+bool CPreferences::s_firstRunWizardDone = false;
 
 /* Proxy */
-CProxyData	CPreferences::s_ProxyData;
+CProxyData CPreferences::s_ProxyData;
 
 /* The rest, organize it! */
-wxString	CPreferences::s_nick;
-Cfg_Lang_Base * CPreferences::s_cfgLang;
-uint32		CPreferences::s_maxupload;
-uint32		CPreferences::s_maxdownload;
-uint32		CPreferences::s_slotallocation;
-wxString	CPreferences::s_Addr;
-uint16		CPreferences::s_port;
-uint16		CPreferences::s_udpport;
-bool		CPreferences::s_UDPEnable;
-uint16		CPreferences::s_maxconnections;
-bool		CPreferences::s_reconnect;
-bool		CPreferences::s_autoconnect;
-bool		CPreferences::s_autoconnectstaticonly;
-bool		CPreferences::s_UPnPEnabled;
-bool		CPreferences::s_UPnPECEnabled;
-bool		CPreferences::s_UPnPWebServerEnabled;
-uint16		CPreferences::s_UPnPTCPPort;
-bool		CPreferences::s_autoserverlist;
-bool		CPreferences::s_deadserver;
-CPath		CPreferences::s_incomingdir;
-CPath		CPreferences::s_tempdir;
-bool		CPreferences::s_ICH;
-uint8		CPreferences::s_depth3D;
-bool		CPreferences::s_scorsystem;
-bool		CPreferences::s_hideonclose;
-bool		CPreferences::s_appimageIntegrationDeclined;
-bool		CPreferences::s_mintotray;
-bool		CPreferences::s_notify;
-bool		CPreferences::s_trayiconenabled;
-bool		CPreferences::s_addnewfilespaused;
-bool		CPreferences::s_addserversfromserver;
-bool		CPreferences::s_addserversfromclient;
-uint16		CPreferences::s_maxsourceperfile;
-uint16		CPreferences::s_trafficOMeterInterval;
-uint16		CPreferences::s_statsInterval;
-uint32		CPreferences::s_maxGraphDownloadRate;
-uint32		CPreferences::s_maxGraphUploadRate;
-bool		CPreferences::s_confirmExit;
-bool		CPreferences::s_filterLanIP;
-bool		CPreferences::s_paranoidfilter;
-bool		CPreferences::s_IPFilterSys;
-bool		CPreferences::s_onlineSig;
-uint16		CPreferences::s_OSUpdate;
-wxString	CPreferences::s_languageID;
-uint8		CPreferences::s_iSeeShares;
-uint8		CPreferences::s_iToolDelayTime;
-uint8		CPreferences::s_splitterbarPosition;
-uint16		CPreferences::s_deadserverretries;
-uint64		CPreferences::s_dwServerKeepAliveTimeoutMins;
-uint8		CPreferences::s_statsMax;
-uint8		CPreferences::s_statsAverageMinutes;
-bool		CPreferences::s_bpreviewprio;
-bool		CPreferences::s_smartidcheck;
-uint8		CPreferences::s_smartidstate;
-bool		CPreferences::s_safeServerConnect;
-bool		CPreferences::s_startMinimized;
-uint16		CPreferences::s_MaxConperFive;
-bool		CPreferences::s_checkDiskspace;
-uint32		CPreferences::s_uMinFreeDiskSpace;
-wxString	CPreferences::s_yourHostname;
-bool		CPreferences::s_bVerbose;
-bool		CPreferences::s_bVerboseLogfile;
-bool		CPreferences::s_bmanualhighprio;
-bool		CPreferences::s_bstartnextfile;
-bool		CPreferences::s_bstartnextfilesame;
-bool		CPreferences::s_bstartnextfilealpha;
-bool		CPreferences::s_bshowoverhead;
-bool		CPreferences::s_bDAP;
-bool		CPreferences::s_bUAP;
+wxString CPreferences::s_nick;
+uint32 CPreferences::s_maxupload;
+uint32 CPreferences::s_maxdownload;
+uint32 CPreferences::s_slotallocation;
+wxString CPreferences::s_Addr;
+wxString CPreferences::s_NetworkInterface;
+uint16 CPreferences::s_port;
+uint16 CPreferences::s_udpport;
+bool CPreferences::s_UDPEnable;
+uint16 CPreferences::s_maxconnections;
+bool CPreferences::s_reconnect;
+bool CPreferences::s_autoconnect;
+bool CPreferences::s_autoconnectstaticonly;
+bool CPreferences::s_UPnPEnabled;
+bool CPreferences::s_UPnPECEnabled;
+bool CPreferences::s_UPnPWebServerEnabled;
+uint16 CPreferences::s_UPnPTCPPort;
+bool CPreferences::s_UPnPAvailable = false;
+bool CPreferences::s_autoserverlist;
+bool CPreferences::s_deadserver;
+CPath CPreferences::s_incomingdir;
+CPath CPreferences::s_tempdir;
+bool CPreferences::s_ICH;
+uint8 CPreferences::s_depth3D;
+bool CPreferences::s_scorsystem;
+bool CPreferences::s_hideonclose;
+bool CPreferences::s_appimageIntegrationDeclined;
+bool CPreferences::s_mintotray;
+bool CPreferences::s_notify;
+bool CPreferences::s_rememberSearchHistory;
+bool CPreferences::s_trayiconenabled;
+bool CPreferences::s_addnewfilespaused;
+bool CPreferences::s_addserversfromserver;
+bool CPreferences::s_addserversfromclient;
+uint16 CPreferences::s_maxsourceperfile;
+uint16 CPreferences::s_trafficOMeterInterval;
+uint16 CPreferences::s_statsInterval;
+uint32 CPreferences::s_maxGraphDownloadRate;
+uint32 CPreferences::s_maxGraphUploadRate;
+bool CPreferences::s_confirmExit;
+bool CPreferences::s_filterLanIP;
+bool CPreferences::s_paranoidfilter;
+bool CPreferences::s_IPFilterSys;
+bool CPreferences::s_onlineSig;
+uint16 CPreferences::s_OSUpdate;
+wxString CPreferences::s_languageID;
+uint8 CPreferences::s_iSeeShares;
+uint8 CPreferences::s_iToolDelayTime;
+uint8 CPreferences::s_splitterbarPosition;
+uint16 CPreferences::s_deadserverretries;
+uint64 CPreferences::s_dwServerKeepAliveTimeoutMins;
+uint8 CPreferences::s_statsMax;
+uint8 CPreferences::s_statsAverageMinutes;
+bool CPreferences::s_bpreviewprio;
+bool CPreferences::s_smartidcheck;
+uint8 CPreferences::s_smartidstate;
+bool CPreferences::s_safeServerConnect;
+bool CPreferences::s_Endgame;
+bool CPreferences::s_startMinimized;
+uint16 CPreferences::s_MaxConperFive;
+uint16 CPreferences::s_kadMaxSourceSearches;
+uint64 CPreferences::s_kadSourceReaskMins;
+uint64 CPreferences::s_sourceReaskMins;
+bool CPreferences::s_checkDiskspace;
+uint32 CPreferences::s_uMinFreeDiskSpace;
+wxString CPreferences::s_yourHostname;
+bool CPreferences::s_bVerbose;
+bool CPreferences::s_bVerboseLogfile;
+bool CPreferences::s_bmanualhighprio;
+bool CPreferences::s_bstartnextfile;
+bool CPreferences::s_bstartnextfilesame;
+bool CPreferences::s_bstartnextfilealpha;
+bool CPreferences::s_bshowoverhead;
+bool CPreferences::s_bDAP;
+bool CPreferences::s_bUAP;
 #ifndef __GIT__
-bool		CPreferences::s_showVersionOnTitle;
+bool CPreferences::s_showVersionOnTitle;
 #endif
-uint8_t		CPreferences::s_showRatesOnTitle;
-wxString	CPreferences::s_VideoPlayer;
-bool		CPreferences::s_showAllNotCats;
-bool		CPreferences::s_msgonlyfriends;
-bool		CPreferences::s_msgsecure;
-uint8		CPreferences::s_filterlevel;
-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;
-uint16		CPreferences::s_nWebUPnPTCPPort;
-bool		CPreferences::s_bWebEnabled;
-bool		CPreferences::s_bWebUseGzip;
-uint32		CPreferences::s_nWebPageRefresh;
-bool		CPreferences::s_bWebLowEnabled;
-wxString	CPreferences::s_WebTemplate;
-bool		CPreferences::s_showCatTabInfos;
+uint8_t CPreferences::s_showRatesOnTitle;
+wxString CPreferences::s_VideoPlayer;
+bool CPreferences::s_showAllNotCats;
+bool CPreferences::s_msgonlyfriends;
+bool CPreferences::s_msgsecure;
+uint8 CPreferences::s_filterlevel;
+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;
+uint16 CPreferences::s_nWebUPnPTCPPort;
+bool CPreferences::s_bWebEnabled;
+bool CPreferences::s_bWebUseGzip;
+bool CPreferences::s_bAmuleApiEnabled;
+uint16 CPreferences::s_nAmuleApiPort;
+wxString CPreferences::s_sAmuleApiBindAddress;
+wxString CPreferences::s_sAmuleApiPassword;
+wxString CPreferences::s_sAmuleApiGuestPassword;
+bool CPreferences::s_bAmuleApiGuestEnabled;
+bool CPreferences::s_bAmuleApiAdminIsSet;
+wxString CPreferences::s_sAmuleApiPath;
+uint32 CPreferences::s_nWebPageRefresh;
+bool CPreferences::s_bWebLowEnabled;
+wxString CPreferences::s_WebTemplate;
+bool CPreferences::s_showCatTabInfos;
 AllCategoryFilter CPreferences::s_allcatFilter;
-bool		CPreferences::s_AcceptExternalConnections;
-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;
-bool		CPreferences::s_ProgBar;
-bool		CPreferences::s_Percent;
-bool		CPreferences::s_SecIdent;
-bool		CPreferences::s_ExtractMetaData;
-bool		CPreferences::s_allocFullFile;
-bool		CPreferences::s_createFilesSparse;
-wxString	CPreferences::s_CustomBrowser;
-bool		CPreferences::s_BrowserTab;
-CPath		CPreferences::s_OSDirectory;
-wxString	CPreferences::s_Skin;
-bool		CPreferences::s_FastED2KLinksHandler;
-bool		CPreferences::s_ToolbarOrientation;
-bool		CPreferences::s_AICHTrustEveryHash;
-wxString	CPreferences::s_CommentFilterString;
-bool		CPreferences::s_IPFilterAutoLoad;
-wxString	CPreferences::s_IPFilterURL;
-CMD4Hash	CPreferences::s_userhash;
-bool		CPreferences::s_MustFilterMessages;
-wxString	CPreferences::s_MessageFilterString;
-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_AutoRescanSharedDirs;
-bool		CPreferences::s_FollowSymlinksInShares;
-bool		CPreferences::s_AutoSortDownload;
-bool		CPreferences::s_NewVersionCheck;
-bool		CPreferences::s_ConnectToKad;
-bool		CPreferences::s_ConnectToED2K;
-unsigned	CPreferences::s_maxClientVersions;
-bool		CPreferences::s_DropSlowSources;
-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;
-bool		CPreferences::s_GeoIPEnabled;
-wxString	CPreferences::s_GeoIPSource;
-wxString	CPreferences::s_GeoIPLoadedSource;
-wxString	CPreferences::s_GeoIPMaxMindLicense;
-wxString	CPreferences::s_GeoIPCustomUrl;
-bool		CPreferences::s_GeoIPAutoUpdate;
-wxString	CPreferences::s_GeoIPUpdateUrl;
-bool		CPreferences::s_preventSleepWhileDownloading;
-wxString	CPreferences::s_StatsServerName;
-wxString	CPreferences::s_StatsServerURL;
+bool CPreferences::s_AcceptExternalConnections;
+bool CPreferences::s_ECRequireEncryption;
+wxString CPreferences::s_ECAddr;
+wxString CPreferences::s_ECNetworkInterface;
+uint32 CPreferences::s_ECPort;
+uint32 CPreferences::s_ECAuthFailureWindowSeconds;
+uint32 CPreferences::s_ECAuthFailureThreshold;
+uint32 CPreferences::s_ECAuthLockoutSeconds;
+wxString CPreferences::s_ECPassword;
+bool CPreferences::s_TransmitOnlyUploadingClients;
+bool CPreferences::s_IPFilterClients;
+bool CPreferences::s_IPFilterServers;
+bool CPreferences::s_UseSrcSeeds;
+bool CPreferences::s_ProgBar;
+bool CPreferences::s_Percent;
+bool CPreferences::s_SecIdent;
+bool CPreferences::s_allocFullFile;
+bool CPreferences::s_mmapEnabled;
+bool CPreferences::s_mmapSupported;
+bool CPreferences::s_createFilesSparse;
+wxString CPreferences::s_CustomBrowser;
+bool CPreferences::s_BrowserTab;
+CPath CPreferences::s_OSDirectory;
+wxString CPreferences::s_Skin;
+bool CPreferences::s_FastED2KLinksHandler;
+bool CPreferences::s_ToolbarOrientation;
+bool CPreferences::s_liveListSort;
+bool CPreferences::s_AICHTrustEveryHash;
+wxString CPreferences::s_CommentFilterString;
+bool CPreferences::s_IPFilterAutoLoad;
+wxString CPreferences::s_IPFilterURL;
+CMD4Hash CPreferences::s_userhash;
+bool CPreferences::s_MustFilterMessages;
+wxString CPreferences::s_MessageFilterString;
+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_AutoRescanSharedDirs;
+bool CPreferences::s_FollowSymlinksInShares;
+wxString CPreferences::s_ExcludeSharePatterns;
+bool CPreferences::s_ExcludeSharePatternsUseRegex;
+CShareExcludeFilter CPreferences::s_ShareExcludeFilter;
+bool CPreferences::s_NewVersionCheck;
+// Default true so the monolithic app (which never receives the capability tag over EC
+// and does not consult this flag) is unaffected; the remote GUI overwrites it from each
+// prefs-apply.
+bool CPreferences::s_versionCheckAvailable = true;
+bool CPreferences::s_MediaMetadataEnabled;
+wxString CPreferences::s_MediaMetadataFFProbePath;
+bool CPreferences::s_ConnectToKad;
+bool CPreferences::s_ConnectToED2K;
+unsigned CPreferences::s_maxClientVersions;
+bool CPreferences::s_DropSlowSources;
+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;
+bool CPreferences::s_GeoIPEnabled;
+bool CPreferences::s_GeoIPSupported = true;
+bool CPreferences::s_GeoIPStatusLoaded = false;
+bool CPreferences::s_GeoIPStatusDownloading = false;
+wxString CPreferences::s_GeoIPStatusLastResult;
+wxString CPreferences::s_GeoIPStatusLoadedSource;
+bool CPreferences::s_GeoIPUpdateRequested = false;
+wxString CPreferences::s_GeoIPSource;
+wxString CPreferences::s_GeoIPLoadedSource;
+wxString CPreferences::s_GeoIPMaxMindLicense;
+wxString CPreferences::s_GeoIPCustomUrl;
+bool CPreferences::s_GeoIPAutoUpdate;
+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 functionality needed to synchronize a
- * variable with a widget. However, please note that wxGenericValidator only
- * 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
- * makes use of several workaround to enable it to be used with integers other
- * than int.
+ * wxGenericValidator supports only a few types (int, wxString, bool, wxArrayInt), so
+ * this template cannot always be used directly: Cfg_Str and Cfg_Bool use it as is,
+ * while Cfg_Int works around it to handle integers other than int.
  */
-template <typename TYPE>
-class Cfg_Tmpl : public Cfg_Base
+template <typename TYPE> class Cfg_Tmpl : public Cfg_Base
 {
 public:
-	/**
-	 * Constructor.
-	 *
-	 * @param keyname
-	 * @param value
-	 * @param defaultVal
-	 */
-	Cfg_Tmpl( const wxString& keyname, TYPE& value, const TYPE& defaultVal )
-	 : Cfg_Base( keyname ),
-	   m_value( value ),
-	   m_default( defaultVal ),
-	   m_widget( NULL )
-	{}
+	Cfg_Tmpl(const wxString &keyname, TYPE &value, const TYPE &defaultVal)
+	: Cfg_Base(keyname)
+	, m_value(value)
+	, m_default(defaultVal)
+	, m_widget(NULL)
+	{
+	}
 
 #ifndef AMULE_DAEMON
 	/**
-	 * Connects the Cfg to a widget.
+	 * Connects the Cfg to a widget, by setting the class's wxValidator.
 	 *
 	 * @param id The ID of the widget to be connected.
 	 * @param parent The parent of the widget. Use this to speed up searches.
 	 *
-	 * This function works by setting the wxValidator of the class. This however
-	 * poses some restrictions on which variable types can be used for this
-	 * template, as noted above. It also poses some limits on the widget types,
-	 * refer to the wx documentation for those.
+	 * Going through the validator restricts which variable types this template takes,
+	 * as noted above, and which widget types; see the wx documentation for those.
 	 */
-	virtual	bool ConnectToWidget( int id, wxWindow* parent = NULL )
+	virtual bool ConnectToWidget(int id, wxWindow *parent = NULL)
 	{
-		if ( id ) {
-			m_widget = wxWindow::FindWindowById( id, parent );
+		if (id) {
+			m_widget = wxWindow::FindWindowById(id, parent);
 
-			if ( m_widget ) {
-				wxGenericValidator validator( &m_value );
+			if (m_widget) {
+				wxGenericValidator validator(&m_value);
 
-				m_widget->SetValidator( validator );
+				m_widget->SetValidator(validator);
 
 				return true;
 			}
@@ -300,18 +328,17 @@
 		return false;
 	}
 
-
 	/** Updates the associated variable, returning true on success. */
 	virtual bool TransferFromWindow()
 	{
-		if ( m_widget ) {
-			wxValidator* validator = m_widget->GetValidator();
+		if (m_widget) {
+			wxValidator *validator = m_widget->GetValidator();
 
-			if ( validator ) {
+			if (validator) {
 				TYPE temp = m_value;
 
-				if ( validator->TransferFromWindow() ) {
-					SetChanged( temp != m_value );
+				if (validator->TransferFromWindow()) {
+					SetChanged(temp != m_value);
 
 					return true;
 				}
@@ -324,119 +351,120 @@
 	/** Updates the associated widget, returning true on success. */
 	virtual bool TransferToWindow()
 	{
-		if ( m_widget ) {
-			wxValidator* validator = m_widget->GetValidator();
+		if (m_widget) {
+			wxValidator *validator = m_widget->GetValidator();
 
-			if ( validator )
+			if (validator)
 				return validator->TransferToWindow();
 		}
 
 		return false;
 	}
 
+	/** @see Cfg_Base::ResetToDefault. Shows the default in the widget without
+	    touching the stored variable, so Cancel is a no-op and OK commits it. */
+	virtual bool ResetToDefault()
+	{
+		if (!m_widget) {
+			return false;
+		}
+
+		TYPE saved = m_value;
+		m_value = m_default;
+		bool ok = TransferToWindow();
+		m_value = saved;
+
+		return ok;
+	}
+
 #endif
 
 	/** Sets the default value. */
-	void	SetDefault(const TYPE& defaultVal)
-	{
-		m_default = defaultVal;
-	}
+	void SetDefault(const TYPE &defaultVal) { m_default = defaultVal; }
 
 protected:
 	//! Reference to the associated variable
-	TYPE&	m_value;
+	TYPE &m_value;
 
 	//! Default variable value
-	TYPE	m_default;
+	TYPE m_default;
 
 	//! Pointer to the widget assigned to the Cfg instance
-	wxWindow*	m_widget;
+	wxWindow *m_widget;
 };
 
-
 /** Cfg class for wxStrings. */
 class Cfg_Str : public Cfg_Tmpl<wxString>
 {
 public:
 	/** Constructor. */
-	Cfg_Str( const wxString& keyname, wxString& value, const wxString& defaultVal = EmptyString )
-	 : Cfg_Tmpl<wxString>( keyname, value, defaultVal )
-	{}
-
-	/** Loads the string, using the specified default value. */
-	virtual void LoadFromFile(wxConfigBase* cfg)
+	Cfg_Str(const wxString &keyname, wxString &value, const wxString &defaultVal = EmptyString)
+	: Cfg_Tmpl<wxString>(keyname, value, defaultVal)
 	{
-		cfg->Read( GetKey(), &m_value, m_default );
 	}
 
+	/** Loads the string, using the specified default value. */
+	virtual void LoadFromFile(wxConfigBase *cfg) { cfg->Read(GetKey(), &m_value, m_default); }
 
 	/** Saves the string to the specified wxConfig object. */
-	virtual void SaveToFile(wxConfigBase* cfg)
-	{
-		cfg->Write( GetKey(), m_value );
-	}
+	virtual void SaveToFile(wxConfigBase *cfg) { cfg->Write(GetKey(), m_value); }
 };
 
-
-/**
- * Cfg-class for encrypting strings, for example for passwords.
- */
+/** Cfg class for encrypting strings, for example passwords. */
 class Cfg_Str_Encrypted : public Cfg_Str
 {
 public:
-	Cfg_Str_Encrypted( const wxString& keyname, wxString& value, const wxString& defaultVal = EmptyString )
-	 : Cfg_Str( keyname, value, defaultVal )
-	{}
+	Cfg_Str_Encrypted(const wxString &keyname, wxString &value, const wxString &defaultVal = EmptyString)
+	: Cfg_Str(keyname, value, defaultVal)
+	{
+	}
 
 #ifndef AMULE_DAEMON
 	virtual bool TransferFromWindow()
 	{
 		// Shakraw: when storing value, store it encrypted here (only if changed in prefs)
-		if ( Cfg_Str::TransferFromWindow() ) {
+		if (Cfg_Str::TransferFromWindow()) {
 
 			// Only recalucate the hash for new, non-empty passwords
-			if ( HasChanged() && !m_value.IsEmpty() ) {
-				m_value = MD5Sum( m_value ).GetHash();
+			if (HasChanged() && !m_value.IsEmpty()) {
+				m_value = MD5Sum(m_value).GetHash();
 			}
 
 			return true;
 		}
 
-
 		return false;
 	}
 #endif
 };
 
-
 /** Cfg class for CPath. */
 class Cfg_Path : public Cfg_Str
 {
 public:
 	/** Constructor. */
-	Cfg_Path(const wxString& keyname, CPath& value, const wxString& defaultVal = EmptyString )
-	 : Cfg_Str(keyname, m_temp_path, defaultVal)
-	 , m_real_path(value)
-	{}
+	Cfg_Path(const wxString &keyname, CPath &value, const wxString &defaultVal = EmptyString)
+	: Cfg_Str(keyname, m_temp_path, defaultVal)
+	, m_real_path(value)
+	{
+	}
 
 	/** @see Cfg_Str::LoadFromFile. */
-	virtual void LoadFromFile(wxConfigBase* cfg)
+	virtual void LoadFromFile(wxConfigBase *cfg)
 	{
 		Cfg_Str::LoadFromFile(cfg);
 
 		m_real_path = CPath::FromUniv(m_temp_path);
 	}
 
-
 	/** @see Cfg_Str::SaveToFile. */
-	virtual void SaveToFile(wxConfigBase* cfg)
+	virtual void SaveToFile(wxConfigBase *cfg)
 	{
 		m_temp_path = CPath::ToUniv(m_real_path);
 
 		Cfg_Str::SaveToFile(cfg);
 	}
 
-
 	/** @see Cfg_Tmpl::TransferToWindow. */
 	virtual bool TransferToWindow()
 	{
@@ -458,41 +486,33 @@
 
 private:
 	wxString m_temp_path;
-	CPath&   m_real_path;
+	CPath &m_real_path;
 };
 
-
 /**
- * Cfg class that takes care of integer types.
+ * Cfg class for integer types, needed because wxValidator supports only plain ints
+ * and wxConfig only longs. Two workarounds follow from that:
  *
- * This template is needed since wxValidator only supports normals ints, and
- * wxConfig for the matter only supports longs, thus some worksarounds are
- * 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
+ *  1) wxValidator only supports int*, so an intermediate variable acts as storage --
+ *     hence the Cfg_Tmpl<int> base, whose integer passes the value back and forth
  *     between the widgets.
- *
- *  2) wxConfig uses longs to save and read values, thus we need an immediate
- *     stage when loading and saving the value.
+ *  2) wxConfig saves and reads longs, so loading and saving needs its own
+ *     intermediate stage.
  */
-template <typename TYPE>
-class Cfg_Int : public Cfg_Tmpl<int>
+template <typename TYPE> class Cfg_Int : public Cfg_Tmpl<int>
 {
 public:
-	Cfg_Int( const wxString& keyname, TYPE& value, int defaultVal = 0 )
-	 : Cfg_Tmpl<int>( keyname, m_temp_value, defaultVal ),
-	   m_real_value( value ),
-	   m_temp_value( value )
-	{}
-
+	Cfg_Int(const wxString &keyname, TYPE &value, int defaultVal = 0)
+	: Cfg_Tmpl<int>(keyname, m_temp_value, defaultVal)
+	, m_real_value(value)
+	, m_temp_value(value)
+	{
+	}
 
-	virtual void LoadFromFile(wxConfigBase* cfg)
+	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;
@@ -500,16 +520,12 @@
 		m_real_value = (TYPE)tmp;
 	}
 
-	virtual void SaveToFile(wxConfigBase* cfg)
-	{
-		cfg->Write( GetKey(), (long)m_real_value );
-	}
-
+	virtual void SaveToFile(wxConfigBase *cfg) { cfg->Write(GetKey(), (long)m_real_value); }
 
 #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;
@@ -522,15 +538,15 @@
 	{
 		m_temp_value = (int)m_real_value;
 
-		if ( Cfg_Tmpl<int>::TransferToWindow() ) {
+		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->GetEventHandler()->ProcessEvent( evt );
+				wxScrollEvent evt(wxEVT_SCROLL_THUMBRELEASE, id, pos);
+				m_widget->GetEventHandler()->ProcessEvent(evt);
 			}
 
 			return true;
@@ -538,355 +554,211 @@
 
 		return false;
 	}
+
+	// @see Cfg_Base::ResetToDefault. Cfg_Int's TransferToWindow rebuilds the widget from
+	// m_real_value, so the default is shown by briefly staging it there and restoring it,
+	// leaving the committed value for OK/Cancel.
+	virtual bool ResetToDefault()
+	{
+		if (!m_widget) {
+			return false;
+		}
+
+		TYPE saved = m_real_value;
+		m_real_value = (TYPE)m_default;
+		bool ok = TransferToWindow();
+		m_real_value = saved;
+
+		return ok;
+	}
 #endif
 
 protected:
-
-	TYPE&	m_real_value;
-	int		m_temp_value;
+	TYPE &m_real_value;
+	int m_temp_value;
 };
 
-
 /**
- * Helper function for creating new Cfg_Ints.
+ * Returns a Cfg_Int of the appropriate type for the variable given, so callers need
+ * not spell the integer type out at every new Cfg_Int.
  *
  * @param keyname The cfg-key under which the item should be saved.
- * @param value The variable to synchronize. The type of this variable defines the type used to create the Cfg_Int.
- * @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
- * 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 maintenance burden.
+ * @param value The variable to synchronize; its type defines the Cfg_Int type.
+ * @param defaultVal The default value if the key is not found when loading.
+ * @return A new Cfg_Int; the caller is responsible for deleting it.
  */
-template <class TYPE>
-Cfg_Base* MkCfg_Int( const wxString& keyname, TYPE& value, int defaultVal )
+template <class TYPE> Cfg_Base *MkCfg_Int(const wxString &keyname, TYPE &value, int defaultVal)
 {
-	return new Cfg_Int<TYPE>( keyname, value, defaultVal );
+	return new Cfg_Int<TYPE>(keyname, value, defaultVal);
 }
 
-
-/**
- * Cfg-class for bools.
- */
+/** Cfg class for bools. */
 class Cfg_Bool : public Cfg_Tmpl<bool>
 {
 public:
-	Cfg_Bool( const wxString& keyname, bool& value, bool defaultVal )
-	 : Cfg_Tmpl<bool>( keyname, value, defaultVal )
-	{}
-
-
-	virtual void LoadFromFile(wxConfigBase* cfg)
+	Cfg_Bool(const wxString &keyname, bool &value, bool defaultVal)
+	: Cfg_Tmpl<bool>(keyname, value, defaultVal)
 	{
-		cfg->Read( GetKey(), &m_value, m_default );
 	}
 
-	virtual void SaveToFile(wxConfigBase* cfg)
-	{
-		cfg->Write( GetKey(), m_value );
-	}
+	virtual void LoadFromFile(wxConfigBase *cfg) { cfg->Read(GetKey(), &m_value, m_default); }
+
+	virtual void SaveToFile(wxConfigBase *cfg) { cfg->Write(GetKey(), m_value); }
 };
 
+/**
+ * Wraps any Cfg class so its value lives only in memory for this run. The wrapped
+ * preference still binds to a dialog control, still reports HasChanged(), and still
+ * travels over EC like any other -- only the amule.conf round trip is dropped.
+ *
+ * This is what the amuleapi credential fields need. Those credentials have exactly one
+ * store, amuleapi-passwords, which amuleapi, amuled and monolithic aMule all read and
+ * write; a second copy in amule.conf would mean two stores that disagree the moment
+ * either side changes, with no way to tell which is newer. The dialog field is
+ * therefore a write-only request ("set the password to this"), not a mirror of what is
+ * stored. The key name is kept for readability; nothing reads or writes it.
+ */
+template <typename BASE> class Cfg_Transient : public BASE
+{
+public:
+	using BASE::BASE;
+
+	virtual void LoadFromFile(wxConfigBase *) {}
+	virtual void SaveToFile(wxConfigBase *) {}
+};
 
 #ifndef AMULE_DAEMON
 
 class Cfg_Colour : public Cfg_Base
 {
-      public:
-	Cfg_Colour(const wxString& key, wxColour& colour)
-		: Cfg_Base(key),
-		  m_colour(colour),
-		  m_default(CMuleColour(colour).GetULong())
-	{}
+public:
+	Cfg_Colour(const wxString &key, wxColour &colour)
+	: Cfg_Base(key)
+	, m_colour(colour)
+	, m_default(CMuleColour(colour).GetULong())
+	{
+	}
 
-	virtual void LoadFromFile(wxConfigBase* cfg)
+	virtual void LoadFromFile(wxConfigBase *cfg)
 	{
 		long int rgb;
 		cfg->Read(GetKey(), &rgb, m_default);
 		m_colour.Set(rgb);
 	}
 
-	virtual void SaveToFile(wxConfigBase* cfg)
+	virtual void SaveToFile(wxConfigBase *cfg)
 	{
 		cfg->Write(GetKey(), static_cast<long int>(CMuleColour(m_colour).GetULong()));
 	}
 
-      private:
-	wxColour&	m_colour;
-	long int	m_default;
-};
-
-
-typedef struct {
-	int	 id;
-	bool	 available;
-	wxString displayname;
-	wxString name;
-} LangInfo;
-
-
-/**
- * The languages aMule has translation for.
- *
- * Add new languages here.
- * Then activate the test code in Cfg_Lang::UpdateChoice below!
- */
-static LangInfo aMuleLanguages = {
-	{ wxLANGUAGE_DEFAULT,				true,	"",	wxTRANSLATE("System default") },
-	{ wxLANGUAGE_ALBANIAN,				false,	"",	wxTRANSLATE("Albanian") },
-	{ wxLANGUAGE_ARABIC,				false,	"",	wxTRANSLATE("Arabic") },
-	{ wxLANGUAGE_ASTURIAN,				false,	"",	wxTRANSLATE("Asturian") },
-	{ wxLANGUAGE_BASQUE,				false,	"",	wxTRANSLATE("Basque") },
-	{ wxLANGUAGE_BULGARIAN,				false,	"",	wxTRANSLATE("Bulgarian") },
-	{ wxLANGUAGE_CATALAN,				false,	"",	wxTRANSLATE("Catalan") },
-	{ wxLANGUAGE_CHINESE_SIMPLIFIED,	false,	"",	wxTRANSLATE("Chinese (Simplified)") },
-	{ wxLANGUAGE_CHINESE_TRADITIONAL,	false,	"",	wxTRANSLATE("Chinese (Traditional)") },
-	{ wxLANGUAGE_CROATIAN,				false,	"",	wxTRANSLATE("Croatian") },
-	{ wxLANGUAGE_CZECH,					false,	"",	wxTRANSLATE("Czech") },
-	{ wxLANGUAGE_DANISH,				false,	"",	wxTRANSLATE("Danish") },
-	{ wxLANGUAGE_DUTCH,					false,	"",	wxTRANSLATE("Dutch") },
-	{ wxLANGUAGE_ENGLISH_UK,			false,	"",	wxTRANSLATE("English (U.K.)") },
-	{ wxLANGUAGE_ENGLISH_US,			false,	"",	wxTRANSLATE("English (U.S.)") },
-	{ wxLANGUAGE_ESTONIAN,				false,	"",	wxTRANSLATE("Estonian") },
-	{ wxLANGUAGE_FINNISH,				false,	"",	wxTRANSLATE("Finnish") },
-	{ wxLANGUAGE_FRENCH,				false,	"",	wxTRANSLATE("French") },
-	{ wxLANGUAGE_GALICIAN,				false,	"",	wxTRANSLATE("Galician") },
-	{ wxLANGUAGE_GERMAN,				false,	"",	wxTRANSLATE("German") },
-	{ wxLANGUAGE_GREEK,					false,	"",	wxTRANSLATE("Greek") },
-	{ wxLANGUAGE_HEBREW,				false,	"",	wxTRANSLATE("Hebrew") },
-	{ wxLANGUAGE_HUNGARIAN,				false,	"",	wxTRANSLATE("Hungarian") },
-	{ wxLANGUAGE_ITALIAN,				false,	"",	wxTRANSLATE("Italian") },
-	{ wxLANGUAGE_ITALIAN_SWISS,			false,	"",	wxTRANSLATE("Italian (Swiss)") },
-	{ wxLANGUAGE_JAPANESE,				false,	"",	wxTRANSLATE("Japanese") },
-	{ wxLANGUAGE_KOREAN,				false,	"",	wxTRANSLATE("Korean") },
-	{ wxLANGUAGE_LITHUANIAN,			false,	"",	wxTRANSLATE("Lithuanian") },
-	{ wxLANGUAGE_NORWEGIAN_NYNORSK,		false,	"",	wxTRANSLATE("Norwegian (Nynorsk)") },
-	{ wxLANGUAGE_POLISH,				false,	"",	wxTRANSLATE("Polish") },
-	{ wxLANGUAGE_PORTUGUESE,			false,	"",	wxTRANSLATE("Portuguese") },
-	{ wxLANGUAGE_PORTUGUESE_BRAZILIAN,	false,	"",	wxTRANSLATE("Portuguese (Brazilian)") },
-	{ wxLANGUAGE_ROMANIAN,				false,	"",	wxTRANSLATE("Romanian") },
-	{ wxLANGUAGE_RUSSIAN,				false,	"",	wxTRANSLATE("Russian") },
-	{ wxLANGUAGE_SLOVENIAN,				false,	"",	wxTRANSLATE("Slovenian") },
-	{ wxLANGUAGE_SPANISH,				false,	"",	wxTRANSLATE("Spanish") },
-	{ wxLANGUAGE_SWEDISH,				false,	"",	wxTRANSLATE("Swedish") },
-	{ wxLANGUAGE_TURKISH,				false,	"",	wxTRANSLATE("Turkish") },
-	{ wxLANGUAGE_UKRAINIAN,				false,	"",	wxTRANSLATE("Ukrainian") },
+private:
+	wxColour &m_colour;
+	long int m_default;
 };
 
-
 typedef Cfg_Int<int> Cfg_PureInt;
 
-// Returns true if aMule's translation catalog (PACKAGE.mo) exists on
-// disk for the given wxWidgets language id, using the same lookup
-// prefixes that InitLocale() registers. Used as an additional gate
-// in the language-picker probe below: the standard wxLocale::IsAvailable
-// / locale_to_check.IsOk() path depends on glibc-locale data being
-// present for each candidate language, which is *not* the case inside
-// Flatpak sandboxes — the GNOME runtime ships only the user's preferred
-// locale, so every other language fails the probe even when our .mo
-// files are reachable. Treating "catalog file is on disk" as also-OK
-// makes the picker show every language we actually ship a translation
-// for, regardless of sandbox glibc state.
-static bool HasAMuleCatalogForLanguage(int wxLanguageId)
-{
-	const wxLanguageInfo* info = wxLocale::GetLanguageInfo(wxLanguageId);
-	if (!info) {
-		return false;
-	}
-	const wxString canonical = info->CanonicalName;
-	if (canonical.IsEmpty()) {
-		return false;
-	}
-
-	// Same prefixes as InitLocale (OtherFunctions.cpp) — keep in sync.
-	wxArrayString prefixes;
-#if defined(__WXMAC__) || defined(__WINDOWS__)
-	prefixes.Add(JoinPaths(wxStandardPaths::Get().GetResourcesDir(), "locale"));
-#elif defined(__WXGTK__) || defined(__UNIX__)
-	prefixes.Add(JoinPaths(JoinPaths(wxStandardPaths::Get().GetInstallPrefix(), "share"), "locale"));
-#endif
-
-	const wxString catalog = wxString(PACKAGE) + ".mo";
-	for (size_t i = 0; i < prefixes.GetCount(); ++i) {
-		const wxString candidate = JoinPaths(JoinPaths(JoinPaths(prefixesi, canonical), "LC_MESSAGES"), catalog);
-		if (wxFileExists(candidate)) {
-			return true;
-		}
-	}
-	return false;
-}
-
-
-class Cfg_Lang : public Cfg_PureInt, public Cfg_Lang_Base
+class Cfg_Lang : public Cfg_PureInt
 {
 public:
 	// cppcheck-suppress uninitMemberVar m_selection, m_langSelector
 	Cfg_Lang()
-		: Cfg_PureInt( "", m_selection, 0 )
+	: Cfg_PureInt("", m_selection, 0)
 	{
-		m_languagesReady = false;
-		m_changePos = 0;
 	}
 
-	virtual void LoadFromFile(wxConfigBase* WXUNUSED(cfg)) {}
-	virtual void SaveToFile(wxConfigBase* WXUNUSED(cfg)) {}
-
+	virtual void LoadFromFile(wxConfigBase *WXUNUSED(cfg)) {}
+	virtual void SaveToFile(wxConfigBase *WXUNUSED(cfg)) {}
 
 	virtual bool TransferFromWindow()
 	{
-		if (!m_languagesReady) {
-			return true;	// nothing changed, no problem
+		if (!Cfg_PureInt::TransferFromWindow()) {
+			return false;
 		}
 
-		if ( Cfg_PureInt::TransferFromWindow() ) {
-			// find wx ID of selected language
-			int i = 0;
-			while (m_selection > 0) {
-				i++;
-				if (aMuleLanguagesi.available) {
-					m_selection--;
-				}
-			}
-			int id = aMuleLanguagesi.id;
-
-			// save language selection
-			thePrefs::SetLanguageID(wxLang2Str(id));
-
-			return true;
+		if (m_selection >= 0 && m_selection < static_cast<int>(m_shown.size())) {
+			thePrefs::SetLanguageID(wxLang2Str(m_shownm_selection->wxId));
 		}
 
-		return false;
+		return true;
 	}
 
-
 	virtual bool TransferToWindow()
 	{
-		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 ( aMuleLanguagesi.id == wxId ) {
-					m_langSelector->Append(wxString(wxGetTranslation(aMuleLanguagesi.name)) + " " + aMuleLanguagesi.name + "");
-					break;
-				}
-			}
-			m_langSelector->Append(_("Change Language"));
-			m_changePos = m_langSelector->GetCount() - 1;
-		}
+		m_langSelector = dynamic_cast<wxChoice *>(m_widget); // doesn't work in ctor!
+		FillChoice();
 
 		return Cfg_PureInt::TransferToWindow();
 	}
 
-	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;
-			aMuleLanguages0.displayname = wxGetTranslation(aMuleLanguages0.name);
-
-			// This suppresses error-messages about invalid locales
-			for (unsigned int i = 1; i < itemsof(aMuleLanguages); ++i) {
-				// Outer gate: glibc-locale-data path OR aMule .mo catalog on
-				// disk. The catalog path is required for Flatpak sandboxes
-				// where the GNOME runtime ships only the user's preferred
-				// glibc locale, so wxLocale::IsAvailable returns false for
-				// every other language despite the .mo being present.
-				const bool hasCatalog = HasAMuleCatalogForLanguage(aMuleLanguagesi.id);
-				if ((aMuleLanguagesi.id > wxLANGUAGE_USER_DEFINED)
-				    || wxLocale::IsAvailable(aMuleLanguagesi.id)
-				    || hasCatalog) {
-					wxLogNull	logTarget;
-					wxLocale	locale_to_check;
-					InitLocale(locale_to_check, aMuleLanguagesi.id);
-					// English (U.S.) is the source language for the .pot catalog,
-					// so it is always available even though no en_US.mo is shipped.
-					const bool isSourceLanguage = aMuleLanguagesi.id == wxLANGUAGE_ENGLISH_US;
-					// Inner gate: same Flatpak rationale — InitLocale() can
-					// fail with IsOk()==false when glibc lacks the locale
-					// data for the candidate, but our .mo is still on disk
-					// and will be applied correctly when the user actually
-					// switches to this language. Accept `hasCatalog` here as
-					// well so those entries surface in the picker.
-					if ((locale_to_check.IsOk() && (locale_to_check.IsLoaded(PACKAGE) || isSourceLanguage))
-					    || hasCatalog) {
-						aMuleLanguagesi.displayname = wxString(wxGetTranslation(aMuleLanguagesi.name)) + " " + aMuleLanguagesi.name + "";
-						aMuleLanguagesi.available = true;
-#if 0
-						// Check for language problems
-						// Activate this code temporarily after messing with the languages!
-						int wxid = StrLang2wx(wxLang2Str(aMuleLanguagesi.id));
-						if (wxid != aMuleLanguagesi.id) {
-							AddDebugLogLineN(logGeneral, CFormat("Language problem for %s : aMule id %d != wx id %d")
-								% aMuleLanguagesi.name % aMuleLanguagesi.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;
+	int m_selection;
 
 private:
+	/**
+	 * Rebuilds the picker from the catalogs that are actually installed.
+	 *
+	 * wxTranslations walks the catalog directories in wx's own search path instead of
+	 * constructing a path per language, so asking it what is installed costs one
+	 * directory listing. The picker used to construct a wxLocale for every language
+	 * instead, which is why it hid behind a "Change Language" entry and only did the
+	 * work once the user asked for it.
+	 */
 	void FillChoice()
 	{
-		int wxId = StrLang2wx(thePrefs::GetLanguageID());
+		wxArrayString installed;
+		if (wxTranslations *translations = wxTranslations::Get()) {
+			installed = translations->GetAvailableTranslations(PACKAGE);
+		}
+
+		const int current = FindLanguageEntry(thePrefs::GetLanguageID());
+
+		std::size_t count = 0;
+		const SLanguageEntry *languages = GetLanguageList(count);
+
+		m_shown.clear();
 		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 (aMuleLanguagesi.available) {
-				m_langSelector->Append(aMuleLanguagesi.displayname);
-				if ( aMuleLanguagesi.id == wxId ) {
-					m_selection = j;
-				}
-				j++;
+		m_selection = 0;
+		for (std::size_t i = 0; i < count; ++i) {
+			if (!IsLanguageAvailable(languagesi, installed)) {
+				continue;
+			}
+
+			wxString label = wxGetTranslation(languagesi.name);
+			if (*languagesi.catalog) {
+				label += " " + wxString(languagesi.name) + "";
+			}
+			m_langSelector->Append(label);
+
+			if (current == static_cast<int>(i)) {
+				m_selection = static_cast<int>(m_shown.size());
 			}
+			m_shown.push_back(&languagesi);
 		}
 	}
 
-	bool m_languagesReady;	// true: all translations calculated
-	int	 m_changePos;
-	wxChoice * m_langSelector;
+	//! The entries currently in the widget, in widget order.
+	std::vector<const SLanguageEntry *> m_shown;
+	wxChoice *m_langSelector;
 };
 
 #endif /* ! AMULE_DAEMON */
 
-void Cfg_Lang_Base::UpdateChoice(int) {}	// dummy
-
 class Cfg_Skin : public Cfg_Str
 {
 public:
-	Cfg_Skin( const wxString& keyname, wxString& value, const wxString& defaultVal = EmptyString )
-		: Cfg_Str( keyname, value, defaultVal ),
-		  m_is_skin(false)
-	{}
+	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 (Cfg_Str::TransferFromWindow()) {
 			if (m_is_skin) {
-				wxChoice *skinSelector = dynamic_cast<wxChoice*>(m_widget);
+				wxChoice *skinSelector = dynamic_cast<wxChoice *>(m_widget);
 				// "- default -" is always the first
 				if (skinSelector->GetSelection() == 0) {
 					m_value.Clear();
@@ -898,19 +770,18 @@
 		return false;
 	}
 
-
 	virtual bool TransferToWindow()
 	{
 
-		wxChoice *skinSelector = dynamic_cast<wxChoice*>(m_widget);
+		wxChoice *skinSelector = dynamic_cast<wxChoice *>(m_widget);
 		skinSelector->Clear();
 
 		wxString folder;
 		int flags = wxDIR_DIRS;
 		wxString filespec;
 		wxString defaultSelection = _("- default -");
-//#warning there has to be a better way...
-		if ( GetKey() == "/SkinGUIOptions/Skin" ) {
+		// #warning there has to be a better way...
+		if (GetKey() == "/SkinGUIOptions/Skin") {
 			folder = "skins";
 			m_is_skin = true;
 			flags = wxDIR_FILES;
@@ -923,19 +794,13 @@
 		wxString Filename;
 		wxDir d;
 
-		if (wxDir::Exists(dirName) &&
-			d.Open(dirName) &&
-			d.GetFirst(& Filename, filespec, flags)
-			)
-		{
-			do
-			{
+		if (wxDir::Exists(dirName) && d.Open(dirName) && d.GetFirst(&Filename, filespec, flags)) {
+			do {
 				if (m_is_skin) {
 					Filename = "User:" + Filename;
 				}
 				skinSelector->Append(Filename);
-			}
-			while (d.GetNext(&Filename));
+			} while (d.GetNext(&Filename));
 		}
 
 		wxString dataDir;
@@ -945,71 +810,56 @@
 			dataDir = wxStandardPaths::Get().GetResourcesDir();
 		}
 #if defined(__WINDOWS__)
-		// Windows portable layout puts amule.exe in bin\ and installable
-		// data (skins, webserver templates, ...) in ..\share\amule\.
-		// wxStandardPaths::GetDataDir() / GetResourcesDir() both return
-		// the exe directory on Windows, so relocate up one level and into
-		// the FHS-style share/amule/ tree the installer actually populates.
-		// Mirrors the BeforeLast('/') + "/amule" adjustment used on Linux
-		// below for the same purpose. (#783)
+		// Windows portable layout puts amule.exe in bin\ and installable data (skins,
+		// webserver templates, ...) in ..\share\amule\. wxStandardPaths::GetDataDir() /
+		// GetResourcesDir() both return the exe directory on Windows, so relocate up one
+		// level and into the FHS-style share/amule/ tree the installer actually populates.
 		dataDir = JoinPaths(JoinPaths(dataDir, ".."), "share");
 		dataDir = JoinPaths(dataDir, "amule");
 #elif !defined(__WXMAC__)
 		dataDir = dataDir.BeforeLast('/') + "/amule";
 #endif
-		wxString systemDir(JoinPaths(dataDir,folder));
-
-		if (wxDir::Exists(systemDir) &&
-			d.Open(systemDir) &&
-			d.GetFirst(& Filename, filespec, flags)
-			)
-		{
-			do
-			{
+		wxString systemDir(JoinPaths(dataDir, folder));
+
+		if (wxDir::Exists(systemDir) && d.Open(systemDir) && d.GetFirst(&Filename, filespec, flags)) {
+			do {
 				if (m_is_skin) {
-					Filename = "System:" +  Filename;
+					Filename = "System:" + Filename;
 				}
 				// avoid duplicates for webserver templates
 				if (skinSelector->FindString(Filename) == wxNOT_FOUND) {
 					skinSelector->Append(Filename);
 				}
-			}
-			while (d.GetNext(&Filename));
+			} while (d.GetNext(&Filename));
 		}
 
 		bool placeholderAppended = false;
-		if ( skinSelector->GetCount() == 0 ) {
+		if (skinSelector->GetCount() == 0) {
 			skinSelector->Append(_("no options available"));
 			placeholderAppended = true;
 		}
 
 		int id = skinSelector->FindString(m_value);
-		if ( id == wxNOT_FOUND ) {
+		if (id == wxNOT_FOUND) {
 			if (m_is_skin) {
 				// Skin files must be local to load; fall back to the
 				// default visually.
 				id = 0;
 				m_value = defaultSelection;
 			} else if (placeholderAppended) {
-				// No real templates found and m_value doesn't match
-				// the placeholder we just appended. m_value is almost
-				// certainly a localized "no options available" string
-				// saved by a prior session under a different aMule
-				// locale (e.g. saved as "nessuna opzione disponibile"
-				// in Italian, now reopened with the locale set to
-				// English). Falling through to the cross-host preserve
-				// branch below would re-append the stale string and
-				// leave the dropdown showing two placeholders. Discard
-				// it instead — the placeholder is the only valid
-				// "selection" when no real templates exist. (#800)
+				// No real templates found and m_value does not match the
+				// placeholder just appended. m_value is almost certainly a
+				// localized "no options available" string saved by a prior session
+				// under a different aMule locale. Falling through to the
+				// cross-host preserve branch below would re-append the stale
+				// string, so discard it instead.
 				id = 0;
 				m_value.Clear();
 			} else if (!m_value.IsEmpty()) {
-				// Template names are consumed by amuleweb, which may
-				// be running on a different host than amulegui or
-				// installing templates outside the GUI's scanned
-				// directories. Preserve the configured value in the
-				// dropdown so a Save round-trip doesn't erase it.
+				// Template names are consumed by amuleweb, which may be running
+				// on a different host than amulegui or installing templates
+				// outside the GUI's scanned directories. Preserve the configured
+				// value in the dropdown so a Save round-trip does not erase it.
 				id = skinSelector->Append(m_value);
 			} else {
 				id = 0;
@@ -1021,27 +871,135 @@
 	}
 #endif /* ! AMULE_DAEMON */
 
-      protected:
-	bool	m_is_skin;
+protected:
+	bool m_is_skin;
 };
 
+CShareExcludeFilter::CShareExcludeFilter()
+: m_regex(nullptr)
+, m_useRegex(false)
+, m_active(false)
+, m_valid(true)
+{
+}
+
+CShareExcludeFilter::~CShareExcludeFilter()
+{
+	delete m_regex;
+}
+
+void CShareExcludeFilter::Compile(const wxString &patterns, bool useRegex)
+{
+	m_globs.Clear();
+	delete m_regex;
+	m_regex = nullptr;
+	m_useRegex = useRegex;
+	m_active = false;
+	m_valid = true;
+
+	wxString trimmed = patterns;
+	trimmed.Trim(true).Trim(false);
+	if (trimmed.IsEmpty()) {
+		return;
+	}
+
+	if (useRegex) {
+		// The whole string is one regex: '|' is native alternation, so
+		// it is NOT split. Case-insensitive to match the wildcard mode.
+		m_regex = new wxRegEx(trimmed, wxRE_ADVANCED | wxRE_ICASE | wxRE_NOSUB);
+		if (m_regex->IsValid()) {
+			m_active = true;
+		} else {
+			// Fail open: a bad regex disables the filter rather than
+			// excluding everything.
+			delete m_regex;
+			m_regex = nullptr;
+			m_valid = false;
+		}
+	} else {
+		// Wildcard mode: '|' separates globs, matched case-insensitively (globs are
+		// lowercased here, the filename is lowercased in Matches()).
+		wxStringTokenizer tokenizer(trimmed, wxT("|"));
+		while (tokenizer.HasMoreTokens()) {
+			wxString glob = tokenizer.GetNextToken();
+			glob.Trim(true).Trim(false);
+			if (!glob.IsEmpty()) {
+				m_globs.Add(glob.Lower());
+			}
+		}
+		m_active = !m_globs.IsEmpty();
+	}
+}
+
+bool CShareExcludeFilter::Matches(const wxString &fileName) const
+{
+	if (!m_active) {
+		return false;
+	}
+	if (m_useRegex) {
+		return m_regex && m_regex->Matches(fileName);
+	}
+	const wxString lower = fileName.Lower();
+	for (size_t i = 0; i < m_globs.GetCount(); ++i) {
+		if (wxMatchWild(m_globsi, lower, false)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+int CPreferences::PreviewExcludeCount(const wxString &patterns, bool useRegex, const wxArrayString &fileNames)
+{
+	CShareExcludeFilter filter;
+	filter.Compile(patterns, useRegex);
+	if (!filter.IsValid()) {
+		return wxNOT_FOUND;
+	}
+	int count = 0;
+	for (size_t i = 0; i < fileNames.GetCount(); ++i) {
+		if (filter.Matches(fileNamesi)) {
+			++count;
+		}
+	}
+	return count;
+}
 
 /// new implementation
 CPreferences::CPreferences()
 {
-	srand( wxGetLocalTimeMillis().GetLo() ); // we need random numbers sometimes
+	srand(wxGetLocalTimeMillis().GetLo()); // we need random numbers sometimes
 
 	// load preferences.dat or set standard values
 	wxString fullpath(s_configDir + "preferences.dat");
+
+	// Capture the first-run state before we (possibly) create preferences.dat below: the
+	// absence of that file marks a fresh install, which the GUI uses to decide whether to
+	// show the first-run setup wizard. Done in the monolithic/daemon core only; the remote
+	// GUI compiles CLIENT_GUI and keeps the default false.
+#ifndef CLIENT_GUI
+	s_firstRun = !wxFileExists(fullpath);
+
+	// Migration for installs that predate the explicit first-run flag: they have a
+	// populated config but no /eMule/FirstRunWizardDone entry. Mark the wizard as already
+	// done for them so it never retroactively pops up. A genuine fresh install is left
+	// alone, so the wizard runs once and then persists its own flag. LoadAllItems() has
+	// already run, so the entry is authoritative.
+	if (!s_firstRun) {
+		wxConfigBase *cfg = wxConfigBase::Get();
+		if (cfg && !cfg->HasEntry("/eMule/FirstRunWizardDone")) {
+			s_firstRunWizardDone = true;
+		}
+	}
+#endif
+
 	CFile preffile;
 	if (wxFileExists(fullpath)) {
 		if (preffile.Open(fullpath, CFile::read)) {
 			try {
 				preffile.ReadUInt8(); // Version. Value is not used.
 				s_userhash = preffile.ReadHash();
-			} catch (const CSafeIOException& e) {
-				AddDebugLogLineC(logGeneral,
-					"Error while reading userhash: " + e.what());
+			} catch (const CSafeIOException &e) {
+				AddDebugLogLineC(logGeneral, "Error while reading userhash: " + e.what());
 			}
 		}
 	}
@@ -1051,11 +1009,9 @@
 			RawPokeUInt16(s_userhash.GetHash() + (i * 2), rand());
 		}
 
-		// Persist only preferences.dat and amule.conf here. A full
-		// Save() would also call SaveSharedFolders() against
-		// still-empty in-memory lists (ReloadSharedFolders runs
-		// below), truncating any shareddir-*.dat files a pre-launch
-		// script may have populated.
+		// Persist only preferences.dat and amule.conf here. A full Save() would also call
+		// SaveSharedFolders() against still-empty in-memory lists, truncating any
+		// shareddir-*.dat files a pre-launch script may have populated.
 		CFile preffile;
 		if (!wxFileExists(fullpath)) {
 			preffile.Create(fullpath);
@@ -1064,8 +1020,10 @@
 			try {
 				preffile.WriteUInt8(PREFFILE_VERSION);
 				preffile.WriteHash(s_userhash);
-			} catch (const CIOFailureException& e) {
-				AddDebugLogLineC(logGeneral, "IO failure while saving user-hash: " + e.what());
+				preffile.Close();
+			} catch (const CIOFailureException &e) {
+				AddDebugLogLineC(
+					logGeneral, "IO failure while saving user-hash: " + e.what());
 			}
 		}
 		SavePreferences();
@@ -1085,390 +1043,508 @@
 	if (slistfile.Open(s_configDir + "addresses.dat", CTextFile::read)) {
 		addresses_list = slistfile.ReadLines();
 	}
+#else
+	// GUI-local only (see LoadPathMappings' declaration): loaded here, alongside the core's
+	// equivalent local-config reads above, rather than through LoadRemote()'s EC round-trip
+	// -- there is no EC round-trip for this, by design.
+	LoadPathMappings();
 #endif
 }
 
-//
 // Gets called at init time
-//
-void CPreferences::BuildItemList( const wxString& appdir )
+void CPreferences::BuildItemList(const wxString &appdir)
 {
 #ifndef AMULE_DAEMON
-	#define NewCfgItem(ID, COMMAND)	s_CfgListID = COMMAND
+#define NewCfgItem(ID, COMMAND) s_CfgListID = COMMAND
 #else
 	int current_id = 0;
-	#define NewCfgItem(ID, COMMAND)	s_CfgList++current_id = COMMAND
+#define NewCfgItem(ID, COMMAND) s_CfgList++current_id = COMMAND
 #endif /* AMULE_DAEMON */
 
-	/**
-	 * User settings
-	 **/
-	NewCfgItem(IDC_NICK,		(new Cfg_Str(  "/eMule/Nick", s_nick, "https://amule-org.github.io" )));
+	/** User settings */
+	NewCfgItem(IDC_NICK, (new Cfg_Str("/eMule/Nick", s_nick, "https://amule-org.github.io")));
 #ifndef AMULE_DAEMON
-	Cfg_Lang * cfgLang = new Cfg_Lang();
-	s_cfgLang = cfgLang;
-	NewCfgItem(IDC_LANGUAGE,	cfgLang);
+	NewCfgItem(IDC_LANGUAGE, (new Cfg_Lang()));
 #endif
 
-	/**
-	 * Browser options
-	 **/
-	#ifdef __WXMAC__
-		wxString	customBrowser = "/usr/bin/open";
-	#else
-		wxString	customBrowser; // left empty
-	#endif
-
-	NewCfgItem(IDC_BROWSERTABS,	(new Cfg_Bool( "/Browser/OpenPageInTab", s_BrowserTab, true )));
-	NewCfgItem(IDC_BROWSERSELF,	(new Cfg_Str(  "/Browser/CustomBrowserString", s_CustomBrowser, customBrowser )));
-
+/** Browser options */
+#ifdef __WXMAC__
+	wxString customBrowser = "/usr/bin/open";
+#else
+	wxString customBrowser; // left empty
+#endif
 
-	/**
-	 * Misc
-	 **/
-	NewCfgItem(IDC_QUEUESIZE,	(MkCfg_Int( "/eMule/QueueSizePref", s_iQueueSize, 50 )));
+	NewCfgItem(IDC_BROWSERTABS, (new Cfg_Bool("/Browser/OpenPageInTab", s_BrowserTab, true)));
+	NewCfgItem(IDC_BROWSERSELF,
+		(new Cfg_Str("/Browser/CustomBrowserString", s_CustomBrowser, customBrowser)));
 
+	/** Misc */
+	NewCfgItem(IDC_QUEUESIZE, (MkCfg_Int("/eMule/QueueSizePref", s_iQueueSize, 50)));
 
 #ifdef __DEBUG__
-	/**
-	 * Debugging
-	 **/
-	NewCfgItem(ID_VERBOSEDEBUG, (new Cfg_Bool( "/eMule/VerboseDebug", s_bVerbose, false )));
-	NewCfgItem(ID_VERBOSEDEBUGLOGFILE, (new Cfg_Bool( "/eMule/VerboseDebugLogfile", s_bVerboseLogfile, false )));
+	/** Debugging */
+	NewCfgItem(ID_VERBOSEDEBUG, (new Cfg_Bool("/eMule/VerboseDebug", s_bVerbose, false)));
+	NewCfgItem(ID_VERBOSEDEBUGLOGFILE,
+		(new Cfg_Bool("/eMule/VerboseDebugLogfile", s_bVerboseLogfile, false)));
 #endif
 
-	/**
-	 * Connection settings
-	 **/
-	NewCfgItem(IDC_MAXUP,		(MkCfg_Int( "/eMule/MaxUpload", s_maxupload, 0 )));
-	NewCfgItem(IDC_MAXDOWN,		(MkCfg_Int( "/eMule/MaxDownload", s_maxdownload, 0 )));
-	NewCfgItem(IDC_SLOTALLOC,	(MkCfg_Int( "/eMule/SlotAllocation", s_slotallocation, 10 )));
-	NewCfgItem(IDC_PORT,		(MkCfg_Int( "/eMule/Port", s_port, DEFAULT_TCP_PORT )));
-	NewCfgItem(IDC_UDPPORT,		(MkCfg_Int( "/eMule/UDPPort", s_udpport, DEFAULT_UDP_PORT )));
-	NewCfgItem(IDC_UDPENABLE,	(new Cfg_Bool( "/eMule/UDPEnable", s_UDPEnable, true )));
-	NewCfgItem(IDC_ADDRESS,		(new Cfg_Str( "/eMule/Address", s_Addr, "")));
-	NewCfgItem(IDC_AUTOCONNECT,	(new Cfg_Bool( "/eMule/Autoconnect", s_autoconnect, true )));
-	NewCfgItem(IDC_MAXSOURCEPERFILE,	(MkCfg_Int( "/eMule/MaxSourcesPerFile", s_maxsourceperfile, 300 )));
-	NewCfgItem(IDC_MAXCON,		(MkCfg_Int( "/eMule/MaxConnections", s_maxconnections, GetRecommendedMaxConnections() )));
-	NewCfgItem(IDC_MAXCON5SEC,	(MkCfg_Int( "/eMule/MaxConnectionsPerFiveSeconds", s_MaxConperFive, 20 )));
-
-	/**
-	 * Proxy
-	 **/
-	NewCfgItem(ID_PROXY_ENABLE_PROXY,	(new Cfg_Bool( "/Proxy/ProxyEnableProxy", s_ProxyData.m_proxyEnable, false )));
-	NewCfgItem(ID_PROXY_TYPE,		(MkCfg_Int( "/Proxy/ProxyType", s_ProxyData.m_proxyType, 0 )));
-	NewCfgItem(ID_PROXY_NAME,		(new Cfg_Str( "/Proxy/ProxyName", s_ProxyData.m_proxyHostName, "" )));
-	NewCfgItem(ID_PROXY_PORT,		(MkCfg_Int( "/Proxy/ProxyPort", s_ProxyData.m_proxyPort, 1080 )));
-	NewCfgItem(ID_PROXY_ENABLE_PASSWORD,	(new Cfg_Bool( "/Proxy/ProxyEnablePassword", s_ProxyData.m_enablePassword, false )));
-	NewCfgItem(ID_PROXY_USER,		(new Cfg_Str( "/Proxy/ProxyUser", s_ProxyData.m_userName, "" )));
-	NewCfgItem(ID_PROXY_PASSWORD,		(new Cfg_Str( "/Proxy/ProxyPassword", s_ProxyData.m_password, "" )));
-
-	/**
-	 * Servers
-	 **/
-	NewCfgItem(IDC_REMOVEDEAD,	(new Cfg_Bool( "/eMule/RemoveDeadServer", s_deadserver, 1 )));
-	NewCfgItem(IDC_SERVERRETRIES,	(MkCfg_Int( "/eMule/DeadServerRetry", s_deadserverretries, 3 )));
-	NewCfgItem(IDC_SERVERKEEPALIVE,	(MkCfg_Int( "/eMule/ServerKeepAliveTimeout", s_dwServerKeepAliveTimeoutMins, 0 )));
-	NewCfgItem(IDC_RECONN,		(new Cfg_Bool( "/eMule/Reconnect", s_reconnect, true )));
-	NewCfgItem(IDC_SCORE,		(new Cfg_Bool( "/eMule/Scoresystem", s_scorsystem, true )));
-	NewCfgItem(IDC_AUTOSERVER,	(new Cfg_Bool( "/eMule/Serverlist", s_autoserverlist, false )));
-	NewCfgItem(IDC_UPDATESERVERCONNECT,	(new Cfg_Bool( "/eMule/AddServerListFromServer", s_addserversfromserver, false)));
-	NewCfgItem(IDC_UPDATESERVERCLIENT,	(new Cfg_Bool( "/eMule/AddServerListFromClient", s_addserversfromclient, false )));
-	NewCfgItem(IDC_SAFESERVERCONNECT,	(new Cfg_Bool( "/eMule/SafeServerConnect", s_safeServerConnect, false )));
-	NewCfgItem(IDC_AUTOCONNECTSTATICONLY,	(new Cfg_Bool( "/eMule/AutoConnectStaticOnly", s_autoconnectstaticonly, false )));
-	NewCfgItem(IDC_UPNP_ENABLED,	(new Cfg_Bool( "/eMule/UPnPEnabled", s_UPnPEnabled, false )));
-	NewCfgItem(IDC_UPNPTCPPORT,	(MkCfg_Int( "/eMule/UPnPTCPPort", s_UPnPTCPPort, 50000 )));
-	NewCfgItem(IDC_SMARTIDCHECK,	(new Cfg_Bool( "/eMule/SmartIdCheck", s_smartidcheck, true )));
+	/** Connection settings */
+	NewCfgItem(IDC_MAXUP, (MkCfg_Int("/eMule/MaxUpload", s_maxupload, 0)));
+	NewCfgItem(IDC_MAXDOWN, (MkCfg_Int("/eMule/MaxDownload", s_maxdownload, 0)));
+	NewCfgItem(IDC_SLOTALLOC, (MkCfg_Int("/eMule/SlotAllocation", s_slotallocation, 10)));
+	NewCfgItem(IDC_PORT, (MkCfg_Int("/eMule/Port", s_port, DEFAULT_TCP_PORT)));
+	NewCfgItem(IDC_UDPPORT, (MkCfg_Int("/eMule/UDPPort", s_udpport, DEFAULT_UDP_PORT)));
+	NewCfgItem(IDC_UDPENABLE, (new Cfg_Bool("/eMule/UDPEnable", s_UDPEnable, true)));
+	NewCfgItem(IDC_ADDRESS, (new Cfg_Str("/eMule/Address", s_Addr, "")));
+	NewCfgItem(IDC_INTERFACE, (new Cfg_Str("/eMule/NetworkInterface", s_NetworkInterface, "")));
+	NewCfgItem(IDC_AUTOCONNECT, (new Cfg_Bool("/eMule/Autoconnect", s_autoconnect, true)));
+	NewCfgItem(IDC_MAXSOURCEPERFILE, (MkCfg_Int("/eMule/MaxSourcesPerFile", s_maxsourceperfile, 300)));
+	NewCfgItem(IDC_MAXCON,
+		(MkCfg_Int("/eMule/MaxConnections", s_maxconnections, GetRecommendedMaxConnections())));
+	NewCfgItem(IDC_MAXCON5SEC, (MkCfg_Int("/eMule/MaxConnectionsPerFiveSeconds", s_MaxConperFive, 50)));
+	NewCfgItem(
+		IDC_KADMAXSEARCHES, (MkCfg_Int("/eMule/KadMaxSourceSearches", s_kadMaxSourceSearches, 30)));
+	NewCfgItem(IDC_KADREASKTIME, (MkCfg_Int("/eMule/KadSourceReaskMinutes", s_kadSourceReaskMins, 30)));
+	NewCfgItem(IDC_SOURCEREASKTIME, (MkCfg_Int("/eMule/SourceReaskMinutes", s_sourceReaskMins, 15)));
+
+	/** Proxy */
+	NewCfgItem(ID_PROXY_ENABLE_PROXY,
+		(new Cfg_Bool("/Proxy/ProxyEnableProxy", s_ProxyData.m_proxyEnable, false)));
+	NewCfgItem(ID_PROXY_TYPE, (MkCfg_Int("/Proxy/ProxyType", s_ProxyData.m_proxyType, 0)));
+	NewCfgItem(ID_PROXY_NAME, (new Cfg_Str("/Proxy/ProxyName", s_ProxyData.m_proxyHostName, "")));
+	NewCfgItem(ID_PROXY_PORT, (MkCfg_Int("/Proxy/ProxyPort", s_ProxyData.m_proxyPort, 1080)));
+	NewCfgItem(ID_PROXY_ENABLE_PASSWORD,
+		(new Cfg_Bool("/Proxy/ProxyEnablePassword", s_ProxyData.m_enablePassword, false)));
+	NewCfgItem(ID_PROXY_USER, (new Cfg_Str("/Proxy/ProxyUser", s_ProxyData.m_userName, "")));
+	NewCfgItem(ID_PROXY_PASSWORD, (new Cfg_Str("/Proxy/ProxyPassword", s_ProxyData.m_password, "")));
+
+	/** Servers */
+	NewCfgItem(IDC_REMOVEDEAD, (new Cfg_Bool("/eMule/RemoveDeadServer", s_deadserver, 1)));
+	NewCfgItem(IDC_SERVERRETRIES, (MkCfg_Int("/eMule/DeadServerRetry", s_deadserverretries, 3)));
+	NewCfgItem(IDC_SERVERKEEPALIVE,
+		(MkCfg_Int("/eMule/ServerKeepAliveTimeout", s_dwServerKeepAliveTimeoutMins, 0)));
+	NewCfgItem(IDC_RECONN, (new Cfg_Bool("/eMule/Reconnect", s_reconnect, true)));
+	NewCfgItem(IDC_SCORE, (new Cfg_Bool("/eMule/Scoresystem", s_scorsystem, true)));
+	NewCfgItem(IDC_AUTOSERVER, (new Cfg_Bool("/eMule/Serverlist", s_autoserverlist, false)));
+	NewCfgItem(IDC_UPDATESERVERCONNECT,
+		(new Cfg_Bool("/eMule/AddServerListFromServer", s_addserversfromserver, false)));
+	NewCfgItem(IDC_UPDATESERVERCLIENT,
+		(new Cfg_Bool("/eMule/AddServerListFromClient", s_addserversfromclient, false)));
+	NewCfgItem(IDC_SAFESERVERCONNECT,
+		(new Cfg_Bool("/eMule/SafeServerConnect", s_safeServerConnect, false)));
+	NewCfgItem(IDC_AUTOCONNECTSTATICONLY,
+		(new Cfg_Bool("/eMule/AutoConnectStaticOnly", s_autoconnectstaticonly, false)));
+	NewCfgItem(IDC_UPNP_ENABLED, (new Cfg_Bool("/eMule/UPnPEnabled", s_UPnPEnabled, false)));
+	NewCfgItem(IDC_UPNPTCPPORT, (MkCfg_Int("/eMule/UPnPTCPPort", s_UPnPTCPPort, 50000)));
+	NewCfgItem(IDC_SMARTIDCHECK, (new Cfg_Bool("/eMule/SmartIdCheck", s_smartidcheck, true)));
 	// Enabled networks
-	NewCfgItem( IDC_NETWORKKAD, (new Cfg_Bool( "/eMule/ConnectToKad",	s_ConnectToKad, true )) );
-	NewCfgItem( IDC_NETWORKED2K, ( new Cfg_Bool( "/eMule/ConnectToED2K",	s_ConnectToED2K, true ) ));
+	NewCfgItem(IDC_NETWORKKAD, (new Cfg_Bool("/eMule/ConnectToKad", s_ConnectToKad, true)));
+	NewCfgItem(IDC_NETWORKED2K, (new Cfg_Bool("/eMule/ConnectToED2K", s_ConnectToED2K, true)));
 
+	/** Files */
+	NewCfgItem(IDC_TEMPFILES, (new Cfg_Path("/eMule/TempDir", s_tempdir, appdir + "Temp")));
+	NewCfgItem(IDC_ENDGAME, (new Cfg_Bool("/eMule/Endgame", s_Endgame, true)));
 
-	/**
-	 * Files
-	 **/
-	NewCfgItem(IDC_TEMPFILES,	(new Cfg_Path(  "/eMule/TempDir",	s_tempdir, appdir + "Temp" )));
-
-	#if defined(__WXMAC__) || defined(__WINDOWS__)
-		wxString incpath = wxStandardPaths::Get().GetDocumentsDir();
-		if (incpath.IsEmpty()) {
-			// There is a built-in possibility for this call to fail, though I can't imagine a reason for that.
-			incpath = appdir + "Incoming";
-		} else {
-			incpath = JoinPaths(incpath, "aMule Downloads");
-		}
-	#else
-		wxString incpath = appdir + "Incoming";
-	#endif
-	NewCfgItem(IDC_INCFILES,	(new Cfg_Path(  "/eMule/IncomingDir", s_incomingdir, incpath )));
-
-	NewCfgItem(IDC_ICH,		(new Cfg_Bool( "/eMule/ICH", s_ICH, true )));
-	NewCfgItem(IDC_AICHTRUST,	(new Cfg_Bool( "/eMule/AICHTrust", s_AICHTrustEveryHash, false )));
-	NewCfgItem(IDC_CHECKDISKSPACE,	(new Cfg_Bool( "/eMule/CheckDiskspace", s_checkDiskspace, true )));
-	NewCfgItem(IDC_MINDISKSPACE,	(MkCfg_Int( "/eMule/MinFreeDiskSpace", s_uMinFreeDiskSpace, 1 )));
-	NewCfgItem(IDC_ADDNEWFILESPAUSED,	(new Cfg_Bool( "/eMule/AddNewFilesPaused", s_addnewfilespaused, false )));
-	NewCfgItem(IDC_PREVIEWPRIO,	(new Cfg_Bool( "/eMule/PreviewPrio", s_bpreviewprio, false )));
-	NewCfgItem(IDC_MANUALSERVERHIGHPRIO,	(new Cfg_Bool( "/eMule/ManualHighPrio", s_bmanualhighprio, false )));
-	NewCfgItem(IDC_STARTNEXTFILE,	(new Cfg_Bool( "/eMule/StartNextFile", s_bstartnextfile, false )));
-	NewCfgItem(IDC_STARTNEXTFILE_SAME,	(new Cfg_Bool( "/eMule/StartNextFileSameCat", s_bstartnextfilesame, false )));
-	NewCfgItem(IDC_STARTNEXTFILE_ALPHA,	(new Cfg_Bool( "/eMule/StartNextFileAlpha", s_bstartnextfilealpha, false )));
-	NewCfgItem(IDC_SRCSEEDS,	(new Cfg_Bool( "/ExternalConnect/UseSrcSeeds", s_UseSrcSeeds, false )));
-	NewCfgItem(IDC_FILEBUFFERSIZE,	(MkCfg_Int( "/eMule/FileBufferSizePref", s_iFileBufferSize, 16 )));
-	NewCfgItem(IDC_DAP,		(new Cfg_Bool( "/eMule/DAPPref", s_bDAP, true )));
-	NewCfgItem(IDC_UAP,		(new Cfg_Bool( "/eMule/UAPPref", s_bUAP, true )));
-	NewCfgItem(IDC_ALLOCFULLFILE,	(new Cfg_Bool( "/eMule/AllocateFullFile", s_allocFullFile, false )));
-
-	/**
-	 * Web Server
-	 */
-	NewCfgItem(IDC_OSDIR,		(new Cfg_Path(  "/eMule/OSDirectory", s_OSDirectory,	appdir )));
-	NewCfgItem(IDC_ONLINESIG,	(new Cfg_Bool( "/eMule/OnlineSignature", s_onlineSig, false )));
-	NewCfgItem(IDC_OSUPDATE,	(MkCfg_Int( "/eMule/OnlineSignatureUpdate", s_OSUpdate, 5 )));
-	NewCfgItem(IDC_ENABLE_WEB,	(new Cfg_Bool( "/WebServer/Enabled", s_bWebEnabled, false )));
-	NewCfgItem(IDC_WEB_PASSWD,	(new Cfg_Str_Encrypted( "/WebServer/Password", s_sWebPassword )));
-	NewCfgItem(IDC_WEB_PASSWD_LOW,	(new Cfg_Str_Encrypted( "/WebServer/PasswordLow", s_sWebLowPassword )));
-	NewCfgItem(IDC_WEB_PORT,	(MkCfg_Int( "/WebServer/Port", s_nWebPort, 4711 )));
-	NewCfgItem(IDC_WEBUPNPTCPPORT,	(MkCfg_Int( "/WebServer/WebUPnPTCPPort", s_nWebUPnPTCPPort, 50001 )));
+#if defined(__WXMAC__) || defined(__WINDOWS__)
+	wxString incpath = wxStandardPaths::Get().GetDocumentsDir();
+	if (incpath.IsEmpty()) {
+		// There is a built-in possibility for this call to fail, though I can't imagine a reason for
+		// that.
+		incpath = appdir + "Incoming";
+	} else {
+		incpath = JoinPaths(incpath, "aMule Downloads");
+	}
+#else
+	wxString incpath = appdir + "Incoming";
+#endif
+	NewCfgItem(IDC_INCFILES, (new Cfg_Path("/eMule/IncomingDir", s_incomingdir, incpath)));
+
+	NewCfgItem(IDC_ICH, (new Cfg_Bool("/eMule/ICH", s_ICH, true)));
+	NewCfgItem(IDC_AICHTRUST, (new Cfg_Bool("/eMule/AICHTrust", s_AICHTrustEveryHash, false)));
+	NewCfgItem(IDC_CHECKDISKSPACE, (new Cfg_Bool("/eMule/CheckDiskspace", s_checkDiskspace, true)));
+	NewCfgItem(IDC_MINDISKSPACE, (MkCfg_Int("/eMule/MinFreeDiskSpace", s_uMinFreeDiskSpace, 500)));
+	NewCfgItem(IDC_ADDNEWFILESPAUSED,
+		(new Cfg_Bool("/eMule/AddNewFilesPaused", s_addnewfilespaused, false)));
+	NewCfgItem(IDC_PREVIEWPRIO, (new Cfg_Bool("/eMule/PreviewPrio", s_bpreviewprio, false)));
+	NewCfgItem(
+		IDC_MANUALSERVERHIGHPRIO, (new Cfg_Bool("/eMule/ManualHighPrio", s_bmanualhighprio, false)));
+	NewCfgItem(IDC_STARTNEXTFILE, (new Cfg_Bool("/eMule/StartNextFile", s_bstartnextfile, false)));
+	NewCfgItem(IDC_STARTNEXTFILE_SAME,
+		(new Cfg_Bool("/eMule/StartNextFileSameCat", s_bstartnextfilesame, false)));
+	NewCfgItem(IDC_STARTNEXTFILE_ALPHA,
+		(new Cfg_Bool("/eMule/StartNextFileAlpha", s_bstartnextfilealpha, false)));
+	NewCfgItem(IDC_SRCSEEDS, (new Cfg_Bool("/ExternalConnect/UseSrcSeeds", s_UseSrcSeeds, false)));
+	NewCfgItem(IDC_FILEBUFFERSIZE, (MkCfg_Int("/eMule/FileBufferSizePref", s_iFileBufferSize, 16)));
+	NewCfgItem(IDC_DAP, (new Cfg_Bool("/eMule/DAPPref", s_bDAP, true)));
+	NewCfgItem(IDC_UAP, (new Cfg_Bool("/eMule/UAPPref", s_bUAP, true)));
+	NewCfgItem(IDC_ALLOCFULLFILE, (new Cfg_Bool("/eMule/AllocateFullFile", s_allocFullFile, false)));
+	NewCfgItem(
+		IDC_CREATEFILESSPARSE, (new Cfg_Bool("/eMule/CreateSparseFiles", s_createFilesSparse, true)));
+	NewCfgItem(IDC_MMAP_ENABLE, (new Cfg_Bool("/eMule/MMapEnabled", s_mmapEnabled, false)));
+
+	/** Web Server */
+	NewCfgItem(IDC_OSDIR, (new Cfg_Path("/eMule/OSDirectory", s_OSDirectory, appdir)));
+	NewCfgItem(IDC_ONLINESIG, (new Cfg_Bool("/eMule/OnlineSignature", s_onlineSig, false)));
+	NewCfgItem(IDC_OSUPDATE, (MkCfg_Int("/eMule/OnlineSignatureUpdate", s_OSUpdate, 5)));
+	NewCfgItem(IDC_ENABLE_WEB, (new Cfg_Bool("/WebServer/Enabled", s_bWebEnabled, false)));
+	NewCfgItem(IDC_ENABLE_AMULEAPI, (new Cfg_Bool("/AmuleApi/Enabled", s_bAmuleApiEnabled, false)));
+	NewCfgItem(IDC_AMULEAPI_PORT, (MkCfg_Int("/AmuleApi/HttpPort", s_nAmuleApiPort, 4713)));
+	NewCfgItem(IDC_AMULEAPI_BIND,
+		(new Cfg_Str("/AmuleApi/BindAddress", s_sAmuleApiBindAddress, "127.0.0.1")));
+	// Transient: see Cfg_Transient. These are pending password changes on
+	// their way to amuleapi-passwords, never a copy of what is stored.
+	NewCfgItem(IDC_AMULEAPI_PASSWD,
+		(new Cfg_Transient<Cfg_Str_Encrypted>("/AmuleApi/Password", s_sAmuleApiPassword)));
+	NewCfgItem(IDC_AMULEAPI_GUEST_ENABLED,
+		(new Cfg_Transient<Cfg_Bool>("/AmuleApi/GuestEnabled", s_bAmuleApiGuestEnabled, false)));
+	NewCfgItem(IDC_AMULEAPI_GUEST_PASSWD,
+		(new Cfg_Transient<Cfg_Str_Encrypted>("/AmuleApi/GuestPassword", s_sAmuleApiGuestPassword)));
+	NewCfgItem(IDC_WEB_PASSWD, (new Cfg_Str_Encrypted("/WebServer/Password", s_sWebPassword)));
+	NewCfgItem(IDC_WEB_PASSWD_LOW, (new Cfg_Str_Encrypted("/WebServer/PasswordLow", s_sWebLowPassword)));
+	NewCfgItem(IDC_WEB_PORT, (MkCfg_Int("/WebServer/Port", s_nWebPort, 4711)));
+	NewCfgItem(IDC_WEBUPNPTCPPORT, (MkCfg_Int("/WebServer/WebUPnPTCPPort", s_nWebUPnPTCPPort, 50001)));
 	NewCfgItem(IDC_UPNP_WEBSERVER_ENABLED,
-					(new Cfg_Bool( "/WebServer/UPnPWebServerEnabled", s_UPnPWebServerEnabled, false )));
-	NewCfgItem(IDC_WEB_GZIP,	(new Cfg_Bool( "/WebServer/UseGzip", s_bWebUseGzip, true )));
-	NewCfgItem(IDC_ENABLE_WEB_LOW,	(new Cfg_Bool( "/WebServer/UseLowRightsUser", s_bWebLowEnabled, false )));
-	NewCfgItem(IDC_WEB_REFRESH_TIMEOUT,	(MkCfg_Int( "/WebServer/PageRefreshTime", s_nWebPageRefresh, 120 )));
-	NewCfgItem(IDC_WEBTEMPLATE,	(new Cfg_Skin( "/WebServer/Template", s_WebTemplate, "" )));
-
-	/**
-	 * External Connections
-	 */
-	NewCfgItem(IDC_EXT_CONN_ACCEPT,	(new Cfg_Bool( "/ExternalConnect/AcceptExternalConnections", s_AcceptExternalConnections, false )));
-	NewCfgItem(IDC_EXT_CONN_IP,	(new Cfg_Str( "/ExternalConnect/ECAddress", s_ECAddr, "" )));
-	NewCfgItem(IDC_EXT_CONN_TCP_PORT,	(MkCfg_Int( "/ExternalConnect/ECPort", s_ECPort, 4712 )));
-	NewCfgItem(IDC_EXT_CONN_PASSWD,	(new Cfg_Str_Encrypted( "/ExternalConnect/ECPassword", s_ECPassword, "" )));
-	NewCfgItem(IDC_UPNP_EC_ENABLED,	(new Cfg_Bool( "/ExternalConnect/UPnPECEnabled", s_UPnPECEnabled, false )));
-
-	/**
-	 * GUI behavior
-	 **/
-	NewCfgItem(IDC_MACHIDEONCLOSE,	(new Cfg_Bool( "/GUI/HideOnClose", s_hideonclose, false )));
-	NewCfgItem(IDC_ENABLETRAYICON,	(new Cfg_Bool( "/eMule/EnableTrayIcon", s_trayiconenabled, false )));
-	NewCfgItem(IDC_MINTRAY,		(new Cfg_Bool( "/eMule/MinToTray", s_mintotray, false )));
-	NewCfgItem(IDC_NOTIF,		(new Cfg_Bool( "/eMule/Notifications", s_notify, false )));
-	NewCfgItem(IDC_EXIT,		(new Cfg_Bool( "/eMule/ConfirmExit", s_confirmExit, true )));
-	NewCfgItem(IDC_STARTMIN,	(new Cfg_Bool( "/eMule/StartupMinimized", s_startMinimized, false )));
-
-	/**
-	 * GUI appearance
-	 **/
-	NewCfgItem(IDC_3DDEPTH,		(MkCfg_Int( "/eMule/3DDepth", s_depth3D, 10 )));
-	NewCfgItem(IDC_TOOLTIPDELAY,	(MkCfg_Int( "/eMule/ToolTipDelay", s_iToolDelayTime, 1 )));
-	NewCfgItem(IDC_SHOWOVERHEAD,	(new Cfg_Bool( "/eMule/ShowOverhead", s_bshowoverhead, false )));
-	NewCfgItem(IDC_EXTCATINFO,	(new Cfg_Bool( "/eMule/ShowInfoOnCatTabs", s_showCatTabInfos, true )));
-	NewCfgItem(IDC_FED2KLH,		(new Cfg_Bool( "/Razor_Preferences/FastED2KLinksHandler", s_FastED2KLinksHandler, true )));
-	NewCfgItem(IDC_PROGBAR,		(new Cfg_Bool( "/ExternalConnect/ShowProgressBar", s_ProgBar, true )));
-	NewCfgItem(IDC_PERCENT,		(new Cfg_Bool( "/ExternalConnect/ShowPercent", s_Percent, true )));
-	NewCfgItem(IDC_SKIN,		(new Cfg_Skin(  "/SkinGUIOptions/Skin", s_Skin, "" )));
-	NewCfgItem(IDC_VERTTOOLBAR,	(new Cfg_Bool( "/eMule/VerticalToolbar", s_ToolbarOrientation, false )));
-#ifdef ENABLE_IP2COUNTRY
-	// The IP2Country tab and its widgets only exist when libmaxminddb is
-	// present at compile time (PreferencesIP2CountryTab in muuli_wdr.cpp
-	// is the only place IDC_SHOW_COUNTRY_FLAGS / IDC_GEOIP_* are created).
-	// The Cfg_* bindings must live under the same gate -- binding them
-	// when the widgets don't exist would surface "Failed to connect Cfg
-	// to widget" log spam in TransferToWindow plus null-pointer crashes
-	// on any later FindWindow access.
-	NewCfgItem(IDC_SHOW_COUNTRY_FLAGS,	(new Cfg_Bool( "/eMule/GeoIPEnabled",        s_GeoIPEnabled,        true )));
-	NewCfgItem(IDC_GEOIP_MAXMIND_LIC,	(new Cfg_Str(  "/eMule/GeoIPMaxMindLicense", s_GeoIPMaxMindLicense, "" )));
-	NewCfgItem(IDC_GEOIP_CUSTOM_URL,	(new Cfg_Str(  "/eMule/GeoIPCustomUrl",      s_GeoIPCustomUrl,      "" )));
-	NewCfgItem(IDC_GEOIP_AUTOUPDATE,	(new Cfg_Bool( "/eMule/GeoIPAutoUpdate",     s_GeoIPAutoUpdate,     true )));
+		(new Cfg_Bool("/WebServer/UPnPWebServerEnabled", s_UPnPWebServerEnabled, false)));
+	NewCfgItem(IDC_WEB_GZIP, (new Cfg_Bool("/WebServer/UseGzip", s_bWebUseGzip, true)));
+	NewCfgItem(
+		IDC_ENABLE_WEB_LOW, (new Cfg_Bool("/WebServer/UseLowRightsUser", s_bWebLowEnabled, false)));
+	NewCfgItem(
+		IDC_WEB_REFRESH_TIMEOUT, (MkCfg_Int("/WebServer/PageRefreshTime", s_nWebPageRefresh, 120)));
+	NewCfgItem(IDC_WEBTEMPLATE, (new Cfg_Skin("/WebServer/Template", s_WebTemplate, "")));
+
+	/** External Connections */
+	NewCfgItem(IDC_EXT_CONN_ACCEPT,
+		(new Cfg_Bool(
+			"/ExternalConnect/AcceptExternalConnections", s_AcceptExternalConnections, false)));
+	NewCfgItem(IDC_EXT_CONN_REQUIRE_ENCRYPTION,
+		(new Cfg_Bool("/ExternalConnect/RequireEncryption", s_ECRequireEncryption, false)));
+	// Loopback by default, so a fresh install does not expose the external connection --
+	// which grants full control of the daemon -- to the whole network before the user has
+	// thought about it. Existing configs are untouched: aMule writes every key on save, so
+	// any config it has ever written already carries an ECAddress line, and wxConfig only
+	// applies a default when the key is *absent*. An empty value still means "any".
+	NewCfgItem(IDC_EXT_CONN_IP, (new Cfg_Str("/ExternalConnect/ECAddress", s_ECAddr, "127.0.0.1")));
+	NewCfgItem(IDC_EC_INTERFACE,
+		(new Cfg_Str("/ExternalConnect/ECNetworkInterface", s_ECNetworkInterface, "")));
+	NewCfgItem(IDC_EXT_CONN_TCP_PORT, (MkCfg_Int("/ExternalConnect/ECPort", s_ECPort, 4712)));
+	NewCfgItem(IDC_EXT_CONN_PASSWD,
+		(new Cfg_Str_Encrypted("/ExternalConnect/ECPassword", s_ECPassword, "")));
+	NewCfgItem(IDC_UPNP_EC_ENABLED,
+		(new Cfg_Bool("/ExternalConnect/UPnPECEnabled", s_UPnPECEnabled, false)));
+	// Brute-force throttle for the EC password exchange. Config-only, with no dialog field:
+	// the defaults suit everyone who is not tuning for an unusual deployment, and a busy
+	// Remote Controls page is a poor place to explain a sliding window. amuleapi exposes
+	// the same three knobs for its own login.
+	s_MiscList.push_back(
+		MkCfg_Int("/ExternalConnect/AuthFailureWindowSeconds", s_ECAuthFailureWindowSeconds, 60));
+	s_MiscList.push_back(
+		MkCfg_Int("/ExternalConnect/AuthFailureThreshold", s_ECAuthFailureThreshold, 10));
+	s_MiscList.push_back(MkCfg_Int("/ExternalConnect/AuthLockoutSeconds", s_ECAuthLockoutSeconds, 300));
+
+	/** GUI behavior */
+	NewCfgItem(IDC_MACHIDEONCLOSE, (new Cfg_Bool("/GUI/HideOnClose", s_hideonclose, false)));
+	NewCfgItem(IDC_ENABLETRAYICON, (new Cfg_Bool("/eMule/EnableTrayIcon", s_trayiconenabled, false)));
+	NewCfgItem(IDC_MINTRAY, (new Cfg_Bool("/eMule/MinToTray", s_mintotray, false)));
+	NewCfgItem(IDC_NOTIF, (new Cfg_Bool("/eMule/Notifications", s_notify, false)));
+	NewCfgItem(IDC_EXIT, (new Cfg_Bool("/eMule/ConfirmExit", s_confirmExit, true)));
+	NewCfgItem(IDC_STARTMIN, (new Cfg_Bool("/eMule/StartupMinimized", s_startMinimized, false)));
+	NewCfgItem(IDC_SEARCHHISTORYENABLED,
+		(new Cfg_Bool("/eMule/SearchHistoryEnabled", s_rememberSearchHistory, true)));
+
+	/** GUI appearance */
+	NewCfgItem(IDC_3DDEPTH, (MkCfg_Int("/eMule/3DDepth", s_depth3D, 10)));
+	NewCfgItem(IDC_TOOLTIPDELAY, (MkCfg_Int("/eMule/ToolTipDelay", s_iToolDelayTime, 1)));
+	NewCfgItem(IDC_SHOWOVERHEAD, (new Cfg_Bool("/eMule/ShowOverhead", s_bshowoverhead, false)));
+	NewCfgItem(IDC_EXTCATINFO, (new Cfg_Bool("/eMule/ShowInfoOnCatTabs", s_showCatTabInfos, true)));
+	NewCfgItem(IDC_FED2KLH,
+		(new Cfg_Bool("/Razor_Preferences/FastED2KLinksHandler", s_FastED2KLinksHandler, true)));
+	NewCfgItem(IDC_PROGBAR, (new Cfg_Bool("/ExternalConnect/ShowProgressBar", s_ProgBar, true)));
+	NewCfgItem(IDC_PERCENT, (new Cfg_Bool("/ExternalConnect/ShowPercent", s_Percent, true)));
+	NewCfgItem(IDC_SKIN, (new Cfg_Skin("/SkinGUIOptions/Skin", s_Skin, "")));
+	NewCfgItem(IDC_VERTTOOLBAR, (new Cfg_Bool("/eMule/VerticalToolbar", s_ToolbarOrientation, false)));
+	NewCfgItem(IDC_LIVELISTSORT, (new Cfg_Bool("/eMule/LiveListSort", s_liveListSort, true)));
+#ifdef GEOIP_GUI
+	// The IP2Country tab and its widgets only exist where the GeoIP GUI is built
+	// (PreferencesIP2CountryTab in muuli_wdr.cpp is the only place IDC_SHOW_COUNTRY_FLAGS /
+	// IDC_GEOIP_* are created) -- i.e. a resolver-owning build or amulegui. The Cfg_*
+	// bindings must live under the same gate: binding them when the widgets do not exist
+	// would surface "Failed to connect Cfg to widget" log spam in TransferToWindow plus
+	// null-pointer crashes on any later FindWindow access.
+	NewCfgItem(IDC_SHOW_COUNTRY_FLAGS, (new Cfg_Bool("/eMule/GeoIPEnabled", s_GeoIPEnabled, true)));
+	NewCfgItem(IDC_GEOIP_MAXMIND_LIC,
+		(new Cfg_Str("/eMule/GeoIPMaxMindLicense", s_GeoIPMaxMindLicense, "")));
+	NewCfgItem(IDC_GEOIP_CUSTOM_URL, (new Cfg_Str("/eMule/GeoIPCustomUrl", s_GeoIPCustomUrl, "")));
+	NewCfgItem(IDC_GEOIP_AUTOUPDATE, (new Cfg_Bool("/eMule/GeoIPAutoUpdate", s_GeoIPAutoUpdate, true)));
 #endif
 #ifndef __GIT__
-	NewCfgItem(IDC_SHOWVERSIONONTITLE,	(new Cfg_Bool( "/eMule/ShowVersionOnTitle", s_showVersionOnTitle, false )));
+	NewCfgItem(IDC_SHOWVERSIONONTITLE,
+		(new Cfg_Bool("/eMule/ShowVersionOnTitle", s_showVersionOnTitle, false)));
 #endif
 
-	/**
-	 * External Apps
-	 */
-	NewCfgItem(IDC_VIDEOPLAYER,	(new Cfg_Str(  "/eMule/VideoPlayer", s_VideoPlayer, "" )));
-
-	/**
-	 * Statistics
-	 **/
-	NewCfgItem(IDC_SLIDER,		(MkCfg_Int( "/eMule/StatGraphsInterval", s_trafficOMeterInterval, 3 )));
-	NewCfgItem(IDC_SLIDER2,		(MkCfg_Int( "/eMule/statsInterval", s_statsInterval, 30 )));
-	NewCfgItem(IDC_DOWNLOAD_CAP,	(MkCfg_Int( "/eMule/DownloadCapacity", s_maxGraphDownloadRate, 300 )));
-	NewCfgItem(IDC_UPLOAD_CAP,	(MkCfg_Int( "/eMule/UploadCapacity", s_maxGraphUploadRate, 100 )));
-	NewCfgItem(IDC_SLIDER3,		(MkCfg_Int( "/eMule/StatsAverageMinutes", s_statsAverageMinutes, 5 )));
-	NewCfgItem(IDC_SLIDER4,		(MkCfg_Int( "/eMule/VariousStatisticsMaxValue", s_statsMax, 100 )));
-	NewCfgItem(IDC_CLIENTVERSIONS,	(MkCfg_Int( "/Statistics/MaxClientVersions", s_maxClientVersions, 0 )));
-
-	/**
-	 * Security
-	 **/
-	NewCfgItem(IDC_SEESHARES,	(MkCfg_Int( "/eMule/SeeShare",	s_iSeeShares, 2 )));
-	NewCfgItem(IDC_SECIDENT,        (new Cfg_Bool( "/ExternalConnect/UseSecIdent", s_SecIdent, true )));
-	NewCfgItem(IDC_IPFCLIENTS,	(new Cfg_Bool( "/ExternalConnect/IpFilterClients", s_IPFilterClients, true )));
-	NewCfgItem(IDC_IPFSERVERS,	(new Cfg_Bool( "/ExternalConnect/IpFilterServers", s_IPFilterServers, true )));
-	NewCfgItem(IDC_FILTERLAN,		(new Cfg_Bool( "/eMule/FilterLanIPs", s_filterLanIP, true )));
-	NewCfgItem(IDC_PARANOID,		(new Cfg_Bool( "/eMule/ParanoidFiltering", s_paranoidfilter, true )));
-	NewCfgItem(IDC_AUTOIPFILTER,	(new Cfg_Bool( "/eMule/IPFilterAutoLoad", s_IPFilterAutoLoad, true )));
-	NewCfgItem(IDC_IPFILTERURL,	(new Cfg_Str(  "/eMule/IPFilterURL", s_IPFilterURL, "" )));
-	NewCfgItem(ID_IPFILTERLEVEL,	(MkCfg_Int( "/eMule/FilterLevel", s_filterlevel, 127 )));
-	NewCfgItem(IDC_IPFILTERSYS,	(new Cfg_Bool( "/eMule/IPFilterSystem", s_IPFilterSys, false )));
+	/** External Apps */
+	NewCfgItem(IDC_VIDEOPLAYER, (new Cfg_Str("/eMule/VideoPlayer", s_VideoPlayer, "")));
+
+	/** Statistics */
+	NewCfgItem(IDC_SLIDER, (MkCfg_Int("/eMule/StatGraphsInterval", s_trafficOMeterInterval, 3)));
+	NewCfgItem(IDC_SLIDER2, (MkCfg_Int("/eMule/statsInterval", s_statsInterval, 30)));
+	// Line capacity, in kB/s. Not a limit -- it is what the connection can do, and both the
+	// traffic graph's scale and the tray's limit presets are derived from it. The old
+	// 300/100 described a fast line when they were chosen and now describe almost nobody,
+	// which left the tray offering a top preset of 300 kB/s on a gigabit connection.
+	//
+	// 100/20 Mbit, converted at 1024. Asymmetric because consumer lines mostly are, and
+	// because upload is the side people actually throttle. A user whose line differs sets
+	// this on the Statistics page, or answers the first-run wizard, which computes it from
+	// the speeds they enter.
+	//
+	// Only new configurations see this. aMule writes every key on save, so an existing
+	// amule.conf already carries the old value and wxConfig applies a default only when the
+	// key is absent.
+	NewCfgItem(IDC_DOWNLOAD_CAP, (MkCfg_Int("/eMule/DownloadCapacity", s_maxGraphDownloadRate, 12500)));
+	NewCfgItem(IDC_UPLOAD_CAP, (MkCfg_Int("/eMule/UploadCapacity", s_maxGraphUploadRate, 2500)));
+	NewCfgItem(IDC_SLIDER3, (MkCfg_Int("/eMule/StatsAverageMinutes", s_statsAverageMinutes, 5)));
+	NewCfgItem(IDC_SLIDER4, (MkCfg_Int("/eMule/VariousStatisticsMaxValue", s_statsMax, 100)));
+	NewCfgItem(IDC_CLIENTVERSIONS, (MkCfg_Int("/Statistics/MaxClientVersions", s_maxClientVersions, 0)));
+
+	/** Security */
+	NewCfgItem(IDC_SEESHARES, (MkCfg_Int("/eMule/SeeShare", s_iSeeShares, 2)));
+	NewCfgItem(IDC_SECIDENT, (new Cfg_Bool("/ExternalConnect/UseSecIdent", s_SecIdent, true)));
+	NewCfgItem(
+		IDC_IPFCLIENTS, (new Cfg_Bool("/ExternalConnect/IpFilterClients", s_IPFilterClients, true)));
+	NewCfgItem(
+		IDC_IPFSERVERS, (new Cfg_Bool("/ExternalConnect/IpFilterServers", s_IPFilterServers, true)));
+	NewCfgItem(IDC_FILTERLAN, (new Cfg_Bool("/eMule/FilterLanIPs", s_filterLanIP, true)));
+	NewCfgItem(IDC_PARANOID, (new Cfg_Bool("/eMule/ParanoidFiltering", s_paranoidfilter, true)));
+	NewCfgItem(IDC_AUTOIPFILTER, (new Cfg_Bool("/eMule/IPFilterAutoLoad", s_IPFilterAutoLoad, false)));
+	NewCfgItem(IDC_IPFILTERURL,
+		(new Cfg_Str(
+			"/eMule/IPFilterURL", s_IPFilterURL, "https://upd.emule-security.org/ipfilter.zip")));
+	NewCfgItem(ID_IPFILTERLEVEL, (MkCfg_Int("/eMule/FilterLevel", s_filterlevel, 127)));
+	NewCfgItem(IDC_IPFILTERSYS, (new Cfg_Bool("/eMule/IPFilterSystem", s_IPFilterSys, false)));
+
+	/** Message Filter */
+	NewCfgItem(IDC_MSGFILTER, (new Cfg_Bool("/eMule/FilterMessages", s_MustFilterMessages, true)));
+	NewCfgItem(IDC_MSGFILTER_ALL, (new Cfg_Bool("/eMule/FilterAllMessages", s_FilterAllMessages, false)));
+	NewCfgItem(IDC_MSGFILTER_NONFRIENDS,
+		(new Cfg_Bool("/eMule/MessagesFromFriendsOnly", s_msgonlyfriends, false)));
+	NewCfgItem(IDC_MSGFILTER_NONSECURE,
+		(new Cfg_Bool("/eMule/MessageFromValidSourcesOnly", s_msgsecure, true)));
+	NewCfgItem(
+		IDC_MSGFILTER_WORD, (new Cfg_Bool("/eMule/FilterWordMessages", s_FilterSomeMessages, false)));
+	NewCfgItem(IDC_MSGWORD, (new Cfg_Str("/eMule/MessageFilter", s_MessageFilterString, "")));
+	NewCfgItem(IDC_MSGLOG, (new Cfg_Bool("/eMule/ShowMessagesInLog", s_ShowMessagesInLog, true)));
+	// Todo NewCfgItem(IDC_MSGADVSPAM, (new Cfg_Bool("/eMule/AdvancedSpamFilter",
+	// s_IsAdvancedSpamfilterEnabled, true ))); Todo NewCfgItem(IDC_MSGCAPTCHA, (new
+	// Cfg_Bool("/eMule/MessageUseCaptchas", s_IsChatCaptchaEnabled, true )));
+	s_MiscList.push_back(new Cfg_Bool("/eMule/AdvancedSpamFilter", s_IsAdvancedSpamfilterEnabled, true));
+	s_MiscList.push_back(new Cfg_Bool("/eMule/MessageUseCaptchas", s_IsChatCaptchaEnabled, true));
+	s_MiscList.push_back(
+		new Cfg_Bool("/GUI/AppImageIntegrationDeclined", s_appimageIntegrationDeclined, false));
+	s_MiscList.push_back(new Cfg_Bool("/eMule/FirstRunWizardDone", s_firstRunWizardDone, false));
+
+	NewCfgItem(IDC_FILTERCOMMENTS, (new Cfg_Bool("/eMule/FilterComments", s_FilterComments, false)));
+	NewCfgItem(IDC_COMMENTWORD, (new Cfg_Str("/eMule/CommentFilter", s_CommentFilterString, "")));
+
+	/** Hidden files sharing */
+	NewCfgItem(
+		IDC_SHAREHIDDENFILES, (new Cfg_Bool("/eMule/ShareHiddenFiles", s_ShareHiddenFiles, false)));
 
 	/**
-	 * Message Filter
-	 **/
-	NewCfgItem(IDC_MSGFILTER,	(new Cfg_Bool( "/eMule/FilterMessages", s_MustFilterMessages, true )));
-	NewCfgItem(IDC_MSGFILTER_ALL,	(new Cfg_Bool( "/eMule/FilterAllMessages", s_FilterAllMessages, false )));
-	NewCfgItem(IDC_MSGFILTER_NONFRIENDS,	(new Cfg_Bool( "/eMule/MessagesFromFriendsOnly",	s_msgonlyfriends, false )));
-	NewCfgItem(IDC_MSGFILTER_NONSECURE,	(new Cfg_Bool( "/eMule/MessageFromValidSourcesOnly",	s_msgsecure, true )));
-	NewCfgItem(IDC_MSGFILTER_WORD,	(new Cfg_Bool( "/eMule/FilterWordMessages", s_FilterSomeMessages, false )));
-	NewCfgItem(IDC_MSGWORD,		(new Cfg_Str(  "/eMule/MessageFilter", s_MessageFilterString, "" )));
-	NewCfgItem(IDC_MSGLOG,	(new Cfg_Bool( "/eMule/ShowMessagesInLog", s_ShowMessagesInLog, true )));
-	//Todo NewCfgItem(IDC_MSGADVSPAM,	(new Cfg_Bool( "/eMule/AdvancedSpamFilter", s_IsAdvancedSpamfilterEnabled, true )));
-	//Todo NewCfgItem(IDC_MSGCAPTCHA,	(new Cfg_Bool( "/eMule/MessageUseCaptchas", s_IsChatCaptchaEnabled, true )));
-	s_MiscList.push_back( new Cfg_Bool( "/eMule/AdvancedSpamFilter", s_IsAdvancedSpamfilterEnabled, true ) );
-	s_MiscList.push_back( new Cfg_Bool( "/eMule/MessageUseCaptchas", s_IsChatCaptchaEnabled, true ) );
-	s_MiscList.push_back( new Cfg_Bool( "/GUI/AppImageIntegrationDeclined", s_appimageIntegrationDeclined, false ) );
-
-	NewCfgItem(IDC_FILTERCOMMENTS,	(new Cfg_Bool( "/eMule/FilterComments", s_FilterComments, false )));
-	NewCfgItem(IDC_COMMENTWORD,		(new Cfg_Str(  "/eMule/CommentFilter", s_CommentFilterString, "" )));
-
-	/**
-	 * Hidden files sharing
-	 **/
-	NewCfgItem(IDC_SHAREHIDDENFILES,	(new Cfg_Bool( "/eMule/ShareHiddenFiles", s_ShareHiddenFiles, false )));
+	 * Auto-rescan of shared directories via wxFileSystemWatcher. Default on so the
+	 * feature is visible without opt-in; the prefs panel lets users disable it (e.g.
+	 * Linux hosts hitting max_user_watches).
+	 */
+	NewCfgItem(IDC_AUTO_RESCAN_SHARED,
+		(new Cfg_Bool("/eMule/AutoRescanSharedDirs", s_AutoRescanSharedDirs, true)));
 
 	/**
-	 * Auto-rescan of shared directories via wxFileSystemWatcher.
-	 * Default on so the feature is visible without opt-in; the prefs panel
-	 * lets users disable it (e.g. Linux hosts hitting max_user_watches).
-	 **/
-	NewCfgItem(IDC_AUTO_RESCAN_SHARED,	(new Cfg_Bool( "/eMule/AutoRescanSharedDirs", s_AutoRescanSharedDirs, true )));
+	 * Whether shared-folder walks should descend into symbolic links. Default true
+	 * preserves historical behaviour; turning it off makes the iterator pass
+	 * wxDIR_NO_FOLLOW so symlinks are not traversed.
+	 */
+	NewCfgItem(IDC_FOLLOW_SYMLINKS_SHARED,
+		(new Cfg_Bool("/eMule/FollowSymlinksInShares", s_FollowSymlinksInShares, true)));
 
 	/**
-	 * Whether shared-folder walks should descend into symbolic links.
-	 * Default true preserves historical behaviour; turning it off makes
-	 * the iterator pass wxDIR_NO_FOLLOW so symlinks are not traversed.
-	 **/
-	NewCfgItem(IDC_FOLLOW_SYMLINKS_SHARED,	(new Cfg_Bool( "/eMule/FollowSymlinksInShares", s_FollowSymlinksInShares, true )));
-
+	 * Shared-file exclusion by name. A '|'-separated list of wildcard patterns, or a
+	 * single regex when ExcludeSharePatternsUseRegex is on.
+	 *
+	 * The default excludes OS-generated metadata junk that no peer wants to download.
+	 * Matching is case-insensitive. Configs missing the key pick this up on load (not
+	 * just fresh installs) -- intentional for this junk, which should never have been
+	 * shared: macOS .DS_Store, ._* (AppleDouble), .Spotlight-V100, .Trashes, .fseventsd,
+	 * .DocumentRevisions-V100, .TemporaryItems, .apdisk; Windows Thumbs.db, ehthumbs.db,
+	 * desktop.ini; Linux .directory (KDE folder metadata). Deliberately NOT included:
+	 * broad download-temp globs (*.part, *.tmp, *.!ut, *INCOMPLETE*) -- those can match
+	 * real user files, so they are left for the user to add.
+	 */
+	NewCfgItem(IDC_EXCLUDE_SHARE_PATTERNS,
+		(new Cfg_Str("/eMule/ExcludeSharePatterns",
+			s_ExcludeSharePatterns,
+			".DS_Store|._*|.Spotlight-V100|.Trashes|.fseventsd|"
+			".DocumentRevisions-V100|.TemporaryItems|.apdisk|"
+			"Thumbs.db|ehthumbs.db|desktop.ini|.directory")));
+	NewCfgItem(IDC_EXCLUDE_SHARE_REGEX,
+		(new Cfg_Bool("/eMule/ExcludeSharePatternsUseRegex", s_ExcludeSharePatternsUseRegex, false)));
+
+#if defined(ENABLE_VERSION_CHECK) || defined(CLIENT_GUI)
 	/**
-	 * Auto-Sorting of downloads
-	 **/
-	 NewCfgItem(IDC_AUTOSORT,	 (new Cfg_Bool( "/eMule/AutoSortDownloads", s_AutoSortDownload, false )));
+	 * Version check. Registered when the feature is compiled in (-DENABLE_VERSION_CHECK,
+	 * ON by default; OFF for OS-package builds where the distro's package manager owns
+	 * updates), OR in the remote GUI (CLIENT_GUI) regardless of its own build -- there
+	 * the checkbox edits the *connected daemon's* preference, so it must stay wired even
+	 * when amulegui itself was built without the feature. PrefsUnifiedDlg hides the
+	 * checkbox when the daemon cannot check. Defaults to on; the user can turn it off.
+	 */
+	NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool("/eMule/NewVersionCheck", s_NewVersionCheck, true)));
+#endif // ENABLE_VERSION_CHECK || CLIENT_GUI
 
 	/**
-	 * Version check.
-	 * Default value is set at configure time via -DDEFAULT_VERSION_CHECK
-	 * (ON by default, OFF for OS-package builds that don't want the
-	 * in-app updater to compete with the distro's package manager).
+	 * Media metadata extraction (issue #140). On by default (issue #1080).
+	 *
+	 * It was off so an upgrade would not kick off a background probe of every shared
+	 * file until the user opted in. The measured cost turned out to be disproportionate
+	 * to that caution -- around 13 ms per file, once, on a dedicated worker, since a
+	 * probe reads the container header rather than the file -- and off-by-default had a
+	 * side effect the reasoning did not account for: the extracted tags are what fill
+	 * the Length / Bitrate / Codec columns for whoever is SEARCHING the network, so a
+	 * share with the feature off is a hole in that data for everyone else while costing
+	 * its owner only a detail dialog reading N/A. A default-off feature that mostly
+	 * benefits other people is one almost nobody enables. It is also undiscoverable on a
+	 * headless amuled + amuleapi deployment, where there is no dialog to stumble across.
+	 *
+	 * Enabling it does not require ffprobe to exist: detection is memoised for the life
+	 * of the process, and with nothing found the worker drops every job after a single
+	 * log line.
+	 *
+	 * No migration accompanies this. Cfg_Bool applies a default only when the key is
+	 * ABSENT, and the key does not exist in 3.0.0 or 3.0.1 -- so every config written by
+	 * a released aMule picks the new default up on its own. The only configs carrying it
+	 * already are from master builds, where "never touched it" and "deliberately turned
+	 * it off" are indistinguishable.
 	 */
-	 NewCfgItem(IDC_NEWVERSION,	(new Cfg_Bool( "/eMule/NewVersionCheck", s_NewVersionCheck, DEFAULT_VERSION_CHECK )));
-
-	 /**
-	  * Obfuscation
-	  **/
-	NewCfgItem( IDC_SUPPORT_PO, ( new Cfg_Bool( "/Obfuscation/IsClientCryptLayerSupported", s_IsClientCryptLayerSupported, true )));
-	NewCfgItem( IDC_ENABLE_PO_OUTGOING, ( new Cfg_Bool( "/Obfuscation/IsCryptLayerRequested", s_bCryptLayerRequested, true )));
-	NewCfgItem( IDC_ENFORCE_PO_INCOMING, ( new Cfg_Bool( "/Obfuscation/IsClientCryptLayerRequired", s_IsClientCryptLayerRequired, false )));
+	NewCfgItem(IDC_MEDIAMETA_ENABLED,
+		(new Cfg_Bool("/MediaMetadata/Enabled", s_MediaMetadataEnabled, true)));
+	NewCfgItem(IDC_MEDIAMETA_FFPROBEPATH,
+		(new Cfg_Str("/MediaMetadata/FFProbePath", s_MediaMetadataFFProbePath, "")));
+
+	/** Obfuscation */
+	NewCfgItem(IDC_SUPPORT_PO,
+		(new Cfg_Bool(
+			"/Obfuscation/IsClientCryptLayerSupported", s_IsClientCryptLayerSupported, true)));
+	NewCfgItem(IDC_ENABLE_PO_OUTGOING,
+		(new Cfg_Bool("/Obfuscation/IsCryptLayerRequested", s_bCryptLayerRequested, true)));
+	NewCfgItem(IDC_ENFORCE_PO_INCOMING,
+		(new Cfg_Bool(
+			"/Obfuscation/IsClientCryptLayerRequired", s_IsClientCryptLayerRequired, false)));
 #ifndef CLIENT_GUI
 	// There is no need for GUI items for this two.
-	s_MiscList.push_back( MkCfg_Int( "/Obfuscation/CryptoPaddingLenght", s_byCryptTCPPaddingLength, 254 ) );
-	s_MiscList.push_back( MkCfg_Int( "/Obfuscation/CryptoKadUDPKey", s_dwKadUDPKey, GetRandomUint32() ) );
+	s_MiscList.push_back(MkCfg_Int("/Obfuscation/CryptoPaddingLenght", s_byCryptTCPPaddingLength, 254));
+	s_MiscList.push_back(MkCfg_Int("/Obfuscation/CryptoKadUDPKey", s_dwKadUDPKey, GetRandomUint32()));
 #endif
 
-	/**
-	 * Power management
-	 **/
-	NewCfgItem( IDC_PREVENT_SLEEP, ( new Cfg_Bool( "/PowerManagement/PreventSleepWhileDownloading", s_preventSleepWhileDownloading, false )));
-
-	/**
-	 * The following doesn't have an associated widget or section
-	 **/
-	s_MiscList.push_back( new Cfg_Str(  "/eMule/Language",			s_languageID ) );
-	s_MiscList.push_back(    MkCfg_Int( "/eMule/SplitterbarPosition",		s_splitterbarPosition, 75 ) );
-	s_MiscList.push_back( new Cfg_Str(  "/eMule/YourHostname",			s_yourHostname, "" ) );
-	s_MiscList.push_back( new Cfg_Str(  "/eMule/DateTimeFormat",		s_datetimeformat, "%A, %x, %X" ) );
-
-	s_MiscList.push_back(    MkCfg_Int( "/eMule/AllcatType",			s_allcatFilter, 0 ) );
-	s_MiscList.push_back( new Cfg_Bool( "/eMule/ShowAllNotCats",		s_showAllNotCats, false ) );
-
-	s_MiscList.push_back( MkCfg_Int( "/eMule/SmartIdState", s_smartidstate, 0 ) );
-
-	s_MiscList.push_back( new Cfg_Bool( "/eMule/DropSlowSources",		s_DropSlowSources, false ) );
-
-	s_MiscList.push_back( new Cfg_Str(  "/eMule/KadNodesUrl",			s_KadURL, "https://upd.emule-security.org/nodes.dat" ) );
-	s_MiscList.push_back( new Cfg_Str(	"/eMule/Ed2kServersUrl",		s_Ed2kURL, "https://upd.emule-security.org/server.met" ) );
-	s_MiscList.push_back( MkCfg_Int( "/eMule/ShowRatesOnTitle",		s_showRatesOnTitle, 0 ));
-
-	// IP2Country / GeoIP database — three sources, all delivering the same
-	// MMDB binary format that geoip/MaxMindDBDatabase reads via libmaxminddb.
-	// DB-IP is the no-account default; MaxMind needs only the License Key
-	// (license-key URL form, no Account ID required); Custom is a
-	// user-supplied URL (escape hatch).
-	s_MiscList.push_back( new Cfg_Str(  "/eMule/GeoIPSource",			s_GeoIPSource,            "dbip" ) );
-	s_MiscList.push_back( new Cfg_Str(  "/eMule/GeoIPLoadedSource",		s_GeoIPLoadedSource,      "" ) );
-	s_MiscList.push_back( new Cfg_Str(  "/eMule/GeoIPMaxMindLicense",	s_GeoIPMaxMindLicense,    "" ) );
-	s_MiscList.push_back( new Cfg_Str(  "/eMule/GeoIPCustomUrl",		s_GeoIPCustomUrl,         "" ) );
-	s_MiscList.push_back( new Cfg_Bool( "/eMule/GeoIPAutoUpdate",		s_GeoIPAutoUpdate,        true ) );
+	/** Power management */
+	NewCfgItem(IDC_PREVENT_SLEEP,
+		(new Cfg_Bool("/PowerManagement/PreventSleepWhileDownloading",
+			s_preventSleepWhileDownloading,
+			false)));
+
+	/** The following does not have an associated widget or section */
+	s_MiscList.push_back(new Cfg_Str("/eMule/Language", s_languageID));
+	s_MiscList.push_back(MkCfg_Int("/eMule/SplitterbarPosition", s_splitterbarPosition, 75));
+	s_MiscList.push_back(new Cfg_Str("/eMule/YourHostname", s_yourHostname, ""));
+	s_MiscList.push_back(new Cfg_Str("/eMule/DateTimeFormat", s_datetimeformat, "%A, %x, %X"));
+
+	s_MiscList.push_back(MkCfg_Int("/eMule/AllcatType", s_allcatFilter, 0));
+	s_MiscList.push_back(new Cfg_Bool("/eMule/ShowAllNotCats", s_showAllNotCats, false));
+
+	s_MiscList.push_back(MkCfg_Int("/eMule/SmartIdState", s_smartidstate, 0));
+
+	s_MiscList.push_back(new Cfg_Bool("/eMule/DropSlowSources", s_DropSlowSources, false));
+
+	s_MiscList.push_back(
+		new Cfg_Str("/eMule/KadNodesUrl", s_KadURL, "https://upd.emule-security.org/nodes.dat"));
+	s_MiscList.push_back(
+		new Cfg_Str("/eMule/Ed2kServersUrl", s_Ed2kURL, "https://upd.emule-security.org/server.met"));
+	s_MiscList.push_back(MkCfg_Int("/eMule/ShowRatesOnTitle", s_showRatesOnTitle, 0));
+
+	// IP2Country / GeoIP database -- three sources, all delivering the same MMDB binary
+	// format that geoip/MaxMindDBDatabase reads via libmaxminddb. DB-IP is the no-account
+	// default; MaxMind needs only the License Key (license-key URL form, no Account ID
+	// required); Custom is a user-supplied URL (escape hatch).
+	s_MiscList.push_back(new Cfg_Str("/eMule/GeoIPSource", s_GeoIPSource, "dbip"));
+	s_MiscList.push_back(new Cfg_Str("/eMule/GeoIPLoadedSource", s_GeoIPLoadedSource, ""));
+	s_MiscList.push_back(new Cfg_Str("/eMule/GeoIPMaxMindLicense", s_GeoIPMaxMindLicense, ""));
+	s_MiscList.push_back(new Cfg_Str("/eMule/GeoIPCustomUrl", s_GeoIPCustomUrl, ""));
+	s_MiscList.push_back(new Cfg_Bool("/eMule/GeoIPAutoUpdate", s_GeoIPAutoUpdate, true));
 
 	// Drop the v3.0.x-WIP /eMule/GeoIPMaxMindAccount key if a previous
-	// fork build wrote one — never released, kept only to avoid clutter.
+	// fork build wrote one -- never released, kept only to avoid clutter.
 	wxConfigBase::Get()->DeleteEntry("/eMule/GeoIPMaxMindAccount");
 
-	// Legacy single-URL setting — preserved on disk for the one-shot
-	// migration that runs from LoadPreferences(); after that the value is
-	// surfaced as Custom URL in the new UI (with source forced to
-	// "custom" so the user's URL isn't silently dropped).
-	s_MiscList.push_back( new Cfg_Str(  "/eMule/GeoLiteCountryUpdateUrl",	s_GeoIPUpdateUrl, "" ) );
+	// Legacy single-URL setting -- preserved on disk for the one-shot migration that runs
+	// from LoadPreferences(); after that the value is surfaced as Custom URL in the new UI
+	// (with source forced to "custom" so the user's URL is not silently dropped).
+	s_MiscList.push_back(new Cfg_Str("/eMule/GeoLiteCountryUpdateUrl", s_GeoIPUpdateUrl, ""));
 	wxConfigBase::Get()->DeleteEntry("/eMule/GeoIPUpdateUrl"); // get rid of the old one for a while
 
-	s_MiscList.push_back( new Cfg_Str( "/WebServer/Path",				s_sWebPath, "amuleweb" ) );
+	s_MiscList.push_back(new Cfg_Str("/WebServer/Path", s_sWebPath, "amuleweb"));
+	s_MiscList.push_back(new Cfg_Str("/AmuleApi/Path", s_sAmuleApiPath, "amuleapi"));
 
-	s_MiscList.push_back( new Cfg_Str( "/eMule/StatsServerName",		s_StatsServerName,	"Shorty's ED2K stats" ) );
-	s_MiscList.push_back( new Cfg_Str( "/eMule/StatsServerURL",		s_StatsServerURL,	"https://ed2k.shortypower.org/?hash=" ) );
+	s_MiscList.push_back(new Cfg_Str("/eMule/StatsServerName", s_StatsServerName, "Shorty's ED2K stats"));
+	s_MiscList.push_back(new Cfg_Str(
+		"/eMule/StatsServerURL", s_StatsServerURL, "https://ed2k.shortypower.org/?hash="));
 
-	s_MiscList.push_back( new Cfg_Bool( "/ExternalConnect/TransmitOnlyUploadingClients",	s_TransmitOnlyUploadingClients, false ) );
-	s_MiscList.push_back( new Cfg_Bool( "/eMule/CreateSparseFiles",		s_createFilesSparse, true ) );
+	s_MiscList.push_back(new Cfg_Bool(
+		"/ExternalConnect/TransmitOnlyUploadingClients", s_TransmitOnlyUploadingClients, false));
 
 #ifndef AMULE_DAEMON
 	// Colors have been moved from global prefs to CStatisticsDlg
-	for ( int i = 0; i < cntStatColors; i++ ) {
+	for (int i = 0; i < cntStatColors; i++) {
 		wxString str = CFormat("/eMule/StatColor%i") % i;
-		s_MiscList.push_back( new Cfg_Colour( str, CStatisticsDlg::acrStati ) );
+		s_MiscList.push_back(new Cfg_Colour(str, CStatisticsDlg::acrStati));
 	}
 #endif
 
 	// User events
 	for (unsigned int i = 0; i < CUserEvents::GetCount(); ++i) {
-		// We can't use NewCfgItem here, because we need to find these items
-		// later, which would be impossible in amuled with NewCfgItem.
-		// The IDs we assign here are high enough to not cause any collision
-		// even on the daemon.
-		s_CfgListUSEREVENTS_FIRST_ID + i * USEREVENTS_IDS_PER_EVENT + 1 = new Cfg_Bool("/UserEvents/" + CUserEvents::GetKey(i) + "/CoreEnabled", CUserEvents::GetCoreEnableVar(i), false);
-		s_CfgListUSEREVENTS_FIRST_ID + i * USEREVENTS_IDS_PER_EVENT + 2 = new Cfg_Str("/UserEvents/" + CUserEvents::GetKey(i) + "/CoreCommand", CUserEvents::GetCoreCommandVar(i), "");
-		s_CfgListUSEREVENTS_FIRST_ID + i * USEREVENTS_IDS_PER_EVENT + 3 = new Cfg_Bool("/UserEvents/" + CUserEvents::GetKey(i) + "/GUIEnabled", CUserEvents::GetGUIEnableVar(i), false);
-		s_CfgListUSEREVENTS_FIRST_ID + i * USEREVENTS_IDS_PER_EVENT + 4 = new Cfg_Str("/UserEvents/" + CUserEvents::GetKey(i) + "/GUICommand", CUserEvents::GetGUICommandVar(i), "");
+		// NewCfgItem cannot be used here, because these items have to be findable later,
+		// which it would make impossible in amuled. The IDs assigned here are high enough
+		// not to collide even on the daemon.
+		s_CfgListUSEREVENTS_FIRST_ID + i * USEREVENTS_IDS_PER_EVENT + 1 =
+			new Cfg_Bool("/UserEvents/" + CUserEvents::GetKey(i) + "/CoreEnabled",
+				CUserEvents::GetCoreEnableVar(i),
+				false);
+		s_CfgListUSEREVENTS_FIRST_ID + i * USEREVENTS_IDS_PER_EVENT + 2 =
+			new Cfg_Str("/UserEvents/" + CUserEvents::GetKey(i) + "/CoreCommand",
+				CUserEvents::GetCoreCommandVar(i),
+				"");
+		s_CfgListUSEREVENTS_FIRST_ID + i * USEREVENTS_IDS_PER_EVENT + 3 =
+			new Cfg_Bool("/UserEvents/" + CUserEvents::GetKey(i) + "/GUIEnabled",
+				CUserEvents::GetGUIEnableVar(i),
+				false);
+		s_CfgListUSEREVENTS_FIRST_ID + i * USEREVENTS_IDS_PER_EVENT + 4 =
+			new Cfg_Str("/UserEvents/" + CUserEvents::GetKey(i) + "/GUICommand",
+				CUserEvents::GetGUICommandVar(i),
+				"");
 	}
 }
 
-
 void CPreferences::EraseItemList()
 {
-	while ( s_CfgList.begin() != s_CfgList.end() ) {
+	while (s_CfgList.begin() != s_CfgList.end()) {
 		delete s_CfgList.begin()->second;
-		s_CfgList.erase( s_CfgList.begin() );
+		s_CfgList.erase(s_CfgList.begin());
 	}
 
 	CFGList::iterator it = s_MiscList.begin();
-	for ( ; it != s_MiscList.end();  ) {
+	for (; it != s_MiscList.end();) {
 		delete *it;
-		it = s_MiscList.erase( it );
+		it = s_MiscList.erase(it);
 	}
 }
 
-
-void CPreferences::LoadAllItems(wxConfigBase* cfg)
+void CPreferences::LoadAllItems(wxConfigBase *cfg)
 {
 #ifndef CLIENT_GUI
 	// Preserve values from old config. The global config object may not be set yet
@@ -1477,24 +1553,42 @@
 		bool ExecOnCompletion;
 		cfg->Read("/eMule/ExecOnCompletion", &ExecOnCompletion, false);
 		// Assign to core command, that's the most likely it was.
-		static_cast<Cfg_Bool*>(s_CfgListUSEREVENTS_FIRST_ID + CUserEvents::DownloadCompleted * USEREVENTS_IDS_PER_EVENT + 1)->SetDefault(ExecOnCompletion);
+		static_cast<Cfg_Bool *>(
+			s_CfgListUSEREVENTS_FIRST_ID +
+				  CUserEvents::DownloadCompleted * USEREVENTS_IDS_PER_EVENT + 1)
+			->SetDefault(ExecOnCompletion);
 		cfg->DeleteEntry("/eMule/ExecOnCompletion");
 	}
 	if (cfg->HasEntry("/eMule/ExecOnCompletionCommand")) {
 		wxString ExecOnCompletionCommand;
 		cfg->Read("/eMule/ExecOnCompletionCommand", &ExecOnCompletionCommand, "");
-		static_cast<Cfg_Str*>(s_CfgListUSEREVENTS_FIRST_ID + CUserEvents::DownloadCompleted * USEREVENTS_IDS_PER_EVENT + 2)->SetDefault(ExecOnCompletionCommand);
+		static_cast<Cfg_Str *>(
+			s_CfgListUSEREVENTS_FIRST_ID +
+				  CUserEvents::DownloadCompleted * USEREVENTS_IDS_PER_EVENT + 2)
+			->SetDefault(ExecOnCompletionCommand);
 		cfg->DeleteEntry("/eMule/ExecOnCompletionCommand");
 	}
 #endif
 	CFGMap::iterator it_a = s_CfgList.begin();
-	for ( ; it_a != s_CfgList.end(); ++it_a ) {
-		it_a->second->LoadFromFile( cfg );
+	for (; it_a != s_CfgList.end(); ++it_a) {
+		it_a->second->LoadFromFile(cfg);
 	}
 
 	CFGList::iterator it_b = s_MiscList.begin();
-	for ( ; it_b != s_MiscList.end(); ++it_b ) {
-		(*it_b)->LoadFromFile( cfg );
+	for (; it_b != s_MiscList.end(); ++it_b) {
+		(*it_b)->LoadFromFile(cfg);
+	}
+
+	// Drop the amuleapi credential digests an early 3.1.0 development build wrote here.
+	// They are no longer read -- amuleapi-passwords is the only store -- and an unsalted MD5
+	// left behind in amule.conf is worth removing rather than leaving to rot. Nothing to
+	// migrate: the digests cannot be converted into the stretched form without the password,
+	// so the operator sets the password once more.
+	if (cfg->HasEntry("/AmuleApi/Password")) {
+		cfg->DeleteEntry("/AmuleApi/Password");
+	}
+	if (cfg->HasEntry("/AmuleApi/GuestPassword")) {
+		cfg->DeleteEntry("/AmuleApi/GuestPassword");
 	}
 
 	// Preserve old value of UDPDisable
@@ -1519,13 +1613,13 @@
 	// Load debug-categories
 	int count = theLogger.GetDebugCategoryCount();
 
-	for ( int i = 0; i < count; i++ ) {
-		const CDebugCategory& cat = theLogger.GetDebugCategory( i );
+	for (int i = 0; i < count; i++) {
+		const CDebugCategory &cat = theLogger.GetDebugCategory(i);
 
 		bool enabled = false;
-		cfg->Read( "/Debug/Cat_" + cat.GetName(), &enabled );
+		cfg->Read("/Debug/Cat_" + cat.GetName(), &enabled);
 
-		theLogger.SetEnabled( cat.GetType(), enabled );
+		theLogger.SetEnabled(cat.GetType(), enabled);
 	}
 #endif
 
@@ -1537,37 +1631,74 @@
 		s_byCryptTCPPaddingLength = GetRandomUint8() % 254;
 	}
 	SetSlotAllocation(s_slotallocation);
+
+	// One-time bump of the raised MaxConnectionsPerFiveSeconds default (20 -> 50). An
+	// existing config holds the old default and would never pick up the new one. The marker
+	// makes this run exactly once, and the == 20 guard means a value the user set (including
+	// a deliberate 20 after this upgrade) is left alone.
+	//
+	// The value is written straight into cfg alongside the marker, not just into the
+	// s_MaxConperFive static: amuled never calls Save()/SaveAllItems, so a static-only bump
+	// is lost on exit while the explicitly-written marker persists -- which on the next boot
+	// suppresses the re-run and reverts the value to the un-bumped 20.
+	if (!cfg->HasEntry("/eMule/MaxConPerFiveDefaultBumped")) {
+		if (s_MaxConperFive == 20) {
+			s_MaxConperFive = 50;
+			cfg->Write("/eMule/MaxConnectionsPerFiveSeconds", (long)s_MaxConperFive);
+		}
+		cfg->Write("/eMule/MaxConPerFiveDefaultBumped", true);
+	}
+
+	// Keep the source-search knobs within their supported ranges even if amule.conf was
+	// hand-edited. SourceReaskMinutes must stay >= 15 so the UDP reask (issued at getter -
+	// 20s) never drops below the ~10 min floor that gets clients auto-banned for reask spam.
+	if (s_kadMaxSourceSearches < 5) {
+		s_kadMaxSourceSearches = 5;
+	} else if (s_kadMaxSourceSearches > 50) {
+		s_kadMaxSourceSearches = 50;
+	}
+	if (s_kadSourceReaskMins < 30) {
+		s_kadSourceReaskMins = 30;
+	} else if (s_kadSourceReaskMins > 60) {
+		s_kadSourceReaskMins = 60;
+	}
+	if (s_sourceReaskMins < 15) {
+		s_sourceReaskMins = 15;
+	} else if (s_sourceReaskMins > 60) {
+		s_sourceReaskMins = 60;
+	}
 #endif
-}
 
+	// Compile the shared-file exclusion filter from the values just loaded.
+	RecompileShareExcludeFilter();
+}
 
-void CPreferences::SaveAllItems(wxConfigBase* cfg)
+void CPreferences::SaveAllItems(wxConfigBase *cfg)
 {
 	// Save the Cfg values
 	CFGMap::iterator it_a = s_CfgList.begin();
-	for ( ; it_a != s_CfgList.end(); ++it_a )
-		it_a->second->SaveToFile( cfg );
+	for (; it_a != s_CfgList.end(); ++it_a)
+		it_a->second->SaveToFile(cfg);
 
 	CFGList::iterator it_b = s_MiscList.begin();
-	for ( ; it_b != s_MiscList.end(); ++it_b )
-		(*it_b)->SaveToFile( cfg );
-
+	for (; it_b != s_MiscList.end(); ++it_b)
+		(*it_b)->SaveToFile(cfg);
 
 // Save debug-categories
 #ifdef __DEBUG__
 	int count = theLogger.GetDebugCategoryCount();
 
-	for ( int i = 0; i < count; i++ ) {
-		const CDebugCategory& cat = theLogger.GetDebugCategory( i );
+	for (int i = 0; i < count; i++) {
+		const CDebugCategory &cat = theLogger.GetDebugCategory(i);
 
-		cfg->Write( "/Debug/Cat_" + cat.GetName(), cat.IsEnabled() );
+		cfg->Write("/Debug/Cat_" + cat.GetName(), cat.IsEnabled());
 	}
 #endif
 }
 
 void CPreferences::SetMaxUpload(uint32 in)
 {
-	if ( s_maxupload != in ) {
+	if (s_maxupload != in) {
 		s_maxupload = in;
 
 		// Ensure that the ratio is upheld
@@ -1575,10 +1706,9 @@
 	}
 }
 
-
 void CPreferences::SetMaxDownload(uint32 in)
 {
-	if ( s_maxdownload != in ) {
+	if (s_maxdownload != in) {
 		s_maxdownload = in;
 
 		// Ensure that the ratio is upheld
@@ -1586,43 +1716,40 @@
 	}
 }
 
-
 void CPreferences::UnsetAutoServerStart()
 {
 	s_autoserverlist = false;
 }
 
-
-// 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
+// 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 are
+// 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()
 {
 	// Backwards compatibility
-	if ( s_maxupload == 0xFFFF )
+	if (s_maxupload == 0xFFFF)
 		s_maxupload = UNLIMITED;
 
 	// Backwards compatibility
-	if ( s_maxdownload == 0xFFFF )
+	if (s_maxdownload == 0xFFFF)
 		s_maxdownload = UNLIMITED;
 
-	if ( s_maxupload == UNLIMITED )
+	if (s_maxupload == UNLIMITED)
 		return;
 
 	// Enforce the limits
-	if ( s_maxupload < 4  ) {
-		if ( ( s_maxupload * 3 < s_maxdownload ) || ( s_maxdownload == 0 ) )
-			s_maxdownload = s_maxupload * 3 ;
-	} else if ( s_maxupload < 10  ) {
-		if ( ( s_maxupload * 4 < s_maxdownload ) || ( s_maxdownload == 0 ) )
+	if (s_maxupload < 4) {
+		if ((s_maxupload * 3 < s_maxdownload) || (s_maxdownload == 0))
+			s_maxdownload = s_maxupload * 3;
+	} else if (s_maxupload < 10) {
+		if ((s_maxupload * 4 < s_maxdownload) || (s_maxdownload == 0))
 			s_maxdownload = s_maxupload * 4;
 	}
 }
 
-
 void CPreferences::Save()
 {
 	wxString fullpath(s_configDir + "preferences.dat");
@@ -1636,7 +1763,8 @@
 		try {
 			preffile.WriteUInt8(PREFFILE_VERSION);
 			preffile.WriteHash(s_userhash);
-		} catch (const CIOFailureException& e) {
+			preffile.Close();
+		} catch (const CIOFailureException &e) {
 			AddDebugLogLineC(logGeneral, "IO failure while saving user-hash: " + e.what());
 		}
 	}
@@ -1644,20 +1772,31 @@
 	SavePreferences();
 
 	SaveSharedFolders();
-}
 
+	// GUI-local only, see SavePathMappings' declaration -- a no-op body on a non-CLIENT_GUI
+	// build, called here for the same reason SaveSharedFolders is: PrefsUnifiedDlg::OnOk()
+	// harvests the dialog's edits into glob_prefs before calling Save(), so a successful
+	// commit lands here alongside the rest.
+	SavePathMappings();
+
+	// Apply a possibly-changed MMapEnabled immediately (local prefs dialog or a remote EC
+	// set that routes through Save()); safe to flip with active transfers -- see
+	// CFileArea::SetMMapEnabled. Core/daemon only; the remote GUI does not link CFileArea.
+#ifndef CLIENT_GUI
+	CFileArea::SetMMapEnabled(s_mmapEnabled);
+#endif
+}
 
 void CPreferences::SaveSharedFolders()
 {
-	#ifndef CLIENT_GUI
-	// Canonical sources of truth: shareddir-explicit.dat (user-added
-	// non-recursive roots) and shareddir-recursive.dat (user-marked
-	// recursive roots). Older versions of aMule know nothing about
-	// these two files -- they only read shareddir.dat -- so we also
-	// regenerate shareddir.dat as the runtime union for backwards
-	// compatibility with both older binaries and external scripts
-	// (e.g. Docker entrypoints) that read or write it directly.
-	auto writeList = (const wxString & filename, const PathList & list) {
+#ifndef CLIENT_GUI
+	// Canonical sources of truth: shareddir-explicit.dat (user-added non-recursive roots)
+	// and shareddir-recursive.dat (user-marked recursive roots). Older versions of aMule
+	// know nothing about these two files -- they only read shareddir.dat -- so we also
+	// regenerate shareddir.dat as the runtime union for backwards compatibility with both
+	// older binaries and external scripts (e.g. Docker entrypoints) that read or write it
+	// directly.
+	auto writeList = (const wxString &filename, const PathList &list) {
 		CTextFile f;
 		if (f.Open(filename, CTextFile::write)) {
 			for (size_t i = 0; i < list.size(); ++i) {
@@ -1668,27 +1807,25 @@
 	writeList(s_configDir + "shareddir-explicit.dat", shareddir_explicit_list);
 	writeList(s_configDir + "shareddir-recursive.dat", shareddir_recursive_list);
 	writeList(s_configDir + "shareddir.dat", shareddir_list);
-	#endif
+#endif
 }
 
-
 CPreferences::~CPreferences()
 {
 	DeleteContents(m_CatList);
 }
 
-
 int32 CPreferences::GetRecommendedMaxConnections()
 {
 #ifndef CLIENT_GUI
 	int iRealMax = PlatformSpecific::GetMaxConnections();
-	if(iRealMax == -1 || iRealMax > 520) {
+	if (iRealMax == -1 || iRealMax > 520) {
 		return 500;
 	}
-	if(iRealMax < 20) {
+	if (iRealMax < 20) {
 		return iRealMax;
 	}
-	if(iRealMax <= 256) {
+	if (iRealMax <= 256) {
 		return iRealMax - 10;
 	}
 	return iRealMax - 20;
@@ -1697,131 +1834,278 @@
 #endif
 }
 
-
 void CPreferences::SavePreferences()
 {
-	wxConfigBase* cfg = wxConfigBase::Get();
+	wxConfigBase *cfg = wxConfigBase::Get();
 
-	cfg->Write( "/eMule/AppVersion", VERSION );
+	cfg->Write("/eMule/AppVersion", VERSION);
 
 	// Save the options
-	SaveAllItems( cfg );
+	SaveAllItems(cfg);
 
 	// Ensure that the changes are saved to disk.
 	cfg->Flush();
-}
 
+	// On a fresh install the file did not exist when the startup pass ran, so wxFileConfig
+	// has only just created it -- with whatever the umask allows, which on Debian and Ubuntu
+	// is group-writable. Tighten it here, once it exists. Cheap to repeat: RestrictToOwner
+	// stats first and does nothing when the mode is already owner-only, which it stays,
+	// because wxFileConfig carries the mode across the replace it does on every later save.
+	// theApp->m_configFile, not a literal: this file is compiled into amulegui too, where
+	// the config is remote.conf. Hardcoding "amule.conf" here left a fresh amulegui
+	// install's remote.conf at the umask default until its next start.
+	const wxString &configFile = theApp->m_configFile;
+	RestrictToOwner(CPath(GetConfigDir() + configFile));
+	RestrictToOwner(CPath(GetConfigDir() + configFile + ".bak"));
+}
 
 void CPreferences::SaveCats()
 {
-	if ( GetCatCount() ) {
-		wxConfigBase* cfg = wxConfigBase::Get();
+	if (GetCatCount()) {
+		wxConfigBase *cfg = wxConfigBase::Get();
 
 		// Save the main cat.
-		cfg->Write( "/eMule/AllcatType", (int)s_allcatFilter);
+		cfg->Write("/eMule/AllcatType", (int)s_allcatFilter);
 
 		// The first category is the default one and should not be counted
 
-		cfg->Write( "/General/Count", (long)(m_CatList.size() - 1) );
+		cfg->Write("/General/Count", (long)(m_CatList.size() - 1));
 
 		uint32 maxcat = m_CatList.size();
 		for (uint32 i = 1; i < maxcat; i++) {
 			cfg->SetPath(CFormat("/Cat#%i") % i);
 
-			cfg->Write( "Title",	m_CatListi->title );
-			cfg->Write( "Incoming",	CPath::ToUniv(m_CatListi->path) );
-			cfg->Write( "Comment",	m_CatListi->comment );
-			cfg->Write( "Color",	wxString(CFormat("%u") % m_CatListi->color));
-			cfg->Write( "Priority",	(int)m_CatListi->prio );
+			cfg->Write("Title", m_CatListi->title);
+			cfg->Write("Incoming", CPath::ToUniv(m_CatListi->path));
+			cfg->Write("Comment", m_CatListi->comment);
+			cfg->Write("Color", wxString(CFormat("%u") % m_CatListi->color));
+			cfg->Write("Priority", (int)m_CatListi->prio);
 		}
 		// remove deleted cats from config
-		while (cfg->DeleteGroup(CFormat("/Cat#%i") % maxcat++)) {}
+		while (cfg->DeleteGroup(CFormat("/Cat#%i") % maxcat++)) {
+		}
 
 		cfg->Flush();
 	}
 }
 
+void CPreferences::SavePathMappings()
+{
+#ifdef CLIENT_GUI
+	wxConfigBase *cfg = wxConfigBase::Get();
+
+	cfg->Write("/PathMappings/Count", (long)m_pathMappings.size());
+
+	for (size_t i = 0; i < m_pathMappings.size(); ++i) {
+		cfg->SetPath(CFormat("/PathMapping#%zu") % (i + 1));
+		cfg->Write("Remote", m_pathMappingsi.remotePrefix);
+		cfg->Write("Local", CPath::ToUniv(m_pathMappingsi.localPrefix));
+	}
+	// Remove any rows left over from a longer list on a previous save.
+	size_t stale = m_pathMappings.size() + 1;
+	while (cfg->DeleteGroup(CFormat("/PathMapping#%zu") % stale++)) {
+	}
+
+	cfg->Flush();
+#endif
+}
+
+void CPreferences::LoadPathMappings()
+{
+#ifdef CLIENT_GUI
+	wxConfigBase *cfg = wxConfigBase::Get();
+
+	m_pathMappings.clear();
+	const long count = cfg->Read("/PathMappings/Count", 0l);
+	for (long i = 1; i <= count; ++i) {
+		cfg->SetPath(CFormat("/PathMapping#%li") % i);
+
+		PathMapping mapping;
+		// Stripped here too, not just at entry (OnPathMappingAdd): an existing config saved
+		// before this fix, or one hand-edited, can still carry a trailing separator, and
+		// CPath's constructor does not strip one -- see ApplyPathMapping()'s substitution.
+		mapping.remotePrefix = TrimRemotePrefix(cfg->Read("Remote", ""));
+		mapping.localPrefix = CPath(StripSeparators(
+			CPath::FromUniv(cfg->Read("Local", "")).GetRaw(), wxString::trailing));
+
+		if (mapping.remotePrefix.IsEmpty() || !mapping.localPrefix.IsOk()) {
+			AddLogLineN(_("Invalid path mapping found, skipping"));
+			continue;
+		}
+		m_pathMappings.push_back(mapping);
+	}
+#endif
+}
+
+wxString CPreferences::TrimRemotePrefix(const wxString &prefix)
+{
+	wxString trimmed = prefix;
+	while (!trimmed.IsEmpty()) {
+		const wxChar last = trimmed.Last();
+		if (last != wxT('/') && last != wxT('\\')) {
+			break;
+		}
+		trimmed.RemoveLast();
+	}
+	return trimmed;
+}
+
+wxString CPreferences::ApplyPathMapping(const wxString &remotePath) const
+{
+#ifdef CLIENT_GUI
+	for (const PathMapping &mapping : m_pathMappings) {
+		if (mapping.remotePrefix.IsEmpty() || !remotePath.StartsWith(mapping.remotePrefix)) {
+			continue;
+		}
+		const size_t prefixLen = mapping.remotePrefix.length();
+		if (remotePath.length() > prefixLen) {
+			// A bare StartsWith() also matches "/mnt/data-old/f" against a "/mnt/data"
+			// mapping. The daemon's OS is not known here, so accept either separator
+			// convention rather than assuming one.
+			const wxChar next = remotePathprefixLen;
+			if (next != wxT('/') && next != wxT('\\')) {
+				continue;
+			}
+		}
+		wxString mapped = mapping.localPrefix.GetRaw() + remotePath.Mid(prefixLen);
+#ifdef __WINDOWS__
+		// The remainder is the daemon's, in the daemon's convention, so a POSIX daemon
+		// contributes '/' to a path that is about to be handed to Win32. Most of Win32
+		// accepts that, but not all of it -- the "explorer /select," this feature exists to
+		// make work is the awkward one -- so normalise. Safe in this direction only: '/'
+		// cannot appear in a Windows filename, whereas '\\' is a perfectly ordinary character
+		// in a POSIX one, so the mirror rewrite would corrupt names rather than fix
+		// separators.
+		mapped.Replace("/", "\\");
+#endif
+		return mapped;
+	}
+#endif
+	return remotePath;
+}
+
+// 2.3.x's default GeoLiteCountryUpdateUrl was .../GeoLiteCountry/GeoIP.dat.gz:
+// a legacy libGeoIP database the MaxMindDB reader can never parse.
+static bool IsLegacyGeoIPDatUrl(const wxString &url)
+{
+	wxString path = url.BeforeFirst('?').BeforeFirst('#').Lower();
+	while (path.EndsWith(".gz") || path.EndsWith(".bz2") || path.EndsWith(".zip") ||
+		path.EndsWith(".tar")) {
+		path = path.BeforeLast('.');
+	}
+	return path.EndsWith(".dat");
+}
 
 void CPreferences::LoadPreferences()
 {
 	LoadCats();
 
-	// One-shot migration of the v2.x GeoLiteCountryUpdateUrl into the new
-	// three-source model. Triggers only when the user had a non-empty URL
-	// configured *and* hasn't yet touched the new GeoIPSource selector
-	// (which defaults to "dbip"). The URL becomes the Custom URL and the
-	// source flips to "custom" so the user's setting carries forward.
+	// One-shot migration of the v2.x GeoLiteCountryUpdateUrl into the new three-source
+	// model. Triggers only when the user had a non-empty URL configured *and* has not yet
+	// touched the new GeoIPSource selector (which defaults to "dbip"). The URL becomes the
+	// Custom URL and the source flips to "custom" so the user's setting carries forward.
 	// Subsequent loads see GeoIPSource == "custom" and skip the migration.
 	if (!s_GeoIPUpdateUrl.IsEmpty() && s_GeoIPSource == "dbip" && s_GeoIPCustomUrl.IsEmpty()) {
 		s_GeoIPCustomUrl = s_GeoIPUpdateUrl;
-		s_GeoIPSource    = "custom";
+		s_GeoIPSource = "custom";
 		s_GeoIPUpdateUrl.clear();
 	}
-}
 
+	// 3.0.1 shipped that migration without this guard, so 2.3.x configs landed on an
+	// unreadable Custom source with no way back -- GeoIPSource == "custom" skips the
+	// migration forever. Repair those too, not just the one migrating right now.
+	if (s_GeoIPSource == "custom" && IsLegacyGeoIPDatUrl(s_GeoIPCustomUrl)) {
+		s_GeoIPCustomUrl.clear();
+		s_GeoIPSource = "dbip";
+		// The recorded provenance points at a file we are about to discard;
+		// empty just means "no attribution", which the status line handles.
+		s_GeoIPLoadedSource.clear();
+	}
+
+	// Push the loaded MMapEnabled value into CFileArea (no-op where mmap is not compiled
+	// in). Also happens after every Save(), so preference changes -- local dialog or
+	// remote-set over EC -- take effect on the next block. Only the core/daemon owns file
+	// I/O; the remote GUI (CLIENT_GUI) ships the preference to the daemon over EC and never
+	// links CFileArea. The core also knows its own mmap capability at compile time; the
+	// remote GUI learns it from the daemon's EC preferences response (see CEC_Prefs_Packet).
+#ifndef CLIENT_GUI
+#ifdef MMAP_SUPPORTED
+	s_mmapSupported = true;
+#else
+	s_mmapSupported = false;
+#endif
+	CFileArea::SetMMapEnabled(s_mmapEnabled);
+#endif
+}
 
 CPreferences::GeoIPSource CPreferences::GetGeoIPSource()
 {
-	if (s_GeoIPSource == "maxmind") return GeoIPSourceMaxMind;
-	if (s_GeoIPSource == "custom")  return GeoIPSourceCustom;
+	if (s_GeoIPSource == "maxmind")
+		return GeoIPSourceMaxMind;
+	if (s_GeoIPSource == "custom")
+		return GeoIPSourceCustom;
 	return GeoIPSourceDBIP;
 }
 
-
 void CPreferences::SetGeoIPSource(GeoIPSource v)
 {
 	switch (v) {
-	case GeoIPSourceMaxMind: s_GeoIPSource = "maxmind"; break;
-	case GeoIPSourceCustom:  s_GeoIPSource = "custom";  break;
+	case GeoIPSourceMaxMind:
+		s_GeoIPSource = "maxmind";
+		break;
+	case GeoIPSourceCustom:
+		s_GeoIPSource = "custom";
+		break;
 	case GeoIPSourceDBIP:
-	default:                 s_GeoIPSource = "dbip";    break;
+	default:
+		s_GeoIPSource = "dbip";
+		break;
 	}
 }
 
-
 void CPreferences::SetGeoIPLoadedSource(GeoIPSource v)
 {
 	switch (v) {
-	case GeoIPSourceMaxMind: s_GeoIPLoadedSource = "maxmind"; break;
-	case GeoIPSourceCustom:  s_GeoIPLoadedSource = "custom";  break;
+	case GeoIPSourceMaxMind:
+		s_GeoIPLoadedSource = "maxmind";
+		break;
+	case GeoIPSourceCustom:
+		s_GeoIPLoadedSource = "custom";
+		break;
 	case GeoIPSourceDBIP:
-	default:                 s_GeoIPLoadedSource = "dbip";    break;
+	default:
+		s_GeoIPLoadedSource = "dbip";
+		break;
 	}
 }
 
-
 wxString CPreferences::GetGeoIPResolvedDownloadUrl(int monthOffset)
 {
 	switch (GetGeoIPSource()) {
 	case GeoIPSourceDBIP: {
-		// DB-IP publishes a fresh dataset per calendar month at a
-		// predictable URL. Substitute YYYY-MM at request time;
-		// monthOffset lets the caller retry the previous month when
-		// the new month's file hasn't published yet (commonly the
-		// first few days after a month boundary). DB-IP retains the
-		// previous month's file at the same URL scheme so the
-		// fallback resolves cleanly.
+		// DB-IP publishes a fresh dataset per calendar month at a predictable URL. Substitute
+		// YYYY-MM at request time; monthOffset lets the caller retry the previous month when
+		// the new month's file has not published yet (commonly the first few days after a
+		// month boundary). DB-IP retains the previous month's file at the same URL scheme so
+		// the fallback resolves cleanly.
 		wxDateTime when = wxDateTime::Now();
 		if (monthOffset != 0) {
 			when = wxDateTime::Now() + wxDateSpan::Months(monthOffset);
 		}
-		return wxString::Format(
-			"https://download.db-ip.com/free/dbip-country-lite-%04d-%02d.mmdb.gz",
-			when.GetYear(), when.GetMonth() + 1);
+		return wxString::Format("https://download.db-ip.com/free/dbip-country-lite-%04d-%02d.mmdb.gz",
+			when.GetYear(),
+			when.GetMonth() + 1);
 	}
 	case GeoIPSourceMaxMind: {
-		// License-key-only URL form. MaxMind also publishes a
-		// basic-auth URL that pairs the License Key with an Account
-		// ID, but the License Key alone is sufficient for the public
-		// GeoLite2 endpoint, so we keep the UX to a single field.
-		// Users who specifically need the basic-auth form can fall
-		// back to Custom URL.
+		// License-key-only URL form. MaxMind also publishes a basic-auth URL that pairs the
+		// License Key with an Account ID, but the License Key alone is sufficient for the
+		// public GeoLite2 endpoint, so the UX stays a single field. Users who specifically
+		// need the basic-auth form can fall back to Custom URL.
 		if (s_GeoIPMaxMindLicense.IsEmpty()) {
 			return wxEmptyString;
 		}
-		return wxString::Format(
-			"https://download.maxmind.com/app/geoip_download"
-			"?edition_id=GeoLite2-Country&license_key=%s&suffix=tar.gz",
+		return wxString::Format("https://download.maxmind.com/app/geoip_download"
+					"?edition_id=GeoLite2-Country&license_key=%s&suffix=tar.gz",
 			s_GeoIPMaxMindLicense);
 	}
 	case GeoIPSourceCustom:
@@ -1830,38 +2114,37 @@
 	return wxEmptyString;
 }
 
-
 void CPreferences::LoadCats()
 {
 	// default cat ... Meow! =(^.^)=
-	Category_Struct* defaultcat = new Category_Struct;
+	Category_Struct *defaultcat = new Category_Struct;
 	defaultcat->prio = 0;
 	defaultcat->color = 0;
 
-	AddCat( defaultcat );
+	AddCat(defaultcat);
 
-	wxConfigBase* cfg = wxConfigBase::Get();
+	wxConfigBase *cfg = wxConfigBase::Get();
 
-	long max = cfg->Read( "/General/Count", 0l );
+	long max = cfg->Read("/General/Count", 0l);
 
-	for ( int i = 1; i <= max ; i++ ) {
+	for (int i = 1; i <= max; i++) {
 		cfg->SetPath(CFormat("/Cat#%i") % i);
 
-		Category_Struct* newcat = new Category_Struct;
+		Category_Struct *newcat = new Category_Struct;
 
-		newcat->title = cfg->Read( "Title", "" );
-		newcat->path  = CPath::FromUniv(cfg->Read("Incoming", ""));
+		newcat->title = cfg->Read("Title", "");
+		newcat->path = CPath::FromUniv(cfg->Read("Incoming", ""));
 
 		// Some sanity checking
-		if ( newcat->title.IsEmpty() || !newcat->path.IsOk() ) {
+		if (newcat->title.IsEmpty() || !newcat->path.IsOk()) {
 			AddLogLineN(_("Invalid category found, skipping"));
 
 			delete newcat;
 			continue;
 		}
 
-		newcat->comment = cfg->Read( "Comment", "" );
-		newcat->prio = cfg->Read( "Priority", 0l );
+		newcat->comment = cfg->Read("Comment", "");
+		newcat->prio = cfg->Read("Priority", 0l);
 		newcat->color = StrToULong(cfg->Read("Color", "0"));
 
 		AddCat(newcat);
@@ -1872,87 +2155,85 @@
 	}
 }
 
-
 uint16 CPreferences::GetDefaultMaxConperFive()
 {
 	return MAXCONPER5SEC;
 }
 
-
-uint32 CPreferences::AddCat(Category_Struct* cat)
+uint32 CPreferences::AddCat(Category_Struct *cat)
 {
-	m_CatList.push_back( cat );
+	m_CatList.push_back(cat);
 
 	return m_CatList.size() - 1;
 }
 
-
 void CPreferences::RemoveCat(size_t index)
 {
-	if ( index < m_CatList.size() ) {
+	if (index < m_CatList.size()) {
 		CatList::iterator it = m_CatList.begin() + index;
 
 		delete *it;
 
-		m_CatList.erase( it );
+		m_CatList.erase(it);
 
-		// remove cat directory from shares
-		theApp->sharedfiles->Reload();
+		// Remove the category directory from shares. Scheduled, not inline: this is reached
+		// from the EC_OP_DELETE_CATEGORY handler as well as the GUI, and an inline walk there
+		// blocks the whole EC lane.
+		theApp->sharedfiles->RequestReload();
 	}
 }
 
-
 uint32 CPreferences::GetCatCount()
 {
 	return m_CatList.size();
 }
 
-
-Category_Struct* CPreferences::GetCategory(size_t index)
+Category_Struct *CPreferences::GetCategory(size_t index)
 {
-	wxASSERT( index < m_CatList.size() );
+	wxASSERT(index < m_CatList.size());
 
 	return m_CatListindex;
 }
 
-
-const CPath& CPreferences::GetCatPath(uint8 index)
+const CPath &CPreferences::GetCatPath(uint8 index)
 {
-	wxASSERT( index < m_CatList.size() );
+	wxASSERT(index < m_CatList.size());
 
 	return m_CatListindex->path;
 }
 
-
 uint32 CPreferences::GetCatColor(size_t index)
 {
-	wxASSERT( index < m_CatList.size() );
+	wxASSERT(index < m_CatList.size());
 
 	return m_CatListindex->color;
 }
 
-bool CPreferences::CreateCategory(
-	Category_Struct *& category,
-	const wxString& name,
-	const CPath& path,
-	const wxString& comment,
+bool CPreferences::CreateCategory(Category_Struct *&category,
+	const wxString &name,
+	const CPath &path,
+	const wxString &comment,
 	uint32 color,
 	uint8 prio)
 {
 	category = new Category_Struct();
-	category->path = thePrefs::GetIncomingDir();	// set a default in case path is invalid
+	category->path = thePrefs::GetIncomingDir(); // set a default in case path is invalid
 	uint32 cat = AddCat(category);
 	return UpdateCategory(cat, name, path, comment, color, prio);
 }
 
 bool CPreferences::UpdateCategory(
-	uint8 cat,
-	const wxString& name,
-	const CPath& path,
-	const wxString& comment,
-	uint32 color,
-	uint8 prio)
+	uint8 cat, const wxString &name, const CPath &path, const wxString &comment, uint32 color, uint8 prio)
 {
+	// Backstop for the index. CreateCategory and the category dialog both pass one that is
+	// valid by construction; the EC handler does not, and its value comes straight off the
+	// wire. Returning false rather than indexing keeps an out-of-range id from reaching
+	// m_CatList, which is a std::vector -- operator past the end is undefined, and what it
+	// actually did was hand back a garbage pointer that the path comparison below
+	// dereferenced (amule-org/amule#1227). Callers already treat false as "not applied".
+	if (cat >= m_CatList.size()) {
+		return false;
+	}
 	Category_Struct *category = m_CatListcat;
 
 	// return true if path is ok, false if not
@@ -1961,28 +2242,29 @@
 		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();
+		// Path changed: reload shared files, adding files in the new path and removing those
+		// from the old. Scheduled for the same reason as the removal above --
+		// EC_OP_UPDATE_CATEGORY reaches here through CEC_Category_Tag::Apply.
+		category->path = path;
+		theApp->sharedfiles->RequestReload();
 	}
-	category->title			= name;
-	category->comment		= comment;
-	category->color			= color;
-	category->prio			= prio;
+	category->title = name;
+	category->comment = comment;
+	category->color = color;
+	category->prio = prio;
 
 	SaveCats();
 	return ret;
 }
 
-
 wxString CPreferences::GetBrowser()
 {
 	wxString cmd(s_CustomBrowser);
 #ifndef __WINDOWS__
-	if( s_BrowserTab ) {
+	if (s_BrowserTab) {
 		// This is certainly not the best way to do it, but I'm lazy
-		if (("mozilla" == cmd.Right(7)) || ("firefox" == cmd.Right(7))
-			|| ("MozillaFirebird" == cmd.Right(15))) {
+		if (("mozilla" == cmd.Right(7)) || ("firefox" == cmd.Right(7)) ||
+			("MozillaFirebird" == cmd.Right(15))) {
 			cmd += " -remote 'openURL(%s, new-tab)'";
 		}
 		if (("galeon" == cmd.Right(6)) || ("epiphany" == cmd.Right(8))) {
@@ -2035,7 +2317,7 @@
 {
 	// Warning: Check for +3, because server UDP is TCP+3
 
-	if (val +3 > 65535) {
+	if (val + 3 > 65535) {
 		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;
@@ -2044,30 +2326,25 @@
 	}
 }
 
+namespace
+{
 
-namespace {
-
-// Load one path per line from a CTextFile. Returns true if the
-// file was opened (even if empty); false if it didn't exist or
-// couldn't be opened.
+// Load one path per line from a CTextFile. Returns true if the file was opened (even if
+// empty); false if it did not exist or could not be opened.
 //
-// Every line is kept regardless of whether the path currently
-// exists on disk. Previously the loader called DirExists() and
-// dropped non-existing entries here, but ReloadSharedFolders'
-// trailing SaveSharedFolders() then persisted the post-filter
-// list back to all three on-disk files -- so one transiently
-// inaccessible directory at load time (USB unmounted, NFS
-// hiccup, permission glitch) silently destroyed the user's
+// Every line is kept regardless of whether the path currently exists on disk. The loader
+// used to call DirExists() and drop non-existing entries here, but
+// ReloadSharedFolders' trailing SaveSharedFolders() then persisted the post-filter list
+// back to all three on-disk files -- so one transiently inaccessible directory at load
+// time (USB unmounted, NFS hiccup, permission glitch) silently destroyed the user's
 // saved shared-dir configuration (#703).
 //
-// All downstream consumers of shareddir_list already handle
-// non-existing entries gracefully: AddFilesFromDirectory in
-// SharedFileList.cpp logs "Shared directory not found, skipping"
-// and returns; ExpandRecursiveRoot early-returns; the
-// SharedDirWatcher skips inaccessible roots. So keeping them in
-// the in-memory list and on disk is harmless and lets the user
-// recover automatically once the path is accessible again.
-bool LoadDirListFile(const wxString & path, CPreferences::PathList & out)
+// All downstream consumers of shareddir_list already handle non-existing entries
+// gracefully: AddFilesFromDirectory in SharedFileList.cpp logs "Shared directory not
+// found, skipping" and returns; ExpandRecursiveRoot early-returns; the SharedDirWatcher
+// skips inaccessible roots. So keeping them in the in-memory list and on disk is
+// harmless and lets the user recover automatically once the path is accessible again.
+bool LoadDirListFile(const wxString &path, CPreferences::PathList &out)
 {
 	out.clear();
 	CTextFile file;
@@ -2081,27 +2358,23 @@
 	return true;
 }
 
-// Walk `root` recursively, appending `root` itself and every
-// descendant directory to `out`. Uses CDirIterator::Dir so hidden
-// subdirs are included (matches the runtime watcher's behaviour --
-// the watcher's AddTree() visits hidden too).
-void ExpandRecursiveRoot(const CPath & root, CPreferences::PathList & out)
+// Walk `root` recursively, appending `root` itself and every descendant directory to
+// `out`. Uses CDirIterator::Dir so hidden subdirs are included, matching the runtime
+// watcher's AddTree().
+void ExpandRecursiveRoot(const CPath &root, CPreferences::PathList &out)
 {
 	if (!root.IsOk() || !root.DirExists()) {
 		return;
 	}
 	out.push_back(root);
 	CDirIterator dir(root);
-	for (CPath sub = dir.GetFirstFile(CDirIterator::Dir);
-		sub.IsOk();
-		sub = dir.GetNextFile()) {
+	for (CPath sub = dir.GetFirstFile(CDirIterator::Dir); sub.IsOk(); sub = dir.GetNextFile()) {
 		ExpandRecursiveRoot(root.JoinPaths(sub), out);
 	}
 }
 
 } // namespace
 
-
 void CPreferences::ReloadSharedFolders()
 {
 #ifndef CLIENT_GUI
@@ -2109,42 +2382,37 @@
 	shareddir_explicit_list.clear();
 	shareddir_recursive_list.clear();
 
-	const wxString explicitPath  = s_configDir + "shareddir-explicit.dat";
+	const wxString explicitPath = s_configDir + "shareddir-explicit.dat";
 	const wxString recursivePath = s_configDir + "shareddir-recursive.dat";
-	const wxString unionPath     = s_configDir + "shareddir.dat";
+	const wxString unionPath = s_configDir + "shareddir.dat";
 
-	const bool haveExplicit  = LoadDirListFile(explicitPath,  shareddir_explicit_list);
+	const bool haveExplicit = LoadDirListFile(explicitPath, shareddir_explicit_list);
 	const bool haveRecursive = LoadDirListFile(recursivePath, shareddir_recursive_list);
 
-	// Migration: an older aMule wrote only shareddir.dat. On first
-	// load with this version neither shareddir-explicit.dat nor
-	// shareddir-recursive.dat exists. Treat every existing entry in
-	// shareddir.dat as explicit (non-recursive). This is the safe
-	// default -- the watcher's auto-add-new-subdir behaviour
-	// (#591/#606) is gated on recursive ancestry, so existing users
-	// keep their current path set but stop silently auto-recursing.
-	// They opt into recursion per root via the UI tree right-click.
+	// Migration: an older aMule wrote only shareddir.dat. On first load with this version
+	// neither shareddir-explicit.dat nor shareddir-recursive.dat exists. Treat every
+	// existing entry in shareddir.dat as explicit (non-recursive). This is the safe default
+	// -- the watcher's auto-add-new-subdir behaviour (#591/#606) is gated on recursive
+	// ancestry, so existing users keep their current path set but stop silently
+	// auto-recursing. They opt into recursion per root via the UI tree right-click.
 	if (!haveExplicit && !haveRecursive) {
 		LoadDirListFile(unionPath, shareddir_explicit_list);
 	}
 
-	// Recursive expansion: for each marked root walk its subtree and
-	// collect every existing directory. This is the *runtime*
-	// expansion -- newly-created subdirs of recursive roots will be
-	// caught here on the next ReloadSharedFolders.
+	// Recursive expansion: for each marked root walk its subtree and collect every existing
+	// directory. This is the *runtime* expansion -- newly-created subdirs of recursive roots
+	// are caught here on the next ReloadSharedFolders.
 	PathList expansion;
 	for (size_t i = 0; i < shareddir_recursive_list.size(); ++i) {
 		ExpandRecursiveRoot(shareddir_recursive_listi, expansion);
 	}
 
-	// Build the expected union as a set for cheap membership tests.
-	// The set is keyed on raw path strings; we accept the macOS
-	// /tmp vs /private/tmp aliasing wart (also present in the
-	// watcher's RegisterNewSubdirectory dedup) -- a real fix needs
-	// path canonicalisation that we don't have a portable wxWidgets
-	// API for. Practical impact: rare duplicate entries on macOS
-	// where script-written shareddir.dat uses /tmp form but
-	// expansion produces /private/tmp form (or vice-versa).
+	// Build the expected union as a set for cheap membership tests. The set is keyed on raw
+	// path strings; we accept the macOS /tmp vs /private/tmp aliasing wart (also present in
+	// the watcher's RegisterNewSubdirectory dedup) -- a real fix needs path canonicalisation
+	// we have no portable wxWidgets API for. Practical impact: rare duplicate entries on
+	// macOS where a script-written shareddir.dat uses the /tmp form but expansion produces
+	// the /private/tmp form, or vice versa.
 	std::set<wxString> expected;
 	for (size_t i = 0; i < shareddir_explicit_list.size(); ++i) {
 		expected.insert(shareddir_explicit_listi.GetRaw());
@@ -2153,12 +2421,10 @@
 		expected.insert(expansioni.GetRaw());
 	}
 
-	// Reconciliation against on-disk shareddir.dat: external writers
-	// (Docker entrypoints, manual sysadmin edits, downgrade-cycle
-	// old binaries) modify shareddir.dat directly and then expect
-	// the next Reload to honour their changes. We import diffs back
-	// into shareddir_explicit_list so they survive future
-	// regenerations.
+	// Reconciliation against on-disk shareddir.dat: external writers (Docker entrypoints,
+	// manual sysadmin edits, downgrade-cycle old binaries) modify shareddir.dat directly and
+	// then expect the next Reload to honour their changes. Import diffs back into
+	// shareddir_explicit_list so they survive future regenerations.
 	PathList onDisk;
 	const bool haveUnion = LoadDirListFile(unionPath, onDisk);
 	if (haveUnion) {
@@ -2167,36 +2433,28 @@
 			actual.insert(onDiski.GetRaw());
 		}
 
-		// Entries written externally that we don't already know
-		// about → import as explicit. We can't tell whether the
-		// external writer intended them as recursive (they didn't
-		// touch shareddir-recursive.dat), so the safe default is
-		// explicit.
+		// Entries written externally that we do not already know about are imported as
+		// explicit. We cannot tell whether the external writer intended them as recursive
+		// (they did not touch shareddir-recursive.dat), so the safe default is explicit.
 		//
-		// DirExists() gate: skip on-disk entries whose directory no
-		// longer exists. Those are stale runtime-expansion remnants
-		// of recursive subdirs that have since been deleted (the
-		// watcher persisted them to shareddir.dat in a previous
-		// session). Without this gate they would be promoted to
-		// shareddir_explicit_list and re-attempted on every restart.
-		// The check is safe because shareddir-explicit/recursive.dat
-		// are loaded above without an existence filter (#703), so a
-		// temporarily-offline network share marked as explicit or
-		// recursive persists across restarts regardless.
+		// DirExists() gate: skip on-disk entries whose directory no longer exists. Those are
+		// stale runtime-expansion remnants of recursive subdirs that have since been deleted
+		// (the watcher persisted them to shareddir.dat in a previous session). Without this
+		// gate they would be promoted to shareddir_explicit_list and re-attempted on every
+		// restart. The check is safe because shareddir-explicit/recursive.dat are loaded above
+		// without an existence filter (#703), so a temporarily-offline network share marked as
+		// explicit or recursive persists across restarts regardless.
 		for (size_t i = 0; i < onDisk.size(); ++i) {
-			if (expected.find(onDiski.GetRaw()) == expected.end()
-				&& onDiski.DirExists()) {
+			if (expected.find(onDiski.GetRaw()) == expected.end() && onDiski.DirExists()) {
 				shareddir_explicit_list.push_back(onDiski);
 				expected.insert(onDiski.GetRaw());
 			}
 		}
 
-		// Entries we expected but the external writer removed →
-		// drop from the explicit list. Entries that came from
-		// `expansion` (a recursive marker) are left in place: the
-		// user's recursive intent overrides a single-entry edit
-		// they made via an old binary. If they really want a
-		// subdir excluded they need to un-mark recursive.
+		// Entries we expected but the external writer removed are dropped from the explicit
+		// list. Entries that came from `expansion` (a recursive marker) are left in place: the
+		// user's recursive intent overrides a single-entry edit they made via an old binary.
+		// To exclude a subdir they have to un-mark recursive.
 		PathList trimmedExplicit;
 		trimmedExplicit.reserve(shareddir_explicit_list.size());
 		for (size_t i = 0; i < shareddir_explicit_list.size(); ++i) {
@@ -2208,9 +2466,9 @@
 		shareddir_explicit_list.swap(trimmedExplicit);
 	}
 
-	// Final in-memory list: union of explicit and the recursive
-	// expansion, deduped. shareddir_list is what the rest of the app
-	// (share scan, watcher, etc.) reads as authoritative.
+	// Final in-memory list: union of explicit and the recursive expansion, deduped.
+	// shareddir_list is what the rest of the app (share scan, watcher, etc.) reads as
+	// authoritative.
 	std::set<wxString> seen;
 	for (size_t i = 0; i < shareddir_explicit_list.size(); ++i) {
 		const wxString key = shareddir_explicit_listi.GetRaw();
@@ -2225,15 +2483,13 @@
 		}
 	}
 
-	// Persist all three files so a crash mid-session doesn't leave
-	// reconciled state un-written, and so the union is up-to-date
-	// for any external reader.
+	// Persist all three files so a crash mid-session does not leave reconciled state
+	// un-written, and so the union is up-to-date for any external reader.
 	SaveSharedFolders();
 #endif
 }
 
-
-bool CPreferences::IsRecursiveAncestor(const CPath & path) const
+bool CPreferences::IsRecursiveAncestor(const CPath &path) const
 {
 	if (!path.IsOk()) {
 		return false;
@@ -2248,9 +2504,8 @@
 		if (target == root) {
 			return true;
 		}
-		// Prefix match with separator boundary, so /home isn't
-		// reported as an ancestor of /home2. Trailing separator on
-		// root is tolerated.
+		// Prefix match with a separator boundary, so /home is not reported as an ancestor of
+		// /home2. A trailing separator on root is tolerated.
 		const wxChar sep = wxFileName::GetPathSeparator();
 		const wxChar lastChar = root.Last();
 		if (target.length() > root.length() && target.StartsWith(root) &&
@@ -2261,21 +2516,21 @@
 	return false;
 }
 
-
-bool CPreferences::IsMessageFiltered(const wxString& message)
+bool CPreferences::IsMessageFiltered(const wxString &message)
 {
 	if (s_FilterAllMessages) {
 		return true;
 	} else {
 		if (s_FilterSomeMessages) {
-			if (s_MessageFilterString.IsSameAs("*")){
+			if (s_MessageFilterString.IsSameAs("*")) {
 				// Filter anything
 				return true;
 			} else {
-				wxStringTokenizer tokenizer( s_MessageFilterString, "," );
+				wxStringTokenizer tokenizer(s_MessageFilterString, ",");
 				while (tokenizer.HasMoreTokens()) {
-					if ( message.Lower().Trim(false).Trim(true).Contains(
-							tokenizer.GetNextToken().Lower().Trim(false).Trim(true))) {
+					if (message.Lower().Trim(false).Trim(true).Contains(
+						    tokenizer.GetNextToken().Lower().Trim(false).Trim(
+							    true))) {
 						return true;
 					}
 				}
@@ -2287,14 +2542,13 @@
 	}
 }
 
-
-bool CPreferences::IsCommentFiltered(const wxString& comment)
+bool CPreferences::IsCommentFiltered(const wxString &comment)
 {
 	if (s_FilterComments) {
-		wxStringTokenizer tokenizer( s_CommentFilterString, "," );
+		wxStringTokenizer tokenizer(s_CommentFilterString, ",");
 		while (tokenizer.HasMoreTokens()) {
-			if ( comment.Lower().Trim(false).Trim(true).Contains(
-					tokenizer.GetNextToken().Lower().Trim(false).Trim(true))) {
+			if (comment.Lower().Trim(false).Trim(true).Contains(
+				    tokenizer.GetNextToken().Lower().Trim(false).Trim(true))) {
 				return true;
 			}
 		}
@@ -2304,14 +2558,14 @@
 
 wxString CPreferences::GetLastHTTPDownloadURL(uint8 t)
 {
-	wxConfigBase* cfg = wxConfigBase::Get();
+	wxConfigBase *cfg = wxConfigBase::Get();
 	wxString key = CFormat("/HTTPDownload/URL_%d") % t;
 	return cfg->Read(key, "");
 }
 
-void CPreferences::SetLastHTTPDownloadURL(uint8 t, const wxString& val)
+void CPreferences::SetLastHTTPDownloadURL(uint8 t, const wxString &val)
 {
-	wxConfigBase* cfg = wxConfigBase::Get();
+	wxConfigBase *cfg = wxConfigBase::Get();
 	wxString key = CFormat("/HTTPDownload/URL_%d") % t;
 	cfg->Write(key, val);
 }

amule-3.0.1.tar.gz/src/Preferences.h -> amule-3.1.0.tar.gz/src/Preferences.h Changed

@@ -26,28 +26,62 @@
 #ifndef PREFERENCES_H
 #define PREFERENCES_H
 
-#include "MD4Hash.h"			// Needed for CMD4Hash
+#include "MD4Hash.h" // Needed for CMD4Hash
 
-#include <wx/arrstr.h>			// Needed for wxArrayString
+#include <wx/arrstr.h> // Needed for wxArrayString
 
 #include <map>
 
 #include "Proxy.h"
 #include "OtherStructs.h"
 
-#include <common/ClientVersion.h>	// Needed for __GIT__
+#include <common/ClientVersion.h> // Needed for __GIT__
 
 class CPreferences;
 class wxConfigBase;
 class wxWindow;
+class wxRegEx;
+
+// Compiled shared-file-name exclusion filter. Holds either a set of wildcard globs (matched
+// case-insensitively with wxMatchWild) or a single regex, chosen by the useRegex flag passed
+// to Compile(). An empty pattern -- or a regex that fails to compile -- yields an inactive
+// filter (Matches() always false): a bad pattern fails open, it never excludes everything.
+// Owns a heap wxRegEx, so non-copyable.
+class CShareExcludeFilter
+{
+public:
+	CShareExcludeFilter();
+	~CShareExcludeFilter();
+
+	// In wildcard mode the string is split on '|' into globs. In regex mode the whole string is
+	// one regex, so '|' is native alternation and is NOT split.
+	void Compile(const wxString &patterns, bool useRegex);
+
+	bool Matches(const wxString &fileName) const;
+
+	bool IsActive() const { return m_active; }
+	bool IsValid() const { return m_valid; }
 
-enum EViewSharedFilesAccess {
+private:
+	CShareExcludeFilter(const CShareExcludeFilter &);
+	CShareExcludeFilter &operator=(const CShareExcludeFilter &);
+
+	wxArrayString m_globs; // lowercased globs (wildcard mode)
+	wxRegEx *m_regex;      // compiled regex (regex mode), owned
+	bool m_useRegex;
+	bool m_active;
+	bool m_valid;
+};
+
+enum EViewSharedFilesAccess
+{
 	vsfaEverybody = 0,
 	vsfaFriends = 1,
 	vsfaNobody = 2
 };
 
-enum AllCategoryFilter {
+enum AllCategoryFilter
+{
 	acfAll = 0,
 	acfAllOthers,
 	acfIncomplete,
@@ -67,124 +101,93 @@
 };
 
 /**
- * Base-class for automatically loading and saving of preferences.
+ * Base class for automatically loading and saving preferences.
  *
- * The purpose of this class is to perform two tasks:
- * 1) To load and save a variable using wxConfig
- * 2) If nescecarry, to synchronize it with a widget
+ * It does two things: load and save a variable using wxConfig, and where necessary keep it
+ * in sync with a widget. This pure-virtual class is the base of all the Cfg types below and
+ * exposes the entire interface.
  *
- * This pure-virtual class servers as the base of all the Cfg types
- * defined below, and exposes the entire interface.
- *
- * Please note that for reasons of simplicity these classes dont provide
- * direct access to the variables they maintain, as there is no real need
- * for this.
- *
- * To create a sub-class you need only provide the Load/Save functionality,
- * as it is given that not all variables have a widget associated.
+ * For simplicity these classes give no direct access to the variables they maintain, since
+ * nothing needs it. A subclass need only provide Load/Save: not every variable has a widget.
  */
 class Cfg_Base
 {
 public:
 	/**
-	 * Constructor.
-	 *
-	 * @param keyname This is the keyname under which the variable is to be saved.
+	 * @param keyname The key under which the variable is to be saved.
 	 */
-	Cfg_Base( const wxString& keyname )
-	 : m_key( keyname ),
-	   m_changed( false )
-	{}
+	Cfg_Base(const wxString &keyname)
+	: m_key(keyname)
+	, m_changed(false)
+	{
+	}
 
-	/**
-	 * Destructor.
-	 */
 	virtual ~Cfg_Base() {}
 
 	/**
-	 * This function loads the associated variable from the provided config object.
+	 * Loads the associated variable from the provided config object.
 	 */
-	virtual void LoadFromFile(wxConfigBase* cfg) = 0;
+	virtual void LoadFromFile(wxConfigBase *cfg) = 0;
 	/**
-	 * This function saves the associated variable to the provided config object.
+	 * Saves the associated variable to the provided config object.
 	 */
-	virtual void SaveToFile(wxConfigBase* cfg) = 0;
+	virtual void SaveToFile(wxConfigBase *cfg) = 0;
 
 	/**
 	 * Syncs the variable with the contents of the widget.
-	 *
-	 * @return True of success, false otherwise.
 	 */
-	virtual bool TransferFromWindow()	{ return false; }
+	virtual bool TransferFromWindow() { return false; }
 	/**
 	 * Syncs the widget with the contents of the variable.
-	 *
-	 * @return True of success, false otherwise.
 	 */
-	virtual bool TransferToWindow()		{ return false; }
+	virtual bool TransferToWindow() { return false; }
 
 	/**
-	 * Connects a widget with the specified ID to the Cfg object.
+	 * Connects a widget with the specified ID to the Cfg object. Only meaningful for Cfg classes
+	 * that can interact with a widget, see Cfg_Tmpl::ConnectToWidget().
 	 *
 	 * @param id The ID of the widget.
-	 * @param parent A pointer to the widgets parent, to speed up searches.
-	 * @return True on success, false otherwise.
-	 *
-	 * This function only makes sense for Cfg-classes that have the capability
-	 * to interact with a widget, see Cfg_Tmpl::ConnectToWidget().
+	 * @param parent A pointer to the widget's parent, to speed up searches.
 	 */
-	virtual	bool ConnectToWidget( int WXUNUSED(id), wxWindow* WXUNUSED(parent) = NULL )	{ return false; }
+	virtual bool ConnectToWidget(int WXUNUSED(id), wxWindow *WXUNUSED(parent) = NULL) { return false; }
 
 	/**
-	 * Gets the key associated with Cfg object.
-	 *
-	 * @return The config-key of this object.
+	 * Pushes the default value into the associated widget, if any. The change is only reflected
+	 * in the widget, not committed to the variable, so a subsequent Cancel leaves the stored
+	 * value untouched (OK commits it via TransferFromWindow like any other edit).
 	 */
-	virtual const wxString& GetKey()	{ return m_key; }
-
+	virtual bool ResetToDefault() { return false; }
 
 	/**
-	 * Specifies if the variable has changed since the TransferFromWindow() call.
-	 *
-	 * @return True if the variable has changed, false otherwise.
+	 * @return The config key of this object.
 	 */
-	virtual bool HasChanged()			{ return m_changed; }
+	virtual const wxString &GetKey() { return m_key; }
 
+	/**
+	 * @return True if the variable has changed since the TransferFromWindow() call.
+	 */
+	virtual bool HasChanged() { return m_changed; }
 
 protected:
 	/**
 	 * Sets the changed status.
-	 *
-	 * @param changed The new status.
 	 */
-	virtual void SetChanged( bool changed )
-	{
-		m_changed = changed;
-	};
+	virtual void SetChanged(bool changed) { m_changed = changed; };
 
 private:
-
 	//! The Config-key under which to save the variable
-	wxString	m_key;
+	wxString m_key;
 
 	//! The changed-status of the variable
-	bool		m_changed;
-};
-
-
-class Cfg_Lang_Base {
-public:
-	virtual void UpdateChoice(int pos);
+	bool m_changed;
 };
 
 const int cntStatColors = 15;
 
-
 //! This typedef is a shortcut similar to the theApp shortcut, but uses :: instead of .
 //! It only allows access to static preference functions, however this is to be desired anyway.
 typedef CPreferences thePrefs;
 
-
 class CPreferences
 {
 public:
@@ -193,722 +196,953 @@
 	CPreferences();
 	~CPreferences();
 
-	void			Save();
-	void			SaveCats();
-	// Read shareddir-explicit.dat, shareddir-recursive.dat, and
-	// shareddir.dat from disk; recompute shareddir_list as the union
-	// of the explicit list and the recursive expansion; reconcile any
-	// drift from external writers (e.g. a Docker entrypoint script
-	// that edits shareddir.dat directly and then calls Reload via
-	// EC); rewrite shareddir.dat as the new union. Safe to call from
-	// startup, the EC ReloadSharedFiles command, the UI Reload
-	// button, and the watcher's debounced reload.
-	void			ReloadSharedFolders();
-	// Persist all three shared-dir files: shareddir-explicit.dat,
-	// shareddir-recursive.dat (the two canonical sources of truth)
-	// and shareddir.dat (regenerated as the union, for backwards
-	// compatibility with older binaries and scripts that read it).
-	// Called by CSharedDirWatcher after it auto-appends a
-	// newly-created subdirectory so the change survives a restart
-	// without forcing a full preferences.dat write.
-	void			SaveSharedFolders();
-	// True iff `path` is in shareddir_recursive_list or is a
-	// descendant of an entry there. Used by the watcher to decide
-	// whether auto-add of a new subdir / cold-discovered subdir is
-	// authorised: non-recursive share roots do NOT auto-collect new
-	// subdirs, recursive roots do.
-	bool			IsRecursiveAncestor(const CPath & path) const;
-
-	static const wxString&	GetConfigDir()			{ return s_configDir; }
-	static void		SetConfigDir(const wxString& dir) { s_configDir = dir; }
-
-	static bool		Score()				{ return s_scorsystem; }
-	static void		SetScoreSystem(bool val)	{ s_scorsystem = val; }
-	static bool		Reconnect()			{ return s_reconnect; }
-	static void		SetReconnect(bool val)		{ s_reconnect = val; }
-	static bool		DeadServer()			{ return s_deadserver; }
-	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_UDPEnable ? s_udpport : 0; }
-	static void		SetUDPPort(uint16 val)		{ s_udpport = 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; }
-	static void		SetTempDir(const CPath& dir)	{ s_tempdir = dir; }
-	static const CMD4Hash&	GetUserHash()			{ return s_userhash; }
-	static void		SetUserHash(const CMD4Hash& h)	{ s_userhash = h; }
-	static uint32		GetMaxUpload()			{ return s_maxupload; }
-	static uint32		GetSlotAllocation()		{ return s_slotallocation; }
-	static bool		IsICHEnabled()			{ return s_ICH; }
-	static void		SetICHEnabled(bool val)		{ s_ICH = val; }
-	static bool		IsTrustingEveryHash()		{ return s_AICHTrustEveryHash; }
-	static void		SetTrustingEveryHash(bool val)	{ s_AICHTrustEveryHash = val; }
-	static bool		AutoServerlist()		{ return s_autoserverlist; }
-	static void		SetAutoServerlist(bool val)	{ s_autoserverlist = val; }
-	static bool		DoMinToTray()			{ return s_mintotray; }
-	static bool		ShowNotifications()		{ return s_notify; }
-	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		IsAppImageIntegrationDeclined()		{ return s_appimageIntegrationDeclined; }
-	static void		SetAppImageIntegrationDeclined(bool val) { s_appimageIntegrationDeclined = val; }
-	static bool		DoAutoConnect()			{ return s_autoconnect; }
-	static void		SetAutoConnect(bool inautoconnect)
-						{s_autoconnect = inautoconnect; }
-	static bool		AddServersFromServer()		{ return s_addserversfromserver; }
-	static void		SetAddServersFromServer(bool val) { s_addserversfromserver = val; }
-	static bool		AddServersFromClient()		{ return s_addserversfromclient; }
-	static void		SetAddServersFromClient(bool val) { s_addserversfromclient = val; }
-	static uint16		GetTrafficOMeterInterval()	{ return s_trafficOMeterInterval; }
-	static void		SetTrafficOMeterInterval(uint16 in)
-						{ s_trafficOMeterInterval = in; }
-	static uint16		GetStatsInterval()		{ return s_statsInterval;}
-	static void		SetStatsInterval(uint16 in)	{ s_statsInterval = in; }
-	static bool		IsConfirmExitEnabled()		{ return s_confirmExit; }
-	static bool		FilterLanIPs()			{ return s_filterLanIP; }
-	static void		SetFilterLanIPs(bool val)	{ s_filterLanIP = val; }
-	static bool		ParanoidFilter()			{ return s_paranoidfilter; }
-	static void		SetParanoidFilter(bool val)	{ s_paranoidfilter = val; }
-	static bool		IsOnlineSignatureEnabled()	{ return s_onlineSig; }
-	static void		SetOnlineSignatureEnabled(bool val) { s_onlineSig = val; }
-	static uint32		GetMaxGraphUploadRate()		{ return s_maxGraphUploadRate; }
-	static uint32		GetMaxGraphDownloadRate()	{ return s_maxGraphDownloadRate; }
-	static void		SetMaxGraphUploadRate(uint32 in){ s_maxGraphUploadRate=in; }
-	static void		SetMaxGraphDownloadRate(uint32 in)
-						{ s_maxGraphDownloadRate = in; }
-
-	static uint32		GetMaxDownload()		{ return s_maxdownload; }
-	static uint16		GetMaxConnections()		{ return s_maxconnections; }
-	static uint16		GetMaxSourcePerFile()		{ return s_maxsourceperfile; }
-	static uint16		GetMaxSourcePerFileSoft() {
-					uint16 temp = (uint16)(s_maxsourceperfile*0.9);
-					if( temp > 1000 ) return 1000;
-                                        return temp; }
-	static uint16		GetMaxSourcePerFileUDP() {
-					uint16 temp = (uint16)(s_maxsourceperfile*0.75);
-					if( temp > 100 ) return 100;
-                                        return temp; }
-	static uint16		GetDeadserverRetries()		{ return s_deadserverretries; }
-	static void		SetDeadserverRetries(uint16 val) { s_deadserverretries = val; }
-	static uint64		GetServerKeepAliveTimeout()	{ return s_dwServerKeepAliveTimeoutMins*60000; }
-	static void		SetServerKeepAliveTimeout(uint64 val)	{ s_dwServerKeepAliveTimeoutMins = val/60000; }
-
-	static const wxString&	GetLanguageID()			{ return s_languageID; }
-	static void		SetLanguageID(const wxString& new_id)	{ s_languageID = new_id; }
-	static uint8		CanSeeShares()			{ return s_iSeeShares; }
-	static void		SetCanSeeShares(uint8 val)	{ s_iSeeShares = val; }
-
-	static uint8		GetStatsMax()			{ return s_statsMax; }
-	static bool		UseFlatBar()			{ return (s_depth3D==0); }
-	static uint8		GetStatsAverageMinutes()	{ return s_statsAverageMinutes; }
-	static void		SetStatsAverageMinutes(uint8 in){ s_statsAverageMinutes = in; }
-
-	static bool		GetStartMinimized()		{ return s_startMinimized; }
-	static void		SetStartMinimized(bool instartMinimized)
-					{ s_startMinimized = instartMinimized;}
-	static bool		GetSmartIdCheck()		{ return s_smartidcheck; }
-	static void		SetSmartIdCheck( bool in_smartidcheck )
-						{ s_smartidcheck = in_smartidcheck; }
-	static uint8		GetSmartIdState()		{ return s_smartidstate; }
-	static void		SetSmartIdState( uint8 in_smartidstate )
-						{ s_smartidstate = in_smartidstate; }
-	static bool		GetVerbose()			{ return s_bVerbose; }
-	static void		SetVerbose(bool val)		{ s_bVerbose = val; }
-	static bool		GetVerboseLogfile()			{ return s_bVerboseLogfile; }
-	static void		SetVerboseLogfile(bool val)		{ s_bVerboseLogfile = val; }
-	static bool		GetPreviewPrio()		{ return s_bpreviewprio; }
-	static void		SetPreviewPrio(bool in)		{ s_bpreviewprio = in; }
-	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; }
-	static void		SetNewAutoDown(bool m_bInDAP)	{ s_bDAP = m_bInDAP; }
-	static bool		GetNewAutoDown()		{ return s_bDAP; }
-
-	static const wxString&	GetVideoPlayer()		{ return s_VideoPlayer; }
-
-	static uint32		GetFileBufferSize()		{ return s_iFileBufferSize*15000; }
-	static void		SetFileBufferSize(uint32 val)	{ s_iFileBufferSize = val/15000; }
-	static uint32		GetQueueSize()			{ return s_iQueueSize*100; }
-	static void		SetQueueSize(uint32 val)	{ s_iQueueSize = val/100; }
-
-	static uint8		Get3DDepth()			{ return s_depth3D;}
-	static bool		AddNewFilesPaused()		{ return s_addnewfilespaused; }
-	static void		SetAddNewFilesPaused(bool val)	{ s_addnewfilespaused = val; }
-
-	static void		SetMaxConsPerFive(int in)	{ s_MaxConperFive=in; }
-
-	static uint16		GetMaxConperFive()		{ return s_MaxConperFive; }
-	static uint16		GetDefaultMaxConperFive();
-
-	static bool		IsSafeServerConnectEnabled()	{ return s_safeServerConnect; }
-	static void		SetSafeServerConnectEnabled(bool val) { s_safeServerConnect = val; }
-
-	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 void		SetMinFreeDiskSpaceMB(uint32 val)	{ s_uMinFreeDiskSpace = val; }
-
-	static const wxString&	GetYourHostname()		{ return s_yourHostname; }
-	static void		SetYourHostname(const wxString& s)	{ s_yourHostname = s; }
-
-	static void		SetMaxUpload(uint32 in);
-	static void		SetMaxDownload(uint32 in);
-	static void		SetSlotAllocation(uint32 in)	{ s_slotallocation = (in >= 1) ? in : 1; };
+	void Save();
+	void SaveCats();
+	// Read the three shared-dir files, recompute shareddir_list as the union of the explicit
+	// list and the recursive expansion, reconcile drift from external writers (a Docker
+	// entrypoint editing shareddir.dat directly, then calling Reload over EC) and rewrite
+	// shareddir.dat as the new union.
+	void ReloadSharedFolders();
+	// Persist all three shared-dir files: the two canonical sources of truth plus shareddir.dat,
+	// regenerated as the union for older binaries and scripts that read it. Called by
+	// CSharedDirWatcher after it auto-appends a new subdir, so the change survives a restart
+	// without a full preferences.dat write.
+	void SaveSharedFolders();
+	// True iff `path` is in shareddir_recursive_list or descends from an entry there. The watcher
+	// gates auto-add on this: non-recursive share roots do not collect new subdirs, recursive
+	// ones do.
+	bool IsRecursiveAncestor(const CPath &path) const;
+
+	static const wxString &GetConfigDir() { return s_configDir; }
+	static void SetConfigDir(const wxString &dir) { s_configDir = dir; }
+
+	// True when this process started without an existing preferences.dat. Captured in the
+	// constructor, before the file is created, so the first-run wizard shows exactly once. Always
+	// false in the remote GUI.
+	static bool IsFirstRun() { return s_firstRun; }
+
+	// True once the first-run wizard was actually completed (the user pressed Finish). Unlike
+	// IsFirstRun(), which is only inferred from a missing preferences.dat, this is a persisted
+	// flag (/eMule/FirstRunWizardDone), so it separates a completed run from a cancelled one and
+	// re-triggers the wizard when cleared. Always false in the remote GUI.
+	static bool IsFirstRunWizardDone() { return s_firstRunWizardDone; }
+	static void SetFirstRunWizardDone(bool val) { s_firstRunWizardDone = val; }
+
+	static bool Score() { return s_scorsystem; }
+	static void SetScoreSystem(bool val) { s_scorsystem = val; }
+	static bool Reconnect() { return s_reconnect; }
+	static void SetReconnect(bool val) { s_reconnect = val; }
+	static bool DeadServer() { return s_deadserver; }
+	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 const wxString &GetAddress() { return s_Addr; }
+	static void SetAddress(const wxString &val) { s_Addr = val; }
+	static const wxString &GetNetworkInterface() { return s_NetworkInterface; }
+	static void SetNetworkInterface(const wxString &val) { s_NetworkInterface = val; }
+	static uint16 GetPort() { return s_port; }
+	static void SetPort(uint16 val);
+	static uint16 GetUDPPort() { return s_udpport; }
+	static uint16 GetEffectiveUDPPort() { return s_UDPEnable ? s_udpport : 0; }
+	static void SetUDPPort(uint16 val) { s_udpport = 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; }
+	static void SetTempDir(const CPath &dir) { s_tempdir = dir; }
+	static const CMD4Hash &GetUserHash() { return s_userhash; }
+	static void SetUserHash(const CMD4Hash &h) { s_userhash = h; }
+	static uint32 GetMaxUpload() { return s_maxupload; }
+	static uint32 GetSlotAllocation() { return s_slotallocation; }
+	static bool IsICHEnabled() { return s_ICH; }
+	static void SetICHEnabled(bool val) { s_ICH = val; }
+	static bool IsTrustingEveryHash() { return s_AICHTrustEveryHash; }
+	static void SetTrustingEveryHash(bool val) { s_AICHTrustEveryHash = val; }
+	static bool AutoServerlist() { return s_autoserverlist; }
+	static void SetAutoServerlist(bool val) { s_autoserverlist = val; }
+	static bool DoMinToTray() { return s_mintotray; }
+	static bool ShowNotifications() { return s_notify; }
+	// Whether the Search tab's Name field keeps a dropdown history of past
+	// queries (amule-org/amule#641). Query history only -- not the results.
+	static bool RememberSearchHistory() { return s_rememberSearchHistory; }
+	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 IsAppImageIntegrationDeclined() { return s_appimageIntegrationDeclined; }
+	static void SetAppImageIntegrationDeclined(bool val) { s_appimageIntegrationDeclined = val; }
+	static bool DoAutoConnect() { return s_autoconnect; }
+	static void SetAutoConnect(bool inautoconnect) { s_autoconnect = inautoconnect; }
+	static bool AddServersFromServer() { return s_addserversfromserver; }
+	static void SetAddServersFromServer(bool val) { s_addserversfromserver = val; }
+	static bool AddServersFromClient() { return s_addserversfromclient; }
+	static void SetAddServersFromClient(bool val) { s_addserversfromclient = val; }
+	static uint16 GetTrafficOMeterInterval() { return s_trafficOMeterInterval; }
+	static void SetTrafficOMeterInterval(uint16 in) { s_trafficOMeterInterval = in; }
+	static uint16 GetStatsInterval() { return s_statsInterval; }
+	static void SetStatsInterval(uint16 in) { s_statsInterval = in; }
+	static bool IsConfirmExitEnabled() { return s_confirmExit; }
+	static bool FilterLanIPs() { return s_filterLanIP; }
+	static void SetFilterLanIPs(bool val) { s_filterLanIP = val; }
+	static bool ParanoidFilter() { return s_paranoidfilter; }
+	static void SetParanoidFilter(bool val) { s_paranoidfilter = val; }
+	static bool IsOnlineSignatureEnabled() { return s_onlineSig; }
+	static void SetOnlineSignatureEnabled(bool val) { s_onlineSig = val; }
+	static uint32 GetMaxGraphUploadRate() { return s_maxGraphUploadRate; }
+	static uint32 GetMaxGraphDownloadRate() { return s_maxGraphDownloadRate; }
+	static void SetMaxGraphUploadRate(uint32 in) { s_maxGraphUploadRate = in; }
+	static void SetMaxGraphDownloadRate(uint32 in) { s_maxGraphDownloadRate = in; }
+
+	static uint32 GetMaxDownload() { return s_maxdownload; }
+	static uint16 GetMaxConnections() { return s_maxconnections; }
+	// OS-aware ceiling for the connection count (the half-open-connection limit on legacy
+	// Windows). Default MaxConnections, and the clamp on the wizard's derived limits.
+	static int32 GetRecommendedMaxConnections();
+	static uint16 GetMaxSourcePerFile() { return s_maxsourceperfile; }
+	static uint16 GetMaxSourcePerFileSoft()
+	{
+		uint16 temp = (uint16)(s_maxsourceperfile * 0.9);
+		if (temp > 1000)
+			return 1000;
+		return temp;
+	}
+	static uint16 GetMaxSourcePerFileUDP()
+	{
+		uint16 temp = (uint16)(s_maxsourceperfile * 0.75);
+		if (temp > 100)
+			return 100;
+		return temp;
+	}
+	static uint16 GetDeadserverRetries() { return s_deadserverretries; }
+	static void SetDeadserverRetries(uint16 val) { s_deadserverretries = val; }
+	static uint64 GetServerKeepAliveTimeout() { return s_dwServerKeepAliveTimeoutMins * 60000; }
+	static void SetServerKeepAliveTimeout(uint64 val) { s_dwServerKeepAliveTimeoutMins = val / 60000; }
+
+	// Concurrent files that may search Kad for sources at once (was the
+	// KADEMLIATOTALFILE constant). Compared against a uint8 source-count.
+	static uint16 GetKadMaxSourceSearches() { return s_kadMaxSourceSearches; }
+	static void SetKadMaxSourceSearches(uint16 val) { s_kadMaxSourceSearches = val; }
+	// Per-file Kad re-search interval (was KADEMLIAREASKTIME). Stored in
+	// minutes; returned/accepted in milliseconds to match the tick arithmetic.
+	static uint64 GetKadSourceReaskTime() { return s_kadSourceReaskMins * 60000; }
+	static void SetKadSourceReaskTime(uint64 val) { s_kadSourceReaskMins = val / 60000; }
+	// Interval before re-asking a known source (was FILEREASKTIME). Same
+	// minutes-stored / milliseconds-exposed convention.
+	static uint64 GetSourceReaskTime() { return s_sourceReaskMins * 60000; }
+	static void SetSourceReaskTime(uint64 val) { s_sourceReaskMins = val / 60000; }
+
+	static const wxString &GetLanguageID() { return s_languageID; }
+	static void SetLanguageID(const wxString &new_id) { s_languageID = new_id; }
+	static uint8 CanSeeShares() { return s_iSeeShares; }
+	static void SetCanSeeShares(uint8 val) { s_iSeeShares = val; }
+
+	static uint8 GetStatsMax() { return s_statsMax; }
+	static bool UseFlatBar() { return (s_depth3D == 0); }
+	static uint8 GetStatsAverageMinutes() { return s_statsAverageMinutes; }
+	static void SetStatsAverageMinutes(uint8 in) { s_statsAverageMinutes = in; }
+
+	static bool GetStartMinimized() { return s_startMinimized; }
+	static void SetStartMinimized(bool instartMinimized) { s_startMinimized = instartMinimized; }
+	static bool GetSmartIdCheck() { return s_smartidcheck; }
+	static void SetSmartIdCheck(bool in_smartidcheck) { s_smartidcheck = in_smartidcheck; }
+	static uint8 GetSmartIdState() { return s_smartidstate; }
+	static void SetSmartIdState(uint8 in_smartidstate) { s_smartidstate = in_smartidstate; }
+	static bool GetVerbose() { return s_bVerbose; }
+	static void SetVerbose(bool val) { s_bVerbose = val; }
+	static bool GetVerboseLogfile() { return s_bVerboseLogfile; }
+	static void SetVerboseLogfile(bool val) { s_bVerboseLogfile = val; }
+	static bool GetPreviewPrio() { return s_bpreviewprio; }
+	static void SetPreviewPrio(bool in) { s_bpreviewprio = in; }
+	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; }
+	static void SetNewAutoDown(bool m_bInDAP) { s_bDAP = m_bInDAP; }
+	static bool GetNewAutoDown() { return s_bDAP; }
+
+	static const wxString &GetVideoPlayer() { return s_VideoPlayer; }
+
+	static uint32 GetFileBufferSize() { return s_iFileBufferSize * 15000; }
+	static void SetFileBufferSize(uint32 val) { s_iFileBufferSize = val / 15000; }
+	static uint32 GetQueueSize() { return s_iQueueSize * 100; }
+	static void SetQueueSize(uint32 val) { s_iQueueSize = val / 100; }
+
+	static uint8 Get3DDepth() { return s_depth3D; }
+	static bool AddNewFilesPaused() { return s_addnewfilespaused; }
+	static void SetAddNewFilesPaused(bool val) { s_addnewfilespaused = val; }
+
+	static void SetMaxConsPerFive(int in) { s_MaxConperFive = in; }
+
+	static uint16 GetMaxConperFive() { return s_MaxConperFive; }
+	static uint16 GetDefaultMaxConperFive();
+
+	static bool IsSafeServerConnectEnabled() { return s_safeServerConnect; }
+	static void SetSafeServerConnectEnabled(bool val) { s_safeServerConnect = val; }
+
+	static bool GetEndgame() { return s_Endgame; }
+	static void SetEndgame(bool val) { s_Endgame = val; }
+
+	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 void SetMinFreeDiskSpaceMB(uint32 val) { s_uMinFreeDiskSpace = val; }
+
+	static const wxString &GetYourHostname() { return s_yourHostname; }
+	static void SetYourHostname(const wxString &s) { s_yourHostname = s; }
+
+	static void SetMaxUpload(uint32 in);
+	static void SetMaxDownload(uint32 in);
+	static void SetSlotAllocation(uint32 in) { s_slotallocation = (in >= 1) ? in : 1; };
 
 	typedef std::vector<CPath> PathList;
-	// The effective set of shared directories at runtime, computed at
-	// load time as `shareddir_explicit_list ∪ expand(shareddir_recursive_list)`.
-	// Persisted as the union to shareddir.dat for backwards compatibility
-	// with older binaries and external scripts that read/write that file.
-	// Live consumers (share scan, watcher) treat this as authoritative.
+	// The effective set of shared directories at runtime, computed at load time as the explicit
+	// list plus the expansion of the recursive one. Persisted as the union to shareddir.dat for
+	// older binaries and external scripts; live consumers treat it as authoritative.
 	PathList shareddir_list;
 
-	// User-explicit non-recursive share roots. Each entry shares only
-	// the files directly under it -- subdirectories are NOT followed.
-	// New subdirs created at runtime under an explicit-only root are
-	// NOT auto-shared (CSharedDirWatcher::RegisterNewSubdirectory
-	// gates on "ancestor is recursive"). Persisted to
-	// shareddir-explicit.dat. Migration: a pre-existing shareddir.dat
-	// with no shareddir-recursive.dat is loaded entirely into this
-	// list, which preserves the user's existing path set without
-	// silently upgrading anything to recursive (safer default).
+	// User-explicit non-recursive share roots: only the files directly under each entry are
+	// shared, and new subdirs created at runtime are NOT auto-shared
+	// (CSharedDirWatcher::RegisterNewSubdirectory gates on "ancestor is recursive"). A
+	// pre-existing shareddir.dat with no shareddir-recursive.dat migrates entirely into this
+	// list, so nothing is silently made recursive.
 	PathList shareddir_explicit_list;
 
-	// User-explicit recursive share roots. Each entry contributes
-	// itself AND every descendant directory to shareddir_list at
-	// load time (cold expansion). New subdirs created at runtime
-	// under a recursive root are auto-added by the watcher's HOT
-	// path. Persisted to shareddir-recursive.dat -- a separate file
-	// so older binaries that read shareddir.dat see the already-
-	// expanded union and behave correctly, while round-tripping
-	// shareddir.dat through an older binary preserves the recursive
-	// intent in this file.
+	// User-explicit recursive share roots: each contributes itself and every descendant directory
+	// to shareddir_list at load time, and new subdirs are auto-added by the watcher. Kept in a
+	// file of its own so older binaries see the already-expanded union in shareddir.dat, while
+	// round-tripping that file through an older binary still preserves the recursive intent here.
 	PathList shareddir_recursive_list;
 
 	wxArrayString addresses_list;
 
-	static bool		AutoConnectStaticOnly()		{ return s_autoconnectstaticonly; }
-	static void		SetAutoConnectStaticOnly(bool val) { s_autoconnectstaticonly = val; }
-	static bool		GetUPnPEnabled()		{ return s_UPnPEnabled; }
-	static void		SetUPnPEnabled(bool val)	{ s_UPnPEnabled = val; }
-	static bool		GetUPnPECEnabled()		{ return s_UPnPECEnabled; }
-	static void		SetUPnPECEnabled(bool val)	{ s_UPnPECEnabled = val; }
-	static bool		GetUPnPWebServerEnabled()	{ return s_UPnPWebServerEnabled; }
-	static void		SetUPnPWebServerEnabled(bool val){ s_UPnPWebServerEnabled = val; }
-	static uint16		GetUPnPTCPPort()		{ return s_UPnPTCPPort; }
-	static void		SetUPnPTCPPort(uint16 val)	{ s_UPnPTCPPort = val; }
-	static bool		IsManualHighPrio()		{ return s_bmanualhighprio; }
-	static void		SetManualHighPrio(bool val)	{ s_bmanualhighprio = val; }
-	void			LoadCats();
-	static const wxString&	GetDateTimeFormat()		{ return s_datetimeformat; }
+	// A user-configured remote->local path-prefix substitution, for amuleGUI against a daemon on
+	// another machine whose filesystem is otherwise reachable. remotePrefix is an opaque string
+	// in the daemon's own path syntax -- never a CPath, which has no notion of a second machine's
+	// separator convention. localPrefix is a real path here, so it is a CPath.
+	struct PathMapping
+	{
+		wxString remotePrefix;
+		CPath localPrefix;
+	};
+	typedef std::vector<PathMapping> PathMappingList;
+
+	const PathMappingList &GetPathMappings() const { return m_pathMappings; }
+	void SetPathMappings(const PathMappingList &mappings) { m_pathMappings = mappings; }
+
+	/**
+	 * Rewrites `remotePath` (as reported by the daemon, e.g. via EC_TAG_KNOWNFILE_PATH) through
+	 * the first configured mapping whose remotePrefix is a prefix of it -- list order decides,
+	 * not prefix length. Returns `remotePath` unchanged when no mapping matches (including when
+	 * the list is empty, the default), or on a non-CLIENT_GUI build (the monolithic app's own
+	 * paths never need remapping). Pure string substitution: the daemon-side comparison never
+	 * goes through CPath, which would silently apply this host's separator conventions to a path
+	 * that is not this host's.
+	 */
+	wxString ApplyPathMapping(const wxString &remotePath) const;
+
+	/**
+	 * Trims trailing separators from a daemon-supplied path prefix, in either OS convention.
+	 *
+	 * Not StripSeparators(), which uses *this* host's separator set: on a POSIX build that set
+	 * has no '\\', so a Windows daemon's "D:\\dl\\" would keep its trailing separator and
+	 * ApplyPathMapping() would run the two halves together with nothing between them -- the same
+	 * corruption the trailing-separator trim exists to prevent, surviving in the mirror
+	 * direction. The daemon's OS is not knowable here, which is also why the prefix boundary test
+	 * accepts either character.
+	 */
+	static wxString TrimRemotePrefix(const wxString &prefix);
+
+	static bool AutoConnectStaticOnly() { return s_autoconnectstaticonly; }
+	static void SetAutoConnectStaticOnly(bool val) { s_autoconnectstaticonly = val; }
+	static bool GetUPnPEnabled() { return s_UPnPEnabled; }
+	static void SetUPnPEnabled(bool val) { s_UPnPEnabled = val; }
+	static bool GetUPnPECEnabled() { return s_UPnPECEnabled; }
+	static void SetUPnPECEnabled(bool val) { s_UPnPECEnabled = val; }
+	static bool GetUPnPWebServerEnabled() { return s_UPnPWebServerEnabled; }
+	static void SetUPnPWebServerEnabled(bool val) { s_UPnPWebServerEnabled = val; }
+	static uint16 GetUPnPTCPPort() { return s_UPnPTCPPort; }
+	static void SetUPnPTCPPort(uint16 val) { s_UPnPTCPPort = val; }
+	// Runtime capability (not persisted): whether the connected daemon is built with UPnP,
+	// advertised over EC. False by default, so a pre-3.1 daemon (which never sends the tag) keeps
+	// the P2P-UPnP controls greyed rather than showing a dead toggle.
+	static bool GetUPnPAvailable() { return s_UPnPAvailable; }
+	static void SetUPnPAvailable(bool val) { s_UPnPAvailable = val; }
+	static bool IsManualHighPrio() { return s_bmanualhighprio; }
+	static void SetManualHighPrio(bool val) { s_bmanualhighprio = val; }
+	void LoadCats();
+	static const wxString &GetDateTimeFormat() { return s_datetimeformat; }
 	// Download Categories
-	uint32			AddCat(Category_Struct* cat);
-	void			RemoveCat(size_t index);
-	uint32			GetCatCount();
-	Category_Struct* GetCategory(size_t index);
-	const CPath&	GetCatPath(uint8 index);
-	uint32			GetCatColor(size_t index);
-	bool			CreateCategory(Category_Struct *& category, const wxString& name, const CPath& path,
-						const wxString& comment, uint32 color, uint8 prio);
-	bool			UpdateCategory(uint8 cat, const wxString& name, const CPath& path,
-						const wxString& comment, uint32 color, uint8 prio);
-
-	static AllCategoryFilter	GetAllcatFilter()		{ return s_allcatFilter; }
-	static void		SetAllcatFilter(AllCategoryFilter in)	{ s_allcatFilter = in; }
-
-	static bool		ShowAllNotCats()		{ return s_showAllNotCats; }
+	uint32 AddCat(Category_Struct *cat);
+	void RemoveCat(size_t index);
+	//! May the caller commit the removal now? Always yes here: this process owns the list.
+	//! amulegui hides this to defer until the daemon replies (amule-org/amule#1231); bound by
+	//! static type, like RemoveCat already is.
+	bool RequestRemoveCat(size_t) { return true; }
+	uint32 GetCatCount();
+	Category_Struct *GetCategory(size_t index);
+	const CPath &GetCatPath(uint8 index);
+	uint32 GetCatColor(size_t index);
+	bool CreateCategory(Category_Struct *&category,
+		const wxString &name,
+		const CPath &path,
+		const wxString &comment,
+		uint32 color,
+		uint8 prio);
+	bool UpdateCategory(uint8 cat,
+		const wxString &name,
+		const CPath &path,
+		const wxString &comment,
+		uint32 color,
+		uint8 prio);
+
+	static AllCategoryFilter GetAllcatFilter() { return s_allcatFilter; }
+	static void SetAllcatFilter(AllCategoryFilter in) { s_allcatFilter = in; }
+
+	static bool ShowAllNotCats() { return s_showAllNotCats; }
 
 	// WebServer
-	static uint16		GetWSPort()			{ return s_nWebPort; }
-	static void		SetWSPort(uint16 uPort)		{ s_nWebPort=uPort; }
-	static uint16		GetWebUPnPTCPPort()		{ return s_nWebUPnPTCPPort; }
-	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; }
-	static void		SetWebUseGzip(bool bUse)	{ s_bWebUseGzip=bUse; }
-	static uint32		GetWebPageRefresh()		{ return s_nWebPageRefresh; }
-	static void		SetWebPageRefresh(uint32 nRefresh) { s_nWebPageRefresh=nRefresh; }
-	static bool		GetWSIsLowUserEnabled()		{ return s_bWebLowEnabled; }
-	static void		SetWSIsLowUserEnabled(bool in)	{ s_bWebLowEnabled=in; }
-	static const wxString&	GetWSLowPass()			{ return s_sWebLowPassword; }
-	static void		SetWSLowPass(const wxString& pass)	{ s_sWebLowPassword = pass; }
-	static const wxString&	GetWebTemplate()		{ return s_WebTemplate; }
-	static void		SetWebTemplate(const wxString& val) { s_WebTemplate = val; }
-
-	static void		SetMaxSourcesPerFile(uint16 in) { s_maxsourceperfile=in;}
-	static void		SetMaxConnections(uint16 in)	{ s_maxconnections =in;}
-
-	static bool		ShowCatTabInfos()		{ return s_showCatTabInfos; }
-	static void		ShowCatTabInfos(bool in)	{ s_showCatTabInfos=in; }
+	static uint16 GetWSPort() { return s_nWebPort; }
+	static void SetWSPort(uint16 uPort) { s_nWebPort = uPort; }
+	static uint16 GetWebUPnPTCPPort() { return s_nWebUPnPTCPPort; }
+	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; }
+
+	// amuleapi (REST/SSE API daemon). Auto-started by amule as a child
+	// process when enabled, mirroring the WebServer autorun above.
+	static bool GetAmuleApiIsEnabled() { return s_bAmuleApiEnabled; }
+	static void SetAmuleApiIsEnabled(bool bEnable) { s_bAmuleApiEnabled = bEnable; }
+	static uint16 GetAmuleApiPort() { return s_nAmuleApiPort; }
+	static void SetAmuleApiPort(uint16 uPort) { s_nAmuleApiPort = uPort; }
+	static const wxString &GetAmuleApiBindAddress() { return s_sAmuleApiBindAddress; }
+	static void SetAmuleApiBindAddress(const wxString &addr) { s_sAmuleApiBindAddress = addr; }
+	// amuleapi's credentials are NOT stored here. They live in amuleapi-passwords, salted and
+	// stretched, read and written through webcommon/Credentials.h; see AmuleApiCredentials.h.
+	//
+	// The two password fields below are pending *requests*: an MD5 hex digest the user just
+	// typed, waiting to be hashed into the credential file, and empty the rest of the time. Empty
+	// therefore means "leave the stored password alone", which is what lets an EC client change
+	// the port without resending a password it can never read back.
+	static const wxString &GetAmuleApiPass() { return s_sAmuleApiPassword; }
+	static void SetAmuleApiPass(const wxString &pass) { s_sAmuleApiPassword = pass; }
+	static const wxString &GetAmuleApiGuestPass() { return s_sAmuleApiGuestPassword; }
+	static void SetAmuleApiGuestPass(const wxString &pass) { s_sAmuleApiGuestPassword = pass; }
+
+	// Guest access is on exactly when a guest credential is stored, so this mirrors the credential
+	// file rather than being a preference of its own: turning it off is what clears the stored
+	// guest password.
+	static bool GetAmuleApiGuestIsEnabled() { return s_bAmuleApiGuestEnabled; }
+	static void SetAmuleApiGuestIsEnabled(bool enable) { s_bAmuleApiGuestEnabled = enable; }
+
+	// Whether an admin credential is stored. Display only -- there is no setter over EC, because
+	// the digest can never be read back out of the credential file. On amulegui this is whatever
+	// the daemon reported.
+	static bool GetAmuleApiAdminIsSet() { return s_bAmuleApiAdminIsSet; }
+	static void SetAmuleApiAdminIsSet(bool isSet) { s_bAmuleApiAdminIsSet = isSet; }
+	static const wxString &GetAmuleApiPath() { return s_sAmuleApiPath; }
+	static void SetAmuleApiPath(const wxString &path) { s_sAmuleApiPath = path; }
+	static bool GetWebUseGzip() { return s_bWebUseGzip; }
+	static void SetWebUseGzip(bool bUse) { s_bWebUseGzip = bUse; }
+	static uint32 GetWebPageRefresh() { return s_nWebPageRefresh; }
+	static void SetWebPageRefresh(uint32 nRefresh) { s_nWebPageRefresh = nRefresh; }
+	static bool GetWSIsLowUserEnabled() { return s_bWebLowEnabled; }
+	static void SetWSIsLowUserEnabled(bool in) { s_bWebLowEnabled = in; }
+	static const wxString &GetWSLowPass() { return s_sWebLowPassword; }
+	static void SetWSLowPass(const wxString &pass) { s_sWebLowPassword = pass; }
+	static const wxString &GetWebTemplate() { return s_WebTemplate; }
+	static void SetWebTemplate(const wxString &val) { s_WebTemplate = val; }
+
+	static void SetMaxSourcesPerFile(uint16 in) { s_maxsourceperfile = in; }
+	static void SetMaxConnections(uint16 in) { s_maxconnections = in; }
+
+	static bool ShowCatTabInfos() { return s_showCatTabInfos; }
+	static void ShowCatTabInfos(bool in) { s_showCatTabInfos = in; }
 
 	// External Connections
-	static bool		AcceptExternalConnections()	{ return s_AcceptExternalConnections; }
-	static void			EnableExternalConnections( bool val ) { s_AcceptExternalConnections = val; }
-	static const wxString&	GetECAddress()			{ return s_ECAddr; }
-	static uint32		ECPort()			{ return s_ECPort; }
-	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; }
+	static bool AcceptExternalConnections() { return s_AcceptExternalConnections; }
+
+	/**
+	 * Refuse any EC session that did not negotiate transport encryption.
+	 *
+	 * Off by default, because turning it on locks out every client built before encryption
+	 * existed. Deliberately a flat policy rather than one keyed on the peer's address: only the
+	 * client knows what it dialed, and this side's peer-IP view misclassifies tunnels. Candidate
+	 * for defaulting on once encryption-capable clients are the norm.
+	 */
+	static bool ECRequireEncryption() { return s_ECRequireEncryption; }
+	static void SetECRequireEncryption(bool val) { s_ECRequireEncryption = val; }
+	static void EnableExternalConnections(bool val) { s_AcceptExternalConnections = val; }
+	static const wxString &GetECAddress() { return s_ECAddr; }
+	static const wxString &GetECNetworkInterface() { return s_ECNetworkInterface; }
+	static void SetECNetworkInterface(const wxString &val) { s_ECNetworkInterface = val; }
+	static uint32 ECPort() { return s_ECPort; }
+	// EC password-exchange throttle. Config-only (no dialog field); see the
+	// registration in Preferences.cpp for why.
+	static uint32 ECAuthFailureWindowSeconds() { return s_ECAuthFailureWindowSeconds; }
+	static uint32 ECAuthFailureThreshold() { return s_ECAuthFailureThreshold; }
+	static uint32 ECAuthLockoutSeconds() { return s_ECAuthLockoutSeconds; }
+	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; }
+	static bool GetFED2KLH() { return s_FastED2KLinksHandler; }
 
 	// Ip filter
-	static bool		IsFilteringClients()		{ return s_IPFilterClients; }
-	static void		SetFilteringClients(bool val);
-	static bool		IsFilteringServers()		{ return s_IPFilterServers; }
-	static void		SetFilteringServers(bool val);
-	static uint8		GetIPFilterLevel()		{ return s_filterlevel;}
-	static void		SetIPFilterLevel(uint8 level);
-	static bool		IPFilterAutoLoad()		{ return s_IPFilterAutoLoad; }
-	static void		SetIPFilterAutoLoad(bool val)	{ s_IPFilterAutoLoad = val; }
-	static const wxString&	IPFilterURL()			{ return s_IPFilterURL; }
-	static void		SetIPFilterURL(const wxString& url)	{ s_IPFilterURL = url; }
-	static bool		UseIPFilterSystem()		{ return s_IPFilterSys; }
-	static void		SetIPFilterSystem(bool val)	{ s_IPFilterSys = val; }
+	static bool IsFilteringClients() { return s_IPFilterClients; }
+	static void SetFilteringClients(bool val);
+	static bool IsFilteringServers() { return s_IPFilterServers; }
+	static void SetFilteringServers(bool val);
+	static uint8 GetIPFilterLevel() { return s_filterlevel; }
+	static void SetIPFilterLevel(uint8 level);
+	static bool IPFilterAutoLoad() { return s_IPFilterAutoLoad; }
+	static void SetIPFilterAutoLoad(bool val) { s_IPFilterAutoLoad = val; }
+	static const wxString &IPFilterURL() { return s_IPFilterURL; }
+	static void SetIPFilterURL(const wxString &url) { s_IPFilterURL = url; }
+	static bool UseIPFilterSystem() { return s_IPFilterSys; }
+	static void SetIPFilterSystem(bool val) { s_IPFilterSys = val; }
 
 	// Source seeds On/Off
-	static bool		GetSrcSeedsOn()			{ return s_UseSrcSeeds; }
-	static void		SetSrcSeedsOn(bool val)		{ s_UseSrcSeeds = val; }
+	static bool GetSrcSeedsOn() { return s_UseSrcSeeds; }
+	static void SetSrcSeedsOn(bool val) { s_UseSrcSeeds = val; }
 
-	static bool		IsSecureIdentEnabled()			{ return s_SecIdent; }
-	static void		SetSecureIdentEnabled(bool val)	{ s_SecIdent = val; }
+	static bool IsSecureIdentEnabled() { return s_SecIdent; }
+	static void SetSecureIdentEnabled(bool val) { s_SecIdent = val; }
 
-	static bool		GetExtractMetaData()			{ return s_ExtractMetaData; }
-	static void		SetExtractMetaData(bool val)	{ s_ExtractMetaData = val; }
+	static bool ShowProgBar() { return s_ProgBar; }
+	static bool ShowPercent() { return s_Percent; }
 
-	static bool		ShowProgBar()			{ return s_ProgBar; }
-	static bool		ShowPercent()			{ return s_Percent; }
+	static bool GetAllocFullFile() { return s_allocFullFile; };
+	static void SetAllocFullFile(bool val) { s_allocFullFile = val; }
 
-	static bool		GetAllocFullFile()		{ return s_allocFullFile; };
-	static void		SetAllocFullFile(bool val)	{ s_allocFullFile = val; }
+	// Memory-mapped file I/O for part files (see CFileArea). Runtime-toggleable; the value is
+	// pushed into CFileArea::SetMMapEnabled() when it is loaded or changed. Only meaningful on
+	// MMAP_SUPPORTED builds.
+	static bool GetMMapEnabled() { return s_mmapEnabled; }
+	static void SetMMapEnabled(bool val) { s_mmapEnabled = val; }
 
-	static bool		CreateFilesSparse()		{ return s_createFilesSparse; }
+	// Runtime capability: is mmap compiled into the core we drive? Mirrors the local
+	// MMAP_SUPPORTED on the monolithic/daemon; on the remote GUI it is what the daemon advertised
+	// over EC. The mmap checkbox and the EC value are both gated on it.
+	static bool GetMMapSupported() { return s_mmapSupported; }
+	static void SetMMapSupported(bool val) { s_mmapSupported = val; }
+
+	static bool CreateFilesSparse() { return s_createFilesSparse; }
 	// Beware! This function reverts the value it gets, that's why the name is also different!
 	// In EC we send/receive the reverted value, that's the reason for a reverse setter.
-	static void		CreateFilesNormal(bool val)	{ s_createFilesSparse = !val; }
+	static void CreateFilesNormal(bool val) { s_createFilesSparse = !val; }
+
+	static wxString GetBrowser();
 
-	static wxString		GetBrowser();
+	static const wxString &GetSkin() { return s_Skin; }
 
-	static const wxString&	GetSkin()			{ return s_Skin; }
+	static bool VerticalToolbar() { return s_ToolbarOrientation; }
 
-	static bool		VerticalToolbar()		{ return s_ToolbarOrientation; }
+	//! Live column sorting: auto-reorder the GUI lists as their values change
+	//! (gates the throttled auto-resort; manual header-click sort is unaffected).
+	static bool LiveListSort() { return s_liveListSort; }
 
-	static const CPath&	GetOSDir()			{ return s_OSDirectory; }
-	static uint16		GetOSUpdate()			{ return s_OSUpdate; }
+	static const CPath &GetOSDir() { return s_OSDirectory; }
+	static void SetOSDir(const CPath &val) { s_OSDirectory = val; }
+	static uint16 GetOSUpdate() { return s_OSUpdate; }
+	static void SetOSUpdate(uint16 val) { s_OSUpdate = val; }
 
-	static uint8		GetToolTipDelay()		{ return s_iToolDelayTime; }
+	static uint8 GetToolTipDelay() { return s_iToolDelayTime; }
 
-	static void		UnsetAutoServerStart();
-	static void		CheckUlDlRatio();
+	static void UnsetAutoServerStart();
+	static void CheckUlDlRatio();
 
-	static void BuildItemList( const wxString& appdir );
+	static void BuildItemList(const wxString &appdir);
 	static void EraseItemList();
 
-	static void LoadAllItems(wxConfigBase* cfg);
-	static void SaveAllItems(wxConfigBase* cfg);
+	static void LoadAllItems(wxConfigBase *cfg);
+	static void SaveAllItems(wxConfigBase *cfg);
 
 #ifndef __GIT__
-	static bool		ShowVersionOnTitle()		{ return s_showVersionOnTitle; }
+	static bool ShowVersionOnTitle() { return s_showVersionOnTitle; }
 #else
-	static bool		ShowVersionOnTitle()		{ return true; }
+	static bool ShowVersionOnTitle() { return true; }
 #endif
-	static uint8_t		GetShowRatesOnTitle()		{ return s_showRatesOnTitle; }
-	static void		SetShowRatesOnTitle(uint8_t val) { s_showRatesOnTitle = val; }
+	static uint8_t GetShowRatesOnTitle() { return s_showRatesOnTitle; }
+	static void SetShowRatesOnTitle(uint8_t val) { s_showRatesOnTitle = val; }
 
 	// Message Filters
 
-	static bool		MustFilterMessages()		{ return s_MustFilterMessages; }
-	static void		SetMustFilterMessages(bool val)	{ s_MustFilterMessages = val; }
-	static bool		IsFilterAllMessages()		{ return s_FilterAllMessages; }
-	static void		SetFilterAllMessages(bool val)	{ s_FilterAllMessages = val; }
-	static bool		MsgOnlyFriends()		{ return s_msgonlyfriends;}
-	static void		SetMsgOnlyFriends(bool val)	{ s_msgonlyfriends = val; }
-	static bool		MsgOnlySecure()			{ return s_msgsecure;}
-	static void		SetMsgOnlySecure(bool val)	{ s_msgsecure = val; }
-	static bool		IsFilterByKeywords()		{ return s_FilterSomeMessages; }
-	static void		SetFilterByKeywords(bool val)	{ s_FilterSomeMessages = val; }
-	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; }
-	static const wxString&	GetCommentFilterString()	{ return s_CommentFilterString; }
-	static void		SetCommentFilterString(const wxString& val) { s_CommentFilterString = val; }
-	static bool		IsCommentFiltered(const wxString& comment);
+	static bool MustFilterMessages() { return s_MustFilterMessages; }
+	static void SetMustFilterMessages(bool val) { s_MustFilterMessages = val; }
+	static bool IsFilterAllMessages() { return s_FilterAllMessages; }
+	static void SetFilterAllMessages(bool val) { s_FilterAllMessages = val; }
+	static bool MsgOnlyFriends() { return s_msgonlyfriends; }
+	static void SetMsgOnlyFriends(bool val) { s_msgonlyfriends = val; }
+	static bool MsgOnlySecure() { return s_msgsecure; }
+	static void SetMsgOnlySecure(bool val) { s_msgsecure = val; }
+	static bool IsFilterByKeywords() { return s_FilterSomeMessages; }
+	static void SetFilterByKeywords(bool val) { s_FilterSomeMessages = val; }
+	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 void SetShowMessagesInLog(bool val) { s_ShowMessagesInLog = val; }
+	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; }
+	static const wxString &GetCommentFilterString() { return s_CommentFilterString; }
+	static void SetCommentFilterString(const wxString &val) { s_CommentFilterString = val; }
+	static bool IsCommentFiltered(const wxString &comment);
 
 	// Can't have it return a reference, will need a pointer later.
-	static const CProxyData *GetProxyData()			{ return &s_ProxyData; }
+	static const CProxyData *GetProxyData() { return &s_ProxyData; }
+	static void SetProxyData(const CProxyData &val) { s_ProxyData = val; }
 
 	// Hidden files
 
 	static bool ShareHiddenFiles() { return s_ShareHiddenFiles; }
 	static void SetShareHiddenFiles(bool val) { s_ShareHiddenFiles = val; }
 
-	// Automatic rescan of shared directories via wxFileSystemWatcher.
-	// On by default; when disabled, the user must hit "Reload shared
-	// files" manually after adding files to a share.
+	// Automatic rescan of shared directories via wxFileSystemWatcher. When
+	// disabled, the user must hit "Reload shared files" manually.
 	static bool AutoRescanSharedDirs() { return s_AutoRescanSharedDirs; }
 	static void SetAutoRescanSharedDirs(bool val) { s_AutoRescanSharedDirs = val; }
 
-	// Whether shared-folder walks should descend into symbolic links.
-	// Default true to preserve historical behaviour; turning it off
-	// passes wxDIR_NO_FOLLOW to the iterator so symlinked files and
-	// directories are skipped entirely.
+	// Whether shared-folder walks descend into symbolic links. Default true for historical
+	// behaviour; off passes wxDIR_NO_FOLLOW to the iterator, skipping symlinked files and
+	// directories entirely.
 	static bool FollowSymlinksInShares() { return s_FollowSymlinksInShares; }
 	static void SetFollowSymlinksInShares(bool val) { s_FollowSymlinksInShares = val; }
 
-	static bool AutoSortDownload()		{ return s_AutoSortDownload; }
-	static bool AutoSortDownload(bool val)	{ bool tmp = s_AutoSortDownload; s_AutoSortDownload = val; return tmp; }
+	// Shared-file exclusion by name. Patterns are a '|'-separated list of
+	// wildcards, or a single regex when ExcludeSharePatternsUseRegex().
+	static const wxString &GetExcludeSharePatterns() { return s_ExcludeSharePatterns; }
+	static void SetExcludeSharePatterns(const wxString &val) { s_ExcludeSharePatterns = val; }
+	static bool ExcludeSharePatternsUseRegex() { return s_ExcludeSharePatternsUseRegex; }
+	static void SetExcludeSharePatternsUseRegex(bool val) { s_ExcludeSharePatternsUseRegex = val; }
+
+	// (Re)compile the live filter from the current pattern string + mode.
+	// Call after loading prefs or after the Directories panel changes them.
+	static void RecompileShareExcludeFilter()
+	{
+		s_ShareExcludeFilter.Compile(s_ExcludeSharePatterns, s_ExcludeSharePatternsUseRegex);
+	}
+	// True if the shared-file basename matches the live exclusion filter.
+	static bool IsShareExcluded(const wxString &fileName)
+	{
+		return s_ShareExcludeFilter.Matches(fileName);
+	}
+	// How many names in the list a candidate (pattern, useRegex) would exclude -- for the
+	// Directories panel's live preview, which tests a typed-but-unsaved pattern without touching
+	// the live filter. wxNOT_FOUND if the regex does not compile.
+	static int PreviewExcludeCount(
+		const wxString &patterns, bool useRegex, const wxArrayString &fileNames);
 
 	// Version check
 
 	static bool GetCheckNewVersion() { return s_NewVersionCheck; }
 	static void SetCheckNewVersion(bool val) { s_NewVersionCheck = val; }
+	// Runtime-only (not persisted): whether the connected daemon can perform version checks. The
+	// remote GUI reads it to hide the "check for new version" checkbox against a daemon that
+	// cannot.
+	static bool GetVersionCheckAvailable() { return s_versionCheckAvailable; }
+	static void SetVersionCheckAvailable(bool val) { s_versionCheckAvailable = val; }
+
+	// Media metadata (issue #140): probe local shared files with ffprobe so we advertise Length /
+	// Bitrate / Codec to peers. An empty path means auto-detect, not off --
+	// MediaProbe::DetectedPath() resolves it per process.
+	static bool GetMediaMetadataEnabled() { return s_MediaMetadataEnabled; }
+	static void SetMediaMetadataEnabled(bool val) { s_MediaMetadataEnabled = val; }
+	static const wxString &GetMediaMetadataFFProbePath() { return s_MediaMetadataFFProbePath; }
+	static void SetMediaMetadataFFProbePath(const wxString &val) { s_MediaMetadataFFProbePath = val; }
 
 	// Networks
-	static bool GetNetworkKademlia()		{ return s_ConnectToKad; }
-	static void SetNetworkKademlia(bool val)	{ s_ConnectToKad = val; }
-	static bool GetNetworkED2K()			{ return s_ConnectToED2K; }
-	static void SetNetworkED2K(bool val)		{ s_ConnectToED2K = val; }
+	static bool GetNetworkKademlia() { return s_ConnectToKad; }
+	static void SetNetworkKademlia(bool val) { s_ConnectToKad = val; }
+	static bool GetNetworkED2K() { return s_ConnectToED2K; }
+	static void SetNetworkED2K(bool val) { s_ConnectToED2K = val; }
 
 	// Statistics
-	static unsigned		GetMaxClientVersions()		{ return s_maxClientVersions; }
+	static unsigned GetMaxClientVersions() { return s_maxClientVersions; }
 
 	// Dropping slow sources
-	static bool GetDropSlowSources()					{ return s_DropSlowSources; }
+	static bool GetDropSlowSources() { return s_DropSlowSources; }
 
 	// server.met and nodes.dat urls
-	static const wxString& GetKadNodesUrl() { return s_KadURL; }
-	static void SetKadNodesUrl(const wxString& url) { s_KadURL = url; }
+	static const wxString &GetKadNodesUrl() { return s_KadURL; }
+	static void SetKadNodesUrl(const wxString &url) { s_KadURL = url; }
 
-	static const wxString& GetEd2kServersUrl() { return s_Ed2kURL; }
-	static void SetEd2kServersUrl(const wxString& url) { s_Ed2kURL = url; }
+	static const wxString &GetEd2kServersUrl() { return s_Ed2kURL; }
+	static void SetEd2kServersUrl(const wxString &url) { s_Ed2kURL = url; }
 
 	// Crypt
-	static bool		IsClientCryptLayerSupported()		{return s_IsClientCryptLayerSupported;}
-	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 void		SetClientCryptLayerSupported(bool v)	{s_IsClientCryptLayerSupported = v;}
-	static void		SetClientCryptLayerRequested(bool v)	{s_bCryptLayerRequested = v; }
-	static void		SetClientCryptLayerRequired(bool v)		{s_IsClientCryptLayerRequired = v;}
-
-	// GeoIP / IP2Country
-	//
-	// Source selector — choose which provider supplies the .mmdb. Values
-	// are persisted as strings ("dbip", "maxmind", "custom") so the config
-	// file stays human-readable across releases. See Preferences.cpp for
-	// the legacy GeoLiteCountryUpdateUrl → custom migration.
-	enum GeoIPSource {
-		GeoIPSourceDBIP    = 0,
+	static bool IsClientCryptLayerSupported() { return s_IsClientCryptLayerSupported; }
+	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 void SetClientCryptLayerSupported(bool v) { s_IsClientCryptLayerSupported = v; }
+	static void SetClientCryptLayerRequested(bool v) { s_bCryptLayerRequested = v; }
+	static void SetClientCryptLayerRequired(bool v) { s_IsClientCryptLayerRequired = v; }
+
+	// GeoIP / IP2Country. Which provider supplies the .mmdb, persisted as strings ("dbip",
+	// "maxmind", "custom") so the config file stays readable across releases; see Preferences.cpp
+	// for the legacy GeoLiteCountryUpdateUrl -> custom migration.
+	enum GeoIPSource
+	{
+		GeoIPSourceDBIP = 0,
 		GeoIPSourceMaxMind = 1,
-		GeoIPSourceCustom  = 2
+		GeoIPSourceCustom = 2
 	};
 
-	static bool				IsGeoIPEnabled()			{return s_GeoIPEnabled;}
-	static void				SetGeoIPEnabled(bool v)		{s_GeoIPEnabled = v;}
-	static GeoIPSource		GetGeoIPSource();
-	static void				SetGeoIPSource(GeoIPSource v);
-	// "Source of the currently-loaded geoip.mmdb" — distinct from
-	// GetGeoIPSource() which is the *next-download* selector. Updated
-	// by CIP2Country::DownloadFinished on success so the status line
-	// can correctly attribute a loaded DB even after the user flips
-	// the dropdown to a different source they haven't yet downloaded
-	// from. Empty string ("") means the file was hand-installed by the
-	// user (or migrated from the legacy GeoLite2-Country.mmdb path), in
-	// which case the status line shows "Loaded" with no attribution.
-	static const wxString&	GetGeoIPLoadedSource()		{return s_GeoIPLoadedSource;}
-	static void				SetGeoIPLoadedSource(GeoIPSource v);
-	static const wxString&	GetGeoIPMaxMindLicense()	{return s_GeoIPMaxMindLicense;}
-	static void				SetGeoIPMaxMindLicense(const wxString& v) {s_GeoIPMaxMindLicense = v;}
-	static const wxString&	GetGeoIPCustomUrl()			{return s_GeoIPCustomUrl;}
-	static void				SetGeoIPCustomUrl(const wxString& v) {s_GeoIPCustomUrl = v;}
-	static bool				IsGeoIPAutoUpdate()			{return s_GeoIPAutoUpdate;}
-	static void				SetGeoIPAutoUpdate(bool v)	{s_GeoIPAutoUpdate = v;}
-
-	// Computes the resolved download URL from the selected source: DB-IP
-	// gets a month substituted into the template; MaxMind has credentials
-	// inserted at the URL-userinfo position; Custom is the stored URL
-	// verbatim. Returns empty if the selected source has not been
-	// configured (e.g. MaxMind with empty credentials, Custom with empty
-	// URL).
+	static bool IsGeoIPEnabled() { return s_GeoIPEnabled; }
+	static void SetGeoIPEnabled(bool v) { s_GeoIPEnabled = v; }
+	static GeoIPSource GetGeoIPSource();
+	static void SetGeoIPSource(GeoIPSource v);
+	// Source of the currently-loaded geoip.mmdb, as distinct from GetGeoIPSource(), which selects
+	// the NEXT download. Updated by CIP2Country::DownloadFinished so the status line still
+	// attributes a loaded DB after the user flips the dropdown to a source they have not
+	// downloaded from. Empty means hand-installed (or migrated from the legacy path), and the
+	// status line then shows "Loaded" with no attribution.
+	static const wxString &GetGeoIPLoadedSource() { return s_GeoIPLoadedSource; }
+	static void SetGeoIPLoadedSource(GeoIPSource v);
+	static const wxString &GetGeoIPMaxMindLicense() { return s_GeoIPMaxMindLicense; }
+	static void SetGeoIPMaxMindLicense(const wxString &v) { s_GeoIPMaxMindLicense = v; }
+	static const wxString &GetGeoIPCustomUrl() { return s_GeoIPCustomUrl; }
+	static void SetGeoIPCustomUrl(const wxString &v) { s_GeoIPCustomUrl = v; }
+	static bool IsGeoIPAutoUpdate() { return s_GeoIPAutoUpdate; }
+	static void SetGeoIPAutoUpdate(bool v) { s_GeoIPAutoUpdate = v; }
+	// Runtime capability (not persisted): does the *core* have GeoIP compiled in? Always true for
+	// monolithic amule; on amulegui it comes from EC_TAG_IP2COUNTRY_SUPPORTED, so the GeoIP panel
+	// can disable itself.
+	static bool IsGeoIPSupported() { return s_GeoIPSupported; }
+	static void SetGeoIPSupported(bool v) { s_GeoIPSupported = v; }
+	// Live GeoIP status mirrored from the daemon over EC, for amulegui's prefs
+	// panel. Monolithic amule reads the live resolver and ignores these.
+	static bool IsGeoIPStatusLoaded() { return s_GeoIPStatusLoaded; }
+	static void SetGeoIPStatusLoaded(bool v) { s_GeoIPStatusLoaded = v; }
+	static bool IsGeoIPStatusDownloading() { return s_GeoIPStatusDownloading; }
+	static void SetGeoIPStatusDownloading(bool v) { s_GeoIPStatusDownloading = v; }
+	static const wxString &GetGeoIPStatusLastResult() { return s_GeoIPStatusLastResult; }
+	static void SetGeoIPStatusLastResult(const wxString &v) { s_GeoIPStatusLastResult = v; }
+	static const wxString &GetGeoIPStatusLoadedSource() { return s_GeoIPStatusLoadedSource; }
+	static void SetGeoIPStatusLoadedSource(const wxString &v) { s_GeoIPStatusLoadedSource = v; }
+
+	// Transient "Update now" trigger: amulegui's prefs panel sets it before SendToRemote() so the
+	// outgoing packet carries an UPDATE_NOW tag, asking the daemon to refresh its GeoIP DB.
+	// Cleared after the send, and never set by the daemon, whose own outbound serialization
+	// therefore never emits the tag.
+	static bool IsGeoIPUpdateRequested() { return s_GeoIPUpdateRequested; }
+	static void SetGeoIPUpdateRequested(bool v) { s_GeoIPUpdateRequested = v; }
+
+	// Resolved download URL for the selected source: DB-IP gets a month substituted into the
+	// template, MaxMind has credentials inserted at the URL-userinfo position, Custom is the
+	// stored URL verbatim. Empty if the source is not configured.
 	//
-	// monthOffset (DB-IP only) shifts the templated month — 0 = current,
-	// -1 = previous, etc. DB-IP often publishes the new month's file a
-	// few days late, so the IP2Country update path retries with -1 on a
-	// download failure to ride out the early-of-month gap. Ignored by
-	// MaxMind and Custom (their URLs aren't month-templated).
+	// monthOffset (DB-IP only) shifts the templated month. DB-IP often publishes the new month's
+	// file a few days late, so the update path retries with -1 to ride out the early-of-month
+	// gap.
 	static wxString GetGeoIPResolvedDownloadUrl(int monthOffset = 0);
 
-	// Legacy: the v2.x single-URL setting. Kept only for the one-shot
-	// migration in CPreferences::LoadPreferences(). Do not use in new
-	// code; query GetGeoIPResolvedDownloadUrl() instead.
-	static const wxString&	GetGeoIPUpdateUrl()			{return s_GeoIPUpdateUrl;}
+	// Legacy v2.x single-URL setting, kept only for the one-shot migration in
+	// LoadPreferences(). Query GetGeoIPResolvedDownloadUrl() instead.
+	static const wxString &GetGeoIPUpdateUrl() { return s_GeoIPUpdateUrl; }
 
 	// Stats server
-	static const wxString&	GetStatsServerName()		{return s_StatsServerName;}
-	static const wxString&	GetStatsServerURL()		{return s_StatsServerURL;}
+	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);
+	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();
+	static bool GetPreventSleepWhileDownloading() { return s_preventSleepWhileDownloading; }
+	static void SetPreventSleepWhileDownloading(bool status) { s_preventSleepWhileDownloading = status; }
 
+protected:
 	//! Temporary storage for statistic-colors.
-	static unsigned long	s_colorscntStatColors;
+	static unsigned long s_colorscntStatColors;
 	//! Reference for checking if the colors has changed.
-	static unsigned long	s_colors_refcntStatColors;
-
-	typedef std::vector<Cfg_Base*>			CFGList;
-	typedef std::map<int, Cfg_Base*>		CFGMap;
-	typedef std::vector<Category_Struct*>	CatList;
+	static unsigned long s_colors_refcntStatColors;
 
+	typedef std::vector<Cfg_Base *> CFGList;
+	typedef std::map<int, Cfg_Base *> CFGMap;
+	typedef std::vector<Category_Struct *> CatList;
 
-	static CFGMap	s_CfgList;
-	static CFGList	s_MiscList;
-	CatList			m_CatList;
+	static CFGMap s_CfgList;
+	static CFGList s_MiscList;
+	CatList m_CatList;
 
 private:
 	void LoadPreferences();
 	void SavePreferences();
 
+	// GUI-local only: never read from or written to over EC, unlike LoadCats()/SaveCats() or
+	// LoadSharedDirsRemote()/SendSharedDirsToRemote(). These go straight to wxConfigBase::Get()
+	// rather than through the Cfg_Base walk that CEC_Prefs_Packet draws from, which is what keeps
+	// path mappings off EC.
+	void LoadPathMappings();
+	void SavePathMappings();
+
+	PathMappingList m_pathMappings;
+
 protected:
-	static wxString	s_configDir;
+	static wxString s_configDir;
+	static bool s_firstRun;
+	static bool s_firstRunWizardDone;
 
-////////////// USER
-	static wxString	s_nick;
+	////////////// USER
+	static wxString s_nick;
 
 	static CMD4Hash s_userhash;
 
-	static Cfg_Lang_Base * s_cfgLang;
-
-////////////// CONNECTION
-	static uint32	s_maxupload;
-	static uint32	s_maxdownload;
-	static uint32	s_slotallocation;
+	////////////// CONNECTION
+	static uint32 s_maxupload;
+	static uint32 s_maxdownload;
+	static uint32 s_slotallocation;
 	static wxString s_Addr;
-	static uint16	s_port;
-	static uint16	s_udpport;
-	static bool	s_UDPEnable;
-	static uint16	s_maxconnections;
-	static bool	s_reconnect;
-	static bool	s_autoconnect;
-	static bool	s_autoconnectstaticonly;
-	static bool	s_UPnPEnabled;
-	static bool	s_UPnPECEnabled;
-	static bool	s_UPnPWebServerEnabled;
-	static uint16	s_UPnPTCPPort;
-
-////////////// PROXY
+	static wxString s_NetworkInterface;
+	static uint16 s_port;
+	static uint16 s_udpport;
+	static bool s_UDPEnable;
+	static uint16 s_maxconnections;
+	static bool s_reconnect;
+	static bool s_autoconnect;
+	static bool s_autoconnectstaticonly;
+	static bool s_UPnPEnabled;
+	static bool s_UPnPECEnabled;
+	static bool s_UPnPWebServerEnabled;
+	static uint16 s_UPnPTCPPort;
+	static bool s_UPnPAvailable;
+
+	////////////// PROXY
 	static CProxyData s_ProxyData;
 
-////////////// SERVERS
-	static bool	s_autoserverlist;
-	static bool	s_deadserver;
-
-////////////// FILES
-	static CPath	s_incomingdir;
-	static CPath	s_tempdir;
-	static bool	s_ICH;
-	static bool	s_AICHTrustEveryHash;
-
-////////////// GUI
-	static uint8	s_depth3D;
-
-	static bool	s_scorsystem;
-	static bool	s_hideonclose;
-	static bool	s_appimageIntegrationDeclined;
-	static bool	s_mintotray;
-	static bool	s_notify;
-	static bool	s_trayiconenabled;
-	static bool	s_addnewfilespaused;
-	static bool	s_addserversfromserver;
-	static bool	s_addserversfromclient;
-	static uint16	s_maxsourceperfile;
-	static uint16	s_trafficOMeterInterval;
-	static uint16	s_statsInterval;
-	static uint32	s_maxGraphDownloadRate;
-	static uint32	s_maxGraphUploadRate;
-	static bool	s_confirmExit;
-
-
-	static bool	s_filterLanIP;
-	static bool	s_paranoidfilter;
-	static bool	s_onlineSig;
-
-	static wxString	s_languageID;
-	static uint8	s_iSeeShares;		// 0=everybody 1=friends only 2=noone
-	static uint8	s_iToolDelayTime;	// tooltip delay time in seconds
-	static uint8	s_splitterbarPosition;
-	static uint16	s_deadserverretries;
-	static uint64	s_dwServerKeepAliveTimeoutMins;
-
-	static uint8	s_statsMax;
-	static uint8	s_statsAverageMinutes;
-
-	static bool	s_bpreviewprio;
-	static bool	s_smartidcheck;
-	static uint8	s_smartidstate;
-	static bool	s_safeServerConnect;
-	static bool	s_startMinimized;
-	static uint16	s_MaxConperFive;
-	static bool	s_checkDiskspace;
-	static uint32	s_uMinFreeDiskSpace;
-	static wxString	s_yourHostname;
-	static bool	s_bVerbose;
+	////////////// SERVERS
+	static bool s_autoserverlist;
+	static bool s_deadserver;
+
+	////////////// FILES
+	static CPath s_incomingdir;
+	static CPath s_tempdir;
+	static bool s_ICH;
+	static bool s_AICHTrustEveryHash;
+
+	////////////// GUI
+	static uint8 s_depth3D;
+
+	static bool s_scorsystem;
+	static bool s_hideonclose;
+	static bool s_appimageIntegrationDeclined;
+	static bool s_mintotray;
+	static bool s_notify;
+	static bool s_rememberSearchHistory;
+	static bool s_trayiconenabled;
+	static bool s_addnewfilespaused;
+	static bool s_addserversfromserver;
+	static bool s_addserversfromclient;
+	static uint16 s_maxsourceperfile;
+	static uint16 s_trafficOMeterInterval;
+	static uint16 s_statsInterval;
+	static uint32 s_maxGraphDownloadRate;
+	static uint32 s_maxGraphUploadRate;
+	static bool s_confirmExit;
+
+	static bool s_filterLanIP;
+	static bool s_paranoidfilter;
+	static bool s_onlineSig;
+
+	static wxString s_languageID;
+	static uint8 s_iSeeShares;     // 0=everybody 1=friends only 2=noone
+	static uint8 s_iToolDelayTime; // tooltip delay time in seconds
+	static uint8 s_splitterbarPosition;
+	static uint16 s_deadserverretries;
+	static uint64 s_dwServerKeepAliveTimeoutMins;
+
+	static uint8 s_statsMax;
+	static uint8 s_statsAverageMinutes;
+
+	static bool s_bpreviewprio;
+	static bool s_smartidcheck;
+	static uint8 s_smartidstate;
+	static bool s_safeServerConnect;
+	static bool s_Endgame;
+	static bool s_startMinimized;
+	static uint16 s_MaxConperFive;
+	// Source-search tuning (see the matching accessors). Reask intervals are stored in minutes so
+	// the getters can widen to milliseconds without narrowing.
+	static uint16 s_kadMaxSourceSearches;
+	static uint64 s_kadSourceReaskMins;
+	static uint64 s_sourceReaskMins;
+	static bool s_checkDiskspace;
+	static uint32 s_uMinFreeDiskSpace;
+	static wxString s_yourHostname;
+	static bool s_bVerbose;
 	static bool s_bVerboseLogfile;
-	static bool	s_bmanualhighprio;
-	static bool	s_bstartnextfile;
-	static bool	s_bstartnextfilesame;
-	static bool	s_bstartnextfilealpha;
-	static bool	s_bshowoverhead;
-	static bool	s_bDAP;
-	static bool	s_bUAP;
+	static bool s_bmanualhighprio;
+	static bool s_bstartnextfile;
+	static bool s_bstartnextfilesame;
+	static bool s_bstartnextfilealpha;
+	static bool s_bshowoverhead;
+	static bool s_bDAP;
+	static bool s_bUAP;
 
 #ifndef __GIT__
-	static bool	s_showVersionOnTitle;
+	static bool s_showVersionOnTitle;
 #endif
-	static uint8_t	s_showRatesOnTitle;	// 0=no, 1=after app name, 2=before app name
+	static uint8_t s_showRatesOnTitle; // 0=no, 1=after app name, 2=before app name
 
-	static wxString	s_VideoPlayer;
-	static bool	s_showAllNotCats;
+	static wxString s_VideoPlayer;
+	static bool s_showAllNotCats;
 
-	static bool	s_msgonlyfriends;
-	static bool	s_msgsecure;
+	static bool s_msgonlyfriends;
+	static bool s_msgsecure;
 
-	static uint8	s_iFileBufferSize;
-	static uint8	s_iQueueSize;
+	static uint8 s_iFileBufferSize;
+	static uint8 s_iQueueSize;
 
-	static wxString	s_datetimeformat;
+	static wxString s_datetimeformat;
 
-	static bool	s_ToolbarOrientation;
+	static bool s_ToolbarOrientation;
+	static bool s_liveListSort;
 
 	// Web Server kuchin
-	static wxString	s_sWebPassword;
-	static wxString	s_sWebPath;
-	static wxString	s_sWebLowPassword;
-	static uint16	s_nWebPort;
-	static uint16	s_nWebUPnPTCPPort;
-	static bool	s_bWebEnabled;
-	static bool	s_bWebUseGzip;
-	static uint32	s_nWebPageRefresh;
-	static bool	s_bWebLowEnabled;
+	static wxString s_sWebPassword;
+	static wxString s_sWebPath;
+	static wxString s_sWebLowPassword;
+	static uint16 s_nWebPort;
+	static uint16 s_nWebUPnPTCPPort;
+	static bool s_bWebEnabled;
+	static bool s_bWebUseGzip;
+
+	// amuleapi (REST/SSE API daemon) autorun.
+	static bool s_bAmuleApiEnabled;
+	static uint16 s_nAmuleApiPort;
+	static wxString s_sAmuleApiBindAddress;
+	static wxString s_sAmuleApiPassword;
+	static wxString s_sAmuleApiGuestPassword;
+	static bool s_bAmuleApiGuestEnabled;
+	static bool s_bAmuleApiAdminIsSet;
+	static wxString s_sAmuleApiPath;
+	static uint32 s_nWebPageRefresh;
+	static bool s_bWebLowEnabled;
 	static wxString s_WebTemplate;
 
-	static bool	s_showCatTabInfos;
+	static bool s_showCatTabInfos;
 	static AllCategoryFilter s_allcatFilter;
 
 	// Kry - external connections
-	static bool	s_AcceptExternalConnections;
+	static bool s_AcceptExternalConnections;
+	static bool s_ECRequireEncryption;
 	static wxString s_ECAddr;
-	static uint32	s_ECPort;
-	static wxString	s_ECPassword;
-	static bool		s_TransmitOnlyUploadingClients;
+	static wxString s_ECNetworkInterface;
+	static uint32 s_ECPort;
+	static uint32 s_ECAuthFailureWindowSeconds;
+	static uint32 s_ECAuthFailureThreshold;
+	static uint32 s_ECAuthLockoutSeconds;
+	static wxString s_ECPassword;
+	static bool s_TransmitOnlyUploadingClients;
 
 	// Kry - IPFilter
-	static bool	s_IPFilterClients;
-	static bool	s_IPFilterServers;
-	static uint8	s_filterlevel;
-	static bool	s_IPFilterAutoLoad;
+	static bool s_IPFilterClients;
+	static bool s_IPFilterServers;
+	static uint8 s_filterlevel;
+	static bool s_IPFilterAutoLoad;
 	static wxString s_IPFilterURL;
-	static bool	s_IPFilterSys;
+	static bool s_IPFilterSys;
 
 	// Kry - Source seeds on/off
-	static bool	s_UseSrcSeeds;
+	static bool s_UseSrcSeeds;
 
-	static bool	s_ProgBar;
-	static bool	s_Percent;
+	static bool s_ProgBar;
+	static bool s_Percent;
 
 	static bool s_SecIdent;
 
-	static bool	s_ExtractMetaData;
+	static bool s_allocFullFile;
+	static bool s_mmapEnabled;
+	static bool s_mmapSupported;
+	static bool s_createFilesSparse;
 
-	static bool	s_allocFullFile;
-	static bool	s_createFilesSparse;
+	static wxString s_CustomBrowser;
+	static bool s_BrowserTab; // Jacobo221 - Open in tabs if possible
 
-	static wxString	s_CustomBrowser;
-	static bool	s_BrowserTab;     // Jacobo221 - Open in tabs if possible
+	static CPath s_OSDirectory;
+	static uint16 s_OSUpdate;
 
-	static CPath	s_OSDirectory;
-	static uint16	s_OSUpdate;
+	static wxString s_Skin;
 
-	static wxString	s_Skin;
-
-	static bool	s_FastED2KLinksHandler;	// Madcat - Toggle Fast ED2K Links Handler
+	static bool s_FastED2KLinksHandler; // Madcat - Toggle Fast ED2K Links Handler
 
 	// Message Filtering
-	static bool	s_MustFilterMessages;
-	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;
+	static bool s_MustFilterMessages;
+	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;
 
 	// Hidden files sharing
-	static bool	s_ShareHiddenFiles;
+	static bool s_ShareHiddenFiles;
 
 	// Auto-rescan of shared dirs via wxFileSystemWatcher.
-	static bool	s_AutoRescanSharedDirs;
+	static bool s_AutoRescanSharedDirs;
 
 	// Follow symlinks while walking shared dirs.
-	static bool	s_FollowSymlinksInShares;
+	static bool s_FollowSymlinksInShares;
 
-	static bool s_AutoSortDownload;
+	// Shared-file exclusion by name: the raw pattern string, the mode
+	// flag, and the compiled filter derived from them.
+	static wxString s_ExcludeSharePatterns;
+	static bool s_ExcludeSharePatternsUseRegex;
+	static CShareExcludeFilter s_ShareExcludeFilter;
 
 	// Version check
 	static bool s_NewVersionCheck;
+	// Runtime-only capability of the connected daemon (not persisted).
+	static bool s_versionCheckAvailable;
+
+	// Media metadata (issue #140)
+	static bool s_MediaMetadataEnabled;
+	static wxString s_MediaMetadataFFProbePath;
 
 	// Kad
 	static bool s_ConnectToKad;
 	static bool s_ConnectToED2K;
 
 	// Statistics
-	static	unsigned	s_maxClientVersions;	// 0 = unlimited
+	static unsigned s_maxClientVersions; // 0 = unlimited
 
 	// Drop slow sources if needed
 	static bool s_DropSlowSources;
@@ -920,17 +1154,25 @@
 	static bool s_IsClientCryptLayerSupported;
 	static bool s_IsClientCryptLayerRequired;
 	static bool s_bCryptLayerRequested;
-	static uint32	s_dwKadUDPKey;
+	static uint32 s_dwKadUDPKey;
 	static uint8 s_byCryptTCPPaddingLength;
 
 	// GeoIP / IP2Country
-	static bool		s_GeoIPEnabled;
-	static wxString	s_GeoIPSource;          // serialised enum: "dbip" / "maxmind" / "custom" — next-download selector
-	static wxString	s_GeoIPLoadedSource;    // same shape — provenance of the currently-loaded geoip.mmdb
-	static wxString	s_GeoIPMaxMindLicense;
-	static wxString	s_GeoIPCustomUrl;
-	static bool		s_GeoIPAutoUpdate;
-	static wxString	s_GeoIPUpdateUrl;       // legacy v2.x single-URL, kept for migration only
+	static bool s_GeoIPEnabled;
+	static bool s_GeoIPSupported; // runtime capability, not persisted (defaults true)
+	// Runtime-only live status mirrored from the daemon (not persisted).
+	static bool s_GeoIPStatusLoaded;
+	static bool s_GeoIPStatusDownloading;
+	static wxString s_GeoIPStatusLastResult;
+	static wxString s_GeoIPStatusLoadedSource;
+	static bool s_GeoIPUpdateRequested; // transient "Update now" trigger, not persisted
+	static wxString
+		s_GeoIPSource; // serialised enum: "dbip" / "maxmind" / "custom" -- next-download selector
+	static wxString s_GeoIPLoadedSource; // same shape -- provenance of the currently-loaded geoip.mmdb
+	static wxString s_GeoIPMaxMindLicense;
+	static wxString s_GeoIPCustomUrl;
+	static bool s_GeoIPAutoUpdate;
+	static wxString s_GeoIPUpdateUrl; // legacy v2.x single-URL, kept for migration only
 
 	// Sleep vetoing
 	static bool s_preventSleepWhileDownloading;
@@ -940,6 +1182,5 @@
 	static wxString s_StatsServerURL;
 };
 
-
 #endif // PREFERENCES_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/PrefsUnifiedDlg.cpp -> amule-3.1.0.tar.gz/src/PrefsUnifiedDlg.cpp Changed

@@ -23,149 +23,203 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include "PrefsUnifiedDlg.h"
 
 #include <common/Constants.h>
-#include <common/Macros.h>		// Needed for itemsof()
+#include <common/Macros.h> // Needed for itemsof()
+
+#include <algorithm> // std::max (page-sidebar column width)
 
+#include <wx/artprov.h> // wxArtProvider::GetBitmapBundle for the page icons
+#include <wx/bmpbndl.h> // wxBitmapBundle for DPI-aware page icons
 #include <wx/colordlg.h>
+#include <wx/combobox.h> // network-interface drop-down (bind-to-interface)
+#include <wx/dataview.h> // the page sidebar (m_PrefsIcons)
+#include <wx/dirdlg.h>   // Browse button on the path-mapping editor (remote GUI)
+#include <wx/listctrl.h> // shared-folders editor (remote GUI)
+#include <set>           // set-compare of shared roots (session refresh)
 #include <wx/progdlg.h>
+#include "SharedFilesReloadProgress.h" // ReloadSharedFilesWithProgress
+
+#include <memory> // std::unique_ptr (progress dialog lifetime)
 #include <wx/stdpaths.h>
 #include <wx/tooltip.h>
-#include <wx/utils.h>		// wxGetUserHome
+#include <wx/utils.h> // wxGetUserHome
+
+// Network-interface enumeration for the "Bind to interface" and "Bind to IP"
+// drop-downs.
+#include <vector>
+#include "NetworkInterfaces.h"
 
-#include "amule.h"				// Needed for theApp
+#include "AmuleApiCredentials.h"
+#include "amule.h" // Needed for theApp
 #include "amuleDlg.h"
-#include "AutostartManager.h"			// Autostart-on-login toggle backend
-#ifdef ENABLE_IP2COUNTRY
-#include "IP2Country.h"				// CIP2Country::Update / GetDatabasePath
-#include <wx/artprov.h>				// wxArtProvider::GetBitmap for the IP2Country tab icon
-#include <wx/filename.h>			// wxFileName for status-line size lookup
+#include "AutostartManager.h"       // Autostart-on-login toggle backend
+#include "ProtocolHandlerManager.h" // ed2k:// + magnet: scheme-handler toggle backend
+#ifdef GEOIP_GUI
+#include "IP2Country.h"  // CIP2Country::Update / GetDatabasePath
+#include <wx/filename.h> // wxFileName for status-line size lookup
+#endif
+#include "CamuleArtProvider.h" // CamuleArtProvider::MakeId for the page-icon bundles
+
+#ifdef __WXMAC__
+#include "MacAppHelper.h" // mac_set_table_view_flush
 #endif
 #include "MuleColour.h"
 #include "EditServerListDlg.h"
-#include "SharedFileList.h"		// Needed for CSharedFileList
-#include "StatisticsDlg.h"		// Needed for graph parameters, colors
-#include "IPFilter.h"			// Needed for CIPFilter
+#include "SearchDlg.h"      // Needed for CSearchDlg::ApplySearchHistoryPref
+#include "SharedFileList.h" // Needed for CSharedFileList
+#include "StatisticsDlg.h"  // Needed for graph parameters, colors
+#include "IPFilter.h"       // Needed for CIPFilter
 #include "ClientList.h"
-#include "DirectoryTreeCtrl.h"	// Needed for CDirectoryTreeCtrl
+#include "DirectoryTreeCtrl.h" // Needed for CDirectoryTreeCtrl
 #include "Preferences.h"
-#include "SharedDirsApplyTask.h"		// Recursive-share expansion worker
+#include "SharedDirsApplyTask.h" // Recursive-share expansion worker
 #include "muuli_wdr.h"
 #include "Logger.h"
-#include <common/Format.h>				// Needed for CFormat
-#include "TransferWnd.h"		// Needed for CTransferWnd::UpdateCatTabTitles()
-#include "KadDlg.h"				// Needed for CKadDlg
-#include "OScopeCtrl.h"			// Needed for OScopeCtrl
+#include "MediaProbe.h"    // Needed for the FFProbePath Detect button handler
+#include <common/Format.h> // Needed for CFormat
+#include "TransferWnd.h"   // Needed for CTransferWnd::UpdateCatTabTitles()
+#include "KadDlg.h"        // Needed for CKadDlg
+#include "OScopeCtrl.h"    // Needed for OScopeCtrl
 #include "ServerList.h"
 #include "Statistics.h"
 #include "UserEvents.h"
-#include "PlatformSpecific.h"		// Needed for PLATFORMSPECIFIC_CAN_PREVENT_SLEEP_MODE
+#include "PlatformSpecific.h" // Needed for PLATFORMSPECIFIC_CAN_PREVENT_SLEEP_MODE
 
-wxBEGIN_EVENT_TABLE(PrefsUnifiedDlg,wxDialog)
-	// Events
+#ifdef CLIENT_GUI
+namespace
+{
+// The open Preferences dialog, or NULL. Lets a GET_SHARED_DIRS reply repaint
+// the editor without holding a pointer that could outlive the dialog.
+PrefsUnifiedDlg *s_openPrefsDlg = nullptr;
+} // namespace
+#endif
+
+wxBEGIN_EVENT_TABLE(PrefsUnifiedDlg, wxDialog)
+// Events
 #define USEREVENTS_EVENT(ID, NAME, VARS) \
-	EVT_CHECKBOX(USEREVENTS_FIRST_ID + CUserEvents::ID * USEREVENTS_IDS_PER_EVENT + 1,	PrefsUnifiedDlg::OnCheckBoxChange) \
-	EVT_CHECKBOX(USEREVENTS_FIRST_ID + CUserEvents::ID * USEREVENTS_IDS_PER_EVENT + 3,	PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(USEREVENTS_FIRST_ID + CUserEvents::ID * USEREVENTS_IDS_PER_EVENT + 1, \
+		PrefsUnifiedDlg::OnCheckBoxChange) \
+	EVT_CHECKBOX(USEREVENTS_FIRST_ID + CUserEvents::ID * USEREVENTS_IDS_PER_EVENT + 3, \
+		PrefsUnifiedDlg::OnCheckBoxChange)
 	USEREVENTS_EVENTLIST()
 #undef USEREVENTS_EVENT
 
 	// Proxy
-	EVT_CHECKBOX(ID_PROXY_ENABLE_PROXY,	PrefsUnifiedDlg::OnCheckBoxChange)
-	EVT_CHECKBOX(ID_PROXY_ENABLE_PASSWORD,	PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(ID_PROXY_ENABLE_PROXY, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(ID_PROXY_ENABLE_PASSWORD, PrefsUnifiedDlg::OnCheckBoxChange)
 
 	// Connection
-	EVT_SPINCTRL(IDC_PORT,			PrefsUnifiedDlg::OnTCPClientPortChange)
+	EVT_SPINCTRL(IDC_PORT, PrefsUnifiedDlg::OnTCPClientPortChange)
 
 	// The rest. Organize it!
-	EVT_CHECKBOX(IDC_UDPENABLE,		PrefsUnifiedDlg::OnCheckBoxChange)
-	EVT_CHECKBOX(IDC_CHECKDISKSPACE,	PrefsUnifiedDlg::OnCheckBoxChange)
-	EVT_CHECKBOX(IDC_ONLINESIG,		PrefsUnifiedDlg::OnCheckBoxChange)
-	EVT_CHECKBOX(IDC_REMOVEDEAD,		PrefsUnifiedDlg::OnCheckBoxChange)
-	EVT_CHECKBOX(IDC_AUTOSERVER,		PrefsUnifiedDlg::OnCheckBoxChange)
-	EVT_CHECKBOX(IDC_AUTOIPFILTER,		PrefsUnifiedDlg::OnCheckBoxChange)
-	EVT_CHECKBOX(IDC_MSGFILTER,		PrefsUnifiedDlg::OnCheckBoxChange)
-	EVT_CHECKBOX(IDC_MSGFILTER_ALL,		PrefsUnifiedDlg::OnCheckBoxChange)
-	EVT_CHECKBOX(IDC_MSGFILTER_WORD,	PrefsUnifiedDlg::OnCheckBoxChange)
-	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)
-
-	// Autostart-on-login: state lives in the OS (registry / plist /
-	// .desktop), not aMule.conf, so it gets its own handler that
-	// writes immediately on toggle rather than waiting for OnOk.
-	EVT_CHECKBOX(IDC_AUTOSTART_LOGIN,	PrefsUnifiedDlg::OnAutostartToggle)
-
+	EVT_CHECKBOX(IDC_UDPENABLE, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_CHECKDISKSPACE, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_ONLINESIG, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_REMOVEDEAD, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_AUTOSERVER, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_AUTOIPFILTER, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_MSGFILTER, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_MSGFILTER_ALL, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_MSGFILTER_WORD, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_FILTERCOMMENTS, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_STARTNEXTFILE, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_ENDGAME, 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_CHECKBOX(IDC_MEDIAMETA_ENABLED, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_EXT_CONN_ACCEPT, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_ENABLE_WEB, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_ENABLE_AMULEAPI, PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_AMULEAPI_GUEST_ENABLED, PrefsUnifiedDlg::OnCheckBoxChange)
+
+	// Autostart-on-login: state lives in the OS (registry / plist / .desktop), not
+	// aMule.conf, so it gets its own handler that writes immediately on toggle.
+	EVT_CHECKBOX(IDC_AUTOSTART_LOGIN, PrefsUnifiedDlg::OnAutostartToggle)
+
+	// ed2k:// and magnet: URL-scheme handler toggles: same live-OS-state model as
+	// autostart above, plus an "another app is currently registered, overwrite?" confirm
+	// gate before Enable.
+	EVT_CHECKBOX(IDC_PROTOCOL_ED2K, PrefsUnifiedDlg::OnProtocolEd2kToggle)
+	EVT_CHECKBOX(IDC_PROTOCOL_MAGNET, PrefsUnifiedDlg::OnProtocolMagnetToggle)
+	EVT_CHECKBOX(IDC_ASSOC_COLLECTION, PrefsUnifiedDlg::OnAssocCollectionToggle)
 
-	EVT_BUTTON(ID_PREFS_OK_TOP,		PrefsUnifiedDlg::OnOk)
-	EVT_BUTTON(ID_PREFS_CANCEL_TOP,		PrefsUnifiedDlg::OnCancel)
+	EVT_BUTTON(ID_PREFS_OK_TOP, PrefsUnifiedDlg::OnOk)
+	EVT_BUTTON(ID_PREFS_CANCEL_TOP, PrefsUnifiedDlg::OnCancel)
 
 	// Browse buttons
-//	EVT_BUTTON(IDC_SELSKIN,		PrefsUnifiedDlg::OnButtonDir)
-	EVT_BUTTON(IDC_BROWSEV,			PrefsUnifiedDlg::OnButtonBrowseApplication)
-	EVT_BUTTON(IDC_SELTEMPDIR,		PrefsUnifiedDlg::OnButtonDir)
-	EVT_BUTTON(IDC_SELINCDIR,		PrefsUnifiedDlg::OnButtonDir)
-	EVT_BUTTON(IDC_SELOSDIR,		PrefsUnifiedDlg::OnButtonDir)
-	EVT_BUTTON(IDC_SELBROWSER,		PrefsUnifiedDlg::OnButtonBrowseApplication)
-
-	EVT_SPINCTRL(IDC_TOOLTIPDELAY,		PrefsUnifiedDlg::OnToolTipDelayChange)
-
-	EVT_BUTTON(IDC_EDITADR,			PrefsUnifiedDlg::OnButtonEditAddr)
-	EVT_BUTTON(IDC_IPFRELOAD,		PrefsUnifiedDlg::OnButtonIPFilterReload)
-	EVT_BUTTON(IDC_COLOR_BUTTON,		PrefsUnifiedDlg::OnButtonColorChange)
-	EVT_BUTTON(IDC_IPFILTERUPDATE,		PrefsUnifiedDlg::OnButtonIPFilterUpdate)
-#ifdef ENABLE_IP2COUNTRY
-	EVT_CHOICE(IDC_GEOIP_SOURCE,		PrefsUnifiedDlg::OnGeoIPSourceChange)
-	EVT_BUTTON(IDC_GEOIP_UPDATE_NOW,	PrefsUnifiedDlg::OnGeoIPUpdateNow)
-	EVT_CHECKBOX(IDC_SHOW_COUNTRY_FLAGS,	PrefsUnifiedDlg::OnGeoIPMasterToggle)
+	//	EVT_BUTTON(IDC_SELSKIN,		PrefsUnifiedDlg::OnButtonDir)
+	EVT_BUTTON(IDC_BROWSEV, PrefsUnifiedDlg::OnButtonBrowseApplication)
+	EVT_BUTTON(IDC_SELTEMPDIR, PrefsUnifiedDlg::OnButtonDir)
+	EVT_BUTTON(IDC_SELINCDIR, PrefsUnifiedDlg::OnButtonDir)
+	EVT_BUTTON(IDC_SELOSDIR, PrefsUnifiedDlg::OnButtonDir)
+#ifdef CLIENT_GUI
+	EVT_BUTTON(IDC_SHAREDDIR_ADD, PrefsUnifiedDlg::OnSharedDirAdd)
+	EVT_BUTTON(IDC_SHAREDDIR_REMOVE, PrefsUnifiedDlg::OnSharedDirRemove)
+	EVT_BUTTON(IDC_PATHMAP_ADD, PrefsUnifiedDlg::OnPathMappingAdd)
+	EVT_BUTTON(IDC_PATHMAP_REMOVE, PrefsUnifiedDlg::OnPathMappingRemove)
+	EVT_BUTTON(IDC_PATHMAP_BROWSE, PrefsUnifiedDlg::OnPathMappingBrowse)
+#endif
+	EVT_BUTTON(IDC_SELBROWSER, PrefsUnifiedDlg::OnButtonBrowseApplication)
+	EVT_BUTTON(IDC_MEDIAMETA_FFPROBEBROWSE, PrefsUnifiedDlg::OnButtonBrowseApplication)
+	EVT_BUTTON(IDC_MEDIAMETA_FFPROBEDETECT, PrefsUnifiedDlg::OnButtonMediaMetaDetect)
+	EVT_BUTTON(IDC_TWEAKS_RESET, PrefsUnifiedDlg::OnButtonTweaksReset)
+#ifndef CLIENT_GUI
+	EVT_BUTTON(IDC_EXCLUDE_SHARE_PREVIEW, PrefsUnifiedDlg::OnButtonExcludePreview)
+#endif
+
+	EVT_SPINCTRL(IDC_TOOLTIPDELAY, PrefsUnifiedDlg::OnToolTipDelayChange)
+
+	EVT_BUTTON(IDC_EDITADR, PrefsUnifiedDlg::OnButtonEditAddr)
+	EVT_BUTTON(IDC_IPFRELOAD, PrefsUnifiedDlg::OnButtonIPFilterReload)
+	EVT_BUTTON(IDC_COLOR_BUTTON, PrefsUnifiedDlg::OnButtonColorChange)
+	EVT_BUTTON(IDC_IPFILTERUPDATE, PrefsUnifiedDlg::OnButtonIPFilterUpdate)
+#ifdef GEOIP_GUI
+	EVT_CHOICE(IDC_GEOIP_SOURCE, PrefsUnifiedDlg::OnGeoIPSourceChange)
+	EVT_BUTTON(IDC_GEOIP_UPDATE_NOW, PrefsUnifiedDlg::OnGeoIPUpdateNow)
+	EVT_CHECKBOX(IDC_SHOW_COUNTRY_FLAGS, PrefsUnifiedDlg::OnGeoIPMasterToggle)
 #endif
-	EVT_CHOICE(IDC_COLORSELECTOR,		PrefsUnifiedDlg::OnColorCategorySelected)
-	EVT_LIST_ITEM_SELECTED(ID_PREFSLISTCTRL,PrefsUnifiedDlg::OnPrefsPageChange)
+	EVT_CHOICE(IDC_COLORSELECTOR, PrefsUnifiedDlg::OnColorCategorySelected)
+	EVT_DATAVIEW_SELECTION_CHANGED(ID_PREFSLISTCTRL, PrefsUnifiedDlg::OnPrefsPageChange)
 
 	EVT_INIT_DIALOG(PrefsUnifiedDlg::OnInitDialog)
 
-	EVT_COMMAND_SCROLL(IDC_SLIDER,		PrefsUnifiedDlg::OnScrollBarChange)
-	EVT_COMMAND_SCROLL(IDC_SLIDER3,		PrefsUnifiedDlg::OnScrollBarChange)
-	EVT_COMMAND_SCROLL(IDC_SLIDER4,		PrefsUnifiedDlg::OnScrollBarChange)
-	EVT_COMMAND_SCROLL(IDC_SLIDER2,		PrefsUnifiedDlg::OnScrollBarChange)
-	EVT_COMMAND_SCROLL(IDC_FILEBUFFERSIZE,	PrefsUnifiedDlg::OnScrollBarChange)
-	EVT_COMMAND_SCROLL(IDC_QUEUESIZE,	PrefsUnifiedDlg::OnScrollBarChange)
-	EVT_COMMAND_SCROLL(IDC_SERVERKEEPALIVE,	PrefsUnifiedDlg::OnScrollBarChange)
-
-	EVT_SPINCTRL(IDC_MAXUP,			PrefsUnifiedDlg::OnRateLimitChanged)
+	EVT_COMMAND_SCROLL(IDC_SLIDER, PrefsUnifiedDlg::OnScrollBarChange)
+	EVT_COMMAND_SCROLL(IDC_SLIDER3, PrefsUnifiedDlg::OnScrollBarChange)
+	EVT_COMMAND_SCROLL(IDC_SLIDER4, PrefsUnifiedDlg::OnScrollBarChange)
+	EVT_COMMAND_SCROLL(IDC_SLIDER2, PrefsUnifiedDlg::OnScrollBarChange)
+	EVT_COMMAND_SCROLL(IDC_FILEBUFFERSIZE, PrefsUnifiedDlg::OnScrollBarChange)
+	EVT_COMMAND_SCROLL(IDC_QUEUESIZE, PrefsUnifiedDlg::OnScrollBarChange)
+	EVT_COMMAND_SCROLL(IDC_SERVERKEEPALIVE, PrefsUnifiedDlg::OnScrollBarChange)
 
-	EVT_LIST_ITEM_SELECTED(IDC_EVENTLIST,	PrefsUnifiedDlg::OnUserEventSelected)
+	EVT_SPINCTRL(IDC_MAXUP, PrefsUnifiedDlg::OnRateLimitChanged)
 
-	EVT_CHOICE(IDC_LANGUAGE,		PrefsUnifiedDlg::OnLanguageChoice)
+	EVT_LIST_ITEM_SELECTED(IDC_EVENTLIST, PrefsUnifiedDlg::OnUserEventSelected)
 
 	EVT_CLOSE(PrefsUnifiedDlg::OnClose)
 
 wxEND_EVENT_TABLE()
 
-
 /**
- * Creates an command-event for the given checkbox.
+ * Creates a command event for the given checkbox.
  *
- * This can be used enforce logical constraints by passing by
- * sending a check-box event for each checkbox, when transferring
- * 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.
+ * Use it to enforce logical constraints by sending a check-box event for each
+ * checkbox when transferring to the UI, and also for checkboxes whose only effect
+ * is enabling or disabling other widgets.
  */
-static void SendCheckBoxEvent(wxWindow* parent, int id)
+static void SendCheckBoxEvent(wxWindow *parent, int id)
 {
-	wxCheckBox* widget = CastByID(id, parent, wxCheckBox);
+	wxCheckBox *widget = CastByID(id, parent, wxCheckBox);
 	wxCHECK_RET(widget, "Invalid widget in CreateEvent");
 
 	wxCommandEvent evt(wxEVT_CHECKBOX, id);
@@ -174,147 +228,178 @@
 	parent->GetEventHandler()->ProcessEvent(evt);
 }
 
-
-
-/**
- * This struct provides a general way to represent config-tabs.
- */
+/** Represents one config tab. */
 struct PrefsPage
 {
 	//! The title of the page, used on the listctrl.
-	wxString	m_title;
+	wxString m_title;
 	//! Function pointer to the wxDesigner function creating the dialog.
-	wxSizer*	(*m_function)(wxWindow*, bool, bool );
+	wxSizer *(*m_function)(wxWindow *, bool, bool);
 	//! The index of the image used on the list.
-	int		m_imageidx;
+	int m_imageidx;
+	//! CamuleArtProvider icon name ("prefs_general"): resolved as "amule:<name>" for an
+	//! SVG-backed bundle before falling back to the legacy m_imageidx art.
+	const char *m_artName;
 };
 
-
-PrefsPage pages =
-{
-	{ wxTRANSLATE("General"),			PreferencesGeneralTab,		13 },
-	{ wxTRANSLATE("Connection"),		PreferencesConnectionTab,	14 },
-	{ wxTRANSLATE("Directories"),		PreferencesDirectoriesTab,	17 },
-	{ wxTRANSLATE("Servers"),			PreferencesServerTab,		15 },
-	{ wxTRANSLATE("Files"),				PreferencesFilesTab,		16 },
-	{ wxTRANSLATE("Security"),			PreferencesSecurityTab,		22 },
-	{ wxTRANSLATE("Interface"),			PreferencesGuiTweaksTab,	19 },
-#ifdef ENABLE_IP2COUNTRY
-	// Inserted between Interface and Statistics so the GeoIP / country-flag
-	// settings sit next to the related display option (the master
-	// IDC_SHOW_COUNTRY_FLAGS checkbox lives in this new tab too). Hidden
-	// from the page list when ENABLE_IP2COUNTRY is off so users who built
-	// without libmaxminddb don't see a panel that can't function.
-	{ wxTRANSLATE("IP2Country"),		PreferencesIP2CountryTab,	13 },
-#endif
-	{ wxTRANSLATE("Statistics"),		PreferencesStatisticsTab,	10 },
-	{ wxTRANSLATE("Proxy"),				PreferencesProxyTab,		24 },
-	{ wxTRANSLATE("Filters"),			PreferencesFilteringTab,	23 },
-	{ wxTRANSLATE("Remote Controls"),	PreferencesRemoteControlsTab,	11 },
-	{ wxTRANSLATE("Online Signature"),	PreferencesOnlineSigTab,	21 },
-	{ wxTRANSLATE("Advanced"),			PreferencesaMuleTweaksTab,	12 },
-	{ wxTRANSLATE("Events"),			PreferencesEventsTab,		5 }
+PrefsPage pages = { { wxTRANSLATE("General"), PreferencesGeneralTab, 13, "prefs_general" },
+	{ wxTRANSLATE("Connection"), PreferencesConnectionTab, 14, "prefs_connection" },
+	{ wxTRANSLATE("Directories"), PreferencesDirectoriesTab, 17, "prefs_directories" },
+#ifdef CLIENT_GUI
+	// Remote-only (issue #843): mapping a daemon's path space onto this machine's has no
+	// meaning for the monolithic app, which is its own daemon. Placed right after
+	// Directories, the other page about paths.
+	{ wxTRANSLATE("Path Mappings"), PreferencesPathMappingTab, 17, "prefs_pathmapping" },
+#endif
+	{ wxTRANSLATE("Servers"), PreferencesServerTab, 15, "prefs_servers" },
+	{ wxTRANSLATE("Files"), PreferencesFilesTab, 16, "prefs_files" },
+	{ wxTRANSLATE("Security"), PreferencesSecurityTab, 22, "prefs_security" },
+	{ wxTRANSLATE("Interface"), PreferencesGuiTweaksTab, 19, "prefs_interface" },
+#ifdef GEOIP_GUI
+	// Inserted between Interface and Statistics so the GeoIP / country-flag settings sit
+	// next to the related display option. Hidden from the page list when ENABLE_IP2COUNTRY
+	// is off, so users who built without libmaxminddb do not see a panel that cannot
+	// function.
+	{ wxTRANSLATE("IP2Country"), PreferencesIP2CountryTab, 13, "prefs_ip2country" },
+#endif
+	{ wxTRANSLATE("Statistics"), PreferencesStatisticsTab, 10, "prefs_statistics" },
+	{ wxTRANSLATE("Proxy"), PreferencesProxyTab, 24, "prefs_proxy" },
+	{ wxTRANSLATE("Filters"), PreferencesFilteringTab, 23, "prefs_filters" },
+	{ wxTRANSLATE("Remote Controls"), PreferencesRemoteControlsTab, 11, "prefs_remote" },
+	{ wxTRANSLATE("Online Signature"), PreferencesOnlineSigTab, 21, "prefs_onlinesig" },
+	{ wxTRANSLATE("Advanced"), PreferencesaMuleTweaksTab, 12, "prefs_advanced" },
+	{ wxTRANSLATE("Events"), PreferencesEventsTab, 5, "prefs_events" }
 #ifdef __DEBUG__
-	,{ wxTRANSLATE("Debugging"),		PreferencesDebug,			25 }
+	,
+	{ wxTRANSLATE("Debugging"), PreferencesDebug, 25, "prefs_debug" }
 #endif
 };
 
-
 PrefsUnifiedDlg::PrefsUnifiedDlg(wxWindow *parent)
-:
-wxDialog(parent, -1, _("Preferences"),
-	wxDefaultPosition, wxDefaultSize,
-	wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
+: wxDialog(parent,
+	  -1,
+	  _("Preferences"),
+	  wxDefaultPosition,
+	  wxDefaultSize,
+	  wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
-#ifdef ENABLE_IP2COUNTRY
+#ifdef GEOIP_GUI
 	s_activeInstance = this;
 #endif
+#ifdef CLIENT_GUI
+	s_openPrefsDlg = this;
+	m_sharedDirsDirty = false;
+	m_sharedDirsLoaded = false;
+	m_pathMappingHintWrapWidth = 0;
+#endif
 	preferencesDlgTop(this, false);
 
-	m_PrefsIcons = CastChild(ID_PREFSLISTCTRL, wxListCtrl);
-	// Pad the tab icons so they don't sit flush against the cell label
-	// and (on Mac) so they don't drop to the row baseline. wxOSX
-	// NSTableView draws the image with zero native horizontal gap and
-	// vertically centres the bitmap; wxGTK and wxMSW already insert a
-	// few pixels of horizontal padding natively and align top-to-top.
-	//
-	// Two-dimensional padding gated on Mac only:
-	//  * Right pad — visible gap between icon and the cell text.
-	//  * Bottom pad — taller bitmap; with the 16x16 source pinned to
-	//    the bitmap's top, NSTableView's vertical centring then lifts
-	//    the icon up to sit alongside the text baseline instead of
-	//    falling to the bottom of the row.
+	m_PrefsIcons = CastChild(ID_PREFSLISTCTRL, wxDataViewListCtrl);
 	const int kPrefsIconW = 16;
 	const int kPrefsIconH = 16;
-#ifdef __WXOSX__
-	const int kPrefsIconRightPad  = 14;
-	const int kPrefsIconBottomPad = 9;
+	// Room for the gap after the icon and the cell's left/right padding. On macOS this is
+	// only the width the list is built with, since the measurement below replaces it --
+	// but it has to be generous, because what that measurement reports is bounded by the
+	// room the control already has: ask from a column pinned to a tight estimate and the
+	// answer comes back tight. On GTK and MSW no measurement follows, so this is the width
+	// itself.
+#ifdef __WXMAC__
+	const int kCellPadding = 48;
 #else
-	const int kPrefsIconRightPad  = 0;
-	const int kPrefsIconBottomPad = 0;
+	const int kCellPadding = 24;
 #endif
-	const int kPrefsImageW = kPrefsIconW + kPrefsIconRightPad;
-	const int kPrefsImageH = kPrefsIconH + kPrefsIconBottomPad;
-	wxImageList *icon_list = new wxImageList(kPrefsImageW, kPrefsImageH);
-	m_PrefsIcons->AssignImageList(icon_list, wxIMAGE_LIST_SMALL);
-
-	// Wrap a 16x16 source bitmap into a kPrefsImageW x kPrefsImageH
-	// canvas with the source pinned to the top-left, right and bottom
-	// pads transparent. No-op when both pads are 0.
-	auto padIcon = &(const wxBitmap& src) -> wxBitmap {
-		if (kPrefsIconRightPad == 0 && kPrefsIconBottomPad == 0) {
-			return src;
-		}
+
+	// The page art only exists at one (16x16) size. Wrap each icon in a wxBitmapBundle
+	// with a smooth 2x upscale so DPI-aware builds render it at the correct logical size
+	// on hi-DPI screens instead of a tiny 16-physical-pixel square. The mask is turned into
+	// an alpha channel first because high-quality scaling needs it.
+	auto makeIcon = &(const wxBitmap &src) -> wxBitmapBundle {
 		wxImage img = src.ConvertToImage();
 		if (!img.HasAlpha()) {
 			img.InitAlpha();
 		}
-		wxImage padded = img.Size(
-			wxSize(kPrefsImageW, kPrefsImageH),
-			wxPoint(0, 0));
-		return wxBitmap(padded);
+		wxImage img2x = img.Scale(img.GetWidth() * 2, img.GetHeight() * 2, wxIMAGE_QUALITY_HIGH);
+		return wxBitmapBundle::FromBitmaps(wxBitmap(img), wxBitmap(img2x));
 	};
 
-	// Add the single column used
-	m_PrefsIcons->InsertColumn(
-		0, "", wxLIST_FORMAT_LEFT,
-		m_PrefsIcons->GetSize().GetWidth()-5);
+	// Single icon+text column. Width is computed below from the actual label text once
+	// every page's title is known -- wxDataViewColumn's own auto-size timing is not
+	// reliably immediate across native (GTK/macOS) vs generic (MSW) backends, so this
+	// measures text extents directly.
+	wxDataViewColumn *iconTextCol = m_PrefsIcons->AppendIconTextColumn(
+		"", wxDATAVIEW_CELL_INERT, wxCOL_WIDTH_DEFAULT, wxALIGN_LEFT, 0);
 
 	// Temp variables for finding the smallest height and width needed
 	int width = 0;
 	int height = 0;
 
-	// Add each page to the page-list
+	// Build the page icons, in page order
+	int maxLabelWidth = 0;
 	for (unsigned int i = 0; i < itemsof(pages); ++i) {
-		// The IP2Country tab uses an embedded-PNG icon shipped via
-		// CamuleArtProvider (registered in CamuleGuiApp::OnInit) rather
-		// than the hardcoded amuleSpecial XPM data the other tabs use.
-		// Existing tabs are kept on amuleSpecial to avoid a wholesale
-		// migration; new tabs should prefer the PNG path.
-#ifdef ENABLE_IP2COUNTRY
-		if (pagesi.m_function == PreferencesIP2CountryTab) {
-			icon_list->Add(padIcon(wxArtProvider::GetBitmap(
-				"amule:prefs_ip2country", wxART_OTHER, wxSize(kPrefsIconW, kPrefsIconH))));
+		// Page icons ship as SVG twins through CamuleArtProvider ("amule:prefs_<name>"),
+		// rasterized by wx at whatever size and DPI the list asks for. The legacy raster art
+		// below stays as the fallback.
+		wxBitmapBundle art =
+			wxArtProvider::GetBitmapBundle(CamuleArtProvider::MakeId(pagesi.m_artName),
+				wxART_LIST,
+				wxSize(kPrefsIconW, kPrefsIconH));
+		if (art.IsOk()) {
+			m_pageIcons.push_back(art);
 		} else
+#ifdef GEOIP_GUI
+			// Art-provider miss: the IP2Country tab asks the art provider once more for a
+			// plain bitmap, every other tab uses the hardcoded amuleSpecial raster data.
+			if (pagesi.m_function == PreferencesIP2CountryTab) {
+				m_pageIcons.push_back(
+					makeIcon(wxArtProvider::GetBitmap("amule:prefs_ip2country",
+						wxART_OTHER,
+						wxSize(kPrefsIconW, kPrefsIconH))));
+			} else
 #endif
-		{
-			icon_list->Add(padIcon(amuleSpecial(pagesi.m_imageidx)));
-		}
-		m_PrefsIcons->InsertItem(i, wxGetTranslation(pagesi.m_title), i);
-	}
+			{
+				m_pageIcons.push_back(makeIcon(amuleSpecial(pagesi.m_imageidx)));
+			}
+
+		const wxString label = wxGetTranslation(pagesi.m_title);
+		maxLabelWidth = std::max(maxLabelWidth, m_PrefsIcons->GetTextExtent(label).GetWidth());
 
-	// 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));
+		// Add each page to the page list. Item data is this page's stable pages index --
+		// never reordered, only which pages are visible changes -- not the row's live
+		// position, so OnPrefsPageChange can always identify the selected page even after a
+		// row has been hidden and re-shown.
+		wxVector<wxVariant> values;
+		values.push_back(wxVariant(wxDataViewIconText(label, m_pageIconsi)));
+		m_PrefsIcons->AppendItem(values, (wxUIntPtr)i);
+	}
+
+#ifdef __WXMAC__
+	// macOS 11 made the inset row style the default: it pads both ends of every row -- the
+	// same padding that draws a selected row as a rounded pill inside its cell rather than
+	// filling it -- and that padding comes out of the space the label is drawn in.
+	mac_set_table_view_flush(m_PrefsIcons->GetHandle());
+#endif
+
+	// Set the list width so there are no scrollers. What the cell needs beyond the label
+	// text -- the icon, the gap after it, the cell's own padding -- is the renderer's
+	// business, and only one of the three ports will say what it comes to: wxOSX answers
+	// wxCOL_WIDTH_AUTOSIZE with the width its cells want, while wxGTK and the generic
+	// implementation echo back the column's current allocation. So this estimate is what
+	// MSW and GTK get, and OnShowMeasureSidebar() replaces it on macOS once the control is
+	// laid out.
+	m_sidebarColumn = iconTextCol;
+	SetSidebarWidth(maxLabelWidth + FromDIP(kPrefsIconW + kCellPadding));
+#ifdef __WXMAC__
+	m_sidebarTextWidth = maxLabelWidth;
+	Bind(wxEVT_SHOW, &PrefsUnifiedDlg::OnShowMeasureSidebar, this);
+#endif
 
 	// Now add the pages and calculate the minimum size
-	wxPanel * DefaultWidget = NULL;
+	m_pageWidgets.assign(itemsof(pages), nullptr);
+	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);
-		// Widget is stored as user data in the list control
-		m_PrefsIcons->SetItemPtrData(i, (wxUIntPtr) Widget);
+		wxPanel *Widget = new wxPanel(this, -1);
+		m_pageWidgetsi = Widget;
 		pagesi.m_function(Widget, true, true);
 		if (i == 0) {
 			DefaultWidget = Widget;
@@ -324,56 +409,71 @@
 		prefs_sizer->Add(Widget, wxSizerFlags().Expand().Expand());
 
 		if (pagesi.m_function == PreferencesGeneralTab) {
-			// This must be done now or pages won't Fit();
-			#ifdef __WINDOWS__
-				CastChild(IDC_BROWSERTABS, wxCheckBox)->Enable(false);
-			#endif /* __WINDOWS__ */
-			CastChild(IDC_PREVIEW_NOTE, wxStaticText)->SetLabel(_("The following variables will be substituted:\n    %PARTFILE - full path to the file\n    %PARTNAME - file name only"));
-			// Tray-icon checkboxes (IDC_ENABLETRAYICON,
-			// IDC_MINTRAY) are visible on every platform now,
-			// including macOS. wxTaskBarIcon → NSStatusItem on
-			// Mac, NOTIFYICONDATA on Windows, GtkStatusIcon /
-			// libayatana SNI on Linux. macOS users who prefer
-			// the menu-bar status-item pattern (Spotify / Slack
-			// / Discord style) can opt in.
+// This must be done now or pages won't Fit();
+#if defined(CLIENT_GUI)
+			// Remote GUI: this checkbox toggles the *daemon's* version-check preference, so
+			// its visibility follows the connected daemon's capability, NOT amulegui's own
+			// build. The capability arrives via the EC tag on prefs-apply: a 3.1+ daemon
+			// built without ENABLE_VERSION_CHECK reports false (hide); a pre-3.1 daemon omits
+			// the tag and is treated as capable (show), since it still supports the
+			// preference.
+			if (!thePrefs::GetVersionCheckAvailable()) {
+				if (wxWindow *vc = FindWindow(IDC_NEWVERSION)) {
+					vc->Hide();
+				}
+			}
+#elif !defined(ENABLE_VERSION_CHECK)
+			// Monolithic built without the in-app check (OS-package build):
+			// hide the now-dead "Check for new version at startup" checkbox.
+			if (wxWindow *vc = FindWindow(IDC_NEWVERSION)) {
+				vc->Hide();
+			}
+#endif
+#ifdef __WINDOWS__
+			CastChild(IDC_BROWSERTABS, wxCheckBox)->Enable(false);
+#endif /* __WINDOWS__ */
+			CastChild(IDC_PREVIEW_NOTE, wxStaticText)
+				->SetLabel(_("The following variables will be substituted:\n    %PARTFILE - "
+					     "full path to the file\n    %PARTNAME - file name only"));
+			// Tray-icon checkboxes are visible on every platform now, including macOS:
+			// wxTaskBarIcon maps to NSStatusItem on Mac, NOTIFYICONDATA on Windows,
+			// GtkStatusIcon / libayatana SNI on Linux.
 #if defined(__WXGTK__) && !defined(WITH_LIBAYATANA_APPINDICATOR)
-			// On Linux without libayatana-appindicator3 the only
-			// backend wxTaskBarIcon can fall back to is the legacy
-			// GtkStatusIcon API, which GNOME Shell dropped in 3.26
-			// and wlroots-based compositors never implemented — the
-			// tray icon is silently invisible. Disable the option
-			// so users don't enable a feature that does nothing.
-			// (CamuleApp::OnInit force-clears UseTrayIcon at startup
-			// for the same reason, so dependent options cascade off
-			// even before the user opens this panel.)
+			// On Linux without libayatana-appindicator3 the only backend wxTaskBarIcon can
+			// fall back to is the legacy GtkStatusIcon API, which GNOME Shell dropped in 3.26
+			// and wlroots-based compositors never implemented -- the tray icon is silently
+			// invisible. Disable the option so users do not enable a feature that does
+			// nothing. CamuleApp::OnInit force-clears UseTrayIcon at startup for the same
+			// reason.
 			FindWindow(IDC_ENABLETRAYICON)->Enable(false);
-			FindWindow(IDC_ENABLETRAYICON)->SetToolTip(
-				_("Tray icon support requires libayatana-appindicator3 at compile time."));
+			FindWindow(IDC_ENABLETRAYICON)
+				->SetToolTip(_("Tray icon support requires libayatana-appindicator3 at "
+					       "compile time."));
 #endif
 
 #ifdef __WXGTK__
-			// xdg-shell intentionally doesn't deliver iconified-state
-			// notifications to clients, so the system minimize button
-			// on Wayland cannot trigger our hide-to-tray path. Same
-			// gap is documented across qBittorrent / Telegram /
-			// KeePassXC / Slack — none of them have a fix either.
-			// Grey out the option with a tooltip so the user
-			// understands why; the runtime sanity check in
-			// CamuleApp::OnInit keeps DoMinToTray() returning false
+			// xdg-shell intentionally does not deliver iconified-state notifications to
+			// clients, so the system minimize button on Wayland cannot trigger our
+			// hide-to-tray path -- the same gap qBittorrent, Telegram, KeePassXC and Slack all
+			// have. Grey out the option with a tooltip so the user understands why; the
+			// runtime sanity check in CamuleApp::OnInit keeps DoMinToTray() returning false
 			// regardless of the saved value.
 			if (CamuleAppCommon::IsWaylandSession()) {
-				FindWindow(IDC_MINTRAY)->SetToolTip(
-					_("Not available on Wayland: the protocol does not "
-					  "report when a window is minimized, so this option "
-					  "cannot intercept the system minimize button. "
-					  "Workaround: launch aMule with `GDK_BACKEND=x11` "
-					  "to use XWayland instead."));
+				FindWindow(IDC_MINTRAY)
+					->SetToolTip(_("Not available on Wayland: the protocol does not "
+						       "report when a window is minimized, so this option "
+						       "cannot intercept the system minimize button. "
+						       "Workaround: launch aMule with `GDK_BACKEND=x11` "
+						       "to use XWayland instead."));
 			}
 #endif
 		} else if (pagesi.m_function == PreferencesEventsTab) {
 
-#define USEREVENTS_REPLACE_VAR(VAR, DESC, CODE)	+ wxString("\n  %" VAR " - ") + wxGetTranslation(DESC)
-#define USEREVENTS_EVENT(ID, NAME, VARS) case CUserEvents::ID: CreateEventPanels(idx, "" VARS, Widget); break;
+#define USEREVENTS_REPLACE_VAR(VAR, DESC, CODE) +wxString("\n  %" VAR " - ") + wxGetTranslation(DESC)
+#define USEREVENTS_EVENT(ID, NAME, VARS) \
+	case CUserEvents::ID: \
+		CreateEventPanels(idx, "" VARS, Widget); \
+		break;
 
 			wxListCtrl *list = CastChild(IDC_EVENTLIST, wxListCtrl);
 			list->InsertColumn(0, "");
@@ -382,40 +482,45 @@
 					wxGetTranslation(CUserEvents::GetDisplayName(
 						static_cast<enum CUserEvents::EventType>(idx))));
 				if (lidx != -1) {
-					list->SetItemData(lidx,
-						USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT);
+					list->SetItemData(
+						lidx, 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("\n %SENDER - ") + wxTRANSLATE("Message sender."), Widget);
-						       break;
+						/* This macro expands to handle all user event types. Here is
+						   an example: case CUserEvents::NewChatSession: {
+						       CreateEventPanels(idx, wxString("\n %SENDER - ") +
+						   wxTRANSLATE("Message sender."), Widget); break;
 						   } */
 					}
 				}
 			}
 			list->SetColumnWidth(0, wxLIST_AUTOSIZE);
-		}
-		else if (pagesi.m_function == PreferencesServerTab) {
+		} else if (pagesi.m_function == PreferencesServerTab) {
 			m_IndexServerTab = i;
 			m_ServerWidget = Widget;
-		}
-		else if (pagesi.m_function == PreferencesaMuleTweaksTab) {
+#ifdef GEOIP_GUI
+		} else if (pagesi.m_function == PreferencesIP2CountryTab) {
+			m_IndexIP2CountryTab = static_cast<int>(i);
+#endif
+		} else if (pagesi.m_function == PreferencesaMuleTweaksTab) {
+			m_aMuleTweaksWidget = Widget;
 			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
+			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 (pagesi.m_function == PreferencesDebug) {
 			int count = theLogger.GetDebugCategoryCount();
-			wxCheckListBox* list = CastChild( ID_DEBUGCATS, wxCheckListBox );
+			wxCheckListBox *list = CastChild(ID_DEBUGCATS, wxCheckListBox);
 
-			for ( int j = 0; j < count; j++ ) {
-				list->Append( theLogger.GetDebugCategory( j ).GetName() );
+			for (int j = 0; j < count; j++) {
+				list->Append(theLogger.GetDebugCategory(j).GetName());
 			}
 		}
 #endif
@@ -442,30 +547,106 @@
 	// Default to the General tab
 	m_CurrentPanel = DefaultWidget;
 	prefs_sizer->Add(DefaultWidget, wxSizerFlags().Expand().Expand());
-	m_CurrentPanel->Show( true );
+	m_CurrentPanel->Show(true);
+
+	// The reset button only applies to the Advanced page; hide it until that
+	// page is selected (OnPrefsPageChange toggles it thereafter).
+	if (wxButton *resetBtn = CastChild(IDC_TWEAKS_RESET, wxButton)) {
+		resetBtn->Show(false);
+	}
+
+#ifdef CLIENT_GUI
+	// The shared-file exclusion preview counts against the core's in-memory shared list,
+	// which the remote GUI has no local access to. Remove the button and its info label
+	// here; the pattern/regex fields still work and sync to amuled over EC.
+	if (wxWindow *previewBtn = FindWindow(IDC_EXCLUDE_SHARE_PREVIEW)) {
+		previewBtn->Show(false);
+	}
+	if (wxWindow *previewInfo = FindWindow(IDC_EXCLUDE_SHARE_PREVIEW_INFO)) {
+		previewInfo->Show(false);
+	}
+#endif
+
+#if !defined(__WINDOWS__) && !defined(CLIENT_GUI)
+	// Monolithic non-Windows: this build is its own core and the setting is a no-op on
+	// POSIX, so hide it. Still registered, so the value keeps round-tripping through the
+	// config and EC.
+	if (wxWindow *sparse = FindWindow(IDC_CREATEFILESSPARSE)) {
+		sparse->Show(false);
+	}
+#endif
 
 	// Select the first item
-	m_PrefsIcons->SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+	m_PrefsIcons->SelectRow(0);
 
 	// We now have the needed minimum height and width
 	prefs_sizer->SetMinSize(width, height);
 
+#ifdef CLIENT_GUI
+	// amulegui: drop the IP2Country page from the menu when the connected core has no
+	// GeoIP support -- a 3.1+ core built without ENABLE_IP2COUNTRY, or a pre-3.1 core that
+	// does not know the capability at all. Mirrors how monolithic amule omits the page at
+	// compile time. Must run before EnableServerTab, which may delete the earlier server
+	// tab and shift this index; the page widget stays built but becomes unreachable.
+	if (!thePrefs::IsGeoIPSupported() && m_IndexIP2CountryTab >= 0) {
+		m_PrefsIcons->DeleteItem(m_IndexIP2CountryTab);
+		m_IndexIP2CountryTab = -1;
+	}
+#endif
+
 	// Don't show server prefs if ED2K is disabled
 	m_ServerTabVisible = true;
 	EnableServerTab(thePrefs::GetNetworkED2K());
 
 	// Store some often used pointers
 	m_ShareSelector = CastChild(IDC_SHARESELECTOR, CDirectoryTreeCtrl);
-	m_buttonColor   = CastChild(IDC_COLOR_BUTTON, wxButton);
-	m_choiceColor   = CastChild(IDC_COLORSELECTOR, wxChoice);
+	m_buttonColor = CastChild(IDC_COLOR_BUTTON, wxButton);
+	m_choiceColor = CastChild(IDC_COLORSELECTOR, wxChoice);
+
+	// Fill the "Bind to interface" and EC "listening interface" drop-downs with what this
+	// machine actually has. Done before the Cfg->widget transfer below so the stored value
+	// -- which may name an interface that is currently down -- is preserved as typed text.
+	// In CLIENT_GUI these are plain wxTextCtrls, since the daemon's interfaces are not this
+	// machine's.
+#ifndef CLIENT_GUI
+	// One enumeration feeds all three controls.
+	const std::vector<NetworkInterface> detectedInterfaces = DetectNetworkInterfaces();
+	wxArrayString interfaceNames;
+	for (const NetworkInterface &iface : detectedInterfaces) {
+		interfaceNames.Add(iface.name);
+	}
+
+	if (wxComboBox *ifaceBox = CastChild(IDC_INTERFACE, wxComboBox)) {
+		ifaceBox->Append(interfaceNames);
+	}
+	// Same for the EC-listener's own interface selector (Remote Controls tab).
+	if (wxComboBox *ecIfaceBox = CastChild(IDC_EC_INTERFACE, wxComboBox)) {
+		ecIfaceBox->Append(interfaceNames);
+	}
+	// The EC listen address. 127.0.0.1 leads because it is both the default and the safe
+	// answer, and 0.0.0.0 is spelled out so that opening the external connection to every
+	// network is a deliberate choice rather than the side effect of an empty field. This
+	// machine's own addresses follow.
+	if (wxComboBox *ecAddrBox = CastChild(IDC_EXT_CONN_IP, wxComboBox)) {
+		ecAddrBox->Append("127.0.0.1");
+		ecAddrBox->Append("0.0.0.0");
+		for (const NetworkInterface &iface : detectedInterfaces) {
+			for (const wxString &address : iface.ipv4) {
+				if (ecAddrBox->FindString(address) == wxNOT_FOUND) {
+					ecAddrBox->Append(address);
+				}
+			}
+		}
+	}
+#endif
 
 	// Connect the Cfgs with their widgets
 	thePrefs::CFGMap::iterator it = thePrefs::s_CfgList.begin();
-	for ( ; it != thePrefs::s_CfgList.end(); ++it ) {
+	for (; it != thePrefs::s_CfgList.end(); ++it) {
 		// Checking for failures
-		if ( !it->second->ConnectToWidget(it->first, this) ) {
-			AddLogLineNS(CFormat(_("Failed to connect Cfg to widget with the ID %d and key %s"))
-				% it->first % it->second->GetKey());
+		if (!it->second->ConnectToWidget(it->first, this)) {
+			AddLogLineNS(CFormat(_("Failed to connect Cfg to widget with the ID %d and key %s")) %
+				     it->first % it->second->GetKey());
 		}
 	}
 	Fit();
@@ -478,68 +659,122 @@
 	Center();
 }
 
-
 void PrefsUnifiedDlg::EnableServerTab(bool enable)
 {
 	if (enable && !m_ServerTabVisible) {
-	// turn server widget on
-		m_PrefsIcons->InsertItem(m_IndexServerTab, wxGetTranslation(pagesm_IndexServerTab.m_title), m_IndexServerTab);
-		m_PrefsIcons->SetItemPtrData(m_IndexServerTab, (wxUIntPtr) m_ServerWidget);
+		// Turn the server widget on. Item data is the page's stable pages index (see the
+		// constructor), not m_ServerWidget directly -- OnPrefsPageChange looks the widget up
+		// from m_pageWidgets by that index.
+		wxVector<wxVariant> values;
+		values.push_back(wxVariant(wxDataViewIconText(
+			wxGetTranslation(pagesm_IndexServerTab.m_title), m_pageIconsm_IndexServerTab)));
+		m_PrefsIcons->InsertItem(m_IndexServerTab, values, (wxUIntPtr)m_IndexServerTab);
 		m_ServerTabVisible = true;
 	} else if (!enable && m_ServerTabVisible) {
-	// turn server widget off
+		// turn server widget off
 		m_PrefsIcons->DeleteItem(m_IndexServerTab);
 		m_ServerTabVisible = false;
 	}
 }
 
-
-Cfg_Base* PrefsUnifiedDlg::GetCfg(int id)
+Cfg_Base *PrefsUnifiedDlg::GetCfg(int id)
 {
-	thePrefs::CFGMap::iterator it = thePrefs::s_CfgList.find( id );
+	thePrefs::CFGMap::iterator it = thePrefs::s_CfgList.find(id);
 
-	if ( it != thePrefs::s_CfgList.end() ) {
+	if (it != thePrefs::s_CfgList.end()) {
 		return it->second;
 	}
 
 	return NULL;
 }
 
-
 bool PrefsUnifiedDlg::TransferToWindow()
 {
 	// Connect the Cfgs with their widgets
 	thePrefs::CFGMap::iterator it = thePrefs::s_CfgList.begin();
-	for ( ; it != thePrefs::s_CfgList.end(); ++it ) {
+	for (; it != thePrefs::s_CfgList.end(); ++it) {
 		// Checking for failures
-		if ( !it->second->TransferToWindow() ) {
-			AddLogLineNS(CFormat(_("Failed to transfer data from Cfg to Widget with the ID %d and key %s"))
-				% it->first % it->second->GetKey());
+		if (!it->second->TransferToWindow()) {
+			AddLogLineNS(CFormat(_("Failed to transfer data from Cfg to Widget with the ID %d "
+					       "and key %s")) %
+				     it->first % it->second->GetKey());
 		}
 	}
 
-	// Load the user's intent (explicit non-recursive vs marked-recursive
-	// roots) into the tree control's two maps. shareddir_list itself
-	// is the runtime expansion -- not useful as UI state since it
-	// includes auto-discovered subdirs that shouldn't render as
-	// user-selected.
+	// The memory-mapped-I/O checkbox is only meaningful when the core we drive supports
+	// mmap: the local build on monolithic (MMAP_SUPPORTED), or the daemon's EC-advertised
+	// capability on the remote GUI. Hide it otherwise.
+	if (wxWindow *mmapBox = FindWindow(IDC_MMAP_ENABLE)) {
+		mmapBox->Show(thePrefs::GetMMapSupported());
+	}
+
+	// Load the user's intent (explicit non-recursive vs marked-recursive roots) into the
+	// tree control's two maps. shareddir_list itself is the runtime expansion, which
+	// includes auto-discovered subdirs that should not render as user-selected.
+#ifdef CLIENT_GUI
+	// Remote GUI: no tree to seed. Show whatever roots we already hold and ask the core
+	// for a fresh copy; the reply repaints us via RefreshSharedDirsIfOpen. Until it lands
+	// the editor's controls stay disabled, because an edit made before it arrives is an
+	// edit against a list we have not seen. Cleared here rather than at close: the dialog
+	// is created once and reused for every open.
+	m_sharedDirsLoaded = false;
+	PopulateSharedDirsList();
+	static_cast<CPreferencesRem *>(theApp->glob_prefs)->LoadSharedDirsRemote();
+
+	// Path mappings (#843): purely local, so there is no remote copy to
+	// fetch -- unlike shared dirs, this is the whole refresh.
+	PopulatePathMappingList();
+#else
 	m_ShareSelector->SetSharedDirectories(&theApp->glob_prefs->shareddir_explicit_list);
 	m_ShareSelector->SetRecursiveSharedDirectories(&theApp->glob_prefs->shareddir_recursive_list);
+#endif
 
-	// Autostart checkbox: state lives in the OS, never aMule.conf, so
-	// read live each time the dialog opens. The thePrefs Cfg machinery
-	// above doesn't know about it.
+	// Autostart checkbox: state lives in the OS, never aMule.conf, so read live
+	// each time the dialog opens. The thePrefs Cfg machinery does not know it.
 	wxCheckBox *autostartCb = static_cast<wxCheckBox *>(FindWindow(IDC_AUTOSTART_LOGIN));
 	if (autostartCb) {
 		autostartCb->SetValue(AutostartManager::IsEnabled());
 	}
 
-#ifdef ENABLE_IP2COUNTRY
-	// Sync the GeoIP source dropdown to the persisted source; the
-	// Cfg_ system above handles the credential / URL / auto-update
-	// fields, but the dropdown is driven through a custom handler so
-	// hide/show of the source sub-panels stays consistent. Also
-	// refresh the status block from the live CIP2Country state.
+	// URL-scheme handler checkboxes: same live-OS-state model. On macOS, LaunchServices
+	// has no "clear default handler" call, so Disable is a no-op -- toggling an
+	// already-checked box off changes nothing the user can observe. Rather than expose a
+	// dead control, hide the checkbox once aMule is the current handler. If they later
+	// switch away via macOS' native "Change All..." chooser, the checkbox reappears on the
+	// next open.
+	wxCheckBox *ed2kCb = static_cast<wxCheckBox *>(FindWindow(IDC_PROTOCOL_ED2K));
+	if (ed2kCb) {
+		bool enabled = ProtocolHandlerManager::IsEnabled(HandlerTarget::Ed2kScheme);
+		ed2kCb->SetValue(enabled);
+#ifdef __WXMAC__
+		ed2kCb->Show(!enabled);
+#endif
+	}
+	wxCheckBox *magnetCb = static_cast<wxCheckBox *>(FindWindow(IDC_PROTOCOL_MAGNET));
+	if (magnetCb) {
+		bool enabled = ProtocolHandlerManager::IsEnabled(HandlerTarget::MagnetScheme);
+		magnetCb->SetValue(enabled);
+#ifdef __WXMAC__
+		magnetCb->Show(!enabled);
+#endif
+	}
+	wxCheckBox *assocCb = static_cast<wxCheckBox *>(FindWindow(IDC_ASSOC_COLLECTION));
+	if (assocCb) {
+		bool enabled = ProtocolHandlerManager::IsEnabled(HandlerTarget::CollectionFile);
+		assocCb->SetValue(enabled);
+#ifdef __WXMAC__
+		// LaunchServices has no "clear default handler" call, so an already-registered box
+		// could not be unticked; hide it rather than offer a control that cannot work. Same as
+		// the schemes.
+		assocCb->Show(!enabled);
+#endif
+	}
+
+#ifdef GEOIP_GUI
+	// Sync the GeoIP source dropdown to the persisted source. The Cfg_ system above
+	// handles the credential / URL / auto-update fields, but the dropdown is driven through
+	// a custom handler so hide/show of the source sub-panels stays consistent. Also refresh
+	// the status block from the live state.
 	wxChoice *geoipSource = CastChild(IDC_GEOIP_SOURCE, wxChoice);
 	if (geoipSource) {
 		geoipSource->SetSelection(static_cast<int>(thePrefs::GetGeoIPSource()));
@@ -547,15 +782,14 @@
 		UpdateGeoIPStatus();
 		UpdateGeoIPControlsEnabled();
 	}
-	// Snapshot the source + credential values that aren't tracked
-	// by the Cfg system, so OnOk can tell whether anything
-	// download-affecting changed during the dialog session.
+	// Snapshot the source + credential values that are not tracked by the Cfg
+	// system, so OnOk can tell whether anything download-affecting changed.
 	m_GeoIPSourceAtOpen = static_cast<int>(thePrefs::GetGeoIPSource());
 	m_GeoIPMaxMindLicenseAtOpen = thePrefs::GetGeoIPMaxMindLicense();
 	m_GeoIPCustomUrlAtOpen = thePrefs::GetGeoIPCustomUrl();
 #endif
 
-	for ( int i = 0; i < cntStatColors; i++ ) {
+	for (int i = 0; i < cntStatColors; i++) {
 		thePrefs::s_colorsi = CMuleColour(CStatisticsDlg::acrStati).GetULong();
 		thePrefs::s_colors_refi = CMuleColour(CStatisticsDlg::acrStati).GetULong();
 	}
@@ -577,25 +811,46 @@
 	}
 
 	// Enable/Disable some controls
-	FindWindow( IDC_MINDISKSPACE )->Enable( thePrefs::IsCheckDiskspaceEnabled() );
-	FindWindow( IDC_OSDIR )->Enable( thePrefs::IsOnlineSignatureEnabled() );
-	FindWindow( IDC_OSUPDATE )->Enable( thePrefs::IsOnlineSignatureEnabled() );
-	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());
-
-	// The tray icon is the only recovery surface for a window hidden
-	// via the close button: on Linux/Windows the option needs the tray
-	// to bring the window back, and on macOS the matching code path
-	// (NSApplicationActivationPolicyAccessory) drops the Dock icon
-	// while hidden, so the tray is also the only way back there.
+	FindWindow(IDC_MINDISKSPACE)->Enable(thePrefs::IsCheckDiskspaceEnabled());
+	FindWindow(IDC_OSDIR)->Enable(thePrefs::IsOnlineSignatureEnabled());
+	FindWindow(IDC_OSUPDATE)->Enable(thePrefs::IsOnlineSignatureEnabled());
+	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_AMULEAPI_GUEST_PASSWD)->Enable(thePrefs::GetAmuleApiGuestIsEnabled());
+
+	// amuleapi's stored password is salted and stretched, so unlike the web server's it
+	// cannot be loaded back into the field. The field is a write-only request ("set it to
+	// this") and empty means "leave it alone", which needs saying somewhere the user looks
+	// -- otherwise an empty box reads as "no password configured".
+	SetCredentialStateLabel(IDC_AMULEAPI_PASSWD_STATE, thePrefs::GetAmuleApiAdminIsSet());
+
+	// Guest access is on exactly when a guest password is stored, so the checkbox already
+	// implies this. Spelled out anyway: an empty field beside a ticked box reads as
+	// "nothing configured" unless you know that invariant.
+	m_amuleApiGuestWasSet = thePrefs::GetAmuleApiGuestIsEnabled();
+	SetCredentialStateLabel(IDC_AMULEAPI_GUEST_PASSWD_STATE, m_amuleApiGuestWasSet);
+
+	// Gate the ffprobe path controls on the master Media metadata toggle so a disabled
+	// feature does not show a live-looking Detect / Browse UI that silently does nothing.
+	{
+		const bool mmOn = thePrefs::GetMediaMetadataEnabled();
+		FindWindow(IDC_MEDIAMETA_FFPROBEPATHTEXT)->Enable(mmOn);
+		FindWindow(IDC_MEDIAMETA_FFPROBEPATH)->Enable(mmOn);
+		FindWindow(IDC_MEDIAMETA_FFPROBEBROWSE)->Enable(mmOn);
+		FindWindow(IDC_MEDIAMETA_FFPROBEDETECT)->Enable(mmOn);
+	}
+
+	// The tray icon is the only recovery surface for a window hidden via the close button:
+	// on Linux/Windows the option needs the tray to bring the window back, and on macOS the
+	// matching code path drops the Dock icon while hidden, so the tray is also the only way
+	// back there.
 	FindWindow(IDC_MACHIDEONCLOSE)->Enable(thePrefs::UseTrayIcon());
 
 #ifdef __WXGTK__
-	const bool minTrayUsable = thePrefs::UseTrayIcon()
-		&& !CamuleAppCommon::IsWaylandSession();
+	const bool minTrayUsable = thePrefs::UseTrayIcon() && !CamuleAppCommon::IsWaylandSession();
 #else
 	const bool minTrayUsable = thePrefs::UseTrayIcon();
 #endif
@@ -624,47 +879,45 @@
 		FindWindow(IDC_SELTEMPDIR)->Enable(false);
 	}
 
-	// Hide preferences that are persisted only to amulegui's local
-	// remote.conf but never sent to amuled via EC_OP_SET_PREFERENCES
-	// (i.e. not packed by CEC_Prefs_Packet at all). The widget would
-	// otherwise show amulegui's stale local default -- not amuled's
-	// real value -- and editing it would silently affect nothing on
-	// the daemon side. Same gap holds whether amulegui is on a
-	// loopback or remote connection: amuled never reads remote.conf,
-	// so the control is dead in both cases. Hide unconditionally for
-	// CLIENT_GUI. Proxy settings (ID_PROXY_*) are deliberately *not*
-	// in this list -- they're consumed by amulegui's own HTTP client
-	// in ApplyProxyToDefaultSession() for the GeoIP database fetch,
-	// so they remain meaningful in CLIENT_GUI builds.
+	// Hide preferences that are persisted only to amulegui's local remote.conf but never
+	// sent to amuled via EC_OP_SET_PREFERENCES -- i.e. not packed by CEC_Prefs_Packet at
+	// all. The widget would otherwise show amulegui's stale local default rather than
+	// amuled's real value, and editing it would silently affect nothing on the daemon side.
+	//
+	// Proxy settings (ID_PROXY_*) are NOT in this list: they are packed by
+	// CEC_Prefs_Packet, so the remote GUI configures the daemon's proxy, and amulegui also
+	// uses the value locally for its own version-check HTTP. GeoIP, by contrast, is
+	// daemon-only -- amulegui has no local resolver.
 	const int amuledOnlyPrefs = {
-		IDC_ADDRESS,
-		IDC_ADDRESSTEXT,
-		IDC_UPNP_ENABLED,
-		IDC_UPNPTCPPORT,
-		IDC_UPNPTCPPORTTEXT,
+		// Web-server UPnP (amuleweb is deprecated) and EC-port UPnP (the EC port is not a P2P
+		// port) stay hidden; only the P2P-router UPnP is wired over EC, and it is
+		// capability-gated in the UPNP block below.
 		IDC_UPNP_WEBSERVER_ENABLED,
 		IDC_WEBUPNPTCPPORT,
 		IDC_WEBUPNPTCPPORTTEXT,
 		IDC_UPNP_EC_ENABLED,
-		IDC_OSDIR,
-		IDC_OSDIRTEXT,
+		// Online-signature "Browse" is a local file picker; the directory field
+		// + update frequency beside it are EC-wired and stay visible.
 		IDC_SELOSDIR,
-		IDC_OSUPDATE,
-		IDC_OSUPDATETEXT,
 		IDC_EXT_CONN_PARAMS_BOX,
 		IDC_EXT_CONN_ACCEPT,
 		IDC_EXT_CONN_IP,
 		IDC_EXT_CONN_IPTEXT,
+		IDC_EC_INTERFACE,
+		IDC_EC_INTERFACETEXT,
 		IDC_EXT_CONN_TCP_PORT,
 		IDC_EXT_CONN_TCPPORTTEXT,
 		IDC_EXT_CONN_PASSWD,
 		IDC_EXT_CONN_PASSWDTEXT,
-		IDC_PARANOID,
-		IDC_IPFILTERSYS,
-		IDC_STARTNEXTFILE_ALPHA,
+		IDC_EXT_CONN_REQUIRE_ENCRYPTION,
+		// ffprobe "Browse" (local file picker) and "Detect" (auto-detects on the GUI host, not
+		// the daemon) cannot target the daemon filesystem. The enable toggle + path field are
+		// EC-wired and stay visible.
+		IDC_MEDIAMETA_FFPROBEBROWSE,
+		IDC_MEDIAMETA_FFPROBEDETECT,
 	};
 	for (int id : amuledOnlyPrefs) {
-		if (wxWindow* w = FindWindow(id)) {
+		if (wxWindow *w = FindWindow(id)) {
 			w->Hide();
 		}
 	}
@@ -675,14 +928,11 @@
 	::SendCheckBoxEvent(this, IDC_ENABLE_PO_OUTGOING);
 	::SendCheckBoxEvent(this, IDC_ENFORCE_PO_INCOMING);
 
-#ifndef ENABLE_IP2COUNTRY
-	// The country-flags checkbox + the rest of the IP2Country controls
-	// only live in the dedicated PreferencesIP2CountryTab, which is
-	// `#ifdef ENABLE_IP2COUNTRY`-gated in the pages table. With
-	// libmaxminddb missing, neither the tab nor any of its widgets
-	// exists, so there's nothing to disable here -- the *.NewCfgItem
-	// bindings below are gated the same way, and SetGeoIPEnabled stays
-	// at its default false.
+#ifndef GEOIP_GUI
+	// The country-flags checkbox and the rest of the IP2Country controls only live in the
+	// dedicated PreferencesIP2CountryTab, which is `#ifdef GEOIP_GUI`-gated in the pages
+	// table. With libmaxminddb missing, neither the tab nor any of its widgets exists, so
+	// there is nothing to disable here.
 #endif
 
 #ifdef __GIT__
@@ -699,6 +949,19 @@
 	CastChild(IDC_RATESAFTERTITLE, wxRadioButton)->SetValue(thePrefs::GetShowRatesOnTitle() != 2);
 
 	// UPNP
+#ifdef CLIENT_GUI
+	// Gate the P2P-router UPnP controls on the daemon's advertised capability
+	// (EC_TAG_GENERAL_UPNP_AVAILABLE), not amulegui's own ENABLE_UPNP -- the daemon is what
+	// forwards. Do NOT clobber the pref when unavailable: the value belongs to the daemon.
+	if (thePrefs::GetUPnPAvailable()) {
+		FindWindow(IDC_UPNPTCPPORT)->Enable(thePrefs::GetUPnPEnabled());
+		FindWindow(IDC_UPNPTCPPORTTEXT)->Enable(thePrefs::GetUPnPEnabled());
+	} else {
+		FindWindow(IDC_UPNP_ENABLED)->Enable(false);
+		FindWindow(IDC_UPNPTCPPORT)->Enable(false);
+		FindWindow(IDC_UPNPTCPPORTTEXT)->Enable(false);
+	}
+#else
 #ifndef ENABLE_UPNP
 	FindWindow(IDC_UPNP_ENABLED)->Enable(false);
 	FindWindow(IDC_UPNPTCPPORT)->Enable(false);
@@ -716,14 +979,15 @@
 	FindWindow(IDC_WEBUPNPTCPPORT)->Enable(thePrefs::GetUPnPWebServerEnabled());
 	FindWindow(IDC_WEBUPNPTCPPORTTEXT)->Enable(thePrefs::GetUPnPWebServerEnabled());
 #endif
+#endif
 
 #ifdef __DEBUG__
 	// Set debugging toggles
 	int count = theLogger.GetDebugCategoryCount();
-	wxCheckListBox* list = CastChild( ID_DEBUGCATS, wxCheckListBox );
+	wxCheckListBox *list = CastChild(ID_DEBUGCATS, wxCheckListBox);
 
-	for ( int i = 0; i < count; i++ ) {
-		list->Check( i, theLogger.GetDebugCategory( i ).IsEnabled() );
+	for (int i = 0; i < count; i++) {
+		list->Check(i, theLogger.GetDebugCategory(i).IsEnabled());
 	}
 #endif
 
@@ -733,85 +997,148 @@
 	return true;
 }
 
-
 bool PrefsUnifiedDlg::TransferFromWindow()
 {
 	// Connect the Cfgs with their widgets
 	thePrefs::CFGMap::iterator it = thePrefs::s_CfgList.begin();
-	for ( ; it != thePrefs::s_CfgList.end(); ++it ) {
+	for (; it != thePrefs::s_CfgList.end(); ++it) {
 		// Checking for failures
-		if ( !it->second->TransferFromWindow() ) {
-			AddLogLineNS(CFormat(_("Failed to transfer data from Widget to Cfg with the ID %d and key %s"))
-				% it->first % it->second->GetKey());
+		if (!it->second->TransferFromWindow()) {
+			AddLogLineNS(CFormat(_("Failed to transfer data from Widget to Cfg with the ID %d "
+					       "and key %s")) %
+				     it->first % it->second->GetKey());
 		}
 	}
 
-	// shareddir_list is committed separately from OnOk (see
-	// CommitSharedDirsWithProgress) so that recursive-share expansion
-	// can run on a worker thread with a progress dialog and a cancel
-	// button. Doing it eagerly here would re-introduce the multi-
-	// minute UI freeze that issue #592 hit on /home-sized roots.
+	// shareddir_list is committed separately from OnOk (see CommitSharedDirsWithProgress)
+	// so that recursive-share expansion can run on a worker thread with a progress dialog
+	// and a cancel button. Doing it eagerly here would re-introduce the multi-minute UI
+	// freeze on /home-sized roots.
 
-	for ( int i = 0; i < cntStatColors; i++ ) {
-		if ( thePrefs::s_colorsi != thePrefs::s_colors_refi ) {
+	for (int i = 0; i < cntStatColors; i++) {
+		if (thePrefs::s_colorsi != thePrefs::s_colors_refi) {
 			CStatisticsDlg::acrStati = thePrefs::s_colorsi;
 			theApp->amuledlg->m_statisticswnd->ApplyStatsColor(i);
 		}
-
-		theApp->amuledlg->m_kademliawnd->SetGraphColors();
 	}
+	// The Kad graph re-reads all of its colours in one go, so it only needs
+	// telling once, after the loop above has updated acrStat.
+	theApp->amuledlg->m_kademliawnd->SetGraphColors();
 
 #ifdef __DEBUG__
 	// Get debugging toggles
 	int count = theLogger.GetDebugCategoryCount();
-	wxCheckListBox* list = CastChild( ID_DEBUGCATS, wxCheckListBox );
+	wxCheckListBox *list = CastChild(ID_DEBUGCATS, wxCheckListBox);
 
-	for ( int i = 0; i < count; i++ ) {
-		theLogger.SetEnabled( theLogger.GetDebugCategory( i ).GetType(), list->IsChecked( i ) );
+	for (int i = 0; i < count; 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);
+	thePrefs::SetShowRatesOnTitle(
+		CastChild(IDC_SHOWRATEONTITLE, wxCheckBox)->GetValue()
+			? (CastChild(IDC_RATESBEFORETITLE, wxRadioButton)->GetValue() ? 2 : 1)
+			: 0);
 
-	#ifdef CLIENT_GUI
+#ifdef CLIENT_GUI
+#ifdef GEOIP_GUI
+	// Parity with monolithic's auto-download-on-OK: if the GeoIP source or the active
+	// source's credential changed since the panel opened, ask the daemon to re-download
+	// from the new source by piggy-backing a one-shot UPDATE_NOW on the prefs packet.
+	// Commit the credential fields to the statics first -- SendToRemote serialises from
+	// there, not from the live widgets.
+	thePrefs::SetGeoIPMaxMindLicense(CastChild(IDC_GEOIP_MAXMIND_LIC, wxTextCtrl)->GetValue());
+	thePrefs::SetGeoIPCustomUrl(CastChild(IDC_GEOIP_CUSTOM_URL, wxTextCtrl)->GetValue());
+	const bool geoipSourceChanged = static_cast<int>(thePrefs::GetGeoIPSource()) != m_GeoIPSourceAtOpen;
+	bool geoipCredChanged = false;
+	switch (thePrefs::GetGeoIPSource()) {
+	case CPreferences::GeoIPSourceMaxMind:
+		geoipCredChanged = thePrefs::GetGeoIPMaxMindLicense() != m_GeoIPMaxMindLicenseAtOpen;
+		break;
+	case CPreferences::GeoIPSourceCustom:
+		geoipCredChanged = thePrefs::GetGeoIPCustomUrl() != m_GeoIPCustomUrlAtOpen;
+		break;
+	default:
+		break;
+	}
+	thePrefs::SetGeoIPUpdateRequested(
+		thePrefs::IsGeoIPEnabled() && (geoipSourceChanged || geoipCredChanged));
+#endif
 	// Send preferences to core.
 	theApp->glob_prefs->SendToRemote();
-	#endif
+#ifdef GEOIP_GUI
+	thePrefs::SetGeoIPUpdateRequested(false);
+#endif
+#endif
 
 	return true;
 }
 
-
 bool PrefsUnifiedDlg::CfgChanged(int ID)
 {
-	Cfg_Base* cfg = GetCfg(ID);
+	Cfg_Base *cfg = GetCfg(ID);
 
-	if ( cfg ) {
+	if (cfg) {
 		return cfg->HasChanged();
 	}
 
 	return false;
 }
 
+void PrefsUnifiedDlg::SetCredentialStateLabel(int id, bool isSet)
+{
+	CastChild(id, wxStaticText)->SetLabel(isSet ? _("A password is set.") : _("No password set."));
+}
 
-void PrefsUnifiedDlg::OnOk(wxCommandEvent& WXUNUSED(event))
+void PrefsUnifiedDlg::OnOk(wxCommandEvent &WXUNUSED(event))
 {
 	TransferFromWindow();
 
-	// Commit the share list with the recursive-expand-on-worker-
-	// thread path. Done after TransferFromWindow (so other prefs
-	// are already populated in glob_prefs) but before Save() so a
-	// successful commit ends up in shareddir.dat alongside the rest.
-	// If the user cancels at the confirm or the progress dialog,
-	// bail out of OnOk *before* anything is persisted — so the prefs
-	// dialog stays open and the user can adjust their selection
-	// without losing the rest of their pending pref changes.
+	// Commit the share list with the recursive-expand-on-worker-thread path. After
+	// TransferFromWindow, so other prefs are already in glob_prefs, but before Save() so a
+	// successful commit ends up in shareddir.dat alongside the rest. If the user cancels at
+	// the confirm or the progress dialog, bail out of OnOk *before* anything is persisted,
+	// so the dialog stays open and the rest of their pending changes are not lost.
 	const SharedDirsCommitResult shareResult = CommitSharedDirsWithProgress();
 	if (shareResult == SharedDirsCommitResult::CancelledByUser) {
 		return;
 	}
-	const bool sharedDirsCommitted =
-		(shareResult == SharedDirsCommitResult::Committed);
+	const bool sharedDirsCommitted = (shareResult == SharedDirsCommitResult::Committed);
+
+	// Guest access ticked, nothing typed, nothing stored: "keep the current password" has
+	// nothing to keep. Caught here, before anything is persisted, so the dialog stays open
+	// on the offending field -- reporting it after the save would leave the user reading an
+	// error about a closed dialog.
+	if (thePrefs::GetAmuleApiGuestIsEnabled() && thePrefs::GetAmuleApiGuestPass().IsEmpty() &&
+		!m_amuleApiGuestWasSet) {
+		wxMessageBox(_("Guest access needs a password. Type one in the guest password "
+			       "field, or untick Enable guest access."),
+			_("Message"),
+			wxOK | wxICON_INFORMATION,
+			this);
+		if (wxWindow *field = FindWindow(IDC_AMULEAPI_GUEST_PASSWD)) {
+			field->SetFocus();
+		}
+		return;
+	}
+
+	// Same for external connections: enabled with no password is not a configuration aMule
+	// can act on. This used to report the problem and then quietly clear the checkbox on
+	// the way out, so the dialog closed with the user's intent discarded and the message
+	// already dismissed. Keep the dialog open on the password field instead. Wording
+	// unchanged so existing translations still apply.
+	if (thePrefs::AcceptExternalConnections() && thePrefs::ECPassword().IsEmpty()) {
+		wxMessageBox(_("You have enabled external connections but have not specified a "
+			       "password.\nExternal connections cannot be enabled unless a valid "
+			       "password is specified."),
+			_("Message"),
+			wxOK | wxICON_INFORMATION,
+			this);
+		if (wxWindow *field = FindWindow(IDC_EXT_CONN_PASSWD)) {
+			field->SetFocus();
+		}
+		return;
+	}
 
 	bool restart_needed = false;
 	wxString restart_needed_msg = _("aMule must be restarted to enable these changes:\n\n");
@@ -829,6 +1156,11 @@
 		restart_needed_msg += _("- UDP port changed.\n");
 	}
 
+	if (CfgChanged(IDC_INTERFACE)) {
+		restart_needed = true;
+		restart_needed_msg += _("- Network interface binding changed.\n");
+	}
+
 	if (CfgChanged(IDC_EXT_CONN_TCP_PORT)) {
 		restart_needed = true;
 		restart_needed_msg += _("- External connect port changed.\n");
@@ -837,7 +1169,7 @@
 		restart_needed = true;
 		restart_needed_msg += _("- External connect acceptance changed.\n");
 	}
-	if (CfgChanged(IDC_EXT_CONN_IP)) {
+	if (CfgChanged(IDC_EXT_CONN_IP) || CfgChanged(IDC_EC_INTERFACE)) {
 		restart_needed = true;
 		restart_needed_msg += _("- External connect interface changed.\n");
 	}
@@ -846,27 +1178,97 @@
 		restart_needed_msg += _("- Protocol obfuscation support changed.\n");
 	}
 
+	// HTTP side-channels (version check, GeoIP, server.met, nodes.dat) go through a
+	// wxWebSession that is handed its proxy once, when it is created: wx's WinHTTP backend
+	// refuses a proxy change after the session's first request. P2P proxying is not
+	// affected -- that runs through CProxySocket and picks the new settings up immediately
+	// -- which is why the message names HTTP specifically rather than claiming the whole
+	// setting is inert.
+	if (CfgChanged(ID_PROXY_ENABLE_PROXY) || CfgChanged(ID_PROXY_TYPE) || CfgChanged(ID_PROXY_NAME) ||
+		CfgChanged(ID_PROXY_PORT) || CfgChanged(ID_PROXY_ENABLE_PASSWORD) ||
+		CfgChanged(ID_PROXY_USER) || CfgChanged(ID_PROXY_PASSWORD)) {
+		restart_needed = true;
+		restart_needed_msg += _("- Proxy settings changed (needed for HTTP transfers).\n");
+	}
+
+	// amuleapi is launched once at startup with its bind address and port, so a change to
+	// either takes effect only after aMule relaunches it. Passwords are deliberately not in
+	// this list: amuleapi re-reads amuleapi-passwords on every login, so a password change
+	// is live. Skip the prompt when external connections will not be usable, so we do not
+	// tell the user to restart for a service that will not run.
+	const bool ecUsable = thePrefs::AcceptExternalConnections() && !thePrefs::ECPassword().IsEmpty();
+	if (ecUsable && (CfgChanged(IDC_ENABLE_AMULEAPI) || CfgChanged(IDC_AMULEAPI_PORT) ||
+				CfgChanged(IDC_AMULEAPI_BIND))) {
+		restart_needed = true;
+		restart_needed_msg += _("- amuleapi settings changed.\n");
+	}
+
 	// Force port checking
 	thePrefs::SetPort(thePrefs::GetPort());
 
 	if ((CPath::GetFileSize(thePrefs::GetConfigDir() + "addresses.dat") == 0) &&
-		CastChild(IDC_AUTOSERVER, wxCheckBox)->IsChecked() ) {
+		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."),
-			_("Message"), wxOK | wxICON_INFORMATION, this);
+		wxMessageBox(_("Your Auto-update server list is empty.\n'Auto-update server list at startup' "
+			       "will be disabled."),
+			_("Message"),
+			wxOK | wxICON_INFORMATION,
+			this);
 	}
 
-	if (thePrefs::AcceptExternalConnections() && thePrefs::ECPassword().IsEmpty()) {
-		thePrefs::EnableExternalConnections( false );
-
-		wxMessageBox( _("You have enabled external connections but have not specified a password.\nExternal connections cannot be enabled unless a valid password is specified."));
+#ifndef CLIENT_GUI
+	// The web server and amuleapi are EC clients of the core; without external connections
+	// they can never connect. OnCheckBoxChange already warns live and reverts the toggles,
+	// so this is a silent backstop that keeps the saved prefs consistent for a config
+	// loaded in a mismatched state.
+	//
+	// amulegui is itself a connected EC client, so external connections are necessarily
+	// enabled on the daemon; its local AcceptExternalConnections pref only mirrors
+	// remote.conf, so this backstop must not run there.
+	if ((thePrefs::GetWSIsEnabled() || thePrefs::GetAmuleApiIsEnabled()) &&
+		!thePrefs::AcceptExternalConnections()) {
+		thePrefs::SetWSIsEnabled(false);
+		thePrefs::SetAmuleApiIsEnabled(false);
 	}
+#endif
+
+#ifdef CLIENT_GUI
+	// Path mappings (#843): harvest before Save(), same as the shared-dirs
+	// commit above, so this ends up persisted alongside the rest.
+	HarvestPathMappingList();
+#endif
 
 	// save the preferences on ok
 	theApp->glob_prefs->Save();
 
+	// Store any amuleapi password the user just typed. Deliberately after Save(), which is
+	// what writes amule.conf locally and what ships the request to the daemon over EC.
+#ifndef CLIENT_GUI
+	{
+		wxString credentialError;
+		if (!AmuleApiCredentials::ApplyPrefs(credentialError)) {
+			wxMessageBox(
+				CFormat(_("The amuleapi password could not be saved: %s")) % credentialError,
+				_("ERROR"),
+				wxOK | wxICON_ERROR,
+				this);
+		}
+	}
+#else
+	// A remote GUI has no credential file of its own -- the daemon has already been handed
+	// the request by Save() and does the storing. Two things still have to happen here that
+	// the daemon cannot do for us: drop the pending digest, so it is not re-sent on every
+	// later save and does not sit in memory for the rest of the session; and remember that
+	// a password now exists, so reopening this dialog says so instead of "No password set".
+	if (!thePrefs::GetAmuleApiPass().IsEmpty()) {
+		thePrefs::SetAmuleApiAdminIsSet(true);
+		thePrefs::SetAmuleApiPass(wxEmptyString);
+	}
+	thePrefs::SetAmuleApiGuestPass(wxEmptyString);
+#endif
+
 	if (CfgChanged(IDC_FED2KLH) && theApp->amuledlg->GetActiveDialog() != CamuleDlg::DT_SEARCH_WND) {
-		theApp->amuledlg->ShowED2KLinksHandler( thePrefs::GetFED2KLH() );
+		theApp->amuledlg->ShowED2KLinksHandler(thePrefs::GetFED2KLH());
 	}
 
 	if (CfgChanged(IDC_LANGUAGE)) {
@@ -884,14 +1286,15 @@
 		restart_needed_msg += _("- ED2K network enabled.\n");
 	}
 
-	// CommitSharedDirsWithProgress already ran Reload (with progress
-	// + cancel) when shareddir_list itself changed. We only need to
-	// trigger a fresh Reload here for the other paths IDC_INCFILES /
-	// IDC_TEMPFILES affect.
-	if (!sharedDirsCommitted
-		&& (CfgChanged(IDC_INCFILES) || CfgChanged(IDC_TEMPFILES)))
-	{
-		theApp->sharedfiles->Reload();
+	// CommitSharedDirsWithProgress already ran Reload (with progress and cancel) when
+	// shareddir_list itself changed; this only triggers a fresh Reload for the other paths
+	// IDC_INCFILES / IDC_TEMPFILES affect. The three settings below each need a re-walk,
+	// and a single OK can change all three -- which used to mean up to three full walks
+	// back to back. Collect the need and do one walk at the end instead.
+	bool needsSharedReload = false;
+
+	if (!sharedDirsCommitted && (CfgChanged(IDC_INCFILES) || CfgChanged(IDC_TEMPFILES))) {
+		needsSharedReload = true;
 	}
 
 	if (CfgChanged(IDC_AUTO_RESCAN_SHARED)) {
@@ -901,18 +1304,58 @@
 	}
 
 	if (CfgChanged(IDC_FOLLOW_SYMLINKS_SHARED) && !sharedDirsCommitted) {
-		// Re-scan so the new symlink policy takes effect on the existing
-		// shared tree: turning the toggle off should drop symlinked
-		// entries already in the shareset, turning it on should pick
-		// them up.
-		theApp->sharedfiles->Reload();
+		// Re-scan so the new symlink policy takes effect on the existing shared tree:
+		// turning the toggle off should drop symlinked entries already in the shareset,
+		// turning it on should pick them up.
+		needsSharedReload = true;
+	}
+
+	if (CfgChanged(IDC_EXCLUDE_SHARE_PATTERNS) || CfgChanged(IDC_EXCLUDE_SHARE_REGEX)) {
+		// Reject-on-apply: in regex mode an invalid expression leaves the filter disabled
+		// (fail-open, never exclude-all), so tell the user rather than silently sharing
+		// everything.
+		if (thePrefs::ExcludeSharePatternsUseRegex()) {
+			CShareExcludeFilter probe;
+			probe.Compile(thePrefs::GetExcludeSharePatterns(), true);
+			if (!probe.IsValid()) {
+				wxMessageBox(_("The shared-file exclusion pattern is not a valid "
+					       "regular expression. The filter has been left disabled."),
+					_("Invalid regular expression"),
+					wxOK | wxICON_WARNING,
+					this);
+			}
+		}
+		thePrefs::RecompileShareExcludeFilter();
+		// Re-scan so newly excluded files leave the shareset and files no
+		// longer matching return.
+		if (!sharedDirsCommitted) {
+			needsSharedReload = true;
+		}
+	}
+
+	// One walk for whichever of the three settings changed. Progress-and-yield rather than
+	// a bare Reload(): the walk costs roughly a stat per shared file, so on a large or
+	// network-mounted tree it runs for seconds to minutes, and without a yield callback
+	// CSharedFileList pumps nothing at all -- the window greys out as "not responding" with
+	// no indication why.
+	//
+	// Pumping here is safe: wxProgressDialog's yield is restricted to UI events, so it
+	// cannot dispatch the queued socket events that carry EC requests, and no client can be
+	// answered from the transiently-empty share map.
+	//
+	// No cancel button, for the same reason as the shared-files Reload button:
+	// FindSharedFiles clears the map before walking, so an abort would leave a partial
+	// share list with nothing to restore. CommitSharedDirsWithProgress can offer one only
+	// because it keeps the previous directory list.
+	if (needsSharedReload) {
+		ReloadSharedFilesWithProgress(this);
 	}
 
 	if (CfgChanged(IDC_OSDIR) || CfgChanged(IDC_ONLINESIG)) {
-		wxTextCtrl* widget = CastChild( IDC_OSDIR, wxTextCtrl );
+		wxTextCtrl *widget = CastChild(IDC_OSDIR, wxTextCtrl);
 
 		// Build the filenames for the two OS files
-		theApp->SetOSFiles( widget->GetValue() );
+		theApp->SetOSFiles(widget->GetValue());
 	}
 
 	if (CfgChanged(IDC_IPFCLIENTS) && thePrefs::IsFilteringClients()) {
@@ -941,22 +1384,30 @@
 		theApp->amuledlg->m_transferwnd->UpdateCatTabTitles();
 	}
 
+	// Applied live rather than listed as restart-needed: the search panel swaps the Name
+	// field between a history dropdown and a plain text field, hides or shows its Clear
+	// button, and (re)loads the stored terms -- all of which it can do in place (issue
+	// #697).
+	if (CfgChanged(IDC_SEARCHHISTORYENABLED) && theApp->amuledlg->m_searchwnd != nullptr) {
+		theApp->amuledlg->m_searchwnd->ApplySearchHistoryPref();
+	}
+
 	// Changes related to the statistics-dlg
 	if (CfgChanged(IDC_SLIDER)) {
 		theApp->amuledlg->m_statisticswnd->SetUpdatePeriod(thePrefs::GetTrafficOMeterInterval());
 		theApp->amuledlg->m_kademliawnd->SetUpdatePeriod(thePrefs::GetTrafficOMeterInterval());
 	}
 
-	if ( CfgChanged(IDC_SLIDER3) ) {
+	if (CfgChanged(IDC_SLIDER3)) {
 		theApp->amuledlg->m_statisticswnd->ResetAveragingTime();
 	}
 
 	if (CfgChanged(IDC_DOWNLOAD_CAP)) {
-		theApp->amuledlg->m_statisticswnd->SetARange( true, thePrefs::GetMaxGraphDownloadRate() );
+		theApp->amuledlg->m_statisticswnd->SetARange(true, thePrefs::GetMaxGraphDownloadRate());
 	}
 
 	if (CfgChanged(IDC_UPLOAD_CAP)) {
-		theApp->amuledlg->m_statisticswnd->SetARange( false, thePrefs::GetMaxGraphUploadRate() );
+		theApp->amuledlg->m_statisticswnd->SetARange(false, thePrefs::GetMaxGraphUploadRate());
 	}
 
 	if (CfgChanged(IDC_SKIN)) {
@@ -972,13 +1423,16 @@
 	}
 
 	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."));
+		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);
+		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)) {
@@ -986,32 +1440,28 @@
 	}
 
 	if (CfgChanged(IDC_SHOW_COUNTRY_FLAGS)) {
-		theApp->amuledlg->EnableIP2Country();
+		// Local enable/disable toggle -- treat as startup so enabling refreshes.
+		theApp->EnableIP2Country(true);
 	}
 
-#ifdef ENABLE_IP2COUNTRY
-	// Auto-download on OK when the user changed anything that affects
-	// *which* file should be on disk. Without this, switching source
-	// DB-IP→MaxMind (or pasting a new license) leaves the old file
-	// loaded until the user remembers to click Update now. We skip
-	// the download if:
-	//   * IP2Country is disabled (the file is irrelevant), or
-	//   * the user just toggled the master enable on — EnableIP2Country
-	//     above already handles missing-file → Update() in that case.
-	// Triggered as a manual update so the user sees a popup if their
-	// new credentials are bad, rather than a silent log line.
-	if (thePrefs::IsGeoIPEnabled()
-		&& !CfgChanged(IDC_SHOW_COUNTRY_FLAGS)
-		&& theApp->amuledlg && theApp->amuledlg->m_IP2Country) {
+#if defined(ENABLE_IP2COUNTRY) && !defined(CLIENT_GUI)
+	// Auto-download on OK when the user changed anything that affects *which* file should
+	// be on disk. Without this, switching source DB-IP -> MaxMind, or pasting a new
+	// license, leaves the old file loaded until the user remembers to click Update now.
+	// Skipped when IP2Country is disabled, or when the user just toggled the master enable
+	// on -- EnableIP2Country above already handles missing-file -> Update() in that case.
+	// Triggered as a manual update so bad credentials pop up rather than a silent log line.
+	// Monolithic only: amulegui's OK send carries the new settings and the daemon
+	// re-downloads.
+	if (thePrefs::IsGeoIPEnabled() && !CfgChanged(IDC_SHOW_COUNTRY_FLAGS) && theApp->amuledlg &&
+		theApp->GetIP2Country()) {
 		const bool sourceChanged =
 			static_cast<int>(thePrefs::GetGeoIPSource()) != m_GeoIPSourceAtOpen;
-		const bool licenseChanged =
-			thePrefs::GetGeoIPMaxMindLicense() != m_GeoIPMaxMindLicenseAtOpen;
-		const bool urlChanged =
-			thePrefs::GetGeoIPCustomUrl() != m_GeoIPCustomUrlAtOpen;
-		// Only re-download if the change matters for the *currently*
-		// selected source. Editing the MaxMind license while DB-IP
-		// is selected shouldn't trigger an unrelated DB-IP fetch.
+		const bool licenseChanged = thePrefs::GetGeoIPMaxMindLicense() != m_GeoIPMaxMindLicenseAtOpen;
+		const bool urlChanged = thePrefs::GetGeoIPCustomUrl() != m_GeoIPCustomUrlAtOpen;
+		// Only re-download if the change matters for the *currently* selected source. Editing
+		// the MaxMind license while DB-IP is selected should not trigger an unrelated DB-IP
+		// fetch.
 		bool credentialChangedForActive = false;
 		switch (thePrefs::GetGeoIPSource()) {
 		case CPreferences::GeoIPSourceMaxMind:
@@ -1024,23 +1474,27 @@
 			break;
 		}
 		if (sourceChanged || credentialChangedForActive) {
-			theApp->amuledlg->m_IP2Country->Update(true);
+			theApp->GetIP2Country()->Update(true);
 		}
 	}
 #endif
 
 	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"), wxOK | 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);
 	}
 
+	EndSharedDirsSession();
 	Show(false);
 }
 
-
-void PrefsUnifiedDlg::OnClose(wxCloseEvent& event)
+void PrefsUnifiedDlg::OnClose(wxCloseEvent &event)
 {
 	Show(false);
+	EndSharedDirsSession();
 
 	// Try to keep the window alive when possible
 	if (event.CanVeto()) {
@@ -1054,36 +1508,35 @@
 		thePrefs::CFGMap::iterator it = thePrefs::s_CfgList.begin();
 		for (; it != thePrefs::s_CfgList.end(); ++it) {
 			// Checking for failures
-			it->second->ConnectToWidget( 0 );
+			it->second->ConnectToWidget(0);
 		}
 
 		Destroy();
 	}
 }
 
-
-void PrefsUnifiedDlg::OnCancel(wxCommandEvent& WXUNUSED(event))
+void PrefsUnifiedDlg::OnCancel(wxCommandEvent &WXUNUSED(event))
 {
 	Show(false);
+	// The edits are being thrown away, so the next session may refresh freely.
+	EndSharedDirsSession();
 	// restore state of server tab if necessary
 	EnableServerTab(thePrefs::GetNetworkED2K());
 
 	if (m_toolbarOrientationChanged) {
-			theApp->amuledlg->Create_Toolbar(m_verticalToolbar);
-			// Update the first tool (conn button)
-			theApp->amuledlg->ShowConnectionState();
-			theApp->amuledlg->Layout();
+		theApp->amuledlg->Create_Toolbar(m_verticalToolbar);
+		// Update the first tool (conn button)
+		theApp->amuledlg->ShowConnectionState();
+		theApp->amuledlg->Layout();
 	}
 }
 
-
-void PrefsUnifiedDlg::OnAutostartToggle(wxCommandEvent& event)
+void PrefsUnifiedDlg::OnAutostartToggle(wxCommandEvent &event)
 {
-	// Apply immediately. The OS is the source of truth — we don't
-	// persist intent in aMule.conf, so there's no Apply-on-OK step
-	// for this widget. If the write fails (e.g. read-only LaunchAgent
-	// dir on a sandboxed macOS install), roll the checkbox back so
-	// the UI reflects reality.
+	// Apply immediately. The OS is the source of truth -- intent is not persisted in
+	// aMule.conf, so there is no Apply-on-OK step for this widget. If the write fails (a
+	// read-only LaunchAgent dir on a sandboxed macOS install, say), roll the checkbox back
+	// so the UI reflects reality.
 	bool wanted = event.IsChecked();
 	bool ok = wanted ? AutostartManager::Enable() : AutostartManager::Disable();
 	if (!ok) {
@@ -1091,214 +1544,350 @@
 		if (cb) {
 			cb->SetValue(!wanted);
 		}
-		wxMessageBox(
-			wanted
-				? _("Could not register aMule for autostart at login. The autostart store may be read-only.")
-				: _("Could not remove the autostart-at-login entry."),
-			_("Autostart"), wxOK | wxICON_WARNING, this);
+		wxMessageBox(wanted ? _("Could not register aMule for autostart at login. The autostart "
+					"store may be read-only.")
+				    : _("Could not remove the autostart-at-login entry."),
+			_("Autostart"),
+			wxOK | wxICON_WARNING,
+			this);
+	}
+}
+
+void PrefsUnifiedDlg::HandleProtocolToggle(HandlerTarget scheme, int checkboxId, bool wanted)
+{
+	// Same live-OS-state semantics as the autostart toggle above, with one extra gate:
+	// before Enable overwrites a pre-existing third-party handler, confirm with the user.
+	// Disable never touches a non-aMule handler. One dialog title for both kinds of
+	// registration, worded for the one being toggled.
+	const bool isFileType = (scheme == HandlerTarget::CollectionFile);
+	const wxString dialogTitle = isFileType ? _("Register file type") : _("Register URL handler");
+
+	if (wanted) {
+		wxString current = ProtocolHandlerManager::GetCurrentHandler(scheme);
+		if (!current.empty()) {
+			wxString msg;
+			if (scheme == HandlerTarget::MagnetScheme) {
+				msg = wxString::Format(
+					_("aMule only handles eD2k-compatible magnets. If you replace the "
+					  "current magnet handler (%s), BitTorrent magnet links will stop "
+					  "working - aMule cannot download BitTorrent content. Continue?"),
+					current);
+			} else if (isFileType) {
+				msg = wxString::Format(_("Another application currently opens "
+							 ".emulecollection files (%s). Replace it with "
+							 "aMule?"),
+					current);
+			} else {
+				msg = wxString::Format(_("Another application is currently the default "
+							 "handler for these links (%s). Replace it with "
+							 "aMule?"),
+					current);
+			}
+			int answer = wxMessageBox(msg, dialogTitle, wxYES_NO | wxICON_QUESTION, this);
+			if (answer != wxYES) {
+				// Roll the checkbox back - user declined.
+				wxCheckBox *cb = static_cast<wxCheckBox *>(FindWindow(checkboxId));
+				if (cb) {
+					cb->SetValue(false);
+				}
+				return;
+			}
+		}
 	}
+
+	bool ok = wanted ? ProtocolHandlerManager::Enable(scheme) : ProtocolHandlerManager::Disable(scheme);
+	if (!ok) {
+		wxCheckBox *cb = static_cast<wxCheckBox *>(FindWindow(checkboxId));
+		if (cb) {
+			cb->SetValue(!wanted);
+		}
+		wxString failure;
+		if (isFileType) {
+			failure = wanted ? _("Could not register aMule for .emulecollection files. The "
+					     "registration store may be read-only.")
+					 : _("Could not remove the file type registration.");
+		} else {
+			failure = wanted ? _("Could not register aMule as the URL handler. The registration "
+					     "store may be read-only.")
+					 : _("Could not remove the URL handler registration.");
+		}
+		wxMessageBox(failure, dialogTitle, wxOK | wxICON_WARNING, this);
+	}
+}
+
+void PrefsUnifiedDlg::OnProtocolEd2kToggle(wxCommandEvent &event)
+{
+	HandleProtocolToggle(HandlerTarget::Ed2kScheme, IDC_PROTOCOL_ED2K, event.IsChecked());
+}
+
+void PrefsUnifiedDlg::OnProtocolMagnetToggle(wxCommandEvent &event)
+{
+	HandleProtocolToggle(HandlerTarget::MagnetScheme, IDC_PROTOCOL_MAGNET, event.IsChecked());
 }
 
+void PrefsUnifiedDlg::OnAssocCollectionToggle(wxCommandEvent &event)
+{
+	HandleProtocolToggle(HandlerTarget::CollectionFile, IDC_ASSOC_COLLECTION, event.IsChecked());
+}
 
-void PrefsUnifiedDlg::OnCheckBoxChange(wxCommandEvent& event)
+void PrefsUnifiedDlg::OnCheckBoxChange(wxCommandEvent &event)
 {
-	bool	value = event.IsChecked();
-	int	id = event.GetId();
+	bool value = event.IsChecked();
+	int id = event.GetId();
 
 	// Check if this checkbox is one of the User Events checkboxes
 	if (id >= USEREVENTS_FIRST_ID &&
-	    id < USEREVENTS_FIRST_ID +
-		(int)CUserEvents::GetCount() * USEREVENTS_IDS_PER_EVENT) {
+		id < USEREVENTS_FIRST_ID + (int)CUserEvents::GetCount() * USEREVENTS_IDS_PER_EVENT) {
 		// The corresponding text control always has
 		// an ID one greater than the checkbox
 		FindWindow(id + 1)->Enable(value);
 		return;
 	}
 
-	switch ( id ) {
-		case IDC_UDPENABLE:
-			FindWindow( IDC_UDPPORT )->Enable(value);
-			break;
+	switch (id) {
+	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_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_MEDIAMETA_ENABLED:
+		FindWindow(IDC_MEDIAMETA_FFPROBEPATHTEXT)->Enable(value);
+		FindWindow(IDC_MEDIAMETA_FFPROBEPATH)->Enable(value);
+		FindWindow(IDC_MEDIAMETA_FFPROBEBROWSE)->Enable(value);
+		FindWindow(IDC_MEDIAMETA_FFPROBEDETECT)->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);
-			}
+	case IDC_UPNP_WEBSERVER_ENABLED:
+		FindWindow(IDC_WEBUPNPTCPPORT)->Enable(value);
+		FindWindow(IDC_WEBUPNPTCPPORTTEXT)->Enable(value);
+		break;
+
+	// The web server and amuleapi are EC clients of the core: they can only run when
+	// external connections are enabled. Warn live and refuse the invalid combination
+	// instead of waiting for OK.
+	//
+	// amulegui is itself a connected EC client, so the precondition is always met. The
+	// IDC_EXT_CONN_ACCEPT checkbox is hidden there and only mirrors remote.conf, so reading
+	// it would wrongly block the toggle.
+	case IDC_ENABLE_WEB:
+	case IDC_ENABLE_AMULEAPI:
+#ifndef CLIENT_GUI
+		if (value && !CastChild(IDC_EXT_CONN_ACCEPT, wxCheckBox)->IsChecked()) {
+			wxMessageBox(_("The web server and aMule API require external connections "
+				       "to be enabled."),
+				_("Message"),
+				wxOK | wxICON_INFORMATION);
+			CastChild(id, wxCheckBox)->SetValue(false);
 			break;
 		}
+#endif
+		if (value && id == IDC_ENABLE_WEB) {
+			// Enabled and allowed: nudge toward the actively-developed API.
+			wxMessageBox(_("The aMule web server is deprecated. Consider running the aMule "
+				       "API instead."),
+				_("Message"),
+				wxOK | wxICON_INFORMATION);
+		}
+		break;
 
-		case IDC_CHECKDISKSPACE:
-			FindWindow( IDC_MINDISKSPACE )->Enable(value);
-			break;
+#ifndef CLIENT_GUI
+	case IDC_EXT_CONN_ACCEPT: {
+		// Turning external connections off strands both EC-client services. (amulegui hides
+		// this checkbox and always runs over EC, so the case is core-only.)
+		wxCheckBox *web = CastChild(IDC_ENABLE_WEB, wxCheckBox);
+		wxCheckBox *api = CastChild(IDC_ENABLE_AMULEAPI, wxCheckBox);
+		if (!value && (web->IsChecked() || api->IsChecked())) {
+			web->SetValue(false);
+			api->SetValue(false);
+			wxMessageBox(_("The web server and aMule API require external connections "
+				       "to be enabled."),
+				_("Message"),
+				wxOK | wxICON_INFORMATION);
+		}
+		break;
+	}
+#endif
 
-		case IDC_ONLINESIG:
-			FindWindow( IDC_OSDIR )->Enable(value);;
-			FindWindow(IDC_OSUPDATE)->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_REMOVEDEAD:
-			FindWindow( IDC_SERVERRETRIES )->Enable(value);;
-			break;
+	case IDC_CHECKDISKSPACE:
+		FindWindow(IDC_MINDISKSPACE)->Enable(value);
+		break;
 
-		case IDC_AUTOSERVER:
-			if ((CPath::GetFileSize(thePrefs::GetConfigDir() + "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);
-				CastChild(event.GetId(), wxCheckBox)->SetValue(false);
-			}
-			break;
+	case IDC_AMULEAPI_GUEST_ENABLED:
+		// Unchecking clears the stored guest password on OK, so a password
+		// typed into a disabled field would be silently discarded.
+		FindWindow(IDC_AMULEAPI_GUEST_PASSWD)->Enable(value);
+		break;
 
-		case IDC_MSGFILTER:
-			// Toggle All filter options
-			FindWindow(IDC_MSGFILTER_ALL)->Enable(value);
-			FindWindow(IDC_MSGFILTER_NONSECURE)->Enable(value);
-			FindWindow(IDC_MSGFILTER_NONFRIENDS)->Enable(value);
-			FindWindow(IDC_MSGFILTER_WORD)->Enable(value);
-			if (value) {
-				FindWindow(IDC_MSGWORD)->Enable(
-					CastChild(IDC_MSGFILTER_WORD, wxCheckBox)->IsChecked());
-			} else {
-				FindWindow(IDC_MSGWORD)->Enable(false);
-			}
-			break;
+	case IDC_ONLINESIG:
+		FindWindow(IDC_OSDIR)->Enable(value);
+		;
+		FindWindow(IDC_OSUPDATE)->Enable(value);
+		break;
 
-		case IDC_MSGFILTER_ALL:
-			// Toggle filtering by data.
-			FindWindow(IDC_MSGFILTER_NONSECURE)->Enable(!value);
-			FindWindow(IDC_MSGFILTER_NONFRIENDS)->Enable(!value);
-			FindWindow(IDC_MSGFILTER_WORD)->Enable(!value);
-			if (!value) {
-				FindWindow(IDC_MSGWORD)->Enable(
-					CastChild(IDC_MSGFILTER_WORD, wxCheckBox)->IsChecked());
-			} else {
-				FindWindow(IDC_MSGWORD)->Enable(false);
-			}
-			break;
+	case IDC_REMOVEDEAD:
+		FindWindow(IDC_SERVERRETRIES)->Enable(value);
+		;
+		break;
 
-		case IDC_MSGFILTER_WORD:
-			// Toggle filter word list.
-			FindWindow(IDC_MSGWORD)->Enable(value);
-			break;
+	case IDC_AUTOSERVER:
+		if ((CPath::GetFileSize(thePrefs::GetConfigDir() + "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);
+			CastChild(event.GetId(), wxCheckBox)->SetValue(false);
+		}
+		break;
 
-		case IDC_FILTERCOMMENTS:
-			FindWindow(IDC_COMMENTWORD)->Enable(value);
-			break;
+	case IDC_MSGFILTER:
+		// Toggle All filter options
+		FindWindow(IDC_MSGFILTER_ALL)->Enable(value);
+		FindWindow(IDC_MSGFILTER_NONSECURE)->Enable(value);
+		FindWindow(IDC_MSGFILTER_NONFRIENDS)->Enable(value);
+		FindWindow(IDC_MSGFILTER_WORD)->Enable(value);
+		if (value) {
+			FindWindow(IDC_MSGWORD)
+				->Enable(CastChild(IDC_MSGFILTER_WORD, wxCheckBox)->IsChecked());
+		} else {
+			FindWindow(IDC_MSGWORD)->Enable(false);
+		}
+		break;
 
-		case ID_PROXY_ENABLE_PROXY:
-			FindWindow(ID_PROXY_TYPE)->Enable(value);
-			FindWindow(ID_PROXY_NAME)->Enable(value);
-			FindWindow(ID_PROXY_PORT)->Enable(value);
-			break;
+	case IDC_MSGFILTER_ALL:
+		// Toggle filtering by data.
+		FindWindow(IDC_MSGFILTER_NONSECURE)->Enable(!value);
+		FindWindow(IDC_MSGFILTER_NONFRIENDS)->Enable(!value);
+		FindWindow(IDC_MSGFILTER_WORD)->Enable(!value);
+		if (!value) {
+			FindWindow(IDC_MSGWORD)
+				->Enable(CastChild(IDC_MSGFILTER_WORD, wxCheckBox)->IsChecked());
+		} else {
+			FindWindow(IDC_MSGWORD)->Enable(false);
+		}
+		break;
 
-		case ID_PROXY_ENABLE_PASSWORD:
-			FindWindow(ID_PROXY_USER)->Enable(value);
-			FindWindow(ID_PROXY_PASSWORD)->Enable(value);
-			break;
+	case IDC_MSGFILTER_WORD:
+		// Toggle filter word list.
+		FindWindow(IDC_MSGWORD)->Enable(value);
+		break;
 
-		case IDC_STARTNEXTFILE:
-			FindWindow(IDC_STARTNEXTFILE_SAME)->Enable(value);
-			FindWindow(IDC_STARTNEXTFILE_ALPHA)->Enable(value);
-			break;
+	case IDC_FILTERCOMMENTS:
+		FindWindow(IDC_COMMENTWORD)->Enable(value);
+		break;
 
-		case IDC_ENABLETRAYICON:
-			FindWindow(IDC_MINTRAY)->Enable(value);
-			// HideOnClose's recovery surface is the tray icon, so its
-			// checkbox follows tray-icon state too. Live-update both
-			// here so the user doesn't have to close + reopen prefs to
-			// see dependent options gate correctly.
-			FindWindow(IDC_MACHIDEONCLOSE)->Enable(value);
-			if (value) {
-				theApp->amuledlg->CreateSystray();
-			} else {
-				theApp->amuledlg->RemoveSystray();
-			}
-			thePrefs::SetUseTrayIcon(value);
-			break;
+	case ID_PROXY_ENABLE_PROXY:
+		FindWindow(ID_PROXY_TYPE)->Enable(value);
+		FindWindow(ID_PROXY_NAME)->Enable(value);
+		FindWindow(ID_PROXY_PORT)->Enable(value);
+		break;
 
-		case IDC_NOTIF:
-			FindWindow(IDC_NOTIF)->Enable(value);
-			break;
+	case ID_PROXY_ENABLE_PASSWORD:
+		FindWindow(ID_PROXY_USER)->Enable(value);
+		FindWindow(ID_PROXY_PASSWORD)->Enable(value);
+		break;
 
-		case IDC_VERTTOOLBAR:
-			m_toolbarOrientationChanged = (m_verticalToolbar != value);
-			theApp->amuledlg->Create_Toolbar(value);
-			// Update the first tool (conn button)
-			theApp->amuledlg->ShowConnectionState();
-			theApp->amuledlg->Layout();
-			break;
+	case IDC_STARTNEXTFILE:
+		FindWindow(IDC_STARTNEXTFILE_SAME)->Enable(value);
+		FindWindow(IDC_STARTNEXTFILE_ALPHA)->Enable(value);
+		break;
 
-		case IDC_ENFORCE_PO_INCOMING:
-			FindWindow(IDC_ENABLE_PO_OUTGOING)->Enable(!value);
-			break;
+	case IDC_ENABLETRAYICON:
+		FindWindow(IDC_MINTRAY)->Enable(value);
+		// HideOnClose's recovery surface is the tray icon, so its checkbox follows tray-icon
+		// state too. Live-update both here so the user does not have to close and reopen prefs
+		// to see dependent options gate correctly.
+		FindWindow(IDC_MACHIDEONCLOSE)->Enable(value);
+		if (value) {
+			theApp->amuledlg->CreateSystray();
+		} else {
+			theApp->amuledlg->RemoveSystray();
+		}
+		thePrefs::SetUseTrayIcon(value);
+		break;
 
-		case IDC_ENABLE_PO_OUTGOING:
-			FindWindow(IDC_SUPPORT_PO)->Enable(!value);
-			FindWindow(IDC_ENFORCE_PO_INCOMING)->Enable(value);
-			break;
+	case IDC_NOTIF:
+		FindWindow(IDC_NOTIF)->Enable(value);
+		break;
 
-		case IDC_SUPPORT_PO:
-			FindWindow(IDC_ENABLE_PO_OUTGOING)->Enable(value);
-			break;
+	case IDC_VERTTOOLBAR:
+		m_toolbarOrientationChanged = (m_verticalToolbar != value);
+		theApp->amuledlg->Create_Toolbar(value);
+		// Update the first tool (conn button)
+		theApp->amuledlg->ShowConnectionState();
+		theApp->amuledlg->Layout();
+		break;
 
-		case IDC_SHOWRATEONTITLE:
-			FindWindow(IDC_RATESBEFORETITLE)->Enable(value);
-			FindWindow(IDC_RATESAFTERTITLE)->Enable(value);
-			break;
+	case IDC_ENFORCE_PO_INCOMING:
+		FindWindow(IDC_ENABLE_PO_OUTGOING)->Enable(!value);
+		break;
 
-		case IDC_NETWORKED2K: {
-			EnableServerTab(value);
-			wxSpinEvent e;
-			OnTCPClientPortChange(e);
-			break;
-		}
+	case IDC_ENABLE_PO_OUTGOING:
+		FindWindow(IDC_SUPPORT_PO)->Enable(!value);
+		FindWindow(IDC_ENFORCE_PO_INCOMING)->Enable(value);
+		break;
 
-		default:
-			break;
+	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;
+		OnTCPClientPortChange(e);
+		break;
 	}
-}
 
+	default:
+		break;
+	}
+}
 
-void PrefsUnifiedDlg::OnButtonColorChange(wxCommandEvent& WXUNUSED(event))
+void PrefsUnifiedDlg::OnButtonColorChange(wxCommandEvent &WXUNUSED(event))
 {
 	int index = m_choiceColor->GetSelection();
-	wxColour col = wxGetColourFromUser( this, CMuleColour(thePrefs::s_colorsindex) );
-	if ( col.Ok() ) {
-		m_buttonColor->SetBackgroundColour( col );
+	wxColour col = wxGetColourFromUser(this, CMuleColour(thePrefs::s_colorsindex));
+	if (col.Ok()) {
+		m_buttonColor->SetBackgroundColour(col);
 		thePrefs::s_colorsindex = CMuleColour(col).GetULong();
 	}
 }
 
-
-void PrefsUnifiedDlg::OnColorCategorySelected(wxCommandEvent& WXUNUSED(evt))
+void PrefsUnifiedDlg::OnColorCategorySelected(wxCommandEvent &WXUNUSED(evt))
 {
-	m_buttonColor->SetBackgroundColour(CMuleColour(thePrefs::s_colors m_choiceColor->GetSelection()  ) );
+	m_buttonColor->SetBackgroundColour(CMuleColour(thePrefs::s_colorsm_choiceColor->GetSelection()));
 }
 
-
-void PrefsUnifiedDlg::OnButtonDir(wxCommandEvent& event)
+void PrefsUnifiedDlg::OnButtonDir(wxCommandEvent &event)
 {
 	wxString type;
 
 	int id = 0;
-	switch ( event.GetId() ) {
+	switch (event.GetId()) {
 	case IDC_SELTEMPDIR:
 		id = IDC_TEMPFILES;
 		type = _("Temporary files");
@@ -1314,10 +1903,10 @@
 		type = _("Online Signatures");
 		break;
 
-//	case IDC_SELSKIN:
-//		id = IDC_SKIN;
-//		type = _("Skins directory");
-//		break;
+		//	case IDC_SELSKIN:
+		//		id = IDC_SKIN;
+		//		type = _("Skins directory");
+		//		break;
 
 	default:
 		wxFAIL;
@@ -1325,160 +1914,249 @@
 	}
 
 	type = CFormat(_("Choose a folder for %s")) % type;
-	wxTextCtrl* widget = CastChild( id, wxTextCtrl );
+	wxTextCtrl *widget = CastChild(id, wxTextCtrl);
 	wxString dir = widget->GetValue();
-	wxString str = wxDirSelector(
-		type, dir,
-		wxDD_DEFAULT_STYLE,
-		wxDefaultPosition, this);
+	wxString str = wxDirSelector(type, dir, wxDD_DEFAULT_STYLE, wxDefaultPosition, this);
 	if (!str.IsEmpty()) {
 		widget->SetValue(str);
 	}
 }
 
+#ifndef CLIENT_GUI
+void PrefsUnifiedDlg::OnButtonExcludePreview(wxCommandEvent &WXUNUSED(event))
+{
+	wxStaticText *info = CastChild(IDC_EXCLUDE_SHARE_PREVIEW_INFO, wxStaticText);
+
+	const wxString patterns = CastChild(IDC_EXCLUDE_SHARE_PATTERNS, wxTextCtrl)->GetValue();
+	const bool useRegex = CastChild(IDC_EXCLUDE_SHARE_REGEX, wxCheckBox)->GetValue();
 
-void PrefsUnifiedDlg::OnButtonBrowseApplication(wxCommandEvent& event)
+	wxArrayString names;
+	theApp->sharedfiles->GetSharedFileNames(names);
+
+	const int excluded = thePrefs::PreviewExcludeCount(patterns, useRegex, names);
+	if (excluded == wxNOT_FOUND) {
+		info->SetLabel(_("Invalid regular expression"));
+	} else {
+		info->SetLabel(CFormat(wxPLURAL("Would exclude %u of %u shared file",
+				       "Would exclude %u of %u shared files",
+				       names.GetCount())) %
+			       (unsigned)excluded % (unsigned)names.GetCount());
+	}
+	// The label width just changed; re-lay-out its row so it is not clipped.
+	info->GetParent()->Layout();
+}
+#endif
+
+void PrefsUnifiedDlg::OnButtonBrowseApplication(wxCommandEvent &event)
 {
 	wxString title;
 	int id = 0;
-	switch ( event.GetId() ) {
-		case IDC_BROWSEV:
-			id = IDC_VIDEOPLAYER;
-			title = _("Browse for videoplayer");
-			break;
-		case IDC_SELBROWSER:
-			id = IDC_BROWSERSELF;
-			title = _("Select browser");
-			break;
-		default:
-			wxFAIL;
-			return;
+	switch (event.GetId()) {
+	case IDC_BROWSEV:
+		id = IDC_VIDEOPLAYER;
+		title = _("Browse for videoplayer");
+		break;
+	case IDC_SELBROWSER:
+		id = IDC_BROWSERSELF;
+		title = _("Select browser");
+		break;
+	case IDC_MEDIAMETA_FFPROBEBROWSE:
+		id = IDC_MEDIAMETA_FFPROBEPATH;
+		title = _("Select ffprobe binary");
+		break;
+	default:
+		wxFAIL;
+		return;
 	}
 	wxString wildcard = CFormat(_("Executable%s"))
 #ifdef __WINDOWS__
-		% " (*.exe)|*.exe";
+			    % " (*.exe)|*.exe";
 #else
-		% "|*";
+			    % "|*";
 #endif
 
-	wxString str = wxFileSelector( title, "", "",
-		"", wildcard, 0, this );
+	wxString str = wxFileSelector(title, "", "", "", wildcard, 0, this);
 
-	if ( !str.IsEmpty() ) {
-		wxTextCtrl* widget = CastChild( id, wxTextCtrl );
-		widget->SetValue( str );
+#ifdef __WXMAC__
+	// wxCocoa quirk: the modal NSOpenPanel steals key-window status; when it dismisses
+	// (Open OR Cancel), Cocoa returns focus and Z-order to whichever aMule window was
+	// active before Preferences opened, not to Preferences itself. IsShown() still returns
+	// true and no wxEVT_CLOSE_WINDOW fires -- the dialog is alive but ordered behind the
+	// main window, which reads as "Preferences closed after Browse click". Raise() restores
+	// its Z-order.
+	Raise();
+#endif
+
+	if (!str.IsEmpty()) {
+		wxTextCtrl *widget = CastChild(id, wxTextCtrl);
+		widget->SetValue(str);
+	}
+}
+
+void PrefsUnifiedDlg::OnButtonMediaMetaDetect(wxCommandEvent &WXUNUSED(evt))
+{
+	// Kick MediaProbe's autodetect and populate the path field with whatever it finds. An
+	// empty result tells the user politely; a path in hand is the more useful common case,
+	// so the binary is not also validated here.
+	//
+	// redetect=true: the point of pressing this is to notice an ffmpeg installed since
+	// aMule started, so the cached answer will not do. Going through DetectedPath() rather
+	// than AutoDetectPath() also refreshes the cache the probe worker reads. Monolithic
+	// only -- amulegui hides the button, because detection here would search the GUI's
+	// filesystem, not the daemon's.
+	const wxString path = MediaProbe::DetectedPath(/*redetect=*/true);
+	if (path.IsEmpty()) {
+		wxMessageBox(_("ffprobe not found on PATH or in the standard install locations. Install "
+			       "ffmpeg (which ships ffprobe) or use Browse to pick a binary manually."),
+			_("Media metadata extraction"),
+			wxOK | wxICON_INFORMATION,
+			this);
+		return;
 	}
+	CastChild(IDC_MEDIAMETA_FFPROBEPATH, wxTextCtrl)->SetValue(path);
 }
 
+void PrefsUnifiedDlg::OnButtonTweaksReset(wxCommandEvent &WXUNUSED(evt))
+{
+	if (wxMessageBox(_("Reset the settings on this page to their default values?"),
+		    _("Reset to defaults"),
+		    wxYES_NO | wxICON_QUESTION,
+		    this) != wxYES) {
+		return;
+	}
+
+	// Walk the currently shown page's controls and reset each one that is bound to a
+	// preference. Only the widgets are updated; the change is committed on OK and discarded
+	// on Cancel. The button is shown only on the Advanced page, so m_CurrentPanel is that
+	// page.
+	if (!m_CurrentPanel) {
+		return;
+	}
 
-void PrefsUnifiedDlg::OnButtonEditAddr(wxCommandEvent& WXUNUSED(evt))
+	for (wxWindow *child : m_CurrentPanel->GetChildren()) {
+		Cfg_Base *cfg = GetCfg(child->GetId());
+		if (cfg) {
+			cfg->ResetToDefault();
+		}
+	}
+}
+
+void PrefsUnifiedDlg::OnButtonEditAddr(wxCommandEvent &WXUNUSED(evt))
 {
-	wxString fullpath( thePrefs::GetConfigDir() + "addresses.dat" );
+	wxString fullpath(thePrefs::GetConfigDir() + "addresses.dat");
 
-	EditServerListDlg* test = new EditServerListDlg(this, _("Edit server list"),
+	EditServerListDlg *test = new EditServerListDlg(this,
+		_("Edit server list"),
 		_("Add here URL's to download server.met files.\nOnly one url on each line."),
-		fullpath );
+		fullpath);
 
 	test->ShowModal();
 	delete test;
 }
 
-
-void PrefsUnifiedDlg::OnButtonIPFilterReload(wxCommandEvent& WXUNUSED(event))
+void PrefsUnifiedDlg::OnButtonIPFilterReload(wxCommandEvent &WXUNUSED(event))
 {
 	theApp->ipfilter->Reload();
 }
 
-
-void PrefsUnifiedDlg::OnButtonIPFilterUpdate(wxCommandEvent& WXUNUSED(event))
+void PrefsUnifiedDlg::OnButtonIPFilterUpdate(wxCommandEvent &WXUNUSED(event))
 {
-	theApp->ipfilter->Update( CastChild( IDC_IPFILTERURL, wxTextCtrl )->GetValue() );
+	theApp->ipfilter->Update(CastChild(IDC_IPFILTERURL, wxTextCtrl)->GetValue());
 }
 
-
-#ifdef ENABLE_IP2COUNTRY
+#ifdef GEOIP_GUI
 PrefsUnifiedDlg *PrefsUnifiedDlg::s_activeInstance = NULL;
 
 PrefsUnifiedDlg::~PrefsUnifiedDlg()
 {
-	// Clear the active-instance pointer so the IP2Country download
-	// callback can't poke a freed dialog if a download completes after
-	// the user has closed Preferences.
+	// Clear the active-instance pointer so the IP2Country download callback cannot poke a
+	// freed dialog if a download completes after the user has closed Preferences.
 	if (s_activeInstance == this) {
 		s_activeInstance = NULL;
 	}
+#ifdef CLIENT_GUI
+	// Same reasoning for the shared-dirs editor: a GET_SHARED_DIRS reply can
+	// land after the dialog is gone, and must not repaint a freed dialog.
+	if (s_openPrefsDlg == this) {
+		s_openPrefsDlg = nullptr;
+	}
+#endif
 }
 
 void PrefsUnifiedDlg::RefreshIP2CountryStatusIfOpen()
 {
-	// IP2Country download-completion hook. CamuleDlg::IP2CountryDownloadFinished
-	// calls this after the new MMDB has been opened, so an open prefs
-	// dialog can refresh its status line without the user having to
-	// flip the source dropdown to trigger a redraw.
+	// IP2Country download-completion hook. CamuleDlg::IP2CountryDownloadFinished calls this
+	// after the new MMDB has been opened, so an open prefs dialog can refresh its status
+	// line without the user having to flip the source dropdown to trigger a redraw.
 	if (s_activeInstance) {
 		s_activeInstance->UpdateGeoIPStatus();
 	}
 }
 
-
-void PrefsUnifiedDlg::NotifyIP2CountryUpdateFailedIfOpen(const wxString& msg)
+void PrefsUnifiedDlg::NotifyIP2CountryUpdateFailedIfOpen(const wxString &msg)
 {
-	// Manual "Update now" failure popup. Skipped if the prefs dialog
-	// has been closed in the meantime: the user has already moved on,
-	// and an unparented popup with no obvious trigger would be more
-	// confusing than the log line they can find under Network → Log.
+	// Manual "Update now" failure popup. Skipped if the prefs dialog has been closed in the
+	// meantime: the user has already moved on, and an unparented popup with no obvious
+	// trigger would be more confusing than the log line they can find under Network -> Log.
 	if (s_activeInstance) {
-		wxMessageBox(msg, _("IP2Country update failed"),
-			wxICON_WARNING | wxOK, s_activeInstance);
+		wxMessageBox(msg, _("IP2Country update failed"), wxICON_WARNING | wxOK, s_activeInstance);
 	}
 }
 
-void PrefsUnifiedDlg::OnGeoIPSourceChange(wxCommandEvent& WXUNUSED(event))
+void PrefsUnifiedDlg::OnGeoIPSourceChange(wxCommandEvent &WXUNUSED(event))
 {
-	// Translate the dropdown index back into the canonical persisted
-	// source string. The dropdown order is fixed: 0 = DB-IP, 1 = MaxMind,
-	// 2 = Custom — matching CPreferences::GeoIPSource numeric values.
+	// Translate the dropdown index back into the canonical persisted source string. The
+	// dropdown order is fixed: 0 = DB-IP, 1 = MaxMind, 2 = Custom -- matching
+	// CPreferences::GeoIPSource numeric values.
 	const int sel = CastChild(IDC_GEOIP_SOURCE, wxChoice)->GetSelection();
 	thePrefs::SetGeoIPSource(static_cast<thePrefs::GeoIPSource>(sel));
 	UpdateGeoIPSourcePanel();
 	UpdateGeoIPStatus();
 }
 
-
-void PrefsUnifiedDlg::OnGeoIPUpdateNow(wxCommandEvent& WXUNUSED(event))
+void PrefsUnifiedDlg::OnGeoIPUpdateNow(wxCommandEvent &WXUNUSED(event))
 {
-	// Persist the credential / URL fields the user just edited *before*
-	// kicking off the download — the URL helper reads them from the
-	// static backing store, not the live widget values. The full prefs
-	// commit happens on OK, but for "Update now" we need a partial save.
+	// Persist the credential / URL fields the user just edited *before* kicking off the
+	// download -- the URL helper reads them from the static backing store, not the live
+	// widget values. The full prefs commit happens on OK, but for "Update now" we need a
+	// partial save.
 	thePrefs::SetGeoIPMaxMindLicense(CastChild(IDC_GEOIP_MAXMIND_LIC, wxTextCtrl)->GetValue());
-	thePrefs::SetGeoIPCustomUrl(    CastChild(IDC_GEOIP_CUSTOM_URL,  wxTextCtrl)->GetValue());
+	thePrefs::SetGeoIPCustomUrl(CastChild(IDC_GEOIP_CUSTOM_URL, wxTextCtrl)->GetValue());
 
-	// Kick off the download. CIP2Country::DownloadFinished will swap
-	// the new file in and re-open the database asynchronously; the
-	// status line refreshes next time the panel is shown (the running
-	// download isn't blocking, so polling would just show "...").
-	if (theApp->amuledlg && theApp->amuledlg->m_IP2Country) {
-		theApp->amuledlg->m_IP2Country->Update(true);
+#ifdef CLIENT_GUI
+	// amulegui has no local resolver; the daemon owns the GeoIP DB (#440). Ask it to
+	// refresh by sending the current prefs with a one-shot UPDATE_NOW trigger piggy-backed
+	// on the normal prefs packet. SendToRemote serializes from the statics we just wrote,
+	// so the license / custom URL the user typed reach the daemon before it resolves the
+	// download URL.
+	thePrefs::SetGeoIPUpdateRequested(true);
+	theApp->glob_prefs->SendToRemote();
+	thePrefs::SetGeoIPUpdateRequested(false);
+#else
+	// Monolithic amule: kick off the download locally. DownloadFinished swaps the new file
+	// in and re-opens the database asynchronously; the status line refreshes next time the
+	// panel is shown (the running download is not blocking, so polling would just show
+	// "...").
+	if (theApp->GetIP2Country()) {
+		theApp->GetIP2Country()->Update(true);
 	}
+#endif
 }
 
-
 void PrefsUnifiedDlg::UpdateGeoIPSourcePanel()
 {
-	// Show exactly one of the three sub-panels based on the selected
-	// source. Each is a discrete wxPanel hosting its own labels and
-	// fields, so toggling the panel collapses the slot cleanly without
-	// leaving orphaned ID-less labels visible.
+	// Show exactly one of the three sub-panels based on the selected source. Each is a
+	// discrete wxPanel hosting its own labels and fields, so toggling the panel collapses
+	// the slot cleanly without leaving orphaned ID-less labels visible.
 	//
-	// Critical: use the *sizer's* Show(window, bool) — wxWindow::Show()
-	// only hides the window, leaving the sizer item still occupying its
-	// slot. Going through wxSizer::Show() releases the slot AND hides
-	// the window, which is what actually re-flows the layout.
+	// Critical: use the *sizer's* Show(window, bool) -- wxWindow::Show() only hides the
+	// window, leaving the sizer item still occupying its slot. Going through
+	// wxSizer::Show() releases the slot AND hides the window, which is what actually
+	// re-flows the layout.
 	const thePrefs::GeoIPSource src = thePrefs::GetGeoIPSource();
-	wxWindow *dbip    = FindWindow(IDC_GEOIP_INFO_DBIP);
+	wxWindow *dbip = FindWindow(IDC_GEOIP_INFO_DBIP);
 	wxWindow *maxmind = FindWindow(IDC_GEOIP_INFO_MAXMIND);
-	wxWindow *custom  = FindWindow(IDC_GEOIP_INFO_CUSTOM);
+	wxWindow *custom = FindWindow(IDC_GEOIP_INFO_CUSTOM);
 	if (!dbip || !maxmind || !custom) {
 		return;
 	}
@@ -1487,22 +2165,20 @@
 	if (!containerSizer) {
 		return;
 	}
-	containerSizer->Show(dbip,    src == thePrefs::GeoIPSourceDBIP);
+	containerSizer->Show(dbip, src == thePrefs::GeoIPSourceDBIP);
 	containerSizer->Show(maxmind, src == thePrefs::GeoIPSourceMaxMind);
-	containerSizer->Show(custom,  src == thePrefs::GeoIPSourceCustom);
+	containerSizer->Show(custom, src == thePrefs::GeoIPSourceCustom);
 
-	// Re-layout the prefs page so the height delta from the now-hidden
-	// panel propagates upward through the wxStaticBoxSizer chain. Each
-	// sub-panel is a real wxPanel (leaf from the layout engine's view),
-	// so the cascade-loop risk that motivated dropping Layout() earlier
-	// does not apply here.
+	// Re-layout the prefs page so the height delta from the now-hidden panel propagates
+	// upward through the wxStaticBoxSizer chain. Each sub-panel is a real wxPanel (leaf
+	// from the layout engine's view), so the cascade-loop risk that motivated dropping
+	// Layout() earlier does not apply here.
 	if (m_CurrentPanel) {
 		m_CurrentPanel->Layout();
 	}
 }
 
-
-void PrefsUnifiedDlg::OnGeoIPMasterToggle(wxCommandEvent& event)
+void PrefsUnifiedDlg::OnGeoIPMasterToggle(wxCommandEvent &event)
 {
 	// Forward to the generic CfgChanged tracker so the OK button noticed
 	// the dirty state, then grey out everything below the master switch.
@@ -1510,14 +2186,14 @@
 	UpdateGeoIPControlsEnabled();
 }
 
-
 void PrefsUnifiedDlg::UpdateGeoIPControlsEnabled()
 {
-	// Master "Show country flags for clients" gates every downstream
-	// control: source selector, all three sub-panel fields, the Update
-	// Now button, auto-update checkbox, and the status line. Each
-	// control is looked up by ID so missing widgets (e.g. earlier
-	// init failure) don't crash.
+	// Master "Show country flags for clients" gates every downstream control: source
+	// selector, all three sub-panel fields, the Update Now button, auto-update checkbox,
+	// and the status line. Each control is looked up by ID so missing widgets (e.g. earlier
+	// init failure) do not crash. When the connected core has no GeoIP support the whole
+	// page is dropped from the menu (see the constructor / CPreferencesRem::LoadRemote), so
+	// we never reach here unsupported.
 	wxCheckBox *master = CastChild(IDC_SHOW_COUNTRY_FLAGS, wxCheckBox);
 	if (!master) {
 		return;
@@ -1543,25 +2219,57 @@
 	}
 }
 
-
 void PrefsUnifiedDlg::UpdateGeoIPStatus()
 {
-	if (!theApp->amuledlg || !theApp->amuledlg->m_IP2Country) {
+	if (!theApp->amuledlg) {
 		return;
 	}
-	CIP2Country *ip2c = theApp->amuledlg->m_IP2Country;
 	wxStaticText *st = CastChild(IDC_GEOIP_STATUS, wxStaticText);
 	if (!st) {
 		return;
 	}
+	CIP2Country *ip2c = theApp->GetIP2Country();
+	if (!ip2c) {
+		// amulegui has no local resolver -- render the status mirrored from the daemon over EC
+		// (#440). The "unavailable" case is handled by UpdateGeoIPControlsEnabled(); here we
+		// show the loaded-source attribution and the last update result (reusing existing
+		// strings).
+		if (!thePrefs::IsGeoIPSupported()) {
+			return;
+		}
+		wxString line;
+		const wxString &src = thePrefs::GetGeoIPStatusLoadedSource();
+		if (thePrefs::IsGeoIPStatusLoaded()) {
+			if (src == "maxmind") {
+				line = _("Data by MaxMind GeoLite2");
+			} else if (src == "custom") {
+				line = _("Custom source");
+			} else if (src == "dbip") {
+				line = _("Data by DB-IP.com");
+			}
+		}
+		const wxString &last = thePrefs::GetGeoIPStatusLastResult();
+		if (!last.IsEmpty()) {
+			if (!line.IsEmpty()) {
+				line += " - ";
+			}
+			line += last;
+		}
+		st->SetLabel(line);
+		return;
+	}
 
-	// Attribution for the *loaded* file (the source that actually wrote
-	// it) — not the currently-selected dropdown source. If the file was
-	// hand-installed (LoadedSource is empty), no attribution is shown:
-	// we don't know who to credit and the per-source sub-panel below
-	// already covers the legal-display obligation.
+#ifndef CLIENT_GUI
+	// Local-resolver status (monolithic amule). amulegui has no CIP2Country and already
+	// returned above via the !ip2c branch, so guarding this out keeps it free of
+	// CIP2Country link symbols.
+	//
+	// Attribution for the *loaded* file (the source that actually wrote it) -- not the
+	// currently-selected dropdown source. If the file was hand-installed (LoadedSource is
+	// empty), no attribution is shown: we do not know who to credit and the per-source
+	// sub-panel below already covers the legal-display obligation.
 	wxString attribution;
-	const wxString& loaded = thePrefs::GetGeoIPLoadedSource();
+	const wxString &loaded = thePrefs::GetGeoIPLoadedSource();
 	if (loaded == "maxmind") {
 		attribution = _("Data by MaxMind GeoLite2");
 	} else if (loaded == "custom") {
@@ -1571,85 +2279,152 @@
 	}
 
 	if (ip2c->IsEnabled()) {
-		// Loaded — single-line summary keeps the dialog height bounded
-		// across sources. We deliberately omit the on-disk path: it's
-		// already in the log line at load time, and wxStaticText
-		// tooltips on wxOSX are unreliable enough that promising it in
-		// the UI would mislead Mac users.
+		// Loaded -- a single-line summary keeps the dialog height bounded across sources. The
+		// on-disk path is deliberately omitted: it is already in the log line at load time, and
+		// wxStaticText tooltips on wxOSX are unreliable enough that promising it in the UI
+		// would mislead Mac users.
 		const wxFileName fn(ip2c->GetDatabasePath());
 		wxString sizeLabel;
 		if (fn.FileExists()) {
 			const wxULongLong bytes = fn.GetSize();
 			if (bytes != wxInvalidSize) {
-				sizeLabel = wxString::Format(" (%.1f MB)", bytes.ToDouble() / (1024.0 * 1024.0));
+				// The unit is a separate argument so it picks up the "MiB"
+				// translation the rest of the dialog already uses.
+				sizeLabel = wxString::Format(
+					" (%.1f %s)", bytes.ToDouble() / (1024.0 * 1024.0), _("MiB"));
 			}
 		}
 		if (attribution.IsEmpty()) {
-			// Hand-installed / migrated file — no attribution to show.
-			st->SetLabel(wxString::Format(
-				_("Status: Loaded%s"), sizeLabel));
+			// Hand-installed / migrated file -- no attribution to show.
+			st->SetLabel(wxString::Format(_("Status: Loaded%s"), sizeLabel));
 		} else {
-			st->SetLabel(wxString::Format(
-				_("Status: Loaded%s - %s"),
-				sizeLabel, attribution));
+			st->SetLabel(wxString::Format(_("Status: Loaded%s - %s"), sizeLabel, attribution));
 		}
 	} else if (wxFileName::FileExists(ip2c->GetDatabasePath())) {
-		// File exists but database failed to open — corrupt / wrong format.
+		// File exists but database failed to open -- corrupt / wrong format.
 		st->SetLabel(_("Status: Failed to load - click 'Update now' to refresh."));
 	} else {
 		st->SetLabel(_("Status: Not found - click 'Update now' to download."));
 	}
+#endif // !CLIENT_GUI
 }
-#endif // ENABLE_IP2COUNTRY
-
+#endif // GEOIP_GUI
 
-void PrefsUnifiedDlg::OnPrefsPageChange(wxListEvent& event)
+#ifdef __WXMAC__
+void PrefsUnifiedDlg::OnShowMeasureSidebar(wxShowEvent &event)
 {
-	prefs_sizer->Detach( m_CurrentPanel );
-	m_CurrentPanel->Show( false );
+	event.Skip();
+	if (m_sidebarMeasured || !event.IsShown() || !m_sidebarColumn) {
+		return;
+	}
+	m_sidebarMeasured = true;
+
+	// Now that the control is on screen it can measure the rows it is actually drawing,
+	// font and cell padding included. The answer is not ready when SetWidth() returns -- it
+	// is resolved while the control is laid out -- so the read-back waits for that.
+	m_sidebarColumn->SetWidth(wxCOL_WIDTH_AUTOSIZE);
+	CallAfter(this() {
+		// Nothing is added to what comes back: the padding the estimate has to guess at is part
+		// of what was measured. A width narrower than the label text is not a measurement at
+		// all, so the estimate stands.
+		const int reported = m_sidebarColumn->GetWidth();
+		if (reported > m_sidebarTextWidth) {
+			SetSidebarWidth(reported);
+			m_PrefsIcons->InvalidateBestSize();
+			Layout();
+		}
+	});
+}
+#endif // __WXMAC__
+
+void PrefsUnifiedDlg::SetSidebarWidth(int columnWidth)
+{
+	m_sidebarColumn->SetWidth(columnWidth);
+	// The control has to be wider than its column: the table draws its cells at a small
+	// offset from its own left edge -- 6 points on macOS, and the other two are not zero
+	// either -- so sizing it to exactly the column width clips the cell against its right
+	// edge.
+	const int controlWidth = columnWidth + FromDIP(6);
+	m_PrefsIcons->SetMinSize(wxSize(controlWidth, -1));
+	m_PrefsIcons->SetMaxSize(wxSize(controlWidth, -1));
+}
+
+void PrefsUnifiedDlg::OnPrefsPageChange(wxDataViewEvent &event)
+{
+	// EVT_DATAVIEW_SELECTION_CHANGED, unlike the old EVT_LIST_ITEM_SELECTED, also fires
+	// when the selection is cleared, in which case GetItem() is not valid and GetItemData()
+	// on it would crash outright. Nothing here currently clears the sidebar's selection, so
+	// this is a guard against future changes rather than a fix for a live bug.
+	if (!event.GetItem().IsOk()) {
+		return;
+	}
+
+	prefs_sizer->Detach(m_CurrentPanel);
+	m_CurrentPanel->Show(false);
 
-	m_CurrentPanel = reinterpret_cast<wxPanel*>(m_PrefsIcons->GetItemData(event.GetIndex()));
-	if (pagesevent.GetIndex().m_function == PreferencesDirectoriesTab) {
+	// Item data is the page's stable pages index (set at insertion in the ctor /
+	// EnableServerTab), not the row's live position in the sidebar -- which shifts whenever
+	// the server / IP2Country row is hidden or re-shown, and previously made both this
+	// widget lookup and the pages lookup below vulnerable to picking the wrong page.
+	const unsigned int pageIdx = (unsigned int)m_PrefsIcons->GetItemData(event.GetItem());
+	m_CurrentPanel = m_pageWidgetspageIdx;
+	if (pagespageIdx.m_function == PreferencesDirectoriesTab) {
+#ifdef CLIENT_GUI
+		// Nothing to initialise: there is no tree here, and the roots are refreshed per editing
+		// session (PrepareSharedDirsForSession) rather than on every page change, which would
+		// discard pending edits when the user navigates away and back.
+#else
 		CastChild(IDC_SHARESELECTOR, CDirectoryTreeCtrl)->Init();
+#endif
+	}
+
+	// The reset-to-defaults button applies to the current page's controls; keep
+	// it to the Advanced page, whose expert tuning knobs it is meant to undo.
+	if (wxButton *resetBtn = CastChild(IDC_TWEAKS_RESET, wxButton)) {
+		// Identify the page by widget, not list index: hiding the server /
+		// IP2Country tab shifts the list index away from the pages index.
+		resetBtn->Show(m_CurrentPanel == m_aMuleTweaksWidget);
 	}
 
-	prefs_sizer->Add( m_CurrentPanel, wxSizerFlags().Expand().Expand());
-	m_CurrentPanel->Show( true );
+	prefs_sizer->Add(m_CurrentPanel, wxSizerFlags().Expand().Expand());
+	m_CurrentPanel->Show(true);
 
 	Layout();
 
 	event.Skip();
 }
 
-
-void PrefsUnifiedDlg::OnToolTipDelayChange(wxSpinEvent& event)
+void PrefsUnifiedDlg::OnToolTipDelayChange(wxSpinEvent &event)
 {
-	wxToolTip::SetDelay( event.GetPosition() * 1000 );
+	wxToolTip::SetDelay(event.GetPosition() * 1000);
 }
 
-
-void PrefsUnifiedDlg::OnInitDialog( wxInitDialogEvent& WXUNUSED(evt) )
+void PrefsUnifiedDlg::OnInitDialog(wxInitDialogEvent &WXUNUSED(evt))
 {
-// This function exists solely to avoid automatic transfer-to-widget calls
+	// This function exists solely to avoid automatic transfer-to-widget calls
 }
 
-
-void PrefsUnifiedDlg::OnScrollBarChange( wxScrollEvent& event )
+void PrefsUnifiedDlg::OnScrollBarChange(wxScrollEvent &event)
 {
 	int id = 0;
 	wxString label;
 
-	switch ( event.GetId() ) {
+	switch (event.GetId()) {
 	case IDC_SLIDER:
 		id = IDC_SLIDERINFO;
-		label = CFormat(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 = CFormat(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;
 
@@ -1661,26 +2436,39 @@
 
 	case IDC_SLIDER2:
 		id = IDC_SLIDERINFO2;
-		label = CFormat(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 = CFormat(wxPLURAL("File Buffer Size: %d byte", "File Buffer Size: %d bytes", event.GetPosition() * 15000)) % (event.GetPosition() * 15000);
+		// 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 = 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 = CFormat(wxPLURAL("Upload Queue Size: %d client", "Upload Queue Size: %d clients", event.GetPosition() * 100)) % (event.GetPosition() * 100);
+		// 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 = 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 = CFormat(wxPLURAL("Server connection refresh interval: %d minute", "Server connection refresh interval: %d minutes", event.GetPosition())) % event.GetPosition();
+		if (event.GetPosition()) {
+			label = CFormat(wxPLURAL("Server connection refresh interval: %d minute",
+					"Server connection refresh interval: %d minutes",
+					event.GetPosition())) %
+				event.GetPosition();
 		} else {
 			label = _("Server connection refresh interval: Disabled");
 		}
@@ -1690,105 +2478,131 @@
 		return;
 	}
 
-	wxStaticText* widget = CastChild( id, wxStaticText );
+	wxStaticText *widget = CastChild(id, wxStaticText);
 
 	if (widget) {
-		widget->SetLabel( label );
+		widget->SetLabel(label);
 		widget->GetParent()->Layout();
 	}
 }
 
-
-void PrefsUnifiedDlg::OnRateLimitChanged( wxSpinEvent& event )
+void PrefsUnifiedDlg::OnRateLimitChanged(wxSpinEvent &event)
 {
 	// 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() != (int)UNLIMITED) {
+		wxSpinCtrl *dlrate = CastChild(IDC_MAXDOWN, wxSpinCtrl);
 
-		if ( event.GetPosition() < 4 ) {
-			if (	( event.GetPosition() * 3 < dlrate->GetValue() ) ||
-				( dlrate->GetValue() == (int)UNLIMITED ) ) {
-				dlrate->SetValue( event.GetPosition() * 3 );
+		if (event.GetPosition() < 4) {
+			if ((event.GetPosition() * 3 < dlrate->GetValue()) ||
+				(dlrate->GetValue() == (int)UNLIMITED)) {
+				dlrate->SetValue(event.GetPosition() * 3);
 			}
-		} else if ( event.GetPosition() < 10  ) {
-			if (	( event.GetPosition() * 4 < dlrate->GetValue() ) ||
-				( dlrate->GetValue() == (int)UNLIMITED ) ) {
-				dlrate->SetValue( event.GetPosition() * 4 );
+		} else if (event.GetPosition() < 10) {
+			if ((event.GetPosition() * 4 < dlrate->GetValue()) ||
+				(dlrate->GetValue() == (int)UNLIMITED)) {
+				dlrate->SetValue(event.GetPosition() * 4);
 			}
 		}
 	}
 }
 
-
-void PrefsUnifiedDlg::OnTCPClientPortChange(wxSpinEvent& WXUNUSED(event))
+void PrefsUnifiedDlg::OnTCPClientPortChange(wxSpinEvent &WXUNUSED(event))
 {
-	CastChild(ID_TEXT_CLIENT_UDP_PORT, wxStaticText)->SetLabel(
-		m_ServerTabVisible ? (wxString() << (CastChild(IDC_PORT, wxSpinCtrl)->GetValue() + 3))
-							: wxString(_("disabled")));
+	CastChild(ID_TEXT_CLIENT_UDP_PORT, wxStaticText)
+		->SetLabel(m_ServerTabVisible
+				   ? (wxString() << (CastChild(IDC_PORT, wxSpinCtrl)->GetValue() + 3))
+				   : wxString(_("disabled")));
 }
 
-void PrefsUnifiedDlg::OnUserEventSelected(wxListEvent& event)
+void PrefsUnifiedDlg::OnUserEventSelected(wxListEvent &event)
 {
 	for (unsigned int i = 0; i < CUserEvents::GetCount(); ++i) {
-		IDC_PREFS_EVENTS_PAGE->Hide(i+1);
+		IDC_PREFS_EVENTS_PAGE->Hide(i + 1);
 	}
 
-	IDC_PREFS_EVENTS_PAGE->Show((event.GetData() - USEREVENTS_FIRST_ID) / USEREVENTS_IDS_PER_EVENT + 1, true);
+	IDC_PREFS_EVENTS_PAGE->Show(
+		(event.GetData() - USEREVENTS_FIRST_ID) / USEREVENTS_IDS_PER_EVENT + 1, true);
 
 	IDC_PREFS_EVENTS_PAGE->Layout();
 
 	event.Skip();
 }
 
-void PrefsUnifiedDlg::OnLanguageChoice(wxCommandEvent &evt)
+void PrefsUnifiedDlg::CreateEventPanels(const int idx, const wxString &vars, wxWindow *parent)
 {
-	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))) );
-	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 );
-	item7->Add( item9, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 5) );
-
-	wxFlexGridSizer *item10 = new wxFlexGridSizer( 3, 0, 0 );
-	item10->AddGrowableCol( 2 );
-
-	item10->Add( 20, 20, wxSizerFlags().Center() );
-
-	wxStaticText *item11 = new wxStaticText( parent, -1, _("Core command:"), wxDefaultPosition, wxDefaultSize, 0 );
-	item10->Add( item11, wxSizerFlags().Center().Border(wxALL, 5) );
-
-	wxTextCtrl *item12 = new wxTextCtrl( parent, USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT + 2, "", wxDefaultPosition, wxDefaultSize, 0 );
+	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(item8,
+		USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT + 1,
+		_("Enable command execution on core"),
+		wxDefaultPosition,
+		wxDefaultSize,
+		0);
+	item7->Add(item9, wxSizerFlags().CenterVertical().Border(wxLEFT | wxRIGHT, 5));
+
+	wxFlexGridSizer *item10 = new wxFlexGridSizer(3, 0, 0);
+	item10->AddGrowableCol(2);
+
+	item10->Add(20, 20, wxSizerFlags().Center());
+
+	wxStaticText *item11 =
+		new wxStaticText(item8, -1, _("Core command:"), wxDefaultPosition, wxDefaultSize, 0);
+	item10->Add(item11, wxSizerFlags().Center().Border(wxALL, 5));
+
+	wxTextCtrl *item12 = new wxTextCtrl(item8,
+		USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT + 2,
+		"",
+		wxDefaultPosition,
+		wxDefaultSize,
+		0);
 	item12->Enable(CUserEvents::IsCoreCommandEnabled(static_cast<enum CUserEvents::EventType>(idx)));
-	item10->Add( item12, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-
-	item7->Add( item10, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
+	item10->Add(item12, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5));
 
-	wxCheckBox *item14 = new wxCheckBox( parent, USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT + 3, _("Enable command execution on GUI"), wxDefaultPosition, wxDefaultSize, 0 );
-	item7->Add( item14, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 5) );
+	item7->Add(item10, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0));
 
-	wxFlexGridSizer *item15 = new wxFlexGridSizer( 3, 0, 0 );
-	item15->AddGrowableCol( 2 );
-
-	item15->Add( 20, 20, wxSizerFlags().Center() );
-
-	wxStaticText *item16 = new wxStaticText( parent, -1, _("GUI command:"), wxDefaultPosition, wxDefaultSize, 0 );
-	item15->Add( item16, wxSizerFlags().Center().Border(wxALL, 5) );
-
-	wxTextCtrl *item17 = new wxTextCtrl( parent, USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT + 4, "", wxDefaultPosition, wxDefaultSize, 0 );
+	wxCheckBox *item14 = new wxCheckBox(item8,
+		USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT + 3,
+		_("Enable command execution on GUI"),
+		wxDefaultPosition,
+		wxDefaultSize,
+		0);
+	item7->Add(item14, wxSizerFlags().CenterVertical().Border(wxLEFT | wxRIGHT, 5));
+
+	wxFlexGridSizer *item15 = new wxFlexGridSizer(3, 0, 0);
+	item15->AddGrowableCol(2);
+
+	item15->Add(20, 20, wxSizerFlags().Center());
+
+	wxStaticText *item16 =
+		new wxStaticText(item8, -1, _("GUI command:"), wxDefaultPosition, wxDefaultSize, 0);
+	item15->Add(item16, wxSizerFlags().Center().Border(wxALL, 5));
+
+	wxTextCtrl *item17 = new wxTextCtrl(item8,
+		USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT + 4,
+		"",
+		wxDefaultPosition,
+		wxDefaultSize,
+		0);
 	item17->Enable(CUserEvents::IsGUICommandEnabled(static_cast<enum CUserEvents::EventType>(idx)));
-	item15->Add( item17, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
+	item15->Add(item17, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5));
 
-	item7->Add( item15, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
+	item7->Add(item15, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0));
 
-	wxStaticText *item13 = new wxStaticText( parent, -1, _("The following variables will be replaced:") + vars, wxDefaultPosition, wxDefaultSize, 0 );
-	item7->Add( item13, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
+	wxStaticText *item13 = new wxStaticText(item8,
+		-1,
+		_("The following variables will be replaced:") + vars,
+		wxDefaultPosition,
+		wxDefaultSize,
+		0);
+	item7->Add(item13, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5));
 
 	IDC_PREFS_EVENTS_PAGE->Add(item7, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5));
 
@@ -1796,24 +2610,22 @@
 	IDC_PREFS_EVENTS_PAGE->Hide(idx + 1);
 }
 
+namespace
+{
 
-namespace {
-
-// Hard-coded list of paths that look like obvious "did you really mean
-// to share this?" candidates. Matched by IsSensitiveSharePath as either
-// the exact path or a strict descendant (separator-boundary aware),
-// so e.g. ~/Documents/Tax2024 is flagged because ~/Documents is on
-// the list. Empty list entries are skipped.
+// Hard-coded list of paths that look like obvious "did you really mean to share this?"
+// candidates. Matched by IsSensitiveSharePath as either the exact path or a strict
+// descendant (separator-boundary aware), so e.g. ~/Documents/Tax2024 is flagged because
+// ~/Documents is on the list. Empty list entries are skipped.
 //
-// This is not meant to be exhaustive — its job is to catch the most
-// common "accidental right-click" cases (issue #592) by raising a
-// confirmation dialog, not to be a privacy boundary. Users can always
-// say "Yes I really do want this" and proceed.
+// This is not meant to be exhaustive -- its job is to catch the most common "accidental
+// right-click" cases (issue #592) by raising a confirmation dialog, not to be a privacy
+// boundary. Users can always say "Yes I really do want this" and proceed.
 wxArrayString BuildSensitivePathList()
 {
 	wxArrayString out;
 
-	auto pushIfNotEmpty = &out(const wxString & s) {
+	auto pushIfNotEmpty = &out(const wxString &s) {
 		if (!s.IsEmpty()) {
 			out.Add(s);
 		}
@@ -1826,8 +2638,8 @@
 		pushIfNotEmpty(home + sep + "Documents");
 		pushIfNotEmpty(home + sep + "Desktop");
 		pushIfNotEmpty(home + sep + "Pictures");
-		pushIfNotEmpty(home + sep + "Library");        // macOS
-		pushIfNotEmpty(home + sep + "AppData");        // Windows
+		pushIfNotEmpty(home + sep + "Library"); // macOS
+		pushIfNotEmpty(home + sep + "AppData"); // Windows
 		pushIfNotEmpty(home + sep + ".aMule");
 		pushIfNotEmpty(home + sep + ".config");
 		pushIfNotEmpty(home + sep + ".ssh");
@@ -1840,7 +2652,7 @@
 	pushIfNotEmpty("C:\\Program Files");
 	pushIfNotEmpty("C:\\Program Files (x86)");
 	pushIfNotEmpty("C:\\ProgramData");
-	pushIfNotEmpty("C:\\Users");          // parent of every user's home
+	pushIfNotEmpty("C:\\Users"); // parent of every user's home
 #else
 	pushIfNotEmpty("/");
 	pushIfNotEmpty("/etc");
@@ -1848,38 +2660,33 @@
 	pushIfNotEmpty("/tmp");
 	pushIfNotEmpty("/boot");
 	pushIfNotEmpty("/usr");
-	pushIfNotEmpty("/home");              // parent of every user's home on Linux
-	pushIfNotEmpty("/root");              // root user's home on Linux
-	pushIfNotEmpty("/Applications");      // macOS
-	pushIfNotEmpty("/System");            // macOS
-	pushIfNotEmpty("/Users");             // parent of every user's home on macOS
+	pushIfNotEmpty("/home");         // parent of every user's home on Linux
+	pushIfNotEmpty("/root");         // root user's home on Linux
+	pushIfNotEmpty("/Applications"); // macOS
+	pushIfNotEmpty("/System");       // macOS
+	pushIfNotEmpty("/Users");        // parent of every user's home on macOS
 #endif
 
 	return out;
 }
 
-bool IsSensitiveSharePath(const CPath & path)
+bool IsSensitiveSharePath(const CPath &path)
 {
 	static const wxArrayString sensitive = BuildSensitivePathList();
 	const wxString raw = path.GetRaw();
 	const wxChar sep = wxFileName::GetPathSeparator();
 	for (size_t i = 0; i < sensitive.GetCount(); ++i) {
-		const wxString & root = sensitivei;
+		const wxString &root = sensitivei;
 		if (raw == root) {
 			return true;
 		}
-		// Prefix match with a separator boundary so /home doesn't
-		// also flag /home2 or /homework. The length floor at 4 keeps
-		// "filesystem-root" entries — `/` (1 char) and `C:\` (3 chars)
-		// — exact-match-only: otherwise every path on the platform
-		// would be a descendant of the root and every share would
-		// trip the confirm dialog. Real subtrees like `/etc`, `/var`,
-		// `C:\Windows` keep their prefix-match behaviour.
-		if (root.length() >= 4
-			&& raw.length() > root.length()
-			&& raw.StartsWith(root)
-			&& (root.Last() == sep || rawroot.length() == sep))
-		{
+		// Prefix match with a separator boundary so /home does not also flag /home2 or
+		// /homework. The length floor at 4 keeps "filesystem-root" entries -- `/` (1 char) and
+		// `C:\` (3 chars) -- exact-match-only: otherwise every path on the platform would be a
+		// descendant of the root and every share would trip the confirm dialog. Real subtrees
+		// like `/etc`, `/var`, `C:\Windows` keep their prefix-match behaviour.
+		if (root.length() >= 4 && raw.length() > root.length() && raw.StartsWith(root) &&
+			(root.Last() == sep || rawroot.length() == sep)) {
 			return true;
 		}
 	}
@@ -1888,10 +2695,28 @@
 
 } // namespace
 
-
-PrefsUnifiedDlg::SharedDirsCommitResult
-PrefsUnifiedDlg::CommitSharedDirsWithProgress()
+PrefsUnifiedDlg::SharedDirsCommitResult PrefsUnifiedDlg::CommitSharedDirsWithProgress()
 {
+#ifdef CLIENT_GUI
+	// Nothing to send unless the user actually edited the list -- the same condition the
+	// monolithic branch below gets from HasChanged, and not merely an optimisation.
+	// PopulateSharedDirsList() fills the editor from glob_prefs, which is still empty in
+	// the window between connecting and the first GET_SHARED_DIRS reply landing. Confirming
+	// the dialog inside that window would harvest an empty editor and instruct the daemon
+	// to share nothing, since SendSharedDirsToRemote() declines only for a daemon that
+	// cannot do this at all.
+	if (!m_sharedDirsDirty) {
+		return SharedDirsCommitResult::NothingToCommit;
+	}
+
+	// The core owns the shared-folder files; we just hand it the roots. No local progress
+	// dialog or rescan here -- the rescan happens daemon-side, and any path it refuses
+	// comes back as a rejection we surface then.
+	HarvestSharedDirsList();
+	static_cast<CPreferencesRem *>(theApp->glob_prefs)->SendSharedDirsToRemote();
+	m_sharedDirsDirty = false;
+	return SharedDirsCommitResult::Committed;
+#else
 	if (!m_ShareSelector || !m_ShareSelector->HasChanged) {
 		return SharedDirsCommitResult::NothingToCommit;
 	}
@@ -1901,21 +2726,19 @@
 	m_ShareSelector->GetSharedDirectories(&explicitShares);
 	m_ShareSelector->GetRecursiveSharedDirectories(&recursiveIntents);
 
-	// Strip entries that are descendants of a recursive root: the
-	// UI's right-click handler populates m_lstShared with the already-
-	// rendered subtree as a side-effect of MarkChildren (so the
-	// in-tree visual stays consistent), but those subdirs aren't
-	// "explicit" intent -- they're the recursive expansion. Without
-	// this filter they'd land in shareddir-explicit.dat and stick
-	// around as orphan pinned paths if the user later removed the
-	// recursive marker externally (no DelSharesUnder cleanup runs
-	// outside the UI). Filter at the commit boundary keeps the
-	// canonical files semantically clean.
+	// Strip entries that are descendants of a recursive root: the UI's right-click handler
+	// populates m_lstShared with the already-rendered subtree as a side-effect of
+	// MarkChildren (so the in-tree visual stays consistent), but those subdirs are not
+	// "explicit" intent -- they are the recursive expansion. Without this filter they would
+	// land in shareddir-explicit.dat and stick around as orphan pinned paths if the user
+	// later removed the recursive marker externally (no DelSharesUnder cleanup runs outside
+	// the UI). Filtering at the commit boundary keeps the canonical files semantically
+	// clean.
 	if (!recursiveIntents.empty()) {
 		const wxChar sep = wxFileName::GetPathSeparator();
-		auto isInsideRecursive = &recursiveIntents, sep(const CPath & p) {
+		auto isInsideRecursive = &recursiveIntents, sep(const CPath &p) {
 			const wxString target = p.GetRaw();
-			for (const CPath & root : recursiveIntents) {
+			for (const CPath &root : recursiveIntents) {
 				const wxString r = root.GetRaw();
 				if (r.IsEmpty()) {
 					continue;
@@ -1923,8 +2746,7 @@
 				if (target == r) {
 					return true;
 				}
-				if (target.length() > r.length() &&
-					target.StartsWith(r) &&
+				if (target.length() > r.length() && target.StartsWith(r) &&
 					(r.Last() == sep || targetr.length() == sep)) {
 					return true;
 				}
@@ -1933,7 +2755,7 @@
 		};
 		CDirectoryTreeCtrl::PathList filtered;
 		filtered.reserve(explicitShares.size());
-		for (const CPath & p : explicitShares) {
+		for (const CPath &p : explicitShares) {
 			if (!isInsideRecursive(p)) {
 				filtered.push_back(p);
 			}
@@ -1943,55 +2765,52 @@
 
 	// Confirm before expanding sensitive recursive roots.
 	std::vector<CPath> sensitive;
-	for (const CPath & p : recursiveIntents) {
+	for (const CPath &p : recursiveIntents) {
 		if (IsSensitiveSharePath(p)) {
 			sensitive.push_back(p);
 		}
 	}
 	if (!sensitive.empty()) {
 		wxString msg = _("The following folders look like system or sensitive locations:\n\n");
-		for (const CPath & p : sensitive) {
+		for (const CPath &p : sensitive) {
 			msg += "  " + p.GetPrintable() + "\n";
 		}
 		msg += "\n";
-		msg += _("Sharing them recursively will publish every file underneath on the eD2k/Kad networks. Do you really want to do this?");
-		const int rv = wxMessageBox(msg,
-			_("Confirm shared folders"),
-			wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this);
+		msg += _("Sharing them recursively will publish every file underneath on the eD2k/Kad "
+			 "networks. Do you really want to do this?");
+		const int rv = wxMessageBox(
+			msg, _("Confirm shared folders"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this);
 		if (rv != wxYES) {
 			return SharedDirsCommitResult::CancelledByUser;
 		}
 	}
 
-	// Snapshot the current shared-dirs state so we can restore it
-	// atomically if the user cancels at any phase (expansion or
-	// reload). Cancel means "leave my saved state alone" — we do not
-	// persist a half-committed list to disk. All three lists are
-	// captured: the explicit/recursive intent + the runtime union,
-	// since SaveSharedFolders persists all three together.
-	const CDirectoryTreeCtrl::PathList originalShares =
-		theApp->glob_prefs->shareddir_list;
-	const CDirectoryTreeCtrl::PathList originalExplicit =
-		theApp->glob_prefs->shareddir_explicit_list;
-	const CDirectoryTreeCtrl::PathList originalRecursive =
-		theApp->glob_prefs->shareddir_recursive_list;
-
-	// One progress dialog covers both phases: the optional recursive
-	// expansion, plus the always-present Reload phase. Even a single
-	// double-click add of one folder still triggers a full Reload of
-	// CSharedFileList, which on a large library (200k+ files) freezes
-	// the UI for a couple of minutes — so the progress UI applies
-	// regardless of whether expansion preceded it. The dialog
-	// auto-hides on Update(100), so on small libraries where Reload
-	// finishes in milliseconds it just flashes briefly.
+	// Snapshot the current shared-dirs state so we can restore it atomically if the user
+	// cancels at any phase (expansion or reload). Cancel means "leave my saved state alone"
+	// -- we do not persist a half-committed list to disk. All three lists are captured: the
+	// explicit/recursive intent plus the runtime union, since SaveSharedFolders persists
+	// all three together.
+	const CDirectoryTreeCtrl::PathList originalShares = theApp->glob_prefs->shareddir_list;
+	const CDirectoryTreeCtrl::PathList originalExplicit = theApp->glob_prefs->shareddir_explicit_list;
+	const CDirectoryTreeCtrl::PathList originalRecursive = theApp->glob_prefs->shareddir_recursive_list;
+
+	// One progress dialog covers both phases: the optional recursive expansion, plus the
+	// always-present Reload phase. Even a single double-click add of one folder still
+	// triggers a full Reload of CSharedFileList, which on a large library (200k+ files)
+	// freezes the UI for a couple of minutes -- so the progress UI applies regardless of
+	// whether expansion preceded it. The dialog auto-hides on Update(100), so on small
+	// libraries where Reload finishes in milliseconds it just flashes briefly.
 	//
-	// The initial body text reflects which phase will run first: if
-	// there is a recursive intent we start in the expansion walk, if
-	// not we go straight into the file-list Reload.
-	const wxString initialBody = recursiveIntents.empty()
-		? _("Reloading shared files…")
-		: _("Scanning for subdirectories…");
-	wxProgressDialog progress(_("Updating shared folders"),
+	// The initial body text reflects which phase will run first: if there is a recursive
+	// intent we start in the expansion walk, if not we go straight into the file-list
+	// Reload.
+	const wxString initialBody = recursiveIntents.empty() ? _("Reloading shared files...")
+							      : _("Scanning for subdirectories...");
+	// Held by pointer so it can be destroyed before the rollback below rather than at end
+	// of scope. wxPD_APP_MODAL keeps its disabler until destruction, so raising the
+	// rollback's dialog while this one is merely hidden would stack two app-modal dialogs
+	// -- the misbehaviour CatDialog.cpp:197-202 documents avoiding.
+	auto progress = std::make_unique<wxProgressDialog>(_("Updating shared folders"),
 		initialBody,
 		/*maximum=*/100,
 		this,
@@ -2001,52 +2820,48 @@
 
 	// ----- Phase 1: optional recursive expansion ---------------------
 	//
-	// Pass `this` as the event owner so progress and done events flow
-	// back into our event handlers below — keeping the GTK main loop
-	// alive during the walk, which in turn keeps the Cancel button on
-	// the progress dialog responsive. A pure polling loop with
-	// wxMilliSleep+Yield works on Cocoa but starves GTK's event queue
-	// and makes the whole UI feel frozen.
+	// Pass `this` as the event owner so progress and done events flow back into our event
+	// handlers below -- keeping the GTK main loop alive during the walk, which in turn
+	// keeps the Cancel button on the progress dialog responsive. A pure polling loop with
+	// wxMilliSleep+Yield works on Cocoa but starves GTK's event queue and makes the whole
+	// UI feel frozen.
 	if (!recursiveIntents.empty()) {
 		CSharedDirsApplyTask task(explicitShares, recursiveIntents, this);
-		if (task.Create() != wxTHREAD_NO_ERROR
-			|| task.Run() != wxTHREAD_NO_ERROR)
-		{
-			// Worker couldn't start. Fall back to the explicit list
-			// (no recursion) so the user at least gets the non-
-			// recursive part of their selection saved.
+		if (task.Create() != wxTHREAD_NO_ERROR || task.Run() != wxTHREAD_NO_ERROR) {
+			// Worker could not start. Fall back to the explicit list (no recursion) so the
+			// user at least gets the non-recursive part of their selection saved.
 			finalShares = explicitShares;
 		} else {
 			bool done = false;
 			bool userCancelled = false;
-			auto onProgress = &(wxThreadEvent & ev) {
-				const wxString status = CFormat(_("Scanned %u directories…"))
-					% static_cast<unsigned>(ev.GetInt());
-				if (!progress.Pulse(status)) {
-					task.Cancel();   // wxThread::Delete joins the worker
+			auto onProgress = &(wxThreadEvent &ev) {
+				const wxString status = CFormat(_("Scanned %u directories...")) %
+							static_cast<unsigned>(ev.GetInt());
+				if (!progress->Pulse(status)) {
+					task.Cancel(); // wxThread::Delete joins the worker
 					userCancelled = true;
 					done = true;
 				}
 			};
-			auto onDone = &(wxThreadEvent & ev) {
+			auto onDone = &(wxThreadEvent &ev) {
 				userCancelled = userCancelled || (ev.GetInt() != 0);
 				done = true;
 			};
 			Bind(wxEVT_SHARED_DIRS_APPLY_PROGRESS, onProgress);
-			Bind(wxEVT_SHARED_DIRS_APPLY_DONE,     onDone);
+			Bind(wxEVT_SHARED_DIRS_APPLY_DONE, onDone);
 
 			while (!done) {
 				wxTheApp->Yield(/*onlyIfNeeded=*/false);
 			}
 
 			Unbind(wxEVT_SHARED_DIRS_APPLY_PROGRESS, onProgress);
-			Unbind(wxEVT_SHARED_DIRS_APPLY_DONE,     onDone);
+			Unbind(wxEVT_SHARED_DIRS_APPLY_DONE, onDone);
 			task.Wait();
 
 			if (userCancelled || task.WasCancelled()) {
-				// shareddir_list was never touched yet — nothing to
+				// shareddir_list was never touched yet -- nothing to
 				// roll back.
-				progress.Update(100);
+				progress->Update(100);
 				return SharedDirsCommitResult::CancelledByUser;
 			}
 			finalShares = task.GetExpandedShares();
@@ -2055,24 +2870,23 @@
 
 	// ----- Phase 2: persist + reload --------------------------------
 	//
-	// Update all three canonical/derived lists on the Preferences
-	// instance and persist them to disk *before* invoking Reload():
-	// FindSharedFiles starts by calling ReloadSharedFolders() which
-	// re-reads from disk, so the in-memory state alone isn't enough.
-	// shareddir-explicit.dat and shareddir-recursive.dat record the
-	// user's intent (non-recursive vs recursive roots); shareddir.dat
-	// is regenerated as the runtime union (= finalShares from the
-	// apply walk) so older binaries still see the right paths.
-	theApp->glob_prefs->shareddir_explicit_list  = explicitShares;
+	// Update all three canonical/derived lists on the Preferences instance and persist them
+	// to disk *before* invoking Reload(): FindSharedFiles starts by calling
+	// ReloadSharedFolders() which re-reads from disk, so the in-memory state alone is not
+	// enough. shareddir-explicit.dat and shareddir-recursive.dat record the user's intent
+	// (non-recursive vs recursive roots); shareddir.dat is regenerated as the runtime union
+	// (= finalShares from the apply walk) so older binaries still see the right paths.
+	theApp->glob_prefs->shareddir_explicit_list = explicitShares;
 	theApp->glob_prefs->shareddir_recursive_list = recursiveIntents;
-	theApp->glob_prefs->shareddir_list           = finalShares;
+	theApp->glob_prefs->shareddir_list = finalShares;
 	theApp->glob_prefs->SaveSharedFolders();
 
 	bool reloadAborted = false;
+	// Its own lambda rather than ReloadSharedFilesWithProgress(): this path is the one
+	// caller that *can* offer cancel, because it keeps the previous directory list to
+	// re-walk against on abort. The wording is shared so the two cannot drift.
 	auto reloadYield = &progress, &reloadAborted(size_t filesScanned) -> bool {
-		const wxString msg = CFormat(_("Reloading shared files: %u files scanned"))
-			% static_cast<unsigned>(filesScanned);
-		if (!progress.Pulse(msg)) {
+		if (!progress->Pulse(SharedFilesScannedMessage(filesScanned))) {
 			reloadAborted = true;
 			return false;
 		}
@@ -2080,25 +2894,392 @@
 	};
 
 	const bool reloadOk = theApp->sharedfiles->Reload(reloadYield);
-	progress.Update(100);
+	progress->Update(100);
+	// Gone before the rollback runs, for the modality reason above and because
+	// wxProgressDialog latches its cancelled state: on the path that matters here the user
+	// has just cancelled, so anything reusing this dialog would get false from its first
+	// Pulse(), abort the rollback walk and leave m_Files_map half-populated.
+	progress.reset();
 
 	if (!reloadOk || reloadAborted) {
-		// Roll back: both the in-memory state and the on-disk
-		// files (shareddir.dat + shareddir-explicit.dat +
-		// shareddir-recursive.dat) have to be reverted. The
-		// in-memory shared-file map is partially populated against
-		// the new list, so rebuild it from the restored list
-		// (without a yield callback — the restored list is by
-		// construction the one the user was already running with
-		// before this OK click).
-		theApp->glob_prefs->shareddir_list           = originalShares;
-		theApp->glob_prefs->shareddir_explicit_list  = originalExplicit;
+		// Roll back: both the in-memory state and the on-disk files (shareddir.dat +
+		// shareddir-explicit.dat + shareddir-recursive.dat) have to be reverted. The in-memory
+		// shared-file map is partially populated against the new list, so rebuild it from the
+		// restored list.
+		//
+		// Through the shared helper rather than a bare Reload(): this walk is the same size as
+		// the one just cancelled, and the user got here *because* that one was taking too long.
+		// A no-yield Reload freezes the window with the dialog already hidden -- no repaint, no
+		// progress, no explanation, on the one path where the user has already said they were
+		// tired of waiting.
+		//
+		// The helper is also the right shape, not merely the convenient one: it offers no
+		// cancel, which is what a rollback needs, since FindSharedFiles clears m_Files_map
+		// before walking and there is no earlier list left to fall back to.
+		theApp->glob_prefs->shareddir_list = originalShares;
+		theApp->glob_prefs->shareddir_explicit_list = originalExplicit;
 		theApp->glob_prefs->shareddir_recursive_list = originalRecursive;
 		theApp->glob_prefs->SaveSharedFolders();
-		theApp->sharedfiles->Reload(nullptr);
+		ReloadSharedFilesWithProgress(this);
 		return SharedDirsCommitResult::CancelledByUser;
 	}
 
 	return SharedDirsCommitResult::Committed;
+#endif // CLIENT_GUI
+}
+#ifdef CLIENT_GUI
+
+void PrefsUnifiedDlg::RefreshSharedDirsIfOpen()
+{
+	if (s_openPrefsDlg == nullptr) {
+		return;
+	}
+	// The daemon's list is here, so the editor may be edited from now on. Set
+	// before the repaint below, which reads it to enable the controls.
+	s_openPrefsDlg->m_sharedDirsLoaded = true;
+	// Never repaint over uncommitted edits: the reply may land after the user has already
+	// started adding rows. That can no longer happen before the first reply -- the controls
+	// were disabled until this point -- so what this protects is an edit made after one
+	// reply against a later one.
+	if (!s_openPrefsDlg->m_sharedDirsDirty) {
+		s_openPrefsDlg->PopulateSharedDirsList();
+	}
+}
+
+namespace
+{
+
+/**
+ * Puts `path` in a list row: `col` shows it, and the row remembers which entry of
+ * `store` it actually is.
+ *
+ * The indirection is the point. A list cell holds display text, and CPath's display
+ * form is not the path: GetPrintable() renders the name for a human, which on macOS
+ * means the NFD-normalised form wxConvFileName produces, while the filesystem form
+ * keeps whatever composition it was given. So "/Motorhead" comes back out of a cell
+ * decomposed -- same characters, different bytes -- and a decomposed path does not
+ * resolve on a byte-exact filesystem, which is what a Linux daemon has and what an
+ * SMB/NFS mount generally presents. Rebuilding a CPath from cell text is therefore
+ * not a round trip, and no caller here should do it.
+ *
+ * The index is stored one-based so that wxListCtrl's default item data of 0 reads as
+ * "no path recorded" instead of silently aliasing the first entry.
+ */
+void SetListRowPath(wxListCtrl *list, long row, int col, const CPath &path, std::vector<CPath> &store)
+{
+	store.push_back(path);
+	list->SetItem(row, col, path.GetPrintable());
+	list->SetItemData(row, static_cast<long>(store.size()));
+}
+
+/** The path SetListRowPath() recorded for `row`. */
+CPath GetListRowPath(wxListCtrl *list, long row, const std::vector<CPath> &store)
+{
+	const size_t stored = static_cast<size_t>(list->GetItemData(row));
+	if (stored == 0 || stored > store.size()) {
+		// Every row is created through SetListRowPath(), so this is a bug in
+		// the caller rather than a state a user can reach.
+		wxFAIL_MSG("List row has no recorded path");
+		return CPath();
+	}
+	return storestored - 1;
+}
+
+} // namespace
+
+void PrefsUnifiedDlg::PopulateSharedDirsList()
+{
+	wxListCtrl *list = CastChild(IDC_SHAREDDIRS_LIST, wxListCtrl);
+	if (list == nullptr) {
+		return;
+	}
+	if (list->GetColumnCount() == 0) {
+		list->InsertColumn(0, _("Shared folder"), wxLIST_FORMAT_LEFT, 320);
+		list->InsertColumn(1, _("Recursive"), wxLIST_FORMAT_LEFT, 90);
+	}
+	list->DeleteAllItems();
+	m_sharedDirRowPaths.clear();
+
+	const bool supported =
+		theApp->m_connect != nullptr && theApp->m_connect->ServerSupportsSharedDirsConfig();
+	// An older core can neither report nor accept these, so leave the editor inert rather
+	// than implying an edit here would reach it. Editable only once the daemon's own list
+	// is on screen: editing before then sets m_sharedDirsDirty, which makes the arriving
+	// reply be discarded to protect the edit, and OK would then replace the daemon's shares
+	// with a list assembled without them.
+	const bool editable = supported && m_sharedDirsLoaded;
+	FindWindow(IDC_SHAREDDIR_PATH)->Enable(editable);
+	FindWindow(IDC_SHAREDDIR_RECURSIVE)->Enable(editable);
+	FindWindow(IDC_SHAREDDIR_ADD)->Enable(editable);
+	FindWindow(IDC_SHAREDDIR_REMOVE)->Enable(editable);
+	if (!supported) {
+		return;
+	}
+
+	long row = 0;
+	for (const CPath &dir : theApp->glob_prefs->shareddir_explicit_list) {
+		list->InsertItem(row, wxEmptyString);
+		SetListRowPath(list, row, 0, dir, m_sharedDirRowPaths);
+		list->SetItem(row, 1, wxEmptyString);
+		++row;
+	}
+	for (const CPath &dir : theApp->glob_prefs->shareddir_recursive_list) {
+		list->InsertItem(row, wxEmptyString);
+		SetListRowPath(list, row, 0, dir, m_sharedDirRowPaths);
+		list->SetItem(row, 1, _("Yes"));
+		++row;
+	}
+}
+
+void PrefsUnifiedDlg::HarvestSharedDirsList()
+{
+	wxListCtrl *list = CastChild(IDC_SHAREDDIRS_LIST, wxListCtrl);
+	if (list == nullptr) {
+		return;
+	}
+	CPreferences::PathList explicitDirs;
+	CPreferences::PathList recursiveDirs;
+	for (long row = 0; row < list->GetItemCount(); ++row) {
+		// The recorded path, not the cell text -- see SetListRowPath().
+		const CPath path = GetListRowPath(list, row, m_sharedDirRowPaths);
+		if (!path.IsOk()) {
+			// GetListRowPath() asserts on this, but the assert is debug-only and an empty
+			// root would go to the daemon as an empty EC_TAG_SHAREDDIR. Drop the row
+			// instead.
+			continue;
+		}
+		wxListItem field;
+		field.SetId(row);
+		field.SetColumn(1);
+		field.SetMask(wxLIST_MASK_TEXT);
+		list->GetItem(field);
+		if (field.GetText().IsEmpty()) {
+			explicitDirs.push_back(path);
+		} else {
+			recursiveDirs.push_back(path);
+		}
+	}
+	theApp->glob_prefs->shareddir_explicit_list = explicitDirs;
+	theApp->glob_prefs->shareddir_recursive_list = recursiveDirs;
+}
+
+void PrefsUnifiedDlg::OnSharedDirAdd(wxCommandEvent &WXUNUSED(evt))
+{
+	wxTextCtrl *pathCtrl = CastChild(IDC_SHAREDDIR_PATH, wxTextCtrl);
+	wxListCtrl *list = CastChild(IDC_SHAREDDIRS_LIST, wxListCtrl);
+	if (pathCtrl == nullptr || list == nullptr) {
+		return;
+	}
+	const wxString path = pathCtrl->GetValue().Strip(wxString::both);
+	if (path.IsEmpty()) {
+		return;
+	}
+	// The path names a folder on the *core's* machine, so it can't be checked
+	// here; the core validates on apply and reports anything it refuses.
+	const CPath newPath(path);
+	// Compared as paths rather than as cell text: the cells show the display form, which
+	// does not always match what was typed (see SetListRowPath), so a text compare can miss
+	// a duplicate.
+	for (long row = 0; row < list->GetItemCount(); ++row) {
+		if (GetListRowPath(list, row, m_sharedDirRowPaths) == newPath) {
+			return; // already listed
+		}
+	}
+	const bool recursive = CastChild(IDC_SHAREDDIR_RECURSIVE, wxCheckBox)->GetValue();
+	const long row = list->InsertItem(list->GetItemCount(), wxEmptyString);
+	SetListRowPath(list, row, 0, newPath, m_sharedDirRowPaths);
+	list->SetItem(row, 1, recursive ? _("Yes") : wxString(wxEmptyString));
+	pathCtrl->Clear();
+	m_sharedDirsDirty = true;
 }
+
+void PrefsUnifiedDlg::OnSharedDirRemove(wxCommandEvent &WXUNUSED(evt))
+{
+	wxListCtrl *list = CastChild(IDC_SHAREDDIRS_LIST, wxListCtrl);
+	if (list == nullptr) {
+		return;
+	}
+	const long sel = list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	if (sel != -1) {
+		list->DeleteItem(sel);
+		m_sharedDirsDirty = true;
+	}
+}
+
+void PrefsUnifiedDlg::PopulatePathMappingList()
+{
+	wxListCtrl *list = CastChild(IDC_PATHMAP_LIST, wxListCtrl);
+	if (list == nullptr) {
+		return;
+	}
+	if (list->GetColumnCount() == 0) {
+		list->InsertColumn(0, _("Remote prefix"), wxLIST_FORMAT_LEFT, 220);
+		list->InsertColumn(1, _("Local prefix"), wxLIST_FORMAT_LEFT, 220);
+	}
+	list->DeleteAllItems();
+	m_pathMappingRowPaths.clear();
+
+	long row = 0;
+	for (const CPreferences::PathMapping &mapping : theApp->glob_prefs->GetPathMappings()) {
+		list->InsertItem(row, mapping.remotePrefix);
+		SetListRowPath(list, row, 1, mapping.localPrefix, m_pathMappingRowPaths);
+		++row;
+	}
+
+	// muuli_wdr.cpp wraps the paragraph above the list once, so the page has a sane minimum
+	// width; from here on it follows the page. Bound on the page rather than on the
+	// paragraph, and idempotently, since this page's controls do not exist until
+	// PreferencesPathMappingTab() builds them and Populate is the first point afterwards
+	// that runs.
+	if (wxStaticText *hint = CastChild(IDC_PATHMAP_HINT, wxStaticText)) {
+		if (m_pathMappingHintText.IsEmpty()) {
+			// Arrives already wrapped, so the breaks come back out: Wrap() would otherwise
+			// keep them forever and could only ever narrow the text further.
+			m_pathMappingHintText = hint->GetLabel();
+			m_pathMappingHintText.Replace("\n", " ");
+		}
+		if (wxWindow *page = hint->GetParent()) {
+			page->Unbind(wxEVT_SIZE, &PrefsUnifiedDlg::OnPathMappingPageResize, this);
+			page->Bind(wxEVT_SIZE, &PrefsUnifiedDlg::OnPathMappingPageResize, this);
+		}
+		WrapPathMappingHint();
+	}
+}
+
+void PrefsUnifiedDlg::OnPathMappingPageResize(wxSizeEvent &evt)
+{
+	WrapPathMappingHint();
+	evt.Skip();
+}
+
+void PrefsUnifiedDlg::WrapPathMappingHint()
+{
+	wxStaticText *hint = CastChild(IDC_PATHMAP_HINT, wxStaticText);
+	if (hint == nullptr || m_pathMappingHintText.IsEmpty()) {
+		return;
+	}
+	wxWindow *page = hint->GetParent();
+	if (page == nullptr) {
+		return;
+	}
+	// The page's width, never the label's: the label's width is whatever the
+	// last SetLabel() made it, which is exactly the feedback this avoids.
+	const int width = page->GetClientSize().GetWidth();
+	if (width <= 0 || width == m_pathMappingHintWrapWidth) {
+		return;
+	}
+	m_pathMappingHintWrapWidth = width;
+	hint->SetLabel(m_pathMappingHintText);
+	hint->Wrap(width);
+	// The paragraph's height has changed, so the rest of the page moves.
+	page->Layout();
+}
+
+void PrefsUnifiedDlg::HarvestPathMappingList()
+{
+	wxListCtrl *list = CastChild(IDC_PATHMAP_LIST, wxListCtrl);
+	if (list == nullptr) {
+		return;
+	}
+	CPreferences::PathMappingList mappings;
+	for (long row = 0; row < list->GetItemCount(); ++row) {
+		CPreferences::PathMapping mapping;
+		// The daemon's path, in the daemon's own OS convention -- never a
+		// CPath (see Preferences.h), so the cell text already round-trips.
+		mapping.remotePrefix = list->GetItemText(row);
+		mapping.localPrefix = GetListRowPath(list, row, m_pathMappingRowPaths);
+		mappings.push_back(mapping);
+	}
+	theApp->glob_prefs->SetPathMappings(mappings);
+}
+
+void PrefsUnifiedDlg::OnPathMappingAdd(wxCommandEvent &WXUNUSED(evt))
+{
+	wxTextCtrl *remoteCtrl = CastChild(IDC_PATHMAP_REMOTE, wxTextCtrl);
+	wxTextCtrl *localCtrl = CastChild(IDC_PATHMAP_LOCAL, wxTextCtrl);
+	wxListCtrl *list = CastChild(IDC_PATHMAP_LIST, wxListCtrl);
+	if (remoteCtrl == nullptr || localCtrl == nullptr || list == nullptr) {
+		return;
+	}
+	// Stripped here, at entry, rather than only where ApplyPathMapping() substitutes: a
+	// trailing separator on the remote prefix silently corrupts every path it maps
+	// (StartsWith() still matches, but the join then runs the two halves together with
+	// nothing between them). TrimRemotePrefix() rather than StripSeparators() for the
+	// remote side: the prefix is the daemon's, and its convention is not this host's.
+	const wxString remote = CPreferences::TrimRemotePrefix(remoteCtrl->GetValue().Strip(wxString::both));
+	const wxString local =
+		StripSeparators(localCtrl->GetValue().Strip(wxString::both), wxString::trailing);
+	if (remote.IsEmpty() || local.IsEmpty()) {
+		wxMessageBox(
+			_("Both the remote and local prefix must be filled in."), _("Path Mappings"), wxOK);
+		return;
+	}
+	for (long row = 0; row < list->GetItemCount(); ++row) {
+		if (list->GetItemText(row) == remote) {
+			wxMessageBox(_("This remote prefix is already mapped."), _("Path Mappings"), wxOK);
+			return;
+		}
+	}
+	const long row = list->InsertItem(list->GetItemCount(), remote);
+	SetListRowPath(list, row, 1, CPath(local), m_pathMappingRowPaths);
+	remoteCtrl->Clear();
+	localCtrl->Clear();
+}
+
+void PrefsUnifiedDlg::OnPathMappingRemove(wxCommandEvent &WXUNUSED(evt))
+{
+	wxListCtrl *list = CastChild(IDC_PATHMAP_LIST, wxListCtrl);
+	if (list == nullptr) {
+		return;
+	}
+	const long sel = list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	if (sel != -1) {
+		list->DeleteItem(sel);
+	}
+}
+
+void PrefsUnifiedDlg::OnPathMappingBrowse(wxCommandEvent &WXUNUSED(evt))
+{
+	wxTextCtrl *localCtrl = CastChild(IDC_PATHMAP_LOCAL, wxTextCtrl);
+	if (localCtrl == nullptr) {
+		return;
+	}
+	wxDirDialog dlg(this, _("Choose the local folder"), localCtrl->GetValue());
+	if (dlg.ShowModal() == wxID_OK) {
+		localCtrl->SetValue(dlg.GetPath());
+	}
+}
+
+#endif // CLIENT_GUI
+
+void PrefsUnifiedDlg::EndSharedDirsSession()
+{
+#ifdef CLIENT_GUI
+	m_sharedDirsDirty = false;
+#else
+	if (m_ShareSelector != nullptr) {
+		m_ShareSelector->HasChanged = false;
+	}
+#endif
+}
+
+void PrefsUnifiedDlg::PrepareSharedDirsForSession()
+{
+#ifndef CLIENT_GUI
+	// TransferToWindow() has already refreshed the tree's backing maps from glob_prefs by
+	// the time we run, so the model is never the stale part. The view is: marks below the
+	// root's immediate children are applied when a node is created, so anything already
+	// expanded keeps the marks it was built with. Rebuild only when the roots have actually
+	// moved since the paint, since rebuilding collapses the tree and re-scans the drives.
+	if (m_ShareSelector == nullptr || m_ShareSelector->HasChanged) {
+		// Edits pending in this session; leave them be.
+		return;
+	}
+	if (m_ShareSelector->NeedsRepaintFor(theApp->glob_prefs->shareddir_explicit_list,
+		    theApp->glob_prefs->shareddir_recursive_list)) {
+		m_ShareSelector->Rebuild();
+	}
+#endif
+}
+
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/PrefsUnifiedDlg.h -> amule-3.1.0.tar.gz/src/PrefsUnifiedDlg.h Changed

@@ -23,11 +23,17 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#ifndef __PrefsUnifiedDlg_H__
-#define __PrefsUnifiedDlg_H__
+#ifndef PREFSUNIFIEDDLG_H
+#define PREFSUNIFIEDDLG_H
 
-#include <wx/dialog.h>		// Needed for wxDialog
+#include <wx/bmpbndl.h> // Needed for wxBitmapBundle (m_pageIcons)
+#include <wx/dialog.h>  // Needed for wxDialog
 
+#include <common/Path.h> // Needed for CPath (value members of m_sharedDirRowPaths)
+
+#include <vector>
+
+#include "ProtocolHandlerManager.h" // Needed for HandlerTarget enum
 
 class Cfg_Base;
 class CDirectoryTreeCtrl;
@@ -36,7 +42,10 @@
 class wxChoice;
 class wxButton;
 class wxPanel;
-class wxListCtrl;
+class wxDataViewListCtrl;
+class wxDataViewColumn;
+class wxDataViewEvent;
+class wxShowEvent;
 
 class wxCommandEvent;
 class wxListEvent;
@@ -44,106 +53,207 @@
 class wxScrollEvent;
 class wxInitDialogEvent;
 
-
-/**
- * This class represents a dialog used to display preferences.
- */
+/// The preferences dialog.
 class PrefsUnifiedDlg : public wxDialog
 {
 public:
 	/**
-	 * Constructor.
-	 *
-	 * @param parent The parent window.
-	 *
-	 * This constructor is a much more simple version of the wxDialog one,
-	 * which only needs to know the parent of the dialog. Please note that
-	 * it is private so that we can ensure that only one dialog has been
-	 * created at one time.
+	 * Constructs the dialog under @a parent. Private, so only one dialog can exist at a time.
 	 */
-	PrefsUnifiedDlg(wxWindow* parent);
-#ifdef ENABLE_IP2COUNTRY
+	PrefsUnifiedDlg(wxWindow *parent);
+#if defined(ENABLE_IP2COUNTRY) || defined(CLIENT_GUI)
 	~PrefsUnifiedDlg();
 
-	// Public module hook: CamuleDlg::IP2CountryDownloadFinished calls
-	// this so an open Preferences dialog refreshes its status block as
-	// soon as the new database is loaded. No-op if no dialog is open.
+	// Public module hook: CamuleDlg::IP2CountryDownloadFinished calls this so an open
+	// Preferences dialog refreshes its status block as soon as the new database is loaded. No-
+	// op if no dialog is open.
 	static void RefreshIP2CountryStatusIfOpen();
 
-	// Public module hook: CIP2Country calls this on a *manual* update
-	// failure (the "Update now" button) so the user sees a modal popup,
-	// not just a buried log line. No-op if the prefs dialog isn't
-	// open — caller is expected to have already logged the same
-	// message via AddLogLineC so the failure is still recorded.
-	static void NotifyIP2CountryUpdateFailedIfOpen(const wxString& msg);
+	//! Public module hook: CIP2Country calls this on a MANUAL update failure (the "Update now"
+	//! button) so the user sees a modal popup rather than a buried log line. No-op when the
+	//! dialog is closed; the caller has already logged the same message.
+	static void NotifyIP2CountryUpdateFailedIfOpen(const wxString &msg);
 #endif
 
-	/**
-	 * Updates the widgets with the values of the preference-variables.
-	 */
+	/// Updates the widgets from the preference variables.
 	bool TransferFromWindow();
-	/**
-	 * Updates the prefernce-variables with the values of the widgets.
-	 */
+	/// Updates the preference variables from the widgets.
 	bool TransferToWindow();
 
-
 protected:
-	/**
-	 * Helper functions which checks if a Cfg has has changed.
-	 */
-	bool			CfgChanged(int id);
+	/// True if the Cfg with this id has changed.
+	bool CfgChanged(int id);
 
-	/**
-	 * Helper functions which returns the Cfg associated with the specified id.
-	 */
-	Cfg_Base*		GetCfg(int id);
+	/// The Cfg associated with the specified id.
+	Cfg_Base *GetCfg(int id);
+
+	//! Pointer to the shared-files list. NULL under CLIENT_GUI: the remote GUI has no business
+	//! browsing *this* machine's filesystem, so the Directories tab builds a path list editor
+	//! instead of the tree.
+	CDirectoryTreeCtrl *m_ShareSelector;
+
+#ifdef CLIENT_GUI
+	//! Set once the user adds or removes a row, cleared when the session ends. Guards the
+	//! editor against being repainted out from under uncommitted edits, either by a session
+	//! refresh or by a late GET_SHARED_DIRS reply.
+	bool m_sharedDirsDirty;
+
+	//! Whether this session's GET_SHARED_DIRS reply has arrived, i.e. whether the editor shows
+	//! the daemon's list rather than whatever glob_prefs held at open time. The edit controls
+	//! stay disabled until it is true: an edit made before the reply lands sets
+	//! m_sharedDirsDirty, which makes RefreshSharedDirsIfOpen() discard that very reply, so OK
+	//! would replace the daemon's shares with a list built without ever having seen them.
+	bool m_sharedDirsLoaded;
+
+	//! The shared-folder rows' actual paths, indexed by the row's item data. A list cell holds
+	//! display text, and CPath's display form is not the path -- see SetListRowPath() in the
+	//! .cpp for why one cannot be rebuilt from the other.
+	std::vector<CPath> m_sharedDirRowPaths;
+
+	//! Fill the shared-folders list widget from glob_prefs' roots.
+	void PopulateSharedDirsList();
+	//! Copy the list widget's rows back into glob_prefs' roots.
+	void HarvestSharedDirsList();
+	void OnSharedDirAdd(wxCommandEvent &evt);
+	void OnSharedDirRemove(wxCommandEvent &evt);
+
+	//! The path-mapping rows' actual local prefixes, indexed by the row's item data. Same
+	//! rationale as m_sharedDirRowPaths: a list cell holds display text, not a round-trippable
+	//! CPath.
+	std::vector<CPath> m_pathMappingRowPaths;
 
+	//! Fill the path-mapping list widget from glob_prefs' mappings (#843). Purely local --
+	//! unlike PopulateSharedDirsList, there is no EC reply to wait for, so this is the whole
+	//! refresh.
+	void PopulatePathMappingList();
+	//! Copy the list widget's rows back into glob_prefs' mappings.
+	void HarvestPathMappingList();
+	void OnPathMappingAdd(wxCommandEvent &evt);
+	void OnPathMappingRemove(wxCommandEvent &evt);
+	//! wxDirDialog for the local-prefix field: typing a remote prefix makes sense (it is the
+	//! daemon's path, nothing here to browse to), but the local side is a real folder on this
+	//! machine.
+	void OnPathMappingBrowse(wxCommandEvent &evt);
+	//! Re-flows the explanatory paragraph above the path-mapping list on resize. Bound on the
+	//! PAGE, not on the paragraph: wxStaticText::SetLabel() resizes the control to fit its
+	//! label, so a handler on the paragraph that rewrites the paragraph feeds itself (stack
+	//! exhaustion inside SetLabel). The page's width is set by the dialog and unmoved by
+	//! anything the label does.
+	void OnPathMappingPageResize(wxSizeEvent &evt);
+	//! Wraps that paragraph to the page's current client width.
+	void WrapPathMappingHint();
 
-	//! Pointer to the shared-files list
-	CDirectoryTreeCtrl*	m_ShareSelector;
+	//! The paragraph with no line breaks in it. wxStaticText::Wrap() only ever inserts breaks
+	//! and treats any newline already there as hard, so re-flowing to a WIDER page has to start
+	//! from unwrapped text.
+	wxString m_pathMappingHintText;
+	//! Width last wrapped to, so a resize that leaves the width alone (a
+	//! height-only change, say) does no work.
+	int m_pathMappingHintWrapWidth;
 
+public:
+	//! Repaint the editor when a GET_SHARED_DIRS reply lands while the dialog is open. A no-op
+	//! when it is not, so the reply handler never needs to know whether the dialog still
+	//! exists.
+	static void RefreshSharedDirsIfOpen();
+
+private:
+#endif
+
+public:
+	//! Re-seed the shared-folders editor at the start of an editing session. The dialog is
+	//! constructed once and reused, so without this it keeps whatever it captured the first
+	//! time Preferences was opened -- stale the moment anything else changes the roots. Called
+	//! on show rather than on page change so it cannot discard edits in progress, and skipped
+	//! while edits are pending.
+	void PrepareSharedDirsForSession();
+
+	//! Mark the end of an editing session: the pending-edit flags stop a refresh clobbering
+	//! work in progress, so they have to be cleared when that work is applied or discarded.
+	//! Otherwise they latch on the first edit and suppress every later refresh for the dialog's
+	//! lifetime -- and it is never destroyed.
+	void EndSharedDirsSession();
+
+private:
 	//! Pointer to the color-selector
-	wxChoice*		m_choiceColor;
+	wxChoice *m_choiceColor;
 
 	//! Pointer to the color-selection button
-	wxButton*		m_buttonColor;
+	wxButton *m_buttonColor;
 
 	//! Pointer to the currently shown preference-page
-	wxPanel*		m_CurrentPanel;
+	wxPanel *m_CurrentPanel;
 
 	//! hide/show server tab
-	int				m_IndexServerTab;
-	bool			m_ServerTabVisible;
-	wxPanel*		m_ServerWidget;
-	wxListCtrl*		m_PrefsIcons;
+	int m_IndexServerTab;
+	bool m_ServerTabVisible;
+	wxPanel *m_ServerWidget;
+#if defined(ENABLE_IP2COUNTRY) || defined(CLIENT_GUI)
+	//! List index of the IP2Country tab, so amulegui can drop it from the menu
+	//! when the connected core has no GeoIP support (#440). -1 if not built.
+	int m_IndexIP2CountryTab = -1;
+#endif
+	//! The Advanced (aMule tweaks) page widget. Kept so OnPrefsPageChange can identify the
+	//! current page by widget rather than list index, which shifts when a tab (server /
+	//! IP2Country) is hidden.
+	wxPanel *m_aMuleTweaksWidget = nullptr;
+	wxDataViewListCtrl *m_PrefsIcons;
+	//! `pages` index for every page widget, by that same stable position (only which pages
+	//! are VISIBLE in m_PrefsIcons changes). Each visible row's item data is one of these, so
+	//! OnPrefsPageChange identifies a page by the stable index rather than by the row's live
+	//! position, which shifts whenever the server / IP2Country row is hidden or re-shown.
+	std::vector<wxPanel *> m_pageWidgets;
+	//! Page icons, in `pages` order -- kept so EnableServerTab can
+	//! re-insert the server row's icon when the tab is re-shown.
+	std::vector<wxBitmapBundle> m_pageIcons;
+	//! The sidebar's single icon+text column, kept so its width can be
+	//! replaced with the control's own measurement on first show.
+	wxDataViewColumn *m_sidebarColumn = nullptr;
+#ifdef __WXMAC__
+	//! Widest label as the control's own font measures it. A reported width
+	//! narrower than this cannot be a measurement of icon-plus-text.
+	int m_sidebarTextWidth = 0;
+	//! The measurement is a one-off; the dialog is shown more than once.
+	bool m_sidebarMeasured = false;
+#endif
 	void EnableServerTab(bool enable);
+#ifdef __WXMAC__
+	void OnShowMeasureSidebar(wxShowEvent &event);
+#endif
+	//! Applies a column width, and the control width that fits it.
+	void SetSidebarWidth(int columnWidth);
 
 	void OnOk(wxCommandEvent &event);
 	void OnCancel(wxCommandEvent &event);
 	void OnClose(wxCloseEvent &event);
 
 	void OnButtonBrowseApplication(wxCommandEvent &event);
-	void OnButtonDir(wxCommandEvent& event);
-	void OnButtonEditAddr(wxCommandEvent& event);
+	void OnButtonDir(wxCommandEvent &event);
+#ifndef CLIENT_GUI
+	// Live preview of the shared-file exclusion filter. Core-only: it reads
+	// the in-memory shared list, absent in the remote GUI.
+	void OnButtonExcludePreview(wxCommandEvent &event);
+#endif
+	void OnButtonEditAddr(wxCommandEvent &event);
+	void OnButtonMediaMetaDetect(wxCommandEvent &event);
+	void OnButtonTweaksReset(wxCommandEvent &event);
 	void OnButtonColorChange(wxCommandEvent &event);
 	void OnButtonIPFilterReload(wxCommandEvent &event);
 	void OnButtonIPFilterUpdate(wxCommandEvent &event);
-#ifdef ENABLE_IP2COUNTRY
+#if defined(ENABLE_IP2COUNTRY) || defined(CLIENT_GUI)
 	void OnGeoIPSourceChange(wxCommandEvent &event);
 	void OnGeoIPUpdateNow(wxCommandEvent &event);
 	void OnGeoIPMasterToggle(wxCommandEvent &event);
-	// Show/hide the three source-specific sub-panels based on the
-	// dropdown index; called from OnGeoIPSourceChange and from
-	// TransferToWindow on dialog open.
+	// Show or hide the three source-specific sub-panels based on the dropdown index; called
+	// from OnGeoIPSourceChange and from TransferToWindow on dialog open.
 	void UpdateGeoIPSourcePanel();
-	// Re-render the status line from the current CIP2Country state +
-	// selected source. Called whenever the dropdown changes, after a
-	// successful Update Now, and from RefreshIP2CountryStatusIfOpen.
+	// Re-render the status line from the current CIP2Country state and selected source. Called
+	// whenever the dropdown changes, after a successful Update Now, and from
+	// RefreshIP2CountryStatusIfOpen.
 	void UpdateGeoIPStatus();
-	// Grey out the source selector + everything downstream when the
-	// master "Show country flags for clients" checkbox is unchecked.
-	// Called from OnGeoIPMasterToggle and TransferToWindow.
+	// Grey out the source selector and everything downstream when the master "Show country
+	// flags for clients" checkbox is unchecked. Called from OnGeoIPMasterToggle and
+	// TransferToWindow.
 	void UpdateGeoIPControlsEnabled();
 
 private:
@@ -151,59 +261,70 @@
 	// callback can find an open dialog without a global pointer chain.
 	static PrefsUnifiedDlg *s_activeInstance;
 
-	// Snapshots taken at TransferToWindow so OnOk can detect "the user
-	// switched GeoIP source / pasted a new license / changed the URL
-	// during this dialog session" and kick off a download — otherwise
-	// the user has to remember to click Update now after each change.
-	// The Cfg system only tracks credential fields bound through
-	// NewCfgItem; the source dropdown is committed live, so we have
-	// to compare it manually.
-	int		m_GeoIPSourceAtOpen;
-	wxString	m_GeoIPMaxMindLicenseAtOpen;
-	wxString	m_GeoIPCustomUrlAtOpen;
+	// Snapshots taken at TransferToWindow so OnOk can tell that the user switched GeoIP source,
+	// pasted a new license or changed the URL during this session and kick off a download,
+	// rather than making them remember to click Update now. The Cfg system only tracks
+	// credential fields bound through NewCfgItem, and the source dropdown is committed live, so
+	// it is compared manually.
+	int m_GeoIPSourceAtOpen;
+	wxString m_GeoIPMaxMindLicenseAtOpen;
+	wxString m_GeoIPCustomUrlAtOpen;
+
 public:
 #endif
 	void OnColorCategorySelected(wxCommandEvent &event);
 	void OnCheckBoxChange(wxCommandEvent &event);
 	void OnAutostartToggle(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 );
-
-	// Tri-state outcome of an attempt to commit the pending share
-	// selection. Used by OnOk to decide between three flows:
-	//   * Committed       → continue to Save() + Reload + Show(false)
-	//   * NothingToCommit → continue to Save() + Show(false), skip Reload
-	//   * CancelledByUser → return early from OnOk: keep the prefs
-	//                       dialog open so the user can adjust their
-	//                       selection without losing the rest of
-	//                       their pending pref changes
-	enum class SharedDirsCommitResult {
+	void OnProtocolEd2kToggle(wxCommandEvent &event);
+	void OnProtocolMagnetToggle(wxCommandEvent &event);
+	void OnAssocCollectionToggle(wxCommandEvent &event);
+	// Shared implementation for the two OnProtocol*Toggle handlers: same live-OS-state write
+	// model as autostart, gated by a confirm dialog when a non-aMule handler is currently in
+	// place.
+	void HandleProtocolToggle(HandlerTarget scheme, int checkboxId, bool wanted);
+	void OnPrefsPageChange(wxDataViewEvent &event);
+	void OnToolTipDelayChange(wxSpinEvent &event);
+	void OnScrollBarChange(wxScrollEvent &event);
+	void OnRateLimitChanged(wxSpinEvent &event);
+	void OnTCPClientPortChange(wxSpinEvent &event);
+	void OnUserEventSelected(wxListEvent &event);
+	void CreateEventPanels(const int idx, const wxString &vars, wxWindow *parent);
+
+	void OnInitDialog(wxInitDialogEvent &evt);
+
+	// Tri-state outcome of an attempt to commit the pending share selection:
+	//   * Committed       -> Save() + Reload + Show(false)
+	//   * NothingToCommit -> Save() + Show(false), skipping Reload
+	//   * CancelledByUser -> return early from OnOk, keeping the dialog open so the rest of the
+	//                        pending pref changes are not lost
+	enum class SharedDirsCommitResult
+	{
 		NothingToCommit,
 		Committed,
 		CancelledByUser,
 	};
 
-	// Commits the pending share selection from the directory tree
-	// into theApp->glob_prefs->shareddir_list. Confirms before
-	// committing recursive-share roots that look like sensitive
-	// system locations (e.g. home, /etc), then runs the recursive
-	// directory enumeration on a worker thread with a cancellable
-	// progress dialog so the UI never freezes on large roots.
+	// Commits the pending share selection from the directory tree into
+	// theApp->glob_prefs->shareddir_list. Confirms before committing recursive-share roots that
+	// look like sensitive system locations, then runs the recursive enumeration on a worker
+	// thread with a cancellable progress dialog.
 	SharedDirsCommitResult CommitSharedDirsWithProgress();
 
+	// Fills one of the amuleapi credential-state labels. A stored password is salted and
+	// stretched and can never be shown, so this label is the only thing telling the user
+	// whether one exists.
+	void SetCredentialStateLabel(int id, bool isSet);
+
 	wxDECLARE_EVENT_TABLE();
 
 private:
-	bool	m_verticalToolbar;
-	bool	m_toolbarOrientationChanged;
+	bool m_verticalToolbar;
+	bool m_toolbarOrientationChanged;
+
+	// Whether a guest password was stored when this dialog opened. TransferFromWindow
+	// overwrites the live preference with the checkbox's value, so OnOk cannot ask the
+	// preference itself.
+	bool m_amuleApiGuestWasSet = false;
 };
 
 #endif

amule-3.1.0.tar.gz/src/ProtocolHandlerManager.cpp Added

@@ -0,0 +1,842 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "ProtocolHandlerManager.h"
+
+#include <wx/app.h>      // Needed for wxTheApp
+#include <wx/filename.h> // Needed for wxFileName
+#include <wx/log.h>      // Needed for wxLogDebug
+#include <wx/stdpaths.h> // Needed for wxStandardPaths
+#include <wx/string.h>   // Needed for wxString
+#include <wx/textfile.h> // Needed for wxTextFile in ProtocolHandler_QueueSchemeLink
+#include <wx/uri.h>      // Needed for wxURI::Unescape on browser-delivered URLs
+
+#include "Preferences.h" // Needed for thePrefs::GetConfigDir in QueueSchemeLink
+
+#include <vector> // Needed for std::vector (Windows registry buffer +
+		  // Linux mimeapps.list line vector)
+
+#ifdef __WXMSW__
+#include <windows.h>
+#include <shlobj.h> // Needed for SHChangeNotify
+#include <cwchar>   // Needed for wcslen
+#else
+#include <climits>      // Needed for PATH_MAX
+#include <stdlib.h>     // Needed for realpath
+#include <wx/file.h>    // Needed for wxFile
+#include <wx/filefn.h>  // Needed for wxRemoveFile
+#include <wx/tokenzr.h> // Needed for wxStringTokenizer
+#include <wx/utils.h>   // Needed for wxGetEnv / wxGetUserHome
+#endif
+
+// Forward declarations for the macOS backend entry points implemented in
+// ProtocolHandlerManager_mac.mm. Declared at file scope (external linkage, global namespace) so the
+// .mm's plain-C++ definitions link against them: a static-linkage declaration could not bind to a
+// global-scope definition.
+#if defined(__WXMAC__) || defined(__WXOSX__)
+wxString MacReadHandler(HandlerTarget scheme);
+bool MacWrite(HandlerTarget scheme, const wxString &canonicalExe);
+bool MacRemove(HandlerTarget scheme);
+wxString MacOwnBundleId();
+#endif
+
+namespace
+{
+// True for targets registered as a URL protocol rather than a file type. The two differ in key
+// layout on Windows and in the mimeapps.list / LaunchServices call used elsewhere, so every backend
+// branches on it.
+bool IsUriScheme(HandlerTarget target)
+{
+	return target != HandlerTarget::CollectionFile;
+}
+
+// The name that identifies this target in the OS store: the scheme for a
+// URL protocol, the ProgID for the Windows file type.
+const wchar_t *SchemeName(HandlerTarget target)
+{
+	switch (target) {
+	case HandlerTarget::Ed2kScheme:
+		return L"ed2k";
+	case HandlerTarget::MagnetScheme:
+		return L"magnet";
+	case HandlerTarget::CollectionFile:
+		return L"aMule.emulecollection";
+	}
+	return L"";
+}
+
+// UTF-8 flavour for POSIX backends. For the file type this is the MIME
+// type, which is what mimeapps.list keys on.
+const char *SchemeNameUtf8(HandlerTarget target)
+{
+	switch (target) {
+	case HandlerTarget::Ed2kScheme:
+		return "ed2k";
+	case HandlerTarget::MagnetScheme:
+		return "magnet";
+	case HandlerTarget::CollectionFile:
+		return "application/x-emule-collection";
+	}
+	return "";
+}
+
+// Per-backend low-level helpers. Return raw OS state without applying aMule-specific policy;
+// definitions live near the bottom of this file.
+//
+// Reads the currently-registered handler's identifier for `scheme`. The shape differs by OS:
+// registry command string on Windows, .desktop id on Linux, bundle id on macOS. Empty on "no
+// handler set".
+wxString BackendReadHandler(HandlerTarget scheme);
+
+// Sets aMule as the default handler for `scheme`. `canonicalExe` is the resolved absolute path of
+// the running binary. Silent overwrite -- the caller owns the "another app is currently the
+// default" UX.
+bool BackendWrite(HandlerTarget scheme, const wxString &canonicalExe);
+
+// Removes aMule as the default handler for `scheme` if we are the current handler. Idempotent --
+// returns true if we were not the current handler either.
+bool BackendRemove(HandlerTarget scheme);
+
+// True iff `raw` (the return value of BackendReadHandler) refers to the aMule binary or bundle at
+// `canonicalExe`. Encapsulates the per-OS identity check: registry command -> executable path,
+// .desktop id -> our desktop file, bundle id -> our bundle id.
+bool BackendIdentityMatches(const wxString &raw, const wxString &canonicalExe);
+
+// True iff `raw` refers to *any* aMule binary or bundle, ignoring path drift. Used by
+// SelfHealOnStartup: a registered handler that is us-but-at-a-stale-path is rewritten; a third-
+// party handler is left alone.
+bool BackendIsUs(const wxString &raw);
+} // namespace
+
+wxString ProtocolHandlerManager::GetCanonicalExecutablePath()
+{
+	// wxStandardPaths::GetExecutablePath() wraps the OS native call. On POSIX we resolve
+	// intermediate symlinks via realpath() so AppImage / .app bundle moves are detected
+	// correctly by SelfHealOnStartup. Same helper as AutostartManager, duplicated so this class
+	// stays self-contained.
+	wxString raw = wxStandardPaths::Get().GetExecutablePath();
+
+#ifndef __WXMSW__
+	if (raw.empty()) {
+		return raw;
+	}
+	char resolvedPATH_MAX;
+	if (realpath(raw.mb_str(wxConvUTF8), resolved) != nullptr) {
+		return wxString::FromUTF8(resolved);
+	}
+	// realpath failed -- fall through to the raw path.
+#endif
+
+	return raw;
+}
+
+#if defined(__WXMAC__)
+// C shim defined in ProtocolHandlerManager_mac.mm -- NSLog with the
+// amuleurl prefix so all diagnostics land under one Console.app filter.
+extern "C" void amule_url_log(const char *msg);
+#define AMULE_URL_LOG(fmtwx, ...) \
+	do { \
+		wxString _s = wxString::Format((fmtwx), ##__VA_ARGS__); \
+		amule_url_log((const char *)_s.mb_str(wxConvUTF8)); \
+	} while (0)
+#else
+#define AMULE_URL_LOG(fmtwx, ...) ((void)0)
+#endif
+
+void ProtocolHandler_QueueLinks(const wxArrayString &links)
+{
+	// Called from the mac Apple Event handlers. Cannot use AddLogLineNS: on an amulegui cold
+	// launch this may run before amuledlg is up, and the GUI log path would deref null.
+	if (links.IsEmpty()) {
+		return;
+	}
+
+	const wxString &cfgDir = thePrefs::GetConfigDir();
+	if (cfgDir.IsEmpty()) {
+		// Would resolve to a path relative to the launch working directory, which for a
+		// .app bundle is "/". Writing the links somewhere the app will never look is worse
+		// than dropping them with a log line.
+		AMULE_URL_LOG(
+			wxT("queue: config dir not set yet, dropping %d link(s)"), (int)links.GetCount());
+		return;
+	}
+	AMULE_URL_LOG(wxT("queue: %d link(s), first '%s'"), (int)links.GetCount(), links0);
+
+	wxTextFile ed2kFile(cfgDir + wxT("ED2KLinks"));
+	if (!ed2kFile.Exists()) {
+		ed2kFile.Create();
+	}
+	if (ed2kFile.Open()) {
+		for (size_t i = 0; i < links.GetCount(); ++i) {
+			ed2kFile.AddLine(linksi);
+		}
+		ed2kFile.AddLine(wxT("RAISE_DIALOG"));
+		ed2kFile.Write();
+		ed2kFile.Close();
+		AMULE_URL_LOG(wxT("wrote ED2KLinks OK"));
+	} else {
+		AMULE_URL_LOG(wxT("failed to open ED2KLinks for write"));
+	}
+	// Do NOT call AddLinksFromFile here -- these handlers can fire before theApp->downloadqueue
+	// is wired (amulegui only builds it once the EC connection is up). The ~1 s polling loop in
+	// CDownloadQueue::Process and CamuleRemoteGuiApp::UpdateStats drains the file on the next
+	// tick.
+}
+
+void ProtocolHandler_QueueSchemeLink(const wxString &url)
+{
+	if (url.empty()) {
+		return;
+	}
+	// Browsers percent-encode ed2k:// pipes; wxURI::Unescape restores the literals the eD2k
+	// parser expects. Done here rather than in QueueLinks because links read out of a
+	// collection file are not percent-encoded, and decoding them would corrupt any filename
+	// that legitimately contains a '%'.
+	wxString decoded = wxURI::Unescape(url);
+	AMULE_URL_LOG(wxT("queue scheme link: '%s' -> '%s'"), url, decoded);
+
+	wxArrayString links;
+	links.Add(decoded);
+	ProtocolHandler_QueueLinks(links);
+}
+
+bool ProtocolHandlerManager::IsEnabled(HandlerTarget scheme)
+{
+	wxString raw = BackendReadHandler(scheme);
+	if (raw.empty()) {
+		return false;
+	}
+	return BackendIsUs(raw);
+}
+
+bool ProtocolHandlerManager::Enable(HandlerTarget scheme)
+{
+	wxString exe = GetCanonicalExecutablePath();
+	if (exe.empty()) {
+		wxLogDebug(wxT("ProtocolHandlerManager::Enable: no executable path resolved, refusing to "
+			       "write a broken handler entry"));
+		return false;
+	}
+	return BackendWrite(scheme, exe);
+}
+
+bool ProtocolHandlerManager::Disable(HandlerTarget scheme)
+{
+	return BackendRemove(scheme);
+}
+
+wxString ProtocolHandlerManager::GetCurrentHandler(HandlerTarget scheme)
+{
+	wxString raw = BackendReadHandler(scheme);
+	if (raw.empty() || BackendIsUs(raw)) {
+		return wxEmptyString;
+	}
+	return raw;
+}
+
+void ProtocolHandlerManager::SelfHealOnStartup()
+{
+	wxString canonical = GetCanonicalExecutablePath();
+	if (canonical.empty()) {
+		return;
+	}
+
+	const HandlerTarget schemes = { HandlerTarget::Ed2kScheme, HandlerTarget::MagnetScheme };
+	for (HandlerTarget scheme : schemes) {
+		wxString raw = BackendReadHandler(scheme);
+		if (raw.empty()) {
+			// No handler set: disabling is a deliberate user choice.
+			continue;
+		}
+		if (!BackendIsUs(raw)) {
+			// A third-party app owns this scheme; leave it alone.
+			continue;
+		}
+		if (BackendIdentityMatches(raw, canonical)) {
+			// We own it and the registered path already matches.
+			continue;
+		}
+		// We own it but the registered path drifted (moved AppImage / .app /
+		// install dir), so rewrite.
+		wxLogDebug(wxT("ProtocolHandlerManager::SelfHealOnStartup: rewriting %s handler from '%s' to "
+			       "'%s'"),
+			SchemeNameUtf8(scheme),
+			raw.c_str(),
+			canonical.c_str());
+		BackendWrite(scheme, canonical);
+	}
+}
+
+// Platform backends
+
+namespace
+{
+
+#if defined(__WXMSW__)
+
+// Windows: per-user URL Protocol under HKCU\Software\Classes\<scheme>:
+//
+//   HKCU\Software\Classes\ed2k\                     (default) = "URL:eD2k Protocol"
+//                              \                   URL Protocol   = ""
+//                              \DefaultIcon\        (default) = "<amule.exe>,0"
+//                              \shell\open\command\ (default) = "\"<amule.exe>\" \"%1\""
+//
+// A file type is laid out differently: the extension key names a ProgID, and the ProgID carries
+// the icon and command:
+//
+//   HKCU\Software\Classes\.emulecollection\  (default) = "aMule.emulecollection"
+//                        \...\OpenWithProgids\ aMule.emulecollection = ""
+//   HKCU\Software\Classes\aMule.emulecollection\
+//                              \                   (default) = "eMule Collection"
+//                              \DefaultIcon\        (default) = "<amule.exe>,0"
+//                              \shell\open\command\ (default) = "\"<amule.exe>\" \"%1\""
+//
+// HKCU rather than HKLM, so toggling never needs elevation.
+
+// The ProgID doubles as the registry key name for the file type, which is
+// what lets SubKey() and the read path stay common with the schemes.
+static const wchar_t *const COLLECTION_PROGID = L"aMule.emulecollection";
+static const wchar_t *const COLLECTION_EXT_KEY = L"Software\\Classes\\.emulecollection";
+
+static wxString SubKey(HandlerTarget target)
+{
+	return wxString::Format(wxT("Software\\Classes\\%s"), SchemeName(target));
+}
+
+static bool WriteStringValue(
+	HKEY root, const wchar_t *subKey, const wchar_t *valueName, const wxString &value)
+{
+	HKEY hKey;
+	if (RegCreateKeyExW(root, subKey, 0, nullptr, 0, KEY_SET_VALUE, nullptr, &hKey, nullptr) !=
+		ERROR_SUCCESS) {
+		return false;
+	}
+	const wchar_t *wstr = value.wc_str();
+	DWORD cb = static_cast<DWORD>((wcslen(wstr) + 1) * sizeof(wchar_t));
+	LSTATUS rc = RegSetValueExW(hKey, valueName, 0, REG_SZ, reinterpret_cast<const BYTE *>(wstr), cb);
+	RegCloseKey(hKey);
+	return rc == ERROR_SUCCESS;
+}
+
+static wxString ReadStringValue(HKEY root, const wchar_t *subKey, const wchar_t *valueName)
+{
+	HKEY hKey;
+	if (RegOpenKeyExW(root, subKey, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) {
+		return wxEmptyString;
+	}
+
+	DWORD type = 0;
+	DWORD cb = 0;
+	LSTATUS rc = RegQueryValueExW(hKey, valueName, nullptr, &type, nullptr, &cb);
+	if (rc != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ) || cb == 0) {
+		RegCloseKey(hKey);
+		return wxEmptyString;
+	}
+
+	size_t wlen = (cb + sizeof(wchar_t) - 1) / sizeof(wchar_t);
+	std::vector<wchar_t> buf(wlen + 1, L'\0');
+	rc = RegQueryValueExW(hKey, valueName, nullptr, &type, reinterpret_cast<LPBYTE>(buf.data()), &cb);
+	RegCloseKey(hKey);
+	if (rc != ERROR_SUCCESS) {
+		return wxEmptyString;
+	}
+	return wxString(buf.data());
+}
+
+// Extract the executable path from a Windows "shell\open\command" value: `"C:\...\amule.exe" "%1"`
+// -> `C:\...\amule.exe`. Also handles the unquoted form.
+static wxString ExtractExeFromCommand(const wxString &command)
+{
+	if (command.empty()) {
+		return wxEmptyString;
+	}
+	if (command0 == wxT('"')) {
+		size_t closing = command.find(wxT('"'), 1);
+		if (closing != wxString::npos) {
+			return command.SubString(1, closing - 1);
+		}
+	}
+	size_t sp = command.find_first_of(wxT(" \t"));
+	if (sp != wxString::npos) {
+		return command.SubString(0, sp - 1);
+	}
+	return command;
+}
+
+wxString BackendReadHandler(HandlerTarget scheme)
+{
+	wxString cmd = ReadStringValue(HKEY_CURRENT_USER,
+		(SubKey(scheme) + wxT("\\shell\\open\\command")).wc_str(),
+		nullptr /* default value */);
+	return ExtractExeFromCommand(cmd);
+}
+
+// Writes the DefaultIcon + shell\open\command pair that a scheme key and a
+// ProgID key carry identically. `base` is Software\Classes\<scheme|progid>.
+static bool WriteIconAndCommand(const wxString &base, const wxString &canonicalExe)
+{
+	// DefaultIcon: what Explorer / Edge show next to the "Open with aMule?"
+	// prompt. "<exe>,0" = first icon resource in the executable.
+	wxString iconRef = wxString::Format(wxT("\"%s\",0"), canonicalExe);
+	if (!WriteStringValue(HKEY_CURRENT_USER, (base + wxT("\\DefaultIcon")).wc_str(), nullptr, iconRef)) {
+		return false;
+	}
+
+	// Quote both the executable and %1 so paths with spaces and URIs with query
+	// strings survive Windows' command tokeniser intact.
+	wxString command = wxString::Format(wxT("\"%s\" \"%%1\""), canonicalExe);
+	return WriteStringValue(
+		HKEY_CURRENT_USER, (base + wxT("\\shell\\open\\command")).wc_str(), nullptr, command);
+}
+
+bool BackendWrite(HandlerTarget target, const wxString &canonicalExe)
+{
+	wxString base = SubKey(target);
+
+	if (IsUriScheme(target)) {
+		// URL Protocol scheme entry -- the sentinel value that tells the
+		// Windows shell "this is a URL protocol, not a filetype".
+		wxString schemeDescription = wxString::Format(wxT("URL:%s Protocol"),
+			target == HandlerTarget::Ed2kScheme ? wxT("eD2k") : wxT("Magnet"));
+		if (!WriteStringValue(HKEY_CURRENT_USER, base.wc_str(), nullptr, schemeDescription)) {
+			return false;
+		}
+		if (!WriteStringValue(HKEY_CURRENT_USER, base.wc_str(), L"URL Protocol", wxEmptyString)) {
+			return false;
+		}
+		return WriteIconAndCommand(base, canonicalExe);
+	}
+
+	// File type: the ProgID's default value is the name Explorer shows
+	// in the "Open with" list and as the file's type column.
+	if (!WriteStringValue(HKEY_CURRENT_USER, base.wc_str(), nullptr, wxT("eMule Collection"))) {
+		return false;
+	}
+	if (!WriteIconAndCommand(base, canonicalExe)) {
+		return false;
+	}
+
+	// Advertise on the extension. OpenWithProgids only adds us to the "Open with" list; the
+	// extension's default is what binds, and we take it only when nothing else has claimed it.
+	// Neither makes aMule the user's *chosen* default: from Windows 8 on that lives in a hash-
+	// protected UserChoice key no application may write.
+	wxString extProgIds = wxString(COLLECTION_EXT_KEY) + wxT("\\OpenWithProgids");
+	if (!WriteStringValue(HKEY_CURRENT_USER, extProgIds.wc_str(), COLLECTION_PROGID, wxEmptyString)) {
+		return false;
+	}
+	wxString currentDefault = ReadStringValue(HKEY_CURRENT_USER, COLLECTION_EXT_KEY, nullptr);
+	if (currentDefault.empty()) {
+		WriteStringValue(HKEY_CURRENT_USER, COLLECTION_EXT_KEY, nullptr, wxString(COLLECTION_PROGID));
+	}
+
+	// Without this Explorer keeps serving the old association until the
+	// next logon.
+	SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr);
+	return true;
+}
+
+// Recursively delete a registry key and everything under it: the registry APIs
+// offer no one-call recursive delete on every Windows version we support.
+static LSTATUS DeleteKeyRecursive(HKEY root, const wchar_t *subKey)
+{
+	HKEY hKey;
+	LSTATUS rc = RegOpenKeyExW(root, subKey, 0, KEY_READ | KEY_WRITE, &hKey);
+	if (rc == ERROR_FILE_NOT_FOUND) {
+		return ERROR_SUCCESS;
+	}
+	if (rc != ERROR_SUCCESS) {
+		return rc;
+	}
+
+	// Enumerate and delete subkeys first. Deletion invalidates an enumeration, so
+	// re-enumerate from index 0 each pass until no subkeys remain.
+	for (;;) {
+		wchar_t name256;
+		DWORD cch = 256;
+		rc = RegEnumKeyExW(hKey, 0, name, &cch, nullptr, nullptr, nullptr, nullptr);
+		if (rc == ERROR_NO_MORE_ITEMS) {
+			break;
+		}
+		if (rc != ERROR_SUCCESS) {
+			RegCloseKey(hKey);
+			return rc;
+		}
+		wxString childPath = wxString(subKey) + wxT("\\") + wxString(name);
+		LSTATUS childRc = DeleteKeyRecursive(root, childPath.wc_str());
+		if (childRc != ERROR_SUCCESS) {
+			RegCloseKey(hKey);
+			return childRc;
+		}
+	}
+	RegCloseKey(hKey);
+
+	return RegDeleteKeyW(root, subKey);
+}
+
+bool BackendRemove(HandlerTarget target)
+{
+	// Only remove if we are the current handler, so a user's manual override or a
+	// third-party handler written under the same key later survives.
+	wxString current = BackendReadHandler(target);
+	if (current.empty()) {
+		return true; // already absent
+	}
+	if (!BackendIsUs(current)) {
+		return true; // not ours to remove
+	}
+
+	LSTATUS rc = DeleteKeyRecursive(HKEY_CURRENT_USER, SubKey(target).wc_str());
+	if (!IsUriScheme(target)) {
+		// Also undo the extension advertisement, mirroring BackendWrite. The
+		// default is cleared only while it still names our ProgID.
+		wxString extProgIds = wxString(COLLECTION_EXT_KEY) + wxT("\\OpenWithProgids");
+		HKEY hKey;
+		if (RegOpenKeyExW(HKEY_CURRENT_USER, extProgIds.wc_str(), 0, KEY_SET_VALUE, &hKey) ==
+			ERROR_SUCCESS) {
+			RegDeleteValueW(hKey, COLLECTION_PROGID);
+			RegCloseKey(hKey);
+		}
+		if (ReadStringValue(HKEY_CURRENT_USER, COLLECTION_EXT_KEY, nullptr) ==
+			wxString(COLLECTION_PROGID)) {
+			DeleteKeyRecursive(HKEY_CURRENT_USER, COLLECTION_EXT_KEY);
+		}
+		SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr);
+	}
+	return rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND;
+}
+
+bool BackendIdentityMatches(const wxString &raw, const wxString &canonicalExe)
+{
+	// Registry values can round-trip with different case on paths, so compare
+	// case-insensitively to match Windows filesystem semantics.
+	return raw.IsSameAs(canonicalExe, false);
+}
+
+bool BackendIsUs(const wxString &raw)
+{
+	if (raw.empty()) {
+		return false;
+	}
+	// "us" == the currently-running binary, keyed by basename so path drift still counts as our
+	// own registration (SelfHealOnStartup rewrites the full path). Per-binary comparison is
+	// what makes the amule/amulegui differentiation work: in a remote-GUI setup amulegui's
+	// checkbox correctly reads "unchecked" while amule.exe is the current handler, and vice
+	// versa.
+	wxString ownExe = ProtocolHandlerManager::GetCanonicalExecutablePath();
+	if (ownExe.empty()) {
+		return false;
+	}
+	wxFileName rawFn(raw);
+	wxFileName ownFn(ownExe);
+	return rawFn.GetFullName().IsSameAs(ownFn.GetFullName(), false);
+}
+
+#elif defined(__WXMAC__) || defined(__WXOSX__)
+
+// The macOS backend is Objective-C++ (it needs LSCopyDefaultHandlerForURLScheme /
+// LSSetDefaultHandlerForURLScheme). Implementation lives in ProtocolHandlerManager_mac.mm; the
+// entry points declared above this anonymous namespace have external linkage so the linker can
+// resolve them.
+
+wxString BackendReadHandler(HandlerTarget scheme)
+{
+	return ::MacReadHandler(scheme);
+}
+
+bool BackendWrite(HandlerTarget scheme, const wxString &canonicalExe)
+{
+	return ::MacWrite(scheme, canonicalExe);
+}
+
+bool BackendRemove(HandlerTarget scheme)
+{
+	// LaunchServices has no "remove default" call -- the model is that some app is always the
+	// default. On Disable the best we can do is check that we are currently the default and no-
+	// op; the user has to pick another app from the OS's "Open With" prompt to actually stop us
+	// receiving clicks. Silently reassigning to a third-party app would be worse than leaving
+	// us bound.
+	//
+	// Returns true so the prefs toggle reads as "disable succeeded": the checkbox flipping off
+	// is the visible signal that we have stepped back. On Sequoia+ this is unavoidable anyway
+	// -- Apple blocked programmatic clearing of scheme handlers to prevent malicious
+	// deregistration.
+	return true;
+}
+
+bool BackendIdentityMatches(const wxString &raw, const wxString & /*canonicalExe*/)
+{
+	// On macOS the identifier is a bundle id, not a path, so path drift does not apply:
+	// LaunchServices tracks the bundle by id and finds its current location. Identity match is
+	// bundle-id equality.
+	return raw.IsSameAs(::MacOwnBundleId(), false);
+}
+
+bool BackendIsUs(const wxString &raw)
+{
+	return BackendIdentityMatches(raw, wxEmptyString);
+}
+
+#else // assumed Linux / *BSD with XDG-compliant desktop env
+
+// Linux: per-user default scheme handler in $XDG_CONFIG_HOME/mimeapps.list (falling back to
+// ~/.config/mimeapps.list), whose Default Applications section maps x-scheme-handler/<scheme> to
+// a .desktop file id. The .desktop file must also declare MimeType= including that pseudo-type
+// before file managers and browsers consider it a valid handler at all; that is shipped statically
+// under packaging/. https://specifications.freedesktop.org/mime-apps-spec/latest/
+//
+// We do NOT depend on xdg-mime being installed -- several minimal distros and containers ship
+// without it, so the ini is written directly.
+
+// Which .desktop id represents the currently-running binary: amule maps to org.amule.aMule.desktop,
+// amulegui to org.amule.aMule.gui.desktop. The daemon is not user-facing but registers against the
+// monolithic id too, so `amuled --configure-protocols on` still points clicks at an entry the DE
+// can open. Basename lookup keeps this working across the install/AppImage variants.
+static wxString OwnDesktopId()
+{
+	wxString ownExe = ProtocolHandlerManager::GetCanonicalExecutablePath();
+	wxFileName fn(ownExe);
+	wxString base = fn.GetFullName();
+	if (base.IsSameAs(wxT("amulegui"), false)) {
+		return wxT("org.amule.aMule.gui.desktop");
+	}
+	return wxT("org.amule.aMule.desktop");
+}
+
+static wxString MimeAppsPath()
+{
+	wxString xdg;
+	if (wxGetEnv(wxT("XDG_CONFIG_HOME"), &xdg) && !xdg.empty()) {
+		return xdg + wxT("/mimeapps.list");
+	}
+	return wxGetUserHome() + wxT("/.config/mimeapps.list");
+}
+
+// The mimeapps.list key. Schemes get the x-scheme-handler/ pseudo-type; the collection is a real
+// MIME type, for which SchemeNameUtf8 already returns the whole key.
+static wxString SchemeKey(HandlerTarget target)
+{
+	if (!IsUriScheme(target)) {
+		return wxString::FromUTF8(SchemeNameUtf8(target));
+	}
+	return wxString::Format(wxT("x-scheme-handler/%s"), SchemeNameUtf8(target));
+}
+
+// Parse an ini-style file into (section, key, value) triples. Original line order is preserved via
+// a vector-of-lines so a round-trip write does not reorder unrelated entries; comments and blank
+// lines survive as-is.
+struct IniLine
+{
+	wxString section; // empty for pre-first-section lines (rare)
+	wxString raw;     // original line text (for comments / blanks)
+	bool isEntry = false;
+	wxString key;
+	wxString value;
+};
+
+static std::vector<IniLine> ReadIniLines(const wxString &path)
+{
+	std::vector<IniLine> lines;
+	// A missing file is the normal "not configured yet" case. Bail before opening
+	// so wxFile does not log a spurious "can't open file (error 2)".
+	if (!wxFile::Exists(path)) {
+		return lines;
+	}
+	wxFile f(path, wxFile::read);
+	if (!f.IsOpened()) {
+		return lines;
+	}
+	wxString content;
+	f.ReadAll(&content, wxConvUTF8);
+	f.Close();
+
+	wxString section;
+	wxStringTokenizer tok(content, wxT("\n"), wxTOKEN_RET_EMPTY_ALL);
+	while (tok.HasMoreTokens()) {
+		wxString line = tok.GetNextToken();
+		wxString trimmed = line;
+		trimmed.Trim(false).Trim(true);
+		IniLine il;
+		il.section = section;
+		il.raw = line;
+		if (trimmed.StartsWith(wxT("")) && trimmed.EndsWith(wxT(""))) {
+			section = trimmed.Mid(1, trimmed.length() - 2);
+			il.section = section;
+		} else if (!trimmed.empty() && !trimmed.StartsWith(wxT("#"))) {
+			int eq = trimmed.Find(wxT('='));
+			if (eq != wxNOT_FOUND) {
+				il.isEntry = true;
+				il.key = trimmed.Mid(0, eq);
+				il.value = trimmed.Mid(eq + 1);
+			}
+		}
+		lines.push_back(il);
+	}
+	return lines;
+}
+
+static bool WriteIniLines(const wxString &path, const std::vector<IniLine> &lines)
+{
+	wxFileName fn(path);
+	if (!fn.DirExists()) {
+		if (!wxFileName::Mkdir(fn.GetPath(), 0755, wxPATH_MKDIR_FULL)) {
+			return false;
+		}
+	}
+
+	wxString out;
+	for (size_t i = 0; i < lines.size(); ++i) {
+		const IniLine &il = linesi;
+		if (il.isEntry) {
+			out << il.key << wxT("=") << il.value;
+		} else {
+			out << il.raw;
+		}
+		// Terminate every line, including the last: mimeapps.list is shared with xdg-mime
+		// and the desktop environment, and an unterminated final line silently fuses with
+		// whatever the next writer appends.
+		out << wxT("\n");
+	}
+
+	wxFile f;
+	if (!f.Create(path, true /* overwrite */, 0644)) {
+		return false;
+	}
+	bool ok = f.Write(out, wxConvUTF8);
+	f.Close();
+	return ok;
+}
+
+wxString BackendReadHandler(HandlerTarget scheme)
+{
+	std::vector<IniLine> lines = ReadIniLines(MimeAppsPath());
+	wxString needle = SchemeKey(scheme);
+	for (const IniLine &il : lines) {
+		if (il.section != wxT("Default Applications")) {
+			continue;
+		}
+		if (!il.isEntry) {
+			continue;
+		}
+		if (il.key == needle) {
+			// mimeapps.list allows semicolon-separated fallback chains; the
+			// first entry is the effective default.
+			wxString first = il.value.BeforeFirst(wxT(';')).Trim(false).Trim(true);
+			return first;
+		}
+	}
+	return wxEmptyString;
+}
+
+bool BackendWrite(HandlerTarget scheme, const wxString &canonicalExe)
+{
+	// canonicalExe is unused on Linux: the mimeapps.list entry references a .desktop file id,
+	// not an executable path, and path drift is handled by the DE resolving the .desktop's
+	// Exec= line at click time.
+	(void)canonicalExe;
+
+	wxString path = MimeAppsPath();
+	std::vector<IniLine> lines = ReadIniLines(path);
+	wxString needle = SchemeKey(scheme);
+
+	// Update in place if the entry exists in Default Applications;
+	// otherwise append.
+	bool sectionSeen = false;
+	int lastLineOfSection = -1;
+	for (size_t i = 0; i < lines.size(); ++i) {
+		if (linesi.section == wxT("Default Applications")) {
+			sectionSeen = true;
+			lastLineOfSection = static_cast<int>(i);
+			if (linesi.isEntry && linesi.key == needle) {
+				linesi.value = OwnDesktopId();
+				return WriteIniLines(path, lines);
+			}
+		}
+	}
+
+	// Not found: insert as the section's last entry, or append the section header
+	// and entry to the end.
+	IniLine entry;
+	entry.section = wxT("Default Applications");
+	entry.isEntry = true;
+	entry.key = needle;
+	entry.value = OwnDesktopId();
+
+	if (sectionSeen) {
+		lines.insert(lines.begin() + lastLineOfSection + 1, entry);
+	} else {
+		if (!lines.empty()) {
+			IniLine blank;
+			lines.push_back(blank);
+		}
+		IniLine header;
+		header.section = wxT("Default Applications");
+		header.raw = wxT("Default Applications");
+		lines.push_back(header);
+		lines.push_back(entry);
+	}
+	return WriteIniLines(path, lines);
+}
+
+bool BackendRemove(HandlerTarget scheme)
+{
+	wxString path = MimeAppsPath();
+	if (!wxFileName::FileExists(path)) {
+		return true;
+	}
+
+	std::vector<IniLine> lines = ReadIniLines(path);
+	wxString needle = SchemeKey(scheme);
+
+	bool changed = false;
+	for (auto it = lines.begin(); it != lines.end();) {
+		if (it->section == wxT("Default Applications") && it->isEntry && it->key == needle &&
+			it->value == OwnDesktopId()) {
+			it = lines.erase(it);
+			changed = true;
+		} else {
+			++it;
+		}
+	}
+	if (!changed) {
+		return true;
+	}
+	return WriteIniLines(path, lines);
+}
+
+bool BackendIdentityMatches(const wxString &raw, const wxString & /*canonicalExe*/)
+{
+	// On Linux the identifier is a .desktop file id, not a path; path drift is
+	// handled by the DE's XDG data-dirs walk, not by us rewriting mimeapps.list.
+	return raw == OwnDesktopId();
+}
+
+bool BackendIsUs(const wxString &raw)
+{
+	return raw == OwnDesktopId();
+}
+
+#endif
+
+} // namespace
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/ProtocolHandlerManager.h Added

@@ -0,0 +1,116 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 PROTOCOLHANDLERMANAGER_H
+#define PROTOCOLHANDLERMANAGER_H
+
+#include <wx/arrstr.h>
+#include <wx/string.h>
+
+// Cross-platform "aMule is the default handler for X" toggle, where X is an ed2k:// / magnet: link
+// or an .emulecollection file. Mirrors AutostartManager's shape: the OS is the source of truth,
+// per-user, no elevation. The per-OS store is:
+//
+//   Windows : HKCU\Software\Classes\<scheme> (URL-protocol keys, DefaultIcon + shell\open\command
+//             pointing at amule.exe). The collection file type instead uses the ProgID layout every
+//             Windows file association needs: the extension key names a ProgID, and the ProgID
+//             carries the icon and the open command.
+//   Linux   : $XDG_CONFIG_HOME/mimeapps.list Default Applications,
+//             x-scheme-handler/<scheme>=org.amule.aMule.desktop, or
+//             application/x-emule-collection=... for the file type. The .desktop still declares
+//             MimeType= as the advertise layer.
+//   macOS   : LaunchServices -- LSSetDefaultHandlerForURLScheme for the schemes,
+//             LSSetDefaultRoleHandlerForContentType for the collection UTI. The .app's Info.plist
+//             declares CFBundleURLTypes / CFBundleDocumentTypes so LaunchServices considers us
+//             eligible.
+//
+// What "enable" can promise for the file type: from Windows 8 on, the user's chosen default lives
+// in a hash-protected UserChoice key no application may write, so enabling adds aMule to the "Open
+// with" list and takes the default only when nothing else has claimed the extension. macOS and
+// Linux have no such restriction.
+//
+// magnet handling keeps its ed2k-compatibility requirement: magnet URIs must carry
+// xt=urn:ed2k:/urn:ed2khash: plus xl=, enforced by CMagnetED2KConverter. This class only owns the
+// OS registration; parsing lives in CamuleAppCommon::CheckPassedLink() and in CMuleCollection.
+
+// What aMule can register itself as the handler for. Named for the registration, not the payload:
+// the two schemes and the collection file type share one policy layer and differ only in the per-OS
+// key they write.
+enum class HandlerTarget
+{
+	Ed2kScheme,
+	MagnetScheme,
+	CollectionFile,
+};
+
+class ProtocolHandlerManager
+{
+public:
+	// Returns true if the OS's per-user default handler for `scheme` is aMule. Does not
+	// validate the registered path against the running binary -- use SelfHealOnStartup() for
+	// that.
+	static bool IsEnabled(HandlerTarget scheme);
+
+	// Writes or overwrites the OS handler entry for `scheme` to point at the running binary's
+	// canonical path. Idempotent. Does NOT prompt before overwriting a pre-existing third-party
+	// handler -- the caller owns the "already registered to another app, overwrite?" UX, via
+	// GetCurrentHandler().
+	static bool Enable(HandlerTarget scheme);
+
+	// Removes the OS handler entry for `scheme` if aMule is the current handler. Idempotent --
+	// a no-op if we are not -- and returns true on success. Never wipes a third-party handler.
+	static bool Disable(HandlerTarget scheme);
+
+	// A short human-readable name of the app currently registered as the default handler for
+	// `scheme` ("Transmission" on macOS, an executable path on Windows/Linux), or empty when no
+	// handler is set or aMule is it. Used to build the "another app is currently the default,
+	// overwrite?" confirm dialog, never to gate Enable() -- see its contract note.
+	static wxString GetCurrentHandler(HandlerTarget scheme);
+
+	// Called once from CamuleApp::OnInit. For each scheme where aMule is the current default
+	// handler AND the registered path differs from the canonical path of the running binary,
+	// rewrites the entry so the next click launches the right binary -- the "user moved the
+	// AppImage / .app / install dir" case. Does nothing where we are not the current handler:
+	// disabling is a deliberate user choice.
+	static void SelfHealOnStartup();
+
+	// Resolves argv0 to its canonical absolute path (realpath() on POSIX,
+	// GetModuleFileNameW() on Windows). Duplicates the AutostartManager helper rather than
+	// depending on it, so this class stays self-contained.
+	static wxString GetCanonicalExecutablePath();
+};
+
+// Queues already-validated eD2k links into the ED2KLinks file, so CDownloadQueue::Process, or the
+// equivalent polling loop in CamuleRemoteGuiApp, picks them up on its next 1-second tick. Build-
+// agnostic: monolithic amule, amulegui and amuled each have a polling loop that calls
+// AddLinksFromFile on the same file. Safe to call before the download queue is wired, the cold-
+// launch case: this only writes. The whole batch costs one open/write, and raises the window once.
+void ProtocolHandler_QueueLinks(const wxArrayString &links);
+
+// Queues a scheme-clicked URL (ed2k:// or magnet:), percent-decoding it first for URLs delivered by
+// browsers, then handing off to ProtocolHandler_QueueLinks.
+void ProtocolHandler_QueueSchemeLink(const wxString &url);
+
+#endif // PROTOCOLHANDLERMANAGER_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/ProtocolHandlerManager_mac.mm Added

@@ -0,0 +1,200 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+//
+// macOS backend for ProtocolHandlerManager: LaunchServices scheme
+// registration (LSSetDefaultHandlerForURLScheme) plus a kAEGetURL Apple
+// Event handler installed at dylib-load time to catch cold-launch
+// scheme clicks.
+
+#include "ProtocolHandlerManager.h"
+
+// Guard the whole body so the Linux clang-tidy runner skips it rather
+// than failing on ApplicationServices/ApplicationServices.h.
+#if defined(__APPLE__)
+
+#import <ApplicationServices/ApplicationServices.h>
+#import <Foundation/Foundation.h>
+
+#import <wx/app.h>
+
+namespace
+{
+// The scheme for a URL protocol, or the imported UTI for the collection
+// file type (declared by UTImportedTypeDeclarations in the bundle plist).
+NSString *NSStringFromScheme(HandlerTarget target)
+{
+	switch (target) {
+	case HandlerTarget::Ed2kScheme:
+		return @"ed2k";
+	case HandlerTarget::MagnetScheme:
+		return @"magnet";
+	case HandlerTarget::CollectionFile:
+		return @"org.amule.emulecollection";
+	}
+	return @"";
+}
+
+bool IsUriScheme(HandlerTarget target)
+{
+	return target != HandlerTarget::CollectionFile;
+}
+
+wxString WxStringFromNSString(NSString *ns)
+{
+	if (ns == nil) {
+		return wxEmptyString;
+	}
+	return wxString::FromUTF8(ns UTF8String);
+}
+} // namespace
+
+wxString MacOwnBundleId()
+{
+	// nil outside a .app bundle (dev-loop harnesses); the CMake
+	// target always builds into aMule.app, so only unit tests hit it.
+	NSString *bid = NSBundle mainBundle bundleIdentifier;
+	return WxStringFromNSString(bid);
+}
+
+wxString MacReadHandler(HandlerTarget target)
+{
+	// Both LSCopy... calls return nil when no handler is set. Deprecated in 10.15 but still
+	// working; the modern NSWorkspace lookups do not cover the write path (LSSetDefault...), so
+	// we stick with the LS pairs for symmetry.
+	CFStringRef nameCf = (CFStringRef)NSStringFromScheme(target);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+	CFStringRef handler = IsUriScheme(target)
+				  ? LSCopyDefaultHandlerForURLScheme(nameCf)
+				  : LSCopyDefaultRoleHandlerForContentType(nameCf, kLSRolesAll);
+#pragma clang diagnostic pop
+	if (handler == nullptr) {
+		return wxEmptyString;
+	}
+	wxString result = WxStringFromNSString((__bridge NSString *)handler);
+	CFRelease(handler);
+	return result;
+}
+
+bool MacWrite(HandlerTarget target, const wxString &canonicalExe)
+{
+	// LaunchServices tracks bundle id, not path -- the canonicalExe
+	// arg is only meaningful on the Windows/Linux backends.
+	(void)canonicalExe;
+
+	wxString ownBid = MacOwnBundleId();
+	if (ownBid.empty()) {
+		return false;
+	}
+	CFStringRef bidCf =
+	    CFStringCreateWithCString(nullptr, ownBid.mb_str(wxConvUTF8), kCFStringEncodingUTF8);
+	if (bidCf == nullptr) {
+		return false;
+	}
+	CFStringRef nameCf = (CFStringRef)NSStringFromScheme(target);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+	OSStatus rc = IsUriScheme(target)
+			  ? LSSetDefaultHandlerForURLScheme(nameCf, bidCf)
+			  : LSSetDefaultRoleHandlerForContentType(nameCf, kLSRolesAll, bidCf);
+#pragma clang diagnostic pop
+	CFRelease(bidCf);
+	return rc == noErr;
+}
+
+bool MacRemove(HandlerTarget /*scheme*/)
+{
+	// LaunchServices has no "clear default handler" call. Disable
+	// on macOS is a UI-only signal; see ProtocolHandlerManager.cpp.
+	return true;
+}
+
+// Runtime URL delivery.
+//
+// Cold-launch scheme clicks are delivered by macOS as a kAEGetURL Apple Event dispatched between
+// applicationWillFinishLaunching and applicationDidFinishLaunching -- earlier than any wxApp OnInit
+// runs. We register the handler in a __attribute__((constructor)) so it is already live when the AE
+// dispatches.
+//
+// wxNSAppController registers for the same event class in applicationWillFinishLaunching, and
+// -setEventHandler: replaces per (class, id) rather than stacking, so exactly one of the two is
+// live. Observed behaviour is that this one wins and wxApp::MacOpenURL never fires; CamuleGuiApp
+// overrides it anyway so a load order that goes the other way still delivers the URL. Only one
+// handler ever runs, so a link cannot be queued twice.
+
+// C shim exposed to ProtocolHandlerManager.cpp so its diagnostics land
+// under the same amuleurl Console.app filter.
+extern "C" void amule_url_log(const char *msg)
+{
+	if (msg == nullptr) {
+		return;
+	}
+	NSLog(@"amuleurl %s", msg);
+}
+
+@interface AmuleURLAppleEventHandler : NSObject {
+}
+- (void)getUrl:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)reply;
+@end
+
+static AmuleURLAppleEventHandler *g_url_handler = nil;
+
+@implementation AmuleURLAppleEventHandler
+- (void)getUrl:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)reply
+{
+	(void)reply;
+	NSString *raw = event paramDescriptorForKeyword:keyDirectObject stringValue;
+	if (raw == nil) {
+		return;
+	}
+	NSLog(@"amuleurl kAEGetURL received: %@", raw);
+	// Marshal to the wx main loop. QueueSchemeLink is build-agnostic; it writes to ED2KLinks
+	// and lets each app's ~1 s polling loop (CDownloadQueue on amule/amuled, OnPollTimer on
+	// amulegui) drain it -- safe even when downloadqueue is not wired yet on cold launch.
+	wxString url = wxString::FromUTF8(raw UTF8String);
+	if (wxTheApp != nullptr) {
+		wxTheApp->CallAfter(url() { ProtocolHandler_QueueSchemeLink(url); });
+	}
+}
+@end
+
+// Runs at dylib-load time, before main(), before wxEntry, before Cocoa's
+// applicationWillFinishLaunching -- so the cold-launch kAEGetURL Apple Event finds our handler
+// already registered. NSAppleEventManager is available at library-load in Cocoa apps.
+__attribute__((constructor)) static void amule_install_url_handler_at_load(void)
+{
+	@autoreleasepool {
+		if (g_url_handler != nil) {
+			return;
+		}
+		g_url_handler = AmuleURLAppleEventHandler alloc init;
+		NSAppleEventManager sharedAppleEventManager setEventHandler:g_url_handler
+			andSelector:@selector(getUrl:withReplyEvent:)
+			forEventClass:kInternetEventClass
+			andEventID:kAEGetURL;
+		NSLog(@"amuleurl library-load: kAEGetURL handler installed");
+	}
+}
+
+#endif // __APPLE__

amule-3.0.1.tar.gz/src/Proxy.cpp -> amule-3.1.0.tar.gz/src/Proxy.cpp Changed

@@ -23,49 +23,43 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "Proxy.h"		/* for Interface		*/
+#include "Proxy.h" /* for Interface		*/
 
 #include <common/EventIDs.h>
 
-#include "ArchSpecific.h"	/* for ENDIAN_HTONS()		*/
-#include "Logger.h"		/* for AddDebugLogLineN		*/
-#include "OtherFunctions.h"	/* for EncodeBase64()		*/
-#include <common/StringFunctions.h>	/* for unicode2char */
+#include "ArchSpecific.h"           /* for ENDIAN_HTONS()		*/
+#include "Logger.h"                 /* for AddDebugLogLineN		*/
+#include "OtherFunctions.h"         /* for EncodeBase64()		*/
+#include <common/StringFunctions.h> /* for unicode2char */
 #include "GuiEvents.h"
 
-// Define it to 1 to debug proxy communication and state machine design. If
-// enabled messages sent to and received from proxies will be dumped to stdout.
-// Has effect only in debug-enabled builds.
+// Define as 1 to debug proxy communication and state machine design: messages sent to and received
+// from proxies are dumped to stdout. Debug-enabled builds only.
 #ifndef DEBUG_DUMP_PROXY_MSG
-#define DEBUG_DUMP_PROXY_MSG	0
+#define DEBUG_DUMP_PROXY_MSG 0
 #endif
 
-
-//------------------------------------------------------------------------------
 // CProxyData
-//------------------------------------------------------------------------------
 
 CProxyData::CProxyData()
 {
 	Clear();
 }
 
-CProxyData::CProxyData(
-	bool		proxyEnable,
-	CProxyType	proxyType,
-	const wxString	&proxyHostName,
-	unsigned short	proxyPort,
-	bool		enablePassword,
-	const wxString	&userName,
-	const wxString	&password)
-:
-m_proxyEnable(proxyEnable),
-m_proxyType(proxyType),
-m_proxyHostName(proxyHostName),
-m_proxyPort(proxyPort),
-m_enablePassword(enablePassword),
-m_userName(userName),
-m_password(password)
+CProxyData::CProxyData(bool proxyEnable,
+	CProxyType proxyType,
+	const wxString &proxyHostName,
+	unsigned short proxyPort,
+	bool enablePassword,
+	const wxString &userName,
+	const wxString &password)
+: m_proxyEnable(proxyEnable)
+, m_proxyType(proxyType)
+, m_proxyHostName(proxyHostName)
+, m_proxyPort(proxyPort)
+, m_enablePassword(enablePassword)
+, m_userName(userName)
+, m_password(password)
 {
 }
 
@@ -84,41 +78,35 @@
 
 #include <typeinfo> // Do_not_auto_remove (NetBSD, older gccs)
 
-//
 // In Asio mode the event handler is:
-//
 void CProxySocket::OnProxyEvent(int evt)
 {
 	m_proxyStateMachine->Schedule(evt);
 	m_proxyStateMachine->Clock();
 }
 
-//------------------------------------------------------------------------------
 // CProxyStateMachine
-//------------------------------------------------------------------------------
 
 CProxyStateMachine::CProxyStateMachine(
-		wxString name,
-		const unsigned int max_states,
-		const CProxyData &proxyData,
-		CProxyCommand proxyCommand)
-:
-CStateMachine(NewName(name, proxyCommand), max_states, PROXY_STATE_START),
-m_proxyData(proxyData),
-m_proxyCommand(proxyCommand),
-m_isLost(false),
-m_isConnected(false),
-m_canReceive(false),
-m_canSend(false),
-m_ok(true),
-m_lastRead(0),
+	wxString name, const unsigned int max_states, const CProxyData &proxyData, CProxyCommand proxyCommand)
+: CStateMachine(NewName(name, proxyCommand), max_states, PROXY_STATE_START)
+, m_proxyData(proxyData)
+, m_proxyCommand(proxyCommand)
+, m_isLost(false)
+, m_isConnected(false)
+, m_canReceive(false)
+, m_canSend(false)
+, m_ok(true)
+, m_lastRead(0)
+,
 // Will be initialized at Start()
-m_peerAddress(NULL),
-m_proxyClientSocket(NULL),
-m_proxyBoundAddress(NULL),
+m_peerAddress(NULL)
+, m_proxyClientSocket(NULL)
+, m_proxyBoundAddress(NULL)
+,
 // Temporary variables
-m_lastReply(0),
-m_packetLength(0)
+m_lastReply(0)
+, m_packetLength(0)
 {
 }
 
@@ -150,28 +138,19 @@
 {
 	m_proxyClientSocket = proxyClientSocket;
 	m_peerAddress = new amuleIPV4Address(peerAddress);
-	//try {
-	//	const wxIPV4address &peer = dynamic_cast<const wxIPV4address &>(peerAddress);
-	//	m_peerAddress = new amuleIPV4Address(peer);
-	//} catch (const std::bad_cast& WXUNUSED(e)) {
-	//	// Should process other types of wxIPAddress before quitting
-	//	AddDebugLogLineN(logProxy, "(1)bad_cast exception!");
-	//	wxFAIL;
-	//	return false;
-	//}
 
 	// To run the state machine, return and just let the events start to happen.
 	return true;
 }
 
-static const int MULE_SOCKET_DUMMY_VALUE = MULE_SOCKET_INPUT + MULE_SOCKET_OUTPUT + MULE_SOCKET_CONNECTION + MULE_SOCKET_LOST;
+static const int MULE_SOCKET_DUMMY_VALUE =
+	MULE_SOCKET_INPUT + MULE_SOCKET_OUTPUT + MULE_SOCKET_CONNECTION + MULE_SOCKET_LOST;
 
 t_sm_state CProxyStateMachine::HandleEvent(t_sm_event event)
 {
 	// Default is stay in current state
 	t_sm_state ret = GetState();
-	switch(event)
-	{
+	switch (event) {
 	case MULE_SOCKET_CONNECTION:
 		AddDebugLogLineN(logProxy, "Connection event");
 		m_isConnected = true;
@@ -202,11 +181,8 @@
 		break;
 	}
 
-	// Aborting conditions:
-	// - MULE_SOCKET_LOST event
-	// - More than 10 times on the same state
-	if (	m_isLost ||
-		GetClocksInCurrentState() > 10) {
+	// Aborting conditions: a MULE_SOCKET_LOST event, or more than 10 clocks in the same state.
+	if (m_isLost || GetClocksInCurrentState() > 10) {
 		ret = PROXY_STATE_END;
 	}
 
@@ -216,25 +192,23 @@
 void CProxyStateMachine::AddDummyEvent()
 {
 	CProxySocket *s = dynamic_cast<CProxySocket *>(m_proxyClientSocket);
-	if (s) {	// should always be
+	if (s) { // should always be
 		CoreNotify_ProxySocketEvent(s, MULE_SOCKET_DUMMY_VALUE);
 	}
 }
 
 void CProxyStateMachine::ReactivateSocket()
 {
-	/*    If proxy is being used, then the TCP socket handlers
-	 * (CServerSocketHandler and CClientTCPSocketHandler) will not
-	 * receive a wxSOCKET_CONNECTION event, because the connection has
-	 * already started with the proxy. So we must add a wxSOCKET_CONNECTION
-	 * event to make things go undetected. A wxSOCKET_OUTPUT event is also
-	 * necessary to start sending data to the server. */
+	/* With a proxy in use the TCP socket handlers (CServerSocketHandler and CClientTCPSocketHandler)
+	 * receive no wxSOCKET_CONNECTION event, the connection having already started with the proxy. So
+	 * add one to make things go undetected, plus a wxSOCKET_OUTPUT event to start sending data to
+	 * the server. */
 	CProxySocket *s = dynamic_cast<CProxySocket *>(m_proxyClientSocket);
 	// If that is not true, we are in serious trouble...
 	wxASSERT(s);
 	if (CDatagramSocketProxy *udp = s->GetUDPSocket()) {
 		// The original socket was a UDP socket
-		if(m_ok) {
+		if (m_ok) {
 			// From now on, the UDP socket can be used,
 			// remove the protection.
 			udp->SetUDPSocketOk();
@@ -243,7 +217,7 @@
 		// be used after proxy negotiation.
 	} else {
 		// The original socket was a TCP socket
-		if (s->GetProxyState()) {	// somehow this gets called twice ?
+		if (s->GetProxyState()) { // somehow this gets called twice ?
 			s->SetProxyState(false);
 			CoreNotify_LibSocketConnect(s, 0);
 			if (m_ok) {
@@ -266,7 +240,8 @@
 	} else if ((m_lastError = m_proxyClientSocket->LastError()) != 0) {
 		m_ok = false;
 	}
-	AddDebugLogLineN(logProxy, CFormat("ProxyWrite %d %d ok %d cansend %d") % nbytes % written % m_ok % m_canSend);
+	AddDebugLogLineN(
+		logProxy, CFormat("ProxyWrite %d %d ok %d cansend %d") % nbytes % written % m_ok % m_canSend);
 
 	return written;
 }
@@ -286,7 +261,8 @@
 	// We will get a new event right away if data is left, or when new data gets available.
 	// So block for now.
 	m_canReceive = false;
-	AddDebugLogLineN(logProxy, CFormat("ProxyRead %d ok %d canrec %d") % m_lastRead % m_ok % m_canReceive);
+	AddDebugLogLineN(
+		logProxy, CFormat("ProxyRead %d ok %d canrec %d") % m_lastRead % m_ok % m_canReceive);
 
 	return m_lastRead;
 }
@@ -301,51 +277,44 @@
 	return m_canSend;
 }
 
-//------------------------------------------------------------------------------
 // CSocks5StateMachine
-//------------------------------------------------------------------------------
 
 /**
- * The state machine constructor must initialize the array of pointer to member
- * functions. Don't waste you time trying to statically initialize this, pointer
- * to member functions require an object to operate on, so this array must be
- * initialized at run time.
+ * The constructor must initialise the array of pointers to member functions. Do not try to
+ * initialise it statically: pointers to member functions need an object to operate on, so this
+ * array has to be built at run time.
  */
-CSocks5StateMachine::CSocks5StateMachine(
-	const CProxyData &proxyData,
-	CProxyCommand proxyCommand)
-:
-CProxyStateMachine(
-	wxString("Socks5"), SOCKS5_MAX_STATES, proxyData, proxyCommand)
+CSocks5StateMachine::CSocks5StateMachine(const CProxyData &proxyData, CProxyCommand proxyCommand)
+: CProxyStateMachine(wxString("Socks5"), SOCKS5_MAX_STATES, proxyData, proxyCommand)
 {
-	m_process_state 0 = &CSocks5StateMachine::process_start;
-	m_state_name 0    = "process_start";
-	m_process_state 1 = &CSocks5StateMachine::process_end;
-	m_state_name 1    = "process_end";
-	m_process_state 2 = &CSocks5StateMachine::process_send_query_authentication_method;
-	m_state_name 2    = "process_send_query_authentication_method";
-	m_process_state 3 = &CSocks5StateMachine::process_receive_authentication_method;
-	m_state_name 3    = "process_receive_authentication_method";
-	m_process_state 4 = &CSocks5StateMachine::process_process_authentication_method;
-	m_state_name 4    = "process_process_authentication_method";
-	m_process_state 5 = &CSocks5StateMachine::process_send_authentication_gssapi;
-	m_state_name 5    = "process_send_authentication_gssapi";
-	m_process_state 6 = &CSocks5StateMachine::process_receive_authentication_gssapi;
-	m_state_name 6    = "process_receive_authentication_gssapi";
-	m_process_state 7 = &CSocks5StateMachine::process_process_authentication_gssapi;
-	m_state_name 7    = "process_process_authentication_gssapi";
-	m_process_state 8 = &CSocks5StateMachine::process_send_authentication_username_password;
-	m_state_name 8    = "process_send_authentication_username_password";
-	m_process_state 9 = &CSocks5StateMachine::process_receive_authentication_username_password;
-	m_state_name 9    = "process_receive_authentication_username_password";
+	m_process_state0 = &CSocks5StateMachine::process_start;
+	m_state_name0 = "process_start";
+	m_process_state1 = &CSocks5StateMachine::process_end;
+	m_state_name1 = "process_end";
+	m_process_state2 = &CSocks5StateMachine::process_send_query_authentication_method;
+	m_state_name2 = "process_send_query_authentication_method";
+	m_process_state3 = &CSocks5StateMachine::process_receive_authentication_method;
+	m_state_name3 = "process_receive_authentication_method";
+	m_process_state4 = &CSocks5StateMachine::process_process_authentication_method;
+	m_state_name4 = "process_process_authentication_method";
+	m_process_state5 = &CSocks5StateMachine::process_send_authentication_gssapi;
+	m_state_name5 = "process_send_authentication_gssapi";
+	m_process_state6 = &CSocks5StateMachine::process_receive_authentication_gssapi;
+	m_state_name6 = "process_receive_authentication_gssapi";
+	m_process_state7 = &CSocks5StateMachine::process_process_authentication_gssapi;
+	m_state_name7 = "process_process_authentication_gssapi";
+	m_process_state8 = &CSocks5StateMachine::process_send_authentication_username_password;
+	m_state_name8 = "process_send_authentication_username_password";
+	m_process_state9 = &CSocks5StateMachine::process_receive_authentication_username_password;
+	m_state_name9 = "process_receive_authentication_username_password";
 	m_process_state10 = &CSocks5StateMachine::process_process_authentication_username_password;
-	m_state_name10    = "process_process_authentication_username_password";
+	m_state_name10 = "process_process_authentication_username_password";
 	m_process_state11 = &CSocks5StateMachine::process_send_command_request;
-	m_state_name11    = "process_send_command_request";
+	m_state_name11 = "process_send_command_request";
 	m_process_state12 = &CSocks5StateMachine::process_receive_command_reply;
-	m_state_name12    = "process_receive_command_reply";
+	m_state_name12 = "process_receive_command_reply";
 	m_process_state13 = &CSocks5StateMachine::process_process_command_reply;
-	m_state_name13    = "process_process_command_reply";
+	m_state_name13 = "process_process_command_reply";
 }
 
 void CSocks5StateMachine::process_state(t_sm_state state, bool entry)
@@ -388,15 +357,14 @@
 		DumpMem(m_buffer, n, m_state_namestate, m_ok);
 	}
 #endif
-	AddDebugLogLineN(logProxy, CFormat(wxString("state: %s clocks: %u")) % m_state_namestate % GetClocksInCurrentState());
+	AddDebugLogLineN(logProxy,
+		CFormat(wxString("state: %s clocks: %u")) % m_state_namestate % GetClocksInCurrentState());
 #endif // __DEBUG__
 }
 
 /**
- * Code this such that the next state is only entered when it is able to
- * perform the operation (read or write). State processing will assume
- * that it can read or write upon entry of the state. This is done using
- * CanSend() and CanReceive().
+ * Code this so the next state is only entered when it can perform its operation (read or write).
+ * State processing assumes it can read or write on entry, via CanSend() and CanReceive().
  */
 t_sm_state CSocks5StateMachine::next_state(t_sm_event event)
 {
@@ -514,22 +482,17 @@
 }
 
 /**
- *	So, this is how you do it: the state machine is clocked by the events
- * that happen inside the event handler. You can add a dummy event whenever
- * you see that the system will not generate an event. But don't add dummy
- * events before reads, reads should only be performed after input events.
+ * The state machine is clocked by the events that happen inside the event handler. Add a dummy
+ * event whenever the system will not generate one, but not before a read: reads should only follow
+ * input events. It may make sense to add a dummy event before a read where there is no state change
+ * (a wait state).
  *
- *	Maybe it makes sense to add a dummy event before a read if there is no
- * state change (wait state).
- *
- *	The event system will generate at least 2 events, one wxSOCKET_CONNECTION,
- * one wxSOCKET_OUTPUT, so we will have 2 clocks in our state machine. Plus, each
- * time there is unread data in the receive buffer of the socket, a wxSOCKET_INPUT
- * event will be generated. If you feel you will need more clocks than these, use
- * AddDummyEvent(), but I suggest you review your state machine design first.
+ * The event system generates at least two events, one wxSOCKET_CONNECTION and one wxSOCKET_OUTPUT,
+ * so the state machine gets two clocks. A wxSOCKET_INPUT event follows each time there is unread
+ * data in the socket's receive buffer. If you need more clocks than that, use AddDummyEvent() --
+ * but review your state machine design first.
  */
-void CSocks5StateMachine::process_start(bool)
-{}
+void CSocks5StateMachine::process_start(bool) {}
 
 void CSocks5StateMachine::process_end(bool)
 {
@@ -564,12 +527,9 @@
 		m_packetLength = 2;
 		ProxyRead(*m_proxyClientSocket, m_buffer);
 	}
-	/* This is added because there will be no more input events. If the
-	 * world was a nice place, we could think about joining the
-	 * process_receive and the process_process states here, but some day
-	 * we might have to deal with the fact that the i/o operation has been
-	 * incomplete, and that we must finish our job the next time we enter
-	 * this state. */
+	/* Added because there will be no more input events. In a nicer world process_receive and
+	 * process_process could be joined here, but some day we may have to deal with an incomplete i/o
+	 * operation and finish the job on the next entry to this state. */
 	AddDummyEvent();
 }
 
@@ -579,15 +539,13 @@
 		m_lastReply = m_buffer1;
 		m_ok = m_ok && m_buffer0 == SOCKS5_VERSION;
 	}
-	/* Ok, this one is here because wxSOCKET_OUTPUT events only happen
-	 * once when you connect the socket, and after that, only after a
-	 * wxSOCKET_WOULDBLOCK error happens. */
+	/* Here because wxSOCKET_OUTPUT events only happen once, when the socket connects, and after
+	 * that only following a wxSOCKET_WOULDBLOCK error. */
 	AddDummyEvent();
 }
 
 void CSocks5StateMachine::process_send_authentication_gssapi(bool)
 {
-	// TODO or not TODO? That is the question...
 	m_ok = false;
 }
 
@@ -612,12 +570,10 @@
 
 		// Prepare username/password buffer
 		m_buffer0 = SOCKS5_AUTH_VERSION_USERNAME_PASSWORD;
-		m_bufferoffsetUser-1 = lenUser;
-		memcpy(m_buffer+offsetUser, unicode2char(m_proxyData.m_userName),
-			lenUser);
-		m_bufferoffsetPassword-1 = lenPassword;
-		memcpy(m_buffer+offsetPassword, unicode2char(m_proxyData.m_password),
-			lenPassword);
+		m_bufferoffsetUser - 1 = lenUser;
+		memcpy(m_buffer + offsetUser, unicode2char(m_proxyData.m_userName), lenUser);
+		m_bufferoffsetPassword - 1 = lenPassword;
+		memcpy(m_buffer + offsetPassword, unicode2char(m_proxyData.m_password), lenPassword);
 
 		// Send the username/password packet
 		ProxyWrite(*m_proxyClientSocket, m_buffer, m_packetLength);
@@ -639,9 +595,8 @@
 	if (entry) {
 		// Process the server's reply
 		m_lastReply = m_buffer1;
-		m_ok =	m_ok &&
-			m_buffer0 == SOCKS5_AUTH_VERSION_USERNAME_PASSWORD &&
-			m_buffer1 == SOCKS5_REPLY_SUCCEED;
+		m_ok = m_ok && m_buffer0 == SOCKS5_AUTH_VERSION_USERNAME_PASSWORD &&
+		       m_buffer1 == SOCKS5_REPLY_SUCCEED;
 	}
 	AddDummyEvent();
 }
@@ -666,8 +621,8 @@
 		}
 		m_buffer2 = SOCKS5_RSV;
 		m_buffer3 = SOCKS5_ATYP_IPV4_ADDRESS;
-		PokeUInt32( m_buffer+4, StringIPtoUint32(m_peerAddress->IPAddress()) );
-		RawPokeUInt16( m_buffer+8, ENDIAN_HTONS( m_peerAddress->Service() ) );
+		PokeUInt32(m_buffer + 4, StringIPtoUint32(m_peerAddress->IPAddress()));
+		RawPokeUInt16(m_buffer + 8, ENDIAN_HTONS(m_peerAddress->Service()));
 
 		// Send the command packet
 		m_packetLength = 10;
@@ -690,67 +645,34 @@
 {
 	if (entry) {
 		m_lastReply = m_buffer1;
-		unsigned char addressType = m_buffer3;
-		// Process the server's reply
-		m_ok = m_ok &&
-			m_buffer0 == SOCKS5_VERSION &&
-			m_buffer1 == SOCKS5_REPLY_SUCCEED;
+		// Process the server's reply. An IPv6 or unknown bound address fails the negotiation:
+		// the bound address is kept as IPv4.
+		const unsigned int portOffset = Socks5ReplyPortOffset(m_buffer, m_lastRead);
+		m_ok = m_ok && portOffset && m_buffer0 == SOCKS5_VERSION &&
+		       m_buffer1 == SOCKS5_REPLY_SUCCEED;
 		if (m_ok) {
-			// Read BND.ADDR
-			unsigned int portOffset = 0;
-			switch(addressType) {
-			case SOCKS5_ATYP_IPV4_ADDRESS:
-			{
-				const unsigned int addrOffset = 4;
-				portOffset = 8;
-				m_proxyBoundAddressIPV4.Hostname( PeekUInt32( m_buffer+addrOffset) );
-				m_proxyBoundAddress = &m_proxyBoundAddressIPV4;
-				break;
-			}
-			case SOCKS5_ATYP_DOMAINNAME:
-			{
-				// Read the domain name
-				const unsigned int addrOffset = 5;
-				portOffset = 10 + m_buffer4;
-				char c = m_bufferportOffset;
-				m_bufferportOffset = 0;
-				m_proxyBoundAddressIPV4.Hostname(
-					char2unicode(m_buffer+addrOffset));
-				m_proxyBoundAddress = &m_proxyBoundAddressIPV4;
-				m_bufferportOffset = c;
-				break;
-			}
-			case SOCKS5_ATYP_IPV6_ADDRESS:
-			{
-				portOffset = 20;
-				// TODO
-				// IPV6 not yet implemented in wx
-				//m_proxyBoundAddress.Hostname(Uint128toStringIP(
-				//	*((uint128 *)(m_buffer+addrOffset)) ));
-				//m_proxyBoundAddress = &m_proxyBoundAddressIPV6;
+			if (m_buffer3 == SOCKS5_ATYP_IPV4_ADDRESS) {
+				m_ok = m_proxyBoundAddressIPV4.Hostname(PeekUInt32(m_buffer + 4));
+			} else if (m_proxyCommand == PROXY_CMD_UDP_ASSOCIATE) {
+				// Datagrams are sent to and accepted from this address, and resolving a
+				// name the server chose would block the event loop on its resolver.
 				m_ok = false;
-				break;
-			}
 			}
-			// Set the packet length at last
+			// Otherwise the bound address is informational, so only its port is read.
+		}
+		if (m_ok) {
+			m_proxyBoundAddress = &m_proxyBoundAddressIPV4;
 			m_packetLength = portOffset + 2;
-			// Read BND.PORT
-			m_proxyBoundAddress->Service( ENDIAN_NTOHS( RawPeekUInt16( m_buffer+portOffset) ) );
+			m_proxyBoundAddress->Service(ENDIAN_NTOHS(RawPeekUInt16(m_buffer + portOffset)));
 		}
 	}
 	AddDummyEvent();
 }
 
-//------------------------------------------------------------------------------
 // CSocks4StateMachine
-//------------------------------------------------------------------------------
-
-CSocks4StateMachine::CSocks4StateMachine(
-	const CProxyData &proxyData,
-	CProxyCommand proxyCommand)
-:
-CProxyStateMachine(
-	wxString("Socks4"), SOCKS4_MAX_STATES, proxyData, proxyCommand)
+
+CSocks4StateMachine::CSocks4StateMachine(const CProxyData &proxyData, CProxyCommand proxyCommand)
+: CProxyStateMachine(wxString("Socks4"), SOCKS4_MAX_STATES, proxyData, proxyCommand)
 {
 	m_process_state0 = &CSocks4StateMachine::process_start;
 	m_state_name0 = "process_start";
@@ -793,7 +715,8 @@
 		DumpMem(m_buffer, n, m_state_namestate, m_ok);
 	}
 #endif
-	AddDebugLogLineN(logProxy, CFormat(wxString("state: %s clocks: %u")) % m_state_namestate % GetClocksInCurrentState());
+	AddDebugLogLineN(logProxy,
+		CFormat(wxString("state: %s clocks: %u")) % m_state_namestate % GetClocksInCurrentState());
 #endif // __DEBUG__
 }
 
@@ -834,8 +757,7 @@
 	return ret;
 }
 
-void CSocks4StateMachine::process_start(bool)
-{}
+void CSocks4StateMachine::process_start(bool) {}
 
 void CSocks4StateMachine::process_end(bool)
 {
@@ -861,15 +783,15 @@
 			return;
 			break;
 		}
-		RawPokeUInt16(m_buffer+2, ENDIAN_HTONS(m_peerAddress->Service()));
+		RawPokeUInt16(m_buffer + 2, ENDIAN_HTONS(m_peerAddress->Service()));
 		// Special processing for SOCKS4a
 		switch (m_proxyData.m_proxyType) {
 		case PROXY_SOCKS4a:
-			PokeUInt32(m_buffer+4, StringIPtoUint32("0.0.0.1"));
+			PokeUInt32(m_buffer + 4, StringIPtoUint32("0.0.0.1"));
 			break;
 		case PROXY_SOCKS4:
 		default:
-			PokeUInt32(m_buffer+4, StringIPtoUint32(m_peerAddress->IPAddress()));
+			PokeUInt32(m_buffer + 4, StringIPtoUint32(m_peerAddress->IPAddress()));
 			break;
 		}
 		// Common processing for SOCKS4/SOCKS4a
@@ -888,8 +810,7 @@
 			// the IP address which we actually know instead here.
 			wxString hostname(m_peerAddress->IPAddress());
 			unsigned char lenDomain = hostname.Len();
-			memcpy(m_buffer + offsetDomain,
-				unicode2char(hostname), lenDomain);
+			memcpy(m_buffer + offsetDomain, unicode2char(hostname), lenDomain);
 			m_bufferoffsetDomain + lenDomain = 0;
 			m_packetLength = 1 + 1 + 2 + 4 + lenUser + 1 + lenDomain + 1;
 			break;
@@ -920,34 +841,23 @@
 		m_lastReply = m_buffer1;
 
 		// Process the server's reply
-		m_ok = m_ok &&
-			m_buffer0 == SOCKS4_REPLY_CODE &&
-			m_buffer1 == SOCKS4_REPLY_GRANTED;
+		m_ok = m_ok && m_buffer0 == SOCKS4_REPLY_CODE && m_buffer1 == SOCKS4_REPLY_GRANTED;
 		if (m_ok) {
-			// Read BND.PORT
 			const unsigned int portOffset = 2;
-			m_ok = m_proxyBoundAddressIPV4.Service(ENDIAN_NTOHS(
-				RawPeekUInt16( m_buffer+portOffset) ) );
-			// Read BND.ADDR
+			m_ok = m_proxyBoundAddressIPV4.Service(
+				ENDIAN_NTOHS(RawPeekUInt16(m_buffer + portOffset)));
 			const unsigned int addrOffset = 4;
-			m_ok = m_ok &&
-				m_proxyBoundAddressIPV4.Hostname( PeekUInt32( m_buffer+addrOffset ) );
+			m_ok = m_ok && m_proxyBoundAddressIPV4.Hostname(PeekUInt32(m_buffer + addrOffset));
 			m_proxyBoundAddress = &m_proxyBoundAddressIPV4;
 		}
 	}
 	AddDummyEvent();
 }
 
-//------------------------------------------------------------------------------
 // CHttpStateMachine
-//------------------------------------------------------------------------------
-
-CHttpStateMachine::CHttpStateMachine(
-	const CProxyData &proxyData,
-	CProxyCommand proxyCommand)
-:
-CProxyStateMachine(
-	wxString("Http"), HTTP_MAX_STATES, proxyData, proxyCommand)
+
+CHttpStateMachine::CHttpStateMachine(const CProxyData &proxyData, CProxyCommand proxyCommand)
+: CProxyStateMachine(wxString("Http"), HTTP_MAX_STATES, proxyData, proxyCommand)
 {
 	m_process_state0 = &CHttpStateMachine::process_start;
 	m_state_name0 = "process_start";
@@ -990,7 +900,8 @@
 		DumpMem(m_buffer, n, m_state_namestate, m_ok);
 	}
 #endif
-	AddDebugLogLineN(logProxy, CFormat(wxString("state: %s clocks: %u")) % m_state_namestate % GetClocksInCurrentState());
+	AddDebugLogLineN(logProxy,
+		CFormat(wxString("state: %s clocks: %u")) % m_state_namestate % GetClocksInCurrentState());
 #endif // __DEBUG__
 }
 
@@ -1031,8 +942,7 @@
 	return ret;
 }
 
-void CHttpStateMachine::process_start(bool)
-{}
+void CHttpStateMachine::process_start(bool) {}
 
 void CHttpStateMachine::process_end(bool)
 {
@@ -1049,16 +959,14 @@
 		wxString userPassEncoded;
 		if (m_proxyData.m_enablePassword) {
 			userPass = m_proxyData.m_userName + ":" + m_proxyData.m_password;
-			userPassEncoded =
-				EncodeBase64(unicode2char(userPass), userPass.Length()).Trim();
+			userPassEncoded = EncodeBase64(unicode2char(userPass), userPass.Length()).Trim();
 		}
 		wxString msg;
 
 		switch (m_proxyCommand) {
 		case PROXY_CMD_CONNECT:
-			msg <<
-			"CONNECT " << ip << ":" << port << " HTTP/1.1\r\n" <<
-			"Host: "   << ip << ":" << port << "\r\n";
+			msg << "CONNECT " << ip << ":" << port << " HTTP/1.1\r\n"
+			    << "Host: " << ip << ":" << port << "\r\n";
 			if (m_proxyData.m_enablePassword) {
 				msg << "Proxy-Authorization: Basic " << userPassEncoded << "\r\n";
 			}
@@ -1076,7 +984,7 @@
 		}
 		// Send the command packet
 		m_packetLength = msg.Len();
-		memcpy(m_buffer, unicode2char(msg), m_packetLength+1);
+		memcpy(m_buffer, unicode2char(msg), m_packetLength + 1);
 		ProxyWrite(*m_proxyClientSocket, m_buffer, m_packetLength);
 	}
 }
@@ -1093,13 +1001,11 @@
 }
 
 /*
- * HTTP Proxy server response should be something like:
- * "HTTP/1.1 200 Connection established\r\n\r\n"
- * but that may vary. The important thing is the "200"
- * code, that means success.
+ * An HTTP proxy server response should be something like "HTTP/1.1 200 Connection established\r\n"
+ * but that varies. What matters is the "200" code, meaning success.
  */
 static const char HTTP_AUTH_RESPONSE = "HTTP/";
-static const int  HTTP_AUTH_RESPONSE_LENGHT = strlen(HTTP_AUTH_RESPONSE);
+static const int HTTP_AUTH_RESPONSE_LENGHT = strlen(HTTP_AUTH_RESPONSE);
 void CHttpStateMachine::process_process_command_reply(bool entry)
 {
 	if (entry) {
@@ -1109,25 +1015,21 @@
 			i++;
 		}
 		// Process the server's reply
-		m_ok =	!memcmp(m_buffer + 0, HTTP_AUTH_RESPONSE, HTTP_AUTH_RESPONSE_LENGHT) &&
-			!memcmp(m_buffer + i, "200", 3);
+		m_ok = !memcmp(m_buffer + 0, HTTP_AUTH_RESPONSE, HTTP_AUTH_RESPONSE_LENGHT) &&
+		       !memcmp(m_buffer + i, "200", 3);
 	}
 	AddDummyEvent();
 }
 
-//------------------------------------------------------------------------------
 // CProxySocket
-//------------------------------------------------------------------------------
 
-CProxySocket::CProxySocket(
-	muleSocketFlags flags,
+CProxySocket::CProxySocket(muleSocketFlags flags,
 	const CProxyData *proxyData,
 	CProxyCommand proxyCommand,
 	CDatagramSocketProxy *udpSocket)
-:
-CLibSocket(flags),
-m_proxyStateMachine(NULL),
-m_udpSocket(udpSocket)
+: CLibSocket(flags)
+, m_proxyStateMachine(NULL)
+, m_udpSocket(udpSocket)
 {
 	SetProxyData(proxyData);
 	if (m_useProxy) {
@@ -1136,19 +1038,16 @@
 			break;
 
 		case PROXY_SOCKS5:
-			m_proxyStateMachine =
-				new CSocks5StateMachine(*proxyData, proxyCommand);
+			m_proxyStateMachine = new CSocks5StateMachine(*proxyData, proxyCommand);
 			break;
 
 		case PROXY_SOCKS4:
 		case PROXY_SOCKS4a:
-			m_proxyStateMachine =
-				new CSocks4StateMachine(*proxyData, proxyCommand);
+			m_proxyStateMachine = new CSocks4StateMachine(*proxyData, proxyCommand);
 			break;
 
 		case PROXY_HTTP:
-			m_proxyStateMachine =
-				new CHttpStateMachine(*proxyData, proxyCommand);
+			m_proxyStateMachine = new CHttpStateMachine(*proxyData, proxyCommand);
 			break;
 
 		default:
@@ -1192,34 +1091,27 @@
 		break;
 
 	case PROXY_SOCKS5:
-		ret =	proxyCommand == PROXY_CMD_CONNECT ||
-			proxyCommand == PROXY_CMD_BIND ||
-			proxyCommand == PROXY_CMD_UDP_ASSOCIATE;
+		ret = proxyCommand == PROXY_CMD_CONNECT || proxyCommand == PROXY_CMD_BIND ||
+		      proxyCommand == PROXY_CMD_UDP_ASSOCIATE;
 		break;
 
 	case PROXY_SOCKS4:
 	case PROXY_SOCKS4a:
-		ret =	proxyCommand == PROXY_CMD_CONNECT ||
-			proxyCommand == PROXY_CMD_BIND;
+		ret = proxyCommand == PROXY_CMD_CONNECT || proxyCommand == PROXY_CMD_BIND;
 		break;
 
 	case PROXY_HTTP:
-		ret =	proxyCommand == PROXY_CMD_CONNECT;
+		ret = proxyCommand == PROXY_CMD_CONNECT;
 		break;
 	}
 
 	return ret;
 }
 
-//------------------------------------------------------------------------------
 // CSocketClientProxy
-//------------------------------------------------------------------------------
 
-CSocketClientProxy::CSocketClientProxy(
-	muleSocketFlags flags,
-	const CProxyData *proxyData)
-:
-CProxySocket(flags, proxyData, PROXY_CMD_CONNECT)
+CSocketClientProxy::CSocketClientProxy(muleSocketFlags flags, const CProxyData *proxyData)
+: CProxySocket(flags, proxyData, PROXY_CMD_CONNECT)
 {
 }
 
@@ -1249,34 +1141,24 @@
 	return CProxySocket::Write(buffer, nbytes);
 }
 
-//------------------------------------------------------------------------------
 // CSocketServerProxy
-//------------------------------------------------------------------------------
-
-CSocketServerProxy::CSocketServerProxy(
-	amuleIPV4Address &address,
-	muleSocketFlags flags,
-	const CProxyData *)
-:
-CLibSocketServer(address, flags)
+
+CSocketServerProxy::CSocketServerProxy(amuleIPV4Address &address, muleSocketFlags flags, const CProxyData *)
+: CLibSocketServer(address, flags)
 {
 	/* Maybe some day when socks6 is out... :) */
 }
 
-//------------------------------------------------------------------------------
 // CDatagramSocketProxy
-//------------------------------------------------------------------------------
 
 CDatagramSocketProxy::CDatagramSocketProxy(
 	amuleIPV4Address &address, muleSocketFlags flags, const CProxyData *proxyData)
-:
-CLibUDPSocket(address, flags),
-m_proxyTCPSocket(MULE_SOCKET_NOWAIT, proxyData, PROXY_CMD_UDP_ASSOCIATE, this)
+: CLibUDPSocket(address, flags)
+, m_proxyTCPSocket(MULE_SOCKET_NOWAIT, proxyData, PROXY_CMD_UDP_ASSOCIATE, this)
 {
 	m_udpSocketOk = false;
-	if (	m_proxyTCPSocket.GetUseProxy() &&
-		m_proxyTCPSocket.ProxyIsCapableOf(PROXY_CMD_UDP_ASSOCIATE)) {
-			m_proxyTCPSocket.Start(address);
+	if (m_proxyTCPSocket.GetUseProxy() && m_proxyTCPSocket.ProxyIsCapableOf(PROXY_CMD_UDP_ASSOCIATE)) {
+		m_proxyTCPSocket.Start(address);
 	} else {
 	}
 	m_lastUDPOperation = UDP_OPERATION_NONE;
@@ -1284,12 +1166,11 @@
 
 CDatagramSocketProxy::~CDatagramSocketProxy()
 {
-	// From RFC-1928:
-	// "A UDP association terminates when the TCP connection that the
-	// UDP ASSOCIATE request arrived terminates."
+	// From RFC-1928: "A UDP association terminates when the TCP connection that the UDP ASSOCIATE
+	// request arrived terminates."
 }
 
-uint32 CDatagramSocketProxy::RecvFrom(amuleIPV4Address& addr, void* buf, uint32 nBytes)
+uint32 CDatagramSocketProxy::RecvFrom(CNetworkAddress &addr, uint16 &port, void *buf, uint32 nBytes)
 {
 	uint32 read = 0;
 	wxMutexLocker lock(m_socketLocker);
@@ -1302,62 +1183,45 @@
 			} else {
 				bufUDP = m_proxyTCPSocket.GetBuffer();
 			}
+			CNetworkAddress relay;
+			uint16 relayPort = 0;
 			read = CLibUDPSocket::RecvFrom(
-				m_proxyTCPSocket.GetProxyBoundAddress(),
-				bufUDP, nBytes + PROXY_UDP_MAXIMUM_OVERHEAD);
-			unsigned int offset;
-			switch (m_proxyTCPSocket.GetBuffer()3) {
-			case SOCKS5_ATYP_IPV4_ADDRESS: {
-				offset = PROXY_UDP_OVERHEAD_IPV4;
-				try {
-					amuleIPV4Address &a = dynamic_cast<amuleIPV4Address &>(addr);
-					a.Hostname( PeekUInt32( m_proxyTCPSocket.GetBuffer()+4 ) );
-					a.Service( ENDIAN_NTOHS( RawPeekUInt16( m_proxyTCPSocket.GetBuffer()+8) ) );
-				} catch (const std::bad_cast& WXUNUSED(e)) {
-					AddDebugLogLineN(logProxy,
-						"(2)bad_cast exception!");
-					wxFAIL;
-				}
-			}
-				break;
-
-			case SOCKS5_ATYP_DOMAINNAME:
-				offset = PROXY_UDP_OVERHEAD_DOMAIN_NAME;
-				break;
-
-			case SOCKS5_ATYP_IPV6_ADDRESS:
-				offset = PROXY_UDP_OVERHEAD_IPV6;
-				break;
-
-			default:
-				/* Error! */
-				offset = 0;
-				break;
+				relay, relayPort, bufUDP, nBytes + PROXY_UDP_MAXIMUM_OVERHEAD);
+			// Anything else reaching this port could forge the SOCKS header and its source.
+			const amuleIPV4Address &bound = m_proxyTCPSocket.GetProxyBoundAddress();
+			const CNetworkAddress expected = Socks5ExpectedRelay(
+				CNetworkAddress::FromIPv4NetworkOrder(StringIPtoUint32(bound.IPAddress())),
+				CNetworkAddress::FromIPv4NetworkOrder(
+					StringIPtoUint32(m_proxyTCPSocket.GetProxyAddress().IPAddress())));
+			if (IsFromSocks5Relay(relay, relayPort, expected, bound.Service())) {
+				read = ParseSocks5UDPDatagram(bufUDP, read, addr, port, buf, nBytes);
+			} else {
+				AddDebugLogLineN(logProxy,
+					CFormat("Dropped a datagram from %s:%u; the SOCKS5 relay is %s:%u") %
+						relay.ToString() % relayPort % expected.ToString() %
+						bound.Service());
+				addr = CNetworkAddress::Absent();
+				port = 0;
+				read = 0;
 			}
-			memcpy(buf, bufUDP + offset, nBytes);
-			// Uncomment here to see the buffer contents on console
-			// DumpMem(bufUDP, wxDatagramSocket::LastCount(), "RecvFrom", 3);
 
 			/* Only delete buffer if it was dynamically created */
 			if (bufUDP != m_proxyTCPSocket.GetBuffer()) {
-				/* We should use a fixed buffer to avoid
-				 * new/delete it all the time.
-				 * I need an upper bound */
-				delete  bufUDP;
+				/* A fixed buffer would avoid new/delete
+				 * every time, but needs an upper bound. */
+				delete bufUDP;
 			}
-			/* There is still one problem pending, fragmentation.
-			 * Either we support it or we have to drop fragmented
-			 * messages. I vote for drop :)
-			 */
+			/* Fragmentation is still pending: either support it
+			 * or drop fragmented messages. Drop. */
 		}
 	} else {
-		read = CLibUDPSocket::RecvFrom(addr, buf, nBytes);
+		read = CLibUDPSocket::RecvFrom(addr, port, buf, nBytes);
 	}
 
 	return read;
 }
 
-uint32 CDatagramSocketProxy::SendTo(const amuleIPV4Address& addr, const void* buf, uint32 nBytes)
+uint32 CDatagramSocketProxy::SendTo(const amuleIPV4Address &addr, const void *buf, uint32 nBytes)
 {
 	uint32 sent = 0;
 	wxMutexLocker lock(m_socketLocker);
@@ -1365,35 +1229,29 @@
 	m_lastUDPOverhead = PROXY_UDP_OVERHEAD_IPV4;
 	if (m_proxyTCPSocket.GetUseProxy()) {
 		if (m_udpSocketOk) {
-			// Mirror RecvFrom's dynamic-buffer fallback: the fixed
-			// PROXY_BUFFER_SIZE (5120) m_buffer can't hold the 10-byte
-			// SOCKS5 UDP request header plus a payload larger than
-			// PROXY_BUFFER_SIZE - PROXY_UDP_OVERHEAD_IPV4 (5110 B).
-			// Without this the memcpy below ran past the end of
-			// m_buffer for any oversized outbound datagram (#881).
+			// Mirror RecvFrom's dynamic-buffer fallback: the fixed PROXY_BUFFER_SIZE
+			// m_buffer cannot hold the 10-byte SOCKS5 UDP request header plus a payload
+			// larger than PROXY_BUFFER_SIZE - PROXY_UDP_OVERHEAD_IPV4, so the memcpy
+			// below ran past the end of m_buffer for any oversized datagram (#881).
 			char *bufUDP = NULL;
 			if (nBytes + PROXY_UDP_OVERHEAD_IPV4 > PROXY_BUFFER_SIZE) {
 				bufUDP = new charnBytes + PROXY_UDP_OVERHEAD_IPV4;
 			} else {
 				bufUDP = m_proxyTCPSocket.GetBuffer();
 			}
-			bufUDP0 = SOCKS5_RSV;	// Reserved
-			bufUDP1 = SOCKS5_RSV;	// Reserved
-			bufUDP2 = 0;		// FRAG
+			bufUDP0 = SOCKS5_RSV; // Reserved
+			bufUDP1 = SOCKS5_RSV; // Reserved
+			bufUDP2 = 0;          // FRAG
 			bufUDP3 = SOCKS5_ATYP_IPV4_ADDRESS;
-			PokeUInt32( bufUDP+4, StringIPtoUint32(addr.IPAddress()));
-			RawPokeUInt16( bufUDP+8, ENDIAN_HTONS( addr.Service() ) );
+			PokeUInt32(bufUDP + 4, StringIPtoUint32(addr.IPAddress()));
+			RawPokeUInt16(bufUDP + 8, ENDIAN_HTONS(addr.Service()));
 			memcpy(bufUDP + PROXY_UDP_OVERHEAD_IPV4, buf, nBytes);
 			nBytes += PROXY_UDP_OVERHEAD_IPV4;
-			sent = CLibUDPSocket::SendTo(
-				m_proxyTCPSocket.GetProxyBoundAddress(),
-				bufUDP, nBytes);
-			// Uncomment here to see the buffer contents on console
-			// DumpMem(bufUDP, nBytes, "SendTo", 3);
+			sent = CLibUDPSocket::SendTo(m_proxyTCPSocket.GetProxyBoundAddress(), bufUDP, nBytes);
 
 			/* Only delete buffer if it was dynamically created */
 			if (bufUDP != m_proxyTCPSocket.GetBuffer()) {
-				delete  bufUDP;
+				delete bufUDP;
 			}
 		}
 	} else {

amule-3.0.1.tar.gz/src/Proxy.h -> amule-3.1.0.tar.gz/src/Proxy.h Changed

@@ -23,12 +23,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#ifndef __PROXY_H__
-#define __PROXY_H__
+#ifndef PROXY_H
+#define PROXY_H
 
-#include "amuleIPV4Address.h"	// For amuleIPV4address
-#include "StateMachine.h"	// For CStateMachine
+#include "amuleIPV4Address.h" // For amuleIPV4address
+#include "StateMachine.h"     // For CStateMachine
 #include "LibSocket.h"
+#include "ArchSpecific.h"
+#include "NetworkAddress.h"
+
+#include <cstring>
 
 #include <wx/wx.h>
 #include <wx/socket.h>
@@ -36,71 +40,61 @@
 /******************************************************************************/
 
 /*
- * SOCKS4 protocol implementation according to:
- * - "SOCKS: A protocol for TCP proxy across firewalls":
- *   amule-root/docs/socks4.protocol
+ * SOCKS4, per "SOCKS: A protocol for TCP proxy across firewalls"
+ * (amule-root/docs/socks4.protocol).
  */
 const unsigned char SOCKS4_VERSION = 0x04;
 
-const unsigned char SOCKS4_CMD_CONNECT	= 0x01;
-const unsigned char SOCKS4_CMD_BIND	= 0x02;
+const unsigned char SOCKS4_CMD_CONNECT = 0x01;
+const unsigned char SOCKS4_CMD_BIND = 0x02;
 
-const unsigned char SOCKS4_REPLY_CODE				= 0;
-const unsigned char SOCKS4_REPLY_GRANTED			= 90;
-const unsigned char SOCKS4_REPLY_FAILED				= 91;
-const unsigned char SOCKS4_REPLY_FAILED_NO_IDENTD		= 92;
-const unsigned char SOCKS4_REPLY_FAILED_DIFFERENT_USERIDS	= 93;
+const unsigned char SOCKS4_REPLY_CODE = 0;
+const unsigned char SOCKS4_REPLY_GRANTED = 90;
+const unsigned char SOCKS4_REPLY_FAILED = 91;
+const unsigned char SOCKS4_REPLY_FAILED_NO_IDENTD = 92;
+const unsigned char SOCKS4_REPLY_FAILED_DIFFERENT_USERIDS = 93;
 
 /*
- * SOCKS5 protocol implementation according to:
- * - RFC-1928: SOCKS Protocol Version 5
- * - RFC-1929: username/password Authentication for SOCKS V5
- *
- * Also, for the future :) :
- * - RFC-1961: GSS-API Authentication Method for SOCKS Version 5
- * - RFC-1508: Generic Security Service Application Program Interface
- * - RFC-1509: Generic Security Service API: C-bindings
- *
+ * SOCKS5, per RFC-1928 (SOCKS Protocol Version 5) and RFC-1929 (username/password
+ * authentication). For the future: RFC-1961 (GSS-API authentication), RFC-1508/1509 (GSS-API and
+ * its C bindings).
  */
 
 const unsigned char SOCKS5_VERSION = 0x05;
 
-const unsigned char SOCKS5_AUTH_METHOD_NO_AUTH_REQUIRED		= 0x00;
-const unsigned char SOCKS5_AUTH_METHOD_GSSAPI			= 0x01;
-const unsigned char SOCKS5_AUTH_METHOD_USERNAME_PASSWORD	= 0x02;
-const unsigned char SOCKS5_AUTH_METHOD_NO_ACCEPTABLE_METHODS	= 0xFF;
+const unsigned char SOCKS5_AUTH_METHOD_NO_AUTH_REQUIRED = 0x00;
+const unsigned char SOCKS5_AUTH_METHOD_GSSAPI = 0x01;
+const unsigned char SOCKS5_AUTH_METHOD_USERNAME_PASSWORD = 0x02;
+const unsigned char SOCKS5_AUTH_METHOD_NO_ACCEPTABLE_METHODS = 0xFF;
 
-const unsigned char SOCKS5_AUTH_VERSION_USERNAME_PASSWORD	= 0x01;
+const unsigned char SOCKS5_AUTH_VERSION_USERNAME_PASSWORD = 0x01;
 
-const unsigned char SOCKS5_CMD_CONNECT		= 0x01;
-const unsigned char SOCKS5_CMD_BIND		= 0x02;
-const unsigned char SOCKS5_CMD_UDP_ASSOCIATE	= 0x03;
+const unsigned char SOCKS5_CMD_CONNECT = 0x01;
+const unsigned char SOCKS5_CMD_BIND = 0x02;
+const unsigned char SOCKS5_CMD_UDP_ASSOCIATE = 0x03;
 
 const unsigned char SOCKS5_RSV = 0x00;
 
-const unsigned char SOCKS5_ATYP_IPV4_ADDRESS	= 0x01;
-const unsigned char SOCKS5_ATYP_DOMAINNAME	= 0x03;
-const unsigned char SOCKS5_ATYP_IPV6_ADDRESS	= 0x04;
-
-const unsigned char SOCKS5_REPLY_SUCCEED		= 0x00;
-const unsigned char SOCKS5_REPLY_GENERAL_SERVER_FAILURE	= 0x01;
-const unsigned char SOCKS5_REPLY_CONNECTION_NOT_ALLOWED	= 0x02;
-const unsigned char SOCKS5_REPLY_NETWORK_UNREACHABLE	= 0x03;
-const unsigned char SOCKS5_REPLY_HOST_UNREACHABLE	= 0x04;
-const unsigned char SOCKS5_REPLY_CONNECTION_REFUSED	= 0x05;
-const unsigned char SOCKS5_REPLY_TTL_EXPIRED		= 0x06;
-const unsigned char SOCKS5_REPLY_COMMAND_NOT_SUPPORTED	= 0x07;
-const unsigned char SOCKS5_REPLY_ATYP_NOT_SUPPORTED	= 0x08;
-
-//------------------------------------------------------------------------------
+const unsigned char SOCKS5_ATYP_IPV4_ADDRESS = 0x01;
+const unsigned char SOCKS5_ATYP_DOMAINNAME = 0x03;
+const unsigned char SOCKS5_ATYP_IPV6_ADDRESS = 0x04;
+
+const unsigned char SOCKS5_REPLY_SUCCEED = 0x00;
+const unsigned char SOCKS5_REPLY_GENERAL_SERVER_FAILURE = 0x01;
+const unsigned char SOCKS5_REPLY_CONNECTION_NOT_ALLOWED = 0x02;
+const unsigned char SOCKS5_REPLY_NETWORK_UNREACHABLE = 0x03;
+const unsigned char SOCKS5_REPLY_HOST_UNREACHABLE = 0x04;
+const unsigned char SOCKS5_REPLY_CONNECTION_REFUSED = 0x05;
+const unsigned char SOCKS5_REPLY_TTL_EXPIRED = 0x06;
+const unsigned char SOCKS5_REPLY_COMMAND_NOT_SUPPORTED = 0x07;
+const unsigned char SOCKS5_REPLY_ATYP_NOT_SUPPORTED = 0x08;
+
 // CProxyType
-//------------------------------------------------------------------------------
 
-/*
- * These constants must match the integer values saved in the configuration file,
- * DO NOT CHANGE THIS ORDER!!!
- */
-enum CProxyType {
+/* These constants must match the integer values saved in the configuration file. DO NOT CHANGE
+ * THIS ORDER! */
+enum CProxyType
+{
 	PROXY_NONE = -1,
 	PROXY_SOCKS5,
 	PROXY_SOCKS4,
@@ -108,169 +102,121 @@
 	PROXY_SOCKS4a
 };
 
-
-//------------------------------------------------------------------------------
 // CProxyData
-//------------------------------------------------------------------------------
-/**
- * The ProxyData class will hold information about the proxy server to be used.
- */
+/// Holds information about the proxy server to be used.
 class CProxyData
 {
 public:
-	/**
-	 * Default constructor.
-	 */
 	CProxyData();
 	/**
-	 * Constructor.
-	 *
-	 * @param proxyEnable	Whether proxy is enabled or not.
-	 * @param proxyType	The type of the proxy server.
-	 * @param proxyHostName	The proxy host name or IP address.
-	 * @param proxyPort	The proxy port number.
+	 * @param proxyEnable Whether proxy is enabled.
+	 * @param proxyType The type of the proxy server.
+	 * @param proxyHostName The proxy host name or IP address.
+	 * @param proxyPort The proxy port number.
 	 * @param enablePassword Whether authentication should be performed.
-	 * @param userName	The user name to authenticate to the server.
-	 * @param password	The password to authenticate to the server.
-	 */
-	CProxyData(
-		bool		proxyEnable,
-		CProxyType	proxyType,
-		const wxString	&proxyHostName,
-		unsigned short	proxyPort,
-		bool		enablePassword,
-		const wxString	&userName,
-		const wxString	&password
-	);
-	/**
-	 * Clears the object contents.
+	 * @param userName The user name to authenticate with.
+	 * @param password The password to authenticate with.
 	 */
+	CProxyData(bool proxyEnable,
+		CProxyType proxyType,
+		const wxString &proxyHostName,
+		unsigned short proxyPort,
+		bool enablePassword,
+		const wxString &userName,
+		const wxString &password);
+	/// Clears the object contents.
 	void Clear();
 
 public:
-	//! Whether proxy is enabled or not.
-	bool		m_proxyEnable;
-	//! The type of the proxy server.
-	CProxyType	m_proxyType;
-	//! The proxy host name or IP address.
-	wxString	m_proxyHostName;
-	//! The proxy port number.
-	unsigned short	m_proxyPort;
-	//! Whether authentication should be performed.
-	bool		m_enablePassword;
-	//! The user name to authenticate to the server.
-	wxString	m_userName;
-	//! The password to authenticate to the server.
-	wxString	m_password;
+	bool m_proxyEnable;
+	CProxyType m_proxyType;
+	wxString m_proxyHostName;
+	unsigned short m_proxyPort;
+	bool m_enablePassword;
+	wxString m_userName;
+	wxString m_password;
 };
 
-//------------------------------------------------------------------------------
 // CProxyStateMachine
-//------------------------------------------------------------------------------
-/* This size is just to be a little bit greater than the UDP buffer used in aMule.
- * Proxy protocol needs much less than this. 1024 would be ok. Other options are
- * - Default ethernet MTU - Eth-II - IP - UDP: 1,514 - 14 - 20 - 8 = 1472 bytes;
- * - Default token ring MTU 4,202 - overheads = ??.
- * It would be really more efficient if the final object was less than
- * a page (4096 bytes) in size.
+/* A little bigger than the UDP buffer aMule uses; the proxy protocol needs far less, and 1024
+ * would do. For reference, the default ethernet MTU less Eth-II/IP/UDP overhead is 1472 bytes. It
+ * would be more efficient if the final object were under a page (4096 bytes).
  */
-//const unsigned int PROXY_BUFFER_SIZE = 1024;
-const unsigned int PROXY_BUFFER_SIZE = 5*1024;
+const unsigned int PROXY_BUFFER_SIZE = 5 * 1024;
 
-enum CProxyCommand {
+enum CProxyCommand
+{
 	PROXY_CMD_CONNECT,
 	PROXY_CMD_BIND,
 	PROXY_CMD_UDP_ASSOCIATE
 };
 
-enum CProxyState {
+enum CProxyState
+{
 	PROXY_STATE_START = 0,
 	PROXY_STATE_END = 1
 };
 
 /**
- * The ProxyStateMachine class is the ancestor of all proxy classes.
- *
- * CProxyStateMachine will do all the common work that a proxy class must do
- * and provide the necessary variables.
+ * Ancestor of all proxy classes: does the common work a proxy class must do and provides the
+ * necessary variables.
  */
 class CProxyStateMachine : public CStateMachine
 {
 public:
 	/**
-	 * Constructor.
-	 *
-	 * @param name		The name of the state machine. For debug messages only.
-	 * @param max_states	The maximum number of states that this machine will have.
-	 * @param proxyData	The necessary proxy information.
-	 * @param cmd		The type of proxy command to run.
+	 * @param name The name of the state machine, for debug messages only.
+	 * @param max_states The maximum number of states this machine will have.
+	 * @param proxyData The necessary proxy information.
+	 * @param cmd The type of proxy command to run.
 	 */
 	CProxyStateMachine(
-		wxString name,
-		const unsigned int max_states,
-		const CProxyData &proxyData,
-		CProxyCommand cmd);
-	/**
-	 * Destructor.
-	 */
+		wxString name, const unsigned int max_states, const CProxyData &proxyData, CProxyCommand cmd);
 	virtual ~CProxyStateMachine();
 	/**
-	 * Adds a small string to the state machine name, containing the proxy command.
-	 *
-	 * @param s	The original state machine name.
-	 * @param cmd	The proxy command.
+	 * Adds a small string to state machine name @a s, containing the proxy command @a cmd.
 	 */
-	static wxString	&NewName(wxString &s, CProxyCommand cmd);
+	static wxString &NewName(wxString &s, CProxyCommand cmd);
 
 	/* Interface */
-	bool		Start(const amuleIPV4Address &peerAddress, CLibSocket *proxyClientSocket);
-	t_sm_state	HandleEvent(t_sm_event event);
-	void		AddDummyEvent();
-	void		ReactivateSocket();
-	char		*GetBuffer()				{ return m_buffer; }
-	amuleIPV4Address	&GetProxyBoundAddress(void) const	{ return *m_proxyBoundAddress; }
-	unsigned char	GetLastReply(void) const		{ return m_lastReply; }
-	bool		IsEndState() const			{ return GetState() == PROXY_STATE_END; }
+	bool Start(const amuleIPV4Address &peerAddress, CLibSocket *proxyClientSocket);
+	t_sm_state HandleEvent(t_sm_event event);
+	void AddDummyEvent();
+	void ReactivateSocket();
+	char *GetBuffer() { return m_buffer; }
+	amuleIPV4Address &GetProxyBoundAddress(void) const { return *m_proxyBoundAddress; }
+	unsigned char GetLastReply(void) const { return m_lastReply; }
+	bool IsEndState() const { return GetState() == PROXY_STATE_END; }
 
 protected:
-	uint32		ProxyWrite(CLibSocket &socket, const void *buffer, wxUint32 nbytes);
-	uint32		ProxyRead(CLibSocket &socket, void *buffer);
-	bool		CanReceive() const;
-	bool		CanSend() const;
-	//
+	uint32 ProxyWrite(CLibSocket &socket, const void *buffer, wxUint32 nbytes);
+	uint32 ProxyRead(CLibSocket &socket, void *buffer);
+	bool CanReceive() const;
+	bool CanSend() const;
 	// Initialized at constructor
-	//
-	const CProxyData	&m_proxyData;
-	CProxyCommand		m_proxyCommand;
-	//
+	const CProxyData &m_proxyData;
+	CProxyCommand m_proxyCommand;
 	// Member variables
-	//
-	char			m_bufferPROXY_BUFFER_SIZE;
-	bool			m_isLost;
-	bool			m_isConnected;
-	bool			m_canReceive;
-	bool			m_canSend;
-	bool			m_ok;
-	unsigned int	m_lastRead;
-	int				m_lastError;
-	//
+	char m_bufferPROXY_BUFFER_SIZE;
+	bool m_isLost;
+	bool m_isConnected;
+	bool m_canReceive;
+	bool m_canSend;
+	bool m_ok;
+	unsigned int m_lastRead;
+	int m_lastError;
 	// Will be initialized at Start()
-	//
-	amuleIPV4Address	*m_peerAddress;
-	CLibSocket			*m_proxyClientSocket;
-	amuleIPV4Address	*m_proxyBoundAddress;
-	amuleIPV4Address	m_proxyBoundAddressIPV4;
-	//wxIPV6address		m_proxyBoundAddressIPV6;
-	//
+	amuleIPV4Address *m_peerAddress;
+	CLibSocket *m_proxyClientSocket;
+	amuleIPV4Address *m_proxyBoundAddress;
+	amuleIPV4Address m_proxyBoundAddressIPV4;
+	// wxIPV6address		m_proxyBoundAddressIPV6;
 	// Temporary variables
-	//
-	unsigned char		m_lastReply;
-	unsigned int		m_packetLength;
+	unsigned char m_lastReply;
+	unsigned int m_packetLength;
 };
 
-//------------------------------------------------------------------------------
 // CSocks5StateMachine
-//------------------------------------------------------------------------------
 class CSocks5StateMachine;
 typedef void (CSocks5StateMachine::*Socks5StateProcessor)(bool entry);
 class CSocks5StateMachine : public CProxyStateMachine
@@ -278,7 +224,8 @@
 private:
 	static const unsigned int SOCKS5_MAX_STATES = 14;
 
-	enum Socks5State {
+	enum Socks5State
+	{
 		SOCKS5_STATE_START = PROXY_STATE_START,
 		SOCKS5_STATE_END = PROXY_STATE_END,
 		SOCKS5_STATE_SEND_QUERY_AUTHENTICATION_METHOD,
@@ -297,9 +244,7 @@
 
 public:
 	/* Constructor */
-	CSocks5StateMachine(
-		const CProxyData &proxyData,
-		CProxyCommand proxyCommand);
+	CSocks5StateMachine(const CProxyData &proxyData, CProxyCommand proxyCommand);
 	void process_state(t_sm_state state, bool entry);
 	t_sm_state next_state(t_sm_event event);
 
@@ -324,9 +269,7 @@
 	wxString m_state_nameSOCKS5_MAX_STATES;
 };
 
-//------------------------------------------------------------------------------
 // CSocks4StateMachine
-//------------------------------------------------------------------------------
 class CSocks4StateMachine;
 typedef void (CSocks4StateMachine::*Socks4StateProcessor)(bool entry);
 class CSocks4StateMachine : public CProxyStateMachine
@@ -334,7 +277,8 @@
 private:
 	static const unsigned int SOCKS4_MAX_STATES = 5;
 
-	enum Socks4State {
+	enum Socks4State
+	{
 		SOCKS4_STATE_START = PROXY_STATE_START,
 		SOCKS4_STATE_END = PROXY_STATE_END,
 		SOCKS4_STATE_SEND_COMMAND_REQUEST,
@@ -344,9 +288,7 @@
 
 public:
 	/* Constructor */
-	CSocks4StateMachine(
-		const CProxyData &proxyData,
-		CProxyCommand proxyCommand);
+	CSocks4StateMachine(const CProxyData &proxyData, CProxyCommand proxyCommand);
 	void process_state(t_sm_state state, bool entry);
 	t_sm_state next_state(t_sm_event event);
 
@@ -362,9 +304,7 @@
 	wxString m_state_nameSOCKS4_MAX_STATES;
 };
 
-//------------------------------------------------------------------------------
 // CHttpStateMachine
-//------------------------------------------------------------------------------
 class CHttpStateMachine;
 typedef void (CHttpStateMachine::*HttpStateProcessor)(bool entry);
 class CHttpStateMachine : public CProxyStateMachine
@@ -372,7 +312,8 @@
 private:
 	static const unsigned int HTTP_MAX_STATES = 5;
 
-	enum HttpState {
+	enum HttpState
+	{
 		HTTP_STATE_START = PROXY_STATE_START,
 		HTTP_STATE_END = PROXY_STATE_END,
 		HTTP_STATE_SEND_COMMAND_REQUEST,
@@ -382,9 +323,7 @@
 
 public:
 	/* Constructor */
-	CHttpStateMachine(
-		const CProxyData &proxyData,
-		CProxyCommand proxyCommand);
+	CHttpStateMachine(const CProxyData &proxyData, CProxyCommand proxyCommand);
 	void process_state(t_sm_state state, bool entry);
 	t_sm_state next_state(t_sm_event event);
 
@@ -400,19 +339,17 @@
 	wxString m_state_nameHTTP_MAX_STATES;
 };
 
-//------------------------------------------------------------------------------
 // CProxySocket
-//------------------------------------------------------------------------------
 
 class CDatagramSocketProxy;
 
 class CProxySocket : public CLibSocket
 {
-friend class CProxyEventHandler;
+	friend class CProxyEventHandler;
+
 public:
 	/* Constructor */
-	CProxySocket(
-		muleSocketFlags flags = MULE_SOCKET_NONE,
+	CProxySocket(muleSocketFlags flags = MULE_SOCKET_NONE,
 		const CProxyData *proxyData = NULL,
 		CProxyCommand proxyCommand = PROXY_CMD_CONNECT,
 		CDatagramSocketProxy *udpSocket = NULL);
@@ -421,30 +358,31 @@
 	~CProxySocket();
 
 	// Asio mode
-	virtual void	OnProxyEvent(int evt);
+	virtual void OnProxyEvent(int evt);
 
 	/* Interface */
-	void		SetProxyData(const CProxyData *proxyData);
-	bool		GetUseProxy() const	{ return m_useProxy; }
-	char		*GetBuffer()		{ return m_proxyStateMachine->GetBuffer(); }
-	amuleIPV4Address	&GetProxyBoundAddress(void) const
-						{ return m_proxyStateMachine->GetProxyBoundAddress(); }
+	void SetProxyData(const CProxyData *proxyData);
+	bool GetUseProxy() const { return m_useProxy; }
+	const amuleIPV4Address &GetProxyAddress() const { return m_proxyAddress; }
+	char *GetBuffer() { return m_proxyStateMachine->GetBuffer(); }
+	amuleIPV4Address &GetProxyBoundAddress(void) const
+	{
+		return m_proxyStateMachine->GetProxyBoundAddress();
+	}
 	bool Start(const amuleIPV4Address &peerAddress);
 	bool ProxyIsCapableOf(CProxyCommand proxyCommand) const;
-	bool ProxyNegotiationIsOver() const	{ return m_proxyStateMachine->IsEndState(); }
+	bool ProxyNegotiationIsOver() const { return m_proxyStateMachine->IsEndState(); }
 	CDatagramSocketProxy *GetUDPSocket() const { return m_udpSocket; }
 
 private:
-	bool			m_useProxy;
-	CProxyData		m_proxyData;
-	amuleIPV4Address	m_proxyAddress;
-	CProxyStateMachine	*m_proxyStateMachine;
-	CDatagramSocketProxy	*m_udpSocket;
+	bool m_useProxy;
+	CProxyData m_proxyData;
+	amuleIPV4Address m_proxyAddress;
+	CProxyStateMachine *m_proxyStateMachine;
+	CDatagramSocketProxy *m_udpSocket;
 };
 
-//------------------------------------------------------------------------------
 // CSocketClientProxy
-//------------------------------------------------------------------------------
 
 class CSocketClientProxy : public CProxySocket
 {
@@ -453,9 +391,7 @@
 
 public:
 	/* Constructor */
-	CSocketClientProxy(
-		muleSocketFlags flags = MULE_SOCKET_NONE,
-		const CProxyData *proxyData = NULL);
+	CSocketClientProxy(muleSocketFlags flags = MULE_SOCKET_NONE, const CProxyData *proxyData = NULL);
 
 	/* Interface */
 	bool Connect(amuleIPV4Address &address, bool wait);
@@ -463,47 +399,116 @@
 	uint32 Write(const void *buffer, wxUint32 nbytes);
 
 private:
-	wxMutex			m_socketLocker;
+	wxMutex m_socketLocker;
 };
 
-//------------------------------------------------------------------------------
 // CSocketServerProxy
-//------------------------------------------------------------------------------
 
 class CSocketServerProxy : public CLibSocketServer
 {
 public:
 	/* Constructor */
-	CSocketServerProxy(
-		amuleIPV4Address &address,
+	CSocketServerProxy(amuleIPV4Address &address,
 		muleSocketFlags flags = MULE_SOCKET_NONE,
 		const CProxyData *proxyData = NULL);
 
 private:
-	wxMutex			m_socketLocker;
+	wxMutex m_socketLocker;
 };
 
-//------------------------------------------------------------------------------
 // CDatagramSocketProxy
-//------------------------------------------------------------------------------
 
-enum UDPOperation {
+enum UDPOperation
+{
 	UDP_OPERATION_NONE,
 	UDP_OPERATION_RECV_FROM,
 	UDP_OPERATION_SEND_TO
 };
 
-const unsigned int PROXY_UDP_OVERHEAD_IPV4		= 10;
-const unsigned int PROXY_UDP_OVERHEAD_DOMAIN_NAME	= 262;
-const unsigned int PROXY_UDP_OVERHEAD_IPV6		= 20;
-const unsigned int PROXY_UDP_MAXIMUM_OVERHEAD		= PROXY_UDP_OVERHEAD_DOMAIN_NAME;
+const unsigned int PROXY_UDP_OVERHEAD_IPV4 = 10;
+const unsigned int PROXY_UDP_OVERHEAD_DOMAIN_NAME = 262;
+const unsigned int PROXY_UDP_OVERHEAD_IPV6 = 22;
+// Domain-name headers are refused, so the IPv6 form is the widest one accepted.
+const unsigned int PROXY_UDP_MAXIMUM_OVERHEAD = PROXY_UDP_OVERHEAD_IPV6;
+
+/** Decode one SOCKS5 UDP datagram without socket state.
+ *
+ * Here rather than in its own header because it reads the ATYP and overhead constants above, which
+ * the TCP handshake in Proxy.cpp also uses, and because RecvFrom() below already puts
+ * CNetworkAddress in this header's interface. A separate header would have to include this one to
+ * reach the constants, so it would move the code without moving the dependency.
+ *
+ * Invalid headers clear the source and port and leave the output buffer untouched.
+ * Valid empty payloads still publish the source. Input and output must not overlap.
+ */
+inline uint32 ParseSocks5UDPDatagram(const char *packet,
+	uint32 available,
+	CNetworkAddress &addr,
+	uint16 &port,
+	void *payload,
+	uint32 capacity)
+{
+	addr = CNetworkAddress::Absent();
+	port = 0;
+	unsigned int offset = 0;
+	if (available >= 4 && packet0 == 0 && packet1 == 0 && packet2 == 0) {
+		if (packet3 == SOCKS5_ATYP_IPV4_ADDRESS && available >= PROXY_UDP_OVERHEAD_IPV4) {
+			offset = PROXY_UDP_OVERHEAD_IPV4;
+			addr = CNetworkAddress::FromIPv4NetworkOrder(PeekUInt32(packet + 4));
+		} else if (packet3 == SOCKS5_ATYP_IPV6_ADDRESS && available >= PROXY_UDP_OVERHEAD_IPV6) {
+			offset = PROXY_UDP_OVERHEAD_IPV6;
+			addr = CNetworkAddress::FromIPv6Bytes(reinterpret_cast<const uint8_t *>(packet + 4))
+				       .Unmapped();
+		}
+	}
+	if (!offset) {
+		return 0;
+	}
+	port = ENDIAN_NTOHS(RawPeekUInt16(packet + offset - 2));
+	const uint32 length = available - offset > capacity ? capacity : available - offset;
+	if (length) {
+		std::memcpy(payload, packet + offset, length);
+	}
+	return length;
+}
+
+/** Offset of the port in a SOCKS5 command reply, or 0 when the reply is truncated or its bound
+ * address cannot be used here (IPv6 or an unknown type).
+ */
+inline unsigned int Socks5ReplyPortOffset(const char *reply, uint32 available)
+{
+	unsigned int portOffset = 0;
+	if (available >= 5 && reply3 == SOCKS5_ATYP_IPV4_ADDRESS) {
+		portOffset = 8;
+	} else if (available >= 5 && reply3 == SOCKS5_ATYP_DOMAINNAME) {
+		portOffset = 5 + static_cast<unsigned char>(reply4);
+	}
+	return portOffset && available >= portOffset + 2 ? portOffset : 0;
+}
+
+/** Where relayed datagrams come from. RFC 1928 leaves BND.ADDR unspecified to mean "the address
+ * you reached the proxy at", so pinning the port alone would accept any host.
+ */
+inline CNetworkAddress Socks5ExpectedRelay(const CNetworkAddress &bound, const CNetworkAddress &proxy)
+{
+	return bound.IsUnspecified() ? proxy : bound;
+}
+
+/** Whether a datagram came from the relay named in the UDP ASSOCIATE reply. An unspecified
+ * relay address (0.0.0.0) pins only the port.
+ */
+inline bool IsFromSocks5Relay(
+	const CNetworkAddress &source, uint16 sourcePort, const CNetworkAddress &relay, uint16 relayPort)
+{
+	return source.IsPresent() && sourcePort == relayPort &&
+	       (relay.IsUnspecified() || source.Unmapped() == relay.Unmapped());
+}
 
 class CDatagramSocketProxy : public CLibUDPSocket
 {
 public:
 	/* Constructor */
-	CDatagramSocketProxy(
-		amuleIPV4Address &address,
+	CDatagramSocketProxy(amuleIPV4Address &address,
 		muleSocketFlags flags = MULE_SOCKET_NONE,
 		const CProxyData *proxyData = NULL);
 
@@ -514,19 +519,19 @@
 	void SetUDPSocketOk() { m_udpSocketOk = true; }
 
 	/* wxDatagramSocket Interface */
-	virtual uint32 RecvFrom(amuleIPV4Address& addr, void* buf, uint32 nBytes);
-	virtual uint32 SendTo(const amuleIPV4Address& addr, const void* buf, uint32 nBytes);
+	virtual uint32 RecvFrom(CNetworkAddress &addr, uint16 &port, void *buf, uint32 nBytes);
+	virtual uint32 SendTo(const amuleIPV4Address &addr, const void *buf, uint32 nBytes);
 
 private:
-	bool			m_udpSocketOk;
-	CProxySocket		m_proxyTCPSocket;
-	enum UDPOperation	m_lastUDPOperation;
-	unsigned int		m_lastUDPOverhead;
-	wxMutex			m_socketLocker;
+	bool m_udpSocketOk;
+	CProxySocket m_proxyTCPSocket;
+	enum UDPOperation m_lastUDPOperation;
+	unsigned int m_lastUDPOverhead;
+	wxMutex m_socketLocker;
 };
 
 /******************************************************************************/
 
-#endif /* __PROXY_H__ */
+#endif /* PROXY_H */
 
 // File_checked_for_headers

amule-3.1.0.tar.gz/src/PublicIPv6Corroboration.h Added

@@ -0,0 +1,411 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 PUBLICIPV6CORROBORATION_H
+#define PUBLICIPV6CORROBORATION_H
+
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <vector>
+
+/**
+ * What a peer claims our own public IPv6 address is, believed only when it is an address we
+ * actually hold and several unrelated peers agree on it.
+ *
+ * The claim arrives in the CT_MOD_YOUR_IP (0xAD) hello tag. The two reference implementations
+ * disagree about it, and the disagreement is the whole reason this class exists:
+ *
+ *  - eMuleAI accepts the tag's integer form and sets its own public IPv4 from it. One peer,
+ *    unverified, decides what that client believes its own address to be -- and a client wrong
+ *    about its own address is wrong about whether it is firewalled, which address it publishes
+ *    to Kad and where it asks to be called back.
+ *  - emule-qt refuses the integer form outright and takes only the 128-bit hash form, then
+ *    filters and corroborates it before believing it.
+ *
+ * aMule follows emule-qt. BaseClient.cpp reads only the hash form and routes it here.
+ *
+ * Two independent gates stand between a peer's word and an adopted address, and they do
+ * different jobs:
+ *
+ *  - The locally-assigned filter is the security control. Peers are unauthenticated, so
+ *    corroboration on its own must never be able to make us advertise a foreign address.
+ *    Requiring the claimed value to be one we actually hold bounds the damage to "picks the
+ *    wrong one of our own addresses".
+ *  - Corroboration is the tie-breaker for that remaining question. A multi-homed host holds
+ *    several global addresses and only some are the one the outside world sees; asking several
+ *    peers which one they see is how the right one is picked.
+ *
+ * The quorum is keyed on the address the packet was observed arriving from, never the sender's
+ * self-declared user hash: a hash costs nothing to invent, so a single host could otherwise
+ * manufacture as many "distinct" corroborating peers as the threshold demands. A routable source
+ * address cannot be invented for free, because a reply has to come back through it.
+ *
+ * Nothing consumes the result yet. This is recognition only: aMule has no IPv6 stack, so the
+ * corroborated address is recorded for the dual-stack change and read by nothing else.
+ *
+ * Not thread-safe, and does not need to be: hellos and the interface refresh both run on the main
+ * thread.
+ */
+
+//! How many distinct observed source addresses have to agree on a value before it is believed.
+//!
+//! Two would be wrong: two source addresses is one dual-homed host, one host that reconnected from
+//! a new lease, or one attacker holding a second socket -- none of which is a second opinion. Three
+//! is the smallest count that forces a claimant to hold addresses it does not control alone, and is
+//! still reachable in an ordinary session.
+//!
+//! It is a floor, not a proof: three addresses under one operator still agree with each other. That
+//! is what the locally-assigned filter is for -- colluding peers can still only steer us between
+//! addresses we hold.
+constexpr std::size_t PUBLIC_IPV6_CORROBORATION_THRESHOLD = 3;
+
+/**
+ * How many distinct observers are remembered per candidate.
+ *
+ * Deliberately above the threshold. Recording only as many votes as the quorum
+ * needs leaves no margin: when one observer falls out of the window the count
+ * drops below the quorum and the address is no longer corroborated, even though
+ * other peers had been agreeing the whole time and were turned away at the cap.
+ * The surplus is the redundancy that makes an expiry survivable, and it is what
+ * a peer cannot spend, since the bound still holds.
+ */
+constexpr std::size_t PUBLIC_IPV6_CORROBORATION_MAX_OBSERVERS = 8;
+
+//! How long one observer's claim keeps counting.
+//!
+//! Without a window, "three distinct peers agree" means "three peers said so at some point since
+//! the process started", so a laptop that moved networks hours ago still carries the votes that
+//! elected the address it had there, and no amount of fresh disagreement can unseat them.
+//!
+//! Thirty minutes because hellos from distinct peers arrive sporadically, minutes apart on a quiet
+//! client, so a window of a few minutes would expire the first vote before the third arrived and
+//! the quorum would never form. It bounds how long a stale address can survive unchallenged; the
+//! interface refresh covers the case where the address simply went away.
+constexpr std::uint64_t PUBLIC_IPV6_CORROBORATION_WINDOW_MS = 30ull * 60ull * 1000ull;
+
+class CPublicIPv6Corroboration
+{
+public:
+	//! A 128-bit address, big-endian, as it travels in the tag.
+	typedef std::array<std::uint8_t, 16> Address;
+
+	CPublicIPv6Corroboration() = default;
+
+	/**
+	 * Publish the addresses currently assigned to a local interface.
+	 *
+	 * This set gates every claim, so it has to be published before any claim can be believed --
+	 * with an empty set nothing is ever adopted, which is the safe direction to fail in.
+	 *
+	 * It must be a refreshed cache rather than a startup snapshot: a prefix renumber or a
+	 * privacy-address rotation would otherwise go unnoticed for as long as the session lasts,
+	 * and we would keep an address we no longer hold. It must equally not be re-scanned per
+	 * claim -- that would put an interface walk on a path any peer can drive.
+	 *
+	 * The second half of the refresh is what makes the cache safe: an already adopted address
+	 * is re-checked here and dropped when it is no longer ours. Without that, a corroborated
+	 * address outlives the prefix it came from.
+	 *
+	 * @param local addresses assigned to a local interface. Anything not global unicast is
+	 * discarded, so callers can pass a whole interface enumeration.
+	 * @param nowMs a millisecond tick count.
+	 */
+	void SetLocalAddresses(const std::vector<Address> &local, std::uint64_t nowMs)
+	{
+		m_local.clear();
+		for (const auto &address : local) {
+			// IsLocallyAssigned() reads the set being built, so this also
+			// collapses the duplicates an interface enumeration produces when
+			// the same address is reported on more than one node.
+			if (IsGlobalUnicast(address) && !IsLocallyAssigned(address)) {
+				m_local.push_back(address);
+			}
+		}
+
+		// A tally for an address we no longer hold is not evidence about the
+		// address we hold now, and keeping it would let the old value stay
+		// elected. Dropping it here is how a renumber gets noticed.
+		std::vector<Candidate> kept;
+		for (const auto &candidate : m_candidates) {
+			if (IsLocallyAssigned(candidate.value)) {
+				kept.push_back(candidate);
+			}
+		}
+		m_candidates.swap(kept);
+
+		Expire(nowMs);
+		Elect();
+	}
+
+	/**
+	 * Record one peer's claim.
+	 *
+	 * @param observedFrom the IPv4 address the hello was actually seen arriving from, host
+	 * order. Zero is ignored: with no observed address there is nothing to key on, and an
+	 * unkeyed claim would let one peer supply the whole quorum by itself.
+	 * @param claimed 16 bytes, big-endian. May be NULL, which is ignored.
+	 * @param nowMs a millisecond tick count. Passed in rather than read here so the window is
+	 * testable at all.
+	 * @return whether some value is corroborated now. A repeat from an address already counted
+	 * for that value refreshes that vote and changes nothing else.
+	 */
+	bool AddClaim(std::uint32_t observedFrom, const std::uint8_t *claimed, std::uint64_t nowMs)
+	{
+		// Aging runs before the claim is judged, so a claim arriving after a long quiet
+		// spell sees an empty tally rather than votes that should already have expired.
+		Expire(nowMs);
+		Elect();
+
+		if (observedFrom == 0 || claimed == nullptr) {
+			return IsCorroborated();
+		}
+
+		const Address value = ToAddress(claimed);
+		// Both checks, not just the second: the locally-assigned set is already
+		// filtered to global unicast, but the address family test is the invariant
+		// this class promises and must not depend on how a caller populated that set.
+		if (!IsGlobalUnicast(value) || !IsLocallyAssigned(value)) {
+			// No state at all for a rejected value: a rejection that allocated
+			// something would let a peer spend our memory on values it invented.
+			return IsCorroborated();
+		}
+
+		Candidate *candidate = Find(value);
+		if (candidate == nullptr) {
+			// emplace_back() rather than push_back(Candidate()), which
+			// clang-tidy flags. It returns a reference from C++17.
+			candidate = &m_candidates.emplace_back();
+			candidate->value = value;
+		}
+
+		Observer *observer = candidate->Find(observedFrom);
+		if (observer != nullptr) {
+			// A peer that is still saying it keeps its vote alive. Without this the
+			// window would expire long-lived peers that never stopped agreeing.
+			observer->lastSeenMs = nowMs;
+		} else if (candidate->observers.size() < PUBLIC_IPV6_CORROBORATION_MAX_OBSERVERS) {
+			// Bounded, but above the quorum. Stopping at the threshold would mean
+			// the first observer to age out un-corroborates an address that other
+			// live peers still agree on, because their votes were refused at the
+			// cap and there is nothing left to fall back on.
+			Observer fresh;
+			fresh.address = observedFrom;
+			fresh.lastSeenMs = nowMs;
+			candidate->observers.push_back(fresh);
+		}
+
+		Elect();
+		return IsCorroborated();
+	}
+
+	//! True once some value reached the threshold and still holds it.
+	bool IsCorroborated() const { return m_adopted; }
+
+	//! The corroborated address, or NULL while none is. 16 bytes.
+	const std::uint8_t *CorroboratedAddress() const
+	{
+		return m_adopted ? m_adoptedValue.data() : nullptr;
+	}
+
+	//! How many distinct observed addresses have claimed this value. For tests and diagnostics;
+	//! nothing should gate on it instead of IsCorroborated(), which owns the threshold.
+	std::size_t DistinctObserversFor(const std::uint8_t *claimed) const
+	{
+		if (claimed == nullptr) {
+			return 0;
+		}
+		const Candidate *candidate = Find(ToAddress(claimed));
+		return candidate == nullptr ? 0 : candidate->observers.size();
+	}
+
+	//! How many differing values are being tracked.
+	std::size_t CandidateCount() const { return m_candidates.size(); }
+
+	//! How many local addresses the filter is currently gating on.
+	std::size_t LocalAddressCount() const { return m_local.size(); }
+
+	//! Forget every claim. The local address set survives: it comes from this machine, not from
+	//! peers, and clearing it would disable the filter until the next refresh.
+	void Reset()
+	{
+		m_candidates.clear();
+		m_adopted = false;
+	}
+
+	//! Global unicast, 2000::/3. Everything a peer could otherwise reflect at us -- the
+	//! unspecified address, loopback, link-local, unique-local, multicast, IPv4-mapped -- falls
+	//! outside it, and none of those is an address the outside world could have seen us arrive
+	//! from.
+	static bool IsGlobalUnicast(const Address &value) { return (value0 & 0xE0) == 0x20; }
+
+private:
+	//! The 16 bytes at @a claimed, which is never NULL here.
+	static Address ToAddress(const std::uint8_t *claimed)
+	{
+		Address value = {};
+		std::memcpy(value.data(), claimed, value.size());
+		return value;
+	}
+
+	struct Observer
+	{
+		std::uint32_t address = 0;
+		std::uint64_t lastSeenMs = 0;
+	};
+
+	struct Candidate
+	{
+		Address value = {};
+		std::vector<Observer> observers;
+
+		Observer *Find(std::uint32_t address)
+		{
+			for (auto &observer : observers) {
+				if (observer.address == address) {
+					return &observer;
+				}
+			}
+			return nullptr;
+		}
+	};
+
+	bool IsLocallyAssigned(const Address &value) const
+	{
+		for (const auto &address : m_local) {
+			if (address == value) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	//! Drop votes older than the window, and candidates left with none.
+	void Expire(std::uint64_t nowMs)
+	{
+		std::vector<Candidate> kept;
+		for (auto &candidate : m_candidates) {
+			Candidate fresh;
+			fresh.value = candidate.value;
+			for (const auto &observer : candidate.observers) {
+				// A tick that appears to move backwards expires the vote rather
+				// than keeping it -- uptime does not go backwards, so this defends
+				// against a caller mixing clocks.
+				if (nowMs >= observer.lastSeenMs &&
+					nowMs - observer.lastSeenMs <= PUBLIC_IPV6_CORROBORATION_WINDOW_MS) {
+					fresh.observers.push_back(observer);
+				}
+			}
+			if (!fresh.observers.empty()) {
+				kept.push_back(fresh);
+			}
+		}
+		m_candidates.swap(kept);
+	}
+
+	/// Re-run the election. An adopted value keeps its seat while it still holds a quorum, so a
+	/// second value reaching the threshold does not flip us back and forth between two
+	/// addresses we equally hold. It loses the seat the moment its quorum lapses -- votes aged
+	/// out, or the address no longer assigned -- and only then may another value take it.
+	void Elect()
+	{
+		if (m_adopted) {
+			const Candidate *candidate = Find(m_adoptedValue);
+			if (candidate != nullptr &&
+				candidate->observers.size() >= PUBLIC_IPV6_CORROBORATION_THRESHOLD) {
+				return;
+			}
+			m_adopted = false;
+		}
+
+		for (const auto &candidate : m_candidates) {
+			if (candidate.observers.size() >= PUBLIC_IPV6_CORROBORATION_THRESHOLD) {
+				m_adoptedValue = candidate.value;
+				m_adopted = true;
+				return;
+			}
+		}
+	}
+
+	Candidate *Find(const Address &value)
+	{
+		for (auto &candidate : m_candidates) {
+			if (candidate.value == value) {
+				return &candidate;
+			}
+		}
+		return nullptr;
+	}
+
+	const Candidate *Find(const Address &value) const
+	{
+		for (const auto &candidate : m_candidates) {
+			if (candidate.value == value) {
+				return &candidate;
+			}
+		}
+		return nullptr;
+	}
+
+	//! The addresses assigned to a local interface, global unicast only.
+	//!
+	//! Deliberately no cap on this or on the candidate list. An earlier revision capped the
+	//! tracked values because the input was attacker-chosen; with the filter in front, a
+	//! candidate can only be one of the addresses this machine's own interfaces bound. A cap
+	//! would now cost something real: occupying a slot costs one claim while corroborating a
+	//! value costs three, so refusing entries past a limit would make permanent denial the
+	//! cheaper attack.
+	std::vector<Address> m_local;
+
+	std::vector<Candidate> m_candidates;
+
+	Address m_adoptedValue = {};
+	bool m_adopted = false;
+};
+
+/// The one tracker the hello path feeds. A function-local static rather than a member of the app
+/// class: nothing consumes the corroborated address yet, and a recognition-only change should not
+/// reach into the app hierarchy to park state no caller reads. It moves to wherever its consumer
+/// lives when one exists.
+inline CPublicIPv6Corroboration &ObservedPublicIPv6()
+{
+	static CPublicIPv6Corroboration instance;
+	return instance;
+}
+
+/**
+ * Re-read this machine's interfaces and publish the result to ObservedPublicIPv6().
+ *
+ * Called at startup, on every server connect, and on a periodic tick. The periodic one is not
+ * redundant: without it the only triggers are startup and a server connect, so a prefix renumber or
+ * a privacy-address rotation goes unnoticed for as long as the session stays connected.
+ *
+ * Declared here, beside what it refreshes, but defined in amule.cpp: the interface enumeration
+ * pulls in wx and the platform socket headers, and this header stays clear of both so the tracker
+ * can be unit-tested on its own.
+ */
+void RefreshLocalPublicIPv6Addresses();
+
+#endif // PUBLICIPV6CORROBORATION_H

amule-3.0.1.tar.gz/src/RC4Encrypt.cpp -> amule-3.1.0.tar.gz/src/RC4Encrypt.cpp Changed

@@ -23,35 +23,31 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include "RC4Encrypt.h"
 #include <common/MD5Sum.h>
 
-
 #include <stdexcept>
 
-CRC4EncryptableBuffer::CRC4EncryptableBuffer() : m_encrypted(false), m_hasKey(false), m_key()
+CRC4EncryptableBuffer::CRC4EncryptableBuffer()
+: m_encrypted(false)
+, m_hasKey(false)
+, m_key()
 {
 }
 
+CRC4EncryptableBuffer::~CRC4EncryptableBuffer() {}
 
-CRC4EncryptableBuffer::~CRC4EncryptableBuffer()
-{
-}
-
-void CRC4EncryptableBuffer::Append(const uint8* buffer, int n)
+void CRC4EncryptableBuffer::Append(const uint8 *buffer, int n)
 {
 	wxASSERT(!m_encrypted);
 	if (!m_encrypted) {
 		CMemFile::Append(buffer, n);
 	} else {
-		throw std::runtime_error(
-			"(CRC4EncryptableBuffer::Append): "
-			"Tried to append data to an encrypted buffer.");
+		throw std::runtime_error("(CRC4EncryptableBuffer::Append): "
+					 "Tried to append data to an encrypted buffer.");
 	}
 }
 
-
 void CRC4EncryptableBuffer::Encrypt()
 {
 	wxASSERT(!m_encrypted);
@@ -59,14 +55,16 @@
 	m_encrypted = true;
 }
 
-void CRC4EncryptableBuffer::RC4Crypt( const uint8 *pachIn, uint8 *pachOut, uint32 nLen)
+void CRC4EncryptableBuffer::RC4Crypt(const uint8 *pachIn, uint8 *pachOut, uint32 nLen)
 {
-	wxASSERT( m_hasKey && nLen > 0 );
+	wxASSERT(m_hasKey && nLen > 0);
 
 	if (m_hasKey) {
-		uint8 byX = m_key.byX;;
+		uint8 byX = m_key.byX;
+		;
 		uint8 byY = m_key.byY;
-		uint8* pabyState = &m_key.abyState0;;
+		uint8 *pabyState = &m_key.abyState0;
+		;
 
 		for (uint32 i = 0; i < nLen; ++i) {
 			uint8 byXorIndex;
@@ -83,10 +81,9 @@
 		m_key.byX = byX;
 		m_key.byY = byY;
 	} else {
-		throw std::runtime_error(
-			"(CRC4EncryptableBuffer::RC4Crypt): "
-			"Encrypt() has been called without a previous call"
-			"to SetKey().");
+		throw std::runtime_error("(CRC4EncryptableBuffer::RC4Crypt): "
+					 "Encrypt() has been called without a previous call"
+					 "to SetKey().");
 	}
 }
 
@@ -100,26 +97,24 @@
 	return ret;
 }
 
-
-void CRC4EncryptableBuffer::SetKey(const MD5Sum& keyhash, bool bSkipDiscard)
+void CRC4EncryptableBuffer::SetKey(const MD5Sum &keyhash, bool bSkipDiscard)
 {
 	wxASSERT(!m_hasKey);
 	if (!m_hasKey) {
 		m_hasKey = true;
-		RC4CreateKey( keyhash.GetRawHash(), 16, bSkipDiscard);
+		RC4CreateKey(keyhash.GetRawHash(), 16, bSkipDiscard);
 	} else {
-		throw std::runtime_error( "(CRC4EncryptableBuffer::SetKey): SetKey() has been called twice.");
+		throw std::runtime_error("(CRC4EncryptableBuffer::SetKey): SetKey() has been called twice.");
 	}
 }
 
-
-void CRC4EncryptableBuffer::RC4CreateKey(const uint8* pachKeyData, uint32 nLen, bool bSkipDiscard)
+void CRC4EncryptableBuffer::RC4CreateKey(const uint8 *pachKeyData, uint32 nLen, bool bSkipDiscard)
 {
 	uint8 index1;
 	uint8 index2;
-	uint8* pabyState;
+	uint8 *pabyState;
 
-	pabyState= &m_key.abyState0;
+	pabyState = &m_key.abyState0;
 	for (int i = 0; i < 256; ++i) {
 		pabyStatei = (uint8)i;
 	}

amule-3.0.1.tar.gz/src/RC4Encrypt.h -> amule-3.1.0.tar.gz/src/RC4Encrypt.h Changed

@@ -23,13 +23,11 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#ifndef __RC4ENCRYPT_H__
-#define __RC4ENCRYPT_H__
-
+#ifndef RC4ENCRYPT_H
+#define RC4ENCRYPT_H
 
 #include <vector>
 
-
 #include "Types.h"
 #include <common/StringFunctions.h>
 #include "MemFile.h"
@@ -45,7 +43,6 @@
 	uint8 byY;
 };
 
-
 class CRC4EncryptableBuffer : public CMemFile
 {
 public:
@@ -56,21 +53,21 @@
 	~CRC4EncryptableBuffer();
 
 	// Appends to the end, checking encrypted state.
-	void Append(const uint8* buffer, int n);
+	void Append(const uint8 *buffer, int n);
 
 	// Sets the encryption key
-	void SetKey(const MD5Sum& keyhash, bool bSkipDiscard = false);
+	void SetKey(const MD5Sum &keyhash, bool bSkipDiscard = false);
 
-	// RC4 encrypts the internal buffer. Marks it as encrypted, any other further call
-	// to add data, as Append(), must assert if the inner data is encrypted.
-	// Make sure to check SetKey has been called!
+	// RC4 encrypts the internal buffer and marks it encrypted; any further call adding data,
+	// such as Append(), must assert if the inner data is encrypted. Make sure SetKey has been
+	// called.
 	void Encrypt();
 
 	// RC4 encrypts an external buffer with the current key.
 	void RC4Crypt(const uint8 *pachIn, uint8 *pachOut, uint32 nLen);
 
 	// Returns a uint8* buffer with a copy of the internal data, and clears the internal one.
-	uint8* Detach();
+	uint8 *Detach();
 
 	// Also clears the encryption flag
 	void ResetData();
@@ -83,7 +80,7 @@
 	bool m_hasKey;
 	RC4_Key_Struct m_key;
 
-	void RC4CreateKey(const uint8* pachKeyData, uint32 nLen, bool bSkipDiscard);
+	void RC4CreateKey(const uint8 *pachKeyData, uint32 nLen, bool bSkipDiscard);
 };
 
-#endif // __RC4ENCRYPT_H__
+#endif // RC4ENCRYPT_H

amule-3.0.1.tar.gz/src/RLE.cpp -> amule-3.1.0.tar.gz/src/RLE.cpp Changed

@@ -25,18 +25,16 @@
 #include "RLE.h"
 #include "ArchSpecific.h"
 #include "ScopedPtr.h"
-#include <ec/cpp/ECTag.h>		// Needed for CECTag
+#include <ec/cpp/ECTag.h> // Needed for CECTag
 
-/*
- * RLE encoder implementation. This is RLE implementation for very specific
- * purpose: encode DIFFERENCE between subsequent states of status bar.
+/**
+ * RLE encoder for one specific purpose: encoding the DIFFERENCE between subsequent states of the
+ * status bar, calculated by xor-ing with the previous data.
  *
- * This difference is calculated by xor-ing with previous data
- *
- * We can't use implementation with "control char" since this encoder
- * will process binary data - not ascii (or unicode) strings
+ * A "control char" implementation will not do, since this encoder processes binary data rather than
+ * ascii or unicode strings.
  */
-void RLE_Data::setup(int len, bool use_diff, uint8 * content)
+void RLE_Data::setup(int len, bool use_diff, uint8 *content)
 {
 	m_len = len;
 	m_use_diff = use_diff;
@@ -59,7 +57,7 @@
 	if (this == &obj)
 		return *this;
 
-	delete  m_buff;
+	delete m_buff;
 	setup(obj.m_len, obj.m_use_diff, obj.m_buff);
 
 	return *this;
@@ -67,23 +65,23 @@
 
 RLE_Data::~RLE_Data()
 {
-	delete  m_buff;
+	delete m_buff;
 }
 
 void RLE_Data::ResetEncoder()
 {
-	delete  m_buff;
+	delete m_buff;
 	m_len = 0;
 	m_buff = 0;
 }
 
 bool RLE_Data::Realloc(int size)
 {
-	if ( size == m_len ) {
+	if (size == m_len) {
 		return false;
 	}
 	if (size == 0) {
-		delete  m_buff;
+		delete m_buff;
 		m_buff = 0;
 		m_len = 0;
 		return true;
@@ -91,13 +89,13 @@
 	uint8 *buff = new uint8size;
 	if (m_len == 0) {
 		memset(buff, 0, size);
-	} else if ( size > m_len ) {
+	} else if (size > m_len) {
 		memset(buff + m_len, 0, size - m_len);
 		memcpy(buff, m_buff, m_len);
 	} else {
 		memcpy(buff, m_buff, size);
 	}
-	delete  m_buff;
+	delete m_buff;
 	m_buff = buff;
 
 	m_len = size;
@@ -106,7 +104,9 @@
 
 const uint8 *RLE_Data::Decode(const uint8 *buff, int len)
 {
-	uint8 * decBuf = m_len ? new uint8m_len : 0;
+	// Value-initialise: a truncated encoding can leave the tail unwritten,
+	// so zero-fill rather than XOR/copy uninitialised bytes into m_buff.
+	uint8 *decBuf = m_len ? new uint8m_len() : nullptr;
 
 	// If data exceeds the buffer, switch to counting only.
 	// Then resize and make a second pass.
@@ -114,10 +114,10 @@
 		overrun = false;
 		int j = 0;
 		for (int i = 0; i < len;) {
-			if (i < len - 2 && buffi+1 == buffi) {
+			if (i < len - 2 && buffi + 1 == buffi) {
 				// This is a sequence.
 				uint8 seqLen = buffi + 2;
-				if (j + seqLen <= m_len) {
+				if (decBuf && j + seqLen <= m_len) {
 					memset(decBuf + j, buffi, seqLen);
 				}
 				j += seqLen;
@@ -132,40 +132,45 @@
 			}
 		}
 		if (j != m_len) {
-			overrun = j > m_len;	// overrun, make a second pass
-			Realloc(j);				// size has changed, adjust
+			overrun = j > m_len; // overrun, make a second pass
+			Realloc(j);          // size has changed, adjust
 			if (overrun) {
 				delete decBuf;
-				decBuf = new uint8m_len;
+				decBuf = new uint8m_len();
 			}
 		}
 	}
+	// Recreate data from diff. The two-pass loop above guarantees decBuf's allocation is >= m_len
+	// (on underrun m_len shrinks, decBuf is not reallocated) and every byte in 0, m_len) is
+	// written or zero-init, so the copy below is in-bounds and defined. The path-sensitive
+	// analyzer cannot prove that invariant across the mid-loop Realloc, so it reports
+	// uninitialised / out-of-bounds / null false positives here.
 	//
-	// Recreate data from diff
-	//
-	if ( m_use_diff ) {
-		for (int k = 0; k < m_len; k++) {
-			m_buffk ^= decBufk;
+	// NOLINTBEGIN(clang-analyzer-core.uninitialized.Assign,clang-analyzer-security.ArrayBound,clang-analyzer-core.NonNullParamChecker)
+	if (decBuf) {
+		if (m_use_diff) {
+			for (int k = 0; k < m_len; k++) {
+				m_buffk ^= decBufk;
+			}
+		} else {
+			memcpy(m_buff, decBuf, m_len);
 		}
-	} else {
-		memcpy(m_buff, decBuf, m_len);
 	}
+	// NOLINTEND(clang-analyzer-core.uninitialized.Assign,clang-analyzer-security.ArrayBound,clang-analyzer-core.NonNullParamChecker)
 	delete decBuf;
 	return m_buff;
 }
 
-const uint8 * RLE_Data::Encode(const uint8 *data, int inlen, int &outlen, bool &changed)
+const uint8 *RLE_Data::Encode(const uint8 *data, int inlen, int &outlen, bool &changed)
 {
-	changed = Realloc(inlen);		// adjust size if necessary
+	changed = Realloc(inlen); // adjust size if necessary
 
 	if (m_len <= 0) {
 		outlen = 0;
 		return NULL;
 	}
-	//
 	// calculate difference from prev
-	//
-	if ( m_use_diff ) {
+	if (m_use_diff) {
 		for (int i = 0; i < m_len; i++) {
 			m_buffi ^= datai;
 			if (m_buffi) {
@@ -177,16 +182,14 @@
 		changed = true;
 	}
 
-	//
 	// now RLE
-	//
-	// In worst case 2-byte sequence is encoded as 3. So, data can grow by 50%.
-	uint8 * enc_buff = new uint8static_cast<size_t>(m_len) * 3 / 2 + 1;
+	// In worst case a 2-byte sequence is encoded as 3, so data can grow by 50%.
+	uint8 *enc_buff = new uint8static_cast<size_t>(m_len) * 3 / 2 + 1;
 	int i = 0, j = 0;
-	while ( i != m_len ) {
+	while (i != m_len) {
 		uint8 curr_val = m_buffi;
 		int seq_start = i;
-		while ( (i != m_len) && (curr_val == m_buffi) && ((i - seq_start) < 0xff)) {
+		while ((i != m_len) && (curr_val == m_buffi) && ((i - seq_start) < 0xff)) {
 			i++;
 		}
 		if (i - seq_start > 1) {
@@ -202,48 +205,43 @@
 
 	outlen = j;
 
-	//
-	// If using differential encoder, remember current data for
-	// later use
-	if ( m_use_diff ) {
+	// If using the differential encoder, remember current data for later use.
+	if (m_use_diff) {
 		memcpy(m_buff, data, m_len);
 	}
 
 	return enc_buff;
 }
 
-const uint8 * RLE_Data::Encode(const ArrayOfUInts16 &data, int &outlen, bool &changed)
+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();
+	// 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();
+	uint8 *bufPtr = buf.get();
 
 	for (int i = 0; i < size; i++) {
 		uint16 ui = datai;
-		bufPtri = (ui > 0xff) ? 0xff : (uint8) ui;
+		bufPtri = (ui > 0xff) ? 0xff : (uint8)ui;
 	}
 	return Encode(bufPtr, size, outlen, changed);
 }
 
-const uint8 * RLE_Data::Encode(const ArrayOfUInts64 &data, int &outlen, bool &changed)
+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 initial RLE will benefit from high bytes being equal (zero)
-	// 0x000003045A6A7A8A, 0x000003045B6B7B8B
-	// 8A8B7A7B6A6B5A5B0404030300000000
-	int size = (int) data.size();
+	// uint64 is copied to a uint8 buffer, first all low bytes, then all second low bytes and so
+	// on, so the initial RLE benefits from the 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();
+	uint8 *bufPtr = buf.get();
 	for (int i = 0; i < size; i++) {
 		uint64 u = datai;
 		for (int j = 0; j < 8; j++) {
@@ -256,7 +254,7 @@
 
 void RLE_Data::Decode(const uint8 *data, int len, ArrayOfUInts64 &outdata)
 {
-	const uint8 * decoded = Decode(data, len);
+	const uint8 *decoded = Decode(data, len);
 	wxASSERT(m_len % 8 == 0);
 	int size = m_len / 8;
 	outdata.resize(size);
@@ -270,9 +268,9 @@
 	}
 }
 
-void PartFileEncoderData::DecodeParts(const CECTag * tag, ArrayOfUInts16 &outdata)
+void PartFileEncoderData::DecodeParts(const CECTag *tag, ArrayOfUInts16 &outdata)
 {
-	const uint8 * buf = m_part_status.Decode((uint8 *)tag->GetTagData(), tag->GetTagDataLen());
+	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++) {
@@ -280,15 +278,14 @@
 	}
 }
 
-void PartFileEncoderData::DecodeGaps(const CECTag * tag, ArrayOfUInts64 &outdata)
+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)
+void PartFileEncoderData::DecodeReqs(const CECTag *tag, ArrayOfUInts64 &outdata)
 {
 	m_req_status.Decode((uint8 *)tag->GetTagData(), tag->GetTagDataLen(), outdata);
 }
 
-
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/RLE.h -> amule-3.1.0.tar.gz/src/RLE.h Changed

@@ -25,20 +25,18 @@
 #ifndef RLE_H
 #define RLE_H
 
-
 #include "Types.h"
 
 /*!
- * General purpose RLE implementation. Just encode or create
- * differential data with previous
+ * General purpose RLE implementation. Encodes raw data, or a diff against the previous data.
  */
 class RLE_Data
 {
 public:
-	RLE_Data(int len = 0, bool use_diff = true)	{ setup(len, use_diff); }
+	RLE_Data(int len = 0, bool use_diff = true) { setup(len, use_diff); }
 
 	// those constructors are for stl containers
-	RLE_Data(const RLE_Data & obj)	{ setup(obj.m_len, obj.m_use_diff, obj.m_buff); }
+	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();
@@ -52,27 +50,25 @@
 	void ResetEncoder();
 
 	// decoder will need access to data
-	const uint8 *Buffer() const	{ return m_buff; }
-	int Size() const	{ return m_len; }
+	const uint8 *Buffer() const { return m_buff; }
+	int Size() const { return m_len; }
 
 private:
-	void setup(int len, bool use_diff, uint8 * content = 0);
+	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);
 
-	//
-	// Encode some raw data
+	// 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 occurred,
-	//          so the differential data (before encoding) is not all zero
+	// changed:	true if the size changed, or the data changed 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);
 
 	// Encode: source data (original or diff in diff mode)
@@ -84,11 +80,11 @@
 	bool m_use_diff;
 };
 
-
 /*!
  * Data difference is different for each EC client
  */
-class PartFileEncoderData {
+class PartFileEncoderData
+{
 protected:
 	// number of sources for each part for progress bar colouring
 	RLE_Data m_part_status;
@@ -100,9 +96,21 @@
 public:
 	//
 	// decoder side - can be used everywhere
-	void DecodeParts(const class CECTag * tag, ArrayOfUInts16 &outdata);
-	void DecodeGaps(const class CECTag * tag, ArrayOfUInts64 &outdata);
-	void DecodeReqs(const class CECTag * tag, ArrayOfUInts64 &outdata);
+	void DecodeParts(const class CECTag *tag, ArrayOfUInts16 &outdata);
+	void DecodeGaps(const class CECTag *tag, ArrayOfUInts64 &outdata);
+	void DecodeReqs(const class CECTag *tag, ArrayOfUInts64 &outdata);
+
+	// Drop the retained differential baselines so the next Decode* starts from an empty buffer.
+	// The RLE stream is a diff against the previously decoded state, which is per-EC-connection
+	// on the daemon (CFileEncoderMap). After a reconnect the daemon's encoders restart empty,
+	// so a reused decoder must reset too or every gap/part/req diff XORs against stale data and
+	// paints garbage, e.g. all-red progress bars (aMule #444).
+	void ResetDecoder()
+	{
+		m_part_status.ResetEncoder();
+		m_gap_status.ResetEncoder();
+		m_req_status.ResetEncoder();
+	}
 };
 
 #endif

amule-3.0.1.tar.gz/src/RandomFunctions.cpp -> amule-3.1.0.tar.gz/src/RandomFunctions.cpp Changed

@@ -25,12 +25,15 @@
 // The backtrace functions contain modified code from libYaMa, (c) Venkatesha Murthy G.
 // You can check libYaMa at http://personal.pavanashree.org/libyama/
 
-#include "RandomFunctions.h"	// Interface declarations
-#include "CryptoPP_Inc.h"	// Needed for Crypto functions
+#include "RandomFunctions.h" // Interface declarations
+#include "CryptoPP_Inc.h"    // Needed for Crypto functions
 
 static CryptoPP::AutoSeededRandomPool cryptRandomGen;
 
-const CryptoPP::AutoSeededRandomPool& GetRandomPool() { return cryptRandomGen; }
+const CryptoPP::AutoSeededRandomPool &GetRandomPool()
+{
+	return cryptRandomGen;
+}
 
 uint8_t GetRandomUint8()
 {
@@ -52,13 +55,14 @@
 	return ((uint64_t)GetRandomUint32() << 32) + GetRandomUint32();
 }
 
-namespace Kademlia {
-	CUInt128 GetRandomUint128()
-	{
-		uint8_t randomBytes16;
-		cryptRandomGen.GenerateBlock(randomBytes, 16);
-		return CUInt128(randomBytes);
-	}
+namespace Kademlia
+{
+CUInt128 GetRandomUint128()
+{
+	uint8_t randomBytes16;
+	cryptRandomGen.GenerateBlock(randomBytes, 16);
+	return CUInt128(randomBytes);
 }
+} // namespace Kademlia
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/RandomFunctions.h -> amule-3.1.0.tar.gz/src/RandomFunctions.h Changed

amule-3.0.1.tar.gz/src/RangeMap.h -> amule-3.1.0.tar.gz/src/RangeMap.h Changed

@@ -30,47 +30,29 @@
 
 #include <common/MuleDebug.h>
 
-
-
 /**
  * Default helper structure for normal CRangeMap instantiations.
  *
- * Specializations should must have the following properties.
- *  - The four value typedefs (see comments for details).
- *  - A template-defined member variable named 'first'.
- *  - A comparison operator that doesn't consider the 'first' field.
- *
- *  The typedefs are used to specify the return values of iterators.
+ * A specialization must provide the four value typedefs (which fix the iterators' return types), a
+ * template-defined member named 'first', and a comparison operator that ignores 'first'.
  */
-template <typename VALUE, typename KEYTYPE>
-struct CRangeMapHelper
+template <typename VALUE, typename KEYTYPE> struct CRangeMapHelper
 {
-	//! Typedef specifying the type to use when a non-const pointer is expected.
-	typedef VALUE* ValuePtr;
-	//! Typedef specifying the type to use when a non-const referenecs is expected.
-	typedef VALUE& ValueRef;
-	//! Typedef specifying the type to use when a const referenecs is expected.
-	typedef const VALUE& ConstValueRef;
-	//! Typedef specifying the type to use when a const pointer is expected.
-	typedef const VALUE* ConstValuePtr;
+	typedef VALUE *ValuePtr;
+	typedef VALUE &ValueRef;
+	typedef const VALUE &ConstValueRef;
+	typedef const VALUE *ConstValuePtr;
 
 	//! Used internally by CRangeMap to specify the end of a range.
 	KEYTYPE first;
 	//! Contains the value of a given range.
-	VALUE  second;
+	VALUE second;
 
-	//! Compares the user-values of this range with another.
-	bool operator==(const CRangeMapHelper<VALUE, KEYTYPE>& o) const {
-		return second == o.second;
-	}
+	bool operator==(const CRangeMapHelper<VALUE, KEYTYPE> &o) const { return second == o.second; }
 };
 
-
-/**
- * Helper structure for CRangeSet (CRangeMap with void as value).
- */
-template <typename KEYTYPE>
-struct CRangeMapHelper<void, KEYTYPE>
+/// Helper structure for CRangeSet (CRangeMap with void as value).
+template <typename KEYTYPE> struct CRangeMapHelper<void, KEYTYPE>
 {
 	typedef void ValuePtr;
 	typedef void ValueRef;
@@ -79,133 +61,85 @@
 
 	KEYTYPE first;
 
-	bool operator==(const CRangeMapHelper<void, KEYTYPE>&) const {
-		return true;
-	}
+	bool operator==(const CRangeMapHelper<void, KEYTYPE> &) const { return true; }
 };
 
-
 /**
- * This class represents a map of non-overlapping ranges.
- *
- * Each range has a user-specified value associated. The map supports quick
- * lookup of which range covers a particular key-value, and will merge or
- * split existing ranges when new ranges are added.
- *
- * The decision on whenever to split/resize a range or to merge the two ranges
- * involved is based on equality of the user-specified value, using the
- * equality operator. Thus if two ranges with the same user-value are placed
- * adjacent to each other or partially overlapping each other, then they will
- * be merged into a single range. If the user-values of the two ranges are
- * different, then the old range will be either resized or split, based on the
- * position of the new range.
+ * A map of non-overlapping ranges, each with a user-specified value.
  *
- * In cases where ranges are split into two parts, copies will be made of the
- * user-specified value, such that each new part contains the same user-value.
+ * Supports quick lookup of which range covers a key, and merges or splits existing ranges as new
+ * ones are added. Whether to split/resize or merge is decided by the equality operator on the user
+ * value: two equal-valued ranges that overlap or sit adjacent are merged into one, and if the
+ * values differ the old range is resized or split around the new one. A split copies the user value
+ * into both parts.
  *
- * It is currently not possible to manipulate existing ranges by hand, other
- * than by erasing and then re-inserting them.
+ * Existing ranges cannot be edited in place -- erase and re-insert. A specialization typedef'd as
+ * CRangeSet associates no value with a range.
  *
- * A specialization of this class exists (typedef'd as CRangeSet), which does
- * not associate a value with each range.
- *
- * NOTE: KEYTYPE is assumed to be an unsigned integer type!
+ * NOTE: KEYTYPE is assumed to be an unsigned integer type.
  */
-template <typename VALUE, typename KEYTYPE = uint64>
-class CRangeMap
+template <typename VALUE, typename KEYTYPE = uint64> class CRangeMap
 {
 	typedef CRangeMapHelper<VALUE, KEYTYPE> HELPER;
+
 private:
 	//! The map uses the start-key as key and the User-value and end-key pair as value
 	typedef std::map<KEYTYPE, HELPER> RangeMap;
-	//! Shortcut for the pair used by the RangeMap.
 	typedef std::pair<KEYTYPE, HELPER> RangePair;
 
 	//! Typedefs used to distinguish between our custom iterator and the real ones.
 	typedef typename RangeMap::iterator RangeIterator;
 	typedef typename RangeMap::const_iterator ConstRangeIterator;
 
-	//! The raw map of range values.
-	RangeMap	m_ranges;
+	RangeMap m_ranges;
 
 	/**
-	 * This class provides a wrapper around the raw iterators used by CRangeMap.
-	 *
-	 * It will act as a normal iterator and also give access the the range values.
-	 * When used as a per normal, it will return the value specified by the user
-	 * for that range.
-	 *
-	 * Special member-functions are keyStart() and keyEnd().
+	 * Wraps the raw iterators CRangeMap uses: acts as a normal iterator returning the user
+	 * value for the range, plus keyStart() and keyEnd().
 	 */
-	template <typename RealIterator, typename ReturnTypeRef, typename ReturnTypePtr>
-	class iterator_base {
+	template <typename RealIterator, typename ReturnTypeRef, typename ReturnTypePtr> class iterator_base
+	{
 		friend class CRangeMap<VALUE, KEYTYPE>;
+
 	public:
-		iterator_base( const RealIterator& it )
-			: m_it( it )
+		iterator_base(const RealIterator &it)
+		: m_it(it)
 		{
 		}
 
-		//! Equality operator
-		bool operator==( const iterator_base& other ) const {
-			return m_it == other.m_it;
-		}
-
-		//! Non-equality operator
-		bool operator!=( const iterator_base& other ) const {
-			return m_it != other.m_it;
-		}
+		bool operator==(const iterator_base &other) const { return m_it == other.m_it; }
 
+		bool operator!=(const iterator_base &other) const { return m_it != other.m_it; }
 
 		//! Returns the starting point of the range
-		KEYTYPE keyStart() const {
-			return m_it->first;
-		}
+		KEYTYPE keyStart() const { return m_it->first; }
 
 		//! Returns the end-point of the range
-		KEYTYPE keyEnd() const {
-			return m_it->second.first;
-		}
-
+		KEYTYPE keyEnd() const { return m_it->second.first; }
 
-		//! Prefix increment.
-		iterator_base& operator++() {
+		iterator_base &operator++()
+		{
 			++m_it;
 
 			return *this;
 		}
 
-		//! Postfix increment.
-		iterator_base operator++(int) {
-			return iterator_base( m_it++ );
-		}
-
+		iterator_base operator++(int) { return iterator_base(m_it++); }
 
-		//!  Prefix decrement.
-		iterator_base& operator--() {
+		iterator_base &operator--()
+		{
 			--m_it;
 
 			return *this;
 		}
 
-		//! Postfix decrement.
-		iterator_base operator--(int) {
-			return iterator_base( m_it-- );
-		}
-
+		iterator_base operator--(int) { return iterator_base(m_it--); }
 
-		//! Deference operator, returning the user-specified value.
-		ReturnTypeRef operator*() const {
-			return m_it->second.second;
-		}
+		ReturnTypeRef operator*() const { return m_it->second.second; }
 
-		//! Member access operator, returning the user-specified value.
-		ReturnTypePtr operator->() const {
-			return &m_it->second.second;
-		}
+		ReturnTypePtr operator->() const { return &m_it->second.second; }
 
 	protected:
-		//! The raw iterator
 		RealIterator m_it;
 	};
 
@@ -218,101 +152,57 @@
 	typedef iterator_base<RangeIterator, ValueRef, ValuePtr> iterator;
 	typedef iterator_base<ConstRangeIterator, ConstValueRef, ConstValuePtr> const_iterator;
 
-	//! The type used to specify size, ie size().
 	typedef typename RangeMap::size_type size_type;
 
-	//! The type of user-data saved with each range.
 	typedef VALUE value_type;
 
-	/**
-	 * Default constructor.
-	 */
-	CRangeMap() {
-	}
+	CRangeMap() {}
 
-	/**
-	 * Copy-constructor.
-	 */
-	CRangeMap(const CRangeMap<VALUE, KEYTYPE>& other)
-		: m_ranges( other.m_ranges )
+	CRangeMap(const CRangeMap<VALUE, KEYTYPE> &other)
+	: m_ranges(other.m_ranges)
 	{
 	}
 
-	/**
-	 * Assignment operator.
-	 */
-	CRangeMap& operator=(const CRangeMap<VALUE, KEYTYPE>& other) {
+	CRangeMap &operator=(const CRangeMap<VALUE, KEYTYPE> &other)
+	{
 		m_ranges = other.m_ranges;
 
 		return *this;
 	}
 
-	/**
-	 * Swaps the contents of the two rangemaps.
-	 */
-	void swap(CRangeMap<VALUE, KEYTYPE>& other) {
-		std::swap(m_ranges, other.m_ranges);
-	}
-
+	/// Swaps the contents of the two rangemaps.
+	void swap(CRangeMap<VALUE, KEYTYPE> &other) { std::swap(m_ranges, other.m_ranges); }
 
-	/**
-	 * Equality operator for two ranges.
-	 *
-	 * @returns True if both ranges contain the same ranges and values.
-	 */
-	bool operator==( const CRangeMap<VALUE, KEYTYPE>& other ) const {
-		// Check if we are comparing with ourselves
-		if ( this == &other ) {
+	/// True if both maps hold the same ranges and values.
+	bool operator==(const CRangeMap<VALUE, KEYTYPE> &other) const
+	{
+		if (this == &other) {
 			return true;
 		}
 
-		// Check size, must be the same
-		if ( size() != other.size() ) {
+		if (size() != other.size()) {
 			return false;
 		}
 
 		return (m_ranges == other.m_ranges);
 	}
 
+	/// Iterator to the first range.
+	iterator begin() { return m_ranges.begin(); }
 
-	/**
-	 * Returns an iterator pointing to the first range.
-	 */
-	iterator begin() {
-		return m_ranges.begin();
-	}
-
-	/**
-	 * Returns an iterator pointing past the last range.
-	 */
-	iterator end() {
-		return m_ranges.end();
-	}
-
-	/**
-	 * Returns a const iterator pointing to the first range.
-	 */
-	const_iterator begin() const {
-		return m_ranges.begin();
-	}
+	/// Iterator past the last range.
+	iterator end() { return m_ranges.end(); }
 
-	/**
-	 * Returns a const iterator pointing past the last range.
-	 */
-	const_iterator end() const {
-		return m_ranges.end();
-	}
+	/// Const iterator to the first range.
+	const_iterator begin() const { return m_ranges.begin(); }
 
+	/// Const iterator past the last range.
+	const_iterator end() const { return m_ranges.end(); }
 
-	/**
-	 * Erases the specified range and returns the range next to it.
-	 *
-	 * @param pos The iterator of the range to be erased.
-	 * @return The iterator of the range after the erased range.
-	 *
-	 * Attempting to erase the end() iterator is an invalid operation.
-	 */
-	iterator erase(iterator pos) {
+	/// Erases the range at @a pos and returns the iterator of the range after it. Erasing end()
+	/// is invalid.
+	iterator erase(iterator pos)
+	{
 		MULE_VALIDATE_PARAMS(pos != end(), "Cannot erase 'end'");
 
 		RangeIterator temp = pos.m_it++;
@@ -322,53 +212,28 @@
 		return pos;
 	}
 
+	/// Number of ranges in the map.
+	size_type size() const { return m_ranges.size(); }
 
-	/**
-	 * Returns the number of ranges in the map.
-	 */
-	size_type size() const {
-		return m_ranges.size();
-	}
+	/// True if the map is empty.
+	bool empty() const { return m_ranges.empty(); }
 
-	/**
-	 * Returns true if the map is empty.
-	 */
-	bool empty() const {
-		return m_ranges.empty();
-	}
+	/// Removes all ranges from the map.
+	void clear() { m_ranges.clear(); }
 
-
-	/**
-	 * Removes all ranges from the map.
-	 */
-	void clear() {
-		m_ranges.clear();
-	}
-
-
-	/**
-	 * Returns the range covering the specified key-value.
-	 *
-	 * @param key A value that may or may not be covered by a range.
-	 * @return end() or the iterator of the range covering key.
-	 *
-	 * A range is considered to cover a value if the value is greater than or
-	 * equal to the start-key and less than or equal to the end-key.
-	 */
-	// Find the range which contains key (it->first <= key <= it->second->first)
-	iterator find_range( KEYTYPE key ) {
-		if ( !m_ranges.empty() ) {
+	/// The range covering @a key (it->first <= key <= it->second->first), or end(). A range
+	/// covers a value from its start-key to its end-key inclusive.
+	iterator find_range(KEYTYPE key)
+	{
+		if (!m_ranges.empty()) {
 			// Find first range whose start comes after key
 			// Thus: key < it->first, but (--it)->first <= key
-			RangeIterator it = m_ranges.upper_bound( key );
+			RangeIterator it = m_ranges.upper_bound(key);
 
-			// Our target range must come before the one we found; does it exist?
-			if ( it != m_ranges.begin() ) {
-				// Go back to the last range which starts at or before key
+			if (it != m_ranges.begin()) {
 				--it;
 
-				// Check if this range covers the key
-				if ( key <= it->second.first ) {
+				if (key <= it->second.first) {
 					return it;
 				}
 			}
@@ -377,11 +242,10 @@
 		return end();
 	}
 
-
-	void erase_range(KEYTYPE startPos, KEYTYPE endPos) {
+	void erase_range(KEYTYPE startPos, KEYTYPE endPos)
+	{
 		// Create default initialized entry, which ensures that all fields are initialized.
 		HELPER entry = HELPER();
-		// Need to set the 'end' field.
 		entry.first = endPos;
 
 		// Insert without merging, which forces the creation of an entry that
@@ -389,101 +253,88 @@
 		erase(do_insert(startPos, entry, false));
 	}
 
-
 	/**
-	 * Inserts a new range into the map, potentially erasing/changing old ranges.
-	 *
-	 * @param startPos The start position of the range, also considered part of the range.
-	 * @param endPos The end position of the range, also considered part of the range.
-	 * @param object The user-data to be associated with the range.
-	 * @return An iterator pointing to the resulting range, covering at least the specified range.
+	 * Inserts a new range, overwriting or resizing existing ranges on conflict.
 	 *
-	 * This function inserts the specified range into the map, while overwriting
-	 * or resizing existing ranges if there is any conflict. Ranges might also
-	 * be merged, if the object of each evaluates to being equal, in which case
-	 * the old range will be removed and the new extended to include the old
-	 * range. This also includes ranges placed directly after or in front of each
-	 * other, which will also be merged if their type is the same.
+	 * @param startPos Start of the range, inclusive. Must be <= endPos.
+	 * @param endPos End of the range, inclusive.
+	 * @param object The user-data to associate with the range.
+	 * @return An iterator covering at least the specified range.
 	 *
-	 * This has the result that the iterator returned can point to a range quite
-	 * different from what was originally specified. If this is not desired, then
-	 * the VALUE type should simply be made to return false on all equality tests.
-	 * Otherwise, the only promise that is made is that the resulting range has
-	 * the same user-data (based on the equality operator) as the what was specified.
-	 *
-	 * Note that the start position must be smaller than or equal to the end-position.
+	 * Ranges whose objects compare equal are merged, including ones placed directly before or
+	 * after each other, so the iterator returned can point to a range quite different from the one
+	 * specified. Make VALUE compare unequal always if that is unwanted; otherwise the only promise
+	 * is that the resulting range carries the same user-data.
 	 */
 	//@{
-	iterator insert(KEYTYPE startPos, KEYTYPE endPos) {
-		HELPER entry = {endPos};
+	iterator insert(KEYTYPE startPos, KEYTYPE endPos)
+	{
+		HELPER entry = { endPos };
 		return do_insert(startPos, entry);
 	}
-	template <typename TYPE>
-	iterator insert(KEYTYPE startPos, KEYTYPE endPos, const TYPE& value) {
-		HELPER entry = {endPos, value};
+	template <typename TYPE> iterator insert(KEYTYPE startPos, KEYTYPE endPos, const TYPE &value)
+	{
+		HELPER entry = { endPos, value };
 		return do_insert(startPos, entry);
 	}
 	//@}
 
 protected:
-	/**
-	 * Inserts the specified range.
-	 *
-	 * @param start The starting position of the range.
-	 * @param entry A helper-struct, containing the end position and possibly user-data.
-	 * @param merge Specifies if ranges should be merged when possible.
-	 * @return An iterator pointing to the range covering at least the specified range.
-	 */
-	iterator do_insert(KEYTYPE start, HELPER entry, bool merge = true) {
+	/// Inserts the range starting at @a start and described by @a entry (end position and any
+	/// user-data), merging with neighbours when @a merge. Returns an iterator covering at least
+	/// that range.
+	iterator do_insert(KEYTYPE start, HELPER entry, bool merge = true)
+	{
 		MULE_VALIDATE_PARAMS(start <= entry.first, "Not a valid range.");
 
 		RangeIterator it = get_insert_it(start);
-		while ( it != m_ranges.end() ) {
+		while (it != m_ranges.end()) {
 			// Begins before the current span
-			if ( start <= it->first ) {
+			if (start <= it->first) {
 				// Never touches the current span, it follows that start < it->first
 				// (it->first) is used to avoid checking against (uintXX)-1 by accident
-				if ( entry.first < it->first - 1 && it->first ) {
+				if (entry.first < it->first - 1 && it->first) {
 					break;
 				}
 
 				// Stops just before the current span, it follows that start < it->first
 				// (it->first) is used to avoid checking against (uintXX)-1 by accident
-				else if ( entry.first == it->first - 1 && it->first ) {
+				else if (entry.first == it->first - 1 && it->first) {
 					// If same type: Merge
 					if (merge && (entry == it->second)) {
 						entry.first = it->second.first;
-						m_ranges.erase( it++ );
+						m_ranges.erase(it++);
 					}
 
 					break;
 				}
 
 				// Covers part of the span
-				else if ( entry.first < it->second.first ) {
+				else if (entry.first < it->second.first) {
 					// Same type, merge
 					if (merge && (entry == it->second)) {
 						entry.first = it->second.first;
-						m_ranges.erase( it++ );
+						m_ranges.erase(it++);
 					} else {
 						// Resize the partially covered span and get the next one
-						it = ++resize( entry.first + 1, it->second.first, it );
+						it = ++resize(entry.first + 1, it->second.first, it);
 					}
 
 					break;
 				} else {
 					// It covers the entire span
-					m_ranges.erase( it++ );
+					m_ranges.erase(it++);
 				}
 			}
 
 			// Starts inside the current span or after the current span
 			else {
 				// Starts inside the current span
-				if ( start <= it->second.first ) {
+				if (start <= it->second.first) {
 					// Ends inside the current span
-					if ( entry.first < it->second.first ) {
-						// Adding a span with same type inside a existing span is fruitless
+					if (entry.first < it->second.first) {
+						// Adding a span with same type inside a existing span is
+						// fruitless
 						if (merge && (entry == it->second)) {
 							return it;
 						}
@@ -499,19 +350,20 @@
 						// Ends past the current span, resize or merge
 						if (merge && (entry == it->second)) {
 							start = it->first;
-							m_ranges.erase( it++ );
+							m_ranges.erase(it++);
 						} else {
-							// Resize the partially covered span and get the next one
-							it = ++resize( it->first, start - 1, it );
+							// Resize the partially covered span and get the next
+							// one
+							it = ++resize(it->first, start - 1, it);
 						}
 					}
 				} else {
 					// Start past the current span
-					if ( start == it->second.first + 1 ) {
+					if (start == it->second.first + 1) {
 						// Touches the current span
 						if (merge && (entry == it->second)) {
 							start = it->first;
-							m_ranges.erase( it++ );
+							m_ranges.erase(it++);
 						} else {
 							++it;
 						}
@@ -526,30 +378,26 @@
 		return m_ranges.insert(it, RangePair(start, entry));
 	}
 
-
-	/**
-	 * Finds the optimal location to start looking for insertion points.
-	 *
-	 * This is the first range whose start comes after the new start. We check
-	 * the last element first, since sequential insertions are common.
-	 */
+	/// Finds the optimal place to start looking for insertion points: the first range whose
+	/// start comes after the new start. The last element is checked first, since sequential
+	/// insertions are common.
 	RangeIterator get_insert_it(KEYTYPE start)
 	{
-		if ( m_ranges.empty() ) {
+		if (m_ranges.empty()) {
 			return m_ranges.end();
 		}
 
 		// The start-key of the last element must be smaller than our start-key
 		// Otherwise there is the possibility that we can merge with the one before that
 		RangeIterator it = --m_ranges.end();
-		if ( start <= it->first ) {
+		if (start <= it->first) {
 			// If the two starts are equal, then we only need to go back another
 			// step to see if the range prior to this one is mergeable
-			if ( start != it->first ) {
-				it = m_ranges.lower_bound( start );
+			if (start != it->first) {
+				it = m_ranges.lower_bound(start);
 			}
 
-			if ( it != m_ranges.begin() ) {
+			if (it != m_ranges.begin()) {
 				// Go back to the last range which starts at or before key
 				--it;
 			}
@@ -558,34 +406,30 @@
 		return it;
 	}
 
-
 	//! Helper function that resizes an existing range to the specified size.
-	RangeIterator resize( KEYTYPE startPos, KEYTYPE endPos, RangeIterator it ) {
+	RangeIterator resize(KEYTYPE startPos, KEYTYPE endPos, RangeIterator it)
+	{
 		HELPER item = it->second;
 		item.first = endPos;
 
-		m_ranges.erase( it++ );
+		m_ranges.erase(it++);
 
 		return m_ranges.insert(it, RangePair(startPos, item));
 	}
 };
 
-
 //! CRangeSet is simply a partial specialization of CRangeMap
 typedef CRangeMap<void> CRangeSet;
 
-
 namespace std
 {
-	/** @see CRangeMap::swap */
-	template <typename VALUE_TYPE, typename KEY_TYPE>
-	void swap(CRangeMap<VALUE_TYPE, KEY_TYPE>& a, CRangeMap<VALUE_TYPE, KEY_TYPE>& b)
-	{
-		a.swap(b);
-	}
+/** @see CRangeMap::swap */
+template <typename VALUE_TYPE, typename KEY_TYPE>
+void swap(CRangeMap<VALUE_TYPE, KEY_TYPE> &a, CRangeMap<VALUE_TYPE, KEY_TYPE> &b)
+{
+	a.swap(b);
 }
-
-
+} // namespace std
 
 #endif
 // File_checked_for_headers

amule-3.1.0.tar.gz/src/ReservedProtocolFrames.h Added

@@ -0,0 +1,171 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 RESERVEDPROTOCOLFRAMES_H
+#define RESERVEDPROTOCOLFRAMES_H
+
+#include <cstddef>
+#include <cstdint>
+
+#include <protocol/Protocols.h> // Needed for the OP_NATT_FRAME_* frame types
+
+/**
+ * Demultiplexing for OP_UDPRESERVEDPROT2 (0xB2).
+ *
+ * Unlike every other UDP protocol byte aMule handles, 0xB2 carries no eD2k opcode. The byte after
+ * the protocol byte is a frame type and the rest is that frame's payload, which is why this cannot
+ * go through CClientUDPSocket::ProcessPacket -- that function's second argument is an opcode and
+ * these are not opcodes.
+ *
+ * The classification lives here rather than in CClientUDPSocket because CClientUDPSocket needs
+ * theApp and cannot be linked into a unit test, and because the two things worth getting wrong --
+ * the truncation guard and the unknown-type drop -- are exactly the two that never produce a
+ * visible symptom when they are wrong.
+ */
+
+//! What the caller should do with an OP_UDPRESERVEDPROT2 frame.
+enum EReservedProt2Disposition
+{
+	//! No frame-type byte to read. Drop; do not read the window.
+	RP2_TRUNCATED,
+	//! One of the five registered types. Dispatch on SReservedProt2Frame::type.
+	RP2_KNOWN_TYPE,
+	//! Not a type this protocol defines. Drop.
+	RP2_UNKNOWN_TYPE
+};
+
+/**
+ * A classified frame. `payload` and `payloadLength` describe the bytes after the type byte and are
+ * only meaningful for RP2_KNOWN_TYPE. A zero-length payload is legitimate -- only the type byte is
+ * mandatory, and each handler decides what it needs.
+ */
+struct SReservedProt2Frame
+{
+	EReservedProt2Disposition disposition;
+	uint8_t type;
+	const uint8_t *payload;
+	size_t payloadLength;
+};
+
+/**
+ * Classify an OP_UDPRESERVEDPROT2 frame.
+ *
+ * @param frame points at the frame-type byte, i.e. one past the protocol byte of the datagram. May
+ * be NULL when frameLength is 0.
+ * @param frameLength bytes available from `frame` onwards. Zero is the datagram that carried
+ * nothing but the protocol byte; the type byte is never read in that case.
+ *
+ * Reads nothing beyond frame0 and never writes through `frame`. The caller must not count a
+ * dropped frame against any flood or ban threshold: this function reaches no accounting of its own,
+ * and CPacketTracking is only entered from the Kad listener, so a drop here is exempt by placement.
+ */
+inline SReservedProt2Frame ClassifyReservedProt2Frame(const uint8_t *frame, size_t frameLength)
+{
+	SReservedProt2Frame result = { RP2_TRUNCATED, 0, nullptr, 0 };
+
+	if (frame == nullptr || frameLength == 0) {
+		return result;
+	}
+
+	result.type = frame0;
+	result.payload = frame + 1;
+	result.payloadLength = frameLength - 1;
+
+	switch (result.type) {
+	case OP_NATT_FRAME_UTP:
+	case OP_NATT_FRAME_QUIC:
+	case OP_NATT_FRAME_CAPS:
+	case OP_NATT_FRAME_CAPS_ACK:
+	case OP_NATT_FRAME_KEY:
+		result.disposition = RP2_KNOWN_TYPE;
+		break;
+	default:
+		result.disposition = RP2_UNKNOWN_TYPE;
+		break;
+	}
+
+	return result;
+}
+
+/**
+ * Keeps an unknown-frame flood from becoming a log flood.
+ *
+ * A peer speaking a frame type this build does not know sends one per connection attempt and
+ * retries, so the interesting information is "it happened" plus a count -- not one line each. Logs
+ * the first occurrence, then at most one per interval, reporting how many were suppressed in
+ * between.
+ *
+ * Not thread-safe, and does not need to be: the client UDP socket's receive path is posted to the
+ * main thread.
+ */
+class CFrameLogThrottle
+{
+public:
+	//! @param intervalMs minimum gap between two logged lines.
+	explicit CFrameLogThrottle(uint64_t intervalMs)
+	: m_intervalMs(intervalMs)
+	{
+	}
+
+	/**
+	 * @param nowMs a millisecond tick count. @return true when the caller should log. A tick
+	 * count that appears to move backwards opens the window rather than closing it: the
+	 * alternative is silence until the clock catches up, which on a 64-bit wrap would be
+	 * forever.
+	 */
+	bool ShouldLog(uint64_t nowMs)
+	{
+		if (!m_everLogged || nowMs < m_lastLoggedMs || nowMs - m_lastLoggedMs >= m_intervalMs) {
+			m_everLogged = true;
+			m_lastLoggedMs = nowMs;
+			// The live counter is moved aside here rather than in
+			// TakeSuppressedCount(), so it is reset even in a build where the debug log
+			// line it feeds compiles away.
+			m_reportable = m_suppressed;
+			m_suppressed = 0;
+			return true;
+		}
+
+		++m_suppressed;
+		return false;
+	}
+
+	//! How many occurrences were dropped since the previous logged line.
+	//! Reads the snapshot ShouldLog() took, so the number is reported once.
+	uint32_t TakeSuppressedCount()
+	{
+		const uint32_t suppressed = m_reportable;
+		m_reportable = 0;
+		return suppressed;
+	}
+
+private:
+	uint64_t m_intervalMs;
+	uint64_t m_lastLoggedMs = 0;
+	uint32_t m_suppressed = 0;
+	uint32_t m_reportable = 0;
+	bool m_everLogged = false;
+};
+
+#endif // RESERVEDPROTOCOLFRAMES_H

amule-3.0.1.tar.gz/src/SHA.cpp -> amule-3.1.0.tar.gz/src/SHA.cpp Changed

@@ -22,225 +22,48 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
-// Kry - Modified version of the original SHA.cpp to work on linux and
-// use wxWidgets. Original license follows.
-//
-
-/*
- ---------------------------------------------------------------------------
- Copyright (c) 2002-2011 Dr Brian Gladman ( brg@gladman.me.uk )
- All rights reserved.
-
- LICENSE TERMS
-
- The free distribution and use of this software in both source and binary
- form is allowed (with or without changes) provided that:
-
-   1. distributions of this source code include the above copyright
-      notice, this list of conditions and the following disclaimer;
-
-   2. distributions in binary form include the above copyright
-      notice, this list of conditions and the following disclaimer
-      in the documentation and/or other associated materials;
-
-   3. the copyright holder's name is not used to endorse products
-      built using this software without specific written permission.
-
- ALTERNATIVELY, provided that this notice is retained in full, this product
- may be distributed under the terms of the GNU General Public License (GPL),
- in which case the provisions of the GPL apply INSTEAD OF those given above.
-
- DISCLAIMER
-
- This software is provided 'as is' with no explicit or implied warranties
- in respect of its properties, including, but not limited to, correctness
- and/or fitness for purpose.
- ---------------------------------------------------------------------------
- Issue Date: 30/11/2002
-
- This is a byte oriented version of SHA1 that operates on arrays of bytes
- stored in memory. It runs at 22 cycles per byte on a Pentium P4 processor
-*/
 
 #include "SHA.h"
 
-
 CSHA::CSHA()
 {
 	Reset();
 }
 
-/*
-    To obtain the highest speed on processors with 32-bit words, this code
-    needs to determine the order in which bytes are packed into such words.
-    The following block of code is an attempt to capture the most obvious
-    ways in which various environments specify their endian definitions.
-    It may well fail, in which case the definitions will need to be set by
-    editing at the points marked **** EDIT HERE IF NECESSARY **** below.
-*/
-#define SHA_LITTLE_ENDIAN   1234 /* byte 0 is least significant (i386) */
-#define SHA_BIG_ENDIAN      4321 /* byte 0 is most significant (mc68k) */
-
-#define rotl32(x,n) (((x) << n) | ((x) >> (32 - n)))
-
-#if (wxBYTE_ORDER == wxBIG_ENDIAN)
-#define swap_b32(x) (x)
-#elif defined(bswap_32)
-#define swap_b32(x) bswap_32(x)
-#else
-#define swap_b32(x) ((rotl32((x), 8) & 0x00ff00ff) | (rotl32((x), 24) & 0xff00ff00))
-#endif
-
-#define SHA1_MASK   (SHA1_BLOCK_SIZE - 1)
-
-/* reverse byte order in 32-bit words   */
-
-#define ch(x,y,z)       (((x) & (y)) ^ (~(x) & (z)))
-#define parity(x,y,z)   ((x) ^ (y) ^ (z))
-#define maj(x,y,z)      (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-
-/* A normal version as set out in the FIPS. This version uses   */
-/* partial loop unrolling and is optimised for the Pentium 4    */
-
-#define rnd(f,k) t = a; a = rotl32(a,5) + f(b,c,d) + e + k + wi; e = d; d = c; c = rotl32(b, 30); b = t
-
-void CSHA::Compile()
+void CSHA::Reset()
 {
-	uint32    w80, i, a, b, c, d, e, t;
-
-    /* note that words are compiled from the buffer into 32-bit */
-    /* words in big-endian order so an order reversal is needed */
-    /* here on little endian machines                           */
-    for(i = 0; i < SHA1_BLOCK_SIZE / 4; ++i)
-        wi = swap_b32(m_nBufferi);
-
-    for(i = SHA1_BLOCK_SIZE / 4; i < 80; ++i)
-        wi = rotl32(wi - 3 ^ wi - 8 ^ wi - 14 ^ wi - 16, 1);
-
-    a = m_nHash0;
-    b = m_nHash1;
-    c = m_nHash2;
-    d = m_nHash3;
-    e = m_nHash4;
-
-    for(i = 0; i < 20; ++i)
-    {
-        rnd(ch, 0x5a827999);
-    }
-
-    for(i = 20; i < 40; ++i)
-    {
-        rnd(parity, 0x6ed9eba1);
-    }
-
-    for(i = 40; i < 60; ++i)
-    {
-        rnd(maj, 0x8f1bbcdc);
-    }
-
-    for(i = 60; i < 80; ++i)
-    {
-        rnd(parity, 0xca62c1d6);
-    }
-
-    m_nHash0 += a;
-    m_nHash1 += b;
-    m_nHash2 += c;
-    m_nHash3 += d;
-    m_nHash4 += e;
+	m_hash = SHA1Digest();
+	m_sha.Restart();
 }
 
-void CSHA::Reset()
+void CSHA::GetHash(SHA1Digest *pHash) const
 {
-    m_nCount0 = m_nCount1 = 0;
-    m_nHash0 = 0x67452301;
-    m_nHash1 = 0xefcdab89;
-    m_nHash2 = 0x98badcfe;
-    m_nHash3 = 0x10325476;
-    m_nHash4 = 0xc3d2e1f0;
+	*pHash = m_hash;
 }
 
-void CSHA::GetHash(CAICHHash& Hash)
+void CSHA::Add(const void *pData, uint32 nLength)
 {
-    /* extract the hash value as bytes in case the hash buffer is   */
-    /* misaligned for 32-bit words*/
-
-	wxASSERT( Hash.GetHashSize() == 20 );
-    for(int i = 0; i < SHA1_DIGEST_SIZE; ++i)
-        Hash.GetRawHash()i = (unsigned char)(m_nHashi >> 2 >> 8 * (~i & 3));
+	// Crypto++'s byte is always `unsigned char`; spell it that way rather than CryptoPP::byte,
+	// which only exists from Crypto++ 5.6.5+ (issue #449, a build failure on 5.6.4). unsigned
+	// char* binds to the byte* API parameter on every version.
+	m_sha.Update(static_cast<const unsigned char *>(pData), nLength);
 }
 
-/* SHA1 hash data in an array of bytes into hash buffer and call the        */
-/* hash_compile function as required.                                       */
-
-void CSHA::Add(const void* pData, uint32 nLength)
+void CSHA::Finish()
 {
-	const unsigned char* data = (const unsigned char*)pData;
-
-	uint32 pos = (uint32)(m_nCount0 & SHA1_MASK),
-             space = SHA1_BLOCK_SIZE - pos;
-    const unsigned char *sp = data;
-
-    if((m_nCount0 += nLength) < nLength)
-        ++(m_nCount1);
-
-    while(nLength >= space)     /* transfer whole blocks while possible  */
-    {
-        memcpy(((unsigned char*)m_nBuffer) + pos, sp, space);
-        sp += space; nLength -= space; space = SHA1_BLOCK_SIZE; pos = 0;
-        Compile();
-    }
-
-    memcpy(((unsigned char*)m_nBuffer) + pos, sp, nLength);
+	m_sha.Final(m_hash.b);
 }
 
-/* SHA1 final padding and digest calculation  */
-
-#if (wxBYTE_ORDER == wxLITTLE_ENDIAN)
-static uint32  mask4 =
-	{   0x00000000, 0x000000ff, 0x0000ffff, 0x00ffffff };
-static uint32  bits4 =
-	{   0x00000080, 0x00008000, 0x00800000, 0x80000000 };
-#else
-static uint32  mask4 =
-	{   0x00000000, 0xff000000, 0xffff0000, 0xffffff00 };
-static uint32  bits4 =
-	{   0x80000000, 0x00800000, 0x00008000, 0x00000080 };
-#endif
-
-void CSHA::Finish(CAICHHash& Hash)
+void CSHA::GetHash(CAICHHash &rHash)
 {
-	uint32    i = (uint32)(m_nCount0 & SHA1_MASK);
-
-    /* mask out the rest of any partial 32-bit word and then set    */
-    /* the next byte to 0x80. On big-endian machines any bytes in   */
-    /* the buffer will be at the top end of 32 bit words, on little */
-    /* endian machines they will be at the bottom. Hence the AND    */
-    /* and OR masks above are reversed for little endian systems    */
-	/* Note that we can always add the first padding byte at this	*/
-	/* because the buffer always contains at least one empty slot	*/
-    m_nBufferi >> 2 = (m_nBufferi >> 2 & maski & 3) | bitsi & 3;
-
-    /* we need 9 or more empty positions, one for the padding byte  */
-    /* (above) and eight for the length count.  If there is not     */
-    /* enough space pad and empty the buffer                        */
-    if(i > SHA1_BLOCK_SIZE - 9)
-    {
-        if(i < 60) m_nBuffer15 = 0;
-        Compile();
-        i = 0;
-    }
-    else    /* compute a word index for the empty buffer positions  */
-        i = (i >> 2) + 1;
-
-    while(i < 14) /* and zero pad all but last two positions      */
-        m_nBufferi++ = 0;
-
-    /* assemble the eight byte counter in in big-endian format		*/
-    m_nBuffer14 = swap_b32((m_nCount1 << 3) | (m_nCount0 >> 29));
-    m_nBuffer15 = swap_b32(m_nCount0 << 3);
+	wxASSERT(rHash.GetHashSize() == sizeof(SHA1Digest));
+	GetHash((SHA1Digest *)rHash.GetRawHash());
+}
 
-    Compile();
-	GetHash(Hash);
+void CSHA::Finish(CAICHHash &rHash)
+{
+	Finish();
+	GetHash(rHash);
 }
+
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/SHA.h -> amule-3.1.0.tar.gz/src/SHA.h Changed

@@ -22,73 +22,42 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
-// Kry - Modified version of the original SHA.cpp to work on linux and
-// use wxWidgets. Original license follows.
-//
-
-/*
- ---------------------------------------------------------------------------
- Copyright (c) 2002-2011 Dr Brian Gladman ( brg@gladman.me.uk )
- All rights reserved.
-
- LICENSE TERMS
-
- The free distribution and use of this software in both source and binary
- form is allowed (with or without changes) provided that:
-
-   1. distributions of this source code include the above copyright
-      notice, this list of conditions and the following disclaimer;
-
-   2. distributions in binary form include the above copyright
-      notice, this list of conditions and the following disclaimer
-      in the documentation and/or other associated materials;
-
-   3. the copyright holder's name is not used to endorse products
-      built using this software without specific written permission.
-
- ALTERNATIVELY, provided that this notice is retained in full, this product
- may be distributed under the terms of the GNU General Public License (GPL),
- in which case the provisions of the GPL apply INSTEAD OF those given above.
-
- DISCLAIMER
 
- This software is provided 'as is' with no explicit or implied warranties
- in respect of its properties, including, but not limited to, correctness
- and/or fitness for purpose.
- ---------------------------------------------------------------------------
- Issue Date: 30/11/2002
+#ifndef SHA_H
+#define SHA_H
 
- This is a byte oriented version of SHA1 that operates on arrays of bytes
- stored in memory. It runs at 22 cycles per byte on a Pentium P4 processor
-*/
+#include "SHAHashSet.h"
+#include "CryptoPP_Inc.h"
 
-#ifndef __SHA_H__
-#define __SHA_H__
+#define SHA1_DIGEST_SIZE 20
 
-#include "SHAHashSet.h"
+typedef struct
+{
+	uint8 bSHA1_DIGEST_SIZE;
+} SHA1Digest;
 
 class CSHA : public CAICHHashAlgo
 {
-// Construction
+
+	// Construction
+
 public:
 	CSHA();
 	virtual ~CSHA() {};
-// Operations
+	// Operations
+
 public:
-	virtual void	Reset();
-	virtual void	Add(const void* pData, uint32 nLength);
-	virtual void	Finish(CAICHHash& Hash);
-	virtual void	GetHash(CAICHHash& Hash);
-protected:
-	void			Compile();
+	virtual void Reset();
+	virtual void Add(const void *pData, uint32 nLength);
+	virtual void Finish(CAICHHash &Hash);
+	virtual void GetHash(CAICHHash &Hash);
+	void GetHash(SHA1Digest *pHash) const;
+	void Finish();
+
 private:
-	uint32	m_nCount2;
-	uint32	m_nHash5;
-	uint32	m_nBuffer16;
+	CryptoPP::SHA1 m_sha;
+	SHA1Digest m_hash;
 };
 
-#define SHA1_BLOCK_SIZE		64
-#define SHA1_DIGEST_SIZE	20
-
-#endif // __SHA_H__
+#endif // SHA_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/SHAHashSet.cpp -> amule-3.1.0.tar.gz/src/SHAHashSet.cpp Changed

@@ -37,40 +37,36 @@
 #include "Logger.h"
 #include <common/Format.h>
 
-
-
-// for this version the limits are set very high, they might be lowered later
-// to make a hash trustworthy, at least 10 unique Ips (255.255.128.0) must have sent it
-// and if we have received more than one hash  for the file, one hash has to be sent by more than 95% of all unique IPs
-#define MINUNIQUEIPS_TOTRUST		10	// how many unique IPs have to send us a hash to make it trustworthy
-#define	MINPERCENTAGE_TOTRUST		92  // how many percentage of clients have to send the same hash to make it trustworthy
+// The limits are set very high for this version and may be lowered later: to make a hash
+// trustworthy, at least 10 unique IPs (255.255.128.0) must have sent it, and if we received more
+// than one hash for the file, one hash has to come from more than 95% of all unique IPs.
+#define MINUNIQUEIPS_TOTRUST 10 // how many unique IPs have to send us a hash to make it trustworthy
+#define MINPERCENTAGE_TOTRUST \
+	92 // how many percentage of clients have to send the same hash to make it trustworthy
 
 CAICHRequestedDataList CAICHHashSet::m_liRequestedData;
 
-// Lazily-built index mapping root hash → file offset in known2.met.
-// See SaveHashSet (dedup-on-append) and LoadHashSet (O(1) lookup for
-// incoming AICH requests) for usage.
+// Lazily-built index mapping root hash to file offset in known2.met. See SaveHashSet (dedup-on-
+// append) and LoadHashSet (O(1) lookup for incoming AICH requests) for usage.
 wxMutex CAICHHashSet::s_rootHashCacheMutex;
 std::unordered_map<CAICHHash, uint64> CAICHHashSet::s_rootHashCache;
 bool CAICHHashSet::s_rootHashCacheLoaded = false;
 
 /////////////////////////////////////////////////////////////////////////////////////////
-///CAICHHash
+/// CAICHHash
 wxString CAICHHash::GetString() const
 {
 	return EncodeBase32(m_abyBuffer, HASHSIZE);
 }
 
-
-void CAICHHash::Read(CFileDataIO* file)
+void CAICHHash::Read(CFileDataIO *file)
 {
-	file->Read(m_abyBuffer,HASHSIZE);
+	file->Read(m_abyBuffer, HASHSIZE);
 }
 
-
-void CAICHHash::Write(CFileDataIO* file) const
+void CAICHHash::Write(CFileDataIO *file) const
 {
-	file->Write(m_abyBuffer,HASHSIZE);
+	file->Write(m_abyBuffer, HASHSIZE);
 }
 
 unsigned int CAICHHash::DecodeBase32(const wxString &base32)
@@ -78,9 +74,8 @@
 	return ::DecodeBase32(base32, HASHSIZE, m_abyBuffer);
 }
 
-
 /////////////////////////////////////////////////////////////////////////////////////////
-///CAICHHashTree
+/// CAICHHashTree
 
 CAICHHashTree::CAICHHashTree(uint64 nDataSize, bool bLeftBranch, uint64 nBaseSize)
 {
@@ -92,16 +87,14 @@
 	m_bHashValid = false;
 }
 
-
 CAICHHashTree::~CAICHHashTree()
 {
 	delete m_pLeftTree;
 	delete m_pRightTree;
 }
 
-
 // recursive
-CAICHHashTree* CAICHHashTree::FindHash(uint64 nStartPos, uint64 nSize, uint8* nLevel)
+CAICHHashTree *CAICHHashTree::FindHash(uint64 nStartPos, uint64 nSize, uint8 *nLevel)
 {
 	(*nLevel)++;
 
@@ -110,15 +103,14 @@
 	wxCHECK(nSize <= m_nDataSize, NULL);
 
 	if (nStartPos == 0 && nSize == m_nDataSize) {
-		// this is the searched hash
 		return this;
 	} else if (m_nDataSize <= m_nBaseSize) { // sanity
 		// this is already the last level, can't go deeper
 		wxFAIL;
 		return NULL;
 	} else {
-		uint64 nBlocks = m_nDataSize / m_nBaseSize + ((m_nDataSize % m_nBaseSize != 0 )? 1:0);
-		uint64 nLeft = (((m_bIsLeftBranch) ? nBlocks+1:nBlocks) / 2)* m_nBaseSize;
+		uint64 nBlocks = m_nDataSize / m_nBaseSize + ((m_nDataSize % m_nBaseSize != 0) ? 1 : 0);
+		uint64 nLeft = (((m_bIsLeftBranch) ? nBlocks + 1 : nBlocks) / 2) * m_nBaseSize;
 		uint64 nRight = m_nDataSize - nLeft;
 		if (nStartPos < nLeft) {
 			if (nStartPos + nSize > nLeft) { // sanity
@@ -127,9 +119,10 @@
 			}
 
 			if (m_pLeftTree == NULL) {
-				m_pLeftTree = new CAICHHashTree(nLeft, true, (nLeft <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
+				m_pLeftTree = new CAICHHashTree(
+					nLeft, true, (nLeft <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
 			} else {
-				wxASSERT( m_pLeftTree->m_nDataSize == nLeft );
+				wxASSERT(m_pLeftTree->m_nDataSize == nLeft);
 			}
 
 			return m_pLeftTree->FindHash(nStartPos, nSize, nLevel);
@@ -141,9 +134,10 @@
 			}
 
 			if (m_pRightTree == NULL) {
-				m_pRightTree = new CAICHHashTree(nRight, false, (nRight <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
+				m_pRightTree = new CAICHHashTree(
+					nRight, false, (nRight <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
 			} else {
-				wxASSERT( m_pRightTree->m_nDataSize == nRight );
+				wxASSERT(m_pRightTree->m_nDataSize == nRight);
 			}
 
 			return m_pRightTree->FindHash(nStartPos, nSize, nLevel);
@@ -151,15 +145,13 @@
 	}
 }
 
-
-// recursive
-// 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)
+// Recursive: calculates the missing hash from the existing ones, overwriting existing hashes. Fails
+// if no hash is found for any branch.
+bool CAICHHashTree::ReCalculateHash(CAICHHashAlgo *hashalg, bool bDontReplace)
 {
 	if (m_pLeftTree && m_pRightTree) {
-		if ( !m_pLeftTree->ReCalculateHash(hashalg, bDontReplace) || !m_pRightTree->ReCalculateHash(hashalg, bDontReplace) ) {
+		if (!m_pLeftTree->ReCalculateHash(hashalg, bDontReplace) ||
+			!m_pRightTree->ReCalculateHash(hashalg, bDontReplace)) {
 			return false;
 		}
 		if (bDontReplace && m_bHashValid) {
@@ -183,7 +175,7 @@
 	}
 }
 
-bool CAICHHashTree::VerifyHashTree(CAICHHashAlgo* hashalg, bool bDeleteBadTrees)
+bool CAICHHashTree::VerifyHashTree(CAICHHashAlgo *hashalg, bool bDeleteBadTrees)
 {
 	if (!m_bHashValid) {
 		wxFAIL;
@@ -201,31 +193,31 @@
 		return false;
 	}
 
-		// calculated missing hashs without overwriting anything
-		if (m_pLeftTree && !m_pLeftTree->m_bHashValid) {
-			m_pLeftTree->ReCalculateHash(hashalg, true);
-		}
-		if (m_pRightTree && !m_pRightTree->m_bHashValid) {
-			m_pRightTree->ReCalculateHash(hashalg, true);
-		}
+	// calculated missing hashs without overwriting anything
+	if (m_pLeftTree && !m_pLeftTree->m_bHashValid) {
+		m_pLeftTree->ReCalculateHash(hashalg, true);
+	}
+	if (m_pRightTree && !m_pRightTree->m_bHashValid) {
+		m_pRightTree->ReCalculateHash(hashalg, true);
+	}
 
-		if ((m_pRightTree && m_pRightTree->m_bHashValid) ^ (m_pLeftTree && m_pLeftTree->m_bHashValid)) {
-			// one branch can never be verified
-			if (bDeleteBadTrees) {
-				if (m_pLeftTree) {
-					delete m_pLeftTree;
-					m_pLeftTree = NULL;
-				}
-				if (m_pRightTree) {
-					delete m_pRightTree;
-					m_pRightTree = NULL;
-				}
+	if ((m_pRightTree && m_pRightTree->m_bHashValid) ^ (m_pLeftTree && m_pLeftTree->m_bHashValid)) {
+		// one branch can never be verified
+		if (bDeleteBadTrees) {
+			if (m_pLeftTree) {
+				delete m_pLeftTree;
+				m_pLeftTree = NULL;
+			}
+			if (m_pRightTree) {
+				delete m_pRightTree;
+				m_pRightTree = NULL;
 			}
-			AddDebugLogLineN(logSHAHashSet, "VerifyHashSet failed - Hashtree incomplete");
-			return false;
 		}
+		AddDebugLogLineN(logSHAHashSet, "VerifyHashSet failed - Hashtree incomplete");
+		return false;
+	}
 	if ((m_pRightTree && m_pRightTree->m_bHashValid) && (m_pLeftTree && m_pLeftTree->m_bHashValid)) {
-	    // check verify the hashs of both child nodes against my hash
+		// check verify the hashs of both child nodes against my hash
 
 		CAICHHash CmpHash;
 		hashalg->Reset();
@@ -246,28 +238,29 @@
 			}
 			return false;
 		}
-		return m_pLeftTree->VerifyHashTree(hashalg, bDeleteBadTrees) && m_pRightTree->VerifyHashTree(hashalg, bDeleteBadTrees);
+		return m_pLeftTree->VerifyHashTree(hashalg, bDeleteBadTrees) &&
+		       m_pRightTree->VerifyHashTree(hashalg, bDeleteBadTrees);
 	} else {
 		// last hash in branch - nothing below to verify
 		return true;
 	}
 }
 
-
-void CAICHHashTree::SetBlockHash(uint64 nSize, uint64 nStartPos, CAICHHashAlgo* pHashAlg)
+void CAICHHashTree::SetBlockHash(uint64 nSize, uint64 nStartPos, CAICHHashAlgo *pHashAlg)
 {
-	wxASSERT ( nSize <= EMBLOCKSIZE );
-	CAICHHashTree* pToInsert = FindHash(nStartPos, nSize);
+	wxASSERT(nSize <= EMBLOCKSIZE);
+	CAICHHashTree *pToInsert = FindHash(nStartPos, nSize);
 	if (pToInsert == NULL) { // sanity
 		wxFAIL;
-		AddDebugLogLineN(logSHAHashSet, "Critical Error: Failed to Insert SHA-HashBlock, FindHash() failed!");
+		AddDebugLogLineN(
+			logSHAHashSet, "Critical Error: Failed to Insert SHA-HashBlock, FindHash() failed!");
 		return;
 	}
 
-	//sanity
 	if (pToInsert->m_nBaseSize != EMBLOCKSIZE || pToInsert->m_nDataSize != nSize) {
 		wxFAIL;
-		AddDebugLogLineN(logSHAHashSet, "Critical Error: Logical error on values in SetBlockHashFromData");
+		AddDebugLogLineN(
+			logSHAHashSet, "Critical Error: Logical error on values in SetBlockHashFromData");
 		return;
 	}
 
@@ -275,8 +268,8 @@
 	pToInsert->m_bHashValid = true;
 }
 
-
-bool CAICHHashTree::CreatePartRecoveryData(uint64 nStartPos, uint64 nSize, CFileDataIO* fileDataOut, uint32 wHashIdent, bool b32BitIdent)
+bool CAICHHashTree::CreatePartRecoveryData(
+	uint64 nStartPos, uint64 nSize, CFileDataIO *fileDataOut, uint32 wHashIdent, bool b32BitIdent)
 {
 	wxCHECK(nStartPos + nSize <= m_nDataSize, false);
 	wxCHECK(nSize <= m_nDataSize, false);
@@ -291,10 +284,10 @@
 		return false;
 	} else {
 		wHashIdent <<= 1;
-		wHashIdent |= (m_bIsLeftBranch) ? 1: 0;
+		wHashIdent |= (m_bIsLeftBranch) ? 1 : 0;
 
-		uint64 nBlocks = m_nDataSize / m_nBaseSize + ((m_nDataSize % m_nBaseSize != 0 )? 1:0);
-		uint64 nLeft = ( ((m_bIsLeftBranch) ? nBlocks+1:nBlocks) / 2)* m_nBaseSize;
+		uint64 nBlocks = m_nDataSize / m_nBaseSize + ((m_nDataSize % m_nBaseSize != 0) ? 1 : 0);
+		uint64 nLeft = (((m_bIsLeftBranch) ? nBlocks + 1 : nBlocks) / 2) * m_nBaseSize;
 		uint64 nRight = m_nDataSize - nLeft;
 		if (m_pLeftTree == NULL || m_pRightTree == NULL) {
 			wxFAIL;
@@ -306,7 +299,8 @@
 				return false;
 			}
 			m_pRightTree->WriteHash(fileDataOut, wHashIdent, b32BitIdent);
-			return m_pLeftTree->CreatePartRecoveryData(nStartPos, nSize, fileDataOut, wHashIdent, b32BitIdent);
+			return m_pLeftTree->CreatePartRecoveryData(
+				nStartPos, nSize, fileDataOut, wHashIdent, b32BitIdent);
 		} else {
 			nStartPos -= nLeft;
 			if (nStartPos + nSize > nRight || !m_pLeftTree->m_bHashValid) { // sanity
@@ -314,21 +308,20 @@
 				return false;
 			}
 			m_pLeftTree->WriteHash(fileDataOut, wHashIdent, b32BitIdent);
-			return m_pRightTree->CreatePartRecoveryData(nStartPos, nSize, fileDataOut, wHashIdent, b32BitIdent);
-
+			return m_pRightTree->CreatePartRecoveryData(
+				nStartPos, nSize, fileDataOut, wHashIdent, b32BitIdent);
 		}
 	}
 }
 
-
-void CAICHHashTree::WriteHash(CFileDataIO* fileDataOut, uint32 wHashIdent, bool b32BitIdent) const
+void CAICHHashTree::WriteHash(CFileDataIO *fileDataOut, uint32 wHashIdent, bool b32BitIdent) const
 {
-	wxASSERT( m_bHashValid );
+	wxASSERT(m_bHashValid);
 	wHashIdent <<= 1;
-	wHashIdent |= (m_bIsLeftBranch) ? 1: 0;
+	wHashIdent |= (m_bIsLeftBranch) ? 1 : 0;
 
 	if (!b32BitIdent) {
-		wxASSERT( wHashIdent <= 0xFFFF );
+		wxASSERT(wHashIdent <= 0xFFFF);
 		fileDataOut->WriteUInt16((uint16)wHashIdent);
 	} else {
 		fileDataOut->WriteUInt32(wHashIdent);
@@ -337,16 +330,16 @@
 	m_Hash.Write(fileDataOut);
 }
 
-
 // write lowest level hashs into file, ordered from left to right optional without identifier
-bool CAICHHashTree::WriteLowestLevelHashs(CFileDataIO* fileDataOut, uint32 wHashIdent, bool bNoIdent, bool b32BitIdent) const
+bool CAICHHashTree::WriteLowestLevelHashs(
+	CFileDataIO *fileDataOut, uint32 wHashIdent, bool bNoIdent, bool b32BitIdent) const
 {
 	wHashIdent <<= 1;
-	wHashIdent |= (m_bIsLeftBranch) ? 1: 0;
+	wHashIdent |= (m_bIsLeftBranch) ? 1 : 0;
 	if (m_pLeftTree == NULL && m_pRightTree == NULL) {
-		if (m_nDataSize <= m_nBaseSize && m_bHashValid ) {
+		if (m_nDataSize <= m_nBaseSize && m_bHashValid) {
 			if (!bNoIdent && !b32BitIdent) {
-				wxASSERT( wHashIdent <= 0xFFFF );
+				wxASSERT(wHashIdent <= 0xFFFF);
 				fileDataOut->WriteUInt16((uint16)wHashIdent);
 			} else if (!bNoIdent && b32BitIdent) {
 				fileDataOut->WriteUInt32(wHashIdent);
@@ -362,13 +355,14 @@
 		wxFAIL;
 		return false;
 	} else {
-		return m_pLeftTree->WriteLowestLevelHashs(fileDataOut, wHashIdent, bNoIdent, b32BitIdent)
-				&& m_pRightTree->WriteLowestLevelHashs(fileDataOut, wHashIdent, bNoIdent, b32BitIdent);
+		return m_pLeftTree->WriteLowestLevelHashs(fileDataOut, wHashIdent, bNoIdent, b32BitIdent) &&
+		       m_pRightTree->WriteLowestLevelHashs(fileDataOut, wHashIdent, bNoIdent, b32BitIdent);
 	}
 }
 
-// recover all low level hashs from given data. hashs are assumed to be ordered in left to right - no identifier used
-bool CAICHHashTree::LoadLowestLevelHashs(CFileDataIO* fileInput)
+// recover all low level hashs from given data. hashs are assumed to be ordered in left to right - no
+// identifier used
+bool CAICHHashTree::LoadLowestLevelHashs(CFileDataIO *fileInput)
 {
 	if (m_nDataSize <= m_nBaseSize) { // sanity
 		// lowest level, read hash
@@ -376,27 +370,28 @@
 		m_bHashValid = true;
 		return true;
 	} else {
-		uint64 nBlocks = m_nDataSize / m_nBaseSize + ((m_nDataSize % m_nBaseSize != 0 )? 1:0);
-		uint64 nLeft = ( ((m_bIsLeftBranch) ? nBlocks+1:nBlocks) / 2)* m_nBaseSize;
+		uint64 nBlocks = m_nDataSize / m_nBaseSize + ((m_nDataSize % m_nBaseSize != 0) ? 1 : 0);
+		uint64 nLeft = (((m_bIsLeftBranch) ? nBlocks + 1 : nBlocks) / 2) * m_nBaseSize;
 		uint64 nRight = m_nDataSize - nLeft;
 		if (m_pLeftTree == NULL) {
-			m_pLeftTree = new CAICHHashTree(nLeft, true, (nLeft <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
+			m_pLeftTree =
+				new CAICHHashTree(nLeft, true, (nLeft <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
 		} else {
-			wxASSERT( m_pLeftTree->m_nDataSize == nLeft );
+			wxASSERT(m_pLeftTree->m_nDataSize == nLeft);
 		}
 		if (m_pRightTree == NULL) {
-			m_pRightTree = new CAICHHashTree(nRight, false, (nRight <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
+			m_pRightTree = new CAICHHashTree(
+				nRight, false, (nRight <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
 		} else {
-			wxASSERT( m_pRightTree->m_nDataSize == nRight );
+			wxASSERT(m_pRightTree->m_nDataSize == nRight);
 		}
-		return m_pLeftTree->LoadLowestLevelHashs(fileInput)
-				&& m_pRightTree->LoadLowestLevelHashs(fileInput);
+		return m_pLeftTree->LoadLowestLevelHashs(fileInput) &&
+		       m_pRightTree->LoadLowestLevelHashs(fileInput);
 	}
 }
 
-
 // write the hash, specified by wHashIdent, with Data from fileInput.
-bool CAICHHashTree::SetHash(CFileDataIO* fileInput, uint32 wHashIdent, sint8 nLevel, bool bAllowOverwrite)
+bool CAICHHashTree::SetHash(CFileDataIO *fileInput, uint32 wHashIdent, sint8 nLevel, bool bAllowOverwrite)
 {
 	if (nLevel == (-1)) {
 		// first call, check how many level we need to go
@@ -405,16 +400,17 @@
 			wHashIdent <<= 1;
 		}
 		if (i > 31) {
-			AddDebugLogLineN(logSHAHashSet, "CAICHHashTree::SetHash - found invalid HashIdent (0)");
+			AddDebugLogLineN(
+				logSHAHashSet, "CAICHHashTree::SetHash - found invalid HashIdent (0)");
 			return false;
 		} else {
 			nLevel = 31 - i;
 		}
 	}
 	if (nLevel == 0) {
-		// this is the searched hash
 		if (m_bHashValid && !bAllowOverwrite) {
-			// not allowed to overwrite this hash, however move the filepointer as if we read a hash
+			// not allowed to overwrite this hash, however move the filepointer as if we read a
+			// hash
 			fileInput->Seek(HASHSIZE, wxFromCurrent);
 			return true;
 		}
@@ -429,42 +425,41 @@
 		// adjust ident to point the path to the next node
 		wHashIdent <<= 1;
 		nLevel--;
-		uint64 nBlocks = m_nDataSize / m_nBaseSize + ((m_nDataSize % m_nBaseSize != 0 )? 1:0);
-		uint64 nLeft = ( ((m_bIsLeftBranch) ? nBlocks+1:nBlocks) / 2)* m_nBaseSize;
+		uint64 nBlocks = m_nDataSize / m_nBaseSize + ((m_nDataSize % m_nBaseSize != 0) ? 1 : 0);
+		uint64 nLeft = (((m_bIsLeftBranch) ? nBlocks + 1 : nBlocks) / 2) * m_nBaseSize;
 		uint64 nRight = m_nDataSize - nLeft;
 		if ((wHashIdent & 0x80000000) > 0) {
 			if (m_pLeftTree == NULL) {
-				m_pLeftTree = new CAICHHashTree(nLeft, true, (nLeft <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
+				m_pLeftTree = new CAICHHashTree(
+					nLeft, true, (nLeft <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
 			} else {
-				wxASSERT( m_pLeftTree->m_nDataSize == nLeft );
+				wxASSERT(m_pLeftTree->m_nDataSize == nLeft);
 			}
 			return m_pLeftTree->SetHash(fileInput, wHashIdent, nLevel);
 		} else {
 			if (m_pRightTree == NULL) {
-				m_pRightTree = new CAICHHashTree(nRight, false, (nRight <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
+				m_pRightTree = new CAICHHashTree(
+					nRight, false, (nRight <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE);
 			} else {
-				wxASSERT( m_pRightTree->m_nDataSize == nRight );
+				wxASSERT(m_pRightTree->m_nDataSize == nRight);
 			}
 			return m_pRightTree->SetHash(fileInput, wHashIdent, nLevel);
 		}
 	}
 }
 
-
 /////////////////////////////////////////////////////////////////////////////////////////
-///CAICHUntrustedHash
+/// CAICHUntrustedHash
 bool CAICHUntrustedHash::AddSigningIP(uint32 dwIP)
 {
 	dwIP &= 0x00F0FFFF; // we use only the 20 most significant bytes for unique IPs
 	return m_adwIpsSigning.insert(dwIP).second;
 }
 
-
-
 /////////////////////////////////////////////////////////////////////////////////////////
-///CAICHHashSet
-CAICHHashSet::CAICHHashSet(CKnownFile* pOwner)
-	: m_pHashTree(0, true, PARTSIZE)
+/// CAICHHashSet
+CAICHHashSet::CAICHHashSet(CKnownFile *pOwner)
+: m_pHashTree(0, true, PARTSIZE)
 {
 	m_eStatus = AICH_EMPTY;
 	m_pOwner = pOwner;
@@ -475,9 +470,9 @@
 	FreeHashSet();
 }
 
-bool CAICHHashSet::CreatePartRecoveryData(uint64 nPartStartPos, CFileDataIO* fileDataOut, bool bDbgDontLoad)
+bool CAICHHashSet::CreatePartRecoveryData(uint64 nPartStartPos, CFileDataIO *fileDataOut, bool bDbgDontLoad)
 {
-	wxASSERT( m_pOwner );
+	wxASSERT(m_pOwner);
 	if (m_pOwner->IsPartFile() || m_eStatus != AICH_HASHSETCOMPLETE) {
 		wxFAIL;
 		return false;
@@ -489,16 +484,18 @@
 	if (!bDbgDontLoad) {
 		if (!LoadHashSet()) {
 			AddDebugLogLineN(logSHAHashSet,
-				CFormat("Created RecoveryData error: failed to load hashset. File: %s") % m_pOwner->GetFileName());
+				CFormat("Created RecoveryData error: failed to load hashset. File: %s") %
+					m_pOwner->GetFileName());
 			SetStatus(AICH_ERROR);
 			return false;
 		}
 	}
 	bool bResult;
 	uint8 nLevel = 0;
-	uint32 nPartSize = min<uint64>(PARTSIZE, m_pOwner->GetFileSize()-nPartStartPos);
-	m_pHashTree.FindHash(nPartStartPos, nPartSize,&nLevel);
-	uint16 nHashsToWrite = (nLevel-1) + nPartSize/EMBLOCKSIZE + ((nPartSize % EMBLOCKSIZE != 0 )? 1:0);
+	uint32 nPartSize = min<uint64>(PARTSIZE, m_pOwner->GetFileSize() - nPartStartPos);
+	m_pHashTree.FindHash(nPartStartPos, nPartSize, &nLevel);
+	uint16 nHashsToWrite =
+		(nLevel - 1) + nPartSize / EMBLOCKSIZE + ((nPartSize % EMBLOCKSIZE != 0) ? 1 : 0);
 	const bool bUse32BitIdentifier = m_pOwner->IsLargeFile();
 
 	if (bUse32BitIdentifier) {
@@ -507,11 +504,14 @@
 
 	fileDataOut->WriteUInt16(nHashsToWrite);
 	uint64 nCheckFilePos = fileDataOut->GetPosition();
-	if (m_pHashTree.CreatePartRecoveryData(nPartStartPos, nPartSize, fileDataOut, 0, bUse32BitIdentifier)) {
-		if (nHashsToWrite*(HASHSIZE+(bUse32BitIdentifier? 4u:2u)) != fileDataOut->GetPosition() - nCheckFilePos) {
+	if (m_pHashTree.CreatePartRecoveryData(
+		    nPartStartPos, nPartSize, fileDataOut, 0, bUse32BitIdentifier)) {
+		if (nHashsToWrite * (HASHSIZE + (bUse32BitIdentifier ? 4u : 2u)) !=
+			fileDataOut->GetPosition() - nCheckFilePos) {
 			wxFAIL;
-			AddDebugLogLineN( logSHAHashSet,
-				CFormat("Created RecoveryData has wrong length. File: %s") % m_pOwner->GetFileName() );
+			AddDebugLogLineN(logSHAHashSet,
+				CFormat("Created RecoveryData has wrong length. File: %s") %
+					m_pOwner->GetFileName());
 			bResult = false;
 			SetStatus(AICH_ERROR);
 		} else {
@@ -533,68 +533,68 @@
 	return bResult;
 }
 
-bool CAICHHashSet::ReadRecoveryData(uint64 nPartStartPos, CMemFile* fileDataIn)
+bool CAICHHashSet::ReadRecoveryData(uint64 nPartStartPos, CMemFile *fileDataIn)
 {
-	if (/*eMule TODO !m_pOwner->IsPartFile() ||*/ !(m_eStatus == AICH_VERIFIED || m_eStatus == AICH_TRUSTED) ) {
+	if (/*eMule TODO !m_pOwner->IsPartFile() ||*/ !(
+		m_eStatus == AICH_VERIFIED || m_eStatus == AICH_TRUSTED)) {
 		wxFAIL;
 		return false;
 	}
 
 	/* V2 AICH Hash Packet:
-		<count1 uint16>											16bit-hashs-to-read
-		(<identifier uint16><hash HASHSIZE>)count1			AICH hashs
-		<count2 uint16>											32bit-hashs-to-read
-		(<identifier uint32><hash HASHSIZE>)count2			AICH hashs
+	     <count1 uint16>                                  16-bit hashes to read
+	     (<identifier uint16><hash HASHSIZE>)count1     AICH hashes
+	     <count2 uint16>                                  32-bit hashes to read
+	     (<identifier uint32><hash HASHSIZE>)count2     AICH hashes
 	*/
 
 	// at this time we check the recoverydata for the correct ammounts of hashs only
 	// all hash are then taken into the tree, depending on there hashidentifier (except the masterhash)
 
 	uint8 nLevel = 0;
-	uint32 nPartSize = min<uint64>(PARTSIZE, m_pOwner->GetFileSize()-nPartStartPos);
-	m_pHashTree.FindHash(nPartStartPos, nPartSize,&nLevel);
-	uint16 nHashsToRead = (nLevel-1) + nPartSize/EMBLOCKSIZE + ((nPartSize % EMBLOCKSIZE != 0 )? 1:0);
+	uint32 nPartSize = min<uint64>(PARTSIZE, m_pOwner->GetFileSize() - nPartStartPos);
+	m_pHashTree.FindHash(nPartStartPos, nPartSize, &nLevel);
+	uint16 nHashsToRead =
+		(nLevel - 1) + nPartSize / EMBLOCKSIZE + ((nPartSize % EMBLOCKSIZE != 0) ? 1 : 0);
 
 	// read hashs with 16 bit identifier
 	uint16 nHashsAvailable = fileDataIn->ReadUInt16();
-	if (fileDataIn->GetLength()-fileDataIn->GetPosition() < nHashsToRead*(HASHSIZE+2u) || (nHashsToRead != nHashsAvailable && nHashsAvailable != 0)) {
+	if (fileDataIn->GetLength() - fileDataIn->GetPosition() < nHashsToRead * (HASHSIZE + 2u) ||
+		(nHashsToRead != nHashsAvailable && nHashsAvailable != 0)) {
 		// this check is redundant, CSafememfile would catch such an error too
 		AddDebugLogLineN(logSHAHashSet,
-			CFormat("Failed to read RecoveryData for '%s' - Received datasize/amounts of hashs was invalid")
-				% m_pOwner->GetFileName());
+			CFormat("Failed to read RecoveryData for '%s' - Received datasize/amounts of hashs "
+				"was invalid") %
+				m_pOwner->GetFileName());
 		return false;
 	}
 	for (uint32 i = 0; i != nHashsAvailable; i++) {
 		uint16 wHashIdent = fileDataIn->ReadUInt16();
 		if (wHashIdent == 1 /*never allow masterhash to be overwritten*/
-			|| !m_pHashTree.SetHash(fileDataIn, wHashIdent,(-1), false))
-		{
+			|| !m_pHashTree.SetHash(fileDataIn, wHashIdent, (-1), false)) {
 			AddDebugLogLineN(logSHAHashSet,
-				CFormat("Failed to read RecoveryData for '%s' - Error when trying to read hash into tree")
-					% m_pOwner->GetFileName());
+				CFormat("Failed to read RecoveryData for '%s' - Error when trying to read "
+					"hash into tree") %
+					m_pOwner->GetFileName());
 			VerifyHashTree(true); // remove invalid hashes which we have already written
 			return false;
 		}
 	}
 
-
 	// read hashs with 32bit identifier
 	if (nHashsAvailable == 0 && fileDataIn->GetLength() - fileDataIn->GetPosition() >= 2) {
 		nHashsAvailable = fileDataIn->ReadUInt16();
-		if (fileDataIn->GetLength()-fileDataIn->GetPosition() < nHashsToRead*(HASHSIZE+4u) || (nHashsToRead != nHashsAvailable && nHashsAvailable != 0)) {
+		if (fileDataIn->GetLength() - fileDataIn->GetPosition() < nHashsToRead * (HASHSIZE + 4u) ||
+			(nHashsToRead != nHashsAvailable && nHashsAvailable != 0)) {
 			// this check is redundant, CSafememfile would catch such an error too
-// TODO:			theApp->QueueDebugLogLine(/*DLP_VERYHIGH,*/ false, _T("Failed to read RecoveryData for %s - Received datasize/amounts of hashs was invalid (2)"), m_pOwner->GetFileName() );
 			return false;
 		}
 
-// TODO: DEBUG_ONLY( theApp->QueueDebugLogLine(/*DLP_VERYHIGH,*/ false, _T("read RecoveryData for %s - Received packet with  %u 32bit hash identifiers)"), m_pOwner->GetFileName(), nHashsAvailable ) );
 		for (uint32 i = 0; i != nHashsToRead; i++) {
 			uint32 wHashIdent = fileDataIn->ReadUInt32();
 			if (wHashIdent == 1 /*never allow masterhash to be overwritten*/
-				|| wHashIdent > 0x400000
-				|| !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() );
+				|| wHashIdent > 0x400000 ||
+				!m_pHashTree.SetHash(fileDataIn, wHashIdent, (-1), false)) {
 				VerifyHashTree(true); // remove invalid hashes which we have already written
 				return false;
 			}
@@ -602,28 +602,27 @@
 	}
 
 	if (nHashsAvailable == 0) {
-// TODO:		theApp->QueueDebugLogLine(/*DLP_VERYHIGH,*/ false, _T("Failed to read RecoveryData for %s - Packet didn't contained any hashs"), m_pOwner->GetFileName() );
 		return false;
 	}
 
-
 	if (VerifyHashTree(true)) {
 		// some final check if all hashs we wanted are there
 		for (uint32 nPartPos = 0; nPartPos < nPartSize; nPartPos += EMBLOCKSIZE) {
-			CAICHHashTree* phtToCheck = m_pHashTree.FindHash(nPartStartPos+nPartPos, min<uint64>(EMBLOCKSIZE, nPartSize-nPartPos));
+			CAICHHashTree *phtToCheck = m_pHashTree.FindHash(
+				nPartStartPos + nPartPos, min<uint64>(EMBLOCKSIZE, nPartSize - nPartPos));
 			if (phtToCheck == NULL || !phtToCheck->m_bHashValid) {
 				AddDebugLogLineN(logSHAHashSet,
-					CFormat("Failed to read RecoveryData for '%s' - Error while verifying presence of all lowest level hashes")
-						% m_pOwner->GetFileName());
+					CFormat("Failed to read RecoveryData for '%s' - Error while "
+						"verifying presence of all lowest level hashes") %
+						m_pOwner->GetFileName());
 				return false;
 			}
 		}
-		// all done
 		return true;
 	} else {
 		AddDebugLogLineN(logSHAHashSet,
-			CFormat("Failed to read RecoveryData for '%s' - Verifying received hashtree failed")
-				% m_pOwner->GetFileName());
+			CFormat("Failed to read RecoveryData for '%s' - Verifying received hashtree failed") %
+				m_pOwner->GetFileName());
 		return false;
 	}
 }
@@ -636,12 +635,10 @@
 	s_rootHashCacheLoaded = false;
 }
 
-
 void CAICHHashSet::LoadRootHashCacheLocked()
 {
-	// Walk known2.met once, collecting every root hash. Replaces the
-	// per-call in-file linear scan that turned bulk-hashing N files into
-	// O(N^2) on-disk work (issue #579).
+	// Walk known2.met once, collecting every root hash. Replaces the per-call in-file linear
+	// scan that turned bulk-hashing N files into O(N^2) on-disk work (issue #579).
 	s_rootHashCache.clear();
 	s_rootHashCacheLoaded = true; // marked early so a partial read still ends the loop
 
@@ -670,41 +667,37 @@
 			return;
 		}
 		while (file.GetPosition() < nFileSize) {
-			// Remember the byte offset of the root-hash position so
-			// LoadHashSet can seek straight here later instead of
-			// rewalking the file.
+			// Remember the byte offset of the root-hash position, so LoadHashSet
+			// can seek straight here instead of rewalking the file.
 			const uint64 entryOffset = file.GetPosition();
 			CAICHHash rootHash;
 			rootHash.Read(&file);
 			const uint32 nHashCount = file.ReadUInt32();
-			const uint64 skipBytes =
-				static_cast<uint64>(nHashCount) * HASHSIZE;
+			const uint64 skipBytes = static_cast<uint64>(nHashCount) * HASHSIZE;
 			if (file.GetPosition() + skipBytes > nFileSize) {
 				// known2.met is truncated past this entry; stop here.
 				// CAICHSyncTask will handle the actual truncation/recovery.
-				AddDebugLogLineC(logSHAHashSet,
-					"AICH cache load: known2.met truncated mid-entry");
+				AddDebugLogLineC(
+					logSHAHashSet, "AICH cache load: known2.met truncated mid-entry");
 				break;
 			}
 			file.Seek(static_cast<wxFileOffset>(skipBytes), wxFromCurrent);
 			s_rootHashCache.emplace(rootHash, entryOffset);
 		}
-	} catch (const CSafeIOException& e) {
-		AddDebugLogLineC(logSHAHashSet,
-			"IO error walking known2.met for AICH cache: " + e.what());
+	} catch (const CSafeIOException &e) {
+		AddDebugLogLineC(logSHAHashSet, "IO error walking known2.met for AICH cache: " + e.what());
 		// Keep whatever we collected; stay marked loaded so we don't
 		// re-scan on every SaveHashSet call (and risk the same error).
 	}
 }
 
-
 bool CAICHHashSet::SaveHashSet()
 {
 	if (m_eStatus != AICH_HASHSETCOMPLETE) {
 		wxFAIL;
 		return false;
 	}
-	if ( !m_pHashTree.m_bHashValid || m_pHashTree.m_nDataSize != m_pOwner->GetFileSize()) {
+	if (!m_pHashTree.m_bHashValid || m_pHashTree.m_nDataSize != m_pOwner->GetFileSize()) {
 		wxFAIL;
 		return false;
 	}
@@ -715,15 +708,14 @@
 		LoadRootHashCacheLocked();
 	}
 
-	// O(1) dedup — replaces the linear file walk that used to make this
+	// O(1) dedup -- replaces the linear file walk that used to make this
 	// O(N) per call and O(N^2) over a bulk-hashing batch.
 	if (s_rootHashCache.find(m_pHashTree.m_Hash) != s_rootHashCache.end()) {
 		return true;
 	}
 
-	// Byte offset at which the new entry's root hash will be appended.
-	// Captured inside the try block and used after it to update the
-	// cache once the write has succeeded.
+	// Byte offset at which the new entry's root hash will be appended; used after
+	// the try block to update the cache once the write has succeeded.
 	uint64 newEntryOffset = 0;
 
 	try {
@@ -740,7 +732,8 @@
 		if (nExistingSize) {
 			uint8 header = file.ReadUInt8();
 			if (header != KNOWN2_MET_VERSION) {
-				AddDebugLogLineC(logSHAHashSet, "Saving failed: Current file is not a met-file!");
+				AddDebugLogLineC(
+					logSHAHashSet, "Saving failed: Current file is not a met-file!");
 				return false;
 			}
 			// Skip the in-file dedup walk; the cache already confirmed
@@ -752,61 +745,62 @@
 			nExistingSize += 1;
 		}
 
-		// This is the byte offset at which the new entry's root hash
-		// will land — capture it for the cache so LoadHashSet can
-		// seek straight here later.
+		// Where the new entry's root hash will land -- captured for the cache so
+		// LoadHashSet can seek straight to it later.
 		newEntryOffset = nExistingSize;
 
-		// write hashset
 		m_pHashTree.m_Hash.Write(&file);
-		uint32 nHashCount = (PARTSIZE/EMBLOCKSIZE + ((PARTSIZE % EMBLOCKSIZE != 0)? 1 : 0)) * (m_pHashTree.m_nDataSize/PARTSIZE);
+		uint32 nHashCount = (PARTSIZE / EMBLOCKSIZE + ((PARTSIZE % EMBLOCKSIZE != 0) ? 1 : 0)) *
+				    (m_pHashTree.m_nDataSize / PARTSIZE);
 		if (m_pHashTree.m_nDataSize % PARTSIZE != 0) {
-			nHashCount += (m_pHashTree.m_nDataSize % PARTSIZE)/EMBLOCKSIZE + (((m_pHashTree.m_nDataSize % PARTSIZE) % EMBLOCKSIZE != 0)? 1 : 0);
+			nHashCount += (m_pHashTree.m_nDataSize % PARTSIZE) / EMBLOCKSIZE +
+				      (((m_pHashTree.m_nDataSize % PARTSIZE) % EMBLOCKSIZE != 0) ? 1 : 0);
 		}
 		file.WriteUInt32(nHashCount);
 		if (!m_pHashTree.WriteLowestLevelHashs(&file, 0, true, true)) {
 			// that's bad... really
 			file.SetLength(nExistingSize);
-			AddDebugLogLineC(logSHAHashSet, "Failed to save HashSet: WriteLowestLevelHashs() failed!");
+			AddDebugLogLineC(
+				logSHAHashSet, "Failed to save HashSet: WriteLowestLevelHashs() failed!");
 			return false;
 		}
-		if (file.GetLength() != nExistingSize + (nHashCount+1)*HASHSIZE + 4) {
+		if (file.GetLength() != nExistingSize + (nHashCount + 1) * HASHSIZE + 4) {
 			// that's even worse
 			file.SetLength(nExistingSize);
-			AddDebugLogLineC(logSHAHashSet, "Failed to save HashSet: Calculated and real size of hashset differ!");
+			AddDebugLogLineC(logSHAHashSet,
+				"Failed to save HashSet: Calculated and real size of hashset differ!");
 			return false;
 		}
-		AddDebugLogLineN(logSHAHashSet, CFormat("Successfully saved eMuleAC Hashset, %u Hashs + 1 Masterhash written") % nHashCount);
-	} catch (const CSafeIOException& e) {
+		AddDebugLogLineN(logSHAHashSet,
+			CFormat("Successfully saved eMuleAC Hashset, %u Hashs + 1 Masterhash written") %
+				nHashCount);
+	} catch (const CSafeIOException &e) {
 		AddDebugLogLineC(logSHAHashSet, "IO error while saving AICH HashSet: " + e.what());
 		return false;
 	}
 
-	// Append succeeded — record offset in the cache so the next
-	// SaveHashSet for this root hash dedups in O(1), and LoadHashSet
-	// can seek straight to it.
+	// Append succeeded, so record the offset: the next SaveHashSet for this root
+	// hash dedups in O(1), and LoadHashSet can seek straight to it.
 	s_rootHashCache.emplace(m_pHashTree.m_Hash, newEntryOffset);
 	return true;
 }
 
-
 bool CAICHHashSet::LoadHashSet()
 {
 	if (m_eStatus != AICH_HASHSETCOMPLETE) {
 		wxFAIL;
 		return false;
 	}
-	if ( !m_pHashTree.m_bHashValid || m_pHashTree.m_nDataSize != m_pOwner->GetFileSize() || m_pHashTree.m_nDataSize == 0) {
+	if (!m_pHashTree.m_bHashValid || m_pHashTree.m_nDataSize != m_pOwner->GetFileSize() ||
+		m_pHashTree.m_nDataSize == 0) {
 		wxFAIL;
 		return false;
 	}
 
-	// O(1) cache lookup: ask the offset index where this root hash
-	// lives in known2.met. The cache was the dedup-on-write index
-	// before; here we reuse it to skip the linear scan that used to
-	// happen on every incoming OP_AICHREQUEST (issue #166). If the
-	// cache miss-and-cold-load path is taken we still pay the one-shot
-	// walk, but only once across all subsequent calls.
+	// O(1) cache lookup: the offset index says where this root hash lives in known2.met. It was
+	// the dedup-on-write index; reusing it here skips the linear scan that used to happen on
+	// every incoming OP_AICHREQUEST (issue #166). A cold load still pays the one-shot walk, but
+	// only once.
 	uint64 cachedOffset = 0;
 	bool haveCachedOffset = false;
 	{
@@ -844,12 +838,10 @@
 
 		uint64 nExistingSize = file.GetLength();
 
-		// Fast path: seek straight to the cached entry. If the offset
-		// turns out to be stale -- past EOF, or first read at that
-		// position doesn't match our root hash -- rewind once to just
-		// past the version header and fall through to a true linear
-		// scan from the top as defensive recovery against external
-		// modification of known2.met between cache load and now.
+		// Fast path: seek straight to the cached entry. A stale offset -- past EOF, or a
+		// first read there that does not match our root hash -- rewinds once to just past
+		// the version header and falls through to a true linear scan, as recovery against
+		// external modification of known2.met.
 		if (haveCachedOffset) {
 			if (cachedOffset >= nExistingSize) {
 				haveCachedOffset = false;
@@ -862,49 +854,55 @@
 		uint32 nHashCount;
 		bool cacheFallbackTriggered = false;
 		while (file.GetPosition() < nExistingSize) {
-			// Position of the root-hash at the start of the entry we're
-			// about to examine — captured pre-read so we can stamp it
-			// back into the cache when a stale-cache rewind succeeds.
+			// Position of the root hash at the start of the entry we are about to
+			// examine, captured pre-read so a stale-cache rewind can stamp it back.
 			const uint64 entryStartPos = file.GetPosition();
 			CurrentHash.Read(&file);
 			if (m_pHashTree.m_Hash == CurrentHash) {
-				// found Hashset
-				uint32 nExpectedCount =	(PARTSIZE/EMBLOCKSIZE + ((PARTSIZE % EMBLOCKSIZE != 0)? 1 : 0)) * (m_pHashTree.m_nDataSize/PARTSIZE);
+				uint32 nExpectedCount =
+					(PARTSIZE / EMBLOCKSIZE + ((PARTSIZE % EMBLOCKSIZE != 0) ? 1 : 0)) *
+					(m_pHashTree.m_nDataSize / PARTSIZE);
 				if (m_pHashTree.m_nDataSize % PARTSIZE != 0) {
-					nExpectedCount += (m_pHashTree.m_nDataSize % PARTSIZE)/EMBLOCKSIZE + (((m_pHashTree.m_nDataSize % PARTSIZE) % EMBLOCKSIZE != 0)? 1 : 0);
+					nExpectedCount +=
+						(m_pHashTree.m_nDataSize % PARTSIZE) / EMBLOCKSIZE +
+						(((m_pHashTree.m_nDataSize % PARTSIZE) % EMBLOCKSIZE != 0)
+								? 1
+								: 0);
 				}
 				nHashCount = file.ReadUInt32();
 				if (nHashCount != nExpectedCount) {
-					AddDebugLogLineC(logSHAHashSet, "Failed to load HashSet: Available Hashs and expected hashcount differ!");
+					AddDebugLogLineC(logSHAHashSet,
+						"Failed to load HashSet: Available Hashs and expected "
+						"hashcount differ!");
 					return false;
 				}
 				if (!m_pHashTree.LoadLowestLevelHashs(&file)) {
-					AddDebugLogLineC(logSHAHashSet, "Failed to load HashSet: LoadLowestLevelHashs failed!");
+					AddDebugLogLineC(logSHAHashSet,
+						"Failed to load HashSet: LoadLowestLevelHashs failed!");
 					return false;
 				}
 				if (!ReCalculateHash(false)) {
-					AddDebugLogLineC(logSHAHashSet, "Failed to load HashSet: Calculating loaded hashs failed!");
+					AddDebugLogLineC(logSHAHashSet,
+						"Failed to load HashSet: Calculating loaded hashs failed!");
 					return false;
 				}
 				if (CurrentHash != m_pHashTree.m_Hash) {
-					AddDebugLogLineC(logSHAHashSet, "Failed to load HashSet: Calculated Masterhash differs from given Masterhash - hashset corrupt!");
+					AddDebugLogLineC(logSHAHashSet,
+						"Failed to load HashSet: Calculated Masterhash differs from "
+						"given Masterhash - hashset corrupt!");
 					return false;
 				}
-				// Self-heal: if we got here via the stale-cache rewind,
-				// update the cache so future lookups for this root hash
-				// go straight to the new correct offset instead of
-				// paying the linear-scan penalty every time.
+				// Self-heal: reached via the stale-cache rewind, so update the cache
+				// and future lookups go straight to the correct offset.
 				if (cacheFallbackTriggered) {
 					wxMutexLocker lock(s_rootHashCacheMutex);
 					s_rootHashCachem_pHashTree.m_Hash = entryStartPos;
 				}
 				return true;
 			}
-			// First read after seeking to the cached offset didn't match
-			// our root hash. The cache must be stale -- known2.met was
-			// modified externally between cache load and now. Rewind once
-			// to just past the version header and restart as a true linear
-			// scan from the top.
+			// The first read after seeking to the cached offset did not match our root
+			// hash, so the cache is stale: known2.met was modified externally. Rewind
+			// once to just past the version header and restart as a linear scan.
 			if (haveCachedOffset && !cacheFallbackTriggered) {
 				cacheFallbackTriggered = true;
 				haveCachedOffset = false;
@@ -912,15 +910,16 @@
 				continue;
 			}
 			nHashCount = file.ReadUInt32();
-			if (file.GetPosition() + nHashCount*HASHSIZE > nExistingSize) {
-				AddDebugLogLineC(logSHAHashSet, "Saving failed: File contains fewer entries than specified!");
+			if (file.GetPosition() + nHashCount * HASHSIZE > nExistingSize) {
+				AddDebugLogLineC(logSHAHashSet,
+					"Saving failed: File contains fewer entries than specified!");
 				return false;
 			}
 			// skip the rest of this hashset
-			file.Seek(nHashCount*HASHSIZE, wxFromCurrent);
+			file.Seek(nHashCount * HASHSIZE, wxFromCurrent);
 		}
 		AddDebugLogLineC(logSHAHashSet, "Failed to load HashSet: HashSet not found!");
-	} catch (const CSafeIOException& e) {
+	} catch (const CSafeIOException &e) {
 		AddDebugLogLineC(logSHAHashSet, "IO error while loading AICH HashSet: " + e.what());
 	}
 
@@ -940,21 +939,21 @@
 	}
 }
 
-void CAICHHashSet::SetMasterHash(const CAICHHash& Hash, EAICHStatus eNewStatus)
+void CAICHHashSet::SetMasterHash(const CAICHHash &Hash, EAICHStatus eNewStatus)
 {
 	m_pHashTree.m_Hash = Hash;
 	m_pHashTree.m_bHashValid = true;
 	SetStatus(eNewStatus);
 }
 
-CAICHHashAlgo*	CAICHHashSet::GetNewHashAlgo()
+CAICHHashAlgo *CAICHHashSet::GetNewHashAlgo()
 {
 	return new CSHA();
 }
 
 bool CAICHHashSet::ReCalculateHash(bool bDontReplace)
 {
-	CAICHHashAlgo* hashalg = GetNewHashAlgo();
+	CAICHHashAlgo *hashalg = GetNewHashAlgo();
 	bool bResult = m_pHashTree.ReCalculateHash(hashalg, bDontReplace);
 	delete hashalg;
 	return bResult;
@@ -962,29 +961,27 @@
 
 bool CAICHHashSet::VerifyHashTree(bool bDeleteBadTrees)
 {
-	CAICHHashAlgo* hashalg = GetNewHashAlgo();
+	CAICHHashAlgo *hashalg = GetNewHashAlgo();
 	bool bResult = m_pHashTree.VerifyHashTree(hashalg, bDeleteBadTrees);
 	delete hashalg;
 	return bResult;
 }
 
-
 void CAICHHashSet::SetFileSize(uint64 nSize)
 {
 	m_pHashTree.m_nDataSize = nSize;
 	m_pHashTree.m_nBaseSize = (nSize <= PARTSIZE) ? EMBLOCKSIZE : PARTSIZE;
 }
 
-
-void CAICHHashSet::UntrustedHashReceived(const CAICHHash& Hash, uint32 dwFromIP)
+void CAICHHashSet::UntrustedHashReceived(const CAICHHash &Hash, uint32 dwFromIP)
 {
-	switch(GetStatus()) {
-		case AICH_EMPTY:
-		case AICH_UNTRUSTED:
-		case AICH_TRUSTED:
-			break;
-		default:
-			return;
+	switch (GetStatus()) {
+	case AICH_EMPTY:
+	case AICH_UNTRUSTED:
+	case AICH_TRUSTED:
+		break;
+	default:
+		return;
 	}
 	bool bFound = false;
 	bool bAdded = false;
@@ -1003,7 +1000,7 @@
 		m_aUntrustedHashs.push_back(uhToAdd);
 	}
 
-	uint32 nSigningIPsTotal = 0;	// unique clients who send us a hash
+	uint32 nSigningIPsTotal = 0; // unique clients who send us a hash
 	int nMostTrustedPos = (-1);  // the hash which most clients send us
 	uint32 nMostTrustedIPs = 0;
 	for (uint32 i = 0; i < (uint32)m_aUntrustedHashs.size(); ++i) {
@@ -1017,20 +1014,15 @@
 		wxFAIL;
 		return;
 	}
-	// the check if we trust any hash
-	if ( thePrefs::IsTrustingEveryHash() ||
-		(nMostTrustedIPs >= MINUNIQUEIPS_TOTRUST && (100 * nMostTrustedIPs)/nSigningIPsTotal >= MINPERCENTAGE_TOTRUST)) {
-		//trusted
+	if (thePrefs::IsTrustingEveryHash() ||
+		(nMostTrustedIPs >= MINUNIQUEIPS_TOTRUST &&
+			(100 * nMostTrustedIPs) / nSigningIPsTotal >= MINPERCENTAGE_TOTRUST)) {
 		AddDebugLogLineN(logSHAHashSet,
 			CFormat("AICH Hash received (%sadded), We have now %u hash(es) from %u unique IP(s). "
-					"We trust the Hash %s from %u client(s) (%u%%). File: %s")
-				% (bAdded ? "" : "not ")
-				% m_aUntrustedHashs.size()
-				% nSigningIPsTotal
-				% m_aUntrustedHashsnMostTrustedPos.m_Hash.GetString()
-				% nMostTrustedIPs
-				% ((100 * nMostTrustedIPs) / nSigningIPsTotal)
-				% m_pOwner->GetFileName());
+				"We trust the Hash %s from %u client(s) (%u%%). File: %s") %
+				(bAdded ? "" : "not ") % m_aUntrustedHashs.size() % nSigningIPsTotal %
+				m_aUntrustedHashsnMostTrustedPos.m_Hash.GetString() % nMostTrustedIPs %
+				((100 * nMostTrustedIPs) / nSigningIPsTotal) % m_pOwner->GetFileName());
 
 		SetStatus(AICH_TRUSTED);
 		if (!HasValidMasterHash() || GetMasterHash() != m_aUntrustedHashsnMostTrustedPos.m_Hash) {
@@ -1038,17 +1030,12 @@
 			FreeHashSet();
 		}
 	} else {
-		// untrusted
 		AddDebugLogLineN(logSHAHashSet,
 			CFormat("AICH Hash received (%sadded), We have now %u hash(es) from %u unique IP(s). "
-					"Best Hash %s from %u clients (%u%%) - but we don't trust it yet. File: %s")
-				% (bAdded ? "": "not ")
-				% m_aUntrustedHashs.size()
-				% nSigningIPsTotal
-				% m_aUntrustedHashsnMostTrustedPos.m_Hash.GetString()
-				% nMostTrustedIPs
-				% ((100 * nMostTrustedIPs) / nSigningIPsTotal)
-				% m_pOwner->GetFileName());
+				"Best Hash %s from %u clients (%u%%) - but we don't trust it yet. File: %s") %
+				(bAdded ? "" : "not ") % m_aUntrustedHashs.size() % nSigningIPsTotal %
+				m_aUntrustedHashsnMostTrustedPos.m_Hash.GetString() % nMostTrustedIPs %
+				((100 * nMostTrustedIPs) / nSigningIPsTotal) % m_pOwner->GetFileName());
 
 		SetStatus(AICH_UNTRUSTED);
 		if (!HasValidMasterHash() || GetMasterHash() != m_aUntrustedHashsnMostTrustedPos.m_Hash) {
@@ -1056,11 +1043,11 @@
 			FreeHashSet();
 		}
 	}
-	if (bAdded) {}	// get rid of unused variable warning
+	if (bAdded) {
+	} // get rid of unused variable warning
 }
 
-
-void CAICHHashSet::ClientAICHRequestFailed(CUpDownClient* pClient)
+void CAICHHashSet::ClientAICHRequestFailed(CUpDownClient *pClient)
 {
 	pClient->SetReqFileAICHHash(NULL);
 	CAICHRequestedData data = GetAICHReqDetails(pClient);
@@ -1068,18 +1055,20 @@
 	if (data.m_pClient.GetClient() != pClient) {
 		return;
 	}
-	if( theApp->downloadqueue->IsPartFile(data.m_pPartFile)) {
+	if (theApp->downloadqueue->IsPartFile(data.m_pPartFile)) {
 		AddDebugLogLineN(logSHAHashSet,
-			CFormat("AICH Request failed, Trying to ask another client (File: '%s', Part: %u, Client '%s'")
-				% data.m_pPartFile->GetFileName() % data.m_nPart % pClient->GetClientFullInfo());
+			CFormat("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);
 	}
 }
 
-
-void CAICHHashSet::RemoveClientAICHRequest(const CUpDownClient* pClient)
+void CAICHHashSet::RemoveClientAICHRequest(const CUpDownClient *pClient)
 {
-	for (CAICHRequestedDataList::iterator it = m_liRequestedData.begin();it != m_liRequestedData.end(); ++it) {
+	for (CAICHRequestedDataList::iterator it = m_liRequestedData.begin(); it != m_liRequestedData.end();
+		++it) {
 		if (it->m_pClient.GetClient() == pClient) {
 			m_liRequestedData.erase(it);
 			return;
@@ -1088,9 +1077,10 @@
 	wxFAIL;
 }
 
-bool CAICHHashSet::IsClientRequestPending(const CPartFile* pForFile, uint16 nPart)
+bool CAICHHashSet::IsClientRequestPending(const CPartFile *pForFile, uint16 nPart)
 {
-	for (CAICHRequestedDataList::iterator it = m_liRequestedData.begin();it != m_liRequestedData.end(); ++it) {
+	for (CAICHRequestedDataList::iterator it = m_liRequestedData.begin(); it != m_liRequestedData.end();
+		++it) {
 		if (it->m_pPartFile == pForFile && it->m_nPart == nPart) {
 			return true;
 		}
@@ -1098,27 +1088,19 @@
 	return false;
 }
 
-
-void CAICHHashSet::DropReferencesTo(const CKnownFile* file)
+void CAICHHashSet::DropReferencesTo(const CKnownFile *file)
 {
-	// Pointer-value strip of any in-flight AICH recovery request that
-	// names `file`. Called from MuleNotify::KnownFileBeingDestroyed
-	// (GuiEvents.cpp) before the CKnownFile / CPartFile is freed by
-	// CPartFile::Delete() or CKnownFileList::PruneDuplicates. Without
-	// this, the pending request would deref the dangling partfile
-	// when the recovery data eventually arrives (RequestAICHRecovery's
-	// existing IsPartFile() guard at line ~990 catches some cases
-	// but a freed-then-reused pointer can spoof that check and
-	// route recovery to the wrong file).
+	// Pointer-value strip of any in-flight AICH recovery request naming `file`. Called from
+	// MuleNotify::KnownFileBeingDestroyed before the CKnownFile / CPartFile is freed, since the
+	// pending request would otherwise deref the dangling partfile when the recovery data
+	// arrives -- RequestAICHRecovery's IsPartFile() guard catches some cases, but a freed-then-
+	// reused pointer can spoof it and route recovery to the wrong file.
 	//
-	// CPartFile inherits from CKnownFile (single inheritance, same
-	// address), so the cast in the comparison is no-deref. Same-
-	// thread call (main thread) so no synchronisation needed on
-	// the static list beyond the normal amule single-threaded GUI
-	// contract.
-	for (CAICHRequestedDataList::iterator it = m_liRequestedData.begin();
-		it != m_liRequestedData.end(); /* manual ++ */) {
-		if (static_cast<const CKnownFile*>(it->m_pPartFile) == file) {
+	// CPartFile inherits from CKnownFile at the same address, so the cast in the comparison
+	// never derefs. Main-thread only, so the static list needs no synchronisation.
+	for (CAICHRequestedDataList::iterator it = m_liRequestedData.begin(); it != m_liRequestedData.end();
+		/* manual ++ */) {
+		if (static_cast<const CKnownFile *>(it->m_pPartFile) == file) {
 			it = m_liRequestedData.erase(it);
 		} else {
 			++it;
@@ -1126,9 +1108,10 @@
 	}
 }
 
-CAICHRequestedData CAICHHashSet::GetAICHReqDetails(const  CUpDownClient* pClient)
+CAICHRequestedData CAICHHashSet::GetAICHReqDetails(const CUpDownClient *pClient)
 {
-	for (CAICHRequestedDataList::iterator it = m_liRequestedData.begin();it != m_liRequestedData.end(); ++it) {
+	for (CAICHRequestedDataList::iterator it = m_liRequestedData.begin(); it != m_liRequestedData.end();
+		++it) {
 		if (it->m_pClient.GetClient() == pClient) {
 			return *(it);
 		}
@@ -1140,13 +1123,14 @@
 
 bool CAICHHashSet::IsPartDataAvailable(uint64 nPartStartPos)
 {
-	if (!(m_eStatus == AICH_VERIFIED || m_eStatus == AICH_TRUSTED || m_eStatus == AICH_HASHSETCOMPLETE) ) {
+	if (!(m_eStatus == AICH_VERIFIED || m_eStatus == AICH_TRUSTED || m_eStatus == AICH_HASHSETCOMPLETE)) {
 		wxFAIL;
 		return false;
 	}
-	uint64 nPartSize = min<uint64>(PARTSIZE, m_pOwner->GetFileSize()-nPartStartPos);
+	uint64 nPartSize = min<uint64>(PARTSIZE, m_pOwner->GetFileSize() - nPartStartPos);
 	for (uint64 nPartPos = 0; nPartPos < nPartSize; nPartPos += EMBLOCKSIZE) {
-		CAICHHashTree* phtToCheck = m_pHashTree.FindHash(nPartStartPos+nPartPos, min<uint64>(EMBLOCKSIZE, nPartSize-nPartPos));
+		CAICHHashTree *phtToCheck = m_pHashTree.FindHash(
+			nPartStartPos + nPartPos, min<uint64>(EMBLOCKSIZE, nPartSize - nPartPos));
 		if (phtToCheck == NULL || !phtToCheck->m_bHashValid) {
 			return false;
 		}
@@ -1154,18 +1138,17 @@
 	return true;
 }
 
-// VC++ defines Assert as ASSERT. VC++ also defines VERIFY MACRO, which is the equivalent of ASSERT but also works in Released builds.
+// VC++ defines Assert as ASSERT. VC++ also defines VERIFY MACRO, which is the equivalent of ASSERT but also
+// works in Released builds.
 
 #define VERIFY(x) wxASSERT(x)
 
 void CAICHHashSet::DbgTest()
 {
 #ifdef _DEBUG
-	//define TESTSIZE 4294567295
 	uint8 maxLevel = 0;
 	uint32 cHash = 1;
 	uint8 curLevel = 0;
-	//uint32 cParts = 0;
 	maxLevel = 0;
 /*	CAICHHashTree* pTest = new CAICHHashTree(TESTSIZE, true, 9728000);
 	for (uint64 i = 0; i+9728000 < TESTSIZE; i += 9728000) {
@@ -1186,46 +1169,40 @@
 	TestHashSet.SetMasterHash(GetMasterHash(), AICH_VERIFIED);
 	CMemFile file;
 	uint64 i;
-	for (i = 0; i+9728000 < TESTSIZE; i += 9728000) {
-		VERIFY( CreatePartRecoveryData(i, &file) );
+	for (i = 0; i + 9728000 < TESTSIZE; i += 9728000) {
+		VERIFY(CreatePartRecoveryData(i, &file));
 
 		/*uint32 nRandomCorruption = (rand() * rand()) % (file.GetLength()-4);
 		file.Seek(nRandomCorruption, CFile::begin);
 		file.Write(&nRandomCorruption, 4);*/
 
-		file.Seek(0,wxFromStart);
-		VERIFY( TestHashSet.ReadRecoveryData(i, &file) );
-		file.Seek(0,wxFromStart);
+		file.Seek(0, wxFromStart);
+		VERIFY(TestHashSet.ReadRecoveryData(i, &file));
+		file.Seek(0, wxFromStart);
 		TestHashSet.FreeHashSet();
 		uint32 j;
-		for (j = 0; j+EMBLOCKSIZE < 9728000; j += EMBLOCKSIZE) {
-			VERIFY( m_pHashTree.FindHash(i+j, EMBLOCKSIZE, &curLevel) );
-			//TRACE("%u - %s\r\n", cHash, m_pHashTree.FindHash(i+j, EMBLOCKSIZE, &curLevel)->m_Hash.GetString());
+		for (j = 0; j + EMBLOCKSIZE < 9728000; j += EMBLOCKSIZE) {
+			VERIFY(m_pHashTree.FindHash(i + j, EMBLOCKSIZE, &curLevel));
 			maxLevel = max(curLevel, maxLevel);
 			curLevel = 0;
 			cHash++;
 		}
-		VERIFY( m_pHashTree.FindHash(i+j, 9728000-j, &curLevel) );
-		//TRACE("%u - %s\r\n", cHash, m_pHashTree.FindHash(i+j, 9728000-j, &curLevel)->m_Hash.GetString());
+		VERIFY(m_pHashTree.FindHash(i + j, 9728000 - j, &curLevel));
 		maxLevel = max(curLevel, maxLevel);
 		curLevel = 0;
 		cHash++;
-
 	}
-	VERIFY( CreatePartRecoveryData(i, &file) );
-	file.Seek(0,wxFromStart);
-	VERIFY( TestHashSet.ReadRecoveryData(i, &file) );
-	file.Seek(0,wxFromStart);
+	VERIFY(CreatePartRecoveryData(i, &file));
+	file.Seek(0, wxFromStart);
+	VERIFY(TestHashSet.ReadRecoveryData(i, &file));
+	file.Seek(0, wxFromStart);
 	TestHashSet.FreeHashSet();
-	for (uint64 j = 0; j+EMBLOCKSIZE < TESTSIZE-i; j += EMBLOCKSIZE) {
-		VERIFY( m_pHashTree.FindHash(i+j, EMBLOCKSIZE, &curLevel) );
-		//TRACE("%u - %s\r\n", cHash,m_pHashTree.FindHash(i+j, EMBLOCKSIZE, &curLevel)->m_Hash.GetString());
+	for (uint64 j = 0; j + EMBLOCKSIZE < TESTSIZE - i; j += EMBLOCKSIZE) {
+		VERIFY(m_pHashTree.FindHash(i + j, EMBLOCKSIZE, &curLevel));
 		maxLevel = max(curLevel, maxLevel);
 		curLevel = 0;
 		cHash++;
 	}
-	//VERIFY( m_pHashTree.FindHash(i+j, (TESTSIZE-i)-j, &curLevel) );
-	//TRACE("%u - %s\r\n", cHash,m_pHashTree.FindHash(i+j, (TESTSIZE-i)-j, &curLevel)->m_Hash.GetString());
 	maxLevel = max(curLevel, maxLevel);
 #endif
 }

amule-3.0.1.tar.gz/src/SHAHashSet.h -> amule-3.1.0.tar.gz/src/SHAHashSet.h Changed

@@ -38,17 +38,17 @@
 Example tree:
 	FileSize: 19506000 Bytes = 18,6 MB
 
-              X(18,6 MB)						MasterHash
-             /          \
-          X(18,55)       \
-         /        \       \
+	      X(18,6 MB)						MasterHash
+	     /          \
+	  X(18,55)       \
+	 /        \       \
   X(9,28)         X(9,28)  X(0,05MB)				PartHashs
  /     \         /     \          \
 X(4,75) X(4,57) X(4,57) X(4,57)    X(4,75)
 ...............
 X(180KB)   X(180KB)  ... X(140KB) | X(180KB) X(180KB) ...	BlockHashs
-                                    v
-                                    Border between first and second Part (9.28MB)
+				    v
+				    Border between first and second Part (9.28MB)
 
 HashsIdentifier:
 When sending hashes, they are sent with a 16bit identifier which specifies its position in the
@@ -65,28 +65,29 @@
  / \   \
 x  _X_  x	        0000000000000110
 
-
-Version 2 of AICH also supports 32bit identifiers to support large files, check CAICHHashSet::CreatePartRecoveryData
+Version 2 of AICH also supports 32bit identifiers to support large files, check
+CAICHHashSet::CreatePartRecoveryData
 */
 
-#ifndef __SHAHAHSET_H__
-#define __SHAHAHSET_H__
+#ifndef SHAHASHSET_H
+#define SHAHASHSET_H
 
 #include <deque>
 #include <set>
 #include <unordered_map>
 
-#include <wx/thread.h>		// Needed for wxMutex
+#include <wx/thread.h> // Needed for wxMutex
 
 #include "Types.h"
 #include "ClientRef.h"
 
-#define HASHSIZE			20
-#define KNOWN2_MET_FILENAME		"known2_64.met"
-#define OLD_KNOWN2_MET_FILENAME		"known2.met"
-#define KNOWN2_MET_VERSION		0x02
+#define HASHSIZE 20
+#define KNOWN2_MET_FILENAME "known2_64.met"
+#define OLD_KNOWN2_MET_FILENAME "known2.met"
+#define KNOWN2_MET_VERSION 0x02
 
-enum EAICHStatus {
+enum EAICHStatus
+{
 	AICH_ERROR = 0,
 	AICH_EMPTY,
 	AICH_UNTRUSTED,
@@ -101,43 +102,42 @@
 class CPartFile;
 class CUpDownClient;
 
-
 /////////////////////////////////////////////////////////////////////////////////////////
-///CAICHHash
+/// CAICHHash
 class CAICHHash
 {
 private:
 	uint8_t m_abyBufferHASHSIZE;
 
 public:
-	CAICHHash()				{ memset(m_abyBuffer, 0, HASHSIZE); }
-	CAICHHash(CFileDataIO* file)		{ Read(file); }
-	CAICHHash(uint8_t* data)		{ Read(data); }
-	CAICHHash(const CAICHHash& k1)		{ *this = k1; }
+	CAICHHash() { memset(m_abyBuffer, 0, HASHSIZE); }
+	CAICHHash(CFileDataIO *file) { Read(file); }
+	CAICHHash(uint8_t *data) { Read(data); }
+	CAICHHash(const CAICHHash &k1) { *this = k1; }
 	~CAICHHash() {}
-	CAICHHash& operator=(const CAICHHash& k1)
-	{
-		memcpy(m_abyBuffer, k1.m_abyBuffer, HASHSIZE);
-		return *this;
-	}
-	friend bool operator==(const CAICHHash& k1,const CAICHHash& k2)
+	// Defaulted: member-wise copy of the POD hash buffer, self-assignment-safe.
+	CAICHHash &operator=(const CAICHHash &k1) = default;
+	friend bool operator==(const CAICHHash &k1, const CAICHHash &k2)
 	{
 		return memcmp(k1.m_abyBuffer, k2.m_abyBuffer, HASHSIZE) == 0;
 	}
-	friend bool operator!=(const CAICHHash& k1,const CAICHHash& k2)	{ return !(k1 == k2); }
-	void Read(CFileDataIO* file);
-	void Write(CFileDataIO* file) const;
-	void Read(uint8_t* data)		{ memcpy(m_abyBuffer, data, HASHSIZE); }
+	friend bool operator!=(const CAICHHash &k1, const CAICHHash &k2) { return !(k1 == k2); }
+	void Read(CFileDataIO *file);
+	void Write(CFileDataIO *file) const;
+	void Read(uint8_t *data) { memcpy(m_abyBuffer, data, HASHSIZE); }
 	wxString GetString() const;
-	uint8_t* GetRawHash()			{ return m_abyBuffer; }
-	const uint8_t* GetRawHash() const	{ return m_abyBuffer; }
-	static uint32 GetHashSize()		{ return HASHSIZE;}
+	uint8_t *GetRawHash() { return m_abyBuffer; }
+	const uint8_t *GetRawHash() const { return m_abyBuffer; }
+	static uint32 GetHashSize() { return HASHSIZE; }
 	unsigned int DecodeBase32(const wxString &base32);
 };
 
-namespace std {
-template <> struct hash<CAICHHash> {
-	size_t operator()(const CAICHHash& h) const noexcept {
+namespace std
+{
+template <> struct hash<CAICHHash>
+{
+	size_t operator()(const CAICHHash &h) const noexcept
+	{
 		// Root hashes already have ~uniform bit distribution; any 8
 		// contiguous bytes make a perfectly fine size_t-sized hash.
 		size_t v;
@@ -145,74 +145,80 @@
 		return v;
 	}
 };
-}
+} // namespace std
 
 /////////////////////////////////////////////////////////////////////////////////////////
-///CAICHHashAlgo
+/// CAICHHashAlgo
 class CAICHHashAlgo
 {
 public:
 	virtual ~CAICHHashAlgo() {};
 	virtual void Reset() = 0;
-	virtual void Add(const void* pData, uint32 nLength) = 0;
-	virtual void Finish(CAICHHash& Hash) = 0;
-	virtual void GetHash(CAICHHash& Hash) = 0;
+	virtual void Add(const void *pData, uint32 nLength) = 0;
+	virtual void Finish(CAICHHash &Hash) = 0;
+	virtual void GetHash(CAICHHash &Hash) = 0;
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
-///CAICHHashTree
+/// CAICHHashTree
 class CAICHHashTree
 {
 	friend class CAICHHashSet;
+
 private:
 	CAICHHash m_Hash;
-	uint64 m_nDataSize;	// size of data which is covered by this hash
-	uint64 m_nBaseSize;	// blocksize on which the lowest hash is based on
-	bool m_bIsLeftBranch;	// left or right branch of the tree
-	bool m_bHashValid;	// the hash is valid and not empty
-	CAICHHashTree* m_pLeftTree;
-	CAICHHashTree* m_pRightTree;
+	uint64 m_nDataSize;   // size of data which is covered by this hash
+	uint64 m_nBaseSize;   // blocksize on which the lowest hash is based on
+	bool m_bIsLeftBranch; // left or right branch of the tree
+	bool m_bHashValid;    // the hash is valid and not empty
+	CAICHHashTree *m_pLeftTree;
+	CAICHHashTree *m_pRightTree;
 
 public:
 	CAICHHashTree(uint64 nDataSize, bool bLeftBranch, uint64 nBaseSize);
 	~CAICHHashTree();
 
-	const CAICHHash &GetHash() const	{ return m_Hash; }
-	uint64 GetNDataSize() const		{ return m_nDataSize; }
-	uint64 GetNBaseSize() const		{ return m_nBaseSize; }
-	bool GetIsLeftBranch() const		{ return m_bIsLeftBranch; }
-	bool GetHashValid() const		{ return m_bHashValid; }
+	const CAICHHash &GetHash() const { return m_Hash; }
+	uint64 GetNDataSize() const { return m_nDataSize; }
+	uint64 GetNBaseSize() const { return m_nBaseSize; }
+	bool GetIsLeftBranch() const { return m_bIsLeftBranch; }
+	bool GetHashValid() const { return m_bHashValid; }
 
-	void SetBlockHash(uint64 nSize, uint64 nStartPos, CAICHHashAlgo* pHashAlg);
-	bool ReCalculateHash(CAICHHashAlgo* hashalg, bool bDontReplace );
-	bool VerifyHashTree(CAICHHashAlgo* hashalg, bool bDeleteBadTrees);
-	CAICHHashTree* FindHash(uint64 nStartPos, uint64 nSize)
+	void SetBlockHash(uint64 nSize, uint64 nStartPos, CAICHHashAlgo *pHashAlg);
+	bool ReCalculateHash(CAICHHashAlgo *hashalg, bool bDontReplace);
+	bool VerifyHashTree(CAICHHashAlgo *hashalg, bool bDeleteBadTrees);
+	CAICHHashTree *FindHash(uint64 nStartPos, uint64 nSize)
 	{
 		uint8 buffer = 0;
 		return FindHash(nStartPos, nSize, &buffer);
 	}
 
 protected:
-	CAICHHashTree* FindHash(uint64 nStartPos, uint64 nSize, uint8* nLevel);
-	bool CreatePartRecoveryData(uint64 nStartPos, uint64 nSize,
-		CFileDataIO* fileDataOut, uint32 wHashIdent, bool b32BitIdent);
-	void WriteHash(CFileDataIO* fileDataOut, uint32 wHashIdent, bool b32BitIdent) const;
-	bool WriteLowestLevelHashs(CFileDataIO* fileDataOut,
-		uint32 wHashIdent, bool bNoIdent, bool b32BitIdent) const;
-	bool LoadLowestLevelHashs(CFileDataIO* fileInput);
-	bool SetHash(CFileDataIO* fileInput, uint32 wHashIdent, sint8 nLevel = (-1), bool bAllowOverwrite = true);
+	CAICHHashTree *FindHash(uint64 nStartPos, uint64 nSize, uint8 *nLevel);
+	bool CreatePartRecoveryData(uint64 nStartPos,
+		uint64 nSize,
+		CFileDataIO *fileDataOut,
+		uint32 wHashIdent,
+		bool b32BitIdent);
+	void WriteHash(CFileDataIO *fileDataOut, uint32 wHashIdent, bool b32BitIdent) const;
+	bool WriteLowestLevelHashs(
+		CFileDataIO *fileDataOut, uint32 wHashIdent, bool bNoIdent, bool b32BitIdent) const;
+	bool LoadLowestLevelHashs(CFileDataIO *fileInput);
+	bool SetHash(
+		CFileDataIO *fileInput, uint32 wHashIdent, sint8 nLevel = (-1), bool bAllowOverwrite = true);
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
-///CAICHUntrustedHashs
-class CAICHUntrustedHash {
+/// CAICHUntrustedHashs
+class CAICHUntrustedHash
+{
 public:
 	CAICHUntrustedHash() = default;
-	CAICHUntrustedHash(const CAICHUntrustedHash&) = default;
-	CAICHUntrustedHash& operator=(const CAICHUntrustedHash& k1)
+	CAICHUntrustedHash(const CAICHUntrustedHash &) = default;
+	CAICHUntrustedHash &operator=(const CAICHUntrustedHash &k1)
 	{
 		m_adwIpsSigning = k1.m_adwIpsSigning;
-		m_Hash = k1.m_Hash ;
+		m_Hash = k1.m_Hash;
 		return *this;
 	}
 	bool AddSigningIP(uint32 dwIP);
@@ -222,38 +228,33 @@
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
-///CAICHUntrustedHashs
-class CAICHRequestedData {
+/// CAICHUntrustedHashs
+class CAICHRequestedData
+{
 public:
 	CAICHRequestedData()
 	{
 		m_nPart = 0;
 		m_pPartFile = NULL;
 	}
-	CAICHRequestedData(const CAICHRequestedData&) = default;
-	CAICHRequestedData& operator=(const CAICHRequestedData& k1)
-	{
-		m_nPart = k1.m_nPart;
-		m_pPartFile = k1.m_pPartFile;
-		m_pClient = k1.m_pClient;
-		return *this;
-	}
+	CAICHRequestedData(const CAICHRequestedData &) = default;
+	// Defaulted: member-wise copy (CClientRef::operator= guards self-assignment).
+	CAICHRequestedData &operator=(const CAICHRequestedData &) = default;
 	uint16 m_nPart;
-	CPartFile* m_pPartFile;
+	CPartFile *m_pPartFile;
 	CClientRef m_pClient;
 };
 
-
 using namespace std;
 
 typedef std::list<CAICHRequestedData> CAICHRequestedDataList;
 
 /////////////////////////////////////////////////////////////////////////////////////////
-///CAICHHashSet
+/// CAICHHashSet
 class CAICHHashSet
 {
 private:
-	CKnownFile* m_pOwner;
+	CKnownFile *m_pOwner;
 	EAICHStatus m_eStatus;
 	deque<CAICHUntrustedHash> m_aUntrustedHashs;
 
@@ -261,72 +262,65 @@
 	static CAICHRequestedDataList m_liRequestedData;
 	CAICHHashTree m_pHashTree;
 
-	CAICHHashSet(CKnownFile* pOwner);
+	CAICHHashSet(CKnownFile *pOwner);
 	~CAICHHashSet(void);
-	bool CreatePartRecoveryData(uint64 nPartStartPos, CFileDataIO* fileDataOut, bool bDbgDontLoad = false);
-	bool ReadRecoveryData(uint64 nPartStartPos, CMemFile* fileDataIn);
+	bool CreatePartRecoveryData(
+		uint64 nPartStartPos, CFileDataIO *fileDataOut, bool bDbgDontLoad = false);
+	bool ReadRecoveryData(uint64 nPartStartPos, CMemFile *fileDataIn);
 	bool ReCalculateHash(bool bDontReplace = false);
 	bool VerifyHashTree(bool bDeleteBadTrees);
-	void UntrustedHashReceived(const CAICHHash& Hash, uint32 dwFromIP);
+	void UntrustedHashReceived(const CAICHHash &Hash, uint32 dwFromIP);
 	bool IsPartDataAvailable(uint64 nPartStartPos);
-	void SetStatus(EAICHStatus bNewValue)	{ m_eStatus = bNewValue; }
-	EAICHStatus GetStatus()	const		{ return m_eStatus; }
+	void SetStatus(EAICHStatus bNewValue) { m_eStatus = bNewValue; }
+	EAICHStatus GetStatus() const { return m_eStatus; }
 
 	void FreeHashSet();
 	void SetFileSize(uint64 nSize);
 
-	CAICHHash& GetMasterHash()		{ return m_pHashTree.m_Hash; }
-	void SetMasterHash(const CAICHHash& Hash, EAICHStatus eNewStatus);
-	bool HasValidMasterHash()		{ return m_pHashTree.m_bHashValid; }
+	CAICHHash &GetMasterHash() { return m_pHashTree.m_Hash; }
+	void SetMasterHash(const CAICHHash &Hash, EAICHStatus eNewStatus);
+	bool HasValidMasterHash() { return m_pHashTree.m_bHashValid; }
 
 	bool SaveHashSet();
 	bool LoadHashSet(); // only call directly when debugging
 
-	static CAICHHashAlgo* GetNewHashAlgo();
-	static void ClientAICHRequestFailed(CUpDownClient* pClient);
-	static void RemoveClientAICHRequest(const CUpDownClient* pClient);
-	static bool IsClientRequestPending(const CPartFile* pForFile, uint16 nPart);
-
-	// Pointer-value strip of any pending AICH-recovery request entry
-	// whose m_pPartFile == `file`. Called from MuleNotify::
-	// KnownFileBeingDestroyed before a CKnownFile / CPartFile is
-	// freed so the existing IsPartFile() guard in
-	// ClientAICHRequestFailed can't be spoofed by allocator reuse of
-	// the same address.
-	static void DropReferencesTo(const CKnownFile* file);
-	static CAICHRequestedData GetAICHReqDetails(const  CUpDownClient* pClient);
+	static CAICHHashAlgo *GetNewHashAlgo();
+	static void ClientAICHRequestFailed(CUpDownClient *pClient);
+	static void RemoveClientAICHRequest(const CUpDownClient *pClient);
+	static bool IsClientRequestPending(const CPartFile *pForFile, uint16 nPart);
+
+	// Pointer-value strip of any pending AICH-recovery request entry whose m_pPartFile ==
+	// `file`. Called from MuleNotify::KnownFileBeingDestroyed before the file is freed, so the
+	// IsPartFile() guard in ClientAICHRequestFailed cannot be spoofed by allocator reuse of the
+	// same address.
+	static void DropReferencesTo(const CKnownFile *file);
+	static CAICHRequestedData GetAICHReqDetails(const CUpDownClient *pClient);
 	void DbgTest();
 
-	void SetOwner(CKnownFile* owner)	{ m_pOwner = owner; }
+	void SetOwner(CKnownFile *owner) { m_pOwner = owner; }
 
-	// Drop the in-memory dedup cache used by SaveHashSet. Call after anything
-	// mutates known2.met outside SaveHashSet (e.g. CAICHSyncTask's corruption
-	// truncation path) so the cache doesn't hold ghost entries.
+	// Drop the in-memory dedup cache used by SaveHashSet. Call after anything mutates
+	// known2.met outside SaveHashSet (CAICHSyncTask's corruption truncation path, say) so the
+	// cache does not hold ghost entries.
 	static void InvalidateRootHashCache();
 
 private:
-	// Cache mapping every root hash currently stored in known2.met to
-	// the byte offset of its entry's root-hash position in the file.
-	// Populated lazily on first SaveHashSet or LoadHashSet call (or
-	// refilled after invalidation).
+	// Cache mapping every root hash currently stored in known2.met to the byte offset of its
+	// entry's root-hash position, populated lazily on the first SaveHashSet or LoadHashSet
+	// call.
 	//
-	// - For SaveHashSet: replaces the per-call linear file walk that
-	//   made the dedup check O(N) per call / O(N^2) over a bulk-hash
-	//   batch.
-	// - For LoadHashSet (and the AICH request path that calls it):
-	//   replaces the per-call linear file walk that turned each
-	//   incoming OP_AICHREQUEST into an O(N) disk-backed scan. The
-	//   cached offset lets LoadHashSet seek straight to the matching
-	//   entry, making the AICH request path O(1) and closing the DoS
-	//   amplification noted in #166.
-	static wxMutex			s_rootHashCacheMutex;
+	// For SaveHashSet it replaces the per-call linear file walk that made the dedup check O(N)
+	// per call and O(N^2) over a bulk-hash batch. For LoadHashSet, and the AICH request path
+	// that calls it, the cached offset lets it seek straight to the matching entry, making that
+	// path O(1) and closing the DoS amplification noted in #166.
+	static wxMutex s_rootHashCacheMutex;
 	static std::unordered_map<CAICHHash, uint64> s_rootHashCache;
-	static bool			s_rootHashCacheLoaded;
+	static bool s_rootHashCacheLoaded;
 
 	// Caller must hold s_rootHashCacheMutex.
 	static void LoadRootHashCacheLocked();
 };
 
-#endif  //__SHAHAHSET_H__
+#endif // SHAHASHSET_H
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/SafeFile.cpp -> amule-3.1.0.tar.gz/src/SafeFile.cpp Changed

@@ -23,52 +23,52 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "SafeFile.h"			// Interface declarations.
-#include "MD4Hash.h"			// Needed for CMD4Hash
-#include "kademlia/utils/UInt128.h"	// Needed for CUInt128
-#include "ScopedPtr.h"			// Needed for CScopedPtr and CScopedArray
+#include "SafeFile.h"               // Interface declarations.
+#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
-#include <common/StringFunctions.h>	// Needed for EscapeForLog
-#include "CompilerSpecific.h"		// Needed for __FUNCTION__
+#include <common/Format.h>          // Needed for CFormat
+#include <common/StringFunctions.h> // Needed for EscapeForLog
+#include "CompilerSpecific.h"       // Needed for __FUNCTION__
 
-#include <cstring>              // For std::memcpy
+#include <cstring> // For std::memcpy
 
-#define CHECK_BOM(size, x) ((size >= 3)  && (x0 == (char)0xEF) && (x1 == (char)0xBB) && (x2 == (char)0xBF))
+#define CHECK_BOM(size, x) \
+	((size >= 3) && (x0 == (char)0xEF) && (x1 == (char)0xBB) && (x2 == (char)0xBF))
 
-const char BOMHeader3 = { '\xEF', '\xBB', '\xBF'};
-
-
-CSafeIOException::CSafeIOException(const wxString& type, const wxString& desc)
-	: CMuleException("SafeIO::" + type, desc) {}
-
-
-CEOFException::CEOFException(const wxString& desc)
-	: CSafeIOException("EOF", desc) {}
+const char BOMHeader3 = { '\xEF', '\xBB', '\xBF' };
 
+CSafeIOException::CSafeIOException(const wxString &type, const wxString &desc)
+: CMuleException("SafeIO::" + type, desc)
+{
+}
 
-CIOFailureException::CIOFailureException(const wxString& desc)
-	: CSafeIOException("IOFailure", desc) {}
+CEOFException::CEOFException(const wxString &desc)
+: CSafeIOException("EOF", desc)
+{
+}
 
-CIOFailureException::CIOFailureException(const wxString& type, const wxString& desc)
-	: CSafeIOException("IOFailure::" + type, desc) {}
+CIOFailureException::CIOFailureException(const wxString &desc)
+: CSafeIOException("IOFailure", desc)
+{
+}
 
+CIOFailureException::CIOFailureException(const wxString &type, const wxString &desc)
+: CSafeIOException("IOFailure::" + type, desc)
+{
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // CFileDataIO
 
-
-CFileDataIO::~CFileDataIO()
-{
-}
-
+CFileDataIO::~CFileDataIO() {}
 
 bool CFileDataIO::Eof() const
 {
 	return GetPosition() >= GetLength();
 }
 
-
 void CFileDataIO::Read(void *buffer, size_t count) const
 {
 	MULE_VALIDATE_PARAMS(buffer, "Attempting to write to NULL buffer.");
@@ -86,8 +86,7 @@
 	}
 }
 
-
-void CFileDataIO::Write(const void* buffer, size_t count)
+void CFileDataIO::Write(const void *buffer, size_t count)
 {
 	MULE_VALIDATE_PARAMS(buffer, "Attempting to read from NULL buffer.");
 
@@ -96,25 +95,24 @@
 	}
 }
 
-
 uint64 CFileDataIO::Seek(sint64 offset, wxSeekMode from) const
 {
 	sint64 newpos = 0;
 	switch (from) {
-		case wxFromStart:
-			newpos = offset;
-			break;
+	case wxFromStart:
+		newpos = offset;
+		break;
 
-		case wxFromCurrent:
-			newpos = GetPosition() + offset;
-			break;
+	case wxFromCurrent:
+		newpos = GetPosition() + offset;
+		break;
 
-		case wxFromEnd:
-			newpos = GetLength() + offset;
-			break;
+	case wxFromEnd:
+		newpos = GetLength() + offset;
+		break;
 
-		default:
-			MULE_VALIDATE_PARAMS(false, "Invalid seek-mode specified.");
+	default:
+		MULE_VALIDATE_PARAMS(false, "Invalid seek-mode specified.");
 	}
 
 	MULE_VALIDATE_PARAMS(newpos >= 0, "Position after seeking would be less than zero!");
@@ -126,7 +124,6 @@
 	return result;
 }
 
-
 uint8 CFileDataIO::ReadUInt8() const
 {
 	uint8 value = 0;
@@ -135,7 +132,6 @@
 	return value;
 }
 
-
 uint16 CFileDataIO::ReadUInt16() const
 {
 	uint16 value = 0;
@@ -144,7 +140,6 @@
 	return ENDIAN_SWAP_16(value);
 }
 
-
 uint32 CFileDataIO::ReadUInt32() const
 {
 	uint32 value = 0;
@@ -153,7 +148,6 @@
 	return ENDIAN_SWAP_32(value);
 }
 
-
 uint64 CFileDataIO::ReadUInt64() const
 {
 	uint64 value = 0;
@@ -162,10 +156,7 @@
 	return ENDIAN_SWAP_64(value);
 }
 
-
-// UInt128 values are stored a little weird way...
-// Four little-endian 32-bit numbers, stored in
-// big-endian order
+// UInt128 values are stored oddly: four little-endian 32-bit numbers in big-endian order.
 CUInt128 CFileDataIO::ReadUInt128() const
 {
 	CUInt128 value;
@@ -177,7 +168,6 @@
 	return value;
 }
 
-
 CMD4Hash CFileDataIO::ReadHash() const
 {
 	CMD4Hash value;
@@ -186,7 +176,6 @@
 	return value;
 }
 
-
 float CFileDataIO::ReadFloat() const
 {
 	float retVal;
@@ -198,8 +187,7 @@
 	return retVal;
 }
 
-
-unsigned char* CFileDataIO::ReadBsob(uint8* puSize) const
+unsigned char *CFileDataIO::ReadBsob(uint8 *puSize) const
 {
 	MULE_VALIDATE_PARAMS(puSize, "NULL pointer argument in ReadBsob");
 
@@ -211,16 +199,19 @@
 	return bsob.release();
 }
 
-
 wxString CFileDataIO::ReadString(bool bOptUTF8, uint8 SizeLen, bool SafeRead) const
 {
 	uint32 readLen;
 	switch (SizeLen) {
-		case sizeof(uint16):	readLen = ReadUInt16();	break;
-		case sizeof(uint32):	readLen = ReadUInt32();	break;
-
-		default:
-			MULE_VALIDATE_PARAMS(false, "Invalid SizeLen value in ReadString");
+	case sizeof(uint16):
+		readLen = ReadUInt16();
+		break;
+	case sizeof(uint32):
+		readLen = ReadUInt32();
+		break;
+
+	default:
+		MULE_VALIDATE_PARAMS(false, "Invalid SizeLen value in ReadString");
 	}
 
 	if (SafeRead) {
@@ -230,16 +221,14 @@
 	return ReadOnlyString(bOptUTF8, readLen);
 }
 
-
 wxString CFileDataIO::ReadOnlyString(bool bOptUTF8, uint16 raw_len) const
 {
-	// We only need to set the the NULL terminator, since we know that
-	// reads will either succeed or throw an exception, in which case
-	// we wont be returning anything
+	// Only the NULL terminator needs setting: a read either succeeds or throws, and on a throw
+	// nothing is returned.
 	std::vector<char> val_array(raw_len + 1);
 	val_arrayraw_len = 0;
 
-	char* val = &(val_array0);
+	char *val = &(val_array0);
 
 	Read(val, raw_len);
 	wxString str;
@@ -261,13 +250,11 @@
 	return str;
 }
 
-
 void CFileDataIO::WriteUInt8(uint8 value)
 {
 	Write(&value, sizeof(uint8));
 }
 
-
 void CFileDataIO::WriteUInt16(uint16 value)
 {
 	ENDIAN_SWAP_I_16(value);
@@ -275,7 +262,6 @@
 	Write(&value, sizeof(uint16));
 }
 
-
 void CFileDataIO::WriteUInt32(uint32 value)
 {
 	ENDIAN_SWAP_I_32(value);
@@ -283,7 +269,6 @@
 	Write(&value, sizeof(uint32));
 }
 
-
 void CFileDataIO::WriteUInt64(uint64 value)
 {
 	ENDIAN_SWAP_I_64(value);
@@ -291,11 +276,8 @@
 	Write(&value, sizeof(uint64));
 }
 
-
-// UInt128 values are stored a little weird way...
-// Four little-endian 32-bit numbers, stored in
-// big-endian order
-void CFileDataIO::WriteUInt128(const Kademlia::CUInt128& value)
+// UInt128 values are stored oddly: four little-endian 32-bit numbers in big-endian order.
+void CFileDataIO::WriteUInt128(const Kademlia::CUInt128 &value)
 {
 	for (int i = 0; i < 4; i++) {
 		// Four 32bits chunks
@@ -303,13 +285,11 @@
 	}
 }
 
-
-void CFileDataIO::WriteHash(const CMD4Hash& value)
+void CFileDataIO::WriteHash(const CMD4Hash &value)
 {
 	Write(value.GetHash(), MD4HASH_LENGTH);
 }
 
-
 void CFileDataIO::WriteFloat(float value)
 {
 	uint32_t toswap{};
@@ -319,35 +299,32 @@
 	Write(&value, sizeof(float));
 }
 
-
-void CFileDataIO::WriteBsob(const unsigned char* value, uint8 size)
+void CFileDataIO::WriteBsob(const unsigned char *value, uint8 size)
 {
 	WriteUInt8(size);
 	Write(value, size);
 }
 
-
-void CFileDataIO::WriteString(const wxString& str, EUtf8Str eEncode, uint8 SizeLen)
+void CFileDataIO::WriteString(const wxString &str, EUtf8Str eEncode, uint8 SizeLen)
 {
 	switch (eEncode) {
-		case utf8strRaw:
-		case utf8strOptBOM: {
-			Unicode2CharBuf s(unicode2UTF8(str));
-			if (s.data()) {
-				WriteStringCore(s, eEncode, SizeLen);
-				break;
-			}
-		}
-		/* fall through */
-		default: {
-			// Non UTF-8 strings are saved as Latin-1
-			wxCharBuffer s1 = str.mb_str(wxConvISO8859_1);
-			WriteStringCore(s1, utf8strNone, SizeLen);
+	case utf8strRaw:
+	case utf8strOptBOM: {
+		Unicode2CharBuf s(unicode2UTF8(str));
+		if (s.data()) {
+			WriteStringCore(s, eEncode, SizeLen);
+			break;
 		}
 	}
+	/* fall through */
+	default: {
+		// Non UTF-8 strings are saved as Latin-1
+		wxCharBuffer s1 = str.mb_str(wxConvISO8859_1);
+		WriteStringCore(s1, utf8strNone, SizeLen);
+	}
+	}
 }
 
-
 void CFileDataIO::WriteStringCore(const char *s, EUtf8Str eEncode, uint8 SizeLen)
 {
 	uint32 sLength = s ? strlen(s) : 0;
@@ -359,37 +336,36 @@
 	}
 
 	switch (SizeLen) {
-		case 0:
-			// Don't write size.
-			break;
-
-		case sizeof(uint16):
-			// We must not allow too long strings to be written,
-			// as this would allow for a buggy clients to "poison"
-			// us, by sending ISO8859-1 strings that expand to a
-			// greater than 16b length when converted as UTF-8.
-			if (real_length > 0xFFFF) {
-				AddDebugLogLineN(logCFile,
-					CFormat(wxT("WriteStringCore: oversized string (%u bytes) truncated to 0xFFFF"))
-						% real_length);
-
-				real_length = std::min<uint32>(real_length, 0xFFFF);
-				if (eEncode == utf8strOptBOM) {
-					sLength = real_length - 3;
-				} else {
-					sLength = real_length;
-				}
+	case 0:
+		// Don't write size.
+		break;
+
+	case sizeof(uint16):
+		// Overlong strings must not be written, or a buggy client could "poison" us by
+		// sending ISO8859-1 strings that expand past 16 bits when converted to UTF-8.
+		if (real_length > 0xFFFF) {
+			AddDebugLogLineN(logCFile,
+				CFormat(wxT(
+					"WriteStringCore: oversized string (%u bytes) truncated to 0xFFFF")) %
+					real_length);
+
+			real_length = std::min<uint32>(real_length, 0xFFFF);
+			if (eEncode == utf8strOptBOM) {
+				sLength = real_length - 3;
+			} else {
+				sLength = real_length;
 			}
+		}
 
-			WriteUInt16(real_length);
-			break;
+		WriteUInt16(real_length);
+		break;
 
-		case sizeof(uint32):
-			WriteUInt32(real_length);
-			break;
+	case sizeof(uint32):
+		WriteUInt32(real_length);
+		break;
 
-		default:
-			MULE_VALIDATE_PARAMS(false, "Invalid length for string-length field.");
+	default:
+		MULE_VALIDATE_PARAMS(false, "Invalid length for string-length field.");
 	}
 
 	// The BOM header must be written even if the string is empty.
@@ -404,7 +380,6 @@
 	}
 }
 
-
 CTag *CFileDataIO::ReadTag(bool bOptACP) const
 {
 	CTag *retVal = NULL;
@@ -414,166 +389,157 @@
 		type = ReadUInt8();
 		name = ReadString(false);
 
-		switch (type)
-		{
-			// NOTE: This tag data type is accepted and stored only to give us the possibility to upgrade
-			// the net in some months.
-			//
-			// And still.. it doesn't work this way without breaking backward compatibility. To properly
-			// do this without messing up the network the following would have to be done:
-			//	 -	those tag types have to be ignored by any client, otherwise those tags would also be sent (and
-			//		that's really the problem)
-			//
-			//	 -	ignoring means, each client has to read and right throw away those tags, so those tags get
-			//		get never stored in any tag list which might be sent by that client to some other client.
-			//
-			//	 -	all calling functions have to be changed to deal with the 'nr. of tags' attribute (which was
-			//		already parsed) correctly.. just ignoring those tags here is not enough, any taglists have to
-			//		be built with the knowledge that the 'nr. of tags' attribute may get decreased during the tag
-			//		reading..
-			//
-			// If those new tags would just be stored and sent to remote clients, any malicious or just bugged
-			// client could let send a lot of nodes "corrupted" packets...
-			//
-			case TAGTYPE_HASH16:
-			{
-				retVal = new CTagHash(name, ReadHash());
-				break;
-			}
+		switch (type) {
+		// This tag data type is accepted and stored only to leave room for a future upgrade
+		// of the net, and even that does not work without breaking backward compatibility:
+		// doing it properly would mean every client reading and discarding these tags
+		// rather than storing them, so they are never re-sent, and every caller handling a
+		// 'nr. of tags' attribute that shrinks during the read. Storing and forwarding them
+		// instead would let a malicious or buggy client have nodes send corrupted packets.
+		case TAGTYPE_HASH16: {
+			retVal = new CTagHash(name, ReadHash());
+			break;
+		}
 
-			case TAGTYPE_STRING:
-				retVal = new CTagString(name, ReadString(bOptACP));
-				break;
-
-			case TAGTYPE_UINT64:
-				retVal = new CTagInt64(name, ReadUInt64());
-				break;
-
-			case TAGTYPE_UINT32:
-				retVal = new CTagInt32(name, ReadUInt32());
-				break;
-
-			case TAGTYPE_UINT16:
-				retVal = new CTagInt16(name, ReadUInt16());
-				break;
-
-			case TAGTYPE_UINT8:
-				retVal = new CTagInt8(name, ReadUInt8());
-				break;
-
-			case TAGTYPE_FLOAT32:
-				retVal = new CTagFloat(name, ReadFloat());
-				break;
-
-			// NOTE: This tag data type is accepted and stored only to give us the possibility to upgrade
-			// the net in some months.
-			//
-			// And still.. it doesn't work this way without breaking backward compatibility
-			case TAGTYPE_BSOB:
-			{
-				uint8 size = 0;
-				CScopedArray<unsigned char> value(ReadBsob(&size));
-
-				retVal = new CTagBsob(name, value.get(), size);
-				break;
-			}
+		case TAGTYPE_STRING:
+			retVal = new CTagString(name, ReadString(bOptACP));
+			break;
+
+		case TAGTYPE_UINT64:
+			retVal = new CTagInt64(name, ReadUInt64());
+			break;
+
+		case TAGTYPE_UINT32:
+			retVal = new CTagInt32(name, ReadUInt32());
+			break;
+
+		case TAGTYPE_UINT16:
+			retVal = new CTagInt16(name, ReadUInt16());
+			break;
+
+		case TAGTYPE_UINT8:
+			retVal = new CTagInt8(name, ReadUInt8());
+			break;
+
+		case TAGTYPE_FLOAT32:
+			retVal = new CTagFloat(name, ReadFloat());
+			break;
 
-			default:
-				// name comes from arbitrary network bytes -- escape control
-				// chars before logging so a malformed / malicious tag can't
-				// inject newlines and corrupt downstream log collectors (#266).
-				throw wxString(CFormat("Invalid Kad tag type; type=0x%02x name=%s\n") % type % EscapeForLog(name));
+		// Same as TAGTYPE_HASH16 above: accepted and stored only to leave room for
+		// a future upgrade, which cannot happen without breaking compatibility.
+		case TAGTYPE_BSOB: {
+			uint8 size = 0;
+			CScopedArray<unsigned char> value(ReadBsob(&size));
+
+			retVal = new CTagBsob(name, value.get(), size);
+			break;
 		}
-	} catch(const CMuleException& e) {
-		AddLogLineN(e.what());
+
+		default:
+			// name comes from arbitrary network bytes -- escape control chars before
+			// logging, so a malformed or malicious tag cannot inject newlines and
+			// corrupt downstream log collectors (#266).
+			throw wxString(CFormat("Invalid Kad tag type; type=0x%02x name=%s\n") % type %
+				       EscapeForLog(name));
+		}
+	} catch (const CMuleException &e) {
+		// Debug, not standard: this says only what went wrong, never which file or packet,
+		// and it is rethrown for a caller that does know. A truncated tag off the network
+		// therefore put a bare "SafeIO::EOF" in the daemon log with nothing around it,
+		// while the line naming the peer and opcode sat at debug level and was compiled out
+		// (issue #961).
+		//
+		// Every caller reports the failure itself: CIndexed through AddDebugLogLineC,
+		// fileview on cerr, and the Kad UDP handlers through CClientUDPSocket -- so a
+		// malformed packet is silent in release, which is right for one that was dropped
+		// and cost nothing.
+		AddDebugLogLineN(logGeneral, e.what());
 		delete retVal;
 		throw;
-	} catch(const wxString& e) {
-		AddLogLineN(e);
+	} catch (const wxString &e) {
+		// Same reasoning: the throw just above carries the type and name,
+		// and the caller names the source.
+		AddDebugLogLineN(logGeneral, e);
 		throw;
 	}
 
 	return retVal;
 }
 
-
-void CFileDataIO::ReadTagPtrList(TagPtrList* taglist, bool bOptACP) const
+void CFileDataIO::ReadTagPtrList(TagPtrList *taglist, bool bOptACP) const
 {
 	MULE_VALIDATE_PARAMS(taglist, "NULL pointer argument in ReadTagPtrList");
 
 	uint32 count = ReadUInt8();
-	for (uint32 i = 0; i < count; i++)
-	{
-		CTag* tag = ReadTag(bOptACP);
+	for (uint32 i = 0; i < count; i++) {
+		CTag *tag = ReadTag(bOptACP);
 		taglist->push_back(tag);
 	}
 }
 
-
-void CFileDataIO::WriteTag(const CTag& tag)
+void CFileDataIO::WriteTag(const CTag &tag)
 {
-	try
-	{
+	try {
 		WriteUInt8(tag.GetType());
 
 		if (!tag.GetName().IsEmpty()) {
-			WriteString(tag.GetName(),utf8strNone);
+			WriteString(tag.GetName(), utf8strNone);
 		} else {
 			WriteUInt16(1);
 			WriteUInt8(tag.GetNameID());
 		}
 
-		switch (tag.GetType())
-		{
-			case TAGTYPE_HASH16:
-				// Do NOT use this to transfer any tags for at least half a year!!
-				WriteHash(CMD4Hash(tag.GetHash()));
-				break;
-			case TAGTYPE_STRING:
-				WriteString(tag.GetStr(), utf8strRaw); // Always UTF8
-				break;
-			case TAGTYPE_UINT64:
-				WriteUInt64(tag.GetInt());
-				break;
-			case TAGTYPE_UINT32:
-				WriteUInt32(tag.GetInt());
-				break;
-			case TAGTYPE_FLOAT32:
-				WriteFloat(tag.GetFloat());
-				break;
-			case TAGTYPE_BSOB:
-				WriteBsob(tag.GetBsob(), tag.GetBsobSize());
-				break;
-			case TAGTYPE_UINT16:
-				WriteUInt16(tag.GetInt());
-				break;
-			case TAGTYPE_UINT8:
-				WriteUInt8(tag.GetInt());
-				break;
-			case TAGTYPE_BLOB:
-				// NOTE: This will break backward compatibility with met files for eMule versions prior to 0.44a
-				// and any aMule prior to SVN 26/02/2005
-				WriteUInt32(tag.GetBlobSize());
-				Write(tag.GetBlob(), tag.GetBlobSize());
-				break;
-			default:
-				//TODO: Support more tag types
-				// With the if above, this should NEVER happen.
-				AddLogLineNS(CFormat("CFileDataIO::WriteTag: Unknown tag: type=0x%02X") % tag.GetType());
-				wxFAIL;
-				break;
+		switch (tag.GetType()) {
+		case TAGTYPE_HASH16:
+			// Do NOT use this to transfer any tags for at least half a year!!
+			WriteHash(CMD4Hash(tag.GetHash()));
+			break;
+		case TAGTYPE_STRING:
+			WriteString(tag.GetStr(), utf8strRaw); // Always UTF8
+			break;
+		case TAGTYPE_UINT64:
+			WriteUInt64(tag.GetInt());
+			break;
+		case TAGTYPE_UINT32:
+			WriteUInt32(tag.GetInt());
+			break;
+		case TAGTYPE_FLOAT32:
+			WriteFloat(tag.GetFloat());
+			break;
+		case TAGTYPE_BSOB:
+			WriteBsob(tag.GetBsob(), tag.GetBsobSize());
+			break;
+		case TAGTYPE_UINT16:
+			WriteUInt16(tag.GetInt());
+			break;
+		case TAGTYPE_UINT8:
+			WriteUInt8(tag.GetInt());
+			break;
+		case TAGTYPE_BLOB:
+			// NOTE: This will break backward compatibility with met files for eMule versions
+			// prior to 0.44a and any aMule prior to SVN 26/02/2005
+			WriteUInt32(tag.GetBlobSize());
+			Write(tag.GetBlob(), tag.GetBlobSize());
+			break;
+		default:
+			// TODO: Support more tag types
+			//  With the if above, this should NEVER happen.
+			AddLogLineNS(
+				CFormat(LOG_DIAGNOSTIC("CFileDataIO::WriteTag: Unknown tag: type=0x%02X")) %
+				tag.GetType());
+			wxFAIL;
+			break;
 		}
 	} catch (...) {
-		AddLogLineNS("Exception in CDataIO:WriteTag");
+		AddLogLineNS(LOG_DIAGNOSTIC("Exception in CDataIO:WriteTag"));
 		throw;
 	}
 }
 
-
-void CFileDataIO::WriteTagPtrList(const TagPtrList& tagList)
+void CFileDataIO::WriteTagPtrList(const TagPtrList &tagList)
 {
 	uint32 count = tagList.size();
-	wxASSERT( count <= 0xFF );
+	wxASSERT(count <= 0xFF);
 
 	WriteUInt8(count);
 	TagPtrList::const_iterator it;
@@ -582,7 +548,8 @@
 	}
 }
 
-uint64 CFileDataIO::GetIntTagValue() const {
+uint64 CFileDataIO::GetIntTagValue() const
+{
 
 	uint8 type = ReadUInt8();
 
@@ -590,24 +557,24 @@
 
 	switch (type) {
 
-		case TAGTYPE_UINT64:
-			return ReadUInt64();
-			break;
+	case TAGTYPE_UINT64:
+		return ReadUInt64();
+		break;
 
-		case TAGTYPE_UINT32:
-			return ReadUInt32();
-			break;
+	case TAGTYPE_UINT32:
+		return ReadUInt32();
+		break;
 
-		case TAGTYPE_UINT16:
-			return ReadUInt16();
-			break;
+	case TAGTYPE_UINT16:
+		return ReadUInt16();
+		break;
 
-		case TAGTYPE_UINT8:
-			return ReadUInt8();
-			break;
+	case TAGTYPE_UINT8:
+		return ReadUInt8();
+		break;
 
-		default:
-			throw wxString("Wrong tag type reading int tag");
+	default:
+		throw wxString("Wrong tag type reading int tag");
 	}
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/SafeFile.h -> amule-3.1.0.tar.gz/src/SafeFile.h Changed

@@ -26,87 +26,66 @@
 #ifndef SAFEFILE_H
 #define SAFEFILE_H
 
-
-#include <wx/filename.h>			// Needed for wxFileName
-#include <common/MuleDebug.h>			// Needef for CMuleException
+#include <wx/filename.h>      // Needed for wxFileName
+#include <common/MuleDebug.h> // Needef for CMuleException
 #include "Tag.h"
 
-namespace Kademlia {
-	class CUInt128;
+namespace Kademlia
+{
+class CUInt128;
 }
 using Kademlia::CUInt128;
 class CMD4Hash;
 
-
 /**
- * This class provides a interface for safe file IO.
+ * Interface for safe file IO.
  *
- * Basic IO operations will either succeed or throw an exception,
- * so that failure cannot be ignored. There are currently 3 types
- * of failures: Read past EOF, errors while reading, and errors
- * while writing.
+ * Basic IO operations either succeed or throw, so failure cannot be ignored. There are
+ * three kinds of failure: read past EOF, errors while reading, and errors while
+ * writing.
  *
- * Beyond basic IO, the interface provides functions for reading
- * and writing a number of simple data-types. These are all written
- * and read as little-endian in order to allow for communication
- * across platforms.
+ * Beyond basic IO, the interface reads and writes a number of simple data types, all
+ * little-endian so they travel across platforms.
  *
- * Note that when empty areas are created, for instance by seeking
- * past the end, then writing, the value of bytes where no data was
- * explicitly written is not specified.
+ * Where an empty area is created -- by seeking past the end, then writing -- the value
+ * of the bytes nothing was explicitly written to is unspecified.
  */
 class CFileDataIO
 {
 public:
 	/**
-	 * The Destructor does nothing, but is needed to allow
-	 * for safe deletion objects via CFileDataIO pointers.
+	 * Does nothing, but is needed to delete objects safely via CFileDataIO pointers.
 	 */
 	virtual ~CFileDataIO();
 
-
-	/**
-	 * Must return the current position in the file.
-	 */
+	/** Must return the current position in the file. */
 	virtual uint64 GetPosition() const = 0;
 
-	/**
-	 * Must return the length of the file-object in bytes.
-	 */
+	/** Must return the length of the file object in bytes. */
 	virtual uint64 GetLength() const = 0;
 
-	/**
-	 * Returns true when the file-position is past or at the end of the file.
-	 */
+	/** Returns true when the file position is past or at the end of the file. */
 	virtual bool Eof() const;
 
-
 	/**
-	 * Changes the file position.
-	 *
-	 * Note that seeking to an negative position is an illegal operation.
+	 * Changes the file position. Seeking to a negative position is illegal.
 	 *
 	 * @see wxFile::Seek
 	 */
 	virtual uint64 Seek(sint64 offset, wxSeekMode from = wxFromStart) const;
 
-
 	/**
 	 * Reads 'count' bytes into 'buffer'.
 	 *
 	 * @param buffer The target buffer.
 	 * @param count The number of bytes to read.
 	 *
-	 * Note that Read will read the specified number of
-	 * bytes unless this would read past the end of the
-	 * file. In that case, a CEOFException is thrown and
-	 * the position and target buffer is left unchanged.
-	 *
-	 * However, it is also possible that the read will
-	 * fail due to IO errors (bad hardware, etc), in which
-	 * case an CIOFailureException will be thrown.
+	 * Reads exactly that many bytes unless it would read past the end of the file, in
+	 * which case a CEOFException is thrown and the position and target buffer are left
+	 * unchanged. A read can also fail on IO errors (bad hardware and the like), which
+	 * throws a CIOFailureException.
 	 */
-	virtual void Read(void* buffer, size_t count) const;
+	virtual void Read(void *buffer, size_t count) const;
 
 	/**
 	 * Write 'count' bytes from 'buffer' into the file.
@@ -114,13 +93,10 @@
 	 * @param buffer The source-data buffer.
 	 * @param count The number of bytes to write.
 	 *
-	 * Note that Write will throw a CIOFailureException
-	 * if it fails to write the specified number of bytes,
-	 * which can be caused by hardware failures, lack of
-	 * free space, etc.
+	 * Throws a CIOFailureException if it fails to write that many bytes -- hardware
+	 * failure, lack of free space, and so on.
 	 */
-	virtual void Write(const void* buffer, size_t count);
-
+	virtual void Write(const void *buffer, size_t count);
 
 	/**
 	 * Reads the given type from the file, stored as little-endian.
@@ -128,14 +104,14 @@
 	 * @see CSafeFileIO::Read
 	 */
 	//@{
-	virtual uint8		ReadUInt8() const;
-	virtual uint16		ReadUInt16() const;
-	virtual uint32		ReadUInt32() const;
-	virtual uint64		ReadUInt64() const;
-	virtual CUInt128	ReadUInt128() const;
-	virtual CMD4Hash	ReadHash() const;
-	virtual float		ReadFloat() const;
-	virtual unsigned char*	ReadBsob(uint8* size) const;
+	virtual uint8 ReadUInt8() const;
+	virtual uint16 ReadUInt16() const;
+	virtual uint32 ReadUInt32() const;
+	virtual uint64 ReadUInt64() const;
+	virtual CUInt128 ReadUInt128() const;
+	virtual CMD4Hash ReadHash() const;
+	virtual float ReadFloat() const;
+	virtual unsigned char *ReadBsob(uint8 *size) const;
 	//@}
 
 	/**
@@ -146,26 +122,23 @@
 	 * @param SafeRead Avoids throwing CEOFException, see below.
 	 * @return The resulting text-string.
 	 *
-	 * Note that when SafeRead is set to true, CSafeFileIO will crop the length
-	 * read from the length-field (see lenBytes), so that at most GetLength() -
-	 * GetPosition() bytes are read.
+	 * With SafeRead set, CSafeFileIO crops the length read from the length field (see
+	 * lenBytes), so at most GetLength() - GetPosition() bytes are read.
 	 *
 	 * @see CSafeFileIO::Read
 	 */
-	virtual wxString	ReadString(bool bOptUTF8, uint8 lenBytes = 2, bool SafeRead = false) const;
+	virtual wxString ReadString(bool bOptUTF8, uint8 lenBytes = 2, bool SafeRead = false) const;
 
 	/**
-	 * Reads a string from the file, where the length is specified directly.
+	 * Reads a string from the file, where the length is specified directly. Typically
+	 * used when the text field's length is not stored as an integer field in front of
+	 * the text field.
 	 *
 	 * @param bOptUTF8 Specifies if the string is UTF8 encoded.
 	 * @param length The length of the string.
 	 * @return The resulting text-string.
-	 *
-	 * This function is typically used when the text-fields length is not stored
-	 * as an integer-field in front of the text-field.
 	 */
-	virtual wxString	ReadOnlyString(bool bOptUTF8, uint16 length) const;
-
+	virtual wxString ReadOnlyString(bool bOptUTF8, uint16 length) const;
 
 	/**
 	 * Writes a value of the given type to the file, storing it as little-endian.
@@ -177,64 +150,61 @@
 	virtual void WriteUInt16(uint16 value);
 	virtual void WriteUInt32(uint32 value);
 	virtual void WriteUInt64(uint64 value);
-	virtual void WriteUInt128(const CUInt128& value);
-	virtual void WriteHash(const CMD4Hash& value);
+	virtual void WriteUInt128(const CUInt128 &value);
+	virtual void WriteHash(const CMD4Hash &value);
 	virtual void WriteFloat(float value);
-	virtual void WriteBsob( const unsigned char* val, uint8 size);
+	virtual void WriteBsob(const unsigned char *val, uint8 size);
 	//@}
 
 	/**
-	 * Writes a text-string to the file.
+	 * Writes a text string to the file.
 	 *
 	 * @param str The string to be written.
 	 * @param encoding The text-encoding, see EUtf8Str.
-	 * @param lenBytes The number of bytes used to store the string length.
-	 *
-	 * Valid values for the 'lenBytes' parameters is 0 bytes (no length field),
-	 * 2 bytes and 4 bytes.
+	 * @param lenBytes The number of bytes used to store the string length: 0 (no length
+	 * field), 2 or 4.
 	 *
 	 * @see CSafeFileIO::Write
 	 */
-	virtual void WriteString(const wxString& str, EUtf8Str encoding = utf8strNone, uint8 lenBytes = 2);
+	virtual void WriteString(const wxString &str, EUtf8Str encoding = utf8strNone, uint8 lenBytes = 2);
 
-/* Warning: Special Kad functions, needs documentation */
+	/* Warning: Special Kad functions, needs documentation */
 
-	CTag*		ReadTag(bool bOptACP = false) const;
-	void		ReadTagPtrList(TagPtrList* taglist, bool bOptACP = false) const;
+	CTag *ReadTag(bool bOptACP = false) const;
+	void ReadTagPtrList(TagPtrList *taglist, bool bOptACP = false) const;
 
-	void		WriteTag(const CTag& tag);
-	void		WriteTagPtrList(const TagPtrList& tagList);
+	void WriteTag(const CTag &tag);
+	void WriteTagPtrList(const TagPtrList &tagList);
 
-/* Special ED2Kv2 function */
-	uint64		GetIntTagValue() const;
+	/* Special ED2Kv2 function */
+	uint64 GetIntTagValue() const;
 
-/* Some functions I added for simplicity */
+	/* Some functions I added for simplicity */
 	// Very obvious
 	bool IsEmpty() { return (GetLength() == 0); }
 
 	// Appends to the end
-	void Append(const uint8* buffer, int n) { Seek(0, wxFromEnd); Write(buffer, n); }
+	void Append(const uint8 *buffer, int n)
+	{
+		Seek(0, wxFromEnd);
+		Write(buffer, n);
+	}
 
 protected:
 	/**
 	 * The actual read / write function, as implemented by subclasses.
 	 *
 	 * @param buffer The buffer to read data into / write data from.
-	 * @param count The number of bytes to read / written.
-	 * @return The number of bytes read / written or -1 in case of errors.
-	 *
-	 * Note that the return value must be the actual number of bytes
-	 * read or written, with the exception that in case of errors, -1
-	 * may be returned. This is because the return value is used to
-	 * detect if the operation succeeded.
+	 * @param count The number of bytes to read / write.
+	 * @return The number of bytes actually read / written, or -1 on error -- the caller
+	 * uses the return value to decide whether the operation succeeded.
 	 *
-	 * This function should not throw Either of the CSafeIOExceptions,
-	 * this is done by the CSafeFileIO::Read and the CSafeFileIO::Write
-	 * functions.
+	 * Must not throw either CSafeIOException; CSafeFileIO::Read and CSafeFileIO::Write
+	 * do that.
 	 */
 	//@{
-	virtual sint64 doRead(void* buffer, size_t count) const = 0;
-	virtual sint64 doWrite(const void* buffer, size_t count) = 0;
+	virtual sint64 doRead(void *buffer, size_t count) const = 0;
+	virtual sint64 doWrite(const void *buffer, size_t count) = 0;
 	//@}
 
 	/**
@@ -243,60 +213,49 @@
 	 * @param offset The absolute offset to seek to.
 	 * @return The resulting offset.
 	 *
-	 * This function should not throw of the CSafeIOExceptions,
-	 * this is handled by the CSafeFileIO::Seek. At the moment,
-	 * seeks that fail are considered a fatal error.
+	 * Must not throw a CSafeIOException; CSafeFileIO::Seek handles that. A failed seek
+	 * is currently a fatal error.
 	 */
 	virtual sint64 doSeek(sint64 offset) const = 0;
 
 private:
 	/**
-	 * Helper-function that does the actual writing of the string.
+	 * Does the actual writing of the string.
 	 *
 	 * @param str The string to be written.
 	 * @param encoding The encoding of the string.
 	 * @param lenBytes The number of bytes used to store the string length.
-	 *
 	 */
-	void WriteStringCore(const char* str, EUtf8Str encoding, uint8 lenBytes);
+	void WriteStringCore(const char *str, EUtf8Str encoding, uint8 lenBytes);
 };
 
-
 /**
- * The base class of IO exceptions used by
- * the CSafeFileIO interface and implementations
- * of the interface.
+ * Base class of the IO exceptions the CSafeFileIO interface and its implementations
+ * use.
  */
 struct CSafeIOException : public CMuleException
 {
-	CSafeIOException(const wxString& type, const wxString& desc);
+	CSafeIOException(const wxString &type, const wxString &desc);
 };
 
-
 /**
- * This exception is thrown when attempts are
- * made at reading past the end of the file.
- *
- * This typically happens when a invalid packet
- * is received that is shorter than expected and
- * is not fatal.
+ * Thrown on an attempt to read past the end of the file. Typically an invalid packet
+ * that is shorter than expected, and not fatal.
  */
-struct CEOFException : public CSafeIOException {
-	CEOFException(const wxString& desc);
+struct CEOFException : public CSafeIOException
+{
+	CEOFException(const wxString &desc);
 };
 
-
 /**
- * This exception reflects a failure in performing
- * basic IO operations read and write. It will be
- * thrown in case a read or a write fails to read
- * or write the specified number of bytes.
+ * A failure in the basic read and write operations: thrown when a read or a write
+ * moves fewer than the specified number of bytes.
  */
-struct CIOFailureException : public CSafeIOException {
-	CIOFailureException(const wxString& type, const wxString& desc);
-	CIOFailureException(const wxString& desc);
+struct CIOFailureException : public CSafeIOException
+{
+	CIOFailureException(const wxString &type, const wxString &desc);
+	CIOFailureException(const wxString &desc);
 };
 
-
 #endif // SAFEFILE_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/Scanner.cpp -> amule-3.1.0.tar.gz/src/Scanner.cpp Changed

amule-3.0.1.tar.gz/src/Scanner.h -> amule-3.1.0.tar.gz/src/Scanner.h Changed

@@ -6,7 +6,7 @@
 
 #line 8 "./Scanner.h"
 
-#define  YY_INT_ALIGNED short int
+#define YY_INT_ALIGNED short int
 
 /* A lexical scanner generated by flex */
 
@@ -35,7 +35,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#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.
@@ -61,31 +61,31 @@
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
-#define INT8_MIN               (-128)
+#define INT8_MIN (-128)
 #endif
 #ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
+#define INT16_MIN (-32767 - 1)
 #endif
 #ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
+#define INT32_MIN (-2147483647 - 1)
 #endif
 #ifndef INT8_MAX
-#define INT8_MAX               (127)
+#define INT8_MAX (127)
 #endif
 #ifndef INT16_MAX
-#define INT16_MAX              (32767)
+#define INT16_MAX (32767)
 #endif
 #ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
+#define INT32_MAX (2147483647)
 #endif
 #ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
+#define UINT8_MAX (255U)
 #endif
 #ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
+#define UINT16_MAX (65535U)
 #endif
 #ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
+#define UINT32_MAX (4294967295U)
 #endif
 
 #endif /* ! C99 */
@@ -97,15 +97,15 @@
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
-#else	/* ! __cplusplus */
+#else /* ! __cplusplus */
 
 /* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
+#if defined(__STDC__)
 
 #define YY_USE_CONST
 
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
+#endif /* defined (__STDC__) */
+#endif /* ! __cplusplus */
 
 #ifdef YY_USE_CONST
 #define yyconst const
@@ -135,11 +135,11 @@
 #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 */
+	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.
@@ -170,8 +170,8 @@
 	 */
 	int yy_at_bol;
 
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
+	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.
@@ -179,25 +179,24 @@
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
-
-	};
+};
 #endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
+void yyrestart(FILE *input_file);
+void yy_switch_to_buffer(YY_BUFFER_STATE new_buffer);
+YY_BUFFER_STATE yy_create_buffer(FILE *file, int size);
+void yy_delete_buffer(YY_BUFFER_STATE b);
+void yy_flush_buffer(YY_BUFFER_STATE b);
+void yypush_buffer_state(YY_BUFFER_STATE new_buffer);
+void yypop_buffer_state(void);
 
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE yy_scan_buffer(char *base, yy_size_t size);
+YY_BUFFER_STATE yy_scan_string(yyconst char *yy_str);
+YY_BUFFER_STATE yy_scan_bytes(yyconst char *bytes, yy_size_t len);
 
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+void *yyalloc(yy_size_t);
+void *yyrealloc(void *, yy_size_t);
+void yyfree(void *);
 
 /* Begin user sect3 */
 
@@ -229,31 +228,31 @@
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int yylex_destroy (void );
+int yylex_destroy(void);
 
-int yyget_debug (void );
+int yyget_debug(void);
 
-void yyset_debug (int debug_flag  );
+void yyset_debug(int debug_flag);
 
-YY_EXTRA_TYPE yyget_extra (void );
+YY_EXTRA_TYPE yyget_extra(void);
 
-void yyset_extra (YY_EXTRA_TYPE user_defined  );
+void yyset_extra(YY_EXTRA_TYPE user_defined);
 
-FILE *yyget_in (void );
+FILE *yyget_in(void);
 
-void yyset_in  (FILE * in_str  );
+void yyset_in(FILE *in_str);
 
-FILE *yyget_out (void );
+FILE *yyget_out(void);
 
-void yyset_out  (FILE * out_str  );
+void yyset_out(FILE *out_str);
 
-yy_size_t yyget_leng (void );
+yy_size_t yyget_leng(void);
 
-char *yyget_text (void );
+char *yyget_text(void);
 
-int yyget_lineno (void );
+int yyget_lineno(void);
 
-void yyset_lineno (int line_number  );
+void yyset_lineno(int line_number);
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -261,18 +260,18 @@
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap(void);
 #else
-extern int yywrap (void );
+extern int yywrap(void);
 #endif
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy(char *, yyconst char *, int);
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen(yyconst char *);
 #endif
 
 #ifndef YY_NO_INPUT
@@ -295,9 +294,9 @@
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int yylex (void);
+extern int yylex(void);
 
-#define YY_DECL int yylex (void)
+#define YY_DECL int yylex(void)
 #endif /* !YY_DECL */
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
@@ -316,7 +315,6 @@
 
 #line 171 "./Scanner.l"
 
-
 #line 321 "./Scanner.h"
 #undef yyIN_HEADER
 #endif /* yyHEADER_H */

amule-3.0.1.tar.gz/src/ScopedPtr.h -> amule-3.1.0.tar.gz/src/ScopedPtr.h Changed

@@ -26,50 +26,70 @@
 #ifndef SCOPEDPTR_H
 #define SCOPEDPTR_H
 
-#include "OtherFunctions.h"		// Needed for DeleteContents()
+#include "OtherFunctions.h" // Needed for DeleteContents()
 
 /**
- * CScopedPtr is a simple smart pointer.
+ * Sets a bool for the lifetime of the scope.
  *
- * This class is a replacement for std::auto_ptr, with simpler
- * copying schematics, in that it doesn't allow copying or
- * assignment, compared to auto_ptr, which allows only one
- * instance to own a pointer (swapping at assignment).
+ * Both users are notebook page-closing handlers whose own teardown fires a MuleNotify that routes
+ * straight back into the close path for the same tab: the flag makes the re-entry a no-op instead
+ * of a recursive close. It lived privately in SearchDlg.cpp while there was one such handler;
+ * chat's is the second, so it moved here rather than being copied.
  */
-template <typename TYPE>
-class CScopedPtr
+class CScopedFlag
 {
 public:
-	/** Constructor. Note that CScopedPtr takes ownership of the pointer. */
-	CScopedPtr(TYPE* ptr)
-		: m_ptr(ptr)
-	{}
+	explicit CScopedFlag(bool &flag)
+	: m_flag(flag)
+	{
+		m_flag = true;
+	}
+	~CScopedFlag() { m_flag = false; }
+	CScopedFlag(const CScopedFlag &) = delete;
+	CScopedFlag &operator=(const CScopedFlag &) = delete;
+
+private:
+	bool &m_flag;
+};
 
-	CScopedPtr()
+/**
+ * A simple smart pointer. A replacement for std::auto_ptr with simpler copying: it allows neither
+ * copying nor assignment, where auto_ptr lets one instance own a pointer and swaps at assignment.
+ */
+template <typename TYPE> class CScopedPtr
+{
+public:
+	/** Constructor. Note that CScopedPtr takes ownership of the pointer. */
+	CScopedPtr(TYPE *ptr)
+	: m_ptr(ptr)
 	{
-		m_ptr = new TYPE;
 	}
 
+	CScopedPtr() { m_ptr = new TYPE; }
+
 	/** Frees the pointer owned by the instance. */
-	~CScopedPtr()			{ delete m_ptr; }
+	~CScopedPtr() { delete m_ptr; }
 
 	//@{
 	/** Deference operators. */
-	TYPE& operator*() const		{ return *m_ptr; }
-	TYPE* operator->() const	{ return m_ptr; }
+	TYPE &operator*() const { return *m_ptr; }
+	TYPE *operator->() const { return m_ptr; }
 	//@}
 
-
 	/** Returns the actual pointer value. */
-	TYPE* get() const		{ return m_ptr; }
+	TYPE *get() const { return m_ptr; }
 
 	/** Sets the actual pointer to a different value. The old pointer is freed. */
-	void reset(TYPE* ptr = 0)	{ delete m_ptr; m_ptr = ptr; }
+	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;
+		TYPE *ptr = m_ptr;
 		m_ptr = 0;
 		return ptr;
 	}
@@ -77,88 +97,84 @@
 private:
 	//@{
 	//! A scoped pointer is neither copyable, nor assignable.
-	CScopedPtr(const CScopedPtr<TYPE>&);
-	CScopedPtr<TYPE>& operator=(const CScopedPtr<TYPE>&);
+	CScopedPtr(const CScopedPtr<TYPE> &);
+	CScopedPtr<TYPE> &operator=(const CScopedPtr<TYPE> &);
 	//@}
 
-	TYPE* m_ptr;
+	TYPE *m_ptr;
 };
 
-
 /**
- * Similar to CScopedPtr, except that an array is expected.
- *
- * @see CScopedPtr
+ * Similar to CScopedPtr, except that an array is expected. @see CScopedPtr
  */
-template <typename TYPE>
-class CScopedArray
+template <typename TYPE> class CScopedArray
 {
 public:
 	/** Constructor. Note that CScopedArray takes ownership of the array. */
-	CScopedArray(TYPE* ptr)
-		: m_ptr(ptr)
-	{}
+	CScopedArray(TYPE *ptr)
+	: m_ptr(ptr)
+	{
+	}
 
 	/** Constructor, allocating nr elements. */
-	CScopedArray(size_t nr)			{ m_ptr = new TYPEnr; }
+	CScopedArray(size_t nr) { m_ptr = new TYPEnr; }
 
 	/** Frees the array owned by this instance. */
-	~CScopedArray()				{ delete m_ptr; }
-
+	~CScopedArray() { delete m_ptr; }
 
 	/** Accessor. */
-	TYPE& operator(unsigned i) const	{ return m_ptri; }
-
+	TYPE &operator(unsigned i) const { return m_ptri; }
 
 	/** @see CScopedPtr::get */
-	TYPE* get() const			{ return m_ptr; }
+	TYPE *get() const { return m_ptr; }
 
 	/** @see CScopedPtr::reset */
-	void reset(TYPE* ptr = 0)		{ delete m_ptr; m_ptr = ptr; }
+	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 TYPEnr; }
+	void reset(size_t nr)
+	{
+		delete m_ptr;
+		m_ptr = new TYPEnr;
+	}
 
 	/** @see CScopedPtr::release */
-	TYPE* release()
+	TYPE *release()
 	{
-		TYPE* ptr = m_ptr;
+		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>&);
+	CScopedArray(const CScopedArray<TYPE> &);
+	CScopedArray<TYPE> &operator=(const CScopedArray<TYPE> &);
 	//@}
 
-	TYPE* m_ptr;
+	TYPE *m_ptr;
 };
 
-
 /**
- * Similar to CScopedPtr, except that a STL container of pointers is expected
- * which has to be freed with DeleteContents.
- *
- * @see CScopedPtr
+ * Similar to CScopedPtr, except that it expects an STL container of pointers, freed with
+ * DeleteContents. @see CScopedPtr
  */
-template <typename STL_CONTAINER>
-class CScopedContainer
+template <typename STL_CONTAINER> class CScopedContainer
 {
 public:
 	/** Constructor. Note that CScopedContainer takes ownership of the array. */
-	CScopedContainer(STL_CONTAINER* ptr)
-		: m_ptr(ptr)
-	{}
-
-	CScopedContainer()
+	CScopedContainer(STL_CONTAINER *ptr)
+	: m_ptr(ptr)
 	{
-		m_ptr = new STL_CONTAINER;
 	}
 
+	CScopedContainer() { m_ptr = new STL_CONTAINER; }
+
 	~CScopedContainer()
 	{
 		if (m_ptr) {
@@ -169,21 +185,20 @@
 
 	//@{
 	/** Deference operators. */
-	STL_CONTAINER& operator*() const	{ return *m_ptr; }
+	STL_CONTAINER &operator*() const { return *m_ptr; }
 	//@}
 
-
 	/** Returns the actual pointer value. */
-	STL_CONTAINER* get() const			{ return m_ptr; }
+	STL_CONTAINER *get() const { return m_ptr; }
 
 private:
 	//@{
 	//! A scoped container is neither copyable, nor assignable.
-	CScopedContainer(const CScopedContainer<STL_CONTAINER>&);
-	CScopedContainer<STL_CONTAINER>& operator=(const CScopedContainer<STL_CONTAINER>&);
+	CScopedContainer(const CScopedContainer<STL_CONTAINER> &);
+	CScopedContainer<STL_CONTAINER> &operator=(const CScopedContainer<STL_CONTAINER> &);
 	//@}
 
-	STL_CONTAINER* m_ptr;
+	STL_CONTAINER *m_ptr;
 };
 
 #endif // SCOPEDPTR_H

amule-3.0.1.tar.gz/src/SearchDlg.cpp -> amule-3.1.0.tar.gz/src/SearchDlg.cpp Changed

@@ -24,87 +24,123 @@
 //
 
 #include <wx/app.h>
+#include <wx/statline.h> // Needed for wxStaticLine
+#include <wx/artprov.h>  // Needed for wxArtProvider::GetBitmap (search-tab close icon)
+#include <wx/clipbrd.h>  // Needed for wxTheClipboard (search-name Paste enable check)
+#include <wx/combobox.h> // Needed for the IDC_SEARCHNAME history dropdown
+#include <wx/config.h>   // Needed to persist the default search type
+#include <wx/dataobj.h>  // Needed for wxTextDataObject (clipboard content check)
+#include <wx/menu.h>     // Needed for the search-history context menu
 
-#include <wx/gauge.h>		// Do_not_auto_remove (win32)
+#include <wx/gauge.h> // Do_not_auto_remove (win32)
+
+#include <algorithm> // Needed for std::min
 
 #include <tags/FileTags.h>
 
-#include "SearchDlg.h"		// Interface declarations.
-#include "SearchListCtrl.h"	// Needed for CSearchListCtrl
-#include "muuli_wdr.h"		// Needed for IDC_STARTS
-#include "amuleDlg.h"		// Needed for CamuleDlg
+#include "SearchDlg.h"      // Interface declarations.
+#include "SearchHistory.h"  // Needed for ApplySearchHistoryEntry
+#include "SearchListCtrl.h" // Needed for CSearchListCtrl
+#include "muuli_wdr.h"      // Needed for IDC_STARTS
+#include "amuleDlg.h"       // Needed for CamuleDlg
 #include "MuleNotebook.h"
 #include "GetTickCount.h"
 #include "Preferences.h"
-#include "amule.h"			// Needed for theApp
-#include "SearchList.h"		// Needed for CSearchList
+#include "amule.h"        // Needed for theApp
+#include "ScopedPtr.h"    // Needed for CScopedFlag
+#include "SearchList.h"   // Needed for CSearchList
+#include "updownclient.h" // Needed for EBrowseStatus (browse tab lifecycle)
 #include <common/Format.h>
+#include <common/TextFile.h> // Needed for CTextFile (searchhistory.dat)
 #include "Logger.h"
 
-#define ID_SEARCHLISTCTRL wxID_HIGHEST+667
+#define ID_SEARCHLISTCTRL wxID_HIGHEST + 667
 
 // just to keep compiler happy
 static wxCommandEvent nullEvent;
 
+namespace
+{
+//! How long typing has to pause before the filter is applied, in ms.
+const int kFilterDebounceMs = 250;
+const int ID_FILTER_DEBOUNCE_TIMER = wxID_HIGHEST + 1301;
+} // namespace
+
 wxBEGIN_EVENT_TABLE(CSearchDlg, wxPanel)
-	EVT_BUTTON(		IDC_STARTS,		CSearchDlg::OnBnClickedStart)
-	EVT_TEXT_ENTER(	IDC_SEARCHNAME,	CSearchDlg::OnBnClickedStart)
+	EVT_BUTTON(IDC_STARTS, CSearchDlg::OnBnClickedStart)
+	EVT_TEXT_ENTER(IDC_SEARCHNAME, CSearchDlg::OnBnClickedStart)
+	EVT_CHOICE(ID_SEARCHTYPE, CSearchDlg::OnSearchTypeChanged)
 
 	EVT_BUTTON(IDC_CANCELS, CSearchDlg::OnBnClickedStop)
 	EVT_BUTTON(IDC_SEARCHMORE, CSearchDlg::OnBnClickedSearchMore)
 
-	EVT_LIST_ITEM_SELECTED(ID_SEARCHLISTCTRL, CSearchDlg::OnListItemSelected)
+	EVT_DATAVIEW_SELECTION_CHANGED(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_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_TEXT,     IDC_SEARCHNAME, CSearchDlg::OnFieldChanged)
-	EVT_CUSTOM( wxEVT_TEXT,     IDC_EDITSEARCHEXTENSION, CSearchDlg::OnFieldChanged)
-	EVT_CUSTOM( wxEVT_SPINCTRL, wxID_ANY, CSearchDlg::OnFieldChanged)
-	EVT_CUSTOM( wxEVT_CHOICE, wxID_ANY, CSearchDlg::OnFieldChanged)
+	EVT_CUSTOM(wxEVT_TEXT, IDC_SEARCHNAME, CSearchDlg::OnFieldChanged)
+	EVT_CUSTOM(wxEVT_TEXT, IDC_EDITSEARCHEXTENSION, CSearchDlg::OnFieldChanged)
+	EVT_CUSTOM(wxEVT_SPINCTRL, wxID_ANY, CSearchDlg::OnFieldChanged)
+	EVT_CUSTOM(wxEVT_CHOICE, 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)
-	EVT_CHECKBOX(ID_FILTER_KNOWN,	CSearchDlg::OnFilteringChange)
-	EVT_BUTTON(ID_FILTER,			CSearchDlg::OnFilteringChange)
+	EVT_TEXT(ID_FILTER_TEXT, CSearchDlg::OnFilterTextChanged)
+	EVT_TIMER(ID_FILTER_DEBOUNCE_TIMER, CSearchDlg::OnFilterDebounceTimer)
+	EVT_TEXT_ENTER(ID_FILTER_TEXT, CSearchDlg::OnFilteringChange)
+	EVT_CHECKBOX(ID_FILTER_INVERT, CSearchDlg::OnFilteringChange)
+	EVT_CHECKBOX(ID_FILTER_KNOWN, CSearchDlg::OnFilteringChange)
+	EVT_BUTTON(ID_FILTER_RESET, CSearchDlg::OnFilterReset)
+
+	EVT_IDLE(CSearchDlg::OnIdle)
 wxEND_EVENT_TABLE()
 
-
-
-CSearchDlg::CSearchDlg(wxWindow* pParent)
+CSearchDlg::CSearchDlg(wxWindow *pParent)
 : wxPanel(pParent, -1)
 {
+	// amuleDlg sets wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED), so only windows carrying
+	// this style are sent idle events at all -- without it OnIdle() never runs and the
+	// coalesced hit-count flush never happens.
+	SetExtraStyle(GetExtraStyle() | wxWS_EX_PROCESS_IDLE);
+
+	m_filterTimer.SetOwner(this, ID_FILTER_DEBOUNCE_TIMER);
+
 	m_last_search_time = 0;
+	m_expiringSearchID = 0;
+	m_inSearchClosing = false;
+	m_startingLocalSearch = false;
 
-	wxSizer* content = searchDlg(this, true);
+	wxSizer *content = searchDlg(this, true);
 	content->Show(this, true);
 
-	m_progressbar = CastChild( ID_SEARCHPROGRESS, wxGauge );
+	m_progressbar = CastChild(ID_SEARCHPROGRESS, wxGauge);
 	m_progressbar->SetRange(100);
 
-	m_notebook = CastChild( ID_NOTEBOOK, CMuleNotebook );
+	m_notebook = CastChild(ID_NOTEBOOK, CMuleNotebook);
 
 #ifdef __WXMAC__
-	//#warning TODO: restore the image list if/when wxMac supports locating the image
+	// #warning TODO: restore the image list if/when wxMac supports locating the image
 #else
-	// Initialise the image list
-	wxImageList* m_ImageList = new wxImageList(16,16);
-	m_ImageList->Add(amuleSpecial(3));
-	m_ImageList->Add(amuleSpecial(4));
+	// Initialise the image list. Both entries were previously a bespoke "X in a box" bitmap
+	// differing only by a hover-highlight border colour; wx's own stock close icon covers both
+	// states just as well without a second custom asset.
+	wxImageList *m_ImageList = new wxImageList(16, 16);
+	wxBitmap closeIcon = ThemedCloseIcon(wxSize(16, 16));
+	m_ImageList->Add(closeIcon);
+	m_ImageList->Add(closeIcon);
 	m_notebook->AssignImageList(m_ImageList);
 #endif
 
 	// Sanity sanity
-	wxChoice* searchchoice = CastChild( ID_SEARCHTYPE, wxChoice );
+	wxChoice *searchchoice = CastChild(ID_SEARCHTYPE, wxChoice);
 	wxASSERT(searchchoice);
 	wxASSERT(searchchoice->GetString(0) == _("Local"));
 	wxASSERT(searchchoice->GetString(2) == _("Kad"));
@@ -116,25 +152,371 @@
 
 	FixSearchTypes();
 
-	CastChild( IDC_TypeSearch, wxChoice )->SetSelection(0);
-	CastChild( IDC_SEARCHMINSIZE, wxChoice )->SetSelection(2);
-	CastChild( IDC_SEARCHMAXSIZE, wxChoice )->SetSelection(2);
+	CastChild(IDC_TypeSearch, wxChoice)->SetSelection(0);
+	CastChild(IDC_SEARCHMINSIZE, wxChoice)->SetSelection(2);
+	CastChild(IDC_SEARCHMAXSIZE, wxChoice)->SetSelection(2);
 
 	// Not there initially.
 	s_search_sizer->Show(s_extended_sizer, false);
 	s_search_sizer->Show(s_filter_sizer, false);
+	ApplyFilterSeparator(false);
+
+	// Clear-history button, sitting in the action row directly after "Reset Fields" -- next to
+	// the other one-shot commands rather than among the search parameters, and beside "Clear
+	// Search Results" so the two destructive actions read as a pair. Anchored ahead of Clear
+	// Search Results, so the three read most to least destructive rightwards.
+	//
+	// Still built here rather than in muuli_wdr because it is not a static control: it is shown
+	// or hidden with the remember-history preference and enabled only while the combo holds
+	// terms, and it backs up a right-click route that is unreachable on wxMSW -- the native
+	// combobox's child EDIT window never forwards WM_CONTEXTMENU to wx.
+	//
+	// The separator is inserted with it and tracked so the pref-driven hide takes both away; a
+	// stray divider would open a gap in the row.
+	if (wxWindow *clearResultsBtn = FindWindow(IDC_CLEAR_RESULTS)) {
+		if (wxSizer *row = clearResultsBtn->GetContainingSizer()) {
+			size_t at = row->GetItemCount();
+			size_t index = 0;
+			for (const wxSizerItem *item : row->GetChildren()) {
+				if (item->GetWindow() == clearResultsBtn) {
+					at = index;
+					break;
+				}
+				++index;
+			}
+			// Button first, then its divider, so both land before the anchor
+			// and the row stays button|divider|button all the way across.
+			// Parent is the row's own, not the dialog: this sizer lives in a
+			// wxStaticBoxSizer and positions in the static box's client area, so a
+			// child of the dialog is drawn offset by the box frame and label.
+			wxWindow *const rowParent = clearResultsBtn->GetParent();
+			m_clearHistoryBtn = new wxButton(rowParent, wxID_ANY, _("Clear Search History"));
+			row->Insert(at, m_clearHistoryBtn, wxSizerFlags().Center().Border(wxALL, 5));
+			m_clearHistorySep = new wxStaticLine(
+				rowParent, wxID_ANY, wxDefaultPosition, wxSize(-1, 20), wxLI_VERTICAL);
+			row->Insert(at + 1, m_clearHistorySep, wxSizerFlags().Center().Border(wxALL, 5));
+			m_clearHistoryBtn->Bind(wxEVT_BUTTON, &CSearchDlg::OnBnClickedClearHistory, this);
+		}
+	}
+
+	ApplySearchHistoryPref();
 
 	Layout();
 }
 
+void CSearchDlg::ApplyFilterSeparator(bool shown)
+{
+	// The rule introduces the filter row, so it goes away with it: left behind it would sit
+	// under the action buttons with nothing beneath, reading as a border on the search box
+	// rather than a divider. Found by id rather than held as a member because muuli_wdr owns it
+	// -- the row it divides is static, unlike the clear-history pair built here.
+	if (wxWindow *sep = FindWindow(ID_FILTER_SEPARATOR)) {
+		sep->Show(shown);
+	}
+}
+
+void CSearchDlg::ApplySearchHistoryPref()
+{
+	const bool wantHistory = CPreferences::RememberSearchHistory();
+
+	RebuildSearchNameField(wantHistory);
+
+	if (m_clearHistoryBtn) {
+		m_clearHistoryBtn->Show(wantHistory);
+	}
+	if (m_clearHistorySep) {
+		m_clearHistorySep->Show(wantHistory);
+	}
+
+	// Only populate when the preference allows it. searchhistory.dat is left untouched either
+	// way, so turning the preference back on restores the previous terms instead of starting
+	// from an empty list.
+	if (wantHistory) {
+		LoadSearchHistory();
+	}
+
+	Layout();
+}
+
+wxTextEntry *CSearchDlg::RebuildSearchNameField(bool wantHistory)
+{
+	wxWindow *current = FindWindow(IDC_SEARCHNAME);
+	if (current == nullptr) {
+		return nullptr;
+	}
+
+	// wxComboBox is not a wxTextCtrl (it is wxWindowWithItems<wxControl, wxComboBoxBase>), so
+	// which one is in place decides whether a dropdown and its history exist at all.
+	const bool haveCombo = (dynamic_cast<wxComboBox *>(current) != nullptr);
+	if (haveCombo == wantHistory) {
+		// Right control already in place, so nothing to rebuild -- but it may still need the
+		// context menu. At construction the combo here is the one muuli_wdr built, which this
+		// class never created and therefore never bound; leaving the binding to the creation path
+		// below meant the "Clear search history" item was missing until the preference was
+		// toggled.
+		if (wantHistory && !m_searchNameCtxBound) {
+			dynamic_cast<wxComboBox *>(current)->Bind(
+				wxEVT_CONTEXT_MENU, &CSearchDlg::OnSearchNameContextMenu, this);
+			m_searchNameCtxBound = true;
+		}
+		return dynamic_cast<wxTextEntry *>(current);
+	}
+
+	wxSizer *slot = current->GetContainingSizer();
+	if (slot == nullptr) {
+		return dynamic_cast<wxTextEntry *>(current);
+	}
+
+	// Carry the typed value across; the swap is a UI change, not a reason to
+	// lose what the user was in the middle of typing.
+	const wxString typed = dynamic_cast<wxTextEntry *>(current)->GetValue();
+
+	// Same parent as the control being replaced, for the reason given at the
+	// clear-history button above.
+	wxWindow *const slotParent = current->GetParent();
+
+	wxWindow *replacement = nullptr;
+	if (wantHistory) {
+		wxComboBox *combo = new wxComboBox(slotParent,
+			IDC_SEARCHNAME,
+			wxEmptyString,
+			wxDefaultPosition,
+			wxSize(80, -1),
+			0,
+			nullptr,
+			wxTE_PROCESS_ENTER);
+		// The context menu is bound per instance, so a freshly created combo needs it
+		// re-attached -- unlike the id-keyed event-table entries, which survive the swap by
+		// themselves.
+		combo->Bind(wxEVT_CONTEXT_MENU, &CSearchDlg::OnSearchNameContextMenu, this);
+		m_searchNameCtxBound = true;
+		replacement = combo;
+	} else {
+		// wxTE_PROCESS_ENTER kept so Enter still starts the search through the existing
+		// EVT_TEXT_ENTER entry. A plain text control carries no history menu, so the binding is
+		// gone with the old combo.
+		m_searchNameCtxBound = false;
+		replacement = new wxTextCtrl(slotParent,
+			IDC_SEARCHNAME,
+			wxEmptyString,
+			wxDefaultPosition,
+			wxSize(80, -1),
+			wxTE_PROCESS_ENTER);
+	}
+
+	// Replace() swaps the window inside the existing sizer item, so the slot keeps its
+	// proportion and border flags; the detached window is ours to destroy.
+	slot->Replace(current, replacement);
+	current->Destroy();
+
+	wxTextEntry *entry = dynamic_cast<wxTextEntry *>(replacement);
+	if (entry != nullptr) {
+		entry->SetValue(typed);
+	}
+	return entry;
+}
+
+void CSearchDlg::OnBnClickedClearHistory(wxCommandEvent &WXUNUSED(evt))
+{
+	ConfirmAndClearSearchHistory();
+}
+
+// Both routes into clearing -- this button and the combo's context menu -- delete
+// searchhistory.dat outright with no undo, so both ask first. The prompt lives here rather
+// than in ClearSearchHistory() so the latter stays usable as a plain action if anything
+// ever needs to clear without asking.
+void CSearchDlg::ConfirmAndClearSearchHistory()
+{
+	const int answer = wxMessageBox(_("Clear the saved search history? This cannot be undone."),
+		_("Clear Search History"),
+		wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION,
+		this);
+	if (answer == wxYES) {
+		ClearSearchHistory();
+	}
+}
+
+CSearchDlg::~CSearchDlg() {}
+
+namespace
+{
+// Search *query* history -- the strings typed into the Name field, not the results they
+// returned. Deliberately not stored in amule.conf: query terms are arguably private, and
+// putting them in the main config both bloats it and makes them travel with the file
+// (config backups, the --amule-config-file push to amuleweb/amuleapi). A dedicated file
+// mirrors eMule's AC_SearchStrings.dat.
+wxString SearchHistoryFilePath()
+{
+	return thePrefs::GetConfigDir() + "searchhistory.dat";
+}
+} // namespace
+
+void CSearchDlg::LoadSearchHistory()
+{
+	// With the preference off the Name field is a plain wxTextCtrl, so there is no dropdown to
+	// fill and the cast below would be null. Guarding here as well as at the call site keeps
+	// every future caller safe.
+	wxComboBox *combo = CastChild(IDC_SEARCHNAME, wxComboBox);
+	if (combo == nullptr || !CPreferences::RememberSearchHistory()) {
+		UpdateClearHistoryButton();
+		return;
+	}
+
+	combo->Clear(); // item list, not the (empty at startup) text value
+
+	CTextFile file;
+	wxArrayString entries;
+	if (file.Open(SearchHistoryFilePath(), CTextFile::read)) {
+		// txtIgnoreEmptyLines|txtStripWhitespace has no single named EReadTextFile enumerator to
+		// cast to, and txtReadDefault also drops '#'-led lines, which would silently eat a
+		// legitimate search term. Read unfiltered and do the trim and empty-drop by hand instead.
+		for (const wxString &line : file.ReadLines(txtReadAll)) {
+			wxString trimmed = line;
+			trimmed.Trim(true).Trim(false);
+			if (!trimmed.IsEmpty()) {
+				entries.Add(trimmed);
+			}
+		}
+		file.Close();
+	}
+
+	size_t count = std::min<size_t>(entries.GetCount(), MAX_SEARCH_HISTORY_ENTRIES);
+	for (size_t i = 0; i < count; ++i) {
+		combo->Append(entriesi);
+	}
+	// Feeds the dropdown's type-ahead suggestion (eMule's ACO_AUTOSUGGEST); re-armed here and
+	// after every RecordSearchHistory/ClearSearchHistory call so it always reflects the current
+	// entry set.
+	combo->AutoComplete(entries);
+
+	UpdateClearHistoryButton();
+}
+
+void CSearchDlg::RecordSearchHistory(const wxString &term)
+{
+	if (!CPreferences::RememberSearchHistory() || term.IsEmpty()) {
+		return;
+	}
+
+	// Null when the preference was turned off (plain wxTextCtrl in place). The check above
+	// already covers that, but this stays defensive because the two states have to agree for
+	// the cast to be safe.
+	wxComboBox *combo = CastChild(IDC_SEARCHNAME, wxComboBox);
+	if (combo == nullptr) {
+		return;
+	}
+
+	wxArrayString current;
+	for (unsigned int i = 0; i < combo->GetCount(); ++i) {
+		current.Add(combo->GetString(i));
+	}
+	wxArrayString entries = ApplySearchHistoryEntry(current, term, MAX_SEARCH_HISTORY_ENTRIES);
+
+	combo->Clear();
+	for (const wxString &entry : entries) {
+		combo->Append(entry);
+	}
+	// combo->Clear() above only touches the item list, but set the value back explicitly anyway
+	// so behaviour does not depend on that not changing across wx versions/platforms.
+	combo->SetValue(term);
+	combo->AutoComplete(entries);
+
+	CTextFile file;
+	if (file.Open(SearchHistoryFilePath(), CTextFile::write)) {
+		file.WriteLines(entries);
+		file.Close();
+	}
+
+	UpdateClearHistoryButton();
+}
+
+void CSearchDlg::ClearSearchHistory()
+{
+	if (wxFileExists(SearchHistoryFilePath())) {
+		wxRemoveFile(SearchHistoryFilePath());
+	}
+
+	// Reached from the context menu and from the Clear button, both of which only exist
+	// alongside a combo -- but the cast is checked so a future caller cannot turn a
+	// disabled-history state into a null dereference.
+	if (wxComboBox *combo = CastChild(IDC_SEARCHNAME, wxComboBox)) {
+		combo->Clear();
+		// Empty array is how wx disables completion (wxMSW routes it to
+		// DisableCompletion()), so the last term stops being suggested too.
+		combo->AutoComplete(wxArrayString());
+	}
 
-CSearchDlg::~CSearchDlg()
+	UpdateClearHistoryButton();
+}
+
+void CSearchDlg::UpdateClearHistoryButton()
 {
+	if (m_clearHistoryBtn == nullptr) {
+		return;
+	}
+
+	const wxComboBox *combo = CastChild(IDC_SEARCHNAME, wxComboBox);
+	m_clearHistoryBtn->Enable(combo != nullptr && combo->GetCount() > 0);
+}
+
+void CSearchDlg::OnSearchNameContextMenu(wxContextMenuEvent &WXUNUSED(evt))
+{
+	wxComboBox *combo = CastChild(IDC_SEARCHNAME, wxComboBox);
+
+	// Overriding the field's context menu (to append the history action below) must not
+	// silently drop the standard edit actions -- a plain wxComboBox's only other context menu
+	// is this one, so without these items right-clicking the field would offer no way to paste
+	// or copy. Same custom-Paste-ID idiom as CMuleTextCtrl::OnRightDown: wxMenu auto-enables
+	// Cut/Copy off wx's own selection tracking, but is too permissive about wxID_PASTE --
+	// enabled even with an empty clipboard -- so Paste gets a custom ID and its own check.
+	enum
+	{
+		ID_SEARCHNAME_PASTE = wxID_HIGHEST + 668
+	};
+
+	wxMenu menu;
+	menu.Append(wxID_CUT);
+	menu.Append(wxID_COPY);
+	menu.Append(ID_SEARCHNAME_PASTE, _("Paste"));
+	menu.Append(wxID_SELECTALL);
+
+	bool canPaste = false;
+	if (combo->CanPaste()) {
+		if (wxTheClipboard->Open()) {
+			if (wxTheClipboard->IsSupported(wxDF_TEXT)) {
+				wxTextDataObject data;
+				wxTheClipboard->GetData(data);
+				canPaste = !data.GetText().IsEmpty();
+			}
+			wxTheClipboard->Close();
+		}
+	}
+	menu.Enable(ID_SEARCHNAME_PASTE, canPaste);
+
+	// Separator: "Clear" is a one-shot action, not another edit command --
+	// keeping it visually apart avoids reading it as one of the group above.
+	menu.AppendSeparator();
+	wxMenuItem *clearItem = menu.Append(wxID_ANY, _("Clear Search History"));
+	clearItem->Enable(combo->GetCount() > 0);
+
+	menu.Bind(wxEVT_MENU, combo(wxCommandEvent &) { combo->Cut(); }, wxID_CUT);
+	menu.Bind(wxEVT_MENU, combo(wxCommandEvent &) { combo->Copy(); }, wxID_COPY);
+	menu.Bind(wxEVT_MENU, combo(wxCommandEvent &) { combo->Paste(); }, ID_SEARCHNAME_PASTE);
+	menu.Bind(wxEVT_MENU, combo(wxCommandEvent &) { combo->SetSelection(-1, -1); }, wxID_SELECTALL);
+	// Deferred off the popup's own modal loop: this handler runs while PopupMenu() is still
+	// unwinding, and putting a modal dialog up before the menu has finished tearing down
+	// misbehaves on wxOSX. The button route needs no such care -- no popup is involved there.
+	menu.Bind(
+		wxEVT_MENU,
+		this(wxCommandEvent &) { CallAfter(&CSearchDlg::ConfirmAndClearSearchHistory); },
+		clearItem->GetId());
+
+	PopupMenu(&menu);
 }
 
 void CSearchDlg::FixSearchTypes()
 {
-	wxChoice* searchchoice = CastChild( ID_SEARCHTYPE, wxChoice );
+	wxChoice *searchchoice = CastChild(ID_SEARCHTYPE, wxChoice);
 
 	searchchoice->Clear();
 
@@ -142,7 +524,7 @@
 
 	int pos = 0;
 
-	if (thePrefs::GetNetworkED2K()){
+	if (thePrefs::GetNetworkED2K()) {
 		searchchoice->Insert(m_searchchoices0, pos++);
 		searchchoice->Insert(m_searchchoices1, pos++);
 	}
@@ -151,14 +533,71 @@
 		searchchoice->Insert(m_searchchoices2, pos++);
 	}
 
-	searchchoice->SetSelection(0);
+	// Restore the last-used search type (persisted in OnSearchTypeChanged) instead of always
+	// defaulting to Local. The stored value is the stable canonical code (0 = Local, 1 =
+	// Global, 2 = Kad); map it back onto whichever entries are present now, falling back to the
+	// first entry when the saved type's network is disabled (amule-org/amule#608).
+	long savedType = 0;
+	wxConfigBase::Get()->Read("/eMule/DefaultSearchType", &savedType, 0);
+	int selection = 0;
+	if (thePrefs::GetNetworkED2K()) {
+		if (savedType == 1) { // Global
+			selection = 1;
+		} else if (savedType == 2 && thePrefs::GetNetworkKademlia()) { // Kad
+			selection = 2;
+		}
+		// else Local (0), or the saved network is gone -> first entry
+	}
+	// With ED2K disabled the only entry is Kad at index 0, so 0 is correct.
+	if (searchchoice->GetCount()) {
+		if (selection >= (int)searchchoice->GetCount()) {
+			selection = 0;
+		}
+		searchchoice->SetSelection(selection);
+	}
 }
 
-CSearchListCtrl* CSearchDlg::GetSearchList( wxUIntPtr id )
+int CSearchDlg::GetSelectedSearchTypeCanonical()
+{
+	int selection = CastChild(ID_SEARCHTYPE, wxChoice)->GetSelection();
+	if (selection == wxNOT_FOUND) {
+		return wxNOT_FOUND;
+	}
+	// FixSearchTypes() inserts choices as Local, Global, Kad, but drops the ED2K pair when ED2K
+	// is disabled -- then the only entry (Kad) sits at 0, so shift it onto the canonical Kad
+	// code (2).
+	if (!thePrefs::GetNetworkED2K()) {
+		selection += 2;
+	}
+	return selection;
+}
+
+void CSearchDlg::OnSearchTypeChanged(wxCommandEvent &WXUNUSED(evt))
+{
+	const int canonical = GetSelectedSearchTypeCanonical();
+	if (canonical != wxNOT_FOUND) {
+		wxConfigBase::Get()->Write("/eMule/DefaultSearchType", (long)canonical);
+	}
+}
+
+void CSearchDlg::ResetResultViews()
+{
+	for (size_t i = 0; i < m_notebook->GetPageCount(); ++i) {
+		CSearchListCtrl *page = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(i));
+		if (page == nullptr) {
+			continue;
+		}
+		// Re-show the id the tab already has: same tab, same search, but the model reloads from
+		// the index rather than keeping items that no longer point at anything.
+		page->ShowResults(page->GetSearchId());
+	}
+}
+
+CSearchListCtrl *CSearchDlg::GetSearchList(wxUIntPtr id)
 {
 	int nPages = m_notebook->GetPageCount();
-	for ( int i = 0; i < nPages; i++ ) {
-		CSearchListCtrl* page = dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(i));
+	for (int i = 0; i < nPages; i++) {
+		CSearchListCtrl *page = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(i));
 
 		if (page->GetSearchId() == id) {
 			return page;
@@ -168,57 +607,214 @@
 	return NULL;
 }
 
+void CSearchDlg::RekeySearch(wxUIntPtr oldID, wxUIntPtr newID)
+{
+	if (oldID == newID) {
+		return;
+	}
+	if (CSearchListCtrl *page = GetSearchList(oldID)) {
+		page->SetSearchId(newID);
+	}
+}
+
+wxUIntPtr CSearchDlg::GetVisibleSearchId()
+{
+	int sel = m_notebook->GetSelection();
+	if (sel == -1) {
+		return 0;
+	}
+	CSearchListCtrl *page = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(sel));
+	return page ? page->GetSearchId() : 0;
+}
 
-void CSearchDlg::AddResult(CSearchFile* toadd)
+void CSearchDlg::ApplyProgressToBar(uint32 status)
 {
-	CSearchListCtrl* outputwnd = GetSearchList( toadd->GetSearchID() );
+	const bool finished = (status == 0xffff || status == 0xfffe);
+	if (finished) {
+		// Finished (ed2k or Kad): reset the bar.
+		m_progressbar->SetValue(0);
+	} else {
+		// Running: real global percent, or the Kad cosmetic ramp.
+		UpdateProgress(status);
+	}
+	// Keep Stop in step with the visible tab's lifecycle -- live while the search runs, greyed
+	// once it finishes. Both callers feed this the visible tab's status
+	// (RefreshVisibleTabProgress on monolithic, UpdateSearchProgress on the remote GUI), so
+	// Stop follows the selected tab rather than the most-recently-started search.
+	FindWindow(IDC_CANCELS)->Enable(!finished);
+}
 
-	if ( outputwnd ) {
-		outputwnd->AddResult( toadd );
+#ifndef CLIENT_GUI
+void CSearchDlg::RefreshVisibleTabProgress()
+{
+	wxUIntPtr sid = GetVisibleSearchId();
+	// No tab => empty bar; otherwise reuse the same sentinel the EC PROGRESS
+	// reply builds, so monolithic and the remote GUI stay in lockstep.
+	ApplyProgressToBar(sid ? theApp->searchlist->GetSearchBarStatusById(sid) : 0xffff);
+	// Keep the Kad-only "More" button in step with the visible tab: enabled only while it is a
+	// running Kad search, greyed once the search completes (IsKadSearch goes false when the Kad
+	// search ends). Refreshing it on the same tick the bar updates is what makes it grey out on
+	// completion instead of lingering until the next tab switch.
+	FindWindow(IDC_SEARCHMORE)->Enable(MoreAllowed((uint32_t)sid));
+}
+#endif
 
-		// Update the result count
-		UpdateHitCount( outputwnd );
+void CSearchDlg::UpdateSearchProgress(uint32 searchID, uint32 status)
+{
+	// Cache per-tab so a tab switch can refresh the bar instantly.
+	m_searchProgresssearchID = status;
+
+	if (status == 0xffff || status == 0xfffe) {
+		// Search finished: clear this tab's Kad "!" marker (a no-op for an ed2k tab, which has
+		// none) regardless of which tab is visible, so each tab clears independently as its own
+		// search completes.
+		KadSearchEnd(searchID);
+	}
+	// The single bottom bar tracks the visible tab only.
+	if (searchID == GetVisibleSearchId()) {
+		ApplyProgressToBar(status);
+#ifdef CLIENT_GUI
+		// Refresh the Kad-only "More" button from the per-search kind/lifecycle the daemon just
+		// reported: IsKadSearch reads the remote cache that CSearchListRem::HandlePacket updated
+		// immediately before this call. (Monolithic drives the button from the local Kad layer on
+		// tab change.)
+		FindWindow(IDC_SEARCHMORE)->Enable(MoreAllowed((uint32_t)searchID));
+#endif
 	}
 }
 
+bool CSearchDlg::HasRunningEd2kSearch() const
+{
+	for (size_t i = 0; i < m_notebook->GetPageCount(); ++i) {
+		const CSearchListCtrl *ctrl = dynamic_cast<const CSearchListCtrl *>(m_notebook->GetPage(i));
+		// A browse tab is not an ed2k search, and the placeholder tab that
+		// exists before the first search has no id yet.
+		if (!ctrl || ctrl->IsBrowse()) {
+			continue;
+		}
+		const wxUIntPtr sid = ctrl->GetSearchId();
+		if (!sid) {
+			continue;
+		}
+		// Kad searches carry their own IDs and run in parallel, so a running
+		// one is not in the way of a new ed2k search.
+		if (theApp->searchlist->IsKadSearch((uint32_t)sid)) {
+			continue;
+		}
+
+		// 0xffff / 0xfffe are the finished sentinels; anything else is a
+		// running percent. Same vocabulary in both builds, different source.
+		uint32 status;
+#ifdef CLIENT_GUI
+		// Remote GUI: the daemon pushes the sentinel through UpdateSearchProgress, which caches
+		// it per tab. A tab with no entry is one nothing has reported on this session -- a search
+		// restored from disk at startup -- so it is finished, not running. Treating the absence
+		// as "running" would prompt on every first search of a session that had stored results.
+		const std::map<wxUIntPtr, uint32>::const_iterator it = m_searchProgress.find(sid);
+		if (it == m_searchProgress.end()) {
+			continue;
+		}
+		status = it->second;
+#else
+		status = theApp->searchlist->GetSearchBarStatusById(sid);
+#endif
+		if (status != 0xffff && status != 0xfffe) {
+			return true;
+		}
+	}
+	return false;
+}
 
-void CSearchDlg::UpdateResult(CSearchFile* toupdate)
+void CSearchDlg::AddResult(CSearchFile *toadd)
 {
-	CSearchListCtrl* outputwnd = GetSearchList( toupdate->GetSearchID() );
+	CSearchListCtrl *outputwnd = GetSearchList(toadd->GetSearchID());
 
-	if ( outputwnd ) {
-		outputwnd->UpdateResult( toupdate );
+	if (outputwnd) {
+		outputwnd->AddResult(toadd);
 
-		// Update the result count
-		UpdateHitCount( outputwnd );
+		// Update the result count -- coalesced to one recompute per idle,
+		// see m_pendingHitCount.
+		m_pendingHitCount.insert(outputwnd);
 	}
 }
 
+void CSearchDlg::UpdateResult(CSearchFile *toupdate)
+{
+	CSearchListCtrl *outputwnd = GetSearchList(toupdate->GetSearchID());
+
+	if (outputwnd) {
+		outputwnd->UpdateResult(toupdate);
 
-void CSearchDlg::OnListItemSelected(wxListEvent& event)
+		// Update the result count -- coalesced to one recompute per idle,
+		// see m_pendingHitCount.
+		m_pendingHitCount.insert(outputwnd);
+	}
+}
+
+void CSearchDlg::OnIdle(wxIdleEvent &evt)
 {
-	FindWindow(IDC_SDOWNLOAD)->Enable(true);
+	evt.Skip();
 
-	event.Skip();
+	if (m_pendingHitCount.empty()) {
+		return;
+	}
+
+	// Drive off the notebook's live pages rather than the pending set: a tab closed since the
+	// mark is simply never matched, so a stale pointer is only ever compared, never followed.
+	for (size_t i = 0; i < m_notebook->GetPageCount(); ++i) {
+		CSearchListCtrl *page = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(i));
+		if (page && m_pendingHitCount.count(page)) {
+			UpdateHitCount(page);
+		}
+	}
+	m_pendingHitCount.clear();
 }
 
+// The Download button acts on the selection, so one place answers whether it is available
+// and both routes here ask it: the selection changing, and a tab switch bringing a
+// different list to the front. They disagreed before -- the selection route only ever
+// enabled, so deselecting the last row left an armed button that did nothing until a tab
+// switch corrected it.
+void CSearchDlg::UpdateDownloadButtonState()
+{
+	bool enable = false;
+	const int selection = m_notebook->GetSelection();
+	if (selection != wxNOT_FOUND) {
+		// A page that is not a result list (or a half-built tab) leaves the
+		// button off rather than dereferencing a failed cast.
+		if (const CSearchListCtrl *ctrl =
+				dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(selection))) {
+			enable = ctrl->GetSelectedItemCount() > 0;
+		}
+	}
+	FindWindow(IDC_SDOWNLOAD)->Enable(enable);
+}
+
+void CSearchDlg::OnListItemSelected(wxDataViewEvent &event)
+{
+	// Recompute rather than Enable(true): wxDataViewCtrl sends this same event when the last
+	// selected row is deselected, and the button has to go back off with it.
+	UpdateDownloadButtonState();
+
+	event.Skip();
+}
 
-void CSearchDlg::OnExtendedSearchChange(wxCommandEvent& event)
+void CSearchDlg::OnExtendedSearchChange(wxCommandEvent &event)
 {
 	s_search_sizer->Show(s_extended_sizer, event.IsChecked());
 
 	Layout();
 }
 
-
-void CSearchDlg::OnFilterCheckChange(wxCommandEvent& event)
+void CSearchDlg::OnFilterCheckChange(wxCommandEvent &event)
 {
 	s_search_sizer->Show(s_filter_sizer, event.IsChecked());
+	ApplyFilterSeparator(event.IsChecked());
 	Layout();
 
 	int nPages = m_notebook->GetPageCount();
-	for ( int i = 0; i < nPages; i++ ) {
-		CSearchListCtrl* page = dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(i));
+	for (int i = 0; i < nPages; i++) {
+		CSearchListCtrl *page = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(i));
 
 		page->EnableFiltering(event.IsChecked());
 
@@ -226,129 +822,307 @@
 	}
 }
 
-
-void CSearchDlg::OnSearchClosing(wxBookCtrlEvent& 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 ) ) {
-		OnBnClickedStop(nullEvent);
-	}
-
-	CSearchListCtrl *ctrl = dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(evt.GetSelection()));
+	CSearchListCtrl *ctrl = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(evt.GetSelection()));
 	wxASSERT(ctrl);
+	// Capture the ID *before* ShowResults(0), which sets m_nResultsID = 0 -- so every
+	// GetSearchId() after that line returns 0, and the stop/free calls below silently addressed
+	// search 0 rather than this tab's search: no EC_OP_SEARCH_STOP was ever sent,
+	// RemoveResults(0) freed nothing, and the progress erase left the real entry behind. That
+	// is what made the daemon-side close gate look correct while the request never arrived.
+	const wxUIntPtr searchID = ctrl->GetSearchId();
+	// RemoveResults below fires MuleNotify::Search_Removed, which routes back into
+	// CloseSearchTab for this very tab; the flag makes that a no-op instead of a recursive
+	// close. Scoped so it clears on every exit path.
+	CScopedFlag closingGuard(m_inSearchClosing);
 	// Zero to avoid results added while destructing.
 	ctrl->ShowResults(0);
-	theApp->searchlist->RemoveResults(ctrl->GetSearchId());
+	m_searchProgress.erase(searchID);
+	// The "More"-is-spent memo dies with the tab: a re-run gets a fresh searchID anyway, and
+	// leaving entries behind would grow this set for the life of the session.
+	m_moreExhausted.erase((uint32_t)searchID);
+#ifdef CLIENT_GUI
+	// Remote multi-search: closing a tab stops *and* frees that specific search on the daemon,
+	// leaving other tabs' searches running. On a legacy daemon this degrades to a parameterless
+	// stop of the single search. Skipped when CloseSearchTab is the one driving this --
+	// DeletePage fires this handler synchronously -- since the daemon already discarded this id.
+	if (searchID != m_expiringSearchID) {
+		theApp->searchlist->StopSearchById(searchID, true);
+	}
+	m_expiringSearchID = 0;
+#else
+	// Monolithic: abort the global search if it was the last tab closed;
+	// RemoveResults below stops any Kad search and frees the bucket in-process.
+	if (evt.GetSelection() == ((int)m_notebook->GetPageCount() - 1)) {
+		OnBnClickedStop(nullEvent);
+	}
+#endif
+	theApp->searchlist->RemoveResults(searchID);
 
 	// Do cleanups if this was the last tab
-	if ( m_notebook->GetPageCount() == 1 ) {
+	if (m_notebook->GetPageCount() == 1) {
 		FindWindow(IDC_SDOWNLOAD)->Enable(false);
 		FindWindow(IDC_CLEAR_RESULTS)->Enable(false);
 	}
 }
 
+void CSearchDlg::OnStartRejected(wxUIntPtr searchID, const wxString &error)
+{
+	// A rejected browse ("View Files") reaches this same path in amuleGUI -- SendBrowseRequest
+	// sends the same EC_TAG_SEARCH_REF and the daemon echoes it on its failure exits too. It
+	// needs the tab dropped and the reason shown, but NOT the search-button reset below: the
+	// user never pressed Search, so clearing Download/Stop would disable them for whatever tab
+	// is visible.
+	const CSearchListCtrl *ctrl = GetSearchList(searchID);
+	const bool wasBrowse = ctrl && ctrl->IsBrowse();
+
+	// Drop the tab the client optimistically created for a start that never
+	// happened (no-op in the monolithic build, which creates none).
+	CloseSearchTab(searchID);
+
+	if (!error.IsEmpty()) {
+		// Deferred off the current call stack: in amuleGUI this runs inside CECSocket's reply
+		// handling, and wxMessageBox spins a nested event loop that re-enters CECSocket::OnInput
+		// and clobbers its rx state -- the same hazard CAddLinkHandler documents. Harmless in the
+		// monolithic build, so both go through the one path.
+		//
+		// `error` is captured BY VALUE, not by reference: it is a const& to the caller's string
+		// and this body runs after that caller has returned.
+		const wxString title = wasBrowse ? _("ERROR") : _("Search warning");
+		wxTheApp->CallAfter(error, title() {
+			wxMessageBox(error, title, wxOK | wxCENTRE | wxICON_INFORMATION);
+		});
+	}
+
+	if (!wasBrowse) {
+		// Back to the pre-search button state: the search never started, so
+		// "Stop" must not stay armed for it.
+		FindWindow(IDC_STARTS)->Enable();
+		FindWindow(IDC_SDOWNLOAD)->Disable();
+		FindWindow(IDC_CANCELS)->Disable();
+	}
+}
 
-void CSearchDlg::OnSearchPageChanged(wxBookCtrlEvent& WXUNUSED(evt))
+void CSearchDlg::OnSearchAdded(wxUIntPtr searchID, const wxString &name, uint32 kind)
+{
+	if (m_startingLocalSearch) {
+		// The local user's own search: OnBnClickedStart creates its tab
+		// itself, selected, as soon as StartNewSearch returns.
+		return;
+	}
+
+	if (GetSearchList(searchID)) {
+		return; // already have a tab for it
+	}
+	// Labelled like any other tab -- "(0)" hit count, "!" for a Kad search -- since it is the
+	// same kind of thing and needs no separate vocabulary. Unselected: it appears unprompted, so
+	// it must not pull the selection away from what the user is doing. Synchronous, matching its
+	// mirror Search_Removed -> CloseSearchTab: both run from wherever the core changed the
+	// search set, including inside EC packet handling.
+	CreateNewTab(((kind == KadSearch) ? "!" : "") + name + " (0)", searchID, false);
+}
+
+void CSearchDlg::CloseSearchTab(wxUIntPtr searchID)
+{
+	if (m_inSearchClosing) {
+		// Already closing a tab: this is the monolithic close path calling back into us
+		// (OnSearchClosing -> CSearchList::RemoveResults -> MuleNotify::Search_Removed -> here)
+		// for the tab it is itself in the middle of removing. That path does the whole job
+		// already.
+		return;
+	}
+	CSearchListCtrl *ctrl = GetSearchList(searchID);
+	if (!ctrl) {
+		return; // no tab open for this id -- nothing to do
+	}
+	int nPages = (int)m_notebook->GetPageCount();
+	for (int i = 0; i < nPages; i++) {
+		if (m_notebook->GetPage(i) != ctrl) {
+			continue;
+		}
+		// DeletePage fires PAGE_CLOSING synchronously, which re-enters OnSearchClosing on this
+		// same call stack and does all the cleanup -- ShowResults(0), the progress erase,
+		// RemoveResults, last-tab button disabling -- itself. Setting this first tells it to skip
+		// only the StopSearchById call: the core has already discarded this id, so a stop request
+		// for it would be a wasted round trip.
+		m_expiringSearchID = searchID;
+		m_notebook->DeletePage(i);
+		break;
+	}
+}
+
+void CSearchDlg::OnSearchPageChanged(wxBookCtrlEvent &WXUNUSED(evt))
 {
 	int selection = m_notebook->GetSelection();
 
-	// Workaround for a bug in wxWidgets, where deletions of pages
-	// can result in an invalid selection. This has been reported as
+	// Workaround for a bug in wxWidgets, where deleting pages can result in an invalid
+	// selection. Reported as
 	// http://sourceforge.net/tracker/index.php?func=detail&aid=1865141&group_id=9863&atid=109863
 	if (selection >= (int)m_notebook->GetPageCount()) {
 		selection = m_notebook->GetPageCount() - 1;
 	}
 
-	// Only enable the Download button for pages where files have been selected
-	if ( selection != -1 ) {
-		CSearchListCtrl *ctrl = dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(selection));
-
-		bool enable = (ctrl->GetSelectedItemCount() > 0);
-		FindWindow(IDC_SDOWNLOAD)->Enable( enable );
+	// Whether Download is available follows the newly-visible list's selection.
+	UpdateDownloadButtonState();
+	if (selection != -1) {
+		CSearchListCtrl *ctrl = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(selection));
+
+		// Refresh the bottom bar instantly for the newly-visible tab so it
+		// tracks the selected search rather than the last one that updated it.
+#ifdef CLIENT_GUI
+		// Remote GUI: from the per-search EC progress cache. If this tab has no cached status yet
+		// (progress not polled, or daemon-side state lost across an EC reconnect), clear the bar
+		// rather than leaving it frozen on the previous tab's value -- the next poll fills in the
+		// real state.
+		if (!m_searchProgress.empty()) {
+			std::map<wxUIntPtr, uint32>::const_iterator it =
+				m_searchProgress.find(ctrl->GetSearchId());
+			if (it != m_searchProgress.end()) {
+				ApplyProgressToBar(it->second);
+			} else {
+				m_progressbar->SetValue(0);
+			}
+		}
+#else
+		// Monolithic: from the local core's per-search lifecycle.
+		RefreshVisibleTabProgress();
+#endif
 
-		// "More" is Kad-only — enable when this tab's searchID still
+		// "More" is Kad-only -- enable when this tab's searchID still
 		// corresponds to an active Kad search.
-		FindWindow(IDC_SEARCHMORE)->Enable(
-			theApp->searchlist->IsKadSearch((uint32_t)ctrl->GetSearchId()));
+		FindWindow(IDC_SEARCHMORE)->Enable(MoreAllowed((uint32_t)ctrl->GetSearchId()));
 	} else {
 		FindWindow(IDC_SEARCHMORE)->Enable(false);
 	}
 }
 
-
-void CSearchDlg::OnBnClickedStart(wxCommandEvent& WXUNUSED(evt))
+void CSearchDlg::OnBnClickedStart(wxCommandEvent &WXUNUSED(evt))
 {
 	if (!thePrefs::GetNetworkED2K() && !thePrefs::GetNetworkKademlia()) {
 		wxMessageBox(_("It's impossible to search when both eD2k and Kademlia are disabled."),
-			     _("Search error"),
-			     wxOK|wxCENTRE|wxICON_ERROR
-			     );
+			_("Search error"),
+			wxOK | wxCENTRE | wxICON_ERROR);
 		return;
 	}
 
-	// We mustn't search more often than once every 2 secs
+	// Starting a second ed2k search finalises the one in flight (see HasRunningEd2kSearch for
+	// why the protocol forces that), and until now it happened silently: the first tab's
+	// progress bar simply cleared, which reads exactly like a search that finished normally.
+	// Ask first, so stopping it is the user's decision. Only ed2k-over-ed2k: starting a Kad
+	// search alongside a running ed2k one is fine, and so is the reverse.
+	const int newType = GetSelectedSearchTypeCanonical();
+	if ((newType == LocalSearch || newType == GlobalSearch) && HasRunningEd2kSearch()) {
+		const int answer =
+			wxMessageBox(_("An eD2k search is still running. Starting a new one will stop it, "
+				       "because the eD2k protocol allows only one search at a time.\n\n"
+				       "Results already found are kept; only new ones stop arriving.\n\n"
+				       "Start the new search anyway?"),
+				_("Search in progress"),
+				wxYES_NO | wxCENTRE | wxICON_QUESTION,
+				this);
+		if (answer != wxYES) {
+			return;
+		}
+	}
+
+	// Debounce accidental double-clicks, but keep it short so multi-search
+	// users can fire several searches (e.g. global + Kad) back-to-back.
 	uint64 now = GetTickCount64();
-	if ((now - m_last_search_time) > 2000) {
+	if ((now - m_last_search_time) > 500) {
 		m_last_search_time = now;
-		// Stop previous ED2K search state only (the server has a
-		// single in-flight search packet per session and m_searchPacket
-		// has to be reset).  Do NOT stop a previous Kad search: the
-		// Kad data layer (CSearchManager::m_searches) supports multiple
-		// concurrent searches keyed by target hash, and stopping the
-		// previous one immediately deletes its CSearch (which strips
-		// the "!" tab indicator and halts result delivery).
-		// Unconditionally calling OnBnClickedStop here was the reason
-		// starting a second Kad search appeared to cancel the first.
+		// Stop previous ED2K search state only -- the server has a single in-flight search packet
+		// per session and m_searchPacket has to be reset. Do NOT stop a previous Kad search: the
+		// Kad data layer supports multiple concurrent searches keyed by target hash, and stopping
+		// the previous one immediately deletes its CSearch, which strips the "!" tab indicator
+		// and halts result delivery. An unconditional stop here is why starting a second Kad
+		// search appeared to cancel the first.
 		theApp->searchlist->StopSearch(/*globalOnly=*/true);
 		StartNewSearch();
 	}
 }
 
-
-void CSearchDlg::OnFieldChanged( wxEvent& WXUNUSED(evt) )
+void CSearchDlg::OnFieldChanged(wxEvent &WXUNUSED(evt))
 {
 	bool enable = false;
 
 	// These are the IDs of the search-fields
 	int textfields = { IDC_SEARCHNAME, IDC_EDITSEARCHEXTENSION };
 
-	for ( uint16 i = 0; i < itemsof(textfields); i++ ) {
-		enable |= !CastChild( textfieldsi, wxTextCtrl )->GetValue().IsEmpty();
+	for (int textfield : textfields) {
+		enable |= !CastChild(textfield, wxTextEntry)->GetValue().IsEmpty();
 	}
 
 	// Check if either of the dropdowns have been changed
 	enable |= (CastChild(IDC_SEARCHMINSIZE, wxChoice)->GetSelection() != 2);
 	enable |= (CastChild(IDC_SEARCHMAXSIZE, wxChoice)->GetSelection() != 2);
 	enable |= (CastChild(IDC_TypeSearch, wxChoice)->GetSelection() > 0);
-	enable |= (CastChild(ID_AUTOCATASSIGN, wxChoice)->GetSelection() > 0);
+	// ID_AUTOCATASSIGN is deliberately absent: it picks where a download goes, not what is
+	// searched for, so choosing one is no reason to offer to reset the search fields (issue
+	// #979).
 
 	// These are the IDs of the search-fields
 	int spinfields = { IDC_SPINSEARCHMIN, IDC_SPINSEARCHMAX, IDC_SPINSEARCHAVAILABILITY };
-	for ( uint16 i = 0; i < itemsof(spinfields); i++ ) {
-		enable |= (CastChild( spinfieldsi, wxSpinCtrl )->GetValue() > 0);
+	for (int spinfield : spinfields) {
+		enable |= (CastChild(spinfield, wxSpinCtrl)->GetValue() > 0);
 	}
 
 	// Enable the "Reset" button if any fields contain text
-	FindWindow(IDC_SEARCH_RESET)->Enable( enable );
+	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 );
+	enable = !CastChild(IDC_SEARCHNAME, wxTextEntry)->GetValue().IsEmpty();
+	FindWindow(IDC_STARTS)->Enable(enable);
+}
+
+void CSearchDlg::OnFilteringChange(wxCommandEvent &WXUNUSED(evt))
+{
+	ApplyFilter();
+}
+
+void CSearchDlg::OnFilterTextChanged(wxCommandEvent &evt)
+{
+	evt.Skip();
+	// Restarted on every keystroke, so only the pause at the end fires it.
+	m_filterTimer.Start(kFilterDebounceMs, wxTIMER_ONE_SHOT);
 }
 
+void CSearchDlg::OnFilterDebounceTimer(wxTimerEvent &WXUNUSED(evt))
+{
+	ApplyFilter();
+}
+
+void CSearchDlg::OnFilterReset(wxCommandEvent &WXUNUSED(evt))
+{
+	// Back to the state a fresh session starts in: empty expression, both toggles off (issue
+	// #698). "Reset Fields" covers the search parameters only, so before this there was no way
+	// to undo a filter except editing each control by hand.
+	CastChild(ID_FILTER_TEXT, wxTextCtrl)->Clear();
+	CastChild(ID_FILTER_INVERT, wxCheckBox)->SetValue(false);
+	CastChild(ID_FILTER_KNOWN, wxCheckBox)->SetValue(false);
+
+	// SetValue()/Clear() do not emit the change events the filter normally reacts to, so push
+	// the cleared state out explicitly -- otherwise the controls would read as reset while the
+	// pages stayed filtered.
+	ApplyFilter();
+}
 
-void CSearchDlg::OnFilteringChange(wxCommandEvent& WXUNUSED(evt))
+void CSearchDlg::ApplyFilter()
 {
+	// Whether we got here from the timer, Enter, the button or a reset, any
+	// pending debounced run is now redundant.
+	m_filterTimer.Stop();
+
 	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 invert = CastChild(ID_FILTER_INVERT, wxCheckBox)->GetValue();
+	bool known = CastChild(ID_FILTER_KNOWN, wxCheckBox)->GetValue();
 
 	// Check that the expression compiles before we try to assign it
 	// Otherwise we will get an error-dialog for each result-list.
 	if (wxRegEx(filter, wxRE_DEFAULT | wxRE_ICASE).IsValid()) {
 		int nPages = m_notebook->GetPageCount();
-		for ( int i = 0; i < nPages; i++ ) {
-			CSearchListCtrl* page = dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(i));
+		for (int i = 0; i < nPages; i++) {
+			CSearchListCtrl *page = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(i));
 
 			page->SetFilter(filter, invert, known);
 
@@ -357,13 +1131,12 @@
 	}
 }
 
-
-bool CSearchDlg::CheckTabNameExists(const wxString& searchString)
+bool CSearchDlg::CheckTabNameExists(const wxString &searchString)
 {
 	int nPages = m_notebook->GetPageCount();
-	for ( int i = 0; i < nPages; i++ ) {
+	for (int i = 0; i < nPages; i++) {
 		// The BeforeLast(' ') is to strip the hit-count from the name
-		if ( m_notebook->GetPageText(i).BeforeLast(' ') == searchString ) {
+		if (m_notebook->GetPageText(i).BeforeLast(' ') == searchString) {
 			return true;
 		}
 	}
@@ -371,17 +1144,16 @@
 	return false;
 }
 
-
-void CSearchDlg::CreateNewTab(const wxString& searchString, wxUIntPtr nSearchID)
+void CSearchDlg::CreateNewTab(const wxString &searchString, wxUIntPtr nSearchID, bool select)
 {
-	CSearchListCtrl* list = new CSearchListCtrl(m_notebook, ID_SEARCHLISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxNO_BORDER);
-	m_notebook->AddPage(list, searchString, true, 0);
+	CSearchListCtrl *list = new CSearchListCtrl(m_notebook, ID_SEARCHLISTCTRL);
+	m_notebook->AddPage(list, searchString, select, 0);
 
 	// Ensure that new results are filtered
-	bool     enable = CastChild(IDC_FILTERCHECK, wxCheckBox)->GetValue();
+	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 invert = CastChild(ID_FILTER_INVERT, wxCheckBox)->GetValue();
+	bool known = CastChild(ID_FILTER_KNOWN, wxCheckBox)->GetValue();
 
 	list->SetFilter(filter, invert, known);
 	list->EnableFiltering(enable);
@@ -390,65 +1162,183 @@
 	Layout();
 	FindWindow(IDC_CLEAR_RESULTS)->Enable(true);
 
-	// AddPage above made the new tab the selected one; defer to
-	// IsKadSearch on its searchID so a freshly-created ED2K tab leaves
-	// the button disabled.
-	FindWindow(IDC_SEARCHMORE)->Enable(
-		theApp->searchlist->IsKadSearch((uint32_t)nSearchID));
+	// "More" tracks the *visible* tab. Only touch it when this tab actually became the visible
+	// one: an unselected tab (a discovered search) must leave the button reflecting whatever the
+	// user is still looking at.
+	if (select) {
+		// AddPage above made the new tab the selected one; defer to IsKadSearch on its searchID
+		// so a freshly-created ED2K tab leaves the button disabled.
+		FindWindow(IDC_SEARCHMORE)->Enable(MoreAllowed((uint32_t)nSearchID));
+	}
 }
 
+uint32 CSearchDlg::s_optimisticIdCounter = 0;
 
-void CSearchDlg::OnBnClickedStop(wxCommandEvent& WXUNUSED(evt))
+// Single source of the remote-GUI OPTIMISTIC placeholder tab id, used by both a new search
+// (StartNewSearch) and a browse. A placeholder tab is created the instant the user acts,
+// then rekeyed to the daemon's real search id when the START reply arrives.
+//
+// The daemon allocates ed2k ids from the low quarter 1, 0x3fffffff and Kad ids from the
+// top half (>= 0x80000000), so a plain low placeholder could numerically equal an earlier
+// tab's daemon id once the counters drift apart -- RekeySearch would then match the WRONG
+// tab and corrupt the tab map. Reserving bit 30 puts every placeholder in 0x40000000,
+// 0x7fffffff, a range no daemon allocator ever produces, while staying bottom-half and
+// clear of Kad.
+wxUIntPtr CSearchDlg::AllocateOptimisticId()
 {
-	theApp->searchlist->StopSearch();
+	s_optimisticIdCounter = (s_optimisticIdCounter + 1) & 0x7fffffff;
+	return 0x40000000u | (s_optimisticIdCounter & 0x3fffffffu);
+}
+
+CSearchListCtrl *CSearchDlg::GetBrowseList(uint32 ecid, int *outPage)
+{
+	for (size_t i = 0; i < m_notebook->GetPageCount(); ++i) {
+		CSearchListCtrl *page = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(i));
+		if (page && page->GetBrowseEcid() == ecid) {
+			if (outPage) {
+				*outPage = static_cast<int>(i);
+			}
+			return page;
+		}
+	}
+	return nullptr;
+}
+
+bool CSearchDlg::ActivateBrowseTabIfOpen(uint32 peerEcid)
+{
+	// ecid 0 is "no live client" (e.g. an unlinked friend): nothing to match.
+	if (peerEcid == 0) {
+		return false;
+	}
+	int page = -1;
+	if (GetBrowseList(peerEcid, &page) && page >= 0) {
+		m_notebook->SetSelection(static_cast<size_t>(page));
+		// The request came from another panel (Friends / Transfers); bring the
+		// Search panel forward so the already-open tab is actually revealed.
+		if (theApp->amuledlg) {
+			theApp->amuledlg->ShowSearchWindow();
+		}
+		return true;
+	}
+	return false;
+}
+
+void CSearchDlg::EnsureBrowseTab(uint32 peerEcid, const wxString &userName, wxUIntPtr searchID, bool reveal)
+{
+	// A re-browse of the same peer refreshes the existing tab: rekey its result-routing ID to
+	// the new one (the daemon may allocate a fresh ID) and mark it browsing again, rather than
+	// opening a duplicate.
+	if (CSearchListCtrl *page = GetBrowseList(peerEcid)) {
+		page->SetSearchId(searchID);
+		page->SetBrowseName(userName);
+		page->SetBrowseStatus(BROWSE_IN_PROGRESS);
+		UpdateHitCount(page);
+		return;
+	}
+
+	CreateNewTab(userName, searchID, reveal);
+	if (CSearchListCtrl *page = GetSearchList(searchID)) {
+		page->SetBrowseEcid(peerEcid);
+		page->SetBrowseName(userName);
+		page->SetBrowseStatus(BROWSE_IN_PROGRESS);
+		UpdateHitCount(page);
+	}
+	// A freshly-started browse comes from another panel (Friends / Transfers), so bring the
+	// Search panel forward to reveal the new tab -- including the toolbar button state, not
+	// just the panel content. Only on tab creation, never on a refresh or a streaming result,
+	// which would yank the panel out from under the user.
+	if (reveal && theApp->amuledlg) {
+		theApp->amuledlg->ShowSearchWindow();
+	}
+}
+
+void CSearchDlg::SetBrowseStatus(wxUIntPtr searchID, uint32 status)
+{
+	CSearchListCtrl *page = GetSearchList(searchID);
+	if (page && page->IsBrowse()) {
+		page->SetBrowseStatus(status);
+		UpdateHitCount(page);
+	}
+}
+
+void CSearchDlg::OnBnClickedStop(wxCommandEvent &WXUNUSED(evt))
+{
+	// Stop only the selected tab's search. The parameterless StopSearch() acts on the scalar
+	// most-recently-started search (m_currentSearch), so with several searches open it would
+	// stop the wrong tab whenever the visible one is not the newest. Address the daemon/core by
+	// the visible tab's own id.
+	wxUIntPtr sid = GetVisibleSearchId();
+	if (sid) {
+		theApp->searchlist->StopSearchById(sid);
+	} else {
+		theApp->searchlist->StopSearch();
+	}
 	ResetControls();
 }
 
+void CSearchDlg::MarkMoreExhausted(uint32_t searchID)
+{
+	m_moreExhausted.insert(searchID);
+	// Only touch the button when the exhausted search is the one on screen -- the verdict
+	// arrives asynchronously and the user may have switched tabs meanwhile. Every other path
+	// recomputes through MoreAllowed anyway, so a tab switch back to it finds the button
+	// correctly disabled.
+	const int sel = m_notebook->GetSelection();
+	if (sel == -1) {
+		return;
+	}
+	CSearchListCtrl *page = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(sel));
+	if (page && (uint32_t)page->GetSearchId() == searchID) {
+		FindWindow(IDC_SEARCHMORE)->Enable(false);
+	}
+}
+
+bool CSearchDlg::MoreAllowed(uint32_t searchID) const
+{
+	return searchID && theApp->searchlist->IsKadSearch(searchID) &&
+	       m_moreExhausted.find(searchID) == m_moreExhausted.end();
+}
 
-void CSearchDlg::OnBnClickedSearchMore(wxCommandEvent& WXUNUSED(evt))
+void CSearchDlg::OnBnClickedSearchMore(wxCommandEvent &WXUNUSED(evt))
 {
-	// "More" button: ask the currently-selected Kad search for more
-	// results.  Uses CSearch::RequestMoreResults() (which dispatches
-	// the existing KADEMLIA_FIND_VALUE_MORE wide-reask variant) to
-	// widen the search frontier — peers we already queried return up
-	// to 11 closer contacts instead of 2, and the existing
-	// ProcessResponse cascade then queries the new neighbours with
-	// FIND_VALUE.  Bounded per-search by KADEMLIA_FIND_VALUE_MORE_REASKS
-	// (4) inside CSearch.
+	// "More" button: ask the currently-selected Kad search for more results. Uses
+	// CSearch::RequestMoreResults(), which dispatches the existing KADEMLIA_FIND_VALUE_MORE
+	// wide-reask variant, to widen the search frontier -- peers we already queried return up to
+	// 11 closer contacts instead of 2, and the existing ProcessResponse cascade then queries the
+	// new neighbours with FIND_VALUE. Bounded per-search by KADEMLIA_FIND_VALUE_MORE_REASKS (4)
+	// inside CSearch.
 	//
-	// For ED2K Local / Global searches there is currently no equivalent
-	// — the "More" button silently no-ops on non-Kad tabs.  This mirrors
-	// the prior behaviour of the (never-wired) ED2K-only stub.
+	// For ED2K Local / Global searches there is currently no equivalent -- the "More" button
+	// silently no-ops on non-Kad tabs. This mirrors the prior behaviour of the (never-wired)
+	// ED2K-only stub.
 	int sel = m_notebook->GetSelection();
 	if (sel == -1) {
 		return;
 	}
-	CSearchListCtrl* page = dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(sel));
+	CSearchListCtrl *page = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(sel));
 	if (!page) {
 		return;
 	}
 	const uint32_t searchID = (uint32_t)page->GetSearchId();
-	if (theApp->searchlist->RequestMoreResults(searchID)) {
-		AddLogLineN(_("Kad search: requested wider results from one more peer."));
-	} else {
-		// Either the active tab isn't a Kad search, the per-search cap is
-		// hit, or there is no responded peer left to reask.  Surface that
-		// to the user as a normal log line (not debug) so a click without
-		// effect is at least visible.
-		AddLogLineN(_("Kad search: no peer left to reask for more results (cap reached or no responses yet)."));
+	// RequestMoreResults logs what actually happened (single source of truth) -- and on amuleGUI
+	// that log is the daemon's, forwarded over EC. What it RETURNS is the other question:
+	// whether a later press could still widen this search. False is terminal (the search is in
+	// its final seconds, or its reask budget is spent), so the button goes away for this search
+	// only.
+	if (!theApp->searchlist->RequestMoreResults(searchID)) {
+		m_moreExhausted.insert(searchID);
+		FindWindow(IDC_SEARCHMORE)->Enable(false);
 	}
 }
 
-
 void CSearchDlg::ResetControls()
 {
 	m_progressbar->SetValue(0);
 
 	FindWindow(IDC_CANCELS)->Disable();
-	FindWindow(IDC_STARTS)->Enable(!CastChild( IDC_SEARCHNAME, wxTextCtrl )->GetValue().IsEmpty());
+	FindWindow(IDC_STARTS)->Enable(!CastChild(IDC_SEARCHNAME, wxTextEntry)->GetValue().IsEmpty());
 }
 
-
 void CSearchDlg::LocalSearchEnd()
 {
 	ResetControls();
@@ -458,41 +1348,39 @@
 {
 	int nPages = m_notebook->GetPageCount();
 	for (int i = 0; i < nPages; ++i) {
-		CSearchListCtrl* page =
-			dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(i));
-		if (page->GetSearchId() == id || id == 0) {	// 0: just update all pages (there is only one KAD search running at a time anyway)
+		CSearchListCtrl *page = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(i));
+		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("!",&rest)) {
-				m_notebook->SetPageText(i,rest);
+			if (m_notebook->GetPageText(i).StartsWith("!", &rest)) {
+				m_notebook->SetPageText(i, rest);
 			}
 		}
 	}
 
 	// If the search that just ended is the one currently shown, the
-	// "More" button now has no candidate to widen — disable it.
+	// "More" button now has no candidate to widen -- disable it.
 	int sel = m_notebook->GetSelection();
 	if (sel != -1) {
-		CSearchListCtrl* page = dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(sel));
+		CSearchListCtrl *page = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(sel));
 		if (page) {
-			FindWindow(IDC_SEARCHMORE)->Enable(
-				theApp->searchlist->IsKadSearch((uint32_t)page->GetSearchId()));
+			FindWindow(IDC_SEARCHMORE)->Enable(MoreAllowed((uint32_t)page->GetSearchId()));
 		}
 	}
 }
 
-void CSearchDlg::OnBnClickedDownload(wxCommandEvent& WXUNUSED(evt))
+void CSearchDlg::OnBnClickedDownload(wxCommandEvent &WXUNUSED(evt))
 {
 	int sel = m_notebook->GetSelection();
 	if (sel != -1) {
-		CSearchListCtrl* list = dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(sel));
+		CSearchListCtrl *list = dynamic_cast<CSearchListCtrl *>(m_notebook->GetPage(sel));
 
 		// Download with items added to category specified in the drop-down menu
 		list->DownloadSelected();
 	}
 }
 
-
-void CSearchDlg::OnBnClickedClear(wxCommandEvent& WXUNUSED(ev))
+void CSearchDlg::OnBnClickedClear(wxCommandEvent &WXUNUSED(ev))
 {
 	OnBnClickedStop(nullEvent);
 
@@ -503,22 +1391,15 @@
 	FindWindow(IDC_SEARCHMORE)->Enable(false);
 }
 
-
 void CSearchDlg::StartNewSearch()
 {
-	// Stay in the bottom half of the uint32 search-ID space so the
-	// ed2k-allocated IDs here can never collide with Kad-allocated IDs
-	// from CSearchManager::m_nextID, which starts at 0x80000000
-	static uint32 m_nSearchID = 0;
-	m_nSearchID = (m_nSearchID + 1) & 0x7fffffff;
-
 	FindWindow(IDC_STARTS)->Disable();
 	FindWindow(IDC_SDOWNLOAD)->Disable();
 	FindWindow(IDC_CANCELS)->Enable();
 
 	CSearchList::CSearchParams params;
 
-	params.searchString = CastChild( IDC_SEARCHNAME, wxTextCtrl )->GetValue();
+	params.searchString = CastChild(IDC_SEARCHNAME, wxTextEntry)->GetValue();
 	params.searchString.Trim(true);
 	params.searchString.Trim(false);
 
@@ -526,103 +1407,162 @@
 		return;
 	}
 
+	RecordSearchHistory(params.searchString);
+
 	if (CastChild(IDC_EXTENDEDSEARCHCHECK, wxCheckBox)->GetValue()) {
-		params.extension = CastChild( IDC_EDITSEARCHEXTENSION, wxTextCtrl )->GetValue();
+		params.extension = CastChild(IDC_EDITSEARCHEXTENSION, wxTextCtrl)->GetValue();
 
-		uint32 sizemin = GetTypeSize( (uint8) CastChild( IDC_SEARCHMINSIZE, wxChoice )->GetSelection() );
-		uint32 sizemax = GetTypeSize( (uint8) CastChild( IDC_SEARCHMAXSIZE, wxChoice )->GetSelection() );
+		uint32 sizemin = GetTypeSize((uint8)CastChild(IDC_SEARCHMINSIZE, wxChoice)->GetSelection());
+		uint32 sizemax = GetTypeSize((uint8)CastChild(IDC_SEARCHMAXSIZE, wxChoice)->GetSelection());
 
 		// Parameter Minimum Size
-		params.minSize = (uint64_t)(CastChild( IDC_SPINSEARCHMIN, wxSpinCtrl )->GetValue()) * (uint64_t)sizemin;
+		params.minSize =
+			(uint64_t)(CastChild(IDC_SPINSEARCHMIN, wxSpinCtrl)->GetValue()) * (uint64_t)sizemin;
 
 		// Parameter Maximum Size
-		params.maxSize = (uint64_t)(CastChild( IDC_SPINSEARCHMAX, wxSpinCtrl )->GetValue()) * (uint64_t)sizemax;
+		params.maxSize =
+			(uint64_t)(CastChild(IDC_SPINSEARCHMAX, wxSpinCtrl)->GetValue()) * (uint64_t)sizemax;
 
 		if ((params.maxSize < params.minSize) && (params.maxSize)) {
 			wxMessageDialog dlg(this,
 				_("Min size must be smaller than max size. Max size ignored."),
-				_("Search warning"), wxOK|wxCENTRE|wxICON_INFORMATION);
+				_("Search warning"),
+				wxOK | wxCENTRE | wxICON_INFORMATION);
 			dlg.ShowModal();
 
 			params.maxSize = 0;
 		}
 
 		// Parameter Availability
-		params.availability = CastChild( IDC_SPINSEARCHAVAILABILITY, wxSpinCtrl )->GetValue();
-
-		switch ( CastChild( IDC_TypeSearch, wxChoice )->GetSelection() ) {
-		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;
-		case 4: params.typeText = ED2KFTSTR_IMAGE;	break;
-		case 5: params.typeText = ED2KFTSTR_PROGRAM;	break;
-		case 6:	params.typeText = ED2KFTSTR_DOCUMENT;	break;
-		case 7:	params.typeText = ED2KFTSTR_VIDEO;	break;
+		params.availability = CastChild(IDC_SPINSEARCHAVAILABILITY, wxSpinCtrl)->GetValue();
+
+		switch (CastChild(IDC_TypeSearch, wxChoice)->GetSelection()) {
+		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;
+		case 4:
+			params.typeText = ED2KFTSTR_IMAGE;
+			break;
+		case 5:
+			params.typeText = ED2KFTSTR_PROGRAM;
+			break;
+		case 6:
+			params.typeText = ED2KFTSTR_DOCUMENT;
+			break;
+		case 7:
+			params.typeText = ED2KFTSTR_VIDEO;
+			break;
 		default:
-			AddDebugLogLineC( logGeneral,
-				CFormat( "Warning! Unknown search-category (%s) selected!" )
-					% params.typeText
-			);
+			AddDebugLogLineC(logGeneral,
+				CFormat("Warning! Unknown search-category (%s) selected!") % params.typeText);
 			break;
 		}
 	}
 
 	SearchType search_type = KadSearch;
 
-	int selection = CastChild( ID_SEARCHTYPE, wxChoice )->GetSelection();
-
-	// In muuli_wdr.cpp, Search Choices are inserted in this order: Local, Global, Kad.
-	// If ED2K is disabled, the only choice in the menu is Kad,
-	// but the starting value is 0 and we need a 2 for the switch
-	if (!thePrefs::GetNetworkED2K()) {
-		selection += 2;
-	}
+	// Canonical order (0 = Local, 1 = Global, 2 = Kad), normalised for the
+	// disabled-ED2K case inside the helper.
+	int selection = GetSelectedSearchTypeCanonical();
 
 	switch (selection) {
-		case 0: // Local Search
-			search_type = LocalSearch;
-			break;
-		case 1: // Global Search
-			search_type = GlobalSearch;
-			break;
-		case 2: // Kad search
-			search_type = KadSearch;
-			break;
-		default:
-			// Should never happen
-			wxFAIL;
-			break;
+	case 0: // Local Search
+		search_type = LocalSearch;
+		break;
+	case 1: // Global Search
+		search_type = GlobalSearch;
+		break;
+	case 2: // Kad search
+		search_type = KadSearch;
+		break;
+	default:
+		// Should never happen
+		wxFAIL;
+		break;
 	}
 
-	uint32 real_id = m_nSearchID;
-	wxString error = theApp->searchlist->StartNewSearch(&real_id, search_type, params);
+#ifdef CLIENT_GUI
+	// Remote GUI: real_id is an OPTIMISTIC placeholder tab id. The tab is created immediately
+	// (for instant feedback) and rekeyed to the daemon's real search id when the START reply
+	// arrives (RemapSearch). AllocateOptimisticId is the single source of both the value and its
+	// collision-free range -- shared with browse tabs so search + browse placeholders draw from
+	// one counter and never collide with each other or with a daemon id before the rekey. See
+	// its definition for why the range (bit 30) matters.
+	uint32 real_id = static_cast<uint32>(AllocateOptimisticId());
+#else
+	// Monolithic: the id is used directly (no remap). Use the single core-search ID counter in
+	// CSearchList::AllocateEd2kId, shared with the EC daemon path (s_ecSearches), so every ed2k
+	// search -- started locally or by an EC client (amulegui, amulecmd, amuleapi) -- draws from
+	// one counter in the range 1, 0x3fffffff. This range is provably disjoint from Kad's
+	// top-half IDs (>= 0x80000000) and from the remote GUI's optimistic placeholder tab IDs
+	// (0x40000000-0x7fffffff, see AllocateOptimisticId). Before this fix the monolithic path
+	// reused AllocateOptimisticId, whose bit-30 reservation collides with every amulegui
+	// placeholder -- the two started at the same counter value and the GUI's tab-rekey would
+	// remap results to the wrong tab (amule-org/amule#703 review by got3nks).
+	uint32 real_id = theApp->searchlist->AllocateEd2kId();
+#endif
+	wxString error;
+	{
+		// StartNewSearch fires MuleNotify::Search_Added before returning; the tab for this search
+		// is created just below, selected. Suppress the notification-driven one for the duration
+		// (see m_startingLocalSearch).
+		CScopedFlag localStartGuard(m_startingLocalSearch);
+		error = theApp->searchlist->StartNewSearch(&real_id, search_type, params);
+	}
 	if (!error.IsEmpty()) {
-		// Search failed / Remote in progress
-		wxMessageBox(error, _("Search warning"),
-			wxOK | wxCENTRE | wxICON_INFORMATION, this);
-		FindWindow(IDC_STARTS)->Enable();
-		FindWindow(IDC_SDOWNLOAD)->Disable();
-		FindWindow(IDC_CANCELS)->Disable();
+		// Search failed / Remote in progress. Shared with amuleGUI's EC_OP_FAILED path so both
+		// builds report a rejected start the same way (got3nks, PR #680 review). Note amuleGUI
+		// never reaches here: CSearchListRem::StartNewSearch returns "" unconditionally and the
+		// rejection arrives later over EC.
+		OnStartRejected(real_id, error);
 	} else {
-		CreateNewTab(
-			((search_type == KadSearch) ? "!" : "") +
-				params.searchString + " (0)",
-			real_id);
+		CreateNewTab(((search_type == KadSearch) ? "!" : "") + params.searchString + " (0)", real_id);
 	}
 }
 
-
-void CSearchDlg::UpdateHitCount(CSearchListCtrl* page)
+void CSearchDlg::UpdateHitCount(CSearchListCtrl *page)
 {
-	for ( uint32 i = 0; i < (uint32)m_notebook->GetPageCount(); ++i ) {
-		if ( m_notebook->GetPage(i) == page ) {
-			wxString searchtxt = m_notebook->GetPageText(i).BeforeLast(' ');
-
-			if ( !searchtxt.IsEmpty() ) {
-				size_t shown = page->GetItemCount();
-				size_t hidden = page->GetHiddenItemCount();
+	for (uint32 i = 0; i < (uint32)m_notebook->GetPageCount(); ++i) {
+		if (m_notebook->GetPage(i) == page) {
+			size_t shown = page->GetItemCount();
+			size_t hidden = page->GetHiddenItemCount();
+
+			// A "View Files" tab composes its label from the stored peer name + lifecycle marker
+			// (kept on the control), so the base name survives re-labelling and never gets
+			// mangled by the BeforeLast(' ') strip used for ordinary search tabs.
+			if (page->IsBrowse()) {
+				wxString count = hidden ? (CFormat(wxT("%u/%u")) % shown % (shown + hidden))
+								  .GetString()
+							: (CFormat(wxT("%u")) % shown).GetString();
+				wxString label;
+				switch (page->GetBrowseStatus()) {
+				case BROWSE_FAILED:
+					// Peer denied, went offline, or dropped mid-list. Reuse the
+					// existing "Failed" catalog string (no new translatable string).
+					label = CFormat(wxT("%s (%s)")) % page->GetBrowseName() % _("Failed");
+					break;
+				case BROWSE_FINISHED:
+					label = CFormat(wxT("%s (%s)")) % page->GetBrowseName() % count;
+					break;
+				default: // BROWSE_IN_PROGRESS: trailing dots = still arriving.
+					label = CFormat(wxT("%s (%s...)")) % page->GetBrowseName() % count;
+					break;
+				}
+				m_notebook->SetPageText(i, label);
+				break;
+			}
 
+			wxString searchtxt = m_notebook->GetPageText(i).BeforeLast(' ');
+			if (!searchtxt.IsEmpty()) {
 				if (hidden) {
 					searchtxt += CFormat(" (%u/%u)") % shown % (shown + hidden);
 				} else {
@@ -637,38 +1577,65 @@
 	}
 }
 
-
-void CSearchDlg::OnBnClickedReset(wxCommandEvent& WXUNUSED(evt))
+void CSearchDlg::OnBnClickedReset(wxCommandEvent &WXUNUSED(evt))
 {
-	CastChild( IDC_SEARCHNAME, wxTextCtrl )->Clear();
-	CastChild( IDC_EDITSEARCHEXTENSION, wxTextCtrl )->Clear();
-	CastChild( IDC_SPINSEARCHMIN, wxSpinCtrl )->SetValue(0);
-	CastChild( IDC_SEARCHMINSIZE, wxChoice )->SetSelection(2);
-	CastChild( IDC_SPINSEARCHMAX, wxSpinCtrl )->SetValue(0);
-	CastChild( IDC_SEARCHMAXSIZE, wxChoice )->SetSelection(2);
-	CastChild( IDC_SPINSEARCHAVAILABILITY, wxSpinCtrl )->SetValue(0);
-	CastChild( IDC_TypeSearch, wxChoice )->SetSelection(0);
-	CastChild( ID_AUTOCATASSIGN, wxChoice )->SetSelection(0);
+	// SetValue(""), not Clear(). Casting to wxTextEntry does NOT get you wxTextEntry::Clear()
+	// here: that method is virtual and wxComboBoxBase overrides it as { wxItemContainer::Clear();
+	// wxTextEntry::Clear(); }, so the call dispatches to the override and wipes the dropdown's
+	// item list -- the whole search history -- along with the typed value. That is what issue
+	// #697 reported. SetValue() only touches the text.
+	CastChild(IDC_SEARCHNAME, wxTextEntry)->SetValue(wxEmptyString);
+	CastChild(IDC_EDITSEARCHEXTENSION, wxTextCtrl)->Clear();
+	CastChild(IDC_SPINSEARCHMIN, wxSpinCtrl)->SetValue(0);
+	CastChild(IDC_SEARCHMINSIZE, wxChoice)->SetSelection(2);
+	CastChild(IDC_SPINSEARCHMAX, wxSpinCtrl)->SetValue(0);
+	CastChild(IDC_SEARCHMAXSIZE, wxChoice)->SetSelection(2);
+	CastChild(IDC_SPINSEARCHAVAILABILITY, wxSpinCtrl)->SetValue(0);
+	CastChild(IDC_TypeSearch, wxChoice)->SetSelection(0);
+	// The download category is not reset here. "Reset Fields" is the counterpart of "Reset
+	// Filters" and clears search parameters; quietly redirecting the next download somewhere
+	// else is not part of that (issue #979).
 
 	FindWindow(IDC_SEARCH_RESET)->Enable(false);
 }
 
-
 void CSearchDlg::UpdateCatChoice()
 {
-	wxChoice* c_cat = CastChild( ID_AUTOCATASSIGN, wxChoice );
+	wxChoice *c_cat = CastChild(ID_AUTOCATASSIGN, wxChoice);
+
+	// Remember the chosen destination by name, not by index: this runs on every category add,
+	// rename and delete, and a delete shifts every index after it. The old code unconditionally
+	// selected Main afterwards, so touching any category silently redirected the next download
+	// -- invisible while the control lived in the hidden extended-parameters row, but not now
+	// that it sits beside the Download button (issue #979).
+	const wxString previous =
+		c_cat->GetSelection() == wxNOT_FOUND ? wxString() : c_cat->GetStringSelection();
+
 	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 );
+	for (unsigned i = 1; i < theApp->glob_prefs->GetCatCount(); i++) {
+		c_cat->Append(theApp->glob_prefs->GetCategory(i)->title);
 	}
 
-	c_cat->SetSelection( 0 );
+	// Falls back to Main when the chosen category was the one just removed or
+	// renamed, which is the only case where the selection cannot be honoured.
+	if (previous.IsEmpty() || !c_cat->SetStringSelection(previous)) {
+		c_cat->SetSelection(0);
+	}
+
+	// With only Main configured there is nothing to choose, so the selector is noise. Same gate
+	// the context menu applies to its own category submenu (SearchListCtrl.cpp), and it lifts as
+	// soon as a second category exists -- this runs on every category change, so no restart is
+	// needed. The label greys out with it, or it reads as live beside a dead dropdown.
+	const bool haveChoice = theApp->glob_prefs->GetCatCount() > 1;
+	c_cat->Enable(haveChoice);
+	FindWindow(ID_AUTOCATASSIGN_LABEL)->Enable(haveChoice);
 }
 
-void CSearchDlg::UpdateProgress(uint32 new_value) {
+void CSearchDlg::UpdateProgress(uint32 new_value)
+{
 	m_progressbar->SetValue(new_value);
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/SearchDlg.h -> amule-3.1.0.tar.gz/src/SearchDlg.h Changed

@@ -26,11 +26,18 @@
 #ifndef SEARCHDLG_H
 #define SEARCHDLG_H
 
-#include <wx/panel.h>		// Needed for wxPanel
-#include <wx/notebook.h>	// needed for wxBookCtrlEvent in wx 2.8
+#include <wx/dataview.h> // Needed for wxDataViewEvent
+#include <wx/notebook.h> // needed for wxBookCtrlEvent in wx 2.8
+#include <wx/panel.h>    // Needed for wxPanel
 
-#include "Types.h"		// Needed for uint16 and uint32
+class wxStaticLine;
 
+#include "Types.h" // Needed for uint16 and uint32
+
+#include <map>        // Needed for std::map (per-tab progress cache)
+#include <wx/timer.h> // Needed for wxTimer (debounced live filtering)
+
+#include <set> // Needed for std::set (pending hit-count recomputes)
 
 class CMuleNotebook;
 class CSearchListCtrl;
@@ -38,136 +45,346 @@
 class wxListEvent;
 class wxSpinEvent;
 class wxGauge;
+class wxContextMenuEvent;
+class wxButton;
+class wxTextEntry;
 class CSearchFile;
 
-
-/**
- * This class represents the Search Dialog, which takes care of
- * enabling the user to search and to display results in a readable
- * manner.
- */
+/// The Search panel: lets the user search and shows the results.
 class CSearchDlg : public wxPanel
 {
 public:
-	/**
-	 * Constructor.
-	 *
-	 * @param pParent The parent widget passed to the wxPanel constructor.
-	 */
-	CSearchDlg(wxWindow* pParent);
+	CSearchDlg(wxWindow *pParent);
 
-	/**
-	 * Destructor.
-	 */
 	~CSearchDlg();
 
-
 	/**
-	 * Adds the provided result to the right result-list.
-	 *
-	 * Please note that there is no duplicates checking, so the files should
-	 * indeed be a new result.
+	 * Adds the result to the right result-list. No duplicate checking, so the file must really
+	 * be a new result.
 	 */
-	void AddResult(CSearchFile* toadd);
+	void AddResult(CSearchFile *toadd);
 
 	/**
-	 * Updates a changed result.
-	 *
-	 * @param A pointer to the updated CSearchFile.
-	 *
-	 * This function will update the source-count and color of the result, and
-	 * if needed, it will also move the result so that the current sorting
-	 * is maintained.
+	 * Updates a changed result: its source count and colour, moving the row if needed to keep
+	 * the current sorting.
 	 */
-	void UpdateResult(CSearchFile* toupdate);
+	void UpdateResult(CSearchFile *toupdate);
 
 	/**
-	 * Checks if a result-page with the specified heading exists.
-	 *
-	 * @param searchString The heading to look for.
+	 * Is there a result-page headed `searchString`?
 	 */
-	bool		CheckTabNameExists(const wxString& searchString);
+	bool CheckTabNameExists(const wxString &searchString);
 
 	/**
-	 * Creates a new tab and displays the specified results.
+	 * Creates a new tab headed `searchString` showing the results for `nSearchID`.
 	 *
-	 * @param searchString This will be the heading of the new page.
-	 * @param nSearchID The results with this searchId will be displayed.
+	 * @param select Bring the new tab to the front. True for a tab the local user just asked
+	 * for. False for one that appears on its own -- a search discovered from another client --
+	 * which must not steal the selection from whatever the user is looking at, possibly mid-
+	 * typing (got3nks, amule-org/amule#703).
 	 */
-	void		CreateNewTab(const wxString& searchString, wxUIntPtr nSearchID);
+	void CreateNewTab(const wxString &searchString, wxUIntPtr nSearchID, bool select = true);
 
+	/// The local search is over.
+	void LocalSearchEnd();
 
-	/**
-	 * Call this function to signify that the local search is over.
-	 */
-	void		LocalSearchEnd();
+	/// The kad search is over.
+	void KadSearchEnd(uint32 id);
 
+	/// Refreshes the category list from the existing categories.
+	void UpdateCatChoice();
 
 	/**
-	 * Call this function to signify that the kad search is over.
+	 * Shows the hit-count in `page`'s heading.
 	 */
-	void		KadSearchEnd(uint32 id);
+	void UpdateHitCount(CSearchListCtrl *page);
 
+	/// Resets the controls.
+	void ResetControls();
 
-	/**
-	 * This function updates the category list according to existing categories.
-	 */
-	void		UpdateCatChoice();
-
+	// Event handler and helper function
+	void OnBnClickedDownload(wxCommandEvent &ev);
+
+	CSearchListCtrl *GetSearchList(wxUIntPtr id);
+
+	// Drop every open tab's rows, keeping the tabs themselves. For a reconnect to a RESTARTED
+	// daemon: the stored searches come back under their original ids, so the tabs still
+	// correspond to something, but every result behind them has been freed and a tab's rows are
+	// raw CSearchFile pointers. Resetting the models makes them re-read the now-empty index.
+	void ResetResultViews();
+
+	// Multi-search (remote GUI): remap a tab's search ID from the optimistic
+	// local ID to the daemon-allocated one once the START reply arrives.
+	void RekeySearch(wxUIntPtr oldID, wxUIntPtr newID);
+
+	// The core rejected something this dialog optimistically opened a tab for: report the
+	// reason and undo the tab. Covers both a search start and a "View Files" browse, since in
+	// amuleGUI both are optimistic and both come back as EC_OP_FAILED carrying the same
+	// EC_TAG_SEARCH_REF.
+	//
+	// The monolithic build calls it from OnBnClickedStart, which has the error string in hand;
+	// amuleGUI reaches it from the EC_OP_FAILED reply, since CSearchListRem::StartNewSearch
+	// returns "" unconditionally and the rejection arrives later over EC.
+	//
+	// searchID is the optimistic tab id: amuleGUI has already created that tab and needs it
+	// dropped, while CloseSearchTab no-ops in the monolithic build. The search-button reset is
+	// skipped for a browse, where the user never pressed Search and it would wrongly disable
+	// Download/Stop for the visible tab.
+	void OnStartRejected(wxUIntPtr searchID, const wxString &error);
+
+	// The core started a search (MuleNotify::Search_Added). Creates a tab unless this GUI
+	// already has one, or unless it is the local user's own search still inside
+	// OnBnClickedStart -- that path creates its own tab, selected, right after StartNewSearch
+	// returns, and would otherwise end up with two (#703).
+	void OnSearchAdded(wxUIntPtr searchID, const wxString &name, uint32 kind);
+
+	// This search's results are gone, so close its tab: one left open on a freed search can only
+	// mislead (in amuleGUI "Download" silently does nothing, the daemon's m_results no longer
+	// having the hash; in the monolithic build the rows hold raw CSearchFile pointers that have
+	// just been deleted). One entry point for both builds:
+	//   - amuleGUI: EC_TAG_SEARCH_EXPIRED, another client closed the search or the daemon's LRU
+	//     evicted it.
+	//   - monolithic: MuleNotify::Search_Removed from CSearchList::RemoveResults.
+	// Goes through the normal DeletePage path so OnSearchClosing does the cleanup in one place;
+	// m_expiringSearchID tells it to skip StopSearchById, which for both callers would address a
+	// search the core has already discarded. No-op if no tab matches, or if OnSearchClosing is
+	// already on the stack -- which is what stops the monolithic close path from recursing.
+	void CloseSearchTab(wxUIntPtr searchID);
 
 	/**
-	 * This function displays the the hit-count in the heading for the specified page.
+	 * Finds or creates the "View Files" tab for a peer's shared-file listing, keyed by the
+	 * peer's ECID so a re-browse refreshes the same tab. searchID is the result-routing ID
+	 * (daemon-allocated over EC, or the local client pointer in the monolithic build); an
+	 * existing tab is rekeyed to it.
 	 *
-	 * @param page The page to have its heading updated.
+	 * @param reveal Select the tab and bring the Search panel forward. True when the local user
+	 * asked for this browse, which is the point of clicking View Files. False for one this
+	 * client did not initiate -- another GUI's browse, or one already running when we attached
+	 * -- which must not pull the panel or the selection away from what the user is doing (same
+	 * rule as a discovered search, amule-org/amule#703).
 	 */
-	void		UpdateHitCount(CSearchListCtrl* page);
+	void EnsureBrowseTab(
+		uint32 peerEcid, const wxString &userName, wxUIntPtr searchID, bool reveal = true);
+
+	// "View Files": if a browse tab for this peer's ECID is open, bring the Search panel
+	// forward, select that tab and return true. Lets callers skip re-browsing a peer whose
+	// listing is still on screen, which would duplicate the results. False for ecid 0 or no
+	// such tab.
+	bool ActivateBrowseTabIfOpen(uint32 peerEcid);
+
+	// Remote GUI: allocate a fresh optimistic placeholder tab ID in the reserved
+	// high sub-range (bit 30, bottom half) the daemon's allocators never produce.
+	wxUIntPtr AllocateOptimisticId();
+
+	// "View Files": update a browse tab's lifecycle marker (EBrowseStatus), keyed by the tab's
+	// result-routing search ID -- the only key both sides agree on across EC, the daemon's
+	// client ECID differing from the GUI's. No-op if the tab isn't an open browse tab.
+	void SetBrowseStatus(wxUIntPtr searchID, uint32 status);
+
+	// Search ID of the currently visible tab (0 if none). The single bottom
+	// progress bar tracks this tab.
+	wxUIntPtr GetVisibleSearchId();
+
+	// Multi-search (remote GUI): apply a per-search progress update. Clears the tab's "!"
+	// marker on completion and drives the bottom bar for the visible tab only, so each search's
+	// lifecycle is tracked independently.
+	void UpdateSearchProgress(uint32 searchID, uint32 status);
 
 	/**
-	 * Helper function which resets the controls.
+	 * Is one of the open tabs an ed2k search that is still running?
+	 *
+	 * eD2k replies carry no search identifier -- neither the server's TCP reply nor the global
+	 * UDP results -- so a client can only attribute incoming results to the query it sent most
+	 * recently. Starting a second ed2k search therefore finalises the one in flight, and the
+	 * user gets no say. This answers whether there is such a search to warn about.
+	 *
+	 * Kad tabs and "View Files" browse tabs are excluded: Kad results carry their own search ID
+	 * so those genuinely run in parallel, and a browse is not an ed2k search at all.
+	 *
+	 * Where the running/finished answer comes from differs between the two builds, so it is
+	 * resolved here and every caller asks the same question.
 	 */
-	void		ResetControls();
+	bool HasRunningEd2kSearch() const;
 
-	// Event handler and helper function
-	void		OnBnClickedDownload(wxCommandEvent& ev);
+	void UpdateProgress(uint32 new_value);
 
-	CSearchListCtrl* GetSearchList( wxUIntPtr id );
-
-	void	UpdateProgress(uint32 new_value);
+#ifndef CLIENT_GUI
+	// Monolithic: drive the bottom bar from the visible tab's core search lifecycle so the bar
+	// follows tab switches -- the local-core analogue of the remote GUI's per-search EC
+	// progress cache.
+	void RefreshVisibleTabProgress();
+#endif
 
-	void	StartNewSearch();
+	void StartNewSearch();
 
 	void FixSearchTypes();
 
+	// Current ID_SEARCHTYPE selection normalised to a stable code (0 = Local, 1 = Global, 2 =
+	// Kad) independent of which networks are enabled, so it can be persisted across restarts.
+	// wxNOT_FOUND if nothing is selected.
+	int GetSelectedSearchTypeCanonical();
+
 private:
 	// Event handlers
-	void		OnFieldChanged(wxEvent& evt);
+	void OnFieldChanged(wxEvent &evt);
+
+	// Search QUERY history: past search terms, not their results, persisted to a
+	// dedicated searchhistory.dat and shown in the IDC_SEARCHNAME combo dropdown.
+	void LoadSearchHistory();
+	void RecordSearchHistory(const wxString &term);
+	void ClearSearchHistory();
+	// Asks first, then clears. Used by every user-facing route so neither the
+	// button nor the context menu can wipe the history without a prompt.
+	void ConfirmAndClearSearchHistory();
+	void OnSearchNameContextMenu(wxContextMenuEvent &evt);
 
-	void		OnListItemSelected(wxListEvent& ev);
-	void		OnBnClickedReset(wxCommandEvent& ev);
-	void		OnBnClickedClear(wxCommandEvent& ev);
-	void		OnExtendedSearchChange(wxCommandEvent& ev);
-	void		OnFilterCheckChange(wxCommandEvent& ev);
-	void		OnFilteringChange(wxCommandEvent& ev);
-
-	void		OnSearchClosing(wxBookCtrlEvent& evt);
+public:
+	// Brings the search-history UI in line with the "Remember search history" preference: with
+	// it off the Name field is a plain wxTextCtrl, the Clear button is hidden and no stored
+	// terms are loaded. searchhistory.dat is left on disk, so re-enabling restores it. Called
+	// at construction and live from PrefsUnifiedDlg::OnOk, so no restart is needed.
+	void ApplySearchHistoryPref();
+	//! Show or hide the rule above the filter row, tracking the row itself.
+	void ApplyFilterSeparator(bool shown);
 
-	void		OnBnClickedStart(wxCommandEvent& evt);
-	void		OnBnClickedStop(wxCommandEvent& evt);
-	void		OnBnClickedSearchMore(wxCommandEvent& evt);
+private:
+	// Replaces the Name field in its sizer slot with the control type the preference calls for,
+	// carrying the typed value across. Returns the control now in place, and no-ops when the
+	// right type is already there.
+	wxTextEntry *RebuildSearchNameField(bool wantHistory);
+
+	// Whether the combo currently in the Name slot has had the context-menu handler attached.
+	// The handler is bound per instance and the combo built by muuli_wdr is one this class
+	// never created, so binding cannot be left to the creation path alone -- which is what made
+	// "Clear search history" missing until the preference was toggled.
+	bool m_searchNameCtxBound = false;
+
+	// Clear-history button, inserted into the action row after "Reset Fields" at construction
+	// together with the divider before it. Both are held rather than looked up by id, so the
+	// pref-driven show/hide cannot silently miss one.
+	wxButton *m_clearHistoryBtn = nullptr;
+	wxStaticLine *m_clearHistorySep = nullptr;
+	void OnBnClickedClearHistory(wxCommandEvent &evt);
+
+	// Greys the button out when there is nothing stored to clear, mirroring
+	// what the context-menu item already does with its own Enable() call.
+	void UpdateClearHistoryButton();
+
+	// Persists the chosen search type so it survives a restart (amule-org/amule#608).
+	void OnSearchTypeChanged(wxCommandEvent &evt);
+
+	// Recomputes the Download button from the visible list's selection; see
+	// the definition for why both callers go through it.
+	void UpdateDownloadButtonState();
+	void OnListItemSelected(wxDataViewEvent &ev);
+	void OnBnClickedReset(wxCommandEvent &ev);
+	void OnBnClickedClear(wxCommandEvent &ev);
+	void OnExtendedSearchChange(wxCommandEvent &ev);
+	void OnFilterCheckChange(wxCommandEvent &ev);
+	void OnFilteringChange(wxCommandEvent &ev);
+	void OnFilterReset(wxCommandEvent &ev);
+
+	// Reads the three filter controls and pushes the result to every open result page. Shared
+	// by OnFilteringChange and OnFilterReset so the reset path applies through exactly the same
+	// code as a manual filter change.
+	void ApplyFilter();
+
+	void OnSearchClosing(wxBookCtrlEvent &evt);
+
+	void OnBnClickedStart(wxCommandEvent &evt);
+	void OnBnClickedStop(wxCommandEvent &evt);
+	void OnBnClickedSearchMore(wxCommandEvent &evt);
+
+	/// Page-change handler; enables or disables the download button.
+	void OnSearchPageChanged(wxBookCtrlEvent &evt);
+
+	// Multi-search (remote GUI): last progress status per search ID, so the bottom bar can be
+	// refreshed instantly on a tab change rather than at the next poll. Empty on monolithic.
+	std::map<wxUIntPtr, uint32> m_searchProgress;
+
+	// Set by CloseSearchTab immediately before DeletePage(), which fires PAGE_CLOSING
+	// synchronously and re-enters OnSearchClosing on the same stack. Tells that handler to skip
+	// StopSearchById for this one id -- the core has already discarded it -- while still
+	// running its other cleanup, so that cleanup lives in one place. 0 the rest of the time.
+	wxUIntPtr m_expiringSearchID;
+
+	// True while OnBnClickedStart is inside StartNewSearch. That call fires
+	// MuleNotify::Search_Added before it returns and this dialog creates the tab for its own
+	// search only afterwards, so without this every local search would get two tabs (#703).
+	bool m_startingLocalSearch;
+
+	// True while OnSearchClosing is on the stack. In the monolithic build that handler calls
+	// CSearchList::RemoveResults, which fires Search_Removed -> CloseSearchTab for the very tab
+	// being closed; without this the pair would recurse and double-delete the page.
+	bool m_inSearchClosing;
+
+	// Set the bottom progress bar from a per-search status sentinel: a finished
+	// search (0xffff/0xfffe) resets it, otherwise it shows the running percent.
+	void ApplyProgressToBar(uint32 status);
+
+	// Find an open "View Files" tab by the browsed peer's ECID (NULL if none).
+	// When found and outPage is non-null, outPage receives the tab's page index.
+	CSearchListCtrl *GetBrowseList(uint32 ecid, int *outPage = nullptr);
+
+	// Monotonic counter behind search/browse tab IDs. On the remote GUI both a new search and a
+	// browse draw their optimistic placeholder from it via AllocateOptimisticId, so the
+	// placeholders cannot collide before the daemon rekeys them; the monolithic build uses the
+	// counter directly.
+	static uint32 s_optimisticIdCounter;
+
+	uint64 m_last_search_time;
+
+	wxGauge *m_progressbar;
+
+	CMuleNotebook *m_notebook;
 
+	wxArrayString m_searchchoices;
 
 	/**
-	 * Event-handler for page-chages which takes care of enabling/disabling the download button.
+	 * Tabs whose hit-count label needs recomputing, flushed once per idle.
+	 *
+	 * UpdateHitCount() walks the whole result list twice (GetItemCount() and
+	 * GetHiddenItemCount(), each looping every result's children), so calling it per arriving
+	 * result is quadratic over a search. Results arrive in bursts and only the final label of a
+	 * burst is ever seen, so the work is coalesced here the same way the tree rebuild is in
+	 * CSearchListCtrl::OnIdle. Entries are only compared against the notebook's live pages in
+	 * OnIdle(), never dereferenced, so a tab closing before the flush is harmless.
 	 */
-	void		OnSearchPageChanged(wxBookCtrlEvent& evt);
+	std::set<CSearchListCtrl *> m_pendingHitCount;
 
-	uint64		m_last_search_time;
+	// Kad searches whose "More" budget is spent, by searchID. The daemon reports this once per
+	// press and it never un-spends, so it is remembered rather than re-asked: the button's
+	// enabled state is recomputed on every tab switch and progress tick, and without this a
+	// switch away and back would re-enable a dead control. Entries die with the tab, and re-
+	// running a search yields a new searchID.
+	std::set<uint32_t> m_moreExhausted;
 
-	wxGauge*	m_progressbar;
+	// Whether the "More" button should be live for this search: Kad-only, and not already
+	// reported as un-widenable. Single home for a predicate five separate sites otherwise have
+	// to keep in step.
+	bool MoreAllowed(uint32_t searchID) const;
 
-	CMuleNotebook*	m_notebook;
+public:
+	// The daemon says this search can no longer be widened. Called from the remote GUI's reply
+	// handler (amuleGUI); the monolithic build reaches the same state straight from
+	// RequestMoreResults' return value.
+	void MarkMoreExhausted(uint32_t searchID);
 
-	wxArrayString m_searchchoices;
+private:
+	void OnIdle(wxIdleEvent &evt);
+
+	/**
+	 * Live filtering, debounced.
+	 *
+	 * ApplyFilter() re-filters every open search tab, and each one re-runs the regex over its
+	 * results and resets its model, so applying on every keystroke would do that work per
+	 * character across all tabs. The text box therefore only restarts a short timer; the filter
+	 * is applied once the typing pauses. Enter and the Filter button still apply immediately.
+	 */
+	void OnFilterTextChanged(wxCommandEvent &evt);
+	void OnFilterDebounceTimer(wxTimerEvent &evt);
+
+	wxTimer m_filterTimer;
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.0.1.tar.gz/src/SearchExpr.h -> amule-3.1.0.tar.gz/src/SearchExpr.h Changed

@@ -35,22 +35,18 @@
 	SEARCHOP_NOT
 };
 
-// Magic-byte (0xAD) delimiter; as a narrow literal on POSIX UTF-8 locale it
-// would fail wxConvLibc and collapse to empty, breaking operator-token
-// comparisons in SearchList. Keep wxT() so the literal is a wide-char at
-// compile time — same reason as FileTags.h TAG_* macros.
-#define	SEARCHOPTOK_AND	wxT("\255AND")
-#define	SEARCHOPTOK_OR	wxT("\255OR")
-#define	SEARCHOPTOK_NOT	wxT("\255NOT")
+// Magic-byte (0xAD) delimiter. As a narrow literal on a POSIX UTF-8 locale it would fail wxConvLibc
+// and collapse to empty, breaking operator-token comparisons in SearchList. Keep wxT() so the
+// literal is wide-char at compile time -- same reason as FileTags.h's TAG_* macros.
+#define SEARCHOPTOK_AND wxT("\255AND")
+#define SEARCHOPTOK_OR wxT("\255OR")
+#define SEARCHOPTOK_NOT wxT("\255NOT")
 
 class CSearchExpr
 {
 public:
-	CSearchExpr(){}
-	CSearchExpr(const wxString& pszString)
-	{
-		Add(pszString);
-	}
+	CSearchExpr() {}
+	CSearchExpr(const wxString &pszString) { Add(pszString); }
 
 	void Add(ESearchOperators eOperator)
 	{
@@ -65,22 +61,19 @@
 		}
 	}
 
-	void Add(const wxString& pszString)
-	{
-		m_aExpr.Add(pszString);
-	}
+	void Add(const wxString &pszString) { m_aExpr.Add(pszString); }
 
-	void Add(const CSearchExpr* pexpr)
+	void Add(const CSearchExpr *pexpr)
 	{
-		//m_aExpr.Append(pexpr->m_aExpr);
-		for (unsigned int i=0; i < pexpr->m_aExpr.GetCount(); ++i) {
+		// m_aExpr.Append(pexpr->m_aExpr);
+		for (unsigned int i = 0; i < pexpr->m_aExpr.GetCount(); ++i) {
 			m_aExpr.Add(pexpr->m_aExpri);
 		}
 	}
 
-	void Concatenate(const wxString& pstrString)
+	void Concatenate(const wxString &pstrString)
 	{
-		wxASSERT( m_aExpr.GetCount() == 1 );
+		wxASSERT(m_aExpr.GetCount() == 1);
 		m_aExpr0 += ' ';
 		m_aExpr0 += pstrString;
 	}
@@ -88,7 +81,7 @@
 	wxArrayString m_aExpr;
 };
 
-void ParsedSearchExpression(const CSearchExpr* pexpr);
+void ParsedSearchExpression(const CSearchExpr *pexpr);
 
 #ifdef _MSC_VER
 #define YY_NO_UNISTD_H

amule-3.0.1.tar.gz/src/SearchFile.cpp -> amule-3.1.0.tar.gz/src/SearchFile.cpp Changed

@@ -23,32 +23,38 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "SearchFile.h"			// Interface declarations.
+#include "SearchFile.h" // Interface declarations.
 
 #include <tags/FileTags.h>
 
-#include "amule.h"				// Needed for theApp
+#include "amule.h" // Needed for theApp
 #include "CanceledFileList.h"
-#include "MemFile.h"			// Needed for CMemFile
-#include "Preferences.h"		// Needed for thePrefs
+#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 "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),
-	  m_showChildren(false),
-	  m_searchID(searchID),
-	  m_sourceCount(0),
-	  m_completeSourceCount(0),
-	  m_kademlia(kademlia),
-	  m_downloadStatus(NEW),
-	  m_directory(directory),
-	  m_clientServerIP(serverIP),
-	  m_clientServerPort(serverPort),
-	  m_kadPublishInfo(0)
+#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)
+, m_showChildren(false)
+, m_searchID(searchID)
+, m_sourceCount(0)
+, m_completeSourceCount(0)
+, m_kademlia(kademlia)
+, m_downloadStatus(NEW)
+, m_directory(directory)
+, m_clientServerIP(serverIP)
+, m_clientServerPort(serverPort)
+, m_kadPublishInfo(0)
 {
 	m_abyFileHash = data.ReadHash();
 	SetDownloadStatus();
@@ -64,31 +70,39 @@
 	for (unsigned int i = 0; i < tagcount; ++i) {
 		CTag tag(data, optUTF8);
 		switch (tag.GetNameID()) {
-			case FT_FILENAME:
-				SetFileName(CPath(tag.GetStr()));
-				break;
-			case FT_FILESIZE:
-				SetFileSize(tag.GetInt());
-				break;
-			case FT_FILESIZE_HI:
-				SetFileSize((((uint64)tag.GetInt()) << 32) + GetFileSize());
-				break;
-			case FT_FILERATING:
+		case FT_FILENAME:
+			SetFileName(CPath(tag.GetStr()));
+			break;
+		case FT_FILESIZE:
+			SetFileSize(tag.GetInt());
+			break;
+		case FT_FILESIZE_HI:
+			SetFileSize((((uint64)tag.GetInt()) << 32) + GetFileSize());
+			break;
+		case FT_FILERATING:
+			if (kademlia) {
+				// Kad results carry the publisher's rating raw (0-5); there is no
+				// server-side packing. Clamp defensively against malformed values.
+				m_iUserRating = static_cast<int8>(std::min<uint64>(tag.GetInt(), 5));
+			} else {
+				// ed2k servers relay the rating packed (low byte = rating * 51); the
+				// low nibble recovers rating * 3, hence the /3.
 				m_iUserRating = (tag.GetInt() & 0xF) / 3;
-				break;
-			case FT_SOURCES:
-				m_sourceCount = tag.GetInt();
-				break;
-			case FT_COMPLETE_SOURCES:
-				m_completeSourceCount = tag.GetInt();
-				break;
-			case FT_PERMISSIONS:
-			case FT_KADLASTPUBLISHKEY:
-			case FT_PARTFILENAME:
-				// Just ignore
-				break;
-			default:
-				AddTagUnique(tag);
+			}
+			break;
+		case FT_SOURCES:
+			m_sourceCount = tag.GetInt();
+			break;
+		case FT_COMPLETE_SOURCES:
+			m_completeSourceCount = tag.GetInt();
+			break;
+		case FT_PERMISSIONS:
+		case FT_KADLASTPUBLISHKEY:
+		case FT_PARTFILENAME:
+			// Just ignore
+			break;
+		default:
+			AddTagUnique(tag);
 		}
 	}
 
@@ -97,48 +111,226 @@
 	}
 }
 
-
-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_clientID(other.m_clientID),
-	  m_clientPort(other.m_clientPort),
-	  m_clientServerIP(other.m_clientServerIP),
-	  m_clientServerPort(other.m_clientServerPort),
-	  m_kadPublishInfo(other.m_kadPublishInfo)
+// CECID() below deliberately allocates a fresh EC ID instead of copying other's.
+CSearchFile::CSearchFile(const CSearchFile &other) // NOLINT(bugprone-copy-constructor-init)
+: 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_clientID(other.m_clientID)
+, m_clientPort(other.m_clientPort)
+, m_clientServerIP(other.m_clientServerIP)
+, m_clientServerPort(other.m_clientServerPort)
+, m_kadPublishInfo(other.m_kadPublishInfo)
 {
 	for (size_t i = 0; i < other.m_children.size(); ++i) {
 		m_children.push_back(new CSearchFile(*other.m_children.at(i)));
 	}
 }
 
+// Only reachable from LoadFromFile(); every field gets overwritten from the stream except
+// m_downloadStatus, which stays NEW until SetDownloadStatus() recomputes it against the live
+// knownfiles/downloadqueue/canceledfiles -- see the WriteToFile()/LoadFromFile() comments in
+// SearchFile.h.
+CSearchFile::CSearchFile()
+: m_parent(nullptr)
+, m_showChildren(false)
+, m_searchID(0)
+, m_sourceCount(0)
+, m_completeSourceCount(0)
+, m_kademlia(false)
+, m_downloadStatus(NEW)
+, m_clientID(0)
+, m_clientPort(0)
+, m_clientServerIP(0)
+, m_clientServerPort(0)
+, m_kadPublishInfo(0)
+{
+}
 
 CSearchFile::~CSearchFile()
 {
+	// Let any open comments dialog drop its pointer before we free the object (a Kad-notes
+	// lookup can still be showing this result). Fired for children too -- they are deleted just
+	// below.
+	Notify_SearchFileBeingDestroyed(this);
+
 	for (size_t i = 0; i < m_children.size(); ++i) {
 		delete m_children.at(i);
 	}
 }
 
+bool CSearchFile::WriteToFile(CFileDataIO *file) const
+{
+	file->WriteHash(m_abyFileHash);
+
+	// Fixed tags: filename, size, sources, complete-sources, and rating if ever set. Anything
+	// else already in m_taglist is appended after, the same shape as CKnownFile::WriteToFile.
+	// Unlike CKnownFile's on-the-wire pairing of an FT_FILESIZE_HI tag alongside a 32-bit
+	// FT_FILESIZE -- a server-wire idiom where the two are used INSTEAD OF a 64-bit tag -- this
+	// format always writes the size as a single 64-bit-capable tag, so a size-hi tag here would
+	// be additive rather than complementary on read.
+	uint32 tagcount = 4;
+	if (m_iUserRating != 0) {
+		tagcount++;
+	}
+	tagcount += m_taglist.size();
+	file->WriteUInt32(tagcount);
+
+	CTagString nametag(FT_FILENAME, CPath::ToUniv(GetFileName()));
+	nametag.WriteTagToFile(file);
+
+	CTagIntSized sizetag(FT_FILESIZE, GetFileSize(), 64);
+	sizetag.WriteTagToFile(file);
+
+	CTagInt32 sourcestag(FT_SOURCES, m_sourceCount);
+	sourcestag.WriteTagToFile(file);
+
+	CTagInt32 completesourcestag(FT_COMPLETE_SOURCES, m_completeSourceCount);
+	completesourcestag.WriteTagToFile(file);
+
+	if (m_iUserRating != 0) {
+		CTagInt32 ratingtag(FT_FILERATING, m_iUserRating);
+		ratingtag.WriteTagToFile(file);
+	}
+
+	for (const CTag &tag : m_taglist) {
+		tag.WriteTagToFile(file);
+	}
+
+	// Non-tag fields.
+	file->WriteUInt8(m_kademlia ? 1 : 0);
+	file->WriteString(m_directory, utf8strRaw); // Always UTF8 -- matches LoadFromFile's ReadString(true)
+	file->WriteUInt32(m_clientID);
+	file->WriteUInt16(m_clientPort);
+	file->WriteUInt32(m_clientServerIP);
+	file->WriteUInt16(m_clientServerPort);
+	file->WriteUInt32(m_kadPublishInfo);
+
+	file->WriteUInt16((uint16)m_clients.size());
+	for (const ClientStruct &client : m_clients) {
+		file->WriteUInt32(client.m_ip);
+		file->WriteUInt16(client.m_port);
+		file->WriteUInt32(client.m_serverIP);
+		file->WriteUInt16(client.m_serverPort);
+	}
+
+	file->WriteUInt16((uint16)m_children.size());
+	for (const CSearchFile *child : m_children) {
+		if (!child->WriteToFile(file)) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+CSearchFile *CSearchFile::LoadFromFile(CFileDataIO *file, bool allowChildren)
+{
+	std::unique_ptr<CSearchFile> result(new CSearchFile());
+
+	result->m_abyFileHash = file->ReadHash();
+
+	uint32 tagcount = file->ReadUInt32();
+	for (uint32 i = 0; i != tagcount; ++i) {
+		CTag tag(*file, true);
+		switch (tag.GetNameID()) {
+		case FT_FILENAME:
+			result->SetFileName(CPath::FromUniv(tag.GetStr()));
+			break;
+		case FT_FILESIZE:
+			result->SetFileSize(tag.GetInt());
+			break;
+		case FT_SOURCES:
+			result->m_sourceCount = tag.GetInt();
+			break;
+		case FT_COMPLETE_SOURCES:
+			result->m_completeSourceCount = tag.GetInt();
+			break;
+		case FT_FILERATING:
+			result->m_iUserRating = static_cast<int8>(tag.GetInt());
+			break;
+		default:
+			result->AddTagUnique(tag);
+		}
+	}
+
+	if (!result->GetFileName().IsOk()) {
+		return nullptr;
+	}
+
+	result->m_kademlia = file->ReadUInt8() != 0;
+	result->m_directory = file->ReadString(true);
+	result->m_clientID = file->ReadUInt32();
+	result->m_clientPort = file->ReadUInt16();
+	result->m_clientServerIP = file->ReadUInt32();
+	result->m_clientServerPort = file->ReadUInt16();
+	result->m_kadPublishInfo = file->ReadUInt32();
+
+	uint16 clientcount = file->ReadUInt16();
+	for (uint16 i = 0; i != clientcount; ++i) {
+		uint32_t ip = file->ReadUInt32();
+		uint16_t port = file->ReadUInt16();
+		uint32_t serverIP = file->ReadUInt32();
+		uint16_t serverPort = file->ReadUInt16();
+		result->m_clients.emplace_back(ip, port, serverIP, serverPort);
+	}
 
-void CSearchFile::AddClient(const ClientStruct& client)
+	uint16 childcount = file->ReadUInt16();
+	if (childcount > 0 && !allowChildren) {
+		// A real result tree is two levels deep at most -- parent plus alternative-filename
+		// children, the invariant AddChild() enforces at runtime. A child record claiming
+		// children of its own is malformed, and without this check a crafted file nesting
+		// one child per level recurses unbounded and overflows the stack before any other
+		// validation runs.
+		return nullptr;
+	}
+	for (uint16 i = 0; i != childcount; ++i) {
+		CSearchFile *child = LoadFromFile(file, false);
+		if (!child) {
+			return nullptr;
+		}
+		// Not AddChild(): that also does live-search duplicate merging, which does not
+		// apply to restoring an already finalized tree where every child was distinct when
+		// written.
+		child->m_parent = result.get();
+		result->m_children.push_back(child);
+	}
+
+	// m_downloadStatus is deliberately left at its NEW default: recomputing it needs
+	// theApp->downloadqueue/knownfiles/canceledfiles, which is the caller's job, so this stays
+	// a pure parser callable before those singletons exist.
+	return result.release();
+}
+
+// SearchFile.cpp is core-only (CORE_SOURCES); the amulegui build compiles its CSearchFile methods
+// in amule-remote-gui.cpp, where the CLIENT_GUI version of GetRatingAndComments (returning the EC-
+// streamed list) also lives.
+void CSearchFile::GetRatingAndComments(FileRatingList &list) const
+{
+	// A search result has no connected sources, so its comments are exactly the
+	// on-demand Kad notes gathered by the CAbstractFile helper.
+	list.clear();
+	GetKadNotesComments(list);
+}
+
+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;
+		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)
+void CSearchFile::MergeResults(const CSearchFile &other)
 {
 	// Sources
 	if (m_kademlia) {
@@ -159,7 +351,8 @@
 			m_kadPublishInfo =
 				std::max(m_kadPublishInfo & 0xFF000000, other.m_kadPublishInfo & 0xFF000000) |
 				std::max(m_kadPublishInfo & 0x00FF0000, other.m_kadPublishInfo & 0x00FF0000) |
-				(((m_kadPublishInfo & 0x0000FFFF) + (other.m_kadPublishInfo & 0x0000FFFF)) >> 1);
+				(((m_kadPublishInfo & 0x0000FFFF) + (other.m_kadPublishInfo & 0x0000FFFF)) >>
+					1);
 		}
 	}
 
@@ -177,15 +370,20 @@
 	// 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());
+		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)
+void CSearchFile::AddChild(CSearchFile *file)
 {
 	wxCHECK_RET(file, "Not a valid child!");
 	wxCHECK_RET(!file->GetParent(), "Search-result can only be child of one other result");
@@ -204,16 +402,23 @@
 			return;
 		} else {
 			// The first child will always be the first result we received.
-			AddDebugLogLineN(logSearch, CFormat("Created initial child for result '%s'") % GetFileName());
+			AddDebugLogLineN(
+				logSearch, CFormat("Created initial child for result '%s'") % GetFileName());
 			m_children.push_back(new CSearchFile(*this));
 			m_children.back()->m_parent = this;
+			// Announced like any other new row. Without this the group is formed with
+			// two children while only the incoming one is ever notified, so a view that
+			// builds its rows from notifications -- rather than re-reading the model as
+			// it draws, which is what hides this on macOS -- shows a two-variant group
+			// holding one row, and the one missing is the result received first.
+			Notify_Search_Add_Result(m_children.back());
 		}
 	}
 
 	file->m_parent = this;
 
 	for (size_t i = 0; i < m_children.size(); ++i) {
-		CSearchFile* other = m_children.at(i);
+		CSearchFile *other = m_children.at(i);
 		// Merge duplicate filenames
 		if (other->GetFileName() == file->GetFileName()) {
 			other->MergeResults(*file);
@@ -232,22 +437,21 @@
 	}
 }
 
-
 void CSearchFile::UpdateParent()
 {
 	wxCHECK_RET(!m_parent, "UpdateParent called on child item");
 
-	uint32_t sourceCount = 0;		// ed2k: sum of all sources, kad: the max sources found
-	uint32_t completeSourceCount = 0;	// ed2k: sum of all sources, kad: the max sources found
-	uint32_t differentNames = 0;		// max known different names
-	uint32_t publishersKnown = 0;		// max publishers known
-	uint32_t trustValue = 0;		// average trust value
+	uint32_t sourceCount = 0;         // ed2k: sum of all sources, kad: the max sources found
+	uint32_t completeSourceCount = 0; // ed2k: sum of all sources, kad: the max sources found
+	uint32_t differentNames = 0;      // max known different names
+	uint32_t publishersKnown = 0;     // max publishers known
+	uint32_t trustValue = 0;          // average trust value
 	unsigned publishInfoTags = 0;
 	unsigned ratingCount = 0;
 	unsigned ratingTotal = 0;
 	CSearchResultList::const_iterator best = m_children.begin();
 	for (CSearchResultList::const_iterator it = m_children.begin(); it != m_children.end(); ++it) {
-		const CSearchFile* child = *it;
+		const CSearchFile *child = *it;
 
 		// Locate the most common name
 		if (child->GetSourceCount() > (*best)->GetSourceCount()) {
@@ -265,8 +469,10 @@
 
 		// Publish info
 		if (child->GetKadPublishInfo() != 0) {
-			differentNames = std::max(differentNames, (child->GetKadPublishInfo() & 0xFF000000) >> 24);
-			publishersKnown = std::max(publishersKnown, (child->GetKadPublishInfo() & 0x00FF0000) >> 16);
+			differentNames =
+				std::max(differentNames, (child->GetKadPublishInfo() & 0xFF000000) >> 24);
+			publishersKnown =
+				std::max(publishersKnown, (child->GetKadPublishInfo() & 0x00FF0000) >> 16);
 			trustValue += child->GetKadPublishInfo() & 0x0000FFFF;
 			publishInfoTags++;
 		}
@@ -279,10 +485,15 @@
 
 		// Available sources
 		if (child->GetClientID() && child->GetClientPort()) {
-			CSearchFile::ClientStruct client(child->GetClientID(), child->GetClientPort(), child->GetClientServerIP(), child->GetClientServerPort());
+			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) {
+		for (std::list<ClientStruct>::const_iterator cit = child->m_clients.begin();
+			cit != child->m_clients.end();
+			++cit) {
 			AddClient(*cit);
 		}
 	}
@@ -291,7 +502,9 @@
 	m_completeSourceCount = completeSourceCount;
 
 	if (publishInfoTags > 0) {
-		m_kadPublishInfo = ((differentNames & 0x000000FF) << 24) | ((publishersKnown & 0x000000FF) << 16) | ((trustValue / publishInfoTags) & 0x0000FFFF);
+		m_kadPublishInfo = ((differentNames & 0x000000FF) << 24) |
+				   ((publishersKnown & 0x000000FF) << 16) |
+				   ((trustValue / publishInfoTags) & 0x0000FFFF);
 	} else {
 		m_kadPublishInfo = 0;
 	}
@@ -307,9 +520,9 @@
 
 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);
+	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;

amule-3.0.1.tar.gz/src/SearchFile.h -> amule-3.1.0.tar.gz/src/SearchFile.h Changed

@@ -26,203 +26,236 @@
 #ifndef SEARCHFILE_H
 #define SEARCHFILE_H
 
-#include "KnownFile.h"	// Needed for CAbstractFile
-
+#include "KnownFile.h" // Needed for CAbstractFile
 
 class CMemFile;
 class CMD4Hash;
 class CSearchFile;
+class CFileDataIO;
 
-
-typedef std::vector<CSearchFile*> CSearchResultList;
-
+typedef std::vector<CSearchFile *> CSearchResultList;
 
 /**
- * Represents a search-result returned from a server or client.
+ * Represents a search result returned from a server or client.
  *
- * A file may have either a parent or any number of children.
- * When a child is added to a result, the parent becomes a generic
- * representation of all its children, which will include a copy
- * of the original result. The parent object will contain the sum
- * of sources (total/complete) and will have the most common
- * filename. Children are owned by their parents, and can be
- * displayed on CSearchListCtrl.
+ * A file may have either a parent or any number of children. When a child is added to a result, the
+ * parent becomes a generic representation of all its children, including a copy of the original
+ * result: it carries the sum of sources (total/complete) and the most common filename. Children are
+ * owned by their parents, and can be displayed on CSearchListCtrl.
  *
- * Basic file parameters (hash, name, size, rating) can be read
- * via the CAbstractFile functions. Tags pertaining to meta-data
- * are stored in the taglist inherited from CAbstractFile.
+ * Basic file parameters (hash, name, size, rating) are read through the CAbstractFile functions;
+ * meta-data tags live in the taglist inherited from CAbstractFile.
  *
- * TODO: Server IP/Port are currently not used.
- * TODO: Client ID/Port are currently not used.
+ * TODO: Server IP/Port and Client ID/Port are currently not used.
  */
 class CSearchFile : public CAbstractFile, public CECID
 {
 public:
 	/** Constructor used to create results on the remote GUI. */
-	CSearchFile(const class CEC_SearchFile_Tag* tag);
+	CSearchFile(const class CEC_SearchFile_Tag *tag);
 	/** Copy constructor, also copies children. */
-	CSearchFile(const CSearchFile& other);
+	CSearchFile(const CSearchFile &other);
 
 	/**
 	 * Normal constructor, reads a result from a packet.
 	 *
-	 * @param data Source of results-packet.
-	 * @param optUTF8 Specifies if text-strings are to be read as UTF8.
-	 * @param searchID searchID The
+	 * @param data Source of the results packet.
+	 * @param optUTF8 Whether text strings are to be read as UTF8.
+	 * @param searchID The search this result belongs to.
 	 * @param serverIP The IP of the server that sent this result.
 	 * @param serverPort The port of the server that sent this result.
-	 * @param directory If from a clients shared files, the directory this file is in.
-	 * @param kademlia Specifies if this was from a kad-search.
+	 * @param directory If from a client's shared files, the directory this file is in.
+	 * @param kademlia Whether this came from a kad search.
 	 */
-	CSearchFile(
-		const CMemFile& data,
+	CSearchFile(const CMemFile &data,
 		bool optUTF8,
 		wxUIntPtr searchID,
 		uint32_t serverIP = 0,
 		uint16_t serverPort = 0,
-		const wxString& directory = "",
+		const wxString &directory = "",
 		bool kademlia = false);
 
-
 	/** Frees all children owned by this file. */
 	virtual ~CSearchFile();
 
+	/**
+	 * Serializes this result, and its children recursively, to `file`. Mirrors CKnownFile's
+	 * WriteToFile/LoadTagsFromFile pattern: fixed fields plus a generic CTag list for anything
+	 * else already carried in m_taglist. m_downloadStatus and m_searchID are NOT persisted --
+	 * the former is always recomputed at runtime (SetDownloadStatus()), the latter reassigned
+	 * by the caller once results are reloaded (see CSearchList::LoadSearches()).
+	 */
+	bool WriteToFile(CFileDataIO *file) const;
 
 	/**
-	 * Merges the two results into one.
+	 * Reconstructs a result, and its children recursively, written by WriteToFile(). Returns a
+	 * heap-allocated, parentless root result the caller owns, or NULL on a malformed record --
+	 * which callers must treat as fatal for the whole load rather than skip-and-continue, since
+	 * a corrupt length prefix partway through the stream leaves every later record unreadable.
 	 *
-	 * Merges the other result into this one, updating
-	 * various information.
+	 * `allowChildren` caps recursion at the real two-level result-tree depth (parent plus
+	 * alternative-filename children, never grandchildren -- the same invariant AddChild()
+	 * enforces at runtime); leave it at the default when reading a root record. A record whose
+	 * children claim children of their own is treated as malformed.
 	 *
-	 * @param other The file to be merged into this.
+	 * Deliberately does not call SetDownloadStatus(): recomputing it needs
+	 * theApp->downloadqueue/knownfiles/canceledfiles, which may not exist yet when results are
+	 * loaded (searchlist is constructed before them, see amule.cpp). Callers must walk the
+	 * returned tree, root and every child, and call SetDownloadStatus() on each node once those
+	 * singletons are available.
+	 */
+	static CSearchFile *LoadFromFile(CFileDataIO *file, bool allowChildren = true);
+
+	/**
+	 * Merges @a other into this result, updating the various information.
 	 */
-	void MergeResults(const CSearchFile& other);
+	void MergeResults(const CSearchFile &other);
 
 	/** Returns the total number of sources. */
-	uint32 GetSourceCount() const			{ return m_sourceCount; }
+	uint32 GetSourceCount() const { return m_sourceCount; }
 	/** Returns the number of sources that have the entire file. */
-	uint32 GetCompleteSourceCount() const	{ return m_completeSourceCount; }
+	uint32 GetCompleteSourceCount() const { return m_completeSourceCount; }
 	/** Returns the ID of the search, used to select the right list when displaying. */
-	wxUIntPtr GetSearchID() const			{ return m_searchID; }
+	wxUIntPtr GetSearchID() const { return m_searchID; }
 	/** Returns true if the result is from a Kademlia search. */
-	bool IsKademlia() const					{ return m_kademlia; }
+	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
+	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; }
+	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; }
+	void SetDownloadStatus(enum DownloadStatus s) { m_downloadStatus = s; }
 
 	/** Returns the parent of this file. */
-	CSearchFile *GetParent() const			{ return m_parent; }
+	CSearchFile *GetParent() const { return m_parent; }
 	/** Returns the list of children belonging to this file. */
-	const CSearchResultList &GetChildren() const	{ return m_children; }
+	const CSearchResultList &GetChildren() const { return m_children; }
 	/** Returns true if this item has children. */
-	bool HasChildren() const				{ return !m_children.empty(); }
+	bool HasChildren() const { return !m_children.empty(); }
 	/** Returns true if children should be displayed. */
-	bool ShowChildren() const				{ return m_showChildren; }
+	bool ShowChildren() const { return m_showChildren; }
 	/** Enable/Disable displaying of children (set in CSearchListCtrl). */
-	void SetShowChildren(bool show)			{ m_showChildren = show; }
+	void SetShowChildren(bool show) { m_showChildren = show; }
 
 	/**
-	 * Adds the given file as a child of this file.
-	 *
-	 * Note that a file can either be a parent _or_
-	 * a child, but not both. Also note that it is
-	 * only legal to add children whose filesize and
-	 * filehash matches the parent's. AddChild takes
-	 * ownership of the file.
+	 * Adds @a file as a child of this file, taking ownership. A file can be either a parent or
+	 * a child, not both, and only a child whose filesize and filehash match the parent's may be
+	 * added.
 	 */
-	void		AddChild(CSearchFile* file);
+	void AddChild(CSearchFile *file);
 
-	struct ClientStruct {
+	struct ClientStruct
+	{
 		ClientStruct()
-			: m_ip(0), m_port(0), m_serverIP(0), m_serverPort(0)
-		{}
+		: 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)
-		{}
+		: 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;
+		uint16_t m_serverPort;
 	};
 
-	void	 AddClient(const ClientStruct& client);
-	const std::list<ClientStruct>& GetClients() const	{ return m_clients; }
-
-	uint32_t GetClientID() const noexcept			{ return m_clientID; }
-	void	 SetClientID(uint32_t clientID) noexcept		{ m_clientID = clientID; }
-	uint16_t GetClientPort() const noexcept			{ return m_clientPort; }
-	void	 SetClientPort(uint16_t port) noexcept		{ m_clientPort = port; }
-	uint32_t GetClientServerIP() const noexcept		{ return m_clientServerIP; }
-	void	 SetClientServerIP(uint32_t serverIP) noexcept	{ m_clientServerIP = serverIP; }
-	uint16_t GetClientServerPort() const noexcept		{ return m_clientServerPort; }
-	void	 SetClientServerPort(uint16_t port) noexcept	{ m_clientServerPort = port; }
-	int	 GetClientsCount() const			{ return ((GetClientID() && GetClientPort()) ? 1 : 0) + m_clients.size(); }
-
-	void	 SetKadPublishInfo(uint32_t val) noexcept	{ m_kadPublishInfo = val; }
-	uint32_t GetKadPublishInfo() const noexcept		{ return m_kadPublishInfo; }
-
-	const wxString& GetDirectory() const noexcept	{ return m_directory; }
+	void AddClient(const ClientStruct &client);
+	const std::list<ClientStruct> &GetClients() const { return m_clients; }
+
+	uint32_t GetClientID() const noexcept { return m_clientID; }
+	void SetClientID(uint32_t clientID) noexcept { m_clientID = clientID; }
+	uint16_t GetClientPort() const noexcept { return m_clientPort; }
+	void SetClientPort(uint16_t port) noexcept { m_clientPort = port; }
+	uint32_t GetClientServerIP() const noexcept { return m_clientServerIP; }
+	void SetClientServerIP(uint32_t serverIP) noexcept { m_clientServerIP = serverIP; }
+	uint16_t GetClientServerPort() const noexcept { return m_clientServerPort; }
+	void SetClientServerPort(uint16_t port) noexcept { m_clientServerPort = port; }
+	int GetClientsCount() const
+	{
+		return ((GetClientID() && GetClientPort()) ? 1 : 0) + m_clients.size();
+	}
+
+	void SetKadPublishInfo(uint32_t val) noexcept { m_kadPublishInfo = val; }
+	uint32_t GetKadPublishInfo() const noexcept { return m_kadPublishInfo; }
+
+	const wxString &GetDirectory() const noexcept { return m_directory; }
+
+#ifndef CLIENT_GUI
+	// Daemon override: a search result's comments are its on-demand Kad notes. On amulegui the
+	// inherited CAbstractFile version returns the EC-streamed cache, so no override is needed
+	// there.
+	void GetRatingAndComments(FileRatingList &list) const;
+#endif
 
 private:
 	//! CSearchFile is not assignable.
-	CSearchFile& operator=(const CSearchFile& other);
+	CSearchFile &operator=(const CSearchFile &other);
+
+	/** Minimal-init constructor, used only by LoadFromFile(). */
+	CSearchFile();
 
 	/**
-	 * Updates a parent file so that it shows various common traits.
-	 *
-	 * Currently, the most common filename is selected, and an average
-	 * of fileratings is set, based on files that have a rating only.
+	 * Updates a parent file so it shows the common traits: the most common filename, and an
+	 * average of the file ratings over the children that have one.
 	 */
-	void	UpdateParent();
+	void UpdateParent();
 
 	//! The parent of this result.
-	CSearchFile*		m_parent;
+	CSearchFile *m_parent;
 	//! Any children this result may have.
-	CSearchResultList	m_children;
+	CSearchResultList m_children;
 	//! If true, children will be shown on the GUI.
-	bool			m_showChildren;
+	bool m_showChildren;
 	//! The unique ID of this search owning this result.
-	wxUIntPtr		m_searchID;
+	wxUIntPtr m_searchID;
 	//! The total number of sources for this file.
-	uint32			m_sourceCount;
+	uint32 m_sourceCount;
 	//! The number of sources that have the complete file.
-	uint32			m_completeSourceCount;
+	uint32 m_completeSourceCount;
 	//! Specifies if the result is from a kademlia search.
-	bool			m_kademlia;
+	bool m_kademlia;
 	//! The download status.
 	enum DownloadStatus m_downloadStatus;
 
 	//! Directory where file is stored (when it is part of a remote shared files list).
-	wxString		m_directory;
+	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;
+	uint32_t m_kadPublishInfo;
 
 	friend class CPartFile;
 	friend class CSearchListRem;
+	// Needs to assign m_searchID directly after LoadFromFile() reconstructs a result tree from
+	// StoredSearches.met, same as CSearchListRem already does for EC-streamed results --
+	// LoadFromFile() deliberately never sets it itself (see its header comment).
+	friend class CSearchList;
 };
 
-
 #endif // SEARCHLIST_H
 // File_checked_for_headers

amule-3.1.0.tar.gz/src/SearchHistory.cpp Added

@@ -0,0 +1,44 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "SearchHistory.h"
+
+wxArrayString ApplySearchHistoryEntry(const wxArrayString &existing, const wxString &term, size_t maxEntries)
+{
+	if (term.IsEmpty()) {
+		return existing;
+	}
+
+	wxArrayString result;
+	result.Add(term);
+	for (const wxString &candidate : existing) {
+		if (candidate.CmpNoCase(term) != 0) {
+			result.Add(candidate);
+		}
+	}
+	if (result.GetCount() > maxEntries) {
+		result.RemoveAt(maxEntries, result.GetCount() - maxEntries);
+	}
+	return result;
+}

amule-3.1.0.tar.gz/src/SearchHistory.h Added

@@ -0,0 +1,47 @@
+//                                                       -*- C++ -*-
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 SEARCHHISTORY_H
+#define SEARCHHISTORY_H
+
+#include <wx/arrstr.h>
+
+// Pure list logic behind the Search tab's Name-field query history (amule-org/amule#641, #643) --
+// kept free of CSearchDlg/wxComboBox so it is unit-testable without a wx GUI event loop. This is
+// query history: the strings the user typed, not the results a search returned (that is the
+// separate, not-yet-implemented result persistence tracked in #641).
+
+// How many past queries the Search tab keeps. Started at eMule's CCustomAutoComplete default of 30
+// (amule-org/amule#643 review) and raised on request (#755): a search history is only useful as far
+// back as it reaches, and clearing it has been a deliberate, confirmed action since #754. It lives
+// here rather than in SearchDlg.cpp so the tests can assert the value the GUI actually passes
+// instead of mirroring a copy of it.
+const size_t MAX_SEARCH_HISTORY_ENTRIES = 100;
+
+// `existing` with `term` moved to the front: any earlier case-insensitive occurrence of `term` is
+// dropped so it does not appear twice, and the result is capped to at most `maxEntries`, oldest
+// entries dropping off the tail first. An empty `term` returns `existing` unchanged.
+wxArrayString ApplySearchHistoryEntry(const wxArrayString &existing, const wxString &term, size_t maxEntries);
+
+#endif // SEARCHHISTORY_H

amule-3.0.1.tar.gz/src/SearchList.cpp -> amule-3.1.0.tar.gz/src/SearchList.cpp Changed

@@ -23,61 +23,67 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "SearchList.h"		// Interface declarations.
+#include "SearchList.h" // Interface declarations.
+
+#include "BrowseManager.h"
+
+#include <algorithm> // Needed for std::sort (StoreSearches)
+#include <utility>   // Needed for std::move (LoadSearches)
 
 #include <protocol/Protocols.h>
 #include <protocol/kad/Constants.h>
 #include <tags/ClientTags.h>
 #include <tags/FileTags.h>
-
-#include "updownclient.h"	// Needed for CUpDownClient
-#include "MemFile.h"		// Needed for CMemFile
-#include "amule.h"			// Needed for theApp
-#include "ServerConnect.h"	// Needed for theApp->serverconnect
-#include "Server.h"			// Needed for CServer
-#include "ServerList.h"		// Needed for theApp->serverlist
-#include "Statistics.h"		// Needed for theStats
-#include "ObservableQueue.h"// Needed for CQueueObserver
+#include <common/DataFileVersion.h> // Needed for STOREDSEARCHES_VERSION
+
+#include "updownclient.h"    // Needed for CUpDownClient
+#include "MemFile.h"         // Needed for CMemFile
+#include "amule.h"           // Needed for theApp
+#include "ServerConnect.h"   // Needed for theApp->serverconnect
+#include "Server.h"          // Needed for CServer
+#include "ServerList.h"      // Needed for theApp->serverlist
+#include "Statistics.h"      // Needed for theStats
+#include "ObservableQueue.h" // Needed for CQueueObserver
 #include <common/Format.h>
-#include "Logger.h"			// Needed for AddLogLineM/...
-#include "Packet.h"			// Needed for CPacket
-#include "GuiEvents.h"		// Needed for Notify_*
-
+#include "CFile.h"       // Needed for CFile (StoredSearches.met)
+#include "Preferences.h" // Needed for thePrefs::GetConfigDir
+#include "Logger.h"      // Needed for AddLogLineM/...
+#include "Packet.h"      // Needed for CPacket
+#include "GuiEvents.h"   // Needed for Notify_*
 
 #ifndef AMULE_DAEMON
-#include "amuleDlg.h"		// Needed for CamuleDlg
-#include "SearchDlg.h"		// Needed for CSearchDlg
+#include "amuleDlg.h"  // Needed for CamuleDlg
+#include "SearchDlg.h" // Needed for CSearchDlg
 #endif
 
 #include "kademlia/kademlia/Kademlia.h"
 #include "kademlia/kademlia/Search.h"
+#include "kademlia/kademlia/Defines.h" // Needed for SEARCHKEYWORD_LIFETIME (Kad ramp)
 
 #include "SearchExpr.h"
 
 #include "Scanner.h"
-void LexInit(const wxString& pszInput);
+void LexInit(const wxString &pszInput);
 void LexFree();
 
 #include "Parser.hpp"
 int yyerror(wxString errstr);
 
-
 static wxString s_strCurKadKeyword;
 
 static CSearchExpr _SearchExpr;
 
 wxArrayString _astrParserErrors;
 
-
 // Helper function for lexer.
-void ParsedSearchExpression(const CSearchExpr* pexpr)
+void ParsedSearchExpression(const CSearchExpr *pexpr)
 {
 	int iOpAnd = 0;
 	int iOpOr = 0;
 	int iOpNot = 0;
 
 	for (unsigned int i = 0; i < pexpr->m_aExpr.GetCount(); i++) {
-		const wxString& str = pexpr->m_aExpri;
+		const wxString &str = pexpr->m_aExpri;
 		if (str == SEARCHOPTOK_AND) {
 			iOpAnd++;
 		} else if (str == SEARCHOPTOK_OR) {
@@ -87,21 +93,9 @@
 		}
 	}
 
-	// this limit (+ the additional operators which will be added later) has to match the limit in 'CreateSearchExpressionTree'
-	//	+1 Type (Audio, Video)
-	//	+1 MinSize
-	//	+1 MaxSize
-	//	+1 Avail
-	//	+1 Extension
-	//	+1 Complete sources
-	//	+1 Codec
-	//	+1 Bitrate
-	//	+1 Length
-	//	+1 Title
-	//	+1 Album
-	//	+1 Artist
-	// ---------------
-	//  12
+	// This limit (plus the operators added later) has to match the limit in
+	// CreateSearchExpressionTree: one each for Type, MinSize, MaxSize, Avail, Extension,
+	// Complete sources, Codec, Bitrate, Length, Title, Album and Artist -- 12 in total.
 	if (iOpAnd + iOpOr + iOpNot > 10) {
 		yyerror("Search expression is too complex");
 	}
@@ -110,20 +104,22 @@
 
 	// optimize search expression, if no OR nor NOT specified
 	if (iOpAnd > 0 && iOpOr == 0 && iOpNot == 0) {
-		// figure out if we can use a better keyword than the one the user selected
-		// for example most user will search like this "The oxymoronaccelerator 2", which would ask the node which indexes "the"
-		// This causes higher traffic for such nodes and makes them a viable target to attackers, while the kad result should be
-		// the same or even better if we ask the node which indexes the rare keyword "oxymoronaccelerator", so we try to rearrange
-		// keywords and generally assume that the longer keywords are rarer
+		// Figure out if we can use a better keyword than the one the user selected: most users
+		// search like "The oxymoronaccelerator 2", which would ask the node indexing "the" --
+		// higher traffic for such nodes and a viable target for attackers. Asking the node that
+		// indexes the rare keyword gives the same or better results, so keywords are rearranged
+		// on the assumption that longer keywords are rarer.
 		if (/*thePrefs::GetRearrangeKadSearchKeywords() &&*/ !s_strCurKadKeyword.IsEmpty()) {
 			for (unsigned int i = 0; i < pexpr->m_aExpr.GetCount(); i++) {
 				if (pexpr->m_aExpri != SEARCHOPTOK_AND) {
-					if (pexpr->m_aExpri != s_strCurKadKeyword
-						&& pexpr->m_aExpri.find_first_of(Kademlia::CSearchManager::GetInvalidKeywordChars()) == wxString::npos
-						&& pexpr->m_aExpri.Find('"') != 0 // no quoted expressions as keyword
-						&& pexpr->m_aExpri.length() >= 3
-						&& s_strCurKadKeyword.length() < pexpr->m_aExpri.length())
-					{
+					if (pexpr->m_aExpri != s_strCurKadKeyword &&
+						pexpr->m_aExpri.find_first_of(
+							Kademlia::CSearchManager::GetInvalidKeywordChars()) ==
+							wxString::npos &&
+						pexpr->m_aExpri.Find('"') !=
+							0 // no quoted expressions as keyword
+						&& pexpr->m_aExpri.length() >= 3 &&
+						s_strCurKadKeyword.length() < pexpr->m_aExpri.length()) {
 						s_strCurKadKeyword = pexpr->m_aExpri;
 					}
 				}
@@ -132,9 +128,9 @@
 		wxString strAndTerms;
 		for (unsigned int i = 0; i < pexpr->m_aExpr.GetCount(); i++) {
 			if (pexpr->m_aExpri != 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
-				// does only contain (implicit) ANDed strings.
+				// Minor optimization: because the Kad keyword was added to the
+				// boolean search expression, remove it here (and only here) -- the
+				// whole expression contains only (implicit) ANDed strings.
 				if (pexpr->m_aExpri != s_strCurKadKeyword) {
 					if (!strAndTerms.IsEmpty()) {
 						strAndTerms += ' ';
@@ -143,7 +139,7 @@
 				}
 			}
 		}
-		wxASSERT( _SearchExpr.m_aExpr.GetCount() == 0);
+		wxASSERT(_SearchExpr.m_aExpr.GetCount() == 0);
 		_SearchExpr.m_aExpr.Add(strAndTerms);
 	} else {
 		if (pexpr->m_aExpr.GetCount() != 1 || pexpr->m_aExpr0 != s_strCurKadKeyword)
@@ -151,65 +147,64 @@
 	}
 }
 
-
 //! Helper class for packet creation
 class CSearchExprTarget
 {
 public:
-	CSearchExprTarget(CMemFile* pData, EUtf8Str eStrEncode, bool supports64bit, bool& using64bit)
-		: m_data(pData),
-		  m_eStrEncode(eStrEncode),
-		  m_supports64bit(supports64bit),
-		  m_using64bit(using64bit)
+	CSearchExprTarget(CMemFile *pData, EUtf8Str eStrEncode, bool supports64bit, bool &using64bit)
+	: m_data(pData)
+	, m_eStrEncode(eStrEncode)
+	, m_supports64bit(supports64bit)
+	, m_using64bit(using64bit)
 	{
 		m_using64bit = false;
 	}
 
 	void WriteBooleanAND()
 	{
-		m_data->WriteUInt8(0);				// boolean operator parameter type
-		m_data->WriteUInt8(0x00);			// "AND"
+		m_data->WriteUInt8(0);    // boolean operator parameter type
+		m_data->WriteUInt8(0x00); // "AND"
 	}
 
 	void WriteBooleanOR()
 	{
-		m_data->WriteUInt8(0);				// boolean operator parameter type
-		m_data->WriteUInt8(0x01);			// "OR"
+		m_data->WriteUInt8(0);    // boolean operator parameter type
+		m_data->WriteUInt8(0x01); // "OR"
 	}
 
 	void WriteBooleanNOT()
 	{
-		m_data->WriteUInt8(0);				// boolean operator parameter type
-		m_data->WriteUInt8(0x02);			// "NOT"
+		m_data->WriteUInt8(0);    // boolean operator parameter type
+		m_data->WriteUInt8(0x02); // "NOT"
 	}
 
-	void WriteMetaDataSearchParam(const wxString& rstrValue)
+	void WriteMetaDataSearchParam(const wxString &rstrValue)
 	{
-		m_data->WriteUInt8(1);				// string parameter type
+		m_data->WriteUInt8(1);                        // string parameter type
 		m_data->WriteString(rstrValue, m_eStrEncode); // string value
 	}
 
-	void WriteMetaDataSearchParam(uint8 uMetaTagID, const wxString& rstrValue)
+	void WriteMetaDataSearchParam(uint8 uMetaTagID, const wxString &rstrValue)
 	{
-		m_data->WriteUInt8(2);				// string parameter type
+		m_data->WriteUInt8(2);                        // string parameter type
 		m_data->WriteString(rstrValue, m_eStrEncode); // string value
-		m_data->WriteUInt16(sizeof(uint8));	// meta tag ID length
-		m_data->WriteUInt8(uMetaTagID);		// meta tag ID name
+		m_data->WriteUInt16(sizeof(uint8));           // meta tag ID length
+		m_data->WriteUInt8(uMetaTagID);               // meta tag ID name
 	}
 
-	void WriteMetaDataSearchParamASCII(uint8 uMetaTagID, const wxString& rstrValue)
+	void WriteMetaDataSearchParamASCII(uint8 uMetaTagID, const wxString &rstrValue)
 	{
-		m_data->WriteUInt8(2);				// string parameter type
+		m_data->WriteUInt8(2);                       // string parameter type
 		m_data->WriteString(rstrValue, utf8strNone); // string value
-		m_data->WriteUInt16(sizeof(uint8));	// meta tag ID length
-		m_data->WriteUInt8(uMetaTagID);		// meta tag ID name
+		m_data->WriteUInt16(sizeof(uint8));          // meta tag ID length
+		m_data->WriteUInt8(uMetaTagID);              // meta tag ID name
 	}
 
-	void WriteMetaDataSearchParam(const wxString& pszMetaTagID, const wxString& rstrValue)
+	void WriteMetaDataSearchParam(const wxString &pszMetaTagID, const wxString &rstrValue)
 	{
-		m_data->WriteUInt8(2);				// string parameter type
+		m_data->WriteUInt8(2);                        // string parameter type
 		m_data->WriteString(rstrValue, m_eStrEncode); // string value
-		m_data->WriteString(pszMetaTagID);	// meta tag ID
+		m_data->WriteString(pszMetaTagID);            // meta tag ID
 	}
 
 	void WriteMetaDataSearchParam(uint8_t uMetaTagID, uint8_t uOperator, uint64_t value)
@@ -217,48 +212,45 @@
 		bool largeValue = value > wxULL(0xFFFFFFFF);
 		if (largeValue && m_supports64bit) {
 			m_using64bit = true;
-			m_data->WriteUInt8(8);		// numeric parameter type (int64)
-			m_data->WriteUInt64(value);	// numeric value
+			m_data->WriteUInt8(8);      // numeric parameter type (int64)
+			m_data->WriteUInt64(value); // numeric value
 		} else {
 			if (largeValue) {
 				value = 0xFFFFFFFFu;
 			}
-			m_data->WriteUInt8(3);		// numeric parameter type (int32)
-			m_data->WriteUInt32(value);	// numeric value
+			m_data->WriteUInt8(3);      // numeric parameter type (int32)
+			m_data->WriteUInt32(value); // numeric value
 		}
-		m_data->WriteUInt8(uOperator);		// comparison operator
-		m_data->WriteUInt16(sizeof(uint8));	// meta tag ID length
-		m_data->WriteUInt8(uMetaTagID);		// meta tag ID name
+		m_data->WriteUInt8(uOperator);      // comparison operator
+		m_data->WriteUInt16(sizeof(uint8)); // meta tag ID length
+		m_data->WriteUInt8(uMetaTagID);     // meta tag ID name
 	}
 
-	void WriteMetaDataSearchParam(const wxString& pszMetaTagID, uint8_t uOperator, uint64_t value)
+	void WriteMetaDataSearchParam(const wxString &pszMetaTagID, uint8_t uOperator, uint64_t value)
 	{
 		bool largeValue = value > wxULL(0xFFFFFFFF);
 		if (largeValue && m_supports64bit) {
 			m_using64bit = true;
-			m_data->WriteUInt8(8);		// numeric parameter type (int64)
-			m_data->WriteUInt64(value);	// numeric value
+			m_data->WriteUInt8(8);      // numeric parameter type (int64)
+			m_data->WriteUInt64(value); // numeric value
 		} else {
 			if (largeValue) {
 				value = 0xFFFFFFFFu;
 			}
-			m_data->WriteUInt8(3);		// numeric parameter type (int32)
-			m_data->WriteUInt32(value);	// numeric value
+			m_data->WriteUInt8(3);      // numeric parameter type (int32)
+			m_data->WriteUInt32(value); // numeric value
 		}
-		m_data->WriteUInt8(uOperator);		// comparison operator
-		m_data->WriteString(pszMetaTagID);	// meta tag ID
+		m_data->WriteUInt8(uOperator);     // comparison operator
+		m_data->WriteString(pszMetaTagID); // meta tag ID
 	}
 
 protected:
-	CMemFile* m_data;
+	CMemFile *m_data;
 	EUtf8Str m_eStrEncode;
 	bool m_supports64bit;
-	bool& m_using64bit;
+	bool &m_using64bit;
 };
 
-
-
-
 ///////////////////////////////////////////////////////////
 // CSearchList
 
@@ -266,47 +258,308 @@
 	EVT_MULE_TIMER(wxID_ANY, CSearchList::OnGlobalSearchTimer)
 wxEND_EVENT_TABLE()
 
-
 CSearchList::CSearchList()
-	: m_searchTimer(this, 0 /* Timer-id doesn't matter. */ ),
-	  m_searchType(LocalSearch),
-	  m_searchInProgress(false),
-	  m_currentSearch(-1),
-	  m_searchPacket(NULL),
-	  m_64bitSearchPacket(false),
-	  m_KadSearchFinished(true)
-{}
-
+: m_searchTimer(this, 0 /* Timer-id doesn't matter. */)
+, m_searchType(LocalSearch)
+, m_searchInProgress(false)
+, m_currentSearch(-1)
+, m_searchPacket(NULL)
+, m_64bitSearchPacket(false)
+, m_KadSearchFinished(true)
+, m_ed2kSearchFinished(true)
+, m_awaitingServerAnswer(false)
+, m_searchStart(0)
+, m_shuttingDown(false)
+{
+}
 
 CSearchList::~CSearchList()
 {
 	StopSearch();
 
-	while (!m_results.empty()) {
-		RemoveResults(m_results.begin()->first);
+	// Teardown: the GUI is being dismantled around us, so suppress the Search_Removed broadcast
+	// below -- there is no tab left worth closing and the notify would reach a half-destroyed
+	// CamuleDlg.
+	m_shuttingDown = true;
+	while (!AllResults().empty()) {
+		RemoveResults(AllResults().begin()->first);
 	}
 }
 
+uint32 CSearchList::AllocateEd2kId()
+{
+	do {
+		m_nextEd2kId = (m_nextEd2kId + 1) & 0x3fffffff;
+	} while (m_nextEd2kId == 0);
+	return m_nextEd2kId;
+}
 
 void CSearchList::RemoveResults(wxUIntPtr searchID)
 {
 	// A non-existent search id will just be ignored
 	Kademlia::CSearchManager::StopSearch(searchID, true);
 
-	ResultMap::iterator it = m_results.find(searchID);
-	if ( it != m_results.end() ) {
-		CSearchResultList& list = it->second;
+	// Tell the GUI before the CSearchFile objects below are deleted: in a monolithic build
+	// CSearchListCtrl's model holds them as raw pointers -- each row's wxDataViewItem ID is the
+	// CSearchFile* -- and nothing else removes those rows, so a tab left open on this search
+	// would fault on the next repaint, sort, scroll or click. Also the local counterpart of
+	// amuleGUI's EC_TAG_SEARCH_EXPIRED-driven close.
+	if (!m_shuttingDown) {
+		Notify_Search_Removed(searchID);
+	}
+
+	// Drop any per-search tracking for this ID (bounded growth).
+	m_finishedKadSearches.erase(static_cast<uint32_t>(searchID));
+	m_searchStartTimes.erase(static_cast<uint32_t>(searchID));
+	m_searchKinds.erase(static_cast<uint32_t>(searchID));
+	m_searchStrings.erase(static_cast<uint32_t>(searchID));
+	m_browsePeers.erase(static_cast<uint32_t>(searchID));
+	// The browse record outlives its client but not its search.
+	theApp->browsemanager->Remove(static_cast<uint32_t>(searchID));
+
+	// This list owns its results, so free them before dropping the index
+	// (which, being shared with the remote search list, never deletes).
+	const CSearchResultList &list = GetSearchResults(searchID);
+	for (CSearchFile *file : list) {
+		delete file;
+	}
+	DropResultIndex(searchID);
+}
+
+const wxChar *const CSearchList::s_storedSearchesFilename = wxT("StoredSearches.met");
+
+void CSearchList::StoreSearches() const
+{
+	// Same contract as the search-terms dropdown this setting already governs (SearchDlg.cpp):
+	// off means "don't remember", and a search's full result set is a stronger form of that
+	// than the query string alone. LoadSearches() is the one that removes a file left over from
+	// when this was still on.
+	if (!thePrefs::RememberSearchHistory()) {
+		return;
+	}
 
-		for (size_t i = 0; i < list.size(); ++i) {
-			delete list.at(i);
+	CFile file(thePrefs::GetConfigDir() + s_storedSearchesFilename, CFile::write_safe);
+	if (!file.IsOpened()) {
+		return;
+	}
+
+	// Oldest-first by start time, so if we have to drop any for the cap
+	// below, we drop the oldest rather than an arbitrary map-ordered subset.
+	std::vector<uint32_t> ids;
+	ids.reserve(m_searchStrings.size());
+	for (const auto &kv : m_searchStrings) {
+		// Browses are deliberately not persisted. They are a snapshot of one peer's share taken
+		// while that peer was connected, so restoring one resurrects a listing for someone very
+		// likely gone -- and a large share would spend the MAX_STORED_SEARCHES budget that exists
+		// for the user's own searches. They are in m_searchStrings only so the search list can
+		// report them by peer name while they are live.
+		std::map<uint32_t, SearchType>::const_iterator kind = m_searchKinds.find(kv.first);
+		if (kind != m_searchKinds.end() && kind->second == BrowseSearch) {
+			continue;
 		}
+		ids.push_back(kv.first);
+	}
+	std::sort(ids.begin(), ids.end(), this(uint32_t a, uint32_t b) {
+		return m_searchStartTimes.at(a) < m_searchStartTimes.at(b);
+	});
+
+	if (ids.size() > MAX_STORED_SEARCHES) {
+		AddLogLineC(CFormat(_("Only saving the %u most recent of %u open searches to %s.")) %
+			    MAX_STORED_SEARCHES % ids.size() % s_storedSearchesFilename);
+		ids.erase(ids.begin(), ids.end() - MAX_STORED_SEARCHES);
+	}
+
+	file.WriteUInt8(STOREDSEARCHES_VERSION);
+	file.WriteUInt32(static_cast<uint32>(ids.size()));
+
+	for (uint32_t id : ids) {
+		const CSearchResultList &results = GetSearchResults(id);
+		std::size_t resultCount = results.size();
+		if (resultCount > MAX_STORED_RESULTS_PER_SEARCH) {
+			AddLogLineC(CFormat(_("Only saving the first %u of %u results for search \"%s\".")) %
+				    MAX_STORED_RESULTS_PER_SEARCH % resultCount % m_searchStrings.at(id));
+			resultCount = MAX_STORED_RESULTS_PER_SEARCH;
+		}
+
+		file.WriteUInt32(id);
+		// m_searchStrings / m_searchKinds / m_searchStartTimes are written and erased together,
+		// so `ids` drawn from m_searchStrings cannot miss -- which is what .at() throughout says.
+		file.WriteString(m_searchStrings.at(id), utf8strRaw);
+		file.WriteUInt8(static_cast<uint8>(m_searchKinds.at(id)));
+		file.WriteUInt64(static_cast<uint64>(m_searchStartTimes.at(id)));
+		file.WriteUInt32(static_cast<uint32>(resultCount));
+
+		for (std::size_t i = 0; i < resultCount; ++i) {
+			resultsi->WriteToFile(&file);
+		}
+	}
+
+	// write_safe writes to a .new sibling; only Close() performs the rename onto the real
+	// filename. Without this call the .new file is left orphaned and StoredSearches.met itself
+	// is never updated.
+	file.Close();
+}
+
+namespace
+{
+//! One search record as read from disk, before it is committed into the live maps. Kept
+//! separate so a malformed record partway through the file can discard everything read so
+//! far instead of leaving CSearchList half-loaded.
+struct LoadedSearch
+{
+	uint32_t id;
+	wxString queryString;
+	SearchType kind;
+	time_t startTime;
+	std::vector<CSearchFile *> results;
+};
 
-		m_results.erase( it );
+void FreeLoaded(std::vector<LoadedSearch> &loaded)
+{
+	for (LoadedSearch &entry : loaded) {
+		for (CSearchFile *f : entry.results) {
+			delete f;
+		}
 	}
+	loaded.clear();
 }
+} // namespace
+
+std::vector<uint32_t> CSearchList::LoadSearches()
+{
+	std::vector<uint32_t> restored;
+
+	CPath fullpath = CPath(thePrefs::GetConfigDir() + s_storedSearchesFilename);
+	if (!thePrefs::RememberSearchHistory()) {
+		// Remove whatever an earlier session with the setting on left behind, so turning it off
+		// actually clears what is on disk rather than just stopping new writes.
+		if (fullpath.FileExists()) {
+			CPath::RemoveFile(fullpath);
+		}
+		return restored;
+	}
+	if (!fullpath.FileExists()) {
+		return restored;
+	}
+
+	CFile file;
+	if (!file.Open(fullpath)) {
+		AddLogLineC(CFormat(_("WARNING: %s cannot be opened.")) % s_storedSearchesFilename);
+		return restored;
+	}
+
+	std::vector<LoadedSearch> loaded;
+
+	try {
+		uint8 version = file.ReadUInt8();
+		if (version != STOREDSEARCHES_VERSION) {
+			AddLogLineC(_("WARNING: Stored search list corrupted, contains invalid header."));
+			return restored;
+		}
+
+		uint32 searchCount = file.ReadUInt32();
+		if (searchCount > MAX_STORED_SEARCHES * 2) {
+			// StoreSearches() never writes more than MAX_STORED_SEARCHES; a count more than
+			// double that is not a file we ever wrote, and trusting it would drive an equally
+			// suspect per-search loop below. Fail closed rather than partially populate.
+			AddLogLineC(_("WARNING: Stored search list corrupted, contains invalid header."));
+			return restored;
+		}
+		loaded.reserve(searchCount);
+
+		for (uint32 i = 0; i < searchCount; ++i) {
+			LoadedSearch entry;
+			entry.id = file.ReadUInt32();
+			entry.queryString = file.ReadString(true);
+			entry.kind = static_cast<SearchType>(file.ReadUInt8());
+			entry.startTime = static_cast<time_t>(file.ReadUInt64());
+
+			uint32 resultCount = file.ReadUInt32();
+			if (resultCount > MAX_STORED_RESULTS_PER_SEARCH * 2) {
+				AddLogLineC(
+					_("WARNING: Stored search list corrupted, contains invalid header."));
+				FreeLoaded(loaded);
+				return std::vector<uint32_t>();
+			}
+
+			entry.results.reserve(resultCount);
+			for (uint32 r = 0; r < resultCount; ++r) {
+				CSearchFile *result = CSearchFile::LoadFromFile(&file);
+				if (!result) {
+					AddLogLineC(_(
+						"Invalid entry in stored search list, file may be corrupt"));
+					for (CSearchFile *f : entry.results) {
+						delete f;
+					}
+					FreeLoaded(loaded);
+					return std::vector<uint32_t>();
+				}
+				entry.results.push_back(result);
+			}
+
+			loaded.push_back(std::move(entry));
+		}
+	} catch (const CInvalidPacket &e) {
+		AddLogLineC(_("Invalid entry in stored search list, file may be corrupt") + ": " + e.what());
+		FreeLoaded(loaded);
+		return restored;
+	} catch (const CSafeIOException &e) {
+		AddLogLineC(CFormat(_("IO error while reading %s file: %s")) % s_storedSearchesFilename %
+			    e.what());
+		FreeLoaded(loaded);
+		return restored;
+	}
 
+	// Everything parsed cleanly -- commit it all to the live maps/index.
+	// theApp->downloadqueue/knownfiles/canceledfiles must already exist here (see amule.cpp's
+	// call site) for SetDownloadStatus() to be meaningful.
+	restored.reserve(loaded.size());
+	for (LoadedSearch &entry : loaded) {
+		m_searchStringsentry.id = entry.queryString;
+		m_searchKindsentry.id = entry.kind;
+		m_searchStartTimesentry.id = entry.startTime;
+
+		// Reserve the id so the first new search of the same kind this session cannot be handed
+		// it -- both counters restart every launch, so without this a restored search collides
+		// with the next one started. Partitioned on the id's own high bit rather than the
+		// persisted `kind` byte: bit 31 is intrinsic to which counter owns the value, while
+		// `kind` is a separate field that could disagree with it if the file were corrupt.
+		if (entry.id == 0xffffffff) {
+			// The legacy single-search bucket comes from neither counter: every EC client
+			// predating multi-search reuses this one id for all its searches, so there is no
+			// allocation to advance past. It has to be excluded explicitly because the bit-31
+			// test below would hand an ed2k search to the Kad counter -- and since this is the
+			// largest uint32 there is, ReserveSearchId would pin m_nextID at its maximum and the
+			// next Kad allocation would wrap to the FIRST Kad id.
+		} else if (entry.id & 0x80000000) {
+			Kademlia::CSearchManager::ReserveSearchId(entry.id);
+		} else {
+			ReserveEd2kId(entry.id);
+		}
+
+		if (entry.kind == KadSearch) {
+			// The original in-flight Kad search can't survive a restart --
+			// come back already finished, hits-only, "More results" disabled.
+			m_finishedKadSearches.insert(entry.id);
+		}
+
+		for (CSearchFile *root : entry.results) {
+			root->m_searchID = entry.id;
+			root->SetDownloadStatus();
+			for (CSearchFile *child : root->GetChildren()) {
+				child->m_searchID = entry.id;
+				child->SetDownloadStatus();
+			}
+			IndexResult(root);
+		}
 
-wxString CSearchList::StartNewSearch(uint32* searchID, SearchType type, CSearchParams& params)
+		restored.push_back(entry.id);
+	}
+
+	return restored;
+}
+
+wxString CSearchList::StartNewSearch(uint32 *searchID, SearchType type, CSearchParams &params)
 {
 	// Check that we can actually perform the specified desired search.
 	if ((type == KadSearch) && !Kademlia::CKademlia::IsRunning()) {
@@ -337,7 +590,11 @@
 		}
 	}
 
-	bool supports64bit = type == KadSearch ? true : theApp->serverconnect->GetCurrentServer() != NULL && (theApp->serverconnect->GetCurrentServer()->GetTCPFlags() & SRV_TCPFLG_LARGEFILES);
+	bool supports64bit = type == KadSearch
+				     ? true
+				     : theApp->serverconnect->GetCurrentServer() != NULL &&
+					       (theApp->serverconnect->GetCurrentServer()->GetTCPFlags() &
+						       SRV_TCPFLG_LARGEFILES);
 	bool packetUsing64bit;
 
 	// This MemFile is automatically free'd
@@ -354,20 +611,25 @@
 		return error;
 	}
 
-	m_searchType = type;
-
-	// EC clients reuse the sentinel `0xffffffff` for every search regardless
-	// of network type. `Get_EC_Response_Search` -> `RemoveResults(0xffffffff)`
-	// already soft-stops the previous Kad search via `PrepareToStop()` so it
-	// can drain in-flight packets, but those late `KademliaSearchKeyword(
-	// 0xffffffff, ...)` callbacks would then land in the *new* search's
-	// `m_results0xffffffff` bucket -- the Kad results contaminate an ed2k
-	// (or vice-versa) result list whenever an EC client switches search type
-	// without restarting the daemon. Hard-delete the previous Kad search
-	// before either a Kad `PrepareFindKeywords` or an ed2k server packet
-	// starts feeding the shared bucket. Native-GUI searches allocate
-	// distinct top/bottom-half IDs (`3008ada0f`) so `*searchID != 0xffffffff`
-	// for them and they are unaffected.
+	// The scalar m_searchType / m_currentSearch are the anchor for the single in-flight ed2k
+	// (local/global) search: its results arrive asynchronously for several seconds and are
+	// attributed via these scalars. A Kad search started ALONGSIDE an in-flight ed2k search has
+	// its own per-ID machinery and needs neither scalar -- so it must not repoint them, or the
+	// ed2k search's late hits get dropped (wrong type) or misfiled (wrong bucket). Every other
+	// start updates the anchor as before.
+	const bool preserveEd2kAnchor = (type == KadSearch) && m_searchInProgress;
+	if (!preserveEd2kAnchor) {
+		m_searchType = type;
+	}
+	m_searchStart = time(NULL);
+
+	// EC clients reuse the sentinel 0xffffffff for every search regardless of network type.
+	// Get_EC_Response_Search -> RemoveResults(0xffffffff) already soft-stops the previous Kad
+	// search via PrepareToStop() so it can drain in-flight packets, but those late
+	// KademliaSearchKeyword callbacks would then land in the *new* search's bucket -- Kad
+	// results contaminating an ed2k result list, or the reverse, whenever an EC client switches
+	// search type without restarting the daemon. Hard-delete the previous Kad search first.
+	// Native-GUI searches allocate distinct top/bottom-half IDs, so they never take this branch.
 	if (*searchID == 0xffffffff) {
 		Kademlia::CSearchManager::StopSearch(0xffffffff, false);
 	}
@@ -376,12 +638,18 @@
 		try {
 			// searchstring will get tokenized there
 			// The tab must be created with the Kad search ID, so searchID is updated.
-			Kademlia::CSearch* search = Kademlia::CSearchManager::PrepareFindKeywords(params.strKeyword, data->GetLength(), data->GetRawBuffer(), *searchID);
+			Kademlia::CSearch *search = Kademlia::CSearchManager::PrepareFindKeywords(
+				params.strKeyword, data->GetLength(), data->GetRawBuffer(), *searchID);
 
 			*searchID = search->GetSearchID();
-			m_currentSearch = *searchID;
+			// Do not repoint the ed2k result-attribution scalar when a Kad search runs alongside
+			// an in-flight ed2k search (see preserveEd2kAnchor above); the Kad search is tracked
+			// by its own ID regardless.
+			if (!preserveEd2kAnchor) {
+				m_currentSearch = *searchID;
+			}
 			m_KadSearchFinished = false;
-		} catch (const wxString& what) {
+		} catch (const wxString &what) {
 			AddLogLineC(what);
 			return _("Unexpected error while attempting Kad search: ") + what;
 		}
@@ -389,26 +657,63 @@
 		// This is an ed2k search, local or global
 		m_currentSearch = *(searchID);
 		m_searchInProgress = true;
+		m_ed2kSearchFinished = false;
 
-		CPacket* searchPacket = new CPacket(*data.get(), OP_EDONKEYPROT, OP_SEARCHREQUEST);
+		CPacket *searchPacket = new CPacket(*data.get(), OP_EDONKEYPROT, OP_SEARCHREQUEST);
 
 		theStats::AddUpOverheadServer(searchPacket->GetPacketSize());
 		theApp->serverconnect->SendPacket(searchPacket, (type == LocalSearch));
 
+		// Bound the wait for the server's answer, for either kind: a local search has no other
+		// terminal path, and a global one's sweep is armed by the very answer we are waiting for.
+		m_awaitingServerAnswer = true;
+		m_searchTimer.Start(SERVER_ANSWER_TIMEOUT_MS, true /* one shot */);
+
 		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!!
+			m_searchPacket->SetOpCode(
+				OP_GLOBSEARCHREQ); // will be changed later when actually sending the packet!!
 		}
 	}
 
+	// Record this search's own start time so its (cosmetic Kad) progress ramp is computed from
+	// *its* age even after it is no longer the most-recently-started search -- otherwise a Kad
+	// search running in parallel with a later ed2k search would report a fixed near-full
+	// percent.
+	m_searchStartTimesstatic_cast<uint32_t>(*searchID) = m_searchStart;
+	// Record this search's kind by id (same reason as the start time above): a later search of
+	// a different type must not make an older tab report the wrong kind. `type` is this
+	// search's real type regardless of the scalar anchor bookkeeping.
+	m_searchKindsstatic_cast<uint32_t>(*searchID) = type;
+	m_searchStringsstatic_cast<uint32_t>(*searchID) = params.searchString;
+
+	// Tell the GUI a search now exists. Every producer funnels through here -- the monolithic
+	// dialog and the EC_OP_SEARCH_START handler alike -- so this one call covers a search
+	// started by any client. The monolithic GUI's own searches already have a tab by this point
+	// and are filtered out on the handler side; what this adds is the tab for a search some
+	// OTHER client started.
+	Notify_Search_Added(
+		static_cast<wxUIntPtr>(*searchID), params.searchString, static_cast<uint32>(type));
+
 	return "";
 }
 
-
 void CSearchList::LocalSearchEnd()
 {
+	if (!m_searchInProgress) {
+		// Nothing left for this reply to end: the wait for it ran out, or the search was stopped.
+		// Without this, a late answer to a terminalized global search reaches the wxCHECK_RET below
+		// with the packet already released -- silent under NDEBUG, an assertion in a Debug build.
+		return;
+	}
+
+	// The answer is in; from here the global branch's sweep bounds itself and the local branch
+	// is already terminal, so the one-shot has nothing left to guard. Cleared before either
+	// branch, since the global one restarts the same timer as the sweep ticker.
+	m_awaitingServerAnswer = false;
+
 	if (m_searchType == GlobalSearch) {
 		wxCHECK_RET(m_searchPacket, "Global search, but no packet");
 
@@ -416,11 +721,20 @@
 		theApp->serverlist->RemoveObserver(&m_serverQueue);
 		m_searchTimer.Start(750);
 	} else {
-		m_searchInProgress = false;
-		Notify_SearchLocalEnd();
+		FinalizeLocalSearch();
 	}
 }
 
+void CSearchList::FinalizeLocalSearch()
+{
+	// Harmless when the server answered in time and the timer never fired;
+	// required when it did not, so the one-shot cannot outlive its search.
+	m_searchTimer.Stop();
+	m_awaitingServerAnswer = false;
+	m_searchInProgress = false;
+	m_ed2kSearchFinished = true;
+	Notify_SearchLocalEnd();
+}
 
 uint32 CSearchList::GetSearchProgress() const
 {
@@ -429,28 +743,106 @@
 		// But we can tell when they are over.
 		return m_KadSearchFinished ? 0xfffe : 0;
 	}
-	if (m_searchInProgress == false) {	// true only for ED2K search
+	if (m_searchInProgress == false) { // true only for ED2K search
 		// No search, no progress ;)
 		return 0;
 	}
 
 	switch (m_searchType) {
-		case LocalSearch:
-			return 0xffff;
-
-		case GlobalSearch:
-			return 100 - (m_serverQueue.GetRemaining() * 100)
-					/ theApp->serverlist->GetServerCount();
+	case LocalSearch:
+		return 0xffff;
+
+	case GlobalSearch:
+		// The sweep is not armed until the connected server answers the local part and the first
+		// timer tick attaches the observer. Until then m_serverQueue is detached and empty, so
+		// GetRemaining() is a stale 0 that would read as 100% ("done") the instant a search
+		// starts. IsActive() is true only during the actual sweep, so report 0 before it begins.
+		if (!m_serverQueue.IsActive()) {
+			return 0;
+		}
+		return 100 - (m_serverQueue.GetRemaining() * 100) / theApp->serverlist->GetServerCount();
 
-		default:
-			wxFAIL;
+	default:
+		wxFAIL;
 	}
 	return 0;
 }
 
+CSearchList::SearchLifecycleState CSearchList::GetSearchLifecycleState() const
+{
+	// m_currentSearch defaults to wxUIntPtr(-1) at construction and after an explicit
+	// StopSearch. A natural global-search completion (via FinalizeGlobalSearch from
+	// OnGlobalSearchTimer) preserves it, so completed-then-idle-view still reports FINISHED
+	// here.
+	if (m_currentSearch == wxUIntPtr(-1)) {
+		return SEARCH_LIFECYCLE_IDLE;
+	}
+	if (m_searchType == KadSearch) {
+		return m_KadSearchFinished ? SEARCH_LIFECYCLE_FINISHED : SEARCH_LIFECYCLE_RUNNING;
+	}
+	// ED2K (Local / Global): m_ed2kSearchFinished mirrors m_KadSearchFinished.
+	return m_ed2kSearchFinished ? SEARCH_LIFECYCLE_FINISHED : SEARCH_LIFECYCLE_RUNNING;
+}
+
+std::size_t CSearchList::GetCurrentSearchResultCount() const
+{
+	if (m_currentSearch == wxUIntPtr(-1)) {
+		return 0;
+	}
+	return GetSearchResults(m_currentSearch).size();
+}
+
+uint8 CSearchList::GetSearchLifecyclePercent() const
+{
+	switch (GetSearchLifecycleState()) {
+	case SEARCH_LIFECYCLE_IDLE:
+		return 0;
+	case SEARCH_LIFECYCLE_FINISHED:
+		// Authoritative completion edge for every search kind.
+		return 100;
+	case SEARCH_LIFECYCLE_RUNNING:
+		break;
+	}
+
+	// --- RUNNING ---
+	if (m_searchType == KadSearch) {
+		// Kad has no measurable progress, so synthesise a cosmetic ramp from the fixed
+		// keyword-search lifetime. The FINISHED state above is what snaps it to 100; capped at 99
+		// so the ramp never claims completion before the daemon actually does.
+		time_t elapsed = time(NULL) - m_searchStart;
+		if (elapsed <= 0) {
+			return 0;
+		}
+		uint32 pct = (uint32)((elapsed * 100) / SEARCHKEYWORD_LIFETIME);
+		return (pct > 99) ? 99 : (uint8)pct;
+	}
 
-void CSearchList::OnGlobalSearchTimer(CTimerEvent& WXUNUSED(evt))
+	if (m_searchType == GlobalSearch) {
+		// Real server-queue-driven percent (0..100).
+		uint32 pct = GetSearchProgress();
+		return (pct > 100) ? 100 : (uint8)pct;
+	}
+
+	// LocalSearch is instantaneous and never observed RUNNING here.
+	return 0;
+}
+
+void CSearchList::OnGlobalSearchTimer(CTimerEvent &WXUNUSED(evt))
 {
+	if (m_awaitingServerAnswer && m_searchInProgress) {
+		// The one-shot armed at StartNewSearch: the connected server never sent OP_SEARCHRESULT,
+		// so neither kind of ed2k search has anything left that would end it. Terminalize through
+		// the finalizer the kind already has, rather than leave it reporting RUNNING for good.
+		// Tested before the packet check below, which a local search would otherwise fall into.
+		AddLogLineN(_("Search timed out: the server did not answer."));
+		if (m_searchType == GlobalSearch) {
+			FinalizeGlobalSearch();
+		} else {
+			FinalizeLocalSearch();
+		}
+		return;
+	}
+
 	// Ensure that the server-queue contains the current servers.
 	if (m_searchPacket == NULL) {
 		// This was a pending event, handled after 'Stop' was pressed.
@@ -460,47 +852,75 @@
 	}
 
 	// UDP requests must not be sent to this server.
-	const CServer* localServer = theApp->serverconnect->GetCurrentServer();
+	const CServer *localServer = theApp->serverconnect->GetCurrentServer();
 	if (localServer) {
 		uint32 localIP = localServer->GetIP();
 		uint16 localPort = localServer->GetPort();
 		while (m_serverQueue.GetRemaining()) {
-			CServer* server = m_serverQueue.GetNext();
+			CServer *server = m_serverQueue.GetNext();
 
 			// Compare against the currently connected server.
 			if ((server->GetPort() == localPort) && (server->GetIP() == localIP)) {
 				// We've already requested from the local server.
 				continue;
 			} else {
-				if (server->SupportsLargeFilesUDP() && (server->GetUDPFlags() & SRV_UDPFLG_EXT_GETFILES)) {
+				if (server->SupportsLargeFilesUDP() &&
+					(server->GetUDPFlags() & SRV_UDPFLG_EXT_GETFILES)) {
 					CMemFile data(50);
 					uint32_t tagCount = 1;
 					data.WriteUInt32(tagCount);
-					CTagVarInt flags(CT_SERVER_UDPSEARCH_FLAGS, SRVCAP_UDP_NEWTAGS_LARGEFILES);
+					CTagVarInt flags(
+						CT_SERVER_UDPSEARCH_FLAGS, SRVCAP_UDP_NEWTAGS_LARGEFILES);
 					flags.WriteNewEd2kTag(&data);
-					CPacket *extSearchPacket = new CPacket(OP_GLOBSEARCHREQ3, m_searchPacket->GetPacketSize() + (uint32_t)data.GetLength(), OP_EDONKEYPROT);
-					extSearchPacket->CopyToDataBuffer(0, data.GetRawBuffer(), data.GetLength());
-					extSearchPacket->CopyToDataBuffer(data.GetLength(), m_searchPacket->GetDataBuffer(), m_searchPacket->GetPacketSize());
+					CPacket *extSearchPacket = new CPacket(OP_GLOBSEARCHREQ3,
+						m_searchPacket->GetPacketSize() + (uint32_t)data.GetLength(),
+						OP_EDONKEYPROT);
+					extSearchPacket->CopyToDataBuffer(
+						0, data.GetRawBuffer(), data.GetLength());
+					extSearchPacket->CopyToDataBuffer(data.GetLength(),
+						m_searchPacket->GetDataBuffer(),
+						m_searchPacket->GetPacketSize());
 					theStats::AddUpOverheadServer(extSearchPacket->GetPacketSize());
 					theApp->serverconnect->SendUDPPacket(extSearchPacket, server, true);
-					AddDebugLogLineN(logServerUDP, "Sending OP_GLOBSEARCHREQ3 to server " + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()));
+					AddDebugLogLineN(logServerUDP,
+						"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);
-						AddDebugLogLineN(logServerUDP, "Sending OP_GLOBSEARCHREQ2 to server " + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()));
-						theStats::AddUpOverheadServer(m_searchPacket->GetPacketSize());
-						theApp->serverconnect->SendUDPPacket(m_searchPacket, server, false);
+						AddDebugLogLineN(logServerUDP,
+							"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 {
-						AddDebugLogLineN(logServerUDP, "Skipped UDP search on server " + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()) + ": No large file support");
+						AddDebugLogLineN(logServerUDP,
+							"Skipped UDP search on server " +
+								Uint32_16toStringIP_Port(
+									server->GetIP(), server->GetPort()) +
+								": No large file support");
 					}
 				} else {
 					if (!m_64bitSearchPacket || server->SupportsLargeFilesUDP()) {
 						m_searchPacket->SetOpCode(OP_GLOBSEARCHREQ);
-						AddDebugLogLineN(logServerUDP, "Sending OP_GLOBSEARCHREQ to server " + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()));
-						theStats::AddUpOverheadServer(m_searchPacket->GetPacketSize());
-						theApp->serverconnect->SendUDPPacket(m_searchPacket, server, false);
+						AddDebugLogLineN(logServerUDP,
+							"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 {
-						AddDebugLogLineN(logServerUDP, "Skipped UDP search on server " + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()) + ": No large file support");
+						AddDebugLogLineN(logServerUDP,
+							"Skipped UDP search on server " +
+								Uint32_16toStringIP_Port(
+									server->GetIP(), server->GetPort()) +
+								": No large file support");
 					}
 				}
 				CoreNotify_Search_Update_Progress(GetSearchProgress());
@@ -508,29 +928,56 @@
 			}
 		}
 	}
-	// No more servers left to ask.
-	StopSearch(true);
+	// No more servers left to ask. Natural completion -- preserve m_currentSearch so
+	// GetSearchLifecycleState reports FINISHED, not IDLE.
+	FinalizeGlobalSearch();
 }
 
-
-void CSearchList::ProcessSharedFileList(const uint8_t* in_packet, uint32 size,
-	CUpDownClient* sender, bool *moreResultsAvailable, const wxString& directory)
+void CSearchList::ProcessSharedFileList(const uint8_t *in_packet,
+	uint32 size,
+	CUpDownClient *sender,
+	bool *moreResultsAvailable,
+	const wxString &directory)
 {
 	wxCHECK_RET(sender, "No sender in search-results from client.");
 
-	wxUIntPtr searchID = reinterpret_cast<wxUIntPtr>(sender);
+	// Route the browsed listing to a result bucket. Every browse has a real, wire-safe search
+	// ID by now -- pinned by the EC handler for a remote one, allocated by RequestSharedFileList
+	// for a local one -- so the union and per-ID polls and the LRU ring can all address these
+	// results.
+	//
+	// A local browse used to key its results on the client pointer, which no remote client can
+	// address, so the browse was invisible to amulegui, amuleweb and amuleapi while an
+	// EC-initiated one showed up everywhere. A pointer is also reused once the client is freed,
+	// so two browses of different peers could collide on one key.
+	//
+	// Allocated once and pinned on the client, not per packet -- a browse arrives in several --
+	// and registered so it is listed like any other search, with its kind and peer, which is
+	// what lets a remote GUI rebuild it as a browse tab.
+	//
+	// Whether this browse was asked for HERE is read before the id is assigned below, because
+	// that assignment is what makes a local browse look like an EC one afterwards. An
+	// EC-initiated browse belongs to another client, so revealing it would pull this user's
+	// panel and selection away.
+#ifndef AMULE_DAEMON
+	const bool ecInitiated = sender->IsBrowseEcInitiated();
+#endif
+
+	wxUIntPtr searchID = static_cast<wxUIntPtr>(sender->GetBrowseSearchId());
 
 #ifndef AMULE_DAEMON
-	if (!theApp->amuledlg->m_searchwnd->CheckTabNameExists(sender->GetUserName())) {
-		theApp->amuledlg->m_searchwnd->CreateNewTab(sender->GetUserName() + " (0)", searchID);
-	}
+	// Find-or-create the peer's "View Files" tab, keyed by ECID (so two peers sharing a nick do
+	// not collapse into one tab, and a re-browse refreshes the same tab). Marks the tab as
+	// browsing; the terminal paths flip it to finished/failed via Notify_Browse_Status.
+	theApp->amuledlg->m_searchwnd->EnsureBrowseTab(
+		sender->ECID(), sender->GetUserName(), searchID, !ecInitiated);
 #endif
 
 	const CMemFile packet(in_packet, size);
 	uint32 results = packet.ReadUInt32();
 	bool unicoded = (sender->GetUnicodeSupport() != utf8strNone);
-	for (unsigned int i = 0; i != results; ++i){
-		CSearchFile* toadd = new CSearchFile(packet, unicoded, searchID, 0, 0, directory);
+	for (unsigned int i = 0; i != results; ++i) {
+		CSearchFile *toadd = new CSearchFile(packet, unicoded, searchID, 0, 0, directory);
 		toadd->SetClientID(sender->GetUserIDHybrid());
 		toadd->SetClientPort(sender->GetUserPort());
 		AddToList(toadd, true);
@@ -542,7 +989,7 @@
 	int iAddData = (int)(packet.GetLength() - packet.GetPosition());
 	if (iAddData == 1) {
 		uint8 ucMore = packet.ReadUInt8();
-		if (ucMore == 0x00 || ucMore == 0x01){
+		if (ucMore == 0x00 || ucMore == 0x01) {
 			if (moreResultsAvailable) {
 				*moreResultsAvailable = (ucMore == 1);
 			}
@@ -550,28 +997,39 @@
 	}
 }
 
-
-// Symmetric counterpart to PR #36's Kad hard-stop on EC search-start.
-// Late ed2k server replies (TCP Local responses here, UDP Global responses
-// in ProcessUDPSearchAnswer below) keep arriving for seconds after the
-// search request is sent. When an EC client switches search type (ed2k ->
-// Kad) those late results would land in `m_resultsm_currentSearch` --
-// with the EC sentinel `0xffffffff` pinned across all EC searches, that
-// bucket is now the new Kad search's bucket, producing ed2k contamination
-// of a Kad result list. Drop late ed2k replies when the active search
-// type is no longer ed2k. Native-GUI parallel searches keep
-// `m_currentSearch` at bottom-half IDs and a Kad tab updates m_searchType
-// to KadSearch -- this gate makes late ed2k packets stop misrouting to
-// the Kad tab's bucket (a pre-existing GUI side bug that nobody noticed
-// because cross-protocol hits in a Kad tab look like noise).
+// Symmetric counterpart to the Kad hard-stop on EC search-start. Late ed2k server replies --
+// TCP Local responses here, UDP Global responses in ProcessUDPSearchAnswer below -- keep
+// arriving for seconds after the search request is sent. When an EC client switches search
+// type (ed2k -> Kad) those late results would land in `m_resultsm_currentSearch`, and with
+// the EC sentinel pinned across all EC searches that bucket is now the new Kad search's,
+// producing ed2k contamination of a Kad result list.
+//
+// Native-GUI parallel searches keep m_currentSearch at bottom-half IDs and a Kad tab updates
+// m_searchType, so this gate also stops late ed2k packets misrouting to the Kad tab's bucket
+// -- a pre-existing GUI-side bug that went unnoticed because cross-protocol hits in a Kad
+// tab look like noise.
 static inline bool IsActiveSearchTypeEd2k(SearchType t)
 {
 	return t == LocalSearch || t == GlobalSearch;
 }
 
-void CSearchList::ProcessSearchAnswer(const uint8_t* in_packet, uint32_t size, bool optUTF8, uint32_t serverIP, uint16_t serverPort)
+bool CSearchList::CanFileServerAnswer() const
 {
-	if (!IsActiveSearchTypeEd2k(m_searchType)) {
+	// Late server replies keep arriving after a search is over, and where they may be filed is
+	// not the same question as whether the search is still running. A terminalized search still
+	// owns its id -- both the timeout and the sweep's natural drain leave m_currentSearch alone
+	// -- so its results have a bucket of their own and are worth keeping.
+	//
+	// An explicit stop is what does not: it hands m_currentSearch back to the sentinel the EC
+	// handler pins across all its searches, and filing server hits there contaminates the bucket
+	// StartNewSearch keeps clean.
+	return IsActiveSearchTypeEd2k(m_searchType) && m_currentSearch != wxUIntPtr(-1);
+}
+
+void CSearchList::ProcessSearchAnswer(
+	const uint8_t *in_packet, uint32_t size, bool optUTF8, uint32_t serverIP, uint16_t serverPort)
+{
+	if (!CanFileServerAnswer()) {
 		return;
 	}
 	CMemFile packet(in_packet, size);
@@ -582,25 +1040,22 @@
 	}
 }
 
-
-void CSearchList::ProcessUDPSearchAnswer(const CMemFile& packet, bool optUTF8, uint32_t serverIP, uint16_t serverPort)
+void CSearchList::ProcessUDPSearchAnswer(
+	const CMemFile &packet, bool optUTF8, uint32_t serverIP, uint16_t serverPort)
 {
-	if (!IsActiveSearchTypeEd2k(m_searchType)) {
+	if (!CanFileServerAnswer()) {
 		return;
 	}
 	AddToList(new CSearchFile(packet, optUTF8, m_currentSearch, serverIP, serverPort), false);
 }
 
-
-bool CSearchList::AddToList(CSearchFile* toadd, bool clientResponse)
+bool CSearchList::AddToList(CSearchFile *toadd, bool clientResponse)
 {
 	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)) {
 		AddDebugLogLineN(logSearch,
-				CFormat("Dropped result with filesize %u: %s")
-					% fileSize
-					% toadd->GetFileName());
+			CFormat("Dropped result with filesize %u: %s") % fileSize % toadd->GetFileName());
 
 		delete toadd;
 		return false;
@@ -610,123 +1065,416 @@
 	if ((clientResponse == false) && !m_resultType.IsEmpty()) {
 		if (GetFileTypeByName(toadd->GetFileName()) != m_resultType) {
 			AddDebugLogLineN(logSearch,
-				CFormat( "Dropped result type %s != %s, file %s" )
-					% GetFileTypeByName(toadd->GetFileName())
-					% m_resultType
-					% toadd->GetFileName());
+				CFormat("Dropped result type %s != %s, file %s") %
+					GetFileTypeByName(toadd->GetFileName()) % m_resultType %
+					toadd->GetFileName());
 
 			delete toadd;
 			return false;
 		}
 	}
 
-
-	// Get, or implicitly create, the map of results for this search
-	CSearchResultList& results = m_resultstoadd->GetSearchID();
+	// Scan the results already indexed for this search (empty if it is the first one) for a
+	// duplicate; the new result is indexed further down, through IndexResult().
+	const CSearchResultList &results = GetSearchResults(toadd->GetSearchID());
 
 	for (size_t i = 0; i < results.size(); ++i) {
-		CSearchFile* item = results.at(i);
+		CSearchFile *item = results.at(i);
 
-		if ((toadd->GetFileHash() == item->GetFileHash()) && (toadd->GetFileSize() == item->GetFileSize())) {
-			AddDebugLogLineN(logSearch, CFormat("Received duplicate results for '%s' : %s") % item->GetFileName() % item->GetFileHash().Encode());
+		if ((toadd->GetFileHash() == item->GetFileHash()) &&
+			(toadd->GetFileSize() == item->GetFileSize())) {
+			AddDebugLogLineN(logSearch,
+				CFormat("Received duplicate results for '%s' : %s") % item->GetFileName() %
+					item->GetFileHash().Encode());
 			// Add the child, possibly updating the parents filename.
+			const size_t childrenBefore = item->GetChildren().size();
 			item->AddChild(toadd);
+			// AddChild() MERGES a duplicate filename into an existing child and deletes the file
+			// it was handed, on two of its four paths -- notifying with `toadd` afterwards would
+			// then read freed memory (got3nks, PR #796 review). Infer survival from whether the
+			// child count actually grew.
+			const bool survived = item->GetChildren().size() > childrenBefore;
+			// Structural change -- leaf-or-nothing to container, or a new row under an existing
+			// container -- needs its own notification. Search_Update_Sources only signals that
+			// the parent's values changed, via wxDataViewModel::ItemChanged(), which some
+			// wxDataViewCtrl backends (GTK, MSW) do not treat as reason to re-check IsContainer()
+			// or re-fetch children, so the child never becomes reachable there. Native
+			// NSOutlineView re-queries IsContainer() on every draw, which masked it.
+			if (survived) {
+				Notify_Search_Add_Result(toadd);
+			}
 			Notify_Search_Update_Sources(item);
 			return true;
 		}
 	}
 
 	AddDebugLogLineN(logSearch,
-		CFormat("Added new result '%s' : %s")
-			% toadd->GetFileName() % toadd->GetFileHash().Encode());
+		CFormat("Added new result '%s' : %s") % toadd->GetFileName() % toadd->GetFileHash().Encode());
 
 	// New unique result, simply add and display.
-	results.push_back(toadd);
+	IndexResult(toadd);
 	Notify_Search_Add_Result(toadd);
 
 	return true;
 }
 
-
-const CSearchResultList& CSearchList::GetSearchResults(wxUIntPtr searchID) const
+void CSearchList::AddFileToDownloadByHash(const CMD4Hash &hash, uint8 cat)
 {
-	ResultMap::const_iterator it = m_results.find(searchID);
-	if (it != m_results.end()) {
-		return it->second;
-	}
+	for (const auto &entry : AllResults()) {
+		for (CSearchFile *sf : entry.second) {
+			if (sf->GetFileHash() == hash) {
+				CoreNotify_Search_Add_Download(sf, cat);
 
-	// TODO: Should we assert in this case?
-	static CSearchResultList list;
-	return list;
+				return;
+			}
+		}
+	}
 }
 
-
-void CSearchList::AddFileToDownloadByHash(const CMD4Hash& hash, uint8 cat)
+CSearchFile *CSearchList::GetSearchFileByID(const CMD4Hash &hash) const
 {
-	ResultMap::iterator it = m_results.begin();
-	for ( ; it != m_results.end(); ++it ) {
-		CSearchResultList& list = it->second;
+	for (const auto &entry : AllResults()) {
+		for (CSearchFile *sf : entry.second) {
+			if (sf->GetFileHash() == hash) {
+				return sf;
+			}
+			for (CSearchFile *child : sf->GetChildren()) {
+				if (child->GetFileHash() == hash) {
+					return child;
+				}
+			}
+		}
+	}
+	return nullptr;
+}
 
-		for ( unsigned int i = 0; i < list.size(); ++i ) {
-			if ( listi->GetFileHash() == hash ) {
-				CoreNotify_Search_Add_Download( listi, cat );
+void CSearchList::GetAllSearchFilesByID(const CMD4Hash &hash, std::vector<CSearchFile *> &out) const
+{
+	// Unlike GetSearchFileByID (first match only), collect EVERY result object that shares this
+	// hash. The same file can appear in more than one open search, and each keeps its own
+	// CSearchFile with its own note list. On-demand Kad notes and the running flag must reach
+	// all of them.
+	for (const auto &entry : AllResults()) {
+		for (CSearchFile *sf : entry.second) {
+			if (sf->GetFileHash() == hash) {
+				out.push_back(sf);
+			}
+			for (CSearchFile *child : sf->GetChildren()) {
+				if (child->GetFileHash() == hash) {
+					out.push_back(child);
+				}
+			}
+		}
+	}
+}
 
+void CSearchList::AddFileToDownloadByEcid(uint32 ecid, uint8 cat)
+{
+	// Match against parents and their same-hash/different-name children (issue #431 grouping);
+	// downloading the specific CSearchFile lands the partfile under that result's own filename.
+	for (const auto &entry : AllResults()) {
+		for (CSearchFile *sf : entry.second) {
+			if (sf->ECID() == ecid) {
+				CoreNotify_Search_Add_Download(sf, cat);
 				return;
 			}
+			if (sf->HasChildren()) {
+				for (CSearchFile *child : sf->GetChildren()) {
+					if (child->ECID() == ecid) {
+						CoreNotify_Search_Add_Download(child, cat);
+						return;
+					}
+				}
+			}
 		}
 	}
 }
 
-
 bool CSearchList::IsKadSearch(uint32_t searchID) const
 {
 	return Kademlia::CSearchManager::IsKadSearch(searchID);
 }
 
+bool CSearchList::IsOrWasKadSearch(uint32_t searchID) const
+{
+	// True if this ID is a Kad keyword search -- still active in the manager, or already
+	// finished (recorded on completion). Lets the per-search progress sentinel pick 0xfffe (Kad
+	// done, clears the "!") vs 0xffff (ed2k done) for an arbitrary search, not just the current
+	// one.
+	return IsKadSearch(searchID) || m_finishedKadSearches.count(searchID) != 0;
+}
 
-bool CSearchList::RequestMoreResults(uint32_t searchID)
+wxString CSearchList::GetSearchStringById(uint32_t searchID) const
+{
+	std::map<uint32_t, wxString>::const_iterator it = m_searchStrings.find(searchID);
+	return it != m_searchStrings.end() ? it->second : wxString();
+}
+
+bool CSearchList::IsKnownSearchId(uint32_t searchID) const
 {
-	return Kademlia::CSearchManager::RequestMoreResults(searchID);
+	return m_searchStrings.count(searchID) != 0 || theApp->browsemanager->Has(searchID);
 }
 
+uint32 CSearchList::GetBrowsePeerEcid(uint32 searchID) const
+{
+	std::map<uint32_t, uint32>::const_iterator it = m_browsePeers.find(searchID);
+	return it != m_browsePeers.end() ? it->second : 0;
+}
+
+void CSearchList::RegisterBrowseSearch(uint32 searchID, const wxString &peerName, uint32 peerEcid)
+{
+	// All three, not just the kind: Save() iterates m_searchStrings and then reads the other two
+	// with .at(), so an id present in one and missing from another throws when the searches are
+	// persisted.
+	m_searchStringssearchID = peerName;
+	m_searchKindssearchID = BrowseSearch;
+	m_searchStartTimessearchID = time(nullptr);
+	m_browsePeerssearchID = peerEcid;
+}
+
+SearchType CSearchList::GetSearchLifecycleKindById(wxUIntPtr searchID) const
+{
+	const uint32_t sid = static_cast<uint32_t>(searchID);
+	// Kad is authoritative from the manager / finished-set even if the recorded
+	// kind was pruned with the results.
+	if (IsOrWasKadSearch(sid)) {
+		return KadSearch;
+	}
+	std::map<uint32_t, SearchType>::const_iterator it = m_searchKinds.find(sid);
+	if (it != m_searchKinds.end()) {
+		return it->second;
+	}
+	// Unknown id (never started here, or evicted): fall back to the scalar.
+	return m_searchType;
+}
+
+bool CSearchList::RequestMoreResults(uint32_t searchID)
+{
+	// Widen this Kad search (KADEMLIA_FIND_VALUE_MORE). The outcome is logged here so the
+	// message has a single home: the monolithic GUI and the daemon (for a remote-GUI request
+	// over EC) both reach this one path, and the daemon forwards the line to amuleGUI -- so the
+	// remote GUI shows the real result rather than an optimistic guess.
+	//
+	// Two different answers come back, and they are not interchangeable. The log line reports
+	// what actually happened on THIS press; the return value reports whether a LATER press could
+	// still do something, which is what a caller greys its control on. A reask that spends the
+	// last of the budget fires (so it is logged as a success) and leaves the search un-widenable
+	// (so it returns false).
+	bool fired = false;
+	const bool reaskable = Kademlia::CSearchManager::RequestMoreResults(searchID, &fired);
+	AddLogLineN(fired ? _("Kad search: requested wider results from one more peer.")
+			  : _("Kad search: no peer left to reask for more results (cap reached or no "
+			      "responses yet)."));
+	return reaskable;
+}
 
 void CSearchList::StopSearch(bool globalOnly)
 {
 	if (m_searchType == GlobalSearch) {
+		FinalizeGlobalSearch();
+		m_currentSearch = -1;
+	} else if (m_searchType == LocalSearch) {
+		// A local search has no sweep to halt, but it does have an armed answer timeout and an
+		// m_searchInProgress that nothing else clears. Leaving both is what made a stopped local
+		// search hang; leaving just the timer would be worse still, announcing a timeout for a
+		// search the user stopped, against a server that may well have answered.
+		//
+		// Not gated on globalOnly: that spares Kad, and a local search is ed2k, exactly like the
+		// global branch above.
+		FinalizeLocalSearch();
 		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);
 	} else if (m_searchType == KadSearch && !globalOnly) {
 		Kademlia::CSearchManager::StopSearch(m_currentSearch, false);
 		m_currentSearch = -1;
 	}
 }
 
+void CSearchList::StopSearchById(wxUIntPtr searchID)
+{
+	// Stop the Kad keyword search for this ID, if it is one. Harmless no-op
+	// when the ID is not an active Kad search (ed2k, or already finished).
+	Kademlia::CSearchManager::StopSearch(searchID, false);
+	// If this is the in-flight ed2k global sweep, finalize it. ed2k is
+	// single-in-flight, so only the current search can be running.
+	if (searchID == m_currentSearch && m_searchInProgress) {
+		FinalizeGlobalSearch();
+	}
+	// Results are intentionally retained -- the multi-search EC "stop" halts
+	// activity but keeps the bucket; RemoveResults() is the free path.
+}
+
+void CSearchList::SetKadSearchFinished(uint32_t searchID)
+{
+	m_finishedKadSearches.insert(searchID);
+	// Legacy scalar for the single-search (parameterless GetSearchProgress /
+	// GetSearchLifecycleState) path.
+	m_KadSearchFinished = true;
+}
+
+CSearchList::SearchLifecycleState CSearchList::GetSearchLifecycleStateById(wxUIntPtr searchID) const
+{
+	uint32_t sid = static_cast<uint32_t>(searchID);
+	// A browse ("View Files") is not a CSearchList search: CBrowseManager owns its lifecycle,
+	// keyed by the same id this function is asked about. Without this the generic tail below
+	// decides it from retained results, which is wrong in both directions -- a browse still
+	// streaming reports finished as soon as its first directory lands, and one the peer denied
+	// reports idle forever, since a failed browse has no results to flip the ternary. Same
+	// mapping the EC progress reply applies (ExternalConn.cpp's AppendSearchProgress), here
+	// instead of only there so the SEARCH_LIST listing cannot disagree with the per-id progress
+	// reply about the same id.
+	if (theApp->browsemanager->Has(sid)) {
+		return theApp->browsemanager->StateOf(sid) == browse::State::InProgress
+			       ? SEARCH_LIFECYCLE_RUNNING
+			       : SEARCH_LIFECYCLE_FINISHED;
+	}
+	// Kad searches are tracked per-ID: still registered in the manager means running; recorded
+	// as finished (its CSearch was destroyed on the result cap or the 45s lifetime) means
+	// finished. Independent of any other search, so one search ending never reports a different
+	// running search as finished.
+	if (IsKadSearch(sid)) {
+		return SEARCH_LIFECYCLE_RUNNING;
+	}
+	if (m_finishedKadSearches.count(sid)) {
+		return SEARCH_LIFECYCLE_FINISHED;
+	}
+	// ed2k / non-Kad: the most-recently-started search owns the scalar state.
+	if (searchID == m_currentSearch) {
+		return GetSearchLifecycleState();
+	}
+	// Otherwise this id is done, whatever any sweep is still doing: results are filed under the
+	// scalar m_currentSearch (ProcessSearchAnswer / ProcessUDPSearchAnswer), so once a newer
+	// ed2k search takes that scalar nothing further can land in this id's bucket. Unreachable,
+	// not idle.
+	//
+	// Deliberately NOT "no other ed2k search is in flight", which is false on one of the two
+	// paths: only the EC start handler finalizes the previous sweep (StopInFlightEd2kSearch,
+	// whose sole caller it is), while the monolithic dialog calls StartNewSearch directly and
+	// merely abandons it, so an older search's sweep may well still be running. Reachability of
+	// the bucket is the narrower property, and the one that holds on both paths.
+	//
+	// Deciding this from the retained results instead reported every search that indexed
+	// *nothing* as IDLE forever -- a query no server matched, one whose every hit AddToList
+	// dropped on the file-type filter, or a global sweep stopped before its first result. IDLE
+	// is not terminal, so GetSearchBarStatusById fell through to the running percent (0) and
+	// every consumer read a finished search as running at 0%: the Stop button stayed live, the
+	// bar never cleared, the EC lifecycle tag said "idle", and the "an eD2k search is still
+	// running" prompt fired on a tab that had long since finished (issue #1103).
+	//
+	// IsKnownSearchId is the discriminator the result bucket could not be: m_searchStrings is
+	// written when the search starts, independent of what it kept, so a search started here
+	// reads FINISHED whether or not it retained anything, while an id that is genuinely unknown
+	// -- never started here, or already evicted -- still reads IDLE.
+	return IsKnownSearchId(sid) ? SEARCH_LIFECYCLE_FINISHED : SEARCH_LIFECYCLE_IDLE;
+}
+
+uint8 CSearchList::GetSearchLifecyclePercentById(wxUIntPtr searchID) const
+{
+	switch (GetSearchLifecycleStateById(searchID)) {
+	case SEARCH_LIFECYCLE_FINISHED:
+		return 100;
+	case SEARCH_LIFECYCLE_IDLE:
+		return 0;
+	case SEARCH_LIFECYCLE_RUNNING:
+		break;
+	}
+	// RUNNING. A Kad search gets a cosmetic time-ramp from *its own* start time (looked up
+	// per-search), so a Kad search still running while a later ed2k search is the current one
+	// ramps correctly instead of sticking near full. An in-flight ed2k global uses its real
+	// server-queue percent -- that state is single-slot, so it only applies to the current
+	// search.
+	const uint32_t sid = static_cast<uint32_t>(searchID);
+	// A browse reports the share of the peer's directory list received so far, rather than the
+	// 0/100 the state switch above would derive.
+	//
+	// Straight from the manager, NOT through GetSearchBarStatusById: that function falls through
+	// to this one for anything it does not consider finished, so routing this branch through it
+	// would recurse between the two.
+	if (theApp->browsemanager->Has(sid)) {
+		const uint16 pct = theApp->browsemanager->BarValue(sid);
+		// 0xffff is the bar's terminal sentinel, not a percent.
+		return (pct == 0xffff) ? 100 : static_cast<uint8>(pct);
+	}
+	if (IsOrWasKadSearch(sid)) {
+		std::map<uint32_t, time_t>::const_iterator it = m_searchStartTimes.find(sid);
+		time_t start = (it != m_searchStartTimes.end()) ? it->second : m_searchStart;
+		time_t elapsed = time(nullptr) - start;
+		if (elapsed <= 0) {
+			return 0;
+		}
+		uint32 pct = (uint32)((elapsed * 100) / SEARCHKEYWORD_LIFETIME);
+		return (pct > 99) ? 99 : (uint8)pct;
+	}
+	if (searchID == m_currentSearch && m_searchType == GlobalSearch) {
+		uint32 pct = GetSearchProgress();
+		return (pct > 100) ? 100 : (uint8)pct;
+	}
+	return 0;
+}
+
+uint32 CSearchList::GetSearchBarStatusById(wxUIntPtr searchID) const
+{
+	// A "View Files" browse tab is not a CSearchList search: CBrowseManager owns its lifecycle,
+	// so ask there rather than keeping a second copy here that would have to be kept in step by
+	// hand.
+	if (theApp->browsemanager->Has(static_cast<uint32_t>(searchID))) {
+		return theApp->browsemanager->BarValue(static_cast<uint32_t>(searchID));
+	}
+	if (GetSearchLifecycleStateById(searchID) == SEARCH_LIFECYCLE_FINISHED) {
+		return IsOrWasKadSearch(static_cast<uint32_t>(searchID)) ? 0xfffe : 0xffff;
+	}
+	// RUNNING or IDLE both map to the running percent (0 when idle).
+	return GetSearchLifecyclePercentById(searchID);
+}
+
+void CSearchList::StopInFlightEd2kSearch()
+{
+	// m_searchInProgress is true only while an ed2k (local/global) search is in flight. A local
+	// search finishes synchronously (LocalSearchEnd on the server reply), so in practice this
+	// finalizes an in-progress global sweep -- halting the timer and dropping the packet so no
+	// further UDP results are filed under the outgoing m_currentSearch. The results already
+	// collected are retained; the caller starts a fresh search next.
+	if (m_searchInProgress) {
+		FinalizeGlobalSearch();
+	}
+}
 
-CSearchList::CMemFilePtr CSearchList::CreateSearchData(CSearchParams& params, SearchType type, bool supports64bit, bool& packetUsing64bit)
+void CSearchList::FinalizeGlobalSearch()
+{
+	m_ed2kSearchFinished = true;
+	// Order is crucial here: on wxMSW an additional event can be generated during the stop. So
+	// the packet has to be deleted first, so that OnGlobalSearchTimer() returns immediately
+	// (packet-null early return) without re-entering this path.
+	delete m_searchPacket;
+	m_searchPacket = NULL;
+	m_searchInProgress = false;
+	m_searchTimer.Stop();
+	m_awaitingServerAnswer = false;
+
+	CoreNotify_Search_Update_Progress(0xffff);
+}
+
+CSearchList::CMemFilePtr CSearchList::CreateSearchData(
+	CSearchParams &params, SearchType type, bool supports64bit, bool &packetUsing64bit)
 {
 	// Count the number of used parameters
 	unsigned int parametercount = 0;
-	if ( !params.typeText.IsEmpty() )	++parametercount;
-	if ( params.minSize > 0 )			++parametercount;
-	if ( params.maxSize > 0 )			++parametercount;
-	if ( params.availability > 0 )		++parametercount;
-	if ( !params.extension.IsEmpty() )	++parametercount;
+	if (!params.typeText.IsEmpty())
+		++parametercount;
+	if (params.minSize > 0)
+		++parametercount;
+	if (params.maxSize > 0)
+		++parametercount;
+	if (params.availability > 0)
+		++parametercount;
+	if (!params.extension.IsEmpty())
+		++parametercount;
 
 	wxString typeText = params.typeText;
-	if (typeText == ED2KFTSTR_ARCHIVE){
+	if (typeText == ED2KFTSTR_ARCHIVE) {
 		// eDonkeyHybrid 0.48 uses type "Pro" for archives files
 		// www.filedonkey.com uses type "Pro" for archives files
 		typeText = ED2KFTSTR_PROGRAM;
-	} else if (typeText == ED2KFTSTR_CDIMAGE){
+	} else if (typeText == ED2KFTSTR_CDIMAGE) {
 		// eDonkeyHybrid 0.48 uses *no* type for iso/nrg/cue/img files
 		// www.filedonkey.com uses type "Pro" for CD-image files
 		typeText = ED2KFTSTR_PROGRAM;
@@ -740,7 +1488,7 @@
 
 	s_strCurKadKeyword.Clear();
 	if (type == KadSearch) {
-		wxASSERT( !params.strKeyword.IsEmpty() );
+		wxASSERT(!params.strKeyword.IsEmpty());
 		s_strCurKadKeyword = params.strKeyword;
 	}
 
@@ -749,8 +1497,8 @@
 	LexFree();
 
 	if (_astrParserErrors.GetCount() > 0) {
-		for (unsigned int i=0; i < _astrParserErrors.GetCount(); ++i) {
-			AddLogLineNS(CFormat("Error %u: %s\n") % i % _astrParserErrorsi);
+		for (unsigned int i = 0; i < _astrParserErrors.GetCount(); ++i) {
+			AddLogLineNS(CFormat(_("Error %u: %s\n")) % i % _astrParserErrorsi);
 		}
 
 		return CMemFilePtr(nullptr);
@@ -763,22 +1511,26 @@
 	}
 
 	if (type == KadSearch && s_strCurKadKeyword != params.strKeyword) {
-		AddDebugLogLineN(logSearch, CFormat("Keyword was rearranged, using '%s' instead of '%s'") % s_strCurKadKeyword % params.strKeyword);
+		AddDebugLogLineN(logSearch,
+			CFormat("Keyword was rearranged, using '%s' instead of '%s'") % s_strCurKadKeyword %
+				params.strKeyword);
 		params.strKeyword = s_strCurKadKeyword;
 	}
 
 	parametercount += _SearchExpr.m_aExpr.GetCount();
 
 	/* Leave the unicode comment there, please... */
-	CSearchExprTarget target(data.get(), true /*I assume everyone is unicoded */ ? utf8strRaw : utf8strNone, supports64bit, packetUsing64bit);
+	CSearchExprTarget target(data.get(),
+		true /*I assume everyone is unicoded */ ? utf8strRaw : utf8strNone,
+		supports64bit,
+		packetUsing64bit);
 
 	unsigned int iParameterCount = 0;
 	if (_SearchExpr.m_aExpr.GetCount() <= 1) {
-		// lugdunummaster requested that searches without OR or NOT operators,
-		// and hence with no more expressions than the string itself, be sent
-		// using a series of ANDed terms, intersecting the ANDs on the terms
-		// (but prepending them) instead of putting the boolean tree at the start
-		// like other searches. This type of search is supposed to take less load
+		// lugdunummaster requested that searches without OR or NOT operators, and hence with no
+		// more expressions than the string itself, be sent using a series of ANDed terms,
+		// intersecting the ANDs on the terms (but prepending them) instead of putting the boolean
+		// tree at the start like other searches. This type of search is supposed to take less load
 		// on servers. Go figure.
 		//
 		// input:      "a" AND min=1 AND max=2
@@ -807,29 +1559,30 @@
 			target.WriteMetaDataSearchParam(FT_FILESIZE, ED2K_SEARCH_OP_GREATER, params.minSize);
 		}
 
-		if (params.maxSize > 0){
+		if (params.maxSize > 0) {
 			if (++iParameterCount < parametercount) {
 				target.WriteBooleanAND();
 			}
 			target.WriteMetaDataSearchParam(FT_FILESIZE, ED2K_SEARCH_OP_LESS, params.maxSize);
 		}
 
-		if (params.availability > 0){
+		if (params.availability > 0) {
 			if (++iParameterCount < parametercount) {
 				target.WriteBooleanAND();
 			}
-			target.WriteMetaDataSearchParam(FT_SOURCES, ED2K_SEARCH_OP_GREATER, params.availability);
+			target.WriteMetaDataSearchParam(
+				FT_SOURCES, ED2K_SEARCH_OP_GREATER, params.availability);
 		}
 
-		if (!params.extension.IsEmpty()){
+		if (!params.extension.IsEmpty()) {
 			if (++iParameterCount < parametercount) {
 				target.WriteBooleanAND();
 			}
 			target.WriteMetaDataSearchParam(FT_FILEFORMAT, params.extension);
 		}
 
-		//#warning TODO - I keep this here, ready if we ever allow such searches...
-		#if 0
+// #warning TODO - I keep this here, ready if we ever allow such searches...
+#if 0
 		if (complete > 0){
 			if (++iParameterCount < parametercount) {
 				target.WriteBooleanAND();
@@ -878,11 +1631,11 @@
 			}
 			target.WriteMetaDataSearchParam(type == KadSearch ? TAG_MEDIA_ARTIST : FT_ED2K_MEDIA_ARTIST, artist);
 		}
-		#endif // 0
+#endif // 0
 
 		// If this assert fails... we're seriously fucked up
 
-		wxASSERT( iParameterCount == parametercount );
+		wxASSERT(iParameterCount == parametercount);
 
 	} else {
 		if (!params.extension.IsEmpty()) {
@@ -897,7 +1650,7 @@
 			}
 		}
 
-		if (params.maxSize > 0){
+		if (params.maxSize > 0) {
 			if (++iParameterCount < parametercount) {
 				target.WriteBooleanAND();
 			}
@@ -909,14 +1662,14 @@
 			}
 		}
 
-		if (!typeText.IsEmpty()){
+		if (!typeText.IsEmpty()) {
 			if (++iParameterCount < parametercount) {
 				target.WriteBooleanAND();
 			}
 		}
 
-		//#warning TODO - same as above...
-		#if 0
+// #warning TODO - same as above...
+#if 0
 		if (complete > 0){
 			if (++iParameterCount < parametercount) {
 				target.WriteBooleanAND();
@@ -958,10 +1711,10 @@
 				target.WriteBooleanAND();
 			}
 		}
-		#endif // 0
+#endif // 0
 
 		// As above, if this fails, we're seriously fucked up.
-		wxASSERT( iParameterCount + _SearchExpr.m_aExpr.GetCount() == parametercount );
+		wxASSERT(iParameterCount + _SearchExpr.m_aExpr.GetCount() == parametercount);
 
 		for (unsigned int j = 0; j < _SearchExpr.m_aExpr.GetCount(); ++j) {
 			if (_SearchExpr.m_aExprj == SEARCHOPTOK_AND) {
@@ -989,15 +1742,16 @@
 		}
 
 		if (params.availability > 0) {
-			target.WriteMetaDataSearchParam(FT_SOURCES, ED2K_SEARCH_OP_GREATER, params.availability);
+			target.WriteMetaDataSearchParam(
+				FT_SOURCES, ED2K_SEARCH_OP_GREATER, params.availability);
 		}
 
 		if (!params.extension.IsEmpty()) {
 			target.WriteMetaDataSearchParam(FT_FILEFORMAT, params.extension);
 		}
 
-		//#warning TODO - third and last warning of the same series.
-		#if 0
+// #warning TODO - third and last warning of the same series.
+#if 0
 		if (complete > 0) {
 			target.WriteMetaDataSearchParam(FT_COMPLETE_SOURCES, ED2K_SEARCH_OP_GREATER, pParams->uComplete);
 		}
@@ -1026,16 +1780,20 @@
 			target.WriteMetaDataSearchParam(type == KadSearch ? TAG_MEDIA_ARTIST : FT_ED2K_MEDIA_ARTIST, artist);
 		}
 
-		#endif // 0
+#endif // 0
 	}
 
 	// Packet ready to go.
 	return data;
 }
 
-
-void CSearchList::KademliaSearchKeyword(uint32_t searchID, const Kademlia::CUInt128 *fileID,
-	const wxString& name, uint64_t size, const wxString& type, uint32_t kadPublishInfo, const TagPtrList& taglist)
+void CSearchList::KademliaSearchKeyword(uint32_t searchID,
+	const Kademlia::CUInt128 *fileID,
+	const wxString &name,
+	uint64_t size,
+	const wxString &type,
+	uint32_t kadPublishInfo,
+	const TagPtrList &taglist)
 {
 	EUtf8Str eStrEncode = utf8strRaw;
 
@@ -1044,8 +1802,8 @@
 	fileID->ToByteArray(fileid);
 	temp.WriteHash(CMD4Hash(fileid));
 
-	temp.WriteUInt32(0);	// client IP
-	temp.WriteUInt16(0);	// client port
+	temp.WriteUInt32(0); // client IP
+	temp.WriteUInt16(0); // client port
 
 	// write tag list
 	unsigned int uFilePosTagCount = temp.GetPosition();
@@ -1069,7 +1827,7 @@
 
 	// Misc tags (bitrate, etc)
 	for (TagPtrList::const_iterator it = taglist.begin(); it != taglist.end(); ++it) {
-		(*it)->WriteTagToFile(&temp,eStrEncode);
+		(*it)->WriteTagToFile(&temp, eStrEncode);
 		tagcount++;
 	}
 
@@ -1084,12 +1842,12 @@
 	AddToList(tempFile);
 }
 
-void CSearchList::UpdateSearchFileByHash(const CMD4Hash& hash)
+void CSearchList::UpdateSearchFileByHash(const CMD4Hash &hash)
 {
-	for (ResultMap::iterator it = m_results.begin(); it != m_results.end(); ++it) {
-		CSearchResultList& results = it->second;
+	for (const auto &entry : AllResults()) {
+		const CSearchResultList &results = entry.second;
 		for (size_t i = 0; i < results.size(); ++i) {
-			CSearchFile* item = results.at(i);
+			CSearchFile *item = results.at(i);
 
 			if (hash == item->GetFileHash()) {
 				// This covers only parent items,

amule-3.0.1.tar.gz/src/SearchList.h -> amule-3.1.0.tar.gz/src/SearchList.h Changed

@@ -26,11 +26,14 @@
 #ifndef SEARCHLIST_H
 #define SEARCHLIST_H
 
-#include "Timer.h"		// Needed for CTimer
-#include "ObservableQueue.h"	// Needed for CQueueObserver
-#include "SearchFile.h"		// Needed for CSearchFile
-#include <common/SmartPtr.h>	// Needed for CSmartPtr
-
+#include "Timer.h"             // Needed for CTimer
+#include "ObservableQueue.h"   // Needed for CQueueObserver
+#include "SearchFile.h"        // Needed for CSearchFile
+#include "SearchResultIndex.h" // Needed for CSearchResultIndex
+#include <common/SmartPtr.h>   // Needed for CSmartPtr
+#include <set>                 // Needed for std::set (per-search Kad completion)
+#include <map>                 // Needed for std::map (per-search start times)
+#include <vector>              // Needed for std::vector (same-hash result fan-out)
 
 class CMemFile;
 class CMD4Hash;
@@ -38,22 +41,38 @@
 class CServer;
 class CSearchFile;
 
-namespace Kademlia {
-	class CUInt128;
+namespace Kademlia
+{
+class CUInt128;
 }
 
-
-enum SearchType {
-	LocalSearch,
-	GlobalSearch,
-	KadSearch
+/**
+ * What kind of search an id names.
+ *
+ * The values are pinned, not incidental. They are cast straight to uint8 and shipped as
+ * EC_TAG_SEARCH_LIFECYCLE_KIND, where they have to line up with EC_SEARCH_TYPE in
+ * ECCodes.abstract, and CSearchList::Save() writes the same byte into the saved-searches
+ * file. So a member's number is part of both the wire protocol and an on-disk format,
+ * and renumbering one silently reinterprets the other.
+ *
+ * Note the gap: 3 belongs to EC_SEARCH_WEB, which has no counterpart here. Appending
+ * BrowseSearch without saying so would have handed it that value and made every browse
+ * report itself as a web search.
+ */
+enum SearchType
+{
+	LocalSearch = 0,
+	GlobalSearch = 1,
+	KadSearch = 2,
+	// 3 is EC_SEARCH_WEB -- deliberately skipped, see above.
+	//! A "View Files" browse of one peer's share. Shares the id space and the lifecycle
+	//! machinery with real searches, but is started by EnsureBrowseTab, not a query.
+	BrowseSearch = 4
 };
 
+typedef std::vector<CSearchFile *> CSearchResultList;
 
-typedef std::vector<CSearchFile*> CSearchResultList;
-
-
-class CSearchList : public wxEvtHandler
+class CSearchList : public wxEvtHandler, public CSearchResultIndex
 {
 public:
 	//! Structure used to pass search-parameters.
@@ -90,44 +109,231 @@
 	 * @param searchID The ID of the search, which may be modified.
 	 * @param type The type of search, see SearchType.
 	 * @param params The search parameters, see CSearchParams.
-	 * @return An empty string on success, otherwise an error-message.
+	 * @return An empty string on success, otherwise an error message.
 	 */
-	wxString StartNewSearch(uint32* searchID, SearchType type, CSearchParams& params);
+	wxString StartNewSearch(uint32 *searchID, SearchType type, CSearchParams &params);
 
 	/** Stops the current search (global or Kad), if any is in progress. */
 	void StopSearch(bool globalOnly = false);
 
+	/**
+	 * Stops network activity for one specific search by ID, keeping its results (the
+	 * multi-search EC "stop", as opposed to RemoveResults, which also frees them). Stops
+	 * the matching Kad keyword search if this ID is one, and finalizes the ed2k global
+	 * sweep if this ID is the in-flight one. A no-op for an already-finished / unknown ID.
+	 */
+	void StopSearchById(wxUIntPtr searchID);
+
+	/**
+	 * Finalizes any in-flight ed2k (local/global) search, keeping its results. ed2k
+	 * searches share a single in-flight slot and file their results under the scalar
+	 * m_currentSearch, so the multi-search EC layer calls this before starting a new
+	 * search to stop the old sweep's late UDP results from leaking into the new search's
+	 * bucket. Running Kad searches are attributed by their own ID and are left untouched.
+	 */
+	void StopInFlightEd2kSearch();
+
+	/**
+	 * Allocates a fresh ed2k search ID from the single core counter shared by the
+	 * monolithic GUI and the EC daemon path. Returns IDs in the range 1, 0x3fffffff
+	 * (never 0), provably disjoint from Kad's top-half IDs (>= 0x80000000) and from the
+	 * remote GUI's optimistic placeholder tab IDs (0x40000000-0x7fffffff, see
+	 * CSearchDlg::AllocateOptimisticId).
+	 */
+	uint32 AllocateEd2kId();
+
+	/**
+	 * Advances m_nextEd2kId past a restored ed2k search's persisted id (issue #641 Phase
+	 * 3), so the next AllocateEd2kId() call this session cannot reissue it -- m_nextEd2kId
+	 * restarts at 0 every launch, so without this a restored search and the first new one
+	 * after a restart collide deterministically. No-op if id is already at or below the
+	 * current counter.
+	 */
+	void ReserveEd2kId(uint32_t id)
+	{
+		const uint32_t masked = id & 0x3fffffff;
+		if (masked > m_nextEd2kId) {
+			m_nextEd2kId = masked;
+		}
+	}
+
 	/** True if the given searchID corresponds to an active Kad search. */
 	bool IsKadSearch(uint32_t searchID) const;
 
+	/** True if the given searchID is a Kad search, active or already finished. */
+	bool IsOrWasKadSearch(uint32_t searchID) const;
+
+	/**
+	 * Returns the query string this search was started with, or an empty string if
+	 * searchID is unknown. Used to label a search enumerated via EC_OP_SEARCH_LIST for a
+	 * client that never started it locally.
+	 */
+	wxString GetSearchStringById(uint32_t searchID) const;
+
+	/**
+	 * True if this core currently routes results/progress for searchID -- either a
+	 * CSearchList search (m_searchStrings, populated in StartNewSearch, pruned in
+	 * RemoveResults) or a "View Files" browse tab (CBrowseManager; browses are not
+	 * CSearchList searches but share the same per-ID result-routing and EC lifecycle --
+	 * got3nks, PR #680 review).
+	 *
+	 * Use this to gate per-ID EC replies (SEARCH_PROGRESS, single-ID SEARCH_RESULTS, Stop,
+	 * Request_More) instead of the EC-only s_ecSearches registry: a monolithic-started
+	 * search (or a browse) is known here but was never Register()'d into that registry, so
+	 * gating on it alone reports a live search as EC_TAG_SEARCH_EXPIRED.
+	 */
+	bool IsKnownSearchId(uint32_t searchID) const;
+
+	/**
+	 * Every search ID this core currently knows a name for -- populated in StartNewSearch
+	 * and RegisterBrowseSearch, pruned in RemoveResults, so this covers a search regardless
+	 * of how it was started (monolithic GUI or an EC client) and is not bounded by any
+	 * EC-connection-specific registry.
+	 *
+	 * Browses are in here: PR #914 registers one under its peer's name so a remote GUI
+	 * listing the core's searches can rebuild it as a browse tab rather than a nameless
+	 * search one. PR #680's narrower rule -- that a browse must never surface on
+	 * EC_OP_SEARCH_LIST -- was superseded by that, so this map is no longer searches-only.
+	 *
+	 * Returned by reference: called once per explicit EC_OP_SEARCH_LIST request, but a copy
+	 * is still needless, and neither caller needs ownership.
+	 */
+	const std::map<uint32_t, wxString> &GetKnownSearchIds() const { return m_searchStrings; }
+
 	/**
-	 * Ask the Kad search identified by searchID to widen its frontier
-	 * via KADEMLIA_FIND_VALUE_MORE.  Wired to the search dialog "More"
-	 * button.  Returns true if a reask was dispatched, false otherwise.
+	 * Ask the Kad search identified by searchID to widen its frontier via
+	 * KADEMLIA_FIND_VALUE_MORE. Wired to the search dialog "More" button. Returns true if
+	 * a reask was dispatched.
 	 */
 	bool RequestMoreResults(uint32_t searchID);
 
 	/** Returns the completion percentage of the current search. */
 	uint32 GetSearchProgress() const;
 
+	// Unambiguous lifecycle accessors used by the new EC tags (EC_TAG_SEARCH_LIFECYCLE_STATE /
+	// _KIND / _RESULT_COUNT). Old consumers still read the overloaded GetSearchProgress()
+	// return.
+	enum SearchLifecycleState
+	{
+		SEARCH_LIFECYCLE_IDLE = 0,    // no search started this session
+		SEARCH_LIFECYCLE_RUNNING = 1, // active search in flight
+		SEARCH_LIFECYCLE_FINISHED = 2 // last search completed; results retained
+	};
+	SearchLifecycleState GetSearchLifecycleState() const;
+
+	// Per-search-ID lifecycle accessors for the multi-search EC path. For the
+	// most-recently-started search these delegate to the scalar accessors above; for older
+	// searches they infer state from the Kad manager (a still-active keyword search is
+	// RUNNING) and the retained result bucket (present means FINISHED).
+	SearchLifecycleState GetSearchLifecycleStateById(wxUIntPtr searchID) const;
+	uint8 GetSearchLifecyclePercentById(wxUIntPtr searchID) const;
+	// The overloaded progress-bar sentinel for a search: 0xffff for a finished ed2k search,
+	// 0xfffe for a finished Kad one (each resets the bar, and Kad also clears the "!" marker),
+	// otherwise the running percent. Single source of truth for the bottom bar, shared by the
+	// EC PROGRESS reply and the search dialog.
+	uint32 GetSearchBarStatusById(wxUIntPtr searchID) const;
+	// "View Files" browse tabs are not CSearchList searches: CBrowseManager owns their bar,
+	// and GetSearchBarStatusById consults it first, so the monolithic bar and the EC PROGRESS
+	// reply render the same value.
+
+	// Echoes m_searchType for the current/last search; meaningful only
+	// when state is RUNNING or FINISHED. Returns LocalSearch by default.
+	SearchType GetSearchLifecycleKind() const { return m_searchType; }
+	// Per-id search kind: the type recorded for THIS search when it started, so the EC PROGRESS
+	// reply reports the polled tab's kind rather than the scalar one -- a remote GUI running
+	// several searches needs each tab's real kind, for the Kad-only "More" button. Kad is
+	// authoritative via IsOrWasKadSearch even if the recorded entry was pruned; unknown ids
+	// fall back to the scalar.
+	SearchType GetSearchLifecycleKindById(wxUIntPtr searchID) const;
+	/**
+	 * Records a browse under @a searchID so it appears in the search list like any other
+	 * entry.
+	 *
+	 * A browse gets a real id from the same space as searches, but nothing described it:
+	 * with no entry here its kind fell back to the scalar and it had no name at all, so a
+	 * remote GUI listing the daemon's searches saw a nameless one it could only rebuild as
+	 * an ordinary search tab.
+	 *
+	 * Writes all three of the per-id maps, which are maintained as a triple -- Save() walks
+	 * m_searchStrings and reaches for the other two with .at(), so a partial entry turns
+	 * saving into an exception rather than a missing field.
+	 */
+	void RegisterBrowseSearch(uint32 searchID, const wxString &peerName, uint32 peerEcid);
+	//! ECID of the peer a browse id is listing, 0 if not a browse. Reported so a remote GUI
+	//! can build a browse tab that is actually tied to its peer -- a tab with no ecid is not
+	//! a browse at all (IsBrowse()).
+	uint32 GetBrowsePeerEcid(uint32 searchID) const;
+	// Result count for the current search; 0 if idle.
+	std::size_t GetCurrentSearchResultCount() const;
+	// Unified 0..100 completion for the current search, surfaced via
+	// EC_TAG_SEARCH_LIFECYCLE_PERCENT. Global uses the real server-queue percent; Kad, which
+	// has no measurable progress, gets a cosmetic time-ramp off the fixed keyword-search
+	// lifetime, which the FINISHED state snaps to 100.
+	uint8 GetSearchLifecyclePercent() const;
+
 	/** This function is called once the local (ed2k) search has ended. */
-	void	LocalSearchEnd();
+	void LocalSearchEnd();
+
+	// GetSearchResults() is inherited from CSearchResultIndex, which holds the
+	// per-search result index this class fills through IndexResult().
+
+	/** Removes all results for the specified search. */
+	void RemoveResults(wxUIntPtr searchID);
 
+	/**
+	 * Persists every currently-held search (query string, kind, start time, and its full
+	 * result tree) to StoredSearches.met, so results survive a restart (issue #641 Phase
+	 * 3). Called from OnExit() before this object is destroyed -- the destructor drains
+	 * everything via RemoveResults(), so this must run first. "View Files" browse tabs are
+	 * not searches (see GetKnownSearchIds()) and are never persisted. Bounded at
+	 * MAX_STORED_SEARCHES / MAX_STORED_RESULTS_PER_SEARCH; anything beyond that is dropped
+	 * with a log line rather than silently.
+	 */
+	void StoreSearches() const;
 
 	/**
-	 * Returns the list of results for the specified search.
+	 * Reloads whatever StoreSearches() last wrote, reconstructing each search's query
+	 * string/kind/start time and its full result tree (SetDownloadStatus() is re-run on
+	 * every restored result). A restored Kad search is recorded as already finished, since
+	 * the original in-flight Kad search object cannot survive a restart. Must run after
+	 * theApp->downloadqueue/knownfiles/canceledfiles exist (see amule.cpp).
+	 *
+	 * A malformed file (bad header, or a search/result count exceeding the write-time caps)
+	 * is treated as fatal for the whole load, matching CSearchFile::LoadFromFile()'s own
+	 * fail-closed contract one level up -- a corrupt file yields zero restored searches
+	 * rather than a partial, unpredictable set.
 	 *
-	 * If the search is not valid, an empty list is returned.
+	 * @return The IDs of every search actually restored, in file order, so callers can
+	 *         register them with clients that discover searches out-of-band (see
+	 *         RegisterRestoredSearch() in ExternalConn.h).
 	 */
-	const	CSearchResultList& GetSearchResults(wxUIntPtr searchID) const;
+	std::vector<uint32_t> LoadSearches();
 
-	/** Removes all results for the specified search. */
-	void	RemoveResults(wxUIntPtr searchID);
+	/** Finds the search-result (by hash) and downloads it in the given category. */
+	void AddFileToDownloadByHash(const CMD4Hash &hash, uint8 category = 0);
 
+	/**
+	 * Returns the first search result (across every search, parents and their children)
+	 * matching the given file hash, or NULL if none. Used by the Kad NOTES machinery to
+	 * size and attach on-demand community comments to a result the user has not downloaded.
+	 */
+	CSearchFile *GetSearchFileByID(const CMD4Hash &hash) const;
 
-	/** Finds the search-result (by hash) and downloads it in the given category. */
-	void	AddFileToDownloadByHash(const CMD4Hash& hash, uint8 category = 0);
+	/**
+	 * Collect EVERY search result (parents and children) matching the given file hash,
+	 * across all concurrent searches. On-demand Kad notes and the running flag fan out to
+	 * all of them so the same file shown in more than one open search tab gets its
+	 * community comments everywhere, not just in the first tab that happens to hold it.
+	 */
+	void GetAllSearchFilesByID(const CMD4Hash &hash, std::vector<CSearchFile *> &out) const;
 
+	/**
+	 * Start downloading the specific search result identified by its EC ECID -- used to
+	 * pick one same-hash/different-name grouped child so the partfile lands under that
+	 * chosen filename (issue #431). Searches parents and their children; a no-op if the
+	 * ecid is gone.
+	 */
+	void AddFileToDownloadByEcid(uint32 ecid, uint8 category = 0);
 
 	/**
 	 * Processes a list of shared files from a client.
@@ -135,114 +341,230 @@
 	 * @param packet The raw packet received from the client.
 	 * @param size the length of the packet.
 	 * @param sender The sender of the packet.
-	 * @param moreResultsAvailable Set to a value specifying if more results are available.
+	 * @param moreResultsAvailable Set to whether more results are available.
 	 * @param directory The directory containing the shared files.
 	 */
-	void	ProcessSharedFileList(const uint8_t* packet, uint32 size, CUpDownClient* sender, bool* moreResultsAvailable, const wxString& directory);
+	void ProcessSharedFileList(const uint8_t *packet,
+		uint32 size,
+		CUpDownClient *sender,
+		bool *moreResultsAvailable,
+		const wxString &directory);
 
 	/**
-	 * Processes a search-result sent via TCP from the local server. All results are added.
+	 * Processes a search result sent via TCP from the local server. All results are added.
 	 *
-	 * @param packet The packet containing one or more search-results.
+	 * @param packet The packet containing one or more search results.
 	 * @param size the length of the packet.
 	 * @param optUTF8 Specifies if the server supports UTF8.
 	 * @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.
+	 * Processes a search result sent via UDP. Only one result is read from the packet.
 	 *
-	 * @param packet The packet containing one or more search-results.
+	 * @param packet The packet containing one or more search results.
 	 * @param optUTF8 Specifies if the server supports UTF8.
 	 * @param serverIP The IP of the server sending the results.
 	 * @param serverPort The Port of the server sending the results.
 	 */
-	void	ProcessUDPSearchAnswer(const CMemFile& packet, bool optUTF8, uint32 serverIP, uint16 serverPort);
-
+	void ProcessUDPSearchAnswer(const CMemFile &packet, bool optUTF8, uint32 serverIP, uint16 serverPort);
 
 	/**
-	 * Adds a result in the form of a kad search-keyword to the specified result-list.
+	 * Adds a result in the form of a kad search keyword to the specified result list.
 	 *
 	 * @param searchID The search to which this result belongs.
-	 * @param fileID The hash of the result-file.
+	 * @param fileID The hash of the result file.
 	 * @param name The filename of the result.
 	 * @param size The filesize of the result.
 	 * @param type The filetype of the result (TODO: Not used?)
 	 * @param kadPublishInfo The kademlia publish information of the result.
-	 * @param taglist List of additional tags associated with the search-result.
+	 * @param taglist List of additional tags associated with the search result.
 	 */
-	void	KademliaSearchKeyword(uint32_t searchID, const Kademlia::CUInt128 *fileID, const wxString& name, uint64_t size, const wxString& type, uint32_t kadPublishInfo, const TagPtrList& taglist);
+	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);
+	void UpdateSearchFileByHash(const CMD4Hash &hash);
 
-	/** Mark current KAD search as finished */
-	void SetKadSearchFinished() { m_KadSearchFinished = true; }
+	/**
+	 * Mark a specific Kad search (by ID) as finished. Records it per-search
+	 * (m_finishedKadSearches) so multi-search progress is precise -- one search ending must
+	 * not report a *different* running search as finished. Also sets the legacy scalar
+	 * m_KadSearchFinished for the single-search (parameterless GetSearchProgress /
+	 * GetSearchLifecycleState) path.
+	 */
+	void SetKadSearchFinished(uint32_t searchID);
 
 private:
+	//! On-disk name of the search-results persistence file, in the config dir.
+	static const wxChar *const s_storedSearchesFilename;
+
+	//! Ceiling on how many searches StoreSearches() writes and LoadSearches() accepts.
+	//! Matches kMaxEcSearches for consistency, though m_searchStrings itself is not
+	//! EC-bounded. The oldest are dropped first, with a log line.
+	static const std::size_t MAX_STORED_SEARCHES = 20;
+
+	//! Ceiling on how many results StoreSearches() writes and LoadSearches() accepts per
+	//! search. Deliberately generous, and not mirrored from any other loader: unlike
+	//! known.met, which describes local files, a search result describes an arbitrary remote
+	//! peer's claims, so the read side must fail closed on a record claiming more than this
+	//! rather than attempt an unbounded allocation.
+	static const std::size_t MAX_STORED_RESULTS_PER_SEARCH = 5000;
+
 	/** Event-handler for global searches. */
-	void OnGlobalSearchTimer(CTimerEvent& evt);
+	void OnGlobalSearchTimer(CTimerEvent &evt);
+
+	/**
+	 * Shared cleanup for global-search completion. Releases the search packet, stops the
+	 * timer, notifies 100% progress, and sets m_ed2kSearchFinished. Callers decide whether
+	 * to also reset m_currentSearch: StopSearch does (explicit abort), the natural-drain
+	 * path in OnGlobalSearchTimer does not (preserving the ID lets GetSearchLifecycleState
+	 * report FINISHED instead of IDLE).
+	 */
+	void FinalizeGlobalSearch();
+
+	/**
+	 * Shared cleanup for local-search completion, whether the connected server answered or
+	 * the wait for it ran out.
+	 */
+	void FinalizeLocalSearch();
+
+	/**
+	 * Whether a server answer arriving now has a search to be filed under. Shared by the
+	 * TCP and UDP result paths so the two cannot drift on what counts as filable.
+	 */
+	bool CanFileServerAnswer() const;
+
+	/**
+	 * How long an ed2k search waits for the connected server's OP_SEARCHRESULT before it is
+	 * given up on.
+	 *
+	 * Both kinds need it, for the same reason. A local search has no other terminal path at
+	 * all: the single call to LocalSearchEnd is what ends it. A global search does have one
+	 * -- the sweep drains and calls FinalizeGlobalSearch -- but the sweep is armed *by*
+	 * LocalSearchEnd, so until the server answers there is nothing running to bound it
+	 * either. A server that never replies therefore leaves either kind RUNNING for as long
+	 * as it stays the most recent search.
+	 *
+	 * Disconnection does not cover it: CServerConnect passes globalOnly, and StopSearch
+	 * ignores a local search entirely.
+	 *
+	 * Long enough that a slow-but-alive server is not cut off, short enough that the
+	 * progress bar, the Stop button and EC_TAG_SEARCH_LIFECYCLE_STATE do not sit wrong for
+	 * a visible stretch.
+	 */
+	static const int SERVER_ANSWER_TIMEOUT_MS = 12000;
 
 	/**
 	 * Adds the specified file to the current search's results.
 	 *
 	 * @param toadd The result to add.
 	 * @param clientResponse Is the result sent by a client (shared-files list).
-	 * @return True if the results were added, false otherwise.
+	 * @return True if the results were added.
 	 *
-	 * Note that this function takes ownership of the CSearchFile object,
-	 * regardless of whenever or not it was actually added to the results list.
+	 * Takes ownership of the CSearchFile object whether or not it was actually added to the
+	 * results list.
 	 */
-	bool AddToList(CSearchFile* toadd, bool clientResponse = false);
+	bool AddToList(CSearchFile *toadd, bool clientResponse = false);
 
 	//! This smart pointer is used to safely prevent leaks.
 	typedef CSmartPtr<CMemFile> CMemFilePtr;
 
 	/** Create a basic search-packet for the given search-type. */
-	CMemFilePtr CreateSearchData(CSearchParams& params, SearchType type, bool supports64bit, bool& packetUsing64bit);
-
+	CMemFilePtr CreateSearchData(
+		CSearchParams &params, SearchType type, bool supports64bit, bool &packetUsing64bit);
 
 	//! Timer used for global search intervals.
-	CTimer	m_searchTimer;
+	CTimer m_searchTimer;
 
 	//! The current search-type, regarding the last/current search.
-	SearchType	m_searchType;
+	SearchType m_searchType;
 
 	//! Specifies if a search is being performed.
-	bool		m_searchInProgress;
+	bool m_searchInProgress;
 
 	//! The ID of the current search.
-	wxUIntPtr	m_currentSearch;
+	wxUIntPtr m_currentSearch;
+
+	//! Monotonic counter for ed2k search IDs, shared by the monolithic GUI and the EC daemon
+	//! path. Its range 1, 0x3fffffff keeps IDs provably disjoint from Kad's top-half IDs
+	//! and the remote GUI's optimistic placeholder range.
+	uint32 m_nextEd2kId = 0;
 
 	//! The current packet used for searches.
-	CPacket*	m_searchPacket;
+	CPacket *m_searchPacket;
 
 	//! Does the current search packet contain 64bit values?
-	bool		m_64bitSearchPacket;
+	bool m_64bitSearchPacket;
 
 	//! If the current search is a KAD search this signals if it is finished.
-	bool		m_KadSearchFinished;
+	bool m_KadSearchFinished;
+
+	//! Per-search Kad completion (multi-search): the IDs of Kad searches that have ended.
+	//! Lets GetSearchLifecycleStateById report each search independently, so one finishing
+	//! does not mark a different still-running search as finished. Pruned in RemoveResults.
+	std::set<uint32_t> m_finishedKadSearches;
+
+	//! Per-search start time (multi-search), so each search's cosmetic Kad progress ramp is
+	//! computed from its own age rather than the single m_searchStart of the
+	//! most-recently-started search. Pruned in RemoveResults.
+	std::map<uint32_t, time_t> m_searchStartTimes;
+
+	//! Per-search kind (multi-search), recorded at start so the EC PROGRESS reply can report
+	//! each polled tab's real type instead of the scalar m_searchType (which only tracks the
+	//! most-recently-started search). Pruned in RemoveResults.
+	std::map<uint32_t, SearchType> m_searchKinds;
+	//! Peer ecid per browse id; see RegisterBrowseSearch().
+	std::map<uint32_t, uint32> m_browsePeers;
+
+	//! This search's original query string, keyed by id (recorded in StartNewSearch, pruned
+	//! in RemoveResults). Needed to label a search enumerated via EC_OP_SEARCH_LIST for a
+	//! client that did not start it locally.
+	std::map<uint32_t, wxString> m_searchStrings;
+
+	//! ED2K-side counterpart of m_KadSearchFinished, covering both local and global
+	//! searches. Cleared in StartNewSearch when an ED2K search is issued, set again in
+	//! LocalSearchEnd or FinalizeGlobalSearch. GetSearchLifecycleState uses it as the
+	//! RUNNING vs FINISHED signal for the ED2K branch.
+	bool m_ed2kSearchFinished;
+	/**
+	 * True from an ed2k search going out until the connected server answers. Tells
+	 * OnGlobalSearchTimer whether a tick is the answer-timeout one-shot or a sweep tick:
+	 * m_serverQueue is still inactive on the sweep's first tick (that tick is what attaches
+	 * the observer), so it cannot say.
+	 */
+	bool m_awaitingServerAnswer;
+
+	//! Wall-clock start of the current/last search. Stamped in StartNewSearch; feeds the Kad
+	//! cosmetic progress ramp in GetSearchLifecyclePercent.
+	time_t m_searchStart;
+
+	//! Set by the destructor before it drains m_results, so RemoveResults skips its
+	//! Search_Removed broadcast during teardown: the GUI is being dismantled around us and
+	//! there is no tab left worth closing.
+	bool m_shuttingDown;
 
 	//! Queue of servers to ask when doing global searches.
 	//! TODO: Replace with 'cookie' system.
-	CQueueObserver<CServer*> m_serverQueue;
-
-	//! Shorthand for the map of results (key is a SearchID).
-	typedef std::map<wxUIntPtr, CSearchResultList> ResultMap;
+	CQueueObserver<CServer *> m_serverQueue;
 
-	//! Map of all search-results added.
-	ResultMap	m_results;
+	// The map of search-results (ResultMap / m_results) lives in
+	// CSearchResultIndex, shared with the remote search list.
 
 	//! Contains the results type desired in the current search.
 	//! If not empty, results of different types are filtered.
-	wxString	m_resultType;
-
+	wxString m_resultType;
 
 	wxDECLARE_EVENT_TABLE();
 };
 
-
 #endif // SEARCHLIST_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/SearchListCtrl.cpp -> amule-3.1.0.tar.gz/src/SearchListCtrl.cpp Changed

@@ -23,1088 +23,1058 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "SearchListCtrl.h"	// Interface declarations
+#include "SearchListCtrl.h" // Interface declarations
+
+#include <algorithm> // Needed for std::find, std::min, std::sort
+#include <vector>    // Needed for std::vector
 
 #include <common/MenuIDs.h>
-#include <common/Format.h>	// Needed for CFormat
-#include <tags/FileTags.h>	// Needed for FT_MEDIA_LENGTH / _BITRATE / _CODEC
-
-#include "amule.h"		// Needed for theApp
-#include "Server.h"		// Needed for CServer
-#include "ServerConnect.h"	// Needed for CServerConnect
-#include "KnownFileList.h"	// Needed for CKnownFileList
-#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"
-
-wxBEGIN_EVENT_TABLE(CSearchListCtrl, CMuleListCtrl)
-	EVT_LIST_ITEM_RIGHT_CLICK(-1, CSearchListCtrl::OnRightClick)
-	EVT_LIST_COL_CLICK( -1,       CSearchListCtrl::OnColumnLClick)
-	EVT_LIST_COL_END_DRAG( -1,    CSearchListCtrl::OnColumnResize)
-
-	EVT_MENU( MP_GETED2KLINK,     CSearchListCtrl::OnPopupGetUrl)
-	EVT_MENU( MP_RAZORSTATS,      CSearchListCtrl::OnRazorStatsCheck)
-	EVT_MENU( MP_SEARCHRELATED,   CSearchListCtrl::OnRelatedSearch)
-	EVT_MENU( MP_MARK_AS_KNOWN,   CSearchListCtrl::OnMarkAsKnown)
-	EVT_MENU( MP_RESUME,          CSearchListCtrl::OnPopupDownload)
-	EVT_MENU_RANGE( MP_ASSIGNCAT, MP_ASSIGNCAT + 99, CSearchListCtrl::OnPopupDownload )
-
-	EVT_LIST_ITEM_ACTIVATED( -1,  CSearchListCtrl::OnItemActivated)
+#include <common/Format.h> // Needed for CFormat
+#include <tags/FileTags.h> // Needed for FT_MEDIA_LENGTH / _BITRATE / _CODEC
+
+#include "amule.h"            // Needed for theApp
+#include "Server.h"           // Needed for CServer
+#include "ServerConnect.h"    // Needed for CServerConnect
+#include "SearchList.h"       // Needed for CSearchFile
+#include "updownclient.h"     // Needed for BROWSE_IN_PROGRESS
+#include "BrowseListModel.h"  // Needed for CBrowseListModel
+#include "SearchListModel.h"  // Needed for CSearchListModel
+#include "GetTickCount.h"     // Needed for GetTickCount64()
+#include "CommentDialogLst.h" // Needed for CCommentDialogLst (Kad comments/ratings)
+#include "SearchDlg.h"        // Needed for CSearchDlg
+#include "amuleDlg.h"         // Needed for CamuleDlg
+#ifndef CLIENT_GUI
+#include "TransferWnd.h"      // Needed for CTransferWnd (download-list batching)
+#include "DownloadListCtrl.h" // Needed for CDownloadListCtrl (download-list batching)
+#endif
+#include "muuli_wdr.h"      // Needed for IDC_* / ID_* control ids
+#include "OtherFunctions.h" // Needed for CmpAny, CastItoXBytes, GetFiletypeByName, ...
+#include "Preferences.h"    // Needed for thePrefs
+#include "GuiEvents.h"      // Needed for CoreNotify_Search_Add_Download
+
+wxBEGIN_EVENT_TABLE(CSearchListCtrl, CMuleDataViewCtrl)
+	EVT_DATAVIEW_ITEM_CONTEXT_MENU(wxID_ANY, CSearchListCtrl::OnRightClick)
+	EVT_DATAVIEW_ITEM_ACTIVATED(wxID_ANY, CSearchListCtrl::OnItemActivated)
+
+	EVT_MENU(MP_GETED2KLINK, CSearchListCtrl::OnPopupGetUrl)
+	EVT_MENU(MP_RAZORSTATS, CSearchListCtrl::OnRazorStatsCheck)
+	EVT_MENU(MP_SEARCHRELATED, CSearchListCtrl::OnRelatedSearch)
+	EVT_MENU(MP_GETCOMMENTS, CSearchListCtrl::OnGetComments)
+	EVT_MENU(MP_EXPANDALL, CSearchListCtrl::OnExpandAll)
+	EVT_MENU(MP_COLLAPSEALL, CSearchListCtrl::OnCollapseAll)
+	EVT_MENU(MP_RESUME, CSearchListCtrl::OnPopupDownload)
+	EVT_MENU_RANGE(MP_ASSIGNCAT, MP_ASSIGNCAT + 99, CSearchListCtrl::OnPopupDownload)
 wxEND_EVENT_TABLE()
 
+std::list<CSearchListCtrl *> CSearchListCtrl::s_lists;
 
-std::list<CSearchListCtrl*> CSearchListCtrl::s_lists;
-
-
-enum SearchListColumns {
-	ID_SEARCH_COL_NAME = 0,
-	ID_SEARCH_COL_SIZE,
-	ID_SEARCH_COL_SOURCES,
-	ID_SEARCH_COL_TYPE,
-	ID_SEARCH_COL_FILEID,
-	ID_SEARCH_COL_STATUS,
-	ID_SEARCH_COL_LENGTH,
-	ID_SEARCH_COL_BITRATE,
-	ID_SEARCH_COL_CODEC,
-	ID_SEARCH_COL_DIRECTORY
-};
-
+// MLOrder-compatible bit values, reused from CMuleListCtrl so the persisted "TableOrderingSearch"
+// config entries stay wire-compatible (see ListColumnStore.cpp, which hardcodes the same values).
+namespace
+{
+const unsigned SORT_DES = 0x1000;
+const unsigned SORT_ALT = 0x2000;
+const unsigned SORTING_MASK = 0x3000;
+} // namespace
 
 CSearchListCtrl::CSearchListCtrl(
-	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_filterKnown(false),
-m_invert(false),
-m_filterEnabled(false)
+	wxWindow *parent, wxWindowID winid, const wxPoint &pos, const wxSize &size, const wxString &name)
+: CMuleDataViewCtrl(parent, winid, pos, size, 0, name)
+, m_nResultsID(0)
+, m_browseEcid(0)
+, m_browseStatus(0)
+, m_filterKnown(false)
+, m_invert(false)
+, m_filterEnabled(false)
 {
-	// Setting the sorter function.
-	SetSortFunc( SortProc );
-
-	InsertColumn( ID_SEARCH_COL_NAME,    _("File Name"), wxLIST_FORMAT_LEFT, 500, "N" );
-	InsertColumn( ID_SEARCH_COL_SIZE,    _("Size"),      wxLIST_FORMAT_LEFT, 100, "Z" );
-	InsertColumn( ID_SEARCH_COL_SOURCES, _("Sources"),   wxLIST_FORMAT_LEFT,  50, "u" );
-	InsertColumn( ID_SEARCH_COL_TYPE,    _("Type"),      wxLIST_FORMAT_LEFT,  65, "Y" );
-	InsertColumn( ID_SEARCH_COL_FILEID,  _("FileID"),    wxLIST_FORMAT_LEFT, 280, "I" );
-	InsertColumn( ID_SEARCH_COL_STATUS,  _("Status"),    wxLIST_FORMAT_LEFT, 100, "S" );
-	// Media tag columns: ed2k/Kad publishers (eMule, eMule AI, aMule) can
-	// advertise per-file media metadata in FT_MEDIA_LENGTH / _BITRATE /
-	// _CODEC. Display them as columns when present; cells stay empty for
-	// non-media results or for files whose owner didn't populate the tags.
-	InsertColumn( ID_SEARCH_COL_LENGTH,  _("Length"),  wxLIST_FORMAT_LEFT,  80, "L" );
-	InsertColumn( ID_SEARCH_COL_BITRATE, _("Bitrate"), wxLIST_FORMAT_LEFT,  80, "B" );
-	InsertColumn( ID_SEARCH_COL_CODEC,   _("Codec"),   wxLIST_FORMAT_LEFT,  80, "C" );
-	// Directories is almost always empty (only populated when the result
-	// came from a "view shared files" request, rare in practice), so put
-	// it at the end with the other usually-empty columns.
-	InsertColumn( ID_SEARCH_COL_DIRECTORY,  _("Directories"),    wxLIST_FORMAT_LEFT, 280, "D" );  // I would have preferred "Directory" but this is already translated
-
-	m_nResultsID = 0;
+	// Without this, idle events are not guaranteed to reach this window (wx's default idle-
+	// processing mode only visits windows opted in this way), so OnIdle's column-resize
+	// detection -- the only way this control learns about a drag-resize, there being no
+	// portable wxDataViewCtrl "column resized" event -- would silently never fire.
+	SetExtraStyle(GetExtraStyle() | wxWS_EX_PROCESS_IDLE);
+
+	m_model = new CSearchListModel(this);
+	AssociateModel(m_model);
+	m_model->DecRef(); // the control now holds the only reference
+
+	AddTextColumn(_("File Name"),
+		CSearchListModel::COL_NAME,
+		"N",
+		500,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	AddTextColumn(_("Size"),
+		CSearchListModel::COL_SIZE,
+		"Z",
+		100,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	AddTextColumn(_("Sources"),
+		CSearchListModel::COL_SOURCES,
+		"u",
+		50,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	AddTextColumn(_("Type"),
+		CSearchListModel::COL_TYPE,
+		"Y",
+		65,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	// Rating: smiley icon + text label in one cell.
+	AddIconTextColumn(_("Rating"),
+		CSearchListModel::COL_RATING,
+		"R",
+		120,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	AddTextColumn(_("FileID"),
+		CSearchListModel::COL_FILEID,
+		"I",
+		280,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	AddTextColumn(_("Status"),
+		CSearchListModel::COL_STATUS,
+		"S",
+		100,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	// Media tag columns: ed2k/Kad publishers (eMule, eMule AI, aMule) can advertise per-file
+	// media metadata in FT_MEDIA_LENGTH / _BITRATE / _CODEC / _ARTIST / _ALBUM / _TITLE. Cells
+	// stay empty for non-media results.
+	AddTextColumn(_("Length"),
+		CSearchListModel::COL_LENGTH,
+		"L",
+		80,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	AddTextColumn(_("Bitrate"),
+		CSearchListModel::COL_BITRATE,
+		"B",
+		80,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	AddTextColumn(_("Codec"),
+		CSearchListModel::COL_CODEC,
+		"C",
+		80,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	// Visible like the three media columns above rather than hidden like the shared-files
+	// list's: a search result is read once, and a user hunting a track by artist wants the
+	// answer without opening the column picker.
+	AddTextColumn(_("Artist"),
+		CSearchListModel::COL_ARTIST,
+		"a",
+		120,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	AddTextColumn(_("Album"),
+		CSearchListModel::COL_ALBUM,
+		"b",
+		120,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	AddTextColumn(_("Title"),
+		CSearchListModel::COL_TITLE,
+		"t",
+		140,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+	// Directories is almost always empty (only populated when the result came from a "view
+	// shared files" request, rare in practice), so it goes at the end with the other usually-
+	// empty columns.
+	AddTextColumn(_("Directories"), // I would have preferred "Directory" but this is already translated
+		CSearchListModel::COL_DIRECTORY,
+		"D",
+		280,
+		wxALIGN_LEFT,
+		wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+
+	// Absorbs the macOS trailing-column sizing; the model answers COL_SPACER
+	// with an empty string.
+	AppendSpacerColumn(CSearchListModel::COL_SPACER);
+
+	// Default sort is by name, ascending.
+	m_sort_orders.emplace_back(CSearchListModel::COL_NAME, 0);
+	ShowSortCaret(CSearchListModel::COL_NAME, 0);
 
 	// Only load settings for first list, otherwise sync with current lists
-	if ( s_lists.empty() ) {
-		// Set the name to enable loading of settings
-		SetTableName( "Search" );
-
-		LoadSettings();
-
-		// Unset the name to avoid the settings getting saved every time a list is closed
-		SetTableName( "" );
+	if (s_lists.empty()) {
+		m_columnStore.SetTableName("Search");
+		LoadColumnSettings();
+		m_columnStore.SetTableName("");
 	} else {
-		// Sync this list with one of the others
-		SyncLists( s_lists.front(), this );
+		SyncLists(s_lists.front(), this);
 	}
 
-	// Add the list so that it will be synced with the other lists
-	s_lists.push_back( this );
-}
-
+	InitColumnState();
 
-wxString CSearchListCtrl::GetOldColumnOrder() const
-{
-	return "N,Z,u,Y,I,S";
+	s_lists.push_back(this);
 }
 
-
 CSearchListCtrl::~CSearchListCtrl()
 {
-	std::list<CSearchListCtrl*>::iterator it = std::find( s_lists.begin(), s_lists.end(), this );
+	// Push this list's widths/sort state onward before it is gone, so whichever tab is closed
+	// LAST -- the one that reaches SaveColumnSettings() below -- reflects the most recently
+	// touched state, whichever tab was resized. Does not depend on the idle-driven live sync
+	// having fired: that only keeps simultaneously-open tabs visually in step.
+	SyncOtherLists(this);
 
-	if ( it != s_lists.end() )
-		s_lists.erase( it );
+	s_lists.remove(this);
 
 	// We only save the settings if the last list was closed
-	if ( s_lists.empty() ) {
-		// In order to get the settings saved, we need to set the name
-		SetTableName( "Search" );
+	if (s_lists.empty()) {
+		m_columnStore.SetTableName("Search");
+		SaveColumnSettings();
 	}
 }
 
-
-void CSearchListCtrl::AddResult(CSearchFile* toshow)
+bool CSearchListCtrl::PassesFilter(const CSearchFile *file) const
 {
-	wxCHECK_RET(toshow->GetSearchID() == m_nResultsID, "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 (parent && !parent->ShowChildren()) {
-		return;
-	} else if (!IsFiltered(toshow)) {
-		if (toshow->HasChildren() && toshow->ShowChildren()) {
-			// Only filter the parent if none of the children are shown.
-			bool foundChild = false;
-			const CSearchResultList& children = toshow->GetChildren();
-			for (size_t i = 0; i < children.size(); ++i) {
-				if (IsFiltered(children.at(i))) {
-					foundChild = true;
-					break;
-				}
-			}
-
-			if (!foundChild) {
-				// No children left, and the parent is filtered.
-				m_filteredOut.push_back(toshow);
-				return;
-			}
-		} else {
-			m_filteredOut.push_back(toshow);
-			return;
-		}
-	}
+	return IsFiltered(file);
+}
 
-	// Insert the item before the item found by the search
-	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__
-	{
-		if (newid > 0) {
-			CSearchFile* before = reinterpret_cast<CSearchFile*>(GetItemData(newid - 1));
-			wxASSERT(before);
-			if (parent) {
-				wxASSERT((before->GetParent() == parent) || (before == parent));
-			} else {
-				wxASSERT(before->GetParent() != toshow);
-			}
-		}
+bool CSearchListCtrl::IsFiltered(const CSearchFile *file) const
+{
+	// By default everything is displayed. Despite the name (kept from the
+	// wxListCtrl-era code) true means "passes the filter, should be shown".
+	bool result = true;
 
-		if ((int)newid < GetItemCount() - 1) {
-			CSearchFile* after = reinterpret_cast<CSearchFile*>(GetItemData(newid + 1));
-			wxASSERT(after);
-			if (parent) {
-				wxASSERT((after->GetParent() == parent) || (!after->GetParent()));
-			} else {
-				wxASSERT((after->GetParent() == toshow) || (!after->GetParent()));
-			}
+	if (m_filterEnabled && m_filter.IsValid()) {
+		result = m_filter.Matches(file->GetFileName().GetPrintable());
+		result = ((result && !m_invert) || (!result && m_invert));
+		if (result && m_filterKnown) {
+			// Still a live status test, so results that were already known stay hidden
+			// -- but never for the ones the user just queued from this list, which
+			// would otherwise disappear under the click that queued them (see
+			// m_userQueued).
+			const bool queuedHere = m_userQueued.count(file->GetFileHash()) != 0;
+			result = queuedHere || file->GetDownloadStatus() == CSearchFile::NEW;
 		}
 	}
-#endif
-
-	SetItemPtrData(newid, toshowdata);
 
-	// Filesize
-	SetItem(newid, ID_SEARCH_COL_SIZE, CastItoXBytes( toshow->GetFileSize() ) );
+	return result;
+}
 
-	// Source count
-	wxString temp = CFormat("%d") % toshow->GetSourceCount();
-	if (toshow->GetCompleteSourceCount()) {
-		temp += CFormat(" (%d)") % toshow->GetCompleteSourceCount();
-	}
-	if (toshow->GetClientsCount()) {
-		temp += CFormat(" %d") % toshow->GetClientsCount();
+bool CSearchListCtrl::ShouldShow(const CSearchFile *file) const
+{
+	if (IsFiltered(file)) {
+		return true;
 	}
-#if defined(__DEBUG__) && !defined(CLIENT_GUI)
-	if (toshow->GetKadPublishInfo() == 0) {
-		temp += " | -";
-	} else {
-		temp += CFormat(" | N:%u, P:%u, T:%0.2f")
-			% ((toshow->GetKadPublishInfo() & 0xFF000000) >> 24)
-			% ((toshow->GetKadPublishInfo() & 0x00FF0000) >> 16)
-			% ((toshow->GetKadPublishInfo() & 0x0000FFFF) / 100.0);
+	// A parent that does not itself pass the filter is still shown as a container if at least
+	// one child does, whether or not it is expanded. The old hand-drawn-tree version only kept
+	// such a parent visible while its children were already expanded-shown; with a real tree
+	// control there is no reason to couple filtering to transient expand state.
+	const CSearchResultList &children = file->GetChildren();
+	for (const CSearchFile *child : children) {
+		if (IsFiltered(child)) {
+			return true;
+		}
 	}
-#endif
-	SetItem( newid, ID_SEARCH_COL_SOURCES, temp );
+	return false;
+}
 
-	// File-type
-	SetItem( newid, ID_SEARCH_COL_TYPE, GetFiletypeByName( toshow->GetFileName() ) );
+void CSearchListCtrl::AddResult(CSearchFile *toshow)
+{
+	wxCHECK_RET(toshow->GetSearchID() == m_nResultsID, "Wrong search-id for result-list");
+	m_model->NotifyFileAdded(toshow);
+}
 
-	// File-hash
-	SetItem(newid, ID_SEARCH_COL_FILEID, toshow->GetFileHash().Encode() );
+void CSearchListCtrl::UpdateResult(CSearchFile *toupdate)
+{
+	m_model->NotifyFileUpdated(toupdate);
+}
 
-	// File status
-	SetItem(newid, ID_SEARCH_COL_STATUS, DetermineStatusPrintable(toshow));
+void CSearchListCtrl::ShowResults(wxUIntPtr ResultsID)
+{
+	m_nResultsID = ResultsID;
+	// Different result set entirely; nothing kept for the old one applies.
+	m_userQueued.clear();
+	m_model->NotifyFilterChanged(); // full reset: new search-id, entirely different result set
+}
 
-	// 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());
+void CSearchListCtrl::SetFilter(const wxString &regExp, bool invert, bool filterKnown)
+{
+	m_filterText = regExp.IsEmpty() ? wxString(".*") : regExp;
+	m_filter.Compile(m_filterText, wxRE_DEFAULT | wxRE_ICASE);
+	m_filterKnown = filterKnown;
+	m_invert = invert;
+	// Re-applying the filter is the point at which the user asked to see the list filtered
+	// afresh, so the rows held over from earlier downloads collapse away here rather than
+	// lingering for the rest of the session.
+	m_userQueued.clear();
 
-	// Media tags (only set when the publishing client populated them):
-	if (uint32 lenSec = toshow->GetIntTagValue(FT_MEDIA_LENGTH)) {
-		SetItem(newid, ID_SEARCH_COL_LENGTH, CastSecondsToHM(lenSec));
-	}
-	if (uint32 bitrate = toshow->GetIntTagValue(FT_MEDIA_BITRATE)) {
-		SetItem(newid, ID_SEARCH_COL_BITRATE,
-			CFormat(wxT("%u kbps")) % bitrate);
-	}
-	const wxString& codec = toshow->GetStrTagValue(FT_MEDIA_CODEC);
-	if (!codec.IsEmpty()) {
-		SetItem(newid, ID_SEARCH_COL_CODEC, FormatMediaCodec(codec));
+	if (m_filterEnabled) {
+		m_model->NotifyFilterChanged();
 	}
-
-	// Set the color of the item
-	UpdateItemColor( newid );
 }
 
-
-void CSearchListCtrl::RemoveResult(CSearchFile* toremove)
+void CSearchListCtrl::EnableFiltering(bool enabled)
 {
-	ShowChildren(toremove, false);
+	if (enabled != m_filterEnabled) {
+		m_filterEnabled = enabled;
+		m_model->NotifyFilterChanged();
+	}
+}
 
-	long index = FindItem(-1, reinterpret_cast<wxUIntPtr>(toremove));
-	if (index != -1) {
-		DeleteItem(index);
-	} else {
-		ResultList::iterator it = std::find(m_filteredOut.begin(), m_filteredOut.end(), toremove);
-		if ( it != m_filteredOut.end()) {
-			m_filteredOut.erase(it);
+size_t CSearchListCtrl::GetHiddenItemCount() const
+{
+	if (!m_nResultsID) {
+		return 0;
+	}
+	size_t hidden = 0;
+	const CSearchResultList &results = theApp->searchlist->GetSearchResults(m_nResultsID);
+	// Only top-level results are indexed (see CSearchResultIndex), so this counts exactly the
+	// results the list would show but for the filter. A grouped child is never hidden in its
+	// own right: it is reached through its parent.
+	for (CSearchFile *file : results) {
+		if (!ShouldShow(file)) {
+			++hidden;
 		}
 	}
+	return hidden;
 }
 
-
-void CSearchListCtrl::UpdateResult(CSearchFile* toupdate)
+size_t CSearchListCtrl::GetItemCount() const
 {
-	long index = FindItem(-1, reinterpret_cast<wxUIntPtr>(toupdate));
-	if (index != -1) {
-		// Update the filename, which may be changed in case of multiple variants.
-		SetItem(index, ID_SEARCH_COL_NAME, toupdate->GetFileName().GetPrintable());
-
-		wxString temp = CFormat("%d") % toupdate->GetSourceCount();
-		if (toupdate->GetCompleteSourceCount()) {
-			temp += CFormat(" (%d)") % toupdate->GetCompleteSourceCount();
-		}
-		if (toupdate->GetClientsCount()) {
-			temp += CFormat(" %d") % toupdate->GetClientsCount();
-		}
-#if defined(__DEBUG__) && !defined(CLIENT_GUI)
-		if (toupdate->GetKadPublishInfo() == 0) {
-			temp += " | -";
-		} else {
-			temp += CFormat(" | N:%u, P:%u, T:%0.2f")
-				% ((toupdate->GetKadPublishInfo() & 0xFF000000) >> 24)
-				% ((toupdate->GetKadPublishInfo() & 0x00FF0000) >> 16)
-				% ((toupdate->GetKadPublishInfo() & 0x0000FFFF) / 100.0);
+	if (!m_nResultsID) {
+		return 0;
+	}
+	size_t shown = 0;
+	const CSearchResultList &results = theApp->searchlist->GetSearchResults(m_nResultsID);
+	// Results, not rows: one per top-level hit, whatever is expanded.
+	//
+	// Adding the children of expanded groups was right when the tab was a wxListCtrl and an
+	// expanded child really was another row. Under the data view children are model nodes,
+	// nothing recomputes the label on expand or collapse, and the tab reported whichever
+	// expansion state happened to be current when some unrelated event last refreshed it -- so
+	// two clients showing identical lists disagreed by exactly the children someone had opened.
+	//
+	// It also makes the label's arithmetic add up: GetHiddenItemCount() has always counted top-
+	// level results only.
+	for (CSearchFile *file : results) {
+		if (!file->GetParent() && ShouldShow(file)) {
+			++shown;
 		}
-#endif
-		SetItem(index, ID_SEARCH_COL_SOURCES, temp);
-
-		SetItem(index, ID_SEARCH_COL_STATUS, DetermineStatusPrintable(toupdate));
-
-		UpdateItemColor(index);
+	}
+	return shown;
+}
 
-		// Deletions of items causes rather large amount of flicker, so to
-		// avoid this, we resort the list to ensure correct ordering.
-		if (!IsItemSorted(index)) {
-			SortList();
+CSearchFile *CSearchListCtrl::GetFocusedFile() const
+{
+	wxDataViewItemArray selections;
+	GetSelections(selections);
+	// The first selected RESULT, not the first selected item: a folder picked up alongside one
+	// would otherwise make this give up, while GetSelectedItemCount() still enables the menu
+	// entry that calls it.
+	for (const wxDataViewItem &item : selections) {
+		if (!m_model->IsFolder(item)) {
+			return CSearchListModel::ToFile(item);
 		}
 	}
+	return nullptr;
 }
 
-
-void CSearchListCtrl::UpdateItemColor(long index)
+std::vector<CSearchFile *> CSearchListCtrl::GetSelectedFiles() const
 {
-	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);
-
-	if (GetItem(item)) {
-		CSearchFile* file = reinterpret_cast<CSearchFile*>(GetItemData(index));
-
-		// Theme-aware state palette. The previous logic started from
-		// wxSYS_COLOUR_WINDOWTEXT and overlaid per-channel tints
-		// (`green = 255`, `red = 255` etc.). On light themes the base
-		// is black so the tints produce green / red / magenta; on dark
-		// themes the base is white-ish, so setting a channel that is
-		// already 255 is a no-op and every state collapses to the same
-		// colour -- the cue was invisible. Two hand-tuned palettes
-		// instead, chosen at draw time via IsDark().
-		const bool isDark = wxSystemSettings::GetAppearance().IsDark();
-		wxColour colour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-
-		switch (file->GetDownloadStatus()) {
-		case CSearchFile::DOWNLOADED:
-			// Already downloaded -- green.
-			colour = isDark ? wxColour( 80, 220,  80) : wxColour(  0, 160,   0);
-			break;
-		case CSearchFile::QUEUED:
-		case CSearchFile::QUEUEDCANCELED:
-			// Currently downloading (or was, then cancelled) -- red.
-			colour = isDark ? wxColour(255, 100, 100) : wxColour(220,   0,   0);
-			break;
-		case CSearchFile::CANCELED:
-			// Cancelled -- magenta.
-			colour = isDark ? wxColour(255, 120, 200) : wxColour(180,   0, 180);
-			break;
-		default: {
-			// New result -- blue-tinted gradient by source count.
-			const int shift = std::min((int)file->GetSourceCount() * 5, 255);
-			colour = isDark ? wxColour(255 - shift, 255 - shift, 255)
-			                : wxColour(0,           0,           shift);
-			break;
+	wxDataViewItemArray selections;
+	GetSelections(selections);
+
+	std::vector<CSearchFile *> files;
+	files.reserve(selections.GetCount());
+	for (const wxDataViewItem &item : selections) {
+		if (m_model->IsFolder(item)) {
+			continue;
 		}
+		if (CSearchFile *file = CSearchListModel::ToFile(item)) {
+			files.push_back(file);
 		}
-
-		// don't forget to set the item data back...
-		wxListItem newitem;
-		newitem.SetId( index );
-		newitem.SetTextColour( colour );
-		SetItem( newitem );
 	}
+	return files;
 }
 
-
-void CSearchListCtrl::ShowResults( wxUIntPtr ResultsID )
+void CSearchListCtrl::SetBrowseEcid(uint32 ecid)
 {
-	DeleteAllItems();
-	m_nResultsID = ResultsID;
-	if (ResultsID) {
-		const CSearchResultList& list = theApp->searchlist->GetSearchResults(ResultsID);
-		for (unsigned int i = 0; i < list.size(); ++i) {
-			AddResult( listi );
-		}
+	const bool wasBrowse = IsBrowse();
+	m_browseEcid = ecid;
+
+	// Only on the transition into browsing. A re-browse of the same peer comes back through
+	// here with the same ECID, and swapping the model again would throw away the folders the
+	// user has open.
+	if (!ecid || wasBrowse) {
+		return;
 	}
-}
 
+	m_model = new CBrowseListModel(this);
+	AssociateModel(m_model);
+	m_model->DecRef(); // the control now holds the only reference
+}
 
-wxUIntPtr CSearchListCtrl::GetSearchId()
+int CSearchListCtrl::GetSelectedItemCount() const
 {
-	return m_nResultsID;
+	// Results, not rows. A browse tab has folders in the tree, and every caller is asking how
+	// many things it can act on, so counting a selected folder would enable an action with
+	// nothing behind it.
+	return static_cast<int>(GetSelectedFiles().size());
 }
 
-
-void CSearchListCtrl::SetFilter(const wxString& regExp, bool invert, bool filterKnown)
+namespace
 {
-	if (regExp.IsEmpty()) {
-		// Show everything
-		m_filterText = ".*";
-	} else {
-		m_filterText = regExp;
+// Media tag columns sort empty last whichever way the column is sorted, so the results that carry
+// the tag stay together rather than being buried under the ones that do not. Shared by all four.
+int CompareMediaStr(const wxString &a, const wxString &b, int modifier)
+{
+	if (a.IsEmpty() && b.IsEmpty()) {
+		return 0;
 	}
-
-	m_filter.Compile(m_filterText, wxRE_DEFAULT | wxRE_ICASE);
-	m_filterKnown = filterKnown;
-	m_invert = invert;
-
-	if (m_filterEnabled) {
-		// Swap the list of filtered results so we can freely add new items to the list
-		ResultList curFiltered;
-		std::swap(curFiltered, m_filteredOut);
-
-		// Filter items already on the list
-		for (int i = 0; i < GetItemCount();) {
-			CSearchFile* file = reinterpret_cast<CSearchFile*>(GetItemData(i));
-
-			if (IsFiltered(file)) {
-				++i;
-			} else {
-				m_filteredOut.push_back(file);
-				DeleteItem(i);
-			}
-		}
-
-		// Check the previously filtered items.
-		ResultList::iterator it = curFiltered.begin();
-		for (; it != curFiltered.end(); ++it) {
-			if (IsFiltered(*it)) {
-				AddResult(*it);
-			} else {
-				m_filteredOut.push_back(*it);
-			}
-		}
+	if (a.IsEmpty()) {
+		return 1;
+	}
+	if (b.IsEmpty()) {
+		return -1;
 	}
+	return modifier * CmpAny(a, b);
 }
+} // namespace
 
-
-void CSearchListCtrl::EnableFiltering(bool enabled)
+int CSearchListCtrl::CompareFilesByColumn(
+	const CSearchFile *f1, const CSearchFile *f2, unsigned column, bool alt, int modifier) const
 {
-	if (enabled != m_filterEnabled) {
-		m_filterEnabled = enabled;
+	switch (column) {
+	case CSearchListModel::COL_NAME:
+		return modifier * CmpAny(f1->GetFileName(), f2->GetFileName());
 
-		if (enabled) {
-			SetFilter(m_filterText, m_invert, m_filterKnown);
-		} else {
-			ResultList::iterator it = m_filteredOut.begin();
-			for (; it != m_filteredOut.end(); ++it) {
-				AddResult(*it);
-			}
+	case CSearchListModel::COL_SIZE:
+		return modifier * CmpAny(f1->GetFileSize(), f2->GetFileSize());
 
-			m_filteredOut.clear();
+	case CSearchListModel::COL_SOURCES: {
+		int cmp = CmpAny(f1->GetSourceCount(), f2->GetSourceCount());
+		int cmp2 = CmpAny(f1->GetCompleteSourceCount(), f2->GetCompleteSourceCount());
+		if (alt) {
+			std::swap(cmp, cmp2);
+		}
+		if (cmp == 0) {
+			cmp = cmp2;
 		}
+		return modifier * cmp;
 	}
-}
 
+	case CSearchListModel::COL_TYPE: {
+		int result = GetFiletypeByName(f1->GetFileName()).Cmp(GetFiletypeByName(f2->GetFileName()));
+		if (result == 0) {
+			result = CmpAny(f1->GetFileName().GetExt(), f2->GetFileName().GetExt());
+		}
+		return modifier * result;
+	}
 
-size_t CSearchListCtrl::GetHiddenItemCount() const
-{
-	return m_filteredOut.size();
-}
+	case CSearchListModel::COL_RATING: {
+		int r1 = f1->HasRating() ? f1->UserRating() : 0;
+		int r2 = f2->HasRating() ? f2->UserRating() : 0;
+		if (!r1 && !r2) {
+			return 0;
+		}
+		if (!r1) {
+			return 1; // unrated always sorts last, direction-independent
+		}
+		if (!r2) {
+			return -1;
+		}
+		return modifier * CmpAny(r1, r2);
+	}
 
+	case CSearchListModel::COL_FILEID:
+		return modifier * CmpAny(f2->GetFileHash(), f1->GetFileHash());
 
-bool CSearchListCtrl::IsFiltered(const CSearchFile* file)
-{
-	// By default, everything is displayed
-	bool result = true;
+	case CSearchListModel::COL_STATUS:
+		return modifier * CmpAny(DetermineStatusPrintable(const_cast<CSearchFile *>(f2)),
+					  DetermineStatusPrintable(const_cast<CSearchFile *>(f1)));
 
-	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 = file->GetDownloadStatus() == CSearchFile::NEW;
+	case CSearchListModel::COL_DIRECTORY: {
+		int result = CmpAny(f1->GetDirectory(), f2->GetDirectory());
+		if (result == 0) {
+			result = CmpAny(f1->GetFileName(), f2->GetFileName());
 		}
+		return modifier * result;
 	}
 
-	return result;
-}
-
-
-int CSearchListCtrl::SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData)
-{
-	CSearchFile* file1 = reinterpret_cast<CSearchFile*>(item1);
-	CSearchFile* file2 = reinterpret_cast<CSearchFile*>(item2);
-
-	// Modifies the result, 1 for ascending, -1 for descending
-	int modifier = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
-	bool alternate = (sortData & CMuleListCtrl::SORT_ALT) != 0;
-
-	// Decide if which should files we should sort by.
-	wxUIntPtr parent1 = reinterpret_cast<wxUIntPtr>(file1->GetParent());
-	wxUIntPtr parent2 = reinterpret_cast<wxUIntPtr>(file2->GetParent());
-	wxUIntPtr filePtr1 = reinterpret_cast<wxUIntPtr>(file1);
-	wxUIntPtr filePtr2 = reinterpret_cast<wxUIntPtr>(file2);
-	if (parent1 && parent2) {
-		if (parent1 != parent2) {
-			return SortProc(parent1, parent2, sortData);
+	case CSearchListModel::COL_LENGTH: {
+		uint32 v1 = f1->GetIntTagValue(FT_MEDIA_LENGTH);
+		uint32 v2 = f2->GetIntTagValue(FT_MEDIA_LENGTH);
+		if (!v1 && !v2) {
+			return 0;
 		}
-	} else if (parent1) {
-		if (parent1 == filePtr2) {
+		if (!v1) {
 			return 1;
-		} else {
-			return SortProc(parent1, filePtr2, sortData);
 		}
-	} else if (parent2) {
-		if (parent2 == filePtr1) {
+		if (!v2) {
 			return -1;
-		} else {
-			return SortProc(filePtr1, parent2, sortData);
 		}
+		return modifier * CmpAny(v1, v2);
 	}
 
-	int result = 0;
-	switch (sortData & CMuleListCtrl::COLUMN_MASK) {
-		// Sort by filename
-		case ID_SEARCH_COL_NAME:
-			result = CmpAny(file1->GetFileName(), file2->GetFileName());
-			break;
-
-		// Sort file-size
-		case ID_SEARCH_COL_SIZE:
-			result = CmpAny( file1->GetFileSize(), file2->GetFileSize() );
-			break;
-
-		// Sort by sources
-		case ID_SEARCH_COL_SOURCES: {
-			int cmp = CmpAny( file1->GetSourceCount(), file2->GetSourceCount() );
-			int cmp2 = CmpAny( file1->GetCompleteSourceCount(), file2->GetCompleteSourceCount() );
+	case CSearchListModel::COL_BITRATE: {
+		uint32 v1 = f1->GetIntTagValue(FT_MEDIA_BITRATE);
+		uint32 v2 = f2->GetIntTagValue(FT_MEDIA_BITRATE);
+		if (!v1 && !v2) {
+			return 0;
+		}
+		if (!v1) {
+			return 1;
+		}
+		if (!v2) {
+			return -1;
+		}
+		return modifier * CmpAny(v1, v2);
+	}
 
-			if ( alternate ) {
-				// Swap criteria
-				int temp = cmp2;
-				cmp2 = cmp;
-				cmp = temp;
-			}
+	case CSearchListModel::COL_CODEC: {
+		const wxString c1 = FormatMediaCodec(f1->GetStrTagValue(FT_MEDIA_CODEC));
+		const wxString c2 = FormatMediaCodec(f2->GetStrTagValue(FT_MEDIA_CODEC));
+		return CompareMediaStr(c1, c2, modifier);
+	}
 
-			if ( cmp == 0 ) {
-				cmp = cmp2;
-			}
+	case CSearchListModel::COL_ARTIST:
+		return CompareMediaStr(
+			f1->GetStrTagValue(FT_MEDIA_ARTIST), f2->GetStrTagValue(FT_MEDIA_ARTIST), modifier);
 
-			result = cmp;
-			break;
-		}
+	case CSearchListModel::COL_ALBUM:
+		return CompareMediaStr(
+			f1->GetStrTagValue(FT_MEDIA_ALBUM), f2->GetStrTagValue(FT_MEDIA_ALBUM), modifier);
 
-		// Sort by file-types
-		case ID_SEARCH_COL_TYPE: {
-			result = GetFiletypeByName(file1->GetFileName()).Cmp(GetFiletypeByName(file2->GetFileName()));
-			if (result == 0) {
-				// Same file-type, sort by extension
-				result = CmpAny(file1->GetFileName().GetExt(), file2->GetFileName().GetExt());
-			}
+	case CSearchListModel::COL_TITLE:
+		return CompareMediaStr(
+			f1->GetStrTagValue(FT_MEDIA_TITLE), f2->GetStrTagValue(FT_MEDIA_TITLE), modifier);
+	}
 
-			break;
-		}
+	return 0;
+}
 
-		// Sort by file-hash
-		case ID_SEARCH_COL_FILEID:
-			result = CmpAny(file2->GetFileHash(), file1->GetFileHash());
-			break;
+int CSearchListCtrl::CompareFiles(const CSearchFile *f1, const CSearchFile *f2) const
+{
+	return CompareItems(CSearchListModel::ToItem(f1), CSearchListModel::ToItem(f2));
+}
 
-		// Sort by file status
-		case ID_SEARCH_COL_STATUS:
-			result = CmpAny(DetermineStatusPrintable(file2), DetermineStatusPrintable(file1));
-			break;
+bool CSearchListCtrl::AltSortAllowed(unsigned column) const
+{
+	return column == CSearchListModel::COL_SOURCES;
+}
 
-		// 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;
+void CSearchListCtrl::SyncLists(CSearchListCtrl *src, CSearchListCtrl *dst)
+{
+	wxCHECK_RET(src && dst, "NULL argument in SyncLists");
 
-		// Sort by media length / bitrate / codec. Files whose owner
-		// didn't populate the tag always cluster at the bottom of the
-		// list, regardless of ascending/descending direction — early
-		// returns bypass the `modifier *` flip at the end of the
-		// function so the undefined-at-bottom rule is direction-
-		// independent.
-		case ID_SEARCH_COL_LENGTH: {
-			uint32 v1 = file1->GetIntTagValue(FT_MEDIA_LENGTH);
-			uint32 v2 = file2->GetIntTagValue(FT_MEDIA_LENGTH);
-			if (!v1 && !v2) break;
-			if (!v1) return 1;
-			if (!v2) return -1;
-			result = CmpAny(v1, v2);
-			break;
+	for (unsigned i = 0; i < src->RealColumnCount(); ++i) {
+		// Hidden state has to travel with the width: copying width alone
+		// would leave the other tabs showing a column this one has hidden.
+		const int col = static_cast<int>(i);
+		const bool hidden = src->IsColumnHidden(col);
+		if (dst->IsColumnHidden(col) != hidden) {
+			dst->SetColumnHidden(col, hidden, src->GetColumn(i)->GetWidth());
 		}
-
-		case ID_SEARCH_COL_BITRATE: {
-			uint32 v1 = file1->GetIntTagValue(FT_MEDIA_BITRATE);
-			uint32 v2 = file2->GetIntTagValue(FT_MEDIA_BITRATE);
-			if (!v1 && !v2) break;
-			if (!v1) return 1;
-			if (!v2) return -1;
-			result = CmpAny(v1, v2);
-			break;
+		if (!hidden && dst->GetColumn(i)->GetWidth() != src->GetColumn(i)->GetWidth()) {
+			dst->GetColumn(i)->SetWidth(src->GetColumn(i)->GetWidth());
 		}
-
-		case ID_SEARCH_COL_CODEC: {
-			const wxString c1 = FormatMediaCodec(file1->GetStrTagValue(FT_MEDIA_CODEC));
-			const wxString c2 = FormatMediaCodec(file2->GetStrTagValue(FT_MEDIA_CODEC));
-			if (c1.IsEmpty() && c2.IsEmpty()) break;
-			if (c1.IsEmpty()) return 1;
-			if (c2.IsEmpty()) return -1;
-			result = CmpAny(c1, c2);
-			break;
+	}
+	dst->UpdateExpanderColumn();
+
+	// Re-baseline what dst's idle poll compares against, so the widths just written read as the
+	// status quo rather than as a drag the user made there. Without this the mirror echoes: dst
+	// notices "its" widths moved and mirrors them straight back.
+	//
+	// The echo does not die out on its own. GTK clamps a column to a minimum taken from its
+	// header and contents, so a width that fits one tab comes back wider in another holding
+	// different results, and the two hand it back and forth indefinitely. It showed up on
+	// columns empty in one of the tabs, since those are the ones whose clamped minimum differs
+	// (issue #1022).
+	dst->ResetKnownWidths();
+
+	if (dst->m_sort_orders.empty() || src->m_sort_orders.empty() ||
+		dst->m_sort_orders.front() != src->m_sort_orders.front()) {
+		dst->m_sort_orders = src->m_sort_orders;
+		if (!dst->m_sort_orders.empty()) {
+			const CColPair &primary = dst->m_sort_orders.front();
+			dst->ShowSortCaret(primary.first, primary.second);
+			dst->GetModel()->Resort();
 		}
 	}
-
-	return modifier * result;
 }
 
-
-void CSearchListCtrl::SetSorting(unsigned column, unsigned order)
+void CSearchListCtrl::SyncOtherLists(CSearchListCtrl *src)
 {
-	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 = reinterpret_cast<CSearchFile*>(GetItemData(i));
-		if (file->ShowChildren()) {
-			ShowChildren(file, false);
+	for (CSearchListCtrl *list : s_lists) {
+		if (list != src) {
+			SyncLists(src, list);
 		}
 	}
-
-	// Then do the sorting
-	CMuleListCtrl::SetSorting(column, order);
-	Thaw();
 }
 
+int CSearchListCtrl::CompareByColumn(const wxDataViewItem &item1,
+	const wxDataViewItem &item2,
+	unsigned column,
+	bool alt,
+	int modifier) const
+{
+	return CompareFilesByColumn(
+		CSearchListModel::ToFile(item1), CSearchListModel::ToFile(item2), column, alt, modifier);
+}
 
-void CSearchListCtrl::SyncLists( CSearchListCtrl* src, CSearchListCtrl* dst )
+void CSearchListCtrl::GetDisplayOrder(wxDataViewItemArray &ordered) const
 {
-	wxCHECK_RET(src && dst, "NULL argument in SyncLists");
+	std::vector<CSearchFile *> files;
+	BuildDisplayOrder(files);
 
-	// Column widths
-	for ( int i = 0; i < src->GetColumnCount(); i++ ) {
-		// We do this check since just setting the width causes a redraw
-		if ( dst->GetColumnWidth( i ) != src->GetColumnWidth( i ) ) {
-			dst->SetColumnWidth( i, src->GetColumnWidth( i ) );
-		}
+	ordered.Clear();
+	ordered.Alloc(files.size());
+	for (CSearchFile *file : files) {
+		ordered.Add(CSearchListModel::ToItem(file));
 	}
+}
 
-	// Sync sorting
-	unsigned column = src->GetSortColumn();
-	unsigned order  = src->GetSortOrder();
-	if (column != dst->GetSortColumn() || order != dst->GetSortOrder()) {
-		dst->SetSorting(column, order);
-	}
+wxString CSearchListCtrl::GetRowLabel(const wxDataViewItem &item) const
+{
+	return CSearchListModel::ToFile(item)->GetFileName().GetPrintable();
 }
 
+wxString CSearchListCtrl::GetOldColumnOrder() const
+{
+	return "N,Z,u,Y,I,S";
+}
 
-void CSearchListCtrl::SyncOtherLists(CSearchListCtrl *src)
+void CSearchListCtrl::SetBrowseStatus(uint32 status)
 {
-	std::list<CSearchListCtrl*>::iterator it;
+	// A re-browse reuses this tab (see CSearchDlg::EnsureBrowseTab), so the rebuild threshold
+	// has to start over with it. Left standing, the previous browse's final row count becomes
+	// the bar the new one never clears: every burst is skipped and the list stays empty until
+	// the browse finishes, which is the wait the throttle exists to avoid (issue #898).
+	if (status == BROWSE_IN_PROGRESS) {
+		m_lastRebuildRows = 0;
+	}
+	m_browseStatus = status;
+}
 
-	for (it = s_lists.begin(); it != s_lists.end(); ++it) {
-		if ((*it) != src) {
-			SyncLists( src, *it );
+void CSearchListCtrl::OnIdleHook()
+{
+	// One coalesced rebuild per idle for everything that arrived since the last one: mixing
+	// incremental Item* notifications with the full model reset a group formation needs left
+	// wxGTK's tree inconsistent, and only wxDataViewModel::Cleared() reliably makes the control
+	// re-derive container-ness.
+	//
+	// That is the fallback rather than the rule: arrivals are reported incrementally where the
+	// backends tolerate it. Cleared() throws away the control's own view state, so selection
+	// and expansion are captured and re-applied around it, or a result landing mid-search would
+	// deselect whatever the user had picked. Items are CSearchFile*, still valid across the
+	// rebuild; ones that went away are dropped by re-checking membership afterwards.
+	if (m_model->HasPending() && !m_model->HasPendingReset()) {
+		// Incremental batch: the control keeps its scroll position, selection and expanded
+		// rows, so there is nothing to preserve around it. This is the path a search takes
+		// while results stream in, which is why the list no longer jumps back to the top on
+		// every burst.
+		m_model->FlushPending();
+	} else if (m_model->HasPending()) {
+		// A browse still streaming in is rebuilt on a growth schedule rather than on every
+		// burst. The rebuild below is O(rows) and a browse arrives one directory at a time,
+		// so per-burst rebuilding is O(bursts x rows): browsing a 39,450-file share took
+		// 384 rebuilds totalling 232 seconds of blocked main loop (issue #898).
+		//
+		// Waiting for the row count to grow by half makes the rebuilds a geometric series,
+		// so their total is a small multiple of the final one -- about 25 instead of 384 --
+		// while results still appear as the browse runs. A finished or failed browse always
+		// falls through, so the last state is exact.
+		if (m_browseStatus == BROWSE_IN_PROGRESS) {
+			// Counted from the indexed result list, not the model: the model would have
+			// to walk its rows to answer, which is the O(rows) cost being avoided here.
+			const unsigned rows =
+				m_nResultsID
+					? (unsigned)theApp->searchlist->GetSearchResults(m_nResultsID).size()
+					: 0;
+			if (m_lastRebuildRows > 0 && rows < m_lastRebuildRows + m_lastRebuildRows / 2) {
+				return;
+			}
+			m_lastRebuildRows = rows;
+		} else {
+			m_lastRebuildRows = 0;
+		}
+
+		// The row the user is looking at, so the rebuild can be put back where they left
+		// it: Cleared() drops the view to the top, which on a running search is every idle.
+		// EnsureVisible() afterwards lands on the same row exactly, because the items here
+		// are CSearchFile pointers and stay nameable across the rebuild (the virtual lists
+		// cannot do this: their items are row numbers).
+		const wxDataViewItem topBefore = GetTopItem();
+
+		wxDataViewItemArray selected;
+		GetSelections(selected);
+		wxDataViewItemArray expanded;
+		{
+			wxDataViewItemArray roots;
+			m_model->GetChildren(wxDataViewItem(), roots);
+			for (size_t i = 0; i < roots.GetCount(); ++i) {
+				if (IsExpanded(rootsi)) {
+					expanded.Add(rootsi);
+				}
+			}
+		}
+
+		m_model->FlushPending();
+
+		wxDataViewItemArray live;
+		m_model->GetChildren(wxDataViewItem(), live);
+		for (size_t i = 0; i < expanded.GetCount(); ++i) {
+			if (live.Index(expandedi) != wxNOT_FOUND) {
+				Expand(expandedi);
+			}
+		}
+		wxDataViewItemArray restore;
+		for (size_t i = 0; i < selected.GetCount(); ++i) {
+			if (live.Index(selectedi) != wxNOT_FOUND) {
+				restore.Add(selectedi);
+			}
+		}
+		if (!restore.IsEmpty()) {
+			SetSelections(restore);
+		}
+
+		// After the selection, which does not move the view on any backend, so this has the
+		// last word on where the list sits. Checked against the live tree first, like
+		// everything else restored here.
+		if (topBefore.IsOk() && live.Index(topBefore) != wxNOT_FOUND) {
+			EnsureVisible(topBefore);
 		}
 	}
 }
 
+void CSearchListCtrl::OnColumnWidthsChanged()
+{
+	// The base persists the new widths; this list additionally mirrors them to
+	// the other open search tabs.
+	CMuleDataViewCtrl::OnColumnWidthsChanged();
+	SyncOtherLists(this);
+}
 
-void CSearchListCtrl::OnRightClick(wxListEvent& event)
+void CSearchListCtrl::OnSortingChanged()
 {
-	CheckSelection(event);
+	if (GetModel()) {
+		GetModel()->Resort();
+	}
+	SyncOtherLists(this);
+}
+
+void CSearchListCtrl::OnRightClick(wxDataViewEvent &event)
+{
+	// A folder row is not a result: none of the actions below apply to it, and
+	// GetSelectedItemCount() counts results, so it would otherwise get no menu at all.
+	// Remembered rather than re-derived when the handler runs, because a right-click does not
+	// select the row on every platform.
+	m_contextFolder = m_model->IsFolder(event.GetItem()) ? event.GetItem() : wxDataViewItem();
+	if (m_contextFolder.IsOk()) {
+		wxMenu menu;
+		menu.Append(MP_EXPANDALL, _("Expand all"));
+		menu.Append(MP_COLLAPSEALL, _("Collapse all"));
+		PopupMenu(&menu, event.GetPosition());
+		return;
+	}
 
 	if (GetSelectedItemCount()) {
-		// Create the popup-menu. No title — wxMenu's title parameter
-		// is the label rendered when the menu is attached to a parent
-		// menubar; for a context popup it's either invisible (wxOSX,
-		// classic wxGTK) or rendered as a non-clickable header (KDE
-		// Plasma 6 with Qt-themed GTK / Wayland, issue #767). The
-		// generic "File" label provides no information either way,
-		// so drop it.
+		// No title: wxMenu's title parameter renders inconsistently or not at all
+		// as a context-popup header across platforms (issue #767).
 		wxMenu menu;
 		menu.Append(MP_RESUME, _("Download"));
 
-		wxMenu* cats = new wxMenu(_("Category"));
+		wxMenu *cats = new wxMenu(_("Category"));
 		cats->Append(MP_ASSIGNCAT, _("Main"));
 		for (unsigned i = 1; i < theApp->glob_prefs->GetCatCount(); i++) {
-			cats->Append(MP_ASSIGNCAT + i,
+			cats->Append(MP_ASSIGNCAT + static_cast<int>(i),
 				theApp->glob_prefs->GetCategory(i)->title);
 		}
 
 		menu.Append(MP_MENU_CATS, _("Download in category"), cats);
 		menu.AppendSeparator();
 
-		const wxString & statsServer = thePrefs::GetStatsServerName();
+		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.Append(MP_GETCOMMENTS, _("Show all comments"));
 		menu.AppendSeparator();
-
-//#warning Uncomment this here to test the MP_MARK_AS_KNOWN feature. Beware! You are on your own here, this might break "known.met"
-#if 0
-		menu.Append(MP_MARK_AS_KNOWN, _("Mark as known file"));
-		menu.AppendSeparator();
-#endif
-
-		menu.Append(MP_GETED2KLINK, _("Copy eD2k link to clipboard"));
-
-		// These should only be enabled for single-selections
-		bool enable = (GetSelectedItemCount() == 1);
-		menu.Enable(MP_GETED2KLINK, enable);
+		// Singular or plural to match what it will copy, as the server list does.
+		// OnPopupGetUrl has always walked the whole selection and joined the links with
+		// newlines -- only the menu stopped it being handed more than one.
+		const bool single = (GetSelectedItemCount() == 1);
+		menu.Append(MP_GETED2KLINK,
+			single ? _("Copy eD2k link to clipboard") : _("Copy eD2k links to clipboard"));
+
+		// Comments stays single-only: it opens a modal dialog for one result.
+		menu.Enable(MP_GETCOMMENTS, single);
 		menu.Enable(MP_MENU_CATS, (theApp->glob_prefs->GetCatCount() > 1));
 
-		PopupMenu(&menu, event.GetPoint());
+		PopupMenu(&menu, event.GetPosition());
 	} else {
 		event.Skip();
 	}
 }
 
-
-void CSearchListCtrl::OnColumnLClick( wxListEvent& event )
-{
-	// Let the real event handler do its work first
-	CMuleListCtrl::OnColumnLClick( event );
-
-	SyncOtherLists( this );
-}
-
-
-void CSearchListCtrl::OnColumnResize( wxListEvent& WXUNUSED(event) )
+void CSearchListCtrl::OnItemActivated(wxDataViewEvent &event)
 {
-	SyncOtherLists( this );
+	CSearchFile *file = CSearchListModel::ToFile(event.GetItem());
+	if (!file) {
+		return;
+	}
+	if (file->HasChildren()) {
+		if (IsExpanded(event.GetItem())) {
+			Collapse(event.GetItem());
+		} else {
+			Expand(event.GetItem());
+		}
+	} else {
+		DownloadSelected();
+	}
 }
 
-
-void CSearchListCtrl::OnPopupGetUrl( wxCommandEvent& WXUNUSED(event) )
+void CSearchListCtrl::OnPopupGetUrl(wxCommandEvent &WXUNUSED(event))
 {
 	wxString URIs;
-
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-
-	while (index != -1) {
-		CSearchFile* file = reinterpret_cast<CSearchFile*>(GetItemData(index));
-
-		URIs += theApp->CreateED2kLink( file ) + "\n";
-
-		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	for (CSearchFile *file : GetSelectedFiles()) {
+		URIs += theApp->CreateED2kLink(file) + "\n";
 	}
-
 	if (!URIs.IsEmpty()) {
-		theApp->CopyTextToClipboard( URIs.RemoveLast() );
+		theApp->CopyTextToClipboard(URIs.RemoveLast());
 	}
 }
 
-
-void CSearchListCtrl::OnRazorStatsCheck( wxCommandEvent& WXUNUSED(event) )
+void CSearchListCtrl::SetSubtreeExpanded(const wxDataViewItem &item, bool expand)
 {
-	int item = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	if (item == -1) {
+	if (!item.IsOk()) {
 		return;
 	}
 
-	CSearchFile* file = reinterpret_cast<CSearchFile*>(GetItemData(item));
-	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) {
-		return;
+	// Parent first when opening, last when closing: a row cannot be
+	// expanded while an ancestor of it is still collapsed.
+	if (expand) {
+		Expand(item);
 	}
 
-	if (thePrefs::GetNetworkED2K() && theApp->serverconnect->GetCurrentServer() != NULL
-			&& theApp->serverconnect->GetCurrentServer()->GetRelatedSearchSupport()) {
+	wxDataViewItemArray children;
+	m_model->GetChildren(item, children);
+	for (const wxDataViewItem &child : children) {
+		if (m_model->IsFolder(child)) {
+			SetSubtreeExpanded(child, expand);
+		}
+	}
 
-		theApp->searchlist->StopSearch(true);
-		theApp->amuledlg->m_searchwnd->ResetControls();
-		wxString keyword("related");
-		do {
-			CSearchFile* file = reinterpret_cast<CSearchFile*>(GetItemData(item));
-			keyword << "::" << file->GetFileHash().Encode();
-			item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-		} while (item > -1);
-		CastByID( IDC_SEARCHNAME, theApp->amuledlg->m_searchwnd, wxTextCtrl )->SetValue(keyword);
-		wxChoice* searchtype = CastByID( ID_SEARCHTYPE, theApp->amuledlg->m_searchwnd, wxChoice );
-		searchtype->SetSelection(searchtype->FindString(_("Local")));
-		theApp->amuledlg->m_searchwnd->StartNewSearch();
-	} else {
-		wxMessageBox(_("You are not currently connected to a server supporting the Related Files search function"),
-				_("Search error"),
-				wxOK|wxCENTRE|wxICON_ERROR
-				);
-		return;
+	if (!expand) {
+		Collapse(item);
 	}
 }
 
-
-void CSearchListCtrl::OnMarkAsKnown( wxCommandEvent& WXUNUSED(event) )
+std::vector<wxDataViewItem> CSearchListCtrl::ContextFolders()
 {
-#ifndef CLIENT_GUI
-	long index = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	while (index > -1) {
-		CSearchFile *searchFile = reinterpret_cast<CSearchFile *>(GetItemData(index));
-		CKnownFile *knownFile(new CKnownFile(*searchFile));
-		theApp->knownfiles->SafeAddKFile(knownFile);
-		index = GetNextItem(index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	std::vector<wxDataViewItem> folders;
+	if (!m_contextFolder.IsOk()) {
+		return folders;
 	}
-#endif
-}
 
+	wxDataViewItemArray selection;
+	GetSelections(selection);
+
+	// The whole selection, but only when the row clicked is part of it: the rule a file manager
+	// follows, since right-clicking outside a selection addresses the row under the pointer. A
+	// right-click does not select on every platform, which is why m_contextFolder is remembered
+	// separately (see OnRightClick).
+	bool clicked_is_selected = false;
+	for (const wxDataViewItem &item : selection) {
+		if (item == m_contextFolder) {
+			clicked_is_selected = true;
+			break;
+		}
+	}
+	if (!clicked_is_selected) {
+		folders.push_back(m_contextFolder);
+		return folders;
+	}
 
-void CSearchListCtrl::OnPopupDownload(wxCommandEvent& event)
-{
-	if (event.GetId() == MP_RESUME) {
-		// Via the "Download" menu-item, use category specified in drop-down menu
-		DownloadSelected();
-	} else {
-		// Via an "Download in category" item
-		DownloadSelected(event.GetId() - MP_ASSIGNCAT);
+	for (const wxDataViewItem &item : selection) {
+		if (m_model->IsFolder(item)) {
+			folders.push_back(item);
+		}
+	}
+	// A selection of results with the click on a folder inside it: act on the
+	// folder, so the entry is never a no-op.
+	if (folders.empty()) {
+		folders.push_back(m_contextFolder);
 	}
+	return folders;
 }
 
-
-void CSearchListCtrl::OnItemActivated(wxListEvent& event)
+void CSearchListCtrl::OnExpandAll(wxCommandEvent &WXUNUSED(event))
 {
-	CSearchFile* file = reinterpret_cast<CSearchFile*>(GetItemData(event.GetIndex()));
-	if (file->HasChildren()) {
-		ShowChildren(file, !file->ShowChildren());
-	} else {
-		DownloadSelected();
+	// Every selected folder, not just the clicked one (issue #910 follow-up). Nesting needs no
+	// special case: a parent's subtree walk already covers a descendant that is also selected.
+	for (const wxDataViewItem &folder : ContextFolders()) {
+		SetSubtreeExpanded(folder, true);
 	}
 }
 
-
-bool CSearchListCtrl::AltSortAllowed(unsigned column) const
+void CSearchListCtrl::OnCollapseAll(wxCommandEvent &WXUNUSED(event))
 {
-	switch (column) {
-	case ID_SEARCH_COL_SOURCES:
-		return true;
-	default:
-		return false;
+	for (const wxDataViewItem &folder : ContextFolders()) {
+		SetSubtreeExpanded(folder, false);
 	}
 }
 
-
-void CSearchListCtrl::DownloadSelected(int category)
+void CSearchListCtrl::OnGetComments(wxCommandEvent &WXUNUSED(event))
 {
-	FindWindowById(IDC_SDOWNLOAD)->Enable(FALSE);
-
-	// Either the "Download" menu-item, the download-button, double-click or enter
-	if (category == -1) {
-		// Defaults to main category
-		category = 0;
-
-		if (CastByID(IDC_EXTENDEDSEARCHCHECK, NULL, wxCheckBox)->GetValue()) {
-			category = CastByID(ID_AUTOCATASSIGN, NULL, wxChoice)->GetSelection();
-		}
-	}
-
-	// Process all selections
-	long index = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	while (index > -1) {
-		CSearchFile* file = reinterpret_cast<CSearchFile*>(GetItemData(index));
-		CoreNotify_Search_Add_Download(file, category);
-		index = GetNextItem(index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	CSearchFile *file = GetFocusedFile();
+	if (file) {
+		// Same dialog the download list uses; its "Get from Kad" button drives
+		// the on-demand community ratings/comments lookup for this result.
+		CCommentDialogLst dialog(this, file);
+		dialog.ShowModal();
 	}
-	// Listcontrol gets updated by notification when download is started
 }
 
-
-static const wxBrush& GetBrush(wxSystemColour index)
+void CSearchListCtrl::OnRazorStatsCheck(wxCommandEvent &WXUNUSED(event))
 {
-	return CMuleColour(index).GetBrush();
+	CSearchFile *file = GetFocusedFile();
+	if (!file) {
+		return;
+	}
+	theApp->amuledlg->LaunchUrl(thePrefs::GetStatsServerURL() + file->GetFileHash().Encode());
 }
 
-
-void CSearchListCtrl::OnDrawItem(
-	int item, wxDC* dc, const wxRect& rect, const wxRect& rectHL, bool highlighted)
+void CSearchListCtrl::OnRelatedSearch(wxCommandEvent &WXUNUSED(event))
 {
-	CSearchFile* file = reinterpret_cast<CSearchFile*>(GetItemData(item));
-
-	// Define text-color and background
-	if (highlighted) {
-		if (GetFocus()) {
-			dc->SetBackground(GetBrush(wxSYS_COLOUR_HIGHLIGHT));
-			dc->SetTextForeground(CMuleColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
-		} else {
-			dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(CMuleColour::GetUnfocusedHighlight(), wxBRUSHSTYLE_SOLID)));
-			dc->SetTextForeground(CMuleColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
-		}
-	} else {
-		dc->SetBackground(GetBrush(wxSYS_COLOUR_LISTBOX));
-		dc->SetTextForeground(CMuleColour(wxSYS_COLOUR_WINDOWTEXT));
-	}
-
-	// Define the border of the drawn area
-	if (highlighted) {
-		dc->SetPen(*(wxThePenList->FindOrCreatePen(CMuleColour(dc->GetBackground().GetColour()).Blend(65), 1, wxPENSTYLE_SOLID)));
-	} else {
-		dc->SetPen(*wxTRANSPARENT_PEN);
-		dc->SetTextForeground(GetItemTextColour(item));
+	// Every selected result, not just the focused one: the keyword this
+	// builds is a "related" query over all of their hashes.
+	const std::vector<CSearchFile *> files = GetSelectedFiles();
+	if (files.empty()) {
+		return;
 	}
 
-	// Clear the background, not done automatically since the drawing is buffered.
-	dc->SetBrush( dc->GetBackground() );
-	dc->DrawRectangle( rectHL.x, rectHL.y, rectHL.width, rectHL.height );
-
-	// Various constant values we use
-	const int iTextOffset = ( rect.GetHeight() - dc->GetCharHeight() ) / 2;
-	const int iOffset = 4;
-	const int treeOffset = 11;
-	const int treeCenter = 6;
-	bool tree_show = false;
-
-	wxRect cur_rec(iOffset, rect.y, 0, rect.height );
-	for (int i = 0; i < GetColumnCount(); i++) {
-		wxListItem listitem;
-		GetColumn(i, listitem);
-
-		if ( listitem.GetWidth() > 0 ) {
-			cur_rec.width = listitem.GetWidth() - 2*iOffset;
-
-			// Make a copy of the current rectangle so we can apply specific tweaks
-			wxRect target_rec = cur_rec;
-
-			// will ensure that text is about in the middle ;)
-			target_rec.y += iTextOffset;
-
-			if (i == 0) {
-				if (file->HasChildren() || file->GetParent()) {
-					tree_show = (listitem.GetWidth() > 0);
-					target_rec.x += treeOffset;
-					target_rec.width -= treeOffset;
-
-					// Children are indented a bit
-					if (file->GetParent()) {
-						target_rec.x += 4;
-						target_rec.width -= 4;
-					}
-				}
-
-				// Check if the rating icon should be drawn
-				if (file->HasRating()) {
-					int image = Client_InvalidRating_Smiley + file->UserRating() - 1;
-
-					int imgWidth = 16;
-
-					theApp->amuledlg->m_imagelist.Draw(image, *dc, target_rec.GetX(),
-							target_rec.GetY() - 1, wxIMAGELIST_DRAW_TRANSPARENT);
-
-					// Move the text past the icon.
-					target_rec.x += imgWidth + 4;
-					target_rec.width -= imgWidth + 4;
-				}
-			}
-
-			wxListItem cellitem;
-			cellitem.SetColumn(i);
-			cellitem.SetId(item);
-
-			// Force clipper (clip 2 px more than the rectangle from the right side)
-			wxDCClipper clipper(*dc, target_rec.x, target_rec.y, target_rec.width - 2, target_rec.height);
-
-			if (GetItem(cellitem)) {
-				dc->DrawText(cellitem.GetText(), target_rec.GetX(), target_rec.GetY());
-			} else {
-				dc->DrawText("GetItem failed!", target_rec.GetX(), target_rec.GetY());
-			}
+	if (thePrefs::GetNetworkED2K() && theApp->serverconnect->GetCurrentServer() != NULL &&
+		theApp->serverconnect->GetCurrentServer()->GetRelatedSearchSupport()) {
 
-			// Increment to the next column
-			cur_rec.x += listitem.GetWidth();
+		theApp->searchlist->StopSearch(true);
+		theApp->amuledlg->m_searchwnd->ResetControls();
+		wxString keyword("related");
+		for (const CSearchFile *file : files) {
+			keyword << "::" << file->GetFileHash().Encode();
 		}
+		CastByID(IDC_SEARCHNAME, theApp->amuledlg->m_searchwnd, wxTextEntry)->SetValue(keyword);
+		wxChoice *searchtype = CastByID(ID_SEARCHTYPE, theApp->amuledlg->m_searchwnd, wxChoice);
+		searchtype->SetSelection(searchtype->FindString(_("Local")));
+		theApp->amuledlg->m_searchwnd->StartNewSearch();
+	} else {
+		wxMessageBox(_("You are not currently connected to a server supporting the Related Files "
+			       "search function"),
+			_("Search error"),
+			wxOK | wxCENTRE | wxICON_ERROR);
 	}
+}
 
-	// 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 && reinterpret_cast<CSearchFile*>(GetItemData(item + 1))->GetParent();
-		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, wxPENSTYLE_SOLID)) );
-
-		if (file->GetParent()) {
-			// Draw the line to the filename
-			dc->DrawLine(treeCenter, middle, treeOffset + 4, 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 (file->HasChildren()) {
-			if (file->ShowChildren()) {
-				// Draw empty circle
-				dc->SetBrush(*wxTRANSPARENT_BRUSH);
-			} else {
-				dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(GetItemTextColour(item))));
-			}
-
-			dc->DrawCircle( treeCenter, middle, 3 );
-
-			// Draw the line to the child node if there are any children
-			if (hasNext && file->ShowChildren()) {
-				dc->DrawLine(treeCenter, middle + 3, treeCenter, cur_rec.y + cur_rec.height + 1);
-			}
-		}
+void CSearchListCtrl::BuildDisplayOrder(std::vector<CSearchFile *> &ordered) const
+{
+	// The model yields top-level rows in arrival order, so they go through this list's own
+	// comparator -- the one CSearchListModel::Compare() uses -- to match what is on screen
+	// under the current sort. GetItemByRow()/GetRowByItem() would be the direct route but exist
+	// only in wx's generic implementation.
+	const auto byDisplayOrder = this(const CSearchFile *f1, const CSearchFile *f2) {
+		return CompareFiles(f1, f2) < 0;
+	};
+
+	wxDataViewItemArray roots;
+	m_model->GetChildren(wxDataViewItem(), roots);
+
+	std::vector<CSearchFile *> parents;
+	parents.reserve(roots.GetCount());
+	for (size_t i = 0; i < roots.GetCount(); ++i) {
+		parents.push_back(CSearchListModel::ToFile(rootsi));
 	}
-
-	// Sanity checks to ensure that results/children are properly positioned.
-#ifdef __WXDEBUG__
-	{
-		CSearchFile* parent = file->GetParent();
-
-		if (item > 0) {
-			CSearchFile* before = reinterpret_cast<CSearchFile*>(GetItemData(item - 1));
-			wxASSERT(before);
-			if (parent) {
-				wxASSERT((before->GetParent() == parent) || (before == parent));
-			} else {
-				wxASSERT(before->GetParent() != file);
-			}
+	std::sort(parents.begin(), parents.end(), byDisplayOrder);
+
+	// An expanded group's children occupy rows of their own, so they belong here too: callers
+	// count rows against what is on screen and select ranges of them. Leaving them out made a
+	// page overshoot and skipped every child in the range.
+	ordered.clear();
+	ordered.reserve(parents.size());
+	for (CSearchFile *parent : parents) {
+		ordered.push_back(parent);
+
+		const wxDataViewItem item = CSearchListModel::ToItem(parent);
+		if (!IsExpanded(item)) {
+			continue;
 		}
-
-		if (item < GetItemCount() - 1) {
-			CSearchFile* after = reinterpret_cast<CSearchFile*>(GetItemData(item + 1));
-			wxASSERT(after);
-			if (parent) {
-				wxASSERT((after->GetParent() == parent) || (!after->GetParent()));
-			} else {
-				wxASSERT((after->GetParent() == file) || (!after->GetParent()));
-			}
+		wxDataViewItemArray kids;
+		m_model->GetChildren(item, kids);
+		std::vector<CSearchFile *> children;
+		children.reserve(kids.GetCount());
+		for (size_t i = 0; i < kids.GetCount(); ++i) {
+			children.push_back(CSearchListModel::ToFile(kidsi));
 		}
+		std::sort(children.begin(), children.end(), byDisplayOrder);
+		ordered.insert(ordered.end(), children.begin(), children.end());
 	}
-#endif
 }
 
-
-void CSearchListCtrl::ShowChildren(CSearchFile* file, bool show)
+void CSearchListCtrl::OnPopupDownload(wxCommandEvent &event)
 {
-	Freeze();
+	if (event.GetId() == MP_RESUME) {
+		DownloadSelected();
+	} else {
+		DownloadSelected(event.GetId() - MP_ASSIGNCAT);
+	}
+}
 
-	file->SetShowChildren(show);
+void CSearchListCtrl::DownloadSelected(int category)
+{
+	FindWindowById(IDC_SDOWNLOAD)->Enable(false);
 
-	const CSearchResultList& results = file->GetChildren();
-	for (size_t i = 0; i < results.size(); ++i) {
-		if (show) {
-			AddResult(resultsi);
-		} else {
-			RemoveResult(resultsi);
-		}
+	// -1 means "no explicit category", i.e. anything but the right-click "Download in category"
+	// action, which passes one and must keep winning. The panel's selector used to be read only
+	// while the Extended Parameters checkbox was ticked, because it lived inside that row, so
+	// unticking the row silently sent the download to Main instead (issue #979).
+	if (category == -1) {
+		category = CastByID(ID_AUTOCATASSIGN, NULL, wxChoice)->GetSelection();
 	}
 
-	Thaw();
-}
+#ifndef CLIENT_GUI
+	// Monolithic: Search_Add_Download runs synchronously on this thread, so each file's
+	// Notify_DownloadCtrlAddFile -> AddFile fires a per-item resort inline. Batch the selection
+	// into a single sort + repaint (issue #615). The remote GUI's adds arrive via the download-
+	// queue poll, which already batches.
+	CDownloadListCtrl *downloadlist = theApp->amuledlg->m_transferwnd->downloadlistctrl;
+	downloadlist->BeginBatchUpdate();
+#endif
 
+	for (CSearchFile *file : GetSelectedFiles()) {
+		// Exempt from "Hide Known Files" before queueing, so the row survives the status
+		// change this is about to cause. Results are grouped only when their hashes match,
+		// so the one insert covers a group's variants too.
+		m_userQueued.insert(file->GetFileHash());
+		CoreNotify_Search_Add_Download(file, category);
+	}
 
-wxString CSearchListCtrl::GetTTSText(unsigned item) const
-{
-	return GetItemText(item);
+#ifndef CLIENT_GUI
+	downloadlist->EndBatchUpdate();
+#endif
+	// List gets updated by notification when download is started
 }
 
-
 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");
 	}
 }

amule-3.0.1.tar.gz/src/SearchListCtrl.h -> amule-3.1.0.tar.gz/src/SearchListCtrl.h Changed

@@ -26,276 +26,264 @@
 #ifndef SEARCHLISTCTRL_H
 #define SEARCHLISTCTRL_H
 
+#include <wx/colour.h>        // Needed for wxColour
+#include "MuleDataViewCtrl.h" // Needed for CMuleDataViewCtrl
+#include <wx/regex.h>         // Needed for wxRegExp
 
-#include <wx/colour.h>		// Needed for wxColour
-#include <wx/regex.h>		// Needed for wxRegExp
-
-#include "MuleListCtrl.h"	// Needed for CMuleListCtrl
+#include "ListColumnStore.h" // Needed for CListColumnStore, IColumnWidthProvider
+#include "MD4Hash.h"         // Needed for CMD4Hash (known-files filter set)
+#include "Types.h"           // Needed for uint32
 
+#include <list>
+#include <set> // Needed for std::set (known-files filter set)
+#include <utility>
+#include <vector>
 
 class CSearchList;
 class CSearchFile;
-
+class CSearchListModel;
 
 /**
- * This class is used to display search results.
+ * Displays search results.
  *
- * Results on added to the list will be colored according to
- * the number of sources and other parameters (see UpdateColor).
+ * Rows are coloured by source count and other parameters (see CSearchListModel::GetAttr). Call
+ * ShowResults() first to display the results of a given id; only then do AddResult() and
+ * UpdateResult() work.
  *
- * To display results, first use the ShowResults function, which will display
- * all current results with the specified id and afterwards you can use the
- * AddResult function to add new results or the UpdateResult function to update
- * already present results. Please note that it is not possible to add results
- * with the AddResult function before calling ShowResults.
+ * Backed by a wxDataViewCtrl (native tree control) rather than a wxListCtrl, for screen-reader
+ * accessibility (#180). Parent/child grouping (same file from several sources) is exposed through
+ * CSearchListModel's native tree interface, driven straight from
+ * CSearchFile::GetParent()/GetChildren(); expand/collapse state belongs to the control
+ * (IsExpanded()), unlike the old hand-drawn tree that faked it with CSearchFile::ShowChildren()
+ * plus manual row insertion.
  */
-class CSearchListCtrl : public CMuleListCtrl
+class CSearchListCtrl : public CMuleDataViewCtrl
 {
 public:
-	/**
-	 * Constructor.
-	 *
-	 * @see CMuleListCtrl::CMuleListCtrl for documentation of parameters.
-	 */
-	 CSearchListCtrl(
-	            wxWindow *parent,
-                wxWindowID winid = -1,
-                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
-                long style = wxLC_ICON,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = "mulelistctrl" );
+	CSearchListCtrl(wxWindow *parent,
+		wxWindowID winid = -1,
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
+		const wxString &name = "searchlistctrl");
 
-	/**
-	 * Destructor.
-	 */
 	virtual ~CSearchListCtrl();
 
-	/**
-	 * Adds the specified file to the list.
-	 *
-	 * @param The new result to be shown.
-	 *
-	 * Please note that no duplicates checking is done, so the pointer should
-	 * point to a new file in order to avoid problems. Also note that the result
-	 * will be inserted sorted according to current sort-type, so there is no
-	 * need to resort the list after adding new items.
-	 */
-	void	AddResult(CSearchFile* toshow);
+	/// Adds @a toshow to the list. No duplicate checking, so it must be a new result.
+	void AddResult(CSearchFile *toshow);
 
-	/**
-	 * Removes the specified file from the list.
-	 */
-	void	RemoveResult(CSearchFile* toshow);
+	/// Updates @a toupdate in the list.
+	void UpdateResult(CSearchFile *toupdate);
 
-	/**
-	 * Updates the specified source.
-	 *
-	 * @param The search result to be updated.
-	 */
-	void	UpdateResult(CSearchFile* toupdate);
+	/// Clears the list and shows the results with ID @a ResultsId; zero just resets it.
+	void ShowResults(wxUIntPtr ResultsId);
 
-	/**
-	 * Clears the list and inserts all results with the specified Id instead.
-	 *
-	 * @param nResult The ID of the results or Zero to simply reset the list.
-	 */
-	void	ShowResults( wxUIntPtr ResultsId );
+	wxUIntPtr GetSearchId() const { return m_nResultsID; }
 
-	/**
-	 * Updates the colors of item at the specified index.
-	 *
-	 * @param index The zero-based index of the item.
-	 *
-	 * 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);
-
-	/**
-	 * Returns the current Search Id.
-	 *
-	 * @return The Search Id of the displayed results (set through ShowResults()).
-	 */
-	wxUIntPtr	GetSearchId();
+	/// Re-key this control's search ID: the multi-search remote GUI remaps an optimistically-
+	/// created tab from its local ID to the daemon-allocated one once the START reply arrives.
+	void SetSearchId(wxUIntPtr id) { m_nResultsID = id; }
 
+	/// "View Files" (browse) tabs are keyed by the browsed peer's ECID, stable across a re-
+	/// browse and across a search-ID rekey, so a second browse of the same peer refreshes this
+	/// tab instead of opening a duplicate. 0 for an ordinary search tab.
+	uint32 GetBrowseEcid() const { return m_browseEcid; }
 	/**
-	 * Sets the filter which decides which results should be shown.
-	 *
-	 * @param regExp A regular expression targeting the filenames.
-	 * @param invert If true, invert the results of the filter-test.
-	 * @param filterKnown Should files that are queued or known be filtered out.
+	 * Marks this tab as browsing @a ecid, and swaps in the model that groups results by the
+	 * folders the peer reported.
 	 *
-	 * An invalid regExp will result in all results being displayed.
+	 * The model is chosen here, not in the constructor, because that is where the answer first
+	 * exists: CSearchDlg::EnsureBrowseTab creates an ordinary tab and only then says who it is
+	 * browsing, with no results yet to migrate. Defined in the .cpp: the swap needs
+	 * CBrowseListModel to be complete.
 	 */
-	void	SetFilter(const wxString& regExp, bool invert, bool filterKnown);
+	void SetBrowseEcid(uint32 ecid);
+	bool IsBrowse() const { return m_browseEcid != 0; }
 
-	/**
-	 * Toggles the use of filtering on and off.
-	 */
-	void	EnableFiltering(bool enabled);
+	// Peer display name and lifecycle (EBrowseStatus) for a browse tab. Held here so
+	// CSearchDlg::UpdateHitCount can recompose the tab label ("<peer> (N...)" receiving, "(N)"
+	// done, "(failed)") on any result or status change without re-parsing it.
+	const wxString &GetBrowseName() const { return m_browseName; }
+	void SetBrowseName(const wxString &name) { m_browseName = name; }
+	uint32 GetBrowseStatus() const { return m_browseStatus; }
+	/// Records the browse state, and restarts the rebuild throttle when a browse begins. In the
+	/// .cpp so this header need not pull in updownclient.h. See OnIdleHook().
+	void SetBrowseStatus(uint32 status);
 
-	/**
-	 * Returns the number of items hidden due to filtering.
-	 */
-	size_t	GetHiddenItemCount() const;
+	/// Sets the filter deciding which results are shown: @a regExp against the filename (an
+	/// invalid one shows everything), @a invert to reverse the test, @a filterKnown to drop
+	/// files that are queued or already known.
+	void SetFilter(const wxString &regExp, bool invert, bool filterKnown);
 
-	/**
-	 * Attempts to download all selected items, updating color-scheme as needed.
-	 *
-	 * @param category The target category, or -1 to use the drop-down selection.
-	 */
-	void	DownloadSelected(int category = -1);
+	/// Toggles filtering on and off.
+	void EnableFiltering(bool enabled);
 
-	static wxString DetermineStatusPrintable(CSearchFile *toshow);
+	/// Number of items hidden by the filter.
+	size_t GetHiddenItemCount() const;
 
-protected:
-	/// Return old column order.
-	wxString GetOldColumnOrder() const;
+	/// Number of results shown: one per top-level hit that passes the filter.
+	size_t GetItemCount() 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.
+	 * The selected result, or NULL if nothing is selected -- or if what is selected is not a
+	 * result at all.
 	 *
-	 * Note that attempting to sort a column in an unsupported order
-	 * is an illegal operation.
+	 * Every item here is a wxDataViewItem holding a bare pointer, and ToFile() turns one back
+	 * into a CSearchFile with an unchecked cast. A browse tab's tree also holds folder nodes,
+	 * and a handler that casts one anyway reads whatever is at that address. These two
+	 * accessors ask the model (IsFolder) first, so the question is answered in one place.
 	 */
-	void SetSorting(unsigned column, unsigned order);
+	CSearchFile *GetFocusedFile() const;
 
-protected:
-	typedef std::list<CSearchFile*> ResultList;
+	/// Every selected item that is a result, skipping any that are not.
+	/// @see GetFocusedFile
+	std::vector<CSearchFile *> GetSelectedFiles() const;
 
-	//! List used to store results that are hidden due to matching the filter.
-	ResultList	m_filteredOut;
+	/// Number of selected rows.
+	int GetSelectedItemCount() const;
 
-	//! The current filter reg-exp.
-	wxRegEx		m_filter;
+	/// Downloads every selected item into @a category, or into the drop-down's selection if -1.
+	void DownloadSelected(int category = -1);
 
-	//! The text from which the filter is compiled.
-	wxString	m_filterText;
-
-	//! Controls if shared/queued results should be shown.
-	bool		m_filterKnown;
-
-	//! Controls if the result of filter-hits should be inverted
-	bool		m_invert;
-
-	//! Specifies if filtering should be used
-	bool		m_filterEnabled;
+	static wxString DetermineStatusPrintable(CSearchFile *toshow);
 
-	/**
-	 * Returns true if the filename is filtered.
-	 */
-	bool	IsFiltered(const CSearchFile* file);
+	/// True if @a file passes this list's own filter test -- its own filename and known status,
+	/// NOT its children. CSearchListModel uses it to decide whether a row, or for a parent at
+	/// least one child, belongs in the tree.
+	bool PassesFilter(const CSearchFile *file) const;
 
 	/**
-	 * Sorter function used by wxListCtrl::SortItems function.
+	 * Whether a filter is in force, i.e. whether a row's visibility is a live function of its
+	 * values rather than a constant.
 	 *
-	 * @see CMuleListCtrl::SetSortFunc
-	 * @see wxListCtrl::SortItems
+	 * CSearchListModel asks before deciding how to report a change. With no filter every result
+	 * is shown, so an arrival is purely an addition and an update keeps its row; with a filter,
+	 * an update can make a row appear or disappear (m_filterKnown drops a result the moment its
+	 * download status stops being NEW), which only a full re-evaluation of the tree catches.
 	 */
-	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData);
+	bool HasActiveFilter() const { return m_filterEnabled && m_filter.IsValid(); }
 
-	/** @see CMuleListCtrl::AltSortAllowed */
-	virtual bool AltSortAllowed(unsigned column) const;
+	/// True if @a file belongs in the tree: it passes the filter itself, or for a parent at
+	/// least one child does, in which case the parent is shown as a container whether or not it
+	/// is expanded -- expand state is display-only and owned by the control, unlike the old
+	/// CSearchFile::ShowChildren().
+	bool ShouldShow(const CSearchFile *file) const;
 
-	/** @see CMuleListCtrl::GetTTSText */
-	virtual wxString GetTTSText(unsigned item) const;
+	/// Full multi-column comparison, walking this list's sort chain (primary column first, then
+	/// the secondary/tertiary columns set by earlier clicks). Used by
+	/// CSearchListModel::Compare().
+	int CompareFiles(const CSearchFile *f1, const CSearchFile *f2) const;
 
-	/**
-	 * Helper function which syncs two lists.
-	 *
-	 * @param src The source list.
-	 * @param dst The list to be synced with the source list.
-	 *
-	 * This function synchronises the following settings of two lists:
-	 *  - Sort column
-	 *  - Sort direction
-	 *  - Column widths
-	 *
-	 * If either sort column or direction is changed, then the dst list will
-	 * be resorted. This function is used to ensure that all results list act
-	 * as one, while still allowing individual selection.
-	 */
-	static void SyncLists( CSearchListCtrl* src, CSearchListCtrl* dst );
+protected:
+	//! Single-column comparison, no chain and no direction. wxDataViewModel::Compare() is only
+	//! ever asked to order true siblings, so grouping needs no parent recursion.
+	int CompareFilesByColumn(
+		const CSearchFile *f1, const CSearchFile *f2, unsigned column, bool alt, int modifier) const;
+
+	// --- CMuleDataViewCtrl hooks ---
+	int CompareByColumn(const wxDataViewItem &item1,
+		const wxDataViewItem &item2,
+		unsigned column,
+		bool alt,
+		int modifier) const override;
+	bool AltSortAllowed(unsigned column) const override;
+	void GetDisplayOrder(wxDataViewItemArray &ordered) const override;
+	wxString GetRowLabel(const wxDataViewItem &item) const override;
+	wxString GetOldColumnOrder() const override;
+	void OnIdleHook() override;
+	void OnColumnWidthsChanged() override;
+	void OnSortingChanged() override;
+
+	/// True if the filename passes the filter and the row should be shown. @see PassesFilter(),
+	/// the public wrapper the model uses.
+	bool IsFiltered(const CSearchFile *file) const;
 
 	/**
-	 * Helper function which syncs all other lists against the specified one.
-	 *
-	 * @param src The list which all other lists should be synced against.
-	 *
-	 * This function just calls SyncLists() on all lists in s_lists, using
-	 * the src argument as the src argument of the SyncLists function.
+	 * Syncs @a dst's sort column, sort direction and column widths from @a src, resorting @a
+	 * dst if the sort changed. Keeps every results list acting as one while still allowing
+	 * individual selection.
 	 */
-	static void SyncOtherLists( CSearchListCtrl* src );
+	static void SyncLists(CSearchListCtrl *src, CSearchListCtrl *dst);
+
+	/// Syncs every other list against @a src.
+	static void SyncOtherLists(CSearchListCtrl *src);
 
 	//! This list contains pointers to all current instances of CSearchListCtrl.
-	static std::list<CSearchListCtrl*> s_lists;
+	static std::list<CSearchListCtrl *> s_lists;
 
 	//! The ID of the search-results which the list is displaying or zero if unset.
 	wxUIntPtr m_nResultsID;
 
-	//! Custom drawing, needed to display children of search-results.
-	void OnDrawItem(int item, wxDC* dc, const wxRect& rect, const wxRect& rectHL, bool highlighted);
+	//! ECID of the browsed peer for a "View Files" tab, or 0 for a search tab.
+	uint32 m_browseEcid;
 
-	/**
-	 * Removes or adds child-entries for the given file.
-	 */
-	void ShowChildren(CSearchFile* file, bool show);
-
-	/**
-	 * Event handler for right mouse clicks.
-	 */
-	void OnRightClick( wxListEvent& event );
+	//! The folder the context menu was opened on, if any. A right-click does not select the row
+	//! on every platform, so the handlers cannot ask for the selection.
+	wxDataViewItem m_contextFolder;
+	//! Peer display name and lifecycle (EBrowseStatus) for a browse tab.
+	wxString m_browseName;
+	uint32 m_browseStatus;
+	//! Rows at the last rebuild while a browse was streaming; see OnIdleHook().
+	unsigned m_lastRebuildRows = 0;
 
-	/**
-	 * Event handler for double-clicks or enter.
-	 */
-	void OnItemActivated( wxListEvent& event );
+	//! The current filter reg-exp.
+	wxRegEx m_filter;
+	//! The text from which the filter is compiled.
+	wxString m_filterText;
+	//! Controls if shared/queued results should be shown.
+	bool m_filterKnown;
+	//! Controls if the result of filter-hits should be inverted.
+	bool m_invert;
+	//! Specifies if filtering should be used.
+	bool m_filterEnabled;
 
 	/**
-	 * Event handler for left-clicks on the column headers.
+	 * Results the user queued from this list, exempt from "Hide Known Files" until the filter
+	 * is applied again.
 	 *
-	 * This eventhandler takes care of sync'ing all the other lists with this one.
-	 */
-	void OnColumnLClick( wxListEvent& event );
-
-	/**
-	 * Event handler for resizing of the columns.
+	 * Queueing a result makes it known, and every result update resets the whole model (see
+	 * CSearchListModel::MarkDirty), so a plain status test re-runs immediately and the row
+	 * vanishes from under the click that queued it -- before the colour confirming the download
+	 * is ever visible, and leaving nothing on screen to say which results were taken (#756).
+	 * Listing them here holds those rows in place, in their queued colour, until SetFilter() or
+	 * ShowResults() clears the set.
 	 *
-	 * This eventhandler takes care of sync'ing all the other lists with this one.
+	 * Keyed on the user's action rather than on when a result became known: in amulegui every
+	 * result is constructed NEW and learns its real status from a later poll
+	 * (CSearchListRem::ProcessItemUpdate), so "was it known when it arrived" is not a question
+	 * the remote GUI can answer.
 	 */
-	void OnColumnResize( wxListEvent& event );
+	std::set<CMD4Hash> m_userQueued;
 
-	/**
-	 * Event handler for get-url menu items.
-	 */
-	void OnPopupGetUrl( wxCommandEvent& event );
+	void OnIdle(wxIdleEvent &event);
 
-	/**
-	 * Event handler for Razorback 2 stats menu items.
-	 */
-	void OnRazorStatsCheck( wxCommandEvent& event );
+	CSearchListModel *m_model;
 
-	/**
-	 * Event handler for related search.
-	 */
-	void OnRelatedSearch( wxCommandEvent& event );
+	void OnRightClick(wxDataViewEvent &event);
+	void OnItemActivated(wxDataViewEvent &event);
 
-	/**
-	 * Event handler for "mark as known".
-	 */
-	void OnMarkAsKnown( wxCommandEvent& event );
+	void OnPopupGetUrl(wxCommandEvent &event);
+	void OnRazorStatsCheck(wxCommandEvent &event);
+	void OnRelatedSearch(wxCommandEvent &event);
+	void OnGetComments(wxCommandEvent &event);
+	//! Folders the expand/collapse entries act on: the whole selection when the
+	//! clicked row belongs to it, otherwise just that row.
+	std::vector<wxDataViewItem> ContextFolders();
+	void OnExpandAll(wxCommandEvent &event);
+	void OnCollapseAll(wxCommandEvent &event);
 
 	/**
-	 * Event handler for download-file(s) menu item.
+	 * Expands or collapses @a item and everything under it. Only folders are containers worth
+	 * walking; a grouped result's children are alternative sources, and opening those wholesale
+	 * is not what "expand all" on a folder means.
 	 */
-	void OnPopupDownload( wxCommandEvent& event );
+	void SetSubtreeExpanded(const wxDataViewItem &item, bool expand);
+	void OnPopupDownload(wxCommandEvent &event);
+
+public:
+
+private:
+	//! Top-level rows in the order they are displayed under the current sort.
+	void BuildDisplayOrder(std::vector<CSearchFile *> &ordered) const;
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.1.0.tar.gz/src/SearchListModel.cpp Added

@@ -0,0 +1,436 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "SearchListModel.h"
+
+#include <algorithm>     // Needed for std::min, std::remove
+#include <unordered_map> // Needed for std::unordered_map (additions per parent)
+#include <unordered_set> // Needed for std::unordered_set (duplicate suppression)
+
+#include <common/Format.h> // Needed for CFormat
+#include <tags/FileTags.h> // Needed for FT_MEDIA_LENGTH / _BITRATE / _CODEC
+
+#include "amule.h"          // Needed for theApp
+#include "amuleDlg.h"       // Needed for CamuleDlg, Client_*_Smiley
+#include "MuleColour.h"     // Needed for IsListBackgroundDark
+#include "OtherFunctions.h" // Needed for CastItoXBytes, GetFiletypeByName, GetRateString, FormatMediaCodec
+#include "SearchDlg.h"      // Needed for CSearchListCtrl
+#include "SearchFile.h"     // Needed for CSearchFile
+#include "SearchList.h"     // Needed for CSearchList, CSearchResultList
+#include "SearchListCtrl.h"
+
+namespace
+{
+/**
+ * Whether arrivals may be reported to the control one at a time. Only on macOS, and only with no
+ * filter in force.
+ *
+ * The filter half is about correctness: m_filterKnown makes a row's visibility a live function of
+ * its download status, so a value change can require a row to appear or disappear, which only
+ * re-evaluating the tree catches.
+ *
+ * The platform half is about wx. Its GTK backend keeps its own mirror of the model's tree, and
+ * feeding this model's arrivals into it a notification at a time corrupts GtkTreeView's red-black
+ * tree outright --
+ *
+ *   gtkrbtree.c:471:_gtk_rbtree_insert_after:
+ *     assertion failed: (_gtk_rbtree_is_nil (tree->root))
+ *
+ * -- which aborts the application. That was first seen for ItemAdded() under a newly formed group;
+ * confining the incremental path to top-level additions and value changes did not avoid it, as the
+ * same abort came back from the root batch. PR #796 had already found that neither ItemChanged()
+ * nor a delete-and-re-add made GTK or MSW re-derive container-ness, and settled on Cleared() for
+ * that reason; two aborts from two different notifications say the constraint is broader than
+ * container-ness, so this stops trying to find the subset GTK tolerates.
+ *
+ * Native NSOutlineView keeps no such structure -- it re-queries the model as it draws, which is
+ * what masked the original #796 defect -- so it takes the incremental path happily, and that is
+ * where the scroll position was being lost on every burst of results.
+ *
+ * MSW is grouped with GTK deliberately: its generic implementation has tree bookkeeping of its own,
+ * it was never the platform this was tested on, and keeping today's behaviour there costs nothing
+ * but a repaint.
+ */
+bool IncrementalNotificationsUsable(const CSearchListCtrl *owner)
+{
+#ifdef __WXOSX__
+	return !owner->HasActiveFilter();
+#else
+	(void)owner;
+	return false;
+#endif
+}
+} // namespace
+
+std::set<CSearchListModel *> CSearchListModel::s_models;
+
+CSearchListModel::CSearchListModel(CSearchListCtrl *owner)
+: m_owner(owner)
+{
+	s_models.insert(this);
+}
+
+CSearchListModel::~CSearchListModel()
+{
+	s_models.erase(this);
+}
+
+void CSearchListModel::DropReferencesTo(CSearchFile *file)
+{
+	for (CSearchListModel *model : s_models) {
+		model->m_pendingAdded.erase(
+			std::remove(model->m_pendingAdded.begin(), model->m_pendingAdded.end(), file),
+			model->m_pendingAdded.end());
+		model->m_pendingChanged.erase(
+			std::remove(model->m_pendingChanged.begin(), model->m_pendingChanged.end(), file),
+			model->m_pendingChanged.end());
+		// A derived model may be holding this pointer in a cache of its own
+		// (CBrowseListModel files results under their folder), and this is the only signal
+		// it gets that the result has died.
+		++model->m_contentGeneration;
+	}
+}
+
+void CSearchListModel::NotifyFileAdded(CSearchFile *file)
+{
+	if (file == nullptr || !IncrementalNotificationsUsable(m_owner)) {
+		MarkDirty();
+		return;
+	}
+	m_pendingAdded.push_back(file);
+	++m_contentGeneration;
+}
+
+void CSearchListModel::NotifyFileUpdated(CSearchFile *file)
+{
+	if (file == nullptr || !IncrementalNotificationsUsable(m_owner)) {
+		MarkDirty();
+		return;
+	}
+	// Values, not membership -- but "hide known files" turns on a result's
+	// own status, so a change can move it in or out of the shown set.
+	m_pendingChanged.push_back(file);
+	++m_contentGeneration;
+}
+
+void CSearchListModel::NotifyFilterChanged()
+{
+	// User action: reset now rather than waiting for idle.
+	DropPending();
+	++m_contentGeneration;
+	m_pendingReset = false;
+	Cleared();
+}
+
+void CSearchListModel::DropPending()
+{
+	m_pendingAdded.clear();
+	m_pendingChanged.clear();
+}
+
+bool CSearchListModel::FlushPending()
+{
+	if (m_pendingReset) {
+		// Supersedes anything queued: Cleared() re-reads the whole tree.
+		DropPending();
+		m_pendingReset = false;
+		Cleared();
+		return true;
+	}
+
+	if (m_pendingAdded.empty() && m_pendingChanged.empty()) {
+		return false;
+	}
+
+	// Nothing here can be dangling: DropReferencesTo() removes a result the moment it is
+	// destroyed. Duplicates can be, and are: SetDownloadStatus() notifies every child of the
+	// parent it updated, so one arrival into a 50-variant group queues 51 entries and a busy
+	// idle window multiplies that. The control is handed each row once.
+	std::unordered_set<const CSearchFile *> seen;
+
+	// Additions are reported per parent, since wx takes one parent for a whole batch: top-level
+	// results under the root, grouped ones under the result they joined.
+	wxDataViewItemArray addedRoots;
+	std::unordered_map<CSearchFile *, wxDataViewItemArray> addedChildren;
+	for (CSearchFile *file : m_pendingAdded) {
+		if (!seen.insert(file).second) {
+			continue;
+		}
+		CSearchFile *parent = const_cast<CSearchFile *>(file->GetParent());
+		if (parent == nullptr) {
+			addedRoots.Add(ToItem(file));
+		} else {
+			addedChildrenparent.Add(ToItem(file));
+		}
+	}
+
+	seen.clear();
+	wxDataViewItemArray changed;
+	for (CSearchFile *file : m_pendingChanged) {
+		if (seen.insert(file).second) {
+			changed.Add(ToItem(file));
+		}
+	}
+	DropPending();
+
+	// Incremental, so the control keeps its scroll position, its selection and its expanded
+	// rows -- which Cleared() destroys, and which used to go on every burst of arriving
+	// results.
+	if (!addedRoots.IsEmpty()) {
+		ItemsAdded(wxDataViewItem(), addedRoots);
+	}
+	for (const auto &entry : addedChildren) {
+		ItemsAdded(ToItem(entry.first), entry.second);
+	}
+	if (!changed.IsEmpty()) {
+		ItemsChanged(changed);
+	}
+	return false;
+}
+
+unsigned int CSearchListModel::GetColumnCount() const
+{
+	return COL_COUNT;
+}
+
+wxString CSearchListModel::GetColumnType(unsigned int col) const
+{
+	return (col == COL_RATING) ? wxString("wxDataViewIconText") : wxString("string");
+}
+
+void CSearchListModel::GetValue(wxVariant &variant, const wxDataViewItem &item, unsigned int col) const
+{
+	CSearchFile *file = ToFile(item);
+
+	switch (col) {
+	case COL_NAME:
+		variant = file->GetFileName().GetPrintable();
+		break;
+
+	case COL_SIZE:
+		variant = CastItoXBytes(file->GetFileSize());
+		break;
+
+	case COL_SOURCES: {
+		wxString temp = CFormat("%d") % file->GetSourceCount();
+		if (file->GetCompleteSourceCount()) {
+			temp += CFormat(" (%d)") % file->GetCompleteSourceCount();
+		}
+		if (file->GetClientsCount()) {
+			temp += CFormat(" %d") % file->GetClientsCount();
+		}
+#if defined(__DEBUG__) && !defined(CLIENT_GUI)
+		if (file->GetKadPublishInfo() == 0) {
+			temp += " | -";
+		} else {
+			temp += CFormat(" | N:%u, P:%u, T:%0.2f") %
+				((file->GetKadPublishInfo() & 0xFF000000) >> 24) %
+				((file->GetKadPublishInfo() & 0x00FF0000) >> 16) %
+				((file->GetKadPublishInfo() & 0x0000FFFF) / 100.0);
+		}
+#endif
+		variant = temp;
+		break;
+	}
+
+	case COL_TYPE:
+		variant = GetFiletypeByName(file->GetFileName());
+		break;
+
+	case COL_RATING: {
+		wxString label;
+		wxIcon icon;
+		if (file->HasRating()) {
+			label = GetRateString(file->UserRating());
+			const int image = Client_InvalidRating_Smiley + file->UserRating() - 1;
+			icon = theApp->amuledlg->m_imagelist.GetIcon(image);
+		}
+		variant << wxDataViewIconText(label, icon);
+		break;
+	}
+
+	case COL_FILEID:
+		variant = file->GetFileHash().Encode();
+		break;
+
+	case COL_STATUS:
+		variant = CSearchListCtrl::DetermineStatusPrintable(file);
+		break;
+
+	case COL_LENGTH: {
+		uint32 lenSec = file->GetIntTagValue(FT_MEDIA_LENGTH);
+		variant = lenSec ? CastSecondsToHM(lenSec) : wxString();
+		break;
+	}
+
+	case COL_BITRATE: {
+		uint32 bitrate = file->GetIntTagValue(FT_MEDIA_BITRATE);
+		variant = bitrate ? wxString(CFormat(wxT("%u kbps")) % bitrate) : wxString();
+		break;
+	}
+
+	case COL_CODEC: {
+		const wxString &codec = file->GetStrTagValue(FT_MEDIA_CODEC);
+		variant = codec.IsEmpty() ? wxString() : FormatMediaCodec(codec);
+		break;
+	}
+
+	// Artist / album / title ride in on the same result tags as the three above -- CSearchFile
+	// keeps every tag it does not consume itself -- and are published by both the ed2k offer
+	// and Kad. Shown verbatim: unlike codec there is no vocabulary to normalise.
+	case COL_ARTIST:
+		variant = file->GetStrTagValue(FT_MEDIA_ARTIST);
+		break;
+
+	case COL_ALBUM:
+		variant = file->GetStrTagValue(FT_MEDIA_ALBUM);
+		break;
+
+	case COL_TITLE:
+		variant = file->GetStrTagValue(FT_MEDIA_TITLE);
+		break;
+
+	case COL_DIRECTORY:
+		variant = file->GetDirectory();
+		break;
+
+	default:
+		break;
+	}
+}
+
+bool CSearchListModel::SetValue(
+	const wxVariant &WXUNUSED(variant), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col))
+{
+	// Every column is read-only (wxDATAVIEW_CELL_INERT); values only ever
+	// change from the core side, via NotifyFileUpdated().
+	return false;
+}
+
+bool CSearchListModel::GetAttr(
+	const wxDataViewItem &item, unsigned int WXUNUSED(col), wxDataViewItemAttr &attr) const
+{
+	CSearchFile *file = ToFile(item);
+
+	// Same theme-aware state palette as the old CSearchListCtrl::UpdateItemColor -- see
+	// MuleColour.h's IsListBackgroundDark() for why the widget's own background is used rather
+	// than wxSystemSettings::GetAppearance().IsDark() alone.
+	const bool isDark = IsListBackgroundDark(m_owner);
+	wxColour colour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+
+	switch (file->GetDownloadStatus()) {
+	case CSearchFile::DOWNLOADED:
+		colour = isDark ? wxColour(80, 220, 80) : wxColour(0, 160, 0);
+		break;
+	case CSearchFile::QUEUED:
+	case CSearchFile::QUEUEDCANCELED:
+		colour = isDark ? wxColour(255, 100, 100) : wxColour(220, 0, 0);
+		break;
+	case CSearchFile::CANCELED:
+		colour = isDark ? wxColour(255, 120, 200) : wxColour(180, 0, 180);
+		break;
+	default: {
+		const int shift = std::min((int)file->GetSourceCount() * 5, 180);
+		colour = isDark ? wxColour(255 - shift, 255 - shift, 255) : wxColour(0, 0, shift);
+		break;
+	}
+	}
+
+	attr.SetColour(colour);
+	return true;
+}
+
+wxDataViewItem CSearchListModel::GetParent(const wxDataViewItem &item) const
+{
+	if (!item.IsOk()) {
+		return wxDataViewItem();
+	}
+	CSearchFile *parent = ToFile(item)->GetParent();
+	return parent ? ToItem(parent) : wxDataViewItem();
+}
+
+bool CSearchListModel::IsContainer(const wxDataViewItem &item) const
+{
+	if (!item.IsOk()) {
+		return true; // invisible root
+	}
+	// Must agree with GetChildren(), which only yields children that pass the filter: answering
+	// "has children" here for a group whose variants are all filtered out draws an expander
+	// that opens onto nothing (got3nks, PR #796 review).
+	const CSearchFile *file = ToFile(item);
+	const CSearchResultList &kids = file->GetChildren();
+	for (const CSearchFile *kid : kids) {
+		if (m_owner->PassesFilter(kid)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool CSearchListModel::HasContainerColumns(const wxDataViewItem &WXUNUSED(item)) const
+{
+	return true;
+}
+
+unsigned int CSearchListModel::GetChildren(const wxDataViewItem &item, wxDataViewItemArray &children) const
+{
+	if (!item.IsOk()) {
+		if (!m_owner->GetSearchId()) {
+			return 0;
+		}
+		const CSearchResultList &results =
+			theApp->searchlist->GetSearchResults(m_owner->GetSearchId());
+		unsigned int count = 0;
+		for (CSearchFile *file : results) {
+			if (!file->GetParent() && m_owner->ShouldShow(file)) {
+				children.Add(ToItem(file));
+				++count;
+			}
+		}
+		return count;
+	}
+
+	CSearchFile *parent = ToFile(item);
+	const CSearchResultList &kids = parent->GetChildren();
+	unsigned int count = 0;
+	for (CSearchFile *kid : kids) {
+		if (m_owner->PassesFilter(kid)) {
+			children.Add(ToItem(kid));
+			++count;
+		}
+	}
+	return count;
+}
+
+int CSearchListModel::Compare(const wxDataViewItem &item1,
+	const wxDataViewItem &item2,
+	unsigned int WXUNUSED(column),
+	bool WXUNUSED(ascending)) const
+{
+	// The requested (column, ascending) pair reflects only the primary native header click; the
+	// full multi-column tie-break chain, set up by earlier clicks on other columns, is tracked
+	// on the control itself and applied here whatever native state triggered this particular
+	// resort -- see CSearchListCtrl::CompareFiles.
+	return m_owner->CompareFiles(ToFile(item1), ToFile(item2));
+}

amule-3.1.0.tar.gz/src/SearchListModel.h Added

@@ -0,0 +1,208 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 SEARCHLISTMODEL_H
+#define SEARCHLISTMODEL_H
+
+#include <wx/dataview.h>
+
+#include <set>    // Needed for std::set (the live-model registry)
+#include <vector> // Needed for std::vector (the pending-arrival batches)
+
+class CSearchFile;
+class CSearchListCtrl;
+
+/**
+ * wxDataViewModel backing a CSearchListCtrl. Presents the CSearchFile parent/children forest for
+ * one search-id as a native tree.
+ *
+ * Two things that used to be hand-rolled in CSearchListCtrl::OnDrawItem / ShowChildren are
+ * deliberately NOT reimplemented here. Expand/collapse state is owned by wxDataViewCtrl itself (per
+ * row, via Expand()/Collapse()/IsExpanded()), so GetChildren() always reports the full child set --
+ * CSearchFile::ShowChildren()/SetShowChildren(), which the old hand-drawn tree used to fake this,
+ * is not consulted. And tree connector lines and the expander glyph are drawn natively by the
+ * control from IsContainer()/GetChildren(), replacing OnDrawItem's manual DrawLine/DrawCircle code.
+ *
+ * Regex/known-file filtering (CSearchListCtrl::SetFilter) is a different concept from
+ * expand/collapse -- a filtered-out result must not appear at all, so it is excluded at the
+ * IsContainer()/GetChildren() level.
+ *
+ * The model does not own or cache the result set: GetChildren() queries
+ * CSearchList::GetSearchResults(), via the owning CSearchListCtrl, live -- so there is a single
+ * source of truth and no separate bookkeeping to keep in sync. AddFile()/RemoveFile()/UpdateFile()
+ * only need to notify the control that something changed; they are not where new data is stored.
+ */
+class CSearchListModel : public wxDataViewModel
+{
+public:
+	explicit CSearchListModel(CSearchListCtrl *owner);
+	~CSearchListModel() override;
+
+	//! Notify the control that a new result is now visible (already added
+	//! to CSearchList's own storage by the caller).
+	void NotifyFileAdded(CSearchFile *file);
+	//! Notify the control that a result's displayed values changed.
+	void NotifyFileUpdated(CSearchFile *file);
+	//! Notify the control that filtering criteria changed and the whole
+	//! tree should be re-evaluated (some rows may appear/disappear).
+	void NotifyFilterChanged();
+
+	/**
+	 * Bumped whenever something happens that could change which results are shown, or how they
+	 * are grouped. For derived models that cache a view of the result set: this model caches
+	 * nothing and re-reads on every query, but a browse groups its results by folder, and
+	 * rederiving that grouping on every query is O(results) against a control that asks several
+	 * times per rebuild. Comparing this instead makes the cost per change rather than per
+	 * query.
+	 */
+	unsigned GetContentGeneration() const noexcept { return m_contentGeneration; }
+
+	//! Forces the next flush to be a full Cleared(). Group formation needs one: making an
+	//! existing result a container leaves the control's tree inconsistent on GTK/MSW under any
+	//! incremental notification -- ItemChanged() and delete+re-add both failed to make those
+	//! backends re-derive container-ness.
+	void MarkDirty()
+	{
+		m_pendingReset = true;
+		++m_contentGeneration;
+	}
+
+	//! Applies whatever the arrivals since the last flush added up to, one batch per idle
+	//! (CSearchListCtrl::OnIdle). Returns true if it was a Cleared(), which costs the control
+	//! its view state.
+	bool FlushPending();
+
+	//! Whether anything is waiting, of either kind.
+	bool HasPending() const
+	{
+		return m_pendingReset || !m_pendingAdded.empty() || !m_pendingChanged.empty();
+	}
+
+	//! Whether the next flush will be a Cleared(), so the caller knows to
+	//! save and restore selection and expansion around it.
+	bool HasPendingReset() const { return m_pendingReset; }
+
+	//! Drops everything queued. For the paths that are about to rebuild the tree anyway, and
+	//! for a new result set, whose pending entries point into storage that is no longer ours.
+	void DropPending();
+
+	/**
+	 * Forgets @a file, which is about to be freed. Called for every CSearchFile destruction
+	 * (MuleNotify::SearchFileBeingDestroyed), which is the only liveness signal there is:
+	 * nothing unlinks a child from its parent's m_children, so a pointer being listed there
+	 * says nothing about whether it is still allocated. Every live model is asked, since a
+	 * result belongs to exactly one of them and none of them knows which.
+	 */
+	static void DropReferencesTo(CSearchFile *file);
+
+	/**
+	 * Whether @a item is a grouping node rather than a result. Always false here: in a search,
+	 * every item is a CSearchFile. A browse grouped by folder (CBrowseListModel) puts nodes in
+	 * the tree that are not results, and this is how a caller holding a wxDataViewItem -- a
+	 * bare void* with nothing to distinguish it -- can find out before handing it to ToFile().
+	 */
+	virtual bool IsFolder(const wxDataViewItem &WXUNUSED(item)) const { return false; }
+
+	//! Unchecked: the caller is responsible for having ruled out a folder
+	//! first, via IsFolder() or by knowing the model has none.
+	static CSearchFile *ToFile(const wxDataViewItem &item)
+	{
+		return static_cast<CSearchFile *>(item.GetID());
+	}
+	static wxDataViewItem ToItem(const CSearchFile *file)
+	{
+		return wxDataViewItem(const_cast<CSearchFile *>(file));
+	}
+
+	//! Column indices, matching the wxDataViewColumn order set up by
+	//! CSearchListCtrl and shared with the Compare() logic below.
+	enum Column
+	{
+		COL_NAME = 0,
+		COL_SIZE,
+		COL_SOURCES,
+		COL_TYPE,
+		COL_RATING,
+		COL_FILEID,
+		COL_STATUS,
+		COL_LENGTH,
+		COL_BITRATE,
+		COL_CODEC,
+		COL_ARTIST,
+		COL_ALBUM,
+		COL_TITLE,
+		COL_DIRECTORY,
+		//! Always empty. macOS sizes the trailing column to the leftover space, collapsing
+		//! it to nothing once the columns are wider than the control; a spacer at the end
+		//! takes that role so no real column is ever the one that disappears. Only appended
+		//! there -- GTK and MSW lay the columns out without it.
+		COL_SPACER,
+		COL_COUNT
+	};
+
+	// wxDataViewModel interface
+	unsigned int GetColumnCount() const wxOVERRIDE;
+	wxString GetColumnType(unsigned int col) const wxOVERRIDE;
+	void GetValue(wxVariant &variant, const wxDataViewItem &item, unsigned int col) const wxOVERRIDE;
+	bool SetValue(const wxVariant &variant, const wxDataViewItem &item, unsigned int col) wxOVERRIDE;
+	bool GetAttr(const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr) const wxOVERRIDE;
+	wxDataViewItem GetParent(const wxDataViewItem &item) const wxOVERRIDE;
+	bool IsContainer(const wxDataViewItem &item) const wxOVERRIDE;
+	//! A grouped result is a row in its own right, not a section header: the parent carries the
+	//! same name/size/sources/rating as any other result and its children are alternative
+	//! sources for the same file. Without this, wxDataViewModel::HasValue() draws only column 0
+	//! for a container -- the group shows its filename and nothing else until expanded.
+	bool HasContainerColumns(const wxDataViewItem &item) const wxOVERRIDE;
+	unsigned int GetChildren(const wxDataViewItem &item, wxDataViewItemArray &children) const wxOVERRIDE;
+	int Compare(const wxDataViewItem &item1,
+		const wxDataViewItem &item2,
+		unsigned int column,
+		bool ascending) const wxOVERRIDE;
+
+protected:
+	//! Protected rather than private: CBrowseListModel derives the folder
+	//! grouping from the same live result set, reached through the owner.
+	CSearchListCtrl *m_owner;
+
+private:
+	//! Set when only a full rebuild will do; see MarkDirty().
+	bool m_pendingReset = false;
+
+	//! See GetContentGeneration(). Wrapping is harmless: it is only ever
+	//! compared for equality against the value at the last cache fill.
+	unsigned m_contentGeneration = 0;
+
+	//! Arrivals waiting to be reported incrementally: new rows, and rows whose values changed.
+	//! Held as pointers between the notification and the next idle, and kept honest by
+	//! DropReferencesTo().
+	std::vector<CSearchFile *> m_pendingAdded;
+	std::vector<CSearchFile *> m_pendingChanged;
+
+	//! Every model that currently exists, for DropReferencesTo(). One per
+	//! search tab, so a handful at most.
+	static std::set<CSearchListModel *> s_models;
+};
+
+#endif // SEARCHLISTMODEL_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/SearchProgressReport.cpp Added

@@ -0,0 +1,133 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+
+#include "SearchProgressReport.h"
+
+#include <ec/cpp/ECPacket.h>
+#include <ec/cpp/ECCodes.h>
+#include <common/Format.h>
+
+#include <wx/intl.h> // _()
+
+namespace
+{
+
+// Wire convention shared with amuleapi's SearchLifecycleStateToString and pinned against
+// CSearchList::SearchLifecycleState by a static_assert in ExternalConn.cpp: 0 idle, 1 running, 2
+// finished.
+wxString StateName(unsigned state)
+{
+	switch (state) {
+	case 1:
+		return _("running");
+	case 2:
+		return _("finished");
+	default:
+		return _("idle");
+	}
+}
+
+wxString OneLine(unsigned id, const wxString &name, unsigned state, unsigned percent, unsigned results)
+{
+	// The query the search was started with, or the peer's nickname for a browse. Older daemons
+	// do not send it; the line then reads as it did before rather than showing an empty pair of
+	// quotes.
+	if (name.IsEmpty()) {
+		return CFormat(_("Search %u: %s, %u %% (%u results)\n")) % id % StateName(state) % percent %
+		       results;
+	}
+	return CFormat(_("Search %u \"%s\": %s, %u %% (%u results)\n")) % id % name % StateName(state) %
+	       percent % results;
+}
+
+wxString NameOf(const CECTag *tag)
+{
+	return tag ? tag->GetStringData() : wxString();
+}
+
+unsigned IntOr(const CECTag *tag, unsigned fallback)
+{
+	return tag ? static_cast<unsigned>(tag->GetInt()) : fallback;
+}
+
+} // namespace
+
+wxString ecprogress::FormatSearchProgress(const CECPacket &response)
+{
+	if (response.GetTagByName(EC_TAG_SEARCH_EXPIRED)) {
+		return _("Search expired or unknown ID. Start a new search.\n");
+	}
+
+	// Union shape: one child per search, its own value the search id and its fields nested
+	// inside. Presence of EC_TAG_SEARCH_ID is NOT the test -- the single-search reply echoes
+	// one as a bare leaf, and an expired verdict echoes the id it is about. Carrying the nested
+	// percent is what makes a child an entry.
+	wxString out;
+	bool sawEntry = false;
+	for (const CECTag &entry : response) {
+		if (entry.GetTagName() != EC_TAG_SEARCH_ID) {
+			continue;
+		}
+		const CECTag *percent = entry.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_PERCENT);
+		if (percent == nullptr) {
+			continue;
+		}
+		sawEntry = true;
+		out += OneLine(static_cast<unsigned>(entry.GetInt()),
+			NameOf(entry.GetTagByName(EC_TAG_SEARCH_NAME)),
+			IntOr(entry.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_STATE), 0),
+			static_cast<unsigned>(percent->GetInt()),
+			IntOr(entry.GetTagByName(EC_TAG_SEARCH_RESULT_COUNT), 0));
+	}
+	if (sawEntry) {
+		return out;
+	}
+
+	// Single-search reply carrying the lifecycle tags. Preferred over the sentinel below: a
+	// finished search reports 100 % and says so, where the sentinel only ever said 0 once the
+	// search stopped running.
+	if (const CECTag *percent = response.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_PERCENT)) {
+		return OneLine(IntOr(response.GetTagByName(EC_TAG_SEARCH_ID), 0),
+			NameOf(response.GetTagByName(EC_TAG_SEARCH_NAME)),
+			IntOr(response.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_STATE), 0),
+			static_cast<unsigned>(percent->GetInt()),
+			IntOr(response.GetTagByName(EC_TAG_SEARCH_RESULT_COUNT), 0));
+	}
+
+	// Oldest daemons: the overloaded sentinel alone. Values above 100 are its
+	// done/failed markers rather than a percentage.
+	if (const CECTag *status = response.GetTagByName(EC_TAG_SEARCH_STATUS)) {
+		const unsigned progress = static_cast<unsigned>(status->GetInt());
+		if (progress <= 100) {
+			return CFormat(_("Search progress: %u %% \n")) % progress;
+		}
+		// Newline outside the msgid: the string is translated in 28
+		// catalogs and changing it would orphan every one of them.
+		return _("Search progress not available") + wxT("\n");
+	}
+
+	// A union reply with nothing in it: the daemon holds no searches. Distinct
+	// from 0 %, which is a running search that has made no progress.
+	return _("No search to report on.\n");
+}

amule-3.1.0.tar.gz/src/SearchProgressReport.h Added

@@ -0,0 +1,55 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+
+#ifndef SEARCHPROGRESSREPORT_H
+#define SEARCHPROGRESSREPORT_H
+
+#include <wx/string.h>
+
+class CECPacket;
+
+namespace ecprogress
+{
+
+/**
+ * Render an `EC_OP_SEARCH_PROGRESS` reply as amulecmd's `progress` output.
+ *
+ * The reply comes in three shapes and the client does not get to choose which: a daemon that echoed
+ * `EC_TAG_CAN_SEARCH_PROGRESS_UNION` always answers with the union, one entry per search, and
+ * naming ids only narrows which entries come back. Older daemons answer about a single search, with
+ * the lifecycle tags at the top level or, older still, only the overloaded `EC_TAG_SEARCH_STATUS`
+ * sentinel.
+ *
+ * Reading one shape as another is what made `progress` report 0 % unconditionally: the union nests
+ * `EC_TAG_SEARCH_STATUS` inside each entry, so a top-level read found nothing and rendered the miss
+ * as a number.
+ *
+ * Kept apart from the command loop, and free of theApp, so all three shapes are reachable from a
+ * test.
+ */
+wxString FormatSearchProgress(const CECPacket &response);
+
+} // namespace ecprogress
+
+#endif // SEARCHPROGRESSREPORT_H

amule-3.1.0.tar.gz/src/SearchResultIndex.h Added

@@ -0,0 +1,166 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 SEARCHRESULTINDEX_H
+#define SEARCHRESULTINDEX_H
+
+#include <algorithm> // Needed for std::find
+#include <map>       // Needed for std::map
+
+#include "SearchFile.h" // Needed for CSearchFile, CSearchResultList
+
+/**
+ * The per-search result index shared by the two search-list implementations.
+ *
+ * The search list has one implementation per build: CSearchList (monolithic, fed by the network
+ * stack) and CSearchListRem (amulegui, fed over EC). Both are reached through the same
+ * theApp->searchlist seam, and the GUI reads its rows from GetSearchResults() -- the wxDataViewCtrl
+ * search model builds every row from it, so a result that is not indexed here is invisible, no
+ * matter how correctly it arrived.
+ *
+ * That contract used to be satisfied by each implementation keeping its own copy of this map, which
+ * is how the remote one came to never populate it at all (the pre-wxDataViewCtrl list control held
+ * its own rows, so nothing broke visibly until the port made this map the row source). Keeping the
+ * map here, with IndexResult() as the only way to add to it, means a new implementation cannot
+ * answer GetSearchResults() correctly and still forget to fill it.
+ *
+ * Ownership deliberately stays with the derived class: the monolithic list owns its CSearchFile
+ * objects, while the remote one only borrows pointers owned by its CRemoteContainer. This index
+ * therefore never deletes anything -- DropResultIndex() drops the bookkeeping and leaves freeing to
+ * the owner.
+ *
+ * What the index holds is part of the contract, not an implementation detail: TOP-LEVEL RESULTS
+ * ONLY. A result grouped under another one (same hash, a different filename) is reachable through
+ * its parent's GetChildren() and must not be indexed here, or GetSearchResults(id).size() stops
+ * meaning "hits for this search" and consumers see each grouped result twice.
+ *
+ * Performance note for whenever result counts grow: UnindexResult() is a linear scan of one
+ * search's list, so tearing down a whole search one result at a time (CRemoteContainer::FullReload,
+ * which calls DeleteItem per item) costs O(N^2) in results per search. That is irrelevant at the
+ * few hundred results a search returns today; if the caps ever rise, drop the whole index for the
+ * search up front with DropResultIndex() rather than unindexing item by item.
+ */
+class CSearchResultIndex
+{
+public:
+	/**
+	 * The list of top-level results for the specified search, or an empty list if the search is
+	 * not known.
+	 */
+	const CSearchResultList &GetSearchResults(wxUIntPtr searchID) const
+	{
+		ResultMap::const_iterator it = m_results.find(searchID);
+		if (it != m_results.end()) {
+			return it->second;
+		}
+
+		static const CSearchResultList emptyList;
+		return emptyList;
+	}
+
+protected:
+	//! Not polymorphic: derived classes are never deleted through this type.
+	~CSearchResultIndex() = default;
+
+	//! Shorthand for the map of results (key is a SearchID).
+	typedef std::map<wxUIntPtr, CSearchResultList> ResultMap;
+
+	/**
+	 * True if this search is present in the index at all. Distinct from
+	 * GetSearchResults(id).empty(): a search that is known but currently holds no results
+	 * answers true here and empty there.
+	 */
+	bool HasSearchResults(wxUIntPtr searchID) const
+	{
+		return m_results.find(searchID) != m_results.end();
+	}
+
+	/**
+	 * Every indexed search, for the few operations that have to walk them all (find a result by
+	 * hash across open searches, drain the index). Read-only on purpose: the map is private so
+	 * that IndexResult() is the only way a result can enter it. Walking the lists to call non-
+	 * const methods on the results themselves is still fine -- the constness applies to the
+	 * index, not to what it points at.
+	 */
+	const ResultMap &AllResults() const { return m_results; }
+
+	/**
+	 * Makes a top-level result visible to the GUI, under its own search id.
+	 *
+	 * This is the single point where a result enters the index, and every search-list
+	 * implementation has to route new results through it. Passing a grouped result is a no-op
+	 * rather than a caller error: the top-level rule is the index's to keep, so an
+	 * implementation that hands over everything it receives still ends up with a correct index
+	 * instead of one that is wrong in a way only a consumer notices.
+	 */
+	void IndexResult(CSearchFile *file)
+	{
+		if (file->GetParent() != nullptr) {
+			return;
+		}
+
+		m_resultsfile->GetSearchID().push_back(file);
+	}
+
+	/**
+	 * Drops a single result from the index without freeing it. Call this before the owner frees
+	 * a result, so no freed pointer is left behind for GetSearchResults() to hand out.
+	 */
+	void UnindexResult(CSearchFile *file)
+	{
+		// Symmetric with IndexResult(): a grouped result was never indexed, so searching
+		// for it would scan the whole list to find nothing. A result is parented when it is
+		// constructed or loaded, before it could have been indexed, and nothing re-parents
+		// an indexed one -- so this can never skip a result that is actually in the index.
+		if (file->GetParent() != nullptr) {
+			return;
+		}
+
+		ResultMap::iterator it = m_results.find(file->GetSearchID());
+		if (it == m_results.end()) {
+			return;
+		}
+
+		CSearchResultList &list = it->second;
+		CSearchResultList::iterator pos = std::find(list.begin(), list.end(), file);
+		if (pos != list.end()) {
+			list.erase(pos);
+		}
+	}
+
+	/**
+	 * Drops a whole search from the index without freeing its results, which belong to the
+	 * derived class.
+	 */
+	void DropResultIndex(wxUIntPtr searchID) { m_results.erase(searchID); }
+
+private:
+	//! Map of all indexed top-level search results, keyed by search id. Private so the only way
+	//! in is IndexResult(): an implementation that answers GetSearchResults() cannot quietly
+	//! stop filling what it answers from, which is exactly the drift this class exists to
+	//! prevent.
+	ResultMap m_results;
+};
+
+#endif // SEARCHRESULTINDEX_H

amule-3.1.0.tar.gz/src/SecIdentPolicy.h Added

@@ -0,0 +1,72 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 SECIDENTPOLICY_H
+#define SECIDENTPOLICY_H
+
+#include "NetworkAddress.h"
+
+namespace SecIdent
+{
+// v2's ChallengeIP is exactly four nonzero IPv4 bytes, never an IPv6 projection.
+inline bool PeerIPv4(const CNetworkAddress &address, uint32_t &ip)
+{
+	ip = 0;
+	return address.ToIPv4NetworkOrder(ip) && ip != 0;
+}
+
+/**
+ * SecIdent v2 signs an IPv4 ChallengeIP that both ends must derive identically, so it is usable
+ * only with a peer that has one. PeerIPv4 supplies that prerequisite at the wire boundary.
+ *
+ * An obligation for whatever adds IPv6 sockets: CLibSocket::GetPeerInt() must keep yielding zero
+ * for a peer with no IPv4 endpoint. True now on both paths, the transport one through
+ * ToIPv4NetworkOrderOrZero() and the asio one because SetIp() takes an amuleIPV4Address, and
+ * widening the second is what dual stack does. Narrow a native IPv6 address to anything non-zero
+ * and v2 is selected for a peer that cannot agree on the value, which fails verification with no
+ * log line -- the failure this policy exists to prevent.
+ */
+enum Version
+{
+	Unavailable = 0,
+	V1 = 1,
+	V2 = 2
+};
+
+inline unsigned SupportedVersions(bool cryptoAvailable, bool hasPeerIPv4)
+{
+	return cryptoAvailable ? (hasPeerIPv4 ? V1 | V2 : V1) : Unavailable;
+}
+
+inline Version SignatureVersion(unsigned peerVersions, bool hasPeerIPv4)
+{
+	// Preserve the historical v1 preference, even on IPv4 connections.
+	if (peerVersions & V1) {
+		return V1;
+	}
+	return (hasPeerIPv4 && (peerVersions & V2)) ? V2 : Unavailable;
+}
+} // namespace SecIdent
+
+#endif // SECIDENTPOLICY_H

amule-3.0.1.tar.gz/src/Server.cpp -> amule-3.1.0.tar.gz/src/Server.cpp Changed

@@ -23,15 +23,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "Server.h"		// Interface declarations.
+#include "Server.h" // Interface declarations.
 
 #include <tags/ServerTags.h>
 
 #include "NetworkFunctions.h" // Needed for StringIPtoUint32
-#include "OtherStructs.h"	// Needed for ServerMet_Struct
+#include "OtherStructs.h"     // Needed for ServerMet_Struct
 #include "amule.h"
 
-CServer::CServer(ServerMet_Struct* in_data)
+CServer::CServer(ServerMet_Struct *in_data)
 {
 	port = in_data->port;
 	ip = in_data->ip;
@@ -39,7 +39,7 @@
 	Init();
 }
 
-CServer::CServer(uint16 in_port, const wxString& i_addr)
+CServer::CServer(uint16 in_port, const wxString &i_addr)
 {
 
 	port = in_port;
@@ -49,26 +49,26 @@
 
 	// GonoszTopi - Init() would clear dynip !
 	// Check that the ip isn't in fact 0.0.0.0
-	if (!ip && !StringIPtoUint32( i_addr, ip ) ) {
+	if (!ip && !StringIPtoUint32(i_addr, ip)) {
 		// If ip == 0, the address is a hostname
 		dynip = i_addr;
 	}
 }
 
-
 // copy constructor
-CServer::CServer(CServer* pOld) : CECID(pOld->ECID())
+CServer::CServer(CServer *pOld)
+: CECID(pOld->ECID())
 {
 	wxASSERT(pOld != NULL);
 
 	TagPtrList::iterator it = pOld->m_taglist.begin();
-	for ( ; it != pOld->m_taglist.end(); ++it ) {
+	for (; it != pOld->m_taglist.end(); ++it) {
 		m_taglist.push_back((*it)->CloneTag());
 	}
 	port = pOld->port;
 	ip = pOld->ip;
 	realport = pOld->realport;
-	staticservermember=pOld->IsStaticMember();
+	staticservermember = pOld->IsStaticMember();
 	tagcount = pOld->tagcount;
 	ipfull = pOld->ipfull;
 	files = pOld->files;
@@ -106,7 +106,8 @@
 	m_taglist.clear();
 }
 
-void CServer::Init() {
+void CServer::Init()
+{
 
 	ipfull = Uint32toStringIP(ip);
 
@@ -123,14 +124,20 @@
 	lastpinged = 0;
 	lastpingedtime = 0;
 	m_dwRealLastPingedTime = 0;
-	staticservermember=false;
-	maxusers=0;
+	staticservermember = false;
+	maxusers = 0;
 	m_uTCPFlags = 0;
 	m_uUDPFlags = 0;
 	challenge = 0;
 	softfiles = 0;
 	hardfiles = 0;
-	m_strVersion = _("Unknown");
+	// Empty, not _("Unknown"): this is a display placeholder, and every non-display consumer of
+	// the field is worse off holding a translated one. server.met would persist the running
+	// locale's word (an Italian aMule wrote ST_VERSION="Sconosciuta"), EC would ship it to
+	// amulegui and amuleapi, and /api/v1/servers would answer a localized string on a surface
+	// documented as English-only. The server list renders the placeholder itself when this is
+	// empty.
+	m_strVersion.Clear();
 	m_uLowIDUsers = 0;
 	m_uDescReqChallenge = 0;
 	lastdescpingedcout = 0;
@@ -143,11 +150,9 @@
 	m_dwIPServerKeyUDP = 0;
 	m_nObfuscationPortTCP = 0;
 	m_nObfuscationPortUDP = 0;
-
 }
 
-
-bool CServer::AddTagFromFile(CFileDataIO* servermet)
+bool CServer::AddTagFromFile(CFileDataIO *servermet)
 {
 	uint64_t val;
 	if (servermet == NULL) {
@@ -156,7 +161,7 @@
 
 	CTag tag(*servermet, true);
 
-	switch(tag.GetNameID()){
+	switch (tag.GetNameID()) {
 	case ST_SERVERNAME:
 		if (listname.IsEmpty()) {
 			listname = tag.GetStr();
@@ -207,8 +212,9 @@
 
 	case ST_VERSION:
 		if (tag.IsStr()) {
-			// m_strVersion defaults to _("Unknown"), so check for that as well
-			if ((m_strVersion.IsEmpty()) || (m_strVersion == _("Unknown"))) {
+			// First writer wins: server.met carries ST_VERSION twice, a UTF-8 copy and
+			// a raw one, and the second must not overwrite what the first decoded.
+			if (m_strVersion.IsEmpty()) {
 				m_strVersion = tag.GetStr();
 			}
 		} else if (tag.IsInt()) {
@@ -267,13 +273,12 @@
 	return true;
 }
 
-
-void CServer::SetListName(const wxString& newname)
+void CServer::SetListName(const wxString &newname)
 {
 	listname = newname;
 }
 
-void CServer::SetDescription(const wxString& newname)
+void CServer::SetDescription(const wxString &newname)
 {
 	description = newname;
 }
@@ -285,12 +290,11 @@
 	ipfull = Uint32toStringIP(ip);
 }
 
-void CServer::SetDynIP(const wxString& newdynip)
+void CServer::SetDynIP(const wxString &newdynip)
 {
 	dynip = newdynip;
 }
 
-
 void CServer::SetLastDescPingedCount(bool bReset)
 {
 	if (bReset) {
@@ -311,7 +315,7 @@
 
 void CServer::SetServerKeyUDP(uint32 dwServerKeyUDP)
 {
-	wxASSERT( theApp->GetPublicIP() != 0 || dwServerKeyUDP == 0 );
+	wxASSERT(theApp->GetPublicIP() != 0 || dwServerKeyUDP == 0);
 	m_dwServerKeyUDP = dwServerKeyUDP;
 	m_dwIPServerKeyUDP = theApp->GetPublicIP();
 }

amule-3.0.1.tar.gz/src/Server.h -> amule-3.1.0.tar.gz/src/Server.h Changed

@@ -28,7 +28,7 @@
 
 #include "Tag.h"
 #include "OtherStructs.h"
-#include <ec/cpp/ECID.h>	// Needed for CECID
+#include <ec/cpp/ECID.h> // Needed for CECID
 
 #include <protocol/ed2k/Client2Server/TCP.h>
 #include <protocol/ed2k/Client2Server/UDP.h>
@@ -36,29 +36,42 @@
 class CFileDataIO;
 
 // Server priority
-#define SRV_PR_LOW                      2
-#define SRV_PR_NORMAL                   0
-#define SRV_PR_HIGH                     1
+#define SRV_PR_LOW 2
+#define SRV_PR_NORMAL 0
+#define SRV_PR_HIGH 1
 // Server priority max and min values
-#define SRV_PR_MAX			2
-#define SRV_PR_MID			1
-#define SRV_PR_MIN			0
+#define SRV_PR_MAX 2
+#define SRV_PR_MID 1
+#define SRV_PR_MIN 0
 
 class CServer : public CECID
 {
-friend class CServerListRem;
+	friend class CServerListRem;
+
 public:
-	CServer(ServerMet_Struct* in_data);
-	CServer(uint16 in_port, const wxString& i_addr);
-	CServer(CServer* pOld);
+	CServer(ServerMet_Struct *in_data);
+	CServer(uint16 in_port, const wxString &i_addr);
+	CServer(CServer *pOld);
 	CServer(const class CEC_Server_Tag *);
 
 	~CServer();
-	void		AddTag(CTag* in_tag)	{m_taglist.push_back(in_tag);}
-	const wxString &GetListName() const	{return listname;}
-	const wxString &GetFullIP() const	{return ipfull;}
+	void AddTag(CTag *in_tag) { m_taglist.push_back(in_tag); }
+	const wxString &GetListName() const { return listname; }
+	const wxString &GetFullIP() const { return ipfull; }
+	// Server host country ISO code accessors (#440). Unconditional and libmaxminddb-free.
+	// m_countryFromCore records whether the tag was present, so an empty authoritative code
+	// ("unknown") is told apart from an absent tag. Unused by monolithic amule, which resolves
+	// country locally; populated over EC on the remote GUI.
+	const wxString &GetCountryCode() const { return m_countryCode; }
+	bool IsCountryFromCore() const { return m_countryFromCore; }
+	void SetCountryCode(const wxString &code)
+	{
+		m_countryCode = code;
+		m_countryFromCore = true;
+	}
 
-	const wxString &GetAddress() const {
+	const wxString &GetAddress() const
+	{
 		if (!dynip.IsEmpty()) {
 			return dynip;
 		} else {
@@ -67,87 +80,98 @@
 	}
 
 	// the official port
-	uint16  GetPort() const			{return realport ? realport : port;}
+	uint16 GetPort() const { return realport ? realport : port; }
 	// the connection port
-	uint16  GetConnPort() const		{return port;}
-	void    SetPort(uint32 val)		{realport = val;}
-	bool	AddTagFromFile(CFileDataIO* servermet);
-	void	SetListName(const wxString& newname);
-	void	SetDescription(const wxString& newdescription);
-	uint32	GetIP() const			{return ip;}
-	uint32	GetFiles() const		{return files;}
-	uint32	GetUsers() const		{return users;}
-	const wxString	&GetDescription() const	{return description;}
-	uint32	GetPing() const			{return ping;}
-	uint32	GetPreferences() const		{return preferences;}
-	uint32	GetMaxUsers() const		{return maxusers;}
-	void	SetMaxUsers(uint32 in_maxusers) {maxusers = in_maxusers;}
-	void	SetUserCount(uint32 in_users)	{users = in_users;}
-	void	SetFileCount(uint32 in_files)	{files = in_files;}
-	void	ResetFailedCount()		{failedcount = 0;}
-	void	AddFailedCount()		{failedcount++;}
-	uint32	GetFailedCount() const		{return failedcount;}
-	void	SetID(uint32 newip);
-	const wxString &GetDynIP() const	{return dynip;}
-	bool	HasDynIP() const		{return !dynip.IsEmpty() ;}
-	void	SetDynIP(const wxString& newdynip);
-
-	time_t	GetLastPingedTime() const				{return lastpingedtime;}
-	void	SetLastPingedTime(time_t in_lastpingedtime)	{lastpingedtime = in_lastpingedtime;}
-
-	time_t	GetRealLastPingedTime() const					{return m_dwRealLastPingedTime;} // last pinged time without any random modificator
-	void	SetRealLastPingedTime(time_t in_lastpingedtime)	{m_dwRealLastPingedTime = in_lastpingedtime;}
-
-	uint64	GetLastPinged() const		{return lastpinged;}
-	void	SetLastPinged(uint64 in_lastpinged) {lastpinged = in_lastpinged;}
-
-	void	SetPing(uint32 in_ping)		{ping = in_ping;}
-	void	SetPreference(uint32 in_preferences) {preferences = in_preferences;}
-	void	SetIsStaticMember(bool in)	{staticservermember=in;}
-	bool	IsStaticMember() const		{return staticservermember;}
-	uint32	GetChallenge() const		{return challenge;}
-	void	SetChallenge(uint32 in_challenge) {challenge = in_challenge;}
-	uint32	GetSoftFiles() const		{return softfiles;}
-	void	SetSoftFiles(uint32 in_softfiles) {softfiles = in_softfiles;}
-	uint32	GetHardFiles() const		{return hardfiles;}
-	void	SetHardFiles(uint32 in_hardfiles) {hardfiles = in_hardfiles;}
-	const	wxString &GetVersion() const	{return m_strVersion;}
-	void	SetVersion(const wxString &pszVersion)	{m_strVersion = pszVersion;}
-	void	SetTCPFlags(uint32 uFlags)	{m_uTCPFlags = uFlags;}
-	uint32	GetTCPFlags() const		{return m_uTCPFlags;}
-	void	SetUDPFlags(uint32 uFlags)	{m_uUDPFlags = uFlags;}
-	uint32	GetUDPFlags() const		{return m_uUDPFlags;}
-	uint32	GetLowIDUsers() const		{return m_uLowIDUsers;}
-	void	SetLowIDUsers(uint32 uLowIDUsers) {m_uLowIDUsers = uLowIDUsers;}
-	uint32	GetDescReqChallenge() const	{return m_uDescReqChallenge;}
-	void	SetDescReqChallenge(uint32 uDescReqChallenge) {m_uDescReqChallenge = uDescReqChallenge;}
-	uint8	GetLastDescPingedCount() const	{return lastdescpingedcout;}
-	void	SetLastDescPingedCount(bool reset);
-
-	uint16	GetObfuscationPortTCP() const			{return m_nObfuscationPortTCP;}
-	void	SetObfuscationPortTCP(uint16 nPort)		{m_nObfuscationPortTCP = nPort;}
-
-	uint16	GetObfuscationPortUDP() const			{return m_nObfuscationPortUDP;}
-	void	SetObfuscationPortUDP(uint16 nPort)		{m_nObfuscationPortUDP = nPort;}
-
-	uint32	GetServerKeyUDP(bool bForce = false) const;
-	void	SetServerKeyUDP(uint32 dwServerKeyUDP);
-
-	bool	GetCryptPingReplyPending() const		{return m_bCryptPingReplyPending;}
-	void	SetCryptPingReplyPending(bool bVal)		{m_bCryptPingReplyPending = bVal;}
-
-	uint32	GetServerKeyUDPIP() const				{return m_dwIPServerKeyUDP;}
-
-	bool	GetUnicodeSupport() const				{return (GetTCPFlags() & SRV_TCPFLG_UNICODE) != 0;}
-	bool	GetRelatedSearchSupport() const			{return (GetTCPFlags() & SRV_TCPFLG_RELATEDSEARCH) != 0;}
-	bool	SupportsLargeFilesTCP() const			{return (GetTCPFlags() & SRV_TCPFLG_LARGEFILES) != 0;}
-	bool	SupportsLargeFilesUDP() const			{return (GetUDPFlags() & SRV_UDPFLG_LARGEFILES) != 0;}
-	bool	SupportsObfuscationUDP() const			{return (GetUDPFlags() & SRV_UDPFLG_UDPOBFUSCATION) != 0;}
-	bool	SupportsObfuscationTCP() const			{return (GetObfuscationPortTCP() != 0) && (((GetUDPFlags() & SRV_UDPFLG_TCPOBFUSCATION) != 0) || ((GetTCPFlags() & SRV_TCPFLG_TCPOBFUSCATION) != 0));}
-	bool	SupportsGetSourcesObfuscation() const	{return (GetTCPFlags() & SRV_TCPFLG_TCPOBFUSCATION) != 0;} // mapped to TCPFLAG_TCPOBFU
-
-	const wxString& GetAuxPortsList() const	{return m_auxPorts;}
-	void	SetAuxPortsList(const wxString& val)	{m_auxPorts = val;}
+	uint16 GetConnPort() const { return port; }
+	void SetPort(uint32 val) { realport = val; }
+	bool AddTagFromFile(CFileDataIO *servermet);
+	void SetListName(const wxString &newname);
+	void SetDescription(const wxString &newdescription);
+	uint32 GetIP() const { return ip; }
+	uint32 GetFiles() const { return files; }
+	uint32 GetUsers() const { return users; }
+	const wxString &GetDescription() const { return description; }
+	uint32 GetPing() const { return ping; }
+	uint32 GetPreferences() const { return preferences; }
+	uint32 GetMaxUsers() const { return maxusers; }
+	void SetMaxUsers(uint32 in_maxusers) { maxusers = in_maxusers; }
+	void SetUserCount(uint32 in_users) { users = in_users; }
+	void SetFileCount(uint32 in_files) { files = in_files; }
+	void ResetFailedCount() { failedcount = 0; }
+	void AddFailedCount() { failedcount++; }
+	uint32 GetFailedCount() const { return failedcount; }
+	void SetID(uint32 newip);
+	const wxString &GetDynIP() const { return dynip; }
+	bool HasDynIP() const { return !dynip.IsEmpty(); }
+	void SetDynIP(const wxString &newdynip);
+
+	time_t GetLastPingedTime() const { return lastpingedtime; }
+	void SetLastPingedTime(time_t in_lastpingedtime) { lastpingedtime = in_lastpingedtime; }
+
+	time_t GetRealLastPingedTime() const
+	{
+		return m_dwRealLastPingedTime;
+	} // last pinged time without any random modificator
+	void SetRealLastPingedTime(time_t in_lastpingedtime) { m_dwRealLastPingedTime = in_lastpingedtime; }
+
+	uint64 GetLastPinged() const { return lastpinged; }
+	void SetLastPinged(uint64 in_lastpinged) { lastpinged = in_lastpinged; }
+
+	void SetPing(uint32 in_ping) { ping = in_ping; }
+	void SetPreference(uint32 in_preferences) { preferences = in_preferences; }
+	void SetIsStaticMember(bool in) { staticservermember = in; }
+	bool IsStaticMember() const { return staticservermember; }
+	uint32 GetChallenge() const { return challenge; }
+	void SetChallenge(uint32 in_challenge) { challenge = in_challenge; }
+	uint32 GetSoftFiles() const { return softfiles; }
+	void SetSoftFiles(uint32 in_softfiles) { softfiles = in_softfiles; }
+	uint32 GetHardFiles() const { return hardfiles; }
+	void SetHardFiles(uint32 in_hardfiles) { hardfiles = in_hardfiles; }
+	const wxString &GetVersion() const { return m_strVersion; }
+	void SetVersion(const wxString &pszVersion) { m_strVersion = pszVersion; }
+	void SetTCPFlags(uint32 uFlags) { m_uTCPFlags = uFlags; }
+	uint32 GetTCPFlags() const { return m_uTCPFlags; }
+	void SetUDPFlags(uint32 uFlags) { m_uUDPFlags = uFlags; }
+	uint32 GetUDPFlags() const { return m_uUDPFlags; }
+	uint32 GetLowIDUsers() const { return m_uLowIDUsers; }
+	void SetLowIDUsers(uint32 uLowIDUsers) { m_uLowIDUsers = uLowIDUsers; }
+	uint32 GetDescReqChallenge() const { return m_uDescReqChallenge; }
+	void SetDescReqChallenge(uint32 uDescReqChallenge) { m_uDescReqChallenge = uDescReqChallenge; }
+	uint8 GetLastDescPingedCount() const { return lastdescpingedcout; }
+	void SetLastDescPingedCount(bool reset);
+
+	uint16 GetObfuscationPortTCP() const { return m_nObfuscationPortTCP; }
+	void SetObfuscationPortTCP(uint16 nPort) { m_nObfuscationPortTCP = nPort; }
+
+	uint16 GetObfuscationPortUDP() const { return m_nObfuscationPortUDP; }
+	void SetObfuscationPortUDP(uint16 nPort) { m_nObfuscationPortUDP = nPort; }
+
+	uint32 GetServerKeyUDP(bool bForce = false) const;
+	void SetServerKeyUDP(uint32 dwServerKeyUDP);
+
+	bool GetCryptPingReplyPending() const { return m_bCryptPingReplyPending; }
+	void SetCryptPingReplyPending(bool bVal) { m_bCryptPingReplyPending = bVal; }
+
+	uint32 GetServerKeyUDPIP() const { return m_dwIPServerKeyUDP; }
+
+	bool GetUnicodeSupport() const { return (GetTCPFlags() & SRV_TCPFLG_UNICODE) != 0; }
+	bool GetRelatedSearchSupport() const { return (GetTCPFlags() & SRV_TCPFLG_RELATEDSEARCH) != 0; }
+	bool SupportsLargeFilesTCP() const { return (GetTCPFlags() & SRV_TCPFLG_LARGEFILES) != 0; }
+	bool SupportsLargeFilesUDP() const { return (GetUDPFlags() & SRV_UDPFLG_LARGEFILES) != 0; }
+	bool SupportsObfuscationUDP() const { return (GetUDPFlags() & SRV_UDPFLG_UDPOBFUSCATION) != 0; }
+	bool SupportsObfuscationTCP() const
+	{
+		return (GetObfuscationPortTCP() != 0) &&
+		       (((GetUDPFlags() & SRV_UDPFLG_TCPOBFUSCATION) != 0) ||
+			       ((GetTCPFlags() & SRV_TCPFLG_TCPOBFUSCATION) != 0));
+	}
+	bool SupportsGetSourcesObfuscation() const
+	{
+		return (GetTCPFlags() & SRV_TCPFLG_TCPOBFUSCATION) != 0;
+	} // mapped to TCPFLAG_TCPOBFU
+
+	const wxString &GetAuxPortsList() const { return m_auxPorts; }
+	void SetAuxPortsList(const wxString &val) { m_auxPorts = val; }
 
 	uint64 GetLastDNSSolve() const { return m_lastdnssolve; }
 	void SetLastDNSSolve(uint64 value) { m_lastdnssolve = value; }
@@ -156,45 +180,48 @@
 	void SetDNSError(bool value) { m_dnsfailure = value; }
 
 private:
-	uint32		challenge;
-	uint64		lastpinged; //This is to get the ping delay.
-	time_t		lastpingedtime; //This is to decide when we retry the ping.
-	uint32		files;
-	uint32		users;
-	uint32		maxusers;
-	uint32		softfiles;
-	uint32		hardfiles;
-	uint32		preferences;
-	uint32		ping;
-	wxString	description;
-	wxString	listname;
-	wxString	dynip;
-	uint32		tagcount;
-	wxString	ipfull;
-	uint32		ip;
-	uint16		port;
-	uint16		realport;
-	uint32		failedcount;
-	uint32		m_uDescReqChallenge;
-	uint8		lastdescpingedcout;
-	TagPtrList		m_taglist;
-	bool		staticservermember;
-	wxString	m_strVersion;
-	uint32		m_uTCPFlags;
-	uint32		m_uUDPFlags;
-	uint32		m_uLowIDUsers;
-	wxString	m_auxPorts;
-
-	uint64		m_lastdnssolve;
-	bool		m_dnsfailure;
-
-	bool		m_bCryptPingReplyPending;
-	uint32		m_dwServerKeyUDP;
-	uint32		m_dwIPServerKeyUDP;
-	uint16		m_nObfuscationPortTCP;
-	uint16		m_nObfuscationPortUDP;
-
-	time_t		m_dwRealLastPingedTime;
+	uint32 challenge;
+	uint64 lastpinged;     // This is to get the ping delay.
+	time_t lastpingedtime; // This is to decide when we retry the ping.
+	uint32 files;
+	uint32 users;
+	uint32 maxusers;
+	uint32 softfiles;
+	uint32 hardfiles;
+	uint32 preferences;
+	uint32 ping;
+	wxString description;
+	wxString listname;
+	// EC-delivered host country (remote GUI only; #440). See the accessors.
+	wxString m_countryCode;
+	bool m_countryFromCore = false;
+	wxString dynip;
+	uint32 tagcount;
+	wxString ipfull;
+	uint32 ip;
+	uint16 port;
+	uint16 realport;
+	uint32 failedcount;
+	uint32 m_uDescReqChallenge;
+	uint8 lastdescpingedcout;
+	TagPtrList m_taglist;
+	bool staticservermember;
+	wxString m_strVersion;
+	uint32 m_uTCPFlags;
+	uint32 m_uUDPFlags;
+	uint32 m_uLowIDUsers;
+	wxString m_auxPorts;
+
+	uint64 m_lastdnssolve;
+	bool m_dnsfailure;
+
+	bool m_bCryptPingReplyPending;
+	uint32 m_dwServerKeyUDP;
+	uint32 m_dwIPServerKeyUDP;
+	uint16 m_nObfuscationPortTCP;
+	uint16 m_nObfuscationPortUDP;
+
+	time_t m_dwRealLastPingedTime;
 
 	void Init();
 };

amule-3.0.1.tar.gz/src/ServerConnect.cpp -> amule-3.1.0.tar.gz/src/ServerConnect.cpp Changed

@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "ServerConnect.h"	// Interface declarations.
+#include "ServerConnect.h" // Interface declarations.
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/ClientSoftware.h> // Sometimes we reply with TCP packets.
@@ -31,55 +31,92 @@
 #include <common/ClientVersion.h>
 #include <common/EventIDs.h>
 
-#include "SearchList.h"		// Needed for CSearchList
-#include "ServerUDPSocket.h"	// Needed for CServerUDPSocket
-#include "SharedFileList.h"	// Needed for CSharedFileList
-#include "Packet.h"		// Needed for CTag
-#include "MemFile.h"		// Needed for CMemFile
-#include "ServerSocket.h"	// Needed for CServerSocket
-#include "ListenSocket.h"	// Needed for CListenSocket
-#include "Server.h"		// Needed for CServer
-#include "amule.h"		// Needed for theApp
-#include "ServerList.h"		// Needed for CServerList
-#include "Preferences.h"	// Needed for CPreferences
-#include "Statistics.h"		// Needed for theStats
+#include "SearchList.h"      // Needed for CSearchList
+#include "ServerUDPSocket.h" // Needed for CServerUDPSocket
+#include "SharedFileList.h"  // Needed for CSharedFileList
+#include "Packet.h"          // Needed for CTag
+#include "MemFile.h"         // Needed for CMemFile
+#include "ServerSocket.h"    // Needed for CServerSocket
+#include "ListenSocket.h"    // Needed for CListenSocket
+#include "Server.h"          // Needed for CServer
+#include "amule.h"           // Needed for theApp
+#include "ServerList.h"      // Needed for CServerList
+#include "Preferences.h"     // Needed for CPreferences
+#include "Statistics.h"      // Needed for theStats
 #include "Logger.h"
-#include "GuiEvents.h"		// Needed for Notify_*
-#include "IPFilter.h"		// Needed for theApp->ipfilter->IsReady()
+#include "GuiEvents.h"               // Needed for Notify_*
+#include "IPFilter.h"                // Needed for theApp->ipfilter->IsReady()
+#include "PublicIPv6Corroboration.h" // Needed for RefreshLocalPublicIPv6Addresses
 #include <common/Format.h>
 
-
-//#define DEBUG_CLIENT_PROTOCOL
-
+// #define DEBUG_CLIENT_PROTOCOL
 
 void CServerConnect::TryAnotherConnectionrequest()
 {
 	if (m_recurseTryAnotherConnectionrequest) {
 		return;
 	}
-	if ( connectionattemps.size() < (unsigned)(( thePrefs::IsSafeServerConnectEnabled()) ? 1 : 2) ) {
+	if (connectionattemps.size() < (unsigned)((thePrefs::IsSafeServerConnectEnabled()) ? 1 : 2)) {
 
-		CServer*  next_server = used_list->GetNextServer(m_bTryObfuscated);
+		CServer *next_server = used_list->GetNextServer(m_bTryObfuscated);
 
-		if ( thePrefs::AutoConnectStaticOnly() ) {
+		if (thePrefs::AutoConnectStaticOnly()) {
 			while (next_server && !next_server->IsStaticMember()) {
 				next_server = used_list->GetNextServer(m_bTryObfuscated);
 			}
 		}
 
 		if (!next_server) {
-			if ( connectionattemps.empty() ) {
-				m_recurseTryAnotherConnectionrequest = true;
-				if (m_bTryObfuscated && !thePrefs::IsClientCryptLayerRequired()){
-					AddLogLineC(_("Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."));
-					// try all servers on the non-obfuscated port next
+			if (connectionattemps.empty()) {
+				// In static-only mode only static servers were attempted, so say
+				// so rather than implying the whole list failed.
+				const bool staticOnly = thePrefs::AutoConnectStaticOnly();
+				if (m_bTryObfuscated && !thePrefs::IsClientCryptLayerRequired()) {
+					AddLogLineC(staticOnly
+							    ? _("Failed to connect to all obfuscated static "
+								"servers "
+								"listed. Making another pass without "
+								"obfuscation.")
+							    : _("Failed to connect to all obfuscated servers "
+								"listed. "
+								"Making another pass without obfuscation."));
+					// Try all servers on the non-obfuscated port next. Bounded:
+					// one extra pass with different parameters, after which the
+					// wrap-around below takes over.
+					m_recurseTryAnotherConnectionrequest = true;
 					m_bTryObfuscated = false;
-					ConnectToAnyServer( false, true);
+					ConnectToAnyServer(false, true);
+					m_recurseTryAnotherConnectionrequest = false;
 				} else {
-					AddLogLineC(_("Failed to connect to all servers listed. Making another pass."));
-					ConnectToAnyServer( false );
+					// No "making another pass" here any more: the next one is
+					// the timer's, below.
+					AddLogLineC(staticOnly
+							    ? _("Failed to connect to all static servers "
+								"listed.")
+							    : _("Failed to connect to all servers listed."));
+					// Wait before starting over rather than restarting the
+					// sweep here. Every server having failed says nothing about
+					// when one will answer, and with the link down they all
+					// fail the moment they are tried -- so the immediate
+					// restart this replaces meant a full pass per second for as
+					// long as the outage lasted. The same timer the
+					// CS_FATALERROR path uses, so a caller that switched auto-
+					// reconnect off gets what it asked for. StopConnectionTry()
+					// first, since it stops the timer and would undo an earlier
+					// arm.
+					StopConnectionTry();
+					if (thePrefs::Reconnect()) {
+						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);
+					}
 				}
-				m_recurseTryAnotherConnectionrequest = false;
 			}
 			return;
 		}
@@ -90,7 +127,7 @@
 
 void CServerConnect::ConnectToAnyServer(bool prioSort, bool bNoCrypt)
 {
-	if (!thePrefs::GetNetworkED2K()){
+	if (!thePrefs::GetNetworkED2K()) {
 		AddLogLineC(_("eD2k network disabled on preferences, not connecting."));
 		return;
 	}
@@ -124,13 +161,13 @@
 		}
 	}
 
-	if ( thePrefs::Score() && prioSort ) {
+	if (thePrefs::Score() && prioSort) {
 		used_list->Sort();
 	}
 
 	used_list->ResetServerPos();
 
-	if (used_list->GetServerCount()==0 ) {
+	if (used_list->GetServerCount() == 0) {
 		connecting = false;
 		AddLogLineC(_("No valid servers to which to connect found in server list"));
 		return;
@@ -141,10 +178,9 @@
 	TryAnotherConnectionrequest();
 }
 
-
-void CServerConnect::ConnectToServer(CServer* server, bool multiconnect, bool bNoCrypt)
+void CServerConnect::ConnectToServer(CServer *server, bool multiconnect, bool bNoCrypt)
 {
-	if (!thePrefs::GetNetworkED2K()){
+	if (!thePrefs::GetNetworkED2K()) {
 		AddLogLineC(_("eD2k network disabled on preferences, not connecting."));
 		return;
 	}
@@ -156,55 +192,62 @@
 	connecting = true;
 	singleconnecting = !multiconnect;
 
-	CServerSocket* newsocket = new CServerSocket(this, thePrefs::GetProxyData());
+	CServerSocket *newsocket = new CServerSocket(this, thePrefs::GetProxyData());
 	m_lstOpenSockets.push_back(newsocket);
 	newsocket->ConnectToServer(server, bNoCrypt);
 
 	connectionattempsGetTickCount64() = newsocket;
 }
 
-
 void CServerConnect::StopConnectionTry()
 {
 	connectionattemps.clear();
 	connecting = false;
 	singleconnecting = false;
-
-	if (m_idRetryTimer.IsRunning())
-	{
-	  m_idRetryTimer.Stop();
+	// Every sweep ends here, so this is where the DNS evidence expires. Outside a sweep nothing
+	// has proved the resolver works, and a manual connect judged on a sweep that ran while the
+	// link was up would blame a name that cannot resolve now -- three of those delete the
+	// server.
+	m_hostnameResolvedThisSweep = false;
+
+	if (m_idRetryTimer.IsRunning()) {
+		m_idRetryTimer.Stop();
 	}
 
 	// close all currently opened sockets except the one which is connected to our current server
-	for(SocketsList::iterator it = m_lstOpenSockets.begin(); it != m_lstOpenSockets.end(); ) {
+	for (SocketsList::iterator it = m_lstOpenSockets.begin(); it != m_lstOpenSockets.end();) {
 		CServerSocket *pSck = *it++;
-		if (pSck == connectedsocket)		// don't destroy socket which is connected to server
+		if (pSck == connectedsocket) // don't destroy socket which is connected to server
 			continue;
-		if (pSck->m_bIsDeleting == false)	// don't destroy socket if it is going to destroy itself later on
+		if (pSck->m_bIsDeleting ==
+			false) // don't destroy socket if it is going to destroy itself later on
 			DestroySocket(pSck);
 	}
 }
 
-void CServerConnect::ConnectionEstablished(CServerSocket* sender)
+void CServerConnect::ConnectionEstablished(CServerSocket *sender)
 {
-	if (connecting == false)
-	{
+	if (connecting == false) {
 		// we are already connected to another server
 		DestroySocket(sender);
 		return;
 	}
 
 	if (sender->GetConnectionState() == CS_WAITFORLOGIN) {
-		AddLogLineN(CFormat( _("Connected to %s (%s:%i)") )
-			% sender->cur_server->GetListName()
-			% sender->cur_server->GetFullIP()
-			% sender->cur_server->GetPort() );
-
-		//send loginpacket
-		CServer* update = theApp->serverlist->GetServerByAddress( sender->cur_server->GetAddress(), sender->cur_server->GetPort() );
-		if (update){
+		AddLogLineN(CFormat(_("Connected to %s (%s:%i)")) % sender->cur_server->GetListName() %
+			    sender->cur_server->GetFullIP() % sender->cur_server->GetPort());
+
+		// A new server connection is the moment our outward-facing address is most likely
+		// to have just changed -- a reconnect after a link came back up lands here. Peers
+		// reached through it will start telling us what address they see, and their claims
+		// are only believed against the set published here.
+		RefreshLocalPublicIPv6Addresses();
+
+		CServer *update = theApp->serverlist->GetServerByAddress(
+			sender->cur_server->GetAddress(), sender->cur_server->GetPort());
+		if (update) {
 			update->ResetFailedCount();
-			Notify_ServerRefresh( update );
+			Notify_ServerRefresh(update);
 		}
 
 		CMemFile data(256);
@@ -217,10 +260,10 @@
 		// Kry - Server doesn't support VBT tags afaik.
 		// Not to mention we don't know its flags yet
 
-		CTagString tagname(CT_NAME,thePrefs::GetUserNick());
+		CTagString tagname(CT_NAME, thePrefs::GetUserNick());
 		tagname.WriteTagToFile(&data);
 
-		CTagInt32 tagversion(CT_VERSION,EDONKEYVERSION);
+		CTagInt32 tagversion(CT_VERSION, EDONKEYVERSION);
 		tagversion.WriteTagToFile(&data);
 
 		uint32 dwCryptFlags = 0;
@@ -238,46 +281,41 @@
 		}
 
 		// FLAGS for server connection
-		CTagInt32 tagflags(CT_SERVER_FLAGS, CAPABLE_ZLIB
-								| CAPABLE_AUXPORT
-								| CAPABLE_NEWTAGS
-								| CAPABLE_UNICODE
-								| CAPABLE_LARGEFILES
-								| dwCryptFlags
-											);
+		CTagInt32 tagflags(CT_SERVER_FLAGS,
+			CAPABLE_ZLIB | CAPABLE_AUXPORT | CAPABLE_NEWTAGS | CAPABLE_UNICODE |
+				CAPABLE_LARGEFILES | dwCryptFlags);
 
 		tagflags.WriteTagToFile(&data);
 
-		// eMule Version (14-Mar-2004: requested by lugdunummaster (need for LowID clients which have no chance
-		// to send an Hello packet to the server during the callback test))
+		// eMule Version (14-Mar-2004: requested by lugdunummaster (need for LowID clients which have
+		// no chance to send an Hello packet to the server during the callback test))
 		CTagInt32 tagMuleVersion(CT_EMULE_VERSION,
-			(SO_AMULE	<< 24) |
-			make_full_ed2k_version(VERSION_MJR, VERSION_MIN, VERSION_UPDATE)
-			 );
+			(SO_AMULE << 24) | make_full_ed2k_version(VERSION_MJR, VERSION_MIN, VERSION_UPDATE));
 		tagMuleVersion.WriteTagToFile(&data);
 
-		CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_LOGINREQUEST);
-		#ifdef DEBUG_CLIENT_PROTOCOL
+		CPacket *packet = new CPacket(data, OP_EDONKEYPROT, OP_LOGINREQUEST);
+#ifdef DEBUG_CLIENT_PROTOCOL
 		AddLogLineC("Client: OP_LOGINREQUEST");
 		AddLogLineC(wxString("        Hash     : ") << thePrefs::GetUserHash().Encode());
 		AddLogLineC(wxString("        ClientID : ") << GetClientID());
 		AddLogLineC(wxString("        Port     : ") << thePrefs::GetPort());
 		AddLogLineC(wxString("        User Nick: ") << thePrefs::GetUserNick());
 		AddLogLineC(wxString("        Edonkey  : ") << EDONKEYVERSION);
-		#endif
+#endif
 		theStats::AddUpOverheadServer(packet->GetPacketSize());
 		SendPacket(packet, true, sender);
-	} else if (sender->GetConnectionState() == CS_CONNECTED){
+	} else if (sender->GetConnectionState() == CS_CONNECTED) {
 		theStats::AddReconnect();
 		theStats::GetServerConnectTimer()->ResetTimer();
 		connected = true;
-		AddLogLineC(CFormat( _("Connection established on: %s") ) % sender->cur_server->GetListName());
+		AddLogLineC(CFormat(_("Connection established on: %s")) % sender->cur_server->GetListName());
 		connectedsocket = sender;
 
 		StopConnectionTry();
 
-		CServer* update = theApp->serverlist->GetServerByAddress(connectedsocket->cur_server->GetAddress(),sender->cur_server->GetPort());
-		if ( update ) {
+		CServer *update = theApp->serverlist->GetServerByAddress(
+			connectedsocket->cur_server->GetAddress(), sender->cur_server->GetPort());
+		if (update) {
 			Notify_ServerHighlight(update, true);
 		}
 
@@ -287,27 +325,26 @@
 
 		// tecxx 1609 2002 - serverlist update
 		if (thePrefs::AddServersFromServer()) {
-			CPacket* packet = new CPacket(OP_GETSERVERLIST, 0, OP_EDONKEYPROT);
+			CPacket *packet = new CPacket(OP_GETSERVERLIST, 0, OP_EDONKEYPROT);
 			theStats::AddUpOverheadServer(packet->GetPacketSize());
 			SendPacket(packet, true);
-			#ifdef DEBUG_CLIENT_PROTOCOL
+#ifdef DEBUG_CLIENT_PROTOCOL
 			AddLogLineC("Client: OP_GETSERVERLIST");
-			#endif
+#endif
 		}
 	}
 
 	theApp->ShowConnectionState();
 }
 
-
-bool CServerConnect::SendPacket(CPacket* packet,bool delpacket, CServerSocket* to)
+bool CServerConnect::SendPacket(CPacket *packet, bool delpacket, CServerSocket *to)
 {
 	if (!to) {
 		if (connected) {
 			connectedsocket->SendPacket(packet, delpacket, true);
 			return true;
 		} else {
-			if ( delpacket ) {
+			if (delpacket) {
 				delete packet;
 			}
 
@@ -319,8 +356,8 @@
 	}
 }
 
-
-bool CServerConnect::SendUDPPacket(CPacket* packet, CServer* host, bool delpacket, bool rawpacket, uint16 port_offset)
+bool CServerConnect::SendUDPPacket(
+	CPacket *packet, CServer *host, bool delpacket, bool rawpacket, uint16 port_offset)
 {
 	if (connected) {
 		serverudpsocket->SendPacket(packet, host, delpacket, rawpacket, port_offset);
@@ -331,53 +368,45 @@
 	return true;
 }
 
-
-void CServerConnect::ConnectionFailed(CServerSocket* sender)
+void CServerConnect::ConnectionFailed(CServerSocket *sender)
 {
-	if (connecting == false && sender != connectedsocket)
-	{
+	if (connecting == false && sender != connectedsocket) {
 		// just return, cleanup is done by the socket itself
 		return;
 	}
-	//messages
-	CServer* pServer = theApp->serverlist->GetServerByAddress(sender->cur_server->GetAddress(), sender->cur_server->GetPort());
-	switch (sender->GetConnectionState()){
-		case CS_FATALERROR:
-			AddLogLineC(_("Fatal Error while trying to connect. Internet connection might be down"));
-			break;
-		case CS_DISCONNECTED:
-			theApp->sharedfiles->ClearED2KPublishInfo();
-			AddLogLineN(CFormat( _("Lost connection to %s (%s:%i)") )
-				% sender->cur_server->GetListName()
-				% sender->cur_server->GetFullIP()
-				% sender->cur_server->GetPort() );
-
-			if (pServer){
-				Notify_ServerHighlight(pServer, false);
-			}
-			break;
-		case CS_SERVERDEAD:
-			AddLogLineN(CFormat( _("%s (%s:%i) appears to be dead.") )
-				% sender->cur_server->GetListName()
-				% sender->cur_server->GetFullIP()
-				% sender->cur_server->GetPort() );
-
-			if (pServer) {
-				pServer->AddFailedCount();
-				Notify_ServerRefresh( pServer );
-			}
-			break;
-		case CS_ERROR:
-			break;
-		case CS_SERVERFULL:
-			AddLogLineN(CFormat( _("%s (%s:%i) appears to be full.") )
-				% sender->cur_server->GetListName()
-				% sender->cur_server->GetFullIP()
-				% sender->cur_server->GetPort() );
+	CServer *pServer = theApp->serverlist->GetServerByAddress(
+		sender->cur_server->GetAddress(), sender->cur_server->GetPort());
+	switch (sender->GetConnectionState()) {
+	case CS_FATALERROR:
+		AddLogLineC(_("Fatal Error while trying to connect. Internet connection might be down"));
+		break;
+	case CS_DISCONNECTED:
+		theApp->sharedfiles->ClearED2KPublishInfo();
+		AddLogLineN(CFormat(_("Lost connection to %s (%s:%i)")) % sender->cur_server->GetListName() %
+			    sender->cur_server->GetFullIP() % sender->cur_server->GetPort());
 
-			break;
-		case CS_NOTCONNECTED:;
-			break;
+		if (pServer) {
+			Notify_ServerHighlight(pServer, false);
+		}
+		break;
+	case CS_SERVERDEAD:
+		AddLogLineN(CFormat(_("%s (%s:%i) appears to be dead.")) % sender->cur_server->GetListName() %
+			    sender->cur_server->GetFullIP() % sender->cur_server->GetPort());
+
+		if (pServer) {
+			pServer->AddFailedCount();
+			Notify_ServerRefresh(pServer);
+		}
+		break;
+	case CS_ERROR:
+		break;
+	case CS_SERVERFULL:
+		AddLogLineN(CFormat(_("%s (%s:%i) appears to be full.")) % sender->cur_server->GetListName() %
+			    sender->cur_server->GetFullIP() % sender->cur_server->GetPort());
+
+		break;
+	case CS_NOTCONNECTED:;
+		break;
 	}
 
 	// IMPORTANT: mark this socket not to be deleted in StopConnectionTry(),
@@ -385,69 +414,71 @@
 	sender->m_bIsDeleting = true;
 
 	switch (sender->GetConnectionState()) {
-		case CS_FATALERROR:{
-			bool autoretry= !singleconnecting;
-			StopConnectionTry();
-			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;
+	case CS_FATALERROR: {
+		bool autoretry = !singleconnecting;
+		StopConnectionTry();
+		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;
+	}
+	case CS_DISCONNECTED: {
+		theApp->sharedfiles->ClearED2KPublishInfo();
+		connected = false;
+		Notify_ServerHighlight(sender->cur_server, false);
+		if (connectedsocket) {
+			connectedsocket->Close();
+		}
+		connectedsocket = NULL;
+		theApp->searchlist->StopSearch(true);
+		Notify_SearchCancel();
+		theStats::GetServerConnectTimer()->StopTimer();
+		if (thePrefs::Reconnect() && !connecting) {
+			ConnectToAnyServer();
 		}
-		case CS_DISCONNECTED:{
-			theApp->sharedfiles->ClearED2KPublishInfo();
-			connected = false;
-			Notify_ServerHighlight(sender->cur_server,false);
-			if (connectedsocket)  {
-				connectedsocket->Close();
-			}
-			connectedsocket = NULL;
-			theApp->searchlist->StopSearch(true);
-			Notify_SearchCancel();
-			theStats::GetServerConnectTimer()->StopTimer();
-			if (thePrefs::Reconnect() && !connecting){
-				ConnectToAnyServer();
-			}
 
-			AddLogLineC(_("Connection lost") );
+		AddLogLineC(_("Connection lost"));
+		break;
+	}
+	case CS_ERROR:
+	case CS_NOTCONNECTED: {
+		if (!connecting)
+			break;
+		AddLogLineN(CFormat(_("Connecting to %s (%s:%i) failed.")) % sender->info %
+			    sender->cur_server->GetFullIP() % sender->cur_server->GetPort());
+	}
+	/* fall through */
+	case CS_SERVERDEAD:
+	case CS_SERVERFULL: {
+		if (!connecting) {
 			break;
 		}
-		case CS_ERROR:
-		case CS_NOTCONNECTED:{
-			if (!connecting)
-				break;
-			AddLogLineN(CFormat( _("Connecting to %s (%s:%i) failed.") )
-				% sender->info
-				% sender->cur_server->GetFullIP()
-				% sender->cur_server->GetPort() );
-		}
-		/* fall through */
-		case CS_SERVERDEAD:
-		case CS_SERVERFULL:{
-			if (!connecting) {
+		if (singleconnecting) {
+			if (pServer && sender->IsServerCryptEnabledConnection() &&
+				!thePrefs::IsClientCryptLayerRequired()) {
+				// try reconnecting without obfuscation
+				ConnectToServer(pServer, false, true);
 				break;
 			}
-			if (singleconnecting) {
-				if (pServer && sender->IsServerCryptEnabledConnection() && !thePrefs::IsClientCryptLayerRequired()){
-					// try reconnecting without obfuscation
-					ConnectToServer(pServer, false, true);
-					break;
-				}
 
-				StopConnectionTry();
-				break;
-			}
+			StopConnectionTry();
+			break;
+		}
 
-			ServerSocketMap::iterator it = connectionattemps.begin();
-			while ( it != connectionattemps.end() ){
-				if ( it->second == sender ) {
-					connectionattemps.erase( it );
-					break;
-				}
-				++it;
+		ServerSocketMap::iterator it = connectionattemps.begin();
+		while (it != connectionattemps.end()) {
+			if (it->second == sender) {
+				connectionattemps.erase(it);
+				break;
 			}
-			TryAnotherConnectionrequest();
+			++it;
 		}
+		TryAnotherConnectionrequest();
+	}
 	}
 	theApp->ShowConnectionState();
 }
@@ -457,27 +488,26 @@
 	uint64 dwCurTick = GetTickCount64();
 
 	ServerSocketMap::iterator it = connectionattemps.begin();
-	while ( it != connectionattemps.end() ){
-		if ( !it->second ) {
+	while (it != connectionattemps.end()) {
+		if (!it->second) {
 			AddLogLineN(_("ERROR: Socket invalid at timeout check"));
-			connectionattemps.erase( it );
+			connectionattemps.erase(it);
 			return;
 		}
 
-		if ( dwCurTick - it->first > CONSERVTIMEOUT) {
+		if (dwCurTick - it->first > CONSERVTIMEOUT) {
 			uint64 key = it->first;
-			CServerSocket* value = it->second;
+			CServerSocket *value = it->second;
 			++it;
 			if (!value->IsSolving()) {
-				AddLogLineN(CFormat( _("Connection attempt to %s (%s:%i) timed out.") )
-					% value->info
-					% value->cur_server->GetFullIP()
-					% value->cur_server->GetPort() );
+				AddLogLineN(CFormat(_("Connection attempt to %s (%s:%i) timed out.")) %
+					    value->info % value->cur_server->GetFullIP() %
+					    value->cur_server->GetPort());
 
-				connectionattemps.erase( key );
+				connectionattemps.erase(key);
 
 				TryAnotherConnectionrequest();
-				DestroySocket( value );
+				DestroySocket(value);
 			}
 		} else {
 			++it;
@@ -485,7 +515,6 @@
 	}
 }
 
-
 bool CServerConnect::Disconnect()
 {
 	if (connected && connectedsocket) {
@@ -493,9 +522,8 @@
 
 		connected = false;
 
-		CServer* update = theApp->serverlist->GetServerByAddress(
-			connectedsocket->cur_server->GetAddress(),
-			connectedsocket->cur_server->GetPort());
+		CServer *update = theApp->serverlist->GetServerByAddress(
+			connectedsocket->cur_server->GetAddress(), connectedsocket->cur_server->GetPort());
 		Notify_ServerHighlight(update, false);
 		theApp->SetPublicIP(0);
 		DestroySocket(connectedsocket);
@@ -508,9 +536,8 @@
 	}
 }
 
-
-CServerConnect::CServerConnect(CServerList* in_serverlist, amuleIPV4Address &address)
-: m_idRetryTimer(theApp,ID_SERVER_RETRY_TIMER_EVENT)
+CServerConnect::CServerConnect(CServerList *in_serverlist, amuleIPV4Address &address)
+: m_idRetryTimer(theApp, ID_SERVER_RETRY_TIMER_EVENT)
 {
 	connectedsocket = NULL;
 	used_list = in_serverlist;
@@ -521,8 +548,8 @@
 	singleconnecting = false;
 	m_recurseTryAnotherConnectionrequest = false;
 	m_bTryObfuscated = thePrefs::IsServerCryptLayerTCPRequested();
+	m_hostnameResolvedThisSweep = false;
 
-	// initialize socket for udp packets
 	if (thePrefs::GetNetworkED2K()) {
 		serverudpsocket = new CServerUDPSocket(address, thePrefs::GetProxyData());
 	} else {
@@ -530,21 +557,16 @@
 	}
 }
 
-
 CServerConnect::~CServerConnect()
 {
 	m_idRetryTimer.Stop();
-	// stop all connections
 	StopConnectionTry();
-	// close connected socket, if any
 	DestroySocket(connectedsocket);
 	connectedsocket = NULL;
-	// close udp socket
 	delete serverudpsocket;
 }
 
-
-CServer* CServerConnect::GetCurrentServer()
+CServer *CServerConnect::GetCurrentServer()
 {
 	if (IsConnected() && connectedsocket) {
 		return connectedsocket->cur_server;
@@ -552,7 +574,6 @@
 	return NULL;
 }
 
-
 void CServerConnect::SetClientID(uint32 newid)
 {
 	clientid = newid;
@@ -562,8 +583,7 @@
 	}
 }
 
-
-void CServerConnect::DestroySocket(CServerSocket* pSck)
+void CServerConnect::DestroySocket(CServerSocket *pSck)
 {
 	if (pSck == NULL) {
 		return;
@@ -572,35 +592,30 @@
 	pSck->Destroy();
 }
 
-
 bool CServerConnect::IsLocalServer(uint32 dwIP, uint16 nPort)
 {
-	if (IsConnected()){
-		if (connectedsocket->cur_server->GetIP() == dwIP && connectedsocket->cur_server->GetPort() == nPort)
+	if (IsConnected()) {
+		if (connectedsocket->cur_server->GetIP() == dwIP &&
+			connectedsocket->cur_server->GetPort() == nPort)
 			return true;
 	}
 	return false;
 }
 
-
 bool CServerConnect::IsServerIP(uint32 ip) const
 {
 	if (ip == 0) {
 		return false;
 	}
 	// Match the live connection first -- cheapest, hottest case.
-	if (connectedsocket && connectedsocket->cur_server
-		&& connectedsocket->cur_server->GetIP() == ip) {
+	if (connectedsocket && connectedsocket->cur_server && connectedsocket->cur_server->GetIP() == ip) {
 		return true;
 	}
-	// Then any login still in flight.  m_lstOpenSockets includes
-	// connectedsocket too, but the early-out above keeps the common
-	// case to a single pointer chase; the loop only runs when we're
-	// actively trying multiple servers in parallel, which is bounded
-	// by max_simcons (typically 2-3) so it's negligible.
-	for (SocketsList::const_iterator it = m_lstOpenSockets.begin();
-		 it != m_lstOpenSockets.end(); ++it) {
-		const CServerSocket* sock = *it;
+	// Then any login still in flight. m_lstOpenSockets includes connectedsocket too, but the
+	// early-out above keeps the common case to a single pointer chase; the loop only runs while
+	// several servers are tried in parallel, bounded by max_simcons.
+	for (SocketsList::const_iterator it = m_lstOpenSockets.begin(); it != m_lstOpenSockets.end(); ++it) {
+		const CServerSocket *sock = *it;
 		if (sock && sock->cur_server && sock->cur_server->GetIP() == ip) {
 			return true;
 		}
@@ -608,31 +623,29 @@
 	return false;
 }
 
-
 void CServerConnect::KeepConnectionAlive()
 {
 	uint64 dwServerKeepAliveTimeout = thePrefs::GetServerKeepAliveTimeout();
 	if (dwServerKeepAliveTimeout && connected && connectedsocket &&
-	connectedsocket->connectionstate == CS_CONNECTED &&
-	GetTickCount64() - connectedsocket->GetLastTransmission() >= dwServerKeepAliveTimeout) {
+		connectedsocket->connectionstate == CS_CONNECTED &&
+		GetTickCount64() - connectedsocket->GetLastTransmission() >= dwServerKeepAliveTimeout) {
 		// "Ping" the server if the TCP connection was not used for the specified interval with
 		// an empty publish files packet -> recommended by lugdunummaster himself!
 
 		CMemFile files(4);
-		files.WriteUInt32(0); //nFiles
+		files.WriteUInt32(0); // nFiles
 
-		CPacket* packet = new CPacket(files, OP_EDONKEYPROT, OP_OFFERFILES);
-		#ifdef DEBUG_CLIENT_PROTOCOL
+		CPacket *packet = new CPacket(files, OP_EDONKEYPROT, OP_OFFERFILES);
+#ifdef DEBUG_CLIENT_PROTOCOL
 		AddLogLineC("Client: OP_OFFERFILES");
-		#endif
-		// compress packet
-		//   - this kind of data is highly compressible (N * (1 MD4 and at least 3 string meta data tags and 1 integer meta data tag))
-		//   - the min. amount of data needed for one published file is ~100 bytes
-		//   - this function is called once when connecting to a server and when a file becomes shareable - so, it's called rarely.
-		//   - if the compressed size is still >= the original size, we send the uncompressed packet
-		// therefore we always try to compress the packet
+#endif
+		// Always try to compress the packet. This data is highly compressible (N * one MD4,
+		// at least 3 string meta tags and 1 integer meta tag), the minimum for one
+		// published file is ~100 bytes, and this runs rarely -- once on connecting to a
+		// server, and when a file becomes shareable. If the compressed size is still >= the
+		// original, the uncompressed packet is sent.
 		theStats::AddUpOverheadServer(packet->GetPacketSize());
-		connectedsocket->SendPacket(packet,true);
+		connectedsocket->SendPacket(packet, true);
 
 		AddDebugLogLineN(logServer, "Refreshing server connection");
 	}
@@ -644,7 +657,7 @@
 	ServerSocketMap::iterator it = connectionattemps.begin();
 
 	while (it != connectionattemps.end()) {
-		const CServerSocket* serversocket = it->second;
+		const CServerSocket *serversocket = it->second;
 		if (serversocket && (serversocket->GetConnectionState() == CS_WAITFORLOGIN) &&
 			(serversocket->GetServerIP() == dwIP)) {
 			return true;
@@ -655,14 +668,12 @@
 	return false;
 }
 
-
 bool CServerConnect::IsConnectedObfuscated() const
 {
 	return connectedsocket != NULL && connectedsocket->IsObfusicating();
 }
 
-
-void CServerConnect::OnServerHostnameResolved(void* socket, uint32 ip)
+void CServerConnect::OnServerHostnameResolved(void *socket, uint32 ip)
 {
 	// The socket object might have been deleted while we waited for the hostname
 	// to be resolved, so we check if it's still among the open sockets.
@@ -674,5 +685,4 @@
 	}
 }
 
-
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ServerConnect.h -> amule-3.1.0.tar.gz/src/ServerConnect.h Changed

@@ -23,18 +23,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-//
 // Client to Server communication
-//
 
 #ifndef SERVERCONNECT_H
 #define SERVERCONNECT_H
 
+#include "amuleIPV4Address.h" // Needed for amuleIPV4Address
+#include "Timer.h"            // Needed for CTimer
 
-#include "amuleIPV4Address.h"	// Needed for amuleIPV4Address
-#include "Timer.h"		// Needed for CTimer
-
-#include <map>			// Needed for std::map
+#include <map> // Needed for std::map
 
 class CServerList;
 class CServerSocket;
@@ -42,92 +39,116 @@
 class CPacket;
 class CServerUDPSocket;
 
-#define CS_FATALERROR	-5
-#define CS_DISCONNECTED	-4
-#define CS_SERVERDEAD	-3
-#define	CS_ERROR	-2
-#define CS_SERVERFULL	-1
-#define	CS_NOTCONNECTED	0
-#define	CS_CONNECTING	1
-#define	CS_CONNECTED	2
-#define	CS_WAITFORLOGIN	3
-#define CS_RETRYCONNECTTIME  30 // seconds
-
-typedef std::map<uint64, CServerSocket*> ServerSocketMap;
-
-class CServerConnect {
+#define CS_FATALERROR -5
+#define CS_DISCONNECTED -4
+#define CS_SERVERDEAD -3
+#define CS_ERROR -2
+#define CS_SERVERFULL -1
+#define CS_NOTCONNECTED 0
+#define CS_CONNECTING 1
+#define CS_CONNECTED 2
+#define CS_WAITFORLOGIN 3
+#define CS_RETRYCONNECTTIME 30 // seconds
+
+typedef std::map<uint64, CServerSocket *> ServerSocketMap;
+
+class CServerConnect
+{
 public:
-	CServerConnect(CServerList* in_serverlist, amuleIPV4Address &address);
+	CServerConnect(CServerList *in_serverlist, amuleIPV4Address &address);
 	~CServerConnect();
 
-	void	ConnectionFailed(CServerSocket* sender);
-	void	ConnectionEstablished(CServerSocket* sender);
+	void ConnectionFailed(CServerSocket *sender);
+	void ConnectionEstablished(CServerSocket *sender);
 
-	void	ConnectToAnyServer(bool prioSort = true, bool bNoCrypt = false);
-	void	ConnectToServer(CServer* toconnect, bool multiconnect = false, bool bNoCrypt = false);
-	void	StopConnectionTry();
-	void	CheckForTimeout();
+	void ConnectToAnyServer(bool prioSort = true, bool bNoCrypt = false);
+	void ConnectToServer(CServer *toconnect, bool multiconnect = false, bool bNoCrypt = false);
+	void StopConnectionTry();
+	void CheckForTimeout();
 
 	// safe socket closure and destruction
-	void	DestroySocket(CServerSocket* pSck);
-	bool	SendPacket(CPacket* packet,bool delpacket = true, CServerSocket* to = 0);
+	void DestroySocket(CServerSocket *pSck);
+	bool SendPacket(CPacket *packet, bool delpacket = true, CServerSocket *to = 0);
 
 	// Creteil Begin
-	bool	IsUDPSocketAvailable() const { return serverudpsocket != NULL; }
+	bool IsUDPSocketAvailable() const { return serverudpsocket != NULL; }
 	// Creteil End
 
-	bool	SendUDPPacket(CPacket* packet,CServer* host, bool delpacket, bool rawpacket = false, uint16 port_offset = 4);
-	bool	Disconnect();
-	bool	IsConnecting()	{ return connecting; }
-	bool	IsConnected()	{ return connected; }
-	uint32	GetClientID()	{ return clientid; }
-	CServer*GetCurrentServer();
-	uint32	clientid;
-	bool	IsLowID()	{ return ::IsLowID(clientid); }
-	void	SetClientID(uint32 newid);
-	bool	IsLocalServer(uint32 dwIP, uint16 nPort);
-
-	/// True if `ip` matches the IP of the currently-connected ed2k server
-	/// or any in-flight CServerSocket whose login attempt is still
-	/// outstanding.  Used by CClientTCPSocket to short-circuit the
-	/// global download-bandwidth throttler for inbound peer connections
-	/// that are actually the server's HighID-callback probe (#778).
-	/// Without that bypass, a saturated peer-side download budget delays
-	/// the probe past the server's verification timer and we end up with
+	bool SendUDPPacket(CPacket *packet,
+		CServer *host,
+		bool delpacket,
+		bool rawpacket = false,
+		uint16 port_offset = 4);
+	bool Disconnect();
+	bool IsConnecting() { return connecting; }
+	bool IsConnected() { return connected; }
+	uint32 GetClientID() { return clientid; }
+	CServer *GetCurrentServer();
+	uint32 clientid;
+	bool IsLowID() { return ::IsLowID(clientid); }
+	void SetClientID(uint32 newid);
+	bool IsLocalServer(uint32 dwIP, uint16 nPort);
+
+	/// True if `ip` matches the currently connected ed2k server, or any in-flight CServerSocket
+	/// whose login attempt is still outstanding. CClientTCPSocket uses it to short-circuit the
+	/// global download-bandwidth throttler for inbound peer connections that are really the
+	/// server's HighID-callback probe (#778). Without that bypass, a saturated peer-side
+	/// download budget delays the probe past the server's verification timer and we end up with
 	/// a permanent LowID under sustained load.
-	bool	IsServerIP(uint32 ip) const;
-	void	TryAnotherConnectionrequest();
-	bool	IsSingleConnect()	{ return singleconnecting; }
-	void	KeepConnectionAlive();
+	bool IsServerIP(uint32 ip) const;
+	void TryAnotherConnectionrequest();
+	bool IsSingleConnect() { return singleconnecting; }
+	void KeepConnectionAlive();
 
 	bool AwaitingTestFromIP(uint32 ip);
 	bool IsConnectedObfuscated() const;
 
+	//! Records that a server's hostname resolved during the current sweep.
+	void NoteHostnameResolved() { m_hostnameResolvedThisSweep = true; }
+
+	/**
+	 * Whether a resolver has answered since the current sweep began.
+	 *
+	 * A server whose hostname does not resolve is the commonest way an eD2k server dies, and
+	 * pruning it is the point of "remove dead servers" -- but with the link down nothing
+	 * resolves, and blaming the whole list for that is what emptied it (issue #887). One server
+	 * failing to resolve while others answered is the case that says something about that
+	 * server, and this is what separates the two.
+	 *
+	 * Only a lookup that actually ran counts: most of server.met carries an address already,
+	 * and going straight to connect proves nothing about the resolver. Cleared by
+	 * StopConnectionTry(), which every sweep ends at, so a connect made outside one is never
+	 * judged on an earlier sweep's link.
+	 */
+	bool HostnameResolvedThisSweep() const { return m_hostnameResolvedThisSweep; }
+
 	/**
 	 * Called when a socket has been DNS resolved.
 	 *
-	 * @param socket The socket object requesting DNS resolution.
+	 * @param socket The socket object requesting DNS resolution. May or may not refer to a
+	 * valid
+	 *               object, so check before use.
 	 * @param ip The found IP, or zero on error.
-	 *
-	 * Note that 'socket' may or may not refer to an valid object,
-	 * and should be checked before being used.
 	 */
-	void OnServerHostnameResolved(void* socket, uint32 ip);
+	void OnServerHostnameResolved(void *socket, uint32 ip);
+
 private:
-	bool	connecting;
-	bool	singleconnecting;
-	bool	connected;
-	int8	max_simcons;
-	bool	m_bTryObfuscated;
-	bool	m_recurseTryAnotherConnectionrequest;
-	CServerSocket*	connectedsocket;
-	CServerList*	used_list;
-	CServerUDPSocket*	serverudpsocket;
+	bool connecting;
+	bool singleconnecting;
+	bool connected;
+	int8 max_simcons;
+	bool m_bTryObfuscated;
+	bool m_recurseTryAnotherConnectionrequest;
+	//! See HostnameResolvedThisSweep(); reset as each sweep starts.
+	bool m_hostnameResolvedThisSweep;
+	CServerSocket *connectedsocket;
+	CServerList *used_list;
+	CServerUDPSocket *serverudpsocket;
 
 	// list of currently opened sockets
-	typedef	std::list<CServerSocket*>	SocketsList;
-	SocketsList	m_lstOpenSockets;
-	CTimer	m_idRetryTimer;
+	typedef std::list<CServerSocket *> SocketsList;
+	SocketsList m_lstOpenSockets;
+	CTimer m_idRetryTimer;
 
 	ServerSocketMap connectionattemps;
 };

amule-3.0.1.tar.gz/src/ServerList.cpp -> amule-3.1.0.tar.gz/src/ServerList.cpp Changed

@@ -25,7 +25,7 @@
 
 #include <wx/wx.h>
 
-#include "ServerList.h"			// Interface declarations.
+#include "ServerList.h" // Interface declarations.
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Constants.h>
@@ -34,25 +34,25 @@
 
 #include <wx/txtstrm.h>
 #include <wx/wfstream.h>
-#include <wx/uri.h>			// Needed for wxURI
+#include <wx/uri.h> // Needed for wxURI
 #include <wx/tokenzr.h>
 
-#include "DownloadQueue.h"		// Needed for CDownloadQueue
-#include "ServerConnect.h"		// Needed for CServerConnect
-#include "Server.h"			// Needed for CServer and SRV_PR_*
-#include "OtherStructs.h"		// Needed for ServerMet_Struct
-#include "CFile.h"			// Needed for CFile
-#include "HTTPDownload.h"		// Needed for HTTPThread
-#include "Preferences.h"		// Needed for thePrefs
-#include "amule.h"			// Needed for theApp
-#include "Statistics.h"			// Needed for theStats
-#include "Packet.h"			// Needed for CPacket
+#include "DownloadQueue.h" // Needed for CDownloadQueue
+#include "ServerConnect.h" // Needed for CServerConnect
+#include "Server.h"        // Needed for CServer and SRV_PR_*
+#include "OtherStructs.h"  // Needed for ServerMet_Struct
+#include "CFile.h"         // Needed for CFile
+#include "HTTPDownload.h"  // Needed for HTTPThread
+#include "Preferences.h"   // Needed for thePrefs
+#include "amule.h"         // Needed for theApp
+#include "Statistics.h"    // Needed for theStats
+#include "Packet.h"        // Needed for CPacket
 #include "Logger.h"
 #include "ScopedPtr.h"
 #include <common/Format.h>
 #include "IPFilter.h"
-#include <common/FileFunctions.h>	// Needed for UnpackArchive
-#include <common/TextFile.h>	// Needed for CTextFile
+#include <common/FileFunctions.h> // Needed for UnpackArchive
+#include <common/TextFile.h>      // Needed for CTextFile
 
 CServerList::CServerList()
 {
@@ -61,37 +61,31 @@
 	m_initialized = false;
 }
 
-
 bool CServerList::Init()
 {
-	// Load Metfile
 	bool bRes = LoadServerMet(CPath(thePrefs::GetConfigDir() + "server.met"));
 
 	// insert static servers from textfile
 	m_staticServersConfig = thePrefs::GetConfigDir() + "staticservers.dat";
 	LoadStaticServers();
 
-	// The HTTP auto-update of server.met used to be kicked from here, but
-	// that fires the libcurl request before the heavy local I/O (partfile
-	// load + shared-file scan) — the wxWebSession worker thread then
-	// competes with the saturated main thread for CPU, libcurl state
-	// machine advances less, and the DNS resolution can time out on
-	// slower setups. The kick now lives in CamuleApp::OnInit() after
-	// sharedfiles->Reload() finishes. See StartAutoUpdate() / #714.
+	// The HTTP auto-update of server.met used to be kicked from here, but that fires the
+	// libcurl request before the heavy local I/O (partfile load + shared-file scan): the
+	// wxWebSession worker then competes with the saturated main thread, the curl state machine
+	// advances less, and DNS can time out on slower setups. The kick now lives in
+	// CamuleApp::OnInit() after sharedfiles->Reload() finishes (#714).
 
 	m_initialized = true;
 	return bRes;
 }
 
-
 void CServerList::StartAutoUpdate()
 {
 	current_url_index = 0;
 	AutoUpdate();
 }
 
-
-bool CServerList::LoadServerMet(const CPath& path)
+bool CServerList::LoadServerMet(const CPath &path)
 {
 	AddLogLineN(CFormat(_("Loading server.met file: %s")) % path);
 
@@ -102,28 +96,30 @@
 		return false;
 	}
 
-	// Try to unpack the file, might be an archive
-	const char* mets = { "server.met", NULL };
+	const char *mets = { "server.met", NULL };
 	// Try to unpack the file, might be an archive
 	if (UnpackArchive(path, mets).second != EFT_Met) {
-		AddLogLineC(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() ){
-		AddLogLineN(_("Failed to open server.met!") );
+	if (!servermet.IsOpened()) {
+		AddLogLineN(_("Failed to open server.met!"));
 		return false;
 	}
 
-
 	try {
 		Notify_ServerFreeze();
 
 		uint8_t version = servermet.ReadUInt8();
 
 		if (version != 0xE0 && version != MET_HEADER) {
-			AddLogLineC(CFormat(_("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;
 		}
@@ -133,38 +129,35 @@
 		ServerMet_Struct sbuffer;
 		uint32 iAddCount = 0;
 
-		for ( uint32 j = 0; j < fservercount; ++j ) {
-			sbuffer.ip		= servermet.ReadUInt32();
-			sbuffer.port		= servermet.ReadUInt16();
-			sbuffer.tagcount	= servermet.ReadUInt32();
+		for (uint32 j = 0; j < fservercount; ++j) {
+			sbuffer.ip = servermet.ReadUInt32();
+			sbuffer.port = servermet.ReadUInt16();
+			sbuffer.tagcount = servermet.ReadUInt32();
 
-			CServer* newserver = new CServer(&sbuffer);
+			CServer *newserver = new CServer(&sbuffer);
 
-			// Load tags
-			for ( uint32 i = 0; i < sbuffer.tagcount; ++i ) {
+			for (uint32 i = 0; i < sbuffer.tagcount; ++i) {
 				newserver->AddTagFromFile(&servermet);
 			}
 
-			// Server priorities are not in sorted order
-			// High = 1, Low = 2, Normal = 0, so we have to check
-			// in a less logical fashion.
+			// Server priorities are not in sorted order -- High = 1, Low = 2, Normal =
+			// 0 -- so the check reads less logically than it might.
 			int priority = newserver->GetPreferences();
 			if (priority < SRV_PR_MIN || priority > SRV_PR_MAX) {
 				newserver->SetPreference(SRV_PR_NORMAL);
 			}
 
-			// set listname for server
-			if ( newserver->GetListName().IsEmpty() ) {
-				newserver->SetListName("Server " +newserver->GetAddress());
+			if (newserver->GetListName().IsEmpty()) {
+				newserver->SetListName("Server " + newserver->GetAddress());
 			}
 
-
-			if ( !theApp->AddServer(newserver) ) {
-				CServer* update = GetServerByAddress(newserver->GetAddress(), newserver->GetPort());
-				if(update) {
-					update->SetListName( newserver->GetListName());
-					if(!newserver->GetDescription().IsEmpty()) {
-						update->SetDescription( newserver->GetDescription());
+			if (!theApp->AddServer(newserver)) {
+				CServer *update =
+					GetServerByAddress(newserver->GetAddress(), newserver->GetPort());
+				if (update) {
+					update->SetListName(newserver->GetListName());
+					if (!newserver->GetDescription().IsEmpty()) {
+						update->SetDescription(newserver->GetDescription());
 					}
 					Notify_ServerRefresh(update);
 				}
@@ -172,22 +165,25 @@
 			} else {
 				++iAddCount;
 			}
-
 		}
 
 		Notify_ServerThaw();
 
 		// cppcheck-suppress duplicateBranch
 		if (!merge) {
-			AddLogLineC(CFormat(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 {
-			AddLogLineC(CFormat(wxPLURAL("%d server added", "%d servers added", iAddCount)) % iAddCount);
+			AddLogLineC(CFormat(wxPLURAL("%d server added", "%d servers added", iAddCount)) %
+				    iAddCount);
 		}
-	} catch (const CInvalidPacket& err) {
+	} catch (const CInvalidPacket &err) {
 		AddLogLineC(_("Error: the file 'server.met' is corrupted: ") + err.what());
 		Notify_ServerThaw();
 		return false;
-	} catch (const CSafeIOException& err) {
+	} catch (const CSafeIOException &err) {
 		AddLogLineC(_("IO error while reading 'server.met': ") + err.what());
 		Notify_ServerThaw();
 		return false;
@@ -196,56 +192,46 @@
 	return true;
 }
 
-
-bool CServerList::AddServer(CServer* in_server, bool fromUser)
+bool CServerList::AddServer(CServer *in_server, bool fromUser)
 {
-	if ( !in_server->GetPort() ) {
-		if ( fromUser ) {
-			AddLogLineC(CFormat( _("Server not added: %s:%d does not specify a valid port.") )
-					% in_server->GetAddress()
-					% in_server->GetPort()
-			);
+	if (!in_server->GetPort()) {
+		if (fromUser) {
+			AddLogLineC(CFormat(_("Server not added: %s:%d does not specify a valid port.")) %
+				    in_server->GetAddress() % in_server->GetPort());
 		}
 
 		return false;
-	} else if (
-				!in_server->HasDynIP() &&
-				(
-					!IsGoodIP( in_server->GetIP(), thePrefs::FilterLanIPs() ) ||
-					(	// 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 ) {
-			AddLogLineC(CFormat( _("Server not added: The IP of %s:%d is filtered or invalid.") )
-					% in_server->GetAddress()
-					% in_server->GetPort()
-			);
+	} else if (!in_server->HasDynIP() &&
+		   (!IsGoodIP(in_server->GetIP(), thePrefs::FilterLanIPs()) ||
+			   ( // 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) {
+			AddLogLineC(
+				CFormat(_("Server not added: The IP of %s:%d is filtered or invalid.")) %
+				in_server->GetAddress() % in_server->GetPort());
 		}
 
 		return false;
 	}
 
-	CServer* test_server = GetServerByAddress(in_server->GetAddress(), in_server->GetPort());
-	// Avoid duplicate (dynIP) servers: If the server which is to be added, is a dynIP-server
-	// but we don't know yet it's DN, we need to search for an already available server with
-	// that IP.
+	CServer *test_server = GetServerByAddress(in_server->GetAddress(), in_server->GetPort());
+	// Avoid duplicate (dynIP) servers: if the server to add is a dynIP server whose DN we do
+	// not know yet, search for an already available server with that IP.
 	if (test_server == NULL && in_server->GetIP() != 0) {
 		test_server = GetServerByIPTCP(in_server->GetIP(), in_server->GetPort());
 	}
 
 	if (test_server) {
-		if ( fromUser ) {
-			AddLogLineC(CFormat( _("Server not added: Server with matching IP:Port %s:%d found in list.") )
-					% in_server->GetAddress()
-					% in_server->GetPort()
-			);
+		if (fromUser) {
+			AddLogLineC(CFormat(_("Server not added: Server with matching IP:Port %s:%d found "
+					      "in list.")) %
+				    in_server->GetAddress() % in_server->GetPort());
 		}
 
 		test_server->ResetFailedCount();
-		Notify_ServerRefresh( test_server );
+		Notify_ServerRefresh(test_server);
 
 		return false;
 	}
@@ -253,50 +239,52 @@
 	theStats::AddServer();
 
 	m_servers.push_back(in_server);
-	NotifyObservers( EventType( EventType::INSERTED, in_server ) );
-
-	if ( fromUser ) {
-		AddLogLineC(CFormat( _("Server added: Server at %s:%d using the name '%s'.") )
-				% in_server->GetAddress()
-				% in_server->GetPort()
-				% in_server->GetListName()
-		);
-	}
+	NotifyObservers(EventType(EventType::INSERTED, in_server));
 
+	if (fromUser) {
+		AddLogLineC(CFormat(_("Server added: Server at %s:%d using the name '%s'.")) %
+			    in_server->GetAddress() % in_server->GetPort() % in_server->GetListName());
+	}
 
 	return true;
 }
 
-
 void CServerList::ServerStats()
 {
 	uint64 tNow = ::GetTickCount64();
 	time_t currentTime = time(NULL);
 
 	if (theApp->IsConnectedED2K() && !m_servers.empty()) {
-		CServer* ping_server = GetNextStatServer();
-		CServer* test = ping_server;
+		CServer *ping_server = GetNextStatServer();
+		CServer *test = ping_server;
 		if (!ping_server) {
 			return;
 		}
 
-		while (ping_server->GetLastPingedTime() && currentTime < (ping_server->GetLastPingedTime() + UDPSERVSTATREASKTIME)) {
+		while (ping_server->GetLastPingedTime() &&
+			currentTime < (ping_server->GetLastPingedTime() + UDPSERVSTATREASKTIME)) {
 			ping_server = GetNextStatServer();
 			if (ping_server == test) {
 				return;
 			}
 		}
 
-		if (ping_server->GetFailedCount() >= thePrefs::GetDeadserverRetries() && thePrefs::DeadServer() && !ping_server->IsStaticMember()) {
+		if (ping_server->GetFailedCount() >= thePrefs::GetDeadserverRetries() &&
+			thePrefs::DeadServer() && !ping_server->IsStaticMember()) {
 			RemoveServer(ping_server);
 			return;
 		}
 
 		srand((unsigned)time(NULL));
-		ping_server->SetRealLastPingedTime(currentTime); // this is not used to calculate the next ping, but only to ensure a minimum delay for premature pings
-		if (!ping_server->GetCryptPingReplyPending() && (!ping_server->GetLastPingedTime() || currentTime >= (ping_server->GetLastPingedTime() + UDPSERVSTATREASKTIME)) && theApp->GetPublicIP() && thePrefs::IsServerCryptLayerUDPEnabled()) {
-			// We try a obfsucation ping first and wait 20 seconds for an answer
-			// if it doesn't get responded to, we don't count it as error but continue with a normal ping
+		ping_server->SetRealLastPingedTime(
+			currentTime); // this is not used to calculate the next ping, but only to ensure a
+				      // minimum delay for premature pings
+		if (!ping_server->GetCryptPingReplyPending() &&
+			(!ping_server->GetLastPingedTime() ||
+				currentTime >= (ping_server->GetLastPingedTime() + UDPSERVSTATREASKTIME)) &&
+			theApp->GetPublicIP() && thePrefs::IsServerCryptLayerUDPEnabled()) {
+			// Try an obfuscation ping first and wait 20 seconds for an answer. No
+			// answer is not counted as an error; we continue with a normal ping.
 			ping_server->SetCryptPingReplyPending(true);
 			uint32 nPacketLen = 4 + (uint8)(rand() % 16); // max padding 16 bytes
 			CScopedArray<uint8_t> pRawPacket(nPacketLen);
@@ -306,33 +294,46 @@
 			}
 
 			memcpy(pRawPacket.get(), &dwChallenge, sizeof(uint32));
-			for (uint32 i = 4; i < nPacketLen; i++) { // fillng up the remaining bytes with random data
+			for (uint32 i = 4; i < nPacketLen;
+				i++) { // fillng up the remaining bytes with random data
 				pRawPacketi = (uint8)rand();
 			}
 
 			ping_server->SetChallenge(dwChallenge);
-			ping_server->SetLastPinged(tNow); //in milliseconds, to calculate the ping
-			ping_server->SetLastPingedTime((currentTime - UDPSERVSTATREASKTIME) + 20); //in seconds, give it 20 extra seconds to respond
+			ping_server->SetLastPinged(tNow); // in milliseconds, to calculate the ping
+			ping_server->SetLastPingedTime((currentTime - UDPSERVSTATREASKTIME) +
+						       20); // in seconds, give it 20 extra seconds to respond
 
-			AddDebugLogLineN(logServerUDP, CFormat(">> Sending OP__GlobServStatReq (obfuscated) to server %s:%u") % ping_server->GetAddress() % ping_server->GetPort());
+			AddDebugLogLineN(logServerUDP,
+				CFormat(">> Sending OP__GlobServStatReq (obfuscated) to server %s:%u") %
+					ping_server->GetAddress() % ping_server->GetPort());
 
-			CPacket* packet = new CPacket(pRawPacket1, nPacketLen - 2, pRawPacket0);
+			CPacket *packet = new CPacket(pRawPacket1, nPacketLen - 2, pRawPacket0);
 			packet->CopyToDataBuffer(0, pRawPacket.get() + 2, nPacketLen - 2);
 
 			theStats::AddUpOverheadServer(packet->GetPacketSize());
-			theApp->serverconnect->SendUDPPacket(packet, ping_server, true, true /*raw packet*/, 12 /* Port offset is 12 for obfuscated encryption*/);
-		} else if (ping_server->GetCryptPingReplyPending() || theApp->GetPublicIP() == 0 || !thePrefs::IsServerCryptLayerUDPEnabled()){
-			// 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()) {
-				AddDebugLogLineN(logServerUDP, "CryptPing failed for server " + ping_server->GetListName());
+			theApp->serverconnect->SendUDPPacket(packet,
+				ping_server,
+				true,
+				true /*raw packet*/,
+				12 /* Port offset is 12 for obfuscated encryption*/);
+		} else if (ping_server->GetCryptPingReplyPending() || theApp->GetPublicIP() == 0 ||
+			   !thePrefs::IsServerCryptLayerUDPEnabled()) {
+			// 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()) {
+				AddDebugLogLineN(logServerUDP,
+					"CryptPing failed for server " + ping_server->GetListName());
 			} else if (thePrefs::IsServerCryptLayerUDPEnabled()) {
-				AddDebugLogLineN(logServerUDP, "CryptPing skipped because our public IP is unknown for server " + ping_server->GetListName());
+				AddDebugLogLineN(logServerUDP,
+					"CryptPing skipped because our public IP is unknown for server " +
+						ping_server->GetListName());
 			}
 
 			ping_server->SetCryptPingReplyPending(false);
 
-			CPacket* packet = new CPacket(OP_GLOBSERVSTATREQ, 4, OP_EDONKEYPROT);
+			CPacket *packet = new CPacket(OP_GLOBSERVSTATREQ, 4, OP_EDONKEYPROT);
 			uint32 challenge = 0x55AA0000 + (uint16)rand();
 			ping_server->SetChallenge(challenge);
 			packet->CopyUInt32ToDataBuffer(challenge);
@@ -348,19 +349,21 @@
 	}
 }
 
-
-void CServerList::RemoveServer(CServer* in_server)
+void CServerList::RemoveServer(CServer *in_server)
 {
 	if (in_server == theApp->serverconnect->GetCurrentServer()) {
-		theApp->ShowAlert(_("You are connected to the server you are trying to delete. please disconnect first."), _("Info"), wxOK);
+		theApp->ShowAlert(_("You are connected to the server you are trying to delete. please "
+				    "disconnect first."),
+			_("Info"),
+			wxOK);
 	} else {
 		CInternalList::iterator it = std::find(m_servers.begin(), m_servers.end(), in_server);
-		if ( it != m_servers.end() ) {
+		if (it != m_servers.end()) {
 			if (theApp->downloadqueue->GetUDPServer() == in_server) {
-				theApp->downloadqueue->SetUDPServer( 0 );
+				theApp->downloadqueue->SetUDPServer(0);
 			}
 
-			NotifyObservers( EventType( EventType::REMOVED, in_server ) );
+			NotifyObservers(EventType(EventType::REMOVED, in_server));
 
 			if (m_serverpos == it) {
 				++m_serverpos;
@@ -372,19 +375,20 @@
 			theStats::DeleteServer();
 
 			Notify_ServerRemove(in_server);
+			theApp->ForgetECObject(in_server->ECID());
 			delete in_server;
 		}
 	}
 }
 
-
 void CServerList::RemoveAllServers()
 {
-	NotifyObservers( EventType( EventType::CLEARED ) );
+	NotifyObservers(EventType(EventType::CLEARED));
 
 	theStats::DeleteAllServers();
 	// no connection, safely remove all servers
-	while ( !m_servers.empty() ) {
+	while (!m_servers.empty()) {
+		theApp->ForgetECObject(m_servers.back()->ECID());
 		delete m_servers.back();
 		m_servers.pop_back();
 	}
@@ -392,21 +396,21 @@
 	m_statserverpos = m_servers.end();
 }
 
-
-void CServerList::GetStatus(uint32 &failed, uint32 &user, uint32 &file, uint32 &tuser, uint32 &tfile,float &occ)
+void CServerList::GetStatus(
+	uint32 &failed, uint32 &user, uint32 &file, uint32 &tuser, uint32 &tfile, float &occ)
 {
 	failed = 0;
 	user = 0;
 	file = 0;
-	tuser=0;
+	tuser = 0;
 	tfile = 0;
-	occ=0;
-	uint32 maxusers=0;
+	occ = 0;
+	uint32 maxusers = 0;
 	uint32 tuserk = 0;
 
 	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it) {
-		const CServer* const curr = *it;
-		if( curr->GetFailedCount() ) {
+		const CServer *const curr = *it;
+		if (curr->GetFailedCount()) {
 			++failed;
 		} else {
 			user += curr->GetUsers();
@@ -417,51 +421,48 @@
 
 		if (curr->GetMaxUsers()) {
 			tuserk += curr->GetUsers(); // total users on servers with known maximum
-			maxusers+=curr->GetMaxUsers();
+			maxusers += curr->GetMaxUsers();
 		}
 	}
-	if (maxusers>0) {
-		occ=(float)(tuserk*100)/maxusers;
+	if (maxusers > 0) {
+		occ = (float)(tuserk * 100) / maxusers;
 	}
 }
 
-
 void CServerList::GetUserFileStatus(uint32 &user, uint32 &file)
 {
 	user = 0;
 	file = 0;
 	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it) {
-		const CServer* const curr = *it;
-		if( !curr->GetFailedCount() ) {
+		const CServer *const curr = *it;
+		if (!curr->GetFailedCount()) {
 			user += curr->GetUsers();
 			file += curr->GetFiles();
 		}
 	}
 }
 
-
 CServerList::~CServerList()
 {
 	if (thePrefs::GetNetworkED2K() && IsInitialized()) {
 		SaveServerMet();
 	}
-	while ( !m_servers.empty() ) {
+	while (!m_servers.empty()) {
 		delete m_servers.back();
 		m_servers.pop_back();
 	}
 }
 
-
 void CServerList::LoadStaticServers()
 {
-	if ( !CPath::FileExists(m_staticServersConfig) ) {
+	if (!CPath::FileExists(m_staticServersConfig)) {
 		return;
 	}
 
 	wxFileInputStream stream(m_staticServersConfig);
 	wxTextInputStream f(stream);
 
-	while ( !stream.Eof() ) {
+	while (!stream.Eof()) {
 		wxString line = f.ReadLine();
 
 		// Skip comments
@@ -469,52 +470,45 @@
 			continue;
 		}
 
-		wxStringTokenizer tokens( line, "," );
+		wxStringTokenizer tokens(line, ",");
 
-		if ( tokens.CountTokens() != 3 ) {
+		if (tokens.CountTokens() != 3) {
 			continue;
 		}
 
-
 		// format is host:port,priority,Name
-		wxString addy = tokens.GetNextToken().Strip( wxString::both );
-		wxString prio = tokens.GetNextToken().Strip( wxString::both );
-		wxString name = tokens.GetNextToken().Strip( wxString::both );
-
-		wxString host = addy.BeforeFirst( ':' );
-		wxString port = addy.AfterFirst( ':' );
+		wxString addy = tokens.GetNextToken().Strip(wxString::both);
+		wxString prio = tokens.GetNextToken().Strip(wxString::both);
+		wxString name = tokens.GetNextToken().Strip(wxString::both);
 
+		wxString host = addy.BeforeFirst(':');
+		wxString port = addy.AfterFirst(':');
 
-		int priority = StrToLong( prio );
+		int priority = StrToLong(prio);
 		if (priority < SRV_PR_MIN || priority > SRV_PR_MAX) {
 			priority = SRV_PR_NORMAL;
 		}
 
-
 		// We need a valid name for the list
-		if ( name.IsEmpty() ) {
+		if (name.IsEmpty()) {
 			name = addy;
 		}
 
+		CServer *server = new CServer(StrToLong(port), host);
 
-		// create server object and add it to the list
-		CServer* server = new CServer( StrToLong( port ), host );
-
-		server->SetListName( name );
-		server->SetIsStaticMember( true );
-		server->SetPreference( priority );
+		server->SetListName(name);
+		server->SetIsStaticMember(true);
+		server->SetPreference(priority);
 
-
-		// Try to add the server to the list
-		if ( !theApp->AddServer( server ) ) {
+		if (!theApp->AddServer(server)) {
 			delete server;
-			CServer* existing = GetServerByAddress( host, StrToULong( port ) );
-			if ( existing) {
-				existing->SetListName( name );
-				existing->SetIsStaticMember( true );
-				existing->SetPreference( priority );
+			CServer *existing = GetServerByAddress(host, StrToULong(port));
+			if (existing) {
+				existing->SetListName(name);
+				existing->SetIsStaticMember(true);
+				existing->SetPreference(priority);
 
-				Notify_ServerRefresh( existing );
+				Notify_ServerRefresh(existing);
 			}
 		}
 	}
@@ -524,43 +518,40 @@
 {
 	CTextFile file;
 	if (!file.Open(m_staticServersConfig, CTextFile::write)) {
-		AddLogLineN(CFormat( _("Failed to open '%s'") ) % m_staticServersConfig );
+		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;
+		const CServer *server = *it;
 
 		if (server->IsStaticMember()) {
-			file.WriteLine(CFormat("%s:%u,%u,%s")
-				% server->GetAddress() % server->GetPort()
-				% server->GetPreferences() % server->GetListName());
+			file.WriteLine(CFormat("%s:%u,%u,%s") % server->GetAddress() % server->GetPort() %
+				       server->GetPreferences() % server->GetListName());
 		}
 	}
 
 	file.Close();
 }
 
-struct ServerPriorityComparator {
+struct ServerPriorityComparator
+{
 	// Return true iff lhs should strictly appear earlier in the list than rhs.
 	// In this case, we want higher priority servers to appear earlier.
-	bool operator()(const CServer* lhs, const CServer* rhs) {
-		wxASSERT
-			(
-			rhs->GetPreferences() == SRV_PR_LOW		||
-			rhs->GetPreferences() == SRV_PR_NORMAL	||
-			rhs->GetPreferences() == SRV_PR_HIGH
-			);
+	bool operator()(const CServer *lhs, const CServer *rhs)
+	{
+		wxASSERT(rhs->GetPreferences() == SRV_PR_LOW || rhs->GetPreferences() == SRV_PR_NORMAL ||
+			 rhs->GetPreferences() == SRV_PR_HIGH);
 		switch (lhs->GetPreferences()) {
-			case SRV_PR_LOW:
-				return false;
-			case SRV_PR_NORMAL:
-				return rhs->GetPreferences() == SRV_PR_LOW;
-			case SRV_PR_HIGH:
-				return rhs->GetPreferences() != SRV_PR_HIGH;
-			default:
-				wxFAIL;
-				return false;
+		case SRV_PR_LOW:
+			return false;
+		case SRV_PR_NORMAL:
+			return rhs->GetPreferences() == SRV_PR_LOW;
+		case SRV_PR_HIGH:
+			return rhs->GetPreferences() != SRV_PR_HIGH;
+		default:
+			wxFAIL;
+			return false;
 		}
 	}
 };
@@ -568,18 +559,17 @@
 void CServerList::Sort()
 {
 	m_servers.sort(ServerPriorityComparator());
-	// Once the list has been sorted, it doesn't really make sense to continue
-	// traversing the new order from the old position.  Plus, there's a bug in
-	// version of libstdc++ before gcc4 such that iterators that were equal to
-	// end() were left dangling.
+	// Once the list has been sorted, continuing to traverse the new order from the old position
+	// makes no sense -- and in libstdc++ before gcc4, iterators equal to end() were left
+	// dangling.
 	m_serverpos = m_servers.begin();
 	m_statserverpos = m_servers.begin();
 }
 
-
-CServer* CServerList::GetNextServer(bool bOnlyObfuscated)
+CServer *CServerList::GetNextServer(bool bOnlyObfuscated)
 {
-	while (bOnlyObfuscated && (m_serverpos != m_servers.end()) && !((*m_serverpos)->SupportsObfuscationTCP() || (*m_serverpos)->SupportsObfuscationUDP())) {
+	while (bOnlyObfuscated && (m_serverpos != m_servers.end()) &&
+		!((*m_serverpos)->SupportsObfuscationTCP() || (*m_serverpos)->SupportsObfuscationUDP())) {
 		wxASSERT(*m_serverpos != NULL);
 		++m_serverpos;
 	}
@@ -595,8 +585,7 @@
 	}
 }
 
-
-CServer* CServerList::GetNextStatServer()
+CServer *CServerList::GetNextStatServer()
 {
 	if (m_statserverpos == m_servers.end()) {
 		m_statserverpos = m_servers.begin();
@@ -610,11 +599,10 @@
 	}
 }
 
-
-CServer* CServerList::GetServerByAddress(const wxString& address, uint16 port) const
+CServer *CServerList::GetServerByAddress(const wxString &address, uint16 port) const
 {
 	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it) {
-		CServer* const s = *it;
+		CServer *const s = *it;
 		if (port == s->GetPort() && s->GetAddress() == address) {
 			return s;
 		}
@@ -622,47 +610,43 @@
 	return NULL;
 }
 
-
-CServer* CServerList::GetServerByIP(uint32 nIP) const
+CServer *CServerList::GetServerByIP(uint32 nIP) const
 {
-	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it){
-        CServer* const s = *it;
+	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it) {
+		CServer *const s = *it;
 		if (s->GetIP() == nIP)
 			return s;
 	}
 	return NULL;
 }
 
-
-CServer* CServerList::GetServerByIPTCP(uint32 nIP, uint16 nPort) const
+CServer *CServerList::GetServerByIPTCP(uint32 nIP, uint16 nPort) const
 {
-	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it){
-        CServer* const s = *it;
+	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it) {
+		CServer *const s = *it;
 		if (s->GetIP() == nIP && s->GetPort() == nPort)
 			return s;
 	}
 	return NULL;
 }
 
-
-CServer* CServerList::GetServerByIPUDP(uint32 nIP, uint16 nUDPPort, bool bObfuscationPorts) const
+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))
+	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))
 			return s;
 	}
 	return NULL;
 }
 
-
-CServer* CServerList::GetServerByECID(uint32 ecid) const
+CServer *CServerList::GetServerByECID(uint32 ecid) const
 {
-	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it){
-        CServer* const s = *it;
+	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it) {
+		CServer *const s = *it;
 		if (s->ECID() == ecid) {
 			return s;
 		}
@@ -670,22 +654,19 @@
 	return NULL;
 }
 
-
-void CServerList::SetStaticServer(CServer* server, bool isStatic)
+void CServerList::SetStaticServer(CServer *server, bool isStatic)
 {
 	server->SetIsStaticMember(isStatic);
 	Notify_ServerRefresh(server);
 	SaveStaticServers();
 }
 
-
-void CServerList::SetServerPrio(CServer* server, uint32 prio)
+void CServerList::SetServerPrio(CServer *server, uint32 prio)
 {
 	server->SetPreference(prio);
 	Notify_ServerRefresh(server);
 }
 
-
 bool CServerList::SaveServerMet()
 {
 	CPath curservermet = CPath(thePrefs::GetConfigDir() + "server.met");
@@ -698,10 +679,10 @@
 
 	try {
 		servermet.WriteUInt8(0xE0);
-		servermet.WriteUInt32( m_servers.size() );
+		servermet.WriteUInt32(m_servers.size());
 
-		for ( CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it) {
-			const CServer* const server = *it;
+		for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it) {
+			const CServer *const server = *it;
 
 			uint16 tagcount = 12;
 			if (!server->GetListName().IsEmpty()) {
@@ -718,13 +699,13 @@
 			}
 
 			// For unicoded name, description, and dynip
-			if ( !server->GetListName().IsEmpty() ) {
+			if (!server->GetListName().IsEmpty()) {
 				++tagcount;
 			}
-			if ( !server->GetDynIP().IsEmpty() ) {
+			if (!server->GetDynIP().IsEmpty()) {
 				++tagcount;
 			}
-			if ( !server->GetDescription().IsEmpty() ) {
+			if (!server->GetDescription().IsEmpty()) {
 				++tagcount;
 			}
 			if (!server->GetVersion().IsEmpty()) {
@@ -751,61 +732,71 @@
 			servermet.WriteUInt16(server->GetPort());
 			servermet.WriteUInt32(tagcount);
 
-			if ( !server->GetListName().IsEmpty() ) {
+			if (!server->GetListName().IsEmpty()) {
 				// This is BOM to keep eMule compatibility
-				CTagString( ST_SERVERNAME, server->GetListName()).WriteTagToFile( &servermet,  utf8strOptBOM);
-				CTagString( ST_SERVERNAME, server->GetListName()).WriteTagToFile( &servermet );
+				CTagString(ST_SERVERNAME, server->GetListName())
+					.WriteTagToFile(&servermet, utf8strOptBOM);
+				CTagString(ST_SERVERNAME, server->GetListName()).WriteTagToFile(&servermet);
 			}
 
-			if ( !server->GetDynIP().IsEmpty() ) {
+			if (!server->GetDynIP().IsEmpty()) {
 				// This is BOM to keep eMule compatibility
-				CTagString( ST_DYNIP, server->GetDynIP()).WriteTagToFile( &servermet, utf8strOptBOM );
-				CTagString( ST_DYNIP, server->GetDynIP()).WriteTagToFile( &servermet );
+				CTagString(ST_DYNIP, server->GetDynIP())
+					.WriteTagToFile(&servermet, utf8strOptBOM);
+				CTagString(ST_DYNIP, server->GetDynIP()).WriteTagToFile(&servermet);
 			}
 
-			if ( !server->GetDescription().IsEmpty() ) {
+			if (!server->GetDescription().IsEmpty()) {
 				// This is BOM to keep eMule compatibility
-				CTagString( ST_DESCRIPTION, server->GetDescription()).WriteTagToFile( &servermet, utf8strOptBOM );
-				CTagString( ST_DESCRIPTION, server->GetDescription()).WriteTagToFile( &servermet );
+				CTagString(ST_DESCRIPTION, server->GetDescription())
+					.WriteTagToFile(&servermet, utf8strOptBOM);
+				CTagString(ST_DESCRIPTION, server->GetDescription())
+					.WriteTagToFile(&servermet);
 			}
 
-			if ( server->GetConnPort() != server->GetPort() ) {
-				CTagString( ST_AUXPORTSLIST,	server->GetAuxPortsList()	).WriteTagToFile( &servermet );
+			if (server->GetConnPort() != server->GetPort()) {
+				CTagString(ST_AUXPORTSLIST, server->GetAuxPortsList())
+					.WriteTagToFile(&servermet);
 			}
 
-			CTagInt32( ST_FAIL,       server->GetFailedCount()   ).WriteTagToFile( &servermet );
-			CTagInt32( ST_PREFERENCE, server->GetPreferences()   ).WriteTagToFile( &servermet );
-			CTagInt32( "users",  server->GetUsers()         ).WriteTagToFile( &servermet );
-			CTagInt32( "files",  server->GetFiles()         ).WriteTagToFile( &servermet );
-			CTagInt32( ST_PING,       server->GetPing()          ).WriteTagToFile( &servermet );
-			//CTagInt32 will actually save an uint32 - safe until Y2106
-			CTagInt32( ST_LASTPING,   (uint32)server->GetLastPingedTime()).WriteTagToFile( &servermet );
-			CTagInt32( ST_MAXUSERS,   server->GetMaxUsers()      ).WriteTagToFile( &servermet );
-			CTagInt32( ST_SOFTFILES,  server->GetSoftFiles()     ).WriteTagToFile( &servermet );
-			CTagInt32( ST_HARDFILES,  server->GetHardFiles()     ).WriteTagToFile( &servermet );
-			if (!server->GetVersion().IsEmpty()){
-				CTagString( ST_VERSION,	server->GetVersion() ).WriteTagToFile( &servermet, utf8strOptBOM );
-				CTagString( ST_VERSION,	server->GetVersion() ).WriteTagToFile( &servermet );
+			CTagInt32(ST_FAIL, server->GetFailedCount()).WriteTagToFile(&servermet);
+			CTagInt32(ST_PREFERENCE, server->GetPreferences()).WriteTagToFile(&servermet);
+			CTagInt32("users", server->GetUsers()).WriteTagToFile(&servermet);
+			CTagInt32("files", server->GetFiles()).WriteTagToFile(&servermet);
+			CTagInt32(ST_PING, server->GetPing()).WriteTagToFile(&servermet);
+			// CTagInt32 will actually save an uint32 - safe until Y2106
+			CTagInt32(ST_LASTPING, (uint32)server->GetLastPingedTime())
+				.WriteTagToFile(&servermet);
+			CTagInt32(ST_MAXUSERS, server->GetMaxUsers()).WriteTagToFile(&servermet);
+			CTagInt32(ST_SOFTFILES, server->GetSoftFiles()).WriteTagToFile(&servermet);
+			CTagInt32(ST_HARDFILES, server->GetHardFiles()).WriteTagToFile(&servermet);
+			if (!server->GetVersion().IsEmpty()) {
+				CTagString(ST_VERSION, server->GetVersion())
+					.WriteTagToFile(&servermet, utf8strOptBOM);
+				CTagString(ST_VERSION, server->GetVersion()).WriteTagToFile(&servermet);
 			}
-			CTagInt32( ST_UDPFLAGS,   server->GetUDPFlags()      ).WriteTagToFile( &servermet );
-			CTagInt32( ST_LOWIDUSERS, server->GetLowIDUsers()    ).WriteTagToFile( &servermet );
+			CTagInt32(ST_UDPFLAGS, server->GetUDPFlags()).WriteTagToFile(&servermet);
+			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).
@@ -816,28 +807,28 @@
 
 		servermet.Close();
 
-	} catch (const CIOFailureException& e) {
-		AddLogLineC("IO failure while writing 'server.met': " + e.what());
+	} catch (const CIOFailureException &e) {
+		AddLogLineC(CFormat(_("IO failure while writing 'server.met': %s")) % e.what());
 		return false;
 	}
 
 	return true;
 }
 
-
 void CServerList::RemoveDeadServers()
 {
-	if ( thePrefs::DeadServer() ) {
-		for ( CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ) {
-			CServer* server = *it++;
-			if ( server->GetFailedCount() > thePrefs::GetDeadserverRetries() && !server->IsStaticMember()) {
+	if (thePrefs::DeadServer()) {
+		for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end();) {
+			CServer *server = *it++;
+			if (server->GetFailedCount() > thePrefs::GetDeadserverRetries() &&
+				!server->IsStaticMember()) {
 				RemoveServer(server);
 			}
 		}
 	}
 }
 
-void CServerList::UpdateServerMetFromURL(const wxString& strURL)
+void CServerList::UpdateServerMetFromURL(const wxString &strURL)
 {
 	if (strURL.Find("://") == -1) {
 		AddLogLineC(_("Invalid URL"));
@@ -845,157 +836,151 @@
 	}
 	m_URLUpdate = strURL;
 	wxString strTempFilename(thePrefs::GetConfigDir() + "server.met.download");
-	CHTTPDownloadThread *downloader = new CHTTPDownloadThread(strURL, strTempFilename, thePrefs::GetConfigDir() + "server.met", HTTP_ServerMet, false, false);
+	CHTTPDownloadThread *downloader = new CHTTPDownloadThread(strURL,
+		strTempFilename,
+		thePrefs::GetConfigDir() + "server.met",
+		HTTP_ServerMet,
+		false,
+		false);
 	downloader->Create();
 	downloader->Run();
 }
 
-
 bool CServerList::DownloadFinished(uint32 result)
 {
 	bool ret = false;
-	if(result == HTTP_Success) {
+	if (result == HTTP_Success) {
 		const CPath tempFilename = CPath(thePrefs::GetConfigDir() + "server.met.download");
 
-		// curl succeeded. proceed with server.met loading
 		LoadServerMet(tempFilename);
 		SaveServerMet();
 
-		// So, file is loaded and merged, and also saved
 		CPath::RemoveFile(tempFilename);
 		AddLogLineN(CFormat(_("Finished downloading the server list from %s")) % m_URLUpdate);
 		ret = true;
-	// cppcheck-suppress duplicateBranch
+		// cppcheck-suppress duplicateBranch
 	} else if (result == HTTP_Skipped) {
-		AddLogLineN(CFormat(_("Skipped download of %s, because requested file is not newer.")) % "server.met");
+		AddLogLineN(CFormat(_("Skipped download of %s, because requested file is not newer.")) %
+			    "server.met");
 	} else {
 		AddLogLineC(CFormat(_("Failed to download %s from %s")) % "server.met" % m_URLUpdate);
 	}
 	return ret;
 }
 
-
 void CServerList::AutoUpdate()
 {
 
 	uint8 url_count = theApp->glob_prefs->addresses_list.GetCount();
 
 	if (!url_count) {
-		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"));
+		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.
-	while ( current_url_index < url_count ) {
+	while (current_url_index < url_count) {
 		wxString URI = theApp->glob_prefs->addresses_listcurrent_url_index;
-		// wxURL only registers protocol handlers for http and ftp, so
-		// any https URL would come back as wxURL_NOPROTO and be rejected
-		// here — but the download itself goes through wxWebRequest,
-		// which handles https fine (#714). Validate with wxURI (RFC
-		// 3986 parser) + an explicit scheme check instead.
+		// wxURL only registers protocol handlers for http and ftp, so any https URL would
+		// come back as wxURL_NOPROTO and be rejected -- while the download itself goes
+		// through wxWebRequest, which handles https fine (#714). Validate with wxURI plus
+		// an explicit scheme check instead.
 		wxURI uri(URI);
 		const wxString scheme = uri.HasScheme() ? uri.GetScheme().Lower() : wxString();
-		if ( uri.HasServer() && (scheme == "http" || scheme == "https") ) {
-			// Ok, got a valid URI
+		if (uri.HasServer() && (scheme == "http" || scheme == "https")) {
 			m_URLUpdate = URI;
-			wxString strTempFilename =
-				thePrefs::GetConfigDir() + "server_auto.met";
-			AddLogLineC(CFormat(
-				_("Start downloading server list from %s")) % URI);
-			CHTTPDownloadThread *downloader = new CHTTPDownloadThread(
-				URI, strTempFilename, thePrefs::GetConfigDir() + "server.met", HTTP_ServerMetAuto, false, false);
+			wxString strTempFilename = thePrefs::GetConfigDir() + "server_auto.met";
+			AddLogLineC(CFormat(_("Start downloading server list from %s")) % URI);
+			CHTTPDownloadThread *downloader = new CHTTPDownloadThread(URI,
+				strTempFilename,
+				thePrefs::GetConfigDir() + "server.met",
+				HTTP_ServerMetAuto,
+				false,
+				false);
 			downloader->Create();
 			downloader->Run();
 
 			return;
 		} else {
-			AddLogLineC(CFormat(
-				_("WARNING: invalid URL specified for auto-updating of servers: %s") ) % URI);
+			AddLogLineC(
+				CFormat(_(
+					"WARNING: invalid URL specified for auto-updating of servers: %s")) %
+				URI);
 		}
 		current_url_index++;
 	}
 	AddLogLineC(_("No valid server.met auto-download url on addresses.dat"));
 }
 
-
 void CServerList::AutoDownloadFinished(uint32 result)
 {
 	if (result == HTTP_Success) {
 		CPath tempFilename = CPath(thePrefs::GetConfigDir() + "server_auto.met");
 
-		// curl succeeded. proceed with server.met loading
 		LoadServerMet(tempFilename);
 		SaveServerMet();
 
-		// So, file is loaded and merged, and also saved
 		CPath::RemoveFile(tempFilename);
 	} else {
-		AddLogLineC(CFormat(_("Failed to download the server list from %s") ) % m_URLUpdate);
+		AddLogLineC(CFormat(_("Failed to download the server list from %s")) % m_URLUpdate);
 	}
 
 	++current_url_index;
 
 	if (current_url_index < theApp->glob_prefs->addresses_list.GetCount()) {
-		// Next!
 		AutoUpdate();
 	}
 }
 
-
-void CServerList::ObserverAdded( ObserverType* o )
+void CServerList::ObserverAdded(ObserverType *o)
 {
-	CObservableQueue<CServer*>::ObserverAdded( o );
+	CObservableQueue<CServer *>::ObserverAdded(o);
 
 	EventType::ValueList ilist;
-	ilist.reserve( m_servers.size() );
-	ilist.assign( m_servers.begin(), m_servers.end() );
+	ilist.reserve(m_servers.size());
+	ilist.assign(m_servers.begin(), m_servers.end());
 
-	NotifyObservers( EventType( EventType::INITIAL, &ilist ), o );
+	NotifyObservers(EventType(EventType::INITIAL, &ilist), o);
 }
 
-
 uint32 CServerList::GetAvgFile() const
 {
-	//Since there is no real way to know how many files are in the kad network,
-	//I figure to try to use the ED2K network stats to find how many files the
-	//average user shares..
+	// There is no real way to know how many files are in the Kad network, so use the ED2K
+	// network stats to find how many files the average user shares.
 	uint32 totaluser = 0;
 	uint32 totalfile = 0;
-	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it){
-		const CServer* const curr = *it;
-		//If this server has reported Users/Files and doesn't limit it's files too much
-		//use this in the calculation..
-		if( curr->GetUsers() && curr->GetFiles() && curr->GetSoftFiles() > 1000 ) {
+	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it) {
+		const CServer *const curr = *it;
+		// If this server has reported Users/Files and doesn't limit it's files too much
+		// use this in the calculation..
+		if (curr->GetUsers() && curr->GetFiles() && curr->GetSoftFiles() > 1000) {
 			totaluser += curr->GetUsers();
 			totalfile += curr->GetFiles();
 		}
 	}
-	//If the user count is a little low, don't send back a average..
-	//I added 50 to the count as many servers do not allow a large amount of files to be shared..
-	//Therefore the estimate here will be lower then the actual.
-	//I would love to add a way for the client to send some statistics back so we could see the real
-	//values here..
-	if ( totaluser > 500000 ) {
-		return (totalfile/totaluser)+50;
+	// If the user count is a little low, do not send back an average. 50 is added to the count
+	// because many servers do not allow a large number of files to be shared, so the estimate
+	// is lower than the actual.
+	if (totaluser > 500000) {
+		return (totalfile / totaluser) + 50;
 	} else {
 		return 0;
 	}
 }
 
-
-std::vector<const CServer*> CServerList::CopySnapshot() const
+std::vector<const CServer *> CServerList::CopySnapshot() const
 {
-	std::vector<const CServer*> result;
+	std::vector<const CServer *> result;
 	result.reserve(m_servers.size());
 	result.assign(m_servers.begin(), m_servers.end());
 	return result;
 }
 
-
 void CServerList::FilterServers()
 {
 	CInternalList::iterator it = m_servers.begin();
 	while (it != m_servers.end()) {
-		CServer* server = *it++;
+		CServer *server = *it++;
 
 		if (server->HasDynIP()) {
 			continue;
@@ -1003,7 +988,8 @@
 
 		if (theApp->ipfilter->IsFiltered(server->GetIP(), true)) {
 			if (server == theApp->serverconnect->GetCurrentServer()) {
-				AddLogLineC(_("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();
@@ -1014,7 +1000,8 @@
 	}
 }
 
-void CServerList::CheckForExpiredUDPKeys() {
+void CServerList::CheckForExpiredUDPKeys()
+{
 
 	if (!thePrefs::IsServerCryptLayerUDPEnabled()) {
 		return;
@@ -1025,17 +1012,21 @@
 	uint32 cPingDelayed = 0;
 	const uint32 dwIP = theApp->GetPublicIP();
 	const time_t currentTime = time(NULL);
-	wxASSERT( dwIP != 0 );
+	wxASSERT(dwIP != 0);
 
 	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it) {
-        CServer* pServer = *it;
-		if (pServer->SupportsObfuscationUDP() && pServer->GetServerKeyUDP(true) != 0 && pServer->GetServerKeyUDPIP() != dwIP){
+		CServer *pServer = *it;
+		if (pServer->SupportsObfuscationUDP() && pServer->GetServerKeyUDP(true) != 0 &&
+			pServer->GetServerKeyUDPIP() != dwIP) {
 			cKeysTotal++;
 			cKeysExpired++;
-			if (currentTime < pServer->GetRealLastPingedTime() + UDPSERVSTATMINREASKTIME){
+			if (currentTime < pServer->GetRealLastPingedTime() + UDPSERVSTATMINREASKTIME) {
 				cPingDelayed++;
 				// next ping: Now + (MinimumDelay - already elapsed time)
-				pServer->SetLastPingedTime((currentTime - UDPSERVSTATREASKTIME) + (UDPSERVSTATMINREASKTIME - (currentTime - pServer->GetRealLastPingedTime())));
+				pServer->SetLastPingedTime(
+					(currentTime - UDPSERVSTATREASKTIME) +
+					(UDPSERVSTATMINREASKTIME -
+						(currentTime - pServer->GetRealLastPingedTime())));
 			} else {
 				pServer->SetLastPingedTime(0);
 			}

amule-3.0.1.tar.gz/src/ServerList.h -> amule-3.1.0.tar.gz/src/ServerList.h Changed

@@ -31,39 +31,39 @@
 class CServer;
 class CPacket;
 
-class CServerList : public CObservableQueue<CServer*>
+class CServerList : public CObservableQueue<CServer *>
 {
 	friend class CServerListCtrl;
 
 public:
 	CServerList();
 	~CServerList();
-	bool		Init();
-	bool		AddServer(CServer* in_server, bool fromUser = false);
-	void		RemoveServer(CServer* in_server);
-	void		RemoveAllServers();
-	void		RemoveDeadServers();
-	bool		LoadServerMet(const CPath& path);
-	bool		SaveServerMet();
-	void		ServerStats();
-	void		ResetServerPos()	{m_serverpos = m_servers.begin();}
-	CServer*	GetNextServer(bool bOnlyObfuscated = false);
-	size_t		GetServerCount()	{return m_servers.size();}
-	CServer*	GetServerByAddress(const wxString& address, uint16 port) const;
-	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);
-	bool		DownloadFinished(uint32 result);
-	void		AutoDownloadFinished(uint32 result);
-	uint32		GetAvgFile() const;
+	bool Init();
+	bool AddServer(CServer *in_server, bool fromUser = false);
+	void RemoveServer(CServer *in_server);
+	void RemoveAllServers();
+	void RemoveDeadServers();
+	bool LoadServerMet(const CPath &path);
+	bool SaveServerMet();
+	void ServerStats();
+	void ResetServerPos() { m_serverpos = m_servers.begin(); }
+	CServer *GetNextServer(bool bOnlyObfuscated = false);
+	size_t GetServerCount() { return m_servers.size(); }
+	CServer *GetServerByAddress(const wxString &address, uint16 port) const;
+	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);
+	bool DownloadFinished(uint32 result);
+	void AutoDownloadFinished(uint32 result);
+	uint32 GetAvgFile() const;
 
-	std::vector<const CServer*> CopySnapshot() const;
+	std::vector<const CServer *> CopySnapshot() const;
 
 	/** Refilters all servers though the IPFilter. */
 	void FilterServers();
@@ -73,43 +73,41 @@
 	/**
 	 * Marks the specified server as static or not.
 	 *
-	 * @param The server to be marked or unmarked as static.
-	 * @param The new static state.
+	 * As well as setting the server's static flag, this adds it to or removes it from the
+	 * static-list file.
 	 *
-	 * Other than setting the static setting of the specified server, it
-	 * also adds or removes the server from the static-list file.
+	 * @param server The server to mark or unmark.
+	 * @param isStatic The new static state.
 	 */
-	void		SetStaticServer(CServer* server, bool isStatic);
-	void		SetServerPrio(CServer* server, uint32 prio);
+	void SetStaticServer(CServer *server, bool isStatic);
+	void SetServerPrio(CServer *server, uint32 prio);
 
 	/**
 	 * Kick off the auto-update HTTP download of server.met.
 	 *
-	 * Split out of Init() so the caller can defer the HTTP request
-	 * until after the heavy startup I/O has finished, avoiding the
-	 * wxWebSession worker thread being starved by the main thread
-	 * (see #714). Caller is expected to gate this on the
-	 * AutoServerlist pref.
+	 * Split out of Init() so the caller can defer the HTTP request until after the heavy
+	 * startup I/O has finished, which stops the main thread starving the wxWebSession worker
+	 * (see #714). The caller is expected to gate this on the AutoServerlist pref.
 	 */
-	void		StartAutoUpdate();
+	void StartAutoUpdate();
 
 private:
-	virtual void	ObserverAdded( ObserverType* );
-	void		AutoUpdate();
-	CServer*	GetNextStatServer();
+	virtual void ObserverAdded(ObserverType *);
+	void AutoUpdate();
+	CServer *GetNextStatServer();
 
-	wxString	m_staticServersConfig;
-	void		LoadStaticServers();
-	void		SaveStaticServers();
-	uint8		current_url_index;
+	wxString m_staticServersConfig;
+	void LoadStaticServers();
+	void SaveStaticServers();
+	uint8 current_url_index;
 
-	typedef std::list<CServer*>	CInternalList;
-	CInternalList			m_servers;
-	CInternalList::const_iterator	m_serverpos;
-	CInternalList::const_iterator	m_statserverpos;
+	typedef std::list<CServer *> CInternalList;
+	CInternalList m_servers;
+	CInternalList::const_iterator m_serverpos;
+	CInternalList::const_iterator m_statserverpos;
 
-	wxString	m_URLUpdate;
-	bool		m_initialized;
+	wxString m_URLUpdate;
+	bool m_initialized;
 };
 
 #endif // SERVERLIST_H

amule-3.0.1.tar.gz/src/ServerListCtrl.cpp -> amule-3.1.0.tar.gz/src/ServerListCtrl.cpp Changed

@@ -23,369 +23,577 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "ServerListCtrl.h"	// Interface declarations
+#include "ServerListCtrl.h" // Interface declarations
+
+#include <algorithm> // Needed for std::max
+#include <vector>    // Needed for std::vector
 
 #include <common/MenuIDs.h>
 
 #include <wx/menu.h>
 #include <wx/stattext.h>
 #include <wx/msgdlg.h>
-#include <wx/settings.h>
 
-#include "amule.h"		// Needed for theApp
-#include "DownloadQueue.h"	// Needed for CDownloadQueue
-#ifdef ENABLE_IP2COUNTRY
-	#include "IP2Country.h"	// Needed for IP2Country
-	#include "amuleDlg.h"	// Needed for IP2Country
+#include "amule.h"         // Needed for theApp
+#include "DownloadQueue.h" // Needed for CDownloadQueue
+#ifdef GEOIP_GUI
+#include "CountryFlags.h"   // Needed for CCountryFlags (flag bitmaps)
+#include "CountryDisplay.h" // Needed for GetDisplayCountryCode
 #endif
-#include "ServerList.h"		// Needed for CServerList
-#include "ServerConnect.h"	// Needed for CServerConnect
-#include "Server.h"		// Needed for CServer and SRV_PR_*
+#include "ServerList.h"    // Needed for CServerList
+#include "ServerConnect.h" // Needed for CServerConnect
+#include "Server.h"        // Needed for CServer and SRV_PR_*
 #include "Logger.h"
-#include <common/Format.h>	// Needed for CFormat
-#include "Preferences.h"	// Needed for thePrefs
-
+#include <common/Format.h> // Needed for CFormat
 
-#define CMuleColour(x) (wxSystemSettings::GetColour(x))
+#include <wx/dcclient.h> // Needed for wxClientDC
 
+// One fixed size for everything in the control's small image list. Set by the 16x16 header sort
+// arrows; the bundled country flags are 16x11 and get padded onto a transparent cell of this size
+// (see FlagImage).
+static const int LIST_IMAGE_SIZE = 16;
 
-wxBEGIN_EVENT_TABLE(CServerListCtrl,CMuleListCtrl)
-	EVT_LIST_ITEM_RIGHT_CLICK( -1,	CServerListCtrl::OnItemRightClicked)
-	EVT_LIST_ITEM_ACTIVATED( -1,	CServerListCtrl::OnItemActivated )
+wxBEGIN_EVENT_TABLE(CServerListCtrl, CMuleVirtualDataViewCtrl)
+	EVT_DATAVIEW_ITEM_CONTEXT_MENU(wxID_ANY, CServerListCtrl::OnItemRightClicked)
+	EVT_DATAVIEW_ITEM_ACTIVATED(wxID_ANY, CServerListCtrl::OnItemActivated)
 
-	EVT_MENU( MP_PRIOLOW,			CServerListCtrl::OnPriorityChange )
-	EVT_MENU( MP_PRIONORMAL,		CServerListCtrl::OnPriorityChange )
-	EVT_MENU( MP_PRIOHIGH,			CServerListCtrl::OnPriorityChange )
+	EVT_MENU(MP_PRIOLOW, CServerListCtrl::OnPriorityChange)
+	EVT_MENU(MP_PRIONORMAL, CServerListCtrl::OnPriorityChange)
+	EVT_MENU(MP_PRIOHIGH, CServerListCtrl::OnPriorityChange)
 
-	EVT_MENU( MP_ADDTOSTATIC,		CServerListCtrl::OnStaticChange )
-	EVT_MENU( MP_REMOVEFROMSTATIC,	CServerListCtrl::OnStaticChange )
+	EVT_MENU(MP_ADDTOSTATIC, CServerListCtrl::OnStaticChange)
+	EVT_MENU(MP_REMOVEFROMSTATIC, CServerListCtrl::OnStaticChange)
 
-	EVT_MENU( MP_CONNECTTO,			CServerListCtrl::OnConnectToServer )
+	EVT_MENU(MP_CONNECTTO, CServerListCtrl::OnConnectToServer)
 
-	EVT_MENU( MP_REMOVE,			CServerListCtrl::OnRemoveServers )
-	EVT_MENU( MP_REMOVEALL,			CServerListCtrl::OnRemoveServers )
+	EVT_MENU(MP_REMOVE, CServerListCtrl::OnRemoveServers)
+	EVT_MENU(MP_REMOVEALL, CServerListCtrl::OnRemoveServers)
 
-	EVT_MENU( MP_GETED2KLINK,		CServerListCtrl::OnGetED2kURL )
+	EVT_MENU(MP_GETED2KLINK, CServerListCtrl::OnGetED2kURL)
 
-	EVT_CHAR( CServerListCtrl::OnKeyPressed )
 wxEND_EVENT_TABLE()
 
-
-
-CServerListCtrl::CServerListCtrl( wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size,
-                                  long style, const wxValidator& validator, const wxString& name )
-	: CMuleListCtrl( parent, winid, pos, size, style, validator, name )
+CServerListCtrl::CServerListCtrl(wxWindow *parent,
+	wxWindowID winid,
+	const wxPoint &pos,
+	const wxSize &size,
+	long style,
+	const wxString &name)
+: CMuleVirtualDataViewCtrl(parent, winid, pos, size, style, name)
 {
-	// Setting the sorter function.
-	SetSortFunc( SortProc );
-
-	// Set the table-name (for loading and saving preferences).
-	SetTableName( "Server" );
-
 	m_connected = 0;
 
-	InsertColumn( COLUMN_SERVER_NAME,	_("Server Name"),	wxLIST_FORMAT_LEFT, 150, "N" );
-	InsertColumn( COLUMN_SERVER_ADDR,	_("Address"),		wxLIST_FORMAT_LEFT, 140, "A" );
-	InsertColumn( COLUMN_SERVER_PORT,	_("Port"),		wxLIST_FORMAT_LEFT,  25, "P" );
-	InsertColumn( COLUMN_SERVER_DESC,	_("Description"),	wxLIST_FORMAT_LEFT, 150, "D" );
-	InsertColumn( COLUMN_SERVER_PING,	_("Ping"),		wxLIST_FORMAT_LEFT,  25, "p" );
-	InsertColumn( COLUMN_SERVER_USERS,	_("Users"),		wxLIST_FORMAT_LEFT,  40, "U" );
-	InsertColumn( COLUMN_SERVER_FILES,	_("Files"),		wxLIST_FORMAT_LEFT,  45, "F" );
-	InsertColumn( COLUMN_SERVER_PRIO,	_("Priority"),		wxLIST_FORMAT_LEFT,  60, "r" );
-	InsertColumn( COLUMN_SERVER_FAILS,	_("Failed"),		wxLIST_FORMAT_LEFT,  40, "f" );
-	InsertColumn( COLUMN_SERVER_STATIC,	_("Static"),		wxLIST_FORMAT_LEFT,  40, "S" );
-	InsertColumn( COLUMN_SERVER_VERSION,	_("Version"),		wxLIST_FORMAT_LEFT,  80, "V" );
-
-#if !defined(CLIENT_GUI)
-	InsertColumn( COLUMN_SERVER_TCPFLAGS,	_("TCP Flags"),		wxLIST_FORMAT_LEFT,  80, "t" );
-	InsertColumn( COLUMN_SERVER_UDPFLAGS,	_("UDP Flags"),		wxLIST_FORMAT_LEFT,  80, "u" );
-	#if !defined(__DEBUG__)
-	//InsertColumn created the columns with their default 80 width, which is required to unhide
-	//them on the context menu. Now, for Release builds, we will hide them by default
-	SetColumnWidth(GetColumnIndex("t"), 0);
-	SetColumnWidth(GetColumnIndex("u"), 0);
-	#endif
+	// The name column carries the country flag, so it is icon+text; the rest
+	// are plain text. Sortable throughout, or wx draws no header caret.
+	const int flags = wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE;
+	AddIconTextColumn(_("Server Name"), COLUMN_SERVER_NAME, "N", 150, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Address"), COLUMN_SERVER_ADDR, "A", 140, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Port"), COLUMN_SERVER_PORT, "P", 25, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Description"), COLUMN_SERVER_DESC, "D", 150, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Ping"), COLUMN_SERVER_PING, "p", 25, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Users"), COLUMN_SERVER_USERS, "U", 40, wxALIGN_LEFT, flags);
+	// Beside Users, since the pair is read together: how many are on now, and
+	// how many the server will take.
+	AddTextColumn(_("Max Users"), COLUMN_SERVER_MAXUSERS, "m", 85, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Files"), COLUMN_SERVER_FILES, "F", 45, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Priority"), COLUMN_SERVER_PRIO, "r", 60, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Failed"), COLUMN_SERVER_FAILS, "f", 40, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Static"), COLUMN_SERVER_STATIC, "S", 40, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Version"), COLUMN_SERVER_VERSION, "V", 80, wxALIGN_LEFT, flags);
+
+	AddTextColumn(_("Soft Files"), COLUMN_SERVER_SOFTFILES, "s", 85, wxALIGN_LEFT, flags);
+	AddTextColumn(_("Hard Files"), COLUMN_SERVER_HARDFILES, "h", 85, wxALIGN_LEFT, flags);
+
+	// Same columns in both binaries: diagnostics, hidden by default in release builds (below),
+	// and the flags are streamed over EC so the remote GUI has the data behind them.
+	AddTextColumn(_("TCP Flags"), COLUMN_SERVER_TCPFLAGS, "t", 80, wxALIGN_LEFT, flags);
+	AddTextColumn(_("UDP Flags"), COLUMN_SERVER_UDPFLAGS, "u", 80, wxALIGN_LEFT, flags);
+	// Per-user publishing limits the server advertises: how many of a user's shared files it
+	// will index. Both arrive with the periodic UDP status reply, the same one that fills Users
+	// and Files.
+
+	// Absorbs the macOS trailing-column sizing; the model answers any column
+	// past the real ones with an empty value.
+	AppendSpacerColumn(COLUMN_SERVER_SPACER);
+	AssociateVirtualModel();
+
+	// Default sort is by name, ascending; LoadColumnSettings() replaces it
+	// when the config has something saved.
+	ApplySorting(COLUMN_SERVER_NAME, 0);
+
+#ifndef __DEBUG__
+	// Wire-flag columns are diagnostics: listed in the header menu so they can be switched on,
+	// hidden by default. Set before the settings are loaded, so anything the user saved wins.
+	SetColumnHidden(COLUMN_SERVER_TCPFLAGS, true, 0);
+	SetColumnHidden(COLUMN_SERVER_UDPFLAGS, true, 0);
 #endif
 
-	LoadSettings();
+	m_columnStore.SetTableName("Server");
+	LoadColumnSettings();
+	InitColumnState();
 }
 
-
 wxString CServerListCtrl::GetOldColumnOrder() const
 {
 	return "N,A,P,D,p,U,F,r,f,S,V,t,u";
 }
 
+CServerListCtrl::~CServerListCtrl() {}
 
-CServerListCtrl::~CServerListCtrl()
-{
-}
-
-
-void CServerListCtrl::AddServer( CServer* toadd )
+void CServerListCtrl::AddServer(CServer *toadd)
 {
 	// RefreshServer will add the server.
 	// This also means that we have simple duplicity checking. ;)
-	RefreshServer( toadd );
+	RefreshServer(toadd);
 
 	ShowServerCount();
 }
 
-
-void CServerListCtrl::RemoveServer(CServer* server)
+void CServerListCtrl::RemoveServer(CServer *server)
 {
-	long result = FindItem(-1, reinterpret_cast<wxUIntPtr>(server));
-	if ( result != -1 ) {
-		DeleteItem(result);
-		ShowServerCount();
+	const wxUIntPtr ptr = reinterpret_cast<wxUIntPtr>(server);
+	if (!HasItemData(ptr)) {
+		return;
 	}
+	if (server == m_connected) {
+		m_connected = nullptr;
+	}
+	RemoveItemData(ptr);
+	ShowServerCount();
 }
 
-
-void CServerListCtrl::RemoveAllServers(int state)
+void CServerListCtrl::RemoveAllServers(bool selectedOnly)
 {
-	int pos = GetNextItem( -1, wxLIST_NEXT_ALL, state);
-	bool connected = theApp->IsConnectedED2K() ||
-	  theApp->serverconnect->IsConnecting();
+	// Collect first, delete second: the rows are a view onto the model, so removing one
+	// renumbers every row below it -- and the confirmations below run a nested event loop,
+	// during which the list can be updated underneath a row index but never underneath a server
+	// pointer.
+	std::vector<CServer *> candidates;
+	if (selectedOnly) {
+		for (wxUIntPtr data : GetSelectedItemData()) {
+			candidates.push_back(reinterpret_cast<CServer *>(data));
+		}
+	} else {
+		for (long row = 0; row < ItemDataCount(); ++row) {
+			candidates.push_back(reinterpret_cast<CServer *>(ItemAt(row)));
+		}
+	}
+
+	const bool connected = theApp->IsConnectedED2K() || theApp->serverconnect->IsConnecting();
 
-	while ( pos != -1 ) {
-		CServer* server = reinterpret_cast<CServer*>(GetItemData(pos));
+	for (CServer *server : candidates) {
+		// May have gone away while a message box was up.
+		if (!HasItemData(reinterpret_cast<wxUIntPtr>(server))) {
+			continue;
+		}
 
 		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 | wxNO_DEFAULT, this) == wxYES) {
-				theApp->serverlist->SetStaticServer(server, false);
-				DeleteItem( pos );
-				theApp->serverlist->RemoveServer( server );
-			} else {
-				++pos;
+			wxMessageBox(_("You are connected to a server you are trying to delete. Please "
+				       "disconnect first. The server was NOT deleted."),
+				_("Info"),
+				wxOK,
+				this);
+			continue;
+		}
+
+		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 | wxNO_DEFAULT,
+				    this) != wxYES) {
+				continue;
 			}
-		} else {
-			DeleteItem( pos );
-			theApp->serverlist->RemoveServer( server );
+			theApp->serverlist->SetStaticServer(server, false);
 		}
 
-		pos = GetNextItem(pos - 1, wxLIST_NEXT_ALL, state);
+		// Drop the row before asking for the removal, not as a result of it: amulegui's
+		// CServerListRem::RemoveServer() only sends an EC command, so the row would
+		// otherwise linger until the core's next update. In the monolithic build the
+		// resulting Notify_ServerRemove() finds the row already gone.
+		RemoveServer(server);
+		theApp->serverlist->RemoveServer(server);
 	}
 
 	ShowServerCount();
 }
 
-
-void CServerListCtrl::RefreshServer( CServer* server )
+void CServerListCtrl::RefreshServer(CServer *server)
 {
-	// Can't really refresh a NULL server
 	if (!server) {
 		return;
 	}
 
-	wxUIntPtr ptr = reinterpret_cast<wxUIntPtr>(server);
-	long itemnr = FindItem( -1, ptr );
-	if ( itemnr == -1 ) {
-		// We are not at the sure that the server isn't in the list, so we can re-add
-		itemnr = InsertItem( GetInsertPos( ptr ), server->GetListName() );
-		SetItemPtrData( itemnr, ptr );
-
-		wxListItem item;
-		item.SetId( itemnr );
-		item.SetBackgroundColour(CMuleColour(wxSYS_COLOUR_LISTBOX));
-		SetItem( item );
-	}
-
-	wxString serverName;
-#ifdef ENABLE_IP2COUNTRY
-	// Get the country name
-	if (theApp->amuledlg->m_IP2Country->IsEnabled() && thePrefs::IsGeoIPEnabled()) {
-		const CountryData& countrydata = theApp->amuledlg->m_IP2Country->GetCountryData(server->GetFullIP());
-		serverName << countrydata.Name;
-		serverName << " - ";
-	}
-#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,
-			CFormat("%u") % server->GetPort());
+	const wxUIntPtr ptr = reinterpret_cast<wxUIntPtr>(server);
+	if (HasItemData(ptr)) {
+		// The cells are rendered from the server on demand, so a refresh is just a repaint
+		// -- plus, when sorted by a column whose value just changed, the re-sort the base
+		// class coalesces for us.
+		RefreshItemData(ptr);
 	} else {
-		SetItem( itemnr, COLUMN_SERVER_PORT,
-			CFormat("%u (%s)") % server->GetPort() % server->GetAuxPortsList());
+		AddItemData(ptr);
 	}
-	SetItem( itemnr, COLUMN_SERVER_DESC, server->GetDescription() );
+}
 
-	if ( server->GetPing() ) {
-		SetItem( itemnr, COLUMN_SERVER_PING,
-			CastSecondsToHM(server->GetPing()/1000, server->GetPing() % 1000 ) );
-	} else {
-		SetItem( itemnr, COLUMN_SERVER_PING, "" );
-	}
+wxString CServerListCtrl::GetItemColumnText(wxUIntPtr item, unsigned column) const
+{
+	const CServer *server = reinterpret_cast<const CServer *>(item);
 
-	if ( server->GetUsers() ) {
-		SetItem( itemnr, COLUMN_SERVER_USERS,
-			CFormat("%u") % server->GetUsers());
-	} else {
-		SetItem( itemnr, COLUMN_SERVER_USERS, "" );
-	}
+	switch (column) {
+	case COLUMN_SERVER_NAME:
+		// The host country is the flag icon on this column, not a text
+		// prefix -- see OnGetItemColumnImage().
+		return server->GetListName();
 
-	if ( server->GetFiles() ) {
-		SetItem( itemnr, COLUMN_SERVER_FILES,
-			CFormat("%u") % server->GetFiles());
-	} else {
-		SetItem( itemnr, COLUMN_SERVER_FILES, "" );
-	}
+	case COLUMN_SERVER_ADDR:
+		return server->GetAddress();
 
-	switch ( server->GetPreferences() ) {
-		case SRV_PR_LOW:	SetItem(itemnr, COLUMN_SERVER_PRIO, _("Low"));		break;
-		case SRV_PR_NORMAL:	SetItem(itemnr, COLUMN_SERVER_PRIO, _("Normal"));	break;
-		case SRV_PR_HIGH:	SetItem(itemnr, COLUMN_SERVER_PRIO, _("High") );	break;
-		default:		SetItem(itemnr, COLUMN_SERVER_PRIO, "---");	// this should never happen
-	}
+	case COLUMN_SERVER_PORT:
+		if (server->GetAuxPortsList().IsEmpty()) {
+			return CFormat("%u") % server->GetPort();
+		}
+		return CFormat("%u (%s)") % server->GetPort() % server->GetAuxPortsList();
 
-	SetItem( itemnr, COLUMN_SERVER_FAILS, CFormat("%u") % server->GetFailedCount());
-	SetItem( itemnr, COLUMN_SERVER_STATIC, ( server->IsStaticMember() ? _("Yes") : _("No") ) );
-	SetItem( itemnr, COLUMN_SERVER_VERSION, server->GetVersion() );
+	case COLUMN_SERVER_DESC:
+		return server->GetDescription();
 
-#if !defined(CLIENT_GUI)
-	wxString flags;
-	/* TCP */
-	if (server->GetTCPFlags() & SRV_TCPFLG_COMPRESSION) {
-		flags += "c";
-	}
-	if (server->GetTCPFlags() & SRV_TCPFLG_NEWTAGS) {
-		flags += "n";
-	}
-	if (server->GetTCPFlags() & SRV_TCPFLG_UNICODE) {
-		flags += "u";
+	case COLUMN_SERVER_PING:
+		if (!server->GetPing()) {
+			return wxEmptyString;
+		}
+		// GetPing() is already milliseconds (a GetTickCount64() delta), and milliseconds is
+		// how latency is written everywhere else, including our own REST API's "ping_ms".
+		// It used to go through CastSecondsToHM(), whose sub-minute branch prints "0.203
+		// secs" (issue #823). The unit is translated because it is not written "ms"
+		// everywhere, and the number is kept out of the catalog entry.
+		return CFormat("%u %s") % server->GetPing() % _("ms");
+
+	case COLUMN_SERVER_USERS:
+		if (!server->GetUsers()) {
+			return wxEmptyString;
+		}
+		return CFormat("%u") % server->GetUsers();
+
+	// Zero means "the server never told us", not "the limit is zero": these only arrive once a
+	// UDP status reply has come back, so a freshly added or UDP-silent server has nothing to
+	// show and stays blank, as Users and Files do.
+	case COLUMN_SERVER_SOFTFILES:
+		if (!server->GetSoftFiles()) {
+			return wxEmptyString;
+		}
+		return CFormat("%u") % server->GetSoftFiles();
+
+	case COLUMN_SERVER_HARDFILES:
+		if (!server->GetHardFiles()) {
+			return wxEmptyString;
+		}
+		return CFormat("%u") % server->GetHardFiles();
+
+	case COLUMN_SERVER_MAXUSERS:
+		if (!server->GetMaxUsers()) {
+			return wxEmptyString;
+		}
+		return CFormat("%u") % server->GetMaxUsers();
+
+	case COLUMN_SERVER_FILES:
+		if (!server->GetFiles()) {
+			return wxEmptyString;
+		}
+		return CFormat("%u") % server->GetFiles();
+
+	case COLUMN_SERVER_PRIO:
+		switch (server->GetPreferences()) {
+		case SRV_PR_LOW:
+			return _("Low");
+		case SRV_PR_NORMAL:
+			return _("Normal");
+		case SRV_PR_HIGH:
+			return _("High");
+		default:
+			return "---"; // this should never happen
+		}
+
+	case COLUMN_SERVER_FAILS:
+		return CFormat("%u") % server->GetFailedCount();
+
+	case COLUMN_SERVER_STATIC:
+		return server->IsStaticMember() ? _("Yes") : _("No");
+
+	case COLUMN_SERVER_VERSION:
+		// The placeholder lives here rather than in CServer, so it is translated in the
+		// locale of whoever is reading the column and never reaches server.met, EC or the
+		// API as data.
+		return server->GetVersion().IsEmpty() ? _("Unknown") : server->GetVersion();
+
+	// Rendered in both binaries: the flags are streamed over EC, so the remote
+	// GUI has the same data behind these columns.
+	case COLUMN_SERVER_TCPFLAGS: {
+		wxString flags;
+		if (server->GetTCPFlags() & SRV_TCPFLG_COMPRESSION) {
+			flags += "c";
+		}
+		if (server->GetTCPFlags() & SRV_TCPFLG_NEWTAGS) {
+			flags += "n";
+		}
+		if (server->GetTCPFlags() & SRV_TCPFLG_UNICODE) {
+			flags += "u";
+		}
+		if (server->GetTCPFlags() & SRV_TCPFLG_RELATEDSEARCH) {
+			flags += "r";
+		}
+		if (server->GetTCPFlags() & SRV_TCPFLG_TYPETAGINTEGER) {
+			flags += "t";
+		}
+		if (server->GetTCPFlags() & SRV_TCPFLG_LARGEFILES) {
+			flags += "l";
+		}
+		if (server->GetTCPFlags() & SRV_TCPFLG_TCPOBFUSCATION) {
+			flags += "o";
+		}
+		return flags;
 	}
-	if (server->GetTCPFlags() & SRV_TCPFLG_RELATEDSEARCH) {
-		flags += "r";
+
+	case COLUMN_SERVER_UDPFLAGS: {
+		wxString flags;
+		if (server->GetUDPFlags() & SRV_UDPFLG_EXT_GETSOURCES) {
+			flags += "g";
+		}
+		if (server->GetUDPFlags() & SRV_UDPFLG_EXT_GETFILES) {
+			flags += "f";
+		}
+		if (server->GetUDPFlags() & SRV_UDPFLG_NEWTAGS) {
+			flags += "n";
+		}
+		if (server->GetUDPFlags() & SRV_UDPFLG_UNICODE) {
+			flags += "u";
+		}
+		if (server->GetUDPFlags() & SRV_UDPFLG_EXT_GETSOURCES2) {
+			flags += "G";
+		}
+		if (server->GetUDPFlags() & SRV_UDPFLG_LARGEFILES) {
+			flags += "l";
+		}
+		if (server->GetUDPFlags() & SRV_UDPFLG_UDPOBFUSCATION) {
+			flags += "o";
+		}
+		if (server->GetUDPFlags() & SRV_UDPFLG_TCPOBFUSCATION) {
+			flags += "O";
+		}
+		return flags;
 	}
-	if (server->GetTCPFlags() & SRV_TCPFLG_TYPETAGINTEGER) {
-		flags += "t";
+
+	default:
+		return wxEmptyString;
 	}
-	if (server->GetTCPFlags() & SRV_TCPFLG_LARGEFILES) {
-		flags += "l";
+}
+
+// Gated with its only caller: this reaches theApp->GetCountryFlags(), which only exists under
+// GEOIP_GUI, so compiling it unconditionally broke the monolithic build at -DENABLE_IP2COUNTRY=NO.
+//
+// Only the definition is gated, not the declaration: GEOIP_GUI is #defined in amule.h, which this
+// file includes but ServerListCtrl.h does not, so gating it there would compile the declaration out
+// from under this definition.
+#ifdef GEOIP_GUI
+const wxIcon &CServerListCtrl::FlagIcon(const wxString &code) const
+{
+	static const wxIcon nullIcon;
+
+	const auto it = m_flagIcons.find(code);
+	if (it != m_flagIcons.end()) {
+		return it->second;
 	}
-	if (server->GetTCPFlags() & SRV_TCPFLG_TCPOBFUSCATION) {
-		flags += "o";
+
+	const wxImage &flag = theApp->GetCountryFlags()->GetFlag(code);
+	if (!flag.IsOk()) {
+		// Cached as an invalid icon so an unknown code isn't looked up again.
+		return m_flagIcons.emplace(code, wxIcon()).first->second;
 	}
 
-	SetItem( itemnr, COLUMN_SERVER_TCPFLAGS, flags );
+	wxIcon icon;
+	icon.CopyFromBitmap(wxBitmap(flag));
+	return m_flagIcons.emplace(code, icon).first->second;
+}
+#endif // GEOIP_GUI
 
-	/* UDP */
-	flags.Clear();
-	if (server->GetUDPFlags() & SRV_UDPFLG_EXT_GETSOURCES) {
-		flags += "g";
+bool CServerListCtrl::GetItemIcon(wxUIntPtr item, unsigned column, wxIcon &icon) const
+{
+	if (column != COLUMN_SERVER_NAME) {
+		return false;
+	}
+#ifdef GEOIP_GUI
+	// Host country as a flag icon, matching the peer list: no icon at all for
+	// an unresolved server, rather than the "? - " prefix this used to show.
+	const CServer *server = reinterpret_cast<const CServer *>(item);
+	wxString code;
+	if (GetDisplayCountryCode(
+		    server->IsCountryFromCore(), server->GetCountryCode(), server->GetIP(), code) &&
+		!code.IsEmpty()) {
+		const wxIcon &flag = FlagIcon(code);
+		if (flag.IsOk()) {
+			icon = flag;
+			return true;
+		}
 	}
-	if (server->GetUDPFlags() & SRV_UDPFLG_EXT_GETFILES) {
-		flags += "f";
+#else
+	wxUnusedVar(item);
+#endif // GEOIP_GUI
+	return false;
+}
+
+bool CServerListCtrl::GetItemAttr(wxUIntPtr item, unsigned WXUNUSED(column), wxDataViewItemAttr &attr) const
+{
+	if (m_connected && reinterpret_cast<const CServer *>(item) == m_connected) {
+		attr.SetBold(true);
+		return true;
 	}
-	if (server->GetUDPFlags() & SRV_UDPFLG_NEWTAGS) {
-		flags += "n";
+	return false;
+}
+
+bool CServerListCtrl::IsLiveSortColumn() const
+{
+	if (m_sort_orders.empty()) {
+		return false;
 	}
-	if (server->GetUDPFlags() & SRV_UDPFLG_UNICODE) {
-		flags += "u";
+	switch (static_cast<int>(m_sort_orders.front().first)) {
+	case COLUMN_SERVER_PING:
+	case COLUMN_SERVER_USERS:
+	case COLUMN_SERVER_FILES:
+		return true;
+	default:
+		return false;
 	}
-	if (server->GetUDPFlags() & SRV_UDPFLG_EXT_GETSOURCES2) {
-		flags += "G";
+}
+
+void CServerListCtrl::HighlightServer(const CServer *server, bool highlight)
+{
+	// The bold font is handed out by OnGetItemAttr(), so all this has to do is
+	// move m_connected and repaint the rows either side of the change.
+	const CServer *previous = m_connected;
+
+	if (highlight) {
+		m_connected = server;
+	} else if (m_connected == server) {
+		m_connected = nullptr;
 	}
-	if (server->GetUDPFlags() & SRV_UDPFLG_LARGEFILES) {
-		flags += "l";
+
+	if (previous == m_connected) {
+		return;
 	}
-	if (server->GetUDPFlags() & SRV_UDPFLG_UDPOBFUSCATION) {
-		flags += "o";
+	if (previous) {
+		RefreshItemData(reinterpret_cast<wxUIntPtr>(previous));
 	}
-	if (server->GetUDPFlags() & SRV_UDPFLG_TCPOBFUSCATION) {
-		flags += "O";
+	if (m_connected) {
+		RefreshItemData(reinterpret_cast<wxUIntPtr>(m_connected));
 	}
-	SetItem( itemnr, COLUMN_SERVER_UDPFLAGS, flags );
+}
 
-#endif
+void CServerListCtrl::ShowServerCount()
+{
+	wxStaticText *label = CastByName("serverListLabel", GetParent(), wxStaticText);
 
-	// Deletions of items causes rather large amount of flicker, so to
-	// avoid this, we resort the list to ensure correct ordering.
-	if (!IsItemSorted(itemnr)) {
-		SortList();
+	if (label) {
+		label->SetLabel(CFormat(_("Servers (%i)")) % ItemDataCount());
+		label->GetParent()->Layout();
 	}
 }
 
-
-void CServerListCtrl::HighlightServer( const CServer* server, bool highlight )
+void CServerListCtrl::FitColumnsToContent()
 {
-	// 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( m_connected, false );
-
-		m_connected = 0;
+	// Only size a profile that has no widths of its own. Both callers run after
+	// LoadColumnSettings() has restored whatever was saved, so fitting unconditionally would
+	// overwrite a width the user had dragged.
+	if (HasPersistedColumnWidths()) {
+		return;
 	}
 
-	long itemnr = FindItem( -1,  reinterpret_cast<wxUIntPtr>(server) );
-	if ( itemnr > -1 ) {
-		wxListItem item;
-		item.SetId( itemnr );
-
-		if ( GetItem( item ) ) {
-			wxFont font = GetFont();
+	// Upper bound for the Description column: descriptions can be very long (full forum URLs),
+	// so cap it rather than let one row blow the column out. The other columns hold short,
+	// bounded values.
+	const int descMaxWidth = 300;
 
-			if ( highlight ) {
-				font.SetWeight( wxFONTWEIGHT_BOLD );
+	// Content is measured against the model rather than asked of the control: wxDataViewCtrl
+	// has no portable "size this column to its contents", and on a list that renders cells on
+	// demand there is nothing native to measure. The margins reproduce what the old
+	// wxLIST_AUTOSIZE produced.
+	const int autosizeMargin = 10;
+	const int imageMargin = 5;
+	const int flagWidth = 16;
 
-				m_connected = server;
-			}
+	wxClientDC dc(this);
+	dc.SetFont(GetFont());
 
-			item.SetFont( font );
+	const long rows = ItemDataCount();
 
-			SetItem( item );
+	Freeze();
+	for (unsigned col = 0; col < RealColumnCount(); ++col) {
+		// Leave hidden columns (the TCP/UDP flag columns, or ones the user
+		// hid from the header menu) hidden.
+		if (IsColumnHidden(static_cast<int>(col))) {
+			continue;
 		}
-	}
-}
 
+		int contentWidth = autosizeMargin;
+		for (long row = 0; row < rows; ++row) {
+			const wxUIntPtr data = ItemAt(row);
+			wxCoord textWidth = 0;
+			dc.GetTextExtent(GetItemColumnText(data, col), &textWidth, nullptr);
+			int cellWidth = textWidth;
+			wxIcon icon;
+			if (GetItemIcon(data, col, icon)) {
+				cellWidth += flagWidth + imageMargin;
+			}
+			if (cellWidth > contentWidth) {
+				contentWidth = cellWidth;
+			}
+		}
+		contentWidth += autosizeMargin;
 
-void CServerListCtrl::ShowServerCount()
-{
-	wxStaticText* label = CastByName( "serverListLabel", GetParent(), wxStaticText );
+		wxCoord headerWidth = 0;
+		dc.GetTextExtent(GetColumn(col)->GetTitle(), &headerWidth, nullptr);
+		headerWidth += 2 * autosizeMargin;
 
-	if ( label ) {
-		label->SetLabel(CFormat(_("Servers (%i)")) % GetItemCount());
-		label->GetParent()->Layout();
+		int width = std::max(contentWidth, static_cast<int>(headerWidth));
+		if (col == COLUMN_SERVER_DESC && width > descMaxWidth) {
+			width = descMaxWidth;
+		}
+		GetColumn(col)->SetWidth(width);
 	}
+	Thaw();
 }
 
-
-void CServerListCtrl::OnItemActivated( wxListEvent& event )
+void CServerListCtrl::OnItemActivated(wxDataViewEvent &event)
 {
-	// Unselect all items but the activated one
-	long item = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	while ( item > -1 ) {
-		SetItemState( item, 0, wxLIST_STATE_SELECTED);
-
-		item = GetNextItem( item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	// Connect to the activated row alone, whatever else was selected.
+	if (event.GetItem().IsOk()) {
+		UnselectAll();
+		Select(event.GetItem());
 	}
 
-	SetItemState( event.GetIndex(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-
 	wxCommandEvent nulEvt;
-	OnConnectToServer( nulEvt );
+	OnConnectToServer(nulEvt);
 }
 
-
-void CServerListCtrl::OnItemRightClicked(wxListEvent& event)
+void CServerListCtrl::OnItemRightClicked(wxDataViewEvent &event)
 {
-	// Check if clicked item is selected. If not, unselect all and select it.
-	long index = CheckSelection(event);
+	// Right-clicking a row outside the selection acts on that row alone.
+	if (event.GetItem().IsOk()) {
+		wxDataViewItemArray selection;
+		GetSelections(selection);
+		if (selection.Index(event.GetItem()) == wxNOT_FOUND) {
+			UnselectAll();
+			Select(event.GetItem());
+		}
+	}
 
 	bool enable_reconnect = false;
 	bool enable_static_on = false;
 	bool enable_static_off = false;
 
-	// Gather information on the selected items
-	while ( index > -1 ) {
-		CServer* server = reinterpret_cast<CServer*>(GetItemData(index));
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CServer *server = reinterpret_cast<CServer *>(data);
 
 		// The current server is selected, so we might display the reconnect option
 		if (server == m_connected) {
@@ -393,253 +601,263 @@
 		}
 
 		// We want to know which options should be enabled, either one or both
-		enable_static_on	|= !server->IsStaticMember();
-		enable_static_off	|=  server->IsStaticMember();
-
-		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+		enable_static_on |= !server->IsStaticMember();
+		enable_static_off |= server->IsStaticMember();
 	}
 
-
-	wxMenu* serverMenu = new wxMenu(_("Server"));
-	wxMenu* serverPrioMenu = new wxMenu();
-	serverPrioMenu->Append( MP_PRIOLOW, _("Low") );
-	serverPrioMenu->Append( MP_PRIONORMAL, _("Normal") );
-	serverPrioMenu->Append( MP_PRIOHIGH, _("High") );
-	serverMenu->Append( MP_CONNECTTO, _("Connect to server") );
-	serverMenu->Append( 12345, _("Priority"), serverPrioMenu );
+	wxMenu *serverMenu = new wxMenu(_("Server"));
+	wxMenu *serverPrioMenu = new wxMenu();
+	serverPrioMenu->Append(MP_PRIOLOW, _("Low"));
+	serverPrioMenu->Append(MP_PRIONORMAL, _("Normal"));
+	serverPrioMenu->Append(MP_PRIOHIGH, _("High"));
+	serverMenu->Append(MP_CONNECTTO, _("Connect to server"));
+	serverMenu->Append(12345, _("Priority"), serverPrioMenu);
 
 	serverMenu->AppendSeparator();
 
-	if (GetSelectedItemCount() == 1) {
-		serverMenu->Append( MP_ADDTOSTATIC, _("Mark server as static") );
-		serverMenu->Append( MP_REMOVEFROMSTATIC, _("Mark server as non-static") );
+	if (static_cast<int>(GetSelectedItemsCount()) == 1) {
+		serverMenu->Append(MP_ADDTOSTATIC, _("Mark server as static"));
+		serverMenu->Append(MP_REMOVEFROMSTATIC, _("Mark server as non-static"));
 	} else {
-		serverMenu->Append( MP_ADDTOSTATIC, _("Mark servers as static") );
-		serverMenu->Append( MP_REMOVEFROMSTATIC, _("Mark servers as non-static") );
+		serverMenu->Append(MP_ADDTOSTATIC, _("Mark servers as static"));
+		serverMenu->Append(MP_REMOVEFROMSTATIC, _("Mark servers as non-static"));
 	}
 
 	serverMenu->AppendSeparator();
 
-	if (GetSelectedItemCount() == 1) {
-		serverMenu->Append( MP_REMOVE, _("Remove server") );
+	if (static_cast<int>(GetSelectedItemsCount()) == 1) {
+		serverMenu->Append(MP_REMOVE, _("Remove server"));
 	} else {
-		serverMenu->Append( MP_REMOVE, _("Remove servers") );
+		serverMenu->Append(MP_REMOVE, _("Remove servers"));
 	}
-	serverMenu->Append( MP_REMOVEALL, _("Remove all servers") );
+	serverMenu->Append(MP_REMOVEALL, _("Remove all servers"));
 
 	serverMenu->AppendSeparator();
 
-	if (GetSelectedItemCount() == 1) {
-		serverMenu->Append( MP_GETED2KLINK, _("Copy eD2k link to clipboard") );
+	if (static_cast<int>(GetSelectedItemsCount()) == 1) {
+		serverMenu->Append(MP_GETED2KLINK, _("Copy eD2k link to clipboard"));
 	} else {
-		serverMenu->Append( MP_GETED2KLINK, _("Copy eD2k links to clipboard") );
+		serverMenu->Append(MP_GETED2KLINK, _("Copy eD2k links to clipboard"));
 	}
 
-	serverMenu->Enable( MP_REMOVEFROMSTATIC,	enable_static_off );
-	serverMenu->Enable( MP_ADDTOSTATIC,			enable_static_on  );
+	serverMenu->Enable(MP_REMOVEFROMSTATIC, enable_static_off);
+	serverMenu->Enable(MP_ADDTOSTATIC, enable_static_on);
 
-	if ( GetSelectedItemCount() == 1 ) {
-		if ( enable_reconnect )
-			serverMenu->SetLabel( MP_CONNECTTO, _("Reconnect to server") );
+	if (static_cast<int>(GetSelectedItemsCount()) == 1) {
+		if (enable_reconnect)
+			serverMenu->SetLabel(MP_CONNECTTO, _("Reconnect to server"));
 	} else {
-		serverMenu->Enable( MP_CONNECTTO, false );
+		serverMenu->Enable(MP_CONNECTTO, false);
 	}
 
-
-	PopupMenu( serverMenu, event.GetPoint() );
+	PopupMenu(serverMenu, event.GetPosition());
 	delete serverMenu;
 }
 
-
-void CServerListCtrl::OnPriorityChange( wxCommandEvent& event )
+void CServerListCtrl::OnPriorityChange(wxCommandEvent &event)
 {
 	uint32 priority = 0;
 
-	switch ( event.GetId() ) {
-		case MP_PRIOLOW:		priority = SRV_PR_LOW;		break;
-		case MP_PRIONORMAL:		priority = SRV_PR_NORMAL;	break;
-		case MP_PRIOHIGH:		priority = SRV_PR_HIGH;		break;
-
-		default:
-			return;
+	switch (event.GetId()) {
+	case MP_PRIOLOW:
+		priority = SRV_PR_LOW;
+		break;
+	case MP_PRIONORMAL:
+		priority = SRV_PR_NORMAL;
+		break;
+	case MP_PRIOHIGH:
+		priority = SRV_PR_HIGH;
+		break;
+
+	default:
+		return;
 	}
 
+	const std::vector<wxUIntPtr> items = GetSelectedItemData();
 
-	ItemDataList items = GetSelectedItems();
-
-	for ( unsigned int i = 0; i < items.size(); ++i ) {
-		CServer* server = reinterpret_cast<CServer*>(itemsi);
+	for (wxUIntPtr data : items) {
+		CServer *server = reinterpret_cast<CServer *>(data);
 		theApp->serverlist->SetServerPrio(server, priority);
 	}
 }
 
-
-void CServerListCtrl::OnStaticChange( wxCommandEvent& event )
+void CServerListCtrl::OnStaticChange(wxCommandEvent &event)
 {
-	bool isStatic = ( event.GetId() == MP_ADDTOSTATIC );
+	bool isStatic = (event.GetId() == MP_ADDTOSTATIC);
 
-	ItemDataList items = GetSelectedItems();
+	const std::vector<wxUIntPtr> items = GetSelectedItemData();
 
-	for ( unsigned int i = 0; i < items.size(); ++i ) {
-		CServer* server = reinterpret_cast<CServer*>(itemsi);
+	for (wxUIntPtr data : items) {
+		CServer *server = reinterpret_cast<CServer *>(data);
 
 		// Only update items that have the wrong setting
-		if ( server->IsStaticMember() != isStatic ) {
+		if (server->IsStaticMember() != isStatic) {
 			theApp->serverlist->SetStaticServer(server, isStatic);
 		}
 	}
 }
 
-
-void CServerListCtrl::OnConnectToServer( wxCommandEvent& WXUNUSED(event) )
+void CServerListCtrl::OnConnectToServer(wxCommandEvent &WXUNUSED(event))
 {
-	int item = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
 
-	if ( item > -1 ) {
-		if ( theApp->IsConnectedED2K() ) {
+	if (!selected.empty()) {
+		if (theApp->IsConnectedED2K()) {
 			theApp->serverconnect->Disconnect();
 		}
 
-		theApp->serverconnect->ConnectToServer( reinterpret_cast<CServer*>(GetItemData(item)) );
+		theApp->serverconnect->ConnectToServer(reinterpret_cast<CServer *>(selected.front()));
 	}
 }
 
-
-void CServerListCtrl::OnGetED2kURL( wxCommandEvent& WXUNUSED(event) )
+void CServerListCtrl::OnGetED2kURL(wxCommandEvent &WXUNUSED(event))
 {
-	int pos = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-
 	wxString URL;
 
-	while ( pos != -1 ) {
-		CServer* server = reinterpret_cast<CServer*>(GetItemData(pos));
-
-		URL += CFormat("ed2k://|server|%s|%d|/\n")	% server->GetFullIP() % server->GetPort();
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CServer *server = reinterpret_cast<CServer *>(data);
 
-		pos = GetNextItem( pos, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+		URL += CFormat("ed2k://|server|%s|%d|/\n") % server->GetFullIP() % server->GetPort();
 	}
 
 	URL.RemoveLast();
 
-	theApp->CopyTextToClipboard( URL );
+	theApp->CopyTextToClipboard(URL);
 }
 
-
-void CServerListCtrl::OnRemoveServers( wxCommandEvent& event )
+void CServerListCtrl::OnRemoveServers(wxCommandEvent &event)
 {
-	if ( event.GetId() == MP_REMOVEALL ) {
-		if ( GetItemCount() ) {
+	if (event.GetId() == MP_REMOVEALL) {
+		if (ItemDataCount()) {
 			wxString question = _("Are you sure that you wish to delete all servers?");
 
-			if ( wxMessageBox( question, _("Cancel"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this) == wxYES ) {
-				if ( theApp->serverconnect->IsConnecting() ) {
+			if (wxMessageBox(
+				    question, _("Cancel"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this) ==
+				wxYES) {
+				if (theApp->serverconnect->IsConnecting()) {
 					theApp->downloadqueue->StopUDPRequests();
 					theApp->serverconnect->StopConnectionTry();
 					theApp->serverconnect->Disconnect();
 				}
 
-				RemoveAllServers(wxLIST_STATE_DONTCARE);
+				RemoveAllServers(false);
 			}
 		}
-	} else if ( event.GetId() == MP_REMOVE ) {
-		if ( GetSelectedItemCount() ) {
+	} else if (event.GetId() == MP_REMOVE) {
+		if (static_cast<int>(GetSelectedItemsCount())) {
 			wxString question;
-			if (GetSelectedItemCount() == 1) {
+			if (static_cast<int>(GetSelectedItemsCount()) == 1) {
 				question = _("Are you sure that you wish to delete the selected server?");
 			} else {
 				question = _("Are you sure that you wish to delete the selected servers?");
 			}
 
-			if ( wxMessageBox( question, _("Cancel"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this) == wxYES ) {
-				RemoveAllServers(wxLIST_STATE_SELECTED);
+			if (wxMessageBox(
+				    question, _("Cancel"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this) ==
+				wxYES) {
+				RemoveAllServers(true);
 			}
 		}
 	}
 }
 
-
-void CServerListCtrl::OnKeyPressed( wxKeyEvent& event )
+bool CServerListCtrl::OnListKey(wxKeyEvent &event)
 {
-	// Check if delete was pressed
+	// Delete removes the selected servers; everything else belongs to the
+	// control's own navigation.
 	if ((event.GetKeyCode() == WXK_DELETE) || (event.GetKeyCode() == WXK_NUMPAD_DELETE)) {
 		wxCommandEvent evt;
-		evt.SetId( MP_REMOVE );
-		OnRemoveServers( evt );
-	} else {
-		event.Skip();
+		evt.SetId(MP_REMOVE);
+		OnRemoveServers(evt);
+		return true;
 	}
+	return false;
 }
 
-
-int CServerListCtrl::SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData)
+int CServerListCtrl::CompareItemData(
+	wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool WXUNUSED(alt), int modifier) const
 {
-	CServer* server1 = reinterpret_cast<CServer*>(item1);
-	CServer* server2 = reinterpret_cast<CServer*>(item2);
-
-	int mode = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
-
-	switch (sortData & CMuleListCtrl::COLUMN_MASK) {
-		// Sort by server-name
-		case COLUMN_SERVER_NAME:
-			return mode * server1->GetListName().CmpNoCase(server2->GetListName());
-
-		// Sort by address
-		case COLUMN_SERVER_ADDR:
-			{
-				if ( server1->HasDynIP() && server2->HasDynIP()) {
-					return mode * server1->GetDynIP().CmpNoCase( server2->GetDynIP() );
-				} else if (server1->HasDynIP()) {
-					return mode * -1;
-				} else if (server2->HasDynIP()) {
-					return mode * 1;
-				} else {
-					uint32 a = wxUINT32_SWAP_ALWAYS(server1->GetIP());
-					uint32 b = wxUINT32_SWAP_ALWAYS(server2->GetIP());
-					return mode * CmpAny(a, b);
-				}
-			}
-		// Sort by port
-		case COLUMN_SERVER_PORT: return mode * CmpAny( server1->GetPort(), server2->GetPort() );
-		// Sort by description
-		case COLUMN_SERVER_DESC: return mode * server1->GetDescription().CmpNoCase( server2->GetDescription() );
-		// Sort by Ping
-		// The -1 ensures that a value of zero (no ping known) is sorted last.
-		case COLUMN_SERVER_PING: return mode * CmpAny( server1->GetPing() - 1, server2->GetPing() -1 );
-		// Sort by user-count
-		case COLUMN_SERVER_USERS: return mode * CmpAny( server1->GetUsers(), server2->GetUsers() );
-		// Sort by file-count
-		case COLUMN_SERVER_FILES: return mode * CmpAny( server1->GetFiles(), server2->GetFiles() );
-		// Sort by priority
-		case COLUMN_SERVER_PRIO:
-			{
-				uint32 srv_pr1 = server1->GetPreferences();
-				uint32 srv_pr2 = server2->GetPreferences();
-				switch ( srv_pr1 ) {
-					case SRV_PR_HIGH:	srv_pr1 = SRV_PR_MAX; break;
-					case SRV_PR_NORMAL:	srv_pr1 = SRV_PR_MID; break;
-					case SRV_PR_LOW:	srv_pr1 = SRV_PR_MIN; break;
-					default:		return 0;
-				}
-				switch ( srv_pr2 ) {
-					case SRV_PR_HIGH:	srv_pr2 = SRV_PR_MAX; break;
-					case SRV_PR_NORMAL:	srv_pr2 = SRV_PR_MID; break;
-					case SRV_PR_LOW:	srv_pr2 = SRV_PR_MIN; break;
-					default:		return 0;
-				}
-				return mode * CmpAny( srv_pr1, srv_pr2 );
-			}
-		// Sort by failure-count
-		case COLUMN_SERVER_FAILS: return mode * CmpAny( server1->GetFailedCount(), server2->GetFailedCount() );
-		// Sort by static servers
-		case COLUMN_SERVER_STATIC:
-			{
-				return mode * CmpAny( server2->IsStaticMember(), server1->IsStaticMember() );
-			}
-		// Sort by version
-		case COLUMN_SERVER_VERSION: return mode * FuzzyStrCmp(server1->GetVersion(), server2->GetVersion());
-
+	const CServer *server1 = reinterpret_cast<const CServer *>(data1);
+	const CServer *server2 = reinterpret_cast<const CServer *>(data2);
+
+	const int mode = modifier;
+
+	switch (column) {
+	case COLUMN_SERVER_NAME:
+		return mode * server1->GetListName().CmpNoCase(server2->GetListName());
+
+	case COLUMN_SERVER_ADDR: {
+		if (server1->HasDynIP() && server2->HasDynIP()) {
+			return mode * server1->GetDynIP().CmpNoCase(server2->GetDynIP());
+		} else if (server1->HasDynIP()) {
+			return mode * -1;
+		} else if (server2->HasDynIP()) {
+			return mode * 1;
+		} else {
+			uint32 a = wxUINT32_SWAP_ALWAYS(server1->GetIP());
+			uint32 b = wxUINT32_SWAP_ALWAYS(server2->GetIP());
+			return mode * CmpAny(a, b);
+		}
+	}
+	case COLUMN_SERVER_PORT:
+		return mode * CmpAny(server1->GetPort(), server2->GetPort());
+	case COLUMN_SERVER_DESC:
+		return mode * server1->GetDescription().CmpNoCase(server2->GetDescription());
+	// Sort by Ping
+	// The -1 ensures that a value of zero (no ping known) is sorted last.
+	case COLUMN_SERVER_PING:
+		return mode * CmpAny(server1->GetPing() - 1, server2->GetPing() - 1);
+	case COLUMN_SERVER_USERS:
+		return mode * CmpAny(server1->GetUsers(), server2->GetUsers());
+	case COLUMN_SERVER_SOFTFILES:
+		return mode * CmpAny(server1->GetSoftFiles(), server2->GetSoftFiles());
+	case COLUMN_SERVER_HARDFILES:
+		return mode * CmpAny(server1->GetHardFiles(), server2->GetHardFiles());
+	case COLUMN_SERVER_MAXUSERS:
+		return mode * CmpAny(server1->GetMaxUsers(), server2->GetMaxUsers());
+	case COLUMN_SERVER_FILES:
+		return mode * CmpAny(server1->GetFiles(), server2->GetFiles());
+	case COLUMN_SERVER_PRIO: {
+		uint32 srv_pr1 = server1->GetPreferences();
+		uint32 srv_pr2 = server2->GetPreferences();
+		switch (srv_pr1) {
+		case SRV_PR_HIGH:
+			srv_pr1 = SRV_PR_MAX;
+			break;
+		case SRV_PR_NORMAL:
+			srv_pr1 = SRV_PR_MID;
+			break;
+		case SRV_PR_LOW:
+			srv_pr1 = SRV_PR_MIN;
+			break;
+		default:
+			return 0;
+		}
+		switch (srv_pr2) {
+		case SRV_PR_HIGH:
+			srv_pr2 = SRV_PR_MAX;
+			break;
+		case SRV_PR_NORMAL:
+			srv_pr2 = SRV_PR_MID;
+			break;
+		case SRV_PR_LOW:
+			srv_pr2 = SRV_PR_MIN;
+			break;
 		default:
 			return 0;
+		}
+		return mode * CmpAny(srv_pr1, srv_pr2);
+	}
+	case COLUMN_SERVER_FAILS:
+		return mode * CmpAny(server1->GetFailedCount(), server2->GetFailedCount());
+	case COLUMN_SERVER_STATIC: {
+		return mode * CmpAny(server2->IsStaticMember(), server1->IsStaticMember());
+	}
+	case COLUMN_SERVER_VERSION:
+		return mode * FuzzyStrCmp(server1->GetVersion(), server2->GetVersion());
+
+	default:
+		return 0;
 	}
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ServerListCtrl.h -> amule-3.1.0.tar.gz/src/ServerListCtrl.h Changed

@@ -26,170 +26,147 @@
 #ifndef SERVERLISTCTRL_H
 #define SERVERLISTCTRL_H
 
-#include "MuleListCtrl.h"	// Needed for CMuleListCtrl
-
-#define	COLUMN_SERVER_NAME	0
-#define	COLUMN_SERVER_ADDR	1
-#define	COLUMN_SERVER_PORT	2
-#define	COLUMN_SERVER_DESC	3
-#define	COLUMN_SERVER_PING	4
-#define	COLUMN_SERVER_USERS	5
-#define	COLUMN_SERVER_FILES	6
-#define	COLUMN_SERVER_PRIO	7
-#define	COLUMN_SERVER_FAILS	8
-#define	COLUMN_SERVER_STATIC	9
-#define	COLUMN_SERVER_VERSION	10
-#define	COLUMN_SERVER_TCPFLAGS	11
-#define	COLUMN_SERVER_UDPFLAGS	12
+#include "MuleVirtualDataViewCtrl.h" // Needed for CMuleVirtualDataViewCtrl
+
+#include <map>
+
+#define COLUMN_SERVER_NAME 0
+#define COLUMN_SERVER_ADDR 1
+#define COLUMN_SERVER_PORT 2
+#define COLUMN_SERVER_DESC 3
+#define COLUMN_SERVER_PING 4
+#define COLUMN_SERVER_USERS 5
+#define COLUMN_SERVER_MAXUSERS 6
+#define COLUMN_SERVER_FILES 7
+#define COLUMN_SERVER_PRIO 8
+#define COLUMN_SERVER_FAILS 9
+#define COLUMN_SERVER_STATIC 10
+#define COLUMN_SERVER_VERSION 11
+// These come before the wire-flag columns on purpose: the flag columns are not appended at all in
+// the remote GUI (see the CLIENT_GUI gate in ServerListCtrl.cpp), and the model treats any id at or
+// above RealColumnCount() -- the count of *appended* columns -- as out of range and renders it
+// blank.
+//
+// The ids must also stay in the same order the columns are appended in. FitColumnsToContent() walks
+// one index and uses it as both a model column and a view position, so a mismatch sizes each column
+// against another one's content, which reads as columns collapsing to nothing.
+#define COLUMN_SERVER_SOFTFILES 12
+#define COLUMN_SERVER_HARDFILES 13
+#define COLUMN_SERVER_TCPFLAGS 14
+#define COLUMN_SERVER_UDPFLAGS 15
+//! Always empty. Absorbs the macOS trailing-column sizing; see
+//! CMuleDataViewCtrl::AppendSpacerColumn().
+#define COLUMN_SERVER_SPACER 16
 
 class CServer;
 class CServerList;
 class wxListEvent;
 class wxCommandEvent;
 
-
 /**
- * The CServerListCtrl is used to display the list of servers which the user
- * can connect to and which we request sources from. It is a permanently sorted
- * list in that it always ensure that the items are sorted in the correct order.
+ * The list of servers the user can connect to and which we request sources from, permanently kept
+ * in sort order. Rows are text-rendered from the model (GetItemColumnText), not owner-drawn: the
+ * only graphic is the country flag in the Server Name column, supplied through GetItemIcon().
  */
-class CServerListCtrl : public CMuleListCtrl
+class CServerListCtrl : public CMuleVirtualDataViewCtrl
 {
 public:
-	/**
-	 * Constructor.
-	 *
-	 * @see CMuleListCtrl::CMuleListCtrl
-	 */
-	CServerListCtrl(
-	            wxWindow *parent,
-                wxWindowID winid = -1,
-                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
-                long style = wxLC_ICON,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = "mulelistctrl" );
+	CServerListCtrl(wxWindow *parent,
+		wxWindowID winid = wxID_ANY,
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
+		long style = 0,
+		const wxString &name = "serverlistctrl");
 
-	/**
-	 * Destructor.
-	 */
 	virtual ~CServerListCtrl();
 
+	/// Adds @a toadd to the list. Calls RefreshServer and ShowServerCount internally, so adding
+	/// a server already in the list is legal, though not recommended.
+	void AddServer(CServer *toadd);
 
-	/**
-	 * Adds a server to the list.
-	 *
-	 * @param A pointer to the new server.
-	 *
-	 * Internally this function calls RefreshServer and ShowServerCount, with
-	 * the result that it is legal to add servers already in the list, though
-	 * not recommended.
-	 */
-	void	AddServer( CServer* toadd );
+	/// Removes a server from the displayed list.
+	void RemoveServer(CServer *server);
 
-	/**
-	 * Removes a server from the displayed list.
-	 */
-	void	RemoveServer(CServer* server);
+	/// Removes servers from the list and from the core; @a selectedOnly restricts it to the
+	/// selected rows.
+	void RemoveAllServers(bool selectedOnly = false);
 
-	/**
-	 * Removes all servers with the specified state.
-	 *
-	 * @param state All items with this state will be removed, default being all.
-	 */
-	void	RemoveAllServers(int state = wxLIST_STATE_DONTCARE);
+	/// Updates the displayed information on @a server, repositioning the row if the current
+	/// sorting needs it. The server need not already be on the list, since AddServer uses this
+	/// -- but that skews the server count until the next AddServer call.
+	void RefreshServer(CServer *server);
 
+	/// Sets @a server's highlighting. Only _one_ item may be highlighted at a time, so
+	/// highlighting one clears whichever was highlighted before.
+	void HighlightServer(const CServer *server, bool highlight);
 
-	/**
-	 * Updates the displayed information on a server.
-	 *
-	 * @param server The server to be updated.
-	 *
-	 * This function will not only update the displayed information, it will also
-	 * reposition the item should it be nescecarry to enforce the current sorting.
-	 * Also note that this function does not require that the server actually is
-	 * on the list already, since AddServer makes use of it, but this should
-	 * generally be avoided, since it will result in the server-count getting
-	 * skewed until the next AddServer call.
-	 */
-	void	RefreshServer( CServer* server );
+	/// Updates the server count in the server window.
+	void ShowServerCount();
 
-	/**
-	 * Sets the highlighting of the specified server.
-	 *
-	 * @param server The server to have its highlighting set.
-	 * @param highlight The new highlighting state.
-	 *
-	 * Please note that only _one_ item is allowed to be highlighted at any
-	 * one time, so calling this function while another item is already
-	 * highlighted will result in the old item not being highlighted any more.
-	 */
-	void	HighlightServer( const CServer* server, bool highlight );
+	/// Resize every visible column to fit its content, and at least its header. The Description
+	/// column is capped so a very long description cannot dominate the list. Meant for one call
+	/// after a bulk (re)load, not for every per-server refresh.
+	void FitColumnsToContent();
 
+protected:
+	/// Return old column order.
+	wxString GetOldColumnOrder() const override;
 
+	/// Text of one cell, pulled on demand for the cells being drawn.
+	wxString GetItemColumnText(wxUIntPtr item, unsigned column) const override;
 
-	/**
-	 * This function updates the server-count in the server-wnd.
-	 */
-	void	ShowServerCount();
+	/// Host-country flag on the Server Name column, nothing elsewhere.
+	bool GetItemIcon(wxUIntPtr item, unsigned column, wxIcon &icon) const override;
 
-protected:
-	/// Return old column order.
-	wxString GetOldColumnOrder() const;
+	/// Bold for the server we are connected to, default for the rest.
+	bool GetItemAttr(wxUIntPtr item, unsigned column, wxDataViewItemAttr &attr) const override;
 
-private:
+	/// Ping, Users and Files change while the list is up, so sorting by one of them enables the
+	/// inherited live auto-sort.
+	bool IsLiveSortColumn() const override;
 
-	/**
-	 * Event-handler for handling item activation (connect).
-	 */
-	void	OnItemActivated( wxListEvent& event );
+	/// Single-column comparison for the base's sort chain.
+	int CompareItemData(
+		wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool alt, int modifier) const override;
 
-	/**
-	 * Event-handler for displaying the popup-menu.
-	 */
-	void	OnItemRightClicked( wxListEvent& event );
+private:
+	/// Item activation (connect).
+	void OnItemActivated(wxDataViewEvent &event);
 
-	/**
-	 * Event-handler for priority changes.
-	 */
-	void	OnPriorityChange( wxCommandEvent& event );
+	/// Displays the popup menu.
+	void OnItemRightClicked(wxDataViewEvent &event);
 
-	/**
-	 * Event-handler for static changes.
-	 */
-	void	OnStaticChange( wxCommandEvent& event );
+	/// Priority changes.
+	void OnPriorityChange(wxCommandEvent &event);
 
-	/**
-	 * Event-handler for server connections.
-	 */
-	void	OnConnectToServer( wxCommandEvent& event );
+	/// Static changes.
+	void OnStaticChange(wxCommandEvent &event);
 
-	/**
-	 * Event-handler for copying server-urls to the clipboard.
-	 */
-	void	OnGetED2kURL( wxCommandEvent& event );
+	/// Server connections.
+	void OnConnectToServer(wxCommandEvent &event);
 
-	/**
-	 * Event-handler for server removal.
-	 */
-	void	OnRemoveServers( wxCommandEvent& event );
+	/// Copying server URLs to the clipboard.
+	void OnGetED2kURL(wxCommandEvent &event);
 
-	/**
-	 * Event-handler for deleting servers when the delete-key is pressed.
-	 */
-	void	OnKeyPressed( wxKeyEvent& event );
+	/// Server removal.
+	void OnRemoveServers(wxCommandEvent &event);
 
-	/**
-	 * Sorter function.
-	 *
-	 * @see wxListCtrl::SortItems
-	 */
-	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData);
+	/// Delete key removes the selected servers; see CMuleDataViewCtrl::OnListKey.
+	bool OnListKey(wxKeyEvent &event) override;
 
+	/// @a code's flag, decoded on first use. An unknown code yields an invalid icon, which
+	/// draws as no icon at all.
+	const wxIcon &FlagIcon(const wxString &code) const;
 
 	//! Used to keep track of the last high-lighted item.
-	const CServer* m_connected;
+	const CServer *m_connected;
 
+	/**
+	 * ISO code -> flag icon, filled in lazily. Mutable because the flags are decoded from
+	 * GetItemIcon(), which the control calls to paint a row and is therefore const. Loading all
+	 * ~250 up front instead would decode a PNG for every country nobody is connected to.
+	 */
+	mutable std::map<wxString, wxIcon> m_flagIcons;
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.0.1.tar.gz/src/ServerSocket.cpp -> amule-3.1.0.tar.gz/src/ServerSocket.cpp Changed

@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "ServerSocket.h"	// Interface declarations
+#include "ServerSocket.h" // Interface declarations
 
 #include <protocol/Protocols.h>
 #include <common/EventIDs.h>
@@ -31,33 +31,29 @@
 
 #include <wx/tokenzr.h>
 
-#include "Packet.h"		// Needed for CPacket
-#include "updownclient.h"	// Needed for CUpDownClient
-#include "ClientList.h"		// Needed for CClientList
-#include "MemFile.h"		// Needed for CMemFile
-#include "PartFile.h"		// Needed for CPartFile
-#include "SearchList.h"		// Needed for CSearchList
-#include "Preferences.h"	// Needed for CPreferences
-#include "DownloadQueue.h"	// Needed for CDownloadQueue
-#include "ServerList.h"		// Needed for CServerList
-#include "Server.h"		// Needed for CServer
-#include "amule.h"		// Needed for theApp
-#include "Statistics.h"		// Needed for theStats
-#include "AsyncDNS.h" // Needed for CAsyncDNS
+#include "Packet.h"        // Needed for CPacket
+#include "updownclient.h"  // Needed for CUpDownClient
+#include "ClientList.h"    // Needed for CClientList
+#include "MemFile.h"       // Needed for CMemFile
+#include "PartFile.h"      // Needed for CPartFile
+#include "SearchList.h"    // Needed for CSearchList
+#include "Preferences.h"   // Needed for CPreferences
+#include "DownloadQueue.h" // Needed for CDownloadQueue
+#include "ServerList.h"    // Needed for CServerList
+#include "Server.h"        // Needed for CServer
+#include "amule.h"         // Needed for theApp
+#include "Statistics.h"    // Needed for theStats
+#include "AsyncDNS.h"      // Needed for CAsyncDNS
 #include "Logger.h"
 #include <common/Format.h>
 #include "IPFilter.h"
-#include "GuiEvents.h"		// Needed for Notify_*
+#include "GuiEvents.h" // Needed for Notify_*
 #include <boost/system/error_code.hpp>
 
-
-//------------------------------------------------------------------------------
 // CServerSocket
-//------------------------------------------------------------------------------
 
-CServerSocket::CServerSocket(CServerConnect* in_serverconnect, const CProxyData *ProxyData)
-:
-CEMSocket(ProxyData)
+CServerSocket::CServerSocket(CServerConnect *in_serverconnect, const CProxyData *ProxyData)
+: CEMSocket(ProxyData)
 {
 	serverconnect = in_serverconnect;
 	connectionstate = 0;
@@ -74,55 +70,75 @@
 
 CServerSocket::~CServerSocket()
 {
-	if (cur_server) {
-		delete cur_server;
-	}
+	delete cur_server;
 	cur_server = NULL;
 }
 
-
 void CServerSocket::OnConnect(int nErrorCode)
 {
 	switch (nErrorCode) {
-		case boost::system::errc::success:
-			if (cur_server->HasDynIP()) {
-				uint32 server_ip = GetPeerInt();
-				cur_server->SetID(server_ip);
-				// GetServerByAddress may return NULL, so we must test!
-				// This was the reason why amule would crash when trying to
-				// connect in wxWidgets 2.5.2
-				CServer *pServer = theApp->serverlist->GetServerByAddress(
-					cur_server->GetAddress(), cur_server->GetPort());
-				if (pServer) {
-					pServer->SetID(server_ip);
-				} else {
-					AddDebugLogLineN(logServer, "theApp->serverlist->GetServerByAddress() returned NULL");
-					return;
-				}
+	case boost::system::errc::success:
+		if (cur_server->HasDynIP()) {
+			uint32 server_ip = GetPeerInt();
+			cur_server->SetID(server_ip);
+			// GetServerByAddress may return NULL, so it must be tested: this was
+			// the reason aMule crashed when connecting under wxWidgets 2.5.2.
+			CServer *pServer = theApp->serverlist->GetServerByAddress(
+				cur_server->GetAddress(), cur_server->GetPort());
+			if (pServer) {
+				pServer->SetID(server_ip);
+			} else {
+				AddDebugLogLineN(
+					logServer, "theApp->serverlist->GetServerByAddress() returned NULL");
+				return;
 			}
-			SetConnectionState(CS_WAITFORLOGIN);
-			break;
-
-		case boost::system::errc::address_in_use:
-		case boost::system::errc::address_not_available:
-		case boost::system::errc::bad_address:
-		case boost::system::errc::connection_refused:
-		case boost::system::errc::host_unreachable:
-		case boost::system::errc::invalid_argument:
-		case boost::system::errc::timed_out:
-			m_bIsDeleting = true;
-			SetConnectionState(CS_SERVERDEAD);
-			serverconnect->DestroySocket(this);
-			return;
+		}
+		SetConnectionState(CS_WAITFORLOGIN);
+		break;
+
+	// Only what the server itself answered counts against it, because CS_SERVERDEAD raises its
+	// failed count and a server past the "remove dead servers" threshold is deleted for good. A
+	// refused connection, or a SYN accepted in silence, is evidence about that server.
+	case boost::system::errc::connection_refused:
+	case boost::system::errc::timed_out:
+		m_bIsDeleting = true;
+		SetConnectionState(CS_SERVERDEAD);
+		serverconnect->DestroySocket(this);
+		return;
 
-		default:
-			m_bIsDeleting = true;
-			SetConnectionState(CS_FATALERROR);
-			serverconnect->DestroySocket(this);
-			return;
+	// Not counted against the server, but the sweep carries on to the next candidate -- which
+	// is what separates these from the CS_FATALERROR default below.
+	//
+	// host_unreachable is the ambiguous one: a router can report it by ICMP for a remote host
+	// that genuinely no longer routes. It is classified here anyway because of how it fails
+	// when the fault is ours: with the link down every server answers that way within
+	// milliseconds, so the whole list accrued failures and was deleted the moment connectivity
+	// returned -- RemoveDeadServers() only runs after a connection succeeds. A server that has
+	// really stopped routing is still counted by the UDP status pings, which have their own
+	// AddFailedCount().
+	//
+	// The rest are unambiguous local socket faults and were never about the server.
+	//
+	// Deliberately not CS_FATALERROR: that calls StopConnectionTry() and waits
+	// CS_RETRYCONNECTTIME, which is right when the whole network is gone -- network_unreachable
+	// and friends still land there via default -- but wrong for one unreachable host, where a
+	// stale entry would stall the sweep for 30 s.
+	case boost::system::errc::address_in_use:
+	case boost::system::errc::address_not_available:
+	case boost::system::errc::bad_address:
+	case boost::system::errc::host_unreachable:
+	case boost::system::errc::invalid_argument:
+		m_bIsDeleting = true;
+		SetConnectionState(CS_ERROR);
+		serverconnect->DestroySocket(this);
+		return;
 
+	default:
+		m_bIsDeleting = true;
+		SetConnectionState(CS_FATALERROR);
+		serverconnect->DestroySocket(this);
+		return;
 	}
-
 }
 
 void CServerSocket::OnReceive(int nErrorCode)
@@ -135,440 +151,460 @@
 	m_dwLastTransmission = GetTickCount64();
 }
 
-bool CServerSocket::ProcessPacket(const uint8_t* packet, uint32 size, int8 opcode)
+bool CServerSocket::ProcessPacket(const uint8_t *packet, uint32 size, int8 opcode)
 {
 	try {
-		AddDebugLogLineN( logServer, "Processing Server Packet: " );
+		AddDebugLogLineN(logServer, "Processing Server Packet: ");
 
-		switch(opcode) {
-			case OP_SERVERMESSAGE: {
-				/* Kry import of lugdunum 16.40 new features */
-				AddDebugLogLineN( logServer, "Server: OP_SERVERMESSAGE" );
+		switch (opcode) {
+		case OP_SERVERMESSAGE: {
+			/* Kry import of lugdunum 16.40 new features */
+			AddDebugLogLineN(logServer, "Server: OP_SERVERMESSAGE");
 
-				if (size < 3) {
-					throw wxString("Corrupt or invalid server message received (size too small)");
-				}
+			if (size < 3) {
+				throw wxString("Corrupt or invalid server message received (size too small)");
+			}
 
-				theStats::AddDownOverheadServer(size);
-				char* buffer = new charsize-1;
-				memcpy(buffer,&packet2,size-2);
-				buffersize-2 = 0;
+			theStats::AddDownOverheadServer(size);
+			char *buffer = new charsize - 1;
+			memcpy(buffer, &packet2, size - 2);
+			buffersize - 2 = 0;
 
-				wxString strMessages(char2unicode(buffer));
+			wxString strMessages(char2unicode(buffer));
 
-				delete buffer;
+			delete buffer;
 
-				// 16.40 servers do not send separate OP_SERVERMESSAGE packets for each line;
-				// instead of this they are sending all text lines with one OP_SERVERMESSAGE packet.
+			// 16.40 servers do not send separate OP_SERVERMESSAGE packets for each line;
+			// instead of this they are sending all text lines with one OP_SERVERMESSAGE packet.
 
-				wxStringTokenizer token(strMessages,"\r\n",wxTOKEN_DEFAULT );
+			wxStringTokenizer token(strMessages, "\r\n", wxTOKEN_DEFAULT);
 
-				while (token.HasMoreTokens()) {
-					wxString message = token.GetNextToken();
+			while (token.HasMoreTokens()) {
+				wxString message = token.GetNextToken();
 
-					bool bOutputMessage = true;
-					if (message.StartsWith("server version")) {
-						wxString strVer = message.Mid(15,64); // truncate string to avoid misuse by servers in showing ads
-						strVer.Trim();
-						CServer* eserver = theApp->serverlist->GetServerByAddress(cur_server->GetAddress(),cur_server->GetPort());
-						if (eserver) {
-							eserver->SetVersion(strVer);
-							Notify_ServerRefresh(eserver);
-						}
-					} else if (message.StartsWith("ERROR")) {
-						CServer* pServer = theApp->serverlist->GetServerByAddress(cur_server->GetAddress(),cur_server->GetPort());
-						wxString servername;
-						if (pServer) {
-							servername	= pServer->GetListName();
-						} else {
-							servername = _("Server");
-						}
-						AddLogLineN(CFormat( _("ERROR: %s (%s) - %s") )
-							% servername
-							% Uint32_16toStringIP_Port(cur_server->GetIP(), cur_server->GetPort())
-							% message.Mid(5,message.Len()).Trim(" :"));
-						bOutputMessage = false;
-
-					} else if (message.StartsWith("WARNING")) {
-
-						CServer* pServer = theApp->serverlist->GetServerByAddress(cur_server->GetAddress(),cur_server->GetPort());
-						wxString servername;
-						if (pServer) {
-							servername	= pServer->GetListName();
-						} else {
-							servername = _("Server");
-						}
-						AddLogLineN(CFormat( _("WARNING: %s (%s) - %s") )
-							% servername
-							% Uint32_16toStringIP_Port(cur_server->GetIP(), cur_server->GetPort())
-							% message.Mid(5,message.Len()).Trim(" :"));
+				bool bOutputMessage = true;
+				if (message.StartsWith("server version")) {
+					wxString strVer =
+						message.Mid(15, 64); // truncate string to avoid misuse by
+								     // servers in showing ads
+					strVer.Trim();
+					CServer *eserver = theApp->serverlist->GetServerByAddress(
+						cur_server->GetAddress(), cur_server->GetPort());
+					if (eserver) {
+						eserver->SetVersion(strVer);
+						Notify_ServerRefresh(eserver);
+					}
+				} else if (message.StartsWith("ERROR")) {
+					CServer *pServer = theApp->serverlist->GetServerByAddress(
+						cur_server->GetAddress(), cur_server->GetPort());
+					wxString servername;
+					if (pServer) {
+						servername = pServer->GetListName();
+					} else {
+						servername = _("Server");
+					}
+					AddLogLineN(CFormat(_("ERROR: %s (%s) - %s")) % servername %
+						    Uint32_16toStringIP_Port(
+							    cur_server->GetIP(), cur_server->GetPort()) %
+						    message.Mid(5, message.Len()).Trim(" :"));
+					bOutputMessage = false;
 
-						bOutputMessage = false;
+				} else if (message.StartsWith("WARNING")) {
+
+					CServer *pServer = theApp->serverlist->GetServerByAddress(
+						cur_server->GetAddress(), cur_server->GetPort());
+					wxString servername;
+					if (pServer) {
+						servername = pServer->GetListName();
+					} else {
+						servername = _("Server");
 					}
+					AddLogLineN(CFormat(_("WARNING: %s (%s) - %s")) % servername %
+						    Uint32_16toStringIP_Port(
+							    cur_server->GetIP(), cur_server->GetPort()) %
+						    message.Mid(5, message.Len()).Trim(" :"));
+
+					bOutputMessage = false;
+				}
 
-					if (message.Find("emDynIP: ") != (-1) && message.Find("") != (-1) && message.Find("emDynIP: ") < message.Find("")){
-						wxString dynip = message.Mid(message.Find("emDynIP: ")+10,message.Find("") - (message.Find("emDynIP: ")+10));
-						dynip.Trim(" ");
-						if ( dynip.Length() && dynip.Length() < 51){
-							CServer* eserver = theApp->serverlist->GetServerByAddress(cur_server->GetAddress(),cur_server->GetPort());
-							if (eserver){
-								eserver->SetDynIP(dynip);
-								cur_server->SetDynIP(dynip);
-								Notify_ServerRefresh(eserver);
-							}
+				if (message.Find("emDynIP: ") != (-1) && message.Find("") != (-1) &&
+					message.Find("emDynIP: ") < message.Find("")) {
+					wxString dynip = message.Mid(message.Find("emDynIP: ") + 10,
+						message.Find("") - (message.Find("emDynIP: ") + 10));
+					dynip.Trim(" ");
+					if (dynip.Length() && dynip.Length() < 51) {
+						CServer *eserver = theApp->serverlist->GetServerByAddress(
+							cur_server->GetAddress(), cur_server->GetPort());
+						if (eserver) {
+							eserver->SetDynIP(dynip);
+							cur_server->SetDynIP(dynip);
+							Notify_ServerRefresh(eserver);
 						}
 					}
+				}
 
-					if (bOutputMessage) {
-						theApp->AddServerMessageLine(message);
-					}
+				if (bOutputMessage) {
+					theApp->AddServerMessageLine(message);
 				}
-				break;
 			}
-			case OP_IDCHANGE: {
-				AddDebugLogLineN(logServer, "Server: OP_IDCHANGE");
-
-				theStats::AddDownOverheadServer(size);
+			break;
+		}
+		case OP_IDCHANGE: {
+			AddDebugLogLineN(logServer, "Server: OP_IDCHANGE");
 
-				if (size < 4 /* uint32 (ID)*/) {
-					throw wxString("Corrupt or invalid loginanswer from server received");
-				}
+			theStats::AddDownOverheadServer(size);
 
-				CMemFile data(packet, size);
+			if (size < 4 /* uint32 (ID)*/) {
+				throw wxString("Corrupt or invalid loginanswer from server received");
+			}
 
-				uint32 new_id = data.ReadUInt32();
-
-				// save TCP flags in 'cur_server'
-				wxASSERT(cur_server);
-				CServer* pServer = NULL;
-				if (cur_server) {
-					uint32 ConnPort = 0;
-					uint32 rport = cur_server->GetConnPort();
-					pServer = theApp->serverlist->GetServerByAddress(cur_server->GetAddress(), rport);
-					if (size >= 4+4 /* uint32 (ID) + uint32 (TCP flags)*/) {
-						cur_server->SetTCPFlags(data.ReadUInt32());
-						if (size >= 4+4+4 /* uint32 (ID) + uint32 (TCP flags) + uint32 (aux port) */) {
-							// aux port login : we should use the 'standard' port of this server to advertise to other clients
-							ConnPort = data.ReadUInt32();
-							cur_server->SetPort(ConnPort);
-							if (cur_server->GetAuxPortsList().IsEmpty()) {
-								cur_server->SetAuxPortsList(CFormat("%u") % rport);
-							}
+			CMemFile data(packet, size);
+
+			uint32 new_id = data.ReadUInt32();
+
+			// save TCP flags in 'cur_server'
+			wxASSERT(cur_server);
+			CServer *pServer = NULL;
+			if (cur_server) {
+				uint32 ConnPort = 0;
+				uint32 rport = cur_server->GetConnPort();
+				pServer = theApp->serverlist->GetServerByAddress(
+					cur_server->GetAddress(), rport);
+				if (size >= 4 + 4 /* uint32 (ID) + uint32 (TCP flags)*/) {
+					cur_server->SetTCPFlags(data.ReadUInt32());
+					if (size >= 4+4+4 /* uint32 (ID) + uint32 (TCP flags) + uint32 (aux port) */) {
+						// aux port login : we should use the 'standard' port of this
+						// server to advertise to other clients
+						ConnPort = data.ReadUInt32();
+						cur_server->SetPort(ConnPort);
+						if (cur_server->GetAuxPortsList().IsEmpty()) {
+							cur_server->SetAuxPortsList(CFormat("%u") % rport);
 						}
-					} else {
-						cur_server->SetTCPFlags(0);
 					}
-					// copy TCP flags into the server in the server list
-					if (pServer) {
-						pServer->SetTCPFlags(cur_server->GetTCPFlags());
-						if (ConnPort) {
-							pServer->SetPort(ConnPort);
-							if (pServer->GetAuxPortsList().IsEmpty()) {
-								pServer->SetAuxPortsList(CFormat("%u") % pServer->GetConnPort());
-							}
-							Notify_ServerRefresh(pServer);
-							Notify_ServerUpdateED2KInfo();
+				} else {
+					cur_server->SetTCPFlags(0);
+				}
+				// copy TCP flags into the server in the server list
+				if (pServer) {
+					pServer->SetTCPFlags(cur_server->GetTCPFlags());
+					if (ConnPort) {
+						pServer->SetPort(ConnPort);
+						if (pServer->GetAuxPortsList().IsEmpty()) {
+							pServer->SetAuxPortsList(
+								CFormat("%u") % pServer->GetConnPort());
 						}
+						Notify_ServerRefresh(pServer);
+						Notify_ServerUpdateED2KInfo();
 					}
 				}
+			}
 
-				uint32 dwServerReportedIP = 0;
-				if (size >= 4 + 4 + 4 + 4 + 4 /* All of the above + reported ip + obfuscation port */) {
-					dwServerReportedIP = data.ReadUInt32();
-					if (::IsLowID(dwServerReportedIP)){
-						AddDebugLogLineN(logServer,
-							CFormat(wxT("OP_IDCHANGE: server-reported IP %u is a LowID-shaped value; ignoring"))
-								% dwServerReportedIP);
-						dwServerReportedIP = 0;
-					}
-					if (dwServerReportedIP != 0 && !::IsLowID(new_id) && dwServerReportedIP != new_id) {
-						AddDebugLogLineN(logServer,
-							CFormat(wxT("OP_IDCHANGE: server-reported IP %u doesn't match assigned HighID %u; ignoring"))
-								% dwServerReportedIP % new_id);
+			uint32 dwServerReportedIP = 0;
+			if (size >=
+				4 + 4 + 4 + 4 + 4 /* All of the above + reported ip + obfuscation port */) {
+				dwServerReportedIP = data.ReadUInt32();
+				if (::IsLowID(dwServerReportedIP)) {
+					AddDebugLogLineN(logServer,
+						CFormat(wxT("OP_IDCHANGE: server-reported IP %u is a "
+							    "LowID-shaped value; ignoring")) %
+							dwServerReportedIP);
+					dwServerReportedIP = 0;
+				}
+				if (dwServerReportedIP != 0 && !::IsLowID(new_id) &&
+					dwServerReportedIP != new_id) {
+					AddDebugLogLineN(logServer,
+						CFormat(wxT("OP_IDCHANGE: server-reported IP %u doesn't "
+							    "match assigned HighID %u; ignoring")) %
+							dwServerReportedIP % new_id);
+				}
+				uint32 dwObfuscationTCPPort = data.ReadUInt32();
+				if (dwObfuscationTCPPort != 0) {
+					if (cur_server != NULL) {
+						cur_server->SetObfuscationPortTCP(dwObfuscationTCPPort);
 					}
-					uint32 dwObfuscationTCPPort = data.ReadUInt32();
-					if (dwObfuscationTCPPort != 0) {
-						if (cur_server != NULL) {
-							cur_server->SetObfuscationPortTCP(dwObfuscationTCPPort);
-						}
-						if (pServer != NULL) {
-							pServer->SetObfuscationPortTCP(dwObfuscationTCPPort);
-						}
+					if (pServer != NULL) {
+						pServer->SetObfuscationPortTCP(dwObfuscationTCPPort);
 					}
 				}
+			}
 
-				if (new_id == 0) {
+			if (new_id == 0) {
+				uint8 state = thePrefs::GetSmartIdState();
+				if (state > 0) {
+					state++;
+					if (state > 3) {
+						thePrefs::SetSmartIdState(0);
+					} else {
+						thePrefs::SetSmartIdState(state);
+					}
+				}
+				// The server explicitly assigned no client ID: it gave up on its
+				// HighID-callback verification before we could complete it. This
+				// used to break out of OP_IDCHANGE without ever calling
+				// SetConnectionState(CS_CONNECTED), leaving the socket in limbo
+				// until the 15 s client-side timeout fired (#778). Disconnect
+				// explicitly so the failure is logged and the next retry starts
+				// immediately.
+				AddLogLineC(
+					CFormat(_("Server %s (%s) rejected our login (no client ID "
+						  "assigned). Disconnecting.")) %
+					(pServer ? pServer->GetListName() : wxString(_("Server"))) %
+					Uint32_16toStringIP_Port(cur_server->GetIP(), cur_server->GetPort()));
+				m_bIsDeleting = true;
+				SetConnectionState(CS_DISCONNECTED);
+				serverconnect->DestroySocket(this);
+				return true;
+			}
+			if (thePrefs::GetSmartIdCheck()) {
+				if (!IsLowID(new_id)) {
+					thePrefs::SetSmartIdState(1);
+				} else {
 					uint8 state = thePrefs::GetSmartIdState();
-					if ( state > 0 ) {
+					if (state > 0) {
 						state++;
-						if(state > 3) {
+						if (state > 3) {
 							thePrefs::SetSmartIdState(0);
 						} else {
 							thePrefs::SetSmartIdState(state);
 						}
-					}
-					// The server explicitly assigned no client ID -- it
-					// gave up on its HighID-callback verification before
-					// we could complete it.  Pre-fix this silently broke
-					// out of OP_IDCHANGE without ever calling
-					// SetConnectionState(CS_CONNECTED), leaving the socket
-					// in limbo until the 15 s client-side timeout fired
-					// (#778).  Disconnect explicitly so the failure is
-					// surfaced as a clear log line and the next retry
-					// starts immediately instead of after the silent wait.
-					AddLogLineC(CFormat(
-						_("Server %s (%s) rejected our login (no client ID assigned). Disconnecting."))
-						% (pServer ? pServer->GetListName() : wxString(_("Server")))
-						% Uint32_16toStringIP_Port(cur_server->GetIP(), cur_server->GetPort()));
-					m_bIsDeleting = true;
-					SetConnectionState(CS_DISCONNECTED);
-					serverconnect->DestroySocket(this);
-					return true;
-				}
-				if(thePrefs::GetSmartIdCheck()) {
-					if (!IsLowID(new_id)) {
-						thePrefs::SetSmartIdState(1);
-					} else {
-						uint8 state = thePrefs::GetSmartIdState();
-						if ( state > 0 ) {
-							state++;
-							if(state > 3) {
-								thePrefs::SetSmartIdState(0);
-							} else {
-								thePrefs::SetSmartIdState(state);
-							}
-							break;
-						}
+						break;
 					}
 				}
+			}
 
-				// we need to know our client when sending our shared files (done indirectly on SetConnectionState)
+			// we need to know our client when sending our shared files (done indirectly on
+			// SetConnectionState)
 
-				serverconnect->SetClientID(new_id);
+			serverconnect->SetClientID(new_id);
 
-				if (::IsLowID(new_id) && dwServerReportedIP != 0) {
-					theApp->SetPublicIP(dwServerReportedIP);
-				}
-
-				if (connectionstate != CS_CONNECTED) {
-					AddDebugLogLineN(logServer, "Connected");
+			if (::IsLowID(new_id) && dwServerReportedIP != 0) {
+				theApp->SetPublicIP(dwServerReportedIP);
+			}
 
-					SetConnectionState(CS_CONNECTED);
-					theApp->OnlineSig();       // Added By Bouc7
-				}
+			if (connectionstate != CS_CONNECTED) {
+				AddDebugLogLineN(logServer, "Connected");
 
-				theApp->ShowConnectionState();
+				SetConnectionState(CS_CONNECTED);
+				theApp->OnlineSig(); // Added By Bouc7
+			}
 
-				AddLogLineN(CFormat(_("New clientid is %u")) % new_id);
-				if (::IsLowID(new_id)) {
-					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 https://amule-org.github.io/docs"));
-				}
+			theApp->ShowConnectionState();
 
-				theApp->downloadqueue->ResetLocalServerRequests();
-				break;
+			AddLogLineN(CFormat(_("New clientid is %u")) % new_id);
+			if (::IsLowID(new_id)) {
+				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 "
+					      "https://amule-org.github.io/docs"));
 			}
-			case OP_SEARCHRESULT: {
-				AddDebugLogLineN(logServer, "Server: OP_SEARCHRESULT");
-
-				theStats::AddDownOverheadServer(size);
-				CServer* cur_srv = (serverconnect) ?
-					serverconnect->GetCurrentServer() : NULL;
-				theApp->searchlist->ProcessSearchAnswer(
-					packet,
-					size,
-					true /*(cur_srv && cur_srv->GetUnicodeSupport())*/,
-					cur_srv ? cur_srv->GetIP() : 0,
-					cur_srv ? cur_srv->GetPort() : 0);
-				theApp->searchlist->LocalSearchEnd();
-				break;
+
+			theApp->downloadqueue->ResetLocalServerRequests();
+			break;
+		}
+		case OP_SEARCHRESULT: {
+			AddDebugLogLineN(logServer, "Server: OP_SEARCHRESULT");
+
+			theStats::AddDownOverheadServer(size);
+			CServer *cur_srv = (serverconnect) ? serverconnect->GetCurrentServer() : NULL;
+			theApp->searchlist->ProcessSearchAnswer(packet,
+				size,
+				true /*(cur_srv && cur_srv->GetUnicodeSupport())*/,
+				cur_srv ? cur_srv->GetIP() : 0,
+				cur_srv ? cur_srv->GetPort() : 0);
+			theApp->searchlist->LocalSearchEnd();
+			break;
+		}
+		case OP_FOUNDSOURCES_OBFU:
+		case OP_FOUNDSOURCES: {
+			AddDebugLogLineN(
+				logServer, CFormat("ServerMsg - OP_FoundSources; sources = %u") % packet16);
+			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 {
+				AddDebugLogLineN(
+					logServer, "Sources received for unknown file: " + fileid.Encode());
 			}
-			case OP_FOUNDSOURCES_OBFU:
-			case OP_FOUNDSOURCES: {
-				AddDebugLogLineN(logServer, CFormat("ServerMsg - OP_FoundSources; sources = %u") % packet16);
-				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 {
-					AddDebugLogLineN(logServer, "Sources received for unknown file: " + fileid.Encode());
-				}
-				break;
+			break;
+		}
+		case OP_SERVERSTATUS: {
+			AddDebugLogLineN(logServer, "Server: OP_SERVERSTATUS");
+			// FIXME some statuspackets have a different size -> why? structure?
+			if (size < 8) {
+				throw wxString("Invalid server status packet");
 			}
-			case OP_SERVERSTATUS: {
-				AddDebugLogLineN(logServer, "Server: OP_SERVERSTATUS");
-				// FIXME some statuspackets have a different size -> why? structure?
-				if (size < 8) {
-					throw wxString("Invalid server status packet");
-				}
-				CServer* update = theApp->serverlist->GetServerByAddress(cur_server->GetAddress(), cur_server->GetPort());
-				if (update) {
-					CMemFile data(packet, size);
-					update->SetUserCount(data.ReadUInt32());
-					update->SetFileCount(data.ReadUInt32());
-					Notify_ServerRefresh( update );
-					theApp->ShowUserCount();
-				}
-				break;
+			CServer *update = theApp->serverlist->GetServerByAddress(
+				cur_server->GetAddress(), cur_server->GetPort());
+			if (update) {
+				CMemFile data(packet, size);
+				update->SetUserCount(data.ReadUInt32());
+				update->SetFileCount(data.ReadUInt32());
+				Notify_ServerRefresh(update);
+				theApp->ShowUserCount();
 			}
-			// Cleaned.
-			case OP_SERVERIDENT: {
-				AddDebugLogLineN(logServer, "Server: OP_SERVERIDENT");
-
-				theStats::AddDownOverheadServer(size);
-				if (size<38) {
-					AddLogLineN(_("Unknown server info received! - too short"));
-					// throw wxString("Unknown server info received!");
-					break;
-				}
-				CServer* update = theApp->serverlist->GetServerByAddress(cur_server->GetAddress(),cur_server->GetPort());
-				if (update) {
-					CMemFile data(packet,size);
-					CMD4Hash hash = data.ReadHash();
-					if (RawPeekUInt32(hash.GetHash()) == 0x2A2A2A2A){ // No endian problem here
-						const wxString& rstrVersion = update->GetVersion();
-						if (!rstrVersion.IsEmpty()) {
-							update->SetVersion("eFarm " + rstrVersion);
-						} else {
-							update->SetVersion("eFarm");
-						}
-					}
-					// Unused
-					/*uint32 nServerIP = */data.ReadUInt32();
-					/*uint16 nServerPort = */data.ReadUInt16();
-
-					uint32 nTags = data.ReadUInt32();
-					for (uint32 i = 0; i < nTags; i++){
-						// Force Unicode=true rather than relying on the
-						// server's SRV_TCPFLG_UNICODE bit: many
-						// real-world servers ship UTF-8 strings (emoji
-						// in names, non-ASCII descriptions) without
-						// advertising the capability flag, and parsing
-						// those bytes as non-Unicode mangles them.
-						// Matches the hardcoded Unicode=true already
-						// used for search-result parsing at the top
-						// of this file. The .met-file parse path
-						// (Server.cpp::AddTagFromFile) also uses
-						// hardcoded Unicode=true, so this aligns the
-						// runtime update with the load-time read and
-						// stops the "name correct on first display,
-						// garbled a few seconds later" regression.
-						// (#831)
-						CTag tag(data, true);
-						if (tag.GetNameID() == ST_SERVERNAME){
-							update->SetListName(tag.GetStr());
-						} else if (tag.GetNameID() == ST_DESCRIPTION){
-							update->SetDescription(tag.GetStr());
-						} // No more known tags from server
-					}
-
-					theApp->ShowConnectionState();
-					Notify_ServerRefresh(update);
-				}
+			break;
+		}
+		// Cleaned.
+		case OP_SERVERIDENT: {
+			AddDebugLogLineN(logServer, "Server: OP_SERVERIDENT");
+
+			theStats::AddDownOverheadServer(size);
+			if (size < 38) {
+				AddLogLineN(_("Unknown server info received! - too short"));
+				// throw wxString("Unknown server info received!");
 				break;
 			}
-			// tecxx 1609 2002 - add server's serverlist to own serverlist
-			case OP_SERVERLIST: {
-				AddDebugLogLineN(logServer, "Server: OP_SERVERLIST");
-
-				// Stack-allocated wrapper so a CEOFException out of any
-				// of the ReadUInt* calls below (empty or truncated
-				// payload from a malicious server) doesn't leak it on
-				// the way out to the function-level catch block at the
-				// end of ProcessPacket (#885).
-				CMemFile servers(packet, size);
-				uint8 count = servers.ReadUInt8();
-				if (((int32)(count*6 + 1) > size)) {
-					count = 0;
-				}
-				int addcount = 0;
-				while(count) {
-					uint32 ip	= servers.ReadUInt32();
-					uint16 port = servers.ReadUInt16();
-					CServer* srv = new CServer(
-								port ,				// Port
-								Uint32toStringIP(ip));	// Ip
-					srv->SetListName(srv->GetFullIP());
-					if (!theApp->AddServer(srv)) {
-						delete srv;
+			CServer *update = theApp->serverlist->GetServerByAddress(
+				cur_server->GetAddress(), cur_server->GetPort());
+			if (update) {
+				CMemFile data(packet, size);
+				CMD4Hash hash = data.ReadHash();
+				if (RawPeekUInt32(hash.GetHash()) == 0x2A2A2A2A) { // No endian problem here
+					const wxString &rstrVersion = update->GetVersion();
+					if (!rstrVersion.IsEmpty()) {
+						update->SetVersion("eFarm " + rstrVersion);
 					} else {
-						addcount++;
+						update->SetVersion("eFarm");
 					}
-					count--;
 				}
-				if (addcount) {
-					AddLogLineN(CFormat(wxPLURAL("Received %d new server", "Received %d new servers", addcount)) % addcount);
+				// Unused
+				/*uint32 nServerIP = */ data.ReadUInt32();
+				/*uint16 nServerPort = */ data.ReadUInt16();
+
+				uint32 nTags = data.ReadUInt32();
+				for (uint32 i = 0; i < nTags; i++) {
+					// Force Unicode=true rather than relying on the server's
+					// SRV_TCPFLG_UNICODE bit: many real-world servers ship
+					// UTF-8 strings without advertising the capability, and
+					// parsing those bytes as non-Unicode mangles them. Matches
+					// the hardcoded Unicode=true used for search-result parsing
+					// and by the .met-file parse path, which is what stops the
+					// "name correct on first display, garbled a few seconds
+					// later" regression (#831).
+					CTag tag(data, true);
+					if (tag.GetNameID() == ST_SERVERNAME) {
+						update->SetListName(tag.GetStr());
+					} else if (tag.GetNameID() == ST_DESCRIPTION) {
+						update->SetDescription(tag.GetStr());
+					} // No more known tags from server
 				}
-				theApp->serverlist->SaveServerMet();
-				AddLogLineN(_("Saving of server-list completed."));
-				break;
+
+				theApp->ShowConnectionState();
+				Notify_ServerRefresh(update);
 			}
-			case OP_CALLBACKREQUESTED: {
-				AddDebugLogLineN(logServer, "Server: OP_CALLBACKREQUESTED");
-
-				theStats::AddDownOverheadServer(size);
-				if (size >= 6) {
-					CMemFile data(packet,size);
-					uint32 dwIP = data.ReadUInt32();
-					uint16 nPort = data.ReadUInt16();
-
-					uint8 byCryptOptions = 0;
-					CMD4Hash achUserHash;
-					if (size >= 23){
-						byCryptOptions = data.ReadUInt8();;
-						achUserHash = data.ReadHash();
-					}
+			break;
+		}
+		// tecxx 1609 2002 - add server's serverlist to own serverlist
+		case OP_SERVERLIST: {
+			AddDebugLogLineN(logServer, "Server: OP_SERVERLIST");
+
+			// Stack-allocated wrapper so a CEOFException out of any of the ReadUInt*
+			// calls below -- an empty or truncated payload from a malicious server --
+			// cannot leak it on the way out (#885).
+			CMemFile servers(packet, size);
+			uint8 count = servers.ReadUInt8();
+			if (((int32)(count * 6 + 1) > size)) {
+				count = 0;
+			}
+			int addcount = 0;
+			while (count) {
+				uint32 ip = servers.ReadUInt32();
+				uint16 port = servers.ReadUInt16();
+				CServer *srv = new CServer(port, // Port
+					Uint32toStringIP(ip));   // Ip
+				srv->SetListName(srv->GetFullIP());
+				if (!theApp->AddServer(srv)) {
+					delete srv;
+				} else {
+					addcount++;
+				}
+				count--;
+			}
+			if (addcount) {
+				AddLogLineN(CFormat(wxPLURAL("Received %d new server",
+						    "Received %d new servers",
+						    addcount)) %
+					    addcount);
+			}
+			theApp->serverlist->SaveServerMet();
+			AddLogLineN(_("Saving of server-list completed."));
+			break;
+		}
+		case OP_CALLBACKREQUESTED: {
+			AddDebugLogLineN(logServer, "Server: OP_CALLBACKREQUESTED");
+
+			theStats::AddDownOverheadServer(size);
+			if (size >= 6) {
+				CMemFile data(packet, size);
+				uint32 dwIP = data.ReadUInt32();
+				uint16 nPort = data.ReadUInt16();
+
+				uint8 byCryptOptions = 0;
+				CMD4Hash achUserHash;
+				if (size >= 23) {
+					byCryptOptions = data.ReadUInt8();
+					;
+					achUserHash = data.ReadHash();
+				}
 
-					CUpDownClient* client = theApp->clientlist->FindClientByIP(dwIP,nPort);
+				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){
-							AddDebugLogLineN(logServer, "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);
-							client->SetCryptLayerRequires(false);
-						} else {
-							client->SetConnectOptions(byCryptOptions, true, false);
-						}
-					} else if (size >= 23) {
-						client->SetUserHash(achUserHash);
+				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) {
+						AddDebugLogLineN(logServer,
+							"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);
+						client->SetCryptLayerRequires(false);
+					} else {
 						client->SetConnectOptions(byCryptOptions, true, false);
 					}
-
-					client->TryToConnect();
+				} else if (size >= 23) {
+					client->SetUserHash(achUserHash);
+					client->SetConnectOptions(byCryptOptions, true, false);
 				}
-				break;
-			}
-			case OP_CALLBACK_FAIL: {
-				AddDebugLogLineN(logServer, "Server: OP_CALLBACK_FAIL");
-				break;
-			}
-			case OP_REJECT: {
-				AddDebugLogLineN(logServer, "Server: OP_REJECT");
-				AddLogLineN(_("Server rejected last command"));
-				break;
+
+				client->TryToConnect();
 			}
-			default:
-				AddDebugLogLineN(logPacketErrors, CFormat("Unknown server packet with OPcode %x") % opcode);
+			break;
+		}
+		case OP_CALLBACK_FAIL: {
+			AddDebugLogLineN(logServer, "Server: OP_CALLBACK_FAIL");
+			break;
+		}
+		case OP_REJECT: {
+			AddDebugLogLineN(logServer, "Server: OP_REJECT");
+			AddLogLineN(_("Server rejected last command"));
+			break;
+		}
+		default:
+			AddDebugLogLineN(
+				logPacketErrors, CFormat("Unknown server packet with OPcode %x") % opcode);
 		}
 		return true;
-	} catch (const CInvalidPacket& e) {
-		AddLogLineN(CFormat( _("Bogus packet received from server: %s") ) % e.what());
-	} catch (const CEOFException& e) {
-		AddLogLineN(CFormat( _("Bogus packet received from server: %s") ) % e.what());
-	} catch (const wxString& error) {
-		AddLogLineN(CFormat( _("Unhandled error while processing packet from server: %s") ) % error);
+	} catch (const CInvalidPacket &e) {
+		AddLogLineN(CFormat(_("Bogus packet received from server: %s")) % e.what());
+	} catch (const CEOFException &e) {
+		AddLogLineN(CFormat(_("Bogus packet received from server: %s")) % e.what());
+	} catch (const wxString &error) {
+		AddLogLineN(CFormat(_("Unhandled error while processing packet from server: %s")) % error);
 	}
 
 	// Don't disconnect because of wrong sources.
-	if (opcode==OP_SEARCHRESULT || opcode==OP_FOUNDSOURCES) {
+	if (opcode == OP_SEARCHRESULT || opcode == OP_FOUNDSOURCES) {
 		return true;
 	}
 
@@ -576,11 +612,11 @@
 	return false;
 }
 
-void CServerSocket::ConnectToServer(CServer* server, bool bNoCrypt)
+void CServerSocket::ConnectToServer(CServer *server, bool bNoCrypt)
 {
 	AddDebugLogLineN(logServer, "Trying to connect");
 
-	if (cur_server){
+	if (cur_server) {
 		wxFAIL;
 		delete cur_server;
 		cur_server = NULL;
@@ -598,40 +634,47 @@
 	if (cur_server->HasDynIP() || !cur_server->GetIP()) {
 		m_IsSolving = true;
 		// Send it to solving thread.
-		CAsyncDNS* dns = new CAsyncDNS(server->GetAddress(), DNS_SERVER_CONNECT, theApp, this);
+		CAsyncDNS *dns = new CAsyncDNS(server->GetAddress(), DNS_SERVER_CONNECT, theApp, this);
 
-		if ( dns->Create() == wxTHREAD_NO_ERROR ) {
-			if ( dns->Run() != wxTHREAD_NO_ERROR ) {
+		if (dns->Create() == wxTHREAD_NO_ERROR) {
+			if (dns->Run() != wxTHREAD_NO_ERROR) {
 				dns->Delete();
-				AddLogLineN(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();
-			AddLogLineN(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
 		OnHostnameResolved(cur_server->GetIP());
 	}
-
 }
 
 void CServerSocket::OnError(int DEBUG_ONLY(nErrorCode))
 {
-	AddDebugLogLineN(logServer, CFormat("Error in serversocket: %s(%s:%i): %u")
-		% cur_server->GetListName() % cur_server->GetFullIP() % cur_server->GetPort() % nErrorCode);
+	AddDebugLogLineN(logServer,
+		CFormat("Error in serversocket: %s(%s:%i): %u") % cur_server->GetListName() %
+			cur_server->GetFullIP() % cur_server->GetPort() % nErrorCode);
 	SetConnectionState(CS_DISCONNECTED);
 }
 
-
-bool CServerSocket::PacketReceived(CPacket* packet)
+bool CServerSocket::PacketReceived(CPacket *packet)
 {
-	AddDebugLogLineN(logServer, CFormat("Server: Packet Received: Prot %x, Opcode %x, Length %u") % packet->GetProtocol() % packet->GetOpCode() % packet->GetPacketSize());
+	AddDebugLogLineN(logServer,
+		CFormat("Server: Packet Received: Prot %x, Opcode %x, Length %u") % packet->GetProtocol() %
+			packet->GetOpCode() % packet->GetPacketSize());
 
 	if (packet->GetProtocol() == OP_PACKEDPROT) {
-		if (!packet->UnPackPacket(250000)){
-			AddDebugLogLineN(logZLib, CFormat("Failed to decompress server TCP packet: protocol=0x%02x  opcode=0x%02x  size=%u")
-				% packet->GetProtocol() % packet->GetOpCode() % packet->GetPacketSize());
+		if (!packet->UnPackPacket(250000)) {
+			AddDebugLogLineN(logZLib,
+				CFormat("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;
 		}
@@ -642,23 +685,29 @@
 	if (packet->GetProtocol() == OP_EDONKEYPROT) {
 		ProcessPacket(packet->GetDataBuffer(), packet->GetPacketSize(), packet->GetOpCode());
 	} else {
-		AddDebugLogLineN(logServer, CFormat("Received server TCP packet with unknown protocol: protocol=0x%02x  opcode=0x%02x  size=%u")
-			% packet->GetProtocol() % packet->GetOpCode() % packet->GetPacketSize());
+		AddDebugLogLineN(logServer,
+			CFormat("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());
 	}
 
 	return true;
 }
 
-
 void CServerSocket::OnClose(int WXUNUSED(nErrorCode))
 {
 	CEMSocket::OnClose(0);
 
 	switch (connectionstate) {
-		case CS_WAITFORLOGIN:	SetConnectionState(CS_SERVERFULL);		break;
-		case CS_CONNECTED:	SetConnectionState(CS_DISCONNECTED);	break;
-		default:				SetConnectionState(CS_NOTCONNECTED);
+	case CS_WAITFORLOGIN:
+		SetConnectionState(CS_SERVERFULL);
+		break;
+	case CS_CONNECTED:
+		SetConnectionState(CS_DISCONNECTED);
+		break;
+	default:
+		SetConnectionState(CS_NOTCONNECTED);
 	}
 
 	serverconnect->DestroySocket(this);
@@ -676,28 +725,41 @@
 	}
 }
 
-
-void CServerSocket::SendPacket(CPacket* packet, bool delpacket, bool controlpacket, uint32 actualPayloadSize)
+void CServerSocket::SendPacket(CPacket *packet, bool delpacket, bool controlpacket, uint32 actualPayloadSize)
 {
 	m_dwLastTransmission = GetTickCount64();
 	CEMSocket::SendPacket(packet, delpacket, controlpacket, actualPayloadSize);
 }
 
+void CServerSocket::OnHostnameResolved(uint32 ip)
+{
 
-void CServerSocket::OnHostnameResolved(uint32 ip) {
-
+	// ConnectToServer() calls straight in here with the address it already had whenever no
+	// lookup was needed, which is most of server.met, and that path succeeds just as well with
+	// the link down. Only a resolver that actually answered is evidence about DNS, so record
+	// what got us here.
+	const bool didLookup = m_IsSolving;
 	m_IsSolving = false;
 	if (ip) {
+		if (didLookup) {
+			// DNS answered, so a *different* server failing to resolve during this
+			// sweep is about that server rather than about our link -- see
+			// CServerConnect::HostnameResolvedThisSweep().
+			serverconnect->NoteHostnameResolved();
+		}
+
 		if (theApp->ipfilter->IsFiltered(ip, true)) {
-			AddLogLineC(CFormat( _("Server IP %s (%s) is filtered.  Not connecting.") )
-				% Uint32toStringIP(ip) % cur_server->GetAddress() );
+			AddLogLineC(CFormat(_("Server IP %s (%s) is filtered.  Not connecting.")) %
+				    Uint32toStringIP(ip) % cur_server->GetAddress());
 			OnConnect(boost::system::errc::invalid_argument);
 		} else {
 			amuleIPV4Address addr;
 			addr.Hostname(ip);
 			uint16 nPort = 0;
 			wxString useObfuscation;
-			if ( !m_bNoCrypt && thePrefs::IsServerCryptLayerTCPRequested() && cur_server->GetObfuscationPortTCP() != 0 && cur_server->SupportsObfuscationTCP()){
+			if (!m_bNoCrypt && thePrefs::IsServerCryptLayerTCPRequested() &&
+				cur_server->GetObfuscationPortTCP() != 0 &&
+				cur_server->SupportsObfuscationTCP()) {
 				nPort = cur_server->GetObfuscationPortTCP();
 				useObfuscation = _("using protocol obfuscation.");
 				SetConnectionEncryption(true, NULL, true);
@@ -708,24 +770,35 @@
 
 			addr.Service(nPort);
 
-			AddLogLineN(CFormat( _("Connecting to %s (%s - %s:%i) %s") )
-				% cur_server->GetListName()
-				% cur_server->GetAddress()
-				% cur_server->GetFullIP()
-				% nPort
-				% useObfuscation
-			);
+			AddLogLineN(CFormat(_("Connecting to %s (%s - %s:%i) %s")) %
+				    cur_server->GetListName() % cur_server->GetAddress() %
+				    cur_server->GetFullIP() % nPort % useObfuscation);
 
-			AddDebugLogLineN(logServer, CFormat("Server %s(%s) Port %i")
-				% cur_server->GetAddress() % Uint32toStringIP(ip) % cur_server->GetConnPort());
+			AddDebugLogLineN(logServer,
+				CFormat("Server %s(%s) Port %i") % cur_server->GetAddress() %
+					Uint32toStringIP(ip) % cur_server->GetConnPort());
 			Connect(addr, false);
 		}
 	} else {
-		AddLogLineC(CFormat( _("Could not solve dns for server %s: Unable to connect!") )
-			% cur_server->GetAddress() );
-		OnConnect(boost::system::errc::host_unreachable);
+		AddLogLineC(CFormat(_("Could not solve dns for server %s: Unable to connect!")) %
+			    cur_server->GetAddress());
+
+		// Decided here rather than by handing OnConnect() a synthesised host_unreachable,
+		// which is what this used to do: a name that does not resolve is not a socket
+		// error, and the two want opposite answers.
+		//
+		// An unresolvable hostname is the commonest way an eD2k server actually dies, so it
+		// is the main thing "remove dead servers" prunes on. But with the link down nothing
+		// resolves, and counting that against every server in turn is what emptied the list
+		// (issue #887). Blame it only once DNS has answered for something else this sweep.
+		//
+		// The first server in a sweep therefore cannot be blamed; a genuinely dead entry is
+		// caught on a later one. Erring that way costs a delay, while erring the other way
+		// costs the server list.
+		m_bIsDeleting = true;
+		SetConnectionState(serverconnect->HostnameResolvedThisSweep() ? CS_SERVERDEAD : CS_ERROR);
+		serverconnect->DestroySocket(this);
 	}
-
 }
 uint32 CServerSocket::GetServerIP() const
 {

amule-3.0.1.tar.gz/src/ServerSocket.h -> amule-3.1.0.tar.gz/src/ServerSocket.h Changed

@@ -23,68 +23,66 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-//
 // Client to Server communication
-//
 
 #ifndef SERVERSOCKET_H
 #define SERVERSOCKET_H
 
-#include "EMSocket.h"		// Needed for CEMSocket
+#include "EMSocket.h" // Needed for CEMSocket
 #include "ServerConnect.h"
 
-//------------------------------------------------------------------------------
 // CServerSocket
-//------------------------------------------------------------------------------
 
 class CServer;
 
 class CServerSocket : public CEMSocket
 {
 	friend class CServerConnect;
-public:
 
-	CServerSocket(CServerConnect* in_serverconnect, const CProxyData *ProxyData = NULL);
+public:
+	CServerSocket(CServerConnect *in_serverconnect, const CProxyData *ProxyData = NULL);
 	virtual ~CServerSocket();
 
-	void	ConnectToServer(CServer* server, bool bNoCrypt = false);
-	sint8	GetConnectionState()	const	{ return connectionstate; }
-	uint64  GetLastTransmission() const	{ return m_dwLastTransmission; }
+	void ConnectToServer(CServer *server, bool bNoCrypt = false);
+	sint8 GetConnectionState() const { return connectionstate; }
+	uint64 GetLastTransmission() const { return m_dwLastTransmission; }
 	wxString info;
 
-	void	OnClose(int nErrorCode) override;
-	void	OnConnect(int nErrorCode) override;
-	void	OnReceive(int nErrorCode) override;
-	void	OnError(int nErrorCode) override;
-	bool	PacketReceived(CPacket* packet) override;
+	void OnClose(int nErrorCode) override;
+	void OnConnect(int nErrorCode) override;
+	void OnReceive(int nErrorCode) override;
+	void OnError(int nErrorCode) override;
+	bool PacketReceived(CPacket *packet) override;
 
-	// Server control traffic is not subject to the global download
-	// bandwidth budget — search/source/MOTD packets are tiny and
-	// latency-sensitive.
-	bool	IsDownloadThrottled() const override { return false; }
-	void	SendPacket(CPacket* packet, bool delpacket = true, bool controlpacket = true, uint32 actualPayloadSize = 0) override;
-	bool	IsSolving() const { return m_IsSolving;};
-	void	OnHostnameResolved(uint32 ip);
+	// Server control traffic is not subject to the global download bandwidth budget -- search,
+	// source and MOTD packets are tiny and latency-sensitive.
+	bool IsDownloadThrottled() const override { return false; }
+	void SendPacket(CPacket *packet,
+		bool delpacket = true,
+		bool controlpacket = true,
+		uint32 actualPayloadSize = 0) override;
+	bool IsSolving() const { return m_IsSolving; };
+	void OnHostnameResolved(uint32 ip);
 	CServer *GetServerConnected() const { return serverconnect->GetCurrentServer(); }
 
 	uint32 GetServerIP() const;
 
 private:
-	bool	ProcessPacket(const uint8_t* packet, uint32 size, int8 opcode);
-	void	SetConnectionState(sint8 newstate);
-	CServerConnect*	serverconnect;
-	sint8	connectionstate;
-	CServer*	cur_server;
+	bool ProcessPacket(const uint8_t *packet, uint32 size, int8 opcode);
+	void SetConnectionState(sint8 newstate);
+	CServerConnect *serverconnect;
+	sint8 connectionstate;
+	CServer *cur_server;
 	bool m_bNoCrypt;
-	bool	headercomplete;
-	int32	sizetoget;
-	int32	sizereceived;
-	char*	rbuffer;
-	bool	m_bIsDeleting;	// true: socket is already in deletion phase, don't destroy it in ::StopConnectionTry
-	uint64	m_dwLastTransmission;
+	bool headercomplete;
+	int32 sizetoget;
+	int32 sizereceived;
+	char *rbuffer;
+	bool m_bIsDeleting; // true: socket is already in deletion phase, don't destroy it in
+			    // ::StopConnectionTry
+	uint64 m_dwLastTransmission;
 
 	bool m_IsSolving;
-
 };
 
 #endif // SERVERSOCKET_H

amule-3.0.1.tar.gz/src/ServerUDPSocket.cpp -> amule-3.1.0.tar.gz/src/ServerUDPSocket.cpp Changed

@@ -23,326 +23,343 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "ServerUDPSocket.h"	// Interface declarations.
+#include "ServerUDPSocket.h" // Interface declarations.
 
 #include <protocol/Protocols.h>
 #include <common/EventIDs.h>
 #include <tags/ServerTags.h>
 
-#include "Packet.h"		// Needed for CPacket
-#include "PartFile.h"		// Needed for CPartFile
-#include "SearchList.h"		// Needed for CSearchList
-#include "MemFile.h"		// Needed for CMemFile
-#include "DownloadQueue.h"	// Needed for CDownloadQueue
-#include "ServerList.h"		// Needed for CServerList
-#include "Server.h"		// Needed for CServer
-#include "amule.h"			// Needed for theApp
-#include "AsyncDNS.h" // Needed for CAsyncDNS
-#include "Statistics.h"		// Needed for theStats
+#include "Packet.h"        // Needed for CPacket
+#include "PartFile.h"      // Needed for CPartFile
+#include "SearchList.h"    // Needed for CSearchList
+#include "MemFile.h"       // Needed for CMemFile
+#include "DownloadQueue.h" // Needed for CDownloadQueue
+#include "ServerList.h"    // Needed for CServerList
+#include "Server.h"        // Needed for CServer
+#include "amule.h"         // Needed for theApp
+#include "AsyncDNS.h"      // Needed for CAsyncDNS
+#include "Statistics.h"    // Needed for theStats
 #include "Logger.h"
 #include <common/Format.h>
-#include "updownclient.h"	// Needed for SF_REMOTE_SERVER
-#include "GuiEvents.h"		// Needed for Notify_*
+#include "updownclient.h" // Needed for SF_REMOTE_SERVER
+#include "GuiEvents.h"    // Needed for Notify_*
 #include "Preferences.h"
 #include "EncryptedDatagramSocket.h"
 #include "RandomFunctions.h"
 #include "ServerConnect.h"
 
-//
 // (TCP+3) UDP socket
-//
 
 CServerUDPSocket::CServerUDPSocket(amuleIPV4Address &address, const CProxyData *ProxyData)
-	: CMuleUDPSocket("Server UDP-Socket", ID_SERVERUDPSOCKET_EVENT, address, ProxyData)
+: CMuleUDPSocket("Server UDP-Socket", ID_SERVERUDPSOCKET_EVENT, address, ProxyData)
 {
 	Open();
 }
 
-
-void CServerUDPSocket::OnPacketReceived(uint32 serverip, uint16 serverport, uint8_t* buffer, size_t length)
+void CServerUDPSocket::OnPacketReceived(
+	const CNetworkAddress &address, uint16 serverport, uint8_t *buffer, size_t length)
 {
 	wxCHECK_RET(length >= 2, "Invalid packet.");
+	uint32 serverip;
+	if (!GetIPv4PacketAddress(address, serverip, logMuleUDP, "server")) {
+		return;
+	}
 
 	size_t nPayLoadLen = length;
-	uint8_t* pBuffer = buffer;
-	CServer* pServer = theApp->serverlist->GetServerByIPUDP(serverip, serverport, true);
+	uint8_t *pBuffer = buffer;
+	CServer *pServer = theApp->serverlist->GetServerByIPUDP(serverip, serverport, true);
 	if (pServer && thePrefs::IsServerCryptLayerUDPEnabled() &&
-		((pServer->GetServerKeyUDP() != 0 && pServer->SupportsObfuscationUDP()) || (pServer->GetCryptPingReplyPending() && pServer->GetChallenge() != 0)))
-	{
+		((pServer->GetServerKeyUDP() != 0 && pServer->SupportsObfuscationUDP()) ||
+			(pServer->GetCryptPingReplyPending() && pServer->GetChallenge() != 0))) {
 		// eMule TODO
 		uint32 dwKey = 0;
-		if (pServer->GetCryptPingReplyPending() && pServer->GetChallenge() != 0 /* && pServer->GetPort() == ntohs(sockAddr.sin_port) - 12 */) {
+		if (pServer->GetCryptPingReplyPending() &&
+			pServer->GetChallenge() !=
+				0 /* && pServer->GetPort() == ntohs(sockAddr.sin_port) - 12 */) {
 			dwKey = pServer->GetChallenge();
 		} else {
 			dwKey = pServer->GetServerKeyUDP();
 		}
 
-		wxASSERT( dwKey != 0 );
-		nPayLoadLen = CEncryptedDatagramSocket::DecryptReceivedServer(buffer, length, &pBuffer, dwKey, serverip);
+		wxASSERT(dwKey != 0);
+		nPayLoadLen = CEncryptedDatagramSocket::DecryptReceivedServer(
+			buffer, length, &pBuffer, dwKey, serverip);
 #ifdef __DEBUG__
 		if (nPayLoadLen == length) {
-			AddDebugLogLineN(logServerUDP, CFormat("Expected encrypted packet, but received unencrytped from server %s, UDPKey %u, Challenge: %u") % pServer->GetListName() % pServer->GetServerKeyUDP() % pServer->GetChallenge());
+			AddDebugLogLineN(logServerUDP,
+				CFormat("Expected encrypted packet, but received unencrytped from server %s, "
+					"UDPKey %u, Challenge: %u") %
+					pServer->GetListName() % pServer->GetServerKeyUDP() %
+					pServer->GetChallenge());
 		} else {
-			AddDebugLogLineN(logServerUDP, CFormat("Received encrypted packet from server %s, UDPKey %u, Challenge: %u") % pServer->GetListName() % pServer->GetServerKeyUDP() % pServer->GetChallenge());
+			AddDebugLogLineN(logServerUDP,
+				CFormat("Received encrypted packet from server %s, UDPKey %u, Challenge: "
+					"%u") %
+					pServer->GetListName() % pServer->GetServerKeyUDP() %
+					pServer->GetChallenge());
 		}
 #endif
 	}
 
 	uint8 protocol = pBuffer0;
-	uint8 opcode  = pBuffer1;
+	uint8 opcode = pBuffer1;
 
 	if (protocol == OP_EDONKEYPROT) {
 		CMemFile data(pBuffer + 2, nPayLoadLen - 2);
 		ProcessPacket(data, opcode, serverip, serverport);
 	} else {
-		AddDebugLogLineN(logServerUDP, CFormat("Received invalid packet, protocol (0x%x) and opcode (0x%x)") % protocol % opcode);
+		AddDebugLogLineN(logServerUDP,
+			CFormat("Received invalid packet, protocol (0x%x) and opcode (0x%x)") % protocol %
+				opcode);
 
 		theStats::AddDownOverheadOther(length);
 	}
 }
 
-
-void CServerUDPSocket::ProcessPacket(CMemFile& packet, uint8 opcode, uint32 ip, uint16 port)
+void CServerUDPSocket::ProcessPacket(CMemFile &packet, uint8 opcode, uint32 ip, uint16 port)
 {
-	CServer* update = theApp->serverlist->GetServerByIPUDP(ip, port, true);
+	CServer *update = theApp->serverlist->GetServerByIPUDP(ip, port, true);
 	unsigned size = packet.GetLength();
 
 	theStats::AddDownOverheadOther(size);
-	AddDebugLogLineN( logServerUDP,
-					CFormat( "Received UDP server packet from %s:%u, opcode (0x%x)") %
-							Uint32toStringIP(ip) % port % opcode );
+	AddDebugLogLineN(logServerUDP,
+		CFormat("Received UDP server packet from %s:%u, opcode (0x%x)") % Uint32toStringIP(ip) %
+			port % opcode);
 
 	try {
-		// Imported: OP_GLOBSEARCHRES, OP_GLOBFOUNDSOURCES & OP_GLOBSERVSTATRES
-		// This makes Server UDP Flags to be set correctly so we use less bandwidth on asking servers for sources
-		// Also we process Search results and Found sources correctly now on 16.40 behaviour.
-		switch(opcode){
-			case OP_GLOBSEARCHRES: {
+		// Imported: OP_GLOBSEARCHRES, OP_GLOBFOUNDSOURCES and OP_GLOBSERVSTATRES. This sets
+		// the server UDP flags correctly, so less bandwidth is spent asking servers for
+		// sources, and search results and found sources are processed as 16.40 does.
+		switch (opcode) {
+		case OP_GLOBSEARCHRES: {
+
+			do {
+				theApp->searchlist->ProcessUDPSearchAnswer(packet, true, ip, port - 4);
+
+				if (packet.GetPosition() + 2 < size) {
+					// An additional packet?
+					uint8 protocol = packet.ReadUInt8();
+					uint8 new_opcode = packet.ReadUInt8();
+
+					if (protocol != OP_EDONKEYPROT || new_opcode != OP_GLOBSEARCHRES) {
+						AddDebugLogLineC(logServerUDP,
+							"Server search reply got additional bogus bytes.");
+						break;
+					} else {
+						AddDebugLogLineN(logServerUDP,
+							"Got server search reply with additional packet.");
+					}
+				}
 
-				// process all search result packets
+			} while (packet.GetPosition() + 2 < size);
 
-				do{
-					theApp->searchlist->ProcessUDPSearchAnswer(packet, true, ip, port - 4);
+			break;
+		}
+		case OP_GLOBFOUNDSOURCES: {
+			// process all source packets
+			do {
+				CMD4Hash fileid = packet.ReadHash();
+				if (CPartFile *file = theApp->downloadqueue->GetFileByID(fileid)) {
+					file->AddSources(packet, ip, port - 4, SF_REMOTE_SERVER, false);
+				} else {
+					AddDebugLogLineC(logServerUDP, "Sources received for unknown file");
+					// skip sources for that file
+					uint8 count = packet.ReadUInt8();
+					packet.Seek(count * (4 + 2), wxFromCurrent);
+				}
 
-					if (packet.GetPosition() + 2 < size) {
-						// An additional packet?
-						uint8 protocol = packet.ReadUInt8();
-						uint8 new_opcode = packet.ReadUInt8();
+				if (packet.GetPosition() + 2 < size) {
+					// An additional packet?
+					uint8 protocol = packet.ReadUInt8();
+					uint8 new_opcode = packet.ReadUInt8();
 
-						if (protocol != OP_EDONKEYPROT || new_opcode != OP_GLOBSEARCHRES) {
-							AddDebugLogLineC( logServerUDP,
-								"Server search reply got additional bogus bytes." );
-							break;
-						} else {
-							AddDebugLogLineN( logServerUDP,
-								"Got server search reply with additional packet." );
-						}
+					if (protocol != OP_EDONKEYPROT || new_opcode != OP_GLOBFOUNDSOURCES) {
+						AddDebugLogLineC(logServerUDP,
+							"Server sources reply got additional bogus bytes.");
+						break;
 					}
+				}
+			} while ((packet.GetPosition() + 2) < size);
+			break;
+		}
 
-				} while (packet.GetPosition()+2 < size);
-
-				break;
+		case OP_GLOBSERVSTATRES: {
+			if (!update) {
+				throw wxString(
+					CFormat("Unknown server on a OP_GLOBSERVSTATRES packet (%s:%d)") %
+					Uint32toStringIP(ip) % (port - 4));
 			}
-			case OP_GLOBFOUNDSOURCES:{
-				// process all source packets
-				do {
-					CMD4Hash fileid = packet.ReadHash();
-					if (CPartFile* file = theApp->downloadqueue->GetFileByID(fileid)) {
-						file->AddSources(packet, ip, port-4, SF_REMOTE_SERVER, false);
-					} else {
-						AddDebugLogLineC( logServerUDP, "Sources received for unknown file" );
-						// skip sources for that file
-						uint8 count = packet.ReadUInt8();
-						packet.Seek(count*(4+2), wxFromCurrent);
-					}
-
-					if (packet.GetPosition()+2 < size) {
-						// An additional packet?
-						uint8 protocol = packet.ReadUInt8();
-						uint8 new_opcode = packet.ReadUInt8();
-
-						if (protocol != OP_EDONKEYPROT || new_opcode != OP_GLOBFOUNDSOURCES) {
-							AddDebugLogLineC( logServerUDP,
-								"Server sources reply got additional bogus bytes." );
-							break;
-						}
-					}
-				} while ((packet.GetPosition() + 2) < size);
-				break;
+			if (size < 12) {
+				throw wxString(CFormat("Invalid OP_GLOBSERVSTATRES packet (size=%u)") % size);
+			}
+			uint32 challenge = packet.ReadUInt32();
+			if (challenge != update->GetChallenge()) {
+				throw wxString(CFormat("Invalid challenge on OP_GLOBSERVSTATRES packet (0x%x "
+						       "!= 0x%x)") %
+					       challenge % update->GetChallenge());
 			}
 
-			case OP_GLOBSERVSTATRES:{
-				// Reviewed with 0.47c
-				if (!update) {
-					throw wxString(CFormat("Unknown server on a OP_GLOBSERVSTATRES packet (%s:%d)") % Uint32toStringIP(ip) % (port-4));
-				}
-				if (size < 12) {
-					throw wxString(CFormat("Invalid OP_GLOBSERVSTATRES packet (size=%u)") % size);
-				}
-				uint32 challenge = packet.ReadUInt32();
-				if (challenge != update->GetChallenge()) {
-					throw wxString(CFormat("Invalid challenge on OP_GLOBSERVSTATRES packet (0x%x != 0x%x)") % challenge % update->GetChallenge());
-				}
-
-				update->SetChallenge(0);
-				update->SetCryptPingReplyPending(false);
-				time_t currentTime = time(NULL);
-				update->SetLastPingedTime(currentTime - (rand() % HR2S(1))); // if we used Obfuscated ping, we still need to reset the time properly
-
-				uint32 cur_user = packet.ReadUInt32();
-				uint32 cur_files = packet.ReadUInt32();
-				uint32 cur_maxusers = 0;
-				uint32 cur_softfiles = 0;
-				uint32 cur_hardfiles = 0;
-				uint32 uUDPFlags = 0;
-				uint32 uLowIDUsers = 0;
-				uint32 dwServerUDPKey = 0;
-				uint16 nTCPObfuscationPort = 0;
-				uint16 nUDPObfuscationPort = 0;
-				if( size >= 16 ){
-					cur_maxusers = packet.ReadUInt32();
-					if( size >= 24 ){
-						cur_softfiles = packet.ReadUInt32();
-						cur_hardfiles = packet.ReadUInt32();
-						if( size >= 28 ){
-							uUDPFlags = packet.ReadUInt32();
-							if( size >= 32 ){
-								uLowIDUsers = packet.ReadUInt32();
-								if (size >= 40) {
-									nUDPObfuscationPort = packet.ReadUInt16();
-									nTCPObfuscationPort = packet.ReadUInt16();
-									dwServerUDPKey = packet.ReadUInt32();
-								}
+			update->SetChallenge(0);
+			update->SetCryptPingReplyPending(false);
+			time_t currentTime = time(NULL);
+			update->SetLastPingedTime(
+				currentTime - (rand() % HR2S(1))); // if we used Obfuscated ping, we still
+								   // need to reset the time properly
+
+			uint32 cur_user = packet.ReadUInt32();
+			uint32 cur_files = packet.ReadUInt32();
+			uint32 cur_maxusers = 0;
+			uint32 cur_softfiles = 0;
+			uint32 cur_hardfiles = 0;
+			uint32 uUDPFlags = 0;
+			uint32 uLowIDUsers = 0;
+			uint32 dwServerUDPKey = 0;
+			uint16 nTCPObfuscationPort = 0;
+			uint16 nUDPObfuscationPort = 0;
+			if (size >= 16) {
+				cur_maxusers = packet.ReadUInt32();
+				if (size >= 24) {
+					cur_softfiles = packet.ReadUInt32();
+					cur_hardfiles = packet.ReadUInt32();
+					if (size >= 28) {
+						uUDPFlags = packet.ReadUInt32();
+						if (size >= 32) {
+							uLowIDUsers = packet.ReadUInt32();
+							if (size >= 40) {
+								nUDPObfuscationPort = packet.ReadUInt16();
+								nTCPObfuscationPort = packet.ReadUInt16();
+								dwServerUDPKey = packet.ReadUInt32();
 							}
 						}
 					}
 				}
+			}
 
-				//SetPing takes uint32 as parameter, enough for the ping
-				update->SetPing( ::GetTickCount64() - update->GetLastPinged() );
-				update->SetUserCount( cur_user );
-				update->SetFileCount( cur_files );
-				update->SetMaxUsers( cur_maxusers );
-				update->SetSoftFiles( cur_softfiles );
-				update->SetHardFiles( cur_hardfiles );
-				update->SetUDPFlags( uUDPFlags );
-				update->SetLowIDUsers( uLowIDUsers );
-				update->SetServerKeyUDP(dwServerUDPKey);
-				update->SetObfuscationPortTCP(nTCPObfuscationPort);
-				update->SetObfuscationPortUDP(nUDPObfuscationPort);
-
-				Notify_ServerRefresh( update );
-
-				update->SetLastDescPingedCount(false);
-				if (update->GetLastDescPingedCount() < 2) {
-					// eserver 16.45+ supports a new OP_SERVER_DESC_RES answer, if the OP_SERVER_DESC_REQ contains a uint32
-					// challenge, the server returns additional info with OP_SERVER_DESC_RES. To properly distinguish the
-					// old and new OP_SERVER_DESC_RES answer, the challenge has to be selected carefully. The first 2 bytes
-					// of the challenge (in network byte order) MUST NOT be a valid string-len-int16!
-					CPacket* sendpacket = new CPacket(OP_SERVER_DESC_REQ, 4, OP_EDONKEYPROT);
-					uint32 uDescReqChallenge = ((uint32)GetRandomUint16() << 16) + INV_SERV_DESC_LEN; // 0xF0FF = an 'invalid' string length.
-					update->SetDescReqChallenge(uDescReqChallenge);
-					sendpacket->CopyUInt32ToDataBuffer(uDescReqChallenge);
-					//theStats.AddUpDataOverheadServer(packet->size);
-					AddDebugLogLineN(logServerUDP, CFormat(">>> 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);
-				}
+			// SetPing takes uint32 as parameter, enough for the ping
+			update->SetPing(::GetTickCount64() - update->GetLastPinged());
+			update->SetUserCount(cur_user);
+			update->SetFileCount(cur_files);
+			update->SetMaxUsers(cur_maxusers);
+			update->SetSoftFiles(cur_softfiles);
+			update->SetHardFiles(cur_hardfiles);
+			update->SetUDPFlags(uUDPFlags);
+			update->SetLowIDUsers(uLowIDUsers);
+			update->SetServerKeyUDP(dwServerUDPKey);
+			update->SetObfuscationPortTCP(nTCPObfuscationPort);
+			update->SetObfuscationPortUDP(nUDPObfuscationPort);
+
+			Notify_ServerRefresh(update);
+
+			update->SetLastDescPingedCount(false);
+			if (update->GetLastDescPingedCount() < 2) {
+				// eserver 16.45+ answers OP_SERVER_DESC_REQ with extra info when
+				// the request carries a uint32 challenge. To tell the old and new
+				// OP_SERVER_DESC_RES apart, the challenge has to be chosen
+				// carefully: its first 2 bytes, in network byte order, MUST NOT be
+				// a valid string-len-int16.
+				CPacket *sendpacket = new CPacket(OP_SERVER_DESC_REQ, 4, OP_EDONKEYPROT);
+				uint32 uDescReqChallenge =
+					((uint32)GetRandomUint16() << 16) +
+					INV_SERV_DESC_LEN; // 0xF0FF = an 'invalid' string length.
+				update->SetDescReqChallenge(uDescReqChallenge);
+				sendpacket->CopyUInt32ToDataBuffer(uDescReqChallenge);
+				AddDebugLogLineN(logServerUDP,
+					CFormat(">>> 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);
+			}
 
-				theApp->ShowUserCount();
-				break;
+			theApp->ShowUserCount();
+			break;
+		}
+		case OP_SERVER_DESC_RES: {
+			if (!update) {
+				throw(wxString("Received OP_SERVER_DESC_RES from an unknown server"));
 			}
-			case OP_SERVER_DESC_RES:{
-				// Reviewed with 0.47c
-				if (!update) {
-					throw(wxString("Received OP_SERVER_DESC_RES from an unknown server"));
-				}
 
-				// old packet: <name_len 2><name name_len><desc_len 2 desc_en>
-				// new packet: <challenge 4><taglist>
-				//
-				// NOTE: To properly distinguish between the two packets which are both using the same opcode...
-				// the first two bytes of <challenge> (in network byte order) have to be an invalid <name_len> at least.
-
-				uint16 Len = packet.ReadUInt16();
-
-				packet.Seek(-2, wxFromCurrent); // Step back
-
-				if (size >= 8 && Len == INV_SERV_DESC_LEN) {
-
-					if (update->GetDescReqChallenge() != 0 && packet.ReadUInt32() == update->GetDescReqChallenge()) {
-
-						update->SetDescReqChallenge(0);
-
-						uint32 uTags = packet.ReadUInt32();
-						for (uint32 i = 0; i < uTags; ++i) {
-							// Force Unicode=true rather than relying on the
-							// server's SRV_TCPFLG_UNICODE bit: many real-world
-							// servers ship UTF-8 strings (emoji in names,
-							// non-ASCII descriptions) without advertising the
-							// capability flag, and parsing as non-Unicode
-							// mangles them. The OP_SERVERIDENT handler in
-							// ServerSocket.cpp does the same, and the .met
-							// load-time parse uses hardcoded Unicode=true.
-							// (#831)
-							CTag tag(packet, true);
-							switch (tag.GetNameID()) {
-								case ST_SERVERNAME:
-									update->SetListName(tag.GetStr());
-									break;
-								case ST_DESCRIPTION:
-									update->SetDescription(tag.GetStr());
-									break;
-								case ST_DYNIP:
-									update->SetDynIP(tag.GetStr());
-									break;
-								case ST_VERSION:
-									if (tag.IsStr()) {
-										update->SetVersion(tag.GetStr());
-									} else if (tag.IsInt()) {
-										update->SetVersion(CFormat("%u.%u") % (tag.GetInt() >> 16) % (tag.GetInt() & 0xFFFF));
-									}
-									break;
-								case ST_AUXPORTSLIST:
-									update->SetAuxPortsList(tag.GetStr());
-									break;
-								default:
-									// Unknown tag
-									;
+			// old packet: <name_len 2><name name_len><desc_len 2 desc_en>; new packet:
+			// <challenge 4><taglist>. Both use the same opcode, so to tell them apart
+			// the first two bytes of <challenge>, in network byte order, have to be an
+			// invalid <name_len> at least.
+
+			uint16 Len = packet.ReadUInt16();
+
+			packet.Seek(-2, wxFromCurrent); // Step back
+
+			if (size >= 8 && Len == INV_SERV_DESC_LEN) {
+
+				if (update->GetDescReqChallenge() != 0 &&
+					packet.ReadUInt32() == update->GetDescReqChallenge()) {
+
+					update->SetDescReqChallenge(0);
+
+					uint32 uTags = packet.ReadUInt32();
+					for (uint32 i = 0; i < uTags; ++i) {
+						// Force Unicode=true rather than relying on the
+						// server's SRV_TCPFLG_UNICODE bit: many real-world
+						// servers ship UTF-8 strings without advertising
+						// the capability, and parsing as non-Unicode
+						// mangles them. The OP_SERVERIDENT handler and the
+						// .met load-time parse do the same (#831).
+						CTag tag(packet, true);
+						switch (tag.GetNameID()) {
+						case ST_SERVERNAME:
+							update->SetListName(tag.GetStr());
+							break;
+						case ST_DESCRIPTION:
+							update->SetDescription(tag.GetStr());
+							break;
+						case ST_DYNIP:
+							update->SetDynIP(tag.GetStr());
+							break;
+						case ST_VERSION:
+							if (tag.IsStr()) {
+								update->SetVersion(tag.GetStr());
+							} else if (tag.IsInt()) {
+								update->SetVersion(CFormat("%u.%u") %
+										   (tag.GetInt() >> 16) %
+										   (tag.GetInt() & 0xFFFF));
 							}
+							break;
+						case ST_AUXPORTSLIST:
+							update->SetAuxPortsList(tag.GetStr());
+							break;
+						default:
+							// Unknown tag
+							;
 						}
-					} else {
-						// A server sent us a new server description packet (including a challenge) although we did not
-						// ask for it. This may happen, if there are multiple servers running on the same machine with
-						// multiple IPs. If such a server is asked for a description, the server will answer 2 times,
-						// but with the same IP.
-						// ignore this packet
-
 					}
 				} else {
-					update->SetDescription(packet.ReadString(update->GetUnicodeSupport()));
-					update->SetListName(packet.ReadString(update->GetUnicodeSupport()));
+					// A server sent a new-style description packet, with a
+					// challenge, although we did not ask for one. That happens
+					// when several servers run on one machine with multiple
+					// IPs: asked for a description, such a server answers twice
+					// from the same IP. Ignore this packet.
 				}
-				break;
+			} else {
+				update->SetDescription(packet.ReadString(update->GetUnicodeSupport()));
+				update->SetListName(packet.ReadString(update->GetUnicodeSupport()));
 			}
-			default:
-				AddDebugLogLineC(logServerUDP, CFormat("Unknown Server UDP opcode %x") % opcode);
+			break;
+		}
+		default:
+			AddDebugLogLineC(logServerUDP, CFormat("Unknown Server UDP opcode %x") % opcode);
 		}
-	} catch (const wxString& DEBUG_ONLY(error)) {
+	} catch (const wxString &DEBUG_ONLY(error)) {
 		AddDebugLogLineN(logServerUDP, "Error while processing incoming UDP Packet: " + error);
-	} catch (const CInvalidPacket& DEBUG_ONLY(error)) {
+	} catch (const CInvalidPacket &DEBUG_ONLY(error)) {
 		AddDebugLogLineN(logServerUDP, "Invalid UDP packet encountered: " + error.what());
-	} catch (const CEOFException& DEBUG_ONLY(e)) {
+	} catch (const CEOFException &DEBUG_ONLY(e)) {
 		AddDebugLogLineN(logServerUDP, "IO error while processing incoming UDP Packet: " + e.what());
 	}
 
 	if (update) {
 		update->ResetFailedCount();
-		Notify_ServerRefresh( update );
+		Notify_ServerRefresh(update);
 	}
-
 }
 
 void CServerUDPSocket::OnReceiveError(int errorCode, uint32 ip, uint16 port)
@@ -350,15 +367,16 @@
 	CMuleUDPSocket::OnReceiveError(errorCode, ip, port);
 
 	// If we are not currently pinging this server, increase the failure counter
-	CServer* pServer = theApp->serverlist->GetServerByIPUDP(ip, port, true);
-	if (pServer && !pServer->GetCryptPingReplyPending() && GetTickCount64() - pServer->GetLastPinged() >= SEC2MS(30)) {
+	CServer *pServer = theApp->serverlist->GetServerByIPUDP(ip, port, true);
+	if (pServer && !pServer->GetCryptPingReplyPending() &&
+		GetTickCount64() - pServer->GetLastPinged() >= SEC2MS(30)) {
 		pServer->AddFailedCount();
 		Notify_ServerRefresh(pServer);
 	}
-
 }
 
-void CServerUDPSocket::SendPacket(CPacket* packet, CServer* host, bool delPacket, bool rawpacket, uint16 port_offset)
+void CServerUDPSocket::SendPacket(
+	CPacket *packet, CServer *host, bool delPacket, bool rawpacket, uint16 port_offset)
 {
 	ServerUDPPacket item = { NULL, 0, 0, "" };
 
@@ -373,18 +391,24 @@
 	item.port = host->GetPort() + port_offset;
 
 	// We might need to encrypt the packet for this server.
-	if (!rawpacket && thePrefs::IsServerCryptLayerUDPEnabled() && host->GetServerKeyUDP() != 0 && host->SupportsObfuscationUDP()) {
+	if (!rawpacket && thePrefs::IsServerCryptLayerUDPEnabled() && host->GetServerKeyUDP() != 0 &&
+		host->SupportsObfuscationUDP()) {
 		uint16 uRawPacketSize = packet->GetPacketSize() + 2;
-		uint8_t* pRawPacket = new uint8_tuRawPacketSize;
+		uint8_t *pRawPacket = new uint8_tuRawPacketSize;
 		memcpy(pRawPacket, packet->GetUDPHeader(), 2);
 		memcpy(pRawPacket + 2, packet->GetDataBuffer(), packet->GetPacketSize());
 
-		uRawPacketSize = CEncryptedDatagramSocket::EncryptSendServer(&pRawPacket, uRawPacketSize, host->GetServerKeyUDP());
-		AddDebugLogLineN(logServerUDP, CFormat("Sending encrypted packet to server %s, UDPKey %u, port %u, original OPCode 0x%02x") % host->GetListName() % host->GetServerKeyUDP() % host->GetObfuscationPortUDP() % packet->GetOpCode());
+		uRawPacketSize = CEncryptedDatagramSocket::EncryptSendServer(
+			&pRawPacket, uRawPacketSize, host->GetServerKeyUDP());
+		AddDebugLogLineN(logServerUDP,
+			CFormat("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);
-		item.packet  = new CPacket(encryptedpacket, pRawPacket0, pRawPacket1);
+		item.packet = new CPacket(encryptedpacket, pRawPacket0, pRawPacket1);
 		delete pRawPacket;
 
 		if (delPacket) {
@@ -392,7 +416,10 @@
 		}
 
 	} else {
-		AddDebugLogLineN(logServerUDP, CFormat("Sending regular packet to server %s, port %u (raw = %s), OPCode 0x%02x") % host->GetListName() % host->GetObfuscationPortUDP() % (rawpacket ? "True" : "False") % packet->GetOpCode());
+		AddDebugLogLineN(logServerUDP,
+			CFormat("Sending regular packet to server %s, port %u (raw = %s), OPCode 0x%02x") %
+				host->GetListName() % host->GetObfuscationPortUDP() %
+				(rawpacket ? "True" : "False") % packet->GetOpCode());
 		if (delPacket) {
 			item.packet = packet;
 		} else {
@@ -400,7 +427,6 @@
 		}
 	}
 
-
 	m_queue.push_back(item);
 
 	// If there is more than one item in the queue,
@@ -410,24 +436,24 @@
 	}
 }
 
-
 void CServerUDPSocket::SendQueue()
 {
 	while (!m_queue.empty()) {
 		ServerUDPPacket item = m_queue.front();
-		CPacket* packet = item.packet;
+		CPacket *packet = item.packet;
 
 		// Do we need to do a DNS lookup before sending?
 		wxASSERT(item.ip || !item.addr.IsEmpty());
 		if (!item.addr.IsEmpty()) {
 			// This not an ip but a hostname. Resolve it.
-			CServer* update = theApp->serverlist->GetServerByAddress(item.addr, item.port);
+			CServer *update = theApp->serverlist->GetServerByAddress(item.addr, item.port);
 			if (update) {
 				const uint64 now = ::GetTickCount64();
 				if (update->GetLastDNSSolve() + DNS_SOLVE_TIME < now) {
 					// Its time for a new check.
-					CAsyncDNS* dns = new CAsyncDNS(item.addr, DNS_UDP, theApp, this);
-					if ((dns->Create() != wxTHREAD_NO_ERROR) || (dns->Run() != wxTHREAD_NO_ERROR)) {
+					CAsyncDNS *dns = new CAsyncDNS(item.addr, DNS_UDP, theApp, this);
+					if ((dns->Create() != wxTHREAD_NO_ERROR) ||
+						(dns->Run() != wxTHREAD_NO_ERROR)) {
 						// Not much we can do here, just drop the packet.
 						dns->Delete();
 						m_queue.pop_front();
@@ -441,19 +467,28 @@
 					// It has been checked recently, don't re-check yet.
 					if (update->GetDNSError()) {
 						// Drop the packet, dns failed last time
-						AddDebugLogLineN(logServerUDP, "Trying to send a UDP packet to a server host that failed DNS: "+item.addr);
+						AddDebugLogLineN(logServerUDP,
+							"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
-							AddDebugLogLineN(logServerUDP, "Sending a UDP packet to a resolved DNS server host: "+item.addr);
+							AddDebugLogLineN(logServerUDP,
+								"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 {
-							AddDebugLogLineN(logServerUDP, "Trying to send a UDP packet to a server host that is checking DNS: "+item.addr);
+							AddDebugLogLineN(logServerUDP,
+								"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();
@@ -463,27 +498,31 @@
 					}
 				}
 			} else {
-				AddDebugLogLineN(logServerUDP, "Trying to send a UDP packet to a server host that is not on serverlist");
+				AddDebugLogLineN(logServerUDP,
+					"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;
 			}
 		}
 
-		CServer* update = theApp->serverlist->GetServerByIPUDP(item.ip, item.port, true);
+		CServer *update = theApp->serverlist->GetServerByIPUDP(item.ip, item.port, true);
 		if (update) {
-			AddDebugLogLineN(logServerUDP, "Sending a UDP packet to a server: "+update->GetAddress());
+			AddDebugLogLineN(
+				logServerUDP, "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 {
-			AddDebugLogLineN(logServerUDP, "Sending a UDP packet to a server no in serverlist: "+Uint32_16toStringIP_Port(item.ip,item.port));
+			AddDebugLogLineN(logServerUDP,
+				"Sending a UDP packet to a server no in serverlist: " +
+					Uint32_16toStringIP_Port(item.ip, item.port));
 		}
 
 		m_queue.pop_front();
 	}
 }
 
-
 void CServerUDPSocket::OnHostnameResolved(uint32 ip)
 {
 	wxCHECK_RET(m_queue.size(), "DNS query returned, but no packets are queued.");
@@ -492,7 +531,7 @@
 	wxCHECK_RET(!item.ip && !item.addr.IsEmpty(), "DNS resolution not expected.");
 
 	/* An asynchronous database routine completed. */
-	CServer* update = theApp->serverlist->GetServerByAddress(item.addr, item.port);
+	CServer *update = theApp->serverlist->GetServerByAddress(item.addr, item.port);
 	if (ip == 0) {
 		update->SetDNSError(true);
 		m_queue.pop_front();

amule-3.0.1.tar.gz/src/ServerUDPSocket.h -> amule-3.1.0.tar.gz/src/ServerUDPSocket.h Changed

@@ -28,31 +28,31 @@
 
 #include "MuleUDPSocket.h"
 
-
 class CPacket;
 class CServer;
 class CMemFile;
 
-
 class CServerUDPSocket : public CMuleUDPSocket
 {
 public:
-	CServerUDPSocket(amuleIPV4Address& addr, const CProxyData* ProxyData = NULL);
+	CServerUDPSocket(amuleIPV4Address &addr, const CProxyData *ProxyData = NULL);
 
-	void	SendPacket(CPacket* packet, CServer* host, bool delPacket, bool rawpacket, uint16 port_offset);
-	void	OnHostnameResolved(uint32 ip);
-	virtual void OnReceiveError(int errorCode, uint32 ip, uint16 port);
+	void SendPacket(CPacket *packet, CServer *host, bool delPacket, bool rawpacket, uint16 port_offset);
+	void OnHostnameResolved(uint32 ip);
+	void OnReceiveError(int errorCode, uint32 ip, uint16 port) override;
 
 private:
-	void	OnPacketReceived(uint32 ip, uint16 port, uint8_t* buffer, size_t length);
-	void	ProcessPacket(CMemFile& packet, uint8 opcode, uint32 ip, uint16 port);
-	void	SendQueue();
-
-	struct ServerUDPPacket {
-		CPacket*	packet;
-		uint32		ip;
-		uint16		port;
-		wxString	addr;
+	void OnPacketReceived(
+		const CNetworkAddress &address, uint16 port, uint8_t *buffer, size_t length) override;
+	void ProcessPacket(CMemFile &packet, uint8 opcode, uint32 ip, uint16 port);
+	void SendQueue();
+
+	struct ServerUDPPacket
+	{
+		CPacket *packet;
+		uint32 ip;
+		uint16 port;
+		wxString addr;
 	};
 
 	typedef std::list<ServerUDPPacket> PacketList;

amule-3.0.1.tar.gz/src/ServerWnd.cpp -> amule-3.1.0.tar.gz/src/ServerWnd.cpp Changed

@@ -23,128 +23,181 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include <algorithm>		// Needed for std::max
-#include <vector>		// Needed for std::vector
-
-#include <wx/clipbrd.h>		// Needed for wxTheClipboard
-#include <wx/dataobj.h>		// Needed for wxTextDataObject
-#include <wx/menu.h>		// Needed for wxMenu (context-menu)
-
-#include "muuli_wdr.h"		// Needed for ID_ADDTOLIST
-#include "ServerWnd.h"		// Interface declarations.
-#include "Server.h"		// Needed for CServer
-#include "ServerList.h"		// Needed for CServerList
-#include "ServerListCtrl.h"	// Needed for CServerListCtrl
-#include "Preferences.h"	// Needed for CPreferences
+#include <algorithm> // Needed for std::max
+#include <vector>    // Needed for std::vector
+
+#include <wx/clipbrd.h>  // Needed for wxTheClipboard
+#include <wx/dataobj.h>  // Needed for wxTextDataObject
+#include <wx/menu.h>     // Needed for wxMenu (context-menu)
+#include <wx/notebook.h> // Needed for wxNotebook (log-tab insertion, CLIENT_GUI)
+
+#include "muuli_wdr.h"      // Needed for ID_ADDTOLIST
+#include "ServerWnd.h"      // Interface declarations.
+#include "Server.h"         // Needed for CServer
+#include "ServerList.h"     // Needed for CServerList
+#include "ServerListCtrl.h" // Needed for CServerListCtrl
+#include "Preferences.h"    // Needed for CPreferences
 #include "ServerConnect.h"
-#include "amuleDlg.h"		// Needed for CamuleDlg
-#include "amule.h"			// Needed for theApp
+#include "amuleDlg.h" // Needed for CamuleDlg
+#include "amule.h"    // Needed for theApp
 #include "Logger.h"
+#include "IPFilter.h" // Needed for CIPFilter::IsReady
 #include "kademlia/utils/UInt128.h"
 
 #include "ClientList.h"
+#include "OtherFunctions.h" // Needed for FormatLocalDateTime
 
-wxBEGIN_EVENT_TABLE(CServerWnd,wxPanel)
-	EVT_BUTTON(ID_ADDTOLIST,CServerWnd::OnBnClickedAddserver)
-	EVT_BUTTON(IDC_ED2KDISCONNECT,CServerWnd::OnBnClickedED2KDisconnect)
-	EVT_BUTTON(ID_UPDATELIST,CServerWnd::OnBnClickedUpdateservermetfromurl)
-	EVT_TEXT_ENTER(IDC_SERVERLISTURL,CServerWnd::OnBnClickedUpdateservermetfromurl)
+wxBEGIN_EVENT_TABLE(CServerWnd, wxPanel)
+	EVT_BUTTON(ID_ADDTOLIST, CServerWnd::OnBnClickedAddserver)
+	EVT_BUTTON(IDC_ED2KDISCONNECT, CServerWnd::OnBnClickedED2KDisconnect)
+	EVT_BUTTON(ID_UPDATELIST, CServerWnd::OnBnClickedUpdateservermetfromurl)
+	EVT_TEXT_ENTER(IDC_SERVERLISTURL, CServerWnd::OnBnClickedUpdateservermetfromurl)
 	EVT_BUTTON(ID_BTN_RESET, CServerWnd::OnBnClickedResetLog)
 	EVT_BUTTON(ID_BTN_RESET_SERVER, CServerWnd::OnBnClickedResetServerLog)
-	EVT_SPLITTER_SASH_POS_CHANGING(ID_SRV_SPLITTER,CServerWnd::OnSashPositionChanging)
-	EVT_SPLITTER_SASH_POS_CHANGED(ID_SRV_SPLITTER,CServerWnd::OnSashPositionChanged)
+#ifdef CLIENT_GUI
+	EVT_BUTTON(ID_BTN_RESET_GUILOG, CServerWnd::OnBnClickedResetGuiLog)
+#endif
+	EVT_SPLITTER_SASH_POS_CHANGING(ID_SRV_SPLITTER, CServerWnd::OnSashPositionChanging)
+	EVT_SPLITTER_SASH_POS_CHANGED(ID_SRV_SPLITTER, CServerWnd::OnSashPositionChanged)
 wxEND_EVENT_TABLE()
 
-
-CServerWnd::CServerWnd(wxWindow* pParent /*=NULL*/, int splitter_pos)
-: wxPanel(pParent, -1)
+// Anonymous enum so the "Copy" context-menu item has a stable ID scoped to this translation unit;
+// it never escapes to the rest of the main dialog's ID space.
+namespace
 {
-	wxSizer* sizer = serverListDlg(this,TRUE);
-
-	// init serverlist
-	// no use now. too early.
-
-	serverlistctrl = CastChild( ID_SERVERLIST, CServerListCtrl );
+enum
+{
+	kInfoListMenuCopy = wxID_HIGHEST + 1
+};
+
+// Column layout of both info lists. Column 0 is an empty spacer that exists only to inset the
+// labels: wxListCtrl has no counterpart to Scintilla's SetMarginLeft, and the left cell padding
+// comes from the platform theme, so on a theme that sets none the text is drawn hard against the
+// frame (issue #702). Its width matches CMuleLogCtrl's text margin, so the info panes line up with
+// the log panes beside them.
+enum
+{
+	kInfoSpacerCol = 0,
+	kInfoLabelCol = 1,
+	kInfoValueCol = 2
+};
+
+// Matches CMuleLogCtrl's FromDIP(5) text margin. Not DIP-scaled here: a wxListCtrl column width is
+// set from a plain int, so this is the same physical inset the log panes use at 100% scaling.
+constexpr int kInfoSpacerWidth = 5;
+
+// Row helpers. InsertItem() writes column 0, which is the spacer, so a row is created empty and the
+// label goes in explicitly -- in one place rather than at each of the ~20 call sites.
+void InfoInsertRow(wxListCtrl *list, long row, const wxString &label)
+{
+	list->InsertItem(row, wxEmptyString);
+	list->SetItem(row, kInfoLabelCol, label);
+}
 
-	CastChild( ID_SRV_SPLITTER, wxSplitterWindow )->SetSashPosition(splitter_pos, true);
-	// Default gravity (0.0) anchors the sash to the top: when the
-	// main window resizes, the server list keeps its height and the
-	// log pane absorbs the extra space. The other amule splitters
-	// (Shared/Transfer/Messages) use the same default and don't
-	// suffer the layout-recalc storm during minimize/restore that
-	// gravity 0.5 produced on Mac and Windows (#334 reproductions).
-	CastChild( IDC_NODESLISTURL, wxTextCtrl )->SetValue(thePrefs::GetKadNodesUrl());
-	CastChild( IDC_SERVERLISTURL, wxTextCtrl )->SetValue(thePrefs::GetEd2kServersUrl());
+void InfoSetValue(wxListCtrl *list, long row, const wxString &value)
+{
+	list->SetItem(row, kInfoValueCol, value);
+}
+} // namespace
 
-	// Insert two columns, currently without a header
-	wxListCtrl* ED2KInfoList = CastChild( ID_ED2KINFO, wxListCtrl );
+CServerWnd::CServerWnd(wxWindow *pParent /*=NULL*/, int splitter_pos)
+: wxPanel(pParent, -1)
+{
+	wxSizer *sizer = serverListDlg(this, TRUE);
+
+#ifdef CLIENT_GUI
+	// amulegui only: "aMule Log" carries the daemon/core log forwarded over EC, so give the GUI
+	// client's own messages a second tab. Inserted after the notebook is built rather than
+	// inside serverListDlg().
+	wxNotebook *srvLogNotebook = CastChild(ID_SRVLOG_NOTEBOOK, wxNotebook);
+	if (srvLogNotebook) {
+		wxPanel *guiLogPanel = new wxPanel(srvLogNotebook, -1);
+		aMuleGuiLog(guiLogPanel, FALSE);
+		srvLogNotebook->InsertPage(1, guiLogPanel, _("aMuleGUI Log"));
+	}
+#endif
+
+	serverlistctrl = CastChild(ID_SERVERLIST, CServerListCtrl);
+
+	CastChild(ID_SRV_SPLITTER, wxSplitterWindow)->SetSashPosition(splitter_pos, true);
+	// Default gravity (0.0) anchors the sash to the top: on a resize the server list keeps its
+	// height and the log pane absorbs the extra space. The other amule splitters use the same
+	// default and avoid the layout-recalc storm during minimize/restore that gravity 0.5
+	// produced on Mac and Windows.
+	CastChild(IDC_NODESLISTURL, wxTextCtrl)->SetValue(thePrefs::GetKadNodesUrl());
+	CastChild(IDC_SERVERLISTURL, wxTextCtrl)->SetValue(thePrefs::GetEd2kServersUrl());
+
+	// Three columns, no header: an empty spacer that insets the labels, then label and value.
+	// Columns must exist before any row is inserted -- adding one to a populated wxListCtrl
+	// does not shift the existing per-row data across ports.
+	wxListCtrl *ED2KInfoList = CastChild(ID_ED2KINFO, wxListCtrl);
 	wxASSERT(ED2KInfoList);
-	ED2KInfoList->InsertColumn(0, "");
-	ED2KInfoList->InsertColumn(1, "");
+	ED2KInfoList->InsertColumn(kInfoSpacerCol, "");
+	ED2KInfoList->InsertColumn(kInfoLabelCol, "");
+	ED2KInfoList->InsertColumn(kInfoValueCol, "");
 
-	wxListCtrl* KadInfoList = CastChild( ID_KADINFO, wxListCtrl );
+	wxListCtrl *KadInfoList = CastChild(ID_KADINFO, wxListCtrl);
 	wxASSERT(KadInfoList);
-	KadInfoList->InsertColumn(0, "");
-	KadInfoList->InsertColumn(1, "");
+	KadInfoList->InsertColumn(kInfoSpacerCol, "");
+	KadInfoList->InsertColumn(kInfoLabelCol, "");
+	KadInfoList->InsertColumn(kInfoValueCol, "");
 
-	// Wire Ctrl+C and right-click-to-copy on both info notebook
-	// list controls (#814). Bound dynamically so the same handler
-	// instance covers both ED2K Info and Kad Info.
-	for (wxListCtrl* list : {ED2KInfoList, KadInfoList}) {
+	// Wire Ctrl+C and right-click-to-copy on both info notebook list controls (#814). Bound
+	// dynamically so the same handler instance covers both ED2K Info and Kad Info.
+	for (wxListCtrl *list : { ED2KInfoList, KadInfoList }) {
 		list->Bind(wxEVT_KEY_DOWN, &CServerWnd::OnInfoListKeyDown, this);
 		list->Bind(wxEVT_CONTEXT_MENU, &CServerWnd::OnInfoListContextMenu, this);
 	}
 
-	sizer->Show(this,TRUE);
-}
+	sizer->Show(this, TRUE);
 
+	UpdateED2KConnectButton();
+}
 
 CServerWnd::~CServerWnd()
 {
-	thePrefs::SetEd2kServersUrl(CastChild( IDC_SERVERLISTURL, wxTextCtrl )->GetValue());
-	thePrefs::SetKadNodesUrl(CastChild( IDC_NODESLISTURL, wxTextCtrl )->GetValue());
+	thePrefs::SetEd2kServersUrl(CastChild(IDC_SERVERLISTURL, wxTextCtrl)->GetValue());
+	thePrefs::SetKadNodesUrl(CastChild(IDC_NODESLISTURL, wxTextCtrl)->GetValue());
 }
 
-
-void CServerWnd::UpdateServerMetFromURL(const wxString& strURL)
+void CServerWnd::UpdateServerMetFromURL(const wxString &strURL)
 {
 	thePrefs::SetEd2kServersUrl(strURL);
 	theApp->serverlist->UpdateServerMetFromURL(strURL);
 }
 
-
-void CServerWnd::OnBnClickedAddserver(wxCommandEvent& WXUNUSED(evt))
+void CServerWnd::OnBnClickedAddserver(wxCommandEvent &WXUNUSED(evt))
 {
-	wxString servername = CastChild( IDC_SERVERNAME, wxTextCtrl )->GetValue();
-	wxString serveraddr = CastChild( IDC_IPADDRESS, wxTextCtrl )->GetValue();
-	long port = StrToULong( CastChild( IDC_SPORT, wxTextCtrl )->GetValue() );
+	wxString servername = CastChild(IDC_SERVERNAME, wxTextCtrl)->GetValue();
+	wxString serveraddr = CastChild(IDC_IPADDRESS, wxTextCtrl)->GetValue();
+	long port = StrToULong(CastChild(IDC_SPORT, wxTextCtrl)->GetValue());
 
-	if ( serveraddr.IsEmpty() ) {
+	if (serveraddr.IsEmpty()) {
 		AddLogLineC(_("Server not added: No IP or hostname specified."));
 		return;
 	}
 
-	if ( port <= 0 || port > 65535 ) {
+	if (port <= 0 || port > 65535) {
 		AddLogLineC(_("Server not added: Invalid server-port specified."));
 		return;
 	}
 
-	CServer* toadd = new CServer( port, serveraddr );
-	toadd->SetListName( servername.IsEmpty() ? serveraddr : servername );
+	CServer *toadd = new CServer(port, serveraddr);
+	toadd->SetListName(servername.IsEmpty() ? serveraddr : servername);
 
-	if ( theApp->AddServer( toadd, true ) ) {
-		CastChild( IDC_SERVERNAME, wxTextCtrl )->Clear();
-		CastChild( IDC_IPADDRESS, wxTextCtrl )->Clear();
-		CastChild( IDC_SPORT, wxTextCtrl )->Clear();
+	if (theApp->AddServer(toadd, true)) {
+		CastChild(IDC_SERVERNAME, wxTextCtrl)->Clear();
+		CastChild(IDC_IPADDRESS, wxTextCtrl)->Clear();
+		CastChild(IDC_SPORT, wxTextCtrl)->Clear();
 	} else {
-		CServer* update = theApp->serverlist->GetServerByAddress(toadd->GetAddress(), toadd->GetPort());
+		CServer *update =
+			theApp->serverlist->GetServerByAddress(toadd->GetAddress(), toadd->GetPort());
 		// See note on CServerList::AddServer
 		if (update == NULL && toadd->GetIP() != 0) {
 			update = theApp->serverlist->GetServerByIPTCP(toadd->GetIP(), toadd->GetPort());
 		}
 
-		if ( update ) {
+		if (update) {
 			update->SetListName(toadd->GetListName());
 			serverlistctrl->RefreshServer(update);
 		}
@@ -154,54 +207,65 @@
 	theApp->serverlist->SaveServerMet();
 }
 
-
-void CServerWnd::OnBnClickedUpdateservermetfromurl(wxCommandEvent& WXUNUSED(evt))
+void CServerWnd::OnBnClickedUpdateservermetfromurl(wxCommandEvent &WXUNUSED(evt))
 {
-	wxString strURL = CastChild( IDC_SERVERLISTURL, wxTextCtrl )->GetValue();
+	wxString strURL = CastChild(IDC_SERVERLISTURL, wxTextCtrl)->GetValue();
 	UpdateServerMetFromURL(strURL);
 }
 
-
-void CServerWnd::OnBnClickedResetLog(wxCommandEvent& WXUNUSED(evt))
+void CServerWnd::OnBnClickedResetLog(wxCommandEvent &WXUNUSED(evt))
 {
 	theApp->GetLog(true); // Reset it.
 }
 
-
-void CServerWnd::OnBnClickedResetServerLog(wxCommandEvent& WXUNUSED(evt))
+void CServerWnd::OnBnClickedResetServerLog(wxCommandEvent &WXUNUSED(evt))
 {
 	theApp->GetServerLog(true); // Reset it
 }
 
+#ifdef CLIENT_GUI
+void CServerWnd::OnBnClickedResetGuiLog(wxCommandEvent &WXUNUSED(evt))
+{
+	// Local-only clear of the "aMuleGUI Log" tab. Unlike the "aMule Log" reset,
+	// there is nothing to reset on the daemon -- this log is generated here.
+	theApp->amuledlg->ResetLog(ID_GUILOGVIEW);
+}
+#endif
 
 void CServerWnd::UpdateED2KInfo()
 {
-	wxListCtrl* ED2KInfoList = CastChild( ID_ED2KINFO, wxListCtrl );
+	wxListCtrl *ED2KInfoList = CastChild(ID_ED2KINFO, wxListCtrl);
 
 	ED2KInfoList->DeleteAllItems();
-	ED2KInfoList->InsertItem(0, _("eD2k Status:"));
+	InfoInsertRow(ED2KInfoList, 0, _("eD2k Status:"));
 
 	if (theApp->IsConnectedED2K()) {
-		ED2KInfoList->SetItem(0, 1, _("Connected"));
+		InfoSetValue(ED2KInfoList, 0, _("Connected"));
 
-		// Connection data
-		ED2KInfoList->InsertItem(1, _("IP:Port"));
-		ED2KInfoList->SetItem(1, 1, theApp->serverconnect->IsLowID()
-			? wxString(_("Server"))
-			: Uint32_16toStringIP_Port(theApp->GetED2KID(), thePrefs::GetPort()));
+		InfoInsertRow(ED2KInfoList, 1, _("IP:Port"));
+		InfoSetValue(ED2KInfoList,
+			1,
+			theApp->serverconnect->IsLowID()
+				? wxString(_("Server"))
+				: Uint32_16toStringIP_Port(theApp->GetED2KID(), thePrefs::GetPort()));
 
-		ED2KInfoList->InsertItem(2, _("ID"));
+		InfoInsertRow(ED2KInfoList, 2, _("ID"));
 		// No need to test the server connect, it's already true
-		ED2KInfoList->SetItem(2, 1, CFormat("%u") % theApp->GetED2KID());
-
-		// Previously this row was inserted with an empty label and just
-		// "LowID"/"HighID" in column 1, leaving a value with no key.
-		// Give it an explicit label so the row is self-explanatory.
-		ED2KInfoList->InsertItem(3, _("Connection Type:"));
-		ED2KInfoList->SetItem(3, 1, theApp->serverconnect->IsLowID() ? _("LowID") : _("HighID"));
+		InfoSetValue(ED2KInfoList, 2, CFormat("%u") % theApp->GetED2KID());
+
+		// This row used to be inserted with an empty label and just "LowID" /
+		// "HighID" in column 1, leaving a value with no key.
+		InfoInsertRow(ED2KInfoList, 3, _("Connection Type:"));
+		InfoSetValue(ED2KInfoList, 3, theApp->serverconnect->IsLowID() ? _("LowID") : _("HighID"));
+
+		// Carried over EC as EC_TAG_CONNSTATE's optional ED2K_CONNECTED_SINCE
+		// sub-tag, so this reads the same on amulegui as locally.
+		if (theApp->GetED2KConnectedSince().IsValid()) {
+			InfoInsertRow(ED2KInfoList, 4, _("Connected since:"));
+			InfoSetValue(ED2KInfoList, 4, FormatLocalDateTime(theApp->GetED2KConnectedSince()));
+		}
 	} else {
-		// No data
-		ED2KInfoList->SetItem(0, 1, _("Not Connected"));
+		InfoSetValue(ED2KInfoList, 0, _("Not Connected"));
 	}
 
 	FitInfoListColumns(ED2KInfoList);
@@ -209,134 +273,138 @@
 
 void CServerWnd::UpdateKadInfo()
 {
-	wxListCtrl* KadInfoList = CastChild( ID_KADINFO, wxListCtrl );
+	wxListCtrl *KadInfoList = CastChild(ID_KADINFO, wxListCtrl);
 
 	int next_row = 0;
 
 	KadInfoList->DeleteAllItems();
 
-	KadInfoList->InsertItem(next_row, _("Kademlia Status:"));
+	InfoInsertRow(KadInfoList, next_row, _("Kademlia Status:"));
 
 	if (theApp->IsKadRunning()) {
-		KadInfoList->SetItem(next_row++, 1, (theApp->IsKadRunningInLanMode() ? _("Running in LAN mode") : _("Running")));
-
-		// Connection data
-		KadInfoList->InsertItem(next_row, _("Kademlia client ID:"));
-		KadInfoList->SetItem(next_row++, 1, theApp->GetKadID().ToHexString());
-		KadInfoList->InsertItem(next_row, _("Status:"));
-		KadInfoList->SetItem(next_row++, 1, theApp->IsConnectedKad() ? _("Connected"): _("Disconnected"));
+		InfoSetValue(KadInfoList,
+			next_row++,
+			(theApp->IsKadRunningInLanMode() ? _("Running in LAN mode") : _("Running")));
+
+		InfoInsertRow(KadInfoList, next_row, _("Kademlia client ID:"));
+		InfoSetValue(KadInfoList, next_row++, theApp->GetKadID().ToHexString());
+		InfoInsertRow(KadInfoList, next_row, _("Status:"));
+		InfoSetValue(KadInfoList,
+			next_row++,
+			theApp->IsConnectedKad() ? _("Connected") : _("Disconnected"));
 		if (theApp->IsConnectedKad()) {
-			KadInfoList->InsertItem(next_row, _("Connection State:"));
-			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:"));
+			// Carried over EC as EC_TAG_CONNSTATE's optional
+			// KAD_CONNECTED_SINCE sub-tag (amule-org/amule#174).
+			if (theApp->GetKadConnectedSince().IsValid()) {
+				InfoInsertRow(KadInfoList, next_row, _("Connected since:"));
+				InfoSetValue(KadInfoList,
+					next_row++,
+					FormatLocalDateTime(theApp->GetKadConnectedSince()));
+			}
+			InfoInsertRow(KadInfoList, next_row, _("Connection State:"));
+			InfoSetValue(KadInfoList,
+				next_row++,
+				theApp->IsFirewalledKad()
+					? wxString(CFormat(_("Firewalled - open TCP port %d in your router "
+							     "or firewall")) %
+						   thePrefs::GetPort())
+					: wxString(_("OK")));
+			InfoInsertRow(KadInfoList, 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")));
+			InfoSetValue(KadInfoList,
+				next_row++,
+				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: "));
+				InfoInsertRow(KadInfoList, next_row, _("Firewalled state: "));
 				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;
+				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;
 				}
-				KadInfoList->SetItem(next_row++, 1, BuddyState);
+				InfoSetValue(KadInfoList, next_row++, BuddyState);
 			}
 
-			KadInfoList->InsertItem(next_row, _("IP address:"));
-			KadInfoList->SetItem(next_row++, 1, Uint32toStringIP(theApp->GetKadIPAddress()));
-
-			// Index info
-			KadInfoList->InsertItem(next_row, _("Indexed sources:"));
-			KadInfoList->SetItem(next_row++, 1, CFormat("%d") % theApp->GetKadIndexedSources());
-			KadInfoList->InsertItem(next_row, _("Indexed keywords:"));
-			KadInfoList->SetItem(next_row++, 1, CFormat("%d") % theApp->GetKadIndexedKeywords());
-			KadInfoList->InsertItem(next_row, _("Indexed notes:"));
-			KadInfoList->SetItem(next_row++, 1, CFormat("%d") % theApp->GetKadIndexedNotes());
-			KadInfoList->InsertItem(next_row, _("Indexed load:"));
-			KadInfoList->SetItem(next_row++, 1, CFormat("%d") % theApp->GetKadIndexedLoad());
-
-			KadInfoList->InsertItem(next_row, _("Average Users:"));
-			KadInfoList->SetItem(next_row, 1, CastItoIShort(theApp->GetKadUsers()));
+			InfoInsertRow(KadInfoList, next_row, _("IP address:"));
+			InfoSetValue(KadInfoList, next_row++, Uint32toStringIP(theApp->GetKadIPAddress()));
+
+			InfoInsertRow(KadInfoList, next_row, _("Indexed sources:"));
+			InfoSetValue(KadInfoList, next_row++, CFormat("%d") % theApp->GetKadIndexedSources());
+			InfoInsertRow(KadInfoList, next_row, _("Indexed keywords:"));
+			InfoSetValue(
+				KadInfoList, next_row++, CFormat("%d") % theApp->GetKadIndexedKeywords());
+			InfoInsertRow(KadInfoList, next_row, _("Indexed notes:"));
+			InfoSetValue(KadInfoList, next_row++, CFormat("%d") % theApp->GetKadIndexedNotes());
+			InfoInsertRow(KadInfoList, next_row, _("Indexed load:"));
+			InfoSetValue(KadInfoList, next_row++, CFormat("%d") % theApp->GetKadIndexedLoad());
+
+			InfoInsertRow(KadInfoList, next_row, _("Average Users:"));
+			InfoSetValue(KadInfoList, next_row, CastItoIShort(theApp->GetKadUsers()));
 			++next_row;
-			KadInfoList->InsertItem(next_row, _("Average Files:"));
-			KadInfoList->SetItem(next_row, 1, CastItoIShort(theApp->GetKadFiles()));
+			InfoInsertRow(KadInfoList, next_row, _("Average Files:"));
+			InfoSetValue(KadInfoList, next_row, CastItoIShort(theApp->GetKadFiles()));
 		}
 	} else {
-		// No data
-		KadInfoList->SetItem(next_row, 1, _("Not running"));
+		InfoSetValue(KadInfoList, next_row, _("Not running"));
 	}
 
 	FitInfoListColumns(KadInfoList);
 }
 
-
-// Both info notebooks (ED2K Info, Kad Info) are two-column wxListCtrls
-// where column 0 holds short labels ("eD2k Status:", "Status:", ...) and
-// column 1 holds values that can grow wide (IP:port strings, hex client
-// IDs, firewall-state sentences). The previous code called
-// `SetColumnWidth(col, wxLIST_AUTOSIZE)` on both columns, which on
-// wxGTK ends up sizing column 1 to the *current* longest item in the
-// list -- and that was sometimes narrower than the actual content, so
-// the IP:Port value got truncated (#813) even though there was free
-// horizontal space in the panel.
+// Both info notebooks are two-column wxListCtrls where column 0 holds short labels and column 1
+// holds values that can grow wide (IP:port strings, hex client IDs, firewall-state sentences).
+// Calling SetColumnWidth(col, wxLIST_AUTOSIZE) on both sized column 1 to the CURRENT longest item
+// on wxGTK, which was sometimes narrower than the actual content, truncating the IP:Port value
+// (#813) with free horizontal space still in the panel.
 //
-// Pin column 0 to autosize (its content is short and predictable) and
-// let column 1 absorb whatever client width remains. Floored at a
-// reasonable minimum so the column stays usable while the panel is
-// being resized or before the first layout pass.
+// Pin column 0 to autosize, its content being short and predictable, and let column 1 absorb
+// whatever client width remains, floored at a usable minimum.
 /* static */
-void CServerWnd::FitInfoListColumns(wxListCtrl* list)
+void CServerWnd::FitInfoListColumns(wxListCtrl *list)
 {
 	if (!list) {
 		return;
 	}
-	list->SetColumnWidth(0, wxLIST_AUTOSIZE);
+	// Fixed narrow spacer; wxLIST_AUTOSIZE would collapse it to zero, since
+	// every cell in it is empty.
+	list->SetColumnWidth(kInfoSpacerCol, kInfoSpacerWidth);
+	list->SetColumnWidth(kInfoLabelCol, wxLIST_AUTOSIZE);
 	const int clientWidth = list->GetClientSize().GetWidth();
-	const int col0 = list->GetColumnWidth(0);
-	// Small breathing-room pad so the rightmost glyph isn't flush
-	// against the column border in GTK themes that draw cell padding
-	// asymmetrically.
+	const int used = list->GetColumnWidth(kInfoSpacerCol) + list->GetColumnWidth(kInfoLabelCol);
+	// Small breathing-room pad so the rightmost glyph is not flush against the column border in
+	// GTK themes that draw cell padding asymmetrically.
 	constexpr int kPad = 8;
-	constexpr int kCol1Min = 200;
-	list->SetColumnWidth(1, std::max(clientWidth - col0 - kPad, kCol1Min));
-}
-
-
-// Anonymous enum so the "Copy" context-menu item has a stable ID
-// scoped to this translation unit (it never escapes to the rest of
-// the main dialog's ID space).
-namespace {
-	enum { kInfoListMenuCopy = wxID_HIGHEST + 1 };
+	constexpr int kValueMin = 200;
+	list->SetColumnWidth(kInfoValueCol, std::max(clientWidth - used - kPad, kValueMin));
 }
 
 /* static */
-void CServerWnd::CopyInfoListToClipboard(wxListCtrl* list)
+void CServerWnd::CopyInfoListToClipboard(wxListCtrl *list)
 {
 	if (!list || list->GetItemCount() == 0) {
 		return;
 	}
 
-	// If the user has rows selected, copy only those; otherwise copy
-	// the whole list. Matches the affordance most users expect from
-	// list-style read-only data panels.
+	// If the user has rows selected, copy only those; otherwise copy the whole list. Matches
+	// the affordance most users expect from list-style read-only data panels.
 	std::vector<long> rows;
 	long sel = list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	while (sel != -1) {
@@ -351,8 +419,10 @@
 
 	wxString out;
 	for (long row : rows) {
-		const wxString label = list->GetItemText(row, 0);
-		const wxString value = list->GetItemText(row, 1);
+		// Columns by name: column 0 is the spacer and always empty, so
+		// copying it would prefix every line with a stray tab.
+		const wxString label = list->GetItemText(row, kInfoLabelCol);
+		const wxString value = list->GetItemText(row, kInfoValueCol);
 		out << label << '\t' << value << '\n';
 	}
 
@@ -364,26 +434,21 @@
 	}
 }
 
-
-void CServerWnd::OnInfoListKeyDown(wxKeyEvent& evt)
+void CServerWnd::OnInfoListKeyDown(wxKeyEvent &evt)
 {
-	// Ctrl+C (or Cmd+C on macOS, which wx maps to ControlDown for
-	// wxKeyEvent on standard menus). Anything else falls through to
-	// the default key handler so arrow navigation etc. still works.
-	if ((evt.GetKeyCode() == 'C' || evt.GetKeyCode() == 'c')
-		&& evt.ControlDown())
-	{
-		wxListCtrl* list = wxDynamicCast(evt.GetEventObject(), wxListCtrl);
+	// Ctrl+C, or Cmd+C on macOS, which wx maps to ControlDown for wxKeyEvent on
+	// standard menus. Anything else falls through to the default key handler.
+	if ((evt.GetKeyCode() == 'C' || evt.GetKeyCode() == 'c') && evt.ControlDown()) {
+		wxListCtrl *list = wxDynamicCast(evt.GetEventObject(), wxListCtrl);
 		CopyInfoListToClipboard(list);
 		return;
 	}
 	evt.Skip();
 }
 
-
-void CServerWnd::OnInfoListContextMenu(wxContextMenuEvent& evt)
+void CServerWnd::OnInfoListContextMenu(wxContextMenuEvent &evt)
 {
-	wxListCtrl* list = wxDynamicCast(evt.GetEventObject(), wxListCtrl);
+	wxListCtrl *list = wxDynamicCast(evt.GetEventObject(), wxListCtrl);
 	if (!list) {
 		evt.Skip();
 		return;
@@ -392,51 +457,46 @@
 	wxMenu menu;
 	menu.Append(kInfoListMenuCopy, _("Copy"));
 
-	// Stash the target list on the menu's client-data slot so the
-	// EVT_MENU handler knows which list control fired the event
-	// without an extra member variable.
+	// Stash the target list on the menu's client-data slot so the EVT_MENU handler
+	// knows which list control fired the event without an extra member.
 	menu.SetClientData(list);
 	menu.Bind(wxEVT_MENU, &CServerWnd::OnInfoListCopy, this, kInfoListMenuCopy);
 
-	// Pop up at the event position (already in screen coords for
-	// wxContextMenuEvent); fall back to the list's centre if the
-	// event came from a keyboard menu key with no position.
+	// Pop up at the event position, already in screen coords for wxContextMenuEvent; fall back
+	// to the list's centre if the event came from a keyboard menu key with no position.
 	const wxPoint pos = evt.GetPosition() != wxDefaultPosition
-		? list->ScreenToClient(evt.GetPosition())
-		: wxPoint(list->GetClientSize().GetWidth() / 2,
-				  list->GetClientSize().GetHeight() / 2);
+				    ? list->ScreenToClient(evt.GetPosition())
+				    : wxPoint(list->GetClientSize().GetWidth() / 2,
+					      list->GetClientSize().GetHeight() / 2);
 	list->PopupMenu(&menu, pos);
 }
 
-
-void CServerWnd::OnInfoListCopy(wxCommandEvent& evt)
+void CServerWnd::OnInfoListCopy(wxCommandEvent &evt)
 {
-	wxMenu* menu = wxDynamicCast(evt.GetEventObject(), wxMenu);
+	wxMenu *menu = wxDynamicCast(evt.GetEventObject(), wxMenu);
 	if (!menu) {
 		return;
 	}
-	wxListCtrl* list = static_cast<wxListCtrl*>(menu->GetClientData());
+	wxListCtrl *list = static_cast<wxListCtrl *>(menu->GetClientData());
 	CopyInfoListToClipboard(list);
 }
 
-void CServerWnd::OnSashPositionChanging(wxSplitterEvent& evt)
+void CServerWnd::OnSashPositionChanging(wxSplitterEvent &evt)
 {
-	// CHANGING fires only while the user is actively dragging the
-	// sash; mark the drag in flight so OnSashPositionChanged knows
-	// the next CHANGED event came from a real user gesture (and not
-	// a layout reflow during minimize/restore).
+	// CHANGING fires only while the user is actively dragging the sash, so mark the drag in
+	// flight and OnSashPositionChanged knows the next CHANGED event came from a real gesture
+	// rather than a layout reflow.
 	m_userDraggingSash = true;
 	evt.Skip();
 }
 
-void CServerWnd::OnSashPositionChanged(wxSplitterEvent& WXUNUSED(evt))
+void CServerWnd::OnSashPositionChanged(wxSplitterEvent &WXUNUSED(evt))
 {
-	wxSplitterWindow* split = CastChild("SrvSplitterWnd", wxSplitterWindow);
+	wxSplitterWindow *split = CastChild("SrvSplitterWnd", wxSplitterWindow);
 	if (!m_userDraggingSash) {
-		// Layout-induced sash move — don't persist. With the default
-		// sash gravity, these should be rare; previously gravity 0.5
-		// produced a storm of CHANGED events during minimize/restore
-		// reflows that pushed the sash out of the visible range.
+		// Layout-induced sash move -- do not persist. Rare with the default sash gravity;
+		// gravity 0.5 produced a storm of CHANGED events during minimize/restore reflows
+		// that pushed the sash out of visible range.
 		return;
 	}
 	m_userDraggingSash = false;
@@ -445,12 +505,38 @@
 	}
 }
 
-void CServerWnd::OnBnClickedED2KDisconnect(wxCommandEvent& WXUNUSED(evt))
+void CServerWnd::OnBnClickedED2KDisconnect(wxCommandEvent &WXUNUSED(evt))
 {
+	// Doubles as Connect/Cancel/Disconnect depending on the button's
+	// current state (see UpdateED2KConnectButton()).
 	if (theApp->serverconnect->IsConnecting()) {
 		theApp->serverconnect->StopConnectionTry();
-	} else {
+	} else if (theApp->IsConnectedED2K()) {
 		theApp->serverconnect->Disconnect();
+	} else {
+		AddLogLineC(_("Connecting"));
+		theApp->serverconnect->ConnectToAnyServer();
 	}
 }
+
+void CServerWnd::UpdateED2KConnectButton()
+{
+	wxButton *button = CastChild(IDC_ED2KDISCONNECT, wxButton);
+	wxCHECK_RET(button, "'IDC_ED2KDISCONNECT' widget not found");
+
+	EConnButtonState state;
+	if (theApp->IsConnectedED2K()) {
+		state = ConnButtonConnected;
+	} else if (theApp->serverconnect->IsConnecting()) {
+		state = ConnButtonConnecting;
+	} else {
+		state = ConnButtonOff;
+	}
+
+	// _("ED2K") matches the translatable tab label (muuli_wdr.cpp's NetDialog), so a
+	// translation that localizes the network name stays consistent between the tab and this
+	// button.
+	SetConnectButtonState(
+		button, state, thePrefs::GetNetworkED2K() && theApp->ipfilter->IsReady(), _("ED2K"));
+}
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ServerWnd.h -> amule-3.1.0.tar.gz/src/ServerWnd.h Changed

@@ -26,56 +26,58 @@
 #ifndef SERVERWND_H
 #define SERVERWND_H
 
-#include <wx/splitter.h>	// Needed for wxSplitter
-#include <wx/listctrl.h>	// Needed for wxListCtrl
-
+#include <wx/splitter.h> // Needed for wxSplitter
+#include <wx/listctrl.h> // Needed for wxListCtrl
 
 class CServerListCtrl;
 
 class CServerWnd : public wxPanel
 {
 public:
-	CServerWnd(wxWindow* pParent, int splitter_pos);   // standard constructor
+	CServerWnd(wxWindow *pParent, int splitter_pos); // standard constructor
 	virtual ~CServerWnd();
 
-	void UpdateServerMetFromURL(const wxString& strURL);
+	void UpdateServerMetFromURL(const wxString &strURL);
 	void UpdateED2KInfo();
 	void UpdateKadInfo();
 
-	CServerListCtrl* serverlistctrl;
+	// Drives the pane's own Connect/Cancel/Disconnect toggle (IDC_ED2KDISCONNECT) from ED2K's
+	// current state. Called from CamuleDlg::ShowConnectionState() alongside UpdateED2KInfo().
+	void UpdateED2KConnectButton();
+
+	CServerListCtrl *serverlistctrl;
 
-	// Shared column-width helper for the two info notebooks (ED2K
-	// Info, Kad Info). Pins column 0 to autosize and fills column 1
-	// with the remaining client width so the value column doesn't
-	// truncate (#813).
-	static void FitInfoListColumns(wxListCtrl* list);
+	// Shared column-width helper for the two info notebooks (ED2K Info, Kad Info). Pins column
+	// 0 to autosize and fills column 1 with the remaining client width so the value column does
+	// not truncate (#813).
+	static void FitInfoListColumns(wxListCtrl *list);
 
-	// Copy currently-selected rows of one of the two info notebooks
-	// (or all rows when no selection) to the clipboard as
-	// tab-separated `<label>\t<value>` lines (#814).
-	static void CopyInfoListToClipboard(wxListCtrl* list);
+	// Copy the selected rows of one of the two info notebooks -- or all rows when nothing is
+	// selected -- to the clipboard as tab-separated `<label>\t<value>` lines (#814).
+	static void CopyInfoListToClipboard(wxListCtrl *list);
 
 private:
-	void OnSashPositionChanging(wxSplitterEvent& evt);
-	void OnSashPositionChanged(wxSplitterEvent& evt);
-	void OnBnClickedAddserver(wxCommandEvent& evt);
-	void OnBnClickedED2KDisconnect(wxCommandEvent& evt);
-	void OnBnClickedUpdateservermetfromurl(wxCommandEvent& evt);
-	void OnBnClickedResetLog(wxCommandEvent& evt);
-	void OnBnClickedResetServerLog(wxCommandEvent& evt);
+	void OnSashPositionChanging(wxSplitterEvent &evt);
+	void OnSashPositionChanged(wxSplitterEvent &evt);
+	void OnBnClickedAddserver(wxCommandEvent &evt);
+	void OnBnClickedED2KDisconnect(wxCommandEvent &evt);
+	void OnBnClickedUpdateservermetfromurl(wxCommandEvent &evt);
+	void OnBnClickedResetLog(wxCommandEvent &evt);
+	void OnBnClickedResetServerLog(wxCommandEvent &evt);
+#ifdef CLIENT_GUI
+	void OnBnClickedResetGuiLog(wxCommandEvent &evt);
+#endif
 
-	// Copy handlers for ED2K Info / Kad Info notebook tabs (#814).
-	// Routed through wxEvtHandler bindings rather than the static
-	// event table so both list-control IDs can share the same code
-	// without a per-ID stanza.
-	void OnInfoListKeyDown(wxKeyEvent& evt);
-	void OnInfoListContextMenu(wxContextMenuEvent& evt);
-	void OnInfoListCopy(wxCommandEvent& evt);
+	// Copy handlers for the ED2K Info / Kad Info notebook tabs (#814). Routed through
+	// wxEvtHandler bindings rather than the static event table so both list-control IDs share
+	// the same code without a per-ID stanza.
+	void OnInfoListKeyDown(wxKeyEvent &evt);
+	void OnInfoListContextMenu(wxContextMenuEvent &evt);
+	void OnInfoListCopy(wxCommandEvent &evt);
 
-	// Set in OnSashPositionChanging (only fires while the user is
-	// actually dragging the sash); checked by OnSashPositionChanged
-	// to filter out layout-induced sash moves that fire during
-	// minimize/restore reflows on Windows.
+	// Set in OnSashPositionChanging, which only fires while the user is actually dragging the
+	// sash; checked by OnSashPositionChanged to filter out layout-induced sash moves that fire
+	// during minimize/restore reflows on Windows.
 	bool m_userDraggingSash = false;
 
 	wxDECLARE_EVENT_TABLE();

amule-3.0.1.tar.gz/src/SharedDirWatcher.cpp -> amule-3.1.0.tar.gz/src/SharedDirWatcher.cpp Changed

@@ -24,34 +24,32 @@
 #include <CoreFoundation/CFRunLoop.h>
 #endif
 
-#include <common/Format.h>		// Needed for CFormat
+#include <common/Format.h> // Needed for CFormat
 
 #include <common/Path.h>
-#include <common/FileFunctions.h>		// CDirIterator for cold-discover walk
+#include <common/FileFunctions.h> // CDirIterator for cold-discover walk
 
 #include "amule.h"
 #include "Logger.h"
 #include "Preferences.h"
 #include "SharedFileList.h"
 
-namespace {
+namespace
+{
 
-// Watcher event mask used by every Add()/AddTree() call below.
-// WARNING + ERROR are subscribed so the backend can signal overflow /
-// dropped events (inotify queue exhaust, kqueue race, Windows
-// ReadDirectoryChangesW buffer exhaust); on those we fall back to a
-// bulk Reload() because incremental state can't be trusted.
-constexpr int kWatchMask = wxFSW_EVENT_CREATE | wxFSW_EVENT_DELETE |
-	wxFSW_EVENT_RENAME | wxFSW_EVENT_MODIFY |
-	wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR;
+// Watcher event mask used by every Add()/AddTree() call below. WARNING + ERROR are
+// subscribed so the backend can signal overflow / dropped events (inotify queue exhaust,
+// kqueue race, Windows ReadDirectoryChangesW buffer exhaust); on those we fall back to a
+// bulk Reload() because incremental state cannot be trusted.
+constexpr int kWatchMask = wxFSW_EVENT_CREATE | wxFSW_EVENT_DELETE | wxFSW_EVENT_RENAME | wxFSW_EVENT_MODIFY |
+			   wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR;
 
 #ifdef __WXOSX__
-// Returns true if `inner` is a strict descendant of `outer` (i.e. `inner`
-// lives inside `outer`'s subtree, not equal to it). Used on macOS to skip
-// shareddir_list entries whose ancestor is also in the list — wx FSEvents
-// rejects overlapping tree watches by silently returning false from a
+// Returns true if `inner` is a strict descendant of `outer` -- inside `outer`'s subtree, not
+// equal to it. Used on macOS to skip shareddir_list entries whose ancestor is also in the
+// list: wx FSEvents rejects overlapping tree watches by silently returning false from a
 // second AddTree() on a path already covered by an earlier stream.
-bool IsStrictlyInside(const CPath & inner, const CPath & outer)
+bool IsStrictlyInside(const CPath &inner, const CPath &outer)
 {
 	if (!inner.IsOk() || !outer.IsOk() || inner.IsSameDir(outer)) {
 		return false;
@@ -66,72 +64,79 @@
 
 } // namespace
 
-// Coalesce a burst of FS events into one Reload. 5 s is long enough to
-// merge the thousands of events a tar-extract produces, short enough for
-// a "drop a file into a shared folder" interaction to feel responsive.
-// macOS FSEvents debounces ~30 s on its own anyway, so on Mac the user-
-// perceived latency is bounded by FSEvents, not by this timer.
+// Coalesce a burst of FS events into one Reload. 5 s is long enough to merge the thousands
+// of events a tar-extract produces, short enough for a "drop a file into a shared folder"
+// interaction to feel responsive. macOS FSEvents debounces ~30 s on its own anyway, so on
+// Mac the user-perceived latency is bounded by FSEvents, not by this timer.
 static constexpr int kDebounceMs = 5000;
 
 // Timer IDs are wx-local; use ones not clashing with the prefs dialog.
-static const int ID_FSWATCHER_DEBOUNCE   = wxID_HIGHEST + 8231;
+static const int ID_FSWATCHER_DEBOUNCE = wxID_HIGHEST + 8231;
 #ifdef __APPLE__
-static const int ID_FSWATCHER_MAC_PUMP   = wxID_HIGHEST + 8232;
+static const int ID_FSWATCHER_MAC_PUMP = wxID_HIGHEST + 8232;
 
-// CFRunLoop pump cadence on macOS amuled. 200 ms keeps user-perceived
-// latency below the 5 s debounce window's resolution while costing only
-// ~5 non-blocking wakeups/second on the main thread.
+// CFRunLoop pump cadence on macOS amuled. 200 ms keeps user-perceived latency below the 5 s
+// debounce window's resolution while costing only ~5 non-blocking wakeups/second on the main
+// thread.
 static constexpr int kMacPumpMs = 200;
 #endif
 
 BEGIN_EVENT_TABLE(CSharedDirWatcher, wxEvtHandler)
-	EVT_FSWATCHER(wxID_ANY, CSharedDirWatcher::OnFileSystemEvent)
-	EVT_TIMER(ID_FSWATCHER_DEBOUNCE, CSharedDirWatcher::OnDebounceTimer)
+EVT_FSWATCHER(wxID_ANY, CSharedDirWatcher::OnFileSystemEvent)
+EVT_TIMER(ID_FSWATCHER_DEBOUNCE, CSharedDirWatcher::OnDebounceTimer)
 #ifdef __APPLE__
-	EVT_TIMER(ID_FSWATCHER_MAC_PUMP, CSharedDirWatcher::OnMacRunLoopPump)
+EVT_TIMER(ID_FSWATCHER_MAC_PUMP, CSharedDirWatcher::OnMacRunLoopPump)
 #endif
 END_EVENT_TABLE()
 
-
-CSharedDirWatcher::CSharedDirWatcher(CSharedFileList * parent) :
-	m_parent(parent),
-	m_watcher(NULL),
-	m_debounceTimer(this, ID_FSWATCHER_DEBOUNCE),
-	m_fallbackPending(false)
+CSharedDirWatcher::CSharedDirWatcher(CSharedFileList *parent)
+: m_parent(parent)
+, m_watcher(NULL)
+, m_debounceTimer(this, ID_FSWATCHER_DEBOUNCE)
 #ifdef __APPLE__
-	, m_macPumpTimer(this, ID_FSWATCHER_MAC_PUMP)
+, m_macPumpTimer(this, ID_FSWATCHER_MAC_PUMP)
 #endif
 {
 }
 
-
 CSharedDirWatcher::~CSharedDirWatcher()
 {
-	Disable();
+	StopTimers();
+	// Synchronous here, unlike Disable(): a CallAfter queued on a handler that is being
+	// destroyed is purged along with it, so a deferred delete would never run -- leaking the
+	// watcher along with its inotify fd and the event loop source wx registered for it.
+	//
+	// This can run from inside a dispatch: the macOS daemon build calls OnExit() straight out of
+	// OnCoreTimer. It is safe there for reasons that do not generalise -- macOS watches through
+	// FSEvents/CFRunLoop rather than a wxFDIOHandler, so there is no epoll source to dangle, and
+	// the call is followed by _exit(0). Treat it as that exception, not as a guarantee.
+	//
+	// Detach before the delete, for the reason spelled out in Disable():
+	// ~wxFileSystemWatcherBase runs RemoveAll(), which can emit a synchronous
+	// wxFSW_EVENT_WARNING against the object under destruction.
+	if (m_watcher) {
+		m_watcher->SetOwner(nullptr);
+	}
+	delete m_watcher;
+	ReapPendingWatchers();
 }
 
-
 void CSharedDirWatcher::Enable()
 {
 	if (m_watcher) {
 		return;
 	}
 
-	// wx 3.2.x's inotify backend hard-requires an active wx event loop
-	// when wxFileSystemWatcher's ctor runs — Init() checks
-	// wxEventLoopBase::GetActive() and silently leaves m_service null
-	// when there isn't one, after which every Add() returns false. The
-	// daemon's CamuleApp::OnInit() runs before the event loop starts, so
-	// the first Enable() call from there must be deferred. (FSEvents on
-	// macOS and ReadDirectoryChangesW on Windows don't have this gate;
-	// deferring is still safe there.) Subsequent calls from the prefs
-	// dialog or EC apply path already run inside an active loop, so they
-	// take the immediate branch.
+	// wx 3.2.x's inotify backend hard-requires an active wx event loop when
+	// wxFileSystemWatcher's ctor runs -- Init() checks wxEventLoopBase::GetActive() and silently
+	// leaves m_service null when there is none, after which every Add() returns false. The
+	// daemon's OnInit() runs before the event loop starts, so the first Enable() call from there
+	// must be deferred. Later calls from the prefs dialog or the EC apply path already run
+	// inside an active loop and take the immediate branch.
 	if (!wxEventLoopBase::GetActive()) {
-		// Queue on `this` (a wxEvtHandler) rather than the app, so that
-		// if Disable()/~CSharedDirWatcher() runs before the loop drains,
-		// wx purges the pending event with the handler instead of firing
-		// it against a dead object.
+		// Queue on `this` (a wxEvtHandler) rather than the app, so that if Disable() or the
+		// destructor runs before the loop drains, wx purges the pending event with the handler
+		// instead of firing it against a dead object.
 		CallAfter(&CSharedDirWatcher::Enable);
 		return;
 	}
@@ -139,19 +144,16 @@
 	m_watcher = new wxFileSystemWatcher();
 	m_watcher->SetOwner(this);
 	RegisterAllPaths();
-	// First-enable also needs the cold-discovery pass; otherwise
-	// subdirs that grew while the daemon was offline are never seen
-	// until Reload() fires Refresh() (which happens only when
+	// First-enable also needs the cold-discovery pass; otherwise subdirs that grew while the
+	// daemon was offline are never seen until Reload() fires Refresh() (which happens only when
 	// shareddir_list itself changes -- not at startup).
 	ColdDiscoverSubdirs();
 
 #ifdef __APPLE__
-	// wx's FSEvents wrapper schedules its stream on the thread's
-	// CFRunLoop at AddTree() time. aMule.app has a real Cocoa event
-	// loop that pumps that runloop, so callbacks deliver normally.
-	// amuled (wxAppConsole) does not — its event loop never spins
-	// CFRunLoop, so events would queue forever. Start a periodic
-	// non-blocking pump only in that case.
+	// wx's FSEvents wrapper schedules its stream on the thread's CFRunLoop at AddTree() time.
+	// aMule.app has a real Cocoa event loop that pumps that runloop, so callbacks deliver
+	// normally. amuled (wxAppConsole) does not -- its event loop never spins CFRunLoop, so
+	// events would queue forever. Start a periodic non-blocking pump only in that case.
 	if (wxTheApp && !wxTheApp->IsGUI()) {
 		m_macPumpTimer.Start(kMacPumpMs, wxTIMER_CONTINUOUS);
 	}
@@ -160,8 +162,7 @@
 	AddDebugLogLineN(logKnownFiles, "Shared-dir watcher enabled");
 }
 
-
-void CSharedDirWatcher::Disable()
+void CSharedDirWatcher::StopTimers()
 {
 	if (m_debounceTimer.IsRunning()) {
 		m_debounceTimer.Stop();
@@ -171,52 +172,76 @@
 		m_macPumpTimer.Stop();
 	}
 #endif
+}
+
+void CSharedDirWatcher::ReapPendingWatchers()
+{
+	// Walk a local copy: ~wxFileSystemWatcher can re-enter this object through wx (see
+	// Disable()), and a Disable() reached from there would push_back into the vector being
+	// iterated.
+	std::vector<wxFileSystemWatcher *> doomed;
+	doomed.swap(m_pendingDelete);
+	for (wxFileSystemWatcher *w : doomed) {
+		delete w;
+	}
+}
+
+void CSharedDirWatcher::Disable()
+{
+	StopTimers();
 	if (!m_watcher) {
 		return;
 	}
-	delete m_watcher;
+	// Detach now, destroy from the pending-event queue. ~wxFileSystemWatcher frees the
+	// wxFDIOEventLoopSourceHandler wx registered for its inotify fd, and
+	// wxEpollDispatcher::Dispatch walks a stack snapshot of the ready events without re-checking
+	// a handler -- so freeing one from inside that loop leaves it calling OnReadWaiting() on
+	// freed memory the moment the same batch reaches this fd.
+	//
+	// No caller reaches here from inside that loop today: Disable() comes from the destructor,
+	// the prefs dialog, the guarded call in CamuleApp::OnInit, and CEC_Prefs_Packet::Apply(),
+	// which the EC layer reaches through a queued wx event -- the phase drained BEFORE Dispatch.
+	// But fs-watcher events themselves are delivered from inside the loop, so one caller reached
+	// from OnFileSystemEvent would make this fatal. Deferring costs nothing.
+	//
+	// Drop the owner as part of the detach: a detached watcher outlives the call, and
+	// SetOwner(nullptr) points its owner back at itself, where nothing is bound, so everything
+	// it still emits goes nowhere.
+	m_watcher->SetOwner(nullptr);
+	m_pendingDelete.push_back(m_watcher);
 	m_watcher = NULL;
+	CallAfter(&CSharedDirWatcher::ReapPendingWatchers);
 	AddDebugLogLineN(logKnownFiles, "Shared-dir watcher disabled");
 }
 
-
 void CSharedDirWatcher::Refresh()
 {
 	if (!m_watcher) {
 		return;
 	}
-	// wxFileSystemWatcher::RemoveAll() drops every registration; we then
-	// re-Add everything from the current (possibly updated) shareddir_list.
-	// This is simpler than diffing old vs new path sets and is cheap given
-	// the typical list size (low hundreds at most).
+	// wxFileSystemWatcher::RemoveAll() drops every registration; we then re-Add everything from
+	// the current (possibly updated) shareddir_list. This is simpler than diffing old vs new
+	// path sets and is cheap given the typical list size (low hundreds at most).
 	m_watcher->RemoveAll();
 	RegisterAllPaths();
-	// Cold-discovery is one-shot at Enable() only. Re-running it from
-	// Refresh() risks adding duplicate entries when a runtime
-	// RegisterNewSubdirectory wrote a path in one canonical form
-	// (e.g. macOS-resolved "/private/tmp/...") while the disk walk
-	// later produces the unresolved form ("/tmp/...") -- both go in
-	// as distinct strings. Startup is the only moment we genuinely
-	// have to walk to catch up; runtime new-dirs are covered by
-	// RegisterNewSubdirectory from OnFileSystemEvent.
+	// Cold-discovery is one-shot at Enable() only. Re-running it from Refresh() risks adding
+	// duplicate entries when a runtime RegisterNewSubdirectory wrote a path in one canonical
+	// form (a macOS-resolved "/private/tmp/...") while the disk walk later produces the
+	// unresolved form -- both go in as distinct strings. Startup is the only moment a walk is
+	// genuinely needed.
 }
 
-
 void CSharedDirWatcher::RegisterAllPaths()
 {
-	// Build the effective watch list by mirroring what
-	// CSharedFileList::Reload() treats as shared (SharedFileList.cpp ~L370):
-	//   1) the global Incoming dir,
-	//   2) every category's Incoming dir,
-	//   3) the explicit shareddir_list.
-	// Without (1) and (2) the watcher misses new files dropped into
-	// Incoming -- a completed download notifies the scanner directly,
-	// but a file copied into Incoming manually (or by another tool)
-	// is only picked up the next time some unrelated CREATE event
-	// fires elsewhere in the shared tree (#741).
+	// Build the effective watch list by mirroring what CSharedFileList::Reload() treats as
+	// shared (SharedFileList.cpp ~L370): the global Incoming dir, every category's Incoming dir,
+	// and the explicit shareddir_list. Without the first two the watcher misses new files
+	// dropped into Incoming -- a completed download notifies the scanner directly, but a file
+	// copied into Incoming manually (or by another tool) is only picked up the next time some
+	// unrelated CREATE event fires elsewhere in the shared tree (#741).
 	thePrefs::PathList shared = theApp->glob_prefs->shareddir_list;
 
-	auto append_unique = &(const CPath & extra) {
+	auto append_unique = &(const CPath &extra) {
 		if (!extra.IsOk()) {
 			return;
 		}
@@ -235,19 +260,17 @@
 	}
 
 #ifdef __WXOSX__
-	// macOS: route through AddTree() which uses FSEvents (kernel-level
-	// recursive watch). wx 3.3.2's bare Add() falls through to the kqueue
-	// base and returns false on otherwise-openable directories — verified
-	// against wx upstream and reproduced locally. AddTree() is also the
-	// API Apple recommends for directory monitoring, so this is the
-	// preferred path even once the kqueue bug is fixed.
+	// macOS: route through AddTree(), which uses FSEvents (kernel-level recursive watch). wx
+	// 3.3.2's bare Add() falls through to the kqueue base and returns false on otherwise-openable
+	// directories -- verified against wx upstream and reproduced locally. AddTree() is also the
+	// API Apple recommends for directory monitoring, so this is the preferred path even once the
+	// kqueue bug is fixed.
 	//
-	// AddTree() is recursive, so an entry whose ancestor is also in
-	// shareddir_list would create overlapping streams; wx FSEvents
-	// rejects the second AddTree() on the inner path. Pre-prune
+	// AddTree() is recursive, so an entry whose ancestor is also in shareddir_list would create
+	// overlapping streams; wx FSEvents rejects the second AddTree() on the inner path. Pre-prune
 	// descendants here so we only AddTree() each top-level entry.
 	for (size_t i = 0; i < shared.size(); ++i) {
-		const CPath & p = sharedi;
+		const CPath &p = sharedi;
 		if (!p.IsOk() || !p.DirExists()) {
 			continue;
 		}
@@ -268,85 +291,81 @@
 		}
 	}
 #else
-	// Linux (inotify), BSD (kqueue), Windows (ReadDirectoryChangesW):
-	// per-dir Add(). shareddir_list already enumerates every subdirectory
-	// individually when the user uses the recursive-share button, so
-	// inotify watch count tracks shareddir_list.size() rather than total
-	// subtree depth.
+	// Linux (inotify), BSD (kqueue), Windows (ReadDirectoryChangesW): per-dir Add().
+	// shareddir_list already enumerates every subdirectory individually when the user uses the
+	// recursive-share button, so the inotify watch count tracks shareddir_list.size() rather
+	// than total subtree depth.
 	for (size_t i = 0; i < shared.size(); ++i) {
-		const CPath & p = sharedi;
+		const CPath &p = sharedi;
 		if (!p.IsOk() || !p.DirExists()) {
 			continue;
 		}
 		wxFileName fn = wxFileName::DirName(p.GetRaw());
 		if (!m_watcher->Add(fn, kWatchMask)) {
-			// Most likely cause on Linux is hitting
-			// /proc/sys/fs/inotify/max_user_watches. Log and continue —
-			// partial coverage is better than zero coverage.
-			AddDebugLogLineC(logKnownFiles,
-				CFormat("Shared-dir watcher: failed to add %s") % p.GetRaw());
+			// Most likely cause on Linux is hitting /proc/sys/fs/inotify/max_user_watches.
+			// Log and continue -- partial coverage is better than zero coverage.
+			AddDebugLogLineC(
+				logKnownFiles, CFormat("Shared-dir watcher: failed to add %s") % p.GetRaw());
 		}
 	}
 #endif
 }
 
-
-void CSharedDirWatcher::OnFileSystemEvent(wxFileSystemWatcherEvent & event)
+void CSharedDirWatcher::OnFileSystemEvent(wxFileSystemWatcherEvent &event)
 {
+	// Nothing to act on with no live watcher. Disable() drops the doomed watcher's owner, so
+	// nothing it emits afterwards gets here; what this catches is an event a backend had
+	// *queued* to us before that, which the MSW one does (wxFSWatcherImplMSW::SendEvent
+	// wxQueueEvent()s from its worker thread). Acting on it would re-arm the debounce timer
+	// StopTimers() just stopped, and a directory CREATE would reach RegisterNewSubdirectory and
+	// persist a shareddir_list change -- SaveSharedFolders() and all -- after the user turned
+	// auto-rescan off.
+	if (!m_watcher) {
+		return;
+	}
+
 	const int changeType = event.GetChangeType();
-	const wxFileName & path = event.GetPath();
+	const wxFileName &path = event.GetPath();
 
 	AddDebugLogLineN(logKnownFiles,
-		CFormat("Shared-dir watcher: event 0x%x on '%s'")
-			% changeType % path.GetFullPath());
-
-	// Watcher-backend overflow / drop signal. inotify reports
-	// IN_Q_OVERFLOW when its per-instance queue exhausts (typical
-	// cause: a multi-million-file `cp -r` into a watched tree),
-	// kqueue can drop on rapid rename storms, and Windows
-	// ReadDirectoryChangesW reports buffer exhaust the same way. In
-	// all three cases the watcher's incremental view of the tree is
-	// now stale, so we have to fall back to a full bulk Reload().
-	// This is the only path that re-walks every shared dir on a
-	// huge shareset (#745); rare in normal operation.
+		CFormat("Shared-dir watcher: event 0x%x on '%s'") % changeType % path.GetFullPath());
+
+	// Watcher-backend overflow / drop signal. inotify reports IN_Q_OVERFLOW when its
+	// per-instance queue exhausts (typical cause: a multi-million-file `cp -r` into a watched
+	// tree), kqueue can drop on rapid rename storms, and Windows ReadDirectoryChangesW reports
+	// buffer exhaust the same way. In all three cases the watcher's incremental view of the tree
+	// is now stale, so fall back to a full bulk Reload(). This is the only path that re-walks
+	// every shared dir on a huge shareset (#745); rare in normal operation.
 	if (changeType & (wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR)) {
-		AddLogLineC(CFormat(
-			_("Shared-dir watcher: backend overflow/error (%s); "
-			  "falling back to full reload"))
-				% (event.GetErrorDescription().IsEmpty()
-					? wxString("unspecified")
-					: event.GetErrorDescription()));
-		m_fallbackPending = true;
+		AddLogLineC(CFormat(_("Shared-dir watcher: backend overflow/error (%s); "
+				      "falling back to full reload")) %
+			    (event.GetErrorDescription().IsEmpty() ? wxString("unspecified")
+								   : event.GetErrorDescription()));
+		m_resyncReason = ResyncDroppedEvents;
 		ScheduleProcessing();
 		return;
 	}
 
-	// Auto-share new subdirectories of any watched path. A user who has
-	// already shared /Music gets new subdirs of /Music auto-included
-	// without having to revisit the prefs dialog. Existing subdirs that
-	// were originally excluded (non-recursive share) are not
-	// retroactively scanned — only newly-created ones get added.
+	// Auto-share new subdirectories of any watched path. A user who has already shared /Music
+	// gets new subdirs of /Music auto-included without having to revisit the prefs dialog.
+	// Existing subdirs that were originally excluded (non-recursive share) are not
+	// retroactively scanned -- only newly-created ones get added.
 	//
-	// Early-return after registration: a directory CREATE is fully
-	// handled inside RegisterNewSubdirectory (add to shareddir_list,
-	// install a watch, race-scan the contents). Falling through to the
-	// file-add accumulator below would enqueue the directory path as if
-	// it were a file, and AddPathToShares's FileExists() check would
-	// reject it with a misleading "Shared file does not exist (possibly
-	// a broken link)" debug line on every new subdir.
+	// Early-return after registration: a directory CREATE is fully handled inside
+	// RegisterNewSubdirectory (add to shareddir_list, install a watch, race-scan the contents).
+	// Falling through to the file-add accumulator below would enqueue the directory path as if
+	// it were a file, and AddPathToShares's FileExists() check would reject it with a misleading
+	// "Shared file does not exist (possibly a broken link)" debug line on every new subdir.
 	//
-	// Use wxDirExists(GetFullPath()) — NOT the path.DirExists() instance
-	// method — because wxFileName::DirExists() checks GetPath() (the
-	// parent directory portion) for its truthiness, not the full path.
-	// Calling .DirExists() on a wxFileName built from
-	// /tv/Season 9/Episode.mkv returns true whenever /tv/Season 9 exists,
-	// which it always does inside a watched share. Without the static
-	// overload, every FILE CREATE would route through
-	// RegisterNewSubdirectory (which then no-ops on its own CPath
-	// directory check) and the early return below would suppress slot
-	// accumulation entirely — meaning no file ever reaches NotifyPathAdded.
-	if ((changeType & wxFSW_EVENT_CREATE) && path.IsOk() &&
-		wxFileName::DirExists(path.GetFullPath())) {
+	// Use wxDirExists(GetFullPath()), NOT the path.DirExists() instance method, because
+	// wxFileName::DirExists() checks GetPath() (the parent directory portion) for its
+	// truthiness, not the full path. Calling .DirExists() on a wxFileName built from
+	// /tv/Season 9/Episode.mkv returns true whenever /tv/Season 9 exists, which it always does
+	// inside a watched share. Without the static overload, every FILE CREATE would route through
+	// RegisterNewSubdirectory (which then no-ops on its own CPath directory check) and the early
+	// return below would suppress slot accumulation entirely -- meaning no file ever reaches
+	// NotifyPathAdded.
+	if ((changeType & wxFSW_EVENT_CREATE) && path.IsOk() && wxFileName::DirExists(path.GetFullPath())) {
 		RegisterNewSubdirectory(path.GetFullPath());
 		return;
 	}
@@ -358,13 +377,13 @@
 		return;
 	}
 
-	const int interesting = changeType & (wxFSW_EVENT_CREATE | wxFSW_EVENT_DELETE |
-		wxFSW_EVENT_RENAME | wxFSW_EVENT_MODIFY);
+	const int interesting = changeType & (wxFSW_EVENT_CREATE | wxFSW_EVENT_DELETE | wxFSW_EVENT_RENAME |
+						     wxFSW_EVENT_MODIFY);
 	if (!interesting) {
 		return;
 	}
 
-	PendingPathEvents & slot = m_pendingEventsrawPath;
+	PendingPathEvents &slot = m_pendingEventsrawPath;
 	slot.flags |= interesting;
 	if (changeType & wxFSW_EVENT_RENAME) {
 		slot.renamedTo = event.GetNewPath().GetFullPath();
@@ -373,27 +392,24 @@
 	ScheduleProcessing();
 }
 
-
-void CSharedDirWatcher::RegisterNewSubdirectory(const wxString & path)
+void CSharedDirWatcher::RegisterNewSubdirectory(const wxString &path)
 {
 	CPath p(path);
 	if (!p.IsOk() || !p.DirExists()) {
 		return;
 	}
 
-	// Only auto-add when an ancestor is in the user's recursive set
-	// (shareddir-recursive.dat). Non-recursive shares are now strict
-	// -- a new subdir under /Music does NOT get auto-shared unless
-	// /Music (or some ancestor of it) was marked recursive via the
-	// UI. This protects desktop users with sensitive nested folders
-	// from silent recursion.
+	// Only auto-add when an ancestor is in the user's recursive set (shareddir-recursive.dat).
+	// Non-recursive shares are now strict -- a new subdir under /Music does NOT get auto-shared
+	// unless /Music (or some ancestor of it) was marked recursive via the UI. This protects
+	// desktop users with sensitive nested folders from silent recursion.
 	if (!theApp->glob_prefs->IsRecursiveAncestor(p)) {
 		return;
 	}
 
-	// Skip if already on the list (defensive — duplicate inotify
+	// Skip if already on the list (defensive -- duplicate inotify
 	// events for the same mkdir are possible).
-	thePrefs::PathList & shared = theApp->glob_prefs->shareddir_list;
+	thePrefs::PathList &shared = theApp->glob_prefs->shareddir_list;
 	for (size_t i = 0; i < shared.size(); ++i) {
 		if (sharedi.IsSameDir(p)) {
 			return;
@@ -403,9 +419,9 @@
 	shared.push_back(p);
 
 #ifndef __WXOSX__
-	// Linux/BSD/Windows: explicitly register the new subdir so events
-	// for its own contents are observed. On macOS the enclosing tree's
-	// FSEvents stream already covers descendants, so nothing to add.
+	// Linux/BSD/Windows: explicitly register the new subdir so events for its own contents are
+	// observed. On macOS the enclosing tree's FSEvents stream already covers descendants, so
+	// there is nothing to add.
 	if (m_watcher) {
 		wxFileName fn = wxFileName::DirName(path);
 		if (!m_watcher->Add(fn, kWatchMask)) {
@@ -415,31 +431,85 @@
 	}
 #endif
 
-	AddDebugLogLineN(logKnownFiles,
-		CFormat("Shared-dir watcher: auto-shared new subdir %s") % path);
+	AddDebugLogLineN(logKnownFiles, CFormat("Shared-dir watcher: auto-shared new subdir %s") % path);
 
 	// Persist the new entry so the change survives a restart.
 	theApp->glob_prefs->SaveSharedFolders();
 
-	// Close the inotify race window. Between the kernel mkdir() that
-	// fired this CREATE event and our wxFileSystemWatcher::Add() above,
-	// any file or subdir created inside `path` fires on a watch that
-	// doesn't exist yet, so the event is silently dropped. Common with
-	// tools that batch a mkdir + a content-drop within microseconds
-	// (Sonarr "mkdir /tv/$show; symlink $episode" being the canonical
-	// case). Walk the new dir now and feed any pre-existing entries
-	// through the same NotifyPathAdded / RegisterNewSubdirectory
-	// pipeline they would have gone through if events had been
-	// observed. Idempotent: NotifyPathAdded short-circuits on the
-	// shared-file path index if the file is already known (covers
-	// macOS, where FSEvents may still deliver the same events later),
-	// and RegisterNewSubdirectory short-circuits on the shareddir_list
-	// dedup check.
+	// Close the inotify race window. Between the kernel mkdir() that fired this CREATE event and
+	// our wxFileSystemWatcher::Add() above, any file or subdir created inside `path` fires on a
+	// watch that does not exist yet, so the event is silently dropped. Common with tools that
+	// batch a mkdir + a content-drop within microseconds (Sonarr "mkdir /tv/$show; symlink
+	// $episode" being the canonical case). Walk the new dir now and feed any pre-existing
+	// entries through the same NotifyPathAdded / RegisterNewSubdirectory pipeline they would
+	// have gone through if events had been observed. Idempotent: NotifyPathAdded short-circuits
+	// on the shared-file path index if the file is already known (covers macOS, where FSEvents
+	// may still deliver the same events later), and RegisterNewSubdirectory short-circuits on
+	// the shareddir_list dedup check.
 	ScanNewSubdirRace(p);
 }
 
+bool CSharedDirWatcher::IsInSharedSet(const wxString &path) const
+{
+	CPath p(path);
+	if (!p.IsOk()) {
+		return false;
+	}
+	const thePrefs::PathList &shared = theApp->glob_prefs->shareddir_list;
+	for (size_t i = 0; i < shared.size(); ++i) {
+		if (sharedi.IsSameDir(p)) {
+			return true;
+		}
+	}
+	return false;
+}
 
-void CSharedDirWatcher::ScanNewSubdirRace(const CPath & parent)
+bool CSharedDirWatcher::HandleDirRemoved(const wxString &path)
+{
+	// Detach the vanished dir's subtree (NotifyPathRemoved is per-file only).
+	m_parent->NotifyDirRemoved(path);
+
+	// Drop it from the runtime union so scans stop chasing a dead path. Leave the user's
+	// explicit/recursive config alone -- the union is recomputed from it on reload anyway.
+	bool removed = false;
+	CPath gone(path);
+	if (gone.IsOk()) {
+		thePrefs::PathList &shared = theApp->glob_prefs->shareddir_list;
+		for (size_t i = 0; i < shared.size(); ++i) {
+			if (sharedi.IsSameDir(gone)) {
+				shared.erase(shared.begin() + i);
+				removed = true;
+				AddDebugLogLineN(logKnownFiles,
+					CFormat("Shared-dir watcher: dropped '%s' from shared set "
+						"(directory removed)") %
+						path);
+				break;
+			}
+		}
+	}
+
+#ifndef __WXOSX__
+	// Remove its per-subdir watch (macOS covers the whole tree via FSEvents). Only if wx still
+	// tracks it: when a directory vanishes the OS drops the inotify watch on its own (a
+	// cross-filesystem move is a delete, firing IN_IGNORED), so the path is no longer in the
+	// watcher's map. Calling Remove() on an untracked path trips wx's `it != m_watches.end()`
+	// assertion and aborts amuled (issue #458). A same-filesystem rename keeps the inode watch
+	// under the old key, so the guarded Remove() still cleans that up. GetWatchedPaths() reports
+	// the exact key Remove() looks up.
+	if (removed && m_watcher) {
+		const wxFileName dir = wxFileName::DirName(path);
+		wxArrayString watched;
+		m_watcher->GetWatchedPaths(&watched);
+		if (watched.Index(dir.GetFullPath()) != wxNOT_FOUND) {
+			m_watcher->Remove(dir);
+		}
+	}
+#endif
+
+	return removed;
+}
+
+void CSharedDirWatcher::ScanNewSubdirRace(const CPath &parent)
 {
 	if (!parent.IsOk() || !parent.DirExists()) {
 		return;
@@ -447,82 +517,71 @@
 
 	const int dirFlags = thePrefs::FollowSymlinksInShares() ? 0 : wxDIR_NO_FOLLOW;
 
-	// Files first: each is routed through NotifyPathAdded, which dedups
-	// against the shared-file path index and queues a CHashingTask for
-	// genuinely new entries.
+	// Files first: each is routed through NotifyPathAdded, which dedups against the shared-file
+	// path index and queues a CHashingTask for genuinely new entries.
 	{
 		CDirIterator files(parent);
-		for (CPath f = files.GetFirstFile(CDirIterator::File, wxEmptyString, dirFlags);
-			f.IsOk();
-			f = files.GetNextFile())
-		{
+		for (CPath f = files.GetFirstFile(CDirIterator::File, wxEmptyString, dirFlags); f.IsOk();
+			f = files.GetNextFile()) {
 			CPath fullFile = parent.JoinPaths(f);
-			m_parent->NotifyPathAdded(fullFile.GetRaw());
+			// bulkScan: this is a whole-tree walk, so an already-known file is
+			// counted into one summary rather than announced per file.
+			m_parent->NotifyPathAdded(fullFile.GetRaw(), /*bulkScan=*/true);
 		}
 	}
 
-	// Subdirs: recurse via RegisterNewSubdirectory so each gets added
-	// to shareddir_list, picks up its own watch on Linux/BSD/Windows,
-	// and runs its own race-scan. Handles arbitrary nesting created
-	// inside the original race window (e.g. mkdir /tv/show; mkdir
+	// Subdirs: recurse via RegisterNewSubdirectory so each gets added to shareddir_list, picks
+	// up its own watch on Linux/BSD/Windows, and runs its own race-scan. Handles arbitrary
+	// nesting created inside the original race window (e.g. mkdir /tv/show; mkdir
 	// /tv/show/season; ln -s /downloads/ep /tv/show/season/ep.mkv).
 	{
 		CDirIterator subdirs(parent);
-		for (CPath sub = subdirs.GetFirstFile(CDirIterator::Dir, wxEmptyString, dirFlags);
-			sub.IsOk();
-			sub = subdirs.GetNextFile())
-		{
+		for (CPath sub = subdirs.GetFirstFile(CDirIterator::Dir, wxEmptyString, dirFlags); sub.IsOk();
+			sub = subdirs.GetNextFile()) {
 			CPath fullSub = parent.JoinPaths(sub);
 			RegisterNewSubdirectory(fullSub.GetRaw());
 		}
 	}
 }
 
-
 void CSharedDirWatcher::ColdDiscoverSubdirs()
 {
 	if (!m_watcher) {
 		return;
 	}
 
-	thePrefs::PathList & shared = theApp->glob_prefs->shareddir_list;
+	thePrefs::PathList &shared = theApp->glob_prefs->shareddir_list;
 	if (shared.empty()) {
 		return;
 	}
 
-	// Walk only the user's recursive roots, not every shared dir.
-	// Non-recursive (explicit) shares are strict: their pre-existing
-	// subdirs do NOT get auto-included. Same policy as the HOT path
-	// (RegisterNewSubdirectory) -- both auto-add behaviours gate on
-	// IsRecursiveAncestor.
-	const thePrefs::PathList & roots =
-		theApp->glob_prefs->shareddir_recursive_list;
+	// Walk only the user's recursive roots, not every shared dir. Non-recursive (explicit)
+	// shares are strict: their pre-existing subdirs do NOT get auto-included. Same policy as the
+	// HOT path (RegisterNewSubdirectory) -- both auto-add behaviours gate on IsRecursiveAncestor.
+	const thePrefs::PathList &roots = theApp->glob_prefs->shareddir_recursive_list;
 	if (roots.empty()) {
 		return;
 	}
 
-	// Membership index over the current list: avoids O(N*M) string
-	// comparisons when M (newly-discovered subdirs) is large. Keys are
-	// raw path strings -- matches the comparison RegisterNewSubdirectory
-	// uses for its own dedup check, just lifted into a set.
-	// std::set rather than unordered_set: wxString has operator< but
-	// no stdlib std::hash specialization, and N here is at most a
-	// few thousand even on heavy users -- log-N membership is fine.
+	// Membership index over the current list: avoids O(N*M) string comparisons when M
+	// (newly-discovered subdirs) is large. Keys are raw path strings -- matches the comparison
+	// RegisterNewSubdirectory uses for its own dedup check, just lifted into a set. std::set
+	// rather than unordered_set: wxString has operator< but no stdlib std::hash specialization,
+	// and N here is at most a few thousand even on heavy users, so log-N membership is fine.
 	std::set<wxString> known;
 	for (size_t i = 0; i < shared.size(); ++i) {
 		known.insert(sharedi.GetRaw());
 	}
 
-	// Discovered new subdirs go here; we add them in bulk after the
-	// walk so a single SaveSharedFolders() flushes the whole batch
-	// rather than rewriting shareddir.dat once per discovery.
+	// Discovered new subdirs go here; they are added in bulk after the walk so a single
+	// SaveSharedFolders() flushes the whole batch rather than rewriting shareddir.dat once per
+	// discovery.
 	std::vector<CPath> discovered;
 
-	// Walk each recursive root's subtree. CSharedFileList's Reload
-	// already handled the root itself; this surfaces previously-
-	// uncovered descendants only.
+	// Walk each recursive root's subtree. CSharedFileList's Reload already handled the root
+	// itself; this surfaces previously-uncovered descendants only.
 	for (size_t i = 0; i < roots.size(); ++i) {
-		const CPath & root = rootsi;
+		const CPath &root = rootsi;
 		if (!root.IsOk() || !root.DirExists()) {
 			continue;
 		}
@@ -534,69 +593,67 @@
 	}
 
 	for (size_t i = 0; i < discovered.size(); ++i) {
-		const CPath & sub = discoveredi;
+		const CPath &sub = discoveredi;
 		shared.push_back(sub);
 #ifndef __WXOSX__
-		// On Linux/BSD/Windows the inotify/kqueue/RDCW backends need
-		// each subdir registered explicitly. macOS's FSEvents stream
-		// from the enclosing AddTree() already covers descendants.
+		// On Linux/BSD/Windows the inotify/kqueue/RDCW backends need each subdir registered
+		// explicitly. macOS's FSEvents stream from the enclosing AddTree() already covers
+		// descendants.
 		wxFileName fn = wxFileName::DirName(sub.GetRaw());
 		if (!m_watcher->Add(fn, kWatchMask)) {
 			AddDebugLogLineC(logKnownFiles,
-				CFormat("Shared-dir watcher: failed to add cold-discovered %s")
-					% sub.GetRaw());
+				CFormat("Shared-dir watcher: failed to add cold-discovered %s") %
+					sub.GetRaw());
 		}
 #endif
 		AddDebugLogLineN(logKnownFiles,
-			CFormat("Shared-dir watcher: cold-discovered subdir %s")
-				% sub.GetRaw());
+			CFormat("Shared-dir watcher: cold-discovered subdir %s") % sub.GetRaw());
 	}
 
 	AddDebugLogLineN(logKnownFiles,
-		CFormat("Shared-dir watcher: cold discovery added %u subdir(s)")
-			% (unsigned)discovered.size());
+		CFormat("Shared-dir watcher: cold discovery added %u subdir(s)") %
+			(unsigned)discovered.size());
 
 	// Single rewrite of shareddir.dat for the whole batch.
 	theApp->glob_prefs->SaveSharedFolders();
 
-	// The initial share-scan already ran (amule.cpp invokes Reload
-	// before EnableDirectoryWatcher), so the in-memory shared file
-	// list doesn't yet reflect the newly-discovered subdirs. We
-	// can't enumerate them via per-file events (they happened while
-	// the watcher was offline), so route through the fallback path:
-	// FlushPendingEvents will see m_fallbackPending and call the
-	// bulk Reload() once the debounce fires.
-	m_fallbackPending = true;
+	// The initial share-scan already ran (amule.cpp invokes Reload before
+	// EnableDirectoryWatcher), so the in-memory shared file list does not yet reflect the
+	// newly-discovered subdirs. They cannot be enumerated via per-file events (those happened
+	// while the watcher was offline), so route through the fallback path: FlushPendingEvents
+	// sees m_resyncReason and calls the bulk Reload() once the debounce fires.
+	//
+	// Never downgrade a pending fault: if the backend already reported dropped events, that is
+	// the more serious reason and must keep its critical message. Enable() can run again while a
+	// resync is still owed (toggling the auto-rescan preference, for one), which is how the two
+	// could meet.
+	if (m_resyncReason == ResyncNone) {
+		m_resyncReason = ResyncColdDiscovery;
+	}
+	m_coldDiscoveredDirs = static_cast<unsigned>(discovered.size());
 	ScheduleProcessing();
 }
 
-
 void CSharedDirWatcher::WalkForUnknownSubdirs(
-	const CPath & root,
-	std::set<wxString> & known,
-	std::vector<CPath> & out)
+	const CPath &root, std::set<wxString> &known, std::vector<CPath> &out)
 {
 	const int extraFlags = thePrefs::FollowSymlinksInShares() ? 0 : wxDIR_NO_FOLLOW;
 	CDirIterator dir(root);
-	for (CPath sub = dir.GetFirstFile(CDirIterator::Dir, wxEmptyString, extraFlags);
-		sub.IsOk();
-		sub = dir.GetNextFile())
-	{
+	for (CPath sub = dir.GetFirstFile(CDirIterator::Dir, wxEmptyString, extraFlags); sub.IsOk();
+		sub = dir.GetNextFile()) {
 		CPath full = root.JoinPaths(sub);
 		const wxString key = full.GetRaw();
 		if (known.find(key) == known.end()) {
 			known.insert(key);
 			out.push_back(full);
 		}
-		// Always recurse: known subdirs may themselves contain
-		// unknown grandchildren, and we want a single Refresh() to
-		// pick up the whole offline-created tree, not just the top
-		// layer of new dirs.
+		// Always recurse: known subdirs may themselves contain unknown grandchildren, and a single
+		// Refresh() should pick up the whole offline-created tree, not just the top layer of new
+		// dirs.
 		WalkForUnknownSubdirs(full, known, out);
 	}
 }
 
-
 void CSharedDirWatcher::ScheduleProcessing()
 {
 	// Restart the timer on every event, so a burst of N events within
@@ -604,27 +661,38 @@
 	m_debounceTimer.Start(kDebounceMs, wxTIMER_ONE_SHOT);
 }
 
-
-void CSharedDirWatcher::OnDebounceTimer(wxTimerEvent & WXUNUSED(event))
+void CSharedDirWatcher::OnDebounceTimer(wxTimerEvent &WXUNUSED(event))
 {
 	FlushPendingEvents();
 }
 
-
 void CSharedDirWatcher::FlushPendingEvents()
 {
-	// Fallback path: the watcher backend signalled it dropped events
-	// since the last flush. We can't trust the per-path deltas in
-	// m_pendingEvents because some events may never have been
-	// delivered. Drop the queue and fall back to a full Reload, which
-	// re-syncs everything from scratch at the cost of one expensive
-	// re-walk. Log at error level so the user sees it.
-	if (m_fallbackPending) {
-		AddLogLineC(_("Shared-dir watcher: events dropped by backend, "
-			"forcing a full shared-files reload to resync"));
+	// Fallback path: the watcher backend signalled it dropped events since the last flush. The
+	// per-path deltas in m_pendingEvents cannot be trusted, because some events may never have
+	// been delivered. Drop the queue and fall back to a full Reload, which re-syncs everything
+	// from scratch at the cost of one expensive re-walk. Log at error level so the user sees it.
+	if (m_resyncReason != ResyncNone) {
+		if (m_resyncReason == ResyncColdDiscovery) {
+			// Routine, not a fault: directories appeared while aMule was off. Reported at info
+			// level and saying what actually happened, so the extra share rescan right after
+			// startup has a stated reason instead of looking like an unexplained second scan.
+			AddLogLineN(CFormat(wxPLURAL("Shared-dir watcher: %u new subdirectory found "
+						     "since last run, rescanning shares",
+					    "Shared-dir watcher: %u new subdirectories found "
+					    "since last run, rescanning shares",
+					    m_coldDiscoveredDirs)) %
+				    m_coldDiscoveredDirs);
+		} else {
+			AddLogLineC(_("Shared-dir watcher: events dropped by backend, "
+				      "forcing a full shared-files reload to resync"));
+		}
 		m_pendingEvents.clear();
-		m_fallbackPending = false;
-		m_parent->Reload();
+		m_resyncReason = ResyncNone;
+		m_coldDiscoveredDirs = 0;
+		// Scheduled: this flush runs on the core event loop, so an inline walk
+		// would block it (and any EC request behind it) for the walk's length.
+		m_parent->RequestReload();
 		return;
 	}
 
@@ -633,24 +701,38 @@
 	}
 
 	AddDebugLogLineN(logKnownFiles,
-		CFormat("Shared-dir watcher: applying %zu incremental delta(s) after debounce")
-			% m_pendingEvents.size());
+		CFormat("Shared-dir watcher: applying %zu incremental delta(s) after debounce") %
+			m_pendingEvents.size());
 
-	// Drain into a local copy first so an inline call back into the
-	// watcher (e.g. via a Notify_* macro that pumps the event loop on
-	// some backends) can't mutate the container while we iterate.
+	// Drain into a local copy first so an inline call back into the watcher (e.g. via a Notify_*
+	// macro that pumps the event loop on some backends) cannot mutate the container while we
+	// iterate.
 	std::unordered_map<wxString, PendingPathEvents> drained;
 	drained.swap(m_pendingEvents);
 
-	for (const auto & entry : drained) {
-		const wxString & path = entry.first;
-		const PendingPathEvents & ev = entry.second;
+	for (const auto &entry : drained) {
+		const wxString &path = entry.first;
+		const PendingPathEvents &ev = entry.second;
 
-		// RENAME first: if the destination is the same as the
-		// CREATE path elsewhere in the batch, the destination's
-		// own event slot will handle the add. Treat the rename as
-		// (delete-old) then schedule new-path processing.
+		// RENAME first: if the destination is the same as the CREATE path elsewhere in the batch,
+		// the destination's own event slot handles the add. Treat the rename as (delete-old) then
+		// schedule new-path processing.
 		if (ev.flags & wxFSW_EVENT_RENAME) {
+			// Directory rename: the subtree moved with no per-file events, so the file pipeline
+			// would just log a bogus "does not exist" and share nothing. Register the new dir
+			// (watch + walk contents); it only re-shares under a recursive ancestor, so an
+			// explicitly picked folder is not resurrected at its new name.
+			if (!ev.renamedTo.IsEmpty() && wxFileName::DirExists(ev.renamedTo)) {
+				// Tear down the old path only if it is gone (inotify shape). Backends that
+				// report the rename against the still-existing parent deliver the old subtree
+				// via a separate DELETE, so never touch a path that still exists (that is the
+				// parent).
+				if (!wxFileName::DirExists(path) && IsInSharedSet(path)) {
+					HandleDirRemoved(path);
+				}
+				RegisterNewSubdirectory(ev.renamedTo);
+				continue;
+			}
 			m_parent->NotifyPathRemoved(path);
 			if (!ev.renamedTo.IsEmpty()) {
 				m_parent->NotifyPathAdded(ev.renamedTo);
@@ -658,19 +740,27 @@
 			continue;
 		}
 
-		// DELETE dominates: if a file was created AND deleted in
-		// the same window we don't want to add then remove; the
-		// remove-effect is the net result. Same path can carry
-		// multiple flags because fs-watcher fires DELETE for the
-		// rename's source on some backends.
+		// DELETE dominates: if a file was created AND deleted in the same window we do not want
+		// to add then remove; the remove-effect is the net result. The same path can carry several
+		// flags, because fs-watcher fires DELETE for the rename's source on some backends.
 		if (ev.flags & wxFSW_EVENT_DELETE) {
-			m_parent->NotifyPathRemoved(path);
+			// A vanished shared *dir* is not in the file index, so NotifyPathRemoved would no-op.
+			// Detach its subtree only when it is a shared dir AND genuinely gone from disk -- a
+			// spurious/transient DELETE, or a delete-then-recreate coalesced into this debounce
+			// window, must not unshare a directory that still exists. The shared-set check also
+			// keeps this off the hot path of ordinary file DELETEs (no O(files) scan per file).
+			if (IsInSharedSet(path) && !wxFileName::DirExists(path)) {
+				if (HandleDirRemoved(path)) {
+					theApp->glob_prefs->SaveSharedFolders();
+				}
+			} else {
+				m_parent->NotifyPathRemoved(path);
+			}
 			continue;
 		}
 
-		// CREATE → add. MODIFY-only without CREATE → modify (which
-		// in NotifyPathModified is a stat-and-rehash-if-changed
-		// path; cheap when nothing actually moved).
+		// CREATE means add. MODIFY-only without CREATE means modify, which in NotifyPathModified
+		// is a stat-and-rehash-if-changed path -- cheap when nothing actually moved.
 		if (ev.flags & wxFSW_EVENT_CREATE) {
 			m_parent->NotifyPathAdded(path);
 		} else if (ev.flags & wxFSW_EVENT_MODIFY) {
@@ -679,15 +769,13 @@
 	}
 }
 
-
 #ifdef __APPLE__
-void CSharedDirWatcher::OnMacRunLoopPump(wxTimerEvent & WXUNUSED(event))
+void CSharedDirWatcher::OnMacRunLoopPump(wxTimerEvent &WXUNUSED(event))
 {
-	// Non-blocking drain (returnAfterSourceHandled=true, timeout=0):
-	// dispatches any FSEvents callbacks queued on this thread's
-	// CFRunLoop since the last tick, then returns immediately. wx's
-	// FSEvents wrapper translates those callbacks into wx events and
-	// posts them to our OnFileSystemEvent via the normal event queue.
+	// Non-blocking drain (returnAfterSourceHandled=true, timeout=0): dispatches any FSEvents
+	// callbacks queued on this thread's CFRunLoop since the last tick, then returns immediately.
+	// wx's FSEvents wrapper translates those callbacks into wx events and posts them to our
+	// OnFileSystemEvent via the normal event queue.
 	CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true);
 }
 #endif

amule-3.0.1.tar.gz/src/SharedDirWatcher.h -> amule-3.1.0.tar.gz/src/SharedDirWatcher.h Changed

@@ -30,138 +30,155 @@
 class CSharedFileList;
 class CPath;
 
-// Watches every directory in CPreferences::shareddir_list for file/dir
-// creation, deletion, rename and modification, and triggers a debounced
-// CSharedFileList::Reload() so newly-added files become shared without a
-// manual "Reload shared files" click.
+// Watches every directory in CPreferences::shareddir_list for file/dir creation, deletion, rename
+// and modification, and triggers a debounced CSharedFileList::Reload() so newly-added files become
+// shared without a manual "Reload shared files" click.
 //
-// New subdirectories created under any watched path are auto-added to
-// shareddir_list so the watcher keeps following them, which mirrors the
-// behaviour users expect from the existing "recursive share" button —
-// once a parent is shared, anything created beneath it is shared too.
-// We do not persist a per-entry recursive flag because shareddir.dat
-// already enumerates each subdirectory individually.
+// New subdirectories created under any watched path are auto-added to shareddir_list so the watcher
+// keeps following them, mirroring what the "recursive share" button already does. No per-entry
+// recursive flag is persisted, because shareddir.dat enumerates each subdirectory individually.
 //
-// Backends per platform are provided by wxFileSystemWatcher: inotify on
-// Linux, FSEvents on macOS, ReadDirectoryChangesW on Windows, kqueue on
-// BSD. AddTree() handles initial recursive setup; we re-Add new subdirs
-// individually as we discover them so the watch graph keeps pace with
-// disk changes.
+// Backends come from wxFileSystemWatcher: inotify on Linux, FSEvents on macOS,
+// ReadDirectoryChangesW on Windows, kqueue on BSD. AddTree() handles the initial recursive setup;
+// new subdirs are re-Added individually as they are discovered.
 class CSharedDirWatcher : public wxEvtHandler
 {
 public:
-	explicit CSharedDirWatcher(CSharedFileList * parent);
+	explicit CSharedDirWatcher(CSharedFileList *parent);
 	~CSharedDirWatcher();
 
 	// Start watching every path in shareddir_list. Safe to call when
-	// already enabled — no-op in that case.
+	// already enabled -- no-op in that case.
 	void Enable();
 
-	// Stop watching and free the watcher object. Safe to call when
-	// already disabled.
+	// Stop watching. The watcher object itself is freed from the event queue rather than here
+	// -- see Disable(). Safe to call when already disabled.
 	void Disable();
 
 	bool IsEnabled() const { return m_watcher != NULL; }
 
-	// Called from CSharedFileList::Reload() after the list has been
-	// rebuilt. Re-walks shareddir_list and updates the watcher's path
-	// set so removed dirs stop firing events and newly-added dirs
-	// start firing.
+	// Called from CSharedFileList::Reload() after the list has been rebuilt. Re-walks
+	// shareddir_list and updates the watcher's path set, so removed dirs stop firing events and
+	// newly-added ones start.
 	void Refresh();
 
-	// Event-type flags accumulated for one pending path between
-	// fs-watcher delivery and debounce-flush. Stored as ints so we
-	// don't have to expose wxFSW_EVENT_* in the header to includers.
-	struct PendingPathEvents {
-		int flags;            // bitmask of wxFSW_EVENT_CREATE/DELETE/MODIFY
-		wxString renamedTo;   // populated for RENAME; empty otherwise
+	// Event-type flags accumulated for one pending path between fs-watcher delivery and
+	// debounce flush. Stored as ints so wxFSW_EVENT_* need not be exposed to includers.
+	struct PendingPathEvents
+	{
+		int flags;          // bitmask of wxFSW_EVENT_CREATE/DELETE/MODIFY
+		wxString renamedTo; // populated for RENAME; empty otherwise
 	};
 
 private:
-	void OnFileSystemEvent(wxFileSystemWatcherEvent & event);
-	void OnDebounceTimer(wxTimerEvent & event);
+	void OnFileSystemEvent(wxFileSystemWatcherEvent &event);
+	void OnDebounceTimer(wxTimerEvent &event);
 #ifdef __APPLE__
-	// macOS amuled (wxAppConsole) doesn't spin the main thread's
-	// CFRunLoop, so FSEvents callbacks scheduled by wx never deliver.
-	// A periodic non-blocking drain fixes that without spawning a
-	// dedicated thread. No-op under aMule.app whose Cocoa main loop
-	// already pumps the runloop.
-	void OnMacRunLoopPump(wxTimerEvent & event);
+	// macOS amuled (wxAppConsole) does not spin the main thread's CFRunLoop, so FSEvents
+	// callbacks scheduled by wx never deliver; a periodic non-blocking drain fixes that without
+	// a dedicated thread. No-op under aMule.app.
+	void OnMacRunLoopPump(wxTimerEvent &event);
 #endif
 
-	// Walk shareddir_list and Add() every path. Errors per-path are
-	// logged but do not abort the rest (so a single Linux
-	// max_user_watches refusal doesn't blank the whole watcher).
+	// Walk shareddir_list and Add() every path. Per-path errors are logged but do not abort the
+	// rest, so a single Linux max_user_watches refusal does not blank the whole watcher.
 	void RegisterAllPaths();
 
-	// Coalesce a burst of FS events into per-path deltas applied on
-	// the debounce-timer flush. Resets the 5-second timer on every
-	// new event; processing runs when the timer finally fires.
+	// Coalesce a burst of FS events into per-path deltas applied on the debounce-timer flush.
+	// Resets the 5-second timer on every new event; processing runs when the timer finally
+	// fires.
 	void ScheduleProcessing();
 
-	// Walk m_pendingEvents and apply each one to CSharedFileList via
-	// NotifyPathAdded/Removed/Modified. Skipped if m_fallbackPending
-	// was set by a wxFSW_EVENT_WARNING / _ERROR event since the last
-	// flush -- in that case we fall back to the bulk Reload() because
-	// the watcher backend has signalled it dropped events and we
-	// can't trust our incremental view of the tree any more.
+	// Walk m_pendingEvents and apply each one to CSharedFileList. Skipped when a resync is owed
+	// from a wxFSW_EVENT_WARNING / _ERROR since the last flush: the backend has signalled it
+	// dropped events, so the incremental view cannot be trusted and the bulk Reload() takes
+	// over.
 	void FlushPendingEvents();
 
-	// Append a newly-created directory to shareddir_list (if not
-	// already there) and start watching it. Used for Option A's
-	// "auto-share new subdirs of watched parents" behaviour.
-	void RegisterNewSubdirectory(const wxString & path);
-
-	// Closes the inotify/kqueue race window inside RegisterNewSubdirectory:
-	// between the kernel mkdir and our wxFileSystemWatcher::Add(), any
-	// files or subdirs created inside the new directory fire on a watch
-	// that doesn't exist yet and get silently dropped. Walks `parent`
-	// after the watch is in place and feeds existing entries through
-	// NotifyPathAdded (files) and RegisterNewSubdirectory (subdirs,
-	// recursively) so the catch-up is symmetric with what the live
-	// event path would have done. Idempotent on second observation.
-	void ScanNewSubdirRace(const CPath & parent);
-
-	// Recursively walk each path in shareddir_list and add any subdir
-	// not already listed. The "cold" twin of RegisterNewSubdirectory:
-	// without this, subdirs created while aMule was offline are never
-	// observed -- the watcher only fires CREATE events post-Enable(),
-	// so a /Music share whose disk grew three new albums in the
-	// interim would never see them until each gained a new file via
-	// some other path. Batches in-memory and writes shareddir.dat
-	// once at the end so a large discovery pass doesn't trigger N
-	// rewrites.
+	// Append a newly-created directory to shareddir_list, if not already there, and start
+	// watching it. Used for the "auto-share new subdirs of watched parents" behaviour.
+	void RegisterNewSubdirectory(const wxString &path);
+
+	// Tear down a renamed-away or deleted shared dir: detach its subtree, drop it from the
+	// runtime shared set and its watch. Never touches the user's explicit/recursive config.
+	// Returns true if it removed a set entry.
+	bool HandleDirRemoved(const wxString &path);
+
+	// Is `path` in the runtime shared set? Distinguishes a dir event from a
+	// file event once the path is gone from disk.
+	bool IsInSharedSet(const wxString &path) const;
+
+	// Closes the inotify/kqueue race window inside RegisterNewSubdirectory: between the kernel
+	// mkdir and our wxFileSystemWatcher::Add(), anything created inside the new directory fires
+	// on a watch that does not exist yet and is silently dropped. Walks `parent` once the watch
+	// is in place and feeds existing entries through NotifyPathAdded and
+	// RegisterNewSubdirectory, so the catch-up matches what the live event path would have
+	// done. Idempotent.
+	void ScanNewSubdirRace(const CPath &parent);
+
+	// Recursively walk each path in shareddir_list and add any subdir not already listed. The
+	// "cold" twin of RegisterNewSubdirectory: the watcher only fires CREATE events post-
+	// Enable(), so without this a /Music share that grew three albums while aMule was offline
+	// would never see them. Batches in memory and writes shareddir.dat once at the end.
 	void ColdDiscoverSubdirs();
 
-	// Recursive walker used by ColdDiscoverSubdirs. Visits every
-	// subdirectory of `root`; for each that is not already in
-	// `known` it inserts the path into `known` and appends to `out`.
-	// Always recurses (even through already-known subdirs) so a tree
-	// whose top layer is in shareddir.dat but whose deeper layers
-	// are not still gets fully covered in one pass.
-	void WalkForUnknownSubdirs(
-		const CPath & root,
-		std::set<wxString> & known,
-		std::vector<CPath> & out);
-
-	CSharedFileList *      m_parent;
-	wxFileSystemWatcher *  m_watcher;
-	wxTimer                m_debounceTimer;
-
-	// Per-path accumulator. Keyed on the raw filesystem path. Events
-	// coalesce per-path: a CREATE followed by N MODIFYs followed by
-	// CLOSE_WRITE on the same file becomes a single dispatch on the
-	// debounce flush. RENAME stores the destination in `renamedTo`.
-	std::unordered_map<wxString, PendingPathEvents>  m_pendingEvents;
-
-	// Set when the watcher backend reports overflow / drop (inotify
-	// queue overflow, kqueue race, Windows ReadDirectoryChangesW
-	// buffer exhaust). FlushPendingEvents() responds by calling the
-	// bulk Reload() because incremental state can no longer be
-	// trusted. Cleared after the fallback fires.
-	bool                   m_fallbackPending;
+	// Recursive walker used by ColdDiscoverSubdirs. Visits every subdirectory of `root`,
+	// inserting each one not already in `known` into `known` and `out`. Always recurses, even
+	// through known subdirs, so a tree whose top layer is in shareddir.dat but whose deeper
+	// layers are not is still fully covered.
+	void WalkForUnknownSubdirs(const CPath &root, std::set<wxString> &known, std::vector<CPath> &out);
+
+	// Destroy the watchers Disable() detached. Queued with CallAfter() so the delete lands
+	// between dispatches; also called by the destructor for whatever the queue never reached.
+	void ReapPendingWatchers();
+
+	// Stop the debounce (and, on macOS, the run-loop pump) timer. Shared
+	// by Disable() and the destructor.
+	void StopTimers();
+
+	CSharedFileList *m_parent;
+	wxFileSystemWatcher *m_watcher;
+	//! Watchers detached by Disable() and not yet destroyed. ~wxFileSystemWatcher frees the
+	//! wxFDIOEventLoopSourceHandler wx registered for its inotify fd, and
+	//! wxEpollDispatcher::Dispatch walks a snapshot of the ready events without re-checking any
+	//! handler -- so freeing one from inside an event handler makes that loop call a virtual on
+	//! freed memory. Destruction is therefore deferred to the pending-event queue, which the
+	//! loop drains before it dispatches.
+	std::vector<wxFileSystemWatcher *> m_pendingDelete;
+	wxTimer m_debounceTimer;
+
+	// Per-path accumulator, keyed on the raw filesystem path. Events coalesce per path: a
+	// CREATE followed by N MODIFYs followed by CLOSE_WRITE on the same file becomes a single
+	// dispatch on the debounce flush. RENAME stores the destination in `renamedTo`.
+	std::unordered_map<wxString, PendingPathEvents> m_pendingEvents;
+
+	// Why a full-reload resync is owed; cleared once the fallback fires.
+	//
+	// ResyncDroppedEvents means the backend reported overflow or drop (inotify queue overflow,
+	// kqueue race, ReadDirectoryChangesW buffer exhaust), so FlushPendingEvents() falls back to
+	// the bulk Reload() and logs a real fault.
+	//
+	// ResyncColdDiscovery means subdirectories simply appeared while aMule was not running.
+	// Nothing failed. Both reasons used to share one bool and so one message, which reported
+	// this routine case as a watcher failure, in red.
+	//
+	// It is hard to provoke: ReloadSharedFolders expands recursive roots into the shared-dir
+	// union and the startup Reload runs before the watcher is enabled, so ColdDiscoverSubdirs
+	// normally finds nothing. What remains is the narrow window where a directory appears
+	// between that Reload and Enable().
+	enum ResyncReason
+	{
+		ResyncNone,
+		//! Backend overflow/error: per-path deltas untrustworthy.
+		ResyncDroppedEvents,
+		//! New subdirs found at startup; nothing failed.
+		ResyncColdDiscovery,
+	};
+	ResyncReason m_resyncReason = ResyncNone;
+	//! Subdirectory count for the ResyncColdDiscovery message.
+	unsigned m_coldDiscoveredDirs = 0;
 #ifdef __APPLE__
-	wxTimer                m_macPumpTimer;
+	wxTimer m_macPumpTimer;
 #endif
 
 	DECLARE_EVENT_TABLE()

amule-3.0.1.tar.gz/src/SharedDirsApplyTask.cpp -> amule-3.1.0.tar.gz/src/SharedDirsApplyTask.cpp Changed

@@ -18,47 +18,41 @@
 
 #include <set>
 
-#include <common/FileFunctions.h>		// CDirIterator
-#include "Preferences.h"		// thePrefs::FollowSymlinksInShares()
+#include <common/FileFunctions.h> // CDirIterator
+#include "Preferences.h"          // thePrefs::FollowSymlinksInShares()
 
 wxDEFINE_EVENT(wxEVT_SHARED_DIRS_APPLY_PROGRESS, wxThreadEvent);
-wxDEFINE_EVENT(wxEVT_SHARED_DIRS_APPLY_DONE,     wxThreadEvent);
+wxDEFINE_EVENT(wxEVT_SHARED_DIRS_APPLY_DONE, wxThreadEvent);
 
-// Coalesce progress events so the UI thread isn't flooded — every
-// 256 directories is enough for a responsive bar without dominating
-// the wxQueueEvent path.
+// Coalesce progress events so the UI thread is not flooded -- every 256 directories is enough for a
+// responsive bar without dominating the wxQueueEvent path.
 static constexpr size_t kProgressBatch = 256;
 
-
-CSharedDirsApplyTask::CSharedDirsApplyTask(const PathList & explicit_shares,
-		const PathList & recursive_shares,
-		wxEvtHandler * owner) :
-	wxThread(wxTHREAD_JOINABLE),
-	m_explicit(explicit_shares),
-	m_recursive(recursive_shares),
-	m_owner(owner)
+CSharedDirsApplyTask::CSharedDirsApplyTask(
+	const PathList &explicit_shares, const PathList &recursive_shares, wxEvtHandler *owner)
+: wxThread(wxTHREAD_JOINABLE)
+, m_explicit(explicit_shares)
+, m_recursive(recursive_shares)
+, m_owner(owner)
 {
 }
 
-
 void CSharedDirsApplyTask::Cancel()
 {
 	if (IsRunning()) {
-		// wxThread::Delete on a joinable thread requests termination
-		// and waits for the worker to exit. The worker checks via
-		// TestDestroy() between directory steps and bails promptly.
+		// wxThread::Delete on a joinable thread requests termination and waits for the
+		// worker to exit. The worker checks via TestDestroy() between directory steps and
+		// bails promptly.
 		Delete();
 	}
 }
 
-
 wxThread::ExitCode CSharedDirsApplyTask::Entry()
 {
-	// Start from the explicit set so subdir-overlap dedup happens in
-	// one place. Use a set keyed on the raw path for O(log N) dedup
-	// against later inserts from the recursive walk.
+	// Start from the explicit set so subdir-overlap dedup happens in one place. A set keyed on
+	// the raw path gives O(log N) dedup against later inserts from the recursive walk.
 	std::set<wxString> seen;
-	for (const CPath & p : m_explicit) {
+	for (const CPath &p : m_explicit) {
 		if (p.IsOk() && p.DirExists()) {
 			if (seen.insert(p.GetRaw()).second) {
 				m_output.push_back(p);
@@ -66,7 +60,7 @@
 		}
 	}
 
-	for (const CPath & root : m_recursive) {
+	for (const CPath &root : m_recursive) {
 		if (TestDestroy()) {
 			m_cancelled.store(true);
 			break;
@@ -87,19 +81,17 @@
 	}
 
 	if (m_owner) {
-		auto * done = new wxThreadEvent(wxEVT_SHARED_DIRS_APPLY_DONE);
+		auto *done = new wxThreadEvent(wxEVT_SHARED_DIRS_APPLY_DONE);
 		done->SetInt(m_cancelled.load() ? 1 : 0);
 		wxQueueEvent(m_owner, done);
 	}
 	return (ExitCode)0;
 }
 
-
-void CSharedDirsApplyTask::ExpandRecursive(const CPath & root)
+void CSharedDirsApplyTask::ExpandRecursive(const CPath &root)
 {
-	// Iterative walk so a deep tree doesn't blow the worker's stack
-	// and so the cancel check can happen between *every* directory
-	// rather than only on the way back up.
+	// Iterative walk, so a deep tree does not blow the worker's stack and the cancel check can
+	// happen between *every* directory rather than only on the way back up.
 	std::vector<CPath> queue;
 	queue.push_back(root);
 
@@ -112,21 +104,17 @@
 		CPath dir = queue.back();
 		queue.pop_back();
 
-		// Enumerate immediate subdirectories. CDirIterator's first
-		// GetFirstFile returns an invalid CPath if the dir can't be
-		// opened (permission denied, vanished, etc.), so a simple
-		// IsOk() check on the first result is enough to skip
-		// unreadable trees without aborting the whole task.
+		// Enumerate immediate subdirectories. CDirIterator's first GetFirstFile returns an
+		// invalid CPath if the dir cannot be opened (permission denied, vanished), so an
+		// IsOk() check on the first result is enough to skip unreadable trees without
+		// aborting the whole task.
 		const int extraFlags = thePrefs::FollowSymlinksInShares() ? 0 : wxDIR_NO_FOLLOW;
 		CDirIterator finder(dir);
 		for (CPath sub = finder.GetFirstFile(CDirIterator::DirNoHidden, wxEmptyString, extraFlags);
 			sub.IsOk();
-			sub = finder.GetNextFile())
-		{
+			sub = finder.GetNextFile()) {
 			CPath fullSub = dir.JoinPaths(sub);
-			if (m_output.empty()
-				|| m_output.back().GetRaw() != fullSub.GetRaw())
-			{
+			if (m_output.empty() || m_output.back().GetRaw() != fullSub.GetRaw()) {
 				// Cheap last-write dedup; full dedup happens via
 				// CPreferences::ReloadSharedFolders later.
 				m_output.push_back(fullSub);
@@ -141,7 +129,6 @@
 	}
 }
 
-
 void CSharedDirsApplyTask::PostProgress()
 {
 	const size_t now = m_scanned.load();
@@ -149,7 +136,7 @@
 	if (!m_owner) {
 		return;
 	}
-	auto * ev = new wxThreadEvent(wxEVT_SHARED_DIRS_APPLY_PROGRESS);
+	auto *ev = new wxThreadEvent(wxEVT_SHARED_DIRS_APPLY_PROGRESS);
 	ev->SetInt(static_cast<int>(now));
 	wxQueueEvent(m_owner, ev);
 }

amule-3.0.1.tar.gz/src/SharedDirsApplyTask.h -> amule-3.1.0.tar.gz/src/SharedDirsApplyTask.h Changed

@@ -25,34 +25,29 @@
 
 #include <common/Path.h>
 
-// Worker thread that flattens the user's pending share intent
-// (explicit-shared paths + recursive-share roots) into a single flat
-// path list ready to drop into CPreferences::shareddir_list. The
-// recursive expansion is the historically-long-running step that used
-// to freeze the Directories preferences panel for minutes when a user
-// right-clicked a deep root like /home — moving it off the UI thread
-// lets the user see a progress bar and cancel cleanly.
+// Worker thread that flattens the user's pending share intent (explicit-shared paths + recursive-
+// share roots) into a single flat path list ready to drop into CPreferences::shareddir_list. The
+// recursive expansion is the historically long-running step that used to freeze the Directories
+// preferences panel for minutes when a user right-clicked a deep root like /home -- moving it off
+// the UI thread lets the user see a progress bar and cancel cleanly.
 //
 // Thread-safety contract:
-//   * The constructor copies its inputs by value into thread-private
-//     storage; the caller can drop its own copies immediately.
-//   * The caller may invoke Cancel() (which calls wxThread::Delete())
-//     from the UI thread at any time. The thread checks via
-//     TestDestroy() between directory enumerations and exits with
-//     m_cancelled=true.
-//   * Progress events are posted to the owner via wxQueueEvent, so the
-//     UI thread receives them in its normal event loop.
-//   * Results are only safe to read after the wxEVT_SHARED_DIRS_APPLY_DONE
-//     event arrives, at which point the worker thread is guaranteed
-//     to be finished.
+//   * The constructor copies its inputs by value into thread-private storage; the caller can drop
+// its own copies immediately.
+//   * The caller may invoke Cancel() (which calls wxThread::Delete()) from the UI thread at any
+// time. The thread checks via TestDestroy() between directory enumerations and exits with
+// m_cancelled=true.
+//   * Progress events are posted to the owner via wxQueueEvent, so the UI thread receives them in
+// its normal event loop.
+//   * Results are only safe to read after the wxEVT_SHARED_DIRS_APPLY_DONE event arrives, at which
+// point the worker thread is guaranteed to be finished.
 class CSharedDirsApplyTask : public wxThread
 {
 public:
 	typedef std::vector<CPath> PathList;
 
-	CSharedDirsApplyTask(const PathList & explicit_shares,
-		const PathList & recursive_shares,
-		wxEvtHandler * owner);
+	CSharedDirsApplyTask(
+		const PathList &explicit_shares, const PathList &recursive_shares, wxEvtHandler *owner);
 
 	// Request graceful termination from the UI thread. Returns once
 	// the worker has acknowledged the cancel and exited.
@@ -60,31 +55,30 @@
 
 	// Read-after-done accessors. Calling these while the thread is
 	// still running is undefined.
-	const PathList & GetExpandedShares() const { return m_output; }
-	bool             WasCancelled() const      { return m_cancelled.load(); }
-	size_t           GetTotalScanned() const   { return m_scanned.load(); }
+	const PathList &GetExpandedShares() const { return m_output; }
+	bool WasCancelled() const { return m_cancelled.load(); }
+	size_t GetTotalScanned() const { return m_scanned.load(); }
 
 protected:
 	ExitCode Entry() override;
 
 private:
-	void ExpandRecursive(const CPath & root);
+	void ExpandRecursive(const CPath &root);
 	void PostProgress();
 
-	PathList            m_explicit;     // copy of the caller's explicit shares
-	PathList            m_recursive;    // copy of the caller's recursive intents
-	wxEvtHandler *      m_owner;
-	PathList            m_output;       // flat path list, filled during Entry()
+	PathList m_explicit;  // copy of the caller's explicit shares
+	PathList m_recursive; // copy of the caller's recursive intents
+	wxEvtHandler *m_owner;
+	PathList m_output; // flat path list, filled during Entry()
 
-	std::atomic<size_t> m_scanned{0};   // directories visited so far
-	std::atomic<bool>   m_cancelled{false};
-	size_t              m_lastReportedScanned = 0;
+	std::atomic<size_t> m_scanned{ 0 }; // directories visited so far
+	std::atomic<bool> m_cancelled{ false };
+	size_t m_lastReportedScanned = 0;
 };
 
-// Events posted from the worker thread to the owner. The owner is
-// expected to be a wxEvtHandler subclass that binds these via
-// Bind(wxEVT_SHARED_DIRS_APPLY_PROGRESS, ...).
+// Events posted from the worker thread to the owner, which is expected to be a wxEvtHandler
+// subclass binding them via Bind(wxEVT_SHARED_DIRS_APPLY_PROGRESS, ...).
 wxDECLARE_EVENT(wxEVT_SHARED_DIRS_APPLY_PROGRESS, wxThreadEvent);
-wxDECLARE_EVENT(wxEVT_SHARED_DIRS_APPLY_DONE,     wxThreadEvent);
+wxDECLARE_EVENT(wxEVT_SHARED_DIRS_APPLY_DONE, wxThreadEvent);
 
 #endif // SHAREDDIRSAPPLYTASK_H

amule-3.0.1.tar.gz/src/SharedFileList.cpp -> amule-3.1.0.tar.gz/src/SharedFileList.cpp Changed

@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "SharedFileList.h"	// Interface declarations  // Do_not_auto_remove
+#include "SharedFileList.h" // Interface declarations  // Do_not_auto_remove
 #include "SharedDirWatcher.h"
 
 #include <map>
@@ -35,29 +35,77 @@
 
 #include <wx/utils.h>
 
-#include "Packet.h"		// Needed for CPacket
-#include "MemFile.h"		// Needed for CMemFile
-#include "ServerConnect.h"	// Needed for CServerConnect
-#include "KnownFileList.h"	// Needed for CKnownFileList
-#include "ThreadTasks.h"	// Needed for CThreadScheduler and CHasherTask
-#include "Preferences.h"	// Needed for thePrefs
-#include "DownloadQueue.h"	// Needed for CDownloadQueue
-#include "amule.h"		// Needed for theApp
-#include "PartFile.h"		// Needed for PartFile
-#include "Server.h"		// Needed for CServer
-#include "Statistics.h"		// Needed for theStats
+#include "Packet.h"           // Needed for CPacket
+#include "MemFile.h"          // Needed for CMemFile
+#include "ServerConnect.h"    // Needed for CServerConnect
+#include "KnownFileList.h"    // Needed for CKnownFileList
+#include "ThreadTasks.h"      // Needed for CThreadScheduler and CHasherTask
+#include "MediaProbeThread.h" // Needed for CMediaProbeThread (media probe queue)
+#include "OtherFunctions.h"   // Needed for GetED2KFileTypeID / ED2KFT_* (MaybeScheduleMediaProbe)
+#include "ThreadScheduler.h"  // Needed for CThreadScheduler::GetPendingCount (bulk probe logging)
+#include "Preferences.h"      // Needed for thePrefs
+#include "DownloadQueue.h"    // Needed for CDownloadQueue
+#include "amule.h"            // Needed for theApp
+#include "PartFile.h"         // Needed for PartFile
+#include "Server.h"           // Needed for CServer
+#include "Statistics.h"       // Needed for theStats
 #include "Logger.h"
 #include <common/Format.h>
 #include <common/FileFunctions.h>
-#include "GuiEvents.h"		// Needed for Notify_*
-#include "SHAHashSet.h"		// Needed for CAICHHash
-
+#include "GuiEvents.h"  // Needed for Notify_*
+#include "SHAHashSet.h" // Needed for CAICHHash
 
 #include "kademlia/kademlia/Kademlia.h"
 #include "kademlia/kademlia/Search.h"
 #include "ClientList.h"
 
-typedef std::deque<CKnownFile*> KnownFileArray;
+#include <vector>
+
+#ifdef __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+typedef std::deque<CKnownFile *> KnownFileArray;
+
+// m_pathIndex key canonicalization. macOS hands the same filename to different subsystems
+// in different Unicode normalization forms: known.met / download names arrive decomposed
+// (NFD) while FSEvents can report the very same path composed (NFC), and a file's CREATE
+// and DELETE events may even disagree. A plain map keyed on the raw path string therefore
+// misses when the lookup form differs from the stored form, so a completed download with
+// an accented name never auto-unshares on delete. Fold every key to NFC so all variants
+// of one name collapse to a single entry. Off macOS filenames are opaque byte strings
+// with no OS-level normalization, so this is identity.
+static wxString NormalizePathKey(const wxString &path)
+{
+#ifdef __APPLE__
+	const wxScopedCharBuffer utf8 = path.utf8_str();
+	if (utf8.data() == NULL || utf8.length() == 0) {
+		return path;
+	}
+	CFStringRef s = CFStringCreateWithBytes(kCFAllocatorDefault,
+		(const UInt8 *)utf8.data(),
+		(CFIndex)utf8.length(),
+		kCFStringEncodingUTF8,
+		false);
+	if (s == NULL) {
+		return path;
+	}
+	CFMutableStringRef mut = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
+	CFRelease(s);
+	if (mut == NULL) {
+		return path;
+	}
+	CFStringNormalize(mut, kCFStringNormalizationFormC);
+	const CFIndex maxLen =
+		CFStringGetMaximumSizeForEncoding(CFStringGetLength(mut), kCFStringEncodingUTF8) + 1;
+	std::vector<char> buf((size_t)maxLen);
+	const Boolean ok = CFStringGetCString(mut, buf.data(), maxLen, kCFStringEncodingUTF8);
+	CFRelease(mut);
+	return ok ? wxString::FromUTF8(buf.data()) : path;
+#else
+	return path;
+#endif
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // CPublishKeyword
@@ -65,21 +113,21 @@
 class CPublishKeyword
 {
 public:
-	CPublishKeyword(const wxString& rstrKeyword)
+	CPublishKeyword(const wxString &rstrKeyword)
 	{
 		m_strKeyword = rstrKeyword;
 		// min. keyword char is allowed to be < 3 in some cases (see also 'CSearchManager::getWords')
-		//ASSERT( rstrKeyword.GetLength() >= 3 );
-		wxASSERT( !rstrKeyword.IsEmpty() );
+		// ASSERT( rstrKeyword.GetLength() >= 3 );
+		wxASSERT(!rstrKeyword.IsEmpty());
 		KadGetKeywordHash(rstrKeyword, &m_nKadID);
 		SetNextPublishTime(0);
 		SetPublishedCount(0);
 	}
 
-	const Kademlia::CUInt128& GetKadID() const { return m_nKadID; }
-	const wxString& GetKeyword() const { return m_strKeyword; }
+	const Kademlia::CUInt128 &GetKadID() const { return m_nKadID; }
+	const wxString &GetKeyword() const { return m_strKeyword; }
 	int GetRefCount() const { return m_aFiles.size(); }
-	const KnownFileArray& GetReferences() const { return m_aFiles; }
+	const KnownFileArray &GetReferences() const { return m_aFiles; }
 
 	uint32 GetNextPublishTime() const { return m_tNextPublishTime; }
 	void SetNextPublishTime(uint32 tNextPublishTime) { m_tNextPublishTime = tNextPublishTime; }
@@ -88,7 +136,8 @@
 	void SetPublishedCount(uint32 uPublishedCount) { m_uPublishedCount = uPublishedCount; }
 	void IncPublishedCount() { m_uPublishedCount++; }
 
-	bool AddRef(CKnownFile* pFile) {
+	bool AddRef(CKnownFile *pFile)
+	{
 		if (std::find(m_aFiles.begin(), m_aFiles.end(), pFile) != m_aFiles.end()) {
 			wxFAIL;
 			return false;
@@ -97,7 +146,8 @@
 		return true;
 	}
 
-	int RemoveRef(CKnownFile* pFile) {
+	int RemoveRef(CKnownFile *pFile)
+	{
 		KnownFileArray::iterator it = std::find(m_aFiles.begin(), m_aFiles.end(), pFile);
 		if (it != m_aFiles.end()) {
 			m_aFiles.erase(it);
@@ -105,11 +155,10 @@
 		return m_aFiles.size();
 	}
 
-	void RemoveAllReferences() {
-		m_aFiles.clear();
-	}
+	void RemoveAllReferences() { m_aFiles.clear(); }
 
-	void RotateReferences(unsigned iRotateSize) {
+	void RotateReferences(unsigned iRotateSize)
+	{
 		wxCHECK_RET(m_aFiles.size(), "RotateReferences: Rotating empty array");
 
 		unsigned shift = (iRotateSize % m_aFiles.size());
@@ -124,7 +173,6 @@
 	KnownFileArray m_aFiles;
 };
 
-
 ///////////////////////////////////////////////////////////////////////////////
 // CPublishKeywordList
 
@@ -134,10 +182,10 @@
 	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 AddKeyword(const wxString &keyword, CKnownFile *file);
+	void AddKeywords(CKnownFile *pFile);
+	void RemoveKeyword(const wxString &keyword, CKnownFile *file);
+	void RemoveKeywords(CKnownFile *pFile);
 	void RemoveAllKeywords();
 
 	void RemoveAllKeywordReferences();
@@ -145,30 +193,31 @@
 
 	int GetCount() const { return m_lstKeywords.size(); }
 
-	CPublishKeyword* GetNextKeyword();
+	CPublishKeyword *GetNextKeyword();
 	void ResetNextKeyword();
 
 	uint32 GetNextPublishTime() const { return m_tNextPublishKeywordTime; }
-	void SetNextPublishTime(uint32 tNextPublishKeywordTime) { m_tNextPublishKeywordTime = tNextPublishKeywordTime; }
+	void SetNextPublishTime(uint32 tNextPublishKeywordTime)
+	{
+		m_tNextPublishKeywordTime = tNextPublishKeywordTime;
+	}
 
 protected:
-	// The list is the canonical container — its insertion order is
-	// load-bearing for GetNextKeyword()'s round-robin publish cursor
-	// (m_posNextKeyword), so we cannot replace it with a map.
-	typedef std::list<CPublishKeyword*> CKeyWordList;
+	// The list is the canonical container -- its insertion order is load-bearing for
+	// GetNextKeyword()'s round-robin publish cursor (m_posNextKeyword), so it cannot be
+	// replaced with a map.
+	typedef std::list<CPublishKeyword *> CKeyWordList;
 	CKeyWordList m_lstKeywords;
 	CKeyWordList::iterator m_posNextKeyword;
 	uint32 m_tNextPublishKeywordTime;
 
-	// Secondary index: keyword string -> position in m_lstKeywords. Lets
-	// FindKeyword() do an O(log N) lookup instead of a linear scan,
-	// collapsing AddKeywords()'s hot path on large shared sets
-	// (CSharedFileList::Reload, called once per shared file at startup)
-	// from O(N²) to O(N log N). std::list iterators are stable across
-	// other inserts/erases, so caching them here is safe.
+	// Secondary index: keyword string -> position in m_lstKeywords. Lets FindKeyword() do an
+	// O(log N) lookup instead of a linear scan, collapsing AddKeywords()'s hot path on large
+	// shared sets from O(N^2) to O(N log N). std::list iterators are stable across other
+	// inserts/erases.
 	std::map<wxString, CKeyWordList::iterator> m_keywordIndex;
 
-	CPublishKeyword* FindKeyword(const wxString& rstrKeyword, CKeyWordList::iterator* ppos = NULL);
+	CPublishKeyword *FindKeyword(const wxString &rstrKeyword, CKeyWordList::iterator *ppos = NULL);
 };
 
 CPublishKeywordList::CPublishKeywordList()
@@ -182,7 +231,7 @@
 	RemoveAllKeywords();
 }
 
-CPublishKeyword* CPublishKeywordList::GetNextKeyword()
+CPublishKeyword *CPublishKeywordList::GetNextKeyword()
 {
 	if (m_posNextKeyword == m_lstKeywords.end()) {
 		m_posNextKeyword = m_lstKeywords.begin();
@@ -198,7 +247,7 @@
 	m_posNextKeyword = m_lstKeywords.begin();
 }
 
-CPublishKeyword* CPublishKeywordList::FindKeyword(const wxString& rstrKeyword, CKeyWordList::iterator* ppos)
+CPublishKeyword *CPublishKeywordList::FindKeyword(const wxString &rstrKeyword, CKeyWordList::iterator *ppos)
 {
 	std::map<wxString, CKeyWordList::iterator>::iterator idx = m_keywordIndex.find(rstrKeyword);
 	if (idx == m_keywordIndex.end()) {
@@ -210,9 +259,9 @@
 	return *(idx->second);
 }
 
-void CPublishKeywordList::AddKeyword(const wxString& keyword, CKnownFile *file)
+void CPublishKeywordList::AddKeyword(const wxString &keyword, CKnownFile *file)
 {
-	CPublishKeyword* pubKw = FindKeyword(keyword);
+	CPublishKeyword *pubKw = FindKeyword(keyword);
 	if (pubKw == NULL) {
 		pubKw = new CPublishKeyword(keyword);
 		m_lstKeywords.push_back(pubKw);
@@ -224,9 +273,9 @@
 	pubKw->AddRef(file);
 }
 
-void CPublishKeywordList::AddKeywords(CKnownFile* pFile)
+void CPublishKeywordList::AddKeywords(CKnownFile *pFile)
 {
-	const Kademlia::WordList& wordlist = pFile->GetKadKeywords();
+	const Kademlia::WordList &wordlist = pFile->GetKadKeywords();
 
 	Kademlia::WordList::const_iterator it;
 	for (it = wordlist.begin(); it != wordlist.end(); ++it) {
@@ -234,10 +283,10 @@
 	}
 }
 
-void CPublishKeywordList::RemoveKeyword(const wxString& keyword, CKnownFile *file)
+void CPublishKeywordList::RemoveKeyword(const wxString &keyword, CKnownFile *file)
 {
 	CKeyWordList::iterator pos;
-	CPublishKeyword* pubKw = FindKeyword(keyword, &pos);
+	CPublishKeyword *pubKw = FindKeyword(keyword, &pos);
 	if (pubKw != NULL) {
 		if (pubKw->RemoveRef(file) == 0) {
 			if (pos == m_posNextKeyword) {
@@ -251,16 +300,15 @@
 	}
 }
 
-void CPublishKeywordList::RemoveKeywords(CKnownFile* pFile)
+void CPublishKeywordList::RemoveKeywords(CKnownFile *pFile)
 {
-	const Kademlia::WordList& wordlist = pFile->GetKadKeywords();
+	const Kademlia::WordList &wordlist = pFile->GetKadKeywords();
 	Kademlia::WordList::const_iterator it;
 	for (it = wordlist.begin(); it != wordlist.end(); ++it) {
 		RemoveKeyword(*it, pFile);
 	}
 }
 
-
 void CPublishKeywordList::RemoveAllKeywords()
 {
 	DeleteContents(m_lstKeywords);
@@ -269,7 +317,6 @@
 	SetNextPublishTime(0);
 }
 
-
 void CPublishKeywordList::RemoveAllKeywordReferences()
 {
 	CKeyWordList::iterator it = m_lstKeywords.begin();
@@ -278,12 +325,11 @@
 	}
 }
 
-
 void CPublishKeywordList::PurgeUnreferencedKeywords()
 {
 	CKeyWordList::iterator it = m_lstKeywords.begin();
 	while (it != m_lstKeywords.end()) {
-		CPublishKeyword* pPubKw = *it;
+		CPublishKeyword *pPubKw = *it;
 		if (pPubKw->GetRefCount() == 0) {
 			if (it == m_posNextKeyword) {
 				++m_posNextKeyword;
@@ -298,8 +344,8 @@
 	}
 }
 
-
-CSharedFileList::CSharedFileList(CKnownFileList* in_filelist){
+CSharedFileList::CSharedFileList(CKnownFileList *in_filelist)
+{
 	filelist = in_filelist;
 	reloading = false;
 	m_lastPublishED2K = 0;
@@ -314,14 +360,12 @@
 	m_dirWatcher = NULL;
 }
 
-
 CSharedFileList::~CSharedFileList()
 {
 	delete m_dirWatcher;
 	delete m_keywords;
 }
 
-
 void CSharedFileList::EnableDirectoryWatcher(bool enable)
 {
 	if (enable) {
@@ -334,11 +378,10 @@
 	}
 }
 
-
-void CSharedFileList::FindSharedFiles(const ReloadYieldCb & yieldCb, bool & aborted)
+void CSharedFileList::FindSharedFiles(const ReloadYieldCb &yieldCb, bool &aborted)
 {
 	/* Abort loading if we are shutting down. */
-	if(theApp->IsOnShutDown()) {
+	if (theApp->IsOnShutDown()) {
 		return;
 	}
 
@@ -351,15 +394,27 @@
 	{
 		wxMutexLocker lock(list_mut);
 		m_Files_map.clear();
+		// The index goes with the map it mirrors. AddFile writes a key only on a fresh insert
+		// and RemoveFile erases only the one key it recomputes, so any path this walk does not
+		// re-add -- a file deleted while its root was unshared, a DELETE lost to a watcher
+		// backend overflow, a remote deletion on a network share -- would keep an entry that
+		// makes NotifyPathAdded treat the path as already shared and silently refuse to share it
+		// again, with nothing logged at any level.
+		//
+		// Same locked scope on purpose: this puts the index under the invariant the map already
+		// has -- neither may be observed between here and the end of the walk, which is the rule
+		// that already forbids pumping the event loop during a walk.
+		m_pathIndex.clear();
+		m_listGeneration.fetch_add(1, std::memory_order_relaxed);
 	}
 
 	// All part files are automatically shared.
-	for ( uint32 i = 0; i < theApp->downloadqueue->GetFileCount(); ++i ) {
-		CPartFile* file = theApp->downloadqueue->GetFileByIndex( i );
+	for (uint32 i = 0; i < theApp->downloadqueue->GetFileCount(); ++i) {
+		CPartFile *file = theApp->downloadqueue->GetFileByIndex(i);
 
-		if ( file->GetStatus(true) == PS_READY ) {
-			AddLogLineNS(CFormat(_("Adding file %s to shares"))
-				% file->GetFullName().GetPrintable());
+		if (file->GetStatus(true) == PS_READY) {
+			AddLogLineNS(
+				CFormat(_("Adding file %s to shares")) % file->GetFullName().GetPrintable());
 			AddFile(file);
 		}
 	}
@@ -369,11 +424,11 @@
 
 	// Global incoming dir and all category incoming directories are automatically shared.
 	sharedPaths.push_back(thePrefs::GetIncomingDir());
-	for (unsigned int i = 1;i < theApp->glob_prefs->GetCatCount(); ++i) {
+	for (unsigned int i = 1; i < theApp->glob_prefs->GetCatCount(); ++i) {
 		sharedPaths.push_back(theApp->glob_prefs->GetCatPath(i));
 	}
 
-	const thePrefs::PathList& shared = theApp->glob_prefs->shareddir_list;
+	const thePrefs::PathList &shared = theApp->glob_prefs->shareddir_list;
 	sharedPaths.insert(sharedPaths.end(), shared.begin(), shared.end());
 
 	sharedPaths.sort();
@@ -384,8 +439,9 @@
 	// So just store the hashing tasks for now.
 	TaskList hashTasks;
 	size_t scanned = 0;
+	size_t excluded = 0;
 	for (std::list<CPath>::iterator it = sharedPaths.begin(); it != sharedPaths.end(); ++it) {
-		AddFilesFromDirectory(*it, hashTasks, yieldCb, scanned, aborted);
+		AddFilesFromDirectory(*it, hashTasks, yieldCb, scanned, excluded, aborted);
 		if (aborted) {
 			break;
 		}
@@ -399,24 +455,37 @@
 			addedFiles++;
 		}
 	}
+	// Accepted tasks only, matching what the old "%i unknown" suffix counted.
+	m_discoveredNewFiles += addedFiles;
+
+	// One unconditional summary. The new-file count used to ride along as a suffix here, in
+	// one of two mutually exclusive variants, and only for this route -- the watcher reported
+	// nothing at all. It now has its own line, emitted from Process() for both routes.
+	AddLogLineN(
+		CFormat(wxPLURAL("Found %i known shared file", "Found %i known shared files", GetCount())) %
+		GetCount());
 
 	if (addedFiles == 0) {
-		AddLogLineN(CFormat(wxPLURAL("Found %i known shared file", "Found %i known shared files", GetCount())) % GetCount());
+		// Make sure the AICH hashes are up to date. This is the startup sync run once the
+		// shared/known list is authoritative, so it opts into the orphan-prune (drop
+		// known2_64.met entries no longer owned by any known file). Post-hashing syncs
+		// deliberately do not prune -- see CAICHSyncTask.
+		CThreadScheduler::AddTask(new CAICHSyncTask(true));
+	}
 
-		// 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.
-		AddLogLineN(CFormat(wxPLURAL("Found %i known shared file, %i unknown", "Found %i known shared files, %i unknown", GetCount())) % GetCount() % addedFiles);
+	if (excluded > 0) {
+		AddLogLineN(CFormat(wxPLURAL("Excluded %i file from sharing by filter",
+				    "Excluded %i files from sharing by filter",
+				    excluded)) %
+			    excluded);
 	}
 }
 
-
 // Checks if the dir a is the same as b. If they are, then logs the message and returns true.
-static bool CheckDirectory(const wxString& a, const CPath& b)
+static bool CheckDirectory(const wxString &a, const CPath &b)
 {
 	if (CPath(a).IsSameDir(b)) {
-		AddLogLineC(CFormat( _("ERROR: Attempted to share %s") ) % a);
+		AddLogLineC(CFormat(_("ERROR: Attempted to share %s")) % a);
 
 		return true;
 	}
@@ -424,14 +493,15 @@
 	return false;
 }
 
-
-unsigned CSharedFileList::AddFilesFromDirectory(const CPath& directory, TaskList & hashTasks,
-	const ReloadYieldCb & yieldCb, size_t & scanned, bool & aborted)
+unsigned CSharedFileList::AddFilesFromDirectory(const CPath &directory,
+	TaskList &hashTasks,
+	const ReloadYieldCb &yieldCb,
+	size_t &scanned,
+	size_t &excluded,
+	bool &aborted)
 {
-	// Do not allow these folders to be shared:
-	//  - The .aMule folder
-	//  - The Temp folder
-	//  - The users home-dir
+	// Do not allow these folders to be shared: the .aMule folder, the Temp folder, and the
+	// user's home dir.
 	if (CheckDirectory(wxGetHomeDir(), directory)) {
 		return 0;
 	} else if (CheckDirectory(thePrefs::GetConfigDir(), directory)) {
@@ -441,15 +511,15 @@
 	}
 
 	if (!directory.DirExists()) {
-		AddLogLineNS(CFormat(_("Shared directory not found, skipping: %s"))
-			% directory.GetPrintable());
+		AddLogLineNS(
+			CFormat(_("Shared directory not found, skipping: %s")) % directory.GetPrintable());
 
 		return 0;
 	}
 
 	CDirIterator::FileType searchFor = CDirIterator::FileNoHidden;
 	if (thePrefs::ShareHiddenFiles()) {
-		 searchFor = CDirIterator::File;
+		searchFor = CDirIterator::File;
 	}
 
 	const int extraFlags = thePrefs::FollowSymlinksInShares() ? 0 : wxDIR_NO_FOLLOW;
@@ -457,15 +527,21 @@
 	unsigned knownFiles = 0;
 	unsigned addedFiles = 0;
 
-	// Yield to the caller every kYieldEvery files so the UI can stay
-	// responsive on big shared trees. 256 strikes a balance between
-	// progress-bar responsiveness (~4 updates/s on a 1 ms-per-file
-	// machine) and the overhead of the callback itself.
+	// Yield to the caller every kYieldEvery files so the UI stays responsive on big shared
+	// trees. 256 balances progress-bar responsiveness (~4 updates/s on a 1 ms-per-file
+	// machine) against the overhead of the callback itself.
 	constexpr size_t kYieldEvery = 256;
 
 	CDirIterator SharedDir(directory);
+	if (!SharedDir.IsOpened()) {
+		AddLogLineNS(
+			CFormat(_("Shared directory not readable, skipping: %s")) % directory.GetPrintable());
+
+		return 0;
+	}
 
-	for (CPath fname = SharedDir.GetFirstFile(searchFor, wxEmptyString, extraFlags); fname.IsOk(); fname = SharedDir.GetNextFile()) {
+	for (CPath fname = SharedDir.GetFirstFile(searchFor, wxEmptyString, extraFlags); fname.IsOk();
+		fname = SharedDir.GetNextFile()) {
 		if (yieldCb && ++scanned % kYieldEvery == 0) {
 			if (!yieldCb(scanned)) {
 				aborted = true;
@@ -476,93 +552,150 @@
 		}
 
 		switch (AddPathToShares(directory, fname, hashTasks)) {
-			case kAddPathQueued:  addedFiles++; break;
-			case kAddPathKnown:   knownFiles++; break;
-			case kAddPathSkipped: break;
+		case kAddPathQueued:
+			addedFiles++;
+			break;
+		case kAddPathKnown:
+		case kAddPathAlreadyShared:
+			// Both are "known" for the summary count; only the attach differs.
+			knownFiles++;
+			break;
+		case kAddPathExcluded:
+			excluded++;
+			break;
+		case kAddPathSkipped:
+			break;
 		}
 	}
 
+	// Debug only: an empty folder is normal when a tree is shared with its subfolders.
 	if ((addedFiles == 0) && (knownFiles == 0)) {
-		AddLogLineN(CFormat(_("No shareable files found in directory: %s"))
-			% directory.GetPrintable());
+		AddDebugLogLineN(logKnownFiles,
+			CFormat("No shareable files found in directory: %s") % directory.GetPrintable());
 	}
 
 	return addedFiles;
 }
 
-
-// Per-path attach. Three outcomes:
-//   kAddPathSkipped — broken link, zero size, stat failed; do nothing.
-//   kAddPathKnown   — matched a CKnownFile in known.met and was either
-//                     newly attached to the shared list or already there.
-//   kAddPathQueued  — unknown file; a CHashingTask was pushed into
-//                     hashTasks. The shared-list attach happens later
-//                     when the hashing thread finishes and calls
-//                     SafeAddKFile() on the resulting CKnownFile.
+// Per-path attach. Three outcomes: kAddPathSkipped -- broken link, zero size, stat
+// failed; do nothing. kAddPathKnown -- matched a CKnownFile in known.met and was either
+// newly attached to the shared list or already there. kAddPathQueued -- unknown file; a
+// CHashingTask was pushed into hashTasks, and the shared-list attach happens later, when
+// the hashing thread finishes and calls SafeAddKFile().
 //
-// Shared between the bulk directory walk (AddFilesFromDirectory above)
-// and the incremental watcher path (NotifyPathAdded below) so the two
+// Shared between the bulk directory walk and the incremental watcher path so the two
 // agree on shareability rules.
-CSharedFileList::AddPathResult
-CSharedFileList::AddPathToShares(const CPath& directory, const CPath& fname,
-	TaskList & hashTasks)
+CSharedFileList::AddPathResult CSharedFileList::AddPathToShares(
+	const CPath &directory, const CPath &fname, TaskList &hashTasks, bool notifyGuiOnKnownAdd)
 {
 	CPath fullPath = directory.JoinPaths(fname);
 
-	if (!fullPath.FileExists()) {
+	// User-configured name exclusion. Checked before touching the filesystem so an excluded
+	// file costs a name match and nothing else. Applies identically to the bulk walk and the
+	// incremental watcher path.
+	if (thePrefs::IsShareExcluded(fname.GetPrintable())) {
+		AddDebugLogLineN(logKnownFiles, CFormat("Excluded from shares by filter: %s") % fullPath);
+		return kAddPathExcluded;
+	}
+
+	// One stat for all three answers. Asking separately -- exists, then modification time,
+	// then size -- costs four filesystem round trips per file, and the size query opens the
+	// file to measure it. Multiplied by the share, that was the larger half of a cold-cache
+	// startup walk. A false here covers all three: a broken symlink, a non-regular file, or
+	// permissions too strict to stat.
+	time_t fdate;
+	sint64 fsize;
+	if (!fullPath.GetFileStat(fdate, fsize)) {
 		AddDebugLogLineN(logKnownFiles,
-			CFormat("Shared file does not exist (possibly a broken link): %s") % fullPath);
+			CFormat("Not a readable regular file (broken link, or permissions), skipping: %s") %
+				fullPath);
 		return kAddPathSkipped;
 	}
 
-	AddDebugLogLineN(logKnownFiles,
-		CFormat("Found shared file: %s") % fullPath);
-
-	time_t fdate = CPath::GetModificationTime(fullPath);
-	sint64 fsize = fullPath.GetFileSize();
-
-	// This will also catch files with too strict permissions.
-	if ((fdate == (time_t)-1) || (fsize == wxInvalidOffset)) {
-		AddDebugLogLineN(logKnownFiles,
-			CFormat("Failed to retrieve modification time or size for '%s', skipping.") % fullPath);
-		return kAddPathSkipped;
-	}
+	AddDebugLogLineN(logKnownFiles, CFormat("Found shared file: %s") % fullPath);
 
 	if (fsize == 0) {
-		AddDebugLogLineN(logKnownFiles,
-			CFormat("Skip zero size file '%s'") % fullPath);
+		AddDebugLogLineN(logKnownFiles, CFormat("Skip zero size file '%s'") % fullPath);
 		return kAddPathSkipped;
 	}
 
-	CKnownFile* toadd = filelist->FindKnownFile(fname, fdate, fsize);
+	CKnownFile *toadd = filelist->FindKnownFile(fname, fdate, fsize);
 	if (toadd) {
-		// Set the path BEFORE AddFile so the path index that AddFile
-		// maintains keys off the file's current GetFilePath() rather
-		// than whatever stale path was stamped on the CKnownFile by
-		// a previous shared-list membership.
+		// Ask before stamping. SetFilePath is not a plain assignment -- it calls
+		// MarkECChanged(), which hands the file a new EC generation and so pushes it into the
+		// next INC_UPDATE. Stamping and then rolling back on a decline did that twice for a
+		// net-zero path change, sending every duplicate-content file to every EC client as
+		// "changed" on each reload.
+		//
+		// The obvious guard -- stamp only when the path differs -- would not have helped: a
+		// decline with previousPath == directory is close to unreachable, since the watcher
+		// route returns on an index hit before reaching here and the bulk walk visits each root
+		// once.
+		{
+			wxMutexLocker lock(list_mut);
+			if (m_Files_map.find(toadd->GetFileHash()) != m_Files_map.end()) {
+				AddDebugLogLineN(
+					logKnownFiles, CFormat("File already shared, skipping: %s") % fname);
+				return kAddPathAlreadyShared;
+			}
+		}
+
+		// Set the path BEFORE AddFile so the path index that AddFile maintains keys off the
+		// file's current GetFilePath() rather than whatever stale path was stamped on the
+		// CKnownFile by a previous shared-list membership.
+		//
+		// The rollback below still stands as the fallback for the check-then-insert race: the
+		// membership test above drops the lock before AddFile retakes it, so a hashing task
+		// completing in between can still make AddFile decline.
+		const CPath previousPath = toadd->GetFilePath();
 		toadd->SetFilePath(directory);
 		if (AddFile(toadd)) {
-			AddDebugLogLineN(logKnownFiles,
-				CFormat("Added known file '%s' to shares")
-					% fname);
+			AddDebugLogLineN(logKnownFiles, CFormat("Added known file '%s' to shares") % fname);
+			// This record matched a file we just saw on disk and it now owns the hash in the
+			// shared list. Give it the hash in the known-file map too: that map keeps whichever
+			// known.met entry loaded last, which for duplicated content can be a different
+			// record -- and if that record's own copy has been deleted, every hash-keyed lookup
+			// resolves to a path that cannot be opened. Called outside AddFile's lock on
+			// purpose: nothing may enter knownfiles while holding the shared-list lock.
+			filelist->PromoteToCanonical(toadd);
+			// The bulk-Reload caller repaints the whole view once its walk finishes; the
+			// incremental watcher caller has no such follow-up, so tell the GUI about this
+			// freshly-shared file directly.
+			if (notifyGuiOnKnownAdd) {
+				Notify_SharedFilesShowFile(toadd);
+			}
 		} else {
-			AddDebugLogLineN(logKnownFiles,
-				CFormat("File already shared, skipping: %s")
-					% fname);
+			// The share set already holds this content, indexed under the path it was first
+			// found at. Put the file back on that path: the stamp above would otherwise leave
+			// GetFilePath() disagreeing with the index key, and nothing reconciles them. That
+			// skew is not cosmetic -- RemoveFile erases by a key it recomputes from
+			// GetFilePath(), so the erase silently misses and leaks the real entry, after which
+			// NotifyPathAdded short-circuits on the leaked key and the file can never be shared
+			// again without a restart. The upload worker also opens GetFilePath(), so it would
+			// read the copy the index does not know about.
+			//
+			// First copy found wins and stays authoritative, which is stable across reloads.
+			// Re-keying the index to the new path would make "last directory walked wins" the
+			// semantics, so which physical copy serves uploads would depend on the sort order of
+			// the shared roots.
+			toadd->SetFilePath(previousPath);
+			AddDebugLogLineN(logKnownFiles, CFormat("File already shared, skipping: %s") % fname);
+			return kAddPathAlreadyShared;
 		}
 		return kAddPathKnown;
 	}
 
 	// Not in knownfilelist - start adding thread to hash file.
-	AddDebugLogLineN(logKnownFiles,
-		CFormat("Hashing new unknown shared file '%s'") % fname);
+	AddDebugLogLineN(logKnownFiles, CFormat("Hashing new unknown shared file '%s'") % fname);
 
 	hashTasks.push_back(new CHashingTask(directory, fname));
+	// Not counted here. CThreadScheduler::DoAddTask dedups on (type, desc) and silently drops
+	// a task already queued, so a re-walk while hashing is still pending constructs the same
+	// tasks again -- counting at construction would report those files as discovered twice.
 	return kAddPathQueued;
 }
 
-
-bool CSharedFileList::AddFile(CKnownFile* pFile)
+bool CSharedFileList::AddFile(CKnownFile *pFile)
 {
 	wxASSERT(pFile->GetHashCount() == pFile->GetED2KPartHashCount());
 
@@ -570,66 +703,250 @@
 
 	CKnownFileMap::value_type entry(pFile->GetFileHash(), pFile);
 	if (m_Files_map.insert(entry).second) {
+		m_listGeneration.fetch_add(1, std::memory_order_relaxed);
 		/* Keywords to publish on Kad */
 		m_keywords->AddKeywords(pFile);
 		theStats::AddSharedFile(pFile->GetFileSize());
-		// Mirror into the path index so the watcher's per-event
-		// dispatch can resolve DELETE / MODIFY events to the
-		// CKnownFile* in O(1). Empty key (e.g. a CPartFile whose
-		// SetFilePath has not run yet) is harmless: it lives in
-		// m_pathIndex under "" until SafeAddKFile attaches the real
-		// path via the post-completion path. Stale entries left
-		// over from a previous shared-list membership are
+		// Mirror into the path index so the watcher's per-event dispatch can resolve DELETE /
+		// MODIFY events to the CKnownFile* in O(1). An empty key (a CPartFile whose SetFilePath
+		// has not run yet) is harmless: it lives in m_pathIndex under "" until SafeAddKFile
+		// attaches the real path. Stale entries from a previous shared-list membership are
 		// overwritten here.
 		const wxString key =
-			pFile->GetFilePath().JoinPaths(pFile->GetFileName()).GetRaw();
+			NormalizePathKey(pFile->GetFilePath().JoinPaths(pFile->GetFileName()).GetRaw());
 		m_pathIndexkey = pFile;
+		// Two ways this is a mass operation rather than one file the user is watching.
+		// `reloading` covers the share walk itself; the hashing queue covers what the walk
+		// leaves behind, since files it discovered are hashed asynchronously and only reach here
+		// when their task finishes -- so a first import of a large library would print one line
+		// per file with `reloading` alone.
+		//
+		// `> 1`, not `> 0`: GetPendingCount counts the running task too, so a single dropped-in
+		// file reads as 1 while it is being hashed. Misjudging the last file of an import as
+		// singular costs one extra line; misjudging a single file as bulk would lose the only
+		// feedback it ever produces.
+		const bool massOperation = reloading || CThreadScheduler::GetPendingCount(wxT("Hashing")) > 1;
+		MaybeScheduleMediaProbe(pFile, MediaProbeMode::Normal, massOperation);
+		return true;
+	}
+	return false;
+}
+
+bool CSharedFileList::MaybeScheduleMediaProbe(CKnownFile *pFile, MediaProbeMode mode, bool bulk)
+{
+	// Callers must keep pFile alive for the duration of this call. AddFile holds list_mut,
+	// which does that; the refresh walk instead snapshots the pointers under the lock and
+	// schedules outside it, which is safe because both callers run on the main thread and
+	// only the main thread removes a file from the list. It is that single-thread property
+	// doing the work, not the mutex.
+	//
+	// Probes local shared audio / video files with ffprobe to populate the six FT_MEDIA_*
+	// fields. Cost-limited three ways: only for files whose ED2K file-type is audio / video
+	// (a cheap extension filter -- a .zip renamed to .mp4 gets scheduled and ffprobe fails
+	// fast, but this skips the mass of docs / archives / images in a typical share tree),
+	// only when the file has no media metadata yet, and only one task at a time at ETP_Low
+	// so hashing and completion never starve. An empty ffprobe path is NOT "off": it means
+	// auto-detect.
+	if (!thePrefs::GetMediaMetadataEnabled()) {
+		return false;
+	}
+	// An empty preference is not "off" -- it means "whatever this machine has", which is what
+	// every place that documents the setting promises. The worker resolves it through
+	// MediaProbe::DetectedPath() and drops the job if that finds nothing; doing it there keeps
+	// the detection subprocess off this thread and pays for it once per process rather than
+	// once per file.
+	const wxString &ffprobePath = thePrefs::GetMediaMetadataFFProbePath();
+	// Shared with the GUI's menu-enable test (IsMediaProbeCandidate, in OtherFunctions): the
+	// view must not offer an action the scheduler will silently drop, which is what two copies
+	// of this rule would eventually produce.
+	if (!IsMediaProbeCandidate(pFile->GetFileName())) {
+		return false;
+	}
+	// Never probe an in-progress download. A partfile is shared while transferring, so this
+	// fires from AddFile() during the download; there is no complete file to read yet, and its
+	// metadata is derived exactly once, on completion, which re-enters here with
+	// bForceReprobe set.
+	//
+	// Only Completion lifts this, and only because a just-completed download is still a
+	// CPartFile object while its bytes are already all on disk. A Refresh walk MUST NOT
+	// inherit that licence.
+	if (mode != MediaProbeMode::Completion && pFile->IsPartFile()) {
+		AddDebugLogLineN(logMediaProbe,
+			CFormat(wxT("MediaProbe: skip (incomplete download) %s")) % pFile->GetFileName());
+		return false;
+	}
+	// GetMetaDataVer(), not a second FT_MEDIA_LENGTH test: one definition of "this file has
+	// been probed", shared with the publishers and the UI. The length-only form here never
+	// considered a codec-only file probed, so every startup re-ran ffprobe on all of them.
+	if (mode == MediaProbeMode::Normal && pFile->GetMetaDataVer() > 0) {
+		AddDebugLogLineN(logMediaProbe,
+			CFormat(wxT("MediaProbe: skip (already has metadata) %s")) % pFile->GetFileName());
+		return false;
+	}
+	// A file ffprobe already tried and could not read is not re-tried on the normal path.
+	// Nothing about it has changed since the last attempt, so a share reload would spawn
+	// ffprobe on every broken file in the library, every time, to fail identically. Refresh
+	// deliberately ignores this -- that is the whole point of an explicit re-extraction.
+	if (mode == MediaProbeMode::Normal && pFile->GetIntTagValue(FT_MEDIA_PROBE_FAILED)) {
+		AddDebugLogLineN(logMediaProbe,
+			CFormat(wxT("MediaProbe: skip (previous probe found nothing) %s")) %
+				pFile->GetFileName());
+		return false;
+	}
+	const CPath fullPath = pFile->GetFilePath().JoinPaths(pFile->GetFileName());
+	// Only probe a file that is actually on disk at this resolved path -- a stale known.met
+	// record can outlive its deleted file.
+	//
+	// Skipped for Refresh, which walks the WHOLE share from an EC handler on the main thread:
+	// one stat per file is cheap, N of them synchronously before the reply goes out is not.
+	// Nothing is lost by deferring it -- Probe stats the path again on the worker and logs the
+	// file as vanished. The cost is that `queued` counts a file that has since been deleted,
+	// which is honest: it says how many were accepted for probing, not how many produced
+	// metadata.
+	if (mode != MediaProbeMode::Refresh && !fullPath.FileExists()) {
+		return false;
+	}
+	// #280: run on the dedicated media-probe worker, NOT the shared
+	// CThreadScheduler -- a slow/hung ffprobe there wedges completions.
+	if (theApp->mediaProbeThread) {
+		AddDebugLogLineN(logMediaProbe,
+			CFormat(wxT("MediaProbe: queueing %s (ffprobe=%s)")) % pFile->GetFileName() %
+				ffprobePath);
+		theApp->mediaProbeThread->QueueProbe(pFile->GetFileHash(), fullPath, ffprobePath, bulk);
+		return true;
+	} else {
+		AddDebugLogLineN(logMediaProbe,
+			CFormat(wxT("MediaProbe: dropped %s - probe thread not ready")) %
+				pFile->GetFileName());
+	}
+	return false;
+}
+
+// A user-triggered refresh must never decline in silence. The scheduler's own "feature is
+// off" check is a debug line, which compiles out of release builds, so a refresh with
+// media metadata disabled did exactly nothing and said nothing -- the GUI greys its entry
+// out for this now, but an older GUI, a script driving EC, or the REST endpoint can still
+// ask.
+static bool MediaRefreshAvailable()
+{
+	if (thePrefs::GetMediaMetadataEnabled()) {
 		return true;
 	}
+	AddLogLineN(_("Media metadata extraction is disabled in preferences, so there is nothing to "
+		      "re-extract."));
 	return false;
 }
 
+unsigned CSharedFileList::RefreshAllMediaMetadata()
+{
+	if (!MediaRefreshAvailable()) {
+		return 0;
+	}
+	// Snapshot under the lock, schedule outside it. Holding list_mut across a whole library's
+	// worth of scheduling would block every reader, including the EC handlers this is invoked
+	// from.
+	std::vector<CKnownFile *> files;
+	{
+		wxMutexLocker lock(list_mut);
+		files.reserve(m_Files_map.size());
+		for (const auto &entry : m_Files_map) {
+			files.push_back(entry.second);
+		}
+	}
+
+	unsigned queued = 0;
+	for (CKnownFile *file : files) {
+		if (MaybeScheduleMediaProbe(file, MediaProbeMode::Refresh, /*bulk=*/true)) {
+			++queued;
+		}
+	}
+	AddLogLineN(CFormat(wxPLURAL("Re-extracting media metadata for %u shared file",
+			    "Re-extracting media metadata for %u shared files",
+			    queued)) %
+		    queued);
+	return queued;
+}
+
+unsigned CSharedFileList::RefreshMediaMetadata(const std::vector<CMD4Hash> &hashes)
+{
+	if (!MediaRefreshAvailable()) {
+		return 0;
+	}
+	unsigned queued = 0;
+	for (const CMD4Hash &hash : hashes) {
+		CKnownFile *file = GetFileByID(hash);
+		// bulk: a selection of many files is one user action and reports one summary, the same
+		// as a whole-share refresh. A selection of one is a single file the user is looking at,
+		// and keeps its per-file line.
+		if (file && MaybeScheduleMediaProbe(file, MediaProbeMode::Refresh, hashes.size() > 1)) {
+			++queued;
+		}
+	}
+	return queued;
+}
 
-void CSharedFileList::SafeAddKFile(CKnownFile* toadd, bool bOnlyAdd)
+bool CSharedFileList::RefreshMediaMetadata(const CMD4Hash &hash)
+{
+	if (!MediaRefreshAvailable()) {
+		return false;
+	}
+	CKnownFile *file = GetFileByID(hash);
+	return file && MaybeScheduleMediaProbe(file, MediaProbeMode::Refresh);
+}
+
+void CSharedFileList::SafeAddKFile(CKnownFile *toadd, bool bOnlyAdd)
 {
 	// Straight insert first. If the hash isn't already in m_Files_map
 	// this succeeds and fires the notifier as before.
 	if (AddFile(toadd)) {
 		Notify_SharedFilesShowFile(toadd);
 	} else {
-		// AddFile failed because some CKnownFile under this hash is
-		// already in m_Files_map. Two possibilities:
-		//
-		//   1. The exact same pointer was re-added — no-op.
-		//   2. CKnownFileList::Append fired the rename-during-hash
-		//      branch (same hash, same size, different name): it
-		//      demoted the prior CKnownFile to m_duplicateFileList and
-		//      installed `toadd` as the canonical entry in
-		//      m_knownFileMap. The shared-files view still points at
-		//      the demoted pointer, which has a filename that no
-		//      longer matches disk and which the duplicate-list prune
-		//      may delete later (dangling pointer in m_Files_map /
-		//      m_pathIndex). Detach the stale entry and install the
-		//      live one so the view mirrors knownfiles.
+		// AddFile failed because some CKnownFile under this hash is already in m_Files_map. Two
+		// possibilities: the exact same pointer was re-added, in which case this is a no-op; or
+		// CKnownFileList::Append fired the rename-during-hash branch (same hash, same size,
+		// different name), which demoted the prior CKnownFile to m_duplicateFileList and
+		// installed `toadd` as canonical. The shared-files view still points at the demoted
+		// pointer, whose filename no longer matches disk and which the duplicate-list prune may
+		// delete later. Detach the stale entry and install the live one so the view mirrors
+		// knownfiles.
 		CKnownFile *stale = NULL;
+		bool alreadyCanonical = false;
 		{
 			wxMutexLocker lock(list_mut);
-			CKnownFileMap::iterator it =
-				m_Files_map.find(toadd->GetFileHash());
-			if (it != m_Files_map.end() && it->second != toadd) {
-				stale = it->second;
+			CKnownFileMap::iterator it = m_Files_map.find(toadd->GetFileHash());
+			if (it != m_Files_map.end()) {
+				if (it->second != toadd) {
+					stale = it->second;
+				} else {
+					alreadyCanonical = true;
+				}
 			}
 		}
 		if (stale) {
 			AddDebugLogLineN(logKnownFiles,
 				CFormat("SafeAddKFile: rename-during-hash swap, "
-					"detaching stale '%s' for live '%s'")
-					% stale->GetFilePath().JoinPaths(stale->GetFileName())
-					% toadd->GetFilePath().JoinPaths(toadd->GetFileName()));
+					"detaching stale '%s' for live '%s'") %
+					stale->GetFilePath().JoinPaths(stale->GetFileName()) %
+					toadd->GetFilePath().JoinPaths(toadd->GetFileName()));
 			RemoveFile(stale);
 			if (AddFile(toadd)) {
 				Notify_SharedFilesShowFile(toadd);
 			}
+		} else if (alreadyCanonical) {
+			// Same pointer, already the canonical shared entry, but its path may have moved
+			// since it was first shared: a partfile downloaded this session was keyed under the
+			// Temp dir and has just been re-added from CompleteFileEnded() with
+			// SetFilePath(Incoming). AddFile()'s insert no-ops here, so the index still points
+			// at the stale Temp path.
+			RefreshPathIndex(toadd);
+			// A download just completed. Because the file was shared as a partfile, its hash was
+			// already in the map, so AddFile()'s insert -- which is what normally schedules the
+			// media probe -- no-op'd above, and a media download would otherwise only get its
+			// FT_MEDIA_* tags on the next startup rescan. QueueProbe() only enqueues, so this
+			// cannot stall the completion. Completion mode bypasses BOTH gates -- the file is
+			// still a CPartFile object at this point -- so the authoritative local probe
+			// overwrites any metadata inherited from the search result.
+			MaybeScheduleMediaProbe(toadd, MediaProbeMode::Completion);
 		}
 	}
 
@@ -640,46 +957,94 @@
 	}
 }
 
+void CSharedFileList::RefreshPathIndex(CKnownFile *file)
+{
+	if (!file) {
+		return;
+	}
+	wxMutexLocker lock(list_mut);
+	const wxString key = NormalizePathKey(file->GetFilePath().JoinPaths(file->GetFileName()).GetRaw());
+	// Drop any stale keys pointing at this file (the pre-completion Temp/<name> entry, or the
+	// "" placeholder from a not-yet-pathed CPartFile) so the index maps only its current
+	// on-disk location. O(shared files), but only runs on the rare re-add of an
+	// already-shared file.
+	bool rekeyed = false;
+	for (std::unordered_map<wxString, CKnownFile *>::iterator it = m_pathIndex.begin();
+		it != m_pathIndex.end();) {
+		if (it->second == file && it->first != key) {
+			it = m_pathIndex.erase(it);
+			rekeyed = true;
+		} else {
+			++it;
+		}
+	}
+	m_pathIndexkey = file;
+	if (rekeyed) {
+		// The file moved without entering or leaving m_Files_map, so nothing else bumps the
+		// generation for it: AddFile()'s insert no-ops on a hash that is already shared. Anything
+		// caching a view of where files live has to be told, or it keeps serving the old location
+		// -- the directory grouping in GetSharedFilesByDirectory() would leave a completed
+		// download filed under Temp until some unrelated add or remove invalidated it.
+		m_listGeneration.fetch_add(1, std::memory_order_relaxed);
+		AddDebugLogLineN(
+			logKnownFiles, CFormat("Path index re-keyed to '%s' (file moved/completed)") % key);
+	}
+}
 
 // removes first occurrence of 'toremove' in 'list'
-void CSharedFileList::RemoveFile(CKnownFile* toremove){
+void CSharedFileList::RemoveFile(CKnownFile *toremove)
+{
 	Notify_SharedFilesRemoveFile(toremove);
 	wxMutexLocker lock(list_mut);
 	if (m_Files_map.erase(toremove->GetFileHash()) > 0) {
+		m_listGeneration.fetch_add(1, std::memory_order_relaxed);
 		theStats::RemoveSharedFile(toremove->GetFileSize());
 	}
-	// Same path key we wrote into the index in AddFile(). erase() is a
-	// no-op if the entry isn't present (e.g. the file was inserted
-	// before m_pathIndex existed in an older save snapshot).
+	// Same path key we wrote into the index in AddFile(). erase() is a no-op if the entry is
+	// not present.
+	//
+	// The premise -- that the key recomputed here is the key AddFile wrote -- holds only while
+	// GetFilePath() still matches what was indexed. When it does not, this erase silently
+	// misses and leaves the real entry behind, which then makes the file permanently
+	// unshareable because NotifyPathAdded short-circuits on it. That is invisible without the
+	// diagnostic below.
 	const wxString key =
-		toremove->GetFilePath().JoinPaths(toremove->GetFileName()).GetRaw();
-	m_pathIndex.erase(key);
+		NormalizePathKey(toremove->GetFilePath().JoinPaths(toremove->GetFileName()).GetRaw());
+	const size_t erasedFromIndex = m_pathIndex.erase(key);
+	// `reloading` suppresses the check for the duration of a walk. The index is cleared at the
+	// start of one and refilled as the walk proceeds, so a removal that lands mid-walk --
+	// CUploadDiskIOThread calls RemoveFile from a worker thread -- legitimately finds nothing
+	// to erase, and the hardening would cry wolf on every such removal.
+	if (erasedFromIndex == 0 && !m_pathIndex.empty() && !reloading) {
+		// Not fatal on its own -- the older-snapshot case above is legitimate -- but it is the
+		// signature of a desynchronised index, so say so rather than leaking an entry in
+		// silence.
+		AddDebugLogLineC(logKnownFiles,
+			CFormat("Path index: no entry under '%s' to erase for a file being removed from "
+				"shares; the index may be out of step with the file's path") %
+				key);
+	}
 	/* This file keywords must not be published to kad anymore */
 	m_keywords->RemoveKeywords(toremove);
 }
 
+// Incremental rescan entry points used by CSharedDirWatcher. These exist so the watcher
+// can apply a single fs-watcher event without firing the bulk Reload() path, which on a
+// 100 k+ file shareset blocks the GUI for minutes per event.
 
-// Incremental rescan entry points used by CSharedDirWatcher.
-//
-// These exist so the watcher can apply a single fs-watcher event
-// without firing the bulk Reload() path, which on a 100 k+ file
-// shareset blocks the GUI for minutes per event. See issue #745.
-
-void CSharedFileList::NotifyPathAdded(const wxString& fullPath)
+void CSharedFileList::NotifyPathAdded(const wxString &fullPath, bool bulkScan)
 {
 	if (fullPath.IsEmpty()) {
 		return;
 	}
 
-	// Already shared? CPartFile::CompleteFile() and SafeAddKFile() are
-	// the canonical add paths for completed downloads — by the time
-	// the watcher's CREATE event fires for a freshly-renamed file in
-	// Incoming, the CKnownFile is usually already in m_Files_map and
-	// the path index. Nothing to do in that case. Scoped lock so we
-	// drop list_mut before doing any filesystem work.
+	// Already shared? CPartFile::CompleteFile() and SafeAddKFile() are the canonical add paths
+	// for completed downloads -- by the time the watcher's CREATE event fires for a
+	// freshly-renamed file in Incoming, the CKnownFile is usually already in m_Files_map and
+	// the path index. Scoped lock so list_mut is dropped before any filesystem work.
 	{
 		wxMutexLocker existsCheck(list_mut);
-		if (m_pathIndex.find(fullPath) != m_pathIndex.end()) {
+		if (m_pathIndex.find(NormalizePathKey(fullPath)) != m_pathIndex.end()) {
 			return;
 		}
 	}
@@ -695,67 +1060,137 @@
 	}
 
 	TaskList hashTasks;
-	switch (AddPathToShares(directory, fname, hashTasks)) {
-		case kAddPathQueued:
-			// Hand the new hashing task to the scheduler. The thread
-			// will call SafeAddKFile() when it finishes, which is
-			// what publishes the file to peers + the GUI.
-			for (TaskList::iterator it = hashTasks.begin(); it != hashTasks.end(); ++it) {
-				CThreadScheduler::AddTask(*it);
+	switch (AddPathToShares(directory, fname, hashTasks, /*notifyGuiOnKnownAdd=*/true)) {
+	case kAddPathQueued:
+		// Hand the new hashing task to the scheduler. The thread calls SafeAddKFile() when it
+		// finishes, which is what publishes the file to peers and the GUI.
+		for (TaskList::iterator it = hashTasks.begin(); it != hashTasks.end(); ++it) {
+			if (CThreadScheduler::AddTask(*it)) {
+				++m_discoveredNewFiles;
 			}
-			break;
-		case kAddPathKnown:
-		case kAddPathSkipped:
-			// AddPathToShares already wrote a debug log line; no
-			// further action needed.
-			break;
+		}
+		break;
+	case kAddPathKnown:
+		// A file already in known.met, moved or renamed into a shared directory: nothing is
+		// hashed and nothing is probed, so without this the file would silently become shared
+		// and be published to peers with no info-level record at all.
+		//
+		// Deliberately here and not inside AddPathToShares, which the bulk walk also calls:
+		// there the already-known case is the overwhelming majority of entries. The watcher path
+		// is different in kind -- it is an event, it fires at unpredictable times, and no summary
+		// line covers it.
+		if (bulkScan) {
+			// One line per file would be thousands during a tree walk; the
+			// tick prints a single summary instead.
+			++m_attachedKnownFiles;
+		} else {
+			AddLogLineN(CFormat(_("Now sharing file: %s")) % fullPath);
+		}
+		break;
+	case kAddPathAlreadyShared:
+	case kAddPathExcluded:
+	case kAddPathSkipped:
+		// AddPathToShares already wrote a debug log line; no further action needed.
+		// Already-shared in particular must not announce a share that did not happen.
+		break;
 	}
 }
 
-
-void CSharedFileList::NotifyPathRemoved(const wxString& fullPath)
+void CSharedFileList::NotifyPathRemoved(const wxString &fullPath)
 {
 	if (fullPath.IsEmpty()) {
 		return;
 	}
 
-	// RemoveFile re-acquires list_mut itself, so we hold list_mut
-	// only long enough to resolve the path → CKnownFile* lookup and
-	// then drop it before calling RemoveFile.
-	CKnownFile* file = NULL;
+	// RemoveFile re-acquires list_mut itself, so we hold list_mut only long enough to resolve
+	// the path -> CKnownFile* lookup and then drop it before calling RemoveFile.
+	CKnownFile *file = NULL;
 	{
 		wxMutexLocker lock(list_mut);
-		auto it = m_pathIndex.find(fullPath);
+		auto it = m_pathIndex.find(NormalizePathKey(fullPath));
 		if (it == m_pathIndex.end()) {
 			return;
 		}
 		file = it->second;
 	}
 
-	AddDebugLogLineN(logKnownFiles,
-		CFormat("Watcher: detaching deleted file '%s' from shares") % fullPath);
+	// Symmetric with "Now sharing file" above: a shared file disappearing
+	// behind the user's back is at least as interesting as one appearing.
+	AddLogLineN(CFormat(_("Stopped sharing removed file: %s")) % fullPath);
+	AddDebugLogLineN(
+		logKnownFiles, CFormat("Watcher: detaching deleted file '%s' from shares") % fullPath);
 	RemoveFile(file);
 }
 
+void CSharedFileList::NotifyDirRemoved(const wxString &dirPath)
+{
+	if (dirPath.IsEmpty()) {
+		return;
+	}
+
+	// Trailing separator so ".../Season 1" does not match sibling ".../Season 10".
+	// NFC-fold to match the normalized keys stored in m_pathIndex (see NormalizePathKey).
+	wxString prefix = NormalizePathKey(dirPath);
+	const wxString sep(wxFileName::GetPathSeparator());
+	if (!prefix.EndsWith(sep)) {
+		prefix += sep;
+	}
+
+	// Collect under the lock, detach outside it: RemoveFile re-locks and erases
+	// from m_pathIndex.
+	std::vector<CKnownFile *> victims;
+	{
+		wxMutexLocker lock(list_mut);
+		for (std::unordered_map<wxString, CKnownFile *>::const_iterator it = m_pathIndex.begin();
+			it != m_pathIndex.end();
+			++it) {
+			if (it->first.StartsWith(prefix)) {
+				victims.push_back(it->second);
+			}
+		}
+	}
+
+	if (victims.empty()) {
+		return;
+	}
 
-void CSharedFileList::NotifyPathModified(const wxString& fullPath)
+	// One summary line, not one per file: a removed subtree can hold thousands of files and
+	// the count is already in hand.
+	//
+	// The count is what this call actually detached, which on some backends is only part of
+	// the subtree. macOS FSEvents delivers per-file DELETEs racing the directory DELETE, so
+	// NotifyPathRemoved above already detached some files individually and only the remainder
+	// is left for this sweep. Every file is still logged exactly once and none is
+	// double-counted, so the accounting is right even though the shape is not the single tidy
+	// line it is on a backend that coalesces the subtree into one event.
+	AddLogLineN(CFormat(wxPLURAL("Stopped sharing %u file under removed directory: %s",
+			    "Stopped sharing %u files under removed directory: %s",
+			    static_cast<unsigned>(victims.size()))) %
+		    static_cast<unsigned>(victims.size()) % dirPath);
+	AddDebugLogLineN(logKnownFiles,
+		CFormat("Watcher: detaching %zu shared file(s) under removed dir '%s'") % victims.size() %
+			dirPath);
+	for (std::vector<CKnownFile *>::iterator it = victims.begin(); it != victims.end(); ++it) {
+		RemoveFile(*it);
+	}
+}
+
+void CSharedFileList::NotifyPathModified(const wxString &fullPath)
 {
 	if (fullPath.IsEmpty()) {
 		return;
 	}
 
-	// MODIFY events fire on metadata touches (utime, chmod, etc.) as
-	// well as on content writes. Only a size/mtime delta warrants
-	// re-hashing. Look up the file in the path index and compare its
-	// known mtime/size against what's on disk.
-	CKnownFile* file = NULL;
+	// MODIFY events fire on metadata touches (utime, chmod, etc.) as well as on content
+	// writes. Only a size/mtime delta warrants re-hashing. Look up the file in the path index
+	// and compare its known mtime/size against what is on disk.
+	CKnownFile *file = NULL;
 	{
 		wxMutexLocker lock(list_mut);
-		auto it = m_pathIndex.find(fullPath);
+		auto it = m_pathIndex.find(NormalizePathKey(fullPath));
 		if (it == m_pathIndex.end()) {
-			// Path appeared via MODIFY but wasn't already shared
-			// — treat as add. List_mut is dropped at scope exit
-			// before NotifyPathAdded re-acquires it.
+			// Path appeared via MODIFY but was not already shared -- treat as add. list_mut is
+			// dropped at scope exit before NotifyPathAdded re-acquires it.
 			file = NULL;
 		} else {
 			file = it->second;
@@ -779,7 +1214,7 @@
 	}
 
 	if (fdiskDate == file->GetLastChangeDatetime() && fdiskSize == (sint64)file->GetFileSize()) {
-		// Same size, same mtime — content unchanged. Drop the event.
+		// Same size, same mtime -- content unchanged. Drop the event.
 		return;
 	}
 
@@ -791,13 +1226,11 @@
 	NotifyPathAdded(fullPath);
 }
 
-
 void CSharedFileList::Reload()
 {
 	Reload(nullptr);
 }
 
-
 bool CSharedFileList::Reload(ReloadYieldCb yieldCb)
 {
 	// Madcat - Disable reloading if reloading already in progress.
@@ -805,38 +1238,57 @@
 	// 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) {
-		// Already running. Surface that to the caller as a non-abort,
-		// non-complete state — they shouldn't react as if they
-		// cancelled, but also haven't completed a fresh scan.
+		// Already running. The walk in flight started before this caller's roots or filters were
+		// in place, so it cannot be the fresh scan they asked for -- leave a request standing so
+		// the next tick runs one. Without this a caller that commits new shared roots and reads
+		// the return as success persists them and never walks them. Surfaced to the caller as a
+		// non-abort, non-complete state.
+		m_reloadLatch.Request();
 		return true;
 	}
 
-	AddDebugLogLineN(logKnownFiles, "Reload shared files");
+	// Take any outstanding RequestReload() with us: this walk is the one that satisfies it, so
+	// a GUI caller can run it (with progress) right after something requested one without
+	// Process() running a second, redundant walk a tick later. Anything requested from here on
+	// belongs to the next walk, and an abort below hands this request back rather than
+	// swallowing it.
+	const bool servingRequest = m_reloadLatch.BeginWalk();
+
+	// Info, not debug: now that EC callers get an immediate reply instead of blocking until
+	// the walk ends, the log is how they observe it starting. The end-of-walk summary is
+	// already an info line, so the two form a pair.
+	AddLogLineN(_("Reloading shared files..."));
 	reloading = true;
 	Notify_SharedFilesRemoveAllItems();
 
 	/* All Kad keywords must be removed.
 	 *
-	 * m_keywords has no internal locking; CSharedFileList::list_mut is
-	 * the outer lock for both m_Files_map and m_keywords (every other
-	 * AddFile / RemoveFile call takes it around m_keywords operations).
-	 * Without the lock here we race CUploadDiskIOThread, which calls
-	 * theApp->sharedfiles->RemoveFile(srcfile) from a worker thread when
-	 * a previously-shared file disappears under it (e.g. user renaming
-	 * a file in Incoming with shared-dir watching enabled, issue #685).
-	 * The worker holds list_mut while it mutates m_keywords via
-	 * RemoveKeywords; concurrent unlocked iteration over m_lstKeywords /
-	 * m_keywordIndex here invalidates iterators / uses freed
-	 * CPublishKeyword*.  Lock only around the keyword ops, NOT around
-	 * FindSharedFiles -- that walks the filesystem and would block the
-	 * worker pool for seconds at a time. */
+	 * m_keywords has no internal locking; CSharedFileList::list_mut is the outer lock for
+	 * both m_Files_map and m_keywords (every other AddFile / RemoveFile call takes it
+	 * around m_keywords operations). Without the lock here we race CUploadDiskIOThread,
+	 * which calls theApp->sharedfiles->RemoveFile(srcfile) from a worker thread when a
+	 * previously-shared file disappears under it (e.g. the user renaming a file in
+	 * Incoming with shared-dir watching enabled, issue #685). The worker holds list_mut
+	 * while it mutates m_keywords via RemoveKeywords; concurrent unlocked iteration over
+	 * m_lstKeywords / m_keywordIndex here invalidates iterators / uses freed
+	 * CPublishKeyword*. Lock only around the keyword ops, NOT around FindSharedFiles --
+	 * that walks the filesystem and would block the worker pool for seconds at a time. */
 	{
 		wxMutexLocker lock(list_mut);
 		m_keywords->RemoveAllKeywordReferences();
 	}
 
 	/* Public identifiers must be erased as they might be invalid now */
-	m_PublicSharedDirNames.clear();
+	{
+		// Under list_mut: IsShared() builds m_sharedDirKeys through a const method and takes the
+		// lock to do it, so this side has to take it too. The public-name map and its index are
+		// cleared in the same scope so the pair cannot be seen half-emptied.
+		wxMutexLocker lock(list_mut);
+		m_PublicSharedDirNames.clear();
+		m_publicNameByDirKey.clear();
+		m_sharedDirKeys.clear();
+		m_sharedDirKeysBuilt = false;
+	}
 
 	bool aborted = false;
 	FindSharedFiles(yieldCb, aborted);
@@ -855,11 +1307,13 @@
 		m_dirWatcher->Refresh();
 	}
 
-	// Tell KnownFileList that a full scan has now run -- this
-	// gates the duplicate-list cap-prune in Save(), so the prune
-	// never fires while the pin set is unpopulated (which would
-	// drop records the scan was about to pin). Only on non-aborted
-	// scans: a cancelled mid-scan leaves the pin set partial.
+	// Tell KnownFileList that a full scan has now run -- this gates the duplicate-list
+	// cap-prune in Save(), so the prune never fires while the pin set is unpopulated, which
+	// would drop records the scan was about to pin. Only on non-aborted scans: a cancelled
+	// mid-scan leaves the pin set partial, and satisfies no request, so the request is handed
+	// back.
+	m_reloadLatch.EndWalk(servingRequest, aborted);
+
 	if (!aborted && filelist) {
 		filelist->MarkInitialShareScanComplete();
 	}
@@ -868,11 +1322,10 @@
 	return !aborted;
 }
 
-
 const CKnownFile *CSharedFileList::GetFileByIndex(unsigned int index) const
 {
 	wxMutexLocker lock(list_mut);
-	if ( index >= m_Files_map.size() ) {
+	if (index >= m_Files_map.size()) {
 		return NULL;
 	}
 	CKnownFileMap::const_iterator pos = m_Files_map.begin();
@@ -880,82 +1333,90 @@
 	return pos->second;
 }
 
-
-CKnownFile*	CSharedFileList::GetFileByID(const CMD4Hash& filehash)
+CKnownFile *CSharedFileList::GetFileByID(const CMD4Hash &filehash)
 {
 	wxMutexLocker lock(list_mut);
 	CKnownFileMap::iterator it = m_Files_map.find(filehash);
 
-	if ( it != m_Files_map.end() ) {
+	if (it != m_Files_map.end()) {
 		return it->second;
 	} else {
 		return NULL;
 	}
 }
 
-short CSharedFileList::GetFilePriorityByID(const CMD4Hash& filehash)
+short CSharedFileList::GetFilePriorityByID(const CMD4Hash &filehash)
 {
-	CKnownFile* tocheck = GetFileByID(filehash);
+	CKnownFile *tocheck = GetFileByID(filehash);
 	if (tocheck)
 		return tocheck->GetUpPriority();
 	else
-		return -10;	// file doesn't exist
+		return -10; // file doesn't exist
 }
 
-
-void CSharedFileList::CopyFileList(std::vector<CKnownFile*>& out_list) const
+void CSharedFileList::CopyFileList(std::vector<CKnownFile *> &out_list) const
 {
 	wxMutexLocker lock(list_mut);
 
 	out_list.reserve(m_Files_map.size());
-	for (
-		CKnownFileMap::const_iterator it = m_Files_map.begin();
-		it != m_Files_map.end();
-		++it
-		) {
+	for (CKnownFileMap::const_iterator it = m_Files_map.begin(); it != m_Files_map.end(); ++it) {
 		out_list.push_back(it->second);
 	}
 }
 
+void CSharedFileList::GetSharedFileNames(wxArrayString &out) const
+{
+	wxMutexLocker lock(list_mut);
 
+	out.Alloc(m_Files_map.size());
+	for (const auto &entry : m_Files_map) {
+		out.Add(entry.second->GetFileName().GetPrintable());
+	}
+}
 
-void CSharedFileList::UpdateItem(CKnownFile* toupdate)
+void CSharedFileList::UpdateItem(CKnownFile *toupdate)
 {
 	Notify_SharedFilesUpdateItem(toupdate);
 }
 
-
-void CSharedFileList::GetSharedFilesByDirectory(const wxString& directory,
-				CKnownFilePtrList& list)
+void CSharedFileList::GetSharedFilesByDirectory(const wxString &directory, CKnownFilePtrList &list)
 {
 	wxMutexLocker lock(list_mut);
 
-	const CPath dir = CPath(directory);
-	for (CKnownFileMap::iterator pos = m_Files_map.begin();
-	     pos != m_Files_map.end(); ++pos ) {
-		CKnownFile *cur_file = pos->second;
-
-		if (dir.IsSameDir(cur_file->GetFilePath())) {
-			list.push_back(cur_file);
+	// Answered from the grouping rather than by walking every shared file: a browsing peer
+	// asks one directory at a time, and the walk made that O(directories x files) IsSameDir()
+	// calls, each normalising both paths.
+	const uint64 generation = m_listGeneration.load(std::memory_order_relaxed);
+	if (!m_dirGroupsBuilt || m_dirGroupsAt != generation) {
+		m_dirGroups.clear();
+		for (const auto &entry : m_Files_map) {
+			CKnownFile *cur_file = entry.second;
+			m_dirGroupscur_file->GetFilePath().GetDirKey().push_back(cur_file);
 		}
+		m_dirGroupsAt = generation;
+		m_dirGroupsBuilt = true;
+	}
+
+	const std::map<wxString, CKnownFilePtrList>::const_iterator group =
+		m_dirGroups.find(CPath(directory).GetDirKey());
+	if (group != m_dirGroups.end()) {
+		list.insert(list.end(), group->second.begin(), group->second.end());
 	}
 }
 
 /* ---------------- Network ----------------- */
 
-void CSharedFileList::ClearED2KPublishInfo(){
-	CKnownFile* cur_file;
+void CSharedFileList::ClearED2KPublishInfo()
+{
+	CKnownFile *cur_file;
 	m_lastPublishED2KFlag = true;
 	wxMutexLocker lock(list_mut);
-	// Suppress per-row GUI updates while we walk every shared file.
-	// SetPublishedED2K() notifies the SharedFilesCtrl which does an
-	// O(N) FindItem per call; without this, a 100k-file shared list
-	// makes every server disconnect freeze the main thread for
-	// minutes. SetPublishedED2K() is also a no-op when the value
-	// didn't change, so the genuinely-false→false majority is free.
-	// See #302.
+	// Suppress per-row GUI updates while we walk every shared file. SetPublishedED2K()
+	// notifies the SharedFilesCtrl, which does an O(N) FindItem per call; without this, a
+	// 100k-file shared list makes every server disconnect freeze the main thread for minutes.
+	// SetPublishedED2K() is also a no-op when the value did not change.
 	Notify_SharedFilesBeginBulkUpdate();
-	for (CKnownFileMap::iterator pos = m_Files_map.begin(); pos != m_Files_map.end(); ++pos ) {
+	for (CKnownFileMap::iterator pos = m_Files_map.begin(); pos != m_Files_map.end(); ++pos) {
 		cur_file = pos->second;
 		cur_file->SetPublishedED2K(false);
 	}
@@ -965,75 +1426,82 @@
 void CSharedFileList::ClearKadSourcePublishInfo()
 {
 	wxMutexLocker lock(list_mut);
-	CKnownFile* cur_file;
-	for (CKnownFileMap::iterator pos = m_Files_map.begin(); pos != m_Files_map.end(); ++pos ) {
+	CKnownFile *cur_file;
+	for (CKnownFileMap::iterator pos = m_Files_map.begin(); pos != m_Files_map.end(); ++pos) {
 		cur_file = pos->second;
-		cur_file->SetLastPublishTimeKadSrc(0,0);
+		cur_file->SetLastPublishTimeKadSrc(0, 0);
 	}
 }
 
-void CSharedFileList::RepublishFile(CKnownFile* pFile)
+void CSharedFileList::RepublishFile(CKnownFile *pFile)
 {
-	CServer* server = theApp->serverconnect->GetCurrentServer();
+	CServer *server = theApp->serverconnect->GetCurrentServer();
 	if (server && (server->GetTCPFlags() & SRV_TCPFLG_COMPRESSION)) {
 		m_lastPublishED2KFlag = true;
-		pFile->SetPublishedED2K(false); // FIXME: this creates a wrong 'No' for the ed2k shared info in the listview until the file is shared again.
+		pFile->SetPublishedED2K(false); // FIXME: this creates a wrong 'No' for the ed2k shared info
+						// in the listview until the file is shared again.
 	}
 }
 
 static uint8 GetRealPrio(uint8 in)
 {
-	switch(in) {
-		case 4 : return 0;
-		case 0 : return 1;
-		case 1 : return 2;
-		case 2 : return 3;
-		case 3 : return 4;
+	switch (in) {
+	case 4:
+		return 0;
+	case 0:
+		return 1;
+	case 1:
+		return 2;
+	case 2:
+		return 3;
+	case 3:
+		return 4;
 	}
 	return 0;
 }
 
-static bool SortFunc( const CKnownFile* fileA, const CKnownFile* fileB )
+static bool SortFunc(const CKnownFile *fileA, const CKnownFile *fileB)
 {
-    return GetRealPrio(fileA->GetUpPriority()) < GetRealPrio(fileB->GetUpPriority());
+	return GetRealPrio(fileA->GetUpPriority()) < GetRealPrio(fileB->GetUpPriority());
 }
 
-void CSharedFileList::SendListToServer(){
-	std::vector<CKnownFile*> SortedList;
+void CSharedFileList::SendListToServer()
+{
+	std::vector<CKnownFile *> SortedList;
 
 	{
 		wxMutexLocker lock(list_mut);
 
-		if (m_Files_map.empty() || !theApp->IsConnectedED2K() ) {
+		if (m_Files_map.empty() || !theApp->IsConnectedED2K()) {
 			return;
 		}
 
 		// Getting a sorted list of the non-published files.
-		SortedList.reserve( m_Files_map.size() );
+		SortedList.reserve(m_Files_map.size());
 
 		CKnownFileMap::iterator it = m_Files_map.begin();
-		for ( ; it != m_Files_map.end(); ++it ) {
+		for (; it != m_Files_map.end(); ++it) {
 			if (!it->second->GetPublishedED2K()) {
-				SortedList.push_back( it->second );
+				SortedList.push_back(it->second);
 			}
 		}
 	}
 
-	std::sort( SortedList.begin(), SortedList.end(), SortFunc );
+	std::sort(SortedList.begin(), SortedList.end(), SortFunc);
 
 	// Limits for the server.
 
-	CServer* server = theApp->serverconnect->GetCurrentServer();
+	CServer *server = theApp->serverconnect->GetCurrentServer();
 	if (!server) {
 		return;
 	}
 
 	uint32 limit = server->GetSoftFiles();
-	if( limit == 0 || limit > 200 ) {
+	if (limit == 0 || limit > 200) {
 		limit = 200;
 	}
 
-	if( (uint32)SortedList.size() < limit ) {
+	if ((uint32)SortedList.size() < limit) {
 		limit = SortedList.size();
 		if (limit == 0) {
 			m_lastPublishED2KFlag = false;
@@ -1043,22 +1511,18 @@
 
 	CMemFile files;
 
-	// Files-sent count is patched in after the loop. We can't write the
-	// final number up-front because the loop body filters out >4GB files
-	// when the server doesn't advertise SRV_TCPFLG_LARGEFILES, and we
-	// only know how many actually made it into the packet once the loop
-	// has run. Pre-fix the header was hard-coded to `limit`, so the
-	// packet header claimed N files but the body could carry N-K of them
-	// for any K >4GB files in the prefix; legacy non-LF servers see a
-	// short read against the count and may reject or partially process
-	// the publish (#347).
+	// Files-sent count is patched in after the loop. The final number cannot be written up
+	// front because the loop body filters out >4GB files when the server does not advertise
+	// SRV_TCPFLG_LARGEFILES, and how many made it into the packet is only known once the loop
+	// has run. Hard-coding `limit` made the header claim N files while the body carried N-K,
+	// and a legacy non-LF server sees a short read against the count.
 	files.WriteUInt32(0);
 
 	uint32 count = 0;
 	// Add to packet
-	std::vector<CKnownFile*>::iterator sorted_it = SortedList.begin();
-	for ( ; (sorted_it != SortedList.end()) && (count < limit); ++sorted_it ) {
-		CKnownFile* file = *sorted_it;
+	std::vector<CKnownFile *>::iterator sorted_it = SortedList.begin();
+	for (; (sorted_it != SortedList.end()) && (count < limit); ++sorted_it) {
+		CKnownFile *file = *sorted_it;
 		if (!file->IsLargeFile() || server->SupportsLargeFilesTCP()) {
 			file->CreateOfferedFilePacket(&files, server, NULL);
 			++count;
@@ -1066,12 +1530,9 @@
 		file->SetPublishedED2K(true);
 	}
 
-	// Nothing to publish to this server (e.g. every unpublished file in
-	// our prefix is >4GB and the server doesn't advertise
-	// SRV_TCPFLG_LARGEFILES). Sending an OP_OFFERFILES with count=0
-	// would just be ~28 bytes of TCP overhead per ED2KREPUBLISHTIME
-	// tick — the server gets no information from "0 offered" that it
-	// didn't already have from us being silent.
+	// Nothing to publish to this server -- e.g. every unpublished file in our prefix is >4GB
+	// and the server does not advertise SRV_TCPFLG_LARGEFILES. Sending an OP_OFFERFILES with
+	// count=0 would just be ~28 bytes of TCP overhead per republish tick.
 	if (count == 0) {
 		return;
 	}
@@ -1080,26 +1541,52 @@
 	files.Seek(0);
 	files.WriteUInt32(count);
 
-	CPacket* packet = new CPacket(files, OP_EDONKEYPROT, OP_OFFERFILES);
-	// compress packet
-	//   - this kind of data is highly compressible (N * (1 MD4 and at least 3 string meta data tags and 1 integer meta data tag))
-	//   - the min. amount of data needed for one published file is ~100 bytes
-	//   - this function is called once when connecting to a server and when a file becomes shareable - so, it's called rarely.
-	//   - if the compressed size is still >= the original size, we send the uncompressed packet
-	// therefore we always try to compress the packet
-	if (server->GetTCPFlags() & SRV_TCPFLG_COMPRESSION){
+	CPacket *packet = new CPacket(files, OP_EDONKEYPROT, OP_OFFERFILES);
+	// Compress the packet: this kind of data is highly compressible (per file, an MD4 plus at
+	// least three string meta tags and one integer one), the minimum per published file is
+	// ~100 bytes, and this is called rarely -- once on connecting to a server and when a file
+	// becomes shareable. If the compressed size is still >= the original, the uncompressed
+	// packet is sent.
+	if (server->GetTCPFlags() & SRV_TCPFLG_COMPRESSION) {
 		packet->PackPacket();
 	}
 
 	theStats::AddUpOverheadServer(packet->GetPacketSize());
-	theApp->serverconnect->SendPacket(packet,true);
+	theApp->serverconnect->SendPacket(packet, true);
 }
 
-
 void CSharedFileList::Process()
 {
+	// Deferred reloads requested by callers on the core event loop (EC handlers, the watcher's
+	// dropped-events fallback) run here rather than inline in the caller. The `reloading`
+	// check means a request that arrives mid-walk stays pending and runs on a later tick
+	// instead of re-entering.
+	if (m_reloadLatch.ShouldStartFromTick(reloading)) {
+		Reload();
+	}
+
+	// Flushed after the drain above, so that when a reload runs on this tick its count is
+	// printed immediately after its own "Found N known shared files" summary rather than
+	// arriving a second later, detached from it. Only when non-zero: a pass that discovered
+	// nothing says nothing.
+	if (m_attachedKnownFiles) {
+		AddLogLineN(CFormat(wxPLURAL("Now sharing %u file found in a new shared directory",
+				    "Now sharing %u files found in new shared directories",
+				    m_attachedKnownFiles)) %
+			    m_attachedKnownFiles);
+		m_attachedKnownFiles = 0;
+	}
+
+	if (m_discoveredNewFiles) {
+		AddLogLineN(CFormat(wxPLURAL("Discovered %u new shared file",
+				    "Discovered %u new shared files",
+				    m_discoveredNewFiles)) %
+			    m_discoveredNewFiles);
+		m_discoveredNewFiles = 0;
+	}
+
 	Publish();
-	if( !m_lastPublishED2KFlag || ( ::GetTickCount64() - m_lastPublishED2K < ED2KREPUBLISHTIME ) ) {
+	if (!m_lastPublishED2KFlag || (::GetTickCount64() - m_lastPublishED2K < ED2KREPUBLISHTIME)) {
 		return;
 	}
 	SendListToServer();
@@ -1112,143 +1599,172 @@
 	unsigned int tNow = time(NULL);
 	bool IsFirewalled = theApp->IsFirewalled();
 
-	if( Kademlia::CKademlia::IsConnected() && ( !IsFirewalled || ( IsFirewalled && theApp->clientlist->GetBuddyStatus() == Connected)) && GetCount() && Kademlia::CKademlia::GetPublish()) {
-		//We are connected to Kad. We are either open or have a buddy. And Kad is ready to start publishing.
+	if (Kademlia::CKademlia::IsConnected() &&
+		(!IsFirewalled || (IsFirewalled && theApp->clientlist->GetBuddyStatus() == Connected)) &&
+		GetCount() && Kademlia::CKademlia::GetPublish()) {
+		// We are connected to Kad. We are either open or have a buddy. And Kad is ready to start
+		// publishing.
 
-		if( Kademlia::CKademlia::GetTotalStoreKey() < KADEMLIATOTALSTOREKEY) {
+		if (Kademlia::CKademlia::GetTotalStoreKey() < KADEMLIATOTALSTOREKEY) {
 
-			// list_mut serialises CPublishKeywordList access against
-			// CUploadDiskIOThread's RemoveFile -> RemoveKeywords path,
-			// which mutates pPubKw->references and ref counts from a
-			// worker thread.  Without the lock the cursor advance and
-			// the GetReferences() iteration below race with that path
-			// (issue #685).  Kad's StartSearch / Go / GetClosestTo /
-			// SendFindValue do not re-enter list_mut, so the lock can
-			// be held across the Kad call.
+			// list_mut serialises CPublishKeywordList access against CUploadDiskIOThread's
+			// RemoveFile -> RemoveKeywords path, which mutates pPubKw->references and ref counts
+			// from a worker thread. Without the lock the cursor advance and the GetReferences()
+			// iteration below race with that path. Kad's StartSearch / Go / GetClosestTo /
+			// SendFindValue do not re-enter list_mut, so the lock can be held across the Kad
+			// call.
 			wxMutexLocker lock(list_mut);
 
-			//We are not at the max simultaneous keyword publishes
+			// We are not at the max simultaneous keyword publishes
 			if (tNow >= m_keywords->GetNextPublishTime()) {
 
-				//Enough time has passed since last keyword publish
+				// Enough time has passed since last keyword publish
 
-				//Get the next keyword which has to be (re)-published
-				CPublishKeyword* pPubKw = m_keywords->GetNextKeyword();
+				// Get the next keyword which has to be (re)-published
+				CPublishKeyword *pPubKw = m_keywords->GetNextKeyword();
 				if (pPubKw) {
 
-					//We have the next keyword to check if it can be published
+					// We have the next keyword to check if it can be published
 
-					//Debug check to make sure things are going well.
-					wxASSERT( pPubKw->GetRefCount() != 0 );
+					// Debug check to make sure things are going well.
+					wxASSERT(pPubKw->GetRefCount() != 0);
 
 					if (tNow >= pPubKw->GetNextPublishTime()) {
-						//This keyword can be published.
-						Kademlia::CSearch* pSearch = Kademlia::CSearchManager::PrepareLookup(Kademlia::CSearch::STOREKEYWORD, false, pPubKw->GetKadID());
+						// This keyword can be published.
+						Kademlia::CSearch *pSearch =
+							Kademlia::CSearchManager::PrepareLookup(
+								Kademlia::CSearch::STOREKEYWORD,
+								false,
+								pPubKw->GetKadID());
 						if (pSearch) {
-							//pSearch was created. Which means no search was already being done with this HashID.
-							//This also means that it was checked to see if network load wasn't a factor.
+							// pSearch was created, so no search was already
+							// being done with this HashID -- which also means
+							// network load was checked.
 
-							//This sets the filename into the search object so we can show it in the gui.
+							// This sets the filename into the search object so we
+							// can show it in the gui.
 							pSearch->SetFileName(pPubKw->GetKeyword());
 
-							//Add all file IDs which relate to the current keyword to be published
-							const KnownFileArray& aFiles = pPubKw->GetReferences();
+							// Add all file IDs which relate to the current
+							// keyword to be published
+							const KnownFileArray &aFiles =
+								pPubKw->GetReferences();
 							uint32 count = 0;
 							for (unsigned int f = 0; f < aFiles.size(); ++f) {
 
-								//Only publish complete files as someone else should have the full file to publish these keywords.
-								//As a side effect, this may help reduce people finding incomplete files in the network.
-								if( !aFilesf->IsPartFile() ) {
+								// Only publish complete files: someone else
+								// should have the full file to publish these
+								// keywords. As a side effect this may help
+								// reduce people finding incomplete files on
+								// the network.
+								if (!aFilesf->IsPartFile()) {
 									count++;
-									pSearch->AddFileID(Kademlia::CUInt128(aFilesf->GetFileHash().GetHash()));
-									if( count > 150 ) {
-										//We only publish up to 150 files per keyword publish then rotate the list.
+									pSearch->AddFileID(Kademlia::CUInt128(
+										aFilesf
+											->GetFileHash()
+											.GetHash()));
+									if (count > 150) {
+										// Publish up to 150 files per
+										// keyword publish, then
+										// rotate the list.
 										pPubKw->RotateReferences(f);
 										break;
 									}
 								}
 							}
 
-							if( count ) {
-								//Start our keyword publish
-								pPubKw->SetNextPublishTime(tNow+(KADEMLIAREPUBLISHTIMEK));
+							if (count) {
+								// Start our keyword publish
+								pPubKw->SetNextPublishTime(
+									tNow + (KADEMLIAREPUBLISHTIMEK));
 								pPubKw->IncPublishedCount();
-								Kademlia::CSearchManager::StartSearch(pSearch);
+								Kademlia::CSearchManager::StartSearch(
+									pSearch);
 							} else {
-								//There were no valid files to publish with this keyword.
+								// There were no valid files to publish with
+								// this keyword.
 								delete pSearch;
 							}
 						}
 					}
 				}
-				m_keywords->SetNextPublishTime(KADEMLIAPUBLISHTIME+tNow);
+				m_keywords->SetNextPublishTime(KADEMLIAPUBLISHTIME + tNow);
 			}
 		}
 
-		if( Kademlia::CKademlia::GetTotalStoreSrc() < KADEMLIATOTALSTORESRC) {
-			if(tNow >= m_lastPublishKadSrc) {
-				if(m_currFileSrc > GetCount()) {
+		if (Kademlia::CKademlia::GetTotalStoreSrc() < KADEMLIATOTALSTORESRC) {
+			if (tNow >= m_lastPublishKadSrc) {
+				if (m_currFileSrc > GetCount()) {
 					m_currFileSrc = 0;
 				}
-				CKnownFile* pCurKnownFile = const_cast<CKnownFile*>(GetFileByIndex(m_currFileSrc));
-				if(pCurKnownFile) {
-					if(pCurKnownFile->PublishSrc()) {
+				CKnownFile *pCurKnownFile =
+					const_cast<CKnownFile *>(GetFileByIndex(m_currFileSrc));
+				if (pCurKnownFile) {
+					if (pCurKnownFile->PublishSrc()) {
 						Kademlia::CUInt128 kadFileID;
 						kadFileID.SetValueBE(pCurKnownFile->GetFileHash().GetHash());
-						if(Kademlia::CSearchManager::PrepareLookup(Kademlia::CSearch::STOREFILE, true, kadFileID )==NULL) {
-							pCurKnownFile->SetLastPublishTimeKadSrc(0,0);
+						if (Kademlia::CSearchManager::PrepareLookup(
+							    Kademlia::CSearch::STOREFILE, true, kadFileID) ==
+							NULL) {
+							pCurKnownFile->SetLastPublishTimeKadSrc(0, 0);
 						}
 					}
 				}
 				m_currFileSrc++;
 
-				// even if we did not publish a source, reset the timer so that this list is processed
-				// only every KADEMLIAPUBLISHTIME seconds.
-				m_lastPublishKadSrc = KADEMLIAPUBLISHTIME+tNow;
+				// even if we did not publish a source, reset the timer so that this list is
+				// processed only every KADEMLIAPUBLISHTIME seconds.
+				m_lastPublishKadSrc = KADEMLIAPUBLISHTIME + tNow;
 			}
 		}
 
-		if( Kademlia::CKademlia::GetTotalStoreNotes() < KADEMLIATOTALSTORENOTES) {
-			if(tNow >= m_lastPublishKadNotes) {
-				if(m_currFileNotes > GetCount()) {
+		if (Kademlia::CKademlia::GetTotalStoreNotes() < KADEMLIATOTALSTORENOTES) {
+			if (tNow >= m_lastPublishKadNotes) {
+				if (m_currFileNotes > GetCount()) {
 					m_currFileNotes = 0;
 				}
-				CKnownFile* pCurKnownFile = const_cast<CKnownFile*>(GetFileByIndex(m_currFileNotes));
-				if(pCurKnownFile) {
-					if(pCurKnownFile->PublishNotes()) {
+				CKnownFile *pCurKnownFile =
+					const_cast<CKnownFile *>(GetFileByIndex(m_currFileNotes));
+				if (pCurKnownFile) {
+					if (pCurKnownFile->PublishNotes()) {
 						Kademlia::CUInt128 kadFileID;
 						kadFileID.SetValueBE(pCurKnownFile->GetFileHash().GetHash());
-						if(Kademlia::CSearchManager::PrepareLookup(Kademlia::CSearch::STORENOTES, true, kadFileID )==NULL)
+						if (Kademlia::CSearchManager::PrepareLookup(
+							    Kademlia::CSearch::STORENOTES, true, kadFileID) ==
+							NULL)
 							pCurKnownFile->SetLastPublishTimeKadNotes(0);
 					}
 				}
 				m_currFileNotes++;
 
-				// even if we did not publish a source, reset the timer so that this list is processed
-				// only every KADEMLIAPUBLISHTIME seconds.
-				m_lastPublishKadNotes = KADEMLIAPUBLISHTIME+tNow;
+				// even if we did not publish a source, reset the timer so that this list is
+				// processed only every KADEMLIAPUBLISHTIME seconds.
+				m_lastPublishKadNotes = KADEMLIAPUBLISHTIME + tNow;
 			}
 		}
 	}
 }
 
-
-void CSharedFileList::AddKeywords(CKnownFile* pFile)
+void CSharedFileList::AddKeywords(CKnownFile *pFile)
 {
 	m_keywords->AddKeywords(pFile);
 }
 
-
-void CSharedFileList::RemoveKeywords(CKnownFile* pFile)
+void CSharedFileList::RemoveKeywords(CKnownFile *pFile)
 {
 	m_keywords->RemoveKeywords(pFile);
 }
 
+void CSharedFileList::VerifyLocalData(const CKnownFile *file) const
+{
+	if (file)
+		file->VerifyLocalData();
+}
 
-bool CSharedFileList::RenameFile(CKnownFile* file, const CPath& newName)
+bool CSharedFileList::RenameFile(CKnownFile *file, const CPath &newName)
 {
 	if (file->IsPartFile()) {
-		CPartFile* pfile = dynamic_cast<CPartFile*>(file);
+		CPartFile *pfile = dynamic_cast<CPartFile *>(file);
 
 		if (file->GetStatus() != PS_COMPLETING) {
 			pfile->SetFileName(newName);
@@ -1264,16 +1780,14 @@
 		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
+			// Copy the word list, because it is reset on SetFileName() and we want to edit it.
 			Kademlia::WordList oldwords = file->GetKadKeywords();
 			file->SetFileName(newName);
 			theApp->knownfiles->Save();
 			UpdateItem(file);
 			RepublishFile(file);
 
-			const Kademlia::WordList& newwords = file->GetKadKeywords();
+			const Kademlia::WordList &newwords = file->GetKadKeywords();
 			Kademlia::WordList::iterator it_old;
 			Kademlia::WordList::const_iterator it_new;
 			// compare keywords in old and new names
@@ -1306,8 +1820,7 @@
 	return false;
 }
 
-
-const CPath* CSharedFileList::GetDirForPublicSharedDirName(const wxString& strSharedDir) const
+const CPath *CSharedFileList::GetDirForPublicSharedDirName(const wxString &strSharedDir) const
 {
 	StringPathMap::const_iterator it = m_PublicSharedDirNames.find(strSharedDir);
 
@@ -1318,20 +1831,27 @@
 	}
 }
 
-
-wxString CSharedFileList::GetPublicSharedDirName(const CPath& dir)
+wxString CSharedFileList::GetPublicSharedDirName(const CPath &dir)
 {
 	// safety check: is the directory supposed to be shared after all?
-	if (!IsShared(dir))	{
+	if (!IsShared(dir)) {
 		wxFAIL;
 		return "";
 	}
-	// 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)) {
+	// Check if the public name for the directory is cached in our map. Keyed rather than
+	// walked: this runs once per shared directory while answering a browse, and comparing
+	// every entry with IsSameDir() made it O(directories^2).
+	//
+	// Under list_mut, like the write further down and like IsShared(). Held for the lookup
+	// alone -- not across the IsShared() calls above and below, which take the same
+	// non-recursive mutex themselves.
+	{
+		wxMutexLocker lock(list_mut);
+		const std::map<wxString, wxString>::const_iterator cached =
+			m_publicNameByDirKey.find(dir.GetDirKey());
+		if (cached != m_publicNameByDirKey.end()) {
 			// public name for directory was determined earlier
-			return it->first;
+			return cached->second;
 		}
 	}
 
@@ -1349,7 +1869,7 @@
 	int iPos;
 	// check all the subdirectories in the path for being shared
 	// the public name will consist of these concatenated
-	while ((iPos = strDirectoryTmp.Find( cPathSeparator, true )) != wxNOT_FOUND)	{
+	while ((iPos = strDirectoryTmp.Find(cPathSeparator, true)) != wxNOT_FOUND) {
 		strPublicName = strDirectoryTmp.Right(strDirectoryTmp.Length() - iPos) + strPublicName;
 		strDirectoryTmp.Truncate(iPos);
 		if (!IsShared(CPath(strDirectoryTmp)))
@@ -1357,87 +1877,108 @@
 	}
 	if (!strPublicName.IsEmpty()) {
 		// remove first path separator ???
-		wxASSERT( strPublicName.GetChar(0) == cPathSeparator );
+		wxASSERT(strPublicName.GetChar(0) == cPathSeparator);
 		strPublicName = strPublicName.Right(strPublicName.Length() - 1);
 	} else {
 		// must be a rootdirectory on Windows
-		wxASSERT( strDirectoryTmp.Length() == 2 );
+		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())	{
+	// Now that we have the name, make it unique by appending an index if necessary. Under
+	// list_mut for the same reason as the lookup above, and covering both maps together so
+	// the pair is never left half-written -- which is what the clear in Reload() is holding
+	// the lock against. Safe to take here: every IsShared() call, which takes the same mutex,
+	// is behind us.
+	wxMutexLocker lock(list_mut);
+	if (m_PublicSharedDirNames.find(strPublicName) != m_PublicSharedDirNames.end()) {
 		wxString strUniquePublicName;
-		for (iPos = 2; ; ++iPos) {
+		for (iPos = 2;; ++iPos) {
 			strUniquePublicName = CFormat("%s_%i") % strPublicName % iPos;
 
-			if (m_PublicSharedDirNames.find(strUniquePublicName) == m_PublicSharedDirNames.end()) {
-				AddDebugLogLineN(logClient, CFormat("Using public name '%s' for directory '%s'")
-				                            % strUniquePublicName
-				                            % dir.GetPrintable());
-				m_PublicSharedDirNames.insert(std::pair<wxString, CPath> (strUniquePublicName, dir));
+			if (m_PublicSharedDirNames.find(strUniquePublicName) ==
+				m_PublicSharedDirNames.end()) {
+				AddDebugLogLineN(logClient,
+					CFormat("Using public name '%s' for directory '%s'") %
+						strUniquePublicName % dir.GetPrintable());
+				m_publicNameByDirKeydir.GetDirKey() = strUniquePublicName;
+				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.
+			// From eMule: checks whether more than 200 shared folders share the same public name.
+			// That can happen when many shared subfolders with the same name live in folders that
+			// are not themselves shared, so their names get concatenated -- and those might all
+			// be the same. Here for safety, so we do not run out of memory.
+			else if (iPos > 200) // Only 200 identical names are indexed.
 			{
-				wxASSERT( false );
+				wxASSERT(false);
 				return "";
 			}
 		}
 	} else {
-		AddDebugLogLineN(logClient, CFormat("Using public name '%s' for directory '%s'") % strPublicName % dir.GetPrintable());
-		m_PublicSharedDirNames.insert(std::pair<wxString, CPath> (strPublicName, dir));
+		AddDebugLogLineN(logClient,
+			CFormat("Using public name '%s' for directory '%s'") % strPublicName %
+				dir.GetPrintable());
+		m_publicNameByDirKeydir.GetDirKey() = strPublicName;
+		m_PublicSharedDirNames.insert(std::pair<wxString, CPath>(strPublicName, dir));
 		return strPublicName;
 	}
 }
 
-
-bool CSharedFileList::IsShared(const CPath& path) const
+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_listi)) {
-				return true;
+	if (path.IsDir(CPath::exists)) {
+		// Under list_mut like every other cache on this class. The lazily built set below is
+		// written through a const method, so without it a caller on another thread would be
+		// writing a std::set while Reload() cleared it. Today both callers sit in
+		// GetPublicSharedDirName() on the main thread and Reload() runs there too, but nothing
+		// states that, and this class carries a mutex precisely because the assumption is not
+		// general. Neither call site holds the lock, so there is nothing to deadlock against.
+		wxMutexLocker lock(list_mut);
+
+		// Both lists below were walked with IsSameDir(), which normalises both paths, and
+		// GetPublicSharedDirName() calls this once per shared directory while answering a browse
+		// -- O(directories^2), and the other half of the 53 s freeze in issue #898. Keyed
+		// instead, built once and dropped in Reload() where the set can change.
+		if (!m_sharedDirKeysBuilt) {
+			const unsigned folderCount = theApp->glob_prefs->shareddir_list.size();
+			for (unsigned i = 0; i < folderCount; ++i) {
+				m_sharedDirKeys.insert(theApp->glob_prefs->shareddir_listi.GetDirKey());
 			}
+			// category 0 is incoming
+			for (unsigned i = 0; i < theApp->glob_prefs->GetCatCount(); ++i) {
+				m_sharedDirKeys.insert(theApp->glob_prefs->GetCategory(i)->path.GetDirKey());
+			}
+			m_sharedDirKeysBuilt = 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;
-			}
+		if (m_sharedDirKeys.count(path.GetDirKey()) != 0) {
+			return true;
 		}
 	}
 
 	return false;
 }
 
-
-void CSharedFileList::CheckAICHHashes(const std::list<CAICHHash>& hashes)
+void CSharedFileList::CheckAICHHashes(const std::list<CAICHHash> &hashes)
 {
-	// Index the master-hash list up front: the inner check is otherwise a
-	// linear std::find over `hashes` for every shared file, making the whole
-	// loop O(N*M). On sharesets of 100 k+ files (issue #745) that walk holds
-	// `list_mut` long enough to freeze the GUI for minutes. An unordered_set
-	// keyed on CAICHHash (std::hash specialisation in SHAHashSet.h) makes
-	// each lookup O(1) average and drops the total to O(N + M).
+	// Index the master-hash list up front: the inner check is otherwise a linear std::find
+	// over `hashes` for every shared file, making the whole loop O(N*M). On sharesets of 100
+	// k+ files (issue #745) that walk holds `list_mut` long enough to freeze the GUI for
+	// minutes. An unordered_set keyed on CAICHHash (std::hash specialisation in SHAHashSet.h)
+	// makes each lookup O(1) average and drops the total to O(N + M).
 	const std::unordered_set<CAICHHash> hashIndex(hashes.begin(), hashes.end());
 
 	wxMutexLocker locker(list_mut);
 
 	// 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.
+	// corresponding hash in our list. Those who don't are queued for hashing.
 	CKnownFileMap::iterator it = m_Files_map.begin();
 	for (; it != m_Files_map.end(); ++it) {
-		const CKnownFile* file = it->second;
+		const CKnownFile *file = it->second;
 
 		if (file->IsPartFile() == false) {
-			CAICHHashSet* hashset = file->GetAICHHashset();
+			CAICHHashSet *hashset = file->GetAICHHashset();
 
 			if (hashset->GetStatus() == AICH_HASHSETCOMPLETE) {
 				if (hashIndex.count(hashset->GetMasterHash()) > 0) {
@@ -1450,7 +1991,6 @@
 			CThreadScheduler::AddTask(new CHashingTask(file));
 		}
 	}
-
 }
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/SharedFileList.h -> amule-3.1.0.tar.gz/src/SharedFileList.h Changed

@@ -26,13 +26,17 @@
 #ifndef SHAREDFILELIST_H
 #define SHAREDFILELIST_H
 
+#include "SharedFilesReloadLatch.h" // Needed for CSharedFilesReloadLatch
+#include <atomic>                   // Needed for std::atomic (m_listGeneration, reloading)
 #include <functional>
 #include <list>
 #include <map>
+#include <set> // Needed for std::set (m_sharedDirKeys)
 #include <unordered_map>
-#include <wx/thread.h>		// Needed for wxMutex
+#include <wx/arrstr.h> // Needed for wxArrayString
+#include <wx/thread.h> // Needed for wxMutex
 
-#include "Types.h"		// Needed for uint16 and uint64
+#include "Types.h" // Needed for uint16 and uint64
 
 struct UnknownFile_Struct;
 
@@ -47,153 +51,350 @@
 class CThreadTask;
 class CSharedDirWatcher;
 
-
-typedef std::map<CMD4Hash,CKnownFile*> CKnownFileMap;
+typedef std::map<CMD4Hash, CKnownFile *> CKnownFileMap;
 typedef std::map<wxString, CPath> StringPathMap;
 typedef std::list<CPath> PathList;
 
-class CSharedFileList {
+class CSharedFileList
+{
 public:
-	CSharedFileList(CKnownFileList* in_filelist);
+	CSharedFileList(CKnownFileList *in_filelist);
 	~CSharedFileList();
 
-	// Yield/cancel hook for chunked reloads. Invoked periodically
-	// during the directory walk with the running count of files
-	// scanned so far. Returning false aborts the reload promptly and
-	// leaves whatever was added in place (partial commit). null is a
-	// no-op — kept that way for daemon-side and EC-triggered callers
-	// that don't have a UI to drive.
+	// Yield/cancel hook for chunked reloads, called during the walk with the running file
+	// count. Returning false aborts the reload and keeps whatever was added. null is a no-op,
+	// for callers with no UI to drive.
 	using ReloadYieldCb = std::function<bool(size_t /*filesScanned*/)>;
 
-	void	Reload();
+	void Reload();
 	// Cancellable + progress-reporting variant. Returns true if the
 	// walk completed normally, false if `yieldCb` requested abort.
-	bool	Reload(ReloadYieldCb yieldCb);
-	void	SafeAddKFile(CKnownFile* toadd, bool bOnlyAdd = false);
-	void	RemoveFile(CKnownFile* toremove);
-	CKnownFile*	GetFileByID(const CMD4Hash& filehash);
-	short	GetFilePriorityByID(const CMD4Hash& filehash);
-	const CKnownFile* GetFileByIndex(unsigned int index) const;
-	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) const;
-	void	UpdateItem(CKnownFile* toupdate);
-	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);
+	bool Reload(ReloadYieldCb yieldCb);
+
+	// Ask for a full reload from the next Process() tick instead of inline. Callers on the core
+	// event loop -- every EC request handler, the watcher's dropped-events fallback -- use this
+	// to answer immediately rather than block for the whole walk. That walk takes seconds to
+	// minutes on a large or network-mounted share, and amuleapi's EC lane is a single
+	// serialised worker, so a blocking reload there stalls the refresher and turns unrelated
+	// endpoints into 503s.
+	//
+	// Repeat requests before the tick coalesce; one arriving mid-walk keeps the flag set so it
+	// runs afterwards instead of nesting.
+	//
+	// A plain bool is deliberate: every setter and the reader run on the core event loop. A
+	// caller off that thread is the thing to fix -- do not make this atomic.
+	void RequestReload() { m_reloadLatch.Request(); }
 
+	// True when a RequestReload() is outstanding. GUI callers run the owed walk themselves
+	// behind a progress dialog rather than let it land silently on a tick.
+	bool IsReloadPending() const { return m_reloadLatch.IsPending(); }
+	void SafeAddKFile(CKnownFile *toadd, bool bOnlyAdd = false);
+	void RemoveFile(CKnownFile *toremove);
+	CKnownFile *GetFileByID(const CMD4Hash &filehash);
+	short GetFilePriorityByID(const CMD4Hash &filehash);
+	const CKnownFile *GetFileByIndex(unsigned int index) const;
+	size_t GetCount()
+	{
+		wxMutexLocker lock(list_mut);
+		return m_Files_map.size();
+	}
+	size_t GetFileCount()
+	{
+		wxMutexLocker lock(list_mut);
+		return m_Files_map.size();
+	}
 	/**
-	 * Returns the name of a folder visible to the public.
+	 * Changes whenever a file enters or leaves the list(s) this snapshots.
 	 *
-	 * @param dir The full path to a shared directory.
-	 * @return The name of the shared directory that will be visible to the public.
+	 * A change token, not a count: a reload clears and re-adds, so it advances once per file.
+	 * All a caller may conclude is "same value means nothing entered or left". Comparing sizes
+	 * would be wrong -- an add and a remove between two polls is a net-zero size change that
+	 * still has to reconcile.
+	 *
+	 * Lets a caller that only needs "did membership change" skip the snapshot. CopyFileList is
+	 * O(n) and the EC file-list reconcile runs it on every poll for every connected client,
+	 * almost always to find nothing came or went.
 	 *
-	 * 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
+	 * Read it BEFORE CopyFileList, never after. Read first and the value can only be older than
+	 * the snapshot; a change racing in between just makes the next poll redo the work. Read
+	 * after, and a change landing between the copy and the read is recorded as already seen,
+	 * and lost.
 	 */
-	wxString		GetPublicSharedDirName(const CPath& dir);
-	const CPath*	GetDirForPublicSharedDirName(const wxString& strSharedDir) const;
+	uint64 GetListGeneration() const { return m_listGeneration.load(std::memory_order_relaxed); }
+
+	void CopyFileList(std::vector<CKnownFile *> &out_list) const;
+	// Fill `out` with the basenames of all currently shared files. Used by
+	// the Directories panel's exclusion-filter live preview.
+	void GetSharedFileNames(wxArrayString &out) const;
+	void UpdateItem(CKnownFile *toupdate);
+	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);
+	void VerifyLocalData(const CKnownFile *file) const;
+
+	// Re-extract media metadata for every shared file, whether or not it has any. Returns how
+	// many probes were queued.
+	//
+	// The only way to correct wrong metadata rather than missing: the scheduler skips anything
+	// already carrying a media tag, so a value from an older build is otherwise permanent short
+	// of deleting known.met, which also discards the ed2k part hashes and every per-file
+	// statistic.
+	//
+	// Asynchronous, on the media-probe worker. Nothing else is touched -- the file is not re-
+	// hashed and never leaves the share.
+	unsigned RefreshAllMediaMetadata();
+
+	// The single-file form, by hash. False when no shared file has that hash, or it is not
+	// eligible: not audio/video by extension, or an incomplete download.
+	bool RefreshMediaMetadata(const CMD4Hash &hash);
+
+	// The batched form the GUI uses; returns how many probes were queued. Lets amulegui send
+	// ONE EC request for a selection: its request fifo stalls the GUI's own polling past about
+	// twenty in flight.
+	unsigned RefreshMediaMetadata(const std::vector<CMD4Hash> &hashes);
 
 	/**
-	 * Returns true, if the specified path points to a shared directory or single shared file.
+	 * Returns the name of a shared folder as the public sees it.
+	 *
+	 * @param dir The full path to a shared directory.
+	 * @return The public name, made only of subdirectories that are shared, so the client's own
+	 * directory structure stays hidden: /ed2k/shared/games/tetris -> "games/tetris" when
+	 * /ed2k/shared is not itself shared.
 	 */
-	bool			IsShared(const CPath& path) const;
+	wxString GetPublicSharedDirName(const CPath &dir);
+	const CPath *GetDirForPublicSharedDirName(const wxString &strSharedDir) const;
+
+	/// True if the path is a shared directory or a single shared file.
+	bool IsShared(const CPath &path) const;
 
 	/* Kad Stuff */
-	void	Publish();
-	void	AddKeywords(CKnownFile* pFile);
-	void	RemoveKeywords(CKnownFile* pFile);
+	void Publish();
+	void AddKeywords(CKnownFile *pFile);
+	void RemoveKeywords(CKnownFile *pFile);
 	// This is actually unused, but keep it here - will be needed later.
-	void	ClearKadSourcePublishInfo();
+	void ClearKadSourcePublishInfo();
 
-	/**
-	 * Checks for files which missing or wrong AICH hashes.
-	 * Those that are found are scheduled for ACIH hashing.
-	 */
-	void CheckAICHHashes(const std::list<CAICHHash>& hashes);
+	/// Schedules AICH hashing for shared files with a missing or wrong AICH hash.
+	void CheckAICHHashes(const std::list<CAICHHash> &hashes);
 
-	/**
-	 * Toggle automatic rescan of shared directories at runtime.
-	 * Called when the user flips the corresponding pref in the
-	 * Directories panel.
-	 */
-	void	EnableDirectoryWatcher(bool enable);
+	/// Toggle automatic rescan of shared directories at runtime. Called when the user flips the
+	/// pref in the Directories panel.
+	void EnableDirectoryWatcher(bool enable);
 
-	// Incremental-rescan entry points used by CSharedDirWatcher to apply
-	// a single fs-watcher event without re-walking every shared dir.
-	// fullPath is the raw filesystem path of the affected entry.
+	// Incremental-rescan entry points used by CSharedDirWatcher to apply one fs-watcher event
+	// without re-walking every shared dir. fullPath is the raw filesystem path of the affected
+	// entry. NotifyPathAdded queues hashing for an unknown file and no-ops if it is already
+	// shared. NotifyPathRemoved detaches the CKnownFile m_pathIndex maps the path to.
+	// NotifyPathModified treats a content change as remove-then-add when mtime/size have
+	// shifted.
 	//
-	// NotifyPathAdded queues a hashing task for an unknown file, no-ops
-	// if the file is already shared. NotifyPathRemoved looks the path up
-	// in m_pathIndex and detaches the matching CKnownFile from the
-	// shared list. NotifyPathModified treats a content-change as
-	// remove-then-add when mtime/size have shifted (otherwise no-op).
+	// All three are safe to call from the wxFileSystemWatcher event thread (wx's main thread on
+	// every supported backend) and take list_mut internally.
 	//
-	// All three are safe to call from the wxFileSystemWatcher event
-	// thread (i.e. wx's main thread on every supported backend), and
-	// take list_mut internally via AddFile/RemoveFile.
-	void	NotifyPathAdded(const wxString& fullPath);
-	void	NotifyPathRemoved(const wxString& fullPath);
-	void	NotifyPathModified(const wxString& fullPath);
+	// bulkScan: the caller is walking a whole tree (the watcher's new-subdirectory race scan)
+	// rather than reacting to one event. Then an already-known file is counted, not announced
+	// -- moving a large known tree into a recursive share would otherwise emit thousands of
+	// info lines in one debounce flush.
+	void NotifyPathAdded(const wxString &fullPath, bool bulkScan = false);
+	void NotifyPathRemoved(const wxString &fullPath);
+	void NotifyPathModified(const wxString &fullPath);
+
+	// Detach every shared file under `dirPath`, for a renamed or deleted dir whose subtree
+	// moves with no per-file events. The prefix match is separator-anchored, so ".../Season 1"
+	// does not swallow ".../Season 10".
+	void NotifyDirRemoved(const wxString &dirPath);
 
 private:
 	typedef std::list<CThreadTask *> TaskList;
 
-	bool	AddFile(CKnownFile* pFile);
-	// Per-path attach: stat fname under directory, look it up in
-	// known.met, and either AddFile() the existing CKnownFile or push
-	// a CHashingTask onto hashTasks. Shared between the bulk-Reload
-	// directory walk and the per-event watcher dispatch so the two
-	// paths agree on what counts as shareable.
-	enum AddPathResult {
-		kAddPathSkipped,    // broken link, zero size, stat failed
-		kAddPathKnown,      // matched a CKnownFile, attached (or already attached)
-		kAddPathQueued      // unknown file, CHashingTask pushed
+	bool AddFile(CKnownFile *pFile);
+
+	// Re-key m_pathIndex for an already-shared file whose on-disk path changed. A partfile
+	// shared while downloading is keyed under Temp (or "" before SetFilePath ran) and moves to
+	// Incoming on completion, but AddFile writes m_pathIndex only on a fresh insert, so the re-
+	// add leaves the index stale. Drops any keys pointing at `file` and installs its current
+	// one, so the watcher can resolve a later DELETE. Takes list_mut.
+	void RefreshPathIndex(CKnownFile *file);
+
+	// Invoked by AddFile with list_mut held. Kicks off a CMediaProbeTask when the preference is
+	// enabled, the file looks like media by ED2K file type, and it has not been probed yet;
+	// returns silently if any gate fails.
+	//
+	// The mode says WHICH gates to bypass: the two callers that bypass anything need different
+	// ones, and a single "force" flag conflated them.
+	//
+	//  * Normal     -- both gates apply.
+	//  * Completion -- both bypassed. The local probe must overwrite metadata inherited from the
+	//                  search result, and a just-completed download is STILL a CPartFile. Safe
+	//                  only because this fires exactly when the file has finished.
+	//  * Refresh    -- metadata gate bypassed, partfile guard not: a genuinely incomplete
+	//                  download has no complete file to read.
+	enum class MediaProbeMode
+	{
+		Normal,
+		Completion,
+		Refresh,
 	};
-	AddPathResult	AddPathToShares(const CPath& directory, const CPath& fname,
-		TaskList & hashTasks);
-	// scanned/aborted are in/out: the caller passes a running count
-	// and a flag that the dir walker flips on abort. Lets a single
-	// counter span all paths in one Reload() pass.
-	unsigned	AddFilesFromDirectory(const CPath& directory, TaskList & hashTasks,
-		const ReloadYieldCb & yieldCb, size_t & scanned, bool & aborted);
-	void	FindSharedFiles(const ReloadYieldCb & yieldCb, bool & aborted);
-	bool	reloading;
-
-	void	SendListToServer();
+	// Returns true when a probe was actually enqueued, so a caller can report what it did. Do
+	// NOT infer that from the worker's pending count: CMediaProbeThread::Entry swaps the whole
+	// job list out as soon as it is signalled, so against an idle worker every enqueue reads as
+	// a no-op.
+	//
+	// `bulk` says whether this probe belongs to a mass operation rather than to one file the
+	// user is looking at. It decides logging verbosity only, and is passed rather than
+	// inferred: the worker drains whatever is queued when it wakes.
+	bool MaybeScheduleMediaProbe(
+		CKnownFile *pFile, MediaProbeMode mode = MediaProbeMode::Normal, bool bulk = false);
+
+	// Per-path attach: stat fname under directory, look it up in known.met, and either
+	// AddFile() the existing CKnownFile or push a CHashingTask. Shared between the bulk-Reload
+	// walk and the per-event watcher dispatch so the two agree on what counts as shareable.
+	//
+	// notifyGuiOnKnownAdd: the bulk-Reload path repaints the whole view afterwards and leaves
+	// this false. The incremental watcher path has no such follow-up and passes true, or a re-
+	// shared file (a rename in Incoming to a name already in known.met) would update the core
+	// share set but never reach the GUI view.
+	enum AddPathResult
+	{
+		//! Broken link, zero size, stat failed.
+		kAddPathSkipped,
+		//! Name matched the user's exclusion filter.
+		kAddPathExcluded,
+		//! Matched a CKnownFile and was newly attached.
+		kAddPathKnown,
+		// Matched a CKnownFile ALREADY in the share set, so the add was declined: the same
+		// content reachable from a second shared directory. (Not a repeated watcher event
+		// -- NotifyPathAdded returns on an index hit before reaching AddPathToShares.)
+		// Split out from kAddPathKnown so callers announcing a file becoming shared do not
+		// claim a share that did not happen.
+		//
+		// The file's path is left as it was, which is load-bearing: AddFile writes
+		// m_pathIndex only on a fresh insert, so stamping the second directory onto the
+		// file would leave GetFilePath() disagreeing with the key it is indexed under, and
+		// nothing reconciles the two.
+		kAddPathAlreadyShared,
+		//! Unknown file; a CHashingTask was pushed.
+		kAddPathQueued
+	};
+	AddPathResult AddPathToShares(const CPath &directory,
+		const CPath &fname,
+		TaskList &hashTasks,
+		bool notifyGuiOnKnownAdd = false);
+	// scanned/aborted are in/out: the caller passes a running count and a flag the
+	// dir walker flips on abort, so one counter spans every path in a Reload().
+	unsigned AddFilesFromDirectory(const CPath &directory,
+		TaskList &hashTasks,
+		const ReloadYieldCb &yieldCb,
+		size_t &scanned,
+		size_t &excluded,
+		bool &aborted);
+	void FindSharedFiles(const ReloadYieldCb &yieldCb, bool &aborted);
+	// Atomic: RemoveFile() reads it off the upload worker thread (issue #1028).
+	std::atomic<bool> reloading;
+	// Set by RequestReload(), drained by Process(). Its rules -- coalescing, a mid-walk request
+	// belonging to the next walk, an aborted walk giving its request back -- live in the latch
+	// so they can be tested standalone.
+	CSharedFilesReloadLatch m_reloadLatch;
+
+	// New files discovered since the last Process() tick, counted at the one place discovery is
+	// decided (AddPathToShares' queued branch) so every route is covered without plumbing.
+	// Flushed once per tick, which coalesces a batch into a single line. A plain unsigned is
+	// enough: every increment and the flush run on the main thread.
+	unsigned m_discoveredNewFiles = 0;
+
+	//! Already-known files attached during a bulk subdirectory scan, summarised
+	//! by Process() rather than announced one line each. See NotifyPathAdded.
+	unsigned m_attachedKnownFiles = 0;
+
+	void SendListToServer();
 	uint64 m_lastPublishED2K;
-	bool	 m_lastPublishED2KFlag;
+	bool m_lastPublishED2KFlag;
+
+	CKnownFileList *filelist;
 
-	CKnownFileList*	filelist;
+	CKnownFileMap m_Files_map;
 
-	CKnownFileMap		m_Files_map;
-	// Secondary index keyed by full path so the watcher can resolve a
-	// DELETE/RENAME event to its CKnownFile* in O(1) without walking
-	// m_Files_map. Maintained alongside m_Files_map in AddFile() and
-	// RemoveFile(); both insertion and erase happen under list_mut so
-	// the two stay consistent. Key is the file's current
+	/**
+	 * Shared files grouped by directory, for GetSharedFilesByDirectory().
+	 *
+	 * A peer browsing a share asks for one directory at a time, and answering each request used
+	 * to walk the whole of m_Files_map calling CPath::IsSameDir(), which normalises both sides
+	 * every time. That is O(directories x files): a 39,450-file share across 1,691 directories
+	 * cost 66.7 million comparisons and blocked the main loop for the best part of a minute
+	 * (issue #898).
+	 *
+	 * Keyed by CPath::GetDirKey(), the canonical form IsSameDir() reduces to, so grouping by it
+	 * is equivalent to the walk it replaces. m_dirGroupsAt records the list generation it was
+	 * built from; that generation is bumped under list_mut at every mutation of m_Files_map,
+	 * which is the lock this is read and written under, so no further invalidation is needed.
+	 */
+	std::map<wxString, CKnownFilePtrList> m_dirGroups;
+	//! Generation m_dirGroups was built from; see there.
+	uint64 m_dirGroupsAt = 0;
+	//! Whether m_dirGroups has been built at all; generation 0 is legal.
+	bool m_dirGroupsBuilt = false;
+	// See GetListGeneration(). Bumped under list_mut wherever m_Files_map
+	// gains or loses an entry; atomic so it can be read without the lock.
+	std::atomic<uint64> m_listGeneration{ 0 };
+	// Secondary index keyed by full path so the watcher can resolve a DELETE/RENAME event to
+	// its CKnownFile* in O(1) without walking m_Files_map. Maintained alongside it in AddFile()
+	// and RemoveFile(), both under list_mut. Key is the file's current
 	// GetFilePath().JoinPaths(GetFileName()) raw string.
-	std::unordered_map<wxString, CKnownFile*>  m_pathIndex;
-	mutable wxMutex		list_mut;
+	//
+	// The invariant is "if and only if": an entry exists for a path exactly when a file in
+	// m_Files_map lives there. NotifyPathAdded, NotifyPathModified and NotifyDirRemoved all
+	// read a hit as proof the file is already shared, so an entry that outlives its file makes
+	// the watcher silently refuse to share that path, returning before its first log statement.
+	//
+	// Hence FindSharedFiles clears it in the same locked scope as m_Files_map: the keys a
+	// reload cannot heal are exactly the ones whose files the walk no longer finds (issue
+	// #1028). Both containers are empty from that clear until the walk refills them, and
+	// neither may be observed in between.
+	std::unordered_map<wxString, CKnownFile *> m_pathIndex;
+	mutable wxMutex list_mut;
+
+	StringPathMap m_PublicSharedDirNames; //! used for mapping strings to shared directories
 
-	StringPathMap m_PublicSharedDirNames;  //! used for mapping strings to shared directories
+	/**
+	 * The reverse of m_PublicSharedDirNames, keyed by CPath::GetDirKey().
+	 *
+	 * GetPublicSharedDirName() used to find a directory's public name by walking
+	 * m_PublicSharedDirNames and comparing each entry with IsSameDir(), which normalises both
+	 * paths. SendSharedDirectories() calls it once per shared directory, so that walk was
+	 * O(directories^2): with 1,691 of them it was one half of a 53 s freeze while answering a
+	 * browse (issue #898).
+	 *
+	 * Cleared wherever m_PublicSharedDirNames is, since the two are written together and expire
+	 * together.
+	 */
+	std::map<wxString, wxString> m_publicNameByDirKey;
+
+	/**
+	 * Keys of every shared directory, for IsShared().
+	 *
+	 * The other half of the same freeze: IsShared() compared the path against every entry of
+	 * shareddir_list and every category path with IsSameDir(), and GetPublicSharedDirName()
+	 * calls it per directory as its safety check. Built on demand and dropped in Reload(),
+	 * where the shared-directory set can change and the public names are already discarded.
+	 */
+	mutable std::set<wxString> m_sharedDirKeys;
+	mutable bool m_sharedDirKeysBuilt = false;
 
 	/* Kad Stuff */
-	CPublishKeywordList* m_keywords;
+	CPublishKeywordList *m_keywords;
 	unsigned int m_currFileSrc;
 	unsigned int m_currFileNotes;
 	unsigned int m_currFileKey;
 	uint32 m_lastPublishKadSrc;
 	uint32 m_lastPublishKadNotes;
 
-	// Fs-watcher for auto-rescan of shared dirs. Owned here; created
-	// lazily on EnableDirectoryWatcher(true). Forward-declared in this
-	// header to keep wx/fswatcher.h out of public includes.
-	CSharedDirWatcher * m_dirWatcher;
+	// Fs-watcher for auto-rescan of shared dirs. Owned here, created lazily on
+	// EnableDirectoryWatcher(true), forward-declared to keep wx/fswatcher.h out of public
+	// includes.
+	CSharedDirWatcher *m_dirWatcher;
 };
 
 #endif // SHAREDFILELIST_H

amule-3.0.1.tar.gz/src/SharedFilePeersListCtrl.cpp -> amule-3.1.0.tar.gz/src/SharedFilePeersListCtrl.cpp Changed

@@ -22,51 +22,41 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 #include "SharedFilePeersListCtrl.h"
-#include "KnownFile.h"		// Do_not_auto_remove
+#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 }
-};
-
-wxBEGIN_EVENT_TABLE(CSharedFilePeersListCtrl, CGenericClientListCtrl)
-wxEND_EVENT_TABLE()
-
-CSharedFilePeersListCtrl::CSharedFilePeersListCtrl(
-	wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size,
-	long style, const wxValidator& validator, const wxString& name )
-:
-CGenericClientListCtrl( "Peers", parent, winid, pos, size, style | wxLC_OWNERDRAW, validator, name )
+namespace
 {
-	// Setting the sorter function.
-	SetSortFunc( SourceSortProc );
+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("Parts on Peer"), 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 } };
+} // namespace
 
+CSharedFilePeersListCtrl::CSharedFilePeersListCtrl(wxWindow *parent,
+	wxWindowID winid,
+	const wxPoint &pos,
+	const wxSize &size,
+	long style,
+	const wxString &name)
+: CGenericClientListCtrl("Peers", parent, winid, pos, size, style, name)
+{
 	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, wxIntPtr sortData)
-{
-	return CGenericClientListCtrl::SortProc(param1, param2, s_sources_column_infosortData & CMuleListCtrl::COLUMN_MASK.cid | (sortData & CMuleListCtrl::SORT_DES));
-}
+CSharedFilePeersListCtrl::~CSharedFilePeersListCtrl() {}
 
-void CSharedFilePeersListCtrl::SetShowSources(CKnownFile * f, bool b) const
+void CSharedFilePeersListCtrl::SetShowSources(CKnownFile *f, bool b) const
 {
 	f->SetShowPeers(b);
 }

amule-3.0.1.tar.gz/src/SharedFilePeersListCtrl.h -> amule-3.1.0.tar.gz/src/SharedFilePeersListCtrl.h Changed

@@ -25,43 +25,33 @@
 #ifndef SHAREDFILEPEERSLISTCTRL_H
 #define SHAREDFILEPEERSLISTCTRL_H
 
-#include "GenericClientListCtrl.h"	// Needed for CGenericClientListCtrl
+#include "GenericClientListCtrl.h" // Needed for CGenericClientListCtrl
 
 /**
- * This class is responsible for representing the peers for a shared file.
+ * Represents the peers for a shared file.
  */
 class CSharedFilePeersListCtrl : public CGenericClientListCtrl
 {
 public:
 	/**
-	 * Constructor.
-	 *
-	 * @see CGenericClientListCtrl::CGenericClientListCtrl for documentation of parameters.
+	 * Constructor. @see CGenericClientListCtrl::CGenericClientListCtrl for the 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 = "peerslistctrl" );
+	CSharedFilePeersListCtrl(wxWindow *parent,
+		wxWindowID winid = wxID_ANY,
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
+		long style = 0,
+		const wxString &name = "peerslistctrl");
 
-	/**
-	 * Destructor.
-	 */
-	virtual	~CSharedFilePeersListCtrl();
+	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, wxIntPtr sortData);
+	CamuleDlg::DialogType GetParentDialog() override { return CamuleDlg::DT_SHARED_WND; }
 
-	bool IsShowingDownloadSources() const { return false; }
+	void SetShowSources(CKnownFile *f, bool b) const override;
 
-	wxDECLARE_EVENT_TABLE();
+	bool IsShowingDownloadSources() const override { return false; }
 };
 
 #endif
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/SharedFilesCtrl.cpp -> amule-3.1.0.tar.gz/src/SharedFilesCtrl.cpp Changed

@@ -23,118 +23,212 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "SharedFilesCtrl.h"	// Interface declarations
+#include "SharedFilesCtrl.h" // Interface declarations
 
-#include <common/MenuIDs.h>
+#include <wx/file.h>    // Needed for wxFile
+#include <wx/filedlg.h> // Needed for wxFileDialog
 
-#include "muuli_wdr.h"			// Needed for ID_SHFILELIST
-#include "SharedFilesWnd.h"		// Needed for CSharedFilesWnd
-#include "amuleDlg.h"			// Needed for CamuleDlg
-#include "CommentDialog.h"		// Needed for CCommentDialog
-#include "PartFile.h"			// Needed for CPartFile
-#include "SharedFileList.h"		// Needed for CKnownFileMap
-#include "amule.h"				// Needed for theApp
-#include "ServerConnect.h"		// Needed for CServerConnect
-#include "Preferences.h"		// Needed for thePrefs
-#include "BarShader.h"			// Needed for CBarShader
-#include "DataToText.h"			// Needed for PriorityToStr
-#include "GuiEvents.h"			// Needed for CoreNotify_*
-#include "MuleCollection.h"		// Needed for CMuleCollection
-#include "DownloadQueue.h"		// Needed for CDownloadQueue
-#include "TransferWnd.h"		// Needed for CTransferWnd
-
-
-wxBEGIN_EVENT_TABLE(CSharedFilesCtrl,CMuleListCtrl)
-	EVT_LIST_ITEM_RIGHT_CLICK(-1, CSharedFilesCtrl::OnRightClick)
-
-	EVT_MENU( MP_PRIOVERYLOW,	CSharedFilesCtrl::OnSetPriority )
-	EVT_MENU( MP_PRIOLOW,		CSharedFilesCtrl::OnSetPriority )
-	EVT_MENU( MP_PRIONORMAL,	CSharedFilesCtrl::OnSetPriority )
-	EVT_MENU( MP_PRIOHIGH,		CSharedFilesCtrl::OnSetPriority )
-	EVT_MENU( MP_PRIOVERYHIGH,	CSharedFilesCtrl::OnSetPriority )
-	EVT_MENU( MP_POWERSHARE,	CSharedFilesCtrl::OnSetPriority )
-	EVT_MENU( MP_PRIOAUTO,		CSharedFilesCtrl::OnSetPriorityAuto )
-
-	EVT_MENU( MP_CMT,			CSharedFilesCtrl::OnEditComment )
-	EVT_MENU( MP_ADDCOLLECTION,		CSharedFilesCtrl::OnAddCollection )
-	EVT_MENU( MP_GETMAGNETLINK,		CSharedFilesCtrl::OnCreateURI )
-	EVT_MENU( MP_GETED2KLINK,				CSharedFilesCtrl::OnCreateURI )
-	EVT_MENU( MP_GETSOURCEED2KLINK,			CSharedFilesCtrl::OnCreateURI )
-	EVT_MENU( MP_GETCRYPTSOURCEDED2KLINK,			CSharedFilesCtrl::OnCreateURI )
-	EVT_MENU( MP_GETHOSTNAMESOURCEED2KLINK,	CSharedFilesCtrl::OnCreateURI )
-	EVT_MENU( MP_GETHOSTNAMECRYPTSOURCEED2KLINK,			CSharedFilesCtrl::OnCreateURI )
-	EVT_MENU( MP_GETAICHED2KLINK,	CSharedFilesCtrl::OnCreateURI )
-	EVT_MENU( MP_GETAICHED2KLINKSRC,	CSharedFilesCtrl::OnCreateURI )
-	EVT_MENU( MP_RENAME,		CSharedFilesCtrl::OnRename )
-	EVT_MENU( MP_WS,		CSharedFilesCtrl::OnGetFeedback )
-
-
-	EVT_CHAR( CSharedFilesCtrl::OnKeyPressed )
-wxEND_EVENT_TABLE()
+#include <common/MenuIDs.h>
+#include <common/StringFunctions.h> // Needed for unicode2UTF8
+
+#include "muuli_wdr.h"        // Needed for ID_SHFILELIST
+#include "SharedFilesWnd.h"   // Needed for CSharedFilesWnd
+#include "amuleDlg.h"         // Needed for CamuleDlg
+#include "CommentDialog.h"    // Needed for CCommentDialog
+#include "FileDetailDialog.h" // Needed for CFileDetailDialog
+#include "PartFile.h"         // Needed for CPartFile
+#include "FileLaunch.h"       // Needed for FileLaunch::Open / Reveal
+#include "SharedFileList.h"   // Needed for CKnownFileMap
+#include "amule.h"            // Needed for theApp
+#include "ServerConnect.h"    // Needed for CServerConnect
+#include "Preferences.h"      // Needed for thePrefs
+#include "MuleBarRenderer.h"  // Needed for CBarFillSpec, CBarFillSpan
+#include "PartBarLegendUI.h"  // Needed for ShowPartBarLegend, ToMuleColour
+#include "PartBarSpans.h"     // Needed for partbar::SpanFor, ModeFor, HashedPartsClamped
+#include "DataToText.h"       // Needed for PriorityToStr
+#include "Statistics.h"       // Needed for theStats (incoming free space)
+#include "GuiEvents.h"        // Needed for CoreNotify_*
+#include "DownloadQueue.h"    // Needed for CDownloadQueue
+#include "TransferWnd.h"      // Needed for CTransferWnd
+#include "Logger.h"           // Needed for AddLogLine
+#include "OtherFunctions.h"   // Needed for FormatLocalDateTime, CastSecondsToHM, FormatMediaCodec
+#include <tags/FileTags.h>    // Needed for FT_MEDIA_LENGTH / _BITRATE / _CODEC
+
+namespace
+{
 
-enum SharedFilesListColumns {
-	ID_SHARED_COL_NAME = 0,
-	ID_SHARED_COL_SIZE,
-	ID_SHARED_COL_TYPE,
-	ID_SHARED_COL_PRIO,
-	ID_SHARED_COL_ID,
-	ID_SHARED_COL_REQ,
-	ID_SHARED_COL_AREQ,
-	ID_SHARED_COL_TRA,
-	ID_SHARED_COL_RTIO,
-	ID_SHARED_COL_PART,
-	ID_SHARED_COL_CMPL,
-	ID_SHARED_COL_PATH
+// Why a shared file can or cannot be re-probed. One classifier rather than the same two conditions
+// at both call sites: the menu asks whether to enable the entry, the handler asks how many of a
+// selection it is leaving out and why, and those answers must not disagree.
+enum class MediaRefreshEligibility
+{
+	Eligible,
+	FeatureDisabled, //!< media metadata extraction is switched off in preferences
+	Incomplete,      //!< an in-progress download has no complete file to read
+	NotMedia,        //!< nothing for ffprobe to extract
 };
 
-
-CSharedFilesCtrl::CSharedFilesCtrl(wxWindow* parent, int id, const wxPoint& pos, wxSize size, int flags)
-	: CMuleListCtrl(parent, id, pos, size, flags | wxLC_OWNERDRAW ),
-	  m_inBulkUpdate(false)
+MediaRefreshEligibility ClassifyForMediaRefresh(const CKnownFile *file)
 {
-	// Setting the sorter function.
-	SetSortFunc( SortProc );
-
-	// Set the table-name (for loading and saving preferences).
-	SetTableName( "Shared" );
-
-	m_menu=NULL;
-
-	InsertColumn(ID_SHARED_COL_NAME, _("File Name"),		wxLIST_FORMAT_LEFT, 250, "N" );
-	InsertColumn(ID_SHARED_COL_SIZE, _("Size"),			wxLIST_FORMAT_LEFT, 100, "Z" );
-	InsertColumn(ID_SHARED_COL_TYPE, _("Type"),			wxLIST_FORMAT_LEFT,  50, "Y" );
-	InsertColumn(ID_SHARED_COL_PRIO, _("Priority"),			wxLIST_FORMAT_LEFT,  70, "p" );
-	InsertColumn(ID_SHARED_COL_ID,   _("FileID"),			wxLIST_FORMAT_LEFT, 220, "I" );
-	InsertColumn(ID_SHARED_COL_REQ,  _("Requests"),			wxLIST_FORMAT_LEFT, 100, "Q" );
-	InsertColumn(ID_SHARED_COL_AREQ, _("Accepted Requests"),	wxLIST_FORMAT_LEFT, 100, "A" );
-	InsertColumn(ID_SHARED_COL_TRA,  _("Transferred Data"),		wxLIST_FORMAT_LEFT, 120, "T" );
-	InsertColumn(ID_SHARED_COL_RTIO, _("Share Ratio"),		wxLIST_FORMAT_LEFT, 100, "R" );
-	InsertColumn(ID_SHARED_COL_PART, _("Obtained Parts"),		wxLIST_FORMAT_LEFT, 120, "P" );
-	InsertColumn(ID_SHARED_COL_CMPL, _("Complete Sources"),		wxLIST_FORMAT_LEFT, 120, "C" );
-	InsertColumn(ID_SHARED_COL_PATH, _("Directory Path"),		wxLIST_FORMAT_LEFT, 220, "D" );
-
-	LoadSettings();
+	// First, because it decides the answer for every file at once: with the feature off the
+	// scheduler drops the job before looking at the file, so the entry would be enabled and do
+	// nothing, with no clue why.
+	//
+	// Correct in amulegui too: the daemon sends this preference over EC as a presence tag and
+	// the receiving side maps an absent tag to false, so a remote GUI reports the DAEMON's
+	// setting rather than its own default.
+	if (!thePrefs::GetMediaMetadataEnabled()) {
+		return MediaRefreshEligibility::FeatureDisabled;
+	}
+	// IsPartFile() is answered correctly in both binaries: amulegui files a shared partfile
+	// into its shared list as the very CPartFile the download queue holds, not a plain
+	// CKnownFile.
+	if (file->IsPartFile()) {
+		return MediaRefreshEligibility::Incomplete;
+	}
+	// The scheduler's own test, through the shared predicate in
+	// OtherFunctions, so the view cannot offer what the core will drop.
+	if (!IsMediaProbeCandidate(file->GetFileName())) {
+		return MediaRefreshEligibility::NotMedia;
+	}
+	return MediaRefreshEligibility::Eligible;
 }
 
+} // namespace
+
+wxBEGIN_EVENT_TABLE(CSharedFilesCtrl, CMuleVirtualDataViewCtrl)
+	EVT_DATAVIEW_ITEM_CONTEXT_MENU(wxID_ANY, CSharedFilesCtrl::OnItemRightClicked)
+	EVT_MENU(MP_VIEW, CSharedFilesCtrl::OnOpenFile)
+	EVT_MENU(MP_SHOWINFOLDER, CSharedFilesCtrl::OnShowInFolder)
+	EVT_DATAVIEW_ITEM_ACTIVATED(wxID_ANY, CSharedFilesCtrl::OnItemActivated)
+
+	EVT_MENU(MP_METINFO, CSharedFilesCtrl::OnViewFileDetails)
+
+	EVT_MENU(MP_PRIOVERYLOW, CSharedFilesCtrl::OnSetPriority)
+	EVT_MENU(MP_PRIOLOW, CSharedFilesCtrl::OnSetPriority)
+	EVT_MENU(MP_PRIONORMAL, CSharedFilesCtrl::OnSetPriority)
+	EVT_MENU(MP_PRIOHIGH, CSharedFilesCtrl::OnSetPriority)
+	EVT_MENU(MP_PRIOVERYHIGH, CSharedFilesCtrl::OnSetPriority)
+	EVT_MENU(MP_POWERSHARE, CSharedFilesCtrl::OnSetPriority)
+	EVT_MENU(MP_PRIOAUTO, CSharedFilesCtrl::OnSetPriorityAuto)
+
+	EVT_MENU(MP_CMT, CSharedFilesCtrl::OnEditComment)
+	EVT_MENU(MP_ADDCOLLECTION, CSharedFilesCtrl::OnAddCollection)
+	EVT_MENU(MP_EXPORTCOLLECTION, CSharedFilesCtrl::OnExportCollection)
+	EVT_MENU(MP_GETMAGNETLINK, CSharedFilesCtrl::OnCreateURI)
+	EVT_MENU(MP_GETED2KLINK, CSharedFilesCtrl::OnCreateURI)
+	EVT_MENU(MP_RAZORSTATS, CSharedFilesCtrl::OnRazorStatsCheck)
+	EVT_MENU(MP_GETSOURCEED2KLINK, CSharedFilesCtrl::OnCreateURI)
+	EVT_MENU(MP_GETCRYPTSOURCEDED2KLINK, CSharedFilesCtrl::OnCreateURI)
+	EVT_MENU(MP_GETHOSTNAMESOURCEED2KLINK, CSharedFilesCtrl::OnCreateURI)
+	EVT_MENU(MP_GETHOSTNAMECRYPTSOURCEED2KLINK, CSharedFilesCtrl::OnCreateURI)
+	EVT_MENU(MP_GETAICHED2KLINK, CSharedFilesCtrl::OnCreateURI)
+	EVT_MENU(MP_GETAICHED2KLINKSRC, CSharedFilesCtrl::OnCreateURI)
+	EVT_MENU(MP_RENAME, CSharedFilesCtrl::OnRename)
+	EVT_MENU(MP_REFRESHMEDIAMETA, CSharedFilesCtrl::OnRefreshMediaMetadata)
+	EVT_MENU(MP_WS, CSharedFilesCtrl::OnGetFeedback)
+	EVT_MENU(MP_VERIFY, CSharedFilesCtrl::OnVerifyLocalData)
+	EVT_MENU(MP_BARLEGEND, CSharedFilesCtrl::OnShowBarLegend)
+wxEND_EVENT_TABLE()
 
-wxString CSharedFilesCtrl::GetOldColumnOrder() const
+CSharedFilesCtrl::CSharedFilesCtrl(wxWindow *parent, int id, const wxPoint &pos, wxSize size, int flags)
+: CMuleVirtualDataViewCtrl(parent, id, pos, size, flags)
+, m_inBulkUpdate(false)
+, m_batchUpdate(false)
+, m_batchFrozen(false)
+, m_hashingRemaining(0)
+, m_batchRowsAppended(false)
+, m_shownSize(0)
 {
-	return "N,Z,Y,p,I,Q,A,T,R,P,C,D";
+	m_menu = nullptr;
+
+	// File Name carries the rating/comment smiley through CMuleIconTextRenderer, which reserves
+	// the icon slot only on rows that have one -- wx's own icon+text renderer indents every row
+	// without a smiley, which is why this briefly lived in a column of its own. Obtained Parts
+	// is the availability bar; the rest are plain text.
+	const int colFlags = wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE;
+	AddIconTextColumn(_("File Name"), COLUMN_SHARED_NAME, "N", 400, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Size"), COLUMN_SHARED_SIZE, "Z", 100, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Type"), COLUMN_SHARED_TYPE, "Y", 90, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Priority"), COLUMN_SHARED_PRIO, "p", 70, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Requests"), COLUMN_SHARED_REQ, "Q", 80, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Accepted Requests"), COLUMN_SHARED_AREQ, "A", 80, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Transferred Data"), COLUMN_SHARED_TRA, "T", 120, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Share Ratio"), COLUMN_SHARED_RTIO, "R", 80, wxALIGN_LEFT, colFlags);
+	AddBarColumn(_("Source Availability"), COLUMN_SHARED_PART, "P", 120, colFlags);
+	AddTextColumn(_("Complete Sources"), COLUMN_SHARED_CMPL, "C", 120, wxALIGN_LEFT, colFlags);
+	// FileID (== file hash) was dropped -- the hash is on the details modal. The three new
+	// columns reuse existing translations ("Speed", "Shared since", "Last upload"); Directory
+	// Path stays but moves to the end.
+	AddTextColumn(_("Speed"), COLUMN_SHARED_SPEED, "U", 90, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Shared since"), COLUMN_SHARED_SINCE, "H", 130, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Last upload"), COLUMN_SHARED_LASTUP, "L", 130, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Directory Path"), COLUMN_SHARED_PATH, "D", 430, wxALIGN_LEFT, colFlags);
+	// Media metadata, the same FT_MEDIA_* tags and wording the search list uses. Keys are
+	// lowercase because "L" and "C" are taken above by Last upload and Complete Sources, and
+	// the store is case-sensitive.
+	AddTextColumn(_("Length"), COLUMN_SHARED_MEDIA_LENGTH, "l", 80, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Bitrate"), COLUMN_SHARED_MEDIA_BITRATE, "b", 80, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Codec"), COLUMN_SHARED_MEDIA_CODEC, "c", 80, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Artist"), COLUMN_SHARED_MEDIA_ARTIST, "a", 120, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Album"), COLUMN_SHARED_MEDIA_ALBUM, "m", 120, wxALIGN_LEFT, colFlags);
+	AddTextColumn(_("Title"), COLUMN_SHARED_MEDIA_TITLE, "i", 140, wxALIGN_LEFT, colFlags);
+
+	AppendSpacerColumn(COLUMN_SHARED_SPACER);
+
+	AssociateVirtualModel();
+
+	// Default sort is by name, ascending; LoadColumnSettings() replaces it
+	// when the config has something saved.
+	ApplySorting(COLUMN_SHARED_NAME, 0);
+
+	// The media columns are only filled for files ffprobe has run over, so a share that has
+	// never been probed would gain three empty columns for everyone. Listed in the header menu,
+	// hidden until asked for -- the widths above are what they get when enabled. Set before
+	// LoadColumnSettings() so anything the user saved wins.
+	SetColumnHidden(COLUMN_SHARED_MEDIA_LENGTH, true, 0);
+	SetColumnHidden(COLUMN_SHARED_MEDIA_BITRATE, true, 0);
+	SetColumnHidden(COLUMN_SHARED_MEDIA_CODEC, true, 0);
+	SetColumnHidden(COLUMN_SHARED_MEDIA_ARTIST, true, 0);
+	SetColumnHidden(COLUMN_SHARED_MEDIA_ALBUM, true, 0);
+	SetColumnHidden(COLUMN_SHARED_MEDIA_TITLE, true, 0);
+
+	m_columnStore.SetTableName("Shared");
+	LoadColumnSettings();
+	InitColumnState();
 }
 
-
-CSharedFilesCtrl::~CSharedFilesCtrl()
+wxString CSharedFilesCtrl::GetOldColumnOrder() const
 {
+	return "N,Z,Y,p,Q,A,T,R,P,C,U,H,L,D";
 }
 
+CSharedFilesCtrl::~CSharedFilesCtrl() {}
 
-void CSharedFilesCtrl::OnRightClick(wxListEvent& event)
+void CSharedFilesCtrl::OnItemRightClicked(wxDataViewEvent &event)
 {
-	long item_hit = CheckSelection(event);
+	// Right-clicking a row outside the selection acts on that row alone.
+	if (event.GetItem().IsOk()) {
+		wxDataViewItemArray selection;
+		GetSelections(selection);
+		if (selection.Index(event.GetItem()) == wxNOT_FOUND) {
+			UnselectAll();
+			Select(event.GetItem());
+		}
+	}
+
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	if (selected.empty()) {
+		return;
+	}
+	// Bound re-checked by the handlers that use it (OnOpenFile, OnShowInFolder): PopupMenu runs
+	// a nested event loop, so the shared-dir watcher can mutate the list while the menu is
+	// open.
+	m_menuItem = selected.front();
 
-	if ( (m_menu == NULL) && (item_hit != -1)) {
+	if (m_menu == nullptr) {
 		m_menu = new wxMenu(_("Shared Files"));
-		wxMenu* prioMenu = new wxMenu();
+		wxMenu *prioMenu = new wxMenu();
 		prioMenu->AppendCheckItem(MP_PRIOVERYLOW, _("Very low"));
 		prioMenu->AppendCheckItem(MP_PRIOLOW, _("Low"));
 		prioMenu->AppendCheckItem(MP_PRIONORMAL, _("Normal"));
@@ -143,10 +237,16 @@
 		prioMenu->AppendCheckItem(MP_POWERSHARE, _("Release"));
 		prioMenu->AppendCheckItem(MP_PRIOAUTO, _("Auto"));
 
-		m_menu->Append(0,_("Priority"),prioMenu);
+		m_menu->Append(0, _("Priority"), prioMenu);
+		m_menu->AppendSeparator();
+
+		m_menu->Append(MP_VIEW, _("&Open the file"));
+		m_menu->Append(MP_SHOWINFOLDER, _("Show in file manager"));
+		m_menu->AppendSeparator();
+		m_menu->Append(MP_METINFO, _("Show file &details"));
 		m_menu->AppendSeparator();
 
-		CKnownFile* file = reinterpret_cast<CKnownFile*>(GetItemData(item_hit));
+		CKnownFile *file = reinterpret_cast<CKnownFile *>(m_menuItem);
 		if (file->GetFileComment().IsEmpty() && !file->GetFileRating()) {
 			m_menu->Append(MP_CMT, _("Add Comment/Rating"));
 		} else {
@@ -157,56 +257,328 @@
 		m_menu->Append(MP_RENAME, _("Rename"));
 		m_menu->AppendSeparator();
 
-		if (file->GetFileName().GetExt() == "emulecollection") {
-			m_menu->Append( MP_ADDCOLLECTION, _("Add files in collection to transfer list"));
+		m_menu->Append(MP_VERIFY, _("Verify Local Data"));
+		m_menu->Append(MP_REFRESHMEDIAMETA, _("Re-extract &media metadata"));
+		m_menu->AppendSeparator();
+
+		const bool isCollection = file->GetFileName().GetExt() == "emulecollection";
+		if (isCollection) {
+			m_menu->Append(MP_ADDCOLLECTION, _("Add files in collection to transfer list"));
 			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_GETSOURCEED2KLINK,_("Copy eD2k link to clipboard (&Source)"));
-		m_menu->Append(MP_GETCRYPTSOURCEDED2KLINK,_("Copy eD2k link to clipboard (Source) (&With Crypt options)"));
-		m_menu->Append(MP_GETHOSTNAMESOURCEED2KLINK,_("Copy eD2k link to clipboard (&Hostname)"));
-		m_menu->Append(MP_GETHOSTNAMECRYPTSOURCEED2KLINK,_("Copy eD2k link to clipboard (Hostname) (With &Crypt options)"));
-		m_menu->Append(MP_GETAICHED2KLINK,_("Copy eD2k link to clipboard (&AICH info)"));
-		m_menu->Append(MP_GETAICHED2KLINKSRC,_("Copy eD2k link to clipboard (&AICH info + Source)"));
-		m_menu->Append(MP_WS,_("Copy feedback to clipboard"));
+		m_menu->Append(MP_GETMAGNETLINK, _("Copy magnet &URI to clipboard"));
+		m_menu->Append(MP_GETED2KLINK, _("Copy eD2k &link to clipboard"));
+		m_menu->Append(MP_GETSOURCEED2KLINK, _("Copy eD2k link to clipboard (&Source)"));
+		m_menu->Append(MP_GETCRYPTSOURCEDED2KLINK,
+			_("Copy eD2k link to clipboard (Source) (&With Crypt options)"));
+		m_menu->Append(MP_GETHOSTNAMESOURCEED2KLINK, _("Copy eD2k link to clipboard (&Hostname)"));
+		m_menu->Append(MP_GETHOSTNAMECRYPTSOURCEED2KLINK,
+			_("Copy eD2k link to clipboard (Hostname) (With &Crypt options)"));
+		m_menu->Append(MP_GETAICHED2KLINK, _("Copy eD2k link to clipboard (&AICH info)"));
+		m_menu->Append(MP_GETAICHED2KLINKSRC, _("Copy eD2k link to clipboard (&AICH info + Source)"));
+		m_menu->Append(MP_WS, _("Copy feedback to clipboard"));
+		m_menu->AppendSeparator();
 
+		// Same entry the search list offers, on the same gate. Every row here has a hash,
+		// partfiles included: a shared partfile is listed under the completed file's hash.
+		// Hidden, not greyed, when no stats server is configured, because an empty
+		// preference means the feature is off rather than unavailable for this row.
+		const wxString &statsServer = thePrefs::GetStatsServerName();
+		if (!statsServer.IsEmpty()) {
+			m_menu->Append(MP_RAZORSTATS, CFormat(_("Get %s for this file")) % statsServer);
+			m_menu->AppendSeparator();
+		}
+		m_menu->Append(MP_EXPORTCOLLECTION, _("Export selected files to an emulecollection"));
+
+		// Which of two unrelated things the bar column explains depends on the row, so the
+		// legend is chosen from the clicked file: right-click a file being re-hashed and
+		// the hashing legend opens, not the availability one.
+		//
+		// Guarded by IsColumnHidden() rather than
+		// CGenericClientListCtrl::FindBarLegendColumn(), a member of the other list. Model
+		// id and view position coincide, so COLUMN_SHARED_PART answers both. A bar the user
+		// has hidden is not on screen to explain.
+		const partbar::BarLegendKind legend =
+			partbar::LegendForSharedFilesRow(file->GetHashingProgress(), file->GetPartCount());
+		if (legend != partbar::BarLegendKind::None && !IsColumnHidden(COLUMN_SHARED_PART)) {
+			m_menu->AppendSeparator();
+			m_menu->Append(MP_BARLEGEND, _("Colour legend"));
+		}
+
+		// Offered only when the file is reachable from this host: the shared list carries
+		// the daemon's directory in amulegui, which resolves here only on a shared
+		// filesystem, and a locally shared file can have been moved since it was hashed.
+		//
+		// CSharedFileList shares PS_READY part files, so an entry here can be an in-
+		// progress download. Gated exactly as the Downloads list does it: a finished file
+		// of any type can be opened, an unfinished one only when enough of the media is on
+		// disk to play.
+		const bool previewable =
+			file->IsPartFile() ? static_cast<CPartFile *>(file)->PreviewAvailable() : true;
+		m_menu->SetLabel(
+			MP_VIEW, file->IsPartFile() ? wxString(_("Preview")) : wxString(_("&Open the file")));
+		// One filesystem check for both entries; see FileLaunch::GetAvailability.
+		bool canOpen = false;
+		bool canReveal = false;
+		FileLaunch::GetAvailability(file, canOpen, canReveal);
+		m_menu->Enable(MP_VIEW, previewable && canOpen);
+		m_menu->Enable(MP_SHOWINFOLDER, canReveal);
+		if (isCollection) {
+			// Reading a collection means reading its bytes on this host, so it needs
+			// the same reachability as opening the file. A part file is excluded on top
+			// of that: it is a truncated collection, not a usable one.
+			m_menu->Enable(MP_ADDCOLLECTION, canOpen && !file->IsPartFile());
+		}
 		m_menu->Enable(MP_GETAICHED2KLINK, file->HasProperAICHHashSet());
 		m_menu->Enable(MP_GETAICHED2KLINKSRC, file->HasProperAICHHashSet());
 		m_menu->Enable(MP_GETHOSTNAMESOURCEED2KLINK, !thePrefs::GetYourHostname().IsEmpty());
 		m_menu->Enable(MP_GETHOSTNAMECRYPTSOURCEED2KLINK, !thePrefs::GetYourHostname().IsEmpty());
+		// Verifying a partfile is not supported: the hashset covers the finished file, and
+		// CVerifyLocalDataTask bails on one anyway. Greyed out rather than silently
+		// refused, so the state is visible before the click instead of only in the log
+		// afterwards (amule-org/amule#1039). IsPartFile() is answered correctly in both
+		// binaries: amulegui files a shared partfile into its shared list as the very
+		// CPartFile the download queue holds (amule-remote-gui.cpp).
+		m_menu->Enable(MP_VERIFY, !file->IsPartFile());
+		// Same two conditions the scheduler applies, asked through the shared predicate
+		// rather than a second copy of the rule: an in-progress download has no complete
+		// file for ffprobe to read, and a file that is not audio or video has nothing to
+		// extract. Greyed out rather than accepted and silently dropped, so the state is
+		// visible before the click (issue #1079).
+		//
+		// Built from the selection, not from the right-clicked row: the handler refreshes
+		// every eligible file in the selection and the confirmation accounts for the rest,
+		// so the entry is available whenever there is anything to do.
+		m_menu->Enable(MP_REFRESHMEDIAMETA, !PartitionForMediaRefresh().eligible.empty());
 
 		int priority = file->IsAutoUpPriority() ? PR_AUTO : file->GetUpPriority();
 
-		prioMenu->Check(MP_PRIOVERYLOW,	priority == PR_VERY_LOW);
-		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);
+		prioMenu->Check(MP_PRIOVERYLOW, priority == PR_VERY_LOW);
+		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() );
+		PopupMenu(m_menu, event.GetPosition());
 
 		delete m_menu;
 
-		m_menu = NULL;
+		m_menu = nullptr;
 	}
 }
 
+void CSharedFilesCtrl::ShowFileDetailDialog(long focused)
+{
+	if (focused < 0) {
+		return;
+	}
+	// Pass every listed file so the dialog's Next/Prev can walk the shared list, anchored on
+	// the clicked row. Reuses the CFileDetailDialog the downloads list uses; per-file state
+	// decides which sections it shows.
+	std::vector<CKnownFile *> files;
+	const long nrItems = ItemDataCount();
+	files.reserve(nrItems);
+	int index = 0;
+	for (long i = 0; i < nrItems; i++) {
+		if (i == focused) {
+			index = static_cast<int>(files.size());
+		}
+		files.push_back(FileAtRow(i));
+	}
+	CFileDetailDialog(this, files, index).ShowModal();
+}
 
-void CSharedFilesCtrl::OnGetFeedback(wxCommandEvent& WXUNUSED(event))
+void CSharedFilesCtrl::OnRazorStatsCheck(wxCommandEvent &WXUNUSED(event))
+{
+	// Bound re-checked, for the reason OnOpenFile gives: PopupMenu runs a nested event loop, so
+	// the shared-dir watcher can drop the row while the menu is open.
+	if (m_menuItem == 0 || !HasItemData(m_menuItem)) {
+		return;
+	}
+	const CKnownFile *file = reinterpret_cast<CKnownFile *>(m_menuItem);
+	theApp->amuledlg->LaunchUrl(thePrefs::GetStatsServerURL() + file->GetFileHash().Encode());
+}
+
+void CSharedFilesCtrl::OnShowBarLegend(wxCommandEvent &WXUNUSED(event))
+{
+	// Bound re-checked, for the reason OnOpenFile gives: PopupMenu runs a nested event loop, so
+	// the shared-dir watcher can drop the row while the menu is open.
+	if (m_menuItem == 0 || !HasItemData(m_menuItem)) {
+		return;
+	}
+
+	// Resolved again rather than remembered from when the entry was appended: a re-hash can
+	// start or finish while the menu is up, and the legend has to explain what the cell is
+	// drawing now.
+	const CKnownFile *file = reinterpret_cast<CKnownFile *>(m_menuItem);
+
+	// Titled from the live column rather than from a second copy of its label,
+	// so the two cannot end up saying different things.
+	ShowPartBarLegend(this,
+		partbar::LegendForSharedFilesRow(file->GetHashingProgress(), file->GetPartCount()),
+		GetColumn(COLUMN_SHARED_PART)->GetTitle());
+}
+
+void CSharedFilesCtrl::OnViewFileDetails(wxCommandEvent &WXUNUSED(event))
+{
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	if (!selected.empty()) {
+		ShowFileDetailDialog(RowOfData(selected.front()));
+	}
+}
+
+void CSharedFilesCtrl::OnItemActivated(wxDataViewEvent &event)
+{
+	if (!event.GetItem().IsOk()) {
+		return;
+	}
+	// Read the row straight off the event, as CDownloadListCtrl::OnItemActivated does --
+	// touching the selection here would discard whatever multi-selection the user had, for no
+	// reason.
+	const long row = GetModelRow(event.GetItem());
+	CKnownFile *file = FileAtRow(row);
+	if (!file) {
+		return;
+	}
+
+	// A finished file of any type can be opened, an unfinished one (CSharedFileList also
+	// carries PS_READY part files) only once enough of the media is on disk to play. Same rule
+	// as CDownloadListCtrl::OnItemActivated -- see the note there. Anything else opens the
+	// file-details modal, which is what every double-click in this list did before.
+	const bool launchable = !file->IsPartFile() || static_cast<CPartFile *>(file)->PreviewAvailable();
+	if (launchable && FileLaunch::CanOpen(file)) {
+		FileLaunch::Open(file, this);
+	} else {
+		ShowFileDetailDialog(row);
+	}
+}
+
+void CSharedFilesCtrl::OnVerifyLocalData(wxCommandEvent &WXUNUSED(event))
+{
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CKnownFile *file = reinterpret_cast<CKnownFile *>(data);
+		// Still reachable with the menu item greyed out for partfiles: the menu is built
+		// from the row that was right-clicked, while this acts on the whole selection.
+		// Right-click a completed file with a partfile also selected and the entry is
+		// enabled, but the partfile still has to be turned away here.
+		if (file->IsPartFile()) {
+			AddLogLineN(
+				CFormat(_("Verify Local Data on PartFile is currently not supported: %s")) %
+				file->GetFileName());
+		} else {
+			theApp->sharedfiles->VerifyLocalData(file);
+		}
+	}
+}
+
+CSharedFilesCtrl::MediaRefreshSelection CSharedFilesCtrl::PartitionForMediaRefresh() const
+{
+	// The action applies to the SELECTION, so the menu has to be enabled from the selection
+	// too. Judging it by the right-clicked row meant a mixed selection greyed the entry out
+	// whenever the row under the cursor was the ineligible one -- select a .mp3 and a .zip,
+	// right-click the .zip, and an action that would have refreshed the .mp3 was unavailable.
+	// The user is choosing with the selection, not with the cursor.
+	MediaRefreshSelection out;
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CKnownFile *file = reinterpret_cast<CKnownFile *>(data);
+		switch (ClassifyForMediaRefresh(file)) {
+		case MediaRefreshEligibility::FeatureDisabled:
+			// Global rather than per-file: with the feature off every file lands here,
+			// the eligible list comes back empty, and the entry is greyed for the whole
+			// selection.
+			break;
+		case MediaRefreshEligibility::Incomplete:
+			++out.incomplete;
+			break;
+		case MediaRefreshEligibility::NotMedia:
+			++out.notMedia;
+			break;
+		case MediaRefreshEligibility::Eligible:
+			out.eligible.push_back(file->GetFileHash());
+			break;
+		}
+	}
+	return out;
+}
+
+void CSharedFilesCtrl::OnRefreshMediaMetadata(wxCommandEvent &WXUNUSED(event))
+{
+	const MediaRefreshSelection sel = PartitionForMediaRefresh();
+	const std::vector<CMD4Hash> &eligible = sel.eligible;
+	const unsigned incomplete = sel.incomplete;
+	const unsigned notMedia = sel.notMedia;
+	if (eligible.empty()) {
+		return;
+	}
+
+	// Say what is being left out whether or not a dialog follows. Select one .mp3 and ten .zip
+	// files and the dialog never appears, so without this the ten are passed over in silence --
+	// and "I selected eleven files and it only did one" is precisely what the log has to
+	// answer. Verify Local Data, the model for this handler, reports every file it refuses
+	// regardless of what else succeeded.
+	if (incomplete > 0) {
+		AddLogLineN(CFormat(wxPLURAL("Media metadata: skipping %u incomplete download",
+				    "Media metadata: skipping %u incomplete downloads",
+				    incomplete)) %
+			    incomplete);
+	}
+	if (notMedia > 0) {
+		AddLogLineN(CFormat(wxPLURAL("Media metadata: skipping %u file that is not audio or video",
+				    "Media metadata: skipping %u files that are not audio or video",
+				    notMedia)) %
+			    notMedia);
+	}
+
+	// One file is the "check whether this fixes it" case and queues straight away; a dialog
+	// there would cost a click on the common action. More than one is where the warning earns
+	// its place -- roughly 13 ms per file, so a large selection is real background work, and
+	// considerably more on network mounts or spun-down disks.
+	if (eligible.size() > 1) {
+		wxString message = CFormat(wxPLURAL("Re-extract media metadata for %u file?",
+					   "Re-extract media metadata for %u files?",
+					   eligible.size())) %
+				   eligible.size();
+		if (incomplete > 0) {
+			message << wxT("\n\n")
+				<< (CFormat(wxPLURAL("%u incomplete download will be skipped.",
+					    "%u incomplete downloads will be skipped.",
+					    incomplete)) %
+					   incomplete);
+		}
+		if (notMedia > 0) {
+			message << (incomplete > 0 ? wxT("\n") : wxT("\n\n"))
+				<< (CFormat(wxPLURAL("%u file is not audio or video and will be skipped.",
+					    "%u files are not audio or video and will be skipped.",
+					    notMedia)) %
+					   notMedia);
+		}
+		message << wxT("\n\n") << _("This runs in the background. Progress is reported in the log.");
+		if (wxMessageBox(message, _("Re-extract media metadata"), wxYES_NO | wxICON_QUESTION, this) !=
+			wxYES) {
+			return;
+		}
+	}
+
+	// One call for the whole set, not one per file: amulegui turns each into an EC request, and
+	// the request fifo stalls the GUI's own polling past about twenty in flight -- "select all,
+	// refresh" on a large share would put one packet per shared file into the socket in a tight
+	// loop.
+	theApp->sharedfiles->RefreshMediaMetadata(eligible);
+}
+
+void CSharedFilesCtrl::OnGetFeedback(wxCommandEvent &WXUNUSED(event))
 {
 	wxString feed;
-	long index = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	while (index != -1) {
+	for (wxUIntPtr data : GetSelectedItemData()) {
 		if (feed.IsEmpty()) {
-			feed = CFormat(_("Feedback from: %s (%s)\n\n")) % thePrefs::GetUserNick() % theApp->GetFullMuleVersion();
+			feed = CFormat(_("Feedback from: %s (%s)\n\n")) % thePrefs::GetUserNick() %
+			       theApp->GetFullMuleVersion();
 		} else {
 			feed += "\n";
 		}
-		feed += reinterpret_cast<CKnownFile*>(GetItemData(index))->GetFeedback();
-		index = GetNextItem(index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		feed += reinterpret_cast<CKnownFile *>(data)->GetFeedback();
 	}
 
 	if (!feed.IsEmpty()) {
@@ -214,543 +586,998 @@
 	}
 }
 
-
-void CSharedFilesCtrl::ShowFileList()
+wxString CSharedFilesCtrl::GetItemColumnText(wxUIntPtr item, unsigned column) const
 {
-	Freeze();
-	DeleteAllItems();
+	CKnownFile *file = reinterpret_cast<CKnownFile *>(item);
 
-	std::vector<CKnownFile*> files;
-	theApp->sharedfiles->CopyFileList(files);
-	for (unsigned i = 0; i < files.size(); ++i) {
-		DoShowFile(filesi, true);
+	switch (column) {
+	case COLUMN_SHARED_NAME:
+		return file->GetFileName().GetPrintable();
+
+	case COLUMN_SHARED_SIZE:
+		return CastItoXBytes(file->GetFileSize());
+
+	case COLUMN_SHARED_TYPE:
+		return GetFiletypeByName(file->GetFileName());
+
+	case COLUMN_SHARED_PRIO:
+		return PriorityToStr(file->GetUpPriority(), file->IsAutoUpPriority());
+
+	case COLUMN_SHARED_REQ:
+		return CFormat("%u (%u)") % file->statistic.GetRequests() %
+		       file->statistic.GetAllTimeRequests();
+
+	case COLUMN_SHARED_AREQ:
+		return CFormat("%u (%u)") % file->statistic.GetAccepts() %
+		       file->statistic.GetAllTimeAccepts();
+
+	case COLUMN_SHARED_TRA:
+		return CastItoXBytes(file->statistic.GetTransferred()) + " (" +
+		       CastItoXBytes(file->statistic.GetAllTimeTransferred()) + ")";
+
+	case COLUMN_SHARED_RTIO:
+		return CFormat("%.2f") % (static_cast<double>(file->statistic.GetAllTimeTransferred()) /
+						 static_cast<double>(file->GetFileSize()));
+
+	case COLUMN_SHARED_CMPL:
+		if (file->m_nCompleteSourcesCountLo == 0) {
+			if (file->m_nCompleteSourcesCountHi) {
+				return CFormat("< %u") % file->m_nCompleteSourcesCountHi;
+			}
+			return "0";
+		} else if (file->m_nCompleteSourcesCountLo == file->m_nCompleteSourcesCountHi) {
+			return CFormat("%u") % file->m_nCompleteSourcesCountLo;
+		} else {
+			return CFormat("%u - %u") % file->m_nCompleteSourcesCountLo %
+			       file->m_nCompleteSourcesCountHi;
+		}
+
+	case COLUMN_SHARED_SPEED:
+		// Live upload speed, adaptive KiB/s / MiB/s and blank below 1 KiB/s -- same
+		// formatting as the peers (client) list. Sorting uses the raw byte/s value (see
+		// CompareItemData), not this string.
+		if (file->GetUploadDatarate() >= 1024) {
+			if (file->GetUploadDatarate() >= 1048576) {
+				return CFormat(_("%.1f MiB/s")) % (file->GetUploadDatarate() / 1048576.0);
+			}
+			return CFormat(_("%.1f KiB/s")) % (file->GetUploadDatarate() / 1024.0);
+		}
+		return wxEmptyString;
+
+	case COLUMN_SHARED_SINCE:
+		if (file->GetDateShared()) {
+			wxDateTime ds(file->GetDateShared());
+			return FormatLocalDateTime(ds);
+		}
+		return wxEmptyString;
+
+	case COLUMN_SHARED_LASTUP:
+		if (file->GetLastUpload()) {
+			wxDateTime lu(file->GetLastUpload());
+			return FormatLocalDateTime(lu);
+		}
+		return wxEmptyString;
+
+	case COLUMN_SHARED_PATH:
+		// Status-agnostic: the Temp dir for a partfile, the destination once completed
+		// (EC_TAG_KNOWNFILE_PATH in the remote GUI).
+		return file->GetFilePath().GetPrintable();
+
+	// Media tags, rendered exactly as the search list renders them so the
+	// same file reads the same in both. Empty when never probed.
+	case COLUMN_SHARED_MEDIA_LENGTH: {
+		uint32 lenSec = file->GetIntTagValue(FT_MEDIA_LENGTH);
+		return lenSec ? CastSecondsToHM(lenSec) : wxString();
 	}
 
-	SortList();
-	ShowFilesCount();
+	case COLUMN_SHARED_MEDIA_BITRATE: {
+		uint32 bitrate = file->GetIntTagValue(FT_MEDIA_BITRATE);
+		return bitrate ? wxString(CFormat(wxT("%u kbps")) % bitrate) : wxString();
+	}
 
-	Thaw();
-}
+	case COLUMN_SHARED_MEDIA_CODEC: {
+		const wxString &codec = file->GetStrTagValue(FT_MEDIA_CODEC);
+		return codec.IsEmpty() ? wxString() : FormatMediaCodec(codec);
+	}
 
+	// Shown verbatim: unlike codec there is no vocabulary to normalise.
+	case COLUMN_SHARED_MEDIA_ARTIST:
+		return file->GetStrTagValue(FT_MEDIA_ARTIST);
 
-void CSharedFilesCtrl::RemoveFile(CKnownFile *toRemove)
-{
-	long index = FindItem( -1, reinterpret_cast<wxUIntPtr>(toRemove) );
+	case COLUMN_SHARED_MEDIA_ALBUM:
+		return file->GetStrTagValue(FT_MEDIA_ALBUM);
 
-	if ( index != -1 ) {
-		DeleteItem( index );
+	case COLUMN_SHARED_MEDIA_TITLE:
+		return file->GetStrTagValue(FT_MEDIA_TITLE);
 
-		ShowFilesCount();
+	default:
+		return wxEmptyString;
 	}
 }
 
-
-void CSharedFilesCtrl::ShowFile(CKnownFile* file)
+bool CSharedFilesCtrl::GetItemIcon(wxUIntPtr item, unsigned column, wxIcon &icon) const
 {
-	DoShowFile(file, false);
-}
+	if (column != COLUMN_SHARED_NAME) {
+		return false;
+	}
+	CKnownFile *file = reinterpret_cast<CKnownFile *>(item);
+	if (!file->GetFileRating() && file->GetFileComment().Length() == 0) {
+		return false;
+	}
 
+	int image = Client_CommentOnly_Smiley;
+	if (file->GetFileRating()) {
+		image = Client_InvalidRating_Smiley + file->GetFileRating() - 1;
+	}
+	wxASSERT(image >= Client_InvalidRating_Smiley);
+	wxASSERT(image <= Client_CommentOnly_Smiley);
+
+	icon = theApp->amuledlg->m_imagelist.GetIcon(image);
+	return true;
+}
 
-void CSharedFilesCtrl::DoShowFile(CKnownFile* file, bool batch)
+void CSharedFilesCtrl::GetItemBarFill(wxUIntPtr item, unsigned column, CBarFillSpec &out) const
 {
-	wxUIntPtr ptr = reinterpret_cast<wxUIntPtr>(file);
-	if ((!batch) && (FindItem(-1, ptr) > -1)) {
+	if (column != COLUMN_SHARED_PART) {
 		return;
 	}
+	CKnownFile *file = reinterpret_cast<CKnownFile *>(item);
 
-	const long insertPos = (batch ? GetItemCount() : GetInsertPos(ptr));
+	const uint64 fileSize = file->GetFileSize();
+	const std::size_t partCount = file->GetPartCount();
+	const bool bFlat = thePrefs::UseFlatBar();
 
-	long newitem = InsertItem(insertPos, "");
-	SetItemPtrData( newitem, ptr );
+	std::vector<CBarFillSpan> spans;
 
-	if (!batch) {
-		ShowFilesCount();
+	// Which of the two unrelated things this cell is drawing. Decided from the same two
+	// integers the row context menu picks the legend from, so the bar and its explanation
+	// cannot disagree.
+	switch (partbar::ModeFor(file->GetHashingProgress(), partCount)) {
+	case partbar::BarMode::None:
+		return;
+
+	case partbar::BarMode::Hashing: {
+		// CHashingTask reports part + 1, so a finished pass reports one part past the end
+		// of the file and the raw count cannot be used as an index. Clamped, then turned
+		// into the last hashed byte.
+		const std::size_t hashedParts =
+			partbar::HashedPartsClamped(file->GetHashingProgress(), partCount);
+		const uint64 hashedEnd = partbar::SpanFor(hashedParts - 1, PARTSIZE, fileSize).end;
+
+		if (hashedEnd < fileSize - 1) {
+			spans.push_back({ hashedEnd + 1,
+				fileSize - 1,
+				ToMuleColour(partbar::HashingPartColour(
+					partbar::HashingPartState::NotYetHashed, bFlat)) });
+		}
+		spans.push_back({ 0,
+			hashedEnd,
+			ToMuleColour(partbar::HashingPartColour(partbar::HashingPartState::Hashed, bFlat)) });
+		break;
 	}
+
+	case partbar::BarMode::Availability: {
+		// A partfile's availability is what the download queue sees from its
+		// sources; a complete file's is what our own uploads have observed.
+		const ArrayOfUInts16 &list = file->IsPartFile()
+						     ? static_cast<CPartFile *>(file)->m_SrcpartFrequency
+						     : file->m_AvailPartFrequency;
+
+		// Indexed alongside the range rather than by subscript: the index is
+		// the part number SpanFor() wants, not a way of reaching the element.
+		std::size_t index = 0;
+		for (const uint16 sources : list) {
+			const partbar::Span span = partbar::SpanFor(index++, PARTSIZE, fileSize);
+			spans.push_back({ span.start,
+				span.end,
+				ToMuleColour(
+					sources == 0
+						? partbar::AvailabilityPartColour(
+							  partbar::AvailabilityPartState::ZeroSources, bFlat)
+						: partbar::SourceAvailabilityColour(sources)) });
+		}
+
+		// Whatever the availability array did not cover. It is normally exactly partCount
+		// long, but a remote GUI can see a share before the daemon's frequencies arrive,
+		// and a tail nobody is known to hold reads as the same red a zero count draws
+		// rather than as unpainted background.
+		const uint64 covered = PARTSIZE * static_cast<uint64>(list.size());
+		if (covered < fileSize) {
+			spans.push_back({ covered,
+				fileSize - 1,
+				ToMuleColour(partbar::AvailabilityPartColour(
+					partbar::AvailabilityPartState::ZeroSources, bFlat)) });
+		}
+		break;
+	}
+	}
+
+	out = CBarFillSpec(item, fileSize, std::move(spans));
 }
 
-void CSharedFilesCtrl::OnSetPriority( wxCommandEvent& event )
+bool CSharedFilesCtrl::AltSortAllowed(unsigned column) const
 {
-	int priority = 0;
+	switch (column) {
+	case COLUMN_SHARED_REQ:
+	case COLUMN_SHARED_AREQ:
+	case COLUMN_SHARED_TRA:
+		return true;
+
+	default:
+		return false;
+	}
+}
 
-	switch ( event.GetId() ) {
-		case MP_PRIOVERYLOW:	priority = PR_VERY_LOW;	break;
-		case MP_PRIOLOW:		priority = PR_LOW;		break;
-		case MP_PRIONORMAL:		priority = PR_NORMAL;	break;
-		case MP_PRIOHIGH:		priority = PR_HIGH;		break;
-		case MP_PRIOVERYHIGH:	priority = PR_VERYHIGH;	break;
-		case MP_POWERSHARE:		priority = PR_POWERSHARE; break;
+bool CSharedFilesCtrl::IsLiveSortColumn() const
+{
+	// Columns whose values change while sharing/uploading. Static columns
+	// (name, size, type, priority, shared-since, path) never auto-resort.
+	if (m_sort_orders.empty()) {
+		return false;
+	}
+	switch (static_cast<int>(m_sort_orders.front().first)) {
+	case COLUMN_SHARED_REQ:
+	case COLUMN_SHARED_AREQ:
+	case COLUMN_SHARED_TRA:
+	case COLUMN_SHARED_RTIO:
+	case COLUMN_SHARED_CMPL:
+	case COLUMN_SHARED_SPEED:
+	case COLUMN_SHARED_LASTUP:
+		return true;
+	default:
+		return false;
 	}
+}
 
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+void CSharedFilesCtrl::ShowFileList()
+{
+	Freeze();
 
-	while( index != -1 ) {
-		CKnownFile* file = reinterpret_cast<CKnownFile*>(GetItemData(index));
-		CoreNotify_KnownFile_Up_Prio_Set( file, priority );
+	// The rebuild renumbers every row, so keep selection + focus by item identity -- otherwise
+	// editing the filter (which comes through here) drops whatever the user had selected.
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
 
-		RefreshItem( index );
+	ClearItemData();
 
-		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	std::vector<CKnownFile *> files;
+	theApp->sharedfiles->CopyFileList(files);
+	uint64 totalSize = 0;
+	for (CKnownFile *file : files) {
+		if (MatchesFilter(file->GetFileName().GetPrintable())) {
+			AppendItemData(reinterpret_cast<wxUIntPtr>(file));
+			totalSize += file->GetFileSize();
+		}
 	}
+	m_shownSize = totalSize;
+	FinishBulkLoad();
+	SetSelectedItemData(selected);
+	ShowFilesCount();
+
+	Thaw();
 }
 
+void CSharedFilesCtrl::RebuildFilteredView()
+{
+	// Filter hook from CMuleVirtualDataViewCtrl: the master share is the
+	// model, so the visible set is rebuilt from it in one pass.
+	ShowFileList();
+}
 
-void CSharedFilesCtrl::OnSetPriorityAuto( wxCommandEvent& WXUNUSED(event) )
+void CSharedFilesCtrl::BeginBatchUpdate()
 {
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	// During the batch ShowFile() appends the row (O(1)) instead of a sorted AddItemData(),
+	// which rebuilds the whole row index per insert -- O(n), so O(n^2) for a burst on a large
+	// share. Coalesce the repaints (Freeze) and defer the single sort to EndBatchUpdate().
+	Freeze();
+	// The rows arrive unsorted and EndBatchUpdate() sorts them once, so the header's sort key
+	// buys nothing here -- and on macOS it costs a re-query and a full comparison pass per
+	// inserted row. See SuspendHeaderSort().
+	SuspendHeaderSort();
+	m_batchUpdate = true;
+	m_batchFrozen = true;
+}
 
-	while( index != -1 ) {
-		CKnownFile* file = reinterpret_cast<CKnownFile*>(GetItemData(index));
-		CoreNotify_KnownFile_Up_Prio_Auto(file);
+void CSharedFilesCtrl::ThawForDisplay()
+{
+	// Only the freeze ends here; the batch runs on, so rows keep arriving as
+	// O(1) appends. Whoever wants them ordered calls SortList().
+	if (m_batchFrozen) {
+		m_batchFrozen = false;
+		Thaw();
+	}
+}
 
-		RefreshItem( index );
+void CSharedFilesCtrl::SortIfRowsAppended()
+{
+	if (!m_batchRowsAppended) {
+		return;
+	}
+	m_batchRowsAppended = false;
+	if (m_startupDrain) {
+		// The rows were appended without notifying the model, so this is the first it hears
+		// of them: FinishBulkLoad() sorts and issues the single Reset() that makes them
+		// exist for the control.
+		FinishBulkLoad();
+		ShowFilesCount();
+	} else {
+		SortList();
+	}
+}
 
-		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+void CSharedFilesCtrl::SetStartupDrainMode(bool on)
+{
+	if (m_startupDrain == on) {
+		return;
+	}
+	m_startupDrain = on;
+	if (!on) {
+		// Anything appended since the last tick is still invisible to the
+		// model; flush before the caller ends the batch.
+		SortIfRowsAppended();
 	}
 }
 
+void CSharedFilesCtrl::SetHashingCount(size_t remaining)
+{
+	if (m_hashingRemaining == remaining) {
+		return;
+	}
+	m_hashingRemaining = remaining;
+	ShowFilesCount();
+}
 
-void CSharedFilesCtrl::OnCreateURI( wxCommandEvent& event )
+void CSharedFilesCtrl::EndBatchUpdate(bool doSort)
 {
-	wxString URIs;
+	m_batchUpdate = false;
+	// A poll that only updated rows in place (no new files) leaves the sort
+	// order untouched, so skip the O(n log n) SortList entirely.
+	if (doSort) {
+		SortList();
+	}
+	m_batchRowsAppended = false;
+	RestoreHeaderSort();
+	// Skipped when ThawForDisplay() already ended the freeze: wx counts
+	// Freeze/Thaw and an unbalanced Thaw() asserts.
+	if (m_batchFrozen) {
+		m_batchFrozen = false;
+		Thaw();
+	}
+}
 
-	if ( event.GetId() == MP_GETSOURCEED2KLINK || event.GetId() == MP_GETCRYPTSOURCEDED2KLINK) {
-		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;
-		}
+void CSharedFilesCtrl::RemoveFile(CKnownFile *toRemove)
+{
+	if (RowOfData(reinterpret_cast<wxUIntPtr>(toRemove)) == -1) {
+		return;
 	}
+	RemoveItemData(reinterpret_cast<wxUIntPtr>(toRemove));
+	m_shownSize -= toRemove->GetFileSize();
+	ShowFilesCount();
+}
 
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+void CSharedFilesCtrl::ClearList()
+{
+	ClearItemData();
+}
 
-	while( index != -1 ) {
-		CKnownFile* file = reinterpret_cast<CKnownFile*>(GetItemData(index));
+void CSharedFilesCtrl::ShowFile(CKnownFile *file)
+{
+	// A newly-shared file that doesn't match the active filter stays hidden;
+	// it'll appear if the filter is cleared/changed (which rebuilds the model).
+	if (!MatchesFilter(file->GetFileName().GetPrintable())) {
+		return;
+	}
 
-		switch ( event.GetId() ) {
-			case MP_GETMAGNETLINK:				URIs += theApp->CreateMagnetLink( file ) + "\n";				break;
-			case MP_GETED2KLINK:				URIs += theApp->CreateED2kLink( file ) + "\n";					break;
-			case MP_GETSOURCEED2KLINK:			URIs += theApp->CreateED2kLink( file , true) + "\n";			break;
-			case MP_GETCRYPTSOURCEDED2KLINK:	URIs += theApp->CreateED2kLink( file , true, false, true) + "\n";			break;
-			case MP_GETHOSTNAMESOURCEED2KLINK:	URIs += theApp->CreateED2kLink( file , true, true) + "\n";	break;
-			case MP_GETHOSTNAMECRYPTSOURCEED2KLINK:			URIs += theApp->CreateED2kLink( file, true, true, true ) + "\n";	break;
-			case MP_GETAICHED2KLINK:			URIs += theApp->CreateED2kLink(file, false, false, false, true) + "\n";		break;
-			case MP_GETAICHED2KLINKSRC:			URIs += theApp->CreateED2kLink(file, true,  false, false, true) + "\n";		break;
+	if (m_batchUpdate) {
+		// Batched poll (remote GUI): append at the end (O(1)) and let EndBatchUpdate() sort
+		// once. AddItemData()'s sorted insert rebuilds the whole row index on every call
+		// (O(n)), turning a burst of freshly-shared files into an O(n^2) freeze on a large
+		// share. Mirrors CDownloadListCtrl::ShowFile(). AppendItemDataNow() keeps the row
+		// index and item count live, so the interleaved reconcile prune and in-place
+		// UpdateItem() during the same poll stay correct.
+		const wxUIntPtr data = reinterpret_cast<wxUIntPtr>(file);
+		if (RowOfData(data) == -1) {
+			if (m_startupDrain) {
+				// Silent append: the drain tick tells the model once, and
+				// refreshes the label, for everything since the last one.
+				AppendItemData(data);
+			} else {
+				AppendItemDataNow(data);
+			}
+			m_batchRowsAppended = true;
+			m_shownSize += file->GetFileSize();
+			if (!m_startupDrain) {
+				ShowFilesCount();
+			}
 		}
+		return;
+	}
+	DoShowFile(file, false);
+}
 
-		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+void CSharedFilesCtrl::DoShowFile(CKnownFile *file, bool batch)
+{
+	if (batch) {
+		// Bulk (re)load: append unsorted; ShowFileList() sorts + indexes once
+		// at the end. No dedupe/count here, exactly as before.
+		AppendItemData(reinterpret_cast<wxUIntPtr>(file));
+		return;
 	}
 
-	if ( !URIs.IsEmpty() ) {
-		theApp->CopyTextToClipboard( URIs.RemoveLast() );
+	// AddItemData() dedupes internally.
+	if (RowOfData(reinterpret_cast<wxUIntPtr>(file)) == -1) {
+		m_shownSize += file->GetFileSize();
 	}
+	AddItemData(reinterpret_cast<wxUIntPtr>(file));
+	ShowFilesCount();
 }
 
-
-void CSharedFilesCtrl::OnEditComment( wxCommandEvent& WXUNUSED(event) )
+void CSharedFilesCtrl::OnSetPriority(wxCommandEvent &event)
 {
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	int priority = 0;
 
-	if ( index != -1 ) {
-		CKnownFile* file = reinterpret_cast<CKnownFile*>(GetItemData(index));
+	switch (event.GetId()) {
+	case MP_PRIOVERYLOW:
+		priority = PR_VERY_LOW;
+		break;
+	case MP_PRIOLOW:
+		priority = PR_LOW;
+		break;
+	case MP_PRIONORMAL:
+		priority = PR_NORMAL;
+		break;
+	case MP_PRIOHIGH:
+		priority = PR_HIGH;
+		break;
+	case MP_PRIOVERYHIGH:
+		priority = PR_VERYHIGH;
+		break;
+	case MP_POWERSHARE:
+		priority = PR_POWERSHARE;
+		break;
+	}
 
-		CCommentDialog dialog( this, file );
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CKnownFile *file = reinterpret_cast<CKnownFile *>(data);
+		CoreNotify_KnownFile_Up_Prio_Set(file, priority);
+		RefreshItemData(data);
+	}
+}
 
-		dialog.ShowModal();
+void CSharedFilesCtrl::OnSetPriorityAuto(wxCommandEvent &WXUNUSED(event))
+{
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		CKnownFile *file = reinterpret_cast<CKnownFile *>(data);
+		CoreNotify_KnownFile_Up_Prio_Auto(file);
+		RefreshItemData(data);
 	}
 }
 
+wxString CSharedFilesCtrl::LinkForFile(const CKnownFile *file, int menuId) const
+{
+	switch (menuId) {
+	case MP_GETMAGNETLINK:
+		return theApp->CreateMagnetLink(file);
+	case MP_GETSOURCEED2KLINK:
+		return theApp->CreateED2kLink(file, true);
+	case MP_GETCRYPTSOURCEDED2KLINK:
+		return theApp->CreateED2kLink(file, true, false, true);
+	case MP_GETHOSTNAMESOURCEED2KLINK:
+		return theApp->CreateED2kLink(file, true, true);
+	case MP_GETHOSTNAMECRYPTSOURCEED2KLINK:
+		return theApp->CreateED2kLink(file, true, true, true);
+	case MP_GETAICHED2KLINK:
+		return theApp->CreateED2kLink(file, false, false, false, true);
+	case MP_GETAICHED2KLINKSRC:
+		return theApp->CreateED2kLink(file, true, false, false, true);
+	default:
+		// MP_GETED2KLINK, and what the collection export asks for.
+		return theApp->CreateED2kLink(file);
+	}
+}
 
-int CSharedFilesCtrl::SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData)
+wxString CSharedFilesCtrl::SelectedLinks(int menuId) const
 {
-	CKnownFile* file1 = reinterpret_cast<CKnownFile*>(item1);
-	CKnownFile* file2 = reinterpret_cast<CKnownFile*>(item2);
+	wxString links;
 
-	int mod = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
-	bool altSorting = (sortData & CMuleListCtrl::SORT_ALT) > 0;
+	for (wxUIntPtr data : GetSelectedItemData()) {
+		const CKnownFile *file = reinterpret_cast<const CKnownFile *>(data);
+		if (file != nullptr) {
+			links += LinkForFile(file, menuId) + "\n";
+		}
+	}
 
-	switch (sortData & CMuleListCtrl::COLUMN_MASK) {
-		// Sort by filename.
-		case  ID_SHARED_COL_NAME:
-			return mod * CmpAny(file1->GetFileName(), file2->GetFileName());
+	return links;
+}
 
-		// Sort by filesize.
-		case  ID_SHARED_COL_SIZE:
-			return mod * CmpAny( file1->GetFileSize(), file2->GetFileSize() );
+void CSharedFilesCtrl::OnCreateURI(wxCommandEvent &event)
+{
+	if (event.GetId() == MP_GETSOURCEED2KLINK || event.GetId() == MP_GETCRYPTSOURCEDED2KLINK) {
+		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;
+		}
+	}
 
-		// Sort by filetype.
-		case  ID_SHARED_COL_TYPE:
-			return mod * GetFiletypeByName(file1->GetFileName()).CmpNoCase(GetFiletypeByName( file2->GetFileName()) );
+	wxString URIs = SelectedLinks(event.GetId());
+	if (!URIs.IsEmpty()) {
+		theApp->CopyTextToClipboard(URIs.RemoveLast());
+	}
+}
 
-		// Sort by priority.
-		case  ID_SHARED_COL_PRIO: {
-			int8 prioA = file1->GetUpPriority();
-			int8 prioB = file2->GetUpPriority();
+void CSharedFilesCtrl::OnExportCollection(wxCommandEvent &WXUNUSED(evt))
+{
+	const wxString caption = _("Export to emulecollection");
+
+	// Same links the "Copy eD2k link to clipboard" item produces, for the same selection: a
+	// text collection is a plain list of them, which is what CMuleCollection and eMule both
+	// read back.
+	const wxString links = SelectedLinks(MP_GETED2KLINK);
+	if (links.IsEmpty()) {
+		wxMessageBox(_("No files are selected to export."), caption, wxOK | wxICON_INFORMATION, this);
+		return;
+	}
 
-			// Work-around for PR_VERY_LOW which has value 4. See KnownFile.h for that stupidity ...
-			return mod * CmpAny( ( prioB != PR_VERY_LOW ? prioB : -1 ), ( prioA != PR_VERY_LOW ? prioA : -1 ) );
+	// Timestamped so repeated exports sit side by side instead of one silently replacing the
+	// last. Sortable order, no characters that would need escaping on any filesystem we
+	// support.
+	const wxString defaultName =
+		CFormat("amule-shared-%s.emulecollection") % wxDateTime::Now().Format("%Y%m%d-%H%M%S");
+
+	wxString wildcard = _("eMule collections (*.emulecollection)");
+	wildcard += "|*.emulecollection|";
+	wildcard += _("All files");
+	wildcard += "|*";
+	wxFileDialog dialog(
+		this, caption, wxEmptyString, defaultName, wildcard, wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+	if (dialog.ShowModal() != wxID_OK) {
+		return;
+	}
+
+	wxString path = dialog.GetPath();
+	if (path.IsEmpty()) {
+		return;
+	}
+	// Append the extension when the user picked the collection filter and left it off.
+	// wxFD_OVERWRITE_PROMPT judged the name as typed, so ask again here: without this, saving
+	// as "backup" over an existing "backup.emulecollection" would overwrite it without a word.
+	if (dialog.GetFilterIndex() == 0 && !path.Lower().EndsWith(".emulecollection")) {
+		path += ".emulecollection";
+		if (wxFileExists(path) &&
+			wxMessageBox(CFormat(_("'%s' already exists. Overwrite it?")) % path,
+				caption,
+				wxYES_NO | wxICON_QUESTION,
+				this) != wxYES) {
+			return;
 		}
+	}
 
-		// Sort by fileID.
-		case  ID_SHARED_COL_ID:
-			return mod * file1->GetFileHash().Encode().Cmp( file2->GetFileHash().Encode() );
+	// UTF-8 and no byte-order mark: aMule skips a BOM when reading a text collection, but eMule
+	// reads one through CStdioFile in text mode, where the mark would land in the first line
+	// and cost that entry.
+	const wxCharBuffer utf8(unicode2UTF8(links));
+	wxFile out;
+	if (!out.Create(path, true) || out.Write(utf8.data(), utf8.length()) != utf8.length() ||
+		!out.Close()) {
+		// A failure part-way through leaves a truncated collection behind;
+		// drop it rather than let it look like a good export.
+		out.Close();
+		wxRemoveFile(path);
+		wxMessageBox(CFormat(_("Failed to write the collection file '%s'.")) % path,
+			caption,
+			wxOK | wxICON_ERROR,
+			this);
+		return;
+	}
 
-		// Sort by Requests this session.
-		case  ID_SHARED_COL_REQ:
-			if (altSorting) {
-				return mod * CmpAny( file1->statistic.GetAllTimeRequests(), file2->statistic.GetAllTimeRequests() );
-			} else {
-				return mod * CmpAny( file1->statistic.GetRequests(), file2->statistic.GetRequests() );
-			}
+	// One string for the log line and the confirmation both, so the export
+	// costs translators one plural form rather than two near-identical ones.
+	const unsigned written = static_cast<unsigned>(links.Freq('\n'));
+	const wxString message = CFormat(wxPLURAL("Exported %u shared file to '%s'.",
+					 "Exported %u shared files to '%s'.",
+					 static_cast<int>(written))) %
+				 written % path;
+	AddLogLineC(message);
+	wxMessageBox(message, caption, wxOK | wxICON_INFORMATION, this);
+}
 
-		// Sort by accepted requests. Ascending.
-		case  ID_SHARED_COL_AREQ:
-			if (altSorting) {
-				return mod * CmpAny( file1->statistic.GetAllTimeAccepts(), file2->statistic.GetAllTimeAccepts() );
-			} else {
-				return mod * CmpAny( file1->statistic.GetAccepts(), file2->statistic.GetAccepts() );
-			}
+void CSharedFilesCtrl::OnEditComment(wxCommandEvent &WXUNUSED(event))
+{
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	if (!selected.empty()) {
+		CKnownFile *file = reinterpret_cast<CKnownFile *>(selected.front());
+		CCommentDialog dialog(this, file);
+		dialog.ShowModal();
+	}
+}
 
-		// Sort by transferred. Ascending.
-		case  ID_SHARED_COL_TRA:
-			if (altSorting) {
-				return mod * CmpAny( file1->statistic.GetAllTimeTransferred(), file2->statistic.GetAllTimeTransferred() );
-			} else {
-				return mod * CmpAny( file1->statistic.GetTransferred(), file2->statistic.GetTransferred() );
-			}
+namespace
+{
+// Empty (never probed) sorts last whichever way the column is sorted, so the
+// rows that do have a value stay together at the top.
+int CompareMediaStr(const wxString &a, const wxString &b, int modifier)
+{
+	if (a.IsEmpty() && b.IsEmpty()) {
+		return 0;
+	}
+	if (a.IsEmpty()) {
+		return 1;
+	}
+	if (b.IsEmpty()) {
+		return -1;
+	}
+	return modifier * a.CmpNoCase(b);
+}
 
-		// Sort by Share Ratio. Ascending.
-		case  ID_SHARED_COL_RTIO:
-			return mod * CmpAny( (double)file1->statistic.GetAllTimeTransferred() / file1->GetFileSize(),
-					(double)file2->statistic.GetAllTimeTransferred() / file2->GetFileSize() );
+int CompareMediaInt(uint32 v1, uint32 v2, int modifier)
+{
+	if (!v1 && !v2) {
+		return 0;
+	}
+	if (!v1) {
+		return 1;
+	}
+	if (!v2) {
+		return -1;
+	}
+	return modifier * CmpAny(v1, v2);
+}
+} // namespace
 
-		// Complete sources asc
-		case ID_SHARED_COL_CMPL:
-			return mod * CmpAny( file1->m_nCompleteSourcesCount, file2->m_nCompleteSourcesCount );
+int CSharedFilesCtrl::CompareItemData(
+	wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool alt, int modifier) const
+{
+	const CKnownFile *file1 = reinterpret_cast<const CKnownFile *>(data1);
+	const CKnownFile *file2 = reinterpret_cast<const CKnownFile *>(data2);
+	const int mod = modifier;
+
+	switch (column) {
+	// Sort by filename.
+	case COLUMN_SHARED_NAME:
+		return mod * CmpAny(file1->GetFileName(), file2->GetFileName());
+
+	// Sort by filesize.
+	case COLUMN_SHARED_SIZE:
+		return mod * CmpAny(file1->GetFileSize(), file2->GetFileSize());
+
+	// Sort by filetype.
+	case COLUMN_SHARED_TYPE:
+		return mod * GetFiletypeByName(file1->GetFileName())
+				     .CmpNoCase(GetFiletypeByName(file2->GetFileName()));
+
+	// Sort by priority.
+	case COLUMN_SHARED_PRIO: {
+		int8 prioA = file1->GetUpPriority();
+		int8 prioB = file2->GetUpPriority();
+
+		// Work-around for PR_VERY_LOW which has value 4. See KnownFile.h for that stupidity ...
+		return mod * CmpAny((prioB != PR_VERY_LOW ? prioB : -1), (prioA != PR_VERY_LOW ? prioA : -1));
+	}
+
+	// Sort by Requests this session.
+	case COLUMN_SHARED_REQ:
+		if (alt) {
+			return mod * CmpAny(file1->statistic.GetAllTimeRequests(),
+					     file2->statistic.GetAllTimeRequests());
+		} else {
+			return mod * CmpAny(file1->statistic.GetRequests(), file2->statistic.GetRequests());
+		}
 
-		// Folders ascending
-		case ID_SHARED_COL_PATH: {
-			if ( file1->IsPartFile() && file2->IsPartFile() )
-				return mod *  0;
-			if ( file1->IsPartFile() )
-				return mod * -1;
-			if ( file2->IsPartFile() )
-				return mod *  1;
+	// Sort by accepted requests. Ascending.
+	case COLUMN_SHARED_AREQ:
+		if (alt) {
+			return mod * CmpAny(file1->statistic.GetAllTimeAccepts(),
+					     file2->statistic.GetAllTimeAccepts());
+		} else {
+			return mod * CmpAny(file1->statistic.GetAccepts(), file2->statistic.GetAccepts());
+		}
 
-			return mod * CmpAny(file1->GetFilePath(), file2->GetFilePath());
+	// Sort by transferred. Ascending.
+	case COLUMN_SHARED_TRA:
+		if (alt) {
+			return mod * CmpAny(file1->statistic.GetAllTimeTransferred(),
+					     file2->statistic.GetAllTimeTransferred());
+		} else {
+			return mod *
+			       CmpAny(file1->statistic.GetTransferred(), file2->statistic.GetTransferred());
 		}
 
-		default:
-			return 0;
+	// Sort by Share Ratio. Ascending.
+	case COLUMN_SHARED_RTIO:
+		return mod * CmpAny(static_cast<double>(file1->statistic.GetAllTimeTransferred()) /
+					     static_cast<double>(file1->GetFileSize()),
+				     static_cast<double>(file2->statistic.GetAllTimeTransferred()) /
+					     static_cast<double>(file2->GetFileSize()));
+
+	// Complete sources asc
+	case COLUMN_SHARED_CMPL:
+		return mod * CmpAny(file1->m_nCompleteSourcesCount, file2->m_nCompleteSourcesCount);
+
+	// Live upload speed asc
+	case COLUMN_SHARED_SPEED:
+		return mod * CmpAny(file1->GetUploadDatarate(), file2->GetUploadDatarate());
+
+	// Shared-since date asc
+	case COLUMN_SHARED_SINCE:
+		return mod * CmpAny(file1->GetDateShared(), file2->GetDateShared());
+
+	// Last-upload date asc
+	case COLUMN_SHARED_LASTUP:
+		return mod * CmpAny(file1->GetLastUpload(), file2->GetLastUpload());
+
+	// Directory path asc (status-agnostic: the Temp dir for a partfile)
+	case COLUMN_SHARED_PATH:
+		return mod * CmpAny(file1->GetFilePath(), file2->GetFilePath());
+
+	// Media tags. Unprobed files sort last in both directions rather than counting as zero,
+	// which would bury the probed rows under them on an ascending sort -- the same rule the
+	// search list applies.
+	case COLUMN_SHARED_MEDIA_LENGTH:
+		return CompareMediaInt(
+			file1->GetIntTagValue(FT_MEDIA_LENGTH), file2->GetIntTagValue(FT_MEDIA_LENGTH), mod);
+
+	case COLUMN_SHARED_MEDIA_BITRATE:
+		return CompareMediaInt(file1->GetIntTagValue(FT_MEDIA_BITRATE),
+			file2->GetIntTagValue(FT_MEDIA_BITRATE),
+			mod);
+
+	case COLUMN_SHARED_MEDIA_CODEC:
+		return CompareMediaStr(FormatMediaCodec(file1->GetStrTagValue(FT_MEDIA_CODEC)),
+			FormatMediaCodec(file2->GetStrTagValue(FT_MEDIA_CODEC)),
+			mod);
+
+	case COLUMN_SHARED_MEDIA_ARTIST:
+		return CompareMediaStr(
+			file1->GetStrTagValue(FT_MEDIA_ARTIST), file2->GetStrTagValue(FT_MEDIA_ARTIST), mod);
+
+	case COLUMN_SHARED_MEDIA_ALBUM:
+		return CompareMediaStr(
+			file1->GetStrTagValue(FT_MEDIA_ALBUM), file2->GetStrTagValue(FT_MEDIA_ALBUM), mod);
+
+	case COLUMN_SHARED_MEDIA_TITLE:
+		return CompareMediaStr(
+			file1->GetStrTagValue(FT_MEDIA_TITLE), file2->GetStrTagValue(FT_MEDIA_TITLE), mod);
+
+	default:
+		return 0;
 	}
 }
 
-
-void CSharedFilesCtrl::UpdateItem(CKnownFile* toupdate)
+void CSharedFilesCtrl::UpdateItem(CKnownFile *toupdate)
 {
 	if (m_inBulkUpdate) {
-		// Caller (e.g. CSharedFileList::ClearED2KPublishInfo) will
-		// issue a single Refresh() in EndBulkUpdate(). Skipping the
-		// per-row FindItem here is what turns ClearED2KPublishInfo
-		// from O(N²) into O(N) for users with thousands of shared
+		// The caller (e.g. CSharedFileList::ClearED2KPublishInfo) issues a single Refresh()
+		// in EndBulkUpdate(). Skipping the per-row refresh here is what turns
+		// ClearED2KPublishInfo from O(N^2) into O(N) for users with thousands of shared
 		// files. See #302.
 		return;
 	}
-	long result = FindItem( -1, reinterpret_cast<wxUIntPtr>(toupdate) );
-
-	if ( result > -1 ) {
-		RefreshItem(result);
+	const wxUIntPtr data = reinterpret_cast<wxUIntPtr>(toupdate);
+	if (!HasItemData(data)) {
+		return;
+	}
+	// Repaints the row and, if sorted by a live column, schedules the
+	// throttled+idle-gated re-sort.
+	RefreshItemData(data);
 
-		if ( GetItemState( result, wxLIST_STATE_SELECTED ) ) {
-			theApp->amuledlg->m_sharedfileswnd->SelectionUpdated();
-		}
+	if (IsItemDataSelected(data)) {
+		theApp->amuledlg->m_sharedfileswnd->SelectionUpdated();
 	}
 }
 
-
 void CSharedFilesCtrl::BeginBulkUpdate()
 {
 	m_inBulkUpdate = true;
 }
 
-
 void CSharedFilesCtrl::EndBulkUpdate()
 {
 	m_inBulkUpdate = false;
-	// One full repaint covers every row whose data changed during the
-	// bulk window. SelectionUpdated() refreshes the right-hand detail
-	// panel in case the selected row's data changed.
+	// One full repaint covers every row whose data changed during the bulk window.
+	// SelectionUpdated() refreshes the right-hand detail panel in case the selected row's data
+	// changed.
 	Refresh();
 	if (theApp->amuledlg && theApp->amuledlg->m_sharedfileswnd) {
 		theApp->amuledlg->m_sharedfileswnd->SelectionUpdated();
 	}
 }
 
-
-void CSharedFilesCtrl::ShowFilesCount()
+uint64 CSharedFilesCtrl::ShownIncompleteBytes() const
 {
-	wxStaticText* label = CastByName( "sharedFilesLabel", GetParent(), wxStaticText );
+	if (!theApp->downloadqueue) {
+		return 0;
+	}
 
-	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();
+	std::vector<CPartFile *> parts;
+#ifdef CLIENT_GUI
+	// CDownQueueRem is a std::map keyed by ECID, with no CopyFileList(). This file is compiled
+	// per executable rather than into muleappgui (cmake/source-vars.cmake), so the two builds
+	// really do see their own download queue here.
+	parts.reserve(theApp->downloadqueue->size());
+	for (const auto &entry : *theApp->downloadqueue) {
+		parts.push_back(entry.second);
+	}
+#else
+	theApp->downloadqueue->CopyFileList(parts);
+#endif
+
+	uint64 missing = 0;
+	for (CPartFile *part : parts) {
+		if (!part) {
+			continue;
+		}
+		// Upcast before the row lookup: the list keys its rows by the
+		// CKnownFile the share holds, which is what was stored.
+		const CKnownFile *known = part;
+		if (RowOfData(reinterpret_cast<wxUIntPtr>(known)) == -1) {
+			continue;
+		}
+		const uint64 size = part->GetFileSize();
+		const uint64 obtained = part->GetCompletedSize();
+		if (obtained < size) {
+			missing += size - obtained;
+		}
+	}
+	return missing;
 }
 
-
-void CSharedFilesCtrl::OnDrawItem( int item, wxDC* dc, const wxRect& rect, const wxRect& rectHL, bool highlighted )
+void CSharedFilesCtrl::UpdateTotalSize()
 {
-	CKnownFile *file = reinterpret_cast<CKnownFile*>(GetItemData(item));
-	wxASSERT( file );
-
-	if ( highlighted ) {
-		CMuleColour newcol = GetFocus()
-			? CMuleColour(wxSYS_COLOUR_HIGHLIGHT)
-			: CMuleColour(CMuleColour::GetUnfocusedHighlight());
-		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( CMuleColour(wxSYS_COLOUR_LISTBOX).GetBrush() );
-		dc->SetTextForeground(CMuleColour(wxSYS_COLOUR_WINDOWTEXT));
-		dc->SetPen(*wxTRANSPARENT_PEN);
-	}
-
-	dc->SetBrush(dc->GetBackground());
-	dc->DrawRectangle(rectHL);
-	dc->SetPen(*wxTRANSPARENT_PEN);
-
-	// Offset based on the height of the fonts
-	const int textVOffset = ( rect.GetHeight() - dc->GetCharHeight() ) / 2;
-	// Empty space to each side of a column
-	const int SPARE_PIXELS_HORZ	= 4;
-
-	// The leftmost position of the current column
-	int columnLeft = 0;
-
-	for ( int i = 0; i < GetColumnCount(); ++i ) {
-		const int columnWidth = GetColumnWidth(i);
-
-		if (columnWidth > 2*SPARE_PIXELS_HORZ) {
-			wxRect columnRect(
-				columnLeft + SPARE_PIXELS_HORZ, rect.y,
-				columnWidth - 2 * SPARE_PIXELS_HORZ, rect.height);
-
-			wxDCClipper clipper(*dc, columnRect);
-
-			wxString textBuffer;
-			switch ( i ) {
-				case ID_SHARED_COL_NAME:
-					textBuffer = file->GetFileName().GetPrintable();
-
-					if (file->GetFileRating() || file->GetFileComment().Length()) {
-						int image = Client_CommentOnly_Smiley;
-						if (file->GetFileRating()) {
-							image = Client_InvalidRating_Smiley + file->GetFileRating() - 1;
-						}
-
-						wxASSERT(image >= Client_InvalidRating_Smiley);
-						wxASSERT(image <= Client_CommentOnly_Smiley);
-
-						int imgWidth = 16;
-
-						theApp->amuledlg->m_imagelist.Draw(image, *dc, columnRect.x,
-								columnRect.y + 1, wxIMAGELIST_DRAW_TRANSPARENT);
-
-						// Move the text to the right
-						columnRect.x += (imgWidth + 4);
-					}
-
-					break;
-
-				case ID_SHARED_COL_SIZE:
-					textBuffer = CastItoXBytes(file->GetFileSize());
-					break;
-
-				case ID_SHARED_COL_TYPE:
-					textBuffer = GetFiletypeByName(file->GetFileName());
-					break;
-
-				case ID_SHARED_COL_PRIO:
-					textBuffer = PriorityToStr(file->GetUpPriority(), file->IsAutoUpPriority());
-					break;
-
-				case ID_SHARED_COL_ID:
-					textBuffer = file->GetFileHash().Encode();
-					break;
-
-				case ID_SHARED_COL_REQ:
-					textBuffer = CFormat("%u (%u)")
-							% file->statistic.GetRequests()
-							% file->statistic.GetAllTimeRequests();
-					break;
-
-				case ID_SHARED_COL_AREQ:
-					textBuffer = CFormat("%u (%u)")
-							% file->statistic.GetAccepts()
-							% file->statistic.GetAllTimeAccepts();
-					break;
-
-				case ID_SHARED_COL_TRA:
-					textBuffer = CastItoXBytes(file->statistic.GetTransferred())
-						+ " (" + CastItoXBytes(file->statistic.GetAllTimeTransferred()) + ")";
-					break;
-
-				case ID_SHARED_COL_RTIO:
-					textBuffer = CFormat("%.2f") %	((double)file->statistic.GetAllTimeTransferred() / file->GetFileSize());
-					break;
-
-				case ID_SHARED_COL_PART:
-					if ( file->GetPartCount() ) {
-						wxRect barRect(columnRect.x, columnRect. y + 1,
-							columnRect.width, columnRect.height - 2);
-
-						DrawAvailabilityBar(file, dc, barRect);
-					}
-					break;
-
-				case ID_SHARED_COL_CMPL:
-					if ( file->m_nCompleteSourcesCountLo == 0 ) {
-						if ( file->m_nCompleteSourcesCountHi ) {
-							textBuffer = CFormat("< %u") % file->m_nCompleteSourcesCountHi;
-						} else {
-							textBuffer = "0";
-						}
-					} else if (file->m_nCompleteSourcesCountLo == file->m_nCompleteSourcesCountHi) {
-						textBuffer = CFormat("%u") % file->m_nCompleteSourcesCountLo;
-					} else {
-						textBuffer = CFormat("%u - %u") % file->m_nCompleteSourcesCountLo % file->m_nCompleteSourcesCountHi;
-					}
-
-					break;
-
-				case ID_SHARED_COL_PATH:
-					if ( file->IsPartFile() ) {
-						textBuffer = _("PartFile");
-					} else {
-						textBuffer = file->GetFilePath().GetPrintable();
-					}
-			}
-
-			if (!textBuffer.IsEmpty()) {
-				dc->DrawText(textBuffer, columnRect.x, columnRect.y + textVOffset);
-			}
+	// The label lives in the statistics box (the bottom pane of the shared splitter), a
+	// different window from this list, so reach it through the shared-files window rather than
+	// GetParent(). Resolved once; see the note on m_freeSpaceLabel.
+	if (!theApp->amuledlg || !theApp->amuledlg->m_sharedfileswnd) {
+		return;
+	}
+	if (!m_totalSizeLabel) {
+		m_totalSizeLabel =
+			CastByName("sharedFilesTotalSize", theApp->amuledlg->m_sharedfileswnd, wxStaticText);
+		if (!m_totalSizeLabel) {
+			return;
 		}
+	}
 
-		// Move to the next column
-		columnLeft += columnWidth;
+	// The total is the sum of the Size column, which shows a part file's final size. That
+	// answers "how much am I sharing" but not "how much of it do I have", and the two differ by
+	// however much is still to download -- 400 GB of it in the report that prompted this
+	// (#927). Both are shown rather than one replaced, so the total still adds up to its own
+	// column.
+	//
+	// "completed", the word the Downloads list already uses for this quantity, rather than
+	// "complete": what is counted is bytes obtained, not files that are finished.
+	const uint64 missing = ShownIncompleteBytes();
+	const wxString text =
+		missing ? CFormat(_("Total size of Shared Files: %s (%s completed)")) %
+				  CastItoXBytes(m_shownSize) % CastItoXBytes(m_shownSize - missing)
+			: CFormat(_("Total size of Shared Files: %s")) % CastItoXBytes(m_shownSize);
+
+	// SetLabel() repaints even when the text is unchanged, and the GUI timer
+	// calls this once a second for as long as the panel is up.
+	if (m_totalSizeLabel->GetLabel() == text) {
+		return;
 	}
+	m_totalSizeLabel->SetLabel(text);
+	m_totalSizeLabel->GetParent()->Layout();
 }
 
-
-wxString CSharedFilesCtrl::GetTTSText(unsigned item) const
+void CSharedFilesCtrl::UpdateFreeSpace()
 {
-	return reinterpret_cast<CKnownFile*>(GetItemData(item))->GetFileName().GetPrintable();
-}
-
-
-bool CSharedFilesCtrl::AltSortAllowed(unsigned column) const
-{
-	switch ( column ) {
-		case ID_SHARED_COL_REQ:
-		case ID_SHARED_COL_AREQ:
-		case ID_SHARED_COL_TRA:
-			return true;
-
-		default:
-			return false;
+	if (!theApp->amuledlg || !theApp->amuledlg->m_sharedfileswnd) {
+		return;
+	}
+	// Resolved once; see the note on CDownloadListCtrl's copy.
+	if (!m_freeSpaceLabel) {
+		m_freeSpaceLabel =
+			CastByName("sharedFilesFreeSpace", theApp->amuledlg->m_sharedfileswnd, wxStaticText);
 	}
+	CamuleDlg::SetFreeSpaceLabel(m_freeSpaceLabel, theStats::GetIncomingFreeSpace(), false);
 }
 
-
-void CSharedFilesCtrl::DrawAvailabilityBar(CKnownFile* file, wxDC* dc, const wxRect& rect ) const
+void CSharedFilesCtrl::ShowFilesCount()
 {
-	// Reference to the availability list
-	const ArrayOfUInts16& list = file->IsPartFile() ?
-		static_cast<CPartFile*>(file)->m_SrcpartFrequency :
-		file->m_AvailPartFrequency;
-	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_ChunkBar;
-	s_ChunkBar.SetFileSize( file->GetFileSize() );
-	s_ChunkBar.SetHeight( barRect.GetHeight() );
-	s_ChunkBar.SetWidth( barRect.GetWidth() );
-	s_ChunkBar.Set3dDepth( CPreferences::Get3DDepth() );
-	uint64 end = 0;
-	for ( unsigned int i = 0; i < list.size(); ++i ) {
-		uint64 start = PARTSIZE * static_cast<uint64>(i);
-		end   = PARTSIZE * static_cast<uint64>(i + 1);
-		s_ChunkBar.FillRange(start, end, CMuleColour(listi ? 0 : 255, listi ? ((210-(22*( listi - 1 ) ) < 0) ? 0 : (210-(22*( listi - 1 ) ))) : 0, listi ? 255 : 0));
+	wxStaticText *label = CastByName("sharedFilesLabel", GetParent(), wxStaticText);
+
+	if (m_hashingRemaining > 0) {
+		// Startup is still hashing files the scan found; they join the list as each one
+		// finishes. Said here rather than in a dialog: it is progress, not something to
+		// acknowledge (#853).
+		label->SetLabel(CFormat(wxPLURAL("Shared Files (%i, hashing %u more)",
+					"Shared Files (%i, hashing %u more)",
+					m_hashingRemaining)) %
+				ItemDataCount() % m_hashingRemaining);
+	} else {
+		label->SetLabel(CFormat(_("Shared Files (%i)")) % ItemDataCount());
 	}
-	s_ChunkBar.FillRange(end + 1, file->GetFileSize() - 1, CMuleColour(255, 0, 0));
-	s_ChunkBar.Draw(dc, barRect.x, barRect.y, bFlat);
 
-	if (!bFlat) {
-		// Draw black border
-		dc->SetPen( *wxBLACK_PEN );
-		dc->SetBrush( *wxTRANSPARENT_BRUSH );
-		dc->DrawRectangle(rect);
-	}
+	UpdateTotalSize();
 
-	dc->SetPen( old_pen );
-	dc->SetBrush( old_brush );
+	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();
 }
 
-void CSharedFilesCtrl::OnRename( wxCommandEvent& WXUNUSED(event) )
+void CSharedFilesCtrl::OnRename(wxCommandEvent &WXUNUSED(event))
 {
-	int item = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	if ( item != -1 ) {
-		CKnownFile* file = reinterpret_cast<CKnownFile*>(GetItemData(item));
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	if (selected.empty()) {
+		return;
+	}
+	CKnownFile *file = reinterpret_cast<CKnownFile *>(selected.front());
 
-		wxString strNewName = ::wxGetTextFromUser(
-			_("Enter new name for this file:"),
-			_("File rename"), file->GetFileName().GetPrintable());
+	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);
-		}
+	CPath newName = CPath(strNewName);
+	if (newName.IsOk() && (newName != file->GetFileName())) {
+		theApp->sharedfiles->RenameFile(file, newName);
 	}
 }
 
-
-void CSharedFilesCtrl::OnKeyPressed( wxKeyEvent& event )
+bool CSharedFilesCtrl::OnListKey(wxKeyEvent &event)
 {
 	if (event.GetKeyCode() == WXK_F2) {
 		wxCommandEvent evt;
 		OnRename(evt);
+		return true;
+	}
+	return false;
+}
+
+void CSharedFilesCtrl::OnAddCollection(wxCommandEvent &WXUNUSED(evt))
+{
+	const std::vector<wxUIntPtr> selected = GetSelectedItemData();
+	if (selected.empty()) {
+		return;
+	}
+	CKnownFile *file = reinterpret_cast<CKnownFile *>(selected.front());
+
+	// The collection is parsed on this side, so its bytes have to be readable from this host.
+	// amulegui is shown the daemon's directory, which ResolvePath() rewrites through the user's
+	// configured mapping; in the monolithic build the path is already local and resolves
+	// unchanged.
+	//
+	// A part file is turned away rather than resolved: it resolves to the ".part" in the temp
+	// directory, which does exist, so a half-downloaded collection would parse and quietly
+	// queue whichever links happened to be on disk already. The menu entry is disabled for
+	// those, so this repeats that test only to keep the handler correct on its own.
+	CPath collection;
+	if (file->IsPartFile() || !FileLaunch::ResolvePath(file, collection)) {
+		return;
+	}
 
+	// The same expansion the command line and the macOS open-document path use: it reports a
+	// missing, malformed or empty collection itself, and runs every entry through
+	// CheckPassedLink() instead of forwarding the raw strings -- so magnet entries convert and
+	// invalid ones are named.
+	wxArrayString links;
+	if (theApp->ExpandPassedCollection(collection.GetRaw(), links, 0) !=
+		CamuleAppCommon::kCollectionExpanded) {
+		// Already logged by ExpandPassedCollection().
 		return;
 	}
-	event.Skip();
+	theApp->downloadqueue->AddLinks(links);
 }
 
+// Both act on one file: the menu is opened over a row, and opening several
+// files at once is not a thing either desktop handler does gracefully.
+void CSharedFilesCtrl::OnOpenFile(wxCommandEvent &WXUNUSED(event))
+{
+	// Bound re-checked: PopupMenu runs a nested event loop, so the shared-dir watcher can
+	// mutate the list while the menu is open. Pinning the identity means a row removed above
+	// this one cannot redirect the click.
+	if (m_menuItem != 0 && HasItemData(m_menuItem)) {
+		FileLaunch::Open(reinterpret_cast<CKnownFile *>(m_menuItem), this);
+	}
+}
 
-void CSharedFilesCtrl::OnAddCollection( wxCommandEvent& WXUNUSED(evt) )
+void CSharedFilesCtrl::OnShowInFolder(wxCommandEvent &WXUNUSED(event))
 {
-	int item = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	if (item != -1) {
-		CKnownFile *file = reinterpret_cast<CKnownFile*>(GetItemData(item));
-		wxString CollectionFile = file->GetFilePath().JoinPaths(file->GetFileName()).GetRaw();
-		CMuleCollection my_collection;
-		if (my_collection.Open( (std::string)CollectionFile.mb_str() )) {
-//#warning This is probably not working on Unicode
-			wxArrayString links;
-			for (size_t e = 0; e < my_collection.size(); ++e) {
-				links.Add(wxString(my_collectione.c_str(), wxConvUTF8));
-			}
-			theApp->downloadqueue->AddLinks(links);
-		}
+	if (m_menuItem != 0 && HasItemData(m_menuItem)) {
+		FileLaunch::Reveal(reinterpret_cast<CKnownFile *>(m_menuItem), this);
 	}
 }

amule-3.0.1.tar.gz/src/SharedFilesCtrl.h -> amule-3.1.0.tar.gz/src/SharedFilesCtrl.h Changed

@@ -26,182 +26,304 @@
 #ifndef SHAREDFILESCTRL_H
 #define SHAREDFILESCTRL_H
 
-#include "MuleListCtrl.h"	// Needed for CMuleListCtrl
-
+#include "MuleVirtualDataViewCtrl.h" // Needed for CMuleVirtualDataViewCtrl
+#include "MD4Hash.h"                 // Needed for CMD4Hash in MediaRefreshSelection
+
+#define COLUMN_SHARED_NAME 0
+#define COLUMN_SHARED_SIZE 1
+#define COLUMN_SHARED_TYPE 2
+#define COLUMN_SHARED_PRIO 3
+#define COLUMN_SHARED_REQ 4
+#define COLUMN_SHARED_AREQ 5
+#define COLUMN_SHARED_TRA 6
+#define COLUMN_SHARED_RTIO 7
+#define COLUMN_SHARED_PART 8
+#define COLUMN_SHARED_CMPL 9
+#define COLUMN_SHARED_SPEED 10
+#define COLUMN_SHARED_SINCE 11
+#define COLUMN_SHARED_LASTUP 12
+#define COLUMN_SHARED_PATH 13
+//! Media metadata from FT_MEDIA_*, as the search list shows. Only files ffprobe has run over have
+//! them, so these columns start hidden (see SetColumnHidden() in the constructor).
+#define COLUMN_SHARED_MEDIA_LENGTH 14
+#define COLUMN_SHARED_MEDIA_BITRATE 15
+#define COLUMN_SHARED_MEDIA_CODEC 16
+#define COLUMN_SHARED_MEDIA_ARTIST 17
+#define COLUMN_SHARED_MEDIA_ALBUM 18
+#define COLUMN_SHARED_MEDIA_TITLE 19
+//! Always empty. Absorbs the macOS trailing-column sizing; see
+//! CMuleDataViewCtrl::AppendSpacerColumn().
+#define COLUMN_SHARED_SPACER 20
 
 class CSharedFileList;
 class CKnownFile;
 class wxMenu;
+class wxStaticText;
 
-
-/**
- * This class represents the widget used to list shared files.
- */
-class CSharedFilesCtrl : public CMuleListCtrl
+/// The widget that lists shared files.
+class CSharedFilesCtrl : public CMuleVirtualDataViewCtrl
 {
 public:
-	/**
-	 * Constructor.
-	 *
-	 * @see CMuleListCtrl::CMuleListCtrl
-	 */
-	CSharedFilesCtrl(wxWindow* parent, int id, const wxPoint& pos, wxSize size, int flags);
+	CSharedFilesCtrl(wxWindow *parent, int id, const wxPoint &pos, wxSize size, int flags);
 
-	/**
-	 * Destructor.
-	 */
 	~CSharedFilesCtrl();
 
-
 	/** Reloads the list of shared files. */
-	void	ShowFileList();
+	void ShowFileList();
+
+	// SetFilterText() is inherited from CMuleVirtualDataViewCtrl: only files whose name
+	// contains the text (case-insensitive) are shown, and an empty string clears the filter.
+	// The rebuild it triggers is RebuildFilteredView() below.
+
+	/** Empties the list (virtual-mode: clears the model + row index). */
+	void ClearList();
 
 	/**
-	 * Adds the specified file to the list, updating filecount and more.
+	 * While the startup hash drain runs, hold back the per-row model notification and the
+	 * files-count label.
 	 *
-	 * @param file The new file to be shown.
+	 * Each finished hash arrives as its own queued event, and ProcessPendingEvents() runs the
+	 * whole queue in one pass -- so with thousands of them the main thread never returns to the
+	 * run loop and the window, already created, cannot paint. Per row the two costs are wx's
+	 * Cocoa Add(), which issues a full NSOutlineView reloadData, and ShowFilesCount(), which
+	 * searches the window hierarchy by name. Deferred, both happen once per drain tick instead
+	 * of once per file.
 	 *
-	 * Note that the item is inserted in sorted order.
+	 * Only for that drain: the tick flushes with FinishBulkLoad(), whose Reset() rebuilds the
+	 * view and drops the scroll position. That is fine while the list is first being populated
+	 * and would not be during amulegui's steady-state poll, which shares the same batch
+	 * machinery.
 	 */
-	void	ShowFile(CKnownFile* file);
+	void SetStartupDrainMode(bool on);
+
+	// Bracket a reconnect resync (issue #444) so the list repaints once (Freeze) and sorts once
+	// at the end rather than per updated/added row.
+	void BeginBatchUpdate();
+	void EndBatchUpdate(bool doSort = true);
 
 	/**
-	 * Removes a file from the list.
+	 * Ends the repaint freeze without ending the batch.
 	 *
-	 * @param toremove The file to be removed.
+	 * Startup keeps appending long after the window is worth showing: the scan finishes in
+	 * seconds, but the files it queued for hashing arrive over the following minutes, and each
+	 * has to stay an O(1) append rather than a sorted insert (#853). Thawing separately lets
+	 * those rows be seen as they land while the batch runs on.
 	 */
-	void	RemoveFile(CKnownFile* toremove);
+	void ThawForDisplay();
+
+	/// Number of files still queued for hashing, shown next to the count. Zero clears it. Only
+	/// startup sets it, and only until its hash queue drains.
+	void SetHashingCount(size_t remaining);
 
 	/**
-	 * Updates a file on the list.
+	 * Sorts only if rows have been appended since the last call.
 	 *
-	 * @param toupdate The file to be updated.
+	 * Startup polls on a timer, but rows arrive on hash completions, and hashing cost tracks
+	 * bytes -- one large file is a single append after minutes of nothing. Sorting per tick
+	 * regardless would be a full std::sort plus a row-index rebuild and a model reset, once a
+	 * second, for no reordering (#853).
 	 */
-	void	UpdateItem(CKnownFile* toupdate);
+	void SortIfRowsAppended();
 
-	/**
-	 * Begin a bulk update. While in this mode, UpdateItem() is a no-op
-	 * and the per-row FindItem/RefreshItem cost is skipped. EndBulkUpdate()
-	 * issues a single full Refresh() to repaint every row at once. Used by
-	 * CSharedFileList::ClearED2KPublishInfo to convert what was an O(N²)
-	 * GUI cascade (per-file SetPublishedED2K() -> notify -> linear-scan
-	 * UpdateItem) into O(N) bookkeeping plus one full repaint.
-	 */
-	void	BeginBulkUpdate();
-	void	EndBulkUpdate();
+	/// Adds @a file to the list in sorted order, updating the file count.
+	void ShowFile(CKnownFile *file);
 
-	/**
-	 * Updates the number of shared files displayed above the list.
-	 */
-	void	ShowFilesCount();
+	/// Removes @a toremove from the list.
+	void RemoveFile(CKnownFile *toremove);
+
+	/// Updates @a toupdate on the list.
+	void UpdateItem(CKnownFile *toupdate);
+
+	/// Begin a bulk update: UpdateItem() becomes a no-op and the per-row FindItem/RefreshItem
+	/// cost is skipped, while EndBulkUpdate() issues one full Refresh(). Turns
+	/// CSharedFileList::ClearED2KPublishInfo's O(N^2) GUI cascade (per-file SetPublishedED2K()
+	/// -> notify -> linear-scan UpdateItem) into O(N) bookkeeping plus one repaint.
+	void BeginBulkUpdate();
+	void EndBulkUpdate();
+
+	/// Updates the number of shared files displayed above the list.
+	void ShowFilesCount();
+
+	/// Refreshes the "Free space:" label from the core's figure for the filesystem finished
+	/// downloads land on. Informational only, with no threshold: nothing here stops when the
+	/// disk fills, and this panel has no category selector to scope a comparison to, so it
+	/// reports the default category's incoming directory. Driven by the GUI timer, like the
+	/// Downloads panel's.
+	void UpdateFreeSpace();
+
+	/// Redraws the "Total size of Shared Files:" label. Also driven by the GUI timer, because
+	/// unlike the total itself the completed figure beside it moves while nothing about the
+	/// list changes: part files gain bytes as they download. Sets the label only when the text
+	/// differs, since this runs once a second while the panel is up.
+	void UpdateTotalSize();
+
+	/** Map a (virtual) row index to its file, or NULL if out of range. */
+	CKnownFile *FileAtRow(long row) const { return reinterpret_cast<CKnownFile *>(ItemAt(row)); }
 
 protected:
 	/// Return old column order.
-	wxString GetOldColumnOrder() const;
+	wxString GetOldColumnOrder() const override;
+
+	/// Text of one cell, pulled on demand for the cells being drawn.
+	wxString GetItemColumnText(wxUIntPtr item, unsigned column) const override;
+
+	/// Rating/comment smiley on the Name column, nothing elsewhere.
+	bool GetItemIcon(wxUIntPtr item, unsigned column, wxIcon &icon) const override;
+
+	/// Availability-bar spans for the Obtained Parts column.
+	void GetItemBarFill(wxUIntPtr item, unsigned column, CBarFillSpec &out) const override;
+
+	/** Whether the current primary sort column changes value during
+	 *  operation (drives the base's live auto-sort). */
+	bool IsLiveSortColumn() const override;
+
+	/** Pause live auto-sort while the context menu is open. */
+	bool IsMenuOpen() const override { return m_menu != nullptr; }
+
+	/// Single-column comparison for the base's sort chain.
+	int CompareItemData(
+		wxUIntPtr data1, wxUIntPtr data2, unsigned column, bool alt, int modifier) const override;
+
+	/// Which columns have alternate sorting. @see CMuleDataViewCtrl::AltSortAllowed
+	bool AltSortAllowed(unsigned column) const override;
+
+	/// @see CMuleVirtualDataViewCtrl::RebuildFilteredView
+	void RebuildFilteredView() override;
 
 private:
-	/**
-	 * Adds the specified file to the list.
-	 *
-	 * If 'batch' is true, the item will be inserted last,
-	 * and the files-count will not be updated, nor is
-	 * the list checked for dupes.
-	 */
-	void	DoShowFile(CKnownFile* file, bool batch);
+	/// Adds @a file to the list. With @a batch, it is appended last, the file count is not
+	/// updated, and the list is not checked for duplicates.
+	void DoShowFile(CKnownFile *file, bool batch);
+
+	void OnItemRightClicked(wxDataViewEvent &event);
+
+	void OnGetFeedback(wxCommandEvent &event);
+	void OnOpenFile(wxCommandEvent &event);
+	void OnShowInFolder(wxCommandEvent &event);
 
 	/**
-	 * Draws the graph of file-part availability.
-	 *
-	 * @param file The file to make a graph over.
-	 * @param dc The wcDC to draw on.
-	 * @param rect The drawing area.
+	 * The item the context menu was built for, by identity rather than row.
 	 *
-	 * This function draws a barspan showing the availability of the parts of
-	 * a file, for both Part-files and Known-files. Availability for Part-files
-	 * is determined using the currently known sources, while availability for
-	 * Known-files is determined using the sources requesting that file.
+	 * The menu's enabled state is decided from this item, so the handlers act on it. A row
+	 * index would not survive the menu being open: PopupMenu runs a nested event loop, so
+	 * timers and EC updates keep mutating the list, and removing a row *above* this one shifts
+	 * every index below it -- the click would act on the neighbouring file. HasItemData() re-
+	 * checks that the item is still present before it is used.
 	 */
-	void	DrawAvailabilityBar( CKnownFile* file, wxDC* dc, const wxRect& rect ) const;
+	wxUIntPtr m_menuItem = 0;
 
-	/**
-	 * Overloaded function needed to do custom drawing of the items.
-	 */
-	virtual void OnDrawItem(int item, wxDC* dc, const wxRect& rect, const wxRect& rectHL, bool highlighted);
+	void OnSetPriority(wxCommandEvent &event);
 
+	void OnSetPriorityAuto(wxCommandEvent &event);
 
-	/**
-	 * @see CMuleListCtrl::GetTTSText
-	 */
-	virtual wxString GetTTSText(unsigned item) const;
+	void OnCreateURI(wxCommandEvent &event);
 
+	/// "Export selected files": writes the selected files' eD2k links to an .emulecollection
+	/// text collection.
+	void OnExportCollection(wxCommandEvent &WXUNUSED(evt));
 
-	/**
-	 * Sorter-function.
-	 *
-	 * @see wxListCtrl::SortItems
-	 */
-	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData);
+	/// The link for one file, in the flavour @a menuId asks for. Any other id yields the plain
+	/// eD2k link.
+	wxString LinkForFile(const CKnownFile *file, int menuId) const;
 
-	/**
-	 * Function that specifies which columns have alternate sorting.
-	 *
-	 * @see CMuleListCtrl::AltSortAllowed
-	 */
-	virtual bool AltSortAllowed(unsigned column) const;
+	/// Every selected row's link, one per line, with a trailing newline. One walk serves the
+	/// clipboard items and the collection export alike; @a menuId picks the flavour, as in
+	/// LinkForFile().
+	wxString SelectedLinks(int menuId) const;
 
+	void OnEditComment(wxCommandEvent &event);
 
-	/**
-	 * Event-handler for right-clicks on the list-items.
-	 */
-	void	OnRightClick(wxListEvent& event);
+	void OnRename(wxCommandEvent &event);
+	void OnRefreshMediaMetadata(wxCommandEvent &event);
 
-	/**
-	 * Event-handler for right-clicks on the list-items.
-	 */
-	void	OnGetFeedback(wxCommandEvent& event);
+	//! The current selection split by whether a media re-extraction can act on it. Shared by
+	//! the menu's enable rule and the handler so the two cannot disagree.
+	struct MediaRefreshSelection
+	{
+		// Hashes, not CKnownFile pointers: the confirmation dialog runs a nested event
+		// loop, and in amulegui the EC poll timer keeps running inside it --
+		// CKnownFilesRem::DeleteItem ends in `delete file` for anything the daemon stops
+		// listing, so a pointer collected before the dialog can dangle. A hash cannot.
+		std::vector<CMD4Hash> eligible;
+		unsigned incomplete = 0; //!< in-progress downloads, nothing complete to read
+		unsigned notMedia = 0;   //!< not audio or video
+	};
+	MediaRefreshSelection PartitionForMediaRefresh() const;
 
-	/**
-	 * Event-handler for the Set Priority menu items.
-	 */
-	void	OnSetPriority( wxCommandEvent& event );
+	/// Checks for renaming via F2.
+	bool OnListKey(wxKeyEvent &event) override;
 
-	/**
-	 * Event-handler for the Auto-Priority menu item.
-	 */
-	void	OnSetPriorityAuto( wxCommandEvent& event );
+	/// Adds the links in a collection to transfers.
+	void OnAddCollection(wxCommandEvent &WXUNUSED(evt));
 
-	/**
-	 * Event-handler for the Create ED2K/Magnet URI items.
-	 */
-	void	OnCreateURI( wxCommandEvent& event );
+	void OnVerifyLocalData(wxCommandEvent &WXUNUSED(evt));
 
-	/**
-	 * Event-handler for the Edit Comment menu item.
-	 */
-	void	OnEditComment( wxCommandEvent& event );
+	/// Opens the file-details dialog for the selected shared file. Reuses the download list's
+	/// CFileDetailDialog, whose sections follow each file's state.
+	void OnViewFileDetails(wxCommandEvent &event);
 
-	/**
-	 * Event-handler for the Rename menu item.
-	 */
-	void	OnRename( wxCommandEvent& event );
+	/// Opens the colour legend for the bar column, for the row the menu was built from. That
+	/// column draws two unrelated things -- how many sources hold each part, and how far a
+	/// running re-hash has read -- so which legend to open is a property of the row
+	/// (partbar::LegendForSharedFilesRow).
+	void OnShowBarLegend(wxCommandEvent &event);
+	void OnRazorStatsCheck(wxCommandEvent &event);
 
-	/**
-	 * Checks for renaming via F2.
-	 */
-	void	OnKeyPressed( wxKeyEvent& event );
+	/// Double-click / Enter on a row also opens the file-details dialog, for parity with the
+	/// downloads list.
+	void OnItemActivated(wxDataViewEvent &event);
 
-	/**
-	 * Adds links in a collection to transfers
-	 */
-	void	OnAddCollection( wxCommandEvent& WXUNUSED(evt) );
+	/** Shared helper: open CFileDetailDialog anchored on the clicked row. */
+	void ShowFileDetailDialog(long focused);
 
 	//! Pointer used to ensure that the menu isn't displayed twice.
-	wxMenu* m_menu;
+	wxMenu *m_menu;
 
 	//! When true, UpdateItem() short-circuits and the bulk caller is
 	//! responsible for issuing a single Refresh() at end-of-bulk.
 	bool m_inBulkUpdate;
 
+	//! True between BeginBatchUpdate()/EndBatchUpdate(): ShowFile() appends
+	//! the row without sorting; EndBatchUpdate() does the single SortList().
+	bool m_batchUpdate;
+
+	//! Whether the batch's Freeze() is still outstanding. Tracked apart from m_batchUpdate
+	//! because ThawForDisplay() ends one without the other, and wx counts Freeze/Thaw -- an
+	//! unbalanced Thaw() asserts.
+	bool m_batchFrozen;
+
+	//! Files still queued for hashing, appended to the count label while
+	//! non-zero. See SetHashingCount().
+	size_t m_hashingRemaining;
+
+	//! Rows appended since the last SortIfRowsAppended(). The batch appends
+	//! without sorting, so this is what makes a later sort worth running.
+	bool m_batchRowsAppended;
+	bool m_startupDrain = false;
+
+	//! Combined size of the displayed files (drives the "Total size:" label)
+	uint64 m_shownSize;
+
+	/**
+	 * Bytes the displayed part files have yet to obtain. m_shownSize sums the Size column, and
+	 * that column shows a part file's final size, not what is on disk yet; subtracting this
+	 * gives the figure the total is shown next to (issue #927).
+	 *
+	 * Walks the download queue asking the row index whether each part file is displayed, rather
+	 * than the reverse: there are at most as many part files as downloads, against a share that
+	 * can hold tens of thousands.
+	 */
+	uint64 ShownIncompleteBytes() const;
+
+	//! The "Free space:" label, resolved by name on first use. Lives in the
+	//! statistics box, so it cannot be reached through GetParent().
+	wxStaticText *m_freeSpaceLabel = nullptr;
+
+	//! The "Total size of Shared Files:" label, resolved the same way.
+	wxStaticText *m_totalSizeLabel = nullptr;
+
+	// The virtual-list model, sorting, live auto-sort and selection
+	// preservation all live in CMuleVirtualDataViewCtrl now.
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.1.0.tar.gz/src/SharedFilesReloadLatch.h Added

@@ -0,0 +1,86 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 SHAREDFILESRELOADLATCH_H
+#define SHAREDFILESRELOADLATCH_H
+
+/**
+ * The "a shared-files reload is owed" flag, on its own so the rules can be tested without standing
+ * up a CSharedFileList (which needs theApp, the preferences and a filesystem to walk).
+ *
+ * Three rules, and the middle one is why this is not a plain bool:
+ *
+ *  - Requests coalesce. Ten callers asking before the next tick get one walk.
+ *  - A request arriving *during* a walk belongs to the NEXT walk. The walk in flight is already
+ * past the files that request was about, so it cannot satisfy it. BeginWalk() takes the outstanding
+ * request with it, which leaves anything requested afterwards standing.
+ *  - A walk that aborts satisfies nothing, so EndWalk() hands the request back rather than letting
+ * a cancelled scan swallow it.
+ *
+ * Single-threaded by contract: every caller runs on the core event loop. A caller off that thread
+ * is the thing to fix, not this.
+ */
+class CSharedFilesReloadLatch
+{
+public:
+	/// Ask for a walk. Repeat calls before the next BeginWalk() coalesce.
+	void Request() { m_pending = true; }
+
+	/// True while a walk is owed.
+	bool IsPending() const { return m_pending; }
+
+	/// Whether the core tick should start a walk now. A walk already running
+	/// leaves the request standing for a later tick rather than nesting.
+	bool ShouldStartFromTick(bool walkRunning) const { return m_pending && !walkRunning; }
+
+	/**
+	 * Called as a walk starts. Takes the outstanding request with it and returns whether there
+	 * was one, so anything requested from here on is owed to the next walk. Pass the result to
+	 * EndWalk().
+	 */
+	bool BeginWalk()
+	{
+		const bool had = m_pending;
+		m_pending = false;
+		return had;
+	}
+
+	/**
+	 * Called as a walk finishes. An aborted walk gives its request back; a completed one has
+	 * satisfied it. Requests that arrived mid-walk are untouched either way -- they were never
+	 * taken.
+	 */
+	void EndWalk(bool hadRequest, bool aborted)
+	{
+		if (aborted && hadRequest) {
+			m_pending = true;
+		}
+	}
+
+private:
+	bool m_pending = false;
+};
+
+#endif // SHAREDFILESRELOADLATCH_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/SharedFilesReloadProgress.cpp Added

@@ -0,0 +1,68 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "SharedFilesReloadProgress.h"
+
+#include <wx/progdlg.h>
+#include <wx/window.h>
+
+#include "SharedFileList.h"
+#include "amule.h" // theApp
+#include "OtherFunctions.h"
+
+wxString SharedFilesScannedMessage(std::size_t filesScanned)
+{
+	return CFormat(_("Reloading shared files: %u files scanned")) % static_cast<unsigned>(filesScanned);
+}
+
+void ReloadSharedFilesWithProgress(wxWindow *parent)
+{
+#ifndef CLIENT_GUI
+	const wxString body = SharedFilesScannedMessage(0);
+	wxProgressDialog progress(_("Reloading shared files..."),
+		body,
+		/*maximum=*/100,
+		parent,
+		wxPD_APP_MODAL | wxPD_AUTO_HIDE);
+	theApp->sharedfiles->Reload(&progress(size_t filesScanned) -> bool {
+		progress.Pulse(SharedFilesScannedMessage(filesScanned));
+		// Always continue: see the no-cancel note in the header.
+		return true;
+	});
+	progress.Update(100);
+#else
+	// amulegui: the walk runs on amuled. CSharedFilesRem::Reload only posts
+	// EC_OP_SHAREDFILES_RELOAD and returns, so a dialog would just flash.
+	(void)parent;
+	theApp->sharedfiles->Reload();
+#endif
+}
+
+void ReloadSharedFilesIfPending(wxWindow *parent)
+{
+	if (theApp->sharedfiles && theApp->sharedfiles->IsReloadPending()) {
+		ReloadSharedFilesWithProgress(parent);
+	}
+}
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/SharedFilesReloadProgress.h Added

@@ -0,0 +1,78 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 SHAREDFILESRELOADPROGRESS_H
+#define SHAREDFILESRELOADPROGRESS_H
+
+#include <cstddef>
+
+#include <wx/string.h>
+
+class wxWindow;
+
+// Declarations only, implementation in the .cpp. Several GUI translation units include this header,
+// and pulling amule.h (and the standard headers behind it) in here put std::byte in scope ahead of
+// the <windows.h> family some of those TUs include further down -- rpcndr.h then declares ::byte
+// and every later use is ambiguous. Keeping the heavy includes on the other side of the .cpp
+// boundary removes that ordering trap for every caller at once.
+
+//! The one wording for reload progress, so every caller reports it identically.
+wxString SharedFilesScannedMessage(std::size_t filesScanned);
+
+/**
+ * Run a shared-files reload behind a progress dialog.
+ *
+ * CSharedFileList::Reload() walks every configured share root on the calling thread, costing
+ * roughly a stat per shared file. On a large or network-mounted tree that is seconds to minutes,
+ * and the no-callback overload yields nothing at all -- so every GUI action triggering one used to
+ * freeze the window with no repaint, no progress and no indication why. A yield callback keeps the
+ * walk on this thread but pumps the event loop every 256 files, so the window repaints and stays
+ * draggable.
+ *
+ * Shared by every GUI entry point that can trigger a walk -- the shared-files Reload button, the
+ * preferences Apply, and the category add/rename/delete paths -- so they all behave the same and
+ * the dialog exists once.
+ *
+ * **Pumping here is safe.** wxProgressDialog restricts its yield to UI events, so it does not
+ * dispatch the queued socket events that carry EC requests (they reach the main loop via
+ * CoreNotify_* and wxQueueEvent). A remote client therefore cannot be answered from the
+ * transiently-empty share map FindSharedFiles builds through, which is the hazard that rules out
+ * pumping the loop generally during a walk.
+ *
+ * **No cancel button, deliberately.** FindSharedFiles() clears m_Files_map before it starts
+ * walking, so an aborted walk leaves a partially populated share list with nothing to roll back to.
+ * PrefsUnifiedDlg's shared-directory commit can offer cancel only because it keeps the previous
+ * directory list and re-walks against it; none of these callers has such prior state.
+ */
+void ReloadSharedFilesWithProgress(wxWindow *parent);
+
+/**
+ * Run the walk only if one is owed, i.e. something just called RequestReload(). Used by the
+ * category paths, where the reload is requested deep in CPreferences (shared with the daemon, so it
+ * cannot raise a dialog itself) and only when the change actually affects the shareset.
+ */
+void ReloadSharedFilesIfPending(wxWindow *parent);
+
+#endif // SHAREDFILESRELOADPROGRESS_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/SharedFilesWnd.cpp -> amule-3.1.0.tar.gz/src/SharedFilesWnd.cpp Changed

@@ -23,216 +23,263 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include <wx/artprov.h> // Needed for the "amule:" art ids
 #include <wx/config.h>
-#include <wx/gauge.h>		// Do_not_auto_remove (win32)
-#include <wx/radiobox.h>
+#include <wx/gauge.h> // Do_not_auto_remove (win32)
+#include <wx/radiobut.h>
 
-#include "SharedFilesWnd.h"	// Interface declarations
+#include "SharedFilesWnd.h" // Interface declarations
 #include "SharedFilesCtrl.h"
+#include "SharedFilesReloadProgress.h" // ReloadSharedFilesWithProgress
 #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
-
+#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
 
 wxBEGIN_EVENT_TABLE(CSharedFilesWnd, wxPanel)
-	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_LIST_ITEM_SELECTED(ID_SHFILELIST, CSharedFilesWnd::OnItemSelectionChanged)
+	EVT_LIST_ITEM_DESELECTED(ID_SHFILELIST, CSharedFilesWnd::OnItemSelectionChanged)
+	EVT_BUTTON(ID_BTNRELSHARED, CSharedFilesWnd::OnBtnReloadShared)
+	EVT_TEXT(IDC_SHARED_FILTER, CSharedFilesWnd::OnFilterChanged)
+	EVT_BUTTON(ID_SHAREDCLIENTTOGGLE, CSharedFilesWnd::OnToggleClientList)
+	// The "show clients for" radio buttons are bound dynamically in the ctor.
 
 	EVT_SPLITTER_SASH_POS_CHANGING(ID_SHARESSPLATTER, CSharedFilesWnd::OnSashPositionChanging)
 wxEND_EVENT_TABLE()
 
-CSharedFilesWnd::CSharedFilesWnd( wxWindow* pParent )
-	: wxPanel(pParent, -1)
+CSharedFilesWnd::CSharedFilesWnd(wxWindow *pParent)
+: wxPanel(pParent, -1)
 {
-	wxSizer* content = sharedfilesDlg(this, true);
+	wxSizer *content = sharedfilesDlg(this, true);
 	content->Show(this, true);
 
-	m_bar_requests	= CastChild( "popbar", wxGauge );
-	m_bar_accepted	= CastChild( "popbarAccept", wxGauge );
-	m_bar_transfer	= CastChild( "popbarTrans", wxGauge );
-	m_radioClientMode = CastChild( ID_SHOW_CLIENTS_MODE, wxRadioBox );
-	sharedfilesctrl = CastChild( "sharedFilesCt", CSharedFilesCtrl );
-	peerslistctrl   = CastChild( ID_SHAREDCLIENTLIST, CSharedFilePeersListCtrl );
+	m_bar_requests = CastChild("popbar", wxGauge);
+	m_bar_accepted = CastChild("popbarAccept", wxGauge);
+	m_bar_transfer = CastChild("popbarTrans", wxGauge);
+	m_radioShowAll = CastChild("showClientsAll", wxRadioButton);
+	m_radioShowSelected = CastChild("showClientsSelected", wxRadioButton);
+	m_radioShowUploading = CastChild("showClientsUploading", wxRadioButton);
+	m_radioShowAll->Bind(wxEVT_RADIOBUTTON, &CSharedFilesWnd::OnSelectClientsMode, this);
+	m_radioShowSelected->Bind(wxEVT_RADIOBUTTON, &CSharedFilesWnd::OnSelectClientsMode, this);
+	m_radioShowUploading->Bind(wxEVT_RADIOBUTTON, &CSharedFilesWnd::OnSelectClientsMode, this);
+	sharedfilesctrl = CastChild("sharedFilesCt", CSharedFilesCtrl);
+	peerslistctrl = CastChild(ID_SHAREDCLIENTLIST, CSharedFilePeersListCtrl);
 	wxASSERT(sharedfilesctrl);
 	wxASSERT(peerslistctrl);
-	m_prepared		= false;
+
+	// Render the initial "Total size: 0 bytes" for an empty share.
+	// CSharedFilesCtrl::ShowFilesCount() cannot do it yet: it reaches the label through
+	// theApp->amuledlg->m_sharedfileswnd, which is not assigned until this constructor returns.
+	if (wxStaticText *totalSize = CastChild("sharedFilesTotalSize", wxStaticText)) {
+		totalSize->SetLabel(CFormat(_("Total size of Shared Files: %s")) % CastItoXBytes(0));
+	}
+
+	m_prepared = false;
 
 	m_splitter = 0;
 
 	wxConfigBase *config = wxConfigBase::Get();
 
-	// Check if the clientlist is hidden
 	bool show = true;
-	config->Read( "/GUI/SharedWnd/ShowClientList", &show, true );
+	config->Read("/GUI/SharedWnd/ShowClientList", &show, true);
 	peerslistctrl->SetShowing(show);
-	// Load the last used splitter position
-	m_splitter = config->Read( "/GUI/SharedWnd/Splitter", 463l );
-	m_clientShow = (EClientShow) config->Read("/GUI/SharedWnd/ClientShowMode", ClientShowAll);
-	m_radioClientMode->SetSelection(m_clientShow);
+	m_splitter = config->Read("/GUI/SharedWnd/Splitter", 463l);
+	m_clientShow = (EClientShow)config->Read("/GUI/SharedWnd/ClientShowMode", ClientShowAll);
+	SetClientShowMode(m_clientShow);
 }
 
+CSharedFilesWnd::EClientShow CSharedFilesWnd::GetClientShowMode() const
+{
+	if (m_radioShowSelected->GetValue()) {
+		return ClientShowSelected;
+	}
+	if (m_radioShowUploading->GetValue()) {
+		return ClientShowUploading;
+	}
+	return ClientShowAll;
+}
+
+void CSharedFilesWnd::SetClientShowMode(EClientShow mode)
+{
+	switch (mode) {
+	case ClientShowSelected:
+		m_radioShowSelected->SetValue(true);
+		break;
+	case ClientShowUploading:
+		m_radioShowUploading->SetValue(true);
+		break;
+	case ClientShowAll:
+	default:
+		m_radioShowAll->SetValue(true);
+		break;
+	}
+}
 
 CSharedFilesWnd::~CSharedFilesWnd()
 {
 	if (m_prepared) {
 		wxConfigBase *config = wxConfigBase::Get();
 
-		if ( !peerslistctrl->GetShowing() ) {
-			// Save the splitter position
-			config->Write( "/GUI/SharedWnd/Splitter", m_splitter );
+		if (!peerslistctrl->GetShowing()) {
+			config->Write("/GUI/SharedWnd/Splitter", m_splitter);
 
-			// Save the visible status of the list
-			config->Write( "/GUI/SharedWnd/ShowClientList", false );
+			config->Write("/GUI/SharedWnd/ShowClientList", false);
 		} else {
-			wxSplitterWindow* splitter = CastChild( "sharedsplitterWnd", wxSplitterWindow );
+			wxSplitterWindow *splitter = CastChild("sharedsplitterWnd", wxSplitterWindow);
 
-			// Save the splitter position
 			config->Write("/GUI/SharedWnd/Splitter", splitter->GetSashPosition());
 
-			// Save the visible status of the list
-			config->Write( "/GUI/SharedWnd/ShowClientList", true );
+			config->Write("/GUI/SharedWnd/ShowClientList", true);
 		}
 		config->Write("/GUI/SharedWnd/ClientShowMode", (int)m_clientShow);
 	}
 }
 
-
-void CSharedFilesWnd::SelectionUpdated()
+// Refresh just the stat bars/labels for the current selection. Cheap -- it walks only the selected
+// rows -- so it can run on every selection change regardless of the client-show mode. The client
+// list below is the costly part, and only depends on the selection in ClientShowSelected mode.
+void CSharedFilesWnd::UpdateSelectionStats()
 {
-	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;
-		uint64 session_transferred = 0;
-		uint32 all_requests = 0;
-		uint32 all_accepted = 0;
-		uint64 all_transferred = 0;
-
-		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 = reinterpret_cast<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();
-			}
-
-			if (m_clientShow != ClientShowUploading) {
-				fileVector.push_back(file);
-			}
-		}
-
-		if (fileVector.empty()) {
-			// Requests
-			m_bar_requests->SetValue( 0 );
-			CastChild(IDC_SREQUESTED, wxStaticText)->SetLabel( "- / -" );
+	// Bars fill with this session's share of the file's all-time activity, the same two numbers
+	// as each label. Both come from the per-file EC counters, so it is reliable in the remote
+	// GUI, and the per-mille scale keeps TB-scale byte counts inside the gauge's int range,
+	// which raw bytes overflow.
+	m_bar_requests->SetRange(1000);
+	m_bar_accepted->SetRange(1000);
+	m_bar_transfer->SetRange(1000);
+
+	uint32 session_requests = 0;
+	uint32 session_accepted = 0;
+	uint64 session_transferred = 0;
+	uint32 all_requests = 0;
+	uint32 all_accepted = 0;
+	uint64 all_transferred = 0;
+	int selectedCount = 0;
+
+	for (wxUIntPtr data : sharedfilesctrl->GetSelectedItemData()) {
+		CKnownFile *file = reinterpret_cast<CKnownFile *>(data);
+		wxASSERT(file);
+		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();
+		++selectedCount;
+	}
 
-			// Accepted requests
-			m_bar_accepted->SetValue( 0 );
-			CastChild(IDC_SACCEPTED, wxStaticText)->SetLabel( "- / -" );
+	if (selectedCount == 0) {
+		m_bar_requests->SetValue(0);
+		CastChild(IDC_SREQUESTED, wxStaticText)->SetLabel("- / -");
+		m_bar_accepted->SetValue(0);
+		CastChild(IDC_SACCEPTED, wxStaticText)->SetLabel("- / -");
+		m_bar_transfer->SetValue(0);
+		CastChild(IDC_STRANSFERRED, wxStaticText)->SetLabel("- / -");
+		return;
+	}
 
-			// Transferred
-			m_bar_transfer->SetValue( 0 );
-			CastChild(IDC_STRANSFERRED, wxStaticText)->SetLabel( "- / -" );
+	// Store text lengths, and layout() when the texts have grown. The label
+	// always shows the selected file's real value; only the bar is a fraction.
+	static uint32 lReq = 0, lAcc = 0, lTrans = 0;
+	// session / all-time as a per-mille gauge fill; all-time >= session and both
+	// are 64-bit, so this never overflows or exceeds the range.
+	auto sharePerMille = (uint64 sess, uint64 all) -> int {
+		if (all == 0) {
+			return 0;
+		}
+		uint64 pm = (uint64)1000 * sess / all;
+		return (int)(pm > 1000 ? 1000 : pm);
+	};
+	m_bar_requests->SetValue(sharePerMille(session_requests, all_requests));
+	wxString labelReq = CFormat("%d / %d") % session_requests % all_requests;
+	CastChild(IDC_SREQUESTED, wxStaticText)->SetLabel(labelReq);
+
+	m_bar_accepted->SetValue(sharePerMille(session_accepted, all_accepted));
+	wxString labelAcc = CFormat("%d / %d") % session_accepted % all_accepted;
+	CastChild(IDC_SACCEPTED, wxStaticText)->SetLabel(labelAcc);
+
+	m_bar_transfer->SetValue(sharePerMille(session_transferred, all_transferred));
+	wxString labelTrans = CastItoXBytes(session_transferred) + " / " + 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();
+	}
+}
 
+void CSharedFilesWnd::SelectionUpdated()
+{
+	UpdateSelectionStats();
+
+	// The client list follows the client-show mode.
+	CKnownFileVector fileVector;
+	if (m_clientShow != ClientShowUploading) {
+		if (m_clientShow == ClientShowSelected) {
+			for (wxUIntPtr data : sharedfilesctrl->GetSelectedItemData()) {
+				fileVector.push_back(reinterpret_cast<CKnownFile *>(data));
+			}
 		} 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("%d / %d") % session_requests % all_requests;
-			CastChild(IDC_SREQUESTED, wxStaticText)->SetLabel(labelReq);
-
-			// Accepted requests
-			session_accepted = session_accepted > lAccepted ? lAccepted : session_accepted;
-			m_bar_accepted->SetValue( session_accepted );
-			wxString labelAcc = CFormat("%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 ) + " / " + 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();
+			const long count = sharedfilesctrl->ItemDataCount();
+			for (long index = 0; index < count; ++index) {
+				fileVector.push_back(sharedfilesctrl->FileAtRow(index));
 			}
 		}
-
-		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.
+		// ShowSources() requires the file vector sorted (see CGenericClientListCtrl).
+		std::sort(fileVector.begin(), fileVector.end());
+	} else {
+		// CGenericClientListCtrl shows clients associated with a KnownFile, so the
+		// uploadqueue carries a special known file holding all ongoing uploads in its
+		// upload list. A hack, but easier than bending the class into a shape it was not
+		// intended for.
 #ifdef CLIENT_GUI
-			fileVector.push_back(theApp->m_allUploadingKnownFile);
+		fileVector.push_back(theApp->m_allUploadingKnownFile);
 #else
-			fileVector.push_back(theApp->uploadqueue->GetAllUploadingKnownFile());
+		fileVector.push_back(theApp->uploadqueue->GetAllUploadingKnownFile());
 #endif
-		}
-		peerslistctrl->ShowSources(fileVector);
-
-		Refresh();
-		Layout();
 	}
-}
+	peerslistctrl->ShowSources(fileVector);
 
+	Refresh();
+	Layout();
+}
 
-void CSharedFilesWnd::OnBtnReloadShared( wxCommandEvent& WXUNUSED(evt) )
+void CSharedFilesWnd::OnBtnReloadShared(wxCommandEvent &WXUNUSED(evt))
 {
-	theApp->sharedfiles->Reload();
+	ReloadSharedFilesWithProgress(this);
 #ifndef CLIENT_GUI
 	// remote gui will update display when data is back
 	SelectionUpdated();
 #endif
 }
 
-
-void CSharedFilesWnd::OnItemSelectionChanged(wxListEvent& evt)
+void CSharedFilesWnd::OnFilterChanged(wxCommandEvent &WXUNUSED(evt))
 {
-	EClientShow clientShowMode = (EClientShow) m_radioClientMode->GetSelection();
+	sharedfilesctrl->SetFilterText(CastChild(IDC_SHARED_FILTER, wxTextCtrl)->GetValue());
+}
 
-	// Only update the list of clients if that list shows clients related to the selected shared files
-	if ( clientShowMode == ClientShowSelected ) {
+void CSharedFilesWnd::OnItemSelectionChanged(wxListEvent &evt)
+{
+	if (GetClientShowMode() == ClientShowSelected) {
+		// The client list is selection-driven here, so do the full update.
 		SelectionUpdated();
+	} else {
+		// Other modes: the client list shows all / all-uploading clients and is not
+		// selection-driven, so only the stat panel needs refreshing -- and immediately,
+		// instead of waiting for the file's next periodic update.
+		UpdateSelectionStats();
 	}
 
 	evt.Skip();
 }
 
-
-void CSharedFilesWnd::RemoveAllSharedFiles() {
-	sharedfilesctrl->DeleteAllItems();
+void CSharedFilesWnd::RemoveAllSharedFiles()
+{
+	sharedfilesctrl->ClearList();
 	sharedfilesctrl->ShowFilesCount();
 	SelectionUpdated();
 }
@@ -243,106 +290,108 @@
 		return;
 	}
 	m_prepared = true;
-	wxSplitterWindow* splitter = CastChild( "sharedsplitterWnd", wxSplitterWindow );
+	wxSplitterWindow *splitter = CastChild("sharedsplitterWnd", wxSplitterWindow);
 	int height = splitter->GetSize().GetHeight();
 	int header_height = s_sharedfilespeerHeader->GetSize().GetHeight();
 
-	if ( m_splitter ) {
+	if (m_splitter) {
 		// Some sanity checking
-		if ( m_splitter < s_splitterMin ) {
+		if (m_splitter < s_splitterMin) {
 			m_splitter = s_splitterMin;
-		} else if ( m_splitter > height - header_height * 2 ) {
+		} else if (m_splitter > height - header_height * 2) {
 			m_splitter = height - header_height * 2;
 		}
-		splitter->SetSashPosition( m_splitter );
+		splitter->SetSashPosition(m_splitter);
 		m_splitter = 0;
 	}
 
-	if ( !peerslistctrl->GetShowing() ) {
+	if (!peerslistctrl->GetShowing()) {
 		// use a toggle event to close it (calculate size, change button)
-		peerslistctrl->SetShowing( true );	// so it will be toggled to false
+		peerslistctrl->SetShowing(true); // so it will be toggled to false
 		wxCommandEvent evt1;
-		OnToggleClientList( evt1 );
+		OnToggleClientList(evt1);
 	}
 }
 
-void CSharedFilesWnd::OnToggleClientList(wxCommandEvent& WXUNUSED(evt))
+void CSharedFilesWnd::OnToggleClientList(wxCommandEvent &WXUNUSED(evt))
 {
-	wxSplitterWindow* splitter = CastChild( "sharedsplitterWnd", wxSplitterWindow );
-	wxBitmapButton*   button = CastChild( ID_SHAREDCLIENTTOGGLE, wxBitmapButton );
+	wxSplitterWindow *splitter = CastChild("sharedsplitterWnd", wxSplitterWindow);
+	wxBitmapButton *button = CastChild(ID_SHAREDCLIENTTOGGLE, wxBitmapButton);
 
-	if ( !peerslistctrl->GetShowing() ) {
-		splitter->SetSashPosition( m_splitter );
+	if (!peerslistctrl->GetShowing()) {
+		splitter->SetSashPosition(m_splitter);
 		m_splitter = 0;
 
-		peerslistctrl->SetShowing( true );
+		peerslistctrl->SetShowing(true);
 
-		button->SetBitmapLabel( amuleDlgImages( 10 ) );
-		button->SetBitmapFocus( amuleDlgImages( 10 ) );
-		button->SetBitmapSelected( amuleDlgImages( 10 ) );
-		button->SetBitmapHover( amuleDlgImages( 10 ) );
+		const wxBitmapBundle art = wxArtProvider::GetBitmapBundle("amule:arrows_down");
+		button->SetBitmapLabel(art);
+		button->SetBitmapFocus(art);
+		button->SetBitmapPressed(art);
+		button->SetBitmapCurrent(art);
 	} else {
-		peerslistctrl->SetShowing( false );
+		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();
+		int height =
+			peerslistctrl->GetSize().GetHeight() + splitter->GetWindow1()->GetSize().GetHeight();
 
-		splitter->SetSashPosition( height );
+		splitter->SetSashPosition(height);
 
-		button->SetBitmapLabel( amuleDlgImages( 11 ) );
-		button->SetBitmapFocus( amuleDlgImages( 11 ) );
-		button->SetBitmapSelected( amuleDlgImages( 11 ) );
-		button->SetBitmapHover( amuleDlgImages( 11 ) );
+		const wxBitmapBundle art = wxArtProvider::GetBitmapBundle("amule:arrows_up");
+		button->SetBitmapLabel(art);
+		button->SetBitmapFocus(art);
+		button->SetBitmapPressed(art);
+		button->SetBitmapCurrent(art);
 	}
 }
 
-void CSharedFilesWnd::OnSashPositionChanging(wxSplitterEvent& evt)
+void CSharedFilesWnd::OnSashPositionChanging(wxSplitterEvent &evt)
 {
-	if ( evt.GetSashPosition() < s_splitterMin ) {
-		evt.SetSashPosition( s_splitterMin );
+	if (evt.GetSashPosition() < s_splitterMin) {
+		evt.SetSashPosition(s_splitterMin);
 	} else {
-		wxSplitterWindow* splitter = wxStaticCast( evt.GetEventObject(), wxSplitterWindow);
+		wxSplitterWindow *splitter = wxStaticCast(evt.GetEventObject(), wxSplitterWindow);
 		wxCHECK_RET(splitter, "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() ) {
+		if (!peerslistctrl->GetShowing()) {
 			// lower window hidden
-			if ( height - mousey < header_height * 2 ) {
+			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
+				m_splitter = mousey; // prevent jumping if it was minimized and is then shown
+						     // by dragging the sash
 				wxCommandEvent evt1;
-				OnToggleClientList( evt1 );
+				OnToggleClientList(evt1);
 			}
 		} else {
 			// lower window showing
-			if ( height - mousey < header_height * 2 ) {
+			if (height - mousey < header_height * 2) {
 				// hide it
 				wxCommandEvent evt1;
-				OnToggleClientList( 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 );
+				// Normal resize. If several events queue up, setting the sash to
+				// the current mouse position speeds things up and makes sash moving
+				// smoother.
+				evt.SetSashPosition(mousey);
 			}
 		}
 	}
 }
 
-
-void CSharedFilesWnd::OnSelectClientsMode(wxCommandEvent& WXUNUSED(evt))
+void CSharedFilesWnd::OnSelectClientsMode(wxCommandEvent &WXUNUSED(evt))
 {
 	EClientShow clientShowLast = m_clientShow;
-	m_clientShow = (EClientShow) m_radioClientMode->GetSelection();
+	m_clientShow = GetClientShowMode();
 
 	if (m_clientShow != clientShowLast) {
 		SelectionUpdated();

amule-3.0.1.tar.gz/src/SharedFilesWnd.h -> amule-3.1.0.tar.gz/src/SharedFilesWnd.h Changed

@@ -26,8 +26,7 @@
 #ifndef SHAREDFILESWND_H
 #define SHAREDFILESWND_H
 
-#include <wx/panel.h>		// Needed for wxPanel
-
+#include <wx/panel.h> // Needed for wxPanel
 
 class CKnownFile;
 class CSharedFilesCtrl;
@@ -35,103 +34,110 @@
 class wxListEvent;
 class wxGauge;
 class wxSplitterEvent;
-class wxRadioBox;
+class wxRadioButton;
 
 /**
- * This class represents the window containing the list of shared files.
+ * The window holding the list of shared files.
  */
 class CSharedFilesWnd : public wxPanel
 {
 public:
-	/**
-	 * Constructor.
-	 */
-	CSharedFilesWnd(wxWindow* pParent = NULL);
+	CSharedFilesWnd(wxWindow *pParent = NULL);
 
-	/**
-	 * Destructor.
-	 */
 	~CSharedFilesWnd();
 
-
 	/**
-	 * This function updates the statistics of the selected items.
-	 *
-	 * Call this function when an item has been selected, or when a
-	 * selected item changes. It
+	 * Updates the statistics of the selected items. Call after an item is selected, or when a
+	 * selected item changes.
 	 */
 	void SelectionUpdated();
 
+	/**
+	 * Refreshes only the stat bars/labels for the current selection. Cheap (it walks just the
+	 * selected rows), so it runs on every selection change regardless of the client-show mode;
+	 * SelectionUpdated() calls it and also rebuilds the client list.
+	 */
+	void UpdateSelectionStats();
 
 	/**
-	 * Deletes all files and updates widget
+	 * Deletes all files and updates the widget.
 	 */
 	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.
+	 * Call before displaying the dialog: makes it look the right way.
 	 */
-	void	Prepare();
+	void Prepare();
 
 	//! Pointer to the widget containing the list of shared files.
-	CSharedFilesCtrl* sharedfilesctrl;
+	CSharedFilesCtrl *sharedfilesctrl;
 
 	//! Pointer to the list of clients.
-	CSharedFilePeersListCtrl*	peerslistctrl;
+	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.
+	 * Event handler: reload the list of shared files.
 	 */
 	void OnBtnReloadShared(wxCommandEvent &evt);
 
+	/** Live text-filter box changed: push the new text to the shared list. */
+	void OnFilterChanged(wxCommandEvent &evt);
+
 	/**
-	 * Event-handler for showing details about a shared file(s).
+	 * Event handler: show details about the selected shared file(s).
 	 */
-	void OnItemSelectionChanged(wxListEvent& evt);
+	void OnItemSelectionChanged(wxListEvent &evt);
 
 	/**
-	 * Event-handler for the list-toggle button.
+	 * Event handler: the list-toggle button.
 	 */
-	void OnToggleClientList( wxCommandEvent& event );
+	void OnToggleClientList(wxCommandEvent &event);
 
 	/**
-	 * Event-handler for changes in the sash divider position.
+	 * Event handler: the sash divider moved.
 	 */
-	void OnSashPositionChanging(wxSplitterEvent& evt);
+	void OnSashPositionChanging(wxSplitterEvent &evt);
 
 	/**
-	 * Event-handler for changes in the clients mode radio box.
+	 * Event handler: the clients mode radio box changed.
 	 */
-	void OnSelectClientsMode( wxCommandEvent& WXUNUSED(evt) );
+	void OnSelectClientsMode(wxCommandEvent &WXUNUSED(evt));
 
 	//! Pointer to the gauge used for showing requests ratio.
-	wxGauge* m_bar_requests;
+	wxGauge *m_bar_requests;
 	//! Pointer to the gauge used for showing accepted-requests ratio.
-	wxGauge* m_bar_accepted;
+	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;
+	wxGauge *m_bar_transfer;
+	//! Radio buttons selecting which clients are shown (replaces the old
+	//! wxRadioBox; see sharedfilesTopDlg in muuli_wdr.cpp).
+	wxRadioButton *m_radioShowAll;
+	wxRadioButton *m_radioShowSelected;
+	wxRadioButton *m_radioShowUploading;
 	//! Flag if window has been prepared
-	bool	m_prepared;
+	bool m_prepared;
 	//! Minimum position of splitter bar
 	static const int s_splitterMin = 90;
 
 	/**
-	 * Mode which clients are shown
+	 * Which clients are shown.
 	 */
-	enum EClientShow {
+	enum EClientShow
+	{
 		ClientShowAll = 0,
 		ClientShowSelected,
 		ClientShowUploading
 	};
 	EClientShow m_clientShow;
 
+	//! Read the mode currently picked by the radio buttons.
+	EClientShow GetClientShowMode() const;
+	//! Check the radio button matching the given mode.
+	void SetClientShowMode(EClientShow mode);
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.0.1.tar.gz/src/SourceListCtrl.cpp -> amule-3.1.0.tar.gz/src/SourceListCtrl.cpp Changed

@@ -22,50 +22,117 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 #include "SourceListCtrl.h"
+
+#include <common/Format.h> // Needed for CFormat
+
+#include "ClientRef.h" // Needed for CClientRef
 #include "KnownFile.h"
+#include "MuleBarRenderer.h" // Needed for CMuleBarRenderer, CBarFillSpec
+#include "PartFile.h"        // Needed for CPartFile
+#include "Preferences.h"     // Needed for thePrefs::ShowProgBar()
 
+namespace
+{
 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 },
+	{ ColumnUserName, wxTRANSLATE("User Name"), 260 },
+	{ ColumnUserDownloaded, wxTRANSLATE("Downloaded"), 65 },
+	{ ColumnUserSpeedDown, wxTRANSLATE("Speed"), 65 },
+	{ ColumnUserUploaded, wxTRANSLATE("Uploaded"), 65 },
+	{ ColumnUserProgress, wxTRANSLATE("Part Status"), 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 }
+	{ ColumnUserSharedFiles, wxTRANSLATE("Shares File List"), 100 }
 };
 
-wxBEGIN_EVENT_TABLE(CSourceListCtrl, CGenericClientListCtrl)
-wxEND_EVENT_TABLE()
-
-CSourceListCtrl::CSourceListCtrl(
-	wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size,
-	long style, const wxValidator& validator, const wxString& name )
-:
-CGenericClientListCtrl( "Sources", parent, winid, pos, size, style | wxLC_OWNERDRAW, validator, name )
+/**
+ * Renders ColumnUserProgress: a client's per-part chunk bar (5 states: no part / have-complete /
+ * downloading / next-requested / have-but-need), or, for an A4AF row, a bordered "A4AF: <filename>"
+ * text badge instead of a bar. A real per-row renderer branch, not a bar overlay, reproducing
+ * DrawSourceStatusBar's A4AF case (GenericClientListCtrl.cpp, pre-port) exactly, including its own
+ * themed border -- its own SetPen, not the base's black one, the base's Render() not being called
+ * for this branch at all.
+ */
+class CSourceBarRenderer : public CMuleBarRenderer
 {
-	// Setting the sorter function.
-	SetSortFunc( SourceSortProc );
+public:
+	bool Render(wxRect cell, wxDC *dc, int state) override
+	{
+		// Gates the whole cell -- bar and A4AF badge alike -- exactly as the
+		// pre-port ColumnUserProgress case did.
+		if (!thePrefs::ShowProgBar()) {
+			return true;
+		}
+		ClientCtrlItem_Struct *item =
+			reinterpret_cast<ClientCtrlItem_Struct *>(GetSpec().GetIdentity());
+		if (!item) {
+			return true;
+		}
+		if (item->GetType() == A4AF_SOURCE) {
+			DrawA4AFBadge(cell, dc, item);
+			return true;
+		}
+		return CMuleBarRenderer::Render(cell, dc, state);
+	}
+
+private:
+	static void DrawA4AFBadge(wxRect cell, wxDC *dc, ClientCtrlItem_Struct *item)
+	{
+		const int iWidth = cell.GetWidth() - 2;
+		const int iHeight = cell.GetHeight() - 2;
+		if (iWidth <= 0 || iHeight <= 0) {
+			return;
+		}
+		wxDCClipper clipper(*dc, cell.GetX(), cell.GetY() + 1, iWidth, iHeight);
+
+		CPartFile *p = item->GetSource().GetRequestFile();
+		const wxString a4af = p ? p->GetFileName().GetPrintable() : wxString("?");
+		const wxString buffer = CFormat("%s: %s") % _("A4AF") % a4af;
+
+		const int mid_x = (2 * cell.GetX() + cell.GetWidth()) >> 1;
+		const int mid_y = (2 * cell.GetY() + cell.GetHeight()) >> 1;
+		wxCoord txtwidth;
+		wxCoord txtheight;
+		dc->GetTextExtent(buffer, &txtwidth, &txtheight);
 
+		// Theme-aware text and border colour. It was *wxBLACK / *wxBLACK_PEN, invisible on
+		// dark themes: the badge sits on the row stripe, not on a known light background.
+		const wxColour badgeColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+		dc->SetTextForeground(badgeColour);
+		dc->DrawText(
+			buffer, wxMax(cell.GetX() + 2, mid_x - (txtwidth >> 1)), mid_y - (txtheight >> 1));
+
+		dc->SetPen(wxPen(badgeColour));
+		dc->SetBrush(*wxTRANSPARENT_BRUSH);
+		dc->DrawRectangle(cell.GetX(), cell.GetY() + 1, iWidth, iHeight);
+	}
+};
+} // namespace
+
+CSourceListCtrl::CSourceListCtrl(wxWindow *parent,
+	wxWindowID winid,
+	const wxPoint &pos,
+	const wxSize &size,
+	long style,
+	const wxString &name)
+: CGenericClientListCtrl("Sources", parent, winid, pos, size, style, name)
+{
 	m_columndata.n_columns = sizeof(s_sources_column_info) / sizeof(CGenericClientListCtrlColumn);
 	m_columndata.columns = s_sources_column_info;
 
 	InitColumnData();
 }
 
-CSourceListCtrl::~CSourceListCtrl()
-{
-}
+CSourceListCtrl::~CSourceListCtrl() {}
 
-int CSourceListCtrl::SourceSortProc(wxUIntPtr param1, wxUIntPtr param2, wxIntPtr sortData)
+CMuleBarRenderer *CSourceListCtrl::CreateProgressBarRenderer() const
 {
-	return CGenericClientListCtrl::SortProc(param1, param2, s_sources_column_infosortData & CMuleListCtrl::COLUMN_MASK.cid | (sortData & CMuleListCtrl::SORT_DES));
+	return new CSourceBarRenderer();
 }
 
-void CSourceListCtrl::SetShowSources(CKnownFile * f, bool b) const
+void CSourceListCtrl::SetShowSources(CKnownFile *f, bool b) const
 {
 	f->SetShowSources(b);
 }

amule-3.0.1.tar.gz/src/SourceListCtrl.h -> amule-3.1.0.tar.gz/src/SourceListCtrl.h Changed

@@ -25,44 +25,34 @@
 #ifndef SOURCELISTCTRL_H
 #define SOURCELISTCTRL_H
 
-#include "GenericClientListCtrl.h"	// Needed for CGenericClientListCtrl
+#include "GenericClientListCtrl.h" // Needed for CGenericClientListCtrl
 
 /**
- * This class is responsible for representing the sources for a file.
-
+ * Represents the sources for a file.
  */
 class CSourceListCtrl : public CGenericClientListCtrl
 {
 public:
 	/**
-	 * Constructor.
-	 *
-	 * @see CGenericClientListCtrl::CGenericClientListCtrl for documentation of parameters.
+	 * Constructor. @see CGenericClientListCtrl::CGenericClientListCtrl for the 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 = "sourcelistctrl" );
+	CSourceListCtrl(wxWindow *parent,
+		wxWindowID winid = wxID_ANY,
+		const wxPoint &pos = wxDefaultPosition,
+		const wxSize &size = wxDefaultSize,
+		long style = 0,
+		const wxString &name = "sourcelistctrl");
 
-	/**
-	 * Destructor.
-	 */
-	virtual	~CSourceListCtrl();
+	virtual ~CSourceListCtrl();
 
 private:
-	virtual CamuleDlg::DialogType GetParentDialog() { return CamuleDlg::DT_TRANSFER_WND; }
-
-	virtual void SetShowSources(CKnownFile * f, bool b) const;
+	CamuleDlg::DialogType GetParentDialog() override { return CamuleDlg::DT_TRANSFER_WND; }
 
-	static int wxCALLBACK SourceSortProc(wxUIntPtr item1, wxUIntPtr item2, wxIntPtr sortData);
+	void SetShowSources(CKnownFile *f, bool b) const override;
 
-	bool IsShowingDownloadSources() const { return true; }
+	CMuleBarRenderer *CreateProgressBarRenderer() const override;
 
-	wxDECLARE_EVENT_TABLE();
+	bool IsShowingDownloadSources() const override { return true; }
 };
 
 #endif

amule-3.1.0.tar.gz/src/SplashScreen.cpp Added

@@ -0,0 +1,282 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "SplashScreen.h"
+
+#include <algorithm> // Needed for std::min / std::max
+#include <cmath>     // Needed for std::sqrt
+
+#include <wx/artprov.h>
+#include <wx/dcbuffer.h>
+#include <wx/image.h>
+#include <wx/utils.h> // Needed for wxSafeYield
+
+#include <common/Format.h> // Needed for CFormat
+
+#include <common/ClientVersion.h> // Needed for VERSION_MJR and friends
+
+#include "CamuleArtProvider.h" // Needed for CamuleArtProvider::MakeId
+#include "Logger.h"
+
+namespace
+{
+
+// Splash geometry, in DIPs. Wide enough for the tagline at a readable size
+// -- it is the longest line and sets the floor.
+constexpr int kSplashWidth = 440;
+constexpr int kSplashHeight = 340;
+constexpr int kLogoSize = 128;
+
+// Gradient, matching the artwork the splash replaces: an ellipse centred on the panel, falling off
+// linearly from a lifted grey to black. The radius is normalised per axis, so the ellipse follows
+// the panel's shape rather than being circular, and reaches black past the corners rather than
+// exactly at them.
+constexpr int kCentreR = 79;
+constexpr int kCentreG = 79;
+constexpr int kCentreB = 82;
+constexpr double kBlackAtRadius = 1.39;
+
+// Repaint at most this often while the caller reports progress. Time-based rather than every-N-
+// items: the shared-file scan runs at wildly different speeds depending on whether the files are
+// local or on network storage, so a count-based rule is either too coarse or too costly. At 10 Hz
+// the bar looks continuous and costs almost nothing.
+constexpr long kRepaintIntervalMs = 100;
+
+// Minimum time on screen. A startup that beats this would otherwise show
+// the splash for a couple of frames, which looks like a flicker.
+constexpr long kMinimumVisibleMs = 1500;
+
+// Shrinks @a font until @a text fits @a maxWidth, and draws it centred.
+//
+// A guard rather than a layout scheme: every string here is short enough at the intended size, but
+// they are translated and the panel is fixed-width, so one long translation would otherwise run off
+// both edges unnoticed.
+void DrawFittedText(
+	wxDC &dc, const wxString &text, wxFont font, int maxWidth, int centreX, int y, wxSize &extent)
+{
+	for (;;) {
+		dc.SetFont(font);
+		extent = dc.GetTextExtent(text);
+		if (extent.x <= maxWidth || font.GetPointSize() <= 6) {
+			break;
+		}
+		font.SetPointSize(font.GetPointSize() - 1);
+	}
+	dc.DrawText(text, centreX - extent.x / 2, y);
+}
+
+wxColour GradientAt(double nx, double ny)
+{
+	const double r = std::sqrt(nx * nx + ny * ny);
+	const double k = std::max(0.0, 1.0 - r / kBlackAtRadius);
+	return wxColour(static_cast<unsigned char>(kCentreR * k),
+		static_cast<unsigned char>(kCentreG * k),
+		static_cast<unsigned char>(kCentreB * k));
+}
+
+} // namespace
+
+wxBEGIN_EVENT_TABLE(CSplashScreen, wxFrame)
+	EVT_PAINT(CSplashScreen::OnPaint)
+	EVT_TIMER(wxID_ANY, CSplashScreen::OnCloseTimer)
+wxEND_EVENT_TABLE()
+
+CSplashScreen::CSplashScreen(wxWindow *parent)
+: wxFrame(parent,
+	  wxID_ANY,
+	  wxEmptyString,
+	  wxDefaultPosition,
+	  wxDefaultSize,
+	  wxFRAME_NO_TASKBAR | wxBORDER_NONE)
+, m_percent(0)
+, m_shownAt(0)
+, m_lastPaint(0)
+, m_paintCount(0)
+, m_paintMicros(0)
+, m_updateMicros(0)
+{
+	SetClientSize(FromDIP(wxSize(kSplashWidth, kSplashHeight)));
+	SetBackgroundStyle(wxBG_STYLE_PAINT);
+	RenderBackdrop();
+	// Explicitly on the screen rather than on the parent: with a parent set, Centre() would
+	// centre on a main window that is not on screen yet, and its saved geometry can put the
+	// splash anywhere or off-screen entirely.
+	CentreOnScreen();
+}
+
+bool CSplashScreen::Show(bool show)
+{
+	const bool shown = wxFrame::Show(show);
+	if (show && m_shownAt == 0) {
+		m_shownAt = wxGetUTCTimeMillis();
+	}
+	return shown;
+}
+
+void CSplashScreen::RenderBackdrop()
+{
+	const wxSize size = GetClientSize();
+	wxImage gradient(size.x, size.y);
+
+	const double halfW = size.x / 2.0;
+	const double halfH = size.y / 2.0;
+	for (int y = 0; y < size.y; ++y) {
+		const double ny = (y + 0.5 - halfH) / halfH;
+		for (int x = 0; x < size.x; ++x) {
+			const double nx = (x + 0.5 - halfW) / halfW;
+			const wxColour c = GradientAt(nx, ny);
+			gradient.SetRGB(x, y, c.Red(), c.Green(), c.Blue());
+		}
+	}
+
+	m_backdrop = wxBitmap(gradient);
+
+	wxMemoryDC dc(m_backdrop);
+	dc.SetTextForeground(*wxWHITE);
+
+	const int logoSize = FromDIP(kLogoSize);
+	const wxBitmap logo = wxArtProvider::GetBitmap(
+		CamuleArtProvider::MakeId("amule"), wxART_OTHER, wxSize(logoSize, logoSize));
+	int y = FromDIP(28);
+	if (logo.IsOk()) {
+		dc.DrawBitmap(logo, (size.x - logo.GetWidth()) / 2, y, true);
+		y += logo.GetHeight() + FromDIP(12);
+	}
+
+	// Application name and running version. The version-number macros rather than
+	// GetMuleVersion(), which deliberately describes the build for debugging -- toolkit, Boost,
+	// snapshot revision -- and is a paragraph, not a title.
+	wxFont title = GetFont();
+	title.SetPointSize(title.GetPointSize() + 6);
+	title.SetWeight(wxFONTWEIGHT_BOLD);
+	const wxString name = wxString::Format("aMule v%d.%d.%d", VERSION_MJR, VERSION_MIN, VERSION_UPDATE);
+	const int textWidth = size.x - 2 * FromDIP(24);
+	wxSize extent;
+	DrawFittedText(dc, name, title, textWidth, size.x / 2, y, extent);
+	y += extent.y + FromDIP(6);
+
+	// Same string the About dialog uses, minus its trailing whitespace.
+	dc.SetTextForeground(wxColour(190, 190, 195));
+	wxString tagline = _("'All-Platform' p2p client based on eMule \n\n");
+	tagline.Trim(true).Trim(false);
+	DrawFittedText(dc, tagline, GetFont(), textWidth, size.x / 2, y, extent);
+}
+
+void CSplashScreen::OnPaint(wxPaintEvent &WXUNUSED(evt))
+{
+	const wxLongLong started = wxGetUTCTimeMillis();
+	wxAutoBufferedPaintDC dc(this);
+	dc.DrawBitmap(m_backdrop, 0, 0, false);
+
+	const wxSize size = GetClientSize();
+	const int margin = FromDIP(40);
+	const int barHeight = FromDIP(10);
+	const int barWidth = size.x - 2 * margin;
+	const int barTop = size.y - FromDIP(64);
+
+	// Trough, then fill. Drawn rather than delegated to wxGauge so the bar
+	// keeps these colours on a dark panel instead of the theme's.
+	dc.SetPen(wxPen(wxColour(90, 90, 95)));
+	dc.SetBrush(wxBrush(wxColour(30, 30, 33)));
+	dc.DrawRoundedRectangle(margin, barTop, barWidth, barHeight, barHeight / 2.0);
+
+	const int clamped = std::min(100, std::max(0, m_percent));
+	const int fill = (barWidth * clamped) / 100;
+	if (fill > 0) {
+		dc.SetPen(*wxTRANSPARENT_PEN);
+		dc.SetBrush(wxBrush(wxColour(232, 138, 40))); // the mule's orange
+		dc.DrawRoundedRectangle(margin, barTop, fill, barHeight, barHeight / 2.0);
+	}
+
+	dc.SetFont(GetFont());
+	dc.SetTextForeground(wxColour(210, 210, 215));
+	const wxSize extent = dc.GetTextExtent(m_status);
+	dc.DrawText(m_status, (size.x - extent.x) / 2, barTop + barHeight + FromDIP(10));
+
+	++m_paintCount;
+	m_paintMicros += (wxGetUTCTimeMillis() - started);
+}
+
+void CSplashScreen::SetProgress(const wxString &status, int percent, bool immediate)
+{
+	m_status = status;
+	m_percent = percent;
+
+	const wxLongLong now = wxGetUTCTimeMillis();
+	if (!immediate && (now - m_lastPaint) < kRepaintIntervalMs) {
+		return;
+	}
+	m_lastPaint = now;
+
+	Refresh(false);
+
+	// The event loop has to run for the invalidation to reach the screen: under GTK3, Update()
+	// cannot force a synchronous repaint the way it does elsewhere, since drawing is driven by
+	// the frame clock, which only ticks from the loop.
+	//
+	// wxSafeYield rather than wxYield: it disables every other top-level window for the
+	// duration, so input arriving while the application is half-built is discarded rather than
+	// dispatched into subsystems that do not exist yet. The rate limit above bounds what this
+	// costs.
+	wxSafeYield(this, true);
+
+	m_updateMicros += (wxGetUTCTimeMillis() - now);
+}
+
+void CSplashScreen::Finish()
+{
+	const wxLongLong visibleMs = wxGetUTCTimeMillis() - m_shownAt;
+
+	// Debug level: this is the splash's own overhead against the work it reports on, which
+	// matters when tuning the phase weighting but is noise in a user's log. The phase timings
+	// themselves are logged normally.
+	//
+	// logGeneral, not logStandard: the latter is the -1 sentinel meaning "not a debug
+	// category", so a debug line asking whether it is enabled reaches CLogger::IsEnabled, whose
+	// index check rejects anything below zero.
+	AddDebugLogLineN(logGeneral,
+		CFormat("Splash: %u repaints costing %lld ms, %lld ms taken from startup, "
+			"over %lld ms on screen") %
+			m_paintCount % m_paintMicros.GetValue() % m_updateMicros.GetValue() %
+			visibleMs.GetValue());
+
+	if (visibleMs >= kMinimumVisibleMs) {
+		Hide();
+		Destroy();
+		return;
+	}
+
+	// Under the floor: hand the close to a one-shot timer so the main thread carries on.
+	// wxWindow::Destroy() is already deferred (it posts to the idle handler), so the frame
+	// outlives this call either way.
+	const int remainingMs = static_cast<int>((kMinimumVisibleMs - visibleMs).ToLong());
+	m_closeTimer.SetOwner(this);
+	m_closeTimer.StartOnce(remainingMs);
+}
+
+void CSplashScreen::OnCloseTimer(wxTimerEvent &WXUNUSED(evt))
+{
+	Hide();
+	Destroy();
+}

amule-3.1.0.tar.gz/src/SplashScreen.h Added

@@ -0,0 +1,104 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 SPLASHSCREEN_H
+#define SPLASHSCREEN_H
+
+#include <wx/bitmap.h> // Needed for the pre-rendered backdrop member
+#include <wx/frame.h>
+#include <wx/timer.h>
+
+// Startup splash for the monolithic GUI.
+//
+// Exists because startup is slow and silent: the main window is created before the shared-file scan
+// runs, but the scan holds the main thread, so nothing paints until it finishes. On a large share
+// -- worse on network storage, where every file costs a round trip -- that is a long stretch with
+// no sign the application is alive, and under Flatpak long enough for xdg-desktop-portal's
+// background monitor to conclude the app has no window and kill it.
+//
+// Everything is drawn by hand rather than assembled from child controls: the background is a dark
+// gradient, and native widgets on top of it would follow the desktop theme instead, giving a light-
+// on-dark gauge on most systems.
+class CSplashScreen : public wxFrame
+{
+public:
+	// Parented to the main window, so the window manager keeps it above aMule and nothing else.
+	// As a parentless wxSTAY_ON_TOP frame it sat at a desktop-global level, covering every
+	// other application with no taskbar button to raise over it or dismiss it with.
+	explicit CSplashScreen(wxWindow *parent);
+
+	// Update the phase text and the bar. Cheap to call often: repainting is rate-limited
+	// internally, so callers can report every file scanned.
+	//
+	// Set @a immediate when the update marks a change of phase rather than progress within one,
+	// to paint it without waiting out the rate limit. It cannot be inferred from the text
+	// changing, since the per-item updates carry a running count and so change their text every
+	// time.
+	void SetProgress(const wxString &status, int percent, bool immediate = false);
+
+	// Close, honouring the minimum on-screen time: a fast startup would otherwise flash the
+	// splash for a few frames, which reads as a glitch.
+	//
+	// Never blocks -- when the floor has not been reached it schedules the close and returns.
+	// Sleeping here would freeze the main thread, the very symptom the splash exists to
+	// explain.
+	void Finish();
+
+	// Stamps the clock the minimum-display floor is measured from, so that floor covers the
+	// time actually spent visible rather than the time since the object was built.
+	bool Show(bool show = true) override;
+
+private:
+	void OnPaint(wxPaintEvent &evt);
+	void OnCloseTimer(wxTimerEvent &evt);
+
+	// Runs down the remainder of the minimum display time when Finish() is
+	// called early, so that wait costs the main thread nothing.
+	wxTimer m_closeTimer;
+
+	// Gradient, logo and the two fixed captions, rendered once. Only the bar and the phase text
+	// change afterwards, so the expensive part is paid at construction rather than on every
+	// update.
+	void RenderBackdrop();
+
+	wxBitmap m_backdrop;
+	wxString m_status;
+	int m_percent;
+
+	// Wall-clock of Show(), for the minimum-display-time floor.
+	wxLongLong m_shownAt;
+	// Wall-clock of the last repaint, for the rate limit.
+	wxLongLong m_lastPaint;
+	// Cost accounting, reported once at Finish() so what the splash takes from the work it
+	// reports on is measurable rather than assumed. Two figures because they answer different
+	// questions: how much was drawn, and how much time the startup path gave up in total
+	// (drawing plus the event-loop pumping that gets it on screen).
+	unsigned m_paintCount;
+	wxLongLong m_paintMicros;
+	wxLongLong m_updateMicros;
+
+	wxDECLARE_EVENT_TABLE();
+};
+
+#endif // SPLASHSCREEN_H

amule-3.0.1.tar.gz/src/StatTree.cpp -> amule-3.1.0.tar.gz/src/StatTree.cpp Changed

@@ -30,16 +30,16 @@
 
 #ifndef CLIENT_GUI
 
-#include <common/Format.h>			// Needed for CFormat
+#include <common/Format.h> // Needed for CFormat
 
-#define a_brackets_b(a,b) (a + " (" + b + ")")
+#define a_brackets_b(a, b) (a + " (" + b + ")")
 
 #endif /* !CLIENT_GUI */
 
-#include <ec/cpp/ECTag.h>			// Needed for CECTag
+#include <ec/cpp/ECTag.h> // Needed for CECTag
 
 #ifdef CLIENT_GUI
-	#include <ec/cpp/ECSpecialTags.h>	// Needed for CEC_StatTree_Node_Tag
+#include <ec/cpp/ECSpecialTags.h> // Needed for CEC_StatTree_Node_Tag
 
 #else
 
@@ -55,13 +55,13 @@
 
 #ifdef CLIENT_GUI
 CStatTreeItemBase::CStatTreeItemBase(const CECTag *tag)
-	: m_label(static_cast<const CEC_StatTree_Node_Tag*>(tag)->GetDisplayString()),
-	  m_uniqueid(tag->GetTagByNameSafe(EC_TAG_STATTREE_NODEID)->GetInt())
+: m_label(static_cast<const CEC_StatTree_Node_Tag *>(tag)->GetDisplayString())
+, m_uniqueid(tag->GetTagByNameSafe(EC_TAG_STATTREE_NODEID)->GetInt())
 {
 	wxASSERT(tag->GetTagName() == EC_TAG_STATTREE_NODE);
 
 	for (CECTag::const_iterator it = tag->begin(); it != tag->end(); ++it) {
-		const CECTag *tmp = & *it;
+		const CECTag *tmp = &*it;
 		if (tmp->GetTagName() == EC_TAG_STATTREE_NODE) {
 			m_children.push_back(new CStatTreeItemBase(tmp));
 		}
@@ -75,10 +75,7 @@
 }
 
 #ifndef CLIENT_GUI
-CStatTreeItemBase* CStatTreeItemBase::AddChild(
-	CStatTreeItemBase* child,
-	uint32_t id,
-	bool skipOneLevel)
+CStatTreeItemBase *CStatTreeItemBase::AddChild(CStatTreeItemBase *child, uint32_t id, bool skipOneLevel)
 {
 	wxMutexLocker lock(m_lock);
 
@@ -90,7 +87,7 @@
 	child->m_id = id;
 
 	if (m_flags & stSortChildren) {
-		std::list<CStatTreeItemBase*>::iterator it = m_children.begin();
+		std::list<CStatTreeItemBase *>::iterator it = m_children.begin();
 		while (it != m_children.end() && id < (*it)->m_id) {
 			++it;
 		}
@@ -106,8 +103,8 @@
 {
 	wxMutexLocker lock(m_lock);
 
-	for (std::list<CStatTreeItemBase*>::const_iterator it = m_children.begin();
-	     it != m_children.end(); ++it) {
+	for (std::list<CStatTreeItemBase *>::const_iterator it = m_children.begin(); it != m_children.end();
+		++it) {
 		if ((*it)->IsVisible()) {
 			return true;
 		}
@@ -120,8 +117,8 @@
 {
 	wxMutexLocker lock(m_lock);
 
-	for (std::list<CStatTreeItemBase*>::const_iterator it = m_children.begin();
-	     it != m_children.end(); ++it) {
+	for (std::list<CStatTreeItemBase *>::const_iterator it = m_children.begin(); it != m_children.end();
+		++it) {
 		if ((*it)->m_id == id) {
 			return true;
 		}
@@ -129,12 +126,12 @@
 	return false;
 }
 
-CStatTreeItemBase* CStatTreeItemBase::GetChildById(uint32_t id)
+CStatTreeItemBase *CStatTreeItemBase::GetChildById(uint32_t id)
 {
 	wxMutexLocker lock(m_lock);
 
-	for (std::list<CStatTreeItemBase*>::const_iterator it = m_children.begin();
-	     it != m_children.end(); ++it) {
+	for (std::list<CStatTreeItemBase *>::const_iterator it = m_children.begin(); it != m_children.end();
+		++it) {
 		if ((*it)->m_id == id) {
 			return *it;
 		}
@@ -147,11 +144,12 @@
 {
 	StatTreeItemIterator it = m_children.begin();
 	m_visible_counter = --max_children;
-	while (it != m_children.end() && !(*it)->IsVisible()) ++it;
+	while (it != m_children.end() && !(*it)->IsVisible())
+		++it;
 	return it;
 }
 
-void CStatTreeItemBase::GetNextVisibleChild(StatTreeItemIterator& it)
+void CStatTreeItemBase::GetNextVisibleChild(StatTreeItemIterator &it)
 {
 	if (m_flags & stCapChildren) {
 		if (m_visible_counter == 0) {
@@ -161,20 +159,21 @@
 			--m_visible_counter;
 		}
 	}
-	if (it != m_children.end()) ++it;
-	while (it != m_children.end() && !(*it)->IsVisible()) ++it;
+	if (it != m_children.end())
+		++it;
+	while (it != m_children.end() && !(*it)->IsVisible())
+		++it;
 }
 
-//
 // Anything below is only for core.
-//
 
-bool CStatTreeItemBase::ValueSort(const CStatTreeItemBase* a, const CStatTreeItemBase* b)
+bool CStatTreeItemBase::ValueSort(const CStatTreeItemBase *a, const CStatTreeItemBase *b)
 {
 	if (a->m_id < 0x00000100 || a->m_id > 0x7fffffff || b->m_id < 0x00000100 || b->m_id > 0x7fffffff) {
 		return a->m_id > b->m_id;
 	} else {
-		return dynamic_cast<const CStatTreeItemCounter*>(a)->GetValue() > dynamic_cast<const CStatTreeItemCounter*>(b)->GetValue();
+		return dynamic_cast<const CStatTreeItemCounter *>(a)->GetValue() >
+		       dynamic_cast<const CStatTreeItemCounter *>(b)->GetValue();
 	}
 }
 
@@ -191,10 +190,17 @@
 		wxMutexLocker lock(m_lock);
 		CECTag *tag = new CECTag(EC_TAG_STATTREE_NODE, m_label);
 		tag->AddTag(CECTag(EC_TAG_STATTREE_NODEID, m_uniqueid));
+		if (!m_key.IsEmpty()) {
+			tag->AddTag(CECTag(EC_TAG_STAT_NODE_KEY, m_key));
+		}
+		if (!m_rawvalue.IsEmpty()) {
+			tag->AddTag(CECTag(EC_TAG_STAT_NODE_RAW, m_rawvalue));
+		}
 		AddECValues(tag);
 		m_visible_counter = max_children - 1;
-		for (std::list<CStatTreeItemBase*>::const_iterator it = m_children.begin();
-		     it != m_children.end(); ++it) {
+		for (std::list<CStatTreeItemBase *>::const_iterator it = m_children.begin();
+			it != m_children.end();
+			++it) {
 			CECTag *tmp = (*it)->CreateECTag(max_children);
 			if (tmp) {
 				tag->AddTag(*tmp);
@@ -214,22 +220,27 @@
 	}
 }
 
-
 /* CStatTreeItemSimple */
 
 #ifndef AMULE_DAEMON
 wxString CStatTreeItemSimple::GetDisplayString() const
 {
 	switch (m_valuetype) {
-		case vtInteger:
-			switch (m_displaymode) {
-				case dmTime:	return CFormat(wxGetTranslation(m_label)) % CastSecondsToHM(m_intvalue);
-				case dmBytes:	return CFormat(wxGetTranslation(m_label)) % CastItoXBytes(m_intvalue);
-				default:	return CFormat(wxGetTranslation(m_label)) % m_intvalue;
-			}
-		case vtFloat:	return CFormat(wxGetTranslation(m_label)) % m_floatvalue;
-		case vtString:	return CFormat(wxGetTranslation(m_label)) % m_stringvalue;
-		default:	return wxGetTranslation(m_label);
+	case vtInteger:
+		switch (m_displaymode) {
+		case dmTime:
+			return CFormat(wxGetTranslation(m_label)) % CastSecondsToHM(m_intvalue);
+		case dmBytes:
+			return CFormat(wxGetTranslation(m_label)) % CastItoXBytes(m_intvalue);
+		default:
+			return CFormat(wxGetTranslation(m_label)) % m_intvalue;
+		}
+	case vtFloat:
+		return CFormat(wxGetTranslation(m_label)) % m_floatvalue;
+	case vtString:
+		return CFormat(wxGetTranslation(m_label)) % m_stringvalue;
+	default:
+		return wxGetTranslation(m_label);
 	}
 }
 #endif
@@ -238,10 +249,14 @@
 {
 	if (m_flags & stHideIfZero) {
 		switch (m_valuetype) {
-			case vtInteger:	return m_intvalue != 0;
-			case vtFloat:	return m_floatvalue != 0.0;
-			case vtString:	return !m_stringvalue.IsEmpty();
-			default: return false;
+		case vtInteger:
+			return m_intvalue != 0;
+		case vtFloat:
+			return m_floatvalue != 0.0;
+		case vtString:
+			return !m_stringvalue.IsEmpty();
+		default:
+			return false;
 		}
 	}
 	return true;
@@ -250,51 +265,47 @@
 void CStatTreeItemSimple::AddECValues(CECTag *tag) const
 {
 	switch (m_valuetype) {
-		case vtInteger: {
-			 if (m_displaymode == dmTime) {
-				 CECTag value(EC_TAG_STAT_NODE_VALUE, (uint32)m_intvalue);
-				 value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_TIME));
-				 tag->AddTag(value);
-			 } else {
-				 CECTag value(EC_TAG_STAT_NODE_VALUE, (uint64)m_intvalue);
-				 if (m_displaymode == dmBytes) {
-					 value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_BYTES));
-				 }
-				 tag->AddTag(value);
-			 }
-			 break;
-		}
-		case vtFloat: {
-			CECTag value(EC_TAG_STAT_NODE_VALUE, m_floatvalue);
-			value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_DOUBLE));
+	case vtInteger: {
+		if (m_displaymode == dmTime) {
+			CECTag value(EC_TAG_STAT_NODE_VALUE, (uint32)m_intvalue);
+			value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_TIME));
 			tag->AddTag(value);
-			break;
-		}
-		case vtString: {
-			CECTag value(EC_TAG_STAT_NODE_VALUE, m_stringvalue);
-			value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_STRING));
+		} else {
+			CECTag value(EC_TAG_STAT_NODE_VALUE, (uint64)m_intvalue);
+			if (m_displaymode == dmBytes) {
+				value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_BYTES));
+			}
 			tag->AddTag(value);
-			break;
 		}
-		default:
-			break;
+		break;
+	}
+	case vtFloat: {
+		CECTag value(EC_TAG_STAT_NODE_VALUE, m_floatvalue);
+		value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_DOUBLE));
+		tag->AddTag(value);
+		break;
+	}
+	case vtString: {
+		CECTag value(EC_TAG_STAT_NODE_VALUE, m_stringvalue);
+		value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_STRING));
+		tag->AddTag(value);
+		break;
+	}
+	default:
+		break;
 	}
 }
 
-
 /* CStatTreeItemCounterTmpl */
 
 #ifndef AMULE_DAEMON
-template<typename _Tp>
-wxString CStatTreeItemCounterTmpl<_Tp>::GetDisplayString() const
+template <typename _Tp> wxString CStatTreeItemCounterTmpl<_Tp>::GetDisplayString() const
 {
 	wxString my_label = wxGetTranslation(m_label);
 	// This is needed for client names, for example
 	if (my_label == m_label) {
 		if (m_label.Right(4) == ": %s") {
-			my_label = wxGetTranslation(
-				m_label.Mid(0, m_label.Length() - 4)) +
-				wxString(": %s");
+			my_label = wxGetTranslation(m_label.Mid(0, m_label.Length() - 4)) + wxString(": %s");
 		}
 	}
 	CFormat label(my_label);
@@ -303,7 +314,10 @@
 	} else {
 		wxString result = CFormat("%u") % m_value;
 		if ((m_flags & stShowPercent) && m_parent) {
-			result += CFormat(" (%.2f%%)") % ((double(m_value) / dynamic_cast<CStatTreeItemCounterTmpl<_Tp>*>(m_parent)->m_value) * 100.0);
+			result += CFormat(" (%.2f%%)") %
+				  ((double(m_value) /
+					   dynamic_cast<CStatTreeItemCounterTmpl<_Tp> *>(m_parent)->m_value) *
+					  100.0);
 		}
 		return label % result;
 	}
@@ -314,8 +328,7 @@
 
 #endif
 
-template<typename _Tp>
-void CStatTreeItemCounterTmpl<_Tp>::AddECValues(CECTag *tag) const
+template <typename _Tp> void CStatTreeItemCounterTmpl<_Tp>::AddECValues(CECTag *tag) const
 {
 	CECTag value(EC_TAG_STAT_NODE_VALUE, (uint64)m_value);
 	if (m_displaymode == dmBytes) {
@@ -324,7 +337,9 @@
 		value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_ISTRING));
 		if ((m_flags & stShowPercent) && m_parent) {
 			CECTag tmp(EC_TAG_STAT_NODE_VALUE,
-				(double(m_value) / dynamic_cast<CStatTreeItemCounterTmpl<_Tp>*>(m_parent)->m_value) * 100.0);
+				(double(m_value) /
+					dynamic_cast<CStatTreeItemCounterTmpl<_Tp> *>(m_parent)->m_value) *
+					100.0);
 			tmp.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_DOUBLE));
 			value.AddTag(tmp);
 		}
@@ -337,22 +352,17 @@
 
 /* CStatTreeItemUlDlCounter */
 
-// The display format is "<session> (<all-time-cumulative>)" where
-// the session value is m_value and the cumulative is what
-// m_totalfunc() returns. Both values are kept in sync by
-// CStatistics::AddSentBytes / AddReceivedBytes, which adds the same
-// byte count to both the session counter (m_value) and the saved
-// cumulative (m_totalfunc()'s underlying s_totalSent / s_totalReceived).
-// So m_totalfunc() already includes m_value -- adding m_value again
-// double-counts the session bytes in the cumulative slot, which is
-// the user-visible #301: live UI shows "session bytes counted twice"
-// and the post-restart figure drops by exactly one session-worth.
-// Use m_totalfunc() directly for the cumulative slot.
+// The display format is "<session> (<all-time-cumulative>)", the session value being m_value and
+// the cumulative what m_totalfunc() returns. CStatistics::AddSentBytes / AddReceivedBytes keeps the
+// two in sync, adding the same byte count to the session counter and to the saved cumulative. So
+// m_totalfunc() already includes m_value, and adding m_value again double-counts the session bytes
+// -- the user-visible #301, where the live UI counts session bytes twice and the post-restart
+// figure drops by exactly one session. Use m_totalfunc() directly for the cumulative slot.
 #ifndef AMULE_DAEMON
 wxString CStatTreeItemUlDlCounter::GetDisplayString() const
 {
 	return CFormat(wxGetTranslation(m_label)) %
-		a_brackets_b(CastItoXBytes(m_value), CastItoXBytes(m_totalfunc()));
+	       a_brackets_b(CastItoXBytes(m_value), CastItoXBytes(m_totalfunc()));
 }
 #endif
 
@@ -366,7 +376,6 @@
 	tag->AddTag(value);
 }
 
-
 /* CStatTreeItemCounterMax */
 
 #ifndef AMULE_DAEMON
@@ -381,14 +390,13 @@
 	tag->AddTag(CECTag(EC_TAG_STAT_NODE_VALUE, (uint64)m_value));
 }
 
-
 /* CStatTreeItemPackets */
 
 #ifndef AMULE_DAEMON
 wxString CStatTreeItemPackets::GetDisplayString() const
 {
 	return CFormat(wxGetTranslation(m_label)) %
-		a_brackets_b(CastItoXBytes(m_bytes), CastItoIShort(m_packets));
+	       a_brackets_b(CastItoXBytes(m_bytes), CastItoIShort(m_packets));
 }
 #endif
 
@@ -402,7 +410,6 @@
 	tag->AddTag(value);
 }
 
-
 /* CStatTreeItemPacketTotals */
 
 #ifndef AMULE_DAEMON
@@ -410,14 +417,15 @@
 {
 	uint32_t tmp_packets = m_packets;
 	uint64_t tmp_bytes = m_bytes;
-	for (std::vector<CStatTreeItemPackets*>::const_iterator it = m_counters.begin();
-	     it != m_counters.end(); ++it) {
+	for (std::vector<CStatTreeItemPackets *>::const_iterator it = m_counters.begin();
+		it != m_counters.end();
+		++it) {
 		tmp_packets += (*it)->m_packets;
 		tmp_bytes += (*it)->m_bytes;
 	}
 
 	return CFormat(wxGetTranslation(m_label)) %
-		a_brackets_b(CastItoXBytes(tmp_bytes), CastItoIShort(tmp_packets));
+	       a_brackets_b(CastItoXBytes(tmp_bytes), CastItoIShort(tmp_packets));
 }
 #endif
 
@@ -425,8 +433,9 @@
 {
 	uint32_t tmp_packets = m_packets;
 	uint64_t tmp_bytes = m_bytes;
-	for (std::vector<CStatTreeItemPackets*>::const_iterator it = m_counters.begin();
-	     it != m_counters.end(); ++it) {
+	for (std::vector<CStatTreeItemPackets *>::const_iterator it = m_counters.begin();
+		it != m_counters.end();
+		++it) {
 		tmp_packets += (*it)->m_packets;
 		tmp_bytes += (*it)->m_bytes;
 	}
@@ -439,26 +448,22 @@
 	tag->AddTag(value);
 }
 
-
 /* CStatTreeItemTimer */
 
 #ifndef AMULE_DAEMON
 wxString CStatTreeItemTimer::GetDisplayString() const
 {
-	return CFormat(wxGetTranslation(m_label)) %
-		CastSecondsToHM(m_value ? GetTimerSeconds() : 0);
+	return CFormat(wxGetTranslation(m_label)) % CastSecondsToHM(m_value ? GetTimerSeconds() : 0);
 }
 #endif
 
 void CStatTreeItemTimer::AddECValues(CECTag *tag) const
 {
-	CECTag value(EC_TAG_STAT_NODE_VALUE,
-		m_value ? (uint32)GetTimerSeconds() : (uint32)0);
+	CECTag value(EC_TAG_STAT_NODE_VALUE, m_value ? (uint32)GetTimerSeconds() : (uint32)0);
 	value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_TIME));
 	tag->AddTag(value);
 }
 
-
 /* CStatTreeItemAverage */
 
 #ifndef AMULE_DAEMON
@@ -466,15 +471,15 @@
 {
 	if ((*m_divisor) != 0) {
 		switch (m_displaymode) {
-			case dmBytes:
-				return CFormat(wxGetTranslation(m_label)) %
-					CastItoXBytes((*m_dividend)/(*m_divisor));
-			case dmTime:
-				return CFormat(wxGetTranslation(m_label)) %
-					CastSecondsToHM((*m_dividend)/(*m_divisor));
-			default:
-				return CFormat(wxGetTranslation(m_label)) %
-					(CFormat("%u") % ((uint64)(*m_dividend)/(*m_divisor))).GetString();
+		case dmBytes:
+			return CFormat(wxGetTranslation(m_label)) %
+			       CastItoXBytes((*m_dividend) / (*m_divisor));
+		case dmTime:
+			return CFormat(wxGetTranslation(m_label)) %
+			       CastSecondsToHM((*m_dividend) / (*m_divisor));
+		default:
+			return CFormat(wxGetTranslation(m_label)) %
+			       (CFormat("%u") % ((uint64)(*m_dividend) / (*m_divisor))).GetString();
 		}
 	} else {
 		return CFormat(wxGetTranslation(m_label)) % "-";
@@ -485,7 +490,7 @@
 void CStatTreeItemAverage::AddECValues(CECTag *tag) const
 {
 	if ((*m_divisor) != 0) {
-		uint64 data = (*m_dividend)/(*m_divisor);
+		uint64 data = (*m_dividend) / (*m_divisor);
 		if (m_displaymode == dmTime) {
 			CECTag value(EC_TAG_STAT_NODE_VALUE, (uint32)data);
 			value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_TIME));
@@ -504,7 +509,6 @@
 	}
 }
 
-
 /* CStatTreeItemAverageSpeed */
 
 #ifndef AMULE_DAEMON
@@ -512,7 +516,7 @@
 {
 	uint64 time = m_timer->GetTimerSeconds();
 	if (time) {
-		return CFormat(wxGetTranslation(m_label)) % CastItoSpeed((*m_counter)/time);
+		return CFormat(wxGetTranslation(m_label)) % CastItoSpeed((*m_counter) / time);
 	} else {
 		return CFormat(wxGetTranslation(m_label)) % CastItoSpeed(0);
 	}
@@ -523,7 +527,7 @@
 {
 	uint64 time = m_timer->GetTimerSeconds();
 	if (time) {
-		CECTag value(EC_TAG_STAT_NODE_VALUE, (uint32)((*m_counter)/time));
+		CECTag value(EC_TAG_STAT_NODE_VALUE, (uint32)((*m_counter) / time));
 		value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_SPEED));
 		tag->AddTag(value);
 	} else {
@@ -533,40 +537,38 @@
 	}
 }
 
-
 /* CStatTreeItemRatio */
 
-wxString CStatTreeItemRatio::GetString() const
+wxString CStatTreeItemRatio::GetString(bool cLocale) const
 {
+	// Number formatter: C-locale (period, locale-independent) for the EC/API
+	// wire, or CFormat (honours LC_NUMERIC) for GUI display.
+	const auto num = cLocale(double d) -> wxString {
+		return cLocale ? wxString::FromCDouble(d, 2) : (CFormat(wxT("%.2f")) % d).GetString();
+	};
+
 	wxString ret;
-	double v1 = m_counter1->GetValue();
-	double v2 = m_counter2->GetValue();
+	double v1 = static_cast<double>(m_counter1->GetValue());
+	double v2 = static_cast<double>(m_counter2->GetValue());
 	if (v1 > 0 && v2 > 0) {
-		if (v2 < v1) {
-			ret = CFormat("%.2f : 1") % (v1 / v2);
-		} else {
-			ret = CFormat("1 : %.2f") % (v2 / v1);
-		}
+		ret = (v2 < v1) ? num(v1 / v2) + wxT(" : 1") : wxT("1 : ") + num(v2 / v1);
 	} else {
-		ret = _("Not available");
+		// English on the wire (client translates); localised for the GUI.
+		ret = cLocale ? wxString(wxTRANSLATE("Not available")) : _("Not available");
 	}
-	
+
 	// show the total ratio
 	if (m_totalfunc1 && m_totalfunc2) {
-		double t1 = m_totalfunc1() + v1;
-		double t2 = m_totalfunc2() + v2;
-		// Guard against fresh-install / zero-history cases. Without
-		// this, t1/t2 or t2/t1 divides by zero and the UI surfaces
-		// "(1 : nan)" or "(1 : inf)".
+		double t1 = static_cast<double>(m_totalfunc1()) + v1;
+		double t2 = static_cast<double>(m_totalfunc2()) + v2;
+		// Guard against fresh-install / zero-history cases. Without it, t1/t2 or t2/t1
+		// divides by zero and the UI shows "(1 : nan)" or "(1 : inf)".
 		if (t1 > 0 && t2 > 0) {
-			if (t2 < t1) {
-				ret += CFormat(" (%.2f : 1)") % (t1 / t2);
-			} else {
-				ret += CFormat(" (1 : %.2f)") % (t2 / t1);
-			}
+			ret += (t2 < t1) ? wxT(" (") + num(t1 / t2) + wxT(" : 1)")
+					 : wxT(" (1 : ") + num(t2 / t1) + wxT(")");
 		}
 	}
-	
+
 	return ret;
 }
 
@@ -579,11 +581,36 @@
 
 void CStatTreeItemRatio::AddECValues(CECTag *tag) const
 {
-	CECTag value(EC_TAG_STAT_NODE_VALUE, GetString());
+	// API contract: English text, C-locale numbers. GetString(false) formats via CFormat
+	// (honouring LC_NUMERIC) and translates "Not available" at the daemon locale, so the wire
+	// value uses GetString(true) instead. The GUI path (GetDisplayString -> GetString()) is
+	// unaffected.
+	const double v1 = static_cast<double>(m_counter1->GetValue());
+	const double v2 = static_cast<double>(m_counter2->GetValue());
+	CECTag value(EC_TAG_STAT_NODE_VALUE, GetString(true));
 	value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_STRING));
+	// Same guard as GetString(): with no session ratio the value is the "Not available"
+	// sentinel, so tag it with a locale-independent token. The English string above stays for
+	// GUI/legacy consumers, which ignore this sub-tag.
+	if (!(v1 > 0 && v2 > 0)) {
+		value.AddTag(CECTag(EC_TAG_STAT_VALUE_ENUM, wxString(wxT("not_available"))));
+	}
 	tag->AddTag(value);
-}
 
+	// Raw numeric ratios (download-per-upload, i.e. received/sent) so API clients need not
+	// parse the composite string above. Distinct tag names, so the display formatter and legacy
+	// consumers ignore them. Same guards as GetString(): only emitted when both sides are > 0.
+	if (v1 > 0 && v2 > 0) {
+		tag->AddTag(CECTag(EC_TAG_STAT_NODE_RATIO, v2 / v1));
+	}
+	if (m_totalfunc1 && m_totalfunc2) {
+		double t1 = static_cast<double>(m_totalfunc1()) + v1;
+		double t2 = static_cast<double>(m_totalfunc2()) + v2;
+		if (t1 > 0 && t2 > 0) {
+			tag->AddTag(CECTag(EC_TAG_STAT_NODE_RATIO_TOTAL, t2 / t1));
+		}
+	}
+}
 
 /* CStatTreeItemReconnects */
 
@@ -596,8 +623,7 @@
 
 void CStatTreeItemReconnects::AddECValues(CECTag *tag) const
 {
-	tag->AddTag(CECTag(EC_TAG_STAT_NODE_VALUE,
-		m_value ? (uint64)(m_value - 1) : (uint64)0));
+	tag->AddTag(CECTag(EC_TAG_STAT_NODE_VALUE, m_value ? (uint64)(m_value - 1) : (uint64)0));
 }
 
 /* CStatTreeItemMaxConnLimitReached */
@@ -607,7 +633,7 @@
 {
 	if (m_count) {
 		return CFormat(wxGetTranslation(m_label)) %
-			(CFormat("%i : %s %s") % m_count % m_time.FormatISODate() % m_time.FormatISOTime());
+		       (CFormat("%i : %s %s") % m_count % m_time.FormatISODate() % m_time.FormatISOTime());
 	} else {
 		return CFormat(wxGetTranslation(m_label)) % _("Never");
 	}
@@ -617,6 +643,7 @@
 void CStatTreeItemMaxConnLimitReached::AddECValues(CECTag *tag) const
 {
 	wxString result;
+	const bool never = (m_count == 0);
 	if (m_count) {
 		result = CFormat("%i : %s %s") % m_count % m_time.FormatISODate() % m_time.FormatISOTime();
 	} else {
@@ -624,6 +651,11 @@
 	}
 	CECTag value(EC_TAG_STAT_NODE_VALUE, result);
 	value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_STRING));
+	// Additive, locale-independent token for the sentinel. The English display string above
+	// stays for GUI/legacy consumers, which ignore this sub-tag.
+	if (never) {
+		value.AddTag(CECTag(EC_TAG_STAT_VALUE_ENUM, wxString(wxT("never"))));
+	}
 	tag->AddTag(value);
 }
 
@@ -632,19 +664,16 @@
 #ifndef AMULE_DAEMON
 wxString CStatTreeItemTotalClients::GetDisplayString() const
 {
-	return CFormat(wxGetTranslation(m_label)) %
-		(m_known->GetValue() + m_unknown->GetValue()) %
-		m_known->GetValue();
+	return CFormat(wxGetTranslation(m_label)) % (m_known->GetValue() + m_unknown->GetValue()) %
+	       m_known->GetValue();
 }
 #endif
 
 void CStatTreeItemTotalClients::AddECValues(CECTag *tag) const
 {
-	CECTag value1(EC_TAG_STAT_NODE_VALUE,
-		(uint64)(m_known->GetValue() + m_unknown->GetValue()));
+	CECTag value1(EC_TAG_STAT_NODE_VALUE, (uint64)(m_known->GetValue() + m_unknown->GetValue()));
 	tag->AddTag(value1);
-	CECTag value2(EC_TAG_STAT_NODE_VALUE,
-		(uint64)m_known->GetValue());
+	CECTag value2(EC_TAG_STAT_NODE_VALUE, (uint64)m_known->GetValue());
 	tag->AddTag(value2);
 }

amule-3.0.1.tar.gz/src/StatTree.h -> amule-3.1.0.tar.gz/src/StatTree.h Changed

@@ -29,55 +29,47 @@
 /**
  * @file StatTree.h
  *
- * Interface to stat tree nodes.
- *
- * This file defines various classes representing
- * statistics tree nodes.
+ * Classes representing statistics tree nodes.
  */
 
-
 #ifndef CLIENT_GUI
-#	define VIRTUAL virtual
+#define VIRTUAL virtual
 #else
-#	define VIRTUAL
+#define VIRTUAL
 #endif
 
-
-#include <list>			// Needed for std::list
-#include <wx/string.h>		// Needed for wxString
-#include <wx/thread.h>		// Needed for wxMutex
+#include <list>        // Needed for std::list
+#include <wx/string.h> // Needed for wxString
+#include <wx/thread.h> // Needed for wxMutex
 #include "Types.h"
 
 #ifndef CLIENT_GUI
 
-#include <wx/datetime.h>	// Needed for wxDateTime
-#include "GetTickCount.h"	// Needed for GetTickCount64()
+#include <wx/datetime.h>  // Needed for wxDateTime
+#include "GetTickCount.h" // Needed for GetTickCount64()
 
-
-/**
- * Stat tree flags
- */
+/** Stat tree flags */
 enum EStatTreeFlags
 {
-	stNone		= 0,		///< Nothing. Really.
-	stSortChildren	= 1,		///< Childrens are sorted descending by their ID.
-	stShowPercent	= 2,		/*!< Shows percentage compared to parent.
-					 *   Counters only, whose parent is also counter! (khmm...)
-					 */
-	stHideIfZero	= 4,		///< Hides item (and children) if value is zero.
-	stSortByValue	= 8,		/*!< Together with stSortChildren, sorts children by their value.
-					 *   WARNING! This assumes that value-sorted children are
-					 *   counters!
-					 *   Sort-by-value works only on children with ID between 0x00000100-0x7fffffff.
-					 *   @note CStatTreeItemBase::ReSortChildren() must be called to get sort order right.
-					 */
-	stCapChildren	= 16		///< Caps children list.
-					/*!< Shows only top n children, where n is set by CStatisticsDlg::FillTree() to thePrefs::GetMaxClientVersions().
-					 *   The list itself is not changed, only visibility is ignored on items
-					 *   outside the top n visible.
-					 *
-					 *   On an EC request, visibility range can be set with the EC_TAG_STATTREE_CAPPING tag.
-					 */
+	stNone = 0,         ///< Nothing. Really.
+	stSortChildren = 1, ///< Childrens are sorted descending by their ID.
+	stShowPercent = 2,  /*!< Shows percentage compared to parent.
+			     *   Counters only, whose parent is also counter! (khmm...)
+			     */
+	stHideIfZero = 4,   ///< Hides item (and children) if value is zero.
+	stSortByValue =
+		8,         /*!< Together with stSortChildren, sorts children by their value.
+			    *   WARNING! This assumes that value-sorted children are
+			    *   counters!
+			    *   Sort-by-value works only on children with ID between 0x00000100-0x7fffffff.
+			    *   @note CStatTreeItemBase::ReSortChildren() must be called to get sort order right.
+			    */
+	stCapChildren = 16 ///< Caps children list.
+			   /*!< Shows only the top n children, where n is set by
+			    * CStatisticsDlg::FillTree() to thePrefs::GetMaxClientVersions(). The list
+			    * itself is not changed, only visibility. On an EC request the range comes
+			    * from the EC_TAG_STATTREE_CAPPING tag.
+			    */
 };
 
 enum EValueType
@@ -88,234 +80,210 @@
 	vtFloat
 };
 
-/**
- * Display modes for Simple and Counter items
- */
+/** Display modes for Simple and Counter items */
 enum EDisplayMode
 {
-	dmDefault,		///< Default display mode.
-	dmTime,			///< Treat integer value as time in seconds.
-	dmBytes			///< Treat integer value as bytes count.
+	dmDefault, ///< Default display mode.
+	dmTime,    ///< Treat integer value as time in seconds.
+	dmBytes    ///< Treat integer value as bytes count.
 };
 
 #endif /* !CLIENT_GUI */
 
-
 class CStatTreeItemBase;
-typedef std::list<CStatTreeItemBase*>::iterator	StatTreeItemIterator;
-
+typedef std::list<CStatTreeItemBase *>::iterator StatTreeItemIterator;
 
 class CECTag;
 
 uint32_t NewStatTreeItemId();
 
-
-/**
- * Base tree item class
- */
+/** Base tree item class */
 class CStatTreeItemBase
 {
 public:
-
 #ifndef CLIENT_GUI
 	/**
 	 * Creates an item with a constant label.
 	 *
-	 * @param label	Visible text for the item.
+	 * @param label Visible text for the item.
 	 * @param flags Flags to use.
 	 */
 	CStatTreeItemBase(const wxString &label, unsigned flags = stNone)
-		: m_label(label), m_parent(NULL), m_flags(flags), m_id(0),
-		m_visible_counter(0), m_uniqueid(NewStatTreeItemId())
-		{}
+	: m_label(label)
+	, m_parent(NULL)
+	, m_flags(flags)
+	, m_id(0)
+	, m_visible_counter(0)
+	, m_uniqueid(NewStatTreeItemId())
+	{
+	}
 #else
-	/**
-	 * Creates an item with a constant label.
-	 *
-	 * @param label	Visible text for the item.
-	 */
+	/** Creates an item with a constant label. */
 	CStatTreeItemBase(const wxString &label, uint32_t uniqueid)
-		: m_label(label), m_uniqueid(uniqueid)
-		{}
+	: m_label(label)
+	, m_uniqueid(uniqueid)
+	{
+	}
 
-	/**
-	 * Creates an item (and the whole subtree) from an EC tag.
-	 *
-	 * @param tag EC tag containing a stat subtree.
-	 */
+	/** Creates an item (and the whole subtree) from an EC tag. */
 	CStatTreeItemBase(const CECTag *tag);
 #endif
 
-	/**
-	 * Deletes all children.
-	 */
-	VIRTUAL	~CStatTreeItemBase();
+	VIRTUAL ~CStatTreeItemBase();
 
 #ifndef CLIENT_GUI
 	/**
-	 * Adds a new child node.
-	 *
-	 * @param child child to add.
-	 * @param id	an optional ID for the new item.
-	 * @param skipOneLevel activates a trick to let the code work for aMule OSInfo and Version trees.
+	 * Adds a new child node and returns it.
 	 *
-	 * @return the newly added item.
+	 * @param skipOneLevel activates a trick to let the code work for aMule OSInfo and
+	 * Version trees.
 	 */
-	CStatTreeItemBase *AddChild(
-		CStatTreeItemBase* child,
-		uint32_t id = 0,
-		bool skipOneLevel = false);
-#endif
+	CStatTreeItemBase *AddChild(CStatTreeItemBase *child, uint32_t id = 0, bool skipOneLevel = false);
 
 	/**
-	 * Check for children.
-	 *
-	 * @return true if this node has children, false otherwise.
+	 * Assigns a stable, untranslated machine key to this node, emitted over EC
+	 * (EC_TAG_STAT_NODE_KEY) so API clients can look a field up by a fixed identifier
+	 * instead of matching the translated/formatted label. An empty key means "no key"
+	 * and omits the tag. Returns this node, so the call can be chained onto a
+	 * freshly-constructed item: AddChild(new CStatTreeItemFoo(...)->SetKey("foo")).
 	 */
-	bool HasChildren() { wxMutexLocker lock(m_lock); return !m_children.empty(); }
+	CStatTreeItemBase *SetKey(const wxString &key)
+	{
+		m_key = key;
+		return this;
+	}
+
+	const wxString &GetKey() const { return m_key; }
 
 	/**
-	 * Check for visible children.
-	 *
-	 * @return true if this node has children and at least one of them is visible.
+	 * Attaches a raw, untranslated machine value for a node whose label is data (a
+	 * client version or OS string). Serialized as EC_TAG_STAT_NODE_RAW so API clients
+	 * need not parse it out of the composite label. Empty means "none" and omits the
+	 * tag. Returns this node, so the call can be chained.
 	 */
+	CStatTreeItemBase *SetRawValue(const wxString &raw)
+	{
+		m_rawvalue = raw;
+		return this;
+	}
+
+	const wxString &GetRawValue() const { return m_rawvalue; }
+#endif
+
+	bool HasChildren()
+	{
+		wxMutexLocker lock(m_lock);
+		return !m_children.empty();
+	}
+
+	/** @return true if this node has children and at least one of them is visible. */
 	bool HasVisibleChildren();
 
 #ifndef CLIENT_GUI
 
-	/**
-	 * Check for a given child.
-	 *
-	 * @return true if this node has a child with the given ID.
-	 */
+	/** @return true if this node has a child with the given ID. */
 	bool HasChildWithId(uint32_t id);
 
-	/**
-	 * Access a specific child.
-	 *
-	 * @return the child with the given ID, or NULL if not found.
-	 */
+	/** @return the child with the given ID, or NULL if not found. */
 	CStatTreeItemBase *GetChildById(uint32_t id);
 
 	/**
 	 * Get the first visible child.
 	 *
-	 * @param max_children The maximum number of children to show, when the stCapChildren flag is set. Otherwise it has no effect. (0 = unlimited)
-	 *
-	 * @return An iterator, that should be passed to GetNextVisibleChild() and IsAtEndOfList().
+	 * @param max_children The maximum number of children to show when the stCapChildren
+	 * flag is set; no effect otherwise (0 = unlimited).
+	 * @return An iterator, to be passed to GetNextVisibleChild() and IsAtEndOfList().
 	 */
 	StatTreeItemIterator GetFirstVisibleChild(uint32_t max_children);
 
-	/**
-	 * Get the next visible child.
-	 */
-	void GetNextVisibleChild(StatTreeItemIterator& it);
+	void GetNextVisibleChild(StatTreeItemIterator &it);
 
 #else /* CLIENT_GUI */
 
 	/**
-	 * Get the first visible child.
-	 *
-	 * @return An iterator, that should be passed to GetNextVisibleChild() and IsAtEndOfList().
-	 *
+	 * @return An iterator, to be passed to GetNextVisibleChild() and IsAtEndOfList().
 	 * @note On a remote list every item is visible.
 	 */
 	StatTreeItemIterator GetFirstVisibleChild() { return m_children.begin(); }
 
-	/**
-	 * Get the next visible child.
-	 *
-	 * @note On a remote list every item is visible.
-	 */
-	void GetNextVisibleChild(StatTreeItemIterator& it) { ++it; }
+	/** @note On a remote list every item is visible. */
+	void GetNextVisibleChild(StatTreeItemIterator &it) { ++it; }
 
 #endif /* !CLIENT_GUI / CLIENT_GUI */
 
-	/**
-	 * Check if we are past the end of child list.
-	 */
-	bool IsAtEndOfList(StatTreeItemIterator& it) { return it == m_children.end(); }
+	/** Check if we are past the end of the child list. */
+	bool IsAtEndOfList(StatTreeItemIterator &it) { return it == m_children.end(); }
 
 #ifndef CLIENT_GUI
-	/**
-	 * Resorts children for the stSortByValue flag.
-	 */
-	void ReSortChildren() { wxMutexLocker lock(m_lock); m_children.sort(ValueSort); }
+	/** Resorts children for the stSortByValue flag. */
+	void ReSortChildren()
+	{
+		wxMutexLocker lock(m_lock);
+		m_children.sort(ValueSort);
+	}
 #endif
 
 #ifndef AMULE_DAEMON
 #ifndef CLIENT_GUI
-	/**
-	 * Returns a string that will be displayed on the GUI tree.
-	 */
-	virtual	wxString GetDisplayString() const;
+	/** Returns a string that will be displayed on the GUI tree. */
+	virtual wxString GetDisplayString() const;
 #else
-	/**
-	 * Returns the associated text (GUI item label).
-	 */
-	const wxString& GetDisplayString() const { return m_label; }
+	/** Returns the associated text (GUI item label). */
+	const wxString &GetDisplayString() const { return m_label; }
 #endif /* !CLIENT_GUI / CLIENT_GUI */
 
 	/**
-	 * Returns the mutex used to lock the child list of this node.
-	 *
-	 * This function is used by CStatisticsDlg to be able to lock the
+	 * Returns the mutex locking this node's child list, so CStatisticsDlg can lock the
 	 * core tree while updating the GUI tree.
 	 */
-	wxMutex& GetLock() { return m_lock; }
+	wxMutex &GetLock() { return m_lock; }
 
-	/**
-	 * Returns the unique ID of this node.
-	 */
+	/** Returns the unique ID of this node. */
 	uint32_t GetUniqueId() const { return m_uniqueid; }
 #endif /* !AMULE_DAEMON */
 
-	/**
-	 * Check whether this node is visible.
-	 */
-	VIRTUAL	bool IsVisible() const { return true; }
+	VIRTUAL bool IsVisible() const { return true; }
 
 #ifndef CLIENT_GUI
 	/**
-	 * Create an EC tag from this node (and children).
+	 * Create an EC tag from this node and its children.
 	 *
-	 * @param max_children The maximum number of children to show, when the stCapChildren flag is set. Otherwise it has no effect. (0 = unlimited)
-	 *
-	 * @return A EC tag containing this node and all its children.
+	 * @param max_children The maximum number of children to show when the stCapChildren
+	 * flag is set; no effect otherwise (0 = unlimited).
 	 */
-	virtual	CECTag *CreateECTag(uint32_t max_children);
+	virtual CECTag *CreateECTag(uint32_t max_children);
 #endif
 
 protected:
-
 #ifndef CLIENT_GUI
 	/**
-	 * Add values to the EC tag being generated.
-	 *
-	 * Should have a real implementation in children which have some value.
-	 * The given parameter is the tag to which values should be added.
+	 * Add values to the EC tag being generated. Children that have a value give this a
+	 * real implementation.
 	 */
-	virtual	void AddECValues(CECTag*) const {}
+	virtual void AddECValues(CECTag *) const {}
 #endif
 
-	//! Unformatted and untranslated label of the node. Note: On remote gui it is already formatted and translated.
+	//! Unformatted and untranslated label of the node. Note: On remote gui it is already formatted and
+	//! translated.
 	const wxString m_label;
 #ifndef CLIENT_GUI
 
-	//! Parent of this node.
 	CStatTreeItemBase *m_parent;
 
-	//! Flags for the node.
 	unsigned m_flags;
+
+	//! Stable, untranslated machine key (empty = none). @see SetKey
+	wxString m_key;
+
+	//! Raw untranslated machine value for data-labelled nodes (empty = none).
+	//! @see SetRawValue
+	wxString m_rawvalue;
 #endif
 
 private:
-
 #ifndef CLIENT_GUI
-	//! Function used when sorting children by value.
-	static bool ValueSort(const CStatTreeItemBase* a, const CStatTreeItemBase* b);
+	static bool ValueSort(const CStatTreeItemBase *a, const CStatTreeItemBase *b);
 
-	//! ID of this node.
 	uint32_t m_id;
 
 	//! Counter to keep track of displayed visible items
@@ -323,284 +291,162 @@
 	uint32_t m_visible_counter;
 #endif
 
-	//! Unique ID of this node.
 	uint32_t m_uniqueid;
 
-	//! Children of this node.
-	std::list<CStatTreeItemBase*>	m_children;
+	std::list<CStatTreeItemBase *> m_children;
 
-	//! Lock to protect list from simultaneous access.
 	wxMutex m_lock;
 };
 
-
-//
 // Anything below is only for core.
-//
 #ifndef CLIENT_GUI
 
 /**
- * Simple tree item.
- *
- * This tree item has one value and nothing speciality. :)
- * The value might be an arbitrary integer or floating point type,
- * or a wxString string.
+ * Simple tree item: one value, of an arbitrary integer or floating point type, or a
+ * wxString. It can display the value in several formats, see SetDisplayMode().
  *
- * The item is able to display value in different formats, see SetDisplayMode().
+ * @note The format code on 'label' has to match: %s for a string and for integers
+ * with displayMode dmTime or dmBytes, %u or similar for integers, %f or similar for
+ * floating point types.
  *
- * @note that you have to specify the right format code on 'label', i.e.:
- * %s for string and integers with displayMode dmTime or dmBytes,
- * %u or similar for integers, and
- * %f or similar for floating point types.
- *
- * @note You have to call SetValue() after creation for non-integer values, otherwise
- * you'll get undesired results.
+ * @note Call SetValue() after creation for non-integer values, or the results are
+ * undesired.
  */
 class CStatTreeItemSimple : public CStatTreeItemBase
 {
 public:
-
-	/**
-	 * Constructor.
-	 *
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 */
 	CStatTreeItemSimple(
-		const wxString &label,
-		unsigned flags = stNone,
-		enum EDisplayMode displaymode = dmDefault)
-	:
-	CStatTreeItemBase(label, flags),
-	m_valuetype(vtUnknown),
-	m_displaymode(displaymode)
+		const wxString &label, unsigned flags = stNone, enum EDisplayMode displaymode = dmDefault)
+	: CStatTreeItemBase(label, flags)
+	, m_valuetype(vtUnknown)
+	, m_displaymode(displaymode)
 	{
 		SetValue((uint64_t)0);
 	}
 
-	/**
-	 * Sets the desired display mode of value.
-	 */
-	void SetDisplayMode(enum EDisplayMode mode)
-	{
-		m_displaymode = mode;
-	}
+	/** Sets the desired display mode of value. */
+	void SetDisplayMode(enum EDisplayMode mode) { m_displaymode = mode; }
 
-	/**
-	 * Sets an integer type value.
-	 *
-	 * @param value the value to be set.
-	 */
+	/** Sets an integer type value. */
 	void SetValue(uint64_t value)
 	{
 		m_valuetype = vtInteger;
 		m_intvalue = value;
 	}
 
-	/**
-	 * Sets a floating point type value.
-	 *
-	 * @param value the value to be set.
-	 */
+	/** Sets a floating point type value. */
 	void SetValue(double value)
 	{
 		m_valuetype = vtFloat;
 		m_floatvalue = value;
 	}
 
-	/**
-	 * Sets a string type value.
-	 *
-	 * @param value the value to be set.
-	 */
-	void SetValue(const wxString& value)
+	/** Sets a string type value. */
+	void SetValue(const wxString &value)
 	{
 		m_valuetype = vtString;
 		m_stringvalue = value;
 	}
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
-	/**
-	 * @see CStatTreeItemBase::IsVisible()
-	 */
-	virtual	bool IsVisible() const;
+	virtual bool IsVisible() const;
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
-	//! Type of the value.
 	enum EValueType m_valuetype;
-	//! Display mode of the value.
 	enum EDisplayMode m_displaymode;
-	//! Union to save space.
 	union
 	{
-		uint64_t m_intvalue;	///< Integer value.
-		double   m_floatvalue;	///< Floating point value.
+		uint64_t m_intvalue; ///< Integer value.
+		double m_floatvalue; ///< Floating point value.
 	};
-	wxString m_stringvalue;	///< String value.
+	wxString m_stringvalue; ///< String value.
 };
 
-
 /**
- * Counter-type tree item template.
- *
- * Able to show percentage compared to parent, hide itself
- * when value is zero, and nice functions for changing the value.
- * stShowPercent and stHideIfZero flags take effect only on
- * this node.
+ * Counter-type tree item template. Able to show a percentage compared to its parent
+ * and to hide itself when the value is zero, plus convenience operators for changing
+ * the value. The stShowPercent and stHideIfZero flags take effect only on this node.
  */
-template<typename _Tp>
-class CStatTreeItemCounterTmpl : public CStatTreeItemBase
+template <typename _Tp> class CStatTreeItemCounterTmpl : public CStatTreeItemBase
 {
 public:
-	/**
-	 * Constructor.
-	 *
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 */
-	CStatTreeItemCounterTmpl(
-		const wxString &label,
-		unsigned flags = stNone)
-	:
-	CStatTreeItemBase(label, flags),
-	m_value(0),
-	m_displaymode(dmDefault) {}
+	CStatTreeItemCounterTmpl(const wxString &label, unsigned flags = stNone)
+	: CStatTreeItemBase(label, flags)
+	, m_value(0)
+	, m_displaymode(dmDefault)
+	{
+	}
 
-	/**
-	 * Retrieve counter value.
-	 */
+	/** Retrieve counter value. */
 	_Tp GetValue() const { return m_value; }
 
-	/**
-	 * Retrieve counter value.
-	 */
 	operator _Tp() const { return m_value; }
 
-	/**
-	 * Set counter to given value.
-	 */
+	/** Set counter to given value. */
 	void SetValue(_Tp value) { m_value = value; }
 
-	/**
-	 * Set counter to given value.
-	 */
 	void operator=(_Tp value) { m_value = value; }
 
-	/**
-	 * Increase value by 1.
-	 */
+	/** Increase value by 1. */
 	void operator++() { ++m_value; }
 
-	/**
-	 * Decrease value by 1.
-	 */
+	/** Decrease value by 1. */
 	void operator--() { --m_value; }
 
-	/**
-	 * Increase value by given amount.
-	 */
+	/** Increase value by given amount. */
 	void operator+=(_Tp value) { m_value += value; }
 
-	/**
-	 * Decrease value by given amount.
-	 */
+	/** Decrease value by given amount. */
 	void operator-=(_Tp value) { m_value -= value; }
 
-	/**
-	 * Sets the desired display mode of value.
-	 */
+	/** Sets the desired display mode of value. */
 	void SetDisplayMode(enum EDisplayMode mode) { m_displaymode = mode; }
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
-	/**
-	 * @see CStatTreeItemBase::IsVisible()
-	 */
-	virtual	bool IsVisible() const
-	{
-		return (m_flags & stHideIfZero) ? (m_value != 0) : true;
-	}
+	virtual bool IsVisible() const { return (m_flags & stHideIfZero) ? (m_value != 0) : true; }
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
-	//! Actual value of the counter.
 	_Tp m_value;
 
-	//! Display mode of the value.
 	enum EDisplayMode m_displaymode;
 };
 
-typedef CStatTreeItemCounterTmpl<uint64_t>	CStatTreeItemCounter;
-typedef CStatTreeItemCounterTmpl<uint32_t>	CStatTreeItemNativeCounter;
-
+typedef CStatTreeItemCounterTmpl<uint64_t> CStatTreeItemCounter;
+typedef CStatTreeItemCounterTmpl<uint32_t> CStatTreeItemNativeCounter;
 
-/**
- * A counter, which does not display its value :P
- */
+/** A counter that does not display its value. */
 class CStatTreeItemHiddenCounter : public CStatTreeItemCounter
 {
 public:
-	/**
-	 * Constructor.
-	 *
-	 * @see CStatTreeItemCounter::CStatTreeItemCounter
-	 */
-	CStatTreeItemHiddenCounter(
-		const wxString &label,
-		unsigned flags = stNone)
-	:
-	CStatTreeItemCounter(label, flags) {}
-
-#ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const
+	CStatTreeItemHiddenCounter(const wxString &label, unsigned flags = stNone)
+	: CStatTreeItemCounter(label, flags)
 	{
-		return CStatTreeItemBase::GetDisplayString();
 	}
+
+#ifndef AMULE_DAEMON
+	// Deliberately calls the grandparent: CStatTreeItemHiddenCounter shows only the
+	// base label and hides the parent CStatTreeItemCounter's count display.
+	// NOLINTNEXTLINE(bugprone-parent-virtual-call)
+	virtual wxString GetDisplayString() const { return CStatTreeItemBase::GetDisplayString(); }
 #endif
 
-	/**
-	 * @see CStatTreeItemBase::IsVisible()
-	 */
 	virtual bool IsVisible() const { return true; }
 
 protected:
-	//! Do nothing here.
-	virtual	void AddECValues(CECTag*) const {}
+	virtual void AddECValues(CECTag *) const {}
 };
 
-
-/**
- * Item for the session/total upload/download counter
- */
+/** Item for the session/total upload/download counter */
 class CStatTreeItemUlDlCounter : public CStatTreeItemCounter
 {
 public:
@@ -608,57 +454,38 @@
 	 * @param label     format text for item.
 	 * @param totalfunc function that will return the totals.
 	 */
-	CStatTreeItemUlDlCounter(
-		const wxString &label,
-		uint64_t (*totalfunc)(),
-		unsigned flags = stNone)
-	:
-	CStatTreeItemCounter(label, flags),
-	m_totalfunc(totalfunc) {}
+	CStatTreeItemUlDlCounter(const wxString &label, uint64_t (*totalfunc)(), unsigned flags = stNone)
+	: CStatTreeItemCounter(label, flags)
+	, m_totalfunc(totalfunc)
+	{
+	}
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
 	//! A function whose return value is the total (without current) value.
 	uint64_t (*m_totalfunc)();
 };
 
-
 /**
- * Counter-like tree item which remembers its max value.
- *
- * Used for active connections counter, to be able to get peak connections.
+ * Counter-like tree item which remembers its max value. Used for the active
+ * connections counter, to get peak connections.
  */
 class CStatTreeItemCounterMax : public CStatTreeItemBase
 {
 public:
-	/**
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 */
 	CStatTreeItemCounterMax(const wxString &label)
-	:
-	CStatTreeItemBase(label),
-	m_value(0),
-	m_max_value(0)
-	{}
+	: CStatTreeItemBase(label)
+	, m_value(0)
+	, m_max_value(0)
+	{
+	}
 
-	/**
-	 * Increase value
-	 */
+	/** Increase value */
 	void operator++()
 	{
 		if (++m_value > m_max_value) {
@@ -666,66 +493,41 @@
 		}
 	}
 
-	/**
-	 * Decrease value
-	 */
+	/** Decrease value */
 	void operator--() { --m_value; }
 
-	/**
-	 * Retrieve actual value
-	 */
+	/** Retrieve actual value */
 	uint32_t GetValue() { return m_value; }
 
-	/**
-	 * Retrieve max value
-	 */
+	/** Retrieve max value */
 	uint32_t GetMaxValue() { return m_max_value; }
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
-	//! Actual value of the counter.
 	uint32_t m_value;
 
-	//! Maximal value the counter has ever reached.
 	uint32_t m_max_value;
 };
 
-
-/**
- * Tree item for counting packets
- */
+/** Tree item for counting packets */
 class CStatTreeItemPackets : public CStatTreeItemBase
 {
 	friend class CStatTreeItemPacketTotals;
 
 public:
-	/**
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 */
 	CStatTreeItemPackets(const wxString &label)
-	:
-	CStatTreeItemBase(label, stNone),
-	m_packets(0),
-	m_bytes(0) {}
+	: CStatTreeItemBase(label, stNone)
+	, m_packets(0)
+	, m_bytes(0)
+	{
+	}
 
-	/**
-	 * Add a packet of size 'size'.
-	 */
+	/** Add a packet of size 'size'. */
 	void operator+=(long size)
 	{
 		++m_packets;
@@ -733,222 +535,126 @@
 	}
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
-	//! Total number of packets.
 	uint32_t m_packets;
 
-	//! Total bytes in the packets.
 	uint64_t m_bytes;
 };
 
-
 /**
- * Tree item for counting totals on packet counters.
- *
- * This item sums up a number of packet counters, plus adds its own values.
+ * Tree item for counting totals on packet counters: sums a number of packet counters
+ * and adds its own values.
  */
 class CStatTreeItemPacketTotals : public CStatTreeItemPackets
 {
 public:
-	/**
-	 * @see CStatTreeItemPackets::CStatTreeItemPackets
-	 */
 	CStatTreeItemPacketTotals(const wxString &label)
-	:
-	CStatTreeItemPackets(label) {}
-
-	/**
-	 * Adds a packet counter, whose values should be counted in the totals.
-	 */
-	void AddPacketCounter(CStatTreeItemPackets* counter)
+	: CStatTreeItemPackets(label)
 	{
-		m_counters.push_back(counter);
 	}
 
+	/** Adds a packet counter whose values should be counted in the totals. */
+	void AddPacketCounter(CStatTreeItemPackets *counter) { m_counters.push_back(counter); }
+
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemPackets::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
-	//! List of packet counters to sum.
-	std::vector<CStatTreeItemPackets*> m_counters;
+	std::vector<CStatTreeItemPackets *> m_counters;
 };
 
-
-/**
- * Tree item for timer type nodes.
- */
+/** Tree item for timer type nodes. */
 class CStatTreeItemTimer : public CStatTreeItemBase
 {
 public:
+	CStatTreeItemTimer(const wxString &label, unsigned flags = stNone)
+	: CStatTreeItemBase(label, flags)
+	, m_value(0)
+	{
+	}
 
-	/**
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 */
-	CStatTreeItemTimer(
-		const wxString &label,
-		unsigned flags = stNone)
-	:
-	CStatTreeItemBase(label, flags),
-	m_value(0) {}
-
-	/**
-	 * Sets timer start time (and thus starts timer).
-	 */
+	/** Sets timer start time (and thus starts the timer). */
 	void SetStartTime(uint64_t value) { m_value = value; }
 
-	/**
-	 * Starts the timer if it's not running.
-	 */
-	void StartTimer() { if (!m_value) m_value = GetTickCount64(); }
+	/** Starts the timer if it is not running. */
+	void StartTimer()
+	{
+		if (!m_value)
+			m_value = GetTickCount64();
+	}
 
-	/**
-	 * Stops the timer.
-	 */
+	/** Stops the timer. */
 	void StopTimer() { m_value = 0; }
 
-	/**
-	 * Check whether the timer is running.
-	 */
+	/** Check whether the timer is running. */
 	bool IsRunning() const { return m_value != 0; }
 
-	/**
-	 * Reset timer unconditionally.
-	 */
+	/** Reset timer unconditionally. */
 	void ResetTimer() { m_value = GetTickCount64(); }
 
-	/**
-	 * Get timer value.
-	 */
-	uint64_t GetTimerValue() const
-	{
-		return m_value ? GetTickCount64() - m_value : 0;
-	}
+	/** Get timer value. */
+	uint64_t GetTimerValue() const { return m_value ? GetTickCount64() - m_value : 0; }
 
-	/**
-	 * Get timer value (in ticks).
-	 */
-	operator uint64_t() const
-	{
-		return m_value ? GetTickCount64() - m_value : 0;
-	}
+	/** Get timer value (in ticks). */
+	operator uint64_t() const { return m_value ? GetTickCount64() - m_value : 0; }
 
-	/**
-	 * Get elapsed time in seconds.
-	 */
-	uint64_t GetTimerSeconds() const
-	{
-		return m_value ? (GetTickCount64() - m_value) / 1000 : 0;
-	}
+	/** Get elapsed time in seconds. */
+	uint64_t GetTimerSeconds() const { return m_value ? (GetTickCount64() - m_value) / 1000 : 0; }
 
-	/**
-	 * Get start time of the timer.
-	 */
+	/** Get start time of the timer. */
 	uint64_t GetTimerStart() const { return m_value; }
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
-	/**
-	 * @see CStatTreeItemBase::IsVisible()
-	 */
-	virtual	bool IsVisible() const
-	{
-		return (m_flags & stHideIfZero) ? m_value != 0 : true;
-	}
+	virtual bool IsVisible() const { return (m_flags & stHideIfZero) ? m_value != 0 : true; }
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
 	//! Tick count value when timer was started.
 	uint64_t m_value;
 };
 
-
 /**
- * Tree item for shared files average size.
- *
- * Average is counted as dividend / divisor, if divisor is non-zero.
+ * Tree item for shared files average size. The average is dividend / divisor, if the
+ * divisor is non-zero.
  */
 class CStatTreeItemAverage : public CStatTreeItemBase
 {
 public:
 	/**
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 *
 	 * @param dividend What to divide.
 	 * @param divisor Divide by what.
 	 */
-	CStatTreeItemAverage(
-		const wxString &label,
+	CStatTreeItemAverage(const wxString &label,
 		const CStatTreeItemCounter *dividend,
 		const CStatTreeItemCounter *divisor,
 		enum EDisplayMode displaymode)
-	:
-	CStatTreeItemBase(label, stNone),
-	m_dividend(dividend),
-	m_divisor(divisor),
-	m_displaymode(displaymode) {}
+	: CStatTreeItemBase(label, stNone)
+	, m_dividend(dividend)
+	, m_divisor(divisor)
+	, m_displaymode(displaymode)
+	{
+	}
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
-	/**
-	 * @see CStatTreeItemBase::IsVisible()
-	 */
-	virtual	bool IsVisible() const	{ return (*m_divisor) != 0; }
+	virtual bool IsVisible() const { return (*m_divisor) != 0; }
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
 	//! What to divide.
 	const CStatTreeItemCounter *m_dividend;
@@ -960,45 +666,29 @@
 	enum EDisplayMode m_displaymode;
 };
 
-
-/**
- * Tree item for average up/down speed.
- */
+/** Tree item for average up/down speed. */
 class CStatTreeItemAverageSpeed : public CStatTreeItemBase
 {
 public:
-
 	/**
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 *
 	 * @param counter Session up/down counter.
 	 * @param timer Session uptime timer.
 	 */
-	CStatTreeItemAverageSpeed(
-		const wxString &label,
+	CStatTreeItemAverageSpeed(const wxString &label,
 		const CStatTreeItemUlDlCounter *counter,
 		const CStatTreeItemTimer *timer)
-	:
-	CStatTreeItemBase(label, stNone),
-	m_counter(counter),
-	m_timer(timer) {}
+	: CStatTreeItemBase(label, stNone)
+	, m_counter(counter)
+	, m_timer(timer)
+	{
+	}
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
 	//! Session sent/received bytes counter.
 	const CStatTreeItemUlDlCounter *m_counter;
@@ -1007,50 +697,35 @@
 	const CStatTreeItemTimer *m_timer;
 };
 
-
 /**
- * Tree item for displaying ratio between two counters.
- *
- * Ratio is counted as counter1:counter2.
+ * Tree item displaying the ratio between two counters, as counter1:counter2.
  */
 class CStatTreeItemRatio : public CStatTreeItemBase
 {
 public:
 	/**
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 *
 	 * @param cnt1 First counter to use.
 	 * @param cnt2 Second counter to use.
 	 */
-	CStatTreeItemRatio(
-		const wxString &label,
+	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_totalfunc1(totalfunc1),
-	m_totalfunc2(totalfunc2){}
+	: CStatTreeItemBase(label, stNone)
+	, m_counter1(cnt1)
+	, m_counter2(cnt2)
+	, m_totalfunc1(totalfunc1)
+	, m_totalfunc2(totalfunc2)
+	{
+	}
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
 	//! First counter.
 	const CStatTreeItemCounter *m_counter1;
@@ -1063,58 +738,40 @@
 	uint64_t (*m_totalfunc2)();
 
 private:
-	//! Formatted String for display or EC
-	wxString GetString() const;
+	//! Formatted "a : b (c : d)" ratio string. cLocale=true renders C-locale
+	//! numbers and an untranslated English "Not available" for the EC/API wire
+	//! (locale-independent); the default renders in the GUI locale for display.
+	wxString GetString(bool cLocale = false) const;
 };
 
-
-/**
- * Special counter for reconnects.
- */
-class CStatTreeItemReconnects : public CStatTreeItemNativeCounter {
+/** Special counter for reconnects. */
+class CStatTreeItemReconnects : public CStatTreeItemNativeCounter
+{
 public:
-	/**
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 */
 	CStatTreeItemReconnects(const wxString &label)
-	:
-	CStatTreeItemNativeCounter(label, stNone) {}
+	: CStatTreeItemNativeCounter(label, stNone)
+	{
+	}
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 };
 
-/**
- * Special item for Max Connection Limit Reached
- */
+/** Special item for Max Connection Limit Reached */
 class CStatTreeItemMaxConnLimitReached : public CStatTreeItemBase
 {
 public:
-	/**
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 */
 	CStatTreeItemMaxConnLimitReached(const wxString &label)
-	:
-	CStatTreeItemBase(label),
-	m_count(0) {}
+	: CStatTreeItemBase(label)
+	, m_count(0)
+	{
+	}
 
-	/**
-	 * Increase counter and save time.
-	 */
+	/** Increase counter and save time. */
 	void operator++()
 	{
 		++m_count;
@@ -1123,24 +780,14 @@
 
 #ifndef AMULE_DAEMON
 	/**
-	 * Returns a string to be displayed on GUI.
-	 *
-	 * For m_count == 0 it will display "Never",
-	 * for other values it will display the counter value and the
-	 * date & time of the event.
+	 * Returns a string to be displayed on the GUI: "Never" for m_count == 0, otherwise
+	 * the counter value plus the date and time of the event.
 	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
 	//! Number of times max conn limit reached.
 	uint32_t m_count;
@@ -1149,43 +796,28 @@
 	wxDateTime m_time;
 };
 
-/**
- * Special item for total client count
- */
+/** Special item for total client count */
 class CStatTreeItemTotalClients : public CStatTreeItemBase
 {
 public:
 	/**
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 *
 	 * @param known Counter that counts known clients.
 	 * @param unknown Counter that counts unknown clients.
 	 */
 	CStatTreeItemTotalClients(
-		const wxString &label,
-		const CStatTreeItemCounter *known,
-		const CStatTreeItemCounter *unknown)
-	:
-	CStatTreeItemBase(label),
-	m_known(known),
-	m_unknown(unknown) {}
+		const wxString &label, const CStatTreeItemCounter *known, const CStatTreeItemCounter *unknown)
+	: CStatTreeItemBase(label)
+	, m_known(known)
+	, m_unknown(unknown)
+	{
+	}
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
-	virtual	wxString GetDisplayString() const;
+	virtual wxString GetDisplayString() const;
 #endif
 
 protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void AddECValues(CECTag *tag) const;
+	virtual void AddECValues(CECTag *tag) const;
 
 	//! Counter counting known clients.
 	const CStatTreeItemCounter *m_known;

amule-3.0.1.tar.gz/src/StateMachine.cpp -> amule-3.1.0.tar.gz/src/StateMachine.cpp Changed

@@ -28,23 +28,18 @@
 #include <common/StringFunctions.h>
 
 CStateMachine::CStateMachine(
-		const wxString &name,
-		const unsigned int maxStates,
-		const t_sm_state initialState )
-:
-m_stateMutex(wxMUTEX_RECURSIVE),
-m_queueMutex(wxMUTEX_RECURSIVE),
-m_name(name),
-m_maxStates(maxStates)
+	const wxString &name, const unsigned int maxStates, const t_sm_state initialState)
+: m_stateMutex(wxMUTEX_RECURSIVE)
+, m_queueMutex(wxMUTEX_RECURSIVE)
+, m_name(name)
+, m_maxStates(maxStates)
 {
 	m_state = initialState;
 	m_clockCounter = 0;
 	m_clocksInCurrentState = 0;
 }
 
-CStateMachine::~CStateMachine()
-{
-}
+CStateMachine::~CStateMachine() {}
 
 void CStateMachine::Clock()
 {
@@ -64,25 +59,22 @@
 
 	/* State changes can only happen here */
 	wxMutexLocker lock(m_stateMutex);
-	m_state = next_state( event );
+	m_state = next_state(event);
 
 	++m_clockCounter;
-	state_entry = ( m_state != old_state ) || ( m_clockCounter == 1 );
-	if( state_entry )
-	{
+	state_entry = (m_state != old_state) || (m_clockCounter == 1);
+	if (state_entry) {
 		m_clocksInCurrentState = 0;
-		// Uncomment here to debug the state machine.
-		// State changes will be printed to stdout.
-		//printf("%s(%04d): %d -> %d\n", (const char *)unicode2char(m_name), m_clockCounter, old_state, m_state);
+		// Uncomment to debug the state machine; state changes print to stdout.
+		// printf("%s(%04d): %d -> %d\n", (const char *)unicode2char(m_name), m_clockCounter,
+		//     old_state, m_state);
 	}
 	++m_clocksInCurrentState;
 
 	/* Process new state entry */
-	if( m_state < m_maxStates )
-	{
-		/* It should be ok to call Clock() recursively inside this
-		 * procedure because state change has already happened. Also
-		 * the m_state mutex is recursive. */
+	if (m_state < m_maxStates) {
+		// Calling Clock() recursively inside this procedure should be fine: the state
+		// change has already happened, and the m_state mutex is recursive.
 		process_state(m_state, state_entry);
 	}
 }

amule-3.0.1.tar.gz/src/StateMachine.h -> amule-3.1.0.tar.gz/src/StateMachine.h Changed

@@ -23,17 +23,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-//
 // Generic state machine implementation
-//
 
 #ifndef STATE_MACHINE_H
 #define STATE_MACHINE_H
 
 #include <queue>
 
-#include <wx/thread.h>		/* For wxMutex, wxMutexLocker	*/
-#include <wx/string.h>		/* For wxString			*/
+#include <wx/thread.h> /* For wxMutex, wxMutexLocker	*/
+#include <wx/string.h> /* For wxString			*/
 
 typedef unsigned int t_sm_state;
 
@@ -42,29 +40,26 @@
 class CStateMachine
 {
 public:
-	CStateMachine(
-		const wxString &name,
-		const unsigned int maxStates,
-		const t_sm_state initialState );
+	CStateMachine(const wxString &name, const unsigned int maxStates, const t_sm_state initialState);
 	virtual ~CStateMachine() = 0;
 	void Clock();
 	void Schedule(t_sm_event event);
-	t_sm_state GetState() const			{ return m_state; }
-	unsigned int GetClocksInCurrentState() const	{ return m_clocksInCurrentState; }
+	t_sm_state GetState() const { return m_state; }
+	unsigned int GetClocksInCurrentState() const { return m_clocksInCurrentState; }
 	virtual t_sm_state next_state(t_sm_event event) = 0;
 	virtual void process_state(t_sm_state state, bool entry) = 0;
 
 private:
 	void flush_queue();
 
-	t_sm_state		m_state;
-	wxMutex			m_stateMutex;
-	std::queue <t_sm_event>	m_queue;
-	wxMutex			m_queueMutex;
-	const wxString		m_name;
-	const unsigned int	m_maxStates;
-	unsigned int		m_clockCounter;
-	unsigned int		m_clocksInCurrentState;
+	t_sm_state m_state;
+	wxMutex m_stateMutex;
+	std::queue<t_sm_event> m_queue;
+	wxMutex m_queueMutex;
+	const wxString m_name;
+	const unsigned int m_maxStates;
+	unsigned int m_clockCounter;
+	unsigned int m_clocksInCurrentState;
 };
 
 #endif // STATE_MACHINE_H

amule-3.0.1.tar.gz/src/Statistics.cpp -> amule-3.1.0.tar.gz/src/Statistics.cpp Changed

@@ -24,45 +24,43 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "Statistics.h"		// Interface declarations
+#include "Statistics.h" // Interface declarations
 
 #include <protocol/ed2k/ClientSoftware.h>
 
-#include <ec/cpp/ECTag.h>		// Needed for CECTag
+#include <ec/cpp/ECTag.h> // Needed for CECTag
 
 #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 "DataToText.h"		// Needed for GetSoftName()
-	#include "ListenSocket.h"	// (tree, GetAverageConnections)
-	#include "ServerList.h"		// Needed for CServerList (tree)
-	#include <cmath>		// Needed for std::floor
-	#include "updownclient.h"	// Needed for CUpDownClient
+#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 "DataToText.h"   // Needed for GetSoftName()
+#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 <ec/cpp/RemoteConnect.h>		// Needed for CRemoteConnect
+#include "GetTickCount.h"         // Needed for GetTickCount64()
+#include <ec/cpp/RemoteConnect.h> // Needed for CRemoteConnect
 #endif
 
-#include "amule.h"		// Needed for theApp
+#include "amule.h" // Needed for theApp
 #include <wx/intl.h>
 #include "Logger.h"
-#include "Preferences.h"	// Needed for thePrefs
+#include "Preferences.h" // Needed for thePrefs
 
 #ifdef __BSD__
-	// glibc -> bsd libc
-	#define round rint
+// glibc -> bsd libc
+#define round rint
 #else
-	#define round(x) floor(x+0.5)
+#define round(x) floor(x + 0.5)
 #endif /* __BSD__ */
 
-
 /*----- CPreciseRateCounter -----*/
-// Shared with CLIENT_GUI: used by the runAvg trend (1) in
-// CStatistics::ComputeAverages, which both builds drive through
-// CStatistics::GetHistory.
+// Shared with CLIENT_GUI: used by the runAvg trend (1) in CStatistics::ComputeAverages, which
+// both builds drive through CStatistics::GetHistory.
 
 void CPreciseRateCounter::CalculateRate(uint64_t now)
 {
@@ -100,7 +98,6 @@
 	}
 }
 
-
 #ifndef CLIENT_GUI
 
 /*----- CStatTreeItemRateCounter -----*/
@@ -108,18 +105,18 @@
 #ifndef AMULE_DAEMON
 wxString CStatTreeItemRateCounter::GetDisplayString() const
 {
-	return CFormat(wxGetTranslation(m_label)) % CastItoSpeed(m_show_maxrate ? (uint32)m_max_rate : (uint32)m_rate);
+	return CFormat(wxGetTranslation(m_label)) %
+	       CastItoSpeed(m_show_maxrate ? (uint32)m_max_rate : (uint32)m_rate);
 }
 #endif
 
-void CStatTreeItemRateCounter::AddECValues(CECTag* tag) const
+void CStatTreeItemRateCounter::AddECValues(CECTag *tag) const
 {
 	CECTag value(EC_TAG_STAT_NODE_VALUE, m_show_maxrate ? (uint32)m_max_rate : (uint32)m_rate);
 	value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_SPEED));
 	tag->AddTag(value);
 }
 
-
 /*----- CStatTreeItemPeakConnections -----*/
 
 #ifndef AMULE_DAEMON
@@ -129,165 +126,155 @@
 }
 #endif
 
-void CStatTreeItemPeakConnections::AddECValues(CECTag* tag) const
+void CStatTreeItemPeakConnections::AddECValues(CECTag *tag) const
 {
 	tag->AddTag(CECTag(EC_TAG_STAT_NODE_VALUE, (uint64)theStats::GetPeakConnections()));
 }
 
-
 /*----- CStatistics -----*/
 
-// Static variables
-
 // Rate counters
-CPreciseRateCounter*		CStatistics::s_upOverheadRate;
-CPreciseRateCounter*		CStatistics::s_downOverheadRate;
-CStatTreeItemRateCounter*	CStatistics::s_uploadrate;
-CStatTreeItemRateCounter*	CStatistics::s_downloadrate;
+CPreciseRateCounter *CStatistics::s_upOverheadRate;
+CPreciseRateCounter *CStatistics::s_downOverheadRate;
+CStatTreeItemRateCounter *CStatistics::s_uploadrate;
+CStatTreeItemRateCounter *CStatistics::s_downloadrate;
 
 #else /* CLIENT_GUI */
 
-uint64	CStatistics::s_start_time;
-uint64	CStatistics::s_statDatasdTotalItems;
+uint64 CStatistics::s_start_time;
+uint64 CStatistics::s_statDatasdTotalItems;
 
 #endif /* !CLIENT_GUI / CLIENT_GUI */
 
 // Tree root
-CStatTreeItemBase*		CStatistics::s_statTree;
+CStatTreeItemBase *CStatistics::s_statTree;
 
 #ifndef CLIENT_GUI
 // Uptime
-CStatTreeItemTimer*		CStatistics::s_uptime;
+CStatTreeItemTimer *CStatistics::s_uptime;
 
 // Upload
-CStatTreeItemUlDlCounter*	CStatistics::s_sessionUpload;
-CStatTreeItemPacketTotals*	CStatistics::s_totalUpOverhead;
-CStatTreeItemPackets*		CStatistics::s_fileReqUpOverhead;
-CStatTreeItemPackets*		CStatistics::s_sourceXchgUpOverhead;
-CStatTreeItemPackets*		CStatistics::s_serverUpOverhead;
-CStatTreeItemPackets*		CStatistics::s_kadUpOverhead;
-CStatTreeItemCounter*		CStatistics::s_cryptUpOverhead;
-CStatTreeItemNativeCounter*	CStatistics::s_activeUploads;
-CStatTreeItemNativeCounter*	CStatistics::s_waitingUploads;
-CStatTreeItemCounter*		CStatistics::s_totalSuccUploads;
-CStatTreeItemCounter*		CStatistics::s_totalFailedUploads;
-CStatTreeItemCounter*		CStatistics::s_totalUploadTime;
+CStatTreeItemUlDlCounter *CStatistics::s_sessionUpload;
+CStatTreeItemPacketTotals *CStatistics::s_totalUpOverhead;
+CStatTreeItemPackets *CStatistics::s_fileReqUpOverhead;
+CStatTreeItemPackets *CStatistics::s_sourceXchgUpOverhead;
+CStatTreeItemPackets *CStatistics::s_serverUpOverhead;
+CStatTreeItemPackets *CStatistics::s_kadUpOverhead;
+CStatTreeItemCounter *CStatistics::s_cryptUpOverhead;
+CStatTreeItemNativeCounter *CStatistics::s_activeUploads;
+CStatTreeItemNativeCounter *CStatistics::s_waitingUploads;
+CStatTreeItemCounter *CStatistics::s_totalSuccUploads;
+CStatTreeItemCounter *CStatistics::s_totalFailedUploads;
+CStatTreeItemCounter *CStatistics::s_totalUploadTime;
 
 // Download
-CStatTreeItemUlDlCounter*	CStatistics::s_sessionDownload;
-CStatTreeItemPacketTotals*	CStatistics::s_totalDownOverhead;
-CStatTreeItemPackets*		CStatistics::s_fileReqDownOverhead;
-CStatTreeItemPackets*		CStatistics::s_sourceXchgDownOverhead;
-CStatTreeItemPackets*		CStatistics::s_serverDownOverhead;
-CStatTreeItemPackets*		CStatistics::s_kadDownOverhead;
-CStatTreeItemCounter*		CStatistics::s_cryptDownOverhead;
-CStatTreeItemCounter*		CStatistics::s_foundSources;
-CStatTreeItemNativeCounter*	CStatistics::s_activeDownloads;
+CStatTreeItemUlDlCounter *CStatistics::s_sessionDownload;
+CStatTreeItemPacketTotals *CStatistics::s_totalDownOverhead;
+CStatTreeItemPackets *CStatistics::s_fileReqDownOverhead;
+CStatTreeItemPackets *CStatistics::s_sourceXchgDownOverhead;
+CStatTreeItemPackets *CStatistics::s_serverDownOverhead;
+CStatTreeItemPackets *CStatistics::s_kadDownOverhead;
+CStatTreeItemCounter *CStatistics::s_cryptDownOverhead;
+CStatTreeItemCounter *CStatistics::s_foundSources;
+CStatTreeItemNativeCounter *CStatistics::s_activeDownloads;
 
 // Connection
-CStatTreeItemReconnects*	CStatistics::s_reconnects;
-CStatTreeItemTimer*		CStatistics::s_sinceFirstTransfer;
-CStatTreeItemTimer*		CStatistics::s_sinceConnected;
-CStatTreeItemCounterMax*	CStatistics::s_activeConnections;
-CStatTreeItemMaxConnLimitReached* CStatistics::s_limitReached;
-CStatTreeItemSimple*		CStatistics::s_avgConnections;
+CStatTreeItemReconnects *CStatistics::s_reconnects;
+CStatTreeItemTimer *CStatistics::s_sinceFirstTransfer;
+CStatTreeItemTimer *CStatistics::s_sinceConnected;
+CStatTreeItemCounterMax *CStatistics::s_activeConnections;
+CStatTreeItemMaxConnLimitReached *CStatistics::s_limitReached;
+CStatTreeItemSimple *CStatistics::s_avgConnections;
 
 // Clients
-CStatTreeItemHiddenCounter*	CStatistics::s_clients;
-CStatTreeItemCounter*		CStatistics::s_unknown;
-//CStatTreeItem			CStatistics::s_lowID;
-//CStatTreeItem			CStatistics::s_secIdentOnOff;
+CStatTreeItemHiddenCounter *CStatistics::s_clients;
+CStatTreeItemCounter *CStatistics::s_unknown;
 #ifdef __DEBUG__
-CStatTreeItemNativeCounter*	CStatistics::s_hasSocket;
+CStatTreeItemNativeCounter *CStatistics::s_hasSocket;
+#endif
+CStatTreeItemNativeCounter *CStatistics::s_filtered;
+CStatTreeItemNativeCounter *CStatistics::s_banned;
+#ifdef ENABLE_KAD_NODE_PROTECTION
+CStatTreeItemNativeCounter *CStatistics::s_kadBanned;
 #endif
-CStatTreeItemNativeCounter*	CStatistics::s_filtered;
-CStatTreeItemNativeCounter*	CStatistics::s_banned;
 
 // Servers
-CStatTreeItemSimple*		CStatistics::s_workingServers;
-CStatTreeItemSimple*		CStatistics::s_failedServers;
-CStatTreeItemNativeCounter*	CStatistics::s_totalServers;
-CStatTreeItemNativeCounter*	CStatistics::s_deletedServers;
-CStatTreeItemNativeCounter*	CStatistics::s_filteredServers;
-CStatTreeItemSimple*		CStatistics::s_usersOnWorking;
-CStatTreeItemSimple*		CStatistics::s_filesOnWorking;
-CStatTreeItemSimple*		CStatistics::s_totalUsers;
-CStatTreeItemSimple*		CStatistics::s_totalFiles;
-CStatTreeItemSimple*		CStatistics::s_serverOccupation;
+CStatTreeItemSimple *CStatistics::s_workingServers;
+CStatTreeItemSimple *CStatistics::s_failedServers;
+CStatTreeItemNativeCounter *CStatistics::s_totalServers;
+CStatTreeItemNativeCounter *CStatistics::s_deletedServers;
+CStatTreeItemNativeCounter *CStatistics::s_filteredServers;
+CStatTreeItemSimple *CStatistics::s_usersOnWorking;
+CStatTreeItemSimple *CStatistics::s_filesOnWorking;
+CStatTreeItemSimple *CStatistics::s_totalUsers;
+CStatTreeItemSimple *CStatistics::s_totalFiles;
+CStatTreeItemSimple *CStatistics::s_serverOccupation;
 
 // Shared files
-CStatTreeItemCounter*		CStatistics::s_numberOfShared;
-CStatTreeItemCounter*		CStatistics::s_sizeOfShare;
+CStatTreeItemCounter *CStatistics::s_numberOfShared;
+CStatTreeItemCounter *CStatistics::s_sizeOfShare;
 
 // Kad
-uint64_t			CStatistics::s_kadNodesTotal;
-uint16_t			CStatistics::s_kadNodesCur;
+uint64_t CStatistics::s_kadNodesTotal;
+uint16_t CStatistics::s_kadNodesCur;
 
 // Totals
-uint64_t			CStatistics::s_totalSent;
-uint64_t			CStatistics::s_totalReceived;
+uint64_t CStatistics::s_totalSent;
+uint64_t CStatistics::s_totalReceived;
 
-bool				CStatistics::s_statsNeedSave;
+// Published by CFreeSpaceThread; unknown until its first sample lands.
+std::atomic<sint64> CStatistics::s_tempFreeSpace{ FREE_SPACE_UNKNOWN };
+std::atomic<sint64> CStatistics::s_incomingFreeSpace{ FREE_SPACE_UNKNOWN };
 
+bool CStatistics::s_statsNeedSave;
 
 CStatistics::CStatistics()
-	: m_graphRunningAvgDown(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true),
-	  m_graphRunningAvgUp(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true),
-	  m_graphRunningAvgKad(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true)
+: m_graphRunningAvgDown(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true)
+, m_graphRunningAvgUp(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true)
+, m_graphRunningAvgKad(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true)
 {
 	uint64 start_time = GetTickCount64();
 
-	// Init graphs
-
 	average_minutes = thePrefs::GetStatsAverageMinutes();
 
-	HR hr = {0.0, 0.0, 0.0, 0.0, 0.0, 0, 0, 0, 0, 0};
+	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))
+	nHistRanges = 7; // =ceil(log(max_update_delay)/log(2))
 	nPointsPerRange = GetPointsPerRange();
-	bitsHistClockMask = (1 << (nHistRanges-1)) - 1;
+	bitsHistClockMask = (1 << (nHistRanges - 1)) - 1;
 	aposRecycle = new listPOSnHistRanges;
-	listPOS *ppos = aposRecycle+nHistRanges-1;
-	for (int i=nHistRanges; i>0; --i) {  // permanently allocated history list
+	listPOS *ppos = aposRecycle + nHistRanges - 1;
+	for (int i = nHistRanges; i > 0; --i) { // permanently allocated history list
 		listHR.push_back(hr);
 		*ppos-- = --listHR.end();
-		for (int j=nPointsPerRange; j>1; --j)
+		for (int j = nPointsPerRange; j > 1; --j)
 			listHR.push_back(hr);
 	}
 
-	// Init rate counters outside the tree
-
 	s_upOverheadRate = new CPreciseRateCounter(5000);
 	s_downOverheadRate = new CPreciseRateCounter(5000);
 
-	// Init Tree
-
 	InitStatsTree();
 	s_uptime->SetStartTime(start_time);
 
-	// Load saved statistics
 	Load();
 	s_statsNeedSave = false;
 }
 
-
 CStatistics::~CStatistics()
 {
 	// clearing listHR frees the memory occupied by the nodes
 	listHR.clear();
-	delete  aposRecycle;
+	delete aposRecycle;
 
 	delete s_statTree;
 
-	// delete items not in the tree
 	delete s_totalUploadTime;
 
-	// delete rate counters outside the tree
 	delete s_upOverheadRate;
 	delete s_downOverheadRate;
 }
 
-
 void CStatistics::Load()
 {
 	CFile f;
@@ -303,23 +290,29 @@
 				s_totalReceived = f.ReadUInt64();
 			}
 		}
-	} catch (const CSafeIOException& e) {
+	} catch (const CSafeIOException &e) {
 		AddLogLineN(e.what());
 	}
 }
 
-
 void CStatistics::Save()
 {
 	if (s_statsNeedSave) {
 		CFile f;
 
-		if (f.Open(JoinPaths(thePrefs::GetConfigDir(), "statistics.dat"), CFile::write)) {
-			f.WriteUInt8(0);	/* version */
-			f.WriteUInt64(s_totalSent);
-			f.WriteUInt64(s_totalReceived);
+		try {
+			if (f.Open(JoinPaths(thePrefs::GetConfigDir(), "statistics.dat"), CFile::write)) {
+				f.WriteUInt8(0); /* version */
+				f.WriteUInt64(s_totalSent);
+				f.WriteUInt64(s_totalReceived);
+				// Explicit so a buffered write error surfaces here, not in the destructor.
+				f.Close();
+			}
+			s_statsNeedSave = false;
+		} catch (const CIOFailureException &e) {
+			// Leave s_statsNeedSave set so the next tick retries.
+			AddDebugLogLineC(logGeneral, "IO failure while saving statistics: " + e.what());
 		}
-		s_statsNeedSave = false;
 	}
 }
 
@@ -332,75 +325,63 @@
 	s_uploadrate->CalculateRate(now);
 }
 
-
-
 /* ------------------------------- 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
-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
-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.
-*/
+ * History list.
+ *
+ * We want to keep as much history as possible without paying much memory for it. Since the history
+ * exists for display, we can exploit the fact that a long period shown in the graphs means each
+ * pixel covers a long period: the most recent history is one window of points at 1 second
+ * resolution, the next window at 2 seconds, the next at 4, and so on up to the maximum. That gives
+ * at least one sample point per pixel for any update delay the user sets, while memory grows with
+ * the *log* of the total period covered.
+ *
+ * The history is a doubly-linked list with the most recent snapshot at the tail. The node count is
+ * fixed, and there are no RemoveHead()/AddTail() calls, which would add overhead and fragment
+ * memory. Instead each second, when a new point is recorded, an existing node is recycled: detached
+ * from its place, put at the tail, then filled with new data. Emilio Sandoz This unfortunately
+ * does not work with stl classes, none of which supports moving a node, so we erase and re-add.
+ */
 
 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
-	// 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
-	// 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
-	// 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) --^
-	^                                                         ^
-    aposRecyclenHistRanges-1               ...              aposRecycle0  Tail
-*/
-	listPOS		*ppos;
-	static int	iClock;
-	int		iClockPrev = iClock++;
-	int		bits = (iClockPrev^iClock) & iClock;  // identify the highest changed bit
+{ // First we query and compute some values, then we store them in the history list
+
+	// Timestamps and Kbyte counts are stored in the history as doubles, computed values as
+	// float. A float's 24 bits are more than enough for anything the graphs display, but rate
+	// and running-average computations work on differences (delta bytes / delta time), and for
+	// long uptimes the large mantissa of a timestamp or cumulative byte count drops too many
+	// significant bits. They are not kept as integers because the conversion would then happen
+	// on every use.
+
+	/*
+		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) --^
+		^                                                         ^
+	    aposRecyclenHistRanges-1               ...              aposRecycle0  Tail
+	*/
+	listPOS *ppos;
+	static int iClock;
+	int iClockPrev = iClock++;
+	int bits = (iClockPrev ^ iClock) & iClock; // identify the highest changed bit
 	if (bits <= bitsHistClockMask) {
 		ppos = aposRecycle;
-		while ((bits /= 2) != 0)  // count to the highest bit that was just toggled to 1
+		while ((bits /= 2) != 0) // count to the highest bit that was just toggled to 1
 			++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);
 	} else {
-		ppos = aposRecycle+nHistRanges-1;
+		ppos = aposRecycle + nHistRanges - 1;
 		// recycle the node at the head; there is no higher range to move nodes into
 		listHR.push_back(**ppos);
 		*ppos = listHR.erase(*ppos);
@@ -422,20 +403,26 @@
 	phr->kadNodesCur = s_kadNodesCur;
 }
 
-
 #endif // !CLIENT_GUI -- GetHistory + ComputeAverages are shared with
        // CLIENT_GUI's CStatistics so COScopeCtrl::PlotHistory has a
        // single implementation for both builds.
 
-unsigned CStatistics::GetHistory(	// Assemble arrays of sample points for a graph
-	unsigned cntPoints,		// number of sample points to assemble
-	double sStep,			// time difference between sample points
-	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
+unsigned CStatistics::GetHistory(        // Assemble arrays of sample points for a graph
+	unsigned cntPoints,              // number of sample points to assemble
+	double sStep,                    // time difference between sample points
+	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);
+	if (sStep == 0.0 || cntPoints == 0) {
+		return (0);
+	}
+
+	// CLIENT_GUI builds start with an empty list, unlike the monolithic constructor which pre-
+	// allocates every record, and the rbegin() below is dereferenced before the rend() test --
+	// so a paint arriving before the first graph reply would read an invalid iterator.
+	if (listHR.empty()) {
+		return (0);
 	}
 
 	float *pf1 = ppf0;
@@ -446,19 +433,17 @@
 
 	// 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;
+	double sTarget;
 	if (sFinal >= 0.0) {
 		sTarget = sFinal;
 	} else {
-		sTarget = sStep==1.0 ?
-			pos->sTimestamp :
-			std::floor(pos->sTimestamp/sStep) * sStep;
+		sTarget = sStep == 1.0 ? pos->sTimestamp : std::floor(pos->sTimestamp / sStep) * sStep;
 	}
 
 	HR **ahr = NULL, **pphr = NULL;
-	bool bRateGraph = (which_graph != GRAPH_CONN);	// rate graph or connections graph?
+	bool bRateGraph = (which_graph != GRAPH_CONN); // rate graph or connections graph?
 	if (bRateGraph) {
-		ahr = new HR* cntPoints;
+		ahr = new HR *cntPoints;
 		pphr = ahr;
 	}
 
@@ -467,20 +452,20 @@
 			++pos;
 			continue;
 		}
-		if (bRateGraph) {		// assemble an array of pointers for ComputeAverages
+		if (bRateGraph) { // assemble an array of pointers for ComputeAverages
 			*pphr++ = &(*pos);
-		} else {			// or build the arrays if possible
+		} else { // or build the arrays if possible
 			*pf1++ = (float)pos->cntUploads;
 			*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
+		if (pos->sTimestamp == 0.0) { // reached beginning of uptime
 			break;
 		}
-		if ((sTarget -= sStep) <= 0.0) {	// don't overshoot the beginning
+		if ((sTarget -= sStep) <= 0.0) { // don't overshoot the beginning
 			if (bRateGraph) {
 				*pphr++ = &hrInit;
 			} else {
@@ -492,7 +477,7 @@
 	}
 
 	if (bRateGraph) {
-		if  (cntFilled > 0) {
+		if (cntFilled > 0) {
 			ComputeAverages(pphr, pos, cntFilled, sStep, ppf, which_graph);
 		}
 		delete ahr;
@@ -503,48 +488,50 @@
 
 #ifndef CLIENT_GUI
 
-unsigned CStatistics::GetHistoryForWeb(  // Assemble arrays of sample points for the webserver
-	unsigned cntPoints,		// maximum number of sample points to assemble
-	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
+unsigned CStatistics::GetHistoryForWeb( // Assemble arrays of sample points for the webserver
+	unsigned cntPoints,             // maximum number of sample points to assemble
+	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;
 	}
-	if (sStep==0.0 || cntPoints==0)
-		return(0);
-	unsigned	cntFilled = 0;
-	listRPOS	pos = listHR.rbegin();
-	double		LastTimeStamp = pos->sTimestamp;
-	double		sTarget = LastTimeStamp;
+	if (sStep == 0.0 || cntPoints == 0)
+		return (0);
+	unsigned cntFilled = 0;
+	listRPOS pos = listHR.rbegin();
+	double LastTimeStamp = pos->sTimestamp;
+	double sTarget = LastTimeStamp;
 
-	HR	**pphr = new HR *cntPoints;
+	HR **pphr = new HR *cntPoints;
 
 	while (pos != listHR.rend()) {
 		if (pos->sTimestamp > sTarget) {
-			++pos;	// find next history record
+			++pos; // find next history record
 			continue;
 		}
 		pphrcntFilled = &(*pos);
-		if (++cntFilled  == cntPoints)		// enough points
+		if (++cntFilled == cntPoints) // enough points
 			break;
-		if (pos->sTimestamp <= *sStart)		// reached beginning of requested time
+		if (pos->sTimestamp <= *sStart) // reached beginning of requested time
 			break;
-		if ((sTarget -= sStep) <= 0.0) {	// don't overshoot the beginning
+		if ((sTarget -= sStep) <= 0.0) { // don't overshoot the beginning
 			pphrcntFilled++ = NULL;
 			break;
 		}
 	}
 
 	if (cntFilled) {
-		*graphData = new uint32 4 * cntFilled;
+		*graphData = new uint324 * cntFilled;
 		if (*graphData) {
 			for (unsigned int i = 0; i < cntFilled; i++) {
 				HR *phr = pphrcntFilled - i - 1;
 				if (phr) {
-					(*graphData)4 * i     = ENDIAN_HTONL((uint32)(phr->kBpsDownCur * 1024.0));
-					(*graphData)4 * i + 1 = ENDIAN_HTONL((uint32)(phr->kBpsUpCur * 1024.0));
+					(*graphData)4 * i =
+						ENDIAN_HTONL((uint32)(phr->kBpsDownCur * 1024.0));
+					(*graphData)4 * i + 1 =
+						ENDIAN_HTONL((uint32)(phr->kBpsUpCur * 1024.0));
 					(*graphData)4 * i + 2 = ENDIAN_HTONL((uint32)phr->cntConnections);
 					(*graphData)4 * i + 3 = ENDIAN_HTONL((uint32)phr->kadNodesCur);
 				} else {
@@ -557,16 +544,14 @@
 		*graphData = NULL;
 	}
 
-	delete  pphr;
+	delete pphr;
 
 	*sStart = LastTimeStamp;
 
 	return cntFilled;
 }
 
-
-unsigned CStatistics::GetHistoryForGui(
-	unsigned cntPoints,
+unsigned CStatistics::GetHistoryForGui(unsigned cntPoints,
 	double sStep,
 	double *sStart,
 	uint32 **graphData,
@@ -589,12 +574,12 @@
 	if (sStep == 0.0 || cntPoints == 0) {
 		return 0;
 	}
-	unsigned	cntFilled = 0;
-	listRPOS	pos = listHR.rbegin();
-	double		LastTimeStamp = pos->sTimestamp;
-	double		sTarget = LastTimeStamp;
+	unsigned cntFilled = 0;
+	listRPOS pos = listHR.rbegin();
+	double LastTimeStamp = pos->sTimestamp;
+	double sTarget = LastTimeStamp;
 
-	HR	**pphr = new HR *cntPoints;
+	HR **pphr = new HR *cntPoints;
 
 	while (pos != listHR.rend()) {
 		if (pos->sTimestamp > sTarget) {
@@ -613,67 +598,78 @@
 	}
 
 	if (cntFilled) {
-		*graphData = new uint32 4 * cntFilled;
-		*connData  = new uint32 2 * cntFilled;
+		*graphData = new uint324 * cntFilled;
+		*connData = new uint322 * cntFilled;
 		for (unsigned int i = 0; i < cntFilled; i++) {
 			HR *phr = pphrcntFilled - i - 1;
 			if (phr) {
-				(*graphData)4 * i     = ENDIAN_HTONL((uint32)(phr->kBpsDownCur * 1024.0));
+				(*graphData)4 * i = ENDIAN_HTONL((uint32)(phr->kBpsDownCur * 1024.0));
 				(*graphData)4 * i + 1 = ENDIAN_HTONL((uint32)(phr->kBpsUpCur * 1024.0));
 				(*graphData)4 * i + 2 = ENDIAN_HTONL((uint32)phr->cntConnections);
 				(*graphData)4 * i + 3 = ENDIAN_HTONL((uint32)phr->kadNodesCur);
-				(*connData)2 * i      = ENDIAN_HTONL((uint32)phr->cntUploads);
-				(*connData)2 * i + 1  = ENDIAN_HTONL((uint32)phr->cntDownloads);
+				(*connData)2 * i = ENDIAN_HTONL((uint32)phr->cntUploads);
+				(*connData)2 * i + 1 = ENDIAN_HTONL((uint32)phr->cntDownloads);
 			} else {
 				(*graphData)4 * i = (*graphData)4 * i + 1 = 0;
 				(*graphData)4 * i + 2 = (*graphData)4 * i + 3 = 0;
-				(*connData)2 * i  = (*connData)2 * i + 1 = 0;
+				(*connData)2 * i = (*connData)2 * i + 1 = 0;
 			}
 		}
-		// Session totals are pulled from the latest sampled point so the
-		// graph's session-average line matches the daemon-side
-		// kBytesReceived / sTimestamp value monolithic amule plots —
-		// instead of forcing amulegui to integrate locally from connect
-		// time (which would diverge whenever the GUI attaches to a
-		// long-running daemon).
-		HR *latest = pphrcntFilled - 1;
+		// Session totals come from the latest sampled point, so the graph's session-average
+		// line matches the kBytesReceived / sTimestamp value monolithic amule plots, rather
+		// than making amulegui integrate locally from connect time, which diverges whenever
+		// it attaches to a long-running daemon.
+		//
+		// pphr was filled walking rbegin() -> rend(), so 0 is the NEWEST record -- the
+		// reverse of the graphData loop above, which reads it backwards to emit points
+		// oldest-first. Taking cntFilled - 1 reported the session total as it stood at
+		// the START of the reply, which the client treats as the total at the END and
+		// integrates backwards from, driving it negative at once. That was harmless while
+		// replies carried a point or two; a backfill makes the two ends the width of the
+		// graph. 0 is also always a real record, the NULL sentinel landing at the oldest
+		// end.
+		HR *latest = pphr0;
 		if (latest) {
-			sessionDlKBytes    = (uint64)latest->kBytesReceived;
-			sessionUlKBytes    = (uint64)latest->kBytesSent;
-			sessionKadTotal    = latest->kadNodesTotal;
+			sessionDlKBytes = (uint64)latest->kBytesReceived;
+			sessionUlKBytes = (uint64)latest->kBytesSent;
+			sessionKadTotal = latest->kadNodesTotal;
 			sessionTimespanSec = latest->sTimestamp;
 		}
 	}
 
-	delete  pphr;
+	delete pphr;
 
 	*sStart = LastTimeStamp;
 
 	return cntFilled;
 }
 
-
 #endif // !CLIENT_GUI -- ComputeAverages is shared too.
 
-void CStatistics::ComputeAverages(
-	HR		**pphr,		// pointer to (end of) array of assembled history records
-	listRPOS	pos,		// position in history list from which to backtrack
-	unsigned	cntFilled,	// number of points in the sample data
-	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
+void CStatistics::ComputeAverages(HR **pphr, // pointer to (end of) array of assembled history records
+	listRPOS pos,                        // position in history list from which to backtrack
+	unsigned cntFilled,                  // number of points in the sample data
+	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);
+	double sTarget, kValueRun;
+	uint64 avgTime = average_minutes * 60;
+	unsigned nBtPoints = (unsigned)(avgTime / sStep);
 
-	CPreciseRateCounter* runningAvg = NULL;
+	CPreciseRateCounter *runningAvg = NULL;
 	switch (which_graph) {
-		case GRAPH_DOWN:	runningAvg = &m_graphRunningAvgDown;	break;
-		case GRAPH_UP:		runningAvg = &m_graphRunningAvgUp;		break;
-		case GRAPH_KAD:		runningAvg = &m_graphRunningAvgKad;		break;
-		default:
-			wxCHECK_RET(false, "ComputeAverages called with unsupported graph type.");
+	case GRAPH_DOWN:
+		runningAvg = &m_graphRunningAvgDown;
+		break;
+	case GRAPH_UP:
+		runningAvg = &m_graphRunningAvgUp;
+		break;
+	case GRAPH_KAD:
+		runningAvg = &m_graphRunningAvgKad;
+		break;
+	default:
+		wxCHECK_RET(false, "ComputeAverages called with unsupported graph type.");
 	}
 
 	runningAvg->m_timespan = avgTime * 1000;
@@ -689,7 +685,8 @@
 	}
 
 	while (nBtPoints--) {
-		while (pos != listHR.rend() && pos->sTimestamp > sTarget) ++pos;	// find next history record
+		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));
 
@@ -719,11 +716,11 @@
 	};
 
 	// now compute averages in returned arrays, starting with the earliest values
-	float *pf1 = ppf0 + cntFilled - 1;	// holds session avg
-	float *pf2 = ppf1 + cntFilled - 1;	// holds running avg
-	float *pf3 = ppf2 + cntFilled - 1;	// holds current rate
+	float *pf1 = ppf0 + cntFilled - 1; // holds session avg
+	float *pf2 = ppf1 + cntFilled - 1; // holds running avg
+	float *pf3 = ppf2 + cntFilled - 1; // holds current rate
 
-	for (int cnt=cntFilled; cnt>0; cnt--, pf1--, pf2--, pf3--) {
+	for (int cnt = cntFilled; cnt > 0; cnt--, pf1--, pf2--, pf3--) {
 		HR *phr = *(--pphr);
 		if (which_graph == GRAPH_DOWN) {
 			kValueRun = phr->kBytesReceived;
@@ -749,7 +746,7 @@
 {
 	GraphUpdateInfo update;
 	listPOS phr = --listHR.end();
-	update.timestamp = (double) phr->sTimestamp;
+	update.timestamp = (double)phr->sTimestamp;
 
 	m_graphRunningAvgDown += (uint32)(phr->kBpsDownCur * 1024.0);
 	m_graphRunningAvgUp += (uint32)(phr->kBpsUpCur * 1024.0);
@@ -779,107 +776,238 @@
 	return update;
 }
 
-
 /* ------------------------------- TREE ---------------------------- */
 
 void CStatistics::InitStatsTree()
 {
-	s_statTree = new CStatTreeItemBase(wxTRANSLATE("Statistics"));
+	s_statTree = (new CStatTreeItemBase(wxTRANSLATE("Statistics")))->SetKey("statistics");
 
-	CStatTreeItemBase* tmpRoot1;
-	CStatTreeItemBase* tmpRoot2;
+	CStatTreeItemBase *tmpRoot1;
+	CStatTreeItemBase *tmpRoot2;
 
-	s_uptime = static_cast<CStatTreeItemTimer*>(s_statTree->AddChild(new CStatTreeItemTimer(wxTRANSLATE("Uptime: %s"))));
+	s_uptime = static_cast<CStatTreeItemTimer *>(
+		s_statTree->AddChild(new CStatTreeItemTimer(wxTRANSLATE("Uptime: %s"))));
 
-	tmpRoot1 = s_statTree->AddChild(new CStatTreeItemBase(wxTRANSLATE("Transfer"), stSortChildren));
+	tmpRoot1 = s_statTree->AddChild(
+		(new CStatTreeItemBase(wxTRANSLATE("Transfer"), stSortChildren))->SetKey("transfer"));
 
-	tmpRoot2 = tmpRoot1->AddChild(new CStatTreeItemBase(wxTRANSLATE("Uploads")), 2);
-	s_sessionUpload = static_cast<CStatTreeItemUlDlCounter*>(tmpRoot2->AddChild(new CStatTreeItemUlDlCounter(wxTRANSLATE("Uploaded Data (Session (Total)): %s"), theStats::GetTotalSentBytes, stSortChildren | stSortByValue)));
+	tmpRoot2 = tmpRoot1->AddChild((new CStatTreeItemBase(wxTRANSLATE("Uploads")))->SetKey("uploads"), 2);
+	s_sessionUpload = static_cast<CStatTreeItemUlDlCounter *>(tmpRoot2->AddChild(
+		new CStatTreeItemUlDlCounter(wxTRANSLATE("Uploaded Data (Session (Total)): %s"),
+			theStats::GetTotalSentBytes,
+			stSortChildren | stSortByValue)));
 	// Children will be added on-the-fly
-	s_totalUpOverhead = static_cast<CStatTreeItemPacketTotals*>(tmpRoot2->AddChild(new CStatTreeItemPacketTotals(wxTRANSLATE("Total Overhead (Packets): %s"))));
-	s_fileReqUpOverhead = static_cast<CStatTreeItemPackets*>(tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("File Request Overhead (Packets): %s"))));
+	s_totalUpOverhead = static_cast<CStatTreeItemPacketTotals *>(tmpRoot2->AddChild(
+		new CStatTreeItemPacketTotals(wxTRANSLATE("Total Overhead (Packets): %s"))));
+	s_fileReqUpOverhead = static_cast<CStatTreeItemPackets *>(tmpRoot2->AddChild(
+		new CStatTreeItemPackets(wxTRANSLATE("File Request Overhead (Packets): %s"))));
 	s_totalUpOverhead->AddPacketCounter(s_fileReqUpOverhead);
-	s_sourceXchgUpOverhead = static_cast<CStatTreeItemPackets*>(tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("Source Exchange Overhead (Packets): %s"))));
+	s_sourceXchgUpOverhead = static_cast<CStatTreeItemPackets *>(tmpRoot2->AddChild(
+		new CStatTreeItemPackets(wxTRANSLATE("Source Exchange Overhead (Packets): %s"))));
 	s_totalUpOverhead->AddPacketCounter(s_sourceXchgUpOverhead);
-	s_serverUpOverhead = static_cast<CStatTreeItemPackets*>(tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("Server Overhead (Packets): %s"))));
+	s_serverUpOverhead = static_cast<CStatTreeItemPackets *>(
+		tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("Server Overhead (Packets): %s"))));
 	s_totalUpOverhead->AddPacketCounter(s_serverUpOverhead);
-	s_kadUpOverhead = static_cast<CStatTreeItemPackets*>(tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("Kad Overhead (Packets): %s"))));
+	s_kadUpOverhead = static_cast<CStatTreeItemPackets *>(
+		tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("Kad Overhead (Packets): %s"))));
 	s_totalUpOverhead->AddPacketCounter(s_kadUpOverhead);
-	s_cryptUpOverhead = static_cast<CStatTreeItemCounter*>(tmpRoot2->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Crypt overhead (UDP): %s"))));
+	s_cryptUpOverhead = static_cast<CStatTreeItemCounter *>(
+		tmpRoot2->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Crypt overhead (UDP): %s"))));
 	s_cryptUpOverhead->SetDisplayMode(dmBytes);
-	s_activeUploads = static_cast<CStatTreeItemNativeCounter*>(tmpRoot2->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Active Uploads: %s"))));
-	s_waitingUploads = static_cast<CStatTreeItemNativeCounter*>(tmpRoot2->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Waiting Uploads: %s"))));
-	s_totalSuccUploads = static_cast<CStatTreeItemCounter*>(tmpRoot2->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Total successful upload sessions: %s"))));
-	s_totalFailedUploads = static_cast<CStatTreeItemCounter*>(tmpRoot2->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Total failed upload sessions: %s"))));
+	s_activeUploads = static_cast<CStatTreeItemNativeCounter *>(
+		tmpRoot2->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Active Uploads: %s"))));
+	s_waitingUploads = static_cast<CStatTreeItemNativeCounter *>(
+		tmpRoot2->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Waiting Uploads: %s"))));
+	s_totalSuccUploads = static_cast<CStatTreeItemCounter *>(tmpRoot2->AddChild(
+		new CStatTreeItemCounter(wxTRANSLATE("Total successful upload sessions: %s"))));
+	s_totalFailedUploads = static_cast<CStatTreeItemCounter *>(tmpRoot2->AddChild(
+		new CStatTreeItemCounter(wxTRANSLATE("Total failed upload sessions: %s"))));
 	s_totalUploadTime = new CStatTreeItemCounter("");
-	tmpRoot2->AddChild(new CStatTreeItemAverage(wxTRANSLATE("Average upload time: %s"), s_totalUploadTime, s_totalSuccUploads, dmTime));
-
-	tmpRoot2 = tmpRoot1->AddChild(new CStatTreeItemBase(wxTRANSLATE("Downloads")), 1);
-	s_sessionDownload = static_cast<CStatTreeItemUlDlCounter*>(tmpRoot2->AddChild(new CStatTreeItemUlDlCounter(wxTRANSLATE("Downloaded Data (Session (Total)): %s"), theStats::GetTotalReceivedBytes, stSortChildren | stSortByValue)));
+	tmpRoot2->AddChild((new CStatTreeItemAverage(wxTRANSLATE("Average upload time: %s"),
+				    s_totalUploadTime,
+				    s_totalSuccUploads,
+				    dmTime))
+				   ->SetKey("upload_avg_time"));
+
+	tmpRoot2 =
+		tmpRoot1->AddChild((new CStatTreeItemBase(wxTRANSLATE("Downloads")))->SetKey("downloads"), 1);
+	s_sessionDownload = static_cast<CStatTreeItemUlDlCounter *>(tmpRoot2->AddChild(
+		new CStatTreeItemUlDlCounter(wxTRANSLATE("Downloaded Data (Session (Total)): %s"),
+			theStats::GetTotalReceivedBytes,
+			stSortChildren | stSortByValue)));
 	// Children will be added on-the-fly
-	s_totalDownOverhead = static_cast<CStatTreeItemPacketTotals*>(tmpRoot2->AddChild(new CStatTreeItemPacketTotals(wxTRANSLATE("Total Overhead (Packets): %s"))));
-	s_fileReqDownOverhead = static_cast<CStatTreeItemPackets*>(tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("File Request Overhead (Packets): %s"))));
+	s_totalDownOverhead = static_cast<CStatTreeItemPacketTotals *>(tmpRoot2->AddChild(
+		new CStatTreeItemPacketTotals(wxTRANSLATE("Total Overhead (Packets): %s"))));
+	s_fileReqDownOverhead = static_cast<CStatTreeItemPackets *>(tmpRoot2->AddChild(
+		new CStatTreeItemPackets(wxTRANSLATE("File Request Overhead (Packets): %s"))));
 	s_totalDownOverhead->AddPacketCounter(s_fileReqDownOverhead);
-	s_sourceXchgDownOverhead = static_cast<CStatTreeItemPackets*>(tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("Source Exchange Overhead (Packets): %s"))));
+	s_sourceXchgDownOverhead = static_cast<CStatTreeItemPackets *>(tmpRoot2->AddChild(
+		new CStatTreeItemPackets(wxTRANSLATE("Source Exchange Overhead (Packets): %s"))));
 	s_totalDownOverhead->AddPacketCounter(s_sourceXchgDownOverhead);
-	s_serverDownOverhead = static_cast<CStatTreeItemPackets*>(tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("Server Overhead (Packets): %s"))));
+	s_serverDownOverhead = static_cast<CStatTreeItemPackets *>(
+		tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("Server Overhead (Packets): %s"))));
 	s_totalDownOverhead->AddPacketCounter(s_serverDownOverhead);
-	s_kadDownOverhead = static_cast<CStatTreeItemPackets*>(tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("Kad Overhead (Packets): %s"))));
+	s_kadDownOverhead = static_cast<CStatTreeItemPackets *>(
+		tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("Kad Overhead (Packets): %s"))));
 	s_totalDownOverhead->AddPacketCounter(s_kadDownOverhead);
-	s_cryptDownOverhead = static_cast<CStatTreeItemCounter*>(tmpRoot2->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Crypt overhead (UDP): %s"))));
+	s_cryptDownOverhead = static_cast<CStatTreeItemCounter *>(
+		tmpRoot2->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Crypt overhead (UDP): %s"))));
 	s_cryptDownOverhead->SetDisplayMode(dmBytes);
-	s_foundSources = static_cast<CStatTreeItemCounter*>(tmpRoot2->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Found Sources: %s"), stSortChildren | stSortByValue)));
-	s_activeDownloads = static_cast<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, 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));
-	tmpRoot1->AddChild(new CStatTreeItemAverageSpeed(wxTRANSLATE("Average upload rate (Session): %s"), s_sessionUpload, s_uptime));
-	s_downloadrate = static_cast<CStatTreeItemRateCounter*>(tmpRoot1->AddChild(new CStatTreeItemRateCounter(wxTRANSLATE("Max download rate (Session): %s"), true, 30000)));
-	s_uploadrate = static_cast<CStatTreeItemRateCounter*>(tmpRoot1->AddChild(new CStatTreeItemRateCounter(wxTRANSLATE("Max upload rate (Session): %s"), true, 30000)));
-	s_reconnects = static_cast<CStatTreeItemReconnects*>(tmpRoot1->AddChild(new CStatTreeItemReconnects(wxTRANSLATE("Reconnects: %i"))));
-	s_sinceFirstTransfer = static_cast<CStatTreeItemTimer*>(tmpRoot1->AddChild(new CStatTreeItemTimer(wxTRANSLATE("Time Since First Transfer: %s"), stHideIfZero)));
-	s_sinceConnected = static_cast<CStatTreeItemTimer*>(tmpRoot1->AddChild(new CStatTreeItemTimer(wxTRANSLATE("Connected To Server Since: %s"))));
-	s_activeConnections = static_cast<CStatTreeItemCounterMax*>(tmpRoot1->AddChild(new CStatTreeItemCounterMax(wxTRANSLATE("Active Connections (estimate): %i"))));
-	s_limitReached = static_cast<CStatTreeItemMaxConnLimitReached*>(tmpRoot1->AddChild(new CStatTreeItemMaxConnLimitReached(wxTRANSLATE("Max Connection Limit Reached: %s"))));
-	s_avgConnections = static_cast<CStatTreeItemSimple*>(tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Average Connections (estimate): %g"))));
+	s_foundSources = static_cast<CStatTreeItemCounter *>(tmpRoot2->AddChild(
+		new CStatTreeItemCounter(wxTRANSLATE("Found Sources: %s"), stSortChildren | stSortByValue)));
+	s_activeDownloads = static_cast<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,
+				    theStats::GetTotalSentBytes,
+				    theStats::GetTotalReceivedBytes))
+				   ->SetKey("ul_dl_ratio"),
+		3);
+
+	tmpRoot1 = s_statTree->AddChild(
+		(new CStatTreeItemBase(wxTRANSLATE("Connection")))->SetKey("connection"));
+	tmpRoot1->AddChild(
+		(new CStatTreeItemAverageSpeed(
+			 wxTRANSLATE("Average download rate (Session): %s"), s_sessionDownload, s_uptime))
+			->SetKey("avg_download_rate"));
+	tmpRoot1->AddChild(
+		(new CStatTreeItemAverageSpeed(
+			 wxTRANSLATE("Average upload rate (Session): %s"), s_sessionUpload, s_uptime))
+			->SetKey("avg_upload_rate"));
+	s_downloadrate = static_cast<CStatTreeItemRateCounter *>(tmpRoot1->AddChild(
+		new CStatTreeItemRateCounter(wxTRANSLATE("Max download rate (Session): %s"), true, 30000)));
+	s_uploadrate = static_cast<CStatTreeItemRateCounter *>(tmpRoot1->AddChild(
+		new CStatTreeItemRateCounter(wxTRANSLATE("Max upload rate (Session): %s"), true, 30000)));
+	s_reconnects = static_cast<CStatTreeItemReconnects *>(
+		tmpRoot1->AddChild(new CStatTreeItemReconnects(wxTRANSLATE("Reconnects: %i"))));
+	s_sinceFirstTransfer = static_cast<CStatTreeItemTimer *>(tmpRoot1->AddChild(
+		new CStatTreeItemTimer(wxTRANSLATE("Time Since First Transfer: %s"), stHideIfZero)));
+	s_sinceConnected = static_cast<CStatTreeItemTimer *>(
+		tmpRoot1->AddChild(new CStatTreeItemTimer(wxTRANSLATE("Connected To Server Since: %s"))));
+	s_activeConnections = static_cast<CStatTreeItemCounterMax *>(tmpRoot1->AddChild(
+		new CStatTreeItemCounterMax(wxTRANSLATE("Active Connections (estimate): %i"))));
+	s_limitReached = static_cast<CStatTreeItemMaxConnLimitReached *>(tmpRoot1->AddChild(
+		new CStatTreeItemMaxConnLimitReached(wxTRANSLATE("Max Connection Limit Reached: %s"))));
+	s_avgConnections = static_cast<CStatTreeItemSimple *>(tmpRoot1->AddChild(
+		new CStatTreeItemSimple(wxTRANSLATE("Average Connections (estimate): %g"))));
 	s_avgConnections->SetValue(0.0);
-	tmpRoot1->AddChild(new CStatTreeItemPeakConnections(wxTRANSLATE("Peak Connections (estimate): %i")));
+	tmpRoot1->AddChild((new CStatTreeItemPeakConnections(wxTRANSLATE("Peak Connections (estimate): %i")))
+				   ->SetKey("peak_connections"));
 
-	s_clients = static_cast<CStatTreeItemHiddenCounter*>(s_statTree->AddChild(new CStatTreeItemHiddenCounter(wxTRANSLATE("Clients"), stSortChildren | stSortByValue)));
-	s_unknown = static_cast<CStatTreeItemCounter*>(s_clients->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Unknown: %s")), 6));
-	//s_lowID = static_cast<CStatTreeItem*>(s_clients->AddChild(new CStatTreeItem(wxTRANSLATE("LowID: %u (%.2f%% Total %.2f%% Known)")), 5));
-	//s_secIdentOnOff = static_cast<CStatTreeItem*>(s_clients->AddChild(new CStatTreeItem(wxTRANSLATE("SecIdent On/Off: %u (%.2f%%) : %u (%.2f%%)")), 4));
+	s_clients = static_cast<CStatTreeItemHiddenCounter *>(s_statTree->AddChild(
+		new CStatTreeItemHiddenCounter(wxTRANSLATE("Clients"), stSortChildren | stSortByValue)));
+	s_unknown = static_cast<CStatTreeItemCounter *>(
+		s_clients->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Unknown: %s")), 6));
 #ifdef __DEBUG__
-	s_hasSocket = static_cast<CStatTreeItemNativeCounter*>(s_clients->AddChild(new CStatTreeItemNativeCounter("HasSocket: %s"), 3));
+	s_hasSocket = static_cast<CStatTreeItemNativeCounter *>(
+		s_clients->AddChild(new CStatTreeItemNativeCounter("HasSocket: %s"), 3));
+#endif
+	s_filtered = static_cast<CStatTreeItemNativeCounter *>(
+		s_clients->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Filtered: %s")), 2));
+	s_banned = static_cast<CStatTreeItemNativeCounter *>(
+		s_clients->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Banned: %s")), 1));
+#ifdef ENABLE_KAD_NODE_PROTECTION
+	// Only when the protection that fills it is compiled in: adding the row unconditionally
+	// would show a figure that is structurally always zero, which reads as "nothing is being
+	// banned" rather than "nothing here can ban".
+	s_kadBanned = static_cast<CStatTreeItemNativeCounter *>(s_clients->AddChild(
+		new CStatTreeItemNativeCounter(wxTRANSLATE("Kad banned addresses: %s")), 1));
 #endif
-	s_filtered = static_cast<CStatTreeItemNativeCounter*>(s_clients->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Filtered: %s")), 2));
-	s_banned = static_cast<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);
+	s_clients->AddChild(
+		(new CStatTreeItemTotalClients(wxTRANSLATE("Total: %i Known: %i"), s_clients, s_unknown))
+			->SetKey("clients_total"),
+		0x80000000);
 
 	// TODO: Use counters?
-	tmpRoot1 = s_statTree->AddChild(new CStatTreeItemBase(wxTRANSLATE("Servers")));
-	s_workingServers = static_cast<CStatTreeItemSimple*>(tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Working Servers: %i"))));
-	s_failedServers = static_cast<CStatTreeItemSimple*>(tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Failed Servers: %i"))));
-	s_totalServers = static_cast<CStatTreeItemNativeCounter*>(tmpRoot1->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Total: %s"))));
-	s_deletedServers = static_cast<CStatTreeItemNativeCounter*>(tmpRoot1->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Deleted Servers: %s"))));
-	s_filteredServers = static_cast<CStatTreeItemNativeCounter*>(tmpRoot1->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Filtered Servers: %s"))));
-	s_usersOnWorking = static_cast<CStatTreeItemSimple*>(tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Users on Working Servers: %llu"))));
-	s_filesOnWorking = static_cast<CStatTreeItemSimple*>(tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Files on Working Servers: %llu"))));
-	s_totalUsers = static_cast<CStatTreeItemSimple*>(tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Total Users: %llu"))));
-	s_totalFiles = static_cast<CStatTreeItemSimple*>(tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Total Files: %llu"))));
-	s_serverOccupation = static_cast<CStatTreeItemSimple*>(tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Server Occupation: %.2f%%"))));
+	tmpRoot1 = s_statTree->AddChild((new CStatTreeItemBase(wxTRANSLATE("Servers")))->SetKey("servers"));
+	s_workingServers = static_cast<CStatTreeItemSimple *>(
+		tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Working Servers: %i"))));
+	s_failedServers = static_cast<CStatTreeItemSimple *>(
+		tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Failed Servers: %i"))));
+	s_totalServers = static_cast<CStatTreeItemNativeCounter *>(
+		tmpRoot1->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Total: %s"))));
+	s_deletedServers = static_cast<CStatTreeItemNativeCounter *>(
+		tmpRoot1->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Deleted Servers: %s"))));
+	s_filteredServers = static_cast<CStatTreeItemNativeCounter *>(
+		tmpRoot1->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Filtered Servers: %s"))));
+	s_usersOnWorking = static_cast<CStatTreeItemSimple *>(
+		tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Users on Working Servers: %llu"))));
+	s_filesOnWorking = static_cast<CStatTreeItemSimple *>(
+		tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Files on Working Servers: %llu"))));
+	s_totalUsers = static_cast<CStatTreeItemSimple *>(
+		tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Total Users: %llu"))));
+	s_totalFiles = static_cast<CStatTreeItemSimple *>(
+		tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Total Files: %llu"))));
+	s_serverOccupation = static_cast<CStatTreeItemSimple *>(
+		tmpRoot1->AddChild(new CStatTreeItemSimple(wxTRANSLATE("Server Occupation: %.2f%%"))));
 	s_serverOccupation->SetValue(0.0);
 
-	tmpRoot1 = s_statTree->AddChild(new CStatTreeItemBase(wxTRANSLATE("Shared Files")));
-	s_numberOfShared = static_cast<CStatTreeItemCounter*>(tmpRoot1->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Number of Shared Files: %s"))));
-	s_sizeOfShare = static_cast<CStatTreeItemCounter*>(tmpRoot1->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Total size of Shared Files: %s"))));
+	tmpRoot1 = s_statTree->AddChild(
+		(new CStatTreeItemBase(wxTRANSLATE("Shared Files")))->SetKey("shared_files"));
+	s_numberOfShared = static_cast<CStatTreeItemCounter *>(
+		tmpRoot1->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Number of Shared Files: %s"))));
+	s_sizeOfShare = static_cast<CStatTreeItemCounter *>(
+		tmpRoot1->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Total size of Shared Files: %s"))));
 	s_sizeOfShare->SetDisplayMode(dmBytes);
-	tmpRoot1->AddChild(new CStatTreeItemAverage(wxTRANSLATE("Average file size: %s"), s_sizeOfShare, s_numberOfShared, dmBytes));
+	tmpRoot1->AddChild(
+		(new CStatTreeItemAverage(
+			 wxTRANSLATE("Average file size: %s"), s_sizeOfShare, s_numberOfShared, dmBytes))
+			->SetKey("shared_avg_size"));
+
+	// Stable machine keys for API consumers (EC_TAG_STAT_NODE_KEY), assigned here so
+	// they stay fixed regardless of label wording or translation.
+	s_uptime->SetKey("uptime");
+	s_sessionUpload->SetKey("upload_data");
+	s_totalUpOverhead->SetKey("upload_total_overhead");
+	s_fileReqUpOverhead->SetKey("upload_filereq_overhead");
+	s_sourceXchgUpOverhead->SetKey("upload_srcexch_overhead");
+	s_serverUpOverhead->SetKey("upload_server_overhead");
+	s_kadUpOverhead->SetKey("upload_kad_overhead");
+	s_cryptUpOverhead->SetKey("upload_crypt_overhead");
+	s_activeUploads->SetKey("active_uploads");
+	s_waitingUploads->SetKey("waiting_uploads");
+	s_totalSuccUploads->SetKey("upload_sessions_success");
+	s_totalFailedUploads->SetKey("upload_sessions_failed");
+	s_sessionDownload->SetKey("download_data");
+	s_totalDownOverhead->SetKey("download_total_overhead");
+	s_fileReqDownOverhead->SetKey("download_filereq_overhead");
+	s_sourceXchgDownOverhead->SetKey("download_srcexch_overhead");
+	s_serverDownOverhead->SetKey("download_server_overhead");
+	s_kadDownOverhead->SetKey("download_kad_overhead");
+	s_cryptDownOverhead->SetKey("download_crypt_overhead");
+	s_foundSources->SetKey("found_sources");
+	s_activeDownloads->SetKey("active_downloads");
+	s_downloadrate->SetKey("max_download_rate");
+	s_uploadrate->SetKey("max_upload_rate");
+	s_reconnects->SetKey("reconnects");
+	s_sinceFirstTransfer->SetKey("since_first_transfer");
+	s_sinceConnected->SetKey("connected_since");
+	s_activeConnections->SetKey("active_connections");
+	s_limitReached->SetKey("max_conn_limit_reached");
+	s_avgConnections->SetKey("avg_connections");
+	s_clients->SetKey("clients");
+	s_unknown->SetKey("clients_unknown");
+	s_filtered->SetKey("clients_filtered");
+	s_banned->SetKey("clients_banned");
+#ifdef ENABLE_KAD_NODE_PROTECTION
+	s_kadBanned->SetKey("clients_kad_banned");
+#endif
+	s_workingServers->SetKey("servers_working");
+	s_failedServers->SetKey("servers_failed");
+	s_totalServers->SetKey("servers_total");
+	s_deletedServers->SetKey("servers_deleted");
+	s_filteredServers->SetKey("servers_filtered");
+	s_usersOnWorking->SetKey("servers_users_working");
+	s_filesOnWorking->SetKey("servers_files_working");
+	s_totalUsers->SetKey("servers_total_users");
+	s_totalFiles->SetKey("servers_total_files");
+	s_serverOccupation->SetKey("servers_occupation");
+	s_numberOfShared->SetKey("shared_count");
+	s_sizeOfShare->SetKey("shared_size");
 }
 
-
 void CStatistics::UpdateStatsTree()
 {
 	// get sort orders right
@@ -900,7 +1028,7 @@
 	uint32 servtfile;
 	float servocc;
 	theApp->serverlist->GetStatus(servfail, servuser, servfile, servtuser, servtfile, servocc);
-	s_workingServers->SetValue((uint64)((*s_totalServers)-servfail));
+	s_workingServers->SetValue((uint64)((*s_totalServers) - servfail));
 	s_failedServers->SetValue((uint64)servfail);
 	s_usersOnWorking->SetValue((uint64)servuser);
 	s_filesOnWorking->SetValue((uint64)servfile);
@@ -909,14 +1037,15 @@
 	s_serverOccupation->SetValue(servocc);
 }
 
-
 void CStatistics::AddSourceOrigin(unsigned origin)
 {
-	CStatTreeItemCounter* counter = static_cast<CStatTreeItemCounter*>(s_foundSources->GetChildById(0x0100 + origin));
+	CStatTreeItemCounter *counter =
+		static_cast<CStatTreeItemCounter *>(s_foundSources->GetChildById(0x0100 + origin));
 	if (counter) {
 		++(*counter);
 	} else {
-		counter = new CStatTreeItemCounter(OriginToText(origin) + ": %s", stHideIfZero | stShowPercent);
+		counter =
+			new CStatTreeItemCounter(OriginToText(origin) + ": %s", stHideIfZero | stShowPercent);
 		++(*counter);
 		s_foundSources->AddChild(counter, 0x0100 + origin);
 	}
@@ -924,7 +1053,8 @@
 
 void CStatistics::RemoveSourceOrigin(unsigned origin)
 {
-	CStatTreeItemCounter* counter = static_cast<CStatTreeItemCounter*>(s_foundSources->GetChildById(0x0100 + origin));
+	CStatTreeItemCounter *counter =
+		static_cast<CStatTreeItemCounter *>(s_foundSources->GetChildById(0x0100 + origin));
 	wxASSERT(counter);
 	--(*counter);
 }
@@ -934,15 +1064,15 @@
 	// prevent appearing multiple tree entries with the same name
 	// this should be kept in sync with GetSoftName().
 	switch (SoftType) {
-		case SO_OLDEMULE:
-			return 0x0100 + SO_EMULE;
-		case SO_NEW_SHAREAZA:
-		case SO_NEW2_SHAREAZA:
-			return 0x0100 + SO_SHAREAZA;
-		case SO_NEW2_MLDONKEY:
-			return 0x0100 + SO_NEW_MLDONKEY;
-		default:
-			return 0x0100 + SoftType;
+	case SO_OLDEMULE:
+		return 0x0100 + SO_EMULE;
+	case SO_NEW_SHAREAZA:
+	case SO_NEW2_SHAREAZA:
+		return 0x0100 + SO_SHAREAZA;
+	case SO_NEW2_MLDONKEY:
+		return 0x0100 + SO_NEW_MLDONKEY;
+	default:
+		return 0x0100 + SoftType;
 	}
 }
 
@@ -953,9 +1083,9 @@
 	uint32 id = GetSoftID(SoftType);
 
 	if (s_sessionDownload->HasChildWithId(id)) {
-		(*static_cast<CStatTreeItemCounter*>(s_sessionDownload->GetChildById(id))) += bytes;
+		(*static_cast<CStatTreeItemCounter *>(s_sessionDownload->GetChildById(id))) += bytes;
 	} else {
-		CStatTreeItemCounter* tmp = new CStatTreeItemCounter(GetSoftName(SoftType) + ": %s");
+		CStatTreeItemCounter *tmp = new CStatTreeItemCounter(GetSoftName(SoftType) + ": %s");
 		tmp->SetDisplayMode(dmBytes);
 		(*tmp) += bytes;
 		s_sessionDownload->AddChild(tmp, id);
@@ -967,9 +1097,9 @@
 	uint32 id = GetSoftID(SoftType);
 
 	if (s_sessionUpload->HasChildWithId(id)) {
-		(*static_cast<CStatTreeItemCounter*>(s_sessionUpload->GetChildById(id))) += bytes;
+		(*static_cast<CStatTreeItemCounter *>(s_sessionUpload->GetChildById(id))) += bytes;
 	} else {
-		CStatTreeItemCounter* tmp = new CStatTreeItemCounter(GetSoftName(SoftType) + ": %s");
+		CStatTreeItemCounter *tmp = new CStatTreeItemCounter(GetSoftName(SoftType) + ": %s");
 		tmp->SetDisplayMode(dmBytes);
 		(*tmp) += bytes;
 		s_sessionUpload->AddChild(tmp, id);
@@ -982,16 +1112,16 @@
 }
 
 // Do some random black magic to strings to get a relatively unique number for them.
-static uint32 GetIdFromString(const wxString& str)
+static uint32 GetIdFromString(const wxString &str)
 {
 	uint32 id = 0;
 	for (unsigned i = 0; i < str.Length(); ++i) {
-                unsigned old_id = id;
-                id += (uint32)str.GetChar(i);
-                id <<= 2;
-                id ^= old_id;
-                id -= old_id;
-        }
+		unsigned old_id = id;
+		id += (uint32)str.GetChar(i);
+		id <<= 2;
+		id ^= old_id;
+		id -= old_id;
+	}
 	return (((id >> 1) + id) | 0x00000100) & 0x7fffffff;
 }
 
@@ -1005,7 +1135,7 @@
 	CStatTreeItemCounter *client;
 
 	if (s_clients->HasChildWithId(id)) {
-		client = static_cast<CStatTreeItemCounter*>(s_clients->GetChildById(id));
+		client = static_cast<CStatTreeItemCounter *>(s_clients->GetChildById(id));
 		++(*client);
 	} else {
 		uint32 flags = stSortChildren | stShowPercent | stHideIfZero;
@@ -1016,8 +1146,14 @@
 		++(*client);
 		s_clients->AddChild(client, id);
 		if (SupportsOSInfo(clientSoft)) {
-			client->AddChild(new CStatTreeItemBase(wxTRANSLATE("Version"), stSortChildren | stCapChildren), 2);
-			client->AddChild(new CStatTreeItemBase(wxTRANSLATE("Operating System"), stSortChildren | stSortByValue), 1);
+			client->AddChild((new CStatTreeItemBase(
+						  wxTRANSLATE("Version"), stSortChildren | stCapChildren))
+						 ->SetKey("client_versions"),
+				2);
+			client->AddChild((new CStatTreeItemBase(wxTRANSLATE("Operating System"),
+						  stSortChildren | stSortByValue))
+						 ->SetKey("client_operating_system"),
+				1);
 		}
 	}
 
@@ -1025,49 +1161,64 @@
 	uint32 clientVersion = pClient->GetVersion();
 
 	if (versionRoot->HasChildWithId(clientVersion)) {
-		CStatTreeItemCounter *version = static_cast<CStatTreeItemCounter*>(versionRoot->GetChildById(clientVersion));
+		CStatTreeItemCounter *version =
+			static_cast<CStatTreeItemCounter *>(versionRoot->GetChildById(clientVersion));
 		++(*version);
 	} else {
-		const wxString& versionStr = pClient->GetVersionString();
-		CStatTreeItemCounter *version = new CStatTreeItemCounter((versionStr.IsEmpty() ? wxString(wxTRANSLATE("Unknown")) : versionStr) + ": %s", stShowPercent | stHideIfZero);
+		const wxString &versionStr = pClient->GetVersionString();
+		CStatTreeItemCounter *version = new CStatTreeItemCounter(
+			(versionStr.IsEmpty() ? wxString(wxTRANSLATE("Unknown")) : versionStr) + ": %s",
+			stShowPercent | stHideIfZero);
+		version->SetKey("client_version");
+		// Raw version string (empty for "Unknown" -> tag omitted), so API
+		// clients read it without parsing the composite label.
+		version->SetRawValue(versionStr);
 		++(*version);
 		versionRoot->AddChild(version, clientVersion, SupportsOSInfo(clientSoft));
 	}
 
 	if (SupportsOSInfo(clientSoft)) {
-		const wxString& OSInfo = pClient->GetClientOSInfo();
+		const wxString &OSInfo = pClient->GetClientOSInfo();
 		uint32 OS_ID = OSInfo.IsEmpty() ? 0 : GetIdFromString(OSInfo);
-		CStatTreeItemBase* OSRoot = client->GetChildById(1);
-		CStatTreeItemCounter* OSNode = static_cast<CStatTreeItemCounter*>(OSRoot->GetChildById(OS_ID));
+		CStatTreeItemBase *OSRoot = client->GetChildById(1);
+		CStatTreeItemCounter *OSNode =
+			static_cast<CStatTreeItemCounter *>(OSRoot->GetChildById(OS_ID));
 		if (OSNode) {
 			++(*OSNode);
 		} else {
-			OSNode = new CStatTreeItemCounter((OS_ID ? OSInfo : wxString(wxTRANSLATE("Not Received"))) + ": %s", stShowPercent | stHideIfZero);
+			OSNode = new CStatTreeItemCounter(
+				(OS_ID ? OSInfo : wxString(wxTRANSLATE("Not Received"))) + ": %s",
+				stShowPercent | stHideIfZero);
+			OSNode->SetKey("client_os");
+			// Raw OS string (empty for "Not Received" -> tag omitted).
+			OSNode->SetRawValue(OSInfo);
 			++(*OSNode);
 			OSRoot->AddChild(OSNode, OS_ID, true);
 		}
 	}
 }
 
-void CStatistics::RemoveKnownClient(uint32 clientSoft, uint32 clientVersion, const wxString& OSInfo)
+void CStatistics::RemoveKnownClient(uint32 clientSoft, uint32 clientVersion, const wxString &OSInfo)
 {
 	--(*s_clients);
 
 	uint32 id = GetSoftID(clientSoft);
 
-	CStatTreeItemCounter *client = static_cast<CStatTreeItemCounter*>(s_clients->GetChildById(id));
+	CStatTreeItemCounter *client = static_cast<CStatTreeItemCounter *>(s_clients->GetChildById(id));
 	wxASSERT(client);
 	--(*client);
 
 	CStatTreeItemBase *versionRoot = SupportsOSInfo(clientSoft) ? client->GetChildById(2) : client;
 
-	CStatTreeItemCounter *version = static_cast<CStatTreeItemCounter*>(versionRoot->GetChildById(clientVersion));
+	CStatTreeItemCounter *version =
+		static_cast<CStatTreeItemCounter *>(versionRoot->GetChildById(clientVersion));
 	wxASSERT(version);
 	--(*version);
 
 	if (SupportsOSInfo(clientSoft)) {
 		uint32 OS_ID = OSInfo.IsEmpty() ? 0 : GetIdFromString(OSInfo);
-		CStatTreeItemCounter* OSNode = static_cast<CStatTreeItemCounter*>(client->GetChildById(1)->GetChildById(OS_ID));
+		CStatTreeItemCounter *OSNode =
+			static_cast<CStatTreeItemCounter *>(client->GetChildById(1)->GetChildById(OS_ID));
 		wxASSERT(OSNode);
 		--(*OSNode);
 	}
@@ -1076,46 +1227,58 @@
 #else /* CLIENT_GUI */
 
 CStatistics::CStatistics(CRemoteConnect &conn)
-	: m_conn(conn),
-	  m_graphRunningAvgDown(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true),
-	  m_graphRunningAvgUp(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true),
-	  m_graphRunningAvgKad(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true)
+: m_conn(conn)
+, m_graphRunningAvgDown(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true)
+, m_graphRunningAvgUp(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true)
+, m_graphRunningAvgKad(thePrefs::GetStatsAverageMinutes() * 60 * 1000, true)
 {
 	s_start_time = GetTickCount64();
 	average_minutes = thePrefs::GetStatsAverageMinutes();
 
 	// Sentinel HR used by GetHistory when sTarget underflows past the
 	// beginning of listHR; matches the monolithic ctor's hrInit.
-	HR hr = {0.0, 0.0, 0.0, 0.0, 0.0, 0, 0, 0, 0, 0};
+	HR hr = { 0.0, 0.0, 0.0, 0.0, 0.0, 0, 0, 0, 0, 0 };
 	hrInit = hr;
 
-	// Init Tree
 	s_statTree = new CStatTreeItemBase(_("Statistics"), 0);
 
-	// Clear stat data container
 	for (int i = 0; i < sdTotalItems; ++i) {
 		s_statDatai = 0;
 	}
 }
 
-
 CStatistics::~CStatistics()
 {
 	listHR.clear();
 	delete s_statTree;
 }
 
-
-void CStatistics::AddHistoryRecord(const HR& hr)
+void CStatistics::AddHistoryRecord(const HR &hr, double minSpacing)
 {
+	// Keep only what the graphs will actually plot: one record every minSpacing seconds, that
+	// being the seconds-per-point they draw at.
+	//
+	// Two things otherwise fill the ring with points no axis asks for. GetHistoryForGui appends
+	// a record before testing whether the caller already has it, so every poll returns at least
+	// the newest record again; and the daemon's newest record advances one second per poll
+	// whatever spacing was requested, so a graph drawing at 3 s stored three records per point.
+	// Drawing never noticed, but kHistoryCap bounds the ring in RECORDS, so both effects cost
+	// real history: measured against a live daemon the graphs opened with 28 minutes behind
+	// them and decayed toward 15.
+	//
+	// Safe against a daemon restart resetting its uptime clock: Startup() builds a new
+	// CStatistics per connection, so timestamps only move forward within one ring's lifetime.
+	if (!listHR.empty() && hr.sTimestamp < listHR.back().sTimestamp + minSpacing) {
+		return;
+	}
+
 	listHR.push_back(hr);
 	while (listHR.size() > kHistoryCap) {
 		listHR.pop_front();
 	}
 }
 
-
-void CStatistics::UpdateStats(const CECPacket* stats)
+void CStatistics::UpdateStats(const CECPacket *stats)
 {
 	s_statDatasdUpload = stats->GetTagByNameSafe(EC_TAG_STATS_UL_SPEED)->GetInt();
 	s_statDatasdUpOverhead = stats->GetTagByNameSafe(EC_TAG_STATS_UP_OVERHEAD)->GetInt();
@@ -1129,7 +1292,8 @@
 	s_statDatasdKadFiles = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_FILES)->GetInt();
 	s_statDatasdKadFirewalledUDP = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_FIREWALLED_UDP)->GetInt();
 	s_statDatasdKadIndexedSources = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_INDEXED_SOURCES)->GetInt();
-	s_statDatasdKadIndexedKeywords = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_INDEXED_KEYWORDS)->GetInt();
+	s_statDatasdKadIndexedKeywords =
+		stats->GetTagByNameSafe(EC_TAG_STATS_KAD_INDEXED_KEYWORDS)->GetInt();
 	s_statDatasdKadIndexedNotes = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_INDEXED_NOTES)->GetInt();
 	s_statDatasdKadIndexedLoad = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_INDEXED_LOAD)->GetInt();
 	s_statDatasdKadIPAddress = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_IP_ADDRESS)->GetInt();
@@ -1139,35 +1303,44 @@
 	s_statDatasdBuddyPort = stats->GetTagByNameSafe(EC_TAG_STATS_BUDDY_PORT)->GetInt();
 	s_statDatasdKadInLanMode = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_IN_LAN_MODE)->GetInt();
 	s_statDatasdTotalSentBytes = stats->GetTagByNameSafe(EC_TAG_STATS_TOTAL_SENT_BYTES)->GetInt();
-	s_statDatasdTotalReceivedBytes = stats->GetTagByNameSafe(EC_TAG_STATS_TOTAL_RECEIVED_BYTES)->GetInt();
+	s_statDatasdTotalReceivedBytes =
+		stats->GetTagByNameSafe(EC_TAG_STATS_TOTAL_RECEIVED_BYTES)->GetInt();
 	s_statDatasdSharedFileCount = stats->GetTagByNameSafe(EC_TAG_STATS_SHARED_FILE_COUNT)->GetInt();
 
-	const CECTag * LoggerTag = stats->GetTagByName(EC_TAG_STATS_LOGGER_MESSAGE);
+	// Absence has to mean "unknown", not zero: a daemon older than these tags sends neither,
+	// and GetTagByNameSafe() would answer 0 for both -- which the Downloads panel would read as
+	// a full disk and paint red.
+	const CECTag *tempFree = stats->GetTagByName(EC_TAG_STATS_TEMP_FREE_SPACE);
+	s_statDatasdTempFreeSpace = tempFree ? tempFree->GetInt() : (uint64)FREE_SPACE_UNKNOWN;
+	const CECTag *incomingFree = stats->GetTagByName(EC_TAG_STATS_INCOMING_FREE_SPACE);
+	s_statDatasdIncomingFreeSpace = incomingFree ? incomingFree->GetInt() : (uint64)FREE_SPACE_UNKNOWN;
+
+	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());
+		// Coalesce the whole poll's log lines into a single repaint and one scroll: a
+		// remote-GUI first-sync backlog can be thousands of lines, and per-line rendering
+		// froze the GUI for minutes (issue #445).
+		theApp->BeginRemoteLogBatch();
+		for (const auto &tag : *LoggerTag) {
+			theApp->AddRemoteLogLine(tag.GetStringData());
 		}
+		theApp->EndRemoteLogBatch();
 	}
 }
 
+void CStatistics::UpdateStatsTree() {}
 
-void CStatistics::UpdateStatsTree()
-{}
-
-
-void CStatistics::RebuildStatTreeRemote(const CECTag * tag)
+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;

amule-3.0.1.tar.gz/src/Statistics.h -> amule-3.1.0.tar.gz/src/Statistics.h Changed

@@ -27,13 +27,15 @@
 #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 in CPreciseRateCounter ctor
+#include "Constants.h"    // Needed for StatsGraphType
+#include "StatTree.h"     // Needed for CStatTreeItem* classes
+#include "GetTickCount.h" // Needed for GetTickCount64 in CPreciseRateCounter ctor
 
-#include <deque>		// Needed for std::deque
+#include <atomic> // Needed for std::atomic (free-space figures)
+#include <deque>  // Needed for std::deque
 
-typedef struct UpdateInfo {
+typedef struct UpdateInfo
+{
 	double timestamp;
 	float downloads3;
 	float uploads3;
@@ -41,207 +43,198 @@
 	float kadnodes3;
 } GraphUpdateInfo;
 
-typedef struct HistoryRecord {
-	double		kBytesSent;
-	double		kBytesReceived;
-	float		kBpsUpCur;
-	float		kBpsDownCur;
-	double		sTimestamp;
-	uint16		cntDownloads;
-	uint16		cntUploads;
-	uint16		cntConnections;
-	uint16		kadNodesCur;
-	uint64		kadNodesTotal;
+typedef struct HistoryRecord
+{
+	double kBytesSent;
+	double kBytesReceived;
+	float kBpsUpCur;
+	float kBpsDownCur;
+	double sTimestamp;
+	uint16 cntDownloads;
+	uint16 cntUploads;
+	uint16 cntConnections;
+	uint16 kadNodesCur;
+	uint64 kadNodesTotal;
 } HR;
 
-
-// CPreciseRateCounter is the only history-bookkeeping primitive that
-// CLIENT_GUI needs (for the runAvg trend on remote stats graphs), so
-// it lives outside the #ifndef CLIENT_GUI gate even though the
-// CStatTree* derivatives below are monolithic-only.
-
 /**
- * Counts precise rate/average on added bytes/values.
+ * Returned by the free-space getters when the figure is not available.
  *
- * @note This class is MT-safe.
+ * A distinct value rather than 0: an unreachable mount and a genuinely full disk are different
+ * states, and the second is exactly what the Downloads panel warns about. Callers must not render
+ * or compare this as a size.
  */
-class CPreciseRateCounter {
-	friend class CStatistics;	// for playing dirty tricks to compute running average :P
- public:
+const sint64 FREE_SPACE_UNKNOWN = -1;
 
-	/**
-	 * Constructor
-	 *
-	 * @param timespan Desired timespan for rate calculations.
-	 * @param count_average Counts average instead of rate.
-	 */
+// CPreciseRateCounter is the only history-bookkeeping primitive CLIENT_GUI needs (the runAvg trend
+// on remote stats graphs), so it sits outside the #ifndef CLIENT_GUI gate even though the
+// CStatTree* derivatives below are monolithic-only.
+
+/// Counts precise rate/average on added bytes/values. MT-safe.
+class CPreciseRateCounter
+{
+	friend class CStatistics; // for playing dirty tricks to compute running average :P
+
+public:
+	/// @param timespan Timespan for rate calculations.
+	/// @param count_average Count an average instead of a rate.
 	CPreciseRateCounter(uint32_t timespan, bool count_average = false)
-		: m_timespan(timespan), m_total(0), m_rate(0.0), m_max_rate(0.0), m_tmp_sum(0), m_count_average(count_average)
-		{
-			if (!count_average) {
-				uint64_t cur_time = GetTickCount64();
-				uint64_t target_time = cur_time - timespan;
-				while (cur_time > target_time) {
-					m_tick_history.push_front(cur_time);
-					m_byte_history.push_front(0);
-					cur_time -= 100;	// default update period
-				}
+	: m_timespan(timespan)
+	, m_total(0)
+	, m_rate(0.0)
+	, m_max_rate(0.0)
+	, m_tmp_sum(0)
+	, m_count_average(count_average)
+	{
+		if (!count_average) {
+			uint64_t cur_time = GetTickCount64();
+			uint64_t target_time = cur_time - timespan;
+			while (cur_time > target_time) {
 				m_tick_history.push_front(cur_time);
+				m_byte_history.push_front(0);
+				cur_time -= 100; // default update period
 			}
+			m_tick_history.push_front(cur_time);
 		}
+	}
 
-	/**
-	 * Calculate current rate.
-	 *
-	 * This function should be called reasonably often, to
-	 * keep rates up-to-date, and prevent history growing
-	 * to the skies.
-	 */
-	void	CalculateRate(uint64_t now);
+	/// Calculate the current rate. Call reasonably often, to keep rates up to date and stop the
+	/// history growing without bound.
+	void CalculateRate(uint64_t now);
 
-	/**
-	 * Get current rate.
-	 *
-	 * @return Current rate in bytes/second.
-	 */
-	double	GetRate()			{ wxMutexLocker lock(m_mutex); return m_rate; };
+	/// Current rate, in bytes/second.
+	double GetRate()
+	{
+		wxMutexLocker lock(m_mutex);
+		return m_rate;
+	};
 
-	/**
-	 * Gets ever seen maximal rate.
-	 *
-	 * @return The maximal rate which occurred.
-	 */
-	double	GetMaxRate()			{ wxMutexLocker lock(m_mutex); return m_max_rate; }
+	/// The highest rate ever seen.
+	double GetMaxRate()
+	{
+		wxMutexLocker lock(m_mutex);
+		return m_max_rate;
+	}
 
-	/**
-	 * Sets desired timespan for rate calculations.
-	 *
-	 * If new timespan is greater than the old was, then the change
-	 * takes effect with time. The exact time needed for the change
-	 * to take effect is new minus old value of the timespan.
-	 *
-	 * If the new timespan is lower than the old, the change takes
-	 * effect immediately at the next call to CalculateRate().
-	 */
-	void	SetTimespan(uint32_t timespan)	{ wxMutexLocker lock(m_mutex); m_timespan = timespan; }
+	/// Sets the timespan for rate calculations. A longer timespan takes effect gradually, over
+	/// the difference between the new and old values; a shorter one takes effect at the next
+	/// CalculateRate().
+	void SetTimespan(uint32_t timespan)
+	{
+		wxMutexLocker lock(m_mutex);
+		m_timespan = timespan;
+	}
 
-	/**
-	 * Add bytes to be tracked for rate-counting.
-	 */
-	void	operator+=(uint32_t bytes)	{ wxMutexLocker lock(m_mutex); m_tmp_sum += bytes; }
-
- protected:
-
-	std::deque<uint32>	m_byte_history;
-	std::deque<uint64>	m_tick_history;
-	uint32_t	m_timespan;
-	uint32_t	m_total;
-	double		m_rate;
-	double		m_max_rate;
-	uint32_t	m_tmp_sum;
-	wxMutex		m_mutex;
-	bool		m_count_average;
-};
+	/// Add bytes to be tracked for rate-counting.
+	void operator+=(uint32_t bytes)
+	{
+		wxMutexLocker lock(m_mutex);
+		m_tmp_sum += bytes;
+	}
 
+protected:
+	std::deque<uint32> m_byte_history;
+	std::deque<uint64> m_tick_history;
+	uint32_t m_timespan;
+	// Sum of every sample currently inside the window. Wide because the sum is not a byte
+	// count: with count_average the samples are rates, and the graphs' running average holds a
+	// 5 minute window of them -- 100 samples at the default 3 s spacing, which passes 2^32 once
+	// the mean rate reaches about 41 MB/s. Past that it wrapped and the trend collapsed. The
+	// samples themselves are fine at 32 bits; only their sum is not.
+	uint64_t m_total;
+	double m_rate;
+	double m_max_rate;
+	uint32_t m_tmp_sum;
+	wxMutex m_mutex;
+	bool m_count_average;
+};
 
 #ifndef CLIENT_GUI
 
 class CECTag;
 
-/**
- * Stat tree item for rates/averages.
- */
-class CStatTreeItemRateCounter : public CStatTreeItemBase, public CPreciseRateCounter {
- public:
-
-	/**
-	 * @see CStatTreeItemBase::CStatTreeItemBase, CPreciseRateCounter::CPreciseRateCounter
-	 *
-	 * @param show_maxrate If true, shows max rate instead of current rate.
-	 */
-	CStatTreeItemRateCounter(const wxString& label, bool show_maxrate, uint32_t timespan, bool count_average = false)
-		: CStatTreeItemBase(label, stNone), CPreciseRateCounter(timespan, count_average), m_show_maxrate(show_maxrate)
-		{}
+/// Stat tree item for rates/averages.
+class CStatTreeItemRateCounter : public CStatTreeItemBase, public CPreciseRateCounter
+{
+public:
+	/// @see CStatTreeItemBase::CStatTreeItemBase, CPreciseRateCounter::CPreciseRateCounter
+	/// @param show_maxrate Show the max rate instead of the current rate.
+	CStatTreeItemRateCounter(
+		const wxString &label, bool show_maxrate, uint32_t timespan, bool count_average = false)
+	: CStatTreeItemBase(label, stNone)
+	, CPreciseRateCounter(timespan, count_average)
+	, m_show_maxrate(show_maxrate)
+	{
+	}
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
+	/// @see CStatTreeItemBase::GetDisplayString()
 	virtual wxString GetDisplayString() const;
 #endif
 
- protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void	AddECValues(CECTag* tag) const;
+protected:
+	/// @see CStatTreeItemBase::AddECValues
+	virtual void AddECValues(CECTag *tag) const;
 
 	//! Whether to show max rate instead of actual rate.
-	bool	m_show_maxrate;
+	bool m_show_maxrate;
 };
 
-
-/**
- * Stat tree item for Peak Connections.
- */
-class CStatTreeItemPeakConnections : public CStatTreeItemBase {
- public:
-
-	/**
-	 * @see CStatTreeItemBase::CStatTreeItemBase
-	 */
-	CStatTreeItemPeakConnections(const wxString& label)
-		: CStatTreeItemBase(label)
-		{}
+/// Stat tree item for Peak Connections.
+class CStatTreeItemPeakConnections : public CStatTreeItemBase
+{
+public:
+	/// @see CStatTreeItemBase::CStatTreeItemBase
+	CStatTreeItemPeakConnections(const wxString &label)
+	: CStatTreeItemBase(label)
+	{
+	}
 
 #ifndef AMULE_DAEMON
-	/**
-	 * @see CStatTreeItemBase::GetDisplayString()
-	 */
+	/// @see CStatTreeItemBase::GetDisplayString()
 	virtual wxString GetDisplayString() const;
 #endif
 
- protected:
-	/**
-	 * Add values to EC tag being generated.
-	 *
-	 * @param tag The tag to which values should be added.
-	 *
-	 * @see CStatTreeItemBase::AddECValues
-	 */
-	virtual	void	AddECValues(CECTag* tag) const;
+protected:
+	/// @see CStatTreeItemBase::AddECValues
+	virtual void AddECValues(CECTag *tag) const;
 };
 
-
 class CUpDownClient;
 
-class CStatistics {
-	friend class CStatisticsDlg;	// to access CStatistics::GetTreeRoot()
- public:
+class CStatistics
+{
+	friend class CStatisticsDlg; // to access CStatistics::GetTreeRoot()
+
+public:
 	CStatistics();
 	~CStatistics();
 
-	static void	Load();
-	static void	Save();
+	static void Load();
+	static void Save();
 
 	/* Statistics graph functions */
 
-	void	 RecordHistory();
+	void RecordHistory();
 	unsigned GetHistoryForWeb(unsigned cntPoints, double sStep, double *sStart, uint32 **graphData);
-	// EC_OP_STATSGRAPHS variant that also fills per-point active-up /
-	// active-down counters and the latest session totals, so amulegui
-	// can render the same 3-line Connections scope and true
-	// kBytesReceived/sTimestamp session average as monolithic amule.
-	// connData is freshly new'd on success (caller owns / deletes).
-	unsigned GetHistoryForGui(unsigned cntPoints, double sStep, double *sStart,
-				  uint32 **graphData, uint32 **connData,
-				  uint64 &sessionDlKBytes, uint64 &sessionUlKBytes,
-				  uint64 &sessionKadTotal, double &sessionTimespanSec);
-	unsigned GetHistory(unsigned cntPoints, double sStep, double sFinal, const std::vector<float *> &ppf, StatsGraphType which_graph);
+	// EC_OP_STATSGRAPHS variant that also fills per-point active-up / active-down counters and
+	// the latest session totals, so amulegui can render the same 3-line Connections scope and
+	// true session average as monolithic amule. connData is new'd on success and owned by the
+	// caller.
+	unsigned GetHistoryForGui(unsigned cntPoints,
+		double sStep,
+		double *sStart,
+		uint32 **graphData,
+		uint32 **connData,
+		uint64 &sessionDlKBytes,
+		uint64 &sessionUlKBytes,
+		uint64 &sessionKadTotal,
+		double &sessionTimespanSec);
+	unsigned GetHistory(unsigned cntPoints,
+		double sStep,
+		double sFinal,
+		const std::vector<float *> &ppf,
+		StatsGraphType which_graph);
 	GraphUpdateInfo GetPointsForUpdate();
 
 	/* Statistics tree functions */
@@ -251,246 +244,364 @@
 	/* Access to the tree */
 
 	// uptime
-	static	uint64	GetUptimeMillis()			{ return s_uptime->GetTimerValue(); }
-	static	uint64	GetUptimeSeconds()			{ return s_uptime->GetTimerSeconds(); }
-	static	uint64	GetStartTime()				{ return s_uptime->GetTimerStart(); }
+	static uint64 GetUptimeMillis() { return s_uptime->GetTimerValue(); }
+	static uint64 GetUptimeSeconds() { return s_uptime->GetTimerSeconds(); }
+	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; }
-	static	void	AddUpOverheadServer(uint32 size)	{ (*s_serverUpOverhead) += size; (*s_upOverheadRate) += size; }
-	static	void	AddUpOverheadKad(uint32 size)		{ (*s_kadUpOverhead) += size; (*s_upOverheadRate) += size; }
-	static	void	AddUpOverheadCrypt(uint32_t size)	{ (*s_cryptUpOverhead) += size; }
-	static	void	AddUpOverheadOther(uint32 size)		{ (*s_totalUpOverhead) += size; (*s_upOverheadRate) += size; }
-	static	double	GetUpOverheadRate()			{ return s_upOverheadRate->GetRate(); }
-	static	void	AddSuccessfulUpload()			{ ++(*s_totalSuccUploads); }
-	static	void	AddFailedUpload()			{ ++(*s_totalFailedUploads); }
-	static	void	AddUploadTime(uint32 time)		{ (*s_totalUploadTime) += time; }
-	static	void	AddUploadingClient()			{ ++(*s_activeUploads); }
-	static	void	RemoveUploadingClient()			{ --(*s_activeUploads); }
-	static	uint32	GetActiveUploadsCount()			{ return (*s_activeUploads); }
-	static	void	AddWaitingClient()			{ ++(*s_waitingUploads); }
-	static	void	RemoveWaitingClient()			{ --(*s_waitingUploads); }
-	static	uint32	GetWaitingUserCount()			{ return (*s_waitingUploads); }
-	static	double	GetUploadRate()				{ return s_uploadrate->GetRate(); }
+	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;
+	}
+	static void AddUpOverheadServer(uint32 size)
+	{
+		(*s_serverUpOverhead) += size;
+		(*s_upOverheadRate) += size;
+	}
+	static void AddUpOverheadKad(uint32 size)
+	{
+		(*s_kadUpOverhead) += size;
+		(*s_upOverheadRate) += size;
+	}
+	static void AddUpOverheadCrypt(uint32_t size) { (*s_cryptUpOverhead) += size; }
+	static void AddUpOverheadOther(uint32 size)
+	{
+		(*s_totalUpOverhead) += size;
+		(*s_upOverheadRate) += size;
+	}
+	static double GetUpOverheadRate() { return s_upOverheadRate->GetRate(); }
+	static void AddSuccessfulUpload() { ++(*s_totalSuccUploads); }
+	static void AddFailedUpload() { ++(*s_totalFailedUploads); }
+	static void AddUploadTime(uint32 time) { (*s_totalUploadTime) += time; }
+	static void AddUploadingClient() { ++(*s_activeUploads); }
+	static void RemoveUploadingClient() { --(*s_activeUploads); }
+	static uint32 GetActiveUploadsCount() { return (*s_activeUploads); }
+	static void AddWaitingClient() { ++(*s_waitingUploads); }
+	static void RemoveWaitingClient() { --(*s_waitingUploads); }
+	static uint32 GetWaitingUserCount() { return (*s_waitingUploads); }
+	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; }
-	static	void	AddDownOverheadServer(uint32 size)	{ (*s_serverDownOverhead) += size; (*s_downOverheadRate) += size; }
-	static	void	AddDownOverheadKad(uint32 size)		{ (*s_kadDownOverhead) += size; (*s_downOverheadRate) += size; }
-	static	void	AddDownOverheadCrypt(uint32_t size)	{ (*s_cryptDownOverhead) += size; }
-	static	void	AddDownOverheadOther(uint32 size)	{ (*s_totalDownOverhead) += size; (*s_downOverheadRate) += size; }
-	static	double	GetDownOverheadRate()			{ return s_downOverheadRate->GetRate(); }
-	static	void	AddFoundSource()			{ ++(*s_foundSources); }
-	static	void	RemoveFoundSource()			{ --(*s_foundSources); }
-	static	uint32	GetFoundSources()			{ return (*s_foundSources); }
-	static	void	AddSourceOrigin(unsigned origin);
-	static	void	RemoveSourceOrigin(unsigned origin);
-	static	void	AddDownloadingSource()			{ ++(*s_activeDownloads); }
-	static	void	RemoveDownloadingSource()		{ --(*s_activeDownloads); }
-	static	uint32	GetDownloadingSources()			{ return (*s_activeDownloads); }
-	static	double	GetDownloadRate()			{ return s_downloadrate->GetRate(); }
+	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;
+	}
+	static void AddDownOverheadServer(uint32 size)
+	{
+		(*s_serverDownOverhead) += size;
+		(*s_downOverheadRate) += size;
+	}
+	static void AddDownOverheadKad(uint32 size)
+	{
+		(*s_kadDownOverhead) += size;
+		(*s_downOverheadRate) += size;
+	}
+	static void AddDownOverheadCrypt(uint32_t size) { (*s_cryptDownOverhead) += size; }
+	static void AddDownOverheadOther(uint32 size)
+	{
+		(*s_totalDownOverhead) += size;
+		(*s_downOverheadRate) += size;
+	}
+	static double GetDownOverheadRate() { return s_downOverheadRate->GetRate(); }
+	static void AddFoundSource() { ++(*s_foundSources); }
+	static void RemoveFoundSource() { --(*s_foundSources); }
+	static uint32 GetFoundSources() { return (*s_foundSources); }
+	static void AddSourceOrigin(unsigned origin);
+	static void RemoveSourceOrigin(unsigned origin);
+	static void AddDownloadingSource() { ++(*s_activeDownloads); }
+	static void RemoveDownloadingSource() { --(*s_activeDownloads); }
+	static uint32 GetDownloadingSources() { return (*s_activeDownloads); }
+	static double GetDownloadRate() { return s_downloadrate->GetRate(); }
 
 	// Connection
-	static	CStatTreeItemTimer* GetServerConnectTimer()	{ return s_sinceConnected; }
-	static	void	AddReconnect()				{ ++(*s_reconnects); }
-	static	void	AddActiveConnection()			{ ++(*s_activeConnections); }
-	static	void	RemoveActiveConnection()		{ --(*s_activeConnections); }
-	static	uint32	GetActiveConnections()			{ return s_activeConnections->GetValue(); }
-	static	uint32	GetPeakConnections()			{ return s_activeConnections->GetMaxValue(); }
-	static	void	AddMaxConnectionLimitReached()		{ ++(*s_limitReached); }
+	static CStatTreeItemTimer *GetServerConnectTimer() { return s_sinceConnected; }
+	static void AddReconnect() { ++(*s_reconnects); }
+	static void AddActiveConnection() { ++(*s_activeConnections); }
+	static void RemoveActiveConnection() { --(*s_activeConnections); }
+	static uint32 GetActiveConnections() { return s_activeConnections->GetValue(); }
+	static uint32 GetPeakConnections() { return s_activeConnections->GetMaxValue(); }
+	static void AddMaxConnectionLimitReached() { ++(*s_limitReached); }
 
 	// Clients
-	static	void	AddFilteredClient()			{ ++(*s_filtered); }
-	static	void	AddUnknownClient()			{ ++(*s_unknown); }
-	static	void	RemoveUnknownClient()			{ --(*s_unknown); }
-	static	void	AddKnownClient(CUpDownClient *pClient);
-	static	void	RemoveKnownClient(uint32 clientSoft, uint32 clientVersion, const wxString& OSInfo);
+	static void AddFilteredClient() { ++(*s_filtered); }
+	static void AddUnknownClient() { ++(*s_unknown); }
+	static void RemoveUnknownClient() { --(*s_unknown); }
+	static void AddKnownClient(CUpDownClient *pClient);
+	static void RemoveKnownClient(uint32 clientSoft, uint32 clientVersion, const wxString &OSInfo);
 #ifdef __DEBUG__
-	static	void	SocketAssignedToClient()		{ ++(*s_hasSocket); }
-	static	void	SocketUnassignedFromClient()		{ --(*s_hasSocket); }
+	static void SocketAssignedToClient() { ++(*s_hasSocket); }
+	static void SocketUnassignedFromClient() { --(*s_hasSocket); }
+#endif
+	static uint32 GetBannedCount() { return (*s_banned); }
+	static void AddBannedClient() { ++(*s_banned); }
+	static void RemoveBannedClient() { --(*s_banned); }
+
+	/**
+	 * Addresses Kad is currently refusing to talk to (CSafeKad).
+	 *
+	 * Set rather than incremented, because these bans lapse inside an aged map with no event to
+	 * hang a decrement on: the count is read back from the record on the Kad timer. That also
+	 * makes it immune to the add/remove drift CBanRecord had to be extracted to fix.
+	 *
+	 * Kept apart from the banned-client figure above on purpose. That one counts CClientList
+	 * bans, which block TCP connections; this one covers Kad addresses only, and conflating
+	 * them would report a peer as barred from uploads when it is merely unwelcome in the
+	 * routing table.
+	 */
+#ifdef ENABLE_KAD_NODE_PROTECTION
+	static void SetKadBannedAddresses(uint32 value) { s_kadBanned->SetValue(value); }
 #endif
-	static	uint32	GetBannedCount()			{ return (*s_banned); }
-	static	void	AddBannedClient()			{ ++(*s_banned); }
-	static	void	RemoveBannedClient()			{ --(*s_banned); }
 
 	// Servers
-	static	void	AddServer()				{ ++(*s_totalServers); }
-	static	void	DeleteServer()				{ ++(*s_deletedServers); --(*s_totalServers); }
-	static	void	DeleteAllServers()			{ (*s_deletedServers) += (*s_totalServers); (*s_totalServers) = 0; }
-	static	void	AddFilteredServer()			{ ++(*s_filteredServers); }
+	static void AddServer() { ++(*s_totalServers); }
+	static void DeleteServer()
+	{
+		++(*s_deletedServers);
+		--(*s_totalServers);
+	}
+	static void DeleteAllServers()
+	{
+		(*s_deletedServers) += (*s_totalServers);
+		(*s_totalServers) = 0;
+	}
+	static void AddFilteredServer() { ++(*s_filteredServers); }
 
 	// Shared files
-	static	void	ClearSharedFilesInfo()			{ (*s_numberOfShared) = 0; (*s_sizeOfShare) = 0; }
-	static	void	AddSharedFile(uint64 size)		{ ++(*s_numberOfShared); (*s_sizeOfShare) += size; }
-	static	void	RemoveSharedFile(uint64 size)		{ --(*s_numberOfShared); (*s_sizeOfShare) -= size; }
-	static	uint32	GetSharedFileCount()			{ return (*s_numberOfShared); }
+	static void ClearSharedFilesInfo()
+	{
+		(*s_numberOfShared) = 0;
+		(*s_sizeOfShare) = 0;
+	}
+	static void AddSharedFile(uint64 size)
+	{
+		++(*s_numberOfShared);
+		(*s_sizeOfShare) += size;
+	}
+	static void RemoveSharedFile(uint64 size)
+	{
+		--(*s_numberOfShared);
+		(*s_sizeOfShare) -= size;
+	}
+	static uint32 GetSharedFileCount() { return (*s_numberOfShared); }
 
 	// Kad nodes
-	static void	AddKadNode()				{ ++s_kadNodesCur; }
-	static void	RemoveKadNode()				{ --s_kadNodesCur; }
-	static uint16_t GetKadNodes()			{ return s_kadNodesCur; }
-
+	static void AddKadNode() { ++s_kadNodesCur; }
+	static void RemoveKadNode() { --s_kadNodesCur; }
+	static uint16_t GetKadNodes() { return s_kadNodesCur; }
+
+	/// Free space on the filesystem holding the part files, in bytes, or FREE_SPACE_UNKNOWN
+	/// until CFreeSpaceThread has published a figure -- which is also what an unreachable mount
+	/// leaves here. A plain atomic read that never touches the filesystem: the probe itself
+	/// blocks, sometimes for as long as a dead NFS mount takes to give up, so it lives on its
+	/// own thread, and both callers here (the GUI timer and the EC stats reply) are on latency-
+	/// critical loops.
+	static sint64 GetTempFreeSpace() { return s_tempFreeSpace.load(std::memory_order_relaxed); }
+
+	//! Free space where finished downloads land. See GetTempFreeSpace(); this is the default
+	//! category's incoming directory, the one the Shared Files panel reports.
+	static sint64 GetIncomingFreeSpace() { return s_incomingFreeSpace.load(std::memory_order_relaxed); }
+
+	//! Called by CFreeSpaceThread with a fresh sample. Nothing else writes
+	//! these, and no reader needs a matching pair.
+	static void PublishTempFreeSpace(sint64 bytes)
+	{
+		s_tempFreeSpace.store(bytes, std::memory_order_relaxed);
+	}
+	static void PublishIncomingFreeSpace(sint64 bytes)
+	{
+		s_incomingFreeSpace.store(bytes, std::memory_order_relaxed);
+	}
 
 	// Other
-	static	void	CalculateRates();
+	static void CalculateRates();
 
-	static	void	AddReceivedBytes(uint32 bytes)
-		{
-			if (!s_sinceFirstTransfer->IsRunning()) {
-				s_sinceFirstTransfer->StartTimer();
-			}
-
-			(*s_sessionDownload) += bytes;
-			(*s_downloadrate) += bytes;
-			s_totalReceived += bytes;
-			s_statsNeedSave = true;
+	static void AddReceivedBytes(uint32 bytes)
+	{
+		if (!s_sinceFirstTransfer->IsRunning()) {
+			s_sinceFirstTransfer->StartTimer();
 		}
 
-	static	void	AddSentBytes(uint32 bytes)
-		{
-			if (!s_sinceFirstTransfer->IsRunning()) {
-				s_sinceFirstTransfer->StartTimer();
-			}
+		(*s_sessionDownload) += bytes;
+		(*s_downloadrate) += bytes;
+		s_totalReceived += bytes;
+		s_statsNeedSave = true;
+	}
 
-			(*s_sessionUpload) += bytes;
-			(*s_uploadrate) += bytes;
-			s_totalSent += bytes;
-			s_statsNeedSave = true;
+	static void AddSentBytes(uint32 bytes)
+	{
+		if (!s_sinceFirstTransfer->IsRunning()) {
+			s_sinceFirstTransfer->StartTimer();
 		}
 
-	static	void	AddDownloadFromSoft(uint8 SoftType, uint32 bytes);
-	static	void	AddUploadToSoft(uint8 SoftType, uint32 bytes);
+		(*s_sessionUpload) += bytes;
+		(*s_uploadrate) += bytes;
+		s_totalSent += bytes;
+		s_statsNeedSave = true;
+	}
+
+	static void AddDownloadFromSoft(uint8 SoftType, uint32 bytes);
+	static void AddUploadToSoft(uint8 SoftType, uint32 bytes);
 
 	// EC
-	static	CECTag*	GetECStatTree(uint8 tree_capping_value)	{ return s_statTree->CreateECTag(tree_capping_value); }
+	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;
-	typedef std::list<HR>::reverse_iterator	listRPOS;
+	// Records held per resolution range. The list is nHistRanges of these, each range at twice
+	// the spacing of the one before, so this sets both how far back the graphs can reach and
+	// how much of that reach is at fine resolution: at a 3 s update delay the two finest ranges
+	// are the ones a graph can plot from.
+	//
+	// Was (1280 / 2) - 80 = 560, once derived from a GUI width, which put the finest usable
+	// reach at 28 minutes -- exhaustible by a remote GUI in a window barely wider than half a
+	// screen. At 64 bytes a record the whole list costs 7 x this x 64 bytes, so 787 KB here
+	// against 245 KB at the old value.
+	//
+	// Public because it is reported to remote GUIs over EC: a client asking for more points
+	// than a range holds would be answered with the same record repeated.
+	static int GetPointsPerRange() { return 1800; }
 
-	/* Graph-related functions */
+private:
+	std::list<HR> listHR;
+	typedef std::list<HR>::iterator listPOS;
+	typedef std::list<HR>::reverse_iterator listRPOS;
 
-	void ComputeAverages(HR **pphr, listRPOS pos, unsigned cntFilled,
-		double sStep, const std::vector<float *> &ppf, StatsGraphType which_graph);
+	/* Graph-related functions */
 
-	int GetPointsPerRange()
-	{
-		return (1280/2) - 80; // This used to be a calc. based on GUI width
-	}
+	void ComputeAverages(HR **pphr,
+		listRPOS pos,
+		unsigned cntFilled,
+		double sStep,
+		const std::vector<float *> &ppf,
+		StatsGraphType which_graph);
 
 	/* Graphs-related vars */
 
-	CPreciseRateCounter	m_graphRunningAvgDown;
-	CPreciseRateCounter	m_graphRunningAvgUp;
-	CPreciseRateCounter	m_graphRunningAvgKad;
-
+	CPreciseRateCounter m_graphRunningAvgDown;
+	CPreciseRateCounter m_graphRunningAvgUp;
+	CPreciseRateCounter m_graphRunningAvgKad;
 
 	uint8 average_minutes;
-	int	nHistRanges;
-	int	bitsHistClockMask;
-	int	nPointsPerRange;
-	listPOS*	aposRecycle;
+	int nHistRanges;
+	int bitsHistClockMask;
+	int nPointsPerRange;
+	listPOS *aposRecycle;
 
 	HR hrInit;
 
 	/* Rate/Average counters */
-	static	CPreciseRateCounter*		s_upOverheadRate;
-	static	CPreciseRateCounter*		s_downOverheadRate;
-	static	CStatTreeItemRateCounter*	s_uploadrate;
-	static	CStatTreeItemRateCounter*	s_downloadrate;
+	static CPreciseRateCounter *s_upOverheadRate;
+	static CPreciseRateCounter *s_downOverheadRate;
+	static CStatTreeItemRateCounter *s_uploadrate;
+	static CStatTreeItemRateCounter *s_downloadrate;
 
 	/* Tree-related functions */
 
-	static	void	InitStatsTree();
+	static void InitStatsTree();
 
-	static	CStatTreeItemBase*	GetTreeRoot()	{ return s_statTree; }
+	static CStatTreeItemBase *GetTreeRoot() { return s_statTree; }
 
 	/* Tree-related vars */
 
-	// the tree
-	static	CStatTreeItemBase*		s_statTree;
+	static CStatTreeItemBase *s_statTree;
 
 	// Uptime
-	static	CStatTreeItemTimer*		s_uptime;
+	static CStatTreeItemTimer *s_uptime;
 
 	// Upload
-	static	CStatTreeItemUlDlCounter*	s_sessionUpload;
-	static	CStatTreeItemPacketTotals*	s_totalUpOverhead;
-	static	CStatTreeItemPackets*		s_fileReqUpOverhead;
-	static	CStatTreeItemPackets*		s_sourceXchgUpOverhead;
-	static	CStatTreeItemPackets*		s_serverUpOverhead;
-	static	CStatTreeItemPackets*		s_kadUpOverhead;
-	static	CStatTreeItemCounter*		s_cryptUpOverhead;
-	static	CStatTreeItemNativeCounter*	s_activeUploads;
-	static	CStatTreeItemNativeCounter*	s_waitingUploads;
-	static	CStatTreeItemCounter*		s_totalSuccUploads;
-	static	CStatTreeItemCounter*		s_totalFailedUploads;
-	static	CStatTreeItemCounter*		s_totalUploadTime;
+	static CStatTreeItemUlDlCounter *s_sessionUpload;
+	static CStatTreeItemPacketTotals *s_totalUpOverhead;
+	static CStatTreeItemPackets *s_fileReqUpOverhead;
+	static CStatTreeItemPackets *s_sourceXchgUpOverhead;
+	static CStatTreeItemPackets *s_serverUpOverhead;
+	static CStatTreeItemPackets *s_kadUpOverhead;
+	static CStatTreeItemCounter *s_cryptUpOverhead;
+	static CStatTreeItemNativeCounter *s_activeUploads;
+	static CStatTreeItemNativeCounter *s_waitingUploads;
+	static CStatTreeItemCounter *s_totalSuccUploads;
+	static CStatTreeItemCounter *s_totalFailedUploads;
+	static CStatTreeItemCounter *s_totalUploadTime;
 
 	// Download
-	static	CStatTreeItemUlDlCounter*	s_sessionDownload;
-	static	CStatTreeItemPacketTotals*	s_totalDownOverhead;
-	static	CStatTreeItemPackets*		s_fileReqDownOverhead;
-	static	CStatTreeItemPackets*		s_sourceXchgDownOverhead;
-	static	CStatTreeItemPackets*		s_serverDownOverhead;
-	static	CStatTreeItemPackets*		s_kadDownOverhead;
-	static	CStatTreeItemCounter*		s_cryptDownOverhead;
-	static	CStatTreeItemCounter*		s_foundSources;
-	static	CStatTreeItemNativeCounter*	s_activeDownloads;
+	static CStatTreeItemUlDlCounter *s_sessionDownload;
+	static CStatTreeItemPacketTotals *s_totalDownOverhead;
+	static CStatTreeItemPackets *s_fileReqDownOverhead;
+	static CStatTreeItemPackets *s_sourceXchgDownOverhead;
+	static CStatTreeItemPackets *s_serverDownOverhead;
+	static CStatTreeItemPackets *s_kadDownOverhead;
+	static CStatTreeItemCounter *s_cryptDownOverhead;
+	static CStatTreeItemCounter *s_foundSources;
+	static CStatTreeItemNativeCounter *s_activeDownloads;
 
 	// Connection
-	static	CStatTreeItemReconnects*	s_reconnects;
-	static	CStatTreeItemTimer*		s_sinceFirstTransfer;
-	static	CStatTreeItemTimer*		s_sinceConnected;
-	static	CStatTreeItemCounterMax*	s_activeConnections;
-	static	CStatTreeItemMaxConnLimitReached* s_limitReached;
-	static	CStatTreeItemSimple*		s_avgConnections;
+	static CStatTreeItemReconnects *s_reconnects;
+	static CStatTreeItemTimer *s_sinceFirstTransfer;
+	static CStatTreeItemTimer *s_sinceConnected;
+	static CStatTreeItemCounterMax *s_activeConnections;
+	static CStatTreeItemMaxConnLimitReached *s_limitReached;
+	static CStatTreeItemSimple *s_avgConnections;
 
 	// Clients
-	static	CStatTreeItemHiddenCounter*	s_clients;
-	static	CStatTreeItemCounter*		s_unknown;
-	//static	CStatTreeItem			s_lowID;
-	//static	CStatTreeItem			s_secIdentOnOff;
+	static CStatTreeItemHiddenCounter *s_clients;
+	static CStatTreeItemCounter *s_unknown;
 #ifdef __DEBUG__
-	static	CStatTreeItemNativeCounter*	s_hasSocket;
+	static CStatTreeItemNativeCounter *s_hasSocket;
+#endif
+	static CStatTreeItemNativeCounter *s_filtered;
+	static CStatTreeItemNativeCounter *s_banned;
+#ifdef ENABLE_KAD_NODE_PROTECTION
+	static CStatTreeItemNativeCounter *s_kadBanned;
 #endif
-	static	CStatTreeItemNativeCounter*	s_filtered;
-	static	CStatTreeItemNativeCounter*	s_banned;
 
 	// Servers
-	static	CStatTreeItemSimple*		s_workingServers;
-	static	CStatTreeItemSimple*		s_failedServers;
-	static	CStatTreeItemNativeCounter*	s_totalServers;
-	static	CStatTreeItemNativeCounter*	s_deletedServers;
-	static	CStatTreeItemNativeCounter*	s_filteredServers;
-	static	CStatTreeItemSimple*		s_usersOnWorking;
-	static	CStatTreeItemSimple*		s_filesOnWorking;
-	static	CStatTreeItemSimple*		s_totalUsers;
-	static	CStatTreeItemSimple*		s_totalFiles;
-	static	CStatTreeItemSimple*		s_serverOccupation;
+	static CStatTreeItemSimple *s_workingServers;
+	static CStatTreeItemSimple *s_failedServers;
+	static CStatTreeItemNativeCounter *s_totalServers;
+	static CStatTreeItemNativeCounter *s_deletedServers;
+	static CStatTreeItemNativeCounter *s_filteredServers;
+	static CStatTreeItemSimple *s_usersOnWorking;
+	static CStatTreeItemSimple *s_filesOnWorking;
+	static CStatTreeItemSimple *s_totalUsers;
+	static CStatTreeItemSimple *s_totalFiles;
+	static CStatTreeItemSimple *s_serverOccupation;
 
 	// Shared files
-	static	CStatTreeItemCounter*		s_numberOfShared;
-	static	CStatTreeItemCounter*		s_sizeOfShare;
+	static CStatTreeItemCounter *s_numberOfShared;
+	static CStatTreeItemCounter *s_sizeOfShare;
 
 	// Kad nodes
-	static	uint64_t	s_kadNodesTotal;
-	static	uint16_t	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 uint64_t s_totalSent;
+	static uint64_t s_totalReceived;
+
+	// Written by CFreeSpaceThread, read by the main and EC threads. Atomic for that reason
+	// alone: they are the only cross-thread state in this class.
+	static std::atomic<sint64> s_tempFreeSpace;
+	static std::atomic<sint64> s_incomingFreeSpace;
 
-	static	bool		s_statsNeedSave;
+	static bool s_statsNeedSave;
 };
 
 #else /* CLIENT_GUI */
@@ -498,7 +609,8 @@
 class CECPacket;
 class CRemoteConnect;
 
-enum StatDataIndex {
+enum StatDataIndex
+{
 	sdUpload,
 	sdUpOverhead,
 	sdDownload,
@@ -523,104 +635,126 @@
 	sdTotalSentBytes,
 	sdTotalReceivedBytes,
 	sdSharedFileCount,
+	sdTempFreeSpace,
+	sdIncomingFreeSpace,
 
 	sdTotalItems
 };
 
-class CStatistics {
-	friend class CStatisticsDlg;	// to access CStatistics::GetTreeRoot()
+class CStatistics
+{
+	friend class CStatisticsDlg; // to access CStatistics::GetTreeRoot()
 
 private:
 	CRemoteConnect &m_conn;
-	static CStatTreeItemBase* s_statTree;
+	static CStatTreeItemBase *s_statTree;
 	static uint64 s_start_time;
 	static uint64 s_statDatasdTotalItems;
 	uint8 average_minutes;
 
-	// History ring for the Statistics + Network->Kad graphs. Filled by
-	// CStatGraphRem::HandlePacket (one HR per decoded point) so the
-	// shared COScopeCtrl::PlotHistory path can replay across tab
-	// switches and auto-rescale events without a daemon round-trip.
-	std::list<HR>				listHR;
-	typedef std::list<HR>::iterator		listPOS;
-	typedef std::list<HR>::reverse_iterator	listRPOS;
-	HR					hrInit;
-	CPreciseRateCounter			m_graphRunningAvgDown;
-	CPreciseRateCounter			m_graphRunningAvgUp;
-	CPreciseRateCounter			m_graphRunningAvgKad;
-
- public:
+	// History ring for the Statistics and Network->Kad graphs. Filled by
+	// CStatGraphRem::HandlePacket, one HR per decoded point, so the shared
+	// COScopeCtrl::PlotHistory path can replay across tab switches and auto-rescale events
+	// without a daemon round-trip.
+	std::list<HR> listHR;
+	typedef std::list<HR>::iterator listPOS;
+	typedef std::list<HR>::reverse_iterator listRPOS;
+	HR hrInit;
+	CPreciseRateCounter m_graphRunningAvgDown;
+	CPreciseRateCounter m_graphRunningAvgUp;
+	CPreciseRateCounter m_graphRunningAvgKad;
+
+public:
 	CStatistics(CRemoteConnect &conn);
 	~CStatistics();
 
-	// Shared with the monolithic build (definitions outside any
-	// CLIENT_GUI gate in Statistics.cpp): assemble a contiguous arrays
-	// of sample points from listHR for the requested graph_type, and
-	// fold the per-trend running averages on top.
-	unsigned GetHistory(unsigned cntPoints, double sStep, double sFinal,
-		const std::vector<float *> &ppf, StatsGraphType which_graph);
-
-	// CLIENT_GUI-only producer (no analogue on monolithic, where
-	// RecordHistory() does the equivalent push from local counters).
-	// Appends one HR record to listHR and caps the ring at
-	// kHistoryCap so memory stays bounded across long sessions.
-	void AddHistoryRecord(const HR& hr);
-	static const size_t kHistoryCap = 1800;	// ~30 min @ 1 Hz
-
-	static	uint64	GetUptimeMillis();
-	static	uint64	GetUptimeSeconds();
-
-	static	uint64	GetTotalSentBytes()			{ return s_statDatasdTotalSentBytes; }
-	static	double	GetUploadRate()				{ return (double)s_statDatasdUpload; }
-	static	double	GetUpOverheadRate()			{ return (double)s_statDatasdUpOverhead; }
-
-	static	uint64	GetTotalReceivedBytes()			{ return s_statDatasdTotalReceivedBytes; }
-	static	double	GetDownloadRate()			{ return (double)s_statDatasdDownload; }
-	static	double	GetDownOverheadRate()			{ return (double)s_statDatasdDownOverhead; }
-
-	static	uint32	GetWaitingUserCount()			{ return s_statDatasdWaitingClients; }
-	static	uint32	GetBannedCount()			{ return s_statDatasdBannedClients; }
-
-	static	uint32	GetSharedFileCount()			{ return s_statDatasdSharedFileCount; }
-
-	static	uint32	GetED2KUsers()			{ return s_statDatasdED2KUsers; }
-	static	uint32	GetKadUsers()			{ return s_statDatasdKadUsers; }
-	static	uint32	GetED2KFiles()			{ return s_statDatasdED2KFiles; }
-	static	uint32	GetKadFiles()			{ return s_statDatasdKadFiles; }
-
-	static	bool	IsFirewalledKadUDP()	{ return s_statDatasdKadFirewalledUDP != 0; }
-	static	uint32	GetKadIndexedSources()	{ return s_statDatasdKadIndexedSources; }
-	static	uint32	GetKadIndexedKeywords()	{ return s_statDatasdKadIndexedKeywords; }
-	static	uint32	GetKadIndexedNotes()	{ return s_statDatasdKadIndexedNotes; }
-	static	uint32	GetKadIndexedLoad()		{ return s_statDatasdKadIndexedLoad; }
-	static	uint32	GetKadIPAddress()		{ return s_statDatasdKadIPAddress; }
-	static	uint8	GetBuddyStatus()		{ return s_statDatasdBuddyStatus; }
-	static	uint32	GetBuddyIP()			{ return s_statDatasdBuddyIP; }
-	static	uint32	GetBuddyPort()			{ return s_statDatasdBuddyPort; }
-	static	bool	IsKadRunningInLanMode()	{ return s_statDatasdKadInLanMode != 0; }
-	static	uint32	GetKadNodes()			{ return s_statDatasdKadNodes; }
-
-	static	void	UpdateStats(const CECPacket* stats);
-
-	void	UpdateStatsTree();
-	void	RebuildStatTreeRemote(const CECTag *);
-	void	SetAverageMinutes(uint8 minutes)	{ average_minutes = minutes; }
-
- private:
-	static	CStatTreeItemBase*	GetTreeRoot()		{ return s_statTree; }
+	// Shared with the monolithic build (definitions outside any CLIENT_GUI gate in
+	// Statistics.cpp): assemble contiguous arrays of sample points from listHR for the
+	// requested graph_type, and fold the per-trend running averages on top.
+	unsigned GetHistory(unsigned cntPoints,
+		double sStep,
+		double sFinal,
+		const std::vector<float *> &ppf,
+		StatsGraphType which_graph);
+
+	// CLIENT_GUI-only producer, with no analogue on monolithic, where RecordHistory() does the
+	// equivalent push from local counters. Appends one HR record to listHR and caps the ring at
+	// kHistoryCap. minSpacing is the seconds-per-point the graphs are drawing at, and records
+	// closer together than that are dropped: finer data than is ever plotted just spends the
+	// ring.
+	void AddHistoryRecord(const HR &hr, double minSpacing);
+	// Drops everything. Used when the sample spacing changes, which
+	// invalidates the resolution the stored points were kept at.
+	void ClearHistory() { listHR.clear(); }
+	// Records, not seconds. One is kept per plotted point, so the useful way to read this is as
+	// a plot width: a graph draws one point per pixel and cannot show more than this many
+	// however wide its window. The span that covers depends on the "Update delay" preference
+	// the points were fetched at -- 3 h at 1 s, a day at 8 s -- but the pixel bound is the same
+	// either way. At 64 bytes a record the ring is about 225 KB.
+	static const size_t kHistoryCap = 3600;
+
+	static uint64 GetUptimeMillis();
+	static uint64 GetUptimeSeconds();
+
+	static uint64 GetTotalSentBytes() { return s_statDatasdTotalSentBytes; }
+	static double GetUploadRate() { return (double)s_statDatasdUpload; }
+	static double GetUpOverheadRate() { return (double)s_statDatasdUpOverhead; }
+
+	static uint64 GetTotalReceivedBytes() { return s_statDatasdTotalReceivedBytes; }
+	static double GetDownloadRate() { return (double)s_statDatasdDownload; }
+	static double GetDownOverheadRate() { return (double)s_statDatasdDownOverhead; }
+
+	static uint32 GetWaitingUserCount() { return s_statDatasdWaitingClients; }
+	static uint32 GetBannedCount() { return s_statDatasdBannedClients; }
+
+	static uint32 GetSharedFileCount() { return s_statDatasdSharedFileCount; }
+
+	// Free space on the daemon's filesystems, as it reported them. Necessarily the core's view:
+	// the machine running the GUI may not have those directories at all, and where it does it
+	// can see a different size, quota or share. Stored as the unsigned slot the array is made
+	// of; FREE_SPACE_UNKNOWN survives the round trip, being the all-ones pattern either way.
+	static sint64 GetTempFreeSpace() { return (sint64)s_statDatasdTempFreeSpace; }
+	static sint64 GetIncomingFreeSpace() { return (sint64)s_statDatasdIncomingFreeSpace; }
+
+	static uint32 GetED2KUsers() { return s_statDatasdED2KUsers; }
+	static uint32 GetKadUsers() { return s_statDatasdKadUsers; }
+	static uint32 GetED2KFiles() { return s_statDatasdED2KFiles; }
+	static uint32 GetKadFiles() { return s_statDatasdKadFiles; }
+
+	static bool IsFirewalledKadUDP() { return s_statDatasdKadFirewalledUDP != 0; }
+	static uint32 GetKadIndexedSources() { return s_statDatasdKadIndexedSources; }
+	static uint32 GetKadIndexedKeywords() { return s_statDatasdKadIndexedKeywords; }
+	static uint32 GetKadIndexedNotes() { return s_statDatasdKadIndexedNotes; }
+	static uint32 GetKadIndexedLoad() { return s_statDatasdKadIndexedLoad; }
+	static uint32 GetKadIPAddress() { return s_statDatasdKadIPAddress; }
+	static uint8 GetBuddyStatus() { return s_statDatasdBuddyStatus; }
+	static uint32 GetBuddyIP() { return s_statDatasdBuddyIP; }
+	static uint32 GetBuddyPort() { return s_statDatasdBuddyPort; }
+	static bool IsKadRunningInLanMode() { return s_statDatasdKadInLanMode != 0; }
+	static uint32 GetKadNodes() { return s_statDatasdKadNodes; }
+
+	static void UpdateStats(const CECPacket *stats);
+
+	void UpdateStatsTree();
+	void RebuildStatTreeRemote(const CECTag *);
+	void SetAverageMinutes(uint8 minutes) { average_minutes = minutes; }
+
+private:
+	static CStatTreeItemBase *GetTreeRoot() { return s_statTree; }
 
 	// Helper for GetHistory(); shared with the monolithic build.
-	void ComputeAverages(HR **pphr, listRPOS pos, unsigned cntFilled,
-		double sStep, const std::vector<float *> &ppf, StatsGraphType which_graph);
+	void ComputeAverages(HR **pphr,
+		listRPOS pos,
+		unsigned cntFilled,
+		double sStep,
+		const std::vector<float *> &ppf,
+		StatsGraphType which_graph);
 };
 
 #endif /* !CLIENT_GUI / CLIENT_GUI */
 
-
-/**
- * Shortcut for CStatistics
- */
-typedef	CStatistics	theStats;
+/// Shortcut for CStatistics.
+typedef CStatistics theStats;
 
 #endif // STATISTICS_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/StatisticsDlg.cpp -> amule-3.1.0.tar.gz/src/StatisticsDlg.cpp Changed

@@ -23,65 +23,58 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include <cmath>		// Needed for std::ceil
-
-#include "ColorFrameCtrl.h"	// Needed for CColorFrameCtrl
-#include "OtherFunctions.h"	// Needed for CastChild()
-#include "OScopeCtrl.h"		// Needed for COScopeCtrl
-#include "Preferences.h"	// Needed for thePrefs
-#include "muuli_wdr.h"		// Needed for statsDlg()
-#include "StatisticsDlg.h"	// Interface declarations
+#include <cmath> // Needed for std::ceil
+
+#include "ColorFrameCtrl.h" // Needed for CColorFrameCtrl
+#include "OtherFunctions.h" // Needed for CastChild()
+#include "OScopeCtrl.h"     // Needed for COScopeCtrl
+#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
 {
-      public:
+public:
 	explicit CTreeItemData(uint32_t uniqueid)
-		: m_uniqueid(uniqueid)
-	{}
+	: m_uniqueid(uniqueid)
+	{
+	}
 
 	uint32_t GetUniqueId() const noexcept { return m_uniqueid; }
 	void SetUniqueId(uint32_t val) noexcept { m_uniqueid = val; }
 
-      private:
+private:
 	uint32_t m_uniqueid;
 };
 
-
 // CStatisticsDlg panel
 
-const wxColour& CStatisticsDlg::getColors(unsigned num)
+const wxColour &CStatisticsDlg::getColors(unsigned num)
 {
 	wxCHECK(num < 15, *wxBLACK);
 
 	return acrStatnum;
 }
 
-CStatisticsDlg::CStatisticsDlg(wxWindow* pParent, CStatistics* stats)
+CStatisticsDlg::CStatisticsDlg(wxWindow *pParent, CStatistics *stats)
 : wxPanel(pParent, -1)
 {
-	wxSizer* content=statsDlg(this,TRUE);
-	content->Show(this,TRUE);
+	wxSizer *content = statsDlg(this, TRUE);
+	content->Show(this, TRUE);
 
-	pscopeDL	= CastChild( "dloadScope", COScopeCtrl );
+	pscopeDL = CastChild("dloadScope", COScopeCtrl);
 	pscopeDL->graph_type = GRAPH_DOWN;
-	pscopeUL	= CastChild( "uloadScope", COScopeCtrl );
+	pscopeUL = CastChild("uloadScope", COScopeCtrl);
 	pscopeUL->graph_type = GRAPH_UP;
-	pscopeConn	= CastChild( "otherScope", COScopeCtrl );
+	pscopeConn = CastChild("otherScope", COScopeCtrl);
 	pscopeConn->graph_type = GRAPH_CONN;
-	stattree	= CastChild( "statTree",	wxTreeCtrl  );
+	stattree = CastChild("statTree", wxTreeCtrl);
 
 	m_stats = stats;
 }
 
-
-
-CStatisticsDlg::~CStatisticsDlg()
-{
-
-}
+CStatisticsDlg::~CStatisticsDlg() {}
 
 void CStatisticsDlg::Init()
 {
@@ -89,119 +82,119 @@
 	InitTree();
 }
 
-
 void CStatisticsDlg::InitGraphs()
 {
 	// called after preferences get initialised
-	for (int index=0; index<=10; ++index) {
+	for (int index = 0; index <= 10; ++index) {
 		ApplyStatsColor(index);
 	}
 
-	pscopeDL->SetRanges(0.0, (float)(thePrefs::GetMaxGraphDownloadRate()+4));
-	pscopeDL->SetYUnits(_("kB/s"));
-	pscopeUL->SetRanges(0.0, (float)(thePrefs::GetMaxGraphUploadRate()+4));
-	pscopeUL->SetYUnits(_("kB/s"));
+	pscopeDL->SetRanges(0.0, (float)(thePrefs::GetMaxGraphDownloadRate() + 4));
+	pscopeDL->SetYUnits(_("KiB/s"));
+	pscopeUL->SetRanges(0.0, (float)(thePrefs::GetMaxGraphUploadRate() + 4));
+	pscopeUL->SetYUnits(_("KiB/s"));
 	pscopeConn->SetRanges(0.0, (float)(thePrefs::GetStatsMax()));
 	pscopeConn->SetYUnits("");
 
 	SetUpdatePeriod(thePrefs::GetTrafficOMeterInterval());
 }
 
-
 // this array is now used to store the current color settings and to define the defaults
-wxColour CStatisticsDlg::acrStatcntStatColors =
-	{
-		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)
-	};
+wxColour CStatisticsDlg::acrStatcntStatColors = { 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::ApplyGraphFrameColors(COScopeCtrl *scope)
+{
+	scope->SetBackgroundColor(getColors(kGraphBackgroundColor));
+	scope->SetGridColor(getColors(kGraphGridColor));
+}
 
-void CStatisticsDlg::ApplyStatsColor(int index)
+void CStatisticsDlg::ApplyGraphSlot(wxWindow *panel, COScopeCtrl *scope, const GraphColorSlot &slot)
 {
-	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 };
-
-	const wxColour& cr = acrStatindex;
-
-	int iRes = aResindex;
-	int iTrend = aTrendindex;
-	COScopeCtrl** ppscope = apscopeindex;
-	CColorFrameCtrl* ctrl;
-	switch (index) {
-		case 0:
-				pscopeDL->SetBackgroundColor(cr);
-				pscopeUL->SetBackgroundColor(cr);
-				pscopeConn->SetBackgroundColor(cr);
-				break;
-		case 1:
-				pscopeDL->SetGridColor(cr);
-				pscopeUL->SetGridColor(cr);
-				pscopeConn->SetGridColor(cr);
-				break;
-		case 2:  case 3:  case 4:
-		case 5:  case 6:  case 7:
-		case 8:  case 9:  case 10:
-				(*ppscope)->SetPlotColor(cr, iTrend);
-				if ((ctrl = CastChild(iRes, CColorFrameCtrl)) == NULL) {
-					throw wxString(CFormat("CStatisticsDlg::ApplyStatsColor: control missing (%d)\n") % iRes);
-				}
-				ctrl->SetBackgroundBrushColour(cr);
-				ctrl->SetFrameBrushColour(*wxBLACK);
-				break;
-		default:
-				break; // ignore unknown index, like SysTray speedbar color
+	const wxColour &cr = getColors(slot.colorIndex);
+	scope->SetPlotColor(cr, slot.iTrend);
+	scope->SetTrendLabel(wxGetTranslation(slot.label), slot.iTrend);
+
+	CColorFrameCtrl *swatch = dynamic_cast<CColorFrameCtrl *>(panel->FindWindow(slot.swatchId));
+	if (swatch == nullptr) {
+		throw wxString(
+			CFormat("CStatisticsDlg::ApplyGraphSlot: control missing (%d)\n") % slot.swatchId);
 	}
+	swatch->SetBackgroundBrushColour(cr);
+	swatch->SetFrameBrushColour(*wxBLACK);
 }
 
-void CStatisticsDlg::UpdateStatGraphs(const uint32 peakconnections, const GraphUpdateInfo& update)
+void CStatisticsDlg::ApplyStatsColor(int index)
 {
+	// Colours 2..10 drive one trend each of the three graphs on this panel, three per graph.
+	// Colour 11 is the systray speed bar and 12..14 belong to the Kad graph; both are applied
+	// by their own owners.
+	static const GraphColorSlot aSlot = { { 2, 2, IDC_C0, wxTRANSLATE("Current") },
+		{ 3, 1, IDC_C0_3, wxTRANSLATE("Running average") },
+		{ 4, 0, IDC_C0_2, wxTRANSLATE("Session average") },
+		{ 5, 2, IDC_C1, wxTRANSLATE("Current") },
+		{ 6, 1, IDC_C1_3, wxTRANSLATE("Running average") },
+		{ 7, 0, IDC_C1_2, wxTRANSLATE("Session average") },
+		{ 8, 1, IDC_S0, wxTRANSLATE("Active connections") },
+		{ 9, 2, IDC_S3, wxTRANSLATE("Active downloads") },
+		{ 10, 0, IDC_S1, wxTRANSLATE("Active uploads") } };
+
+	if (index == kGraphBackgroundColor || index == kGraphGridColor) {
+		ApplyGraphFrameColors(pscopeDL);
+		ApplyGraphFrameColors(pscopeUL);
+		ApplyGraphFrameColors(pscopeConn);
+		return;
+	}
 
-	std::vector<float *> v1(3);
-	v10 = const_cast<float *>(&update.downloads0);
-	v11 = const_cast<float *>(&update.downloads1);
-	v12 = const_cast<float *>(&update.downloads2);
-	const std::vector<float *> &apfDown(v1);
-	std::vector<float *> v2(3);
-	v20 = const_cast<float *>(&update.uploads0);
-	v21 = const_cast<float *>(&update.uploads1);
-	v22 = const_cast<float *>(&update.uploads2);
-	const std::vector<float *> &apfUp(v2);
-	std::vector<float *> v3(3);
-	v30 = const_cast<float *>(&update.connections0);
-	v31 = const_cast<float *>(&update.connections1);
-	v32 = const_cast<float *>(&update.connections2);
-	const std::vector<float *> &apfConn(v3);
-
-	if (!IsShownOnScreen()) {
-		pscopeDL->DelayPoints();
-		pscopeUL->DelayPoints();
-		pscopeConn->DelayPoints();
+	if (index < 2 || index > 10) {
+		return; // not one of this panel's graph colours
 	}
 
-	static unsigned nScalePrev=1;
+	COScopeCtrl *scope = (index <= 4) ? pscopeDL : ((index <= 7) ? pscopeUL : pscopeConn);
+	ApplyGraphSlot(this, scope, aSlotindex - 2);
+}
+
+void CStatisticsDlg::UpdateStatGraphs(const uint32 peakconnections, const GraphUpdateInfo &update)
+{
+
+	// The sample itself reaches the graphs through the statistics history, which already holds
+	// it by the time we get here; update only carries what this panel needs for its own labels
+	// and ranges.
+	static unsigned nScalePrev = 1;
 	unsigned nScale = (unsigned)std::ceil((float)peakconnections / pscopeConn->GetUpperLimit());
 	if (nScale != nScalePrev) {
 		nScalePrev = nScale;
-		wxStaticText* label = CastChild( ID_ACTIVEC, wxStaticText );
+		wxStaticText *label = CastChild(ID_ACTIVEC, wxStaticText);
 
 		label->SetLabel(CFormat(_("Active connections (1:%u)")) % nScale);
-		label->GetParent()->Layout();
+		// The panel, not label->GetParent(): that parent is the static box now.
+		Layout();
 
-		pscopeConn->SetRange(0.0, (float)nScale*pscopeConn->GetUpperLimit(), 1);
+		pscopeConn->SetRange(0.0, (float)nScale * pscopeConn->GetUpperLimit(), 1);
 	}
 
 	if (!IsShownOnScreen()) {
 		return;
 	}
 
-	pscopeDL->AppendPoints(update.timestamp, apfDown);
-	pscopeUL->AppendPoints(update.timestamp, apfUp);
-	pscopeConn->AppendPoints(update.timestamp, apfConn);
+	pscopeDL->AppendPoints(update.timestamp);
+	pscopeUL->AppendPoints(update.timestamp);
+	pscopeConn->AppendPoints(update.timestamp);
 }
 
-
 void CStatisticsDlg::SetUpdatePeriod(int step)
 {
 	// this gets called after the value in Preferences/Statistics/Update delay has been changed
@@ -216,7 +209,6 @@
 	}
 }
 
-
 void CStatisticsDlg::ResetAveragingTime()
 {
 	// this gets called after the value in Preferences/Statistics/time for running avg has been changed
@@ -224,18 +216,16 @@
 	pscopeUL->InvalidateGraph();
 }
 
-
-void CStatisticsDlg::SetARange(bool SetDownload,int maxValue)
+void CStatisticsDlg::SetARange(bool SetDownload, int maxValue)
 {
-	if ( SetDownload ) {
-		pscopeDL->SetRanges( 0, maxValue + 4 );
+	if (SetDownload) {
+		pscopeDL->SetRanges(0, maxValue + 4);
 	} else {
-		pscopeUL->SetRanges( 0, maxValue + 4 );
+		pscopeUL->SetRanges(0, maxValue + 4);
 	}
 }
 
-
-void  CStatisticsDlg::InitTree()
+void CStatisticsDlg::InitTree()
 {
 #ifndef CLIENT_GUI
 	wxTreeItemId root =
@@ -250,9 +240,9 @@
 
 	// Expand main items
 	wxTreeItemIdValue cookie;
-	wxTreeItemId expand_it = stattree->GetFirstChild(root,cookie);
+	wxTreeItemId expand_it = stattree->GetFirstChild(root, cookie);
 
-	while(expand_it.IsOk()) {
+	while (expand_it.IsOk()) {
 		stattree->Expand(expand_it);
 		// Next on this level
 		expand_it = stattree->GetNextSibling(expand_it);
@@ -260,14 +250,15 @@
 #endif
 }
 
-void CStatisticsDlg::GetExpandedNodes(NodeIdSet& nodeset, const wxTreeItemId& root)
+void CStatisticsDlg::GetExpandedNodes(NodeIdSet &nodeset, const wxTreeItemId &root)
 {
 	wxTreeItemIdValue cookie;
-	wxTreeItemId temp_it = stattree->GetFirstChild(root,cookie);
+	wxTreeItemId temp_it = stattree->GetFirstChild(root, cookie);
 
 	while (temp_it.IsOk()) {
 		if (stattree->IsExpanded(temp_it)) {
-			nodeset.insert(dynamic_cast<CTreeItemData*>(stattree->GetItemData(temp_it))->GetUniqueId());
+			nodeset.insert(
+				dynamic_cast<CTreeItemData *>(stattree->GetItemData(temp_it))->GetUniqueId());
 		}
 		if (stattree->ItemHasChildren(temp_it)) {
 			GetExpandedNodes(nodeset, temp_it);
@@ -287,7 +278,7 @@
 		m_stats->UpdateStatsTree();
 	}
 
-	CStatTreeItemBase* treeRoot = theStats::GetTreeRoot();
+	CStatTreeItemBase *treeRoot = theStats::GetTreeRoot();
 	wxTreeItemId root = stattree->GetRootItem();
 	FillTree(treeRoot, root, ExpandedNodes);
 #ifdef CLIENT_GUI
@@ -300,9 +291,9 @@
 
 			// Expand main items
 			wxTreeItemIdValue cookie;
-			wxTreeItemId expand_it = stattree->GetFirstChild(root,cookie);
+			wxTreeItemId expand_it = stattree->GetFirstChild(root, cookie);
 
-			while(expand_it.IsOk()) {
+			while (expand_it.IsOk()) {
 				stattree->Expand(expand_it);
 				// Next on this level
 				expand_it = stattree->GetNextSibling(expand_it);
@@ -313,16 +304,15 @@
 #endif
 }
 
-
 #ifdef CLIENT_GUI
-void CStatisticsDlg::RebuildStatTreeRemote(const CECTag * tag)
+void CStatisticsDlg::RebuildStatTreeRemote(const CECTag *tag)
 {
 	m_stats->RebuildStatTreeRemote(tag);
 }
 #endif
 
-
-void CStatisticsDlg::FillTree(CStatTreeItemBase* statssubtree, wxTreeItemId& StatsGUITree, const NodeIdSet& expandednodes)
+void CStatisticsDlg::FillTree(
+	CStatTreeItemBase *statssubtree, wxTreeItemId &StatsGUITree, const NodeIdSet &expandednodes)
 {
 	wxMutexLocker lock(statssubtree->GetLock());
 
@@ -333,7 +323,7 @@
 #endif
 
 	wxTreeItemIdValue cookie;
-	wxTreeItemId temp_GUI_it = stattree->GetFirstChild(StatsGUITree,cookie);
+	wxTreeItemId temp_GUI_it = stattree->GetFirstChild(StatsGUITree, cookie);
 
 	while (!statssubtree->IsAtEndOfList(temp_it)) {
 		wxTreeItemId temp_item;
@@ -342,7 +332,7 @@
 			stattree->SetItemText(temp_GUI_it, (*temp_it)->GetDisplayString());
 			temp_item = temp_GUI_it;
 			uint32_t uid = (*temp_it)->GetUniqueId();
-			dynamic_cast<CTreeItemData*>(stattree->GetItemData(temp_GUI_it))->SetUniqueId(uid);
+			dynamic_cast<CTreeItemData *>(stattree->GetItemData(temp_GUI_it))->SetUniqueId(uid);
 			if (expandednodes.find(uid) != expandednodes.end()) {
 				stattree->Expand(temp_GUI_it);
 			} else {
@@ -351,7 +341,7 @@
 			temp_GUI_it = stattree->GetNextSibling(temp_GUI_it);
 		} else {
 			// No more child on GUI, add them.
-			temp_item = stattree->AppendItem(StatsGUITree,(*temp_it)->GetDisplayString());
+			temp_item = stattree->AppendItem(StatsGUITree, (*temp_it)->GetDisplayString());
 			stattree->SetItemData(temp_item, new CTreeItemData((*temp_it)->GetUniqueId()));
 		}
 		// Has childs?

amule-3.0.1.tar.gz/src/StatisticsDlg.h -> amule-3.1.0.tar.gz/src/StatisticsDlg.h Changed

@@ -26,12 +26,12 @@
 #ifndef STATISTICSDLG_H
 #define STATISTICSDLG_H
 
-#include <wx/panel.h>		// Needed for wxPanel
+#include <wx/panel.h> // Needed for wxPanel
 #include <wx/colour.h>
 
-#include <set>			// Needed for std::set
+#include <set> // Needed for std::set
 
-typedef std::set<uint32_t>	NodeIdSet;
+typedef std::set<uint32_t> NodeIdSet;
 
 class COScopeCtrl;
 class CStatistics;
@@ -39,7 +39,7 @@
 class CECTag;
 class wxTreeCtrl;
 class wxTreeItemId;
-//struct UpdateInfo;
+// struct UpdateInfo;
 typedef struct UpdateInfo GraphUpdateInfo;
 
 // CStatisticsDlg panel
@@ -50,30 +50,56 @@
 	friend class CPreferences;
 
 public:
-	CStatisticsDlg(wxWindow* pParent, CStatistics* stats);
+	CStatisticsDlg(wxWindow *pParent, CStatistics *stats);
 	~CStatisticsDlg();
 
-	void UpdateStatGraphs(const uint32 peakconnections, const GraphUpdateInfo& update);
+	void UpdateStatGraphs(const uint32 peakconnections, const GraphUpdateInfo &update);
 	void SetUpdatePeriod(int step);
 	void ResetAveragingTime();
 	void ShowStatistics(bool init = false);
 	void SetARange(bool SetDownload, int maxValue);
-	void FillTree(CStatTreeItemBase* statssubtree, wxTreeItemId& StatsGUITree, const NodeIdSet& expandednodes);
-	void GetExpandedNodes(NodeIdSet& nodeset, const wxTreeItemId& root);
+	void FillTree(
+		CStatTreeItemBase *statssubtree, wxTreeItemId &StatsGUITree, const NodeIdSet &expandednodes);
+	void GetExpandedNodes(NodeIdSet &nodeset, const wxTreeItemId &root);
 	void Init();
 	void InitTree();
 	void InitGraphs();
 	void ApplyStatsColor(int index);
 	void RebuildStatTreeRemote(const CECTag *);
-	static const wxColour& getColors(unsigned num);
-	COScopeCtrl* GetDLScope() { return pscopeDL; };
-	COScopeCtrl* GetConnScope() { return pscopeConn; };
+	static const wxColour &getColors(unsigned num);
+
+	// Colour indexes shared by every graph in the GUI.
+	enum
+	{
+		kGraphBackgroundColor = 0,
+		kGraphGridColor = 1
+	};
+
+	// One trend's colour wiring: which preference colour drives it and which legend swatch
+	// shows the same colour beside the graph. CKadDlg describes its graph with these too, so
+	// both panels colour their graphs through the code below rather than each rolling its own.
+	struct GraphColorSlot
+	{
+		unsigned colorIndex; // index into getColors()
+		unsigned iTrend;     // trend within the graph
+		int swatchId;        // CColorFrameCtrl showing the same colour
+		// wxTRANSLATE'd copy of the legend text beside the swatch; the
+		// graph shows it in its hover readout.
+		const char *label;
+	};
+
+	// Background and grid are the same two colours for every graph.
+	static void ApplyGraphFrameColors(COScopeCtrl *scope);
+	// panel is the window holding slot.swatchId.
+	static void ApplyGraphSlot(wxWindow *panel, COScopeCtrl *scope, const GraphColorSlot &slot);
+	COScopeCtrl *GetDLScope() { return pscopeDL; };
+	COScopeCtrl *GetConnScope() { return pscopeConn; };
 
 protected:
 	static wxColour acrStat15;
-	COScopeCtrl* pscopeDL,*pscopeUL,*pscopeConn;
-	wxTreeCtrl* stattree;
-	CStatistics* m_stats;
+	COScopeCtrl *pscopeDL, *pscopeUL, *pscopeConn;
+	wxTreeCtrl *stattree;
+	CStatistics *m_stats;
 };
 
 #endif // STATISTICSDLG_H

amule-3.1.0.tar.gz/src/StreamTransport.h Added

@@ -0,0 +1,163 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 STREAMTRANSPORT_H
+#define STREAMTRANSPORT_H
+
+#include "NetworkAddress.h"
+
+#include <cstddef>
+#include <cstdint>
+
+/**
+ * What a byte stream has to do to stand in for a TCP socket here.
+ *
+ * The eD2k stack above -- CEMSocket and everything it carries -- is written against CLibSocket, so
+ * a second transport is only possible if it answers the same questions. This is that set of
+ * questions, named once, so a transport can be written and tested without a socket, a peer, or the
+ * app.
+ *
+ * The contract that matters is the would-block one, because CEMSocket depends on it rather than
+ * merely tolerating it:
+ *
+ *   - a read or write that cannot proceed returns 0, sets the matching Blocks flag, and leaves
+ * LastError() at 0;
+ *   - a transport that returns 0 with an error set is reporting a dead connection, and the stack
+ * drops the peer.
+ *
+ * Returning 0 and an error for a full send window is therefore not cosmetic: it disconnects a peer
+ * whose window will open a millisecond later.
+ *
+ * Deliberately free of Boost.Asio and of libutp. Both exist below this line; neither belongs in the
+ * include closure of code that only wants bytes.
+ */
+class IStreamTransportEvents;
+
+class IStreamTransport
+{
+public:
+	virtual ~IStreamTransport() = default;
+
+	//! Whether the stream has completed its handshake and not yet ended.
+	virtual bool IsConnected() const = 0;
+
+	virtual bool IsInbound() const = 0;
+
+	/**
+	 * Whether this transport obfuscates the bytes it carries.
+	 *
+	 * True suppresses the ed2k stream handshake, which would otherwise obfuscate them twice.
+	 * Deliberately asked of the transport rather than assumed from its presence: answering
+	 * wrongly sends in the clear what the peer was owed obfuscated.
+	 */
+	virtual bool ObfuscatesStream() const = 0;
+
+	virtual void SetEvents(IStreamTransportEvents *events) = 0;
+
+	//! Whether the stream is usable. False once it has failed or been closed.
+	virtual bool IsOk() const = 0;
+
+	//! Bytes moved into @a buffer. 0 with BlocksRead() means "not yet", not "never".
+	virtual uint32_t Read(void *buffer, uint32_t length) = 0;
+
+	//! Bytes accepted from @a buffer. 0 with BlocksWrite() means "not yet", not "never".
+	virtual uint32_t Write(const void *buffer, uint32_t length) = 0;
+
+	//! Ends the stream. Calling it twice must be harmless.
+	virtual void Close() = 0;
+
+	/**
+	 * Offers whatever Write() queued to the underlying transport.
+	 *
+	 * Write() may run on another thread and only queues, so the owning thread
+	 * has to hand the bytes over. A transport with nothing to defer is empty.
+	 */
+	virtual void Flush() = 0;
+
+	virtual bool BlocksRead() const = 0;
+	virtual bool BlocksWrite() const = 0;
+
+	/**
+	 * Zero unless the stream actually failed. Never set for a would-block.
+	 *
+	 * Only its truthiness is defined; the value is opaque. It shares its name and type with
+	 * `CLibSocket::LastError()`, which returns a boost error_code, so the trap is a call site
+	 * comparing against an errno or WinSock constant and matching by coincidence.
+	 * Implementations keep their values outside those ranges; ask the transport for the reason
+	 * instead.
+	 */
+	virtual int LastError() const = 0;
+
+	/**
+	 * The peer's address, full width.
+	 *
+	 * Deliberately not the 32-bit form `CLibSocket::GetPeerInt()` returns, even though
+	 * mirroring it would make substitution simpler: this series exists because a peer's
+	 * identity does not fit in 32 bits, and a new interface that narrows by construction would
+	 * put back exactly what NetworkAddress.h removed. A call site that genuinely needs the eD2k
+	 * wire form narrows with ToIPv4NetworkOrder() and handles the failure.
+	 */
+	virtual CNetworkAddress GetPeerAddress() const = 0;
+	virtual uint16_t GetPeerPort() const = 0;
+};
+
+/**
+ * What the layer above a stream is told, in the order it is told.
+ *
+ * Deliberately not the CoreNotify_LibSocket* macros: those take a CLibSocket*,
+ * which does not exist until something accepts a connection, and a transport
+ * that reaches for theApp is a transport that cannot be tested. The acceptor
+ * implements this by forwarding to those macros.
+ */
+class IStreamTransportEvents
+{
+public:
+	virtual ~IStreamTransportEvents() = default;
+
+	//! An outbound handshake completed; writability is not completion.
+	virtual void OnStreamConnected() {}
+
+	//! Bytes are readable.
+	virtual void OnStreamReadable() = 0;
+
+	//! The send window opened; a blocked writer may continue.
+	virtual void OnStreamWritable() = 0;
+
+	//! The stream ended, cleanly or otherwise. Ask the transport which.
+	virtual void OnStreamLost() = 0;
+
+	/**
+	 * Asks for Flush() to be called on the main thread.
+	 *
+	 * Raised from the upload bandwidth thread, so the implementation must
+	 * marshal -- MuleNotify::DoNotify clones a functor and delivers it to
+	 * wxTheApp, which is how the asio layer already crosses the same boundary.
+	 * Only the first queue-up since the last flush raises it, so the cost is
+	 * one event per idle-to-busy transition rather than one per write.
+	 */
+	virtual void OnFlushRequested() = 0;
+};
+
+#endif // STREAMTRANSPORT_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/Tag.cpp -> amule-3.1.0.tar.gz/src/Tag.cpp Changed

@@ -23,21 +23,19 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include "Tag.h" // Interface declarations
 
-#include "Tag.h"			// Interface declarations
-
-#include <common/Format.h>		// Needed for WXLONGLONGFMTSPEC
-
-#include "SafeFile.h"			// Needed for CFileDataIO
-#include "MD4Hash.h"			// Needed for CMD4Hash
-#include "CompilerSpecific.h"		// Needed for __FUNCTION__
+#include <common/Format.h> // Needed for WXLONGLONGFMTSPEC
 
+#include "SafeFile.h"         // Needed for CFileDataIO
+#include "MD4Hash.h"          // Needed for CMD4Hash
+#include "CompilerSpecific.h" // Needed for __FUNCTION__
 
 ///////////////////////////////////////////////////////////////////////////////
 // CTag
 
-CTag::CTag(const wxString& Name)
-	: m_Name(Name)
+CTag::CTag(const wxString &Name)
+: m_Name(Name)
 {
 	m_uType = 0;
 	m_uName = 0;
@@ -53,8 +51,8 @@
 	m_nSize = 0;
 }
 
-CTag::CTag(const CTag& rTag)
-	: m_Name(rTag.m_Name)
+CTag::CTag(const CTag &rTag)
+: m_Name(rTag.m_Name)
 {
 	m_uType = rTag.m_uType;
 	m_uName = rTag.m_uName;
@@ -81,8 +79,7 @@
 	}
 }
 
-
-CTag::CTag(const CFileDataIO& data, bool bOptUTF8)
+CTag::CTag(const CFileDataIO &data, bool bOptUTF8)
 {
 	// Zero variables to allow for safe deletion
 	m_uType = m_uName = m_nSize = m_uVal = 0;
@@ -99,85 +96,86 @@
 				m_uName = data.ReadUInt8();
 			} else {
 				m_uName = 0;
-				m_Name = data.ReadOnlyString(utf8strNone,length);
+				m_Name = data.ReadOnlyString(utf8strNone, length);
 			}
 		}
 
-		// NOTE: It's very important that we read the *entire* packet data,
-		// even if we do not use each tag. Otherwise we will get in trouble
-		// when the packets are returned in a list - like the search results
-		// from a server. If we cannot do this, then we throw an exception.
+		// It is very important to read the *entire* packet data, even for tags we do not
+		// use. Otherwise we get into trouble when packets are returned in a list, like
+		// search results from a server. If we cannot, we throw an exception.
 		switch (m_uType) {
-			case TAGTYPE_STRING:
-				m_pstrVal = new wxString(data.ReadString(bOptUTF8));
-				break;
-
-			case TAGTYPE_UINT32:
-				m_uVal = data.ReadUInt32();
-				break;
-
-			case TAGTYPE_UINT64:
-				m_uVal = data.ReadUInt64();
-				break;
-
-			case TAGTYPE_UINT16:
-				m_uVal = data.ReadUInt16();
-				m_uType = TAGTYPE_UINT32;
-				break;
-
-			case TAGTYPE_UINT8:
-				m_uVal = data.ReadUInt8();
-				m_uType = TAGTYPE_UINT32;
-				break;
-
-			case TAGTYPE_FLOAT32:
-				//#warning Endianness problem?
-				data.Read(&m_fVal, 4);
-				break;
-
-			case TAGTYPE_HASH16:
-				m_hashVal = new CMD4Hash(data.ReadHash());
-				break;
-
-			case TAGTYPE_BOOL:
-				printf("***NOTE: %s; Reading BOOL tag\n", __FUNCTION__);
-				data.ReadUInt8();
-				break;
-
-			case TAGTYPE_BOOLARRAY: {
-				printf("***NOTE: %s; Reading BOOL Array tag\n", __FUNCTION__);
-				uint16 len = data.ReadUInt16();
-
-				// 07-Apr-2004: eMule versions prior to 0.42e.29 used the formula "(len+7)/8"!
-				//#warning This seems to be off by one! 8 / 8 + 1 == 2, etc.
-				data.Seek((len / 8) + 1, wxFromCurrent);
-				break;
+		case TAGTYPE_STRING:
+			m_pstrVal = new wxString(data.ReadString(bOptUTF8));
+			break;
+
+		case TAGTYPE_UINT32:
+			m_uVal = data.ReadUInt32();
+			break;
+
+		case TAGTYPE_UINT64:
+			m_uVal = data.ReadUInt64();
+			break;
+
+		case TAGTYPE_UINT16:
+			m_uVal = data.ReadUInt16();
+			m_uType = TAGTYPE_UINT32;
+			break;
+
+		case TAGTYPE_UINT8:
+			m_uVal = data.ReadUInt8();
+			m_uType = TAGTYPE_UINT32;
+			break;
+
+		case TAGTYPE_FLOAT32:
+			// #warning Endianness problem?
+			data.Read(&m_fVal, 4);
+			break;
+
+		case TAGTYPE_HASH16:
+			m_hashVal = new CMD4Hash(data.ReadHash());
+			break;
+
+		case TAGTYPE_BOOL:
+			printf("***NOTE: %s; Reading BOOL tag\n", __FUNCTION__);
+			data.ReadUInt8();
+			break;
+
+		case TAGTYPE_BOOLARRAY: {
+			printf("***NOTE: %s; Reading BOOL Array tag\n", __FUNCTION__);
+			uint16 len = data.ReadUInt16();
+
+			// 07-Apr-2004: eMule versions prior to 0.42e.29 used the formula "(len+7)/8"!
+			// #warning This seems to be off by one! 8 / 8 + 1 == 2, etc.
+			data.Seek((len / 8) + 1, wxFromCurrent);
+			break;
+		}
+
+		case TAGTYPE_BLOB:
+			// 07-Apr-2004: eMule versions prior to 0.42e.29 handled the "len" as int16!
+			m_nSize = data.ReadUInt32();
+
+			// Since the length is 32b, this check is needed to avoid
+			// huge allocations in case of bad tags.
+			if (m_nSize > data.GetLength() - data.GetPosition()) {
+				throw CInvalidPacket("Malformed tag");
 			}
 
-			case TAGTYPE_BLOB:
-				// 07-Apr-2004: eMule versions prior to 0.42e.29 handled the "len" as int16!
-				m_nSize = data.ReadUInt32();
-
-				// Since the length is 32b, this check is needed to avoid
-				// huge allocations in case of bad tags.
-				if (m_nSize > data.GetLength() - data.GetPosition()) {
-					throw CInvalidPacket("Malformed tag");
-				}
-
-				m_pData = new unsigned charm_nSize;
-				data.Read(m_pData, m_nSize);
-				break;
-
-			default:
-				if (m_uType >= TAGTYPE_STR1 && m_uType <= TAGTYPE_STR16) {
-					uint8 length = m_uType - TAGTYPE_STR1 + 1;
-					m_pstrVal = new wxString(data.ReadOnlyString(bOptUTF8, length));
-					m_uType = TAGTYPE_STRING;
-				} else {
-					// Since we cannot determine the length of this tag, we
-					// simply have to abort reading the file.
-					throw CInvalidPacket(CFormat("Unknown tag type encountered %x, cannot proceed!") % m_uType);
-				}
+			m_pData = new unsigned charm_nSize;
+			data.Read(m_pData, m_nSize);
+			break;
+
+		default:
+			if (m_uType >= TAGTYPE_STR1 && m_uType <= TAGTYPE_STR16) {
+				uint8 length = m_uType - TAGTYPE_STR1 + 1;
+				m_pstrVal = new wxString(data.ReadOnlyString(bOptUTF8, length));
+				m_uType = TAGTYPE_STRING;
+			} else {
+				// Since we cannot determine the length of this tag, we
+				// simply have to abort reading the file.
+				throw CInvalidPacket(
+					CFormat("Unknown tag type encountered %x, cannot proceed!") %
+					m_uType);
+			}
 		}
 	} catch (...) {
 		if (m_uType == TAGTYPE_BLOB) {
@@ -188,7 +186,6 @@
 	}
 }
 
-
 CTag::~CTag()
 {
 	if (IsStr()) {
@@ -200,37 +197,44 @@
 	}
 }
 
-
 CTag &CTag::operator=(const CTag &rhs)
 {
 	if (&rhs != this) {
+		// Release whatever THIS currently owns, keyed on its *current* type -- the same
+		// dispatch the destructor uses. The union means the owned pointer only exists for
+		// string / hash / blob / bsob tags; for an int/float tag that slot holds a scalar,
+		// not a pointer. Freeing based on the RHS type, as this used to, frees a garbage
+		// "pointer" whenever the two tags' types differ -- assigning a string tag onto a
+		// slot currently holding an int, which is exactly what std::vector<CTag>::erase
+		// does when it shifts elements. That corrupts the heap, observed as a double free
+		// in a wxString destructor.
+		if (IsStr()) {
+			delete m_pstrVal;
+		} else if (IsHash()) {
+			delete m_hashVal;
+		} else if (IsBlob() || IsBsob()) {
+			delete m_pData;
+		}
+
 		m_uType = rhs.m_uType;
 		m_uName = rhs.m_uName;
 		m_Name = rhs.m_Name;
 		m_nSize = 0;
 		if (rhs.IsStr()) {
-			wxString *p = new wxString(rhs.GetStr());
-			delete m_pstrVal;
-			m_pstrVal = p;
+			m_pstrVal = new wxString(rhs.GetStr());
 		} else if (rhs.IsInt()) {
 			m_uVal = rhs.GetInt();
 		} else if (rhs.IsFloat()) {
 			m_fVal = rhs.GetFloat();
 		} else if (rhs.IsHash()) {
-			CMD4Hash *p = new CMD4Hash(rhs.GetHash());
-			delete m_hashVal;
-			m_hashVal = p;
+			m_hashVal = new CMD4Hash(rhs.GetHash());
 		} else if (rhs.IsBlob()) {
 			m_nSize = rhs.GetBlobSize();
-			unsigned char *p = new unsigned charrhs.GetBlobSize();
-			delete  m_pData;
-			m_pData = p;
+			m_pData = new unsigned charrhs.GetBlobSize();
 			memcpy(m_pData, rhs.GetBlob(), rhs.GetBlobSize());
 		} else if (rhs.IsBsob()) {
 			m_nSize = rhs.GetBsobSize();
-			unsigned char *p = new unsigned charrhs.GetBsobSize();
-			delete  m_pData;
-			m_pData = p;
+			m_pData = new unsigned charrhs.GetBsobSize();
 			memcpy(m_pData, rhs.GetBsob(), rhs.GetBsobSize());
 		} else {
 			wxFAIL;
@@ -240,7 +244,6 @@
 	return *this;
 }
 
-
 #define CHECK_TAG_TYPE(check, expected) \
 	if (!(check)) { \
 		throw CInvalidPacket(#expected " tag expected, but found " + GetFullInfo()); \
@@ -253,15 +256,13 @@
 	return m_uVal;
 }
 
-
-const wxString& CTag::GetStr() const
+const wxString &CTag::GetStr() const
 {
 	CHECK_TAG_TYPE(IsStr(), String);
 
 	return *m_pstrVal;
 }
 
-
 float CTag::GetFloat() const
 {
 	CHECK_TAG_TYPE(IsFloat(), Float);
@@ -269,15 +270,13 @@
 	return m_fVal;
 }
 
-
-const CMD4Hash& CTag::GetHash() const
+const CMD4Hash &CTag::GetHash() const
 {
 	CHECK_TAG_TYPE(IsHash(), Hash);
 
 	return *m_hashVal;
 }
 
-
 uint32 CTag::GetBlobSize() const
 {
 	CHECK_TAG_TYPE(IsBlob(), Blob);
@@ -285,15 +284,13 @@
 	return m_nSize;
 }
 
-
-const uint8_t* CTag::GetBlob() const
+const uint8_t *CTag::GetBlob() const
 {
 	CHECK_TAG_TYPE(IsBlob(), Blob);
 
 	return m_pData;
 }
 
-
 uint32 CTag::GetBsobSize() const
 {
 	CHECK_TAG_TYPE(IsBsob(), Bsob);
@@ -301,15 +298,14 @@
 	return m_nSize;
 }
 
-
-const uint8_t* CTag::GetBsob() const
+const uint8_t *CTag::GetBsob() const
 {
 	CHECK_TAG_TYPE(IsBsob(), Bsob);
 
 	return m_pData;
 }
 
-bool CTag::WriteNewEd2kTag(CFileDataIO* data, EUtf8Str eStrEncode) const
+bool CTag::WriteNewEd2kTag(CFileDataIO *data, EUtf8Str eStrEncode) const
 {
 
 	// Write tag type
@@ -322,7 +318,7 @@
 			uType = TAGTYPE_UINT16;
 		} else if (m_uVal <= 0xFFFFFFFF) {
 			uType = TAGTYPE_UINT32;
-		} else  {
+		} else {
 			uType = TAGTYPE_UINT64;
 		}
 	} else if (IsStr()) {
@@ -339,59 +335,59 @@
 	// Write tag name
 	if (!m_Name.IsEmpty()) {
 		data->WriteUInt8(uType);
-		data->WriteString(m_Name,utf8strNone);
+		data->WriteString(m_Name, utf8strNone);
 	} else {
-		wxASSERT( m_uName != 0 );
+		wxASSERT(m_uName != 0);
 		data->WriteUInt8(uType | 0x80);
 		data->WriteUInt8(m_uName);
 	}
 
 	// Write tag data
 	switch (uType) {
-		case TAGTYPE_STRING:
-			data->WriteString(*m_pstrVal,eStrEncode);
-			break;
-		case TAGTYPE_UINT64:
-			data->WriteUInt64(m_uVal);
-			break;
-		case TAGTYPE_UINT32:
-			data->WriteUInt32(m_uVal);
-			break;
-		case TAGTYPE_UINT16:
-			data->WriteUInt16(m_uVal);
-			break;
-		case TAGTYPE_UINT8:
-			data->WriteUInt8(m_uVal);
-			break;
-		case TAGTYPE_FLOAT32:
-			//#warning Endianness problem?
-			data->Write(&m_fVal, 4);
-			break;
-		case TAGTYPE_HASH16:
-			data->WriteHash(*m_hashVal);
-			break;
-		case TAGTYPE_BLOB:
-			data->WriteUInt32(m_nSize);
-			data->Write(m_pData, m_nSize);
-			break;
-		default:
-			// See comment on the default: of CTag::CTag(const CFileDataIO& data, bool bOptUTF8)
-			if (uType >= TAGTYPE_STR1 && uType <= TAGTYPE_STR16) {
-				// Sending '0' as len size makes it not write the len on the IO file.
-				// This is because this tag types send the len as their type.
-				data->WriteString(*m_pstrVal,eStrEncode,0);
-			} else {
-				printf("%s; Unknown tag: type=0x%02X\n", __FUNCTION__, uType);
-				wxFAIL;
-				return false;
-			}
-			break;
+	case TAGTYPE_STRING:
+		data->WriteString(*m_pstrVal, eStrEncode);
+		break;
+	case TAGTYPE_UINT64:
+		data->WriteUInt64(m_uVal);
+		break;
+	case TAGTYPE_UINT32:
+		data->WriteUInt32(m_uVal);
+		break;
+	case TAGTYPE_UINT16:
+		data->WriteUInt16(m_uVal);
+		break;
+	case TAGTYPE_UINT8:
+		data->WriteUInt8(m_uVal);
+		break;
+	case TAGTYPE_FLOAT32:
+		// #warning Endianness problem?
+		data->Write(&m_fVal, 4);
+		break;
+	case TAGTYPE_HASH16:
+		data->WriteHash(*m_hashVal);
+		break;
+	case TAGTYPE_BLOB:
+		data->WriteUInt32(m_nSize);
+		data->Write(m_pData, m_nSize);
+		break;
+	default:
+		// See comment on the default: of CTag::CTag(const CFileDataIO& data, bool bOptUTF8)
+		if (uType >= TAGTYPE_STR1 && uType <= TAGTYPE_STR16) {
+			// Sending '0' as len size makes it not write the len on the IO file.
+			// This is because this tag types send the len as their type.
+			data->WriteString(*m_pstrVal, eStrEncode, 0);
+		} else {
+			printf("%s; Unknown tag: type=0x%02X\n", __FUNCTION__, uType);
+			wxFAIL;
+			return false;
+		}
+		break;
 	}
 
 	return true;
 }
 
-bool CTag::WriteTagToFile(CFileDataIO* file, EUtf8Str WXUNUSED(eStrEncode), bool restrictive) const
+bool CTag::WriteTagToFile(CFileDataIO *file, EUtf8Str WXUNUSED(eStrEncode), bool restrictive) const
 {
 
 	// Don't write tags of unknown types, we wouldn't be able to read them in again
@@ -408,7 +404,6 @@
 	}
 }
 
-
 wxString CTag::GetFullInfo() const
 {
 	wxString strTag;
@@ -430,8 +425,7 @@
 		strTag += *m_pstrVal;
 		strTag += "\"";
 	} else if (m_uType >= TAGTYPE_STR1 && m_uType <= TAGTYPE_STR16) {
-		strTag += CFormat("(Str%u)\"") % (m_uType - TAGTYPE_STR1 + 1)
-					+  *m_pstrVal + "\"";
+		strTag += CFormat("(Str%u)\"") % (m_uType - TAGTYPE_STR1 + 1) + *m_pstrVal + "\"";
 	} else if (m_uType == TAGTYPE_UINT64) {
 		strTag += CFormat("(Int64)%u") % m_uVal;
 	} else if (m_uType == TAGTYPE_UINT32) {
@@ -452,19 +446,21 @@
 	return strTag;
 }
 
-CTagHash::CTagHash(const wxString& name, const CMD4Hash& value)
-	: CTag(name) {
-		m_hashVal = new CMD4Hash(value);
-		m_uType = TAGTYPE_HASH16;
-	}
+CTagHash::CTagHash(const wxString &name, const CMD4Hash &value)
+: CTag(name)
+{
+	m_hashVal = new CMD4Hash(value);
+	m_uType = TAGTYPE_HASH16;
+}
 
-CTagHash::CTagHash(uint8 name, const CMD4Hash& value)
-	: CTag(name) {
-		m_hashVal = new CMD4Hash(value);
-		m_uType = TAGTYPE_HASH16;
-	}
+CTagHash::CTagHash(uint8 name, const CMD4Hash &value)
+: CTag(name)
+{
+	m_hashVal = new CMD4Hash(value);
+	m_uType = TAGTYPE_HASH16;
+}
 
-void deleteTagPtrListEntries(TagPtrList* taglist)
+void deleteTagPtrListEntries(TagPtrList *taglist)
 {
 	DeleteContents(*taglist);
 }

amule-3.0.1.tar.gz/src/Tag.h -> amule-3.1.0.tar.gz/src/Tag.h Changed

@@ -26,8 +26,7 @@
 #ifndef TAG_H
 #define TAG_H
 
-
-#include <common/StringFunctions.h>	// Needed for EUtf8Str
+#include <common/StringFunctions.h> // Needed for EUtf8Str
 
 #include <tags/TagTypes.h>
 
@@ -42,134 +41,147 @@
 class CTag
 {
 public:
-	CTag(const CTag& rTag);
-	CTag(const CFileDataIO& data, bool bOptUTF8);
+	CTag(const CTag &rTag);
+	CTag(const CFileDataIO &data, bool bOptUTF8);
 	virtual ~CTag();
-	CTag& operator=(const CTag&);
-
-	uint8 GetType() const		{ return m_uType; }
-	uint8 GetNameID() const		{ return m_uName; }
-	const wxString& GetName() const	{ return m_Name; }
-
-	bool IsStr() const		{ return m_uType == TAGTYPE_STRING; }
-	bool IsInt() const		{ return
-		(m_uType == TAGTYPE_UINT64) ||
-		(m_uType == TAGTYPE_UINT32) ||
-		(m_uType == TAGTYPE_UINT16) ||
-		(m_uType == TAGTYPE_UINT8); }
-	bool IsFloat() const		{ return m_uType == TAGTYPE_FLOAT32; }
-	bool IsHash() const		{ return m_uType == TAGTYPE_HASH16; }
-	bool IsBlob() const		{ return m_uType == TAGTYPE_BLOB; }
-	bool IsBsob() const		{ return m_uType == TAGTYPE_BSOB; }
+	CTag &operator=(const CTag &);
+
+	uint8 GetType() const { return m_uType; }
+	uint8 GetNameID() const { return m_uName; }
+	const wxString &GetName() const { return m_Name; }
+
+	bool IsStr() const { return m_uType == TAGTYPE_STRING; }
+	bool IsInt() const
+	{
+		return (m_uType == TAGTYPE_UINT64) || (m_uType == TAGTYPE_UINT32) ||
+		       (m_uType == TAGTYPE_UINT16) || (m_uType == TAGTYPE_UINT8);
+	}
+	bool IsFloat() const { return m_uType == TAGTYPE_FLOAT32; }
+	bool IsHash() const { return m_uType == TAGTYPE_HASH16; }
+	bool IsBlob() const { return m_uType == TAGTYPE_BLOB; }
+	bool IsBsob() const { return m_uType == TAGTYPE_BSOB; }
 
 	uint64 GetInt() const;
 
-	const wxString& GetStr() const;
+	const wxString &GetStr() const;
 
 	float GetFloat() const;
 
-	const CMD4Hash& GetHash() const;
+	const CMD4Hash &GetHash() const;
 
-	const uint8_t* GetBlob() const;
+	const uint8_t *GetBlob() const;
 	uint32 GetBlobSize() const;
 
-	const uint8_t* GetBsob() const;
+	const uint8_t *GetBsob() const;
 	uint32 GetBsobSize() const;
 
-	CTag* CloneTag()		{ return new CTag(*this); }
+	CTag *CloneTag() { return new CTag(*this); }
 
-	bool WriteTagToFile(CFileDataIO* file,
+	bool WriteTagToFile(CFileDataIO *file,
 		EUtf8Str eStrEncode = utf8strNone,
-		bool restrictive = true) const;			// old eD2K tags
-	bool WriteNewEd2kTag(CFileDataIO* file,
-		EUtf8Str eStrEncode = utf8strNone) const;	// new eD2K tags
+		bool restrictive = true) const; // old eD2K tags
+	bool WriteNewEd2kTag(CFileDataIO *file,
+		EUtf8Str eStrEncode = utf8strNone) const; // new eD2K tags
 
 	wxString GetFullInfo() const;
 
 protected:
-	CTag(const wxString& Name);
+	CTag(const wxString &Name);
 	CTag(uint8 uName);
 
-	uint8	m_uType;
-	union {
-		CMD4Hash*	m_hashVal;
-		wxString*	m_pstrVal;
-		uint64		m_uVal;
-		float		m_fVal;
-		unsigned char*	m_pData;
+	uint8 m_uType;
+	union
+	{
+		CMD4Hash *m_hashVal;
+		wxString *m_pstrVal;
+		uint64 m_uVal;
+		float m_fVal;
+		unsigned char *m_pData;
 	};
 
-	uint32		m_nSize;
+	uint32 m_nSize;
 
 private:
-	uint8		m_uName;
-	wxString	m_Name;
-
+	uint8 m_uName;
+	wxString m_Name;
 };
 
-typedef std::list<CTag*> TagPtrList;
+typedef std::list<CTag *> TagPtrList;
 
 class CTagIntSized : public CTag
 {
 public:
-	CTagIntSized(const wxString& name, uint64 value, uint8 bitsize)
-		: CTag(name) {
-			Init(value, bitsize);
-		}
+	CTagIntSized(const wxString &name, uint64 value, uint8 bitsize)
+	: CTag(name)
+	{
+		Init(value, bitsize);
+	}
 
 	CTagIntSized(uint8 name, uint64 value, uint8 bitsize)
-		: CTag(name) {
-			Init(value, bitsize);
-		}
+	: CTag(name)
+	{
+		Init(value, bitsize);
+	}
 
 protected:
-	CTagIntSized(const wxString& name) : CTag(name) {}
-	CTagIntSized(uint8 name) : CTag(name) {}
-
-	void Init(uint64 value, uint8 bitsize) {
-			switch (bitsize) {
-				case 64:
-					wxASSERT(value <= ULONGLONG(0xFFFFFFFFFFFFFFFF));
-					m_uVal = value;
-					m_uType = TAGTYPE_UINT64;
-					break;
-				case 32:
-					wxASSERT(value <= 0xFFFFFFFF);
-					m_uVal = value;
-					m_uType = TAGTYPE_UINT32;
-					break;
-				case 16:
-					wxASSERT(value <= 0xFFFF);
-					m_uVal = value;
-					m_uType = TAGTYPE_UINT16;
-					break;
-				case 8:
-					wxASSERT(value <= 0xFF);
-					m_uVal = value;
-					m_uType = TAGTYPE_UINT8;
-					break;
-				default:
-					throw wxString("Invalid bitsize on int tag");
-			}
+	CTagIntSized(const wxString &name)
+	: CTag(name)
+	{
+	}
+	CTagIntSized(uint8 name)
+	: CTag(name)
+	{
+	}
+
+	void Init(uint64 value, uint8 bitsize)
+	{
+		switch (bitsize) {
+		case 64:
+			wxASSERT(value <= ULONGLONG(0xFFFFFFFFFFFFFFFF));
+			m_uVal = value;
+			m_uType = TAGTYPE_UINT64;
+			break;
+		case 32:
+			wxASSERT(value <= 0xFFFFFFFF);
+			m_uVal = value;
+			m_uType = TAGTYPE_UINT32;
+			break;
+		case 16:
+			wxASSERT(value <= 0xFFFF);
+			m_uVal = value;
+			m_uType = TAGTYPE_UINT16;
+			break;
+		case 8:
+			wxASSERT(value <= 0xFF);
+			m_uVal = value;
+			m_uType = TAGTYPE_UINT8;
+			break;
+		default:
+			throw wxString("Invalid bitsize on int tag");
+		}
 	}
 };
 
 class CTagVarInt : public CTagIntSized
 {
 public:
-	CTagVarInt(const wxString& name, uint64 value, uint8 forced_bits = 0)
-		: CTagIntSized(name) {
-			SizedInit(value, forced_bits);
-		}
+	CTagVarInt(const wxString &name, uint64 value, uint8 forced_bits = 0)
+	: CTagIntSized(name)
+	{
+		SizedInit(value, forced_bits);
+	}
 	CTagVarInt(uint8 name, uint64 value, uint8 forced_bits = 0)
-		: CTagIntSized(name) {
-			SizedInit(value, forced_bits);
-		}
+	: CTagIntSized(name)
+	{
+		SizedInit(value, forced_bits);
+	}
+
 private:
-	void SizedInit(uint64 value, uint8 forced_bits) {
+	void SizedInit(uint64 value, uint8 forced_bits)
+	{
 		if (forced_bits) {
 			// The bitsize was forced.
-			Init(value,forced_bits);
+			Init(value, forced_bits);
 		} else {
 			m_uVal = value;
 			if (value <= 0xFF) {
@@ -188,88 +200,108 @@
 class CTagInt64 : public CTagIntSized
 {
 public:
-	CTagInt64(const wxString& name, uint64 value)
-		: CTagIntSized(name, value, 64) {	}
+	CTagInt64(const wxString &name, uint64 value)
+	: CTagIntSized(name, value, 64)
+	{
+	}
 
 	CTagInt64(uint8 name, uint64 value)
-		: CTagIntSized(name, value, 64) { }
+	: CTagIntSized(name, value, 64)
+	{
+	}
 };
 
 class CTagInt32 : public CTagIntSized
 {
 public:
-	CTagInt32(const wxString& name, uint64 value)
-		: CTagIntSized(name, value, 32) {	}
+	CTagInt32(const wxString &name, uint64 value)
+	: CTagIntSized(name, value, 32)
+	{
+	}
 
 	CTagInt32(uint8 name, uint64 value)
-		: CTagIntSized(name, value, 32) { }
+	: CTagIntSized(name, value, 32)
+	{
+	}
 };
 
 class CTagInt16 : public CTagIntSized
 {
 public:
-	CTagInt16(const wxString& name, uint64 value)
-		: CTagIntSized(name, value, 16) {	}
+	CTagInt16(const wxString &name, uint64 value)
+	: CTagIntSized(name, value, 16)
+	{
+	}
 
 	CTagInt16(uint8 name, uint64 value)
-		: CTagIntSized(name, value, 16) { }
+	: CTagIntSized(name, value, 16)
+	{
+	}
 };
 
 class CTagInt8 : public CTagIntSized
 {
 public:
-	CTagInt8(const wxString& name, uint64 value)
-		: CTagIntSized(name, value, 8) {	}
+	CTagInt8(const wxString &name, uint64 value)
+	: CTagIntSized(name, value, 8)
+	{
+	}
 
 	CTagInt8(uint8 name, uint64 value)
-		: CTagIntSized(name, value, 8) { }
+	: CTagIntSized(name, value, 8)
+	{
+	}
 };
 
 class CTagFloat : public CTag
 {
 public:
-	CTagFloat(const wxString& name, float value)
-		: CTag(name) {
-			m_fVal = value;
-			m_uType = TAGTYPE_FLOAT32;
-		}
+	CTagFloat(const wxString &name, float value)
+	: CTag(name)
+	{
+		m_fVal = value;
+		m_uType = TAGTYPE_FLOAT32;
+	}
 
 	CTagFloat(uint8 name, float value)
-		: CTag(name) {
-			m_fVal = value;
-			m_uType = TAGTYPE_FLOAT32;
-		}
+	: CTag(name)
+	{
+		m_fVal = value;
+		m_uType = TAGTYPE_FLOAT32;
+	}
 };
 
 class CTagString : public CTag
 {
 public:
-	CTagString(const wxString& name, const wxString& value)
-		: CTag(name) {
-			m_pstrVal = new wxString(value);
-			m_uType = TAGTYPE_STRING;
-		}
+	CTagString(const wxString &name, const wxString &value)
+	: CTag(name)
+	{
+		m_pstrVal = new wxString(value);
+		m_uType = TAGTYPE_STRING;
+	}
 
-	CTagString(uint8 name, const wxString& value)
-		: CTag(name) {
-			m_pstrVal = new wxString(value);
-			m_uType = TAGTYPE_STRING;
-		}
+	CTagString(uint8 name, const wxString &value)
+	: CTag(name)
+	{
+		m_pstrVal = new wxString(value);
+		m_uType = TAGTYPE_STRING;
+	}
 };
 
 class CTagHash : public CTag
 {
 public:
 	// Implementation on .cpp to allow forward declaration of CMD4Hash
-	CTagHash(const wxString& name, const CMD4Hash& value);
-	CTagHash(uint8 name, const CMD4Hash& value);
+	CTagHash(const wxString &name, const CMD4Hash &value);
+	CTagHash(uint8 name, const CMD4Hash &value);
 };
 
 class CTagBsob : public CTag
 {
 public:
-	CTagBsob(const wxString& name, const uint8_t* value, uint8 nSize)
-		: CTag(name)
+	CTagBsob(const wxString &name, const uint8_t *value, uint8 nSize)
+	: CTag(name)
 	{
 		m_uType = TAGTYPE_BSOB;
 		m_pData = new uint8_tnSize;
@@ -281,8 +313,8 @@
 class CTagBlob : public CTag
 {
 public:
-	CTagBlob(const wxString& name, const uint8_t* value, uint8 nSize)
-		: CTag(name)
+	CTagBlob(const wxString &name, const uint8_t *value, uint8 nSize)
+	: CTag(name)
 	{
 		m_uType = TAGTYPE_BLOB;
 		m_pData = new uint8_tnSize;
@@ -291,7 +323,7 @@
 	}
 };
 
-void deleteTagPtrListEntries(TagPtrList* taglist);
+void deleteTagPtrListEntries(TagPtrList *taglist);
 
 #endif // TAG_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/TerminationProcess.cpp -> amule-3.1.0.tar.gz/src/TerminationProcess.cpp Changed

amule-3.0.1.tar.gz/src/TerminationProcess.h -> amule-3.1.0.tar.gz/src/TerminationProcess.h Changed

amule-3.1.0.tar.gz/src/TerminationProcessAmuleApi.cpp Added

@@ -0,0 +1,42 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "TerminationProcessAmuleApi.h"
+
+CTerminationProcessAmuleApi::CTerminationProcessAmuleApi(const wxString &cmd, int *amuleapi_pid)
+: CTerminationProcess(cmd)
+, m_amuleapi_pid(amuleapi_pid)
+{
+	// Don't open a command window on Windows
+	Redirect();
+}
+
+void CTerminationProcessAmuleApi::OnTerminate(int pid, int status)
+{
+	// Tell the application that amuleapi is no longer running
+	*m_amuleapi_pid = 0;
+
+	// Normal termination processing here
+	CTerminationProcess::OnTerminate(pid, status);
+}

amule-3.1.0.tar.gz/src/TerminationProcessAmuleApi.h Added

@@ -0,0 +1,42 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 TERMINATIONPROCESSAMULEAPI_H
+#define TERMINATIONPROCESSAMULEAPI_H
+
+#include "TerminationProcess.h" // for CTerminationProcess
+
+// This is the handler for process termination events.
+// Used on some calls to wxExecute().
+class CTerminationProcessAmuleApi : public CTerminationProcess
+{
+private:
+	int *m_amuleapi_pid;
+
+public:
+	CTerminationProcessAmuleApi(const wxString &cmd, int *amuleapi_pid);
+	virtual void OnTerminate(int pid, int status);
+};
+
+#endif // TERMINATIONPROCESSAMULEAPI_H

amule-3.0.1.tar.gz/src/TerminationProcessAmuleweb.cpp -> amule-3.1.0.tar.gz/src/TerminationProcessAmuleweb.cpp Changed

amule-3.0.1.tar.gz/src/TerminationProcessAmuleweb.h -> amule-3.1.0.tar.gz/src/TerminationProcessAmuleweb.h Changed

amule-3.0.1.tar.gz/src/TextClient.cpp -> amule-3.1.0.tar.gz/src/TextClient.cpp Changed

@@ -23,33 +23,34 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "config.h"			// Needed for VERSION
+#include "config.h" // Needed for VERSION
 #include "TextClient.h"
 
+#include "SearchProgressReport.h"
+
 #ifndef __WINDOWS__
-	#include <unistd.h>		// Do_not_auto_remove
+#include <unistd.h> // Do_not_auto_remove
 #endif
 
-
 //-------------------------------------------------------------------
 
-
 //-------------------------------------------------------------------
 
 #include <ec/cpp/ECSpecialTags.h>
 
 #include <wx/tokenzr.h>
 
-#include <common/Format.h>		// Needed for CFormat
+#include <common/Format.h>          // Needed for CFormat
+#include <common/StringFunctions.h> // Needed for RestoreEncodedPipes
 #include "OtherFunctions.h"
-#include "Constants.h"			// Needed for Priority Levels
-#include "DataToText.h"			// Needed for PriorityToStr
-#include "MuleVersion.h"		// Needed for GetMuleVersion()
+#include "Constants.h"   // Needed for Priority Levels
+#include "DataToText.h"  // Needed for PriorityToStr
+#include "MuleVersion.h" // Needed for GetMuleVersion()
 
 //-------------------------------------------------------------------
 
-enum {
+enum
+{
 	CMD_ID_STATUS,
 	CMD_ID_RESUME,
 	CMD_ID_PAUSE,
@@ -90,6 +91,8 @@
 	CMD_ID_SET_BWLIMIT_UP,
 	CMD_ID_SET_BWLIMIT_DOWN,
 	CMD_ID_GET_BWLIMITS,
+	CMD_ID_SET_ENDGAME,
+	CMD_ID_GET_ENDGAME,
 	CMD_ID_STATTREE,
 	CMD_ID_SEARCH,
 	CMD_ID_SEARCH_GLOBAL,
@@ -103,9 +106,8 @@
 
 };
 
-// method to create a SearchFile
 SearchFile::SearchFile(const CEC_SearchFile_Tag *tag)
-	: nHash(tag->FileHash())
+: nHash(tag->FileHash())
 {
 	sHash = nHash.Encode();
 	sFileName = tag->FileName();
@@ -114,10 +116,9 @@
 	bPresent = tag->AlreadyHave();
 }
 
-// Parse a size string like "100M", "1G", "512K", "12345" (bytes default).
-// Suffixes are case-insensitive and use binary multipliers
-// (K=1024, M=1024*1024, G=1024*1024*1024). Returns true on success.
-static bool ParseSizeWithSuffix(const wxString& s, uint64& out)
+// Parse a size string like "100M", "1G", "512K", "12345" (bytes by default). Suffixes are case-
+// insensitive and binary (K=1024, M=1024*1024, G=1024*1024*1024). True on success.
+static bool ParseSizeWithSuffix(const wxString &s, uint64 &out)
 {
 	if (s.IsEmpty()) {
 		return false;
@@ -127,11 +128,20 @@
 	const wxUniChar last = s.Last();
 	if (!wxIsdigit(last)) {
 		switch (static_cast<int>(wxTolower(last))) {
-			case 'k': multiplier = 1024ULL; break;
-			case 'm': multiplier = 1024ULL * 1024; break;
-			case 'g': multiplier = 1024ULL * 1024 * 1024; break;
-			case 'b': multiplier = 1; break;
-			default: return false;
+		case 'k':
+			multiplier = 1024ULL;
+			break;
+		case 'm':
+			multiplier = 1024ULL * 1024;
+			break;
+		case 'g':
+			multiplier = 1024ULL * 1024 * 1024;
+			break;
+		case 'b':
+			multiplier = 1;
+			break;
+		default:
+			return false;
 		}
 		digits = s.Left(s.length() - 1);
 	}
@@ -143,19 +153,16 @@
 	return true;
 }
 
-// Strip optional --type / --extension / --avail / --min-size / --max-size
-// flags from `args`, leaving only the search keyword(s). Each flag takes
-// exactly one whitespace-separated value. Unknown tokens are preserved as
-// part of the search query, joined by single spaces in input order.
-// Returns true on success, false if a flag is missing its value or a value
-// fails to parse; on failure the output values are undefined.
-static bool ParseSearchFilters(
-	wxString& args,
-	wxString& type,
-	wxString& extension,
-	uint32& avail,
-	uint64& min_size,
-	uint64& max_size)
+// Strip optional --type / --extension / --avail / --min-size / --max-size flags from `args`,
+// leaving the search keywords. Each flag takes exactly one whitespace-separated value; unknown
+// tokens stay part of the query, joined by single spaces in input order. False if a flag is missing
+// its value or a value fails to parse, in which case the outputs are undefined.
+static bool ParseSearchFilters(wxString &args,
+	wxString &type,
+	wxString &extension,
+	uint32 &avail,
+	uint64 &min_size,
+	uint64 &max_size)
 {
 	type.Clear();
 	extension.Clear();
@@ -168,22 +175,30 @@
 	while (tok.HasMoreTokens()) {
 		wxString t = tok.GetNextToken();
 		if (t == wxT("--type")) {
-			if (!tok.HasMoreTokens()) return false;
+			if (!tok.HasMoreTokens())
+				return false;
 			type = tok.GetNextToken();
 		} else if (t == wxT("--extension") || t == wxT("--ext")) {
-			if (!tok.HasMoreTokens()) return false;
+			if (!tok.HasMoreTokens())
+				return false;
 			extension = tok.GetNextToken();
 		} else if (t == wxT("--avail") || t == wxT("--availability")) {
-			if (!tok.HasMoreTokens()) return false;
+			if (!tok.HasMoreTokens())
+				return false;
 			unsigned long n = 0;
-			if (!tok.GetNextToken().ToULong(&n)) return false;
+			if (!tok.GetNextToken().ToULong(&n))
+				return false;
 			avail = static_cast<uint32>(n);
 		} else if (t == wxT("--min-size")) {
-			if (!tok.HasMoreTokens()) return false;
-			if (!ParseSizeWithSuffix(tok.GetNextToken(), min_size)) return false;
+			if (!tok.HasMoreTokens())
+				return false;
+			if (!ParseSizeWithSuffix(tok.GetNextToken(), min_size))
+				return false;
 		} else if (t == wxT("--max-size")) {
-			if (!tok.HasMoreTokens()) return false;
-			if (!ParseSizeWithSuffix(tok.GetNextToken(), max_size)) return false;
+			if (!tok.HasMoreTokens())
+				return false;
+			if (!ParseSizeWithSuffix(tok.GetNextToken(), max_size))
+				return false;
 		} else {
 			if (!remaining.IsEmpty()) {
 				remaining += wxT(' ');
@@ -197,22 +212,28 @@
 }
 
 //-------------------------------------------------------------------
-IMPLEMENT_APP (CamulecmdApp)
+IMPLEMENT_APP(CamulecmdApp)
 //-------------------------------------------------------------------
 
-void CamulecmdApp::OnInitCmdLine(wxCmdLineParser& parser)
+void CamulecmdApp::OnInitCmdLine(wxCmdLineParser &parser)
 {
 	CaMuleExternalConnector::OnInitCmdLine(parser, "amulecmd");
-	parser.AddOption("c", "command",
+	parser.AddOption("c",
+		"command",
 		_("Execute <str> and exit."),
-		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
+		wxCMD_LINE_VAL_STRING,
+		wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddSwitch("",
+		"space-separated",
+		_("Separate list fields with spaces, as before, instead of tabs."),
+		wxCMD_LINE_PARAM_OPTIONAL);
 }
 
-bool CamulecmdApp::OnCmdLineParsed(wxCmdLineParser& parser)
+bool CamulecmdApp::OnCmdLineParsed(wxCmdLineParser &parser)
 {
+	m_spaceSeparated = parser.Found("space-separated");
 	m_HasCmdOnCmdLine = parser.Found("command", &m_CmdString);
-	if (m_CmdString.Lower().StartsWith("help"))
-	{
+	if (m_CmdString.Lower().StartsWith("help")) {
 		OnInitCommandSet();
 		printf("%s %s\n", m_appname, (const char *)unicode2char(GetMuleVersion()));
 		Parse_Command(m_CmdString);
@@ -222,7 +243,7 @@
 	return CaMuleExternalConnector::OnCmdLineParsed(parser);
 }
 
-void CamulecmdApp::TextShell(const wxString& prompt)
+void CamulecmdApp::TextShell(const wxString &prompt)
 {
 	if (m_HasCmdOnCmdLine)
 		Parse_Command(m_CmdString);
@@ -240,7 +261,7 @@
 
 	// Implementation of the deprecated command 'SetIPFilter'.
 	if (CmdId == CMD_ID_SET_IPFILTER) {
-		if ( ! args.IsEmpty() ) {
+		if (!args.IsEmpty()) {
 			if (args.IsSameAs("ON", false)) {
 				CmdId = CMD_ID_SET_IPFILTER_ON;
 			} else if (args.IsSameAs("OFF", false)) {
@@ -254,422 +275,482 @@
 	}
 
 	switch (CmdId) {
-		case CMD_ID_STATUS:
-			request_list.push_back(new CECPacket(EC_OP_STAT_REQ, EC_DETAIL_CMD));
-			break;
-
-		case CMD_ID_SHUTDOWN:
-			request_list.push_back(new CECPacket(EC_OP_SHUTDOWN));
-			break;
-
-		case CMD_ID_CONNECT:
-			if ( !args.IsEmpty() ) {
-				unsigned int ip4;
-				unsigned int port;
-				// Not much we can do against this unicode2char.
-				int result = sscanf(unicode2char(args), "%3d.%3d.%3d.%3d:%5d", &ip0, &ip1, &ip2, &ip3, &port);
-				if (result != 5) {
-					// Try to resolve DNS -- good for dynamic IP servers
-					wxString serverName(args.BeforeFirst(':'));
-					long lPort;
-					bool ok = args.AfterFirst(':').ToLong(&lPort);
-					port = (unsigned int)lPort;
-					amuleIPV4Address a;
-					a.Hostname(serverName);
-					a.Service(port);
-					result = sscanf(unicode2char(a.IPAddress()), "%3d.%3d.%3d.%3d", &ip0, &ip1, &ip2, &ip3);
-					if (serverName.IsEmpty() || !ok || (result != 4)) {
-						Show(_("Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"));
-						return 0;
-					}
+	case CMD_ID_STATUS:
+		request_list.push_back(new CECPacket(EC_OP_STAT_REQ, EC_DETAIL_CMD));
+		break;
+
+	case CMD_ID_SHUTDOWN:
+		request_list.push_back(new CECPacket(EC_OP_SHUTDOWN));
+		break;
+
+	case CMD_ID_CONNECT:
+		if (!args.IsEmpty()) {
+			unsigned int ip4;
+			unsigned int port;
+			// Not much we can do against this unicode2char.
+			int result = sscanf(unicode2char(args),
+				"%3d.%3d.%3d.%3d:%5d",
+				&ip0,
+				&ip1,
+				&ip2,
+				&ip3,
+				&port);
+			if (result != 5) {
+				// Try to resolve DNS -- good for dynamic IP servers
+				wxString serverName(args.BeforeFirst(':'));
+				long lPort;
+				bool ok = args.AfterFirst(':').ToLong(&lPort);
+				port = (unsigned int)lPort;
+				amuleIPV4Address a;
+				a.Hostname(serverName);
+				a.Service(port);
+				result = sscanf(unicode2char(a.IPAddress()),
+					"%3d.%3d.%3d.%3d",
+					&ip0,
+					&ip1,
+					&ip2,
+					&ip3);
+				if (serverName.IsEmpty() || !ok || (result != 4)) {
+					Show(_("Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"));
+					return 0;
 				}
-				EC_IPv4_t addr;
-				addr.m_ip0 = ip0;
-				addr.m_ip1 = ip1;
-				addr.m_ip2 = ip2;
-				addr.m_ip3 = ip3;
-				addr.m_port = port;
-				request = new CECPacket(EC_OP_SERVER_CONNECT);
-				request->AddTag(CECTag(EC_TAG_SERVER, addr));
-				request_list.push_back(request);
-			} else {
-				request_list.push_back(new CECPacket(EC_OP_CONNECT));
 			}
-			break;
-
-		case CMD_ID_CONNECT_ED2K:
-			request_list.push_back(new CECPacket(EC_OP_SERVER_CONNECT));
-			break;
-
-		case CMD_ID_CONNECT_KAD:
-			request_list.push_back(new CECPacket(EC_OP_KAD_START));
-			break;
-
-		case CMD_ID_DISCONNECT:
-			request_list.push_back(new CECPacket(EC_OP_DISCONNECT));
-			break;
-
-		case CMD_ID_DISCONNECT_ED2K:
-			request_list.push_back(new CECPacket(EC_OP_SERVER_DISCONNECT));
-			break;
-
-		case CMD_ID_DISCONNECT_KAD:
-			request_list.push_back(new CECPacket(EC_OP_KAD_STOP));
-			break;
-
-		case CMD_ID_RELOAD_SHARED:
-			request_list.push_back(new CECPacket(EC_OP_SHAREDFILES_RELOAD));
-			break;
-
-		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);
+			EC_IPv4_t addr;
+			addr.m_ip0 = ip0;
+			addr.m_ip1 = ip1;
+			addr.m_ip2 = ip2;
+			addr.m_ip3 = ip3;
+			addr.m_port = port;
+			request = new CECPacket(EC_OP_SERVER_CONNECT);
+			request->AddTag(CECTag(EC_TAG_SERVER, addr));
 			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:
-			tmp_int = 1;
-		/* fall through */
-		case CMD_ID_SET_IPFILTER_OFF:
-		case CMD_ID_SET_IPFILTER_CLIENTS_OFF:
-		case CMD_ID_SET_IPFILTER_SERVERS_OFF:
-			{
-				if (CmdId == CMD_ID_SET_IPFILTER_CLIENTS_ON || CmdId == CMD_ID_SET_IPFILTER_CLIENTS_OFF) {
-					CmdId = CMD_ID_GET_IPFILTER_STATE_CLIENTS;
-				} else if (CmdId == CMD_ID_SET_IPFILTER_SERVERS_ON || CmdId == CMD_ID_SET_IPFILTER_SERVERS_OFF) {
-					CmdId = CMD_ID_GET_IPFILTER_STATE_SERVERS;
-				} else {
-					CmdId = CMD_ID_GET_IPFILTER_STATE;
-				}
+		} else {
+			request_list.push_back(new CECPacket(EC_OP_CONNECT));
+		}
+		break;
+
+	case CMD_ID_CONNECT_ED2K:
+		request_list.push_back(new CECPacket(EC_OP_SERVER_CONNECT));
+		break;
+
+	case CMD_ID_CONNECT_KAD:
+		request_list.push_back(new CECPacket(EC_OP_KAD_START));
+		break;
+
+	case CMD_ID_DISCONNECT:
+		request_list.push_back(new CECPacket(EC_OP_DISCONNECT));
+		break;
+
+	case CMD_ID_DISCONNECT_ED2K:
+		request_list.push_back(new CECPacket(EC_OP_SERVER_DISCONNECT));
+		break;
+
+	case CMD_ID_DISCONNECT_KAD:
+		request_list.push_back(new CECPacket(EC_OP_KAD_STOP));
+		break;
+
+	case CMD_ID_RELOAD_SHARED:
+		request_list.push_back(new CECPacket(EC_OP_SHAREDFILES_RELOAD));
+		break;
+
+	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:
+		tmp_int = 1;
+	/* fall through */
+	case CMD_ID_SET_IPFILTER_OFF:
+	case CMD_ID_SET_IPFILTER_CLIENTS_OFF:
+	case CMD_ID_SET_IPFILTER_SERVERS_OFF: {
+		if (CmdId == CMD_ID_SET_IPFILTER_CLIENTS_ON || CmdId == CMD_ID_SET_IPFILTER_CLIENTS_OFF) {
+			CmdId = CMD_ID_GET_IPFILTER_STATE_CLIENTS;
+		} else if (CmdId == CMD_ID_SET_IPFILTER_SERVERS_ON ||
+			   CmdId == CMD_ID_SET_IPFILTER_SERVERS_OFF) {
+			CmdId = CMD_ID_GET_IPFILTER_STATE_SERVERS;
+		} else {
+			CmdId = CMD_ID_GET_IPFILTER_STATE;
+		}
 
+		request = new CECPacket(EC_OP_SET_PREFERENCES);
+		CECEmptyTag prefs(EC_TAG_PREFS_SECURITY);
+		if (CmdId != CMD_ID_GET_IPFILTER_STATE_SERVERS) {
+			prefs.AddTag(CECTag(EC_TAG_IPFILTER_CLIENTS, (uint8)tmp_int));
+		}
+		if (CmdId != CMD_ID_GET_IPFILTER_STATE_CLIENTS) {
+			prefs.AddTag(CECTag(EC_TAG_IPFILTER_SERVERS, (uint8)tmp_int));
+		}
+		request->AddTag(prefs);
+		request_list.push_back(request);
+	}
+	/* fall through */
+	case CMD_ID_GET_IPFILTER:
+	case CMD_ID_GET_IPFILTER_STATE:
+	case CMD_ID_GET_IPFILTER_STATE_CLIENTS:
+	case CMD_ID_GET_IPFILTER_STATE_SERVERS:
+		request = new CECPacket(EC_OP_GET_PREFERENCES);
+		request->AddTag(CECTag(EC_TAG_SELECT_PREFS, (uint32)EC_PREFS_SECURITY));
+		request_list.push_back(request);
+		break;
+
+	case CMD_ID_SET_IPFILTER_LEVEL:
+		if (!args.IsEmpty()) // This 'if' must stay as long as we support the deprecated 'IPLevel'
+				     // command.
+		{
+			unsigned long int level = 0;
+			if (args.ToULong(&level) == true && level < 256) {
 				request = new CECPacket(EC_OP_SET_PREFERENCES);
 				CECEmptyTag prefs(EC_TAG_PREFS_SECURITY);
-				if (CmdId != CMD_ID_GET_IPFILTER_STATE_SERVERS) {
-					prefs.AddTag(CECTag(EC_TAG_IPFILTER_CLIENTS, (uint8)tmp_int));
-				}
-				if (CmdId != CMD_ID_GET_IPFILTER_STATE_CLIENTS) {
-					prefs.AddTag(CECTag(EC_TAG_IPFILTER_SERVERS, (uint8)tmp_int));
-				}
+				prefs.AddTag(CECTag(EC_TAG_IPFILTER_LEVEL, (uint8)level));
 				request->AddTag(prefs);
 				request_list.push_back(request);
+			} else {
+				return CMD_ERR_INVALID_ARG;
 			}
-		/* fall through */
-		case CMD_ID_GET_IPFILTER:
-		case CMD_ID_GET_IPFILTER_STATE:
-		case CMD_ID_GET_IPFILTER_STATE_CLIENTS:
-		case CMD_ID_GET_IPFILTER_STATE_SERVERS:
-			request = new CECPacket(EC_OP_GET_PREFERENCES);
-			request->AddTag(CECTag(EC_TAG_SELECT_PREFS, (uint32)EC_PREFS_SECURITY));
-			request_list.push_back(request);
-			break;
-
-		case CMD_ID_SET_IPFILTER_LEVEL:
-			if (!args.IsEmpty()) // This 'if' must stay as long as we support the deprecated 'IPLevel' command.
-			{
-				unsigned long int level = 0;
-				if (args.ToULong(&level) == true && level < 256) {
-					request = new CECPacket(EC_OP_SET_PREFERENCES);
-					CECEmptyTag prefs(EC_TAG_PREFS_SECURITY);
-					prefs.AddTag(CECTag(EC_TAG_IPFILTER_LEVEL, (uint8)level));
-					request->AddTag(prefs);
-					request_list.push_back(request);
-				} else {
-					return CMD_ERR_INVALID_ARG;
+		}
+		CmdId = CMD_ID_GET_IPFILTER_LEVEL;
+	/* fall through */
+	case CMD_ID_GET_IPFILTER_LEVEL:
+		request = new CECPacket(EC_OP_GET_PREFERENCES);
+		request->AddTag(CECTag(EC_TAG_SELECT_PREFS, (uint32)EC_PREFS_SECURITY));
+		request_list.push_back(request);
+		break;
+
+	case CMD_ID_PAUSE:
+	case CMD_ID_CANCEL:
+	case CMD_ID_RESUME: {
+		if (args.IsEmpty()) {
+			Show(_("This command requires an argument. Valid arguments: 'all', filename, or a "
+			       "number.\n"));
+			return 0;
+		} else {
+			wxStringTokenizer argsTokenizer(args);
+			wxString token;
+			CMD4Hash hash;
+
+			CECPacket request_all(EC_OP_GET_DLOAD_QUEUE, EC_DETAIL_CMD);
+			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:
+					wxFAIL;
 				}
-			}
-			CmdId = CMD_ID_GET_IPFILTER_LEVEL;
-		/* fall through */
-		case CMD_ID_GET_IPFILTER_LEVEL:
-			request = new CECPacket(EC_OP_GET_PREFERENCES);
-			request->AddTag(CECTag(EC_TAG_SELECT_PREFS, (uint32)EC_PREFS_SECURITY));
-			request_list.push_back(request);
-			break;
-
-		case CMD_ID_PAUSE:
-		case CMD_ID_CANCEL:
-		case CMD_ID_RESUME:
-		{
-			if ( args.IsEmpty() ) {
-				Show(_("This command requires an argument. Valid arguments: 'all', filename, or a number.\n"));
-				return 0;
-			} else {
-				wxStringTokenizer argsTokenizer(args);
-				wxString token;
-				CMD4Hash hash;
-
-				// Grab the entire dl queue right away
-				CECPacket request_all(EC_OP_GET_DLOAD_QUEUE, EC_DETAIL_CMD);
-				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: wxFAIL;
-					}
 
-					// We loop through all the arguments
-					while(argsTokenizer.HasMoreTokens()) {
-						token=argsTokenizer.GetNextToken();
-
-						// 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 == "all" ) {
-							for (CECPacket::const_iterator it = reply_all->begin(); it != reply_all->end(); ++it) {
-								const CEC_PartFile_Tag *tag = static_cast<const CEC_PartFile_Tag *>(&*it);
-								request->AddTag(CECTag(EC_TAG_PARTFILE, tag->FileHash()));
-							}
-							break;
-						} else if ( hash.Decode(token.Trim(false).Trim(true)) ) {
-							if ( !hash.IsEmpty() ) {
-								Show(_("Processing by hash: ") + token + "\n");
-								request->AddTag(CECTag(EC_TAG_PARTFILE, hash));
-							}
-						} else {
-							 // Go through the dl queue and look at each filename
-							for (CECPacket::const_iterator it = reply_all->begin(); it != reply_all->end(); ++it) {
-								const CEC_PartFile_Tag *tag = static_cast<const CEC_PartFile_Tag *>(&*it);
-								wxString partmetname = tag->PartMetName();
-
-								// 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 + "\n");
-									request->AddTag(CECTag(EC_TAG_PARTFILE, tag->FileHash()));
-								}
+				while (argsTokenizer.HasMoreTokens()) {
+					token = argsTokenizer.GetNextToken();
+
+					// "all" selects every file, so there is nothing more to add and the
+					// loop can stop.
+					if (token == "all") {
+						for (CECPacket::const_iterator it = reply_all->begin();
+							it != reply_all->end();
+							++it) {
+							const CEC_PartFile_Tag *tag =
+								static_cast<const CEC_PartFile_Tag *>(&*it);
+							request->AddTag(
+								CECTag(EC_TAG_PARTFILE, tag->FileHash()));
+						}
+						break;
+					} else if (hash.Decode(token.Trim(false).Trim(true))) {
+						if (!hash.IsEmpty()) {
+							Show(_("Processing by hash: ") + token + "\n");
+							request->AddTag(CECTag(EC_TAG_PARTFILE, hash));
+						}
+					} else {
+						for (CECPacket::const_iterator it = reply_all->begin();
+							it != reply_all->end();
+							++it) {
+							const CEC_PartFile_Tag *tag =
+								static_cast<const CEC_PartFile_Tag *>(&*it);
+							wxString partmetname = tag->PartMetName();
+
+							// 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 +
+									"\n");
+								request->AddTag(CECTag(
+									EC_TAG_PARTFILE, tag->FileHash()));
 							}
-						} // End of filename check else
-					} // End of argument token loop
+						}
+					} // End of filename check else
+				} // End of argument token loop
 
 				request_list.push_back(request);
 
 				delete reply_all;
 
-				} // End of dl queue processing
+			} // End of dl queue processing
 
-			} // end of command processing
-			break;
-		}
+		} // end of command processing
+		break;
+	}
 
-		case CMD_ID_PRIORITY_LOW:
-		case CMD_ID_PRIORITY_NORMAL:
-		case CMD_ID_PRIORITY_HIGH:
-		case CMD_ID_PRIORITY_AUTO:
-			if ( args.IsEmpty() ) {
-				Show(_("This command requires an argument. Valid arguments: a file hash.\n"));
-				return 0;
-			} else {
-				CMD4Hash hash;
-				if (hash.Decode(args.Trim(false).Trim(true))) {
-					if (!hash.IsEmpty()) {
-						request = new CECPacket(EC_OP_PARTFILE_PRIO_SET);
-						CECTag hashtag(EC_TAG_PARTFILE, hash);
-						switch(CmdId) {
-							case CMD_ID_PRIORITY_LOW:
-								hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)PR_LOW));
-								break;
-							case CMD_ID_PRIORITY_NORMAL:
-								hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)PR_NORMAL));
-								break;
-							case CMD_ID_PRIORITY_HIGH:
-								hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)PR_HIGH));
-								break;
-							case CMD_ID_PRIORITY_AUTO:
-								hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)PR_AUTO));
-								break;
-							default: wxFAIL;
-						}
-						request->AddTag(hashtag);
-						request_list.push_back(request);
-					} else {
-						Show(_("Not a valid number\n"));
-						return 0;
+	case CMD_ID_PRIORITY_LOW:
+	case CMD_ID_PRIORITY_NORMAL:
+	case CMD_ID_PRIORITY_HIGH:
+	case CMD_ID_PRIORITY_AUTO:
+		if (args.IsEmpty()) {
+			Show(_("This command requires an argument. Valid arguments: a file hash.\n"));
+			return 0;
+		} else {
+			CMD4Hash hash;
+			if (hash.Decode(args.Trim(false).Trim(true))) {
+				if (!hash.IsEmpty()) {
+					request = new CECPacket(EC_OP_PARTFILE_PRIO_SET);
+					CECTag hashtag(EC_TAG_PARTFILE, hash);
+					switch (CmdId) {
+					case CMD_ID_PRIORITY_LOW:
+						hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)PR_LOW));
+						break;
+					case CMD_ID_PRIORITY_NORMAL:
+						hashtag.AddTag(
+							CECTag(EC_TAG_PARTFILE_PRIO, (uint8)PR_NORMAL));
+						break;
+					case CMD_ID_PRIORITY_HIGH:
+						hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)PR_HIGH));
+						break;
+					case CMD_ID_PRIORITY_AUTO:
+						hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)PR_AUTO));
+						break;
+					default:
+						wxFAIL;
 					}
+					request->AddTag(hashtag);
+					request_list.push_back(request);
 				} else {
-						Show(_("Not a valid hash (length should be exactly 32 chars)\n"));
-						return 0;
+					Show(_("Not a valid number\n"));
+					return 0;
 				}
+			} else {
+				Show(_("Not a valid hash (length should be exactly 32 chars)\n"));
+				return 0;
 			}
-			break;
+		}
+		break;
 
-		case CMD_ID_SHOW_UL:
-			request_list.push_back(new CECPacket(EC_OP_GET_ULOAD_QUEUE));
-			break;
+	case CMD_ID_SHOW_UL:
+		request_list.push_back(new CECPacket(EC_OP_GET_ULOAD_QUEUE));
+		break;
 
-		case CMD_ID_SHOW_DL:
-			request_list.push_back(new CECPacket(EC_OP_GET_DLOAD_QUEUE));
-			break;
+	case CMD_ID_SHOW_DL:
+		request_list.push_back(new CECPacket(EC_OP_GET_DLOAD_QUEUE));
+		break;
 
-		case CMD_ID_SHOW_LOG:
-			request_list.push_back(new CECPacket(EC_OP_GET_LOG));
-			break;
+	case CMD_ID_SHOW_LOG:
+		request_list.push_back(new CECPacket(EC_OP_GET_LOG));
+		break;
 
-		case CMD_ID_SHOW_SERVERS:
-			request_list.push_back(new CECPacket(EC_OP_GET_SERVER_LIST, EC_DETAIL_CMD));
-			break;
+	case CMD_ID_SHOW_SERVERS:
+		request_list.push_back(new CECPacket(EC_OP_GET_SERVER_LIST, EC_DETAIL_CMD));
+		break;
 
-		case CMD_ID_SHOW_SHARED:
-			request_list.push_back(new CECPacket(EC_OP_GET_SHARED_FILES));
-			break;
+	case CMD_ID_SHOW_SHARED:
+		request_list.push_back(new CECPacket(EC_OP_GET_SHARED_FILES));
+		break;
 
-		case CMD_ID_RESET_LOG:
-			request_list.push_back(new CECPacket(EC_OP_RESET_LOG));
-			break;
+	case CMD_ID_RESET_LOG:
+		request_list.push_back(new CECPacket(EC_OP_RESET_LOG));
+		break;
 
-		case CMD_ID_ADDLINK:
-			if (args.StartsWith("ed2k://")) {
-				//aMule doesn't like AICH links without |/| in front of h=
-				if (args.Find("|h=") > -1 && args.Find("|/|h=") == -1) {
-					args.Replace("|h=","|/|h=");
-				}
-				// repair links where | is replaced with %7C (Firefox)
-				if (args.StartsWith("ed2k://%7C")) {
-					args.Replace("%7C","|");
-				}
+	case CMD_ID_ADDLINK:
+		if (args.StartsWith("ed2k://")) {
+			// aMule doesn't like AICH links without |/| in front of h=
+			if (args.Find("|h=") > -1 && args.Find("|/|h=") == -1) {
+				args.Replace("|h=", "|/|h=");
 			}
-			request = new CECPacket(EC_OP_ADD_LINK);
-			request->AddTag(CECTag(EC_TAG_STRING, args));
-			request_list.push_back(request);
-			break;
-
-		case CMD_ID_SET_BWLIMIT_UP:
-			tmp_int = EC_TAG_CONN_MAX_UL - EC_TAG_CONN_MAX_DL;
-		/* fall through */
-		case CMD_ID_SET_BWLIMIT_DOWN:
-			tmp_int += EC_TAG_CONN_MAX_DL;
-			{
-				unsigned long int limit;
-				if (args.ToULong(&limit)) {
-					request = new CECPacket(EC_OP_SET_PREFERENCES);
-					CECEmptyTag prefs(EC_TAG_PREFS_CONNECTIONS);
-					prefs.AddTag(CECTag(tmp_int, (uint16)limit));
-					request->AddTag(prefs);
-					request_list.push_back(request);
-				} else {
-					return CMD_ERR_INVALID_ARG;
-				}
+			// The daemon restores these itself, but amulecmd is routinely
+			// pointed at an older one over EC, so repair before sending.
+			args = RestoreEncodedPipes(args);
+		}
+		request = new CECPacket(EC_OP_ADD_LINK);
+		request->AddTag(CECTag(EC_TAG_STRING, args));
+		request_list.push_back(request);
+		break;
+
+	case CMD_ID_SET_BWLIMIT_UP:
+		tmp_int = EC_TAG_CONN_MAX_UL - EC_TAG_CONN_MAX_DL;
+	/* fall through */
+	case CMD_ID_SET_BWLIMIT_DOWN:
+		tmp_int += EC_TAG_CONN_MAX_DL;
+		{
+			unsigned long int limit;
+			if (args.ToULong(&limit)) {
+				request = new CECPacket(EC_OP_SET_PREFERENCES);
+				CECEmptyTag prefs(EC_TAG_PREFS_CONNECTIONS);
+				prefs.AddTag(CECTag(tmp_int, (uint16)limit));
+				request->AddTag(prefs);
+				request_list.push_back(request);
+			} else {
+				return CMD_ERR_INVALID_ARG;
 			}
-		/* fall through */
-		case CMD_ID_GET_BWLIMITS:
-			request = new CECPacket(EC_OP_GET_PREFERENCES);
-			request->AddTag(CECTag(EC_TAG_SELECT_PREFS, (uint32)EC_PREFS_CONNECTIONS));
+		}
+	/* fall through */
+	case CMD_ID_GET_BWLIMITS:
+		request = new CECPacket(EC_OP_GET_PREFERENCES);
+		request->AddTag(CECTag(EC_TAG_SELECT_PREFS, (uint32)EC_PREFS_CONNECTIONS));
+		request_list.push_back(request);
+		break;
+	case CMD_ID_SET_ENDGAME: {
+		uint8 val = 2;
+		if (args.IsSameAs("ON", false) || args.IsSameAs("1", false)) {
+			val = 1;
+		} else if (args.IsSameAs("OFF", false) || args.IsSameAs("0", false)) {
+			val = 0;
+		}
+		if (val != 2) {
+			request = new CECPacket(EC_OP_SET_PREFERENCES);
+			CECEmptyTag prefs(EC_TAG_PREFS_FILES);
+			prefs.AddTag(CECTag(EC_TAG_FILES_ENDGAME, val));
+			request->AddTag(prefs);
 			request_list.push_back(request);
-			break;
-
-		case CMD_ID_STATTREE:
-			request = new CECPacket(EC_OP_GET_STATSTREE);
-			if (!args.IsEmpty()) {
-				unsigned long int max_versions;
-				if (args.ToULong(&max_versions)) {
-					if (max_versions < 256) {
-						request->AddTag(CECTag(EC_TAG_STATTREE_CAPPING, (uint8)max_versions));
-					} else {
-						delete request;
-						return CMD_ERR_INVALID_ARG;
-					}
+		} else {
+			return CMD_ERR_INVALID_ARG;
+		}
+	} break;
+	case CMD_ID_GET_ENDGAME:
+		request = new CECPacket(EC_OP_GET_PREFERENCES);
+		request->AddTag(CECTag(EC_TAG_SELECT_PREFS, (uint32)EC_PREFS_FILES));
+		request_list.push_back(request);
+		break;
+
+	case CMD_ID_STATTREE:
+		request = new CECPacket(EC_OP_GET_STATSTREE);
+		if (!args.IsEmpty()) {
+			unsigned long int max_versions;
+			if (args.ToULong(&max_versions)) {
+				if (max_versions < 256) {
+					request->AddTag(CECTag(EC_TAG_STATTREE_CAPPING, (uint8)max_versions));
 				} else {
 					delete request;
 					return CMD_ERR_INVALID_ARG;
 				}
+			} else {
+				delete request;
+				return CMD_ERR_INVALID_ARG;
 			}
-			request_list.push_back(request);
-			break;
-		case CMD_ID_SEARCH_GLOBAL:
-			search_type = EC_SEARCH_GLOBAL;
-		/* fall through */
-		case CMD_ID_SEARCH_LOCAL:
-			if (search_type != EC_SEARCH_GLOBAL){
-				search_type = EC_SEARCH_LOCAL;
-			}
-		/* fall through */
-		case CMD_ID_SEARCH_KAD:
-			if (search_type != EC_SEARCH_GLOBAL && search_type != EC_SEARCH_LOCAL){
-				search_type = EC_SEARCH_KAD;
+		}
+		request_list.push_back(request);
+		break;
+	case CMD_ID_SEARCH_GLOBAL:
+		search_type = EC_SEARCH_GLOBAL;
+	/* fall through */
+	case CMD_ID_SEARCH_LOCAL:
+		if (search_type != EC_SEARCH_GLOBAL) {
+			search_type = EC_SEARCH_LOCAL;
+		}
+	/* fall through */
+	case CMD_ID_SEARCH_KAD:
+		if (search_type != EC_SEARCH_GLOBAL && search_type != EC_SEARCH_LOCAL) {
+			search_type = EC_SEARCH_KAD;
+		}
+		if (!args.IsEmpty()) {
+			wxString search = args;
+			wxString type;
+			wxString extension;
+			uint32 avail = 0;
+			uint64 min_size = 0;
+			uint64 max_size = 0;
+
+			if (!ParseSearchFilters(search, type, extension, avail, min_size, max_size)) {
+				/* TRANSLATORS:
+				   'help search' is a command to the program, do not translate it. */
+				Show(_("Invalid search filter syntax.\nType 'help search' to get more "
+				       "help.\n"));
+				return CMD_ERR_INVALID_ARG;
 			}
-			if (!args.IsEmpty())
-			{
-				wxString search = args;
-				wxString type;
-				wxString extension;
-				uint32 avail = 0;
-				uint64 min_size = 0;
-				uint64 max_size = 0;
-
-				if (!ParseSearchFilters(search, type, extension, avail, min_size, max_size)) {
-					/* TRANSLATORS:
-					   'help search' is a command to the program, do not translate it. */
-					Show(_("Invalid search filter syntax.\nType 'help search' to get more help.\n"));
-					return CMD_ERR_INVALID_ARG;
-				}
-				if (search.IsEmpty()) {
-					/* TRANSLATORS:
-					   'help search' is a command to the program, do not translate it. */
-					Show(_("No search keyword provided.\nType 'help search' to get more help.\n"));
-					return CMD_ERR_INVALID_ARG;
-				}
-
-				request = new CECPacket(EC_OP_SEARCH_START);
-				request->AddTag(CEC_Search_Tag (search, search_type, type, extension, avail, min_size, max_size));
-				request_list.push_back(request);
+			if (search.IsEmpty()) {
+				/* TRANSLATORS:
+				   'help search' is a command to the program, do not translate it. */
+				Show(_("No search keyword provided.\nType 'help search' to get more "
+				       "help.\n"));
+				return CMD_ERR_INVALID_ARG;
 			}
-			break;
-		case CMD_ID_SEARCH:
-			/* TRANSLATORS:
-			   'help search' is a command to the program, do not translate it. */
-			Show(_("No search type defined.\nType 'help search' to get more help.\n"));
-			break;
-
 
-		case CMD_ID_SEARCH_RESULTS:
-			request_list.push_back(new CECPacket(EC_OP_SEARCH_RESULTS, EC_DETAIL_FULL));
-			break;
+			request = new CECPacket(EC_OP_SEARCH_START);
+			request->AddTag(CEC_Search_Tag(
+				search, search_type, type, extension, avail, min_size, max_size));
+			request_list.push_back(request);
+		}
+		break;
+	case CMD_ID_SEARCH:
+		/* TRANSLATORS:
+		   'help search' is a command to the program, do not translate it. */
+		Show(_("No search type defined.\nType 'help search' to get more help.\n"));
+		break;
+
+	case CMD_ID_SEARCH_RESULTS: {
+		CECPacket *req = new CECPacket(EC_OP_SEARCH_RESULTS, EC_DETAIL_FULL);
+		// Optional search ID (multi-search). No ID => the daemon's most
+		// recently started search.
+		unsigned long sid = 0;
+		if (!args.Trim().IsEmpty() && args.Trim().ToULong(&sid)) {
+			req->AddTag(CECTag(EC_TAG_SEARCH_ID, static_cast<uint32>(sid)));
+		}
+		request_list.push_back(req);
+		break;
+	}
 
-		case CMD_ID_SEARCH_PROGRESS:
-			request_list.push_back(new CECPacket(EC_OP_SEARCH_PROGRESS));
-			break;
+	case CMD_ID_SEARCH_PROGRESS: {
+		CECPacket *req = new CECPacket(EC_OP_SEARCH_PROGRESS);
+		unsigned long sid = 0;
+		if (!args.Trim().IsEmpty() && args.Trim().ToULong(&sid)) {
+			req->AddTag(CECTag(EC_TAG_SEARCH_ID, static_cast<uint32>(sid)));
+		}
+		request_list.push_back(req);
+		break;
+	}
 
-		case CMD_ID_DOWNLOAD:
-			if (!args.IsEmpty())
-			{
-				unsigned long int id = 0;
-				if (args.ToULong(&id) == true && id < m_Results_map.size()) {
-
-					SearchFile* file = m_Results_mapid;
-					Show(CFormat(_("Download File: %lu %s\n")) % id % file->sFileName);
-					request = new CECPacket(EC_OP_DOWNLOAD_SEARCH_RESULT);
-					// get with id the hash and category=0
-					uint32 category = 0;
-					CECTag hashtag(EC_TAG_PARTFILE, file->nHash);
-					hashtag.AddTag(CECTag(EC_TAG_PARTFILE_CAT, category));
-					request->AddTag(hashtag);
-					request_list.push_back(request);
-				} else {
-					return CMD_ERR_INVALID_ARG;
-				}
+	case CMD_ID_DOWNLOAD:
+		if (!args.IsEmpty()) {
+			unsigned long int id = 0;
+			if (args.ToULong(&id) == true && id < m_Results_map.size()) {
+
+				SearchFile *file = m_Results_mapid;
+				Show(CFormat(_("Download File: %lu %s\n")) % id % file->sFileName);
+				request = new CECPacket(EC_OP_DOWNLOAD_SEARCH_RESULT);
+				uint32 category = 0;
+				CECTag hashtag(EC_TAG_PARTFILE, file->nHash);
+				hashtag.AddTag(CECTag(EC_TAG_PARTFILE_CAT, category));
+				request->AddTag(hashtag);
+				request_list.push_back(request);
+			} else {
+				return CMD_ERR_INVALID_ARG;
 			}
-			break;
+		}
+		break;
 
-		default:
-			return CMD_ERR_PROCESS_CMD;
+	default:
+		return CMD_ERR_PROCESS_CMD;
 	}
 
 	m_last_cmd_id = CmdId;
 
-	if ( ! request_list.empty() ) {
+	if (!request_list.empty()) {
 		std::list<CECPacket *>::iterator it = request_list.begin();
-		while ( it != request_list.end() ) {
+		while (it != request_list.end()) {
 			CECPacket *curr = *it++;
 			if (curr->GetOpCode() == EC_OP_SHUTDOWN) {
 				SendPacket(curr);
@@ -678,7 +759,7 @@
 			}
 			const CECPacket *reply = SendRecvMsg_v2(curr);
 			delete curr;
-			if ( reply ) {
+			if (reply) {
 				Process_Answer_v2(reply);
 				delete reply;
 			}
@@ -689,34 +770,37 @@
 	return CMD_OK;
 }
 
- /*
- * Method to show the results in the console
+/**
+ * Shows the results in the console.
  */
 void CamulecmdApp::ShowResults(CResultMap results_map)
 {
 	unsigned int name_max = 80;
 	unsigned int mb_max = 5;
 	unsigned int nr_max = 5;
-	wxString output, name, sources, mb , kb;
+	wxString output, name, sources, mb, kb;
 
-	printf("Nr.    Filename:                                                                        Size(MB):  Sources: \n");
-	printf("-----------------------------------------------------------------------------------------------------------\n");
+	printf("Nr.    Filename:                                                                        "
+	       "Size(MiB):  Sources: \n");
+	printf("---------------------------------------------------------------------------------------------"
+	       "--------------\n");
 
-	for( std::map<unsigned long int,SearchFile*>::iterator iter = results_map.begin(); iter != results_map.end(); ++iter ) {
+	for (std::map<unsigned long int, SearchFile *>::iterator iter = results_map.begin();
+		iter != results_map.end();
+		++iter) {
 		unsigned long int id = 0;
 		id = (*iter).first;
-		SearchFile* file = (*iter).second;
+		SearchFile *file = (*iter).second;
 
 		output.Printf("%lu.      ", id);
 		output = output.SubString(0, nr_max).Append(file->sFileName).Append(' ', name_max);
-		mb.Printf("     %llu", static_cast<unsigned long long>(file->lFileSize/1024/1024));
-		kb.Printf(".%03llu", static_cast<unsigned long long>(file->lFileSize/1024%1024));
-		output = output.SubString(0, nr_max + name_max + mb_max - mb.Length() ).Append(mb).Append(kb);
-		printf("%s     %ld\n",(const char*)unicode2char(output), file->lSourceCount );
+		mb.Printf("     %llu", static_cast<unsigned long long>(file->lFileSize / 1024 / 1024));
+		kb.Printf(".%03llu", static_cast<unsigned long long>(file->lFileSize / 1024 % 1024));
+		output = output.SubString(0, nr_max + name_max + mb_max - mb.Length()).Append(mb).Append(kb);
+		printf("%s     %ld\n", (const char *)unicode2char(output), file->lSourceCount);
 	}
 }
 
-
 // Formats a statistics (sub)tree to text
 static wxString StatTree2Text(const CEC_StatTree_Node_Tag *tree, int depth)
 {
@@ -725,7 +809,7 @@
 	}
 	wxString result = wxString(wxChar(' '), depth) + tree->GetDisplayString() + "\n";
 	for (CECTag::const_iterator it = tree->begin(); it != tree->end(); ++it) {
-		const CEC_StatTree_Node_Tag *tmp = static_cast<const CEC_StatTree_Node_Tag*>(&*it);
+		const CEC_StatTree_Node_Tag *tmp = static_cast<const CEC_StatTree_Node_Tag *>(&*it);
 		if (tmp->GetTagName() == EC_TAG_STATTREE_NODE) {
 			result += StatTree2Text(tmp, depth + 1);
 		}
@@ -733,8 +817,8 @@
 	return result;
 }
 
-/*
- * Format EC packet into text form for output to console
+/**
+ * Formats an EC packet into text for the console.
  */
 void CamulecmdApp::Process_Answer_v2(const CECPacket *response)
 {
@@ -742,234 +826,278 @@
 	wxString msgFailedUnknown(_("Request failed with an unknown error."));
 	wxASSERT(response);
 	switch (response->GetOpCode()) {
-		case EC_OP_NOOP:
-			s << _("Operation was successful.");
-			break;
-		case EC_OP_FAILED:
-			{
-				const CECTag *tag = response->GetFirstTagSafe();
-				if (tag->IsString()) {
-					s <<	CFormat(_("Request failed with the following error: %s")) % wxGetTranslation(tag->GetStringData());
-				} else {
-					s << msgFailedUnknown;
-				}
+	case EC_OP_NOOP:
+		s << _("Operation was successful.");
+		break;
+	case EC_OP_FAILED: {
+		const CECTag *tag = response->GetFirstTagSafe();
+		if (tag->IsString()) {
+			s << CFormat(_("Request failed with the following error: %s")) %
+					wxGetTranslation(tag->GetStringData());
+		} else {
+			s << msgFailedUnknown;
+		}
+	} break;
+	case EC_OP_SET_PREFERENCES: {
+		const CECTag *tab = response->GetTagByNameSafe(EC_TAG_PREFS_SECURITY);
+		const CECTag *ipfilterLevel = tab->GetTagByName(EC_TAG_IPFILTER_LEVEL);
+		if (ipfilterLevel) {
+			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 += CFormat(_("IP filtering for clients is %s.\n")) %
+				     ((tab->GetTagByName(EC_TAG_IPFILTER_CLIENTS) == NULL) ? _("OFF")
+											   : _("ON"));
 			}
-			break;
-		case EC_OP_SET_PREFERENCES:
-			{
-				const CECTag *tab = response->GetTagByNameSafe(EC_TAG_PREFS_SECURITY);
-				const CECTag *ipfilterLevel = tab->GetTagByName(EC_TAG_IPFILTER_LEVEL);
-				if (ipfilterLevel) {
-					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 += 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 += 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) {
-						s << CFormat(_("Current IPFilter Level is %d.\n")) % ipfilterLevel->GetInt();
-					}
-				}
-				tab = response->GetTagByNameSafe(EC_TAG_PREFS_CONNECTIONS);
-				const CECTag *connMaxUL = tab->GetTagByName(EC_TAG_CONN_MAX_UL);
-				const CECTag *connMaxDL = tab->GetTagByName(EC_TAG_CONN_MAX_DL);
-				if (connMaxUL && connMaxDL) {
-					s << CFormat(_("Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"))
-						% connMaxUL->GetInt() % connMaxDL->GetInt();
-				}
+			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 += CFormat(_("IP filtering for servers is %s.\n")) %
+				     ((tab->GetTagByName(EC_TAG_IPFILTER_SERVERS) == NULL) ? _("OFF")
+											   : _("ON"));
 			}
-			break;
-		case EC_OP_STRINGS:
-			for (CECPacket::const_iterator it = response->begin(); it != response->end(); ++it) {
-				const CECTag &tag = *it;
+			if (m_last_cmd_id == CMD_ID_GET_IPFILTER ||
+				m_last_cmd_id == CMD_ID_GET_IPFILTER_LEVEL) {
+				s << CFormat(_("Current IPFilter Level is %d.\n")) % ipfilterLevel->GetInt();
+			}
+		}
+		tab = response->GetTagByNameSafe(EC_TAG_PREFS_CONNECTIONS);
+		const CECTag *connMaxUL = tab->GetTagByName(EC_TAG_CONN_MAX_UL);
+		const CECTag *connMaxDL = tab->GetTagByName(EC_TAG_CONN_MAX_DL);
+		if (connMaxUL && connMaxDL) {
+			s << CFormat(_("Bandwidth limits: Up: %u KiB/s, Down: %u KiB/s.\n")) %
+					connMaxUL->GetInt() % connMaxDL->GetInt();
+		}
+		tab = response->GetTagByNameSafe(EC_TAG_PREFS_FILES);
+		s << CFormat(_("Endgame source rotation is %s.\n")) %
+				((tab->GetTagByName(EC_TAG_FILES_ENDGAME) == nullptr) ? _("OFF") : _("ON"));
+	} break;
+	case EC_OP_STRINGS:
+		for (CECPacket::const_iterator it = response->begin(); it != response->end(); ++it) {
+			const CECTag &tag = *it;
+			if (tag.GetTagName() == EC_TAG_SEARCH_ID) {
+				// Multi-search: the daemon-allocated search ID. Pass it to 'results
+				// <id>' / 'progress <id>' to address this search; no-arg acts on
+				// the most recent one.
+				s << CFormat(_("Search started (id %u).\n")) % tag.GetInt();
+			} else if (tag.IsString()) {
 				s << tag.GetStringData() << "\n";
 			}
-			break;
-		case EC_OP_STATS: {
-			const CEC_ConnState_Tag *connState = static_cast<const CEC_ConnState_Tag*>(response->GetTagByName(EC_TAG_CONNSTATE));
-			if (connState) {
-				s << _("eD2k") << ": ";
-				if (connState->IsConnectedED2K()) {
-					const CECTag *server = connState->GetTagByName(EC_TAG_SERVER);
-					const CECTag *serverName = server ? server->GetTagByName(EC_TAG_SERVER_NAME) : NULL;
-					if (server && serverName) {
-						s << CFormat(_("Connected to %s %s %s")) %
-						 serverName->GetStringData() %
-						 server->GetIPv4Data().StringIP() %
-						 (connState->HasLowID() ? _("with LowID") : _("with HighID"));
-					}
-				} else if (connState->IsConnectingED2K()) {
-					s << _("Now connecting");
-				} else {
-					s << _("Not connected");
+		}
+		break;
+	case EC_OP_STATS: {
+		const CEC_ConnState_Tag *connState =
+			static_cast<const CEC_ConnState_Tag *>(response->GetTagByName(EC_TAG_CONNSTATE));
+		if (connState) {
+			s << _("eD2k") << ": ";
+			if (connState->IsConnectedED2K()) {
+				const CECTag *server = connState->GetTagByName(EC_TAG_SERVER);
+				const CECTag *serverName =
+					server ? server->GetTagByName(EC_TAG_SERVER_NAME) : NULL;
+				if (server && serverName) {
+					s << CFormat(_("Connected to %s %s %s")) %
+							serverName->GetStringData() %
+							server->GetIPv4Data().StringIP() %
+							(connState->HasLowID() ? _("with LowID")
+									       : _("with HighID"));
 				}
-				s << '\n' << _("Kad") << ": ";
-				if (connState->IsKadRunning()) {
-					if (connState->IsConnectedKademlia()) {
-						s << _("Connected") << " (";
-						if (connState->IsKadFirewalled()) {
-							s << _("firewalled");
-						} else {
-							s << _("ok");
-						}
-						s << ')';
+			} else if (connState->IsConnectingED2K()) {
+				s << _("Now connecting");
+			} else {
+				s << _("Not connected");
+			}
+			s << '\n' << _("Kad") << ": ";
+			if (connState->IsKadRunning()) {
+				if (connState->IsConnectedKademlia()) {
+					s << _("Connected") << " (";
+					if (connState->IsKadFirewalled()) {
+						s << _("firewalled");
 					} else {
-						s << _("Not connected");
+						s << _("ok");
 					}
+					s << ')';
 				} else {
-					s << _("Not running");
+					s << _("Not connected");
 				}
-				s << '\n';
-			}
-			const CECTag *tmpTag;
-			if ((tmpTag = response->GetTagByName(EC_TAG_STATS_DL_SPEED)) != 0) {
-				s <<	CFormat(_("\nDownload:\t%s")) % CastItoSpeed(tmpTag->GetInt());
+			} else {
+				s << _("Not running");
 			}
-			if ((tmpTag = response->GetTagByName(EC_TAG_STATS_UL_SPEED)) != 0) {
-				s <<	CFormat(_("\nUpload:\t%s")) % CastItoSpeed(tmpTag->GetInt());
+			s << '\n';
+		}
+		const CECTag *tmpTag;
+		if ((tmpTag = response->GetTagByName(EC_TAG_STATS_DL_SPEED)) != 0) {
+			s << CFormat(_("\nDownload:\t%s")) % CastItoSpeed(tmpTag->GetInt());
+		}
+		if ((tmpTag = response->GetTagByName(EC_TAG_STATS_UL_SPEED)) != 0) {
+			s << CFormat(_("\nUpload:\t%s")) % CastItoSpeed(tmpTag->GetInt());
+		}
+		if ((tmpTag = response->GetTagByName(EC_TAG_STATS_UL_QUEUE_LEN)) != 0) {
+			s << CFormat(_("\nClients in queue:\t%d\n")) % tmpTag->GetInt();
+		}
+		if ((tmpTag = response->GetTagByName(EC_TAG_STATS_TOTAL_SRC_COUNT)) != 0) {
+			s << CFormat(_("\nTotal sources:\t%d\n")) % tmpTag->GetInt();
+		}
+		break;
+	}
+	case EC_OP_DLOAD_QUEUE:
+		for (CECPacket::const_iterator it = response->begin(); it != response->end(); ++it) {
+			const CEC_PartFile_Tag *tag = static_cast<const CEC_PartFile_Tag *>(&*it);
+			uint64 filesize, donesize;
+			filesize = tag->SizeFull();
+			donesize = tag->SizeDone();
+			// Still two lines per entry: the newline delimits records and the leading
+			// tab marks the continuation, so splitting each line on the separator stays
+			// unambiguous.
+			s << tag->FileHashString() << Sep(" ") << Field(tag->FileName())
+			  << (CFormat("\n\t %.1f%%") % ((float)donesize / ((float)filesize) * 100.0))
+			  << Sep(" ")
+			  << (CFormat("%4i/%4i") %
+				     ((int)tag->SourceCount() - (int)tag->SourceNotCurrCount()) %
+				     (int)tag->SourceCount())
+			  << Sep(" ")
+			  // The no-value branches were padding that stood in for the value AND its
+			  // separator, so in tab mode each becomes one empty field -- every row keeps the
+			  // same field count.
+			  << ((int)tag->SourceCountA4AF()
+					     ? wxString(CFormat("+%2.2i") % (int)tag->SourceCountA4AF()) +
+						       Sep(" ")
+					     : Sep("    "))
+			  << ((int)tag->SourceXferCount()
+					     ? wxString(CFormat("(%2.2i)") % (int)tag->SourceXferCount()) +
+						       Sep(" - ")
+					     : Sep("     - "))
+			  << tag->GetFileStatusString();
+			s << Sep(" - ") << tag->PartMetName();
+			if (tag->DownPrio() < 10) {
+				s << Sep(" - ") << PriorityToStr((int)tag->DownPrio(), 0);
+			} else {
+				s << Sep(" - ") << PriorityToStr((tag->DownPrio() - 10), 1);
 			}
-			if ((tmpTag = response->GetTagByName(EC_TAG_STATS_UL_QUEUE_LEN)) != 0) {
-				s <<	CFormat(_("\nClients in queue:\t%d\n")) % tmpTag->GetInt();
+			if (tag->SourceXferCount() > 0) {
+				s << Sep(" - ") + CastItoSpeed(tag->Speed());
 			}
-			if ((tmpTag = response->GetTagByName(EC_TAG_STATS_TOTAL_SRC_COUNT)) != 0) {
-				s <<	CFormat(_("\nTotal sources:\t%d\n")) % tmpTag->GetInt();
+			s << "\n";
+		}
+		break;
+	case EC_OP_ULOAD_QUEUE:
+		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 << "\n"
+				  << CFormat("%10u") % tag->GetInt() << Sep(" ")
+				  << Field(clientName->GetStringData()) << Sep(" ")
+				  << Field(partfileName->GetStringData()) << Sep(" ")
+				  << CastItoXBytes(partfileSizeXfer->GetInt()) << Sep(" ")
+				  << CastItoSpeed(partfileSpeed->GetInt());
 			}
-			break;
 		}
-		case EC_OP_DLOAD_QUEUE:
-			for (CECPacket::const_iterator it = response->begin(); it != response->end(); ++it) {
-				const CEC_PartFile_Tag *tag = static_cast<const CEC_PartFile_Tag *>(&*it);
-				uint64 filesize, donesize;
-				filesize = tag->SizeFull();
-				donesize = tag->SizeDone();
-				s <<	tag->FileHashString() << " " <<
-					tag->FileName() <<
-					(CFormat("\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("+%2.2i ") % (int)tag->SourceCountA4AF()) : wxString("    ")) <<
-					((int)tag->SourceXferCount() ? wxString(CFormat("(%2.2i) - ") % (int)tag->SourceXferCount()) : wxString("     - ")) <<
-					tag->GetFileStatusString();
-				s << " - " << tag->PartMetName();
-				if (tag->DownPrio() < 10) {
-					s << " - " << PriorityToStr((int)tag->DownPrio(), 0);
+		break;
+	case EC_OP_LOG:
+		for (CECPacket::const_iterator it = response->begin(); it != response->end(); ++it) {
+			const CECTag &tag = *it;
+			s << tag.GetStringData() << "\n";
+		}
+		break;
+	case EC_OP_SERVER_LIST:
+		for (CECPacket::const_iterator it = response->begin(); it != response->end(); ++it) {
+			const CECTag &tag = *it;
+			const CECTag *serverName = tag.GetTagByName(EC_TAG_SERVER_NAME);
+			// Server host country ISO code from the daemon's GeoIP (#440),
+			// appended so existing "<ip> <name>" parsing keeps working.
+			const CECTag *country = tag.GetTagByName(EC_TAG_SERVER_COUNTRY);
+			if (serverName) {
+				wxString ip = tag.GetIPv4Data().StringIP();
+				if (m_spaceSeparated) {
+					// The column padding was the separator.
+					ip.Append(' ', 24 - ip.Length());
+					s << ip;
 				} else {
-					s << " - " << PriorityToStr((tag->DownPrio() - 10), 1);
+					s << ip << "\t";
 				}
-				if ( tag->SourceXferCount() > 0) {
-					s << " - " + CastItoSpeed(tag->Speed());
+				s << Field(serverName->GetStringData());
+				if (country && !country->GetStringData().IsEmpty()) {
+					s << Sep(" ") << "" << country->GetStringData() << "";
 				}
 				s << "\n";
 			}
-			break;
-		case EC_OP_ULOAD_QUEUE:
-			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 <<	"\n" <<
-						CFormat("%10u ") % tag->GetInt() <<
-						clientName->GetStringData() << " " <<
-						partfileName->GetStringData() << " " <<
-						CastItoXBytes(partfileSizeXfer->GetInt()) << " " <<
-						CastItoSpeed(partfileSpeed->GetInt());
-				}
-			}
-			break;
-		case EC_OP_LOG:
-			for (CECPacket::const_iterator it = response->begin(); it != response->end(); ++it) {
-				const CECTag &tag = *it;
-				s << tag.GetStringData() << "\n";
-			}
-			break;
-		case EC_OP_SERVER_LIST:
-			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() << "\n";
-				}
-			}
-			break;
-
-		case EC_OP_SHARED_FILES:
-			for (CECPacket::const_iterator it = response->begin(); it != response->end(); ++it) {
-				const CEC_SharedFile_Tag *tag = static_cast<const CEC_SharedFile_Tag *>(&*it);
-				s << tag->FileHashString() << " ";
-				wxString filePath = tag->FilePath();
-				bool ispartfile = true;
-				if (filePath.EndsWith(".part")) {
-					for (unsigned i = 0; i < filePath.Length() - 5; i++) {
-						if (filePathi < '0' || filePathi > '9') {
-							ispartfile = false;
-							break;
-						}
+		}
+		break;
+
+	case EC_OP_SHARED_FILES:
+		for (CECPacket::const_iterator it = response->begin(); it != response->end(); ++it) {
+			const CEC_SharedFile_Tag *tag = static_cast<const CEC_SharedFile_Tag *>(&*it);
+			s << tag->FileHashString() << Sep(" ");
+			wxString filePath = tag->FilePath();
+			bool ispartfile = true;
+			if (filePath.EndsWith(".part")) {
+				for (unsigned i = 0; i < filePath.Length() - 5; i++) {
+					if (filePathi < '0' || filePathi > '9') {
+						ispartfile = false;
+						break;
 					}
-				} else {
-					ispartfile = false;
 				}
-				if (ispartfile) {
-					s << _("PartFile") << " ";
-				} else {
-					s << filePath
+			} else {
+				ispartfile = false;
+			}
+			if (ispartfile) {
+				s << _("PartFile") << Sep(" ");
+			} else {
+				s << Field(filePath)
 #ifdef __WINDOWS__
-					  << '\\';
+				  << '\\';
 #else
-					  << '/';
+				  << '/';
 #endif
-				}
-				s << tag->FileName()
-				  << "\n\t" << PriorityToStr(tag->UpPrio() % 10, tag->UpPrio() >= 10) << " - " << CFormat("%i(%i) / %i(%i) - %s (%s) - %.2f\n")
-					% tag->GetRequests() % tag->GetAllRequests()
-					% tag->GetAccepts() % tag->GetAllAccepts()
-					% CastItoXBytes(tag->GetXferred()) % CastItoXBytes(tag->GetAllXferred())
-					% (static_cast<float>(tag->GetAllXferred()) / static_cast<float>(tag->SizeFull()));
 			}
-			break;
+			s << Field(tag->FileName()) << "\n\t"
+			  << PriorityToStr(tag->UpPrio() % 10, tag->UpPrio() >= 10) << Sep(" - ")
+			  << CFormat("%i(%i)") % tag->GetRequests() % tag->GetAllRequests() << Sep(" / ")
+			  << CFormat("%i(%i)") % tag->GetAccepts() % tag->GetAllAccepts() << Sep(" - ")
+			  << CFormat("%s (%s)") % CastItoXBytes(tag->GetXferred()) %
+					CastItoXBytes(tag->GetAllXferred())
+			  << Sep(" - ")
+			  << CFormat("%.2f\n") % (static_cast<float>(tag->GetAllXferred()) /
+							 static_cast<float>(tag->SizeFull()));
+		}
+		break;
 
-		case EC_OP_STATSTREE:
-			s << StatTree2Text(static_cast<const CEC_StatTree_Node_Tag*>(response->GetTagByName(EC_TAG_STATTREE_NODE)), 0);
-			break;
+	case EC_OP_STATSTREE:
+		s << StatTree2Text(static_cast<const CEC_StatTree_Node_Tag *>(
+					   response->GetTagByName(EC_TAG_STATTREE_NODE)),
+			0);
+		break;
 
-		case EC_OP_SEARCH_RESULTS:
-		{
-			int i = 0;
-			m_Results_map.clear();
-			s += CFormat(_("Number of search results: %i\n")) % response->GetTagCount();
-			for (CECPacket::const_iterator it = response->begin(); it != response->end(); ++it) {
-				const CEC_SearchFile_Tag *tag = static_cast<const CEC_SearchFile_Tag *>(&*it);
-				//printf("Tag FileName: %s \n",(const char*)unicode2char(tag->FileName()));
-				m_Results_mapi++ = new SearchFile(tag);
-			}
-			ShowResults(m_Results_map);
+	case EC_OP_SEARCH_RESULTS: {
+		if (response->GetTagByName(EC_TAG_SEARCH_EXPIRED)) {
+			s += _("Search expired or unknown ID. Start a new search.\n");
 			break;
 		}
-		case EC_OP_SEARCH_PROGRESS:
-		{
-			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;
+		int i = 0;
+		m_Results_map.clear();
+		s += CFormat(_("Number of search results: %i\n")) % response->GetTagCount();
+		for (CECPacket::const_iterator it = response->begin(); it != response->end(); ++it) {
+			const CEC_SearchFile_Tag *tag = static_cast<const CEC_SearchFile_Tag *>(&*it);
+			// printf("Tag FileName: %s \n",(const char*)unicode2char(tag->FileName()));
+			m_Results_mapi++ = new SearchFile(tag);
 		}
-		default:
-			s += CFormat(_("Received an unknown reply from the server, OpCode = %#x.")) % response->GetOpCode();
+		ShowResults(m_Results_map);
+		break;
+	}
+	case EC_OP_SEARCH_PROGRESS:
+		// Every shape the daemon may answer with, decoded in one place. This used to read
+		// EC_TAG_SEARCH_STATUS off the top level, which the union reply does not carry
+		// there -- and since amulecmd advertises the union capability along with multi-
+		// search, the union is exactly what it gets, so `progress` reported 0 % whatever
+		// the search was doing.
+		s += ecprogress::FormatSearchProgress(*response);
+		break;
+	default:
+		s += CFormat(_("Received an unknown reply from the server, OpCode = %#x.")) %
+		     response->GetOpCode();
 	}
 	Process_Answer(s);
 }
@@ -982,138 +1110,304 @@
 
 	CaMuleExternalConnector::OnInitCommandSet();
 
-	m_commands.AddCommand("Status", CMD_ID_STATUS, wxTRANSLATE("Show short status information."),
-			      wxTRANSLATE("Show connection status, current up/download speeds, etc.\n"), CMD_PARAM_NEVER);
-
-	m_commands.AddCommand("Statistics", CMD_ID_STATTREE, wxTRANSLATE("Show full statistics tree."),
-			      wxTRANSLATE("Optionally, a number in the range 0-255 can be passed as an argument to this\ncommand, which tells how many entries of the client version subtrees should be\nshown. Passing 0 or omitting it means 'unlimited'.\n\nExample: 'statistics 5' will show only the top 5 versions for each client type.\n"));
-
-	m_commands.AddCommand("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("Reload", CMD_ERR_INCOMPLETE, wxTRANSLATE("Reload the given object."), "", CMD_PARAM_NEVER);
-	tmp->AddCommand("Shared", CMD_ID_RELOAD_SHARED, wxTRANSLATE("Reload shared files list."), "", CMD_PARAM_NEVER);
-
-	tmp2 = tmp->AddCommand("IPFilter", CMD_ID_RELOAD_IPFILTER_LOCAL, wxTRANSLATE("Reload IP filtering table."), "", CMD_PARAM_OPTIONAL);
-	tmp2->AddCommand("File", CMD_ID_RELOAD_IPFILTER_LOCAL, wxTRANSLATE("Reload current IP filtering table."), "", CMD_PARAM_NEVER);
-	tmp2->AddCommand("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("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);
-	tmp->AddCommand("ED2K", CMD_ID_CONNECT_ED2K, wxTRANSLATE("Connect to eD2k only."), "", CMD_PARAM_NEVER);
+	m_commands.AddCommand("Status",
+		CMD_ID_STATUS,
+		wxTRANSLATE("Show short status information."),
+		wxTRANSLATE("Show connection status, current up/download speeds, etc.\n"),
+		CMD_PARAM_NEVER);
+
+	m_commands.AddCommand("Statistics",
+		CMD_ID_STATTREE,
+		wxTRANSLATE("Show full statistics tree."),
+		wxTRANSLATE("Optionally, a number in the range 0-255 can be passed as an argument to "
+			    "this\ncommand, which tells how many entries of the client version subtrees "
+			    "should be\nshown. Passing 0 or omitting it means 'unlimited'.\n\nExample: "
+			    "'statistics 5' will show only the top 5 versions for each client type.\n"));
+
+	m_commands.AddCommand("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(
+		"Reload", CMD_ERR_INCOMPLETE, wxTRANSLATE("Reload the given object."), "", CMD_PARAM_NEVER);
+	tmp->AddCommand("Shared",
+		CMD_ID_RELOAD_SHARED,
+		wxTRANSLATE("Reload shared files list."),
+		"",
+		CMD_PARAM_NEVER);
+
+	tmp2 = tmp->AddCommand("IPFilter",
+		CMD_ID_RELOAD_IPFILTER_LOCAL,
+		wxTRANSLATE("Reload IP filtering table."),
+		"",
+		CMD_PARAM_OPTIONAL);
+	tmp2->AddCommand("File",
+		CMD_ID_RELOAD_IPFILTER_LOCAL,
+		wxTRANSLATE("Reload current IP filtering table."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp2->AddCommand("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("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);
+	tmp->AddCommand(
+		"ED2K", CMD_ID_CONNECT_ED2K, wxTRANSLATE("Connect to eD2k only."), "", CMD_PARAM_NEVER);
 	tmp->AddCommand("Kad", CMD_ID_CONNECT_KAD, wxTRANSLATE("Connect to Kad only."), "", CMD_PARAM_NEVER);
 
-	tmp = m_commands.AddCommand("Disconnect", CMD_ID_DISCONNECT, wxTRANSLATE("Disconnect from the network."),
-				    wxTRANSLATE("This will disconnect from all networks that are currently connected.\n"), CMD_PARAM_NEVER);
-	tmp->AddCommand("ED2K", CMD_ID_DISCONNECT_ED2K, wxTRANSLATE("Disconnect from eD2k only."), "", CMD_PARAM_NEVER);
-	tmp->AddCommand("Kad", CMD_ID_DISCONNECT_KAD, wxTRANSLATE("Disconnect from Kad only."), "", CMD_PARAM_NEVER);
-
-	m_commands.AddCommand("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("Set", CMD_ERR_INCOMPLETE, wxTRANSLATE("Set a preference value."),
-				    "", CMD_PARAM_NEVER);
-
-	tmp2 = tmp->AddCommand("IPFilter", CMD_ERR_INCOMPLETE, wxTRANSLATE("Set IP filtering preferences."), "", CMD_PARAM_NEVER);
-	tmp2->AddCommand("On", CMD_ID_SET_IPFILTER_ON, wxTRANSLATE("Turn IP filtering on for both clients and servers."), "", CMD_PARAM_NEVER);
-	tmp2->AddCommand("Off", CMD_ID_SET_IPFILTER_OFF, wxTRANSLATE("Turn IP filtering off for both clients and servers."), "", CMD_PARAM_NEVER);
-	tmp3 = tmp2->AddCommand("Clients", CMD_ERR_INCOMPLETE, wxTRANSLATE("Enable/Disable IP filtering for clients."), "", CMD_PARAM_NEVER);
-	tmp3->AddCommand("On", CMD_ID_SET_IPFILTER_CLIENTS_ON, wxTRANSLATE("Turn IP filtering on for clients."), "", CMD_PARAM_NEVER);
-	tmp3->AddCommand("Off", CMD_ID_SET_IPFILTER_CLIENTS_OFF, wxTRANSLATE("Turn IP filtering off for clients."), "", CMD_PARAM_NEVER);
-	tmp3 = tmp2->AddCommand("Servers", CMD_ERR_INCOMPLETE, wxTRANSLATE("Enable/Disable IP filtering for servers."), "", CMD_PARAM_NEVER);
-	tmp3->AddCommand("On", CMD_ID_SET_IPFILTER_SERVERS_ON, wxTRANSLATE("Turn IP filtering on for servers."), "", CMD_PARAM_NEVER);
-	tmp3->AddCommand("Off", CMD_ID_SET_IPFILTER_SERVERS_OFF, wxTRANSLATE("Turn IP filtering off for servers."), "", CMD_PARAM_NEVER);
-	tmp2->AddCommand("Level", CMD_ID_SET_IPFILTER_LEVEL, wxTRANSLATE("Select IP filtering level."),
-			 wxTRANSLATE("Valid filtering levels are in the range 0-255, and it's default (initial)\nvalue is 127.\n"), CMD_PARAM_ALWAYS);
-
-	tmp2 = tmp->AddCommand("BwLimit", CMD_ERR_INCOMPLETE, wxTRANSLATE("Set bandwidth limits."),
-			       wxTRANSLATE("The value given to these commands has to be in kilobytes/sec.\n"), CMD_PARAM_NEVER);
-	tmp2->AddCommand("Up", CMD_ID_SET_BWLIMIT_UP, wxTRANSLATE("Set upload bandwidth limit."),
-			 wxTRANSLATE("The given value must be in kilobytes/sec.\n"), CMD_PARAM_ALWAYS);
-	tmp2->AddCommand("Down", CMD_ID_SET_BWLIMIT_DOWN, wxTRANSLATE("Set download bandwidth limit."),
-			 wxTRANSLATE("The given value must be in kilobytes/sec.\n"), CMD_PARAM_ALWAYS);
-
-	tmp = m_commands.AddCommand("Get", CMD_ERR_INCOMPLETE, wxTRANSLATE("Get and display a preference value."),
-				    "", CMD_PARAM_NEVER);
-
-	tmp2 = tmp->AddCommand("IPFilter", CMD_ID_GET_IPFILTER, wxTRANSLATE("Get IP filtering preferences."), "", CMD_PARAM_NEVER);
-	tmp3 = tmp2->AddCommand("State", CMD_ID_GET_IPFILTER_STATE, wxTRANSLATE("Get IP filtering state for both clients and servers."), "", CMD_PARAM_NEVER);
-	tmp3->AddCommand("Clients", CMD_ID_GET_IPFILTER_STATE_CLIENTS, wxTRANSLATE("Get IP filtering state for clients only."), "", CMD_PARAM_NEVER);
-	tmp3->AddCommand("Servers", CMD_ID_GET_IPFILTER_STATE_SERVERS, wxTRANSLATE("Get IP filtering state for servers only."), "", CMD_PARAM_NEVER);
-	tmp2->AddCommand("Level", CMD_ID_GET_IPFILTER_LEVEL, wxTRANSLATE("Get IP filtering level."), "", CMD_PARAM_NEVER);
-
-	tmp->AddCommand("BwLimits", CMD_ID_GET_BWLIMITS, wxTRANSLATE("Get bandwidth limits."), "", CMD_PARAM_NEVER);
-
-	tmp = m_commands.AddCommand("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\n"
-				  "Example: 'search kad file' will execute a kad search for \"file\".\n"
-				  "\n"
-				  "Optional filters can be added before, after, or interleaved with\n"
-				  "the search keyword(s):\n"
-				  "    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
-				  "    --extension <ext>      (alias: --ext)\n"
-				  "    --avail <N>            minimum number of sources\n"
-				  "    --min-size <NKMG>    smallest file size; K=1024, M=K*1024, G=M*1024\n"
-				  "    --max-size <NKMG>    largest file size; same suffixes\n"
-				  "Example: 'search global linux iso --type Iso --min-size 100M' returns\n"
-				  "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"
-				  ), CMD_PARAM_ALWAYS);
-	tmp->AddCommand("global", CMD_ID_SEARCH_GLOBAL, wxTRANSLATE("Execute a global search."), "", CMD_PARAM_ALWAYS);
-	tmp->AddCommand("local", CMD_ID_SEARCH_LOCAL, wxTRANSLATE("Execute a local search"), "", CMD_PARAM_ALWAYS);
+	tmp = m_commands.AddCommand("Disconnect",
+		CMD_ID_DISCONNECT,
+		wxTRANSLATE("Disconnect from the network."),
+		wxTRANSLATE("This will disconnect from all networks that are currently connected.\n"),
+		CMD_PARAM_NEVER);
+	tmp->AddCommand("ED2K",
+		CMD_ID_DISCONNECT_ED2K,
+		wxTRANSLATE("Disconnect from eD2k only."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp->AddCommand(
+		"Kad", CMD_ID_DISCONNECT_KAD, wxTRANSLATE("Disconnect from Kad only."), "", CMD_PARAM_NEVER);
+
+	m_commands.AddCommand("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(
+		"Set", CMD_ERR_INCOMPLETE, wxTRANSLATE("Set a preference value."), "", CMD_PARAM_NEVER);
+
+	tmp2 = tmp->AddCommand("IPFilter",
+		CMD_ERR_INCOMPLETE,
+		wxTRANSLATE("Set IP filtering preferences."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp2->AddCommand("On",
+		CMD_ID_SET_IPFILTER_ON,
+		wxTRANSLATE("Turn IP filtering on for both clients and servers."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp2->AddCommand("Off",
+		CMD_ID_SET_IPFILTER_OFF,
+		wxTRANSLATE("Turn IP filtering off for both clients and servers."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp3 = tmp2->AddCommand("Clients",
+		CMD_ERR_INCOMPLETE,
+		wxTRANSLATE("Enable/Disable IP filtering for clients."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp3->AddCommand("On",
+		CMD_ID_SET_IPFILTER_CLIENTS_ON,
+		wxTRANSLATE("Turn IP filtering on for clients."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp3->AddCommand("Off",
+		CMD_ID_SET_IPFILTER_CLIENTS_OFF,
+		wxTRANSLATE("Turn IP filtering off for clients."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp3 = tmp2->AddCommand("Servers",
+		CMD_ERR_INCOMPLETE,
+		wxTRANSLATE("Enable/Disable IP filtering for servers."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp3->AddCommand("On",
+		CMD_ID_SET_IPFILTER_SERVERS_ON,
+		wxTRANSLATE("Turn IP filtering on for servers."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp3->AddCommand("Off",
+		CMD_ID_SET_IPFILTER_SERVERS_OFF,
+		wxTRANSLATE("Turn IP filtering off for servers."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp2->AddCommand("Level",
+		CMD_ID_SET_IPFILTER_LEVEL,
+		wxTRANSLATE("Select IP filtering level."),
+		wxTRANSLATE("Valid filtering levels are in the range 0-255, and it's default "
+			    "(initial)\nvalue is 127.\n"),
+		CMD_PARAM_ALWAYS);
+
+	tmp2 = tmp->AddCommand("BwLimit",
+		CMD_ERR_INCOMPLETE,
+		wxTRANSLATE("Set bandwidth limits."),
+		wxTRANSLATE("The value given to these commands has to be in kilobytes/sec.\n"),
+		CMD_PARAM_NEVER);
+	tmp2->AddCommand("Up",
+		CMD_ID_SET_BWLIMIT_UP,
+		wxTRANSLATE("Set upload bandwidth limit."),
+		wxTRANSLATE("The given value must be in kilobytes/sec.\n"),
+		CMD_PARAM_ALWAYS);
+	tmp2->AddCommand("Down",
+		CMD_ID_SET_BWLIMIT_DOWN,
+		wxTRANSLATE("Set download bandwidth limit."),
+		wxTRANSLATE("The given value must be in kilobytes/sec.\n"),
+		CMD_PARAM_ALWAYS);
+	tmp->AddCommand("Endgame",
+		CMD_ID_SET_ENDGAME,
+		wxTRANSLATE("Enable or disable endgame source rotation."),
+		wxTRANSLATE("The given value must be 1/ON (enable) or 0/OFF (disable).\n"),
+		CMD_PARAM_ALWAYS);
+
+	tmp = m_commands.AddCommand("Get",
+		CMD_ERR_INCOMPLETE,
+		wxTRANSLATE("Get and display a preference value."),
+		"",
+		CMD_PARAM_NEVER);
+
+	tmp2 = tmp->AddCommand("IPFilter",
+		CMD_ID_GET_IPFILTER,
+		wxTRANSLATE("Get IP filtering preferences."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp3 = tmp2->AddCommand("State",
+		CMD_ID_GET_IPFILTER_STATE,
+		wxTRANSLATE("Get IP filtering state for both clients and servers."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp3->AddCommand("Clients",
+		CMD_ID_GET_IPFILTER_STATE_CLIENTS,
+		wxTRANSLATE("Get IP filtering state for clients only."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp3->AddCommand("Servers",
+		CMD_ID_GET_IPFILTER_STATE_SERVERS,
+		wxTRANSLATE("Get IP filtering state for servers only."),
+		"",
+		CMD_PARAM_NEVER);
+	tmp2->AddCommand("Level",
+		CMD_ID_GET_IPFILTER_LEVEL,
+		wxTRANSLATE("Get IP filtering level."),
+		"",
+		CMD_PARAM_NEVER);
+
+	tmp->AddCommand(
+		"BwLimits", CMD_ID_GET_BWLIMITS, wxTRANSLATE("Get bandwidth limits."), "", CMD_PARAM_NEVER);
+	tmp->AddCommand("Endgame",
+		CMD_ID_GET_ENDGAME,
+		wxTRANSLATE("Get endgame source rotation state."),
+		"",
+		CMD_PARAM_NEVER);
+
+	tmp = m_commands.AddCommand("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\n"
+			    "Example: 'search kad file' will execute a kad search for \"file\".\n"
+			    "\n"
+			    "Optional filters can be added before, after, or interleaved with\n"
+			    "the search keyword(s):\n"
+			    "    --type <Audio|Video|Image|Doc|Pro|Arc|Iso>\n"
+			    "    --extension <ext>      (alias: --ext)\n"
+			    "    --avail <N>            minimum number of sources\n"
+			    "    --min-size <NKMG>    smallest file size; K=1024, M=K*1024, G=M*1024\n"
+			    "    --max-size <NKMG>    largest file size; same suffixes\n"
+			    "Example: 'search global linux iso --type Iso --min-size 100M' returns\n"
+			    "results for \"linux iso\" of file-type Iso at least 100 MiB.\n"),
+		CMD_PARAM_ALWAYS);
+	tmp->AddCommand("global",
+		CMD_ID_SEARCH_GLOBAL,
+		wxTRANSLATE("Execute a global search."),
+		"",
+		CMD_PARAM_ALWAYS);
+	tmp->AddCommand(
+		"local", CMD_ID_SEARCH_LOCAL, wxTRANSLATE("Execute a local search"), "", CMD_PARAM_ALWAYS);
 	tmp->AddCommand("kad", CMD_ID_SEARCH_KAD, wxTRANSLATE("Execute a kad search"), "", CMD_PARAM_ALWAYS);
 
-	m_commands.AddCommand("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("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("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);
+	m_commands.AddCommand("Results",
+		CMD_ID_SEARCH_RESULTS,
+		wxTRANSLATE("Show the results of a search."),
+		wxTRANSLATE("Return the results of a search.\n"
+			    "Optionally takes a search id (from 'search ...'); with no id, "
+			    "returns the results of the most recently started search.\n"),
+		CMD_PARAM_OPTIONAL);
+
+	m_commands.AddCommand("Progress",
+		CMD_ID_SEARCH_PROGRESS,
+		wxTRANSLATE("Show the progress of a search."),
+		wxTRANSLATE("Show the progress of a search.\n"
+			    "Optionally takes a search id; with no id, shows the progress of "
+			    "the most recently started search.\n"),
+		CMD_PARAM_OPTIONAL);
+
+	m_commands.AddCommand("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);
 
-
-	//
 	// TODO: These commands below need implementation and/or rewrite!
-	//
-
-	m_commands.AddCommand("Pause", CMD_ID_PAUSE, wxTRANSLATE("Pause download."),
-			      "", CMD_PARAM_ALWAYS);
-
-	m_commands.AddCommand("Resume", CMD_ID_RESUME, wxTRANSLATE("Resume download."),
-			      "", CMD_PARAM_ALWAYS);
-
-	m_commands.AddCommand("Cancel", CMD_ID_CANCEL, wxTRANSLATE("Cancel download."),
-			      "", CMD_PARAM_ALWAYS);
 
-	tmp = m_commands.AddCommand("Priority", CMD_ERR_INCOMPLETE, wxTRANSLATE("Set download priority."),
-				    wxTRANSLATE("Set priority of a download to Low, Normal, High or Auto.\n"), CMD_PARAM_ALWAYS);
-	tmp->AddCommand("Low", CMD_ID_PRIORITY_LOW, wxTRANSLATE("Set priority to low."), "", CMD_PARAM_ALWAYS);
-	tmp->AddCommand("Normal", CMD_ID_PRIORITY_NORMAL, wxTRANSLATE("Set priority to normal."), "", CMD_PARAM_ALWAYS);
-	tmp->AddCommand("High", CMD_ID_PRIORITY_HIGH, wxTRANSLATE("Set priority to high."), "", CMD_PARAM_ALWAYS);
-	tmp->AddCommand("Auto", CMD_ID_PRIORITY_AUTO, wxTRANSLATE("Set priority to auto."), "", CMD_PARAM_ALWAYS);
-
-	tmp = m_commands.AddCommand("Show", CMD_ERR_INCOMPLETE, wxTRANSLATE("Show queues/lists."),
-				    wxTRANSLATE("Show upload/download queue, server list or shared files list.\n"), CMD_PARAM_ALWAYS);
+	m_commands.AddCommand("Pause", CMD_ID_PAUSE, wxTRANSLATE("Pause download."), "", CMD_PARAM_ALWAYS);
+
+	m_commands.AddCommand("Resume", CMD_ID_RESUME, wxTRANSLATE("Resume download."), "", CMD_PARAM_ALWAYS);
+
+	m_commands.AddCommand("Cancel", CMD_ID_CANCEL, wxTRANSLATE("Cancel download."), "", CMD_PARAM_ALWAYS);
+
+	tmp = m_commands.AddCommand("Priority",
+		CMD_ERR_INCOMPLETE,
+		wxTRANSLATE("Set download priority."),
+		wxTRANSLATE("Set priority of a download to Low, Normal, High or Auto.\n"),
+		CMD_PARAM_ALWAYS);
+	tmp->AddCommand(
+		"Low", CMD_ID_PRIORITY_LOW, wxTRANSLATE("Set priority to low."), "", CMD_PARAM_ALWAYS);
+	tmp->AddCommand("Normal",
+		CMD_ID_PRIORITY_NORMAL,
+		wxTRANSLATE("Set priority to normal."),
+		"",
+		CMD_PARAM_ALWAYS);
+	tmp->AddCommand(
+		"High", CMD_ID_PRIORITY_HIGH, wxTRANSLATE("Set priority to high."), "", CMD_PARAM_ALWAYS);
+	tmp->AddCommand(
+		"Auto", CMD_ID_PRIORITY_AUTO, wxTRANSLATE("Set priority to auto."), "", CMD_PARAM_ALWAYS);
+
+	tmp = m_commands.AddCommand("Show",
+		CMD_ERR_INCOMPLETE,
+		wxTRANSLATE("Show queues/lists."),
+		wxTRANSLATE("Show upload/download queue, server list or shared files list.\n"),
+		CMD_PARAM_ALWAYS);
 	tmp->AddCommand("UL", CMD_ID_SHOW_UL, wxTRANSLATE("Show upload queue."), "", CMD_PARAM_NEVER);
 	tmp->AddCommand("DL", CMD_ID_SHOW_DL, wxTRANSLATE("Show download queue."), "", CMD_PARAM_NEVER);
 	tmp->AddCommand("Log", CMD_ID_SHOW_LOG, wxTRANSLATE("Show log."), "", CMD_PARAM_NEVER);
-	tmp->AddCommand("Servers", CMD_ID_SHOW_SERVERS, wxTRANSLATE("Show servers list."), "", CMD_PARAM_NEVER);
-	tmp->AddCommand("Shared", CMD_ID_SHOW_SHARED, wxTRANSLATE("Show shared files list."), "", CMD_PARAM_NEVER);
+	tmp->AddCommand(
+		"Servers", CMD_ID_SHOW_SERVERS, wxTRANSLATE("Show servers list."), "", CMD_PARAM_NEVER);
+	tmp->AddCommand(
+		"Shared", CMD_ID_SHOW_SHARED, wxTRANSLATE("Show shared files list."), "", CMD_PARAM_NEVER);
 
 	m_commands.AddCommand("Reset", CMD_ID_RESET_LOG, wxTRANSLATE("Reset log."), "", CMD_PARAM_NEVER);
 
-	//
 	// Deprecated commands, kept for backwards compatibility only.
-	//
 
 #define DEPRECATED(OLDCMD, ID, NEWCMD, PARAM) \
-	m_commands.AddCommand(OLDCMD, CMD_ID_##ID | CMD_DEPRECATED, CFormat(wxTRANSLATE("Deprecated command, use '%s' instead.")) % NEWCMD, \
-			      CFormat(wxTRANSLATE("This is a deprecated command, and may be removed in the future.\nUse '%s' instead.\n")) % NEWCMD, CMD_PARAM_##PARAM)
+	m_commands.AddCommand(OLDCMD, \
+		CMD_ID_##ID | CMD_DEPRECATED, \
+		CFormat(wxTRANSLATE("Deprecated command, use '%s' instead.")) % NEWCMD, \
+		CFormat(wxTRANSLATE("This is a deprecated command, and may be removed in the future.\nUse " \
+				    "'%s' instead.\n")) % \
+			NEWCMD, \
+		CMD_PARAM_##PARAM)
 
 	DEPRECATED("Stats", STATUS, "Status", NEVER);
 	DEPRECATED("SetIPFilter", SET_IPFILTER, "Set IPFilter", OPTIONAL);
@@ -1128,16 +1422,22 @@
 
 int CamulecmdApp::OnRun()
 {
+	// amulecmd reads EC_TAG_SEARCH_ID back and addresses results/progress by it, so opt into
+	// the multi-search protocol: several searches can be kept on the daemon at once and
+	// referenced by ID (no-arg commands act on the most recent).
+	m_canMultiSearch = true;
 	ConnectAndRun("aMulecmd", VERSION);
 	return 0;
 }
 
 // Stub functions needed by the linker in ASIO builds
-#include "GuiEvents.h"
 namespace MuleNotify
 {
-	void HandleNotification(const class CMuleNotiferBase&) {}
-	void HandleNotificationAlways(const class CMuleNotiferBase&) {}
-}
+void HandleNotification(const class CMuleNotiferBase &);
+void HandleNotificationAlways(const class CMuleNotiferBase &);
+
+void HandleNotification(const class CMuleNotiferBase &) {}
+void HandleNotificationAlways(const class CMuleNotiferBase &) {}
+} // namespace MuleNotify
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/TextClient.h -> amule-3.1.0.tar.gz/src/TextClient.h Changed

@@ -30,30 +30,27 @@
 
 #include <map>
 
+class CEC_SearchFile_Tag;
 
+class SearchFile
+{
+public:
+	wxString sFileName;
+	// Must be 64-bit: `unsigned long` is 32 bits on LLP64 (Windows 64-bit), so amulecmd mis-
+	// displayed any shared file > 4 GiB. The search EC tag carries the size as uint64.
+	uint64 lFileSize;
+	CMD4Hash nHash;
+	wxString sHash;
+	long lSourceCount;
+	bool bPresent;
 
-class CEC_SearchFile_Tag;
+	SearchFile(const CEC_SearchFile_Tag *);
 
-class SearchFile {
-	public:
-		wxString sFileName;
-		// lFileSize must be 64-bit -- `unsigned long` is 32 bits on
-		// LLP64 (Windows 64-bit), so amulecmd would mis-display the
-		// size of any shared file > 4 GiB. The search EC tag carries
-		// the size as uint64, so widen this carrier to match.
-		uint64 lFileSize;
-		CMD4Hash  nHash;
-		wxString  sHash;
-		long lSourceCount;
-		bool bPresent;
-
-		SearchFile(const CEC_SearchFile_Tag *);
-
-		static class SearchInfo *GetContainerInstance();
-		CMD4Hash ID() { return nHash; }
+	static class SearchInfo *GetContainerInstance();
+	CMD4Hash ID() { return nHash; }
 };
 
-typedef std::map<unsigned long int,SearchFile*> CResultMap;
+typedef std::map<unsigned long int, SearchFile *> CResultMap;
 
 wxString ECv2_Response2String(CECPacket *response);
 
@@ -67,16 +64,66 @@
 
 private:
 	// other command line switches
-	void OnInitCmdLine(wxCmdLineParser& amuleweb_parser);
-	bool OnCmdLineParsed(wxCmdLineParser& parser);
-	void TextShell(const wxString& prompt);
+	void OnInitCmdLine(wxCmdLineParser &amuleweb_parser);
+	bool OnCmdLineParsed(wxCmdLineParser &parser);
+	void TextShell(const wxString &prompt);
 	void ShowResults(CResultMap results_map);
 	bool m_HasCmdOnCmdLine;
 	wxString m_CmdString;
+
+	/**
+	 * Print list fields separated by spaces, as before, instead of tabs.
+	 *
+	 * The rows carry client names and file names, both of which routinely contain spaces, so
+	 * nothing reading a space-separated row can split it back into fields (discussion #161).
+	 * Tabs are the default; this restores the previous output byte for byte.
+	 */
+	bool m_spaceSeparated = false;
+
+	/**
+	 * The separator to print where @a legacy used to be printed.
+	 *
+	 * ONLY separators go through here. Column padding stays as it is, values that merely
+	 * contain punctuation (`12/34` source counts, `5(7)` request counts) stay one field, and
+	 * translated values (file status, priority) are still translated -- a parser wanting stable
+	 * text still wants LC_ALL=C, or the REST API.
+	 */
+	wxString Sep(const wxString &legacy) const { return m_spaceSeparated ? legacy : wxString("\t"); }
+
+	/**
+	 * A value on its way into a field, with the active separator taken out of it.
+	 *
+	 * File names, client names and server names reach here from the network or the filesystem,
+	 * and nothing strips control characters on the way. A name carrying the separator splits
+	 * into two fields and shifts every later field of that row -- the bug tabs were introduced
+	 * to fix, since names routinely contain spaces. A tab inside a name is the same bug, only
+	 * rarer.
+	 *
+	 * Space-separated mode keeps the tab: that mode reproduces the older output byte for byte,
+	 * and a name containing a space is the ambiguity it opts back into.
+	 *
+	 * A newline is replaced in BOTH modes. It does not blur a field boundary, it fabricates a
+	 * whole record out of one -- every list command ends its rows with a newline, and `show dl`
+	 * and `show ul` also use it to structure a record. CRLF collapses to a single space rather
+	 * than two.
+	 *
+	 * Only separators are replaced. A value is never truncated, escaped or reworded.
+	 */
+	wxString Field(const wxString &value) const
+	{
+		wxString out(value);
+		out.Replace("\r\n", " ");
+		out.Replace("\n", " ");
+		out.Replace("\r", " ");
+		if (!m_spaceSeparated) {
+			out.Replace("\t", " ");
+		}
+		return out;
+	}
 	virtual int OnRun();
 
-	int	m_last_cmd_id;
-	CResultMap	m_Results_map;
+	int m_last_cmd_id;
+	CResultMap m_Results_map;
 };
 
 #endif // TEXTCLIENT_H

amule-3.0.1.tar.gz/src/ThreadScheduler.cpp -> amule-3.1.0.tar.gz/src/ThreadScheduler.cpp Changed

@@ -22,51 +22,46 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "ThreadScheduler.h"	// Interface declarations
-#include "Logger.h"				// Needed for Add(Debug)LogLine{C,N}
-#include <common/Format.h>		// Needed for CFormat
-#include "ScopedPtr.h"			// Needed for CScopedPtr
+#include "ThreadScheduler.h" // Interface declarations
+#include "Logger.h"          // Needed for Add(Debug)LogLine{C,N}
+#include <common/Format.h>   // Needed for CFormat
+#include "ScopedPtr.h"       // Needed for CScopedPtr
 
-#include <algorithm>			// Needed for std::sort		// Do_not_auto_remove (mingw-gcc-3.4.5)
+#include <algorithm> // Needed for std::sort		// Do_not_auto_remove (mingw-gcc-3.4.5)
 
 //! Global lock the scheduler and its thread.
 static wxMutex s_lock;
 //! Pointer to the global scheduler instance (automatically instantiated).
-static CThreadScheduler* s_scheduler = NULL;
+static CThreadScheduler *s_scheduler = NULL;
 //! Specifies if the scheduler is running.
-static bool	s_running = false;
+static bool s_running = false;
 //! Specifies if the global scheduler has been terminated.
 static bool s_terminated = false;
 
 /**
- * This class is used in a custom implementation of wxThreadHelper.
+ * Used in a custom implementation of wxThreadHelper.
  *
- * The reason for not using wxThreadHelper are as follows:
- *  - wxThreadHelper makes use of wxThread:Kill, which is warned against
- *    several times in the docs, and even calls it in its destructor.
- *  - Managing the thread-object is difficult, since the only way to
- *    destroy it is to create a new thread.
+ * wxThreadHelper is avoided because it uses wxThread::Kill, which the docs warn against repeatedly
+ * and which it even calls in its destructor; and because managing the thread object is difficult,
+ * the only way to destroy it being to create a new thread.
  */
 class CTaskThread : public CMuleThread
 {
 public:
-	CTaskThread(CThreadScheduler* owner)
-		: CMuleThread(wxTHREAD_JOINABLE),
-		  m_owner(owner)
+	CTaskThread(CThreadScheduler *owner)
+	: CMuleThread(wxTHREAD_JOINABLE)
+	, m_owner(owner)
 	{
 	}
 
 	//! For simplicity's sake, all code is placed in CThreadScheduler::Entry
-	void* Entry() {
-		return m_owner->Entry();
-	}
+	void *Entry() { return m_owner->Entry(); }
 
 private:
 	//! The scheduler owning this thread.
-	CThreadScheduler* m_owner;
+	CThreadScheduler *m_owner;
 };
 
-
 void CThreadScheduler::Start()
 {
 	wxMutexLocker lock(s_lock);
@@ -81,11 +76,10 @@
 	}
 }
 
-
 void CThreadScheduler::Terminate()
 {
 	AddDebugLogLineN(logThreads, "Terminating scheduler");
-	CThreadScheduler* ptr = NULL;
+	CThreadScheduler *ptr = NULL;
 
 	{
 		wxMutexLocker lock(s_lock);
@@ -101,8 +95,7 @@
 	AddDebugLogLineN(logThreads, "Scheduler terminated");
 }
 
-
-bool CThreadScheduler::AddTask(CThreadTask* task, bool overwrite)
+bool CThreadScheduler::AddTask(CThreadTask *task, bool overwrite)
 {
 	wxMutexLocker lock(s_lock);
 
@@ -119,23 +112,27 @@
 	return s_scheduler->DoAddTask(task, overwrite);
 }
 
-
 /** Returns string representation of error code. */
 static wxString GetErrMsg(wxThreadError err)
 {
 	switch (err) {
-		case wxTHREAD_NO_ERROR:		return "wxTHREAD_NO_ERROR";
-		case wxTHREAD_NO_RESOURCE:	return "wxTHREAD_NO_RESOURCE";
-		case wxTHREAD_RUNNING:		return "wxTHREAD_RUNNING";
-		case wxTHREAD_NOT_RUNNING:	return "wxTHREAD_NOT_RUNNING";
-		case wxTHREAD_KILLED:		return "wxTHREAD_KILLED";
-		case wxTHREAD_MISC_ERROR:	return "wxTHREAD_MISC_ERROR";
-		default:
-			return "Unknown error";
+	case wxTHREAD_NO_ERROR:
+		return "wxTHREAD_NO_ERROR";
+	case wxTHREAD_NO_RESOURCE:
+		return "wxTHREAD_NO_RESOURCE";
+	case wxTHREAD_RUNNING:
+		return "wxTHREAD_RUNNING";
+	case wxTHREAD_NOT_RUNNING:
+		return "wxTHREAD_NOT_RUNNING";
+	case wxTHREAD_KILLED:
+		return "wxTHREAD_KILLED";
+	case wxTHREAD_MISC_ERROR:
+		return "wxTHREAD_MISC_ERROR";
+	default:
+		return "Unknown error";
 	}
 }
 
-
 void CThreadScheduler::CreateSchedulerThread()
 {
 	if ((m_thread && m_thread->IsAlive()) || m_tasks.empty()) {
@@ -161,7 +158,8 @@
 			AddDebugLogLineN(logThreads, "Scheduler thread started");
 			return;
 		} else {
-			AddDebugLogLineC(logThreads, "Error while starting scheduler thread: " + GetErrMsg(err));
+			AddDebugLogLineC(
+				logThreads, "Error while starting scheduler thread: " + GetErrMsg(err));
 		}
 	} else {
 		AddDebugLogLineC(logThreads, "Error while creating scheduler thread: " + GetErrMsg(err));
@@ -173,11 +171,11 @@
 	m_thread = NULL;
 }
 
-
 /** This is the sorter functor for the task-queue. */
 struct CTaskSorter
 {
-	bool operator()(const CThreadScheduler::CEntryPair& a, const CThreadScheduler::CEntryPair& b) {
+	bool operator()(const CThreadScheduler::CEntryPair &a, const CThreadScheduler::CEntryPair &b)
+	{
 		if (a.first->GetPriority() != b.first->GetPriority()) {
 			return a.first->GetPriority() > b.first->GetPriority();
 		}
@@ -187,17 +185,13 @@
 	}
 };
 
-
-
 CThreadScheduler::CThreadScheduler()
-	: m_tasksDirty(false),
-	  m_thread(NULL),
-	  m_currentTask(NULL)
+: m_tasksDirty(false)
+, m_thread(NULL)
+, m_currentTask(NULL)
 {
-
 }
 
-
 CThreadScheduler::~CThreadScheduler()
 {
 	if (m_thread) {
@@ -206,7 +200,6 @@
 	}
 }
 
-
 size_t CThreadScheduler::GetTaskCount() const
 {
 	wxMutexLocker lock(s_lock);
@@ -214,15 +207,39 @@
 	return m_tasks.size();
 }
 
+size_t CThreadScheduler::GetPendingCount(const wxString &type)
+{
+	wxMutexLocker lock(s_lock);
 
-bool CThreadScheduler::DoAddTask(CThreadTask* task, bool overwrite)
+	if (s_scheduler == nullptr) {
+		return 0;
+	}
+
+	size_t count = 0;
+	for (const CEntryPair &entry : s_scheduler->m_tasks) {
+		if (type.IsEmpty() || entry.first->GetType() == type) {
+			++count;
+		}
+	}
+
+	// The running task has already left the queue but is not done, so count it: otherwise a
+	// batch reads as finished while its last task is still executing.
+	const CThreadTask *current = s_scheduler->m_currentTask;
+	if (current && (type.IsEmpty() || current->GetType() == type)) {
+		++count;
+	}
+
+	return count;
+}
+
+bool CThreadScheduler::DoAddTask(CThreadTask *task, bool overwrite)
 {
 	// GetTick is too lowres, so we just use a counter to ensure that
 	// the sorted order will match the order in which the tasks were added.
 	static unsigned taskAge = 0;
 
 	// Get the map for this task type, implicitly creating it as needed.
-	CDescMap& map = m_taskDescstask->GetType();
+	CDescMap &map = m_taskDescstask->GetType();
 
 	CDescMap::value_type entry(task->GetDesc(), task);
 	if (map.insert(entry).second) {
@@ -230,9 +247,10 @@
 		m_tasks.push_back(CEntryPair(task, taskAge++));
 		m_tasksDirty = true;
 	} else if (overwrite) {
-		AddDebugLogLineN(logThreads, "Task overwritten: " + task->GetType() + " - " + task->GetDesc());
+		AddDebugLogLineN(
+			logThreads, "Task overwritten: " + task->GetType() + " - " + task->GetDesc());
 
-		CThreadTask* existingTask = maptask->GetDesc();
+		CThreadTask *existingTask = maptask->GetDesc();
 		if (m_currentTask == existingTask) {
 			// The duplicate is already being executed, abort it.
 			m_currentTask->m_abort = true;
@@ -246,7 +264,8 @@
 		maptask->GetDesc() = task;
 		m_tasksDirty = true;
 	} else {
-		AddDebugLogLineN(logThreads, "Duplicate task, discarding: " + task->GetType() + " - " + task->GetDesc());
+		AddDebugLogLineN(logThreads,
+			"Duplicate task, discarding: " + task->GetType() + " - " + task->GetDesc());
 		delete task;
 		return false;
 	}
@@ -258,8 +277,7 @@
 	return true;
 }
 
-
-void* CThreadScheduler::Entry()
+void *CThreadScheduler::Entry()
 {
 	AddDebugLogLineN(logThreads, "Entering scheduling loop");
 
@@ -297,17 +315,18 @@
 		{
 			wxMutexLocker lock(s_lock);
 
-			// If the task has been aborted, the entry now refers to
-			// a different task, so dont remove it. That also means
-			// that it can't be the last task of this type.
+			// If the task has been aborted the entry now refers to a different task, so
+			// do not remove it. That also means it cannot be the last task of this
+			// type.
 			if (!task->m_abort) {
 				AddDebugLogLineN(logThreads,
-					CFormat("Completed task '%s%s', %u tasks remaining.")
-						% task->GetType()
-						% (task->GetDesc().IsEmpty() ? wxString() : (" - " + task->GetDesc()))
-						% m_tasks.size() );
+					CFormat("Completed task '%s%s', %u tasks remaining.") %
+						task->GetType() %
+						(task->GetDesc().IsEmpty() ? wxString()
+									   : (" - " + task->GetDesc())) %
+						m_tasks.size());
 
-				CDescMap& map = m_taskDescstask->GetType();
+				CDescMap &map = m_taskDescstask->GetType();
 				if (!map.erase(task->GetDesc())) {
 					wxFAIL;
 				} else if (map.empty()) {
@@ -331,35 +350,27 @@
 	return 0;
 }
 
-
-
-CThreadTask::CThreadTask(const wxString& type, const wxString& desc, ETaskPriority priority)
-	: m_type(type),
-	  m_desc(desc),
-	  m_priority(priority),
-	  m_owner(NULL),
-	  m_abort(false)
-{
-}
-
-
-CThreadTask::~CThreadTask()
+CThreadTask::CThreadTask(const wxString &type, const wxString &desc, ETaskPriority priority)
+: m_type(type)
+, m_desc(desc)
+, m_priority(priority)
+, m_owner(NULL)
+, m_abort(false)
 {
 }
 
+CThreadTask::~CThreadTask() {}
 
 void CThreadTask::OnLastTask()
 {
 	// Does nothing by default.
 }
 
-
 void CThreadTask::OnExit()
 {
 	// Does nothing by default.
 }
 
-
 bool CThreadTask::TestDestroy() const
 {
 	wxCHECK(m_owner, m_abort);
@@ -367,23 +378,19 @@
 	return m_abort || m_owner->TestDestroy();
 }
 
-
-const wxString& CThreadTask::GetType() const
+const wxString &CThreadTask::GetType() const
 {
 	return m_type;
 }
 
-
-const wxString& CThreadTask::GetDesc() const
+const wxString &CThreadTask::GetDesc() const
 {
 	return m_desc;
 }
 
-
 ETaskPriority CThreadTask::GetPriority() const
 {
 	return m_priority;
 }
 
-
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ThreadScheduler.h -> amule-3.1.0.tar.gz/src/ThreadScheduler.h Changed

@@ -23,7 +23,6 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #ifndef THREADSCHEDULER_H
 #define THREADSCHEDULER_H
 
@@ -33,10 +32,8 @@
 #include "Types.h"
 #include "MuleThread.h"
 
-
 class CThreadTask;
 
-
 //! The priority values of tasks.
 enum ETaskPriority
 {
@@ -47,19 +44,13 @@
 	ETP_Critical
 };
 
-
 /**
- * This class mananges scheduling of background tasks.
+ * Manages the scheduling of background tasks.
  *
- * Currently it is assumed that all tasks are IO intensive,
- * so that only a single task is allowed to proceed at any
- * one time. All threads are run in lowest priority mode.
+ * All tasks are assumed to be IO intensive, so only one runs at a time, and every thread runs at
+ * lowest priority. Tasks are sorted by priority (see ETaskPriority) and age.
  *
- * Tasks are sorted by priority (see ETaskPriority) and age.
- *
- * Note that the scheduler starts in suspended mode, in
- * which tasks are queued but not executed. Call Start()
- * to begin execution of the tasks.
+ * The scheduler starts suspended, queueing tasks without executing them; call Start() to begin.
  */
 class CThreadScheduler
 {
@@ -68,30 +59,38 @@
 	static void Start();
 
 	/**
-	 * Terminates task execution and frees the scheduler object.
-	 *
-	 * Tasks added after this are discarded.
+	 * Terminates task execution and frees the scheduler object. Tasks added afterwards are
+	 * discarded.
 	 */
 	static void Terminate();
 
-
 	/**
-	 * Adds a new task to the queue, returning true if the task was queued.
-	 *
-	 * Before the task is queued, it is checked against the
-	 * existing tasks based on type and description. If an
-	 * matching task already exists, this task-object is
-	 * discarded. The task is also discarded if the scheduler
-	 * has been terminated. If 'overwrite' is true, any
-	 * existing duplicate task is dropped, and if already
-	 * running, terminated.
+	 * Adds a new task to the queue, taking ownership of it, and returns true if it was queued.
 	 *
-	 * Note: This function takes ownership of the task.
+	 * Before queueing, the task is checked against the existing ones by type and description; a
+	 * matching task already present discards this object. It is also discarded if the scheduler
+	 * has been terminated. With `overwrite`, any existing duplicate is dropped, and terminated
+	 * if already running.
 	 *
 	 * @see Start
 	 * @see Terminate
 	 */
-	static bool AddTask(CThreadTask* task, bool overwrite = false);
+	static bool AddTask(CThreadTask *task, bool overwrite = false);
+
+	/**
+	 * The number of tasks still to be completed: those waiting on the queue, plus the one being
+	 * executed.
+	 *
+	 * For progress reporting, so a caller that has queued a batch can tell how much of it is
+	 * left without tracking completions itself. This is a snapshot taken under the scheduler's
+	 * lock; the worker may have moved on by the time it is read, so treat it as a lower bound
+	 * rather than an exact figure.
+	 *
+	 * @param type Count only tasks of this type, as passed to the CThreadTask constructor;
+	 * empty counts every task. Callers reporting on a batch of their own want the filter: the
+	 * queue is shared, and other subsystems add to it.
+	 */
+	static size_t GetPendingCount(const wxString &type = wxEmptyString);
 
 private:
 	CThreadScheduler();
@@ -101,69 +100,63 @@
 	size_t GetTaskCount() const;
 
 	/** Tries to add the given task to the queue, returning true on success. */
-	bool DoAddTask(CThreadTask* task, bool overwrite);
+	bool DoAddTask(CThreadTask *task, bool overwrite);
 
 	/** Creates the actual scheduler thread if none exist. */
 	void CreateSchedulerThread();
 
 	/** Entry function called via internal thread-object. */
-	void* Entry();
+	void *Entry();
 
 	//! Contains a task and its age.
-	typedef std::pair<CThreadTask*, uint32> CEntryPair;
+	typedef std::pair<CThreadTask *, uint32> CEntryPair;
 
 	//! List of currently scheduled tasks.
 	std::deque<CEntryPair> m_tasks;
 
 	//! Specifies if tasks should be resorted by priority.
-	bool	m_tasksDirty;
+	bool m_tasksDirty;
 
-	typedef std::map<wxString, CThreadTask*> CDescMap;
+	typedef std::map<wxString, CThreadTask *> CDescMap;
 	typedef std::map<wxString, CDescMap> CTypeMap;
 	//! Map of current task by type -> desc. Used to avoid duplicate tasks.
 	CTypeMap m_taskDescs;
 
 	//! The actual worker thread.
-	CMuleThread* m_thread;
+	CMuleThread *m_thread;
 	//! The currently running task, if any.
-	CThreadTask* m_currentTask;
+	CThreadTask *m_currentTask;
 
 	friend class CTaskThread;
 	friend struct CTaskSorter;
 };
 
-
 /**
- * Base-class of all threaded tasks.
- *
- * This class acts as a pseudo-thread, and is transparently
- * executed on a worker thread by the CThreadScheduler
- * class.
+ * Base class of all threaded tasks.
  *
- * Note that the task type should be an unique description
- * of the task type, as it is used to detect completion of
- * all tasks of a given type and in duplicate detection
- * with the description. The description should be unique
- * for the given task, such that duplicates can be discovered.
+ * Acts as a pseudo-thread, transparently executed on a worker thread by CThreadScheduler. The task
+ * type should be a unique description of the KIND of task, since it is used to detect completion of
+ * all tasks of a given type and, with the description, to find duplicates. The description should
+ * be unique for the given task.
  */
 class CThreadTask
 {
 public:
 	/**
-	 * @param type Should be a name constant among tasks of the type (hashing, completion, etc).
-	 * @param desc Should be an unique description for this task, for detecting duplicates.
-	 * @param priority Decides how soon the task will be carried out.
+	 * @param type A name constant among tasks of this kind (hashing, completion, ...).
+	 * @param desc A unique description for this task, for detecting duplicates.
+	 * @param priority Decides how soon the task is carried out.
 	 */
-	CThreadTask(const wxString& type, const wxString& desc, ETaskPriority priority = ETP_Normal);
+	CThreadTask(const wxString &type, const wxString &desc, ETaskPriority priority = ETP_Normal);
 
 	/** Needed since CThreadScheduler only works with CThreadTask pointers. */
 	virtual ~CThreadTask();
 
 	/** Returns the task type, used for debugging and duplicate detection. */
-	const wxString& GetType() const;
+	const wxString &GetType() const;
 
 	/** Returns the task description, used for debugging and duplicate detection. */
-	const wxString& GetDesc() const;
+	const wxString &GetDesc() const;
 
 	/** Returns the priority of the task. Used when selecting the next task. */
 	ETaskPriority GetPriority() const;
@@ -187,7 +180,7 @@
 	ETaskPriority m_priority;
 
 	//! The owner (scheduler), used when calling TestDestroy.
-	CMuleThread* m_owner;
+	CMuleThread *m_owner;
 	//! Specifies if the specific task should be aborted.
 	bool m_abort;

amule-3.0.1.tar.gz/src/ThreadTasks.cpp -> amule-3.1.0.tar.gz/src/ThreadTasks.cpp Changed

@@ -24,77 +24,72 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include <wx/app.h>			// Needed for wxTheApp
-
-#include <algorithm>			// std::min
-#include <unordered_set>		// CAICHSyncTask orphan-prune liveRoots set
-
-#include "ThreadTasks.h"		// Interface declarations
-#include "PartFile.h"			// Needed for CPartFile
-#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
-#include "Preferences.h"		// Needed for thePrefs
-#include "ScopedPtr.h"			// Needed for CScopedPtr and CScopedArray
-#include "PlatformSpecific.h"		// Needed for CanFSHandleSpecialChars
+#include <wx/app.h> // Needed for wxTheApp
+
+#include <algorithm>     // std::min
+#include <unordered_set> // CAICHSyncTask orphan-prune liveRoots set
+
+#include "ThreadTasks.h"      // Interface declarations
+#include "PartFile.h"         // Needed for CPartFile
+#include "CFile.h"            // Needed for CFile::CloneFile
+#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
+#include "Preferences.h"      // Needed for thePrefs
+#include "ScopedPtr.h"        // Needed for CScopedPtr and CScopedArray
+#include "PlatformSpecific.h" // Needed for CanFSHandleSpecialChars
 #include "config.h"
 
 //! This hash represents the value for an empty MD4 hashing
 const uint8_t g_emptyMD4Hash16 = {
-	0x31, 0xD6, 0xCF, 0xE0, 0xD1, 0x6A, 0xE9, 0x31,
-	0xB7, 0x3C, 0x59, 0xD7, 0xE0, 0xC0, 0x89, 0xC0 };
-
+	0x31, 0xD6, 0xCF, 0xE0, 0xD1, 0x6A, 0xE9, 0x31, 0xB7, 0x3C, 0x59, 0xD7, 0xE0, 0xC0, 0x89, 0xC0
+};
 
 ////////////////////////////////////////////////////////////
 // CHashingTask
 
-CHashingTask::CHashingTask(const CPath& path, const CPath& filename, const CPartFile* part)
-	// GetPrintable is used to improve the readability of the log.
-	: CThreadTask("Hashing", path.JoinPaths(filename).GetPrintable(), (part ? ETP_High : ETP_Normal)),
-	  m_path(path),
-	  m_filename(filename),
-	  m_toHash(EH_MD4_AND_AICH),
-	  m_owner(part)
+CHashingTask::CHashingTask(const CPath &path, const CPath &filename, const CPartFile *part)
+: CThreadTask("Hashing", path.JoinPaths(filename).GetPrintable(), (part ? ETP_High : ETP_Normal))
+, m_path(path)
+, m_filename(filename)
+, m_toHash(EH_MD4_AND_AICH)
+, m_owner(part)
 {
-	// We can only create the AICH hashset if the file is a knownfile or
-	// if the partfile is complete, since the MD4 hashset is checked first,
-	// so that the AICH hashset only gets assigned if the MD4 hashset
-	// matches what we expected. Due to the rarity of post-completion
-	// corruptions, this gives us a nice speedup in most cases.
+	// We can only create the AICH hashset if the file is a knownfile or the partfile is
+	// complete, since the MD4 hashset is checked first and the AICH hashset is only assigned if
+	// the MD4 one matches what we expected. Post-completion corruptions are rare, so this is a
+	// nice speedup in most cases.
 	if (part && !part->GetGapList().empty()) {
 		m_toHash = EH_MD4;
 	}
 }
 
-
-CHashingTask::CHashingTask(const CKnownFile* toAICHHash)
-	// GetPrintable is used to improve the readability of the log.
-	: CThreadTask("AICH Hashing", toAICHHash->GetFilePath().JoinPaths(toAICHHash->GetFileName()).GetPrintable(), ETP_Low),
-	  m_path(toAICHHash->GetFilePath()),
-	  m_filename(toAICHHash->GetFileName()),
-	  m_toHash(EH_AICH),
-	  m_owner(toAICHHash)
+CHashingTask::CHashingTask(const CKnownFile *toAICHHash)
+: CThreadTask("AICH Hashing",
+	  toAICHHash->GetFilePath().JoinPaths(toAICHHash->GetFileName()).GetPrintable(),
+	  ETP_Low)
+, m_path(toAICHHash->GetFilePath())
+, m_filename(toAICHHash->GetFileName())
+, m_toHash(EH_AICH)
+, m_owner(toAICHHash)
 {
 }
 
-
 void CHashingTask::Entry()
 {
 	CFileAutoClose file;
 
 	CPath fullPath = m_path.JoinPaths(m_filename);
 	if (!file.Open(fullPath, CFile::read)) {
-		AddDebugLogLineC(logHasher,
-			CFormat("Warning, failed to open file, skipping: %s") % fullPath);
+		AddDebugLogLineC(logHasher, CFormat("Warning, failed to open file, skipping: %s") % fullPath);
 		return;
 	}
 
 	uint64 fileLength = 0;
 	try {
 		fileLength = file.GetLength();
-	} catch (const CIOFailureException&) {
+	} catch (const CIOFailureException &) {
 		AddDebugLogLineC(logHasher,
 			CFormat("Warning, failed to retrieve file-length, skipping: %s") % fullPath);
 		return;
@@ -110,8 +105,7 @@
 			wxFAIL;
 		} else {
 			// Zero-size partfiles should be hashed, but not zero-sized shared-files.
-			AddDebugLogLineC(logHasher,
-				CFormat("Warning, 0-size file, skipping: %s") % fullPath);
+			AddDebugLogLineC(logHasher, CFormat("Warning, 0-size file, skipping: %s") % fullPath);
 		}
 
 		return;
@@ -124,40 +118,61 @@
 	knownfile->SetFileSize(fileLength);
 	knownfile->m_lastDateChanged = CPath::GetModificationTime(fullPath);
 	knownfile->m_AvailPartFrequency.insert(
-		knownfile->m_AvailPartFrequency.begin(),
-		knownfile->GetPartCount(), 0);
-
+		knownfile->m_AvailPartFrequency.begin(), knownfile->GetPartCount(), 0);
+
+	// Info level, not debug: AddDebugLogLineN compiles to nothing outside a debug build, so the
+	// binaries users run had no record that the client was reading every byte of a file (issue
+	// #968). Emitted here rather than where the task was queued, because tasks run serially on
+	// CThreadScheduler long after the directory walk, and after the guards above, so a skipped
+	// file never claims to have been hashed. The full path, not m_filename: the same basename
+	// can exist in several shared directories.
+	//
+	// m_owner is set only for a partfile -- completion hashing or a corrupt-part re-hash. Those
+	// are real disk work, but the path being read is an internal temp name like Temp/003.part,
+	// so report the download's own name and which kind of work it is instead.
+	const bool ownedByPartfile = (m_owner != nullptr);
 	if ((m_toHash & EH_MD4) && (m_toHash & EH_AICH)) {
 		knownfile->GetAICHHashset()->FreeHashSet();
-		AddDebugLogLineN( logHasher, CFormat(
-			"Starting to create MD4 and AICH hash for file: %s") %
-			m_filename );
+		if (ownedByPartfile) {
+			AddLogLineN(CFormat(_("Hashing downloaded file: %s")) % m_owner->GetFileName());
+		} else {
+			AddLogLineN(CFormat(_("Hashing file: %s")) % fullPath);
+		}
+		AddDebugLogLineN(
+			logHasher, CFormat("Starting to create MD4 and AICH hash for file: %s") % m_filename);
 	} else if ((m_toHash & EH_MD4)) {
-		AddDebugLogLineN( logHasher, CFormat(
-			"Starting to create MD4 hash for file: %s") % m_filename );
+		if (ownedByPartfile) {
+			AddLogLineN(CFormat(_("Hashing downloaded file: %s")) % m_owner->GetFileName());
+		} else {
+			AddLogLineN(CFormat(_("Hashing file: %s")) % fullPath);
+		}
+		AddDebugLogLineN(logHasher, CFormat("Starting to create MD4 hash for file: %s") % m_filename);
 	} else if ((m_toHash & EH_AICH)) {
 		knownfile->GetAICHHashset()->FreeHashSet();
-		AddDebugLogLineN( logHasher, CFormat(
-			"Starting to create AICH hash for file: %s") % m_filename );
+		// Distinct wording: this fires for files discovered long ago whose AICH master hash
+		// is missing from known2_64.met, so "hashing" would wrongly suggest the file was
+		// just found. After a known2_64.met loss it re-reads the entire library, which is
+		// the silent multi-hour case worth a line.
+		AddLogLineN(CFormat(_("Rebuilding AICH hashset for file: %s")) % fullPath);
+		AddDebugLogLineN(
+			logHasher, CFormat("Starting to create AICH hash for file: %s") % m_filename);
 	} else {
-		wxCHECK_RET(0, (CFormat("No hashes requested for file, skipping: %s")
-			% m_filename).GetString());
+		wxCHECK_RET(
+			0, (CFormat("No hashes requested for file, skipping: %s") % m_filename).GetString());
 	}
 
-	// This loops creates the part-hashes, loop-de-loop.
 	try {
 		for (uint16 part = 0; part < knownfile->GetPartCount() && !TestDestroy(); part++) {
 			SetHashingProgress(part + 1);
 			if (CreateNextPartHash(file, part, knownfile.get(), m_toHash) == false) {
 				AddDebugLogLineC(logHasher,
-					CFormat("Error while hashing file, skipping: %s")
-						% m_filename);
+					CFormat("Error while hashing file, skipping: %s") % m_filename);
 
 				SetHashingProgress(0);
 				return;
 			}
 		}
-	} catch (const CSafeIOException& e) {
+	} catch (const CSafeIOException &e) {
 		AddDebugLogLineC(logHasher, "IO exception while hashing file: " + e.what());
 		SetHashingProgress(0);
 		return;
@@ -167,10 +182,10 @@
 	if ((m_toHash & EH_MD4) && !TestDestroy()) {
 		// If the file is < PARTSIZE, then the filehash is that one hash,
 		// otherwise, the filehash is the hash of the parthashes
-		if ( knownfile->m_hashlist.size() == 1 ) {
+		if (knownfile->m_hashlist.size() == 1) {
 			knownfile->m_abyFileHash = knownfile->m_hashlist0;
 			knownfile->m_hashlist.clear();
-		} else if ( knownfile->m_hashlist.size() ) {
+		} else if (knownfile->m_hashlist.size()) {
 			CMD4Hash hash;
 			knownfile->CreateHashFromHashlist(knownfile->m_hashlist, &hash);
 			knownfile->m_abyFileHash = hash;
@@ -180,17 +195,16 @@
 		}
 	}
 
-	// Did we create a AICH hashset?
 	if ((m_toHash & EH_AICH) && !TestDestroy()) {
-		CAICHHashSet* AICHHashSet = knownfile->GetAICHHashset();
+		CAICHHashSet *AICHHashSet = knownfile->GetAICHHashset();
 
 		AICHHashSet->ReCalculateHash(false);
-		if (AICHHashSet->VerifyHashTree(true) ) {
+		if (AICHHashSet->VerifyHashTree(true)) {
 			AICHHashSet->SetStatus(AICH_HASHSETCOMPLETE);
 			if (!AICHHashSet->SaveHashSet()) {
-				AddDebugLogLineC( logHasher,
-					CFormat("Warning, failed to save AICH hashset for file: %s")
-						% m_filename );
+				AddDebugLogLineC(logHasher,
+					CFormat("Warning, failed to save AICH hashset for file: %s") %
+						m_filename);
 			}
 			// delete hashset now to free memory
 			AICHHashSet->FreeHashSet();
@@ -208,7 +222,6 @@
 	}
 }
 
-
 void CHashingTask::SetHashingProgress(uint16 part)
 {
 	if (m_owner) {
@@ -216,8 +229,7 @@
 	}
 }
 
-
-bool CHashingTask::CreateNextPartHash(CFileAutoClose& file, uint16 part, CKnownFile* owner, EHashes toHash)
+bool CHashingTask::CreateNextPartHash(CFileAutoClose &file, uint16 part, CKnownFile *owner, EHashes toHash)
 {
 	wxCHECK_MSG(!file.Eof(), false, "Unexpected EOF in CreateNextPartHash");
 
@@ -226,10 +238,9 @@
 	const uint64 partLength = owner->GetPartSize(part);
 
 	CMD4Hash hash;
-	CMD4Hash* md4Hash = ((toHash & EH_MD4) ? &hash : NULL);
-	CAICHHashTree* aichHash = NULL;
+	CMD4Hash *md4Hash = ((toHash & EH_MD4) ? &hash : NULL);
+	CAICHHashTree *aichHash = NULL;
 
-	// Setup for AICH hashing
 	if (toHash & EH_AICH) {
 		aichHash = owner->GetAICHHashset()->m_pHashTree.FindHash(offset, partLength);
 	}
@@ -237,13 +248,11 @@
 	owner->CreateHashFromFile(file, offset, partLength, md4Hash, aichHash);
 
 	if (toHash & EH_MD4) {
-		// Store the md4 hash
 		owner->m_hashlist.push_back(hash);
 
-		// This is because of the ed2k implementation for parts. A 2 * PARTSIZE
-		// 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
+		// The ed2k part implementation means a 2 * PARTSIZE file has 3 parts (see
+		// CKnownFile::SetFileSize), so a hash has to be created for the 0-size data: the
+		// default md4 hash for null data, 31D6CFE0D16AE931B73C59D7E0C089C0.
 		if ((partLength == PARTSIZE) && file.Eof()) {
 			owner->m_hashlist.push_back(CMD4Hash(g_emptyMD4Hash));
 		}
@@ -252,7 +261,6 @@
 	return true;
 }
 
-
 void CHashingTask::OnLastTask()
 {
 	if (GetType() == "Hashing") {
@@ -260,65 +268,68 @@
 		// explicitly save the list of hashed files here.
 		theApp->knownfiles->Save();
 
-		// Make sure the AICH-hashes are up to date.
+		// Make sure the AICH hashes are up to date. No orphan-prune here: this runs right
+		// after hashing and races the main-thread SafeAddKFile that registers those files,
+		// so pruning could delete a hashset we just wrote. Only the startup sync prunes.
 		CThreadScheduler::AddTask(new CAICHSyncTask());
 	}
 }
 
-
 ////////////////////////////////////////////////////////////
 // CAICHSyncTask
 
-CAICHSyncTask::CAICHSyncTask()
-	: CThreadTask("AICH Synchronizing", "", ETP_Low)
+CAICHSyncTask::CAICHSyncTask(bool pruneOrphans)
+: CThreadTask("AICH Synchronizing", "", ETP_Low)
+, m_pruneOrphans(pruneOrphans)
 {
 }
 
-
 void CAICHSyncTask::Entry()
 {
 	ConvertToKnown2ToKnown264();
 
-	AddDebugLogLineN( logAICHThread, "Synchronization thread started." );
+	AddDebugLogLineN(logAICHThread, "Synchronization 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(thePrefs::GetConfigDir() + KNOWN2_MET_FILENAME);
 
-	// Snapshot of AICH master hashes still referenced by a known.met
-	// record. Used to drop orphans (entries whose owning known.met
-	// record was TTL-evicted by CKnownFileList::PruneDuplicates) from
-	// known2_64.met during the read walk. Empty set disables the prune
-	// (defensive: never wipe everything before knownfiles is loaded).
+	// Snapshot of AICH master hashes still referenced by a known.met record, used to drop
+	// orphans -- entries whose owning record was TTL-evicted by PruneDuplicates -- during the
+	// read walk. An empty set disables the prune, so nothing is ever wiped before knownfiles is
+	// loaded.
+	//
+	// Only the startup sync collects it: a post-hashing sync runs on a worker thread that can
+	// outrun the main-thread SafeAddKFile registering the file it just hashed, whose freshly-
+	// written hashset would then be absent from liveRoots and pruned as an orphan.
 	std::unordered_set<CAICHHash> liveRoots;
-	if (theApp->knownfiles) {
+	if (m_pruneOrphans && theApp->knownfiles) {
 		theApp->knownfiles->CollectLiveAICHRoots(liveRoots);
 	}
 
 	CFile file;
 	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).
+		// 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, "Error, failed to open 'known2_64.met' file!" );
+			AddDebugLogLineC(logAICHThread, "Error, failed to open 'known2_64.met' file!");
 			return;
 		}
 		try {
 			file.WriteUInt8(KNOWN2_MET_VERSION);
-		} catch (const CIOFailureException& e) {
-			AddDebugLogLineC(logAICHThread, "IO failure while creating hashlist (Aborting): " + e.what());
+		} catch (const CIOFailureException &e) {
+			AddDebugLogLineC(
+				logAICHThread, "IO failure while creating hashlist (Aborting): " + e.what());
 			return;
 		}
 	} else {
 		if (!file.Open(fullpath, CFile::read)) {
-			AddDebugLogLineC( logAICHThread, "Error, failed to open 'known2_64.met' file!" );
+			AddDebugLogLineC(logAICHThread, "Error, failed to open 'known2_64.met' file!");
 			return;
 		}
 
-		// Rewrite target. CFile::write_safe writes to "<name>.new" and
-		// renames on Close(); a partial rewrite leaves the original
-		// known2_64.met untouched, so a crash mid-prune doesn't lose
-		// data. Only opened when we actually have a live-roots set to
-		// filter against.
+		// Rewrite target. CFile::write_safe writes to "<name>.new" and renames on Close(),
+		// so a crash mid-prune leaves the original known2_64.met untouched. Opened only
+		// when there is a live-roots set to filter against.
 		const bool prune = !liveRoots.empty();
 		CFile rewriteFile;
 		bool rewriteOk = false;
@@ -329,7 +340,7 @@
 			if (rewriteOk) {
 				try {
 					rewriteFile.WriteUInt8(KNOWN2_MET_VERSION);
-				} catch (const CIOFailureException&) {
+				} catch (const CIOFailureException &) {
 					rewriteOk = false;
 					rewriteFile.Close();
 				}
@@ -348,13 +359,11 @@
 
 			uint64 nExistingSize = file.GetLength();
 			while (file.GetPosition() < nExistingSize) {
-				// Read the next hash
 				CAICHHash rootHash(&file);
 
 				uint32 nHashCount = file.ReadUInt32();
 				const uint64 hashsetBytes =
-					static_cast<uint64>(nHashCount) *
-					CAICHHash::GetHashSize();
+					static_cast<uint64>(nHashCount) * CAICHHash::GetHashSize();
 				if (file.GetPosition() + hashsetBytes > nExistingSize) {
 					throw CEOFException("Hashlist ends past end of file.");
 				}
@@ -369,11 +378,9 @@
 					if (keep) {
 						rootHash.Write(&rewriteFile);
 						rewriteFile.WriteUInt32(nHashCount);
-						// Stream the hashset bytes through a small
-						// fixed buffer rather than slurping into RAM:
-						// large files can have many MB of leaf+tree
-						// SHA-1s and we don't want one entry to
-						// dictate the working set.
+						// Stream the hashset bytes through a small fixed
+						// buffer rather than slurping into RAM: large files
+						// can have many MB of leaf and tree SHA-1s.
 						uint8_t buf64 * 1024;
 						uint64 remaining = hashsetBytes;
 						while (remaining > 0) {
@@ -386,21 +393,18 @@
 						++keptCount;
 						nLastVerifiedPos = static_cast<uint32>(file.GetPosition());
 					} else {
-						nLastVerifiedPos = file.Seek(
-							static_cast<wxFileOffset>(hashsetBytes),
-							wxFromCurrent);
+						nLastVerifiedPos =
+							file.Seek(static_cast<wxFileOffset>(hashsetBytes),
+								wxFromCurrent);
 						++droppedCount;
 					}
 				} else {
-					// No rewrite in progress (prune disabled or
-					// rewrite file failed to open): just skip the
-					// hashset bytes as before.
+					// No rewrite in progress, so just skip the hashset bytes.
 					nLastVerifiedPos = file.Seek(
-						static_cast<wxFileOffset>(hashsetBytes),
-						wxFromCurrent);
+						static_cast<wxFileOffset>(hashsetBytes), wxFromCurrent);
 				}
 			}
-		} catch (const CEOFException&) {
+		} catch (const CEOFException &) {
 			AddDebugLogLineC(logAICHThread, "Hashlist corrupted, truncating file.");
 			file.Close();
 			file.Reopen(CFile::read_write);
@@ -408,18 +412,18 @@
 			// Drop the SaveHashSet dedup cache: some of its entries
 			// may have just been truncated off the end of the file.
 			CAICHHashSet::InvalidateRootHashCache();
-			// Don't finalise the rewrite when the source was
-			// corrupt -- the partial .new file would replace the
-			// just-truncated source with something different. Abort
-			// the rewrite explicitly so its destructor doesn't end
-			// up renaming a stale .new over the recovered file.
+			// Do not finalise the rewrite when the source was corrupt: the partial .new
+			// file would replace the just-truncated source with something different.
+			// Abort explicitly so its destructor cannot rename a stale .new over the
+			// recovered file.
 			if (rewriteOk) {
 				rewriteFile.Close();
 				CPath::RemoveFile(CPath(fullpath.GetRaw() + wxT(".new")));
 				rewriteOk = false;
 			}
-		} catch (const CIOFailureException& e) {
-			AddDebugLogLineC(logAICHThread, "IO failure while reading hashlist (Aborting): " + e.what());
+		} catch (const CIOFailureException &e) {
+			AddDebugLogLineC(
+				logAICHThread, "IO failure while reading hashlist (Aborting): " + e.what());
 			if (rewriteOk) {
 				rewriteFile.Close();
 				CPath::RemoveFile(CPath(fullpath.GetRaw() + wxT(".new")));
@@ -431,18 +435,16 @@
 			rewriteFile.Close();
 			if (droppedCount > 0) {
 				AddDebugLogLineN(logAICHThread,
-					CFormat("known2_64.met orphan prune: dropped %u, kept %u")
-						% (unsigned)droppedCount
-						% (unsigned)keptCount);
-				// The dedup cache mirrored the old file. Drop it so
-				// the next SaveHashSet rebuilds against the rewritten
-				// known2_64.met instead of insisting hashes we just
-				// pruned are still "present".
+					CFormat("known2_64.met orphan prune: dropped %u, kept %u") %
+						(unsigned)droppedCount % (unsigned)keptCount);
+				// The dedup cache mirrored the old file. Drop it so the next
+				// SaveHashSet rebuilds against the rewritten known2_64.met rather
+				// than insisting pruned hashes are still present.
 				CAICHHashSet::InvalidateRootHashCache();
 			}
 		}
 
-		AddDebugLogLineN( logAICHThread, "Masterhashes of known files have been loaded." );
+		AddDebugLogLineN(logAICHThread, "Masterhashes of known files have been loaded.");
 	}
 
 	// Now we check that all files which are in the sharedfilelist have a
@@ -450,7 +452,6 @@
 	theApp->sharedfiles->CheckAICHHashes(hashlist);
 }
 
-
 bool CAICHSyncTask::ConvertToKnown2ToKnown264()
 {
 	// converting known2.met to known2_64.met to support large files
@@ -474,15 +475,14 @@
 		return false;
 	}
 
-
 	if (!newfile.Open(newfullpath, CFile::write_excl)) {
 		AddDebugLogLineC(logAICHThread, "Failed to create 'known2_64.met' file.");
 
 		return false;
 	}
 
-	AddLogLineN(CFormat(_("Converting old AICH hashsets in '%s' to 64b in '%s'."))
-			% OLD_KNOWN2_MET_FILENAME % KNOWN2_MET_FILENAME);
+	AddLogLineN(CFormat(_("Converting old AICH hashsets in '%s' to 64b in '%s'.")) %
+		    OLD_KNOWN2_MET_FILENAME % KNOWN2_MET_FILENAME);
 
 	try {
 		newfile.WriteUInt8(KNOWN2_MET_VERSION);
@@ -491,8 +491,7 @@
 			CAICHHash aichHash(&oldfile);
 			uint32 nHashCount = oldfile.ReadUInt16();
 
-			const size_t hashBytes = static_cast<size_t>(nHashCount)
-				* CAICHHash::GetHashSize();
+			const size_t hashBytes = static_cast<size_t>(nHashCount) * CAICHHash::GetHashSize();
 			CScopedArray<uint8_t> buffer(hashBytes);
 
 			oldfile.Read(buffer.get(), hashBytes);
@@ -501,41 +500,246 @@
 			newfile.Write(buffer.get(), hashBytes);
 		}
 		newfile.Flush();
-	} catch (const CEOFException& e) {
+	} catch (const CEOFException &e) {
 		AddDebugLogLineC(logAICHThread, "Error reading old 'known2.met' file." + e.what());
 		return false;
-	} catch (const CIOFailureException& e) {
+	} catch (const CIOFailureException &e) {
 		AddDebugLogLineC(logAICHThread, "IO error while converting 'known2.met' file: " + e.what());
 		return false;
 	}
 
 	// FIXME LARGE FILES (uncomment)
-	//DeleteFile(oldfullpath);
+	// DeleteFile(oldfullpath);
 
 	return true;
 }
 
+////////////////////////////////////////////////////////////
+// CVerifyLocalDataTask
+
+CVerifyLocalDataTask::CVerifyLocalDataTask(const CMD4Hash &md4)
+: CThreadTask("VerifyLocalData", md4.Encode(), ETP_High) /*ETP_High as this is requested by the user*/
+, m_fileID(md4)
+{
+}
+
+void CVerifyLocalDataTask::PrintReport(const CPath &fullPath, const bool checkedAICH)
+{
+
+	std::string scope = checkedAICH ? "MD4 & AICH" : "MD4";
+
+	if (m_corruptedMD4.empty() && m_corruptedAICH.empty()) {
+		AddLogLineN(CFormat(_("Verify Local Data (%s): Result OK for %s")) % scope % fullPath);
+		return;
+	}
+
+	std::string res_md4;
+	res_md4.reserve(10 + m_corruptedMD4.size() * 3);
+	for (size_t i = 0; i < m_corruptedMD4.size(); ++i) {
+		res_md4 += std::to_string(static_cast<int>(m_corruptedMD4i));
+		if (i < m_corruptedMD4.size() - 1) {
+			res_md4 += ",";
+		}
+	}
+
+	std::string res_aich;
+	res_aich.reserve(10 + m_corruptedAICH.size() * 5);
+	if (checkedAICH) {
+		for (size_t i = 0; i < m_corruptedAICH.size(); ++i) {
+			res_aich += std::to_string(static_cast<int>(m_corruptedAICHi.first)) + ": (";
+
+			for (size_t j = 0; j < m_corruptedAICHi.second.size(); ++j) {
+				res_aich += std::to_string(static_cast<int>(m_corruptedAICHi.secondj));
+				if (j < m_corruptedAICHi.second.size() - 1) {
+					res_aich += ",";
+				}
+			}
+			res_aich += ")";
+			if (i < m_corruptedAICH.size() - 1) {
+				res_aich += ", ";
+			}
+		}
+	}
+
+	AddLogLineC(CFormat(_("Verify Local Data (%s): ERRORS FOUND! %s Failed blocks: MD4: %s. %s %s")) %
+		    scope % fullPath % res_md4 % (checkedAICH ? "AICH: " : "") %
+		    (checkedAICH ? res_aich : ""));
+}
+
+void CVerifyLocalDataTask::Entry()
+{
+
+	CFileAutoClose file;
+	uint64 fileLength = 0;
+	uint64 fileSize = 0;
+	std::vector<CMD4Hash> storedMD4Hashes;
+	CAICHHash aichRootHash;
+	EAICHStatus aichStatus;
+	CPath fullPath;
+	CKnownFile *knownFile;
+	{
+		knownFile = theApp->knownfiles->FindKnownFileByID(m_fileID);
+		if (knownFile == nullptr) {
+			AddDebugLogLineC(logVerifyLocalData,
+				CFormat("Warning, file was removed before verifying it: %s") % GetDesc());
+			return;
+		}
 
+		if (knownFile->IsPartFile()) {
+			AddDebugLogLineC(logVerifyLocalData,
+				CFormat("Warning, file is a part file, skipping %s") % GetDesc());
+			return;
+		}
+		CPath filepath = knownFile->GetFilePath();
+		CPath filename = knownFile->GetFileName();
+		fullPath = filepath.JoinPaths(filename);
+		storedMD4Hashes.reserve(knownFile->GetHashCount());
+		for (size_t i = 0; i < knownFile->GetHashCount(); ++i)
+			storedMD4Hashes.push_back(knownFile->GetPartHash(i));
+		aichRootHash = knownFile->GetAICHHashset()->GetMasterHash();
+		aichStatus = knownFile->GetAICHHashset()->GetStatus();
+		fileSize = knownFile->GetFileSize();
+	} // no more knownFile after this point
+
+	if (!file.Open(fullPath, CFile::read)) {
+		AddDebugLogLineC(
+			logVerifyLocalData, CFormat("Warning, failed to open file, skipping: %s") % fullPath);
+		return;
+	}
+
+	try {
+		fileLength = file.GetLength();
+	} catch (const CIOFailureException &) {
+		AddDebugLogLineC(logVerifyLocalData,
+			CFormat("Warning, failed to retrieve file-length, skipping: %s") % fullPath);
+		return;
+	}
+
+	if (fileLength != fileSize) {
+		AddDebugLogLineC(logVerifyLocalData,
+			CFormat("Warning, size mismatch between stored value and underlying file, skipping: "
+				"%s") %
+				fullPath);
+		return;
+	} else if (fileLength > MAX_FILE_SIZE) {
+		AddDebugLogLineC(logVerifyLocalData,
+			CFormat("Warning, file is larger than supported size, skipping: %s") % fullPath);
+		return;
+	} else if (fileLength == 0) {
+		// Zero-size partfiles should be hashed, but not zero-sized shared-files.
+		AddDebugLogLineC(
+			logVerifyLocalData, CFormat("Warning, 0-size file, skipping: %s") % fullPath);
+
+		return;
+	}
+
+	// Not the knownFile's own AICHHashSet, which is not thread-safe: while we check AICH hashes
+	// here, a peer could send an OP_AICHREQUEST for the same file and call
+	// LoadHashSet()/FreeHashSet() on the same working set.
+	CKnownFile storedFile;
+	storedFile.SetFileSize(fileSize);
+	storedFile.GetAICHHashset()->SetMasterHash(aichRootHash, aichStatus);
+	bool isAICHloaded = storedFile.GetAICHHashset()->LoadHashSet();
+
+	if (!isAICHloaded) {
+		AddDebugLogLineN(logVerifyLocalData,
+			CFormat("Verify Local Data error: failed to load hashset. File: %s") % fullPath);
+	}
+
+	try {
+		for (uint16 part = 0; part < storedFile.GetPartCount() && !TestDestroy(); part++) {
+
+			const uint64 offset = part * PARTSIZE; // We'll read at most PARTSIZE bytes per cycle
+			const uint64 partLength = storedFile.GetPartSize(part);
+
+			// check if the file is still there, and we are pointing to the same object
+			if (knownFile == theApp->knownfiles->FindKnownFileByID(m_fileID))
+				knownFile->SetHashingProgress(part + 1);
+			else {
+				AddDebugLogLineC(logVerifyLocalData,
+					CFormat("File removed or modified during hash check: File: %s ID: "
+						"%s") %
+						fullPath % m_fileID.Encode());
+				return;
+			}
+
+			CMD4Hash md4Hash;
+			CKnownFile calculatedCAICHOwner;
+			CAICHHashTree *aichHash = nullptr;
+			if (isAICHloaded) {
+				calculatedCAICHOwner.SetFileSize(storedFile.GetFileSize());
+				aichHash = calculatedCAICHOwner.GetAICHHashset()->m_pHashTree.FindHash(
+					offset, partLength);
+			}
+
+			CKnownFile::CreateHashFromFile(file, offset, partLength, &md4Hash, aichHash);
+			if (isAICHloaded) {
+				std::vector<uint8> corruptedAICHinThisPart;
+				uint8 block = 0;
+				for (uint64 pos = offset; pos < offset + partLength;
+					block++, pos += EMBLOCKSIZE) {
+					const uint32 nBlockSize =
+						min<uint32>(EMBLOCKSIZE, offset + partLength - pos);
+					CAICHHashTree *pVerifiedBlock =
+						storedFile.GetAICHHashset()->m_pHashTree.FindHash(
+							pos, nBlockSize);
+					CAICHHashTree *pOurBlock =
+						calculatedCAICHOwner.GetAICHHashset()->m_pHashTree.FindHash(
+							pos, nBlockSize);
+					if (pVerifiedBlock == nullptr || pOurBlock == nullptr ||
+						!pVerifiedBlock->GetHashValid() ||
+						!pOurBlock->GetHashValid()) {
+						AddDebugLogLineN(logVerifyLocalData,
+							CFormat("Verify Local Data error: Invalid/NULL AICH "
+								"block. File: %s, part %d, block %d") %
+								fullPath % part % block);
+						continue;
+					}
+					if (pOurBlock->GetHash() != pVerifiedBlock->GetHash())
+						corruptedAICHinThisPart.push_back(block);
+				}
+				if (!corruptedAICHinThisPart.empty())
+					m_corruptedAICH.emplace_back(part, corruptedAICHinThisPart);
+			}
+
+			// For files smaller than PARTSIZE, GetPartHash is empty and the MD4 of the
+			// part is the MD4 of the file; see CKnownFile::SetFileSize().
+			if (storedMD4Hashes.empty()) {
+				if (md4Hash != m_fileID)
+					m_corruptedMD4.push_back(part);
+				break;
+			}
+
+			if (storedMD4Hashespart != md4Hash)
+				m_corruptedMD4.push_back(part);
+		}
+
+		if (!TestDestroy()) // don't print an unfinished report
+			PrintReport(fullPath, isAICHloaded);
+
+	} catch (const CSafeIOException &e) {
+		AddDebugLogLineC(logVerifyLocalData, "IO exception while hashing file: " + e.what());
+	}
+	if (knownFile == theApp->knownfiles->FindKnownFileByID(m_fileID))
+		knownFile->SetHashingProgress(0);
+}
 
 ////////////////////////////////////////////////////////////
 // CCompletionTask
 
-
-CCompletionTask::CCompletionTask(const CPartFile* file)
-	// GetPrintable is used to improve the readability of the log.
-	: CThreadTask("Completing", file->GetFullName().GetPrintable(), ETP_High),
-	  m_filename(file->GetFileName()),
-	  m_metPath(file->GetFullName()),
-	  m_category(file->GetCategory()),
-	  m_owner(file),
-	  m_error(false)
+CCompletionTask::CCompletionTask(const CPartFile *file)
+: CThreadTask("Completing", file->GetFullName().GetPrintable(), ETP_High)
+, m_filename(file->GetFileName())
+, m_metPath(file->GetFullName())
+, m_category(file->GetCategory())
+, m_owner(file)
+, m_error(false)
 {
 	wxASSERT(m_filename.IsOk());
 	wxASSERT(m_metPath.IsOk());
 	wxASSERT(m_owner);
 }
 
-
 void CCompletionTask::Entry()
 {
 	CPath targetPath;
@@ -545,7 +749,7 @@
 		// Prevent the preference values from changing underneath us.
 		wxMutexGuiLocker guiLock;
 #else
-		//#warning Thread-safety needed
+		// #warning Thread-safety needed
 #endif
 
 		targetPath = theApp->glob_prefs->GetCategory(m_category)->path;
@@ -556,13 +760,14 @@
 
 	CPath dstName = m_filename.Cleanup(true, !PlatformSpecific::CanFSHandleSpecialChars(targetPath));
 
-	// Avoid empty filenames ...
 	if (!dstName.IsOk()) {
 		dstName = CPath("Unknown");
 	}
 
 	if (m_filename != dstName) {
-		AddLogLineC(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
@@ -574,30 +779,33 @@
 	}
 
 	if (newName != targetPath.JoinPaths(dstName)) {
-		AddLogLineC(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.
 	CPath partfilename = m_metPath.RemoveExt();
 	if (!CPath::RenameFile(partfilename, newName)) {
-		if (!CPath::CloneFile(partfilename, newName, true)) {
+		if (!CFile::CloneFile(partfilename, newName, true)) {
 			m_error = true;
 			return;
 		}
 
 		if (!CPath::RemoveFile(partfilename)) {
-			AddDebugLogLineC(logPartFile, CFormat("WARNING: Could not remove original '%s' after creating backup") % partfilename);
+			AddDebugLogLineC(logPartFile,
+				CFormat("WARNING: Could not remove original '%s' after creating backup") %
+					partfilename);
 		}
 	}
 
-	// Removes the various other data-files
-	const char* otherMetExt = { "", PARTMET_BAK_EXT, ".seeds", NULL };
+	const char *otherMetExt = { "", PARTMET_BAK_EXT, ".seeds", NULL };
 	for (size_t i = 0; otherMetExti; ++i) {
 		CPath toRemove = m_metPath.AppendExt(otherMetExti);
 
 		if (toRemove.FileExists()) {
 			if (!CPath::RemoveFile(toRemove)) {
-				AddDebugLogLineC(logPartFile, CFormat("WARNING: Failed to delete %s") % toRemove);
+				AddDebugLogLineC(
+					logPartFile, CFormat("WARNING: Failed to delete %s") % toRemove);
 			}
 		}
 	}
@@ -605,46 +813,43 @@
 	m_newName = newName;
 }
 
-
 void CCompletionTask::OnExit()
 {
-	// Notify the app that the completion has finished for this file.
 	CCompletionEvent evt(m_error, m_owner, m_newName);
 
 	wxQueueEvent(wxTheApp, (evt).Clone());
 }
 
-
-
 ////////////////////////////////////////////////////////////
 // CAllocateFileTask
 
 #ifdef HAVE_FALLOCATE
-#	ifndef _GNU_SOURCE
-#		define _GNU_SOURCE
-#	endif
-#	ifdef HAVE_FCNTL_H
-#		include <fcntl.h>
-#	endif
-#	include <linux/falloc.h>
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#include <linux/falloc.h>
 #elif defined HAVE_SYS_FALLOCATE
-#	include <sys/syscall.h>
-#	include <sys/types.h>
-#	include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <unistd.h>
 #elif defined HAVE_POSIX_FALLOCATE
-#	define _XOPEN_SOURCE 600
-#	include <stdlib.h>
-#	ifdef HAVE_FCNTL_H
-#		include <fcntl.h>
-#	endif
+#define _XOPEN_SOURCE 600
+#include <stdlib.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
 #endif
 #include <stdlib.h>
 #include <errno.h>
 
 CAllocateFileTask::CAllocateFileTask(CPartFile *file, bool pause)
-	// GetPrintable is used to improve the readability of the log.
-	: CThreadTask("Allocating", file->GetFullName().RemoveExt().GetPrintable(), ETP_High),
-	  m_file(file), m_pause(pause), m_result(ENOSYS)
+: CThreadTask("Allocating", file->GetFullName().RemoveExt().GetPrintable(), ETP_High)
+, m_file(file)
+, m_pause(pause)
+, m_result(ENOSYS)
 {
 	wxASSERT(file != NULL);
 }
@@ -672,33 +877,32 @@
 
 #ifdef __WINDOWS__
 	try {
-		// File is already created as non-sparse, so we only need to set the length.
-		// This will fail to allocate the file e.g. under wine on linux/ext3,
-		// but works with NTFS and FAT32.
+		// The file is already created as non-sparse, so we only need to set the length.
+		// This fails to allocate the file under wine on linux/ext3, for instance, but works
+		// with NTFS and FAT32.
 		file.Seek(m_file->GetFileSize() - 1, wxFromStart);
 		file.WriteUInt8(0);
 		file.Close();
 		m_result = 0;
-	} catch (const CSafeIOException&) {
+	} catch (const CSafeIOException &) {
 		m_result = errno;
 	}
 #else
-	// Use kernel level routines if possible
-#  ifdef HAVE_FALLOCATE
+#ifdef HAVE_FALLOCATE
 	m_result = fallocate(file.fd(), 0, 0, m_file->GetFileSize());
-#  elif defined HAVE_SYS_FALLOCATE
+#elif defined HAVE_SYS_FALLOCATE
 	m_result = syscall(SYS_fallocate, file.fd(), 0, (loff_t)0, (loff_t)m_file->GetFileSize());
 	if (m_result == -1) {
 		m_result = errno;
 	}
-#  elif defined HAVE_POSIX_FALLOCATE
-	// otherwise use glibc implementation, if available
+#elif defined HAVE_POSIX_FALLOCATE
 	m_result = posix_fallocate(file.fd(), 0, m_file->GetFileSize());
-#  endif
+#endif
 
 	if (m_result != 0 && m_result != ENOSPC) {
-		// If everything else fails, use slow-and-dirty method of allocating the file: write the whole file with zeroes.
-#  define BLOCK_SIZE	1048576		/* Write 1 MB blocks */
+		// If everything else fails, use slow-and-dirty method of allocating the file: write the whole
+		// file with zeroes.
+#define BLOCK_SIZE 1048576 /* Write 1 MB blocks */
 		void *zero = calloc(1, BLOCK_SIZE);
 		if (zero != NULL) {
 			try {
@@ -711,7 +915,7 @@
 				}
 				file.Close();
 				m_result = 0;
-			} catch (const CSafeIOException&) {
+			} catch (const CSafeIOException &) {
 				m_result = errno;
 			}
 			free(zero);
@@ -728,85 +932,95 @@
 
 void CAllocateFileTask::OnExit()
 {
-	// Notify the app that the preallocation has finished for this file.
 	CAllocFinishedEvent evt(m_file, m_pause, m_result);
 
 	wxQueueEvent(wxTheApp, (evt).Clone());
 }
 
-
-
 ////////////////////////////////////////////////////////////
 // CHashingEvent
 
 wxDEFINE_EVENT(MULE_EVT_HASHING, wxEvent);
 wxDEFINE_EVENT(MULE_EVT_AICH_HASHING, wxEvent);
-CHashingEvent::CHashingEvent(wxEventType type, CKnownFile* result, const CKnownFile* owner)
-	: wxEvent(-1, type),
-	  m_owner(owner),
-	  m_result(result)
+wxDEFINE_EVENT(MULE_EVT_MEDIA_PROBE, wxEvent);
+
+CMediaProbeEvent::CMediaProbeEvent(
+	const CMD4Hash &hash, const MediaInfo &info, bool succeeded, bool markUnprobeable)
+: wxEvent(-1, MULE_EVT_MEDIA_PROBE)
+, m_hash(hash)
+, m_succeeded(succeeded)
+, m_markUnprobeable(markUnprobeable)
 {
+	// Deep-copy every string: this event is built on the probe worker and consumed on the main
+	// thread, and wxString is refcounted, so handing the buffer over shared would race the
+	// worker's own copy going out of scope.
+	m_info.length_seconds = info.length_seconds;
+	m_info.bitrate_kbps = info.bitrate_kbps;
+	m_info.codec = wxString(info.codec.c_str(), info.codec.length());
+	m_info.artist = wxString(info.artist.c_str(), info.artist.length());
+	m_info.album = wxString(info.album.c_str(), info.album.length());
+	m_info.title = wxString(info.title.c_str(), info.title.length());
 }
 
+wxEvent *CMediaProbeEvent::Clone() const
+{
+	return new CMediaProbeEvent(m_hash, m_info, m_succeeded, m_markUnprobeable);
+}
+CHashingEvent::CHashingEvent(wxEventType type, CKnownFile *result, const CKnownFile *owner)
+: wxEvent(-1, type)
+, m_owner(owner)
+, m_result(result)
+{
+}
 
-wxEvent* CHashingEvent::Clone() const
+wxEvent *CHashingEvent::Clone() const
 {
 	return new CHashingEvent(GetEventType(), m_result, m_owner);
 }
 
-
-const CKnownFile* CHashingEvent::GetOwner() const
+const CKnownFile *CHashingEvent::GetOwner() const
 {
 	return m_owner;
 }
 
-
-CKnownFile* CHashingEvent::GetResult() const
+CKnownFile *CHashingEvent::GetResult() const
 {
 	return m_result;
 }
 
-
-
-
 ////////////////////////////////////////////////////////////
 // CCompletionEvent
 
 wxDEFINE_EVENT(MULE_EVT_FILE_COMPLETED, wxEvent);
 
-CCompletionEvent::CCompletionEvent(bool errorOccurred, const CPartFile* owner, const CPath& fullPath)
-	: wxEvent(-1, MULE_EVT_FILE_COMPLETED),
-	  m_fullPath(fullPath),
-	  m_owner(owner),
-	  m_error(errorOccurred)
+CCompletionEvent::CCompletionEvent(bool errorOccurred, const CPartFile *owner, const CPath &fullPath)
+: wxEvent(-1, MULE_EVT_FILE_COMPLETED)
+, m_fullPath(fullPath)
+, m_owner(owner)
+, m_error(errorOccurred)
 {
 }
 
-
-wxEvent* CCompletionEvent::Clone() const
+wxEvent *CCompletionEvent::Clone() const
 {
 	return new CCompletionEvent(m_error, m_owner, m_fullPath);
 }
 
-
 bool CCompletionEvent::ErrorOccurred() const
 {
 	return m_error;
 }
 
-
-const CPartFile* CCompletionEvent::GetOwner() const
+const CPartFile *CCompletionEvent::GetOwner() const
 {
 	return m_owner;
 }
 
-
-const CPath& CCompletionEvent::GetFullPath() const
+const CPath &CCompletionEvent::GetFullPath() const
 {
 	return m_fullPath;
 }
 
-
 ////////////////////////////////////////////////////////////
 // CAllocFinishedEvent

amule-3.0.1.tar.gz/src/ThreadTasks.h -> amule-3.1.0.tar.gz/src/ThreadTasks.h Changed

@@ -28,24 +28,20 @@
 #define TASKS_H
 
 #include "ThreadScheduler.h"
+#include "MediaProbe.h" // Needed for MediaInfo
+#include "MD4Hash.h"    // Needed for CMD4Hash on CMediaProbeTask + CMediaProbeEvent
 #include <common/Path.h>
 
 class CKnownFile;
 class CPartFile;
 class CFileAutoClose;
 
-
 /**
- * This task performs MD4 and/or AICH hashings of a file,
- * depending on the type. For new shared files (using the
- * first constructor, with part == NULL), both MD4 and
- * AICH hashes are created. For incomplete partfiles
- * (rehashed due to changed timestamps), only MD4 hashing
- * is done. For complete partfiles, both MD4 and AICH
- * hashing is done.
+ * Performs MD4 and/or AICH hashing of a file, depending on the type.
  *
- * For existing shared files (using the second constructor),
- * only an AICH hash is created.
+ * First constructor: a new shared file (part == NULL) gets both MD4 and AICH; an incomplete
+ * partfile, rehashed because its timestamp changed, gets MD4 only; a complete partfile gets both.
+ * Second constructor: an existing shared file gets an AICH hash only.
  *
  * @see CHashingEvent
  * @see CAICHSyncTask
@@ -58,54 +54,42 @@
 	 *
 	 * @param path The full path, without filename.
 	 * @param filename The actual filename.
-	 * @param part Used to identify the owner in the event-handler (PartFiles only).
+	 * @param part Identifies the owner in the event handler (PartFiles only).
 	 *
-	 * CHashingEvents sent by this type of tasks have the id MULE_EVT_HASHING.
-	 * @see EVT_MULE_HASHING
+	 * CHashingEvents from this kind of task have the id MULE_EVT_HASHING. @see EVT_MULE_HASHING
 	 */
-	CHashingTask(const CPath& path, const CPath& filename, const CPartFile* part = NULL);
+	CHashingTask(const CPath &path, const CPath &filename, const CPartFile *part = NULL);
 
 	/**
-	 * Schedules a KnownFile to have a AICH hashset created, used by CAICHSyncTask.
-	 *
-	 * CHashingEvents sent by this type of tasks have the id MULE_EVT_AICH_HASHING.
-	 * @see EVT_MULE_AICH_HASHING
-	 **/
-	CHashingTask(const CKnownFile* toAICHHash);
+	 * Schedules a KnownFile to have an AICH hashset created; used by CAICHSyncTask.
+	 * CHashingEvents from this kind of task have the id MULE_EVT_AICH_HASHING. @see
+	 * EVT_MULE_AICH_HASHING
+	 */
+	CHashingTask(const CKnownFile *toAICHHash);
 
 protected:
-	//! Specifies which hashes should be calculated when the task is executed.
-	//! EH_MD4 and EH_AICH are bit flags; the combined value is named
-	//! explicitly so a bitwise OR cast doesn't produce a value outside
-	//! the enum's valid range (caught by
-	//! clang-analyzer-optin.core.EnumCastOutOfRange in the cpp ctor).
-	enum EHashes {
+	//! Which hashes to calculate when the task runs. EH_MD4 and EH_AICH are bit flags; the
+	//! combined value is named explicitly so a bitwise OR cast cannot produce a value outside
+	//! the enum's valid range.
+	enum EHashes
+	{
 		EH_AICH = 1,
 		EH_MD4 = 2,
 		EH_MD4_AND_AICH = EH_MD4 | EH_AICH
 	};
 
-	//! @see CThreadTask::OnLastTask
 	virtual void OnLastTask();
 
-	//! @see CThreadTask::Entry
 	virtual void Entry();
 
 	/**
-	 * 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.
+	 * Hashes the next PARTSIZE chunk of @a file: an MD4 hash, plus an AICH hashset when @a
+	 * toHash asks for one. @a part is the part number and @a owner the known (or part) file it
+	 * belongs to.
 	 *
-	 * This function will create a MD4 hash and, if specified, a AICH hashset for
-	 * the next part of the file. This function makes the assumption that it wont
-	 * be called for closed or EOF files.
+	 * Returns false on read errors. Assumes it is never called for a closed or EOF file.
 	 */
-	bool CreateNextPartHash(CFileAutoClose& file, uint16 part, 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.
 	CPath m_path;
@@ -114,22 +98,29 @@
 	//! Specifies which hash-types should be calculated
 	EHashes m_toHash;
 	//! If a partfile or an AICH hashing, this pointer stores it for callbacks.
-	const CKnownFile* m_owner;
+	const CKnownFile *m_owner;
 
 private:
 	void SetHashingProgress(uint16 part);
 };
 
+// Media metadata probing (#140/#280) runs on the dedicated CMediaProbeThread, not the shared
+// CThreadScheduler, so a slow or hung ffprobe cannot stall completions. Results still arrive via
+// the CMediaProbeEvent below.
 
 /**
- * This task synchronizes the AICH hashlist.
- *
- * Shared files that are lacking a AICH-hash are scheduled for hashing.
+ * Synchronizes the AICH hashlist: shared files lacking an AICH hash are scheduled for hashing.
  */
 class CAICHSyncTask : public CThreadTask
 {
 public:
-	CAICHSyncTask();
+	/**
+	 * @param pruneOrphans Rewrite known2_64.met dropping hashsets no longer referenced by any
+	 * known file. Only safe when the known-file list is authoritative (startup); a post-hashing
+	 * sync races the main-thread registration of the file it just hashed and would prune its
+	 * own freshly-written hashset. Defaults to false so only the startup sync opts in.
+	 */
+	explicit CAICHSyncTask(bool pruneOrphans = false);
 
 protected:
 	/** See CThreadTask::Entry */
@@ -137,23 +128,43 @@
 
 	/** Converts old known2.met files to known2_64.met files. */
 	bool ConvertToKnown2ToKnown264();
+
+private:
+	bool m_pruneOrphans;
 };
 
+/**
+ * Calculates MD4 and AICH hashes for a known file, to check file integrity against the hashes
+ * stored in the .met files.
+ */
+class CVerifyLocalDataTask : public CThreadTask
+{
+public:
+	explicit CVerifyLocalDataTask(const CMD4Hash &md4);
+
+protected:
+	/** See CThreadTask::Entry */
+	virtual void Entry();
+
+	std::vector<uint16> m_corruptedMD4;
+	std::vector<std::pair<uint16, std::vector<uint8>>> m_corruptedAICH;
+	CMD4Hash m_fileID;
+
+private:
+	void PrintReport(const CPath &fullPath, const bool checkedAICH);
+};
 
 /**
- * This task performs the final tasks on a complete download.
- *
- * This includes finding a usable destination filename, removing
- * old data files and moving the part-file (potentially to a
- * different partition).
- **/
+ * Performs the final steps on a complete download: finding a usable destination filename, removing
+ * old data files and moving the part-file, possibly to a different partition.
+ */
 class CCompletionTask : public CThreadTask
 {
 public:
 	/**
 	 * Creates a thread which will complete the given download.
 	 */
-	CCompletionTask(const CPartFile* file);
+	CCompletionTask(const CPartFile *file);
 
 protected:
 	/** See CThreadTask::Entry */
@@ -163,156 +174,198 @@
 	virtual void OnExit();
 
 	//! The target filename.
-	CPath		m_filename;
+	CPath m_filename;
 	//! The full path to the .met-file
-	CPath		m_metPath;
+	CPath m_metPath;
 	//! The category of the download.
-	uint8		m_category;
+	uint8 m_category;
 	//! Owner of the file, used when sending completion-event.
-	const CPartFile*	m_owner;
+	const CPartFile *m_owner;
 	//! Specifies if an error occurred during completion.
-	bool		m_error;
+	bool m_error;
 	//! The resulting full path. File may be be renamed.
-	CPath		m_newName;
+	CPath m_newName;
 };
 
-
 /**
- * This task preallocates space for a newly created partfile.
+ * Preallocates space for a newly created partfile.
  */
 class CAllocateFileTask : public CThreadTask
 {
-      public:
+public:
 	/** Creates a thread that will allocate disk space for the full file. */
 	CAllocateFileTask(CPartFile *file, bool pause);
 
-      protected:
+protected:
 	/** See CThreadTask::Entry */
 	virtual void Entry();
 
 	/** See CThreadTask::OnExit */
 	virtual void OnExit();
 
-      private:
+private:
 	//! The partfile for which this task allocates space.
-	CPartFile *	m_file;
+	CPartFile *m_file;
 
 	//! Should this download start paused?
-	bool		m_pause;
+	bool m_pause;
 
 	//! Result of the preallocation.
-	long		m_result;
+	long m_result;
 };
 
-
 /**
- * This event is used to signal the completion of a hashing event.
- *
- * @see CHashingTask
+ * Signals the completion of a hashing event. @see CHashingTask
  */
 class CHashingEvent : public wxEvent
 {
 public:
 	/**
 	 * @param type MULE_EVT_HASHING or MULE_EVT_AICH_HASHING.
-	 * @param result
 	 */
-	CHashingEvent(wxEventType type, CKnownFile* result, const CKnownFile* owner = NULL);
+	CHashingEvent(wxEventType type, CKnownFile *result, const CKnownFile *owner = NULL);
 
 	/** @see wxEvent::Clone */
-	virtual wxEvent* Clone() const;
+	virtual wxEvent *Clone() const;
 
 	/** Returns the owner (may be NULL) of the hashing result. */
-	const CKnownFile* GetOwner() const;
+	const CKnownFile *GetOwner() const;
 	/** Returns a CKnownfile used to store the results of the hashing. */
-	CKnownFile* GetResult() const;
+	CKnownFile *GetResult() const;
 
 private:
 	//! The file owner.
-	const CKnownFile* m_owner;
+	const CKnownFile *m_owner;
 	//! The hashing results.
-	CKnownFile* m_result;
+	CKnownFile *m_result;
 };
 
+/**
+ * Sent when a probe finished, whether or not it extracted anything. The main-thread handler
+ * resolves the hash back to a CKnownFile* (via CKnownFileList::FindKnownFileByID) and attaches the
+ * FT_MEDIA_* tags there -- doing that from the worker thread would race the publish paths that read
+ * m_taglist.
+ *
+ * A FAILED probe is reported too (issue #1116): the handler records that the file was tried and
+ * produced nothing, so the "already probed" gate stops re-queueing it on every reload and every
+ * restart. Without that round trip a file ffprobe cannot read is indistinguishable from one never
+ * probed.
+ */
+class CMediaProbeEvent : public wxEvent
+{
+public:
+	// Carries the MediaInfo whole rather than one accessor per field: the struct already IS the
+	// set of extracted fields, and mirroring them here meant every new field touched the event,
+	// its ctor, its Clone and the handler. Strings are deep-copied on construction for the
+	// thread hop -- see the ctor.
+	//
+	// succeeded == false carries no MediaInfo worth reading: the handler records the failure
+	// and leaves whatever tags the file already had. markUnprobeable is meaningful only then --
+	// it says the probe reached a verdict about the FILE (ffprobe ran and found nothing usable)
+	// rather than failing on the environment (no binary, a timeout, a file that vanished). Only
+	// the former may be recorded against the file.
+	CMediaProbeEvent(const CMD4Hash &hash,
+		const MediaInfo &info,
+		bool succeeded = true,
+		bool markUnprobeable = false);
+
+	virtual wxEvent *Clone() const;
+
+	const CMD4Hash &GetHash() const { return m_hash; }
+	const MediaInfo &GetInfo() const { return m_info; }
+	bool Succeeded() const { return m_succeeded; }
+	bool MarkUnprobeable() const { return m_markUnprobeable; }
+
+private:
+	CMD4Hash m_hash;
+	MediaInfo m_info;
+	bool m_succeeded;
+	bool m_markUnprobeable;
+};
 
 /**
- * This event is sent when a part-file has been completed.
+ * Sent when a part-file has been completed.
  */
 class CCompletionEvent : public wxEvent
 {
 public:
 	/** Constructor, see getter funtion for description of parameters. */
-	CCompletionEvent(bool errorOccured, const CPartFile* owner, const CPath& fullPath);
+	CCompletionEvent(bool errorOccured, const CPartFile *owner, const CPath &fullPath);
 
 	/** @see wxEvent::Clone */
-	virtual wxEvent* Clone() const;
+	virtual wxEvent *Clone() const;
 
 	/** Returns true if completion failed. */
 	bool ErrorOccurred() const;
 
 	/** Returns the owner of the file that was being completed. */
-	const CPartFile* GetOwner() const;
+	const CPartFile *GetOwner() const;
 
 	/** Returns the full path to the completed file (empty on failure). */
-	const CPath& GetFullPath() const;
+	const CPath &GetFullPath() const;
+
 private:
 	//! The full path to the completed file.
 	CPath m_fullPath;
 
 	//! The owner of the completed .part file.
-	const CPartFile* m_owner;
+	const CPartFile *m_owner;
 
 	//! Specifies if completion failed.
 	bool m_error;
 };
 
-
 /**
- * This event is sent when preallocation of a new partfile is finished.
+ * Sent when preallocation of a new partfile is finished.
  */
 wxDECLARE_EVENT(MULE_EVT_ALLOC_FINISHED, wxEvent);
 class CAllocFinishedEvent : public wxEvent
 {
-      public:
+public:
 	/** Constructor, see getter function for description of parameters. */
 	CAllocFinishedEvent(CPartFile *file, bool pause, long result)
-		: wxEvent(-1, MULE_EVT_ALLOC_FINISHED),
-		  m_file(file), m_pause(pause), m_result(result)
-	{}
+	: wxEvent(-1, MULE_EVT_ALLOC_FINISHED)
+	, m_file(file)
+	, m_pause(pause)
+	, m_result(result)
+	{
+	}
 
 	/** @see wxEvent::Clone */
 	virtual wxEvent *Clone() const;
 
 	/** Returns the partfile for which preallocation was requested. */
-	CPartFile *GetFile() const noexcept	{ return m_file; }
+	CPartFile *GetFile() const noexcept { return m_file; }
 
 	/** Returns whether the partfile should start paused. */
-	bool	IsPaused() const noexcept	{ return m_pause; }
+	bool IsPaused() const noexcept { return m_pause; }
 
 	/** Returns the result of preallocation: true on success, false otherwise. */
-	bool	Succeeded() const noexcept	{ return m_result == 0; }
+	bool Succeeded() const noexcept { return m_result == 0; }
 
 	/** Returns the result of the preallocation. */
-	long	GetResult() const noexcept	{ return m_result; }
+	long GetResult() const noexcept { return m_result; }
 
-      private:
+private:
 	//! The partfile for which preallocation was requested.
-	CPartFile *	m_file;
+	CPartFile *m_file;
 
 	//! Should the download start paused?
-	bool		m_pause;
+	bool m_pause;
 
 	//! Result of preallocation
-	long		m_result;
+	long m_result;
 };
 
 wxDECLARE_EVENT(MULE_EVT_HASHING, wxEvent);
 wxDECLARE_EVENT(MULE_EVT_AICH_HASHING, wxEvent);
 wxDECLARE_EVENT(MULE_EVT_FILE_COMPLETED, wxEvent);
+wxDECLARE_EVENT(MULE_EVT_MEDIA_PROBE, wxEvent);
 
-typedef void (wxEvtHandler::*MuleHashingEventFunction)(CHashingEvent&);
-typedef void (wxEvtHandler::*MuleCompletionEventFunction)(CCompletionEvent&);
-typedef void (wxEvtHandler::*MuleAllocFinishedEventFunction)(CAllocFinishedEvent&);
+typedef void (wxEvtHandler::*MuleHashingEventFunction)(CHashingEvent &);
+typedef void (wxEvtHandler::*MuleCompletionEventFunction)(CCompletionEvent &);
+typedef void (wxEvtHandler::*MuleAllocFinishedEventFunction)(CAllocFinishedEvent &);
+typedef void (wxEvtHandler::*MuleMediaProbeEventFunction)(CMediaProbeEvent &);
 
 //! Event-handler for completed hashings of new shared files and partfiles.
 #define EVT_MULE_HASHING(func) \
@@ -330,6 +383,9 @@
 #define EVT_MULE_ALLOC_FINISHED(func) \
 	wx__DECLARE_EVT0(MULE_EVT_ALLOC_FINISHED, wxEVENT_HANDLER_CAST(MuleAllocFinishedEventFunction, func))
 
+//! Event-handler for MediaProbe-completed events.
+#define EVT_MULE_MEDIA_PROBE(func) \
+	wx__DECLARE_EVT0(MULE_EVT_MEDIA_PROBE, wxEVENT_HANDLER_CAST(MuleMediaProbeEventFunction, func))
 
 #endif // TASKS_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/ThrottledSocket.h -> amule-3.1.0.tar.gz/src/ThrottledSocket.h Changed

@@ -26,29 +26,26 @@
 #ifndef THROTTLEDSOCKET_H
 #define THROTTLEDSOCKET_H
 
-
 struct SocketSentBytes
 {
-    bool    success;
-	uint32	sentBytesStandardPackets;
-	uint32	sentBytesControlPackets;
+	bool success;
+	uint32 sentBytesStandardPackets;
+	uint32 sentBytesControlPackets;
 };
 
-
 class ThrottledControlSocket
 {
 public:
-    virtual ~ThrottledControlSocket() {}
-    virtual SocketSentBytes SendControlData(uint32 maxNumberOfBytesToSend, uint32 minFragSize) = 0;
+	virtual ~ThrottledControlSocket() {}
+	virtual SocketSentBytes SendControlData(uint32 maxNumberOfBytesToSend, uint32 minFragSize) = 0;
 };
 
-
 class ThrottledFileSocket : public ThrottledControlSocket
 {
 public:
-    virtual SocketSentBytes SendFileAndControlData(uint32 maxNumberOfBytesToSend, uint32 minFragSize) = 0;
-    virtual uint64 	GetLastCalledSend() = 0;
-    virtual uint32	GetNeededBytes() = 0;
+	virtual SocketSentBytes SendFileAndControlData(uint32 maxNumberOfBytesToSend, uint32 minFragSize) = 0;
+	virtual uint64 GetLastCalledSend() = 0;
+	virtual uint32 GetNeededBytes() = 0;
 };
 
 #endif

amule-3.0.1.tar.gz/src/Timer.cpp -> amule-3.1.0.tar.gz/src/Timer.cpp Changed

@@ -22,10 +22,9 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "Timer.h"		// Interface declaration
-#include "GetTickCount.h"	// Needed for GetTickCount
-#include "MuleThread.h"		// Needed for CMuleThread
-
+#include "Timer.h"        // Interface declaration
+#include "GetTickCount.h" // Needed for GetTickCount
+#include "MuleThread.h"   // Needed for CMuleThread
 
 //////////////////////// Timer Thread ////////////////////
 
@@ -33,11 +32,12 @@
 {
 public:
 	CTimerThread()
-		: CMuleThread(wxTHREAD_JOINABLE)
+	: CMuleThread(wxTHREAD_JOINABLE)
 	{
 	}
 
-	void* Entry() {
+	void *Entry()
+	{
 		CTimerEvent evt(m_id);
 
 		uint64 lastEvent = GetTickCount64();
@@ -47,9 +47,9 @@
 			// This is typically zero, because lastEvent was already incremented by one period.
 			sint64 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.  So,
-				// the calculation of delta has produced an absurd value.
+				// We are far too far behind. Most likely the system time was
+				// adjusted backwards, so the delta calculation produced an absurd
+				// value.
 				delta = 100 * m_period;
 				lastEvent = now - delta;
 			}
@@ -57,12 +57,10 @@
 			// Wait one period (adjusted by the difference just calculated)
 			sint64 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
-			// implement a Sleep operation which the owning CTimer can
-			// interrupt by posting to the semaphore.  So, it follows
-			// that if we do acquire the semaphore it means the owner
-			// wants us to exit.
+			// In normal operation we never actually acquire the semaphore, we always
+			// time out. This implements a Sleep the owning CTimer can interrupt by
+			// posting to the semaphore, so acquiring it means the owner wants us to
+			// exit.
 			if (m_sleepSemaphore.WaitTimeout(timeout) == wxSEMA_TIMEOUT) {
 				// Increment for one event only, so no events can be lost.
 				lastEvent += m_period;
@@ -76,14 +74,13 @@
 		return NULL;
 	}
 
-	sint64			m_period;
-	bool			m_oneShot;
-	wxEvtHandler*	m_owner;
-	int				m_id;
-	wxSemaphore		m_sleepSemaphore;
+	sint64 m_period;
+	bool m_oneShot;
+	wxEvtHandler *m_owner;
+	int m_id;
+	wxSemaphore m_sleepSemaphore;
 };
 
-
 ////////////////////// CTimer ////////////////////////
 
 CTimer::~CTimer()
@@ -91,8 +88,7 @@
 	Stop();
 }
 
-
-CTimer::CTimer(wxEvtHandler* owner, int id)
+CTimer::CTimer(wxEvtHandler *owner, int id)
 {
 	wxASSERT(owner);
 	m_owner = owner;
@@ -100,13 +96,11 @@
 	m_thread = NULL;
 }
 
-
 bool CTimer::IsRunning() const
 {
 	return (m_thread && m_thread->IsRunning());
 }
 
-
 bool CTimer::Start(int millisecs, bool oneShot)
 {
 	wxCHECK_MSG(m_id != -1, false, "Invalid target-ID for timer-events.");
@@ -116,10 +110,10 @@
 	Stop();
 
 	m_thread = new CTimerThread();
-	m_thread->m_period	= millisecs;
-	m_thread->m_oneShot	= oneShot;
-	m_thread->m_owner	= m_owner;
-	m_thread->m_id		= m_id;
+	m_thread->m_period = millisecs;
+	m_thread->m_oneShot = oneShot;
+	m_thread->m_owner = m_owner;
+	m_thread->m_id = m_id;
 
 	if (m_thread->Create() == wxTHREAD_NO_ERROR) {
 		if (m_thread->Run() == wxTHREAD_NO_ERROR) {
@@ -135,7 +129,6 @@
 	return false;
 }
 
-
 void CTimer::Stop()
 {
 	if (m_thread) {
@@ -146,15 +139,13 @@
 	}
 }
 
-
 wxDEFINE_EVENT(MULE_EVT_TIMER, wxEvent);
 CTimerEvent::CTimerEvent(int id)
-	: wxEvent(id, MULE_EVT_TIMER)
+: wxEvent(id, MULE_EVT_TIMER)
 {
 }
 
-
-wxEvent* CTimerEvent::Clone() const
+wxEvent *CTimerEvent::Clone() const
 {
 	return new CTimerEvent(GetId());
 }

amule-3.0.1.tar.gz/src/Timer.h -> amule-3.1.0.tar.gz/src/Timer.h Changed

@@ -30,9 +30,8 @@
 
 #include <wx/event.h>
 
-
 /**
- * Replacement for wxTimer as it doesn't work on non-X builds
+ * Replacement for wxTimer, which does not work on non-X builds.
  */
 class CTimer
 {
@@ -54,34 +53,28 @@
 	bool IsRunning() const;
 
 	/**
-	 * Stops the timer.
-	 *
-	 * Note that this does not delete the actual thread
-	 * immediately, but no new events will be queued after
-	 * calling this function.
+	 * Stops the timer. The thread is not deleted immediately, but no new events are queued
+	 * after this call.
 	 */
 	void Stop();
 
 private:
-	CTimerThread* m_thread;
-	wxEvtHandler* m_owner;
+	CTimerThread *m_thread;
+	wxEvtHandler *m_owner;
 	int m_id;
 };
 
-
-
 class CTimerEvent : public wxEvent
 {
 public:
 	CTimerEvent(int id = 0);
 
-	virtual wxEvent* Clone() const;
+	virtual wxEvent *Clone() const;
 };
 
-
 wxDECLARE_EVENT(MULE_EVT_TIMER, wxEvent);
 
-typedef void (wxEvtHandler::*MuleTimerEventFunction)(CTimerEvent&);
+typedef void (wxEvtHandler::*MuleTimerEventFunction)(CTimerEvent &);
 
 #define EVT_MULE_TIMER(id, func) \
 	wx__DECLARE_EVT1(MULE_EVT_TIMER, id, wxEVENT_HANDLER_CAST(MuleTimerEventFunction, func))

amule-3.1.0.tar.gz/src/TrackedClientRecord.h Added

@@ -0,0 +1,83 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 TRACKEDCLIENTRECORD_H
+#define TRACKEDCLIENTRECORD_H
+
+#include "Types.h" // Needed for uint16, uint64
+#include "PeerAddressing.h"
+
+#include <map>
+
+/**
+ * The user hash each deleted peer had per address and port, kept after its client is gone so a
+ * peer that returns with a different hash can be banned for it. The tick is a parameter, so expiry
+ * is testable without the application clock.
+ */
+class CTrackedClientRecord
+{
+public:
+	bool Add(const CNetworkAddress &address, uint16 port, void *hash, uint64 now)
+	{
+		const auto key = PeerAddressing::IndexKey(address);
+		if (key.IsAbsent()) {
+			return false;
+		}
+		auto &record = m_clientskey;
+		record.inserted = now;
+		record.hashesport = hash;
+		return true;
+	}
+
+	bool Compare(const CNetworkAddress &address, uint16 port, void *hash) const
+	{
+		const auto client = m_clients.find(PeerAddressing::IndexKey(address));
+		if (client == m_clients.end()) {
+			return true;
+		}
+		const auto prior = client->second.hashes.find(port);
+		return prior == client->second.hashes.end() || prior->second == hash;
+	}
+
+	void DropLapsed(uint64 now, uint64 duration)
+	{
+		for (auto it = m_clients.begin(); it != m_clients.end();) {
+			if (it->second.inserted + duration < now) {
+				it = m_clients.erase(it);
+			} else {
+				++it;
+			}
+		}
+	}
+
+private:
+	struct Record
+	{
+		uint64 inserted = 0;
+		std::map<uint16, void *> hashes;
+	};
+	std::map<CNetworkAddress, Record> m_clients;
+};
+
+#endif // TRACKEDCLIENTRECORD_H

amule-3.0.1.tar.gz/src/TransferWnd.cpp -> amule-3.1.0.tar.gz/src/TransferWnd.cpp Changed

@@ -23,83 +23,103 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "TransferWnd.h"	// Interface declarations
+#include "TransferWnd.h" // Interface declarations
 
 #include <common/MenuIDs.h>
 
+#include <wx/artprov.h> // Needed for the "amule:" art ids
 #include <wx/config.h>
 
-
 // This include must be before amuleDlg.h
 #ifdef __WINDOWS__
-    #include <wx/msw/winundef.h>	// Needed for windows compilation
+#include <wx/msw/winundef.h> // Needed for windows compilation
 #endif
 
-
-#include "amuleDlg.h"			// Needed for CamuleDlg
-#include "PartFile.h"			// Needed for PR_LOW
-#include "DownloadQueue.h"		// Needed for CDownloadQueue
-#include "CatDialog.h"			// Needed for CCatDialog
-#include "DownloadListCtrl.h"		// Needed for CDownloadListCtrl
-#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()
+#include "amuleDlg.h"         // Needed for CamuleDlg
+#include "PartFile.h"         // Needed for PR_LOW
+#include "DownloadQueue.h"    // Needed for CDownloadQueue
+#include "CatDialog.h"        // Needed for CCatDialog
+#include "DownloadListCtrl.h" // Needed for CDownloadListCtrl
+#include "SourceListCtrl.h"   // Needed for CSourceListCtrl
+#include "amule.h"            // Needed for theApp
+#include "muuli_wdr.h"        // Needed for ID_CATEGORIES
+#include "OtherFunctions.h"   // Needed for CastItoXBytes
+#include "SearchDlg.h"        // Needed for CSearchDlg->UpdateCatChoice()
 #include "MuleNotebook.h"
 #include "Preferences.h"
-#include "Statistics.h"			// Needed for theStats
-#include "SharedFileList.h"		// Needed for CSharedFileList
-#include "GuiEvents.h"			// Needed for CoreNotify_*
+#include "Statistics.h"     // Needed for theStats
+#include "SharedFileList.h" // Needed for CSharedFileList
+#include "GuiEvents.h"      // Needed for CoreNotify_*
+// ReloadSharedFilesIfPending
+#include "SharedFilesReloadProgress.h"
 
+#ifdef __WXMAC__
+#include "MacAppHelper.h" // Needed for mac_tab_view_buttons_mid_y
+
+#include <vector>
+#endif
 
 wxBEGIN_EVENT_TABLE(CTransferWnd, wxPanel)
 	EVT_RIGHT_DOWN(CTransferWnd::OnNMRclickDLtab)
-	EVT_NOTEBOOK_PAGE_CHANGED(ID_CATEGORIES,	CTransferWnd::OnCategoryChanged)
+	EVT_NOTEBOOK_PAGE_CHANGED(ID_CATEGORIES, CTransferWnd::OnCategoryChanged)
 
 	EVT_SPLITTER_SASH_POS_CHANGING(ID_DOWNLOADSSPLATTER, CTransferWnd::OnSashPositionChanging)
 
-	EVT_BUTTON(ID_BTNCLRCOMPL,		CTransferWnd::OnBtnClearDownloads)
-	EVT_BUTTON(ID_CLIENTTOGGLE,		CTransferWnd::OnToggleClientList)
+	EVT_BUTTON(ID_BTNCLRCOMPL, CTransferWnd::OnBtnClearDownloads)
+	EVT_BUTTON(ID_CLIENTTOGGLE, CTransferWnd::OnToggleClientList)
+
+	EVT_TEXT(IDC_TRANSFER_FILTER, CTransferWnd::OnFilterChanged)
 
 	EVT_MENU_RANGE(MP_CAT_SET0, MP_CAT_SET0 + 15, CTransferWnd::OnSetDefaultCat)
-	EVT_MENU(MP_CAT_ADD,			CTransferWnd::OnAddCategory)
-	EVT_MENU(MP_CAT_EDIT,			CTransferWnd::OnEditCategory)
-	EVT_MENU(MP_CAT_REMOVE,			CTransferWnd::OnDelCategory)
-	EVT_MENU(MP_PRIOLOW,			CTransferWnd::OnSetCatPriority)
-	EVT_MENU(MP_PRIONORMAL,			CTransferWnd::OnSetCatPriority)
-	EVT_MENU(MP_PRIOHIGH,			CTransferWnd::OnSetCatPriority)
-	EVT_MENU(MP_PRIOAUTO,			CTransferWnd::OnSetCatPriority)
-	EVT_MENU(MP_PAUSE,			CTransferWnd::OnSetCatStatus)
-	EVT_MENU(MP_STOP,			CTransferWnd::OnSetCatStatus)
-	EVT_MENU(MP_CANCEL,			CTransferWnd::OnSetCatStatus)
-	EVT_MENU(MP_RESUME,			CTransferWnd::OnSetCatStatus)
+	EVT_MENU(MP_CAT_ADD, CTransferWnd::OnAddCategory)
+	EVT_MENU(MP_CAT_EDIT, CTransferWnd::OnEditCategory)
+	EVT_MENU(MP_CAT_REMOVE, CTransferWnd::OnDelCategory)
+	EVT_MENU(MP_PRIOLOW, CTransferWnd::OnSetCatPriority)
+	EVT_MENU(MP_PRIONORMAL, CTransferWnd::OnSetCatPriority)
+	EVT_MENU(MP_PRIOHIGH, CTransferWnd::OnSetCatPriority)
+	EVT_MENU(MP_PRIOAUTO, CTransferWnd::OnSetCatPriority)
+	EVT_MENU(MP_PAUSE, CTransferWnd::OnSetCatStatus)
+	EVT_MENU(MP_STOP, CTransferWnd::OnSetCatStatus)
+	EVT_MENU(MP_CANCEL, CTransferWnd::OnSetCatStatus)
+	EVT_MENU(MP_RESUME, CTransferWnd::OnSetCatStatus)
 wxEND_EVENT_TABLE()
 
-
-
-CTransferWnd::CTransferWnd( wxWindow* pParent )
-	: wxPanel( pParent, -1 )
+CTransferWnd::CTransferWnd(wxWindow *pParent)
+: wxPanel(pParent, -1)
 {
-	wxSizer* content = transferDlg(this, true);
+	wxSizer *content = transferDlg(this, true);
 	content->Show(this, true);
 
-	downloadlistctrl = CastChild( "downloadList", CDownloadListCtrl );
-	clientlistctrl   = CastChild( ID_CLIENTLIST, CSourceListCtrl );
-	m_dlTab          = CastChild( ID_CATEGORIES, CMuleNotebook );
+	downloadlistctrl = CastChild("downloadList", CDownloadListCtrl);
+	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));
+#ifdef __WXMAC__
+	// The native tab view draws its buttons across the top edge of its page bezel, so the dark bar
+	// sits below the row's centre and the controls beside it looked misaligned. Move them down onto
+	// the bar's centre, measured from where AppKit put the buttons. Deferred until laid out.
+	CallAfter(this() { CentreHeaderOnCategoryBar(); });
+#endif
+
+	// Render the initial "Total size: 0 bytes" so the field is visible for an empty queue.
+	// CDownloadListCtrl::SetTotalSize() cannot do it yet: it reaches the label through
+	// theApp->amuledlg->m_transferwnd, which is not assigned until this constructor returns.
+	if (wxStaticText *totalSize = CastChild("downloadsTotalSize", wxStaticText)) {
+		totalSize->SetLabel(CFormat(_("Total queue size: %s")) % CastItoXBytes(0));
+	}
+
+	const wxBitmapBundle clrDisabled =
+		wxArtProvider::GetBitmapBundle("amule:transfer_clear_completed_disabled");
+	CastChild(ID_BTNCLRCOMPL, wxBitmapButton)->SetBitmapDisabled(clrDisabled);
 
 	// We want to use our own popup
-	m_dlTab->SetPopupHandler( this );
+	m_dlTab->SetPopupHandler(this);
 
-	// Set default category
 	theApp->glob_prefs->GetCategory(0)->title = GetCatTitle(thePrefs::GetAllcatFilter());
 	theApp->glob_prefs->GetCategory(0)->path = thePrefs::GetIncomingDir();
 
-	// Show default + userdefined categories
-	for ( uint32 i = 0; i < theApp->glob_prefs->GetCatCount(); i++ ) {
-		m_dlTab->AddPage( new wxPanel(m_dlTab), theApp->glob_prefs->GetCategory(i)->title );
+	for (uint32 i = 0; i < theApp->glob_prefs->GetCatCount(); i++) {
+		m_dlTab->AddPage(new wxPanel(m_dlTab), theApp->glob_prefs->GetCategory(i)->title);
 	}
 
 	m_menu = NULL;
@@ -107,44 +127,34 @@
 
 	wxConfigBase *config = wxConfigBase::Get();
 
-	// Check if the clientlist is hidden
 	bool show = true;
-	config->Read( "/GUI/TransferWnd/ShowClientList", &show, true );
+	config->Read("/GUI/TransferWnd/ShowClientList", &show, true);
 	clientlistctrl->SetShowing(show);
-	// Load the last used splitter position
-	m_splitter = config->Read( "/GUI/TransferWnd/Splitter", 463l );
+	m_splitter = config->Read("/GUI/TransferWnd/Splitter", 463l);
 }
 
-
 CTransferWnd::~CTransferWnd()
 {
 	wxConfigBase *config = wxConfigBase::Get();
 
-	if ( !clientlistctrl->GetShowing() ) {
-		// Save the splitter position
-		config->Write( "/GUI/TransferWnd/Splitter", m_splitter );
+	if (!clientlistctrl->GetShowing()) {
+		config->Write("/GUI/TransferWnd/Splitter", m_splitter);
 
-		// Save the visible status of the list
-		config->Write( "/GUI/TransferWnd/ShowClientList", false );
+		config->Write("/GUI/TransferWnd/ShowClientList", false);
 	} else {
-		wxSplitterWindow* splitter = CastChild( "splitterWnd", wxSplitterWindow );
+		wxSplitterWindow *splitter = CastChild("splitterWnd", wxSplitterWindow);
 
-		// Save the splitter position
-		config->Write( "/GUI/TransferWnd/Splitter", splitter->GetSashPosition() );
+		config->Write("/GUI/TransferWnd/Splitter", splitter->GetSashPosition());
 
-		// Save the visible status of the list
-		config->Write( "/GUI/TransferWnd/ShowClientList", true );
+		config->Write("/GUI/TransferWnd/ShowClientList", true);
 	}
 }
 
-
-void CTransferWnd::AddCategory( Category_Struct* category )
+void CTransferWnd::AddCategory(Category_Struct *category)
 {
-	// Add the initial page
-	m_dlTab->AddPage( new wxPanel(m_dlTab), category->title );
+	m_dlTab->AddPage(new wxPanel(m_dlTab), category->title);
 
-	// Update the title
-	UpdateCategory( m_dlTab->GetPageCount() - 1 );
+	UpdateCategory(m_dlTab->GetPageCount() - 1);
 
 	theApp->amuledlg->m_searchwnd->UpdateCatChoice();
 }
@@ -159,13 +169,15 @@
 		downloads.insert(downloads.begin(), nrCats, 0);
 
 #ifdef CLIENT_GUI
-		for (CDownQueueRem::const_iterator it = theApp->downloadqueue->begin(); it != theApp->downloadqueue->end(); ++it) {
+		for (CDownQueueRem::const_iterator it = theApp->downloadqueue->begin();
+			it != theApp->downloadqueue->end();
+			++it) {
 			CPartFile *cur_file = it->second;
 #else
-		std::vector<CPartFile*> fileList;
+		std::vector<CPartFile *> fileList;
 		theApp->downloadqueue->CopyFileList(fileList, true);
 		int size = fileList.size();
-		for (int i = 0; i < size; ++i ) {
+		for (int i = 0; i < size; ++i) {
 			CPartFile *cur_file = fileListi;
 #endif
 			bool downloading = cur_file->GetTransferingSrcCount() > 0;
@@ -183,7 +195,6 @@
 				}
 			}
 		}
-
 	}
 	int start, end;
 	if (index == -1) {
@@ -202,74 +213,103 @@
 	}
 }
 
-
-void CTransferWnd::OnSetCatStatus( wxCommandEvent& event )
+void CTransferWnd::OnSetCatStatus(wxCommandEvent &event)
 {
-	if ( event.GetId() == MP_CANCEL ) {
-		if ( wxMessageBox(_("Are you sure you wish to cancel and delete all files in this category?"),_("Confirmation Required"), wxYES_NO|wxNO_DEFAULT|wxCENTRE|wxICON_EXCLAMATION, this) == wxNO) {
+	if (event.GetId() == MP_CANCEL) {
+		if (wxMessageBox(_("Are you sure you wish to cancel and delete all files in this category?"),
+			    _("Confirmation Required"),
+			    wxYES_NO | wxNO_DEFAULT | wxCENTRE | wxICON_EXCLAMATION,
+			    this) == wxNO) {
 			return;
 		}
 	}
 
-	CoreNotify_Download_Set_Cat_Status( m_dlTab->GetSelection(), event.GetId() );
+	CoreNotify_Download_Set_Cat_Status(m_dlTab->GetSelection(), event.GetId());
 }
 
-
-void CTransferWnd::OnSetCatPriority( wxCommandEvent& event )
+void CTransferWnd::OnSetCatPriority(wxCommandEvent &event)
 {
 	int priority = 0;
 
-	switch ( event.GetId() ) {
-		case MP_PRIOLOW:	priority = PR_LOW;	break;
-		case MP_PRIONORMAL:	priority = PR_NORMAL;	break;
-		case MP_PRIOHIGH:	priority = PR_HIGH;	break;
-		case MP_PRIOAUTO:	priority = PR_AUTO;	break;
-		default:
-			return;
+	switch (event.GetId()) {
+	case MP_PRIOLOW:
+		priority = PR_LOW;
+		break;
+	case MP_PRIONORMAL:
+		priority = PR_NORMAL;
+		break;
+	case MP_PRIOHIGH:
+		priority = PR_HIGH;
+		break;
+	case MP_PRIOAUTO:
+		priority = PR_AUTO;
+		break;
+	default:
+		return;
 	}
 
-	CoreNotify_Download_Set_Cat_Prio( m_dlTab->GetSelection(), priority );
+	CoreNotify_Download_Set_Cat_Prio(m_dlTab->GetSelection(), priority);
 }
 
-
-void CTransferWnd::OnAddCategory(wxCommandEvent& WXUNUSED(event))
+void CTransferWnd::OnAddCategory(wxCommandEvent &WXUNUSED(event))
 {
 	if (theApp->glob_prefs->GetCatCount() >= 99) {
-		wxMessageBox(_("Only 99 categories are supported."), _("Too many categories!"), wxOK | wxICON_EXCLAMATION);
+		wxMessageBox(_("Only 99 categories are supported."),
+			_("Too many categories!"),
+			wxOK | wxICON_EXCLAMATION);
 		return;
 	}
-	CCatDialog dialog( this,
+	CCatDialog dialog(this,
 	// Allow browse?
 #ifdef CLIENT_GUI
-	false
+		false
 #else
-	true
+		true
 #endif
 	);
 	dialog.ShowModal();
+	// A new category's incoming dir joins the shareset, so the dialog may have left a re-walk
+	// owed. Run it now the modal is gone, behind its own progress dialog, rather than letting
+	// it freeze the app on a core tick.
+	ReloadSharedFilesIfPending(this);
 }
 
-
-void CTransferWnd::OnDelCategory(wxCommandEvent& WXUNUSED(event))
+void CTransferWnd::OnDelCategory(wxCommandEvent &WXUNUSED(event))
 {
 	RemoveCategory(m_dlTab->GetSelection());
 }
 
-
 void CTransferWnd::RemoveCategory(int index)
 {
-	if ( index > 0 ) {
-		theApp->downloadqueue->ResetCatParts(index);
-		theApp->glob_prefs->RemoveCat(index);
-		RemoveCategoryPage(index);
-		if ( theApp->glob_prefs->GetCatCount() == 1 ) {
-			thePrefs::SetAllcatFilter( acfAll );
-		}
-		theApp->glob_prefs->SaveCats();
-		theApp->amuledlg->m_searchwnd->UpdateCatChoice();
+	if (index <= 0) {
+		return;
+	}
+	// Granted immediately in the monolithic build; in amulegui it goes out as
+	// EC_OP_DELETE_CATEGORY and the reply handler commits instead, so a refused delete cannot
+	// close the tab (amule-org/amule#1231).
+	if (theApp->glob_prefs->RequestRemoveCat(index)) {
+		CommitRemoveCategory(index);
 	}
 }
 
+void CTransferWnd::CommitRemoveCategory(int index)
+{
+	if (index <= 0) {
+		return;
+	}
+	theApp->downloadqueue->ResetCatParts(index);
+	theApp->glob_prefs->RemoveCat(index);
+	RemoveCategoryPage(index);
+	if (theApp->glob_prefs->GetCatCount() == 1) {
+		thePrefs::SetAllcatFilter(acfAll);
+	}
+	theApp->glob_prefs->SaveCats();
+	theApp->amuledlg->m_searchwnd->UpdateCatChoice();
+	// RemoveCat() asks for a re-walk, the category's directory leaving the shareset. Run it
+	// here behind a progress dialog rather than letting it land silently on a core tick --
+	// CPreferences is shared with the daemon, so it cannot raise one itself.
+	ReloadSharedFilesIfPending(this);
+}
 
 void CTransferWnd::RemoveCategoryPage(int index)
 {
@@ -278,38 +318,39 @@
 	downloadlistctrl->ChangeCategory(0);
 }
 
-
-void CTransferWnd::OnEditCategory( wxCommandEvent& WXUNUSED(event) )
+void CTransferWnd::OnEditCategory(wxCommandEvent &WXUNUSED(event))
 {
-	CCatDialog dialog( this,
+	CCatDialog dialog(this,
 	// Allow browse?
 #ifdef CLIENT_GUI
-	false
+		false
 #else
-	true
+		true
 #endif
-		, m_dlTab->GetSelection());
+		,
+		m_dlTab->GetSelection());
 
 	dialog.ShowModal();
+	// Same as OnAddCategory: an edited path moves files in and out of the
+	// shareset, and the re-walk is owed once the modal closes.
+	ReloadSharedFilesIfPending(this);
 }
 
-
-void CTransferWnd::OnSetDefaultCat( wxCommandEvent& event )
+void CTransferWnd::OnSetDefaultCat(wxCommandEvent &event)
 {
-	thePrefs::SetAllcatFilter( static_cast<AllCategoryFilter>(event.GetId() - MP_CAT_SET0) );
-	theApp->glob_prefs->GetCategory(0)->title = GetCatTitle( thePrefs::GetAllcatFilter() );
+	thePrefs::SetAllcatFilter(static_cast<AllCategoryFilter>(event.GetId() - MP_CAT_SET0));
+	theApp->glob_prefs->GetCategory(0)->title = GetCatTitle(thePrefs::GetAllcatFilter());
 
-	UpdateCategory( 0 );
+	UpdateCategory(0);
 
-	downloadlistctrl->ChangeCategory( 0 );
+	downloadlistctrl->ChangeCategory(0);
 
 	theApp->glob_prefs->SaveCats();
 
 	downloadlistctrl->SortList();
 }
 
-
-void CTransferWnd::OnCategoryChanged(wxNotebookEvent& evt)
+void CTransferWnd::OnCategoryChanged(wxNotebookEvent &evt)
 {
 	// First remove currently showing sources (switching cat will deselect all)
 	CKnownFileVector filesVector;
@@ -319,63 +360,62 @@
 	downloadlistctrl->SortList();
 }
 
-
-void CTransferWnd::OnNMRclickDLtab(wxMouseEvent& evt)
+void CTransferWnd::OnNMRclickDLtab(wxMouseEvent &evt)
 {
 	// Only handle events from the category-notebook
-	if ( evt.GetEventObject() != (wxObject*)m_dlTab )
+	if (evt.GetEventObject() != (wxObject *)m_dlTab)
 		return;
 
-	if ( m_dlTab->GetSelection() == -1 ) {
+	if (m_dlTab->GetSelection() == -1) {
 		return;
 	}
 
 	// Avoid opening another menu when it's already open
-	if ( m_menu == NULL ) {
-		m_menu = new wxMenu( _("Category") );
+	if (m_menu == NULL) {
+		m_menu = new wxMenu(_("Category"));
 
-		if ( m_dlTab->GetSelection() == 0 ) {
-			wxMenu* catmenu = new wxMenu();
+		if (m_dlTab->GetSelection() == 0) {
+			wxMenu *catmenu = new wxMenu();
 
-			catmenu->Append( MP_CAT_SET0,      _("All") );
-			catmenu->Append( MP_CAT_SET0 + 1,  _("All others") );
+			catmenu->Append(MP_CAT_SET0, _("All"));
+			catmenu->Append(MP_CAT_SET0 + 1, _("All others"));
 
 			catmenu->AppendSeparator();
 
-			catmenu->Append( MP_CAT_SET0 + 2,  _("Incomplete") );
-			catmenu->Append( MP_CAT_SET0 + 3,  _("Completed") );
-			catmenu->Append( MP_CAT_SET0 + 4,  _("Waiting") );
-			catmenu->Append( MP_CAT_SET0 + 5,  _("Downloading") );
-			catmenu->Append( MP_CAT_SET0 + 6,  _("Erroneous") );
-			catmenu->Append( MP_CAT_SET0 + 7,  _("Paused") );
-			catmenu->Append( MP_CAT_SET0 + 8,  _("Stopped") );
-			catmenu->Append( MP_CAT_SET0 + 15, _("Active") );
+			catmenu->Append(MP_CAT_SET0 + 2, _("Incomplete"));
+			catmenu->Append(MP_CAT_SET0 + 3, _("Completed"));
+			catmenu->Append(MP_CAT_SET0 + 4, _("Waiting"));
+			catmenu->Append(MP_CAT_SET0 + 5, _("Downloading"));
+			catmenu->Append(MP_CAT_SET0 + 6, _("Erroneous"));
+			catmenu->Append(MP_CAT_SET0 + 7, _("Paused"));
+			catmenu->Append(MP_CAT_SET0 + 8, _("Stopped"));
+			catmenu->Append(MP_CAT_SET0 + 15, _("Active"));
 
 			catmenu->AppendSeparator();
 
-			catmenu->Append( MP_CAT_SET0 + 9,  _("Video") );
-			catmenu->Append( MP_CAT_SET0 + 10, _("Audio") );
-			catmenu->Append( MP_CAT_SET0 + 11, _("Archive") );
-			catmenu->Append( MP_CAT_SET0 + 12, _("CD-Images") );
-			catmenu->Append( MP_CAT_SET0 + 13, _("Pictures") );
-			catmenu->Append( MP_CAT_SET0 + 14, _("Text") );
+			catmenu->Append(MP_CAT_SET0 + 9, _("Video"));
+			catmenu->Append(MP_CAT_SET0 + 10, _("Audio"));
+			catmenu->Append(MP_CAT_SET0 + 11, _("Archive"));
+			catmenu->Append(MP_CAT_SET0 + 12, _("Disc images"));
+			catmenu->Append(MP_CAT_SET0 + 13, _("Pictures"));
+			catmenu->Append(MP_CAT_SET0 + 14, _("Text"));
 
 			m_menu->Append(0, _("Select view filter"), catmenu);
 		}
 
-		m_menu->Append( MP_CAT_ADD, _("Add category") );
+		m_menu->Append(MP_CAT_ADD, _("Add category"));
 
-		if ( m_dlTab->GetSelection() ) {
-			m_menu->Append(MP_CAT_EDIT,_("Edit category"));
+		if (m_dlTab->GetSelection()) {
+			m_menu->Append(MP_CAT_EDIT, _("Edit category"));
 			m_menu->Append(MP_CAT_REMOVE, _("Remove category"));
 		}
 
 		m_menu->AppendSeparator();
 
-		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_CANCEL, _("Cancel"));
+		m_menu->Append(MP_STOP, _("&Stop"));
+		m_menu->Append(MP_PAUSE, _("&Pause"));
+		m_menu->Append(MP_RESUME, _("&Resume"));
 
 		PopupMenu(m_menu, evt.GetPosition());
 
@@ -384,110 +424,161 @@
 	}
 }
 
-
-void CTransferWnd::OnBtnClearDownloads( wxCommandEvent& WXUNUSED(evt) )
+void CTransferWnd::OnBtnClearDownloads(wxCommandEvent &WXUNUSED(evt))
 {
-    downloadlistctrl->Freeze();
-    downloadlistctrl->ClearCompleted();
-    downloadlistctrl->Thaw();
+	downloadlistctrl->Freeze();
+	downloadlistctrl->ClearCompleted();
+	downloadlistctrl->Thaw();
 }
 
+void CTransferWnd::OnFilterChanged(wxCommandEvent &WXUNUSED(evt))
+{
+	downloadlistctrl->SetFilterText(CastChild(IDC_TRANSFER_FILTER, wxTextCtrl)->GetValue());
+}
 
 void CTransferWnd::Prepare()
 {
-	wxSplitterWindow* splitter = CastChild( "splitterWnd", wxSplitterWindow );
+	wxSplitterWindow *splitter = CastChild("splitterWnd", wxSplitterWindow);
 	int height = splitter->GetSize().GetHeight();
 	int header_height = s_clientlistHeader->GetSize().GetHeight();
 
-	if ( m_splitter ) {
+	if (m_splitter) {
 		// Some sanity checking
-		if ( m_splitter < s_splitterMin ) {
+		if (m_splitter < s_splitterMin) {
 			m_splitter = s_splitterMin;
-		} else if ( m_splitter > height - header_height * 2 ) {
+		} else if (m_splitter > height - header_height * 2) {
 			m_splitter = height - header_height * 2;
 		}
-		splitter->SetSashPosition( m_splitter );
+		splitter->SetSashPosition(m_splitter);
 		m_splitter = 0;
 	}
 
-	if ( !clientlistctrl->GetShowing() ) {
+	if (!clientlistctrl->GetShowing()) {
 		// use a toggle event to close it (calculate size, change button)
-		clientlistctrl->SetShowing( true );	// so it will be toggled to false
+		clientlistctrl->SetShowing(true); // so it will be toggled to false
 		wxCommandEvent evt1;
-		OnToggleClientList( evt1 );
+		OnToggleClientList(evt1);
 	}
 }
 
-void CTransferWnd::OnToggleClientList(wxCommandEvent& WXUNUSED(evt))
+void CTransferWnd::OnToggleClientList(wxCommandEvent &WXUNUSED(evt))
 {
-	wxSplitterWindow* splitter = CastChild( "splitterWnd", wxSplitterWindow );
-	wxBitmapButton*   button = CastChild( ID_CLIENTTOGGLE, wxBitmapButton );
+	wxSplitterWindow *splitter = CastChild("splitterWnd", wxSplitterWindow);
+	wxBitmapButton *button = CastChild(ID_CLIENTTOGGLE, wxBitmapButton);
 
-	if ( !clientlistctrl->GetShowing() ) {
-		splitter->SetSashPosition( m_splitter );
+	if (!clientlistctrl->GetShowing()) {
+		splitter->SetSashPosition(m_splitter);
 		m_splitter = 0;
 
-		clientlistctrl->SetShowing( true );
+		clientlistctrl->SetShowing(true);
 
-		button->SetBitmapLabel( amuleDlgImages( 10 ) );
-		button->SetBitmapFocus( amuleDlgImages( 10 ) );
-		button->SetBitmapSelected( amuleDlgImages( 10 ) );
-		button->SetBitmapHover( amuleDlgImages( 10 ) );
+		const wxBitmapBundle art = wxArtProvider::GetBitmapBundle("amule:arrows_down");
+		button->SetBitmapLabel(art);
+		button->SetBitmapFocus(art);
+		button->SetBitmapPressed(art);
+		button->SetBitmapCurrent(art);
 	} else {
-		clientlistctrl->SetShowing( false );
+		clientlistctrl->SetShowing(false);
 
 		m_splitter = splitter->GetSashPosition();
 
 		// Add the height of the listctrl to the top-window
-		int height = clientlistctrl->GetSize().GetHeight()
-					 + splitter->GetWindow1()->GetSize().GetHeight();
+		int height =
+			clientlistctrl->GetSize().GetHeight() + splitter->GetWindow1()->GetSize().GetHeight();
 
-		splitter->SetSashPosition( height );
+		splitter->SetSashPosition(height);
 
-		button->SetBitmapLabel( amuleDlgImages( 11 ) );
-		button->SetBitmapFocus( amuleDlgImages( 11 ) );
-		button->SetBitmapSelected( amuleDlgImages( 11 ) );
-		button->SetBitmapHover( amuleDlgImages( 11 ) );
+		const wxBitmapBundle art = wxArtProvider::GetBitmapBundle("amule:arrows_up");
+		button->SetBitmapLabel(art);
+		button->SetBitmapFocus(art);
+		button->SetBitmapPressed(art);
+		button->SetBitmapCurrent(art);
 	}
 }
 
-
-void CTransferWnd::OnSashPositionChanging(wxSplitterEvent& evt)
+void CTransferWnd::OnSashPositionChanging(wxSplitterEvent &evt)
 {
-	if ( evt.GetSashPosition() < s_splitterMin ) {
-		evt.SetSashPosition( s_splitterMin );
+	if (evt.GetSashPosition() < s_splitterMin) {
+		evt.SetSashPosition(s_splitterMin);
 	} else {
-		wxSplitterWindow* splitter = wxStaticCast( evt.GetEventObject(), wxSplitterWindow);
+		wxSplitterWindow *splitter = wxStaticCast(evt.GetEventObject(), wxSplitterWindow);
 		wxCHECK_RET(splitter, "ERROR: NULL splitter in CTransferWnd::OnSashPositionChanging");
 
 		int height = splitter->GetSize().GetHeight();
 		int header_height = s_clientlistHeader->GetSize().GetHeight();
 		int mousey = wxGetMousePosition().y - splitter->GetScreenRect().GetTop();
 
-		if ( !clientlistctrl->GetShowing() ) {
+		if (!clientlistctrl->GetShowing()) {
 			// lower window hidden
-			if ( height - mousey < header_height * 2 ) {
+			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
+				m_splitter = mousey; // prevent jumping if it was minimized and is then shown
+						     // by dragging the sash
 				wxCommandEvent event;
-				OnToggleClientList( event );
+				OnToggleClientList(event);
 			}
 		} else {
 			// lower window showing
-			if ( height - mousey < header_height * 2 ) {
+			if (height - mousey < header_height * 2) {
 				// hide it
 				wxCommandEvent event;
-				OnToggleClientList( 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 );
+				// Normal resize. If several events queue up, setting the sash to
+				// the current mouse position speeds things up and makes sash moving
+				// smoother.
+				evt.SetSashPosition(mousey);
+			}
+		}
+	}
+}
+#ifdef __WXMAC__
+void CTransferWnd::CentreHeaderOnCategoryBar()
+{
+	wxSizer *row = m_dlTab->GetContainingSizer();
+	const double buttonsMid = mac_tab_view_buttons_mid_y(m_dlTab->GetHandle());
+	if (!row || buttonsMid <= 0) {
+		return;
+	}
+	const wxRect tabs = m_dlTab->GetRect();
+	const double barCentre = (buttonsMid + tabs.GetBottom() + 1) / 2.0;
+	const int topBorder = wxRound(2 * (barCentre - (tabs.y + tabs.height / 2.0)));
+	if (topBorder <= 0) {
+		return;
+	}
+
+	// A sizer item has one border width for every side it names, so the existing left/right gaps
+	// become spacers and the border is left to shift the control down.
+	std::vector<wxWindow *> controls;
+	for (wxSizerItem *item : row->GetChildren()) {
+		if (item->IsWindow() && item->GetWindow() != m_dlTab) {
+			controls.push_back(item->GetWindow());
+		}
+	}
+	for (wxWindow *control : controls) {
+		size_t index = 0;
+		for (wxSizerItem *item : row->GetChildren()) {
+			if (item->GetWindow() == control) {
+				break;
 			}
+			++index;
+		}
+		wxSizerItem *item = row->GetItem(control);
+		const int flags = item->GetFlag();
+		const int gap = item->GetBorder();
+		item->SetFlag((flags & ~wxALL) | wxTOP);
+		item->SetBorder(topBorder);
+		if (flags & wxRIGHT) {
+			row->Insert(index + 1, gap, 0);
+		}
+		if (flags & wxLEFT) {
+			row->Insert(index, gap, 0);
 		}
 	}
+	m_dlTab->GetParent()->Layout();
 }
+#endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/TransferWnd.h -> amule-3.1.0.tar.gz/src/TransferWnd.h Changed

@@ -26,9 +26,9 @@
 #ifndef TRANSFERWND_H
 #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 <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"
 
 class CSourceListCtrl;
@@ -42,66 +42,51 @@
 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
+ * Manages the lists and other controls in the transfer window; primarily, the user-defined
  * categories.
  */
 class CTransferWnd : public wxPanel
 {
 public:
-	/**
-	 * Constructor.
-	 */
-	CTransferWnd(wxWindow* pParent = NULL);
+	CTransferWnd(wxWindow *pParent = NULL);
 
-	/**
-	 * Destructor.
-	 */
 	~CTransferWnd();
 
-
 	/**
-	 * Adds the specified category to the end of the list.
-	 *
-	 * @param category A pointer to the new category.
-	 *
-	 * This function should be called after a category has been
-	 * added to the lists of categories. The new category is assumed
-	 * to be the last, and thus will be appended to the end of the tabs
-	 * on the category-notebook.
+	 * Adds @a category to the end of the list. Call after the category has been added to the
+	 * lists of categories: the new one is assumed to be the last, and is appended to the end of
+	 * the tabs on the category notebook.
 	 */
-	void AddCategory( Category_Struct* category );
+	void AddCategory(Category_Struct *category);
 
 	/**
-	 * Updates the title of the specified category.
-	 *
-	 * @param index The index of the category on the notebook. -1 will update all categories.
+	 * Updates the title of the category at notebook index @a index; -1 updates all of them.
 	 */
 	void UpdateCategory(int index);
 
 	/**
-	 * Remove category
+	 * Removes a category.
 	 */
 	void RemoveCategory(int index);
+	//! Everything that follows a category really being gone. Split out so the
+	//! monolithic build can run it inline and amulegui from the EC reply.
+	void CommitRemoveCategory(int index);
 	void RemoveCategoryPage(int index);
 
 	/**
-	 * Helper-function which updates the displayed titles of all existing categories.
+	 * Updates the displayed titles of every existing category.
 	 */
-	void	UpdateCatTabTitles() { UpdateCategory(-1); }
-
+	void UpdateCatTabTitles() { UpdateCategory(-1); }
 
 	/**
-	 * Call this function before displaying the dialog.
-	 *
-	 * This functions does a few tasks to ensure that the dialog is looking the right way.
+	 * Call before displaying the dialog: does a few tasks to make sure it looks the right way.
 	 */
-	void	Prepare();
+	void Prepare();
 
 	//! Pointer to the download-queue.
-	CDownloadListCtrl*	downloadlistctrl;
+	CDownloadListCtrl *downloadlistctrl;
 	//! Pointer to the list of clients.
-	CSourceListCtrl*	clientlistctrl;
+	CSourceListCtrl *clientlistctrl;
 
 private:
 	//! Contains the current (or last if the clientlist is hidden) position of the splitter.
@@ -110,67 +95,73 @@
 	static const int s_splitterMin = 90;
 
 	/**
-	 * Event-handler for the set status by category menu-item.
+	 * Handler for the set-status-by-category menu item.
 	 */
-	void OnSetCatStatus( wxCommandEvent& event );
+	void OnSetCatStatus(wxCommandEvent &event);
 
 	/**
-	 * Event-handler for the set priority by category menu-item.
+	 * Handler for the set-priority-by-category menu item.
 	 */
-	void OnSetCatPriority( wxCommandEvent& event );
+	void OnSetCatPriority(wxCommandEvent &event);
 
 	/**
-	 * Event-handler for the "Add Category" menu-item.
+	 * Handler for the "Add Category" menu item.
 	 */
-	void OnAddCategory( wxCommandEvent& event );
+	void OnAddCategory(wxCommandEvent &event);
 
 	/**
-	 * Event-handler for the "Delete Category" menu-item.
+	 * Handler for the "Delete Category" menu item.
 	 */
-	void OnDelCategory( wxCommandEvent& event );
+	void OnDelCategory(wxCommandEvent &event);
 
 	/**
-	 * Event-handler for the "Edit Category" menu-item.
+	 * Handler for the "Edit Category" menu item.
 	 */
-	void OnEditCategory( wxCommandEvent& event );
+	void OnEditCategory(wxCommandEvent &event);
 
 	/**
-	 * Event-handler for manipulating the default category.
+	 * Handler for manipulating the default category.
 	 */
-	void OnSetDefaultCat( wxCommandEvent& event );
+	void OnSetDefaultCat(wxCommandEvent &event);
 
 	/**
-	 * Event-handler for the "Clear Completed" button.
+	 * Handler for the "Clear Completed" button.
 	 */
 	void OnBtnClearDownloads(wxCommandEvent &evt);
 
+#ifdef __WXMAC__
+	//! Vertically centres the header controls on the category tabs' page bezel.
+	void CentreHeaderOnCategoryBar();
+#endif
+
+	/** Live text-filter box changed: push the new text to the download list. */
+	void OnFilterChanged(wxCommandEvent &evt);
+
 	/**
-	 * Event-handler for changing categories.
+	 * Handler for changing categories.
 	 */
-	void OnCategoryChanged(wxBookCtrlEvent& evt);
+	void OnCategoryChanged(wxBookCtrlEvent &evt);
 
 	/**
-	 * Event-handler for displaying the category-popup menu.
+	 * Handler for displaying the category popup menu.
 	 */
-	void OnNMRclickDLtab(wxMouseEvent& evt);
+	void OnNMRclickDLtab(wxMouseEvent &evt);
 
 	/**
-	 * Event-handler for the list-toggle button.
+	 * Handler for the list-toggle button.
 	 */
-	void OnToggleClientList( wxCommandEvent& event );
+	void OnToggleClientList(wxCommandEvent &event);
 
 	/**
-	 * Event-handler for changes in the sash divider position.
+	 * Handler for changes in the sash divider position.
 	 */
-	void OnSashPositionChanging(wxSplitterEvent& evt);
-
+	void OnSashPositionChanging(wxSplitterEvent &evt);
 
 	//! Variable used to ensure that the category menu doesn't get displayed twice.
-	wxMenu* m_menu;
+	wxMenu *m_menu;
 
 	//! Pointer to the category tabs.
-	CMuleNotebook* m_dlTab;
-
+	CMuleNotebook *m_dlTab;
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.0.1.tar.gz/src/Types.h -> amule-3.1.0.tar.gz/src/Types.h Changed

@@ -27,36 +27,34 @@
 #define TYPES_H
 
 #ifndef USE_STD_STRING
-#include <wx/string.h>		// Needed for wxString and ""
+#include <wx/string.h> // Needed for wxString and ""
 #endif
 
-#include <list>			// Needed for std::list
-#include <vector>		// Needed for std::vector
+#include <list>   // Needed for std::list
+#include <vector> // Needed for std::vector
 
 #ifndef _MSC_VER
-	#ifndef __STDC_FORMAT_MACROS
-		#define __STDC_FORMAT_MACROS
-	#endif
-	#include <inttypes.h>
-	#define LONGLONG(x) x##ll
-	#define ULONGLONG(x) x##llu
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+#include <inttypes.h>
+#define LONGLONG(x) x##ll
+#define ULONGLONG(x) x##llu
 #else
-	typedef unsigned __int8 uint8_t;
-	typedef unsigned __int16 uint16_t;
-	typedef unsigned __int32 uint32_t;
-	typedef unsigned __int64 uint64_t;
-	typedef signed __int8 int8_t;
-	typedef signed __int16 int16_t;
-	typedef signed __int32 int32_t;
-	typedef signed __int64 int64_t;
-	#define LONGLONG(x) x##i64
-	#define ULONGLONG(x) x##ui64
+typedef unsigned __int8 uint8_t;
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int64 uint64_t;
+typedef signed __int8 int8_t;
+typedef signed __int16 int16_t;
+typedef signed __int32 int32_t;
+typedef signed __int64 int64_t;
+#define LONGLONG(x) x##i64
+#define ULONGLONG(x) x##ui64
 #endif
 
-// These are _MSC_VER defines used in eMule. They should
-// not be used in aMule, instead, use this table to
-// find the type to use in order to get the desired
-// effect.
+// eMule uses these _MSC_VER defines. Do not use them in aMule; use this table to find the type
+// that gives the same effect.
 //////////////////////////////////////////////////
 // Name              // Type To Use In Amule    //
 //////////////////////////////////////////////////
@@ -90,23 +88,21 @@
 // POINT             // wxPoint                 //
 //////////////////////////////////////////////////
 
-/*
- * Backwards compatibility with emule.
- * Note that the int* types are indeed unsigned.
+/**
+ * Backwards compatibility with emule. Note that the int* types are indeed unsigned.
  */
-typedef uint8_t		int8;
-typedef uint8_t		uint8;
-typedef uint16_t	int16;
-typedef uint16_t	uint16;
-typedef uint32_t	int32;
-typedef uint32_t	uint32;
-typedef uint64_t	int64;
-typedef uint64_t	uint64;
-typedef int8_t		sint8;
-typedef int16_t		sint16;
-typedef int32_t		sint32;
-typedef int64_t		sint64;
-
+typedef uint8_t int8;
+typedef uint8_t uint8;
+typedef uint16_t int16;
+typedef uint16_t uint16;
+typedef uint32_t int32;
+typedef uint32_t uint32;
+typedef uint64_t int64;
+typedef uint64_t uint64;
+typedef int8_t sint8;
+typedef int16_t sint16;
+typedef int32_t sint32;
+typedef int64_t sint64;
 
 class CKnownFile;
 
@@ -115,59 +111,55 @@
 #ifndef USE_STD_STRING
 typedef std::list<wxString> CStringList;
 #endif
-typedef std::list<CKnownFile*> CKnownFilePtrList;
+typedef std::list<CKnownFile *> CKnownFilePtrList;
 //@}
 
-typedef std::vector<uint8>  ArrayOfUInts8;
+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;
+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.
-// THE FACT SOMETHING IS USED IN JUST ONE PLACE DOESN'T MEAN IT HAS
-// TO BE MOVED TO THAT PLACE. I MIGHT NEED IT ELSEWHERE LATER.
-//
+// KEEP IT HERE. Being used in one place today does not mean it belongs there.
 
 #ifndef USE_STD_STRING
 static const wxString EmptyString = "";
 #endif
 
 #ifndef __cplusplus
-	typedef int bool;
+typedef int bool;
 #endif
 
-
-#ifdef _WIN32			// Used in non-wx-apps too (ed2k), so don't use __WINDOWS__ here !
-	#ifndef NOMINMAX
-		#define NOMINMAX
-	#endif
-	#include <windows.h> // Needed for RECT  // Do_not_auto_remove
-	// Windows compilers don't have these constants
-	#ifndef W_OK
-		enum
-		{
-			F_OK = 0,   // test for existence
-			X_OK = 1,   //          execute permission
-			W_OK = 2,   //          write
-			R_OK = 4    //          read
-		};
-	#endif // W_OK
-	#ifdef __WINDOWS__
-		#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;
+#ifdef _WIN32 // Used in non-wx-apps too (ed2k), so don't use __WINDOWS__ here !
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h> // Needed for RECT  // Do_not_auto_remove
+// Windows compilers don't have these constants
+#ifndef W_OK
+enum
+{
+	F_OK = 0, // test for existence
+	X_OK = 1, //          execute permission
+	W_OK = 2, //          write
+	R_OK = 4  //          read
+};
+#endif // W_OK
+#ifdef __WINDOWS__
+#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 /* _WIN32 */
 
-
 #endif /* TYPES_H */
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/UPnPBase.cpp -> amule-3.1.0.tar.gz/src/UPnPBase.cpp Changed

@@ -23,13 +23,13 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "config.h"		// Needed for ENABLE_UPNP
+#include "config.h" // Needed for ENABLE_UPNP
 
 #ifdef ENABLE_UPNP
 
 // check for broken Debian-hacked libUPnP
 #include <upnp.h>
-#ifdef STRING_H				// defined in UpnpString.h Yes, I would have liked UPNPSTRING_H much better.
+#ifdef STRING_H // defined in UpnpString.h Yes, I would have liked UPNPSTRING_H much better.
 #define BROKEN_DEBIAN_LIBUPNP
 #endif
 
@@ -44,26 +44,23 @@
 #define UPNP_VERSION_MAJOR 1
 #define UPNP_VERSION_MINOR 14
 #define UPNP_VERSION_PATCH 18
-#define UPNP_VERSION (\
-	(UPNP_VERSION_MAJOR * 10000) + \
-	(UPNP_VERSION_MINOR * 100) + \
-	(UPNP_VERSION_PATCH))
+#define UPNP_VERSION ((UPNP_VERSION_MAJOR * 10000) + (UPNP_VERSION_MINOR * 100) + (UPNP_VERSION_PATCH))
 
 #endif /* UPNP_MAJOR_VERSION == 17 */
 
 #include "UPnPBase.h"
 
-#include <algorithm>		// For transform()
-#include "CCtypeAsciiScope.h"	// Needed to pin LC_CTYPE = C around the
-				// ASCII-only tolower() comparisons below
-				// (Turkish-i: tolower('I') = U+0131 under
-				// tr_TR.UTF-8, breaks UPnP direction /
-				// device-type matching).
+#include <algorithm>          // For transform()
+#include "CCtypeAsciiScope.h" // Needed to pin LC_CTYPE = C around the
+			      // ASCII-only tolower() comparisons below
+			      // (Turkish-i: tolower('I') = U+0131 under
+			      // tr_TR.UTF-8, breaks UPnP direction /
+			      // device-type matching).
 
 #ifdef BROKEN_DEBIAN_LIBUPNP
-  #define GET_UPNP_STRING(a) UpnpString_get_String(a)
+#define GET_UPNP_STRING(a) UpnpString_get_String(a)
 #else
-  #define GET_UPNP_STRING(a) (a)
+#define GET_UPNP_STRING(a) (a)
 #endif
 
 std::string stdEmptyString;
@@ -81,14 +78,11 @@
 const char s_device = "device";
 const char s_deviceList = "deviceList";
 
-/**
- * Case insensitive std::string comparison
- */
+/// Case-insensitive std::string comparison.
 static bool stdStringIsEqualCI(const std::string &s1, const std::string &s2)
 {
-	// Pin LC_CTYPE = C so tolower() is ASCII-deterministic regardless of
-	// the user's locale (tr_TR turns 'I' into U+0131, breaking this
-	// comparison's intended semantics).
+	// Pin LC_CTYPE = C so tolower() is ASCII-deterministic regardless of the user's locale
+	// (tr_TR turns 'I' into U+0131, breaking this comparison's intended semantics).
 	CCtypeAsciiScope scope;
 	std::string ns1(s1);
 	std::string ns2(s2);
@@ -97,7 +91,6 @@
 	return ns1 == ns2;
 }
 
-
 static bool stdStringStartsWithCI(const std::string &s, const std::string &prefix)
 {
 	if (s.size() < prefix.size()) {
@@ -112,18 +105,13 @@
 	return head == p;
 }
 
-
 CUPnPPortMapping::CUPnPPortMapping(
-	int port,
-	const std::string &protocol,
-	bool enabled,
-	const std::string &description)
-:
-m_port(),
-m_protocol(protocol),
-m_enabled(enabled ? "1" : "0"),
-m_description(description),
-m_key()
+	int port, const std::string &protocol, bool enabled, const std::string &description)
+: m_port()
+, m_protocol(protocol)
+, m_enabled(enabled ? "1" : "0")
+, m_description(description)
+, m_key()
 {
 	std::ostringstream oss;
 	oss << port;
@@ -131,32 +119,33 @@
 	m_key = m_protocol + m_port;
 }
 
-namespace UPnP {
+namespace UPnP
+{
 
 static const std::string ROOT_DEVICE("upnp:rootdevice");
 
-namespace Device {
-	static const std::string IGW("urn:schemas-upnp-org:device:InternetGatewayDevice:1");
-	static const std::string WAN("urn:schemas-upnp-org:device:WANDevice:1");
-	static const std::string WAN_Connection("urn:schemas-upnp-org:device:WANConnectionDevice:1");
-	static const std::string LAN("urn:schemas-upnp-org:device:LANDevice:1");
-}
-
-namespace Service {
-	static const std::string Layer3_Forwarding("urn:schemas-upnp-org:service:Layer3Forwarding:1");
-	static const std::string WAN_Common_Interface_Config("urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1");
-	static const std::string WAN_IP_Connection("urn:schemas-upnp-org:service:WANIPConnection:1");
-	static const std::string WAN_PPP_Connection("urn:schemas-upnp-org:service:WANPPPConnection:1");
-}
+namespace Device
+{
+static const std::string IGW("urn:schemas-upnp-org:device:InternetGatewayDevice:1");
+static const std::string WAN("urn:schemas-upnp-org:device:WANDevice:1");
+static const std::string WAN_Connection("urn:schemas-upnp-org:device:WANConnectionDevice:1");
+static const std::string LAN("urn:schemas-upnp-org:device:LANDevice:1");
+} // namespace Device
 
-// Decide whether an SSDP NT/ST is something amule actually wants to learn
-// about. The whitelist is the IGW family plus upnp:rootdevice (which is
-// opaque from SSDP alone -- the description.xml has to be fetched to
-// classify it). Anything else (media renderers, mesh APs, smart speakers,
-// ...) gets dropped before amule attempts to download description.xml,
-// which keeps the libupnp ThreadPool queue from filling on busy LANs and
-// stops spurious "Error retrieving device description" log lines for
-// devices we have no use for.
+namespace Service
+{
+static const std::string Layer3_Forwarding("urn:schemas-upnp-org:service:Layer3Forwarding:1");
+static const std::string WAN_Common_Interface_Config(
+	"urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1");
+static const std::string WAN_IP_Connection("urn:schemas-upnp-org:service:WANIPConnection:1");
+static const std::string WAN_PPP_Connection("urn:schemas-upnp-org:service:WANPPPConnection:1");
+} // namespace Service
+
+// Decide whether an SSDP NT/ST is something amule wants to learn about. The whitelist is the IGW
+// family plus upnp:rootdevice, which is opaque from SSDP alone (description.xml has to be fetched
+// to classify it). Anything else is dropped before that fetch, which keeps the libupnp ThreadPool
+// queue from filling on busy LANs and stops spurious "Error retrieving device description" lines
+// for devices we have no use for.
 static bool IsWANRelatedDeviceType(const std::string &type)
 {
 	if (type.empty()) {
@@ -187,49 +176,49 @@
 	return false;
 }
 
+// Case-insensitive match of a device/service type URN against a fully-versioned reference URN,
+// ignoring the trailing ":<version>". IGD:2 gateways advertise their embedded devices and services
+// with a ":2" suffix, so classifying by an exact ":1" string would skip them even though libupnp's
+// version-tolerant M-SEARCH still reaches the device. The fully-versioned constants stay (they
+// double as the M-SEARCH target, which must carry a version) and the tail is stripped only for
+// classification. The reference's final ':' is kept in the prefix so "WANIPConnection:" cannot
+// match "WANIPConnectionFoo:1".
+static bool TypeMatchesIgnoringVersion(const std::string &type, const std::string &reference)
+{
+	std::string::size_type lastColon = reference.find_last_of(':');
+	if (lastColon == std::string::npos) {
+		return stdStringIsEqualCI(type, reference);
+	}
+	return stdStringStartsWithCI(type, reference.substr(0, lastColon + 1));
+}
+
 static std::string ProcessErrorMessage(
-	const std::string &message,
-	int errorCode,
-	const DOMString errorString,
-	IXML_Document *doc)
+	const std::string &message, int errorCode, const DOMString errorString, IXML_Document *doc)
 {
 	std::ostringstream msg;
 	if (errorString == NULL || *errorString == 0) {
 		errorString = "Not available";
 	}
 	if (errorCode > 0) {
-		msg << "Error: " <<
-			message <<
-			": Error code :'";
+		msg << "Error: " << message << ": Error code :'";
 		if (doc) {
 			CUPnPError e(doc);
-			msg << e.getErrorCode() <<
-				"', Error description :'" <<
-				e.getErrorDescription() <<
-				"'.";
+			msg << e.getErrorCode() << "', Error description :'" << e.getErrorDescription()
+			    << "'.";
 		} else {
-			msg << errorCode <<
-				"', Error description :'" <<
-				errorString <<
-				"'.";
+			msg << errorCode << "', Error description :'" << errorString << "'.";
 		}
 		AddDebugLogLineN(logUPnP, msg);
 	} else {
-		msg << "Error: " <<
-			message <<
-			": UPnP SDK error: " <<
-			UpnpGetErrorMessage(errorCode) <<
-			" (" << errorCode << ").";
+		msg << "Error: " << message << ": UPnP SDK error: " << UpnpGetErrorMessage(errorCode) << " ("
+		    << errorCode << ").";
 		AddDebugLogLineN(logUPnP, msg);
 	}
 
 	return msg.str();
 }
 
-
-static void ProcessActionResponse(
-	IXML_Document *RespDoc,
-	const std::string &actionName)
+static void ProcessActionResponse(IXML_Document *RespDoc, const std::string &actionName)
 {
 	std::ostringstream msg;
 	msg << "Response: ";
@@ -239,26 +228,21 @@
 		while (child) {
 			const DOMString childTag = IXML::Element::GetTag(child);
 			std::string childValue = IXML::Element::GetTextValue(child);
-			msg << "\n    " <<
-				childTag << "='" <<
-				childValue << "'";
+			msg << "\n    " << childTag << "='" << childValue << "'";
 			child = IXML::Element::GetNextSibling(child);
 		}
 	} else {
-		msg << "\n    Empty response for action '" <<
-			actionName << "'.";
+		msg << "\n    Empty response for action '" << actionName << "'.";
 	}
 	AddDebugLogLineN(logUPnP, msg);
 }
 
 } /* namespace UPnP */
 
+namespace IXML
+{
 
-namespace IXML {
-
-/*!
- * \brief Returns the root node of a given document.
- */
+/*! \brief Returns the root node of a given document. */
 IXML_Element *Document::GetRootElement(IXML_Document *doc)
 {
 	return reinterpret_cast<IXML_Element *>(ixmlNode_getFirstChild(&doc->n));
@@ -267,47 +251,36 @@
 /*!
  * \brief Frees the given document.
  *
- * \note Any nodes extracted via any other interface function will become
- * invalid after this call unless explicitly cloned.
+ * \note Nodes extracted via any other interface function become invalid after this call unless
+ * explicitly cloned.
  */
 inline void Document::Free(IXML_Document *doc)
 {
 	ixmlDocument_free(doc);
 }
 
-namespace Element {
+namespace Element
+{
 
-/*!
- * \brief Returns the first child of a given element.
- */
+/*! \brief Returns the first child of a given element. */
 IXML_Element *GetFirstChild(IXML_Element *parent)
 {
 	return reinterpret_cast<IXML_Element *>(ixmlNode_getFirstChild(&parent->n));
 }
 
-
-
-/*!
- * \brief Returns the next sibling of a given child.
- */
+/*! \brief Returns the next sibling of a given child. */
 IXML_Element *GetNextSibling(IXML_Element *child)
 {
 	return reinterpret_cast<IXML_Element *>(ixmlNode_getNextSibling(&child->n));
 }
 
-
-/*!
- * \brief Returns the element tag (name)
- */
+/*! \brief Returns the element tag (name). */
 const DOMString GetTag(IXML_Element *element)
 {
 	return ixmlNode_getNodeName(&element->n);
 }
 
-
-/*!
- * \brief Returns the TEXT node value of the current node.
- */
+/*! \brief Returns the TEXT node value of the current node. */
 const std::string GetTextValue(IXML_Element *element)
 {
 	if (!element) {
@@ -323,20 +296,13 @@
 	return ret;
 }
 
-
-/*!
- * \brief Returns the TEXT node value of the first child matching tag.
- */
+/*! \brief Returns the TEXT node value of the first child matching tag. */
 const std::string GetChildValueByTag(IXML_Element *element, const DOMString tag)
 {
 	return GetTextValue(GetFirstChildByTag(element, tag));
 }
 
-
-/*!
- * \brief Returns the first child element that matches the requested tag or
- * NULL if not found.
- */
+/*! \brief Returns the first child element matching the requested tag, or NULL. */
 IXML_Element *GetFirstChildByTag(IXML_Element *element, const DOMString tag)
 {
 	if (!element || !tag) {
@@ -345,7 +311,7 @@
 
 	IXML_Node *child = ixmlNode_getFirstChild(&element->n);
 	const DOMString childTag = ixmlNode_getNodeName(child);
-	while(child && childTag && strcmp(tag, childTag)) {
+	while (child && childTag && strcmp(tag, childTag)) {
 		child = ixmlNode_getNextSibling(child);
 		childTag = ixmlNode_getNodeName(child);
 	}
@@ -353,10 +319,9 @@
 	return reinterpret_cast<IXML_Element *>(child);
 }
 
-
 /*!
- * \brief Returns the next sibling element that matches the requested tag. Should be
- * used with the return value of GetFirstChildByTag().
+ * \brief Returns the next sibling element matching the requested tag. Use with the return value
+ * of GetFirstChildByTag().
  */
 IXML_Element *GetNextSiblingByTag(IXML_Element *element, const DOMString tag)
 {
@@ -369,12 +334,11 @@
 	do {
 		child = ixmlNode_getNextSibling(child);
 		childTag = ixmlNode_getNodeName(child);
-	} while(child && childTag && strcmp(tag, childTag));
+	} while (child && childTag && strcmp(tag, childTag));
 
 	return reinterpret_cast<IXML_Element *>(child);
 }
 
-
 const std::string GetAttributeByTag(IXML_Element *element, const DOMString tag)
 {
 	IXML_NamedNodeMap *NamedNodeMap = ixmlNode_getAttributes(&element->n);
@@ -393,216 +357,153 @@
 
 } /* namespace IXML */
 
-
 CUPnPError::CUPnPError(IXML_Document *errorDoc)
-:
-m_root            (IXML::Document::GetRootElement(errorDoc)),
-m_ErrorCode       (IXML::Element::GetChildValueByTag(m_root, "errorCode")),
-m_ErrorDescription(IXML::Element::GetChildValueByTag(m_root, "errorDescription"))
+: m_root(IXML::Document::GetRootElement(errorDoc))
+, m_ErrorCode(IXML::Element::GetChildValueByTag(m_root, "errorCode"))
+, m_ErrorDescription(IXML::Element::GetChildValueByTag(m_root, "errorDescription"))
 {
 }
 
-
-CUPnPArgument::CUPnPArgument(
-	const CUPnPControlPoint &WXUNUSED(upnpControlPoint),
+CUPnPArgument::CUPnPArgument(const CUPnPControlPoint &WXUNUSED(upnpControlPoint),
 	IXML_Element *argument,
 	const std::string &WXUNUSED(SCPDURL))
-:
-m_name                (IXML::Element::GetChildValueByTag(argument, "name")),
-m_direction           (IXML::Element::GetChildValueByTag(argument, "direction")),
-m_retval              (IXML::Element::GetFirstChildByTag(argument, "retval")),
-m_relatedStateVariable(IXML::Element::GetChildValueByTag(argument, "relatedStateVariable"))
+: m_name(IXML::Element::GetChildValueByTag(argument, "name"))
+, m_direction(IXML::Element::GetChildValueByTag(argument, "direction"))
+, m_retval(IXML::Element::GetFirstChildByTag(argument, "retval"))
+, m_relatedStateVariable(IXML::Element::GetChildValueByTag(argument, "relatedStateVariable"))
 {
 	std::ostringstream msg;
-	msg <<	"\n    Argument:"                  <<
-		"\n        name: "                 << m_name <<
-		"\n        direction: "            << m_direction <<
-		"\n        retval: "               << m_retval <<
-		"\n        relatedStateVariable: " << m_relatedStateVariable;
+	msg << "\n    Argument:" << "\n        name: " << m_name << "\n        direction: " << m_direction
+	    << "\n        retval: " << m_retval
+	    << "\n        relatedStateVariable: " << m_relatedStateVariable;
 	AddDebugLogLineN(logUPnP, msg);
 }
 
-
 CUPnPAction::CUPnPAction(
-	const CUPnPControlPoint &upnpControlPoint,
-	IXML_Element *action,
-	const std::string &SCPDURL)
-:
-m_ArgumentList(upnpControlPoint, action, SCPDURL),
-m_name(IXML::Element::GetChildValueByTag(action, "name"))
+	const CUPnPControlPoint &upnpControlPoint, IXML_Element *action, const std::string &SCPDURL)
+: m_ArgumentList(upnpControlPoint, action, SCPDURL)
+, m_name(IXML::Element::GetChildValueByTag(action, "name"))
 {
 	std::ostringstream msg;
-	msg <<	"\n    Action:"    <<
-		"\n        name: " << m_name;
+	msg << "\n    Action:" << "\n        name: " << m_name;
 	AddDebugLogLineN(logUPnP, msg);
 }
 
-
-CUPnPAllowedValue::CUPnPAllowedValue(
-	const CUPnPControlPoint &WXUNUSED(upnpControlPoint),
+CUPnPAllowedValue::CUPnPAllowedValue(const CUPnPControlPoint &WXUNUSED(upnpControlPoint),
 	IXML_Element *allowedValue,
 	const std::string &WXUNUSED(SCPDURL))
-:
-m_allowedValue(IXML::Element::GetTextValue(allowedValue))
+: m_allowedValue(IXML::Element::GetTextValue(allowedValue))
 {
 	std::ostringstream msg;
-	msg <<	"\n    AllowedValue:"      <<
-		"\n        allowedValue: " << m_allowedValue;
+	msg << "\n    AllowedValue:" << "\n        allowedValue: " << m_allowedValue;
 	AddDebugLogLineN(logUPnP, msg);
 }
 
-
 CUPnPStateVariable::CUPnPStateVariable(
-	const CUPnPControlPoint &upnpControlPoint,
-	IXML_Element *stateVariable,
-	const std::string &SCPDURL)
-:
-m_AllowedValueList(upnpControlPoint, stateVariable, SCPDURL),
-m_name        (IXML::Element::GetChildValueByTag(stateVariable, "name")),
-m_dataType    (IXML::Element::GetChildValueByTag(stateVariable, "dataType")),
-m_defaultValue(IXML::Element::GetChildValueByTag(stateVariable, "defaultValue")),
-m_sendEvents  (IXML::Element::GetAttributeByTag (stateVariable, "sendEvents"))
+	const CUPnPControlPoint &upnpControlPoint, IXML_Element *stateVariable, const std::string &SCPDURL)
+: m_AllowedValueList(upnpControlPoint, stateVariable, SCPDURL)
+, m_name(IXML::Element::GetChildValueByTag(stateVariable, "name"))
+, m_dataType(IXML::Element::GetChildValueByTag(stateVariable, "dataType"))
+, m_defaultValue(IXML::Element::GetChildValueByTag(stateVariable, "defaultValue"))
+, m_sendEvents(IXML::Element::GetAttributeByTag(stateVariable, "sendEvents"))
 {
 	std::ostringstream msg;
-	msg <<	"\n    StateVariable:"     <<
-		"\n        name: "         << m_name <<
-		"\n        dataType: "     << m_dataType <<
-		"\n        defaultValue: " << m_defaultValue <<
-		"\n        sendEvents: "   << m_sendEvents;
+	msg << "\n    StateVariable:" << "\n        name: " << m_name << "\n        dataType: " << m_dataType
+	    << "\n        defaultValue: " << m_defaultValue << "\n        sendEvents: " << m_sendEvents;
 	AddDebugLogLineN(logUPnP, msg);
 }
 
-
 CUPnPSCPD::CUPnPSCPD(
-	const CUPnPControlPoint &upnpControlPoint,
-	IXML_Element *scpd,
-	const std::string &SCPDURL)
-:
-m_ActionList(upnpControlPoint, scpd, SCPDURL),
-m_ServiceStateTable(upnpControlPoint, scpd, SCPDURL),
-m_SCPDURL(SCPDURL)
+	const CUPnPControlPoint &upnpControlPoint, IXML_Element *scpd, const std::string &SCPDURL)
+: m_ActionList(upnpControlPoint, scpd, SCPDURL)
+, m_ServiceStateTable(upnpControlPoint, scpd, SCPDURL)
+, m_SCPDURL(SCPDURL)
 {
 }
 
-
 CUPnPArgumentValue::CUPnPArgumentValue()
-:
-m_argument(),
-m_value()
+: m_argument()
+, m_value()
 {
 }
 
-
-CUPnPArgumentValue::CUPnPArgumentValue(
-	const std::string &argument, const std::string &value)
-:
-m_argument(argument),
-m_value(value)
+CUPnPArgumentValue::CUPnPArgumentValue(const std::string &argument, const std::string &value)
+: m_argument(argument)
+, m_value(value)
 {
 }
 
-
 CUPnPService::CUPnPService(
-	const CUPnPControlPoint &upnpControlPoint,
-	IXML_Element *service,
-	const std::string &URLBase)
-:
-m_UPnPControlPoint(upnpControlPoint),
-m_serviceType(IXML::Element::GetChildValueByTag(service, "serviceType")),
-m_serviceId  (IXML::Element::GetChildValueByTag(service, "serviceId")),
-m_SCPDURL    (IXML::Element::GetChildValueByTag(service, "SCPDURL")),
-m_controlURL (IXML::Element::GetChildValueByTag(service, "controlURL")),
-m_eventSubURL(IXML::Element::GetChildValueByTag(service, "eventSubURL")),
-m_timeout(1801),
-m_SCPD(nullptr)
+	const CUPnPControlPoint &upnpControlPoint, IXML_Element *service, const std::string &URLBase)
+: m_UPnPControlPoint(upnpControlPoint)
+, m_serviceType(IXML::Element::GetChildValueByTag(service, "serviceType"))
+, m_serviceId(IXML::Element::GetChildValueByTag(service, "serviceId"))
+, m_SCPDURL(IXML::Element::GetChildValueByTag(service, "SCPDURL"))
+, m_controlURL(IXML::Element::GetChildValueByTag(service, "controlURL"))
+, m_eventSubURL(IXML::Element::GetChildValueByTag(service, "eventSubURL"))
+, m_timeout(1801)
+, m_SCPD(nullptr)
 {
 	std::ostringstream msg;
 	int errcode;
 
-	memset(m_SID, 0 , sizeof(Upnp_SID));
+	memset(m_SID, 0, sizeof(Upnp_SID));
 
 	std::vector<char> vscpdURL(URLBase.length() + m_SCPDURL.length() + 1);
 	char *scpdURL = &vscpdURL0;
-	errcode = UpnpResolveURL(
-		URLBase.c_str(),
-		m_SCPDURL.c_str(),
-		scpdURL);
-	if( errcode != UPNP_E_SUCCESS ) {
-		msg << "Error generating scpdURL from " <<
-			"|" << URLBase << "|" <<
-			m_SCPDURL << "|.";
+	errcode = UpnpResolveURL(URLBase.c_str(), m_SCPDURL.c_str(), scpdURL);
+	if (errcode != UPNP_E_SUCCESS) {
+		msg << "Error generating scpdURL from " << "|" << URLBase << "|" << m_SCPDURL << "|.";
 		AddDebugLogLineN(logUPnP, msg);
 	} else {
 		m_absSCPDURL = scpdURL;
 	}
 
-	std::vector<char> vcontrolURL(
-		URLBase.length() + m_controlURL.length() + 1);
+	std::vector<char> vcontrolURL(URLBase.length() + m_controlURL.length() + 1);
 	char *controlURL = &vcontrolURL0;
-	errcode = UpnpResolveURL(
-		URLBase.c_str(),
-		m_controlURL.c_str(),
-		controlURL);
-	if( errcode != UPNP_E_SUCCESS ) {
-		msg << "Error generating controlURL from " <<
-			"|" << URLBase << "|" <<
-			m_controlURL << "|.";
+	errcode = UpnpResolveURL(URLBase.c_str(), m_controlURL.c_str(), controlURL);
+	if (errcode != UPNP_E_SUCCESS) {
+		msg << "Error generating controlURL from " << "|" << URLBase << "|" << m_controlURL << "|.";
 		AddDebugLogLineN(logUPnP, msg);
 	} else {
 		m_absControlURL = controlURL;
 	}
 
-	std::vector<char> veventURL(
-		URLBase.length() + m_eventSubURL.length() + 1);
+	std::vector<char> veventURL(URLBase.length() + m_eventSubURL.length() + 1);
 	char *eventURL = &veventURL0;
-	errcode = UpnpResolveURL(
-		URLBase.c_str(),
-		m_eventSubURL.c_str(),
-		eventURL);
-	if( errcode != UPNP_E_SUCCESS ) {
-		msg << "Error generating eventURL from " <<
-			"|" << URLBase << "|" <<
-			m_eventSubURL << "|.";
+	errcode = UpnpResolveURL(URLBase.c_str(), m_eventSubURL.c_str(), eventURL);
+	if (errcode != UPNP_E_SUCCESS) {
+		msg << "Error generating eventURL from " << "|" << URLBase << "|" << m_eventSubURL << "|.";
 		AddDebugLogLineN(logUPnP, msg);
 	} else {
 		m_absEventSubURL = eventURL;
 	}
 
-	msg <<	"\n    Service:"             <<
-		"\n        serviceType: "    << m_serviceType <<
-		"\n        serviceId: "      << m_serviceId <<
-		"\n        SCPDURL: "        << m_SCPDURL <<
-		"\n        absSCPDURL: "     << m_absSCPDURL <<
-		"\n        controlURL: "     << m_controlURL <<
-		"\n        absControlURL: "  << m_absControlURL <<
-		"\n        eventSubURL: "    << m_eventSubURL <<
-		"\n        absEventSubURL: " << m_absEventSubURL;
+	msg << "\n    Service:" << "\n        serviceType: " << m_serviceType
+	    << "\n        serviceId: " << m_serviceId << "\n        SCPDURL: " << m_SCPDURL
+	    << "\n        absSCPDURL: " << m_absSCPDURL << "\n        controlURL: " << m_controlURL
+	    << "\n        absControlURL: " << m_absControlURL << "\n        eventSubURL: " << m_eventSubURL
+	    << "\n        absEventSubURL: " << m_absEventSubURL;
 	AddDebugLogLineN(logUPnP, msg);
 
-	if (m_serviceType == UPnP::Service::WAN_IP_Connection ||
-	    m_serviceType == UPnP::Service::WAN_PPP_Connection) {
+	if (UPnP::TypeMatchesIgnoringVersion(m_serviceType, UPnP::Service::WAN_IP_Connection) ||
+		UPnP::TypeMatchesIgnoringVersion(m_serviceType, UPnP::Service::WAN_PPP_Connection)) {
 #if 0
 	    m_serviceType == UPnP::Service::WAN_PPP_Connection ||
 	    m_serviceType == UPnP::Service::WAN_Common_Interface_Config ||
 	    m_serviceType == UPnP::Service::Layer3_Forwarding) {
 #endif
 #if 0
-//#warning Delete this code on release.
 		if (!upnpControlPoint.WanServiceDetected()) {
 			// This condition can be used to suspend the parse
 			// of the XML tree.
 #endif
-//#warning Delete this code when m_WanService is no longer used.
-			const_cast<CUPnPControlPoint &>(upnpControlPoint).SetWanService(this);
-			// Log it
-			msg.str("");
-			msg << "WAN Service Detected: '" <<
-				m_serviceType << "'.";
-			AddDebugLogLineN(logUPnP, msg);
-			// Subscribe
-			const_cast<CUPnPControlPoint &>(upnpControlPoint).Subscribe(*this);
+		const_cast<CUPnPControlPoint &>(upnpControlPoint).SetWanService(this);
+		msg.str("");
+		msg << "WAN Service Detected: '" << m_serviceType << "'.";
+		AddDebugLogLineN(logUPnP, msg);
+		const_cast<CUPnPControlPoint &>(upnpControlPoint).Subscribe(*this);
 #if 0
-//#warning Delete this code on release.
 		} else {
 			msg.str("");
 			msg << "WAN service detected again: '" <<
@@ -613,90 +514,73 @@
 #endif
 	} else {
 		msg.str("");
-		msg << "Uninteresting service detected: '" <<
-			m_serviceType << "'. Ignoring.";
+		msg << "Uninteresting service detected: '" << m_serviceType << "'. Ignoring.";
 		AddDebugLogLineN(logUPnP, msg);
 	}
 }
 
-
-CUPnPService::~CUPnPService()
-{
-}
-
+CUPnPService::~CUPnPService() {}
 
 bool CUPnPService::Execute(
-	const std::string &ActionName,
-	const std::vector<CUPnPArgumentValue> &ArgValue) const
+	const std::string &ActionName, const std::vector<CUPnPArgumentValue> &ArgValue) const
 {
 	std::ostringstream msg;
 	if (m_SCPD.get() == nullptr) {
-		msg << "Service without SCPD Document, cannot execute action '" << ActionName <<
-			"' for service '" << GetServiceType() << "'.";
+		msg << "Service without SCPD Document, cannot execute action '" << ActionName
+		    << "' for service '" << GetServiceType() << "'.";
 		AddDebugLogLineN(logUPnP, msg);
 		return false;
 	}
 	std::ostringstream msgAction("Sending action ");
-	// Check for correct action name
-	ActionList::const_iterator itAction =
-		m_SCPD->GetActionList().find(ActionName);
+	ActionList::const_iterator itAction = m_SCPD->GetActionList().find(ActionName);
 	if (itAction == m_SCPD->GetActionList().end()) {
-		msg << "Invalid action name '" << ActionName <<
-			"' for service '" << GetServiceType() << "'.";
+		msg << "Invalid action name '" << ActionName << "' for service '" << GetServiceType() << "'.";
 		AddDebugLogLineN(logUPnP, msg);
 		return false;
 	}
 	msgAction << ActionName << "(";
 	bool firstTime = true;
-	// Check for correct Argument/Value pairs
 	const CUPnPAction &action = *(itAction->second);
 	for (unsigned int i = 0; i < ArgValue.size(); ++i) {
-		ArgumentList::const_iterator itArg =
-			action.GetArgumentList().find(ArgValuei.GetArgument());
+		ArgumentList::const_iterator itArg = action.GetArgumentList().find(ArgValuei.GetArgument());
 		if (itArg == action.GetArgumentList().end()) {
-			msg << "Invalid argument name '" << ArgValuei.GetArgument() <<
-				"' for action '" << action.GetName() <<
-				"' for service '" << GetServiceType() << "'.";
+			msg << "Invalid argument name '" << ArgValuei.GetArgument() << "' for action '"
+			    << action.GetName() << "' for service '" << GetServiceType() << "'.";
 			AddDebugLogLineN(logUPnP, msg);
 			return false;
 		}
 		const CUPnPArgument &argument = *(itArg->second);
-		// Direction is "in" or "out" — ASCII-only. Pin LC_CTYPE = C so
+		// Direction is "in" or "out" -- ASCII-only. Pin LC_CTYPE = C so
 		// tolower() doesn't fold 'I' to U+0131 under tr_TR.
 		CCtypeAsciiScope direction_scope;
 		if (tolower(argument.GetDirection()0) != 'i' ||
-		    tolower(argument.GetDirection()1) != 'n') {
-			msg << "Invalid direction for argument '" <<
-				ArgValuei.GetArgument() <<
-				"' for action '" << action.GetName() <<
-				"' for service '" << GetServiceType() << "'.";
+			tolower(argument.GetDirection()1) != 'n') {
+			msg << "Invalid direction for argument '" << ArgValuei.GetArgument()
+			    << "' for action '" << action.GetName() << "' for service '" << GetServiceType()
+			    << "'.";
 			AddDebugLogLineN(logUPnP, msg);
 			return false;
 		}
-		const std::string relatedStateVariableName =
-			argument.GetRelatedStateVariable();
+		const std::string relatedStateVariableName = argument.GetRelatedStateVariable();
 		if (!relatedStateVariableName.empty()) {
 			ServiceStateTable::const_iterator itSVT =
-				m_SCPD->GetServiceStateTable().
-				find(relatedStateVariableName);
+				m_SCPD->GetServiceStateTable().find(relatedStateVariableName);
 			if (itSVT == m_SCPD->GetServiceStateTable().end()) {
-				msg << "Inconsistent Service State Table, did not find '" <<
-					relatedStateVariableName <<
-					"' for argument '" << argument.GetName() <<
-					"' for action '" << action.GetName() <<
-					"' for service '" << GetServiceType() << "'.";
+				msg << "Inconsistent Service State Table, did not find '"
+				    << relatedStateVariableName << "' for argument '" << argument.GetName()
+				    << "' for action '" << action.GetName() << "' for service '"
+				    << GetServiceType() << "'.";
 				AddDebugLogLineN(logUPnP, msg);
 				return false;
 			}
 			const CUPnPStateVariable &stateVariable = *(itSVT->second);
-			if (	!stateVariable.GetAllowedValueList().empty() &&
+			if (!stateVariable.GetAllowedValueList().empty() &&
 				stateVariable.GetAllowedValueList().find(ArgValuei.GetValue()) ==
 					stateVariable.GetAllowedValueList().end()) {
-				msg << "Value not allowed '" << ArgValuei.GetValue() <<
-					"' for state variable '" << relatedStateVariableName <<
-					"' for argument '" << argument.GetName() <<
-					"' for action '" << action.GetName() <<
-					"' for service '" << GetServiceType() << "'.";
+				msg << "Value not allowed '" << ArgValuei.GetValue()
+				    << "' for state variable '" << relatedStateVariableName
+				    << "' for argument '" << argument.GetName() << "' for action '"
+				    << action.GetName() << "' for service '" << GetServiceType() << "'.";
 				AddDebugLogLineN(logUPnP, msg);
 				return false;
 			}
@@ -706,35 +590,25 @@
 		} else {
 			msgAction << ", ";
 		}
-		msgAction <<
-			ArgValuei.GetArgument() <<
-			"='" <<
-			ArgValuei.GetValue() <<
-			"'";
+		msgAction << ArgValuei.GetArgument() << "='" << ArgValuei.GetValue() << "'";
 	}
 	msgAction << ")";
 	AddDebugLogLineN(logUPnP, msgAction);
-	// Everything is ok, make the action
 	IXML_Document *ActionDoc = NULL;
 	if (!ArgValue.empty()) {
 		for (unsigned int i = 0; i < ArgValue.size(); ++i) {
-			int ret = UpnpAddToAction(
-				&ActionDoc,
+			int ret = UpnpAddToAction(&ActionDoc,
 				action.GetName().c_str(),
 				GetServiceType().c_str(),
 				ArgValuei.GetArgument().c_str(),
 				ArgValuei.GetValue().c_str());
 			if (ret != UPNP_E_SUCCESS) {
-				UPnP::ProcessErrorMessage(
-					"UpnpAddToAction", ret, NULL, NULL);
+				UPnP::ProcessErrorMessage("UpnpAddToAction", ret, NULL, NULL);
 				return false;
 			}
 		}
 	} else {
-		ActionDoc = UpnpMakeAction(
-			action.GetName().c_str(),
-			GetServiceType().c_str(),
-			0, NULL);
+		ActionDoc = UpnpMakeAction(action.GetName().c_str(), GetServiceType().c_str(), 0, NULL);
 		if (!ActionDoc) {
 			msg << "Error: UpnpMakeAction returned NULL.";
 			AddDebugLogLineN(logUPnP, msg);
@@ -742,7 +616,6 @@
 		}
 	}
 #if 0
-	// Send the action asynchronously
 	UpnpSendActionAsync(
 		m_UPnPControlPoint.GetUPnPClientHandle(),
 		GetAbsControlURL().c_str(),
@@ -753,165 +626,126 @@
 	return true;
 #endif
 
-	// Send the action synchronously
 	IXML_Document *RespDoc = NULL;
-	int ret = UpnpSendAction(
-		m_UPnPControlPoint.GetUPnPClientHandle(),
+	int ret = UpnpSendAction(m_UPnPControlPoint.GetUPnPClientHandle(),
 		GetAbsControlURL().c_str(),
 		GetServiceType().c_str(),
-		NULL, ActionDoc, &RespDoc);
+		NULL,
+		ActionDoc,
+		&RespDoc);
 	if (ret != UPNP_E_SUCCESS) {
-		UPnP::ProcessErrorMessage(
-			"UpnpSendAction", ret, NULL, RespDoc);
+		UPnP::ProcessErrorMessage("UpnpSendAction", ret, NULL, RespDoc);
 		IXML::Document::Free(ActionDoc);
 		IXML::Document::Free(RespDoc);
 		return false;
 	}
 	IXML::Document::Free(ActionDoc);
 
-	// Check the response document
 	UPnP::ProcessActionResponse(RespDoc, action.GetName());
 
-	// Free the response document
 	IXML::Document::Free(RespDoc);
 
 	return true;
 }
 
-
-const std::string CUPnPService::GetStateVariable(
-	const std::string &stateVariableName) const
+const std::string CUPnPService::GetStateVariable(const std::string &stateVariableName) const
 {
 	std::ostringstream msg;
 	DOMString StVarVal;
-	int ret = UpnpGetServiceVarStatus(
-		m_UPnPControlPoint.GetUPnPClientHandle(),
+	int ret = UpnpGetServiceVarStatus(m_UPnPControlPoint.GetUPnPClientHandle(),
 		GetAbsControlURL().c_str(),
 		stateVariableName.c_str(),
 		&StVarVal);
 	if (ret != UPNP_E_SUCCESS) {
-		msg << "GetStateVariable(\"" <<
-			stateVariableName <<
-			"\"): in a call to UpnpGetServiceVarStatus";
-		UPnP::ProcessErrorMessage(
-			msg.str(), ret, StVarVal, NULL);
+		msg << "GetStateVariable(\"" << stateVariableName
+		    << "\"): in a call to UpnpGetServiceVarStatus";
+		UPnP::ProcessErrorMessage(msg.str(), ret, StVarVal, NULL);
 		return stdEmptyString;
 	}
-	msg << "GetStateVariable: " <<
-		stateVariableName <<
-		"='" <<
-		StVarVal <<
-		"'.";
+	msg << "GetStateVariable: " << stateVariableName << "='" << StVarVal << "'.";
 	AddDebugLogLineN(logUPnP, msg);
 	return StVarVal;
 }
 
-
 CUPnPDevice::CUPnPDevice(
-	const CUPnPControlPoint &upnpControlPoint,
-	IXML_Element *device,
-	const std::string &URLBase)
-:
-m_DeviceList(upnpControlPoint, device, URLBase),
-m_ServiceList(upnpControlPoint, device, URLBase),
-m_deviceType       (IXML::Element::GetChildValueByTag(device, "deviceType")),
-m_friendlyName     (IXML::Element::GetChildValueByTag(device, "friendlyName")),
-m_manufacturer     (IXML::Element::GetChildValueByTag(device, "manufacturer")),
-m_manufacturerURL  (IXML::Element::GetChildValueByTag(device, "manufacturerURL")),
-m_modelDescription (IXML::Element::GetChildValueByTag(device, "modelDescription")),
-m_modelName        (IXML::Element::GetChildValueByTag(device, "modelName")),
-m_modelNumber      (IXML::Element::GetChildValueByTag(device, "modelNumber")),
-m_modelURL         (IXML::Element::GetChildValueByTag(device, "modelURL")),
-m_serialNumber     (IXML::Element::GetChildValueByTag(device, "serialNumber")),
-m_UDN              (IXML::Element::GetChildValueByTag(device, "UDN")),
-m_UPC              (IXML::Element::GetChildValueByTag(device, "UPC")),
-m_presentationURL  (IXML::Element::GetChildValueByTag(device, "presentationURL"))
+	const CUPnPControlPoint &upnpControlPoint, IXML_Element *device, const std::string &URLBase)
+: m_DeviceList(upnpControlPoint, device, URLBase)
+, m_ServiceList(upnpControlPoint, device, URLBase)
+, m_deviceType(IXML::Element::GetChildValueByTag(device, "deviceType"))
+, m_friendlyName(IXML::Element::GetChildValueByTag(device, "friendlyName"))
+, m_manufacturer(IXML::Element::GetChildValueByTag(device, "manufacturer"))
+, m_manufacturerURL(IXML::Element::GetChildValueByTag(device, "manufacturerURL"))
+, m_modelDescription(IXML::Element::GetChildValueByTag(device, "modelDescription"))
+, m_modelName(IXML::Element::GetChildValueByTag(device, "modelName"))
+, m_modelNumber(IXML::Element::GetChildValueByTag(device, "modelNumber"))
+, m_modelURL(IXML::Element::GetChildValueByTag(device, "modelURL"))
+, m_serialNumber(IXML::Element::GetChildValueByTag(device, "serialNumber"))
+, m_UDN(IXML::Element::GetChildValueByTag(device, "UDN"))
+, m_UPC(IXML::Element::GetChildValueByTag(device, "UPC"))
+, m_presentationURL(IXML::Element::GetChildValueByTag(device, "presentationURL"))
 {
 	std::ostringstream msg;
-	int presURLlen = strlen(URLBase.c_str()) +
-		strlen(m_presentationURL.c_str()) + 2;
+	int presURLlen = strlen(URLBase.c_str()) + strlen(m_presentationURL.c_str()) + 2;
 	std::vector<char> vpresURL(presURLlen);
-	char* presURL = &vpresURL0;
-	int errcode = UpnpResolveURL(
-		URLBase.c_str(),
-		m_presentationURL.c_str(),
-		presURL);
+	char *presURL = &vpresURL0;
+	int errcode = UpnpResolveURL(URLBase.c_str(), m_presentationURL.c_str(), presURL);
 	if (errcode != UPNP_E_SUCCESS) {
-		msg << "Error generating presentationURL from " <<
-			"|" << URLBase << "|" <<
-			m_presentationURL << "|.";
+		msg << "Error generating presentationURL from " << "|" << URLBase << "|" << m_presentationURL
+		    << "|.";
 		AddDebugLogLineN(logUPnP, msg);
 	} else {
 		m_presentationURL = presURL;
 	}
 
 	msg.str("");
-	msg <<	"\n    Device: "                <<
-		"\n        friendlyName: "      << m_friendlyName <<
-		"\n        deviceType: "        << m_deviceType <<
-		"\n        manufacturer: "      << m_manufacturer <<
-		"\n        manufacturerURL: "   << m_manufacturerURL <<
-		"\n        modelDescription: "  << m_modelDescription <<
-		"\n        modelName: "         << m_modelName <<
-		"\n        modelNumber: "       << m_modelNumber <<
-		"\n        modelURL: "          << m_modelURL <<
-		"\n        serialNumber: "      << m_serialNumber <<
-		"\n        UDN: "               << m_UDN <<
-		"\n        UPC: "               << m_UPC <<
-		"\n        presentationURL: "   << m_presentationURL;
+	msg << "\n    Device: " << "\n        friendlyName: " << m_friendlyName
+	    << "\n        deviceType: " << m_deviceType << "\n        manufacturer: " << m_manufacturer
+	    << "\n        manufacturerURL: " << m_manufacturerURL
+	    << "\n        modelDescription: " << m_modelDescription << "\n        modelName: " << m_modelName
+	    << "\n        modelNumber: " << m_modelNumber << "\n        modelURL: " << m_modelURL
+	    << "\n        serialNumber: " << m_serialNumber << "\n        UDN: " << m_UDN
+	    << "\n        UPC: " << m_UPC << "\n        presentationURL: " << m_presentationURL;
 	AddDebugLogLineN(logUPnP, msg);
 }
 
-
-CUPnPRootDevice::CUPnPRootDevice(
-	const CUPnPControlPoint &upnpControlPoint,
+CUPnPRootDevice::CUPnPRootDevice(const CUPnPControlPoint &upnpControlPoint,
 	IXML_Element *rootDevice,
 	const std::string &OriginalURLBase,
 	const std::string &FixedURLBase,
 	const char *location,
 	int expires)
-:
-CUPnPDevice(upnpControlPoint, rootDevice, FixedURLBase),
-m_URLBase(OriginalURLBase),
-m_location(location),
-m_expires(expires)
+: CUPnPDevice(upnpControlPoint, rootDevice, FixedURLBase)
+, m_URLBase(OriginalURLBase)
+, m_location(location)
+, m_expires(expires)
 {
 	std::ostringstream msg;
-	msg <<
-		"\n    Root Device: "       <<
-		"\n        URLBase: "       << m_URLBase <<
-		"\n        Fixed URLBase: " << FixedURLBase <<
-		"\n        location: "      << m_location <<
-		"\n        expires: "       << m_expires;
+	msg << "\n    Root Device: " << "\n        URLBase: " << m_URLBase
+	    << "\n        Fixed URLBase: " << FixedURLBase << "\n        location: " << m_location
+	    << "\n        expires: " << m_expires;
 	AddDebugLogLineN(logUPnP, msg);
 }
 
-
 CUPnPControlPoint *CUPnPControlPoint::s_CtrlPoint = NULL;
 
-
 CUPnPControlPoint::CUPnPControlPoint(unsigned short udpPort)
-:
-m_UPnPClientHandle(),
-m_RootDeviceMap(),
-m_ServiceMap(),
-m_ActivePortMappingsMap(),
-m_RootDeviceListMutex(),
-m_IGWDeviceDetected(false),
-m_WanService(NULL)
+: m_UPnPClientHandle()
+, m_RootDeviceMap()
+, m_ServiceMap()
+, m_ActivePortMappingsMap()
+, m_RootDeviceListMutex()
+, m_IGWDeviceDetected(false)
+, m_WanService(NULL)
 {
-	// Pointer to self
 	s_CtrlPoint = this;
-	// Null string at first
 	std::ostringstream msg;
 
-	// Declare those here to avoid 
+	// Declare those here to avoid
 	// "jump to label ‘error’ -fpermissive crosses initialization
 	// of ‘char* ipAddress’"
 	unsigned short port;
 	char *ipAddress;
 
-	// Start UPnP
 	int ret;
 	ret = UpnpInit2(0, udpPort);
 	if (ret != UPNP_E_SUCCESS) {
@@ -920,12 +754,26 @@
 	}
 	port = UpnpGetServerPort();
 	ipAddress = UpnpGetServerIpAddress();
-	msg << "bound to " << ipAddress << ":" <<
-		port << ".";
+	msg << "bound to " << ipAddress << ":" << port << ".";
 	AddDebugLogLineN(logUPnP, msg);
 	msg.str("");
-	ret = UpnpRegisterClient(
-		static_cast<Upnp_FunPtr>(&CUPnPControlPoint::Callback),
+
+	// Raise the SDK's incoming content-length ceiling above libupnp's 16 KB default. Some
+	// gateways serve an SCPD/description XML slightly larger than that, which makes the
+	// blocking UpnpDownloadXmlDoc in Subscribe() fail with UPNP_E_OUTOF_BOUNDS -- the service
+	// never registers, no port mapping happens, and the user is stuck on a LowID (seen on ZTE
+	// and Sagemcom routers). 1 MB clears any real router descriptor while still bounding what a
+	// hostile LAN device can push into a blocking fetch. Must run after UpnpInit2 succeeds: the
+	// call is a no-op until the SDK is initialised.
+	ret = UpnpSetMaxContentLength(1024 * 1024);
+	if (ret != UPNP_E_SUCCESS) {
+		msg << "warning(UpnpSetMaxContentLength): could not raise content-length limit, error code "
+		    << ret << "; keeping libupnp default.";
+		AddDebugLogLineN(logUPnP, msg);
+		msg.str("");
+	}
+
+	ret = UpnpRegisterClient(static_cast<Upnp_FunPtr>(&CUPnPControlPoint::Callback),
 		&m_UPnPClientHandle,
 		&m_UPnPClientHandle);
 	if (ret != UPNP_E_SUCCESS) {
@@ -933,19 +781,17 @@
 		goto error;
 	}
 
-	// We could ask for just the right device here. If the root device
-	// contains the device we want, it will respond with the full XML doc,
-	// including the root device and every sub-device it has.
-	//
-	// But let's find out what we have in our network by calling UPnP::ROOT_DEVICE.
+	// Search for the InternetGatewayDevice specifically rather than upnp:rootdevice. Searching
+	// rootdevice makes every UPnP speaker on the LAN answer the M-SEARCH, and our SEARCH_RESULT
+	// handler then fetches description.xml from each one synchronously on a libupnp worker
+	// thread; on a busy LAN that saturates the mini-server thread pool until ThreadPoolAdd hits
+	// its cap and drops jobs. Targeting the IGW type means only gateways answer, which is all
+	// port mapping needs, and a gateway that appears later is still caught by its periodic IGW-
+	// typed ADVERTISEMENT_ALIVE.
 	//
-	// We should not search twice, because this will produce two
-	// UPNP_DISCOVERY_SEARCH_TIMEOUT events, and we might end with problems
-	// on the mutex.
-	ret = UpnpSearchAsync(m_UPnPClientHandle, 3, UPnP::ROOT_DEVICE.c_str(), NULL);
-	//ret = UpnpSearchAsync(m_UPnPClientHandle, 3, UPnP::Device::IGW.c_str(), this);
-	//ret = UpnpSearchAsync(m_UPnPClientHandle, 3, UPnP::Device::LAN.c_str(), this);
-	//ret = UpnpSearchAsync(m_UPnPClientHandle, 3, UPnP::Device::WAN_Connection.c_str(), this);
+	// We must not search more than once: each search produces its own
+	// UPNP_DISCOVERY_SEARCH_TIMEOUT event, and two would race on the mutex.
+	ret = UpnpSearchAsync(m_UPnPClientHandle, 3, UPnP::Device::IGW.c_str(), nullptr);
 	if (ret != UPNP_E_SUCCESS) {
 		msg << "error(UpnpSearchAsync): Error sending search request: ";
 		goto error;
@@ -953,46 +799,36 @@
 
 	// Wait for the UPnP initialization to complete.
 	{
-		// Lock the search timeout mutex
 		m_WaitForSearchTimeoutMutex.Lock();
 
-		// Lock it again, so that we block. Unlocking will only happen
-		// when the UPNP_DISCOVERY_SEARCH_TIMEOUT event occurs at the
-		// callback.
+		// Lock it again, so that we block. Unlocking only happens when the
+		// UPNP_DISCOVERY_SEARCH_TIMEOUT event occurs at the callback.
 		CUPnPMutexLocker lock(m_WaitForSearchTimeoutMutex);
 	}
 	return;
 
-	// Error processing
 error:
 	UpnpFinish();
 	msg << ret << ": " << UpnpGetErrorMessage(ret) << ".";
 	throw CUPnPException(msg);
 }
 
-
 CUPnPControlPoint::~CUPnPControlPoint()
 {
-	for(	RootDeviceMap::iterator it = m_RootDeviceMap.begin();
-		it != m_RootDeviceMap.end();
-		++it) {
+	for (RootDeviceMap::iterator it = m_RootDeviceMap.begin(); it != m_RootDeviceMap.end(); ++it) {
 		delete it->second;
 	}
-	// Remove all first
-	// RemoveAll();
 	UpnpUnRegisterClient(m_UPnPClientHandle);
 	UpnpFinish();
 }
 
-
-bool CUPnPControlPoint::AddPortMappings(
-	std::vector<CUPnPPortMapping> &upnpPortMapping)
+bool CUPnPControlPoint::AddPortMappings(std::vector<CUPnPPortMapping> &upnpPortMapping)
 {
 	std::ostringstream msg;
 	if (!WanServiceDetected()) {
-		msg <<  "UPnP Error: "
-			"CUPnPControlPoint::AddPortMapping: "
-			"WAN Service not detected.";
+		msg << "UPnP Error: "
+		       "CUPnPControlPoint::AddPortMapping: "
+		       "WAN Service not detected.";
 		AddDebugLogLineC(logUPnP, msg);
 		return false;
 	}
@@ -1000,22 +836,15 @@
 	int n = upnpPortMapping.size();
 	bool ok = false;
 
-	// Check the number of port mappings before
 	std::istringstream PortMappingNumberOfEntries(
-		m_WanService->GetStateVariable(
-			"PortMappingNumberOfEntries"));
+		m_WanService->GetStateVariable("PortMappingNumberOfEntries"));
 	unsigned long oldNumberOfEntries;
 	PortMappingNumberOfEntries >> oldNumberOfEntries;
 
-	// Add the enabled port mappings
 	for (int i = 0; i < n; ++i) {
 		if (upnpPortMappingi.getEnabled() == "1") {
-			// Add the mapping to the control point
-			// active mappings list
-			m_ActivePortMappingsMapupnpPortMappingi.getKey() =
-				upnpPortMappingi;
+			m_ActivePortMappingsMapupnpPortMappingi.getKey() = upnpPortMappingi;
 
-			// Add the port mapping
 			PrivateAddPortMapping(upnpPortMappingi);
 		}
 	}
@@ -1033,7 +862,6 @@
 	m_WanService->GetStateVariable("PortMappingNumberOfEntries");
 	m_WanService->GetStateVariable("PortMappingLeaseDuration");
 
-	// Just for testing
 	std::vector<CUPnPArgumentValue> argval;
 	argval.resize(0);
 	m_WanService->Execute("GetStatusInfo", argval);
@@ -1050,17 +878,13 @@
 	m_WanService->GetStateVariable("PortMappingDescription");
 #endif
 
-	// Debug only
 	msg.str("");
 	msg << "CUPnPControlPoint::AddPortMappings: "
-		"m_ActivePortMappingsMap.size() == " <<
-		m_ActivePortMappingsMap.size();
+	       "m_ActivePortMappingsMap.size() == "
+	    << m_ActivePortMappingsMap.size();
 	AddDebugLogLineN(logUPnP, msg);
 
-	// Not very good, must find a better test
-	PortMappingNumberOfEntries.str(
-		m_WanService->GetStateVariable(
-			"PortMappingNumberOfEntries"));
+	PortMappingNumberOfEntries.str(m_WanService->GetStateVariable("PortMappingNumberOfEntries"));
 	unsigned long newNumberOfEntries;
 	PortMappingNumberOfEntries >> newNumberOfEntries;
 	ok = newNumberOfEntries - oldNumberOfEntries == 4;
@@ -1068,31 +892,24 @@
 	return ok;
 }
 
-
 void CUPnPControlPoint::RefreshPortMappings()
 {
-	for (	PortMappingMap::iterator it = m_ActivePortMappingsMap.begin();
+	for (PortMappingMap::iterator it = m_ActivePortMappingsMap.begin();
 		it != m_ActivePortMappingsMap.end();
 		++it) {
 		PrivateAddPortMapping(it->second);
 	}
 
-	// For testing
 	m_WanService->GetStateVariable("PortMappingNumberOfEntries");
 }
 
-
-bool CUPnPControlPoint::PrivateAddPortMapping(
-	CUPnPPortMapping &upnpPortMapping)
+bool CUPnPControlPoint::PrivateAddPortMapping(CUPnPPortMapping &upnpPortMapping)
 {
-	// Get an IP address. The UPnP server one must do.
 	std::string ipAddress(UpnpGetServerIpAddress());
 
-	// Start building the action
 	std::string actionName("AddPortMapping");
 	std::vector<CUPnPArgumentValue> argval(8);
 
-	// Action parameters
 	argval0.SetArgument("NewRemoteHost");
 	argval0.SetValue("");
 	argval1.SetArgument("NewExternalPort");
@@ -1110,25 +927,21 @@
 	argval7.SetArgument("NewLeaseDuration");
 	argval7.SetValue("0");
 
-	// Execute
 	bool ret = true;
-	for (ServiceMap::iterator it = m_ServiceMap.begin();
-	     it != m_ServiceMap.end(); ++it) {
+	for (ServiceMap::iterator it = m_ServiceMap.begin(); it != m_ServiceMap.end(); ++it) {
 		ret &= it->second->Execute(actionName, argval);
 	}
 
 	return ret;
 }
 
-
-bool CUPnPControlPoint::DeletePortMappings(
-	std::vector<CUPnPPortMapping> &upnpPortMapping)
+bool CUPnPControlPoint::DeletePortMappings(std::vector<CUPnPPortMapping> &upnpPortMapping)
 {
 	std::ostringstream msg;
 	if (!WanServiceDetected()) {
-		msg <<  "UPnP Error: "
-			"CUPnPControlPoint::DeletePortMapping: "
-			"WAN Service not detected.";
+		msg << "UPnP Error: "
+		       "CUPnPControlPoint::DeletePortMapping: "
+		       "WAN Service not detected.";
 		AddDebugLogLineC(logUPnP, msg);
 		return false;
 	}
@@ -1136,47 +949,36 @@
 	int n = upnpPortMapping.size();
 	bool ok = false;
 
-	// Check the number of port mappings before
 	std::istringstream PortMappingNumberOfEntries(
-		m_WanService->GetStateVariable(
-			"PortMappingNumberOfEntries"));
+		m_WanService->GetStateVariable("PortMappingNumberOfEntries"));
 	unsigned long oldNumberOfEntries;
 	PortMappingNumberOfEntries >> oldNumberOfEntries;
 
-	// Delete the enabled port mappings
 	for (int i = 0; i < n; ++i) {
 		if (upnpPortMappingi.getEnabled() == "1") {
-			// Delete the mapping from the control point
-			// active mappings list
 			PortMappingMap::iterator it =
-				m_ActivePortMappingsMap.find(
-					upnpPortMappingi.getKey());
+				m_ActivePortMappingsMap.find(upnpPortMappingi.getKey());
 			if (it != m_ActivePortMappingsMap.end()) {
 				m_ActivePortMappingsMap.erase(it);
 			} else {
-				msg <<  "UPnP Error: "
-					"CUPnPControlPoint::DeletePortMapping: "
-					"Mapping was not found in the active "
-					"mapping map.";
+				msg << "UPnP Error: "
+				       "CUPnPControlPoint::DeletePortMapping: "
+				       "Mapping was not found in the active "
+				       "mapping map.";
 				AddDebugLogLineC(logUPnP, msg);
 			}
 
-			// Delete the port mapping
 			PrivateDeletePortMapping(upnpPortMappingi);
 		}
 	}
 
-	// Debug only
 	msg.str("");
 	msg << "CUPnPControlPoint::DeletePortMappings: "
-		"m_ActivePortMappingsMap.size() == " <<
-		m_ActivePortMappingsMap.size();
+	       "m_ActivePortMappingsMap.size() == "
+	    << m_ActivePortMappingsMap.size();
 	AddDebugLogLineN(logUPnP, msg);
 
-	// Not very good, must find a better test
-	PortMappingNumberOfEntries.str(
-		m_WanService->GetStateVariable(
-			"PortMappingNumberOfEntries"));
+	PortMappingNumberOfEntries.str(m_WanService->GetStateVariable("PortMappingNumberOfEntries"));
 	unsigned long newNumberOfEntries;
 	PortMappingNumberOfEntries >> newNumberOfEntries;
 	ok = oldNumberOfEntries - newNumberOfEntries == 4;
@@ -1184,15 +986,11 @@
 	return ok;
 }
 
-
-bool CUPnPControlPoint::PrivateDeletePortMapping(
-	CUPnPPortMapping &upnpPortMapping)
+bool CUPnPControlPoint::PrivateDeletePortMapping(CUPnPPortMapping &upnpPortMapping)
 {
-	// Start building the action
 	std::string actionName("DeletePortMapping");
 	std::vector<CUPnPArgumentValue> argval(3);
 
-	// Action parameters
 	argval0.SetArgument("NewRemoteHost");
 	argval0.SetValue("");
 	argval1.SetArgument("NewExternalPort");
@@ -1200,18 +998,14 @@
 	argval2.SetArgument("NewProtocol");
 	argval2.SetValue(upnpPortMapping.getProtocol());
 
-	// Execute
 	bool ret = true;
-	for (ServiceMap::iterator it = m_ServiceMap.begin();
-	     it != m_ServiceMap.end(); ++it) {
+	for (ServiceMap::iterator it = m_ServiceMap.begin(); it != m_ServiceMap.end(); ++it) {
 		ret &= it->second->Execute(actionName, argval);
 	}
 
 	return ret;
 }
 
-
-// This function is static
 #if UPNP_VERSION >= 11800
 int CUPnPControlPoint::Callback(Upnp_EventType_e EventType, void *Event, void * /*Cookie*/)
 #elif UPNP_VERSION >= 11430
@@ -1226,43 +1020,34 @@
 {
 	std::ostringstream msg;
 	std::ostringstream msg2;
-	// Somehow, this is unreliable. UPNP_DISCOVERY_ADVERTISEMENT_ALIVE events
-	// happen with a wrong cookie and... boom!
-	// CUPnPControlPoint *upnpCP = static_cast<CUPnPControlPoint *>(Cookie);
+	// Somehow, this is unreliable: UPNP_DISCOVERY_ADVERTISEMENT_ALIVE events
+	// happen with a wrong cookie, so the cookie cannot be trusted here.
 	CUPnPControlPoint *upnpCP = CUPnPControlPoint::s_CtrlPoint;
 
-	//fprintf(stderr, "Callback: %d, Cookie: %p\n", EventType, Cookie);
 	switch (EventType) {
 	case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE: {
-		// Drop unsolicited NOTIFY announcements whose NT isn't a device
-		// or service we care about. Without this filter amule fetches
-		// description.xml from every UPnP speaker, media renderer, mesh
-		// AP, etc. on the LAN -- which both burns libupnp's ThreadPool
-		// budget and produces "Error retrieving device description" log
-		// noise for devices whose endpoints amule has no business poking.
+		// Drop unsolicited NOTIFY announcements whose NT is not a device or service we care
+		// about. Without this filter amule fetches description.xml from every UPnP speaker
+		// on the LAN, which burns libupnp's ThreadPool budget and produces "Error
+		// retrieving device description" noise for endpoints amule has no business poking.
 #if UPNP_VERSION >= 10800
 		UpnpDiscovery *d_filter_event = (UpnpDiscovery *)Event;
-		const char *deviceType =
-			UpnpDiscovery_get_DeviceType_cstr(d_filter_event);
+		const char *deviceType = UpnpDiscovery_get_DeviceType_cstr(d_filter_event);
 #else
-		struct Upnp_Discovery *d_filter_event =
-			(struct Upnp_Discovery *)Event;
+		struct Upnp_Discovery *d_filter_event = (struct Upnp_Discovery *)Event;
 		const char *deviceType = d_filter_event->DeviceType;
 #endif
 		if (!UPnP::IsWANRelatedDeviceType(deviceType ? deviceType : "")) {
 			break;
 		}
-		//fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_ALIVE\n");
 		msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_ALIVE): ";
-		msg2<< "UPNP_DISCOVERY_ADVERTISEMENT_ALIVE: ";
+		msg2 << "UPNP_DISCOVERY_ADVERTISEMENT_ALIVE: ";
 		goto upnpDiscovery;
 	}
 	case UPNP_DISCOVERY_SEARCH_RESULT: {
-		//fprintf(stderr, "Callback: UPNP_DISCOVERY_SEARCH_RESULT\n");
 		msg << "error(UPNP_DISCOVERY_SEARCH_RESULT): ";
-		msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: ";
-		// UPnP Discovery
-upnpDiscovery:
+		msg2 << "UPNP_DISCOVERY_SEARCH_RESULT: ";
+	upnpDiscovery:
 #if UPNP_VERSION >= 10800
 		UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
 #else
@@ -1285,54 +1070,40 @@
 #else
 		const char *location = d_event->Location;
 #endif
-		// Passive ALIVE announcements arrive in dense bursts (one per
-		// service class, every few seconds per device). When the
-		// announcing device's HTTP server is unreachable each fetch
-		// blocks a libupnp worker thread for the full TCP-connect
-		// timeout. Suppress repeat fetches against a recently-failed
-		// URL on ALIVE only -- SEARCH_RESULT is an active poll
-		// initiated by us and bypasses the cache.
+		// Passive ALIVE announcements arrive in dense bursts (one per service class, every
+		// few seconds per device), and when the announcing device's HTTP server is
+		// unreachable each fetch blocks a libupnp worker for the full TCP-connect timeout.
+		// Suppress repeat fetches against a recently-failed URL on ALIVE only:
+		// SEARCH_RESULT is our own active poll.
 		if (EventType == UPNP_DISCOVERY_ADVERTISEMENT_ALIVE &&
-		    upnpCP->ShouldSkipAdvertisementFetch(location ? location : "")) {
+			upnpCP->ShouldSkipAdvertisementFetch(location ? location : "")) {
 			break;
 		}
 		int ret = UpnpDownloadXmlDoc(location, &doc);
 		if (ret != UPNP_E_SUCCESS) {
 			if (EventType == UPNP_DISCOVERY_ADVERTISEMENT_ALIVE) {
-				upnpCP->RecordAdvertisementFetchResult(
-					location ? location : "", false);
+				upnpCP->RecordAdvertisementFetchResult(location ? location : "", false);
 			}
-			msg << "Error retrieving device description from " <<
-				(location ? location : "") << ": " <<
-				UpnpGetErrorMessage(ret) <<
-				"(" << ret << ").";
+			msg << "Error retrieving device description from " << (location ? location : "")
+			    << ": " << UpnpGetErrorMessage(ret) << "(" << ret << ").";
 			AddDebugLogLineN(logUPnP, msg);
 		} else {
 			if (EventType == UPNP_DISCOVERY_ADVERTISEMENT_ALIVE) {
-				upnpCP->RecordAdvertisementFetchResult(
-					location ? location : "", true);
+				upnpCP->RecordAdvertisementFetchResult(location ? location : "", true);
 			}
-			msg2 << "Retrieving device description from " <<
-				(location ? location : "") << ".";
+			msg2 << "Retrieving device description from " << (location ? location : "") << ".";
 			AddDebugLogLineN(logUPnP, msg2);
 		}
 		if (doc) {
-			// Get the root node
 			IXML_Element *root = IXML::Document::GetRootElement(doc);
-			// Extract the URLBase
 			const std::string urlBase = IXML::Element::GetChildValueByTag(root, "URLBase");
-			// Get the root device
 			IXML_Element *rootDevice = IXML::Element::GetFirstChildByTag(root, "device");
-			// Extract the deviceType
 			std::string devType(IXML::Element::GetChildValueByTag(rootDevice, "deviceType"));
 			// Only add device if it is an InternetGatewayDevice
-			if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) {
-				// This condition can be used to auto-detect
-				// the UPnP device we are interested in.
-				// Obs.: Don't block the entry here on this
-				// condition! There may be more than one device,
-				// and the first that enters may not be the one
-				// we are interested in!
+			// (any version -- IGD:2 advertises its root as ":2").
+			if (UPnP::TypeMatchesIgnoringVersion(devType, UPnP::Device::IGW)) {
+				// Do not block entry on this condition: there may be more than one
+				// device, and the first to arrive may not be the one we want.
 				upnpCP->SetIGWDeviceDetected(true);
 				// Log it if not UPNP_DISCOVERY_ADVERTISEMENT_ALIVE,
 				// we don't want to spam our logs.
@@ -1340,34 +1111,28 @@
 					msg.str("Internet Gateway Device Detected.");
 					AddDebugLogLineC(logUPnP, msg);
 				}
-				// Add the root device to our list
 #if UPNP_VERSION >= 10800
 				int expires = UpnpDiscovery_get_Expires(d_event);
-				upnpCP->AddRootDevice(rootDevice, urlBase,
-					location, expires);
+				upnpCP->AddRootDevice(rootDevice, urlBase, location, expires);
 #else
-				upnpCP->AddRootDevice(rootDevice, urlBase,
-					d_event->Location, d_event->Expires);
+				upnpCP->AddRootDevice(
+					rootDevice, urlBase, d_event->Location, d_event->Expires);
 #endif
 			}
-			// Free the XML doc tree
 			IXML::Document::Free(doc);
 		}
 		break;
 	}
 	case UPNP_DISCOVERY_SEARCH_TIMEOUT: {
-		//fprintf(stderr, "Callback: UPNP_DISCOVERY_SEARCH_TIMEOUT\n");
 		// Search timeout
 		msg << "UPNP_DISCOVERY_SEARCH_TIMEOUT.";
 		AddDebugLogLineN(logUPnP, msg);
 
-		// Unlock the search timeout mutex
 		upnpCP->m_WaitForSearchTimeoutMutex.Unlock();
 
 		break;
 	}
 	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
-		//fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n");
 		// UPnP Device Removed
 #if UPNP_VERSION >= 10800
 		UpnpDiscovery *dab_event = (UpnpDiscovery *)Event;
@@ -1394,17 +1159,16 @@
 		// Check for an InternetGatewayDevice and removes it from the list
 
 		{
-			// devType is a UPnP URN ("urn:schemas-upnp-org:device:...")
-			// — ASCII-only. Pin LC_CTYPE = C around the tolower
-			// transform so 'I' stays 'i' under tr_TR.
+			// devType is a UPnP URN ("urn:schemas-upnp-org:device:..."), so ASCII-only.
+			// Pin LC_CTYPE = C around the tolower transform so 'I' stays 'i' under
+			// tr_TR.
 			CCtypeAsciiScope devtype_scope;
 			std::transform(devType.begin(), devType.end(), devType.begin(), tolower);
 		}
 
-		if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) {
+		if (UPnP::TypeMatchesIgnoringVersion(devType, UPnP::Device::IGW)) {
 #if UPNP_VERSION >= 10800
-			const char *deviceID =
-				UpnpDiscovery_get_DeviceID_cstr(dab_event);
+			const char *deviceID = UpnpDiscovery_get_DeviceID_cstr(dab_event);
 			upnpCP->RemoveRootDevice(deviceID);
 #else
 			upnpCP->RemoveRootDevice(dab_event->DeviceId);
@@ -1413,13 +1177,11 @@
 		break;
 	}
 	case UPNP_EVENT_RECEIVED: {
-		//fprintf(stderr, "Callback: UPNP_EVENT_RECEIVED\n");
 		// Event received
 #if UPNP_VERSION >= 10800
 		UpnpEvent *e_event = (UpnpEvent *)Event;
 		int eventKey = UpnpEvent_get_EventKey(e_event);
-		IXML_Document *changedVariables =
-			UpnpEvent_get_ChangedVariables(e_event);
+		IXML_Document *changedVariables = UpnpEvent_get_ChangedVariables(e_event);
 		const std::string sid = UpnpEvent_get_SID_cstr(e_event);
 #else
 		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
@@ -1434,32 +1196,27 @@
 		break;
 	}
 	case UPNP_EVENT_SUBSCRIBE_COMPLETE:
-		//fprintf(stderr, "Callback: UPNP_EVENT_SUBSCRIBE_COMPLETE\n");
 		msg << "error(UPNP_EVENT_SUBSCRIBE_COMPLETE): ";
 		goto upnpEventRenewalComplete;
 	case UPNP_EVENT_UNSUBSCRIBE_COMPLETE:
-		//fprintf(stderr, "Callback: UPNP_EVENT_UNSUBSCRIBE_COMPLETE\n");
 		msg << "error(UPNP_EVENT_UNSUBSCRIBE_COMPLETE): ";
 		goto upnpEventRenewalComplete;
 	case UPNP_EVENT_RENEWAL_COMPLETE: {
-		//fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n");
 		msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): ";
-upnpEventRenewalComplete:
+	upnpEventRenewalComplete:
 #if UPNP_VERSION >= 10800
 		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
 		int errCode = UpnpEventSubscribe_get_ErrCode(es_event);
 		if (errCode != UPNP_E_SUCCESS) {
 #else
-		struct Upnp_Event_Subscribe *es_event =
-			(struct Upnp_Event_Subscribe *)Event;
+		struct Upnp_Event_Subscribe *es_event = (struct Upnp_Event_Subscribe *)Event;
 		if (es_event->ErrCode != UPNP_E_SUCCESS) {
 #endif
 			msg << "Error in Event Subscribe Callback";
 #if UPNP_VERSION >= 10800
 			UPnP::ProcessErrorMessage(msg.str(), errCode, NULL, NULL);
 #else
-			UPnP::ProcessErrorMessage(
-				msg.str(), es_event->ErrCode, NULL, NULL);
+			UPnP::ProcessErrorMessage(msg.str(), es_event->ErrCode, NULL, NULL);
 #endif
 		} else {
 #if 0
@@ -1482,30 +1239,25 @@
 		break;
 	}
 	case UPNP_EVENT_AUTORENEWAL_FAILED:
-		//fprintf(stderr, "Callback: UPNP_EVENT_AUTORENEWAL_FAILED\n");
 		msg << "error(UPNP_EVENT_AUTORENEWAL_FAILED): ";
 		msg2 << "UPNP_EVENT_AUTORENEWAL_FAILED: ";
 		goto upnpEventSubscriptionExpired;
 	case UPNP_EVENT_SUBSCRIPTION_EXPIRED: {
-		//fprintf(stderr, "Callback: UPNP_EVENT_SUBSCRIPTION_EXPIRED\n");
 		msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): ";
 		msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: ";
-upnpEventSubscriptionExpired:
+	upnpEventSubscriptionExpired:
 #if UPNP_VERSION >= 10800
 		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
 #else
-		struct Upnp_Event_Subscribe *es_event =
-			(struct Upnp_Event_Subscribe *)Event;
+		struct Upnp_Event_Subscribe *es_event = (struct Upnp_Event_Subscribe *)Event;
 #endif
 		Upnp_SID newSID;
 		memset(newSID, 0, sizeof(Upnp_SID));
 		int TimeOut = 1801;
 #if UPNP_VERSION >= 10800
-		const char *publisherUrl =
-			UpnpEventSubscribe_get_PublisherUrl_cstr(es_event);
+		const char *publisherUrl = UpnpEventSubscribe_get_PublisherUrl_cstr(es_event);
 #endif
-		int ret = UpnpSubscribe(
-			upnpCP->m_UPnPClientHandle,
+		int ret = UpnpSubscribe(upnpCP->m_UPnPClientHandle,
 #if UPNP_VERSION >= 10800
 			publisherUrl,
 #else
@@ -1541,46 +1293,40 @@
 #else
 					GET_UPNP_STRING(es_event->PublisherUrl) <<
 #endif
-					"' with SID == '" <<
-					newSID << "'.";
+					"' with SID == '" << newSID << "'.";
 				AddDebugLogLineC(logUPnP, msg2);
-				// In principle, we should test to see if the
-				// service is the same. But here we only have one
-				// service, so...
+				// In principle we should test whether the service is the same, but
+				// there is only one service here.
 				upnpCP->RefreshPortMappings();
 			} else {
-				msg << "Error: did not find service " <<
-					newSID << " in the service map.";
+				msg << "Error: did not find service " << newSID << " in the service map.";
 				AddDebugLogLineN(logUPnP, msg);
 			}
 		}
 		break;
 	}
 	case UPNP_CONTROL_ACTION_COMPLETE: {
-		//fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n");
 		// This is here if we choose to do this asynchronously
 #if UPNP_VERSION >= 10800
 		UpnpActionComplete *a_event = (UpnpActionComplete *)Event;
 		int errCode = UpnpActionComplete_get_ErrCode(a_event);
-		IXML_Document *actionResult =
-			UpnpActionComplete_get_ActionResult(a_event);
+		IXML_Document *actionResult = UpnpActionComplete_get_ActionResult(a_event);
 		if (errCode != UPNP_E_SUCCESS) {
 #else
-		struct Upnp_Action_Complete *a_event =
-			(struct Upnp_Action_Complete *)Event;
+		struct Upnp_Action_Complete *a_event = (struct Upnp_Action_Complete *)Event;
 		if (a_event->ErrCode != UPNP_E_SUCCESS) {
 #endif
-			UPnP::ProcessErrorMessage(
-				"UpnpSendActionAsync",
+			UPnP::ProcessErrorMessage("UpnpSendActionAsync",
 #if UPNP_VERSION >= 10800
-				errCode, NULL,
+				errCode,
+				NULL,
 				actionResult);
 #else
-				a_event->ErrCode, NULL,
+				a_event->ErrCode,
+				NULL,
 				a_event->ActionResult);
 #endif
 		} else {
-			// Check the response document
 			UPnP::ProcessActionResponse(
 #if UPNP_VERSION >= 10800
 				actionResult,
@@ -1589,21 +1335,18 @@
 #endif
 				"<UpnpSendActionAsync>");
 		}
-		/* No need for any processing here, just print out results.
-		 * Service state table updates are handled by events.
-		 */
+		/* Nothing to process here, just print the results. Service state table updates are handled
+		 * by events. */
 		break;
 	}
 	case UPNP_CONTROL_GET_VAR_COMPLETE: {
-		//fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n");
 		msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): ";
 #if UPNP_VERSION >= 10800
 		UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event;
 		int errCode = UpnpStateVarComplete_get_ErrCode(sv_event);
 		if (errCode != UPNP_E_SUCCESS) {
 #else
-		struct Upnp_State_Var_Complete *sv_event =
-			(struct Upnp_State_Var_Complete *)Event;
+		struct Upnp_State_Var_Complete *sv_event = (struct Upnp_State_Var_Complete *)Event;
 		if (sv_event->ErrCode != UPNP_E_SUCCESS) {
 #endif
 			msg << "m_UpnpGetServiceVarStatusAsync";
@@ -1615,9 +1358,8 @@
 #endif
 		} else {
 #if 0
-			// Warning: The use of UpnpGetServiceVarStatus and
-			// UpnpGetServiceVarStatusAsync is deprecated by the
-			// UPnP forum.
+			// Warning: UpnpGetServiceVarStatus and UpnpGetServiceVarStatusAsync are
+			// deprecated by the UPnP forum.
 #if UPNP_VERSION >= 10800
 			const char *ctrlUrl =
 				UpnpStateVarComplete_get_CtrlUrl(sv_event);
@@ -1639,48 +1381,35 @@
 	}
 	// ignore these cases, since this is not a device
 	case UPNP_CONTROL_GET_VAR_REQUEST:
-		//fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_REQUEST\n");
 		msg << "error(UPNP_CONTROL_GET_VAR_REQUEST): ";
 		goto eventSubscriptionRequest;
 	case UPNP_CONTROL_ACTION_REQUEST:
-		//fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_REQUEST\n");
 		msg << "error(UPNP_CONTROL_ACTION_REQUEST): ";
 		goto eventSubscriptionRequest;
 	case UPNP_EVENT_SUBSCRIPTION_REQUEST:
-		//fprintf(stderr, "Callback: UPNP_EVENT_SUBSCRIPTION_REQUEST\n");
 		msg << "error(UPNP_EVENT_SUBSCRIPTION_REQUEST): ";
-eventSubscriptionRequest:
+	eventSubscriptionRequest:
 		msg << "This is not a UPnP Device, this is a UPnP Control Point, event ignored.";
 		AddDebugLogLineC(logUPnP, msg);
 		break;
 	default:
-		// Hum, this is not good, we forgot to handle something...
-		fprintf(stderr,
-			"Callback: default... Unknown event:'%d', not good.\n",
-			EventType);
-		msg << "error(UPnP::Callback): Event not handled:'" <<
-			EventType << "'.";
+		fprintf(stderr, "Callback: default... Unknown event:'%d', not good.\n", EventType);
+		msg << "error(UPnP::Callback): Event not handled:'" << EventType << "'.";
 		fprintf(stderr, "%s\n", msg.str().c_str());
 		AddDebugLogLineC(logUPnP, msg);
 		// Better not throw in the callback. Who would catch it?
-		//throw CUPnPException(msg);
 		break;
 	}
 
 	return 0;
 }
 
-
 void CUPnPControlPoint::OnEventReceived(
-		const std::string &Sid,
-		int EventKey,
-		IXML_Document *ChangedVariablesDoc)
+	const std::string &Sid, int EventKey, IXML_Document *ChangedVariablesDoc)
 {
 	std::ostringstream msg;
-	msg << "UPNP_EVENT_RECEIVED:" <<
-		"\n    SID: " << Sid <<
-		"\n    Key: " << EventKey <<
-		"\n    Property list:";
+	msg << "UPNP_EVENT_RECEIVED:" << "\n    SID: " << Sid << "\n    Key: " << EventKey
+	    << "\n    Property list:";
 	IXML_Element *root = IXML::Document::GetRootElement(ChangedVariablesDoc);
 	IXML_Element *child = IXML::Element::GetFirstChild(root);
 	if (child) {
@@ -1688,9 +1417,7 @@
 			IXML_Element *child2 = IXML::Element::GetFirstChild(child);
 			const DOMString childTag = IXML::Element::GetTag(child2);
 			std::string childValue = IXML::Element::GetTextValue(child2);
-			msg << "\n        " <<
-				childTag << "='" <<
-				childValue << "'";
+			msg << "\n        " << childTag << "='" << childValue << "'";
 			child = IXML::Element::GetNextSibling(child);
 		}
 	} else {
@@ -1699,44 +1426,30 @@
 	AddDebugLogLineC(logUPnP, msg);
 }
 
-
 void CUPnPControlPoint::AddRootDevice(
-	IXML_Element *rootDevice, const std::string &urlBase,
-	const char *location, int expires)
+	IXML_Element *rootDevice, const std::string &urlBase, const char *location, int expires)
 {
-	// Lock the Root Device List
 	CUPnPMutexLocker lock(m_RootDeviceListMutex);
 
-	// Root node's URLBase
-	std::string OriginalURLBase(urlBase);
-	std::string FixedURLBase(OriginalURLBase.empty() ?
-		location :
-		OriginalURLBase);
+	const std::string &OriginalURLBase(urlBase);
+	std::string FixedURLBase(OriginalURLBase.empty() ? location : OriginalURLBase);
 
-	// Get the UDN (Unique Device Name)
 	std::string UDN(IXML::Element::GetChildValueByTag(rootDevice, "UDN"));
 	RootDeviceMap::iterator it = m_RootDeviceMap.find(UDN);
 	bool alreadyAdded = it != m_RootDeviceMap.end();
 	if (alreadyAdded) {
-		// Just set the expires field
 		it->second->SetExpires(expires);
 	} else {
-		// Add a new root device to the root device list
 		CUPnPRootDevice *upnpRootDevice = new CUPnPRootDevice(
-			*this, rootDevice,
-			OriginalURLBase, FixedURLBase,
-			location, expires);
+			*this, rootDevice, OriginalURLBase, FixedURLBase, location, expires);
 		m_RootDeviceMapupnpRootDevice->GetUDN() = upnpRootDevice;
 	}
 }
 
-
 void CUPnPControlPoint::RemoveRootDevice(const char *udn)
 {
-	// Lock the Root Device List
 	CUPnPMutexLocker lock(m_RootDeviceListMutex);
 
-	// Remove
 	std::string UDN(udn);
 	RootDeviceMap::iterator it = m_RootDeviceMap.find(UDN);
 	if (it != m_RootDeviceMap.end()) {
@@ -1745,13 +1458,10 @@
 	}
 }
 
-
-bool CUPnPControlPoint::ShouldSkipAdvertisementFetch(
-	const std::string &location)
+bool CUPnPControlPoint::ShouldSkipAdvertisementFetch(const std::string &location)
 {
 	CUPnPMutexLocker lock(m_failedFetchCacheMutex);
-	std::map<std::string, time_t>::iterator it =
-		m_failedFetchCache.find(location);
+	std::map<std::string, time_t>::iterator it = m_failedFetchCache.find(location);
 	if (it == m_failedFetchCache.end()) {
 		return false;
 	}
@@ -1764,72 +1474,63 @@
 	return true;
 }
 
-
-void CUPnPControlPoint::RecordAdvertisementFetchResult(
-	const std::string &location, bool success)
+void CUPnPControlPoint::RecordAdvertisementFetchResult(const std::string &location, bool /*success*/)
 {
 	CUPnPMutexLocker lock(m_failedFetchCacheMutex);
-	if (success) {
-		m_failedFetchCache.erase(location);
-	} else {
-		m_failedFetchCachelocation = time(NULL);
-	}
+	// Rate-limit successes the same way as failures. Erasing on success re-issued a blocking
+	// UpnpDownloadXmlDoc on every subsequent ALIVE announcement for an already-classified
+	// location, and those arrive in dense repeating bursts, so on a busy LAN they alone can
+	// keep libupnp's thread pool saturated. Recording the attempt time regardless of outcome
+	// bounds ALIVE-driven downloads to one per location per FAILED_FETCH_TTL_SECS, and nothing
+	// is lost: a gateway found on the first fetch is already registered, and later ALIVEs only
+	// refresh the expiry, which the TTL covers.
+	m_failedFetchCachelocation = time(nullptr);
 }
 
-
 void CUPnPControlPoint::Subscribe(CUPnPService &service)
 {
 	std::ostringstream msg;
 
 	IXML_Document *scpdDoc = NULL;
-	int errcode = UpnpDownloadXmlDoc(
-		service.GetAbsSCPDURL().c_str(), &scpdDoc);
+	int errcode = UpnpDownloadXmlDoc(service.GetAbsSCPDURL().c_str(), &scpdDoc);
 	if (errcode == UPNP_E_SUCCESS) {
-		// Get the root node of this service (the SCPD Document)
 		IXML_Element *scpdRoot = IXML::Document::GetRootElement(scpdDoc);
 		CUPnPSCPD *scpd = new CUPnPSCPD(*this, scpdRoot, service.GetAbsSCPDURL());
 		service.SetSCPD(scpd);
 		IXML::Document::Free(scpdDoc);
 		m_ServiceMapservice.GetAbsEventSubURL() = &service;
-		msg << "Successfully retrieved SCPD Document for service " <<
-			service.GetServiceType() << ", absEventSubURL: " <<
-			service.GetAbsEventSubURL() << ".";
+		msg << "Successfully retrieved SCPD Document for service " << service.GetServiceType()
+		    << ", absEventSubURL: " << service.GetAbsEventSubURL() << ".";
 		AddDebugLogLineN(logUPnP, msg);
 		msg.str("");
 
-		// Now try to subscribe to this service. If the subscription
-		// is not successful, we will not be notified about events,
-		// but it may be possible to use the service anyway.
+		// Now try to subscribe to this service. Without a successful subscription we are
+		// not notified about events, but the service may still be usable.
 		errcode = UpnpSubscribe(m_UPnPClientHandle,
 			service.GetAbsEventSubURL().c_str(),
 			service.GetTimeoutAddr(),
 			service.GetSID());
 		if (errcode == UPNP_E_SUCCESS) {
-			msg << "Successfully subscribed to service " <<
-				service.GetServiceType() << ", absEventSubURL: " <<
-				service.GetAbsEventSubURL() << ".";
+			msg << "Successfully subscribed to service " << service.GetServiceType()
+			    << ", absEventSubURL: " << service.GetAbsEventSubURL() << ".";
 			AddDebugLogLineC(logUPnP, msg);
 		} else {
-			msg << "Error subscribing to service " <<
-				service.GetServiceType() << ", absEventSubURL: " <<
-				service.GetAbsEventSubURL() << ", error: " <<
-				UpnpGetErrorMessage(errcode) << ".";
+			msg << "Error subscribing to service " << service.GetServiceType()
+			    << ", absEventSubURL: " << service.GetAbsEventSubURL()
+			    << ", error: " << UpnpGetErrorMessage(errcode) << ".";
 			goto error;
 		}
 	} else {
-		msg << "Error getting SCPD Document from " <<
-			service.GetAbsSCPDURL() << ".";
+		msg << "Error getting SCPD Document from " << service.GetAbsSCPDURL() << ".";
 		AddDebugLogLineN(logUPnP, msg);
 	}
 
 	return;
 
-	// Error processing
 error:
 	AddDebugLogLineN(logUPnP, msg);
 }
 
-
 void CUPnPControlPoint::Unsubscribe(CUPnPService &service)
 {
 	ServiceMap::iterator it = m_ServiceMap.find(service.GetAbsEventSubURL());

amule-3.0.1.tar.gz/src/UPnPBase.h -> amule-3.1.0.tar.gz/src/UPnPBase.h Changed

@@ -23,24 +23,20 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 // This define must not conflict with the one in the standard header
 #ifndef AMULE_UPNP_H
 #define AMULE_UPNP_H
 
-
 #include <map>
 #include <string>
 #include <sstream>
 
 #include "UPnPCompatibility.h"
 
-#include <common/SmartPtr.h>		// Needed for CSmartPtr
-
+#include <common/SmartPtr.h> // Needed for CSmartPtr
 
 extern std::string stdEmptyString;
 
-
 class CUPnPPortMapping
 {
 private:
@@ -51,43 +47,37 @@
 	std::string m_key;
 
 public:
-	CUPnPPortMapping(
-		int port = 0,
+	CUPnPPortMapping(int port = 0,
 		const std::string &protocol = stdEmptyString,
 		bool enabled = false,
 		const std::string &description = stdEmptyString);
-	const std::string &getPort() const
-		{ return m_port; }
-	const std::string &getProtocol() const
-		{ return m_protocol; }
-	const std::string &getEnabled() const
-		{ return m_enabled; }
-	const std::string &getDescription() const
-		{ return m_description; }
-	const std::string &getKey() const
-		{ return m_key; }
+	const std::string &getPort() const { return m_port; }
+	const std::string &getProtocol() const { return m_protocol; }
+	const std::string &getEnabled() const { return m_enabled; }
+	const std::string &getDescription() const { return m_description; }
+	const std::string &getKey() const { return m_key; }
 };
 
-
 namespace IXML
 {
-	namespace Document {
-		IXML_Element *GetRootElement(IXML_Document *doc);
-		void Free(IXML_Document *doc);
-	}
-
-	namespace Element {
-		IXML_Element *GetFirstChild(IXML_Element *parent);
-		IXML_Element *GetNextSibling(IXML_Element *child);
-		const DOMString GetTag(IXML_Element *element);
-		const std::string GetTextValue(IXML_Element *element);
-		const std::string GetChildValueByTag(IXML_Element *element, const DOMString tag);
-		IXML_Element *GetFirstChildByTag(IXML_Element *element, const DOMString tag);
-		IXML_Element *GetNextSiblingByTag(IXML_Element *element, const DOMString tag);
-		const std::string GetAttributeByTag(IXML_Element *element, const DOMString tag);
-	}
-}
+namespace Document
+{
+IXML_Element *GetRootElement(IXML_Document *doc);
+void Free(IXML_Document *doc);
+} // namespace Document
 
+namespace Element
+{
+IXML_Element *GetFirstChild(IXML_Element *parent);
+IXML_Element *GetNextSibling(IXML_Element *child);
+const DOMString GetTag(IXML_Element *element);
+const std::string GetTextValue(IXML_Element *element);
+const std::string GetChildValueByTag(IXML_Element *element, const DOMString tag);
+IXML_Element *GetFirstChildByTag(IXML_Element *element, const DOMString tag);
+IXML_Element *GetNextSiblingByTag(IXML_Element *element, const DOMString tag);
+const std::string GetAttributeByTag(IXML_Element *element, const DOMString tag);
+} // namespace Element
+} // namespace IXML
 
 class CUPnPControlPoint;
 
@@ -95,23 +85,17 @@
 class CXML_List : public std::map<const std::string, T *>
 {
 public:
-	CXML_List(
-		const CUPnPControlPoint &upnpControlPoint,
-		IXML_Element *parent,
-		const std::string &url);
+	CXML_List(const CUPnPControlPoint &upnpControlPoint, IXML_Element *parent, const std::string &url);
 	~CXML_List();
 };
 
-
 template <typename T, char const *XML_ELEMENT_NAME, char const *XML_LIST_NAME>
 CXML_List<T, XML_ELEMENT_NAME, XML_LIST_NAME>::CXML_List(
-	const CUPnPControlPoint &upnpControlPoint,
-	IXML_Element *parent,
-	const std::string &url)
+	const CUPnPControlPoint &upnpControlPoint, IXML_Element *parent, const std::string &url)
 {
 	IXML_Element *elementList = IXML::Element::GetFirstChildByTag(parent, XML_LIST_NAME);
 	unsigned int i = 0;
-	for (   IXML_Element *element = IXML::Element::GetFirstChildByTag(elementList, XML_ELEMENT_NAME);
+	for (IXML_Element *element = IXML::Element::GetFirstChildByTag(elementList, XML_ELEMENT_NAME);
 		element;
 		element = IXML::Element::GetNextSiblingByTag(element, XML_ELEMENT_NAME)) {
 		// Add a new element to the element list
@@ -120,17 +104,15 @@
 		++i;
 	}
 	std::ostringstream msg;
-	msg << "\n    " << XML_LIST_NAME << ": " <<
-		i << " " << XML_ELEMENT_NAME << "s.";
+	msg << "\n    " << XML_LIST_NAME << ": " << i << " " << XML_ELEMENT_NAME << "s.";
 	AddDebugLogLineN(logUPnP, msg);
 }
 
-
 template <typename T, char const *XML_ELEMENT_NAME, char const *XML_LIST_NAME>
 CXML_List<T, XML_ELEMENT_NAME, XML_LIST_NAME>::~CXML_List()
 {
 	typename CXML_List<T, XML_ELEMENT_NAME, XML_LIST_NAME>::iterator it;
-	for(it = this->begin(); it != this->end(); ++it) {
+	for (it = this->begin(); it != this->end(); ++it) {
 		delete (*it).second;
 	}
 }
@@ -148,8 +130,6 @@
 extern const char s_device;
 extern const char s_deviceList;
 
-
-
 class CUPnPArgument;
 typedef CXML_List<CUPnPArgument, s_argument, s_argumentList> ArgumentList;
 class CUPnPAction;
@@ -163,21 +143,19 @@
 class CUPnPDevice;
 typedef CXML_List<CUPnPDevice, s_device, s_deviceList> DeviceList;
 
-
 class CUPnPError
 {
 private:
 	IXML_Element *m_root;
 	const std::string m_ErrorCode;
 	const std::string m_ErrorDescription;
+
 public:
-	CUPnPError(IXML_Document *errorDoc);	const std::string &getErrorCode() const
-		{ return m_ErrorCode; }
-	const std::string &getErrorDescription() const
-		{ return m_ErrorDescription; }
+	CUPnPError(IXML_Document *errorDoc);
+	const std::string &getErrorCode() const { return m_ErrorCode; }
+	const std::string &getErrorDescription() const { return m_ErrorDescription; }
 };
 
-
 class CUPnPArgument
 {
 private:
@@ -187,23 +165,16 @@
 	const std::string m_relatedStateVariable;
 
 public:
-	CUPnPArgument(
-		const CUPnPControlPoint &upnpControlPoint,
+	CUPnPArgument(const CUPnPControlPoint &upnpControlPoint,
 		IXML_Element *argument,
-		const std::string &SCPDURL);	const std::string &GetName() const
-		{ return m_name; }
-	const std::string &GetDirection() const
-		{ return m_direction; }
-	bool GetRetVal() const
-		{ return m_retval; }
-	const std::string &GetRelatedStateVariable() const
-		{ return m_relatedStateVariable; }
-	const std::string &GetKey() const
-		{ return m_name; }
+		const std::string &SCPDURL);
+	const std::string &GetName() const { return m_name; }
+	const std::string &GetDirection() const { return m_direction; }
+	bool GetRetVal() const { return m_retval; }
+	const std::string &GetRelatedStateVariable() const { return m_relatedStateVariable; }
+	const std::string &GetKey() const { return m_name; }
 };
 
-
-
 class CUPnPAction
 {
 private:
@@ -212,33 +183,25 @@
 
 public:
 	CUPnPAction(
-		const CUPnPControlPoint &upnpControlPoint,
-		IXML_Element *action,
-		const std::string &SCPDURL);	const std::string &GetName() const
-		{ return m_name; }
-	const std::string &GetKey() const
-		{ return m_name; }
-	const ArgumentList &GetArgumentList() const
-		{ return m_ArgumentList; }
+		const CUPnPControlPoint &upnpControlPoint, IXML_Element *action, const std::string &SCPDURL);
+	const std::string &GetName() const { return m_name; }
+	const std::string &GetKey() const { return m_name; }
+	const ArgumentList &GetArgumentList() const { return m_ArgumentList; }
 };
 
-
 class CUPnPAllowedValue
 {
 private:
 	const std::string m_allowedValue;
 
 public:
-	CUPnPAllowedValue(
-		const CUPnPControlPoint &upnpControlPoint,
+	CUPnPAllowedValue(const CUPnPControlPoint &upnpControlPoint,
 		IXML_Element *allowedValue,
-		const std::string &SCPDURL);	const std::string &GetAllowedValue() const
-		{ return m_allowedValue; }
-	const std::string &GetKey() const
-		{ return m_allowedValue; }
+		const std::string &SCPDURL);
+	const std::string &GetAllowedValue() const { return m_allowedValue; }
+	const std::string &GetKey() const { return m_allowedValue; }
 };
 
-
 class CUPnPStateVariable
 {
 private:
@@ -249,22 +212,16 @@
 	const std::string m_sendEvents;
 
 public:
-	CUPnPStateVariable(
-		const CUPnPControlPoint &upnpControlPoint,
+	CUPnPStateVariable(const CUPnPControlPoint &upnpControlPoint,
 		IXML_Element *stateVariable,
-		const std::string &URLBase);	const std::string &GetNname() const
-		{ return m_name; }
-	const std::string &GetDataType() const
-		{ return m_dataType; }
-	const std::string &GetDefaultValue() const
-		{ return m_defaultValue; }
-	const std::string &GetKey() const
-		{ return m_name; }
-	const AllowedValueList &GetAllowedValueList() const
-		{ return m_AllowedValueList; }
+		const std::string &URLBase);
+	const std::string &GetNname() const { return m_name; }
+	const std::string &GetDataType() const { return m_dataType; }
+	const std::string &GetDefaultValue() const { return m_defaultValue; }
+	const std::string &GetKey() const { return m_name; }
+	const AllowedValueList &GetAllowedValueList() const { return m_AllowedValueList; }
 };
 
-
 class CUPnPSCPD
 {
 private:
@@ -273,16 +230,11 @@
 	const std::string m_SCPDURL;
 
 public:
-	CUPnPSCPD(
-		const CUPnPControlPoint &upnpControlPoint,
-		IXML_Element *scpd,
-		const std::string &SCPDURL);	const ActionList &GetActionList() const
-		{ return m_ActionList; }
-	const ServiceStateTable &GetServiceStateTable() const
-		{ return m_ServiceStateTable; }
+	CUPnPSCPD(const CUPnPControlPoint &upnpControlPoint, IXML_Element *scpd, const std::string &SCPDURL);
+	const ActionList &GetActionList() const { return m_ActionList; }
+	const ServiceStateTable &GetServiceStateTable() const { return m_ServiceStateTable; }
 };
 
-
 class CUPnPArgumentValue
 {
 private:
@@ -292,13 +244,12 @@
 public:
 	CUPnPArgumentValue();
 	CUPnPArgumentValue(const std::string &argument, const std::string &value);
-	const std::string &GetArgument() const	{ return m_argument; }
-	const std::string &GetValue() const	{ return m_value; }
-	const std::string &SetArgument(const std::string& argument)	{ return m_argument = argument; }
-	const std::string &SetValue(const std::string &value)		{ return m_value = value; }
+	const std::string &GetArgument() const { return m_argument; }
+	const std::string &GetValue() const { return m_value; }
+	const std::string &SetArgument(const std::string &argument) { return m_argument = argument; }
+	const std::string &SetValue(const std::string &value) { return m_value = value; }
 };
 
-
 class CUPnPService
 {
 private:
@@ -317,52 +268,30 @@
 
 public:
 	CUPnPService(
-		const CUPnPControlPoint &upnpControlPoint,
-		IXML_Element *service,
-		const std::string &URLBase);
+		const CUPnPControlPoint &upnpControlPoint, IXML_Element *service, const std::string &URLBase);
 	~CUPnPService();
 
-	const std::string &GetServiceType() const
-		{ return m_serviceType; }
-	const std::string &GetServiceId() const
-		{ return m_serviceId; }
-	const std::string &GetSCPDURL() const
-		{ return m_SCPDURL; }
-	const std::string &GetAbsSCPDURL() const
-		{ return m_absSCPDURL; }
-	const std::string &GetControlURL() const
-		{ return m_controlURL; }
-	const std::string &GetEventSubURL() const
-		{ return m_eventSubURL; }
-	const std::string &GetAbsControlURL() const
-		{ return m_absControlURL; }
-	const std::string &GetAbsEventSubURL() const
-		{ return m_absEventSubURL; }
-	int GetTimeout() const
-		{ return m_timeout; }
-	void SetTimeout(int t)
-		{ m_timeout = t; }
-	int *GetTimeoutAddr()
-		{ return &m_timeout; }
-	char *GetSID()
-		{ return m_SID; }
-	void SetSID(const char *s)
-		{ memcpy(m_SID, s, sizeof(Upnp_SID)); }
-	const std::string &GetKey() const
-		{ return m_serviceId; }
-	bool IsSubscribed() const
-		{ return m_SCPD.get() != NULL; }
-	void SetSCPD(CUPnPSCPD *SCPD)
-		{ m_SCPD.reset(SCPD); }
-
-	bool Execute(
-		const std::string &ActionName,
-		const std::vector<CUPnPArgumentValue> &ArgValue) const;
-	const std::string GetStateVariable(
-		const std::string &stateVariableName) const;
+	const std::string &GetServiceType() const { return m_serviceType; }
+	const std::string &GetServiceId() const { return m_serviceId; }
+	const std::string &GetSCPDURL() const { return m_SCPDURL; }
+	const std::string &GetAbsSCPDURL() const { return m_absSCPDURL; }
+	const std::string &GetControlURL() const { return m_controlURL; }
+	const std::string &GetEventSubURL() const { return m_eventSubURL; }
+	const std::string &GetAbsControlURL() const { return m_absControlURL; }
+	const std::string &GetAbsEventSubURL() const { return m_absEventSubURL; }
+	int GetTimeout() const { return m_timeout; }
+	void SetTimeout(int t) { m_timeout = t; }
+	int *GetTimeoutAddr() { return &m_timeout; }
+	char *GetSID() { return m_SID; }
+	void SetSID(const char *s) { memcpy(m_SID, s, sizeof(Upnp_SID)); }
+	const std::string &GetKey() const { return m_serviceId; }
+	bool IsSubscribed() const { return m_SCPD.get() != NULL; }
+	void SetSCPD(CUPnPSCPD *SCPD) { m_SCPD.reset(SCPD); }
+
+	bool Execute(const std::string &ActionName, const std::vector<CUPnPArgumentValue> &ArgValue) const;
+	const std::string GetStateVariable(const std::string &stateVariableName) const;
 };
 
-
 class CUPnPDevice
 {
 private:
@@ -385,22 +314,14 @@
 
 public:
 	CUPnPDevice(
-		const CUPnPControlPoint &upnpControlPoint,
-		IXML_Element *device,
-		const std::string &URLBase);
-	const std::string &GetUDN() const
-		{ return m_UDN; }
-	const std::string &GetDeviceType() const
-		{ return m_deviceType; }
-	const std::string &GetFriendlyName() const
-		{ return m_friendlyName; }
-	const std::string &GetPresentationURL() const
-		{ return m_presentationURL; }
-	const std::string &GetKey() const
-		{ return m_UDN; }
+		const CUPnPControlPoint &upnpControlPoint, IXML_Element *device, const std::string &URLBase);
+	const std::string &GetUDN() const { return m_UDN; }
+	const std::string &GetDeviceType() const { return m_deviceType; }
+	const std::string &GetFriendlyName() const { return m_friendlyName; }
+	const std::string &GetPresentationURL() const { return m_presentationURL; }
+	const std::string &GetKey() const { return m_UDN; }
 };
 
-
 class CUPnPRootDevice : public CUPnPDevice
 {
 private:
@@ -409,29 +330,22 @@
 	int m_expires;
 
 public:
-	CUPnPRootDevice(
-		const CUPnPControlPoint &upnpControlPoint,
+	CUPnPRootDevice(const CUPnPControlPoint &upnpControlPoint,
 		IXML_Element *rootDevice,
 		const std::string &OriginalURLBase,
 		const std::string &FixedURLBase,
 		const char *location,
 		int expires);
-	const std::string &GetURLBase() const
-		{ return m_URLBase; }
-	const std::string &GetLocation() const
-		{ return m_location; }
-	int GetExpires() const
-		{ return m_expires; }
-	void SetExpires(int expires)
-		{ m_expires = expires; }
+	const std::string &GetURLBase() const { return m_URLBase; }
+	const std::string &GetLocation() const { return m_location; }
+	int GetExpires() const { return m_expires; }
+	void SetExpires(int expires) { m_expires = expires; }
 };
 
-
 typedef std::map<const std::string, CUPnPRootDevice *> RootDeviceMap;
 typedef std::map<const std::string, CUPnPService *> ServiceMap;
 typedef std::map<const std::string, CUPnPPortMapping> PortMappingMap;
 
-
 class CUPnPControlPoint
 {
 private:
@@ -443,7 +357,7 @@
 	PortMappingMap m_ActivePortMappingsMap;
 	CUPnPMutex m_RootDeviceListMutex;
 	bool m_IGWDeviceDetected;
-//#warning This variable is for testing purposes only and should disappear on release.
+	// #warning This variable is for testing purposes only and should disappear on release.
 	CUPnPService *m_WanService;
 	CUPnPMutex m_WaitForSearchTimeoutMutex;
 
@@ -452,82 +366,52 @@
 	~CUPnPControlPoint();
 	void Subscribe(CUPnPService &service);
 	void Unsubscribe(CUPnPService &service);
-	bool AddPortMappings(
-		std::vector<CUPnPPortMapping> &upnpPortMapping);
-	bool DeletePortMappings(
-		std::vector<CUPnPPortMapping> &upnpPortMapping);
-
-	UpnpClient_Handle GetUPnPClientHandle()	const
-		{ return m_UPnPClientHandle; }
-
-	bool GetIGWDeviceDetected() const
-		{ return m_IGWDeviceDetected; }
-	void SetIGWDeviceDetected(bool b)
-		{ m_IGWDeviceDetected = b; }
-	bool WanServiceDetected() const
-		{ return !m_ServiceMap.empty(); }
-	void SetWanService(CUPnPService *service)
-		{ m_WanService = service; }
+	bool AddPortMappings(std::vector<CUPnPPortMapping> &upnpPortMapping);
+	bool DeletePortMappings(std::vector<CUPnPPortMapping> &upnpPortMapping);
+
+	UpnpClient_Handle GetUPnPClientHandle() const { return m_UPnPClientHandle; }
+
+	bool GetIGWDeviceDetected() const { return m_IGWDeviceDetected; }
+	void SetIGWDeviceDetected(bool b) { m_IGWDeviceDetected = b; }
+	bool WanServiceDetected() const { return !m_ServiceMap.empty(); }
+	void SetWanService(CUPnPService *service) { m_WanService = service; }
 
 	// Callback function
 	static int Callback(
 #if UPNP_VERSION >= 11800
-		Upnp_EventType_e EventType,
-		void *Event,
-		void *Cookie);
+		Upnp_EventType_e EventType, void *Event, void *Cookie);
 #elif UPNP_VERSION >= 11430
-		Upnp_EventType_e EventType,
-		const void *Event,
-		void *Cookie);
+		Upnp_EventType_e EventType, const void *Event, void *Cookie);
 #elif UPNP_VERSION >= 11426
-		Upnp_EventType_e EventType,
-		void *Event,
-		void *Cookie);
+		Upnp_EventType_e EventType, void *Event, void *Cookie);
 #elif UPNP_VERSION >= 10800
-		Upnp_EventType_e EventType,
-		const void *Event,
-		void *Cookie);
+		Upnp_EventType_e EventType, const void *Event, void *Cookie);
 #else
-		Upnp_EventType EventType,
-		void* Event,
-		void* Cookie);
+		Upnp_EventType EventType, void *Event, void *Cookie);
 #endif
 
 private:
-	void OnEventReceived(
-		const std::string &Sid,
-		int EventKey,
-		IXML_Document *ChangedVariables);
+	void OnEventReceived(const std::string &Sid, int EventKey, IXML_Document *ChangedVariables);
 	void AddRootDevice(
-		IXML_Element *rootDevice,
-		const std::string &urlBase,
-		const char *location,
-		int expires);
-	void RemoveRootDevice(
-		const char *udn);
+		IXML_Element *rootDevice, const std::string &urlBase, const char *location, int expires);
+	void RemoveRootDevice(const char *udn);
 	void RefreshPortMappings();
-	bool PrivateAddPortMapping(
-		CUPnPPortMapping &upnpPortMapping);
-	bool PrivateDeletePortMapping(
-		CUPnPPortMapping &upnpPortMapping);
-
-	// Suppress repeated UpnpDownloadXmlDoc() against URLs that just failed.
-	// SSDP ALIVE announcements arrive in dense bursts (one per service
-	// class, every few seconds per device). When the announcing device's
-	// HTTP server is unreachable each fetch pins a libupnp worker thread
-	// for the full TCP-connect timeout; a single misbehaving device on a
-	// busy LAN can saturate libupnp's internal pool. Each failed location
-	// URL is suppressed for FAILED_FETCH_TTL_SECS before the next attempt
-	// is allowed.
+	bool PrivateAddPortMapping(CUPnPPortMapping &upnpPortMapping);
+	bool PrivateDeletePortMapping(CUPnPPortMapping &upnpPortMapping);
+
+	// Suppress repeated UpnpDownloadXmlDoc() against URLs that just failed. SSDP ALIVE
+	// announcements arrive in dense bursts, one per service class, every few seconds per
+	// device. When the announcing device's HTTP server is unreachable each fetch pins a libupnp
+	// worker thread for the full TCP-connect timeout; a single misbehaving device on a busy LAN
+	// can saturate libupnp's internal pool. Each failed location URL is suppressed for
+	// FAILED_FETCH_TTL_SECS before the next attempt.
 	bool ShouldSkipAdvertisementFetch(const std::string &location);
-	void RecordAdvertisementFetchResult(const std::string &location,
-	                                    bool success);
+	void RecordAdvertisementFetchResult(const std::string &location, bool success);
 	std::map<std::string, time_t> m_failedFetchCache;
 	CUPnPMutex m_failedFetchCacheMutex;
 	static const int FAILED_FETCH_TTL_SECS = 300;
 };
 
-
 #endif /* AMULE_UPNP_H */
 
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/UPnPCompatibility.h -> amule-3.1.0.tar.gz/src/UPnPCompatibility.h Changed

@@ -23,41 +23,31 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #ifndef UPNPCOMPATIBILITY_H
 #define UPNPCOMPATIBILITY_H
 
-
 #include <upnp.h>
 #include <upnptools.h>
 
-
 #include <sstream>
 
+#include <common/MuleDebug.h>       // for CMuleException::
+#include <common/StringFunctions.h> // for char2unicode()
 
-#include <common/MuleDebug.h>		// for CMuleException::
-#include <common/StringFunctions.h>	// for char2unicode()
-
-
-#include "Logger.h"				// for Add(Debug)LogLineM()
-
+#include "Logger.h" // for Add(Debug)LogLineM()
 
 class CUPnPException : public CMuleException
 {
 public:
-	CUPnPException(const std::ostringstream& msg)
-	:
-	CMuleException(
-		"CUPnPException",
-		wxString(char2unicode(msg.str().c_str()))) {}
+	CUPnPException(const std::ostringstream &msg)
+	: CMuleException("CUPnPException", wxString(char2unicode(msg.str().c_str())))
+	{
+	}
 };
 
-
 // There is no need to create mutex/mutex locker classes using ithread.h
 // because wx already has them.
 #define CUPnPMutex wxMutex
 #define CUPnPMutexLocker wxMutexLocker
 
-
 #endif // UPNPCOMPATIBILITY_H
-

amule-3.0.1.tar.gz/src/UpDownClientEC.h -> amule-3.1.0.tar.gz/src/UpDownClientEC.h Changed

@@ -26,163 +26,193 @@
 #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
+#include <ec/cpp/ECID.h>      // Needed for CECID
+#include "BitVector.h"        // Needed for BitVector
+#include "ClientRef.h"        // Needed for debug defines
+#include "PeerCapabilities.h" // Needed for CPeerCapabilities
 
 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.
+	 * 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.
+	 * Reference count, increased whenever the client is linked to a clientref. Clients are
+	 * stored only by ClientRefs; CUpDownClient * is for temporary use only. Linking is done
+	 * only by the friend class CClientRef, so the methods are private.
 	 */
-	uint16	m_linked;
+	uint16 m_linked;
 #ifdef DEBUG_ZOMBIE_CLIENTS
-	bool	m_linkedDebug;
+	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() {
+	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++) {
+		for (std::multiset<wxString>::iterator it = m_linkedFrom.begin(); it != m_linkedFrom.end();
+			it++) {
 			ret += *it + ", ";
 		}
 		return ret;
 	}
 #else
-	void	Link()		{ m_linked++; }
-	void	Unlink();
+	void Link() { m_linked++; }
+	void Unlink();
 #endif
 
 public:
 	CUpDownClient(const 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);
-
+	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); }
+	// Numeric counterpart, matching the core client. amulegui never resolves locally -- it
+	// takes the from-core branch in GetDisplayCountryCode -- but that helper is shared with
+	// monolithic aMule and takes the numeric form.
+	uint32 GetFullIPNumeric() const { return 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; }
+	const CPeerCapabilities &GetModCapabilities() const { return m_modCapabilities; }
+	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;
+
+	//! The credit modifier to show the user: no identity gate, unlike GetScoreRatio.
+	double GetCreditRatio() 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; }
+	// Peer country ISO code delivered by the core over EC (#439). Unconditional, and
+	// libmaxminddb-free, so the shared client-list drawing code compiles against the remote
+	// GUI's EC client whether or not this build has the resolver. m_countryFromCore marks that
+	// the tag was present, so an empty code ("unknown") is distinguished from the no-tag case.
+	const wxString &GetCountryCode() const { return m_countryCode; }
+	bool IsCountryFromCore() const { return m_countryFromCore; }
+	void SetCountryCode(const wxString &code)
+	{
+		m_countryCode = code;
+		m_countryFromCore = true;
+	}
+	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;
+	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;
+	CPeerCapabilities m_modCapabilities;
+	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;
+	wxString m_countryCode; // EC-provided peer country (#439); see accessors
+	bool m_countryFromCore = false;
+
+	// other stuff
+	CClientCredits *credits;
 };
 
-
 #endif
-

amule-3.0.1.tar.gz/src/UploadBandwidthThrottler.cpp -> amule-3.1.0.tar.gz/src/UploadBandwidthThrottler.cpp Changed

@@ -38,16 +38,14 @@
 #include "amule.h"
 #include "UploadDiskIOThread.h"
 
-
 /////////////////////////////////////
 
-
 /**
  * The constructor starts the thread.
  */
 UploadBandwidthThrottler::UploadBandwidthThrottler()
-		: wxThread( wxTHREAD_JOINABLE )
-		, m_newDataCondition( m_newDataMutex )
+: wxThread(wxTHREAD_JOINABLE)
+, m_newDataCondition(m_newDataMutex)
 {
 	m_SentBytesSinceLastCall = 0;
 	m_SentBytesSinceLastCallOverhead = 0;
@@ -58,37 +56,32 @@
 	Run();
 }
 
-
 /**
- * The destructor stops the thread. If the thread has already stopped, destructor does nothing.
+ * The destructor stops the thread, or does nothing if it has already stopped.
  */
 UploadBandwidthThrottler::~UploadBandwidthThrottler()
 {
 	EndThread();
 }
 
-
 /**
- * Called by the disk I/O thread when it has put new data on a socket queue.
- * Wakes the throttler immediately instead of waiting for its next sleep interval.
- * eMule ref: UploadBandwidthThrottler.cpp:795
+ * Called by the disk I/O thread when it has put new data on a socket queue. Wakes the throttler
+ * immediately instead of waiting for its next sleep interval. eMule ref:
+ * UploadBandwidthThrottler.cpp:795
  */
 void UploadBandwidthThrottler::NewUploadDataAvailable()
 {
-	wxMutexLocker lock( m_newDataMutex );
+	wxMutexLocker lock(m_newDataMutex);
 	m_newDataCondition.Signal();
 }
 
-
 /**
- * Find out how many bytes that has been put on the sockets since the last call to this
- * method. Includes overhead of control packets.
- *
- * @return the number of bytes that has been put on the sockets since the last call
+ * Bytes put on the sockets since the last call to this method, including control-packet overhead.
+ * Resets the counter.
  */
 uint64 UploadBandwidthThrottler::GetNumberOfSentBytesSinceLastCallAndReset()
 {
-	wxMutexLocker lock( m_sendLocker );
+	wxMutexLocker lock(m_sendLocker);
 
 	uint64 numberOfSentBytesSinceLastCall = m_SentBytesSinceLastCall;
 	m_SentBytesSinceLastCall = 0;
@@ -97,14 +90,12 @@
 }
 
 /**
- * Find out how many bytes that has been put on the sockets since the last call to this
- * method. Excludes overhead of control packets.
- *
- * @return the number of bytes that has been put on the sockets since the last call
+ * Bytes put on the sockets since the last call to this method, excluding control-packet overhead.
+ * Resets the counter.
  */
 uint64 UploadBandwidthThrottler::GetNumberOfSentBytesOverheadSinceLastCallAndReset()
 {
-	wxMutexLocker lock( m_sendLocker );
+	wxMutexLocker lock(m_sendLocker);
 
 	uint64 numberOfSentBytesSinceLastCall = m_SentBytesSinceLastCallOverhead;
 	m_SentBytesSinceLastCallOverhead = 0;
@@ -112,27 +103,20 @@
 	return numberOfSentBytesSinceLastCall;
 }
 
-
 /**
- * Add a socket to the list of sockets that have upload slots. The main thread will
- * continuously call send on these sockets, to give them chance to work off their queues.
- * The sockets are called in the order they exist in the list, so the top socket (index 0)
- * will be given a chance first to use bandwidth, and then the next socket (index 1) etc.
+ * Add a socket to the list of sockets that have upload slots. The main thread continuously calls
+ * send on these, so they can work off their queues; they are served in list order, so the top
+ * socket gets the bandwidth first.
  *
- * It is possible to add a socket several times to the list without removing it in between,
- * but that should be avoided.
+ * Adding a socket several times without removing it in between is possible but should be avoided.
  *
- * @param index insert the socket at this place in the list. An index that is higher than the
- *              current number of sockets in the list will mean that the socket should be inserted
- *              last in the list.
- *
- * @param socket the address to the socket that should be added to the list. If the address is NULL,
- *               this method will do nothing.
+ * @param index where to insert the socket. An index past the end means last.
+ * @param socket the socket to add. NULL does nothing.
  */
-void UploadBandwidthThrottler::AddToStandardList(uint32 index, ThrottledFileSocket* socket)
+void UploadBandwidthThrottler::AddToStandardList(uint32 index, ThrottledFileSocket *socket)
 {
-	if ( socket ) {
-		wxMutexLocker lock( m_sendLocker );
+	if (socket) {
+		wxMutexLocker lock(m_sendLocker);
 
 		RemoveFromStandardListNoLock(socket);
 		if (index > (uint32)m_StandardOrder_list.size()) {
@@ -143,61 +127,43 @@
 	}
 }
 
-
 /**
- * Remove a socket from the list of sockets that have upload slots.
- *
- * If the socket has mistakenly been added several times to the list, this method
- * will return all of the entries for the socket.
- *
- * @param socket the address of the socket that should be removed from the list. If this socket
- *               does not exist in the list, this method will do nothing.
+ * Remove a socket from the list of sockets that have upload slots. If it was mistakenly added
+ * several times, every entry for it is removed. A socket not in the list does nothing.
  */
-bool UploadBandwidthThrottler::RemoveFromStandardList(ThrottledFileSocket* socket)
+bool UploadBandwidthThrottler::RemoveFromStandardList(ThrottledFileSocket *socket)
 {
-	wxMutexLocker lock( m_sendLocker );
+	wxMutexLocker lock(m_sendLocker);
 
 	return RemoveFromStandardListNoLock(socket);
 }
 
-
 /**
- * Remove a socket from the list of sockets that have upload slots. NOT THREADSAFE!
- * This is an internal method that doesn't take the necessary lock before it removes
- * the socket. This method should only be called when the current thread already owns
- * the m_sendLocker lock!
- *
- * @param socket address of the socket that should be removed from the list. If this socket
- *               does not exist in the list, this method will do nothing.
+ * Remove a socket from the list of sockets that have upload slots. NOT THREADSAFE: this is the
+ * internal form, which does not take m_sendLocker, so only call it while already holding that lock.
+ * A socket not in the list does nothing.
  */
-bool UploadBandwidthThrottler::RemoveFromStandardListNoLock(ThrottledFileSocket* socket)
+bool UploadBandwidthThrottler::RemoveFromStandardListNoLock(ThrottledFileSocket *socket)
 {
-	return (EraseFirstValue( m_StandardOrder_list, socket ) > 0);
+	return (EraseFirstValue(m_StandardOrder_list, socket) > 0);
 }
 
-
 /**
-* Notifies the send thread that it should try to call controlpacket send
-* for the supplied socket. It is allowed to call this method several times
-* for the same socket, without having controlpacket send called for the socket
-* first. The doublette entries are never filtered, since it is incurs less cpu
-* overhead to simply call Send() in the socket for each double. Send() will
-* already have done its work when the second Send() is called, and will just
-* return with little cpu overhead.
-*
-* @param socket address to the socket that requests to have controlpacket send
-*               to be called on it
-*/
-void UploadBandwidthThrottler::QueueForSendingControlPacket(ThrottledControlSocket* socket, bool hasSent)
+ * Notifies the send thread that it should try to call controlpacket send for @a socket.
+ *
+ * May be called several times for the same socket without a send in between. Duplicates are not
+ * filtered: calling Send() again costs less CPU than filtering, since the second call finds the
+ * work already done and returns.
+ */
+void UploadBandwidthThrottler::QueueForSendingControlPacket(ThrottledControlSocket *socket, bool hasSent)
 {
 	bool wasEmpty = false;
 	{
-		// Get critical section
-		wxMutexLocker lock( m_tempQueueLocker );
+		wxMutexLocker lock(m_tempQueueLocker);
 
-		if ( m_doRun ) {
+		if (m_doRun) {
 			wasEmpty = m_TempControlQueue_list.empty() && m_TempControlQueueFirst_list.empty();
-			if( hasSent ) {
+			if (hasSent) {
 				m_TempControlQueueFirst_list.push_back(socket);
 			} else {
 				m_TempControlQueue_list.push_back(socket);
@@ -205,82 +171,63 @@
 		}
 	}
 
-	// Wake the throttler when the temp control queue transitions from
-	// empty to non-empty.  Without this signal the throttler's adaptive
-	// backoff (extraSleepTime *= 5 per idle tick, capped at 1 sec) lets
-	// the thread doze through newly-queued packets, adding 5–25 ms of
-	// latency to every freshly-built OP_REQUESTPARTS — which directly
-	// caps per-peer download throughput on Windows where peer ramp is
-	// already sensitive to ACK clock jitter.
+	// Wake the throttler when the temp control queue goes from empty to non-empty. Without the
+	// signal its adaptive backoff (extraSleepTime *= 5 per idle tick, capped at 1 s) lets the
+	// thread doze through newly-queued packets, adding 5-25 ms of latency to every freshly-
+	// built OP_REQUESTPARTS -- which directly caps per-peer download throughput on Windows,
+	// where peer ramp is already sensitive to ACK clock jitter.
 	//
-	// Gating on the empty→non-empty transition (rather than signaling
-	// on every queue add) matches the CBatchDrainNotifier pattern: one
-	// wake per drain cycle, not per producer add.  Bursty enqueues
-	// from the same SendBlockRequests fan-out coalesce into a single
-	// signal.
-	//
-	// The disk I/O thread already wakes the throttler the same way
-	// via NewUploadDataAvailable() when fresh file-data lands on a
-	// socket; this closes the equivalent gap for the control-packet
-	// path.
+	// Gating on that transition rather than on every queue add matches the CBatchDrainNotifier
+	// pattern: one wake per drain cycle, so bursty enqueues from one SendBlockRequests fan-out
+	// coalesce into a single signal. The disk I/O thread already wakes the throttler the same
+	// way for file data.
 	if (wasEmpty) {
-		wxMutexLocker lock( m_newDataMutex );
+		wxMutexLocker lock(m_newDataMutex);
 		m_newDataCondition.Signal();
 	}
 }
 
-
-
 /**
- * Remove the socket from all lists and queues. This will make it safe to
- * erase/delete the socket. It will also cause the main thread to stop calling
- * send() for the socket.
- *
- * @param socket address to the socket that should be removed
+ * Remove @a socket from all lists and queues, making it safe to erase or delete and stopping the
+ * main thread calling send() for it.
  */
-void UploadBandwidthThrottler::DoRemoveFromAllQueues(ThrottledControlSocket* socket)
+void UploadBandwidthThrottler::DoRemoveFromAllQueues(ThrottledControlSocket *socket)
 {
-	if ( m_doRun ) {
-		// Remove this socket from control packet queue
-		EraseValue( m_ControlQueue_list, socket );
-		EraseValue( m_ControlQueueFirst_list, socket );
-
-		wxMutexLocker lock( m_tempQueueLocker );
-		EraseValue( m_TempControlQueue_list, socket );
-		EraseValue( m_TempControlQueueFirst_list, socket );
+	if (m_doRun) {
+		EraseValue(m_ControlQueue_list, socket);
+		EraseValue(m_ControlQueueFirst_list, socket);
+
+		wxMutexLocker lock(m_tempQueueLocker);
+		EraseValue(m_TempControlQueue_list, socket);
+		EraseValue(m_TempControlQueueFirst_list, socket);
 	}
 }
 
-
-void UploadBandwidthThrottler::RemoveFromAllQueues(ThrottledControlSocket* socket)
+void UploadBandwidthThrottler::RemoveFromAllQueues(ThrottledControlSocket *socket)
 {
-	wxMutexLocker lock( m_sendLocker );
+	wxMutexLocker lock(m_sendLocker);
 
-	DoRemoveFromAllQueues( socket );
+	DoRemoveFromAllQueues(socket);
 }
 
-
-void UploadBandwidthThrottler::RemoveFromAllQueues(ThrottledFileSocket* socket)
+void UploadBandwidthThrottler::RemoveFromAllQueues(ThrottledFileSocket *socket)
 {
-	wxMutexLocker lock( m_sendLocker );
+	wxMutexLocker lock(m_sendLocker);
 
 	if (m_doRun) {
 		DoRemoveFromAllQueues(socket);
 
-		// And remove it from upload slots
 		RemoveFromStandardListNoLock(socket);
 	}
 }
 
-
 /**
- * Make the thread exit. This method will not return until the thread has stopped
- * looping. This guarantees that the thread will not access the CEMSockets after this
- * call has exited.
+ * Make the thread exit. Does not return until the thread has stopped looping, which guarantees it
+ * will not touch the CEMSockets afterwards.
  */
 void UploadBandwidthThrottler::EndThread()
 {
-	if (m_doRun) {	// do it only once
+	if (m_doRun) { // do it only once
 		{
 			wxMutexLocker lock(m_sendLocker);
 
@@ -292,23 +239,20 @@
 	}
 }
 
-
 /**
  * The thread method that handles calling send for the individual sockets.
  *
- * Control packets will always be tried to be sent first. If there is any bandwidth leftover
- * after that, send() for the upload slot sockets will be called in priority order until we have run
- * out of available bandwidth for this loop. Upload slots will not be allowed to go without having sent
- * called for more than a defined amount of time (i.e. two seconds).
- *
- * @return always returns 0.
+ * Control packets are always tried first. Any bandwidth left over goes to the upload-slot sockets
+ * in priority order, until the loop runs out. No upload slot is left without a send for longer than
+ * a defined time (two seconds). Always returns 0.
  */
-void* UploadBandwidthThrottler::Entry()
+void *UploadBandwidthThrottler::Entry()
 {
 	const uint32 TIME_BETWEEN_UPLOAD_LOOPS = 1;
 
 	uint64 lastLoopTick = GetTickCount64();
-	// Bytes to spend in current cycle. If we spend more this becomes negative and causes a wait next time.
+	// Bytes to spend in current cycle. If we spend more this becomes negative and causes a wait next
+	// time.
 	sint32 bytesToSpend = 0;
 	uint32 allowedDataRate;
 	uint32 rememberedSlotCounter = 0;
@@ -317,9 +261,8 @@
 	while (m_doRun && !TestDestroy()) {
 		uint64 timeSinceLastLoop = GetTickCount64() - lastLoopTick;
 
-		// Calculate data rate
 		if (thePrefs::GetMaxUpload() == UNLIMITED) {
-			// MaxUpload=0 means literal unlimited — bypass the per-iteration rate cap
+			// MaxUpload=0 means literal unlimited -- bypass the per-iteration rate cap
 			// so SendFileAndControlData() is never throttled.
 			allowedDataRate = UNLIMITED_RATE;
 		} else {
@@ -327,28 +270,30 @@
 		}
 
 		uint32 minFragSize = 1300;
-		uint32 doubleSendSize = minFragSize*2; // send two packages at a time so they can share an ACK
-		if (allowedDataRate < 6*1024) {
+		uint32 doubleSendSize =
+			minFragSize * 2; // send two packages at a time so they can share an ACK
+		if (allowedDataRate < 6 * 1024) {
 			minFragSize = 536;
-			doubleSendSize = minFragSize; // don't send two packages at a time at very low speeds to give them a smoother load
+			doubleSendSize = minFragSize; // don't send two packages at a time at very low speeds
+						      // to give them a smoother load
 		}
 
-
 		uint64 sleepTime;
 		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);
+			sleepTime = std::max((-bytesToSpend + 1) * 1000 / allowedDataRate +
+						     2, // add 2 ms to allow for rounding inaccuracies
+				extraSleepTime);
 		} else {
 			// We could send at once, but sleep a while to not suck up all cpu
 			sleepTime = extraSleepTime;
 		}
 
 		if (timeSinceLastLoop < sleepTime) {
-			// eMule ref: UploadBandwidthThrottler.cpp:580 — WaitForSingleObject replaced with wxCondition::WaitTimeout
-			// Wakes early if disk I/O thread signals NewUploadDataAvailable()
-			wxMutexLocker lock( m_newDataMutex );
+			// wxCondition::WaitTimeout in place of eMule's WaitForSingleObject.
+			// Wakes early if the disk I/O thread signals NewUploadDataAvailable().
+			wxMutexLocker lock(m_newDataMutex);
 			m_newDataCondition.WaitTimeout(sleepTime - timeSinceLastLoop);
 		}
 
@@ -362,21 +307,21 @@
 		lastLoopTick = thisLoopTick;
 
 		if (timeSinceLastLoop > sleepTime + 2000) {
-			AddDebugLogLineN(logGeneral, CFormat("UploadBandwidthThrottler: Time since last loop too long. time: %ims wanted: %ims Max: %ims")
-				% timeSinceLastLoop % sleepTime % (sleepTime + 2000));
+			AddDebugLogLineN(logGeneral,
+				CFormat("UploadBandwidthThrottler: Time since last loop too long. time: %ims "
+					"wanted: %ims Max: %ims") %
+					timeSinceLastLoop % sleepTime % (sleepTime + 2000));
 
 			timeSinceLastLoop = sleepTime + 2000;
 		}
 
-		// Calculate how many bytes we can spend
-		// In UNLIMITED mode, allowedDataRate = UINT_MAX (~4 GB/s) would overflow the
-		// sint32 bytesToSpend accumulator when multiplied by timeSinceLastLoop.
-		// Cap the budget rate at 1 GB/s — still far above any real uplink, and every
-		// real socket send() will short-circuit far below this ceiling.
-		const uint32 bytesToSpendRate = (allowedDataRate == UNLIMITED_RATE)
-			? (1024u * 1024u * 1024u)
-			: allowedDataRate;
-		bytesToSpend += (sint32) (bytesToSpendRate / 1000.0 * timeSinceLastLoop);
+		// Calculate how many bytes we can spend. In UNLIMITED mode allowedDataRate is
+		// UINT_MAX (~4 GB/s), which would overflow the sint32 bytesToSpend accumulator once
+		// multiplied by timeSinceLastLoop, so the budget rate is capped at 1 GB/s -- still
+		// far above any real uplink.
+		const uint32 bytesToSpendRate =
+			(allowedDataRate == UNLIMITED_RATE) ? (1024u * 1024u * 1024u) : allowedDataRate;
+		bytesToSpend += (sint32)(bytesToSpendRate / 1000.0 * timeSinceLastLoop);
 
 		if (bytesToSpend >= 1) {
 			sint32 spentBytes = 0;
@@ -387,22 +332,24 @@
 			{
 				wxMutexLocker queueLock(m_tempQueueLocker);
 
-				// are there any sockets in m_TempControlQueue_list? Move them to normal m_ControlQueue_list;
-				m_ControlQueueFirst_list.insert(	m_ControlQueueFirst_list.end(),
-													m_TempControlQueueFirst_list.begin(),
-													m_TempControlQueueFirst_list.end() );
+				// are there any sockets in m_TempControlQueue_list? Move them to normal
+				// m_ControlQueue_list;
+				m_ControlQueueFirst_list.insert(m_ControlQueueFirst_list.end(),
+					m_TempControlQueueFirst_list.begin(),
+					m_TempControlQueueFirst_list.end());
 
-				m_ControlQueue_list.insert( m_ControlQueue_list.end(),
-											m_TempControlQueue_list.begin(),
-											m_TempControlQueue_list.end() );
+				m_ControlQueue_list.insert(m_ControlQueue_list.end(),
+					m_TempControlQueue_list.begin(),
+					m_TempControlQueue_list.end());
 
 				m_TempControlQueue_list.clear();
 				m_TempControlQueueFirst_list.clear();
 			}
 
 			// Send any queued up control packets first
-			while (spentBytes < bytesToSpend && (!m_ControlQueueFirst_list.empty() || !m_ControlQueue_list.empty())) {
-				ThrottledControlSocket* socket = NULL;
+			while (spentBytes < bytesToSpend &&
+				(!m_ControlQueueFirst_list.empty() || !m_ControlQueue_list.empty())) {
+				ThrottledControlSocket *socket = NULL;
 
 				if (!m_ControlQueueFirst_list.empty()) {
 					socket = m_ControlQueueFirst_list.front();
@@ -413,55 +360,74 @@
 				}
 
 				if (socket != NULL) {
-					SocketSentBytes socketSentBytes = socket->SendControlData(bytesToSpend-spentBytes, minFragSize);
-					spentBytes += socketSentBytes.sentBytesControlPackets + socketSentBytes.sentBytesStandardPackets;
+					SocketSentBytes socketSentBytes = socket->SendControlData(
+						bytesToSpend - spentBytes, minFragSize);
+					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.
+			// Check if any sockets haven't gotten data for a long time. Then trickle them a
+			// package.
 			uint32 slots = m_StandardOrder_list.size();
 			for (uint32 slotCounter = 0; slotCounter < slots; slotCounter++) {
-				ThrottledFileSocket* socket = m_StandardOrder_list slotCounter ;
+				ThrottledFileSocket *socket = m_StandardOrder_listslotCounter;
 
 				if (socket != NULL) {
-					if (thisLoopTick-socket->GetLastCalledSend() > SEC2MS(1)) {
+					if (thisLoopTick - socket->GetLastCalledSend() > SEC2MS(1)) {
 						// trickle
 						uint32 neededBytes = socket->GetNeededBytes();
 
 						if (neededBytes > 0) {
-							SocketSentBytes socketSentBytes = socket->SendFileAndControlData(neededBytes, minFragSize);
-							spentBytes += socketSentBytes.sentBytesControlPackets + socketSentBytes.sentBytesStandardPackets;
-							spentOverhead += socketSentBytes.sentBytesControlPackets;
+							SocketSentBytes socketSentBytes =
+								socket->SendFileAndControlData(
+									neededBytes, minFragSize);
+							spentBytes +=
+								socketSentBytes.sentBytesControlPackets +
+								socketSentBytes.sentBytesStandardPackets;
+							spentOverhead +=
+								socketSentBytes.sentBytesControlPackets;
 						}
 					}
 				} else {
-					AddDebugLogLineN(logGeneral, CFormat( "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("There was a NULL socket in the "
+							"UploadBandwidthThrottler Standard list (trickle)! "
+							"Prevented usage. Index: %i Size: %i") %
+							slotCounter % m_StandardOrder_list.size());
 				}
 			}
 
-			// 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
+			// Give available bandwidth to slots, starting with the one we ended with
+			// last time. Two passes: the first gives packets of doubleSendSize, the
+			// second as much as possible, starting from the last slot of the first
+			// pass.
+			for (uint32 slotCounter = 0; (slotCounter < slots * 2) && spentBytes < bytesToSpend;
+				slotCounter++) {
+				if (rememberedSlotCounter >= slots) { // wrap around pointer
 					rememberedSlotCounter = 0;
 				}
 
-				uint32 data = (slotCounter < slots - 1)	? doubleSendSize				// pass 1
-															: (bytesToSpend - spentBytes);	// pass 2
+				uint32 data = (slotCounter < slots - 1)
+						      ? doubleSendSize               // pass 1
+						      : (bytesToSpend - spentBytes); // pass 2
 
-				ThrottledFileSocket* socket = m_StandardOrder_list rememberedSlotCounter ;
+				ThrottledFileSocket *socket = m_StandardOrder_listrememberedSlotCounter;
 
 				if (socket != NULL) {
-					SocketSentBytes socketSentBytes = socket->SendFileAndControlData(data, doubleSendSize);
-					spentBytes += socketSentBytes.sentBytesControlPackets + socketSentBytes.sentBytesStandardPackets;
+					SocketSentBytes socketSentBytes =
+						socket->SendFileAndControlData(data, doubleSendSize);
+					spentBytes += socketSentBytes.sentBytesControlPackets +
+						      socketSentBytes.sentBytesStandardPackets;
 					spentOverhead += socketSentBytes.sentBytesControlPackets;
 				} else {
-					AddDebugLogLineN(logGeneral, CFormat("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("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++;
@@ -471,8 +437,8 @@
 			bytesToSpend -= spentBytes;
 			sint32 minBytesToSpend = (slots + 1) * minFragSize;
 
-			if (bytesToSpend < - minBytesToSpend) {
-				bytesToSpend = - minBytesToSpend;
+			if (bytesToSpend < -minBytesToSpend) {
+				bytesToSpend = -minBytesToSpend;
 			} else {
 				sint32 bandwidthSavedTolerance = slots * 512 + 1;
 				if (bytesToSpend > bandwidthSavedTolerance) {
@@ -483,14 +449,15 @@
 			m_SentBytesSinceLastCall += spentBytes;
 			m_SentBytesSinceLastCallOverhead += spentOverhead;
 
-			if (spentBytes == 0) {	// spentBytes includes the overhead
+			if (spentBytes == 0) { // spentBytes includes the overhead
 				extraSleepTime = std::min<uint32>(extraSleepTime * 5, 1000); // 1s at most
 			} else {
 				extraSleepTime = TIME_BETWEEN_UPLOAD_LOOPS;
 
-				// eMule ref: EMSocket.cpp:602 — SocketAvailable()
-				// Wake disk I/O thread whenever payload bytes were actually sent so it can
-				// refill the socket queue without waiting for its 100ms WaitTimeout.
+				// eMule ref: EMSocket.cpp:602 -- SocketAvailable(). Wake the disk
+				// I/O thread whenever payload bytes were actually sent, so it can
+				// refill the socket queue without waiting for its 100 ms
+				// WaitTimeout.
 				if (spentBytes > spentOverhead && theApp->uploadDiskIOThread != NULL) {
 					theApp->uploadDiskIOThread->SocketNeedsMoreData();
 				}

amule-3.0.1.tar.gz/src/UploadBandwidthThrottler.h -> amule-3.1.0.tar.gz/src/UploadBandwidthThrottler.h Changed

@@ -26,7 +26,6 @@
 #ifndef UPLOADBANDWIDTHTHROTTLER_H
 #define UPLOADBANDWIDTHTHROTTLER_H
 
-
 #include <wx/thread.h>
 
 #include <deque>
@@ -39,62 +38,60 @@
 class UploadBandwidthThrottler : public wxThread
 {
 public:
-    UploadBandwidthThrottler();
-    ~UploadBandwidthThrottler();
+	UploadBandwidthThrottler();
+	~UploadBandwidthThrottler();
 
 	uint64 GetNumberOfSentBytesSinceLastCallAndReset();
-    uint64 GetNumberOfSentBytesOverheadSinceLastCallAndReset();
+	uint64 GetNumberOfSentBytesOverheadSinceLastCallAndReset();
 
-    void AddToStandardList(uint32 index, ThrottledFileSocket* socket);
-    bool RemoveFromStandardList(ThrottledFileSocket* socket);
+	void AddToStandardList(uint32 index, ThrottledFileSocket *socket);
+	bool RemoveFromStandardList(ThrottledFileSocket *socket);
 
-    void QueueForSendingControlPacket(ThrottledControlSocket* socket, bool hasSent = false);
-    void RemoveFromAllQueues(ThrottledControlSocket* socket);
-    void RemoveFromAllQueues(ThrottledFileSocket* socket);
+	void QueueForSendingControlPacket(ThrottledControlSocket *socket, bool hasSent = false);
+	void RemoveFromAllQueues(ThrottledControlSocket *socket);
+	void RemoveFromAllQueues(ThrottledFileSocket *socket);
 
-    void EndThread();
+	void EndThread();
 
-	// Called by disk I/O thread when new packet data is available on a socket queue.
-	// Wakes the throttler early instead of waiting for its next sleep interval.
-	// eMule ref: UploadBandwidthThrottler.cpp:795
+	// Called by the disk I/O thread when new packet data is available on a socket queue. Wakes
+	// the throttler early instead of waiting for its next sleep interval. eMule ref:
+	// UploadBandwidthThrottler.cpp:795
 	void NewUploadDataAvailable();
 
 private:
-    void DoRemoveFromAllQueues(ThrottledControlSocket* socket);
-    bool RemoveFromStandardListNoLock(ThrottledFileSocket* socket);
+	void DoRemoveFromAllQueues(ThrottledControlSocket *socket);
+	bool RemoveFromStandardListNoLock(ThrottledFileSocket *socket);
 
-    void* Entry();
+	void *Entry();
 
-    bool m_doRun;
+	bool m_doRun;
 
-    wxMutex    m_sendLocker;
-    wxMutex    m_tempQueueLocker;
+	wxMutex m_sendLocker;
+	wxMutex m_tempQueueLocker;
 
 	// Used by disk I/O thread to wake the throttler when new data is available.
 	// eMule ref: UploadBandwidthThrottler.cpp:795 (NewUploadDataAvailable)
-	wxMutex     m_newDataMutex;
-	wxCondition m_newDataCondition;  // replaces CEvent m_eventNewDataAvailable
+	wxMutex m_newDataMutex;
+	wxCondition m_newDataCondition; // replaces CEvent m_eventNewDataAvailable
 
-	typedef std::deque<ThrottledControlSocket*> SocketQueue;
+	typedef std::deque<ThrottledControlSocket *> SocketQueue;
 
 	// a queue for all the sockets that want to have Send() called on them.
-    SocketQueue m_ControlQueue_list;
+	SocketQueue m_ControlQueue_list;
 	// a queue for all the sockets that want to have Send() called on them.
-    SocketQueue m_ControlQueueFirst_list;
+	SocketQueue m_ControlQueueFirst_list;
 	// sockets that wants to enter m_ControlQueue_list
-    SocketQueue m_TempControlQueue_list;
+	SocketQueue m_TempControlQueue_list;
 	// sockets that wants to enter m_ControlQueue_list and has been able to send before
-    SocketQueue m_TempControlQueueFirst_list;
-
+	SocketQueue m_TempControlQueueFirst_list;
 
-	typedef std::deque<ThrottledFileSocket*> FileSocketQueue;
+	typedef std::deque<ThrottledFileSocket *> FileSocketQueue;
 	// sockets that have upload slots. Ordered so the most prioritized socket is first
-    FileSocketQueue m_StandardOrder_list;
+	FileSocketQueue m_StandardOrder_list;
 
-    uint64 m_SentBytesSinceLastCall;
-    uint64 m_SentBytesSinceLastCallOverhead;
+	uint64 m_SentBytesSinceLastCall;
+	uint64 m_SentBytesSinceLastCallOverhead;
 };
 
-
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/UploadClient.cpp -> amule-3.1.0.tar.gz/src/UploadClient.cpp Changed

@@ -23,30 +23,29 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "updownclient.h"		// Needed for CUpDownClient
+#include "updownclient.h" // Needed for CUpDownClient
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
 
 #include <zlib.h>
 
-#include "ClientCredits.h"	// Needed for CClientCredits
-#include "Packet.h"		// Needed for CPacket
-#include "MemFile.h"		// Needed for CMemFile
-#include "UploadQueue.h"	// Needed for CUploadQueue
-#include "DownloadQueue.h"	// Needed for CDownloadQueue
-#include "PartFile.h"		// Needed for PR_POWERSHARE
-#include "ClientTCPSocket.h"	// Needed for CClientTCPSocket
-#include "SharedFileList.h"	// Needed for CSharedFileList
-#include "amule.h"		// Needed for theApp
+#include "ClientCredits.h"   // Needed for CClientCredits
+#include "Packet.h"          // Needed for CPacket
+#include "MemFile.h"         // Needed for CMemFile
+#include "UploadQueue.h"     // Needed for CUploadQueue
+#include "DownloadQueue.h"   // Needed for CDownloadQueue
+#include "PartFile.h"        // Needed for PR_POWERSHARE
+#include "ClientTCPSocket.h" // Needed for CClientTCPSocket
+#include "SharedFileList.h"  // Needed for CSharedFileList
+#include "amule.h"           // Needed for theApp
 #include "ClientList.h"
-#include "Statistics.h"		// Needed for theStats
+#include "Statistics.h" // Needed for theStats
 #include "Logger.h"
-#include "ScopedPtr.h"		// Needed for CScopedArray
-#include "GuiEvents.h"		// Needed for Notify_*
-#include "FileArea.h"		// Needed for CFileArea
-#include "UploadDiskIOThread.h"	// Needed for CUploadDiskIOThread
-
+#include "ScopedPtr.h"          // Needed for CScopedArray
+#include "GuiEvents.h"          // Needed for Notify_*
+#include "FileArea.h"           // Needed for CFileArea
+#include "UploadDiskIOThread.h" // Needed for CUploadDiskIOThread
 
 //	members of CUpDownClient
 //	which are mainly used for uploading functions
@@ -54,8 +53,14 @@
 void CUpDownClient::SetUploadState(uint8 eNewState)
 {
 	if (eNewState != m_nUploadState) {
+		// Entering or leaving US_UPLOADING changes this file's live upload speed and
+		// uploading-client count (issue #466). Mark it EC-dirty so the delta protocol re-
+		// sends those tags, or a file that just stopped uploading keeps a stale non-zero
+		// speed in remote clients.
+		if ((m_nUploadState == US_UPLOADING || eNewState == US_UPLOADING) && m_uploadingfile) {
+			m_uploadingfile->MarkECChanged();
+		}
 		if (m_nUploadState == US_UPLOADING) {
-			// Reset upload data rate computation
 			m_nUpDatarate = 0;
 			m_nSumForAvgUpDataRate = 0;
 			m_AvarageUDR_list.clear();
@@ -74,7 +79,7 @@
 
 uint32 CUpDownClient::CalculateScoreInternal()
 {
-	//TODO: complete this (friends, uploadspeed, amuleuser etc etc)
+	// TODO: complete this (friends, uploadspeed, amuleuser etc etc)
 	if (m_Username.IsEmpty()) {
 		return 0;
 	}
@@ -83,8 +88,8 @@
 		return 0;
 	}
 
-	const CKnownFile* pFile = GetUploadFile();
-	if ( !pFile ) {
+	const CKnownFile *pFile = GetUploadFile();
+	if (!pFile) {
 		return 0;
 	}
 
@@ -107,75 +112,62 @@
 	}
 
 	// calculate score, based on waitingtime and other factors
-	float fBaseValue = (float)(::GetTickCount64()-GetWaitStartTime())/1000;
+	float fBaseValue = (float)(::GetTickCount64() - GetWaitStartTime()) / 1000;
 
-	fBaseValue *= GetScoreRatio();	// credits
+	fBaseValue *= GetScoreRatio(); // credits
 
-	// 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.
+	// Take file upload priority into account. One unsolved problem: a client sometimes asks for
+	// 2 files and there is no way to tell which it finally gets, so it could be queued first
+	// because of a high-priority file and then ask 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_VERY_LOW:
-			filepriority = 0.2f;
-			break;
-		case PR_NORMAL:
-		default:
-			filepriority = 0.7f;
-			break;
+	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_VERY_LOW:
+		filepriority = 0.2f;
+		break;
+	case PR_NORMAL:
+	default:
+		filepriority = 0.7f;
+		break;
 	}
 	fBaseValue *= filepriority;
 
-	if ( (IsEmuleClient() || GetClientSoft() < 10) && m_byEmuleVersion <= 0x19) {
+	if ((IsEmuleClient() || GetClientSoft() < 10) && m_byEmuleVersion <= 0x19) {
 		fBaseValue *= 0.5f;
 	}
 	return (uint32)fBaseValue;
 }
 
-
-// Checks if it is next requested block from another chunk of the actual file or from another file
-//
-// Returns
-//   true : Next requested block is from another different chunk or file than last downloaded block
-//   false: Next requested block is from same chunk that last downloaded block
+// True when the next requested block is from a different chunk or file than the
+// last downloaded block. Tarod 12/22/2002
 bool CUpDownClient::IsDifferentPartBlock() const // Tarod 12/22/2002
 {
 	bool different_part = false;
 
-	// Check if we have good lists and proceed to check for different chunks
-	if ((!m_BlockRequests_queue.empty()) && !m_DoneBlocks_list.empty())
-	{
-		Requested_Block_Struct* last_done_block = NULL;
-		Requested_Block_Struct* next_requested_block = NULL;
+	if ((!m_BlockRequests_queue.empty()) && !m_DoneBlocks_list.empty()) {
+		Requested_Block_Struct *last_done_block = NULL;
+		Requested_Block_Struct *next_requested_block = NULL;
 		uint64 last_done_part = 0xffffffff;
 		uint64 next_requested_part = 0xffffffff;
 
-
-		// Get last block and next pending
 		last_done_block = m_DoneBlocks_list.front();
 		next_requested_block = m_BlockRequests_queue.front();
 
-		// Calculate corresponding parts to blocks
 		last_done_part = last_done_block->StartOffset / PARTSIZE;
 		next_requested_part = next_requested_block->StartOffset / PARTSIZE;
 
-		// Test is we are asking same file and same part
-		if ( last_done_part != next_requested_part) {
+		if (last_done_part != next_requested_part) {
 			different_part = true;
 			AddDebugLogLineN(logClient, "Session ended due to new chunk.");
 		}
@@ -189,14 +181,13 @@
 	return different_part;
 }
 
-
 void CUpDownClient::ProcessExtendedInfo(const CMemFile *data, CKnownFile *tempreqfile)
 {
-	m_uploadingfile->UpdateUpPartsFrequency( this, false ); // Decrement
+	m_uploadingfile->UpdateUpPartsFrequency(this, false); // Decrement
 	m_upPartStatus.clear();
-	m_nUpCompleteSourcesCount= 0;
+	m_nUpCompleteSourcesCount = 0;
 
-	if( GetExtendedRequestsVersion() == 0 ) {
+	if (GetExtendedRequestsVersion() == 0) {
 		// Something is coded wrong on this client if he's sending something it doesn't advertise.
 		return;
 	}
@@ -209,24 +200,26 @@
 
 	uint16 nED2KUpPartCount = data->ReadUInt16();
 	if (!nED2KUpPartCount) {
-		m_upPartStatus.setsize( 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!
+			// We already checked if we are talking about the same file.. So if we get here,
+			// something really strange happened!
 			m_upPartStatus.clear();
 			return;
 		}
 
-		m_upPartStatus.setsize( 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.set(done, (toread>>i)&1);
+				for (sint32 i = 0; i != 8; i++) {
+					m_upPartStatus.set(done, (toread >> i) & 1);
 					//	We may want to use this for another feature..
-					//	if (m_upPartStatusdone && !tempreqfile->IsComplete(done*PARTSIZE,((done+1)*PARTSIZE)-1))
+					//	if (m_upPartStatusdone &&
+					//! tempreqfile->IsComplete(done*PARTSIZE,((done+1)*PARTSIZE)-1))
 					// bPartsNeeded = true;
 					done++;
 					if (done == m_upPartStatus.size()) {
@@ -236,83 +229,94 @@
 			}
 		} catch (...) {
 			// We want the increment the frequency even if we didn't read everything
-			m_uploadingfile->UpdateUpPartsFrequency( this, true ); // Increment
+			m_uploadingfile->UpdateUpPartsFrequency(this, true); // Increment
 
 			throw;
 		}
 
 		if (GetExtendedRequestsVersion() > 1) {
-			uint16 nCompleteCountLast = GetUpCompleteSourcesCount();
-			uint16 nCompleteCountNew = data->ReadUInt16();
-			SetUpCompleteSourcesCount(nCompleteCountNew);
-			if (nCompleteCountLast != nCompleteCountNew) {
-				tempreqfile->UpdatePartsInfo();
-			}
+			// Still guarded, because this is where the count is read off the wire. The
+			// recompute it used to gate has moved below: the peer's self-reported total
+			// staying put says nothing about its part bitmap.
+			SetUpCompleteSourcesCount(data->ReadUInt16());
 		}
 	}
 
-	m_uploadingfile->UpdateUpPartsFrequency( this, true ); // Increment
+	m_uploadingfile->UpdateUpPartsFrequency(this, true); // Increment
+	// Unconditional now, where it used to be gated on the peer's self-reported complete-source
+	// total having changed -- which says nothing about its part bitmap, so the frequency vector
+	// could move without the count following (issue #1050). UpdatePartsInfo() is throttled to
+	// one real recompute a minute per file, so the extra calls cost a comparison.
+	//
+	// On tempreqfile, as before: the UDP/v3 callers pass a reqfile that is not necessarily this
+	// client's m_uploadingfile.
+	tempreqfile->UpdatePartsInfo();
 
 	Notify_SharedCtrlRefreshClient(ECID(), AVAILABLE_SOURCE);
 }
 
-
-void CUpDownClient::SetUploadFileID(CKnownFile* newreqfile)
+void CUpDownClient::SetUploadFileID(CKnownFile *newreqfile)
 {
 	if (m_uploadingfile == newreqfile) {
 		return;
 	} else if (m_uploadingfile) {
 		m_uploadingfile->RemoveUploadingClient(this);
 		m_uploadingfile->UpdateUpPartsFrequency(this, false); // Decrement
+		// The decrement side never recomputed, so the count was a high-water mark that only
+		// ever rose (issue #1050). This one call covers both the peer disconnecting and the
+		// peer switching to a different file.
+		m_uploadingfile->UpdatePartsInfo();
 	}
 
 	if (newreqfile) {
-		// This is a new file! update info
 		newreqfile->AddUploadingClient(this);
 
 		if (m_requpfileid != newreqfile->GetFileHash()) {
 			m_requpfileid = newreqfile->GetFileHash();
-			m_upPartStatus.setsize( 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
+			newreqfile->UpdatePartsInfo();
 		}
 
 		m_uploadingfile = newreqfile;
 	} else {
 		m_upPartStatus.clear();
 		m_nUpCompleteSourcesCount = 0;
-		// This clears m_uploadingfile and m_requpfileid
 		ClearUploadFileID();
 	}
 }
 
-
-void CUpDownClient::AddReqBlock(Requested_Block_Struct* reqblock, bool bSignalIOThread)
+void CUpDownClient::AddReqBlock(Requested_Block_Struct *reqblock, bool bSignalIOThread)
 {
 	if (GetUploadState() != US_UPLOADING) {
-		AddDebugLogLineN(logRemoteClient, "UploadClient: Client tried to add requested block when not in upload slot! Prevented requested blocks from being added.");
+		AddDebugLogLineN(logRemoteClient,
+			"UploadClient: Client tried to add requested block when not in upload slot! "
+			"Prevented requested blocks from being added.");
 		delete reqblock;
 		return;
 	}
 
-	// eMule ref: UploadClient.cpp AddReqBlock — sanity checks before queuing
-	CKnownFile* srcfile = theApp->sharedfiles->GetFileByID(CMD4Hash(reqblock->FileID));
+	// eMule ref: UploadClient.cpp AddReqBlock -- sanity checks before queuing
+	CKnownFile *srcfile = theApp->sharedfiles->GetFileByID(CMD4Hash(reqblock->FileID));
 	if (srcfile == NULL) {
 		AddDebugLogLineN(logRemoteClient, "AddReqBlock: Requested file not found in shared files");
 		delete reqblock;
 		return;
 	}
 
-	if (srcfile->IsPartFile() && !static_cast<CPartFile*>(srcfile)->IsComplete(reqblock->StartOffset, reqblock->EndOffset - 1)) {
-		AddDebugLogLineN(logRemoteClient, CFormat("AddReqBlock: Requested block not complete (%llu - %llu)")
-			% reqblock->StartOffset % (reqblock->EndOffset - 1));
+	if (srcfile->IsPartFile() && !static_cast<CPartFile *>(srcfile)->IsComplete(
+					     reqblock->StartOffset, reqblock->EndOffset - 1)) {
+		AddDebugLogLineN(logRemoteClient,
+			CFormat("AddReqBlock: Requested block not complete (%llu - %llu)") %
+				reqblock->StartOffset % (reqblock->EndOffset - 1));
 		delete reqblock;
 		return;
 	}
 
 	if (reqblock->StartOffset >= reqblock->EndOffset || reqblock->EndOffset > srcfile->GetFileSize()) {
-		AddDebugLogLineN(logRemoteClient, "AddReqBlock: Invalid block request (out of range or negative size)");
+		AddDebugLogLineN(logRemoteClient,
+			"AddReqBlock: Invalid block request (out of range or negative size)");
 		delete reqblock;
 		return;
 	}
@@ -336,15 +340,16 @@
 	}
 
 	{
-		// Hold m_blockListLock for all reads/writes of the block queues.
-		// The disk I/O thread accesses m_DoneBlocks_list, m_BlockRequests_queue,
-		// and m_addedPayloadQueueSession under this same lock.
+		// Hold m_blockListLock for all reads and writes of the block queues. The disk I/O
+		// thread accesses m_DoneBlocks_list, m_BlockRequests_queue and
+		// m_addedPayloadQueueSession under this same lock.
 		wxMutexLocker lock(m_blockListLock);
 
 		{
-			std::list<Requested_Block_Struct*>::iterator it = m_DoneBlocks_list.begin();
+			std::list<Requested_Block_Struct *>::iterator it = m_DoneBlocks_list.begin();
 			for (; it != m_DoneBlocks_list.end(); ++it) {
-				if (reqblock->StartOffset == (*it)->StartOffset && reqblock->EndOffset == (*it)->EndOffset) {
+				if (reqblock->StartOffset == (*it)->StartOffset &&
+					reqblock->EndOffset == (*it)->EndOffset) {
 					delete reqblock;
 					return;
 				}
@@ -352,9 +357,10 @@
 		}
 
 		{
-			std::list<Requested_Block_Struct*>::iterator it = m_BlockRequests_queue.begin();
+			std::list<Requested_Block_Struct *>::iterator it = m_BlockRequests_queue.begin();
 			for (; it != m_BlockRequests_queue.end(); ++it) {
-				if (reqblock->StartOffset == (*it)->StartOffset && reqblock->EndOffset == (*it)->EndOffset) {
+				if (reqblock->StartOffset == (*it)->StartOffset &&
+					reqblock->EndOffset == (*it)->EndOffset) {
 					delete reqblock;
 					return;
 				}
@@ -362,25 +368,25 @@
 		}
 
 		m_BlockRequests_queue.push_back(reqblock);
-	}	// release lock before signalling to avoid contention
+	} // release lock before signalling to avoid contention
 
 	// Notify disk I/O thread that new block requests are available.
-	// eMule ref: NewBlockRequestsAvailable() — UploadDiskIOThread.h:55
+	// eMule ref: NewBlockRequestsAvailable() -- UploadDiskIOThread.h:55
 	if (bSignalIOThread && theApp->uploadDiskIOThread) {
 		theApp->uploadDiskIOThread->NewBlockRequestsAvailable();
 	}
 }
 
-
 uint64 CUpDownClient::GetWaitStartTime() const
 {
 	uint64 dwResult = 0;
 
-	if ( credits ) {
-		dwResult = credits->GetSecureWaitStartTime(GetIP());
+	if (credits) {
+		dwResult = credits->GetSecureWaitStartTime(GetUserAddress());
 
 		if (dwResult > m_dwUploadTime && IsDownloading()) {
-			// This happens only if two clients with invalid securehash are in the queue - if at all
+			// This happens only if two clients with invalid securehash are in the queue - if at
+			// all
 			dwResult = m_dwUploadTime - 1;
 		}
 	}
@@ -388,23 +394,20 @@
 	return dwResult;
 }
 
-
 void CUpDownClient::SetWaitStartTime()
 {
-	if ( credits ) {
-		credits->SetSecWaitStartTime(GetIP());
+	if (credits) {
+		credits->SetSecWaitStartTime(GetUserAddress());
 	}
 }
 
-
 void CUpDownClient::ClearWaitStartTime()
 {
-	if ( credits ) {
+	if (credits) {
 		credits->ClearWaitStartTime();
 	}
 }
 
-
 void CUpDownClient::ResetSessionUp()
 {
 	m_nCurSessionUp = m_nTransferredUp;
@@ -413,132 +416,124 @@
 	// 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;
+		CEMSocket *s = m_socket;
 		s->GetSentPayloadSinceLastCallAndReset();
 	}
 }
 
-
 uint32 CUpDownClient::SendBlockData()
 {
-    uint64 curTick = ::GetTickCount64();
-    uint64 sentBytesCompleteFile = 0;
-    uint64 sentBytesPartFile = 0;
-    uint64 sentBytesPayload = 0;
-
-    if (m_socket) {
-		CEMSocket* s = m_socket;
-//		uint32 uUpStatsPort = GetUserPort();
-
-	    // Extended statistics information based on which client software and which port we sent this data to...
-	    // This also updates the grand total for sent bytes, etc.  And where this data came from.
-        sentBytesCompleteFile = s->GetSentBytesCompleteFileSinceLastCallAndReset();
-        sentBytesPartFile = s->GetSentBytesPartFileSinceLastCallAndReset();
-//		thePrefs.Add2SessionTransferData(GetClientSoft(), uUpStatsPort, false, true, sentBytesCompleteFile, (IsFriend() && GetFriendSlot()));
-//		thePrefs.Add2SessionTransferData(GetClientSoft(), uUpStatsPort, true, true, sentBytesPartFile, (IsFriend() && GetFriendSlot()));
+	uint64 curTick = ::GetTickCount64();
+	uint64 sentBytesCompleteFile = 0;
+	uint64 sentBytesPartFile = 0;
+	uint64 sentBytesPayload = 0;
 
-		m_nTransferredUp += sentBytesCompleteFile + sentBytesPartFile;
-        credits->AddUploaded(sentBytesCompleteFile + sentBytesPartFile, GetIP(), theApp->CryptoAvailable());
+	if (m_socket) {
+		CEMSocket *s = m_socket;
 
-        sentBytesPayload = s->GetSentPayloadSinceLastCallAndReset();
-        m_nCurQueueSessionPayloadUp += sentBytesPayload;
+		// Extended statistics based on which client software and port we sent this
+		// data to, which also updates the grand totals.
+		sentBytesCompleteFile = s->GetSentBytesCompleteFileSinceLastCallAndReset();
+		sentBytesPartFile = s->GetSentBytesPartFileSinceLastCallAndReset();
 
-        // Wake the disk I/O thread so it can re-check its buffer condition with the
-        // freshly updated m_nCurQueueSessionPayloadUp. Without this, the thread might
-        // wait up to its WaitTimeout (100ms) before noticing curPayload advanced.
-        if (sentBytesPayload > 0 && theApp->uploadDiskIOThread) {
-            theApp->uploadDiskIOThread->SocketNeedsMoreData();
-        }
+		m_nTransferredUp += sentBytesCompleteFile + sentBytesPartFile;
+		credits->AddUploaded(sentBytesCompleteFile + sentBytesPartFile,
+			GetUserAddress(),
+			theApp->CryptoAvailable());
+
+		sentBytesPayload = s->GetSentPayloadSinceLastCallAndReset();
+		m_nCurQueueSessionPayloadUp += sentBytesPayload;
+
+		// Wake the disk I/O thread so it re-checks its buffer condition against the freshly
+		// updated m_nCurQueueSessionPayloadUp, rather than waiting out its 100 ms timeout
+		// before noticing curPayload advanced.
+		if (sentBytesPayload > 0 && theApp->uploadDiskIOThread) {
+			theApp->uploadDiskIOThread->SocketNeedsMoreData();
+		}
 
-        if (theApp->uploadqueue->CheckForTimeOver(this)) {
-            theApp->uploadqueue->RemoveFromUploadQueue(this);
+		if (theApp->uploadqueue->CheckForTimeOver(this)) {
+			theApp->uploadqueue->RemoveFromUploadQueue(this);
 			SendOutOfPartReqsAndAddToWaitingQueue();
-        }
-    }
-
-    if(sentBytesCompleteFile + sentBytesPartFile > 0 ||
-        m_AvarageUDR_list.empty() || (curTick - m_AvarageUDR_list.back().timestamp) > 1*1000) {
-        // Store how much data we've transferred this round,
-        // to be able to calculate average speed later
-        // keep sum of all values in list up to date
-        TransferredData newitem = {(uint32) (sentBytesCompleteFile + sentBytesPartFile), curTick};
-        m_AvarageUDR_list.push_back(newitem);
-        m_nSumForAvgUpDataRate += sentBytesCompleteFile + sentBytesPartFile;
-    }
-
-    // remove to old values in list
-    while ((!m_AvarageUDR_list.empty()) && (curTick - m_AvarageUDR_list.front().timestamp) > 10*1000) {
-        // keep sum of all values in list up to date
-        m_nSumForAvgUpDataRate -= m_AvarageUDR_list.front().datalen;
-	m_AvarageUDR_list.pop_front();
-    }
-
-    // Calculate average speed for this slot
-    if ((!m_AvarageUDR_list.empty()) && (curTick - m_AvarageUDR_list.front().timestamp) > 0 && GetUpStartTimeDelay() > 2*1000) {
-        m_nUpDatarate = ((uint64)m_nSumForAvgUpDataRate*1000) / (curTick-m_AvarageUDR_list.front().timestamp);
-    } else {
-        // not enough values to calculate trustworthy speed. Use -1 to tell this
-        m_nUpDatarate = 0; //-1;
-    }
-
-    // Check if it's time to update the display.
+		}
+	}
+
+	if (sentBytesCompleteFile + sentBytesPartFile > 0 || m_AvarageUDR_list.empty() ||
+		(curTick - m_AvarageUDR_list.back().timestamp) > 1 * 1000) {
+		// Store how much data was transferred this round, to calculate the average
+		// speed later, keeping the running sum up to date.
+		TransferredData newitem = { (uint32)(sentBytesCompleteFile + sentBytesPartFile), curTick };
+		m_AvarageUDR_list.push_back(newitem);
+		m_nSumForAvgUpDataRate += sentBytesCompleteFile + sentBytesPartFile;
+	}
+
+	while ((!m_AvarageUDR_list.empty()) && (curTick - m_AvarageUDR_list.front().timestamp) > 10 * 1000) {
+		// keep sum of all values in list up to date
+		m_nSumForAvgUpDataRate -= m_AvarageUDR_list.front().datalen;
+		m_AvarageUDR_list.pop_front();
+	}
+
+	if ((!m_AvarageUDR_list.empty()) && (curTick - m_AvarageUDR_list.front().timestamp) > 0 &&
+		GetUpStartTimeDelay() > 2 * 1000) {
+		m_nUpDatarate = ((uint64)m_nSumForAvgUpDataRate * 1000) /
+				(curTick - m_AvarageUDR_list.front().timestamp);
+	} else {
+		// not enough values to calculate trustworthy speed. Use -1 to tell this
+		m_nUpDatarate = 0; //-1;
+	}
+
 	m_cSendblock++;
-	if (m_cSendblock == 30){
+	if (m_cSendblock == 30) {
 		m_cSendblock = 0;
 		Notify_SharedCtrlRefreshClient(ECID(), AVAILABLE_SOURCE);
 	}
 
-    return sentBytesCompleteFile + sentBytesPartFile;
+	return sentBytesCompleteFile + sentBytesPartFile;
 }
 
-
 void CUpDownClient::SendOutOfPartReqsAndAddToWaitingQueue()
 {
 	// Kry - this is actually taken from eMule, but makes a lot of sense ;)
 
-	//OP_OUTOFPARTREQS will tell the downloading client to go back to OnQueue..
-	//The main reason for this is that if we put the client back on queue and it goes
-	//back to the upload before the socket times out... We get a situation where the
-	//downloader thinks it already sent the requested blocks and the uploader thinks
-	//the downloader didn't send any request blocks. Then the connection times out..
-	//I did some tests with eDonkey also and it seems to work well with them also..
+	// OP_OUTOFPARTREQS tells the downloading client to go back to OnQueue. Without it, a client
+	// put back on queue that returns before the socket times out leaves the downloader thinking
+	// it already sent the requested blocks while the uploader thinks it sent none, and the
+	// connection times out.
 
 	// Send this immediately, don't queue.
-	CPacket* pPacket = new CPacket(OP_OUTOFPARTREQS, 0, OP_EDONKEYPROT);
+	CPacket *pPacket = new CPacket(OP_OUTOFPARTREQS, 0, OP_EDONKEYPROT);
 	theStats::AddUpOverheadFileRequest(pPacket->GetPacketSize());
-	AddDebugLogLineN( logLocalClient, "Local Client: OP_OUTOFPARTREQS to " + GetFullIP() );
+	AddDebugLogLineN(logLocalClient, "Local Client: OP_OUTOFPARTREQS to " + GetFullIP());
 	SendPacket(pPacket, true, true);
 
 	theApp->uploadqueue->AddClientToQueue(this);
 }
 
-
 /**
- * See description for CEMSocket::TruncateQueues().
+ * See the description for CEMSocket::TruncateQueues().
  */
 void CUpDownClient::FlushSendBlocks()
 {
 	// Call this when you stop upload, or the socket might be not able to send
-    if (m_socket) {    //socket may be NULL...
-        m_socket->TruncateQueues();
+	if (m_socket) { // socket may be NULL...
+		m_socket->TruncateQueues();
 	}
 }
 
-
-void CUpDownClient::SendHashsetPacket(const CMD4Hash& forfileid)
+void CUpDownClient::SendHashsetPacket(const CMD4Hash &forfileid)
 {
-	CKnownFile* file = theApp->sharedfiles->GetFileByID( forfileid );
+	CKnownFile *file = theApp->sharedfiles->GetFileByID(forfileid);
 	bool from_dq = false;
-	if ( !file ) {
+	if (!file) {
 		from_dq = true;
 		if ((file = theApp->downloadqueue->GetFileByID(forfileid)) == NULL) {
-			AddLogLineN(CFormat( _("Hashset requested for unknown file: %s") ) % forfileid.Encode() );
+			AddLogLineN(
+				CFormat(_("Hashset requested for unknown file: %s")) % forfileid.Encode());
 
 			return;
 		}
 	}
 
-	if ( !file->GetHashCount() ) {
+	if (!file->GetHashCount()) {
 		if (from_dq) {
 			AddDebugLogLineN(logRemoteClient, "Requested hashset could not be found");
 			return;
@@ -558,13 +553,12 @@
 	for (int i = 0; i != parts; i++) {
 		data.WriteHash(file->GetPartHash(i));
 	}
-	CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_HASHSETANSWER);
+	CPacket *packet = new CPacket(data, OP_EDONKEYPROT, OP_HASHSETANSWER);
 	theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
 	AddDebugLogLineN(logLocalClient, "Local Client: OP_HASHSETANSWER to " + GetFullIP());
-	SendPacket(packet,true,true);
+	SendPacket(packet, true, true);
 }
 
-
 void CUpDownClient::ClearUploadBlockRequests()
 {
 	FlushSendBlocks();
@@ -572,7 +566,8 @@
 	DeleteContents(m_DoneBlocks_list);
 }
 
-void CUpDownClient::SendRankingInfo(){
+void CUpDownClient::SendRankingInfo()
+{
 	if (!ExtProtocolAvailable()) {
 		return;
 	}
@@ -586,15 +581,16 @@
 	data.WriteUInt16(nRank);
 	// Kry: what are these zero bytes for. are they really correct?
 	// Kry - Well, eMule does like that. I guess they're ok.
-	data.WriteUInt32(0); data.WriteUInt32(0); data.WriteUInt16(0);
-	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_QUEUERANKING);
+	data.WriteUInt32(0);
+	data.WriteUInt32(0);
+	data.WriteUInt16(0);
+	CPacket *packet = new CPacket(data, OP_EMULEPROT, OP_QUEUERANKING);
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
 	AddDebugLogLineN(logLocalClient, "Local Client: OP_QUEUERANKING to " + GetFullIP());
-	SendPacket(packet,true,true);
+	SendPacket(packet, true, true);
 }
 
-
-void CUpDownClient::SendCommentInfo(CKnownFile* file)
+void CUpDownClient::SendCommentInfo(CKnownFile *file)
 {
 	if (!m_bCommentDirty || file == NULL || !ExtProtocolAvailable() || m_byAcceptCommentVer < 1) {
 		return;
@@ -605,7 +601,7 @@
 	wxString desc = file->GetFileComment().Left(MAXFILECOMMENTLEN);
 	uint8 rating = file->GetFileRating();
 
-	if ( file->GetFileRating() == 0 && desc.IsEmpty() ) {
+	if (file->GetFileRating() == 0 && desc.IsEmpty()) {
 		return;
 	}
 
@@ -613,27 +609,40 @@
 	data.WriteUInt8(rating);
 	data.WriteString(desc, GetUnicodeSupport(), 4 /* size it's uint32 */);
 
-	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_FILEDESC);
+	CPacket *packet = new CPacket(data, OP_EMULEPROT, OP_FILEDESC);
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
 	AddDebugLogLineN(logLocalClient, "Local Client: OP_FILEDESC to " + GetFullIP());
-	SendPacket(packet,true);
+	SendPacket(packet, true);
 }
 
-void  CUpDownClient::UnBan(){
+void CUpDownClient::UnBan()
+{
 	m_Aggressiveness = 0;
 
 	theApp->clientlist->AddTrackClient(this);
-	theApp->clientlist->RemoveBannedClient( GetIP() );
+	theApp->clientlist->RemoveBannedClient(GetUserAddress());
 	SetUploadState(US_NONE);
 	ClearWaitStartTime();
 }
 
-void CUpDownClient::Ban(){
+void CUpDownClient::Ban()
+{
 	theApp->clientlist->AddTrackClient(this);
-	theApp->clientlist->AddBannedClient( GetIP() );
+	theApp->clientlist->AddBannedClient(GetUserAddress());
 
-	AddDebugLogLineN(logClient, "Client '" + GetUserName() + "' seems to be an aggressive client and is banned from the uploadqueue");
+	AddDebugLogLineN(logClient,
+		"Client '" + GetUserName() +
+			"' seems to be an aggressive client and is banned from the uploadqueue");
 
+	// The upload state is set whether or not the record took the address, and the two are
+	// deliberately independent. US_BANNED governs this client object and needs nothing to
+	// identify it, so an aggressive peer we have no address for still loses its slot; the
+	// record governs an ADDRESS, so the ban outlives the object and survives a reconnection,
+	// and with no address there is nothing to remember it by.
+	//
+	// The visible consequence is that IsBanned() reads false for such a peer while its state is
+	// US_BANNED, so it is never un-banned through the record. That is the right way round: we
+	// cannot recognise it if it comes back.
 	SetUploadState(US_BANNED);
 
 	Notify_SharedCtrlRefreshClient(ECID(), UNAVAILABLE_SOURCE);
@@ -641,54 +650,50 @@
 
 bool CUpDownClient::IsBanned() const
 {
-	return ( (theApp->clientlist->IsBannedClient(GetIP()) ) && m_nDownloadState != DS_DOWNLOADING);
+	return ((theApp->clientlist->IsBannedClient(GetUserAddress())) && m_nDownloadState != DS_DOWNLOADING);
 }
 
 void CUpDownClient::CheckForAggressive()
 {
 	uint64 cur_time = ::GetTickCount64();
 
-	// First call, initialize
-	if ( !m_LastFileRequest ) {
+	if (!m_LastFileRequest) {
 		m_LastFileRequest = cur_time;
 		return;
 	}
 
-	// Is this an aggressive request?
-	if ( ( cur_time - m_LastFileRequest ) < MIN_REQUESTTIME ) {
+	if ((cur_time - m_LastFileRequest) < MIN_REQUESTTIME) {
 		m_Aggressiveness += 3;
 
 		// Is the client EVIL?
-		if ( m_Aggressiveness >= 10 && (!IsBanned() && m_nDownloadState != DS_DOWNLOADING )) {
-			AddDebugLogLineN(logClient, CFormat( "Aggressive client banned (score: %d): %s -- %s -- %s" )
-				% m_Aggressiveness
-				% m_Username
-				% m_strModVersion
-				% m_fullClientVerString );
+		if (m_Aggressiveness >= 10 && (!IsBanned() && m_nDownloadState != DS_DOWNLOADING)) {
+			AddDebugLogLineN(logClient,
+				CFormat("Aggressive client banned (score: %d): %s -- %s -- %s") %
+					m_Aggressiveness % m_Username % m_strModVersion %
+					m_fullClientVerString);
 			Ban();
 		}
 	} else {
 		// Polite request, reward client
-		if ( m_Aggressiveness )
+		if (m_Aggressiveness)
 			m_Aggressiveness--;
 	}
 
 	m_LastFileRequest = cur_time;
 }
 
-
-void CUpDownClient::SetUploadFileID(const CMD4Hash& new_id)
+void CUpDownClient::SetUploadFileID(const CMD4Hash &new_id)
 {
-	// Update the uploading file found
-	CKnownFile* uploadingfile = theApp->sharedfiles->GetFileByID(new_id);
-	if ( !uploadingfile ) {
+	CKnownFile *uploadingfile = theApp->sharedfiles->GetFileByID(new_id);
+	if (!uploadingfile) {
 		// Can this really happen?
 		uploadingfile = theApp->downloadqueue->GetFileByID(new_id);
 	}
 	SetUploadFileID(uploadingfile); // This will update queue count on old and new file.
 }
 
-void CUpDownClient::ProcessRequestPartsPacket(const uint8_t* pachPacket, uint32 nSize, bool largeblocks) {
+void CUpDownClient::ProcessRequestPartsPacket(const uint8_t *pachPacket, uint32 nSize, bool largeblocks)
+{
 
 	CMemFile data(pachPacket, nSize);
 
@@ -717,11 +722,10 @@
 
 	for (unsigned int i = 0; i < itemsof(auStartOffsets); i++) {
 		AddDebugLogLineN(logClient,
-			CFormat("Client %s requests %d File block %d-%d (%d bytes):")
-				% GetFullIP() % i % auStartOffsetsi % auEndOffsetsi
-				% (auEndOffsetsi - auStartOffsetsi));
+			CFormat("Client %s requests %d File block %d-%d (%d bytes):") % GetFullIP() % i %
+				auStartOffsetsi % auEndOffsetsi % (auEndOffsetsi - auStartOffsetsi));
 		if (auEndOffsetsi > auStartOffsetsi) {
-			Requested_Block_Struct* reqblock = new Requested_Block_Struct;
+			Requested_Block_Struct *reqblock = new Requested_Block_Struct;
 			reqblock->StartOffset = auStartOffsetsi;
 			reqblock->EndOffset = auEndOffsetsi;
 			md4cpy(reqblock->FileID, reqfilehash.GetHash());
@@ -738,39 +742,4 @@
 	}
 }
 
-void CUpDownClient::ProcessRequestPartsPacketv2(const CMemFile& data) {
-
-	CMD4Hash reqfilehash = data.ReadHash();
-
-	uint8 numblocks = data.ReadUInt8();
-
-	for (int i = 0; i < numblocks; i++) {
-		Requested_Block_Struct* reqblock = new Requested_Block_Struct;
-		try {
-			reqblock->StartOffset = data.GetIntTagValue();
-			// 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)) {
-				AddDebugLogLineN(logClient, CFormat("Client %s request is invalid! %d / %d")
-					% GetFullIP() % reqblock->StartOffset % reqblock->EndOffset);
-				throw wxString("Client request is invalid!");
-			}
-
-			AddDebugLogLineN(logClient,
-				CFormat("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;
-			AddReqBlock(reqblock, false);
-		} catch (...) {
-			delete reqblock;
-			throw;
-		}
-	}
-	if (theApp->uploadDiskIOThread) {
-		theApp->uploadDiskIOThread->NewBlockRequestsAvailable();
-	}
-}
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/UploadDiskIOThread.cpp -> amule-3.1.0.tar.gz/src/UploadDiskIOThread.cpp Changed

@@ -25,37 +25,35 @@
 
 #include "UploadDiskIOThread.h"
 
-#include "updownclient.h"		// Needed for CUpDownClient
-#include "UploadQueue.h"		// Needed for CUploadQueue
-#include "SharedFileList.h"		// Needed for CSharedFileList
-#include "KnownFile.h"			// Needed for CKnownFile
-#include "PartFile.h"			// Needed for CPartFile
-#include "ClientTCPSocket.h"	// Needed for CClientTCPSocket
-#include "Packet.h"				// Needed for CPacket
-#include "MemFile.h"			// Needed for CMemFile
-#include "amule.h"				// Needed for theApp
+#include "updownclient.h"    // Needed for CUpDownClient
+#include "UploadQueue.h"     // Needed for CUploadQueue
+#include "SharedFileList.h"  // Needed for CSharedFileList
+#include "KnownFile.h"       // Needed for CKnownFile
+#include "PartFile.h"        // Needed for CPartFile
+#include "ClientTCPSocket.h" // Needed for CClientTCPSocket
+#include "Packet.h"          // Needed for CPacket
+#include "MemFile.h"         // Needed for CMemFile
+#include "amule.h"           // Needed for theApp
 #include "Logger.h"
-#include "OtherFunctions.h"		// Needed for GetFiletype / ftArchive
+#include "OtherFunctions.h" // Needed for GetFiletype / ftArchive
 #include "MD4Hash.h"
-#include "ScopedPtr.h"			// Needed for CScopedArray
+#include "ScopedPtr.h" // Needed for CScopedArray
 #include "UploadBandwidthThrottler.h"
-#include "Statistics.h"			// Needed for theStats
+#include "Statistics.h" // Needed for theStats
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
-#include <algorithm>			// Needed for std::min / std::max
+#include <algorithm> // Needed for std::min / std::max
 #include <zlib.h>
 
-// eMule ref: UploadDiskIOThread.cpp:43-45
-#define SLOT_COMPRESSIONCHECK_DATARATE	(1024*150)	// 150 KB/s — above this we may disable compression
-#define MAX_FINISHED_REQUESTS_COMPRESSION	15			// max queued finished reads before disabling compression
-#define BIGBUFFER_MINDATARATE			(75 * 1024)	// eMule: BIGBUFFER_MINDATARATE
+#define SLOT_COMPRESSIONCHECK_DATARATE (1024 * 150) // 150 KB/s -- above this we may disable compression
+#define MAX_FINISHED_REQUESTS_COMPRESSION 15        // max queued finished reads before disabling compression
+#define BIGBUFFER_MINDATARATE (75 * 1024)           // eMule: BIGBUFFER_MINDATARATE
 
-
-// eMule ref: CUploadDiskIOThread::CUploadDiskIOThread() — line 49
+// eMule ref: CUploadDiskIOThread::CUploadDiskIOThread()
 CUploadDiskIOThread::CUploadDiskIOThread()
-	: wxThread(wxTHREAD_JOINABLE)
-	, m_condition(m_mutex)
+: wxThread(wxTHREAD_JOINABLE)
+, m_condition(m_mutex)
 {
 	m_bRun = false;
 	m_bSignalThrottler = false;
@@ -70,11 +68,10 @@
 
 CUploadDiskIOThread::~CUploadDiskIOThread()
 {
-	wxASSERT( !m_bRun );
+	wxASSERT(!m_bRun);
 }
 
-
-// eMule ref: CUploadDiskIOThread::EndThread() — line 77
+// eMule ref: CUploadDiskIOThread::EndThread()
 void CUploadDiskIOThread::EndThread()
 {
 	{
@@ -82,15 +79,12 @@
 		m_bRun = false;
 		m_condition.Signal();
 	}
-	Wait();	// join — replaces m_eventThreadEnded->Lock()
+	Wait(); // join -- replaces m_eventThreadEnded->Lock()
 }
 
-
-// eMule ref: CUploadDiskIOThread::NewBlockRequestsAvailable() — UploadDiskIOThread.h:55
-// Called by main thread when new block requests are added for a client.
-// Uses a sticky flag so the signal is not lost if the thread is between iterations
-// (not yet sleeping in WaitTimeout). Without the flag, wxCondition::Signal() is a
-// pure pulse — it is dropped if no thread is currently waiting.
+// Called by the main thread when new block requests are added for a client. Uses a sticky flag so
+// the signal is not lost when the thread is between iterations: wxCondition::Signal() is a pure
+// pulse and is dropped if no thread is waiting.
 void CUploadDiskIOThread::NewBlockRequestsAvailable()
 {
 	wxMutexLocker lock(m_mutex);
@@ -98,9 +92,7 @@
 	m_condition.Signal();
 }
 
-
-// eMule ref: CUploadDiskIOThread::SocketNeedsMoreData() — UploadDiskIOThread.h:56
-// Called by throttler when it drains a socket and needs more data.
+// Called by the throttler when it drains a socket and needs more data.
 void CUploadDiskIOThread::SocketNeedsMoreData()
 {
 	wxMutexLocker lock(m_mutex);
@@ -108,53 +100,44 @@
 	m_condition.Signal();
 }
 
-
-// eMule ref: CUploadDiskIOThread::RunInternal() — line 84
-void* CUploadDiskIOThread::Entry()
+// eMule ref: CUploadDiskIOThread::RunInternal()
+void *CUploadDiskIOThread::Entry()
 {
 	m_bRun = true;
 
-	while (m_bRun)	// eMule ref: line 88
+	while (m_bRun) // eMule ref: line 88
 	{
-		// eMule ref: lines 92-109 — reset events, lock upload list, iterate clients
 		{
 			wxMutexLocker uploadLock(theApp->uploadqueue->GetUploadingListLock());
-			const CClientRefList& uploadList = theApp->uploadqueue->GetUploadingList();
+			const CClientRefList &uploadList = theApp->uploadqueue->GetUploadingList();
 
-			for (CClientRefList::const_iterator it = uploadList.begin(); it != uploadList.end(); ++it)
-			{
-				CUpDownClient* client = it->GetClient();
-				if (client != NULL && client->GetSocket() != NULL && client->IsConnected())
-				{
+			for (CClientRefList::const_iterator it = uploadList.begin(); it != uploadList.end();
+				++it) {
+				CUpDownClient *client = it->GetClient();
+				if (client != NULL && client->GetSocket() != NULL && client->IsConnected()) {
 					StartCreateNextBlockPackage(client);
 				}
 			}
 		}
 
-		// eMule ref: lines 112-143 — drain pending IO / finished IO
-		// Simplified: reads are synchronous, so m_listPendingIO doesn't exist.
-		// All completed reads are already in m_listFinishedIO.
-		while (!m_listFinishedIO.empty())	// eMule ref: line 142
+		// Reads are synchronous, so there is no m_listPendingIO: every completed
+		// read is already in m_listFinishedIO.
+		while (!m_listFinishedIO.empty()) // eMule ref: line 142
 		{
-			ReadRequest_Struct* req = m_listFinishedIO.front();
+			ReadRequest_Struct *req = m_listFinishedIO.front();
 			m_listFinishedIO.pop_front();
 			ReadCompletionRoutine(req);
 		}
 
-		// eMule ref: lines 146-149 — signal throttler if we put new data on a socket
-		if (m_bSignalThrottler && theApp->uploadBandwidthThrottler != NULL)
-		{
+		if (m_bSignalThrottler && theApp->uploadBandwidthThrottler != NULL) {
 			theApp->uploadBandwidthThrottler->NewUploadDataAvailable();
 			m_bSignalThrottler = false;
 		}
 
-		// eMule ref: line 152-155 — WaitForMultipleObjects(events, 500ms)
-		// Replaced with: wxCondition::WaitTimeout(500ms) with sticky-flag check.
-		// wxCondition::Signal() is a pure pulse — it is dropped if no thread is
-		// currently blocked in WaitTimeout(). The sticky flags (m_bNewBlocksPending,
-		// m_bSocketNeedsPending) are set under m_mutex by callers, so we check them
-		// before sleeping and skip the wait if a signal arrived since last iteration.
-		// 500ms matches eMule's WaitForMultipleObjects timeout.
+		// wxCondition::WaitTimeout(500ms) in place of eMule's WaitForMultipleObjects.
+		// Signal() is a pure pulse and is dropped if no thread is blocked in WaitTimeout(),
+		// so the callers set the sticky flags (m_bNewBlocksPending, m_bSocketNeedsPending)
+		// under m_mutex and we check them before sleeping.
 		{
 			wxMutexLocker lock(m_mutex);
 			if (m_bRun && !m_bNewBlocksPending && !m_bSocketNeedsPending) {
@@ -165,15 +148,17 @@
 		}
 	}
 
-	// Cleanup — eMule ref: lines 157-180
-	// No overlapped I/O to cancel. Just clear the open files list.
-	for (std::list<OpenFile_Struct*>::iterator it = m_listOpenFiles.begin(); it != m_listOpenFiles.end(); ++it) {
+	// Cleanup. No overlapped I/O to cancel, so just clear the open files list.
+	for (std::list<OpenFile_Struct *>::iterator it = m_listOpenFiles.begin(); it != m_listOpenFiles.end();
+		++it) {
 		delete *it;
 	}
 	m_listOpenFiles.clear();
 
 	// Discard any unprocessed finished reads
-	for (std::list<ReadRequest_Struct*>::iterator it = m_listFinishedIO.begin(); it != m_listFinishedIO.end(); ++it) {
+	for (std::list<ReadRequest_Struct *>::iterator it = m_listFinishedIO.begin();
+		it != m_listFinishedIO.end();
+		++it) {
 		delete *it;
 	}
 	m_listFinishedIO.clear();
@@ -181,88 +166,86 @@
 	return NULL;
 }
 
-
-// eMule ref: CUploadDiskIOThread::StartCreateNextBlockPackage() — line 185
-void CUploadDiskIOThread::StartCreateNextBlockPackage(CUpDownClient* client)
+// eMule ref: CUploadDiskIOThread::StartCreateNextBlockPackage()
+void CUploadDiskIOThread::StartCreateNextBlockPackage(CUpDownClient *client)
 {
-	// eMule ref: lines 188-189 — lock block lists
 	wxMutexLocker lockBlockLists(client->m_blockListLock);
 
-	// eMule ref: lines 192-207 — check payload buffer, early return if full
-	// eMule ref: lines 193-196 — GetQueueSessionPayloadUp() is probably outdated, so also
-	// add the value reported by the socket as sent since the last timer tick.
-	// PeekSentPayload() is non-resetting (does not consume the counter used by SendBlockData())
-	// and is protected by m_sendLocker. Calling from the disk thread is safe: we hold
-	// uploadLock (taken by Entry() before calling this function), which prevents the socket
-	// from being freed — disconnect/cleanup requires uploadLock. (eMule ref: line 187)
+	// GetQueueSessionPayloadUp() is probably outdated, so also add what the socket reports as
+	// sent since the last timer tick. PeekSentPayload() is non-resetting (it does not consume
+	// the counter SendBlockData() uses) and is protected by m_sendLocker. Calling it from the
+	// disk thread is safe: we hold uploadLock, taken by Entry() before this call, and
+	// disconnect/cleanup needs that lock.
 	sint64 nCurQueueSessionPayloadUp = client->m_nCurQueueSessionPayloadUp;
-	CClientTCPSocket* pSock = client->GetSocket();
+	CClientTCPSocket *pSock = client->GetSocket();
 	if (pSock != NULL)
 		nCurQueueSessionPayloadUp += (sint64)pSock->PeekSentPayload();
 	sint64 addedPayloadQueueSession = client->m_addedPayloadQueueSession;
 
-	// eMule ref: lines 199-201
 	bool bFastUpload = client->GetUploadDatarate() > BIGBUFFER_MINDATARATE;
-	const uint32 nBufferLimit = bFastUpload ? ((5 * EMBLOCKSIZE) + 1) : (EMBLOCKSIZE + 1);
+	// Send-ahead depth: how many blocks this thread primes into a fast slot's async send queue
+	// (1 otherwise). This is the upload-side in-flight depth -- the mirror of the leecher's
+	// request cap -- so it is bandwidth-delay-product limited: on a high-RTT link a shallow
+	// buffer drains before the next refill and caps throughput. eMule's 5 is a low-BDP default;
+	// 10 keeps a fast slot fed across moderate WAN RTTs. The cost is a transient ~1.8 MB of
+	// send-queue data per active fast slot, self-bounded by the OS TCP send buffer.
+	const uint32 nBufferLimit = bFastUpload ? ((10 * EMBLOCKSIZE) + 1) : (EMBLOCKSIZE + 1);
 
 	if (client->m_BlockRequests_queue.empty() ||
 		(addedPayloadQueueSession > nCurQueueSessionPayloadUp &&
-		 (uint32)(addedPayloadQueueSession - nCurQueueSessionPayloadUp) > nBufferLimit))
-	{
+			(uint32)(addedPayloadQueueSession - nCurQueueSessionPayloadUp) > nBufferLimit)) {
 		return;
 	}
 
 	try {
-		// eMule ref: lines 211-212 — buffer while below limit
 		while (!client->m_BlockRequests_queue.empty() &&
-			   (addedPayloadQueueSession <= nCurQueueSessionPayloadUp ||
-			    (uint32)(addedPayloadQueueSession - nCurQueueSessionPayloadUp) < nBufferLimit))
-		{
-			Requested_Block_Struct* currentblock = client->m_BlockRequests_queue.front();
-
-			// eMule ref: lines 215-223 — check file ID switch; defer to main thread
-			if (md4cmp(currentblock->FileID, client->GetUploadFileID().GetHash()) != 0)
-			{
-				AddDebugLogLineN(logClient, "CUploadDiskIOThread::StartCreateNextBlockPackage: Switched fileid, waiting for mainthread");
+			(addedPayloadQueueSession <= nCurQueueSessionPayloadUp ||
+				(uint32)(addedPayloadQueueSession - nCurQueueSessionPayloadUp) <
+					nBufferLimit)) {
+			Requested_Block_Struct *currentblock = client->m_BlockRequests_queue.front();
+
+			if (md4cmp(currentblock->FileID, client->GetUploadFileID().GetHash()) != 0) {
+				AddDebugLogLineN(logClient,
+					"CUploadDiskIOThread::StartCreateNextBlockPackage: Switched fileid, "
+					"waiting for mainthread");
 				return;
 			}
 
-			// eMule ref: lines 227-244 — resolve file from shared list
-			CKnownFile* srcfile = theApp->sharedfiles->GetFileByID(CMD4Hash(currentblock->FileID));
+			CKnownFile *srcfile =
+				theApp->sharedfiles->GetFileByID(CMD4Hash(currentblock->FileID));
 			if (srcfile == NULL) {
 				throw wxString("requested file not found");
 			}
 
-			CPartFile* srcPartFile = srcfile->IsPartFile() ? static_cast<CPartFile*>(srcfile) : NULL;
+			CPartFile *srcPartFile =
+				srcfile->IsPartFile() ? static_cast<CPartFile *>(srcfile) : NULL;
 
-			// eMule ref: lines 247-252 — validate block offsets
 			if (currentblock->EndOffset > srcfile->GetFileSize()) {
-				throw wxString(CFormat("Asked for data up to %d beyond end of file (%d)")
-					% currentblock->EndOffset % srcfile->GetFileSize());
+				throw wxString(CFormat("Asked for data up to %d beyond end of file (%d)") %
+					       currentblock->EndOffset % srcfile->GetFileSize());
 			} else if (currentblock->StartOffset > currentblock->EndOffset) {
-				throw wxString(CFormat("Asked for invalid block (start %d > end %d)")
-					% currentblock->StartOffset % currentblock->EndOffset);
+				throw wxString(CFormat("Asked for invalid block (start %d > end %d)") %
+					       currentblock->StartOffset % currentblock->EndOffset);
 			}
 
 			uint64 togo = currentblock->EndOffset - currentblock->StartOffset;
 			if (togo > EMBLOCKSIZE * 3) {
-				throw wxString(CFormat("Client requested too large block (%d > %d)")
-					% togo % (EMBLOCKSIZE * 3));
+				throw wxString(CFormat("Client requested too large block (%d > %d)") % togo %
+					       (EMBLOCKSIZE * 3));
 			}
 
-			// eMule ref: lines 256-298 — find/create file struct in m_listOpenFiles
-			// In eMule this opens a HANDLE; here we track per-file metadata only.
-			// CFileArea opens the file internally as needed.
-			OpenFile_Struct* pFileStruct = NULL;
-			for (std::list<OpenFile_Struct*>::iterator it = m_listOpenFiles.begin(); it != m_listOpenFiles.end(); ++it)
-			{
+			// In eMule this opens a HANDLE; here only per-file metadata is
+			// tracked, since CFileArea opens the file internally as needed.
+			OpenFile_Struct *pFileStruct = NULL;
+			for (std::list<OpenFile_Struct *>::iterator it = m_listOpenFiles.begin();
+				it != m_listOpenFiles.end();
+				++it) {
 				if (md4cmp((*it)->ucMD4FileHash, currentblock->FileID) == 0) {
 					pFileStruct = *it;
 					break;
 				}
 			}
-			if (pFileStruct == NULL)
-			{
+			if (pFileStruct == NULL) {
 				pFileStruct = new OpenFile_Struct;
 				md4cpy(pFileStruct->ucMD4FileHash, currentblock->FileID);
 				pFileStruct->nInUse = 0;
@@ -271,30 +254,55 @@
 				m_listOpenFiles.push_back(pFileStruct);
 			}
 
-			// eMule ref: lines 301-345 — ReadFile(OVERLAPPED) → replaced with CFileArea::ReadAt()
-			// Read is synchronous on this thread; go straight to m_listFinishedIO (no pending list).
-			ReadRequest_Struct* req = new ReadRequest_Struct;
+			// CFileArea::ReadAt() in place of eMule's ReadFile(OVERLAPPED). The read is
+			// synchronous on this thread, so it goes straight to m_listFinishedIO.
+			ReadRequest_Struct *req = new ReadRequest_Struct;
 			req->pFileStruct = pFileStruct;
 			req->pClient = client;
 			req->uStartOffset = currentblock->StartOffset;
 			req->uEndOffset = currentblock->EndOffset;
-			req->pBlock = currentblock;  // snapshot before moving to DoneBlocks_list
+			req->pBlock = currentblock; // snapshot before moving to DoneBlocks_list
 
 			if (srcPartFile) {
-				if (!srcPartFile->IsComplete(currentblock->StartOffset, currentblock->EndOffset - 1)) {
+				if (!srcPartFile->IsComplete(
+					    currentblock->StartOffset, currentblock->EndOffset - 1)) {
 					delete req;
-					throw wxString(CFormat("Asked for incomplete block (%d - %d)")
-						% currentblock->StartOffset % (currentblock->EndOffset - 1));
+					throw wxString(CFormat("Asked for incomplete block (%d - %d)") %
+						       currentblock->StartOffset %
+						       (currentblock->EndOffset - 1));
 				}
-				if (!srcPartFile->ReadData(req->area, currentblock->StartOffset, (uint32)togo)) {
+				bool handleClosed = false;
+				if (!srcPartFile->ReadData(req->area,
+					    currentblock->StartOffset,
+					    (uint32)togo,
+					    &handleClosed)) {
 					delete req;
+					// A closed handle means PerformFileComplete got there
+					// first: the download finished and the file is on its way
+					// to Incoming. That is not this client's fault, and
+					// throwing would set m_bIOError and have
+					// CUploadQueue::Process drop it, undoing the graceful
+					// SuspendUpload() that parked it on the waiting list to
+					// survive the completion. Defer to the main thread, as the
+					// file-id switch above does.
+					//
+					// Only for that specific failure: any other false is a real
+					// error and must still be reported as one.
+					if (handleClosed && srcPartFile->GetStatus() == PS_COMPLETING) {
+						AddDebugLogLineN(logClient,
+							"CUploadDiskIOThread::StartCreateNextBlockPackage:"
+							" file completing, waiting for mainthread");
+						return;
+					}
 					throw wxString("Failed to read from requested partfile");
 				}
 			} else {
 				CFileAutoClose file;
 				CPath fullname = srcfile->GetFilePath().JoinPaths(srcfile->GetFileName());
 				if (!file.Open(fullname, CFile::read)) {
-					AddLogLineN(CFormat(_("Failed to open file (%s), removing from list of shared files.")) % srcfile->GetFileName());
+					AddLogLineN(CFormat(_("Failed to open file (%s), removing from list "
+							      "of shared files.")) %
+						    srcfile->GetFileName());
 					theApp->sharedfiles->RemoveFile(srcfile);
 					delete req;
 					throw wxString("Failed to open requested file");
@@ -305,35 +313,33 @@
 
 			pFileStruct->nInUse++;
 
-			// Set upload file ID on the client — mirrors eMule's SetUploadFileID call in the main thread path
+			// Mirrors eMule's SetUploadFileID call in the main thread path.
 			client->SetUploadFileID(srcfile);
 
-			// eMule ref: line 343 — add to m_listFinishedIO (skipping m_listPendingIO)
 			m_listFinishedIO.push_back(req);
 
-			// eMule ref: lines 347-349
 			addedPayloadQueueSession += togo;
 			client->m_addedPayloadQueueSession += togo;
 			srcfile->statistic.AddTransferred(togo);
 			client->m_DoneBlocks_list.push_front(client->m_BlockRequests_queue.front());
 			client->m_BlockRequests_queue.pop_front();
 		}
-	} catch (const wxString& DEBUG_ONLY(error)) {
-		AddDebugLogLineN(logClient, CFormat("CUploadDiskIOThread: error for client '%s': %s")
-			% client->GetUserName() % error);
+	} catch (const wxString &DEBUG_ONLY(error)) {
+		AddDebugLogLineN(logClient,
+			CFormat("CUploadDiskIOThread: error for client '%s': %s") % client->GetUserName() %
+				error);
 		client->m_bIOError = true;
-	} catch (const CIOFailureException& error) {
+	} catch (const CIOFailureException &error) {
 		AddDebugLogLineC(logClient, "CUploadDiskIOThread: IO failure: " + error.what());
 		client->m_bIOError = true;
-	} catch (const CEOFException&) {
+	} catch (const CEOFException &) {
 		AddDebugLogLineN(logClient, "CUploadDiskIOThread: EOF reading block");
 		client->m_bIOError = true;
 	}
 }
 
-
-// eMule ref: CUploadDiskIOThread::ReadCompletetionRoutine() — line 369
-void CUploadDiskIOThread::ReadCompletionRoutine(ReadRequest_Struct* req)
+// eMule ref: CUploadDiskIOThread::ReadCompletetionRoutine()
+void CUploadDiskIOThread::ReadCompletionRoutine(ReadRequest_Struct *req)
 {
 	if (req == NULL) {
 		wxASSERT(false);
@@ -342,16 +348,14 @@
 
 	bool bError = false;
 
-	// eMule ref: lines 388-406 — check client is still in upload list
-	// Hold uploadLock through SendPacket to prevent the socket from being freed
-	// by a concurrent disconnect; matches eMule's design (lock scope to line 482).
+	// Check the client is still in the upload list, and hold uploadLock through SendPacket so a
+	// concurrent disconnect cannot free the socket; matches eMule's lock scope.
 	{
 		wxMutexLocker uploadLock(theApp->uploadqueue->GetUploadingListLock());
-		const CClientRefList& uploadList = theApp->uploadqueue->GetUploadingList();
+		const CClientRefList &uploadList = theApp->uploadqueue->GetUploadingList();
 
 		bool bFound = false;
-		for (CClientRefList::const_iterator it = uploadList.begin(); it != uploadList.end(); ++it)
-		{
+		for (CClientRefList::const_iterator it = uploadList.begin(); it != uploadList.end(); ++it) {
 			if (it->GetClient() == req->pClient) {
 				bFound = true;
 				break;
@@ -359,89 +363,89 @@
 		}
 
 		if (!bFound) {
-			AddDebugLogLineN(logClient, "CUploadDiskIOThread::ReadCompletionRoutine: Client not found in uploadlist anymore, discarding block");
+			AddDebugLogLineN(logClient,
+				"CUploadDiskIOThread::ReadCompletionRoutine: Client not found in uploadlist "
+				"anymore, discarding block");
 			bError = true;
 		}
 
-		// eMule ref: lines 408-482 — create packets and send
-		if (!bError)
-		{
-			CUpDownClient* client = req->pClient;
-			CClientTCPSocket* pSocket = client->GetSocket();
+		if (!bError) {
+			CUpDownClient *client = req->pClient;
+			CClientTCPSocket *pSocket = client->GetSocket();
 
-			// eMule ref: lines 420-422 — check socket still connected
 			if (pSocket == NULL || !client->IsConnected()) {
-				AddDebugLogLineN(logClient, "CUploadDiskIOThread::ReadCompletionRoutine: Client has no connected socket");
+				AddDebugLogLineN(logClient,
+					"CUploadDiskIOThread::ReadCompletionRoutine: Client has no connected "
+					"socket");
 				bError = true;
 				client->m_bIOError = true;
 			}
 
-			if (!bError)
-			{
-				// eMule ref: lines 428-447 — decide compression
-				// Disable compression if socket is starved and data rate is high.
-				// Once disabled for a client, stays disabled for the session.
+			if (!bError) {
+				// Disable compression if the socket is starved and the data rate is
+				// high. Once disabled for a client it stays disabled for the session.
 				bool bUseCompression = false;
-				if (!client->m_bDisableCompression && req->pFileStruct->bCompress && client->m_byDataCompVer == 1)
-				{
-					if ((sint32)m_listFinishedIO.size() > MAX_FINISHED_REQUESTS_COMPRESSION &&
-						theStats::GetUploadRate() > SLOT_COMPRESSIONCHECK_DATARATE)
-					{
+				if (!client->m_bDisableCompression && req->pFileStruct->bCompress &&
+					client->m_byDataCompVer == 1) {
+					if ((sint32)m_listFinishedIO.size() >
+							MAX_FINISHED_REQUESTS_COMPRESSION &&
+						theStats::GetUploadRate() > SLOT_COMPRESSIONCHECK_DATARATE) {
 						client->m_bDisableCompression = true;
-					}
-					else if (client->GetUploadDatarate() > SLOT_COMPRESSIONCHECK_DATARATE &&
-						     pSocket != NULL && !pSocket->HasQueues(true) && !pSocket->IsBusyQuickCheck())
-					{
+					} else if (client->GetUploadDatarate() >
+							   SLOT_COMPRESSIONCHECK_DATARATE &&
+						   pSocket != NULL && !pSocket->HasQueues(true) &&
+						   !pSocket->IsBusyQuickCheck()) {
 						client->m_bDisableCompression = true;
-					}
-					else {
+					} else {
 						bUseCompression = true;
 					}
 				}
 
-				// eMule ref: lines 454-470 — CreateStandardPackets() or CreatePackedPackets()
-				// Build packets into a local list, then send them out.
-				// File ID was set in StartCreateNextBlockPackage when srcfile was resolved.
+				// Build packets into a local list, then send them out. The file ID was
+				// set in StartCreateNextBlockPackage when srcfile was resolved.
 				CPacketList packetList;
 				uint32 data_rate = client->GetUploadDatarate();
 				if (bUseCompression) {
 					CreatePackedPackets(req->area.GetBuffer(),
-						req->uStartOffset, req->uEndOffset, packetList,
-						req->pFileStruct->ucMD4FileHash, data_rate);
+						req->uStartOffset,
+						req->uEndOffset,
+						packetList,
+						req->pFileStruct->ucMD4FileHash,
+						data_rate);
 				} else {
 					CreateStandardPackets(req->area.GetBuffer(),
-						req->uStartOffset, req->uEndOffset, packetList,
-						req->pFileStruct->ucMD4FileHash, data_rate);
+						req->uStartOffset,
+						req->uEndOffset,
+						packetList,
+						req->pFileStruct->ucMD4FileHash,
+						data_rate);
 				}
 
-				// eMule ref: lines 478-482 — send all packets
-				for (CPacketList::iterator it = packetList.begin(); it != packetList.end(); ++it)
-				{
+				for (CPacketList::iterator it = packetList.begin(); it != packetList.end();
+					++it) {
 					theStats::AddUploadToSoft(client->GetClientSoft(), it->second);
 					pSocket->SendPacket(it->first, true, false, it->second);
 				}
 
-				// eMule ref: line 471
 				m_bSignalThrottler = true;
 			}
 		}
 	} // uploadLock released here
 
-	// eMule ref: line 493 — ReleaseOvOpenFile
 	ReleaseOpenFile(req->pFileStruct);
 	delete req;
 }
 
-
-// eMule ref: CUploadDiskIOThread::ReleaseOvOpenFile() — line 498
-bool CUploadDiskIOThread::ReleaseOpenFile(OpenFile_Struct* pFileStruct)
+// eMule ref: CUploadDiskIOThread::ReleaseOvOpenFile()
+bool CUploadDiskIOThread::ReleaseOpenFile(OpenFile_Struct *pFileStruct)
 {
-	for (std::list<OpenFile_Struct*>::iterator it = m_listOpenFiles.begin(); it != m_listOpenFiles.end(); ++it)
-	{
+	for (std::list<OpenFile_Struct *>::iterator it = m_listOpenFiles.begin(); it != m_listOpenFiles.end();
+		++it) {
 		if (*it == pFileStruct) {
 			pFileStruct->nInUse--;
 			if (pFileStruct->nInUse == 0) {
-				// eMule: CloseHandle(hFile). We have no persistent handle — CFileArea already closed.
+				// eMule closes its handle here; we have no persistent one, CFileArea
+				// having already closed.
 				m_listOpenFiles.erase(it);
 				delete pFileStruct;
 			}
@@ -452,24 +456,27 @@
 	return false;
 }
 
-
 // eMule 0.70b ref: CUploadDiskIOThread::CreateStandardPackets()
-void CUploadDiskIOThread::CreateStandardPackets(const uint8_t* buffer, uint64 startOffset, uint64 endOffset, CPacketList& packetList, const uint8_t* fileHash, uint32 uploadDatarate)
+void CUploadDiskIOThread::CreateStandardPackets(const uint8_t *buffer,
+	uint64 startOffset,
+	uint64 endOffset,
+	CPacketList &packetList,
+	const uint8_t *fileHash,
+	uint32 uploadDatarate)
 {
 	uint32 togo = (uint32)(endOffset - startOffset);
 
 	CMemFile memfile(buffer, togo);
-	// Adaptive chunk size: scale with per-slot speed, floor 10 KiB, ceil EMBLOCKSIZE.
-	// /8 => ~125 ms of data per chunk; enough to saturate a TCP segment burst
-	// without making per-packet latency awful on slow peers.
-	// uploadDatarate is 0 at session start; the floor keeps behavior sane.
-	// Ceiling at EMBLOCKSIZE (180 KiB): one packet per block — no benefit
-	// in going higher since the receiver requests blocks of this size.
+	// Adaptive chunk size: scale with per-slot speed, floor 10 KiB, ceil EMBLOCKSIZE. /8 is
+	// ~125 ms of data per chunk, enough to saturate a TCP segment burst without making per-
+	// packet latency awful on slow peers, and the floor keeps it sane while uploadDatarate is
+	// still 0. Going past EMBLOCKSIZE buys nothing, since the receiver requests blocks of
+	// exactly that size.
 	const uint32 chunkSize = std::min(std::max(uploadDatarate / 8u, 10240u), (uint32)EMBLOCKSIZE);
 	uint32 nPacketSize = (togo <= chunkSize + 2600u) ? togo : chunkSize;
 
-	while (togo){
-		if (togo < nPacketSize*2) {
+	while (togo) {
+		if (togo < nPacketSize * 2) {
 			nPacketSize = togo;
 		}
 
@@ -493,24 +500,30 @@
 		char *tempbuf = new charnPacketSize;
 		memfile.Read(tempbuf, nPacketSize);
 		data.Write(tempbuf, nPacketSize);
-		delete  tempbuf;
-		CPacket* packet = new CPacket(data, (bLargeBlocks ? OP_EMULEPROT : OP_EDONKEYPROT), (bLargeBlocks ? (uint8)OP_SENDINGPART_I64 : (uint8)OP_SENDINGPART));
+		delete tempbuf;
+		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));
 		packetList.push_back(std::make_pair(packet, nPacketSize));
 	}
 }
 
-
 // eMule 0.70b ref: CUploadDiskIOThread::CreatePackedPackets()
-void CUploadDiskIOThread::CreatePackedPackets(const uint8_t* buffer, uint64 startOffset, uint64 endOffset, CPacketList& packetList, const uint8_t* fileHash, uint32 uploadDatarate)
+void CUploadDiskIOThread::CreatePackedPackets(const uint8_t *buffer,
+	uint64 startOffset,
+	uint64 endOffset,
+	CPacketList &packetList,
+	const uint8_t *fileHash,
+	uint32 uploadDatarate)
 {
 	uint32 togo = (uint32)(endOffset - startOffset);
-	uLongf newsize = togo+300;
+	uLongf newsize = togo + 300;
 	CScopedArray<uint8_t> output(newsize);
-	// eMule 0.70b: use compression level 1 instead of 9 — for typical 10240-byte
+	// eMule 0.70b: use compression level 1 instead of 9 -- for typical 10240-byte
 	// blocks the size difference is small (~4-12%) but level 1 is 1.5-2.5x faster.
 	uint16 result = compress2(output.get(), &newsize, buffer, togo, 1);
-	if (result != Z_OK || togo <= newsize){
+	if (result != Z_OK || togo <= newsize) {
 		CreateStandardPackets(buffer, startOffset, endOffset, packetList, fileHash, uploadDatarate);
 		return;
 	}
@@ -520,12 +533,12 @@
 	uint32 totalPayloadSize = 0;
 	uint32 oldSize = togo;
 	togo = newsize;
-	// Adaptive chunk size — see CreateStandardPackets for rationale.
+	// Adaptive chunk size -- see CreateStandardPackets for rationale.
 	const uint32 chunkSize = std::min(std::max(uploadDatarate / 8u, 10240u), (uint32)EMBLOCKSIZE);
 	uint32 nPacketSize = (togo <= chunkSize + 2600u) ? togo : chunkSize;
 
 	while (togo) {
-		if (togo < nPacketSize*2) {
+		if (togo < nPacketSize * 2) {
 			nPacketSize = togo;
 		}
 		togo -= nPacketSize;
@@ -542,17 +555,16 @@
 		data.WriteUInt32(newsize);
 		char *tempbuf = new charnPacketSize;
 		memfile.Read(tempbuf, nPacketSize);
-		data.Write(tempbuf,nPacketSize);
-		delete  tempbuf;
-		CPacket* packet = new CPacket(data, OP_EMULEPROT, (isLargeBlock ? OP_COMPRESSEDPART_I64 : OP_COMPRESSEDPART));
+		data.Write(tempbuf, nPacketSize);
+		delete tempbuf;
+		CPacket *packet = new CPacket(
+			data, OP_EMULEPROT, (isLargeBlock ? OP_COMPRESSEDPART_I64 : OP_COMPRESSEDPART));
 
-		// approximate payload size
-		uint32 payloadSize = static_cast<uint32>(
-			(static_cast<uint64>(nPacketSize) * oldSize) /
-			newsize);
+		uint32 payloadSize =
+			static_cast<uint32>((static_cast<uint64>(nPacketSize) * oldSize) / newsize);
 
-		if (togo == 0 && totalPayloadSize+payloadSize < oldSize) {
-			payloadSize = oldSize-totalPayloadSize;
+		if (togo == 0 && totalPayloadSize + payloadSize < oldSize) {
+			payloadSize = oldSize - totalPayloadSize;
 		}
 
 		totalPayloadSize += payloadSize;

amule-3.0.1.tar.gz/src/UploadDiskIOThread.h -> amule-3.1.0.tar.gz/src/UploadDiskIOThread.h Changed

@@ -27,48 +27,49 @@
 #define UPLOADDISKIOTHREAD_H
 
 #include <list>
-#include <utility>		// Needed for std::pair
+#include <atomic>
+#include <utility> // Needed for std::pair
 
 #include <wx/thread.h>
 
 #include "Types.h"
-#include "FileArea.h"	// Needed for CFileArea
+#include "FileArea.h" // Needed for CFileArea
 
 class CPacket;
 class CUpDownClient;
 
-// Mirrors eMule's OpenOvFile_Struct (UploadDiskIOThread.h:20-28)
-// HANDLE hFile replaced with aMule's file-open-on-demand model:
-// we don't cache file handles; CFileArea opens/closes as needed.
+// Mirrors eMule's OpenOvFile_Struct (UploadDiskIOThread.h:20-28). HANDLE hFile is replaced with
+// aMule's file-open-on-demand model: we cache no file handles, CFileArea opens and closes as
+// needed.
 struct OpenFile_Struct
 {
-	uint8    ucMD4FileHash16;
-	uint32   nInUse;
-	uint64   uFileSize;
-	bool     bCompress;             // true if this file type should be compressed
+	uint8 ucMD4FileHash16;
+	uint32 nInUse;
+	uint64 uFileSize;
+	bool bCompress; // true if this file type should be compressed
 };
 
 struct Requested_Block_Struct;
 
 // Mirrors eMule's OverlappedEx_Struct (UploadDiskIOThread.h:32-41)
-// OVERLAPPED removed — reads are synchronous on this thread via CFileArea.
+// OVERLAPPED removed -- reads are synchronous on this thread via CFileArea.
 struct ReadRequest_Struct
 {
-	OpenFile_Struct*          pFileStruct;
-	CUpDownClient*            pClient;
-	uint64                    uStartOffset;
-	uint64                    uEndOffset;
-	Requested_Block_Struct*   pBlock;      // the block this IO is for (set in StartCreateNextBlockPackage)
-	CFileArea                 area;        // holds read buffer; replaces BYTE* pBuffer + OVERLAPPED
+	OpenFile_Struct *pFileStruct;
+	CUpDownClient *pClient;
+	uint64 uStartOffset;
+	uint64 uEndOffset;
+	Requested_Block_Struct *pBlock; // the block this IO is for (set in StartCreateNextBlockPackage)
+	CFileArea area;                 // holds read buffer; replaces BYTE* pBuffer + OVERLAPPED
 };
 
-// Packet + payload-size pair, used by the static packet-creation helpers.
-// Mirrors eMule's CPacketList + Packet::uStatsPayLoad approach; aMule's CPacket
-// has no uStatsPayLoad member so we carry the value alongside the pointer.
-typedef std::list< std::pair<CPacket*, uint32> > CPacketList;
+// Packet + payload-size pair, used by the static packet-creation helpers. Mirrors eMule's
+// CPacketList + Packet::uStatsPayLoad approach; aMule's CPacket has no uStatsPayLoad member, so we
+// carry the value alongside the pointer.
+typedef std::list<std::pair<CPacket *, uint32>> CPacketList;
 
-// Port of eMule's CUploadDiskIOThread (UploadDiskIOThread.h:48-86).
-// Windows primitives replaced with wxWidgets equivalents:
+// Port of eMule's CUploadDiskIOThread (UploadDiskIOThread.h:48-86). Windows primitives replaced
+// with wxWidgets equivalents:
 //   CWinThread           -> wxThread (joinable)
 //   CEvent               -> wxCondition + wxMutex
 //   WaitForMultipleObjects -> wxCondition::WaitTimeout()
@@ -81,36 +82,46 @@
 	CUploadDiskIOThread();
 	~CUploadDiskIOThread();
 
-	void EndThread();                  // eMule ref: UploadDiskIOThread.cpp:77
-	void NewBlockRequestsAvailable();  // eMule ref: UploadDiskIOThread.h:55
-	void SocketNeedsMoreData();        // eMule ref: UploadDiskIOThread.h:56
+	void EndThread();                 // eMule ref: UploadDiskIOThread.cpp:77
+	void NewBlockRequestsAvailable(); // eMule ref: UploadDiskIOThread.h:55
+	void SocketNeedsMoreData();       // eMule ref: UploadDiskIOThread.h:56
 
-	// eMule ref: UploadDiskIOThread.h:72-73 — static packet creation helpers
+	// eMule ref: UploadDiskIOThread.h:72-73 -- static packet creation helpers
 	// uploadDatarate (bytes/s) scales per-packet chunk size (10 KiB floor, 128 KiB ceiling).
-	static void CreateStandardPackets(const uint8_t* buffer, uint64 startOffset, uint64 endOffset, CPacketList& packetList, const uint8_t* fileHash, uint32 uploadDatarate = 0);
-	static void CreatePackedPackets(const uint8_t* buffer, uint64 startOffset, uint64 endOffset, CPacketList& packetList, const uint8_t* fileHash, uint32 uploadDatarate = 0);
+	static void CreateStandardPackets(const uint8_t *buffer,
+		uint64 startOffset,
+		uint64 endOffset,
+		CPacketList &packetList,
+		const uint8_t *fileHash,
+		uint32 uploadDatarate = 0);
+	static void CreatePackedPackets(const uint8_t *buffer,
+		uint64 startOffset,
+		uint64 endOffset,
+		CPacketList &packetList,
+		const uint8_t *fileHash,
+		uint32 uploadDatarate = 0);
 
 private:
-	void* Entry() override;            // replaces RunProc/RunInternal
+	void *Entry() override; // replaces RunProc/RunInternal
 
-	void StartCreateNextBlockPackage(CUpDownClient* client);           // eMule ref: line 185
-	void ReadCompletionRoutine(ReadRequest_Struct* req);               // eMule ref: line 369
-	bool ReleaseOpenFile(OpenFile_Struct* pFileStruct);                // eMule ref: line 498
+	void StartCreateNextBlockPackage(CUpDownClient *client); // eMule ref: line 185
+	void ReadCompletionRoutine(ReadRequest_Struct *req);     // eMule ref: line 369
+	bool ReleaseOpenFile(OpenFile_Struct *pFileStruct);      // eMule ref: line 498
 
-	volatile bool   m_bRun;            // eMule ref: m_bRun (line 77)
-	bool            m_bSignalThrottler;// eMule ref: m_bSignalThrottler (line 78)
+	std::atomic<bool> m_bRun{ false }; // eMule ref: m_bRun (line 77)
+	bool m_bSignalThrottler;           // eMule ref: m_bSignalThrottler (line 78)
 
-	wxMutex         m_mutex;
-	wxCondition     m_condition;       // replaces m_eventNewBlockRequests + m_eventSocketNeedsData
+	wxMutex m_mutex;
+	wxCondition m_condition; // replaces m_eventNewBlockRequests + m_eventSocketNeedsData
 	// Sticky flags: set by Signal() callers, consumed by Entry() before sleeping.
 	// Prevents lost wakeups when signal arrives before WaitTimeout() is entered.
-	bool            m_bNewBlocksPending;   // set by NewBlockRequestsAvailable()
-	bool            m_bSocketNeedsPending; // set by SocketNeedsMoreData()
-	// m_eventAsyncIOFinished not needed — reads complete synchronously on this thread
+	bool m_bNewBlocksPending;   // set by NewBlockRequestsAvailable()
+	bool m_bSocketNeedsPending; // set by SocketNeedsMoreData()
+	// m_eventAsyncIOFinished not needed -- reads complete synchronously on this thread
 
-	std::list<OpenFile_Struct*>       m_listOpenFiles;   // eMule ref: line 83
-	std::list<ReadRequest_Struct*>    m_listFinishedIO;  // eMule ref: line 85
-	// m_listPendingIO not needed — reads are synchronous, go straight to m_listFinishedIO
+	std::list<OpenFile_Struct *> m_listOpenFiles;     // eMule ref: line 83
+	std::list<ReadRequest_Struct *> m_listFinishedIO; // eMule ref: line 85
+	// m_listPendingIO not needed -- reads are synchronous, go straight to m_listFinishedIO
 };
 
 #endif

amule-3.0.1.tar.gz/src/UploadQueue.cpp -> amule-3.1.0.tar.gz/src/UploadQueue.cpp Changed

@@ -23,7 +23,8 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "UploadQueue.h"	// Interface declarations
+#include "UploadQueue.h" // Interface declarations
+#include "UploadQueueAddressPolicy.h"
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
@@ -32,36 +33,35 @@
 
 #include <cmath>
 
-#include "Types.h"		// Do_not_auto_remove (win32)
+#include "Types.h" // Do_not_auto_remove (win32)
 
 #ifdef __WINDOWS__
-	#include <winsock2.h>	// Do_not_auto_remove (htonl/ntohs/inet_addr) — legacy <winsock.h> pulls <windows.h> and trips winsock2.h:15 via later wx includes
+#include <winsock2.h> // Do_not_auto_remove (htonl/ntohs/inet_addr) -- legacy <winsock.h> pulls <windows.h> and trips winsock2.h:15 via later wx includes
 #else
-	#include <sys/types.h>	// Do_not_auto_remove
-	#include <netinet/in.h>	// Do_not_auto_remove
-	#include <arpa/inet.h>	// Do_not_auto_remove
+#include <sys/types.h>  // Do_not_auto_remove
+#include <netinet/in.h> // Do_not_auto_remove
+#include <arpa/inet.h>  // Do_not_auto_remove
 #endif
 
-#include "ServerConnect.h"	// Needed for CServerConnect
-#include "KnownFile.h"		// Needed for CKnownFile
-#include "Packet.h"		// Needed for CPacket
-#include "ClientTCPSocket.h"	// Needed for CClientTCPSocket
-#include "SharedFileList.h"	// Needed for CSharedFileList
-#include "updownclient.h"	// Needed for CUpDownClient
-#include "amule.h"		// Needed for theApp
+#include "ServerConnect.h"   // Needed for CServerConnect
+#include "KnownFile.h"       // Needed for CKnownFile
+#include "Packet.h"          // Needed for CPacket
+#include "ClientTCPSocket.h" // Needed for CClientTCPSocket
+#include "SharedFileList.h"  // Needed for CSharedFileList
+#include "updownclient.h"    // Needed for CUpDownClient
+#include "amule.h"           // Needed for theApp
 #include "Preferences.h"
 #include "ClientList.h"
-#include "Statistics.h"		// Needed for theStats
+#include "Statistics.h" // Needed for theStats
 #include "Logger.h"
 #include <common/Format.h>
 #include "UploadBandwidthThrottler.h"
-#include "GuiEvents.h"		// Needed for Notify_*
+#include "GuiEvents.h" // Needed for Notify_*
 #include "ListenSocket.h"
 #include "DownloadQueue.h"
 #include "PartFile.h"
 
-
-//TODO rewrite the whole networkcode, use overlapped sockets
+// TODO rewrite the whole networkcode, use overlapped sockets
 
 CUploadQueue::CUploadQueue()
 {
@@ -72,19 +72,18 @@
 	m_allUploadingKnownFile = new CKnownFile;
 }
 
-
-void CUploadQueue::SortGetBestClient(CClientRef * bestClient)
+void CUploadQueue::SortGetBestClient(CClientRef *bestClient)
 {
 	uint64 tick = GetTickCount64();
 	m_lastSort = tick;
 	CClientRefList::iterator it = m_waitinglist.begin();
-	for (; it != m_waitinglist.end(); ) {
+	for (; it != m_waitinglist.end();) {
 		CClientRefList::iterator it2 = it++;
-		CUpDownClient* cur_client = it2->GetClient();
+		CUpDownClient *cur_client = it2->GetClient();
 
 		// clear dead clients
-		if (tick - cur_client->GetLastUpRequest() > MAX_PURGEQUEUETIME
-			|| !theApp->sharedfiles->GetFileByID(cur_client->GetUploadFileID())) {
+		if (tick - cur_client->GetLastUpRequest() > MAX_PURGEQUEUETIME ||
+			!theApp->sharedfiles->GetFileByID(cur_client->GetUploadFileID())) {
 			cur_client->ClearWaitStartTime();
 			RemoveFromWaitingQueue(it2);
 			if (!cur_client->GetSocket()) {
@@ -96,20 +95,18 @@
 			continue;
 		}
 
-		if (cur_client->IsBanned() || IsSuspended(cur_client->GetUploadFileID())) { // Banned client or suspended upload ?
+		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 {
@@ -119,15 +116,13 @@
 		}
 	}
 
-	// Second Pass:
-	// - calculate queue rank
-	// - find best high id client
-	// - mark all better low id clients as enabled for upload
+	// Second pass: calculate queue rank, find the best high id client, and 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(); ) {
+	for (it = m_waitinglist.begin(); it != m_waitinglist.end();) {
 		CClientRefList::iterator it2 = it++;
-		CUpDownClient* cur_client = it2->GetClient();
+		CUpDownClient *cur_client = it2->GetClient();
 		cur_client->SetUploadQueueWaitingPosition(rank++);
 		if (bestClientFound) {
 			// There's a better high id client
@@ -141,7 +136,8 @@
 				bestClientFound = true;
 				cur_client->m_bAddNextConnect = false;
 				if (bestClient) {
-					bestClient->Link(cur_client CLIENT_DEBUGSTRING("CUploadQueue::SortGetBestClient"));
+					bestClient->Link(cur_client CLIENT_DEBUGSTRING(
+						"CUploadQueue::SortGetBestClient"));
 					RemoveFromWaitingQueue(it2);
 					rank--;
 					lastupslotHighID = true; // VQB LowID alternate
@@ -153,22 +149,18 @@
 #ifdef __DEBUG__
 	AddDebugLogLineN(logLocalClient, CFormat("Current UL queue (%d):") % (rank - 1));
 	for (it = m_waitinglist.begin(); it != m_waitinglist.end(); ++it) {
-		CUpDownClient* c = it->GetClient();
-		AddDebugLogLineN(logLocalClient, CFormat("%4d %7d  %s %5d  %s")
-			% c->GetUploadQueueWaitingPosition()
-			% c->GetScore()
-			% (c->HasLowID() ? (c->IsConnected() ? "LoCon" : "LowId") : "High ")
-			% c->ECID()
-			% c->GetUserName()
-			);
-	}
-#endif	// __DEBUG__
+		CUpDownClient *c = it->GetClient();
+		AddDebugLogLineN(logLocalClient,
+			CFormat("%4d %7d  %s %5d  %s") % c->GetUploadQueueWaitingPosition() % c->GetScore() %
+				(c->HasLowID() ? (c->IsConnected() ? "LoCon" : "LowId") : "High ") %
+				c->ECID() % c->GetUserName());
+	}
+#endif // __DEBUG__
 }
 
-
-void CUploadQueue::AddUpNextClient(CUpDownClient* directadd)
+void CUploadQueue::AddUpNextClient(CUpDownClient *directadd)
 {
-	CUpDownClient* newclient = NULL;
+	CUpDownClient *newclient = NULL;
 	CClientRef newClientRef;
 	// select next client or use given client
 	if (!directadd) {
@@ -178,10 +170,11 @@
 		if (!newclient) {
 			// Nothing to upload. Try to find something from the sources.
 			if (PopulatePossiblyWaitingList() > 0) {
-				newClientRef = * m_possiblyWaitingList.begin();
+				newClientRef = *m_possiblyWaitingList.begin();
 				m_possiblyWaitingList.pop_front();
 				newclient = newClientRef.GetClient();
-				AddDebugLogLineN( logLocalClient, "Added client from possiblyWaitingList " + newclient->GetFullIP() );
+				AddDebugLogLineN(logLocalClient,
+					"Added client from possiblyWaitingList " + newclient->GetFullIP());
 			}
 		}
 #endif
@@ -191,8 +184,8 @@
 	} else {
 		// Check if requested file is suspended or not shared (maybe deleted recently)
 
-		if (IsSuspended(directadd->GetUploadFileID())
-			|| !theApp->sharedfiles->GetFileByID(directadd->GetUploadFileID())) {
+		if (IsSuspended(directadd->GetUploadFileID()) ||
+			!theApp->sharedfiles->GetFileByID(directadd->GetUploadFileID())) {
 			return;
 		} else {
 			newclient = directadd;
@@ -209,10 +202,11 @@
 			return;
 		}
 	} else {
-		CPacket* packet = new CPacket(OP_ACCEPTUPLOADREQ, 0, OP_EDONKEYPROT);
+		CPacket *packet = new CPacket(OP_ACCEPTUPLOADREQ, 0, OP_EDONKEYPROT);
 		theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-		AddDebugLogLineN( logLocalClient, "Local Client: OP_ACCEPTUPLOADREQ to " + newclient->GetFullIP() );
-		newclient->SendPacket(packet,true);
+		AddDebugLogLineN(
+			logLocalClient, "Local Client: OP_ACCEPTUPLOADREQ to " + newclient->GetFullIP());
+		newclient->SendPacket(packet, true);
 		newclient->SetUploadState(US_UPLOADING);
 	}
 	newclient->SetUpStartTime();
@@ -221,14 +215,14 @@
 	{
 		// Guard against concurrent iteration by the disk I/O thread.
 		wxMutexLocker lock(m_uploadingListMutex);
-		theApp->uploadBandwidthThrottler->AddToStandardList(m_uploadinglist.size(), newclient->GetSocket());
+		theApp->uploadBandwidthThrottler->AddToStandardList(
+			m_uploadinglist.size(), newclient->GetSocket());
 		m_uploadinglist.push_back(CCLIENTREF(newclient, "CUploadQueue::AddUpNextClient"));
 	}
 	m_allUploadingKnownFile->AddUploadingClient(newclient);
 	theStats::AddUploadingClient();
 
-	// Statistic
-	CKnownFile* reqfile = const_cast<CKnownFile*>(newclient->GetUploadFile());
+	CKnownFile *reqfile = const_cast<CKnownFile *>(newclient->GetUploadFile());
 	if (reqfile) {
 		reqfile->statistic.AddAccepted();
 	}
@@ -241,13 +235,11 @@
 	// Check if someone's waiting, if there is a slot for him,
 	// or if we should try to free a slot for him
 	uint64 tick = GetTickCount64();
-	// Nobody waiting or upload started recently
-	// (Actually instead of "empty" it should check for "no HighID clients queued",
-	//  but the cost for that outweighs 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.
+	// Nobody waiting, or an upload started recently. (This should really check for "no HighID
+	// clients queued", but the cost outweighs the benefit: as it is, a slot is freed even when
+	// the whole queue is LowID and cannot take it -- just one, and the kicked client gets it
+	// straight back if it has HighID.) Running out of sockets stops new clients being added,
+	// but does not kick existing ones, or uploading would cease at once.
 #if EXTENDED_UPLOADQUEUE
 	if (tick - m_nLastStartUpload < 1000
 #else
@@ -255,12 +247,12 @@
 #endif
 		|| theApp->listensocket->TooManySockets()) {
 		m_allowKicking = false;
-	// Already a slot free, try to fill it
+		// 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
+		// All slots taken, try to free one
 	} else {
 		m_allowKicking = true;
 	}
@@ -269,12 +261,13 @@
 	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++->GetClient();
+		CUpDownClient *cur_client = it++->GetClient();
 
-		// It seems chatting or friend slots can get stuck at times in upload.. This needs looked into..
+		// It seems chatting or friend slots can get stuck at times in upload.. This needs looked
+		// into..
 		if (!cur_client->GetSocket()) {
 			RemoveFromUploadQueue(cur_client);
-			if(cur_client->Disconnected(_T("CUploadQueue::Process"))){
+			if (cur_client->Disconnected(_T("CUploadQueue::Process"))) {
 				cur_client->Safe_Delete();
 			}
 		} else if (cur_client->m_bIOError) {
@@ -289,28 +282,24 @@
 	uint64 sentBytes = theApp->uploadBandwidthThrottler->GetNumberOfSentBytesSinceLastCallAndReset();
 	(void)theApp->uploadBandwidthThrottler->GetNumberOfSentBytesOverheadSinceLastCallAndReset();
 
-	// Update statistics
 	if (sentBytes) {
 		theStats::AddSentBytes(sentBytes);
 	}
 
 	// Periodically resort queue if it doesn't happen anyway
-	if ((sint64) (tick - m_lastSort) > MIN2MS(2)) {
+	if ((sint64)(tick - m_lastSort) > MIN2MS(2)) {
 		SortGetBestClient();
 	}
 }
 
-
 uint32 CUploadQueue::GetMaxSlots() const
 {
 	uint32 nMaxSlots = 0;
 	float kBpsUpPerClient = (float)thePrefs::GetSlotAllocation();
 	if (thePrefs::GetMaxUpload() == UNLIMITED) {
-		// Speed-based formula plus a floor. The raw "currentRate / slotRate + 2"
-		// is a chicken-and-egg trap: with 0 B/s observed uplink we'd cap at 2 slots,
-		// which can't carry enough parallel TCP flows to break cold-start and let
-		// the uplink ramp up. Floor at N_FLOOR slots regardless of measured rate so
-		// there is always enough concurrency for the ramp.
+		// Speed-based formula plus a floor. The raw "currentRate / slotRate + 2" is a
+		// chicken-and-egg trap: with 0 B/s observed uplink it caps at 2 slots, too few
+		// parallel TCP flows to break cold-start and let the uplink ramp up.
 		const uint32 N_FLOOR = 20;
 		float kBpsUp = theStats::GetUploadRate() / 1024.0f;
 		uint32 bySpeed = (uint32)(kBpsUp / kBpsUpPerClient) + 2;
@@ -318,9 +307,9 @@
 	} else {
 		if (thePrefs::GetMaxUpload() >= 10) {
 			nMaxSlots = (uint32)floor((float)thePrefs::GetMaxUpload() / kBpsUpPerClient + 0.5);
-				// floor(x + 0.5) is a way of doing round(x) that works with gcc < 3 ...
+			// floor(x + 0.5) is a way of doing round(x) that works with gcc < 3 ...
 			if (nMaxSlots < MIN_UP_CLIENTS_ALLOWED) {
-				nMaxSlots=MIN_UP_CLIENTS_ALLOWED;
+				nMaxSlots = MIN_UP_CLIENTS_ALLOWED;
 			}
 		} else {
 			nMaxSlots = MIN_UP_CLIENTS_ALLOWED;
@@ -332,7 +321,6 @@
 	return nMaxSlots;
 }
 
-
 CUploadQueue::~CUploadQueue()
 {
 	wxASSERT(m_waitinglist.empty());
@@ -340,8 +328,7 @@
 	delete m_allUploadingKnownFile;
 }
 
-
-bool CUploadQueue::IsOnUploadQueue(const CUpDownClient* client) const
+bool CUploadQueue::IsOnUploadQueue(const CUpDownClient *client) const
 {
 	for (CClientRefList::const_iterator it = m_waitinglist.begin(); it != m_waitinglist.end(); ++it) {
 		if (it->GetClient() == client) {
@@ -351,8 +338,7 @@
 	return false;
 }
 
-
-bool CUploadQueue::IsDownloading(const CUpDownClient* client) const
+bool CUploadQueue::IsDownloading(const CUpDownClient *client) const
 {
 	for (CClientRefList::const_iterator it = m_uploadinglist.begin(); it != m_uploadinglist.end(); ++it) {
 		if (it->GetClient() == client) {
@@ -362,20 +348,39 @@
 	return false;
 }
 
-
-CUpDownClient* CUploadQueue::GetWaitingClientByIP_UDP(uint32 dwIP, uint16 nUDPPort, bool bIgnorePortOnUniqueIP, bool* pbMultipleIPs)
+CUpDownClient *CUploadQueue::GetWaitingClientByIP_UDP(
+	const CNetworkAddress &address, uint16 nUDPPort, bool bIgnorePortOnUniqueIP, bool *pbMultipleIPs)
 {
-	CUpDownClient* pMatchingIPClient = NULL;
+	CUpDownClient *pMatchingIPClient = NULL;
 
 	int cMatches = 0;
 
+	// Hoisted: the requester is one value for the whole walk, and the list runs to
+	// thePrefs::GetQueueSize() entries. The out-parameter is answered on the way out,
+	// as the walk below does, rather than left to whatever the caller initialised.
+	if (!UploadQueueAddressPolicy::IsMatchable(address)) {
+		if (pbMultipleIPs) {
+			*pbMultipleIPs = false;
+		}
+		return nullptr;
+	}
+	const PeerAddressing::UdpEndpoint source{ address, nUDPPort };
+
 	CClientRefList::iterator it = m_waitinglist.begin();
 	for (; it != m_waitinglist.end(); ++it) {
-		CUpDownClient* cur_client = it->GetClient();
-
-		if ((dwIP == cur_client->GetIP()) && (nUDPPort == cur_client->GetUDPPort())) {
+		CUpDownClient *cur_client = it->GetClient();
+		const bool sameAddress =
+			UploadQueueAddressPolicy::Matches(address, cur_client->GetUserAddress());
+
+		// Through MatchesUdpSource() rather than == on the two ports: a queued client
+		// that never advertised a UDP port carries zero, and a relayed request naming
+		// port zero would otherwise be an exact match against it. That client is then
+		// charged an ask count, and on the UDP twin can be banned for it.
+		if (sameAddress &&
+			PeerAddressing::MatchesUdpSource(
+				{ cur_client->GetUserAddress(), cur_client->GetUDPPort() }, source)) {
 			return cur_client;
-		} else if ((dwIP == cur_client->GetIP()) && bIgnorePortOnUniqueIP) {
+		} else if (sameAddress && bIgnorePortOnUniqueIP) {
 			pMatchingIPClient = cur_client;
 			cMatches++;
 		}
@@ -392,40 +397,38 @@
 	}
 }
 
-
-void CUploadQueue::AddClientToQueue(CUpDownClient* client)
+void CUploadQueue::AddClientToQueue(CUpDownClient *client)
 {
-	if (theApp->serverconnect->IsConnected() && theApp->serverconnect->IsLowID() && !theApp->serverconnect->IsLocalServer(client->GetServerIP(),client->GetServerPort()) && client->GetDownloadState() == DS_NONE && !client->IsFriend() && theStats::GetWaitingUserCount() > 50) {
+	if (theApp->serverconnect->IsConnected() && theApp->serverconnect->IsLowID() &&
+		!theApp->serverconnect->IsLocalServer(client->GetServerIP(), client->GetServerPort()) &&
+		client->GetDownloadState() == DS_NONE && !client->IsFriend() &&
+		theStats::GetWaitingUserCount() > 50) {
 		// Well, all that issues finish in the same: don't allow to add to the queue
 		return;
 	}
 
-	if ( client->IsBanned() ) {
+	if (client->IsBanned()) {
 		return;
 	}
 
 	client->AddAskedCount();
 	client->SetLastUpRequest();
 
-	// Find all clients with the same user-hash
-	CClientList::SourceList found = theApp->clientlist->GetClientsByHash( client->GetUserHash() );
+	CClientList::SourceList found = theApp->clientlist->GetClientsByHash(client->GetUserHash());
 
 	CClientList::SourceList::iterator it = found.begin();
 	while (it != found.end()) {
-		CUpDownClient* cur_client = it++->GetClient();
-
-		if ( IsOnUploadQueue( cur_client ) ) {
-			if ( cur_client == client ) {
-				// 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
+		CUpDownClient *cur_client = it++->GetClient();
+
+		if (IsOnUploadQueue(cur_client)) {
+			if (cur_client == client) {
+				// Where LowID clients get their upload slot. They cannot be
+				// contacted on reaching the top of the queue, so they are only
+				// marked for uploading and get their slot through the connection
+				// they initiate next. No slot is free then, so they are assigned an
+				// extra one, taking the count one over the configured number; no
+				// further LowID client gets a slot until a HighID client has, or a
+				// slot really is free.
 				if (client->m_bAddNextConnect) {
 					uint32 maxSlots = GetMaxSlots();
 					if (lastupslotHighID) {
@@ -446,24 +449,26 @@
 			} else {
 				// Hash-clash, remove unidentified clients (possibly both)
 
-				if ( !cur_client->IsIdentified() ) {
+				if (!cur_client->IsIdentified()) {
 					// Cur_client isn't identifed, remove it
-					theApp->clientlist->AddTrackClient( cur_client );
+					theApp->clientlist->AddTrackClient(cur_client);
 
-					RemoveFromWaitingQueue( cur_client );
-					if ( !cur_client->GetSocket() ) {
-						if (cur_client->Disconnected( "AddClientToQueue - same userhash" ) ) {
+					RemoveFromWaitingQueue(cur_client);
+					if (!cur_client->GetSocket()) {
+						if (cur_client->Disconnected(
+							    "AddClientToQueue - same userhash")) {
 							cur_client->Safe_Delete();
 						}
 					}
 				}
 
-				if ( !client->IsIdentified() ) {
+				if (!client->IsIdentified()) {
 					// New client isn't identified, remove it
-					theApp->clientlist->AddTrackClient( client );
+					theApp->clientlist->AddTrackClient(client);
 
-					if ( !client->GetSocket() ) {
-						if ( client->Disconnected( "AddClientToQueue - same userhash" ) ) {
+					if (!client->GetSocket()) {
+						if (client->Disconnected(
+							    "AddClientToQueue - same userhash")) {
 							client->Safe_Delete();
 						}
 					}
@@ -474,35 +479,51 @@
 		}
 	}
 
-	// Count the number of clients with the same IP-address
-	found = theApp->clientlist->GetClientsByIP( client->GetIP() );
-
+	// Count clients in the same address-accounting scope. Identity remains keyed by the exact
+	// canonical address, while IPv6 rate limiting aggregates a delegated /64. A client without
+	// an address has no host identity and is intentionally outside this cap.
+	const CNetworkAddress clientAddress = client->GetUserAddress();
+	// The scope is one value for the whole walk, and the list runs to
+	// thePrefs::GetQueueSize() entries. Held past the loop for the refusal below.
+	const CNetworkAddress clientScope = PeerAddressing::RateLimitScope(clientAddress);
 	int ipCount = 0;
-	for ( it = found.begin(); it != found.end(); ++it ) {
-		if ( ( it->GetClient() == client ) || IsOnUploadQueue( it->GetClient() ) ) {
-			ipCount++;
+	if (UploadQueueAddressPolicy::IsMatchable(clientAddress)) {
+		ipCount = 1;
+		for (const auto &entry : m_waitinglist) {
+			CUpDownClient *cur_client = entry.GetClient();
+			const CNetworkAddress &otherAddress = cur_client->GetUserAddress();
+			if (cur_client != client && UploadQueueAddressPolicy::IsMatchable(otherAddress) &&
+				PeerAddressing::RateLimitScope(otherAddress) == clientScope) {
+				ipCount++;
+			}
 		}
 	}
 
-	// We do not accept more than 3 clients from the same IP
-	if ( ipCount > 3 ) {
-		return;
-	} else if ( theApp->clientlist->GetClientsFromIP(client->GetIP()) >= 3 ) {
+	// No more than 3 clients from the same address-accounting scope may be on the upload queue.
+	// Only clients actually queued are counted: an earlier check also counted the tracked
+	// "deleted clients" list, so a client behind a shared or NAT IP that simply cancelled a few
+	// downloads was locked out for up to two hours, cleared only by a restart. Flood protection is
+	// the aggressiveness/ban path's job.
+	if (ipCount > 3) {
+		AddDebugLogLineN(logLocalClient,
+			CFormat("Rejected upload request from %s: too many clients (%d) in the same "
+				"accounting scope (%s) already on the upload queue") %
+				clientAddress.ToWxString() % ipCount % clientScope.ToWxString());
 		return;
 	}
 
-	// statistic values
-	CKnownFile* reqfile = const_cast<CKnownFile*>(client->GetUploadFile());
+	CKnownFile *reqfile = const_cast<CKnownFile *>(client->GetUploadFile());
 	if (reqfile) {
 		reqfile->statistic.AddRequest();
 	}
 
 	if (client->IsDownloading()) {
 		// he's already downloading and wants probably only another file
-		CPacket* packet = new CPacket(OP_ACCEPTUPLOADREQ, 0, OP_EDONKEYPROT);
+		CPacket *packet = new CPacket(OP_ACCEPTUPLOADREQ, 0, OP_EDONKEYPROT);
 		theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-		AddDebugLogLineN( logLocalClient, "Local Client: OP_ACCEPTUPLOADREQ to " + client->GetFullIP() );
-		client->SendPacket(packet,true);
+		AddDebugLogLineN(
+			logLocalClient, "Local Client: OP_ACCEPTUPLOADREQ to " + client->GetFullIP());
+		client->SendPacket(packet, true);
 		return;
 	}
 
@@ -514,36 +535,31 @@
 	uint64 tick = GetTickCount64();
 	client->ClearWaitStartTime();
 	// if possible start upload right away
-	if (m_waitinglist.empty() && tick - m_nLastStartUpload >= 1000
-		&& m_uploadinglist.size() < GetMaxSlots()
-		 && !theApp->listensocket->TooManySockets()) {
+	if (m_waitinglist.empty() && tick - m_nLastStartUpload >= 1000 &&
+		m_uploadinglist.size() < GetMaxSlots() && !theApp->listensocket->TooManySockets()) {
 		AddUpNextClient(client);
 		m_nLastStartUpload = tick;
 	} else {
-		// add to waiting queue
-		m_waitinglist.push_back(CCLIENTREF(client, "CUploadQueue::AddClientToQueue m_waitinglist.push_back"));
-		// and sort it to update queue ranks
+		m_waitinglist.push_back(
+			CCLIENTREF(client, "CUploadQueue::AddClientToQueue m_waitinglist.push_back"));
 		SortGetBestClient();
 		theStats::AddWaitingClient();
 		client->ClearAskedCount();
 		client->SetUploadState(US_ONUPLOADQUEUE);
 		client->SendRankingInfo();
-		//Notify_QlistAddClient(client);
 	}
 }
 
-
-bool CUploadQueue::RemoveFromUploadQueue(CUpDownClient* client)
+bool CUploadQueue::RemoveFromUploadQueue(CUpDownClient *client)
 {
-	// Keep track of this client
 	theApp->clientlist->AddTrackClient(client);
 
 	// Guard the find+erase against concurrent iteration by the disk I/O thread.
 	bool found = false;
 	{
 		wxMutexLocker lock(m_uploadingListMutex);
-		CClientRefList::iterator it = std::find(m_uploadinglist.begin(),
-			m_uploadinglist.end(), CCLIENTREF(client, ""));
+		CClientRefList::iterator it =
+			std::find(m_uploadinglist.begin(), m_uploadinglist.end(), CCLIENTREF(client, ""));
 		if (it != m_uploadinglist.end()) {
 			m_uploadinglist.erase(it);
 			found = true;
@@ -553,7 +569,7 @@
 	if (found) {
 		m_allUploadingKnownFile->RemoveUploadingClient(client);
 		theStats::RemoveUploadingClient();
-		if( client->GetTransferredUp() ) {
+		if (client->GetTransferredUp()) {
 			theStats::AddSuccessfulUpload();
 			theStats::AddUploadTime(client->GetUpStartTimeDelay() / 1000);
 		} else {
@@ -567,8 +583,7 @@
 	return false;
 }
 
-
-bool CUploadQueue::CheckForTimeOver(CUpDownClient* client)
+bool CUploadQueue::CheckForTimeOver(CUpDownClient *client)
 {
 	// Don't kick anybody if there's no need to
 	if (!m_allowKicking) {
@@ -576,15 +591,17 @@
 	}
 	// First, check if it is a VIP slot (friend or Release-Prio).
 	if (client->GetFriendSlot()) {
-		return false;	// never drop the friend
+		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) {
+		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++;
 			}
 		}
@@ -592,51 +609,43 @@
 		if (vips <= GetMaxSlots() / 2) {
 			return false;
 		}
-		// Otherwise normal rules apply.
 	}
 
-	// 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
+	// Ordinary slots. "Transfer full chunks": drop a client after 10 MB uploaded or after an
+	// hour, so the average UL speed should be at least 2.84 kB/s. We do not track what it is
+	// downloading, but if it is all from one chunk it 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 false;
 }
 
-
-/*
- * This function removes a file indicated by filehash from suspended_uploads_list.
+/**
+ * Removes the file named by filehash from suspended_uploads_list.
  */
-void CUploadQueue::ResumeUpload( const CMD4Hash& filehash )
+void CUploadQueue::ResumeUpload(const CMD4Hash &filehash)
 {
 	suspendedUploadsSet.erase(filehash);
-	AddLogLineN(CFormat( _("Resuming uploads of file: %s" ) )
-				% filehash.Encode() );
+	AddLogLineN(CFormat(_("Resuming uploads of file: %s")) % filehash.Encode());
 }
 
-/*
- * This function stops upload of a file indicated by filehash.
+/**
+ * Stops the upload of the file named by filehash.
  *
- * a) terminate == 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) terminate == 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.
+ * terminate == false: the file is suspended while a download completes, and resumed afterwards, so
+ * keeping the client makes sense. Such files go in suspendedUploadsSet.
+ *
+ * terminate == true: the file is deleted, so the client is not added to the waiting list. Waiting
+ * clients are swept out on the next AddUpNextClient run, their file no longer being shared.
  */
-uint16 CUploadQueue::SuspendUpload(const CMD4Hash& filehash, bool terminate)
+uint16 CUploadQueue::SuspendUpload(const CMD4Hash &filehash, bool terminate)
 {
-	AddLogLineN(CFormat( _("Suspending upload of file: %s" ) )
-				% filehash.Encode() );
+	AddLogLineN(CFormat(_("Suspending upload of file: %s")) % filehash.Encode());
 	uint16 removed = 0;
 
-	//Append the filehash to the list.
 	if (!terminate) {
 		suspendedUploadsSet.insert(filehash);
 	}
@@ -644,9 +653,8 @@
 	CClientRefList::iterator it = m_uploadinglist.begin();
 	while (it != m_uploadinglist.end()) {
 		CUpDownClient *potential = it++->GetClient();
-		//check if the client is uploading the file we need to suspend
+		// check if the client is uploading the file we need to suspend
 		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) {
@@ -664,7 +672,7 @@
 	return removed;
 }
 
-bool CUploadQueue::RemoveFromWaitingQueue(CUpDownClient* client)
+bool CUploadQueue::RemoveFromWaitingQueue(CUpDownClient *client)
 {
 	CClientRefList::iterator it = m_waitinglist.begin();
 
@@ -685,16 +693,14 @@
 	return false;
 }
 
-
 void CUploadQueue::RemoveFromWaitingQueue(CClientRefList::iterator pos)
 {
-	CUpDownClient* todelete = pos->GetClient();
+	CUpDownClient *todelete = pos->GetClient();
 	m_waitinglist.erase(pos);
 	theStats::RemoveWaitingClient();
-	if( todelete->IsBanned() ) {
+	if (todelete->IsBanned()) {
 		todelete->UnBan();
 	}
-	//Notify_QlistRemoveClient(todelete);
 	todelete->SetUploadState(US_NONE);
 	todelete->ClearScore();
 	todelete->SetUploadQueueWaitingPosition(0);
@@ -716,14 +722,13 @@
 	}
 	lastPopulate = tick;
 
-	// Get our downloads
 	int nrDownloads = theApp->downloadqueue->GetFileCount();
 	for (int idownload = 0; idownload < nrDownloads; idownload++) {
-		CPartFile * download = theApp->downloadqueue->GetFileByIndex(idownload);
+		CPartFile *download = theApp->downloadqueue->GetFileByIndex(idownload);
 		if (!download || download->GetAvailablePartCount() == 0) {
 			continue;
 		}
-		const CKnownFile::SourceSet& sources = download->GetSourceList();
+		const CKnownFile::SourceSet &sources = download->GetSourceList();
 		if (sources.empty()) {
 			continue;
 		}
@@ -736,12 +741,11 @@
 			partsAvailablei = 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();
+			CUpDownClient *client = it->GetClient();
 			if (!client || client->GetUploadFile() != download || client->HasLowID()) {
 				continue;
 			}
-			const BitVector& partStatus = client->GetPartStatus();
+			const BitVector &partStatus = client->GetPartStatus();
 			if (partStatus.size() != parts) {
 				continue;
 			}

amule-3.0.1.tar.gz/src/UploadQueue.h -> amule-3.1.0.tar.gz/src/UploadQueue.h Changed

@@ -26,20 +26,19 @@
 #ifndef UPLOADQUEUE_H
 #define UPLOADQUEUE_H
 
-#include "ClientRef.h"		// Needed for CClientRefList
-#include "MD4Hash.h"		// Needed for CMD4Hash
-#include <wx/thread.h>		// Needed for wxMutex
+#include "ClientRef.h"      // Needed for CClientRefList
+#include "MD4Hash.h"        // Needed for CMD4Hash
+#include "NetworkAddress.h" // Needed for CNetworkAddress
+#include <wx/thread.h>      // Needed for wxMutex
 
-// Experimental extended upload queue population
+// 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.
+// A client set up from scratch (no shares, all downloads empty) takes a while after its first
+// chunks complete before uploads start: the upload queue is empty, because clients that find
+// nothing to download do not 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.
+// Set this to 1 for faster finding of upload slots in that case. aMule then tries to contact its
+// sources for uploading when the upload queue is empty.
 #define EXTENDED_UPLOADQUEUE 0
 
 class CUpDownClient;
@@ -50,50 +49,57 @@
 public:
 	CUploadQueue();
 	~CUploadQueue();
-	void	Process();
-	void	AddClientToQueue(CUpDownClient* client);
-	bool	RemoveFromUploadQueue(CUpDownClient* client);
-	bool	RemoveFromWaitingQueue(CUpDownClient* client);
-	bool	IsOnUploadQueue(const CUpDownClient* client) const;
-	bool	IsDownloading(const CUpDownClient* client) const;
-	bool	CheckForTimeOver(CUpDownClient* client);
-	void	ResortQueue() { SortGetBestClient(); }
+	void Process();
+	void AddClientToQueue(CUpDownClient *client);
+	bool RemoveFromUploadQueue(CUpDownClient *client);
+	bool RemoveFromWaitingQueue(CUpDownClient *client);
+	bool IsOnUploadQueue(const CUpDownClient *client) const;
+	bool IsDownloading(const CUpDownClient *client) const;
+	bool CheckForTimeOver(CUpDownClient *client);
+	void ResortQueue() { SortGetBestClient(); }
 
-	const CClientRefList& GetWaitingList() const { return m_waitinglist; }
-	const CClientRefList& GetUploadingList() const { return m_uploadinglist; }
+	const CClientRefList &GetWaitingList() const { return m_waitinglist; }
+	const CClientRefList &GetUploadingList() const { return m_uploadinglist; }
 
-	// Thread-safe access for disk I/O thread — caller must hold the returned lock for the duration of iteration
-	wxMutex& GetUploadingListLock() { return m_uploadingListMutex; }
+	// Thread-safe access for disk I/O thread -- caller must hold the returned lock for the duration of
+	// iteration
+	wxMutex &GetUploadingListLock() { return m_uploadingListMutex; }
 
-	CUpDownClient* GetWaitingClientByIP_UDP(uint32 dwIP, uint16 nUDPPort, bool bIgnorePortOnUniqueIP, bool* pbMultipleIPs = NULL);
+	CUpDownClient *GetWaitingClientByIP_UDP(const CNetworkAddress &address,
+		uint16 nUDPPort,
+		bool bIgnorePortOnUniqueIP,
+		bool *pbMultipleIPs = nullptr);
 
-	uint16	SuspendUpload(const CMD4Hash &, bool terminate);
-	void	ResumeUpload(const CMD4Hash &);
-	CKnownFile* GetAllUploadingKnownFile() { return m_allUploadingKnownFile; }
+	uint16 SuspendUpload(const CMD4Hash &, bool terminate);
+	void ResumeUpload(const CMD4Hash &);
+	CKnownFile *GetAllUploadingKnownFile() { return m_allUploadingKnownFile; }
 
 private:
-	void	RemoveFromWaitingQueue(CClientRefList::iterator pos);
-	uint32	GetMaxSlots() const;
-	void	AddUpNextClient(CUpDownClient* directadd = 0);
-	bool	IsSuspended(const CMD4Hash& hash) { return suspendedUploadsSet.find(hash) != suspendedUploadsSet.end(); }
-	void	SortGetBestClient(CClientRef * bestClient = NULL);
+	void RemoveFromWaitingQueue(CClientRefList::iterator pos);
+	uint32 GetMaxSlots() const;
+	void AddUpNextClient(CUpDownClient *directadd = 0);
+	bool IsSuspended(const CMD4Hash &hash)
+	{
+		return suspendedUploadsSet.find(hash) != suspendedUploadsSet.end();
+	}
+	void SortGetBestClient(CClientRef *bestClient = NULL);
 
 	CClientRefList m_waitinglist;
 	CClientRefList m_uploadinglist;
-	wxMutex        m_uploadingListMutex;	// guards m_uploadinglist for disk I/O thread access
+	wxMutex m_uploadingListMutex; // guards m_uploadinglist for disk I/O thread access
 
 #if EXTENDED_UPLOADQUEUE
 	CClientRefList m_possiblyWaitingList;
-	int		PopulatePossiblyWaitingList();
+	int PopulatePossiblyWaitingList();
 #endif
 
-	std::set<CMD4Hash> suspendedUploadsSet;  // set for suspended uploads
-	uint64	m_nLastStartUpload;
-	uint64	m_lastSort;
-	bool	lastupslotHighID; // VQB lowID alternation
-	bool	m_allowKicking;
+	std::set<CMD4Hash> suspendedUploadsSet; // set for suspended uploads
+	uint64 m_nLastStartUpload;
+	uint64 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;
+	CKnownFile *m_allUploadingKnownFile;
 };
 
 #endif // UPLOADQUEUE_H

amule-3.1.0.tar.gz/src/UploadQueueAddressPolicy.h Added

@@ -0,0 +1,63 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 UPLOADQUEUEADDRESSPOLICY_H
+#define UPLOADQUEUEADDRESSPOLICY_H
+
+#include "PeerAddressing.h"
+
+namespace UploadQueueAddressPolicy
+{
+/**
+ * Whether an address can take part in a match at all.
+ *
+ * Absent and unspecified addresses name nobody, so two of them are not the same peer. Hoisting this
+ * out of the loop is also what keeps a requester that can never match from walking the queue.
+ */
+inline bool IsMatchable(const CNetworkAddress &address) noexcept
+{
+	return PeerAddressing::IsIndexable(address);
+}
+
+/**
+ * Match a UDP requester to a queued peer without narrowing native IPv6 to zero.
+ *
+ * Address only. The caller that needs the port dimension as well goes through
+ * PeerAddressing::MatchesUdpSource(), whose zero-port refusal this must not silently duplicate.
+ */
+inline bool Matches(const CNetworkAddress &requester, const CNetworkAddress &peer) noexcept
+{
+	return IsMatchable(requester) && IsMatchable(peer) &&
+	       PeerAddressing::IndexKey(requester) == PeerAddressing::IndexKey(peer);
+}
+
+/** Match upload-capacity accounting scopes without widening peer identity. */
+inline bool MatchesRateLimitScope(const CNetworkAddress &first, const CNetworkAddress &second) noexcept
+{
+	return IsMatchable(first) && IsMatchable(second) &&
+	       PeerAddressing::RateLimitScope(first) == PeerAddressing::RateLimitScope(second);
+}
+} // namespace UploadQueueAddressPolicy
+
+#endif // UPLOADQUEUEADDRESSPOLICY_H

amule-3.0.1.tar.gz/src/UserEvents.cpp -> amule-3.1.0.tar.gz/src/UserEvents.cpp Changed

@@ -22,22 +22,21 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include "UserEvents.h"
 
-
 #include <common/Format.h>
+#include "AppImageEnv.h" // Needed for GetSanitizedExecEnv
 #include "Logger.h"
 #include "Preferences.h"
 #include "PartFile.h"
-#include "TerminationProcess.h"	// Needed for CTerminationProcess
-
+#include "TerminationProcess.h" // Needed for CTerminationProcess
 
 #include <wx/process.h>
+#include <wx/utils.h> // Needed for wxExecuteEnv
 
-
-#define USEREVENTS_EVENT(ID, NAME, VARS)	{ #ID, NAME, false, "", false, "" },
-static struct {
+#define USEREVENTS_EVENT(ID, NAME, VARS) { #ID, NAME, false, "", false, "" },
+static struct
+{
 	const wxString key;
 	const wxString name;
 	bool core_enabled;
@@ -51,11 +50,10 @@
 };
 #undef USEREVENTS_EVENT
 
-
-// Always defined: the wxCHECK_* macros below evaluate their condition in
-// both debug and release, unlike the wxASSERT_* family this used to be
-// paired with. Returns false for any out-of-range event so accessors below
-// can fall through to a safe sentinel instead of reading past s_EventList.
+// Always defined: the wxCHECK_* macros below evaluate their condition in both debug and release,
+// unlike the wxASSERT_* family this used to be paired with. Returns false for any out-of-range
+// event, so the accessors below can fall through to a safe sentinel instead of reading past
+// s_EventList.
 inline bool CheckIndex(const unsigned int idx)
 {
 	return (idx < itemsof(s_EventList));
@@ -66,103 +64,105 @@
 	return itemsof(s_EventList);
 }
 
-// wxCHECK rather than wxASSERT in the accessors below: a release build
-// would otherwise read past s_EventList on a bad index instead of
-// aborting (wxASSERT is a no-op in release). Each accessor returns a
-// safe sentinel — entry 0 — when the index is out of range; the
-// debug-build behaviour (assert + abort on first mis-use) is unchanged.
+// wxCHECK rather than wxASSERT in the accessors below: a release build would otherwise read past
+// s_EventList on a bad index instead of aborting, wxASSERT being a no-op in release. Each accessor
+// returns a safe sentinel, entry 0, when the index is out of range; the debug-build assert +
+// abort on first misuse is unchanged.
 
-const wxString& CUserEvents::GetDisplayName(enum EventType event)
+const wxString &CUserEvents::GetDisplayName(enum EventType event)
 {
-	wxCHECK_MSG(CheckIndex(event), s_EventList0.name,
+	wxCHECK_MSG(CheckIndex(event),
+		s_EventList0.name,
 		"CUserEvents::GetDisplayName: event index out of range");
 	return s_EventListevent.name;
 }
 
 bool CUserEvents::IsCoreCommandEnabled(enum EventType event)
 {
-	wxCHECK_MSG(CheckIndex(event), false,
-		"CUserEvents::IsCoreCommandEnabled: event index out of range");
+	wxCHECK_MSG(CheckIndex(event), false, "CUserEvents::IsCoreCommandEnabled: event index out of range");
 	return s_EventListevent.core_enabled;
 }
 
 bool CUserEvents::IsGUICommandEnabled(enum EventType event)
 {
-	wxCHECK_MSG(CheckIndex(event), false,
-		"CUserEvents::IsGUICommandEnabled: event index out of range");
+	wxCHECK_MSG(CheckIndex(event), false, "CUserEvents::IsGUICommandEnabled: event index out of range");
 	return s_EventListevent.gui_enabled;
 }
 
-const wxString& CUserEvents::GetKey(const unsigned int event)
+const wxString &CUserEvents::GetKey(const unsigned int event)
 {
-	wxCHECK_MSG(CheckIndex(event), s_EventList0.key,
-		"CUserEvents::GetKey: event index out of range");
+	wxCHECK_MSG(CheckIndex(event), s_EventList0.key, "CUserEvents::GetKey: event index out of range");
 	return s_EventListevent.key;
 }
 
-bool& CUserEvents::GetCoreEnableVar(const unsigned int event)
+bool &CUserEvents::GetCoreEnableVar(const unsigned int event)
 {
-	wxCHECK_MSG(CheckIndex(event), s_EventList0.core_enabled,
+	wxCHECK_MSG(CheckIndex(event),
+		s_EventList0.core_enabled,
 		"CUserEvents::GetCoreEnableVar: event index out of range");
 	return s_EventListevent.core_enabled;
 }
 
-wxString& CUserEvents::GetCoreCommandVar(const unsigned int event)
+wxString &CUserEvents::GetCoreCommandVar(const unsigned int event)
 {
-	wxCHECK_MSG(CheckIndex(event), s_EventList0.core_command,
+	wxCHECK_MSG(CheckIndex(event),
+		s_EventList0.core_command,
 		"CUserEvents::GetCoreCommandVar: event index out of range");
 	return s_EventListevent.core_command;
 }
 
-bool& CUserEvents::GetGUIEnableVar(const unsigned int event)
+bool &CUserEvents::GetGUIEnableVar(const unsigned int event)
 {
-	wxCHECK_MSG(CheckIndex(event), s_EventList0.gui_enabled,
+	wxCHECK_MSG(CheckIndex(event),
+		s_EventList0.gui_enabled,
 		"CUserEvents::GetGUIEnableVar: event index out of range");
 	return s_EventListevent.gui_enabled;
 }
 
-wxString& CUserEvents::GetGUICommandVar(const unsigned int event)
+wxString &CUserEvents::GetGUICommandVar(const unsigned int event)
 {
-	wxCHECK_MSG(CheckIndex(event), s_EventList0.gui_command,
+	wxCHECK_MSG(CheckIndex(event),
+		s_EventList0.gui_command,
 		"CUserEvents::GetGUICommandVar: event index out of range");
 	return s_EventListevent.gui_command;
 }
 
-#define USEREVENTS_EVENT(ID, NAME, VARS)	case CUserEvents::ID: { VARS break; }
-#define USEREVENTS_REPLACE_VAR(VAR, DESC, CODE)	command.Replace("%" VAR, CODE);
-static void ExecuteCommand(
-	enum CUserEvents::EventType event,
-	const void* object,
-	const wxString& cmd)
+#define USEREVENTS_EVENT(ID, NAME, VARS) \
+	case CUserEvents::ID: { \
+		VARS break; \
+	}
+#define USEREVENTS_REPLACE_VAR(VAR, DESC, CODE) command.Replace("%" VAR, CODE);
+static void ExecuteCommand(enum CUserEvents::EventType event, const void *object, const wxString &cmd)
 {
 	// This variable is needed by the USEREVENTS_EVENTLIST macro.
 	wxString command = cmd;
 	switch (event) {
 		USEREVENTS_EVENTLIST()
 		/* This macro expands to handle all user event types. Example:
-		   case CUserEvents::NewChatSession: {
+		   case CUserEvents::NewChatSession:
 		       command.Replace( "%SENDER", *((wxString*)object) );
-			   break;
-		   } */
+		       break; */
 	}
 	if (!command.empty()) {
+		// Inside an AppImage, run the user command with a sanitized environment so it loads
+		// system libraries rather than the bundled ones (#334); a no-op copy elsewhere.
 		CTerminationProcess *p = new CTerminationProcess(cmd);
-		if (!wxExecute(command, wxEXEC_ASYNC, p)) {
+		wxExecuteEnv execEnv;
+		const bool sanitized = AppImageEnv::GetSanitizedExecEnv(execEnv);
+		if (!wxExecute(command, wxEXEC_ASYNC, p, sanitized ? &execEnv : nullptr)) {
 			// If wxExecute fails, we need to delete the CTerminationProcess
 			// otherwise it will leak.
 			delete p;
-			AddLogLineC(CFormat(_("Failed to execute command `%s' on `%s' event.")) %
-				command % s_EventListevent.name);
+			AddLogLineC(CFormat(_("Failed to execute command '%s' on '%s' event.")) % command %
+				    s_EventListevent.name);
 		}
 	}
 }
 
-void CUserEvents::ProcessEvent(enum EventType event, const void* object)
+void CUserEvents::ProcessEvent(enum EventType event, const void *object)
 {
-	wxCHECK_RET(CheckIndex(event),
-		"CUserEvents::ProcessEvent: event index out of range");
-	wxCHECK_RET(object != NULL,
-		"CUserEvents::ProcessEvent: NULL object");
+	wxCHECK_RET(CheckIndex(event), "CUserEvents::ProcessEvent: event index out of range");
+	wxCHECK_RET(object != NULL, "CUserEvents::ProcessEvent: NULL object");
 
 #ifndef CLIENT_GUI
 	if (s_EventListevent.core_enabled) {

amule-3.0.1.tar.gz/src/UserEvents.h -> amule-3.1.0.tar.gz/src/UserEvents.h Changed

@@ -25,93 +25,79 @@
 #ifndef USEREVENTS_H
 #define USEREVENTS_H
 
-#include <wx/intl.h>		// Needed for wxTRANSLATE
-
+#include <wx/intl.h> // Needed for wxTRANSLATE
 
 #ifdef _MSC_VER
-	#define ATTR(x)
+#define ATTR(x)
 #else
-	#define ATTR(x) __attribute__((x))
+#define ATTR(x) __attribute__((x))
 #endif
 
-/* Each event will use 5 IDs:
-   - the panel that shows the prefs for this event
-   - the 'Core command enabled' checkbox
-   - the 'Core command' textctrl
-   - the 'GUI command enabled' checkbox
-   - the 'GUI command' textctrl
-*/
-#define USEREVENTS_IDS_PER_EVENT	5
+/* Each event uses 5 IDs: the panel showing its prefs, the 'Core command enabled' checkbox, the
+   'Core command' textctrl, the 'GUI command enabled' checkbox and the 'GUI command' textctrl. */
+#define USEREVENTS_IDS_PER_EVENT 5
 
-const int USEREVENTS_FIRST_ID	=	11500;	/* Some safe GUI ID to start from */
+const int USEREVENTS_FIRST_ID = 11500; /* Some safe GUI ID to start from */
 
 /**
  * Macro listing all the events.
  *
- * This huge macro is expanded 5 times in the sources, each time producing
- * different code. If we decide to get rid of the macro either because of coding style
- * decision, or someone finds a compiler that doesn't support this big macro, we
- * 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::ExecuteCommand())
+ * Expanded 5 times in the sources, each producing different code. Dropping the macro -- on style
+ * grounds, or because a compiler cannot cope with one this big -- means keeping those five places
+ * in sync by hand: one in PrefsUnifiedDlg.cpp (EVENT_LIST, PrefsUnifiedDlg::PrefsUnifiedDlg()), one
+ * in this header (CUserEvents::EventType), and two in UserEvents.cpp (static struct EventList;
+ * CUserEvent::ExecuteCommand()).
  */
 #define USEREVENTS_EVENTLIST() \
-	USEREVENTS_EVENT(DownloadCompleted, wxTRANSLATE("Download completed"), \
-		USEREVENTS_REPLACE_VAR( \
-			"FILE", \
+	USEREVENTS_EVENT(DownloadCompleted, \
+		wxTRANSLATE("Download completed"), \
+		USEREVENTS_REPLACE_VAR("FILE", \
 			wxTRANSLATE("The full path to the file."), \
-			static_cast<const CPartFile*>(object)->GetFullName().GetRaw() ) \
-		USEREVENTS_REPLACE_VAR( \
-			"NAME", \
+			static_cast<const CPartFile *>(object) \
+				->GetFullName() \
+				.GetRaw()) USEREVENTS_REPLACE_VAR("NAME", \
 			wxTRANSLATE("The name of the file without path component."), \
-			static_cast<const CPartFile*>(object)->GetFileName().GetRaw() ) \
-		USEREVENTS_REPLACE_VAR( \
-			"HASH", \
-			wxTRANSLATE("The eD2k hash of the file."), \
-			static_cast<const CPartFile*>(object)->GetFileHash().Encode() ) \
-		USEREVENTS_REPLACE_VAR( \
-			"SIZE", \
-			wxTRANSLATE("The size of the file in bytes."), \
-			(CFormat("%llu") % static_cast<const CPartFile*>(object)->GetFileSize()).GetString() ) \
-		USEREVENTS_REPLACE_VAR( \
-			"DLACTIVETIME", \
-			wxTRANSLATE("Cumulative download activity time."), \
-			CastSecondsToHM(static_cast<const CPartFile*>(object)->GetDlActiveTime()) ) \
-	) \
-	USEREVENTS_EVENT(NewChatSession, wxTRANSLATE("New chat session started"), \
+			static_cast<const CPartFile *>(object)->GetFileName().GetRaw()) \
+			USEREVENTS_REPLACE_VAR("HASH", \
+				wxTRANSLATE("The eD2k hash of the file."), \
+				static_cast<const CPartFile *>(object)->GetFileHash().Encode()) \
+				USEREVENTS_REPLACE_VAR("SIZE", \
+					wxTRANSLATE("The size of the file in bytes."), \
+					(CFormat("%llu") % \
+						static_cast<const CPartFile *>(object)->GetFileSize()) \
+						.GetString()) USEREVENTS_REPLACE_VAR("DLACTIVETIME", \
+					wxTRANSLATE("Cumulative download activity time."), \
+					CastSecondsToHM( \
+						static_cast<const CPartFile *>(object)->GetDlActiveTime()))) \
+	USEREVENTS_EVENT(NewChatSession, \
+		wxTRANSLATE("New chat session started"), \
 		USEREVENTS_REPLACE_VAR( \
-			"SENDER", \
-			wxTRANSLATE("Message sender."), \
-			*static_cast<const wxString*>(object) ) \
-	) \
-	USEREVENTS_EVENT(OutOfDiskSpace, wxTRANSLATE("Out of space"), \
-		USEREVENTS_REPLACE_VAR( \
-			"PARTITION", \
+			"SENDER", wxTRANSLATE("Message sender."), *static_cast<const wxString *>(object))) \
+	USEREVENTS_EVENT(OutOfDiskSpace, \
+		wxTRANSLATE("Out of space"), \
+		USEREVENTS_REPLACE_VAR("PARTITION", \
 			wxTRANSLATE("Disk partition."), \
-			wxString(static_cast<const wxChar*>(object)) ) \
-	) \
-	USEREVENTS_EVENT(ErrorOnCompletion, wxTRANSLATE("Error on completion"), \
-		USEREVENTS_REPLACE_VAR( \
-			"FILE", \
+			wxString(static_cast<const wxChar *>(object)))) \
+	USEREVENTS_EVENT(ErrorOnCompletion, \
+		wxTRANSLATE("Error on completion"), \
+		USEREVENTS_REPLACE_VAR("FILE", \
 			wxTRANSLATE("The full path to the file."), \
-			static_cast<const CPartFile*>(object)->GetFullName().GetRaw() ) \
-	)
-
+			static_cast<const CPartFile *>(object)->GetFullName().GetRaw()))
 
-#define USEREVENTS_EVENT(ID, NAME, VARS)	ID,
+#define USEREVENTS_EVENT(ID, NAME, VARS) ID,
 
 /**
- * Class to handle userspace events.
- *
- * These events that we publish to the user and let him
- * specify a command to be run when one of these events occur.
+ * Handles userspace events: events published to the user, who can specify a command to run when one
+ * occurs.
  */
-class CUserEvents {
+class CUserEvents
+{
 	friend class CPreferences;
- public:
+
+public:
 	//! Event list
-	enum EventType {
+	enum EventType
+	{
 		USEREVENTS_EVENTLIST()
 		/* This macro expands to the following list of user event types:
 		   DownloadCompleted, NewChatSession, OutOfDiskSpace, ErrorOnCompletion */
@@ -120,46 +106,40 @@
 	/**
 	 * Process a user event.
 	 *
-	 * Notes on the 'object' argument: this should be a pointer to
-	 * an object instance, from which all of the replacement texts
-	 * can be generated.
-	 *
-	 * Unfortunately this approach does not provide any type-safety,
-	 * a list of string pairs (key, replacement) would be the best.
-	 * However, this would need either expanding the macro at all of
-	 * the places where CUserEvents::ProcessEvent is called from, or
-	 * creating lists of parameters for each event, etc = more lists
-	 * to keep in sync manually.
+	 * `object` should be a pointer to an object instance from which every replacement text can
+	 * be generated. That is not type-safe; a list of (key, replacement) string pairs would be
+	 * better, but it would mean either expanding the macro at every CUserEvents::ProcessEvent
+	 * call site or creating a parameter list per event -- more lists to keep in sync by hand.
 	 */
-	static void		ProcessEvent(enum EventType event, const void* object);
+	static void ProcessEvent(enum EventType event, const void *object);
 
 	/**
-	 * Returns the number of defined user events.
+	 * The number of defined user events.
 	 */
-	static unsigned int	GetCount() ATTR(__const__);
+	static unsigned int GetCount() ATTR(__const__);
 
 	/**
-	 * Returns the human-readable name of the event.
+	 * The human-readable name of the event.
 	 */
-	static const wxString&	GetDisplayName(enum EventType event) ATTR(__pure__);
+	static const wxString &GetDisplayName(enum EventType event) ATTR(__pure__);
 
 	/**
-	 * Checks whether the core command is enabled.
+	 * Whether the core command is enabled.
 	 */
-	static bool		IsCoreCommandEnabled(enum EventType event) ATTR(__pure__);
+	static bool IsCoreCommandEnabled(enum EventType event) ATTR(__pure__);
 
 	/**
-	 * Checks whether the GUI command is enabled.
+	 * Whether the GUI command is enabled.
 	 */
-	static bool		IsGUICommandEnabled(enum EventType event) ATTR(__pure__);
+	static bool IsGUICommandEnabled(enum EventType event) ATTR(__pure__);
 
- private:
+private:
 	// functions for CPreferences
-	static const wxString&	GetKey(const unsigned int event) ATTR(__pure__);
-	static bool&		GetCoreEnableVar(const unsigned int event) ATTR(__pure__);
-	static wxString&	GetCoreCommandVar(const unsigned int event) ATTR(__pure__);
-	static bool&		GetGUIEnableVar(const unsigned int event) ATTR(__pure__);
-	static wxString&	GetGUICommandVar(const unsigned int event) ATTR(__pure__);
+	static const wxString &GetKey(const unsigned int event) ATTR(__pure__);
+	static bool &GetCoreEnableVar(const unsigned int event) ATTR(__pure__);
+	static wxString &GetCoreCommandVar(const unsigned int event) ATTR(__pure__);
+	static bool &GetGUIEnableVar(const unsigned int event) ATTR(__pure__);
+	static wxString &GetGUICommandVar(const unsigned int event) ATTR(__pure__);
 };
 
 #undef USEREVENTS_EVENT

amule-3.1.0.tar.gz/src/UtpContext.h Added

@@ -0,0 +1,343 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 UTP_CONTEXT_H
+#define UTP_CONTEXT_H
+
+#include "ReservedProtocolFrames.h"
+#include "UtpDialPolicy.h"
+
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <utility>
+
+// IPv4 uses aMule's low-byte-first integer representation; ports are host order.
+class IUtpDatagramSink
+{
+public:
+	virtual ~IUtpDatagramSink() = default;
+	/**
+	 * Sends one uTP datagram, with the crypt parameters of the socket it came
+	 * from rather than any derived from the destination address.
+	 *
+	 * @a userHash is borrowed for the duration of the call and is null exactly
+	 * when @a encrypt is false.
+	 */
+	virtual void SendUtpDatagram(const uint8_t *payload,
+		size_t length,
+		uint32_t ip,
+		uint16_t port,
+		bool encrypt,
+		const uint8_t *userHash) = 0;
+};
+
+class IStreamTransport;
+
+class IUtpContext
+{
+public:
+	virtual ~IUtpContext() = default;
+	virtual bool Configure() = 0;
+	virtual bool IsAvailable() const = 0;
+	virtual void Destroy() = 0;
+	virtual bool ProcessDatagram(const uint8_t *payload, size_t length, uint32_t ip, uint16_t port) = 0;
+	virtual void Tick() = 0;
+
+	// Unactivated prerequisite. Success transfers a pending stream into an
+	// initially empty output; it is NOT an application connection notification.
+	// False leaves output untouched, allowing the caller's legacy fallback.
+	// The caller must first apply DecideUtpDial and existing security checks.
+	// Polling transport state is possible, but attaching it to a client awaits
+	// explicit connection-completion plumbing (never a writability event).
+	// Default refusal keeps contexts without outbound support fail-closed.
+	virtual bool Dial(uint32_t, uint16_t, bool, const uint8_t *, std::unique_ptr<IStreamTransport> &)
+	{
+		return false;
+	}
+
+	//! True while that endpoint holds at least one accepted or outbound socket.
+	virtual bool HasRegisteredPeer(uint32_t ip, uint16_t port) const = 0;
+};
+
+// Counted, not a set: one endpoint can hold several sockets, and forgetting on
+// the first close would leave the survivor answered with an RST.
+class CUtpPeerRegistry
+{
+public:
+	void Add(uint32_t ip, uint16_t port) { ++m_peersKey(ip, port); }
+
+	void Remove(uint32_t ip, uint16_t port)
+	{
+		const auto found = m_peers.find(Key(ip, port));
+		if (found == m_peers.end()) {
+			return;
+		}
+		if (--found->second == 0) {
+			m_peers.erase(found);
+		}
+	}
+
+	bool Has(uint32_t ip, uint16_t port) const { return m_peers.find(Key(ip, port)) != m_peers.end(); }
+
+	size_t Size() const { return m_peers.size(); }
+
+private:
+	static std::uint64_t Key(uint32_t ip, uint16_t port)
+	{
+		return (static_cast<std::uint64_t>(ip) << 16) | port;
+	}
+
+	std::map<std::uint64_t, unsigned> m_peers;
+};
+
+// Library seam: no libutp types escape the adapter.
+
+//! Where an accepted uTP stream is offered for admission.
+class IUtpStreamAcceptor
+{
+public:
+	virtual ~IUtpStreamAcceptor() = default;
+
+	/**
+	 * Offers one accepted stream.
+	 *
+	 * By reference on purpose: a by-value parameter is destroyed by a refusal,
+	 * and that closes the socket the adapter then closes again.
+	 */
+	virtual bool AcceptStream(
+		std::unique_ptr<IStreamTransport> &transport, uint32_t ip, uint16_t port) = 0;
+};
+
+class IUtpLibrary
+{
+public:
+	virtual ~IUtpLibrary() = default;
+	virtual bool Create(IUtpDatagramSink &sink) = 0;
+	virtual void Destroy() = 0;
+	virtual bool ProcessDatagram(const uint8_t *payload, size_t length, uint32_t ip, uint16_t port) = 0;
+	virtual void IssueDeferredAcks() = 0;
+	virtual void CheckTimeouts() = 0;
+
+	// IPv4/host-order port; crypt parameters are installed before the SYN.
+	// Caller must retain the library until the returned transport is destroyed.
+	virtual bool Dial(uint32_t, uint16_t, bool, const uint8_t *, std::unique_ptr<IStreamTransport> &)
+	{
+		return false;
+	}
+
+	//! Null refuses every inbound SYN, which is the state before an acceptor exists.
+	virtual void SetAcceptor(IUtpStreamAcceptor *acceptor) = 0;
+
+	//! True while that endpoint holds at least one accepted or outbound socket.
+	virtual bool HasRegisteredPeer(uint32_t ip, uint16_t port) const = 0;
+};
+
+// Main-thread only. Tick never recreates state abandoned by socket Close().
+class CUtpContext final : public IUtpContext
+{
+public:
+	CUtpContext(std::unique_ptr<IUtpLibrary> library, IUtpDatagramSink &sink)
+	: m_library(std::move(library))
+	, m_sink(sink)
+	{
+	}
+	~CUtpContext() override { Destroy(); }
+	bool Configure() override
+	{
+		if (!m_active) {
+			m_active = m_library->Create(m_sink);
+			// Re-applied on every rebuild, not once at construction. Destroy()
+			// drops the library's acceptor, and CClientUDPSocket::Close() is
+			// followed by Open() on a Kad reconnect without the object being
+			// rebuilt -- so an acceptor installed only in the constructor is
+			// gone for the session and every SYN is refused silently.
+			if (m_active) {
+				m_library->SetAcceptor(m_acceptor);
+			}
+		}
+		return m_active;
+	}
+	bool IsAvailable() const override { return m_active; }
+	void Destroy() override
+	{
+		if (m_active) {
+			m_library->Destroy();
+			m_active = false;
+		}
+	}
+	bool ProcessDatagram(const uint8_t *payload, size_t length, uint32_t ip, uint16_t port) override
+	{
+		if (!Configure()) {
+			return false;
+		}
+		const bool claimed = m_library->ProcessDatagram(payload, length, ip, port);
+		m_library->IssueDeferredAcks();
+		return claimed;
+	}
+	void Tick() override
+	{
+		if (m_active) {
+			m_library->IssueDeferredAcks();
+			m_library->CheckTimeouts();
+		}
+	}
+
+	bool Dial(uint32_t ip,
+		uint16_t port,
+		bool encrypt,
+		const uint8_t *userHash,
+		std::unique_ptr<IStreamTransport> &transport) override
+	{
+		// Never reopen a closed UDP service as a side effect of dialing.
+		if (!m_active || transport || ip == 0 || port == 0 || (encrypt && userHash == nullptr)) {
+			return false;
+		}
+		return m_library->Dial(ip, port, encrypt, userHash, transport);
+	}
+
+	// Delegated rather than answered here: registration happens where sockets
+	// are created and destroyed, which is the library adapter.
+	bool HasRegisteredPeer(uint32_t ip, uint16_t port) const override
+	{
+		return m_library->HasRegisteredPeer(ip, port);
+	}
+
+	//! Held, so it survives the context being destroyed and rebuilt.
+	void SetAcceptor(IUtpStreamAcceptor *acceptor)
+	{
+		m_acceptor = acceptor;
+		if (m_active) {
+			m_library->SetAcceptor(acceptor);
+		}
+	}
+
+private:
+	std::unique_ptr<IUtpLibrary> m_library;
+	IUtpDatagramSink &m_sink;
+	IUtpStreamAcceptor *m_acceptor = nullptr;
+	bool m_active = false;
+};
+
+// libutp answers an unmatched non-SYN with an unsolicited RST to the claimed
+// source, which makes this host a reflector for a forged address.
+enum class EUtpFrameKind
+{
+	//! Shorter than a header, or a version libutp does not implement.
+	Malformed,
+	//! A connection request. Admission decides; no prior registration needed.
+	Syn,
+	//! Traffic for a connection, which only an already-registered peer can have.
+	Existing
+};
+
+//! Mirrors libutp's validity test (UTP_Version): type < ST_NUM_STATES,
+//! extension < 3, version 1.
+inline EUtpFrameKind ClassifyUtpFrame(const uint8_t *payload, size_t length)
+{
+	// Header is 20 bytes in version 1; anything shorter cannot be parsed.
+	constexpr size_t kUtpHeaderBytes = 20;
+	constexpr uint8_t kUtpVersion = 1;
+	constexpr uint8_t kStNumStates = 5;
+	constexpr uint8_t kStSyn = 4;
+	if (payload == nullptr || length < kUtpHeaderBytes) {
+		return EUtpFrameKind::Malformed;
+	}
+	const uint8_t type = static_cast<uint8_t>(payload0 >> 4);
+	const uint8_t version = static_cast<uint8_t>(payload0 & 0x0F);
+	const uint8_t extension = payload1;
+	if (type >= kStNumStates || extension >= 3 || version != kUtpVersion) {
+		return EUtpFrameKind::Malformed;
+	}
+	return type == kStSyn ? EUtpFrameKind::Syn : EUtpFrameKind::Existing;
+}
+
+inline bool ProcessUtpFrame(
+	IUtpContext &context, const SReservedProt2Frame &frame, uint32_t ip, uint16_t port)
+{
+	return frame.disposition == RP2_KNOWN_TYPE && frame.type == OP_NATT_FRAME_UTP &&
+	       context.ProcessDatagram(frame.payload, frame.payloadLength, ip, port);
+}
+
+// UDP sizing for libutp, accounting for the two-byte aMule envelope.
+//
+// libutp's own defaults (utp_default_get_udp_mtu / _overhead in utp_utils.cpp) branch on the
+// address family and know nothing of the envelope, so overriding them is what makes libutp size
+// packets that do not fragment. Branching the same way keeps the family awareness those defaults
+// had: an IPv6 peer costs 20 more header bytes than IPv4, and libutp assumes Teredo because it
+// cannot know the local interface either.
+//
+// Taken as a bool rather than a sockaddr so this stays free of socket headers and testable without
+// one; the adapter does the sa_family comparison.
+constexpr std::uint64_t kUtpEnvelopeBytes = 2;
+
+// What CEncryptedDatagramSocket::EncryptSendClient() prepends. Its cryptHeaderLen is
+// `padLen + CRYPT_HEADER_WITHOUTPADDING + (kad ? 8 : 0)`, which is 8 here because a uTP datagram
+// is not Kad and padLen is hardcoded to zero -- under a comment reading "padding disabled for UDP
+// currently". Enabling it makes this budget too small again, which is the defect this constant
+// exists to fix, so that switch has to come back here.
+//
+// Subtracted unconditionally rather than only for peers we encrypt to, because the budget is a
+// property of the libutp context while the decision is per-datagram, and a budget that is right
+// only sometimes is the fragmentation this override exists to prevent. The cost of being wrong
+// in this direction is eight bytes of payload on a plaintext datagram.
+constexpr std::uint64_t kUtpCryptHeaderBytes = 8;
+
+constexpr std::uint64_t UtpUdpMtu(bool isIPv6)
+{
+	// IPv4:   1500 ethernet - 20 IPv4 - 8 UDP - 24 GRE - 8 PPPoE - 2 MPPE - 36 fudge.
+	// Teredo: 1280 - 40 IPv6 - 8 UDP.
+	return (isIPv6 ? UINT64_C(1232) : UINT64_C(1402)) - kUtpEnvelopeBytes - kUtpCryptHeaderBytes;
+}
+
+constexpr std::uint64_t UtpUdpOverhead(bool isIPv6)
+{
+	// IPv4: 20 + 8. Teredo: that, plus 40 IPv6 + 8 UDP again.
+	return (isIPv6 ? UINT64_C(76) : UINT64_C(28)) + kUtpEnvelopeBytes;
+}
+
+// Keep CPacket's application types out of the libutp translation unit.
+template <typename Packet, typename Socket>
+void QueueUtpDatagram(Socket &socket,
+	const uint8_t *payload,
+	size_t length,
+	uint32_t ip,
+	uint16_t port,
+	bool encrypt,
+	const uint8_t *hash)
+{
+	// Maximum IPv4 UDP payload, less the aMule envelope.
+	if (length > 65507 - 2 || (length != 0 && payload == nullptr)) {
+		return;
+	}
+	auto packet = std::make_unique<Packet>(
+		OP_NATT_FRAME_UTP, static_cast<uint32_t>(length), OP_UDPRESERVEDPROT2);
+	if (length != 0) {
+		packet->CopyToDataBuffer(0, payload, static_cast<unsigned int>(length));
+	}
+	socket.SendPacket(packet.release(), ip, port, encrypt, hash, false, 0);
+}
+
+#endif // UTP_CONTEXT_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/UtpDialPolicy.h Added

@@ -0,0 +1,65 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 UTP_DIAL_POLICY_H
+#define UTP_DIAL_POLICY_H
+
+#include <cstdint>
+#include <cstring>
+
+// Preserve the TCP/callback/buddy/refusal path unless direct uTP is eligible.
+// This policy does not replace security checks or authorize NAT rendezvous.
+enum class EUtpDialDecision
+{
+	PreserveLegacy,
+	TryUtp
+};
+
+struct SUtpDialFacts
+{
+	bool peerSupportsUtp = false;
+	bool localOutboundService = false;
+	bool directHighId = false;
+	bool proxyEnabled = false;
+	bool routableEndpoint = false;
+	// The stream handshake never runs over a transport, so a peer owed
+	// obfuscation may only be dialled when the frames carry it themselves.
+	bool obfuscationSatisfied = false;
+};
+
+inline EUtpDialDecision DecideUtpDial(const SUtpDialFacts &facts)
+{
+	return facts.peerSupportsUtp && facts.localOutboundService && facts.directHighId &&
+			       !facts.proxyEnabled && facts.routableEndpoint && facts.obfuscationSatisfied
+		       ? EUtpDialDecision::TryUtp
+		       : EUtpDialDecision::PreserveLegacy;
+}
+
+/** Whether this side keeps the already-found transport in a simultaneous dial. */
+inline bool ShouldKeepFoundUtp(bool foundInbound, const uint8_t *localHash, const uint8_t *peerHash)
+{
+	return foundInbound == (std::memcmp(localHash, peerHash, 16) > 0);
+}
+
+#endif // UTP_DIAL_POLICY_H

amule-3.1.0.tar.gz/src/UtpLibraryAdapter.cpp Added

@@ -0,0 +1,402 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "UtpLibraryAdapter.h"
+
+#include "UtpSocketTransport.h" // per-socket crypt parameters, resolved from userdata
+#include <libutp/utp.h>
+
+#include <map>
+#include <utility>
+#include <vector>
+
+namespace
+{
+class CUtpLibraryAdapter final : public IUtpLibrary, public IUtpSocketOperations
+{
+public:
+	~CUtpLibraryAdapter() override { Destroy(); }
+
+	// -- IUtpSocketOperations, the four per-socket libutp calls ---------
+
+	std::ptrdiff_t WriteToSocket(Handle socket, const uint8_t *data, size_t length) override
+	{
+		utp_iovec vector{ const_cast<uint8_t *>(data), length };
+		// As it came: clamping utp_writev's -1 to 0 would lose the sentinel at
+		// the one seam that can still tell them apart.
+		return utp_writev(static_cast<utp_socket *>(socket), &vector, 1);
+	}
+
+	void NotifyReadDrained(Handle socket) override
+	{
+		utp_read_drained(static_cast<utp_socket *>(socket));
+	}
+
+	void CloseSocket(Handle socket) override
+	{
+		auto *raw = static_cast<utp_socket *>(socket);
+		// Closed before the userdata goes, so the FIN this sends carries the
+		// stream's crypt parameters like every other datagram on it.
+		utp_close(raw);
+		// utp_close() only starts the socket dying; DESTROYING arrives later and
+		// would hand a callback a freed transport.
+		utp_set_userdata(raw, nullptr);
+		// The endpoint stays registered until DESTROYING: a closing socket still
+		// has to receive the peer's acknowledgement of that FIN, and the ingress
+		// gate drops anything from an endpoint it does not know. m_endpoints is
+		// what lets the removal happen without the userdata this just cleared.
+	}
+
+	void SetReceiveBuffer(Handle socket, size_t bytes) override
+	{
+		utp_setsockopt(static_cast<utp_socket *>(socket), UTP_RCVBUF, static_cast<int>(bytes));
+	}
+	bool Create(IUtpDatagramSink &sink) override
+	{
+		if (m_context) {
+			return true;
+		}
+		m_context = utp_init(2);
+		if (!m_context) {
+			return false;
+		}
+		utp_context_set_userdata(m_context, &sink);
+		s_self = this;
+		utp_set_callback(m_context, UTP_SENDTO, SendTo);
+		utp_set_callback(m_context, UTP_GET_UDP_MTU, GetUdpMtu);
+		utp_set_callback(m_context, UTP_GET_UDP_OVERHEAD, GetUdpOverhead);
+		utp_set_callback(m_context, UTP_ON_ACCEPT, OnAccept);
+		utp_set_callback(m_context, UTP_ON_STATE_CHANGE, OnStateChange);
+		utp_set_callback(m_context, UTP_ON_ERROR, OnError);
+		utp_set_callback(m_context, UTP_ON_READ, OnRead);
+		utp_set_callback(m_context, UTP_GET_READ_BUFFER_SIZE, GetReadBufferSize);
+		return true;
+	}
+
+	bool Dial(uint32_t ip,
+		uint16_t port,
+		bool encrypt,
+		const uint8_t *userHash,
+		std::unique_ptr<IStreamTransport> &transport) override
+	{
+		if (!m_context || transport || ip == 0 || port == 0 || (encrypt && userHash == nullptr)) {
+			return false;
+		}
+		auto *socket = utp_create_socket(m_context);
+		if (socket == nullptr) {
+			return false;
+		}
+		auto pending = std::make_unique<CUtpSocketTransport>(
+			*this, socket, CNetworkAddress::FromIPv4NetworkOrder(ip), port, nullptr, false);
+		utp_set_userdata(socket, pending.get());
+		pending->ApplyReceiveBound();
+		pending->SetCryptParameters(encrypt, userHash);
+		// Register before the SYN, so its reply passes the ingress gate and the
+		// socket-to-endpoint record removes it on every close path.
+		Register(socket, ip, port);
+		sockaddr_in address{};
+		address.sin_family = AF_INET;
+		address.sin_port = htons(port);
+		auto *bytes = reinterpret_cast<uint8_t *>(&address.sin_addr.s_addr);
+		for (unsigned i = 0; i < 4; ++i) {
+			bytesi = static_cast<uint8_t>(ip >> (8 * i));
+		}
+		if (utp_connect(socket, reinterpret_cast<const sockaddr *>(&address), sizeof(address)) != 0 ||
+			!pending->IsOk()) {
+			return false;
+		}
+		transport = std::move(pending);
+		return true;
+	}
+
+	void SetAcceptor(IUtpStreamAcceptor *acceptor) override { m_acceptor = acceptor; }
+
+	bool HasRegisteredPeer(uint32_t ip, uint16_t port) const override { return m_peers.Has(ip, port); }
+	void Destroy() override
+	{
+		if (!m_context) {
+			return;
+		}
+		// Not closed here: struct_utp_context owns UTPSocketHT, whose map holds
+		// each socket in a unique_ptr with a deleter, so `delete ctx` destroys
+		// them and ~UTPSocket emits DESTROYING (utp_internal.cpp:2499) -- the
+		// callback each transport needs. Closing first would utp_close() a
+		// dying socket, which it asserts against.
+		m_refusedStreams.clear();
+		for (utp_socket *refused : m_refused) {
+			utp_close(refused);
+		}
+		m_refused.clear();
+		utp_destroy(m_context);
+		// Every live socket emitted DESTROYING above; anything left is a socket
+		// libutp never told us about, and its endpoint is dead either way.
+		m_endpoints.clear();
+		m_context = nullptr;
+		m_acceptor = nullptr;
+		if (s_self == this) {
+			s_self = nullptr;
+		}
+	}
+	bool ProcessDatagram(const uint8_t *payload, size_t length, uint32_t ip, uint16_t port) override
+	{
+		sockaddr_in address{};
+		address.sin_family = AF_INET;
+		address.sin_port = htons(port);
+		auto *bytes = reinterpret_cast<uint8_t *>(&address.sin_addr.s_addr);
+		for (unsigned i = 0; i < 4; ++i) {
+			bytesi = static_cast<uint8_t>(ip >> (8 * i));
+		}
+		const bool claimed = utp_process_udp(m_context,
+					     payload,
+					     length,
+					     reinterpret_cast<const sockaddr *>(&address),
+					     sizeof(address)) != 0;
+		// Not inside UTP_ON_ACCEPT: utp_close() can produce DESTROYING before
+		// it returns, re-entering the callback that is still deciding.
+		// Destruction is the close, exactly once.
+		m_refusedStreams.clear();
+		for (utp_socket *refused : m_refused) {
+			utp_close(refused);
+		}
+		m_refused.clear();
+		return claimed;
+	}
+	void IssueDeferredAcks() override { utp_issue_deferred_acks(m_context); }
+	void CheckTimeouts() override { utp_check_timeouts(m_context); }
+
+private:
+	static uint64 SendTo(utp_callback_arguments *args)
+	{
+		if (!args->address || args->address->sa_family != AF_INET ||
+			args->address_len < sizeof(sockaddr_in)) {
+			return 0;
+		}
+		const auto *address = reinterpret_cast<const sockaddr_in *>(args->address);
+		const auto *bytes = reinterpret_cast<const uint8_t *>(&address->sin_addr.s_addr);
+		uint32_t ip = 0;
+		for (unsigned i = 0; i < 4; ++i) {
+			ip |= static_cast<uint32_t>(bytesi) << (8 * i);
+		}
+		auto *sink = static_cast<IUtpDatagramSink *>(utp_context_get_userdata(args->context));
+		// From the socket, never the destination: an address can belong to
+		// several clients. A context-level send has no verified peer.
+		bool encrypt = false;
+		const uint8_t *userHash = nullptr;
+		if (args->socket != nullptr) {
+			const auto *transport =
+				static_cast<const CUtpSocketTransport *>(utp_get_userdata(args->socket));
+			if (transport != nullptr) {
+				encrypt = transport->CryptParameters(&userHash);
+			}
+		}
+		sink->SendUtpDatagram(args->buf, args->len, ip, ntohs(address->sin_port), encrypt, userHash);
+		return 0;
+	}
+	//! The transport that owns a socket, or null for one we never accepted.
+	static CUtpSocketTransport *TransportOf(utp_socket *socket)
+	{
+		if (socket == nullptr) {
+			return nullptr;
+		}
+		return static_cast<CUtpSocketTransport *>(utp_get_userdata(socket));
+	}
+
+	static uint64 OnAccept(utp_callback_arguments *args)
+	{
+		if (s_self == nullptr || s_self->m_acceptor == nullptr || args->address == nullptr ||
+			args->address->sa_family != AF_INET) {
+			// No acceptor refuses every SYN, as this build did before one.
+			if (s_self != nullptr && args->socket != nullptr) {
+				s_self->m_refused.push_back(args->socket);
+			}
+			return 0;
+		}
+		const auto *address = reinterpret_cast<const sockaddr_in *>(args->address);
+		const auto *bytes = reinterpret_cast<const uint8_t *>(&address->sin_addr.s_addr);
+		uint32_t ip = 0;
+		for (unsigned i = 0; i < 4; ++i) {
+			ip |= static_cast<uint32_t>(bytesi) << (8 * i);
+		}
+		const uint16_t port = ntohs(address->sin_port);
+
+		// Interface type so the seam can move out of it; the concrete pointer
+		// stays for the setup below.
+		auto owned = std::make_unique<CUtpSocketTransport>(*s_self,
+			args->socket,
+			CNetworkAddress::FromIPv4NetworkOrder(ip),
+			port,
+			nullptr,
+			true);
+		CUtpSocketTransport *raw = owned.get();
+		std::unique_ptr<IStreamTransport> transport(std::move(owned));
+		// Before admission can produce a callback that needs it.
+		utp_set_userdata(args->socket, raw);
+		// Until this runs, libutp's 1 MiB default is the receive bound.
+		raw->ApplyReceiveBound();
+		// libutp reaches CS_CONNECTED on the peer's first ST_DATA, silently.
+		raw->MarkConnected();
+
+		// Registered before admission so that this pairs with the removal in
+		// CloseSocket(), which runs for every socket that has a transport --
+		// including a refused one, whose destructor closes it. Registering only
+		// the admitted ones would make a refused stream decrement the count of a
+		// live stream from the same endpoint, since a peer uses one UDP port, and
+		// drop that live stream off the gate its own frames pass through.
+		// Briefly registering a refused endpoint costs nothing: libutp still holds
+		// the socket until the close below.
+		s_self->Register(args->socket, ip, port);
+		if (!s_self->m_acceptor->AcceptStream(transport, ip, port)) {
+			// Forgotten at once, unlike an admitted stream: a refused peer has no
+			// FIN to acknowledge, and leaving its endpoint on the gate until the
+			// socket is destroyed would let its next frames reach libutp.
+			s_self->Forget(args->socket);
+			// Destroying it closes the socket, which must happen after libutp
+			// has finished with the datagram.
+			s_self->m_refusedStreams.push_back(std::move(transport));
+			return 0;
+		}
+		return 0;
+	}
+
+	static uint64 OnStateChange(utp_callback_arguments *args)
+	{
+		if (args->state == UTP_STATE_DESTROYING && s_self != nullptr) {
+			// Before the transport check: a closed socket has no userdata left,
+			// and this is the only notice that its endpoint is now dead.
+			s_self->Forget(args->socket);
+		}
+		CUtpSocketTransport *transport = TransportOf(args->socket);
+		if (transport == nullptr) {
+			return 0;
+		}
+		switch (args->state) {
+		case UTP_STATE_WRITABLE:
+			transport->OnWritable();
+			break;
+		case UTP_STATE_EOF:
+			transport->OnEnded(EUtpTransportFailure::Eof);
+			break;
+		case UTP_STATE_DESTROYING:
+			// Forgotten before the transport is told, and the handle dies with
+			// this callback.
+			utp_set_userdata(args->socket, nullptr);
+			transport->OnEnded(EUtpTransportFailure::Destroying);
+			break;
+		case UTP_STATE_CONNECT:
+			// The transport notifies its attached socket after the state transition;
+			// outbound and inbound streams use the same connection-completion path.
+			transport->MarkConnected();
+			break;
+		default:
+			break;
+		}
+		return 0;
+	}
+
+	static uint64 OnError(utp_callback_arguments *args)
+	{
+		CUtpSocketTransport *transport = TransportOf(args->socket);
+		if (transport == nullptr) {
+			return 0;
+		}
+		switch (args->error_code) {
+		case UTP_ECONNREFUSED:
+			transport->OnEnded(EUtpTransportFailure::Refused);
+			break;
+		case UTP_ETIMEDOUT:
+			transport->OnEnded(EUtpTransportFailure::TimedOut);
+			break;
+		case UTP_ECONNRESET:
+		default:
+			transport->OnEnded(EUtpTransportFailure::Reset);
+			break;
+		}
+		return 0;
+	}
+
+	static uint64 OnRead(utp_callback_arguments *args)
+	{
+		CUtpSocketTransport *transport = TransportOf(args->socket);
+		if (transport != nullptr) {
+			transport->OnPayload(args->buf, args->len);
+		}
+		return 0;
+	}
+
+	static uint64 GetReadBufferSize(utp_callback_arguments *args)
+	{
+		// Occupancy, not free space: libutp advertises opt_rcvbuf minus this,
+		// so the free figure runs the feedback backwards, silently.
+		const CUtpSocketTransport *transport = TransportOf(args->socket);
+		return transport == nullptr ? 0 : transport->ReadBufferSize();
+	}
+
+	static uint64 GetUdpMtu(utp_callback_arguments *args)
+	{
+		return UtpUdpMtu(args->address->sa_family == AF_INET6);
+	}
+	static uint64 GetUdpOverhead(utp_callback_arguments *args)
+	{
+		return UtpUdpOverhead(args->address->sa_family == AF_INET6);
+	}
+	void Register(utp_socket *socket, uint32_t ip, uint16_t port)
+	{
+		m_peers.Add(ip, port);
+		m_endpointssocket = { ip, port };
+	}
+
+	void Forget(utp_socket *socket)
+	{
+		const auto found = m_endpoints.find(socket);
+		if (found == m_endpoints.end()) {
+			return;
+		}
+		m_peers.Remove(found->second.first, found->second.second);
+		m_endpoints.erase(found);
+	}
+
+	utp_context *m_context = nullptr;
+	IUtpStreamAcceptor *m_acceptor = nullptr;
+	CUtpPeerRegistry m_peers;
+	// Which endpoint each socket holds, so the registry can be kept until the
+	// socket is destroyed rather than until its userdata is cleared.
+	std::map<utp_socket *, std::pair<uint32_t, uint16_t>> m_endpoints;
+	// Sockets refused before a transport existed, closed once libutp has
+	// finished with the datagram.
+	std::vector<utp_socket *> m_refused;
+	// Refused streams, destroyed at the same point. Destruction is the close.
+	std::vector<std::unique_ptr<IStreamTransport>> m_refusedStreams;
+	// libutp's callbacks carry only the context's user pointer, which already
+	// holds the datagram sink. One adapter exists per process.
+	static CUtpLibraryAdapter *s_self;
+};
+
+CUtpLibraryAdapter *CUtpLibraryAdapter::s_self = nullptr;
+} // namespace
+
+std::unique_ptr<IUtpLibrary> CreateUtpLibrary()
+{
+	return std::make_unique<CUtpLibraryAdapter>();
+}
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/UtpLibraryAdapter.h Added

@@ -0,0 +1,33 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 UTP_LIBRARY_ADAPTER_H
+#define UTP_LIBRARY_ADAPTER_H
+
+#include "UtpContext.h"
+
+std::unique_ptr<IUtpLibrary> CreateUtpLibrary();
+
+#endif // UTP_LIBRARY_ADAPTER_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/UtpSocketTransport.h Added

@@ -0,0 +1,580 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 UTPSOCKETTRANSPORT_H
+#define UTPSOCKETTRANSPORT_H
+
+#include "StreamTransport.h"
+#include "UtpStream.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <mutex>
+#include <vector>
+
+/**
+ * The per-socket libutp calls a transport makes, behind a seam.
+ *
+ * Only four, and the re-entrancy rule differs per call rather than being one
+ * blanket ban, because a blanket ban is a rule the code would have to break:
+ *
+ * - CloseSocket() must never be made from inside a callback: utp_close() can
+ *   produce UTP_STATE_DESTROYING before it returns.
+ * - WriteToSocket() is what UTP_STATE_WRITABLE exists to invite, so it is
+ *   correct from there. From UTP_ON_ACCEPT it achieves nothing, since the
+ *   socket is still CS_SYN_RECV, and from UTP_ON_READ it re-enters
+ *   utp_process_incoming. Both of those request a flush instead.
+ * - NotifyReadDrained() is safe from anywhere, including inside UTP_ON_READ:
+ *   utp_read_drained() only recomputes the receive window and sends or
+ *   schedules an ACK, and never re-enters the incoming path.
+ * - SetReceiveBuffer() is configuration, made once by the acceptor.
+ *
+ * Naming them here keeps the transport testable without the library.
+ *
+ * The handle is opaque on purpose: a utp_socket* never appears outside the
+ * adapter's translation unit, which is what stops <libutp/utp.h> reaching the
+ * rest of src/.
+ */
+class IUtpSocketOperations
+{
+public:
+	using Handle = void *;
+
+	virtual ~IUtpSocketOperations() = default;
+
+	//! Offers bytes. Nonpositive results (including libutp's -1) accept nothing.
+	virtual std::ptrdiff_t WriteToSocket(Handle socket, const uint8_t *data, size_t length) = 0;
+
+	//! Tells libutp the application has caught up, so delivery may resume.
+	virtual void NotifyReadDrained(Handle socket) = 0;
+
+	//! utp_close(). Exactly one caller may ever make this call per socket.
+	virtual void CloseSocket(Handle socket) = 0;
+
+	//! Sets the receive-buffer size libutp advertises window against.
+	virtual void SetReceiveBuffer(Handle socket, size_t bytes) = 0;
+};
+
+/**
+ * An IStreamTransport over one libutp socket.
+ *
+ * Main thread only for everything that touches libutp -- Flush(), Read()'s
+ * drained notification and Close(). Write() is the exception by necessity: it
+ * is reached from the upload bandwidth thread through CEMSocket, so it only
+ * queues into CUtpStream and the main thread hands those bytes to libutp on the
+ * next Flush(). That split is the whole reason the queue exists.
+ *
+ * Nothing constructs one of these yet.
+ */
+class CUtpSocketTransport final : public IStreamTransport
+{
+public:
+	CUtpSocketTransport(IUtpSocketOperations &operations,
+		IUtpSocketOperations::Handle socket,
+		const CNetworkAddress &peer,
+		uint16_t peerPort,
+		IStreamTransportEvents *events,
+		bool inbound)
+	: m_operations(operations)
+	, m_socket(socket)
+	, m_peer(peer)
+	, m_peerPort(peerPort)
+	, m_inbound(inbound)
+	, m_events(events)
+	{
+	}
+
+	~CUtpSocketTransport() override
+	{
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			m_events = nullptr;
+		}
+		Close();
+	}
+
+	CUtpSocketTransport(const CUtpSocketTransport &) = delete;
+	CUtpSocketTransport &operator=(const CUtpSocketTransport &) = delete;
+
+	/**
+	 * Sets the receive-window ceiling, not backpressure on its own.
+	 *
+	 * The adapter must register UTP_GET_READ_BUFFER_SIZE and synchronously
+	 * pull ReadBufferSize(): libutp advertises opt_rcvbuf minus those bytes.
+	 * Without that callback, occupancy is treated as zero.
+	 */
+	void ApplyReceiveBound()
+	{
+		IUtpSocketOperations::Handle socket = nullptr;
+		size_t bound = 0;
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			socket = m_socket;
+			bound = m_stream.ReadBound();
+		}
+		if (socket != nullptr) {
+			m_operations.SetReceiveBuffer(socket, bound);
+		}
+	}
+
+	// -- IStreamTransport ---------------------------------------------
+
+	// These are read from the upload bandwidth thread inside CEMSocket's send
+	// loop while the main thread's callbacks write them, so they take the lock
+	// like everything else that touches the stream.
+	/**
+	 * True once accepted, which is not libutp being ready to send: the acceptor
+	 * marks it at CS_SYN_RECV, and CS_CONNECTED arrives silently on the peer's
+	 * first ST_DATA. Answers "is there a stream", not "will a write leave now".
+	 */
+	bool IsConnected() const override
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		return m_connected && m_stream.IsOk();
+	}
+	bool IsInbound() const override { return m_inbound; }
+
+	bool ObfuscatesStream() const override
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		return m_encrypt;
+	}
+	bool IsOk() const override
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		return m_stream.IsOk();
+	}
+	bool BlocksRead() const override
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		return m_stream.BlocksRead();
+	}
+	bool BlocksWrite() const override
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		return m_stream.BlocksWrite();
+	}
+	int LastError() const override
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		return m_stream.LastError();
+	}
+	//! Fixed for the transport's lifetime, so it needs no lock.
+	CNetworkAddress GetPeerAddress() const override { return m_peer; }
+	uint16_t GetPeerPort() const override { return m_peerPort; }
+
+	uint32_t Read(void *buffer, uint32_t length) override
+	{
+		IUtpSocketOperations::Handle socket = nullptr;
+		uint32_t taken = 0;
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			taken = m_stream.Read(buffer, length);
+			// Owed only once the reader has emptied the buffer, and only to
+			// a socket that still exists: libutp stopped delivering while we
+			// were behind, and this is what resumes it.
+			if (m_stream.ConsumeReadDrainedEdge()) {
+				socket = m_socket;
+			}
+		}
+		if (socket != nullptr) {
+			// Outside the lock: this can re-enter.
+			m_operations.NotifyReadDrained(socket);
+		}
+		return taken;
+	}
+
+	/**
+	 * Queues bytes. Reached from the upload bandwidth thread.
+	 *
+	 * Deliberately does not call libutp: that would be a library call from a
+	 * thread libutp knows nothing about, and utp_write() can produce callbacks.
+	 * The bytes leave on the next Flush().
+	 */
+	uint32_t Write(const void *buffer, uint32_t length) override
+	{
+		uint32_t taken = 0;
+		IStreamTransportEvents *events = nullptr;
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			taken = m_stream.Write(buffer, length);
+			if (taken != 0 && !m_flushInProgress) {
+				events = RequestFlushLocked();
+			}
+		}
+		RaiseFlushRequest(events);
+		return taken;
+	}
+
+	/**
+	 * Closes once, and never touches the handle again.
+	 *
+	 * The handle is the token: it is cleared before the call, so the
+	 * destructor, a second Close() and a DESTROYING callback all find nothing
+	 * to close. That one rule also covers every other call -- Flush() and the
+	 * drained notification check the same pointer -- which is why it is the
+	 * mechanism here rather than a separate flag that would have to be
+	 * consulted in each of them.
+	 */
+	void Close() override
+	{
+		IUtpSocketOperations::Handle socket = nullptr;
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			socket = m_socket;
+			m_socket = nullptr;
+			m_connected = false;
+			// Our own close, not the peer's FIN. Both are clean ends with no
+			// error, but Failure() must not claim we saw a FIN we never saw.
+			m_stream.OnFailure(EUtpTransportFailure::Closed);
+			m_flushPending = false;
+		}
+		if (socket != nullptr) {
+			// Unlocked: utp_close() can produce UTP_STATE_DESTROYING before
+			// it returns, and that callback comes back through OnEnded().
+			m_operations.CloseSocket(socket);
+		}
+	}
+
+	// -- main-thread pump ---------------------------------------------
+
+	/**
+	 * Offers queued bytes to libutp and keeps whatever it refused.
+	 *
+	 * utp_write() takes less than it is offered as soon as the congestion
+	 * window is full, and nothing while the socket is not yet connected, so
+	 * the accepted count is what may be dropped from the queue -- never the
+	 * whole of it.
+	 */
+	void Flush() override
+	{
+		IUtpSocketOperations::Handle socket = nullptr;
+		std::vector<uint8_t> pending;
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			// Cleared before the re-entrancy check, not after it. Any entry here
+			// absorbs the outstanding request, and the early return below is an
+			// entry: leaving the flag set there meant the re-entry was recorded,
+			// consumed by the tail, and then dropped anyway, because
+			// RequestFlushLocked() short-circuits on this very flag. Write()
+			// short-circuits on it too, so the queue stranded for good with
+			// IsOk() still reporting true.
+			m_flushPending = false;
+			if (m_flushInProgress) {
+				// Record it rather than drop it: the outer flush offers bytes
+				// this caller has not seen, so returning silently would lose
+				// whatever edge asked for this one.
+				m_flushAgain = true;
+				return;
+			}
+			if (m_socket == nullptr || !m_stream.IsOk()) {
+				return;
+			}
+			socket = m_socket;
+			// Bounded: a blocked socket would otherwise have its whole
+			// backlog copied on every attempt, and libutp takes at most a
+			// window anyway.
+			pending = m_stream.PeekQueuedBytes(kFlushChunk);
+			if (pending.empty()) {
+				return;
+			}
+			m_flushInProgress = true;
+			m_flushAgain = false;
+		}
+		// From here the in-progress flag must be cleared on every exit: the
+		// library call and the writable notification both reach code that can
+		// throw, and a flag left set stops Write() from ever requesting a
+		// flush again -- silently, with IsOk() still true.
+		CFlushGuard guard(*this);
+
+		// Offered with the lock released: IUtpSocketOperations' calls can
+		// re-enter, and a callback that reaches Flush() again would deadlock
+		// against a non-recursive mutex held across the call.
+		const std::ptrdiff_t result =
+			m_operations.WriteToSocket(socket, pending.data(), pending.size());
+		const size_t accepted = result > 0 ? static_cast<size_t>(result) : 0;
+		IStreamTransportEvents *writableEvents = nullptr;
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			const bool wasBlocked = m_stream.BlocksWrite();
+			if (m_socket == socket && m_stream.IsOk()) {
+				m_stream.ConsumeQueuedBytes(std::min(accepted, pending.size()));
+				if (wasBlocked && !m_stream.BlocksWrite()) {
+					writableEvents = m_events;
+				}
+			}
+		}
+		if (writableEvents != nullptr) {
+			writableEvents->OnStreamWritable();
+		}
+		IStreamTransportEvents *flushEvents = nullptr;
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			// Released first and unconditionally: short-circuiting past it
+			// would leave the re-entry recorded but never consumed, and the
+			// in-progress flag set while the sink below runs.
+			const bool reentered = guard.Release();
+			// A fully accepted offer needs a local continuation: utp_writev
+			// returns as soon as it has sent everything it was given, without
+			// arming CS_CONNECTED_FULL, so no writable edge is coming for the
+			// rest of the queue. A partial or window-full result did arm it.
+			if (accepted == pending.size() || reentered) {
+				flushEvents = RequestFlushLocked();
+			}
+		}
+		RaiseFlushRequest(flushEvents);
+	}
+
+	// -- libutp callbacks, translated ---------------------------------
+
+	// Adapter transition, not a libutp callback: the future acceptor MUST call
+	// this from UTP_ON_ACCEPT. Only outgoing sockets get UTP_STATE_CONNECT.
+	void MarkConnected()
+	{
+		IStreamTransportEvents *flushEvents = nullptr;
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			if (m_connected || m_socket == nullptr || !m_stream.IsOk()) {
+				return;
+			}
+			m_connected = true;
+			flushEvents = RequestFlushLocked();
+		}
+		// Requested, not flushed: this runs inside UTP_ON_ACCEPT, where the
+		// socket is still CS_SYN_RECV, so utp_writev would refuse every byte
+		// at its state guard and the peek would be copied for nothing.
+		RaiseFlushRequest(flushEvents);
+		NotifyEvents(&IStreamTransportEvents::OnStreamConnected);
+		NotifyEvents(&IStreamTransportEvents::OnStreamWritable);
+	}
+
+	void OnPayload(const uint8_t *data, size_t length)
+	{
+		IStreamTransportEvents *flushEvents = nullptr;
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			m_stream.OnPayload(data, length);
+			// This ST_DATA is what completes an inbound handshake, and
+			// libutp makes that transition silently: CS_SYN_RECV becomes
+			// CS_CONNECTED with no callback at all. Until it happens
+			// utp_writev refuses everything without arming a writable edge,
+			// so a reply queued at accept has been waiting for this moment.
+			// Requested rather than flushed here, because this runs inside
+			// UTP_ON_READ, which would re-enter utp_process_incoming.
+			//
+			// A peer that connects and then says nothing never reaches this,
+			// and so never gets its reply -- unreachable for eD2k, where the
+			// side that opened the connection always speaks first.
+			flushEvents = RequestFlushLocked();
+		}
+		RaiseFlushRequest(flushEvents);
+		NotifyEvents(&IStreamTransportEvents::OnStreamReadable);
+	}
+
+	void OnWritable() { Flush(); }
+
+	void OnEnded(EUtpTransportFailure failure)
+	{
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			m_stream.OnFailure(failure);
+			m_connected = false;
+			if (failure == EUtpTransportFailure::Destroying) {
+				// The handle dies with this callback, so it must not be
+				// closed and must not be touched again. Clearing it is
+				// what stops the destructor, and everything else, from
+				// reaching for it.
+				m_socket = nullptr;
+			}
+		}
+		NotifyEvents(&IStreamTransportEvents::OnStreamLost);
+	}
+
+	//! For the acceptor and for tests; never leaves the adapter otherwise.
+	IUtpSocketOperations::Handle SocketHandle() const
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		return m_socket;
+	}
+
+	//! After construction: the receiving socket does not exist until admission
+	//! has decided, and admission needs the transport first.
+	void SetEvents(IStreamTransportEvents *events) override
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		m_events = events;
+	}
+
+	//! How the stream ended, for a caller that needs more than IsOk().
+	EUtpTransportFailure Failure() const
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		return m_stream.Failure();
+	}
+
+	/**
+	 * Per socket, not looked up from the destination: one address can host
+	 * several clients, and the wrong hash leaves the recipient unable to
+	 * decrypt. Copied because AttachToAlreadyKnown() can replace the client.
+	 */
+	void SetCryptParameters(bool encrypt, const uint8_t *userHash)
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		m_encrypt = encrypt && userHash != nullptr;
+		if (m_encrypt) {
+			std::copy(userHash, userHash + kUserHashBytes, m_userHash);
+		}
+	}
+
+	//! True when SendUtpDatagram() should obfuscate, with the hash to key on.
+	bool CryptParameters(const uint8_t **userHash) const
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		if (!m_encrypt) {
+			return false;
+		}
+		*userHash = m_userHash;
+		return true;
+	}
+
+	//! Current buffered bytes, pulled synchronously by UTP_GET_READ_BUFFER_SIZE.
+	size_t ReadBufferSize() const
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		return m_stream.ReadBufferSize();
+	}
+
+	//! Bytes queued and not yet accepted by libutp.
+	size_t PendingWriteBytes() const
+	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+		return m_stream.WriteBufferSize();
+	}
+
+private:
+	//! Clears the in-progress flag on every exit and reports any re-entry.
+	class CFlushGuard
+	{
+	public:
+		explicit CFlushGuard(CUtpSocketTransport &owner)
+		: m_owner(owner)
+		{
+		}
+
+		~CFlushGuard()
+		{
+			std::lock_guard<std::mutex> lock(m_owner.m_mutex);
+			m_owner.m_flushInProgress = false;
+		}
+
+		//! Caller holds the mutex. True when a flush was requested meanwhile.
+		bool Release()
+		{
+			m_owner.m_flushInProgress = false;
+			const bool again = m_owner.m_flushAgain;
+			m_owner.m_flushAgain = false;
+			return again;
+		}
+
+		CFlushGuard(const CFlushGuard &) = delete;
+		CFlushGuard &operator=(const CFlushGuard &) = delete;
+
+	private:
+		CUtpSocketTransport &m_owner;
+	};
+
+	// Caller holds m_mutex. The returned sink must be called unlocked.
+	IStreamTransportEvents *RequestFlushLocked()
+	{
+		if (m_flushPending || m_socket == nullptr || !m_stream.IsOk() ||
+			m_stream.WriteBufferSize() == 0 || m_events == nullptr) {
+			return nullptr;
+		}
+		m_flushPending = true;
+		return m_events;
+	}
+
+	/**
+	 * Delivers a flush request, and does not leave the flag set if it throws.
+	 *
+	 * m_flushPending gates every later request, so a sink that throws with it
+	 * still set stops the socket sending for good, silently, with IsOk() still
+	 * reporting true. Same wedge CFlushGuard prevents, one flag over.
+	 */
+	void RaiseFlushRequest(IStreamTransportEvents *events)
+	{
+		if (events == nullptr) {
+			return;
+		}
+		try {
+			events->OnFlushRequested();
+		} catch (...) {
+			{
+				std::lock_guard<std::mutex> lock(m_mutex);
+				m_flushPending = false;
+			}
+			throw;
+		}
+	}
+
+	void NotifyEvents(void (IStreamTransportEvents::*callback)())
+	{
+		IStreamTransportEvents *events = nullptr;
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			events = m_events;
+		}
+		if (events != nullptr) {
+			(events->*callback)();
+		}
+	}
+
+	//! One window's worth, so an offer costs a packet or two, not the backlog.
+	static constexpr size_t kFlushChunk = 64 * 1024;
+
+	//! An ed2k user hash. Copied, so the owning client may be replaced.
+	static constexpr size_t kUserHashBytes = 16;
+
+	IUtpSocketOperations &m_operations;
+	mutable std::mutex m_mutex;
+	IUtpSocketOperations::Handle m_socket;
+	const CNetworkAddress m_peer;
+	const uint16_t m_peerPort;
+	const bool m_inbound;
+	// Non-owning: the owner must quiesce Write()/queued pumps before destruction
+	// and keep the sink alive through all calls. Callbacks must not delete this
+	// transport synchronously. Destruction detaches before library re-entry.
+	IStreamTransportEvents *m_events;
+	CUtpStream m_stream;
+	bool m_connected = false;
+	bool m_flushPending = false;
+	bool m_flushInProgress = false;
+	bool m_flushAgain = false;
+	bool m_encrypt = false;
+	uint8_t m_userHashkUserHashBytes = { 0 };
+};
+
+#endif // UTPSOCKETTRANSPORT_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/UtpStream.h Added

@@ -0,0 +1,287 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 UTPSTREAM_H
+#define UTPSTREAM_H
+
+#include "UtpTransportFailure.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <deque>
+#include <vector>
+
+/**
+ * The buffering a uTP stream needs, with no libutp in sight.
+ *
+ * libutp hands bytes up in a callback and takes bytes down through a call, and neither happens when
+ * the eD2k stack above wants it to. This holds the two queues in between and answers the would-
+ * block questions CEMSocket asks, so the state machine can be tested without a library, a socket or
+ * a peer.
+ *
+ * It calls nothing. Read-drained and window notifications are the transport's to send, from the
+ * main thread; this only reports when they are due, because a class that both buffers bytes and re-
+ * enters libutp is the one that deadlocks when libutp calls back into it.
+ */
+class CUtpStream
+{
+public:
+	//! Default bound on unsent bytes. One eD2k block plus headroom.
+	static constexpr size_t kDefaultWriteBound = 256 * 1024;
+
+	//! One datagram's worth: how far short of the bound a stalled stream sits.
+	static constexpr size_t kWindowSlackBytes = 2048;
+
+	//! A datagram's worth, or a proportion when the bound is smaller than one.
+	size_t WindowSlack() const
+	{
+		const size_t proportional = m_readBound / 8;
+		return proportional < kWindowSlackBytes ? proportional : kWindowSlackBytes;
+	}
+
+	//! PeekQueuedBytes() default: no cap, the whole queue.
+	static constexpr size_t kNoPeekLimit = static_cast<size_t>(-1);
+
+	/**
+	 * Default bound on buffered received bytes.
+	 *
+	 * @b Not a cap that drops bytes: libutp can deliver more than this in one callback and
+	 * received data is never discarded, because a byte thrown away here is a hole in a file the
+	 * peer already paid to send. It is the number UTP_GET_READ_BUFFER_SIZE reports, which is
+	 * how libutp decides to stop advertising receive window -- so the bound is applied by the
+	 * peer slowing down, one round trip later, rather than by this class refusing anything.
+	 *
+	 * Inert until the acceptor wires that callback. It is decided here so the acceptor inherits
+	 * a value rather than inventing one, and so both directions are bounded: an unbounded read
+	 * buffer is how a peer that sends faster than the application reads grows memory without
+	 * limit.
+	 *
+	 * 256 KiB, because this is the number that goes on the wire. libutp advertises opt_rcvbuf
+	 * minus what is queued as the window in every packet, and the peer will not have more than
+	 * that in flight, so the bound is a per-connection speed limit: at 300 ms round trip 64 KiB
+	 * is about 218 KB/s, where TCP has no such limit at all because the OS autotunes its window
+	 * into megabytes. It cannot be raised on its own -- whatever is advertised is what arrives,
+	 * and OnPayload() never refuses bytes the peer already paid to send -- so this value is also
+	 * the memory a single slow-reading connection may hold. eMuleAI settled on the same 256 KiB
+	 * (eMuleAI/UtpSocket.cpp), which is the interoperability argument for it as well.
+	 */
+	static constexpr size_t kDefaultReadBound = 256 * 1024;
+
+	explicit CUtpStream(size_t writeBound = kDefaultWriteBound, size_t readBound = kDefaultReadBound)
+	: m_writeBound(writeBound)
+	, m_readBound(readBound)
+	{
+	}
+
+	// -- inbound ------------------------------------------------------
+
+	//! Bytes arrived from the peer. Called from libutp's read callback.
+	void OnPayload(const uint8_t *data, size_t length)
+	{
+		if (data == nullptr || length == 0) {
+			return;
+		}
+		m_readBuffer.insert(m_readBuffer.end(), data, data + length);
+		m_blocksRead = false;
+	}
+
+	/**
+	 * Moves buffered bytes out. An empty buffer is a would-block, not an end: 0 bytes,
+	 * BlocksRead() set, LastError() still 0. Once the peer has sent EOF an empty buffer is the
+	 * end of the stream instead, and that is the one case where 0 means no more bytes are
+	 * coming.
+	 */
+	uint32_t Read(void *buffer, uint32_t length)
+	{
+		if (buffer == nullptr || length == 0) {
+			return 0;
+		}
+		const size_t available = m_readBuffer.size();
+		if (available == 0) {
+			m_blocksRead = !IsTerminal();
+			return 0;
+		}
+		const size_t taken = available < length ? available : length;
+		const auto consumed = static_cast<std::deque<uint8_t>::difference_type>(taken);
+		std::copy(m_readBuffer.begin(),
+			m_readBuffer.begin() + consumed,
+			static_cast<uint8_t *>(buffer));
+		m_readBuffer.erase(m_readBuffer.begin(), m_readBuffer.begin() + consumed);
+		m_blocksRead = false;
+		// On the crossing, not on an empty buffer: a packet reader keeps a
+		// backlog forever and would never signal. Measured a packet short of
+		// the bound because occupancy never reaches it -- libutp advertises
+		// opt_rcvbuf minus occupancy and stops once that cannot hold another
+		// packet, stalling at 64954 of 65536. Comparing against the bound never
+		// fires, and the transfer hangs on a zero-window probe.
+		const size_t highWater = ReadBound() - WindowSlack();
+		if (!IsTerminal() && available >= highWater && m_readBuffer.size() < highWater) {
+			m_readDrainedDue = true;
+		}
+		return static_cast<uint32_t>(taken);
+	}
+
+	//! What libutp's read-buffer-size callback should report.
+	size_t ReadBufferSize() const { return m_readBuffer.size(); }
+
+	/**
+	 * The value the acceptor passes to utp_setsockopt(UTP_RCVBUF). libutp applies the bound
+	 * itself: get_rcv_window() advertises opt_rcvbuf minus what ReadBufferSize() reports, so a
+	 * reader that falls behind shrinks the window to zero and the peer stops. Read() reports
+	 * the crossing back below this bound so the transport can advertise the reopened window.
+	 * This never refuses payloads, which would drop bytes the peer already paid to send.
+	 */
+	size_t ReadBound() const { return m_readBound; }
+
+	//! True once per pending crossing below ReadBound(), for the libutp notification owner.
+	bool ConsumeReadDrainedEdge()
+	{
+		const bool due = m_readDrainedDue;
+		m_readDrainedDue = false;
+		return due;
+	}
+
+	// -- outbound -----------------------------------------------------
+
+	/**
+	 * Queues bytes for the peer. A full queue is a would-block: 0 bytes, BlocksWrite() set, no
+	 * error. The bound exists because libutp accepts writes into its own send buffer without
+	 * limit, so an unbounded queue here would let a stalled peer grow memory until the upload
+	 * thread noticed, which it has no way to do.
+	 */
+	uint32_t Write(const void *buffer, uint32_t length)
+	{
+		if (IsTerminal() || buffer == nullptr || length == 0) {
+			return 0;
+		}
+		const size_t queued = m_writeBuffer.size();
+		if (queued >= m_writeBound) {
+			m_blocksWrite = true;
+			return 0;
+		}
+		const size_t room = m_writeBound - queued;
+		const size_t taken = room < length ? room : length;
+		const uint8_t *in = static_cast<const uint8_t *>(buffer);
+		m_writeBuffer.insert(m_writeBuffer.end(), in, in + taken);
+		m_blocksWrite = m_writeBuffer.size() >= m_writeBound;
+		return static_cast<uint32_t>(taken);
+	}
+
+	size_t WriteBufferSize() const { return m_writeBuffer.size(); }
+
+	/**
+	 * The queued bytes, for the caller that will offer them to libutp.
+	 *
+	 * @a limit caps the copy. libutp takes at most a window per call anyway,
+	 * so offering the whole backlog copies bytes that cannot be accepted --
+	 * and a blocked socket would pay that copy again on every attempt.
+	 */
+	std::vector<uint8_t> PeekQueuedBytes(size_t limit = kNoPeekLimit) const
+	{
+		const size_t queued = m_writeBuffer.size();
+		const size_t taken = limit < queued ? limit : queued;
+		return std::vector<uint8_t>(m_writeBuffer.begin(),
+			m_writeBuffer.begin() + static_cast<std::deque<uint8_t>::difference_type>(taken));
+	}
+
+	/**
+	 * Drops the bytes libutp accepted and keeps the rest queued. utp_write() returns how much
+	 * it took, which is less than it was offered as soon as the congestion window is full, and
+	 * zero while the socket is not connected. Handing the whole queue out and clearing it would
+	 * leave the caller holding the refused tail with nowhere to put it back, so it would need a
+	 * second queue that WriteBufferSize() cannot see and m_writeBound does not bound. Peek,
+	 * offer, then consume what was taken.
+	 */
+	void ConsumeQueuedBytes(size_t accepted)
+	{
+		const size_t queued = m_writeBuffer.size();
+		const size_t drop = accepted < queued ? accepted : queued;
+		m_writeBuffer.erase(m_writeBuffer.begin(),
+			m_writeBuffer.begin() + static_cast<std::deque<uint8_t>::difference_type>(drop));
+		m_blocksWrite = m_writeBuffer.size() >= m_writeBound;
+	}
+
+	// -- ending -------------------------------------------------------
+
+	/**
+	 * Records how the stream ended; the first end wins. A reset arriving after a clean EOF does
+	 * not turn a finished transfer into a failed one, which is what would happen if the last
+	 * writer won.
+	 */
+	void OnFailure(EUtpTransportFailure failure)
+	{
+		if (failure != EUtpTransportFailure::None && m_failure == EUtpTransportFailure::None) {
+			m_failure = failure;
+		}
+		m_blocksRead = false;
+		m_blocksWrite = false;
+	}
+
+	EUtpTransportFailure Failure() const { return m_failure; }
+	bool IsTerminal() const { return IsUtpTerminal(m_failure); }
+
+	/**
+	 * Whether the stream is still usable, as IStreamTransport::IsOk() means it. A clean EOF
+	 * ends the stream without failing it, so Write() refuses with 0 while BlocksWrite() and
+	 * LastError() are both still 0. Those two alone describe a would-block, which this is not,
+	 * so the difference has to be askable rather than inferred from the pair.
+	 */
+	bool IsOk() const { return !IsTerminal(); }
+
+	/**
+	 * Nonzero only for a real failure. EOF and destroying are ends, not errors.
+	 *
+	 * The value is opaque: only its truthiness is defined. It is offset out of the way on
+	 * purpose, because this stands in for CLibSocket::LastError() under the same name and type
+	 * and a call site comparing against a known constant would otherwise match by coincidence
+	 * -- wrong, and silent. CLibSocket::LastError() returns a boost error_code value (see
+	 * m_ErrorCode in LibSocketAsio.cpp), so the range to clear is errno on POSIX and the
+	 * WinSock codes on Windows, not wxSocketError. Callers wanting the reason ask Failure().
+	 */
+	int LastError() const
+	{
+		return IsUtpFailure(m_failure) ? kErrorBase + static_cast<int>(m_failure) : 0;
+	}
+
+	bool BlocksRead() const { return m_blocksRead; }
+	bool BlocksWrite() const { return m_blocksWrite; }
+
+private:
+	//! Above errno, the WinSock range (10000-11999) and wxSocketError alike,
+	//! so a stray comparison against any of them cannot match.
+	static constexpr int kErrorBase = 0x7500;
+
+	std::deque<uint8_t> m_readBuffer;
+	std::deque<uint8_t> m_writeBuffer;
+	size_t m_writeBound;
+	size_t m_readBound;
+	bool m_blocksRead = false;
+	bool m_blocksWrite = false;
+	bool m_readDrainedDue = false;
+	EUtpTransportFailure m_failure = EUtpTransportFailure::None;
+};
+
+#endif // UTPSTREAM_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/UtpStreamAcceptor.cpp Added

@@ -0,0 +1,86 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "UtpStreamAcceptor.h"
+
+#include "ClientTCPSocket.h"
+#include "Logger.h"
+#include "ClientList.h"
+#include "IPFilter.h"
+#include "ListenSocket.h"
+#include "ServerConnect.h"
+#include "Statistics.h"
+#include "StreamTransport.h"
+#include "amule.h"
+
+#ifdef AMULE_UTP_TRANSPORT
+
+bool CUtpStreamAcceptor::AcceptStream(
+	std::unique_ptr<IStreamTransport> &transport, uint32_t ip, uint16_t port)
+{
+	// Refusals come before ownership moves: destroying a transport closes its
+	// socket, and the adapter closes a refused one too.
+	const EUtpAdmission decision = DecideUtpAdmission(theApp->IsRunning(),
+		theApp->serverconnect->IsConnecting(),
+		theApp->listensocket->TooManySockets(),
+		ip,
+		ip != 0 && theApp->ipfilter->IsFiltered(ip),
+		ip != 0 && theApp->clientlist->IsBannedClient(ip));
+
+	switch (decision) {
+	case EUtpAdmission::Admit:
+		break;
+	case EUtpAdmission::TooManySockets:
+		// Per stream: a uTP SYN arrives alone, with no accept burst to fold.
+		theStats::AddMaxConnectionLimitReached();
+		return false;
+	case EUtpAdmission::Filtered:
+		AddDebugLogLineN(logClient,
+			CFormat("Denied uTP stream from %s:%u (Filtered IP)") % Uint32toStringIP(ip) % port);
+		return false;
+	case EUtpAdmission::Banned:
+		AddDebugLogLineN(logClient,
+			CFormat("Denied uTP stream from %s:%u (Banned IP)") % Uint32toStringIP(ip) % port);
+		return false;
+	case EUtpAdmission::ShuttingDown:
+	case EUtpAdmission::NoAddress:
+		return false;
+	}
+
+	auto *socket = new CClientTCPSocket();
+	// AttachTransport() installs the event sink before it takes ownership, so
+	// an early callback always has somewhere to deliver.
+	socket->AttachTransport(std::move(transport));
+	// Records m_remoteip; its checks were made above. Refusal still has to delete
+	// the socket, as CListenSocket::OnAccept does, or it stays with no address.
+	if (!socket->InitNetworkData(CClientTCPSocket::AdmissionTransport::UTP)) {
+		socket->Safe_Delete();
+		return false;
+	}
+	AddDebugLogLineN(logClient, CFormat("Accepted uTP stream from %s:%u") % Uint32toStringIP(ip) % port);
+	return true;
+}
+
+#endif // AMULE_UTP_TRANSPORT
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/UtpStreamAcceptor.h Added

@@ -0,0 +1,77 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 UTPSTREAMACCEPTOR_H
+#define UTPSTREAMACCEPTOR_H
+
+#include "UtpContext.h"
+
+//! Why an accepted uTP stream was, or was not, taken.
+enum class EUtpAdmission
+{
+	Admit,
+	ShuttingDown,
+	TooManySockets,
+	NoAddress,
+	Filtered,
+	Banned
+};
+
+/**
+ * The admission decision, separated from gathering the facts it needs.
+ *
+ * What CListenSocket::OnAccept and CClientTCPSocket::InitNetworkData ask for
+ * TCP. @a connectingToServer is the listener's exception: refusing then is what
+ * produces a LowID on every server.
+ */
+constexpr EUtpAdmission DecideUtpAdmission(
+	bool running, bool connectingToServer, bool tooManySockets, uint32_t ip, bool filtered, bool banned)
+{
+	if (!running) {
+		return EUtpAdmission::ShuttingDown;
+	}
+	if (!connectingToServer && tooManySockets) {
+		return EUtpAdmission::TooManySockets;
+	}
+	if (ip == 0) {
+		return EUtpAdmission::NoAddress;
+	}
+	if (filtered) {
+		return EUtpAdmission::Filtered;
+	}
+	if (banned) {
+		return EUtpAdmission::Banned;
+	}
+	return EUtpAdmission::Admit;
+}
+
+//! Gathers those facts from the application and acts on the decision.
+class CUtpStreamAcceptor : public IUtpStreamAcceptor
+{
+public:
+	bool AcceptStream(std::unique_ptr<IStreamTransport> &transport, uint32_t ip, uint16_t port) override;
+};
+
+#endif // UTPSTREAMACCEPTOR_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/UtpTransportFailure.h Added

@@ -0,0 +1,71 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 UTPTRANSPORTFAILURE_H
+#define UTPTRANSPORTFAILURE_H
+
+/**
+ * How a uTP stream ended.
+ *
+ * Three of these are ends the peer chose and two are ends the transport reports. They are one enum
+ * rather than a bool because the caller acts differently on each: a refused connection says the
+ * peer is reachable and declined, a timeout says nothing about the peer at all, and a reset says
+ * the connection existed and no longer does. Collapsing them is how a dead peer and a firewalled
+ * one become indistinguishable in the source list.
+ *
+ * @c Eof, @c Closed and @c Destroying are terminal but are @b not failures. A peer that closes
+ * cleanly after sending what it owed has not failed, and reporting it as an error would penalise
+ * it in exactly the accounting a clean close should leave alone.
+ */
+enum class EUtpTransportFailure
+{
+	//! No end yet: the stream is live, or ended cleanly.
+	None,
+	//! The peer answered and declined the connection.
+	Refused,
+	//! No answer within the transport's own retransmission budget.
+	TimedOut,
+	//! The connection existed and the peer tore it down.
+	Reset,
+	//! The peer finished sending. Not an error.
+	Eof,
+	//! We closed it. Not an error, and distinct from a FIN we never saw.
+	Closed,
+	//! The library is destroying the socket. Not an error.
+	Destroying
+};
+
+inline bool IsUtpFailure(EUtpTransportFailure failure) noexcept
+{
+	return failure == EUtpTransportFailure::Refused || failure == EUtpTransportFailure::TimedOut ||
+	       failure == EUtpTransportFailure::Reset;
+}
+
+inline bool IsUtpTerminal(EUtpTransportFailure failure) noexcept
+{
+	return failure != EUtpTransportFailure::None;
+}
+
+#endif // UTPTRANSPORTFAILURE_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/VersionCheck.cpp Added

@@ -0,0 +1,129 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "VersionCheck.h"
+
+#include "config.h" // Needed for ENABLE_VERSION_CHECK
+
+#ifdef ENABLE_VERSION_CHECK
+
+#include "OtherFunctions.h" // CompareLatestReleaseVersion
+#include "Logger.h"         // AddDebugLogLineN / logGeneral
+#include "HTTPDownload.h"   // CreateAmuleWebRequest (shared curl session + interface bind)
+
+wxDEFINE_EVENT(wxEVT_VERSION_CHECK_DONE, wxCommandEvent);
+
+// GitHub Releases "latest" endpoint -- returns the most recent non-prerelease, non-draft release as
+// JSON. The same source the daemon-side CamuleApp::CheckNewVersion uses.
+static const wxString VERSION_CHECK_URL = wxT("https://api.github.com/repos/amule-org/amule/releases/latest");
+
+CVersionCheck::CVersionCheck()
+: m_notify(NULL)
+, m_notifyId(wxID_ANY)
+, m_status(Failed)
+{
+}
+
+CVersionCheck::~CVersionCheck()
+{
+	if (m_request.IsOk() && m_request.GetState() == wxWebRequest::State_Active) {
+		m_request.Cancel();
+	}
+}
+
+void CVersionCheck::Start(wxEvtHandler *notify, int notifyId)
+{
+	if (m_status == Checking) {
+		return;
+	}
+	m_notify = notify;
+	m_notifyId = notifyId;
+	m_status = Checking;
+	m_latest.Clear();
+
+	// Shared aMule HTTP path: curl-backed session, proxy, and egress bound to the configured
+	// network interface when one is set, so the check does not leak past a bound interface.
+	m_request = CreateAmuleWebRequest(this, VERSION_CHECK_URL);
+	if (!m_request.IsOk()) {
+		Finish(Failed);
+		return;
+	}
+	// The body is a few KB of JSON -- keep it in memory, no temp file.
+	m_request.SetStorage(wxWebRequest::Storage_Memory);
+	// GitHub's API rejects requests without a User-Agent header.
+	m_request.SetHeader(wxT("User-Agent"), wxT("aMule"));
+	m_request.SetHeader(wxT("Accept"), wxT("application/vnd.github+json"));
+	Bind(wxEVT_WEBREQUEST_STATE, &CVersionCheck::OnRequestState, this);
+	m_request.Start();
+}
+
+void CVersionCheck::OnRequestState(wxWebRequestEvent &evt)
+{
+	switch (evt.GetState()) {
+	case wxWebRequest::State_Completed:
+		Finish(Evaluate(evt.GetResponse().AsString()));
+		break;
+	case wxWebRequest::State_Failed:
+	case wxWebRequest::State_Unauthorized:
+		AddDebugLogLineN(logGeneral, wxT("Version check failed: ") + evt.GetErrorDescription());
+		Finish(Failed);
+		break;
+	case wxWebRequest::State_Cancelled:
+		Finish(Failed);
+		break;
+	default:
+		// State_Idle / State_Active -- request still in progress.
+		break;
+	}
+}
+
+CVersionCheck::Status CVersionCheck::Evaluate(const wxString &json)
+{
+	// Shared parse + compare (see OtherFunctions.cpp:CompareLatestReleaseVersion). The same
+	// logic the daemon check and amuleapi use, so there is a single source of truth for how a
+	// GitHub release tag is interpreted.
+	const CVersionCompareResult r = CompareLatestReleaseVersion(json);
+	switch (r.state) {
+	case CVersionCompareResult::Outdated:
+		m_latest = r.latest;
+		return Outdated;
+	case CVersionCompareResult::UpToDate:
+		return UpToDate;
+	case CVersionCompareResult::ParseError:
+	default:
+		return Failed;
+	}
+}
+
+void CVersionCheck::Finish(Status status)
+{
+	m_status = status;
+	if (m_notify) {
+		wxCommandEvent evt(wxEVT_VERSION_CHECK_DONE, m_notifyId);
+		evt.SetInt(status);
+		m_notify->AddPendingEvent(evt);
+	}
+}
+
+#endif // ENABLE_VERSION_CHECK

amule-3.1.0.tar.gz/src/VersionCheck.h Added

@@ -0,0 +1,92 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 VERSIONCHECK_H
+#define VERSIONCHECK_H
+
+#include "config.h" // for ENABLE_VERSION_CHECK
+
+#ifdef ENABLE_VERSION_CHECK
+
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/webrequest.h>
+
+// Posted (as a wxCommandEvent) to the handler passed to CVersionCheck::Start()
+// when a check finishes. GetInt() carries the resulting CVersionCheck::Status.
+wxDECLARE_EVENT(wxEVT_VERSION_CHECK_DONE, wxCommandEvent);
+
+// Fetches the latest published aMule release from GitHub and compares it against the running client
+// version (VERSION_MJR / MIN / UPDATE).
+//
+// Shared by the monolithic GUI and amulegui: both are GUI clients built from the same version
+// macros, so neither needs the daemon core nor an EC roundtrip to answer "is a newer aMule
+// available?".
+//
+// Asynchronous: Start() kicks off a wxWebRequest and returns immediately; the result arrives later
+// as a wxEVT_VERSION_CHECK_DONE event on the caller's handler. One instance runs at most one check
+// at a time.
+class CVersionCheck : public wxEvtHandler
+{
+public:
+	enum Status
+	{
+		Checking, // a request is currently in flight
+		UpToDate, // running version is the latest release (or newer)
+		Outdated, // a newer release exists -- see LatestVersion()
+		Failed    // network or parse error
+	};
+
+	CVersionCheck();
+	~CVersionCheck() override;
+
+	// Start an asynchronous check. On completion a wxEVT_VERSION_CHECK_DONE command event with
+	// id == notifyId is posted to notify. A Start() call while a check is already in flight is
+	// ignored.
+	void Start(wxEvtHandler *notify, int notifyId);
+
+	Status GetStatus() const { return m_status; }
+
+	// Latest release version as "X.Y.Z"; populated when the status is
+	// Outdated, empty otherwise.
+	const wxString &LatestVersion() const { return m_latest; }
+
+private:
+	void OnRequestState(wxWebRequestEvent &evt);
+	void Finish(Status status);
+
+	// Parse the /releases/latest JSON, extract tag_name, and compare it
+	// against the running version. Sets m_latest on Outdated.
+	Status Evaluate(const wxString &json);
+
+	wxWebRequest m_request;
+	wxEvtHandler *m_notify;
+	int m_notifyId;
+	Status m_status;
+	wxString m_latest;
+};
+
+#endif // ENABLE_VERSION_CHECK
+
+#endif // VERSIONCHECK_H

amule-3.1.0.tar.gz/src/WarningsPop.h Added

@@ -0,0 +1,31 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// Closes a block opened by WarningsPush_CryptoPP.h or WarningsPush_Asio.h. Deliberately unguarded:
+// a translation unit opens and closes one of these blocks per third-party include group, so this
+// file has to be includable more than once.
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

amule-3.1.0.tar.gz/src/WarningsPush_Asio.h Added

@@ -0,0 +1,46 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// Silences the deprecation diagnostics Boost.Asio's headers trip, across the includes that follow
+// and nothing else. Close with WarningsPop.h.
+//
+// Asio gives several exception types a user-provided destructor alongside an implicit copy
+// constructor, and its execution headers define constexpr statics out of line, which C++17 makes
+// redundant. Both are deprecated and the -Werror=deprecated gate reaches them. Named exactly rather
+// than a blanket suppression, for the reason in WarningsPush_CryptoPP.h.
+//
+// Measured with AppleClang 21 and Boost 1.92: without both suppressions ip/tcp.hpp produces 29
+// errors under -Werror=deprecated, 27 redundant constexpr static definitions and 2 deprecated
+// copies with a user-provided destructor. Each suppression is independently necessary.
+//
+// Only the wider closures need this: <boost/asio/ip/address.hpp> alone trips neither, measured at
+// zero, which is why NetworkAddressAsio.h has no wrap.
+//
+// Deliberately unguarded: see WarningsPop.h.
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-copy-with-user-provided-dtor"
+#pragma clang diagnostic ignored "-Wdeprecated-redundant-constexpr-static-def"
+#endif

amule-3.1.0.tar.gz/src/WarningsPush_CryptoPP.h Added

@@ -0,0 +1,45 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// Silences the deprecation diagnostics Crypto++'s headers trip, across the includes that follow and
+// nothing else. Close with WarningsPop.h.
+//
+// Crypto++ gives several classes a user-provided copy or destructor alongside an implicit
+// counterpart, and still carries dynamic exception specifications. All three are deprecated in
+// C++17 and the -Werror=deprecated gate in src/CMakeLists.txt reaches them, because the headers are
+// discovered without -isystem. A deprecation-warning audit build surfaces roughly 200 warnings from
+// cryptopp headers alone. Named exactly, rather than a blanket -Wno-deprecated, so a genuine
+// deprecation in aMule's own code still fails the build.
+//
+// Clang-only by necessity as well as by choice: GCC's -Wdeprecated-copy does not decompose into the
+// -with-user-provided-* sub-cases, so there is nothing for it to suppress.
+//
+// Deliberately unguarded: see WarningsPop.h.
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-copy-with-user-provided-copy"
+#pragma clang diagnostic ignored "-Wdeprecated-copy-with-user-provided-dtor"
+#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
+#endif

amule-3.0.1.tar.gz/src/amule-gui.cpp -> amule-3.1.0.tar.gz/src/amule-gui.cpp Changed

@@ -22,36 +22,44 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "amule.h"				// Interface declarations.
+#include "amule.h"                  // Interface declarations.
+#include "ProtocolHandlerManager.h" // Needed for ProtocolHandler_QueueSchemeLink
 
 #include <common/EventIDs.h>
 #include <common/ClientVersion.h>
 
-#include <wx/clipbrd.h>			// Needed for wxClipBoard
+#include <wx/clipbrd.h> // Needed for wxClipBoard
 #include <wx/sizer.h>
-#include <wx/tokenzr.h>			// Needed for wxStringTokenizer
-
-#include "SharedFilesWnd.h"		// Needed for CSharedFilesWnd
-#include "Timer.h"				// Needed for CTimer
-#include "AppImageIntegration.h"	// Needed for AppImage first-run prompt
-#include "CamuleArtProvider.h"	// Needed for wxArtProvider::Push() in OnInit
-#include "PartFile.h"			// Needed for CPartFile
-#include "PartFileHashThread.h"	// Needed for EVT_PARTFILE_HASH_RESULT
-
-#include "muuli_wdr.h"			// Needed for IDs
-#include "amuleDlg.h"			// Needed for CamuleDlg
+#include <wx/tokenzr.h> // Needed for wxStringTokenizer
+
+#include "SharedFilesWnd.h"      // Needed for CSharedFilesWnd
+#include "Timer.h"               // Needed for CTimer
+#include "AppImageIntegration.h" // Needed for AppImage first-run prompt
+#include "CamuleArtProvider.h"   // Needed for wxArtProvider::Push() in OnInit
+#include "PartFile.h"            // Needed for CPartFile
+#include "PartFileHashThread.h"  // Needed for EVT_PARTFILE_HASH_RESULT
+
+#include "muuli_wdr.h" // Needed for IDs
+#include "amuleDlg.h"  // Needed for CamuleDlg
+#ifdef GEOIP_GUI
+#include "CountryFlags.h"    // Needed for CCountryFlags
+#include "IP2Country.h"      // Needed for CIP2Country
+#include "PrefsUnifiedDlg.h" // Needed for NotifyIP2CountryUpdateFailedIfOpen
+#endif
 #include "PartFileConvert.h"
+#include "SearchDlg.h"  // Needed for CSearchDlg, CSearchListCtrl
+#include "SearchList.h" // Needed for CSearchList
 #include "ThreadTasks.h"
-#include "Logger.h"				// Needed for EVT_MULE_LOGGING
-#include "GuiEvents.h"			// Needed for EVT_MULE_NOTIFY
+#include "Logger.h"    // Needed for EVT_MULE_LOGGING
+#include "GuiEvents.h" // Needed for EVT_MULE_NOTIFY
 
 #ifdef __WXMAC__
-	#include <CoreFoundation/CFBundle.h>  // Do_not_auto_remove
-	#include <ApplicationServices/ApplicationServices.h>	// For LSRegisterURL // Do_not_auto_remove
+#include <CoreFoundation/CFBundle.h>                 // Do_not_auto_remove
+#include <ApplicationServices/ApplicationServices.h> // For LSRegisterURL // Do_not_auto_remove
 #endif
 
 #ifndef CLIENT_GUI
-#include "InternalEvents.h"		// Needed for wxEVT_*
+#include "InternalEvents.h" // Needed for wxEVT_*
 
 wxBEGIN_EVENT_TABLE(CamuleGuiApp, wxApp)
 
@@ -74,6 +82,9 @@
 	EVT_MULE_HASHING(CamuleGuiApp::OnFinishedHashing)
 	EVT_MULE_AICH_HASHING(CamuleGuiApp::OnFinishedAICHHashing)
 
+	// MediaProbe (#140) -- attaches media tags on the main thread.
+	EVT_MULE_MEDIA_PROBE(CamuleGuiApp::OnMediaProbeFinished)
+
 	// CPartFileHashThread per-part result
 	EVT_PARTFILE_HASH_RESULT(CamuleGuiApp::OnPartFileHashResult)
 
@@ -86,43 +97,63 @@
 	// Disk space preallocation finished
 	EVT_MULE_ALLOC_FINISHED(CamuleGuiApp::OnFinishedAllocation)
 
-	// macOS Dock right-click → Quit and system session end.
-	// Normal exit paths (red X, Cmd+Q, File > Quit) go through CamuleDlg::OnClose
-	// → ShutDown → OnExit. The Dock "Quit" path on macOS skips OnClose and
-	// requires an EVT_END_SESSION handler to ensure cleanup runs.
+	// macOS Dock right-click Quit and system session end. Normal exit paths (red X, Cmd+Q, File
+	// > Quit) go through CamuleDlg::OnClose -> ShutDown -> OnExit; the Dock Quit path skips
+	// OnClose and needs EVT_END_SESSION to run the cleanup.
 	EVT_QUERY_END_SESSION(CamuleGuiApp::OnQueryEndSession)
 	EVT_END_SESSION(CamuleGuiApp::OnEndSession)
 wxEND_EVENT_TABLE()
 
-
 IMPLEMENT_APP(CamuleGuiApp)
 
 #endif // CLIENT_GUI
 
 CamuleGuiBase::CamuleGuiBase()
 {
-	// Disable these checks for now.  The code really needs updating to
-	// eliminate these inconsistent flag uses, but these checks are new
-	// since wx3.0, and this should just return us to what 3.0 did.
+	// Disable these checks for now. The code really needs updating to eliminate these
+	// inconsistent flag uses, but the checks are new since wx3.0, and this returns us to what
+	// 3.0 did.
 	wxSizerFlags::DisableConsistencyChecks();
 
 	amuledlg = NULL;
-}
 
+#ifdef GEOIP_GUI
+	// Country flag images, shared by both GUIs. Codes come from the core resolver (monolithic)
+	// or the EC tag (amulegui); this maps them to flags. The resolver's manual-update failure
+	// popup is wired later, once the core has created the resolver in OnInit.
+	m_countryFlags = new CCountryFlags();
+#endif
+}
 
 CamuleGuiBase::~CamuleGuiBase()
 {
-	#ifndef CLIENT_GUI
+#ifndef CLIENT_GUI
 	CPartFileConvert::StopThread();
-	#endif
+#endif
+#ifdef GEOIP_GUI
+	delete m_countryFlags;
+	m_countryFlags = nullptr;
+#endif
 }
 
-
 int CamuleGuiBase::ShowAlert(wxString msg, wxString title, int flags)
 {
 	return wxMessageBox(msg, title, flags);
 }
 
+void CamuleGuiBase::FollowSystemAppearance()
+{
+#if wxCHECK_VERSION(3, 3, 0)
+	// Every other platform follows the desktop's light/dark setting by itself; MSW is the one
+	// that has to be asked, which is why aMule looked native in dark mode on GTK and macOS but
+	// not on Windows. Not gated on __WXMSW__: Appearance::System is the right request
+	// everywhere and a no-op elsewhere.
+	const wxApp::AppearanceResult appearance = wxTheApp->SetAppearance(wxApp::Appearance::System);
+	if (appearance == wxApp::AppearanceResult::Failure) {
+		AddDebugLogLineN(logStandard, "Could not follow the system light/dark appearance");
+	}
+#endif
+}
 
 int CamuleGuiBase::InitGui(bool geometry_enabled, wxString &geom_string)
 {
@@ -132,50 +163,39 @@
 	unsigned int geometry_width = 800;
 	unsigned int geometry_height = 600;
 
-	if ( geometry_enabled ) {
-		// I plan on moving this to a separate function, as it just clutters up OnInit()
-		/*
-		This implementation might work with mac, provided that the
-		SetSize() function works as expected.
-		*/
+	if (geometry_enabled) {
+		// TODO: move this to a separate function; it just clutters up OnInit(). It might work with
+		// mac too, provided SetSize() works as expected.
 
-		// Remove possible prefix
-		if ( geom_string.GetChar(0) == '=' ) {
-			geom_string.Remove( 0, 1 );
+		if (geom_string.GetChar(0) == '=') {
+			geom_string.Remove(0, 1);
 		}
 
-		// Stupid ToLong functions forces me to use longs =(
 		long width = geometry_width;
 		long height = geometry_height;
 
-		// Get the available display area
 		wxRect display = wxGetClientDisplayRect();
 
-		// We want to place aMule inside the client area by default
 		long x = display.x;
 		long y = display.y;
 
-		// Tokenize the string
 		wxStringTokenizer tokens(geom_string, "xX+-");
 
-		// First part: Program width
-		if ( tokens.GetNextToken().ToLong( &width ) ) {
-			wxString prefix = geom_string tokens.GetPosition() - 1 ;
-			if ( prefix == "x" || prefix == "X" ) {
-				// Second part: Program height
-				if ( tokens.GetNextToken().ToLong( &height ) ) {
-					prefix = geom_string tokens.GetPosition() - 1 ;
-					if ( prefix == "+" || prefix == "-" ) {
-						// Third part: X-Offset
-						if ( tokens.GetNextToken().ToLong( &x ) ) {
-							if ( prefix == "-" )
-								x = display.GetRight() - ( width + x );
-							prefix = geom_string tokens.GetPosition() - 1 ;
-							if ( prefix == "+" || prefix == "-" ) {
-								// Fourth part: Y-Offset
-								if ( tokens.GetNextToken().ToLong( &y ) ) {
-									if ( prefix == "-" )
-										y = display.GetBottom() - ( height + y );
+		if (tokens.GetNextToken().ToLong(&width)) {
+			wxString prefix = geom_stringtokens.GetPosition() - 1;
+			if (prefix == "x" || prefix == "X") {
+				if (tokens.GetNextToken().ToLong(&height)) {
+					prefix = geom_stringtokens.GetPosition() - 1;
+					if (prefix == "+" || prefix == "-") {
+						if (tokens.GetNextToken().ToLong(&x)) {
+							if (prefix == "-")
+								x = display.GetRight() - (width + x);
+							prefix = geom_stringtokens.GetPosition() - 1;
+							if (prefix == "+" || prefix == "-") {
+								if (tokens.GetNextToken().ToLong(&y)) {
+									if (prefix == "-")
+										y = display.GetBottom() -
+										    (height + y);
 								}
 							}
 						}
@@ -193,11 +213,11 @@
 
 	ResetTitle();
 
-	// Should default/last-used position be overridden?
-	if ( geometry_enabled ) {
-		amuledlg = new CamuleDlg(NULL, m_FrameTitle,
-		                         wxPoint(geometry_x,geometry_y),
-		                         wxSize( geometry_width, geometry_height - 58 ));
+	if (geometry_enabled) {
+		amuledlg = new CamuleDlg(NULL,
+			m_FrameTitle,
+			wxPoint(geometry_x, geometry_y),
+			wxSize(geometry_width, geometry_height - 58));
 	} else {
 		amuledlg = new CamuleDlg(NULL, m_FrameTitle);
 	}
@@ -205,21 +225,53 @@
 	return 0;
 }
 
-// Sets m_FrameTitle
+// See CamuleApp::RestoreSearchTabs(). Split out of InitGui() so it can run after the download queue
+// is loaded: CSearchList::LoadSearches() computes each restored result's download status against
+// downloadqueue/knownfiles/canceledfiles, and the queue is still empty while the GUI is being built
+// (#1101 -- restored results that were already downloading came back as NEW).
+void CamuleGuiBase::CreateRestoredSearchTabs()
+{
+#ifndef CLIENT_GUI
+	// Create a tab for every search restored from StoredSearches.met. Reuses the same
+	// unselected-tab path CSearchDlg::OnSearchAdded provides for a search discovered from
+	// another client -- a restored search is the same kind of thing, discovered locally instead
+	// of over EC. Nothing has started a search yet at this point in startup, so every entry
+	// here is a restored one.
+	//
+	// Monolithic (CSearchList) only: this file is also compiled into the amuleGUI target, where
+	// theApp->searchlist is CSearchListRem and restored searches arrive over EC_OP_SEARCH_LIST
+	// instead.
+	for (const auto &kv : theApp->searchlist->GetKnownSearchIds()) {
+		Notify_Search_Added(static_cast<wxUIntPtr>(kv.first),
+			kv.second,
+			static_cast<uint32>(theApp->searchlist->GetSearchLifecycleKindById(kv.first)));
+		// OnSearchAdded labels the tab " (0)", right for a freshly discovered foreign
+		// search but wrong here: LoadSearches() ran before this call, so the tab's list is
+		// already populated and only the label needs correcting.
+		if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+			if (CSearchListCtrl *page = theApp->amuledlg->m_searchwnd->GetSearchList(
+				    static_cast<wxUIntPtr>(kv.first))) {
+				theApp->amuledlg->m_searchwnd->UpdateHitCount(page);
+			}
+		}
+	}
+#endif
+}
+
 void CamuleGuiBase::ResetTitle()
 {
 #ifdef GITDATE
-	#ifdef CLIENT_GUI
-		m_FrameTitle = CFormat("aMule remote control %s %s") % VERSION % GITDATE;
-	#else
-		m_FrameTitle = CFormat("aMule %s %s") % VERSION % GITDATE;
-	#endif
+#ifdef CLIENT_GUI
+	m_FrameTitle = CFormat("aMule remote control %s %s") % VERSION % GITDATE;
 #else
-	#ifdef CLIENT_GUI
-		m_FrameTitle = _("aMule remote control");
-	#else
-		m_FrameTitle = _("aMule");
-	#endif
+	m_FrameTitle = CFormat("aMule %s %s") % VERSION % GITDATE;
+#endif
+#else
+#ifdef CLIENT_GUI
+	m_FrameTitle = _("aMule remote control");
+#else
+	m_FrameTitle = _("aMule");
+#endif
 
 	if (thePrefs::ShowVersionOnTitle()) {
 		m_FrameTitle += ' ';
@@ -228,7 +280,6 @@
 #endif
 }
 
-
 // Sets the contents of the clipboard. Prior content  erased.
 bool CamuleGuiBase::CopyTextToClipboard(wxString strText)
 {
@@ -242,21 +293,19 @@
 	return ClipBoardOpen;
 }
 
-
-void CamuleGuiBase::AddGuiLogLine(const wxString& line)
+void CamuleGuiBase::AddGuiLogLine(const wxString &line)
 {
 	if (amuledlg) {
-		while ( !m_logLines.empty() ) {
-			amuledlg->AddLogLine(m_logLines.front());
+		while (!m_logLines.empty()) {
+			amuledlg->AddGuiLogLine(m_logLines.front());
 			m_logLines.pop_front();
 		}
-		amuledlg->AddLogLine(line);
+		amuledlg->AddGuiLogLine(line);
 	} else {
 		m_logLines.push_back(line);
 	}
 }
 
-
 #ifndef CLIENT_GUI
 
 int CamuleGuiApp::InitGui(bool geometry_enable, wxString &geometry_string)
@@ -266,13 +315,11 @@
 	return 0;
 }
 
-
 int CamuleGuiApp::ShowAlert(wxString msg, wxString title, int flags)
 {
 	return CamuleGuiBase::ShowAlert(msg, title, flags);
 }
 
-
 int CamuleGuiApp::OnExit()
 {
 	delete core_timer;
@@ -280,31 +327,39 @@
 	return CamuleApp::OnExit();
 }
 
-
 void CamuleGuiApp::ShutDown(wxCloseEvent &WXUNUSED(evt))
 {
+	// The tray icon's Exit runs its own menu-tracking loop and stays live while a modal dialog
+	// is open, so this can be reached with one of the list controls' dialogs still on the stack
+	// -- the same hazard the remote GUI hits on an EC drop. See
+	// CamuleAppCommon::DeferShutDownToOuterLoop.
+	if (DeferShutDownToOuterLoop(this {
+		    if (!IsOnShutDown() && amuledlg) {
+			    wxCloseEvent ev;
+			    ShutDown(ev);
+		    }
+	    })) {
+		return;
+	}
+
 	amuledlg->DlgShutDown();
 	amuledlg->Destroy();
 	CamuleApp::ShutDown();
 }
 
-
-// macOS Dock right-click → Quit bypasses OnClose. wxWidgets posts a session-end
-// event for this path; drive the same ShutDown sequence so the destructor
-// chain (~CPartFile → FlushBuffer → SavePartFile) runs and download progress
-// is persisted.
-void CamuleGuiApp::OnQueryEndSession(wxCloseEvent& evt)
+// macOS Dock right-click Quit bypasses OnClose. wx posts a session-end event for this path; drive
+// the same ShutDown sequence so the destructor chain (~CPartFile -> FlushBuffer -> SavePartFile)
+// runs and progress is persisted.
+void CamuleGuiApp::OnQueryEndSession(wxCloseEvent &evt)
 {
-	// Mark the app as quitting before letting wx propagate the close
-	// to top-level windows. CamuleDlg::OnClose checks this flag and
-	// skips its HideOnClose-veto branch when set, so a Dock right-
-	// click → Quit (or any other session-end path) actually quits
-	// instead of getting hidden to tray.
+	// Mark the app as quitting before letting wx propagate the close to top-level windows:
+	// CamuleDlg::OnClose checks this flag and skips its HideOnClose-veto branch, so a session-
+	// end path actually quits instead of hiding to tray.
 	SetQuitting();
 	evt.Skip();
 }
 
-void CamuleGuiApp::OnEndSession(wxCloseEvent& evt)
+void CamuleGuiApp::OnEndSession(wxCloseEvent &evt)
 {
 	// Run ShutDown if not already running (OnClose may already have triggered it).
 	if (!IsOnShutDown() && amuledlg) {
@@ -319,64 +374,68 @@
 #ifdef __WXMAC__
 void CamuleGuiApp::MacReopenApp()
 {
-	// Fired when the user clicks the Dock icon and aMule has no
-	// visible top-level windows. Without this override, wxApp's
-	// default Reopen handler is a no-op when the frame is hidden,
-	// so a window hidden via the close button (HideOnClose pref =
-	// macOS-style "close hides instead of quits") stays permanently
-	// hidden — the only way to bring aMule back was to Cmd+Tab.
-	//
-	// Show + Iconize(false) + Raise covers all three hidden states:
-	// hidden via Show(false), iconized to the dock, or just behind
-	// other apps.
+	// Fired when the user clicks the Dock icon with no visible top-level windows, and on a re-
+	// launch from Finder / Launchpad. Without this override wxApp's default Reopen handler is a
+	// no-op when the frame is hidden, so a window hidden via the close button (HideOnClose)
+	// stays hidden and only Cmd+Tab brings aMule back. The restore itself lives on the window,
+	// shared with the tray icon.
 	if (amuledlg) {
-		amuledlg->Show(true);
-		amuledlg->Iconize(false);
-		amuledlg->Raise();
+		amuledlg->RestoreMainWindow();
 	}
 }
-#endif
 
+void CamuleGuiApp::MacOpenFiles(const wxArrayString &fileNames)
+{
+	// Fires for a Finder double-click, "Open With > aMule", and files dropped on the Dock icon,
+	// so most of what arrives here is not a collection at all; OpenCollectionFiles ignores
+	// those silently rather than nagging. wx holds the launch event until after OnInit returns,
+	// so thePrefs::GetConfigDir() is set by the time this runs even on a cold launch.
+	OpenCollectionFiles(fileNames);
+}
+
+void CamuleGuiApp::MacOpenURL(const wxString &url)
+{
+	ProtocolHandler_QueueSchemeLink(url);
+}
+#endif
 
 bool CamuleGuiApp::OnInit()
 {
 	amuledlg = NULL;
 
-	// Register the embedded-PNG art provider before CamuleApp::OnInit()
-	// touches anything UI-shaped. wxArtProvider::Push takes ownership
-	// of the pointer; wx tears the providers down at app exit.
+	// Register the embedded-PNG art provider before CamuleApp::OnInit() touches anything UI-
+	// shaped. wxArtProvider::Push takes ownership of the pointer; wx tears the providers down
+	// at app exit.
 	wxArtProvider::Push(new CamuleArtProvider());
 
-	if ( !CamuleApp::OnInit() ) {
+	// Must happen before any window exists, and the startup splash is created
+	// inside CamuleApp::OnInit() below.
+	FollowSystemAppearance();
+
+	if (!CamuleApp::OnInit()) {
 		return false;
 	}
 
-	// Create the Core timer
-	core_timer = new CTimer(this,ID_CORE_TIMER_EVENT);
+	core_timer = new CTimer(this, ID_CORE_TIMER_EVENT);
 	if (!core_timer) {
 		AddLogLineCS(_("Fatal Error: Failed to create Core Timer"));
 		OnExit();
 	}
 
-	// Start the Core and Gui timers
-
-	// Note: wxTimer can be off by more than 10% !!!
-	// In addition to the systematic error introduced by wxTimer, we are losing
-	// timer cycles due to high CPU load.  I've observed about 0.5% random loss of cycles under
-	// low load, and more than 6% lost cycles with heavy download traffic and/or other tasks
-	// in the system, such as a video player or a VMware virtual machine.
-	// The upload queue process loop has now been rewritten to compensate for timer errors.
-	// When adding functionality, assume that the timer is only approximately correct;
-	// for measurements, always use the system clock ::GetTickCount64().
+	// Note: wxTimer can be off by more than 10%, and timer cycles are also lost to CPU load --
+	// about 0.5% under light load, more than 6% with heavy download traffic or another
+	// demanding process. The upload queue process loop compensates for timer error. When adding
+	// functionality assume the timer is only approximately correct, and measure with
+	// ::GetTickCount64().
 	core_timer->Start(CORE_TIMER_PERIOD);
 	amuledlg->StartGuiTimer();
 
 #ifdef __WXMAC__
-	// This tells the OS to notice the ed2kHelperScript.app inside aMule.app.
-	// ed2kHelperScript.app describes itself (Info.plist) as handling ed2k URLs.
-	// So, from then on the OS will know to pass ed2k URLs to the helper app.
-	CFURLRef ed2kHelperUrl = CFBundleCopyAuxiliaryExecutableURL(
-		CFBundleGetMainBundle(), CFSTR("ed2kHelperScript.app"));
+	// This tells the OS to notice the ed2kHelperScript.app inside aMule.app. That app's
+	// Info.plist says it handles ed2k URLs, so from then on the OS passes ed2k URLs to the
+	// helper.
+	CFURLRef ed2kHelperUrl =
+		CFBundleCopyAuxiliaryExecutableURL(CFBundleGetMainBundle(), CFSTR("ed2kHelperScript.app"));
 	if (ed2kHelperUrl) {
 		LSRegisterURL(ed2kHelperUrl, true);
 		CFRelease(ed2kHelperUrl);
@@ -384,36 +443,30 @@
 #endif
 
 #ifdef __WXGTK__
-	// AppImage first-run desktop integration prompt. CallAfter defers the
-	// dialog until the event loop is fully running, so the modal doesn't
-	// block OnInit's return path.
-	CallAfter(this {
-		AppImageIntegration::PromptAndInstall(amuledlg);
-	});
+	// AppImage first-run desktop integration prompt. CallAfter defers the dialog until the
+	// event loop is fully running, so the modal does not block OnInit's return path.
+	CallAfter(this { AppImageIntegration::PromptAndInstall(amuledlg); });
 #endif
 
 	return true;
 }
 
-
 wxString CamuleGuiApp::GetLog(bool reset)
 {
-	if ( reset ) {
+	if (reset) {
 		amuledlg->ResetLog(ID_LOGVIEW);
 	}
 	return CamuleApp::GetLog(reset);
 }
 
-
 wxString CamuleGuiApp::GetServerLog(bool reset)
 {
-	if ( reset ) {
+	if (reset) {
 		amuledlg->ResetLog(ID_SERVERINFO);
 	}
 	return CamuleApp::GetServerLog(reset);
 }
 
-
 void CamuleGuiApp::AddServerMessageLine(wxString &msg)
 {
 	amuledlg->AddServerMessageLine(msg);

amule-3.0.1.tar.gz/src/amule-remote-gui.cpp -> amule-3.1.0.tar.gz/src/amule-remote-gui.cpp Changed

@@ -22,70 +22,74 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include <algorithm>             // Needed for std::min
+#include "libs/ec/cpp/ECCrypt.h" // Needed for ECCrypt::CipherName
 
 #include <wx/ipc.h>
-#include <wx/cmdline.h>			// Needed for wxCmdLineParser
-#include <wx/config.h>			// Do_not_auto_remove (win32)
-#include <wx/fileconf.h>		// Needed for wxFileConfig
-#include <wx/socket.h>			// Needed for wxSocketBase
+#include <wx/cmdline.h>  // Needed for wxCmdLineParser
+#include <wx/config.h>   // Do_not_auto_remove (win32)
+#include <wx/fileconf.h> // Needed for wxFileConfig
+#include <wx/socket.h>   // Needed for wxSocketBase
 
 #if defined(__WXGTK__) && !defined(__APPLE__)
-#include <glib.h>			// g_set_prgname() — wl_app_id / WM_CLASS binding
+#include <glib.h> // g_set_prgname() -- wl_app_id / WM_CLASS binding
 #endif
 
-
+#include <common/MuleDebug.h> // Needed for get_backtrace and SuppressNextAbortBacktrace
 #include <common/Format.h>
 #include <common/StringFunctions.h>
 #include <common/MD5Sum.h>
 
-
 #include <include/common/EventIDs.h>
 
-
-#include "amule.h"			// Interface declarations.
-#include "CamuleArtProvider.h"		// Needed for wxArtProvider::Push() in OnInit
-#include "amuleDlg.h"			// Needed for CamuleDlg
+#include "amule.h"                  // Interface declarations.
+#include "ProtocolHandlerManager.h" // Needed for ProtocolHandler_QueueSchemeLink
+#include "CamuleArtProvider.h"      // Needed for wxArtProvider::Push() in OnInit
+#include "amuleDlg.h"               // Needed for CamuleDlg
+#include "PrefsUnifiedDlg.h"        // Needed for the shared-dirs editor refresh hook
+
+#include <wx/sizer.h>    // CReconnectDialog layout (issue #444)
+#include <wx/stattext.h> // CReconnectDialog status label
+#include <wx/button.h>   // CReconnectDialog abort button
 #include "ClientCredits.h"
 #include "SourceListCtrl.h"
 #include "ChatWnd.h"
-#include "DataToText.h"			// Needed for GetSoftName()
-#include "DownloadListCtrl.h"		// Needed for CDownloadListCtrl
+#include "ClientsWnd.h"       // Needed for CClientsWnd
+#include "DataToText.h"       // Needed for GetSoftName()
+#include "DownloadListCtrl.h" // Needed for CDownloadListCtrl
 #include "Friend.h"
-#include "GetTickCount.h"	// Needed for GetTickCount64
+#include "GetTickCount.h" // Needed for GetTickCount64
 #include "GuiEvents.h"
-#ifdef ENABLE_IP2COUNTRY
-	#include "IP2Country.h"		// Needed for IP2Country
+#ifdef GEOIP_GUI
+#include "IP2Country.h" // Needed for IP2Country
 #endif
-#include "InternalEvents.h"	// Needed for wxEVT_CORE_FINISHED_HTTP_DOWNLOAD
+#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
-#include "SearchDlg.h"			// Needed for CSearchDlg
-#include "Server.h"			// Needed for GetListName
-#include "ServerWnd.h"			// Needed for CServerWnd
-#include "SharedFilesCtrl.h"		// Needed for CSharedFilesCtrl
-#include "SharedFilesWnd.h"		// Needed for CSharedFilesWnd
-#include "TransferWnd.h"		// Needed for CTransferWnd
-#include "UpDownClientEC.h"		// Needed for CUpDownClient
-#include "ServerListCtrl.h"		// Needed for CServerListCtrl
+#include "muuli_wdr.h"       // Needed for IDs
+#include "PartFile.h"        // Needed for CPartFile
+#include <tags/FileTags.h>   // Needed for FT_MEDIA_* metadata tag names
+#include "SearchDlg.h"       // Needed for CSearchDlg
+#include "Server.h"          // Needed for GetListName
+#include "ServerWnd.h"       // Needed for CServerWnd
+#include "SharedFilesCtrl.h" // Needed for CSharedFilesCtrl
+#include "SharedFilesWnd.h"  // Needed for CSharedFilesWnd
+#include "TransferWnd.h"     // Needed for CTransferWnd
+#include "UpDownClientEC.h"  // Needed for CUpDownClient
+#include "ServerListCtrl.h"  // Needed for CServerListCtrl
 #include "ScopedPtr.h"
-#include "StatisticsDlg.h"	// Needed for CStatisticsDlg
-#include "KadDlg.h"		// Needed for CKadDlg::UpdateGraph
-#include "ArchSpecific.h"	// Needed for ENDIAN_NTOHL
-
+#include "StatisticsDlg.h" // Needed for CStatisticsDlg
+#include "KadDlg.h"        // Needed for CKadDlg::UpdateGraph
+#include "ArchSpecific.h"  // Needed for ENDIAN_NTOHL
 
 CEConnectDlg::CEConnectDlg()
-:
-wxDialog(theApp->amuledlg, -1, _("Connect to remote amule"), wxDefaultPosition)
+: wxDialog(theApp->amuledlg, -1, _("Connect to remote amule"), wxDefaultPosition)
 {
 	CoreConnect(this, true);
 
 	wxString pref_host, pref_port;
-	// Use the literal loopback address rather than "localhost":
-	// on Windows, "localhost" lookups can fail intermittently
-	// (IPv4 vs IPv6 stack ordering, hosts-file shape, ...).
-	// 127.0.0.1 is portable across every supported OS. Same default
-	// as amulecmd / amuleweb (CaMuleExternalConnector). (#822)
+	// The literal loopback address rather than "localhost": on Windows, "localhost"
+	// lookups can fail intermittently (IPv4 vs IPv6 stack ordering, hosts-file shape).
+	// 127.0.0.1 is portable, and is the same default amulecmd / amuleweb use (#822).
 	wxConfig::Get()->Read("/EC/Host", &pref_host, "127.0.0.1");
 	wxConfig::Get()->Read("/EC/Port", &pref_port, "4712");
 	wxConfig::Get()->Read("/EC/Password", &pwd_hash);
@@ -96,23 +100,24 @@
 	CastChild(ID_REMOTE_PORT, wxTextCtrl)->SetValue(pref_port);
 	CastChild(ID_EC_PASSWD, wxTextCtrl)->SetValue(pwd_hash);
 	CastChild(ID_EC_FORCE_ZLIB, wxCheckBox)->SetValue(pref_force_zlib != 0);
+	// Default 1: a config predating this key gets encryption.
+	long pref_encryption;
+	wxConfig::Get()->Read("/EC/Encryption", &pref_encryption, 1);
+	CastChild(ID_EC_ENCRYPTION, wxCheckBox)->SetValue(pref_encryption != 0);
 
 	CentreOnParent();
 }
 
-
 wxString CEConnectDlg::PassHash()
 {
 	return pwd_hash;
 }
 
-
 wxBEGIN_EVENT_TABLE(CEConnectDlg, wxDialog)
-  EVT_BUTTON(wxID_OK, CEConnectDlg::OnOK)
+	EVT_BUTTON(wxID_OK, CEConnectDlg::OnOK)
 wxEND_EVENT_TABLE()
 
-
-void CEConnectDlg::OnOK(wxCommandEvent& evt)
+void CEConnectDlg::OnOK(wxCommandEvent &evt)
 {
 	wxString s_port = CastChild(ID_REMOTE_PORT, wxTextCtrl)->GetValue();
 	port = StrToLong(s_port);
@@ -125,106 +130,249 @@
 	}
 	m_save_user_pass = CastChild(ID_EC_SAVE, wxCheckBox)->IsChecked();
 	m_force_zlib = CastChild(ID_EC_FORCE_ZLIB, wxCheckBox)->IsChecked();
+	m_encryption = CastChild(ID_EC_ENCRYPTION, wxCheckBox)->IsChecked();
 	evt.Skip();
 }
 
-
 wxDEFINE_EVENT(wxEVT_EC_INIT_DONE, wxEvent);
 
+// Reconnect-after-loss dialog. Shown modally while amulegui re-establishes a dropped
+// EC connection: modal so the main window is frozen (the user must not act on stale
+// data or queue EC commands at a dead socket), while the retry timer and socket
+// events still pump in the modal loop. The wxID_CANCEL button ends the modal with
+// wxID_CANCEL; a successful reconnect ends it with wxID_OK.
+class CReconnectDialog : public wxDialog
+{
+public:
+	CReconnectDialog(wxWindow *parent, const wxString &target)
+	: wxDialog(parent, wxID_ANY, _("Connection lost"), wxDefaultPosition, wxDefaultSize, wxCAPTION)
+	, m_label(nullptr)
+	, m_target(target)
+	{
+		wxBoxSizer *top = new wxBoxSizer(wxVERTICAL);
+		m_label = new wxStaticText(this, wxID_ANY, wxEmptyString);
+		top->Add(m_label, 0, wxALL, 15);
+		top->Add(new wxButton(this, wxID_CANCEL, _("Abort and exit")),
+			0,
+			static_cast<int>(wxALIGN_CENTER) | wxLEFT | wxRIGHT | wxBOTTOM,
+			15);
+		SetAttempt(1);
+		SetSizerAndFit(top);
+		CentreOnParent();
+	}
+
+	// Shown while a connect attempt is in flight.
+	void SetAttempt(int n) { SetStatus(CFormat(_("Reconnecting... (attempt %d)")) % n); }
+
+	// Shown counting down to the next attempt after a failure.
+	void SetCountdown(int seconds) { SetStatus(CFormat(_("Next attempt in %d s...")) % seconds); }
+
+private:
+	// Only the middle line changes; the (widest) "paused" line is constant,
+	// so the dialog keeps its size and doesn't jump on each update.
+	void SetStatus(const wxString &middle)
+	{
+		m_label->SetLabel(CFormat(_("Connection to %s lost.\n%s\n\nThe interface is paused "
+					    "until the connection is restored.")) %
+				  m_target % middle);
+	}
+
+	wxStaticText *m_label;
+	wxString m_target;
+};
+
 wxBEGIN_EVENT_TABLE(CamuleRemoteGuiApp, wxApp)
+	// macOS Dock right-click -> Quit ends the session without going through
+	// the red-X / Cmd+Q paths; catch it so ShutDown + OnExit cleanup still runs.
+	EVT_QUERY_END_SESSION(CamuleRemoteGuiApp::OnQueryEndSession)
+	EVT_END_SESSION(CamuleRemoteGuiApp::OnEndSession)
+
 	// Core timer
 	EVT_TIMER(ID_CORE_TIMER_EVENT, CamuleRemoteGuiApp::OnPollTimer)
 	// Watchdog on the initial EC connect attempt
 	EVT_TIMER(ID_REMOTE_CONNECT_TIMEOUT_TIMER, CamuleRemoteGuiApp::OnConnectTimeout)
+	// Spacing between reconnect attempts after a post-startup loss (#444)
+	EVT_TIMER(ID_REMOTE_RECONNECT_TIMER, CamuleRemoteGuiApp::OnReconnectTimer)
 
 	EVT_CUSTOM(wxEVT_EC_CONNECTION, -1, CamuleRemoteGuiApp::OnECConnection)
 	EVT_CUSTOM(wxEVT_EC_INIT_DONE, -1, CamuleRemoteGuiApp::OnECInitDone)
 
 	EVT_MULE_NOTIFY(CamuleRemoteGuiApp::OnNotifyEvent)
 
-#ifdef ENABLE_IP2COUNTRY
+#ifdef GEOIP_GUI
 	// HTTPDownload finished
 	EVT_MULE_INTERNAL(wxEVT_CORE_FINISHED_HTTP_DOWNLOAD, -1, CamuleRemoteGuiApp::OnFinishedHTTPDownload)
 #endif
 wxEND_EVENT_TABLE()
 
-
 IMPLEMENT_APP(CamuleRemoteGuiApp)
 
-
 int CamuleRemoteGuiApp::OnExit()
 {
 	StopTickTimer();
 
-	wxSocketBase::Shutdown();	// needed because we also called Initialize() manually
+	wxSocketBase::Shutdown(); // needed because we also called Initialize() manually
+
+	// Mirror CamuleApp::OnExit: drain the pending-delete queue (where
+	// CamuleDlg::OnClose -> ShutDown parked amuledlg->Destroy()) so the frame's
+	// lazily-scheduled destructor runs, then tear down wxConfig to flush it. Otherwise
+	// the red-X + confirm path reaches here with the destroy still queued and anything
+	// that chain persists is lost. The _Exit(0) below skips wx's own cleanup.
+	DeletePendingObjects();
+	delete wxConfigBase::Set(nullptr);
+
+	// Skip wx's static-destructor / module cleanup, exactly as the monolithic app does
+	// in CamuleGuiApp::OnExit. wx's WebRequestModule teardown destroys the platform
+	// wxWebSession, whose dtor dereferences already-freed state and raise(SIGABRT)s on
+	// quit. amulegui links wxWebRequest too, so it hits the identical crash. By this
+	// point our own cleanup has run; _Exit bypasses atexit and static destructors so the
+	// buggy wx dtor never runs. Remove once the upstream wx fix lands in a release we
+	// depend on. _Exit also skips ~CamuleAppCommon, which would release the
+	// single-instance lock; drop it here so muleLockRGUI is unlinked.
+	ReleaseSingleInstance();
+	std::_Exit(0);
 
 	return wxApp::OnExit();
 }
 
+void CamuleRemoteGuiApp::OnQueryEndSession(wxCloseEvent &evt)
+{
+	// Flag the quit so CamuleDlg::OnClose skips its HideOnClose-veto branch
+	// and actually quits on a Dock right-click -> Quit (as for Cmd+Q).
+	SetQuitting();
+	evt.Skip();
+}
+
+void CamuleRemoteGuiApp::OnEndSession(wxCloseEvent &evt)
+{
+	// The Dock-Quit path can bypass OnExit, so run ShutDown (unless OnClose already did
+	// -- it nulls amuledlg) and then OnExit explicitly, so the list-control destructors
+	// and wxConfig flush run and column widths persist.
+	if (amuledlg) {
+		ShutDown(evt);
+	}
+	OnExit();
+	evt.Skip();
+}
+
+#ifdef __WXMAC__
+void CamuleRemoteGuiApp::MacReopenApp()
+{
+	// Dock-icon click (and re-launch from Finder / Launchpad) while no window is
+	// visible. wxApp's default handler only de-iconizes; a frame hidden with Show(false)
+	// -- both the close-button HideOnClose path and minimize-to-tray end there -- is not
+	// a candidate, so without this amulegui never came back.
+	if (amuledlg) {
+		amuledlg->RestoreMainWindow();
+	}
+}
+
+void CamuleRemoteGuiApp::MacOpenFiles(const wxArrayString &fileNames)
+{
+	// Also fires for Dock drops of arbitrary files; anything that is not
+	// a collection is ignored without complaint. Mirrors CamuleGuiApp.
+	OpenCollectionFiles(fileNames);
+}
+
+void CamuleRemoteGuiApp::MacOpenURL(const wxString &url)
+{
+	ProtocolHandler_QueueSchemeLink(url);
+}
+#endif
 
 #if wxUSE_ON_FATAL_EXCEPTION
-// Gracefully handle fatal exceptions and print backtrace if possible.
-// Mirrors CamuleApp::OnFatalException (amule.cpp) -- without this
-// override amulegui crashes produce no symbolicated amule frames,
-// which makes diagnosing GTK-callback-into-stale-widget bugs like
-// #692 a guessing game.
+// Gracefully handle fatal exceptions and print a backtrace if possible. Without this
+// override amulegui crashes produce no symbolicated amule frames, which makes
+// diagnosing GTK-callback-into-stale-widget bugs a guessing game.
 void CamuleRemoteGuiApp::OnFatalException()
 {
 	/* Print the backtrace */
 	wxString msg;
-	msg	<< "\n--------------------------------------------------------------------------------\n"
-		<< "A fatal error has occurred and amulegui has crashed.\n"
-		<< "Please assist us in fixing this problem by reporting the backtrace below as a\n"
-		<< "GitHub issue, including as much information as possible regarding the\n"
-		<< "circumstances of this crash. Issue tracker:\n"
-		<< "    https://github.com/amule-org/amule/issues\n"
-		<< "If possible, please try to generate a real backtrace of this crash:\n"
-		<< "    https://amule-org.github.io/docs/contributing/bug-report\n\n"
-		<< "----------------------------=| BACKTRACE FOLLOWS: |=----------------------------\n"
-		<< "Current version is: " << FullMuleVersion
-		<< "\nRunning on: " << OSDescription
-		<< "\n\n"
-		<< get_backtrace(1) // 1 == skip this function.
-		<< "\n--------------------------------------------------------------------------------\n";
+	msg << "\n--------------------------------------------------------------------------------\n"
+	    << "A fatal error has occurred and amulegui has crashed.\n"
+	    << "Please assist us in fixing this problem by reporting the backtrace below as a\n"
+	    << "GitHub issue, including as much information as possible regarding the\n"
+	    << "circumstances of this crash. Issue tracker:\n"
+	    << "    https://github.com/amule-org/amule/issues\n"
+	    << "If possible, please try to generate a real backtrace of this crash:\n"
+	    << "    https://amule-org.github.io/docs/contributing/bug-report\n\n"
+	    << "----------------------------=| BACKTRACE FOLLOWS: |=----------------------------\n"
+	    << "Current version is: " << FullMuleVersion << "\nRunning on: " << OSDescription << "\n\n"
+	    << get_backtrace(1) // 1 == skip this function.
+	    << "\n--------------------------------------------------------------------------------\n";
 
 	theLogger.EmergencyLog(msg, true);
+
+	// wx's handler calls abort() as soon as this returns, so without this the SIGABRT handler
+	// adds a second, raw backtrace under a banner that blames the allocator. The symbolicated
+	// one above is the report; this keeps it the only one.
+	SuppressNextAbortBacktrace();
 }
 #endif
 
+void CamuleRemoteGuiApp::OnAssertFailure(
+	const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg)
+{
+	// Unlike CamuleApp there is no app-state gate here: the remote GUI has no equivalent
+	// of IsRunning(), and its window is either up or the assert came from a thread that
+	// cannot show a dialog anyway.
+	if (ReportAssertFailure(file, line, func, cond, msg, wxThread::IsMain())) {
+		// See CamuleApp::OnAssertFailure for why this goes through the helper.
+		RunWxAssertHandler(& { wxApp::OnAssertFailure(file, line, func, cond, msg); });
+	}
+}
 
-void CamuleRemoteGuiApp::OnPollTimer(wxTimerEvent&)
+void CamuleRemoteGuiApp::OnPollTimer(wxTimerEvent &)
 {
 	static int request_step = 0;
-	static uint32 msPrevStats = 0;
 
+	// Reply watchdog. EC has no application-level keepalive, and the daemon always
+	// answers, so requests outstanding with nothing coming back means the transport has
+	// gone quiet -- an SSH tunnel with no ServerAliveInterval, a NAT dropping an idle
+	// mapping, a proxy that stopped relaying. None of those close the socket: it stays
+	// ESTABLISHED with every queue empty and no error is raised, so neither OnLost nor
+	// OnError fires.
+	//
+	// Without this the failure is permanent AND silent. Once m_req_count passes
+	// m_req_fifo_thr the early-return below fires on every tick, so the client stops
+	// sending too -- and recovery would need a reply, which needs a request. Gated on
+	// the fifo so it trips on the real symptom rather than waiting for the queue to fill.
+	if (m_connect->GetReqFifoSize() > 0 &&
+		m_connect->MillisecondsSinceLastReply() > EC_REPLY_TIMEOUT_MS) {
+		// Untranslated and debug-level on purpose: the user-facing messaging already comes
+		// from the path this drops into -- OnLost posts "Connection failure" and
+		// BeginReconnect announces the retry, both long translated.
+		AddDebugLogLineN(logEC,
+			CFormat(wxT("EC reply watchdog: no reply for %u ms with %u requests "
+				    "pending -- treating the connection as dead")) %
+				(unsigned)m_connect->MillisecondsSinceLastReply() %
+				(unsigned)m_connect->GetReqFifoSize());
+		// Close ourselves and dispatch the loss: a self-close suppresses the asio
+		// lost-event path, so without the explicit dispatch nothing would tell the GUI.
+		// Lands in OnECConnection(false) -> BeginReconnect().
+		m_connect->CloseAndDispatchLost();
+		return;
+	}
 	if (m_connect->RequestFifoFull()) {
 		return;
 	}
 
 	switch (request_step) {
-	case 0:
-		// 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: {
+	case 0: {
 		CECPacket stats_req(EC_OP_STAT_REQ, EC_DETAIL_INC_UPDATE);
 		m_connect->SendRequest(&m_stats_updater, &stats_req);
 		request_step++;
 		break;
 	}
-	case 2:
-		if (amuledlg->m_sharedfileswnd->IsShown()
-			|| amuledlg->m_chatwnd->IsShown()
-			|| amuledlg->m_serverwnd->IsShown()) {
+	case 1:
+		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);
-			// Server-message log mirror: pull the cumulative
-			// server_msg buffer while the Network tab is up so the
-			// "Server Info" sub-panel reaches feature parity with
-			// the monolithic build. ed2k server messages are bursty
-			// (one-off on connect, the occasional ID-change notice,
-			// disconnect) so the natural ~3 s cadence of step 2 is
-			// plenty.
+			// Server-message log mirror: pull the cumulative server_msg buffer while the
+			// Network tab is up so the "Server Info" sub-panel reaches parity with the
+			// monolithic build. ed2k server messages are bursty, so the natural cadence of
+			// the page step is plenty.
 			if (amuledlg->m_serverwnd->IsShown()) {
 				CECPacket srvinfo_req(EC_OP_GET_SERVERINFO);
 				m_connect->SendRequest(&m_serverinfo_handler, &srvinfo_req);
@@ -232,31 +380,73 @@
 		} else if (amuledlg->m_transferwnd->IsShown()) {
 			// update both downloads and shared files
 			knownfiles->DoRequery(EC_OP_GET_UPDATE, EC_TAG_KNOWNFILE);
+		} else if (amuledlg->m_clientswnd->IsShown()) {
+			// Same request, for the peers rather than the files: the EC_TAG_CLIENT tags the
+			// clients list lives on ride along in this reply and are sent by nothing else.
+			// Without this the page shows whatever the peers looked like when the user left
+			// the last tab that did ask.
+			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);
+			// Ask what searches the daemon currently holds -- independent of m_curr_search,
+			// which only ever reflects a search THIS client started -- so a search opened by
+			// another client gets a tab created here.
+			//
+			// Search entries are near-static, so unlike the results union poll below this is
+			// not asked every tick: once on (re)connect, and again only when a result turns
+			// up bearing a search ID with no tab yet.
+			//
+			// RequestSearchList, not DoRequery, on purpose: HandlePacket's EC_OP_SEARCH_LIST
+			// branch never reaches the base class's STATUS_REQ_SENT -> IDLE transition, so
+			// DoRequery would wedge this container's request state machine and silently drop
+			// every later poll.
+			if (searchlist->m_needSearchListRequery) {
+				searchlist->RequestSearchList();
+				searchlist->m_needSearchListRequery = false;
 			}
-		}
-		// Stats polling is always on, even when the Statistics dialog
-		// isn't the active tab. statgraphs->HandlePacket() also feeds
-		// the Kad node-count graph on the Network -> Kad sub-tab via
-		// m_kademliawnd->UpdateGraph(); gating on m_statisticswnd left
-		// the Kad graph empty whenever the user wasn't sitting on
-		// Statistics, and produced a visible gap in the Statistics
-		// graph itself across any tab switch. Both requests are cheap
-		// deltas: the graph sends m_lastTimestamp and the daemon
-		// returns only points newer than that (or EC_OP_FAILED "No
-		// points for graph."); the tree request honors
-		// thePrefs::GetStatsInterval().
+			// The union poll below already returns every active search's results regardless
+			// of m_curr_search -- the old gate just meant a client that never started a
+			// search of its own never asked at all, even once a tab existed for one it
+			// learned about above.
+			searchlist->DoRequery(EC_OP_SEARCH_RESULTS, EC_TAG_SEARCHFILE);
+		}
+		// Stats polling is always on, even when the Statistics dialog is not the active
+		// tab. statgraphs->HandlePacket() also feeds the Kad node-count graph on the
+		// Network -> Kad sub-tab, so gating on m_statisticswnd left that graph empty
+		// whenever the user was elsewhere. Both requests are cheap deltas: the graph sends
+		// m_lastTimestamp and the daemon returns only newer points; the tree request
+		// honours GetStatsInterval().
 		{
-			int sStatsUpdate = thePrefs::GetStatsInterval();
-			uint32 msCur = theStats::GetUptimeMillis();
-			if ((sStatsUpdate > 0) && ((int)(msCur - msPrevStats) > sStatsUpdate*1000)) {
-				msPrevStats = msCur;
+			const uint32 sStatsUpdate = thePrefs::GetStatsInterval();
+			const uint32 msCur = theStats::GetUptimeMillis();
+			// Unsigned throughout on purpose. The subtraction is modular, so it yields the
+			// true elapsed time even across the point where a 32-bit millisecond counter
+			// wraps. Casting it to int threw that away: a difference above INT_MAX reads as
+			// negative, so the tree stopped refreshing rather than refreshing late.
+			//
+			// The elapsed test cannot be the whole condition either: on the first poll
+			// nothing has elapsed, so the tree would stay empty for a full interval.
+			// m_statsTreePolled makes that first fetch unconditional.
+			const bool dueByInterval = (msCur - m_msPrevStatsTree) > sStatsUpdate * 1000;
+			if ((sStatsUpdate > 0) && (!m_statsTreePolled || dueByInterval)) {
+				m_statsTreePolled = true;
+				m_msPrevStatsTree = msCur;
 				stattree->DoRequery();
 			}
 			statgraphs->DoRequery();
 		}
+		// Chat sessions plus every message newer than our cursor, in one roundtrip. Polled
+		// unconditionally -- like stats above, unlike the per-tab data -- so a message
+		// arriving while the user is on another tab still triggers the new-message blink;
+		// an idle daemon answers with the session list and no message children. Gated on
+		// the capability: a daemon that never echoes EC_TAG_CAN_CHAT asserts on these
+		// opcodes.
+		if (m_connect->ServerSupportsChatSessions()) {
+			CECPacket chat_req(EC_OP_GET_CHAT_SESSIONS);
+			if (m_chatmsg_handler.Cursor()) {
+				chat_req.AddTag(CECTag(EC_TAG_CHAT_MSG_ID, m_chatmsg_handler.Cursor()));
+			}
+			m_connect->SendRequest(&m_chatmsg_handler, &chat_req);
+		}
 		// Back to the roots
 		request_step = 0;
 		break;
@@ -274,19 +464,22 @@
 	}
 }
 
-
-void CamuleRemoteGuiApp::OnFinishedHTTPDownload(CMuleInternalEvent& event)
+void CamuleRemoteGuiApp::OnFinishedHTTPDownload(CMuleInternalEvent &WXUNUSED(event))
 {
-	if (event.GetInt() == HTTP_GeoIP) {
-		amuledlg->IP2CountryDownloadFinished(event.GetExtraInt64());
-		// If we updated, the dialog is already up. Redraw it to show the flags.
-		amuledlg->Refresh();
-	}
+	// amulegui has no local GeoIP resolver -- country codes arrive over EC from
+	// the daemon -- so it never starts a GeoIP download.
 }
 
-
 void CamuleRemoteGuiApp::ShutDown(wxCloseEvent &WXUNUSED(evt))
 {
+	// A modal dialog (comments/ratings, file details, ...) runs its own event loop, and
+	// an EC drop is dispatched from whichever loop is current -- so a shutdown can start
+	// with one of those dialogs still on the stack. Unwind to the outer loop first;
+	// Quit() resumes the teardown from there.
+	if (DeferShutDownToOuterLoop(this { Quit(); })) {
+		return;
+	}
+
 	// Stop the Core Timer
 	delete poll_timer;
 	poll_timer = NULL;
@@ -310,46 +503,59 @@
 	}
 	delete m_allUploadingKnownFile;
 	delete stattree;
+
+	m_tornDown = true;
 }
 
+void CamuleRemoteGuiApp::Quit()
+{
+	if (m_tornDown) {
+		return;
+	}
+
+	wxCloseEvent ev;
+	ShutDown(ev);
+
+	// Still unset means ShutDown() postponed itself to the outer event loop;
+	// leaving the main loop now would drop the retry it queued.
+	if (m_tornDown) {
+		ExitMainLoop();
+	}
+}
 
 bool CamuleRemoteGuiApp::OnInit()
 {
 	StartTickTimer();
 	amuledlg = NULL;
 	connect_timeout_timer = NULL;
-	// ShutDown() unconditionally deletes these, but Startup() — where they
-	// are allocated — only runs after a successful EC connect. Null them so
-	// a connect-timeout teardown doesn't delete an indeterminate pointer.
+	// ShutDown() unconditionally deletes these, but Startup() -- where they are
+	// allocated -- only runs after a successful EC connect. Null them so a
+	// connect-timeout teardown does not delete an indeterminate pointer.
 	stattree = NULL;
 	m_allUploadingKnownFile = NULL;
 
 #if defined(__WXGTK__) && !defined(__APPLE__)
-	// Set the GTK program name to the canonical app id. On Wayland,
-	// GTK derives wl_app_id (xdg_toplevel.set_app_id) from
-	// g_get_prgname(); compositors match wl_app_id against the
-	// .desktop filename to bind windows to launcher icons. Without
-	// this the binding falls back to argv0, which differs across
-	// packaging formats (AppImage's argv0 is "aMuleGUI", distro
-	// installs use "amulegui", Flatpak renames the .desktop entirely).
-	// On X11 the same value also feeds into WM_CLASS, matching
-	// StartupWMClass=org.amule.aMule.gui in the .desktop file. Must run
-	// before any GTK window is created — same fix the monolithic amule
-	// has in CamuleApp::OnInit; amulegui shipped without it, so on
-	// GNOME / wlroots the taskbar icon never bound to the launcher
-	// and showed the generic fallback. (#562 follow-up.)
-	// Skipped on macOS even under wxGTK (MacPorts): no Wayland or
-	// .desktop binding exists, and app identity is set via Info.plist
-	// in the .app bundle. Dropping the call lets that build skip the
-	// glib2 dep entirely (#641).
+	// Set the GTK program name to the canonical app id. On Wayland, GTK derives
+	// wl_app_id from g_get_prgname(), and compositors match wl_app_id against the
+	// .desktop filename to bind windows to launcher icons. Without this the binding
+	// falls back to argv0, which differs across packaging formats. On X11 the same
+	// value feeds WM_CLASS, matching StartupWMClass in the .desktop file. Must run
+	// before any GTK window is created.
+	//
+	// Skipped on macOS even under wxGTK: no Wayland or .desktop binding exists, and app
+	// identity is set via Info.plist. Dropping the call lets that build skip glib2.
 	g_set_prgname("org.amule.aMule.gui");
 #endif
 
-	// Register the embedded-PNG art provider before any UI work.
-	// wxArtProvider::Push takes ownership of the pointer; wx tears
-	// the providers down at app exit.
+	// Register the embedded-PNG art provider before any UI work. wxArtProvider::Push
+	// takes ownership of the pointer; wx tears the providers down at app exit.
 	wxArtProvider::Push(new CamuleArtProvider());
 
+	// Must happen before any window exists; the connect dialog below is the first one
+	// amulegui creates. Without this amulegui stayed light on Windows while the
+	// monolithic amule, which has always asked, went dark.
+	FollowSystemAppearance();
+
 	// Get theApp
 	theApp = &wxGetApp();
 
@@ -365,7 +571,7 @@
 	wxSocketBase::Initialize();
 
 	// Create the polling timer
-	poll_timer = new wxTimer(this,ID_CORE_TIMER_EVENT);
+	poll_timer = new wxTimer(this, ID_CORE_TIMER_EVENT);
 	if (!poll_timer) {
 		AddLogLineCS(_("Fatal Error: Failed to create Poll Timer"));
 		OnExit();
@@ -378,28 +584,32 @@
 	glob_prefs = new CPreferencesRem(m_connect);
 	long enableZLIB;
 	wxConfig::Get()->Read("/EC/ZLIB", &enableZLIB, 1);
-	m_connect->SetCapabilities(enableZLIB != 0, true, false);	// ZLIB, UTF8 numbers, notification
-	// The ForceZLIB override is read from the connection dialog
-	// (see ShowConnectionDialog) so the user's checkbox choice in this
-	// session overrides the persisted /EC/ForceZLIB value.
+	m_connect->SetCapabilities(enableZLIB != 0, true, false); // ZLIB, UTF8 numbers, notification
+	// amulegui addresses searches by daemon-allocated ID (per-tab, several at once); so
+	// advertise the multi-search capability. An old daemon will not echo it and amulegui
+	// stays single-search.
+	m_connect->SetCanMultiSearch(true);
+	// amulegui shows incoming friend/chat messages read-only; ask the daemon to relay
+	// them. An old daemon will not echo the capability and amulegui simply never polls.
+	m_connect->SetCanChatSessions(true);
+	// The ForceZLIB override is read from the connection dialog (see
+	// ShowConnectionDialog) so the user's checkbox choice in this session overrides the
+	// persisted /EC/ForceZLIB value.
 
 	InitCustomLanguages();
 	InitLocale(m_locale, StrLang2wx(thePrefs::GetLanguageID()));
 
 	if (ShowConnectionDialog()) {
-		// The watchdog timer is armed inside ShowConnectionDialog right
-		// before each ConnectToCore call — the retry loop re-arms it on
-		// every attempt, so OnInit doesn't need to touch it here.
+		// The watchdog timer is armed inside ShowConnectionDialog right before
+		// each ConnectToCore call -- the retry loop re-arms it on every attempt.
 		AddLogLineNS(_("Going to event loop..."));
 		return true;
 	}
 
-	// User cancelled (or ShowConnectionDialog failed before reaching the
-	// connect step). Tear down the partial init so the Asio thread pool,
-	// poll timer and remote-connect socket don't leak — wx will never
-	// call ShutDown() / OnExit() because the main loop isn't entered when
-	// OnInit() returns false, so we have to unwind manually here. Without
-	// this, wx reports "4 threads were not terminated by the application".
+	// User cancelled, or ShowConnectionDialog failed before reaching the connect step.
+	// Tear down the partial init so the Asio thread pool, poll timer and remote-connect
+	// socket do not leak: wx never calls ShutDown() / OnExit() because the main loop is
+	// not entered when OnInit() returns false.
 	if (m_AsioService) {
 		m_AsioService->Stop();
 		delete m_AsioService;
@@ -416,20 +626,16 @@
 	return false;
 }
 
-
 bool CamuleRemoteGuiApp::CryptoAvailable() const
 {
 	return thePrefs::IsSecureIdentEnabled(); // good enough
 }
 
-
 bool CamuleRemoteGuiApp::ShowConnectionDialog()
 {
-	// The dialog is kept alive across retry attempts so the values the
-	// user typed (host / port / password / Force-ZLIB) survive a wrong
-	// guess — they only need to fix the field that was wrong instead of
-	// re-typing everything. Destroyed in Startup() on success or below
-	// when the user cancels.
+	// The dialog is kept alive across retry attempts so the values the user typed
+	// survive a wrong guess -- they only need to fix the field that was wrong. Destroyed
+	// in Startup() on success, or below when the user cancels.
 	if (!dialog) {
 		dialog = new CEConnectDlg;
 	}
@@ -448,50 +654,48 @@
 		}
 
 		AddLogLineNS(_("Connecting..."));
-		// Watchdog on the EC connect. When the host is unreachable the
-		// TCP SYN can silently time out over several minutes while the
-		// main loop is running with no visible window, which the OS
-		// reports as "not responding". Fire a shorter timeout so we
-		// can show an error and re-prompt instead. Re-armed on every
-		// retry attempt so the user gets the same 15s budget each time.
+		// Watchdog on the EC connect. When the host is unreachable the TCP SYN can silently
+		// time out over several minutes while the main loop runs with no visible window,
+		// which the OS reports as "not responding". Fire a shorter timeout instead, re-armed
+		// on every retry so each gets the same budget.
 		delete connect_timeout_timer;
 		connect_timeout_timer = new wxTimer(this, ID_REMOTE_CONNECT_TIMEOUT_TIMER);
 		connect_timeout_timer->StartOnce(15000);
 
-		// Apply the dialog's Force-ZLIB checkbox state to the EC client
-		// before each ConnectToCore attempt (re-applied per retry so
-		// the user can toggle it between attempts if they need to).
+		// Apply the dialog's checkbox states to the EC client before each ConnectToCore
+		// attempt, re-applied per retry so the user can toggle them between attempts.
+		// ResetEcConnect() recreates m_connect on a failed handshake and deliberately does
+		// not re-apply these two: the dialog owns them and sets them again on the fresh
+		// object right here.
 		m_connect->SetForceZlib(dialog->ForceZlib());
-		if (m_connect->ConnectToCore(dialog->Host(), dialog->Port(),
-			dialog->Login(), dialog->PassHash(),
-			"amule-remote", "0x0001")) {
+		m_connect->SetCanAEAD(dialog->Encryption());
+		if (m_connect->ConnectToCore(
+			    dialog->Host(), dialog->Port(), dialog->PassHash(), "amule-remote", "0x0001")) {
 			// Sync part succeeded; async OnECConnection will
 			// resolve the auth outcome.
 			return true;
 		}
 
-		// Sync failure (DNS / immediate connect-refused). The async
-		// path won't fire — cancel the watchdog ourselves, show the
-		// error, recreate the EC client so its half-baked socket
-		// state is gone, and loop back to the dialog.
+		// Sync failure (DNS / immediate connect-refused). The async path will not fire --
+		// cancel the watchdog ourselves, show the error, recreate the EC client so its
+		// half-baked socket state is gone, and loop back.
 		connect_timeout_timer->Stop();
 		delete connect_timeout_timer;
 		connect_timeout_timer = NULL;
 		wxMessageBox(_("Connection failed. Please check the host, port, and password."),
-			_("ERROR"), wxOK | wxICON_ERROR);
+			_("ERROR"),
+			wxOK | wxICON_ERROR);
 		ResetEcConnect();
 	}
 }
 
-
 void CamuleRemoteGuiApp::ResetEcConnect()
 {
-	// Tear down the busted EC client and recreate a fresh one. The
-	// CRemoteConnect's socket / auth state isn't safe to reuse after
-	// a failed handshake. glob_prefs holds a reference to m_connect
-	// so it's reborn alongside. Both objects are only fully wired
-	// into the rest of the app by Startup(), which doesn't run until
-	// a successful connect — recreating them here is safe.
+	// Tear down the busted EC client and recreate a fresh one: the CRemoteConnect's
+	// socket / auth state is not safe to reuse after a failed handshake. glob_prefs
+	// holds a reference to m_connect so it is reborn alongside. Both are only fully
+	// wired in by Startup(), which does not run until a successful connect, so
+	// recreating them here is safe.
 	delete glob_prefs;
 	glob_prefs = NULL;
 	if (m_connect) {
@@ -503,102 +707,414 @@
 	long enableZLIB;
 	wxConfig::Get()->Read("/EC/ZLIB", &enableZLIB, 1);
 	m_connect->SetCapabilities(enableZLIB != 0, true, false);
+	m_connect->SetCanMultiSearch(true);
+	m_connect->SetCanChatSessions(true);
 }
 
-
-void CamuleRemoteGuiApp::OnECConnection(wxEvent& event) {
-	// Connect attempt resolved one way or the other — kill the watchdog.
+void CamuleRemoteGuiApp::OnECConnection(wxEvent &event)
+{
+	// Connect attempt resolved one way or the other -- kill the watchdog.
 	if (connect_timeout_timer) {
 		connect_timeout_timer->Stop();
 		delete connect_timeout_timer;
 		connect_timeout_timer = NULL;
 	}
-	wxECSocketEvent& evt = *((wxECSocketEvent*)&event);
+	wxECSocketEvent &evt = *((wxECSocketEvent *)&event);
 	AddLogLineNS(_("Remote GUI EC event handler"));
 	wxString reply = evt.GetServerReply();
 	AddLogLineC(reply);
 	if (evt.GetResult() == true) {
-		// Connected - go to next init step
-		glob_prefs->LoadRemote();
+		if (m_reconnecting) {
+			// Reconnected: close the modal reconnect dialog. Execution resumes right
+			// after ShowModal() in ShowReconnectDialog(), which re-arms the reconcile
+			// prune and restarts polling.
+			if (m_reconnectDlg) {
+				m_reconnectDlg->EndModal(wxID_OK);
+			} else {
+				// Reconnected behind a minimised window, so there is no modal loop
+				// to unwind and nothing to close -- finish here instead (issue #806).
+				FinishReconnect(wxID_OK);
+			}
+		} else {
+			// Connected - go to next init step
+			glob_prefs->LoadRemote();
+		}
+	} else if (m_reconnecting) {
+		// A reconnect attempt failed. Space out the next one; the modal
+		// dialog stays up with the attempt count and an Abort button.
+		ScheduleNextReconnect();
 	} else if (dialog) {
-		// Connect failed during the initial attempt or a previous
-		// retry (dialog is still alive — it's only destroyed in
-		// Startup() after a successful connect). Show the error,
-		// reset the EC client, and reopen the dialog with the
-		// previous values still in place so the user can fix the
-		// wrong field and try again. If the user cancels the retry,
-		// then we shut down.
-		wxMessageBox(
-			(CFormat(_("Connection Failed. Unable to connect to %s:%d\n")) % dialog->Host() % dialog->Port()) + reply,
-			_("ERROR"), wxOK | wxICON_ERROR);
+		// Connect failed during the initial attempt or a previous retry -- the dialog is
+		// still alive, it is only destroyed in Startup() after success. Show the error,
+		// reset the EC client, and reopen the dialog with the previous values in place. If
+		// the user cancels the retry, shut down.
+		wxMessageBox((CFormat(_("Connection Failed. Unable to connect to %s:%d\n")) % dialog->Host() %
+				     dialog->Port()) +
+				     reply,
+			_("ERROR"),
+			wxOK | wxICON_ERROR);
 		ResetEcConnect();
 		if (!ShowConnectionDialog()) {
 			AddLogLineNS(_("Going down"));
-			wxCloseEvent ev;
-			ShutDown(ev);
-			ExitMainLoop();
+			Quit();
 		}
 	} else {
-		// Server disconnected after Startup() already ran — the
-		// dialog is gone, the rest of the app is wired up, and we
-		// have no clean path back. Tell the user and shut down.
-		AddLogLineNS(_("Going down"));
-		wxMessageBox(_("Connection closed - aMule has terminated probably."), _("ERROR"), wxOK);
-		wxCloseEvent ev;
-		ShutDown(ev);
-		ExitMainLoop();
+		// Connection lost after startup (the machine slept and the EC socket dropped, say).
+		// Do not quit -- freeze the UI and reconnect in the background until we are back or
+		// the user aborts.
+		BeginReconnect();
 	}
 }
 
-
-void CamuleRemoteGuiApp::OnConnectTimeout(wxTimerEvent&)
+void CamuleRemoteGuiApp::OnConnectTimeout(wxTimerEvent &)
 {
 	delete connect_timeout_timer;
 	connect_timeout_timer = NULL;
 
+	if (m_reconnecting) {
+		// This reconnect attempt hung (host unreachable, SYN black-holed). Treat it as a
+		// failed attempt and space out the next one; the modal reconnect dialog stays up
+		// with its Abort button.
+		AddLogLineCS(_("Reconnect attempt timed out; retrying."));
+		ScheduleNextReconnect();
+		return;
+	}
+
 	wxString host = dialog ? dialog->Host() : wxString();
-	long     port = dialog ? dialog->Port() : 0;
+	long port = dialog ? dialog->Port() : 0;
 	wxMessageBox(
-		CFormat(_("Connection timed out. Unable to reach %s:%d within the allotted time.\nPlease check the host, port and that aMule is running with External Connections enabled."))
-			% host % port,
-		_("ERROR"), wxOK | wxICON_ERROR);
+		CFormat(_(
+			"Connection timed out. Unable to reach %s:%d within the allotted time.\nPlease check "
+			"the host, port and that aMule is running with External Connections enabled.")) %
+			host % port,
+		_("ERROR"),
+		wxOK | wxICON_ERROR);
 
 	// Reset the EC client and reopen the dialog so the user can
 	// correct the host / port / etc. If they cancel, then quit.
 	ResetEcConnect();
 	if (!ShowConnectionDialog()) {
-		wxCloseEvent ev;
-		ShutDown(ev);
-		ExitMainLoop();
+		Quit();
+	}
+}
+
+void CamuleRemoteGuiApp::BeginReconnect()
+{
+	if (m_reconnecting) {
+		return;
+	}
+	m_reconnecting = true;
+	m_reconnectAttempt = 0;
+
+	AddLogLineCS(_("Connection to the remote core was lost. Trying to reconnect..."));
+
+	// Freeze polling while disconnected: the poll timer would fire
+	// GET_UPDATE at a dead socket, and the GUI timer animates stale data.
+	if (poll_timer) {
+		poll_timer->Stop();
+	}
+	if (amuledlg) {
+		amuledlg->StopGuiTimer();
+	}
+
+	if (!m_reconnectTimer) {
+		m_reconnectTimer = new wxTimer(this, ID_REMOTE_RECONNECT_TIMER);
+	}
+
+	// Kick off the first attempt before deciding about the dialog, so the common case --
+	// a blip that reconnects on the first try -- can be over with before anything is
+	// drawn.
+	AttemptReconnect();
+
+	// The dialog earns its intrusion by explaining a frozen window. With the window
+	// minimised or hidden to tray there is nothing on screen to explain, and a modal
+	// appearing over whatever the user is actually doing is worse than silence. Retry
+	// quietly instead; the log still carries every attempt, and OnMainWindowRestored()
+	// puts the dialog up if the user comes back.
+	//
+	// "Visible" has to mean both halves: minimized to Dock/taskbar keeps IsShown() true
+	// with nothing on screen, and hidden to tray leaves the iconized bit clear while the
+	// frame is gone. CamuleDlg tracks the iconized half from wxIconizeEvent rather than
+	// wxFrame::IsIconized(), which lies on wxGTK mid-transition. Compositors that never
+	// report iconize at all keep the old behaviour for the minimize case.
+	if (amuledlg && !amuledlg->IsVisibleToUser()) {
+		return;
 	}
+
+	ShowReconnectDialog();
 }
 
+void CamuleRemoteGuiApp::ShowReconnectDialog()
+{
+	if (!m_reconnecting || m_reconnectDlg) {
+		return;
+	}
+
+	m_reconnectDlg = new CReconnectDialog(amuledlg, CFormat(wxT("%s:%d")) % m_ecHost % m_ecPort);
+	// The retry loop has been running without us, so open on what it is actually doing
+	// rather than on "attempt 1": mid-countdown after a failed attempt, or in the middle
+	// of one.
+	if (m_reconnectCountdown > 0) {
+		m_reconnectDlg->SetCountdown(m_reconnectCountdown);
+	} else {
+		m_reconnectDlg->SetAttempt(m_reconnectAttempt);
+	}
+
+	// Run it modally: the retry timer and OnECConnection pump inside ShowModal().
+	// A success calls EndModal(wxID_OK); the Abort button ends it with wxID_CANCEL.
+	const int result = m_reconnectDlg->ShowModal();
+	m_reconnectDlg->Destroy();
+	m_reconnectDlg = nullptr;
+	FinishReconnect(result);
+}
 
-void CamuleRemoteGuiApp::OnECInitDone(wxEvent& )
+void CamuleRemoteGuiApp::UpdateCoreVersionIndicator()
 {
-	Startup();
+	if (!amuledlg || !m_connect) {
+		return;
+	}
+	// Cipher names are protocol identifiers ("AES-128-GCM"), not prose, so
+	// only the not-encrypted case needs the catalog.
+	const bool encrypted = m_connect->IsAEADEnabled();
+	const wxString encryption =
+		encrypted ? wxString::FromAscii(ECCrypt::CipherName(m_connect->GetAEADCipher()))
+			  : _("Disabled");
+
+	// Empty against a daemon too old to send EC_TAG_SERVER_VERSION; the
+	// dialog hides the field in that case rather than showing a blank.
+	amuledlg->ShowCoreVersion(m_connect->GetServerVersion(),
+		CFormat(wxT("%s:%d")) % m_ecHost % m_ecPort,
+		encryption,
+		encrypted);
+}
+
+void CamuleRemoteGuiApp::FinishReconnect(int result)
+{
+	m_reconnecting = false;
+	m_reconnectCountdown = 0;
+	if (m_reconnectTimer) {
+		m_reconnectTimer->Stop();
+	}
+	delete connect_timeout_timer;
+	connect_timeout_timer = nullptr;
+
+	if (result == wxID_OK) {
+		AddLogLineCS(_("Reconnected to the remote core."));
+
+		// The daemon may have been upgraded while we were away, so re-read
+		// the version rather than leaving the pre-drop one on screen.
+		UpdateCoreVersionIndicator();
+
+		// Everything we hold is keyed by ECID, and an ECID only means something within
+		// one daemon process: CECID hands them out from a counter that restarts with the
+		// process, so a restarted daemon reissues the same numbers in whatever order it
+		// loads files this time. Reconciling in place across that pairs our objects with
+		// whatever now shares their number.
+		//
+		// EC_TAG_SESSION_ID says which process we are talking to. The same value means
+		// the socket dropped but the daemon lived, so the in-place reconcile below is
+		// right and keeps scroll and selection. Anything else -- a different value, or
+		// none at all -- means we cannot trust a single ID we hold.
+		const uint64 sessionId = m_connect ? m_connect->GetServerSessionId() : 0;
+		const bool sameSession = sessionId != 0 && sessionId == m_ecSessionId;
+		m_ecSessionId = sessionId;
+
+		if (!sameSession) {
+			AddLogLineNS(_("The remote core was restarted; reloading."));
+			if (knownfiles) {
+				knownfiles->ResetForNewDaemonSession();
+			}
+			if (clientlist) {
+				clientlist->ResetForNewSession();
+			}
+			if (serverlist) {
+				serverlist->ResetForNewSession();
+			}
+			if (friendlist) {
+				friendlist->ResetForNewSession();
+			}
+			if (searchlist) {
+				// Searches survive a restart -- amuled persists them and
+				// re-registers each restored one, so the daemon hands the same
+				// results back under their original search ids. What does NOT
+				// survive is the per-result ECID: the counter restarts with the
+				// process, so every restored result arrives as an id this client
+				// has never seen and is added alongside the copy it already holds.
+				//
+				// Nothing reaps the stale copy on its own: the search list deletes
+				// only on an explicit EC_TAG_FILE_REMOVED tombstone, and a daemon
+				// that has just started never emits one for an unknown ECID.
+				searchlist->ResetForNewSession();
+				if (amuledlg && amuledlg->m_searchwnd) {
+					// Frees every result, so the tabs must drop their rows
+					// before anything repaints through them.
+					amuledlg->m_searchwnd->ResetResultViews();
+				}
+			}
+		} else if (knownfiles) {
+			// Same daemon: the next full poll reconciles every list against the fresh
+			// snapshot in place (update / add / prune), so scroll and selection survive.
+			knownfiles->ArmReconnectReconcile();
+		}
+		// The tree on screen belongs to the connection that just ended; fetch a fresh one
+		// on the next poll rather than after an interval measured against the old one.
+		ResetStatsTreePoll();
+		if (poll_timer) {
+			poll_timer->Start(EC_POLL_INTERVAL_MS);
+		}
+		if (amuledlg) {
+			amuledlg->StartGuiTimer();
+		}
+	} else {
+		// User aborted the reconnect.
+		AddLogLineNS(_("Going down"));
+		Quit();
+	}
+}
+
+void CamuleRemoteGuiApp::OnMainWindowRestored()
+{
+	if (!m_reconnecting || m_reconnectDlg) {
+		return;
+	}
+	// Not straight from here: this runs inside the iconize event handler, and
+	// ShowReconnectDialog() ends in either a nested modal loop or Quit(). Let the
+	// handler return first -- tearing the main window down from a nested loop is what a
+	// crash there costs.
+	CallAfter(&CamuleRemoteGuiApp::ShowReconnectDialog);
+}
+
+void CamuleRemoteGuiApp::AttemptReconnect()
+{
+	m_reconnectAttempt++;
+	if (m_reconnectDlg) {
+		m_reconnectDlg->SetAttempt(m_reconnectAttempt);
+	}
+
+	AddLogLineCS(CFormat(_("Reconnect attempt %d: connecting to %s:%d")) % m_reconnectAttempt % m_ecHost %
+		     m_ecPort);
+
+	// Reset ALL layers of the reused connection: the pending-request FIFO (orphaned
+	// handlers from requests the dropped socket left unanswered would otherwise mis-pair
+	// with the new session's replies -- a stats reply routed to the file-list handler
+	// wipes the download and shared lists), the EC packet-reassembly state (a stale
+	// mid-packet read would misparse the new session's first bytes and the login would
+	// fail), and a fresh asio socket on the SAME CRemoteConnect object, which keeps every
+	// remote container's m_conn pointer valid.
+	//
+	// Locally chosen capability flags persist deliberately -- what this end can do has
+	// not changed. Flags agreed with the previous daemon are a different matter: the next
+	// one may not support them, so they are dropped here rather than inside
+	// ResetProtocolState, which other CECSocket users share.
+	m_connect->DiscardRequestQueue();
+	m_connect->ResetProtocolState();
+	m_connect->ClearPeerNegotiatedFlags();
+	m_connect->ResetForReconnect();
+
+	// Per-attempt watchdog so an attempt that hangs (host unreachable, SYN black-holed)
+	// does not stall the retry loop; OnConnectTimeout treats a fire as a failed attempt.
+	// Cancelled by OnECConnection when it resolves.
+	delete connect_timeout_timer;
+	connect_timeout_timer = new wxTimer(this, ID_REMOTE_CONNECT_TIMEOUT_TIMER);
+	connect_timeout_timer->StartOnce(15000);
+
+	if (!m_connect->ConnectToCore(m_ecHost, m_ecPort, m_ecPass, "amule-remote", "0x0001")) {
+		// Couldn't even initiate the connect -- space out the next attempt.
+		AddLogLineCS(_("Reconnect could not start; retrying shortly."));
+		delete connect_timeout_timer;
+		connect_timeout_timer = nullptr;
+		ScheduleNextReconnect();
+	}
+	// else: async -- OnECConnection resolves success/failure.
+}
+
+void CamuleRemoteGuiApp::ScheduleNextReconnect()
+{
+	// Drop any pending per-attempt watchdog, then count down 5 s to the next attempt via
+	// a repeating 1 s tick that updates the dialog, so the user sees when the retry will
+	// fire and an unreachable daemon is not hammered.
+	delete connect_timeout_timer;
+	connect_timeout_timer = nullptr;
+	m_reconnectCountdown = 5;
+	if (m_reconnectDlg) {
+		m_reconnectDlg->SetCountdown(m_reconnectCountdown);
+	}
+	if (m_reconnectTimer) {
+		m_reconnectTimer->Start(1000);
+	}
 }
 
+void CamuleRemoteGuiApp::OnReconnectTimer(wxTimerEvent &)
+{
+	if (!m_reconnecting) {
+		return;
+	}
+	if (--m_reconnectCountdown > 0) {
+		if (m_reconnectDlg) {
+			m_reconnectDlg->SetCountdown(m_reconnectCountdown);
+		}
+		return;
+	}
+	// Countdown elapsed -- fire the next attempt.
+	m_reconnectTimer->Stop();
+	AttemptReconnect();
+}
 
-void CamuleRemoteGuiApp::OnNotifyEvent(CMuleGUIEvent& evt)
+void CamuleRemoteGuiApp::OnECInitDone(wxEvent &)
 {
-	evt.Notify();
+	Startup();
 }
 
+void CamuleRemoteGuiApp::OnNotifyEvent(CMuleGUIEvent &evt)
+{
+	// Two kinds of notification arrive here and they need opposite treatment.
+	//
+	// DoNotify() drives what the GUI displays. Its handlers read
+	// theApp->amuledlg->m_transferwnd and friends without checking the dialog itself, so
+	// one delivered after the window is gone dereferences null. amulegui destroys its
+	// dialog whenever the EC link drops -- a remote core restart being the everyday way
+	// that happens -- and the pending-event queue is not drained first.
+	// HandleNotification() already declines to run one of these inline when there is no
+	// window; this is the queued half.
+	//
+	// DoNotifyAlways() is how the socket layer reaches the main thread. Those must run
+	// whatever the GUI is doing -- amulegui has no main window until an EC connection has
+	// been made, so dropping them means the connection never completes and every attempt
+	// ends at the watchdog.
+	if (evt.IsAlways() || amuledlg) {
+		evt.Notify();
+	}
+}
 
-void CamuleRemoteGuiApp::Startup() {
+void CamuleRemoteGuiApp::Startup()
+{
 
 	if (dialog->SaveUserPass()) {
 		wxConfig::Get()->Write("/EC/Host", dialog->Host());
 		wxConfig::Get()->Write("/EC/Port", dialog->Port());
 		wxConfig::Get()->Write("/EC/Password", dialog->PassHash());
 		wxConfig::Get()->Write("/EC/ForceZLIB", dialog->ForceZlib() ? 1l : 0l);
+		wxConfig::Get()->Write("/EC/Encryption", dialog->Encryption() ? 1l : 0l);
 	}
+	// Capture the EC connection params so a post-startup reconnect
+	// (issue #444) can re-dial without the (about-to-be-destroyed) dialog.
+	m_ecHost = dialog->Host();
+	m_ecPort = dialog->Port();
+	m_ecPass = dialog->PassHash();
+	// Baseline for the reconnect comparison: which daemon process this first connection
+	// reached. Stays 0 against a daemon that does not send EC_TAG_SESSION_ID, which makes
+	// every later reconnect take the start-over path.
+	//
+	// Not null-guarded, deliberately: Startup() only runs on a successful connect and the
+	// lines below dereference m_connect unconditionally, so a guard here would protect
+	// nothing while claiming the pointer is optional.
+	m_ecSessionId = m_connect->GetServerSessionId();
+
 	dialog->Destroy();
 	dialog = NULL;
 
 	m_ConnState = 0;
-	m_clientID  = 0;
+	m_clientID = 0;
 
 	serverconnect = new CServerConnectRem(m_connect);
 	m_statistics = new CStatistics(*m_connect);
@@ -610,8 +1126,7 @@
 	serverlist = new CServerListRem(m_connect);
 	friendlist = new CFriendListRem(m_connect);
 
-
-	sharedfiles	= new CSharedFilesRem(m_connect);
+	sharedfiles = new CSharedFilesRem(m_connect);
 	knownfiles = new CKnownFilesRem(m_connect);
 
 	downloadqueue = new CDownQueueRem(m_connect);
@@ -619,58 +1134,77 @@
 
 	m_allUploadingKnownFile = new CKnownFile;
 
+	// Must run before InitGui() below: the CamuleDlg constructor reads UseTrayIcon() to
+	// decide whether to create the tray icon at all, so a guard applied after it would
+	// leave the icon built for a backend that cannot show it. Nothing here waits on the
+	// EC connection -- these are amulegui's own local preferences -- so OnInit() would
+	// have worked equally well.
+	SanitiseTrayPreferences();
+
 	// Create main dialog
 	InitGui(m_geometryEnabled, m_geometryString);
 
+	// Needs the dialog to exist, so it cannot happen with the rest of the
+	// handshake bookkeeping above.
+	UpdateCoreVersionIndicator();
+
 	// Forward wxLog events to CLogger
 	wxLog::SetActiveTarget(new CLoggerTarget);
 	knownfiles->DoRequery(EC_OP_GET_UPDATE, EC_TAG_KNOWNFILE);
 
 	// Start the Poll Timer
-	poll_timer->Start(1000);
+	ResetStatsTreePoll();
+	poll_timer->Start(EC_POLL_INTERVAL_MS);
 	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
-}
+	// Drain any pre-connect URL queued by ProtocolHandler_QueueSchemeLink (cold launch:
+	// click wrote ED2KLinks, the user then connects). Saves a ~1 s wait for OnPollTimer
+	// to notice the file. No-op if empty.
+	AddLinksFromFile();
 
+	// amulegui does no local GeoIP resolution: the daemon resolves country codes
+	// and sends them over EC, and amulegui only renders the flags.
+}
 
 int CamuleRemoteGuiApp::ShowAlert(wxString msg, wxString title, int flags)
 {
 	return CamuleGuiBase::ShowAlert(msg, title, flags);
 }
 
-
-void CamuleRemoteGuiApp::AddRemoteLogLine(const wxString& line)
+void CamuleRemoteGuiApp::AddRemoteLogLine(const wxString &line)
 {
 	amuledlg->AddLogLine(line);
 }
 
+void CamuleRemoteGuiApp::BeginRemoteLogBatch()
+{
+	amuledlg->BeginLogBatch();
+}
+
+void CamuleRemoteGuiApp::EndRemoteLogBatch()
+{
+	amuledlg->EndLogBatch();
+}
+
 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
+	AddLogLineN(_(
+		"Ready")); // The first log line after the window is up triggers output of all the ones before
 	return 0;
 }
 
-
 bool CamuleRemoteGuiApp::CopyTextToClipboard(wxString strText)
 {
 	return CamuleGuiBase::CopyTextToClipboard(strText);
 }
 
-
 uint32 CamuleRemoteGuiApp::GetPublicIP()
 {
 	return 0;
 }
 
-
 wxString CamuleRemoteGuiApp::GetLog(bool reset)
 {
 	if (reset) {
@@ -681,7 +1215,6 @@
 	return "";
 }
 
-
 wxString CamuleRemoteGuiApp::GetServerLog(bool reset)
 {
 	if (reset) {
@@ -695,25 +1228,21 @@
 	return "";
 }
 
-
 void CamuleRemoteGuiApp::AddServerMessageLine(wxString &msg)
 {
-	// Drives the same CamuleDlg::AddServerMessageLine the monolithic
-	// build calls -- ID_SERVERINFO text ctrl + 500-char truncation +
-	// auto-scroll. Cumulative-log diffing happens in
-	// CServerInfoHandlerRem::HandlePacket; by the time we land here
-	// `msg` is a single new line, ready to append.
+	// Drives the same CamuleDlg::AddServerMessageLine the monolithic build calls --
+	// ID_SERVERINFO text ctrl, 500-char truncation, auto-scroll. Cumulative-log diffing
+	// happens in CServerInfoHandlerRem::HandlePacket; by the time we land here `msg` is a
+	// single new line, ready to append.
 	amuledlg->AddServerMessageLine(msg);
 }
 
-
 void CServerInfoHandlerRem::HandlePacket(const CECPacket *packet)
 {
-	// amuled answers EC_OP_GET_SERVERINFO with one EC_TAG_STRING
-	// carrying the full cumulative server_msg buffer. Diff against
-	// what we've already shown so the text ctrl receives only new
-	// lines (preserves scroll position and avoids re-rendering tens
-	// of KB on every poll).
+	// amuled answers EC_OP_GET_SERVERINFO with one EC_TAG_STRING carrying the full
+	// cumulative server_msg buffer. Diff against what we have already shown so the text
+	// ctrl receives only new lines, preserving scroll position and avoiding a re-render
+	// of tens of KB on every poll.
 	const CECTag *tag = packet->GetFirstTagSafe();
 	if (!tag || !tag->IsString()) {
 		return;
@@ -724,10 +1253,16 @@
 	if (fullLog.StartsWith(m_seenSoFar)) {
 		delta = fullLog.Mid(m_seenSoFar.length());
 	} else {
-		// amuled was restarted, or someone else issued a clear, so the
-		// remote cumulative buffer is shorter or unrelated. Wipe the
-		// local view and start fresh from the current snapshot.
-		theApp->amuledlg->ResetLog(ID_SERVERINFO);
+		// amuled was restarted, or someone else issued a clear, so the remote cumulative
+		// buffer is shorter or unrelated. Wipe the local view and start fresh from the
+		// current snapshot.
+		//
+		// Guarded like every other view call reached from an EC reply: a reply can land
+		// while amulegui has no dialog. The bookkeeping around these calls still has to
+		// run, so only the call into the view is skipped.
+		if (theApp->amuledlg) {
+			theApp->amuledlg->ResetLog(ID_SERVERINFO);
+		}
 		delta = fullLog;
 	}
 	m_seenSoFar = fullLog;
@@ -741,18 +1276,82 @@
 	}
 }
 
+void CChatMsgHandlerRem::HandlePacket(const CECPacket *packet)
+{
+	// EC_OP_CHAT_SESSIONS: a top-level EC_TAG_CHAT_MSG_ID carrying the store's current
+	// last id, then one EC_TAG_CHAT_SESSION per session with only the messages newer
+	// than the cursor we sent.
+	if (!theApp->amuledlg || !theApp->amuledlg->m_chatwnd) {
+		return;
+	}
+	CChatWnd *chatwnd = theApp->amuledlg->m_chatwnd;
+
+	// First reply of a connection backfills history rather than announcing it: replay
+	// must not light the Messages toolbar button up for messages the user already read on
+	// another client. Only what arrives after we have a cursor is genuinely new.
+	const bool backfill = (m_cursor == 0);
+
+	std::set<uint64> present;
+	for (const CECTag &sessionTag : *packet) {
+		if (sessionTag.GetTagName() != EC_TAG_CHAT_SESSION) {
+			continue;
+		}
+		const uint64 gui_id = sessionTag.GetInt();
+		present.insert(gui_id);
+
+		wxString name;
+		if (const CECTag *nameTag = sessionTag.GetTagByName(EC_TAG_CHAT_PEER_NAME)) {
+			name = nameTag->GetStringData();
+		}
+		if (name.IsEmpty()) {
+			name = ChatPeerFallbackName(gui_id);
+		}
+
+		// Open the tab even when the session has no new messages: that is how a session
+		// started before we connected becomes visible at all. Unfocused, so a session
+		// appearing on its own cannot steal the selection.
+		chatwnd->StartSessionByID(gui_id, name);
+
+		for (const CECTag &msgTag : sessionTag) {
+			if (msgTag.GetTagName() != EC_TAG_CHAT_MESSAGE) {
+				continue;
+			}
+			const CECTag *dirTag = msgTag.GetTagByName(EC_TAG_CHAT_DIRECTION);
+			const bool outgoing = dirTag && dirTag->GetInt() != 0;
+			chatwnd->AppendStoredMessage(
+				gui_id, name, msgTag.GetStringData(), outgoing, /*blink=*/!backfill);
+		}
+	}
+
+	// A session we are tracking that is absent from the reply was closed by another
+	// client, or evicted. Drop the tab without sending a close of our own -- the core has
+	// already forgotten it. Snapshot first: closing a tab mutates the set being iterated.
+	const std::set<uint64> tracked = m_sessions;
+	for (uint64 gui_id : tracked) {
+		if (!present.count(gui_id)) {
+			chatwnd->EndSessionFromCore(gui_id);
+		}
+	}
+	m_sessions = present;
+
+	if (const CECTag *cursorTag = packet->GetTagByName(EC_TAG_CHAT_MSG_ID)) {
+		// Advance even when nothing came back, so evicted ids are not asked
+		// for forever.
+		m_cursor = cursorTag->GetInt();
+	}
+}
 
-bool CamuleRemoteGuiApp::AddServer(CServer * server, bool)
+bool CamuleRemoteGuiApp::AddServer(CServer *server, bool)
 {
 	CECPacket req(EC_OP_SERVER_ADD);
-	req.AddTag(CECTag(EC_TAG_SERVER_ADDRESS, CFormat("%s:%d") % server->GetAddress() % server->GetPort()));
+	req.AddTag(
+		CECTag(EC_TAG_SERVER_ADDRESS, CFormat("%s:%d") % server->GetAddress() % server->GetPort()));
 	req.AddTag(CECTag(EC_TAG_SERVER_NAME, server->GetListName()));
 	m_connect->SendPacket(&req);
 
 	return true;
 }
 
-
 bool CamuleRemoteGuiApp::IsFirewalled() const
 {
 	if (IsConnectedED2K() && !serverconnect->IsLowID()) {
@@ -762,22 +1361,21 @@
 	return IsFirewalledKad();
 }
 
-
-bool CamuleRemoteGuiApp::IsConnectedED2K() const {
+bool CamuleRemoteGuiApp::IsConnectedED2K() const
+{
 	return serverconnect && serverconnect->IsConnected();
 }
 
-
-void CamuleRemoteGuiApp::StartKad() {
+void CamuleRemoteGuiApp::StartKad()
+{
 	m_connect->StartKad();
 }
 
-
-void CamuleRemoteGuiApp::StopKad() {
+void CamuleRemoteGuiApp::StopKad()
+{
 	m_connect->StopKad();
 }
 
-
 void CamuleRemoteGuiApp::BootstrapKad(uint32 ip, uint16 port)
 {
 	CECPacket req(EC_OP_KAD_BOOTSTRAP_FROM_IP);
@@ -787,8 +1385,7 @@
 	m_connect->SendPacket(&req);
 }
 
-
-void CamuleRemoteGuiApp::UpdateNotesDat(const wxString& url)
+void CamuleRemoteGuiApp::UpdateNotesDat(const wxString &url)
 {
 	CECPacket req(EC_OP_KAD_UPDATE_FROM_URL);
 	req.AddTag(CECTag(EC_TAG_KADEMLIA_UPDATE_URL, url));
@@ -796,38 +1393,40 @@
 	m_connect->SendPacket(&req);
 }
 
-
-void CamuleRemoteGuiApp::DisconnectED2K() {
+void CamuleRemoteGuiApp::DisconnectED2K()
+{
 	if (IsConnectedED2K()) {
 		m_connect->DisconnectED2K();
 	}
 }
 
-
 uint32 CamuleRemoteGuiApp::GetED2KID() const
 {
 	return serverconnect ? serverconnect->GetClientID() : 0;
 }
 
-
 uint32 CamuleRemoteGuiApp::GetID() const
 {
 	return m_clientID;
 }
 
-
-void CamuleRemoteGuiApp::ShowUserCount() {
+void CamuleRemoteGuiApp::ShowUserCount()
+{
 	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());
+		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());
+		buffer = CFormat(s_singlenetstatusformat) % CastItoIShort(theStats::GetED2KUsers()) %
+			 CastItoIShort(theStats::GetED2KFiles());
 	} else if (thePrefs::GetNetworkKademlia()) {
-		buffer = CFormat(s_singlenetstatusformat) % CastItoIShort(theStats::GetKadUsers()) % CastItoIShort(theStats::GetKadFiles());
+		buffer = CFormat(s_singlenetstatusformat) % CastItoIShort(theStats::GetKadUsers()) %
+			 CastItoIShort(theStats::GetKadFiles());
 	} else {
 		buffer = _("No networks selected");
 	}
@@ -835,38 +1434,23 @@
 	Notify_ShowUserCount(buffer);
 }
 
-
 /*
- * Preferences: holds both local and remote settings.
- *
- * First, everything is loaded from local config file. Later, settings
- * that are relevant on remote side only are loaded thru EC
+ * Preferences: holds both local and remote settings. Everything is loaded from the
+ * local config file first; settings that are relevant on the remote side only are
+ * loaded later through EC.
  */
 CPreferencesRem::CPreferencesRem(CRemoteConnect *conn)
 {
 	m_conn = conn;
 
-	//
-	// Settings queried from remote side
-	//
-	m_exchange_send_selected_prefs =
-		EC_PREFS_GENERAL |
-		EC_PREFS_CONNECTIONS |
-		EC_PREFS_MESSAGEFILTER |
-		EC_PREFS_ONLINESIG |
-		EC_PREFS_SERVERS |
-		EC_PREFS_FILES |
-		EC_PREFS_DIRECTORIES |
-		EC_PREFS_SECURITY |
-		EC_PREFS_CORETWEAKS |
-		EC_PREFS_REMOTECONTROLS |
-		EC_PREFS_KADEMLIA;
-	m_exchange_recv_selected_prefs =
-		m_exchange_send_selected_prefs |
-		EC_PREFS_CATEGORIES;
+	// Settings queried from the remote side
+	m_exchange_send_selected_prefs = EC_PREFS_GENERAL | EC_PREFS_CONNECTIONS | EC_PREFS_MESSAGEFILTER |
+					 EC_PREFS_ONLINESIG | EC_PREFS_SERVERS | EC_PREFS_FILES |
+					 EC_PREFS_DIRECTORIES | EC_PREFS_SECURITY | EC_PREFS_CORETWEAKS |
+					 EC_PREFS_REMOTECONTROLS | EC_PREFS_KADEMLIA | EC_PREFS_IP2COUNTRY;
+	m_exchange_recv_selected_prefs = m_exchange_send_selected_prefs | EC_PREFS_CATEGORIES;
 }
 
-
 void CPreferencesRem::HandlePacket(const CECPacket *packet)
 {
 	static_cast<const CEC_Prefs_Packet *>(packet)->Apply();
@@ -879,27 +1463,31 @@
 			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->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 {
 		Category_Struct *cat = new Category_Struct;
 		cat->title = _("All");
-		cat->color =  0;
+		cat->color = 0;
 		cat->prio = PR_NORMAL;
 		theApp->glob_prefs->AddCat(cat);
 	}
 	wxECInitDoneEvent event;
 	theApp->AddPendingEvent(event);
-
 }
 
-
 bool CPreferencesRem::LoadRemote()
 {
-	//
-	// override local settings with remote
+#ifdef GEOIP_GUI
+	// Assume the core has NO GeoIP support until it says otherwise. A 3.1+ core built
+	// with ENABLE_IP2COUNTRY answers with EC_TAG_IP2COUNTRY_SUPPORTED; a pre-3.1 core
+	// omits the whole category, so leaving this false correctly hides the IP2Country page
+	// rather than offering settings it cannot honour.
+	thePrefs::SetGeoIPSupported(false);
+#endif
+	// Override local settings with remote
 	CECPacket req(EC_OP_GET_PREFERENCES, EC_DETAIL_UPDATE);
 
 	// bring categories too
@@ -910,88 +1498,198 @@
 	return true;
 }
 
-
 void CPreferencesRem::SendToRemote()
 {
 	CEC_Prefs_Packet pref_packet(m_exchange_send_selected_prefs, EC_DETAIL_UPDATE, EC_DETAIL_FULL);
 	m_conn->SendPacket(&pref_packet);
 }
 
+// Reply handler for the shared-directory ops. Deliberately separate from
+// CPreferencesRem::HandlePacket, which static_casts every packet it is given to
+// CEC_Prefs_Packet -- routing a non-prefs reply through it would be undefined
+// behaviour. Results are stored on glob_prefs rather than on the Preferences dialog,
+// so a reply arriving after the user closed the dialog is harmless.
+class CSharedDirsHandler : public CECPacketHandlerBase
+{
+	void HandlePacket(const CECPacket *packet) override;
+};
 
-// Surfaces the EC_OP_FAILED reply from amuled's EC_OP_ADD_LINK handler
-// to the user. CDownQueueRem::AddLink used to drop the reply on the
-// floor (fire-and-forget SendPacket), so a malformed ed2k link -- e.g.
-// the original #310 reproducer `ed2k::3D366ED505B977FC61C9A6EE01E96329`
-// -- silently did nothing. amuled does the right thing now (logs
-// "Unknown protocol of link" and returns EC_OP_FAILED + EC_TAG_STRING),
-// but the GUI side has to actually show the message.
-class CAddLinkHandler : public CECPacketHandlerBase {
+void CSharedDirsHandler::HandlePacket(const CECPacket *packet)
+{
+	if (packet->GetOpCode() == EC_OP_GET_SHARED_DIRS) {
+		CPreferences::PathList explicitDirs;
+		CPreferences::PathList recursiveDirs;
+		for (const CECTag &tag : *packet) {
+			if (tag.GetTagName() != EC_TAG_SHAREDDIR) {
+				continue;
+			}
+			const CPath path(tag.GetStringData());
+			const CECTag *recursiveTag = tag.GetTagByName(EC_TAG_SHAREDDIR_RECURSIVE);
+			if (recursiveTag != nullptr && recursiveTag->GetInt() != 0) {
+				recursiveDirs.push_back(path);
+			} else {
+				explicitDirs.push_back(path);
+			}
+		}
+		theApp->glob_prefs->shareddir_explicit_list = explicitDirs;
+		theApp->glob_prefs->shareddir_recursive_list = recursiveDirs;
+		// Refresh the editor if Preferences is open; a no-op otherwise.
+		wxTheApp->CallAfter(() { PrefsUnifiedDlg::RefreshSharedDirsIfOpen(); });
+	} else if (packet->GetOpCode() == EC_OP_SET_SHARED_DIRS) {
+		// The daemon applied every path that validated and listed the rest. Report them so
+		// a typo'd path cannot become a silently dead share -- the remote user has no way
+		// to browse and check it themselves.
+		wxString rejected;
+		for (const CECTag &tag : *packet) {
+			if (tag.GetTagName() != EC_TAG_SHAREDDIR_REJECTED) {
+				continue;
+			}
+			const CECTag *errTag = tag.GetTagByName(EC_TAG_SHAREDDIR_ERROR);
+			// Reason codes are translated here, in the user's locale, rather
+			// than shipped as text from a daemon with a different one.
+			const wxString reason = (errTag != nullptr && errTag->GetInt() == 2)
+							? _("not readable")
+							: _("not found");
+			rejected += CFormat("\n%s (%s)") % tag.GetStringData() % reason;
+		}
+		if (!rejected.IsEmpty()) {
+			const wxString msg =
+				CFormat(_("The core rejected these shared folders:%s")) % rejected;
+			// Deferred: a modal opened straight from a packet handler spins a nested event
+			// loop that re-enters the EC socket and corrupts its receive state (see
+			// CAddLinkHandler).
+			wxTheApp->CallAfter(msg() { wxMessageBox(msg, _("ERROR"), wxOK | wxICON_ERROR); });
+		}
+	}
+	delete this;
+}
+
+void CPreferencesRem::LoadSharedDirsRemote()
+{
+	if (!m_conn->ServerSupportsSharedDirsConfig()) {
+		return;
+	}
+	CECPacket req(EC_OP_GET_SHARED_DIRS);
+	m_conn->SendRequest(new CSharedDirsHandler(), &req);
+}
+
+void CPreferencesRem::SendSharedDirsToRemote()
+{
+	if (!m_conn->ServerSupportsSharedDirsConfig()) {
+		return;
+	}
+	CECPacket req(EC_OP_SET_SHARED_DIRS);
+	for (const CPath &dir : shareddir_explicit_list) {
+		req.AddTag(CECTag(EC_TAG_SHAREDDIR, dir.GetRaw()));
+	}
+	for (const CPath &dir : shareddir_recursive_list) {
+		CECTag dirTag(EC_TAG_SHAREDDIR, dir.GetRaw());
+		dirTag.AddTag(CECTag(EC_TAG_SHAREDDIR_RECURSIVE, (uint8)1));
+		req.AddTag(dirTag);
+	}
+	m_conn->SendRequest(new CSharedDirsHandler(), &req);
+}
+
+// Surfaces the EC_OP_FAILED reply from amuled's EC_OP_ADD_LINK handler to the user.
+// CDownQueueRem::AddLink used to drop the reply on the floor, so a malformed ed2k
+// link silently did nothing. amuled logs "Unknown protocol of link" and returns
+// EC_OP_FAILED + EC_TAG_STRING; the GUI side has to show it.
+class CAddLinkHandler : public CECPacketHandlerBase
+{
 	virtual void HandlePacket(const CECPacket *packet);
 };
 
-
 void CAddLinkHandler::HandlePacket(const CECPacket *packet)
 {
 	if (packet->GetOpCode() == EC_OP_FAILED) {
-		// Daemon-side EC_OP_ADD_LINK always tags the failure response
-		// with an EC_TAG_STRING explaining what went wrong. Reuse that
-		// string as the fallback too (it's already in the i18n catalog
-		// at po/amule.pot:1783, so no new string needs adding here).
+		// Daemon-side EC_OP_ADD_LINK always tags the failure response with an EC_TAG_STRING
+		// explaining what went wrong. Reuse that string as the fallback too, since it is
+		// already in the i18n catalog.
 		const CECTag *tag = packet->GetFirstTagSafe();
 		wxString msg = (tag && tag->IsString())
-			? wxGetTranslation(tag->GetStringData())
-			: wxGetTranslation(wxTRANSLATE("Invalid link or already on list."));
-		// Defer the modal off the OnPacketReceived call stack: wxMessageBox
-		// spins a nested wx event loop, which dispatches CoreNotify_LibSocket*
-		// events that re-enter CECSocket::OnInput on the same socket and
-		// clobber its rx state (m_curr_rx_data / m_bytes_needed / m_in_header).
-		// Under heavy notification load — a batched-link add against a
-		// big shareset — the corrupted parse trips a protocol-error
-		// CloseSocket, which is the desync amuled logs as "External
-		// connection closed" right after the AddLink batch (#757 part 1).
-		wxTheApp->CallAfter(msg() {
-			wxMessageBox(msg, _("ERROR"), wxOK | wxICON_ERROR);
-		});
+				       ? wxGetTranslation(tag->GetStringData())
+				       : wxGetTranslation(wxTRANSLATE("Invalid link or already on list."));
+		// Defer the modal off the OnPacketReceived call stack: wxMessageBox spins a nested
+		// wx event loop, which dispatches CoreNotify_LibSocket* events that re-enter
+		// CECSocket::OnInput on the same socket and clobber its rx state. Under heavy
+		// notification load the corrupted parse trips a protocol-error CloseSocket, which
+		// amuled logs as "External connection closed" right after the AddLink batch.
+		wxTheApp->CallAfter(msg() { wxMessageBox(msg, _("ERROR"), wxOK | wxICON_ERROR); });
 	}
 	delete this;
 }
 
+class CCatHandler : public CECPacketHandlerBase
+{
+	virtual void HandlePacket(const CECPacket *packet);
+};
 
-class CCatHandler : public CECPacketHandlerBase {
+// EC_OP_DELETE_CATEGORY reply. Holds the index because a successful delete
+// answers a bare EC_OP_NOOP; only the failures name the category.
+class CCatDeleteHandler : public CECPacketHandlerBase
+{
+public:
+	explicit CCatDeleteHandler(uint8 cat)
+	: m_cat(cat)
+	{
+	}
 	virtual void HandlePacket(const CECPacket *packet);
+	// Socket died mid-request: free ourselves (DiscardRequestQueue clears the queue
+	// without deleting) and commit nothing -- whether the daemon did the delete before
+	// the drop is exactly what is unknown.
+	virtual void AbortPendingRequest() { delete this; }
+
+private:
+	uint8 m_cat;
 };
 
+void CCatDeleteHandler::HandlePacket(const CECPacket *packet)
+{
+	if (packet->GetOpCode() == EC_OP_FAILED) {
+		// Nothing was removed locally, so there is nothing to undo. Report the
+		// reason: a rejected index means our list is behind the core's.
+		const CECTag *msgTag = packet->GetTagByName(EC_TAG_STRING);
+		const wxString reason = msgTag ? wxGetTranslation(msgTag->GetStringData())
+					       : wxString(_("The daemon refused the request."));
+		const wxString msg = CFormat(_("Could not delete the category: %s")) % reason;
+		// Modal off the OnPacketReceived stack, as the handlers above do.
+		wxTheApp->CallAfter(msg() { wxMessageBox(msg, _("ERROR"), wxOK); });
+	} else if (theApp->amuledlg && theApp->amuledlg->m_transferwnd) {
+		// Confirmed gone core-side: same commit the monolithic build runs inline.
+		theApp->amuledlg->m_transferwnd->CommitRemoveCategory(m_cat);
+	}
+	delete this;
+}
 
 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);
+		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);
-			wxString msg = CFormat(_("Can't create directory '%s' for category '%s', keeping directory '%s'."))
-				% cs->path.GetPrintable() % cs->title % pathTag->GetStringData();
+			Category_Struct *cs = theApp->glob_prefs->GetCategory(cat);
+			wxString msg = CFormat(_("Can't create directory '%s' for category '%s', keeping "
+						 "directory '%s'.")) %
+				       cs->path.GetPrintable() % cs->title % pathTag->GetStringData();
 			cs->path = CPath(pathTag->GetStringData());
-			theApp->amuledlg->m_transferwnd->UpdateCategory(cat);
-			theApp->amuledlg->m_transferwnd->downloadlistctrl->Refresh();
-			// Same re-entrancy hazard as CAddLinkHandler above: keep the
-			// modal off the OnPacketReceived stack so a nested wx event
-			// loop doesn't corrupt CECSocket rx state.
-			wxTheApp->CallAfter(msg() {
-				wxMessageBox(msg, _("ERROR"), wxOK);
-			});
+			if (theApp->amuledlg) {
+				theApp->amuledlg->m_transferwnd->UpdateCategory(cat);
+				theApp->amuledlg->m_transferwnd->downloadlistctrl->Refresh();
+			}
+			// Same re-entrancy hazard as CAddLinkHandler above: keep the modal off the
+			// OnPacketReceived stack so a nested wx event loop does not corrupt CECSocket
+			// rx state.
+			wxTheApp->CallAfter(msg() { wxMessageBox(msg, _("ERROR"), wxOK); });
 		}
 	}
 	delete this;
 }
 
-
-bool CPreferencesRem::CreateCategory(
-	Category_Struct *& category,
-	const wxString& name,
-	const CPath& path,
-	const wxString& comment,
+bool CPreferencesRem::CreateCategory(Category_Struct *&category,
+	const wxString &name,
+	const CPath &path,
+	const wxString &comment,
 	uint32 color,
 	uint8 prio)
 {
@@ -1001,25 +1699,19 @@
 	m_conn->SendRequest(new CCatHandler, &req);
 
 	category = new Category_Struct();
-	category->path		= path;
-	category->title		= name;
-	category->comment	= comment;
-	category->color		= color;
-	category->prio		= prio;
+	category->path = path;
+	category->title = name;
+	category->comment = comment;
+	category->color = color;
+	category->prio = prio;
 
 	AddCat(category);
 
 	return true;
 }
 
-
 bool CPreferencesRem::UpdateCategory(
-	uint8 cat,
-	const wxString& name,
-	const CPath& path,
-	const wxString& comment,
-	uint32 color,
-	uint8 prio)
+	uint8 cat, const wxString &name, const CPath &path, const wxString &comment, uint32 color, uint8 prio)
 {
 	CECPacket req(EC_OP_UPDATE_CATEGORY);
 	CEC_Category_Tag tag(cat, name, path.GetRaw(), comment, color, prio);
@@ -1027,65 +1719,61 @@
 	m_conn->SendRequest(new CCatHandler, &req);
 
 	Category_Struct *category = m_CatListcat;
-	category->path		= path;
-	category->title		= name;
-	category->comment	= comment;
-	category->color		= color;
-	category->prio		= prio;
+	category->path = path;
+	category->title = name;
+	category->comment = comment;
+	category->color = color;
+	category->prio = prio;
 
 	return true;
 }
 
-
-void CPreferencesRem::RemoveCat(uint8 cat)
+bool CPreferencesRem::RequestRemoveCat(size_t cat)
 {
+	const uint8 cat8 = static_cast<uint8>(cat);
 	CECPacket req(EC_OP_DELETE_CATEGORY);
-	CEC_Category_Tag tag(cat, EC_DETAIL_CMD);
+	CEC_Category_Tag tag(cat8, EC_DETAIL_CMD);
 	req.AddTag(tag);
-	m_conn->SendPacket(&req);
-	CPreferences::RemoveCat(cat);
+	// SendRequest, not SendPacket: the reply decides whether this happened.
+	// Fire-and-forget updated the local list regardless, so a discarded delete shifted
+	// this client's indices against the core's -- and ids are positional.
+	m_conn->SendRequest(new CCatDeleteHandler(cat8), &req);
+	return false;
 }
 
-
-//
 // Container implementation
-//
 CServerConnectRem::CServerConnectRem(CRemoteConnect *conn)
 {
 	m_CurrServer = 0;
 	m_Conn = conn;
 }
 
-
 void CServerConnectRem::ConnectToAnyServer()
 {
 	CECPacket req(EC_OP_SERVER_CONNECT);
 	m_Conn->SendPacket(&req);
 }
 
-
 void CServerConnectRem::StopConnectionTry()
 {
 	// lfroen: isn't Disconnect the same ?
 }
 
-
 void CServerConnectRem::Disconnect()
 {
 	CECPacket req(EC_OP_SERVER_DISCONNECT);
 	m_Conn->SendPacket(&req);
 }
 
-
 void CServerConnectRem::ConnectToServer(CServer *server)
 {
 	m_Conn->ConnectED2K(server->GetIP(), server->GetPort());
 }
 
-
 void CServerConnectRem::HandlePacket(const CECPacket *packet)
 {
-	const CEC_ConnState_Tag *tag = static_cast<const CEC_ConnState_Tag *>(packet->GetTagByName(EC_TAG_CONNSTATE));
+	const CEC_ConnState_Tag *tag =
+		static_cast<const CEC_ConnState_Tag *>(packet->GetTagByName(EC_TAG_CONNSTATE));
 	if (!tag) {
 		return;
 	}
@@ -1101,14 +1789,26 @@
 		if (srvtag) {
 			server = theApp->serverlist->GetByID(srvtag->GetInt());
 			if (server != m_CurrServer) {
-				theApp->amuledlg->m_serverwnd->serverlistctrl->HighlightServer(server, true);
+				if (theApp->amuledlg) {
+					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;
+		uint32 ed2kSince = 0;
+		theApp->m_ed2kConnectedSince =
+			tag->GetED2KConnectedSince(ed2kSince) ? wxDateTime((time_t)ed2kSince) : wxDateTime();
+	} else {
+		theApp->m_ed2kConnectedSince = wxDateTime();
+		if (m_CurrServer) {
+			if (theApp->amuledlg) {
+				theApp->amuledlg->m_serverwnd->serverlistctrl->HighlightServer(
+					m_CurrServer, false);
+			}
+			m_CurrServer = nullptr;
+		}
 	}
 
 	if (tag->IsConnectedKademlia()) {
@@ -1117,25 +1817,41 @@
 		} else {
 			theApp->m_ConnState |= CONNECTED_KAD_OK;
 		}
+		uint32 kadSince = 0;
+		theApp->m_kadConnectedSince =
+			tag->GetKadConnectedSince(kadSince) ? wxDateTime((time_t)kadSince) : wxDateTime();
 	} else {
 		if (tag->IsKadRunning()) {
 			theApp->m_ConnState |= CONNECTED_KAD_NOT;
 		}
+		theApp->m_kadConnectedSince = wxDateTime();
 	}
 
-	theApp->amuledlg->ShowConnectionState();
+	if (theApp->amuledlg) {
+		theApp->amuledlg->ShowConnectionState();
+	}
 }
 
-
-/*
- * Server list: host list of ed2k servers.
- */
+// Server list: host list of ed2k servers.
 CServerListRem::CServerListRem(CRemoteConnect *conn)
-:
-CRemoteContainer<CServer, uint32, CEC_Server_Tag>(conn, true)
+: CRemoteContainer<CServer, uint32, CEC_Server_Tag>(conn, true)
 {
 }
 
+void CServerListRem::ProcessUpdate(const CECTag *reply, CECPacket *full_req, int req_type)
+{
+	CRemoteContainer<CServer, uint32, CEC_Server_Tag>::ProcessUpdate(reply, full_req, req_type);
+
+	// Size the columns once the first list has actually arrived -- see m_columnsFitted.
+	// Empty is not "arrived": fitting against no rows would measure only the headers and
+	// then never run again.
+	if (!m_columnsFitted && !m_items.empty() && theApp->amuledlg != nullptr &&
+		theApp->amuledlg->m_serverwnd != nullptr &&
+		theApp->amuledlg->m_serverwnd->serverlistctrl != nullptr) {
+		m_columnsFitted = true;
+		theApp->amuledlg->m_serverwnd->serverlistctrl->FitColumnsToContent();
+	}
+}
 
 void CServerListRem::HandlePacket(const CECPacket *)
 {
@@ -1144,7 +1860,6 @@
 	// CRemoteContainer<CServer, uint32, CEC_Server_Tag>::HandlePacket(packet);
 }
 
-
 void CServerListRem::UpdateServerMetFromURL(wxString url)
 {
 	CECPacket req(EC_OP_SERVER_UPDATE_FROM_URL);
@@ -1153,8 +1868,7 @@
 	m_conn->SendPacket(&req);
 }
 
-
-void CServerListRem::SetStaticServer(CServer* server, bool isStatic)
+void CServerListRem::SetStaticServer(CServer *server, bool isStatic)
 {
 	// update display right away
 	server->SetIsStaticMember(isStatic);
@@ -1167,8 +1881,7 @@
 	m_conn->SendPacket(&req);
 }
 
-
-void CServerListRem::SetServerPrio(CServer* server, uint32 prio)
+void CServerListRem::SetServerPrio(CServer *server, uint32 prio)
 {
 	// update display right away
 	server->SetPreference(prio);
@@ -1181,13 +1894,11 @@
 	m_conn->SendPacket(&req);
 }
 
-
-void CServerListRem::RemoveServer(CServer* server)
+void CServerListRem::RemoveServer(CServer *server)
 {
-	m_conn->RemoveServer(server->GetIP(),server->GetPort());
+	m_conn->RemoveServer(server->GetIP(), server->GetPort());
 }
 
-
 void CServerListRem::UpdateUserFileStatus(CServer *server)
 {
 	if (server) {
@@ -1196,8 +1907,7 @@
 	}
 }
 
-
-CServer *CServerListRem::GetServerByAddress(const wxString& WXUNUSED(address), uint16 WXUNUSED(port)) const
+CServer *CServerListRem::GetServerByAddress(const wxString &WXUNUSED(address), uint16 WXUNUSED(port)) const
 {
 	// It's ok to return 0 for context where this code is used in remote gui
 	return 0;
@@ -1211,49 +1921,69 @@
 
 CServer *CServerListRem::CreateItem(const CEC_Server_Tag *tag)
 {
-	CServer * server = new CServer(tag);
+	CServer *server = new CServer(tag);
 	ProcessItemUpdate(tag, server);
 	return server;
 }
 
-
 void CServerListRem::DeleteItem(CServer *in_srv)
 {
 	CScopedPtr<CServer> srv(in_srv);
-	theApp->amuledlg->m_serverwnd->serverlistctrl->RemoveServer(srv.get());
+	if (theApp->amuledlg) {
+		theApp->amuledlg->m_serverwnd->serverlistctrl->RemoveServer(srv.get());
+	}
 }
 
-
 uint32 CServerListRem::GetItemID(CServer *server)
 {
 	return server->ECID();
 }
 
-
-void CServerListRem::ProcessItemUpdate(const CEC_Server_Tag * tag, CServer * server)
+void CServerListRem::ProcessItemUpdate(const CEC_Server_Tag *tag, CServer *server)
 {
 	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);
+	tag->ServerName(&server->listname);
+	tag->ServerDesc(&server->description);
+	tag->ServerVersion(&server->m_strVersion);
+#ifdef GEOIP_GUI
+	// Server host country from the daemon's GeoIP (#440); check tag presence
+	// so an authoritative empty code isn't mistaken for an absent tag.
+	if (tag->GetTagByName(EC_TAG_SERVER_COUNTRY)) {
+		server->SetCountryCode(tag->Country());
+	}
+#endif
+	tag->GetMaxUsers(&server->maxusers);
+	tag->GetSoftFiles(&server->softfiles);
+	tag->GetHardFiles(&server->hardfiles);
+	// Read through the pointer, as the fields above do. The valuemap builder omits a tag
+	// whose value has not changed since the last update, and the return form yields 0 for
+	// an absent tag -- so assigning it would wipe the value on every update that did not
+	// resend it. AssignIfExist() leaves it alone.
+	uint32 tcpFlags = server->GetTCPFlags();
+	uint32 udpFlags = server->GetUDPFlags();
+	tag->GetTCPFlags(&tcpFlags);
+	tag->GetUDPFlags(&udpFlags);
+	server->SetTCPFlags(tcpFlags);
+	server->SetUDPFlags(udpFlags);
+
+	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);
+	if (theApp->amuledlg) {
+		theApp->amuledlg->m_serverwnd->serverlistctrl->RefreshServer(server);
+	}
 }
 
-
-CServer::CServer(const CEC_Server_Tag *tag) : CECID(tag->GetInt())
+CServer::CServer(const CEC_Server_Tag *tag)
+: CECID(tag->GetInt())
 {
 	ip = tag->GetTagByNameSafe(EC_TAG_SERVER_IP)->GetInt();
 	port = tag->GetTagByNameSafe(EC_TAG_SERVER_PORT)->GetInt();
@@ -1261,23 +1991,18 @@
 	Init();
 }
 
-
-/*
- * IP filter
- */
-CIPFilterRem::CIPFilterRem(CRemoteConnect* conn)
+// IP filter
+CIPFilterRem::CIPFilterRem(CRemoteConnect *conn)
 {
 	m_conn = conn;
 }
 
-
 void CIPFilterRem::Reload()
 {
 	CECPacket req(EC_OP_IPFILTER_RELOAD);
 	m_conn->SendPacket(&req);
 }
 
-
 void CIPFilterRem::Update(wxString url)
 {
 	CECPacket req(EC_OP_IPFILTER_UPDATE);
@@ -1286,16 +2011,12 @@
 	m_conn->SendPacket(&req);
 }
 
-
-/*
- * Shared files list
- */
+// Shared files list
 CSharedFilesRem::CSharedFilesRem(CRemoteConnect *conn)
 {
 	m_conn = conn;
 }
 
-
 void CSharedFilesRem::Reload(bool, bool)
 {
 	CECPacket req(EC_OP_SHAREDFILES_RELOAD);
@@ -1303,8 +2024,7 @@
 	m_conn->SendPacket(&req);
 }
 
-
-bool CSharedFilesRem::RenameFile(CKnownFile* file, const CPath& newName)
+bool CSharedFilesRem::RenameFile(CKnownFile *file, const CPath &newName)
 {
 	// We use the printable name, as the filename originated from user input,
 	// and the filesystem name might not be valid on the remote host.
@@ -1319,8 +2039,48 @@
 	return true;
 }
 
+void CSharedFilesRem::VerifyLocalData(const CKnownFile *file) const
+{
+	CECPacket request(EC_OP_VERIFY_LOCAL_DATA);
+	request.AddTag(CECTag(EC_TAG_KNOWNFILE, file->GetFileHash()));
+	m_conn->SendPacket(&request);
+}
+
+unsigned CSharedFilesRem::RefreshMediaMetadata(const std::vector<CMD4Hash> &hashes)
+{
+	if (hashes.empty()) {
+		return 0;
+	}
+	// ONE packet carrying every hash. One request per file would push the selection
+	// through m_req_fifo a packet at a time, and OnPollTimer stops updating the GUI while
+	// that fifo is full -- on a large selection the window would go quiet for as long as
+	// it took to drain.
+	CECPacket request(EC_OP_REFRESH_MEDIA_METADATA);
+	for (const CMD4Hash &hash : hashes) {
+		// A FRESH tag per hash, deliberately. CECTag::AddTag swaps the argument's contents
+		// into the child list and leaves the original empty, so adding the same tag object
+		// twice appends one real child and one blank -- silently sending fewer hashes than
+		// intended.
+		request.AddTag(CECTag(EC_TAG_KNOWNFILE, hash));
+	}
+	m_conn->SendPacket(&request);
+	// Sent, not probed: the daemon decides eligibility and reports what it did
+	// in its own log, which this GUI displays.
+	return hashes.size();
+}
+
+bool CSharedFilesRem::RefreshMediaMetadata(const CMD4Hash &hash)
+{
+	CECPacket request(EC_OP_REFRESH_MEDIA_METADATA);
+	request.AddTag(CECTag(EC_TAG_KNOWNFILE, hash));
+	m_conn->SendPacket(&request);
+	// Sent, not probed. A daemon that predates the opcode answers EC_OP_FAILED and the
+	// reply is dropped here as for every other fire-and-forget request on this class; the
+	// user sees nothing happen, which is the same outcome as the action not existing.
+	return true;
+}
 
-void CSharedFilesRem::SetFileCommentRating(CKnownFile* file, const wxString& newComment, int8 newRating)
+void CSharedFilesRem::SetFileCommentRating(CKnownFile *file, const wxString &newComment, int8 newRating)
 {
 	CECPacket request(EC_OP_SHARED_FILE_SET_COMMENT);
 	request.AddTag(CECTag(EC_TAG_KNOWNFILE, file->GetFileHash()));
@@ -1330,8 +2090,18 @@
 	m_conn->SendPacket(&request);
 }
 
+void CSharedFilesRem::SearchKadNotes(CAbstractFile *file)
+{
+	// The daemon owns Kad; ask it to run the on-demand NOTES lookup for this file (a
+	// download, a shared file, or a search result -- the request is keyed purely by
+	// hash). Retrieved notes flow back through the comments channel.
+	CECPacket request(EC_OP_SHARED_FILE_SEARCH_KAD_NOTES);
+	request.AddTag(CECTag(EC_TAG_KNOWNFILE, file->GetFileHash()));
+
+	m_conn->SendPacket(&request);
+}
 
-void CSharedFilesRem::CopyFileList(std::vector<CKnownFile*>& out_list) const
+void CSharedFilesRem::CopyFileList(std::vector<CKnownFile *> &out_list) const
 {
 	out_list.reserve(size());
 	for (const_iterator it = begin(); it != end(); ++it) {
@@ -1339,39 +2109,37 @@
 	}
 }
 
-
-void CKnownFilesRem::DeleteItem(CKnownFile * file)
+void CKnownFilesRem::DeleteItem(CKnownFile *file)
 {
 	uint32 id = file->ECID();
-	// Broadcast to every subscriber that holds a raw CKnownFile* to
-	// this object — CUpDownClient::m_uploadingfile / m_reqfile (the
-	// #748 crash flow), CGenericClientListCtrl::m_knownfiles (#755),
-	// and the open-dialog registry. Subscribers strip their refs
-	// using pointer-value comparison only. See
-	// MuleNotify::KnownFileBeingDestroyed (GuiEvents.cpp).
+	// Broadcast to every subscriber that holds a raw CKnownFile* to this object --
+	// CUpDownClient::m_uploadingfile / m_reqfile, CGenericClientListCtrl's own list, and
+	// the open-dialog registry. Subscribers strip their refs using pointer-value
+	// comparison only.
 	Notify_KnownFileBeingDestroyed(file);
 
 	if (theApp->sharedfiles->count(id)) {
-		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->RemoveFile(file);
+		if (theApp->amuledlg) {
+			theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->RemoveFile(file);
+		}
 		theApp->sharedfiles->erase(id);
 	}
 	if (theApp->downloadqueue->count(id)) {
-		theApp->amuledlg->m_transferwnd->downloadlistctrl->RemoveFile(static_cast<CPartFile *>(file));
+		if (theApp->amuledlg) {
+			theApp->amuledlg->m_transferwnd->downloadlistctrl->RemoveFile(
+				static_cast<CPartFile *>(file));
+		}
 		theApp->downloadqueue->erase(id);
 	}
 	delete file;
 }
 
-
 void CUpDownClientListRem::DropReferencesTo(const CKnownFile *file)
 {
-	// Null out CUpDownClient::m_uploadingfile / m_reqfile on every
-	// client still pointing at `file`. Called by
-	// MuleNotify::KnownFileBeingDestroyed (the broadcast handler in
-	// GuiEvents.cpp) which is itself fired from CKnownFilesRem::
-	// DeleteItem above before the file is freed. Pointer-value
-	// comparison only — `file` may already be freed by the time
-	// this runs on the main thread.
+	// Null out CUpDownClient::m_uploadingfile / m_reqfile on every client still pointing
+	// at `file`. Called by MuleNotify::KnownFileBeingDestroyed, itself fired from
+	// CKnownFilesRem::DeleteItem above before the file is freed. Pointer-value comparison
+	// only -- `file` may already be freed by the time this runs on the main thread.
 	for (iterator it = begin(); it != end(); ++it) {
 		CUpDownClient *client = (*it)->GetClient();
 		if (!client) {
@@ -1386,29 +2154,120 @@
 	}
 }
 
-
 uint32 CKnownFilesRem::GetItemID(CKnownFile *file)
 {
 	return file->ECID();
 }
 
+namespace
+{
+
+// Copy the six FT_MEDIA_* fields off an EC tag onto the local proxy object, so the
+// identical GetIntTagValue / GetStrTagValue / GetMetaDataVer calls in the File Details
+// dialog work unchanged in the remote build.
+//
+// A zero / empty value is the daemon saying the field is GONE, not a value worth
+// storing -- it only sends one for a field it previously sent a real value for.
+// Storing it would leave the dialog showing 0:00 or a blank Artist where N/A is the
+// honest answer.
+//
+// Shared by the known-file walker and the search-result one because the daemon emits
+// these from ONE place for both: CEC_SharedFile_Tag's base ctor, which
+// CEC_SearchFile_Tag derives from.
+void DecodeMediaTags(const CECTag *tag, CAbstractFile *file)
+{
+	static const struct
+	{
+		ec_tagname_t ecId;
+		uint8 ftId;
+		bool isInt;
+	} kMedia = { { EC_TAG_KNOWNFILE_MEDIA_LENGTH, FT_MEDIA_LENGTH, true },
+		{ EC_TAG_KNOWNFILE_MEDIA_BITRATE, FT_MEDIA_BITRATE, true },
+		{ EC_TAG_KNOWNFILE_MEDIA_CODEC, FT_MEDIA_CODEC, false },
+		{ EC_TAG_KNOWNFILE_MEDIA_ARTIST, FT_MEDIA_ARTIST, false },
+		{ EC_TAG_KNOWNFILE_MEDIA_ALBUM, FT_MEDIA_ALBUM, false },
+		{ EC_TAG_KNOWNFILE_MEDIA_TITLE, FT_MEDIA_TITLE, false } };
+	for (const auto &entry : kMedia) {
+		const CECTag *m = tag->GetTagByName(entry.ecId);
+		if (!m) {
+			// Absent means UNCHANGED, per the CValueMap contract -- not
+			// cleared. Leave whatever is already stored.
+			continue;
+		}
+		if (entry.isInt) {
+			const uint32 v = m->GetInt();
+			if (v) {
+				file->AddTagUnique(CTagInt32(entry.ftId, v));
+			} else {
+				file->RemoveTag(entry.ftId);
+			}
+		} else {
+			const wxString v = m->GetStringData();
+			if (!v.IsEmpty()) {
+				file->AddTagUnique(CTagString(entry.ftId, v));
+			} else {
+				file->RemoveTag(entry.ftId);
+			}
+		}
+	}
+}
+
+} // namespace
 
 void CKnownFilesRem::ProcessItemUpdate(const CEC_SharedFile_Tag *tag, CKnownFile *file)
 {
 	const CECTag *parttag = tag->GetTagByName(EC_TAG_PARTFILE_PART_STATUS);
 	if (parttag) {
-		const uint8 *data =	file->m_partStatus.Decode(
-				(uint8 *)parttag->GetTagData(),
-				parttag->GetTagDataLen());
-		for(int i = 0; i < file->GetPartCount(); ++i) {
+		const uint8 *data =
+			file->m_partStatus.Decode((uint8 *)parttag->GetTagData(), parttag->GetTagDataLen());
+		// The two bounds come from different places and are not guaranteed to
+		// agree: the buffer is as long as the decoder made it from what the wire
+		// carried, while GetPartCount() is this object's own, derived from the
+		// size it currently believes the file to be. They match for as long as an
+		// ECID keeps meaning the same file -- which a daemon restart ends, because
+		// CECID hands IDs out from a counter that starts again with the process
+		// while amulegui deliberately keeps its objects across a reconnect. An ID
+		// that comes back naming a different file then pairs a short buffer with a
+		// long part count, and this loop reads off the end of the allocation.
+		//
+		// Copy what actually arrived and clear the rest rather than trusting
+		// either bound: leaving the tail would show the previous file's
+		// availability under the new one's name.
+		const int arrived = file->m_partStatus.Size();
+		const int parts = file->GetPartCount();
+		const int copied = std::min(arrived, parts);
+		if (arrived != parts && !m_loggedPartStatusMismatch) {
+			// Says the tag and the object disagree about which file this is. The reconnect
+			// path is supposed to make that impossible by discarding everything keyed by
+			// ECID when the daemon changes underneath us, so this firing means that went
+			// wrong. Critical rather than debug: clamping the copy leaves no other trace,
+			// the rest of this update goes on applying the same mismatched tag, and what
+			// the user ends up looking at is a row describing the wrong file.
+			//
+			// Once per session, not once per file: if the ECID space has gone bad it has
+			// gone bad for everything, and this loop runs over the whole library.
+			m_loggedPartStatusMismatch = true;
+			AddLogLineC(CFormat(_("The remote core sent inconsistent data for \"%s\" "
+					      "(part status %d, expected %d). The file list may be "
+					      "showing the wrong information; reconnect to clear it.")) %
+				    file->GetFileName().GetPrintable() % arrived % parts);
+		}
+		for (int i = 0; i < copied; ++i) {
 			file->m_AvailPartFrequencyi = datai;
 		}
+		for (int i = copied; i < parts; ++i) {
+			file->m_AvailPartFrequencyi = 0;
+		}
 	}
 	wxString fileName;
 	if (tag->FileName(fileName)) {
 		file->SetFileName(CPath(fileName));
 	}
-	if (tag->FilePath(fileName)) {
+	// The status-agnostic directory (EC_TAG_KNOWNFILE_PATH): the Temp dir for a
+	// partfile, the destination once completed. FilePath()/_FILENAME carries the .part
+	// basename for partfiles, so decode the dedicated PATH tag here to keep GetFilePath()
+	// meaning "the folder" in amulegui, as it does in the daemon.
+	if (tag->DirectoryPath(fileName)) {
 		file->m_filePath = CPath(fileName);
 	}
 	tag->UpPrio(&file->m_iUpPriorityEC);
@@ -1431,22 +2290,72 @@
 	tag->GetCompleteSourcesLow(&file->m_nCompleteSourcesCountLo);
 	tag->GetCompleteSourcesHigh(&file->m_nCompleteSourcesCountHi);
 	tag->GetCompleteSources(&file->m_nCompleteSourcesCount);
+	uint16 hashingProgress = 0;
+	if (tag->HashingProgress(hashingProgress)) {
+		file->SetHashingProgress(hashingProgress);
+	}
 
 	tag->GetOnQueue(&file->m_queuedCount);
 
+	// Live upload activity: the daemon summarises these from its m_ClientUploadList and
+	// ships them every update tick. Decoded into the EC mirror members so
+	// GetUploadDatarate() / GetTransferringClientCount() work in amulegui.
+	tag->GetUploadSpeed(&file->m_uploadDatarateEC);
+	tag->GetUploadingCount(&file->m_transferringClientCountEC);
+	// Share timestamps ride only in the full-detail section, not every tick, so
+	// guard on a real (non-zero) value to avoid a bare update tick zeroing them.
+	time_t sharedSince = 0;
+	tag->GetSharedSince(&sharedSince);
+	if (sharedSince) {
+		file->SetDateShared(sharedSince);
+	}
+	time_t lastUpload = 0;
+	tag->GetLastUpload(&lastUpload);
+	if (lastUpload) {
+		file->SetLastUpload(lastUpload);
+	}
+
 	tag->GetComment(file->m_strComment);
 	tag->GetRating(file->m_iRating);
 
+	// Community ratings/comments plus the on-demand Kad-notes running flag. The daemon
+	// serializes these on the CEC_SharedFile_Tag base, so this one decode serves both
+	// shared files and downloads. The container is present only when it changed, so an
+	// absent tag keeps the prior list.
+	const CECTag *commenttag = tag->GetTagByName(EC_TAG_PARTFILE_COMMENTS);
+	if (commenttag) {
+		file->ClearFileRatingList();
+		for (CECTag::const_iterator it = commenttag->begin(); it != commenttag->end();) {
+			wxString u = (it++)->GetStringData();
+			wxString f = (it++)->GetStringData();
+			sint16 r = static_cast<sint16>(static_cast<sint64>((it++)->GetInt()));
+			wxString c = (it++)->GetStringData();
+			file->AddFileRatingList(u, f, r, c);
+		}
+		file->UpdateFileRatingCommentAvail();
+	}
+	if (const CECTag *kadSearchTag = tag->GetTagByName(EC_TAG_PARTFILE_KAD_COMMENT_SEARCHING)) {
+		file->SetKadCommentSearchRunning(kadSearchTag->GetInt() != 0);
+	}
+
 	requested += file->statistic.requested;
 	transferred += file->statistic.transferred;
 	accepted += file->statistic.transferred;
 
-	if (!m_initialUpdate) {
+	if (!m_initialUpdate && theApp->amuledlg) {
 		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->UpdateItem(file);
 	}
 
+	// Media metadata rides the SHARED-FILE base tag, so it is decoded here for every
+	// known file rather than inside the partfile branch below. It used to live there,
+	// which meant a COMPLETED shared file -- the only kind the completion re-probe
+	// produces -- had all six tags dropped on the floor, and the File Details dialog
+	// showed N/A for anything not downloading.
+	DecodeMediaTags(tag, file);
+
 	if (file->IsPartFile()) {
-		ProcessItemUpdatePartfile(static_cast<const CEC_PartFile_Tag *>(tag), static_cast<CPartFile *>(file));
+		ProcessItemUpdatePartfile(
+			static_cast<const CEC_PartFile_Tag *>(tag), static_cast<CPartFile *>(file));
 	}
 }
 
@@ -1462,26 +2371,90 @@
 	m_conn->SendPacket(&req);
 }
 
+void CKnownFilesRem::ArmReconnectReconcile()
+{
+	m_reconnectReconcile = true;
+
+	// A reconnect opens a fresh EC session. The daemon keeps its RLE gap/part/req-status
+	// encoders per connection, so the new session's encoders restart from an empty
+	// baseline. Our reused CKnownFile / CPartFile objects still carry the previous
+	// session's *decoder* state; left alone, the first differential status update would
+	// XOR the daemon's from-empty diff against that stale buffer and paint garbage -- all
+	// red progress bars and wrong shared-file availability shading.
+	for (CKnownFile *file : *this) {
+		file->m_partStatus.ResetEncoder();
+		if (file->IsPartFile()) {
+			static_cast<CPartFile *>(file)->m_PartFileEncoderData.ResetDecoder();
+		}
+	}
+}
+
+void CKnownFilesRem::ResetForNewDaemonSession()
+{
+	CRemoteContainer<CKnownFile, uint32, CEC_SharedFile_Tag>::ResetForNewSession();
+
+	// Back to the state a cold boot starts in: the next reply is a full library snapshot
+	// and gets the batched ShowFileList() treatment, not the per-item show-and-sort that
+	// a steady-state poll uses.
+	m_initialUpdate = true;
+	// Nothing left to reconcile against, so the one-shot absence-prune has
+	// no work and must not fire on a list it would find empty anyway.
+	m_reconnectReconcile = false;
+	// New session, new chance to complain if the ECIDs go bad again.
+	m_loggedPartStatusMismatch = false;
+}
+
 void CKnownFilesRem::ProcessUpdate(const CECTag *reply, CECPacket *, int)
 {
 	requested = 0;
 	transferred = 0;
 	accepted = 0;
 
-	// Partial-update protocol negotiated at auth time (see
-	// CRemoteConnect::ServerSupportsPartialUpdate). When true, the server
-	// only sends tags for files that actually changed and signals
-	// deletions explicitly via top-level `EC_TAG_FILE_REMOVED` markers —
-	// the bulk "anything missing == deleted" loop below would silently
-	// wipe most of the library every cycle (#713). When false (old
-	// server), the server emits alive-marker tags for unchanged files
-	// so the bulk-deletion path stays correct.
+	// The first poll after a reconnect re-processes the whole (potentially 10k+) library
+	// in one go -- update-in-place, add, prune -- which is the reconcile case that drives
+	// the one-shot absence-prune below. The cold-boot m_initialUpdate path has its own
+	// batching and never overlaps.
+	const bool reconcile = m_reconnectReconcile;
+
+	// Batch the download list on every steady-state poll, not just a reconnect resync: an
+	// ordinary poll can surface a whole burst of freshly-added downloads at once, and
+	// CDownloadListCtrl::AddFile() re-sorts the entire list on every insert -- O(n^2 log
+	// n) on a 10k queue, which freezes the GUI for seconds. BeginBatchUpdate() suppresses
+	// the per-item sort; the single SortList() runs once at the end, and only if a file
+	// was actually added, so a pure in-place stat poll stays sort-free.
+	//
+	// The dialog is part of the condition: these Begin/End pairs and the per-item calls
+	// between them are view work, and an EC reply can arrive with no dialog at all.
+	const bool batchDownloadList = !m_initialUpdate && theApp->amuledlg != nullptr;
+	bool downloadListGrew = false;
+	if (batchDownloadList) {
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->BeginBatchUpdate();
+	}
+
+	// Same reasoning for the shared-files list: a steady-state poll can surface a burst
+	// of freshly-shared files, and ShowFile() -> AddItemData() rebuilds the whole
+	// virtual-list row index on every insert -- O(n) each, O(n^2) on a large share. Batch
+	// every non-initial poll and sort once at the end, only if the poll added a file.
+	const bool batchSharedList = !m_initialUpdate && theApp->amuledlg != nullptr;
+	bool sharedListGrew = false;
+	if (batchSharedList) {
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->BeginBatchUpdate();
+	}
+	// Set below if the reconnect reconcile reply is too empty to trust as a
+	// full snapshot: keep the one-shot armed instead of pruning (see #444).
+	bool deferReconcile = false;
+
+	// Partial-update protocol negotiated at auth time. When true, the server only sends
+	// tags for files that actually changed and signals deletions explicitly via top-level
+	// EC_TAG_FILE_REMOVED markers -- the bulk "anything missing == deleted" loop below
+	// would silently wipe most of the library every cycle. When false, the server emits
+	// alive-marker tags for unchanged files so the bulk-deletion path stays correct.
 	const bool partial_update = m_conn->ServerSupportsPartialUpdate();
 
 	std::set<uint32> core_files;
 	std::set<uint32> removed_files;
 	for (CECPacket::const_iterator it = reply->begin(); it != reply->end(); ++it) {
-		const CECTag * curTag = &*it;
+		const CECTag *curTag = &*it;
 		ec_tagname_t tagname = curTag->GetTagName();
 		if (tagname == EC_TAG_CLIENT) {
 			theApp->clientlist->ProcessUpdate(curTag, NULL, EC_TAG_CLIENT);
@@ -1490,22 +2463,25 @@
 		} else if (tagname == EC_TAG_FRIEND) {
 			theApp->friendlist->ProcessUpdate(curTag, NULL, EC_TAG_FRIEND);
 		} else if (tagname == EC_TAG_FILE_REMOVED) {
-			// Explicit deletion marker from a partial-update-capable
-			// server. Buffered and processed in one pass below so we
-			// only iterate the live list when there's actually
-			// something to remove. Outside the partial-update path
-			// the server never emits this tag.
+			// Explicit deletion marker from a partial-update-capable server. Buffered and
+			// processed in one pass below so the live list is only iterated when there is
+			// something to remove. Outside the partial-update path the server never emits
+			// this tag.
 			removed_files.insert(curTag->GetInt());
 		} else if (tagname == EC_TAG_KNOWNFILE || tagname == EC_TAG_PARTFILE) {
 			const CEC_SharedFile_Tag *tag = static_cast<const CEC_SharedFile_Tag *>(curTag);
 			uint32 id = tag->ID();
 			bool isNew = true;
 			if (!m_initialUpdate) {
-				if (!partial_update) {
+				// Collect the full ID set whenever we mean to prune by absence below: a
+				// legacy server always (it emits alive markers for every file), or once
+				// right after a reconnect, where the fresh session sends a full snapshot
+				// to reconcile against.
+				if (!partial_update || m_reconnectReconcile) {
 					core_files.insert(id);
 				}
-				std::map<uint32, CKnownFile*>::iterator it2 = m_items_hash.find(id);
-				if (it2 != m_items_hash.end() ) {
+				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);
@@ -1514,58 +2490,62 @@
 				}
 			}
 			if (isNew) {
-				// An alive-marker tag carries only the ECID with no
-				// child tags; it's the compat-mode "this file still
-				// exists" signal and is only meaningful for files we
-				// already know. If we receive one for an ID we've never
-				// seen (race during bulk Reload, server diff baseline
-				// briefly out of step, etc.), constructing
-				// CKnownFile(tag) on an empty tag yields a ghost entry
-				// with no name and zero size (#808). Skip the marker
-				// and rely on a subsequent full-tag update to introduce
-				// the file.
+				// An alive-marker tag carries only the ECID with no child tags; it is
+				// the compat-mode "this file still exists" signal and is only meaningful
+				// for files we already know. For an ID never seen -- a race during bulk
+				// Reload, a server diff baseline briefly out of step -- constructing
+				// CKnownFile(tag) on an empty tag yields a ghost entry with no name and
+				// zero size. Skip the marker and rely on a later full-tag update.
 				if (!tag->HasChildTags()) {
 					AddDebugLogLineN(logEC,
-						CFormat(wxT("EC: alive-marker for unknown file ID %u; ignoring.")) % id);
+						CFormat(wxT("EC: alive-marker for unknown file ID %u; "
+							    "ignoring.")) %
+							id);
 					continue;
 				}
-				// Second variant of the same #808 ghost-entry pattern.
-				// CEC_SharedFile_Tag runs each metadata field through
-				// a per-connection CValueMap (ECSpecialTags.h) which
-				// suppresses tags whose value hasn't changed since the
-				// last cached send.  On an EC_DETAIL_INC_UPDATE for a
-				// file ID we've never seen, the server may already
-				// have cached + suppressed EC_TAG_PARTFILE_HASH /
-				// _NAME / _SIZE_FULL, in which case the tag has plenty
-				// of statistical child tags (request count, accepts,
-				// transferred, AICH masterhash, priority...) but no
-				// identifying metadata.  CKnownFile(tag) would then
-				// read empty hash + 0 size via GetTagByNameSafe and
-				// produce the same 0-byte unnamed ghost entry that the
-				// HasChildTags() guard above is shaped against -- with
-				// children but no identity.  Detect by the absence of
-				// the file hash (the canonical identity tag) and skip
-				// the same way; the next full-state poll picks the
-				// file up correctly once the server-side cache
-				// invalidation puts it back on the wire.
+				// Second variant of the same ghost-entry pattern. CEC_SharedFile_Tag
+				// runs each metadata field through a per-connection CValueMap, which
+				// suppresses tags whose value has not changed since the last cached
+				// send. On an EC_DETAIL_INC_UPDATE for a file ID we have never seen,
+				// the server may already have cached and suppressed
+				// EC_TAG_PARTFILE_HASH / _NAME / _SIZE_FULL, so the tag has plenty of
+				// statistical children but no identifying metadata -- and
+				// CKnownFile(tag) would produce the same 0-byte unnamed ghost the
+				// HasChildTags() guard above is shaped against. Detect by the absence
+				// of the file hash and skip the same way.
 				if (tag->GetTagByName(EC_TAG_PARTFILE_HASH) == NULL) {
 					AddDebugLogLineN(logEC,
-						CFormat(wxT("EC: incomplete INC_UPDATE tag (no PARTFILE_HASH) for unknown file ID %u; ignoring.")) % id);
+						CFormat(wxT(
+							"EC: incomplete INC_UPDATE tag (no PARTFILE_HASH) "
+							"for unknown file ID %u; ignoring.")) %
+							id);
 					continue;
 				}
-				CKnownFile * newFile;
+				CKnownFile *newFile;
 				if (tag->GetTagName() == EC_TAG_PARTFILE) {
-					CPartFile *file = new CPartFile(static_cast<const CEC_PartFile_Tag *>(tag));
+					CPartFile *file =
+						new CPartFile(static_cast<const CEC_PartFile_Tag *>(tag));
 					ProcessItemUpdate(tag, file);
 					(*theApp->downloadqueue)id = file;
-					theApp->amuledlg->m_transferwnd->downloadlistctrl->AddFile(file);
+					// On the initial full sync, defer the per-item show + sort;
+					// the whole list is shown and sorted once below via
+					// ShowFileList(), which is O(n^2) otherwise.
+					if (theApp->amuledlg) {
+						theApp->amuledlg->m_transferwnd->downloadlistctrl->AddFile(
+							file, /*deferView=*/m_initialUpdate);
+					}
+					downloadListGrew = true;
 					newFile = file;
 				} else {
 					newFile = new CKnownFile(tag);
 					ProcessItemUpdate(tag, newFile);
 					(*theApp->sharedfiles)id = newFile;
 					if (!m_initialUpdate) {
-						theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFile(newFile);
+						if (theApp->amuledlg) {
+							theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl
+								->ShowFile(newFile);
+						}
+						sharedListGrew = true;
 					}
 				}
 				AddItem(newFile);
@@ -1574,35 +2554,68 @@
 	}
 
 	if (m_initialUpdate) {
-		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFileList();
+		if (theApp->amuledlg) {
+			theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFileList();
+			theApp->amuledlg->m_transferwnd->downloadlistctrl->ShowFileList();
+		}
 		m_initialUpdate = false;
-	} else if (partial_update) {
-		// Apply explicit removals from `EC_TAG_FILE_REMOVED` markers.
-		// One linear pass over the live list, only when there's
-		// actually something to remove.
+	} else if (partial_update && !m_reconnectReconcile) {
+		// Normal partial-update poll: apply explicit removals from `EC_TAG_FILE_REMOVED`
+		// markers. One linear pass over the live list, only when there is actually
+		// something to remove.
 		if (!removed_files.empty()) {
-			for(iterator it = begin(); it != end();) {
+			for (iterator it = begin(); it != end();) {
 				iterator it2 = it++;
 				if (removed_files.count(GetItemID(*it2))) {
 					RemoveItem(it2);
 				}
 			}
 		}
+	} else if (reconcile && core_files.empty() && GetCount() != 0) {
+		// Defensive guard: the first poll after a reconnect should carry the full library
+		// snapshot. If it came back with no file tags at all while we still hold a
+		// populated list, that reply is not a trustworthy baseline -- pruning by absence
+		// here would wipe every download and shared file. Skip the prune and leave the
+		// one-shot armed for the next poll.
+		AddDebugLogLineN(logEC,
+			wxT("EC: post-reconnect reconcile reply carried no files; "
+			    "deferring the absence-prune to the next poll."));
+		deferReconcile = true;
 	} else {
-		// Legacy server: anything missing from the response is
-		// deleted. Server emits alive-marker tags for unchanged
-		// files so this remains correct without the per-file diff
-		// work that the partial-update path skips.
-		for(iterator it = begin(); it != end();) {
+		// Legacy server (alive-marker protocol), OR the first poll after a reconnect:
+		// anything missing from the response is deleted. On reconnect the fresh
+		// partial-update server sends a full snapshot but never re-emits FILE_REMOVED for
+		// files deleted while we were disconnected, so this one-shot prune is how those
+		// stale entries get cleared.
+		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.
+				RemoveItem(it2); // This calls DeleteItem, where it is removed from lists and
+						 // views.
 			}
 		}
 	}
+	if (batchDownloadList) {
+		// Sort once if the poll added a file, or on a reconnect resync where the
+		// whole list was reconciled; otherwise EndBatchUpdate() just Thaws.
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->EndBatchUpdate(
+			reconcile || downloadListGrew);
+	}
+	if (batchSharedList) {
+		// Sort once if the poll added a shared file, or on a reconnect resync
+		// where the whole list was reconciled; otherwise EndBatchUpdate() Thaws.
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->EndBatchUpdate(
+			reconcile || sharedListGrew);
+	}
+	// One-shot: consumed by the first post-reconnect poll above, unless the
+	// reply was too empty to trust and we left the flag armed for the next.
+	if (!deferReconcile) {
+		m_reconnectReconcile = false;
+	}
 }
 
-CKnownFilesRem::CKnownFilesRem(CRemoteConnect * conn) : CRemoteContainer<CKnownFile, uint32, CEC_SharedFile_Tag>(conn, true)
+CKnownFilesRem::CKnownFilesRem(CRemoteConnect *conn)
+: CRemoteContainer<CKnownFile, uint32, CEC_SharedFile_Tag>(conn, true)
 {
 	requested = 0;
 	transferred = 0;
@@ -1610,17 +2623,12 @@
 	m_initialUpdate = true;
 }
 
-
-/*
- * List of uploading and waiting clients.
- */
+// List of uploading and waiting clients.
 CUpDownClientListRem::CUpDownClientListRem(CRemoteConnect *conn)
-:
-CRemoteContainer<CClientRef, uint32, CEC_UpDownClient_Tag>(conn, true)
+: CRemoteContainer<CClientRef, uint32, CEC_UpDownClient_Tag>(conn, true)
 {
 }
 
-
 CClientRef::CClientRef(const CEC_UpDownClient_Tag *tag)
 {
 	m_client = new CUpDownClient(tag);
@@ -1631,8 +2639,8 @@
 #endif
 }
 
-
-CUpDownClient::CUpDownClient(const CEC_UpDownClient_Tag *tag) : CECID(tag->ID())
+CUpDownClient::CUpDownClient(const CEC_UpDownClient_Tag *tag)
+: CECID(tag->ID())
 {
 	m_linked = 0;
 #ifdef DEBUG_ZOMBIE_CLIENTS
@@ -1640,43 +2648,44 @@
 #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;
+	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_modCapabilities.Reset();
+	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());
 }
 
 #ifdef DEBUG_ZOMBIE_CLIENTS
-void CUpDownClient::Unlink(const wxString& from)
+void CUpDownClient::Unlink(const wxString &from)
 {
 	std::multiset<wxString>::iterator it = m_linkedFrom.find(from);
 	if (it != m_linkedFrom.end()) {
@@ -1685,7 +2694,8 @@
 	m_linked--;
 	if (!m_linked) {
 		if (m_linkedDebug) {
-			AddLogLineN(CFormat("Last reference to client %d %p unlinked, delete it.") % ECID() % this);
+			AddLogLineN(CFormat("Last reference to client %d %p unlinked, delete it.") % ECID() %
+				    this);
 		}
 		delete this;
 	}
@@ -1702,33 +2712,34 @@
 }
 #endif
 
-
 uint64 CUpDownClient::GetDownloadedTotal() const
 {
 	return credits->GetDownloadedTotal();
 }
 
-
 uint64 CUpDownClient::GetUploadedTotal() const
 {
 	return credits->GetUploadedTotal();
 }
 
-
 double CUpDownClient::GetScoreRatio() const
 {
-	return credits->GetScoreRatio(GetIP(), theApp->CryptoAvailable());
+	return credits->GetScoreRatio(
+		CNetworkAddress::FromIPv4NetworkOrderOrAbsent(GetIP()), theApp->CryptoAvailable());
 }
 
-/* End Warning */
+double CUpDownClient::GetCreditRatio() const
+{
+	return credits->GetCreditRatio();
+}
 
+/* End Warning */
 
 CUpDownClient::~CUpDownClient()
 {
 	delete credits;
 }
 
-
 CClientRef *CUpDownClientListRem::CreateItem(const CEC_UpDownClient_Tag *tag)
 {
 	CClientRef *client = new CClientRef(tag);
@@ -1737,31 +2748,34 @@
 	return client;
 }
 
-
 void CUpDownClientListRem::DeleteItem(CClientRef *clientref)
 {
-	CUpDownClient* client = clientref->GetClient();
+	CUpDownClient *client = clientref->GetClient();
+
 	if (client->m_reqfile) {
 		client->m_reqfile->DelSource(client);
 		client->m_reqfile = NULL;
 	}
-	Notify_SourceCtrlRemoveSource(client->ECID(), (CPartFile*) NULL);
+	Notify_SourceCtrlRemoveSource(client->ECID(), (CPartFile *)NULL);
 
 	if (client->m_uploadingfile) {
-		client->m_uploadingfile->RemoveUploadingClient(client);	// this notifies
+		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);
+	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->UnLinkClient(); // this notifies
 		client->m_Friend = NULL;
 	}
 
 #ifdef DEBUG_ZOMBIE_CLIENTS
 	if (client->m_linked > 1) {
-		AddLogLineC(CFormat("Client %d still linked in %d places: %s") % client->ECID() % (client->m_linked - 1) % client->GetLinkedFrom());
+		// Same level and wording as the core-side twin in BaseClient.cpp.
+		AddLogLineN(CFormat("Client %d: deletion deferred, still referenced in %d place(s): %s") %
+			    client->ECID() % (client->m_linked - 1) % client->GetLinkedFrom());
 		client->m_linkedDebug = true;
 	}
 #endif
@@ -1769,24 +2783,28 @@
 	delete clientref;
 }
 
-
 uint32 CUpDownClientListRem::GetItemID(CClientRef *client)
 {
 	return client->ECID();
 }
 
-
-void CUpDownClientListRem::ProcessItemUpdate(
-	const CEC_UpDownClient_Tag *tag,
-	CClientRef *clientref)
+void CUpDownClientListRem::ProcessItemUpdate(const CEC_UpDownClient_Tag *tag, CClientRef *clientref)
 {
 	if (!tag->HasChildTags()) {
-		return;		// speed exit for clients without any change
+		return; // speed exit for clients without any change
 	}
 	CUpDownClient *client = clientref->GetClient();
 
 	tag->UserID(&client->m_nUserIDHybrid);
 	tag->ClientName(&client->m_Username);
+#ifdef GEOIP_GUI
+	// Peer country from the daemon's GeoIP. Check tag *presence*, not its value: a
+	// present-but-empty tag is an authoritative "unknown" and must still mark the code as
+	// core-provided, so the client list does not try a (non-existent) local fallback.
+	if (tag->GetTagByName(EC_TAG_CLIENT_COUNTRY)) {
+		client->SetCountryCode(tag->Country());
+	}
+#endif
 	// Client Software
 	bool sw_updated = false;
 	if (tag->ClientSoftware(client->m_clientSoft)) {
@@ -1797,7 +2815,8 @@
 		if (client->m_clientSoftString == _("Unknown")) {
 			client->m_fullClientVerString = client->m_clientSoftString;
 		} else {
-			client->m_fullClientVerString = client->m_clientSoftString + " " + client->m_clientVerString;
+			client->m_fullClientVerString =
+				client->m_clientSoftString + " " + client->m_clientVerString;
 		}
 	}
 	// User hash
@@ -1817,6 +2836,14 @@
 
 	tag->GetCurrentIdentState(&client->m_identState);
 	tag->ObfuscationStatus(client->m_obfuscationStatus);
+	{
+		// Additive tag: an older daemon sends nothing and the mirror keeps
+		// whatever it had, which for a fresh client is the empty word.
+		uint32 modCapabilities = 0;
+		if (tag->ModCapabilities(modCapabilities)) {
+			client->m_modCapabilities.SetFromWire(modCapabilities);
+		}
+	}
 	tag->HasExtendedProtocol(&client->m_bEmuleProtocol);
 
 	tag->WaitingPosition(&client->m_waitingPosition);
@@ -1834,16 +2861,16 @@
 	}
 
 	tag->SpeedUp(&client->m_nUpDatarate);
-	if ( client->m_nDownloadState == DS_DOWNLOADING ) {
+	if (client->m_nDownloadState == DS_DOWNLOADING) {
 		tag->SpeedDown(&client->m_kBpsDown);
 	} else {
 		client->m_kBpsDown = 0;
 	}
 
-	//tag->WaitTime(&client->m_WaitTime);
-	//tag->XferTime(&client->m_UpStartTimeDelay);
-	//tag->LastReqTime(&client->m_dwLastUpRequest);
-	//tag->QueueTime(&client->m_WaitStartTime);
+	// tag->WaitTime(&client->m_WaitTime);
+	// tag->XferTime(&client->m_UpStartTimeDelay);
+	// tag->LastReqTime(&client->m_dwLastUpRequest);
+	// tag->QueueTime(&client->m_WaitStartTime);
 
 	CreditStruct *credit_struct = const_cast<CreditStruct *>(client->credits->GetDataStruct());
 	tag->XferUp(&credit_struct->uploaded);
@@ -1879,18 +2906,19 @@
 			client->m_reqfile = NULL;
 			client->m_downPartStatus.clear();
 		}
-		CKnownFile * kf = theApp->knownfiles->GetByID(fileID);
+		CKnownFile *kf = theApp->knownfiles->GetByID(fileID);
 		if (kf && kf->IsCPartFile()) {
 			client->m_reqfile = static_cast<CPartFile *>(kf);
 			client->m_reqfile->AddSource(client);
 			client->m_downPartStatus.setsize(kf->GetPartCount(), 0);
-			Notify_SourceCtrlAddSource(client->m_reqfile, CCLIENTREF(client, "AddSource"), A4AF_SOURCE);
+			Notify_SourceCtrlAddSource(
+				client->m_reqfile, CCLIENTREF(client, "AddSource"), A4AF_SOURCE);
 			notified = true;
 		}
 	}
 
 	// Part status
-	const CECTag * partStatusTag = tag->GetTagByName(EC_TAG_CLIENT_PART_STATUS);
+	const CECTag *partStatusTag = tag->GetTagByName(EC_TAG_CLIENT_PART_STATUS);
 	if (partStatusTag) {
 		if (partStatusTag->GetTagDataLen() == 0) {
 			// empty tag means full source
@@ -1904,14 +2932,14 @@
 	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;
+		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);
@@ -1921,15 +2949,15 @@
 	notified = false;
 	if (tag->UploadFile(fileID)) {
 		if (client->m_uploadingfile) {
-			client->m_uploadingfile->RemoveUploadingClient(client);	// this notifies
+			client->m_uploadingfile->RemoveUploadingClient(client); // this notifies
 			notified = true;
 			client->m_uploadingfile = NULL;
 		}
-		CKnownFile * kf = theApp->knownfiles->GetByID(fileID);
+		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
+			client->m_uploadingfile->AddUploadingClient(client); // this notifies
 			notified = true;
 		}
 	}
@@ -1943,29 +2971,25 @@
 		notified = false;
 	}
 
-	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)
+	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;
+		case US_UPLOADING:
+		case US_ONUPLOADQUEUE:
+			type = AVAILABLE_SOURCE;
+			break;
+		default:
+			type = UNAVAILABLE_SOURCE;
+			break;
 		}
 		Notify_SharedCtrlRefreshClient(client->ECID(), type);
 	}
 }
 
-
-/*
- * Download queue container: hold PartFiles with progress status
- *
- */
-
+// Download queue container: holds PartFiles with progress status.
 
 bool CDownQueueRem::AddLink(const wxString &link, uint8 cat)
 {
@@ -1974,20 +2998,19 @@
 	link_tag.AddTag(CECTag(EC_TAG_PARTFILE_CAT, cat));
 	req.AddTag(link_tag);
 
-	// SendRequest registers the handler; on EC_OP_FAILED the GUI shows
-	// the wxMessageBox set up in CAddLinkHandler. Previously this was
-	// fire-and-forget and silently dropped errors (#310 follow-up).
+	// SendRequest registers the handler; on EC_OP_FAILED the GUI shows the wxMessageBox
+	// set up in CAddLinkHandler. This used to be fire-and-forget and silently dropped
+	// errors.
 	m_conn->SendRequest(new CAddLinkHandler, &req);
 	return true;
 }
 
-
-void CDownQueueRem::AddLinks(const wxArrayString& links, uint8 cat)
+void CDownQueueRem::AddLinks(const wxArrayString &links, uint8 cat)
 {
-	// Pack the whole batch into one EC_OP_ADD_LINK packet. The daemon-side
-	// handler (PR #551) already iterates over every child tag and emits a
-	// single aggregated response, so CAddLinkHandler fires once for the
-	// whole batch — no client-side N popups for N invalid links.
+	// Pack the whole batch into one EC_OP_ADD_LINK packet. The daemon-side handler
+	// already iterates over every child tag and emits a single aggregated response, so
+	// CAddLinkHandler fires once for the whole batch -- no client-side N popups for N
+	// invalid links.
 	if (links.IsEmpty()) {
 		return;
 	}
@@ -2000,25 +3023,20 @@
 	m_conn->SendRequest(new CAddLinkHandler, &req);
 }
 
-
 void CDownQueueRem::ResetCatParts(int cat)
 {
-	// 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.
+	// Called when a category is deleted. The command runs on the remote side, but the
+	// files still have to be updated here right away, or drawing errors (colour not
+	// available) follow.
 	for (iterator it = begin(); it != end(); ++it) {
-		CPartFile* file = it->second;
+		CPartFile *file = it->second;
 		file->RemoveCategory(cat);
 	}
 }
 
-
-
 void CKnownFilesRem::ProcessItemUpdatePartfile(const CEC_PartFile_Tag *tag, CPartFile *file)
 {
-	//
-	// update status
-	//
+	// Update status
 	tag->Speed(&file->m_kbpsDown);
 	file->kBpsDown = file->m_kbpsDown / 1024.0;
 
@@ -2046,7 +3064,7 @@
 	tag->FileCat(&file->m_category);
 
 	tag->DownPrio(&file->m_iDownPriorityEC);
-	if ( file->m_iDownPriorityEC >= 10 ) {
+	if (file->m_iDownPriorityEC >= 10) {
 		file->m_iDownPriority = file->m_iDownPriorityEC - 10;
 		file->m_bAutoDownPriority = true;
 	} else {
@@ -2054,11 +3072,9 @@
 		file->m_bAutoDownPriority = false;
 	}
 
-	file->percentcompleted = (100.0*file->GetCompletedSize()) / file->GetFileSize();
+	file->percentcompleted = (100.0 * file->GetCompletedSize()) / file->GetFileSize();
 
-	//
 	// Copy part/gap status
-	//
 	const CECTag *gaptag = tag->GetTagByName(EC_TAG_PARTFILE_GAP_STATUS);
 	const CECTag *parttag = tag->GetTagByName(EC_TAG_PARTFILE_PART_STATUS);
 	const CECTag *reqtag = tag->GetTagByName(EC_TAG_PARTFILE_REQ_STATUS);
@@ -2074,13 +3090,13 @@
 
 			// and refill it
 			for (int j = 0; j < gap_size; j++) {
-				file->m_gaplist.AddGap(gaps2*j, gaps2*j+1);
+				file->m_gaplist.AddGap(gaps2 * j, gaps2 * j + 1);
 			}
 		}
 		if (parttag) {
 			encoder.DecodeParts(parttag, file->m_SrcpartFrequency);
 			// sanity check
-			wxASSERT (file->m_SrcpartFrequency.size() == file->GetPartCount());
+			wxASSERT(file->m_SrcpartFrequency.size() == file->GetPartCount());
 		}
 		if (reqtag) {
 			ArrayOfUInts64 reqs;
@@ -2091,9 +3107,9 @@
 
 			// and refill it
 			for (int j = 0; j < req_size; j++) {
-				Requested_Block_Struct* block = new Requested_Block_Struct;
-				block->StartOffset = reqs2*j;
-				block->EndOffset   = reqs2*j+1;
+				Requested_Block_Struct *block = new Requested_Block_Struct;
+				block->StartOffset = reqs2 * j;
+				block->EndOffset = reqs2 * j + 1;
 				file->m_requestedblocks_list.push_back(block);
 			}
 		}
@@ -2119,32 +3135,22 @@
 		}
 	}
 
-	// Get comments
-	const CECTag *commenttag = tag->GetTagByName(EC_TAG_PARTFILE_COMMENTS);
-	if (commenttag) {
-		file->ClearFileRatingList();
-		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();
-	}
+	// Comments/ratings and the Kad-notes running flag are decoded once for every known
+	// file in CKnownFilesRem::ProcessItemUpdate, so there is nothing partfile-specific
+	// to do here.
 
 	// Update A4AF sources
-	ListOfUInts32 & clientIDs = file->GetA4AFClientIDs();
+	ListOfUInts32 &clientIDs = file->GetA4AFClientIDs();
 	const 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
+			if (it->GetTagName() != EC_TAG_ECID) { // should always be this
 				continue;
 			}
 			uint32 id = it->GetInt();
-			CClientRef * src = theApp->clientlist->GetByID(id);
+			CClientRef *src = theApp->clientlist->GetByID(id);
 			if (src) {
 				file->AddA4AFSource(src->GetClient());
 			} else {
@@ -2154,10 +3160,10 @@
 		}
 	} 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(); ) {
+		for (ListOfUInts32::iterator it = clientIDs.begin(); it != clientIDs.end();) {
 			ListOfUInts32::iterator it1 = it++;
 			uint32 id = *it1;
-			CClientRef * src = theApp->clientlist->GetByID(id);
+			CClientRef *src = theApp->clientlist->GetByID(id);
 			if (src) {
 				file->AddA4AFSource(src->GetClient());
 				clientIDs.erase(it1);
@@ -2165,17 +3171,20 @@
 		}
 	}
 
-	theApp->amuledlg->m_transferwnd->downloadlistctrl->UpdateItem(file);
+	if (theApp->amuledlg) {
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->UpdateItem(file);
+	}
 
 	// 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);
+		if (theApp->amuledlg) {
+			theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFile(file);
+		}
 	}
 }
 
-
 void CDownQueueRem::SendFileCommand(CPartFile *file, ec_tagname_t cmd)
 {
 	CECPacket req(cmd);
@@ -2184,7 +3193,6 @@
 	m_conn->SendPacket(&req);
 }
 
-
 void CDownQueueRem::Prio(CPartFile *file, uint8 prio)
 {
 	CECPacket req(EC_OP_PARTFILE_PRIO_SET);
@@ -2196,21 +3204,18 @@
 	m_conn->SendPacket(&req);
 }
 
-
 void CDownQueueRem::AutoPrio(CPartFile *file, bool flag)
 {
 	CECPacket req(EC_OP_PARTFILE_PRIO_SET);
 
 	CECTag hashtag(EC_TAG_PARTFILE, file->GetFileHash());
 
-	hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO,
-		(uint8)(flag ? PR_AUTO : file->GetDownPriority())));
+	hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)(flag ? PR_AUTO : file->GetDownPriority())));
 	req.AddTag(hashtag);
 
 	m_conn->SendPacket(&req);
 }
 
-
 void CDownQueueRem::Category(CPartFile *file, uint8 cat)
 {
 	CECPacket req(EC_OP_PARTFILE_SET_CAT);
@@ -2223,8 +3228,7 @@
 	m_conn->SendPacket(&req);
 }
 
-
-void CDownQueueRem::AddSearchToDownload(CSearchFile* file, uint8 category)
+void CDownQueueRem::AddSearchToDownload(CSearchFile *file, uint8 category)
 {
 	CECPacket req(EC_OP_DOWNLOAD_SEARCH_RESULT);
 	CECTag hashtag(EC_TAG_PARTFILE, file->GetFileHash());
@@ -2234,8 +3238,7 @@
 	m_conn->SendPacket(&req);
 }
 
-
-void CDownQueueRem::ClearCompleted(const ListOfUInts32 & ecids)
+void CDownQueueRem::ClearCompleted(const ListOfUInts32 &ecids)
 {
 	CECPacket req(EC_OP_CLEAR_COMPLETED);
 	for (ListOfUInts32::const_iterator it = ecids.begin(); it != ecids.end(); ++it) {
@@ -2245,45 +3248,36 @@
 	m_conn->SendPacket(&req);
 }
 
-
-/*
- * List of friends.
- */
+// List of friends.
 CFriendListRem::CFriendListRem(CRemoteConnect *conn)
-:
-CRemoteContainer<CFriend, uint32, CEC_Friend_Tag>(conn, true)
+: CRemoteContainer<CFriend, uint32, CEC_Friend_Tag>(conn, true)
 {
 }
 
-
 void CFriendListRem::HandlePacket(const CECPacket *)
 {
-	wxFAIL;		// not needed
+	wxFAIL; // not needed
 }
 
-
-CFriend * CFriendListRem::CreateItem(const CEC_Friend_Tag * tag)
+CFriend *CFriendListRem::CreateItem(const CEC_Friend_Tag *tag)
 {
-	CFriend * Friend = new CFriend(tag->ID());
+	CFriend *Friend = new CFriend(tag->ID());
 	ProcessItemUpdate(tag, Friend);
 	return Friend;
 }
 
-
-void CFriendListRem::DeleteItem(CFriend * Friend)
+void CFriendListRem::DeleteItem(CFriend *Friend)
 {
 	Friend->UnLinkClient(false);
 	Notify_ChatRemoveFriend(Friend);
 }
 
-
-uint32 CFriendListRem::GetItemID(CFriend * Friend)
+uint32 CFriendListRem::GetItemID(CFriend *Friend)
 {
 	return Friend->ECID();
 }
 
-
-void CFriendListRem::ProcessItemUpdate(const CEC_Friend_Tag * tag, CFriend * Friend)
+void CFriendListRem::ProcessItemUpdate(const CEC_Friend_Tag *tag, CFriend *Friend)
 {
 	if (!tag->HasChildTags()) {
 		return;
@@ -2292,13 +3286,20 @@
 	tag->UserHash(Friend->m_UserHash);
 	tag->IP(Friend->m_dwLastUsedIP);
 	tag->Port(Friend->m_nLastUsedPort);
+	// Read the slot back rather than leaving it at its constructor false: the context
+	// menu's check mark is drawn from it, so without this it never showed which friend
+	// actually holds the slot.
+	bool friendSlot = false;
+	if (tag->FriendSlot(friendSlot)) {
+		Friend->SetPersistentFriendSlot(friendSlot);
+	}
 	uint32 clientID;
 	bool notified = false;
 	if (tag->Client(clientID)) {
 		if (clientID) {
-			CClientRef * client = theApp->clientlist->GetByID(clientID);
+			CClientRef *client = theApp->clientlist->GetByID(clientID);
 			if (client) {
-				Friend->LinkClient(*client);	// this notifies
+				Friend->LinkClient(*client); // this notifies
 				notified = true;
 			}
 		} else {
@@ -2311,8 +3312,7 @@
 	}
 }
 
-
-void CFriendListRem::AddFriend(const CClientRef& toadd)
+void CFriendListRem::AddFriend(const CClientRef &toadd)
 {
 	CECPacket req(EC_OP_FRIEND);
 
@@ -2323,8 +3323,8 @@
 	m_conn->SendPacket(&req);
 }
 
-
-void CFriendListRem::AddFriend(const CMD4Hash& userhash, uint32 lastUsedIP, uint32 lastUsedPort, const wxString& name)
+void CFriendListRem::AddFriend(
+	const CMD4Hash &userhash, uint32 lastUsedIP, uint32 lastUsedPort, const wxString &name)
 {
 	CECPacket req(EC_OP_FRIEND);
 
@@ -2338,8 +3338,22 @@
 	m_conn->SendPacket(&req);
 }
 
+CFriend *CFriendListRem::LookupFriend(const CMD4Hash &userhash, uint32 dwIP, uint16 nPort) const
+{
+	for (CFriend *cur_friend : m_items) {
+		if (!userhash.IsEmpty() && cur_friend->HasHash()) {
+			if (cur_friend->GetUserHash() == userhash) {
+				return cur_friend;
+			}
+		} else if (dwIP != 0 && cur_friend->GetIP() == dwIP && cur_friend->GetPort() == nPort) {
+			// A zero address is the absence of one, not a value to match on.
+			return cur_friend;
+		}
+	}
+	return nullptr;
+}
 
-void CFriendListRem::RemoveFriend(CFriend* toremove)
+void CFriendListRem::RemoveFriend(CFriend *toremove)
 {
 	CECPacket req(EC_OP_FRIEND);
 
@@ -2350,9 +3364,11 @@
 	m_conn->SendPacket(&req);
 }
 
-
-void CFriendListRem::SetFriendSlot(CFriend* Friend, bool new_state)
+void CFriendListRem::SetFriendSlot(CFriend *Friend, bool new_state)
 {
+	if (!Friend) {
+		return;
+	}
 	CECPacket req(EC_OP_FRIEND);
 
 	CECTag slottag(EC_TAG_FRIEND_FRIENDSLOT, new_state);
@@ -2362,97 +3378,493 @@
 	m_conn->SendPacket(&req);
 }
 
-
-void CFriendListRem::RequestSharedFileList(CFriend* Friend)
+// "View Files" (browse) over EC. On a multi-search daemon, open an optimistic browse
+// tab and correlate it via EC_TAG_SEARCH_REF: the daemon allocates the browse's search
+// id, echoes the ref, and CSearchListRem::HandlePacket rekeys the tab exactly like a
+// search START reply. On a legacy daemon fall back to the old fire-and-forget request
+// with no tab -- the daemon cannot surface browse results over EC there.
+static void SendBrowseRequest(
+	CRemoteConnect *conn, CECEmptyTag &sharedtag, uint32 peerEcid, const wxString &peerName)
 {
 	CECPacket req(EC_OP_FRIEND);
+	if (conn->ServerSupportsMultiSearch() && theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+		wxUIntPtr localID = theApp->amuledlg->m_searchwnd->AllocateOptimisticId();
+		theApp->amuledlg->m_searchwnd->EnsureBrowseTab(peerEcid, peerName, localID);
+		sharedtag.AddTag(CECTag(EC_TAG_SEARCH_REF, (uint32)localID));
+		req.AddTag(sharedtag);
+		conn->SendRequest(theApp->searchlist, &req);
+	} else {
+		req.AddTag(sharedtag);
+		conn->SendPacket(&req);
+	}
+}
 
+void CFriendListRem::RequestSharedFileList(CFriend *Friend)
+{
 	CECEmptyTag sharedtag(EC_TAG_FRIEND_SHARED);
 	sharedtag.AddTag(CECTag(EC_TAG_FRIEND, Friend->ECID()));
-	req.AddTag(sharedtag);
-
-	m_conn->SendPacket(&req);
+	SendBrowseRequest(m_conn, sharedtag, Friend->ECID(), Friend->GetName());
 }
 
-
-void CFriendListRem::RequestSharedFileList(CClientRef& client)
+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);
+	SendBrowseRequest(m_conn, sharedtag, client.ECID(), client.GetUserName());
 }
 
-
-
-/*
- * Search results
- */
-CSearchListRem::CSearchListRem(CRemoteConnect *conn) : CRemoteContainer<CSearchFile, uint32, CEC_SearchFile_Tag>(conn, true)
+// Search results
+CSearchListRem::CSearchListRem(CRemoteConnect *conn)
+: CRemoteContainer<CSearchFile, uint32, CEC_SearchFile_Tag>(conn, true)
+, m_needSearchListRequery(true)
 {
-	m_curr_search = -1;
+	m_curr_search = 0;
 }
 
-
 wxString CSearchListRem::StartNewSearch(
-	uint32* nSearchID, SearchType search_type,
-	const CSearchList::CSearchParams& params)
+	uint32 *nSearchID, SearchType search_type, const CSearchList::CSearchParams &params)
 {
 	CECPacket search_req(EC_OP_SEARCH_START);
 	EC_SEARCH_TYPE ec_search_type = EC_SEARCH_LOCAL;
-	switch(search_type) {
-		case LocalSearch: ec_search_type = EC_SEARCH_LOCAL; break;
-		case GlobalSearch: ec_search_type =  EC_SEARCH_GLOBAL; break;
-		case KadSearch: ec_search_type =  EC_SEARCH_KAD; break;
-	}
-	search_req.AddTag(
-		CEC_Search_Tag(params.searchString, ec_search_type,
-		params.typeText, params.extension, params.availability,
-		params.minSize, params.maxSize));
+	switch (search_type) {
+	case LocalSearch:
+		ec_search_type = EC_SEARCH_LOCAL;
+		break;
+	case GlobalSearch:
+		ec_search_type = EC_SEARCH_GLOBAL;
+		break;
+	case KadSearch:
+		ec_search_type = EC_SEARCH_KAD;
+		break;
+	case BrowseSearch:
+		// Never a query: a browse goes out as EC_OP_FRIEND from SendBrowseRequest().
+		// Listed rather than defaulted, so a new kind still trips -Wswitch here.
+		wxFAIL;
+		break;
+	}
+	search_req.AddTag(CEC_Search_Tag(params.searchString,
+		ec_search_type,
+		params.typeText,
+		params.extension,
+		params.availability,
+		params.minSize,
+		params.maxSize));
+
+	if (m_conn->ServerSupportsMultiSearch()) {
+		// Multi-search: the daemon allocates the real search ID. Send the optimistic local
+		// tab ID as a correlation token; the daemon echoes it alongside the allocated
+		// EC_TAG_SEARCH_ID and HandlePacket remaps the tab. Sent via SendRequest so the
+		// reply routes back to this handler.
+		search_req.AddTag(CECTag(EC_TAG_SEARCH_REF, *nSearchID));
+		m_conn->SendRequest(this, &search_req);
+		// See m_pendingSearchStarts's declaration: closes the window where an
+		// EC_OP_SEARCH_LIST reply could double-tab this not-yet-remapped search before
+		// RemapSearch erases this ID again.
+		m_pendingSearchStarts.insert(*nSearchID);
+	} else {
+		// Legacy single-search daemon: no ID negotiation, sentinel bucket.
+		m_conn->SendPacket(&search_req);
+	}
+	m_curr_search = *(nSearchID);
+
+	// Legacy single-search wipes the one result set on the daemon at each new search, so
+	// flush the container to match. Multi-search must NOT flush: the container holds
+	// every open search's results, and clearing its item hash without clearing the
+	// displayed rows makes the next poll re-create every result -- ghost rows under
+	// INC_UPDATE, duplicates under FULL.
+	if (!m_conn->ServerSupportsMultiSearch()) {
+		Flush();
+	}
 
+	return ""; // EC reply will have the error mesg is needed.
+}
+
+void CSearchListRem::StopSearch(bool globalOnly)
+{
+	// globalOnly is the new-search path: monolithic uses it to reset only the single
+	// in-flight ed2k slot while sparing running Kad searches. In multi-search each search
+	// is independent and the daemon finalizes any in-flight ed2k search itself, so
+	// starting a new search must NOT stop the previous one -- otherwise a second Kad
+	// search cancels the first. On a legacy daemon, fall through. globalOnly == false is
+	// the explicit Stop.
+	if (globalOnly && m_conn->ServerSupportsMultiSearch()) {
+		return;
+	}
+	StopSearchById(m_curr_search, false);
+}
+
+void CSearchListRem::StopSearchById(wxUIntPtr searchID, bool andClose)
+{
+	if (searchID == 0) {
+		return;
+	}
+	CECPacket search_req(EC_OP_SEARCH_STOP);
+	if (m_conn->ServerSupportsMultiSearch()) {
+		// Per-ID stop; the close flag also frees the results (tab close).
+		search_req.AddTag(CECTag(EC_TAG_SEARCH_ID, (uint32)searchID));
+		if (andClose) {
+			search_req.AddTag(CECEmptyTag(EC_TAG_SEARCH_CLOSE));
+			// Tab closed: stop tracking this search's lifecycle.
+			m_activeSearches.erase((uint32)searchID);
+			m_kadActive.erase((uint32)searchID);
+			// Also the backstop for a START whose reply never attributed itself (an
+			// EC_OP_FAILED carries no ID): closing the tab the failed start left behind
+			// clears its entry, so the discovery deferral cannot be held open for the rest
+			// of the session. A no-op in the normal case.
+			m_pendingSearchStarts.erase((uint32)searchID);
+		}
+	}
+	// Legacy: parameterless stop of the single current search.
 	m_conn->SendPacket(&search_req);
-	m_curr_search = *(nSearchID); // No kad remote search yet.
+}
 
-	Flush();
+bool CSearchListRem::IsKadSearch(uint32_t searchID) const
+{
+	// The "More" button applies only to a *running* Kad search -- it greys out once the
+	// search completes. The flag is set from each search's per-id kind and lifecycle
+	// state in HandlePacket.
+	std::map<uint32, bool>::const_iterator it = m_kadActive.find(searchID);
+	return it != m_kadActive.end() && it->second;
+}
 
-	return ""; // EC reply will have the error mesg is needed.
+bool CSearchListRem::RequestMoreResults(uint32_t searchID)
+{
+	if (searchID == 0) {
+		return false;
+	}
+	// Ask the daemon to widen this Kad search (KADEMLIA_FIND_VALUE_MORE). SendRequest,
+	// not SendPacket: the daemon answers with EC_OP_MISC_DATA carrying
+	// EC_TAG_SEARCH_MORE_REASKABLE, and HandlePacket greys the button for that search
+	// when the reasking is over for good. This used to be fire-and-forget with an
+	// optimistic true, so a user could press "More" repeatedly against a daemon that was
+	// doing nothing.
+	//
+	// Still returns true here: the verdict arrives asynchronously, and this return only
+	// says the request went out.
+	CECPacket req(EC_OP_SEARCH_REQUEST_MORE);
+	if (m_conn->ServerSupportsMultiSearch()) {
+		req.AddTag(CECTag(EC_TAG_SEARCH_ID, (uint32)searchID));
+	}
+	m_conn->SendRequest(this, &req);
+	return true;
 }
 
+void CSearchListRem::RemapSearch(uint32 localID, uint32 daemonID)
+{
+	// Closes this ID's m_pendingSearchStarts window regardless of whether the local and
+	// daemon ids happen to match -- the early return below is only about whether a rekey
+	// is needed, not whether the START round trip has completed. Keyed by ID, so a
+	// *browse* remap, which also lands here, erases nothing and cannot lift the deferral
+	// for someone else's in-flight start.
+	m_pendingSearchStarts.erase(localID);
+	if (localID == daemonID) {
+		return;
+	}
+	// Rekey the optimistic tab (created with the local ID) to the daemon's ID so the
+	// union-poll results, tagged with the daemon ID, route to it. The START reply arrives
+	// well before any network results, so nothing is misrouted.
+	if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+		theApp->amuledlg->m_searchwnd->RekeySearch(localID, daemonID);
+	}
+	m_curr_search = daemonID;
+	// Track this search for per-tab progress polling.
+	m_activeSearches.insert(daemonID);
+}
+
+void CSearchListRem::RequestSearchList()
+{
+	// Capability-gated: an older daemon has no case for EC_OP_SEARCH_LIST, so the request
+	// would land in ProcessRequest2's unknown-opcode branch, which logs "invalid opcode
+	// received" and trips a wxFAIL on the daemon. Sending nothing degrades to listing only
+	// searches this client started, which is exactly what such a daemon can support
+	// anyway.
+	if (!m_conn->ServerSupportsSearchList()) {
+		return;
+	}
+
+	CECPacket req(EC_OP_SEARCH_LIST);
+	m_conn->SendRequest(this, &req);
+}
 
-void CSearchListRem::StopSearch(bool)
+void CSearchListRem::ProcessUpdate(const CECTag *reply, CECPacket *full_req, int req_type)
 {
-	if (m_curr_search != -1) {
-		CECPacket search_req(EC_OP_SEARCH_STOP);
-		m_conn->SendPacket(&search_req);
+	if (!m_conn->ServerSupportsPartialSearch()) {
+		// Legacy daemon: it still re-sends every live result each poll and
+		// expects absence to mean deletion.
+		CRemoteContainer<CSearchFile, uint32, CEC_SearchFile_Tag>::ProcessUpdate(
+			reply, full_req, req_type);
+		return;
+	}
+	for (const CECTag &entry : *reply) {
+		const CECTag *curTag = &entry;
+		if (curTag->GetTagName() == EC_TAG_FILE_REMOVED) {
+			// The one path that deletes now. Same tombstone the shared-file
+			// list uses; the payload is the result's ECID.
+			const uint32 ecid = static_cast<uint32>(curTag->GetInt());
+			std::map<uint32, CSearchFile *>::iterator hit = m_items_hash.find(ecid);
+			if (hit == m_items_hash.end()) {
+				continue;
+			}
+			for (iterator lit = begin(); lit != end(); ++lit) {
+				if (GetItemID(*lit) == ecid) {
+					RemoveItem(lit);
+					break;
+				}
+			}
+			continue;
+		}
+		if (curTag->GetTagName() != req_type) {
+			continue;
+		}
+		const CEC_SearchFile_Tag *tag = static_cast<const CEC_SearchFile_Tag *>(curTag);
+		if (m_items_hash.count(tag->ID())) {
+			ProcessItemUpdate(tag, m_items_hashtag->ID());
+		} else {
+			// A result new to this client always arrives with its owning EC_TAG_SEARCH_ID
+			// (the daemon omits that tag only for results it has already attributed), so
+			// CreateItem can route it to a tab.
+			AddItem(CreateItem(tag));
+		}
 	}
 }
 
+void CSearchListRem::ApplySearchProgress(const CECTag *src)
+{
+	// Per-search progress: STATUS is the first tag; EC_TAG_SEARCH_ID is echoed so we can
+	// update this specific tab's lifecycle. An expired search, evicted on the daemon,
+	// reports done so its "!" clears.
+	const CECTag *idTag = src->GetTagByName(EC_TAG_SEARCH_ID);
+	const CECTag *browseTag = src->GetTagByName(EC_TAG_SEARCH_BROWSE_STATUS);
+	if (idTag && theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+		if (browseTag) {
+			// A browse ("View Files") tab: update its lifecycle marker (browsing /
+			// finished / failed) AND drive the gauge from the bar value
+			// (EC_TAG_SEARCH_STATUS) via the same per-tab path a search uses.
+			theApp->amuledlg->m_searchwnd->SetBrowseStatus(
+				idTag->GetInt(), (uint32)browseTag->GetInt());
+			if (const CECTag *barTag = src->GetTagByName(EC_TAG_SEARCH_STATUS)) {
+				theApp->amuledlg->m_searchwnd->UpdateSearchProgress(
+					idTag->GetInt(), (uint32)barTag->GetInt());
+			}
+		} else {
+			const bool expired = src->GetTagByName(EC_TAG_SEARCH_EXPIRED) != nullptr;
+			if (expired) {
+				// The daemon has discarded this search -- a deliberate close from another
+				// client, or LRU eviction -- so its tab here can only mislead: mapping this
+				// to the plain "finished" status would make it indistinguishable from a
+				// search that ended normally, and "Download" on one of its results would
+				// silently do nothing, since the daemon's m_results no longer has the hash.
+				// Close the tab locally instead -- CloseSearchTab does not send
+				// EC_OP_SEARCH_STOP, since the daemon already does not know this id.
+				const uint32 sid = (uint32)idTag->GetInt();
+				m_activeSearches.erase(sid);
+				if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+					theApp->amuledlg->m_searchwnd->CloseSearchTab(sid);
+				}
+			} else {
+				// Cache whether this tab is a *running* Kad search so IsKadSearch can gate
+				// the "More" button -- enabled only while the search runs. Updated before
+				// the progress call, which refreshes that button for the visible tab.
+				const CECTag *kindTag = src->GetTagByName(EC_TAG_SEARCH_LIFECYCLE_KIND);
+				const CECTag *stateTag = src->GetTagByName(EC_TAG_SEARCH_LIFECYCLE_STATE);
+				if (kindTag && stateTag) {
+					m_kadActive(uint32)idTag->GetInt() =
+						(kindTag->GetInt() == KadSearch) &&
+						(stateTag->GetInt() == CSearchList::SEARCH_LIFECYCLE_RUNNING);
+				}
+				theApp->amuledlg->m_searchwnd->UpdateSearchProgress(
+					idTag->GetInt(), (uint32)src->GetFirstTagSafe()->GetInt());
+			}
+		}
+	}
+}
 
 void CSearchListRem::HandlePacket(const CECPacket *packet)
 {
-	if ( packet->GetOpCode() == EC_OP_SEARCH_PROGRESS ) {
-		CoreNotify_Search_Update_Progress(packet->GetFirstTagSafe()->GetInt());
+	// Reply to EC_OP_SEARCH_REQUEST_MORE. Claimed by the TAG, not by the opcode alone:
+	// EC_OP_MISC_DATA is a generic envelope (search stop and GET_CONNSTATE use it too),
+	// and consuming every packet with that opcode would silently swallow any future
+	// request routed here.
+	//
+	// The tag is absent on a daemon older than it, which means "unknown", never
+	// "exhausted" -- so that case falls through and keeps the previous optimistic
+	// behaviour. Present and false is terminal for this search.
+	//
+	// The id has to come off the packet rather than from the selected tab. The EC FIFO
+	// pairs replies to requests positionally, with no request id on the wire, so with two
+	// "More" presses in flight on different tabs the arrival order is the only thing
+	// distinguishing them -- and the user may have switched tabs meanwhile.
+	if (const CECTag *reaskable = packet->GetTagByName(EC_TAG_SEARCH_MORE_REASKABLE)) {
+		const CECTag *idTag = packet->GetTagByName(EC_TAG_SEARCH_ID);
+		if (idTag && reaskable->GetInt() == 0 && theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+			theApp->amuledlg->m_searchwnd->MarkMoreExhausted((uint32)idTag->GetInt());
+		}
+		return;
+	}
+	if (packet->GetOpCode() == EC_OP_SEARCH_PROGRESS) {
+		if (m_conn->ServerSupportsMultiSearch()) {
+			if (m_conn->ServerSupportsSearchProgressUnion()) {
+				// Union form: one child per search the daemon holds, so a client with N
+				// open tabs costs one round trip instead of N. Every child is an
+				// EC_TAG_SEARCH_ID entry whose own value is the search id and whose
+				// children are that search's progress.
+				std::set<uint32> reported;
+				for (const CECTag &entry : *packet) {
+					if (entry.GetTagName() != EC_TAG_SEARCH_ID) {
+						continue;
+					}
+					reported.insert((uint32)entry.GetInt());
+					ApplySearchProgress(&entry);
+				}
+				// The union carries no EC_TAG_SEARCH_EXPIRED: it reports the daemon's whole
+				// set, so a tab whose id is missing from it is one the daemon no longer has
+				// -- closed from another client, or evicted by the LRU. Same verdict the
+				// per-id poll reaches via the explicit tag, and on the same cycle rather
+				// than whenever that id next gets polled.
+				//
+				// Snapshot first: CloseSearchTab erases from m_activeSearches.
+				const std::set<uint32> tracked = m_activeSearches;
+				for (uint32 id : tracked) {
+					if (reported.count(id)) {
+						continue;
+					}
+					m_activeSearches.erase(id);
+					if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+						theApp->amuledlg->m_searchwnd->CloseSearchTab(id);
+					}
+				}
+			} else {
+				ApplySearchProgress(packet);
+			}
+		} else {
+			CoreNotify_Search_Update_Progress(packet->GetFirstTagSafe()->GetInt());
+		}
+	} else if (packet->GetOpCode() == EC_OP_STRINGS) {
+		// Multi-search START reply: remap the optimistic local tab ID to the
+		// daemon-allocated ID. Guarded by both tags so non-search string replies are
+		// ignored.
+		const CECTag *idTag = packet->GetTagByName(EC_TAG_SEARCH_ID);
+		const CECTag *refTag = packet->GetTagByName(EC_TAG_SEARCH_REF);
+		if (idTag && refTag) {
+			RemapSearch(refTag->GetInt(), idTag->GetInt());
+		}
+	} else if (packet->GetOpCode() == EC_OP_FAILED) {
+		// A rejected EC_OP_SEARCH_START or browse -- both route their replies here. Both
+		// send EC_TAG_SEARCH_REF, the optimistic tab id, and the daemon echoes it on the
+		// failure paths too, so the verdict is attributable: without it, StartNewSearch's
+		// unconditional "" return means OnBnClickedStart already took its success branch
+		// and created a tab, leaving a phantom tab plus an id stuck in
+		// m_pendingSearchStarts.
+		//
+		// The branch also has to exist at all: without it an EC_OP_FAILED falls through to
+		// CRemoteContainer::HandlePacket, which hits wxFAIL in IDLE and, if a DoRequery
+		// happened to be outstanding, consumes that reply.
+		if (const CECTag *refTag = packet->GetTagByName(EC_TAG_SEARCH_REF)) {
+			const uint32 localID = static_cast<uint32>(refTag->GetInt());
+			m_pendingSearchStarts.erase(localID);
+			// Report it and undo the optimistic tab/button state, through the same path the
+			// monolithic build uses for a rejected start. The daemon sends the reason as
+			// EC_TAG_STRING (a wxTRANSLATE'd literal, so translate it here); without this the
+			// user clicks Search and nothing happens.
+			if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+				const CECTag *msgTag = packet->GetTagByName(EC_TAG_STRING);
+				const wxString reason = (msgTag && msgTag->IsString())
+								? wxGetTranslation(msgTag->GetStringData())
+								: wxString();
+				theApp->amuledlg->m_searchwnd->OnStartRejected(localID, reason);
+			}
+			// Nothing to prune from m_activeSearches / m_kadActive: both are only ever keyed
+			// by a daemon-allocated id (RemapSearch, or the discovery branch), never by an
+			// optimistic one.
+		}
+	} else if (packet->GetOpCode() == EC_OP_SEARCH_LIST) {
+		// One entry per search the daemon currently holds, so a search this client never
+		// started locally -- one already open in another amulegui session -- gets a tab
+		// here instead of silently having its results dropped by AddResult/UpdateResult,
+		// neither of which looks up a tab that does not exist yet. Skips any ID that
+		// already has a tab.
+		//
+		// Deferred whole, rather than per-id, while m_pendingSearchStarts is non-empty:
+		// this reply's ids reflect the daemon's state at send time, which can already
+		// include a search THIS client just started but has not been told the id of yet --
+		// and the ids in that set are the client's *optimistic* ones, which never match the
+		// daemon ids here. Re-arming for the next tick costs one extra poll.
+		if (!m_pendingSearchStarts.empty()) {
+			m_needSearchListRequery = true;
+		} else if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+			for (const CECTag &entry : *packet) {
+				uint32 sid = static_cast<uint32>(entry.GetInt());
+				if (sid == 0 || theApp->amuledlg->m_searchwnd->GetSearchList(sid)) {
+					continue;
+				}
+				const CECTag *nameTag = entry.GetTagByName(EC_TAG_SEARCH_NAME);
+				// "(0)" matches CSearchDlg::CreateNewTab's own callers -- no leading "!"
+				// even for a Kad search: that marker is a live indicator normal callers
+				// seed only because they know at creation time they just started a Kad
+				// search, and it is only ever cleared, never set, by the progress path
+				// below. Making this tab first-class in m_activeSearches is what lets
+				// that live path take over.
+				//
+				// Unselected: this tab appears on its own, driven by another client, so
+				// it must not pull the selection away from whatever the local user is
+				// looking at -- possibly mid-typing in the search box.
+				//
+				// A browse the daemon is serving for someone else arrives here like any
+				// other search, since it shares the id space. Rebuild it as a browse tab
+				// rather than a search tab, which is what the kind is reported for.
+				// Daemons predating EC_SEARCH_BROWSE never send it, so the test simply
+				// fails there.
+				const CECTag *kindTag = entry.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_KIND);
+				const CECTag *peerTag = entry.GetTagByName(EC_TAG_CLIENT);
+				const uint32 peerEcid = peerTag ? static_cast<uint32>(peerTag->GetInt()) : 0;
+				// Only with a real peer: EnsureBrowseTab keys on the ecid and an ecid of 0
+				// is not "unknown peer", it is what every ordinary search tab carries --
+				// GetBrowseList(0) would match the first of those and repoint it at this
+				// browse. A daemon that reports the kind without the peer falls through to
+				// the plain tab.
+				if (kindTag && kindTag->GetInt() == BrowseSearch && peerEcid) {
+					theApp->amuledlg->m_searchwnd->EnsureBrowseTab(peerEcid,
+						nameTag ? nameTag->GetStringData() : wxString(),
+						sid,
+						false);
+				} else {
+					theApp->amuledlg->m_searchwnd->CreateNewTab(
+						(nameTag ? nameTag->GetStringData() : wxString()) + " (0)",
+						sid,
+						false);
+				}
+				// Without this, a discovered tab never gets polled for progress at all
+				// (Phase1Done only loops over m_activeSearches), so its hit count, progress
+				// bar and "!" marker would stay frozen forever.
+				m_activeSearches.insert(sid);
+				// Backfill: a result for this sid may already have arrived and been dropped
+				// by CreateItem, no tab existing yet to AddResult into, and the daemon's
+				// INC_UPDATE diffing never re-sends an already-delivered result -- so without
+				// this it is lost permanently rather than merely delayed. The container still
+				// holds it: CreateItem keeps every CSearchFile it builds, tab or no tab.
+				for (CSearchFile *file : m_items) {
+					if (file->GetSearchID() == sid) {
+						theApp->amuledlg->m_searchwnd->AddResult(file);
+					}
+				}
+			}
+		}
 	} else {
 		CRemoteContainer<CSearchFile, uint32, CEC_SearchFile_Tag>::HandlePacket(packet);
 	}
 }
 
-
 CSearchFile::CSearchFile(const 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_kadPublishInfo(0)
+: 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_kadPublishInfo(0)
 {
 	SetFileName(CPath(tag->FileName()));
 	m_abyFileHash = tag->FileHash();
@@ -2463,53 +3875,91 @@
 		m_iUserRating = rating;
 	}
 
-	m_searchID = theApp->searchlist->m_curr_search;
+	// Browse ("View Files") results carry their source peer's id/port and the shared
+	// folder they live in -- the daemon emits these only for browse results, so a remote
+	// GUI can render per-source info and folder grouping.
+	tag->GetBrowseSource(m_clientID, m_clientPort, m_directory);
+
+	// Multi-search: the daemon's union poll tags every result with its owning search ID,
+	// so route by that. 0 means a legacy single-search reply: fall back to the one
+	// current-search ID (old daemon / old behaviour).
+	uint32 tagSearchID = tag->SearchID();
+	m_searchID = tagSearchID ? tagSearchID : theApp->searchlist->m_curr_search;
 	uint32 parentID = tag->ParentID();
 	if (parentID) {
-		CSearchFile * parent = theApp->searchlist->GetByID(parentID);
+		CSearchFile *parent = theApp->searchlist->GetByID(parentID);
 		if (parent) {
 			parent->AddChild(this);
 		}
 	}
 }
 
-
-void CSearchFile::AddChild(CSearchFile* file)
+void CSearchFile::AddChild(CSearchFile *file)
 {
 	m_children.push_back(file);
 	file->m_parent = this;
 }
 
-
 // dtor is virtual - must be implemented
 CSearchFile::~CSearchFile()
 {
+	// Mirror the core dtor: let an open comments dialog drop this result before it is
+	// freed (the remote container can remove/recreate a result while the modal is up).
+	// The core ~CSearchFile lives in SearchFile.cpp, which the remote GUI does not
+	// compile, so the notify has to be fired here too.
+	Notify_SearchFileBeingDestroyed(this);
 }
 
-
 CSearchFile *CSearchListRem::CreateItem(const CEC_SearchFile_Tag *tag)
 {
 	CSearchFile *file = new CSearchFile(tag);
 	ProcessItemUpdate(tag, file);
 
+	// A result bearing a search ID with no tab is exactly the symptom EC_OP_SEARCH_LIST
+	// exists to fix -- ask for the list again on the next poll so a tab gets created for
+	// it, instead of polling that op every tick regardless of whether anything new
+	// showed up.
+	if (file->m_searchID != 0 && !theApp->amuledlg->m_searchwnd->GetSearchList(file->m_searchID)) {
+		m_needSearchListRequery = true;
+	}
+
+	// A result whose tag names a parent this client has not built yet cannot be grouped:
+	// the constructor's lookup came back empty, so it stays parentless and is indexed as
+	// a top-level row that nothing ever re-parents. The daemon emits a parent before its
+	// children, so this should not happen -- log it rather than assert, since the trigger
+	// would be the wire order rather than a bug on this side, and losing the result would
+	// be worse.
+	if (tag->ParentID() != 0 && file->GetParent() == nullptr) {
+		AddDebugLogLineN(logSearch,
+			CFormat("Search result %u names parent %u, which has not arrived; "
+				"showing it as a top-level result") %
+				file->ECID() % tag->ParentID());
+	}
+
+	// Make the result visible to the GUI: the search model builds its rows from
+	// GetSearchResults(), so a result that is not indexed here shows up nowhere, however
+	// correctly it arrived over EC. Grouped children are dropped by IndexResult() itself,
+	// which is where that rule lives.
+	IndexResult(file);
+
 	theApp->amuledlg->m_searchwnd->AddResult(file);
 
 	return file;
 }
 
-
 void CSearchListRem::DeleteItem(CSearchFile *file)
 {
+	// De-index before freeing, so a later GetSearchResults() never hands out
+	// this freed pointer.
+	UnindexResult(file);
 	delete file;
 }
 
-
 uint32 CSearchListRem::GetItemID(CSearchFile *file)
 {
 	return file->ECID();
 }
 
-
 void CSearchListRem::ProcessItemUpdate(const CEC_SearchFile_Tag *tag, CSearchFile *file)
 {
 	uint32 sourceCount = file->m_sourceCount;
@@ -2517,75 +3967,104 @@
 	CSearchFile::DownloadStatus status = file->m_downloadStatus;
 	tag->SourceCount(&file->m_sourceCount);
 	tag->CompleteSourceCount(&file->m_completeSourceCount);
-	tag->DownloadStatus((uint32 *) &file->m_downloadStatus);
+	tag->DownloadStatus((uint32 *)&file->m_downloadStatus);
+
+	// On-demand Kad community ratings/comments (same positional encoding as a partfile's;
+	// see CEC_SearchFile_Tag). The comments dialog polls the running flag + rating list
+	// directly, so no explicit UpdateResult is needed here.
+	const CECTag *commenttag = tag->GetTagByName(EC_TAG_PARTFILE_COMMENTS);
+	if (commenttag) {
+		file->ClearFileRatingList();
+		for (CECTag::const_iterator it = commenttag->begin(); it != commenttag->end();) {
+			wxString u = (it++)->GetStringData();
+			wxString f = (it++)->GetStringData();
+			sint16 r = static_cast<sint16>(static_cast<sint64>((it++)->GetInt()));
+			wxString c = (it++)->GetStringData();
+			file->AddFileRatingList(u, f, r, c);
+		}
+	}
+	if (const CECTag *kadSearchTag = tag->GetTagByName(EC_TAG_PARTFILE_KAD_COMMENT_SEARCHING)) {
+		file->SetKadCommentSearchRunning(kadSearchTag->GetInt() != 0);
+	}
+
+	// The daemon has always sent these for search results -- CEC_SearchFile_Tag derives
+	// from CEC_SharedFile_Tag, whose base ctor emits them -- and this walker never read
+	// them back, so amulegui showed an empty Length / Bitrate / Codec for every hit while
+	// the monolithic client filled those columns in from the same server reply.
+	DecodeMediaTags(tag, file);
 
-	if (file->m_sourceCount != sourceCount
-			|| file->m_completeSourceCount != completeSourceCount
-			|| file->m_downloadStatus != status) {
+	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);
 		}
 	}
 }
 
-
 bool CSearchListRem::Phase1Done(const CECPacket *WXUNUSED(reply))
 {
-	CECPacket progress_req(EC_OP_SEARCH_PROGRESS);
-	m_conn->SendRequest(this, &progress_req);
+	// The empty check matters: with no open tabs the per-id path below sends nothing, and
+	// an unconditional union request would turn that into a roundtrip every cycle.
+	if (m_conn->ServerSupportsSearchProgressUnion() && !m_activeSearches.empty()) {
+		// One request covers every open tab: the daemon answers with one child per search.
+		// Costs a single round trip no matter how many are open, where the per-id path
+		// below sends one each -- and kept sending them for searches that had long
+		// finished, since a tab only leaves m_activeSearches when it is closed. The ids
+		// ride along so the daemon keeps bumping exactly the searches this client still has
+		// open in its LRU.
+		CECPacket progress_req(EC_OP_SEARCH_PROGRESS);
+		for (uint32 id : m_activeSearches) {
+			progress_req.AddTag(CECTag(EC_TAG_SEARCH_ID, id));
+		}
+		m_conn->SendRequest(this, &progress_req);
+	} else if (m_conn->ServerSupportsMultiSearch()) {
+		// Poll progress for each open search so every tab's lifecycle ("!", progress bar)
+		// is tracked independently. Snapshot the set: an expired reply may erase from
+		// m_activeSearches while iterating.
+		std::set<uint32> ids = m_activeSearches;
+		for (uint32 id : ids) {
+			CECPacket progress_req(EC_OP_SEARCH_PROGRESS);
+			progress_req.AddTag(CECTag(EC_TAG_SEARCH_ID, id));
+			m_conn->SendRequest(this, &progress_req);
+		}
+	} else {
+		CECPacket progress_req(EC_OP_SEARCH_PROGRESS);
+		m_conn->SendRequest(this, &progress_req);
+	}
 
 	return true;
 }
 
-
 void CSearchListRem::RemoveResults(wxUIntPtr nSearchID)
 {
-	ResultMap::iterator it = m_results.find(nSearchID);
-	if (it != m_results.end()) {
-		CSearchResultList& list = it->second;
-		for (unsigned int i = 0; i < list.size(); ++i) {
-			delete listi;
-		}
-		m_results.erase(it);
-	}
-}
-
-
-const CSearchResultList& CSearchListRem::GetSearchResults(wxUIntPtr nSearchID)
-{
-	ResultMap::const_iterator it = m_results.find(nSearchID);
-	if (it != m_results.end()) {
-		return it->second;
-	}
-
-	// TODO: Should we assert in this case?
-	static CSearchResultList list;
-	return list;
+	// The index only borrows: the CRemoteContainer owns these results and frees them
+	// through DeleteItem(), so dropping the index is all that is needed -- deleting would
+	// double-free.
+	DropResultIndex(nSearchID);
+	m_kadActive.erase((uint32)nSearchID);
 }
 
-
 void CStatsUpdaterRem::HandlePacket(const CECPacket *packet)
 {
 	theStats::UpdateStats(packet);
-	theApp->amuledlg->ShowTransferRate();
+	if (theApp->amuledlg) {
+		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()
 {
 	CClientRef ref = CCLIENTREF(this, "");
 	theApp->friendlist->RequestSharedFileList(ref);
 }
 
-
-bool CUpDownClient::SwapToAnotherFile(
-	bool WXUNUSED(bIgnoreNoNeeded),
+bool CUpDownClient::SwapToAnotherFile(bool WXUNUSED(bIgnoreNoNeeded),
 	bool WXUNUSED(ignoreSuspensions),
 	bool WXUNUSED(bRemoveCompletely),
-	CPartFile* toFile)
+	CPartFile *toFile)
 {
 	CECPacket req(EC_OP_CLIENT_SWAP_TO_ANOTHER_FILE);
 	req.AddTag(CECTag(EC_TAG_CLIENT, ECID()));
@@ -2595,51 +4074,43 @@
 	return true;
 }
 
-
 wxString CAICHHash::GetString() const
 {
 	return EncodeBase32(m_abyBuffer, HASHSIZE);
 }
 
-
-//
-// Those functions are virtual. So even they don't get called they must
-// be defined so linker will be happy
-//
-CPacket* CKnownFile::CreateSrcInfoPacket(const CUpDownClient *, uint8 /*byRequestedVersion*/, uint16 /*nRequestedOptions*/)
+// These functions are virtual, so even though they are never called they must
+// be defined for the linker.
+CPacket *CKnownFile::CreateSrcInfoPacket(
+	const CUpDownClient *, uint8 /*byRequestedVersion*/, uint16 /*nRequestedOptions*/)
 {
 	wxFAIL;
 	return 0;
 }
 
-
-bool CKnownFile::LoadFromFile(const class CFileDataIO*)
+bool CKnownFile::LoadFromFile(const class CFileDataIO *)
 {
 	wxFAIL;
 	return false;
 }
 
-
 void CKnownFile::UpdatePartsInfo()
 {
 	wxFAIL;
 }
 
-
-CPacket* CPartFile::CreateSrcInfoPacket(CUpDownClient const *, uint8 /*byRequestedVersion*/, uint16 /*nRequestedOptions*/)
+CPacket *CPartFile::CreateSrcInfoPacket(
+	CUpDownClient const *, uint8 /*byRequestedVersion*/, uint16 /*nRequestedOptions*/)
 {
 	wxFAIL;
 	return 0;
 }
 
-
 void CPartFile::UpdatePartsInfo()
 {
 	wxFAIL;
 }
 
-
-
 void CPartFile::UpdateFileRatingCommentAvail()
 {
 	bool prevComment = m_hasComment;
@@ -2651,7 +4122,7 @@
 
 	FileRatingList::iterator it = m_FileRatingList.begin();
 	for (; it != m_FileRatingList.end(); ++it) {
-		SFileRating& cur_rat = *it;
+		SFileRating &cur_rat = *it;
 
 		if (!cur_rat.Comment.IsEmpty()) {
 			m_hasComment = true;
@@ -2676,7 +4147,6 @@
 	}
 }
 
-
 void CStatTreeRem::DoRequery()
 {
 	CECPacket request(EC_OP_GET_STATSTREE);
@@ -2686,35 +4156,73 @@
 	m_conn->SendRequest(this, &request);
 }
 
-void CStatTreeRem::HandlePacket(const CECPacket * p)
+void CStatTreeRem::HandlePacket(const CECPacket *p)
 {
-	const CECTag* treeRoot = p->GetTagByName(EC_TAG_STATTREE_NODE);
+	const CECTag *treeRoot = p->GetTagByName(EC_TAG_STATTREE_NODE);
 	if (treeRoot) {
-		theApp->amuledlg->m_statisticswnd->RebuildStatTreeRemote(treeRoot);
-		theApp->amuledlg->m_statisticswnd->ShowStatistics();
+		if (theApp->amuledlg) {
+			theApp->amuledlg->m_statisticswnd->RebuildStatTreeRemote(treeRoot);
+			theApp->amuledlg->m_statisticswnd->ShowStatistics();
+		}
 	}
 }
 
+namespace
+{
+// See the comment in DoRequery: the daemon's newest history range holds this many
+// records at its finest spacing, so this is how much it can serve before the answers
+// stop lining up with the scale we asked for. Tracks CStatistics::GetPointsPerRange()
+// and has to be raised with it.
+//
+// Against an older daemon, whose ranges are shallower, a request this deep runs off
+// the end of the resolution it asked for and the far left of the first backfill is
+// drawn time-compressed. It corrects itself as live points arrive.
+const uint16 kMaxHistoryPoints = 1800;
+
+} // namespace
 
 void CStatGraphRem::DoRequery()
 {
 	CECPacket request(EC_OP_GET_STATSGRAPHS, EC_DETAIL_FULL);
-	// Send back the most recent timestamp we've seen; daemon-side
-	// CStatistics::GetHistoryForWeb uses it as the lower bound so the
-	// response only carries points the GUI hasn't drawn yet.
+	// Send back the most recent timestamp we have seen; daemon-side
+	// CStatistics::GetHistoryForGui uses it as the lower bound so the response only
+	// carries points the GUI has not drawn yet. (GetHistoryForWeb is amuleweb's
+	// near-identical twin, not this path.)
 	request.AddTag(CECTag(EC_TAG_STATSGRAPH_LAST, m_lastTimestamp));
-	// 1 s between points — matches monolithic amule's
-	// CamuleDlg::OnCoreTimer graph cadence, and lines up with the
-	// 1 s history-record granularity the daemon itself stores.
-	request.AddTag(CECTag(EC_TAG_STATSGRAPH_SCALE, (uint16)1));
-	// Generous upper bound: 32 points = ~32 s of backlog per poll,
-	// so a brief stall / reconnect catches up in one round-trip
-	// instead of needing dozens.
-	request.AddTag(CECTag(EC_TAG_STATSGRAPH_WIDTH, (uint16)32));
+	// Seconds between points. This has to be the same step the graphs are going to plot
+	// at -- COScopeCtrl gets it from the "Update delay" preference and asks
+	// CStatistics::GetHistory for points that far apart. Requesting a fixed 1 s here
+	// meant amulegui honoured the preference when drawing and ignored it when fetching,
+	// so the graphs only ever had the daemon's 1-second range behind them however far
+	// back the user had asked to see.
+	const uint16 nScale = std::max<uint16>(thePrefs::GetTrafficOMeterInterval(), 1);
+	if ((double)nScale != m_sScale) {
+		// The ring keeps one record per requested interval, so what is in it is only
+		// meaningful at the scale it was fetched at: replotting 8 s records on a 3 s axis
+		// would place them at the wrong times. Drop it and let it refill. Deliberately
+		// without resetting m_lastTimestamp -- asking for a fresh backfill here would race
+		// the reply still in the air from the previous scale, whose points would then be
+		// timestamped with this one.
+		theApp->m_statistics->ClearHistory();
+		m_sScale = (double)nScale;
+	}
+	request.AddTag(CECTag(EC_TAG_STATSGRAPH_SCALE, nScale));
+	// Upper bound on points per reply. In the steady state the daemon only sends what is
+	// newer than the timestamp above, i.e. one point per poll, so this bites in exactly
+	// two cases: the first poll after connecting, where m_lastTimestamp is still 0 and
+	// the daemon serves its whole history, and catching up after a stall or a reconnect.
+	// Both then arrive in a single round trip and the graphs open with history behind
+	// them.
+	//
+	// The value is the depth of the daemon's 1-second history range. Asking for more
+	// would return records that are not 1 s apart while HandlePacket reconstructs their
+	// timestamps assuming they are, which stretches the left of the plot rather than
+	// showing more of the past.
+	request.AddTag(CECTag(EC_TAG_STATSGRAPH_WIDTH, std::min(kMaxHistoryPoints, m_nDaemonDepth)));
 	m_conn->SendRequest(this, &request);
 }
 
-void CStatGraphRem::HandlePacket(const CECPacket * p)
+void CStatGraphRem::HandlePacket(const CECPacket *p)
 {
 	// EC_OP_FAILED with "No points for graph." -> daemon has nothing
 	// newer than m_lastTimestamp; nothing to do this cycle.
@@ -2728,18 +4236,34 @@
 	}
 	m_lastTimestamp = tsTag->GetDoubleData();
 
-	// EC_TAG_STATSGRAPH_DATA carries N x (dl_Bps, ul_Bps, conn, kadCur)
-	// uint32 4-tuples in network byte order. Points are sStep seconds
-	// apart (we request 1 s in DoRequery, matching monolithic amule's
-	// CamuleDlg::OnCoreTimer graph cadence).
+	// How many points this daemon can answer with before it starts repeating a record.
+	// Absent from daemons predating the tag, which is exactly the case the conservative
+	// default covers. Learning that it can serve more than we asked for is worth a
+	// one-off refetch: the ring only accepts points newer than what it holds, so the
+	// deeper history would never arrive otherwise.
+	const CECTag *depthTag = p->GetTagByName(EC_TAG_STATSGRAPH_DEPTH);
+	if (depthTag) {
+		const uint16 nDepth = std::max<uint16>((uint16)depthTag->GetInt(), 1);
+		if (nDepth > m_nDaemonDepth) {
+			m_nDaemonDepth = nDepth;
+			theApp->m_statistics->ClearHistory();
+			m_lastTimestamp = 0.0;
+			return;
+		}
+		m_nDaemonDepth = nDepth;
+	}
+
+	// EC_TAG_STATSGRAPH_DATA carries N x (dl_Bps, ul_Bps, conn, kadCur) uint32 4-tuples
+	// in network byte order. Points are m_sScale seconds apart, that being the scale
+	// DoRequery asked this reply for.
 	const uint8_t *raw = (const uint8_t *)dataTag->GetTagData();
 	size_t dataLen = dataTag->GetTagDataLen();
 	size_t numPoints = dataLen / (4 * sizeof(uint32));
 
-	// EC_TAG_STATSGRAPH_DATA_CONN (new tag, optional) carries the matching
-	// N x (cntUploads, cntDownloads) uint32 pairs so the Connections scope
-	// can show monolithic amule's 3-line breakdown. Absent when talking to
-	// a pre-extension daemon — fall back to flat 0 lines for those slots.
+	// EC_TAG_STATSGRAPH_DATA_CONN (optional) carries the matching N x (cntUploads,
+	// cntDownloads) uint32 pairs so the Connections scope can show monolithic amule's
+	// 3-line breakdown. Absent against a pre-extension daemon -- fall back to flat 0
+	// lines for those slots.
 	const CECTag *connTag = p->GetTagByName(EC_TAG_STATSGRAPH_DATA_CONN);
 	const uint8_t *connRaw = NULL;
 	size_t connPoints = 0;
@@ -2748,76 +4272,123 @@
 		connPoints = connTag->GetTagDataLen() / (2 * sizeof(uint32));
 	}
 
-	// Session totals — let amulegui compute the same
-	// kBytesReceived / sTimestamp session average monolithic plots.
-	// Absent on old daemons; fall back to 0 (Session line stays flat).
-	const CECTag *sesDlTag  = p->GetTagByName(EC_TAG_STATSGRAPH_SESSION_DL);
-	const CECTag *sesUlTag  = p->GetTagByName(EC_TAG_STATSGRAPH_SESSION_UL);
+	// Session totals -- let amulegui compute the same kBytesReceived /
+	// sTimestamp session average monolithic plots. Absent on old daemons.
+	const CECTag *sesDlTag = p->GetTagByName(EC_TAG_STATSGRAPH_SESSION_DL);
+	const CECTag *sesUlTag = p->GetTagByName(EC_TAG_STATSGRAPH_SESSION_UL);
 	const CECTag *sesKadTag = p->GetTagByName(EC_TAG_STATSGRAPH_SESSION_KAD);
-	const CECTag *sesTsTag  = p->GetTagByName(EC_TAG_STATSGRAPH_SESSION_TIMESPAN);
-	const double sessionTs   = sesTsTag  ? sesTsTag->GetDoubleData()    : 0.0;
-	const uint64 sessionDlB  = sesDlTag  ? sesDlTag->GetInt()           : 0;
-	const uint64 sessionUlB  = sesUlTag  ? sesUlTag->GetInt()           : 0;
-	const uint64 sessionKadN = sesKadTag ? sesKadTag->GetInt()          : 0;
-	const float sessionDl  = sessionTs > 0.0 ? (float)(sessionDlB  / sessionTs) : 0.0f;
-	const float sessionUl  = sessionTs > 0.0 ? (float)(sessionUlB  / sessionTs) : 0.0f;
+	const CECTag *sesTsTag = p->GetTagByName(EC_TAG_STATSGRAPH_SESSION_TIMESPAN);
+	const double sessionTs = sesTsTag ? sesTsTag->GetDoubleData() : 0.0;
+	const uint64 sessionDlB = sesDlTag ? sesDlTag->GetInt() : 0;
+	const uint64 sessionUlB = sesUlTag ? sesUlTag->GetInt() : 0;
+	const uint64 sessionKadN = sesKadTag ? sesKadTag->GetInt() : 0;
+	const float sessionDl = sessionTs > 0.0 ? (float)(sessionDlB / sessionTs) : 0.0f;
+	const float sessionUl = sessionTs > 0.0 ? (float)(sessionUlB / sessionTs) : 0.0f;
 	const float sessionKad = sessionTs > 0.0 ? (float)(sessionKadN / sessionTs) : 0.0f;
 
-	// Running-average window: mirror CPreciseRateCounter's
-	// count_average=true behaviour with a deque of per-second samples
-	// sized to GetStatsAverageMinutes() minutes (the same preference
-	// monolithic amule's CStatistics::OnStatsChange uses). The
-	// daemon-side counter's per-tick state isn't on the wire, so this
-	// is recomputed locally from the per-point rates we already unpack.
-	const size_t winCap = (size_t)thePrefs::GetStatsAverageMinutes() * 60;
-	const size_t cap = winCap ? winCap : 1;
+	// Cumulative session counters for each point in the reply.
+	//
+	// ComputeAverages derives the session-average trend as kBytesReceived / sTimestamp,
+	// so it needs the cumulative figure as it stood at each point, while the daemon sends
+	// only the newest. The rest are reconstructed from the per-point rates this same
+	// reply carries -- a rectangle-rule integral, so it carries a few percent of error
+	// against a spiky signal.
+	//
+	// Which direction to integrate matters, because that error is divided by the point's
+	// timestamp. Going backwards from the newest puts it at the oldest point, and when a
+	// reply reaches back near the start of the daemon's session that divisor is a few
+	// seconds: a 3% error on several GB reads as tens of MB/s where the truth is nearly
+	// zero, and past the session start the divisor goes negative and the trend flips sign.
+	//
+	// So pick the end that is known exactly. If the reply spans the whole session the
+	// oldest point's total is zero by definition, and integrating forward leaves the error
+	// at the newest point, divided by the full session length. Otherwise every timestamp
+	// in the window is large and backwards from the daemon's own newest figure is exact
+	// where it starts.
+	std::vector<double> aKBytesDl(numPoints, 0.0);
+	std::vector<double> aKBytesUl(numPoints, 0.0);
+	std::vector<double> aKadTotal(numPoints, 0.0);
+	// Within one sample of zero means the oldest point IS the session's first sample --
+	// the daemon answers with what it has, so a reply that reaches the start stops there
+	// rather than running past it. Testing for a timestamp at or below zero would almost
+	// never fire.
+	const double oldestTs = m_lastTimestamp - (double)(numPoints - 1) * m_sScale;
+	const bool spansSessionStart = oldestTs <= m_sScale;
+	{
+		auto rateAt = &(size_t j, size_t offset) {
+			uint32 v;
+			memcpy(&v, raw + j * 16 + offset, 4);
+			return (double)ENDIAN_NTOHL(v);
+		};
+
+		if (spansSessionStart) {
+			double kDl = 0.0, kUl = 0.0, kKad = 0.0;
+			for (size_t j = 0; j < numPoints; ++j) {
+				kDl += (rateAt(j, 0) / 1024.0) * m_sScale;
+				kUl += (rateAt(j, 4) / 1024.0) * m_sScale;
+				kKad += rateAt(j, 12) * m_sScale;
+				aKBytesDlj = kDl;
+				aKBytesUlj = kUl;
+				aKadTotalj = kKad;
+			}
+		} else {
+			double kDl = (double)sessionDlB;
+			double kUl = (double)sessionUlB;
+			double kKad = (double)sessionKadN;
+			for (size_t j = numPoints; j-- > 0;) {
+				aKBytesDlj = std::max(kDl, 0.0);
+				aKBytesUlj = std::max(kUl, 0.0);
+				aKadTotalj = std::max(kKad, 0.0);
+
+				kDl -= (rateAt(j, 0) / 1024.0) * m_sScale;
+				kUl -= (rateAt(j, 4) / 1024.0) * m_sScale;
+				kKad -= rateAt(j, 12) * m_sScale;
+			}
+		}
+	}
 
 	for (size_t i = 0; i < numPoints; i++) {
 		uint32 dl, ul, conn, kad;
-		memcpy(&dl,   raw + i * 16 + 0,  4);
-		memcpy(&ul,   raw + i * 16 + 4,  4);
-		memcpy(&conn, raw + i * 16 + 8,  4);
-		memcpy(&kad,  raw + i * 16 + 12, 4);
-		dl   = ENDIAN_NTOHL(dl);
-		ul   = ENDIAN_NTOHL(ul);
+		memcpy(&dl, raw + i * 16 + 0, 4);
+		memcpy(&ul, raw + i * 16 + 4, 4);
+		memcpy(&conn, raw + i * 16 + 8, 4);
+		memcpy(&kad, raw + i * 16 + 12, 4);
+		dl = ENDIAN_NTOHL(dl);
+		ul = ENDIAN_NTOHL(ul);
 		conn = ENDIAN_NTOHL(conn);
-		kad  = ENDIAN_NTOHL(kad);
+		kad = ENDIAN_NTOHL(kad);
 
 		uint32 cntUp = 0, cntDown = 0;
 		if (connRaw && i < connPoints) {
-			memcpy(&cntUp,   connRaw + i * 8 + 0, 4);
+			memcpy(&cntUp, connRaw + i * 8 + 0, 4);
 			memcpy(&cntDown, connRaw + i * 8 + 4, 4);
-			cntUp   = ENDIAN_NTOHL(cntUp);
+			cntUp = ENDIAN_NTOHL(cntUp);
 			cntDown = ENDIAN_NTOHL(cntDown);
 		}
 
-		const float dl_kbps  = dl / 1024.0f;
-		const float ul_kbps  = ul / 1024.0f;
-		const float kad_cnt  = (float)kad;
-
-		m_winDl.push_back(dl_kbps);
-		m_winUp.push_back(ul_kbps);
-		m_winKad.push_back(kad_cnt);
-		while (m_winDl.size()  > cap) m_winDl.pop_front();
-		while (m_winUp.size()  > cap) m_winUp.pop_front();
-		while (m_winKad.size() > cap) m_winKad.pop_front();
-
-		double sumDl = 0.0, sumUp = 0.0, sumKad = 0.0;
-		for (float v : m_winDl)  sumDl  += v;
-		for (float v : m_winUp)  sumUp  += v;
-		for (float v : m_winKad) sumKad += v;
-		const float runDl  = m_winDl.empty()  ? 0.0f : (float)(sumDl  / m_winDl.size());
-		const float runUp  = m_winUp.empty()  ? 0.0f : (float)(sumUp  / m_winUp.size());
-		const float runKad = m_winKad.empty() ? 0.0f : (float)(sumKad / m_winKad.size());
+		const float dl_kbps = dl / 1024.0f;
+		const float ul_kbps = ul / 1024.0f;
+		const float kad_cnt = (float)kad;
 
 		GraphUpdateInfo update;
 		update.timestamp = m_lastTimestamp;
-		// Slot layout matches CStatistics::GetPointsForUpdate:
-		//   downloads/uploads/kadnodes — 0 session avg, 1 running avg, 2 current.
-		//   connections — 0 cntUploads, 1 cntConnections, 2 cntDownloads.
-		update.downloads0 = sessionDl;  update.downloads1 = runDl;  update.downloads2 = dl_kbps;
-		update.uploads0   = sessionUl;  update.uploads1   = runUp;  update.uploads2   = ul_kbps;
-		update.kadnodes0  = sessionKad; update.kadnodes1  = runKad; update.kadnodes2  = kad_cnt;
+		// Slot layout matches CStatistics::GetPointsForUpdate: downloads/uploads/kadnodes
+		// are 0 session avg, 1 running avg, 2 current; connections are 0
+		// cntUploads, 1 cntConnections, 2 cntDownloads. Only timestamp and kadnodes2
+		// are read now that the graphs draw from the history rather than from the point
+		// handed to them; the rest is filled to keep the struct's contract with the
+		// monolithic producer. The running-average slots stay at their per-point value: the
+		// trend the graphs plot is rebuilt by CStatistics::ComputeAverages, which sizes its
+		// window from the sample step.
+		update.downloads0 = sessionDl;
+		update.downloads1 = dl_kbps;
+		update.downloads2 = dl_kbps;
+		update.uploads0 = sessionUl;
+		update.uploads1 = ul_kbps;
+		update.uploads2 = ul_kbps;
+		update.kadnodes0 = sessionKad;
+		update.kadnodes1 = kad_cnt;
+		update.kadnodes2 = kad_cnt;
 		update.connections0 = (float)cntUp;
 		update.connections1 = (float)conn;
 		update.connections2 = (float)cntDown;
@@ -2825,27 +4396,30 @@
 		if (conn > m_peakConnections) {
 			m_peakConnections = conn;
 		}
-		theApp->amuledlg->m_statisticswnd->UpdateStatGraphs(
-			m_peakConnections, update);
-		theApp->amuledlg->m_kademliawnd->UpdateGraph(update);
-
-		// Mirror the decoded point into the client-side history ring
-		// so COScopeCtrl::PlotHistory (now shared with monolithic) can
-		// replay across tab switches and auto-rescale wipes without
-		// another daemon round-trip. Field mapping mirrors
-		// CStatistics::GetPointsForUpdate so the same GetHistory +
-		// ComputeAverages code paths read it back correctly:
-		//   kBytes{Received,Sent} / kadNodesTotal are stored as
-		//   (session rate * timestamp) so ComputeAverages's
-		//   "kValueRun / sTimestamp" recovers the session-avg trend.
-		// Per-point timestamps are reconstructed from the batch by
-		// stepping back from m_lastTimestamp at 1 s spacing (matches
-		// the scale we request in DoRequery).
-		const double sStep = 1.0;
-		const double pointTs = m_lastTimestamp - (double)(numPoints - 1 - i) * sStep;
-		HR hr = {
-			/* kBytesSent     */ (double)sessionUl  * pointTs,
-			/* kBytesReceived */ (double)sessionDl  * pointTs,
+
+		// Mirror the decoded point into the client-side history ring so COScopeCtrl -- which
+		// draws straight from the history, and is shared with monolithic -- can replay
+		// across tab switches and auto-rescale wipes without another daemon round trip. This
+		// has to happen before the graphs are told about the sample, which is also the order
+		// the monolithic build sees. Field mapping mirrors GetPointsForUpdate so the same
+		// GetHistory + ComputeAverages paths read it back correctly: kBytes{Received,Sent} /
+		// kadNodesTotal are stored as (session rate * timestamp), so "kValueRun /
+		// sTimestamp" recovers the session-avg trend. Per-point timestamps are reconstructed
+		// by stepping back from m_lastTimestamp.
+		const double pointTs = m_lastTimestamp - (double)(numPoints - 1 - i) * m_sScale;
+
+		// A reply can reach back past the moment the daemon's session began -- its history
+		// list is preallocated, so it answers with as many points as were asked for even
+		// when fewer exist. Those points reconstruct to a timestamp at or below zero, and
+		// ComputeAverages divides by it: at zero the session average is undefined and below
+		// it the whole trend changes sign. Drop them rather than store a value that cannot
+		// be drawn honestly.
+		if (pointTs <= 0.0) {
+			continue;
+		}
+
+		HR hr = { /* kBytesSent     */ aKBytesUli,
+			/* kBytesReceived */ aKBytesDli,
 			/* kBpsUpCur      */ ul_kbps,
 			/* kBpsDownCur    */ dl_kbps,
 			/* sTimestamp     */ pointTs,
@@ -2853,18 +4427,20 @@
 			/* cntUploads     */ (uint16)cntUp,
 			/* cntConnections */ (uint16)conn,
 			/* kadNodesCur    */ (uint16)kad,
-			/* kadNodesTotal  */ (uint64)((double)sessionKad * pointTs)
-		};
-		theApp->m_statistics->AddHistoryRecord(hr);
+			/* kadNodesTotal  */ (uint64)aKadTotali };
+		theApp->m_statistics->AddHistoryRecord(hr, m_sScale);
+
+		if (theApp->amuledlg) {
+			theApp->amuledlg->m_statisticswnd->UpdateStatGraphs(m_peakConnections, update);
+			theApp->amuledlg->m_kademliawnd->UpdateGraph(update);
+		}
 	}
 }
 
 CamuleRemoteGuiApp *theApp;
 
-//
-// since gui is not linked with amule.cpp - define events here
-//
+// The GUI is not linked with amule.cpp, so define the events here.
 wxDEFINE_EVENT(wxEVT_CORE_FINISHED_HTTP_DOWNLOAD, wxEvent);
 wxDEFINE_EVENT(wxEVT_CORE_SOURCE_DNS_DONE, wxEvent);
 wxDEFINE_EVENT(wxEVT_CORE_UDP_DNS_DONE, wxEvent);
-wxDEFINE_EVENT(wxEVT_CORE_SERVER_DNS_DONE, wxEvent);// File_checked_for_headers
+wxDEFINE_EVENT(wxEVT_CORE_SERVER_DNS_DONE, wxEvent); // File_checked_for_headers

amule-3.0.1.tar.gz/src/amule-remote-gui.h -> amule-3.1.0.tar.gz/src/amule-remote-gui.h Changed

@@ -25,23 +25,22 @@
 #ifndef AMULE_REMOTE_GUI_H
 #define AMULE_REMOTE_GUI_H
 
-
-#include <deque>				// std::deque for CStatGraphRem rolling-average windows
-#include <functional>				// std::function for the CSharedFilesRem
-								// Reload(yieldCb) shim — matches the daemon-side
-								// signature added in PrefsUnifiedDlg's commit path.
-#include <ec/cpp/RemoteConnect.h>		// Needed for CRemoteConnect
-
+#include <functional>             // std::function for the CSharedFilesRem
+#include <set>                    // std::set for CChatMsgHandlerRem's tracked sessions
+				  // Reload(yieldCb) shim -- matches the daemon-side
+				  // signature added in PrefsUnifiedDlg's commit path.
+#include <ec/cpp/RemoteConnect.h> // Needed for CRemoteConnect
 
 #include "Statistics.h"
 #include "Preferences.h"
 #include "Statistics.h"
 #include "RLE.h"
-#include "SearchList.h"			// Needed for CSearchFile
-#include "kademlia/utils/UInt128.h"	// Needed for CUInt128
+#include "SearchList.h"             // Needed for CSearchFile
+#include "kademlia/utils/UInt128.h" // Needed for CUInt128
 
 class CED2KFileLink;
 class CServer;
+class CAbstractFile;
 class CKnownFile;
 class CSearchFile;
 class CPartFile;
@@ -54,73 +53,96 @@
 class wxTimerEvent;
 
 #include <wx/dialog.h>
+#include <wx/datetime.h> // Needed for wxDateTime (ED2K/Kad "Connected since")
 
-class CEConnectDlg : public wxDialog {
+class CEConnectDlg : public wxDialog
+{
 	wxString host;
 	int port;
 
 	wxString pwd_hash;
-	wxString login, passwd;
+	wxString passwd;
 	bool m_save_user_pass;
 	bool m_force_zlib;
+	bool m_encryption;
 
 	wxDECLARE_EVENT_TABLE();
+
 public:
 	CEConnectDlg();
 
-	void OnOK(wxCommandEvent& event);
+	void OnOK(wxCommandEvent &event);
 
 	wxString Host() { return host; }
 	int Port() { return port; }
 
-	wxString Login() { return login; }
 	wxString PassHash();
 	bool SaveUserPass() { return m_save_user_pass; }
 	bool ForceZlib() { return m_force_zlib; }
+
+	/// Whether to offer EC transport encryption. Ticked by default: the daemon only
+	/// encrypts what a client asks for, and only the client knows the address it dialed.
+	bool Encryption() { return m_encryption; }
 };
 
 wxDECLARE_EVENT(wxEVT_EC_INIT_DONE, wxEvent);
-class wxECInitDoneEvent : public wxEvent {
+class wxECInitDoneEvent : public wxEvent
+{
 public:
-	wxECInitDoneEvent() : wxEvent(-1, wxEVT_EC_INIT_DONE)
+	wxECInitDoneEvent()
+	: wxEvent(-1, wxEVT_EC_INIT_DONE)
 	{
 	}
 
-	wxEvent *Clone(void) const
-	{
-		return new wxECInitDoneEvent(*this);
-	}
+	wxEvent *Clone(void) const { return new wxECInitDoneEvent(*this); }
 };
 
-class CPreferencesRem : public CPreferences, public CECPacketHandlerBase {
+class CPreferencesRem : public CPreferences, public CECPacketHandlerBase
+{
 	CRemoteConnect *m_conn;
 	uint32 m_exchange_send_selected_prefs;
 	uint32 m_exchange_recv_selected_prefs;
 
 	virtual void HandlePacket(const CECPacket *packet);
+
 public:
 	CPreferencesRem(CRemoteConnect *);
 
-	bool CreateCategory(Category_Struct *& category, const wxString& name, const CPath& path,
-						const wxString& comment, uint32 color, uint8 prio);
-	bool UpdateCategory(uint8 cat, const wxString& name, const CPath& path,
-						const wxString& comment, uint32 color, uint8 prio);
-
-	void RemoveCat(uint8 cat);
+	bool CreateCategory(Category_Struct *&category,
+		const wxString &name,
+		const CPath &path,
+		const wxString &comment,
+		uint32 color,
+		uint8 prio);
+	bool UpdateCategory(uint8 cat,
+		const wxString &name,
+		const CPath &path,
+		const wxString &comment,
+		uint32 color,
+		uint8 prio);
+
+	//! Sends EC_OP_DELETE_CATEGORY and always answers false: the daemon owns the list, so
+	//! CCatDeleteHandler commits only once it agrees. size_t to match the base it hides.
+	bool RequestRemoveCat(size_t cat);
 
 	bool LoadRemote();
 	void SendToRemote();
+
+	// Shared-directory roots. Unlike the rest of the preferences these are a variable-length
+	// list whose apply rewrites files and triggers a rescan, so they ride their own ops
+	// rather than the prefs packet. The replies go to a dedicated handler; results land in
+	// this object's shareddir_*_list members, which outlive the Preferences dialog.
+	void LoadSharedDirsRemote();
+	void SendSharedDirsToRemote();
 };
 
-//
-// T - type if item in container
-// I - type of id of item
-// G - type of tag used to create/update items
-//
-template <class T, class I, class G = CECTag>
-class CRemoteContainer : public CECPacketHandlerBase {
+// T - type of item in the container; I - type of the item's id; G - type of tag used to
+// create/update items.
+template <class T, class I, class G = CECTag> class CRemoteContainer : public CECPacketHandlerBase
+{
 protected:
-	enum {
+	enum
+	{
 		IDLE,            // no request in the air
 		STATUS_REQ_SENT, // sent request for item status
 		FULL_REQ_SENT    // sent request for full info
@@ -142,57 +164,63 @@
 
 	virtual void HandlePacket(const CECPacket *packet)
 	{
-		switch(this->m_state) {
-			case IDLE: wxFAIL; break; // 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) ) {
-					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);
-
-						// Phase 3: request full info about files we don't have yet
-						if ( req_full.HasChildTags() ) {
-							m_conn->SendRequest(this, &req_full);
-							this->m_state = FULL_REQ_SENT;
-						}
+		switch (this->m_state) {
+		case IDLE:
+			wxFAIL;
+			break; // 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)) {
+				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 them in a tag, then request full info.
+					CECPacket req_full(this->m_full_req_cmd);
+
+					ProcessUpdate(packet, &req_full, m_full_req_tag);
+
+					// Phase 3: request full info about files we don't have yet
+					if (req_full.HasChildTags()) {
+						m_conn->SendRequest(this, &req_full);
+						this->m_state = FULL_REQ_SENT;
 					}
 				}
-				break;
-			case FULL_REQ_SENT:
-				ProcessFull(packet);
-				m_state = IDLE;
-				break;
+			}
+			break;
+		case FULL_REQ_SENT:
+			ProcessFull(packet);
+			m_state = IDLE;
+			break;
 		}
 	}
+
 public:
 	CRemoteContainer(CRemoteConnect *conn, bool inc_tags)
-		: m_state(IDLE),
-		  m_conn(conn),
-		  m_item_count(0),
-		  m_inc_tags(inc_tags),
-		  m_full_req_cmd(0),
-		  m_full_req_tag(0)
-	{}
+	: m_state(IDLE)
+	, m_conn(conn)
+	, m_item_count(0)
+	, m_inc_tags(inc_tags)
+	, m_full_req_cmd(0)
+	, m_full_req_tag(0)
+	{
+	}
+
+	virtual ~CRemoteContainer() {}
 
-	virtual ~CRemoteContainer()
-	{}
+	// A reconnect flushed the request FIFO (CRemoteConnect::DiscardRequestQueue): the
+	// status/full reply this container was waiting for is gone, so rewind the request SM to
+	// IDLE. Otherwise DoRequery()/FullReload() see a non-IDLE state and refuse to re-request,
+	// leaving the list frozen after reconnect.
+	virtual void AbortPendingRequest() { m_state = IDLE; }
 
 	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;
-	}
+	uint32 GetCount() { return m_item_count; }
 
 	void AddItem(T *item)
 	{
@@ -214,38 +242,35 @@
 		m_item_count = 0;
 	}
 
-	//
-	// 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)
+	/**
+	 * Drops every item, one at a time through the normal removal path.
+	 *
+	 * Not Flush(): that empties the indices and leaks the objects, and anything else
+	 * still holding a raw pointer to one of them never hears about it. RemoveItem() ->
+	 * DeleteItem() is the path that tears a live item down properly -- the destroy
+	 * broadcast that makes clients and list controls drop their references, removal from
+	 * the views, then the delete.
+	 *
+	 * For use when everything keyed by ECID has stopped meaning anything, which is what
+	 * a reconnect to a restarted daemon amounts to.
+	 */
+	void ResetForNewSession()
 	{
-		CECPacket req(cmd);
-		CScopedPtr<const CECPacket> reply(this->m_conn->SendRecvPacket(&req));
-		if ( !reply.get() ) {
-			return false;
-		}
-		for(typename std::list<T *>::iterator j = this->m_items.begin(); j != this->m_items.end(); j++) {
-			this->DeleteItem(*j);
+		for (iterator it = begin(); it != end();) {
+			iterator it2 = it++;
+			RemoveItem(it2);
 		}
-
-		Flush();
-
-		ProcessFull(reply.get());
-
-		return true;
 	}
-	*/
+
+	// Flush & reload
 	void FullReload(int cmd)
 	{
-		if ( this->m_state != IDLE ) {
+		if (this->m_state != IDLE) {
 			return;
 		}
 
-		for(typename std::list<T *>::iterator j = this->m_items.begin(); j != this->m_items.end(); ++j) {
+		for (typename std::list<T *>::iterator j = this->m_items.begin(); j != this->m_items.end();
+			++j) {
 			this->DeleteItem(*j);
 		}
 
@@ -257,13 +282,11 @@
 		this->m_full_req_cmd = cmd;
 	}
 
-	//
-	// Following are like basically same code as in webserver. Eventually it must
-	// be same class
-	//
+	// Following is basically the same code as in webserver. Eventually it must be the same
+	// class.
 	void DoRequery(int cmd, int tag)
 	{
-		if ( this->m_state != IDLE ) {
+		if (this->m_state != IDLE) {
 			return;
 		}
 		CECPacket req_sts(cmd, m_inc_tags ? EC_DETAIL_INC_UPDATE : EC_DETAIL_UPDATE);
@@ -272,46 +295,6 @@
 		this->m_full_req_cmd = cmd;
 		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
-		CScopedPtr<const CECPacket> reply(this->m_conn->SendRecvPacket(&req_sts));
-		if ( !reply.get() ) {
-			return false;
-		}
-
-		if ( !this->Phase1Done(reply.get()) ) {
-			// if derived class choose not to proceed, return - but with good status
-			return true;
-		}
-		//
-		// Phase 2: update status, mark new files for subsequent query
-		CECPacket req_full(cmd);
-
-		ProcessUpdate(reply.get(), &req_full, tag);
-
-		reply.reset();
-
-		if ( !m_inc_tags ) {
-			// Phase 3: request full info about files we don't have yet
-			if ( req_full.GetTagCount() ) {
-				reply.reset(this->m_conn->SendRecvPacket(&req_full));
-				if ( !reply.get() ) {
-					return false;
-				}
-				ProcessFull(reply.get());
-			}
-		}
-		return true;
-	}
-	*/
 
 	void ProcessFull(const CECPacket *reply)
 	{
@@ -322,7 +305,7 @@
 		}
 	}
 
-	void RemoveItem(iterator & it)
+	void RemoveItem(iterator &it)
 	{
 		I item_id = GetItemID(*it);
 		// reduce count
@@ -341,12 +324,12 @@
 		std::set<I> core_files;
 		for (CECPacket::const_iterator it = reply->begin(); it != reply->end(); ++it) {
 			const G *tag = static_cast<const G *>(&*it);
-			if ( tag->GetTagName() != req_type ) {
+			if (tag->GetTagName() != req_type) {
 				continue;
 			}
 
 			core_files.insert(tag->ID());
-			if ( m_items_hash.count(tag->ID()) ) {
+			if (m_items_hash.count(tag->ID())) {
 				// Item already known: update it
 				T *item = m_items_hashtag->ID();
 				ProcessItemUpdate(tag, item);
@@ -363,36 +346,24 @@
 				}
 			}
 		}
-		for(iterator it = begin(); it != end();) {
+		for (iterator it = begin(); it != end();) {
 			iterator it2 = it++;
-			if ( core_files.count(GetItemID(*it2)) == 0 ) {
+			if (core_files.count(GetItemID(*it2)) == 0) {
 				RemoveItem(it2);
 			}
 		}
 	}
 
-	virtual T *CreateItem(const G *)
-	{
-		return 0;
-	}
-	virtual void DeleteItem(T *)
-	{
-	}
-	virtual I GetItemID(T *)
-	{
-		return I();
-	}
-	virtual void ProcessItemUpdate(const G *, T *)
-	{
-	}
+	virtual T *CreateItem(const G *) { return 0; }
+	virtual void DeleteItem(T *) {}
+	virtual I GetItemID(T *) { return I(); }
+	virtual void ProcessItemUpdate(const G *, T *) {}
 
-	virtual bool Phase1Done(const CECPacket *)
-	{
-		return true;
-	}
+	virtual bool Phase1Done(const CECPacket *) { return true; }
 };
 
-class CServerConnectRem {
+class CServerConnectRem
+{
 	CRemoteConnect *m_Conn;
 	uint32 m_ID;
 
@@ -409,21 +380,38 @@
 	uint32 GetClientID() { return m_ID; }
 	CServer *GetCurrentServer() { return m_CurrServer; }
 
-	//
 	// Actions
-	//
-	void ConnectToServer(CServer* server);
+	void ConnectToServer(CServer *server);
 	void ConnectToAnyServer();
 	void StopConnectionTry();
 	void Disconnect();
 };
 
-class CServerListRem : public CRemoteContainer<CServer, uint32, CEC_Server_Tag> {
+class CServerListRem : public CRemoteContainer<CServer, uint32, CEC_Server_Tag>
+{
 	uint32 m_TotalUser, m_TotalFile;
 
+	/**
+	 * The server list has been sized to its contents once.
+	 *
+	 * The core fits its columns when a bulk (re)load finishes, via Notify_ServerThaw()
+	 * from CServerList -- a path the remote GUI never takes, since its list arrives over
+	 * EC instead. Without this the columns kept their compiled-in defaults forever in
+	 * amulegui, and the narrow ones (Port and Ping default to 25px) could not fit their
+	 * own headers.
+	 *
+	 * One-shot on purpose: refitting on every update would undo a width the user had
+	 * dragged, and nothing distinguishes "still default" from "chosen".
+	 */
+	bool m_columnsFitted = false;
+
 	virtual void HandlePacket(const CECPacket *packet);
+
 public:
 	CServerListRem(CRemoteConnect *);
+	// Public because the base declares it so, and the update loop calls it
+	// through a CServerListRem reference. See m_columnsFitted.
+	virtual void ProcessUpdate(const CECTag *reply, CECPacket *full_req, int req_type);
 	void GetUserFileStatus(uint32 &total_user, uint32 &total_file)
 	{
 		total_user = m_TotalUser;
@@ -432,130 +420,166 @@
 
 	void UpdateUserFileStatus(CServer *server);
 
-	CServer* GetServerByAddress(const wxString& address, uint16 port) const;
-	CServer* GetServerByIPTCP(uint32 nIP, uint16 nPort) const;
+	CServer *GetServerByAddress(const wxString &address, uint16 port) const;
+	CServer *GetServerByIPTCP(uint32 nIP, uint16 nPort) const;
 
-	//
 	// Actions
-	//
-	void RemoveServer(CServer* server);
+	void RemoveServer(CServer *server);
 	void UpdateServerMetFromURL(wxString url);
-	void SetStaticServer(CServer* server, bool isStatic);
-	void SetServerPrio(CServer* server, uint32 prio);
-	void SaveServerMet() {}	// not needed here
-	void FilterServers() {}	// not needed here
+	void SetStaticServer(CServer *server, bool isStatic);
+	void SetServerPrio(CServer *server, uint32 prio);
+	void SaveServerMet() {} // not needed here
+	void FilterServers() {} // not needed here
 
-	//
 	// template
-	//
 	CServer *CreateItem(const CEC_Server_Tag *);
 	void DeleteItem(CServer *);
 	uint32 GetItemID(CServer *);
 	void ProcessItemUpdate(const CEC_Server_Tag *, CServer *);
 };
 
-class CUpDownClientListRem : public CRemoteContainer<CClientRef, uint32, CEC_UpDownClient_Tag> {
+class CUpDownClientListRem : public CRemoteContainer<CClientRef, uint32, CEC_UpDownClient_Tag>
+{
 public:
 	CUpDownClientListRem(CRemoteConnect *);
 
-	void FilterQueues() {}	// not needed here
-	//
+	void FilterQueues() {} // not needed here
 	// template
-	//
 	CClientRef *CreateItem(const CEC_UpDownClient_Tag *);
 	void DeleteItem(CClientRef *);
 	uint32 GetItemID(CClientRef *);
 	void ProcessItemUpdate(const CEC_UpDownClient_Tag *, CClientRef *);
 
-	// Null out CUpDownClient::m_uploadingfile / m_reqfile on every
-	// client still pointing at `file`. Called by the broadcast
-	// handler MuleNotify::KnownFileBeingDestroyed before a
-	// CKnownFile is freed, so the dangling pointers don't get
-	// dereffed by a later CUpDownClientListRem::DeleteItem (the
-	// #748 / #755 UAF family). Pointer-value comparison only.
+	// Null out CUpDownClient::m_uploadingfile / m_reqfile on every client still pointing at
+	// `file`. Called by the broadcast handler MuleNotify::KnownFileBeingDestroyed before a
+	// CKnownFile is freed, so the dangling pointers are not dereffed by a later DeleteItem.
+	// Pointer-value comparison only.
 	void DropReferencesTo(const CKnownFile *file);
 };
 
-class CDownQueueRem : public std::map<uint32, CPartFile*> {
+class CDownQueueRem : public std::map<uint32, CPartFile *>
+{
 	CRemoteConnect *m_conn;
+
 public:
-	CDownQueueRem(CRemoteConnect * conn) { m_conn = conn; }
+	CDownQueueRem(CRemoteConnect *conn) { m_conn = conn; }
 
-	CPartFile* GetFileByID(uint32 id);
+	CPartFile *GetFileByID(uint32 id);
 
-	//
 	// User actions
-	//
 	void Prio(CPartFile *file, uint8 prio);
 	void AutoPrio(CPartFile *file, bool flag);
 	void Category(CPartFile *file, uint8 cat);
 
 	void SendFileCommand(CPartFile *file, ec_tagname_t cmd);
-	//
 	// Actions
-	//
 	void StopUDPRequests() {}
-	void AddFileLinkToDownload(CED2KFileLink*, uint8);
+	void AddFileLinkToDownload(CED2KFileLink *, uint8);
 	bool AddLink(const wxString &link, uint8 category = 0);
-	void AddLinks(const wxArrayString& links, uint8 category = 0);
+	void AddLinks(const wxArrayString &links, uint8 category = 0);
 	void UnsetCompletedFilesExist();
 	void ResetCatParts(int cat);
-	void AddSearchToDownload(CSearchFile* toadd, uint8 category);
-	void ClearCompleted(const ListOfUInts32 & ecids);
+	void AddSearchToDownload(CSearchFile *toadd, uint8 category);
+	void ClearCompleted(const ListOfUInts32 &ecids);
 };
 
-class CSharedFilesRem  : public std::map<uint32, CKnownFile*> {
+class CSharedFilesRem : public std::map<uint32, CKnownFile *>
+{
 	CRemoteConnect *m_conn;
+
 public:
-	CSharedFilesRem(CRemoteConnect * conn);
+	CSharedFilesRem(CRemoteConnect *conn);
 
 	CKnownFile *GetFileByID(uint32 id);
 
 	void SetFilePrio(CKnownFile *file, uint8 prio);
 
-	//
 	// Actions
-	//
 	void Reload(bool sendtoserver = true, bool firstload = false);
-	bool RenameFile(CKnownFile* file, const CPath& newName);
-	void SetFileCommentRating(CKnownFile* file, const wxString& newComment, int8 newRating);
-	void CopyFileList(std::vector<CKnownFile*>& out_list) const;
-
-	// Remote-side shim for the daemon's cancellable-progress Reload
-	// added in the shared-dirs deferred-apply flow. The actual file
-	// walk happens on amuled; here we just fall through to the
-	// existing EC-driven Reload(sendtoserver=true) and ignore the
-	// progress callback. Returns true (never "cancelled") because
-	// the local-thread part of the operation is essentially instant.
-	bool Reload(std::function<bool(size_t)> /* yieldCb */) {
+	bool RenameFile(CKnownFile *file, const CPath &newName);
+	void SetFileCommentRating(CKnownFile *file, const wxString &newComment, int8 newRating);
+	void VerifyLocalData(const CKnownFile *file) const;
+
+	// Mirrors CSharedFileList's signature so the one call site in CSharedFilesCtrl compiles
+	// for both binaries -- muleappgui is built once and carries no build-variant defines, so
+	// the split has to live in the type of theApp->sharedfiles rather than in an #ifdef at
+	// the call site. Returns true when the request was SENT, not when anything was probed:
+	// the daemon decides eligibility and reports the outcome in its own log.
+	bool RefreshMediaMetadata(const CMD4Hash &hash);
+	unsigned RefreshMediaMetadata(const std::vector<CMD4Hash> &hashes);
+	void SearchKadNotes(CAbstractFile *file);
+	void CopyFileList(std::vector<CKnownFile *> &out_list) const;
+
+	// Remote-side shim for the daemon's cancellable-progress Reload. The file walk happens on
+	// amuled; here we fall through to the existing EC-driven Reload(sendtoserver=true) and
+	// ignore the progress callback. Returns true -- never "cancelled" -- because the
+	// local-thread part is essentially instant.
+	bool Reload(std::function<bool(size_t)> /* yieldCb */)
+	{
 		Reload();
 		return true;
 	}
 
-	// Remote-side no-op. The actual watcher lives on amuled and is
-	// driven there by the EC-synced AutoRescanSharedDirs pref; on the
-	// GUI side there is nothing to enable/disable locally.
+	// Remote-side shim for the daemon's deferred-reload request. On the daemon this defers
+	// the walk to the next Process() tick so an EC handler need not block on it; here
+	// Reload() only posts EC_OP_SHAREDFILES_RELOAD and returns, so it is already the
+	// non-blocking thing RequestReload() exists to provide.
+	void RequestReload() { Reload(); }
+
+	// Always false on the remote side: there is no local walk to owe. When a category change
+	// reaches CPreferencesRem it goes out over EC, and amuled schedules its own reload; the
+	// GUI must not also run or announce one.
+	bool IsReloadPending() const { return false; }
+
+	// Remote-side no-op. The actual watcher lives on amuled and is driven there
+	// by the EC-synced AutoRescanSharedDirs pref.
 	void EnableDirectoryWatcher(bool /* enable */) {}
 };
 
-class CKnownFilesRem : public CRemoteContainer<CKnownFile, uint32, CEC_SharedFile_Tag> {
-	CKnownFile * CreateKnownFile(const CEC_SharedFile_Tag *tag, CKnownFile *file = NULL);
-	CPartFile  * CreatePartFile(const CEC_PartFile_Tag *tag);
+class CKnownFilesRem : public CRemoteContainer<CKnownFile, uint32, CEC_SharedFile_Tag>
+{
+	CKnownFile *CreateKnownFile(const CEC_SharedFile_Tag *tag, CKnownFile *file = NULL);
+	CPartFile *CreatePartFile(const CEC_PartFile_Tag *tag);
+
+	bool m_initialUpdate; // improved handling for first data transfer
+
+	// Set once by the app on a reconnect. A reconnected partial-update server sends a full
+	// snapshot but never re-emits FILE_REMOVED for files deleted while we were disconnected,
+	// so ProcessUpdate() forces a single prune-by-absence against that snapshot, then clears
+	// this.
+	bool m_reconnectReconcile = false;
+
+	// One-shot for the part-status length mismatch warning: the check sits in a per-file loop
+	// that covers the whole library on every poll, and the condition it reports is
+	// library-wide when it happens at all.
+	bool m_loggedPartStatusMismatch = false;
 
-	bool m_initialUpdate;	// improved handling for first data transfer
 public:
-	CKnownFilesRem(CRemoteConnect * conn);
+	CKnownFilesRem(CRemoteConnect *conn);
 
 	CKnownFile *FindKnownFileByID(uint32 id) { return GetByID(id); }
 
+	// Arm the one-shot reconcile prune for the next full update (reconnect)
+	// and reset every reused file's differential decoders (see the .cpp).
+	void ArmReconnectReconcile();
+
+	/**
+	 * Throw away every file and start again from the next poll, for a reconnect where
+	 * the ECIDs we hold have stopped meaning anything. Re-arms the cold-boot path so the
+	 * repopulate goes through ShowFileList()'s batching rather than one sort per row.
+	 */
+	void ResetForNewDaemonSession();
+
 	uint16 requested;
 	uint32 transferred;
 	uint16 accepted;
 
-	//
 	// template
-	//
-	CKnownFile *CreateItem(const CEC_SharedFile_Tag *) { wxFAIL; return NULL; }	// unused, required by template
+	CKnownFile *CreateItem(const CEC_SharedFile_Tag *)
+	{
+		wxFAIL;
+		return NULL;
+	} // unused, required by template
 	void DeleteItem(CKnownFile *);
 	uint32 GetItemID(CKnownFile *);
 	void ProcessItemUpdate(const CEC_SharedFile_Tag *, CKnownFile *);
@@ -565,50 +589,124 @@
 	void ProcessItemUpdatePartfile(const CEC_PartFile_Tag *, CPartFile *);
 };
 
-class CIPFilterRem {
+class CIPFilterRem
+{
 	CRemoteConnect *m_conn;
+
 public:
 	CIPFilterRem(CRemoteConnect *conn);
 
-	//
 	// Actions
-	//
 	void Reload();
 	void Update(wxString strURL = "");
 	bool IsReady() const { return true; }
 };
 
-class CSearchListRem : public CRemoteContainer<CSearchFile, uint32, CEC_SearchFile_Tag> {
+class CSearchListRem : public CRemoteContainer<CSearchFile, uint32, CEC_SearchFile_Tag>,
+		       public CSearchResultIndex
+{
 	virtual void HandlePacket(const CECPacket *);
+
+	// Partial-update union poll: delete a result only when the daemon says so
+	// (EC_TAG_FILE_REMOVED), instead of the base class's "anything missing from this reply is
+	// gone" sweep.
+	//
+	// Absence-implies-deletion forced the daemon to re-send every result of every open search
+	// on every poll just to say "still here" -- with two finished searches and ~900 results
+	// that measured 12 KB per poll, of which none carried a single changed field. With
+	// removal made explicit the daemon can skip an unchanged result entirely, and an idle
+	// search costs nothing. Falls back to the base implementation against a daemon that did
+	// not echo EC_TAG_CAN_PARTIAL_UPDATE, which still relies on absence.
+	virtual void ProcessUpdate(const CECTag *reply, CECPacket *full_req, int req_type);
+
 public:
 	CSearchListRem(CRemoteConnect *);
 
-	int m_curr_search;
-	typedef std::map<wxUIntPtr, CSearchResultList> ResultMap;
-	ResultMap m_results;
+	// Reachability fix (#641): true when OnPollTimer should ask amuled what searches it
+	// currently holds (EC_OP_SEARCH_LIST) on its next poll. Starts true so a freshly
+	// (re)connected client discovers every search once up front; CreateItem sets it again
+	// whenever a result arrives for a search ID with no local tab, which is the only signal
+	// that amuled is holding a search this client does not know about yet. Cleared by
+	// OnPollTimer right after sending the request, so steady state costs nothing.
+	bool m_needSearchListRequery;
+
+	// Optimistic local IDs of this session's own EC_OP_SEARCH_START requests sent but not yet
+	// remapped (see RemapSearch). While non-empty, the EC_OP_SEARCH_LIST discovery branch
+	// defers creating any new tab: the daemon already knows about a just-started search
+	// before this client's START reply (carrying EC_TAG_SEARCH_REF/EC_TAG_SEARCH_ID) comes
+	// back, so a list reply landing in that window would otherwise be indistinguishable from
+	// a genuinely foreign search and create a second tab for the same one, which RemapSearch
+	// then rekeys onto -- two tabs, one search (got3nks, PR #680 review). Inserted in
+	// StartNewSearch's multi-search branch, erased in RemapSearch.
+	//
+	// A set of IDs rather than a bare count so an unattributable reply can never clear it:
+	// EC_OP_FAILED reaches this same handler for a failed *browse* too (SendBrowseRequest
+	// routes EC_OP_FRIEND here, and the daemon's EC_TAG_FRIEND_SHARED branch has "Friend not
+	// found." / "Client not found." / malformed exits), and "client not found" is ordinary --
+	// the peer gets reaped between the user seeing the row and clicking View Files. A count
+	// would have let that decrement lift the deferral a round trip early.
+	std::set<uint32> m_pendingSearchStarts;
+
+	// Most-recently-started search ID (0 = none). uint32 so it correctly holds a
+	// daemon-allocated Kad ID (top half of the range); as a signed int those wrapped negative
+	// and corrupted the STOP/remap round-trip.
+	uint32 m_curr_search;
+	// Daemon IDs of the currently open searches (one per tab). Polled individually for
+	// progress so each tab's lifecycle ("!", progress bar) is tracked independently.
+	// Populated on remap, removed on tab close.
+	std::set<uint32> m_activeSearches;
+	// Per-search "is this a running Kad search?" -- the SearchDlg "More" button gate. Set
+	// from LIFECYCLE_KIND + LIFECYCLE_STATE in each progress reply (kind == KadSearch &&
+	// state == RUNNING), so "More" is enabled only while the search runs and greys out once
+	// it completes. Pruned on tab close / removal.
+	std::map<uint32, bool> m_kadActive;
+
+	// The result index (ResultMap / m_results) and GetSearchResults() live in
+	// CSearchResultIndex, shared with the monolithic search list. Results here are owned by
+	// the CRemoteContainer, so the index only borrows pointers.
 
-	const CSearchResultList& GetSearchResults(wxUIntPtr nSearchID);
 	void RemoveResults(wxUIntPtr nSearchID);
-	const CSearchResultList& GetSearchResults(wxUIntPtr nSearchID) const;
-	//
 	// Actions
-	//
 
-	wxString StartNewSearch(uint32* nSearchID, SearchType search_type,
-		const CSearchList::CSearchParams& params);
+	wxString StartNewSearch(
+		uint32 *nSearchID, SearchType search_type, const CSearchList::CSearchParams &params);
 
 	void StopSearch(bool globalOnly = false);
 
-	// Stub for monolithic CSearchList API parity.  amulegui has no
-	// direct Kad layer access; an EC opcode for "search-more" is a
-	// follow-up PR.  Until then these always return false, which keeps
-	// the SearchDlg "More" button disabled in remote-GUI mode.
-	bool IsKadSearch(uint32_t /*searchID*/) const { return false; }
-	bool RequestMoreResults(uint32_t /*searchID*/) { return false; }
+	// Multi-search: stop one search by ID; andClose also frees its results on the daemon (tab
+	// close). Falls back to a parameterless stop on a legacy daemon. andClose defaults to
+	// false so the shared search dialog can stop the selected tab without closing it
+	// (CSearchList's single-arg overload matches the same call).
+	void StopSearchById(wxUIntPtr searchID, bool andClose = false);
+
+	// Multi-search: remap the optimistic local tab ID to the daemon-allocated
+	// ID once the START reply echoes the correlation token.
+	void RemapSearch(uint32 localID, uint32 daemonID);
+
+	// Reachability fix (#641): a direct one-off EC_OP_SEARCH_LIST request, bypassing
+	// DoRequery's single-request-in-flight state machine on purpose. HandlePacket answers
+	// EC_OP_SEARCH_LIST in its own branch (below) and never reaches the base class's
+	// STATUS_REQ_SENT -> IDLE transition, so routing this through DoRequery wedges m_state
+	// permanently and silently drops every later DoRequery(EC_OP_SEARCH_RESULTS, ...) call --
+	// exactly the mirror of Phase1Done's EC_OP_SEARCH_PROGRESS requests just below.
+	void RequestSearchList();
+
+	// Decode one search's progress and apply it to that search's tab. `src` is either the
+	// whole EC_OP_SEARCH_PROGRESS reply (a per-id poll, where the progress tags sit at the
+	// top level) or one child entry of the union form (every open search in a single reply).
+	// Both shapes carry an identical tag set -- the daemon emits them from one function -- so
+	// there is exactly one decode here rather than one per shape.
+	void ApplySearchProgress(const CECTag *src);
+
+	// Monolithic CSearchList API parity over EC. IsKadSearch reports whether a given tab is a
+	// *live* Kad search -- the SearchDlg "More" button gate -- from m_kadActive, which
+	// HandlePacket fills from each search's per-id LIFECYCLE_KIND + LIFECYCLE_STATE in the
+	// progress reply. RequestMoreResults sends EC_OP_SEARCH_REQUEST_MORE so the daemon widens
+	// that Kad search.
+	bool IsKadSearch(uint32_t searchID) const;
+	bool RequestMoreResults(uint32_t searchID);
 
-	//
 	// template
-	//
 	CSearchFile *CreateItem(const CEC_SearchFile_Tag *);
 	void DeleteItem(CSearchFile *);
 	uint32 GetItemID(CSearchFile *);
@@ -616,99 +714,233 @@
 	bool Phase1Done(const CECPacket *);
 };
 
-class CFriendListRem : public CRemoteContainer<CFriend, uint32, CEC_Friend_Tag> {
+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);
+	void AddFriend(const CClientRef &toadd);
+	void AddFriend(
+		const CMD4Hash &userhash, uint32 lastUsedIP, uint32 lastUsedPort, const wxString &name);
+	void RemoveFriend(CFriend *toremove);
+
+	// The same batch API CFriendList exposes, so shared GUI code can bracket a bulk operation
+	// without knowing which build it is in. Nothing to defer here: the daemon owns
+	// emfriends.met and each change is one EC packet.
+	void BeginBatch() {}
+	void EndBatch() {}
+	void RequestSharedFileList(CFriend *Friend);
+	void RequestSharedFileList(CClientRef &client);
+	void SetFriendSlot(CFriend *Friend, bool new_state);
+
+	/**
+	 * The friend with this identity, or NULL.
+	 *
+	 * Same contract as CFriendList::LookupFriend(): a hash matches a hashed friend, an
+	 * address matches one entered by address, and the list is left untouched. Reads the
+	 * container the daemon has already synced here, so it costs no EC round-trip. There
+	 * is deliberately no adopting counterpart to CFriendList::FindFriend(): the list this
+	 * build holds is a copy and the daemon owns the file.
+	 */
+	CFriend *LookupFriend(const CMD4Hash &userhash, uint32 dwIP, uint16 nPort) const;
 
-	//
 	// template
-	//
 	CFriend *CreateItem(const CEC_Friend_Tag *);
 	void DeleteItem(CFriend *);
 	uint32 GetItemID(CFriend *);
 	void ProcessItemUpdate(const CEC_Friend_Tag *, CFriend *);
 };
 
-class CStatsUpdaterRem : public CECPacketHandlerBase {
+class CStatsUpdaterRem : public CECPacketHandlerBase
+{
 	virtual void HandlePacket(const CECPacket *);
+
 public:
 	CStatsUpdaterRem() {}
 };
 
 // Server-message log mirror. amuled accumulates ed2k server messages in
-// CamuleApp::server_msg and serves them as one EC_TAG_STRING tag on
-// EC_OP_GET_SERVERINFO. We poll periodically while the network/servers
-// tab is visible, keep the last-seen snapshot in m_seenSoFar, and feed
-// only the new tail through CamuleDlg::AddServerMessageLine so the GUI
-// text control behaves the same as the monolithic build (append-only,
-// no scroll reset). EC_OP_CLEAR_SERVERINFO is used on the Reset button.
-class CServerInfoHandlerRem : public CECPacketHandlerBase {
+// CamuleApp::server_msg and serves them as one EC_TAG_STRING tag on EC_OP_GET_SERVERINFO.
+// We poll periodically while the network/servers tab is visible, keep the last-seen
+// snapshot in m_seenSoFar, and feed only the new tail through
+// CamuleDlg::AddServerMessageLine so the GUI text control behaves the same as the
+// monolithic build (append-only, no scroll reset). EC_OP_CLEAR_SERVERINFO is used on the
+// Reset button.
+class CServerInfoHandlerRem : public CECPacketHandlerBase
+{
 public:
 	wxString m_seenSoFar;
 	virtual void HandlePacket(const CECPacket *);
 };
 
-class CStatTreeRem : public CECPacketHandlerBase {
+// Polls the daemon's chat session store (EC_OP_GET_CHAT_SESSIONS -> EC_OP_CHAT_SESSIONS):
+// one roundtrip returns every session plus the messages newer than our cursor, so an idle
+// connection costs one small packet.
+//
+// Holds two pieces of client state. `m_cursor` is the resume position -- the highest
+// message id we hold -- which the poll sends so the daemon replies with only what is new;
+// it starts at 0, and that first reply is history replay rather than live arrivals.
+// `m_sessions` is the set we currently show tabs for, so a session missing from a reply
+// can be recognised as closed elsewhere and its tab dropped without echoing a close back.
+class CChatMsgHandlerRem : public CECPacketHandlerBase
+{
+public:
+	virtual void HandlePacket(const CECPacket *);
+
+	//! Resume cursor for the next poll; 0 until the first reply lands.
+	uint32 Cursor() const { return m_cursor; }
+
+private:
+	uint32 m_cursor = 0;
+	std::set<uint64> m_sessions;
+};
+
+class CStatTreeRem : public CECPacketHandlerBase
+{
 	virtual void HandlePacket(const CECPacket *);
 	CRemoteConnect *m_conn;
+
 public:
-	CStatTreeRem(CRemoteConnect * conn) { m_conn = conn; }
+	CStatTreeRem(CRemoteConnect *conn) { m_conn = conn; }
 	void DoRequery();
 };
 
-// Async EC poller that pulls the rolling-window graph history from the
-// daemon and feeds CStatisticsDlg / CKadDlg via the same UpdateStatGraphs
-// pipeline monolithic amule uses.
-class CStatGraphRem : public CECPacketHandlerBase {
+// Async EC poller that pulls the rolling-window graph history from the daemon and feeds
+// CStatisticsDlg / CKadDlg via the same UpdateStatGraphs pipeline monolithic amule uses.
+class CStatGraphRem : public CECPacketHandlerBase
+{
 	virtual void HandlePacket(const CECPacket *);
 	CRemoteConnect *m_conn;
 	// Last timestamp the daemon reported; sent back on the next request
 	// so the response only carries points the GUI hasn't seen yet.
 	double m_lastTimestamp;
+	// Seconds between points, as asked for by the request this reply answers. Timestamps are
+	// not on the wire, so HandlePacket steps back from m_lastTimestamp at this spacing to
+	// place the points; keeping the value the request used means a preference change
+	// mid-flight cannot mislabel the reply already in the air.
+	double m_sScale;
+	// Points this daemon says it can answer with per resolution range, from
+	// EC_TAG_STATSGRAPH_DEPTH. Starts at what daemons predating that tag were built with,
+	// since their silence is indistinguishable from having that much -- asking for more would
+	// get records repeated, and with no timestamps on the wire they would be drawn as real
+	// samples.
+	uint16 m_nDaemonDepth;
 
-	// Per-metric sliding window of recent samples — feeds the
-	// "Running average" line on each COScopeCtrl. Mirrors monolithic
-	// amule's CPreciseRateCounter with count_average=true: simple
-	// mean of the last N one-second samples, where N is
-	// GetStatsAverageMinutes()*60. Session average is pulled from
-	// EC_TAG_STATSGRAPH_SESSION_* (set by the daemon) so no local
-	// integral is needed.
-	std::deque<float> m_winDl;
-	std::deque<float> m_winUp;
-	std::deque<float> m_winKad;
 public:
-	// Peak connection count seen so far. CLIENT_GUI doesn't get the
-	// daemon's CStatTreeItemMaxValue accessor, so we track it locally
-	// off the connection samples we already unpack for the graphs.
+	// Peak connection count seen so far. CLIENT_GUI does not get the daemon's
+	// CStatTreeItemMaxValue accessor, so we track it locally off the connection samples we
+	// already unpack for the graphs.
 	uint32 m_peakConnections;
+
 public:
-	CStatGraphRem(CRemoteConnect * conn)
-		: m_conn(conn), m_lastTimestamp(0.0), m_peakConnections(0) {}
+	CStatGraphRem(CRemoteConnect *conn)
+	: m_conn(conn)
+	, m_lastTimestamp(0.0)
+	, m_sScale(1.0)
+	, m_nDaemonDepth(560)
+	, m_peakConnections(0)
+	{
+	}
 	void DoRequery();
 };
 
-class CListenSocketRem {
+class CListenSocketRem
+{
 	uint32 m_peak_connections;
+
 public:
 	uint32 GetPeakConnections() { return m_peak_connections; }
 };
 
-class CamuleRemoteGuiApp : public wxApp, public CamuleGuiBase, public CamuleAppCommon {
-	wxTimer*	poll_timer;
-	// Watchdog on the initial EC connect attempt. Started when the user
-	// clicks OK on the connection dialog; fires if no OnECConnection
-	// event has arrived within the timeout, so a wrong host / firewalled
-	// daemon doesn't leave amulegui "not responding" indefinitely with
-	// no visible window while TCP SYN silently times out over minutes.
-	wxTimer*	connect_timeout_timer;
+// Tick of the remote GUI's poll timer. The handler alternates between two steps -- the
+// stats request, then the active page's data -- so either comes round every two ticks,
+// i.e. ~1 s. Requests are incremental updates against the daemon's value maps, so a
+// shorter tick costs a near-empty reply when nothing moved rather than a proportionally
+// larger one.
+//
+// The round-robin is what keeps at most one step's worth of requests on the wire per tick,
+// and it pauses rather than skips under back-pressure: the fifo-full early return happens
+// before the switch, so the step index does not advance and the cycle resumes where it
+// stopped instead of firing everything that came due while the link was stalled.
+#define EC_POLL_INTERVAL_MS 500
+
+// How long the remote GUI waits for a reply before deciding the EC connection is dead.
+// Generous on purpose: a healthy link answers in single-digit milliseconds, and the poll
+// cycle is ~1 s, so 30 s cannot be reached by a merely busy daemon -- only by one that has
+// stopped answering entirely.
+#define EC_REPLY_TIMEOUT_MS 30000
+
+class CamuleRemoteGuiApp : public wxApp, public CamuleGuiBase, public CamuleAppCommon
+{
+	wxTimer *poll_timer;
+	// Watchdog on the initial EC connect attempt. Started when the user clicks OK on the
+	// connection dialog; fires if no OnECConnection event has arrived within the timeout, so
+	// a wrong host / firewalled daemon does not leave amulegui "not responding" indefinitely
+	// with no visible window while TCP SYN silently times out over minutes.
+	wxTimer *connect_timeout_timer;
+
+	// --- Statistics-tree poll cadence ---
+	// The tree is fetched on a timer of its own (thePrefs::GetStatsInterval(), 30 s by
+	// default) rather than on every poll, because it is the one EC request here that is a
+	// full snapshot instead of a delta.
+	//
+	// m_statsTreePolled says whether that has happened yet *on this connection*. Without it
+	// the elapsed-time test alone is false on the first tick -- nothing has elapsed yet -- so
+	// a freshly started amulegui showed an empty Statistics tree for a whole interval, and a
+	// reconnect kept showing the previous daemon's tree for the remainder of one.
+	// ResetStatsTreePoll() clears it wherever a connection begins.
+	bool m_statsTreePolled = false;
+	uint32 m_msPrevStatsTree = 0;
+
+	// Called wherever a connection begins, so the next poll fetches the tree straight away
+	// instead of waiting out an interval that measures time spent on a connection that is no
+	// longer the current one.
+	void ResetStatsTreePoll()
+	{
+		m_statsTreePolled = false;
+		m_msPrevStatsTree = 0;
+	}
+
+	// --- Reconnect-after-loss (issue #444) ---
+	// When the EC connection drops after startup (e.g. the machine slept), amulegui no longer
+	// exits: it freezes the UI behind a modal dialog and retries every 5 s until the
+	// connection is restored (then reconciles all state against the fresh server snapshot in
+	// place) or the user aborts. EC connection params are captured in Startup() so a reconnect
+	// can be attempted without the (destroyed) connection dialog. Set once ShutDown() has
+	// actually run, so a shutdown postponed out of a modal dialog's event loop is resumed
+	// exactly once.
+	bool m_tornDown = false;
+
+	bool m_reconnecting = false;
+	int m_reconnectAttempt = 0;
+	int m_reconnectCountdown = 0;
+	wxTimer *m_reconnectTimer = nullptr;
+	class CReconnectDialog *m_reconnectDlg = nullptr;
+	wxString m_ecHost;
+	int m_ecPort = 0;
+	wxString m_ecPass;
+	// EC_TAG_SESSION_ID of the daemon process we last connected to, so a reconnect can tell
+	// "the socket dropped" from "the daemon restarted". 0 until the first successful connect,
+	// and against a daemon too old to send it -- either way the reconnect path treats it as
+	// "can't tell".
+	uint64 m_ecSessionId = 0;
+	void BeginReconnect();
+	void AttemptReconnect();
+	void ScheduleNextReconnect();
+	void OnReconnectTimer(wxTimerEvent &evt);
+	/// Put the modal reconnect dialog up, reflecting whatever the retry loop
+	/// is doing right now, and act on how it ends.
+	void ShowReconnectDialog();
+	/// Tear the reconnect down and act on its outcome: wxID_OK resumes polling, anything
+	/// else is the user aborting. Runs whether or not a dialog was ever shown --
+	/// reconnecting behind a minimised window finishes without one.
+	void FinishReconnect(int result);
+	// Push the connected core's version and endpoint to the status bar. Called on first
+	// connect and again after every reconnect: a reconnect may have reached a daemon that was
+	// upgraded and restarted meanwhile, so the version on screen can go stale.
+	void UpdateCoreVersionIndicator();
 
 	virtual int InitGui(bool geometry_enable, wxString &geometry_string);
 
@@ -716,38 +948,78 @@
 
 	int OnExit();
 
+	// Catch alternate quit paths (macOS Dock right-click -> Quit) so the ShutDown + OnExit
+	// cleanup (list-control SaveSettings, wxConfig flush) runs even when wx skips OnExit.
+	// Mirrors CamuleGuiApp (amule-gui.cpp).
+	void OnEndSession(wxCloseEvent &evt);
+	void OnQueryEndSession(wxCloseEvent &evt);
+
 #if wxUSE_ON_FATAL_EXCEPTION
-	// Print a libbfd/addr2line-resolved backtrace on fatal signal.
-	// Mirrors CamuleApp::OnFatalException so amulegui crashes (#692)
-	// produce the same symbolicated trace amule(d) already emit.
+	// Print a libbfd/addr2line-resolved backtrace on fatal signal. Mirrors
+	// CamuleApp::OnFatalException so amulegui crashes (#692) produce the same symbolicated
+	// trace amule(d) already emit.
 	void OnFatalException();
 #endif
 
-	void OnPollTimer(wxTimerEvent& evt);
-	void OnConnectTimeout(wxTimerEvent& evt);
+	// Likewise for assertions, which until now amulegui alone dropped: the wxWidgets dialog
+	// was the only record, so anything that aborted before it could be read left nothing
+	// behind, and remotelogfile showed a clean session. Compiled unconditionally for the
+	// reason CamuleApp's copy is: distro wx packages keep wxDEBUG_LEVEL=1, so release builds
+	// assert too.
+	//
+	// No `override` keyword, deliberately: nothing else in this class carries one, and
+	// -Werror=inconsistent-missing-override then demands it on all eight of the others.
+	void OnAssertFailure(
+		const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg);
+
+#ifdef __WXMAC__
+	// Restore the main window when the user clicks the Dock icon while no window is visible.
+	// Mirrors CamuleGuiApp; both hand off to CamuleDlg::RestoreMainWindow().
+	virtual void MacReopenApp();
+
+	// Finder "Open With" / double-click on a .emulecollection, and ed2k:// / magnet: clicks.
+	// Both queue into the ED2KLinks file rather than touching downloadqueue, which here does
+	// not exist until the EC connection is up -- Startup() drains the file once that happens.
+	// Mirrors CamuleGuiApp (amule-gui.cpp); see the notes there on which handler actually
+	// receives the URL event.
+	virtual void MacOpenFiles(const wxArrayString &fileNames);
+	virtual void MacOpenURL(const wxString &url);
+#endif
 
-	void OnECConnection(wxEvent& event);
-	void OnECInitDone(wxEvent& event);
-	void OnNotifyEvent(CMuleGUIEvent& evt);
-	void OnFinishedHTTPDownload(CMuleInternalEvent& event);
+	void OnPollTimer(wxTimerEvent &evt);
+	void OnConnectTimeout(wxTimerEvent &evt);
+
+	void OnECConnection(wxEvent &event);
+	void OnECInitDone(wxEvent &event);
+	void OnNotifyEvent(CMuleGUIEvent &evt);
+	void OnFinishedHTTPDownload(CMuleInternalEvent &event);
 
 	CStatsUpdaterRem m_stats_updater;
 	CServerInfoHandlerRem m_serverinfo_handler;
-public:
+	CChatMsgHandlerRem m_chatmsg_handler;
 
+public:
 	void Startup();
 
+	/// The main window came back from the taskbar/tray. If a reconnect has been running
+	/// quietly behind it, this is the moment to show the dialog -- the user can see the
+	/// frozen window now, so they should be told why and given the Abort button. No-op
+	/// otherwise.
+	void OnMainWindowRestored();
+
 	bool ShowConnectionDialog();
 
-	// Tear down and recreate the EC client socket so a fresh
-	// ConnectToCore can run after a failed attempt left m_connect's
-	// auth state half-initialised. Called on retry from
+	// Tear down and recreate the EC client socket so a fresh ConnectToCore can run after a
+	// failed attempt left m_connect's auth state half-initialised. Called on retry from
 	// ShowConnectionDialog / OnECConnection / OnConnectTimeout.
 	void ResetEcConnect();
 
 	class CRemoteConnect *m_connect;
 
-	CEConnectDlg *dialog;
+	// Must be null before the first ShowConnectionDialog(), which lazily creates it (if
+	// (!dialog) ...) and reuses it across retries. Left uninitialized it is read as garbage on
+	// the startup path -- harmless on Clang/ARM (landed null) but a segfault on GCC/x64.
+	CEConnectDlg *dialog = nullptr;
 
 	bool CopyTextToClipboard(wxString strText);
 
@@ -755,9 +1027,14 @@
 
 	void ShutDown(wxCloseEvent &evt);
 
+	// Tear down and leave the main loop. Safe to call with a modal dialog open: ShutDown()
+	// postpones itself until that dialog's event loop has been unwound, and Quit() is re-run
+	// from there.
+	void Quit();
+
 	CPreferencesRem *glob_prefs;
 
-	CAsioService*	m_AsioService;
+	CAsioService *m_AsioService;
 
 	//
 	// Provide access to core data thru EC
@@ -771,8 +1048,8 @@
 	CSearchListRem *searchlist;
 	CFriendListRem *friendlist;
 	CListenSocketRem *listensocket;
-	CStatTreeRem * stattree;
-	CStatGraphRem * statgraphs;
+	CStatTreeRem *stattree;
+	CStatGraphRem *statgraphs;
 
 	CStatistics *m_statistics;
 
@@ -784,41 +1061,53 @@
 	wxString GetServerLog(bool reset = false);
 
 	void AddServerMessageLine(wxString &msg);
-	void AddRemoteLogLine(const wxString& line);
+	void AddRemoteLogLine(const wxString &line);
+	// Bracket a stats poll's worth of AddRemoteLogLine() calls so the log
+	// view repaints/scrolls once for the batch, not per line (issue #445).
+	void BeginRemoteLogBatch();
+	void EndRemoteLogBatch();
 
-	void SetOSFiles(wxString ) { /* onlinesig is created on remote side */ }
+	void SetOSFiles(wxString) { /* onlinesig is created on remote side */ }
 
 	bool IsConnected() const { return IsConnectedED2K() || IsConnectedKad(); }
 	bool IsFirewalled() const;
 	bool IsConnectedED2K() const;
 	bool IsConnectedKad() const
 	{
-		return ((m_ConnState & CONNECTED_KAD_OK)
-				|| (m_ConnState & CONNECTED_KAD_FIREWALLED));
+		return ((m_ConnState & CONNECTED_KAD_OK) || (m_ConnState & CONNECTED_KAD_FIREWALLED));
 	}
 	bool IsFirewalledKad() const { return (m_ConnState & CONNECTED_KAD_FIREWALLED) != 0; }
 
-	bool IsKadRunning() const { return ((m_ConnState & CONNECTED_KAD_OK)
-				|| (m_ConnState & CONNECTED_KAD_FIREWALLED)
-				|| (m_ConnState & CONNECTED_KAD_NOT)); }
+	// Same accessor names as CamuleApp (src/amule.h) so the shared GUI source files
+	// (ServerWnd.cpp) can call theApp->GetED2KConnectedSince() unconditionally instead of
+	// #ifndef CLIENT_GUI-gating the row out of amulegui (amule-org/amule#174). Populated from
+	// EC_TAG_CONNSTATE's optional sub-tags in CServerConnectRem::HandlePacket.
+	const wxDateTime &GetED2KConnectedSince() const { return m_ed2kConnectedSince; }
+	const wxDateTime &GetKadConnectedSince() const { return m_kadConnectedSince; }
+
+	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(); }
+	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(); }
-	const CUInt128&	GetKadID() const	{ return m_kadID; }
+	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(); }
+	const CUInt128 &GetKadID() const { return m_kadID; }
 	// True IP of machine
-	uint32 GetKadIPAddress() const		{ return theStats::GetKadIPAddress(); }
+	uint32 GetKadIPAddress() const { return theStats::GetKadIPAddress(); }
 	// Buddy status
-	uint8	GetBuddyStatus() const		{ return theStats::GetBuddyStatus(); }
-	uint32	GetBuddyIP() const			{ return theStats::GetBuddyIP(); }
-	uint32	GetBuddyPort() const		{ return theStats::GetBuddyPort(); }
+	uint8 GetBuddyStatus() const { return theStats::GetBuddyStatus(); }
+	uint32 GetBuddyIP() const { return theStats::GetBuddyIP(); }
+	uint32 GetBuddyPort() const { return theStats::GetBuddyPort(); }
 
 	void StartKad();
 	void StopKad();
@@ -826,7 +1115,7 @@
 	/** Bootstraps kad from the specified IP (must be in hostorder). */
 	void BootstrapKad(uint32 ip, uint16 port);
 	/** Updates the nodes.dat file from the specified url. */
-	void UpdateNotesDat(const wxString& str);
+	void UpdateNotesDat(const wxString &str);
 
 	void DisconnectED2K();
 
@@ -838,12 +1127,16 @@
 
 	uint8 m_ConnState;
 	uint32 m_clientID;
+	// Set by CServerConnectRem::HandlePacket(); see the
+	// GetED2KConnectedSince()/GetKadConnectedSince() accessors above.
+	wxDateTime m_ed2kConnectedSince;
+	wxDateTime m_kadConnectedSince;
 
-	wxLocale	m_locale;
+	wxLocale m_locale;
 	// This KnownFile collects all currently uploading clients for display in the upload list control
-	CKnownFile * m_allUploadingKnownFile;
+	CKnownFile *m_allUploadingKnownFile;
 
-	CUInt128	m_kadID;
+	CUInt128 m_kadID;
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.0.1.tar.gz/src/amule.cpp -> amule-3.1.0.tar.gz/src/amule.cpp Changed

@@ -23,109 +23,151 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include "amule.h" // Interface declarations.
 
-#include "amule.h"			// Interface declarations.
+#include "BrowseManager.h"
 
 #include <csignal>
 #include <cstring>
 #include <wx/process.h>
 #include <wx/sstream.h>
-#include "config.h"			// Needed for HAVE_GETRLIMIT, HAVE_SETRLIMIT,
-					//   HAVE_SYS_RESOURCE_H, HAVE_SYS_STATVFS_H, VERSION
-					//   and ENABLE_NLS
+#include "config.h" // Needed for HAVE_GETRLIMIT, HAVE_SETRLIMIT,
+		    //   HAVE_SYS_RESOURCE_H, HAVE_SYS_STATVFS_H, VERSION
+		    //   and ENABLE_NLS
 #include <common/ClientVersion.h>
+#include <common/MuleDebug.h> // Needed for SuppressNextAbortBacktrace
 
-#include <wx/cmdline.h>			// Needed for wxCmdLineParser
+#include <wx/cmdline.h> // Needed for wxCmdLineParser
 #ifndef AMULE_DAEMON
-	#include <wx/choicdlg.h>	// Needed for wxMultiChoiceDialog (GUI-only)
+#include <wx/dialog.h>   // Needed for the bootstrap dialog (GUI-only)
+#include <wx/sizer.h>    // Needed for wxBoxSizer (GUI-only)
+#include <wx/stattext.h> // Needed for wxStaticText (GUI-only)
+#include <wx/checkbox.h> // Needed for wxCheckBox (GUI-only)
 #endif
-#include <wx/config.h>			// Do_not_auto_remove (win32)
+#include <wx/config.h> // Do_not_auto_remove (win32)
 #include <wx/fileconf.h>
-#include <wx/regex.h>			// Needed for wxRegEx (version check JSON parse)
+#include <wx/regex.h> // Needed for wxRegEx (version check JSON parse)
 #include <wx/socket.h>
 #include <wx/tokenzr.h>
 #include <wx/wfstream.h>
-#include <wx/stopwatch.h>		// Needed for wxStopWatch
+#include <wx/stopwatch.h> // Needed for wxStopWatch
 #ifdef __WINDOWS__
-#include <wx/stdpaths.h>		// Needed for wxStandardPaths (CA bundle lookup)
-#include <wx/filename.h>		// Needed for wxFileName (CA bundle lookup)
+#include <wx/stdpaths.h> // Needed for wxStandardPaths (CA bundle lookup)
+#include <wx/filename.h> // Needed for wxFileName (CA bundle lookup)
 #endif
 
 #if defined(__WXGTK__) && !defined(__APPLE__)
-#include <glib.h>			// g_set_prgname() — wl_app_id / WM_CLASS binding
+#include <glib.h> // g_set_prgname() -- wl_app_id / WM_CLASS binding
 #endif
 
-
-#include <common/Format.h>		// Needed for CFormat
+#include <common/EventIDs.h>        // Needed for ID_SPLASH_POLL_TIMER
+#include <common/Format.h>          // Needed for CFormat
+#include <tags/FileTags.h>          // Needed for FT_MEDIA_* on OnMediaProbeFinished
+#include <common/DataFileVersion.h> // Needed for MET_HEADER (server.met probe)
+#include "CFile.h"                  // Needed for CFile (server.met probe)
 #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
-#include "ExternalConn.h"		// Needed for ExternalConn & MuleConnection
-#include <common/FileFunctions.h>	// Needed for CDirIterator
-#include "FriendList.h"			// Needed for CFriendList
-#include "HTTPDownload.h"		// Needed for CHTTPDownloadThread
-#include "InternalEvents.h"		// Needed for CMuleInternalEvent
-#include "IPFilter.h"			// Needed for CIPFilter
-#include "KnownFileList.h"		// Needed for CKnownFileList
-#include "ListenSocket.h"		// Needed for CListenSocket
-#include "Logger.h"			// Needed for CLogger // Do_not_auto_remove
-#include "MagnetURI.h"			// Needed for CMagnetURI
+#include "ClientCreditsList.h"    // Needed for CClientCreditsList
+#include "ClientList.h"           // Needed for CClientList
+#include "ClientUDPSocket.h"      // Needed for CClientUDPSocket & CMuleUDPSocket
+#include "ExternalConn.h"         // Needed for ExternalConn & MuleConnection
+#include <common/FileFunctions.h> // Needed for CDirIterator
+#include "FriendList.h"           // Needed for CFriendList
+#include "ChatSessionStore.h"     // Needed for CChatSessionStore
+#include "HTTPDownload.h"         // Needed for CHTTPDownloadThread
+#include "InternalEvents.h"       // Needed for CMuleInternalEvent
+#include "IPFilter.h"             // Needed for CIPFilter
+#include "GetTickCount.h"         // Needed for GetTickCount64
+#include "KnownFileList.h"        // Needed for CKnownFileList
+#include "LibSocket.h"            // Needed for SetSocketBindInterface
+#include "ListenSocket.h"         // Needed for CListenSocket
+#include "Logger.h"               // Needed for CLogger // Do_not_auto_remove
+#include "MagnetURI.h"            // Needed for CMagnetURI
+#include "NetworkInterfaces.h"    // Needed for DetectNetworkInterfaces
 #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
-#include "ServerList.h"			// Needed for CServerList
+#include "PartFile.h"                   // Needed for CPartFile
+#include "PlatformSpecific.h"           // Needed for PlatformSpecific::AllowSleepMode();
+#include "Preferences.h"                // Needed for CPreferences
+#include "PublicIPv6Corroboration.h"    // Needed for ObservedPublicIPv6
+#include "SearchList.h"                 // Needed for CSearchList
+#include "Server.h"                     // Needed for GetListName
+#include "ServerList.h"                 // Needed for CServerList
 #include "ServerConnect.h"              // Needed for CServerConnect
-#include "ServerUDPSocket.h"		// Needed for CServerUDPSocket
-#include "Statistics.h"			// Needed for CStatistics
-#include "TerminationProcessAmuleweb.h"	// Needed for CTerminationProcessAmuleweb
+#include "ServerUDPSocket.h"            // Needed for CServerUDPSocket
+#include "Statistics.h"                 // Needed for CStatistics
+#include "AmuleApiCredentials.h"        // Needed for AmuleApiCredentials::RefreshState
+#include <AtomicFile.h>                 // webcommon::WriteFileAtomic0600 for the EC token
+#include <Credentials.h>                // webcommon::EcTokenFilePath / GenerateEcToken
+#include "TerminationProcessAmuleApi.h" // Needed for CTerminationProcessAmuleApi
+#include "TerminationProcessAmuleweb.h" // Needed for CTerminationProcessAmuleweb
 #include "ThreadTasks.h"
-#include "UploadQueue.h"		// Needed for CUploadQueue
-#include "PartFileWriteThread.h"	// Needed for CPartFileWriteThread
-#include "PartFileHashThread.h"		// Needed for CPartFileHashThread
+#include "UploadQueue.h"         // Needed for CUploadQueue
+#include "PartFileWriteThread.h" // Needed for CPartFileWriteThread
+#include "PartFileHashThread.h"  // Needed for CPartFileHashThread
+#include "MediaProbeThread.h"    // Needed for CMediaProbeThread
+#include "FreeSpaceThread.h"     // Needed for CFreeSpaceThread
 #include "UploadBandwidthThrottler.h"
 #include "UploadDiskIOThread.h"
 #include "UserEvents.h"
 #include "ScopedPtr.h"
 
 #ifdef ENABLE_UPNP
-#include "UPnPBase.h"			// Needed for UPnP
+#include "UPnPBase.h" // Needed for UPnP
 #endif
 
 #ifdef __WXMAC__
-#include <wx/sysopt.h>			// Do_not_auto_remove
+#include <wx/sysopt.h> // Do_not_auto_remove
 #endif
 
-#ifndef AMULE_DAEMON
-	#ifdef __WXMAC__
-		#include <CoreFoundation/CFBundle.h>  // Do_not_auto_remove
-		#include <wx/osx/core/cfstring.h>  // Do_not_auto_remove
-	#endif
-	#include <wx/msgdlg.h>
+// Core GeoIP resolver -- headless, now compiled into the daemon too (#439/#440),
+// so its header must be visible outside the GUI-only include block below.
+#include "IP2Country.h"
 
-	#include "amuleDlg.h"
+#ifndef AMULE_DAEMON
+#ifdef __WXMAC__
+#include <CoreFoundation/CFBundle.h> // Do_not_auto_remove
+#include <wx/osx/core/cfstring.h>    // Do_not_auto_remove
 #endif
+#include <wx/msgdlg.h>
 
+#include "amuleDlg.h"
+#include "PrefsUnifiedDlg.h" // For NotifyIP2CountryUpdateFailedIfOpen (GUI popup)
+#include "FirstRunWizard.h"  // Needed for the first-run setup wizard (GUI-only)
+
+// The splash is monolithic-only: amulegui has no local shared-file scan or part-file
+// load to wait on -- its startup cost is an EC round trip -- and the daemon has no GUI.
+#ifndef CLIENT_GUI
+#define AMULE_SHOW_SPLASH 1
+#include "SplashScreen.h"
+// The splash batches both list controls for the length of startup, so it
+// needs the panels that own them.
+#include "TransferWnd.h"      // Needed for CTransferWnd::downloadlistctrl
+#include "SharedFilesWnd.h"   // Needed for CSharedFilesWnd::sharedfilesctrl
+#include "DownloadListCtrl.h" // Needed for Begin/EndBatchUpdate
+#include "SharedFilesCtrl.h"  // Needed for Begin/EndBatchUpdate
+
+// The task type CHashingTask registers itself under. The splash counts only these: the
+// scheduler queue is shared, and the IP-filter load sits on it too, so an unfiltered
+// count would report "hashing" work that is nothing of the sort -- and would keep the
+// splash up waiting for it.
+static const wxString kSplashHashTaskType = "Hashing";
+#endif
+#endif
 
 #ifdef HAVE_SYS_RESOURCE_H
-	#include <sys/resource.h>
+#include <sys/resource.h>
 #endif
 
 #ifdef HAVE_SYS_STATVFS_H
-	#include <sys/statvfs.h>  // Do_not_auto_remove
+#include <sys/statvfs.h> // Do_not_auto_remove
 #endif
 
-
 #ifdef __GLIBC__
-# define RLIMIT_RESOURCE __rlimit_resource
+#define RLIMIT_RESOURCE __rlimit_resource
 #else
-# define RLIMIT_RESOURCE int
+#define RLIMIT_RESOURCE int
 #endif
 
 #ifdef AMULE_DAEMON
@@ -144,7 +186,6 @@
 #endif
 }
 
-
 static void SetResourceLimits()
 {
 #ifdef HAVE_SYS_RESOURCE_H
@@ -163,20 +204,18 @@
 // in the signal handler.
 bool g_shutdownSignal = false;
 
-void OnShutdownSignal( int /* sig */ )
+void OnShutdownSignal(int /* sig */)
 {
 	signal(SIGINT, SIG_DFL);
 	signal(SIGTERM, SIG_DFL);
 
 	g_shutdownSignal = true;
 
-	// The actual shutdown trigger is driven from OnCoreTimer (normal
-	// context) since calling ExitMainLoop() from signal context isn't
-	// async-signal-safe and silently no-ops on macOS's wxAppConsole
-	// event loop.
+	// The actual shutdown trigger is driven from OnCoreTimer (normal context) since
+	// calling ExitMainLoop() from signal context is not async-signal-safe and silently
+	// no-ops on macOS's wxAppConsole event loop.
 }
 
-
 CamuleApp::CamuleApp()
 {
 	// Madcat - Initialize timer as the VERY FIRST thing to avoid any issues later.
@@ -188,35 +227,41 @@
 
 	theApp = &wxGetApp();
 
-	clientlist	= NULL;
-	searchlist	= NULL;
-	knownfiles	= NULL;
-	canceledfiles	= NULL;
-	serverlist	= NULL;
-	serverconnect	= NULL;
-	sharedfiles	= NULL;
-	listensocket	= NULL;
-	clientudp	= NULL;
-	clientcredits	= NULL;
-	friendlist	= NULL;
-	downloadqueue	= NULL;
-	uploadqueue	= NULL;
-	ipfilter	= NULL;
+	clientlist = NULL;
+	chatsessions = nullptr;
+	searchlist = NULL;
+	browsemanager = nullptr;
+	knownfiles = NULL;
+	canceledfiles = NULL;
+	serverlist = NULL;
+	serverconnect = NULL;
+	m_IP2Country = nullptr;
+	sharedfiles = NULL;
+	listensocket = NULL;
+	clientudp = NULL;
+	clientcredits = NULL;
+	friendlist = NULL;
+	downloadqueue = NULL;
+	uploadqueue = NULL;
+	ipfilter = NULL;
 	ECServerHandler = NULL;
-	glob_prefs	= NULL;
-	m_statistics	= NULL;
+	glob_prefs = NULL;
+	m_statistics = NULL;
 	uploadBandwidthThrottler = NULL;
 	uploadDiskIOThread = NULL;
 #ifdef ENABLE_UPNP
-	m_upnp		= NULL;
+	m_upnp = NULL;
 	m_upnpMappings.resize(4);
 #endif
-	core_timer	= NULL;
+	core_timer = NULL;
 	partFileHashThread = NULL;
+	mediaProbeThread = nullptr;
+	freeSpaceThread = nullptr;
 
-	m_localip	= 0;
-	m_dwPublicIP	= 0;
-	webserver_pid	= 0;
+	m_localip = 0;
+	m_dwPublicIP = 0;
+	webserver_pid = 0;
+	amuleapi_pid = 0;
 
 	enable_daemon_fork = false;
 
@@ -224,53 +269,80 @@
 	SetResourceLimits();
 
 #ifdef _MSC_VER
-	_CrtSetDbgFlag(0);		// Disable useless memleak debugging
+	_CrtSetDbgFlag(0); // Disable useless memleak debugging
 #endif
 }
 
 CamuleApp::~CamuleApp()
 {
+	// Headless GeoIP resolver (owned by the core; NULL when GeoIP is
+	// disabled/unsupported). Frees the mmap'd MaxMind DB handle.
+	delete m_IP2Country;
+	m_IP2Country = nullptr;
+
 	// Closing the log-file as the very last thing, since
 	// wxWidgets log-events are saved in it as well.
 	theLogger.CloseLogfile();
 }
 
+#ifdef ENABLE_IP2COUNTRY
+void CamuleApp::EnableIP2Country(bool startup)
+{
+	if (thePrefs::IsGeoIPEnabled()) {
+		if (!m_IP2Country) {
+			m_IP2Country = new CIP2Country(thePrefs::GetConfigDir());
+#ifndef AMULE_DAEMON
+			// Monolithic amule surfaces manual-update ("Update now") failures
+			// as a prefs-dialog popup; the daemon has no dialog and only logs.
+			m_IP2Country->SetUpdateFailedNotifier((const wxString &msg) {
+				PrefsUnifiedDlg::NotifyIP2CountryUpdateFailedIfOpen(msg);
+			});
+#endif
+		}
+		m_IP2Country->Enable();
+		// Auto-update refresh from the selected source so the user sees current data
+		// without opening Preferences. Fires only at startup or a local enable toggle --
+		// NOT on every remote prefs-apply, which would download on each amulegui OK and,
+		// alongside an explicit "Update now", double the request. First-run / missing-file
+		// is handled inside Enable() regardless.
+		if (startup && thePrefs::IsGeoIPAutoUpdate() && m_IP2Country->IsEnabled()) {
+			m_IP2Country->Update();
+		}
+	} else if (m_IP2Country) {
+		m_IP2Country->Disable();
+	}
+}
+#else
+void CamuleApp::EnableIP2Country(bool) {}
+#endif
+
 int CamuleApp::OnExit()
 {
-	// Guard against double-entry: on macOS the EVT_END_SESSION handler calls
-	// OnExit() explicitly (so the destructor chain runs before Cocoa
-	// terminates the process), and wxEntry may also call it on event-loop
-	// teardown. Without the guard the queues would be double-freed.
+	// Guard against double-entry: on macOS the EVT_END_SESSION handler calls OnExit()
+	// explicitly, so the destructor chain runs before Cocoa terminates the process, and
+	// wxEntry may also call it on event-loop teardown. Without the guard the queues would
+	// be double-freed.
 	static bool s_exitDone = false;
 	if (s_exitDone) {
 		return 0;
 	}
 	s_exitDone = true;
 
-	if (m_app_state!=APP_STATE_STARTING) {
+	if (m_app_state != APP_STATE_STARTING) {
 		AddLogLineNS(_("Now, exiting main app..."));
 	}
 
-	// Flush wx's pending-delete queue before tearing down wxConfig:
-	// CamuleGuiApp::ShutDown calls amuledlg->Destroy(), which is lazy
-	// (it schedules deletion on the main-loop tail). On the CMD+Q path
-	// the event loop drains that queue naturally before OnExit runs;
-	// on the macOS Dock right-click → Quit path CamuleGuiApp::OnEndSession
-	// reaches OnExit directly, so without an explicit drain here the
-	// CamuleDlg destructor chain (and CMuleListCtrl::SaveSettings inside
-	// it) never runs against a live wxConfig, and column widths /
-	// sort orders silently fail to persist.
+	// Flush wx's pending-delete queue before tearing down wxConfig: CamuleGuiApp::ShutDown
+	// calls amuledlg->Destroy(), which is lazy. On the CMD+Q path the event loop drains
+	// that queue naturally before OnExit runs; on the macOS Dock right-click -> Quit path
+	// CamuleGuiApp::OnEndSession reaches OnExit directly, so without an explicit drain here
+	// the CamuleDlg destructor chain never runs against a live wxConfig, and whatever it
+	// still persists from there is silently lost.
 	DeletePendingObjects();
 
-	// From wxWidgets docs, wxConfigBase:
-	// ...
-	// Note that you must delete this object (usually in wxApp::OnExit)
-	// in order to avoid memory leaks, wxWidgets won't do it automatically.
-	//
-	// As it happens, you may even further simplify the procedure described
-	// above: you may forget about calling Set(). When Get() is called and
-	// there is no current object, it will create one using Create() function.
-	// To disable this behaviour DontCreateOnDemand() is provided.
+	// From the wxConfigBase docs: this object must be deleted, usually in wxApp::OnExit,
+	// or wxWidgets leaks it -- Get() creates one on demand when none is current, unless
+	// DontCreateOnDemand() was called.
 	delete wxConfigBase::Set((wxConfigBase *)NULL);
 
 	// Save credits
@@ -281,20 +353,40 @@
 		AddLogLineNS(CFormat(_("Terminating amuleweb instance with pid '%d' ... ")) % webserver_pid);
 		wxKillError rc;
 		if (wxKill(webserver_pid, wxSIGTERM, &rc) == -1) {
-			AddLogLineNS(CFormat(_("Killing amuleweb instance with pid '%d' ... ")) % webserver_pid);
+			AddLogLineNS(
+				CFormat(_("Killing amuleweb instance with pid '%d' ... ")) % webserver_pid);
 			if (wxKill(webserver_pid, wxSIGKILL, &rc) == -1) {
 				AddLogLineNS(_("Failed"));
 			}
 		}
 	}
 
-	if (m_app_state!=APP_STATE_STARTING) {
+	// Kill amuleapi if running
+	if (amuleapi_pid) {
+		AddLogLineNS(CFormat(_("Terminating amuleapi instance with pid '%d' ... ")) % amuleapi_pid);
+		wxKillError rc;
+		if (wxKill(amuleapi_pid, wxSIGTERM, &rc) == -1) {
+			AddLogLineNS(
+				CFormat(_("Killing amuleapi instance with pid '%d' ... ")) % amuleapi_pid);
+			if (wxKill(amuleapi_pid, wxSIGKILL, &rc) == -1) {
+				AddLogLineNS(_("Failed"));
+			}
+		}
+	}
+
+	if (m_app_state != APP_STATE_STARTING) {
 		AddLogLineNS(_("aMule OnExit: Terminating core."));
 	}
 
 	delete serverlist;
 	serverlist = NULL;
 
+	// Persist search results for the next startup, while downloadqueue / knownfiles /
+	// canceledfiles -- needed to recompute download status on the next load -- and
+	// searchlist itself are all still alive. Must run before the delete below.
+	if (searchlist) {
+		searchlist->StoreSearches();
+	}
 	delete searchlist;
 	searchlist = NULL;
 
@@ -304,6 +396,9 @@
 	delete friendlist;
 	friendlist = NULL;
 
+	delete chatsessions;
+	chatsessions = nullptr;
+
 	// Destroying CDownloadQueue calls destructor for CPartFile
 	// calling CSharedFileList::SafeAddKFile occasionally.
 	delete sharedfiles;
@@ -324,12 +419,19 @@
 	delete canceledfiles;
 	canceledfiles = NULL;
 
+	// Immediately before clientlist, and after everything that destroys clients on its way
+	// out -- serverconnect, listensocket, clientudp. Each of those reaps peers through
+	// CClientList::RemoveClient, which asks the manager to let go of any browse of them;
+	// deleting it earlier left that call reaching through a dangling pointer whenever a
+	// peer socket was still open at exit.
+	delete browsemanager;
+	browsemanager = nullptr;
+
 	delete clientlist;
 	clientlist = NULL;
 
-	// Stop upload disk I/O thread before deleting uploadqueue — the thread
-	// iterates uploadqueue->GetUploadingList() and will crash if it runs
-	// after uploadqueue is freed.
+	// Stop the upload disk I/O thread before deleting uploadqueue -- the thread iterates
+	// uploadqueue->GetUploadingList() and will crash if it runs after uploadqueue is freed.
 	if (uploadDiskIOThread) {
 		uploadDiskIOThread->EndThread();
 		delete uploadDiskIOThread;
@@ -339,6 +441,24 @@
 	delete uploadqueue;
 	uploadqueue = NULL;
 
+	// Stop the media-probe worker: it is independent of the download pipeline, so tear it
+	// down early. Queued probes are dropped; any in-flight ffprobe is bounded by
+	// MediaProbe's timeout.
+	if (mediaProbeThread) {
+		mediaProbeThread->EndThread();
+		delete mediaProbeThread;
+		mediaProbeThread = nullptr;
+	}
+
+	// Same for the free-space worker, and for the same reason it exists: stopping it here
+	// means nothing later in this teardown can be held up by a probe waiting on an
+	// unresponsive mount. It reads no preferences of its own.
+	if (freeSpaceThread) {
+		freeSpaceThread->EndThread();
+		delete freeSpaceThread;
+		freeSpaceThread = nullptr;
+	}
+
 	// Stop hash thread first so any in-flight HashSinglePart finishes
 	// and m_pendingHashes drops to 0 before ~CPartFile waits on it.
 	if (partFileHashThread) {
@@ -347,7 +467,7 @@
 		partFileHashThread = NULL;
 	}
 
-	// Stop write thread before deleting downloadqueue — must drain pending writes.
+	// Stop write thread before deleting downloadqueue -- must drain pending writes.
 	if (partFileWriteThread) {
 		partFileWriteThread->EndThread();
 		delete partFileWriteThread;
@@ -375,7 +495,7 @@
 	glob_prefs = NULL;
 	CPreferences::EraseItemList();
 
-	// Shut down disk I/O thread before throttler — eMule ref: emule.cpp shutdown order
+	// Shut down disk I/O thread before throttler -- eMule ref: emule.cpp shutdown order
 	if (uploadDiskIOThread) {
 		uploadDiskIOThread->EndThread();
 		delete uploadDiskIOThread;
@@ -388,20 +508,17 @@
 	delete m_AsioService;
 	m_AsioService = NULL;
 
-	wxSocketBase::Shutdown();	// needed because we also called Initialize() manually
+	wxSocketBase::Shutdown(); // needed because we also called Initialize() manually
 
-	if (m_app_state!=APP_STATE_STARTING) {
+	if (m_app_state != APP_STATE_STARTING) {
 		AddLogLineNS(_("aMule shutdown completed."));
 	}
 
 #if wxUSE_MEMORY_TRACING
 	AddLogLineNS(_("Memory debug results for aMule exit:"));
 	// Log mem debug messages to wxLogStderr
-	wxLog* oldLog = wxLog::SetActiveTarget(new wxLogStderr);
-	//AddLogLineNS("**************Classes**************";
-	//wxDebugContext::PrintClasses();
-	//AddLogLineNS("***************Dump***************";
-	//wxDebugContext::Dump();
+	wxLog *oldLog = wxLog::SetActiveTarget(new wxLogStderr);
+	// wxDebugContext::PrintClasses() / Dump() also available here.
 	AddLogLineNS("***************Stats**************");
 	wxDebugContext::PrintStatistics(true);
 
@@ -411,72 +528,78 @@
 
 	StopTickTimer();
 
-	// wxWebSession's destructor is unsafe to run at wx module cleanup
-	// time on every platform we ship:
+	// wxWebSession's destructor is unsafe to run at wx module cleanup time on every
+	// platform we ship:
 	//
-	//   macOS (wxWebSessionURLSession, wx 3.3.2): releases the
-	//     NSURLSession and its delegate separately without first
-	//     calling -invalidateAndCancel. NSURLSession retains the
-	//     delegate strongly, so the session's dealloc already drops
-	//     the delegate ref; wx's subsequent release hits a freed
-	//     object and aborts with "pointer being freed was not
-	//     allocated".
+	//   macOS (wxWebSessionURLSession, wx 3.3.2): releases the NSURLSession and its
+	//     delegate separately without first calling -invalidateAndCancel. NSURLSession
+	//     retains the delegate strongly, so the session's dealloc already drops the
+	//     delegate ref; wx's subsequent release hits a freed object and aborts with
+	//     "pointer being freed was not allocated".
 	//
-	//   Linux (wxWebSessionCURL, wx 3.2.6): the dtor calls
-	//     curl_multi_cleanup, which invokes the registered socket
-	//     callback (wxWebSessionCURL::SocketCallback) to drop tracked
-	//     sockets. That callback dereferences session state that the
-	//     dtor's earlier steps have already torn down; a wxASSERT
-	//     fires and the fatal-signal handler raise(SIGABRT)s. Reported
-	//     in amule-org/amule#18 with a fully symbolicated backtrace.
+	//   Linux (wxWebSessionCURL, wx 3.2.6): the dtor calls curl_multi_cleanup, which
+	//     invokes the registered socket callback to drop tracked sockets. That callback
+	//     dereferences session state the dtor's earlier steps have already torn down; a
+	//     wxASSERT fires and the fatal-signal handler raise(SIGABRT)s.
 	//
-	//   Windows (wxWebSessionWinHTTP): not observed to crash but the
-	//     same class of cleanup-time race is plausible.
-	//
-	// By this point in OnExit we have saved state, joined threads,
-	// and flushed logs — nothing aMule-owned remains to clean up.
-	// _Exit bypasses atexit and static destructors, so the buggy wx
-	// dtor never runs and the process terminates cleanly. Remove this
-	// once the upstream wx fix lands in a release we depend on.
+	//   Windows (wxWebSessionWinHTTP): not observed to crash, but the same class of
+	//     cleanup-time race is plausible.
+	ReleaseSingleInstance();
 	std::_Exit(0);
 
 	// Return 0 for successful program termination
 	return AMULE_APP_BASE::OnExit();
 }
 
-
 int CamuleApp::InitGui(bool, wxString &)
 {
 	return 0;
 }
 
+// Probe server.met for actual server entries rather than mere existence.
+// ~CServerList() calls SaveServerMet() unconditionally whenever eD2k is enabled, so a
+// cancelled first run with zero servers still leaves a valid-but-empty file (header
+// 0xE0 + a uint32 count of 0). Checking the count, not just the file, is what keeps the
+// bootstrap page from re-offering the download after such a run.
+static bool ServerMetHasServers(const wxString &path)
+{
+	if (!wxFileExists(path)) {
+		return false;
+	}
+	try {
+		CFile file(path, CFile::read);
+		if (!file.IsOpened()) {
+			return false;
+		}
+		uint8_t version = file.ReadUInt8();
+		if (version != 0xE0 && version != MET_HEADER) {
+			return false;
+		}
+		return file.ReadUInt32() > 0;
+	} catch (const CSafeIOException &) {
+		return false;
+	}
+}
 
-//
 // Application initialization
-//
 bool CamuleApp::OnInit()
 {
 #if wxUSE_MEMORY_TRACING
 	// any text before call of Localize_mule needs not to be translated.
-	AddLogLineNS("Checkpoint set on app init for memory debug");	// debug output
+	AddLogLineNS("Checkpoint set on app init for memory debug"); // debug output
 	wxDebugContext::SetCheckpoint();
 #endif
 
 #if defined(__WXGTK__) && !defined(__APPLE__)
-	// Set the GTK program name to the canonical app id. On Wayland,
-	// GTK derives wl_app_id (xdg_toplevel.set_app_id) from
-	// g_get_prgname(); compositors match wl_app_id against the
-	// .desktop filename to bind windows to launcher icons. Without
-	// this the binding falls back to argv0, which differs across
-	// packaging formats (AppImage's argv0 is "aMule", distro
-	// installs use "amule", Flatpak renames the .desktop entirely).
-	// On X11 the same value also feeds into WM_CLASS, matching
-	// StartupWMClass=org.amule.aMule in the .desktop file. Must run
-	// before any GTK window is created.
-	// Skipped on macOS even under wxGTK (MacPorts): no Wayland or
-	// .desktop binding exists, and app identity is set via Info.plist
-	// in the .app bundle. Dropping the call lets that build skip the
-	// glib2 dep entirely (#641).
+	// Set the GTK program name to the canonical app id. On Wayland, GTK derives wl_app_id
+	// from g_get_prgname(), and compositors match wl_app_id against the .desktop filename
+	// to bind windows to launcher icons. Without this the binding falls back to argv0,
+	// which differs across packaging formats. On X11 the same value feeds WM_CLASS,
+	// matching StartupWMClass in the .desktop file. Must run before any GTK window is
+	// created.
+	//
+	// Skipped on macOS even under wxGTK: no Wayland or .desktop binding exists, and app
+	// identity is set via Info.plist. Dropping the call lets that build skip glib2.
 	g_set_prgname("org.amule.aMule");
 #endif
 
@@ -502,13 +625,11 @@
 #endif
 
 #ifdef __WINDOWS__
-	// wxWebRequest is backed by libcurl on MSYS2 (MINGW64 / CLANGARM64)
-	// builds. MSYS2 libcurl is compiled with `--with-ca-bundle=` pointing
-	// at an absolute MSYS2 path that does not exist on end-user machines,
-	// so HTTPS (and any HTTP→HTTPS redirect — e.g. SourceForge) fails
-	// with "libcurl error 77: Problem with the SSL CA cert". CMake's
-	// install step ships a ca-bundle.crt next to the .exe; point
-	// CURL_CA_BUNDLE at it here if the user has not set one explicitly.
+	// wxWebRequest is backed by libcurl on MSYS2 builds, and MSYS2 libcurl is compiled with
+	// `--with-ca-bundle=` pointing at an absolute MSYS2 path that does not exist on end-user
+	// machines, so HTTPS -- and any HTTP->HTTPS redirect -- fails with "libcurl error 77".
+	// CMake's install step ships a ca-bundle.crt next to the .exe; point CURL_CA_BUNDLE at
+	// it unless the user set one explicitly.
 	{
 		wxString existing;
 		if (!wxGetEnv("CURL_CA_BUNDLE", &existing) || existing.IsEmpty()) {
@@ -530,57 +651,64 @@
 
 	glob_prefs = new CPreferences();
 
-	CPath outDir;
-	if (CheckMuleDirectory("temp", thePrefs::GetTempDir(), thePrefs::GetConfigDir() + "Temp", outDir)) {
-		thePrefs::SetTempDir(outDir);
-	} else {
-		return false;
+	// Push the bind-to-interface preference into the socket library before any socket is
+	// opened -- mulesocket cannot read CPreferences itself. It is a security-relevant
+	// choice (VPN-leak prevention), so make the outcome visible: confirm the bind when it
+	// applies, and warn loudly when it does not, or traffic silently stays on the default
+	// route.
+	const wxString &bindInterface = thePrefs::GetNetworkInterface();
+	SetSocketBindInterface(bindInterface);
+	switch (TestSocketBindInterface(bindInterface)) {
+	case BindIface_Empty:
+		break; // no interface configured -- nothing to report
+	case BindIface_OK:
+#ifdef __WINDOWS__
+		// On Windows only the ed2k/Kad sockets are bound; aMule's HTTP uses the WinHTTP
+		// backend, which has no interface-bind API -- so say so rather than overclaim.
+		AddLogLineN(CFormat(_("Binding aMule's peer-to-peer traffic to interface: %s "
+				      "(HTTP updates use the default route)")) %
+			    bindInterface);
+#else
+		AddLogLineN(CFormat(_("Binding all network traffic to interface: %s")) % bindInterface);
+#endif
+		break;
+	case BindIface_NotFound:
+		AddLogLineC(CFormat(_("WARNING: configured network interface '%s' was not found - "
+				      "traffic is NOT bound to it and may leave via the default "
+				      "route. Check the interface name in Preferences.")) %
+			    bindInterface);
+		break;
+	case BindIface_Denied:
+		AddLogLineC(CFormat(_("WARNING: binding to network interface '%s' requires elevated "
+				      "privileges and was NOT applied - traffic may leave via the "
+				      "default route. Grant the capability (e.g. 'sudo setcap "
+				      "cap_net_raw+ep' on the aMule binary) or run with sufficient "
+				      "privileges.")) %
+			    bindInterface);
+		break;
+	default:
+		AddLogLineC(CFormat(_("WARNING: could not bind to network interface '%s' - traffic "
+				      "may leave via the default route.")) %
+			    bindInterface);
+		break;
 	}
 
-	if (CheckMuleDirectory("incoming", thePrefs::GetIncomingDir(), thePrefs::GetConfigDir() + "Incoming", outDir)) {
-		thePrefs::SetIncomingDir(outDir);
-	} else {
-		return false;
-	}
+	// The temp / incoming directories are validated and created further down, after the
+	// first-run wizard has had a chance to point them somewhere else.
 
 	// Initialize wx sockets (needed for http download in background with Asio sockets)
 	wxSocketBase::Initialize();
 
-#if defined(__WXGTK__) && !defined(WITH_LIBAYATANA_APPINDICATOR)
-	// On Linux without libayatana-appindicator3 the tray icon falls
-	// back to the legacy GtkStatusIcon backend, which GNOME Shell
-	// dropped in 3.26 and wlroots-based compositors never picked up
-	// — the icon is silently invisible. Force the pref off so users
-	// don't end up with the window hidden via HideOnClose and no
-	// surface to bring it back. The existing sanity check below
-	// will then cascade MinToTray off as well.
-	thePrefs::SetUseTrayIcon(false);
-#endif
-
-#ifdef __WXGTK__
-	// xdg-shell intentionally doesn't deliver iconified-state
-	// notifications to clients, so on Wayland the system minimize
-	// button cannot trigger our Show(false) hide-to-tray path.
-	// The same gap is documented in qBittorrent #17265, Telegram
-	// #2123, KeePassXC #6502 and others. Force MinToTray off when
-	// running under a Wayland session so the option doesn't appear
-	// to "do nothing" — the prefs panel also greys the checkbox.
-	if (CamuleAppCommon::IsWaylandSession()) {
-		thePrefs::SetMinToTray(false);
-	}
-#endif
-
-	// Some sanity check
-	if (!thePrefs::UseTrayIcon()) {
-		thePrefs::SetMinToTray(false);
-	}
+	// Before InitGui() below builds the window that these settings decide
+	// how to hide. amulegui does the same from Startup().
+	SanitiseTrayPreferences();
 
 	// Build the filenames for the two OS files
 	SetOSFiles(thePrefs::GetOSDir().GetRaw());
 
 	// Check if we have the old style locale config
 	bool old_localedef = false;
-	wxString langId = thePrefs::GetLanguageID();
+	const wxString &langId = thePrefs::GetLanguageID();
 	if (!langId.IsEmpty() && (langId.GetChar(0) >= '0' && langId.GetChar(0) <= '9')) {
 		old_localedef = true;
 		thePrefs::SetLanguageID(wxLang2Str(wxLANGUAGE_DEFAULT));
@@ -592,7 +720,10 @@
 	Localize_mule();
 
 	if (old_localedef) {
-		ShowAlert(_("Your locale has been changed to System Default due to a configuration change. Sorry."), _("Info"), wxCENTRE | wxOK | wxICON_ERROR);
+		ShowAlert(_("Your locale has been changed to System Default due to a configuration change. "
+			    "Sorry."),
+			_("Info"),
+			wxCENTRE | wxOK | wxICON_ERROR);
 	}
 #endif
 
@@ -606,79 +737,122 @@
 
 #ifndef __WINDOWS__
 	if (getuid() == 0) {
-		wxString msg =
-			"Warning! You are running aMule as root.\n"
-			"Doing so is not recommended for security reasons,\n"
-			"and you are advised to run aMule as an normal\n"
-			"user instead.";
+		wxString msg = "Warning! You are running aMule as root.\n"
+			       "Doing so is not recommended for security reasons,\n"
+			       "and you are advised to run aMule as an normal\n"
+			       "user instead.";
 
 		ShowAlert(msg, _("WARNING"), wxCENTRE | wxOK | wxICON_ERROR);
 
 		fprintf(stderr, "\n--------------------------------------------------\n");
-		fprintf(stderr, "%s", (const char*)unicode2UTF8(msg));
+		fprintf(stderr, "%s", (const char *)unicode2UTF8(msg));
 		fprintf(stderr, "\n--------------------------------------------------\n\n");
 	}
 #endif
 
 	// Display notification on new version or first run
-	wxTextFile vfile( thePrefs::GetConfigDir() + "lastversion" );
+	wxTextFile vfile(thePrefs::GetConfigDir() + "lastversion");
 	wxString newMule(VERSION);
 
-	if ( !wxFileExists( vfile.GetName() ) ) {
+	if (!wxFileExists(vfile.GetName())) {
 		vfile.Create();
 	}
 
-	if ( vfile.Open() ) {
+	if (vfile.Open()) {
 		// Check if this version has been run before
 		bool found = false;
-		for ( size_t i = 0; i < vfile.GetLineCount(); i++ ) {
+		for (size_t i = 0; i < vfile.GetLineCount(); i++) {
 			// Check if this version has been run before
-			if ( vfile.GetLine(i) == newMule ) {
+			if (vfile.GetLine(i) == newMule) {
 				found = true;
 				break;
 			}
 		}
 
 		// We haven't run this version before?
-		if ( !found ) {
+		if (!found) {
 			// Insert new at top to provide faster searches
-			vfile.InsertLine( newMule, 0 );
+			vfile.InsertLine(newMule, 0);
 
-			Trigger_New_version( newMule );
+			Trigger_New_version(newMule);
 		}
 
 		// Keep at most 10 entries
-		while ( vfile.GetLineCount() > 10 )
-			vfile.RemoveLine( vfile.GetLineCount() - 1 );
+		while (vfile.GetLineCount() > 10)
+			vfile.RemoveLine(vfile.GetLineCount() - 1);
 
 		vfile.Write();
 		vfile.Close();
 	}
 
+	// First launch: run the guided setup wizard before the network stack comes up, so the
+	// chosen ports, enabled networks and UPnP setting take effect when
+	// ReinitializeNetwork() runs below. The wizard applies and saves every preference it
+	// collects; it only hands back which bootstrap files to fetch.
+#ifndef AMULE_DAEMON
+	bool firstRunWizardShown = false;
+	bool wizardWantsServerMet = false;
+	bool wizardWantsNodesDat = false;
+	// Gate on the explicit "wizard completed" flag rather than the inferred first-run flag:
+	// a cancelled wizard leaves the flag unset, so it reappears next launch until the user
+	// actually finishes it.
+	if (!thePrefs::IsFirstRunWizardDone()) {
+		// Only offer a bootstrap download when the corresponding data is actually missing:
+		// the wizard can reappear after a cancelled run, and by then the user may already
+		// have populated server.met -- probed for real entries, since a cancelled run leaves
+		// an empty one -- or nodes.dat.
+		const bool needServerMet = thePrefs::GetNetworkED2K() &&
+					   !ServerMetHasServers(thePrefs::GetConfigDir() + "server.met");
+		const bool needNodesDat = thePrefs::GetNetworkKademlia() &&
+					  !wxFileExists(thePrefs::GetConfigDir() + "nodes.dat");
+
+		FirstRunWizard::Result wiz = FirstRunWizard::Run(NULL, needServerMet, needNodesDat);
+		firstRunWizardShown = true;
+		wizardWantsServerMet = wiz.downloadServerMet;
+		wizardWantsNodesDat = wiz.downloadNodesDat;
+	}
+#endif
+
+	// Validate (and create if needed) the temp / incoming directories.
+	// Deferred to here so the first-run wizard above could redirect them.
+	CPath outDir;
+	if (CheckMuleDirectory("temp", thePrefs::GetTempDir(), thePrefs::GetConfigDir() + "Temp", outDir)) {
+		thePrefs::SetTempDir(outDir);
+	} else {
+		return false;
+	}
+	if (CheckMuleDirectory(
+		    "incoming", thePrefs::GetIncomingDir(), thePrefs::GetConfigDir() + "Incoming", outDir)) {
+		thePrefs::SetIncomingDir(outDir);
+	} else {
+		return false;
+	}
+
 	m_statistics = new CStatistics();
 
-	clientlist	= new CClientList();
-	friendlist	= new CFriendList();
-	searchlist	= new CSearchList();
-	knownfiles	= new CKnownFileList();
-	canceledfiles	= new CCanceledFileList;
-	serverlist	= new CServerList();
+	clientlist = new CClientList();
+	friendlist = new CFriendList();
+	chatsessions = new CChatSessionStore();
+	searchlist = new CSearchList();
+	browsemanager = new CBrowseManager();
+	knownfiles = new CKnownFileList();
+	canceledfiles = new CCanceledFileList;
+	serverlist = new CServerList();
 
-	sharedfiles	= new CSharedFileList(knownfiles);
-	clientcredits	= new CClientCreditsList();
+	sharedfiles = new CSharedFileList(knownfiles);
+	clientcredits = new CClientCreditsList();
 
 	// bugfix - do this before creating the uploadqueue
-	downloadqueue	= new CDownloadQueue();
-	uploadqueue	= new CUploadQueue();
-	// partFileWriteThread / partFileHashThread are constructed AFTER
-	// InitGui() further down — both spawn a wxThread in their ctor,
-	// and the amuled `-f` fork only carries the calling thread to the
-	// child. Constructing them here (pre-fork) would leave the C++
-	// objects alive in the daemon child with their POSIX threads gone,
-	// so FlushBuffer's PB_PENDING items would never drain and the
-	// `.part` file would stay at 0 bytes despite the network side
-	// happily receiving chunks (#849).
-	ipfilter	= new CIPFilter();
+	downloadqueue = new CDownloadQueue();
+	uploadqueue = new CUploadQueue();
+
+	// partFileWriteThread / partFileHashThread are constructed AFTER InitGui() further
+	// down: both spawn a wxThread in their ctor, and the amuled `-f` fork only carries the
+	// calling thread to the child. Constructing them pre-fork would leave the C++ objects
+	// alive in the daemon child with their POSIX threads gone, so FlushBuffer's PB_PENDING
+	// items would never drain and the `.part` file would stay at 0 bytes while the network
+	// side received chunks.
+	ipfilter = new CIPFilter();
 
 	// Creates all needed listening sockets
 	wxString msg;
@@ -687,17 +861,43 @@
 		AddLogLineNS(msg);
 	}
 
-	// The GitHub version check and the server.met auto-update used to be
-	// fired from here, before the partfile load + 91k-shared-file scan
-	// run further down. On busy setups the wxWebSession worker thread
-	// then competes with the saturated main thread for CPU, libcurl's
-	// state machine advances less, and DNS resolution can time out
-	// (#714). Both startup HTTP downloads now fire after
-	// sharedfiles->Reload() returns below.
+	// The GitHub version check and the server.met auto-update used to fire from here,
+	// before the partfile load and shared-file scan below. On busy setups the wxWebSession
+	// worker then competes with the saturated main thread for CPU, libcurl's state machine
+	// advances less, and DNS resolution can time out. Both now fire after
+	// sharedfiles->Reload() returns.
 
 	// Create main dialog, or fork to background (daemon).
 	InitGui(m_geometryEnabled, m_geometryString);
 
+#ifdef AMULE_SHOW_SPLASH
+	// Up before the heavy local I/O below, which holds the main thread long enough that the
+	// main window -- already created by InitGui -- never gets painted. Shown here rather
+	// than earlier so it does not outlive a failed GUI init.
+	CSplashScreen *splash = new CSplashScreen(theApp->amuledlg);
+	m_splash = splash;
+	splash->Show();
+
+	// Both list controls are batched for the whole startup: part-file loading fills the
+	// download list and the scan plus hashing fill the shared list, and each
+	// individually-sorted insert rebuilds the row index, so a burst of thousands is
+	// quadratic. BeginBatchUpdate turns those into appends plus one sort at the end, held
+	// until the hash queue drains.
+	if (theApp->amuledlg && theApp->amuledlg->m_transferwnd &&
+		theApp->amuledlg->m_transferwnd->downloadlistctrl) {
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->BeginBatchUpdate();
+	}
+	if (theApp->amuledlg && theApp->amuledlg->m_sharedfileswnd &&
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->BeginBatchUpdate();
+	}
+	// One pump so the window is mapped and painted before the phases start; from here on
+	// SetProgress repaints without running the event loop, so a half-initialised
+	// application cannot be clicked into.
+	wxYield();
+	const wxLongLong splashPhaseStart = wxGetUTCTimeMillis();
+#endif
+
 #ifdef AMULE_DAEMON
 	// Need to refresh wxSingleInstanceChecker after the daemon fork() !
 	if (enable_daemon_fork) {
@@ -706,64 +906,205 @@
 	}
 #endif
 
-	// Has to be created after the call to InitGui, as fork
-	// (when using posix threads) only replicates the mainthread,
-	// and the UBT constructor creates a thread.
+	// Has to be created after the call to InitGui: fork (when using posix threads) only
+	// replicates the main thread, and the UBT constructor creates a thread.
 	uploadBandwidthThrottler = new UploadBandwidthThrottler();
 
-	// Start disk I/O thread — must be after uploadBandwidthThrottler.
+	// Start disk I/O thread -- must be after uploadBandwidthThrottler.
 	// eMule ref: emule.cpp:748
 	uploadDiskIOThread = new CUploadDiskIOThread();
 
-	// Download disk-write and hashing threads. Same constraint as the
-	// upload disk I/O thread above: each ctor calls wxThread::Run(),
-	// and amuled's `-f` fork above only carries the calling thread to
-	// the child. Constructing them post-fork ensures the spawned
-	// POSIX threads belong to the daemon child and actually drain the
-	// PartFileBufferedData queue (#849).
+	// Download disk-write and hashing threads. Same constraint as the upload disk I/O
+	// thread above: each ctor calls wxThread::Run(), and amuled's `-f` fork only carries
+	// the calling thread to the child. Constructing them post-fork ensures the spawned
+	// POSIX threads belong to the child and actually drain the PartFileBufferedData queue.
 	partFileWriteThread = new CPartFileWriteThread();
 	partFileHashThread = new CPartFileHashThread();
+	// Dedicated worker for ffprobe metadata, isolated from the shared
+	// CThreadScheduler so a slow or hung probe can never stall completions.
+	mediaProbeThread = new CMediaProbeThread();
+	// Dedicated worker for the free-space probe, isolated for the same reason: statvfs()
+	// blocks on the directory, and temp or incoming is commonly a network mount. Given its
+	// paths straight away so the panels have a figure without waiting for the first core
+	// tick.
+	freeSpaceThread = new CFreeSpaceThread();
+	freeSpaceThread->SetPaths(thePrefs::GetTempDir(), thePrefs::GetIncomingDir());
 
 	m_AsioService = new CAsioService;
 
-	// 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.
+	// Start performing background tasks. This starts loading the IP filter right away; the
+	// log is confusing, because background log entries only print once the foreground goes
+	// idle, which is after the partfiles have loaded.
 	CThreadScheduler::Start();
 
 	// These must be initialized after the gui is loaded.
+#ifdef AMULE_SHOW_SPLASH
+	// Bands per phase, sized from the timings this block logs. Measured on a 10 000-file
+	// share: network setup came to 10 ms and 400 part files to 130 ms, against 6010 ms of
+	// scanning, so the early phases get almost nothing -- an even split would leave the bar
+	// parked at a third for the whole visible wait. The shared scan has no total until it
+	// finishes, and counting first would walk the tree twice; known.met is last session's
+	// view of the same tree, so it is the best estimate available.
+	const size_t sharedEstimate = knownfiles ? knownfiles->GetKnownFileCount() : 0;
+
+	// Weight the temp band by cost rather than by item count. On the same share with 400
+	// part files: 130 ms to load them against 6010 ms to scan 10 000 files, i.e. 0.33 ms
+	// each against 0.60 ms -- a part file is actually the cheaper item, since loading one
+	// reads its .met and only stats the .part. Two rather than one leaves room for the
+	// populated ones a real Temp directory holds. Capped well short of half the bar: the
+	// scan is the phase that usually runs long, and it must keep room to show it.
+	constexpr int kPartFileWeight = 2;
+	constexpr int kNetworkBandEnd = 2;
+	constexpr int kTempBandMaxEnd = 40;
+	constexpr int kScanBandEnd = 100;
+
+	splash->SetProgress(_("Initializing network"), 0, true);
+#endif
 	if (thePrefs::GetNetworkED2K()) {
 		serverlist->Init();
 	}
+
+#ifdef AMULE_SHOW_SPLASH
+	const wxLongLong networkDoneAt = wxGetUTCTimeMillis();
+	splash->SetProgress(_("Loading temp files"), kNetworkBandEnd, true);
+	// Part-file totals are exact: LoadMetFiles enumerates the directory into a vector
+	// before loading any of them, so the band end can be sized against the shared estimate
+	// on the first callback.
+	size_t partFilesLoaded = 0;
+	int tempBandEnd = kNetworkBandEnd;
+	downloadqueue->LoadMetFiles(thePrefs::GetTempDir(), &(size_t loaded, size_t total) {
+		if (partFilesLoaded == 0) {
+			partFilesLoaded = total;
+			const size_t weighted = kPartFileWeight * total;
+			const size_t whole = weighted + sharedEstimate;
+			tempBandEnd = kNetworkBandEnd +
+				      static_cast<int>(((kScanBandEnd - kNetworkBandEnd) * weighted) / whole);
+			tempBandEnd = std::min(tempBandEnd, kTempBandMaxEnd);
+		}
+		const int percent = kNetworkBandEnd +
+				    static_cast<int>(((tempBandEnd - kNetworkBandEnd) * loaded) / total);
+		splash->SetProgress(CFormat(_("Loading temp files (%u of %u)")) % loaded % total, percent);
+	});
+	const wxLongLong tempDoneAt = wxGetUTCTimeMillis();
+
+	// With no known.met -- a first run -- there is no estimate, so the bar holds at the band
+	// start and the count in the status text carries the information instead. That is also
+	// the run where everything found needs hashing, so the held-back band is not wasted:
+	// the hashing phase below spends it.
+	const int scanBandEnd = (sharedEstimate > 0) ? kScanBandEnd : tempBandEnd;
+	splash->SetProgress(_("Loading shared files"), tempBandEnd, true);
+	// Kept for the log line below: the scan reports its running count to the splash but had
+	// no way to report the final one, so the estimate was printed with nothing to compare
+	// it against.
+	size_t sharedScanned = 0;
+	sharedfiles->Reload(&(size_t scanned) {
+		sharedScanned = scanned;
+		int percent = tempBandEnd;
+		if (sharedEstimate > 0) {
+			// Clamped below the band end: an estimate that undershoots must
+			// not park the bar at 100% while the scan is still running.
+			const size_t capped = std::min(scanned, sharedEstimate);
+			percent = tempBandEnd +
+				  static_cast<int>(((scanBandEnd - tempBandEnd) * capped) / sharedEstimate);
+		}
+		splash->SetProgress(CFormat(_("Loading shared files (%u)")) % scanned, percent);
+		return true;
+	});
+	const wxLongLong sharedDoneAt = wxGetUTCTimeMillis();
+
+	// Normal level, not debug: these are the numbers the phase weighting above is meant to
+	// be tuned from, and a measurement that needs verbose logging turned on first is one
+	// nobody will report back. Both phases report count then duration, and the estimate
+	// says what it estimates -- it is a file count from known.met, and printing it as a
+	// bare number after a millisecond figure read as an estimated duration.
+	AddLogLineN(CFormat(LOG_DIAGNOSTIC("Startup phases: network %lld ms, %u part files %lld ms, shared "
+					   "scan %u files ") "%lld ms (estimated %u files)") %
+		    (networkDoneAt - splashPhaseStart).GetValue() % partFilesLoaded %
+		    (tempDoneAt - networkDoneAt).GetValue() % sharedScanned %
+		    (sharedDoneAt - tempDoneAt).GetValue() % sharedEstimate);
+
+	// The scan has everything it is going to have: the files it recognised are listed, and
+	// the ones it did not are now queued for hashing. That drain is the slowest part of a
+	// first run by a wide margin -- hashing cost scales with bytes, not files -- and it
+	// used to hold the splash up with it, so a large share of new files left the
+	// application unreachable. The window goes up here instead, and the drain finishes
+	// behind it.
+	splash->SetProgress(_("Starting up"), 100, true);
+	ShowMainWindowAfterScan();
+
+	const size_t pendingHashes = CThreadScheduler::GetPendingCount(kSplashHashTaskType);
+	if (pendingHashes == 0) {
+		FinishStartupHashing();
+	} else {
+		// Each completion appends its row (the batch is still open, so that stays O(1)) and
+		// the tick below sorts them into place, keeping the list ordered without paying a
+		// row-index rebuild per file.
+		UpdateStartupHashProgress();
+		if (theApp->amuledlg && theApp->amuledlg->m_sharedfileswnd &&
+			theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
+			// Rows from the drain are announced to the model once per tick
+			// rather than once per file; see SetStartupDrainMode().
+			theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->SetStartupDrainMode(true);
+		}
+		m_splashPollTimer.SetOwner(this, ID_SPLASH_POLL_TIMER);
+		Bind(wxEVT_TIMER, &CamuleApp::OnSplashPollTimer, this, ID_SPLASH_POLL_TIMER);
+		// Once a second: this is the sort cadence now, not a counter
+		// animation, and GetPendingCount() takes the scheduler's lock.
+		m_splashPollTimer.Start(1000);
+	}
+#else
 	downloadqueue->LoadMetFiles(thePrefs::GetTempDir());
 	sharedfiles->Reload();
+#endif
+
+	// Restore search results saved on a previous clean shutdown (StoredSearches.met).
+	// Registering each restored search with the EC multi-search registry makes it reachable
+	// via EC_OP_SEARCH_LIST for any client that connects later.
+	//
+	// Deliberately *after* LoadMetFiles() and sharedfiles->Reload(), not merely after those
+	// objects are constructed. LoadSearches() recomputes each restored result's download
+	// status through SetDownloadStatus(), which asks three lists whether they know the
+	// hash. knownfiles and canceledfiles load in their own constructors, but
+	// CDownloadQueue's constructor only makes an empty queue and it is LoadMetFiles() that
+	// fills it -- so running the restore first meant every result asked an empty download
+	// queue and came back NEW instead of QUEUED. Nothing corrected it afterwards either:
+	// LoadMetFiles() appends to m_filelist directly rather than through AddDownload(), so
+	// UpdateSearchFileByHash() never fires.
+	for (uint32_t restoredId : searchlist->LoadSearches()) {
+		RegisterRestoredSearch(restoredId);
+	}
+	// The monolithic search tabs are built from what the loop above just restored, so they
+	// follow it rather than sitting in InitGui() where the list is still empty. No-op on
+	// the daemon.
+	RestoreSearchTabs();
+
+	// Source seeds need two things: the part files they belong to, loaded just above, and a
+	// filter to check the seeded IPs against, which the load-finished handler waits for
+	// before running this same load. When the filter wins that race the handler runs first
+	// and iterates an empty queue, dropping every seed, so run it again here. Re-adding a
+	// source already in the queue is a no-op, so the overlap is harmless.
+	if (thePrefs::GetSrcSeedsOn() && ipfilter->IsReady()) {
+		downloadqueue->LoadSourceSeeds();
+	}
 
 	// Fire the deferred startup HTTP downloads now that the heavy local
-	// I/O is done — see the comment in OnInit() further up.
+	// I/O is done -- see the comment in OnInit() further up.
+#ifdef ENABLE_VERSION_CHECK
+	// Both the daemon and the monolithic app run the core version check: it updates the
+	// internal state relayed over EC and, on the monolithic, drives the GUI popup. amulegui
+	// is not a CamuleApp and runs its own CVersionCheck. The About dialog's "Check for
+	// updates" button stays on CVersionCheck.
 	if (thePrefs::GetCheckNewVersion()) {
-		// Test if there's any new version. The URL is the GitHub
-		// Releases "latest" endpoint, which returns JSON describing the
-		// most recent non-prerelease, non-draft Release.  We parse the
-		// `tag_name` field in CheckNewVersion() below. This replaces the
-		// legacy SourceForge `lastversion` text file, which has been
-		// unmaintained since the project moved to GitHub years ago.
-		// We use the thread base because I don't want a dialog to pop up.
-		CHTTPDownloadThread* version_check =
-			new CHTTPDownloadThread("https://api.github.com/repos/amule-org/amule/releases/latest",
-				thePrefs::GetConfigDir() + "last_version_check", thePrefs::GetConfigDir() + "last_version", HTTP_VersionCheck, false, false);
-		version_check->Create();
-		version_check->Run();
+		StartVersionCheck();
 	}
+#endif // ENABLE_VERSION_CHECK
 	if (thePrefs::GetNetworkED2K() && thePrefs::AutoServerlist()) {
 		serverlist->StartAutoUpdate();
 	}
 
-	// Start the fs-watcher after the initial scan so directories exist
-	// in shareddir_list before Add() runs. The watcher itself is cheap
-	// when no events fire; gating it on the user pref keeps inotify
-	// watches off the books on hosts where the user doesn't want them.
+	// Start the fs-watcher after the initial scan so directories exist in shareddir_list
+	// before Add() runs. The watcher is cheap when no events fire; gating it on the user
+	// pref keeps inotify watches off the books.
 	if (thePrefs::AutoRescanSharedDirs()) {
 		sharedfiles->EnableDirectoryWatcher(true);
 	}
@@ -777,86 +1118,139 @@
 	// The user can start pressing buttons like mad if he feels like it.
 	m_app_state = APP_STATE_RUNNING;
 
-	{
-		const bool needServerMet = !serverlist->GetServerCount() && thePrefs::GetNetworkED2K();
-		const bool needNodesDat  = thePrefs::GetNetworkKademlia()
-			&& !wxFileExists(thePrefs::GetConfigDir() + "nodes.dat");
+	// The listen socket has been bound since ReinitializeNetwork(), so a peer -- typically
+	// one that had us in its source list moments ago -- can have connected while the rest
+	// of this ran. CListenSocket::OnAccept() declines those, because until the line above
+	// there was no loaded client list to hand them to, and declining leaves the connection
+	// sitting unread. Take it now: it re-arms the acceptor, which otherwise would not
+	// happen until the first core timer tick, well after we have asked a server for a
+	// HighID.
+	if (listensocket) {
+		listensocket->Process();
+	}
 
-		if (needServerMet || needNodesDat) {
+	{
 #ifndef AMULE_DAEMON
-			wxArrayString choices;
-			if (needServerMet) choices.Add(_("eD2k server list (server.met)"));
-			if (needNodesDat)  choices.Add(_("Kad bootstrap nodes (nodes.dat)"));
-
-			wxArrayInt defaults;
-			for (size_t i = 0; i < choices.GetCount(); ++i) defaults.Add(i);
-
-			wxMultiChoiceDialog dlg(
-				static_cast<wxWindow*>(theApp->amuledlg),
-				_("aMule has detected missing network bootstrap files.\nSelect which ones to download:"),
-				_("Network bootstrap"),
-				choices);
-			dlg.SetSelections(defaults);
-
-			if (dlg.ShowModal() == wxID_OK) {
-				const wxArrayInt sel = dlg.GetSelections();
-				int idx = 0;
+		if (firstRunWizardShown) {
+			// The first-run wizard already collected the user's bootstrap choices (and
+			// UPnP / port settings, which were applied before ReinitializeNetwork ran).
+			// Act on them now that the server list and sockets exist.
+			if (wizardWantsServerMet) {
+				serverlist->UpdateServerMetFromURL(thePrefs::GetEd2kServersUrl());
+			}
+			if (wizardWantsNodesDat) {
+				UpdateNotesDat(thePrefs::GetKadNodesUrl());
+			}
+		} else {
+			const bool needServerMet =
+				!serverlist->GetServerCount() && thePrefs::GetNetworkED2K();
+			const bool needNodesDat = thePrefs::GetNetworkKademlia() &&
+						  !wxFileExists(thePrefs::GetConfigDir() + "nodes.dat");
+
+			if (needServerMet || needNodesDat) {
+				// Returning user who is missing a bootstrap file (e.g. just enabled a
+				// network): offer to fetch what is gone. UPnP / ports live in
+				// Preferences for these users, so this dialog stays focused on the
+				// missing files.
+				wxDialog dlg(static_cast<wxWindow *>(theApp->amuledlg),
+					wxID_ANY,
+					_("Network bootstrap"));
+				wxBoxSizer *topSizer = new wxBoxSizer(wxVERTICAL);
+
+				topSizer->Add(new wxStaticText(&dlg,
+						      wxID_ANY,
+						      _("aMule has detected missing network bootstrap "
+							"files.\nSelect which ones to download:")),
+					0,
+					wxALL,
+					10);
+
+				wxCheckBox *serverMetCheck = NULL;
 				if (needServerMet) {
-					if (sel.Index(idx++) != wxNOT_FOUND) {
-						serverlist->UpdateServerMetFromURL(thePrefs::GetEd2kServersUrl());
-					}
+					serverMetCheck = new wxCheckBox(
+						&dlg, wxID_ANY, _("eD2k server list (server.met)"));
+					serverMetCheck->SetValue(true);
+					topSizer->Add(serverMetCheck, 0, wxLEFT | wxRIGHT | wxTOP, 10);
 				}
+				wxCheckBox *nodesDatCheck = NULL;
 				if (needNodesDat) {
-					if (sel.Index(idx++) != wxNOT_FOUND) {
+					nodesDatCheck = new wxCheckBox(
+						&dlg, wxID_ANY, _("Kad bootstrap nodes (nodes.dat)"));
+					nodesDatCheck->SetValue(true);
+					topSizer->Add(nodesDatCheck, 0, wxLEFT | wxRIGHT | wxTOP, 10);
+				}
+
+				if (wxSizer *btnSizer = dlg.CreateButtonSizer(wxOK | wxCANCEL))
+					topSizer->Add(btnSizer, 0, static_cast<int>(wxEXPAND) | wxALL, 10);
+
+				dlg.SetSizerAndFit(topSizer);
+
+				if (dlg.ShowModal() == wxID_OK) {
+					if (serverMetCheck && serverMetCheck->GetValue()) {
+						serverlist->UpdateServerMetFromURL(
+							thePrefs::GetEd2kServersUrl());
+					}
+					if (nodesDatCheck && nodesDatCheck->GetValue()) {
 						UpdateNotesDat(thePrefs::GetKadNodesUrl());
 					}
 				}
 			}
+		}
 #else
-			if (needServerMet) {
-				serverlist->UpdateServerMetFromURL(thePrefs::GetEd2kServersUrl());
-			}
-			if (needNodesDat) {
-				UpdateNotesDat(thePrefs::GetKadNodesUrl());
-			}
-#endif
+		const bool needServerMet = !serverlist->GetServerCount() && thePrefs::GetNetworkED2K();
+		const bool needNodesDat = thePrefs::GetNetworkKademlia() &&
+					  !wxFileExists(thePrefs::GetConfigDir() + "nodes.dat");
+		if (needServerMet) {
+			serverlist->UpdateServerMetFromURL(thePrefs::GetEd2kServersUrl());
 		}
+		if (needNodesDat) {
+			UpdateNotesDat(thePrefs::GetKadNodesUrl());
+		}
+#endif
 	}
 
-
 	// Autoconnect if that option is enabled
 	if (thePrefs::DoAutoConnect()) {
-		// IP filter is still loading and will be finished on event.
-		// Tell it to autoconnect.
+		// The IP filter may still be loading, in which case its
+		// load-finished event starts the networks these flags ask for.
 		if (thePrefs::GetNetworkED2K()) {
 			ipfilter->ConnectToAnyServerWhenReady();
 		}
 		if (thePrefs::GetNetworkKademlia()) {
 			ipfilter->StartKADWhenReady();
 		}
+		// It may equally have finished already: it loads on a worker thread, and the splash
+		// pumps the event loop while the local I/O above runs, so a fast filter is dispatched
+		// long before this point and nothing would start the networks afterwards. No-op while
+		// it is still loading.
+		ipfilter->StartPendingNetworks();
 	}
 
-	// Enable GeoIP
-#ifdef ENABLE_IP2COUNTRY
-	theApp->amuledlg->EnableIP2Country();
-#endif
+	// Enable GeoIP. The resolver is headless and core-owned so the daemon resolves country
+	// codes for the EC tag exactly as monolithic amule does for local display. The flag
+	// *images* are a GUI concern layered on top.
+	EnableIP2Country(true); // startup: allow the auto-update refresh
 
 	// Run webserver?
 	if (thePrefs::GetWSIsEnabled()) {
 		wxString aMuleConfigFile = thePrefs::GetConfigDir() + m_configFile;
+		// Not a const&: the __WXMAC__ block below reassigns this. clang-tidy runs on Linux
+		// where that block is #ifdef'd out, so it cannot see the write.
+		// NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
 		wxString amulewebPath = thePrefs::GetWSPath();
 
 #if defined(__WXMAC__) && !defined(AMULE_DAEMON)
 		// For the Mac GUI application, look for amuleweb in the bundle
-		CFURLRef amulewebUrl = CFBundleCopyAuxiliaryExecutableURL(
-			CFBundleGetMainBundle(), CFSTR("amuleweb"));
+		CFURLRef amulewebUrl =
+			CFBundleCopyAuxiliaryExecutableURL(CFBundleGetMainBundle(), CFSTR("amuleweb"));
 
 		if (amulewebUrl) {
 			CFURLRef absoluteUrl = CFURLCopyAbsoluteURL(amulewebUrl);
 			CFRelease(amulewebUrl);
 
 			if (absoluteUrl) {
-				CFStringRef amulewebCfstr = CFURLCopyFileSystemPath(absoluteUrl, kCFURLPOSIXPathStyle);
+				CFStringRef amulewebCfstr =
+					CFURLCopyFileSystemPath(absoluteUrl, kCFURLPOSIXPathStyle);
 				CFRelease(absoluteUrl);
 				amulewebPath = wxCFStringRef(amulewebCfstr).AsString();
 			}
@@ -864,17 +1258,13 @@
 #endif
 
 #ifdef __WINDOWS__
-#	define QUOTE	"\""
+#define QUOTE "\""
 #else
-#	define QUOTE	"\'"
+#define QUOTE "\'"
 #endif
 
-		wxString cmd =
-			QUOTE +
-			amulewebPath +
-			QUOTE " " QUOTE "--amule-config-file=" +
-			aMuleConfigFile +
-			QUOTE;
+		wxString cmd = QUOTE + amulewebPath +
+			       QUOTE " " QUOTE "--amule-config-file=" + aMuleConfigFile + QUOTE;
 		CTerminationProcessAmuleweb *p = new CTerminationProcessAmuleweb(cmd, &webserver_pid);
 		webserver_pid = static_cast<int>(wxExecute(cmd, wxEXEC_ASYNC, p));
 		bool webserver_ok = webserver_pid > 0;
@@ -882,16 +1272,109 @@
 			AddLogLineC(CFormat(_("web server running on pid %d")) % webserver_pid);
 		} else {
 			delete p;
-			ShowAlert(_(
-				"You requested to run web server on startup, but the amuleweb binary cannot be run. Please install the package containing aMule web server, or build aMule from source with -DBUILD_WEBSERVER=YES and install it."),
-				_("ERROR"), wxOK | wxICON_ERROR);
+			// Defer the modal until after OnInit returns. During OnInit the main window is
+			// not yet visible on Windows, so a modal ShowAlert spawns invisible and blocks
+			// the message loop waiting on input that cannot be given -- aMule then boots
+			// into an unresponsive white window with only the error ding audible.
+			CallAfter(this() {
+				ShowAlert(_("You requested to run web server on startup, "
+					    "but the amuleweb binary cannot be run. Please "
+					    "install the package containing aMule web "
+					    "server, or build aMule from source with "
+					    "-DBUILD_WEBSERVER=YES and install it."),
+					_("ERROR"),
+					wxOK | wxICON_ERROR);
+			});
+		}
+	}
+
+	// Read amuleapi-passwords so the preferences know what is actually configured before
+	// the dialog can be opened, and before the bind-vs-password warning below has to reason
+	// about it.
+	AmuleApiCredentials::RefreshState();
+
+	// Run amuleapi?
+	if (thePrefs::GetAmuleApiIsEnabled()) {
+		// Not a const&: the __WXMAC__ block below reassigns this. clang-tidy runs on Linux
+		// where that block is #ifdef'd out, so it cannot see the write.
+		// NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
+		wxString amuleapiPath = thePrefs::GetAmuleApiPath();
+
+#if defined(__WXMAC__) && !defined(AMULE_DAEMON)
+		// For the Mac GUI application, look for amuleapi in the bundle
+		CFURLRef amuleapiUrl =
+			CFBundleCopyAuxiliaryExecutableURL(CFBundleGetMainBundle(), CFSTR("amuleapi"));
+
+		if (amuleapiUrl) {
+			CFURLRef absoluteUrl = CFURLCopyAbsoluteURL(amuleapiUrl);
+			CFRelease(amuleapiUrl);
+
+			if (absoluteUrl) {
+				CFStringRef amuleapiCfstr =
+					CFURLCopyFileSystemPath(absoluteUrl, kCFURLPOSIXPathStyle);
+				CFRelease(absoluteUrl);
+				amuleapiPath = wxCFStringRef(amuleapiCfstr).AsString();
+			}
+		}
+#endif
+
+		// Hand the child an ephemeral EC credential instead of letting it read the
+		// password-equivalent value out of amule.conf. Written 0600 into the config dir the
+		// child is about to be pointed at, under the one name both sides derive from
+		// webcommon; the child deletes it the moment it has read it, and OnCoreTimer removes
+		// it regardless once the deadline expires. The path is deliberately NOT on the
+		// command line: argv is world-readable via ps.
+		//
+		// A failure here is not fatal -- amuleapi still has its own configured EC password --
+		// but it is worth saying, because that fallback is the credential we are trying to
+		// stop using.
+		m_ecToken = wxString::FromUTF8(webcommon::GenerateEcToken().c_str());
+		const std::string tokenPath =
+			webcommon::EcTokenFilePath(std::string(thePrefs::GetConfigDir().utf8_str()));
+		if (webcommon::WriteFileAtomic0600(tokenPath, std::string(m_ecToken.utf8_str()) + "\n")) {
+			m_ecTokenFileExpiryMs = theStats::GetUptimeMillis() + EC_TOKEN_FILE_TTL_MS;
+		} else {
+			AddLogLineC(CFormat(_("Could not write the amuleapi EC token to %s; "
+					      "amuleapi will fall back to its configured password.")) %
+				    wxString::FromUTF8(tokenPath.c_str()));
+			m_ecToken.Clear();
+		}
+
+		// No --amule-config-file here, unlike amuleweb above: amuleapi takes the ephemeral
+		// token written just now instead of reading the hashed EC password out of amule.conf.
+		// It finds the token through the config dir passed below, which is also where its
+		// admin and guest credentials live. The HTTP bind address and port are passed
+		// explicitly; a non-loopback bind requires an admin password or amuleapi refuses to
+		// start.
+		wxString cmd = QUOTE + amuleapiPath +
+			       QUOTE " " QUOTE "--config-dir=" + thePrefs::GetConfigDir() +
+			       QUOTE " " QUOTE "--bind=" + thePrefs::GetAmuleApiBindAddress() + QUOTE +
+			       wxString::Format(wxT(" --http-port=%u"), thePrefs::GetAmuleApiPort());
+		CTerminationProcessAmuleApi *p = new CTerminationProcessAmuleApi(cmd, &amuleapi_pid);
+		amuleapi_pid = static_cast<int>(wxExecute(cmd, wxEXEC_ASYNC, p));
+		bool amuleapi_ok = amuleapi_pid > 0;
+		if (amuleapi_ok) {
+			AddLogLineC(CFormat(_("amuleapi running on pid %d")) % amuleapi_pid);
+		} else {
+			delete p;
+			// See the amuleweb branch above for why this is deferred with
+			// CallAfter rather than shown inline during OnInit.
+			CallAfter(this() {
+				ShowAlert(_("You requested to run amuleapi on startup, "
+					    "but the amuleapi binary cannot be run. Please "
+					    "install the package containing aMule's REST API "
+					    "server, or build aMule from source with "
+					    "-DBUILD_AMULEAPI=YES and install it."),
+					_("ERROR"),
+					wxOK | wxICON_ERROR);
+			});
 		}
 	}
 
 	return true;
 }
 
-bool CamuleApp::ReinitializeNetwork(wxString* msg)
+bool CamuleApp::ReinitializeNetwork(wxString *msg)
 {
 	bool ok = true;
 	static bool firstTime = true;
@@ -905,21 +1388,20 @@
 	if (thePrefs::ECPort() == thePrefs::GetPort()) {
 		// Select a random usable port in the range 1025 ... 2^16 - 1
 		uint16 port = thePrefs::ECPort();
-		while ( port < 1024 || port  == thePrefs::GetPort() ) {
+		while (port < 1024 || port == thePrefs::GetPort()) {
 			port = (uint16)rand();
 		}
-		thePrefs::SetECPort( port );
+		thePrefs::SetECPort(port);
 
-		wxString err =
-			"Network configuration failed! You cannot use the same port\n"
-			"for the main TCP port and the External Connections port.\n"
-			"The EC port has been changed to avoid conflict, see the\n"
-			"preferences for the new value.\n";
+		wxString err = "Network configuration failed! You cannot use the same port\n"
+			       "for the main TCP port and the External Connections port.\n"
+			       "The EC port has been changed to avoid conflict, see the\n"
+			       "preferences for the new value.\n";
 		*msg << err;
 
-		AddLogLineN("" );
-		AddLogLineC(err );
-		AddLogLineN("" );
+		AddLogLineN("");
+		AddLogLineC(err);
+		AddLogLineN("");
 
 		ok = false;
 	}
@@ -927,22 +1409,21 @@
 	if (thePrefs::GetUDPPort() == thePrefs::GetPort() + 3) {
 		// Select a random usable value in the range 1025 ... 2^16 - 1
 		uint16 port = thePrefs::GetUDPPort();
-		while ( port < 1024 || port == thePrefs::GetPort() + 3 ) {
+		while (port < 1024 || port == thePrefs::GetPort() + 3) {
 			port = (uint16)rand();
 		}
-		thePrefs::SetUDPPort( port );
+		thePrefs::SetUDPPort(port);
 
-		wxString err =
-			"Network configuration failed! You set your UDP port to\n"
-			"the value of the main TCP port plus 3.\n"
-			"This port has been reserved for the Server-UDP port. The\n"
-			"port value has been changed to avoid conflict, see the\n"
-			"preferences for the new value\n";
+		wxString err = "Network configuration failed! You set your UDP port to\n"
+			       "the value of the main TCP port plus 3.\n"
+			       "This port has been reserved for the Server-UDP port. The\n"
+			       "port value has been changed to avoid conflict, see the\n"
+			       "preferences for the new value\n";
 		*msg << err;
 
-		AddLogLineN("" );
-		AddLogLineC(err );
-		AddLogLineN("" );
+		AddLogLineN("");
+		AddLogLineC(err);
+		AddLogLineN("");
 
 		ok = false;
 	}
@@ -951,11 +1432,22 @@
 	// TODO: read this from configuration file
 	amuleIPV4Address myaddr4;
 
-	// Create the External Connections Socket.
-	// Default is 4712.
-	// Get ready to handle connections from apps like amulecmd
-	if (thePrefs::GetECAddress().IsEmpty() || !myaddr0.Hostname(thePrefs::GetECAddress())) {
+	// Create the External Connections socket (default 4712), ready to handle connections
+	// from apps like amulecmd.
+	//
+	// An empty address means "any", which is a deliberate choice the user can make. A
+	// configured address that will not resolve is a different case and must not fall
+	// through to the same place: binding every interface because the requested one happens
+	// to be down would silently expose full control of the daemon to networks the user
+	// thought they had excluded. Interface IPs come and go, so this is reachable in normal
+	// use -- fall back to loopback instead, where EC keeps working locally.
+	if (thePrefs::GetECAddress().IsEmpty()) {
 		myaddr0.AnyAddress();
+	} else if (!myaddr0.Hostname(thePrefs::GetECAddress())) {
+		AddLogLineC(CFormat(_("External connection: could not bind to '%s', "
+				      "listening on 127.0.0.1 only.")) %
+			    thePrefs::GetECAddress());
+		myaddr0.Hostname("127.0.0.1");
 	}
 	myaddr0.Service(thePrefs::ECPort());
 	ECServerHandler = new ExternalConn(myaddr0, msg);
@@ -966,100 +1458,123 @@
 		myaddr1.AnyAddress();
 	} else if (!myaddr1.Hostname(thePrefs::GetAddress())) {
 		myaddr1.AnyAddress();
-		AddLogLineC(CFormat(_("Could not bind ports to the specified address: %s"))
-			% thePrefs::GetAddress());
+		AddLogLineC(CFormat(_("Could not bind ports to the specified address: %s")) %
+			    thePrefs::GetAddress());
 	}
 
 	wxString ip = myaddr1.IPAddress();
-	myaddr1.Service(thePrefs::GetPort()+3);
+	myaddr1.Service(thePrefs::GetPort() + 3);
 	serverconnect = new CServerConnect(serverlist, myaddr1);
-	*msg << CFormat( "*** Server UDP socket (TCP+3) at %s:%u\n" )
-		% ip % ((unsigned int)thePrefs::GetPort() + 3u);
+	*msg << CFormat("*** Server UDP socket (TCP+3) at %s:%u\n") % ip %
+			((unsigned int)thePrefs::GetPort() + 3u);
 
-	// Create the ListenSocket (aMule TCP socket).
-	// Used for Client Port / Connections from other clients,
-	// Client to Client Source Exchange.
-	// Default is 4662.
+	// Create the ListenSocket (aMule TCP socket), used for the client port, connections
+	// from other clients and client-to-client source exchange. Default is 4662.
 	myaddr2 = myaddr1;
 	myaddr2.Service(thePrefs::GetPort());
 	listensocket = new CListenSocket(myaddr2);
-	*msg << CFormat( "*** TCP socket (TCP) listening on %s:%u\n" )
-		% ip % (unsigned int)(thePrefs::GetPort());
+	*msg << CFormat("*** TCP socket (TCP) listening on %s:%u\n") % ip %
+			(unsigned int)(thePrefs::GetPort());
 	// Notify(true) has already been called to the ListenSocket, so events may
 	// be already coming in.
 	if (!listensocket->IsOk()) {
 		// If we weren't able to start listening, we need to warn the user
 		wxString err;
 		err = CFormat(_("Port %u is not available. You will be LOWID\n")) %
-			(unsigned int)(thePrefs::GetPort());
+		      (unsigned int)(thePrefs::GetPort());
 		*msg << 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.")) %
-			(unsigned int)(thePrefs::GetPort());
+		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.")) %
+		      (unsigned int)(thePrefs::GetPort());
 		ShowAlert(err, _("ERROR"), wxOK | wxICON_ERROR);
 	}
 
-	// Create the UDP socket.
-	// Used for extended eMule protocol, Queue Rating, File Reask Ping.
-	// Also used for Kademlia.
-	// Default is port 4672.
+	// Create the UDP socket, used for the extended eMule protocol (queue rating, file reask
+	// ping) and for Kademlia. Default is port 4672.
 	myaddr3 = myaddr1;
 	myaddr3.Service(thePrefs::GetUDPPort());
 	clientudp = new CClientUDPSocket(myaddr3, thePrefs::GetProxyData());
 	if (!thePrefs::IsUDPDisabled()) {
-		*msg << CFormat( "*** Client UDP socket (extended eMule) at %s:%u" )
-			% ip % thePrefs::GetUDPPort();
+		*msg << CFormat("*** Client UDP socket (extended eMule) at %s:%u") % ip %
+				thePrefs::GetUDPPort();
 	} else {
 		*msg << "*** Client UDP socket (extended eMule) disabled on preferences";
 	}
 
 #ifdef ENABLE_UPNP
-	if (thePrefs::GetUPnPEnabled()) {
-		try {
-			m_upnpMappings0 = CUPnPPortMapping(
-				myaddr0.Service(),
-				"TCP",
-				thePrefs::GetUPnPECEnabled(),
-				"aMule TCP External Connections Socket");
-			m_upnpMappings1 = CUPnPPortMapping(
-				myaddr1.Service(),
-				"UDP",
-				thePrefs::GetUPnPEnabled(),
-				"aMule UDP socket (TCP+3)");
-			m_upnpMappings2 = CUPnPPortMapping(
-				myaddr2.Service(),
-				"TCP",
-				thePrefs::GetUPnPEnabled(),
-				"aMule TCP Listen Socket");
-			m_upnpMappings3 = CUPnPPortMapping(
-				myaddr3.Service(),
-				"UDP",
-				thePrefs::GetUPnPEnabled(),
-				"aMule UDP Extended eMule Socket");
-			m_upnp = new CUPnPControlPoint(thePrefs::GetUPnPTCPPort());
-
-			wxStopWatch count; // Wait UPnP service responses for 3s before add port mappings
-			while (count.Time() < 3000 && !m_upnp->WanServiceDetected());
-
-			m_upnp->AddPortMappings(m_upnpMappings);
-		} catch(CUPnPException &e) {
-			wxString error_msg;
-			error_msg << e.what();
-			AddLogLineC(error_msg);
-			fprintf(stderr, "%s\n", (const char *)unicode2char(error_msg));
-		}
-	}
+	StartUPnP();
 #endif
 
+	// Sockets have just been (re)created, so the interface list this machine presents is as
+	// current as it will ever be. Publishing it here also covers the reinitialisation path,
+	// where a changed bind address or a first-run wizard can leave us on a different
+	// interface entirely.
+	RefreshLocalPublicIPv6Addresses();
+
 	return ok;
 }
 
-/* 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.
-*/
+void RefreshLocalPublicIPv6Addresses()
+{
+	std::vector<CPublicIPv6Corroboration::Address> local;
+	for (const NetworkInterface &iface : DetectNetworkInterfaces()) {
+		local.insert(local.end(), iface.ipv6.begin(), iface.ipv6.end());
+	}
+	// Publishing the set is only half of it: the same call re-validates an already adopted
+	// reflection against the addresses we still hold, which is how a prefix renumber gets
+	// noticed at all.
+	ObservedPublicIPv6().SetLocalAddresses(local, ::GetTickCount64());
+}
+
+#ifdef ENABLE_UPNP
+void CamuleApp::StartUPnP()
+{
+	// Nothing to do when UPnP is disabled, and we must never create a second control point
+	// if one already exists -- e.g. the first-run bootstrap dialog enabling UPnP after
+	// ReinitializeNetwork() ran.
+	if (!thePrefs::GetUPnPEnabled() || m_upnp) {
+		return;
+	}
+
+	// The mapped ports come straight from the preferences rather than the listening
+	// sockets, so this can run independently of ReinitializeNetwork() (which owns the local
+	// myaddr array).
+	try {
+		m_upnpMappings0 = CUPnPPortMapping(thePrefs::ECPort(),
+			"TCP",
+			thePrefs::GetUPnPECEnabled(),
+			"aMule TCP External Connections Socket");
+		m_upnpMappings1 = CUPnPPortMapping(thePrefs::GetPort() + 3,
+			"UDP",
+			thePrefs::GetUPnPEnabled(),
+			"aMule UDP socket (TCP+3)");
+		m_upnpMappings2 = CUPnPPortMapping(
+			thePrefs::GetPort(), "TCP", thePrefs::GetUPnPEnabled(), "aMule TCP Listen Socket");
+		m_upnpMappings3 = CUPnPPortMapping(thePrefs::GetUDPPort(),
+			"UDP",
+			thePrefs::GetUPnPEnabled(),
+			"aMule UDP Extended eMule Socket");
+		m_upnp = new CUPnPControlPoint(thePrefs::GetUPnPTCPPort());
+
+		wxStopWatch count; // Wait UPnP service responses for 3s before add port mappings
+		while (count.Time() < 3000 && !m_upnp->WanServiceDetected())
+			;
+
+		m_upnp->AddPortMappings(m_upnpMappings);
+	} catch (CUPnPException &e) {
+		wxString error_msg;
+		error_msg << e.what();
+		AddLogLineC(error_msg);
+		fprintf(stderr, "%s\n", (const char *)unicode2char(error_msg));
+	}
+}
+#endif
+
+/* 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. */
 void CamuleApp::OnlineSig(bool zero /* reset stats (used on shutdown) */)
 {
 	// Do not do anything if online signature is disabled in Preferences
@@ -1070,15 +1585,18 @@
 	}
 
 	// Remove old signature files
-	if ( wxFileExists( m_emulesig_path ) ) { wxRemoveFile( m_emulesig_path ); }
-	if ( wxFileExists( m_amulesig_path ) ) { wxRemoveFile( m_amulesig_path ); }
-
+	if (wxFileExists(m_emulesig_path)) {
+		wxRemoveFile(m_emulesig_path);
+	}
+	if (wxFileExists(m_amulesig_path)) {
+		wxRemoveFile(m_amulesig_path);
+	}
 
 	wxTextFile amulesig_out;
 	wxTextFile emulesig_out;
 
 	// Open both files if needed
-	if ( !emulesig_out.Create( m_emulesig_path) ) {
+	if (!emulesig_out.Create(m_emulesig_path)) {
 		AddLogLineC(_("Failed to create OnlineSig File"));
 		// Will never try again.
 		m_amulesig_path.Clear();
@@ -1086,7 +1604,7 @@
 		return;
 	}
 
-	if ( !amulesig_out.Create(m_amulesig_path) ) {
+	if (!amulesig_out.Create(m_amulesig_path)) {
 		AddLogLineC(_("Failed to create aMule OnlineSig File"));
 		// Will never try again.
 		m_amulesig_path.Clear();
@@ -1109,14 +1627,11 @@
 			emulesig_string =
 				// Connected
 				"1|"
-				//Server name
-				+ serverconnect->GetCurrentServer()->GetListName()
-				+ "|"
+				// Server name
+				+ serverconnect->GetCurrentServer()->GetListName() +
+				"|"
 				// IP and port of the server
-				+ serverconnect->GetCurrentServer()->GetFullIP()
-				+ "|"
-				+ temp;
-
+				+ serverconnect->GetCurrentServer()->GetFullIP() + "|" + temp;
 
 			// Now for amule sig
 
@@ -1148,7 +1663,7 @@
 			amulesig_out.AddLine("0\n0\n0\n0\n0");
 		}
 		if (IsConnectedKad()) {
-			if(Kademlia::CKademlia::IsFirewalled()) {
+			if (Kademlia::CKademlia::IsFirewalled()) {
 				// Connected. Firewalled. State 1.
 				amulesig_out.AddLine("1");
 			} else {
@@ -1209,13 +1724,11 @@
 		amulesig_out.AddLine("0");
 		amulesig_out.AddLine("0");
 	} else {
-        // Total received bytes in session
-		amulesig_out.AddLine( CFormat( "%llu" ) %
-			theStats::GetSessionReceivedBytes() );
-
-        // Total sent bytes in session
-		amulesig_out.AddLine( CFormat( "%llu" ) %
-			theStats::GetSessionSentBytes() );
+		// Total received bytes in session
+		amulesig_out.AddLine(CFormat("%llu") % theStats::GetSessionReceivedBytes());
+
+		// Total sent bytes in session
+		amulesig_out.AddLine(CFormat("%llu") % theStats::GetSessionSentBytes());
 
 		// Uptime
 		amulesig_out.AddLine(CFormat("%llu") % theStats::GetUptimeSeconds());
@@ -1224,8 +1737,7 @@
 	// Flush the files
 	emulesig_out.Write();
 	amulesig_out.Write();
-} //End Added By Bouc7
-
+} // End Added By Bouc7
 
 #if wxUSE_ON_FATAL_EXCEPTION
 // Gracefully handle fatal exceptions and print backtrace if possible
@@ -1233,42 +1745,46 @@
 {
 	/* Print the backtrace */
 	wxString msg;
-	msg	<< "\n--------------------------------------------------------------------------------\n"
-		<< "A fatal error has occurred and aMule has crashed.\n"
-		<< "Please assist us in fixing this problem by reporting the backtrace below as a\n"
-		<< "GitHub issue, including as much information as possible regarding the\n"
-		<< "circumstances of this crash. Issue tracker:\n"
-		<< "    https://github.com/amule-org/amule/issues\n"
-		<< "If possible, please try to generate a real backtrace of this crash:\n"
-		<< "    https://amule-org.github.io/docs/contributing/bug-report\n\n"
-		<< "----------------------------=| BACKTRACE FOLLOWS: |=----------------------------\n"
-		<< "Current version is: " << FullMuleVersion
-		<< "\nRunning on: " << OSDescription
-		<< "\n\n"
-		<< get_backtrace(1) // 1 == skip this function.
-		<< "\n--------------------------------------------------------------------------------\n";
+	msg << "\n--------------------------------------------------------------------------------\n"
+	    << "A fatal error has occurred and aMule has crashed.\n"
+	    << "Please assist us in fixing this problem by reporting the backtrace below as a\n"
+	    << "GitHub issue, including as much information as possible regarding the\n"
+	    << "circumstances of this crash. Issue tracker:\n"
+	    << "    https://github.com/amule-org/amule/issues\n"
+	    << "If possible, please try to generate a real backtrace of this crash:\n"
+	    << "    https://amule-org.github.io/docs/contributing/bug-report\n\n"
+	    << "----------------------------=| BACKTRACE FOLLOWS: |=----------------------------\n"
+	    << "Current version is: " << FullMuleVersion << "\nRunning on: " << OSDescription << "\n\n"
+	    << get_backtrace(1) // 1 == skip this function.
+	    << "\n--------------------------------------------------------------------------------\n";
 
 	theLogger.EmergencyLog(msg, true);
+
+	// wx's handler calls abort() as soon as this returns, so without this the SIGABRT handler
+	// adds a second, raw backtrace under a banner that blames the allocator. The symbolicated
+	// one above is the report; this keeps it the only one.
+	SuppressNextAbortBacktrace();
 }
 #endif
 
-
 // Sets the localization of aMule
 void CamuleApp::Localize_mule()
 {
 	InitCustomLanguages();
 	InitLocale(m_locale, StrLang2wx(thePrefs::GetLanguageID()));
 	if (!m_locale.IsOk()) {
-		AddLogLineN(_("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)"));
 	}
 }
 
-
 // Displays information related to important changes in aMule.
 // Is called when the user runs a new version of aMule
 void CamuleApp::Trigger_New_version(wxString new_version)
 {
-	wxString info = wxString(" --- ") + wxString(CFormat(_("This is the first time you run aMule %s")) % new_version) + " ---\n\n";
+	wxString info = wxString(" --- ") +
+			wxString(CFormat(_("This is the first time you run aMule %s")) % new_version) +
+			" ---\n\n";
 	if (new_version == "GIT") {
 		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");
@@ -1285,15 +1801,17 @@
 	ShowAlert(info, _("Info"), wxCENTRE | wxOK | wxICON_ERROR);
 }
 
-
-void CamuleApp::SetOSFiles(const wxString& new_path)
+void CamuleApp::SetOSFiles(const wxString &new_path)
 {
-	if ( thePrefs::IsOnlineSignatureEnabled() ) {
-		if ( ::wxDirExists(new_path) ) {
+	if (thePrefs::IsOnlineSignatureEnabled()) {
+		if (::wxDirExists(new_path)) {
 			m_emulesig_path = JoinPaths(new_path, "onlinesig.dat");
 			m_amulesig_path = JoinPaths(new_path, "amulesig.dat");
 		} else {
-			ShowAlert(_("The folder for Online Signature files you specified is INVALID!\n OnlineSignature will be DISABLED until you fix it on preferences."), _("ERROR"), wxOK | wxICON_ERROR);
+			ShowAlert(_("The folder for Online Signature files you specified is INVALID!\n "
+				    "OnlineSignature will be DISABLED until you fix it on preferences."),
+				_("ERROR"),
+				wxOK | wxICON_ERROR);
 			m_emulesig_path.Clear();
 			m_amulesig_path.Clear();
 		}
@@ -1303,81 +1821,62 @@
 	}
 }
 
-
 #ifndef wxUSE_STACKWALKER
 #define wxUSE_STACKWALKER 0
 #endif
-void CamuleApp::OnAssertFailure(const wxChar* file, int line,
-				const wxChar* func, const wxChar* cond, const wxChar* msg)
+void CamuleApp::OnAssertFailure(
+	const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg)
 {
-	wxString errmsg = CFormat( "Assertion failed: %s:%s:%d: Assertion '%s' failed. %s\nBacktrace follows:\n%s\n" )
-		% file % func % line % cond % ( msg ? wxString(msg) : wxString() )
-		% get_backtrace(2);		// Skip the function-calls directly related to the assert call.
-	theLogger.EmergencyLog(errmsg, false);
-
-	// --disable-fatal: skip the wxApp dialog and abort directly so a
-	// supervisor (systemd, watchdog script) sees a non-zero exit and
-	// can restart aMule. The errmsg above is already on stderr and in
-	// the log; nothing useful would be lost by skipping the dialog.
-	if (m_disableFatal) {
-		raise(SIGABRT);
-		return; // unreachable
-	}
-
-	if (wxThread::IsMain() && IsRunning()) {
-		AMULE_APP_BASE::OnAssertFailure(file, line, func, cond, msg);
-	} else {
-#ifdef _MSC_VER
-		wxString s = CFormat("%s in %s") % cond % func;
-		if (msg) {
-			s << " : " << msg;
-		}
-		_wassert(s.wc_str(), file, line);
-#else
-		// Abort, allows gdb to catch the assertion
-		raise( SIGABRT );
-#endif
+	// The log copy, the backtrace and --disable-fatal are the same for every app and live
+	// in CamuleAppCommon; only the base to fall through to is ours. IsRunning() gates the
+	// dialog because wxWidgets cannot show one before the app is up or once it is tearing
+	// down.
+	if (ReportAssertFailure(file, line, func, cond, msg, wxThread::IsMain() && IsRunning())) {
+		// Through the helper for the trap wx takes on the way out when the user chooses to stop.
+		RunWxAssertHandler(& { AMULE_APP_BASE::OnAssertFailure(file, line, func, cond, msg); });
 	}
 }
 
-
-void CamuleApp::OnUDPDnsDone(CMuleInternalEvent& evt)
+void CamuleApp::OnUDPDnsDone(CMuleInternalEvent &evt)
 {
-	CServerUDPSocket* socket =reinterpret_cast<CServerUDPSocket*>(evt.GetClientData());
+	CServerUDPSocket *socket = reinterpret_cast<CServerUDPSocket *>(evt.GetClientData());
 	socket->OnHostnameResolved(evt.GetExtraInt64());
 }
 
-
-void CamuleApp::OnSourceDnsDone(CMuleInternalEvent& evt)
+void CamuleApp::OnSourceDnsDone(CMuleInternalEvent &evt)
 {
 	downloadqueue->OnHostnameResolved(evt.GetExtraInt64());
 }
 
-
-void CamuleApp::OnServerDnsDone(CMuleInternalEvent& evt)
+void CamuleApp::OnServerDnsDone(CMuleInternalEvent &evt)
 {
 	AddLogLineNS(_("Server hostname notified"));
 	serverconnect->OnServerHostnameResolved(evt.GetClientData(), evt.GetExtraInt64());
 }
 
-
-void CamuleApp::OnTCPTimer(CTimerEvent& WXUNUSED(evt))
+void CamuleApp::OnTCPTimer(CTimerEvent &WXUNUSED(evt))
 {
-	if(!IsRunning()) {
+	if (!IsRunning()) {
 		return;
 	}
 	serverconnect->StopConnectionTry();
-	if (IsConnectedED2K() ) {
+	if (IsConnectedED2K()) {
 		return;
 	}
 	serverconnect->ConnectToAnyServer();
 }
 
+void CamuleApp::ForgetECObject(uint32 ecid)
+{
+	if (ECServerHandler) {
+		ECServerHandler->ForgetObject(ecid);
+	}
+}
 
-void CamuleApp::OnCoreTimer(CTimerEvent& WXUNUSED(evt))
+void CamuleApp::OnCoreTimer(CTimerEvent &WXUNUSED(evt))
 {
 	// Former TimerProc section
-	static uint64 msPrev1, msPrev5, msPrevSave, msPrevHist, msPrevOS, msPrevKnownMet;
+	static uint64 msPrev1, msPrev5, msPrevSave, msPrevHist, msPrevOS, msPrevKnownMet, msPrevIfaces;
 	uint64 msCur = theStats::GetUptimeMillis();
 	TheTime = msCur / 1000;
 
@@ -1385,19 +1884,16 @@
 		return;
 	}
 
-	// Check if we should terminate the app. OnShutdownSignal only sets
-	// the flag; the actual exit trigger runs from here (normal context)
-	// every CORE_TIMER_PERIOD ms.
-	if ( g_shutdownSignal ) {
+	// Check if we should terminate the app. OnShutdownSignal only sets the flag; the actual
+	// exit trigger runs from here (normal context) every CORE_TIMER_PERIOD ms.
+	if (g_shutdownSignal) {
 #ifdef AMULE_DAEMON
 #if defined(__APPLE__)
-		// wxBase 3.3.2's wxAppConsole event loop on macOS doesn't
-		// honour ExitMainLoop without a top-level window driving the
-		// close (the way wxApp does for the GUI build below). Run
-		// OnExit() directly here for clean shutdown of all subsystems,
-		// then _exit() to terminate before wx's own static destructors
-		// hit the NSURLSession-cleanup crash also handled in OnExit's
-		// __APPLE__ block.
+		// wxBase 3.3.2's wxAppConsole event loop on macOS does not honour ExitMainLoop
+		// without a top-level window driving the close. Run OnExit() directly here for a
+		// clean shutdown of all subsystems, then _exit() to terminate before wx's own static
+		// destructors hit the NSURLSession cleanup crash also handled in OnExit's __APPLE__
+		// block.
 		static bool s_alreadyExiting = false;
 		if (!s_alreadyExiting) {
 			s_alreadyExiting = true;
@@ -1408,9 +1904,9 @@
 		ExitMainLoop();
 #endif
 #else
-		wxWindow* top = GetTopWindow();
+		wxWindow *top = GetTopWindow();
 
-		if ( top ) {
+		if (top) {
 			top->Close(true);
 		} else {
 			// No top-window, have to force termination.
@@ -1419,47 +1915,59 @@
 #endif
 	}
 
-	// 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.
+	// 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, so under high CPU load a new core
+	// timer event could be generated before the last one finished. Detect that and return
+	// early.
 	static bool recurse = false;
 	if (recurse) {
 		return;
 	}
 	recurse = true;
 
+#ifdef AMULE_UTP_TRANSPORT
+	// Unguarded like the queues below: ReinitializeNetwork() always constructs clientudp,
+	// disabled UDP included -- it simply leaves it unopened. A null check here would also
+	// tell the static analyser that the Kad recovery's clientudp->Close() further down can
+	// be reached with a null pointer.
+	clientudp->TickUtp();
+#endif
+
 	uploadqueue->Process();
 	downloadqueue->Process();
-	//theApp->clientcredits->Process();
+	// theApp->clientcredits->Process();
 	theStats::CalculateRates();
 
-	if (msCur-msPrevHist > 1000) {
-		// unlike the other loop counters in this function this one will sometimes
-		// produce two calls in quick succession (if there was a gap of more than one
-		// second between calls to TimerProc) - this is intentional!  This way the
-		// history list keeps an average of one node per second and gets thinned out
-		// correctly as time progresses.
+	if (msCur - msPrevHist > 1000) {
+		// Unlike the other loop counters in this function this one will sometimes produce
+		// two calls in quick succession, if there was a gap of more than one second between
+		// calls to TimerProc. That is intentional: the history list then keeps an average of
+		// one node per second.
 		msPrevHist += 1000;
 
 		m_statistics->RecordHistory();
-
 	}
 
-
-	if (msCur-msPrev1 > 1000) {  // approximately every second
+	if (msCur - msPrev1 > 1000) { // approximately every second
 		msPrev1 = msCur;
+
+		// Keep the free-space worker's directories current. The paths can change under the
+		// preferences dialog, and the worker must not read thePrefs itself -- no worker in
+		// the tree does, and a wxString read concurrently with an assignment is a race
+		// whatever the value.
+		if (freeSpaceThread) {
+			freeSpaceThread->SetPaths(thePrefs::GetTempDir(), thePrefs::GetIncomingDir());
+		}
 		clientcredits->Process();
 		clientlist->Process();
 
 		// Publish files to server if needed.
 		sharedfiles->Process();
 
-		if( Kademlia::CKademlia::IsRunning() ) {
+		if (Kademlia::CKademlia::IsRunning()) {
 			Kademlia::CKademlia::Process();
-			if(Kademlia::CKademlia::GetPrefs()->HasLostConnection()) {
+			if (Kademlia::CKademlia::GetPrefs()->HasLostConnection()) {
 				StopKad();
 				clientudp->Close();
 				clientudp->Open();
@@ -1469,7 +1977,7 @@
 			}
 		}
 
-		if( serverconnect->IsConnecting() && !serverconnect->IsSingleConnect() ) {
+		if (serverconnect->IsConnecting() && !serverconnect->IsSingleConnect()) {
 			serverconnect->TryAnotherConnectionrequest();
 		}
 		if (serverconnect->IsConnecting()) {
@@ -1477,15 +1985,37 @@
 		}
 		listensocket->UpdateConnectionsStatus();
 
+#ifdef ENABLE_VERSION_CHECK
+		// Periodic re-check: once per day, so a long-running amuled or monolithic amule
+		// keeps its version state fresh instead of only checking at startup. Fires
+		// immediately the first time the preference is enabled at runtime.
+		// StartVersionCheck() self-stamps and skips the fetch within its own cooldown, so
+		// re-entry here is harmless.
+		if (thePrefs::GetCheckNewVersion()) {
+			const time_t nowSec = time(nullptr);
+			if (m_versionCheckLastAttempt == 0 ||
+				nowSec - m_versionCheckLastAttempt >= 24 * 60 * 60) {
+				StartVersionCheck();
+			}
+		}
+#endif // ENABLE_VERSION_CHECK
 	}
 
-
-	if (msCur-msPrev5 > 5000) {  // every 5 seconds
+	if (msCur - msPrev5 > 5000) { // every 5 seconds
 		msPrev5 = msCur;
 		listensocket->Process();
 	}
 
-	if (msCur-msPrevSave >= 60000) {
+	// Roughly every five minutes. An interface walk is too expensive to do per peer claim
+	// and too rare to leave to startup: between the two, this is what notices a prefix
+	// renumber or a privacy-address rotation on a session that never reconnects to a
+	// server.
+	if (msCur - msPrevIfaces >= 5 * 60 * 1000) {
+		msPrevIfaces = msCur;
+		RefreshLocalPublicIPv6Addresses();
+	}
+
+	if (msCur - msPrevSave >= 60000) {
 		msPrevSave = msCur;
 		theStats::Save();
 	}
@@ -1496,12 +2026,36 @@
 		msPrevOS = msCur;
 	}
 
-	if (msCur - msPrevKnownMet >= 30*60*1000/*There must be a prefs option for this*/) {
+	if (msCur - msPrevKnownMet >= 30 * 60 * 1000 /*There must be a prefs option for this*/) {
 		// Save Shared Files data
 		knownfiles->Save();
 		msPrevKnownMet = msCur;
 	}
 
+	// Coalesced flush of media-probe tag updates: OnMediaProbeFinished bumps
+	// m_mediaTagsDirtiedMs on every probe instead of saving inline; save once here when
+	// probing has been idle for 30 s. Resets the periodic timer above so known.met is not
+	// rewritten twice in quick succession.
+	if (m_mediaTagsDirtiedMs && msCur - m_mediaTagsDirtiedMs >= 30000) {
+		knownfiles->Save();
+		m_mediaTagsDirtiedMs = 0;
+		msPrevKnownMet = msCur;
+	}
+
+	// Backstop for the amuleapi EC token file. The child unlinks it as soon as it has read
+	// it, so in the normal case this finds nothing to do -- it exists for the child that
+	// never got that far, so a live secret cannot be left at rest by a crash or a failed
+	// exec. The in-memory token stays valid either way; only the file is transient.
+	if (m_ecTokenFileExpiryMs && msCur >= m_ecTokenFileExpiryMs) {
+		m_ecTokenFileExpiryMs = 0;
+		const wxString tokenPath = wxString::FromUTF8(
+			webcommon::EcTokenFilePath(std::string(thePrefs::GetConfigDir().utf8_str())).c_str());
+		if (wxFileExists(tokenPath) && wxRemoveFile(tokenPath)) {
+			AddDebugLogLineN(logGeneral,
+				CFormat("amuleapi EC token file removed unread after %u ms: %s") %
+					EC_TOKEN_FILE_TTL_MS % tokenPath);
+		}
+	}
 
 	// Recommended by lugdunummaster himself - from emule 0.30c
 	serverconnect->KeepConnectionAlive();
@@ -1510,13 +2064,96 @@
 	recurse = false;
 }
 
+#if !defined(CLIENT_GUI) && !defined(AMULE_DAEMON)
+void CamuleApp::OnSplashPollTimer(wxTimerEvent &WXUNUSED(evt))
+{
+	UpdateStartupHashProgress();
+}
+
+void CamuleApp::UpdateStartupHashProgress()
+{
+	// What the scheduler reports is what remains, so the completed count is derived rather
+	// than tracked -- one fewer thing to keep in step with a queue that other subsystems
+	// also feed.
+	const size_t remaining = CThreadScheduler::GetPendingCount(kSplashHashTaskType);
+
+	CSharedFilesCtrl *sharedList = (theApp->amuledlg && theApp->amuledlg->m_sharedfileswnd)
+					       ? theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl
+					       : nullptr;
+	if (sharedList) {
+		// The count moves every tick; the order only moves when a hash finished and appended
+		// a row. Hashing cost tracks bytes, so a large file is minutes of nothing followed by
+		// one append -- sorting per tick regardless would rebuild the row index once a second
+		// for no reordering.
+		sharedList->SetHashingCount(remaining);
+		sharedList->SortIfRowsAppended();
+	}
+
+	if (remaining == 0) {
+		FinishStartupHashing();
+	}
+}
+
+void CamuleApp::ShowMainWindowAfterScan()
+{
+	// The download list holds every part file there is going to be, so its
+	// batch is simply over: one sort, one thaw.
+	if (theApp->amuledlg && theApp->amuledlg->m_transferwnd &&
+		theApp->amuledlg->m_transferwnd->downloadlistctrl) {
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->EndBatchUpdate();
+	}
+
+	// The shared list is not finished -- hashing still has files to hand it -- so its batch
+	// stays open and only the freeze ends. Sorting what the scan found means the list is
+	// ordered from the moment it is visible, and rows arriving later are appended and
+	// sorted by the poll tick.
+	if (theApp->amuledlg && theApp->amuledlg->m_sharedfileswnd &&
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
+		// Sort-if-dirty rather than an unconditional sort: the scan's files arrived as
+		// appends and set the flag, and the first drain tick runs moments from here --
+		// sorting outright would leave the flag set and have that tick repeat the largest
+		// sort of the whole startup.
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->SortIfRowsAppended();
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ThawForDisplay();
+	}
+
+	if (theApp->amuledlg) {
+		theApp->amuledlg->ShowStartupWindow();
+	}
+
+	if (m_splash) {
+		m_splash->Finish();
+		m_splash = nullptr;
+	}
+}
 
-void CamuleApp::OnFinishedHashing(CHashingEvent& evt)
+void CamuleApp::FinishStartupHashing()
+{
+	m_splashPollTimer.Stop();
+
+	if (theApp->amuledlg && theApp->amuledlg->m_sharedfileswnd &&
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl) {
+		CSharedFilesCtrl *sharedList = theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl;
+		// Off first: it flushes whatever the last tick did not see, so the
+		// batch below closes with the model already knowing every row.
+		sharedList->SetStartupDrainMode(false);
+		sharedList->SetHashingCount(0);
+		// Ends the batch opened before the scan, without its sort: whatever was appended has
+		// just been sorted, either by the tick that brought the count to zero or, when
+		// nothing needed hashing, at the end of the scan. Nothing can append in between --
+		// both run synchronously in one handler. The thaw inside is skipped too:
+		// ShowMainWindowAfterScan() ended the freeze already.
+		sharedList->EndBatchUpdate(false);
+	}
+}
+#endif
+
+void CamuleApp::OnFinishedHashing(CHashingEvent &evt)
 {
 	wxCHECK_RET(evt.GetResult(), "No result of hashing");
 
-	CKnownFile* owner = const_cast<CKnownFile*>(evt.GetOwner());
-	CKnownFile* result = evt.GetResult();
+	CKnownFile *owner = const_cast<CKnownFile *>(evt.GetOwner());
+	CKnownFile *result = evt.GetResult();
 
 	if (owner) {
 		// Check if the partfile still exists, as it might have
@@ -1524,25 +2161,20 @@
 		if (downloadqueue->IsPartFile(owner)) {
 			// This cast must not be done before the IsPartFile
 			// call, as dynamic_cast will barf on dangling pointers.
-			dynamic_cast<CPartFile*>(owner)->PartFileHashFinished(result);
+			dynamic_cast<CPartFile *>(owner)->PartFileHashFinished(result);
 		}
 	} else {
 		static uint64 bytecount = 0;
 
-		// CHashingTask runs against a stable file descriptor, so the
-		// hash completes even if the file is renamed or unlinked
-		// mid-hash. Re-check the path at completion: if the file is
-		// no longer where we hashed it from (move out of the watched
-		// tree, delete during hash, or an interim rename whose final
-		// destination is a different path), drop the result. Surfacing
-		// it would leave a shared-list entry under a filename that
-		// doesn't exist on disk, which peers cannot fetch chunks from.
-		const CPath hashedFullPath =
-			result->GetFilePath().JoinPaths(result->GetFileName());
+		// CHashingTask runs against a stable file descriptor, so the hash completes even if
+		// the file is renamed or unlinked mid-hash. Re-check the path at completion: if the
+		// file is no longer where we hashed it from -- moved out of the watched tree,
+		// deleted, or renamed to a different final path -- drop the result. Surfacing it
+		// would leave a shared-list entry under a filename that does not exist on disk.
+		const CPath hashedFullPath = result->GetFilePath().JoinPaths(result->GetFileName());
 		if (!hashedFullPath.FileExists()) {
 			AddDebugLogLineN(logKnownFiles,
-				CFormat("Hashed file vanished before share, dropping: %s")
-					% hashedFullPath);
+				CFormat("Hashed file vanished before share, dropping: %s") % hashedFullPath);
 			delete result;
 			return;
 		}
@@ -1555,8 +2187,9 @@
 			bytecount += result->GetFileSize();
 			// If we have added files with a total size of ~3000mb
 			if (bytecount >= wxULL(3145728000)) {
-				AddDebugLogLineN(logKnownFiles, "Failsafe for crash on file hashing creation");
-				if ( m_app_state != APP_STATE_SHUTTINGDOWN ) {
+				AddDebugLogLineN(
+					logKnownFiles, "Failsafe for crash on file hashing creation");
+				if (m_app_state != APP_STATE_SHUTTINGDOWN) {
 					knownfiles->Save();
 					bytecount = 0;
 				}
@@ -1569,46 +2202,38 @@
 	}
 }
 
-
-void CamuleApp::OnPartFileHashResult(CPartFileHashResultEvent& evt)
+void CamuleApp::OnPartFileHashResult(CPartFileHashResultEvent &evt)
 {
 	if (m_app_state == APP_STATE_SHUTTINGDOWN || !theApp || !theApp->IsRunning()) {
 		return;
 	}
 
-	// Look up the file by hash. If it was removed from the download
-	// queue between enqueue and dispatch (cancelled, completed early)
-	// the lookup returns NULL and we drop the event safely.
-	CPartFile* file = downloadqueue->GetFileByID(evt.FileHash());
+	// Look up the file by hash. If it was removed from the download queue between enqueue
+	// and dispatch (cancelled, completed early) the lookup returns NULL and we drop the
+	// event safely.
+	CPartFile *file = downloadqueue->GetFileByID(evt.FileHash());
 	if (!file) {
-		AddDebugLogLineN(logPartFile, CFormat(
-			"Hash result for part %u: file no longer in download queue, dropping")
-			% evt.PartNumber());
+		AddDebugLogLineN(logPartFile,
+			CFormat("Hash result for part %u: file no longer in download queue, dropping") %
+				evt.PartNumber());
 		return;
 	}
 
-	file->OnAsyncHashComplete(evt.PartNumber(), evt.Ok(),
-		evt.FromAICHRecoveryDataAvailable());
+	file->OnAsyncHashComplete(evt.PartNumber(), evt.Ok(), evt.FromAICHRecoveryDataAvailable());
 }
 
-
-void CamuleApp::OnFinishedAICHHashing(CHashingEvent& evt)
+void CamuleApp::OnFinishedAICHHashing(CHashingEvent &evt)
 {
 	wxCHECK_RET(evt.GetResult(), "No result of AICH-hashing");
 
-	CKnownFile* owner = const_cast<CKnownFile*>(evt.GetOwner());
+	CKnownFile *owner = const_cast<CKnownFile *>(evt.GetOwner());
 	CScopedPtr<CKnownFile> result(evt.GetResult());
 
-	// Validate the owner is still alive — AICH hashing of a multi-GB
-	// file can run for many seconds, during which the CKnownFile may
-	// have been TTL-evicted from CKnownFileList::PruneDuplicates or
-	// destroyed via CPartFile::Delete. Without this check we'd deref
-	// freed memory in the swap below. See the broadcast-hook PR
-	// (Notify_KnownFileBeingDestroyed) for the symmetric GUI-side
-	// fixes. Same defensive pattern as OnFinishedHashing above.
-	if (!owner ||
-		(!knownfiles->IsKnownFile(owner)
-			&& !downloadqueue->IsPartFile(owner))) {
+	// Validate the owner is still alive -- AICH hashing of a multi-GB file can run for many
+	// seconds, during which the CKnownFile may have been TTL-evicted from PruneDuplicates
+	// or destroyed via CPartFile::Delete. Without this check the swap below would deref
+	// freed memory. Same defensive pattern as OnFinishedHashing above.
+	if (!owner || (!knownfiles->IsKnownFile(owner) && !downloadqueue->IsPartFile(owner))) {
 		AddDebugLogLineN(logKnownFiles,
 			"OnFinishedAICHHashing: owner CKnownFile was destroyed "
 			"while AICH hashing was in flight; dropping result");
@@ -1616,8 +2241,8 @@
 	}
 
 	if (result->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE) {
-		CAICHHashSet* oldSet = owner->GetAICHHashset();
-		CAICHHashSet* newSet = result->GetAICHHashset();
+		CAICHHashSet *oldSet = owner->GetAICHHashset();
+		CAICHHashSet *newSet = result->GetAICHHashset();
 
 		owner->SetAICHHashset(newSet);
 		newSet->SetOwner(owner);
@@ -1631,14 +2256,152 @@
 	}
 }
 
+void CamuleApp::OnMediaProbeFinished(CMediaProbeEvent &evt)
+{
+	// The task ran off-main; the file may have been unshared while we were probing.
+	// Re-resolve the hash instead of holding a CKnownFile* across the boundary.
+	CKnownFile *file = theApp->knownfiles->FindKnownFileByID(evt.GetHash());
+	// The shared list can hold a DIFFERENT object for the same hash than the known-file map
+	// does -- that is what happens when the same content is shared at more than one path,
+	// which on a media library is common. The probe is scheduled off the shared-list entry
+	// and its gate reads that entry, but the result was only ever applied to the known-file
+	// map's, so the shared entry stayed bare, still looked unprobed, and was re-queued on
+	// every reload and restart -- succeeding every time, which is why it showed up as a
+	// repeating probe with no failures. Both objects are updated now; usually they ARE the
+	// same object and the second update is skipped.
+	CKnownFile *sharedFile =
+		theApp->sharedfiles ? theApp->sharedfiles->GetFileByID(evt.GetHash()) : nullptr;
+	if (sharedFile == file) {
+		sharedFile = nullptr;
+	}
+	if (!file && sharedFile) {
+		file = sharedFile;
+		sharedFile = nullptr;
+	}
+	if (!file) {
+		// The probe ran and its result is being thrown away. That is expected when the file
+		// was unshared mid-probe, but it is also the shape a silently dropped result would
+		// have -- and a dropped result means the file keeps no metadata and no marker, so it
+		// is re-probed on every reload forever.
+		AddLogLineN(CFormat(_("Media metadata: probed file is no longer known, result discarded "
+				      "(%s)")) %
+			    evt.GetHash().Encode());
+		return;
+	}
+
+	// A probe that produced nothing still has to leave a trace, or the gate that skips
+	// already-probed files cannot tell it from a file never tried and re-queues it on every
+	// reload and restart. The existing media tags are left alone: a probe that failed has
+	// established nothing about the file.
+	if (!evt.Succeeded()) {
+		// Only a verdict about the file is recorded. A missing or broken ffprobe, a timeout,
+		// or a file that vanished between queue and probe says nothing about the file itself,
+		// and marking on those would mean one mistyped ffprobe path brands every media file
+		// in the library.
+		if (evt.MarkUnprobeable()) {
+			file->AddTagUnique(CTagInt32(FT_MEDIA_PROBE_FAILED, 1));
+			if (sharedFile) {
+				sharedFile->AddTagUnique(CTagInt32(FT_MEDIA_PROBE_FAILED, 1));
+			}
+			m_mediaTagsDirtiedMs = theStats::GetUptimeMillis();
+		}
+		return;
+	}
+
+	// A successful probe is AUTHORITATIVE for every media field: what it found is attached,
+	// and what it did NOT find is removed. The alternative to a value the probe could not
+	// determine is not "no tag" -- it is whatever was there before, which for a completed
+	// download is the unverified preview inherited from the search result. Leaving that in
+	// place made aMule republish a peer's numbers to ed2k and Kad as its own, which is
+	// exactly what the completion re-probe exists to prevent.
+	//
+	// This runs only when Probe() returned true; a failed probe never reaches here, so an
+	// unreadable file keeps its preview rather than being wiped.
+	//
+	// KNOWN LIMITATION: this corrects a file only when a probe actually runs for it, and
+	// the two callers are the initial share-add and the completion re-probe. Anything
+	// already carrying media tags is skipped by the scheduler's gate, so no later start
+	// re-probes it. Two populations are therefore left uncorrected, and neither is only
+	// about inherited previews:
+	//
+	//  - a download that COMPLETED BEFORE this change keeps whatever its search result
+	//    advertised;
+	//  - a file probed by an earlier build keeps what THAT probe stored -- including a
+	//    cover-art codec, since such a file also carries a real length and so looks probed
+	//    to every version of the gate.
+	//
+	// There is deliberately no migration for either: correcting them needs an explicit
+	// user-triggered re-extraction, which is what issue #1079 is for.
+	const MediaInfo &info = evt.GetInfo();
+	const auto setOrClearInt = &(uint8 id, uint32 value) {
+		for (CKnownFile *target : { file, sharedFile }) {
+			if (!target) {
+				continue;
+			}
+			if (value) {
+				target->AddTagUnique(CTagInt32(id, value));
+			} else {
+				target->RemoveTag(id);
+			}
+		}
+	};
+	const auto setOrClearStr = &(uint8 id, const wxString &value) {
+		for (CKnownFile *target : { file, sharedFile }) {
+			if (!target) {
+				continue;
+			}
+			if (!value.IsEmpty()) {
+				target->AddTagUnique(CTagString(id, value));
+			} else {
+				target->RemoveTag(id);
+			}
+		}
+	};
+	setOrClearInt(FT_MEDIA_LENGTH, info.length_seconds);
+	setOrClearInt(FT_MEDIA_BITRATE, info.bitrate_kbps);
+	setOrClearStr(FT_MEDIA_CODEC, info.codec);
+	setOrClearStr(FT_MEDIA_ARTIST, info.artist);
+	setOrClearStr(FT_MEDIA_ALBUM, info.album);
+	setOrClearStr(FT_MEDIA_TITLE, info.title);
+	// This probe worked, so any earlier failure is stale -- clear it, or a
+	// file that has since been fixed would keep a marker saying otherwise.
+	file->RemoveTag(FT_MEDIA_PROBE_FAILED);
+	if (sharedFile) {
+		sharedFile->RemoveTag(FT_MEDIA_PROBE_FAILED);
+	}
+	// Traced under logMediaProbe -- the "metadata actually landed"
+	// confirmation, logged once per file when tags are attached.
+	AddDebugLogLineN(logMediaProbe,
+		CFormat(wxT("Media metadata: %s -> length=%us bitrate=%ukbps codec=%s artist=%s album=%s "
+			    "title=%s")) %
+			file->GetFileName() % info.length_seconds % info.bitrate_kbps % info.codec %
+			info.artist % info.album % info.title);
+	// EC exports the tag list; the remote GUI + web UI need to see
+	// the new values on next refresher tick.
+	file->MarkECChanged();
+	// The shared-list object is the one EC serves: CFileEncoderMap builds its encoders from
+	// CopyFileList(shares) keyed by ECID, so leaving it unmarked means
+	// Get_EC_Response_GetUpdate takes its unchanged shortcut and every remote client keeps
+	// showing the file bare.
+	if (sharedFile) {
+		sharedFile->MarkECChanged();
+	}
+	// Coalesce the known.met save instead of rewriting the whole file per probe.
+	// CKnownFileList::Save rewrites every known file, so a per-probe save is O(files) each
+	// time -- O(N^2) when the whole library is probed at startup, which pegged a core and
+	// could re-enter Save mid-write. Bump the last-change stamp on every probe; OnCoreTimer
+	// flushes a single Save once probing has been idle for 30 s. The 30-min periodic save
+	// is the backstop.
+	m_mediaTagsDirtiedMs = theStats::GetUptimeMillis();
+}
 
-void CamuleApp::OnFinishedCompletion(CCompletionEvent& evt)
+void CamuleApp::OnFinishedCompletion(CCompletionEvent &evt)
 {
-	CPartFile* completed = const_cast<CPartFile*>(evt.GetOwner());
+	CPartFile *completed = const_cast<CPartFile *>(evt.GetOwner());
 	wxCHECK_RET(completed, "Completion event sent for unspecified file");
-	// wxASSERT_MSG is a no-op in Release; the deref below would UAF
-	// silently if the partfile was cancelled while the completion
-	// worker was running. Convert to a real validate-before-deref.
+	// wxASSERT_MSG is a no-op in Release; the deref below would UAF silently if the
+	// partfile was cancelled while the completion worker was running. Convert to a real
+	// validate-before-deref.
 	if (!downloadqueue->IsPartFile(completed)) {
 		AddDebugLogLineN(logPartFile,
 			"OnFinishedCompletion: completed CPartFile was destroyed "
@@ -1655,15 +2418,13 @@
 	CUserEvents::ProcessEvent(CUserEvents::DownloadCompleted, completed);
 }
 
-void CamuleApp::OnFinishedAllocation(CAllocFinishedEvent& evt)
+void CamuleApp::OnFinishedAllocation(CAllocFinishedEvent &evt)
 {
 	CPartFile *file = evt.GetFile();
 	wxCHECK_RET(file, "Allocation finished event sent for unspecified file");
-	// Preallocation can take 10+ seconds on slow disks (Windows VM
-	// full-prealloc of a 30 GB file is in this range). If the user
-	// cancels the download mid-preallocation, the CPartFile is freed
-	// before this completion event reaches the main thread. wxASSERT
-	// would be a no-op in Release; convert to a real check.
+	// Preallocation can take 10+ seconds on slow disks. If the user cancels the download
+	// mid-preallocation, the CPartFile is freed before this completion event reaches the
+	// main thread -- and wxASSERT would be a no-op in Release.
 	if (!downloadqueue->IsPartFile(file)) {
 		AddDebugLogLineN(logPartFile,
 			"OnFinishedAllocation: partfile was destroyed while "
@@ -1680,25 +2441,29 @@
 			file->ResumeFile();
 		}
 	} else {
-		AddLogLineN(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();
 	}
 
 	file->AllocationFinished();
 };
 
-void CamuleApp::OnNotifyEvent(CMuleGUIEvent& evt)
+void CamuleApp::OnNotifyEvent(CMuleGUIEvent &evt)
 {
 #ifdef AMULE_DAEMON
 	evt.Notify();
 #else
-	if (theApp->amuledlg) {
+	// IsAlways() covers the socket-layer notifications, which have to run whether or not
+	// there is a window. The monolithic app builds its dialog before networking starts, so
+	// this is far less exposed than amulegui, but the window is gone again during shutdown
+	// while sockets are still closing.
+	if (evt.IsAlways() || theApp->amuledlg) {
 		evt.Notify();
 	}
 #endif
 }
 
-
 void CamuleApp::ShutDown()
 {
 	// Just in case
@@ -1770,21 +2535,19 @@
 	AddDebugLogLineN(logGeneral, "CamuleApp::ShutDown() has ended.");
 }
 
-
 bool CamuleApp::AddServer(CServer *srv, bool fromUser)
 {
-	if ( serverlist->AddServer(srv, fromUser) ) {
+	if (serverlist->AddServer(srv, fromUser)) {
 		Notify_ServerAdd(srv);
 		return true;
 	}
 	return false;
 }
 
-
 uint32 CamuleApp::GetPublicIP(bool ignorelocal) const
 {
 	if (m_dwPublicIP == 0) {
-		if (Kademlia::CKademlia::IsConnected() && Kademlia::CKademlia::GetIPAddress() ) {
+		if (Kademlia::CKademlia::IsConnected() && Kademlia::CKademlia::GetIPAddress()) {
 			return wxUINT32_SWAP_ALWAYS(Kademlia::CKademlia::GetIPAddress());
 		} else {
 			return ignorelocal ? 0 : m_localip;
@@ -1794,7 +2557,6 @@
 	return m_dwPublicIP;
 }
 
-
 void CamuleApp::SetPublicIP(const uint32 dwIP)
 {
 	wxASSERT((dwIP == 0) || !IsLowID(dwIP));
@@ -1807,16 +2569,15 @@
 	}
 }
 
-
 wxString CamuleApp::GetLog(bool reset)
 {
 	wxFile logfile;
 	logfile.Open(thePrefs::GetConfigDir() + "logfile");
-	if ( !logfile.IsOpened() ) {
+	if (!logfile.IsOpened()) {
 		return _("ERROR: can't open logfile");
 	}
 	int len = logfile.Length();
-	if ( len == 0 ) {
+	if (len == 0) {
 		return _("WARNING: logfile is empty. Something is wrong.");
 	}
 	char *tmp_buffer = new charlen + sizeof(wxChar);
@@ -1826,12 +2587,12 @@
 	// try to guess file format
 	wxString str;
 	if (tmp_buffer0 && tmp_buffer1) {
-		str = wxString::FromUTF8(tmp_buffer); 
+		str = wxString::FromUTF8(tmp_buffer);
 	} else {
-		str = wxString(tmp_buffer); 
+		str = wxString(tmp_buffer);
 	}
-	delete  tmp_buffer;
-	if ( reset ) {
+	delete tmp_buffer;
+	if (reset) {
 		theLogger.CloseLogfile();
 		if (theLogger.OpenLogfile(thePrefs::GetConfigDir() + "logfile")) {
 			AddLogLineN(_("Log has been reset"));
@@ -1841,11 +2602,10 @@
 	return str;
 }
 
-
 wxString CamuleApp::GetServerLog(bool reset)
 {
 	wxString ret = server_msg;
-	if ( reset ) {
+	if (reset) {
 		server_msg.Clear();
 	}
 	return ret;
@@ -1856,67 +2616,108 @@
 	return GetLog(reset);
 }
 
-
 void CamuleApp::AddServerMessageLine(wxString &msg)
 {
 	server_msg += msg + "\n";
 	AddLogLineN(CFormat(_("ServerMessage: %s")) % msg);
 }
 
-
-
-void CamuleApp::OnFinishedHTTPDownload(CMuleInternalEvent& event)
+void CamuleApp::OnFinishedHTTPDownload(CMuleInternalEvent &event)
 {
 	switch (event.GetInt()) {
-		case HTTP_IPFilter:
-			ipfilter->DownloadFinished(event.GetExtraInt64());
-			break;
-		case HTTP_ServerMet:
-			if (serverlist->DownloadFinished(event.GetExtraInt64()) && !IsConnectedED2K()) {
-				// If successfully downloaded a server list, and are not connected at the moment, try to connect.
-				// This happens when no server met is available on startup.
-				serverconnect->ConnectToAnyServer();
-			}
-			break;
-		case HTTP_ServerMetAuto:
-			serverlist->AutoDownloadFinished(event.GetExtraInt64());
-			break;
-		case HTTP_VersionCheck:
-			CheckNewVersion(event.GetExtraInt64());
-			break;
-		case HTTP_NodesDat:
-			if (event.GetExtraInt64() == HTTP_Success) {
-
-				wxString file = thePrefs::GetConfigDir() + "nodes.dat";
-				if (wxFileExists(file)) {
-					wxRemoveFile(file);
-				}
+	case HTTP_IPFilter:
+		ipfilter->DownloadFinished(event.GetExtraInt64());
+		break;
+	case HTTP_ServerMet:
+		if (serverlist->DownloadFinished(event.GetExtraInt64()) && !IsConnectedED2K()) {
+			// If successfully downloaded a server list, and are not connected at the moment, try
+			// to connect. This happens when no server met is available on startup.
+			serverconnect->ConnectToAnyServer();
+		}
+		break;
+	case HTTP_ServerMetAuto:
+		serverlist->AutoDownloadFinished(event.GetExtraInt64());
+		break;
+#ifdef ENABLE_VERSION_CHECK
+	case HTTP_VersionCheck:
+		CheckNewVersion(event.GetExtraInt64());
+		break;
+#endif
+	case HTTP_NodesDat:
+		if (event.GetExtraInt64() == HTTP_Success) {
+
+			wxString file = thePrefs::GetConfigDir() + "nodes.dat";
+			if (wxFileExists(file)) {
+				wxRemoveFile(file);
+			}
 
-				if ( Kademlia::CKademlia::IsRunning() ) {
-					Kademlia::CKademlia::Stop();
-				}
+			if (Kademlia::CKademlia::IsRunning()) {
+				Kademlia::CKademlia::Stop();
+			}
 
-				wxRenameFile(file + ".download",file);
+			wxRenameFile(file + ".download", file);
 
-				Kademlia::CKademlia::Start();
-				theApp->ShowConnectionState();
+			Kademlia::CKademlia::Start();
+			theApp->ShowConnectionState();
 			// cppcheck-suppress duplicateBranch
-			} else if (event.GetExtraInt64() == HTTP_Skipped) {
-				AddLogLineN(CFormat(_("Skipped download of %s, because requested file is not newer.")) % "nodes.dat");
-			} else {
-				AddLogLineC(_("Failed to download the nodes list."));
-			}
-			break;
+		} else if (event.GetExtraInt64() == HTTP_Skipped) {
+			AddLogLineN(
+				CFormat(_("Skipped download of %s, because requested file is not newer.")) %
+				"nodes.dat");
+		} else {
+			AddLogLineC(_("Failed to download the nodes list."));
+		}
+		break;
 #ifdef ENABLE_IP2COUNTRY
-		case HTTP_GeoIP:
-			theApp->amuledlg->IP2CountryDownloadFinished(event.GetExtraInt64());
-			// If we updated, the dialog is already up. Redraw it to show the flags.
+	case HTTP_GeoIP:
+		// Core resolver handles the swap-in of the freshly downloaded DB (daemon +
+		// monolithic). GetIP2Country() is NULL on amulegui, which has no local resolver --
+		// it never starts a GeoIP download.
+		if (theApp->GetIP2Country()) {
+			theApp->GetIP2Country()->DownloadFinished(event.GetExtraInt64());
+		}
+#ifndef AMULE_DAEMON
+		// Refresh the prefs IP2Country status block if the user is watching it,
+		// and redraw the main dialog so refreshed flags show up.
+		PrefsUnifiedDlg::RefreshIP2CountryStatusIfOpen();
+		if (theApp->amuledlg) {
 			theApp->amuledlg->Refresh();
-			break;
+		}
+#endif
+		break;
 #endif
 	}
 }
 
+#ifdef ENABLE_VERSION_CHECK
+bool CamuleApp::StartVersionCheck()
+{
+	// Throttle against GitHub's unauthenticated rate limit (60 req/hr): skip triggers
+	// arriving within the cooldown of the last attempt. The startup call is the first
+	// attempt (m_versionCheckLastAttempt == 0) so it always runs.
+	const time_t kMinInterval = 60; // seconds
+	const time_t now = time(nullptr);
+	if (m_versionCheckLastAttempt != 0 && now - m_versionCheckLastAttempt < kMinInterval) {
+		return false;
+	}
+	m_versionCheckLastAttempt = now;
+
+	// The GitHub Releases "latest" endpoint returns JSON describing the most recent
+	// non-prerelease, non-draft Release. CheckNewVersion() parses the tag_name on
+	// completion. Fire-and-forget through the download thread so no dialog pops up. Reused
+	// by OnInit and the EC_OP_VERSION_CHECK trigger.
+	CHTTPDownloadThread *version_check =
+		new CHTTPDownloadThread("https://api.github.com/repos/amule-org/amule/releases/latest",
+			thePrefs::GetConfigDir() + "last_version_check",
+			thePrefs::GetConfigDir() + "last_version",
+			HTTP_VersionCheck,
+			false,
+			false);
+	version_check->Create();
+	version_check->Run();
+	return true;
+}
+
 void CamuleApp::CheckNewVersion(uint32 result)
 {
 	if (result == HTTP_Success) {
@@ -1924,99 +2725,62 @@
 		wxTextFile file;
 
 		if (!file.Open(filename)) {
-			AddLogLineC(_("Failed to open the downloaded version check file") );
+			AddLogLineC(_("Failed to open the downloaded version check file"));
 			return;
 		} else if (!file.GetLineCount()) {
 			AddLogLineC(_("Corrupted version check file"));
 		} else {
-			// The downloaded file is the GitHub Releases /latest JSON
-			// response.  Concatenate all lines so the regex below
-			// matches across the pretty-printed payload.
+			// The downloaded file is the GitHub Releases /latest JSON response. Concatenate
+			// all lines so the regex below matches across the pretty-printed payload.
 			wxString jsonContent;
 			for (size_t i = 0; i < file.GetLineCount(); ++i) {
 				jsonContent += file.GetLine(i);
 			}
 
-			// Extract the `tag_name` string from the JSON.  The
-			// /releases/latest endpoint excludes pre-releases by
-			// design, so any tag_name we see here represents the
-			// latest stable Release.  We don't need a full JSON
-			// parser for one well-known field — a regex on the
-			// `"tag_name": "..."` pair is robust against
-			// whitespace and field-order changes.
-			wxRegEx tagRe("\"tag_name\":space:*::space:*\"(^\"+)\"");
-			if (!tagRe.IsValid() || !tagRe.Matches(jsonContent)) {
+			// Shared parse + compare (OtherFunctions.cpp: CompareLatestReleaseVersion) -- the
+			// same logic the GUI check (CVersionCheck) and amuleapi use. Folds the former
+			// regex/strip/tokenize block into one call; the ParseError branch covers every
+			// "corrupt input" case the inline code returned on (bad regex, empty tag,
+			// non-numeric component).
+			const CVersionCompareResult vc = CompareLatestReleaseVersion(jsonContent);
+			if (vc.state == CVersionCompareResult::ParseError) {
 				AddLogLineC(_("Corrupted version check file"));
 				file.Close();
 				wxRemoveFile(filename);
 				return;
 			}
-			wxString versionLine = tagRe.GetMatch(jsonContent, 1);
-
-			// Strip the optional `v` prefix (aMule's tags are bare
-			// semver, but be tolerant in case a future maintainer
-			// switches to vX.Y.Z).
-			if (versionLine.StartsWith("v") || versionLine.StartsWith("V")) {
-				versionLine = versionLine.Mid(1);
-			}
-
-			// Strip any pre-release / build-metadata suffix so the
-			// integer comparison sees only MAJOR.MINOR.UPDATE.
-			// /releases/latest already excludes pre-releases, but
-			// be defensive: a stable tag like `3.0.0+build42`
-			// should still parse.
-			size_t suffixPos = versionLine.find_first_of(wxT("-+"));
-			if (suffixPos != wxString::npos) {
-				versionLine = versionLine.Mid(0, suffixPos);
-			}
-
-			// Catch degenerate inputs where the prefix/suffix
-			// strip leaves nothing behind (e.g. tag_name "v",
-			// "-foo", "v-rc1").  Without this guard the
-			// tokenizer returns no tokens, all three fields
-			// stay at 0, and the comparison silently reports
-			// "up to date" against an unparseable input.
-			if (versionLine.IsEmpty()) {
-				AddLogLineC(_("Corrupted version check file"));
-				file.Close();
-				wxRemoveFile(filename);
-				return;
-			}
-
-			wxStringTokenizer tkz(versionLine, ".");
-
-			AddDebugLogLineN(logGeneral, wxString("Running: ") + VERSION + ", Version check: " + versionLine);
-
-			long fields = {0, 0, 0};
-			for (int i = 0; i < 3; ++i) {
-				if (!tkz.HasMoreTokens()) {
-					// Tags with fewer than three components (e.g.
-					// a maintainer tagging "3.1" instead of "3.1.0")
-					// are valid; treat the missing field as 0.
-					break;
-				}
-				wxString token = tkz.GetNextToken();
 
-				if (!token.ToLong(&fieldsi)) {
-					AddLogLineC(_("Corrupted version check file"));
-					file.Close();
-					wxRemoveFile(filename);
-					return;
-				}
-			}
+			// Persist the outcome so it can be relayed over EC to amuleapi (the /version
+			// "update" object) and read by the UIs. Set on any successful parse (up-to-date or
+			// outdated).
+			m_versionCheckLatest = vc.latest;
+			m_versionCheckOutdated = (vc.state == CVersionCompareResult::Outdated);
+			m_versionCheckDone = true;
+			m_versionCheckTimestamp = time(nullptr);
+
+			// Drive the monolithic GUI's "new version" popup from the shared engine (no-op on
+			// the daemon; amulegui runs its own check). This is why the monolithic no longer
+			// needs a separate CVersionCheck.
+			Notify_VersionCheckResult(m_versionCheckLatest, m_versionCheckOutdated);
 
-			long curVer = make_full_ed2k_version(VERSION_MJR, VERSION_MIN, VERSION_UPDATE);
-			long newVer = make_full_ed2k_version(fields0, fields1, fields2);
+			AddDebugLogLineN(logGeneral,
+				wxString("Running: ") + VERSION + ", Version check: " + vc.latest);
 
-			if (curVer < newVer) {
+			if (vc.state == CVersionCompareResult::Outdated) {
 				AddLogLineC(_("You are using an outdated version of aMule!"));
 				// cppcheck-suppress zerodiv
-				AddLogLineN(CFormat(_("Your aMule version is %i.%i.%i and the latest version is %li.%li.%li")) % VERSION_MJR % VERSION_MIN % VERSION_UPDATE % fields0 % fields1 % fields2);
-				AddLogLineN(_("The latest version can always be found at https://github.com/amule-org/amule/releases/latest"));
-				#ifdef AMULE_DAEMON
-				AddLogLineCS(CFormat(_("WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"))
-					% VERSION_MJR % VERSION_MIN % VERSION_UPDATE % fields0 % fields1 % fields2);
-				#endif
+				AddLogLineN(CFormat(_("Your aMule version is %i.%i.%i and the latest version "
+						      "is %li.%li.%li")) %
+					    VERSION_MJR % VERSION_MIN % VERSION_UPDATE % vc.major % vc.minor %
+					    vc.update);
+				AddLogLineN(_("The latest version can always be found at "
+					      "https://github.com/amule-org/amule/releases/latest"));
+#ifdef AMULE_DAEMON
+				AddLogLineCS(CFormat(_("WARNING: Your aMuled version is outdated: %i.%i.%i < "
+						       "%li.%li.%li")) %
+					     VERSION_MJR % VERSION_MIN % VERSION_UPDATE % vc.major %
+					     vc.minor % vc.update);
+#endif
 			} else {
 				AddLogLineN(_("Your copy of aMule is up to date."));
 			}
@@ -2027,28 +2791,24 @@
 	} else {
 		AddLogLineC(_("Failed to download the version check file"));
 	}
-
 }
-
+#endif // ENABLE_VERSION_CHECK
 
 bool CamuleApp::IsConnected() const
 {
 	return (IsConnectedED2K() || IsConnectedKad());
 }
 
-
 bool CamuleApp::IsConnectedED2K() const
 {
 	return serverconnect && serverconnect->IsConnected();
 }
 
-
 bool CamuleApp::IsConnectedKad() const
 {
 	return Kademlia::CKademlia::IsConnected();
 }
 
-
 bool CamuleApp::IsFirewalled() const
 {
 	if (theApp->IsConnectedED2K() && !theApp->serverconnect->IsLowID()) {
@@ -2060,14 +2820,14 @@
 
 bool CamuleApp::IsFirewalledKad() const
 {
-	return !Kademlia::CKademlia::IsConnected()		// not connected counts as firewalled
-			|| Kademlia::CKademlia::IsFirewalled();
+	return !Kademlia::CKademlia::IsConnected() // not connected counts as firewalled
+	       || Kademlia::CKademlia::IsFirewalled();
 }
 
 bool CamuleApp::IsFirewalledKadUDP() const
 {
-	return !Kademlia::CKademlia::IsConnected()		// not connected counts as firewalled
-			|| Kademlia::CUDPFirewallTester::IsFirewalledUDP(true);
+	return !Kademlia::CKademlia::IsConnected() // not connected counts as firewalled
+	       || Kademlia::CUDPFirewallTester::IsFirewalledUDP(true);
 }
 
 bool CamuleApp::IsKadRunning() const
@@ -2111,7 +2871,6 @@
 	return Kademlia::CKademlia::GetIndexed()->m_totalIndexLoad;
 }
 
-
 // True IP of machine
 uint32 CamuleApp::GetKadIPAddress() const
 {
@@ -2119,22 +2878,22 @@
 }
 
 // Buddy status
-uint8	CamuleApp::GetBuddyStatus() const
+uint8 CamuleApp::GetBuddyStatus() const
 {
 	return clientlist->GetBuddyStatus();
 }
 
-uint32	CamuleApp::GetBuddyIP() const
+uint32 CamuleApp::GetBuddyIP() const
 {
 	return clientlist->GetBuddyIP();
 }
 
-uint32	CamuleApp::GetBuddyPort() const
+uint32 CamuleApp::GetBuddyPort() const
 {
 	return clientlist->GetBuddyPort();
 }
 
-const Kademlia::CUInt128& CamuleApp::GetKadID() const
+const Kademlia::CUInt128 &CamuleApp::GetKadID() const
 {
 	return Kademlia::CKademlia::GetKadID();
 }
@@ -2145,53 +2904,57 @@
 		if (IsConnectedED2K()) {
 			if (serverconnect->IsLowID()) {
 				if (Kademlia::CKademlia::IsFirewalled()) {
-					//Both Connected - Both Firewalled
+					// Both Connected - Both Firewalled
 					return false;
 				} else {
-					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.
+					if (clientServerIP ==
+							theApp->serverconnect->GetCurrentServer()->GetIP() &&
+						clientServerPort == theApp->serverconnect->GetCurrentServer()
+									    ->GetPort()) {
+						// Both connected, server LowID, Kad open, client on the same
+						// server. Prevent a callback to the server: it breaks the
+						// protocol and gets you banned.
 						return false;
 					} else {
-						// Both Connected - Server lowID, Kad Open - Client on remote server
+						// Both Connected - Server lowID, Kad Open - Client on remote
+						// server
 						return true;
 					}
 				}
 			} else {
-				//Both Connected - Server HighID, Kad don't care
+				// Both Connected - Server HighID, Kad don't care
 				return true;
 			}
 		} else {
 			if (Kademlia::CKademlia::IsFirewalled()) {
-				//Only Kad Connected - Kad Firewalled
+				// Only Kad Connected - Kad Firewalled
 				return false;
 			} else {
-				//Only Kad Connected - Kad Open
+				// Only Kad Connected - Kad Open
 				return true;
 			}
 		}
 	} else {
 		if (IsConnectedED2K()) {
 			if (serverconnect->IsLowID()) {
-				//Only Server Connected - Server LowID
+				// Only Server Connected - Server LowID
 				return false;
 			} else {
-				//Only Server Connected - Server HighID
+				// Only Server Connected - Server HighID
 				return true;
 			}
 		} else {
-			//We are not connected at all!
+			// We are not connected at all!
 			return false;
 		}
 	}
 }
 
-void CamuleApp::ShowUserCount() {
+void CamuleApp::ShowUserCount()
+{
 	uint32 totaluser = 0, totalfile = 0;
 
-	theApp->serverlist->GetUserFileStatus( totaluser, totalfile );
+	theApp->serverlist->GetUserFileStatus(totaluser, totalfile);
 
 	wxString buffer;
 
@@ -2199,11 +2962,16 @@
 	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(totaluser) % CastItoIShort(Kademlia::CKademlia::GetKademliaUsers()) % CastItoIShort(totalfile) % CastItoIShort(Kademlia::CKademlia::GetKademliaFiles());
+		buffer = CFormat(s_bothnetstatusformat) % CastItoIShort(totaluser) %
+			 CastItoIShort(Kademlia::CKademlia::GetKademliaUsers()) % CastItoIShort(totalfile) %
+			 CastItoIShort(Kademlia::CKademlia::GetKademliaFiles());
 	} else if (thePrefs::GetNetworkED2K()) {
-		buffer = CFormat(s_singlenetstatusformat) % CastItoIShort(totaluser) % CastItoIShort(totalfile);
+		buffer = CFormat(s_singlenetstatusformat) % CastItoIShort(totaluser) %
+			 CastItoIShort(totalfile);
 	} else if (thePrefs::GetNetworkKademlia()) {
-		buffer = CFormat(s_singlenetstatusformat) % CastItoIShort(Kademlia::CKademlia::GetKademliaUsers()) % CastItoIShort(Kademlia::CKademlia::GetKademliaFiles());
+		buffer = CFormat(s_singlenetstatusformat) %
+			 CastItoIShort(Kademlia::CKademlia::GetKademliaUsers()) %
+			 CastItoIShort(Kademlia::CKademlia::GetKademliaFiles());
 	} else {
 		buffer = _("No networks selected");
 	}
@@ -2211,10 +2979,9 @@
 	Notify_ShowUserCount(buffer);
 }
 
-
 void CamuleApp::ShowConnectionState(bool forceUpdate)
 {
-	static uint8 old_state = (1<<7); // This flag doesn't exist
+	static uint8 old_state = (1 << 7); // This flag doesn't exist
 
 	uint8 state = 0;
 
@@ -2234,28 +3001,25 @@
 		}
 	}
 
-	// Wipe the cumulative server-message buffer when the connected
-	// ed2k server changes (either disconnected, or switched A -> B).
-	// Without this the Server Info tab keeps showing messages from the
-	// server we just left. We do the data clear here so amulegui sees
-	// the cleared buffer on its next EC_OP_GET_SERVERINFO poll without
-	// any extra round trip — the existing else branch in
-	// CServerInfoHandlerRem::HandlePacket resets the local view when
-	// fullLog shortens. The on-screen text ctrl in monolithic builds
-	// is cleared from CamuleDlg::ShowConnectionState's matching
-	// detection.
-	static CServer* s_lastConnectedServer = NULL;
-	CServer* nowConnectedServer = (state & CONNECTED_ED2K)
-		? theApp->serverconnect->GetCurrentServer() : NULL;
-	if (s_lastConnectedServer != NULL
-		&& (!(state & CONNECTED_ED2K)
-			|| (nowConnectedServer && nowConnectedServer != s_lastConnectedServer))) {
+	// Wipe the cumulative server-message buffer when the connected ed2k server changes
+	// (either disconnected, or switched A -> B). Without this the Server Info tab keeps
+	// showing messages from the server we just left. The data clear happens here so
+	// amulegui sees the cleared buffer on its next EC_OP_GET_SERVERINFO poll without any
+	// extra round trip -- the existing else branch in CServerInfoHandlerRem::HandlePacket
+	// resets the local view when fullLog shortens. The on-screen text ctrl in monolithic
+	// builds is cleared from CamuleDlg::ShowConnectionState's matching detection.
+	static CServer *s_lastConnectedServer = NULL;
+	CServer *nowConnectedServer =
+		(state & CONNECTED_ED2K) ? theApp->serverconnect->GetCurrentServer() : NULL;
+	if (s_lastConnectedServer != NULL &&
+		(!(state & CONNECTED_ED2K) ||
+			(nowConnectedServer && nowConnectedServer != s_lastConnectedServer))) {
 		server_msg.Clear();
 	}
 	if (nowConnectedServer) {
 		s_lastConnectedServer = nowConnectedServer;
 	} else if (!(state & CONNECTED_ED2K)) {
-		// Truly disconnected — drop the cached pointer so a reconnect
+		// Truly disconnected -- drop the cached pointer so a reconnect
 		// to the same server doesn't spuriously clear next time.
 		s_lastConnectedServer = NULL;
 	}
@@ -2267,32 +3031,39 @@
 		if (changed_flags & CONNECTED_ED2K) {
 			// ED2K status changed
 			wxString connected_server;
-			CServer* ed2k_server = theApp->serverconnect->GetCurrentServer();
+			CServer *ed2k_server = theApp->serverconnect->GetCurrentServer();
 			if (ed2k_server) {
 				connected_server = ed2k_server->GetListName();
 			}
 			if (state & CONNECTED_ED2K) {
 				// We connected to some server
-				const wxString id = theApp->serverconnect->IsLowID() ? _("with LowID") : _("with HighID");
+				const wxString id =
+					theApp->serverconnect->IsLowID() ? _("with LowID") : _("with HighID");
 
 				AddLogLineC(CFormat(_("Connected to %s %s")) % connected_server % id);
+				m_ed2kConnectedSince = wxDateTime::Now();
 			} else {
 				// cppcheck-suppress duplicateBranch
-				if ( theApp->serverconnect->IsConnecting() ) {
+				if (theApp->serverconnect->IsConnecting()) {
 					AddLogLineC(CFormat(_("Connecting to %s")) % connected_server);
 				} else {
 					AddLogLineC(_("Disconnected from eD2k"));
 				}
+				m_ed2kConnectedSince = wxDateTime();
 			}
 		}
 
-		if (changed_flags & CONNECTED_KAD_NOT) {
-			// cppcheck-suppress duplicateBranch
-			if (state & CONNECTED_KAD_NOT) {
-				AddLogLineC(_("Kad started."));
-			} else {
-				AddLogLineC(_("Kad stopped."));
-			}
+		// Kad's three flags together mean "running"; CONNECTED_KAD_NOT alone means "running, but no
+		// contact yet". Keying these two messages on that single flag mislabelled both its edges:
+		// finishing the bootstrap clears it and printed "Kad stopped.", losing contact sets it and
+		// printed "Kad started." (amule-org/amule#1369). This pair is about whether Kad is running,
+		// so test that; the block below reports the connected edge on its own.
+		const uint8 kad_running_flags =
+			CONNECTED_KAD_NOT | CONNECTED_KAD_OK | CONNECTED_KAD_FIREWALLED;
+		const bool kad_was_running = (old_state & kad_running_flags) != 0;
+		const bool kad_is_running = (state & kad_running_flags) != 0;
+		if (kad_was_running != kad_is_running) {
+			AddLogLineC(kad_is_running ? _("Kad started.") : _("Kad stopped."));
 		}
 
 		if (changed_flags & (CONNECTED_KAD_OK | CONNECTED_KAD_FIREWALLED)) {
@@ -2303,8 +3074,10 @@
 				} else {
 					AddLogLineC(_("Connected to Kad (firewalled)"));
 				}
+				m_kadConnectedSince = wxDateTime::Now();
 			} else {
 				AddLogLineC(_("Disconnected from Kad"));
+				m_kadConnectedSince = wxDateTime();
 			}
 		}
 
@@ -2317,11 +3090,10 @@
 	Notify_ShowConnState(forceUpdate);
 }
 
-
 void CamuleApp::OnUnhandledException()
 {
 	// Call the generic exception-handler.
-	fprintf(stderr, "\taMule Version: %s\n", (const char*)unicode2char(GetFullMuleVersion()));
+	fprintf(stderr, "\taMule Version: %s\n", (const char *)unicode2char(GetFullMuleVersion()));
 	::OnUnhandledException();
 }
 
@@ -2336,7 +3108,8 @@
 				ipfilter->StartKADWhenReady();
 			}
 		} else {
-			AddLogLineC(_("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()) {
 		AddLogLineC(_("Kad network disabled on preferences, not connecting."));
@@ -2348,16 +3121,14 @@
 	// Stop Kad if it's running
 	if (Kademlia::CKademlia::IsRunning()) {
 		Kademlia::CKademlia::Stop();
-		// Refresh the status-bar Kad indicator immediately; the
-		// symmetric BootstrapKad() path already does this after
-		// Start(). Without it the "Disconnect Kad" button in
-		// KadDlg leaves a stale "Connected to Kad" indicator
-		// until the next periodic refresh in the main timer.
+		// Refresh the status-bar Kad indicator immediately; the symmetric BootstrapKad()
+		// path already does this after Start(). Without it the "Disconnect Kad" button in
+		// KadDlg leaves a stale "Connected to Kad" indicator until the next periodic refresh
+		// in the main timer.
 		ShowConnectionState();
 	}
 }
 
-
 void CamuleApp::BootstrapKad(uint32 ip, uint16 port)
 {
 	if (!Kademlia::CKademlia::IsRunning()) {
@@ -2368,17 +3139,16 @@
 	Kademlia::CKademlia::Bootstrap(ip, port);
 }
 
-
-void CamuleApp::UpdateNotesDat(const wxString& url)
+void CamuleApp::UpdateNotesDat(const wxString &url)
 {
 	wxString strTempFilename(thePrefs::GetConfigDir() + "nodes.dat.download");
 
-	CHTTPDownloadThread *downloader = new CHTTPDownloadThread(url, strTempFilename, thePrefs::GetConfigDir() + "nodes.dat", HTTP_NodesDat, true, false);
+	CHTTPDownloadThread *downloader = new CHTTPDownloadThread(
+		url, strTempFilename, thePrefs::GetConfigDir() + "nodes.dat", HTTP_NodesDat, true, false);
 	downloader->Create();
 	downloader->Run();
 }
 
-
 void CamuleApp::DisconnectED2K()
 {
 	// Stop ED2K if it's running
@@ -2392,19 +3162,21 @@
 	return clientcredits && clientcredits->CryptoAvailable();
 }
 
-uint32 CamuleApp::GetED2KID() const {
+uint32 CamuleApp::GetED2KID() const
+{
 	return serverconnect ? serverconnect->GetClientID() : 0;
 }
 
-uint32 CamuleApp::GetID() const {
+uint32 CamuleApp::GetID() const
+{
 	uint32 ID;
 
-	if( Kademlia::CKademlia::IsConnected() && !Kademlia::CKademlia::IsFirewalled() ) {
+	if (Kademlia::CKademlia::IsConnected() && !Kademlia::CKademlia::IsFirewalled()) {
 		// We trust Kad above ED2K
 		ID = ENDIAN_NTOHL(Kademlia::CKademlia::GetIPAddress());
-	} else if( theApp->serverconnect->IsConnected() ) {
+	} else if (theApp->serverconnect->IsConnected()) {
 		ID = theApp->serverconnect->GetClientID();
-	} else if ( Kademlia::CKademlia::IsConnected() && Kademlia::CKademlia::IsFirewalled() ) {
+	} else if (Kademlia::CKademlia::IsConnected() && Kademlia::CKademlia::IsFirewalled()) {
 		// A firewalled Kad client gets a "1"
 		ID = 1;
 	} else {
@@ -2417,4 +3189,4 @@
 wxDEFINE_EVENT(wxEVT_CORE_FINISHED_HTTP_DOWNLOAD, wxEvent);
 wxDEFINE_EVENT(wxEVT_CORE_SOURCE_DNS_DONE, wxEvent);
 wxDEFINE_EVENT(wxEVT_CORE_UDP_DNS_DONE, wxEvent);
-wxDEFINE_EVENT(wxEVT_CORE_SERVER_DNS_DONE, wxEvent);// File_checked_for_headers
+wxDEFINE_EVENT(wxEVT_CORE_SERVER_DNS_DONE, wxEvent); // File_checked_for_headers

amule-3.0.1.tar.gz/src/amule.h -> amule-3.1.0.tar.gz/src/amule.h Changed

@@ -23,32 +23,45 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #ifndef AMULE_H
 #define AMULE_H
 
+#include <wx/app.h>      // Needed for wxApp
+#include <wx/datetime.h> // Needed for wxDateTime (ED2K/Kad "Connected since")
+#include <wx/intl.h>     // Needed for wxLocale
+#include <wx/timer.h>    // Needed for wxTimer (startup splash poll)
 
-#include <wx/app.h>			// Needed for wxApp
-#include <wx/intl.h>			// Needed for wxLocale
-
-
-#include "Types.h"			// Needed for int32, uint16 and uint64
+#include "Types.h"    // Needed for int32, uint16 and uint64
+#include <functional> // Needed for std::function (DeferShutDownToOuterLoop)
 #include <map>
 #ifndef __WINDOWS__
-	#include <signal.h>
+#include <signal.h>
 #endif // __WINDOWS__
 
-#include "config.h"			// Needed for ENABLE_UPNP
+#include "config.h" // Needed for ENABLE_UPNP
+
+// GeoIP country DISPLAY + remote-config capability, as opposed to the resolver. True for a
+// resolver-owning build (ENABLE_IP2COUNTRY, needs libmaxminddb) or any remote GUI (amulegui, which
+// receives country codes over EC and links no library). Gate flag rendering, the country columns
+// and the IP2Country prefs page on GEOIP_GUI; keep ENABLE_IP2COUNTRY for the resolver itself.
+#if defined(ENABLE_IP2COUNTRY) || defined(CLIENT_GUI)
+#define GEOIP_GUI 1
+#endif
 
 class CAbstractFile;
 class CKnownFile;
+class CSplashScreen;
 class ExternalConn;
 class CamuleDlg;
+class CIP2Country;
+class CCountryFlags;
 class CPreferences;
 class CDownloadQueue;
 class CUploadQueue;
 class CPartFileWriteThread;
 class CPartFileHashThread;
+class CMediaProbeThread;
+class CFreeSpaceThread;
 class CPartFileHashResultEvent;
 class CServerConnect;
 class CSharedFileList;
@@ -61,8 +74,10 @@
 class CKnownFileList;
 class CCanceledFileList;
 class CSearchList;
+class CBrowseManager;
 class CClientCreditsList;
 class CFriendList;
+class CChatSessionStore;
 class CClientUDPSocket;
 class CIPFilter;
 class UploadBandwidthThrottler;
@@ -75,30 +90,31 @@
 class CStatistics;
 class wxCommandEvent;
 class wxCloseEvent;
+class wxIdleEvent;
 class wxFFileOutputStream;
 class CTimer;
 class CTimerEvent;
-class wxSingleInstanceChecker;
+class InstanceLock;
 class CHashingEvent;
+class CMediaProbeEvent;
 class CMuleInternalEvent;
 class CCompletionEvent;
 class CAllocFinishedEvent;
 class wxExecuteData;
 class CLoggingEvent;
 
-
-namespace MuleNotify {
-	class CMuleGUIEvent;
+namespace MuleNotify
+{
+class CMuleGUIEvent;
 }
 
 using MuleNotify::CMuleGUIEvent;
 
-
-namespace Kademlia {
-	class CUInt128;
+namespace Kademlia
+{
+class CUInt128;
 }
 
-
 #ifdef AMULE_DAEMON
 #define AMULE_APP_BASE wxAppConsole
 #define CORE_TIMER_PERIOD 300
@@ -107,82 +123,200 @@
 #define CORE_TIMER_PERIOD 100
 #endif
 
-#define CONNECTED_ED2K (1<<0)
-#define CONNECTED_KAD_NOT (1<<1)
-#define CONNECTED_KAD_OK (1<<2)
-#define CONNECTED_KAD_FIREWALLED (1<<3)
-
+// How long the amuleapi EC token file may sit on disk before the core removes it, read or not: long
+// enough for a slow exec on a loaded machine, short enough not to leave a secret at rest.
+#define EC_TOKEN_FILE_TTL_MS 10000
 
-void OnShutdownSignal( int /* sig */ );
+#define CONNECTED_ED2K (1 << 0)
+#define CONNECTED_KAD_NOT (1 << 1)
+#define CONNECTED_KAD_OK (1 << 2)
+#define CONNECTED_KAD_FIREWALLED (1 << 3)
 
+void OnShutdownSignal(int /* sig */);
 
 // Base class common to amule, aamuled and amulegui
 class CamuleAppCommon
 {
 private:
-	// Used to detect a previous running instance of aMule
-	wxSingleInstanceChecker*	m_singleInstance;
+	// Detects a previous running instance. InstanceLock replaces wxSingleInstanceChecker on
+	// POSIX so the check survives PID-namespace boundaries (Flatpak).
+	InstanceLock *m_singleInstance;
+
+	bool CheckPassedLink(const wxString &in, wxString &out, int cat);
+
+public:
+	// Outcome of trying to read a path as a collection.
+	enum CollectionExpansion
+	{
+		// The path isn't a collection; a command-line caller treats it
+		// as a link instead.
+		kNotACollection,
+		// The path named a collection and its links were emitted.
+		kCollectionExpanded,
+		// The path named a collection we could not read. Already logged, and not retried as
+		// a link -- that would emit a second, misleading "invalid eD2k link" error.
+		kCollectionFailed
+	};
+
+	/**
+	 * Expands a .emulecollection into its eD2k links.
+	 *
+	 * Reads the file from this host's filesystem, so a caller holding a remote core's path must
+	 * resolve it first (FileLaunch::ResolvePath). Accepts a plain path or a file:// URL, since
+	 * file managers pass either. Each link goes through CheckPassedLink(), so the caller gets
+	 * the same canonicalisation and category suffix as a link typed on the command line.
+	 * Missing, malformed and empty collections are reported here; the caller only has to stop.
+	 */
+	CollectionExpansion ExpandPassedCollection(const wxString &in, wxArrayString &out, int cat);
+
+	/**
+	 * Queues every collection among @a fileNames into the ED2KLinks file.
+	 *
+	 * The macOS "open document" path: the OS hands us the files the user double-clicked or
+	 * dropped on the Dock icon, which is why anything that is not a collection is skipped
+	 * without complaint. Goes through the ED2KLinks file rather than downloadqueue, which on
+	 * amulegui does not exist until the EC connection is up.
+	 */
+	void OpenCollectionFiles(const wxArrayString &fileNames);
 
-	bool		CheckPassedLink(const wxString &in, wxString &out, int cat);
 protected:
-	wxString	FullMuleVersion;
-	wxString	OSDescription;
-	wxString	OSType;
-	bool		enable_daemon_fork;
-	bool		ec_config;
-	bool		m_skipConnectionDialog;
-	bool		m_geometryEnabled;
-	bool		m_disableFatal;
-	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);
+	wxString FullMuleVersion;
+	wxString OSDescription;
+	wxString OSType;
+	bool enable_daemon_fork;
+	bool ec_config;
+	bool m_skipConnectionDialog;
+	bool m_geometryEnabled;
+	bool m_disableFatal;
+	wxString m_geometryString;
+	wxString m_logFile;
+	wxString m_appName;
+	wxString m_PidFile;
+
+	bool InitCommon(int argc, wxChar **argv);
+
+	/**
+	 * Logs an assertion, with a backtrace, and applies --disable-fatal.
+	 *
+	 * Every app wants this identically -- the log copy is often the only record that survives,
+	 * since the wxWidgets dialog dies with the process if nobody presses Continue -- but only
+	 * the app itself knows which wxWidgets base to hand the assert on to afterwards, so the
+	 * decision is returned rather than acted on here.
+	 *
+	 * @param dialogUsable whether wxWidgets can still put its assert dialog on screen: false
+	 * off the main thread, and false for an app that is not running yet or is already tearing
+	 * down.
+	 * @return true when the caller should call its base OnAssertFailure(). Does not return at
+	 * all when --disable-fatal is set, or when the dialog is unusable: both abort so a
+	 * supervisor sees a non-zero exit and a debugger catches the assert in place.
+	 */
+	bool ReportAssertFailure(const wxChar *file,
+		int line,
+		const wxChar *func,
+		const wxChar *cond,
+		const wxChar *msg,
+		bool dialogUsable);
+
+	void RefreshSingleInstanceChecker();
+	// Drop the single-instance lock and unlink its file. OnExit() calls std::_Exit() to dodge
+	// the wxWebSession teardown crash, which bypasses ~CamuleAppCommon, so this must run
+	// explicitly or the muleLock / muleLockRGUI file lingers between runs.
+	void ReleaseSingleInstance();
+
+	/**
+	 * Postpone a shutdown requested from inside a nested event loop.
+	 *
+	 * amuledlg->Destroy() only queues the frame on wxPendingDelete, drained from the idle
+	 * handler of whichever event loop is running. A modal dialog runs its own, so a shutdown
+	 * started while one is open destroys the main window from under the handlers that opened
+	 * the dialog: ~CamuleDlg walks down to the list control, and DestroyChildren() deletes the
+	 * stack-allocated dialog those frames still own, aborting on a free of stack memory.
+	 *
+	 * Ending the nested loop makes its ShowModal() return, so those frames unwind normally; @a
+	 * retry then runs the teardown from the loop we land in, and several levels of nesting peel
+	 * off one per pass. Driven by idle events rather than CallAfter(), because
+	 * wxEvtHandler::ProcessPendingEvents() re-drains whatever is queued while it runs -- a
+	 * pending-event retry is picked up by the very loop it is waiting to leave, and Exit/re-
+	 * queue live-locks. Idle events come from the loop itself, so it unwinds first.
+	 *
+	 * @return true if the shutdown was postponed and the caller must return without tearing
+	 * anything down.
+	 */
+	bool DeferShutDownToOuterLoop(const std::function<void()> &retry);
+
+	void OnDeferredShutDownIdle(wxIdleEvent &evt);
+
+	// Teardown queued by DeferShutDownToOuterLoop(), run once the nested
+	// event loops have unwound. Non-empty only while one is outstanding.
+	std::function<void()> m_deferredShutDown;
+
+	bool CheckMuleDirectory(const wxString &desc,
+		const class CPath &directory,
+		const wxString &alternative,
+		class CPath &outDir);
+
 public:
-	wxString	m_configFile;
+	wxString m_configFile;
 
 	CamuleAppCommon();
 	~CamuleAppCommon();
-	void		AddLinksFromFile();
+
+	// GeoIP country resolver (DB + download + ISO-code lookup). Lives on CamuleApp (amuled +
+	// monolithic); amulegui has none and receives country codes over EC, so the base returns
+	// nullptr. Shared model code resolves locally where a resolver exists and uses the EC value
+	// where it does not.
+	virtual class CIP2Country *GetIP2Country() { return nullptr; }
+
+	// Apply the current GeoIP preference at runtime, creating the resolver on first enable and
+	// disabling it when turned off. No-op on amulegui, which configures the daemon's GeoIP over
+	// EC. startup=true also kicks the auto-update refresh; it is false on a remote prefs-apply
+	// so an amulegui OK does not download on every save -- an explicit "Update now" carries
+	// that intent.
+	virtual void EnableIP2Country(bool startup) {}
+
+	void AddLinksFromFile();
 	// URL functions
-	wxString	CreateMagnetLink(const CAbstractFile *f);
-	wxString	CreateED2kLink(const CAbstractFile* f, bool add_source = false, bool use_hostname = false, bool add_cryptoptions = false, bool add_AICH = false);
-	// Who am I ?
+	wxString CreateMagnetLink(const CAbstractFile *f);
+	wxString CreateED2kLink(const CAbstractFile *f,
+		bool add_source = false,
+		bool use_hostname = false,
+		bool add_cryptoptions = false,
+		bool add_AICH = false);
 #ifdef AMULE_DAEMON
-	bool		IsDaemon() const { return true; }
+	bool IsDaemon() const { return true; }
 #else
-	bool		IsDaemon() const { return false; }
+	bool IsDaemon() const { return false; }
 #endif
 
 #ifdef CLIENT_GUI
-	bool		IsRemoteGui() const { return true; }
+	bool IsRemoteGui() const { return true; }
 #else
-	bool		IsRemoteGui() const { return false; }
+	bool IsRemoteGui() const { return false; }
 #endif
 
-	const wxString&	GetMuleAppName() const { return m_appName; }
-	const wxString	GetFullMuleVersion() const;
+	const wxString &GetMuleAppName() const { return m_appName; }
+	const wxString GetFullMuleVersion() const;
 
 #ifdef __WXGTK__
-	// True when the process is running under a Wayland session (any
-	// distro, any compositor). xdg-shell intentionally doesn't deliver
-	// iconify-state notifications to clients, so several tray-icon
-	// features that rely on detecting "user just minimized the
-	// window" cannot work there — the call sites use this flag to
-	// disable / grey out the relevant prefs and skip the broken paths.
+	// True when the process runs under a Wayland session. xdg-shell deliberately does not tell
+	// clients about iconify state, so tray features that rely on detecting "user just minimized
+	// the window" cannot work there; call sites grey out the relevant prefs.
 	static bool IsWaylandSession();
 #endif
 
-	// Set when a quit was requested out-of-band of the main-window
-	// close button (Cmd+Q, Dock right-click → Quit, tray-icon Exit).
-	// CamuleDlg::OnClose checks this so HideOnClose only hides the
-	// window for the actual red close-button gesture and never blocks
-	// an explicit quit request. Lives on the common base so both the
-	// monolithic CamuleApp and the remote-GUI CamuleRemoteGuiApp
-	// expose the same accessors.
+	/// Forces the tray-dependent preferences off where the tray cannot deliver what they
+	/// promise. Both settings hide the main window and leave the tray icon as the only way
+	/// back, so each has to be switched off wherever that icon will not be there: no SNI
+	/// backend on Linux (the legacy GtkStatusIcon is invisible on modern desktops), a Wayland
+	/// session (no iconify notification to hide on), or the tray icon simply turned off. Called
+	/// by every GUI app before it builds its window -- amuled inherits it harmlessly, having no
+	/// window to hide.
+	static void SanitiseTrayPreferences();
+
+	// Set when a quit was requested out-of-band of the main-window close button (Cmd+Q, Dock
+	// right-click Quit, tray-icon Exit). CamuleDlg::OnClose checks it so HideOnClose only hides
+	// the window for the actual close gesture and never blocks an explicit quit. On the common
+	// base so CamuleApp and CamuleRemoteGuiApp expose the same accessors.
 	bool IsQuitting() const { return m_isQuitting; }
 	void SetQuitting() { m_isQuitting = true; }
 	void ResetQuitting() { m_isQuitting = false; }
@@ -194,7 +328,8 @@
 class CamuleApp : public AMULE_APP_BASE, public CamuleAppCommon
 {
 private:
-	enum APPState {
+	enum APPState
+	{
 		APP_STATE_RUNNING = 0,
 		APP_STATE_SHUTTINGDOWN,
 		APP_STATE_STARTING
@@ -202,34 +337,44 @@
 
 public:
 	CamuleApp();
-	virtual	 ~CamuleApp();
+	virtual ~CamuleApp();
 
-	virtual bool	OnInit();
-	int		OnExit();
+	bool OnInit() override;
+	int OnExit() override;
 #if wxUSE_ON_FATAL_EXCEPTION
-	void		OnFatalException();
+	void OnFatalException() override;
 #endif
-	bool		ReinitializeNetwork(wxString *msg);
+	bool ReinitializeNetwork(wxString *msg);
+
+	// The core owns the GeoIP resolver (created in OnInit, guarded by ENABLE_IP2COUNTRY and
+	// thePrefs::IsGeoIPEnabled), serving the daemon's country EC tag and the monolithic build's
+	// display.
+	CIP2Country *GetIP2Country() override { return m_IP2Country; }
+	void EnableIP2Country(bool startup) override;
 
-	// derived classes may override those
 	virtual int InitGui(bool geometry_enable, wxString &geometry_string);
 
+	/// Create a search tab for every search restored from StoredSearches.met. Separate from
+	/// InitGui() because the two cannot share a slot in startup order: the tabs need the
+	/// restored results, and those need the download queue loaded before their status is
+	/// computed, well after the GUI is up. Called from OnInit() right after
+	/// CSearchList::LoadSearches(); a no-op on builds without a search dialog.
+	virtual void RestoreSearchTabs() {}
+
 	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); }
+	// Called where a client, server or friend is removed. EC connections cache the last
+	// value sent per object and only an entry's own removal can free it.
+	void ForgetECObject(uint32 ecid);
 	bool IsOnShutDown() const { return (m_app_state == APP_STATE_SHUTTINGDOWN); }
 
 	// Check ED2K and Kademlia state
 	bool IsFirewalled() const;
-	// Are we connected to at least one network?
 	bool IsConnected() const;
-	// Connection to ED2K
 	bool IsConnectedED2K() const;
 
-	// What about Kad? Is it running?
 	bool IsKadRunning() const;
-	// Connection to Kad
 	bool IsConnectedKad() const;
 	// Check Kad state (TCP)
 	bool IsFirewalledKad() const;
@@ -238,65 +383,72 @@
 	// 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;
+	uint32 GetKadUsers() const;
+	uint32 GetKadFiles() const;
+	uint32 GetKadIndexedSources() const;
+	uint32 GetKadIndexedKeywords() const;
+	uint32 GetKadIndexedNotes() const;
+	uint32 GetKadIndexedLoad() const;
 	// True IP of machine
-	uint32	GetKadIPAddress() const;
+	uint32 GetKadIPAddress() const;
 	// Buddy status
-	uint8	GetBuddyStatus() const;
-	uint32	GetBuddyIP() const;
-	uint32	GetBuddyPort() const;
-	// Kad ID
-	const Kademlia::CUInt128& GetKadID() const;
+	uint8 GetBuddyStatus() const;
+	uint32 GetBuddyIP() const;
+	uint32 GetBuddyPort() const;
+	const Kademlia::CUInt128 &GetKadID() const;
 
 	// Check if we should callback this client
 	bool CanDoCallback(uint32 clientServerIP, uint16 clientServerPort);
 
-	// Misc functions
-	void		OnlineSig(bool zero = false);
-	void		Localize_mule();
-	void		Trigger_New_version(wxString newMule);
+	void OnlineSig(bool zero = false);
+	void Localize_mule();
+	void Trigger_New_version(wxString newMule);
 
-	// shakraw - new EC code using wxSocketBase
-	ExternalConn*	ECServerHandler;
+	ExternalConn *ECServerHandler;
 
 	// return current (valid) public IP or 0 if unknown
 	// If ignorelocal is true, don't use m_localip
-	uint32	GetPublicIP(bool ignorelocal = false) const;
-	void		SetPublicIP(const uint32 dwIP);
-
-	uint32	GetED2KID() const;
-	uint32	GetID() const;
-
-	// Other parts of the interface and such
-	CPreferences*		glob_prefs;
-	CDownloadQueue*		downloadqueue;
-	CUploadQueue*		uploadqueue;
-	CPartFileWriteThread*	partFileWriteThread;
-	CPartFileHashThread*	partFileHashThread;
-	CServerConnect*		serverconnect;
-	CSharedFileList*	sharedfiles;
-	CServerList*		serverlist;
-	CListenSocket*		listensocket;
-	CClientList*		clientlist;
-	CKnownFileList*		knownfiles;
-	CCanceledFileList*	canceledfiles;
-	CSearchList*		searchlist;
-	CClientCreditsList*	clientcredits;
-	CFriendList*		friendlist;
-	CClientUDPSocket*	clientudp;
-	CStatistics*		m_statistics;
-	CIPFilter*		ipfilter;
-	UploadBandwidthThrottler* uploadBandwidthThrottler;
-	CUploadDiskIOThread*      uploadDiskIOThread;		// eMule ref: emule.h:92
-	CAsioService*		m_AsioService;
+	uint32 GetPublicIP(bool ignorelocal = false) const;
+	void SetPublicIP(const uint32 dwIP);
+
+	uint32 GetED2KID() const;
+	uint32 GetID() const;
+
+	CPreferences *glob_prefs;
+	CDownloadQueue *downloadqueue;
+	CUploadQueue *uploadqueue;
+	CPartFileWriteThread *partFileWriteThread;
+	CPartFileHashThread *partFileHashThread;
+	CMediaProbeThread *mediaProbeThread;
+	CFreeSpaceThread *freeSpaceThread;
+	CServerConnect *serverconnect;
+	CSharedFileList *sharedfiles;
+	CServerList *serverlist;
+	CListenSocket *listensocket;
+	CClientList *clientlist;
+	CKnownFileList *knownfiles;
+	CCanceledFileList *canceledfiles;
+	CSearchList *searchlist;
+	//! Every "View Files" browse in flight. Owns their whole lifecycle; see
+	//! CBrowseManager.
+	CBrowseManager *browsemanager;
+	CClientCreditsList *clientcredits;
+	CFriendList *friendlist;
+	// The core's chat transcript, shared by the local GUI and every EC client so
+	// all three see one conversation. In-memory; emptied by a restart.
+	CChatSessionStore *chatsessions;
+	CClientUDPSocket *clientudp;
+	CStatistics *m_statistics;
+	CIPFilter *ipfilter;
+	UploadBandwidthThrottler *uploadBandwidthThrottler;
+	CUploadDiskIOThread *uploadDiskIOThread; // eMule ref: emule.h:92
+	CAsioService *m_AsioService;
 #ifdef ENABLE_UPNP
-	CUPnPControlPoint*	m_upnp;
+	CUPnPControlPoint *m_upnp;
 	std::vector<CUPnPPortMapping> m_upnpMappings;
+	// Build the port mappings from the current preferences and start the UPnP
+	// control point. A no-op when UPnP is disabled or already running.
+	void StartUPnP();
 #endif
 	wxLocale m_locale;
 
@@ -311,143 +463,257 @@
 #ifdef __DEBUG__
 	void AddSocketDeleteDebug(uint32 socket_pointer, uint32 creation_time);
 #endif
-	void SetOSFiles(const wxString& new_path);
+	void SetOSFiles(const wxString &new_path);
 
-	const wxString& GetOSType() const { return OSType; }
+	const wxString &GetOSType() const { return OSType; }
 
 	void ShowUserCount();
 
 	void ShowConnectionState(bool forceUpdate = false);
 
+	// Wall-clock time of the most recent ed2k/Kad connect, set by ShowConnectionState() on the
+	// false->true transition it already detects, invalid while disconnected. Feeds the desktop
+	// Info panes' "Connected since" row; not wired over EC, so amulegui lacks it.
+	const wxDateTime &GetED2KConnectedSince() const { return m_ed2kConnectedSince; }
+	const wxDateTime &GetKadConnectedSince() const { return m_kadConnectedSince; }
+
 	void StartKad();
 	void StopKad();
 
 	/** Bootstraps kad from the specified IP (must be in hostorder). */
 	void BootstrapKad(uint32 ip, uint16 port);
 	/** Updates the nodes.dat file from the specified url. */
-	void UpdateNotesDat(const wxString& str);
-
+	void UpdateNotesDat(const wxString &str);
 
 	void DisconnectED2K();
 
 	bool CryptoAvailable() const;
 
 protected:
-
-	/**
-	 * Handles asserts in a thread-safe manner.
-	 *
-	 * Compiled unconditionally (not just in __WXDEBUG__) so the
-	 * --disable-fatal short-circuit also covers wxWidgets' own
-	 * release-build assertions: Debian / Ubuntu's libwx packages
-	 * leave wxDEBUG_LEVEL=1, which keeps wxASSERT live even in
-	 * release builds and otherwise routes here through wxApp's
-	 * default dialog.
-	 */
-	virtual void OnAssertFailure(const wxChar* file, int line,
-		const wxChar* func, const wxChar* cond, const wxChar* msg);
-
-	void OnUDPDnsDone(CMuleInternalEvent& evt);
-	void OnSourceDnsDone(CMuleInternalEvent& evt);
-	void OnServerDnsDone(CMuleInternalEvent& evt);
-
-	void OnTCPTimer(CTimerEvent& evt);
-	void OnCoreTimer(CTimerEvent& evt);
-
-	void OnFinishedHashing(CHashingEvent& evt);
-	void OnPartFileHashResult(CPartFileHashResultEvent& evt);
-	void OnFinishedAICHHashing(CHashingEvent& evt);
-	void OnFinishedCompletion(CCompletionEvent& evt);
-	void OnFinishedAllocation(CAllocFinishedEvent& evt);
-	void OnFinishedHTTPDownload(CMuleInternalEvent& evt);
-	void OnHashingShutdown(CMuleInternalEvent&);
-	void OnNotifyEvent(CMuleGUIEvent& evt);
+	/// Handles asserts in a thread-safe manner. Compiled unconditionally, not just in
+	/// __WXDEBUG__, so the --disable-fatal short-circuit also covers wxWidgets' own release-
+	/// build assertions: Debian/Ubuntu's libwx packages leave wxDEBUG_LEVEL=1, which keeps
+	/// wxASSERT live in release builds and otherwise routes here through wxApp's default
+	/// dialog.
+	void OnAssertFailure(const wxChar *file,
+		int line,
+		const wxChar *func,
+		const wxChar *cond,
+		const wxChar *msg) override;
+
+	void OnUDPDnsDone(CMuleInternalEvent &evt);
+	void OnSourceDnsDone(CMuleInternalEvent &evt);
+	void OnServerDnsDone(CMuleInternalEvent &evt);
+
+	void OnTCPTimer(CTimerEvent &evt);
+	void OnCoreTimer(CTimerEvent &evt);
+
+	void OnFinishedHashing(CHashingEvent &evt);
+	void OnPartFileHashResult(CPartFileHashResultEvent &evt);
+	void OnFinishedAICHHashing(CHashingEvent &evt);
+
+#if !defined(CLIENT_GUI) && !defined(AMULE_DAEMON)
+	// Monolithic only: the daemon has no window to put a splash on, and amulegui is a separate
+	// process that does not run this startup at all.
+	//
+	// Kept alive past OnInit because the slowest part of a first run is hashing everything the
+	// scan found unknown, which drains asynchronously. Null once the window is up and the
+	// splash has closed -- the end of the scan, not the end of hashing (#853).
+	CSplashScreen *m_splash = nullptr;
+	// Drives the hashing drain: refreshes the count on the shared-files label and sorts the
+	// rows that arrived since the last tick. Polled rather than driven from the completion
+	// handlers, because the worker clears its current task after posting the completion event,
+	// so a handler-driven update can see the last task still pending and then never run again.
+	// Polling also covers tasks that finish without reaching a handler.
+	wxTimer m_splashPollTimer;
+
+	// One tick of the drain: label, sort, and finish when the queue empties.
+	void UpdateStartupHashProgress();
+	void OnSplashPollTimer(wxTimerEvent &evt);
+	// Ends the download list's batch, sorts and thaws the shared list, shows the main window
+	// and closes the splash. Called when the scan finishes, with hashing still running.
+	void ShowMainWindowAfterScan();
+	// Ends the shared list's batch with its final sort and stops the poll
+	// timer. Safe to call when nothing needed hashing.
+	void FinishStartupHashing();
+#endif // monolithic only
+
+	// CMediaProbeTask marshals results back here so FT_MEDIA_* tags are attached
+	// on the main thread -- the worker never touches CKnownFile state.
+	void OnMediaProbeFinished(CMediaProbeEvent &evt);
+	void OnFinishedCompletion(CCompletionEvent &evt);
+	void OnFinishedAllocation(CAllocFinishedEvent &evt);
+	void OnFinishedHTTPDownload(CMuleInternalEvent &evt);
+	void OnHashingShutdown(CMuleInternalEvent &);
+	void OnNotifyEvent(CMuleGUIEvent &evt);
 
 	void SetTimeOnTransfer();
 
 	APPState m_app_state;
 
+	// Media-probe tag writes coalesce into one known.met save: every OnMediaProbeFinished
+	// stamps this (uptime ms) and OnCoreTimer flushes a single Save() once probing has been
+	// idle for 30 s, avoiding the O(N^2) full-file rewrite when the whole library is probed at
+	// startup. 0 = nothing pending.
+	uint64 m_mediaTagsDirtiedMs = 0;
+
+	// Headless GeoIP resolver, owned by the core (created in OnInit under
+	// ENABLE_IP2COUNTRY). NULL when GeoIP is disabled/unsupported.
+	CIP2Country *m_IP2Country;
+
 	wxString m_emulesig_path;
 	wxString m_amulesig_path;
 
 	uint32 m_dwPublicIP;
 
-	// PID type: `int` is wide enough for any OS pid we run on -- POSIX
-	// pid_t is typically `int`, and Windows process IDs are 32-bit
-	// DWORDs but always fit in a positive int. `long` was wrong on
-	// LLP64 only by happy accident (long is also 32-bit there), but
-	// using `int` makes the intent explicit and avoids %ld for what
-	// is really an int-sized value.
+	// PID type: `int` fits any OS pid we run on -- POSIX pid_t is typically int, and Windows
+	// process IDs are 32-bit DWORDs. `long` was right on LLP64 only by accident.
 	int webserver_pid;
+	int amuleapi_pid;
+
+	// Ephemeral EC credential for the amuleapi we spawn. Generated fresh every start, handed
+	// over through a 0600 file in the config dir that the child deletes as soon as it has read
+	// it, and accepted by the EC server alongside the configured password for the rest of this
+	// run.
+	//
+	// The point is that amuleapi never needs the value in amule.conf. That stored value IS the
+	// credential -- the challenge hashes it directly -- so a compromised network-facing daemon
+	// holding it would hold the equivalent of the user's EC password. Empty when we did not
+	// spawn amuleapi, in which case no token is accepted at all.
+	wxString m_ecToken;
+
+	// Uptime-ms deadline after which the token file is removed whether or not the child read
+	// it: a child that dies before reading would leave a live secret at rest. 0 = nothing
+	// pending.
+	uint64 m_ecTokenFileExpiryMs = 0;
 
 	wxString server_msg;
 
-	CTimer* core_timer;
+	CTimer *core_timer;
+
+public:
+	// The ephemeral EC credential handed to the spawned amuleapi, empty when none was issued.
+	// The EC server's authentication path accepts it alongside the configured password.
+	const wxString &GetEcToken() const { return m_ecToken; }
+
+#ifdef ENABLE_VERSION_CHECK
+	// Result of the last completed version check, relayed over EC to
+	// amuleapi (the /version "update" object) and read by the UIs.
+	bool IsVersionCheckDone() const { return m_versionCheckDone; }
+	bool IsVersionCheckOutdated() const { return m_versionCheckOutdated; }
+	const wxString &GetVersionCheckLatest() const { return m_versionCheckLatest; }
+	// Unix time the last check completed (0 if never). Relayed so clients
+	// can show how stale the result is (checks are startup-only).
+	time_t GetVersionCheckTimestamp() const { return m_versionCheckTimestamp; }
+
+	// Kick off an async GitHub /releases/latest fetch; CheckNewVersion() stores the outcome.
+	// Used by OnInit and the EC_OP_VERSION_CHECK trigger. False when throttled, so the trigger
+	// caller can report "try again later" rather than hammering the rate limit.
+	bool StartVersionCheck();
+#endif
 
 private:
-	virtual void OnUnhandledException();
+	void OnUnhandledException() override;
 
+#ifdef ENABLE_VERSION_CHECK
 	void CheckNewVersion(uint32 result);
 
+	bool m_versionCheckDone = false;
+	bool m_versionCheckOutdated = false;
+	wxString m_versionCheckLatest;
+	// Unix time the last check completed (0 = never).
+	time_t m_versionCheckTimestamp = 0;
+	// Wall-clock of the last StartVersionCheck() attempt, for throttling
+	// the EC trigger against GitHub's unauthenticated rate limit.
+	time_t m_versionCheckLastAttempt = 0;
+#endif
+
 	uint32 m_localip;
-};
 
+	// Set by ShowConnectionState(); see the GetED2KConnectedSince() /
+	// GetKadConnectedSince() accessors above.
+	wxDateTime m_ed2kConnectedSince;
+	wxDateTime m_kadConnectedSince;
+};
 
 #ifndef AMULE_DAEMON
 
-
-class CamuleGuiBase {
+class CamuleGuiBase
+{
 public:
 	CamuleGuiBase();
-	virtual	 ~CamuleGuiBase();
+	virtual ~CamuleGuiBase();
 
-	wxString	m_FrameTitle;
-	CamuleDlg*	amuledlg;
+	wxString m_FrameTitle;
+	CamuleDlg *amuledlg;
+
+#ifdef GEOIP_GUI
+	// Country flag images (ISO code -> wxImage) for both GUIs; the code itself comes from the
+	// core resolver or the EC tag. Held by pointer to keep <wx/image.h> out of the core header.
+	CCountryFlags *GetCountryFlags() { return m_countryFlags; }
+#endif
 
-	bool CopyTextToClipboard( wxString strText );
+	bool CopyTextToClipboard(wxString strText);
 	void ResetTitle();
 
+	/// Asks the platform to follow the desktop's light/dark setting. Must be called from
+	/// OnInit() before the first window is created: wx answers CannotChange once one exists, so
+	/// anywhere later silently does nothing.
+	static void FollowSystemAppearance();
+
 	virtual int InitGui(bool geometry_enable, wxString &geometry_string);
+	//! See CamuleApp::RestoreSearchTabs().
+	void CreateRestoredSearchTabs();
 	virtual int ShowAlert(wxString msg, wxString title, int flags);
 
-	void AddGuiLogLine(const wxString& line);
+	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.
-	 */
+	/// Log messages queued for the GUI while it cannot display them yet, i.e. until the dialog
+	/// exists.
 	std::list<wxString> m_logLines;
-};
 
+#ifdef GEOIP_GUI
+	CCountryFlags *m_countryFlags;
+#endif
+};
 
 #ifndef CLIENT_GUI
 
-
 class CamuleGuiApp : public CamuleApp, public CamuleGuiBase
 {
 
-    virtual int InitGui(bool geometry_enable, wxString &geometry_string);
+	virtual int InitGui(bool geometry_enable, wxString &geometry_string);
+	// No `override`: this class declares none, and adding the first one
+	// turns -Winconsistent-missing-override into errors on every sibling.
+	virtual void RestoreSearchTabs() { CreateRestoredSearchTabs(); }
 
 	int OnExit();
 	bool OnInit();
 
 	// Catch alternate quit paths (macOS Dock right-click → Quit)
 	// so we can run ShutDown cleanup even when wxApp skips OnExit.
-	void OnEndSession(wxCloseEvent& evt);
-	void OnQueryEndSession(wxCloseEvent& evt);
+	void OnEndSession(wxCloseEvent &evt);
+	void OnQueryEndSession(wxCloseEvent &evt);
 
 #ifdef __WXMAC__
-	// Restore the main window when the user clicks the Dock icon
-	// while no aMule windows are visible. Default wxApp::MacReopenApp
-	// behaviour is to do nothing when the frame is hidden, so a
-	// window hidden via the close button (HideOnClose pref) stays
-	// permanently hidden — the app appears stuck.
+	// Restore the main window on a Dock-icon click while no aMule window is visible.
+	// wxApp::MacReopenApp does nothing for a hidden frame, so HideOnClose would hide it for
+	// good.
 	virtual void MacReopenApp();
+
+	// Finder "Open With" / double-click on a .emulecollection, and Dock drops. wx defers the
+	// launch event until after OnInit returns, so the config dir is always set by then.
+	virtual void MacOpenFiles(const wxArrayString &fileNames);
+
+	// ed2k:// and magnet: clicks. A safety net, not the usual path: in practice the kAEGetURL
+	// handler in ProtocolHandlerManager_mac.mm receives these. wxNSAppController registers for
+	// the same event and -setEventHandler: replaces per (class, id), so which one is live
+	// depends on load order; either way the URL is queued exactly once.
+	virtual void MacOpenURL(const wxString &url);
 #endif
 
 public:
-
 	virtual int ShowAlert(wxString msg, wxString title, int flags);
 
 	void ShutDown(wxCloseEvent &evt);
@@ -458,26 +724,19 @@
 	wxDECLARE_EVENT_TABLE();
 };
 
-
 DECLARE_APP(CamuleGuiApp)
 extern CamuleGuiApp *theApp;
 
-
 #else /* !CLIENT_GUI */
 
-
 #include "amule-remote-gui.h"
 
-
 #endif // CLIENT_GUI
 
-
 #define CALL_APP_DATA_LOCK
 
-
 #else /* ! AMULE_DAEMON */
 
-
 class CamuleDaemonApp : public CamuleApp
 {
 private:
@@ -486,16 +745,12 @@
 	int OnExit();
 
 	virtual int InitGui(bool geometry_enable, wxString &geometry_string);
-	// The GTK wxApps sets its file name conversion properly
-	// in wxApp::Initialize(), while wxAppConsole::Initialize()
-	// does not, leaving wxConvFileName being set to wxConvLibc. File
-	// name conversion should be set otherwise amuled will abort to
-	// handle non-ASCII file names which monolithic amule can handle.
-	// This function are overridden to perform this.
-	virtual bool Initialize(int& argc_, wxChar **argv_);
+	// wxApp::Initialize() sets the file name conversion properly, but
+	// wxAppConsole::Initialize() leaves wxConvFileName as wxConvLibc, on which amuled aborts
+	// for the non-ASCII file names monolithic amule handles. This override sets it.
+	virtual bool Initialize(int &argc_, wxChar **argv_);
 
 public:
-
 	bool CopyTextToClipboard(wxString strText);
 
 	virtual int ShowAlert(wxString msg, wxString title, int flags);

amule-3.0.1.tar.gz/src/amuleAppCommon.cpp -> amule-3.1.0.tar.gz/src/amuleAppCommon.cpp Changed

@@ -22,43 +22,90 @@
 // 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 separately for each app.
-//
+// Functions common to all three apps (amule, amuled, amulegui) but preprocessor-dependent (they
+// use theApp, thePrefs), so this file is compiled separately for each app.
 
+#include <signal.h> // Needed for raise(), SIGABRT
 
 #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/cmdline.h>  // Needed for wxCmdLineParser
+#include <wx/evtloop.h>  // Needed for wxEventLoopBase
+#include <wx/filename.h> // Needed for wxFileName
+#include <wx/filesys.h>  // Needed for wxFileSystem::URLToFileName
+
+#include "InstanceLock.h" // Needed for InstanceLock (replaces wxSingleInstanceChecker on POSIX)
+#include <wx/textfile.h>  // Needed for wxTextFile
+#include <wx/config.h>    // Do_not_auto_remove (win32)
 #include <wx/fileconf.h>
 
 #ifdef __WXGTK__
-#include <stdlib.h>				// Needed for getenv (IsWaylandSession)
-#include <string.h>				// Needed for strcmp (IsWaylandSession)
+#include <stdlib.h> // Needed for getenv (IsWaylandSession)
+#include <string.h> // Needed for strcmp (IsWaylandSession)
 #endif
 
-#include "amule.h"			// Interface declarations.
-#include "AutostartManager.h"		// Needed for --configure-autostart handling
-#include "CamuleFileConfig.h"		// CamuleFileConfig + CCtypeAsciiScope (#852)
-#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 "amule.h"                  // Interface declarations.
+#include "AutostartManager.h"       // Needed for --configure-autostart handling
+#include "ProtocolHandlerManager.h" // Needed for --configure-protocols handling
+#include "CamuleFileConfig.h"       // CamuleFileConfig + CCtypeAsciiScope (#852)
+#include <common/FileFunctions.h>   // Needed for RestrictToOwner
+#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 "MagnetURI.h"        // Needed for CMagnetURI
+#include "MuleCollection.h"   // Needed for expanding .emulecollection arguments
+#include <common/MuleDebug.h> // Needed for get_backtrace
 #include "Preferences.h"
 #include "ScopedPtr.h"
-#include "MuleVersion.h"		// Needed for GetMuleVersion()
+#include "MuleVersion.h" // Needed for GetMuleVersion()
 
 #ifndef CLIENT_GUI
 #include "DownloadQueue.h"
 #endif
 
+bool CamuleAppCommon::ReportAssertFailure(const wxChar *file,
+	int line,
+	const wxChar *func,
+	const wxChar *cond,
+	const wxChar *msg,
+	bool dialogUsable)
+{
+	wxString errmsg =
+		CFormat("Assertion failed: %s:%s:%d: Assertion '%s' failed. %s\nBacktrace follows:\n%s\n") %
+		file % func % line % cond % (msg ? wxString(msg) : wxString()) %
+		get_backtrace(2); // Skip the function-calls directly related to the assert call.
+	theLogger.EmergencyLog(errmsg, false);
+
+	// --disable-fatal: skip the wxApp dialog and abort directly so a supervisor (systemd,
+	// watchdog script) sees a non-zero exit and can restart aMule. The errmsg above is already
+	// on stderr and in the log; nothing useful is lost by skipping the dialog.
+	if (m_disableFatal) {
+		SuppressNextAbortBacktrace();
+		raise(SIGABRT);
+		return false; // unreachable
+	}
+
+	if (!dialogUsable) {
+#ifdef _MSC_VER
+		wxString s = CFormat("%s in %s") % cond % func;
+		if (msg) {
+			s << " : " << msg;
+		}
+		_wassert(s.wc_str(), file, line);
+#else
+		// Abort, allows gdb to catch the assertion
+		SuppressNextAbortBacktrace();
+		raise(SIGABRT);
+#endif
+		return false; // unreachable
+	}
+
+	return true;
+}
+
 CamuleAppCommon::CamuleAppCommon()
 {
 	m_singleInstance = NULL;
@@ -66,54 +113,46 @@
 	m_geometryEnabled = false;
 	m_disableFatal = false;
 	if (IsRemoteGui()) {
-		m_appName		= "aMuleGUI";
-		m_configFile	= "remote.conf";
-		m_logFile		= "remotelogfile";
+		m_appName = "aMuleGUI";
+		m_configFile = "remote.conf";
+		m_logFile = "remotelogfile";
 	} else {
-		m_configFile	= "amule.conf";
-		m_logFile		= "logfile";
+		m_configFile = "amule.conf";
+		m_logFile = "logfile";
 
 		if (IsDaemon()) {
-			m_appName	= "aMuleD";
+			m_appName = "aMuleD";
 		} else {
-			m_appName	= "aMule";
+			m_appName = "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
 }
 
 #ifdef __WXGTK__
 bool CamuleAppCommon::IsWaylandSession()
 {
-	// Explicit GDK_BACKEND=x11 forces the app onto XWayland — OS
-	// minimize events come through reliably, so treat it as X11.
-	// This is the documented user workaround for "I want MinToTray
-	// on Wayland": launch with `GDK_BACKEND=x11 amule`. Same trick
-	// Discord users adopt to get their tray icon back on Wayland.
-	if (const char* gb = getenv("GDK_BACKEND")) {
+	// Explicit GDK_BACKEND=x11 forces the app onto XWayland, where OS minimize events come
+	// through reliably, so treat it as X11. This is the documented user workaround for "I want
+	// MinToTray on Wayland".
+	if (const char *gb = getenv("GDK_BACKEND")) {
 		if (strncmp(gb, "x11", 3) == 0) {
 			return false;
 		}
 	}
-	// WAYLAND_DISPLAY is set by Wayland servers to the socket name
-	// (e.g. "wayland-0") for any client running under that session.
-	// XDG_SESSION_TYPE is the systemd-logind hint and is also set
-	// to "wayland" on every common distro. Either non-empty match
-	// is treated as a Wayland session.
-	if (const char* wd = getenv("WAYLAND_DISPLAY")) {
+	// WAYLAND_DISPLAY is set by Wayland servers to the socket name for any client in that
+	// session; XDG_SESSION_TYPE is the systemd-logind hint, also set to "wayland" on every
+	// common distro. Either non-empty match counts.
+	if (const char *wd = getenv("WAYLAND_DISPLAY")) {
 		if (wd0 != '\0') {
 			return true;
 		}
 	}
-	if (const char* st = getenv("XDG_SESSION_TYPE")) {
+	if (const char *st = getenv("XDG_SESSION_TYPE")) {
 		if (strcmp(st, "wayland") == 0) {
 			return true;
 		}
@@ -122,14 +161,98 @@
 }
 #endif
 
+void CamuleAppCommon::SanitiseTrayPreferences()
+{
+#if defined(__WXGTK__) && !defined(WITH_LIBAYATANA_APPINDICATOR)
+	// On Linux without libayatana-appindicator3 the tray icon falls back to the legacy
+	// GtkStatusIcon backend, which GNOME Shell dropped in 3.26 and wlroots compositors never
+	// picked up -- the icon is silently invisible. Force the pref off so users do not end up
+	// with the window hidden via HideOnClose and no surface to bring it back; the sanity check
+	// below cascades MinToTray off too.
+	thePrefs::SetUseTrayIcon(false);
+#endif
+
+#ifdef __WXGTK__
+	// xdg-shell intentionally does not deliver iconified-state notifications to clients, so on
+	// Wayland the system minimize button cannot trigger our Show(false) hide-to-tray path.
+	// Force MinToTray off there so the option does not appear to do nothing; the prefs panel
+	// also greys the checkbox.
+	if (IsWaylandSession()) {
+		thePrefs::SetMinToTray(false);
+	}
+#endif
+
+	// Minimize-to-tray without a tray icon hides the window with nothing
+	// left to bring it back.
+	if (!thePrefs::UseTrayIcon()) {
+		thePrefs::SetMinToTray(false);
+	}
+}
+
 void CamuleAppCommon::RefreshSingleInstanceChecker()
 {
-#if defined(__WXMAC__) && defined(AMULE_DAEMON)
-	//#warning TODO: fix wxSingleInstanceChecker for amuled on Mac (wx link problems)
-#else
+	// Reacquire after the daemonization fork(). POSIX advisory locks are owned by the parent
+	// process and not inherited, so the forked daemon must relock the same file. This path used
+	// to be disabled on __WXMAC__ + AMULE_DAEMON because wxSingleInstanceChecker pulled Cocoa
+	// symbols into a headless binary; InstanceLock is fcntl-only on POSIX, so amuled/Mac now
+	// works too.
 	delete m_singleInstance;
-	m_singleInstance = new wxSingleInstanceChecker("muleLock", thePrefs::GetConfigDir());
-#endif
+	m_singleInstance = new InstanceLock();
+	// Same self-description as the first acquire: the fork is the daemon, and
+	// the file it rewrites is the one a later GUI launch will read.
+	m_singleInstance->Acquire("muleLock",
+		thePrefs::GetConfigDir(),
+		IsDaemon() ? "amuled" : (IsRemoteGui() ? "amulegui" : "amule"));
+}
+
+void CamuleAppCommon::ReleaseSingleInstance()
+{
+	// ~InstanceLock() -> Release() unlinks the lock file and drops the fcntl lock. OnExit()
+	// terminates via std::_Exit(), which skips ~CamuleAppCommon and would otherwise leave the
+	// file behind.
+	delete m_singleInstance;
+	m_singleInstance = nullptr;
+}
+
+bool CamuleAppCommon::DeferShutDownToOuterLoop(const std::function<void()> &retry)
+{
+	wxEventLoopBase *active = wxEventLoopBase::GetActive();
+	if (!active || active->IsMain()) {
+		return false;
+	}
+
+	// Exit() only asks the loop to stop, so the frames between here and the ShowModal() that
+	// started it still have to unwind before teardown can safely run -- hence the retry rather
+	// than falling through.
+	active->Exit();
+
+	if (!m_deferredShutDown) {
+		wxTheApp->Bind(wxEVT_IDLE, &CamuleAppCommon::OnDeferredShutDownIdle, this);
+	}
+	m_deferredShutDown = retry;
+	return true;
+}
+
+void CamuleAppCommon::OnDeferredShutDownIdle(wxIdleEvent &evt)
+{
+	evt.Skip();
+
+	wxEventLoopBase *active = wxEventLoopBase::GetActive();
+	if (active && !active->IsMain()) {
+		// A further loop was entered (or this one has not unwound yet).
+		// Keep asking it to stop and look again on the next idle.
+		active->Exit();
+		evt.RequestMore();
+		return;
+	}
+
+	wxTheApp->Unbind(wxEVT_IDLE, &CamuleAppCommon::OnDeferredShutDownIdle, this);
+
+	// Clear before running: the teardown re-enters ShutDown(), which must see
+	// no outstanding retry or it would bind a second idle handler.
+	std::function<void()> retry;
+	retry.swap(m_deferredShutDown);
+	retry();
 }
 
 void CamuleAppCommon::AddLinksFromFile()
@@ -139,52 +262,60 @@
 		return;
 	}
 
-	// Attempt to lock the ED2KLinks file.
-	CFileLock lock((const char*)unicode2char(fullPath));
+	CFileLock lock((const char *)unicode2char(fullPath));
 
 	wxTextFile file(fullPath);
-	if ( file.Open() ) {
-		unsigned failed = 0;
-		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 == "RAISE_DIALOG") {
-					Notify_ShowGUI();
-					continue;
-				}
-				unsigned long category = 0;
-				if (line.AfterLast(':').ToULong(&category) == true) {
-					line = line.BeforeLast(':');
-				} else { // If ToULong returns false the category still can have been changed!
-						 // This is fixed in wx 2.9
-					category = 0;
-				}
-				if (!theApp->downloadqueue->AddLink(line, category)) {
-					++failed;
-				}
+	if (file.Open()) {
+		// Group the links by category and hand each group to AddLinks() in one call: a
+		// collection expands to hundreds of lines, and the per-link path costs one EC round
+		// trip, and possibly one error dialog, each on the remote GUI. Order within a
+		// category is preserved.
+		std::vector<std::pair<uint8, wxArrayString>> batches;
+
+		for (unsigned int i = 0; i < file.GetLineCount(); i++) {
+			wxString line = file.GetLine(i).Strip(wxString::both);
+
+			if (line.IsEmpty()) {
+				continue;
+			}
+			// Special case! used by a secondary running mule to raise this one.
+			if (line == "RAISE_DIALOG") {
+				Notify_ShowGUI();
+				continue;
+			}
+			unsigned long category = 0;
+			if (line.AfterLast(':').ToULong(&category) == true) {
+				line = line.BeforeLast(':');
+			} else { // If ToULong returns false the category still can have been changed!
+				 // This is fixed in wx 2.9
+				category = 0;
 			}
+
+			const uint8 cat = static_cast<uint8>(category);
+			size_t slot = 0;
+			while (slot < batches.size() && batchesslot.first != cat) {
+				++slot;
+			}
+			if (slot == batches.size()) {
+				batches.emplace_back(cat, wxArrayString());
+			}
+			batchesslot.second.Add(line);
 		}
 
 		file.Close();
 
-		if (failed > 0) {
-			theApp->ShowAlert(
-				CFormat(wxPLURAL("Could not add %u link from ED2KLinks file (see log for details).",
-				                 "Could not add %u links from ED2KLinks file (see log for details).", failed)) % failed,
-				_("ERROR"), wxOK | wxICON_ERROR);
+		// AddLinks() logs each failure and raises a single aggregated alert
+		// for the batch, so there is nothing to count or report here.
+		for (const auto &batch : batches) {
+			theApp->downloadqueue->AddLinks(batch.second, batch.first);
 		}
 	} else {
 		AddLogLineNS(_("Failed to open ED2KLinks file."));
 	}
 
-	// Delete the file.
 	wxRemoveFile(thePrefs::GetConfigDir() + "ED2KLinks");
 }
 
-
-// Returns a magnet ed2k URI
 wxString CamuleAppCommon::CreateMagnetLink(const CAbstractFile *f)
 {
 	CMagnetURI uri;
@@ -194,22 +325,26 @@
 	uri.AddField("xt", wxString("urn:ed2khash:") + f->GetFileHash().Encode().Lower());
 	uri.AddField("xl", CFormat("%d") % f->GetFileSize());
 
+	// AICH, when we have one -- same source and condition CreateED2kLink()
+	// uses for the ed2k link's "h=" field (amule-org/amule#331).
+	const CKnownFile *kf = dynamic_cast<const CKnownFile *>(f);
+	if (kf && kf->HasProperAICHHashSet()) {
+		uri.AddField("xt", wxString("urn:aich:") + kf->GetAICHMasterHash());
+	}
+
 	return uri.GetLink();
 }
 
-
-// Returns a ed2k file URL
-wxString CamuleAppCommon::CreateED2kLink(const CAbstractFile *f, bool add_source, bool use_hostname, bool add_cryptoptions, bool add_AICH)
+wxString CamuleAppCommon::CreateED2kLink(
+	const CAbstractFile *f, bool add_source, bool use_hostname, bool add_cryptoptions, bool add_AICH)
 {
 	wxASSERT(!(!add_source && (use_hostname || add_cryptoptions)));
 	// Construct URL like this: ed2k://|file|<filename>|<size>|<hash>|/
-	wxString strURL = CFormat("ed2k://|file|%s|%i|%s|")
-		% f->GetFileName().Cleanup(false)
-		% f->GetFileSize() % f->GetFileHash().Encode();
+	wxString strURL = CFormat("ed2k://|file|%s|%i|%s|") % f->GetFileName().Cleanup(false) %
+			  f->GetFileSize() % f->GetFileHash().Encode();
 
-	// Append the AICH info
 	if (add_AICH) {
-		const CKnownFile* kf = dynamic_cast<const CKnownFile*>(f);
+		const CKnownFile *kf = dynamic_cast<const CKnownFile *>(f);
 		if (kf && kf->HasProperAICHHashSet()) {
 			strURL << "h=" << kf->GetAICHMasterHash() << "|";
 		}
@@ -218,28 +353,25 @@
 	strURL << "/";
 
 	if (add_source && theApp->IsConnected() && !theApp->IsFirewalled()) {
-		// Create the first part of the URL
 		strURL << "|sources,";
 		if (use_hostname) {
 			strURL << thePrefs::GetYourHostname();
 		} else {
 			uint32 clientID = theApp->GetID();
-			strURL = CFormat("%s%u.%u.%u.%u")
-				% strURL
-				% (clientID & 0xff)
-				% ((clientID >> 8) & 0xff)
-				% ((clientID >> 16) & 0xff)
-				% ((clientID >> 24) & 0xff);
+			strURL = CFormat("%s%u.%u.%u.%u") % strURL % (clientID & 0xff) %
+				 ((clientID >> 8) & 0xff) % ((clientID >> 16) & 0xff) %
+				 ((clientID >> 24) & 0xff);
 		}
 
-		strURL << ":" <<
-			thePrefs::GetPort();
+		strURL << ":" << thePrefs::GetPort();
 
 		if (add_cryptoptions) {
 			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);
+			uint16 byCryptOptions = (uRequiresCryptLayer << 2) | (uRequestsCryptLayer << 1) |
+						(uSupportsCryptLayer << 0) |
+						(uSupportsCryptLayer ? 0x80 : 0x00);
 
 			strURL << ":" << byCryptOptions;
 
@@ -249,37 +381,50 @@
 		}
 		strURL << "|/";
 	} else if (add_source) {
-		AddLogLineC(_("WARNING: You can't add yourself as a source for an eD2k link while having a lowid."));
+		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>|h=<AICH master hash>|/|sources,(<ip>|<hostname>):<port>:cryptoptions:hash|/"
+	// Result is "ed2k://|file|<filename>|<size>|<hash>|h=<AICH master
+	// hash>|/|sources,(<ip>|<hostname>):<port>:cryptoptions:hash|/"
 	return strURL;
 }
 
-
-bool CamuleAppCommon::InitCommon(int argc, wxChar ** argv)
+bool CamuleAppCommon::InitCommon(int argc, wxChar **argv)
 {
 	theApp->SetAppName("aMule");
 	FullMuleVersion = GetFullMuleVersion();
 	OSDescription = wxGetOsDescription();
-	OSType = OSDescription.BeforeFirst( ' ' );
-	if ( OSType.IsEmpty() ) {
+	OSType = OSDescription.BeforeFirst(' ');
+	if (OSType.IsEmpty()) {
 		OSType = "Unknown";
 	}
 
-	// Parse cmdline arguments.
 	wxCmdLineParser cmdline(argc, argv);
 
-	// Handle these arguments.
 	cmdline.AddSwitch("v", "version", "Displays the current version number.");
 	cmdline.AddSwitch("h", "help", "Displays this information.");
 	cmdline.AddOption("c", "config-dir", "read config from <dir> instead of home");
-	// One-shot autostart toggle. Called by the Windows installer's
-	// Components-page checkbox and by the Preferences UI; lives in
-	// AutostartManager so the OS-specific store (Windows registry,
-	// macOS LaunchAgent, Linux XDG .desktop) is hidden from callers.
-	cmdline.AddOption("", "configure-autostart",
+	// One-shot autostart toggle, called by the Windows installer's Components page and by the
+	// Preferences UI. Lives in AutostartManager so the OS-specific store stays hidden from
+	// callers.
+	cmdline.AddOption("",
+		"configure-autostart",
 		"Enable or disable starting this binary on user login (on|off), then exit.");
+	// One-shot ed2k:// + magnet: URL-scheme handler toggle, called by the Windows installer's
+	// Components page and by the Preferences UI / first-run wizard. Lives in
+	// ProtocolHandlerManager for the same reason.
+	cmdline.AddOption("",
+		"configure-protocols",
+		"Register/unregister aMule as the default handler for URL schemes, then exit. "
+		"Values: on|off (both schemes) or ed2k:on|ed2k:off|magnet:on|magnet:off "
+		"(per-scheme). The Windows installer invokes the per-scheme form.");
+	// Same one-shot shape as the two above; also how a portable or self-built copy
+	// registers itself without an installer.
+	cmdline.AddOption("",
+		"configure-file-assoc",
+		"Register/unregister aMule as the handler for .emulecollection files, then exit. "
+		"Values: on|off.");
 #ifdef AMULE_DAEMON
 	cmdline.AddSwitch("f", "full-daemon", "Fork to background.");
 	cmdline.AddOption("p", "pid-file", "After fork, create a pid-file in the given fullname file.");
@@ -293,10 +438,11 @@
 #define HELPTAB "\t\t\t"
 #endif
 
-	cmdline.AddOption("geometry", "",
-			"Sets the geometry of the app.\n"
-			HELPTAB "<str> uses the same format as standard X11 apps:\n"
-			HELPTAB "=<width>{xX}<height>{+-}<xoffset>{+-}<yoffset>");
+	cmdline.AddOption("geometry",
+		"",
+		"Sets the geometry of the app.\n" HELPTAB
+		"<str> uses the same format as standard X11 apps:\n" HELPTAB
+		"=<width>{xX}<height>{+-}<xoffset>{+-}<yoffset>");
 #endif // !AMULE_DAEMON
 
 	cmdline.AddSwitch("o", "log-stdout", "Print log messages to stdout.");
@@ -309,31 +455,34 @@
 	cmdline.AddOption("w", "use-amuleweb", "Specify location of amuleweb binary.");
 #endif
 #ifndef __WINDOWS__
-	cmdline.AddSwitch("d", "disable-fatal",
+	cmdline.AddSwitch("d",
+		"disable-fatal",
 		"Don't catch fatal exceptions or block exit on assertions "
 		"(useful under systemd / watchdog scripts).");
-// Keep stdin open to run valgrind --gen_suppressions
+	// Keep stdin open to run valgrind --gen_suppressions
 	cmdline.AddSwitch("i", "enable-stdin", "Do not disable stdin.");
 #endif
 
-	// Allow passing of links to the app
 	cmdline.AddOption("t", "category", "Set category for passed ED2K links.", wxCMD_LINE_VAL_NUMBER);
-	cmdline.AddParam("ED2K link", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE);
+	cmdline.AddParam(
+		"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() ) {
+	if (cmdline.Parse()) {
 		return false;
 	} else if (cmdline.Found("help")) {
 		cmdline.Usage();
 		return false;
 	}
 
-	if ( cmdline.Found("version")) {
+	if (cmdline.Found("version")) {
 		// This looks silly with logging macros that add a timestamp.
-		printf("%s\n", (const char*)unicode2char(wxString(CFormat("%s (OS: %s)") % FullMuleVersion % OSType)));
+		printf("%s\n",
+			(const char *)unicode2char(
+				wxString(CFormat("%s (OS: %s)") % FullMuleVersion % OSType)));
 		return false;
 	}
 
@@ -341,28 +490,104 @@
 	if (cmdline.Found("configure-autostart", &autostart_arg)) {
 		autostart_arg.MakeLower();
 		bool ok = false;
-		if (autostart_arg == wxT("on") || autostart_arg == wxT("yes") || autostart_arg == wxT("true") || autostart_arg == wxT("1")) {
+		if (autostart_arg == wxT("on") || autostart_arg == wxT("yes") ||
+			autostart_arg == wxT("true") || autostart_arg == wxT("1")) {
 			ok = AutostartManager::Enable();
 			printf(ok ? "autostart enabled\n" : "autostart enable FAILED\n");
-		} else if (autostart_arg == wxT("off") || autostart_arg == wxT("no") || autostart_arg == wxT("false") || autostart_arg == wxT("0")) {
+		} else if (autostart_arg == wxT("off") || autostart_arg == wxT("no") ||
+			   autostart_arg == wxT("false") || autostart_arg == wxT("0")) {
 			ok = AutostartManager::Disable();
 			printf(ok ? "autostart disabled\n" : "autostart disable FAILED\n");
 		} else {
-			fprintf(stderr, "configure-autostart expects 'on' or 'off' (got '%s')\n",
-				(const char*)unicode2char(autostart_arg));
-		}
-		// Exit either way — this flag is a one-shot toggle, not a
-		// "run aMule WITH autostart enabled" combo. (Caller can chain:
-		// `amule --configure-autostart on && amule`.)
-		// Return-false here propagates to OnInit returning false, which
-		// makes wxApp terminate cleanly with exit code 0/1 per `ok`.
-		// Using exit() directly would skip wx destructors.
+			fprintf(stderr,
+				"configure-autostart expects 'on' or 'off' (got '%s')\n",
+				(const char *)unicode2char(autostart_arg));
+		}
+		// Exit either way: this flag is a one-shot toggle, not a "run aMule WITH autostart
+		// enabled" combo. Returning false propagates to OnInit, so wxApp terminates cleanly
+		// with exit code 0/1 per `ok`; exit() would skip the wx destructors.
+		return false;
+	}
+
+	wxString protocols_arg;
+	if (cmdline.Found("configure-protocols", &protocols_arg)) {
+		protocols_arg.MakeLower();
+		// Both the legacy bare on|off (applying to both schemes) and the
+		// per-scheme ed2k:on|magnet:off form the Windows installer now uses.
+		bool doEd2k = false, doMagnet = false;
+		bool wantEnable = false;
+		bool parsed = true;
+		if (protocols_arg == wxT("on") || protocols_arg == wxT("yes") ||
+			protocols_arg == wxT("true") || protocols_arg == wxT("1")) {
+			doEd2k = doMagnet = true;
+			wantEnable = true;
+		} else if (protocols_arg == wxT("off") || protocols_arg == wxT("no") ||
+			   protocols_arg == wxT("false") || protocols_arg == wxT("0")) {
+			doEd2k = doMagnet = true;
+			wantEnable = false;
+		} else if (protocols_arg == wxT("ed2k:on")) {
+			doEd2k = true;
+			wantEnable = true;
+		} else if (protocols_arg == wxT("ed2k:off")) {
+			doEd2k = true;
+			wantEnable = false;
+		} else if (protocols_arg == wxT("magnet:on")) {
+			doMagnet = true;
+			wantEnable = true;
+		} else if (protocols_arg == wxT("magnet:off")) {
+			doMagnet = true;
+			wantEnable = false;
+		} else {
+			parsed = false;
+		}
+		if (!parsed) {
+			fprintf(stderr,
+				"configure-protocols expects 'on', 'off', 'ed2k:on', 'ed2k:off', "
+				"'magnet:on' or 'magnet:off' (got '%s')\n",
+				(const char *)unicode2char(protocols_arg));
+			return false;
+		}
+		bool ok = true;
+		if (doEd2k) {
+			ok &= (wantEnable ? ProtocolHandlerManager::Enable(HandlerTarget::Ed2kScheme)
+					  : ProtocolHandlerManager::Disable(HandlerTarget::Ed2kScheme));
+		}
+		if (doMagnet) {
+			ok &= (wantEnable ? ProtocolHandlerManager::Enable(HandlerTarget::MagnetScheme)
+					  : ProtocolHandlerManager::Disable(HandlerTarget::MagnetScheme));
+		}
+		printf("%s: %s%s\n",
+			ok ? (wantEnable ? "protocols enabled" : "protocols disabled")
+			   : (wantEnable ? "protocols enable FAILED" : "protocols disable FAILED"),
+			doEd2k ? "ed2k" : "",
+			doMagnet ? (doEd2k ? ", magnet" : "magnet") : "");
+		// Same one-shot exit semantics as --configure-autostart above.
+		return false;
+	}
+
+	wxString fileassoc_arg;
+	if (cmdline.Found("configure-file-assoc", &fileassoc_arg)) {
+		fileassoc_arg.MakeLower();
+		bool ok = false;
+		if (fileassoc_arg == wxT("on") || fileassoc_arg == wxT("yes") ||
+			fileassoc_arg == wxT("true") || fileassoc_arg == wxT("1")) {
+			ok = ProtocolHandlerManager::Enable(HandlerTarget::CollectionFile);
+			printf(ok ? "file association enabled\n" : "file association enable FAILED\n");
+		} else if (fileassoc_arg == wxT("off") || fileassoc_arg == wxT("no") ||
+			   fileassoc_arg == wxT("false") || fileassoc_arg == wxT("0")) {
+			ok = ProtocolHandlerManager::Disable(HandlerTarget::CollectionFile);
+			printf(ok ? "file association disabled\n" : "file association disable FAILED\n");
+		} else {
+			fprintf(stderr,
+				"configure-file-assoc expects 'on' or 'off' (got '%s')\n",
+				(const char *)unicode2char(fileassoc_arg));
+		}
+		// Same one-shot exit semantics as --configure-autostart above.
 		return false;
 	}
 
 	wxString configdir;
 	if (cmdline.Found("config-dir", &configdir)) {
-		// Make an absolute path from the config dir
 		wxFileName fn(configdir);
 		fn.MakeAbsolute();
 		configdir = fn.GetFullPath();
@@ -371,50 +596,57 @@
 		}
 		thePrefs::SetConfigDir(configdir);
 	} else {
-		thePrefs::SetConfigDir(/*OtherFunctions::*/GetConfigDir(m_configFile));
+		thePrefs::SetConfigDir(/*OtherFunctions::*/ GetConfigDir(m_configFile));
 	}
 
-	// Backtracing works in MSW.
-	// Problem is just that the backtraces are useless, because apparently the context gets lost
-	// in the try/catch somewhere.
-	// So leave it out.
+	// Left out on MSW: backtraces there are useless, because the context is
+	// apparently lost somewhere in the try/catch.
 #ifndef __WINDOWS__
 	m_disableFatal = cmdline.Found("disable-fatal");
-	#if wxUSE_ON_FATAL_EXCEPTION
-		if ( !m_disableFatal ) {
-			// catch fatal exceptions
-			wxHandleFatalExceptions(true);
-		}
-	#endif
+#if wxUSE_ON_FATAL_EXCEPTION
+	if (!m_disableFatal) {
+		wxHandleFatalExceptions(true);
+	}
+#endif
+	// Armed whether or not wx's handlers are: --disable-fatal turns off the dialog and the
+	// wx-caught signals, but a glibc heap abort still kills us silently, and that is the case
+	// this exists to report. wx covers SIGSEGV/SIGBUS/SIGILL/SIGFPE and never SIGABRT or SIGTRAP.
+	// After wxHandleFatalExceptions() above, so the SIGILL handler has wx's to chain into.
+	InstallFatalAbortHandler();
+	// The banner is written from a signal handler and cannot format anything, so the build is
+	// recorded up front; without it a pasted report does not say which binary produced it.
+	SetFatalAbortVersionLine((const char *)unicode2char(CFormat("%s on %s") % FullMuleVersion % OSType));
 #endif
 
 	theLogger.SetEnabledStdoutLog(cmdline.Found("log-stdout"));
 #ifdef AMULE_DAEMON
 	enable_daemon_fork = cmdline.Found("full-daemon");
-	if ( cmdline.Found("pid-file", &m_PidFile) ) {
-		// Remove any existing PidFile
-		if ( wxFileExists (m_PidFile) ) wxRemoveFile (m_PidFile);
+	if (cmdline.Found("pid-file", &m_PidFile)) {
+		if (wxFileExists(m_PidFile))
+			wxRemoveFile(m_PidFile);
 	}
 	ec_config = cmdline.Found("ec-config");
 #else
 	enable_daemon_fork = false;
 
 	// Default geometry of the GUI. Can be changed with a cmdline argument...
-	if ( cmdline.Found("geometry", &m_geometryString) ) {
+	if (cmdline.Found("geometry", &m_geometryString)) {
 		m_geometryEnabled = true;
 	}
 #endif
 
 	if (theLogger.IsEnabledStdoutLog()) {
-		if ( enable_daemon_fork ) {
-			AddLogLineNS("Daemon will fork to background - log to stdout disabled");	// localization not active yet
+		if (enable_daemon_fork) {
+			AddLogLineNS(LOG_PRELOCALE(
+				"Daemon will fork to background - log to stdout disabled")); // localization
+											     // not active yet
 			theLogger.SetEnabledStdoutLog(false);
 		} else {
-			AddLogLineNS("Logging to stdout enabled");
+			AddLogLineNS(LOG_PRELOCALE("Logging to stdout enabled"));
 		}
 	}
 
-	AddLogLineNS("Initialising " + FullMuleVersion);
+	AddLogLineNS(LOG_PRELOCALE("Initialising ") + FullMuleVersion);
 
 	// Ensure that "~/.aMule/" is accessible.
 	CPath outDir;
@@ -425,18 +657,23 @@
 	if (cmdline.Found("reset-config")) {
 		// Make a backup first.
 		wxRemoveFile(thePrefs::GetConfigDir() + m_configFile + ".backup");
-		wxRenameFile(thePrefs::GetConfigDir() + m_configFile, thePrefs::GetConfigDir() + m_configFile + ".backup");
-		AddLogLineNS(CFormat("Your settings have been reset to default values.\nThe old config file has been saved as %s.backup\n") % m_configFile);
+		wxRenameFile(thePrefs::GetConfigDir() + m_configFile,
+			thePrefs::GetConfigDir() + m_configFile + ".backup");
+		AddLogLineNS(CFormat(LOG_PRELOCALE("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
+	size_t linksPassed = cmdline.GetParamCount(); // number of links from the command line
 	// cppcheck-suppress variableScope
-	int linksActuallyPassed = 0;					// number of links that pass the syntax check
+	int linksActuallyPassed = 0; // number of links that pass the syntax check
 	if (linksPassed) {
-		long cat = 0;
-		if (!cmdline.Found("t", &cat)) {
-			cat = 0;
+		long catArg = 0;
+		if (!cmdline.Found("t", &catArg)) {
+			catArg = 0;
 		}
+		// wxCmdLineParser hands back a long; both consumers take an int.
+		const int cat = static_cast<int>(catArg);
 
 		wxTextFile ed2kFile(thePrefs::GetConfigDir() + "ED2KLinks");
 		if (!ed2kFile.Exists()) {
@@ -444,38 +681,121 @@
 		}
 		if (ed2kFile.Open()) {
 			for (size_t i = 0; i < linksPassed; i++) {
+				const wxString param = cmdline.GetParam(i);
+
+				// A .emulecollection argument stands for every link inside it,
+				// which is what makes a file-manager double-click work where the
+				// path arrives as an ordinary argument.
+				wxArrayString expanded;
+				const CollectionExpansion expansion =
+					ExpandPassedCollection(param, expanded, cat);
+				if (expansion == kCollectionFailed) {
+					continue;
+				}
+				if (expansion == kCollectionExpanded) {
+					for (size_t e = 0; e < expanded.GetCount(); ++e) {
+						ed2kFile.AddLine(expandede);
+						linksActuallyPassed++;
+					}
+					continue;
+				}
+
 				wxString link;
-				if (CheckPassedLink(cmdline.GetParam(i), link, cat)) {
+				if (CheckPassedLink(param, link, cat)) {
 					ed2kFile.AddLine(link);
 					linksActuallyPassed++;
 				}
 			}
 			ed2kFile.Write();
 		} else {
-			AddLogLineCS("Failed to open 'ED2KLinks', cannot add links.");
+			AddLogLineCS(LOG_PRELOCALE("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("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("Checking if there is an instance already running...");
+	AddLogLineNS(LOG_PRELOCALE("Checking if there is an instance already running..."));
 
-	m_singleInstance = new wxSingleInstanceChecker();
+	m_singleInstance = new InstanceLock();
 	wxString lockfile = IsRemoteGui() ? "muleLockRGUI" : "muleLock";
-	if (m_singleInstance->Create(lockfile, thePrefs::GetConfigDir())
-		&& m_singleInstance->IsAnotherRunning()) {
-		AddLogLineCS(CFormat("There is an instance of %s already running") % m_appName);
-		AddLogLineNS(CFormat("(lock file: %s%s)") % thePrefs::GetConfigDir() % lockfile);
+	// Recorded in the lock file so a later launch knows whether the holder has a window: amuled
+	// shares muleLock with the monolithic GUI, and only one of the two can be brought to the
+	// front.
+	const wxString selfKind = IsDaemon() ? "amuled" : (IsRemoteGui() ? "amulegui" : "amule");
+	InstanceLock::Result lockResult =
+		m_singleInstance->Acquire(lockfile, thePrefs::GetConfigDir(), selfKind);
+	if (lockResult == InstanceLock::LOCK_HELD) {
+		// Neutral: something holds it, and WHAT holds it is decided below. Saying "an
+		// instance is already running" here meant the log asserted it and then contradicted
+		// itself two lines later.
+		AddLogLineNS(
+			CFormat(LOG_PRELOCALE("(lock file: %s%s)")) % thePrefs::GetConfigDir() % lockfile);
 		if (linksPassed) {
-			AddLogLineNS(CFormat("passed %d %s to it, finished") % linksActuallyPassed
-				% (linksPassed == 1 ? "link" : "links"));
+			AddLogLineNS(CFormat(LOG_PRELOCALE("passed %d %s to it, finished")) %
+				     linksActuallyPassed % (linksPassed == 1 ? "link" : "links"));
+			// Nothing was handed over, so don't pull the running
+			// instance to the front on account of a bad argument.
+			if (linksActuallyPassed == 0) {
+				return false;
+			}
+		}
+
+		// The lock is held, but by what? Two holders have nothing to raise, and both used
+		// to end the launch in silence.
+		//
+		// On POSIX any process can take a write lock on the file, so a backup or indexing
+		// agent is indistinguishable from here; the pid aMule records tells them apart,
+		// because a foreign holder never refreshes it. On Windows that cannot arise: only
+		// aMule creates the named mutex, and the OS releases it when its owner dies. What
+		// both share is amuled, which uses the same lock as the monolithic GUI and has no
+		// window, so the raise below was always a no-op the user could not see.
+		//
+		// Deliberately conservative: anything not established counts as raisable, so the
+		// only new dialog is one we are sure about, and a lock record with no kind line
+		// (written by an older aMule) keeps the old behaviour exactly.
+		const int holder = m_singleInstance->HolderPid();
+		const wxString holderKind = m_singleInstance->HolderKind();
+#ifdef __WINDOWS__
+		const bool holderAlive = true;
+#else
+		// EPERM means the pid exists under another user, which is alive.
+		const bool holderAlive = (holder <= 0) || (kill(holder, 0) == 0) || (errno == EPERM);
+#endif
+		const bool holderRaisable = holderKind != "amuled";
+		if (!holderAlive || !holderRaisable) {
+			const wxString lockPath = m_singleInstance->Path();
+			wxString msg;
+			if (!holderAlive) {
+				AddLogLineCS(CFormat(LOG_PRELOCALE(
+						     "Lock file %s is held by another program, not "
+						     "by a running aMule (recorded pid %d is gone).")) %
+					     lockPath % holder);
+				msg = CFormat(_("Another program is holding aMule's lock file:\n\n%s\n\nThat "
+						"is not a running copy of aMule, so there is nothing to "
+						"bring to the front. Close the other program, or delete "
+						"the lock file while aMule is not running.")) %
+				      lockPath;
+			} else {
+				AddLogLineCS(CFormat(LOG_PRELOCALE("The aMule daemon (pid %d) holds %s; it "
+								   "has no window to raise.")) %
+					     holder % lockPath);
+				msg = CFormat(_("The aMule daemon (amuled) is already running as process %d "
+						"and is using this configuration.\n\nIt has no window to "
+						"bring to the front. Connect to it with amuleGUI, or stop "
+						"the daemon before starting aMule.")) %
+				      holder;
+			}
+			theApp->ShowAlert(msg, _("aMule cannot start"), wxOK | wxICON_ERROR);
+			// No raise request: nothing would act on it, and the line would sit in
+			// ED2KLinks until some later start consumed it and raised itself.
 			return false;
 		}
 
-		// This is very tricky. The most secure way to communicate is via ED2K links file
+		AddLogLineCS(
+			CFormat(LOG_PRELOCALE("There is an instance of %s already running")) % m_appName);
+
+		// The ED2K links file is the most secure way to communicate this. Raise the window
+		// even when links were handed over: it matters most for a file-manager double-click
+		// on a collection, where the links land in the running instance either way but
+		// without this there is no visible response.
 		wxTextFile ed2kFile(thePrefs::GetConfigDir() + "ED2KLinks");
 		if (!ed2kFile.Exists()) {
 			ed2kFile.Create();
@@ -485,61 +805,73 @@
 			ed2kFile.AddLine("RAISE_DIALOG");
 			ed2kFile.Write();
 
-			AddLogLineNS("Raising current running instance.");
+			AddLogLineNS(LOG_PRELOCALE("Raising current running instance."));
 		} else {
-			AddLogLineCS("Failed to open 'ED2KFile', cannot signal running instance.");
+			AddLogLineCS(
+				LOG_PRELOCALE("Failed to open 'ED2KFile', cannot signal running instance."));
 		}
 
 		return false;
+	} else if (lockResult == InstanceLock::LOCK_ERROR) {
+		AddLogLineCS(CFormat(LOG_PRELOCALE("Could not access lock file (%s%s); continuing without "
+						   "single-instance ") "protection.") %
+			     thePrefs::GetConfigDir() % lockfile);
 	} else {
-		AddLogLineNS("No other instances are running.");
+		AddLogLineNS(LOG_PRELOCALE("No other instances are running."));
 	}
-#endif
 
 #ifndef __WINDOWS__
-	// Close standard-input
-	if ( !cmdline.Found("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 (!cmdline.Found("enable-stdin")) {
+		// The full daemon closes all std file-descriptors itself, so closing here
+		// would instead close the first open file, which is the logfile 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. CamuleFileConfig is a wxFileConfig subclass that
-	// wraps every entry / group lookup in an LC_CTYPE="C" scope so the
-	// case-insensitive sorted-array binary searches are locale-
-	// deterministic. The initial parse below also has to run under
-	// LC_CTYPE="C" so the in-memory sort order matches what subsequent
-	// Read / Write calls will use — otherwise a session that runs under
-	// a non-C locale silently accumulates duplicate key=value lines in
-	// amule.conf (#852).
+	// Create the CFG file and set it as the global config. CamuleFileConfig wraps every entry
+	// and group lookup in an LC_CTYPE="C" scope so the case-insensitive sorted-array binary
+	// searches are locale-deterministic. The initial parse below must run under the same scope
+	// so the in-memory sort order matches what later Read / Write calls use -- otherwise a
+	// session under a non-C locale silently accumulates duplicate key=value lines in
+	// amule.conf.
 	{
 		CCtypeAsciiScope scope;
-		wxConfig::Set(new CamuleFileConfig("", "",
-			thePrefs::GetConfigDir() + m_configFile));
+		wxConfig::Set(new CamuleFileConfig("", "", thePrefs::GetConfigDir() + m_configFile));
+	}
+
+	// The config holds the EC password, which is the credential itself rather than a verifier
+	// -- anything that can read this file can drive the daemon. It is created with whatever the
+	// umask allows, group-writable by default on Debian and Ubuntu. Tightened here rather than
+	// at creation so existing configs are covered too; the .bak is a full copy and needs the
+	// same.
+	if (RestrictToOwner(CPath(thePrefs::GetConfigDir() + m_configFile))) {
+		AddLogLineN(CFormat(_("Restricted permissions on %s to owner-only.")) % m_configFile);
 	}
+	RestrictToOwner(CPath(thePrefs::GetConfigDir() + m_configFile + ".bak"));
 
-	// Make a backup of the log file
 	CPath logfileName = CPath(thePrefs::GetConfigDir() + m_logFile);
 	if (logfileName.FileExists()) {
 		CPath::BackupFile(logfileName, ".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
+	// Send the abort backtrace to the logfile, which is where EmergencyLog() already puts the
+	// SIGSEGV report, so both crash kinds land in the same place. Not conditional on
+	// --full-daemon: that mode points fd 0/1/2 at /dev/null, but a desktop-launched amule or
+	// amulegui has no useful stderr either. Nothing is given up by arming it: stderrUsable
+	// defaults to true, so a terminal still gets its copy.
+	if (theLogger.CrashFd() >= 0) {
+		SetFatalAbortRedirectFd(theLogger.CrashFd());
+	}
+
 	CPreferences::BuildItemList(thePrefs::GetConfigDir());
-	CPreferences::LoadAllItems( wxConfigBase::Get() );
+	CPreferences::LoadAllItems(wxConfigBase::Get());
 
 #ifdef CLIENT_GUI
 	m_skipConnectionDialog = cmdline.Found("skip");
@@ -547,44 +879,120 @@
 	wxString amulewebPath;
 	if (cmdline.Found("use-amuleweb", &amulewebPath)) {
 		thePrefs::SetWSPath(amulewebPath);
-		AddLogLineNS(CFormat("Using amuleweb in '%s'.") % amulewebPath);
+		AddLogLineNS(CFormat(LOG_PRELOCALE("Using amuleweb in '%s'.")) % amulewebPath);
 	}
 #endif
 
-	// If an autostart entry exists pointing at a stale path (user
-	// moved the AppImage / .app / install dir since they enabled the
-	// toggle), silently rewrite it to the current canonical path so
-	// the next login launches the right binary. No-op if no entry
-	// exists — disabling autostart is always a deliberate choice we
-	// don't second-guess.
+	// An autostart entry pointing at a stale path (the AppImage / .app / install dir moved
+	// since the toggle was enabled) is silently rewritten to the current canonical path. No-op
+	// when no entry exists: disabling autostart is a deliberate choice.
 	AutostartManager::SelfHealOnStartup();
 
+	// Same for the URL-scheme handler registration: rewrite a drifted path where
+	// we are the current handler, no-op where we are not.
+	ProtocolHandlerManager::SelfHealOnStartup();
+
 	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.
+ * A detailed description of the aMule version in use, including application name and wx
+ * information.
  */
 const wxString CamuleAppCommon::GetFullMuleVersion() const
 {
 	return GetMuleAppName() + " " + GetMuleVersion();
 }
 
+void CamuleAppCommon::OpenCollectionFiles(const wxArrayString &fileNames)
+{
+	wxArrayString links;
+
+	for (size_t i = 0; i < fileNames.GetCount(); ++i) {
+		wxArrayString expanded;
+		// Category 0: the OS gives us no way to say which one, same as
+		// a link clicked in a browser.
+		if (ExpandPassedCollection(fileNamesi, expanded, 0) == kCollectionExpanded) {
+			for (size_t e = 0; e < expanded.GetCount(); ++e) {
+				links.Add(expandede);
+			}
+		}
+	}
+
+	ProtocolHandler_QueueLinks(links);
+}
+
+CamuleAppCommon::CollectionExpansion CamuleAppCommon::ExpandPassedCollection(
+	const wxString &in, wxArrayString &out, int cat)
+{
+	wxString path(in);
+
+	// File managers hand over either a plain path or a file:// URL,
+	// depending on the platform and on the .desktop Exec field in use.
+	if (path.StartsWith("file://")) {
+		const wxFileName fn = wxFileSystem::URLToFileName(path);
+		path = fn.GetFullPath();
+	}
+
+	if (path.IsEmpty() || !wxFileName(path).GetExt().IsSameAs("emulecollection", false)) {
+		return kNotACollection;
+	}
+	if (!wxFile::Exists(path)) {
+		// The extension says collection, so a missing file is a real
+		// error rather than something to retry as a link.
+		AddLogLineCS(CFormat(_("Collection file not found: %s")) % path);
+		return kCollectionFailed;
+	}
+
+	CMuleCollection collection;
+	if (!collection.Open(path)) {
+		AddLogLineCS(CFormat(_("Invalid or empty collection file: %s")) % path);
+		return kCollectionFailed;
+	}
+
+	unsigned skipped = 0;
+	for (size_t i = 0; i < collection.size(); ++i) {
+		// eMule stores collection strings as UTF-8. Fall back to raw bytes rather
+		// than dropping the entry, since FromUTF8 yields empty on invalid input.
+		wxString link = wxString::FromUTF8(collectioni.c_str());
+		if (link.IsEmpty()) {
+			link = wxString::From8BitData(collectioni.c_str());
+		}
+
+		// Route through CheckPassedLink so a collection link gets the same
+		// validation, canonicalisation and category suffix as a command-line one.
+		wxString checked;
+		if (CheckPassedLink(link, checked, cat)) {
+			out.Add(checked);
+		} else {
+			++skipped;
+		}
+	}
+
+	if (out.IsEmpty()) {
+		AddLogLineCS(CFormat(_("No usable links in collection: %s")) % path);
+		return kCollectionFailed;
+	}
+	if (skipped > 0) {
+		AddLogLineCS(CFormat(wxPLURAL("Skipped %u unusable link in collection: %s",
+				     "Skipped %u unusable links in collection: %s",
+				     skipped)) %
+			     skipped % path);
+	}
+
+	return kCollectionExpanded;
+}
+
 bool CamuleAppCommon::CheckPassedLink(const wxString &in, wxString &out, int cat)
 {
+	// Percent-encoded '|' delimiters are restored by CreateLinkFromUrl()
+	// below, which every other entry point reaches too.
 	wxString link(in);
 
-	// restore ASCII-encoded pipes
-	link.Replace("%7C", "|");
-	link.Replace("%7c", "|");
-
 	if (link.compare(0, 7, "magnet:") == 0) {
 		link = CMagnetED2KConverter(link);
 		if (link.empty()) {
-			AddLogLineCS(CFormat("Cannot convert magnet link to eD2k: %s") % in);
+			AddLogLineCS(CFormat(_("Cannot convert magnet link to eD2k: %s")) % in);
 			return false;
 		}
 	}
@@ -596,23 +1004,23 @@
 			out += CFormat(":%d") % cat;
 		}
 		return true;
-	} catch ( const wxString& err ) {
-		AddLogLineCS(CFormat("Invalid eD2k link \"%s\" - ERROR: %s") % link % err);
+	} catch (const wxString &err) {
+		AddLogLineCS(CFormat(_("Invalid eD2k link \"%s\" - ERROR: %s")) % link % err);
 	}
 	return false;
 }
 
-
 /**
- * Checks permissions on a aMule directory, creating if needed.
+ * Checks permissions on an aMule directory, creating it if needed.
  *
- * @param desc A description of the directory in question, used for error messages.
+ * @param desc A description of the directory, 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 alternative Tried instead if `directory` could not be created.
  * @param outDir Returns the used path.
  * @return False on error.
  */
-bool CamuleAppCommon::CheckMuleDirectory(const wxString& desc, const CPath& directory, const wxString& alternative, CPath& outDir)
+bool CamuleAppCommon::CheckMuleDirectory(
+	const wxString &desc, const CPath &directory, const wxString &alternative, CPath &outDir)
 {
 	wxString msg;
 
@@ -622,23 +1030,21 @@
 	} else if (directory.DirExists()) {
 		// Strings are not translated here because translation isn't up yet.
 		msg = CFormat("Permissions on the %s directory too strict!\n"
-			"aMule cannot proceed. To fix this, you must set read/write/exec\n"
-			"permissions for the folder '%s'")
-				% desc % directory;
+			      "aMule cannot proceed. To fix this, you must set read/write/exec\n"
+			      "permissions for the folder '%s'") %
+		      desc % directory;
 	} else if (CPath::MakeDir(directory)) {
 		outDir = directory;
 		return true;
 	} else {
-		msg << CFormat("Could not create the %s directory at '%s'.")
-			% desc % directory;
+		msg << CFormat("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 << "\nAttempting to use default directory at location \n'"
-			<< alternative << "'.";
-		if (theApp->ShowAlert(msg, "Error accessing directory.", wxICON_ERROR | wxOK | wxCANCEL) == wxCANCEL) {
+		msg << "\nAttempting to use default directory at location \n'" << alternative << "'.";
+		if (theApp->ShowAlert(msg, "Error accessing directory.", wxICON_ERROR | wxOK | wxCANCEL) ==
+			wxCANCEL) {
 			outDir = CPath("");
 			return false;
 		}

amule-3.0.1.tar.gz/src/amuleDlg.cpp -> amule-3.1.0.tar.gz/src/amuleDlg.cpp Changed

@@ -26,99 +26,79 @@
 #include <wx/app.h>
 
 #include <wx/archive.h>
-#include <wx/config.h>				// Do_not_auto_remove (MacOS 10.3, wx 2.7)
-#include <wx/confbase.h>			// Do_not_auto_remove (MacOS 10.3, wx 2.7)
+#include <wx/config.h>   // Do_not_auto_remove (MacOS 10.3, wx 2.7)
+#include <wx/confbase.h> // Do_not_auto_remove (MacOS 10.3, wx 2.7)
 #include <wx/html/htmlwin.h>
-#include <wx/mimetype.h>			// Do_not_auto_remove (win32)
+#include <wx/checkbox.h> // Needed for wxCheckBox (version popup)
+#include <wx/mimetype.h> // Do_not_auto_remove (win32)
+#include <wx/statbmp.h>  // Needed for wxStaticBitmap (version popup)
 #include <wx/stattext.h>
 #include <wx/stdpaths.h>
-#include <wx/textfile.h>			// Do_not_auto_remove (win32)
+#include <wx/textfile.h> // Do_not_auto_remove (win32)
 #include <wx/tokenzr.h>
 #include <wx/wfstream.h>
 #include <wx/zipstrm.h>
 #include <wx/sysopt.h>
-#include <wx/wupdlock.h>			// Needed for wxWindowUpdateLocker
-#include <wx/utils.h>				// Needed for wxFindWindowAtPoint
+#include <wx/wupdlock.h> // Needed for wxWindowUpdateLocker
+#include <wx/utils.h>    // Needed for wxFindWindowAtPoint
 
 #include <common/EventIDs.h>
 
-#include "config.h"				// Needed for GITDATE, PACKAGE, VERSION
-#include "amuleDlg.h"				// Interface declarations.
-
-#include <common/Format.h>			// Needed for CFormat
-#include "amule.h"				// Needed for theApp
-#include "ChatWnd.h"				// Needed for CChatWnd
-#include "SourceListCtrl.h"			// Needed for CSourceListCtrl
-#include "DownloadListCtrl.h"			// Needed for CDownloadListCtrl
-#include "DownloadQueue.h"			// Needed for CDownloadQueue
-#include "KadDlg.h"				// Needed for CKadDlg
+#include "config.h"   // Needed for GITDATE, PACKAGE, VERSION
+#include "amuleDlg.h" // Interface declarations.
+
+#include <common/Format.h>    // Needed for CFormat
+#include "AboutDialog.h"      // Needed for CAboutDlg
+#include "amule.h"            // Needed for theApp
+#include "AppImageEnv.h"      // Needed for GetSanitizedExecEnv
+#include "ChatWnd.h"          // Needed for CChatWnd
+#include "ClientsWnd.h"       // Needed for CClientsWnd
+#include "SourceListCtrl.h"   // Needed for CSourceListCtrl
+#include "DownloadListCtrl.h" // Needed for CDownloadListCtrl
+#include "DownloadQueue.h"    // Needed for CDownloadQueue
+#include "KadDlg.h"           // Needed for CKadDlg
 #include "Logger.h"
+#include "MuleTextCtrl.h" // Needed for CMuleTextCtrl (fast-links placeholder)
+#include "MuleLogCtrl.h"  // Needed for CMuleLogCtrl (the log/server-info panes)
 #include "MuleTrayIcon.h"
-#include "muuli_wdr.h"				// Needed for ID_BUTTON*
-#include "Preferences.h"			// Needed for CPreferences
+#include "muuli_wdr.h"   // Needed for ID_BUTTON*
+#include "Preferences.h" // Needed for CPreferences
 #include "PrefsUnifiedDlg.h"
-#include "SearchDlg.h"				// Needed for CSearchDlg
-#include "Server.h"				// Needed for CServer
-#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
+#include "SearchDlg.h"               // Needed for CSearchDlg
+#include "Server.h"                  // Needed for CServer
+#include "ServerConnect.h"           // Needed for CServerConnect
+#include "ServerWnd.h"               // Needed for CServerWnd
+#include "SharedFilesWnd.h"          // Needed for CSharedFilesWnd
+#include "SharedFilesCtrl.h"         // Needed for CSharedFilesCtrl::UpdateFreeSpace
+#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"
+#include "CamuleArtProvider.h" // Needed for CamuleArtProvider::MakeId
+#include "CCtypeAsciiScope.h"  // Needed for locale-safe ASCII lowercasing of art ids
 
-#include <wx/artprov.h>		// Needed for wxArtProvider::GetIcon
+#include <wx/artprov.h>
+#ifdef __WINDOWS__
+#include <wx/msw/private.h> // Needed for wxGetInstance
+#endif
+#include <wx/bmpbndl.h>  // Needed for wxBitmapBundle
+#include <wx/iconbndl.h> // Needed for wxIconBundle // Needed for wxArtProvider::GetIcon
 
 #include "kademlia/kademlia/Kademlia.h"
-#include "MuleVersion.h"			// Needed for GetMuleVersion()
+#include "MuleVersion.h"    // Needed for GetMuleVersion(), GetShortMuleVersion()
+#include "InfoGridDialog.h" // Needed for ShowInfoGridDialog
 
 #ifdef ENABLE_IP2COUNTRY
-#include "IP2Country.h"				// Needed for IP2Country
+#include "IP2Country.h" // Needed for IP2Country
 #endif
 
 #ifdef __WXMAC__
-#include "MacAppHelper.h"			// mac_set_accessory_mode
-#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);
-
-	// Refresh the IP2Country status block in the Preferences dialog if
-	// the user happens to have it open right now (e.g. they clicked
-	// "Update now" and have been watching the panel). No-op otherwise.
-	PrefsUnifiedDlg::RefreshIP2CountryStatusIfOpen();
-}
-
-void CamuleDlg::EnableIP2Country()
-{
-	if (thePrefs::IsGeoIPEnabled()) {
-		m_IP2Country->Enable();
-		// Auto-update on startup: refresh the database from the
-		// selected source so the user sees current data without
-		// having to open Preferences and click "Update now". Only
-		// fires when both the master enable AND the per-source
-		// auto-update toggle are on, and a database is already
-		// loaded (the first-run / missing-file path is handled
-		// inside Enable() above via its own Update() call).
-		if (thePrefs::IsGeoIPAutoUpdate() && m_IP2Country->IsEnabled()) {
-			m_IP2Country->Update();
-		}
-	}
-}
-
-#else
-
-void CamuleDlg::IP2CountryDownloadFinished(uint32){}
-void CamuleDlg::EnableIP2Country(){}
-
+#include "MacAppHelper.h" // mac_set_accessory_mode
 #endif
 
 wxBEGIN_EVENT_TABLE(CamuleDlg, wxFrame)
@@ -128,13 +108,26 @@
 	EVT_TOOL(ID_BUTTONDOWNLOADS, CamuleDlg::OnToolBarButton)
 	EVT_TOOL(ID_BUTTONSHARED, CamuleDlg::OnToolBarButton)
 	EVT_TOOL(ID_BUTTONMESSAGES, CamuleDlg::OnToolBarButton)
+	EVT_TOOL(ID_BUTTONCLIENTS, CamuleDlg::OnToolBarButton)
 	EVT_TOOL(ID_BUTTONSTATISTICS, CamuleDlg::OnToolBarButton)
 	EVT_TOOL(ID_ABOUT, CamuleDlg::OnAboutButton)
 
 	EVT_TOOL(ID_BUTTONNEWPREFERENCES, CamuleDlg::OnPrefButton)
 	EVT_TOOL(ID_BUTTONIMPORT, CamuleDlg::OnImportButton)
 
-	EVT_TOOL(ID_BUTTONCONNECT, CamuleDlg::OnBnConnect)
+	// Alt+<letter> tab-switch shortcuts. On Windows/Linux these come from the
+	// wxAcceleratorEntry table built in OnInit(); on macOS from real NSMenuItem key
+	// equivalents (see the __WXMAC__ menu bar there), since a plain accelerator-table entry
+	// on wxOSX only fires its wxEVT_MENU once per click-to-refocus. Either path lands here
+	// as a wxEVT_MENU with the same button ID.
+	EVT_MENU(ID_BUTTONNETWORKS, CamuleDlg::OnToolBarButton)
+	EVT_MENU(ID_BUTTONSEARCH, CamuleDlg::OnToolBarButton)
+	EVT_MENU(ID_BUTTONDOWNLOADS, CamuleDlg::OnToolBarButton)
+	EVT_MENU(ID_BUTTONSHARED, CamuleDlg::OnToolBarButton)
+	EVT_MENU(ID_BUTTONMESSAGES, CamuleDlg::OnToolBarButton)
+	EVT_MENU(ID_BUTTONCLIENTS, CamuleDlg::OnToolBarButton)
+	EVT_MENU(ID_BUTTONSTATISTICS, CamuleDlg::OnToolBarButton)
+	EVT_MENU(ID_BUTTONNEWPREFERENCES, CamuleDlg::OnPrefButton)
 
 	EVT_CLOSE(CamuleDlg::OnClose)
 	EVT_ICONIZE(CamuleDlg::OnMinimize)
@@ -154,75 +147,125 @@
 wxEND_EVENT_TABLE()
 
 #ifndef wxCLOSE_BOX
-	#define wxCLOSE_BOX 0
+#define wxCLOSE_BOX 0
 #endif
 
-CamuleDlg::CamuleDlg(
-	wxWindow* pParent,
-	const wxString &title,
-	wxPoint where,
-	wxSize dlg_size)
-:
-wxFrame(
-	pParent, -1, title, where, dlg_size,
-	wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxDIALOG_NO_PARENT|
-	wxRESIZE_BORDER|wxMINIMIZE_BOX|wxMAXIMIZE_BOX|wxCLOSE_BOX,
-	"aMule"),
-m_activewnd(NULL),
-m_transferwnd(NULL),
-m_serverwnd(NULL),
-m_sharedfileswnd(NULL),
-m_searchwnd(NULL),
-m_chatwnd(NULL),
-m_statisticswnd(NULL),
-m_kademliawnd(NULL),
-m_prefsDialog(NULL),
-m_srv_split_pos(0),
-m_lastShownPos(wxDefaultPosition),
-m_lastShownSize(wxDefaultSize),
-m_lastShownMaximized(false),
-m_lastShownValid(false),
-m_imagelist(16,16),
-m_tblist(32,32),
-m_prefsVisible(false),
-m_wndToolbar(NULL),
-m_wndTaskbarNotifier(NULL),
-m_nActiveDialog(DT_NETWORKS_WND),
-m_is_safe_state(false),
-m_BlinkMessages(false),
-m_CurrentBlinkBitmap(24),
-m_last_iconizing(0),
-m_skinFileName(),
-m_clientSkinNames(CLIENT_SKIN_SIZE)
+#if defined(__WXGTK__) && !defined(__APPLE__)
+#include <gio/gio.h> // GDBus, for the Flatpak background-portal request below
+
+// Inside a Flatpak sandbox, a client configured to run without a visible window
+// (hide-to-tray on close, or start minimized) maps no window, and
+// xdg-desktop-portal's background monitor then kills it unless the "background"
+// permission was granted. aMule never asked for it, so on backends that default to deny
+// (KDE) the app was killed on close. Requesting it registers aMule as a legitimate
+// background app. Native builds are not background-monitored -- hence the FLATPAK_ID
+// gate -- and this is a no-op wherever there is no portal.
+static void RequestFlatpakBackgroundPermission()
+{
+	if (g_getenv("FLATPAK_ID") == nullptr) {
+		return;
+	}
+
+	GError *error = nullptr;
+	GDBusConnection *conn = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, &error);
+	if (conn == nullptr) {
+		if (error != nullptr) {
+			g_error_free(error);
+		}
+		return;
+	}
+
+	GVariantBuilder options;
+	g_variant_builder_init(&options, G_VARIANT_TYPE_VARDICT);
+	g_variant_builder_add(&options,
+		"{sv}",
+		"reason",
+		g_variant_new_string("aMule keeps running in the background to continue your transfers."));
+	g_variant_builder_add(&options, "{sv}", "autostart", g_variant_new_boolean(FALSE));
+
+	// Fire-and-forget: the portal grants (or on KDE prompts once) and records the permission
+	// for next launch. The returned request handle is not needed, and the GUI must not block
+	// waiting on a possible prompt.
+	g_dbus_connection_call(conn,
+		"org.freedesktop.portal.Desktop",
+		"/org/freedesktop/portal/desktop",
+		"org.freedesktop.portal.Background",
+		"RequestBackground",
+		g_variant_new("(sa{sv})", "", &options),
+		nullptr,
+		G_DBUS_CALL_FLAGS_NONE,
+		-1,
+		nullptr,
+		nullptr,
+		nullptr);
+
+	g_object_unref(conn);
+}
+#endif // defined(__WXGTK__) && !defined(__APPLE__)
+
+CamuleDlg::CamuleDlg(wxWindow *pParent, const wxString &title, wxPoint where, wxSize dlg_size)
+: wxFrame(pParent,
+	  -1,
+	  title,
+	  where,
+	  dlg_size,
+	  wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
+		  wxCLOSE_BOX,
+	  "aMule")
+, m_activewnd(NULL)
+, m_transferwnd(NULL)
+, m_serverwnd(NULL)
+, m_sharedfileswnd(NULL)
+, m_searchwnd(NULL)
+, m_chatwnd(NULL)
+, m_statisticswnd(NULL)
+, m_kademliawnd(NULL)
+, m_prefsDialog(NULL)
+, m_srv_split_pos(0)
+, m_lastShownPos(wxDefaultPosition)
+, m_lastShownSize(wxDefaultSize)
+, m_lastShownMaximized(false)
+, m_lastShownValid(false)
+, m_imagelist(16, 16)
+, m_prefsVisible(false)
+, m_wndToolbar(NULL)
+, m_wndTaskbarNotifier(NULL)
+, m_nActiveDialog(DT_NETWORKS_WND)
+, m_is_safe_state(false)
+, m_BlinkMessages(false)
+, m_CurrentBlinkBitmap(Toolbar_Messages)
+, m_last_iconizing(0)
+, m_skinFileName()
+, m_clientSkinNames(CLIENT_SKIN_SIZE)
 {
 	// Initialize skin names
-	m_clientSkinNamesClient_Green_Smiley            = "Transfer";
-	m_clientSkinNamesClient_Red_Smiley              = "Connecting";
-	m_clientSkinNamesClient_Yellow_Smiley           = "OnQueue";
-	m_clientSkinNamesClient_Grey_Smiley             = "A4AFNoNeededPartsQueueFull";
-	m_clientSkinNamesClient_White_Smiley            = "StatusUnknown";
+	m_clientSkinNamesClient_Green_Smiley = "Transfer";
+	m_clientSkinNamesClient_Red_Smiley = "Connecting";
+	m_clientSkinNamesClient_Yellow_Smiley = "OnQueue";
+	m_clientSkinNamesClient_Grey_Smiley = "A4AFNoNeededPartsQueueFull";
+	m_clientSkinNamesClient_White_Smiley = "StatusUnknown";
 	m_clientSkinNamesClient_ExtendedProtocol_Smiley = "ExtendedProtocol";
-	m_clientSkinNamesClient_SecIdent_Smiley         = "SecIdent";
-	m_clientSkinNamesClient_BadGuy_Smiley           = "BadGuy";
-	m_clientSkinNamesClient_CreditsGrey_Smiley      = "CreditsGrey";
-	m_clientSkinNamesClient_CreditsYellow_Smiley    = "CreditsYellow";
-	m_clientSkinNamesClient_Upload_Smiley           = "Upload";
-	m_clientSkinNamesClient_Friend_Smiley           = "Friend";
-	m_clientSkinNamesClient_eMule_Smiley            = "eMule";
-	m_clientSkinNamesClient_mlDonkey_Smiley         = "mlDonkey";
-	m_clientSkinNamesClient_eDonkeyHybrid_Smiley    = "eDonkeyHybrid";
-	m_clientSkinNamesClient_aMule_Smiley            = "aMule";
-	m_clientSkinNamesClient_lphant_Smiley           = "lphant";
-	m_clientSkinNamesClient_Shareaza_Smiley         = "Shareaza";
-	m_clientSkinNamesClient_xMule_Smiley            = "xMule";
-	m_clientSkinNamesClient_Unknown                 = "Unknown";
-	m_clientSkinNamesClient_InvalidRating_Smiley    = "InvalidRatingOnFile";
-	m_clientSkinNamesClient_PoorRating_Smiley       = "PoorRatingOnFile";
-	m_clientSkinNamesClient_GoodRating_Smiley       = "GoodRatingOnFile";
-	m_clientSkinNamesClient_FairRating_Smiley       = "FairRatingOnFile";
-	m_clientSkinNamesClient_ExcellentRating_Smiley  = "ExcellentRatingOnFile";
-	m_clientSkinNamesClient_CommentOnly_Smiley      = "CommentOnly";
-	m_clientSkinNamesClient_Encryption_Smiley       = "Encrypted";
+	m_clientSkinNamesClient_SecIdent_Smiley = "SecIdent";
+	m_clientSkinNamesClient_BadGuy_Smiley = "BadGuy";
+	m_clientSkinNamesClient_CreditsGrey_Smiley = "CreditsGrey";
+	m_clientSkinNamesClient_CreditsYellow_Smiley = "CreditsYellow";
+	m_clientSkinNamesClient_Upload_Smiley = "Upload";
+	m_clientSkinNamesClient_Friend_Smiley = "Friend";
+	m_clientSkinNamesClient_eMule_Smiley = "eMule";
+	m_clientSkinNamesClient_mlDonkey_Smiley = "mlDonkey";
+	m_clientSkinNamesClient_eDonkeyHybrid_Smiley = "eDonkeyHybrid";
+	m_clientSkinNamesClient_aMule_Smiley = "aMule";
+	m_clientSkinNamesClient_lphant_Smiley = "lphant";
+	m_clientSkinNamesClient_Shareaza_Smiley = "Shareaza";
+	m_clientSkinNamesClient_xMule_Smiley = "xMule";
+	m_clientSkinNamesClient_Unknown = "Unknown";
+	m_clientSkinNamesClient_InvalidRating_Smiley = "InvalidRatingOnFile";
+	m_clientSkinNamesClient_PoorRating_Smiley = "PoorRatingOnFile";
+	m_clientSkinNamesClient_GoodRating_Smiley = "GoodRatingOnFile";
+	m_clientSkinNamesClient_FairRating_Smiley = "FairRatingOnFile";
+	m_clientSkinNamesClient_ExcellentRating_Smiley = "ExcellentRatingOnFile";
+	m_clientSkinNamesClient_CommentOnly_Smiley = "CommentOnly";
+	m_clientSkinNamesClient_Encryption_Smiley = "Encrypted";
 
 	// wxWidgets send idle events to ALL WINDOWS by default... *SIGH*
 	wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED);
@@ -235,16 +278,34 @@
 #endif
 
 #if !defined(__WXMAC__)
-	// this crashes on Mac with wx 2.9.
-	// On Windows the wxICON macro resolves the icon from the .rc
-	// resource bundle (see amule.rc); elsewhere it would normally
-	// expand to wxIcon(aMule_xpm), but the XPM tree is gone — we
-	// route through CamuleArtProvider, which decodes the embedded
-	// PNG bytes registered under the "amule:amule" art id.
+	// This crashes on Mac with wx 2.9. On Windows the wxICON macro resolves the icon from
+	// the .rc resource bundle (see amule.rc), which already carries every size the window
+	// manager might ask for.
 #ifdef __WINDOWS__
-	SetIcon(wxICON(aMule));
+	// The whole group from amule.rc, not one icon out of it. SetIcon() gives the window a
+	// single image, and Windows then derives whichever of ICON_BIG / ICON_SMALL it was not
+	// handed by scaling that one -- so one of the two is always resampled rather than read
+	// from the size the .ico already carries.
+	SetIcons(wxIconBundle("aMule", wxGetInstance()));
 #else
-	SetIcon(wxArtProvider::GetIcon("amule:amule"));
+	// Elsewhere the icon comes from CamuleArtProvider. A set of sizes rather than one, so the
+	// taskbar, the alt-tab switcher and the window frame each get a rendering of their own
+	// instead of scaling a single raster.
+	wxIconBundle icons;
+	const wxBitmapBundle logo = wxArtProvider::GetBitmapBundle("amule:amule");
+	for (const int side : { 16, 24, 32, 48, 64, 128, 256 }) {
+		const wxBitmap bitmap = logo.GetBitmap(wxSize(side, side));
+		if (bitmap.IsOk()) {
+			wxIcon icon;
+			icon.CopyFromBitmap(bitmap);
+			icons.AddIcon(icon);
+		}
+	}
+	if (icons.IsEmpty()) {
+		SetIcon(wxArtProvider::GetIcon("amule:amule"));
+	} else {
+		SetIcons(icons);
+	}
 #endif
 #endif
 
@@ -255,7 +316,7 @@
 	s_main->AddGrowableCol(0);
 	s_main->AddGrowableRow(0);
 
-	wxPanel* p_cnt = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize);
+	wxPanel *p_cnt = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize);
 	s_main->Add(p_cnt, wxSizerFlags().Expand().Expand());
 	muleDlg(p_cnt, false, true);
 	SetSizer(s_main, true);
@@ -263,16 +324,18 @@
 	m_serverwnd = new CServerWnd(p_cnt, m_srv_split_pos);
 	AddLogLineN("");
 	AddLogLineN(wxString(" - ") +
-		wxString(CFormat(_("This is aMule %s based on eMule.")) % GetMuleVersion()));
-	AddLogLineN(wxString("   ") +
-		wxString(CFormat(_("Running on %s")) % wxGetOsDescription()));
-	AddLogLineN(" - " +
-		wxString(_("Visit https://github.com/amule-org/amule/releases/latest to check if a new version is available.")));
+		    wxString(CFormat(_("This is aMule %s based on eMule.")) % GetMuleVersion()));
+	AddLogLineN(wxString("   ") + wxString(CFormat(_("Running on %s")) % wxGetOsDescription()));
+#ifdef ENABLE_VERSION_CHECK
+	AddLogLineN(" - " + wxString(_("Visit https://github.com/amule-org/amule/releases/latest to check if "
+				       "a new version is available.")));
+#endif
 	AddLogLineN("");
 
 #ifdef ENABLE_IP2COUNTRY
+	// The GeoIP resolver itself is core-owned (CamuleApp); the dialog only
+	// records that the build supports it, for the prefs panel.
 	m_GeoIPavailable = true;
-	m_IP2Country = new CIP2Country(thePrefs::GetConfigDir());
 #else
 	m_GeoIPavailable = false;
 #endif
@@ -281,17 +344,28 @@
 	m_sharedfileswnd = new CSharedFilesWnd(p_cnt);
 	m_statisticswnd = new CStatisticsDlg(p_cnt, theApp->m_statistics);
 	m_chatwnd = new CChatWnd(p_cnt);
+	m_clientswnd = new CClientsWnd(p_cnt);
 	m_kademliawnd = CastChild("kadWnd", CKadDlg);
 
+	// Status-bar core-version field opens its details dialog on click. Null in
+	// monolithic aMule, which does not build it.
+	if (wxWindow *coreVerLabel = CastChild("coreVersionLabel", wxWindow)) {
+		coreVerLabel->Bind(wxEVT_LEFT_UP, &CamuleDlg::OnCoreVersionClicked, this);
+	}
+	if (wxWindow *coreVerIcon = CastChild("coreVersionImage", wxWindow)) {
+		coreVerIcon->Bind(wxEVT_LEFT_UP, &CamuleDlg::OnCoreVersionClicked, this);
+	}
+
 	m_serverwnd->Show(false);
 	m_searchwnd->Show(false);
 	m_transferwnd->Show(false);
 	m_sharedfileswnd->Show(false);
 	m_statisticswnd->Show(false);
 	m_chatwnd->Show(false);
+	m_clientswnd->Show(false);
 
 	// Create the GUI timer
-	gui_timer=new wxTimer(this,ID_GUI_TIMER_EVENT);
+	gui_timer = new wxTimer(this, ID_GUI_TIMER_EVENT);
 	if (!gui_timer) {
 		AddLogLineN(_("FATAL ERROR: Failed to create Timer"));
 		exit(1);
@@ -300,15 +374,13 @@
 	// Set transfers as active window
 	Create_Toolbar(thePrefs::VerticalToolbar());
 	SetActiveDialog(DT_TRANSFER_WND, m_transferwnd);
-	m_wndToolbar->ToggleTool(ID_BUTTONDOWNLOADS, true );
+	m_wndToolbar->ToggleTool(ID_BUTTONDOWNLOADS, true);
 
 	bool override_where = (where != wxDefaultPosition);
-	bool override_size = (
-		(dlg_size.x != DEFAULT_SIZE_X) ||
-		(dlg_size.y != DEFAULT_SIZE_Y) );
+	bool override_size = ((dlg_size.x != DEFAULT_SIZE_X) || (dlg_size.y != DEFAULT_SIZE_Y));
 	if (!LoadGUIPrefs(override_where, override_size)) {
 		// Prefs not loaded for some reason, exit
-		AddLogLineC("Error! Unable to load Preferences" );
+		AddLogLineC(_("Error! Unable to load Preferences"));
 		return;
 	}
 
@@ -326,46 +398,86 @@
 		CreateSystray();
 	}
 
-	Show(true);
+	// Deferred on the monolithic build, where the startup splash is up and the work it
+	// reports on -- part-file load, shared-file scan, hashing -- runs on this thread. A window
+	// shown now would sit there taking clicks it cannot answer, and the first of those would
+	// raise it over the splash that was explaining the wait. amulegui has no such wait.
+#ifdef CLIENT_GUI
+	ShowStartupWindow();
+#endif
 
-	// Workaround for wxMSW: Create_Toolbar() above (and the Realize()
-	// inside Apply_Toolbar_Skin) runs before the frame is mapped at
-	// its final on-screen size. wxMSW's native toolbar control
-	// measures whether labels fit at *that* moment to pick its display
-	// mode (icon-only vs icon-with-label-below); with long-string
-	// locales (it_IT, fr_FR, ...) on amulegui (one fewer button than
-	// the monolithic GUI, so a slightly different total width) the
-	// initial measurement decides icon-only and never recovers when
-	// the frame later resizes to the saved/maximized geometry, leaving
-	// the labels clipped. Re-realize the toolbar after Show(true) so
-	// the mode is picked against the actual on-screen frame width.
-	if (m_wndToolbar) {
-		m_wndToolbar->Realize();
-	}
+#if defined(ENABLE_VERSION_CHECK) && defined(CLIENT_GUI)
+	// amulegui only: defer the "is a newer aMule available?" check until the event loop is
+	// running, past the heavy startup I/O. The monolithic app drives this from the shared core
+	// engine instead, so there is a single fetch that also feeds the EC version state.
+	CallAfter(&CamuleDlg::StartupVersionCheck);
+#endif
 
-	// Must we start minimized?
-	if (thePrefs::GetStartMinimized()) {
-		Iconize(true);
+#if defined(__WXGTK__) && !defined(__APPLE__)
+	// If we are set up to run without a visible window (hide-to-tray on close, or start
+	// minimized), ask the desktop portal for background permission so a Flatpak build is not
+	// killed on close. No-op outside Flatpak. See the helper.
+	if (thePrefs::HideOnClose() || thePrefs::GetStartMinimized()) {
+		RequestFlatpakBackgroundPermission();
 	}
+#endif
 
 	// Set shortcut keys
+#ifdef __WXMAC__
+	// Alt+<letter> tab-switch shortcuts, exposed as real NSMenuItem key equivalents rather
+	// than wxAcceleratorEntry entries: on wxOSX an accelerator-table entry fires its
+	// wxEVT_MENU exactly once per click-to-refocus -- the FIRST Alt+<letter> after the window
+	// regains key status switches tabs, but every subsequent press is silently swallowed by
+	// Cocoa's key-equivalent dispatch until the user clicks in the window again. Real menu key
+	// equivalents are dispatched by the OS itself, and VoiceOver can navigate an actual menu.
+	wxAcceleratorEntry entries = { wxAcceleratorEntry(wxACCEL_CTRL, 'Q', wxID_EXIT) };
+	SetAcceleratorTable(wxAcceleratorTable(itemsof(entries), entries));
+
+	wxMenu *navigateMenu = new wxMenu();
+	navigateMenu->Append(ID_BUTTONNETWORKS, _("Networks") + "\tAlt+N");
+	navigateMenu->Append(ID_BUTTONSEARCH, _("Searches") + "\tAlt+S");
+	navigateMenu->Append(ID_BUTTONDOWNLOADS, _("Downloads") + "\tAlt+T");
+	navigateMenu->Append(ID_BUTTONSHARED, _("Shared files") + "\tAlt+F");
+	navigateMenu->Append(ID_BUTTONCLIENTS, _("Clients") + "\tAlt+C");
+	navigateMenu->Append(ID_BUTTONMESSAGES, _("Messages") + "\tAlt+M");
+	navigateMenu->Append(ID_BUTTONSTATISTICS, _("Statistics") + "\tAlt+G");
+	navigateMenu->AppendSeparator();
+	navigateMenu->Append(ID_BUTTONNEWPREFERENCES, _("Preferences") + "\tAlt+P");
+
+	wxMenuBar *menuBar = new wxMenuBar();
+	menuBar->Append(navigateMenu, _("Navigate"));
+	SetMenuBar(menuBar);
+#else
+	// Alt+<letter> mirrors the classic eMule tab shortcuts (Alt+S for Search, etc.) and gives
+	// keyboard users a way to switch tabs without the mouse. macOS gets the same shortcuts via
+	// a real menu instead -- see the __WXMAC__ branch above.
 	wxAcceleratorEntry entries = {
-		wxAcceleratorEntry(wxACCEL_CTRL, 'Q', wxID_EXIT)
+		wxAcceleratorEntry(wxACCEL_CTRL, 'Q', wxID_EXIT),
+		wxAcceleratorEntry(wxACCEL_ALT, 'N', ID_BUTTONNETWORKS),
+		wxAcceleratorEntry(wxACCEL_ALT, 'S', ID_BUTTONSEARCH),
+		wxAcceleratorEntry(wxACCEL_ALT, 'T', ID_BUTTONDOWNLOADS),
+		wxAcceleratorEntry(wxACCEL_ALT, 'F', ID_BUTTONSHARED),
+		wxAcceleratorEntry(wxACCEL_ALT, 'M', ID_BUTTONMESSAGES),
+		wxAcceleratorEntry(wxACCEL_ALT, 'C', ID_BUTTONCLIENTS),
+		wxAcceleratorEntry(wxACCEL_ALT, 'G', ID_BUTTONSTATISTICS),
+		wxAcceleratorEntry(wxACCEL_ALT, 'P', ID_BUTTONNEWPREFERENCES),
 	};
-
 	SetAcceleratorTable(wxAcceleratorTable(itemsof(entries), entries));
-	ShowED2KLinksHandler( thePrefs::GetFED2KLH() );
+#endif
+	ShowED2KLinksHandler(thePrefs::GetFED2KLH());
 
-	wxNotebook* logs_notebook = CastChild( ID_SRVLOG_NOTEBOOK, wxNotebook);
-	wxNotebook* networks_notebook = CastChild( ID_NETNOTEBOOK, wxNotebook);
+	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 (uint32 i = 0; i < logs_notebook->GetPageCount(); ++i) {
-		m_logpagesi.page = logs_notebook->GetPage(i);
-		m_logpagesi.name = logs_notebook->GetPageText(i);
-	}
+	// Capture the network-conditional log tabs by the control each hosts, not by index --
+	// amulegui's tab layout differs from the monolithic build, and an index-based scheme
+	// silently dropped Kad Info when the "aMuleGUI Log" tab was added. DoNetworkRearrange()
+	// shows/hides these by identity.
+	m_logServerInfo = CaptureLogPage(logs_notebook, ID_SERVERINFO);
+	m_logED2KInfo = CaptureLogPage(logs_notebook, ID_ED2KINFO);
+	m_logKadInfo = CaptureLogPage(logs_notebook, ID_KADINFO);
 
 	for (uint32 i = 0; i < networks_notebook->GetPageCount(); ++i) {
 		m_networkpagesi.page = networks_notebook->GetPage(i);
@@ -375,70 +487,100 @@
 	DoNetworkRearrange();
 }
 
-
 // Madcat - Sets Fast ED2K Links Handler on/off.
-void CamuleDlg::ShowED2KLinksHandler( bool show )
+void CamuleDlg::ShowStartupWindow()
 {
-	// Errorchecking in case the pointer becomes invalid ...
-	if (s_fed2klh == NULL) {
-		wxLogWarning("Unable to find Fast ED2K Links handler sizer! Hiding FED2KLH aborted.");
+	if (IsShown()) {
 		return;
 	}
 
-	s_dlgcnt->Show( s_fed2klh, show );
-	s_dlgcnt->Layout();
+	Show(true);
+
+	// Workaround for wxMSW: Create_Toolbar() (and the Realize() inside Apply_Toolbar_Skin)
+	// runs before the frame is mapped at its final on-screen size. wxMSW's native toolbar
+	// measures whether labels fit at *that* moment to pick its display mode, so with
+	// long-string locales the initial measurement decides icon-only and never recovers when
+	// the frame later resizes to the saved geometry, leaving the labels clipped. Re-realize
+	// the toolbar after Show(true), against the actual on-screen frame width.
+	if (m_wndToolbar) {
+		m_wndToolbar->Realize();
+	}
+
+	// Must we start minimized?
+	if (thePrefs::GetStartMinimized()) {
+		Iconize(true);
+	}
 }
 
-// Toogles ed2k link handler.
-void CamuleDlg::ToogleED2KLinksHandler()
+void CamuleDlg::ShowED2KLinksHandler(bool show)
 {
 	// Errorchecking in case the pointer becomes invalid ...
 	if (s_fed2klh == NULL) {
-		wxLogWarning("Unable to find Fast ED2K Links handler sizer! Toogling FED2KLH aborted.");
+		wxLogWarning("Unable to find Fast ED2K Links handler sizer! Hiding FED2KLH aborted.");
 		return;
 	}
-	ShowED2KLinksHandler(!s_dlgcnt->IsShown(s_fed2klh));
+
+	s_dlgcnt->Show(s_fed2klh, show);
+	s_dlgcnt->Layout();
 }
 
-void CamuleDlg::SetActiveDialog(DialogType type, wxWindow* dlg)
+void CamuleDlg::SetActiveDialog(DialogType type, wxWindow *dlg)
 {
 	m_nActiveDialog = type;
 
-	if ( type == DT_TRANSFER_WND ) {
+	if (type == DT_TRANSFER_WND) {
 		if (thePrefs::ShowCatTabInfos()) {
 			m_transferwnd->UpdateCatTabTitles();
 		}
 	}
 
-	if ( m_activewnd ) {
+	if (m_activewnd) {
 		m_activewnd->Show(false);
 		contentSizer->Detach(m_activewnd);
 	}
 
 	contentSizer->Add(dlg, wxSizerFlags(1).Expand());
 	dlg->Show(true);
-	m_activewnd=dlg;
+	m_activewnd = dlg;
 	s_dlgcnt->Layout();
 
 	// Since we might be suspending redrawing while hiding the dialog
 	// we have to refresh it once it is visible again
-	dlg->Refresh( true );
+	dlg->Refresh(true);
 	dlg->SetFocus();
 
-	if ( type == DT_SHARED_WND ) {
+	if (type == DT_SHARED_WND) {
 		// set up splitter now that window sizes are defined
 		m_sharedfileswnd->Prepare();
 	}
+
+	// The panel that just appeared is only refreshed on the timer, so without this it would
+	// show its previous figure -- from whenever it was last on screen, which can be a long
+	// time -- until the next tick.
+	UpdateFreeSpaceLabels();
 }
 
+void CamuleDlg::ShowSearchWindow()
+{
+	if (!m_is_safe_state || m_nActiveDialog == DT_SEARCH_WND) {
+		return;
+	}
+	// A real toolbar click lets wx toggle the pressed button on, then OnToolBarButton switches
+	// the panel and untoggles the previous button. Reproduce that: pre-toggle Search, then run
+	// the handler so the panel, the ED2K-links handler, the untoggle, and its lastbutton
+	// bookkeeping all match.
+	m_wndToolbar->ToggleTool(ID_BUTTONSEARCH, true);
+	wxCommandEvent evt(wxEVT_COMMAND_TOOL_CLICKED, ID_BUTTONSEARCH);
+	OnToolBarButton(evt);
+}
 
 void CamuleDlg::UpdateTrayIcon(int percent)
 {
 	// set trayicon-icon
-	if(!theApp->IsConnected()) {
+	if (!theApp->IsConnected()) {
 		m_wndTaskbarNotifier->SetTrayIcon(TRAY_ICON_DISCONNECTED, percent);
 	} else {
-		if(theApp->IsConnectedED2K() && theApp->serverconnect->IsLowID()) {
+		if (theApp->IsConnectedED2K() && theApp->serverconnect->IsLowID()) {
 			m_wndTaskbarNotifier->SetTrayIcon(TRAY_ICON_LOWID, percent);
 		} else {
 			m_wndTaskbarNotifier->SetTrayIcon(TRAY_ICON_HIGHID, percent);
@@ -446,120 +588,296 @@
 	}
 }
 
-
 void CamuleDlg::CreateSystray()
 {
-	wxCHECK_RET(m_wndTaskbarNotifier == NULL,
-		"Systray already created");
+	wxCHECK_RET(m_wndTaskbarNotifier == NULL, "Systray already created");
 
 	m_wndTaskbarNotifier = new CMuleTrayIcon();
 	// This will effectively show the Tray Icon.
 	UpdateTrayIcon(0);
 }
 
-
 void CamuleDlg::RemoveSystray()
 {
-	delete m_wndTaskbarNotifier;
+	// Deleted on the next idle rather than here. "Exit" on the tray menu is handled by the
+	// tray icon itself, and wxTaskBarIcon::PopupMenu() pushes the icon as its own window's
+	// event handler for the duration of the menu's nested event loop, popping it again only
+	// after the menu returns. Shutting down from that item therefore reaches here with the
+	// icon still pushed and its window procedure on the stack, so deleting it now destroys
+	// the window while the handler is attached -- which asserts in ~wxWindowBase(), and is
+	// undefined behaviour whether or not assertions are compiled in.
+	//
+	// ScheduleForDestruction() would be the obvious tool but takes a wxObject*, and under
+	// WITH_LIBAYATANA_APPINDICATOR CMuleTrayIcon has no base class at all. CallAfter() on the
+	// dialog works in both builds.
+	//
+	// Clearing the member first keeps this idempotent, and the recreate path is unaffected:
+	// each click is a separate event, so the pending deletion has run by the time
+	// CreateSystray() looks.
+	CMuleTrayIcon *icon = m_wndTaskbarNotifier;
 	m_wndTaskbarNotifier = NULL;
+	if (icon) {
+		CallAfter(icon { delete icon; });
+	}
+}
+
+void CamuleDlg::UpdateFreeSpaceLabels()
+{
+	// Only the panel actually on screen: nobody can read a label on a panel that is behind
+	// another one or in a window hidden to the tray, and the Downloads refresh walks the whole
+	// queue to decide whether to warn. The figures themselves are free to read, so this skips
+	// pointless work, not a block.
+	if (!IsVisibleToUser()) {
+		return;
+	}
+	if (IsDialogVisible(DT_TRANSFER_WND) && m_transferwnd && m_transferwnd->downloadlistctrl) {
+		m_transferwnd->downloadlistctrl->UpdateFreeSpace();
+	}
+	if (IsDialogVisible(DT_SHARED_WND) && m_sharedfileswnd && m_sharedfileswnd->sharedfilesctrl) {
+		m_sharedfileswnd->sharedfilesctrl->UpdateFreeSpace();
+		// The completed figure beside the total moves without the list
+		// changing, so it cannot wait for the next add or remove.
+		m_sharedfileswnd->sharedfilesctrl->UpdateTotalSize();
+	}
 }
 
+namespace
+{
+/**
+ * SetLabel() repaints even when the text is unchanged, and this runs once a second for
+ * the life of the session. Answers whether the layout has to be redone, so a caller
+ * touching two labels relayouts once.
+ */
+bool SetLabelIfChanged(wxStaticText *label, const wxString &text)
+{
+	if (!label || label->GetLabel() == text) {
+		return false;
+	}
+	label->SetLabel(text);
+	return true;
+}
 
-void CamuleDlg::OnToolBarButton(wxCommandEvent& ev)
+// Re-flow the strip a status label sits in, not its parent.
+//
+// These labels are children of a horizontal bar that shares its parent sizer with the main
+// content area, so laying the parent out re-flowed everything under it -- on the main
+// window that includes the search page and its results notebook -- to make room for a few
+// characters of text. On wxMSW that invalidation erases the notebook whenever no page
+// covers it. The containing sizer is the bar alone, which is the only thing that ever has
+// to move.
+void RelayoutLabelStrip(wxWindow *label)
 {
-	static int lastbutton = ID_BUTTONDOWNLOADS;
+	if (wxSizer *strip = label->GetContainingSizer()) {
+		strip->Layout();
+	} else {
+		label->GetParent()->Layout();
+	}
+}
 
-	// Kry - just if the GUI is ready for it
-	if ( m_is_safe_state ) {
+// Set a status label and re-flow its strip, both only when the text changed. The strip
+// scope is what fixes the flicker: these run on every stats update -- once per 500 ms EC
+// reply in the remote GUI -- and at that rate the text usually has changed, so the guard
+// alone would rarely spare the work.
+bool UpdateStatusLabel(wxStaticText *label, const wxString &text)
+{
+	if (!SetLabelIfChanged(label, text)) {
+		return false;
+	}
+	RelayoutLabelStrip(label);
+	return true;
+}
+} // namespace
 
-		// Rehide the handler if needed
-		if ( lastbutton == ID_BUTTONSEARCH && !thePrefs::GetFED2KLH() ) {
-			if (ev.GetId() != ID_BUTTONSEARCH) {
-				ShowED2KLinksHandler( false );
-			} else {
-				// Toogle ED2K handler.
-				ToogleED2KLinksHandler();
-			}
-		}
+void CamuleDlg::SetFreeSpaceLabel(
+	wxStaticText *label, sint64 freeSpace, bool warn, wxStaticText *separatorLabel)
+{
+	if (!label) {
+		return;
+	}
 
-		if ( lastbutton != ev.GetId() ) {
-			switch ( ev.GetId() ) {
-				case ID_BUTTONNETWORKS:
-					SetActiveDialog(DT_NETWORKS_WND, m_serverwnd);
-					// Set serverlist splitter position
-					CastChild( "SrvSplitterWnd", wxSplitterWindow )->SetSashPosition(m_srv_split_pos, true);
-					break;
-
-				case ID_BUTTONSEARCH:
-					// The search dialog should always display the handler
-					if ( !thePrefs::GetFED2KLH() )
-						ShowED2KLinksHandler( true );
-
-					SetActiveDialog(DT_SEARCH_WND, m_searchwnd);
-					break;
-
-				case ID_BUTTONDOWNLOADS:
-					SetActiveDialog(DT_TRANSFER_WND, m_transferwnd);
-					// Prepare the dialog, sets the splitter-position
-					m_transferwnd->Prepare();
-					break;
-
-				case ID_BUTTONSHARED:
-					SetActiveDialog(DT_SHARED_WND, m_sharedfileswnd);
-					break;
-
-				case ID_BUTTONMESSAGES:
-					m_BlinkMessages = false;
-					SetActiveDialog(DT_CHAT_WND, m_chatwnd);
-					break;
-
-				case ID_BUTTONSTATISTICS:
-					SetActiveDialog(DT_STATS_WND, m_statisticswnd);
-					break;
-
-				// This shouldn't happen, but just in case
-				default:
-					AddLogLineC("Unknown button triggered CamuleApp::OnToolBarButton()." );
-					break;
-			}
+	// Nothing to say rather than something wrong: the figure is missing when the directory
+	// could not be queried at all -- it does not exist, or its mount (commonly a NAS) is
+	// unreachable. "0 bytes" would read as a full disk.
+	if (freeSpace == FREE_SPACE_UNKNOWN) {
+		// The separator exists only to join this figure to the field before it, so it goes when
+		// the figure does -- otherwise the queue size is left trailing a bare "|". Hidden rather
+		// than emptied: its padding is sizer border, which an empty label would still reserve.
+		bool relayout = SetLabelIfChanged(label, wxEmptyString);
+		if (separatorLabel && separatorLabel->IsShown()) {
+			separatorLabel->Show(false);
+			relayout = true;
 		}
+		if (relayout) {
+			RelayoutLabelStrip(label);
+		}
+		return;
+	}
 
-		m_wndToolbar->ToggleTool(lastbutton, lastbutton == ev.GetId() );
-		lastbutton = ev.GetId();
+	const wxColour colour = warn ? *wxRED : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+	if (label->GetForegroundColour() != colour) {
+		label->SetForegroundColour(colour);
+		label->Refresh();
 	}
-}
 
+	// The separator sits in its own label and is never recoloured: a wxStaticText colours all
+	// or nothing, so a separator sharing this label turned red along with the figure whenever
+	// the warning fired. It is layout, not language, so it stays out of the catalog -- and the
+	// gaps around it are sizer border.
+	bool relayout = SetLabelIfChanged(separatorLabel, "|");
+	if (separatorLabel && !separatorLabel->IsShown()) {
+		separatorLabel->Show(true);
+		relayout = true;
+	}
+	relayout =
+		SetLabelIfChanged(label, CFormat(_("Free space: %s")) % CastItoXBytes(freeSpace)) || relayout;
+	if (relayout) {
+		RelayoutLabelStrip(label);
+	}
+}
 
-void CamuleDlg::OnAboutButton(wxCommandEvent& WXUNUSED(ev))
+void CamuleDlg::RestoreMainWindow()
 {
-	wxString msg = " ";
+#ifdef __WXMAC__
+	// Restore the regular Dock icon before the window comes back. It has to happen first:
+	// activating a Dock-less (accessory) application gives no visible focus change, so the
+	// window would return behind whatever the user is looking at.
+	mac_set_accessory_mode(false);
+#endif
+	// Restoring is a decision, not something to infer from events: this is the one place that
+	// knows the user asked for the window back, so the logical flag is cleared here rather
+	// than left to OnShow/OnMinimize.
+	//
+	// Those events do not arrive on the path that matters. On Windows, a window that is hidden
+	// *and* iconized -- what minimize-to-tray leaves behind -- gets neither wxEVT_SHOW nor
+	// wxEVT_ICONIZE from the sequence below: Iconize(false) restores and shows it, so the
+	// Show(true) after it sees an already-shown window and never reaches ShowWindow(). The
+	// flag then stays set for the rest of the session and IsVisibleToUser() never becomes true
+	// again, which stops the free-space refresh and keeps the tray toggle stuck on "restore".
+	// Restoring a window that was only hidden does fire wxEVT_SHOW, which is why this looked
+	// intermittent.
+	m_iconized_logical = false;
+
 #ifdef CLIENT_GUI
-	msg << _("aMule remote control ") << VERSION;
-#else
-	msg << "aMule " << VERSION;
+	// Same reasoning one step further: a reconnect that has been retrying quietly behind a
+	// tray-hidden window now has a window to explain itself in. OnMainWindowRestored() is
+	// otherwise reached only from OnShow() and OnMinimize(), i.e. from the two events that do
+	// not arrive on this path -- so on Windows the dialog never appeared for a user who came
+	// back mid-outage. Cheap to call unconditionally: it returns immediately unless a
+	// reconnect is running without a dialog.
+	theApp->OnMainWindowRestored();
 #endif
-	msg << " ";
-#ifdef GITDATE
-	msg << _("Snapshot:") << "\n " << GITDATE;
+
+	// Clear the iconized bit on every platform -- the window might be hidden (Show(false) via
+	// HideOnClose / minimize-to-tray) or just iconized to the OS Dock/taskbar; in either case
+	// the user wants a normal restored frame. Without this, Show(true) on a still-iconized
+	// window would leave it as a taskbar entry without un-minimizing. Iconize(false) is
+	// idempotent, so do not gate on IsIconized(): wxGTK can report a stale value
+	// mid-transition.
+	Iconize(false);
+	Show(true);
+	Raise();
+}
+
+void CamuleDlg::HideToTray()
+{
+#ifdef __WXMAC__
+	// Drop NSApp's activation policy to Accessory before hiding -- that removes the Dock icon,
+	// and any in-flight miniaturize-to-Dock target, so hiding does not leave a Dock thumbnail
+	// behind. The tray icon stays as the only recovery surface; RestoreMainWindow() restores
+	// both.
+	mac_set_accessory_mode(true);
 #endif
-	msg << "\n\n" << _("'All-Platform' p2p client based on eMule \n\n") <<
-		_("Website: https://amule-org.github.io \n") <<
-		_("Forum: https://github.com/amule-org/amule/discussions \n") <<
-		_("Documentation: https://amule-org.github.io/docs \n") <<
-		_("Issues: https://github.com/amule-org/amule/issues \n\n") <<
-		_("Copyright (c) 2003-2026 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-2011 Petar Maymounkov ( petar@maymounkov.org )\n") <<
-		_("https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf\n");
+	Show(false);
+}
+
+void CamuleDlg::OnToolBarButton(wxCommandEvent &ev)
+{
+	static int lastbutton = ID_BUTTONDOWNLOADS;
 
+	// Kry - just if the GUI is ready for it
 	if (m_is_safe_state) {
-		wxMessageBox(msg, _("Message"), wxOK | wxICON_INFORMATION, this);
+
+		// Leaving the search page hides the handler again, since without GetFED2KLH() it belongs
+		// to that page only. Re-clicking the search button while already on the page used to
+		// toggle the handler instead -- a 2005 shortcut that no other toolbar button has, that
+		// nothing advertises, and that did nothing at all once "show in every window" was
+		// enabled.
+		if (lastbutton == ID_BUTTONSEARCH && !thePrefs::GetFED2KLH() &&
+			ev.GetId() != ID_BUTTONSEARCH) {
+			ShowED2KLinksHandler(false);
+		}
+
+		if (lastbutton != ev.GetId()) {
+			switch (ev.GetId()) {
+			case ID_BUTTONNETWORKS:
+				SetActiveDialog(DT_NETWORKS_WND, m_serverwnd);
+				// Set serverlist splitter position
+				CastChild("SrvSplitterWnd", wxSplitterWindow)
+					->SetSashPosition(m_srv_split_pos, true);
+				break;
+
+			case ID_BUTTONSEARCH:
+				// The search dialog should always display the handler
+				if (!thePrefs::GetFED2KLH())
+					ShowED2KLinksHandler(true);
+
+				SetActiveDialog(DT_SEARCH_WND, m_searchwnd);
+				break;
+
+			case ID_BUTTONDOWNLOADS:
+				SetActiveDialog(DT_TRANSFER_WND, m_transferwnd);
+				// Prepare the dialog, sets the splitter-position
+				m_transferwnd->Prepare();
+				break;
+
+			case ID_BUTTONSHARED:
+				SetActiveDialog(DT_SHARED_WND, m_sharedfileswnd);
+				break;
+
+			case ID_BUTTONMESSAGES:
+				m_BlinkMessages = false;
+				SetActiveDialog(DT_CHAT_WND, m_chatwnd);
+				break;
+
+			case ID_BUTTONCLIENTS:
+				SetActiveDialog(DT_CLIENTS_WND, m_clientswnd);
+				break;
+
+			case ID_BUTTONSTATISTICS:
+				SetActiveDialog(DT_STATS_WND, m_statisticswnd);
+				break;
+
+			// This shouldn't happen, but just in case
+			default:
+				AddDebugLogLineC(logStandard,
+					"Unknown button triggered CamuleApp::OnToolBarButton().");
+				break;
+			}
+		}
+
+		// A physical click auto-toggles the clicked wxITEM_CHECK tool, so historically this only
+		// had to untoggle the *previous* one. An accelerator or menu event does not click
+		// anything, so the new tab's tool never lit up that way -- leaving no toolbar button
+		// active until the next mouse click. Toggle both ends explicitly.
+		if (lastbutton != ev.GetId()) {
+			m_wndToolbar->ToggleTool(lastbutton, false);
+		}
+		m_wndToolbar->ToggleTool(ev.GetId(), true);
+		lastbutton = ev.GetId();
 	}
 }
 
+void CamuleDlg::OnAboutButton(wxCommandEvent &WXUNUSED(ev))
+{
+	// The version + credits text, plus a live "Check for updates" control
+	// backed by the shared CVersionCheck, now live in CAboutDlg.
+	if (m_is_safe_state) {
+		CAboutDlg dlg(this);
+		dlg.ShowModal();
+	}
+}
 
-void CamuleDlg::OnPrefButton(wxCommandEvent& WXUNUSED(ev))
+void CamuleDlg::OnPrefButton(wxCommandEvent &WXUNUSED(ev))
 {
 	if (m_is_safe_state) {
 		if (m_prefsDialog == NULL) {
@@ -567,13 +885,17 @@
 		}
 
 		m_prefsDialog->TransferToWindow();
+		// The dialog is built once and reused, so the shared-folders editor would otherwise keep
+		// the roots it captured the first time this was opened -- stale as soon as anything else
+		// changes them, a remote GUI over EC for one. Re-seed it per session; it declines while
+		// the user has edits pending so this can never discard them.
+		m_prefsDialog->PrepareSharedDirsForSession();
 		m_prefsDialog->Show(true);
 		m_prefsDialog->Raise();
 	}
 }
 
-
-void CamuleDlg::OnImportButton(wxCommandEvent& WXUNUSED(ev))
+void CamuleDlg::OnImportButton(wxCommandEvent &WXUNUSED(ev))
 {
 #ifndef CLIENT_GUI
 	if (m_is_safe_state) {
@@ -582,39 +904,150 @@
 #endif
 }
 
+// Always compiled (independent of ENABLE_VERSION_CHECK) so the shared MuleNotify handler
+// in GuiEvents.cpp links in an OS-package build with the check compiled out; it is simply
+// never invoked there.
+void CamuleDlg::ShowVersionAvailable(const wxString &latest)
+{
+	if (!m_is_safe_state || latest.IsEmpty() || m_versionPopupShown) {
+		return;
+	}
+
+	// Version-based opt-out: last_version_notified holds the exact version the user ticked
+	// "Don't ask again" for. We skip only that version, so a newer release (e.g. muting 3.1,
+	// then 3.2 appears) re-triggers the popup. The file is written only on opt-out, not on
+	// every show, so an outdated user who dismisses without opting out is reminded again next
+	// run.
+	const wxString stampPath = thePrefs::GetConfigDir() + wxT("last_version_notified");
+	if (wxFileExists(stampPath)) {
+		wxTextFile stamp(stampPath);
+		if (stamp.Open()) {
+			const wxString mutedVersion = stamp.GetLineCount() ? stamp.GetLine(0) : wxString();
+			stamp.Close();
+			if (mutedVersion == latest) {
+				return; // user opted out of this specific version
+			}
+		}
+	}
+
+	// Show at most once per session, so the daily periodic re-check does not re-pop within the
+	// same run (and covers the case where startup found us up to date but a release appeared
+	// later).
+	m_versionPopupShown = true;
+
+	// Custom dialog so it carries the aMule icon (as in the About box) instead of the generic
+	// information icon, alongside the per-version "Don't ask again" opt-out.
+	wxDialog dlg(this, wxID_ANY, _("New version available"));
+
+	wxStaticText *msg = new wxStaticText(&dlg,
+		wxID_ANY,
+		CFormat(_("A new version of aMule (%s) is available.\n\n"
+			  "You are running %s.\n\n"
+			  "Would you like to open the download page?")) %
+			latest % VERSION);
+	wxCheckBox *dontAsk = new wxCheckBox(&dlg, wxID_ANY, _("Don't ask again"));
+
+	wxBoxSizer *topRow = new wxBoxSizer(wxHORIZONTAL);
+	// A bundle at a stated size, like the About dialog, so it renders at the display's scale.
+	const wxBitmapBundle logoBmp =
+		wxArtProvider::GetBitmapBundle(wxT("amule:amule"), wxART_MESSAGE_BOX, wxSize(42, 42));
+	if (logoBmp.IsOk()) {
+		topRow->Add(
+			new wxStaticBitmap(&dlg, wxID_ANY, logoBmp), wxSizerFlags().Top().Border(wxALL, 12));
+	}
+	topRow->Add(msg, wxSizerFlags(1).CenterVertical().Border(wxALL, 12));
+
+	// Bottom row: the opt-out checkbox on the left, the Yes/No buttons on the
+	// right (a stretch spacer pushes them apart).
+	wxBoxSizer *bottomRow = new wxBoxSizer(wxHORIZONTAL);
+	bottomRow->Add(dontAsk, wxSizerFlags().CenterVertical());
+	bottomRow->AddStretchSpacer();
+	bottomRow->Add(dlg.CreateButtonSizer(wxYES | wxNO), wxSizerFlags().CenterVertical());
+
+	wxBoxSizer *top = new wxBoxSizer(wxVERTICAL);
+	top->Add(topRow, wxSizerFlags(1).Expand());
+	top->Add(bottomRow, wxSizerFlags().Expand().Border(wxALL, 10));
+
+	// wxDialog auto-closes on OK/Cancel but not Yes/No; map them so ShowModal
+	// returns wxID_YES / wxID_NO (Enter = Yes, Esc = No).
+	dlg.SetAffirmativeId(wxID_YES);
+	dlg.SetEscapeId(wxID_NO);
+
+	dlg.SetSizerAndFit(top);
+	dlg.Centre();
+	const int answer = dlg.ShowModal();
+
+	if (dontAsk->IsChecked()) {
+		// Persist the opt-out for this version only.
+		wxTextFile stamp(stampPath);
+		if (wxFileExists(stampPath) ? stamp.Open() : stamp.Create()) {
+			stamp.Clear();
+			stamp.AddLine(latest);
+			stamp.Write();
+			stamp.Close();
+		}
+	}
+
+	if (answer == wxID_YES) {
+		wxLaunchDefaultBrowser(wxT("https://github.com/amule-org/amule/releases/latest"));
+	}
+}
+
+#if defined(ENABLE_VERSION_CHECK) && defined(CLIENT_GUI)
+void CamuleDlg::StartupVersionCheck()
+{
+	if (!thePrefs::GetCheckNewVersion()) {
+		return;
+	}
+	if (!m_startupVersionCheck) {
+		m_startupVersionCheck = new CVersionCheck();
+		Bind(wxEVT_VERSION_CHECK_DONE, &CamuleDlg::OnStartupVersionCheckDone, this);
+	}
+	m_lastGuiVersionCheck = time(nullptr);
+	m_startupVersionCheck->Start(this, wxID_ANY);
+}
+
+void CamuleDlg::OnStartupVersionCheckDone(wxCommandEvent &evt)
+{
+	if (evt.GetInt() != CVersionCheck::Outdated || !m_startupVersionCheck) {
+		return;
+	}
+	ShowVersionAvailable(m_startupVersionCheck->LatestVersion());
+}
+#endif // ENABLE_VERSION_CHECK && CLIENT_GUI
 
 CamuleDlg::~CamuleDlg()
 {
 	theApp->amuledlg = NULL;
 
-#ifdef ENABLE_IP2COUNTRY
-	delete m_IP2Country;
+#if defined(ENABLE_VERSION_CHECK) && defined(CLIENT_GUI)
+	delete m_startupVersionCheck;
+	m_startupVersionCheck = NULL;
 #endif
 
 	AddLogLineN(_("aMule dialog destroyed"));
 }
 
-
-void CamuleDlg::OnBnConnect(wxCommandEvent& WXUNUSED(evt))
+void CamuleDlg::OnBnConnect(wxCommandEvent &WXUNUSED(evt))
 {
 
 	bool disconnect = (theApp->IsConnectedED2K() || theApp->serverconnect->IsConnecting())
-						#ifdef CLIENT_GUI
-						|| theApp->IsConnectedKad()		// there's no Kad running state atm
-						#else
-						|| (Kademlia::CKademlia::IsRunning())
-						#endif
-						;
+#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
+			// disconnect if currently connected
 			if (theApp->serverconnect->IsConnecting()) {
 				theApp->serverconnect->StopConnectionTry();
 			} else {
 				theApp->serverconnect->Disconnect();
 			}
 		} else {
-			//connect if not currently connected
+			// connect if not currently connected
 			AddLogLineC(_("Connecting"));
 			theApp->serverconnect->ConnectToAnyServer();
 		}
@@ -624,122 +1057,129 @@
 
 	// Connect Kad also
 	if (thePrefs::GetNetworkKademlia()) {
-		if( disconnect ) {
+		if (disconnect) {
 			theApp->StopKad();
 		} else {
 			theApp->StartKad();
 		}
 	} else {
-		#ifndef CLIENT_GUI
-			wxASSERT(!Kademlia::CKademlia::IsRunning());
-		#endif
+#ifndef CLIENT_GUI
+		wxASSERT(!Kademlia::CKademlia::IsRunning());
+#endif
 	}
 
 	ShowConnectionState();
 }
 
-
 void CamuleDlg::ResetLog(int id)
 {
-	wxTextCtrl* ct = CastByID(id, m_serverwnd, wxTextCtrl);
+	CMuleLogCtrl *ct = CastByID(id, m_serverwnd, CMuleLogCtrl);
 	wxCHECK_RET(ct, "Resetting unknown log");
 
-	ct->Clear();
+	ct->ClearLog();
 
 	if (id == ID_LOGVIEW) {
 		// Also clear the log line
-		wxStaticText* text = CastChild("infoLabel", wxStaticText);
-		text->SetLabel("");
-		text->GetParent()->Layout();
+		wxStaticText *text = CastChild("infoLabel", wxStaticText);
+		UpdateStatusLabel(text, wxEmptyString);
 	}
 }
 
+void CamuleDlg::AddLogLine(const wxString &line)
+{
+	// The "aMule Log" tab: the daemon/core log (over EC in amulegui, or this
+	// process's own log in the monolithic build).
+	AddLogLineToView(line, ID_LOGVIEW);
+}
 
-void CamuleDlg::AddLogLine(const wxString& line)
+void CamuleDlg::AddGuiLogLine(const wxString &line)
+{
+#ifdef CLIENT_GUI
+	// amulegui: the GUI client's own messages go to the separate "aMuleGUI Log"
+	// tab, keeping "aMule Log" for the daemon log.
+	AddLogLineToView(line, ID_GUILOGVIEW);
+#else
+	// Monolithic: there is a single log tab.
+	AddLogLine(line);
+#endif
+}
+
+void CamuleDlg::AddLogLineToView(const wxString &line, int viewId)
 {
 	bool addtostatusbar = line0 == '!';
 	wxString bufferline = line.Mid(1);
 
-	// Add the message to the log-view
-	wxTextCtrl* ct = CastByID( ID_LOGVIEW, m_serverwnd, wxTextCtrl );
-	if ( ct ) {
-		// 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);
-		style.SetFontSize(8);
-		ct->SetDefaultStyle(style);
-		ct->AppendText(bufferline);
-		ct->ShowPosition( ct->GetLastPosition() - 1 );
+	// Add the message to the log-view. CMuleLogCtrl (Scintilla) renders only the visible
+	// lines, so a large first-sync backlog no longer reflows per line or mispaints the tail
+	// the way the old wxTE_RICH2 control did (issues #445, #547). Critical lines are shown
+	// bold.
+	CMuleLogCtrl *ct = CastByID(viewId, m_serverwnd, CMuleLogCtrl);
+	if (ct) {
+		ct->AppendLogLine(bufferline, addtostatusbar);
 	}
 
-
 	// Set the status-bar if the event warrents it
-	if ( addtostatusbar ) {
+	if (addtostatusbar) {
 		// Escape "&"s, which would otherwise not show up
-		bufferline.Replace( "&", "&&" );
-		wxStaticText* text = CastChild( "infoLabel", wxStaticText );
+		bufferline.Replace("&", "&&");
+		wxStaticText *text = CastChild("infoLabel", wxStaticText);
+		text->SetToolTip(bufferline);
 		// Only show the first line if multiple lines
-		text->SetLabel( bufferline.BeforeFirst( '\n' ) );
-		text->SetToolTip( bufferline );
-		text->GetParent()->Layout();
+		UpdateStatusLabel(text, bufferline.BeforeFirst('\n'));
 	}
+}
 
+void CamuleDlg::BeginLogBatch()
+{
+	// A stats poll can carry a large first-sync backlog; bracket the burst so the log view is
+	// written and tail-scrolled once for the whole batch rather than per line (see
+	// CMuleLogCtrl::BeginBatch/EndBatch).
+	CMuleLogCtrl *ct = CastByID(ID_LOGVIEW, m_serverwnd, CMuleLogCtrl);
+	if (ct) {
+		ct->BeginBatch();
+	}
 }
 
+void CamuleDlg::EndLogBatch()
+{
+	CMuleLogCtrl *ct = CastByID(ID_LOGVIEW, m_serverwnd, CMuleLogCtrl);
+	if (ct) {
+		ct->EndBatch();
+	}
+}
 
-void CamuleDlg::AddServerMessageLine(wxString& message)
+void CamuleDlg::AddServerMessageLine(wxString &message)
 {
-	wxTextCtrl* cv= CastByID( ID_SERVERINFO, m_serverwnd, wxTextCtrl );
-	if(cv) {
+	CMuleLogCtrl *cv = CastByID(ID_SERVERINFO, m_serverwnd, CMuleLogCtrl);
+	if (cv) {
 		if (message.Length() > 500) {
-			cv->AppendText(message.Left(500) + "\n");
+			cv->AppendLogLine(message.Left(500) + "\n");
 		} else {
-			cv->AppendText(message + "\n");
+			cv->AppendLogLine(message + "\n");
 		}
-		cv->ShowPosition(cv->GetLastPosition()-1);
 	}
 }
 
-
-void CamuleDlg::ShowConnectionState(bool skinChanged)
+void CamuleDlg::ShowConnectionState()
 {
-	static wxImageList status_arrows(16,16,true,0);
-	if (!status_arrows.GetImageCount()) {
-		// Generate the image list (This is only done once)
-		for (int t = 0; t < 7; ++t) {
-			status_arrows.Add(connImages(t));
-		}
-	}
-
-	// Wipe the Server Info text ctrl on any transition that leaves it
-	// showing messages from a server we're no longer talking to:
-	//   1) connected -> disconnected
-	//   2) connected to A -> connected to B (server switch)
-	// The data side (amuled's server_msg, shared with the monolithic
-	// build) is wiped in the matching block inside
-	// CamuleApp::ShowConnectionState; here we only ResetLog the text
-	// ctrl. We deliberately don't touch the amulegui side's
-	// CServerInfoHandlerRem::m_seenSoFar snapshot: if we cleared it
-	// locally and amuled's cleanup hadn't landed yet, the next poll
-	// would replay the stale buffer through the "fullLog starts with
-	// empty seenSoFar" path. Leaving the snapshot alone lets
-	// HandlePacket's existing StartsWith-vs-else logic handle the
-	// transition naturally -- once amuled's server_msg shortens
-	// after its own clear, the prefix mismatches and the else branch
-	// resets the local view properly.
+	// Wipe the Server Info text ctrl on any transition that leaves it showing messages from a
+	// server we are no longer talking to: connected -> disconnected, or connected to A ->
+	// connected to B.
+	//
+	// The data side (amuled's server_msg) is wiped in the matching block inside
+	// CamuleApp::ShowConnectionState; here we only ResetLog the text ctrl. The amulegui side's
+	// CServerInfoHandlerRem::m_seenSoFar snapshot is deliberately left alone: clearing it
+	// locally while amuled's cleanup had not landed yet would make the next poll replay the
+	// stale buffer through the "fullLog starts with empty seenSoFar" path. Leaving it lets
+	// HandlePacket's StartsWith-vs-else logic handle the transition naturally.
 	static bool s_wasConnectedED2K = false;
-	static CServer* s_lastConnectedServer = NULL;
+	static CServer *s_lastConnectedServer = NULL;
 	bool nowConnectedED2K = theApp->IsConnectedED2K();
-	CServer* nowConnectedServer = nowConnectedED2K
-		? theApp->serverconnect->GetCurrentServer() : NULL;
+	CServer *nowConnectedServer = nowConnectedED2K ? theApp->serverconnect->GetCurrentServer() : NULL;
 
-	if (s_wasConnectedED2K
-		&& (!nowConnectedED2K
-			|| (nowConnectedServer && s_lastConnectedServer
-				&& nowConnectedServer != s_lastConnectedServer))) {
+	if (s_wasConnectedED2K &&
+		(!nowConnectedED2K || (nowConnectedServer && s_lastConnectedServer &&
+					      nowConnectedServer != s_lastConnectedServer))) {
 		ResetLog(ID_SERVERINFO);
 	}
 	s_wasConnectedED2K = nowConnectedED2K;
@@ -751,24 +1191,34 @@
 
 	m_serverwnd->UpdateED2KInfo();
 	m_serverwnd->UpdateKadInfo();
+	m_serverwnd->UpdateED2KConnectButton();
+	m_kademliawnd->UpdateConnectButton();
 
-
-	////////////////////////////////////////////////////////////
 	// Determine the status of the networks
-	//
-	enum ED2KState { ED2KOff = 0, ED2KLowID = 1, ED2KConnecting = 2, ED2KHighID = 3, ED2KUndef = -1 };
-	enum EKadState { EKadOff = 4, EKadFW = 5, EKadConnecting = 5, EKadOK = 6, EKadUndef = -1 };
+	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;
+	EKadState kadState = EKadOff;
 
-	////////////////////////////////////////////////////////////
-	// Update the label on the status-bar and determine
-	// the states of the two networks.
-	//
+	// Update the label on the status bar and determine the states of the two networks.
 	wxString msgED2K;
 	if (theApp->IsConnectedED2K()) {
-		CServer* server = theApp->serverconnect->GetCurrentServer();
+		CServer *server = theApp->serverconnect->GetCurrentServer();
 		if (server) {
 			msgED2K = CFormat("eD2k: %s") % server->GetListName();
 		}
@@ -805,8 +1255,10 @@
 		msgKad = _("Kad: Off");
 	}
 
-	wxStaticText* connLabel = CastChild( "connLabel", wxStaticText );
-	{ wxCHECK_RET(connLabel, "'connLabel' widget not found"); }
+	wxStaticText *connLabel = CastChild("connLabel", wxStaticText);
+	{
+		wxCHECK_RET(connLabel, "'connLabel' widget not found");
+	}
 
 	wxString labelMsg;
 	if (msgED2K.Length() && msgKad.Length()) {
@@ -815,120 +1267,177 @@
 		labelMsg = msgED2K + msgKad;
 	}
 
-	connLabel->SetLabel(labelMsg);
-	connLabel->GetParent()->Layout();
-
-
-	////////////////////////////////////////////////////////////
-	// Update the connect/disconnect/cancel button.
-	//
-	enum EConnState {
-		ECS_Unknown,
-		ECS_Connected,
-		ECS_Connecting,
-		ECS_Disconnected
-	};
-
-	static EConnState s_oldState = ECS_Unknown;
-	EConnState currentState = ECS_Disconnected;
-
-	if (theApp->serverconnect->IsConnecting() ||
-			(theApp->IsKadRunning() && !theApp->IsConnectedKad())) {
-		currentState = ECS_Connecting;
-	} else if (theApp->IsConnected()) {
-		currentState = ECS_Connected;
-	} else {
-		currentState = ECS_Disconnected;
-	}
-
-	if ( (true == skinChanged) || (currentState != s_oldState) ) {
-		wxWindowUpdateLocker freezer(m_wndToolbar);
+	UpdateStatusLabel(connLabel, labelMsg);
 
-		wxToolBarToolBase* toolbarTool = m_wndToolbar->FindById(ID_BUTTONCONNECT);
-
-		int bitmapIdx = 0;
-		switch (currentState) {
-			case ECS_Connecting:
-				toolbarTool->SetLabel(_("Cancel"));
-				toolbarTool->SetShortHelp(_("Stop the current connection attempts"));
-				bitmapIdx = 2;
-				break;
-
-			case ECS_Connected:
-				toolbarTool->SetLabel(_("Disconnect"));
-				toolbarTool->SetShortHelp(_("Disconnect from the currently connected networks"));
-				bitmapIdx = 1;
-				break;
-
-			default:
-				toolbarTool->SetLabel(_("Connect"));
-				toolbarTool->SetShortHelp(_("Connect to the currently enabled networks"));
-				bitmapIdx = 0;
-		}
-
-		// wxToolBarToolBase::SetNormalBitmap only updates the C++ tool
-		// data; on wxMSW the native control keeps showing the previous
-		// bitmap from its cached image list until the next full
-		// Realize(). The toolbar-level SetToolNormalBitmap() pushes the
-		// new bitmap into the native image list immediately, so the
-		// connect-state transition paints atomically with the new
-		// bitmap on the next redraw — without forcing a re-layout that
-		// would disrupt a vertical toolbar's orientation measurement.
-		// Same pattern as SetMessagesTool() just below. wxCocoa keeps
-		// the tool path because SetToolNormalBitmap isn't fully wired
-		// on the OS X NSToolbar backend. (#800)
-#ifdef __WXCOCOA__
-		toolbarTool->SetNormalBitmap(m_tblist.GetBitmap(bitmapIdx));
-#else
-		m_wndToolbar->SetToolNormalBitmap(ID_BUTTONCONNECT, m_tblist.GetBitmap(bitmapIdx));
-#endif
-
-		m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady());
-
-		s_oldState = currentState;
-	}
-
-
-	////////////////////////////////////////////////////////////
-	// Update the globe-icon in the lower-right corner.
-	// (only if connection state has changed)
-	//
+	// Update the globe icon in the lower-right corner, only if the connection state 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( "connImage", wxStaticBitmap );
+		wxStaticBitmap *connBitmap = CastChild("connImage", wxStaticBitmap);
 		wxCHECK_RET(connBitmap, "'connImage' widget not found");
 
-		wxBitmap statusIcon = connBitmap->GetBitmap();
+		// Overlay art ids, indexed by the ED2KState / EKadState enums
+		// above (the Kad table is offset by EKadOff).
+		static const char *const ed2kArt = { "amule:status_conn_ed2k_off",
+			"amule:status_conn_ed2k_low",
+			"amule:status_conn_ed2k_connecting",
+			"amule:status_conn_ed2k_high" };
+		static const char *const kadArt = { "amule:status_conn_kad_off",
+			"amule:status_conn_kad_firewalled",
+			"amule:status_conn_kad_ok" };
+
+		// Compose the globe from the base art plus one overlay arrow per network.
+		// GetBitmapFor rasterizes each bundle at this window's DPI scale, so the SVG art
+		// stays crisp on hi-DPI displays.
+		const wxBitmap baseIcon =
+			wxArtProvider::GetBitmapBundle("amule:status_conn_base").GetBitmapFor(connBitmap);
 		// Sanity check - otherwise there's a crash here if aMule runs out of resources
-		if (statusIcon.GetRefData() == NULL) {
+		if (!baseIcon.IsOk()) {
 			return;
 		}
 
-		wxMemoryDC bitmapDC(statusIcon);
+		// GetBitmapFor() hands back the art-provider-cached bundle's own (copy-on-write)
+		// bitmap, and a wxMemoryDC draws into that shared pixel buffer without unsharing it.
+		// Compositing the overlays straight onto it would stamp the arrows into the cached
+		// base, so they would accumulate on every later state change. Draw into a private deep
+		// copy instead; the overlays are fetched the same way, so they share baseIcon's scale
+		// factor.
+		wxBitmap statusIcon(baseIcon.ConvertToImage(), -1, baseIcon.GetScaleFactor());
+
+		{
+			wxMemoryDC bitmapDC(statusIcon);
+
+			bitmapDC.DrawBitmap(wxArtProvider::GetBitmapBundle(kadArtkadState - EKadOff)
+						    .GetBitmapFor(connBitmap),
+				0,
+				0,
+				true);
+			bitmapDC.DrawBitmap(
+				wxArtProvider::GetBitmapBundle(ed2kArted2kState).GetBitmapFor(connBitmap),
+				0,
+				0,
+				true);
+		}
 
-		status_arrows.Draw(kadState, bitmapDC, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT);
-		status_arrows.Draw(ed2kState, bitmapDC, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT);
+		// GetBitmapFor() returns an *unscaled* bitmap (scale factor 1.0) whose pixel size
+		// already matches the window DPI. Setting it on the static bitmap as-is renders the
+		// globe DPI-scale times larger than the sibling status icons, which are bundle-backed
+		// and size themselves in logical units. Stamp the window's scale factor on the
+		// composite instead.
+		statusIcon.SetScaleFactor(connBitmap->GetDPIScaleFactor());
 
 		connBitmap->SetBitmap(statusIcon);
 	}
 }
 
+void CamuleDlg::ShowCoreVersion(
+	const wxString &coreVersion, const wxString &endpoint, const wxString &encryption, bool encrypted)
+{
+	wxStaticText *label = CastChild("coreVersionLabel", wxStaticText);
+	wxStaticBitmap *icon = CastChild("coreVersionImage", wxStaticBitmap);
+	wxWindow *sep = CastChild("coreVersionSep", wxWindow);
+	// Absent in monolithic aMule, which never builds them.
+	if (!label || !icon || !sep) {
+		return;
+	}
+
+	// Empty before the handshake, and from a core too old to send
+	// EC_TAG_SERVER_VERSION. Hide rather than show a blank.
+	if (coreVersion.IsEmpty()) {
+		label->Show(false);
+		icon->Show(false);
+		sep->Show(false);
+		return;
+	}
+
+	m_coreVersion = coreVersion;
+	m_coreEndpoint = endpoint;
+	m_coreEncryption = encryption;
+	m_coreEncrypted = encrypted;
+
+	// Exact inequality: a dev build reports "GIT rev. <describe>", which has no
+	// ordering against a release number, so "newer" is unanswerable.
+	const bool differs = (coreVersion != GetShortMuleVersion());
+
+	label->Show(true);
+	icon->Show(true);
+	sep->Show(true);
+
+	// "%s: %s" is punctuation, so only the word needs translating.
+	UpdateStatusLabel(label, CFormat(wxT("%s: %s")) % _("Core") % coreVersion);
+
+	// Same idiom as SetFreeSpaceLabel above: recolour only on a real change.
+	const wxColour colour = differs ? *wxRED : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+	if (label->GetForegroundColour() != colour) {
+		label->SetForegroundColour(colour);
+		label->Refresh();
+	}
+}
+
+void CamuleDlg::OnCoreVersionClicked(wxMouseEvent &WXUNUSED(event))
+{
+	if (m_coreVersion.IsEmpty()) {
+		return;
+	}
+	const wxString ownVersion = GetShortMuleVersion();
+	const wxString endpoint = m_coreEndpoint;
+	const wxString encryption = m_coreEncryption;
+	const bool encrypted = m_coreEncrypted;
+	const wxString coreVersion = m_coreVersion;
+
+	const bool differs = (coreVersion != ownVersion);
+
+	// Our own client_red / client_green rather than stock wx art: on macOS the stock glyphs
+	// are template symbols that take the system label colour, so they render grey and ignore
+	// a tint, and tinting is not portable either -- GTK's error icon is already a red disc
+	// with a white cross, which a blanket recolour would flatten. These two are a matched
+	// pair from one set.
+	ShowInfoGridDialog(
+		this,
+		_("Version"),
+		differs ? _("The core and aMuleGUI are different versions.")
+			: _("The core and aMuleGUI are the same version."),
+		&(wxWindow *dlg, wxSizer *grid) {
+			const struct
+			{
+				wxString label;
+				wxString value;
+				wxColour colour;
+			} rows = {
+				{ _("Address"), endpoint, wxNullColour },
+				// Red only when off: an encrypted link is the expected
+				// state and needs no colour to say so.
+				{ _("Encryption"), encryption, encrypted ? wxNullColour : *wxRED },
+				{ _("Core"), coreVersion, wxNullColour },
+				{ _("aMuleGUI"), ownVersion, wxNullColour },
+			};
+			for (const auto &row : rows) {
+				grid->Add(new wxStaticText(dlg, wxID_ANY, row.label),
+					0,
+					wxALIGN_CENTRE_VERTICAL);
+				wxStaticText *value = new wxStaticText(dlg, wxID_ANY, row.value);
+				if (row.colour.IsOk()) {
+					value->SetForegroundColour(row.colour);
+				}
+				grid->Add(value, 0, wxALIGN_CENTRE_VERTICAL);
+			}
+		},
+		differs ? wxString("amule:client_red") : wxString("amule:client_green"),
+		differs ? *wxRED : wxNullColour);
+}
 
-void CamuleDlg::ShowUserCount(const wxString& info)
+void CamuleDlg::ShowUserCount(const wxString &info)
 {
-	wxStaticText* label = CastChild( "userLabel", wxStaticText );
+	wxStaticText *label = CastChild("userLabel", wxStaticText);
 
 	// Update Kad tab
 	m_serverwnd->UpdateKadInfo();
 
-	label->SetLabel(info);
-	label->GetParent()->Layout();
+	UpdateStatusLabel(label, info);
 }
 
-
 void CamuleDlg::ShowTransferRate()
 {
 	float kBpsUp = theStats::GetUploadRate() / 1024.0;
@@ -938,27 +1447,35 @@
 	bool showMBpsUp = (MBpsUp >= 1);
 	bool showMBpsDown = (MBpsDown >= 1);
 	wxString buffer;
-	if( thePrefs::ShowOverhead() )
-	{
-		buffer = CFormat(_("Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)"))
-				 % (showMBpsUp ? MBpsUp : kBpsUp) % (showMBpsUp ? _(" MB/s") : ((kBpsUp > 0) ? _(" kB/s") : "")) % (theStats::GetUpOverheadRate() / 1024.0)
-				 % (showMBpsDown ? MBpsDown : kBpsDown) % (showMBpsDown ? _(" MB/s") : ((kBpsDown > 0) ? _(" kB/s") : "")) % (theStats::GetDownOverheadRate() / 1024.0);
+	if (thePrefs::ShowOverhead()) {
+		buffer = CFormat(_("Up: %.1f%s (%.1f) | Down: %.1f%s (%.1f)")) %
+			 (showMBpsUp ? MBpsUp : kBpsUp) %
+			 (showMBpsUp ? _(" MiB/s") : ((kBpsUp > 0) ? _(" KiB/s") : "")) %
+			 (theStats::GetUpOverheadRate() / 1024.0) % (showMBpsDown ? MBpsDown : kBpsDown) %
+			 (showMBpsDown ? _(" MiB/s") : ((kBpsDown > 0) ? _(" KiB/s") : "")) %
+			 (theStats::GetDownOverheadRate() / 1024.0);
 	} else {
-		buffer = CFormat(_("Up: %.1f%s | Down: %.1f%s"))
-				 % (showMBpsUp ? MBpsUp : kBpsUp) % (showMBpsUp ? _(" MB/s") : ((kBpsUp > 0) ? _(" kB/s") : ""))
-				 % (showMBpsDown ? MBpsDown : kBpsDown) % (showMBpsDown ? _(" MB/s") : ((kBpsDown > 0) ? _(" kB/s") : ""));
+		buffer = CFormat(_("Up: %.1f%s | Down: %.1f%s")) % (showMBpsUp ? MBpsUp : kBpsUp) %
+			 (showMBpsUp ? _(" MiB/s") : ((kBpsUp > 0) ? _(" KiB/s") : "")) %
+			 (showMBpsDown ? MBpsDown : kBpsDown) %
+			 (showMBpsDown ? _(" MiB/s") : ((kBpsDown > 0) ? _(" KiB/s") : ""));
 	}
 	buffer.Truncate(50); // Max size 50
 
-	wxStaticText* label = CastChild( "speedLabel", wxStaticText );
-	label->SetLabel(buffer);
-	label->GetParent()->Layout();
+	// The status labels all share one strip, and updating any of them used to
+	// re-flow the whole content area behind it -- see UpdateStatusLabel().
+	wxStaticText *label = CastChild("speedLabel", wxStaticText);
+	UpdateStatusLabel(label, buffer);
 
 	// Show upload/download speed in title
 	if (thePrefs::GetShowRatesOnTitle()) {
-		wxString UpDownSpeed = CFormat("Up: %.1f%s | Down: %.1f%s")
-						   % (showMBpsUp ? MBpsUp : kBpsUp) % (showMBpsUp ? _(" MB/s") : ((kBpsUp > 0) ? _(" kB/s") : ""))
-						   % (showMBpsDown ? MBpsDown : kBpsDown) % (showMBpsDown ? _(" MB/s") : ((kBpsDown > 0) ? _(" kB/s") : ""));
+		// Same msgid as the speed label above, so this reuses that translation
+		// rather than asking translators for the string twice.
+		wxString UpDownSpeed = CFormat(_("Up: %.1f%s | Down: %.1f%s")) %
+				       (showMBpsUp ? MBpsUp : kBpsUp) %
+				       (showMBpsUp ? _(" MiB/s") : ((kBpsUp > 0) ? _(" KiB/s") : "")) %
+				       (showMBpsDown ? MBpsDown : kBpsDown) %
+				       (showMBpsDown ? _(" MiB/s") : ((kBpsDown > 0) ? _(" KiB/s") : ""));
 		if (thePrefs::GetShowRatesOnTitle() == 1) {
 			SetTitle(theApp->m_FrameTitle + " -- " + UpDownSpeed);
 		} else {
@@ -969,11 +1486,11 @@
 	wxASSERT((m_wndTaskbarNotifier != NULL) == thePrefs::UseTrayIcon());
 	if (m_wndTaskbarNotifier) {
 		// set trayicon-icon
-		int percentDown = (int)ceil((kBpsDown*100) / thePrefs::GetMaxGraphDownloadRate());
-		UpdateTrayIcon( ( percentDown > 100 ) ? 100 : percentDown);
+		int percentDown = (int)ceil((kBpsDown * 100) / thePrefs::GetMaxGraphDownloadRate());
+		UpdateTrayIcon((percentDown > 100) ? 100 : percentDown);
 
 		wxString buffer2;
-		if ( theApp->IsConnected() ) {
+		if (theApp->IsConnected()) {
 			buffer2 = CFormat(_("aMule (%s | Connected)")) % buffer;
 		} else {
 			buffer2 = CFormat(_("aMule (%s | Disconnected)")) % buffer;
@@ -981,14 +1498,19 @@
 		m_wndTaskbarNotifier->SetTrayToolTip(buffer2);
 	}
 
-	wxStaticBitmap* bmp = CastChild( "transferImg", wxStaticBitmap );
-	bmp->SetBitmap(dlStatusImages((kBpsUp>0.01 ? 2 : 0) + (kBpsDown>0.01 ? 1 : 0)));
+	wxStaticBitmap *bmp = CastChild("transferImg", wxStaticBitmap);
+	static const char *const speedArt = { "amule:status_speed_idle",
+		"amule:status_speed_down",
+		"amule:status_speed_up",
+		"amule:status_speed_both" };
+	bmp->SetBitmap(wxArtProvider::GetBitmapBundle(
+		speedArt(kBpsUp > 0.01 ? 2 : 0) + (kBpsDown > 0.01 ? 1 : 0)));
 }
 
 void CamuleDlg::DlgShutDown()
 {
 	// Are we already shutting down or still on init?
-	if ( m_is_safe_state == false ) {
+	if (m_is_safe_state == false) {
 		return;
 	}
 
@@ -1003,19 +1525,16 @@
 	RemoveSystray();
 }
 
-void CamuleDlg::OnClose(wxCloseEvent& evt)
+void CamuleDlg::OnClose(wxCloseEvent &evt)
 {
-	// The tray icon is the only recovery surface for a window hidden
-	// via the close button on every platform: Linux/Windows use the
-	// NSStatusItem-equivalent to bring the window back, and on macOS
-	// the matching path drops the Dock icon (accessory mode) while
-	// hidden, so the Dock is no longer a fallback either.
+	// Gated on the tray icon because on Linux and Windows it is the only way back once the
+	// frame is hidden. Deliberately a plain Show(false) rather than HideToTray(): on macOS the
+	// Dock icon stays, which is what the close button is supposed to leave behind there, and
+	// the Dock-reopen handler brings the window back from it.
 	bool hideOnClose = thePrefs::HideOnClose() && thePrefs::UseTrayIcon();
-	// Quit menus (Cmd+Q, Dock right-click → Quit, tray-icon Exit) all
-	// either pass force=true to Close() (CanVeto()==false) or set the
-	// app's IsQuitting() flag from OnQueryEndSession. Either signal
-	// bypasses the hide-on-close branch so HideOnClose only governs
-	// the red close-button gesture itself.
+	// Quit menus (Cmd+Q, Dock right-click Quit, tray-icon Exit) all either pass force=true to
+	// Close() or set the app's IsQuitting() flag from OnQueryEndSession. Either signal bypasses
+	// the hide-on-close branch, so HideOnClose only governs the red close-button gesture.
 	if (hideOnClose && evt.CanVeto() && !theApp->IsQuitting()) {
 		Show(false);
 		evt.Veto();
@@ -1023,14 +1542,16 @@
 	}
 
 	// This will be here till the core close is != app close
-	if (evt.CanVeto() && thePrefs::IsConfirmExitEnabled() ) {
-		if (wxNO == wxMessageBox(wxString(CFormat(_("Do you really want to exit %s?")) % theApp->GetMuleAppName()),
-				wxString(_("Exit confirmation")), wxYES_NO | wxNO_DEFAULT, this)) {
+	if (evt.CanVeto() && thePrefs::IsConfirmExitEnabled()) {
+		if (wxNO == wxMessageBox(wxString(CFormat(_("Do you really want to exit %s?")) %
+						  theApp->GetMuleAppName()),
+				    wxString(_("Exit confirmation")),
+				    wxYES_NO | wxNO_DEFAULT,
+				    this)) {
 			evt.Veto();
-			// User canceled the quit. Clear the IsQuitting flag so a
-			// subsequent close-button click respects HideOnClose
-			// again (the flag was set by tray-Exit / Dock-Quit but
-			// the operation didn't go through).
+			// User cancelled the quit. Clear the IsQuitting flag so a subsequent close-button
+			// click respects HideOnClose again (the flag was set by tray-Exit / Dock-Quit but the
+			// operation did not go through).
 			theApp->ResetQuitting();
 			return;
 		}
@@ -1044,27 +1565,34 @@
 	theApp->ShutDown(evt);
 }
 
-
-void CamuleDlg::OnBnClickedFast(wxCommandEvent& WXUNUSED(evt))
+void CamuleDlg::OnBnClickedFast(wxCommandEvent &WXUNUSED(evt))
 {
-	wxTextCtrl* ctl = CastChild( "FastEd2kLinks", wxTextCtrl );
+	CMuleTextCtrl *ctl = CastChild("FastEd2kLinks", CMuleTextCtrl);
+
+	// Nothing typed yet -- only the placeholder hint is on screen.
+	if (ctl->IsShowingPlaceholder()) {
+		return;
+	}
 
+	// Split on real line breaks: on MSW, GetLineText() returns wrapped screen
+	// lines, which cuts a long link in two.
 	wxArrayString links;
-	for ( int i = 0; i < ctl->GetNumberOfLines(); i++ ) {
-		wxString strlink = ctl->GetLineText(i);
+	wxStringTokenizer lines(ctl->GetValue(), "\r\n", wxTOKEN_STRTOK);
+	while (lines.HasMoreTokens()) {
+		wxString strlink = lines.GetNextToken();
 		strlink.Trim(true);
 		strlink.Trim(false);
-		if ( !strlink.IsEmpty() ) {
+		if (!strlink.IsEmpty()) {
 			links.Add(strlink);
 		}
 	}
 
 	ctl->SetValue("");
+	ctl->RefreshPlaceholder();
 
 	theApp->downloadqueue->AddLinks(links, m_transferwnd->downloadlistctrl->GetCategory());
 }
 
-
 // Formerly known as LoadRazorPrefs()
 bool CamuleDlg::LoadGUIPrefs(bool override_pos, bool override_size)
 {
@@ -1101,7 +1629,7 @@
 
 	if (!override_pos) {
 		// If x1 and y1 != -1 Redefine location
-		if(x1 != -1 && y1 != -1) {
+		if (x1 != -1 && y1 != -1) {
 			wxRect display = wxGetClientDisplayRect();
 			if (x1 <= display.GetRightTop().x && y1 <= display.GetRightBottom().y) {
 				Move(x1, y1);
@@ -1118,7 +1646,6 @@
 	return true;
 }
 
-
 bool CamuleDlg::SaveGUIPrefs()
 {
 	/* Razor 1a - Modif by MikaelB
@@ -1133,10 +1660,9 @@
 	// The section where to save in in file
 	wxString section = "/Razor_Preferences/";
 
-	// Prefer the live frame geometry; fall back to the last cached
-	// non-iconized snapshot when the user exits from a minimized
-	// window (iconized GetPosition() returns sentinel values on
-	// Windows that aren't safe to round-trip).
+	// Prefer the live frame geometry; fall back to the last cached non-iconized snapshot when
+	// the user exits from a minimized window (iconized GetPosition() returns sentinel values
+	// on Windows that are not safe to round-trip).
 	wxPoint pos;
 	wxSize size;
 	bool maximized;
@@ -1153,15 +1679,15 @@
 		haveGeom = true;
 	}
 	if (haveGeom) {
-		config->Write(section+"MAIN_X_POS", (long) pos.x);
-		config->Write(section+"MAIN_Y_POS", (long) pos.y);
-		config->Write(section+"MAIN_X_SIZE", (long) size.x);
-		config->Write(section+"MAIN_Y_SIZE", (long) size.y);
-		config->Write(section+"Maximized", (long) (maximized ? 1 : 0));
+		config->Write(section + "MAIN_X_POS", (long)pos.x);
+		config->Write(section + "MAIN_Y_POS", (long)pos.y);
+		config->Write(section + "MAIN_X_SIZE", (long)size.x);
+		config->Write(section + "MAIN_Y_SIZE", (long)size.y);
+		config->Write(section + "Maximized", (long)(maximized ? 1 : 0));
 	}
 
 	// Saving sash position of splitter in server window
-	config->Write(section+"SRV_SPLITTER_POS", (long) m_srv_split_pos);
+	config->Write(section + "SRV_SPLITTER_POS", (long)m_srv_split_pos);
 
 	config->Flush(true);
 
@@ -1170,25 +1696,25 @@
 	return true;
 }
 
-
-void CamuleDlg::OnShow(wxShowEvent& evt)
+void CamuleDlg::OnShow(wxShowEvent &evt)
 {
-	// When the window becomes visible the iconized state is
-	// effectively cleared — Iconize(false) on a non-iconized
-	// window doesn't fire wxIconizeEvent on every platform, so
-	// IsTrayLogicallyIconized() would otherwise stay sticky from
-	// a previous minimize-to-tray cycle.
+	// When the window becomes visible the iconized state is effectively cleared --
+	// Iconize(false) on a non-iconized window does not fire wxIconizeEvent on every platform,
+	// so IsTrayLogicallyIconized() would otherwise stay sticky from a previous
+	// minimize-to-tray cycle.
 	if (evt.IsShown()) {
 		m_iconized_logical = false;
+#ifdef CLIENT_GUI
+		// Restored from the tray (tray click/menu, or an un-hide after HideOnClose), which
+		// never fires wxIconizeEvent -- see OnMinimize for the other half of issue #806.
+		theApp->OnMainWindowRestored();
+#endif
 	}
 #ifdef WITH_LIBAYATANA_APPINDICATOR
-	// SNI tray menus are static between rebuilds, so the
-	// "Show aMule"/"Hide aMule" entry's label can drift out of sync
-	// when the window is hidden via paths that don't go through
-	// CMuleTrayIcon::DoShowHide (close-button HideOnClose,
-	// minimize-to-tray, programmatic Show(false) via the tray
-	// menu's hide-and-restore). Re-tracking visibility here keeps
-	// the menu honest across every entry point.
+	// SNI tray menus are static between rebuilds, so the "Show aMule"/"Hide aMule" entry's
+	// label can drift out of sync when the window is hidden via paths that do not go through
+	// CMuleTrayIcon::DoShowHide (close-button HideOnClose, minimize-to-tray, a programmatic
+	// Show(false)). Re-tracking visibility here keeps the menu honest across every entry point.
 	if (m_wndTaskbarNotifier) {
 		m_wndTaskbarNotifier->RebuildMenu();
 	}
@@ -1196,29 +1722,34 @@
 	evt.Skip();
 }
 
-void CamuleDlg::OnMinimize(wxIconizeEvent& evt)
+void CamuleDlg::OnMinimize(wxIconizeEvent &evt)
 {
-	// Snapshot the iconize state straight from the event — wxFrame's
-	// IsIconized() is unreliable on wxGTK during the minimize-button
-	// transition, so consumers that need to know if the window is
-	// iconized (tray menu label, DoShowHide branch decision) read
-	// IsTrayLogicallyIconized() instead.
+	// Snapshot the iconize state straight from the event -- wxFrame's IsIconized() is
+	// unreliable on wxGTK during the minimize-button transition, so consumers that need to know
+	// read IsTrayLogicallyIconized() instead.
 	m_iconized_logical = evt.IsIconized();
 
+#ifdef CLIENT_GUI
+	// Coming back from the taskbar/Dock with a reconnect running quietly behind the window:
+	// now that there is a frozen window to explain, put the dialog up. OnShow covers the same
+	// for the tray paths, which hide the frame without ever iconizing it.
+	if (IsVisibleToUser()) {
+		theApp->OnMainWindowRestored();
+	}
+#endif
+
 #ifdef WITH_LIBAYATANA_APPINDICATOR
-	// SNI tray menu is built once and held; iconize doesn't fire
-	// EVT_SHOW so OnShow's RebuildMenu() doesn't run. Push the
-	// refresh from here so the "Show aMule"/"Hide aMule" label
-	// follows iconize transitions too.
+	// SNI tray menu is built once and held; iconize does not fire EVT_SHOW so OnShow's
+	// RebuildMenu() does not run. Push the refresh from here so the "Show aMule"/"Hide aMule"
+	// label follows iconize transitions too.
 	if (m_wndTaskbarNotifier) {
 		m_wndTaskbarNotifier->RebuildMenu();
 	}
 #endif
-// Evil Hack: check if the mouse is inside the window. Linux only —
-// the heuristic filters spurious iconize events from window-manager
-// state changes (workspace switches, etc.). On macOS it can return
-// NULL during the yellow-button minimize transition itself, which
-// would silently skip the hide-to-tray branch entirely.
+// Evil Hack: check if the mouse is inside the window. Linux only -- the heuristic filters
+// spurious iconize events from window-manager state changes (workspace switches, etc.). On
+// macOS it can return NULL during the yellow-button minimize transition itself, which would
+// silently skip the hide-to-tray branch entirely.
 #if !defined(__WINDOWS__) && !defined(__WXMAC__)
 	if (wxFindWindowAtPoint(wxGetMousePosition()))
 #endif
@@ -1228,36 +1759,24 @@
 		} else {
 			if (m_wndTaskbarNotifier && thePrefs::DoMinToTray()) {
 				if (evt.IsIconized()) {
-#ifdef __WXMAC__
-					// Drop NSApp's activation policy to Accessory
-					// before hiding — that removes the Dock icon
-					// (and any in-flight miniaturize-to-Dock target),
-					// so the yellow button doesn't leave a Dock
-					// thumbnail. Tray icon stays as the only
-					// recovery surface; Show(true) from the tray's
-					// DoShowHide restores both the Dock icon and the
-					// window.
-					mac_set_accessory_mode(true);
-#endif
-					Show(false);
+					HideToTray();
 				} else {
-					Show(true);
+					RestoreMainWindow();
 				}
-			}
-			else {
+			} else {
 				evt.Skip();
 			}
 		}
 	}
 }
 
-void CamuleDlg::OnGUITimer(wxTimerEvent& WXUNUSED(evt))
+void CamuleDlg::OnGUITimer(wxTimerEvent &WXUNUSED(evt))
 {
 	// Former TimerProc section
 
-	static uint32	msPrev1, msPrev5;
+	static uint32 msPrev1, msPrev5;
 
-	uint32			msCur = theStats::GetUptimeMillis();
+	uint32 msCur = theStats::GetUptimeMillis();
 
 	// can this actually happen under wxwin ?
 	if (!SafeState()) {
@@ -1267,7 +1786,7 @@
 #ifndef CLIENT_GUI
 	static uint32 msPrevGraph, msPrevStats;
 	int msGraphUpdate = thePrefs::GetTrafficOMeterInterval() * 1000;
-	if ((msGraphUpdate > 0)  && ((msCur / msGraphUpdate) > (msPrevGraph / msGraphUpdate))) {
+	if ((msGraphUpdate > 0) && ((msCur / msGraphUpdate) > (msPrevGraph / msGraphUpdate))) {
 		// trying to get the graph shifts evenly spaced after a change in the update period
 		msPrevGraph = msCur;
 
@@ -1278,7 +1797,7 @@
 	}
 
 	int sStatsUpdate = thePrefs::GetStatsInterval();
-	if ((sStatsUpdate > 0) && ((int)(msCur - msPrevStats) > sStatsUpdate*1000)) {
+	if ((sStatsUpdate > 0) && ((int)(msCur - msPrevStats) > sStatsUpdate * 1000)) {
 		if (m_statisticswnd->IsShownOnScreen()) {
 			msPrevStats = msCur;
 			m_statisticswnd->ShowStatistics();
@@ -1286,63 +1805,90 @@
 	}
 #endif
 
-	if (msCur-msPrev5 > 5000) {  // every 5 seconds
+	if (msCur - msPrev5 > 5000) { // every 5 seconds
 		msPrev5 = msCur;
 		ShowTransferRate();
-		if (thePrefs::ShowCatTabInfos() && theApp->amuledlg->m_activewnd == theApp->amuledlg->m_transferwnd) {
+		if (thePrefs::ShowCatTabInfos() &&
+			theApp->amuledlg->m_activewnd == theApp->amuledlg->m_transferwnd) {
 			m_transferwnd->UpdateCatTabTitles();
 		}
-		if (thePrefs::AutoSortDownload()) {
-			m_transferwnd->downloadlistctrl->SortList();
-			m_transferwnd->clientlistctrl->SortList();
-			m_sharedfileswnd->peerslistctrl->SortList();
-		}
 		m_kademliawnd->UpdateNodeCount(CStatistics::GetKadNodes());
+
+#if defined(ENABLE_VERSION_CHECK) && defined(CLIENT_GUI)
+		// amulegui periodic re-check (daily). amulegui is not a CamuleApp, so it has no core
+		// engine and re-runs its own CVersionCheck. Fires immediately the first time the
+		// preference is enabled at runtime. StartupVersionCheck() is a no-op while a check is
+		// already in flight.
+		if (thePrefs::GetCheckNewVersion() &&
+			(m_lastGuiVersionCheck == 0 ||
+				time(nullptr) - m_lastGuiVersionCheck >= 24 * 60 * 60)) {
+			StartupVersionCheck();
+		}
+#endif
 	}
 
-	if (msCur-msPrev1 > 1000) {  // every second
+	if (msCur - msPrev1 > 1000) { // every second
 		msPrev1 = msCur;
-		if (m_CurrentBlinkBitmap == 12) {
-			m_CurrentBlinkBitmap = 7;
+
+		// The clients page shows live speeds and transfer totals, so it wants a per-second
+		// refresh -- and no more. This timer fires at 10 Hz, so outside this block the whole
+		// sweep ran ten times a second: every peer the core knows re-read, both panes rebuilt and
+		// the known-client store reconciled, for a display that changes once a second at most.
+		if (m_clientswnd && m_activewnd == static_cast<wxWindow *>(m_clientswnd)) {
+			m_clientswnd->UpdateAll();
+		}
+		if (m_CurrentBlinkBitmap == Toolbar_Blink) {
+			m_CurrentBlinkBitmap = Toolbar_Messages;
 			SetMessagesTool();
 		} else {
 			if (m_BlinkMessages) {
-				m_CurrentBlinkBitmap = 12;
+				m_CurrentBlinkBitmap = Toolbar_Blink;
 				SetMessagesTool();
 			}
 		}
+#ifndef CLIENT_GUI
+		// Animate the search progress bar for the visible tab while the search window is up.
+		// This is the periodic tick the cosmetic Kad ramp needs -- a Kad search has no
+		// per-result notify to drive it -- and refreshes a running ed2k percent too. amulegui
+		// drives the same bar from EC instead.
+		if (m_searchwnd && m_searchwnd->IsShown()) {
+			m_searchwnd->RefreshVisibleTabProgress();
+		}
+#endif
 
+		// Free space moves on its own as the part files grow, so it is
+		// refreshed on the clock rather than when a list changes.
+		UpdateFreeSpaceLabels();
 	}
 }
 
-
 void CamuleDlg::SetMessagesTool()
 {
 	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
+	m_wndToolbar->SetToolNormalBitmap(ID_BUTTONMESSAGES, m_tblistm_CurrentBlinkBitmap);
 }
 
-void CamuleDlg::LaunchUrl( const wxString& url )
+void CamuleDlg::LaunchUrl(const wxString &url)
 {
 	wxString cmd;
 
 	cmd = thePrefs::GetBrowser();
 	wxString tmp = url;
 	// Pipes cause problems, so escape them
-	tmp.Replace( "|", "%7C" );
+	tmp.Replace("|", "%7C");
 
-	if ( !cmd.IsEmpty() ) {
+	if (!cmd.IsEmpty()) {
 		if (!cmd.Replace("%s", tmp)) {
 			// No %s found, just append the url
 			cmd += " " + tmp;
 		}
 
+		// Inside an AppImage, launch the browser with a sanitized environment so it loads
+		// system libraries rather than the bundled ones (#334); a no-op copy elsewhere.
 		CTerminationProcess *p = new CTerminationProcess(cmd);
-		if (wxExecute(cmd, wxEXEC_ASYNC, p)) {
+		wxExecuteEnv execEnv;
+		const bool sanitized = AppImageEnv::GetSanitizedExecEnv(execEnv);
+		if (wxExecute(cmd, wxEXEC_ASYNC, p, sanitized ? &execEnv : nullptr)) {
 			AddLogLineN(_("Launch Command: ") + cmd);
 			return;
 		} else {
@@ -1357,7 +1903,6 @@
 	wxLogError("Unable to launch browser. Please set correct browser executable path in Preferences.");
 }
 
-
 bool CamuleDlg::Check_and_Init_Skin()
 {
 	bool ret = true;
@@ -1371,35 +1916,28 @@
 
 	wxStandardPathsBase &spb(wxStandardPaths::Get());
 #ifdef __WINDOWS__
-	// Windows portable layout: amule.exe lives in bin\ and installable
-	// data (skins, ...) in ..\share\amule\.  wx returns the exe directory
-	// for both GetPluginsDir() and GetDataDir() on Windows, so relocate
-	// to the FHS-style path the installer actually populates.  Has to
-	// match the Preferences enumeration above (Preferences.cpp::TransferToWindow)
-	// or the dropdown would offer a skin we can't load.  (#783)
+	// Windows portable layout: amule.exe lives in bin\ and installable data (skins, ...) in
+	// ..\share\amule\. wx returns the exe directory for both GetPluginsDir() and GetDataDir()
+	// on Windows, so relocate to the FHS-style path the installer actually populates. Has to
+	// match the Preferences enumeration, or the dropdown would offer a skin we cannot load.
 	wxString dataDir(JoinPaths(JoinPaths(spb.GetDataDir(), ".."), "share"));
 	dataDir = JoinPaths(dataDir, "amule");
 #elif defined(__WXMAC__)
-		wxString dataDir(spb.GetDataDir());
+	wxString dataDir(spb.GetDataDir());
 #else
 	wxString dataDir(spb.GetDataDir().BeforeLast('/') + "/amule");
 #endif
-	wxString systemDir(JoinPaths(dataDir,"skins") + wxFileName::GetPathSeparator());
-
+	wxString systemDir(JoinPaths(dataDir, "skins") + wxFileName::GetPathSeparator());
 
-	skinFileName.Replace("User:", userDir );
-	skinFileName.Replace("System:", systemDir );
+	skinFileName.Replace("User:", userDir);
+	skinFileName.Replace("System:", systemDir);
 
 	m_skinFileName.Assign(skinFileName);
 	if (!m_skinFileName.FileExists()) {
-		AddLogLineC(CFormat(
-			_("Skin directory '%s' does not exist")) %
-			skinFileName );
+		AddLogLineC(CFormat(_("Skin directory '%s' does not exist")) % skinFileName);
 		ret = false;
 	} else if (!m_skinFileName.IsFileReadable()) {
-		AddLogLineC(CFormat(
-			_("WARNING: Unable to open skin file '%s' for read")) %
-			skinFileName);
+		AddLogLineC(CFormat(_("WARNING: Unable to open skin file '%s' for read")) % skinFileName);
 		ret = false;
 	}
 
@@ -1408,7 +1946,7 @@
 	wxZipEntry *entry;
 
 	while ((entry = zip.GetNextEntry()) != NULL) {
-		wxZipEntry*& current = catentry->GetInternalName();
+		wxZipEntry *&current = catentry->GetInternalName();
 		delete current;
 		current = entry;
 	}
@@ -1416,11 +1954,7 @@
 	return ret;
 }
 
-
-void CamuleDlg::Add_Skin_Icon(
-	const wxString &iconName,
-	const wxBitmap &stdIcon,
-	bool useSkins)
+void CamuleDlg::Add_Skin_Icon(const wxString &iconName, const wxBitmap &stdIcon, bool useSkins)
 {
 	wxImage new_image;
 	if (useSkins) {
@@ -1428,30 +1962,67 @@
 		wxZipInputStream zip(in);
 
 		ZipCatalog::iterator it = cat.find(wxZipEntry::GetInternalName(iconName + ".png"));
-		if ( it != cat.end() ) {
+		if (it != cat.end()) {
 			zip.OpenEntry(*it->second);
-			if ( !new_image.LoadFile(zip,wxBITMAP_TYPE_PNG) ) {
-				AddLogLineN("Warning: Error loading icon for " +
-						iconName);
+			if (!new_image.LoadFile(zip, wxBITMAP_TYPE_PNG)) {
+				AddLogLineN(LOG_DIAGNOSTIC("Warning: Error loading icon for ") + iconName);
 				useSkins = false;
 			}
-		}else {
-				AddLogLineN("Warning: Can't load icon for " +
-						iconName);
-				useSkins = false;
+		} else {
+			AddLogLineN(LOG_DIAGNOSTIC("Warning: Can't load icon for ") + iconName);
+			useSkins = false;
 		}
-
 	}
 
 	wxBitmap bmp(useSkins ? new_image : stdIcon);
 	if (iconName.StartsWith("Client_")) {
 		m_imagelist.Add(bmp);
 	} else if (iconName.StartsWith("Toolbar_")) {
-		m_tblist.Add(bmp);
+		if (!useSkins) {
+			// The built-in toolbar art ships as an SVG twin through CamuleArtProvider
+			// ("amule:toolbar_<name>"), which wx rasterizes at whatever size/DPI the
+			// toolbar asks for. An active skin keeps full control: its PNG takes the
+			// raster path below instead.
+			//
+			// CCtypeAsciiScope pins LC_CTYPE to "C" so wxString::Lower() stays
+			// ASCII-correct when folding "Toolbar_Foo" to the art id: in a Turkic locale
+			// it would map 'I' to the dotless 'i'.
+			CCtypeAsciiScope asciiCtype;
+			wxBitmapBundle art = wxArtProvider::GetBitmapBundle(
+				CamuleArtProvider::MakeId(iconName.Lower()), wxART_TOOLBAR, wxSize(32, 32));
+			if (!art.IsOk()) {
+				// Every built-in toolbar icon ships embedded in icon_data.c, generated from
+				// the same src/icons/ sources CamuleArtProvider reads -- this can only fail
+				// with a broken build, not a reachable runtime condition. Fall back to a
+				// generic stock icon rather than shipping a bespoke raster twin of each
+				// toolbar asset for an error path that cannot happen.
+				AddLogLineN(LOG_DIAGNOSTIC("Warning: Could not load built-in icon for ") +
+					    iconName);
+				art = wxArtProvider::GetBitmapBundle(
+					wxART_MISSING_IMAGE, wxART_TOOLBAR, wxSize(32, 32));
+			}
+			m_tblist.push_back(art);
+			return;
+		}
+		// The toolbar art only exists at one (32x32) size. Store it as a wxBitmapBundle with a
+		// smooth 2x upscale so DPI-aware toolbars pick a correctly sized bitmap on hi-DPI
+		// screens instead of drawing the 1x art at a tiny physical size. The mask is turned into
+		// an alpha channel first, because high-quality scaling of a masked image smears the mask
+		// colour into the icon edges.
+		wxImage img = bmp.ConvertToImage();
+		if (img.IsOk()) {
+			if (!img.HasAlpha()) {
+				img.InitAlpha();
+			}
+			m_tblist.push_back(wxBitmapBundle::FromBitmaps(bmp,
+				wxBitmap(img.Scale(
+					img.GetWidth() * 2, img.GetHeight() * 2, wxIMAGE_QUALITY_HIGH))));
+		} else {
+			m_tblist.emplace_back(bmp);
+		}
 	}
 }
 
-
 void CamuleDlg::Apply_Clients_Skin()
 {
 	bool useSkins = Check_and_Init_Skin();
@@ -1461,54 +2032,116 @@
 
 	// Add the images to the image list
 	for (int i = 0; i < CLIENT_SKIN_SIZE; ++i) {
-		Add_Skin_Icon("Client_" + m_clientSkinNamesi,
-			clientImages(i), useSkins);
+		Add_Skin_Icon("Client_" + m_clientSkinNamesi, clientImages(i), useSkins);
 	}
 }
 
+namespace
+{
+// The macOS Navigate menu (see the __WXMAC__ branch of the ctor) renders its own
+// "\tAlt+N"-style accelerator spec using the platform's native glyph automatically -- Cocoa
+// substitutes Alt for the Option symbol when it draws a real NSMenuItem key equivalent.
+// Toolbar tooltips are plain text, though, so wx never touches them; spell out the
+// platform-correct suffix by hand to match what the menu right above it already shows
+// (amule-org/amule#642 follow-up).
+wxString TabAccelSuffix(const wxString &letter)
+{
+#ifdef __WXMAC__
+	// Built from the codepoint, not a raw literal, so it cannot be mangled by a narrow->wide
+	// conversion through a non-UTF-8 system encoding -- macOS reports GetSystemEncodingName()
+	// as Mac OS Roman, which is why #318 had to force UTF-8 under __WXOSX__ elsewhere.
+	return " (" + wxString(wxUniChar(0x2325)) + letter + ")"; // U+2325 OPTION KEY
+#else
+	return " (Alt+" + letter + ")";
+#endif
+}
+} // namespace
 
 void CamuleDlg::Apply_Toolbar_Skin(wxToolBar *wndToolbar)
 {
 	bool useSkins = Check_and_Init_Skin();
 
-
 	// Clear the toolbar image list
-	m_tblist.RemoveAll();
-
-	// Add the images to the image list
-	Add_Skin_Icon("Toolbar_Connect",    connButImg(0),      useSkins);
-	Add_Skin_Icon("Toolbar_Disconnect", connButImg(1),      useSkins);
-	Add_Skin_Icon("Toolbar_Connecting", connButImg(2),      useSkins);
-	Add_Skin_Icon("Toolbar_Network",    amuleDlgImages(20), useSkins);
-	Add_Skin_Icon("Toolbar_Transfers",  amuleDlgImages(21), useSkins);
-	Add_Skin_Icon("Toolbar_Search",     amuleDlgImages(22), useSkins);
-	Add_Skin_Icon("Toolbar_Shared",     amuleDlgImages(23), useSkins);
-	Add_Skin_Icon("Toolbar_Messages",   amuleDlgImages(24), useSkins);
-	Add_Skin_Icon("Toolbar_Stats",      amuleDlgImages(25), useSkins);
-	Add_Skin_Icon("Toolbar_Prefs",      amuleDlgImages(26), useSkins);
-	Add_Skin_Icon("Toolbar_Import",     amuleDlgImages(32), useSkins);
-	Add_Skin_Icon("Toolbar_About",      amuleDlgImages(29), useSkins);
-	Add_Skin_Icon("Toolbar_Blink",	 amuleDlgImages(33), useSkins);
+	m_tblist.clear();
+
+	// Add the images to the image list, in ToolbarSkinEnum order. wxNullBitmap: Add_Skin_Icon
+	// only falls back to its stdIcon argument when no skin is active AND the built-in
+	// CamuleArtProvider lookup failed -- see the comment there for why that combination cannot
+	// happen with a correct build, so there is no bespoke bitmap to pass.
+	Add_Skin_Icon("Toolbar_Network", wxNullBitmap, useSkins);
+	Add_Skin_Icon("Toolbar_Transfers", wxNullBitmap, useSkins);
+	Add_Skin_Icon("Toolbar_Search", wxNullBitmap, useSkins);
+	Add_Skin_Icon("Toolbar_Shared", wxNullBitmap, useSkins);
+	Add_Skin_Icon("Toolbar_Messages", wxNullBitmap, useSkins);
+	Add_Skin_Icon("Toolbar_Clients", wxNullBitmap, useSkins);
+	Add_Skin_Icon("Toolbar_Stats", wxNullBitmap, useSkins);
+	Add_Skin_Icon("Toolbar_Prefs", wxNullBitmap, useSkins);
+	Add_Skin_Icon("Toolbar_Import", wxNullBitmap, useSkins);
+	Add_Skin_Icon("Toolbar_About", wxNullBitmap, useSkins);
+	Add_Skin_Icon("Toolbar_Blink", wxNullBitmap, useSkins);
 
 	// Build aMule toolbar
 	wndToolbar->SetMargins(0, 0);
 
-	// Placeholder. Gets updated by ShowConnectionState
-	wndToolbar->AddTool(ID_BUTTONCONNECT, "...", 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_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->AddTool(ID_BUTTONNETWORKS,
+		_("Networks"),
+		m_tblistToolbar_Network,
+		wxNullBitmap,
+		wxITEM_CHECK,
+		_("Networks Window") + TabAccelSuffix("N"));
+	wndToolbar->AddTool(ID_BUTTONSEARCH,
+		_("Searches"),
+		m_tblistToolbar_Search,
+		wxNullBitmap,
+		wxITEM_CHECK,
+		_("Searches Window") + TabAccelSuffix("S"));
+	wndToolbar->AddTool(ID_BUTTONDOWNLOADS,
+		_("Downloads"),
+		m_tblistToolbar_Transfers,
+		wxNullBitmap,
+		wxITEM_CHECK,
+		_("Downloads Window") + TabAccelSuffix("T"));
+	wndToolbar->AddTool(ID_BUTTONSHARED,
+		_("Shared files"),
+		m_tblistToolbar_Shared,
+		wxNullBitmap,
+		wxITEM_CHECK,
+		_("Shared Files Window") + TabAccelSuffix("F"));
+	wndToolbar->AddTool(ID_BUTTONCLIENTS,
+		_("Clients"),
+		m_tblistToolbar_Clients,
+		wxNullBitmap,
+		wxITEM_CHECK,
+		_("Clients Window") + TabAccelSuffix("C"));
+	wndToolbar->AddTool(ID_BUTTONMESSAGES,
+		_("Messages"),
+		m_tblistToolbar_Messages,
+		wxNullBitmap,
+		wxITEM_CHECK,
+		_("Messages Window") + TabAccelSuffix("M"));
+	wndToolbar->AddTool(ID_BUTTONSTATISTICS,
+		_("Statistics"),
+		m_tblistToolbar_Stats,
+		wxNullBitmap,
+		wxITEM_CHECK,
+		_("Statistics Graph Window") + TabAccelSuffix("G"));
 	wndToolbar->AddSeparator();
-	wndToolbar->AddTool(ID_BUTTONNEWPREFERENCES, _("Preferences"), m_tblist.GetBitmap(9), wxNullBitmap, wxITEM_NORMAL, _("Preferences Settings Window"));
+	wndToolbar->AddTool(ID_BUTTONNEWPREFERENCES,
+		_("Preferences"),
+		m_tblistToolbar_Prefs,
+		wxNullBitmap,
+		wxITEM_NORMAL,
+		_("Preferences Settings Window") + TabAccelSuffix("P"));
 #ifndef CLIENT_GUI
-	wndToolbar->AddTool(ID_BUTTONIMPORT, _("Import"), m_tblist.GetBitmap(10), wxNullBitmap, wxITEM_NORMAL, _("The partfile importer tool"));
+	wndToolbar->AddTool(ID_BUTTONIMPORT,
+		_("Import"),
+		m_tblistToolbar_Import,
+		wxNullBitmap,
+		wxITEM_NORMAL,
+		_("The partfile importer tool"));
 #endif
-	wndToolbar->AddTool(ID_ABOUT, _("About"), m_tblist.GetBitmap(11), wxNullBitmap, wxITEM_NORMAL, _("About/Help"));
+	wndToolbar->AddTool(
+		ID_ABOUT, _("About"), m_tblistToolbar_About, wxNullBitmap, wxITEM_NORMAL, _("About/Help"));
 
 	wndToolbar->ToggleTool(ID_BUTTONDOWNLOADS, true);
 
@@ -1516,11 +2149,9 @@
 	// items don't get added immediately.
 	wndToolbar->Realize();
 
-	// Updates the "Connect" button, and so on.
-	ShowConnectionState(true);
+	ShowConnectionState();
 }
 
-
 void CamuleDlg::Create_Toolbar(bool orientation)
 {
 	Freeze();
@@ -1541,11 +2172,13 @@
 	}
 
 	if (!m_wndToolbar) {
-		m_wndToolbar = CreateToolBar((orientation ? wxTB_VERTICAL : wxTB_HORIZONTAL) |
-					      int(wxNO_BORDER) | wxTB_TEXT | wxTB_FLAT |
-					      wxCLIP_CHILDREN | wxTB_NODIVIDER);
+		m_wndToolbar =
+			CreateToolBar((orientation ? wxTB_VERTICAL : wxTB_HORIZONTAL) | int(wxNO_BORDER) |
+				      wxTB_TEXT | wxTB_FLAT | wxCLIP_CHILDREN | wxTB_NODIVIDER);
 
-		m_wndToolbar->SetToolBitmapSize(wxSize(32, 32));
+		// No SetToolBitmapSize() here: the tools are wxBitmapBundles, so the toolbar derives the
+		// bitmap size from the bundles' default (32 DIP) size and scales it with the monitor's
+		// DPI. Forcing a fixed size would pin the icons at 32 physical pixels again.
 	}
 
 	Apply_Toolbar_Skin(m_wndToolbar);
@@ -1553,17 +2186,14 @@
 	Thaw();
 
 #ifdef __WXMSW__
-	// wxMSW's native toolbar control measures itself once, at the
-	// moment AddTool / Realize is called inside Apply_Toolbar_Skin.
-	// When Create_Toolbar runs from the preferences-OK path (vertical
-	// orientation toggle), the frame is at its current settled size
-	// but the new toolbar's internal measurement races against the
-	// outer sizer's pending re-layout — the toolbar ends up rendered
-	// at the wrong width and doesn't resize on its own until something
-	// (e.g. a ShowConnectionState update from an incoming connection)
-	// forces a paint. Defer Realize + Layout to the next event loop
-	// iteration so the toolbar measures against the post-layout
-	// geometry. (#800)
+	// wxMSW's native toolbar control measures itself once, at the moment AddTool / Realize is
+	// called inside Apply_Toolbar_Skin. When Create_Toolbar runs from the preferences-OK path
+	// (vertical orientation toggle), the frame is at its current settled size but the new
+	// toolbar's internal measurement races against the outer sizer's pending re-layout -- the
+	// toolbar ends up rendered at the wrong width and does not resize on its own until
+	// something (e.g. a ShowConnectionState update from an incoming connection) forces a
+	// paint. Defer Realize + Layout to the next event loop iteration so the toolbar measures
+	// against the post-layout geometry. (#800)
 	CallAfter(this() {
 		if (m_wndToolbar) {
 			m_wndToolbar->Realize();
@@ -1575,13 +2205,11 @@
 #endif
 }
 
-
 void CamuleDlg::CacheLastShownGeometry()
 {
-	// Iconized frames report sentinel positions (e.g. -32000,-32000 on
-	// Windows) and meaningless sizes; only snapshot real geometry. The
-	// snapshot lets SaveGUIPrefs persist a usable layout even when the
-	// user quits straight from the taskbar without restoring first.
+	// Iconized frames report sentinel positions (e.g. -32000,-32000 on Windows) and
+	// meaningless sizes; only snapshot real geometry. The snapshot lets SaveGUIPrefs persist a
+	// usable layout even when the user quits straight from the taskbar without restoring.
 	if (IsIconized()) {
 		return;
 	}
@@ -1591,15 +2219,13 @@
 	m_lastShownValid = true;
 }
 
-
-void CamuleDlg::OnMainGUIMove(wxMoveEvent& evt)
+void CamuleDlg::OnMainGUIMove(wxMoveEvent &evt)
 {
 	CacheLastShownGeometry();
 	evt.Skip();
 }
 
-
-void CamuleDlg::OnMainGUISizeChange(wxSizeEvent& evt)
+void CamuleDlg::OnMainGUISizeChange(wxSizeEvent &evt)
 {
 	CacheLastShownGeometry();
 	wxFrame::OnSize(evt);
@@ -1607,16 +2233,14 @@
 		// Transfer window's splitter set again if it's hidden.
 		if (!m_transferwnd->clientlistctrl->GetShowing()) {
 			int height = m_transferwnd->clientlistctrl->GetSize().GetHeight();
-			wxSplitterWindow* splitter =
-				CastChild("splitterWnd", wxSplitterWindow);
+			wxSplitterWindow *splitter = CastChild("splitterWnd", wxSplitterWindow);
 			height += splitter->GetWindow1()->GetSize().GetHeight();
-			splitter->SetSashPosition( height );
+			splitter->SetSashPosition(height);
 		}
 	}
 }
 
-
-void CamuleDlg::OnKeyPressed(wxKeyEvent& event)
+void CamuleDlg::OnKeyPressed(wxKeyEvent &event)
 {
 	if (event.GetKeyCode() == WXK_F1) {
 		// Ctrl/Alt/Shift must not be pressed, to avoid
@@ -1630,12 +2254,32 @@
 	event.Skip();
 }
 
-
-void CamuleDlg::OnExit(wxCommandEvent& WXUNUSED(evt))
+void CamuleDlg::OnExit(wxCommandEvent &WXUNUSED(evt))
 {
 	Close(true);
 }
 
+PageType CamuleDlg::CaptureLogPage(wxNotebook *notebook, wxWindowID ctrlId)
+{
+	PageType result{ nullptr, wxString() };
+	// The control lives inside its notebook page (a direct child of the
+	// notebook); walk up from the control to that page.
+	wxWindow *win = notebook->FindWindow(ctrlId);
+	wxASSERT(win);
+	if (!win) {
+		return result;
+	}
+	while (win->GetParent() && win->GetParent() != notebook) {
+		win = win->GetParent();
+	}
+	result.page = win;
+	const int idx = notebook->FindPage(win);
+	if (idx != wxNOT_FOUND) {
+		result.name = notebook->GetPageText(idx);
+	}
+	return result;
+}
+
 void CamuleDlg::DoNetworkRearrange()
 {
 #if !defined(__WXOSX_COCOA__)
@@ -1644,78 +2288,77 @@
 	wxWindowUpdateLocker freezer(this);
 #endif
 
-	wxToolBarToolBase* toolbarTool = m_wndToolbar->FindById(ID_BUTTONNETWORKS);
+	wxToolBarToolBase *toolbarTool = m_wndToolbar->FindById(ID_BUTTONNETWORKS);
 
 	// set the log windows
-	wxNotebook* logs_notebook = CastChild( ID_SRVLOG_NOTEBOOK, wxNotebook);
-
-	while (logs_notebook->GetPageCount() > 1) {
-		logs_notebook->RemovePage(logs_notebook->GetPageCount() - 1);
+	wxNotebook *logs_notebook = CastChild(ID_SRVLOG_NOTEBOOK, wxNotebook);
+
+	// Detach the network-conditional tabs by identity (never by index -- the always-on tabs
+	// "aMule Log" and, in amulegui, "aMuleGUI Log" must be left in place), then re-add the ones
+	// whose network is enabled.
+	for (const PageType *p : { &m_logServerInfo, &m_logED2KInfo, &m_logKadInfo }) {
+		const int idx = logs_notebook->FindPage(p->page);
+		if (idx != wxNOT_FOUND) {
+			logs_notebook->RemovePage(idx);
+		}
 	}
 
 	if (thePrefs::GetNetworkED2K()) {
-		// "Server Info" sub-panel. Previously CLIENT_GUI-gated because
-		// amulegui had no way to populate ID_SERVERINFO from amuled;
-		// the EC_OP_GET_SERVERINFO / EC_OP_CLEAR_SERVERINFO polling
-		// in CamuleRemoteGuiApp now mirrors the server_msg buffer, so
-		// the tab is shown unconditionally as in the monolithic build.
-		logs_notebook->AddPage(m_logpages1.page, m_logpages1.name);
-		logs_notebook->AddPage(m_logpages2.page, m_logpages2.name);
+		// "Server Info" sub-panel. Previously CLIENT_GUI-gated because amulegui had no way to
+		// populate ID_SERVERINFO from amuled; the EC_OP_GET_SERVERINFO / EC_OP_CLEAR_SERVERINFO
+		// polling in CamuleRemoteGuiApp now mirrors the server_msg buffer, so the tab is shown
+		// unconditionally as in the monolithic build.
+		logs_notebook->AddPage(m_logServerInfo.page, m_logServerInfo.name);
+		logs_notebook->AddPage(m_logED2KInfo.page, m_logED2KInfo.name);
 	}
 
 	if (thePrefs::GetNetworkKademlia()) {
-		logs_notebook->AddPage(m_logpages3.page, m_logpages3.name);
+		logs_notebook->AddPage(m_logKadInfo.page, m_logKadInfo.name);
 	}
 
-	// Set the main window.
-	// If we have both networks active, activate a notebook to select between them.
-	// If only one is active, show the window directly without a surrounding one tab notebook.
+	// Set the main window. With both networks active, use a notebook to select between them;
+	// with only one, show that window directly instead of a one-tab notebook.
 
-	// States:
-	// 1: ED2K only
-	// 2: Kad only
-	// 3: both (in Notebook)
+	// States: 1 = ED2K only, 2 = Kad only, 3 = both (in Notebook)
 
-	static uint8 currentState = 3;		// on startup we have both enabled
+	static uint8 currentState = 3; // on startup we have both enabled
 	uint8 newState;
 	if (thePrefs::GetNetworkED2K() && thePrefs::GetNetworkKademlia()) {
 		newState = 3;
 		toolbarTool->SetLabel(_("Networks"));
-	}
-	else if (thePrefs::GetNetworkED2K()) {
+	} else if (thePrefs::GetNetworkED2K()) {
 		newState = 1;
 		toolbarTool->SetLabel(_("eD2k network"));
-	}
-	else {			// Kad only or no network
-		newState = 2;	// no network makes no sense anyway, so just show Kad there
+	} else {              // Kad only or no network
+		newState = 2; // no network makes no sense anyway, so just show Kad there
 		toolbarTool->SetLabel(thePrefs::GetNetworkKademlia() ? _("Kad network") : _("No network"));
 	}
 
 	if (newState != currentState) {
-		wxNotebook* networks_notebook = CastChild(ID_NETNOTEBOOK, wxNotebook);
+		wxNotebook *networks_notebook = CastChild(ID_NETNOTEBOOK, wxNotebook);
 		// First hide all windows
 		networks_notebook->Show(false);
 		m_networkpages0.page->Show(false);
 		m_networkpages1.page->Show(false);
 		m_networknotebooksizer->Clear();
 
-		wxWindow* replacement = NULL;
+		wxWindow *replacement = NULL;
 
 		// Move both pages into the notebook if they aren't already there.
-		if (currentState == 1) {	// ED2K
+		if (currentState == 1) { // ED2K
 			m_networkpages0.page->Reparent(networks_notebook);
 			networks_notebook->InsertPage(0, m_networkpages0.page, m_networkpages0.name);
-		} else if (currentState == 2) {	// Kad
+		} else if (currentState == 2) { // Kad
 			m_networkpages1.page->Reparent(networks_notebook);
 			networks_notebook->AddPage(m_networkpages1.page, m_networkpages1.name);
 		}
 
-		// Now both pages are in the notebook. If we want to show one of them outside, move it back out again.
-		// Windows that are part of a notebook can't be reparented.
+		// Now both pages are in the notebook. If we want to show one of them outside, move it back
+		// out again. Windows that are part of a notebook can't be reparented.
 		if (newState == 3) {
-			// Since we messed with the notebook, we now have to show both pages, one after the other.
-			// Otherwise GTK gets confused and shows the first tab only.
-			// (So much for "platform independent".)
+			// Since we messed with the notebook, both pages now have to be shown one after the
+			// other. Otherwise GTK gets confused and shows the first tab only. (So much for
+			// "platform independent".)
 			networks_notebook->SetSelection(1);
 			m_networkpages1.page->Show();
 			networks_notebook->SetSelection(0);
@@ -1731,17 +2374,18 @@
 
 		replacement->Reparent(m_networknotebooksizer->GetContainingWindow());
 		replacement->Show();
-		m_networknotebooksizer->Add(replacement, wxSizerFlags(1).Expand().CenterVertical().Border(wxTOP, 5));
+		m_networknotebooksizer->Add(
+			replacement, wxSizerFlags(1).Expand().CenterVertical().Border(wxTOP, 5));
 		m_networknotebooksizer->Layout();
 		currentState = newState;
 	}
 
 	// Tool bar
 
-	m_wndToolbar->EnableTool(ID_BUTTONNETWORKS, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()));
-	m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady());
+	m_wndToolbar->EnableTool(
+		ID_BUTTONNETWORKS, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()));
 
-	ShowConnectionState();	// status in the bottom right
+	ShowConnectionState(); // status in the bottom right
 	m_searchwnd->FixSearchTypes();
 }

amule-3.0.1.tar.gz/src/amuleDlg.h -> amule-3.1.0.tar.gz/src/amuleDlg.h Changed

@@ -26,20 +26,27 @@
 #ifndef AMULEDLG_H
 #define AMULEDLG_H
 
+#include "config.h" // for ENABLE_VERSION_CHECK (gates the startup version-check members)
 
 #include <wx/archive.h>
+#include <wx/bmpbndl.h>
 #include <wx/filename.h>
-#include <wx/frame.h>			// Needed for wxFrame
+#include <wx/frame.h> // Needed for wxFrame
 #include <wx/imaglist.h>
 #include <wx/timer.h>
 #include <wx/wfstream.h>
 #include <wx/zipstrm.h>
 
-#include "Types.h"			// Needed for uint32
+#include <vector>
+
+#include "Types.h" // Needed for uint32
 #include "StatisticsDlg.h"
 
 class wxTimerEvent;
 class wxTextCtrl;
+class wxNotebook;
+class wxStaticText;
+class CVersionCheck;
 
 class CIP2Country;
 class CTransferWnd;
@@ -50,25 +57,24 @@
 class CKadDlg;
 class PrefsUnifiedDlg;
 
-
 class CMuleTrayIcon;
 
-struct PageType {
-	wxWindow* page;
+struct PageType
+{
+	wxWindow *page;
 	wxString name;
 };
 
-#define MP_RESTORE	4001
-#define MP_CONNECT	4002
-#define MP_DISCONNECT	4003
-#define MP_EXIT		4004
-
-
-#define DEFAULT_SIZE_X  800
-#define DEFAULT_SIZE_Y  600
+#define MP_RESTORE 4001
+#define MP_CONNECT 4002
+#define MP_DISCONNECT 4003
+#define MP_EXIT 4004
 
+#define DEFAULT_SIZE_X 800
+#define DEFAULT_SIZE_Y 600
 
-enum ClientSkinEnum {
+enum ClientSkinEnum
+{
 	Client_Green_Smiley = 0,
 	Client_Red_Smiley,
 	Client_Yellow_Smiley,
@@ -100,72 +106,170 @@
 	CLIENT_SKIN_SIZE
 };
 
+// Indexes into CamuleDlg::m_tblist. Must match the order of the
+// Add_Skin_Icon("Toolbar_...") calls in Apply_Toolbar_Skin.
+enum ToolbarSkinEnum
+{
+	Toolbar_Network = 0,
+	Toolbar_Transfers,
+	Toolbar_Search,
+	Toolbar_Shared,
+	Toolbar_Messages,
+	Toolbar_Clients,
+	Toolbar_Stats,
+	Toolbar_Prefs,
+	Toolbar_Import,
+	Toolbar_About,
+	Toolbar_Blink,
+	// Add items here.
+	TOOLBAR_SKIN_SIZE
+};
 
 // CamuleDlg Dialogfeld
 class CamuleDlg : public wxFrame
 {
 public:
-	CamuleDlg(
-		wxWindow *pParent = NULL,
+	CamuleDlg(wxWindow *pParent = NULL,
 		const wxString &title = "",
 		wxPoint where = wxDefaultPosition,
-		wxSize dlg_size = wxSize(DEFAULT_SIZE_X,DEFAULT_SIZE_Y));
+		wxSize dlg_size = wxSize(DEFAULT_SIZE_X, DEFAULT_SIZE_Y));
 	~CamuleDlg();
 
-	void AddLogLine(const wxString& line);
-	void AddServerMessageLine(wxString& message);
+	void AddLogLine(const wxString &line);
+	// The GUI client's own log. In amulegui this is a separate "aMuleGUI Log"
+	// tab; in the monolithic build it is the same tab as AddLogLine().
+	void AddGuiLogLine(const wxString &line);
+	void AddServerMessageLine(wxString &message);
 	void ResetLog(int id);
 
-	void ShowUserCount(const wxString& info = "");
-	void ShowConnectionState(bool skinChanged = false);
+	// Bracket a burst of AddLogLine() calls so the log view is repainted and scrolled once for
+	// the whole batch instead of per line (issue #445 -- a remote-GUI first-sync backlog is
+	// thousands of lines).
+	void BeginLogBatch();
+	void EndLogBatch();
+
+	// Last values pushed by ShowCoreVersion, so the click handler can build
+	// the dialog without re-reading the EC connection.
+	wxString m_coreVersion;
+	wxString m_coreEndpoint;
+	wxString m_coreEncryption;
+	bool m_coreEncrypted = false;
+
+	void ShowUserCount(const wxString &info = "");
+	// Reveal and populate the status-bar core-version field. `coreVersion` is what the core
+	// reported over EC; `endpoint` is the host:port it was reached on. amulegui only.
+	void ShowCoreVersion(const wxString &coreVersion,
+		const wxString &endpoint,
+		const wxString &encryption,
+		bool encrypted);
+	// Details dialog for the status-bar core-version field. A dialog rather than a tooltip: the
+	// bar shifts sideways whenever the speed text changes width, which cancels a hover before
+	// it can fire.
+	void OnCoreVersionClicked(wxMouseEvent &event);
+	void ShowConnectionState();
 	void ShowTransferRate();
 
-	bool StatisticsWindowActive()
-		{ return (m_activewnd == static_cast<wxWindow*>(m_statisticswnd)); }
+	bool StatisticsWindowActive() { return (m_activewnd == static_cast<wxWindow *>(m_statisticswnd)); }
 
 	/* Returns the active dialog. Needed to check what to redraw. */
-	enum DialogType {
+	enum DialogType
+	{
 		DT_TRANSFER_WND,
 		DT_NETWORKS_WND,
 		DT_SEARCH_WND,
 		DT_SHARED_WND,
 		DT_CHAT_WND,
 		DT_STATS_WND,
-		DT_KAD_WND	// this one is still unused
+		DT_CLIENTS_WND,
+		DT_KAD_WND // this one is still unused
 	};
-	DialogType GetActiveDialog()
-		{ return m_nActiveDialog; }
-	void SetActiveDialog(DialogType type, wxWindow* dlg);
+	DialogType GetActiveDialog() { return m_nActiveDialog; }
+	void SetActiveDialog(DialogType type, wxWindow *dlg);
 
-	/**
-	 * Helper function for deciding if a certain dlg is visible.
-	 *
-	 * @return True if the dialog is visible to the user, false otherwise.
-	 */
-	bool IsDialogVisible( DialogType dlg )
+	// Programmatically switch to the Search panel exactly as clicking the Search toolbar button
+	// would -- panel, toolbar button state, ED2K-links handler and the handler's bookkeeping
+	// all stay consistent. Used when a "View Files" browse opens a tab from another panel.
+	void ShowSearchWindow();
+
+	/// True if the dialog is visible to the user.
+	bool IsDialogVisible(DialogType dlg)
 	{
 		return m_nActiveDialog == dlg && m_is_safe_state /* && !IsIconized() */;
 	}
 
-	void ShowED2KLinksHandler( bool show );
+	/**
+	 * Makes the main window visible, and applies the settings that only take effect once it is
+	 * (the toolbar re-realize, start-minimized).
+	 *
+	 * Called from the constructor on amulegui. The monolithic build calls it when the startup
+	 * splash closes instead, so the window appears ready rather than sitting unresponsive
+	 * behind the splash. Idempotent: does nothing if the window is already shown.
+	 */
+	void ShowStartupWindow();
+
+	void ShowED2KLinksHandler(bool show);
 
 	void DlgShutDown();
-	void OnClose(wxCloseEvent& evt);
-	void OnBnConnect(wxCommandEvent& evt);
+	void OnClose(wxCloseEvent &evt);
+	void OnBnConnect(wxCommandEvent &evt);
 
-	bool SafeState()	{ return m_is_safe_state; }
+	bool SafeState() { return m_is_safe_state; }
 
 	void LaunchUrl(const wxString &url);
 
 	void CreateSystray();
 	void RemoveSystray();
 
-	void StartGuiTimer()	{ gui_timer->Start(100); }
-	void StopGuiTimer()	{ gui_timer->Stop(); }
+	/**
+	 * Refreshes the free-space label of whichever panel is on screen.
+	 *
+	 * Driven by the GUI timer, and again when a panel becomes active so it does not show the
+	 * figure it had when it was last visible until the next tick.
+	 */
+	void UpdateFreeSpaceLabels();
+
+	/**
+	 * Writes a free-space figure into @a label, red when @a warn. FREE_SPACE_UNKNOWN empties
+	 * the label rather than printing a size, so an unreachable mount shows nothing instead of
+	 * "0 bytes free".
+	 *
+	 * @a separatorLabel is the "|" joining this figure to the field before it, in a label of
+	 * its own because a wxStaticText colours all or nothing -- kept here rather than at the
+	 * call sites so it is set and cleared with the figure it belongs to, and never left
+	 * trailing the field before it when there is nothing to show. Panels that show the figure
+	 * on its own pass nothing.
+	 */
+	static void SetFreeSpaceLabel(
+		wxStaticText *label, sint64 freeSpace, bool warn, wxStaticText *separatorLabel = nullptr);
+
+	/**
+	 * Brings the main window back from every state that hides it.
+	 *
+	 * The one restore path, shared by the tray icon (click, menu), the duplicate-launch
+	 * RAISE_DIALOG signal and the macOS Dock-reopen handler of both applications. Written once
+	 * because the hidden states compose: the window can be hidden (Show(false) via HideOnClose
+	 * or minimize-to-tray), iconized to the Dock/taskbar, merely behind another application's
+	 * window, or -- on macOS -- any of those with the Dock icon dropped as well.
+	 */
+	void RestoreMainWindow();
 
 	/**
-	 * This function ensures that _all_ list widgets are properly sorted.
+	 * Hides the main window, leaving the tray icon as the way back.
+	 *
+	 * The counterpart of RestoreMainWindow(), and the reason both are here: on macOS the hide
+	 * has a second half (dropping NSApp to accessory so no Dock icon is left behind) that every
+	 * hide path has to perform and every show path has to undo.
+	 *
+	 * Named for the tray where its counterpart is not, because every caller of this one really
+	 * is a tray path -- the tray menu, and minimize-to-tray, which only runs when the icon
+	 * exists. The close-button HideOnClose path deliberately does not come here; see OnClose().
 	 */
+	void HideToTray();
+
+	void StartGuiTimer() { gui_timer->Start(100); }
+	void StopGuiTimer() { gui_timer->Stop(); }
+
+	/// Ensures that _all_ list widgets are properly sorted.
 	void InitSort();
 
 	void SetMessageBlink(bool state) { m_BlinkMessages = state; }
@@ -173,51 +277,49 @@
 
 	void DoNetworkRearrange();
 
-	CIP2Country*		m_IP2Country;
-	void IP2CountryDownloadFinished(uint32 result);
-	void EnableIP2Country();
-
-	wxWindow*		m_activewnd;
-	CTransferWnd*		m_transferwnd;
-	CServerWnd*		m_serverwnd;
-	CSharedFilesWnd*	m_sharedfileswnd;
-	CSearchDlg*		m_searchwnd;
-	CChatWnd*		m_chatwnd;
-	CStatisticsDlg*		m_statisticswnd;
-	CKadDlg*		m_kademliawnd;
+	wxWindow *m_activewnd;
+	CTransferWnd *m_transferwnd;
+	CServerWnd *m_serverwnd;
+	CSharedFilesWnd *m_sharedfileswnd;
+	CSearchDlg *m_searchwnd;
+	CChatWnd *m_chatwnd;
+	class CClientsWnd *m_clientswnd;
+	CStatisticsDlg *m_statisticswnd;
+	CKadDlg *m_kademliawnd;
 	//! Pointer to the current preference dialog, if any.
-	PrefsUnifiedDlg*	m_prefsDialog;
+	PrefsUnifiedDlg *m_prefsDialog;
 
-	int			m_srv_split_pos;
+	int m_srv_split_pos;
 
-	// Last frame geometry seen while NOT iconized. SaveGUIPrefs uses
-	// it as the fallback when the user exits from a minimized state
-	// (otherwise the iconized GetPosition() returns sentinel values
-	// like -32000,-32000 on Windows and the saved pos is unusable).
-	wxPoint		m_lastShownPos;
-	wxSize		m_lastShownSize;
-	bool		m_lastShownMaximized;
-	bool		m_lastShownValid;
+	// Last frame geometry seen while NOT iconized. SaveGUIPrefs uses it as the fallback when
+	// the user exits from a minimized state, where the iconized GetPosition() returns sentinel
+	// values like -32000,-32000 on Windows.
+	wxPoint m_lastShownPos;
+	wxSize m_lastShownSize;
+	bool m_lastShownMaximized;
+	bool m_lastShownValid;
 
 	wxImageList m_imagelist;
-	wxImageList m_tblist;
+	// Toolbar icons as resolution-aware bundles (the 32x32 art plus a smooth 2x upscale). The
+	// executable is per-monitor-DPI aware, so a plain 32px wxBitmap would be drawn at 32
+	// PHYSICAL pixels -- tiny and blurry on hi-DPI screens.
+	std::vector<wxBitmapBundle> m_tblist;
 
 protected:
-	void OnToolBarButton(wxCommandEvent& ev);
-	void OnAboutButton(wxCommandEvent& ev);
-	void OnPrefButton(wxCommandEvent& ev);
-	void OnImportButton(wxCommandEvent& ev);
-	void OnMinimize(wxIconizeEvent& evt);
-	void OnShow(wxShowEvent& evt);
-	void OnBnClickedFast(wxCommandEvent& evt);
-	void OnGUITimer(wxTimerEvent& evt);
-	void OnMainGUISizeChange(wxSizeEvent& evt);
-	void OnMainGUIMove(wxMoveEvent& evt);
-	// Stash the current (non-iconized) pos / size / maximized state so
-	// SaveGUIPrefs can fall back to the last good geometry if the user
-	// exits from a minimized window.
+	void OnToolBarButton(wxCommandEvent &ev);
+	void OnAboutButton(wxCommandEvent &ev);
+	void OnPrefButton(wxCommandEvent &ev);
+	void OnImportButton(wxCommandEvent &ev);
+	void OnMinimize(wxIconizeEvent &evt);
+	void OnShow(wxShowEvent &evt);
+	void OnBnClickedFast(wxCommandEvent &evt);
+	void OnGUITimer(wxTimerEvent &evt);
+	void OnMainGUISizeChange(wxSizeEvent &evt);
+	void OnMainGUIMove(wxMoveEvent &evt);
+	// Stash the current (non-iconized) pos / size / maximized state so SaveGUIPrefs can fall
+	// back to the last good geometry if the user exits from a minimized window.
 	void CacheLastShownGeometry();
-	void OnExit(wxCommandEvent& evt);
+	void OnExit(wxCommandEvent &evt);
 
 private:
 	//! Specifies if the prefs-dialog was shown before minimizing.
@@ -228,31 +330,68 @@
 	DialogType m_nActiveDialog;
 	bool m_is_safe_state;
 	bool m_BlinkMessages;
+
+	//! Shared append logic for both log views (ID_LOGVIEW / ID_GUILOGVIEW).
+	//! Lines starting with '!' are critical (bold + status bar).
+	void AddLogLineToView(const wxString &line, int viewId);
 	int m_CurrentBlinkBitmap;
 	uint32 m_last_iconizing;
+	// The "new version available" popup is shown at most once per session;
+	// the daily periodic re-check must not re-pop within the same run.
+	bool m_versionPopupShown = false;
+
+#if defined(ENABLE_VERSION_CHECK) && defined(CLIENT_GUI)
+	// amulegui-only: it is not a CamuleApp and has no core version-check engine, so the remote
+	// GUI runs its own CVersionCheck. The monolithic app drives the popup from the shared core
+	// engine instead. Owned, created lazily by StartupVersionCheck() when the preference is on.
+	CVersionCheck *m_startupVersionCheck = nullptr;
+	time_t m_lastGuiVersionCheck = 0;
+	void StartupVersionCheck();
+	void OnStartupVersionCheckDone(wxCommandEvent &evt);
+#endif // ENABLE_VERSION_CHECK && CLIENT_GUI
 
 public:
-	// Track iconize state from wxIconizeEvent::IsIconized(), which is
-	// reliable across platforms — unlike wxFrame::IsIconized() which
-	// can return false on wxGTK after a minimize-button click while
-	// the OS still has the window iconized. Tray menu and DoShowHide
-	// consult this to decide whether the window is "visible to the
-	// user" so the "Show aMule"/"Hide aMule" label and the click
-	// action stay in sync with reality.
+	// Show the "a new version is available" popup: at most once per session, and never for a
+	// version the user muted via the dialog's "Don't ask again" checkbox, which is recorded
+	// per-version so a newer release still asks. Called from the core engine in the monolithic
+	// app and from OnStartupVersionCheckDone in amulegui.
+	void ShowVersionAvailable(const wxString &latest);
+
+	// Track iconize state from wxIconizeEvent::IsIconized(), which is reliable across platforms
+	// -- unlike wxFrame::IsIconized(), which can return false on wxGTK after a minimize click
+	// while the OS still has the window iconized. The tray menu and DoShowHide consult this to
+	// keep the "Show aMule" / "Hide aMule" label and the click action in step with reality.
 	bool IsTrayLogicallyIconized() const { return m_iconized_logical; }
 
+	/// Whether the user can actually see the window. Both halves are needed and neither is
+	/// enough: minimized to Dock/taskbar keeps IsShown() true while nothing is on screen, and
+	/// hidden to tray leaves the iconized bit clear while the frame is gone. Used by the tray
+	/// menu to label Show/Hide, and by amulegui to decide whether a modal is worth putting up
+	/// (issue #806).
+	bool IsVisibleToUser() const { return IsShown() && !m_iconized_logical; }
+
 private:
 	bool m_iconized_logical = false;
 	wxFileName m_skinFileName;
 	std::vector<wxString> m_clientSkinNames;
 	bool m_GeoIPavailable;
 
-	WX_DECLARE_STRING_HASH_MAP(wxZipEntry*, ZipCatalog);
+	WX_DECLARE_STRING_HASH_MAP(wxZipEntry *, ZipCatalog);
 	ZipCatalog cat;
 
-	PageType m_logpages4;
+	// Network-conditional log tabs (Server Info / ED2K Info / Kad Info), captured by the
+	// control each page hosts rather than by notebook index: the tab layout differs between the
+	// monolithic build and amulegui, and index-based tracking silently broke Kad Info when the
+	// "aMuleGUI Log" tab was inserted. DoNetworkRearrange() shows and hides these by identity.
+	PageType m_logServerInfo;
+	PageType m_logED2KInfo;
+	PageType m_logKadInfo;
 	PageType m_networkpages2;
 
+	// Finds the notebook page hosting the control ctrlId and captures its window and tab label.
+	// Used to track the network-conditional log tabs by identity instead of position.
+	PageType CaptureLogPage(wxNotebook *notebook, wxWindowID ctrlId);
+
 	bool LoadGUIPrefs(bool override_pos, bool override_size);
 	bool SaveGUIPrefs();
 
@@ -262,9 +401,8 @@
 	void Apply_Toolbar_Skin(wxToolBar *wndToolbar);
 	bool Check_and_Init_Skin();
 	void Add_Skin_Icon(const wxString &iconName, const wxBitmap &stdIcon, bool useSkins);
-	void ToogleED2KLinksHandler();
 	void SetMessagesTool();
-	void OnKeyPressed(wxKeyEvent& evt);
+	void OnKeyPressed(wxKeyEvent &evt);
 
 	wxDECLARE_EVENT_TABLE();
 };

amule-3.0.1.tar.gz/src/amuleIPV4Address.h -> amule-3.1.0.tar.gz/src/amuleIPV4Address.h Changed

@@ -26,7 +26,7 @@
 #ifndef AMULEIPV4ADDRESS_H
 #define AMULEIPV4ADDRESS_H
 
-#include "NetworkFunctions.h"	// Needed for Uint32toStringIP
+#include "NetworkFunctions.h" // Needed for Uint32toStringIP
 
 class amuleIPV4Address
 {
@@ -35,10 +35,10 @@
 	amuleIPV4Address(const amuleIPV4Address &a);
 	amuleIPV4Address(const class CamuleIPV4Endpoint &ep);
 	virtual ~amuleIPV4Address();
-	amuleIPV4Address& operator=(const amuleIPV4Address &a);
-	amuleIPV4Address& operator=(const class CamuleIPV4Endpoint &a);
+	amuleIPV4Address &operator=(const amuleIPV4Address &a);
+	amuleIPV4Address &operator=(const class CamuleIPV4Endpoint &a);
 
-	virtual bool Hostname(const wxString& name);
+	virtual bool Hostname(const wxString &name);
 
 	virtual bool Hostname(uint32 ip)
 	{
@@ -50,7 +50,6 @@
 		return Hostname(Uint32toStringIP(ip));
 	}
 
-
 	// Set the port to that corresponding to the specified service.
 	// Returns true on success, false if something goes wrong (invalid service).
 	virtual bool Service(uint16 service);
@@ -67,11 +66,11 @@
 	// Set address to any of the addresses of the current machine.
 	virtual bool AnyAddress();
 
-	const class CamuleIPV4Endpoint & GetEndpoint() const;
-	class CamuleIPV4Endpoint & GetEndpoint();
+	const class CamuleIPV4Endpoint &GetEndpoint() const;
+	class CamuleIPV4Endpoint &GetEndpoint();
 
 private:
-	class CamuleIPV4Endpoint * m_endpoint;
+	class CamuleIPV4Endpoint *m_endpoint;
 };
 
 #endif // AMULEIPV4ADDRESS_H

amule-3.0.1.tar.gz/src/amuled.cpp -> amule-3.1.0.tar.gz/src/amuled.cpp Changed

@@ -22,55 +22,58 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "amule.h"			// Interface declarations.
+#include "amule.h" // Interface declarations.
 
 #include <include/common/EventIDs.h>
 
-#include "config.h"			// Needed for HAVE_SYS_RESOURCE_H, etc
-
+#include "config.h" // Needed for HAVE_SYS_RESOURCE_H, etc
 
 // Include the necessary headers for select(2), properly guarded
 #if defined HAVE_SYS_SELECT_H && !defined __IRIX__
-#	include <sys/select.h>
+#include <sys/select.h>
 #else
-#	ifdef HAVE_SYS_TIME_H
-#		include <sys/time.h>
-#	endif
-#	ifdef HAVE_SYS_TYPES_H
-#		include <sys/types.h>
-#	endif
-#	ifdef HAVE_UNISTD_H
-#		include <unistd.h>
-#	endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#endif
+
+#ifndef __WINDOWS__
+#include <cstdio>  // fprintf() for the pre-wxEntry "forking to background" notice
+#include <cstring> // strcmp() for the pre-wxEntry daemon-flag scan
+#include <fcntl.h> // open()/O_RDWR for the early daemonize fork
 #endif
 
 #include <wx/utils.h>
 
-#include <common/LocaleInit.h>		// Needed for aMuleInitLocale()
-#include "Preferences.h"		// Needed for CPreferences
-#include "PartFile.h"			// Needed for CPartFile
-#include "PartFileHashThread.h"	// Needed for EVT_PARTFILE_HASH_RESULT
+#include <common/LocaleInit.h>  // Needed for aMuleInitLocale()
+#include "Preferences.h"        // Needed for CPreferences
+#include "PartFile.h"           // Needed for CPartFile
+#include "PartFileHashThread.h" // Needed for EVT_PARTFILE_HASH_RESULT
 #include "Logger.h"
 #include <common/Format.h>
-#include "InternalEvents.h"		// Needed for wxEVT_*
+#include "InternalEvents.h" // Needed for wxEVT_*
 #include "ThreadTasks.h"
-#include "GuiEvents.h"			// Needed for EVT_MULE_NOTIFY
-#include "Timer.h"			// Needed for EVT_MULE_TIMER
-
-#include "ClientUDPSocket.h"		// Do_not_auto_remove (forward declaration not enough)
-#include "ListenSocket.h"		// Do_not_auto_remove (forward declaration not enough)
+#include "GuiEvents.h" // Needed for EVT_MULE_NOTIFY
+#include "Timer.h"     // Needed for EVT_MULE_TIMER
 
+#include "ClientUDPSocket.h" // Do_not_auto_remove (forward declaration not enough)
+#include "ListenSocket.h"    // Do_not_auto_remove (forward declaration not enough)
 
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h> // Do_not_auto_remove
 #endif
 
 #ifndef __WINDOWS__
-	#ifdef  HAVE_SYS_WAIT_H
-		#include <sys/wait.h> // Do_not_auto_remove
-	#endif
-	#include <wx/ffile.h>
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h> // Do_not_auto_remove
+#endif
+#include <wx/ffile.h>
 #endif
 
 wxBEGIN_EVENT_TABLE(CamuleDaemonApp, wxAppConsole)
@@ -94,6 +97,9 @@
 	EVT_MULE_HASHING(CamuleDaemonApp::OnFinishedHashing)
 	EVT_MULE_AICH_HASHING(CamuleDaemonApp::OnFinishedAICHHashing)
 
+	// MediaProbe (#140) -- attaches media tags on the main thread.
+	EVT_MULE_MEDIA_PROBE(CamuleDaemonApp::OnMediaProbeFinished)
+
 	// CPartFileHashThread per-part result
 	EVT_PARTFILE_HASH_RESULT(CamuleDaemonApp::OnPartFileHashResult)
 
@@ -107,48 +113,116 @@
 	EVT_MULE_ALLOC_FINISHED(CamuleDaemonApp::OnFinishedAllocation)
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(CamuleDaemonApp)
+IMPLEMENT_APP_NO_MAIN(CamuleDaemonApp)
+
+#ifndef __WINDOWS__
+// amuled's `-f`/`--full-daemon` must daemonize BEFORE wxEntry() initialises wxWidgets. On macOS wx
+// links the Cocoa core, which spins up framework threads during app init; forking AFTER that and
+// then calling into ObjC from the child -- the FSEvents run-loop pump, the version-check HTTP
+// fetch, Kad startup -- trips the ObjC fork-safety guard and aborts or spins at 100% CPU. Forking
+// first lets Cocoa initialise fresh in the child, and is harmless on Linux/*BSD. Everything then
+// runs in the child, so the worker threads constructed during OnInit() land in the daemon instead
+// of being orphaned by a mid-init fork (#849). Windows never forks.
+static bool AmuledWantsDaemonFork(int argc, char **argv)
+{
+	for (int i = 1; i < argc; ++i) {
+		if (strcmp(argvi, "--") == 0) {
+			break; // end-of-options marker
+		}
+		if (strcmp(argvi, "-f") == 0 || strcmp(argvi, "--full-daemon") == 0) {
+			return true;
+		}
+	}
+	return false;
+}
+
+static void AmuledDaemonizeEarly()
+{
+	// Say goodbye on the still-attached terminal before detaching stdio. This
+	// runs before wxEntry(), so there's no gettext yet -- plain English notice.
+	fprintf(stdout, "amuled: forking to background - see you\n");
+	fflush(stdout);
+
+	// Detach stdio to /dev/null and fork; the original process exits so the shell returns, and
+	// the child -- session leader after setsid() -- carries on into wxEntry(). The pid file is
+	// written later from InitGui(), now running in this child, with getpid().
+	for (int i_fd = 0; i_fd < 3; ++i_fd) {
+		close(i_fd);
+	}
+	int fd = open("/dev/null", O_RDWR);
+	if (fd >= 0) {
+		// fd is 0, the lowest free after the closes, so dup twice to reopen stdout(1) and
+		// stderr(2) on /dev/null. The empty bodies ignore the dup return deliberately,
+		// silencing -Wunused-result.
+		if (dup(fd)) {
+		}
+		if (dup(fd)) {
+		}
+	}
+	pid_t pid = fork();
+	if (pid < 0) {
+		_exit(1);
+	}
+	if (pid > 0) {
+		_exit(0); // original process: leave without running static dtors
+	}
+	setsid(); // child detaches from the controlling tty
+}
+#endif // !__WINDOWS__
+
+int main(int argc, char **argv)
+{
+#ifndef __WINDOWS__
+	if (AmuledWantsDaemonFork(argc, argv)) {
+		AmuledDaemonizeEarly();
+	}
+#endif
+	return wxEntry(argc, argv);
+}
 
 #ifdef __WINDOWS__
-//
 // CTRL-C-Handler
 // see http://msdn.microsoft.com/en-us/library/windows/desktop/ms685049%28v=vs.85%29.aspx
-//
 static BOOL CtrlHandler(DWORD fdwCtrlType)
 {
 	switch (fdwCtrlType) {
-		case CTRL_C_EVENT:
-		case CTRL_CLOSE_EVENT:
-		case CTRL_BREAK_EVENT:
-			// handle these
-			AddLogLineNS("Received break event, exit main loop");
-			theApp->ExitMainLoop();
-			return TRUE;
-			break;
-		case CTRL_LOGOFF_EVENT:
-		case CTRL_SHUTDOWN_EVENT:
-		default:
-			// don't handle these
-			return FALSE;
-			break;
+	case CTRL_C_EVENT:
+	case CTRL_CLOSE_EVENT:
+	case CTRL_BREAK_EVENT:
+		AddDebugLogLineN(logStandard, "Received break event, exit main loop");
+		theApp->ExitMainLoop();
+		return TRUE;
+		break;
+	case CTRL_LOGOFF_EVENT:
+	case CTRL_SHUTDOWN_EVENT:
+	default:
+		return FALSE;
+		break;
 	}
 }
 
 #endif // __WINDOWS__
 
-
 int CamuleDaemonApp::OnRun()
 {
 	if (!thePrefs::AcceptExternalConnections()) {
-		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"));
+		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()) {
-		AddLogLineCS(_("ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"));
+		AddLogLineCS(
+			_("ERROR: A valid password is required to use external connections, and aMule daemon "
+			  "cannot be used without external connections. To run aMule daemon, 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 https://amule-org.github.io/docs"));
 		return 0;
 	}
 
 #ifdef __WINDOWS__
-	SetConsoleCtrlHandler((PHANDLER_ROUTINE) CtrlHandler, TRUE);
+	SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandler, TRUE);
 #endif // __WINDOWS__
 
 	return wxApp::OnRun();
@@ -156,11 +230,11 @@
 
 bool CamuleDaemonApp::OnInit()
 {
-	if ( !CamuleApp::OnInit() ) {
+	if (!CamuleApp::OnInit()) {
 		return false;
 	}
 	AddLogLineNS(_("amuled: OnInit - starting timer"));
-	core_timer = new CTimer(this,ID_CORE_TIMER_EVENT);
+	core_timer = new CTimer(this, ID_CORE_TIMER_EVENT);
 	core_timer->Start(CORE_TIMER_PERIOD);
 	glob_prefs->GetCategory(0)->title = GetCatTitle(thePrefs::GetAllcatFilter());
 	glob_prefs->GetCategory(0)->path = thePrefs::GetIncomingDir();
@@ -168,86 +242,72 @@
 	return true;
 }
 
-int CamuleDaemonApp::InitGui(bool ,wxString &)
+int CamuleDaemonApp::InitGui(bool, wxString &)
 {
 #ifndef __WINDOWS__
-	if ( !enable_daemon_fork ) {
+	if (!enable_daemon_fork) {
 		return 0;
 	}
-	AddLogLineNS(_("amuled: forking to background - see you"));
+	// The fork+setsid+stdio detach happens before wxEntry() now (see main() above), so this
+	// runs in the daemon child. Silence the stdout log and drop the pid file with our own post-
+	// setsid pid.
 	theLogger.SetEnabledStdoutLog(false);
-	//
-	// 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);
-	if (dup(fd)){}	// prevent GCC warning
-	if (dup(fd)){}
-	pid_t pid = fork();
-
-	wxASSERT(pid != -1);
-
-	if ( pid ) {
-		exit(0);
-	} else {
-		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("%d\n") % pid;
-			wxFFile ff(m_PidFile, "w");
-			if (!ff.Error()) {
-				ff.Write(temp);
-				ff.Close();
-			} else {
-				AddLogLineNS(_("Cannot Create Pid File"));
-			}
+	if (!m_PidFile.IsEmpty()) {
+		// A pid file with the daemon's pid, so any daemon-manager can manage the
+		// process.
+		wxString temp = CFormat("%d\n") % (int)getpid();
+		wxFFile ff(m_PidFile, "w");
+		if (!ff.Error()) {
+			ff.Write(temp);
+			ff.Close();
+		} else {
+			AddLogLineNS(_("Cannot Create Pid File"));
 		}
 	}
-
 #endif
 	return 0;
 }
 
-bool CamuleDaemonApp::Initialize(int& argc_, wxChar **argv_)
+bool CamuleDaemonApp::Initialize(int &argc_, wxChar **argv_)
 {
-	if ( !wxAppConsole::Initialize(argc_, argv_) ) {
+	if (!wxAppConsole::Initialize(argc_, argv_)) {
 		return false;
 	}
 
-	// Pull LC_CTYPE etc. from the environment so unicode2char() emits
-	// real UTF-8 instead of mangling non-ASCII bytes under the default
-	// "C" locale (see #203).
+	// Pull LC_CTYPE etc. from the environment so unicode2char() emits real UTF-8 instead of
+	// mangling non-ASCII bytes under the default "C" locale (see #203).
 	aMuleInitLocale();
 
 #ifdef __UNIX__
 	wxString encName;
 #if wxUSE_INTL
-	// if a non default locale is set,
-	// assume that the user wants his
-        // filenames in this locale too
-        encName = wxLocale::GetSystemEncodingName().Upper();
-
-        // But don't consider ASCII in this case.
-	if ( !encName.empty() ) {
-		if ( encName == "US-ASCII" ) {
+	// A non-default locale is taken to mean the user wants filenames in that locale too.
+	encName = wxLocale::GetSystemEncodingName().Upper();
+
+	// But don't consider ASCII in this case.
+	if (!encName.empty()) {
+		if (encName == "US-ASCII") {
 			// This means US-ASCII when returned
 			// from GetEncodingFromName().
 			encName.clear();
 		}
-        }
+	}
 #endif // wxUSE_INTL
 
 	// in this case, UTF-8 is used by default.
-        if ( encName.empty() ) {
+	if (encName.empty()) {
 		encName = "UTF-8";
 	}
 
+#ifdef __WXOSX__
+	// macOS reports "Mac OS Roman" from GetSystemEncodingName() regardless of the user's
+	// locale, but HFS+/APFS file names are always UTF-8. Encoding with Mac Roman turns U+00AA
+	// into the single byte 0xAA, which the kernel rejects as invalid UTF-8 when the completed
+	// file is opened, leaving non-ASCII downloads stuck in PS_ERROR. The GUI keeps wx's UTF-8
+	// converter; force UTF-8 to match.
+	encName = "UTF-8";
+#endif
+
 	static wxConvBrokenFileNames fileconv(encName);
 	wxConvFileName = &fileconv;
 #endif // __UNIX__
@@ -262,15 +322,14 @@
 	return CamuleApp::OnExit();
 }
 
-
 int CamuleDaemonApp::ShowAlert(wxString msg, wxString title, int flags)
 {
-	if ( flags | wxICON_ERROR ) {
+	if (flags | wxICON_ERROR) {
 		title = CFormat(_("ERROR: %s")) % title;
 	}
 	AddLogLineCS(title + " " + msg);
 
-	return 0;	// That's neither yes nor no, ok, cancel
+	return 0; // That's neither yes nor no, ok, cancel
 }
 
 // File_checked_for_headers

amule-3.1.0.tar.gz/src/extern/.clang-format Added

amule-3.1.0.tar.gz/src/extern/libutp Added

amule-3.1.0.tar.gz/src/extern/libutp/AMULE_PROVENANCE.md Added

@@ -0,0 +1,58 @@
+# libutp vendoring provenance
+
+This directory is a verbatim partial snapshot of an upstream libutp revision.
+It carries no aMule changes, and nothing here may be edited locally.
+
+| | |
+| --- | --- |
+| Upstream | <https://github.com/transmission/libutp> |
+| Commit | `490874c44a2ecf914404b0a20e043c9755fff47b` |
+| Commit date | 2024-11-16 |
+| Version | 3.4 |
+| License | MIT — see `LICENSE`(LICENSE) |
+| Local patches | none |
+
+`transmission/libutp` rather than the original `bittorrent/libutp`: the original
+is unmaintained, while Transmission's fork is still maintained and is the one
+that carries the CMake packaging and the `libutp/` include prefix this vendoring
+relies on.
+
+## What is vendored, and what is not
+
+`SHA256SUMS`(SHA256SUMS) lists every vendored file. It covers exactly the
+upstream paths selected below and not this file, so verification does not depend
+on aMule-authored text.
+
+Vendored: the library's sources and headers, its own `CMakeLists.txt` and
+`config.cmake.in`, plus `LICENSE` and `README.md`.
+
+Deliberately not vendored, because none of it is needed to build the library and
+all of it would age independently of the pin: upstream's `.github/` CI,
+`.gitignore`, `Makefile`, the Visual Studio project files and `prop_sheets/`, the
+`ucat.c` sample and `parse_log.py`.
+
+`libutp_inet_ntop.{cpp,h}` is kept even though it is only compiled on Windows,
+since dropping a platform's source would make the snapshot no longer a snapshot.
+
+## Verifying this snapshot
+
+```sh
+git clone https://github.com/transmission/libutp /tmp/libutp-upstream
+git -C /tmp/libutp-upstream checkout 490874c44a2ecf914404b0a20e043c9755fff47b
+
+# every vendored file is byte-identical to upstream at that commit
+cd src/extern/libutp
+awk '{ print $2 }' SHA256SUMS | while read -r f; do
+	cmp "$f" "/tmp/libutp-upstream/$f" || echo "DIFFERS: $f"
+done
+
+# and the manifest still describes this directory
+shasum -a 256 -c SHA256SUMS
+```
+
+## Updating the pin
+
+Re-run the copy for the paths in `SHA256SUMS`, regenerate the manifest, and
+update the table above in the same commit. A pin bump is its own commit: keeping
+it separate from aMule code is what lets a reviewer diff it against upstream
+instead of reading it.

amule-3.1.0.tar.gz/src/extern/libutp/CMakeLists.txt Added

@@ -0,0 +1,170 @@
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+project(libutp VERSION 3.4 LANGUAGES C CXX)
+
+set(LIBUTP_STANDALONE_BUILD OFF)
+if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+    set(LIBUTP_STANDALONE_BUILD ON)
+endif()
+
+option(LIBUTP_SHARED "${PROJECT_NAME}: Build shared library" ${BUILD_SHARED_LIBS})
+option(LIBUTP_ENABLE_INSTALL "${PROJECT_NAME}: Enable install" ${LIBUTP_STANDALONE_BUILD})
+option(LIBUTP_ENABLE_WERROR "${PROJECT_NAME}: Treat warnings as errors" ${LIBUTP_STANDALONE_BUILD})
+option(LIBUTP_BUILD_PROGRAMS "${PROJECT_NAME}: Build programs" ${LIBUTP_STANDALONE_BUILD})
+
+if(LIBUTP_ENABLE_INSTALL)
+    include(GNUInstallDirs)
+    include(CMakePackageConfigHelpers)
+endif()
+
+if(LIBUTP_STANDALONE_BUILD)
+    if(NOT CMAKE_C_STANDARD)
+        set(CMAKE_C_STANDARD 11)
+        set(CMAKE_C_STANDARD_REQUIRED ON)
+        set(CMAKE_C_EXTENSIONS OFF)
+    endif()
+
+    if(NOT CMAKE_CXX_STANDARD)
+        set(CMAKE_CXX_STANDARD 17)
+        set(CMAKE_CXX_STANDARD_REQUIRED ON)
+        set(CMAKE_CXX_EXTENSIONS OFF)
+    endif()
+
+    if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+        add_compile_options(
+            -Wall
+            -Wextra
+            -pedantic
+            $<$<BOOL:${LIBUTP_ENABLE_WERROR}>:-Werror>)
+    elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+        add_compile_options(
+            /W4
+            /wd4244 # '...': conversion from '...' to '...', possible loss of data
+            /wd4267 # '...': conversion from '...' to '...', possible loss of data
+            $<$<BOOL:${LIBUTP_ENABLE_WERROR}>:/WX>)
+    endif()
+endif()
+
+set(LIBUTP_LIBRARY_TYPE STATIC)
+if(LIBUTP_SHARED)
+    set(LIBUTP_LIBRARY_TYPE SHARED)
+endif()
+
+set(LIBUTP_ADD_SOURCES)
+if(WIN32)
+    list(APPEND LIBUTP_ADD_SOURCES
+        libutp_inet_ntop.cpp
+        libutp_inet_ntop.h)
+endif()
+
+if(CMAKE_VERSION VERSION_LESS 3.25)
+    set(BSD OFF)
+    if(CMAKE_SYSTEM_NAME MATCHES "BSD")
+        set(BSD ON)
+    endif()
+endif()
+
+add_library(libutp ${LIBUTP_LIBRARY_TYPE}
+    include/libutp/utp.h
+    include/libutp/utp_types.h
+    utp_api.cpp
+    utp_callbacks.cpp
+    utp_callbacks.h
+    utp_hash.cpp
+    utp_hash.h
+    utp_internal.cpp
+    utp_internal.h
+    utp_packedsockaddr.cpp
+    utp_packedsockaddr.h
+    utp_templates.h
+    utp_utils.cpp
+    utp_utils.h
+    ${LIBUTP_ADD_SOURCES})
+
+if(NOT LIBUTP_STANDALONE_BUILD)
+    add_library(${PROJECT_NAME}::libutp ALIAS libutp)
+endif()
+
+set_target_properties(libutp
+    PROPERTIES
+        OUTPUT_NAME utp)
+
+target_compile_definitions(libutp
+    PRIVATE
+        $<$<BOOL:${WIN32}>:_WINSOCK_DEPRECATED_NO_WARNINGS>
+    PUBLIC
+        $<$<BOOL:${WIN32}>:WIN32>
+        $<$<NOT:$<BOOL:${WIN32}>>:POSIX>)
+
+target_include_directories(libutp
+    PRIVATE
+        include/libutp
+    PUBLIC
+        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+if(LIBUTP_ENABLE_INSTALL)
+    install(
+        TARGETS libutp
+        EXPORT ${PROJECT_NAME}-targets
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+    install(
+        DIRECTORY ${PROJECT_SOURCE_DIR}/include/
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+endif()
+
+if(LIBUTP_BUILD_PROGRAMS AND NOT MSVC)
+    add_executable(ucat
+        ucat.c)
+
+    if(NOT LIBB64_STANDALONE_BUILD)
+        add_executable(${PROJECT_NAME}::ucat ALIAS ucat)
+    endif()
+
+    target_compile_definitions(ucat
+        PRIVATE
+            $<$<NOT:$<OR:$<BOOL:${WIN32}>,$<BOOL:${BSD}>>>:_POSIX_C_SOURCE=200112L>
+            $<$<BOOL:${APPLE}>:_DARWIN_C_SOURCE>)
+
+    target_link_libraries(ucat
+        PRIVATE
+            libutp)
+
+    if(LIBUTP_ENABLE_INSTALL)
+        install(
+            TARGETS ucat
+            EXPORT ${PROJECT_NAME}-targets
+            DESTINATION ${CMAKE_INSTALL_BINDIR})
+    endif()
+endif()
+
+if(LIBUTP_ENABLE_INSTALL)
+    write_basic_package_version_file(
+        ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
+        VERSION ${PROJECT_VERSION}
+        COMPATIBILITY SameMajorVersion)
+
+    configure_file(
+        config.cmake.in
+        ${PROJECT_NAME}-config.cmake
+        @ONLY)
+
+    install(
+        EXPORT ${PROJECT_NAME}-targets
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+        NAMESPACE ${PROJECT_NAME}::)
+
+    install(
+        FILES
+            ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
+            ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+
+    install(
+        FILES
+            LICENSE
+            README.md
+        DESTINATION ${CMAKE_INSTALL_DOCDIR})
+endif()

amule-3.1.0.tar.gz/src/extern/libutp/LICENSE Added

@@ -0,0 +1,19 @@
+Copyright (c) 2010-2013 BitTorrent, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

amule-3.1.0.tar.gz/src/extern/libutp/README.md Added

@@ -0,0 +1,68 @@
+# libutp - The uTorrent Transport Protocol library.
+Copyright (c) 2010 BitTorrent, Inc.
+
+uTP is a TCP-like implementation of LEDBATledbat documented as a BitTorrent
+extension in BEP-29bep29. uTP provides reliable, ordered delivery
+while maintaining minimum extra delay. It is implemented on top of UDP to be
+cross-platform and functional today. As a result, uTP is the primary transport
+for uTorrent peer-to-peer connections.
+
+uTP is written in C++, but the external interface is strictly C (C11 standard).
+
+## The Interface
+
+The uTP socket interface is a bit different from the Berkeley socket API to
+avoid the need for our own select() implementation, and to make it easier to
+write event-based code with minimal buffering.
+
+When you create a uTP socket, you register a set of callbacks. Most notably, the
+on_read callback is a reactive callback which occurs when bytes arrive off the
+network. The write side of the socket is proactive, and you call UTP_Write to
+indicate the number of bytes you wish to write. As packets are created, the
+on_write callback is called for each packet, so you can fill the buffers with
+data.
+
+The libutp interface is not thread-safe. It was designed for use in a
+single-threaded asyncronous context, although with proper synchronization
+it may be used from a multi-threaded environment as well.
+
+See utp.h for more details and other API documentation.
+
+## Example
+
+See ucat.c. Build with:
+ 
+   make ucat
+
+## Building
+
+uTP has been known to build on Windows with MSVC and on linux and OS X with gcc.
+On Windows, use the MSVC project files (utp.sln, and friends). On other platforms,
+building the shared library is as simple as:
+
+    make
+
+To build one of the examples, which will statically link in everything it needs
+from libutp:
+
+    cd utp_test && make
+
+## Packaging and API
+
+The libutp API is considered unstable, and probably always will be. We encourage
+you to test with the version of libutp you have, and be mindful when upgrading.
+For this reason, it is probably also a good idea to bundle libutp with your
+application.
+
+## License
+
+libutp is released under the MITlic license.
+
+## Related Work
+
+Research and analysis of congestion control mechanisms can be found here.survey
+
+ledbat: http://datatracker.ietf.org/wg/ledbat/charter/
+bep29: http://www.bittorrent.org/beps/bep_0029.html
+lic: http://www.opensource.org/licenses/mit-license.php
+survey: http://datatracker.ietf.org/doc/draft-ietf-ledbat-survey/

amule-3.1.0.tar.gz/src/extern/libutp/SHA256SUMS Added

@@ -0,0 +1,20 @@
+21e24b056c48cc6b01a0df3bb29849ab55daa7c29fd1f9a96ae2e590f6a17920  CMakeLists.txt
+ad186a9c3191cf9fa8c2a1e007d20db2598f0e3f24ef1bb9d0094d73e7ad692c  config.cmake.in
+95224c7f138330be47feb7bea64f000babe8075befe104d40efe97ad13be6eda  include/libutp/utp_types.h
+a478fb3f8aca16d034d974628d6ade25cd35ce393c54274fa0c17eeb5de8e349  include/libutp/utp.h
+e13accf3ba8e3b4ee145d3abdf435267742e63ba83db99281c63cdb8f8080903  libutp_inet_ntop.cpp
+082c7b08589209d3e4d931c0b1ac17508e5452b2233886852d5664dee95a67bd  libutp_inet_ntop.h
+73b400bf61dde52223dae1642205ca187f1a6b24a508dcce52bf386c27a0e58c  LICENSE
+e5db4eec33a039051f8bbb2f454063196aa8aced60fb745442e5f266d6b5fab0  README.md
+df689078d6ebca8595fc6b78a8668c68c86ed829670214b3071a49f0f804b3e8  utp_api.cpp
+79cb0a661101160ddccfbe7de036881af44849d0a88a0404bc9127e67a53fd98  utp_callbacks.cpp
+89ecb3d13749da3b6bc915a099ce8b86040b947297376444a8c224a3425d694a  utp_callbacks.h
+dbdf30ccc6fbf108cbb1eb1bdadc54b9e8f1fb4c913635aa6d614211e9a7459e  utp_hash.cpp
+07c979b2687c0c09271d232c67e508394b11b49c492e0ff62bf3ea76f8e52b53  utp_hash.h
+42dfc4cf0287dbddb9c5c948d422296deabb97b68569ce52b051436b9afac2c0  utp_internal.cpp
+b62dae87305575ca15d0cb3c260185f960243a38ca941082c596c3a572bd72ed  utp_internal.h
+7b3ac43315fda21bfe6d2c6a64d897ec4324920d7f45089299f992616da6fc39  utp_packedsockaddr.cpp
+2717009e45e78fab225a6510d3e0dc666c14042c0f13b1db75a45bf71911edf7  utp_packedsockaddr.h
+99d3d419ad2bbbe98391885318b256c32ef33fd52fc697edccf52b9fd7b58c1d  utp_templates.h
+3f36ca003fb939afd88b02d326e50c8e047a56b170f0b70aaaebecfc9cb2b108  utp_utils.cpp
+26b8067a8c133472f3f518d907f0733c4dfa488234277efd03e05ea7699efa50  utp_utils.h

amule-3.1.0.tar.gz/src/extern/libutp/config.cmake.in Added

amule-3.1.0.tar.gz/src/extern/libutp/include Added

amule-3.1.0.tar.gz/src/extern/libutp/include/libutp Added

amule-3.1.0.tar.gz/src/extern/libutp/include/libutp/utp.h Added

@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __UTP_H__
+#define __UTP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdarg.h>
+#include "utp_types.h"
+
+typedef struct UTPSocket					utp_socket;
+typedef struct struct_utp_context			utp_context;
+
+enum {
+	UTP_UDP_DONTFRAG = 2	// Used to be a #define as UDP_IP_DONTFRAG
+};
+
+enum {
+	// socket has reveived syn-ack (notification only for outgoing connection completion)
+	// this implies writability
+	UTP_STATE_CONNECT = 1,
+
+	// socket is able to send more data
+	UTP_STATE_WRITABLE = 2,
+
+	// connection closed
+	UTP_STATE_EOF = 3,
+
+	// socket is being destroyed, meaning all data has been sent if possible.
+	// it is not valid to refer to the socket after this state change occurs
+	UTP_STATE_DESTROYING = 4
+};
+
+extern const char *utp_state_names;
+
+// Errors codes that can be passed to UTP_ON_ERROR callback
+enum {
+	UTP_ECONNREFUSED = 0,
+	UTP_ECONNRESET,
+	UTP_ETIMEDOUT
+};
+
+extern const char *utp_error_code_names;
+
+enum {
+	// callback names
+	UTP_ON_FIREWALL = 0,
+	UTP_ON_ACCEPT,
+	UTP_ON_CONNECT,
+	UTP_ON_ERROR,
+	UTP_ON_READ,
+	UTP_ON_OVERHEAD_STATISTICS,
+	UTP_ON_STATE_CHANGE,
+	UTP_GET_READ_BUFFER_SIZE,
+	UTP_ON_DELAY_SAMPLE,
+	UTP_GET_UDP_MTU,
+	UTP_GET_UDP_OVERHEAD,
+	UTP_GET_MILLISECONDS,
+	UTP_GET_MICROSECONDS,
+	UTP_GET_RANDOM,
+	UTP_LOG,
+	UTP_SENDTO,
+
+	// context and socket options that may be set/queried
+    UTP_LOG_NORMAL,
+    UTP_LOG_MTU,
+    UTP_LOG_DEBUG,
+	UTP_SNDBUF,
+	UTP_RCVBUF,
+	UTP_TARGET_DELAY,
+
+	UTP_ARRAY_SIZE	// must be last
+};
+
+extern const char *utp_callback_names;
+
+typedef struct {
+	utp_context *context;
+	utp_socket *socket;
+	size_t len;
+	uint32 flags;
+	int callback_type;
+	const byte *buf;
+
+	union {
+		const struct sockaddr *address;
+		int send;
+		int sample_ms;
+		int error_code;
+		int state;
+	};
+
+	union {
+		socklen_t address_len;
+		int type;
+	};
+} utp_callback_arguments;
+
+typedef uint64 utp_callback_t(utp_callback_arguments *);
+
+// Returned by utp_get_context_stats()
+typedef struct {
+	uint32 _nraw_recv5;	// total packets recieved less than 300/600/1200/MTU bytes fpr all connections (context-wide)
+	uint32 _nraw_send5;	// total packets sent     less than 300/600/1200/MTU bytes for all connections (context-wide)
+} utp_context_stats;
+
+// Returned by utp_get_stats()
+typedef struct {
+	uint64 nbytes_recv;	// total bytes received
+	uint64 nbytes_xmit;	// total bytes transmitted
+	uint32 rexmit;		// retransmit counter
+	uint32 fastrexmit;	// fast retransmit counter
+	uint32 nxmit;		// transmit counter
+	uint32 nrecv;		// receive counter (total)
+	uint32 nduprecv;	// duplicate receive counter
+	uint32 mtu_guess;	// Best guess at MTU
+} utp_socket_stats;
+
+#define UTP_IOV_MAX 1024
+
+// For utp_writev, to writes data from multiple buffers
+struct utp_iovec {
+	void *iov_base;
+	size_t iov_len;
+};
+
+// Public Functions
+utp_context*	utp_init						(int version);
+void			utp_destroy						(utp_context *ctx);
+void			utp_set_callback				(utp_context *ctx, int callback_name, utp_callback_t *proc);
+void*			utp_context_set_userdata		(utp_context *ctx, void *userdata);
+void*			utp_context_get_userdata		(utp_context *ctx);
+int				utp_context_set_option			(utp_context *ctx, int opt, int val);
+int				utp_context_get_option			(utp_context *ctx, int opt);
+int				utp_process_udp					(utp_context *ctx, const byte *buf, size_t len, const struct sockaddr *to, socklen_t tolen);
+int				utp_process_icmp_error			(utp_context *ctx, const byte *buffer, size_t len, const struct sockaddr *to, socklen_t tolen);
+int				utp_process_icmp_fragmentation	(utp_context *ctx, const byte *buffer, size_t len, const struct sockaddr *to, socklen_t tolen, uint16 next_hop_mtu);
+void			utp_check_timeouts				(utp_context *ctx);
+void			utp_issue_deferred_acks			(utp_context *ctx);
+utp_context_stats* utp_get_context_stats		(utp_context *ctx);
+utp_socket*		utp_create_socket				(utp_context *ctx);
+void*			utp_set_userdata				(utp_socket *s, void *userdata);
+void*			utp_get_userdata				(utp_socket *s);
+int				utp_setsockopt					(utp_socket *s, int opt, int val);
+int				utp_getsockopt					(utp_socket *s, int opt);
+int				utp_connect						(utp_socket *s, const struct sockaddr *to, socklen_t tolen);
+ssize_t			utp_write						(utp_socket *s, void *buf, size_t count);
+ssize_t			utp_writev						(utp_socket *s, struct utp_iovec *iovec, size_t num_iovecs);
+int				utp_getpeername					(utp_socket *s, struct sockaddr *addr, socklen_t *addrlen);
+void			utp_read_drained				(utp_socket *s);
+int				utp_get_delays					(utp_socket *s, uint32 *ours, uint32 *theirs, uint32 *age);
+utp_socket_stats* utp_get_stats					(utp_socket *s);
+utp_context*	utp_get_context					(utp_socket *s);
+void			utp_close						(utp_socket *s);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //__UTP_H__

amule-3.1.0.tar.gz/src/extern/libutp/include/libutp/utp_types.h Added

@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __UTP_TYPES_H__
+#define __UTP_TYPES_H__
+
+#include <inttypes.h>
+
+// Allow libutp consumers or prerequisites to override PACKED_ATTRIBUTE
+#ifndef PACKED_ATTRIBUTE
+#if defined BROKEN_GCC_STRUCTURE_PACKING && defined __GNUC__
+	// Used for gcc tool chains accepting but not supporting pragma pack
+	// See http://gcc.gnu.org/onlinedocs/gcc/Type-Attributes.html
+	#define PACKED_ATTRIBUTE __attribute__((__packed__))
+#else
+	#define PACKED_ATTRIBUTE
+#endif // defined BROKEN_GCC_STRUCTURE_PACKING && defined __GNUC__
+#endif // ndef PACKED_ATTRIBUTE
+
+#ifdef __GNUC__
+	#define ALIGNED_ATTRIBUTE(x)  __attribute__((aligned (x)))
+#else
+	#define ALIGNED_ATTRIBUTE(x)
+#endif
+
+// hash.cpp needs socket definitions, which is why this networking specific
+// code is inclued in utypes.h
+#ifdef WIN32
+	#undef _CRT_SECURE_NO_DEPRECATE
+	#define _CRT_SECURE_NO_DEPRECATE
+	#undef WIN32_LEAN_AND_MEAN
+	#define WIN32_LEAN_AND_MEAN
+	#include <windows.h>
+	#include <winsock2.h>
+	#include <ws2tcpip.h>
+	#define IP_OPT_DONTFRAG IP_DONTFRAGMENT
+#else
+	#include <netinet/in.h>
+	#include <arpa/inet.h>
+	#include <unistd.h>
+	#include <sys/socket.h>
+
+	#ifdef IP_DONTFRAG
+		#define IP_OPT_DONTFRAG IP_DONTFRAG
+	#elif defined IP_DONTFRAGMENT
+		#define IP_OPT_DONTFRAG IP_DONTFRAGMENT
+	#else
+		//#warning "I don't know how to set DF bit on this system"
+	#endif
+#endif
+
+#ifdef _MSC_VER
+	#include <BaseTsd.h>
+	typedef SSIZE_T ssize_t;
+#endif
+
+#ifdef POSIX
+	typedef struct sockaddr_storage SOCKADDR_STORAGE;
+#endif
+
+#ifdef WIN32
+	#define I64u "%I64u"
+#else
+	#define I64u "%Lu"
+#endif
+
+// standard types
+typedef unsigned char byte;
+typedef unsigned char uint8;
+typedef signed char int8;
+typedef unsigned short uint16;
+typedef signed short int16;
+typedef unsigned int uint;
+typedef unsigned int uint32;
+typedef signed int int32;
+
+typedef uint64_t uint64;
+typedef int64_t int64;
+
+/* compile-time assert */
+#ifndef CASSERT
+#define CASSERT( exp, name ) typedef int is_not_##name  (exp ) ? 1 : -1 ;
+#endif
+
+CASSERT(8 == sizeof(uint64), sizeof_uint64_is_8)
+CASSERT(8 == sizeof(int64), sizeof_int64_is_8)
+
+// always ANSI
+typedef const char * cstr;
+typedef char * str;
+
+#ifndef __cplusplus
+typedef uint8 bool;
+#endif
+
+#endif //__UTP_TYPES_H__

amule-3.1.0.tar.gz/src/extern/libutp/libutp_inet_ntop.cpp Added

@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include "libutp_inet_ntop.h"
+
+
+//######################################################################
+const char *libutp::inet_ntop(int af, const void *src, char *dest, size_t length)
+{
+	if (af != AF_INET && af != AF_INET6)
+	{
+		return NULL;
+	}
+
+	SOCKADDR_STORAGE address;
+	DWORD address_length;
+
+	if (af == AF_INET)
+	{
+		address_length = sizeof(sockaddr_in);
+		sockaddr_in* ipv4_address = (sockaddr_in*)(&address);
+		ipv4_address->sin_family = AF_INET;
+		ipv4_address->sin_port = 0;
+		memcpy(&ipv4_address->sin_addr, src, sizeof(in_addr));
+	}
+	else // AF_INET6
+	{
+		address_length = sizeof(sockaddr_in6);
+		sockaddr_in6* ipv6_address = (sockaddr_in6*)(&address);
+		ipv6_address->sin6_family = AF_INET6;
+		ipv6_address->sin6_port = 0;
+		ipv6_address->sin6_flowinfo = 0;
+		// hmmm
+		ipv6_address->sin6_scope_id = 0;
+		memcpy(&ipv6_address->sin6_addr, src, sizeof(in6_addr));
+	}
+
+	DWORD string_length = (DWORD)(length);
+	int result;
+	result = WSAAddressToStringA((sockaddr*)(&address),
+								 address_length, 0, dest,
+								 &string_length);
+
+	// one common reason for this to fail is that ipv6 is not installed
+
+	return result == SOCKET_ERROR ? NULL : dest;
+}
+
+//######################################################################
+int libutp::inet_pton(int af, const char* src, void* dest)
+{
+	if (af != AF_INET && af != AF_INET6)
+	{
+		return -1;
+	}
+
+	SOCKADDR_STORAGE address;
+	int address_length = sizeof(SOCKADDR_STORAGE);
+	int result = WSAStringToAddressA((char*)(src), af, 0,
+									 (sockaddr*)(&address),
+									 &address_length);
+
+	if (af == AF_INET)
+	{
+		if (result != SOCKET_ERROR)
+		{
+			sockaddr_in* ipv4_address =(sockaddr_in*)(&address);
+			memcpy(dest, &ipv4_address->sin_addr, sizeof(in_addr));
+		}
+		else if (strcmp(src, "255.255.255.255") == 0)
+		{
+			((in_addr*)(dest))->s_addr = INADDR_NONE;
+		}
+	}
+	else // AF_INET6
+	{
+		if (result != SOCKET_ERROR)
+		{
+			sockaddr_in6* ipv6_address = (sockaddr_in6*)(&address);
+			memcpy(dest, &ipv6_address->sin6_addr, sizeof(in6_addr));
+		}
+	}
+
+	return result == SOCKET_ERROR ? -1 : 1;
+}

amule-3.1.0.tar.gz/src/extern/libutp/libutp_inet_ntop.h Added

@@ -0,0 +1,68 @@
+#ifndef LIBUTP_INET_NTOP_H
+#define LIBUTP_INET_NTOP_H
+
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// About us linking the system inet_pton and inet_ntop symbols:
+// 1) These symbols are usually defined on POSIX systems
+// 2) They are not defined on Windows versions earlier than Vista
+// Defined in:
+// ut_utils/src/sockaddr.cpp
+// libutp/win32_inet_ntop.obj
+// 
+// When we drop support for XP we can just #include <ws2tcpip.h>, and use the system functions
+// For now, we will always use our functions on windows, on all builds
+// The reason is: we would like the debug build to behave as much as the release build as possible
+// It is much better to catch a problem in the debug build, than to link the system version
+// in debug, and our version int he wild.
+
+#if defined(_WIN32_WINNT)
+#if _WIN32_WINNT >= 0x600 // Win32, post-XP
+#include <ws2tcpip.h> // for inet_ntop, inet_pton
+#define INET_NTOP inet_ntop
+#define INET_PTON inet_pton
+#else
+#define INET_NTOP libutp::inet_ntop // Win32, pre-XP: Use ours
+#define INET_PTON libutp::inet_pton
+#endif
+#else // not WIN32
+#include <arpa/inet.h> // for inet_ntop, inet_pton
+#define INET_NTOP inet_ntop
+#define INET_PTON inet_pton
+#endif
+
+//######################################################################
+//######################################################################
+namespace libutp {
+
+
+//######################################################################
+const char *inet_ntop(int af, const void *src, char *dest, size_t length);
+
+//######################################################################
+int inet_pton(int af, const char* src, void* dest);
+
+
+} //namespace libutp
+
+#endif // LIBUTP_INET_NTOP_H

amule-3.1.0.tar.gz/src/extern/libutp/utp_api.cpp Added

@@ -0,0 +1,135 @@
+// vim:set ts=4 sw=4 ai:
+
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include "utp_internal.h"
+#include "utp_utils.h"
+
+extern "C" {
+
+const char * utp_callback_names = {
+	"UTP_ON_FIREWALL",
+	"UTP_ON_ACCEPT",
+	"UTP_ON_CONNECT",
+	"UTP_ON_ERROR",
+	"UTP_ON_READ",
+	"UTP_ON_OVERHEAD_STATISTICS",
+	"UTP_ON_STATE_CHANGE",
+	"UTP_GET_READ_BUFFER_SIZE",
+	"UTP_ON_DELAY_SAMPLE",
+	"UTP_GET_UDP_MTU",
+	"UTP_GET_UDP_OVERHEAD",
+	"UTP_GET_MILLISECONDS",
+	"UTP_GET_MICROSECONDS",
+	"UTP_GET_RANDOM",
+	"UTP_LOG",
+	"UTP_SENDTO",
+};
+
+const char * utp_error_code_names = {
+	"UTP_ECONNREFUSED",
+	"UTP_ECONNRESET",
+	"UTP_ETIMEDOUT",
+};
+
+const char *utp_state_names = {
+	NULL,
+	"UTP_STATE_CONNECT",
+	"UTP_STATE_WRITABLE",
+	"UTP_STATE_EOF",
+	"UTP_STATE_DESTROYING",
+};
+
+struct_utp_context::struct_utp_context()
+	: userdata(NULL)
+	, current_ms(0)
+	, last_utp_socket(NULL)
+	, log_normal(false)
+	, log_mtu(false)
+	, log_debug(false)
+{
+	memset(&context_stats, 0, sizeof(context_stats));
+	memset(callbacks, 0, sizeof(callbacks));
+	target_delay = CCONTROL_TARGET;
+
+	callbacksUTP_GET_UDP_MTU      = &utp_default_get_udp_mtu;
+	callbacksUTP_GET_UDP_OVERHEAD = &utp_default_get_udp_overhead;
+	callbacksUTP_GET_MILLISECONDS = &utp_default_get_milliseconds;
+	callbacksUTP_GET_MICROSECONDS = &utp_default_get_microseconds;
+	callbacksUTP_GET_RANDOM       = &utp_default_get_random;
+
+	// 1 MB of receive buffer (i.e. max bandwidth delay product)
+	// means that from  a peer with 200 ms RTT, we cannot receive
+	// faster than 5 MB/s
+	// from a peer with 10 ms RTT, we cannot receive faster than
+	// 100 MB/s. This is assumed to be good enough, since bandwidth
+	// often is proportional to RTT anyway
+	// when setting a download rate limit, all sockets should have
+	// their receive buffer set much lower, to say 60 kiB or so
+	opt_rcvbuf = opt_sndbuf = 1024 * 1024;
+	last_check = 0;
+}
+
+utp_context* utp_init (int version)
+{
+	assert(version == 2);
+	if (version != 2)
+		return NULL;
+	utp_context *ctx = new utp_context;
+	return ctx;
+}
+
+void utp_destroy(utp_context *ctx) {
+	assert(ctx);
+	if (ctx) delete ctx;
+}
+
+void utp_set_callback(utp_context *ctx, int callback_name, utp_callback_t *proc) {
+	assert(ctx);
+	if (ctx) ctx->callbackscallback_name = proc;
+}
+
+void* utp_context_set_userdata(utp_context *ctx, void *userdata) {
+	assert(ctx);
+	if (ctx) ctx->userdata = userdata;
+	return ctx ? ctx->userdata : NULL;
+}
+
+void* utp_context_get_userdata(utp_context *ctx) {
+	assert(ctx);
+	return ctx ? ctx->userdata : NULL;
+}
+
+utp_context_stats* utp_get_context_stats(utp_context *ctx) {
+	assert(ctx);
+	return ctx ? &ctx->context_stats : NULL;
+}
+
+ssize_t utp_write(utp_socket *socket, void *buf, size_t len) {
+	struct utp_iovec iovec = { buf, len };
+	return utp_writev(socket, &iovec, 1);
+}
+
+}

amule-3.1.0.tar.gz/src/extern/libutp/utp_callbacks.cpp Added

@@ -0,0 +1,208 @@
+// vim:set ts=4 sw=4 ai:
+
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "utp_callbacks.h"
+
+int utp_call_on_firewall(utp_context *ctx, const struct sockaddr *address, socklen_t address_len)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_ON_FIREWALL) return 0;
+	args.callback_type = UTP_ON_FIREWALL;
+	args.context = ctx;
+	args.socket = NULL;
+	args.address = address;
+	args.address_len = address_len;
+	return (int)ctx->callbacksUTP_ON_FIREWALL(&args);
+}
+
+void utp_call_on_accept(utp_context *ctx, utp_socket *socket, const struct sockaddr *address, socklen_t address_len)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_ON_ACCEPT) return;
+	args.callback_type = UTP_ON_ACCEPT;
+	args.context = ctx;
+	args.socket = socket;
+	args.address = address;
+	args.address_len = address_len;
+	ctx->callbacksUTP_ON_ACCEPT(&args);
+}
+
+void utp_call_on_connect(utp_context *ctx, utp_socket *socket)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_ON_CONNECT) return;
+	args.callback_type = UTP_ON_CONNECT;
+	args.context = ctx;
+	args.socket = socket;
+	ctx->callbacksUTP_ON_CONNECT(&args);
+}
+
+void utp_call_on_error(utp_context *ctx, utp_socket *socket, int error_code)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_ON_ERROR) return;
+	args.callback_type = UTP_ON_ERROR;
+	args.context = ctx;
+	args.socket = socket;
+	args.error_code = error_code;
+	ctx->callbacksUTP_ON_ERROR(&args);
+}
+
+void utp_call_on_read(utp_context *ctx, utp_socket *socket, const byte *buf, size_t len)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_ON_READ) return;
+	args.callback_type = UTP_ON_READ;
+	args.context = ctx;
+	args.socket = socket;
+	args.buf = buf;
+	args.len = len;
+	ctx->callbacksUTP_ON_READ(&args);
+}
+
+void utp_call_on_overhead_statistics(utp_context *ctx, utp_socket *socket, int send, size_t len, int type)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_ON_OVERHEAD_STATISTICS) return;
+	args.callback_type = UTP_ON_OVERHEAD_STATISTICS;
+	args.context = ctx;
+	args.socket = socket;
+	args.send = send;
+	args.len = len;
+	args.type = type;
+	ctx->callbacksUTP_ON_OVERHEAD_STATISTICS(&args);
+}
+
+void utp_call_on_delay_sample(utp_context *ctx, utp_socket *socket, int sample_ms)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_ON_DELAY_SAMPLE) return;
+	args.callback_type = UTP_ON_DELAY_SAMPLE;
+	args.context = ctx;
+	args.socket = socket;
+	args.sample_ms = sample_ms;
+	ctx->callbacksUTP_ON_DELAY_SAMPLE(&args);
+}
+
+void utp_call_on_state_change(utp_context *ctx, utp_socket *socket, int state)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_ON_STATE_CHANGE) return;
+	args.callback_type = UTP_ON_STATE_CHANGE;
+	args.context = ctx;
+	args.socket = socket;
+	args.state = state;
+	ctx->callbacksUTP_ON_STATE_CHANGE(&args);
+}
+
+uint16 utp_call_get_udp_mtu(utp_context *ctx, utp_socket *socket, const struct sockaddr *address, socklen_t address_len)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_GET_UDP_MTU) return 0;
+	args.callback_type = UTP_GET_UDP_MTU;
+	args.context = ctx;
+	args.socket = socket;
+	args.address = address;
+	args.address_len = address_len;
+	return (uint16)ctx->callbacksUTP_GET_UDP_MTU(&args);
+}
+
+uint16 utp_call_get_udp_overhead(utp_context *ctx, utp_socket *socket, const struct sockaddr *address, socklen_t address_len)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_GET_UDP_OVERHEAD) return 0;
+	args.callback_type = UTP_GET_UDP_OVERHEAD;
+	args.context = ctx;
+	args.socket = socket;
+	args.address = address;
+	args.address_len = address_len;
+	return (uint16)ctx->callbacksUTP_GET_UDP_OVERHEAD(&args);
+}
+
+uint64 utp_call_get_milliseconds(utp_context *ctx, utp_socket *socket)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_GET_MILLISECONDS) return 0;
+	args.callback_type = UTP_GET_MILLISECONDS;
+	args.context = ctx;
+	args.socket = socket;
+	return ctx->callbacksUTP_GET_MILLISECONDS(&args);
+}
+
+uint64 utp_call_get_microseconds(utp_context *ctx, utp_socket *socket)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_GET_MICROSECONDS) return 0;
+	args.callback_type = UTP_GET_MICROSECONDS;
+	args.context = ctx;
+	args.socket = socket;
+	return ctx->callbacksUTP_GET_MICROSECONDS(&args);
+}
+
+uint32 utp_call_get_random(utp_context *ctx, utp_socket *socket)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_GET_RANDOM) return 0;
+	args.callback_type = UTP_GET_RANDOM;
+	args.context = ctx;
+	args.socket = socket;
+	return (uint32)ctx->callbacksUTP_GET_RANDOM(&args);
+}
+
+size_t utp_call_get_read_buffer_size(utp_context *ctx, utp_socket *socket)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_GET_READ_BUFFER_SIZE) return 0;
+	args.callback_type = UTP_GET_READ_BUFFER_SIZE;
+	args.context = ctx;
+	args.socket = socket;
+	return (size_t)ctx->callbacksUTP_GET_READ_BUFFER_SIZE(&args);
+}
+
+void utp_call_log(utp_context *ctx, utp_socket *socket, const byte *buf)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_LOG) return;
+	args.callback_type = UTP_LOG;
+	args.context = ctx;
+	args.socket = socket;
+	args.buf = buf;
+	ctx->callbacksUTP_LOG(&args);
+}
+
+void utp_call_sendto(utp_context *ctx, utp_socket *socket, const byte *buf, size_t len, const struct sockaddr *address, socklen_t address_len, uint32 flags)
+{
+	utp_callback_arguments args;
+	if (!ctx->callbacksUTP_SENDTO) return;
+	args.callback_type = UTP_SENDTO;
+	args.context = ctx;
+	args.socket = socket;
+	args.buf = buf;
+	args.len = len;
+	args.address = address;
+	args.address_len = address_len;
+	args.flags = flags;
+	ctx->callbacksUTP_SENDTO(&args);
+}
+

amule-3.1.0.tar.gz/src/extern/libutp/utp_callbacks.h Added

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __UTP_CALLBACKS_H__
+#define __UTP_CALLBACKS_H__
+
+#include "utp.h"
+#include "utp_internal.h"
+
+// Generated by running:  grep ^a-z utp_callbacks.cpp | sed 's/$/;/'
+int utp_call_on_firewall(utp_context *ctx, const struct sockaddr *address, socklen_t address_len);
+void utp_call_on_accept(utp_context *ctx, utp_socket *s, const struct sockaddr *address, socklen_t address_len);
+void utp_call_on_connect(utp_context *ctx, utp_socket *s);
+void utp_call_on_error(utp_context *ctx, utp_socket *s, int error_code);
+void utp_call_on_read(utp_context *ctx, utp_socket *s, const byte *buf, size_t len);
+void utp_call_on_overhead_statistics(utp_context *ctx, utp_socket *s, int send, size_t len, int type);
+void utp_call_on_delay_sample(utp_context *ctx, utp_socket *s, int sample_ms);
+void utp_call_on_state_change(utp_context *ctx, utp_socket *s, int state);
+uint16 utp_call_get_udp_mtu(utp_context *ctx, utp_socket *s, const struct sockaddr *address, socklen_t address_len);
+uint16 utp_call_get_udp_overhead(utp_context *ctx, utp_socket *s, const struct sockaddr *address, socklen_t address_len);
+uint64 utp_call_get_milliseconds(utp_context *ctx, utp_socket *s);
+uint64 utp_call_get_microseconds(utp_context *ctx, utp_socket *s);
+uint32 utp_call_get_random(utp_context *ctx, utp_socket *s);
+size_t utp_call_get_read_buffer_size(utp_context *ctx, utp_socket *s);
+void utp_call_log(utp_context *ctx, utp_socket *s, const byte *buf);
+void utp_call_sendto(utp_context *ctx, utp_socket *s, const byte *buf, size_t len, const struct sockaddr *address, socklen_t address_len, uint32 flags);
+
+#endif // __UTP_CALLBACKS_H__

amule-3.1.0.tar.gz/src/extern/libutp/utp_hash.cpp Added

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "utp_hash.h"
+#include "utp_types.h"
+
+#ifdef STRICT_ALIGN
+inline uint32 Read32(const void *p)
+{
+	uint32 tmp;
+	memcpy(&tmp, p, sizeof tmp);
+	return tmp;
+}
+#else
+inline uint32 Read32(const void *p) { return *(uint32*)p; }
+#endif
+
+uint utp_hash_mem(const void *keyp, size_t keysize)
+{
+	uint hash = 0;
+	uint n = keysize;
+	while (n >= 4) {
+		hash ^= Read32(keyp);
+		keyp = (byte*)keyp + sizeof(uint32);
+		hash = (hash << 13) | (hash >> 19);
+		n -= 4;
+	}
+	while (n != 0) {
+		hash ^= *(byte*)keyp;
+		keyp = (byte*)keyp + sizeof(byte);
+		hash = (hash << 8) | (hash >> 24);
+		n--;
+	}
+	return hash;
+}

amule-3.1.0.tar.gz/src/extern/libutp/utp_hash.h Added

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __UTP_HASH_H__
+#define __UTP_HASH_H__
+
+#include "utp_types.h"
+
+uint utp_hash_mem(const void *keyp, size_t keysize);
+
+#endif //__UTP_HASH_H__

amule-3.1.0.tar.gz/src/extern/libutp/utp_internal.cpp Added

@@ -0,0 +1,3432 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <limits.h> // for UINT_MAX
+#include <time.h>
+
+#include <algorithm>
+#include <limits>
+
+#include "utp_types.h"
+#include "utp_packedsockaddr.h"
+#include "utp_internal.h"
+
+#define	TIMEOUT_CHECK_INTERVAL	500
+
+// number of bytes to increase max window size by, per RTT. This is
+// scaled down linearly proportional to off_target. i.e. if all packets
+// in one window have 0 delay, window size will increase by this number.
+// Typically it's less. TCP increases one MSS per RTT, which is 1500
+#define MAX_CWND_INCREASE_BYTES_PER_RTT 3000
+#define CUR_DELAY_SIZE 3
+// experiments suggest that a clock skew of 10 ms per 325 seconds
+// is not impossible. Reset delay_base every 13 minutes. The clock
+// skew is dealt with by observing the delay base in the other
+// direction, and adjusting our own upwards if the opposite direction
+// delay base keeps going down
+#define DELAY_BASE_HISTORY 13
+#define MAX_WINDOW_DECAY 100 // ms
+
+#define REORDER_BUFFER_SIZE 32
+#define REORDER_BUFFER_MAX_SIZE 1024
+#define OUTGOING_BUFFER_MAX_SIZE 1024
+
+#define PACKET_SIZE 1435
+
+// this is the minimum max_window value. It can never drop below this
+#define MIN_WINDOW_SIZE 10
+
+// if we receive 4 or more duplicate acks, we resend the packet
+// that hasn't been acked yet
+#define DUPLICATE_ACKS_BEFORE_RESEND 3
+
+// Allow a reception window of at least 3 ack_nrs behind seq_nr
+// A non-SYN packet with an ack_nr difference greater than this is
+// considered suspicious and ignored
+#define ACK_NR_ALLOWED_WINDOW DUPLICATE_ACKS_BEFORE_RESEND
+
+#define RST_INFO_TIMEOUT 10000
+#define RST_INFO_LIMIT 1000
+// 29 seconds determined from measuring many home NAT devices
+#define KEEPALIVE_INTERVAL 29000
+
+
+#define SEQ_NR_MASK 0xFFFF
+#define ACK_NR_MASK 0xFFFF
+#define TIMESTAMP_MASK 0xFFFFFFFF
+
+#define DIV_ROUND_UP(num, denom) ((num + denom - 1) / denom)
+
+// The totals are derived from the following data:
+//  45: IPv6 address including embedded IPv4 address
+//  11: Scope Id
+//   2: Brackets around IPv6 address when port is present
+//   6: Port (including colon)
+//   1: Terminating null byte
+char addrbuf65;
+#define addrfmt(x, s) x.fmt(s, sizeof(s))
+
+
+#if (defined(__SVR4) && defined(__sun))
+	#pragma pack(1)
+#else
+	#pragma pack(push,1)
+#endif
+
+
+// these packet sizes are including the uTP header wich
+// is either 20 or 23 bytes depending on version
+#define PACKET_SIZE_EMPTY_BUCKET 0
+#define PACKET_SIZE_EMPTY 23
+#define PACKET_SIZE_SMALL_BUCKET 1
+#define PACKET_SIZE_SMALL 373
+#define PACKET_SIZE_MID_BUCKET 2
+#define PACKET_SIZE_MID 723
+#define PACKET_SIZE_BIG_BUCKET 3
+#define PACKET_SIZE_BIG 1400
+#define PACKET_SIZE_HUGE_BUCKET 4
+
+struct PACKED_ATTRIBUTE PacketFormatV1 {
+	// packet_type (4 high bits)
+	// protocol version (4 low bits)
+	byte ver_type;
+	byte version() const { return ver_type & 0xf; }
+	byte type() const { return ver_type >> 4; }
+	void set_version_and_type(byte v, byte t) { ver_type = (v & 0xf) | (t << 4); }
+	void set_version(byte v) { ver_type = (ver_type & 0xf0) | (v & 0xf); }
+	void set_type(byte t) { ver_type = (ver_type & 0xf) | (t << 4); }
+
+	// Type of the first extension header
+	byte ext;
+	// connection ID
+	uint16_big connid;
+	uint32_big tv_usec;
+	uint32_big reply_micro;
+	// receive window size in bytes
+	uint32_big windowsize;
+	// Sequence number
+	uint16_big seq_nr;
+	// Acknowledgment number
+	uint16_big ack_nr;
+};
+
+struct PACKED_ATTRIBUTE PacketFormatAckV1 {
+	PacketFormatV1 pf;
+	byte ext_next;
+	byte ext_len;
+	byte acks4;
+};
+
+#if (defined(__SVR4) && defined(__sun))
+	#pragma pack(0)
+#else
+	#pragma pack(pop)
+#endif
+
+enum {
+	ST_DATA = 0,		// Data packet.
+	ST_FIN = 1,			// Finalize the connection. This is the last packet.
+	ST_STATE = 2,		// State packet. Used to transmit an ACK with no data.
+	ST_RESET = 3,		// Terminate connection forcefully.
+	ST_SYN = 4,			// Connect SYN
+	ST_NUM_STATES		// used for bounds checking
+};
+
+#if UTP_DEBUG_LOGGING
+static const cstr flagnames = {
+	"ST_DATA","ST_FIN","ST_STATE","ST_RESET","ST_SYN"
+};
+#endif
+
+enum CONN_STATE {
+	CS_UNINITIALIZED = 0,
+	CS_IDLE,
+	CS_SYN_SENT,
+	CS_SYN_RECV,
+	CS_CONNECTED,
+	CS_CONNECTED_FULL,
+	CS_GOT_FIN,
+	CS_DESTROY_DELAY,
+	CS_FIN_SENT,
+	CS_RESET,
+	CS_DESTROY
+};
+
+#if UTP_DEBUG_LOGGING
+static const cstr statenames = {
+	"UNINITIALIZED", "IDLE","SYN_SENT", "SYN_RECV", "CONNECTED","CONNECTED_FULL","GOT_FIN","DESTROY_DELAY","FIN_SENT","RESET","DESTROY"
+};
+#endif
+
+struct OutgoingPacket {
+	size_t length;
+	size_t payload;
+	uint64 time_sent; // microseconds
+	uint transmissions:31;
+	bool need_resend:1;
+	byte data1;
+};
+
+struct SizableCircularBuffer {
+	// This is the mask. Since it's always a power of 2, adding 1 to this value will return the size.
+	size_t mask;
+	// This is the elements that the circular buffer points to
+	void **elements;
+
+	void *get(size_t i) const { assert(elements); return elements ? elementsi & mask : NULL; }
+	void put(size_t i, void *data) { assert(elements); elementsi&mask = data; }
+
+	void grow(size_t item, size_t index);
+	void ensure_size(size_t item, size_t index) { if (index > mask) grow(item, index); }
+	size_t size() { return mask + 1; }
+};
+
+// Item contains the element we want to make space for
+// index is the index in the list.
+void SizableCircularBuffer::grow(size_t item, size_t index)
+{
+	// Figure out the new size.
+	size_t size = mask + 1;
+	do size *= 2; while (index >= size);
+
+	// Allocate the new buffer
+	void **buf = (void**)calloc(size, sizeof(void*));
+
+	size--;
+
+	// Copy elements from the old buffer to the new buffer
+	for (size_t i = 0; i <= mask; i++) {
+		buf(item - index + i) & size = get(item - index + i);
+	}
+
+	// Swap to the newly allocated buffer
+	mask = size;
+	free(elements);
+	elements = buf;
+}
+
+// compare if lhs is less than rhs, taking wrapping
+// into account. if lhs is close to UINT_MAX and rhs
+// is close to 0, lhs is assumed to have wrapped and
+// considered smaller
+bool wrapping_compare_less(uint32 lhs, uint32 rhs, uint32 mask)
+{
+	// distance walking from lhs to rhs, downwards
+	const uint32 dist_down = (lhs - rhs) & mask;
+	// distance walking from lhs to rhs, upwards
+	const uint32 dist_up = (rhs - lhs) & mask;
+
+	// if the distance walking up is shorter, lhs
+	// is less than rhs. If the distance walking down
+	// is shorter, then rhs is less than lhs
+	return dist_up < dist_down;
+}
+
+struct DelayHist {
+	uint32 delay_base;
+
+	// this is the history of delay samples,
+	// normalized by using the delay_base. These
+	// values are always greater than 0 and measures
+	// the queuing delay in microseconds
+	uint32 cur_delay_histCUR_DELAY_SIZE;
+	size_t cur_delay_idx;
+
+	// this is the history of delay_base. It's
+	// a number that doesn't have an absolute meaning
+	// only relative. It doesn't make sense to initialize
+	// it to anything other than values relative to
+	// what's been seen in the real world.
+	uint32 delay_base_histDELAY_BASE_HISTORY;
+	size_t delay_base_idx;
+	// the time when we last stepped the delay_base_idx
+	uint64 delay_base_time;
+
+	bool delay_base_initialized;
+
+	void clear(uint64 current_ms)
+	{
+		delay_base_initialized = false;
+		delay_base = 0;
+		cur_delay_idx = 0;
+		delay_base_idx = 0;
+		delay_base_time = current_ms;
+		for (size_t i = 0; i < CUR_DELAY_SIZE; i++) {
+			cur_delay_histi = 0;
+		}
+		for (size_t i = 0; i < DELAY_BASE_HISTORY; i++) {
+			delay_base_histi = 0;
+		}
+	}
+
+	void shift(const uint32 offset)
+	{
+		// the offset should never be "negative"
+		// assert(offset < 0x10000000);
+
+		// increase all of our base delays by this amount
+		// this is used to take clock skew into account
+		// by observing the other side's changes in its base_delay
+		for (size_t i = 0; i < DELAY_BASE_HISTORY; i++) {
+			delay_base_histi += offset;
+		}
+		delay_base += offset;
+	}
+
+	void add_sample(const uint32 sample, uint64 current_ms)
+	{
+		// The two clocks (in the two peers) are assumed not to
+		// progress at the exact same rate. They are assumed to be
+		// drifting, which causes the delay samples to contain
+		// a systematic error, either they are under-
+		// estimated or over-estimated. This is why we update the
+		// delay_base every two minutes, to adjust for this.
+
+		// This means the values will keep drifting and eventually wrap.
+		// We can cross the wrapping boundry in two directions, either
+		// going up, crossing the highest value, or going down, crossing 0.
+
+		// if the delay_base is close to the max value and sample actually
+		// wrapped on the other end we would see something like this:
+		// delay_base = 0xffffff00, sample = 0x00000400
+		// sample - delay_base = 0x500 which is the correct difference
+
+		// if the delay_base is instead close to 0, and we got an even lower
+		// sample (that will eventually update the delay_base), we may see
+		// something like this:
+		// delay_base = 0x00000400, sample = 0xffffff00
+		// sample - delay_base = 0xfffffb00
+		// this needs to be interpreted as a negative number and the actual
+		// recorded delay should be 0.
+
+		// It is important that all arithmetic that assume wrapping
+		// is done with unsigned intergers. Signed integers are not guaranteed
+		// to wrap the way unsigned integers do. At least GCC takes advantage
+		// of this relaxed rule and won't necessarily wrap signed ints.
+
+		// remove the clock offset and propagation delay.
+		// delay base is min of the sample and the current
+		// delay base. This min-operation is subject to wrapping
+		// and care needs to be taken to correctly choose the
+		// true minimum.
+
+		// specifically the problem case is when delay_base is very small
+		// and sample is very large (because it wrapped past zero), sample
+		// needs to be considered the smaller
+
+		if (!delay_base_initialized) {
+			// delay_base being 0 suggests that we haven't initialized
+			// it or its history with any real measurements yet. Initialize
+			// everything with this sample.
+			for (size_t i = 0; i < DELAY_BASE_HISTORY; i++) {
+				// if we don't have a value, set it to the current sample
+				delay_base_histi = sample;
+				continue;
+			}
+			delay_base = sample;
+			delay_base_initialized = true;
+		}
+
+		if (wrapping_compare_less(sample, delay_base_histdelay_base_idx, TIMESTAMP_MASK)) {
+			// sample is smaller than the current delay_base_hist entry
+			// update it
+			delay_base_histdelay_base_idx = sample;
+		}
+
+		// is sample lower than delay_base? If so, update delay_base
+		if (wrapping_compare_less(sample, delay_base, TIMESTAMP_MASK)) {
+			// sample is smaller than the current delay_base
+			// update it
+			delay_base = sample;
+		}
+
+		// this operation may wrap, and is supposed to
+		const uint32 delay = sample - delay_base;
+		// sanity check. If this is triggered, something fishy is going on
+		// it means the measured sample was greater than 32 seconds!
+		//assert(delay < 0x2000000);
+
+		cur_delay_histcur_delay_idx = delay;
+		cur_delay_idx = (cur_delay_idx + 1) % CUR_DELAY_SIZE;
+
+		// once every minute
+		if (current_ms - delay_base_time > 60 * 1000) {
+			delay_base_time = current_ms;
+			delay_base_idx = (delay_base_idx + 1) % DELAY_BASE_HISTORY;
+			// clear up the new delay base history spot by initializing
+			// it to the current sample, then update it
+			delay_base_histdelay_base_idx = sample;
+			delay_base = delay_base_hist0;
+			// Assign the lowest delay in the last 2 minutes to delay_base
+			for (size_t i = 0; i < DELAY_BASE_HISTORY; i++) {
+				if (wrapping_compare_less(delay_base_histi, delay_base, TIMESTAMP_MASK))
+					delay_base = delay_base_histi;
+			}
+		}
+	}
+
+	uint32 get_value()
+	{
+		uint32 value = UINT_MAX;
+		for (size_t i = 0; i < CUR_DELAY_SIZE; i++) {
+			value = std::min(cur_delay_histi, value);
+		}
+		// value could be UINT_MAX if we have no samples yet...
+		return value;
+	}
+};
+
+struct UTPSocket {
+	~UTPSocket();
+
+	PackedSockAddr addr;
+	utp_context *ctx;
+
+	int ida; //for ack socket list
+
+	uint16 retransmit_count;
+
+	uint16 reorder_count;
+	byte duplicate_ack;
+
+	// the number of packets in the send queue. Packets that haven't
+	// yet been sent count as well as packets marked as needing resend
+	// the oldest un-acked packet in the send queue is seq_nr - cur_window_packets
+	uint16 cur_window_packets;
+
+	// how much of the window is used, number of bytes in-flight
+	// packets that have not yet been sent do not count, packets
+	// that are marked as needing to be re-sent (due to a timeout)
+	// don't count either
+	size_t cur_window;
+	// maximum window size, in bytes
+	size_t max_window;
+	// UTP_SNDBUF setting, in bytes
+	size_t opt_sndbuf;
+	// UTP_RCVBUF setting, in bytes
+	size_t opt_rcvbuf;
+
+	// this is the target delay, in microseconds
+	// for this socket. defaults to 100000.
+	size_t target_delay;
+
+	// Is a FIN packet in the reassembly buffer?
+	bool got_fin:1;
+	// Timeout procedure
+	bool fast_timeout:1;
+
+	// max receive window for other end, in bytes
+	size_t max_window_user;
+	CONN_STATE state;
+	// TickCount when we last decayed window (wraps)
+	int64 last_rwin_decay;
+
+	// the sequence number of the FIN packet. This field is only set
+	// when we have received a FIN, and the flag field has the FIN flag set.
+	// it is used to know when it is safe to destroy the socket, we must have
+	// received all packets up to this sequence number first.
+	uint16 eof_pkt;
+
+	// All sequence numbers up to including this have been properly received
+	// by us
+	uint16 ack_nr;
+	// This is the sequence number for the next packet to be sent.
+	uint16 seq_nr;
+
+	uint16 timeout_seq_nr;
+
+	// This is the sequence number of the next packet we're allowed to
+	// do a fast resend with. This makes sure we only do a fast-resend
+	// once per packet. We can resend the packet with this sequence number
+	// or any later packet (with a higher sequence number).
+	uint16 fast_resend_seq_nr;
+
+	uint32 reply_micro;
+
+	uint64 last_got_packet;
+	uint64 last_sent_packet;
+	uint64 last_measured_delay;
+
+	// timestamp of the last time the cwnd was full
+	// this is used to prevent the congestion window
+	// from growing when we're not sending at capacity
+	mutable uint64 last_maxed_out_window;
+
+	void *userdata;
+
+	// Round trip time
+	uint rtt;
+	// Round trip time variance
+	uint rtt_var;
+	// Round trip timeout
+	uint rto;
+	DelayHist rtt_hist;
+	uint retransmit_timeout;
+	// The RTO timer will timeout here.
+	uint64 rto_timeout;
+	// When the window size is set to zero, start this timer. It will send a new packet every 30secs.
+	uint64 zerowindow_time;
+
+	uint32 conn_seed;
+	// Connection ID for packets I receive
+	uint32 conn_id_recv;
+	// Connection ID for packets I send
+	uint32 conn_id_send;
+	// Last rcv window we advertised, in bytes
+	size_t last_rcv_win;
+
+	DelayHist our_hist;
+	DelayHist their_hist;
+
+	// extension bytes from SYN packet
+	byte extensions8;
+
+	// MTU Discovery
+	// time when we should restart the MTU discovery
+	uint64 mtu_discover_time;
+	// ceiling and floor of binary search. last is the mtu size
+	// we're currently using
+	uint32 mtu_ceiling, mtu_floor, mtu_last;
+	// we only ever have a single probe in flight at any given time.
+	// this is the sequence number of that probe, and the size of
+	// that packet
+	uint32 mtu_probe_seq, mtu_probe_size;
+
+	// this is the average delay samples, as compared to the initial
+	// sample. It's averaged over 5 seconds
+	int32 average_delay;
+	// this is the sum of all the delay samples
+	// we've made recently. The important distinction
+	// of these samples is that they are all made compared
+	// to the initial sample, this is to deal with
+	// wrapping in a simple way.
+	int64 current_delay_sum;
+	// number of sample ins current_delay_sum
+	int current_delay_samples;
+	// initialized to 0, set to the first raw delay sample
+	// each sample that's added to current_delay_sum
+	// is subtracted from the value first, to make it
+	// a delay relative to this sample
+	uint32 average_delay_base;
+	// the next time we should add an average delay
+	// sample into average_delay_hist
+	uint64 average_sample_time;
+	// the estimated clock drift between our computer
+	// and the endpoint computer. The unit is microseconds
+	// per 5 seconds
+	int32 clock_drift;
+	// just used for logging
+	int32 clock_drift_raw;
+
+	SizableCircularBuffer inbuf, outbuf;
+
+	#ifdef _DEBUG
+	// Public per-socket statistics, returned by utp_get_stats()
+	utp_socket_stats _stats;
+	#endif
+
+	// true if we're in slow-start (exponential growth) phase
+	bool slow_start;
+
+	// the slow-start threshold, in bytes
+	size_t ssthresh;
+
+	void log(int level, char const *fmt, ...)
+	{
+		va_list va;
+		char buf4096, buf24096;
+
+		// don't bother with vsnprintf() etc calls if we're not going to log.
+		if (!ctx->would_log(level)) {
+			return;
+		}
+
+		va_start(va, fmt);
+		vsnprintf(buf, 4096, fmt, va);
+		va_end(va);
+		buf4095 = '\0';
+
+		snprintf(buf2, 4096, "%p %s %06u %s", (void*)this, addrfmt(addr, addrbuf), conn_id_recv, buf);
+		buf24095 = '\0';
+
+		ctx->log_unchecked(this, buf2);
+	}
+
+	void schedule_ack();
+
+	// called every time mtu_floor or mtu_ceiling are adjusted
+	void mtu_search_update();
+	void mtu_reset();
+
+	// Calculates the current receive window
+	size_t get_rcv_window()
+	{
+		// Trim window down according to what's already in buffer.
+		const size_t numbuf = utp_call_get_read_buffer_size(this->ctx, this);
+		assert((int)numbuf >= 0);
+		return opt_rcvbuf > numbuf ? opt_rcvbuf - numbuf : 0;
+	}
+
+	// Test if we're ready to decay max_window
+	// XXX this breaks when spaced by > INT_MAX/2, which is 49
+	// days; the failure mode in that case is we do an extra decay
+	// or fail to do one when we really shouldn't.
+	bool can_decay_win(int64 msec) const
+	{
+                return (msec - last_rwin_decay) >= MAX_WINDOW_DECAY;
+	}
+
+	// If we can, decay max window, returns true if we actually did so
+	void maybe_decay_win(uint64 current_ms)
+	{
+		if (can_decay_win(current_ms)) {
+			// TCP uses 0.5
+			max_window = (size_t)(max_window * .5);
+			last_rwin_decay = current_ms;
+			if (max_window < MIN_WINDOW_SIZE)
+				max_window = MIN_WINDOW_SIZE;
+			slow_start = false;
+			ssthresh = max_window;
+		}
+	}
+
+	size_t get_header_size() const
+	{
+		return sizeof(PacketFormatV1);
+	}
+
+	size_t get_udp_mtu()
+	{
+		socklen_t len;
+		SOCKADDR_STORAGE sa = addr.get_sockaddr_storage(&len);
+		return utp_call_get_udp_mtu(this->ctx, this, (const struct sockaddr *)&sa, len);
+	}
+
+	size_t get_udp_overhead()
+	{
+		socklen_t len;
+		SOCKADDR_STORAGE sa = addr.get_sockaddr_storage(&len);
+		return utp_call_get_udp_overhead(this->ctx, this, (const struct sockaddr *)&sa, len);
+	}
+
+	size_t get_overhead()
+	{
+		return get_udp_overhead() + get_header_size();
+	}
+
+	void send_data(byte* b, size_t length, bandwidth_type_t type, uint32 flags = 0);
+
+	void send_ack(bool synack = false);
+
+	void send_keep_alive();
+
+	static void send_rst(utp_context *ctx,
+						 const PackedSockAddr &addr, uint32 conn_id_send,
+						 uint16 ack_nr, uint16 seq_nr);
+
+	void send_packet(OutgoingPacket *pkt);
+
+	bool is_full(int bytes = -1);
+	bool flush_packets();
+	void write_outgoing_packet(size_t payload, uint flags, struct utp_iovec *iovec, size_t num_iovecs);
+
+	#ifdef _DEBUG
+	void check_invariant();
+	#endif
+
+	void check_timeouts();
+	int ack_packet(uint16 seq);
+	size_t selective_ack_bytes(uint base, const byte* mask, byte len, int64& min_rtt);
+	void selective_ack(uint base, const byte *mask, byte len);
+	void apply_ccontrol(size_t bytes_acked, uint32 actual_delay, int64 min_rtt);
+	size_t get_packet_size() const;
+};
+
+static void removeSocketFromAckList(UTPSocket *conn)
+{
+	const auto ida = conn->ida;
+	if (ida < 0)
+		return;
+
+	auto& acks = conn->ctx->ack_sockets;
+	assert(acksida->ida == ida);
+
+	// fast-remove `conn` from acks by swapping w/last and resizing.
+	// update `ida` index for both swapped sockets.
+	// note the steps need to be safe even when conn == acks.back()
+	std::swap(acksida, acks.back());
+	acksida->ida = ida;
+	acks.resize(acks.size() - 1U);
+	conn->ida = -1;
+}
+
+static void utp_register_sent_packet(utp_context *ctx, size_t length)
+{
+	if (length <= PACKET_SIZE_MID) {
+		if (length <= PACKET_SIZE_EMPTY) {
+			ctx->context_stats._nraw_sendPACKET_SIZE_EMPTY_BUCKET++;
+		} else if (length <= PACKET_SIZE_SMALL) {
+			ctx->context_stats._nraw_sendPACKET_SIZE_SMALL_BUCKET++;
+		} else
+			ctx->context_stats._nraw_sendPACKET_SIZE_MID_BUCKET++;
+	} else {
+		if (length <= PACKET_SIZE_BIG) {
+			ctx->context_stats._nraw_sendPACKET_SIZE_BIG_BUCKET++;
+		} else
+			ctx->context_stats._nraw_sendPACKET_SIZE_HUGE_BUCKET++;
+	}
+}
+
+void send_to_addr(utp_context *ctx, const byte *p, size_t len, const PackedSockAddr &addr, int flags = 0)
+{
+	socklen_t tolen;
+	SOCKADDR_STORAGE to = addr.get_sockaddr_storage(&tolen);
+	utp_register_sent_packet(ctx, len);
+	utp_call_sendto(ctx, NULL, p, len, (const struct sockaddr *)&to, tolen, flags);
+}
+
+void UTPSocket::schedule_ack()
+{
+	if (ida == -1){
+		#if UTP_DEBUG_LOGGING
+		log(UTP_LOG_DEBUG, "schedule_ack");
+		#endif
+		ida = ctx->ack_sockets.size();
+		ctx->ack_sockets.push_back(this);
+	} else {
+		#if UTP_DEBUG_LOGGING
+		log(UTP_LOG_DEBUG, "schedule_ack: already in list");
+		#endif
+	}
+}
+
+void UTPSocket::send_data(byte* b, size_t length, bandwidth_type_t type, uint32 flags)
+{
+	// time stamp this packet with local time, the stamp goes into
+	// the header of every packet at the 8th byte for 8 bytes :
+	// two integers, check packet.h for more
+	uint64 time = utp_call_get_microseconds(ctx, this);
+
+	PacketFormatV1* b1 = (PacketFormatV1*)b;
+	b1->tv_usec = (uint32)time;
+	b1->reply_micro = reply_micro;
+
+	last_sent_packet = ctx->current_ms;
+
+	#ifdef _DEBUG
+	_stats.nbytes_xmit += length;
+	++_stats.nxmit;
+	#endif
+
+	if (ctx->callbacksUTP_ON_OVERHEAD_STATISTICS) {
+		size_t n;
+		if (type == payload_bandwidth) {
+			// if this packet carries payload, just
+			// count the header as overhead
+			type = header_overhead;
+			n = get_overhead();
+		} else {
+			n = length + get_udp_overhead();
+		}
+		utp_call_on_overhead_statistics(ctx, this, true, n, type);
+	}
+#if UTP_DEBUG_LOGGING
+	int flags2 = b1->type();
+	uint16 seq_nr = b1->seq_nr;
+	uint16 ack_nr = b1->ack_nr;
+	log(UTP_LOG_DEBUG, "send %s len:%u id:%u timestamp:" I64u " reply_micro:%u flags:%s seq_nr:%u ack_nr:%u",
+		addrfmt(addr, addrbuf), (uint)length, conn_id_send, time, reply_micro, flagnamesflags2,
+		seq_nr, ack_nr);
+#endif
+	send_to_addr(ctx, b, length, addr, flags);
+	removeSocketFromAckList(this);
+}
+
+void UTPSocket::send_ack(bool synack)
+{
+	(void)synack;
+
+	PacketFormatAckV1 pfa;
+	zeromem(&pfa);
+
+	size_t len;
+	last_rcv_win = get_rcv_window();
+	pfa.pf.set_version_and_type(1, ST_STATE);
+	pfa.pf.ext = 0;
+	pfa.pf.connid = conn_id_send;
+	pfa.pf.ack_nr = ack_nr;
+	pfa.pf.seq_nr = seq_nr;
+	pfa.pf.windowsize = (uint32)last_rcv_win;
+	len = sizeof(PacketFormatV1);
+
+	// we never need to send EACK for connections
+	// that are shutting down
+	if (reorder_count != 0 && state < CS_GOT_FIN) {
+		// if reorder count > 0, send an EACK.
+		// reorder count should always be 0
+		// for synacks, so this should not be
+		// as synack
+		assert(!synack);
+		pfa.pf.ext = 1;
+		pfa.ext_next = 0;
+		pfa.ext_len = 4;
+		uint m = 0;
+
+		// reorder count should only be non-zero
+		// if the packet ack_nr + 1 has not yet
+		// been received
+		assert(inbuf.get(ack_nr + 1) == NULL);
+		size_t window = std::min(size_t{ 14U + 16U }, inbuf.size());
+		// Generate bit mask of segments received.
+		for (size_t i = 0; i < window; i++) {
+			if (inbuf.get(ack_nr + i + 2) != NULL) {
+				m |= 1 << i;
+
+				#if UTP_DEBUG_LOGGING
+				log(UTP_LOG_DEBUG, "EACK packet %u", ack_nr + i + 2);
+				#endif
+			}
+		}
+		pfa.acks0 = (byte)m;
+		pfa.acks1 = (byte)(m >> 8);
+		pfa.acks2 = (byte)(m >> 16);
+		pfa.acks3 = (byte)(m >> 24);
+		len += 4 + 2;
+
+		#if UTP_DEBUG_LOGGING
+		log(UTP_LOG_DEBUG, "Sending EACK %u %u bits:%032b", ack_nr, conn_id_send, m);
+		#endif
+	} else {
+		#if UTP_DEBUG_LOGGING
+		log(UTP_LOG_DEBUG, "Sending ACK %u %u", ack_nr, conn_id_send);
+		#endif
+	}
+
+	send_data((byte*)&pfa, len, ack_overhead);
+	removeSocketFromAckList(this);
+}
+
+void UTPSocket::send_keep_alive()
+{
+	ack_nr--;
+
+	#if UTP_DEBUG_LOGGING
+	log(UTP_LOG_DEBUG, "Sending KeepAlive ACK %u %u", ack_nr, conn_id_send);
+	#endif
+
+	send_ack();
+	ack_nr++;
+}
+
+void UTPSocket::send_rst(utp_context *ctx,
+	const PackedSockAddr &addr, uint32 conn_id_send, uint16 ack_nr, uint16 seq_nr)
+{
+	PacketFormatV1 pf1;
+	zeromem(&pf1);
+
+	size_t len;
+	pf1.set_version_and_type(1, ST_RESET);
+	pf1.ext = 0;
+	pf1.connid = conn_id_send;
+	pf1.ack_nr = ack_nr;
+	pf1.seq_nr = seq_nr;
+	pf1.windowsize = 0;
+	len = sizeof(PacketFormatV1);
+
+//	LOG_DEBUG("%s: Sending RST id:%u seq_nr:%u ack_nr:%u", addrfmt(addr, addrbuf), conn_id_send, seq_nr, ack_nr);
+//	LOG_DEBUG("send %s len:%u id:%u", addrfmt(addr, addrbuf), (uint)len, conn_id_send);
+	send_to_addr(ctx, (const byte*)&pf1, len, addr);
+}
+
+void UTPSocket::send_packet(OutgoingPacket *pkt)
+{
+	// only count against the quota the first time we
+	// send the packet. Don't enforce quota when closing
+	// a socket. Only enforce the quota when we're sending
+	// at slow rates (max window < packet size)
+
+	//size_t max_send = std::min(max_window, opt_sndbuf, max_window_user);
+	time_t cur_time = utp_call_get_milliseconds(this->ctx, this);
+
+	if (pkt->transmissions == 0 || pkt->need_resend) {
+		cur_window += pkt->payload;
+	}
+
+	pkt->need_resend = false;
+
+	PacketFormatV1* p1 = (PacketFormatV1*)pkt->data;
+	p1->ack_nr = ack_nr;
+	pkt->time_sent = utp_call_get_microseconds(this->ctx, this);
+
+	//socklen_t salen;
+	//SOCKADDR_STORAGE sa = addr.get_sockaddr_storage(&salen);
+	bool use_as_mtu_probe = false;
+
+	// TODO: this is subject to nasty wrapping issues! Below as well
+ 	if (mtu_discover_time < (uint64)cur_time) {
+		// it's time to reset our MTU assupmtions
+		// and trigger a new search
+		mtu_reset();
+	}
+
+	// don't use packets that are larger then mtu_ceiling
+	// as probes, since they were probably used as probes
+	// already and failed, now we need it to fragment
+	// just to get it through
+	// if seq_nr == 1, the probe would end up being 0
+	// which is a magic number representing no-probe
+	// that why we don't send a probe for a packet with
+	// sequence number 0
+ 	if (mtu_floor < mtu_ceiling
+		&& pkt->length > mtu_floor
+		&& pkt->length <= mtu_ceiling
+		&& mtu_probe_seq == 0
+		&& seq_nr != 1
+		&& pkt->transmissions == 0) {
+
+		// we've already incremented seq_nr
+		// for this packet
+ 		mtu_probe_seq = (seq_nr - 1) & ACK_NR_MASK;
+ 		mtu_probe_size = pkt->length;
+		assert(pkt->length >= mtu_floor);
+		assert(pkt->length <= mtu_ceiling);
+ 		use_as_mtu_probe = true;
+		log(UTP_LOG_MTU, "MTU PROBE floor:%d ceiling:%d current:%d"
+			, mtu_floor, mtu_ceiling, mtu_probe_size);
+ 	}
+
+	pkt->transmissions++;
+	send_data((byte*)pkt->data, pkt->length,
+		(state == CS_SYN_SENT) ? connect_overhead
+		: (pkt->transmissions == 1) ? payload_bandwidth
+		: retransmit_overhead, use_as_mtu_probe ? UTP_UDP_DONTFRAG : 0);
+}
+
+bool UTPSocket::is_full(int bytes)
+{
+	size_t packet_size = get_packet_size();
+	if (bytes < 0) bytes = packet_size;
+	else if (bytes > (int)packet_size) bytes = (int)packet_size;
+	size_t max_send = std::min({ max_window, opt_sndbuf, max_window_user });
+
+	// subtract one to save space for the FIN packet
+	if (cur_window_packets >= OUTGOING_BUFFER_MAX_SIZE - 1) {
+
+		#if UTP_DEBUG_LOGGING
+		log(UTP_LOG_DEBUG, "is_full:false cur_window_packets:%d MAX:%d", cur_window_packets, OUTGOING_BUFFER_MAX_SIZE - 1);
+		#endif
+
+		last_maxed_out_window = ctx->current_ms;
+		return true;
+	}
+
+	#if UTP_DEBUG_LOGGING
+	log(UTP_LOG_DEBUG, "is_full:%s. cur_window:%u pkt:%u max:%u cur_window_packets:%u max_window:%u"
+		, (cur_window + bytes > max_send) ? "true" : "false"
+		, cur_window, bytes, max_send, cur_window_packets
+		, max_window);
+	#endif
+
+	if (cur_window + bytes > max_send) {
+		last_maxed_out_window = ctx->current_ms;
+		return true;
+	}
+	return false;
+}
+
+bool UTPSocket::flush_packets()
+{
+	size_t packet_size = get_packet_size();
+
+	// send packets that are waiting on the pacer to be sent
+	// i has to be an unsigned 16 bit counter to wrap correctly
+	// signed types are not guaranteed to wrap the way you expect
+	for (uint16 i = seq_nr - cur_window_packets; i != seq_nr; ++i) {
+		OutgoingPacket *pkt = (OutgoingPacket*)outbuf.get(i);
+		if (pkt == 0 || (pkt->transmissions > 0 && pkt->need_resend == false)) continue;
+		// have we run out of quota?
+		if (is_full()) return true;
+
+		// Nagle check
+		// don't send the last packet if we have one packet in-flight
+		// and the current packet is still smaller than packet_size.
+		if (i != ((seq_nr - 1) & ACK_NR_MASK) ||
+			cur_window_packets == 1 ||
+			pkt->payload >= packet_size) {
+			send_packet(pkt);
+		}
+	}
+	return false;
+}
+
+// @payload: number of bytes to send
+// @flags: either ST_DATA, or ST_FIN
+// @iovec: base address of iovec array
+// @num_iovecs: number of iovecs in array
+void UTPSocket::write_outgoing_packet(size_t payload, uint flags, struct utp_iovec *iovec, size_t num_iovecs)
+{
+	// Setup initial timeout timer
+	if (cur_window_packets == 0) {
+		retransmit_timeout = rto;
+		rto_timeout = ctx->current_ms + retransmit_timeout;
+		assert(cur_window == 0);
+	}
+
+	size_t packet_size = get_packet_size();
+	do {
+		assert(cur_window_packets < OUTGOING_BUFFER_MAX_SIZE);
+		assert(flags == ST_DATA || flags == ST_FIN);
+
+		size_t added = 0;
+
+		OutgoingPacket *pkt = NULL;
+
+		if (cur_window_packets > 0) {
+			pkt = (OutgoingPacket*)outbuf.get(seq_nr - 1);
+		}
+
+		const size_t header_size = get_header_size();
+		bool append = true;
+
+		// if there's any room left in the last packet in the window
+		// and it hasn't been sent yet, fill that frame first
+		if (payload && pkt && !pkt->transmissions && pkt->payload < packet_size) {
+			// Use the previous unsent packet
+			added = std::min(payload + pkt->payload, std::max(packet_size, pkt->payload)) - pkt->payload;
+			pkt = (OutgoingPacket*)realloc(pkt,
+										   (sizeof(OutgoingPacket) - 1) +
+										   header_size +
+										   pkt->payload + added);
+			outbuf.put(seq_nr - 1, pkt);
+			append = false;
+			assert(!pkt->need_resend);
+		} else {
+			// Create the packet to send.
+			added = payload;
+			pkt = (OutgoingPacket*)malloc((sizeof(OutgoingPacket) - 1) +
+										  header_size +
+										  added);
+			pkt->payload = 0;
+			pkt->transmissions = 0;
+			pkt->need_resend = false;
+		}
+
+		if (added) {
+			assert(flags == ST_DATA);
+
+			// Fill it with data from the upper layer.
+			unsigned char *p = pkt->data + header_size + pkt->payload;
+			size_t needed = added;
+
+			/*
+			while (needed) {
+				*p = *(char*)iovec0.iov_base;
+				p++;
+				iovec0.iov_base = (char *)iovec0.iov_base + 1;
+				needed--;
+			}
+			*/
+
+			for (size_t i = 0; i < num_iovecs && needed; i++) {
+				if (ioveci.iov_len == 0)
+					continue;
+
+				size_t num = std::min(needed, ioveci.iov_len);
+				memcpy(p, ioveci.iov_base, num);
+
+				p += num;
+
+				ioveci.iov_len -= num;
+				ioveci.iov_base = (byte*)ioveci.iov_base + num;	// ioveci.iov_base += num, but without void* pointers
+				needed -= num;
+			}
+
+			assert(needed == 0);
+		}
+		pkt->payload += added;
+		pkt->length = header_size + pkt->payload;
+		last_rcv_win = get_rcv_window();
+
+		PacketFormatV1* p1 = (PacketFormatV1*)pkt->data;
+		p1->set_version_and_type(1, flags);
+		p1->ext = 0;
+		p1->connid = conn_id_send;
+		p1->windowsize = (uint32)last_rcv_win;
+		p1->ack_nr = ack_nr;
+
+		if (append) {
+			// Remember the message in the outgoing queue.
+			outbuf.ensure_size(seq_nr, cur_window_packets);
+			outbuf.put(seq_nr, pkt);
+			p1->seq_nr = seq_nr;
+			seq_nr++;
+			cur_window_packets++;
+		}
+
+		payload -= added;
+
+	} while (payload);
+
+	flush_packets();
+}
+
+#ifdef _DEBUG
+void UTPSocket::check_invariant()
+{
+	if (reorder_count > 0) {
+		assert(inbuf.get(ack_nr + 1) == NULL);
+	}
+
+	size_t outstanding_bytes = 0;
+	for (int i = 0; i < cur_window_packets; ++i) {
+		OutgoingPacket *pkt = (OutgoingPacket*)outbuf.get(seq_nr - i - 1);
+		if (pkt == 0 || pkt->transmissions == 0 || pkt->need_resend) continue;
+		outstanding_bytes += pkt->payload;
+	}
+	assert(outstanding_bytes == cur_window);
+}
+#endif
+
+void UTPSocket::check_timeouts()
+{
+	#ifdef _DEBUG
+	check_invariant();
+	#endif
+
+	// this invariant should always be true
+	assert(cur_window_packets == 0 || outbuf.get(seq_nr - cur_window_packets));
+
+	#if UTP_DEBUG_LOGGING
+	log(UTP_LOG_DEBUG, "CheckTimeouts timeout:%d max_window:%u cur_window:%u "
+			 "state:%s cur_window_packets:%u",
+			 (int)(rto_timeout - ctx->current_ms), (uint)max_window, (uint)cur_window,
+			 statenamesstate, cur_window_packets);
+	#endif
+
+	if (state != CS_DESTROY) flush_packets();
+
+	switch (state) {
+	case CS_SYN_SENT:
+	case CS_SYN_RECV:
+	case CS_CONNECTED_FULL:
+	case CS_CONNECTED:
+	case CS_FIN_SENT: {
+
+		// Reset max window...
+		if ((int)(ctx->current_ms - zerowindow_time) >= 0 && max_window_user == 0) {
+			max_window_user = PACKET_SIZE;
+		}
+
+		if ((int)(ctx->current_ms - rto_timeout) >= 0
+			&& rto_timeout > 0) {
+
+			bool ignore_loss = false;
+
+			if (cur_window_packets == 1
+				&& ((seq_nr - 1u) & ACK_NR_MASK) == mtu_probe_seq
+				&& mtu_probe_seq != 0) {
+				// we only had  a single outstanding packet that timed out, and it was the probe
+				mtu_ceiling = mtu_probe_size - 1;
+				mtu_search_update();
+				// this packet was most likely dropped because the packet size being
+				// too big and not because congestion. To accelerate the binary search for
+				// the MTU, resend immediately and don't reset the window size
+				ignore_loss = true;
+				log(UTP_LOG_MTU, "MTU PROBE-TIMEOUT floor:%d ceiling:%d current:%d"
+					, mtu_floor, mtu_ceiling, mtu_last);
+			}
+			// we dropepd the probe, clear these fields to
+			// allow us to send a new one
+			mtu_probe_seq = mtu_probe_size = 0;
+			log(UTP_LOG_MTU, "MTU TIMEOUT");
+
+			/*
+			OutgoingPacket *pkt = (OutgoingPacket*)outbuf.get(seq_nr - cur_window_packets);
+
+			// If there were a lot of retransmissions, force recomputation of round trip time
+			if (pkt->transmissions >= 4)
+				rtt = 0;
+			*/
+
+			// Increase RTO
+			const uint new_timeout = ignore_loss ? retransmit_timeout : retransmit_timeout * 2;
+
+			// They initiated the connection but failed to respond before the rto. 
+			// A malicious client can also spoof the destination address of a ST_SYN bringing us to this state.
+			// Kill the connection and do not notify the upper layer
+			if (state == CS_SYN_RECV) {
+				state = CS_DESTROY;
+				utp_call_on_error(ctx, this, UTP_ETIMEDOUT);
+				return;
+			}
+
+			// We initiated the connection but the other side failed to respond before the rto
+			if (retransmit_count >= 4 || (state == CS_SYN_SENT && retransmit_count >= 2)) {
+				// 4 consecutive transmissions have timed out. Kill it. If we
+				// haven't even connected yet, give up after only 2 consecutive
+				// failed transmissions.
+				if (state == CS_FIN_SENT)
+					state = CS_DESTROY;
+				else
+					state = CS_RESET;
+				utp_call_on_error(ctx, this, UTP_ETIMEDOUT);
+				return;
+			}
+
+			retransmit_timeout = new_timeout;
+			rto_timeout = ctx->current_ms + new_timeout;
+
+			if (!ignore_loss) {
+				// On Timeout
+				duplicate_ack = 0;
+
+				int packet_size = get_packet_size();
+
+				if ((cur_window_packets == 0) && ((int)max_window > packet_size)) {
+					// we don't have any packets in-flight, even though
+					// we could. This implies that the connection is just
+					// idling. No need to be aggressive about resetting the
+					// congestion window. Just let it decay by a 3:rd.
+					// don't set it any lower than the packet size though
+					max_window = std::max<size_t>(max_window * 2 / 3, size_t(packet_size));
+				} else {
+					// our delay was so high that our congestion window
+					// was shrunk below one packet, preventing us from
+					// sending anything for one time-out period. Now, reset
+					// the congestion window to fit one packet, to start over
+					// again
+					max_window = packet_size;
+					slow_start = true;
+				}
+			}
+
+			// every packet should be considered lost
+			for (int i = 0; i < cur_window_packets; ++i) {
+				OutgoingPacket *pkt = (OutgoingPacket*)outbuf.get(seq_nr - i - 1);
+				if (pkt == 0 || pkt->transmissions == 0 || pkt->need_resend) continue;
+				pkt->need_resend = true;
+				assert(cur_window >= pkt->payload);
+				cur_window -= pkt->payload;
+			}
+
+			if (cur_window_packets > 0) {
+				retransmit_count++;
+				// used in parse_log.py
+				log(UTP_LOG_NORMAL, "Packet timeout. Resend. seq_nr:%u. timeout:%u "
+					"max_window:%u cur_window_packets:%d"
+					, seq_nr - cur_window_packets, retransmit_timeout
+					, (uint)max_window, int(cur_window_packets));
+
+				fast_timeout = true;
+				timeout_seq_nr = seq_nr;
+
+				OutgoingPacket *pkt = (OutgoingPacket*)outbuf.get(seq_nr - cur_window_packets);
+				assert(pkt);
+
+				// Re-send the packet.
+				send_packet(pkt);
+			}
+		}
+
+		// Mark the socket as writable. If the cwnd has grown, or if the number of
+		// bytes in-flight is lower than cwnd, we need to make the socket writable again
+		// in case it isn't
+		if (state == CS_CONNECTED_FULL && !is_full()) {
+			state = CS_CONNECTED;
+
+			#if UTP_DEBUG_LOGGING
+			log(UTP_LOG_DEBUG, "Socket writable. max_window:%u cur_window:%u packet_size:%u",
+				(uint)max_window, (uint)cur_window, (uint)get_packet_size());
+			#endif
+			utp_call_on_state_change(this->ctx, this, UTP_STATE_WRITABLE);
+		}
+
+		if (state >= CS_CONNECTED && state < CS_GOT_FIN) {
+			if ((int)(ctx->current_ms - last_sent_packet) >= KEEPALIVE_INTERVAL) {
+				send_keep_alive();
+			}
+		}
+		break;
+	}
+
+	// Close?
+	case CS_GOT_FIN:
+	case CS_DESTROY_DELAY:
+		if ((int)(ctx->current_ms - rto_timeout) >= 0) {
+			state = (state == CS_DESTROY_DELAY) ? CS_DESTROY : CS_RESET;
+			if (cur_window_packets > 0) {
+				utp_call_on_error(ctx, this, UTP_ECONNRESET);
+			}
+		}
+		break;
+	// prevent warning
+	case CS_UNINITIALIZED:
+	case CS_IDLE:
+	case CS_RESET:
+	case CS_DESTROY:
+		break;
+	}
+}
+
+// this should be called every time we change mtu_floor or mtu_ceiling
+void UTPSocket::mtu_search_update()
+{
+	assert(mtu_floor <= mtu_ceiling);
+
+	// binary search
+	mtu_last = (mtu_floor + mtu_ceiling) / 2;
+
+	// enable a new probe to be sent
+	mtu_probe_seq = mtu_probe_size = 0;
+
+	// if the floor and ceiling are close enough, consider the
+	// MTU binary search complete. We set the current value
+	// to floor since that's the only size we know can go through
+	// also set the ceiling to floor to terminate the searching
+	if (mtu_ceiling - mtu_floor <= 16) {
+		mtu_last = mtu_floor;
+		log(UTP_LOG_MTU, "MTU DONE floor:%d ceiling:%d current:%d"
+			, mtu_floor, mtu_ceiling, mtu_last);
+		mtu_ceiling = mtu_floor;
+		assert(mtu_floor <= mtu_ceiling);
+		// Do another search in 30 minutes
+		mtu_discover_time = utp_call_get_milliseconds(this->ctx, this) + 30 * 60 * 1000;
+	}
+}
+
+void UTPSocket::mtu_reset()
+{
+	mtu_ceiling = get_udp_mtu();
+	// Less would not pass TCP...
+	mtu_floor = 576;
+	log(UTP_LOG_MTU, "MTU RESET floor:%d ceiling:%d current:%d"
+		, mtu_floor, mtu_ceiling, mtu_last);
+	assert(mtu_floor <= mtu_ceiling);
+	mtu_discover_time = utp_call_get_milliseconds(this->ctx, this) + 30 * 60 * 1000;
+}
+
+// returns:
+// 0: the packet was acked.
+// 1: it means that the packet had already been acked
+// 2: the packet has not been sent yet
+int UTPSocket::ack_packet(uint16 seq)
+{
+	OutgoingPacket *pkt = (OutgoingPacket*)outbuf.get(seq);
+
+	// the packet has already been acked (or not sent)
+	if (pkt == NULL) {
+
+		#if UTP_DEBUG_LOGGING
+		log(UTP_LOG_DEBUG, "got ack for:%u (already acked, or never sent)", seq);
+		#endif
+
+		return 1;
+	}
+
+	// can't ack packets that haven't been sent yet!
+	if (pkt->transmissions == 0) {
+
+		#if UTP_DEBUG_LOGGING
+		log(UTP_LOG_DEBUG, "got ack for:%u (never sent, pkt_size:%u need_resend:%u)",
+			seq, (uint)pkt->payload, pkt->need_resend);
+		#endif
+
+		return 2;
+	}
+
+	#if UTP_DEBUG_LOGGING
+	log(UTP_LOG_DEBUG, "got ack for:%u (pkt_size:%u need_resend:%u)",
+		seq, (uint)pkt->payload, pkt->need_resend);
+	#endif
+
+	outbuf.put(seq, NULL);
+
+	// if we never re-sent the packet, update the RTT estimate
+	if (pkt->transmissions == 1) {
+		// Estimate the round trip time.
+		const uint32 ertt = (uint32)((utp_call_get_microseconds(this->ctx, this) - pkt->time_sent) / 1000);
+		if (rtt == 0) {
+			// First round trip time sample
+			rtt = ertt;
+			rtt_var = ertt / 2;
+			// sanity check. rtt should never be more than 6 seconds
+//			assert(rtt < 6000);
+		} else {
+			// Compute new round trip times
+			const int delta = (int)rtt - ertt;
+			rtt_var = rtt_var + (int)(abs(delta) - rtt_var) / 4;
+			rtt = rtt - rtt/8 + ertt/8;
+			// sanity check. rtt should never be more than 6 seconds
+//			assert(rtt < 6000);
+			rtt_hist.add_sample(ertt, ctx->current_ms);
+		}
+		rto = std::max<uint>(rtt + rtt_var * 4U, 1000U);
+
+		#if UTP_DEBUG_LOGGING
+		log(UTP_LOG_DEBUG, "rtt:%u avg:%u var:%u rto:%u",
+			ertt, rtt, rtt_var, rto);
+		#endif
+
+	}
+	retransmit_timeout = rto;
+	rto_timeout = ctx->current_ms + rto;
+	// if need_resend is set, this packet has already
+	// been considered timed-out, and is not included in
+	// the cur_window anymore
+	if (!pkt->need_resend) {
+		assert(cur_window >= pkt->payload);
+		cur_window -= pkt->payload;
+	}
+	free(pkt);
+	retransmit_count = 0;
+	return 0;
+}
+
+// count the number of bytes that were acked by the EACK header
+size_t UTPSocket::selective_ack_bytes(uint base, const byte* mask, byte len, int64& min_rtt)
+{
+	if (cur_window_packets == 0) return 0;
+
+	size_t acked_bytes = 0;
+	int bits = len * 8;
+	uint64 now = utp_call_get_microseconds(this->ctx, this);
+
+	do {
+		uint v = base + bits;
+
+		// ignore bits that haven't been sent yet
+		// see comment in UTPSocket::selective_ack
+		if (((seq_nr - v - 1) & ACK_NR_MASK) >= (uint16)(cur_window_packets - 1))
+			continue;
+
+		// ignore bits that represents packets we haven't sent yet
+		// or packets that have already been acked
+		OutgoingPacket *pkt = (OutgoingPacket*)outbuf.get(v);
+		if (!pkt || pkt->transmissions == 0)
+			continue;
+
+		// Count the number of segments that were successfully received past it.
+		if (bits >= 0 && maskbits>>3 & (1 << (bits & 7))) {
+			assert((int)(pkt->payload) >= 0);
+			acked_bytes += pkt->payload;
+			if (pkt->time_sent < now)
+				min_rtt = std::min<int64>(min_rtt, now - pkt->time_sent);
+			else
+				min_rtt = std::min<int64>(min_rtt, 50000);
+			continue;
+		}
+	} while (--bits >= -1);
+	return acked_bytes;
+}
+
+enum { MAX_EACK = 128 };
+
+void UTPSocket::selective_ack(uint base, const byte *mask, byte len)
+{
+	if (cur_window_packets == 0) return;
+
+	// the range is inclusive 0, 31 bits
+	int bits = len * 8 - 1;
+
+	int count = 0;
+
+	// resends is a stack of sequence numbers we need to resend. Since we
+	// iterate in reverse over the acked packets, at the end, the top packets
+	// are the ones we want to resend
+	int resendsMAX_EACK;
+	int nr = 0;
+
+#if UTP_DEBUG_LOGGING
+	char bitmask1024 = {0};
+	int counter = bits;
+	for (int i = 0; i <= bits; ++i) {
+		bool bit_set = counter >= 0 && maskcounter>>3 & (1 << (counter & 7));
+		bitmaski = bit_set ? '1' : '0';
+		--counter;
+	}
+
+	log(UTP_LOG_DEBUG, "Got EACK %s base:%u", bitmask, base);
+#endif
+
+	do {
+		// we're iterating over the bits from higher sequence numbers
+		// to lower (kind of in reverse order, wich might not be very
+		// intuitive)
+		uint v = base + bits;
+
+		// ignore bits that haven't been sent yet
+		// and bits that fall below the ACKed sequence number
+		// this can happen if an EACK message gets
+		// reordered and arrives after a packet that ACKs up past
+		// the base for thie EACK message
+
+		// this is essentially the same as:
+		// if v >= seq_nr || v <= seq_nr - cur_window_packets
+		// but it takes wrapping into account
+
+		// if v == seq_nr the -1 will make it wrap. if v > seq_nr
+		// it will also wrap (since it will fall further below 0)
+		// and be > cur_window_packets.
+		// if v == seq_nr - cur_window_packets, the result will be
+		// seq_nr - (seq_nr - cur_window_packets) - 1
+		// == seq_nr - seq_nr + cur_window_packets - 1
+		// == cur_window_packets - 1 which will be caught by the
+		// test. If v < seq_nr - cur_window_packets the result will grow
+		// fall furhter outside of the cur_window_packets range.
+
+		// sequence number space:
+		//
+		//     rejected <   accepted   > rejected
+		// <============+--------------+============>
+		//              ^              ^
+		//              |              |
+		//        (seq_nr-wnd)         seq_nr
+
+		if (((seq_nr - v - 1) & ACK_NR_MASK) >= (uint16)(cur_window_packets - 1))
+			continue;
+
+		// this counts as a duplicate ack, even though we might have
+		// received an ack for this packet previously (in another EACK
+		// message for instance)
+		bool bit_set = bits >= 0 && maskbits>>3 & (1 << (bits & 7));
+
+		// if this packet is acked, it counts towards the duplicate ack counter
+		if (bit_set) count++;
+
+		// ignore bits that represents packets we haven't sent yet
+		// or packets that have already been acked
+		OutgoingPacket *pkt = (OutgoingPacket*)outbuf.get(v);
+		if (!pkt || pkt->transmissions == 0) {
+
+			#if UTP_DEBUG_LOGGING
+			log(UTP_LOG_DEBUG, "skipping %u. pkt:%08x transmissions:%u %s",
+				v, pkt, pkt?pkt->transmissions:0, pkt?"(not sent yet?)":"(already acked?)");
+			#endif
+			continue;
+		}
+
+		// Count the number of segments that were successfully received past it.
+		if (bit_set) {
+			// the selective ack should never ACK the packet we're waiting for to decrement cur_window_packets
+			assert((v & outbuf.mask) != ((seq_nr - cur_window_packets) & outbuf.mask));
+			ack_packet(v);
+			continue;
+		}
+
+		// Resend segments
+		// if count is less than our re-send limit, we haven't seen enough
+		// acked packets in front of this one to warrant a re-send.
+		// if count == 0, we're still going through the tail of zeroes
+		if (((v - fast_resend_seq_nr) & ACK_NR_MASK) <= OUTGOING_BUFFER_MAX_SIZE &&
+			count >= DUPLICATE_ACKS_BEFORE_RESEND) {
+			// resends is a stack, and we're mostly interested in the top of it
+			// if we're full, just throw away the lower half
+			if (nr >= MAX_EACK - 2) {
+				memmove(resends, &resendsMAX_EACK/2, MAX_EACK/2 * sizeof(resends0));
+				nr -= MAX_EACK / 2;
+			}
+			resendsnr++ = v;
+
+			#if UTP_DEBUG_LOGGING
+			log(UTP_LOG_DEBUG, "no ack for %u", v);
+			#endif
+
+		} else {
+
+			#if UTP_DEBUG_LOGGING
+			log(UTP_LOG_DEBUG, "not resending %u count:%d dup_ack:%u fast_resend_seq_nr:%u",
+				v, count, duplicate_ack, fast_resend_seq_nr);
+			#endif
+		}
+	} while (--bits >= -1);
+
+	if (((base - 1 - fast_resend_seq_nr) & ACK_NR_MASK) <= OUTGOING_BUFFER_MAX_SIZE &&
+		count >= DUPLICATE_ACKS_BEFORE_RESEND) {
+		// if we get enough duplicate acks to start
+		// resending, the first packet we should resend
+		// is base-1
+		resendsnr++ = (base - 1) & ACK_NR_MASK;
+
+		#if UTP_DEBUG_LOGGING
+		log(UTP_LOG_DEBUG, "no ack for %u", (base - 1) & ACK_NR_MASK);
+		#endif
+
+	} else {
+		#if UTP_DEBUG_LOGGING
+		log(UTP_LOG_DEBUG, "not resending %u count:%d dup_ack:%u fast_resend_seq_nr:%u",
+			base - 1, count, duplicate_ack, fast_resend_seq_nr);
+		#endif
+	}
+
+	bool back_off = false;
+	int i = 0;
+	while (nr > 0) {
+		uint v = resends--nr;
+		// don't consider the tail of 0:es to be lost packets
+		// only unacked packets with acked packets after should
+		// be considered lost
+		OutgoingPacket *pkt = (OutgoingPacket*)outbuf.get(v);
+
+		// this may be an old (re-ordered) packet, and some of the
+		// packets in here may have been acked already. In which
+		// case they will not be in the send queue anymore
+		if (!pkt) continue;
+
+		// used in parse_log.py
+		log(UTP_LOG_NORMAL, "Packet %u lost. Resending", v);
+
+		// On Loss
+		back_off = true;
+
+		#ifdef _DEBUG
+		++_stats.rexmit;
+		#endif
+
+		send_packet(pkt);
+		fast_resend_seq_nr = (v + 1) & ACK_NR_MASK;
+
+		// Re-send max 4 packets.
+		if (++i >= 4) break;
+	}
+
+	if (back_off)
+		maybe_decay_win(ctx->current_ms);
+
+	duplicate_ack = count;
+}
+
+void UTPSocket::apply_ccontrol(size_t bytes_acked, uint32 actual_delay, int64 min_rtt)
+{
+	// the delay can never be greater than the rtt. The min_rtt
+	// variable is the RTT in microseconds
+
+	assert(min_rtt >= 0);
+	int32 our_delay = std::min<uint32>(our_hist.get_value(), uint32(min_rtt));
+	assert(our_delay != INT_MAX);
+	assert(our_delay >= 0);
+
+	utp_call_on_delay_sample(this->ctx, this, our_delay / 1000);
+
+	// This test the connection under heavy load from foreground
+	// traffic. Pretend that our delays are very high to force the
+	// connection to use sub-packet size window sizes
+	//our_delay *= 4;
+
+	// target is microseconds
+	int target = target_delay;
+	if (target <= 0) target = 100000;
+
+	// this is here to compensate for very large clock drift that affects
+	// the congestion controller into giving certain endpoints an unfair
+	// share of the bandwidth. We have an estimate of the clock drift
+	// (clock_drift). The unit of this is microseconds per 5 seconds.
+	// empirically, a reasonable cut-off appears to be about 200000
+	// (which is pretty high). The main purpose is to compensate for
+	// people trying to "cheat" uTP by making their clock run slower,
+	// and this definitely catches that without any risk of false positives
+	// if clock_drift < -200000 start applying a penalty delay proportional
+	// to how far beoynd -200000 the clock drift is
+	int32 penalty = 0;
+	if (clock_drift < -200000) {
+		penalty = (-clock_drift - 200000) / 7;
+		our_delay += penalty;
+	}
+
+	double off_target = target - our_delay;
+
+	// this is the same as:
+	//
+	//    (std::min(off_target, target) / target) * (bytes_acked / max_window) * MAX_CWND_INCREASE_BYTES_PER_RTT
+	//
+	// so, it's scaling the max increase by the fraction of the window this ack represents, and the fraction
+	// of the target delay the current delay represents.
+	// The std::min() around off_target protects against crazy values of our_delay, which may happen when th
+	// timestamps wraps, or by just having a malicious peer sending garbage. This caps the increase
+	// of the window size to MAX_CWND_INCREASE_BYTES_PER_RTT per rtt.
+	// as for large negative numbers, this direction is already capped at the min packet size further down
+	// the min around the bytes_acked protects against the case where the window size was recently
+	// shrunk and the number of acked bytes exceeds that. This is considered no more than one full
+	// window, in order to keep the gain within sane boundries.
+
+	assert(bytes_acked > 0);
+	double window_factor = std::min<double>(bytes_acked, max_window) / std::max<double>(max_window, bytes_acked);
+
+	double delay_factor = off_target / target;
+	double scaled_gain = MAX_CWND_INCREASE_BYTES_PER_RTT * window_factor * delay_factor;
+
+	// since MAX_CWND_INCREASE_BYTES_PER_RTT is a cap on how much the window size (max_window)
+	// may increase per RTT, we may not increase the window size more than that proportional
+	// to the number of bytes that were acked, so that once one window has been acked (one rtt)
+	// the increase limit is not exceeded
+	// the +1. is to allow for floating point imprecision
+	assert(scaled_gain <= 1. + MAX_CWND_INCREASE_BYTES_PER_RTT * std::min<double>(bytes_acked, max_window) / std::max<double>(max_window, bytes_acked));
+
+	if (scaled_gain > 0 && ctx->current_ms - last_maxed_out_window > 1000) {
+		// if it was more than 1 second since we tried to send a packet
+		// and stopped because we hit the max window, we're most likely rate
+		// limited (which prevents us from ever hitting the window size)
+		// if this is the case, we cannot let the max_window grow indefinitely
+		scaled_gain = 0;
+	}
+
+	size_t ledbat_cwnd = (max_window + scaled_gain < MIN_WINDOW_SIZE) ? MIN_WINDOW_SIZE : (size_t)(max_window + scaled_gain);
+
+	if (slow_start) {
+		size_t ss_cwnd = (size_t)(max_window + window_factor*get_packet_size());
+		if (ss_cwnd > ssthresh) {
+			slow_start = false;
+		} else if (our_delay > target*0.9) {
+			// even if we're a little under the target delay, we conservatively
+			// discontinue the slow start phase
+			slow_start = false;
+			ssthresh = max_window;
+		} else {
+			max_window = std::max(ss_cwnd, ledbat_cwnd);
+		}
+	} else {
+		max_window = ledbat_cwnd;
+	}
+
+
+	// make sure that the congestion window is below max
+	// make sure that we don't shrink our window too small
+	max_window = clamp<size_t>(max_window, MIN_WINDOW_SIZE, opt_sndbuf);
+
+	// used in parse_log.py
+	log(UTP_LOG_NORMAL, "actual_delay:%u our_delay:%d their_delay:%u off_target:%d max_window:%u "
+			"delay_base:%u delay_sum:%d target_delay:%d acked_bytes:%u cur_window:%u "
+			"scaled_gain:%f rtt:%u rate:%u wnduser:%u rto:%u timeout:%d get_microseconds:" I64u " "
+			"cur_window_packets:%u packet_size:%u their_delay_base:%u their_actual_delay:%u "
+			"average_delay:%d clock_drift:%d clock_drift_raw:%d delay_penalty:%d current_delay_sum:" I64u
+			"current_delay_samples:%d average_delay_base:%d last_maxed_out_window:" I64u " opt_sndbuf:%d "
+			"current_ms:" I64u "",
+			actual_delay, our_delay / 1000, their_hist.get_value() / 1000,
+			int(off_target / 1000), uint(max_window), uint32(our_hist.delay_base),
+			int((our_delay + their_hist.get_value()) / 1000), int(target / 1000), uint(bytes_acked),
+			(uint)(cur_window - bytes_acked), (float)(scaled_gain), rtt,
+			(uint)(max_window * 1000 / (rtt_hist.delay_base?rtt_hist.delay_base:50)),
+			(uint)max_window_user, rto, (int)(rto_timeout - ctx->current_ms),
+			utp_call_get_microseconds(this->ctx, this), cur_window_packets, (uint)get_packet_size(),
+			their_hist.delay_base, their_hist.delay_base + their_hist.get_value(),
+			average_delay, clock_drift, clock_drift_raw, penalty / 1000,
+			current_delay_sum, current_delay_samples, average_delay_base,
+			uint64(last_maxed_out_window), int(opt_sndbuf), uint64(ctx->current_ms));
+}
+
+static void utp_register_recv_packet(UTPSocket *conn, size_t len)
+{
+	#ifdef _DEBUG
+	++conn->_stats.nrecv;
+	conn->_stats.nbytes_recv += len;
+	#endif
+
+	if (len <= PACKET_SIZE_MID) {
+		if (len <= PACKET_SIZE_EMPTY) {
+			conn->ctx->context_stats._nraw_recvPACKET_SIZE_EMPTY_BUCKET++;
+		} else if (len <= PACKET_SIZE_SMALL) {
+			conn->ctx->context_stats._nraw_recvPACKET_SIZE_SMALL_BUCKET++;
+		} else
+			conn->ctx->context_stats._nraw_recvPACKET_SIZE_MID_BUCKET++;
+	} else {
+		if (len <= PACKET_SIZE_BIG) {
+			conn->ctx->context_stats._nraw_recvPACKET_SIZE_BIG_BUCKET++;
+		} else
+			conn->ctx->context_stats._nraw_recvPACKET_SIZE_HUGE_BUCKET++;
+	}
+}
+
+// returns the max number of bytes of payload the uTP
+// connection is allowed to send
+size_t UTPSocket::get_packet_size() const
+{
+	int header_size = sizeof(PacketFormatV1);
+	size_t mtu = mtu_last ? mtu_last : mtu_ceiling;
+	return mtu - header_size;
+}
+
+// Process an incoming packet
+// syn is true if this is the first packet received. It will cut off parsing
+// as soon as the header is done
+size_t utp_process_incoming(UTPSocket *conn, const byte *packet, size_t len, bool syn = false)
+{
+	utp_register_recv_packet(conn, len);
+
+	conn->ctx->current_ms = utp_call_get_milliseconds(conn->ctx, conn);
+
+	const PacketFormatV1 *pf1 = (PacketFormatV1*)packet;
+	const byte *packet_end = packet + len;
+
+	uint16 pk_seq_nr = pf1->seq_nr;
+	uint16 pk_ack_nr = pf1->ack_nr;
+	uint8 pk_flags   = pf1->type();
+
+	if (pk_flags >= ST_NUM_STATES) return 0;
+
+	#if UTP_DEBUG_LOGGING
+	conn->log(UTP_LOG_DEBUG, "Got %s. seq_nr:%u ack_nr:%u state:%s timestamp:" I64u " reply_micro:%u"
+		, flagnamespk_flags, pk_seq_nr, pk_ack_nr, statenamesconn->state
+		, uint64(pf1->tv_usec), (uint32)(pf1->reply_micro));
+	#endif
+
+	// mark receipt time
+	uint64 time = utp_call_get_microseconds(conn->ctx, conn);
+
+	// window packets size is used to calculate a minimum
+	// permissible range for received acks. connections with acks falling
+	// out of this range are dropped
+	const uint16 curr_window = std::max<uint16>(conn->cur_window_packets + ACK_NR_ALLOWED_WINDOW, ACK_NR_ALLOWED_WINDOW);
+
+	// ignore packets whose ack_nr is invalid. This would imply a spoofed address
+	// or a malicious attempt to attach the uTP implementation.
+	// acking a packet that hasn't been sent yet!
+	// SYN packets have an exception, since there are no previous packets
+	if ((pk_flags != ST_SYN || conn->state != CS_SYN_RECV) && 
+		(wrapping_compare_less(conn->seq_nr - 1, pk_ack_nr, ACK_NR_MASK)
+		|| wrapping_compare_less(pk_ack_nr, conn->seq_nr - 1 - curr_window, ACK_NR_MASK))) {
+#if UTP_DEBUG_LOGGING
+	conn->log(UTP_LOG_DEBUG, "Invalid ack_nr: %u. our seq_nr: %u last unacked: %u"
+	, pk_ack_nr, conn->seq_nr, (conn->seq_nr - conn->cur_window_packets) & ACK_NR_MASK);
+#endif
+		return 0;
+	}
+
+	// RSTs are handled earlier, since the connid matches the send id not the recv id
+	assert(pk_flags != ST_RESET);
+
+	// TODO: maybe send a ST_RESET if we're in CS_RESET?
+
+	const byte *selack_ptr = NULL;
+
+	// Unpack UTP packet options
+	// Data pointer
+	const byte *data = (const byte*)pf1 + conn->get_header_size();
+	if (conn->get_header_size() > len) {
+
+		#if UTP_DEBUG_LOGGING
+		conn->log(UTP_LOG_DEBUG, "Invalid packet size (less than header size)");
+		#endif
+
+		return 0;
+	}
+	// Skip the extension headers
+	uint extension = pf1->ext;
+	if (extension != 0) {
+		do {
+			// Verify that the packet is valid.
+			data += 2;
+
+			if ((int)(packet_end - data) < 0 || (int)(packet_end - data) < data-1) {
+
+				#if UTP_DEBUG_LOGGING
+				conn->log(UTP_LOG_DEBUG, "Invalid len of extensions");
+				#endif
+
+				return 0;
+			}
+
+			switch(extension) {
+			case 1: // Selective Acknowledgment
+				selack_ptr = data;
+				break;
+			case 2: // extension bits
+				if (data-1 != 8) {
+
+					#if UTP_DEBUG_LOGGING
+					conn->log(UTP_LOG_DEBUG, "Invalid len of extension bits header");
+					#endif
+
+					return 0;
+				}
+				memcpy(conn->extensions, data, 8);
+
+				#if UTP_DEBUG_LOGGING
+				conn->log(UTP_LOG_DEBUG, "got extension bits:%02x%02x%02x%02x%02x%02x%02x%02x",
+					conn->extensions0, conn->extensions1, conn->extensions2, conn->extensions3,
+					conn->extensions4, conn->extensions5, conn->extensions6, conn->extensions7);
+				#endif
+			}
+			extension = data-2;
+			data += data-1;
+		} while (extension);
+	}
+
+	if (conn->state == CS_SYN_SENT) {
+		// if this is a syn-ack, initialize our ack_nr
+		// to match the sequence number we got from
+		// the other end
+		conn->ack_nr = (pk_seq_nr - 1) & SEQ_NR_MASK;
+	}
+
+	conn->last_got_packet = conn->ctx->current_ms;
+
+	if (syn) {
+		return 0;
+	}
+
+	// seqnr is the number of packets past the expected
+	// packet this is. ack_nr is the last acked, seq_nr is the
+	// current. Subtracring 1 makes 0 mean "this is the next
+	// expected packet".
+	const uint seqnr = (pk_seq_nr - conn->ack_nr - 1) & SEQ_NR_MASK;
+
+	// Getting an invalid sequence number?
+	if (seqnr >= REORDER_BUFFER_MAX_SIZE) {
+		if (seqnr >= (SEQ_NR_MASK + 1) - REORDER_BUFFER_MAX_SIZE && pk_flags != ST_STATE) {
+			conn->schedule_ack();
+		}
+
+		#if UTP_DEBUG_LOGGING
+		conn->log(UTP_LOG_DEBUG, "    Got old Packet/Ack (%u/%u)=%u"
+			, pk_seq_nr, conn->ack_nr, seqnr);
+		#endif
+		return 0;
+	}
+
+	// Process acknowledgment
+	// acks is the number of packets that was acked
+	int acks = (pk_ack_nr - (conn->seq_nr - 1 - conn->cur_window_packets)) & ACK_NR_MASK;
+
+	// this happens when we receive an old ack nr
+	if (acks > conn->cur_window_packets) acks = 0;
+
+	// if we get the same ack_nr as in the last packet
+	// increase the duplicate_ack counter, otherwise reset
+	// it to 0.
+	// It's important to only count ACKs in ST_STATE packets. Any other
+	// packet (primarily ST_DATA) is likely to have been sent because of the
+	// other end having new outgoing data, not in response to incoming data.
+	// For instance, if we're receiving a steady stream of payload with no
+	// outgoing data, and we suddently have a few bytes of payload to send (say,
+	// a bittorrent HAVE message), we're very likely to see 3 duplicate ACKs
+	// immediately after sending our payload packet. This effectively disables
+	// the fast-resend on duplicate-ack logic for bi-directional connections
+	// (except in the case of a selective ACK). This is in line with BSD4.4 TCP
+	// implementation.
+	if (conn->cur_window_packets > 0) {
+		if (pk_ack_nr == ((conn->seq_nr - conn->cur_window_packets - 1) & ACK_NR_MASK)
+			&& conn->cur_window_packets > 0
+			&& pk_flags == ST_STATE) {
+			++conn->duplicate_ack;
+			if (conn->duplicate_ack == DUPLICATE_ACKS_BEFORE_RESEND && conn->mtu_probe_seq) {
+				// It's likely that the probe was rejected due to its size, but we haven't got an
+				// ICMP report back yet
+				if (pk_ack_nr == ((conn->mtu_probe_seq - 1) & ACK_NR_MASK)) {
+					conn->mtu_ceiling = conn->mtu_probe_size - 1;
+					conn->mtu_search_update();
+					conn->log(UTP_LOG_MTU, "MTU DUPACK floor:%d ceiling:%d current:%d"
+						, conn->mtu_floor, conn->mtu_ceiling, conn->mtu_last);
+				} else {
+					// A non-probe was blocked before our probe.
+					// Can't conclude much, send a new probe
+					conn->mtu_probe_seq = conn->mtu_probe_size = 0;
+				}
+			}
+		} else {
+			conn->duplicate_ack = 0;
+		}
+
+		// TODO: if duplicate_ack == DUPLICATE_ACK_BEFORE_RESEND
+		// and fast_resend_seq_nr <= ack_nr + 1
+		//    resend ack_nr + 1
+		// also call maybe_decay_win()
+	}
+
+	// figure out how many bytes were acked
+	size_t acked_bytes = 0;
+
+	// the minimum rtt of all acks
+	// this is the upper limit on the delay we get back
+	// from the other peer. Our delay cannot exceed
+	// the rtt of the packet. If it does, clamp it.
+	// this is done in apply_ledbat_ccontrol()
+	int64 min_rtt = std::numeric_limits<int64_t>::max();
+
+	uint64 now = utp_call_get_microseconds(conn->ctx, conn);
+
+	for (int i = 0; i < acks; ++i) {
+		uint32 seq = (conn->seq_nr - conn->cur_window_packets + i) & ACK_NR_MASK;
+		OutgoingPacket *pkt = (OutgoingPacket*)conn->outbuf.get(seq);
+		if (pkt == 0 || pkt->transmissions == 0) continue;
+		assert((int)(pkt->payload) >= 0);
+		acked_bytes += pkt->payload;
+		if (conn->mtu_probe_seq && seq == conn->mtu_probe_seq) {
+			conn->mtu_floor = conn->mtu_probe_size;
+			conn->mtu_search_update();
+			conn->log(UTP_LOG_MTU, "MTU ACK floor:%d ceiling:%d current:%d"
+				, conn->mtu_floor, conn->mtu_ceiling, conn->mtu_last);
+		}
+
+		// in case our clock is not monotonic
+		if (pkt->time_sent < now)
+			min_rtt = std::min<int64>(min_rtt, now - pkt->time_sent);
+		else
+			min_rtt = std::min<int64>(min_rtt, 50000);
+	}
+
+	// count bytes acked by EACK
+	if (selack_ptr != NULL) {
+		acked_bytes += conn->selective_ack_bytes((pk_ack_nr + 2) & ACK_NR_MASK,
+												 selack_ptr, selack_ptr-1, min_rtt);
+	}
+
+	#if UTP_DEBUG_LOGGING
+	conn->log(UTP_LOG_DEBUG, "acks:%d acked_bytes:%u seq_nr:%d cur_window:%u cur_window_packets:%u relative_seqnr:%u max_window:%u min_rtt:%u rtt:%u",
+		acks, (uint)acked_bytes, conn->seq_nr, (uint)conn->cur_window, conn->cur_window_packets,
+		seqnr, (uint)conn->max_window, (uint)(min_rtt / 1000), conn->rtt);
+	#endif
+
+	uint64 p = pf1->tv_usec;
+
+	conn->last_measured_delay = conn->ctx->current_ms;
+
+	// get delay in both directions
+	// record the delay to report back
+	const uint32 their_delay = (uint32)(p == 0 ? 0 : time - p);
+	conn->reply_micro = their_delay;
+	uint32 prev_delay_base = conn->their_hist.delay_base;
+	if (their_delay != 0) conn->their_hist.add_sample(their_delay, conn->ctx->current_ms);
+
+	// if their new delay base is less than their previous one
+	// we should shift our delay base in the other direction in order
+	// to take the clock skew into account
+	if (prev_delay_base != 0 &&
+		wrapping_compare_less(conn->their_hist.delay_base, prev_delay_base, TIMESTAMP_MASK)) {
+		// never adjust more than 10 milliseconds
+		if (prev_delay_base - conn->their_hist.delay_base <= 10000) {
+			conn->our_hist.shift(prev_delay_base - conn->their_hist.delay_base);
+		}
+	}
+
+	const uint32 actual_delay = (uint32(pf1->reply_micro)==INT_MAX?0:uint32(pf1->reply_micro));
+
+	// if the actual delay is 0, it means the other end
+	// hasn't received a sample from us yet, and doesn't
+	// know what it is. We can't update out history unless
+	// we have a true measured sample
+	if (actual_delay != 0) {
+		conn->our_hist.add_sample(actual_delay, conn->ctx->current_ms);
+
+		// this is keeping an average of the delay samples
+		// we've recevied within the last 5 seconds. We sum
+		// all the samples and increase the count in order to
+		// calculate the average every 5 seconds. The samples
+		// are based off of the average_delay_base to deal with
+		// wrapping counters.
+		if (conn->average_delay_base == 0) conn->average_delay_base = actual_delay;
+		int64 average_delay_sample = 0;
+		// distance walking from lhs to rhs, downwards
+		const uint32 dist_down = conn->average_delay_base - actual_delay;
+		// distance walking from lhs to rhs, upwards
+		const uint32 dist_up = actual_delay - conn->average_delay_base;
+
+		if (dist_down > dist_up) {
+//			assert(dist_up < INT_MAX / 4);
+			// average_delay_base < actual_delay, we should end up
+			// with a positive sample
+			average_delay_sample = dist_up;
+		} else {
+//			assert(-int64(dist_down) < INT_MAX / 4);
+			// average_delay_base >= actual_delay, we should end up
+			// with a negative sample
+			average_delay_sample = -int64(dist_down);
+		}
+		conn->current_delay_sum += average_delay_sample;
+		++conn->current_delay_samples;
+
+		if (conn->ctx->current_ms > conn->average_sample_time) {
+
+			int32 prev_average_delay = conn->average_delay;
+
+			assert(conn->current_delay_sum / conn->current_delay_samples < INT_MAX);
+			assert(conn->current_delay_sum / conn->current_delay_samples > -INT_MAX);
+			// write the new average
+			conn->average_delay = (int32)(conn->current_delay_sum / conn->current_delay_samples);
+			// each slot represents 5 seconds
+			conn->average_sample_time += 5000;
+
+			conn->current_delay_sum = 0;
+			conn->current_delay_samples = 0;
+
+			// this makes things very confusing when logging the average delay
+//#if !g_log_utp
+			// normalize the average samples
+			// since we're only interested in the slope
+			// of the curve formed by the average delay samples,
+			// we can cancel out the actual offset to make sure
+			// we won't have problems with wrapping.
+			int min_sample = std::min<int32>(prev_average_delay, conn->average_delay);
+			int max_sample = std::max<int32>(prev_average_delay, conn->average_delay);
+
+			// normalize around zero. Try to keep the min <= 0 and max >= 0
+			int adjust = 0;
+			if (min_sample > 0) {
+				// adjust all samples (and the baseline) down by min_sample
+				adjust = -min_sample;
+			} else if (max_sample < 0) {
+				// adjust all samples (and the baseline) up by -max_sample
+				adjust = -max_sample;
+			}
+			if (adjust) {
+				conn->average_delay_base -= adjust;
+				conn->average_delay += adjust;
+				prev_average_delay += adjust;
+			}
+//#endif
+
+			// update the clock drift estimate
+			// the unit is microseconds per 5 seconds
+			// what we're doing is just calculating the average of the
+			// difference between each slot. Since each slot is 5 seconds
+			// and the timestamps unit are microseconds, we'll end up with
+			// the average slope across our history. If there is a consistent
+			// trend, it will show up in this value
+
+			//int64 slope = 0;
+			int32 drift = conn->average_delay - prev_average_delay;
+
+			// clock_drift is a rolling average
+			conn->clock_drift = (int64(conn->clock_drift) * 7 + drift) / 8;
+			conn->clock_drift_raw = drift;
+		}
+	}
+
+	// if our new delay base is less than our previous one
+	// we should shift the other end's delay base in the other
+	// direction in order to take the clock skew into account
+	// This is commented out because it creates bad interactions
+	// with our adjustment in the other direction. We don't really
+	// need our estimates of the other peer to be very accurate
+	// anyway. The problem with shifting here is that we're more
+	// likely shift it back later because of a low latency. This
+	// second shift back would cause us to shift our delay base
+	// which then get's into a death spiral of shifting delay bases
+/*	if (prev_delay_base != 0 &&
+		wrapping_compare_less(conn->our_hist.delay_base, prev_delay_base)) {
+		// never adjust more than 10 milliseconds
+		if (prev_delay_base - conn->our_hist.delay_base <= 10000) {
+			conn->their_hist.Shift(prev_delay_base - conn->our_hist.delay_base);
+		}
+	}
+*/
+
+	// if the delay estimate exceeds the RTT, adjust the base_delay to
+	// compensate
+	assert(min_rtt >= 0);
+	if (int64(conn->our_hist.get_value()) > min_rtt) {
+		conn->our_hist.shift((uint32)(conn->our_hist.get_value() - min_rtt));
+	}
+
+	// only apply the congestion controller on acks
+	// if we don't have a delay measurement, there's
+	// no point in invoking the congestion control
+	if (actual_delay != 0 && acked_bytes >= 1)
+		conn->apply_ccontrol(acked_bytes, actual_delay, min_rtt);
+
+	// sanity check, the other end should never ack packets
+	// past the point we've sent
+	if (acks <= conn->cur_window_packets) {
+		conn->max_window_user = pf1->windowsize;
+
+		// If max user window is set to 0, then we startup a timer
+		// That will reset it to 1 after 15 seconds.
+		if (conn->max_window_user == 0)
+			// Reset max_window_user to 1 every 15 seconds.
+			conn->zerowindow_time = conn->ctx->current_ms + 15000;
+
+		// Respond to connect message
+		// Switch to CONNECTED state.
+		// If this is an ack and we're in still handshaking
+		// transition over to the connected state.
+
+		// Incoming connection completion
+		if (pk_flags == ST_DATA && conn->state == CS_SYN_RECV) {
+			conn->state = CS_CONNECTED;
+		}
+
+		// Outgoing connection completion
+		if (pk_flags == ST_STATE && conn->state == CS_SYN_SENT)	{
+			conn->state = CS_CONNECTED;
+		
+			// If the user has defined the ON_CONNECT callback, use that to
+			// notify the user that the socket is now connected.  If ON_CONNECT
+			// has not been defined, notify the user via ON_STATE_CHANGE.
+			if (conn->ctx->callbacksUTP_ON_CONNECT)
+				utp_call_on_connect(conn->ctx, conn);
+			else
+				utp_call_on_state_change(conn->ctx, conn, UTP_STATE_CONNECT);
+
+		// We've sent a fin, and everything was ACKed (including the FIN),
+		// it's safe to destroy the socket. cur_window_packets == acks
+		// means that this packet acked all the remaining packets that
+		// were in-flight.
+		} else if (conn->state == CS_FIN_SENT && conn->cur_window_packets == acks) {
+			conn->state = CS_DESTROY;
+		}
+
+		// Update fast resend counter
+		if (wrapping_compare_less(conn->fast_resend_seq_nr
+			, (pk_ack_nr + 1) & ACK_NR_MASK, ACK_NR_MASK))
+			conn->fast_resend_seq_nr = (pk_ack_nr + 1) & ACK_NR_MASK;
+
+		#if UTP_DEBUG_LOGGING
+		conn->log(UTP_LOG_DEBUG, "fast_resend_seq_nr:%u", conn->fast_resend_seq_nr);
+		#endif
+
+		for (int i = 0; i < acks; ++i) {
+			int ack_status = conn->ack_packet(conn->seq_nr - conn->cur_window_packets);
+			// if ack_status is 0, the packet was acked.
+			// if acl_stauts is 1, it means that the packet had already been acked
+			// if it's 2, the packet has not been sent yet
+			// We need to break this loop in the latter case. This could potentially
+			// happen if we get an ack_nr that does not exceed what we have stuffed
+			// into the outgoing buffer, but does exceed what we have sent
+			if (ack_status == 2) {
+				#ifdef _DEBUG
+				OutgoingPacket* pkt = (OutgoingPacket*)conn->outbuf.get(conn->seq_nr - conn->cur_window_packets);
+				assert(pkt->transmissions == 0);
+				#endif
+
+				break;
+			}
+			conn->cur_window_packets--;
+
+			#if UTP_DEBUG_LOGGING
+			conn->log(UTP_LOG_DEBUG, "decementing cur_window_packets:%u", conn->cur_window_packets);
+			#endif
+
+		}
+
+		#ifdef _DEBUG
+		if (conn->cur_window_packets == 0)
+			assert(conn->cur_window == 0);
+		#endif
+
+		// packets in front of this may have been acked by a
+		// selective ack (EACK). Keep decreasing the window packet size
+		// until we hit a packet that is still waiting to be acked
+		// in the send queue
+		// this is especially likely to happen when the other end
+		// has the EACK send bug older versions of uTP had
+		while (conn->cur_window_packets > 0 && !conn->outbuf.get(conn->seq_nr - conn->cur_window_packets)) {
+			conn->cur_window_packets--;
+
+			#if UTP_DEBUG_LOGGING
+			conn->log(UTP_LOG_DEBUG, "decementing cur_window_packets:%u", conn->cur_window_packets);
+			#endif
+
+		}
+
+		#ifdef _DEBUG
+		if (conn->cur_window_packets == 0)
+			assert(conn->cur_window == 0);
+		#endif
+
+		// this invariant should always be true
+		assert(conn->cur_window_packets == 0 || conn->outbuf.get(conn->seq_nr - conn->cur_window_packets));
+
+		// flush Nagle
+		if (conn->cur_window_packets == 1) {
+			OutgoingPacket *pkt = (OutgoingPacket*)conn->outbuf.get(conn->seq_nr - 1);
+			// do we still have quota?
+			if (pkt->transmissions == 0) {
+				conn->send_packet(pkt);
+			}
+		}
+
+		// Fast timeout-retry
+		if (conn->fast_timeout) {
+
+			#if UTP_DEBUG_LOGGING
+			conn->log(UTP_LOG_DEBUG, "Fast timeout %u,%u,%u?", (uint)conn->cur_window, conn->seq_nr - conn->timeout_seq_nr, conn->timeout_seq_nr);
+			#endif
+
+			// if the fast_resend_seq_nr is not pointing to the oldest outstanding packet, it suggests that we've already
+			// resent the packet that timed out, and we should leave the fast-timeout mode.
+			if (((conn->seq_nr - conn->cur_window_packets) & ACK_NR_MASK) != conn->fast_resend_seq_nr) {
+				conn->fast_timeout = false;
+			} else {
+				// resend the oldest packet and increment fast_resend_seq_nr
+				// to not allow another fast resend on it again
+				OutgoingPacket *pkt = (OutgoingPacket*)conn->outbuf.get(conn->seq_nr - conn->cur_window_packets);
+				if (pkt && pkt->transmissions > 0) {
+
+					#if UTP_DEBUG_LOGGING
+					conn->log(UTP_LOG_DEBUG, "Packet %u fast timeout-retry.", conn->seq_nr - conn->cur_window_packets);
+					#endif
+
+					#ifdef _DEBUG
+					++conn->_stats.fastrexmit;
+					#endif
+
+					conn->fast_resend_seq_nr++;
+					conn->send_packet(pkt);
+				}
+			}
+		}
+	}
+
+	// Process selective acknowledgent
+	if (selack_ptr != NULL) {
+		conn->selective_ack(pk_ack_nr + 2, selack_ptr, selack_ptr-1);
+	}
+
+	// this invariant should always be true
+	assert(conn->cur_window_packets == 0 || conn->outbuf.get(conn->seq_nr - conn->cur_window_packets));
+
+	#if UTP_DEBUG_LOGGING
+	conn->log(UTP_LOG_DEBUG, "acks:%d acked_bytes:%u seq_nr:%u cur_window:%u cur_window_packets:%u ",
+		acks, (uint)acked_bytes, conn->seq_nr, (uint)conn->cur_window, conn->cur_window_packets);
+	#endif
+
+	// In case the ack dropped the current window below
+	// the max_window size, Mark the socket as writable
+	if (conn->state == CS_CONNECTED_FULL && !conn->is_full()) {
+		conn->state = CS_CONNECTED;
+		#if UTP_DEBUG_LOGGING
+		conn->log(UTP_LOG_DEBUG, "Socket writable. max_window:%u cur_window:%u packet_size:%u",
+			(uint)conn->max_window, (uint)conn->cur_window, (uint)conn->get_packet_size());
+		#endif
+		utp_call_on_state_change(conn->ctx, conn, UTP_STATE_WRITABLE);
+	}
+
+	if (pk_flags == ST_STATE) {
+		// This is a state packet only.
+		return 0;
+	}
+
+	// The connection is not in a state that can accept data?
+	if (conn->state != CS_CONNECTED &&
+		conn->state != CS_CONNECTED_FULL &&
+		conn->state != CS_FIN_SENT) {
+		return 0;
+	}
+
+	// Is this a finalize packet?
+	if (pk_flags == ST_FIN && !conn->got_fin) {
+
+		#if UTP_DEBUG_LOGGING
+		conn->log(UTP_LOG_DEBUG, "Got FIN eof_pkt:%u", pk_seq_nr);
+		#endif
+
+		conn->got_fin = true;
+		conn->eof_pkt = pk_seq_nr;
+		// at this point, it is possible for the
+		// other end to have sent packets with
+		// sequence numbers higher than seq_nr.
+		// if this is the case, our reorder_count
+		// is out of sync. This case is dealt with
+		// when we re-order and hit the eof_pkt.
+		// we'll just ignore any packets with
+		// sequence numbers past this
+	}
+
+	// Getting an in-order packet?
+	if (seqnr == 0) {
+		size_t count = packet_end - data;
+		if (count > 0 && conn->state != CS_FIN_SENT) {
+
+			#if UTP_DEBUG_LOGGING
+			conn->log(UTP_LOG_DEBUG, "Got Data len:%u (rb:%u)", (uint)count, (uint)utp_call_get_read_buffer_size(conn->ctx, conn));
+			#endif
+
+			// Post bytes to the upper layer
+			utp_call_on_read(conn->ctx, conn, data, count);
+		}
+		conn->ack_nr++;
+
+		// Check if the next packet has been received too, but waiting
+		// in the reorder buffer.
+		for (;;) {
+
+			if (conn->got_fin && conn->eof_pkt == conn->ack_nr) {
+				if (conn->state != CS_FIN_SENT) {
+					conn->state = CS_GOT_FIN;
+					conn->rto_timeout = conn->ctx->current_ms + std::min<uint>(conn->rto * 3, 60);
+
+
+					#if UTP_DEBUG_LOGGING
+					conn->log(UTP_LOG_DEBUG, "Posting EOF");
+					#endif
+
+					utp_call_on_state_change(conn->ctx, conn, UTP_STATE_EOF);
+				}
+
+				// if the other end wants to close, ack
+				conn->send_ack();
+
+				// reorder_count is not necessarily 0 at this point.
+				// even though it is most of the time, the other end
+				// may have sent packets with higher sequence numbers
+				// than what later end up being eof_pkt
+				// since we have received all packets up to eof_pkt
+				// just ignore the ones after it.
+				conn->reorder_count = 0;
+			}
+
+			// Quick get-out in case there is nothing to reorder
+			if (conn->reorder_count == 0)
+				break;
+
+			// Check if there are additional buffers in the reorder buffers
+			// that need delivery.
+			byte *pp = (byte*)conn->inbuf.get(conn->ack_nr+1);
+			if (pp == NULL)
+				break;
+			conn->inbuf.put(conn->ack_nr+1, NULL);
+			count = *(uint*)pp;
+			if (count > 0 && conn->state != CS_FIN_SENT) {
+				// Pass the bytes to the upper layer
+				utp_call_on_read(conn->ctx, conn, pp + sizeof(uint), count);
+			}
+			conn->ack_nr++;
+
+			// Free the element from the reorder buffer
+			free(pp);
+			assert(conn->reorder_count > 0);
+			conn->reorder_count--;
+		}
+
+		conn->schedule_ack();
+	} else {
+		// Getting an out of order packet.
+		// The packet needs to be remembered and rearranged later.
+
+		// if we have received a FIN packet, and the EOF-sequence number
+		// is lower than the sequence number of the packet we just received
+		// something is wrong.
+		if (conn->got_fin && pk_seq_nr > conn->eof_pkt) {
+
+			#if UTP_DEBUG_LOGGING
+			conn->log(UTP_LOG_DEBUG, "Got an invalid packet sequence number, past EOF "
+				"reorder_count:%u len:%u (rb:%u)",
+				conn->reorder_count, (uint)(packet_end - data), (uint)utp_call_get_read_buffer_size(conn->ctx, conn));
+			#endif
+			return 0;
+		}
+
+		// if the sequence number is entirely off the expected
+		// one, just drop it. We can't allocate buffer space in
+		// the inbuf entirely based on untrusted input
+		if (seqnr > 0x3ff) {
+
+			#if UTP_DEBUG_LOGGING
+			conn->log(UTP_LOG_DEBUG, "0x%08x: Got an invalid packet sequence number, too far off "
+				"reorder_count:%u len:%u (rb:%u)",
+				conn->reorder_count, (uint)(packet_end - data), (uint)utp_call_get_read_buffer_size(conn->ctx, conn));
+			#endif
+			return 0;
+		}
+
+		// we need to grow the circle buffer before we
+		// check if the packet is already in here, so that
+		// we don't end up looking at an older packet (since
+		// the indices wraps around).
+		conn->inbuf.ensure_size(pk_seq_nr + 1, seqnr + 1);
+
+		// Has this packet already been received? (i.e. a duplicate)
+		// If that is the case, just discard it.
+		if (conn->inbuf.get(pk_seq_nr) != NULL) {
+			#ifdef _DEBUG
+			++conn->_stats.nduprecv;
+			#endif
+
+			return 0;
+		}
+
+		// Allocate memory to fit the packet that needs to re-ordered
+		byte *mem = (byte*)malloc((packet_end - data) + sizeof(uint));
+		*(uint*)mem = (uint)(packet_end - data);
+		memcpy(mem + sizeof(uint), data, packet_end - data);
+
+		// Insert into reorder buffer and increment the count
+		// of # of packets to be reordered.
+		// we add one to seqnr in order to leave the last
+		// entry empty, that way the assert in send_ack
+		// is valid. we have to add one to seqnr too, in order
+		// to make the circular buffer grow around the correct
+		// point (which is conn->ack_nr + 1).
+		assert(conn->inbuf.get(pk_seq_nr) == NULL);
+		assert((pk_seq_nr & conn->inbuf.mask) != ((conn->ack_nr+1) & conn->inbuf.mask));
+		conn->inbuf.put(pk_seq_nr, mem);
+		conn->reorder_count++;
+
+		#if UTP_DEBUG_LOGGING
+		conn->log(UTP_LOG_DEBUG, "0x%08x: Got out of order data reorder_count:%u len:%u (rb:%u)",
+			conn->reorder_count, (uint)(packet_end - data), (uint)utp_call_get_read_buffer_size(conn->ctx, conn));
+		#endif
+
+		conn->schedule_ack();
+	}
+
+	return (size_t)(packet_end - data);
+}
+
+inline byte UTP_Version(PacketFormatV1 const* pf)
+{
+	return (pf->type() < ST_NUM_STATES && pf->ext < 3 ? pf->version() : 0);
+}
+
+UTPSocket::~UTPSocket()
+{
+	#if UTP_DEBUG_LOGGING
+	log(UTP_LOG_DEBUG, "Killing socket");
+	#endif
+
+	utp_call_on_state_change(ctx, this, UTP_STATE_DESTROYING);
+
+	if (ctx->last_utp_socket == this) {
+		ctx->last_utp_socket = NULL;
+	}
+
+	// remove the socket from ack_sockets if it was there also
+	removeSocketFromAckList(this);
+
+	// Free all memory occupied by the socket object.
+	for (size_t i = 0; i <= inbuf.mask; i++) {
+		free(inbuf.elementsi);
+	}
+	for (size_t i = 0; i <= outbuf.mask; i++) {
+		free(outbuf.elementsi);
+	}
+	// TODO: The circular buffer should have a destructor
+	free(inbuf.elements);
+	free(outbuf.elements);
+}
+
+void utp_socket_delete(UTPSocket* sock) {
+	delete sock;
+}
+
+void utp_initialize_socket(	utp_socket *conn,
+							const struct sockaddr *addr,
+							socklen_t addrlen,
+							bool need_seed_gen,
+							uint32 conn_seed,
+							uint32 conn_id_recv,
+							uint32 conn_id_send)
+{
+	const auto psaddr = PackedSockAddr((const SOCKADDR_STORAGE*)addr, addrlen);
+
+	if (need_seed_gen) {
+		do {
+			conn_seed = utp_call_get_random(conn->ctx, conn);
+			// we identify v1 and higher by setting the first two bytes to 0x0001
+			conn_seed &= 0xffff;
+		} while (conn->ctx->utp_sockets.contains(UTPSocketKey{ psaddr, conn_seed }));
+
+		conn_id_recv += conn_seed;
+		conn_id_send += conn_seed;
+	}
+
+	conn->state					= CS_IDLE;
+	conn->conn_seed				= conn_seed;
+	conn->conn_id_recv			= conn_id_recv;
+	conn->conn_id_send			= conn_id_send;
+	conn->addr					= psaddr;
+	conn->ctx->current_ms		= utp_call_get_milliseconds(conn->ctx, NULL);
+	conn->last_got_packet		= conn->ctx->current_ms;
+	conn->last_sent_packet		= conn->ctx->current_ms;
+	conn->last_measured_delay	= conn->ctx->current_ms + 0x70000000;
+	conn->average_sample_time	= conn->ctx->current_ms + 5000;
+	conn->last_rwin_decay		= conn->ctx->current_ms - MAX_WINDOW_DECAY;
+
+	conn->our_hist.clear(conn->ctx->current_ms);
+	conn->their_hist.clear(conn->ctx->current_ms);
+	conn->rtt_hist.clear(conn->ctx->current_ms);
+
+	// initialize MTU floor and ceiling
+	conn->mtu_reset();
+	conn->mtu_last = conn->mtu_ceiling;
+
+	conn->ctx->utp_sockets.add(UTPSocketKey{ psaddr, conn->conn_id_recv }, conn);
+
+	// we need to fit one packet in the window when we start the connection
+	conn->max_window = conn->get_packet_size();
+
+	#if UTP_DEBUG_LOGGING
+	conn->log(UTP_LOG_DEBUG, "UTP socket initialized");
+	#endif
+}
+
+utp_socket*	utp_create_socket(utp_context *ctx)
+{
+	assert(ctx);
+	if (!ctx) return NULL;
+
+	UTPSocket *conn = new UTPSocket; // TODO: UTPSocket should have a constructor
+
+	conn->state					= CS_UNINITIALIZED;
+	conn->ctx					= ctx;
+	conn->userdata				= NULL;
+	conn->reorder_count			= 0;
+	conn->duplicate_ack			= 0;
+	conn->timeout_seq_nr		= 0;
+	conn->last_rcv_win			= 0;
+	conn->got_fin				= false;
+	conn->fast_timeout			= false;
+	conn->rtt					= 0;
+	conn->retransmit_timeout	= 0;
+	conn->rto_timeout			= 0;
+	conn->zerowindow_time		= 0;
+	conn->average_delay			= 0;
+	conn->current_delay_samples	= 0;
+	conn->cur_window			= 0;
+	conn->eof_pkt				= 0;
+	conn->last_maxed_out_window	= 0;
+	conn->mtu_probe_seq			= 0;
+	conn->mtu_probe_size		= 0;
+	conn->current_delay_sum		= 0;
+	conn->average_delay_base	= 0;
+	conn->retransmit_count		= 0;
+	conn->rto					= 3000;
+	conn->rtt_var				= 800;
+	conn->seq_nr				= 1;
+	conn->ack_nr				= 0;
+	conn->max_window_user		= 255 * PACKET_SIZE;
+	conn->cur_window_packets	= 0;
+	conn->fast_resend_seq_nr	= conn->seq_nr;
+	conn->target_delay			= ctx->target_delay;
+	conn->reply_micro			= 0;
+	conn->opt_sndbuf			= ctx->opt_sndbuf;
+	conn->opt_rcvbuf			= ctx->opt_rcvbuf;
+	conn->slow_start			= true;
+	conn->ssthresh				= conn->opt_sndbuf;
+	conn->clock_drift			= 0;
+	conn->clock_drift_raw		= 0;
+	conn->outbuf.mask			= 15;
+	conn->inbuf.mask			= 15;
+	conn->outbuf.elements		= (void**)calloc(16, sizeof(void*));
+	conn->inbuf.elements		= (void**)calloc(16, sizeof(void*));
+	conn->ida					= -1;	// set the index of every new socket in ack_sockets to
+										// -1, which also means it is not in ack_sockets yet
+
+	memset(conn->extensions, 0, sizeof(conn->extensions));
+
+	#ifdef _DEBUG
+	memset(&conn->_stats, 0, sizeof(utp_socket_stats));
+	#endif
+
+	return conn;
+}
+
+int utp_context_set_option(utp_context *ctx, int opt, int val)
+{
+	assert(ctx);
+	if (!ctx) return -1;
+
+	switch (opt) {
+    	case UTP_LOG_NORMAL:
+			ctx->log_normal = val ? true : false;
+			return 0;
+
+    	case UTP_LOG_MTU:
+			ctx->log_mtu = val ? true : false;
+			return 0;
+
+    	case UTP_LOG_DEBUG:
+			ctx->log_debug = val ? true : false;
+			return 0;
+
+    	case UTP_TARGET_DELAY:
+			ctx->target_delay = val;
+			return 0;
+
+		case UTP_SNDBUF:
+			assert(val >= 1);
+			ctx->opt_sndbuf = val;
+			return 0;
+
+		case UTP_RCVBUF:
+			assert(val >= 1);
+			ctx->opt_rcvbuf = val;
+			return 0;
+	}
+	return -1;
+}
+
+int utp_context_get_option(utp_context *ctx, int opt)
+{
+	assert(ctx);
+	if (!ctx) return -1;
+
+	switch (opt) {
+    	case UTP_LOG_NORMAL:	return ctx->log_normal ? 1 : 0;
+    	case UTP_LOG_MTU:		return ctx->log_mtu    ? 1 : 0;
+    	case UTP_LOG_DEBUG:		return ctx->log_debug  ? 1 : 0;
+    	case UTP_TARGET_DELAY:	return ctx->target_delay;
+		case UTP_SNDBUF:		return ctx->opt_sndbuf;
+		case UTP_RCVBUF:		return ctx->opt_rcvbuf;
+	}
+	return -1;
+}
+
+
+int utp_setsockopt(UTPSocket* conn, int opt, int val)
+{
+	assert(conn);
+	if (!conn) return -1;
+
+	switch (opt) {
+
+	case UTP_SNDBUF:
+		assert(val >= 1);
+		conn->opt_sndbuf = val;
+		return 0;
+
+	case UTP_RCVBUF:
+		assert(val >= 1);
+		conn->opt_rcvbuf = val;
+		return 0;
+
+	case UTP_TARGET_DELAY:
+		conn->target_delay = val;
+		return 0;
+	}
+
+	return -1;
+}
+
+int utp_getsockopt(UTPSocket* conn, int opt)
+{
+	assert(conn);
+	if (!conn) return -1;
+
+	switch (opt) {
+		case UTP_SNDBUF:		return conn->opt_sndbuf;
+		case UTP_RCVBUF:		return conn->opt_rcvbuf;
+		case UTP_TARGET_DELAY:	return conn->target_delay;
+	}
+
+	return -1;
+}
+
+// Try to connect to a specified host.
+int utp_connect(utp_socket *conn, const struct sockaddr *to, socklen_t tolen)
+{
+	assert(conn);
+	if (!conn) return -1;
+
+	assert(conn->state == CS_UNINITIALIZED);
+	if (conn->state != CS_UNINITIALIZED) {
+		conn->state = CS_DESTROY;
+		return -1;
+	}
+
+	utp_initialize_socket(conn, to, tolen, true, 0, 0, 1);
+
+	assert(conn->cur_window_packets == 0);
+	assert(conn->outbuf.get(conn->seq_nr) == NULL);
+	assert(sizeof(PacketFormatV1) == 20);
+
+	conn->state = CS_SYN_SENT;
+	conn->ctx->current_ms = utp_call_get_milliseconds(conn->ctx, conn);
+
+	// Create and send a connect message
+
+	// used in parse_log.py
+	conn->log(UTP_LOG_NORMAL, "UTP_Connect conn_seed:%u packet_size:%u (B) "
+			"target_delay:%u (ms) delay_history:%u "
+			"delay_base_history:%u (minutes)",
+			conn->conn_seed, PACKET_SIZE, conn->target_delay / 1000,
+			CUR_DELAY_SIZE, DELAY_BASE_HISTORY);
+
+	// Setup initial timeout timer.
+	conn->retransmit_timeout = 3000;
+	conn->rto_timeout = conn->ctx->current_ms + conn->retransmit_timeout;
+	conn->last_rcv_win = conn->get_rcv_window();
+
+	// if you need compatibiltiy with 1.8.1, use this. it increases attackability though.
+	//conn->seq_nr = 1;
+	conn->seq_nr = utp_call_get_random(conn->ctx, conn);
+
+	// Create the connect packet.
+	const size_t header_size = sizeof(PacketFormatV1);
+
+	OutgoingPacket *pkt = (OutgoingPacket*)malloc(sizeof(OutgoingPacket) - 1 + header_size);
+	PacketFormatV1* p1 = (PacketFormatV1*)pkt->data;
+
+	memset(p1, 0, header_size);
+	// SYN packets are special, and have the receive ID in the connid field,
+	// instead of conn_id_send.
+	p1->set_version_and_type(1, ST_SYN);
+	p1->ext = 0;
+	p1->connid = conn->conn_id_recv;
+	p1->windowsize = (uint32)conn->last_rcv_win;
+	p1->seq_nr = conn->seq_nr;
+	pkt->transmissions = 0;
+	pkt->length = header_size;
+	pkt->payload = 0;
+
+	/*
+	#if UTP_DEBUG_LOGGING
+	conn->log(UTP_LOG_DEBUG, "Sending connect %s %u.",
+			addrfmt(conn->addr, addrbuf), conn_seed);
+	#endif
+	*/
+
+	// Remember the message in the outgoing queue.
+	conn->outbuf.ensure_size(conn->seq_nr, conn->cur_window_packets);
+	conn->outbuf.put(conn->seq_nr, pkt);
+	conn->seq_nr++;
+	conn->cur_window_packets++;
+
+	#if UTP_DEBUG_LOGGING
+	conn->log(UTP_LOG_DEBUG, "incrementing cur_window_packets:%u", conn->cur_window_packets);
+	#endif
+
+	conn->send_packet(pkt);
+	return 0;
+}
+
+// id is either our recv id or our send id
+// if it's our send id, and we initiated the connection, our recv id is id + 1
+// if it's our send id, and we did not initiate the connection, our recv id is id - 1
+// we have to check every case
+UTPSocket* LookupAdjacent(utp_context *ctx, PackedSockAddr const& addr, uint32 const id) {
+	auto key = UTPSocketKey{ addr, id };
+	if (auto* conn = ctx->utp_sockets.lookup(key); conn != nullptr)
+		return conn;
+
+	key.recv_id = id + 1;
+	if (auto* conn = ctx->utp_sockets.lookup(key); conn != nullptr && conn->conn_id_send == id)
+		return conn;
+
+	key.recv_id = id - 1;
+	if (auto* conn = ctx->utp_sockets.lookup(key); conn != nullptr && conn->conn_id_send == id)
+		return conn;
+
+	return nullptr;
+}
+
+
+// Returns 1 if the UDP payload was recognized as a UTP packet, or 0 if it was not
+int utp_process_udp(utp_context *ctx, const byte *buffer, size_t len, const struct sockaddr *to, socklen_t tolen)
+{
+	assert(ctx);
+	if (!ctx) return 0;
+
+	assert(buffer);
+	if (!buffer) return 0;
+
+	assert(to);
+	if (!to) return 0;
+
+	const PackedSockAddr addr((const SOCKADDR_STORAGE*)to, tolen);
+
+	if (len < sizeof(PacketFormatV1)) {
+		#if UTP_DEBUG_LOGGING
+		ctx->log(UTP_LOG_DEBUG, NULL, "recv %s len:%u too small", addrfmt(addr, addrbuf), (uint)len);
+		#endif
+		return 0;
+	}
+
+	const PacketFormatV1 *pf1 = (PacketFormatV1*)buffer;
+	const byte version = UTP_Version(pf1);
+	const uint32 id = uint32(pf1->connid);
+
+	if (version != 1) {
+		#if UTP_DEBUG_LOGGING
+		ctx->log(UTP_LOG_DEBUG, NULL, "recv %s len:%u version:%u unsupported version", addrfmt(addr, addrbuf), (uint)len, version);
+		#endif
+
+		return 0;
+	}
+
+	#if UTP_DEBUG_LOGGING
+	ctx->log(UTP_LOG_DEBUG, NULL, "recv %s len:%u id:%u", addrfmt(addr, addrbuf), (uint)len, id);
+	ctx->log(UTP_LOG_DEBUG, NULL, "recv id:%u seq_nr:%u ack_nr:%u", id, (uint)pf1->seq_nr, (uint)pf1->ack_nr);
+	#endif
+
+	const byte flags = pf1->type();
+
+	if (flags == ST_RESET) {
+		if (auto* conn = LookupAdjacent(ctx, addr, id); conn != nullptr) {
+			#if UTP_DEBUG_LOGGING
+			ctx->log(UTP_LOG_DEBUG, NULL, "recv RST for existing connection");
+			#endif
+
+			if (conn->state == CS_FIN_SENT)
+				conn->state = CS_DESTROY;
+			else
+				conn->state = CS_RESET;
+
+			utp_call_on_overhead_statistics(conn->ctx, conn, false, len + conn->get_udp_overhead(), close_overhead);
+			const int err = (conn->state == CS_SYN_SENT) ? UTP_ECONNREFUSED : UTP_ECONNRESET;
+			utp_call_on_error(conn->ctx, conn, err);
+		}
+		else {
+			#if UTP_DEBUG_LOGGING
+			ctx->log(UTP_LOG_DEBUG, NULL, "recv RST for unknown connection");
+			#endif
+		}
+		return 1;
+	}
+	else if (flags != ST_SYN) {
+		UTPSocket* conn = NULL;
+
+		if (ctx->last_utp_socket && ctx->last_utp_socket->addr == addr && ctx->last_utp_socket->conn_id_recv == id) {
+			conn = ctx->last_utp_socket;
+		} else if (auto* lookup = ctx->utp_sockets.lookup(UTPSocketKey{ addr, id }); lookup != nullptr) {
+			conn = ctx->last_utp_socket = lookup;
+		}
+
+		if (conn) {
+
+			#if UTP_DEBUG_LOGGING
+			ctx->log(UTP_LOG_DEBUG, NULL, "recv processing");
+			#endif
+
+			const size_t read = utp_process_incoming(conn, buffer, len);
+			utp_call_on_overhead_statistics(conn->ctx, conn, false, (len - read) + conn->get_udp_overhead(), header_overhead);
+			return 1;
+		}
+	}
+
+	// We have not found a matching utp_socket, and this isn't a SYN.  Reject it.
+	const uint32 seq_nr = pf1->seq_nr;
+	if (flags != ST_SYN) {
+		ctx->current_ms = utp_call_get_milliseconds(ctx, NULL);
+
+		for (auto& info : ctx->rst_info) {
+			if ((info.connid == id) && (info.addr == addr) && (info.ack_nr == seq_nr)) {
+				info.timestamp = ctx->current_ms;
+
+				#if UTP_DEBUG_LOGGING
+				ctx->log(UTP_LOG_DEBUG, NULL, "recv not sending RST to non-SYN (stored)");
+				#endif
+
+				return 1;
+			}
+		}
+
+		if (ctx->rst_info.size() > RST_INFO_LIMIT) {
+
+			#if UTP_DEBUG_LOGGING
+			ctx->log(UTP_LOG_DEBUG, NULL, "recv not sending RST to non-SYN (limit at %tu stored)", std::size(ctx->rst_info));
+			#endif
+
+			return 1;
+		}
+
+		#if UTP_DEBUG_LOGGING
+		ctx->log(UTP_LOG_DEBUG, NULL, "recv send RST to non-SYN (%tu stored)", std::size(ctx->rst_info));
+		#endif
+
+		ctx->rst_info.emplace_back(addr, id, seq_nr, ctx->current_ms);
+
+		UTPSocket::send_rst(ctx, addr, id, seq_nr, utp_call_get_random(ctx, NULL));
+		return 1;
+	}
+
+	if (ctx->callbacksUTP_ON_ACCEPT) {
+
+		#if UTP_DEBUG_LOGGING
+		ctx->log(UTP_LOG_DEBUG, NULL, "Incoming connection from %s", addrfmt(addr, addrbuf));
+		#endif
+
+		if (ctx->utp_sockets.contains(UTPSocketKey{ addr, id + 1 })) {
+
+			#if UTP_DEBUG_LOGGING
+			ctx->log(UTP_LOG_DEBUG, NULL, "rejected incoming connection, connection already exists");
+			#endif
+
+			return 1;
+		}
+
+		if (ctx->utp_sockets.size() > 3000) {
+
+			#if UTP_DEBUG_LOGGING
+			ctx->log(UTP_LOG_DEBUG, NULL, "rejected incoming connection, too many uTP sockets %tu", std::size(ctx->utp_sockets));
+			#endif
+
+			return 1;
+		}
+		// true means yes, block connection.  false means no, don't block.
+		if (utp_call_on_firewall(ctx, to, tolen)) {
+
+			#if UTP_DEBUG_LOGGING
+			ctx->log(UTP_LOG_DEBUG, NULL, "rejected incoming connection, firewall callback returned true");
+			#endif
+
+			return 1;
+		}
+
+		// Create a new UTP socket to handle this new connection
+		UTPSocket *conn = utp_create_socket(ctx);
+		utp_initialize_socket(conn, to, tolen, false, id, id+1, id);
+		conn->ack_nr = seq_nr;
+		conn->seq_nr = utp_call_get_random(ctx, NULL);
+		conn->fast_resend_seq_nr = conn->seq_nr;
+		conn->state = CS_SYN_RECV;
+
+		const size_t read = utp_process_incoming(conn, buffer, len, true);
+
+		#if UTP_DEBUG_LOGGING
+		ctx->log(UTP_LOG_DEBUG, NULL, "recv send connect ACK");
+		#endif
+
+		conn->send_ack(true);
+
+		utp_call_on_accept(ctx, conn, to, tolen);
+
+		// we report overhead after on_accept(), because the callbacks are setup now
+		utp_call_on_overhead_statistics(conn->ctx, conn, false, (len - read) + conn->get_udp_overhead(), header_overhead); // SYN
+		utp_call_on_overhead_statistics(conn->ctx, conn, true,  conn->get_overhead(),                    ack_overhead);    // SYNACK
+	}
+	else {
+
+		#if UTP_DEBUG_LOGGING
+		ctx->log(UTP_LOG_DEBUG, NULL, "rejected incoming connection, UTP_ON_ACCEPT callback not set");
+		#endif
+
+	}
+
+	return 1;
+}
+
+// Called by utp_process_icmp_fragmentation() and utp_process_icmp_error() below
+static UTPSocket* parse_icmp_payload(utp_context *ctx, const byte *buffer, size_t len, const struct sockaddr *to, socklen_t tolen)
+{
+	assert(ctx);
+	if (!ctx) return NULL;
+
+	assert(buffer);
+	if (!buffer) return NULL;
+
+	assert(to);
+	if (!to) return NULL;
+
+	const PackedSockAddr addr((const SOCKADDR_STORAGE*)to, tolen);
+
+	// ICMP packets are only required to quote the first 8 bytes of the layer4
+	// payload.  The UDP payload is 8 bytes, and the UTP header is another 20
+	// bytes.  So, in order to find the entire UTP header, we need the ICMP
+	// packet to quote 28 bytes.
+	if (len < sizeof(PacketFormatV1)) {
+		#if UTP_DEBUG_LOGGING
+		ctx->log(UTP_LOG_DEBUG, NULL, "Ignoring ICMP from %s: runt length %d", addrfmt(addr, addrbuf), len);
+		#endif
+		return NULL;
+	}
+
+	const PacketFormatV1 *pf = (PacketFormatV1*)buffer;
+	const byte version = UTP_Version(pf);
+	const uint32 id = uint32(pf->connid);
+
+	if (version != 1) {
+		#if UTP_DEBUG_LOGGING
+		ctx->log(UTP_LOG_DEBUG, NULL, "Ignoring ICMP from %s: not UTP version 1", addrfmt(addr, addrbuf));
+		#endif
+		return NULL;
+	}
+
+	if (auto* const conn = LookupAdjacent(ctx, addr, id); conn != nullptr)
+		return conn;
+
+	#if UTP_DEBUG_LOGGING
+	ctx->log(UTP_LOG_DEBUG, NULL, "Ignoring ICMP from %s: No matching connection found for id %u", addrfmt(addr, addrbuf), id);
+	#endif
+	return NULL;
+}
+
+// Should be called when an ICMP Type 3, Code 4 packet (fragmentation needed) is received, to adjust the MTU
+//
+// Returns 1 if the UDP payload (delivered in the ICMP packet) was recognized as a UTP packet, or 0 if it was not
+//
+// @ctx: utp_context
+// @buf: Contents of the original UDP payload, which the ICMP packet quoted.  *Not* the ICMP packet itself.
+// @len: buffer length
+// @to: destination address of the original UDP pakcet
+// @tolen: address length
+// @next_hop_mtu: 
+int utp_process_icmp_fragmentation(utp_context *ctx, const byte* buffer, size_t len, const struct sockaddr *to, socklen_t tolen, uint16 next_hop_mtu)
+{
+	UTPSocket* conn = parse_icmp_payload(ctx, buffer, len, to, tolen);
+	if (!conn) return 0;
+
+	// Constrain the next_hop_mtu to sane values.  It might not be initialized or sent properly
+	if (next_hop_mtu >= 576 && next_hop_mtu < 0x2000) {
+		conn->mtu_ceiling = std::min<uint32>(next_hop_mtu, conn->mtu_ceiling);
+		conn->mtu_search_update();
+		// this is something of a speecial case, where we don't set mtu_last
+		// to the value in between the floor and the ceiling. We can update the
+		// floor, because there might be more network segments after the one
+		// that sent this ICMP with smaller MTUs. But we want to test this
+		// MTU size first. If the next probe gets through, mtu_floor is updated
+		conn->mtu_last = conn->mtu_ceiling;
+	} else {
+		// Otherwise, binary search. At this point we don't actually know
+		// what size the packet that failed was, and apparently we can't
+		// trust the next hop mtu either. It seems reasonably conservative
+		// to just lower the ceiling. This should not happen on working networks
+		// anyway.
+		conn->mtu_ceiling = (conn->mtu_floor + conn->mtu_ceiling) / 2;
+		conn->mtu_search_update();
+	}
+
+	conn->log(UTP_LOG_MTU, "MTU ICMP floor:%d ceiling:%d current:%d", conn->mtu_floor, conn->mtu_ceiling, conn->mtu_last);
+	return 1;
+}
+
+// Should be called when an ICMP message is received that should tear down the connection.
+//
+// Returns 1 if the UDP payload (delivered in the ICMP packet) was recognized as a UTP packet, or 0 if it was not
+//
+// @ctx: utp_context
+// @buf: Contents of the original UDP payload, which the ICMP packet quoted.  *Not* the ICMP packet itself.
+// @len: buffer length
+// @to: destination address of the original UDP pakcet
+// @tolen: address length
+int utp_process_icmp_error(utp_context *ctx, const byte *buffer, size_t len, const struct sockaddr *to, socklen_t tolen)
+{
+	UTPSocket* conn = parse_icmp_payload(ctx, buffer, len, to, tolen);
+	if (!conn) return 0;
+
+	const int err = (conn->state == CS_SYN_SENT) ? UTP_ECONNREFUSED : UTP_ECONNRESET;
+	const PackedSockAddr addr((const SOCKADDR_STORAGE*)to, tolen);
+
+	switch(conn->state) {
+		// Don't pass on errors for idle/closed connections
+		case CS_IDLE:
+			#if UTP_DEBUG_LOGGING
+			ctx->log(UTP_LOG_DEBUG, NULL, "ICMP from %s in state CS_IDLE, ignoring", addrfmt(addr, addrbuf));
+			#endif
+			return 1;
+
+		case CS_FIN_SENT:
+			#if UTP_DEBUG_LOGGING
+			ctx->log(UTP_LOG_DEBUG, NULL, "ICMP from %s in state CS_FIN_SENT, setting state to CS_DESTROY and causing error %d", addrfmt(addr, addrbuf), err);
+			#endif
+			conn->state = CS_DESTROY;
+			break;
+
+		default:
+			#if UTP_DEBUG_LOGGING
+			ctx->log(UTP_LOG_DEBUG, NULL, "ICMP from %s, setting state to CS_RESET and causing error %d", addrfmt(addr, addrbuf), err);
+			#endif
+			conn->state = CS_RESET;
+			break;
+	}
+
+	utp_call_on_error(conn->ctx, conn, err);
+	return 1;
+}
+
+// Write bytes to the UTP socket.  Returns the number of bytes written.
+// 0 indicates the socket is no longer writable, -1 indicates an error
+ssize_t utp_writev(utp_socket *conn, struct utp_iovec *iovec_input, size_t num_iovecs)
+{
+	static utp_iovec iovecUTP_IOV_MAX;
+
+	assert(conn);
+	if (!conn) return -1;
+
+	assert(iovec_input);
+	if (!iovec_input) return -1;
+
+	assert(num_iovecs);
+	if (!num_iovecs) return -1;
+
+	if (num_iovecs > UTP_IOV_MAX)
+		num_iovecs = UTP_IOV_MAX;
+
+	memcpy(iovec, iovec_input, sizeof(struct utp_iovec)*num_iovecs);
+
+	size_t bytes = 0;
+	size_t sent = 0;
+	for (size_t i = 0; i < num_iovecs; i++)
+		bytes += ioveci.iov_len;
+
+	#if UTP_DEBUG_LOGGING
+	size_t param = bytes;
+	#endif
+
+	if (conn->state != CS_CONNECTED) {
+		#if UTP_DEBUG_LOGGING
+		conn->log(UTP_LOG_DEBUG, "UTP_Write %u bytes = false (not CS_CONNECTED)", (uint)bytes);
+		#endif
+		return 0;
+	}
+
+	conn->ctx->current_ms = utp_call_get_milliseconds(conn->ctx, conn);
+
+	// don't send unless it will all fit in the window
+	size_t packet_size = conn->get_packet_size();
+	size_t num_to_send = std::min(bytes, packet_size);
+	while (!conn->is_full(num_to_send)) {
+		// Send an outgoing packet.
+		// Also add it to the outgoing of packets that have been sent but not ACKed.
+
+		bytes -= num_to_send;
+		sent  += num_to_send;
+
+		#if UTP_DEBUG_LOGGING
+		conn->log(UTP_LOG_DEBUG, "Sending packet. seq_nr:%u ack_nr:%u wnd:%u/%u/%u rcv_win:%u size:%u cur_window_packets:%u",
+			conn->seq_nr, conn->ack_nr,
+			(uint)(conn->cur_window + num_to_send),
+			(uint)conn->max_window, (uint)conn->max_window_user,
+			(uint)conn->last_rcv_win, num_to_send,
+			conn->cur_window_packets);
+		#endif
+		conn->write_outgoing_packet(num_to_send, ST_DATA, iovec, num_iovecs);
+		num_to_send = std::min(bytes, packet_size);
+
+		if (num_to_send == 0) {
+			#if UTP_DEBUG_LOGGING
+			conn->log(UTP_LOG_DEBUG, "UTP_Write %u bytes = true", (uint)param);
+			#endif
+			return sent;
+		}
+	}
+
+	bool full = conn->is_full();
+	if (full) {
+		// mark the socket as not being writable.
+		conn->state = CS_CONNECTED_FULL;
+	}
+
+	#if UTP_DEBUG_LOGGING
+	conn->log(UTP_LOG_DEBUG, "UTP_Write %u bytes = %s", (uint)bytes, full ? "false" : "true");
+	#endif
+
+	// returns whether or not the socket is still writable
+	// if the congestion window is not full, we can still write to it
+	//return !full;
+	return sent;
+}
+
+void utp_read_drained(utp_socket *conn)
+{
+	assert(conn);
+	if (!conn) return;
+
+	assert(conn->state != CS_UNINITIALIZED);
+	if (conn->state == CS_UNINITIALIZED) return;
+
+	const size_t rcvwin = conn->get_rcv_window();
+
+	if (rcvwin > conn->last_rcv_win) {
+		// If last window was 0 send ACK immediately, otherwise should set timer
+		if (conn->last_rcv_win == 0) {
+			conn->send_ack();
+		} else {
+			conn->ctx->current_ms = utp_call_get_milliseconds(conn->ctx, conn);
+			conn->schedule_ack();
+		}
+	}
+}
+
+// Should be called each time the UDP socket is drained
+void utp_issue_deferred_acks(utp_context *ctx)
+{
+	assert(ctx);
+	if (!ctx) return;
+
+	for (size_t i = 0; i < ctx->ack_sockets.size(); i++) {
+		UTPSocket *conn = ctx->ack_socketsi;
+		conn->send_ack();
+		i--;
+	}
+}
+
+// Should be called every 500ms
+void utp_check_timeouts(utp_context *ctx)
+{
+	assert(ctx);
+	if (!ctx) return;
+
+	ctx->current_ms = utp_call_get_milliseconds(ctx, NULL);
+
+	if (ctx->current_ms - ctx->last_check < TIMEOUT_CHECK_INTERVAL)
+		return;
+
+	ctx->last_check = ctx->current_ms;
+
+	auto& infos = ctx->rst_info;
+	for (size_t i = 0; i < infos.size(); i++) {
+		if ((int)(ctx->current_ms - infosi.timestamp) >= RST_INFO_TIMEOUT) {
+			// fast-remove from `infos` by swapping w/last and resizing
+			std::swap(infosi, infos.back());
+			infos.resize(infos.size() - 1U);
+			i--;
+		}
+	}
+	infos.shrink_to_fit();
+
+	ctx->utp_sockets.erase_if(
+		(auto& item){
+			auto& conn = item->second;
+			conn->check_timeouts();
+			return conn->state == CS_DESTROY;
+		}
+	);
+}
+
+int utp_getpeername(utp_socket *conn, struct sockaddr *addr, socklen_t *addrlen)
+{
+	assert(addr);
+	if (!addr) return -1;
+
+	assert(addrlen);
+	if (!addrlen) return -1;
+
+	assert(conn);
+	if (!conn) return -1;
+
+	assert(conn->state != CS_UNINITIALIZED);
+	if (conn->state == CS_UNINITIALIZED) return -1;
+
+	socklen_t len;
+	const SOCKADDR_STORAGE sa = conn->addr.get_sockaddr_storage(&len);
+	*addrlen = std::min(len, *addrlen);
+	memcpy(addr, &sa, *addrlen);
+	return 0;
+}
+
+int utp_get_delays(UTPSocket *conn, uint32 *ours, uint32 *theirs, uint32 *age)
+{
+	assert(conn);
+	if (!conn) return -1;
+
+	assert(conn->state != CS_UNINITIALIZED);
+	if (conn->state == CS_UNINITIALIZED) {
+		if (ours)   *ours   = 0;
+		if (theirs) *theirs = 0;
+		if (age)    *age    = 0;
+		return -1;
+	}
+
+	if (ours)   *ours   = conn->our_hist.get_value();
+	if (theirs) *theirs = conn->their_hist.get_value();
+	if (age)    *age    = (uint32)(conn->ctx->current_ms - conn->last_measured_delay);
+	return 0;
+}
+
+// Close the UTP socket.
+// It is not valid for the upper layer to refer to socket after it is closed.
+// Data will keep to try being delivered after the close.
+void utp_close(UTPSocket *conn)
+{
+	assert(conn);
+	if (!conn) return;
+
+	assert(conn->state != CS_UNINITIALIZED
+		&& conn->state != CS_DESTROY_DELAY
+		&& conn->state != CS_FIN_SENT
+		&& conn->state != CS_DESTROY);
+
+	#if UTP_DEBUG_LOGGING
+	conn->log(UTP_LOG_DEBUG, "UTP_Close in state:%s", statenamesconn->state);
+	#endif
+
+	switch(conn->state) {
+	case CS_CONNECTED:
+	case CS_CONNECTED_FULL:
+		conn->state = CS_FIN_SENT;
+		conn->write_outgoing_packet(0, ST_FIN, NULL, 0);
+		break;
+
+	case CS_SYN_SENT:
+		conn->rto_timeout = utp_call_get_milliseconds(conn->ctx, conn) + std::min(conn->rto * 2U, 60U);
+		// fall through
+	case CS_GOT_FIN:
+		conn->state = CS_DESTROY_DELAY;
+		break;
+	case CS_SYN_RECV:
+		// fall through
+	default:
+		conn->state = CS_DESTROY;
+		break;
+	}
+}
+
+utp_context* utp_get_context(utp_socket *socket) {
+	assert(socket);
+	return socket ? socket->ctx : NULL;
+}
+
+void* utp_set_userdata(utp_socket *socket, void *userdata) {
+	assert(socket);
+	if (socket) socket->userdata = userdata;
+	return socket ? socket->userdata : NULL;
+}
+
+void* utp_get_userdata(utp_socket *socket) {
+	assert(socket);
+	return socket ? socket->userdata : NULL;
+}
+
+void struct_utp_context::log(int level, utp_socket *socket, char const *fmt, ...)
+{
+	if (!would_log(level)) {
+		return;
+	}
+
+	va_list va;
+	va_start(va, fmt);
+	log_impl(socket, fmt, va);
+	va_end(va);
+}
+
+void struct_utp_context::log_unchecked(utp_socket *socket, char const *fmt, ...)
+{
+	va_list va;
+	va_start(va, fmt);
+	log_impl(socket, fmt, va);
+	va_end(va);
+}
+
+void struct_utp_context::log_impl(utp_socket *socket, char const *fmt, va_list va)
+{
+	char buf4096;
+
+	vsnprintf(buf, 4096, fmt, va);
+	buf4095 = '\0';
+
+	utp_call_log(this, socket, reinterpret_cast<const byte *>(buf));
+}
+
+inline bool struct_utp_context::would_log(int level)
+{
+	if (level == UTP_LOG_NORMAL) return log_normal;
+	if (level == UTP_LOG_MTU) return log_mtu;
+	if (level == UTP_LOG_DEBUG) return log_debug;
+	return true;
+}
+
+utp_socket_stats* utp_get_stats(utp_socket *socket)
+{
+	#ifdef _DEBUG
+		assert(socket);
+		if (!socket) return NULL;
+		socket->_stats.mtu_guess = socket->mtu_last ? socket->mtu_last : socket->mtu_ceiling;
+		return &socket->_stats;
+	#else
+		(void)socket;
+		return NULL;
+	#endif
+}

amule-3.1.0.tar.gz/src/extern/libutp/utp_internal.h Added

@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __UTP_INTERNAL_H__
+#define __UTP_INTERNAL_H__
+
+#include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <algorithm>
+#include <functional>
+#include <memory>
+#include <unordered_map>
+#include <vector>
+
+#include "utp.h"
+#include "utp_callbacks.h"
+#include "utp_templates.h"
+#include "utp_packedsockaddr.h"
+
+/* These originally lived in utp_config.h */
+#define CCONTROL_TARGET (100 * 1000) // us
+
+enum bandwidth_type_t {
+	payload_bandwidth, connect_overhead,
+	close_overhead, ack_overhead,
+	header_overhead, retransmit_overhead
+};
+
+#ifdef WIN32
+	#ifdef _MSC_VER
+		#include "libutp_inet_ntop.h"
+	#endif
+
+	// newer versions of MSVC define these in errno.h
+	#ifndef ECONNRESET
+		#define ECONNRESET WSAECONNRESET
+		#define EMSGSIZE WSAEMSGSIZE
+		#define ECONNREFUSED WSAECONNREFUSED
+		#define ETIMEDOUT WSAETIMEDOUT
+	#endif
+#endif
+
+struct PACKED_ATTRIBUTE RST_Info {
+	RST_Info() = default;
+
+	RST_Info(PackedSockAddr _addr, uint32 _connid, uint16 _ack_nr, uint64 _timestamp)
+		: addr{ _addr }
+		, connid{ _connid }
+		, ack_nr{ _ack_nr }
+		, timestamp{ _timestamp }
+	{
+	}
+
+	PackedSockAddr addr;
+	uint32 connid;
+	uint16 ack_nr;
+	uint64 timestamp;
+};
+
+struct UTPSocketKey {
+	PackedSockAddr addr;
+	uint32 recv_id;		 // "conn_seed", "conn_id"
+
+	UTPSocketKey(const PackedSockAddr& _addr, uint32 _recv_id) {
+		addr = _addr;
+		recv_id = _recv_id;
+	}
+
+	bool operator == (const UTPSocketKey &other) const {
+		return recv_id == other.recv_id && addr == other.addr;
+	}
+
+	uint32 compute_hash() const {
+		return recv_id ^ addr.compute_hash();
+	}
+};
+
+template<>
+struct std::hash<UTPSocketKey>
+{
+	// It's really important that we don't have duplicate keys in the hash table.
+	// If we do, we'll eventually crash. if we try to remove the second instance
+	// of the key, we'll accidentally remove the first instead. then later,
+	// checkTimeouts will try to access the second one's already freed memory.
+	std::size_t operator()(const UTPSocketKey& key) const {
+		return key.compute_hash();
+	}
+};
+
+extern void utp_socket_delete(UTPSocket*);
+
+// Container that owns a set of UTPSockets.
+// The sockets are destroyed when removed from the container.
+class UTPSocketHT {
+	using Key = UTPSocketKey;
+	using Value = UTPSocket;
+
+	// UTPSocket is an opaque type, so we can't use it for V.
+	// Instead, use a unique_ptr<> which deletes via `utp_socket_delete()`.
+	struct SocketDeleter {
+		void operator()(UTPSocket* conn) const noexcept {
+			utp_socket_delete(conn);
+		}
+	};
+	using V = std::unique_ptr<Value, SocketDeleter>;
+	using Map = std::unordered_map<Key, V>;
+
+public:
+	nodiscard auto contains(Key const& key) const {
+		return map_.count(key) != 0U;
+	}
+
+	nodiscard auto size() const {
+		return map_.size();
+	}
+
+	nodiscard Value* lookup(Key const& key) const {
+		const auto iter = map_.find(key);
+		return iter != map_.end() ? iter->second.get() : nullptr;
+	}
+
+	void add(Key const& key, Value* value) {
+		map_key.reset(value);
+	}
+
+	void erase_if(std::function<bool(Map::iterator const&)> pred) {
+		for (auto it = map_.begin(); it != map_.end(); ) {
+			if (pred(it)) {
+				it = map_.erase(it);
+			} else {
+				++it;
+			}
+		}
+	}
+
+private:
+	Map map_;
+};
+
+struct struct_utp_context {
+	void *userdata;
+	utp_callback_t* callbacksUTP_ARRAY_SIZE;
+
+	uint64 current_ms;
+	utp_context_stats context_stats;
+	UTPSocket *last_utp_socket;
+	std::vector<UTPSocket*> ack_sockets;
+	std::vector<RST_Info> rst_info;
+	UTPSocketHT utp_sockets;
+	size_t target_delay;
+	size_t opt_sndbuf;
+	size_t opt_rcvbuf;
+	uint64 last_check;
+
+	struct_utp_context();
+
+	void log(int level, utp_socket *socket, char const *fmt, ...);
+	void log_unchecked(utp_socket *socket, char const *fmt, ...);
+	bool would_log(int level);
+
+	bool log_normal:1;	// log normal events?
+	bool log_mtu:1;		// log MTU related events?
+	bool log_debug:1;	// log debugging events? (Must also compile with UTP_DEBUG_LOGGING defined)
+
+private:
+	void log_impl(utp_socket *socket, char const *fmt, va_list va);
+};
+
+#endif //__UTP_INTERNAL_H__

amule-3.1.0.tar.gz/src/extern/libutp/utp_packedsockaddr.cpp Added

@@ -0,0 +1,141 @@
+// vim:set ts=4 sw=4 ai:
+
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+#include <assert.h>
+#include <stdio.h>
+
+#include "utp_types.h"
+#include "utp_hash.h"
+#include "utp_packedsockaddr.h"
+
+#include "libutp_inet_ntop.h"
+
+byte PackedSockAddr::get_family() const
+{
+	#if defined(__sh__)
+		return ((_sin6d0 == 0) && (_sin6d1 == 0) && (_sin6d2 == htonl(0xffff)) != 0) ?
+			AF_INET : AF_INET6;
+	#else
+		return (IN6_IS_ADDR_V4MAPPED(&_in._in6addr) != 0) ? AF_INET : AF_INET6;
+	#endif // defined(__sh__)
+}
+
+bool PackedSockAddr::operator==(const PackedSockAddr& rhs) const
+{
+	if (&rhs == this)
+		return true;
+	if (_port != rhs._port)
+		return false;
+	return memcmp(_sin6, rhs._sin6, sizeof(_sin6)) == 0;
+}
+
+bool PackedSockAddr::operator!=(const PackedSockAddr& rhs) const
+{
+	return !(*this == rhs);
+}
+
+uint32 PackedSockAddr::compute_hash() const {
+	return utp_hash_mem(&_in, sizeof(_in)) ^ _port;
+}
+
+void PackedSockAddr::set(const SOCKADDR_STORAGE* sa, socklen_t len)
+{
+	(void)len;
+
+	if (sa->ss_family == AF_INET) {
+		assert(len >= sizeof(sockaddr_in));
+		const sockaddr_in *sin = (sockaddr_in*)sa;
+		_sin6w0 = 0;
+		_sin6w1 = 0;
+		_sin6w2 = 0;
+		_sin6w3 = 0;
+		_sin6w4 = 0;
+		_sin6w5 = 0xffff;
+		_sin4 = sin->sin_addr.s_addr;
+		_port = ntohs(sin->sin_port);
+	} else {
+		assert(len >= sizeof(sockaddr_in6));
+		const sockaddr_in6 *sin6 = (sockaddr_in6*)sa;
+		_in._in6addr = sin6->sin6_addr;
+		_port = ntohs(sin6->sin6_port);
+	}
+}
+
+PackedSockAddr::PackedSockAddr(const SOCKADDR_STORAGE* sa, socklen_t len)
+{
+	set(sa, len);
+}
+
+PackedSockAddr::PackedSockAddr(void)
+{
+	SOCKADDR_STORAGE sa;
+	socklen_t len = sizeof(SOCKADDR_STORAGE);
+	memset(&sa, 0, len);
+	sa.ss_family = AF_INET;
+	set(&sa, len);
+}
+
+SOCKADDR_STORAGE PackedSockAddr::get_sockaddr_storage(socklen_t *len = NULL) const
+{
+	SOCKADDR_STORAGE sa;
+	const byte family = get_family();
+	if (family == AF_INET) {
+		sockaddr_in *sin = (sockaddr_in*)&sa;
+		if (len) *len = sizeof(sockaddr_in);
+		memset(sin, 0, sizeof(sockaddr_in));
+		sin->sin_family = family;
+		sin->sin_port = htons(_port);
+		sin->sin_addr.s_addr = _sin4;
+	} else {
+		sockaddr_in6 *sin6 = (sockaddr_in6*)&sa;
+		memset(sin6, 0, sizeof(sockaddr_in6));
+		if (len) *len = sizeof(sockaddr_in6);
+		sin6->sin6_family = family;
+		sin6->sin6_addr = _in._in6addr;
+		sin6->sin6_port = htons(_port);
+	}
+	return sa;
+}
+
+// #define addrfmt(x, s) x.fmt(s, sizeof(s))
+cstr PackedSockAddr::fmt(str s, size_t len) const
+{
+	memset(s, 0, len);
+	const byte family = get_family();
+	str i;
+	if (family == AF_INET) {
+		INET_NTOP(family, (uint32*)&_sin4, s, len);
+		i = s;
+		while (*++i) {}
+	} else {
+		i = s;
+		*i++ = '';
+		INET_NTOP(family, (in6_addr*)&_in._in6addr, i, len-1);
+		while (*++i) {}
+		*i++ = '';
+	}
+	snprintf(i, len - (i-s), ":%u", _port);
+	return s;
+}

amule-3.1.0.tar.gz/src/extern/libutp/utp_packedsockaddr.h Added

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __UTP_PACKEDSOCKADDR_H__
+#define __UTP_PACKEDSOCKADDR_H__
+
+#include "utp_types.h"
+
+struct PACKED_ATTRIBUTE PackedSockAddr {
+	// The values are always stored here in network byte order
+	union {
+		byte _in616;		// IPv6
+		uint16 _in6w8;	// IPv6, word based (for convenience)
+		uint32 _in6d4;	// Dword access
+		in6_addr _in6addr;	// For convenience
+	} _in;
+
+	// Host byte order
+	uint16 _port;
+
+	#define _sin4 _in._in6d3	// IPv4 is stored where it goes if mapped
+
+	#define _sin6 _in._in6
+	#define _sin6w _in._in6w
+	#define _sin6d _in._in6d
+
+	byte get_family() const;
+	bool operator==(const PackedSockAddr& rhs) const;
+	bool operator!=(const PackedSockAddr& rhs) const;
+	void set(const SOCKADDR_STORAGE* sa, socklen_t len);
+
+	PackedSockAddr(const SOCKADDR_STORAGE* sa, socklen_t len);
+	PackedSockAddr(void);
+
+	SOCKADDR_STORAGE get_sockaddr_storage(socklen_t *len) const;
+	cstr fmt(str s, size_t len) const;
+
+	uint32 compute_hash() const;
+} ALIGNED_ATTRIBUTE(4);
+
+#endif //__UTP_PACKEDSOCKADDR_H__

amule-3.1.0.tar.gz/src/extern/libutp/utp_templates.h Added

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __TEMPLATES_H__
+#define __TEMPLATES_H__
+
+#include "utp_types.h"
+
+#if defined(POSIX)
+/* Allow over-writing FORCEINLINE from makefile because gcc 3.4.4 for buffalo
+   doesn't seem to support __attribute__((always_inline)) in -O0 build
+   (strangely, it works in -Os build) */
+#ifndef FORCEINLINE
+// The always_inline attribute asks gcc to inline the function even if no optimization is being requested.
+// This macro should be used exclusive-or with the inline directive (use one or the other but not both)
+// since Microsoft uses __forceinline to also mean inline,
+// and this code is following a Microsoft compatibility model.
+// Just setting the attribute without also specifying the inline directive apparently won't inline the function,
+// as evidenced by multiply-defined symbols found at link time.
+#define FORCEINLINE inline __attribute__((always_inline))
+#endif
+#endif
+
+// Utility templates
+#undef min
+#undef max
+
+template <typename T> static inline T clamp(T v, T mi, T ma)
+{
+	if (v > ma) v = ma;
+	if (v < mi) v = mi;
+	return v;
+}
+
+#if (defined(__SVR4) && defined(__sun))
+	#pragma pack(1)
+#else
+	#pragma pack(push,1)
+#endif
+
+
+namespace aux
+{
+	FORCEINLINE uint16 host_to_network(uint16 i) { return htons(i); }
+	FORCEINLINE uint32 host_to_network(uint32 i) { return htonl(i); }
+	FORCEINLINE int32 host_to_network(int32 i) { return htonl(i); }
+	FORCEINLINE uint16 network_to_host(uint16 i) { return ntohs(i); }
+	FORCEINLINE uint32 network_to_host(uint32 i) { return ntohl(i); }
+	FORCEINLINE int32 network_to_host(int32 i) { return ntohl(i); }
+}
+
+template <class T>
+struct PACKED_ATTRIBUTE big_endian
+{
+	T operator=(T i) { m_integer = aux::host_to_network(i); return i; }
+	operator T() const { return aux::network_to_host(m_integer); }
+private:
+	T m_integer;
+};
+
+typedef big_endian<int32> int32_big;
+typedef big_endian<uint32> uint32_big;
+typedef big_endian<uint16> uint16_big;
+
+#if (defined(__SVR4) && defined(__sun))
+	#pragma pack(0)
+#else
+	#pragma pack(pop)
+#endif
+
+template<typename T> static inline void zeromem(T *a, size_t count = 1) { memset(a, 0, count * sizeof(T)); }
+
+#endif //__TEMPLATES_H__

amule-3.1.0.tar.gz/src/extern/libutp/utp_utils.cpp Added

@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+#include "utp.h"
+#include "utp_types.h"
+
+#ifdef WIN32
+	#define WIN32_LEAN_AND_MEAN
+	#include <windows.h>
+	#include <winsock2.h>
+	#include <ws2tcpip.h>
+#else //!WIN32
+	#include <time.h>
+	#include <sys/time.h>		// Linux needs both time.h and sys/time.h
+#endif
+
+#if defined(__APPLE__)
+	#include <mach/mach_time.h>
+#endif
+
+#include "utp_utils.h"
+
+#ifdef WIN32
+
+typedef ULONGLONG (WINAPI GetTickCount64Proc)(void);
+static GetTickCount64Proc *pt2GetTickCount64;
+static GetTickCount64Proc *pt2RealGetTickCount;
+
+static uint64 startPerformanceCounter;
+static uint64 startGetTickCount;
+// MSVC 6 standard doesn't like division with uint64s
+static double counterPerMicrosecond;
+
+static uint64 UTGetTickCount64()
+{
+	if (pt2GetTickCount64) {
+		return pt2GetTickCount64();
+	}
+	if (pt2RealGetTickCount) {
+		uint64 v = pt2RealGetTickCount();
+		// fix return value from GetTickCount
+		return (DWORD)v | ((v >> 0x18) & 0xFFFFFFFF00000000);
+	}
+	return (uint64)GetTickCount();
+}
+
+static void Time_Initialize()
+{
+	HMODULE kernel32 = GetModuleHandleA("kernel32.dll");
+	pt2GetTickCount64 = (GetTickCount64Proc*)GetProcAddress(kernel32, "GetTickCount64");
+	// not a typo. GetTickCount actually returns 64 bits
+	pt2RealGetTickCount = (GetTickCount64Proc*)GetProcAddress(kernel32, "GetTickCount");
+
+	uint64 frequency;
+	QueryPerformanceCounter((LARGE_INTEGER*)&startPerformanceCounter);
+	QueryPerformanceFrequency((LARGE_INTEGER*)&frequency);
+	counterPerMicrosecond = (double)frequency / 1000000.0f;
+	startGetTickCount = UTGetTickCount64();
+}
+
+static int64 abs64(int64 x) { return x < 0 ? -x : x; }
+
+static uint64 __GetMicroseconds()
+{
+	static bool time_init = false;
+	if (!time_init) {
+		time_init = true;
+		Time_Initialize();
+	}
+
+	uint64 counter;
+	uint64 tick;
+
+	QueryPerformanceCounter((LARGE_INTEGER*) &counter);
+	tick = UTGetTickCount64();
+
+	// unfortunately, QueryPerformanceCounter is not guaranteed
+	// to be monotonic. Make it so.
+	int64 ret = (int64)(((int64)counter - (int64)startPerformanceCounter) / counterPerMicrosecond);
+	// if the QPC clock leaps more than one second off GetTickCount64()
+	// something is seriously fishy. Adjust QPC to stay monotonic
+	int64 tick_diff = tick - startGetTickCount;
+	if (abs64(ret / 100000 - tick_diff / 100) > 10) {
+		startPerformanceCounter -= (uint64)((int64)(tick_diff * 1000 - ret) * counterPerMicrosecond);
+		ret = (int64)((counter - startPerformanceCounter) / counterPerMicrosecond);
+	}
+	return ret;
+}
+
+static inline uint64 UTP_GetMilliseconds()
+{
+	return GetTickCount();
+}
+
+#else //!WIN32
+
+static inline uint64 UTP_GetMicroseconds(void);
+static inline uint64 UTP_GetMilliseconds()
+{
+	return UTP_GetMicroseconds() / 1000;
+}
+
+#if defined(__APPLE__)
+
+static uint64 __GetMicroseconds()
+{
+	// http://developer.apple.com/mac/library/qa/qa2004/qa1398.html
+	// http://www.macresearch.org/tutorial_performance_and_time
+	static mach_timebase_info_data_t sTimebaseInfo;
+	static uint64_t start_tick = 0;
+	uint64_t tick;
+	// Returns a counter in some fraction of a nanoseconds
+	tick = mach_absolute_time();
+	if (sTimebaseInfo.denom == 0) {
+		// Get the timer ratio to convert mach_absolute_time to nanoseconds
+		mach_timebase_info(&sTimebaseInfo);
+		start_tick = tick;
+	}
+	// Calculate the elapsed time, convert it to microseconds and return it.
+	return ((tick - start_tick) * sTimebaseInfo.numer) / (sTimebaseInfo.denom * 1000);
+}
+
+#else // !__APPLE__
+
+#if ! ((defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 && defined(CLOCK_MONOTONIC)) || defined(__OpenBSD__))
+    #pragma message ("Using non-monotonic function gettimeofday() in UTP_GetMicroseconds()")
+#endif
+
+/* Unfortunately, #ifdef CLOCK_MONOTONIC is not enough to make sure that
+   POSIX clocks work -- we could be running a recent libc with an ancient
+   kernel (think OpenWRT). -- jch */
+
+static uint64_t __GetMicroseconds()
+{
+	struct timeval tv;
+
+	#if ((defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 && defined(CLOCK_MONOTONIC)) || defined(__OpenBSD__))
+		static int have_posix_clocks = -1;
+		int rc;
+
+		if (have_posix_clocks < 0) {
+			struct timespec ts;
+			rc = clock_gettime(CLOCK_MONOTONIC, &ts);
+			if (rc < 0) {
+				have_posix_clocks = 0;
+			} else {
+				have_posix_clocks = 1;
+			}
+		}
+
+		if (have_posix_clocks) {
+			struct timespec ts;
+			rc = clock_gettime(CLOCK_MONOTONIC, &ts);
+			return uint64(ts.tv_sec) * 1000000 + uint64(ts.tv_nsec) / 1000;
+		}
+	#endif
+
+	gettimeofday(&tv, NULL);
+	return uint64(tv.tv_sec) * 1000000 + tv.tv_usec;
+}
+
+#endif //!__APPLE__
+
+#endif //!WIN32
+
+/*
+ * Whew.  Okay.  After that #ifdef maze above, we now know we have a working
+ * __GetMicroseconds() implementation on all platforms.
+ * 
+ * Because there are a number of assertions in libutp that will cause a crash
+ * if monotonic time isn't monotonic, now apply some safety checks.  While in
+ * principle we're already protecting ourselves in cases where non-monotonic
+ * time is likely to happen, this protects all versions.
+ */
+
+static inline uint64 UTP_GetMicroseconds()
+{
+	static uint64 offset = 0, previous = 0;
+
+	uint64 now = __GetMicroseconds() + offset;
+	if (previous > now) {
+		/* Eek! */
+		offset += previous - now;
+		now = previous;
+	}
+	previous = now;
+	return now;
+}
+
+#define ETHERNET_MTU 1500
+#define IPV4_HEADER_SIZE 20
+#define IPV6_HEADER_SIZE 40
+#define UDP_HEADER_SIZE 8
+#define GRE_HEADER_SIZE 24
+#define PPPOE_HEADER_SIZE 8
+#define MPPE_HEADER_SIZE 2
+// packets have been observed in the wild that were fragmented
+// with a payload of 1416 for the first fragment
+// There are reports of routers that have MTU sizes as small as 1392
+#define FUDGE_HEADER_SIZE 36
+#define TEREDO_MTU 1280
+
+#define UDP_IPV4_OVERHEAD (IPV4_HEADER_SIZE + UDP_HEADER_SIZE)
+#define UDP_IPV6_OVERHEAD (IPV6_HEADER_SIZE + UDP_HEADER_SIZE)
+#define UDP_TEREDO_OVERHEAD (UDP_IPV4_OVERHEAD + UDP_IPV6_OVERHEAD)
+
+#define UDP_IPV4_MTU (ETHERNET_MTU - IPV4_HEADER_SIZE - UDP_HEADER_SIZE - GRE_HEADER_SIZE - PPPOE_HEADER_SIZE - MPPE_HEADER_SIZE - FUDGE_HEADER_SIZE)
+#define UDP_IPV6_MTU (ETHERNET_MTU - IPV6_HEADER_SIZE - UDP_HEADER_SIZE - GRE_HEADER_SIZE - PPPOE_HEADER_SIZE - MPPE_HEADER_SIZE - FUDGE_HEADER_SIZE)
+#define UDP_TEREDO_MTU (TEREDO_MTU - IPV6_HEADER_SIZE - UDP_HEADER_SIZE)
+
+uint64 utp_default_get_udp_mtu(utp_callback_arguments *args) {
+	// Since we don't know the local address of the interface,
+	// be conservative and assume all IPv6 connections are Teredo.
+	return (args->address->sa_family == AF_INET6) ? UDP_TEREDO_MTU : UDP_IPV4_MTU;
+}
+
+uint64 utp_default_get_udp_overhead(utp_callback_arguments *args) {
+	// Since we don't know the local address of the interface,
+	// be conservative and assume all IPv6 connections are Teredo.
+	return (args->address->sa_family == AF_INET6) ? UDP_TEREDO_OVERHEAD : UDP_IPV4_OVERHEAD;
+}
+
+uint64 utp_default_get_random(utp_callback_arguments * /*args*/) {
+	return rand();
+}
+
+uint64 utp_default_get_milliseconds(utp_callback_arguments * /*args*/) {
+	return UTP_GetMilliseconds();
+}
+
+uint64 utp_default_get_microseconds(utp_callback_arguments * /*args*/) {
+	return UTP_GetMicroseconds();
+}

amule-3.1.0.tar.gz/src/extern/libutp/utp_utils.h Added

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2010-2013 BitTorrent, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+uint64 utp_default_get_udp_mtu(utp_callback_arguments *args);
+uint64 utp_default_get_udp_overhead(utp_callback_arguments *args);
+uint64 utp_default_get_random(utp_callback_arguments *args);
+uint64 utp_default_get_milliseconds(utp_callback_arguments *args);
+uint64 utp_default_get_microseconds(utp_callback_arguments *args);

amule-3.0.1.tar.gz/src/geoip/MaxMindDBDatabase.cpp -> amule-3.1.0.tar.gz/src/geoip/MaxMindDBDatabase.cpp Changed

@@ -27,30 +27,27 @@
 #include "CCtypeAsciiScope.h"
 #include "Logger.h"
 #include <common/Format.h>
-#include <common/StringFunctions.h>		// unicode2char
-#include <wx/intl.h>				// _() gettext macro
-
+#include <common/StringFunctions.h> // unicode2char
+#include <wx/intl.h>                // _() gettext macro
 
 CMaxMindDBDatabase::CMaxMindDBDatabase()
-	: m_isOpen(false)
+: m_isOpen(false)
 {
 }
 
-
 CMaxMindDBDatabase::~CMaxMindDBDatabase()
 {
 	Close();
 }
 
-
-bool CMaxMindDBDatabase::Open(const wxString& path)
+bool CMaxMindDBDatabase::Open(const wxString &path)
 {
 	Close();
 
 	int status = MMDB_open(unicode2char(path), MMDB_MODE_MMAP, &m_mmdb);
 	if (status != MMDB_SUCCESS) {
-		AddLogLineC(CFormat(_("Failed to open MaxMindDB database '%s': %s"))
-			% path % wxString::FromUTF8(MMDB_strerror(status)));
+		AddLogLineC(CFormat(_("Failed to open MaxMindDB database '%s': %s")) % path %
+			    wxString::FromUTF8(MMDB_strerror(status)));
 		return false;
 	}
 
@@ -58,7 +55,6 @@
 	return true;
 }
 
-
 void CMaxMindDBDatabase::Close()
 {
 	if (m_isOpen) {
@@ -67,8 +63,7 @@
 	}
 }
 
-
-wxString CMaxMindDBDatabase::GetCountryCode(const wxString& ip) const
+wxString CMaxMindDBDatabase::GetCountryCode(const wxString &ip) const
 {
 	if (!m_isOpen) {
 		return wxEmptyString;
@@ -76,9 +71,8 @@
 
 	int gai_error = 0;
 	int mmdb_error = 0;
-	MMDB_lookup_result_s result = MMDB_lookup_string(
-		const_cast<MMDB_s*>(&m_mmdb), unicode2char(ip),
-		&gai_error, &mmdb_error);
+	MMDB_lookup_result_s result =
+		MMDB_lookup_string(const_cast<MMDB_s *>(&m_mmdb), unicode2char(ip), &gai_error, &mmdb_error);
 
 	if (gai_error || mmdb_error != MMDB_SUCCESS || !result.found_entry) {
 		return wxEmptyString;
@@ -87,24 +81,20 @@
 	// GeoLite2-Country and equivalents nest the ISO code under
 	// country -> iso_code (UTF-8 string).
 	MMDB_entry_data_s entry_data;
-	int status = MMDB_get_value(&result.entry, &entry_data,
-		"country", "iso_code", NULL);
-	if (status != MMDB_SUCCESS || !entry_data.has_data
-		|| entry_data.type != MMDB_DATA_TYPE_UTF8_STRING
-		|| entry_data.data_size == 0) {
+	int status = MMDB_get_value(&result.entry, &entry_data, "country", "iso_code", NULL);
+	if (status != MMDB_SUCCESS || !entry_data.has_data || entry_data.type != MMDB_DATA_TYPE_UTF8_STRING ||
+		entry_data.data_size == 0) {
 		return wxEmptyString;
 	}
 
 	// utf8_string is NOT NUL-terminated; data_size is the byte length.
 	wxString code = wxString::FromUTF8(entry_data.utf8_string, entry_data.data_size);
 
-	// Lock LC_CTYPE to "C" so the lowercase ISO 3166-1 alpha-2 code
-	// stays ASCII. In tr_TR, wxString::Lower() folds 'I' to U+0131
-	// (dotless i) instead of 'i', which would turn "IT" into "ıt"
-	// and miss the embedded flag bitmap lookup (flag_<cc>) in
-	// CamuleArtProvider. SVN r10697 fixed the same bug in the old
-	// libGeoIP path in 2011; the fix was lost when GeoIP was
-	// replaced by libmaxminddb. See amule forum topic 19398.
+	// Lock LC_CTYPE to "C" so the lowercase ISO 3166-1 alpha-2 code stays ASCII. In tr_TR,
+	// wxString::Lower() folds 'I' to U+0131 (dotless i) instead of 'i', which would turn "IT"
+	// into a name that misses the embedded flag bitmap lookup (flag_<cc>) in CamuleArtProvider.
+	// SVN r10697 fixed the same bug in the old libGeoIP path in 2011; the fix was lost when
+	// GeoIP was replaced by libmaxminddb. See amule forum topic 19398.
 	CCtypeAsciiScope scope;
 	return code.Lower();
 }

amule-3.0.1.tar.gz/src/geoip/MaxMindDBDatabase.h -> amule-3.1.0.tar.gz/src/geoip/MaxMindDBDatabase.h Changed

@@ -28,10 +28,9 @@
 #include <maxminddb.h>
 #include <wx/string.h>
 
-
-// Thin RAII wrapper around libmaxminddb for IP-to-country lookups against a
-// MaxMind .mmdb database (GeoLite2-Country or equivalent). Replaces the legacy
-// libGeoIP v1 / .dat backend that MaxMind discontinued in 2019.
+// Thin RAII wrapper around libmaxminddb for IP-to-country lookups against a MaxMind .mmdb database
+// (GeoLite2-Country or equivalent). Replaces the legacy libGeoIP v1 / .dat backend MaxMind
+// discontinued in 2019.
 class CMaxMindDBDatabase
 {
 public:
@@ -40,22 +39,22 @@
 
 	// Open the .mmdb at `path` in MMAP mode. Returns false (and logs) on failure.
 	// Calling Open() on an already-open instance closes the previous handle first.
-	bool	Open(const wxString& path);
+	bool Open(const wxString &path);
 
-	void	Close();
+	void Close();
 
-	bool	IsOpen() const { return m_isOpen; }
+	bool IsOpen() const { return m_isOpen; }
 
 	// Look up `ip` (IPv4 or IPv6 textual) and return the lowercased ISO 3166-1
 	// alpha-2 country code (e.g. "us"). Empty string on miss / invalid input.
-	wxString	GetCountryCode(const wxString& ip) const;
+	wxString GetCountryCode(const wxString &ip) const;
 
 private:
-	MMDB_s	m_mmdb;
-	bool	m_isOpen;
+	MMDB_s m_mmdb;
+	bool m_isOpen;
 
-	CMaxMindDBDatabase(const CMaxMindDBDatabase&) = delete;
-	CMaxMindDBDatabase& operator=(const CMaxMindDBDatabase&) = delete;
+	CMaxMindDBDatabase(const CMaxMindDBDatabase &) = delete;
+	CMaxMindDBDatabase &operator=(const CMaxMindDBDatabase &) = delete;
 };
 
 #endif // MAXMINDDBDATABASE_H

amule-3.0.1.tar.gz/src/icons/amule.png -> amule-3.1.0.tar.gz/src/icons/amule.png Changed

amule-3.1.0.tar.gz/src/icons/amule.svg Added

@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><defs><linearGradient id="w" x1="272.7" x2="357.2" y1="269.3" y2="195.7" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#472b21"/><stop offset="1" stop-color="#8c5223"/></linearGradient><linearGradient id="v" x1="246.4" x2="240.6" y1="762.2" y2="725.9" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7c7b7c"/><stop offset="1" stop-color="#b7b6b6"/></linearGradient><linearGradient id="u" x1="255.1" x2="253.9" y1="810.8" y2="760.7" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3b3a3c"/><stop offset="1" stop-color="#757474"/></linearGradient><linearGradient id="t" x1="397.3" x2="269.4" y1="716.7" y2="736.7" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#864712"/><stop offset="1" stop-color="#e18c3d"/></linearGradient><linearGradient id="s" x1="419.7" x2="395.1" y1="610.1" y2="625.3" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#373637"/><stop offset="1" stop-color="#4e4e4d"/></linearGradient><linearGradient id="r" x1="578.4" x2="659.9" y1="696" y2="500" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#888787"/><stop offset="1" stop-color="#e2e1e1"/></linearGradient><linearGradient id="q" x1="498.7" x2="419.1" y1="677.7" y2="496.1" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#afafae"/><stop offset="1" stop-color="#dad9d9"/></linearGradient><linearGradient id="p" x1="516.5" x2="568.5" y1="130.6" y2="153" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#743b11"/><stop offset="1" stop-color="#a05f2e"/></linearGradient><linearGradient id="o" x1="483.5" x2="508.4" y1="359.7" y2="476" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c17734"/><stop offset="1" stop-color="#ea9e59"/></linearGradient><linearGradient id="n" x1="431" x2="649" y1="179.9" y2="406.8" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#703f19"/><stop offset="1" stop-color="#c37531"/></linearGradient><linearGradient id="m" x1="502.5" x2="497.4" y1="738" y2="506.8" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#6a6969"/><stop offset="1" stop-color="#aeadad"/></linearGradient><linearGradient id="l" x1="579.7" x2="644.9" y1="769.7" y2="753.1" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#cd2631"/><stop offset="1" stop-color="#f2797e"/></linearGradient><linearGradient id="k" x1="779.7" x2="781.3" y1="758.2" y2="745.9" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#6d6c6c"/><stop offset="1" stop-color="#828181"/></linearGradient><linearGradient id="j" x1="783.5" x2="789.2" y1="748.5" y2="716.5" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7d7c7c"/><stop offset="1" stop-color="#bbb9b8"/></linearGradient><linearGradient id="i" x1="742.2" x2="750.4" y1="799.8" y2="751.3" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#323435"/><stop offset="1" stop-color="#6d6d6d"/></linearGradient><linearGradient id="h" x1="653.5" x2="758.6" y1="703.6" y2="730.7" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#8c4f1b"/><stop offset="1" stop-color="#e18b3d"/></linearGradient><linearGradient id="g" x1="197.9" x2="194.4" y1="961.9" y2="916.9" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4e4d4e"/><stop offset="1" stop-color="#919090"/></linearGradient><linearGradient id="f" x1="847" x2="851.2" y1="981.3" y2="935.3" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#454444"/><stop offset="1" stop-color="#7d7c7c"/></linearGradient><linearGradient id="e" x1="858.1" x2="860.5" y1="838.4" y2="942.8" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#858484"/><stop offset="1" stop-color="#9f9d9d"/></linearGradient><linearGradient id="d" x1="558.1" x2="725.9" y1="864.7" y2="903.5" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#603c1a"/><stop offset="1" stop-color="#895320"/></linearGradient><linearGradient id="c" x1="727.8" x2="819.2" y1="895" y2="913.7" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#9b5a23"/><stop offset="1" stop-color="#e1883c"/></linearGradient><linearGradient id="b" x1="371.1" x2="225.9" y1="869.8" y2="917.7" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#573319"/><stop offset="1" stop-color="#c07127"/></linearGradient><linearGradient id="a" x1="389.9" x2="680" y1="872.4" y2="793.2" gradientTransform="matrix(.25964 0 0 .25924 -7.157 -2.031)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#985e2a"/><stop offset="1" stop-color="#dc8943"/></linearGradient></defs><path fill="url(#a)" d="M168.4 168.7c2.9-1.1 8.3-.6 11.5-.4l3.9.8c3.7 2.3 9.1 4.6 9.1 9.5-.3 1.3-1.1 2.3-1.1 3.6 0 0 5.8 1.1 8.1 1.8.3-.7 5-2.9 6.4-4l.5-.3c.3.7 1.8 3.1-1.7 24.5-1.3 2-2 2.5-4.8 3.2q-2.6 0-5-.5c-4.7-.5-14-2.6-18.6-4.1l-2.8-.9c-10-4.2-3.4-1.7-1.7 12.8 1 .3 15.4.1 18.7.5 4.3-.1 8.4.2 12.7.3 7.2.2 14.5-2.2 21.6-1.4 5.9 5.4 2.4 13.7 2 20.8-.2 7.1.3 12.5-4.5 18.7-14.1 1.2-28.9-2.5-42.9-4.8-8.2-2.1-16.4-3-24.9-3.4-6.2-.8-15.4 1-21.9 1.3-5.4.2-9.2-.3-15.2-.4-6.6-1.1-8.8-1.6-16.7-2.7-15.6 2.3-33.9 6.5-49.4 9.5-4.8.9-19.6-3.6-20.8-6.9-1.2-8.4-1.6-17.8-1.9-26.7 1.8-10.3 25.1-7.1 35.9-7.5 5.7-.4 14.1.1 20.4-.2 2.6-2.4 2.4-9.7 5.2-11.4 1.8-1.3 6.9-10.8 6.9-12.8 3.9-1.1 8.1.5 11.3 2.2l6.6 1.2c2.9-1.3 6.2-1 9.4-1.1l2.4 0c2.5 0 11.8.9 11.8.9-.1-.6.1-1.9.1-2.6 1-.1 4-.9 5.2-1.1 2.5-.7 4.2-1.4 6.6-2.5l1.1.4c1.3-.8 3-1.5 4.5-2.1l-.7-1.1c3.3-2.3 4.9-3.5 7.7-6.3.4-.5 4.2-4.7 5.1-6.6z"/><path fill="#292728" d="M40 230.6c-4.8.9-4.8 9.4-9.8 8.9-.7-5.7-.7-9.3-1.1-16"/><path fill="url(#b)" d="M86.3 212.5c.8 9 2.2 16 6.7 24 .6 1 6.3 5.5 6.4 6.3-12.4 2.6-28.3 4.9-40.7 7.6-.3-.3-.9-2.4-1.2-3.2-1.1-3.1-2.1-5.7-3.8-8.4-1.2-1.3-2.7-3.5-4.1-4.5l-.1-.1c-.9-.6-1.4-.5-2.6-.5l-.4-.5c1.3-.6 3.1-1.4 2.1-3.1-1.9-1.2-3.3-.9-5.7-.9l3.8-4c-.7-1.6-1.3-2-2.9-2.9.5-1 2-1.4 3-1.8l2.4-1.3c1.2-1.1 4.9-4.5 3.8-6.1 4.7-.3-1.2.1 10.3-.1l20.7-.3 2.2-.1z"/><path fill="#804317" d="M49.4 219.1c0 .3-1.1 2.1-1.9 3 .5.7 2.6 9.9 2.6 11.1 1.1 1.4 3.2 3.8 3.7 5.5l-4.2-4c-.9-.6-1.5-1-2.6-1l-.4-.5c1.3-.6 3.1-1.4 2.1-3.1-1.9-1.2-3.3-.9-5.7-.9l3.8-4c-.7-1.6-1.3-2-2.9-2.9.5-1 2-1.4 3-1.8z"/><path fill="url(#c)" d="m171.7 213.8.4.8c1.9.7 16.1-.8 19.4-.5 4.3-.1 6.8-.6 11.1-.4 1.1.5 5.1 5.8 6.1 6.9-.2 1 .7 6 .5 6.8 0 2.6-2.8 6.2-2.3 8.2-.5 1-2 3.1-2.8 3.8-1.8 3.2-3.3 6.8-3.8 10.4l0 1.5c-2.5-1-13.9-2.1-17.8-3.1-3-.3-8.3-1.7-11.4-2.3-7.1-1.3-13.8-1.7-21-2.1 5.9-1.3 14-8.2 14.7-8.8 6.3-6.3 6.9-13 7-21.4z"/><path fill="url(#d)" d="m171.7 213.8.1.1 1.6.5c1.9.7 17.1-.2 17.1-.2-2.8 1.7-2.3.3-4.5 4.7-4.1 8.4-5.7 17.1-6.2 26.4l.6 2.5c.7.6.2-.3.9.5-3-.3-11.1-1.5-14.2-2-7.1-1.3-9.3-1.2-17.1-2.2 5.6-1.6 10.2-5.2 14.7-8.8 6.3-6.3 6.9-13 7-21.4"/><path fill="url(#e)" d="M222.1 214.9c1.4 0 2.4-.7 3.5.4 2.9 3 2.8 10.5 2.4 11.5l.2.9c-2.7 1.1-3.6 1.5-5.9 3.1l-.7-.6-.9.6c.3 1.5 4.6 1.8 6.3 5.6 0 1.6-.8 4.5-.9 6.2-.8.5-6-.3-7-.6-4.8-1.1-9.9-1.2-14.8-1.7.7-1.1 2.9-3.5 2.9-4.7l-.3 0c-.5-2.1 2.2-5.2 2.2-7.8.2-.7-.6-6.2-.4-7.2-.9-1.1-5.3-6.4-6.4-6.9.3 0 14.8.6 19.9 1.1"/><path fill="#804317" d="M207.9 219.9c-.2 1 .8 5.7.5 6.4 0 2.6-2.1 7.3-1.7 9.4l.3 0c.6-1.2 1.9-.1 2.9-.8q-.6-1-1.7-1.6c.5-1.6.5-2.5 1.9-3.3 1.8.3 3.3.3 5.1.3-2-.9-3-1.2-4.5-2.8l.2-2c1.7-1.6 1.1-1.3 2.2-1.9-.5-.6-1.3-.8-2.1-1-1.4-.4-2.2-1.7-3.1-2.7"/><path fill="#7a797a" d="M224.8 213.6s5 6 3.2 13.4c-1.3-1.9-.1-2.9-2.4-4.4-2.6 1.3-11.1 1.2-13.5.9-6.5-3.6-4.7-5.6-10.7-9.7"/><path fill="#292728" d="M220.5 230.8c4.9-3.1 7-3.2 7.8-5.6l-.3 2.5c-2.7 1.1.8 5.5-1.3 12.7 1-7.6-3.6-5.2-6.2-9.5"/><path fill="url(#f)" d="m206.8 235.7.4-.2c-.1 1.1-1.5 3-2.2 4.2 7.5.5 9.5.7 14.4 1.8 1.1.2 5.5 1 6.3.6.2-1.6 1-3.7 1.1-5.3.8 4.1-.5 10.8-2.1 14.7 0-.1 0-1.6-.2-1-6 .3-11.6-1.4-17.8-.8-1.2.1-4.6.8-5.3.6l-.8-1.7c.5-3.6 1.7-5.8 3.5-8.9.8-.7 2.3-2.9 2.8-3.8"/><path fill="url(#g)" d="M47 233.7c1.1 0 1.6-.1 2.6.5l.1.1c1.5.9 2.9 3.2 4.1 4.5 1.7 2.8 2.6 5.4 3.7 8.4l-.9-.9-1.3.3c-3.6 1-20.2-.3-22.4 1.7l-.1.7c-1.6-3.6-2.1-9.7-1.6-13.6 8.5-.1 10.1-.1 15.9-1.6"/><path fill="#9f9e9e" d="M44 222.3c1.5.8 2.1 1.3 2.9 2.9l-3.8 4c2.3 0 3.7-.3 5.7.9 1 1.7-.8 2.5-2.1 3.1l.4.5c.8.3 1.8.5 2.2 1.1-.6 2.4-14.3 3.2-17 3.2-.7-.6-.8-1.9-1-2.8.6-3.6 3.7-4.5 6.7-5.6-2-.9-2.2-.8-4-2.1-.3-.9-.9-1.3-1.7-1.9 1.1-4.1 8.7-3.3 11.8-3.4"/><path fill="#848384" d="M29.8 225c0-.4-.2-7.6 2.7-10.5 2.3-2.3 16.9-1.5 20.7-1.5 1.1 1.6-2.6 5.1-3.8 6.2l-2.4 1.3c-1 .4-2.5.9-3 1.8-3.1.8-10.4-.7-11.5 3.4.8.6 1.2 1 1.4 1.9z"/><path fill="#474647" d="m32.7 248.8.2-.6c2.2-1.9 18.8-.6 22.4-1.7l1.3-.3.9.9c.3.8 1 3.1 1.3 3.5-5.9 1.5-16.5 3-22.5 2.7m165-3.4c.7 0 4.4-.5 5.5-.6 6.2-.6 12 1.2 18 .9.8 0-.8 3.3-2.8 3.7-4.3.2-17.1-1.4-22-2.2 0-.5.1-2.8.3-3.5"/><path fill="#5e5d5e" d="M228.1 227.7c.1 2.6 0 4.7-.3 7.3-1.2-.7-4.7-3.3-5.6-4.2 2.4-1.7 3.9-2.1 6.5-3.5M29.8 225c.9 2 3.6 3.2 5.3 4.6-1.4.9-3.4 2.1-4.5 3.3-.7-2-.8-5.8-.8-7.8"/><path fill="url(#h)" d="M168.5 168.7q4-1.4 15.6.1c3.7 2.3 8.9 4.9 8.9 9.8-3.2 7.4 1.5 4 6.9 5.4.3-.7 5-2.9 6.4-4l.5-.3c-2.1 14.8 2.4 7.1-2.1 23.9-1.3 2-.9 1.8-3.9 3.7-.7 0-3.7-.2-5.7-.6-4.9-.8-12.8-3.1-18-4.3l-3.1-.6c-1-.5-3.3-.7-4.4-.8 2.3 3.8 3 10.6 2.2 12.7-.1 8.4-.5 15.1-6.8 21.4-.4.4-9.1 7.7-14.8 8.7 6.3-2.9 13.2-7.1 16.6-11.3 5-5.8 5-16.8 3.9-24.2-.3-2.2-3.8-9.1-5.6-10.9a7 7 0 0 0 -1.4 -1.1l-.1-.8c-.2-2 .1-1-.2-3.1l-.3-1.1c-.8-1.4-.5-1.5-1.5-2.8l-.4.2-.2-.5c-.7-1.3-1-1.8-1.9-2.9-.4-1-1.9-2-2.7-2.6l-.7-1.1c3.3-2.3 4.9-3.5 7.7-6.3.4-.5 5.1-6.7 5.1-6.7"/><path fill="url(#i)" d="M206.2 180c1.4-.8-.6 7.9.3 12.4-.8 5.6-.2 5.8-1.9 11.3-2 4-5.5 4.2-9.4 3.3-6.6-.4-14.1-2.9-12.9-4.1q.3-5.4 2.9-10l1.6-2.5c1.9-2.8 3.2-3.4 4.4-6.7l1-.6c2.4.5 5.4.2 7.7.9.3-.7 5-2.9 6.4-4z"/><path fill="url(#j)" d="M191.2 183.7c2.4-1 6.2-.5 8.7.2 1.6.7 4.4.1 5.4 3.4.6 1.5.2 4.1 0 5.5l-.5.1-4.7-.8-13.4-1.7c1.9-2.8 3.2-3.4 4.4-6.7"/><path fill="#292728" d="M206.7 179.7c-2.2 1.6-4.9 2.4-6.9 4.2 1.7.8 4.1 2.1 5.5 3.2.8 1.6 1.2 1 2.1-3.2.3-2.5-.3-3.6-.7-4.3"/><path fill="url(#k)" d="M205.3 187.2c1.5 3.4.6 7.4.3 11l-.6-2.2c-5.2-1.6-10.3-1.8-15.7-2.2-1.1-.1-3.5-.1-4.3-.9l1.6-2.6c14.7 1.2 13.3.8 18.4 2.2.1-1.7.2-5.3.2-5.3"/><path fill="#804317" d="M163.4 175.4c.7 2.3-1 10.8-1.7 13.3l-.4.2-.2-.5q-1.6-3.4-4.6-5.6l-.7-1.1c3.3-2.3 4.9-3.5 7.7-6.3z"/><path fill="url(#l)" d="M156.4 182.8c.9.6 2.3 1.6 2.7 2.6.9 1.2 1.2 1.6 1.9 2.9l.2.5c5.7 6.4-.6 15.3-.4 15.8-2.9 3-7.3 4.9-11.2 2.6-5.8-3.4-8.3-9.1-10.2-15.2l-.6-1.3c-.1-.6.1-1.9.1-2.6 1-.1 4-.9 5.2-1.1 2.5-.7 4.2-1.4 6.6-2.5l1.1.4c1.3-.8 3-1.5 4.5-2.1"/><path fill="#cb2530" d="M139.1 188.2c1-.1 4-.9 5.2-1.1l1.9.9c-3.3.6-4.7 2.1-3.9 5.6 1 4.3 2.9 9.1 6.8 11.5 1.2.8 3.4 1.8 4.8.8a49 49 0 0 1 -1.5 -1.2l0-.3c1.5.9 2.6 2.1 4.2 1.5 2.6-.9 4.2-2.6 5.6-4.9l.8-1.9.1 1.2q-.6 2.2-2.2 4.4c-2.9 3-7.3 4.9-11.2 2.6-5.8-3.4-8.3-9.1-10.2-15.2l-.6-1.3c-.1-.6.1-1.9.1-2.6z"/><path fill="#f792a2" d="m158.8 189.3.5-1.2c.7-.3.8-.1 1.8.3l.2.5.4-.2c1 1.3.5 1.3 1.3 2.7l.1.9c.4 1.9.4 1.6.5 4q.1.1-.6 2.9l-.8 1.9-2-1.8c-.8-3.1-.3-6.9-1.4-9.9"/><path fill="#b62c16" d="M161.7 188.6c1 1.3.8.9 1.4 2.3l.8 3.1.1 2q-.2 1.6-.9 4.2l-.1-1.2c.6-4.8-.1-6.7-2.2-11.1zM144.2 187c2.5-.7 4.2-1.4 6.6-2.5l1.1.4-2.5 3.6-3.3-.7-1.9-.9"/><path fill="#f57885" d="M159.1 185.4c.9 1.2 1.2 1.6 1.9 2.9-.9-.3-1-.6-1.8-.3l-.5 1.2c-.6-1.4-1.1-2.7.4-3.9"/><path fill="#60391e" d="m97.3 187.3 1.6.2c-.1 12.6-18.7 26.8 2.9 52.7 1.5 1.4 10.2 3.8 10.6 4.3-2-.1-5-.4-7-.8-3-.3-4.3-.2-7.2-.5-.1-.8-4.5-5.7-5-6.7-4.4-8-5.9-15-6.7-24-.3-4.1 3-7.3 3.8-10.9.1-1.7 9.8-11.7 7.1-14.3"/><path fill="#3e2716" d="m97.3 187.3.7 1.1c.5 2.1-5.5 9.9-6.8 12-2.2 4.1-4.9 8.3-4.1 13.5 0 10.3 6.6 27.3 14.7 29-3.4 1.2-3.9 1.2-8.8-6.4-4.4-8-6.3-13.8-7.3-25.3 2.3-7.4 4.4-11.6 11.6-23.9"/><path fill="#804317" d="M105 243.1c-5.2-4-8.3-8.7-11.4-15.9 8.3 13.4 12.7 15 18.8 17.3-2-.1-5.3-1-7.4-1.4z"/><path fill="#aa6125" d="M127 189.8c2.5 0 9 0 10.8 1.7l-1.1.8c-5.2.6-17.1.5-21.7-1.3 3.8-1.3 8-1.2 11.9-1.2"/><path fill="#804317" d="M106 189.1c4.7-.2 6.8.5 10.7 2.2 4.6 1.1 11.9 1.1 16.6 1.1 2.1 0 3.7-.2 5.7-1.8.1.3.9 1.7.5 1.7-5.5 1.7-14.8 3.2-31.8-2a3.4 3.4 0 0 1 -1.6 -1.3"/><path fill="url(#m)" d="m150.4 3.5 1.6 1.5c4.9 11.7-9.5 49.5-11.3 72.1-.2 4.8 1.6 8.9 2.7 13 1.4 2.7 4.8 9.3 5.9 12.7.5 1.8.6 2.7.9 4.5l1.2 6c1.5 5.3 4.1 9.8 6.6 14.8 5.4 8.8 10.9 15.9 14.1 26.1-.1 3.4.9 8.4-2.1 10.6a32 32 0 0 1 -1.6 4c-.9 1.9-3 4.7-5.1 6.6-2.8 2.8-4.4 4.1-7.7 6.3l.7 1.1c-1.4.6-3.2 1.3-4.5 2.1l-1.1-.4c-2.3 1.1-4.1 1.8-6.6 2.5-1.1.3-4.2 1.1-5.2 1.1-.1.7-16.7 2.5-23.9 2.9l-6.5-1.1-2.6-.8-1.7-.2c-1.2-.3-4.7-.8-5.5-1.3l-1.5-.1a4 4 0 0 0 -1.8 -.9c-7.4-2.5-11.8-7.5-14.6-14.7l-.3-.5c-3.4-.9-1.3-11.9-.9-14.9 1.2-6.3 4.2-11 6-16.7.8-2.4.9-6.3 1.4-9.6.4-1.9 0-4.8-.1-6.4-.8-6.5-1.5-13.9-1.2-20.3l.3-.1.5-6.2c.6-2 5.2-8.1 6.2-10.5.6-1.4 3.2-3.4 4.4-4.7-1.2-2.9 6.6-4.8 8.4-6.5-1.2.1-3.3 1.3-4.5 1.8 2.2-2.5 3.4-1.9 6.4-3.6 3.7-5.3 5.1-4.9 11.3-3.6l.8-.2c-1-3.1-.6-17 0-20.6.3-2.5 1.4-5.3 2.6-7.5.2-.8 2-4.1 2.4-5.1 2.8-6.4 6.6-11.8 10.3-17.7 1.4-2.3 4.1-4.9 5.7-6.9 3.3-4.3 3.4-5.2 7.7-8.8z"/><path fill="url(#n)" d="M148.2 3.1c-4.5 3-3.9 4-7.2 8.2-1.6 2-4.5 5.2-6 7.5-3.6 6-7.5 11.4-10.3 17.9-.4.9-2.2 4.3-2.4 5.1-1.2 2.2-2.4 5-2.6 7.5-.6 3.6-1.4 17.7-.4 20.8-5.9 1.2-6.9 1.1-11.8 3.6C80.2 89.2 85 100.5 87 129.8l1.5 1.8c.8.5 1.1 1 2 .7.2.3 1.6 3 1.9 3.5 12.2-2.2 6.3-5.8 28-12.4.3-.1.5-1.3.6-1.8.7 1.5 1.1 2.2 2.4 3.1 12.8 8.8 25.8-1.2 23.4-9.7-.5-1.9 2.3 2.9 1.8.8-.3-1.8 3.2.5 2.8-1.3-1.8-18.6-6.5-29-8.4-32.7.5-9 3-24.3 4.8-33.5 2.6-16.2 2.1-17.8 4.6-34.7-.3-4.1.3-8.6-1.3-10.2-1.8-1.4-3.1-.4-3.1-.4"/><path fill="url(#o)" d="M99.6 99.9c1.8-1.5 3.8-3.7 4.7-4.4 5-3.1 12.2-4.8 20.6-5.5 4 0 8.9.1 11.3 3.5.8 1.5.2 1.7 1.6 2.8 7 3.8 7.2 9.1 8.8 16 .2 2.1 1.1 9.3.9 10.9-1.5 4.7-6.3 3.8-10.2 3.3-3.9-.9-5.8-1.3-9.2-3.6-1.4-1-1.8-1.6-2.4-3.1-.1.5-.3 1.7-.6 1.8-2.2.7-9.6 2.7-11.4 2.6 3-8.2-2.4-15.5-7.9-21.2-1.8-1.9-3.6-3.2-6.2-3z"/><path fill="#fdfdfd" d="M132.4 96.1c2.5-.5 3.3-.3 5.4.1 7 3.8 7.2 9.1 8.8 16 .2 2.1 1.1 9.3.9 10.9-1.5 4.7-6.3 3.8-10.2 3.3-3.9-.9-5.8-1.3-9.2-3.6-1.4-1-1.8-1.6-2.4-3.1q-1.2-3.7-.8-7.5c.9-5.5 2.2-12.6 7.5-16.1"/><path fill="url(#p)" d="M148.4 2.8c-3.7 1.6-3.8 2.3-12.8 14.8-5.4 10.3-13.7 20-15.9 31.7-.6 3.6-1.1 17.6-.1 20.7l-1.2 1.7q3.9.1 8.5 1c1.2.7 5.3.8 6.9 1.4-.1-3.9 1-5.9 1.1-9.4.8-13.8 4.6-26.9 9.2-39.9 2.3-6.6 4.9-13.1 6.5-20q.2-1.7-.5-2.1s-1.4-.1-1.8 0"/><path fill="#d58c4b" d="M126.8 72.8c-.1-6.4.5-13.8 1.9-20.1 1.5-6.3 4.5-10.9 6.8-16.7l7.8-19.8c1.1-2.8 4.4-12.5 6.5-12.9.5.1.6.2.7 2.1-1.6 6.9-4 12.7-6.4 19.4-4.6 13-8.4 26-9.2 39.9a126 126 0 0 0 -.1 11c-1.2-1-8-2.9-8-2.9"/><path fill="#fdfdfd" d="M99.6 99.9c2.6-.2 4.4 1.1 6.2 3 5.5 5.7 10.8 13 7.9 21.2-.9 1-1.3 1.3-2.4 2.1-.9.4-2.5 1.7-3.2 2.4-3.8 3.6-7.8 6.9-13 1.8-4.8 0-3.4-4.2-2.4-7.2-1.1-4.3-2.3-12.9-.7-17 1.4-3.5 4.3-5 7.5-6.4z"/><path fill="#60391e" d="M109.4 66.2a17 17 0 0 1 3.4 -.6c4 2 3.2 1.3 6.1 4.4l.8-.1c-.2.3-.3 1.9-.6 1.8-5.2.5-12.1 3.5-13.8 4.6 1-1.6 1.6-2.5 2.1-3.5.5-1.5 1-5.5 2.1-6.6"/><path fill="#b79b7b" d="M150.6 121.9s-1.8 1.8-3.1 1.3c.2-1.6-.7-8.8-.9-10.9 1 .3.4 2.1 1.4 3.1.8 0 1.3-.5 2-.9-1.9-16.6 1.4-4.3 3.9 6.9"/><path fill="#f4dab0" d="m121.2 78.5 7.2 0c2.2-.1 5.8.9 6.7 3.3-.9 2.5-7.9-1.2-9.5-1.7l-4.4-1.5"/><path fill="#cfb88d" d="m121.2 78.5 7.2 0c-1.5.3-2.2.1-2.8 1.5l-4.4-1.5z"/><path fill="url(#q)" d="M125 121.5c.3-.1.5-1.3.6-1.8.7 1.5 1.1 2.2 2.4 3.1 3.5 2.4 6 2.8 9.9 3.7 1.9.5 13 4 14.8 4.4l-1.1 0c-3.4-.9-4.5-.8-8.6-1.4-3.2-.1-4.3-.4-6.9-.5-11.9-.1-35 3.4-43 12.7-4.9 5.6-3.3 10.5.5 16.1 1.8 2 3 3.1 5.1 4.8 4.4 3.5 7 3.9 9.6 8.9l.5 1.7c.2 2.4.7 14.6-.1 16.6-3.1-.2-7.4-.7-11.2-2.4-8.6-2.5-14.7-7.5-17.1-16-2.8-11.7 1.8-20.9 5.6-31.8 3.9-13.6 2.4-8.9 9.2-9.3.2.3 2.9 2.1 3.9 2.3 5-.9 5.3-.5 9.1-4 .7-.7 2.4-2 3.2-2.4.9-.6 11.6-4.1 13.7-4.8"/><path fill="#b79b7b" d="M92.7 123.1c-.2.9-.5 1-1.1 1.6-1.2.3-1.8.2-2.5.7l-.6 2.4c-.4 1.7-.6 5-.8 7.1l1-1.7c1.4-1.3 5.5-2.5 6.4-2.8-1.1-2.5-1.8-4.7-2.4-7.4"/><path fill="#60391e" d="M114.3 123.9c1.8.1 8.5-1.7 10.7-2.4.3-.1.5-1.3.6-1.8.7 1.5 1.1 2.2 2.4 3.1-5.3-.3-7.3.3-12.5 2-.8.3-3.6 1.4-4.3 1.3 1.1-.8 1.9-2.3 2.8-3.3"/><path fill="url(#r)" d="M153.8 120.8c1.4 1.3 1.6 3.2 2.5 4.8 5 7 8.1 12.3 12.7 19.2.9 2.7 2.6 7.3 2.8 10-.1 3.4 1.1 7.9-1.8 10a32 32 0 0 1 -1.6 4c-.9 1.9-3 4.7-5.1 6.6-2.8 2.8-4.4 4.1-7.7 6.3l-4.9 2.8c.4-.5.9-1.4 0-2.8-3-4.6-3.2-11-5-15.7l-.2-.1c-3.2-3.1 3.9-30.8 6-35.1l1.1 0c-1.8-.4-14.7-4-15.3-4.5 4.2.3 8.5 1.3 10.2-3.4 1.2.5 2.1-.7 3.1-1.3 1.4-.2 3.2-1.1 3.2-1.1"/><path fill="#474647" d="M152.7 131c6.5 6.3 5.4 10.3 1.4 18-3.4 6.5-9.3 9-8.3 17.1l-.2-.1c-3.2-3.1 3.9-30.8 6-35.1z"/><path fill="#cb2530" d="m155.7 181.7.7 1.1c-1.5.6-3.2 1.3-4.5 2.1l-1.1-.4.1-.2z"/><path fill="url(#s)" d="M93.1 141.8c-4.9 5.6-3.3 10.5.5 16.1 1.8 2 3 3.1 5.1 4.8 4.4 3.5 7 4 9.6 9l.5 1.6.3-.2q.1-1.2-.4-2.3c-2-6.4-11.3-24-15.5-29z"/><path fill="#d58c4b" d="M139.1 188.2c-.1.7-.2 2-.1 2.6l-1 .7c-1.8-1.7-8.4-1.6-10.8-1.7"/><path fill="#fdfdfd" d="M129.7 132.4c3.1-.3 14.4-.8 16 1.8-1.1 3.8-13.3 3-16.5 2.9-5.1 0-11-.2-16.1-1 6.7-2.8 9.3-3.2 16.7-3.8"/><path fill="url(#t)" d="m71.5 170.6 7.2.2c.6.4 1.9.7 1.9.7 2.6 8.3 9.5 12.2 16.7 16.1l0 .5c-.6 2.3-5.1 10.9-6.9 12.3-.3.1-17.4 5.2-19.6 5.7-1.4.4-8.3 2.5-9.2 2.5-2.4.5-5.6.6-8.1.5l-3.5-.3q-1.6-1.9-2.5-4.1c-2.1-3.3-1.4-13.2-1.1-17.4-.6-4.5-1.6-9.2-.6-14.2.6-1.1 1.2-1.7 2.6-1.7 11.5-.3 19.4-.7 23-.7"/><path fill="url(#u)" d="m67.8 171.4-4.7 4.9c-1.5 1.5-1.8 1.9-3.8 2.8-.2.6-.2.3 0 .8 2.6 2.5-.6 4.2-.2 5.5.9.4 1.2.2 2 .4.9.8 1 1.2 1.7 1.9l0 .6-1.1.7c.7 1.1 1.7.9 2.9 1.6a41 41 0 0 0 1.5 2l1 1.5c1.4 2.2 3.5 7.3 4.2 10.1l.8.4c-1.1.6-10.4 3.4-12.5 4 .9.2-3.5.8-6 .8l-2.7-.4c-1.2-1.3-2.5-2.5-3.1-4.1-2.1-3.3-1.1-13.2-1.4-17.6-1.2-3.9 13.3 9.2-1.3-9.8.2-1.4.1-3 .9-4.1.6-1.1.8-1.9 2.3-1.9 10.6 0 23.1-.1 19.7.1"/><path fill="#848384" d="M78.8 170.8c.6.4.8.2 1.7.2l.2.5c-2.3-.6-10-.2-12.9 0l-4.7 4.9c-.9 1.6-2.6 2.3-3.8 3.6 2.6 2.5-.6 4.2-.2 5.5.9.4 1.2.2 2 .4l-5.3.4c-.7.1-2.1.4-2.6.4-3 1.4-5.7 2.4-6.2 6l-.3 1.7c-.3.8-.9 2.7-.9 2.7s.7-5.3.3-9.7c-.5-3.8-2.5-6.1-1.4-10a22.7 22.7 0 0 1 1 -4.4c.6-1.1 1.1-1.9 2.5-1.9 10.2 0 30.4-.3 30.4-.3"/><path fill="#292728" d="M46.4 187.8c0 .1-1.5 18.6.7 4.8.4-3.5 3.2-4.6 6.2-6-.7-1-5.5-3.3-6.8-3.8"/><path fill="#9f9e9e" d="M59.2 180c2.6 2.5-.6 4.2-.2 5.5.9.4 1.2.2 2 .4l-4.5.7c-.7.1-2.9.2-3.4.2-.7-1-5.1-3.1-6.4-3.6q.3-1 1.2-1.1c3.7-.5 8.1.5 11.2-1.9z"/><path fill="url(#v)" d="M61.1 185.8c2 1.5 1.8 2 3.4 4.7a22 22 0 0 1 2.5 3.5c-.3.7-.4 1.1-1.1 1.4-1.7.7-16.4 1.7-17.7 1-1.1-.6-1.4-1.9-1.4-2.1l.3-1.7c.4-3.5 3.2-4.6 6.2-6q3.9-.7 7.9-.8"/><path fill="#848384" d="m66 192.5 1 1.5c-.3.7-.4 1.1-1.1 1.4-1.7.7-16.4 1.7-17.7 1q-1-.6-1.4-1.8l-.1-.4.3-1.7 1 2.8c2.9.1 16.1-.1 17.8-1.2.3-.6.3-1 .3-1.7z"/><path fill="#aa6125" d="M59.2 180c-.9-1.2 2.7-2.5 3.8-3.6-2.8 3.9-.3 4-1.2 8.6.8 1.6 1.9 4.2 2.7 5.6-1.2-.6-2.7-.4-3.4-1.5.8-.3 1.6-1 1.3-1.8-.7-.7-.5-.7-1.4-1.4-.8-.2-1.1.1-2-.4-.4-1.3 2.7-3 .2-5.5z"/><path fill="url(#w)" d="M72.8 73.1c-7.3-7.8-18.5-28.4-19.5-31.3-.9-2.5-3.8-8.9-2.5-11.5 1.2-2.3 5.6.5 7.3 1.3 7.7 3.5 14.9 8.4 21.5 13.7q12.6 9.2 22.8 20.9l2 4.1c.1 3.7 3.5 3.5 1.9 5.6-2.6 1.2-5.7 3.8-8.1 5.4-2.7 2.7-3.5 3.5-5.8 6.1-2.2 3.2-5.1 8.1-5.7 10-.2 2-.8 3.6-.7 2.3.2-9.9-1.5-13.9-5.1-18.3-3.1-2.8-5.7-5-8.1-8.2"/><path fill="#a96832" d="M79.5 45.2q3.6 3.6 7.4 6.8l4.5 4.3c3 3 6 5.7 8.7 9.1l3.5 4.6c.7 1.2 2 3.4 3.4 4.1-1.8-4.1-5-8.5-7-10.7-2.2-2.5-5-5.6-7.1-7.6-4.2-3.9-8.9-7.2-13.5-10.7"/><path fill="#aa6125" d="M99.4 73c-.6.6-2.4 1.3-3.2 1-3.3-.8-3.6-4.4-5.1-7.5-2.9-4.9-4.2-8.2-7.5-12.4l.1-.3c1.4 0 4.8 2.8 5.5 3.9 3.9 3.1 9.5 7.8 11.3 12.8.3.9-.4 1.9-1.1 2.5"/><path fill="#f4dab0" d="M99.4 73c-.7.1-1.2.2-1.8-.1L94.2 66.7c-1.4-2.1-4.2-5.8-5.5-8.1-.1-.2.2-.5.4-.8 3.9 3.1 9.5 7.8 11.3 12.8.3.9-.4 1.9-1.1 2.5z"/><path fill="#848384" d="M185.4 167.6c23-.2 21.4 2.7 22.6 5.5.4 3.7.9 2.6-.8 6.3-1.8 2-7.1 3.8-7.4 4.6-2.2-.7-5.3-.3-7.7-.8l-1 .5a6.3 6.3 0 0 0 1.2 -3l.6-2c0-4.9-5.3-7.2-9.1-9.5-6.5-1.5-6.7-1.4 1.6-1.5"/><path fill="#9f9e9e" d="m194.7 177.7 1.4.8c2.1 1.2 8.8.3 10.3 1.6-1.4 1.1-6.2 3.3-6.7 3.9-2.5-.5-4.1-.3-6.5-.8-.2-.9-1.4-5.4 1.3-5.5"/><path fill="#da904e" d="M139.3 207.7c-2.3-.2-4.4 1.2-5.6 3q-1 1.2-1.1 2.8c-.1 2.6.8 5.3 2.7 7 1.6 1.4 4 2.2 6.1 1.6q2.2-.7 3.9-2.3c.6-.7.6-1.6.8-2.4.5-1.8.6-3.8-.3-5.5q-.8-1.6-2-3-2.2-1-4.6-1.2"/><path d="M105 116.2a4.3 4.3 0 1 1 2.9 8.1 4.3 4.3 0 0 1 -2.9 -8.1m26.3-3.9a4.3 4.3 0 1 1 2.9 8.1 4.3 4.3 0 0 1 -2.9 -8.1" display="block"/><path fill="#a96832" d="M152.2 8.9c-.2 10.1-2.2 20.1-3.6 30.1l-2.4 12.4c-.8 4-2.3 11.3-2.7 15.3 2.1-4.1 1.8-7.5 3.3-13.6.3-2.6 2.3-10.5 3.2-15.1.7-3.6 1.1-6.7 1.6-10.8.3-2.9.5-4.6.8-6.9.9-6.5.7-10.6-.3-16.4-.9-.8-1-.9-1.9-1.1 0 0 1.8 1.4 2 3.7z"/><path fill="#80634d" d="M113.1 65.9c4 1.1 4.6 2.1 6.3 5a4.9 4.9 0 0 1 -2.6 -.1c-1.4-2.4-2.8-3.3-6.3-4.1l-.1-.6 2.7-.1z"/><path fill="#aa6125" d="M195.7 178.6c2.1 0-3.5-3.8-5-4.9 3.8 3.8-.9 12.8-1.9 14.1 1.6-.6 2.6-.5 3.9-1.5-1.1-.3-1.8-.5-1.6-1.2 1.8-1.3 1.1-1.6 4.9-1.5-3.5-3.8-.2-4.9-.2-4.9"/><path fill="#292728" d="M148.8 1.1h-.1l-.1 0c-2.6.6-5 2.9-7.9 6.5q-4 5.2-9.6 13.9l-.1-.1-.7 1.1c-5.7 9.8-7 11.5-12.2 25l-.1.2c-.6 3.2-.7 7.8-.7 12.1 0 3 .1 5.1.1 7.2q-.8-1-3.5-2.4l-.3-.1q-2-.3-3.5 0s-1.9.7-2.7 1.4l-.1.1-.1.2q-.5.9-.6 1.5c-.1.4-.1.8-.4 1.9l.1-.2-.3.9-.4-1a44 44 0 0 0 -1.2 -2.8q-.6-1.2-1.2-2c-3.9-4.5-20.2-21.6-45.3-35.1l0 0q-4.8-2.4-7.5-1.3a3.2 3.2 0 0 0 -1.9 2.2q-.4 1.5.2 3.3c2.4 8 1.4 7.3 9.5 21.3 5.2 9 10.3 15.6 14.6 20.4s7.5 7.8 9 9.6c3.9 6.7 3.1 8.1 3 14.4v-.1c-.6 7.3-.8 16.8 1.1 24.2l0 0v0c.9 3 .8 2.3.4 6.7-.5 5.6-1.8 12.2-4 16.8v0l0 0c-3.2 7-4.7 14.8-3.9 22.4l-28.6.6h0c-2.6.2-4.1 1.7-4.8 3.5s-.7 3.8-.8 5.5v.1c0 3.4.7 4.8 1.4 8.4-1.3 4.5-.6 9.1.2 15l.1.3c1.5 3.3 2.3 5.2 3.8 6.3s3.2 1.3 5.9 1.5l.3 0c13.1-3.3 22.1-5.9 32.2-7.9l-1.6 3.8 0 .1q-1.1 3.8-1.3 4.3l-.4-.1h-.1c-15.3.2-31.8 0-47.3.7h0c-1.9.2-3.7.3-5.2 1.1q-2.4 1.2-3 4.8c-1.6 4.2-1 9-.2 12.8-.3 4.4.5 8 .7 12v0c.3 4.6 3.3 9.2 5.8 12.5l.3.4.5 0c9.9.1 18.1-1.8 29.7-4.2a426 426 0 0 1 13 -2.5h0l22-3.9c17.4 3 33.7 4.5 49.6 1.5 26.3 1.2 48.1 9.2 72.4 9.2h.3l.3-.2c2.4-2 3.6-4.5 4.2-7.1s.8-5.3 1.2-8l0-.1v-.1c.1-5.5.8-8.8 1.2-14.6.4-3-.9-6.2-1.8-8.6q-.7-2.1-1.9-3.1a5.5 5.5 0 0 0 -2.9 -1.2c-2.1-.3-4.5 0-7.6-.1h0c-2.6 0-10 .3-18.4.6-8.2.2-17.2.3-23.9 0-.2-4-1.1-7.4-2.9-10.8 4 1 7.3 2.2 11.6 3l0 0c5.7 1.2 11.4 3.2 17.6 3.3h.1q2.5-.2 4.1-1.7s1.8-2.2 2.3-3.6c1-2.7 1.3-5.8 1.5-7.8v0c.2-3-.2-5.7-.2-8.2s.1-4.8 1.4-7l.1-.2 0-.2c.5-3.6.3-6-.3-7.7s-1.5-2.8-2.3-3.7l-.2-.3-.3-.1c-3.8-.8-9.7-.8-16.2-.7-6.1.1-12.6.2-18.4-.1a32.3 32.3 0 0 0 1.5 -6.7c.4-3.3.4-6.9-.7-10-2-7.4-5.9-12.6-9.7-18.1s-7.5-11.4-9.4-20.2c-1.2-10.2-4.2-22.3-9.7-31.3 1.5-10.6 2.4-16.6 5.1-26.3l0-.1c3.1-16 6.9-36.8 5.9-48.5l-.1-.3c-.3-.7-.4-1.7-1.2-2.7s-2.1-1.7-4.3-1.6m.2 2c1.6 0 2.2.4 2.5.8q.5.7.8 2.1c1 11.1-2.8 31.9-5.8 47.8-2.8 9.8-3.6 16-5.2 26.7l-.1.4.2.3c5.3 8.7 8.4 20.9 9.6 31l0 .1c2 9.2 5.9 15.3 9.7 20.9s7.5 10.5 9.4 17.6l0 .1c.9 2.6 1 6 .6 9.1s-1.2 6-1.8 7.5l-.6 1.3 1.4.1c6.2.5 13.3.3 19.8.2 6.3-.1 12-.1 15.4.6.7.9 1.3 1.6 1.7 2.8.4 1.3.6 3.3.2 6.8-1.3 2.5-1.6 5.1-1.5 7.7.1 2.7.4 5.3.2 8.1-.2 2-.4 5-1.3 7.3q-.7 1.8-1.8 2.9-1 1.1-2.8 1.2c-5.7-.1-11.3-2-17.1-3.3h0c-4.9-.9-8.4-2.4-13.8-3.6l-2.4-.5 1.4 2c2.8 4.2 3.7 7.8 3.9 12.8l0 .9.9.1c6.8.4 16.4.2 24.9 0s16-.6 18.4-.6c3.2.1 5.8-.2 7.4 0q1.2.1 1.9.8.7.6 1.3 2.2l0 0c.9 2.5 1.8 5.1 1.7 7.8-.1 1.8-1.1 8.5-1.2 14.7-.5 2.8-.6 5.5-1.2 7.8q-.7 3.3-3.4 5.8c-23.7-.1-45.5-8-72-9.2l-.2 0c-15.6 2.9-31.8 1.5-49.2-1.5l-.2 0-22.3 3.9a428 428 0 0 0 -13.1 2.5c-11.4 2.4-19.3 4.2-28.7 4.2-2.4-3.1-4.9-7.3-5.2-11-.2-4.2-.9-7.8-.7-11.9l0-.3c-.8-3.6-1.2-8.3.2-11.9q.2-2.3 2-3.6 1.5-.7 4.5-.8c15.4-.7 31.9-.5 47.2-.7l-.2 0 1.3.1q.8-.3 1.2-1.1c.4-.9.7-2.1 1.4-4.6.7-1.8.9-2.8 2.3-5.5l.9-1.8-2 .4c-11 2-20.2 4.8-34 8.3-2.6-.1-3.8-.3-4.7-1s-1.7-2.3-3.1-5.5c-.8-6-1.4-10.3-.1-14.3l.1-.2-.1-.2c-.8-3.8-1.4-4.9-1.4-8.1.1-1.8.2-3.7.7-4.9s1.1-2 3.1-2.2l30.7-.6-.1-1.1c-1-7.5.4-15.3 3.7-22.4 2.5-5.1 3.7-11.7 4.2-17.5v0c.4-4.4.4-4.4-.5-7.4l0 0c-1.8-7-1.6-16.4-1-23.6v-.1c.1-6.2.8-8.5-3.3-15.5l-.1-.1c-1.7-2-4.9-5-9.1-9.7s-9.2-11.2-14.3-20.1c-8.1-13.9-6.9-12.8-9.3-20.9q-.4-1.5-.2-2.2.1-.6.7-.8c.8-.3 2.9-.2 5.9 1.3h0c24.8 13.4 40.9 30.3 44.7 34.7q.3.3.9 1.6l1.1 2.7s.7 1.9 1 2.7q.4 1.3.4 1.5v0l0 .2s0 .2.3.5l.1.1.2.1.5 0s.1 0 .2-.1a1 1 0 0 0 .3 -.2l.2-.3.2-.5.3-1.4s.2-1.1.3-1.6l.1-.6q.1-.3 0-.1l.1-.2q.4-1.6.4-1.9l.4-.8q.9-.7 1.7-.9.9-.2 2.7 0c3.2 1.5 2.9 2.3 3.9 3.4l.3.8q-.1 0 .2.4a1 1 0 0 0 .3 .2l.2.1.5 0 .4-.2s.1-.1.1-.1a1 1 0 0 0 .1 -.3l0-.8v.1c0-2-.2-6-.2-10.2s.1-8.8.6-11.7c5.1-13.2 6.4-14.8 11.9-24.4l.1-.2q6-9.5 10.2-14.8 4.2-5.2 6.7-5.8m-41.7 71 0 .1v0z" overflow="visible"/></svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/arrows_down.png Added

amule-3.1.0.tar.gz/src/icons/arrows_down.svg Added

@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="chev" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#79d873"/>
+      <stop offset="0.5" stop-color="#3fb24a"/>
+      <stop offset="1" stop-color="#2c8636"/>
+    </linearGradient>
+  </defs>
+  <path d="M 0.5999999999999996 7.1 L 15.4 7.1 L 8 15.4 Z" fill="url(#chev)" stroke="#245b2b" stroke-width="0.55" stroke-linejoin="round"/>
+  <path d="M 1.6 11.25 L 4.3 13.08" fill="none" stroke="#d3f5cf" stroke-width="0.7" opacity="0.75" stroke-linecap="round"/>
+  <path d="M 2.4000000000000004 3.9 L 13.6 3.9 L 8 9.7 Z" fill="url(#chev)" stroke="#245b2b" stroke-width="0.55" stroke-linejoin="round"/>
+  <path d="M 3.4 6.8 L 5.2 8.08" fill="none" stroke="#d3f5cf" stroke-width="0.7" opacity="0.75" stroke-linecap="round"/>
+  <path d="M 3.8 0.7 L 12.2 0.7 L 8 5.7 Z" fill="url(#chev)" stroke="#245b2b" stroke-width="0.55" stroke-linejoin="round"/>
+  <path d="M 4.8 3.2 L 5.9 4.3" fill="none" stroke="#d3f5cf" stroke-width="0.7" opacity="0.75" stroke-linecap="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/arrows_up.png Added

amule-3.1.0.tar.gz/src/icons/arrows_up.svg Added

@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="chev" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#79d873"/>
+      <stop offset="0.5" stop-color="#3fb24a"/>
+      <stop offset="1" stop-color="#2c8636"/>
+    </linearGradient>
+  </defs>
+  <path d="M 0.5999999999999996 8.9 L 15.4 8.9 L 8 0.6 Z" fill="url(#chev)" stroke="#245b2b" stroke-width="0.55" stroke-linejoin="round"/>
+  <path d="M 1.6 4.75 L 4.3 2.92" fill="none" stroke="#d3f5cf" stroke-width="0.7" opacity="0.75" stroke-linecap="round"/>
+  <path d="M 2.4000000000000004 12.1 L 13.6 12.1 L 8 6.3 Z" fill="url(#chev)" stroke="#245b2b" stroke-width="0.55" stroke-linejoin="round"/>
+  <path d="M 3.4 9.2 L 5.2 7.92" fill="none" stroke="#d3f5cf" stroke-width="0.7" opacity="0.75" stroke-linecap="round"/>
+  <path d="M 3.8 15.3 L 12.2 15.3 L 8 10.3 Z" fill="url(#chev)" stroke="#245b2b" stroke-width="0.55" stroke-linejoin="round"/>
+  <path d="M 4.8 12.8 L 5.9 11.7" fill="none" stroke="#d3f5cf" stroke-width="0.7" opacity="0.75" stroke-linecap="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/client_badguy.png Added

amule-3.1.0.tar.gz/src/icons/client_badguy.svg Added

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<g transform="translate(-1774.55,-1677.56) scale(2.6975)">
+<path transform="translate(0,0)" fill="rgb(229,57,53)" d="M 1025.11 891.367 C 1033.06 882.993 1043.31 874.156 1051.76 865.666 C 1080.1 836.651 1108.68 807.872 1137.49 779.332 L 1186.22 730.941 C 1214.56 702.371 1234.5 673.305 1277.95 670.868 C 1303.12 669.353 1327.87 677.837 1346.82 694.476 C 1366.58 712.175 1376 735.291 1377.81 761.632 C 1381.56 814.302 1334.69 844.845 1301.82 879.124 C 1270.97 911.299 1236.64 943.053 1206 975.744 C 1191.09 991.657 1172.78 1006.57 1158.44 1022.73 L 1157.52 1023.77 C 1175.38 1043.53 1195.17 1062.43 1214.08 1081.23 L 1303.01 1169.54 C 1316.83 1183.22 1331.39 1198.66 1345.68 1211.63 C 1406.46 1266.86 1377.48 1367.86 1293.24 1379.74 C 1291.37 1379.91 1289.49 1380.03 1287.61 1380.1 C 1259.53 1381.13 1237.72 1373.11 1218.26 1352.95 C 1203.69 1337.86 1188.32 1322.85 1173.46 1308.01 L 1107.96 1243.23 C 1080.81 1215.95 1052.35 1186.62 1024.1 1160.62 C 960.986 1219.99 900.94 1284.47 838.73 1344.92 C 816.557 1366.47 803.418 1378.47 770.651 1379.82 C 745.248 1381.01 720.433 1371.94 701.795 1354.63 C 683.054 1337.25 672.123 1313.04 671.48 1287.49 C 671.038 1273.55 676.545 1245.39 685.55 1235.45 C 749.344 1165 828.068 1093.94 892.721 1025.65 C 852.701 988.636 809.361 942.436 770.008 903.595 C 752.403 886.553 734.94 869.364 717.621 852.031 C 694.172 828.727 677.087 815.644 672.077 780.728 C 668.482 754.795 675.371 728.499 691.219 707.659 C 707.318 686.642 730.127 674.854 756.068 671.34 C 759.044 671.124 762.026 670.993 765.01 670.948 C 793.194 670.796 814.297 681.786 833.274 701.717 C 845.322 714.371 858.55 727.288 871.069 739.503 L 1025.11 891.367 z"/>
+</g>
+</svg>

amule-3.1.0.tar.gz/src/icons/client_commentonly.png Added

amule-3.1.0.tar.gz/src/icons/client_commentonly.svg Added

@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(32,28,28)" d="M 1474.99 432.65 C 1474.75 394.392 1468.38 354.925 1496.2 326.089 C 1511.39 310.283 1532.34 301.314 1554.27 301.232 C 1576.79 300.962 1595.06 309.201 1611.2 324.791 C 1641.77 354.325 1634.91 396.047 1635.13 436.244 C 1676.01 447.53 1705.54 468.327 1730.27 503.082 C 1762.48 548.352 1758.54 594.415 1758.79 646.736 L 1758.93 784.862 L 1758.95 1257.5 L 1758.83 1466.85 C 1758.77 1494.29 1760.5 1543.16 1757.76 1567.91 C 1756.04 1584.99 1751.53 1601.68 1744.41 1617.3 C 1726.33 1657.26 1693.09 1688.38 1652.03 1703.81 C 1613.49 1717.88 1567.75 1713.79 1526.89 1713.76 L 1385.73 1713.73 L 965.34 1713.64 L 618.029 1713.67 L 510.151 1713.8 C 489.105 1713.83 468.41 1714.21 447.162 1713.27 C 363.986 1709.62 296.457 1640.62 293.043 1557.77 C 292.214 1537.65 292.802 1516.95 292.835 1496.72 L 292.908 1385.8 L 292.745 1028.03 L 292.822 741.128 L 292.581 641.83 C 292.537 623.976 291.859 601.322 293.087 583.944 C 294.686 562.981 300.256 542.514 309.501 523.632 C 325.698 490.245 352.88 463.441 386.49 447.712 C 395.548 443.522 407.59 439.576 417.156 436.23 C 420.806 398.468 408.688 359.504 436.094 329.298 C 453.104 310.552 472.139 302.975 496.776 301.426 C 518.909 301.883 537.082 308.493 552.966 324.342 C 581.513 352.828 576.071 394.71 576.026 432.453 L 629.584 432.678 C 630.603 394.084 622.715 355.808 651.616 326.771 C 667.858 310.453 686.133 301.672 709.259 301.383 C 730.236 300.953 750.47 309.156 765.226 324.072 C 795.281 354.138 789.166 392.904 789.04 433.013 L 841.845 432.967 C 841.908 394.665 834.871 353.665 863.548 325.538 C 879.675 309.719 898.287 301.652 920.869 301.48 C 942.221 301.26 962.756 309.675 977.813 324.816 C 1007.27 354.176 1001.17 392.886 1001.33 432.142 L 1051.82 432.195 C 1052.22 393.215 1045.41 355.173 1074.42 325.42 C 1089.12 310.258 1109.31 301.65 1130.43 301.538 C 1152.4 301.151 1173.61 309.611 1189.28 325.016 C 1218.56 354.296 1212.15 393.214 1212.13 432.459 C 1229.53 432.877 1248.42 432.502 1265.93 432.5 C 1265.84 394.606 1259.83 353.437 1287.52 325.157 C 1302.41 310.163 1322.6 301.641 1343.73 301.438 C 1365.37 301.484 1386.11 310.133 1401.38 325.48 C 1430.55 354.977 1424.47 392.84 1424.36 432.3 L 1474.99 432.65 z"/>
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 1001.01 459.781 C 1017.07 459.217 1035.79 459.7 1052.05 459.722 L 1052.14 530.224 C 1052.17 548.694 1051.21 578.406 1055.76 595.512 C 1059.17 608.427 1065.81 620.262 1075.06 629.901 C 1105.44 661.629 1158.01 662.718 1189.14 631.552 C 1198.81 621.779 1205.69 609.587 1209.04 596.251 C 1213.02 580.391 1211.81 551.684 1211.76 534.649 L 1211.57 461.275 L 1265.97 461.598 L 1265.85 532.865 C 1265.82 551.374 1264.41 579.532 1268.93 596.535 C 1272.31 609.032 1278.86 620.445 1287.95 629.67 C 1302.8 644.913 1323.11 653.621 1344.39 653.874 C 1365.74 653.924 1386.21 645.419 1401.24 630.26 C 1429.61 601.792 1424.45 566.234 1424.41 528.593 L 1424.56 461.441 C 1441.25 461.189 1459.19 461.652 1475.98 461.774 L 1475.94 534.506 C 1475.94 552.454 1474.63 579.958 1479.01 596.548 C 1482.55 609.586 1489.38 621.495 1498.85 631.133 C 1513.79 646.202 1534.92 654.349 1556.06 654.199 C 1576.73 654.133 1596.51 645.752 1610.93 630.945 C 1638.63 602.841 1634.23 569.942 1634.19 533.523 L 1634.08 467.456 C 1696.77 488.783 1729.29 538.758 1729.76 603.893 L 1729.96 1270.97 L 1730.09 1469.83 C 1730.11 1493.79 1731.48 1552.3 1728.32 1573.72 C 1724.01 1601.52 1711.12 1627.28 1691.45 1647.39 C 1647.95 1691.05 1607.78 1688.17 1551.61 1688.08 L 1446.21 1687.93 L 1047.5 1687.89 L 641.703 1687.93 L 514.819 1687.9 C 493.508 1687.9 462.531 1688.79 442.063 1686.96 C 425.779 1685.54 409.859 1681.34 394.993 1674.55 C 364.159 1659.97 340.359 1633.76 328.808 1601.67 C 317.785 1570.86 321.029 1522.4 321.085 1488.56 L 321.342 1357.63 L 321.134 1002.02 L 321.204 729.839 L 321.033 638.315 C 320.974 601.775 317.904 570.308 334.988 536.358 C 353.05 500.463 379.909 479.545 417.321 466.429 C 418.068 490.527 417.137 515.338 417.438 539.495 C 417.665 557.654 416.092 577.713 420.894 595.212 C 424.634 608.583 431.766 620.76 441.599 630.561 C 456.346 645.301 476.356 653.559 497.206 653.51 C 518.246 653.472 538.373 644.907 552.988 629.771 C 562.586 620.094 569.384 607.998 572.66 594.768 C 577.087 577.53 576.003 549.049 575.918 530.48 L 575.513 461.665 C 592.205 460.963 612.901 461.571 629.897 461.598 L 629.868 530.507 C 629.877 567.55 625.125 601.024 652.369 629.651 C 667.116 644.986 687.335 653.857 708.605 654.326 C 729.533 654.653 749.718 646.571 764.637 631.89 C 793.988 602.776 789.177 566.344 789.136 528.285 L 789.041 460.981 L 841.906 461.062 L 841.67 536.437 C 841.603 553.853 840.112 579.151 844.119 595.43 C 847.285 608.106 853.709 619.734 862.752 629.162 C 877.931 644.831 898.697 653.85 920.508 654.246 C 942.089 654.513 962.89 646.184 978.323 631.096 C 1005.92 603.585 1001.12 565.483 1001.06 529.299 L 1001.01 459.781 z"/>
+<path transform="translate(0,0)" fill="rgb(32,28,28)" d="M 527.527 1262.46 C 585.314 1260.46 653.297 1262.04 711.762 1262.02 L 1070.7 1262.17 L 1384.14 1262.23 L 1478.07 1262.46 C 1490.05 1262.48 1522.13 1259.63 1531.48 1266.7 C 1541.73 1274.46 1536.21 1286.01 1522.47 1287.54 C 1455.9 1288.42 1388.22 1287.87 1321.52 1287.9 L 950.31 1288.02 L 657.722 1287.96 L 564.064 1287.94 C 553.358 1287.94 502.087 1294.26 515.386 1268.31 C 517.212 1264.75 523.656 1262.94 527.527 1262.46 z"/>
+<path transform="translate(0,0)" fill="rgb(32,28,28)" d="M 524.431 1446.36 C 579.862 1444.94 639.359 1445.95 695.032 1445.94 L 1036.34 1446 L 1427.32 1445.84 C 1443.05 1445.92 1517.08 1444.23 1526.44 1447.35 C 1529.95 1448.52 1534.1 1451.12 1535.52 1454.73 C 1536.74 1457.84 1536.54 1460.75 1535.02 1463.69 C 1532.85 1467.89 1529.51 1469.78 1525.2 1471.28 C 1414.41 1472.5 1302.57 1471.59 1191.7 1471.45 L 752.91 1471.61 L 587.825 1471.58 C 566.963 1471.57 543.178 1472.58 522.824 1470.66 C 513.445 1469.78 508.833 1452.08 524.431 1446.36 z"/>
+<path transform="translate(0,0)" fill="rgb(32,28,28)" d="M 522.727 1074.18 C 537.235 1073.41 556.399 1073.87 571.149 1073.9 L 655.295 1074.03 L 908.099 1073.92 L 1329.57 1073.92 L 1465.3 1074.05 C 1482.34 1074.06 1499.34 1074.11 1516.38 1073.67 C 1520.8 1073.76 1525.79 1074.41 1529.68 1076.73 C 1541.81 1083.97 1536.96 1095.78 1524.75 1098.54 L 862.793 1098.6 L 665.433 1098.56 C 620.826 1098.68 576.222 1098.56 531.619 1098.62 C 513.662 1098.64 506.347 1084.57 522.727 1074.18 z"/>
+<path transform="translate(0,0)" fill="rgb(32,28,28)" d="M 721.32 890.501 L 1256.46 890.385 L 1440.54 890.685 L 1496.04 890.963 C 1504.22 890.939 1526.36 888.63 1532.69 894.04 C 1542.96 902.816 1534.16 912.526 1522.52 913.075 C 1502.01 914.041 1481.14 913.242 1460.49 913.228 L 1328.25 913.589 L 788.896 913.356 L 610.531 913.34 C 584.467 913.354 558.578 913.288 532.323 913.718 C 519.845 913.923 505.403 908.565 517.94 893.655 C 519.826 891.412 525.997 890.693 528.884 890.662 C 547.985 890.457 567.65 890.81 586.71 890.762 L 721.32 890.501 z"/>
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 867.756 460.982 L 974.748 461.043 L 974.92 536.917 C 975.001 565.034 978.976 589.251 959.659 612.194 C 938.277 632.382 905.804 634.689 884.1 613.399 C 876.824 606.176 871.795 597.001 869.622 586.982 C 866.992 575.214 867.907 550.774 867.886 537.679 L 867.756 460.982 z"/>
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 1501.42 461.933 C 1535.92 461.096 1574.04 461.993 1608.83 462.067 C 1609.38 482.488 1609.6 505.859 1609.07 526.215 C 1608.29 556.544 1615.42 588.593 1593.21 612.585 C 1571.3 632.943 1537.77 633.182 1516.62 611.965 C 1510.22 605.523 1505.73 597.432 1503.66 588.593 C 1500.84 576.978 1501.99 553.557 1501.93 540.512 L 1501.42 461.933 z"/>
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 443.588 461.202 L 549.817 461.424 C 549.544 486.198 550.353 511.079 549.929 535.817 C 549.461 563.141 554.572 589.447 535.167 611.426 C 504.273 640.844 456.861 630.59 445.069 587.122 C 442.017 575.871 443.781 553.54 443.774 540.927 L 443.588 461.202 z"/>
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 1078.35 461.109 C 1112.86 460.315 1150.01 460.999 1184.72 460.986 L 1184.82 532.571 C 1184.84 561.021 1188.66 588.35 1169.29 611.323 C 1139.43 639.671 1091.4 628.66 1080.39 587.1 C 1076.93 574.05 1078.52 551.8 1078.46 537.638 C 1078.21 512.129 1078.18 486.619 1078.35 461.109 z"/>
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 1292.37 461.776 L 1398.14 461.833 L 1398.24 537.555 C 1398.28 566.713 1403.24 589.84 1382.63 613.132 C 1365.21 629.918 1342.07 632.576 1320.63 622.262 C 1287.37 606.261 1292.61 570.415 1292.54 540.133 L 1292.37 461.776 z"/>
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 753.56 461.48 L 762.381 461.507 L 762.809 533.277 C 762.877 546.797 763.649 569.067 761.555 581.714 C 760.359 589.282 757.678 596.539 753.665 603.066 C 737.18 629.472 704.415 634.29 678.806 618.136 C 650.942 596.511 656.759 568.148 656.767 536.437 L 656.843 461.733 C 688.33 461.041 721.671 461.796 753.56 461.48 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 918.941 328.36 C 932.374 326.684 948.977 333.264 958.447 342.554 C 980.514 364.201 975.024 403.779 974.969 432.656 L 925.5 432.725 L 868.308 432.696 C 868.05 388.076 859.193 336.112 918.941 328.36 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 1124.34 328.179 C 1154.68 325.672 1180.12 344.586 1183.33 374.837 C 1185.21 392.631 1184.13 414.665 1184.07 432.744 L 1139.5 432.777 L 1078.28 432.865 C 1077.78 387.92 1067.84 341.035 1124.34 328.179 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 1336.02 329.223 C 1338.15 329.044 1340.28 328.914 1342.41 328.833 C 1351.92 328.504 1360.5 329.939 1369.18 334.081 C 1405.92 351.606 1398.32 399.034 1398.11 432.653 L 1355.5 432.731 C 1334.72 432.719 1312.99 433.032 1292.31 432.02 C 1290.96 388.744 1283.72 342.929 1336.02 329.223 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 489.433 329.156 C 507.605 327.811 522.856 332.108 535.542 345.931 C 555.166 367.311 549.905 405.273 549.703 432.751 L 506.09 432.708 L 443.877 432.949 C 443.607 389.11 434.193 341.472 489.433 329.156 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 702.95 329.255 C 748.118 324.593 766.428 363.006 762.248 400.865 C 761.312 409.345 762.202 423.636 762.166 432.731 L 717.5 432.79 L 656.713 432.899 C 656.558 389.247 647.307 340.449 702.95 329.255 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 1547.89 329.301 C 1549.91 329.122 1551.97 328.961 1554 328.949 C 1567.98 328.863 1581.42 334.315 1591.39 344.114 C 1613.48 365.753 1608.1 402.59 1607.94 432.495 L 1560.88 432.493 L 1501.89 432.653 C 1501.57 391.007 1492.7 339.018 1547.89 329.301 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/client_creditsgrey.png Added

amule-3.1.0.tar.gz/src/icons/client_creditsgrey.svg Added

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<g transform="translate(773.77,-97.12) scale(0.6807)">
+<path transform="translate(0,0)" fill="rgb(158,158,158)" d="M 1024.66 202.695 C 1030.31 209.156 1093.98 395.927 1101.53 417.521 C 1137.89 518.926 1173.62 620.561 1208.69 722.419 C 1215.41 741.914 1226.19 768.186 1231.5 787.038 C 1330.04 789.333 1433.17 788.108 1532.05 787.793 C 1644.65 787.434 1759.58 789.058 1871.93 787.563 C 1846.89 804.038 1818.51 825.243 1793.75 842.81 L 1641.85 950.044 L 1448.77 1086.78 C 1412.08 1112.77 1369.4 1141.09 1334.35 1168.34 C 1362.65 1246.2 1389.4 1326.15 1417.02 1404.5 L 1546.93 1775.02 C 1515.43 1754.02 1480.07 1727.33 1448.57 1705.28 L 1121.95 1475.45 C 1090.12 1453.4 1057.82 1428.21 1025.45 1407.39 L 1023.02 1406.93 C 1012.69 1412.13 977.204 1439.14 966.002 1447.2 L 846.504 1532.47 L 503.918 1774.74 C 510.154 1753.97 518.032 1733.84 525.096 1713.3 L 580.217 1557.58 C 588.402 1534.68 595.629 1511.31 603.78 1488.37 C 642.023 1381.41 679.665 1274.24 716.704 1166.85 C 692.449 1148.49 661.213 1128.28 635.88 1110.3 L 425.33 961.649 L 260.804 845.088 C 234.161 826.252 206.675 805.951 179.566 788.06 L 818.259 787.748 C 827.434 760.756 838.3 733.705 847.743 706.693 L 954.987 402.417 C 978.633 336.119 1000.41 269.036 1024.66 202.695 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 1025.28 463.649 C 1027.77 466.037 1160.33 846.552 1172.05 878.531 L 1602.03 869.982 C 1592.02 878.525 1575.95 889.179 1564.96 896.846 L 1507.35 937.306 L 1318.22 1069.66 C 1288.52 1090.41 1258.74 1109.45 1229.63 1131.29 C 1237.94 1153.94 1245.33 1178.06 1253.3 1200.94 L 1308.94 1359.61 C 1323.37 1399.69 1337.48 1439.88 1351.26 1480.19 C 1358.63 1501.24 1366.65 1522.62 1373.33 1543.84 C 1333.09 1512.6 1279.71 1477.25 1237.29 1447.27 C 1166.06 1396.29 1094.56 1345.69 1022.78 1295.48 C 1018.42 1296.54 706.029 1521.91 676.317 1543.64 C 725.331 1406.77 773.502 1269.6 820.829 1132.13 C 813.117 1124.99 792.249 1111.38 782.919 1104.96 L 726.731 1065.61 C 655.205 1016.7 584.201 967.033 513.73 916.613 C 493.047 901.733 464.87 884.898 446.508 869.779 C 517.711 870.287 591.767 873.012 662.97 874.765 L 879.172 879.157 C 897.121 834.888 914.685 779.245 930.358 733.524 C 961.174 643.278 992.817 553.316 1025.28 463.649 z"/>
+</g>
+</svg>

amule-3.1.0.tar.gz/src/icons/client_creditsyellow.png Added

amule-3.1.0.tar.gz/src/icons/client_creditsyellow.svg Added

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<g transform="translate(751.40,-116.18) scale(0.7021)">
+<path transform="translate(0,0)" fill="rgb(253,216,53)" d="M 1026.42 197.71 C 1031.71 203.741 1063.53 279.682 1068.4 290.635 L 1205.44 601.303 C 1218.26 630.513 1230.38 660.193 1243.06 689.475 C 1249.64 704.68 1255.41 719.98 1262.86 734.791 C 1316.92 741.059 1374.81 744.846 1429.39 749.94 L 1846.76 788.126 C 1813.41 819.894 1771.1 855.591 1736.12 886.487 L 1538.26 1062.46 C 1506.84 1089.96 1475.66 1117.72 1444.71 1145.74 C 1430.6 1158.28 1416.02 1170.07 1402.28 1183.05 C 1408.04 1202.48 1414.22 1233.54 1418.92 1254.13 L 1448.62 1383.74 L 1538.88 1774.04 C 1524.16 1765.64 1507.39 1754.06 1492.62 1744.88 L 1413.43 1696.66 L 1176.88 1554.55 C 1159.96 1544.3 1142.63 1534.91 1125.83 1524.38 C 1105.97 1512.02 1086.17 1499.55 1066.44 1486.98 C 1059.65 1482.61 1033.04 1463.91 1027.39 1463.81 C 1012.98 1471.34 999.405 1480.28 985.469 1488.68 L 895.235 1543.32 L 514.214 1773.95 C 521.528 1738.48 531.156 1702.09 539.632 1666.79 L 570.426 1533.02 L 610.102 1362.09 L 635.532 1251.7 C 640.791 1228.81 645.144 1207.5 651.062 1184.6 C 631.924 1165.83 607.22 1145.58 586.894 1127.51 C 546.933 1091.59 506.768 1055.89 466.401 1020.43 L 205.961 788.409 L 567.297 755.116 L 728.107 740.47 C 748.843 738.635 770.361 736.086 791.01 734.704 L 944.705 383.15 L 998.452 261.057 C 1007.37 240.783 1016.76 217.37 1026.42 197.71 z"/>
+</g>
+</svg>

amule-3.1.0.tar.gz/src/icons/client_edonkeyhybrid.png Added

amule-3.1.0.tar.gz/src/icons/client_edonkeyhybrid.svg Added

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(158,158,158)" d="M 1006.53 226.421 C 1019.25 225.204 1043.29 226.178 1056.1 227.09 C 1146.69 234.212 1233.44 266.689 1306.43 320.805 C 1366.81 365.267 1416.94 422.184 1453.41 487.702 C 1492.07 558.432 1514.33 636.948 1518.55 717.443 C 1520.2 747.286 1519.21 786.767 1519.28 817.221 L 1519.36 949.52 C 1519.37 1012.1 1519.92 1073.35 1528.7 1136.05 C 1549.35 1283.66 1608.96 1442.6 1721.3 1545.29 C 1731.95 1555.03 1745.11 1564.96 1757.42 1572.34 C 1768.59 1579.02 1781.94 1585.02 1792.23 1592.86 C 1803.7 1601.44 1811.13 1614.36 1812.78 1628.59 C 1817.47 1672.5 1774.75 1689.79 1742.12 1705.63 C 1668.92 1741.17 1580.98 1727.28 1517.09 1678.96 C 1503.9 1669 1490.97 1656.81 1478.72 1646.13 C 1421.94 1596.64 1349.38 1584.96 1285.52 1628.85 C 1259.27 1646.25 1243.24 1663.71 1214.62 1679.91 C 1157.38 1712.32 1113.56 1727.73 1048.25 1733.8 C 979.382 1737.59 910.842 1721.89 850.499 1688.49 C 835.674 1680.11 819.004 1669.42 805.091 1659.59 C 794.083 1651.28 783 1642.24 771.977 1634.04 C 707.92 1586.36 631.874 1592.31 572.71 1644.76 C 560.128 1655.91 547.618 1669.04 533.861 1679.14 C 500.075 1703.92 459.42 1720.37 417.557 1724.26 C 370.945 1728.73 332.13 1718.54 291.229 1696.98 C 279.274 1690.7 268.506 1684.72 257.884 1676.13 C 234.704 1657.4 232.701 1623.56 250.882 1600.82 C 260.488 1588.8 278.59 1582.29 291.184 1573.77 C 300.65 1567.37 310.233 1560.62 319.231 1553.51 C 382.24 1503.24 438.087 1413.15 468.292 1339.24 C 506.138 1244.61 527.308 1144.14 530.863 1042.29 C 532.181 1010.99 531.514 977.557 531.411 946.064 L 531.182 807.911 C 531.109 772.105 530.063 735.418 533.374 699.859 C 543.112 584.113 590.519 474.749 668.336 388.514 C 755.321 292.05 876.853 233.802 1006.53 226.421 z"/>
+<path transform="translate(0,0)" fill="rgb(104,105,109)" d="M 1005.51 292.412 C 1072.8 287.782 1154.26 306.859 1214 337.473 C 1274.3 368.028 1326.75 412.04 1367.32 466.107 C 1421.13 537.864 1452.96 623.686 1458.97 713.172 C 1461.24 745.658 1459.97 784.501 1459.98 817.487 L 1460.61 930.773 C 1460.62 965.203 1460.06 1000.12 1461.35 1034.54 C 1464.84 1127.08 1480.77 1218.74 1508.74 1307.03 C 1543.45 1414.52 1609.14 1530.57 1700.34 1600.46 C 1716.48 1612.82 1732.09 1621.12 1749.97 1630.28 C 1735.56 1641.34 1721.43 1647.85 1704.04 1653.41 C 1647.61 1671.49 1601.28 1658.28 1553.58 1625.2 C 1528.54 1607.83 1504.04 1583.07 1478.69 1568.05 C 1451.71 1553.02 1422.64 1543.78 1392.05 1540.61 C 1339.42 1534.66 1277.81 1554.12 1235.94 1587.09 C 1177.45 1633.14 1122.73 1670.12 1043.9 1673.18 C 982.055 1678.3 909.746 1656.23 859.516 1620.02 C 796.272 1574.42 752.401 1535.17 667.515 1539.83 C 624.508 1542.35 583.294 1557.94 549.377 1584.5 C 506.357 1617.59 481.735 1653.77 419.415 1661.96 C 378.951 1667.28 333.123 1655.81 300.718 1630.72 C 317.911 1621.69 339.263 1610.28 354.728 1598.49 C 406.942 1558.68 450.096 1497.94 481.642 1441.2 C 540.811 1332.84 576.172 1213.1 585.361 1089.98 C 592.865 998.675 589.535 909.549 590.487 818.186 C 590.854 783.015 589.144 740.569 591.826 705.822 C 598.978 608.939 637.155 516.937 700.698 443.454 C 780.495 353.004 884.981 300.048 1005.51 292.412 z"/>
+<path transform="translate(0,0)" fill="rgb(158,158,158)" d="M 1010.1 304.448 C 1237.43 297.948 1419.28 471.654 1445.21 693.169 C 1449.91 733.386 1447.09 772.756 1447.6 812.983 C 1448.4 875.445 1447.32 938.082 1448.47 1000.51 C 1449.35 1082.23 1459.43 1163.6 1478.51 1243.07 C 1513.68 1391.06 1593.06 1549.85 1726.36 1631.87 C 1668.17 1663.84 1603.43 1649.46 1553.58 1610.22 C 1534.47 1595.19 1503.56 1569 1483.89 1557.72 C 1448.77 1537.68 1408.91 1527.44 1368.48 1528.07 C 1325.82 1529.29 1284.24 1541.79 1247.98 1564.3 C 1229.58 1575.7 1212.34 1590.47 1194.77 1603.33 C 1147.76 1637.75 1100.11 1658.05 1041.15 1661.17 C 976.083 1666.3 912.708 1643.1 860.424 1605.54 C 831.021 1584.42 804.334 1562.79 771.182 1547.5 C 695.503 1513.29 607.058 1524.14 541.899 1575.64 C 510.918 1599.76 486.527 1629.52 447.494 1642.87 C 401.569 1658.57 366.962 1651.87 324.898 1632.51 C 396.811 1590.66 443.825 1529.83 485.596 1459.19 C 560.607 1332.32 595.321 1179.99 600.6 1033.63 C 603.258 959.967 601.135 884.601 602.115 810.789 C 602.579 775.909 600.908 738.861 603.884 704.264 C 611.92 606.281 652.535 513.81 719.251 441.599 C 795.271 359.426 897.841 308.867 1010.1 304.448 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/client_encryption.png Added

amule-3.1.0.tar.gz/src/icons/client_encryption.svg Added

@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<g transform="translate(-153.58,-2.79) scale(0.5019)">
+<defs>
+	<linearGradient id="Gradient1" gradientUnits="userSpaceOnUse" x1="1333.15" y1="1399.31" x2="676.262" y2="624.516">
+		<stop class="stop0" offset="0" stop-opacity="1" stop-color="rgb(53,113,168)"/>
+		<stop class="stop1" offset="1" stop-opacity="1" stop-color="rgb(91,151,205)"/>
+	</linearGradient>
+</defs>
+<path transform="translate(0,0)" fill="rgb(51,51,51)" d="M 577.062 690.533 C 587.934 686.663 605.937 683.698 617.617 681.953 C 683.175 672.162 754.87 681.876 815.009 709.996 C 817.259 711.048 820.662 712.749 822.707 714.044 C 830.725 716.938 849.859 727.779 857.019 732.664 C 866.934 738.108 879.33 747.483 888.316 754.621 C 930.016 787.746 955.074 821.527 979.975 867.967 C 1079.8 865.121 1183.08 866.128 1283.24 864.534 L 1529.91 861.5 C 1568.95 861.109 1613.12 859.644 1651.68 860.29 C 1668.2 872.685 1695.77 901.009 1711.54 915.892 C 1752.54 955.216 1794.05 993.993 1836.08 1032.21 C 1808.75 1059.25 1775.82 1087.72 1747.29 1114.24 C 1723.14 1136.79 1698.86 1159.19 1674.46 1181.46 C 1661.33 1193.52 1647.37 1206.94 1633.85 1218.39 C 1618.99 1204.2 1604.2 1187.49 1590.22 1172.26 C 1572.39 1152.71 1554.39 1133.32 1536.22 1114.08 C 1528.46 1105.74 1519.2 1095.17 1511.24 1087.43 C 1466.49 1129.05 1423.28 1173.95 1378.71 1214.78 L 1308.23 1138.57 C 1292.15 1121.03 1274.29 1100.81 1257.56 1084.05 C 1236.64 1104.3 1215.54 1124.37 1194.27 1144.25 C 1186.53 1151.62 1175.29 1163.79 1167.86 1169.99 C 1104.75 1170.06 1040.89 1167.91 977.647 1167.48 C 939.426 1252.59 880.165 1312.29 791.911 1345.97 C 704.769 1379.09 608.081 1376.5 522.833 1338.78 C 440.354 1301.71 371.093 1232.74 338.875 1147.78 C 305.98 1062.57 308.572 967.73 346.074 884.442 C 365.409 842.327 392.688 804.338 426.416 772.559 C 430.106 769.108 442.414 758.06 446.372 755.74 C 458.126 745.339 486.068 726.825 500.699 720.325 C 503.024 717.873 519.943 710.292 524.002 708.672 C 537.378 702.415 562.764 693.569 577.062 690.533 z"/>
+<path transform="translate(0,0)" fill="rgb(1,1,1)" d="M 500.699 720.325 C 500.38 724.22 491.24 727.897 487.362 730.135 C 480.292 734.217 474.229 738.396 467.434 742.723 L 464.435 744.724 L 463.027 745.664 C 457.015 749.362 453.164 755.12 446.372 755.74 C 458.126 745.339 486.068 726.825 500.699 720.325 z"/>
+<path transform="translate(0,0)" fill="rgb(1,1,1)" d="M 524.002 708.672 C 537.378 702.415 562.764 693.569 577.062 690.533 C 577.679 693.215 572.917 694.388 570.534 695.086 C 556.903 699.081 543.255 703.624 529.956 708.368 C 525.916 709.81 527.837 711.01 524.002 708.672 z"/>
+<path transform="translate(0,0)" fill="rgb(1,1,1)" d="M 822.707 714.044 C 830.725 716.938 849.859 727.779 857.019 732.664 C 852.851 734.797 846.943 728.758 843.407 726.246 C 843.079 726.456 842.751 726.666 842.423 726.877 C 842.396 726.869 832.413 721.09 831.031 720.434 L 829.587 719.701 C 827.69 718.757 822.212 716.46 822.707 714.044 z"/>
+<path transform="translate(0,0)" fill="rgb(1,1,1)" d="M 657.622 722.428 C 696.483 720.116 750.429 732.217 786.186 747.644 C 864.06 781.243 917.354 837.877 948.862 916.062 C 1001.14 916.15 1052.08 914.506 1104 914.097 L 1383.74 911.686 C 1467.4 909.84 1551.06 908.621 1634.74 908.027 C 1677.91 950.038 1722.05 990.408 1765.26 1032.1 C 1754 1044.08 1739.37 1056.49 1727.25 1067.78 C 1697.04 1095.92 1663.86 1123.02 1634.88 1152.31 C 1615.74 1134.24 1591.61 1106.24 1573.45 1086.24 C 1554.37 1065.23 1529.13 1039.47 1511.65 1017.88 C 1468.29 1061.52 1424.13 1104.36 1379.19 1146.38 C 1368.46 1136.09 1353.08 1118.2 1342.75 1106.84 C 1338.34 1100.87 1322.14 1084.13 1316.41 1077.88 C 1297.19 1057.13 1278.18 1036.19 1259.39 1015.05 C 1232.53 1043.21 1203.58 1069.16 1175.99 1096.6 C 1167.95 1104.6 1157.66 1114.96 1148.69 1121.72 C 1132.21 1122.8 1099.42 1120.38 1081.05 1120.38 C 1037.47 1120.38 993.391 1120.18 949.91 1117.98 C 939.183 1152.9 918.815 1188.68 894.804 1216.08 C 841.767 1277.35 766.341 1314.74 685.467 1319.86 C 603.457 1325.18 522.74 1297.38 461.407 1242.68 C 346.609 1140.98 331.273 961.819 424.785 841.3 C 483.898 765.113 562.023 727.666 657.622 722.428 z"/>
+<path transform="translate(0,0)" fill="url(#Gradient1)" d="M 647.466 726.402 C 698.759 721.184 765.653 738.83 810.796 763.15 C 868.115 794.03 927.263 856.312 945.928 919.726 C 960.516 918.744 980.72 919.189 995.644 919.13 C 1023.52 919.106 1051.39 918.827 1079.26 918.292 L 1468.95 913.304 C 1521.71 912.566 1581.23 914.041 1633.38 911.253 C 1655.26 932.926 1678.1 954.152 1700.43 975.452 C 1719.83 993.959 1741.19 1015.08 1761.65 1032.2 C 1750.58 1040.31 1727.66 1062.51 1716.8 1072.4 C 1689.16 1097.26 1661.77 1122.4 1634.63 1147.8 C 1594.17 1105.88 1550.4 1056.74 1511.36 1013.01 C 1470.5 1055.52 1422.34 1101.33 1379.5 1142.11 L 1350.02 1109.76 C 1319.81 1077.24 1290.01 1043.15 1259.6 1010.91 L 1185.93 1082 C 1173.74 1093.72 1160.63 1107.36 1147.87 1118.01 C 1130.31 1118.43 1107.81 1117.47 1089.9 1117.29 C 1042.49 1116.76 995.087 1115.99 947.685 1114.97 C 933.4 1153.7 921.904 1178.54 894.298 1210.91 C 842.356 1272.9 767.387 1311.05 686.693 1316.54 C 607.226 1322.25 528.73 1296.26 468.385 1244.24 C 409.802 1193.99 373.589 1122.52 367.719 1045.56 C 361.517 967.147 386.848 889.501 438.097 829.832 C 492.823 766.621 564.509 732.469 647.466 726.402 z"/>
+</g>
+</svg>

amule-3.1.0.tar.gz/src/icons/client_excellentrating.png Added

amule-3.1.0.tar.gz/src/icons/client_excellentrating.svg Added

@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<g transform="translate(-418.17,157.97) scale(0.909)">
+<path transform="translate(0,0)" fill="rgb(32,27,26)" d="M 854.886 209.371 C 874.714 208.048 901.43 208.895 921.948 208.93 L 1042.05 208.996 L 1143.79 208.915 C 1175.67 208.885 1208.32 205.518 1237.63 220.255 C 1263.03 233.344 1282.16 256.024 1290.78 283.267 C 1299 308.923 1294.56 329.387 1296.32 354.656 C 1300.79 418.935 1283.08 472.085 1214.89 493.81 L 1214.97 620.966 C 1214.99 669.182 1211.11 714.879 1223.55 761.895 C 1237.62 815.047 1266.81 834.356 1303.86 870.313 C 1345.89 910.869 1386.09 953.698 1428.12 994.214 C 1491.88 1055.69 1532.84 1147.25 1544.01 1234.98 C 1559.04 1345.11 1529.54 1456.68 1462.04 1544.98 C 1394.54 1631.93 1304.88 1681.97 1196.11 1695.75 C 1154.67 1699.93 1105.77 1698.4 1063.5 1698.49 C 1007.2 1698.6 950.14 1698.72 893.849 1697.96 C 788.132 1696.53 690.827 1653.79 617.776 1577.02 C 501.945 1453.06 471.629 1271.78 540.824 1116.87 C 556.964 1079.87 579.382 1039.87 608.06 1011.34 C 620.211 999.25 632.43 987.218 644.48 975.022 L 753.306 864.72 C 779.241 838.23 805.39 818.655 820.864 783.554 C 841.892 735.853 837.446 691.111 837.248 640.501 C 836.96 591.592 837.202 542.682 837.973 493.779 C 766.122 470.863 754.709 422.144 757.144 354.728 C 758.553 315.714 751.467 283.889 779.698 249.858 C 800.558 224.713 822.735 213.261 854.886 209.371 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 825.982 1047.48 C 883.817 1045.53 953.506 1061.38 1005.55 1085.93 C 1022.61 1093.72 1038.32 1103.64 1055.41 1111.46 C 1155.76 1157.38 1269.42 1162.14 1375.76 1135.88 C 1395.44 1131.02 1413.5 1124.34 1432.52 1117.3 C 1443.23 1130.36 1454.87 1163.85 1460.11 1180.53 C 1515.22 1356.24 1429.58 1561.53 1244.26 1614.66 C 1196.98 1628.08 1154.01 1628.03 1105.55 1628.01 L 1008.7 1628.01 C 885.394 1628.14 785.301 1638.15 685.889 1548.48 C 558.293 1433.38 541.932 1241.49 630.077 1098.07 C 636.955 1086.87 645.616 1087.56 656.8 1083.25 C 712.23 1061.87 766.576 1049.14 825.982 1047.48 z"/>
+<path transform="translate(0,0)" fill="rgb(76,175,80)" d="M 808.103 1051.42 C 814.883 1050.63 827.696 1050.78 834.823 1050.81 C 892.769 1051.37 949.96 1064.02 1002.73 1087.96 C 1021.98 1096.58 1040.15 1108.35 1060.5 1117.42 C 1175.21 1168.53 1315.27 1165.56 1431.49 1121.31 C 1438.35 1132.5 1444.65 1147.13 1449.33 1159.55 C 1515.74 1335.77 1441.45 1537.55 1260.76 1606.46 C 1249.83 1609.98 1238.75 1613 1227.54 1615.52 C 1165.91 1628.95 1085.05 1623.94 1020.8 1624.05 L 940.894 1624.45 C 900.046 1624.69 874.06 1625.57 833.676 1617.81 C 794.612 1610.48 757.353 1595.6 723.988 1574.01 C 652.457 1527.97 604.51 1451.7 586.526 1369.29 C 565.874 1274.53 583.973 1175.44 636.794 1094.09 C 645.587 1089.65 660.787 1084.75 670.435 1081.47 C 718.079 1065.3 758.242 1055.12 808.103 1051.42 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 915.006 495.022 L 1050.09 495.28 C 1078.49 495.271 1109.94 494.663 1138.1 495.72 L 1137.95 643.576 C 1138.02 703.227 1135.43 764.158 1164.42 818.75 C 1196.46 878.712 1229.25 902.303 1276.77 948.92 C 1314.57 985.315 1352.04 1022.04 1389.19 1059.1 C 1304.4 1094.08 1175.14 1090.03 1090.98 1053.97 C 1073.82 1046.61 1059.06 1036.09 1042.67 1028.11 C 996.57 1006.16 947.149 992.009 896.42 986.235 C 856.04 981.491 813.799 981.629 773.459 987.406 C 765.512 988.545 728.137 997.389 723.876 995.877 C 741.672 981.846 763.936 957.075 781.532 941.341 C 848.14 881.782 901.157 829.288 912.681 735.245 C 916.322 705.531 914.964 672.632 914.96 642.044 L 915.006 495.022 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 864.477 280.408 C 864.549 280.399 864.622 280.391 864.694 280.383 C 889.266 279.763 914.968 279.919 939.417 280.025 C 976.381 280.238 1013.35 280.256 1050.31 280.079 L 1140.56 279.994 C 1173.9 280.044 1226.56 271.606 1225.91 322.854 C 1225.61 347.042 1227.19 373.304 1224.05 397.036 C 1221.74 414.577 1205.19 421.58 1189.25 422.008 L 961.999 423.016 L 894.482 423.148 C 882.673 423.173 846.874 424.879 837.939 418.678 C 820.894 405.079 824.919 373.379 824.951 353.998 C 825.012 317.296 818.123 284.52 864.477 280.408 z"/>
+<path transform="translate(0,0)" fill="rgb(187,136,41)" d="M 879.526 283.493 L 1083.35 283.61 L 1152.42 283.641 C 1165.76 283.66 1180.28 283.167 1193.34 284.377 C 1211.6 286.068 1222.41 304.939 1222.08 321.895 C 1221.77 337.114 1222.15 351.943 1221.95 367.124 C 1221.77 381.221 1223.85 399.44 1213.37 410.432 C 1202.91 421.153 1186.23 419.355 1172.5 419.192 L 951.472 419.112 L 885.783 419.27 C 861.305 419.345 828.306 426.042 828.816 390.15 C 829.204 362.87 826.793 333.014 830.114 306.112 C 832.848 283.965 863.054 283.557 879.526 283.493 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 712.305 1002.69 C 714.56 999.939 720.465 991.942 723.876 995.877 C 723.348 1001.66 717.373 1003.25 712.305 1002.69 z"/>
+</g>
+<g transform="translate(620.29,157.97) scale(0.909)">
+<path transform="translate(0,0)" fill="rgb(32,27,26)" d="M 854.886 209.371 C 874.714 208.048 901.43 208.895 921.948 208.93 L 1042.05 208.996 L 1143.79 208.915 C 1175.67 208.885 1208.32 205.518 1237.63 220.255 C 1263.03 233.344 1282.16 256.024 1290.78 283.267 C 1299 308.923 1294.56 329.387 1296.32 354.656 C 1300.79 418.935 1283.08 472.085 1214.89 493.81 L 1214.97 620.966 C 1214.99 669.182 1211.11 714.879 1223.55 761.895 C 1237.62 815.047 1266.81 834.356 1303.86 870.313 C 1345.89 910.869 1386.09 953.698 1428.12 994.214 C 1491.88 1055.69 1532.84 1147.25 1544.01 1234.98 C 1559.04 1345.11 1529.54 1456.68 1462.04 1544.98 C 1394.54 1631.93 1304.88 1681.97 1196.11 1695.75 C 1154.67 1699.93 1105.77 1698.4 1063.5 1698.49 C 1007.2 1698.6 950.14 1698.72 893.849 1697.96 C 788.132 1696.53 690.827 1653.79 617.776 1577.02 C 501.945 1453.06 471.629 1271.78 540.824 1116.87 C 556.964 1079.87 579.382 1039.87 608.06 1011.34 C 620.211 999.25 632.43 987.218 644.48 975.022 L 753.306 864.72 C 779.241 838.23 805.39 818.655 820.864 783.554 C 841.892 735.853 837.446 691.111 837.248 640.501 C 836.96 591.592 837.202 542.682 837.973 493.779 C 766.122 470.863 754.709 422.144 757.144 354.728 C 758.553 315.714 751.467 283.889 779.698 249.858 C 800.558 224.713 822.735 213.261 854.886 209.371 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 825.982 1047.48 C 883.817 1045.53 953.506 1061.38 1005.55 1085.93 C 1022.61 1093.72 1038.32 1103.64 1055.41 1111.46 C 1155.76 1157.38 1269.42 1162.14 1375.76 1135.88 C 1395.44 1131.02 1413.5 1124.34 1432.52 1117.3 C 1443.23 1130.36 1454.87 1163.85 1460.11 1180.53 C 1515.22 1356.24 1429.58 1561.53 1244.26 1614.66 C 1196.98 1628.08 1154.01 1628.03 1105.55 1628.01 L 1008.7 1628.01 C 885.394 1628.14 785.301 1638.15 685.889 1548.48 C 558.293 1433.38 541.932 1241.49 630.077 1098.07 C 636.955 1086.87 645.616 1087.56 656.8 1083.25 C 712.23 1061.87 766.576 1049.14 825.982 1047.48 z"/>
+<path transform="translate(0,0)" fill="rgb(76,175,80)" d="M 808.103 1051.42 C 814.883 1050.63 827.696 1050.78 834.823 1050.81 C 892.769 1051.37 949.96 1064.02 1002.73 1087.96 C 1021.98 1096.58 1040.15 1108.35 1060.5 1117.42 C 1175.21 1168.53 1315.27 1165.56 1431.49 1121.31 C 1438.35 1132.5 1444.65 1147.13 1449.33 1159.55 C 1515.74 1335.77 1441.45 1537.55 1260.76 1606.46 C 1249.83 1609.98 1238.75 1613 1227.54 1615.52 C 1165.91 1628.95 1085.05 1623.94 1020.8 1624.05 L 940.894 1624.45 C 900.046 1624.69 874.06 1625.57 833.676 1617.81 C 794.612 1610.48 757.353 1595.6 723.988 1574.01 C 652.457 1527.97 604.51 1451.7 586.526 1369.29 C 565.874 1274.53 583.973 1175.44 636.794 1094.09 C 645.587 1089.65 660.787 1084.75 670.435 1081.47 C 718.079 1065.3 758.242 1055.12 808.103 1051.42 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 915.006 495.022 L 1050.09 495.28 C 1078.49 495.271 1109.94 494.663 1138.1 495.72 L 1137.95 643.576 C 1138.02 703.227 1135.43 764.158 1164.42 818.75 C 1196.46 878.712 1229.25 902.303 1276.77 948.92 C 1314.57 985.315 1352.04 1022.04 1389.19 1059.1 C 1304.4 1094.08 1175.14 1090.03 1090.98 1053.97 C 1073.82 1046.61 1059.06 1036.09 1042.67 1028.11 C 996.57 1006.16 947.149 992.009 896.42 986.235 C 856.04 981.491 813.799 981.629 773.459 987.406 C 765.512 988.545 728.137 997.389 723.876 995.877 C 741.672 981.846 763.936 957.075 781.532 941.341 C 848.14 881.782 901.157 829.288 912.681 735.245 C 916.322 705.531 914.964 672.632 914.96 642.044 L 915.006 495.022 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 864.477 280.408 C 864.549 280.399 864.622 280.391 864.694 280.383 C 889.266 279.763 914.968 279.919 939.417 280.025 C 976.381 280.238 1013.35 280.256 1050.31 280.079 L 1140.56 279.994 C 1173.9 280.044 1226.56 271.606 1225.91 322.854 C 1225.61 347.042 1227.19 373.304 1224.05 397.036 C 1221.74 414.577 1205.19 421.58 1189.25 422.008 L 961.999 423.016 L 894.482 423.148 C 882.673 423.173 846.874 424.879 837.939 418.678 C 820.894 405.079 824.919 373.379 824.951 353.998 C 825.012 317.296 818.123 284.52 864.477 280.408 z"/>
+<path transform="translate(0,0)" fill="rgb(187,136,41)" d="M 879.526 283.493 L 1083.35 283.61 L 1152.42 283.641 C 1165.76 283.66 1180.28 283.167 1193.34 284.377 C 1211.6 286.068 1222.41 304.939 1222.08 321.895 C 1221.77 337.114 1222.15 351.943 1221.95 367.124 C 1221.77 381.221 1223.85 399.44 1213.37 410.432 C 1202.91 421.153 1186.23 419.355 1172.5 419.192 L 951.472 419.112 L 885.783 419.27 C 861.305 419.345 828.306 426.042 828.816 390.15 C 829.204 362.87 826.793 333.014 830.114 306.112 C 832.848 283.965 863.054 283.557 879.526 283.493 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 712.305 1002.69 C 714.56 999.939 720.465 991.942 723.876 995.877 C 723.348 1001.66 717.373 1003.25 712.305 1002.69 z"/>
+</g>
+</svg>

amule-3.1.0.tar.gz/src/icons/client_extendedprotocol.png Added

amule-3.1.0.tar.gz/src/icons/client_extendedprotocol.svg Added

amule-3.1.0.tar.gz/src/icons/client_fairrating.png Added

amule-3.1.0.tar.gz/src/icons/client_fairrating.svg Added

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<g transform="translate(101.06,157.97) scale(0.909)">
+<path transform="translate(0,0)" fill="rgb(32,27,26)" d="M 854.886 209.371 C 874.714 208.048 901.43 208.895 921.948 208.93 L 1042.05 208.996 L 1143.79 208.915 C 1175.67 208.885 1208.32 205.518 1237.63 220.255 C 1263.03 233.344 1282.16 256.024 1290.78 283.267 C 1299 308.923 1294.56 329.387 1296.32 354.656 C 1300.79 418.935 1283.08 472.085 1214.89 493.81 L 1214.97 620.966 C 1214.99 669.182 1211.11 714.879 1223.55 761.895 C 1237.62 815.047 1266.81 834.356 1303.86 870.313 C 1345.89 910.869 1386.09 953.698 1428.12 994.214 C 1491.88 1055.69 1532.84 1147.25 1544.01 1234.98 C 1559.04 1345.11 1529.54 1456.68 1462.04 1544.98 C 1394.54 1631.93 1304.88 1681.97 1196.11 1695.75 C 1154.67 1699.93 1105.77 1698.4 1063.5 1698.49 C 1007.2 1698.6 950.14 1698.72 893.849 1697.96 C 788.132 1696.53 690.827 1653.79 617.776 1577.02 C 501.945 1453.06 471.629 1271.78 540.824 1116.87 C 556.964 1079.87 579.382 1039.87 608.06 1011.34 C 620.211 999.25 632.43 987.218 644.48 975.022 L 753.306 864.72 C 779.241 838.23 805.39 818.655 820.864 783.554 C 841.892 735.853 837.446 691.111 837.248 640.501 C 836.96 591.592 837.202 542.682 837.973 493.779 C 766.122 470.863 754.709 422.144 757.144 354.728 C 758.553 315.714 751.467 283.889 779.698 249.858 C 800.558 224.713 822.735 213.261 854.886 209.371 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 825.982 1047.48 C 883.817 1045.53 953.506 1061.38 1005.55 1085.93 C 1022.61 1093.72 1038.32 1103.64 1055.41 1111.46 C 1155.76 1157.38 1269.42 1162.14 1375.76 1135.88 C 1395.44 1131.02 1413.5 1124.34 1432.52 1117.3 C 1443.23 1130.36 1454.87 1163.85 1460.11 1180.53 C 1515.22 1356.24 1429.58 1561.53 1244.26 1614.66 C 1196.98 1628.08 1154.01 1628.03 1105.55 1628.01 L 1008.7 1628.01 C 885.394 1628.14 785.301 1638.15 685.889 1548.48 C 558.293 1433.38 541.932 1241.49 630.077 1098.07 C 636.955 1086.87 645.616 1087.56 656.8 1083.25 C 712.23 1061.87 766.576 1049.14 825.982 1047.48 z"/>
+<path transform="translate(0,0)" fill="rgb(230,126,34)" d="M 808.103 1051.42 C 814.883 1050.63 827.696 1050.78 834.823 1050.81 C 892.769 1051.37 949.96 1064.02 1002.73 1087.96 C 1021.98 1096.58 1040.15 1108.35 1060.5 1117.42 C 1175.21 1168.53 1315.27 1165.56 1431.49 1121.31 C 1438.35 1132.5 1444.65 1147.13 1449.33 1159.55 C 1515.74 1335.77 1441.45 1537.55 1260.76 1606.46 C 1249.83 1609.98 1238.75 1613 1227.54 1615.52 C 1165.91 1628.95 1085.05 1623.94 1020.8 1624.05 L 940.894 1624.45 C 900.046 1624.69 874.06 1625.57 833.676 1617.81 C 794.612 1610.48 757.353 1595.6 723.988 1574.01 C 652.457 1527.97 604.51 1451.7 586.526 1369.29 C 565.874 1274.53 583.973 1175.44 636.794 1094.09 C 645.587 1089.65 660.787 1084.75 670.435 1081.47 C 718.079 1065.3 758.242 1055.12 808.103 1051.42 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 915.006 495.022 L 1050.09 495.28 C 1078.49 495.271 1109.94 494.663 1138.1 495.72 L 1137.95 643.576 C 1138.02 703.227 1135.43 764.158 1164.42 818.75 C 1196.46 878.712 1229.25 902.303 1276.77 948.92 C 1314.57 985.315 1352.04 1022.04 1389.19 1059.1 C 1304.4 1094.08 1175.14 1090.03 1090.98 1053.97 C 1073.82 1046.61 1059.06 1036.09 1042.67 1028.11 C 996.57 1006.16 947.149 992.009 896.42 986.235 C 856.04 981.491 813.799 981.629 773.459 987.406 C 765.512 988.545 728.137 997.389 723.876 995.877 C 741.672 981.846 763.936 957.075 781.532 941.341 C 848.14 881.782 901.157 829.288 912.681 735.245 C 916.322 705.531 914.964 672.632 914.96 642.044 L 915.006 495.022 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 864.477 280.408 C 864.549 280.399 864.622 280.391 864.694 280.383 C 889.266 279.763 914.968 279.919 939.417 280.025 C 976.381 280.238 1013.35 280.256 1050.31 280.079 L 1140.56 279.994 C 1173.9 280.044 1226.56 271.606 1225.91 322.854 C 1225.61 347.042 1227.19 373.304 1224.05 397.036 C 1221.74 414.577 1205.19 421.58 1189.25 422.008 L 961.999 423.016 L 894.482 423.148 C 882.673 423.173 846.874 424.879 837.939 418.678 C 820.894 405.079 824.919 373.379 824.951 353.998 C 825.012 317.296 818.123 284.52 864.477 280.408 z"/>
+<path transform="translate(0,0)" fill="rgb(187,136,41)" d="M 879.526 283.493 L 1083.35 283.61 L 1152.42 283.641 C 1165.76 283.66 1180.28 283.167 1193.34 284.377 C 1211.6 286.068 1222.41 304.939 1222.08 321.895 C 1221.77 337.114 1222.15 351.943 1221.95 367.124 C 1221.77 381.221 1223.85 399.44 1213.37 410.432 C 1202.91 421.153 1186.23 419.355 1172.5 419.192 L 951.472 419.112 L 885.783 419.27 C 861.305 419.345 828.306 426.042 828.816 390.15 C 829.204 362.87 826.793 333.014 830.114 306.112 C 832.848 283.965 863.054 283.557 879.526 283.493 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 712.305 1002.69 C 714.56 999.939 720.465 991.942 723.876 995.877 C 723.348 1001.66 717.373 1003.25 712.305 1002.69 z"/>
+</g>
+</svg>

amule-3.1.0.tar.gz/src/icons/client_friend.png Added

amule-3.1.0.tar.gz/src/icons/client_friend.svg Added

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 749.823 938.494 L 988.749 938.241 L 1073.33 938.425 C 1092.98 938.472 1114.23 938.117 1133.69 939.798 C 1218.82 947.11 1298.61 984.344 1358.9 1044.89 C 1411.33 1096.49 1445.63 1163.69 1456.66 1236.42 C 1459.95 1259.35 1460.2 1280.29 1460.35 1303.43 L 1460.69 1470.09 C 1460.8 1540.98 1469.91 1606.44 1414.8 1661.77 C 1390.95 1685.79 1360.84 1702.65 1327.89 1710.41 C 1297.23 1717.87 1246.95 1715.71 1213.72 1715.62 L 1085.5 1715.39 L 689.28 1715.46 L 591.338 1715.65 C 567.713 1715.7 535.12 1716.63 512.461 1712.32 C 479.728 1706.14 449.459 1690.69 425.259 1667.81 C 392.566 1636.42 373.671 1594 374.055 1549.02 C 374.536 1492.74 374.051 1435.46 374.355 1379.42 C 374.833 1291.22 365.902 1217.6 409.264 1136.45 C 430.297 1097.08 443.006 1077.89 474.969 1045.2 C 535.101 983.703 613.332 949.993 698.047 940.112 C 714.206 938.227 733.338 938.582 749.823 938.494 z"/>
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 907.938 238.256 C 1089.12 234.612 1238.91 378.621 1242.39 559.806 C 1245.88 740.991 1101.73 890.652 920.547 893.976 C 739.585 897.296 590.151 753.374 586.671 572.415 C 583.192 391.456 726.982 241.896 907.938 238.256 z"/>
+<path transform="translate(0,0)" fill="rgb(229,57,53)" d="M 1493.17 604.381 C 1532.63 599.085 1579.9 617.263 1603.24 650.134 C 1615.61 632.654 1628.14 623.761 1648.24 614.943 C 1733.48 577.546 1838.81 641.443 1837.34 736.735 C 1836.41 797.187 1801.45 820.055 1761.59 858.433 L 1693.7 925.114 C 1684.24 934.368 1674.88 943.734 1665.63 953.21 C 1649.45 969.632 1637.72 984.679 1613.6 988.448 C 1600.33 990.521 1577.51 986.426 1567.73 977.68 C 1552.48 964.046 1536.58 947.101 1521.53 932.73 L 1443.12 857.758 C 1407.78 824.361 1375.89 803.38 1369 751.278 C 1364.61 719.211 1373.28 686.725 1393.05 661.104 C 1418.25 628.736 1452.52 609.213 1493.17 604.381 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/client_goodrating.png Added

amule-3.1.0.tar.gz/src/icons/client_goodrating.svg Added

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<g transform="translate(101.06,157.97) scale(0.909)">
+<path transform="translate(0,0)" fill="rgb(32,27,26)" d="M 854.886 209.371 C 874.714 208.048 901.43 208.895 921.948 208.93 L 1042.05 208.996 L 1143.79 208.915 C 1175.67 208.885 1208.32 205.518 1237.63 220.255 C 1263.03 233.344 1282.16 256.024 1290.78 283.267 C 1299 308.923 1294.56 329.387 1296.32 354.656 C 1300.79 418.935 1283.08 472.085 1214.89 493.81 L 1214.97 620.966 C 1214.99 669.182 1211.11 714.879 1223.55 761.895 C 1237.62 815.047 1266.81 834.356 1303.86 870.313 C 1345.89 910.869 1386.09 953.698 1428.12 994.214 C 1491.88 1055.69 1532.84 1147.25 1544.01 1234.98 C 1559.04 1345.11 1529.54 1456.68 1462.04 1544.98 C 1394.54 1631.93 1304.88 1681.97 1196.11 1695.75 C 1154.67 1699.93 1105.77 1698.4 1063.5 1698.49 C 1007.2 1698.6 950.14 1698.72 893.849 1697.96 C 788.132 1696.53 690.827 1653.79 617.776 1577.02 C 501.945 1453.06 471.629 1271.78 540.824 1116.87 C 556.964 1079.87 579.382 1039.87 608.06 1011.34 C 620.211 999.25 632.43 987.218 644.48 975.022 L 753.306 864.72 C 779.241 838.23 805.39 818.655 820.864 783.554 C 841.892 735.853 837.446 691.111 837.248 640.501 C 836.96 591.592 837.202 542.682 837.973 493.779 C 766.122 470.863 754.709 422.144 757.144 354.728 C 758.553 315.714 751.467 283.889 779.698 249.858 C 800.558 224.713 822.735 213.261 854.886 209.371 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 825.982 1047.48 C 883.817 1045.53 953.506 1061.38 1005.55 1085.93 C 1022.61 1093.72 1038.32 1103.64 1055.41 1111.46 C 1155.76 1157.38 1269.42 1162.14 1375.76 1135.88 C 1395.44 1131.02 1413.5 1124.34 1432.52 1117.3 C 1443.23 1130.36 1454.87 1163.85 1460.11 1180.53 C 1515.22 1356.24 1429.58 1561.53 1244.26 1614.66 C 1196.98 1628.08 1154.01 1628.03 1105.55 1628.01 L 1008.7 1628.01 C 885.394 1628.14 785.301 1638.15 685.889 1548.48 C 558.293 1433.38 541.932 1241.49 630.077 1098.07 C 636.955 1086.87 645.616 1087.56 656.8 1083.25 C 712.23 1061.87 766.576 1049.14 825.982 1047.48 z"/>
+<path transform="translate(0,0)" fill="rgb(76,175,80)" d="M 808.103 1051.42 C 814.883 1050.63 827.696 1050.78 834.823 1050.81 C 892.769 1051.37 949.96 1064.02 1002.73 1087.96 C 1021.98 1096.58 1040.15 1108.35 1060.5 1117.42 C 1175.21 1168.53 1315.27 1165.56 1431.49 1121.31 C 1438.35 1132.5 1444.65 1147.13 1449.33 1159.55 C 1515.74 1335.77 1441.45 1537.55 1260.76 1606.46 C 1249.83 1609.98 1238.75 1613 1227.54 1615.52 C 1165.91 1628.95 1085.05 1623.94 1020.8 1624.05 L 940.894 1624.45 C 900.046 1624.69 874.06 1625.57 833.676 1617.81 C 794.612 1610.48 757.353 1595.6 723.988 1574.01 C 652.457 1527.97 604.51 1451.7 586.526 1369.29 C 565.874 1274.53 583.973 1175.44 636.794 1094.09 C 645.587 1089.65 660.787 1084.75 670.435 1081.47 C 718.079 1065.3 758.242 1055.12 808.103 1051.42 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 915.006 495.022 L 1050.09 495.28 C 1078.49 495.271 1109.94 494.663 1138.1 495.72 L 1137.95 643.576 C 1138.02 703.227 1135.43 764.158 1164.42 818.75 C 1196.46 878.712 1229.25 902.303 1276.77 948.92 C 1314.57 985.315 1352.04 1022.04 1389.19 1059.1 C 1304.4 1094.08 1175.14 1090.03 1090.98 1053.97 C 1073.82 1046.61 1059.06 1036.09 1042.67 1028.11 C 996.57 1006.16 947.149 992.009 896.42 986.235 C 856.04 981.491 813.799 981.629 773.459 987.406 C 765.512 988.545 728.137 997.389 723.876 995.877 C 741.672 981.846 763.936 957.075 781.532 941.341 C 848.14 881.782 901.157 829.288 912.681 735.245 C 916.322 705.531 914.964 672.632 914.96 642.044 L 915.006 495.022 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 864.477 280.408 C 864.549 280.399 864.622 280.391 864.694 280.383 C 889.266 279.763 914.968 279.919 939.417 280.025 C 976.381 280.238 1013.35 280.256 1050.31 280.079 L 1140.56 279.994 C 1173.9 280.044 1226.56 271.606 1225.91 322.854 C 1225.61 347.042 1227.19 373.304 1224.05 397.036 C 1221.74 414.577 1205.19 421.58 1189.25 422.008 L 961.999 423.016 L 894.482 423.148 C 882.673 423.173 846.874 424.879 837.939 418.678 C 820.894 405.079 824.919 373.379 824.951 353.998 C 825.012 317.296 818.123 284.52 864.477 280.408 z"/>
+<path transform="translate(0,0)" fill="rgb(187,136,41)" d="M 879.526 283.493 L 1083.35 283.61 L 1152.42 283.641 C 1165.76 283.66 1180.28 283.167 1193.34 284.377 C 1211.6 286.068 1222.41 304.939 1222.08 321.895 C 1221.77 337.114 1222.15 351.943 1221.95 367.124 C 1221.77 381.221 1223.85 399.44 1213.37 410.432 C 1202.91 421.153 1186.23 419.355 1172.5 419.192 L 951.472 419.112 L 885.783 419.27 C 861.305 419.345 828.306 426.042 828.816 390.15 C 829.204 362.87 826.793 333.014 830.114 306.112 C 832.848 283.965 863.054 283.557 879.526 283.493 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 712.305 1002.69 C 714.56 999.939 720.465 991.942 723.876 995.877 C 723.348 1001.66 717.373 1003.25 712.305 1002.69 z"/>
+</g>
+</svg>

amule-3.1.0.tar.gz/src/icons/client_green.png Added

amule-3.1.0.tar.gz/src/icons/client_green.svg Added

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(47,46,47)" d="M 1003.43 264.036 C 1424.02 251.557 1775.15 582.266 1787.86 1002.85 C 1800.58 1423.42 1470.06 1774.74 1049.49 1787.69 C 628.586 1800.65 276.931 1469.82 264.207 1048.91 C 251.483 627.995 582.511 276.525 1003.43 264.036 z"/>
+<path transform="translate(0,0)" fill="rgb(34,204,26)" d="M 991.411 319.95 C 1381.25 300.794 1712.78 601.336 1731.85 991.178 C 1750.92 1381.02 1450.31 1712.49 1060.46 1731.47 C 670.738 1750.45 339.395 1449.95 320.33 1060.23 C 301.264 670.509 601.694 339.101 991.411 319.95 z"/>
+<path transform="translate(0,0)" fill="rgb(47,46,47)" d="M 585.285 1010.21 C 617.803 1007.84 619.158 1028.45 621.979 1053.57 C 629.731 1122.59 657.622 1191.8 700.435 1246.54 C 768.049 1333.15 867.4 1389.23 976.488 1402.37 C 1086.96 1415.45 1198.08 1383.85 1285.14 1314.6 C 1368.78 1248.59 1426.57 1145.13 1432.81 1038.27 C 1433.33 1029.36 1437.05 1021.4 1444.3 1016.03 C 1451.06 1010.94 1459.65 1008.95 1467.96 1010.56 C 1503.35 1017.36 1490.87 1062.52 1486.43 1087.09 C 1479.87 1123.46 1465.72 1161.69 1449.89 1194.99 C 1395.06 1308.17 1297.58 1394.98 1178.83 1436.36 C 1095.27 1465.48 1005.15 1470.28 918.972 1450.19 C 887.665 1442.57 850.092 1428.23 820.971 1414.23 C 709.51 1359.88 623.922 1263.85 582.721 1146.89 C 573.821 1121.27 554.113 1052 564.761 1025.56 C 567.86 1017.86 577.461 1012.9 585.285 1010.21 z"/>
+<path transform="translate(0,0)" fill="rgb(47,46,47)" d="M 845.168 708.467 C 890.692 703.846 931.318 737.063 935.831 782.598 C 940.345 828.132 907.032 868.679 861.487 873.085 C 816.094 877.477 775.711 844.298 771.213 798.916 C 766.714 753.534 799.797 713.073 845.168 708.467 z"/>
+<path transform="translate(0,0)" fill="rgb(47,46,47)" d="M 1189.65 708.533 C 1235.3 704.133 1275.81 737.73 1279.92 783.405 C 1284.04 829.08 1250.2 869.38 1204.5 873.216 C 1159.19 877.018 1119.32 843.53 1115.24 798.252 C 1111.16 752.973 1144.4 712.894 1189.65 708.533 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/client_grey.png Added

amule-3.1.0.tar.gz/src/icons/client_grey.svg Added

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(34,33,34)" d="M 1007.73 264.046 C 1428.3 254.187 1777.29 587.012 1787.38 1007.58 C 1797.47 1428.15 1464.84 1777.33 1044.28 1787.65 C 623.39 1797.98 273.879 1465.03 263.781 1044.13 C 253.683 623.239 586.825 273.912 1007.73 264.046 z"/>
+<path transform="translate(0,0)" fill="rgb(158,158,158)" d="M 998.86 328.16 C 1384.05 313.302 1708.42 613.397 1723.5 998.582 C 1738.58 1383.77 1438.68 1708.31 1053.5 1723.61 C 668.007 1738.93 343.143 1438.72 328.048 1053.22 C 312.954 667.72 613.35 343.031 998.86 328.16 z"/>
+<path transform="translate(0,0)" fill="rgb(34,33,34)" d="M 1011.67 1185.43 C 1013.11 1185.33 1014.55 1185.26 1016 1185.22 C 1143.47 1182.54 1266.85 1230.25 1359.35 1318.01 C 1376.67 1334.54 1419.97 1379.04 1419.93 1402.72 C 1419.99 1411.39 1416.37 1419.67 1409.96 1425.51 C 1404.58 1430.37 1397.76 1433.58 1390.53 1434.21 C 1368.19 1436.18 1357.83 1414.3 1346.46 1399.21 C 1275.76 1305.35 1158.8 1253.7 1043.25 1248.99 C 1017.01 1247.87 990.716 1249.2 964.721 1252.98 C 874.938 1266.57 789.121 1306.54 726.098 1373.29 C 712.321 1387.64 702.091 1404.28 690.777 1420.46 C 679.482 1436.61 658.332 1439.41 643.192 1426.76 C 636.58 1421.19 632.604 1413.1 632.228 1404.46 C 631.215 1385.31 655.541 1358.19 668.024 1343.89 C 729.966 1272.94 815.058 1223.85 905.977 1200.75 C 941.278 1191.79 975.52 1187.9 1011.67 1185.43 z"/>
+<path transform="translate(0,0)" fill="rgb(34,33,34)" d="M 760.724 759.871 C 817.114 754.234 867.359 795.471 872.829 851.878 C 878.299 908.285 836.914 958.408 780.491 963.71 C 724.304 968.991 674.436 927.816 668.989 871.645 C 663.542 815.474 704.569 765.484 760.724 759.871 z"/>
+<path transform="translate(0,0)" fill="rgb(158,158,158)" d="M 769.19 822.416 C 790.898 821.496 809.242 838.349 810.16 860.057 C 811.078 881.765 794.223 900.107 772.515 901.023 C 750.809 901.939 732.471 885.087 731.553 863.381 C 730.635 841.676 747.485 823.336 769.19 822.416 z"/>
+<path transform="translate(0,0)" fill="rgb(34,33,34)" d="M 1270.55 760.261 C 1326.75 754.915 1376.62 796.194 1381.87 852.404 C 1387.12 908.614 1345.76 958.415 1289.54 963.57 C 1233.45 968.713 1183.8 927.47 1178.56 871.396 C 1173.32 815.321 1214.48 765.595 1270.55 760.261 z"/>
+<path transform="translate(0,0)" fill="rgb(158,158,158)" d="M 1272.3 823.445 C 1293.29 818.892 1314.02 832.113 1318.75 853.064 C 1323.48 874.015 1310.43 894.859 1289.52 899.76 C 1268.36 904.719 1247.22 891.482 1242.43 870.284 C 1237.65 849.085 1251.06 828.051 1272.3 823.445 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/client_invalidrating.png Added

amule-3.1.0.tar.gz/src/icons/client_invalidrating.svg Added

@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<g transform="translate(-418.17,157.97) scale(0.909)">
+<path transform="translate(0,0)" fill="rgb(32,27,26)" d="M 854.886 209.371 C 874.714 208.048 901.43 208.895 921.948 208.93 L 1042.05 208.996 L 1143.79 208.915 C 1175.67 208.885 1208.32 205.518 1237.63 220.255 C 1263.03 233.344 1282.16 256.024 1290.78 283.267 C 1299 308.923 1294.56 329.387 1296.32 354.656 C 1300.79 418.935 1283.08 472.085 1214.89 493.81 L 1214.97 620.966 C 1214.99 669.182 1211.11 714.879 1223.55 761.895 C 1237.62 815.047 1266.81 834.356 1303.86 870.313 C 1345.89 910.869 1386.09 953.698 1428.12 994.214 C 1491.88 1055.69 1532.84 1147.25 1544.01 1234.98 C 1559.04 1345.11 1529.54 1456.68 1462.04 1544.98 C 1394.54 1631.93 1304.88 1681.97 1196.11 1695.75 C 1154.67 1699.93 1105.77 1698.4 1063.5 1698.49 C 1007.2 1698.6 950.14 1698.72 893.849 1697.96 C 788.132 1696.53 690.827 1653.79 617.776 1577.02 C 501.945 1453.06 471.629 1271.78 540.824 1116.87 C 556.964 1079.87 579.382 1039.87 608.06 1011.34 C 620.211 999.25 632.43 987.218 644.48 975.022 L 753.306 864.72 C 779.241 838.23 805.39 818.655 820.864 783.554 C 841.892 735.853 837.446 691.111 837.248 640.501 C 836.96 591.592 837.202 542.682 837.973 493.779 C 766.122 470.863 754.709 422.144 757.144 354.728 C 758.553 315.714 751.467 283.889 779.698 249.858 C 800.558 224.713 822.735 213.261 854.886 209.371 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 825.982 1047.48 C 883.817 1045.53 953.506 1061.38 1005.55 1085.93 C 1022.61 1093.72 1038.32 1103.64 1055.41 1111.46 C 1155.76 1157.38 1269.42 1162.14 1375.76 1135.88 C 1395.44 1131.02 1413.5 1124.34 1432.52 1117.3 C 1443.23 1130.36 1454.87 1163.85 1460.11 1180.53 C 1515.22 1356.24 1429.58 1561.53 1244.26 1614.66 C 1196.98 1628.08 1154.01 1628.03 1105.55 1628.01 L 1008.7 1628.01 C 885.394 1628.14 785.301 1638.15 685.889 1548.48 C 558.293 1433.38 541.932 1241.49 630.077 1098.07 C 636.955 1086.87 645.616 1087.56 656.8 1083.25 C 712.23 1061.87 766.576 1049.14 825.982 1047.48 z"/>
+<path transform="translate(0,0)" fill="rgb(176,16,33)" d="M 808.103 1051.42 C 814.883 1050.63 827.696 1050.78 834.823 1050.81 C 892.769 1051.37 949.96 1064.02 1002.73 1087.96 C 1021.98 1096.58 1040.15 1108.35 1060.5 1117.42 C 1175.21 1168.53 1315.27 1165.56 1431.49 1121.31 C 1438.35 1132.5 1444.65 1147.13 1449.33 1159.55 C 1515.74 1335.77 1441.45 1537.55 1260.76 1606.46 C 1249.83 1609.98 1238.75 1613 1227.54 1615.52 C 1165.91 1628.95 1085.05 1623.94 1020.8 1624.05 L 940.894 1624.45 C 900.046 1624.69 874.06 1625.57 833.676 1617.81 C 794.612 1610.48 757.353 1595.6 723.988 1574.01 C 652.457 1527.97 604.51 1451.7 586.526 1369.29 C 565.874 1274.53 583.973 1175.44 636.794 1094.09 C 645.587 1089.65 660.787 1084.75 670.435 1081.47 C 718.079 1065.3 758.242 1055.12 808.103 1051.42 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 915.006 495.022 L 1050.09 495.28 C 1078.49 495.271 1109.94 494.663 1138.1 495.72 L 1137.95 643.576 C 1138.02 703.227 1135.43 764.158 1164.42 818.75 C 1196.46 878.712 1229.25 902.303 1276.77 948.92 C 1314.57 985.315 1352.04 1022.04 1389.19 1059.1 C 1304.4 1094.08 1175.14 1090.03 1090.98 1053.97 C 1073.82 1046.61 1059.06 1036.09 1042.67 1028.11 C 996.57 1006.16 947.149 992.009 896.42 986.235 C 856.04 981.491 813.799 981.629 773.459 987.406 C 765.512 988.545 728.137 997.389 723.876 995.877 C 741.672 981.846 763.936 957.075 781.532 941.341 C 848.14 881.782 901.157 829.288 912.681 735.245 C 916.322 705.531 914.964 672.632 914.96 642.044 L 915.006 495.022 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 864.477 280.408 C 864.549 280.399 864.622 280.391 864.694 280.383 C 889.266 279.763 914.968 279.919 939.417 280.025 C 976.381 280.238 1013.35 280.256 1050.31 280.079 L 1140.56 279.994 C 1173.9 280.044 1226.56 271.606 1225.91 322.854 C 1225.61 347.042 1227.19 373.304 1224.05 397.036 C 1221.74 414.577 1205.19 421.58 1189.25 422.008 L 961.999 423.016 L 894.482 423.148 C 882.673 423.173 846.874 424.879 837.939 418.678 C 820.894 405.079 824.919 373.379 824.951 353.998 C 825.012 317.296 818.123 284.52 864.477 280.408 z"/>
+<path transform="translate(0,0)" fill="rgb(187,136,41)" d="M 879.526 283.493 L 1083.35 283.61 L 1152.42 283.641 C 1165.76 283.66 1180.28 283.167 1193.34 284.377 C 1211.6 286.068 1222.41 304.939 1222.08 321.895 C 1221.77 337.114 1222.15 351.943 1221.95 367.124 C 1221.77 381.221 1223.85 399.44 1213.37 410.432 C 1202.91 421.153 1186.23 419.355 1172.5 419.192 L 951.472 419.112 L 885.783 419.27 C 861.305 419.345 828.306 426.042 828.816 390.15 C 829.204 362.87 826.793 333.014 830.114 306.112 C 832.848 283.965 863.054 283.557 879.526 283.493 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 712.305 1002.69 C 714.56 999.939 720.465 991.942 723.876 995.877 C 723.348 1001.66 717.373 1003.25 712.305 1002.69 z"/>
+</g>
+<g transform="translate(620.29,157.97) scale(0.909)">
+<path transform="translate(0,0)" fill="rgb(32,27,26)" d="M 854.886 209.371 C 874.714 208.048 901.43 208.895 921.948 208.93 L 1042.05 208.996 L 1143.79 208.915 C 1175.67 208.885 1208.32 205.518 1237.63 220.255 C 1263.03 233.344 1282.16 256.024 1290.78 283.267 C 1299 308.923 1294.56 329.387 1296.32 354.656 C 1300.79 418.935 1283.08 472.085 1214.89 493.81 L 1214.97 620.966 C 1214.99 669.182 1211.11 714.879 1223.55 761.895 C 1237.62 815.047 1266.81 834.356 1303.86 870.313 C 1345.89 910.869 1386.09 953.698 1428.12 994.214 C 1491.88 1055.69 1532.84 1147.25 1544.01 1234.98 C 1559.04 1345.11 1529.54 1456.68 1462.04 1544.98 C 1394.54 1631.93 1304.88 1681.97 1196.11 1695.75 C 1154.67 1699.93 1105.77 1698.4 1063.5 1698.49 C 1007.2 1698.6 950.14 1698.72 893.849 1697.96 C 788.132 1696.53 690.827 1653.79 617.776 1577.02 C 501.945 1453.06 471.629 1271.78 540.824 1116.87 C 556.964 1079.87 579.382 1039.87 608.06 1011.34 C 620.211 999.25 632.43 987.218 644.48 975.022 L 753.306 864.72 C 779.241 838.23 805.39 818.655 820.864 783.554 C 841.892 735.853 837.446 691.111 837.248 640.501 C 836.96 591.592 837.202 542.682 837.973 493.779 C 766.122 470.863 754.709 422.144 757.144 354.728 C 758.553 315.714 751.467 283.889 779.698 249.858 C 800.558 224.713 822.735 213.261 854.886 209.371 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 825.982 1047.48 C 883.817 1045.53 953.506 1061.38 1005.55 1085.93 C 1022.61 1093.72 1038.32 1103.64 1055.41 1111.46 C 1155.76 1157.38 1269.42 1162.14 1375.76 1135.88 C 1395.44 1131.02 1413.5 1124.34 1432.52 1117.3 C 1443.23 1130.36 1454.87 1163.85 1460.11 1180.53 C 1515.22 1356.24 1429.58 1561.53 1244.26 1614.66 C 1196.98 1628.08 1154.01 1628.03 1105.55 1628.01 L 1008.7 1628.01 C 885.394 1628.14 785.301 1638.15 685.889 1548.48 C 558.293 1433.38 541.932 1241.49 630.077 1098.07 C 636.955 1086.87 645.616 1087.56 656.8 1083.25 C 712.23 1061.87 766.576 1049.14 825.982 1047.48 z"/>
+<path transform="translate(0,0)" fill="rgb(176,16,33)" d="M 808.103 1051.42 C 814.883 1050.63 827.696 1050.78 834.823 1050.81 C 892.769 1051.37 949.96 1064.02 1002.73 1087.96 C 1021.98 1096.58 1040.15 1108.35 1060.5 1117.42 C 1175.21 1168.53 1315.27 1165.56 1431.49 1121.31 C 1438.35 1132.5 1444.65 1147.13 1449.33 1159.55 C 1515.74 1335.77 1441.45 1537.55 1260.76 1606.46 C 1249.83 1609.98 1238.75 1613 1227.54 1615.52 C 1165.91 1628.95 1085.05 1623.94 1020.8 1624.05 L 940.894 1624.45 C 900.046 1624.69 874.06 1625.57 833.676 1617.81 C 794.612 1610.48 757.353 1595.6 723.988 1574.01 C 652.457 1527.97 604.51 1451.7 586.526 1369.29 C 565.874 1274.53 583.973 1175.44 636.794 1094.09 C 645.587 1089.65 660.787 1084.75 670.435 1081.47 C 718.079 1065.3 758.242 1055.12 808.103 1051.42 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 915.006 495.022 L 1050.09 495.28 C 1078.49 495.271 1109.94 494.663 1138.1 495.72 L 1137.95 643.576 C 1138.02 703.227 1135.43 764.158 1164.42 818.75 C 1196.46 878.712 1229.25 902.303 1276.77 948.92 C 1314.57 985.315 1352.04 1022.04 1389.19 1059.1 C 1304.4 1094.08 1175.14 1090.03 1090.98 1053.97 C 1073.82 1046.61 1059.06 1036.09 1042.67 1028.11 C 996.57 1006.16 947.149 992.009 896.42 986.235 C 856.04 981.491 813.799 981.629 773.459 987.406 C 765.512 988.545 728.137 997.389 723.876 995.877 C 741.672 981.846 763.936 957.075 781.532 941.341 C 848.14 881.782 901.157 829.288 912.681 735.245 C 916.322 705.531 914.964 672.632 914.96 642.044 L 915.006 495.022 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 864.477 280.408 C 864.549 280.399 864.622 280.391 864.694 280.383 C 889.266 279.763 914.968 279.919 939.417 280.025 C 976.381 280.238 1013.35 280.256 1050.31 280.079 L 1140.56 279.994 C 1173.9 280.044 1226.56 271.606 1225.91 322.854 C 1225.61 347.042 1227.19 373.304 1224.05 397.036 C 1221.74 414.577 1205.19 421.58 1189.25 422.008 L 961.999 423.016 L 894.482 423.148 C 882.673 423.173 846.874 424.879 837.939 418.678 C 820.894 405.079 824.919 373.379 824.951 353.998 C 825.012 317.296 818.123 284.52 864.477 280.408 z"/>
+<path transform="translate(0,0)" fill="rgb(187,136,41)" d="M 879.526 283.493 L 1083.35 283.61 L 1152.42 283.641 C 1165.76 283.66 1180.28 283.167 1193.34 284.377 C 1211.6 286.068 1222.41 304.939 1222.08 321.895 C 1221.77 337.114 1222.15 351.943 1221.95 367.124 C 1221.77 381.221 1223.85 399.44 1213.37 410.432 C 1202.91 421.153 1186.23 419.355 1172.5 419.192 L 951.472 419.112 L 885.783 419.27 C 861.305 419.345 828.306 426.042 828.816 390.15 C 829.204 362.87 826.793 333.014 830.114 306.112 C 832.848 283.965 863.054 283.557 879.526 283.493 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 712.305 1002.69 C 714.56 999.939 720.465 991.942 723.876 995.877 C 723.348 1001.66 717.373 1003.25 712.305 1002.69 z"/>
+</g>
+</svg>

amule-3.1.0.tar.gz/src/icons/client_mldonkey.png Added

amule-3.1.0.tar.gz/src/icons/client_mldonkey.svg Added

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(104,107,114)" d="M 993.987 257.873 C 1417.74 240.362 1775.52 569.536 1793.31 993.275 C 1811.09 1417.01 1482.15 1775.01 1058.42 1793.07 C 634.305 1811.14 275.911 1481.83 258.11 1057.71 C 240.31 633.581 569.85 275.4 993.987 257.873 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 1005.87 292.642 C 1410.82 281.775 1747.86 601.354 1758.51 1006.31 C 1769.17 1411.26 1449.42 1748.13 1044.46 1758.58 C 639.794 1769.03 303.225 1449.56 292.573 1044.9 C 281.922 640.234 601.219 303.501 1005.87 292.642 z"/>
+<path transform="translate(0,0)" fill="rgb(76,175,80)" d="M 1369.92 659.783 C 1390.54 676.576 1417.35 705.657 1436.87 724.373 C 1471.88 757.947 1506.79 793.903 1542.19 826.925 C 1532.87 837.404 1520.34 847.889 1510.32 858.544 C 1471.18 900.19 1428.63 939.308 1388.55 979.761 L 1070.97 1297.32 C 1014.67 1353.33 956.891 1408.94 901.724 1466 C 882.144 1447.94 860.505 1425.87 841.196 1407.13 L 692.641 1261.07 C 635.088 1206.1 577.628 1146.12 519.816 1092.09 C 527.684 1081.56 565.799 1043.96 577.826 1032.52 C 615.562 996.633 653.133 956.604 690.884 921.413 C 713.02 941.934 734.575 963.708 756.212 984.78 L 847.021 1072.32 C 864.764 1089.46 883.92 1109.46 902.17 1125.55 C 995.275 1031.52 1088.89 937.993 1183.02 844.984 C 1243.3 784.958 1307.93 717.366 1369.92 659.783 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/client_poorrating.png Added

amule-3.1.0.tar.gz/src/icons/client_poorrating.svg Added

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<g transform="translate(101.06,157.97) scale(0.909)">
+<path transform="translate(0,0)" fill="rgb(32,27,26)" d="M 854.886 209.371 C 874.714 208.048 901.43 208.895 921.948 208.93 L 1042.05 208.996 L 1143.79 208.915 C 1175.67 208.885 1208.32 205.518 1237.63 220.255 C 1263.03 233.344 1282.16 256.024 1290.78 283.267 C 1299 308.923 1294.56 329.387 1296.32 354.656 C 1300.79 418.935 1283.08 472.085 1214.89 493.81 L 1214.97 620.966 C 1214.99 669.182 1211.11 714.879 1223.55 761.895 C 1237.62 815.047 1266.81 834.356 1303.86 870.313 C 1345.89 910.869 1386.09 953.698 1428.12 994.214 C 1491.88 1055.69 1532.84 1147.25 1544.01 1234.98 C 1559.04 1345.11 1529.54 1456.68 1462.04 1544.98 C 1394.54 1631.93 1304.88 1681.97 1196.11 1695.75 C 1154.67 1699.93 1105.77 1698.4 1063.5 1698.49 C 1007.2 1698.6 950.14 1698.72 893.849 1697.96 C 788.132 1696.53 690.827 1653.79 617.776 1577.02 C 501.945 1453.06 471.629 1271.78 540.824 1116.87 C 556.964 1079.87 579.382 1039.87 608.06 1011.34 C 620.211 999.25 632.43 987.218 644.48 975.022 L 753.306 864.72 C 779.241 838.23 805.39 818.655 820.864 783.554 C 841.892 735.853 837.446 691.111 837.248 640.501 C 836.96 591.592 837.202 542.682 837.973 493.779 C 766.122 470.863 754.709 422.144 757.144 354.728 C 758.553 315.714 751.467 283.889 779.698 249.858 C 800.558 224.713 822.735 213.261 854.886 209.371 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 825.982 1047.48 C 883.817 1045.53 953.506 1061.38 1005.55 1085.93 C 1022.61 1093.72 1038.32 1103.64 1055.41 1111.46 C 1155.76 1157.38 1269.42 1162.14 1375.76 1135.88 C 1395.44 1131.02 1413.5 1124.34 1432.52 1117.3 C 1443.23 1130.36 1454.87 1163.85 1460.11 1180.53 C 1515.22 1356.24 1429.58 1561.53 1244.26 1614.66 C 1196.98 1628.08 1154.01 1628.03 1105.55 1628.01 L 1008.7 1628.01 C 885.394 1628.14 785.301 1638.15 685.889 1548.48 C 558.293 1433.38 541.932 1241.49 630.077 1098.07 C 636.955 1086.87 645.616 1087.56 656.8 1083.25 C 712.23 1061.87 766.576 1049.14 825.982 1047.48 z"/>
+<path transform="translate(0,0)" fill="rgb(176,16,33)" d="M 808.103 1051.42 C 814.883 1050.63 827.696 1050.78 834.823 1050.81 C 892.769 1051.37 949.96 1064.02 1002.73 1087.96 C 1021.98 1096.58 1040.15 1108.35 1060.5 1117.42 C 1175.21 1168.53 1315.27 1165.56 1431.49 1121.31 C 1438.35 1132.5 1444.65 1147.13 1449.33 1159.55 C 1515.74 1335.77 1441.45 1537.55 1260.76 1606.46 C 1249.83 1609.98 1238.75 1613 1227.54 1615.52 C 1165.91 1628.95 1085.05 1623.94 1020.8 1624.05 L 940.894 1624.45 C 900.046 1624.69 874.06 1625.57 833.676 1617.81 C 794.612 1610.48 757.353 1595.6 723.988 1574.01 C 652.457 1527.97 604.51 1451.7 586.526 1369.29 C 565.874 1274.53 583.973 1175.44 636.794 1094.09 C 645.587 1089.65 660.787 1084.75 670.435 1081.47 C 718.079 1065.3 758.242 1055.12 808.103 1051.42 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 915.006 495.022 L 1050.09 495.28 C 1078.49 495.271 1109.94 494.663 1138.1 495.72 L 1137.95 643.576 C 1138.02 703.227 1135.43 764.158 1164.42 818.75 C 1196.46 878.712 1229.25 902.303 1276.77 948.92 C 1314.57 985.315 1352.04 1022.04 1389.19 1059.1 C 1304.4 1094.08 1175.14 1090.03 1090.98 1053.97 C 1073.82 1046.61 1059.06 1036.09 1042.67 1028.11 C 996.57 1006.16 947.149 992.009 896.42 986.235 C 856.04 981.491 813.799 981.629 773.459 987.406 C 765.512 988.545 728.137 997.389 723.876 995.877 C 741.672 981.846 763.936 957.075 781.532 941.341 C 848.14 881.782 901.157 829.288 912.681 735.245 C 916.322 705.531 914.964 672.632 914.96 642.044 L 915.006 495.022 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 864.477 280.408 C 864.549 280.399 864.622 280.391 864.694 280.383 C 889.266 279.763 914.968 279.919 939.417 280.025 C 976.381 280.238 1013.35 280.256 1050.31 280.079 L 1140.56 279.994 C 1173.9 280.044 1226.56 271.606 1225.91 322.854 C 1225.61 347.042 1227.19 373.304 1224.05 397.036 C 1221.74 414.577 1205.19 421.58 1189.25 422.008 L 961.999 423.016 L 894.482 423.148 C 882.673 423.173 846.874 424.879 837.939 418.678 C 820.894 405.079 824.919 373.379 824.951 353.998 C 825.012 317.296 818.123 284.52 864.477 280.408 z"/>
+<path transform="translate(0,0)" fill="rgb(187,136,41)" d="M 879.526 283.493 L 1083.35 283.61 L 1152.42 283.641 C 1165.76 283.66 1180.28 283.167 1193.34 284.377 C 1211.6 286.068 1222.41 304.939 1222.08 321.895 C 1221.77 337.114 1222.15 351.943 1221.95 367.124 C 1221.77 381.221 1223.85 399.44 1213.37 410.432 C 1202.91 421.153 1186.23 419.355 1172.5 419.192 L 951.472 419.112 L 885.783 419.27 C 861.305 419.345 828.306 426.042 828.816 390.15 C 829.204 362.87 826.793 333.014 830.114 306.112 C 832.848 283.965 863.054 283.557 879.526 283.493 z"/>
+<path transform="translate(0,0)" fill="rgb(1,0,1)" d="M 712.305 1002.69 C 714.56 999.939 720.465 991.942 723.876 995.877 C 723.348 1001.66 717.373 1003.25 712.305 1002.69 z"/>
+</g>
+</svg>

amule-3.1.0.tar.gz/src/icons/client_red.png Added

amule-3.1.0.tar.gz/src/icons/client_red.svg Added

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(0,0,0)" d="M 1005.84 258.623 C 1429.61 247.621 1782.05 582.259 1793.01 1006.03 C 1803.97 1429.8 1469.29 1782.2 1045.52 1793.11 C 621.813 1804.02 269.474 1469.41 258.519 1045.7 C 247.564 621.998 582.14 269.624 1005.84 258.623 z"/>
+<path transform="translate(0,0)" fill="rgb(229,57,53)" d="M 1011.81 303.431 C 1411 295.885 1740.67 613.461 1748.05 1012.65 C 1755.43 1411.84 1437.71 1741.38 1038.52 1748.59 C 639.569 1755.79 310.267 1438.31 302.894 1039.36 C 295.521 640.408 612.867 310.972 1011.81 303.431 z"/>
+<path transform="translate(0,0)" fill="rgb(0,0,0)" d="M 654.442 1297.45 L 1145.75 1297.17 L 1316.47 1297.17 C 1344.23 1297.19 1372.02 1297.04 1399.77 1297.46 C 1411.58 1297.64 1421.53 1306.51 1422.68 1318.3 C 1423.28 1324.67 1421.27 1331.01 1417.13 1335.88 C 1411.94 1342.05 1406.77 1343.53 1399.12 1344.12 L 897.541 1344.17 L 735.217 1344.21 C 707.298 1344.2 679.371 1344.31 651.461 1343.86 C 640.078 1343.68 629.691 1334.52 628.208 1323.29 C 627.417 1317.23 629.218 1311.12 633.169 1306.46 C 639.506 1298.93 645.499 1298.13 654.442 1297.45 z"/>
+<path transform="translate(0,0)" fill="rgb(0,0,0)" d="M 1263.4 794.403 C 1322.52 789.946 1374.11 834.113 1378.83 893.208 C 1383.54 952.303 1339.6 1004.09 1280.52 1009.06 C 1221.09 1014.06 1168.91 969.788 1164.17 910.33 C 1159.42 850.871 1203.92 798.887 1263.4 794.403 z"/>
+<path transform="translate(0,0)" fill="rgb(38,29,28)" d="M 1265.06 838.218 C 1300.08 834.16 1331.79 859.159 1336.03 894.155 C 1340.26 929.151 1315.42 960.989 1280.44 965.396 C 1245.22 969.833 1213.11 944.779 1208.85 909.535 C 1204.58 874.292 1229.8 842.305 1265.06 838.218 z"/>
+<path transform="translate(0,0)" fill="rgb(0,0,0)" d="M 772.834 794.362 C 832.164 790.514 883.364 835.525 887.149 894.859 C 890.935 954.193 845.87 1005.35 786.532 1009.07 C 727.283 1012.79 676.223 967.802 672.443 908.557 C 668.663 849.312 713.592 798.204 772.834 794.362 z"/>
+<path transform="translate(0,0)" fill="rgb(38,29,28)" d="M 772.391 838.707 C 807.159 834.531 838.783 859.188 843.212 893.924 C 847.641 928.66 823.215 960.463 788.512 965.144 C 753.45 969.873 721.247 945.14 716.772 910.045 C 712.298 874.95 737.265 842.927 772.391 838.707 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/client_secident.png Added

amule-3.1.0.tar.gz/src/icons/client_secident.svg Added

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<g transform="translate(-102.99,1114.79) scale(0.5414)">
+<path transform="translate(0,0)" fill="rgb(229,57,53)" d="M 1683.12 423.405 C 1766.49 414.703 1844.18 485.678 1844.99 569.464 C 1845.36 602.77 1834.79 635.278 1814.91 662.001 C 1800.8 680.702 1778.84 699.972 1761.99 716.797 C 1742.85 735.926 1723.87 755.253 1704.68 774.316 L 1505.04 974.447 L 937.648 1550.94 C 885.821 1603.41 801.659 1614.32 740.117 1572.35 C 734.515 1568.53 725.043 1561.47 720.799 1556.21 C 698.347 1528.42 672.674 1504.21 647.373 1479.01 L 400.37 1234.88 C 363.598 1197.28 323.723 1161.8 286.807 1124.46 C 190.252 1026.8 262.315 862.758 399.909 865.877 C 430.679 866.275 460.647 875.747 486.057 893.106 C 503.461 905.073 514.267 920.546 528.588 934.861 C 547.395 953.658 566.097 972.541 584.851 991.387 L 717.863 1125.3 C 755.041 1162.38 791.983 1199.7 828.685 1237.25 C 891.016 1168.76 955.939 1105.18 1020.8 1039.35 L 1372.38 685.32 L 1529.78 525.826 C 1542.2 513.131 1554.56 500.372 1566.85 487.549 C 1604.81 447.61 1625.13 428.774 1683.12 423.405 z"/>
+</g>
+</svg>

amule-3.1.0.tar.gz/src/icons/client_unknown.png Added

amule-3.1.0.tar.gz/src/icons/client_unknown.svg Added

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(36,33,34)" d="M 996.244 277.649 C 1413.8 261.181 1765.63 586.383 1782 1003.95 C 1798.37 1421.51 1473.09 1773.26 1055.52 1789.53 C 638.089 1805.8 286.481 1480.65 270.115 1063.22 C 253.75 645.794 578.821 294.111 996.244 277.649 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 986.159 297.54 C 1392.81 275.523 1740.28 587.383 1762.2 994.037 C 1784.12 1400.69 1472.17 1748.09 1065.51 1769.91 C 658.995 1791.71 311.743 1479.9 289.834 1073.39 C 267.925 666.878 579.653 319.549 986.159 297.54 z"/>
+<path transform="translate(0,0)" fill="rgb(36,33,34)" d="M 1017.32 514.449 C 1095.09 511.889 1161.85 530.876 1226.15 574.57 C 1357.27 663.066 1394.89 832.479 1302.71 963.25 C 1280.67 994.524 1241.99 1032.8 1209.21 1051.95 C 1149.81 1086.64 1114.14 1140.55 1111.77 1210.1 C 1111.42 1220.29 1112.39 1236.25 1106.47 1244.64 C 1103.64 1246.49 1098.1 1246.79 1094.64 1246.79 C 1043.79 1246.8 992.831 1247.33 941.995 1246.9 C 932.912 1246.38 931.867 1234.92 931.822 1228.29 C 931.272 1147.78 945.668 1073.34 1003.38 1013.07 C 1021.4 995.25 1042.87 978.228 1064.89 965.721 C 1133.11 926.983 1185.74 862.606 1166.51 779.338 C 1158.13 744.118 1136.01 713.714 1105.08 694.909 C 1015.54 639.619 904.346 697.167 881.117 794.432 C 878.849 803.93 873.823 832.667 869.64 839.461 C 864.39 840.639 859.158 841.249 853.786 841.471 C 841.014 842.001 704.345 842.569 700.624 840.422 C 696.763 838.194 695.488 831.438 695.215 827.466 C 694.372 815.212 697.3 801.555 699.69 789.505 C 712.211 726.364 744.068 667.565 787.363 620.212 C 846.75 555.574 929.593 517.473 1017.32 514.449 z"/>
+<path transform="translate(0,0)" fill="rgb(161,136,127)" d="M 1019.68 533.442 C 1026.76 533.2 1033.85 533.226 1040.93 533.52 C 1067.85 534.498 1093.5 537.523 1119.49 545.028 C 1331.39 606.23 1414.1 842.855 1241.44 1002.55 C 1211.75 976.262 1176.66 950.335 1148.94 922.333 C 1193.48 864.371 1201.68 802.538 1170.29 736.23 C 1149.27 696.598 1105.65 666.57 1061.98 657.982 C 1018.01 649.749 972.568 659.221 935.548 684.336 C 885.028 718.457 866.023 765.307 854.87 822.651 C 808.164 821.96 761.45 821.987 714.744 822.733 C 729.543 663.236 859.623 541.239 1019.68 533.442 z"/>
+<path transform="translate(0,0)" fill="rgb(161,136,127)" d="M 1135.4 937.132 C 1140.7 940.62 1158.63 956.828 1164.29 961.719 L 1227.53 1016.12 C 1205.73 1034.6 1182.95 1041.67 1159.73 1064.05 C 1106.34 1115.54 1094.47 1156.59 1091.94 1227.25 C 1076.29 1227.9 1060.04 1227.82 1044.33 1227.93 C 1013.17 1228.06 982.003 1228.02 950.841 1227.81 C 950.792 1214.07 951.292 1200.34 952.34 1186.64 C 957.834 1110.2 982.762 1049.16 1045.79 1001.21 C 1061.34 989.377 1079.73 979.721 1095.92 968.672 C 1110.32 958.843 1122.28 948.507 1135.4 937.132 z"/>
+<path transform="translate(0,0)" fill="rgb(36,33,34)" d="M 1011.92 1314.05 C 1075.3 1306.41 1132.87 1351.6 1140.51 1414.98 C 1148.14 1478.36 1102.95 1535.93 1039.57 1543.55 C 976.196 1551.18 918.642 1505.99 911.01 1442.62 C 903.377 1379.25 948.556 1321.69 1011.92 1314.05 z"/>
+<path transform="translate(0,0)" fill="rgb(161,136,127)" d="M 1013.64 1332.91 C 1066.67 1326.16 1115.11 1363.72 1121.79 1416.76 C 1128.46 1469.8 1090.84 1518.19 1037.79 1524.79 C 984.841 1531.38 936.565 1493.84 929.903 1440.91 C 923.241 1387.97 960.711 1339.64 1013.64 1332.91 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/client_upload.png Added

amule-3.1.0.tar.gz/src/icons/client_upload.svg Added

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(253,216,53)" d="M 1015.55 225.395 C 1021.79 224.836 1029.2 224.8 1035.48 225 C 1065.52 226.179 1094.51 236.405 1118.65 254.34 C 1132.29 264.333 1142.73 275.396 1154.72 287.108 C 1170.46 302.307 1185.99 317.719 1201.3 333.342 L 1327.92 459.786 L 1557.81 689.183 L 1655.02 786.495 C 1698.52 830.233 1744.19 864.434 1741.35 932.759 C 1739.91 966.179 1725.23 997.654 1700.55 1020.23 C 1675.31 1043.51 1641.78 1055.66 1607.49 1053.97 C 1550.93 1051.24 1524.54 1017.66 1488.32 980.958 L 1396.34 886.954 L 1269.63 757.178 C 1234.17 721.467 1192.16 680.75 1158.82 643.836 C 1137.05 981.83 1281.05 1326.9 1591.46 1484.54 C 1646.43 1512.45 1703.33 1521.36 1730.85 1583.04 C 1779.22 1691.43 1666.43 1795.89 1560.65 1751.03 C 1324.97 1660.02 1136.34 1490.71 1032.99 1259.58 L 1026.63 1244.65 C 979.677 1347.02 933.03 1424.29 856.308 1507.08 C 764.244 1605.63 652.29 1683.5 527.864 1735.51 C 498.385 1747.84 475.859 1759.9 442.576 1761.19 C 324.346 1765.85 263.018 1620.16 352.534 1540.91 C 381.532 1515.24 425.57 1503.19 460.412 1485.58 C 536.093 1446.56 604.588 1394.95 662.969 1332.97 C 806.862 1181.69 878.526 983.117 891.077 776.894 C 893.729 733.308 893.171 691.096 892.044 647.517 C 863.197 677.82 833.585 705.964 804.219 735.579 L 630.665 910.453 L 549.033 992.064 C 516.763 1023.76 498.112 1047.11 449.94 1052.97 C 417.087 1056.65 384.128 1047.03 358.408 1026.26 C 332.15 1005.65 315.432 975.218 312.114 942.001 C 305.689 878.652 336.093 852.86 376.792 811.788 C 396.345 791.931 416.022 772.199 435.824 752.59 L 614.824 573.882 L 838.47 349.505 C 855.616 332.632 872.625 315.623 889.498 298.478 C 901.319 286.428 917.38 268.952 930.391 258.955 C 954.996 239.876 984.545 228.231 1015.55 225.395 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/client_white.png Added

amule-3.1.0.tar.gz/src/icons/client_white.svg Added

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(97,97,97)" d="M 1016.07 262.495 C 1437.45 257.136 1783.4 594.387 1788.76 1015.77 C 1794.13 1437.15 1456.88 1783.1 1035.5 1788.47 C 614.108 1793.84 268.15 1456.59 262.785 1035.2 C 257.42 613.807 594.679 267.854 1016.07 262.495 z"/>
+<path transform="translate(0,0)" fill="rgb(189,189,189)" d="M 998.357 292.331 C 1403.22 277.09 1743.85 592.803 1759.35 997.657 C 1774.84 1402.51 1459.35 1743.34 1054.5 1759.09 C 649.296 1774.86 308.094 1459.02 292.582 1053.8 C 277.071 648.586 593.13 307.585 998.357 292.331 z"/>
+<path transform="translate(0,0)" fill="rgb(57,58,61)" d="M 1000.51 550.411 C 1006.23 549.663 1020.56 549.497 1026.54 549.501 C 1079.61 549.609 1131.78 563.201 1178.16 589.002 C 1307.47 661.522 1372.98 813.209 1304.83 951.079 C 1264.89 1031.88 1199.06 1083.49 1112.61 1107.23 C 1112.26 1166 1124.13 1232.44 1056.97 1258.93 C 1036.24 1267.31 1012.99 1266.85 992.613 1257.65 C 932.023 1231.02 939.541 1171.59 940.231 1116.22 C 940.67 1081.03 934.861 1042.12 949.143 1009.37 C 962.282 982.385 988.764 963.262 1018.44 958.773 C 1027.68 957.376 1038.07 957.387 1047.47 956.579 C 1078.5 953.637 1107.1 938.511 1126.99 914.517 C 1148.09 889.392 1156.15 859.293 1152.96 826.844 C 1149.5 793.926 1133.01 763.76 1107.18 743.073 C 1079.59 720.604 1044.18 710.059 1008.8 713.771 C 962.313 718.962 922.294 748.941 904.246 792.092 C 895.291 813.937 894.135 829.566 878.432 849.159 C 863.432 868.115 841.376 880.165 817.321 882.546 C 763.227 887.854 715.061 839.169 724.171 784.976 C 731.878 739.129 759.116 690.425 789.579 655.176 C 842.491 593.95 920.042 556.521 1000.51 550.411 z"/>
+<path transform="translate(0,0)" fill="rgb(97,97,97)" d="M 1018.72 578.461 C 1080.88 577.024 1141.84 595.673 1192.55 631.64 C 1246.03 669.942 1289.38 732.459 1299.33 797.893 C 1320.39 936.393 1216.99 1061.96 1082.67 1083.73 L 1082.97 1144.25 C 1083.03 1157.66 1083.89 1179.11 1081.07 1191.46 C 1079.05 1200.42 1074.83 1208.74 1068.79 1215.67 C 1047.54 1240.04 1011.9 1242.48 987.87 1220.53 C 961.289 1196.25 971.244 1143.65 969.437 1110.84 C 968.376 1091.57 967.778 1051.69 971.693 1034.6 C 974.165 1023.48 979.587 1013.22 987.39 1004.92 C 1001.37 990.211 1017.87 986.296 1037.25 985.906 C 1122.06 986.612 1190.18 912.468 1182.46 827.949 C 1178.38 786.337 1158.05 748.01 1125.9 721.283 C 1044.49 653.876 920.998 678.952 878.535 777.997 C 870.57 796.578 867.839 816.307 854.63 832.575 C 835.563 856.056 796.262 860.664 772.815 841.272 C 739.338 811.593 755.509 768.983 771.58 735.069 C 817.604 637.945 912.82 582.151 1018.72 578.461 z"/>
+<path transform="translate(0,0)" fill="rgb(57,58,61)" d="M 1018.08 1316.47 C 1069.19 1311.93 1114.31 1349.69 1118.85 1400.8 C 1123.4 1451.91 1085.65 1497.03 1034.54 1501.58 C 983.416 1506.14 938.286 1468.38 933.74 1417.26 C 929.194 1366.14 966.954 1321.01 1018.08 1316.47 z"/>
+<path transform="translate(0,0)" fill="rgb(97,97,97)" d="M 1018.17 1345.99 C 1053.07 1341.59 1084.91 1366.41 1089.15 1401.34 C 1093.4 1436.26 1068.44 1467.99 1033.49 1472.08 C 998.767 1476.14 967.289 1451.37 963.07 1416.66 C 958.851 1381.96 983.479 1350.37 1018.17 1345.99 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/client_yellow.png Added

amule-3.1.0.tar.gz/src/icons/client_yellow.svg Added

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(0,0,0)" d="M 1007.75 257.514 C 1432.35 247.488 1784.65 583.649 1794.53 1008.26 C 1804.41 1432.86 1468.13 1785.04 1043.51 1794.78 C 619.112 1804.5 267.142 1468.42 257.268 1044.02 C 247.395 619.622 583.355 267.535 1007.75 257.514 z"/>
+<path transform="translate(0,0)" fill="rgb(253,216,53)" d="M 999.451 308.448 C 1395.52 293.821 1728.6 602.735 1743.79 998.78 C 1758.97 1394.82 1450.53 1728.34 1054.51 1744.09 C 657.692 1759.88 323.358 1450.68 308.139 1053.84 C 292.919 656.999 602.589 323.104 999.451 308.448 z"/>
+<path transform="translate(0,0)" fill="rgb(0,0,0)" d="M 807.587 1295.4 C 837.733 1294.18 871.616 1294.82 901.954 1294.89 L 1049.89 1295.07 L 1173.07 1294.96 C 1195.45 1294.91 1218.23 1294.64 1240.59 1295.11 C 1246.43 1295.68 1253.67 1295.48 1258.35 1299.33 C 1269.43 1308.44 1271.94 1324.75 1262.15 1335.79 C 1255.95 1342.78 1253.08 1343.51 1243.97 1344.53 C 1205.94 1343.58 1166.25 1344.35 1128.1 1344.39 L 917.91 1344.15 L 847.123 1344.29 C 835.32 1344.33 800.826 1346.38 793.286 1340.06 C 773.212 1323.24 782.104 1298.37 807.587 1295.4 z"/>
+<path transform="translate(0,0)" fill="rgb(0,0,0)" d="M 1279.39 854.713 C 1324.63 853.417 1362.45 888.828 1364.13 934.049 C 1365.81 979.27 1330.72 1017.39 1285.51 1019.45 C 1239.76 1021.54 1201.08 985.93 1199.38 940.166 C 1197.69 894.401 1233.62 856.025 1279.39 854.713 z"/>
+<path transform="translate(0,0)" fill="rgb(0,0,0)" d="M 764.814 855.003 C 810.133 852.141 849.211 886.516 852.151 931.83 C 855.092 977.144 820.786 1016.28 775.477 1019.3 C 730.056 1022.33 690.801 987.919 687.853 942.493 C 684.905 897.067 719.383 857.872 764.814 855.003 z"/>
+</svg>
\ No newline at end of file

amule-3.0.1.tar.gz/src/icons/embed_icons.py -> amule-3.1.0.tar.gz/src/icons/embed_icons.py Changed

@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 """
 Generate a C translation unit that embeds every PNG icon under this
-directory tree into a single static lookup table.
+directory tree (plus each icon's optional same-name SVG twin) into a
+single static lookup table.
 
 Usage:  embed_icons.py <icons_dir> <output_c_file>
 
@@ -9,12 +10,14 @@
 matching public declarations):
 
     static const unsigned char icon_<name>_png = { 0x89, 0x50, ... };
-    static const unsigned int  icon_<name>_png_len = N;
-    ... one pair per icon ...
+    static const unsigned char icon_<name>_svg = { 0x3c, 0x73, ... };
+    ... one png array per icon, plus an svg array when a twin exists ...
 
     static const struct AMuleIconEntry icons = {
-        { "amule", icon_amule_png, sizeof icon_amule_png },
-        { "flag_us", icon_flag_us_png, sizeof icon_flag_us_png },
+        { "amule", icon_amule_png, sizeof icon_amule_png, 0, 0 },
+        { "toolbar_search", icon_toolbar_search_png,
+          sizeof icon_toolbar_search_png, icon_toolbar_search_svg,
+          sizeof icon_toolbar_search_svg },
         ...
     };
 
@@ -23,9 +26,15 @@
 
 Icons in <icons_dir>/<name>.png get the art-id "<name>".
 Icons in <icons_dir>/flags/<code>.png get the art-id "flag_<code>".
+
+A <name>.svg next to <name>.png is embedded as the icon's vector twin;
+CamuleArtProvider renders every request for the icon from it on wx
+builds with SVG (NanoSVG) support.  The PNG stays mandatory: it is the
+raster fallback and defines the icon's natural size, so an .svg without
+a matching .png is an error.
 """
 
-import os
+import re
 import sys
 from pathlib import Path
 
@@ -35,9 +44,16 @@
     return name.replace("-", "_").replace(".", "_")
 
 
+def svg_twin(png_path: Path):
+    """Return the icon's .svg twin path, or None when it has none."""
+    svg = png_path.with_suffix(".svg")
+    return svg if svg.is_file() else None
+
+
 def collect_icons(icons_dir: Path):
     """
-    Yield (art_id, c_ident, file_path) for every .png under icons_dir.
+    Yield (art_id, c_ident, png_path, svg_path-or-None) for every .png
+    under icons_dir.
 
     Files directly under icons_dir use their stem as the art id
     ("foo.png" -> art_id "foo").  Files under icons_dir/flags/ get the
@@ -48,7 +64,7 @@
     # Top-level icons (everything except the flags/ subdir).
     for path in sorted(icons_dir.glob("*.png")):
         stem = path.stem
-        entries.append((stem, sanitise(stem), path))
+        entries.append((stem, sanitise(stem), path, svg_twin(path)))
 
     # Country flags.
     flags_dir = icons_dir / "flags"
@@ -56,45 +72,111 @@
         for path in sorted(flags_dir.glob("*.png")):
             stem = path.stem
             art_id = f"flag_{stem}"
-            entries.append((art_id, sanitise(art_id), path))
+            entries.append((art_id, sanitise(art_id), path, svg_twin(path)))
 
     return entries
 
 
+def find_orphan_svgs(icons_dir: Path, entries):
+    """List .svg files that have no .png twin (the PNG is mandatory)."""
+    known = {svg for _art_id, _c_ident, _png, svg in entries if svg is not None}
+    search_dirs = icons_dir
+    flags_dir = icons_dir / "flags"
+    if flags_dir.is_dir():
+        search_dirs.append(flags_dir)
+
+    orphans = 
+    for directory in search_dirs:
+        for svg in sorted(directory.glob("*.svg")):
+            if svg not in known:
+                orphans.append(svg)
+    return orphans
+
+
+_NUMBER = re.compile(r"-+?(?:\d+\.?\d*|\.\d+)(?:eE-+?\d+)?")
+
+
+def count_packed_arc_flags(svg_path: Path) -> int:
+    """
+    Count arc commands whose flags are packed against the next value, e.g.
+    "a7 7 0 00-1.4-1.1". Valid SVG, but wx 3.2's NanoSVG reads "00" as one
+    number, shifts the remaining arguments and fills a large wrong area.
+    """
+    packed = 0
+    text = svg_path.read_text(encoding="utf-8")
+    for path_data in re.findall(r'\bd="(^"*)"', text):
+        for args in re.findall(r"aA(^A-Za-z*)", path_data):
+            i, pos = 0, 0
+            while True:
+                while i < len(args) and argsi in " ,\t\r\n":
+                    i += 1
+                if i >= len(args):
+                    break
+                # Arc arguments repeat as rx ry rotation large-arc sweep x y.
+                if pos % 7 in (3, 4):
+                    if i + 1 < len(args) and argsi + 1 not in " ,\t\r\n":
+                        packed += 1
+                        break
+                    i += 1
+                else:
+                    match = _NUMBER.match(args, i)
+                    if match is None:
+                        break
+                    i = match.end()
+                pos += 1
+    return packed
+
+
+def emit_byte_array(chunks, c_name: str, data: bytes):
+    chunks.append(f"static const unsigned char {c_name} = {{\n")
+    # 16 bytes per line, hex-formatted.
+    line = 
+    for i, b in enumerate(data):
+        line.append(f"0x{b:02x}")
+        if (i + 1) % 16 == 0:
+            chunks.append("\t" + ", ".join(line) + ",\n")
+            line = 
+    if line:
+        chunks.append("\t" + ", ".join(line) + "\n")
+    chunks.append("};\n")
+    chunks.append("\n")
+
+
 def emit(out_path: Path, entries):
     chunks = 
+    # The byte arrays are laid out 16 values per line; clang-format would
+    # otherwise reflow every array in the file, so opt the whole TU out.
+    # This marker also shields the checked-in src/icons/icon_data.c from
+    # the clang-format CI check (which covers all of src/).
+    chunks.append("// clang-format off\n")
     chunks.append("/*\n")
-    chunks.append(" * Auto-generated by src/icons/embed_icons.py — do not edit.\n")
+    chunks.append(" * Auto-generated by src/icons/embed_icons.py -- do not edit.\n")
     chunks.append(" *\n")
-    chunks.append(" * Embeds every PNG icon under src/icons/ as a static byte array,\n")
-    chunks.append(" * exposes them to C++ via the C-API declared in icon_data.h.\n")
+    chunks.append(" * Embeds every PNG icon under src/icons/ (and each icon's\n")
+    chunks.append(" * optional SVG twin) as a static byte array, exposes them to\n")
+    chunks.append(" * C++ via the C-API declared in icon_data.h.\n")
     chunks.append(" */\n")
     chunks.append("\n")
     chunks.append('#include "icon_data.h"\n')
     chunks.append("\n")
 
     # Per-icon byte arrays.
-    for _art_id, c_ident, path in entries:
-        data = path.read_bytes()
-        chunks.append(f"static const unsigned char icon_{c_ident}_png = {{\n")
-        # 16 bytes per line, hex-formatted.
-        line = 
-        for i, b in enumerate(data):
-            line.append(f"0x{b:02x}")
-            if (i + 1) % 16 == 0:
-                chunks.append("\t" + ", ".join(line) + ",\n")
-                line = 
-        if line:
-            chunks.append("\t" + ", ".join(line) + "\n")
-        chunks.append("};\n")
-        chunks.append("\n")
+    for _art_id, c_ident, png_path, svg_path in entries:
+        emit_byte_array(chunks, f"icon_{c_ident}_png", png_path.read_bytes())
+        if svg_path is not None:
+            emit_byte_array(chunks, f"icon_{c_ident}_svg", svg_path.read_bytes())
 
     # Lookup table.
     chunks.append("static const struct AMuleIconEntry icons = {\n")
-    for art_id, c_ident, _path in entries:
-        chunks.append(
-            f'\t{{ "{art_id}", icon_{c_ident}_png, sizeof icon_{c_ident}_png }},\n'
-        )
+    for art_id, c_ident, _png_path, svg_path in entries:
+        if svg_path is not None:
+            chunks.append(f'\t{{ "{art_id}", icon_{c_ident}_png,\n')
+            chunks.append(f"\t\tsizeof icon_{c_ident}_png, icon_{c_ident}_svg,\n")
+            chunks.append(f"\t\tsizeof icon_{c_ident}_svg }},\n")
+        else:
+            chunks.append(
+                f'\t{{ "{art_id}", icon_{c_ident}_png, sizeof icon_{c_ident}_png, 0, 0 }},\n'
+            )
     chunks.append("};\n")
     chunks.append("\n")
     chunks.append(
@@ -129,11 +211,14 @@
     chunks.append("}\n")
 
     out_path.parent.mkdir(parents=True, exist_ok=True)
-    out_path.write_text("".join(chunks))
+    # Force UTF-8: the header comment contains a non-ASCII em-dash, and
+    # Path.write_text() would otherwise use the locale encoding (cp1252
+    # on Windows/mingw CI), corrupting it or raising UnicodeEncodeError.
+    out_path.write_text("".join(chunks), encoding="utf-8")
 
 
 def main(argv):
-    if len(argv) != 3:
+    if len(argv) < 3:
         print(__doc__, file=sys.stderr)
         return 2
 
@@ -149,8 +234,47 @@
         print(f"error: no .png files found under {icons_dir}", file=sys.stderr)
         return 1
 
+    orphans = find_orphan_svgs(icons_dir, entries)
+    if orphans:
+        for svg in orphans:
+            print(f"error: {svg} has no matching .png fallback", file=sys.stderr)
+        return 1
+
+    packed = False
+    for _art_id, _c_ident, _png, svg in entries:
+        if svg is not None and count_packed_arc_flags(svg):
+            print(f"error: {svg} packs arc flags against the next value (e.g. 'a7 7 0 00-1.4'); "
+                  "wx 3.2 mis-renders that. Separate them: 'a7 7 0 0 0 -1.4'.", file=sys.stderr)
+            packed = True
+    if packed:
+        return 1
+
+    # A duplicate art id, or a duplicate C identifier (distinct names that
+    # collide once sanitise() folds '-'/'.' to '_' -- e.g. "foo-bar" vs
+    # "foo_bar", or a top-level "flag_x.png" shadowing "flags/x.png"), would
+    # emit two byte arrays with the same symbol (a C redefinition) and make
+    # amule_find_icon() shadow one of the icons. The current icon set has no
+    # such clash; guard so a future rename fails loudly here instead of with
+    # an opaque compiler error or a silently missing icon.
+    seen_art, seen_ident, collision = {}, {}, False
+    for art_id, c_ident, png_path, _svg in entries:
+        if art_id in seen_art:
+            print(f"error: art id '{art_id}' ({png_path}) collides with {seen_artart_id}", file=sys.stderr)
+            collision = True
+        else:
+            seen_artart_id = png_path
+        if c_ident in seen_ident:
+            print(f"error: C identifier 'icon_{c_ident}' ({png_path}) collides with "
+                  f"{seen_identc_ident}", file=sys.stderr)
+            collision = True
+        else:
+            seen_identc_ident = png_path
+    if collision:
+        return 1
+
     emit(out_path, entries)
-    print(f"emitted {len(entries)} icons -> {out_path}")
+    n_svg = sum(1 for e in entries if e3 is not None)
+    print(f"emitted {len(entries)} icons ({n_svg} with SVG) -> {out_path}")
     return 0

amule-3.1.0.tar.gz/src/icons/folder.png Added

amule-3.1.0.tar.gz/src/icons/folder.svg Added

amule-3.1.0.tar.gz/src/icons/folder_shared.png Added

amule-3.1.0.tar.gz/src/icons/folder_shared.svg Added

amule-3.1.0.tar.gz/src/icons/friends.png Added

amule-3.1.0.tar.gz/src/icons/friends.svg Added

amule-3.0.1.tar.gz/src/icons/icon_data.c -> amule-3.1.0.tar.gz/src/icons/icon_data.c Changed

@@ -1,124 +1,3508 @@
+// clang-format off
 /*
- * Auto-generated by src/icons/embed_icons.py — do not edit.
+ * Auto-generated by src/icons/embed_icons.py -- do not edit.
  *
- * Embeds every PNG icon under src/icons/ as a static byte array,
- * exposes them to C++ via the C-API declared in icon_data.h.
+ * Embeds every PNG icon under src/icons/ (and each icon's
+ * optional SVG twin) as a static byte array, exposes them to
+ * C++ via the C-API declared in icon_data.h.
  */
 
 #include "icon_data.h"
 
 static const unsigned char icon_amule_png = {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x2a, 0x08, 0x03, 0x00, 0x00, 0x00, 0xe5, 0x3f, 0xa9,
-	0xa0, 0x00, 0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4d, 0x00, 0x00, 0x7a, 0x26, 0x00, 0x00, 0x80,
-	0x84, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x00, 0x80, 0xe8, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xea,
-	0x60, 0x00, 0x00, 0x3a, 0x98, 0x00, 0x00, 0x17, 0x70, 0x9c, 0xba, 0x51, 0x3c, 0x00, 0x00, 0x02,
-	0xc1, 0x50, 0x4c, 0x54, 0x45, 0x00, 0x00, 0x00, 0x4f, 0x2c, 0x14, 0x31, 0x22, 0x14, 0x2c, 0x1e,
-	0x14, 0xe9, 0x8f, 0x44, 0x04, 0x04, 0x0c, 0xa4, 0x5a, 0x1c, 0xe4, 0x8a, 0x44, 0x21, 0x1d, 0x1c,
-	0xdb, 0x85, 0x44, 0xb4, 0x64, 0x2c, 0x13, 0x14, 0x14, 0x09, 0x0b, 0x0c, 0x94, 0x4f, 0x1c, 0xec,
-	0x96, 0x54, 0x8c, 0x4a, 0x1c, 0x5c, 0x3a, 0x1c, 0x68, 0x42, 0x1c, 0xbc, 0x6a, 0x2c, 0xd9, 0x89,
-	0x4c, 0x8c, 0x51, 0x24, 0x3a, 0x24, 0x1c, 0x80, 0x44, 0x1c, 0x7c, 0x4a, 0x24, 0x27, 0x23, 0x1c,
-	0x07, 0x0d, 0x14, 0x99, 0x4b, 0x14, 0xda, 0x90, 0x54, 0x78, 0x52, 0x34, 0x68, 0x42, 0x24, 0x67,
-	0x38, 0x1c, 0x4c, 0x3a, 0x24, 0xac, 0x5a, 0x24, 0xec, 0xa2, 0x64, 0x5c, 0x4a, 0x34, 0x2c, 0x2a,
-	0x24, 0x61, 0x35, 0x14, 0x7c, 0x52, 0x2c, 0x82, 0x4e, 0x24, 0xcf, 0x76, 0x3c, 0x94, 0x4a, 0x0c,
-	0x2c, 0x2e, 0x34, 0x5c, 0x34, 0x1c, 0x49, 0x2a, 0x1c, 0x74, 0x3e, 0x1c, 0x98, 0x5c, 0x2c, 0xa0,
-	0x6e, 0x44, 0xdc, 0x96, 0x54, 0x14, 0x1a, 0x1c, 0x70, 0x3e, 0x14, 0xd4, 0x96, 0x6c, 0xc4, 0x9a,
-	0x7c, 0x29, 0x25, 0x24, 0x74, 0x45, 0x1c, 0xec, 0x9e, 0x64, 0xd5, 0x7e, 0x3c, 0x6a, 0x3e, 0x1c,
-	0x5c, 0x2e, 0x14, 0x84, 0x46, 0x14, 0xfc, 0xd6, 0xa4, 0x3c, 0x2e, 0x24, 0xc4, 0x82, 0x4c, 0x61,
-	0x45, 0x2c, 0x8c, 0x56, 0x24, 0xb4, 0x8a, 0x6c, 0xb4, 0x72, 0x3c, 0x8b, 0x4f, 0x1c, 0x98, 0x59,
-	0x24, 0xa4, 0x5e, 0x2c, 0xa4, 0x62, 0x34, 0x94, 0x5e, 0x3c, 0x1c, 0x1e, 0x24, 0xb8, 0x6d, 0x34,
-	0xb4, 0x64, 0x24, 0xb2, 0x5e, 0x1c, 0xc4, 0x6e, 0x24, 0x08, 0x13, 0x1c, 0x7c, 0x3e, 0x0c, 0x8c,
-	0x46, 0x0c, 0xa4, 0x4e, 0x0c, 0xc2, 0x73, 0x34, 0xcc, 0x6e, 0x2c, 0xce, 0x78, 0x34, 0xe4, 0xb6,
-	0x8c, 0x34, 0x2a, 0x1c, 0x84, 0x42, 0x0c, 0xf4, 0xe6, 0xd4, 0xec, 0xde, 0xd4, 0xc4, 0x62, 0x14,
-	0xd8, 0x74, 0x24, 0xfc, 0xee, 0xe4, 0xfc, 0xfe, 0xfc, 0xc4, 0x92, 0x6c, 0xf4, 0xd6, 0xbc, 0xd4,
-	0x7a, 0x2c, 0x9c, 0x76, 0x54, 0xd7, 0xe1, 0xe4, 0xf4, 0xa6, 0x5c, 0x04, 0x12, 0x24, 0x67, 0x66,
-	0x64, 0xb4, 0x92, 0x7c, 0xa8, 0x7a, 0x54, 0x34, 0x3e, 0x44, 0xa4, 0x6e, 0x3c, 0xaa, 0xaa, 0xac,
-	0xf1, 0xf1, 0xf4, 0xe4, 0xd2, 0xbc, 0x4c, 0x42, 0x3c, 0xac, 0x92, 0x74, 0xd4, 0xd6, 0xd4, 0xcc,
-	0xce, 0xcc, 0xdc, 0xde, 0xdc, 0xec, 0xeb, 0xec, 0xec, 0xea, 0xe4, 0xf4, 0xf6, 0xf4, 0xd4, 0xd2,
-	0xd4, 0xa6, 0xa7, 0xa4, 0xae, 0xb3, 0xb4, 0xe4, 0xe2, 0xe4, 0x8f, 0x8c, 0x8c, 0x59, 0x57, 0x54,
-	0x94, 0x8e, 0x94, 0x94, 0x96, 0x9c, 0x97, 0x96, 0x94, 0xa1, 0xa2, 0xa4, 0x61, 0x5e, 0x5c, 0x9c,
-	0x9a, 0x94, 0x7c, 0x78, 0x74, 0x50, 0x52, 0x54, 0x9c, 0x9a, 0x9c, 0x41, 0x3d, 0x3c, 0x4c, 0x4a,
-	0x44, 0xcc, 0xca, 0xc4, 0x87, 0x84, 0x84, 0x0c, 0x0a, 0x04, 0x9c, 0x9e, 0x9c, 0x91, 0x9a, 0x9c,
-	0xc1, 0xc3, 0xc4, 0x38, 0x32, 0x2c, 0x74, 0x72, 0x6c, 0xbc, 0xba, 0xb4, 0xbc, 0xba, 0xbc, 0x7e,
-	0x7c, 0x7c, 0xb4, 0xbe, 0xc4, 0x14, 0x22, 0x2c, 0x58, 0x5e, 0x64, 0x6c, 0x5e, 0x54, 0x74, 0x72,
-	0x74, 0x9c, 0xaa, 0xb4, 0x9c, 0x72, 0x4c, 0xa4, 0x52, 0x14, 0x6d, 0x6d, 0x6c, 0x9c, 0x8a, 0x7c,
-	0xe7, 0x86, 0x3c, 0xe7, 0x83, 0x34, 0xc4, 0x5e, 0x0c, 0xbc, 0x9e, 0x8c, 0xac, 0xae, 0xb4, 0x5c,
-	0x6a, 0x74, 0x69, 0x72, 0x74, 0x8c, 0x7e, 0x64, 0xd4, 0x76, 0x2c, 0xe4, 0x7e, 0x2c, 0xbf, 0x7b,
-	0x44, 0xb0, 0xb6, 0xbc, 0xa4, 0x8a, 0x74, 0xdc, 0x7e, 0x34, 0xc1, 0x68, 0x24, 0x9c, 0x82, 0x6c,
-	0xb0, 0xae, 0xac, 0x74, 0x7e, 0x84, 0x64, 0x72, 0x7c, 0x69, 0x77, 0x7c, 0x54, 0x51, 0x4c, 0xe4,
-	0x64, 0x64, 0x94, 0x2e, 0x14, 0xc0, 0xc6, 0xcc, 0x4c, 0x4a, 0x4c, 0x74, 0x3e, 0x0c, 0x54, 0x26,
-	0x04, 0x74, 0x4e, 0x2c, 0x8c, 0x54, 0x2c, 0xb0, 0x6b, 0x2c, 0xc4, 0x1a, 0x1c, 0xe4, 0x3e, 0x44,
-	0xfc, 0x6e, 0x74, 0xec, 0x8a, 0x94, 0xf4, 0x86, 0x34, 0x84, 0x8e, 0x94, 0x4c, 0x46, 0x44, 0xa0,
-	0x5e, 0x24, 0xc0, 0x6e, 0x2c, 0xcc, 0x82, 0x34, 0xcc, 0x46, 0x34, 0xcc, 0x32, 0x3c, 0xf4, 0x9e,
-	0xac, 0xa4, 0x52, 0x1c, 0xec, 0x8a, 0x3c, 0x64, 0x62, 0x64, 0x44, 0x46, 0x4c, 0x8c, 0x62, 0x3c,
-	0x48, 0x34, 0x24, 0x80, 0x4a, 0x1c, 0xdc, 0x83, 0x3c, 0xdc, 0x8a, 0x44, 0xc4, 0x16, 0x34, 0xd4,
-	0x3a, 0x44, 0xe4, 0x56, 0x54, 0x04, 0x0d, 0x1c, 0x3c, 0x36, 0x34, 0xdc, 0x9e, 0x54, 0xdc, 0x8e,
-	0x4c, 0xcc, 0x62, 0x3c, 0xcc, 0x7e, 0x34, 0x7c, 0x46, 0x24, 0xdc, 0x98, 0x5c, 0x5c, 0x3e, 0x2c,
-	0x84, 0x56, 0x34, 0x90, 0x70, 0x54, 0x84, 0x5a, 0x34, 0xcc, 0x6a, 0x1c, 0x74, 0x4a, 0x1c, 0x9c,
-	0x76, 0x5c, 0xa8, 0x64, 0x2c, 0xc7, 0x73, 0x2c, 0xac, 0x9e, 0x94, 0xc4, 0xce, 0xd4, 0xdc, 0x82,
-	0x34, 0xa4, 0x5a, 0x24, 0x7c, 0x76, 0x6c, 0x74, 0x82, 0x8c, 0x67, 0x3e, 0x24, 0x4c, 0x5a, 0x64,
-	0x0c, 0x12, 0x0c, 0xff, 0xff, 0xff, 0x94, 0x10, 0xfb, 0x5c, 0x00, 0x00, 0x00, 0x01, 0x74, 0x52,
-	0x4e, 0x53, 0x00, 0x40, 0xe6, 0xd8, 0x66, 0x00, 0x00, 0x00, 0x01, 0x62, 0x4b, 0x47, 0x44, 0xea,
-	0xc8, 0xda, 0x16, 0x2e, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xea, 0x05, 0x07,
-	0x15, 0x1c, 0x21, 0x9e, 0xcf, 0x09, 0x15, 0x00, 0x00, 0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x64,
-	0x61, 0x74, 0x65, 0x3a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x00, 0x32, 0x30, 0x32, 0x36, 0x2d,
-	0x30, 0x35, 0x2d, 0x30, 0x37, 0x54, 0x32, 0x31, 0x3a, 0x32, 0x35, 0x3a, 0x34, 0x30, 0x2b, 0x30,
-	0x30, 0x3a, 0x30, 0x30, 0xbb, 0xe9, 0x28, 0xea, 0x00, 0x00, 0x00, 0x25, 0x74, 0x45, 0x58, 0x74,
-	0x64, 0x61, 0x74, 0x65, 0x3a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x00, 0x32, 0x30, 0x32, 0x36,
-	0x2d, 0x30, 0x35, 0x2d, 0x30, 0x37, 0x54, 0x32, 0x31, 0x3a, 0x32, 0x35, 0x3a, 0x34, 0x30, 0x2b,
-	0x30, 0x30, 0x3a, 0x30, 0x30, 0xca, 0xb4, 0x90, 0x56, 0x00, 0x00, 0x00, 0x28, 0x74, 0x45, 0x58,
-	0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x00,
-	0x32, 0x30, 0x32, 0x36, 0x2d, 0x30, 0x35, 0x2d, 0x30, 0x37, 0x54, 0x32, 0x31, 0x3a, 0x32, 0x38,
-	0x3a, 0x33, 0x33, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0x53, 0x72, 0x29, 0xbd, 0x00, 0x00, 0x02,
-	0xfb, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0xc0, 0x04, 0x8c, 0x4c, 0x0c, 0x78, 0x01,
-	0x33, 0x0b, 0x7e, 0x05, 0xac, 0x6c, 0xec, 0x1c, 0x78, 0x15, 0x30, 0x72, 0x72, 0x61, 0x88, 0x71,
-	0x23, 0xb1, 0x79, 0x78, 0xf9, 0xf8, 0x59, 0xd1, 0x15, 0x08, 0x20, 0x59, 0x2a, 0x28, 0x24, 0x2c,
-	0x82, 0x61, 0x82, 0xa8, 0x98, 0xb8, 0x04, 0x94, 0x29, 0x29, 0x25, 0xcd, 0x25, 0x83, 0x69, 0xaf,
-	0xac, 0x1c, 0xaf, 0x3c, 0xc4, 0x5c, 0x01, 0x05, 0x45, 0x29, 0x25, 0x4c, 0x05, 0xca, 0x2a, 0x72,
-	0xbc, 0xaa, 0x3c, 0x20, 0x96, 0x9a, 0xba, 0xb4, 0x86, 0x26, 0xa6, 0x02, 0x1e, 0x2d, 0x6d, 0x1d,
-	0x5d, 0x3d, 0x10, 0x4b, 0x4c, 0x9f, 0x93, 0xdf, 0x00, 0x8b, 0xdf, 0x0c, 0x44, 0x19, 0x0d, 0x8d,
-	0x8c, 0x19, 0x4c, 0x18, 0x4c, 0xcd, 0xcc, 0x2d, 0xb0, 0x07, 0x1f, 0x93, 0xa5, 0x95, 0xb5, 0x28,
-	0x93, 0x8d, 0xa5, 0xad, 0x90, 0x1d, 0xf6, 0xf0, 0x31, 0x61, 0x56, 0x51, 0x61, 0x34, 0xe4, 0xb7,
-	0x77, 0xd0, 0x75, 0xc4, 0xae, 0x80, 0x9b, 0x9b, 0x59, 0xce, 0xc9, 0x59, 0xd7, 0xc5, 0xd1, 0xd5,
-	0x0d, 0x87, 0x02, 0x77, 0x39, 0x5e, 0x5d, 0x2e, 0x0f, 0x21, 0x4f, 0x2f, 0x6f, 0x1f, 0x1c, 0x91,
-	0xe0, 0xeb, 0xe7, 0xef, 0x19, 0x10, 0x18, 0x14, 0x1c, 0x14, 0x82, 0x43, 0x41, 0x68, 0x58, 0x78,
-	0x44, 0x50, 0x64, 0x54, 0x74, 0xb4, 0x25, 0x0e, 0x05, 0x31, 0xd1, 0xd1, 0xb1, 0x71, 0x2c, 0xd1,
-	0xd1, 0xd1, 0xf1, 0xd8, 0xe5, 0x59, 0x8d, 0xa3, 0x13, 0xa2, 0x59, 0x12, 0x93, 0x92, 0xa3, 0x53,
-	0x70, 0x98, 0x90, 0x1a, 0xcd, 0x90, 0x66, 0x9b, 0x9e, 0x91, 0x19, 0x9d, 0x95, 0x8d, 0x5d, 0x41,
-	0x0e, 0xd0, 0xf4, 0xdc, 0x84, 0xbc, 0xbc, 0xfc, 0x82, 0x4c, 0xec, 0x0a, 0x0a, 0x8b, 0x8a, 0x4b,
-	0x4a, 0xcb, 0x0a, 0x32, 0x0b, 0xcb, 0x2b, 0x4a, 0xb0, 0x2a, 0x88, 0x2e, 0x29, 0x2f, 0xaf, 0xac,
-	0xaa, 0xae, 0xae, 0xa9, 0x35, 0x88, 0xae, 0xc0, 0x22, 0x5f, 0x57, 0xdf, 0x90, 0xd1, 0x58, 0x0d,
-	0x04, 0x19, 0x4d, 0xcd, 0x05, 0x2d, 0x58, 0x14, 0x64, 0xb6, 0xb6, 0xd5, 0xb4, 0xd7, 0x35, 0x76,
-	0xd4, 0xd5, 0x98, 0x64, 0x74, 0x62, 0x71, 0x05, 0x77, 0x74, 0x67, 0x57, 0x43, 0x63, 0x75, 0x39,
-	0x10, 0x74, 0xf7, 0x64, 0x14, 0x72, 0x63, 0x28, 0xf0, 0xc9, 0xec, 0xcd, 0x68, 0x6e, 0x05, 0x81,
-	0xbe, 0xea, 0x9a, 0x9a, 0xfe, 0x09, 0xc0, 0x08, 0xe1, 0x81, 0xc9, 0x99, 0xd4, 0x4e, 0x9c, 0x24,
-	0x23, 0x9b, 0x90, 0x91, 0x91, 0xd1, 0xdd, 0xd7, 0x57, 0x5f, 0x3f, 0xb9, 0xbc, 0x64, 0xca, 0xd4,
-	0x69, 0xea, 0xd2, 0x55, 0x55, 0x7d, 0x50, 0x05, 0xd3, 0x4b, 0x67, 0xcc, 0x9c, 0x35, 0x7b, 0xce,
-	0xdc, 0x8e, 0x9a, 0xfa, 0xe9, 0x93, 0x93, 0xe7, 0x75, 0xcf, 0x9f, 0xbb, 0x20, 0xd4, 0x6b, 0xe1,
-	0xa2, 0xc5, 0x4b, 0xaa, 0xa1, 0x0a, 0x9a, 0x33, 0x96, 0x7a, 0x2f, 0x5b, 0xee, 0xbf, 0x62, 0xe5,
-	0x92, 0x55, 0xab, 0x57, 0xaf, 0x5e, 0x33, 0x7d, 0xed, 0xba, 0xf5, 0x7e, 0x9e, 0x41, 0x8b, 0x72,
-	0x36, 0xac, 0x85, 0x2a, 0xd8, 0x98, 0x37, 0x77, 0xf1, 0xb2, 0x85, 0x6c, 0x9b, 0x36, 0x3b, 0x6d,
-	0x51, 0xdd, 0xaa, 0xbb, 0x6d, 0xfb, 0x8e, 0x9d, 0xbb, 0xfc, 0xbc, 0x77, 0xa7, 0xee, 0x59, 0x59,
-	0x0e, 0x55, 0xb0, 0xb7, 0x7c, 0xfe, 0xbc, 0x99, 0xbb, 0x97, 0x9b, 0x1a, 0x3a, 0xed, 0xf3, 0xdc,
-	0xb6, 0xff, 0xc0, 0xc1, 0x43, 0xeb, 0x0e, 0x1f, 0xf1, 0x38, 0x5a, 0x3b, 0x71, 0xfa, 0x31, 0xa8,
-	0x02, 0x8e, 0xda, 0x86, 0xe3, 0x27, 0xe4, 0x35, 0x4f, 0x9e, 0x72, 0x76, 0x0d, 0x08, 0x38, 0x7d,
-	0x86, 0xf3, 0xec, 0xb9, 0xf3, 0xba, 0x17, 0x24, 0x34, 0x2f, 0x36, 0x9b, 0xa0, 0x46, 0x37, 0xa3,
-	0x93, 0xee, 0x36, 0x0f, 0x73, 0x4e, 0xe9, 0x4b, 0x97, 0xaf, 0x04, 0x5c, 0x95, 0x44, 0x48, 0xb4,
-	0x76, 0x74, 0xd8, 0xee, 0x13, 0x17, 0xbf, 0xa6, 0xa5, 0xe5, 0xb4, 0xcf, 0x23, 0xe0, 0x2a, 0xe7,
-	0xf5, 0xeb, 0x97, 0x4f, 0x07, 0x5d, 0xb5, 0xbb, 0xb1, 0xe5, 0xe6, 0x89, 0x5b, 0xab, 0xeb, 0x81,
-	0xb6, 0xac, 0xec, 0xb8, 0x7d, 0xe7, 0x8e, 0xb3, 0x88, 0xa9, 0x16, 0xd0, 0x04, 0x21, 0xa0, 0x09,
-	0x97, 0xa5, 0x39, 0xcd, 0x03, 0x02, 0xee, 0x9e, 0x62, 0x5b, 0xb8, 0x7b, 0xd6, 0xbd, 0x9a, 0x0c,
-	0x06, 0x86, 0xe4, 0xce, 0x5b, 0x5e, 0x9e, 0xce, 0x4e, 0xa6, 0x16, 0xda, 0xfc, 0xf6, 0xf7, 0x3d,
-	0x02, 0xcc, 0x4f, 0x73, 0x9a, 0xab, 0x07, 0xdc, 0x17, 0x10, 0x67, 0x0b, 0x34, 0xf7, 0xd6, 0xeb,
-	0x07, 0x86, 0xd5, 0xca, 0xce, 0xea, 0xfb, 0x77, 0xd8, 0x44, 0x4e, 0x59, 0x30, 0x0a, 0x8a, 0xdc,
-	0xdf, 0xe6, 0x11, 0xa0, 0x1e, 0x14, 0xa4, 0xbe, 0xff, 0xae, 0xa0, 0x93, 0xe7, 0x83, 0xd3, 0xde,
-	0x0f, 0x1f, 0x01, 0x7d, 0xda, 0xda, 0x37, 0x7f, 0x7a, 0xdc, 0x72, 0x05, 0x7b, 0x31, 0x39, 0x51,
-	0x01, 0x91, 0x07, 0x41, 0x57, 0x1f, 0x9f, 0x0e, 0x70, 0x3e, 0x75, 0xea, 0xd4, 0x93, 0xe5, 0x57,
-	0x67, 0x3d, 0x7d, 0x56, 0x5e, 0x07, 0x0c, 0xa6, 0x8a, 0x8a, 0x06, 0xd7, 0x53, 0x27, 0x25, 0xb8,
-	0x25, 0x25, 0x79, 0x24, 0x59, 0x4d, 0x4c, 0x4c, 0x7c, 0x7c, 0x2e, 0xf8, 0x98, 0xd8, 0x3c, 0x77,
-	0x3e, 0xcd, 0xf2, 0xa2, 0x36, 0xb9, 0x96, 0x81, 0xe1, 0x65, 0x17, 0x07, 0x46, 0x99, 0x04, 0xf1,
-	0x37, 0x0f, 0x47, 0x57, 0xf6, 0x45, 0x06, 0xfc, 0x80, 0x87, 0x07, 0x00, 0x67, 0x13, 0xf8, 0xef,
-	0x20, 0x81, 0x09, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+	0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x06, 0x00, 0x00, 0x00, 0x5c, 0x72, 0xa8,
+	0x66, 0x00, 0x00, 0x69, 0x60, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda, 0xec, 0x5d, 0x03, 0x78, 0x24,
+	0x5b, 0xd0, 0xed, 0xdf, 0x36, 0x56, 0x9a, 0x0c, 0xba, 0x6f, 0x0f, 0x63, 0xdb, 0xb6, 0x8d, 0x35,
+	0xb3, 0xb6, 0x6d, 0xdb, 0xcf, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0x27, 0xf5, 0xdf, 0xea, 0xe9, 0x3b,
+	0x49, 0x67, 0x32, 0x9d, 0xf7, 0xef, 0x4b, 0xb2, 0x33, 0x79, 0xf7, 0x7c, 0x5f, 0x3d, 0xee, 0x6e,
+	0xf0, 0xe5, 0x9c, 0xba, 0xb7, 0x4e, 0x55, 0x5d, 0x81, 0x83, 0x83, 0x83, 0x83, 0x83, 0xe3, 0x0f,
+	0xc1, 0x60, 0x30, 0xfc, 0xbd, 0x2c, 0xca, 0xd5, 0xb2, 0x24, 0x5d, 0x29, 0x13, 0x72, 0xab, 0x2c,
+	0xc9, 0x07, 0x89, 0x48, 0xa6, 0x27, 0x27, 0x27, 0xff, 0xb5, 0xc0, 0xc1, 0xc1, 0x31, 0x74, 0x21,
+	0x49, 0x52, 0xb8, 0x2c, 0x92, 0x57, 0x65, 0x89, 0x80, 0x57, 0x88, 0xe4, 0x41, 0x9b, 0xcd, 0x36,
+	0x5c, 0xe0, 0xe0, 0xe0, 0x18, 0x7a, 0xb0, 0x4a, 0xd2, 0x64, 0x59, 0x22, 0xbf, 0x32, 0xc2, 0x3b,
+	0x65, 0x02, 0x1b, 0xab, 0x42, 0xa0, 0x3d, 0xd7, 0xd6, 0x11, 0xe3, 0x92, 0xbf, 0xc4, 0xff, 0x66,
+	0x95, 0xc8, 0xa5, 0x02, 0x07, 0x07, 0xc7, 0xd0, 0x82, 0x2c, 0x49, 0xed, 0x8c, 0xf8, 0x56, 0x42,
+	0xa0, 0x31, 0xde, 0x0c, 0xa7, 0xdb, 0x42, 0xe0, 0xf9, 0x6d, 0x79, 0x70, 0xc3, 0xdc, 0x58, 0x58,
+	0x5b, 0xee, 0xfa, 0x94, 0xfd, 0x7f, 0x9b, 0xc9, 0x66, 0x16, 0x38, 0x38, 0x38, 0x86, 0x54, 0xe6,
+	0x07, 0x8c, 0x50, 0xab, 0x04, 0x0b, 0x32, 0x8c, 0xb0, 0xb7, 0xc2, 0x02, 0x4f, 0x6f, 0xca, 0x51,
+	0x04, 0xe0, 0xda, 0xd9, 0x31, 0xb0, 0x30, 0x6d, 0x14, 0xc4, 0x04, 0x5b, 0xdf, 0xc2, 0x5f, 0x43,
+	0x44, 0xb2, 0x48, 0xe0, 0xe0, 0xe0, 0x18, 0x12, 0xe4, 0x9f, 0x29, 0x4b, 0xe4, 0x27, 0x1a, 0x90,
+	0x11, 0x6a, 0xe9, 0x9c, 0x9f, 0x1e, 0x04, 0x5b, 0x0b, 0x83, 0xe0, 0x86, 0x39, 0x31, 0x48, 0x7e,
+	0x25, 0x8e, 0x35, 0x39, 0x60, 0x7e, 0xea, 0x48, 0x28, 0x48, 0x0c, 0x7f, 0x55, 0x3d, 0x21, 0x6c,
+	0x14, 0x38, 0x38, 0x38, 0x02, 0x1b, 0xa2, 0x28, 0x12, 0x59, 0x22, 0xdf, 0xd2, 0x80, 0x10, 0xab,
+	0xd4, 0xb1, 0x28, 0xc3, 0x00, 0x5b, 0x0a, 0x0c, 0x70, 0xb2, 0xd9, 0x01, 0x4f, 0x6f, 0x76, 0x67,
+	0xff, 0xc7, 0xd7, 0x67, 0xc2, 0xca, 0xdc, 0xb1, 0xb0, 0x80, 0x9e, 0x00, 0x9a, 0x73, 0x63, 0x3f,
+	0x51, 0x04, 0x40, 0x24, 0x27, 0x05, 0x0e, 0x0e, 0x8e, 0xc0, 0x85, 0x4d, 0x14, 0x23, 0x64, 0x89,
+	0x3c, 0x40, 0x03, 0xa2, 0x1c, 0xe4, 0xdb, 0x19, 0xc9, 0x06, 0xd8, 0x94, 0x3f, 0x4e, 0xc9, 0xfe,
+	0xd7, 0xce, 0x8a, 0xf2, 0x64, 0xff, 0xfb, 0x57, 0xa6, 0x2a, 0xe4, 0x5f, 0x48, 0xa3, 0x31, 0x3b,
+	0x4a, 0x11, 0x0b, 0x99, 0x90, 0x23, 0x02, 0x07, 0x07, 0x47, 0xe0, 0x02, 0xb3, 0x38, 0xbb, 0xf7,
+	0x4f, 0x48, 0x30, 0xc0, 0xc6, 0xbc, 0xb1, 0xb0, 0x99, 0x66, 0xff, 0x43, 0x35, 0x04, 0x1e, 0x5b,
+	0x9f, 0xe9, 0x11, 0x80, 0x8b, 0xa7, 0x84, 0x2b, 0xe4, 0x5f, 0x94, 0x3e, 0x0a, 0xe6, 0x56, 0x24,
+	0xfe, 0xa4, 0xfe, 0x9e, 0x3b, 0x05, 0x0e, 0x0e, 0x8e, 0xc0, 0x84, 0x2c, 0xca, 0xe3, 0x19, 0xf9,
+	0x4b, 0x22, 0x8c, 0x9d, 0xeb, 0x73, 0xc6, 0xa8, 0xd9, 0xdf, 0x00, 0x17, 0x4c, 0x08, 0x56, 0x88,
+	0xcf, 0x62, 0x4f, 0x95, 0x8c, 0xe4, 0x57, 0x62, 0x61, 0x69, 0x78, 0x47, 0x00, 0x0b, 0x00, 0x07,
+	0x07, 0x07, 0x21, 0xa4, 0x54, 0x26, 0xe4, 0x23, 0x24, 0x72, 0x7e, 0xa4, 0xf8, 0xed, 0xea, 0xac,
+	0xd1, 0xb0, 0x21, 0x97, 0x66, 0x7f, 0x2a, 0x00, 0x3b, 0x4a, 0x8c, 0x70, 0xcf, 0xb2, 0x64, 0x0f,
+	0xf9, 0xef, 0x59, 0x9e, 0xe2, 0x21, 0xff, 0xe2, 0x8c, 0x51, 0x30, 0x2d, 0x2f, 0x58, 0x15, 0x00,
+	0xe9, 0x1c, 0x81, 0x83, 0x83, 0x23, 0xb0, 0x80, 0xad, 0xbc, 0xd8, 0xcd, 0xa7, 0x14, 0xfd, 0x64,
+	0xe9, 0xc7, 0x25, 0xe9, 0xa3, 0x61, 0x7d, 0xce, 0x68, 0x3c, 0xfe, 0x2b, 0xc5, 0xbf, 0x73, 0xdb,
+	0x5c, 0x9a, 0xec, 0x7f, 0xf9, 0xf4, 0x48, 0x0f, 0xf9, 0x97, 0x64, 0x8c, 0x86, 0x29, 0x59, 0x4e,
+	0x08, 0xdc, 0x22, 0x20, 0x07, 0x07, 0x6f, 0xf6, 0x59, 0xc6, 0x8e, 0xfe, 0x93, 0x13, 0xc6, 0xc2,
+	0xda, 0xac, 0x51, 0x34, 0xfb, 0x8f, 0x81, 0xcd, 0x6a, 0xf1, 0xef, 0xa6, 0x79, 0x71, 0x1a, 0x01,
+	0xd8, 0x5f, 0x63, 0x65, 0xe4, 0x57, 0x05, 0xc0, 0x11, 0xa0, 0x02, 0xc0, 0xc1, 0xc1, 0xef, 0xfd,
+	0x8d, 0xb2, 0x44, 0x7e, 0xa0, 0x01, 0x55, 0x51, 0x41, 0x1d, 0xab, 0x33, 0x47, 0xc2, 0xba, 0xec,
+	0xae, 0xec, 0xbf, 0xa3, 0xc4, 0x04, 0x4f, 0x6c, 0xc8, 0x62, 0xe4, 0x57, 0xfe, 0x79, 0x89, 0x4a,
+	0xfe, 0xa5, 0x34, 0x56, 0xe6, 0x8c, 0x85, 0xda, 0x64, 0x3b, 0xeb, 0x14, 0x5c, 0x25, 0x70, 0x70,
+	0x70, 0x04, 0xcc, 0xbd, 0xdf, 0x21, 0x4b, 0xe4, 0x7e, 0x1a, 0x90, 0x19, 0x26, 0xfd, 0xbc, 0x34,
+	0x6d, 0xa4, 0x92, 0xfd, 0xbb, 0x8a, 0x7f, 0x41, 0x70, 0x6e, 0xab, 0x53, 0x93, 0xfd, 0xaf, 0x9b,
+	0x1d, 0xe3, 0x26, 0x7f, 0xa6, 0x3b, 0xd6, 0xe4, 0x8d, 0x83, 0xf2, 0x04, 0x7b, 0xa7, 0x5a, 0x03,
+	0x98, 0x2f, 0x70, 0x70, 0x70, 0x04, 0x06, 0x64, 0x42, 0xf6, 0x21, 0x71, 0x23, 0x1d, 0xf2, 0xcf,
+	0x53, 0x13, 0x46, 0x03, 0xcb, 0xfe, 0xcc, 0xfa, 0xdb, 0x56, 0x14, 0x04, 0x77, 0x2e, 0x49, 0xd4,
+	0x08, 0xc0, 0xde, 0x2a, 0xe2, 0x21, 0xff, 0xb2, 0x2c, 0xfa, 0x6b, 0x8b, 0x2d, 0x90, 0x17, 0xeb,
+	0xfc, 0x55, 0x6d, 0x05, 0x9e, 0x20, 0x70, 0x70, 0x70, 0xf8, 0x3f, 0x64, 0x59, 0x8e, 0x66, 0x13,
+	0x7e, 0x95, 0x91, 0xe3, 0x60, 0x55, 0xc6, 0x08, 0x58, 0xa3, 0xc9, 0xfe, 0x06, 0x38, 0xd5, 0xec,
+	0x80, 0xe7, 0xb6, 0xe6, 0x7a, 0xc8, 0x7f, 0xf7, 0xb2, 0x64, 0x0d, 0xf9, 0x97, 0x67, 0x8d, 0x81,
+	0x5d, 0x0d, 0xe1, 0x90, 0x19, 0xe3, 0x54, 0xfa, 0x00, 0x08, 0x21, 0xcd, 0x02, 0x07, 0x07, 0x87,
+	0xff, 0x1f, 0xfd, 0x59, 0xd5, 0x3f, 0x37, 0x5c, 0xec, 0x58, 0x9e, 0x3e, 0x5c, 0xc9, 0xfe, 0x6b,
+	0xb3, 0xbb, 0xac, 0x3f, 0xcc, 0xfe, 0xd7, 0xcf, 0x66, 0x7d, 0xff, 0xac, 0xf9, 0x27, 0x4c, 0x43,
+	0x7e, 0x8c, 0xfd, 0xcd, 0x11, 0x10, 0xe9, 0xb4, 0xfd, 0xa8, 0x0a, 0x40, 0x8c, 0xc0, 0xc1, 0xc1,
+	0xe1, 0xdf, 0x20, 0x22, 0x59, 0x85, 0x84, 0xb5, 0xcb, 0x72, 0xc7, 0xac, 0xc4, 0x91, 0xb0, 0x92,
+	0x65, 0xff, 0x6e, 0xd6, 0xdf, 0xfe, 0x2a, 0x09, 0x1e, 0x5e, 0x93, 0xae, 0x29, 0xfe, 0xed, 0x28,
+	0x17, 0x35, 0xe4, 0x5f, 0x91, 0x3d, 0x06, 0x8e, 0x4d, 0x49, 0x04, 0x97, 0x4d, 0x76, 0x77, 0x02,
+	0xca, 0xb2, 0x5d, 0xe0, 0xe0, 0xe0, 0xf0, 0xeb, 0x29, 0xbf, 0x7a, 0x56, 0xf5, 0xaf, 0x8d, 0x36,
+	0xc0, 0x0a, 0x9a, 0xfd, 0x57, 0x65, 0x8e, 0xf4, 0xb2, 0xfe, 0x2e, 0x99, 0x1c, 0xa6, 0xc9, 0xfe,
+	0xb7, 0x2c, 0x4c, 0xf0, 0x22, 0xff, 0x4a, 0x7a, 0x5d, 0x38, 0x30, 0x31, 0xe5, 0x37, 0xd5, 0x42,
+	0xfc, 0x41, 0x92, 0xa4, 0x7f, 0x11, 0x38, 0x38, 0x38, 0xfc, 0x76, 0xca, 0xef, 0xbf, 0x65, 0x49,
+	0x7a, 0x12, 0x09, 0x1b, 0xe3, 0x92, 0x3b, 0x96, 0xa6, 0x0e, 0x53, 0xb2, 0x7f, 0x4f, 0xeb, 0x6f,
+	0x7b, 0xb1, 0x11, 0xee, 0x58, 0xac, 0x2d, 0xfe, 0x9d, 0x37, 0x21, 0xc4, 0x8b, 0xfc, 0xab, 0xa8,
+	0x05, 0x78, 0x68, 0x92, 0x67, 0x0e, 0x00, 0x04, 0x0e, 0x0e, 0x0e, 0xff, 0x85, 0x2c, 0xc9, 0xe7,
+	0xaa, 0x7e, 0x7d, 0xe7, 0xb4, 0xf8, 0x11, 0xb0, 0x3c, 0x6d, 0x38, 0x16, 0xff, 0xbc, 0xac, 0xbf,
+	0x93, 0x8d, 0x0e, 0x78, 0x66, 0x4b, 0x8e, 0x87, 0xfc, 0x8f, 0xac, 0xcd, 0x80, 0xcd, 0x45, 0x26,
+	0x58, 0xd1, 0x83, 0xfc, 0x18, 0xdb, 0x1b, 0x22, 0x7e, 0x56, 0x05, 0xe0, 0x4d, 0x81, 0x83, 0x83,
+	0xc3, 0x6f, 0xc9, 0xdf, 0xc6, 0x32, 0x75, 0x45, 0x8c, 0xb9, 0x73, 0x59, 0xea, 0xff, 0xe2, 0xf1,
+	0xbf, 0x57, 0xeb, 0xef, 0xba, 0xf6, 0x68, 0x46, 0x7e, 0xb6, 0xfa, 0x0b, 0x89, 0xef, 0x45, 0xfe,
+	0xd5, 0xb9, 0x63, 0x61, 0x5e, 0x81, 0x13, 0xd4, 0x51, 0xe0, 0x0b, 0x05, 0x0e, 0x0e, 0x0e, 0x3f,
+	0xed, 0xf5, 0x97, 0xc8, 0xa3, 0x34, 0x20, 0xcc, 0x61, 0xfb, 0x6d, 0x61, 0xd2, 0xff, 0xd2, 0xec,
+	0x3f, 0xac, 0x37, 0xeb, 0x0f, 0x8f, 0xff, 0x98, 0xf1, 0x35, 0x02, 0x70, 0xb2, 0xc5, 0xd9, 0x2b,
+	0xf9, 0xb7, 0xd5, 0xb8, 0x60, 0x7a, 0x8e, 0xeb, 0x57, 0xff, 0x6e, 0x03, 0xe6, 0xe0, 0xe0, 0x55,
+	0xff, 0x95, 0x2c, 0xfb, 0xd7, 0x45, 0x8f, 0x83, 0xa5, 0x29, 0x2c, 0xfb, 0x7b, 0x5b, 0x7f, 0x17,
+	0x4f, 0x0a, 0xd5, 0x90, 0xff, 0xa1, 0xd5, 0xe9, 0xd8, 0xed, 0xd7, 0x93, 0xfc, 0xf4, 0xbf, 0x8d,
+	0x85, 0xfd, 0xad, 0xb1, 0x50, 0x96, 0xe0, 0xf8, 0x5e, 0x11, 0x00, 0x49, 0x9a, 0x29, 0x70, 0x70,
+	0x70, 0xf8, 0xdd, 0x3e, 0xff, 0x38, 0x59, 0x92, 0x5f, 0x43, 0x92, 0x66, 0x45, 0xc8, 0x1d, 0x8b,
+	0x93, 0xff, 0x07, 0x96, 0xa5, 0x0e, 0xeb, 0xd5, 0xfa, 0xc3, 0xec, 0x7f, 0xfb, 0xa2, 0x44, 0xaf,
+	0xd6, 0xdf, 0xde, 0xc8, 0x8f, 0x71, 0x74, 0x72, 0xd2, 0x6f, 0x69, 0xe1, 0xd6, 0xaf, 0x15, 0x71,
+	0x11, 0xe5, 0x12, 0x81, 0x83, 0x83, 0xc3, 0xbf, 0x40, 0x24, 0xb2, 0x95, 0x65, 0xff, 0xf1, 0x31,
+	0x23, 0x31, 0xfb, 0xfb, 0xb4, 0xfe, 0x4e, 0x34, 0xda, 0xd9, 0xc6, 0x5f, 0x4f, 0x9c, 0x68, 0x76,
+	0xf6, 0x4a, 0xfe, 0xb5, 0x34, 0x4e, 0x4d, 0x4d, 0xf8, 0x35, 0xd2, 0x21, 0x2b, 0x02, 0x60, 0x13,
+	0xc5, 0x78, 0x81, 0x83, 0x63, 0xa0, 0x80, 0x4d, 0x26, 0xb8, 0x71, 0x86, 0x86, 0xd2, 0x75, 0xa6,
+	0xb6, 0xb1, 0xde, 0x69, 0x25, 0x64, 0x1e, 0xda, 0x5b, 0x02, 0x87, 0xaf, 0xe5, 0x9e, 0xca, 0x1d,
+	0x3d, 0x3d, 0x44, 0x04, 0x4d, 0xf6, 0xef, 0xc5, 0xfa, 0xbb, 0x66, 0x96, 0xb6, 0xf8, 0xf7, 0xe0,
+	0xea, 0x34, 0x58, 0x9f, 0x6f, 0xe8, 0x95, 0xfc, 0xeb, 0xa8, 0x68, 0x9c, 0x3f, 0x35, 0xe6, 0x2b,
+	0xab, 0x44, 0x94, 0x65, 0x20, 0xfc, 0x65, 0x20, 0x8e, 0x01, 0x03, 0xfe, 0x70, 0xb1, 0x2d, 0xb5,
+	0xbd, 0x07, 0x8a, 0x82, 0x7c, 0xd0, 0x6c, 0x36, 0x8f, 0x16, 0x38, 0x3c, 0xc0, 0x37, 0xfc, 0x14,
+	0x72, 0x12, 0xd2, 0x39, 0x23, 0x7e, 0x18, 0x66, 0x7f, 0xad, 0xf5, 0x97, 0xdb, 0x65, 0xfd, 0xed,
+	0x2d, 0x17, 0xe1, 0x81, 0x55, 0x69, 0x1a, 0x01, 0xb8, 0x7e, 0x4e, 0xac, 0x4f, 0xf2, 0x6f, 0x28,
+	0x34, 0xc0, 0xde, 0xc6, 0x50, 0x26, 0xc6, 0xdf, 0x0a, 0x1c, 0x1c, 0x83, 0x71, 0x8c, 0x8d, 0x77,
+	0x8a, 0x9d, 0x79, 0x61, 0x16, 0xc8, 0xa1, 0x11, 0x6d, 0x17, 0x31, 0xfb, 0x60, 0x78, 0x84, 0x00,
+	0xdb, 0x5c, 0xf1, 0x11, 0x4b, 0x01, 0xc1, 0x87, 0x7d, 0x00, 0xa3, 0x30, 0xcc, 0xa0, 0x64, 0x7f,
+	0x3d, 0xeb, 0xef, 0xa2, 0x89, 0x21, 0x48, 0x7a, 0xaf, 0xe3, 0x7f, 0x6f, 0xe4, 0x5f, 0x5f, 0x40,
+	0x45, 0xa3, 0xc4, 0x08, 0xab, 0xcb, 0x5d, 0xec, 0xfb, 0xfe, 0xa8, 0xc0, 0xc1, 0x31, 0xd0, 0x9b,
+	0x6a, 0x6d, 0x84, 0x7c, 0x33, 0x39, 0xd1, 0x08, 0xd3, 0x93, 0x8d, 0x30, 0x23, 0xc5, 0x08, 0xb3,
+	0x68, 0x4c, 0xa3, 0xff, 0x5c, 0x1c, 0x69, 0x01, 0xa7, 0x2c, 0x79, 0x3a, 0xd2, 0xac, 0x12, 0x79,
+	0x17, 0x5f, 0xb1, 0x15, 0xfe, 0xc4, 0x50, 0xaf, 0x4b, 0xe0, 0xb2, 0x92, 0xce, 0x39, 0x09, 0xff,
+	0x03, 0x4b, 0xa8, 0x00, 0xe8, 0x59, 0x7f, 0xb7, 0x2d, 0x4c, 0xe8, 0x71, 0xfc, 0x4f, 0x87, 0x0d,
+	0x05, 0x06, 0x46, 0x7c, 0x0d, 0xf9, 0x31, 0x76, 0x55, 0x58, 0x60, 0x66, 0xae, 0x43, 0x15, 0x5f,
+	0xf9, 0x5c, 0x81, 0x83, 0x63, 0xa0, 0x60, 0x25, 0x64, 0xaf, 0x32, 0xbc, 0x42, 0xa4, 0xaf, 0x27,
+	0x27, 0x18, 0x61, 0x6a, 0x37, 0x11, 0x68, 0xa7, 0x31, 0x3b, 0x95, 0x46, 0x1a, 0x0a, 0x81, 0xb9,
+	0xc3, 0x26, 0x49, 0xac, 0x37, 0x9d, 0x86, 0x7c, 0x2f, 0xbe, 0x6a, 0xfb, 0x27, 0x9c, 0xf6, 0xcb,
+	0x67, 0xdf, 0x83, 0xca, 0xf0, 0xd1, 0xb0, 0x38, 0xe9, 0xbf, 0x75, 0xad, 0xbf, 0xe3, 0x0d, 0x36,
+	0x78, 0x72, 0x63, 0xb6, 0x46, 0x00, 0x6e, 0x9c, 0x1b, 0xe7, 0x93, 0xfc, 0x1b, 0x68, 0xec, 0xa9,
+	0x12, 0xa1, 0x3a, 0xc9, 0xfe, 0xdb, 0xe0, 0x3c, 0x09, 0xc6, 0xc1, 0x07, 0x58, 0x58, 0x25, 0x3b,
+	0xde, 0x08, 0x78, 0x0a, 0x98, 0x9a, 0xe4, 0x16, 0x81, 0x99, 0x28, 0x02, 0x54, 0x00, 0xe6, 0x50,
+	0x01, 0x98, 0x9b, 0x4e, 0x45, 0x21, 0xd5, 0x04, 0xe9, 0xa1, 0xe2, 0x2f, 0xec, 0xd7, 0xb3, 0x26,
+	0x15, 0xac, 0x23, 0xfc, 0x59, 0x9a, 0x7e, 0x58, 0xbf, 0x7f, 0xb8, 0x4d, 0xea, 0x5c, 0x90, 0xf8,
+	0x5f, 0xee, 0xec, 0xaf, 0xb1, 0xfe, 0xc6, 0x68, 0x8a, 0x7f, 0x57, 0xcf, 0x8c, 0xf2, 0x3a, 0xfe,
+	0x9f, 0x6a, 0x75, 0xfa, 0x24, 0xff, 0xc6, 0x42, 0x03, 0x1c, 0x6e, 0xb4, 0xff, 0x94, 0x12, 0x66,
+	0x55, 0x7a, 0x00, 0x24, 0x49, 0x2a, 0x17, 0x38, 0x38, 0x06, 0x0a, 0x58, 0xdc, 0xeb, 0xda, 0x57,
+	0x6f, 0x86, 0x49, 0x09, 0xfa, 0x22, 0x30, 0x3f, 0xc3, 0x08, 0x13, 0x93, 0x4c, 0x10, 0xe3, 0x90,
+	0x3a, 0xbb, 0x84, 0x40, 0xfa, 0x12, 0x33, 0x15, 0x12, 0x64, 0x88, 0x67, 0xff, 0x66, 0xf6, 0x35,
+	0x37, 0x44, 0x8c, 0x80, 0x45, 0x98, 0xfd, 0x75, 0xac, 0x3f, 0xdc, 0xf9, 0xf7, 0xc0, 0x4a, 0x4d,
+	0xf1, 0x0f, 0x9f, 0xff, 0xa2, 0x64, 0x37, 0xf8, 0x24, 0xff, 0xc6, 0x22, 0x03, 0x9c, 0x68, 0x71,
+	0xfc, 0xe4, 0xb4, 0xca, 0x3f, 0xf3, 0x31, 0x60, 0x8e, 0xc1, 0xba, 0xd3, 0x3e, 0x4b, 0x03, 0x12,
+	0x9c, 0xe2, 0x67, 0x13, 0xe3, 0x8d, 0x8a, 0x08, 0x4c, 0xa1, 0x22, 0x30, 0x8d, 0x8a, 0xc0, 0x8c,
+	0x1e, 0x22, 0x30, 0x4f, 0x15, 0x81, 0x85, 0x99, 0x46, 0xa8, 0x8b, 0x33, 0x43, 0xb0, 0xdc, 0xfd,
+	0x5a, 0x20, 0x3d, 0x69, 0xb3, 0x58, 0x82, 0x87, 0xf0, 0x7a, 0xef, 0x57, 0x95, 0xef, 0x93, 0x4b,
+	0xec, 0x5c, 0x98, 0xf8, 0x5f, 0x7d, 0x5a, 0x7f, 0x17, 0x4c, 0xf0, 0x2e, 0xfe, 0xdd, 0x3c, 0x3f,
+	0x5e, 0x97, 0xfc, 0x9b, 0x68, 0x1c, 0x6a, 0x72, 0x7d, 0xc3, 0xbe, 0xa7, 0x83, 0x21, 0xaa, 0x1c,
+	0x7c, 0x98, 0x65, 0x2d, 0xfe, 0xb0, 0x39, 0x68, 0x1d, 0x60, 0x7c, 0x9c, 0x11, 0x7c, 0x89, 0xc0,
+	0xec, 0x1e, 0x22, 0xb0, 0x28, 0x93, 0xfe, 0x9d, 0x46, 0x51, 0xa4, 0x45, 0xb1, 0xc3, 0x58, 0x0f,
+	0x01, 0xba, 0x05, 0x43, 0xed, 0x07, 0x17, 0x0b, 0x9f, 0x8c, 0x94, 0xad, 0x51, 0xc3, 0x30, 0xfb,
+	0xeb, 0x5a, 0x7f, 0x98, 0xfd, 0x6f, 0x5b, 0x18, 0xef, 0x25, 0x00, 0x17, 0x4e, 0x0a, 0xed, 0x95,
+	0xfc, 0x48, 0x7c, 0x8c, 0xcd, 0x34, 0x36, 0x56, 0xa9, 0x33, 0x00, 0x12, 0x79, 0x51, 0xe0, 0xe0,
+	0x18, 0x84, 0xa3, 0x6d, 0x99, 0xfa, 0x03, 0xf7, 0x6b, 0x55, 0xa4, 0x09, 0x7c, 0x89, 0xc0, 0xac,
+	0x1e, 0x22, 0xb0, 0x40, 0x15, 0x81, 0x25, 0xd9, 0x78, 0x2d, 0x30, 0x43, 0x66, 0x98, 0x88, 0x04,
+	0x61, 0x71, 0x33, 0xfe, 0xb9, 0xc2, 0x10, 0x80, 0xd1, 0x68, 0xfc, 0x37, 0x59, 0x24, 0x77, 0xe3,
+	0xd7, 0x95, 0x1d, 0x26, 0x76, 0x2e, 0x48, 0xf8, 0x2f, 0x8f, 0xf5, 0xb7, 0xd2, 0x87, 0xf5, 0x77,
+	0xb2, 0xc9, 0x0e, 0x4f, 0x6d, 0xd2, 0x16, 0xff, 0xb0, 0x13, 0x70, 0x5f, 0x35, 0xd1, 0x25, 0xff,
+	0xb6, 0xd2, 0x20, 0x98, 0x96, 0xe3, 0x60, 0x27, 0xaa, 0xa3, 0x02, 0x07, 0xc7, 0x20, 0x4d, 0xb4,
+	0x7d, 0x4a, 0x03, 0x32, 0x82, 0x2d, 0x1f, 0xb5, 0xc6, 0x1a, 0x95, 0x82, 0xe0, 0x44, 0xac, 0x07,
+	0x30, 0x11, 0x50, 0x9d, 0x01, 0x26, 0x02, 0x58, 0x0f, 0x98, 0x97, 0xd1, 0x5d, 0x04, 0x30, 0x4c,
+	0x50, 0x15, 0x6b, 0x41, 0x47, 0xa1, 0x83, 0x9d, 0x06, 0xb0, 0xcf, 0x00, 0x7b, 0x07, 0x86, 0x8a,
+	0xef, 0x8f, 0x77, 0xff, 0x85, 0x89, 0xff, 0xdd, 0x97, 0xf5, 0xe7, 0xb5, 0xf3, 0x0f, 0xe3, 0xde,
+	0xe5, 0x29, 0xba, 0xe4, 0xdf, 0x52, 0x6c, 0x80, 0xdd, 0x95, 0x66, 0x68, 0x4a, 0x73, 0x3b, 0x00,
+	0xf8, 0xbd, 0x13, 0x38, 0x38, 0x06, 0x03, 0x98, 0x6d, 0xd4, 0xe7, 0xab, 0xde, 0x6f, 0x89, 0x31,
+	0x02, 0x8a, 0xc0, 0x04, 0x26, 0x02, 0x1a, 0x7b, 0x50, 0x5f, 0x04, 0x96, 0xe6, 0x98, 0x60, 0x6e,
+	0xa6, 0x19, 0x12, 0x83, 0x25, 0x85, 0x30, 0xec, 0x28, 0x8b, 0x24, 0x0a, 0xe0, 0x15, 0xdf, 0x17,
+	0x2a, 0x95, 0x7f, 0xbb, 0x04, 0x98, 0xfd, 0x7b, 0x5a, 0x7f, 0xeb, 0x7a, 0x58, 0x7f, 0x87, 0x6b,
+	0x88, 0xd7, 0xd8, 0x2f, 0xc6, 0xb5, 0xb3, 0xa3, 0x61, 0x83, 0x0e, 0xf9, 0x31, 0x0e, 0xd5, 0x11,
+	0xc8, 0x8e, 0xb2, 0x7e, 0xa3, 0x0e, 0x01, 0x8d, 0x17, 0x38, 0x38, 0x06, 0xe9, 0x8e, 0x9b, 0xce,
+	0x08, 0x5b, 0x13, 0x65, 0x02, 0x14, 0x81, 0x36, 0x26, 0x02, 0xbd, 0x39, 0x03, 0x34, 0x98, 0x33,
+	0xc0, 0x8a, 0x82, 0x8b, 0xb3, 0xdc, 0x22, 0xb0, 0x8c, 0x8a, 0xc0, 0x8a, 0x5c, 0x13, 0xd4, 0xc5,
+	0x5b, 0xc0, 0x2e, 0x93, 0x5f, 0x03, 0xb9, 0x36, 0x80, 0x16, 0x27, 0xeb, 0xf9, 0x2f, 0x0f, 0x1b,
+	0x0d, 0x0b, 0x7f, 0x87, 0xf5, 0x77, 0xa1, 0x77, 0xf1, 0x0f, 0x03, 0xdf, 0x01, 0xd4, 0x25, 0xff,
+	0xd6, 0x92, 0x20, 0x38, 0xd1, 0x64, 0x83, 0x10, 0x9b, 0xfc, 0x1d, 0x7e, 0xbc, 0xb3, 0x24, 0x9a,
+	0x1c, 0xfc, 0x1a, 0x20, 0xbe, 0xd9, 0x4c, 0x05, 0xa0, 0x25, 0x96, 0x8a, 0x40, 0x9c, 0x22, 0x02,
+	0x3a, 0xf6, 0xa0, 0xbe, 0x08, 0xcc, 0x57, 0x4e, 0x03, 0x22, 0x73, 0x0a, 0x30, 0xee, 0x44, 0xeb,
+	0x31, 0xd0, 0xb6, 0xfc, 0x3a, 0x64, 0x02, 0xb3, 0xe3, 0xfe, 0x4b, 0xdf, 0xfa, 0xa3, 0xd9, 0x7f,
+	0x5f, 0xa5, 0x04, 0xf7, 0xaf, 0x4c, 0xf5, 0x22, 0xff, 0xa3, 0xeb, 0x32, 0x61, 0x7b, 0xa9, 0x51,
+	0x97, 0xfc, 0xdb, 0x68, 0x1c, 0x6f, 0x71, 0x7a, 0xda, 0xaf, 0x83, 0x0d, 0x86, 0x7f, 0x17, 0x38,
+	0x38, 0x06, 0xf1, 0x1a, 0xb0, 0xd3, 0xdd, 0x15, 0x48, 0x3e, 0x6a, 0x8c, 0x36, 0xc2, 0x1f, 0x11,
+	0x81, 0xa5, 0x4c, 0x04, 0xf2, 0x4c, 0xb0, 0x2a, 0xdf, 0x04, 0xf5, 0xf1, 0x16, 0xe8, 0xd6, 0x49,
+	0xf8, 0x29, 0xfd, 0xe7, 0xec, 0x00, 0x11, 0xc5, 0x0f, 0x69, 0x40, 0x4e, 0xf0, 0x38, 0xf8, 0x3d,
+	0xd6, 0xdf, 0xa5, 0x53, 0xc3, 0x7b, 0xcb, 0xfe, 0xb8, 0x0b, 0xc0, 0x07, 0xf9, 0x83, 0x18, 0xf9,
+	0xa9, 0x40, 0x04, 0xe1, 0x26, 0xa0, 0x4e, 0xd6, 0x72, 0x2d, 0x70, 0x70, 0x0c, 0x76, 0x53, 0x10,
+	0x3b, 0xee, 0xe6, 0x87, 0x9a, 0xbf, 0x68, 0x42, 0x11, 0x50, 0xeb, 0x01, 0x7a, 0xf6, 0x60, 0xbb,
+	0x97, 0x3d, 0xa8, 0x15, 0x81, 0x95, 0xaa, 0x08, 0xcc, 0xce, 0x30, 0x43, 0x94, 0x43, 0x52, 0x3a,
+	0x09, 0x59, 0x91, 0xcb, 0x9f, 0xaf, 0x04, 0xd8, 0x85, 0xc7, 0x3e, 0xd7, 0x29, 0x31, 0xff, 0xd3,
+	0xab, 0xf5, 0xb7, 0xa1, 0x9b, 0xf5, 0xb7, 0xbb, 0xdc, 0xc2, 0xde, 0xfa, 0xf7, 0x8a, 0xcb, 0xa7,
+	0x45, 0x78, 0x93, 0xbf, 0x44, 0x4b, 0xfe, 0x3d, 0x95, 0x66, 0x68, 0xcf, 0x73, 0xb8, 0xe7, 0x2e,
+	0x44, 0x72, 0xad, 0xc0, 0xc1, 0x71, 0xb6, 0x86, 0x83, 0x1c, 0x44, 0xfa, 0xa0, 0x21, 0xca, 0x08,
+	0xfa, 0x22, 0xa0, 0x6f, 0x0f, 0x32, 0x11, 0x58, 0xde, 0x4d, 0x04, 0xf0, 0x5a, 0x90, 0x13, 0x2e,
+	0xb2, 0xe1, 0x22, 0x8c, 0x47, 0x09, 0x21, 0x06, 0x3f, 0x9d, 0x94, 0xbc, 0x51, 0x99, 0x92, 0x74,
+	0x98, 0xa0, 0xcb, 0xfa, 0x1b, 0xe6, 0xc3, 0xfa, 0x33, 0x62, 0xdf, 0x3f, 0x23, 0xbc, 0x57, 0x1c,
+	0x69, 0xb0, 0x6a, 0xc8, 0xbf, 0xb5, 0x07, 0xf9, 0x31, 0x0e, 0xd7, 0x11, 0xa8, 0x48, 0xb0, 0x7d,
+	0xa6, 0x6e, 0x17, 0xde, 0x28, 0x70, 0x70, 0x0c, 0x36, 0x6c, 0x26, 0x9b, 0x99, 0x9d, 0x02, 0x72,
+	0x42, 0x4c, 0x7d, 0x8b, 0x40, 0x32, 0x8a, 0x40, 0x0f, 0x67, 0x20, 0xdd, 0xdb, 0x19, 0x58, 0x9e,
+	0xeb, 0x16, 0x81, 0xd5, 0x54, 0x04, 0xd6, 0x16, 0x98, 0x60, 0x42, 0x8a, 0x05, 0x45, 0xe6, 0x37,
+	0x4f, 0x2b, 0x31, 0x21, 0xf9, 0xfe, 0x7a, 0x1a, 0xaa, 0x8b, 0x18, 0xf9, 0xbb, 0xac, 0xbf, 0xdb,
+	0x17, 0xb1, 0xa9, 0x3f, 0xef, 0xfb, 0xff, 0xe6, 0xe2, 0x20, 0x5d, 0xf2, 0xef, 0x28, 0x33, 0x2a,
+	0x05, 0xc0, 0xd8, 0x60, 0xf9, 0x33, 0x7f, 0x99, 0x01, 0xe0, 0xe0, 0xa7, 0x80, 0xf7, 0x6a, 0x23,
+	0x8d, 0xd0, 0x10, 0x4d, 0x45, 0x00, 0xeb, 0x01, 0x34, 0xbc, 0x7a, 0x04, 0x74, 0xed, 0x41, 0x7d,
+	0x11, 0x58, 0x94, 0x63, 0x86, 0x18, 0x67, 0xd7, 0x95, 0x00, 0x0b, 0x6e, 0x7e, 0x54, 0x0f, 0x59,
+	0xe6, 0x1e, 0xf9, 0x95, 0x3b, 0xe7, 0xc5, 0xff, 0x77, 0x9f, 0xd6, 0xdf, 0xe9, 0x66, 0x07, 0x3c,
+	0xb3, 0x39, 0xa7, 0x57, 0x01, 0xb8, 0x6b, 0x69, 0x72, 0x9f, 0xe4, 0xdf, 0x49, 0xe3, 0xbc, 0xf1,
+	0x2e, 0xec, 0xa8, 0xfc, 0x91, 0xcf, 0x00, 0x70, 0xf8, 0x83, 0xf5, 0xa5, 0xfc, 0x20, 0xa6, 0xba,
+	0x2c, 0x2f, 0xd5, 0x51, 0x11, 0x68, 0xec, 0x26, 0x02, 0x6d, 0x7f, 0xa0, 0x47, 0x00, 0xaf, 0x00,
+	0xab, 0xba, 0x89, 0xc0, 0x3a, 0x1a, 0x05, 0x51, 0xe2, 0xd7, 0xdd, 0xe6, 0x09, 0xae, 0xa4, 0x1f,
+	0xff, 0x9f, 0xfd, 0xa0, 0xf8, 0xf7, 0x26, 0x0d, 0x28, 0x8c, 0x30, 0x77, 0x59, 0x7f, 0x69, 0x5a,
+	0xeb, 0x6f, 0x53, 0xb7, 0xe2, 0xdf, 0x0d, 0x73, 0x62, 0x7d, 0x1e, 0xff, 0xaf, 0x9b, 0x1d, 0xad,
+	0x4f, 0x7e, 0x35, 0xf6, 0xd4, 0xb9, 0x3a, 0xd9, 0xf2, 0x15, 0x81, 0x83, 0xe3, 0x2c, 0x9f, 0x02,
+	0x36, 0xa8, 0xa7, 0x80, 0x37, 0xca, 0xc2, 0x4d, 0x50, 0x1f, 0xe5, 0x16, 0x81, 0xfe, 0xb2, 0x07,
+	0x99, 0x08, 0xa0, 0x00, 0xac, 0x2f, 0x34, 0x41, 0x63, 0x82, 0xf8, 0x73, 0xb8, 0xc3, 0x3d, 0x01,
+	0x87, 0x77, 0x6f, 0xec, 0x4b, 0x38, 0x6b, 0x02, 0x28, 0x49, 0xa9, 0x4a, 0xf6, 0xb7, 0x3b, 0xbe,
+	0x9b, 0x14, 0x3b, 0xbc, 0x17, 0xeb, 0x6f, 0xb4, 0xc6, 0xfa, 0xc3, 0xbe, 0xff, 0xc7, 0x37, 0x64,
+	0xf9, 0x14, 0x80, 0x8b, 0x27, 0x87, 0xea, 0x92, 0x7f, 0x57, 0xb9, 0x11, 0xf6, 0x55, 0x59, 0x60,
+	0x56, 0xae, 0xbb, 0x03, 0x50, 0x26, 0xe4, 0x0a, 0x81, 0x83, 0xe3, 0x6c, 0x02, 0xb3, 0x30, 0xb3,
+	0xc0, 0xe2, 0x1c, 0xe2, 0xcb, 0x78, 0x15, 0x18, 0x08, 0x11, 0x58, 0xd3, 0x4d, 0x04, 0xb0, 0x83,
+	0x30, 0xd4, 0x2e, 0xab, 0x83, 0x30, 0xf2, 0x97, 0x28, 0x02, 0x67, 0x73, 0xe9, 0x47, 0x98, 0xcb,
+	0xf5, 0xc3, 0x99, 0x4e, 0xfd, 0xb1, 0x78, 0x76, 0x6b, 0x2e, 0x1c, 0xae, 0xb7, 0xea, 0x92, 0x1f,
+	0xe3, 0x48, 0x1d, 0x81, 0xc6, 0x14, 0xdb, 0x57, 0xea, 0xb2, 0x95, 0x83, 0x02, 0x07, 0x87, 0x1f,
+	0x2c, 0x0b, 0x99, 0xac, 0x7a, 0xd2, 0xbf, 0x94, 0x85, 0x99, 0x7e, 0xf9, 0xbd, 0x22, 0xe0, 0x6d,
+	0x0f, 0xea, 0xf7, 0x08, 0x30, 0x11, 0xd8, 0x50, 0x64, 0x82, 0xe5, 0xf9, 0x66, 0x48, 0x0c, 0x91,
+	0x7f, 0x62, 0xc3, 0x49, 0xb2, 0x24, 0xb5, 0x9f, 0x85, 0xfb, 0x7f, 0x3b, 0x7e, 0xfc, 0xc4, 0x70,
+	0xe7, 0xcf, 0x7d, 0x59, 0x7f, 0x98, 0xfd, 0x6f, 0x9a, 0xeb, 0xfb, 0xf8, 0x8f, 0x2d, 0xc1, 0x5a,
+	0xf2, 0x1b, 0xbd, 0xc8, 0xbf, 0xbb, 0xdc, 0x04, 0x27, 0x9b, 0x6d, 0x90, 0x1a, 0x46, 0xde, 0x53,
+	0x6b, 0x21, 0xd3, 0x05, 0x0e, 0x0e, 0x3f, 0x69, 0x84, 0x79, 0x56, 0xc9, 0x86, 0x56, 0xf1, 0xcd,
+	0x9a, 0x08, 0x23, 0x60, 0x3d, 0x40, 0xc7, 0x19, 0xd0, 0x19, 0x21, 0xd6, 0xeb, 0x11, 0xd0, 0x8a,
+	0xc0, 0xda, 0x42, 0x13, 0x14, 0x46, 0xcb, 0xdf, 0xb3, 0xba, 0x00, 0xae, 0x2d, 0xc3, 0xcf, 0x65,
+	0xb0, 0xbb, 0xff, 0x72, 0xa3, 0x1d, 0x3f, 0xfb, 0xb2, 0xfe, 0xb6, 0xa8, 0xd6, 0xdf, 0x9e, 0x72,
+	0x0b, 0xbe, 0xf0, 0xe3, 0x53, 0x00, 0xee, 0x5c, 0x92, 0xd4, 0x45, 0xfe, 0xb2, 0xde, 0xc9, 0xbf,
+	0xa7, 0xc2, 0x04, 0xe7, 0xb5, 0x39, 0xc1, 0x65, 0x95, 0xbe, 0xc4, 0x8f, 0xeb, 0x97, 0xab, 0xd6,
+	0x38, 0xf8, 0x8c, 0x40, 0x4e, 0xb0, 0xf9, 0x63, 0x26, 0x02, 0xfd, 0xde, 0x23, 0xc0, 0x44, 0xa0,
+	0xd0, 0x2d, 0x02, 0x1b, 0x8b, 0x4d, 0xd0, 0x94, 0x4c, 0x7e, 0x3c, 0x1b, 0xc5, 0x41, 0xd6, 0x11,
+	0x99, 0x17, 0x65, 0xeb, 0xe8, 0xcb, 0xfa, 0x3b, 0x52, 0x2b, 0x23, 0xd1, 0x7d, 0xc6, 0x8d, 0xf3,
+	0xe2, 0xd8, 0x91, 0xdf, 0x27, 0xf9, 0x31, 0x4e, 0xb6, 0x05, 0x03, 0xfb, 0x5a, 0xfd, 0x6a, 0x7a,
+	0x92, 0x83, 0x03, 0xbb, 0xd2, 0xd4, 0x82, 0xe0, 0x27, 0x95, 0xe1, 0x41, 0xe0, 0x11, 0x81, 0x68,
+	0x8d, 0x08, 0xf4, 0x3e, 0x42, 0x9c, 0xfc, 0xfb, 0xed, 0x41, 0x74, 0x05, 0x30, 0xd6, 0xab, 0x22,
+	0xb0, 0x89, 0x8a, 0xc0, 0xac, 0x6c, 0x65, 0x63, 0x31, 0xa8, 0xdd, 0x71, 0x0f, 0xa2, 0x43, 0x31,
+	0x58, 0x36, 0x68, 0x45, 0xbc, 0xad, 0x53, 0xcf, 0xfa, 0xdb, 0x59, 0x62, 0x82, 0x2b, 0xa6, 0x45,
+	0xe8, 0x0a, 0xc0, 0x85, 0x13, 0x43, 0xfa, 0x24, 0xff, 0xc1, 0x1a, 0x11, 0x36, 0x54, 0x38, 0x98,
+	0x03, 0xf0, 0xac, 0xc0, 0xc1, 0xe1, 0xaf, 0xcd, 0x41, 0x29, 0x4e, 0xf3, 0x5b, 0xd5, 0x54, 0x00,
+	0x6a, 0x69, 0x68, 0xed, 0x41, 0x36, 0x42, 0x7c, 0xe6, 0x3d, 0x02, 0x48, 0xfa, 0xf3, 0x1a, 0x2d,
+	0xb0, 0xb7, 0xc2, 0xac, 0x11, 0x81, 0xa5, 0x05, 0x04, 0x27, 0xe4, 0x58, 0x86, 0x7c, 0x0b, 0x5f,
+	0xe5, 0x19, 0x14, 0x01, 0x88, 0x95, 0x74, 0xad, 0xbf, 0x5d, 0xa5, 0x66, 0x36, 0xf7, 0xef, 0x33,
+	0x8e, 0x36, 0xc8, 0xba, 0xe4, 0xdf, 0x5b, 0x69, 0x82, 0x63, 0xf5, 0x04, 0x26, 0x66, 0x58, 0xbf,
+	0xf0, 0xfb, 0x35, 0xe0, 0x1c, 0xfc, 0x01, 0x11, 0x2b, 0x21, 0xdf, 0x97, 0x86, 0x19, 0x81, 0x89,
+	0x40, 0xfd, 0xff, 0xa3, 0x47, 0xa0, 0xbd, 0x87, 0x08, 0x2c, 0xcc, 0xf0, 0x76, 0x06, 0xf6, 0x50,
+	0xf2, 0x5f, 0xd2, 0x62, 0x81, 0x53, 0xf5, 0x66, 0xd8, 0x84, 0x57, 0x01, 0x55, 0x04, 0x56, 0x17,
+	0x49, 0x10, 0xe5, 0xf4, 0x88, 0xc0, 0x57, 0xf8, 0x5e, 0xde, 0x40, 0x0b, 0x40, 0x79, 0xb4, 0xb9,
+	0xcb, 0xfa, 0xcb, 0xf6, 0xb6, 0xfe, 0x76, 0x97, 0x59, 0x70, 0xc9, 0x87, 0x4f, 0xf2, 0xe3, 0x3a,
+	0xf0, 0x9d, 0xe5, 0x26, 0x5d, 0xf2, 0xef, 0xa3, 0x71, 0xaa, 0xd9, 0x8e, 0x05, 0xc0, 0x4f, 0xfc,
+	0x76, 0x07, 0x00, 0x07, 0x87, 0xdd, 0x62, 0x91, 0xf1, 0x08, 0x8e, 0x3f, 0xa4, 0xd1, 0x36, 0xcb,
+	0x2b, 0x78, 0x15, 0x40, 0x11, 0x18, 0x08, 0x7b, 0xf0, 0x44, 0xad, 0x5b, 0x04, 0xce, 0x6f, 0xb4,
+	0xd0, 0x0a, 0x7a, 0x97, 0x08, 0x2c, 0xcd, 0x97, 0xa0, 0x38, 0xce, 0xa6, 0x1c, 0x95, 0x6d, 0x12,
+	0x79, 0x91, 0x10, 0x52, 0x33, 0x40, 0x62, 0x77, 0xbb, 0xb2, 0xfd, 0x27, 0xce, 0xe4, 0xd3, 0xfa,
+	0xdb, 0x59, 0x6a, 0xa6, 0x27, 0x15, 0x09, 0x1e, 0x5f, 0x9f, 0xa9, 0xe7, 0x00, 0x78, 0x91, 0x9f,
+	0x11, 0x9f, 0x91, 0x7f, 0x7f, 0x95, 0x19, 0x76, 0xd7, 0x3a, 0x70, 0x6f, 0xc2, 0xcf, 0x32, 0x5a,
+	0x9f, 0xb2, 0x6c, 0x11, 0x38, 0x38, 0xfc, 0x11, 0xb2, 0x28, 0x16, 0xb3, 0x42, 0x55, 0x5e, 0xb0,
+	0xf1, 0x4b, 0x56, 0x0f, 0xe8, 0x6f, 0x11, 0xc0, 0x62, 0xe0, 0x85, 0xcd, 0x16, 0x45, 0x04, 0x2e,
+	0x68, 0xb2, 0xc0, 0xf6, 0x4a, 0x49, 0x29, 0x0a, 0x6e, 0xa6, 0xb1, 0xbd, 0x5c, 0x82, 0xcc, 0x48,
+	0x2b, 0xbb, 0x2f, 0x7f, 0x47, 0x08, 0x49, 0x1e, 0xa8, 0x97, 0x7f, 0xaa, 0xa3, 0x83, 0x7c, 0x58,
+	0x7f, 0x98, 0xfd, 0xcd, 0x70, 0xa0, 0x9a, 0xe8, 0x1d, 0xff, 0xd1, 0x1d, 0xe8, 0x93, 0xfc, 0x18,
+	0x1b, 0x2b, 0x9d, 0xec, 0x64, 0xf3, 0xa6, 0xc0, 0xc1, 0xe1, 0xaf, 0x08, 0x0b, 0x0b, 0xfb, 0x1b,
+	0xbc, 0xa3, 0xaa, 0xab, 0xc3, 0x5e, 0x2e, 0x0b, 0x0d, 0x82, 0xaa, 0x1e, 0x22, 0xd0, 0xa4, 0x11,
+	0x01, 0xbd, 0x11, 0x62, 0xfd, 0x1e, 0x81, 0xbd, 0xea, 0x55, 0xe0, 0x96, 0xa5, 0x69, 0xf0, 0xce,
+	0x9d, 0x7b, 0xe0, 0x58, 0x4b, 0x88, 0x47, 0x04, 0xd6, 0x15, 0x4b, 0x50, 0x93, 0x64, 0xeb, 0x70,
+	0xf7, 0x0a, 0x48, 0xef, 0xf4, 0xf7, 0xb1, 0x99, 0x9d, 0x74, 0x5a, 0xe2, 0xc6, 0xf5, 0x6a, 0xfd,
+	0x61, 0xf1, 0x0f, 0xed, 0xbf, 0x0b, 0xc6, 0xfb, 0x6e, 0x00, 0x62, 0x3b, 0x00, 0x76, 0x95, 0x9b,
+	0x74, 0xc9, 0x7f, 0xb8, 0x56, 0x84, 0xa6, 0x54, 0x1b, 0x9b, 0x85, 0x58, 0x2f, 0x70, 0x70, 0xf8,
+	0x33, 0x70, 0x74, 0x97, 0xcd, 0x09, 0x24, 0x3b, 0x2c, 0x6f, 0x54, 0x84, 0x31, 0x11, 0xe8, 0xdf,
+	0x1e, 0x81, 0xd5, 0x79, 0x26, 0x38, 0x51, 0xe7, 0x16, 0x81, 0xf7, 0xa8, 0x00, 0x7c, 0xfa, 0xf8,
+	0x69, 0xb8, 0xa8, 0x3d, 0xd1, 0x23, 0x02, 0xbb, 0x2a, 0x24, 0x28, 0x8d, 0xb7, 0x79, 0x56, 0x91,
+	0xe3, 0xf4, 0x5c, 0x7f, 0x9f, 0x00, 0x9a, 0xe3, 0xc6, 0xf5, 0xb0, 0xfe, 0x82, 0x58, 0xf1, 0x8f,
+	0x0a, 0x94, 0xd8, 0x97, 0x03, 0x80, 0x0d, 0x42, 0xba, 0xe4, 0x3f, 0x50, 0x6d, 0x86, 0xe3, 0x0d,
+	0x32, 0x64, 0x45, 0xc8, 0xca, 0xd7, 0x11, 0x10, 0x6f, 0x2e, 0x72, 0x70, 0xe0, 0x2b, 0x40, 0x6a,
+	0x41, 0xf0, 0xbb, 0x92, 0x10, 0x23, 0x9c, 0x89, 0x08, 0xe8, 0xaf, 0x19, 0x47, 0x11, 0x70, 0xdf,
+	0xfb, 0x51, 0x00, 0x6e, 0x5c, 0x90, 0x00, 0xdf, 0xbe, 0x74, 0x05, 0x7c, 0xf5, 0xdc, 0xc5, 0x70,
+	0xdd, 0xca, 0x42, 0xe5, 0xbf, 0x6f, 0xe9, 0x45, 0x04, 0xb0, 0x85, 0xb7, 0x3f, 0x05, 0xa0, 0x25,
+	0xce, 0xd0, 0x9b, 0xf5, 0x87, 0xc5, 0x3f, 0x5c, 0xfd, 0xd5, 0xa7, 0x03, 0x70, 0xd5, 0x8c, 0x48,
+	0x5d, 0xf2, 0x1f, 0xa4, 0x71, 0xa4, 0xc1, 0x0e, 0x76, 0xf5, 0x4d, 0x05, 0x66, 0x71, 0x72, 0x70,
+	0x04, 0xcc, 0x1b, 0x79, 0xa1, 0xb2, 0xf8, 0x66, 0x79, 0x68, 0x10, 0x78, 0x8a, 0x82, 0x4c, 0x04,
+	0x34, 0xf6, 0xe0, 0x99, 0xad, 0x19, 0x5f, 0x96, 0x6b, 0x82, 0xa3, 0x35, 0xee, 0x53, 0xc0, 0x93,
+	0x27, 0xa6, 0xc1, 0x77, 0xaf, 0x5c, 0x05, 0x9f, 0x3f, 0x71, 0x2e, 0xdc, 0xb5, 0xab, 0x09, 0xb6,
+	0x50, 0x22, 0x62, 0xa0, 0x08, 0x94, 0xc5, 0xdb, 0x80, 0xbd, 0xa5, 0x8f, 0xee, 0x40, 0xbf, 0x09,
+	0x40, 0xbc, 0xa1, 0xa7, 0xf5, 0xc7, 0xb2, 0x3f, 0x25, 0x31, 0x61, 0xaf, 0xfe, 0xfa, 0x8c, 0x4b,
+	0x26, 0x87, 0xea, 0x92, 0xff, 0x50, 0x8d, 0x05, 0x36, 0x56, 0x38, 0x20, 0xe0, 0xfc, 0x7f, 0x0e,
+	0x0e, 0x7c, 0x02, 0x8c, 0xf5, 0x06, 0xa4, 0x39, 0x4c, 0x6f, 0x33, 0x11, 0xd0, 0xe9, 0x11, 0x38,
+	0x93, 0x11, 0x62, 0x4a, 0x72, 0x33, 0x5c, 0x4c, 0x05, 0xe0, 0xd2, 0x36, 0x09, 0xaf, 0x02, 0x28,
+	0x02, 0x4a, 0xdc, 0xb3, 0xa7, 0x05, 0xb6, 0x95, 0xba, 0x45, 0x60, 0x6f, 0x35, 0xe9, 0x57, 0x11,
+	0x60, 0x02, 0xd0, 0x1a, 0x6f, 0xf0, 0x58, 0x7f, 0xdb, 0xdc, 0xd6, 0x1f, 0xcb, 0xfe, 0x94, 0xc0,
+	0x04, 0xe7, 0xfc, 0x75, 0x05, 0xe0, 0x82, 0x09, 0x2e, 0x5d, 0xf2, 0x63, 0xb4, 0xe7, 0xda, 0x21,
+	0x20, 0xfd, 0x7f, 0x0e, 0x0e, 0xd6, 0x33, 0x6f, 0x93, 0xa4, 0x1f, 0x0a, 0x83, 0x8d, 0xc0, 0x44,
+	0x40, 0xa7, 0x47, 0xe0, 0x8c, 0xd6, 0x8c, 0x1f, 0x51, 0x4f, 0x01, 0xd7, 0xcd, 0x89, 0x51, 0xae,
+	0x01, 0x4c, 0x04, 0xee, 0xa3, 0x22, 0xb0, 0xb9, 0xd8, 0x2d, 0x02, 0x07, 0xeb, 0xac, 0xdd, 0x45,
+	0xe0, 0xd3, 0x3f, 0xd2, 0x2c, 0x24, 0x13, 0x72, 0xab, 0x5b, 0x00, 0x82, 0xbc, 0xac, 0xbf, 0x3d,
+	0xe5, 0x34, 0xfb, 0x57, 0x4a, 0x94, 0xbc, 0xb2, 0xee, 0x0c, 0x00, 0xc6, 0xb1, 0x06, 0x59, 0x97,
+	0xfc, 0x47, 0xea, 0x44, 0x28, 0x8d, 0xb3, 0xb2, 0x56, 0xe7, 0x76, 0x81, 0x83, 0x23, 0xd0, 0xae,
+	0x02, 0xac, 0x62, 0x1e, 0x62, 0x15, 0xdf, 0x45, 0x57, 0x00, 0xeb, 0x01, 0xfd, 0xdd, 0x23, 0xb0,
+	0xa1, 0xd0, 0x84, 0x3d, 0x01, 0x8a, 0x08, 0x3c, 0xb8, 0xab, 0x4e, 0x21, 0x3f, 0x8b, 0x9b, 0xd7,
+	0x97, 0xa3, 0x08, 0x28, 0xfd, 0x02, 0x47, 0x1a, 0x6c, 0x28, 0x02, 0x6c, 0xad, 0xf6, 0x87, 0xbe,
+	0xd6, 0x8f, 0xe3, 0x5d, 0x1b, 0x5f, 0xfa, 0x65, 0x81, 0xf6, 0x26, 0xf6, 0xdf, 0xf7, 0x6c, 0x04,
+	0x6a, 0x4b, 0x30, 0x7a, 0x59, 0x7f, 0x78, 0xfc, 0x3f, 0x50, 0x45, 0x68, 0xf5, 0xde, 0xda, 0x97,
+	0x00, 0x50, 0xc2, 0x5b, 0x18, 0xf1, 0xbd, 0xc8, 0x7f, 0xb8, 0xd6, 0x02, 0xc7, 0xeb, 0x25, 0x88,
+	0x76, 0xba, 0x6d, 0x55, 0x76, 0x6a, 0xe1, 0xe0, 0x08, 0x28, 0x60, 0xa6, 0x65, 0xae, 0x40, 0x8a,
+	0xc3, 0xfc, 0x2d, 0x13, 0x81, 0xfe, 0xee, 0x11, 0xd8, 0xa7, 0xda, 0x82, 0x97, 0x4d, 0x90, 0xe1,
+	0xc5, 0x4b, 0x97, 0x78, 0x04, 0xe0, 0x93, 0x87, 0x8f, 0xc3, 0x75, 0xab, 0x8a, 0x3d, 0x22, 0x70,
+	0xb4, 0xd1, 0x01, 0x99, 0x11, 0x56, 0xb7, 0x08, 0x10, 0x72, 0x61, 0xcf, 0x3d, 0x7f, 0x48, 0x6e,
+	0x76, 0x75, 0xd1, 0x84, 0x48, 0x5e, 0x65, 0x45, 0x44, 0x26, 0x00, 0x75, 0x71, 0x26, 0x2f, 0xeb,
+	0x6f, 0xbf, 0x72, 0xfc, 0x97, 0x69, 0xf6, 0xb6, 0x61, 0xa7, 0x9f, 0x2f, 0xf2, 0xe3, 0x33, 0xe0,
+	0xba, 0xe4, 0x3f, 0x42, 0x63, 0x7f, 0x6d, 0xd7, 0xc7, 0x67, 0x83, 0x4e, 0x1c, 0x1c, 0x01, 0x07,
+	0x2b, 0x21, 0xf3, 0xd8, 0x2a, 0xab, 0x7c, 0x97, 0x11, 0x50, 0x04, 0x74, 0x9c, 0x81, 0x33, 0x5a,
+	0x33, 0x8e, 0xd6, 0x20, 0x36, 0x05, 0xa1, 0x08, 0x5c, 0x39, 0xc5, 0x09, 0x9f, 0x51, 0x5b, 0x90,
+	0x89, 0xc0, 0xe7, 0x4f, 0x9e, 0x0b, 0x87, 0x5b, 0x82, 0x15, 0x11, 0xd8, 0x56, 0x6a, 0x86, 0x13,
+	0x2d, 0x2e, 0x88, 0x71, 0xa9, 0xdb, 0x85, 0xba, 0x35, 0x0a, 0xb1, 0xe7, 0xbd, 0xf5, 0x43, 0x3e,
+	0xc8, 0x7a, 0x1d, 0x6a, 0x62, 0xcd, 0xee, 0xec, 0xcf, 0x8a, 0x7f, 0xdd, 0xb2, 0xff, 0xb1, 0x06,
+	0x3b, 0x3c, 0xbb, 0x25, 0xd7, 0xb7, 0x00, 0x6c, 0xca, 0xd1, 0x25, 0x3f, 0xc6, 0x92, 0x7c, 0x69,
+	0xc8, 0x15, 0x00, 0x39, 0xf8, 0xc4, 0xe0, 0x67, 0xc5, 0x21, 0x41, 0x58, 0x0f, 0xe8, 0x77, 0x7b,
+	0x70, 0x5f, 0xa5, 0xfb, 0x14, 0x80, 0xf1, 0xc8, 0x81, 0x56, 0xcd, 0x55, 0xe0, 0x99, 0x0b, 0x17,
+	0xc1, 0xe6, 0x12, 0xd6, 0x23, 0x20, 0xc2, 0xa6, 0x4a, 0x57, 0x27, 0x5b, 0x2f, 0xa6, 0xae, 0xf9,
+	0xca, 0xf6, 0x64, 0x5b, 0x42, 0x20, 0xc5, 0x65, 0x86, 0x82, 0x08, 0x0b, 0x94, 0xc5, 0x3b, 0xa0,
+	0x22, 0x2d, 0x12, 0x22, 0x5c, 0x0e, 0x8f, 0x08, 0xb0, 0x13, 0x42, 0x6d, 0x9c, 0xc5, 0xcb, 0xfa,
+	0x63, 0xd9, 0xff, 0x78, 0x83, 0x1d, 0x89, 0xae, 0x17, 0xba, 0xe4, 0x3f, 0x5a, 0x67, 0x81, 0x89,
+	0x69, 0x6e, 0x01, 0xc0, 0x13, 0x87, 0xc0, 0xc1, 0x11, 0xc8, 0xc0, 0x67, 0xac, 0xd8, 0x22, 0xcd,
+	0x70, 0xab, 0xf4, 0x61, 0xa9, 0x8e, 0x08, 0x9c, 0xe9, 0x9a, 0xf1, 0x55, 0xb9, 0x46, 0x8f, 0x00,
+	0x5c, 0x35, 0x2d, 0x04, 0xde, 0xba, 0x65, 0x2b, 0x13, 0x00, 0xa5, 0x38, 0x78, 0xd5, 0x0a, 0xb5,
+	0x47, 0x80, 0x12, 0xf6, 0x40, 0x0d, 0x81, 0xe4, 0x30, 0x77, 0x83, 0x0d, 0x5e, 0x53, 0xd8, 0x8c,
+	0xbf, 0x95, 0x90, 0x5f, 0x6b, 0xa2, 0xc6, 0xd1, 0x8f, 0x3f, 0x56, 0x13, 0x93, 0xd2, 0x6d, 0x50,
+	0x9e, 0x16, 0xa3, 0x39, 0x0d, 0xd4, 0x26, 0x90, 0xce, 0x9e, 0xd6, 0x1f, 0x16, 0xff, 0x8e, 0x52,
+	0x01, 0x38, 0xa7, 0xd5, 0xa5, 0x47, 0x7e, 0x7c, 0x1a, 0x5c, 0x97, 0xfc, 0xc7, 0xea, 0x45, 0x28,
+	0x89, 0x91, 0xd8, 0xc2, 0x93, 0x79, 0x02, 0x07, 0xc7, 0x50, 0xb0, 0x06, 0x59, 0x3d, 0x20, 0xc9,
+	0x6e, 0xfe, 0xa9, 0x0c, 0x45, 0xe0, 0x0c, 0x7a, 0x04, 0xf4, 0xec, 0x41, 0xd6, 0x17, 0x80, 0xf1,
+	0xc0, 0xae, 0x5a, 0xcd, 0x29, 0xe0, 0xc5, 0x2b, 0x56, 0xc1, 0x16, 0x4a, 0x56, 0x26, 0x02, 0xed,
+	0x39, 0xb6, 0x5f, 0xd9, 0x46, 0x21, 0x59, 0x92, 0xef, 0xc5, 0x7f, 0x8e, 0xb2, 0x8b, 0x5f, 0x30,
+	0xd2, 0xf7, 0x8c, 0x09, 0xc9, 0x16, 0x28, 0x4f, 0xef, 0x12, 0x81, 0x9a, 0x64, 0xc7, 0x8f, 0x5a,
+	0xeb, 0x4f, 0x3d, 0xfe, 0xd7, 0xdb, 0xe1, 0xbc, 0xb6, 0x10, 0x7d, 0x01, 0xd8, 0x98, 0xed, 0x45,
+	0x7e, 0x24, 0x3e, 0x23, 0xff, 0x71, 0x1a, 0x49, 0x21, 0xee, 0x8f, 0xc3, 0x6a, 0x0f, 0x1c, 0x1c,
+	0x01, 0x0f, 0xec, 0xcb, 0x57, 0x09, 0xf4, 0x5b, 0x96, 0xd3, 0x04, 0x3e, 0x44, 0xe0, 0x8c, 0xd7,
+	0x8c, 0x6f, 0x2c, 0x74, 0x77, 0x07, 0xb2, 0x78, 0xfb, 0xb6, 0xed, 0x1a, 0x11, 0xb8, 0x62, 0x49,
+	0x9e, 0xba, 0x47, 0x80, 0x06, 0x25, 0x6f, 0xb0, 0x95, 0x74, 0xda, 0x65, 0xf9, 0x7b, 0x76, 0xac,
+	0xcf, 0x0c, 0x36, 0x75, 0x20, 0xd9, 0x7d, 0xc5, 0xb4, 0xec, 0x60, 0x48, 0x8a, 0x0c, 0x51, 0x88,
+	0x59, 0x1c, 0x63, 0x85, 0x5d, 0x3d, 0xac, 0xbf, 0xa3, 0xca, 0xf1, 0xdf, 0x01, 0xe7, 0xf5, 0x31,
+	0x07, 0xf0, 0xe4, 0xc6, 0x2c, 0x5d, 0xf2, 0x63, 0x38, 0x64, 0x8f, 0x00, 0x18, 0x04, 0x0e, 0x8e,
+	0xa1, 0xf6, 0xb0, 0x88, 0x8d, 0x90, 0xef, 0xf3, 0x5c, 0x46, 0x26, 0x02, 0xfd, 0x62, 0x0f, 0xe2,
+	0x29, 0xe0, 0xa4, 0x7b, 0x46, 0x80, 0x0d, 0x0b, 0x69, 0x04, 0xe0, 0xea, 0x55, 0xa5, 0xca, 0x32,
+	0x11, 0x36, 0x42, 0x9c, 0x1f, 0xed, 0x5e, 0xb4, 0xc9, 0xa2, 0x2c, 0xc2, 0x80, 0x44, 0xd7, 0x8d,
+	0xd2, 0x48, 0xa3, 0xf2, 0x6b, 0xab, 0x62, 0x45, 0xd8, 0xd5, 0xc3, 0xfa, 0xc3, 0xec, 0x7f, 0xb2,
+	0xc9, 0x09, 0x17, 0xf4, 0x2d, 0x00, 0xba, 0xe4, 0xdf, 0x56, 0x21, 0x02, 0xdb, 0xaf, 0x20, 0x70,
+	0x70, 0x0c, 0xc1, 0x65, 0xa2, 0x77, 0xaa, 0x45, 0xc1, 0x6f, 0xb1, 0x49, 0xa8, 0x3f, 0xed, 0xc1,
+	0xe5, 0x39, 0x46, 0xb8, 0x48, 0x1d, 0x17, 0xc6, 0x78, 0xfd, 0xba, 0xf5, 0x0a, 0xf9, 0xdf, 0xbc,
+	0x65, 0x3b, 0x25, 0xbf, 0x45, 0x59, 0x2e, 0xca, 0x44, 0x60, 0x4e, 0x96, 0x59, 0x71, 0x03, 0x58,
+	0x34, 0x44, 0x7b, 0xdf, 0xff, 0xdb, 0xe2, 0xc6, 0xd2, 0x53, 0xc6, 0x38, 0x58, 0x91, 0x63, 0xa0,
+	0xbf, 0xcf, 0xa0, 0xec, 0xf0, 0x5b, 0x9c, 0x8b, 0x05, 0x45, 0xf7, 0x26, 0x1f, 0x36, 0xce, 0xbb,
+	0xb7, 0x12, 0x1b, 0x7a, 0x44, 0x38, 0x54, 0x4b, 0x28, 0x99, 0x6d, 0xf0, 0x8c, 0x8e, 0x0b, 0x80,
+	0xe1, 0x8b, 0xfc, 0x27, 0x1a, 0x44, 0x58, 0x52, 0xe0, 0xb9, 0xff, 0x3f, 0x21, 0x70, 0x70, 0x0c,
+	0xc5, 0xa2, 0xa0, 0x55, 0x22, 0x2f, 0x2a, 0x4d, 0x42, 0x44, 0xfc, 0xa1, 0x24, 0x24, 0xc8, 0xcb,
+	0x1e, 0xfc, 0x23, 0x6b, 0xc6, 0x97, 0x51, 0x11, 0x38, 0x58, 0xe5, 0x6e, 0x13, 0xbe, 0xb0, 0xc9,
+	0x02, 0x27, 0x5a, 0x43, 0x60, 0x55, 0xbe, 0xf7, 0x86, 0x61, 0x9c, 0x1e, 0x0c, 0xb7, 0x4b, 0xca,
+	0x9a, 0xf1, 0x60, 0xab, 0xd4, 0xc9, 0x48, 0x3f, 0x9e, 0x92, 0x7e, 0x4e, 0xda, 0x38, 0x58, 0x9d,
+	0x67, 0x80, 0x2d, 0xbe, 0x5e, 0xeb, 0xd1, 0xd9, 0xe2, 0x83, 0x71, 0xb0, 0x86, 0x7e, 0xec, 0x49,
+	0x2e, 0x3a, 0x13, 0x10, 0x8f, 0x19, 0xdf, 0x4b, 0x00, 0x7c, 0x91, 0xff, 0x64, 0xa3, 0x04, 0x93,
+	0xd3, 0xff, 0x04, 0x0e, 0x00, 0x07, 0xdf, 0x25, 0xc8, 0x1e, 0x17, 0x89, 0xb2, 0x59, 0x7e, 0xf0,
+	0x72, 0x06, 0x06, 0x69, 0xcd, 0x78, 0x79, 0xac, 0xfb, 0xb8, 0x9d, 0xe0, 0x30, 0xd3, 0xfa, 0xc2,
+	0x58, 0x58, 0x9a, 0x35, 0x0e, 0x36, 0xf7, 0xf1, 0x54, 0xd7, 0x2e, 0x7d, 0xf2, 0xf7, 0xda, 0xe4,
+	0x73, 0xe1, 0x44, 0x27, 0xdc, 0xba, 0x20, 0x16, 0x1d, 0x00, 0x14, 0x00, 0x9f, 0xe4, 0xc7, 0x28,
+	0x8d, 0xf5, 0xbc, 0x87, 0xb8, 0x48, 0xe0, 0xe0, 0x18, 0xaa, 0xc0, 0x16, 0x57, 0x1c, 0xd0, 0xa1,
+	0x01, 0x31, 0x36, 0xcb, 0x2f, 0x5e, 0x22, 0x30, 0x08, 0x6b, 0xc6, 0xa7, 0xa7, 0x9b, 0x21, 0xdc,
+	0x26, 0xc1, 0xb4, 0x54, 0x23, 0x7b, 0xa4, 0xb3, 0x5f, 0xc8, 0x7f, 0x50, 0x0d, 0x56, 0xec, 0x63,
+	0x77, 0xfe, 0xe3, 0x94, 0xe8, 0xd7, 0xce, 0x0a, 0xf7, 0x49, 0xfe, 0x53, 0x34, 0x52, 0x42, 0x09,
+	0xfc, 0x29, 0x5e, 0x01, 0xe6, 0xe0, 0x40, 0x9b, 0x8b, 0x55, 0xe1, 0x13, 0xec, 0x96, 0x6f, 0x34,
+	0x22, 0x30, 0x60, 0x6b, 0xc6, 0xd9, 0xdb, 0x83, 0x38, 0x4b, 0x10, 0x84, 0xc4, 0xd7, 0x21, 0xbf,
+	0xb1, 0xbf, 0xc8, 0xcf, 0x8e, 0xfd, 0xba, 0xe4, 0x3f, 0xdd, 0x24, 0x81, 0xcb, 0xaa, 0x36, 0x25,
+	0x59, 0x2c, 0xff, 0xc7, 0xde, 0x59, 0x80, 0xb5, 0xb1, 0x74, 0x7d, 0x7c, 0x3f, 0x77, 0x77, 0x2f,
+	0xb5, 0x6c, 0x08, 0x04, 0xa8, 0xbb, 0x19, 0x5a, 0x77, 0xa5, 0xd4, 0xdd, 0xdd, 0x5d, 0xa0, 0x4a,
+	0xdd, 0xcd, 0xb0, 0xb6, 0x50, 0xc5, 0xdd, 0xdd, 0xdd, 0xda, 0x52, 0x77, 0x2f, 0xf6, 0x9e, 0x6f,
+	0xcf, 0x24, 0x9b, 0xb0, 0x77, 0x43, 0xba, 0x40, 0x5e, 0x63, 0xe7, 0xff, 0x3c, 0xbf, 0xab, 0xb1,
+	0x7b, 0x9f, 0xfd, 0x9d, 0x99, 0xd9, 0x1d, 0xb1, 0x66, 0x68, 0x68, 0x9a, 0x7b, 0xb0, 0xa5, 0xe3,
+	0x6f, 0xc4, 0xf5, 0xb5, 0x68, 0x55, 0x2b, 0x7e, 0x3c, 0x68, 0xfa, 0x6d, 0xc6, 0xb7, 0x39, 0xb5,
+	0x84, 0x3d, 0x28, 0xbe, 0x11, 0xf9, 0x51, 0x7c, 0xd3, 0xcb, 0xcf, 0x8b, 0x6f, 0x50, 0x7e, 0x5c,
+	0x03, 0x20, 0xbf, 0x43, 0x40, 0x68, 0x68, 0xf8, 0x33, 0xf7, 0x38, 0x6a, 0xfa, 0x5b, 0xb6, 0xae,
+	0x12, 0x15, 0x01, 0x13, 0x6d, 0x33, 0x8e, 0x43, 0x81, 0xed, 0x4e, 0x66, 0x26, 0x93, 0xdf, 0x6b,
+	0x8d, 0x2d, 0x44, 0x9d, 0x5f, 0x02, 0xd1, 0x17, 0x97, 0xe9, 0xb9, 0xb0, 0x14, 0x22, 0x4e, 0xcc,
+	0x81, 0x87, 0x3b, 0x47, 0x81, 0xef, 0x3a, 0x3b, 0xf0, 0x58, 0xd8, 0xb5, 0x5e, 0xf9, 0x2f, 0xd6,
+	0x91, 0xff, 0xf2, 0x54, 0x16, 0xb6, 0x0d, 0xd7, 0xc8, 0xaf, 0x36, 0x67, 0xdf, 0x31, 0x34, 0x34,
+	0xf2, 0x2a, 0x02, 0xca, 0x8d, 0xda, 0x3d, 0x04, 0xde, 0xf7, 0xb1, 0x6c, 0x5d, 0x61, 0xea, 0x25,
+	0xc4, 0x9b, 0xec, 0xcd, 0x60, 0xe7, 0xe0, 0x16, 0x26, 0x93, 0x9f, 0x5f, 0xcb, 0x7f, 0x75, 0x41,
+	0x77, 0x88, 0xbf, 0xb2, 0x12, 0xf2, 0x43, 0xdd, 0x21, 0x2b, 0xf8, 0x30, 0xbc, 0xcf, 0xf1, 0x16,
+	0xcc, 0x3f, 0x40, 0x5e, 0xc4, 0x9f, 0x83, 0xf8, 0x33, 0xf3, 0xe1, 0x92, 0x8b, 0x79, 0xbd, 0xf2,
+	0x23, 0x73, 0x06, 0x6a, 0x0a, 0x40, 0x57, 0xb5, 0x32, 0x98, 0xa1, 0xa1, 0x91, 0x5b, 0xf8, 0x79,
+	0xf9, 0x1c, 0x35, 0x83, 0xd4, 0xad, 0xb2, 0x4d, 0x31, 0x47, 0x60, 0x25, 0x57, 0x00, 0x36, 0x3b,
+	0x98, 0xc1, 0xee, 0x21, 0x86, 0xe5, 0xdf, 0xd7, 0x68, 0xf9, 0xc5, 0xdd, 0x7e, 0xaf, 0x65, 0xbd,
+	0x21, 0xf5, 0xea, 0x4a, 0x78, 0x97, 0x79, 0x03, 0xc5, 0x17, 0xf1, 0x32, 0xf1, 0x02, 0x78, 0x2f,
+	0xee, 0x66, 0x50, 0xfe, 0x2b, 0x1c, 0xce, 0x7d, 0x34, 0x05, 0xa0, 0x83, 0xa5, 0xd2, 0x97, 0xa1,
+	0xa1, 0x91, 0x73, 0x11, 0xc0, 0x99, 0x70, 0xb6, 0x56, 0x2d, 0x3f, 0x34, 0x60, 0x8e, 0x80, 0xf8,
+	0xc9, 0x00, 0x57, 0x00, 0xb6, 0x39, 0xb6, 0x10, 0xca, 0x3f, 0xcc, 0xd4, 0xf2, 0x8b, 0xc7, 0xfc,
+	0xe7, 0x9d, 0x95, 0x10, 0xb8, 0x7b, 0x34, 0x94, 0x06, 0xee, 0x17, 0x15, 0x81, 0x8a, 0xa8, 0xe3,
+	0x70, 0x65, 0x9a, 0x4a, 0x24, 0xff, 0x55, 0x17, 0x16, 0x36, 0x0d, 0x63, 0x41, 0x7b, 0xfc, 0xf9,
+	0x47, 0x9c, 0x2f, 0xc1, 0xd0, 0xd0, 0xc8, 0x74, 0x38, 0x70, 0x45, 0x2b, 0xc2, 0x0f, 0x6e, 0xca,
+	0x70, 0x6d, 0x63, 0x1e, 0x0f, 0x2e, 0xed, 0x67, 0x06, 0x5b, 0x1c, 0xcc, 0x9a, 0x28, 0x3f, 0x8a,
+	0xdf, 0x30, 0xf9, 0xf9, 0xf1, 0x3e, 0x3f, 0xe6, 0xf7, 0x5a, 0xdc, 0x15, 0x22, 0xdd, 0xa7, 0x42,
+	0x96, 0xe7, 0x3a, 0x28, 0x0b, 0x3a, 0x00, 0x69, 0x57, 0x57, 0xc0, 0x65, 0x17, 0xa5, 0x48, 0xfe,
+	0xab, 0xd3, 0x58, 0xb8, 0xc6, 0xd1, 0xa7, 0x9d, 0x6e, 0x1e, 0xc0, 0x16, 0x86, 0x86, 0x46, 0xae,
+	0x53, 0x86, 0x39, 0xf9, 0xbd, 0x51, 0x04, 0x0b, 0x85, 0xe2, 0x1b, 0x6e, 0x26, 0x22, 0xbd, 0x08,
+	0x90, 0x02, 0xc0, 0xc9, 0xdf, 0xe2, 0xd7, 0x2f, 0xbf, 0xe1, 0xe5, 0xbc, 0x12, 0x6e, 0xf8, 0x09,
+	0xe5, 0x47, 0xf1, 0x91, 0xeb, 0xd3, 0x94, 0xb0, 0x65, 0x98, 0x52, 0xdb, 0x0b, 0x50, 0xbe, 0xa7,
+	0xbd, 0x00, 0x1a, 0x59, 0x17, 0x01, 0x7e, 0xa9, 0xae, 0x9a, 0x65, 0xab, 0x87, 0x4b, 0x5c, 0x42,
+	0x8c, 0x05, 0x80, 0xc8, 0x3f, 0x54, 0x2f, 0xbf, 0xab, 0x64, 0xf9, 0x5b, 0xfd, 0x56, 0xe5, 0xbf,
+	0x31, 0x5d, 0x43, 0x5f, 0xda, 0x0b, 0xa0, 0xa1, 0x21, 0x73, 0x04, 0x3a, 0x70, 0x22, 0x14, 0x70,
+	0x40, 0x2f, 0x8b, 0xd6, 0x3f, 0x5d, 0x42, 0x8c, 0x05, 0x60, 0x93, 0x7d, 0xe3, 0xe4, 0x3f, 0xfc,
+	0xeb, 0x94, 0xdf, 0x59, 0xba, 0xfc, 0x1e, 0x33, 0x94, 0xb0, 0xca, 0x89, 0xef, 0x05, 0xb0, 0xe9,
+	0x64, 0x17, 0x63, 0x1a, 0x1a, 0x19, 0xdf, 0x14, 0xdc, 0xa0, 0x1d, 0x0a, 0xd4, 0x0c, 0xb1, 0x36,
+	0x83, 0xfa, 0xe6, 0x08, 0x60, 0xf7, 0x7f, 0x9d, 0xad, 0xd9, 0xaf, 0x53, 0x7e, 0x14, 0xbf, 0x49,
+	0xf2, 0x5f, 0x91, 0x20, 0xbf, 0xe7, 0x0c, 0x73, 0xf0, 0x9c, 0x69, 0x8e, 0xbd, 0x80, 0x5f, 0xc9,
+	0xbe, 0x17, 0x40, 0x43, 0x83, 0x33, 0xe2, 0xf8, 0x85, 0x43, 0x3d, 0x54, 0xad, 0x01, 0x87, 0x02,
+	0x86, 0xe6, 0x08, 0xac, 0x1c, 0x68, 0x06, 0x7b, 0x9a, 0x81, 0xfc, 0x5e, 0x33, 0x35, 0x6c, 0x1b,
+	0xa1, 0xe4, 0xcf, 0x05, 0xa0, 0xf7, 0x02, 0x68, 0x48, 0x68, 0x2f, 0x80, 0x55, 0x00, 0xf6, 0x02,
+	0x46, 0x08, 0x8b, 0x00, 0xd7, 0xfa, 0x4b, 0x97, 0xff, 0xe0, 0xaf, 0x4f, 0x7e, 0x14, 0xdf, 0x24,
+	0xf2, 0x7b, 0xcf, 0x32, 0x07, 0x1f, 0x8e, 0x5e, 0x36, 0x6c, 0x8d, 0xec, 0x0f, 0x07, 0xa1, 0xa1,
+	0xe1, 0xc6, 0xc1, 0xff, 0xcc, 0x2f, 0x1a, 0x1a, 0x60, 0xd9, 0x0a, 0x86, 0xd5, 0x29, 0x02, 0xce,
+	0x5d, 0xcc, 0x60, 0xb3, 0xc3, 0xef, 0x96, 0xfc, 0x97, 0xa4, 0xca, 0x3f, 0xa3, 0x7e, 0xf9, 0x6f,
+	0x72, 0x2c, 0xb2, 0x23, 0xa7, 0x03, 0x21, 0x49, 0x0c, 0x0d, 0x8d, 0x9c, 0xa3, 0x64, 0xd9, 0x08,
+	0x94, 0xa1, 0xbb, 0x79, 0x1b, 0x18, 0x62, 0x65, 0xa6, 0x2b, 0x02, 0x8b, 0xfb, 0x9a, 0x54, 0x7e,
+	0xa3, 0x7b, 0xf6, 0x9f, 0xe1, 0x40, 0xa9, 0x3d, 0x66, 0xaa, 0xc0, 0x67, 0x8e, 0x05, 0xf8, 0xcd,
+	0x57, 0xc3, 0x83, 0xc5, 0xd6, 0x10, 0xb8, 0xac, 0x1d, 0x84, 0xae, 0x6c, 0xcf, 0xd1, 0x41, 0x47,
+	0xc8, 0x8a, 0xf6, 0xe0, 0xbf, 0xd4, 0x06, 0xee, 0x2d, 0xb4, 0x86, 0x5b, 0x73, 0x2d, 0x1b, 0x2c,
+	0xff, 0xad, 0xd9, 0x2a, 0xd8, 0x37, 0x56, 0x57, 0x00, 0x3e, 0xb0, 0x2c, 0xdb, 0x9e, 0xa1, 0xa1,
+	0x91, 0xf1, 0xe4, 0x20, 0x57, 0x94, 0xa1, 0xbd, 0xb2, 0x2d, 0x0c, 0x56, 0x9b, 0x91, 0x22, 0x30,
+	0xbd, 0xbb, 0x19, 0xec, 0x1a, 0x52, 0x8f, 0xfc, 0x23, 0x9a, 0x2e, 0xff, 0x45, 0x67, 0x16, 0x3c,
+	0x39, 0xd9, 0x51, 0xf4, 0x00, 0x4e, 0xe6, 0xf0, 0xd5, 0x1d, 0x20, 0x72, 0x4d, 0x47, 0x01, 0x51,
+	0x6b, 0x3b, 0x89, 0x88, 0x5e, 0xd7, 0x59, 0x47, 0x0c, 0xb2, 0xbe, 0x0b, 0xf7, 0xcf, 0x3b, 0x73,
+	0x9f, 0xd1, 0x8e, 0x88, 0xee, 0x21, 0x41, 0xfe, 0xdb, 0x73, 0x34, 0xd8, 0x76, 0x52, 0x7e, 0xd2,
+	0x0e, 0x03, 0x56, 0x32, 0x34, 0x34, 0xf2, 0x8c, 0xf0, 0x00, 0x0f, 0x07, 0x4b, 0x33, 0x52, 0x04,
+	0xd6, 0xda, 0x1a, 0x96, 0x7f, 0x7f, 0x23, 0xe5, 0x3f, 0xcd, 0x75, 0xed, 0xaf, 0x4d, 0x37, 0x27,
+	0xc2, 0x07, 0x2d, 0x6f, 0x87, 0x82, 0x0b, 0x31, 0x2a, 0xbb, 0x50, 0xf8, 0x58, 0x9e, 0x0d, 0x1a,
+	0xe2, 0x36, 0x74, 0x85, 0xb8, 0x8d, 0x5d, 0x21, 0x6c, 0x55, 0x47, 0xf0, 0x9d, 0x6f, 0xf9, 0x53,
+	0xf9, 0x7d, 0xb5, 0xac, 0x74, 0x32, 0xa7, 0xa7, 0x04, 0xd1, 0xd0, 0xb0, 0x2c, 0x3b, 0x88, 0x2f,
+	0x00, 0xb6, 0x16, 0x2d, 0x71, 0xec, 0x5f, 0x47, 0x7e, 0x33, 0xe9, 0xf2, 0x8b, 0xd7, 0xf2, 0xe3,
+	0x69, 0xbc, 0xd8, 0x4d, 0xc7, 0x6e, 0xbb, 0xf1, 0xd6, 0xdd, 0xa8, 0xec, 0x88, 0x40, 0x76, 0x2d,
+	0xdd, 0x08, 0xf1, 0x9b, 0x90, 0xee, 0x08, 0xf7, 0x9a, 0x6e, 0x70, 0x6b, 0x8e, 0xc5, 0x4f, 0xe5,
+	0xf7, 0x9b, 0x6b, 0x01, 0x47, 0x26, 0xaa, 0xc0, 0x42, 0x49, 0xee, 0x7f, 0xfc, 0x50, 0x28, 0x14,
+	0xdd, 0x19, 0x1a, 0x1a, 0x19, 0x6f, 0x21, 0x06, 0x08, 0xae, 0x0f, 0x58, 0x6f, 0xab, 0x95, 0x7f,
+	0x78, 0xe3, 0xe5, 0x3f, 0x35, 0xa1, 0x2d, 0xdc, 0x9e, 0xa7, 0x86, 0x88, 0xd5, 0xd2, 0xbb, 0xf2,
+	0xe2, 0xd6, 0x1d, 0x25, 0xd7, 0x21, 0x92, 0x1d, 0x49, 0x40, 0x36, 0xf7, 0x80, 0xc4, 0x3a, 0x04,
+	0x2f, 0xef, 0xa0, 0x97, 0x7f, 0xb6, 0xca, 0xa0, 0xfc, 0x77, 0xe6, 0x69, 0x70, 0xe8, 0xac, 0x7c,
+	0xad, 0x1d, 0x06, 0x6c, 0x60, 0x68, 0x68, 0x64, 0xda, 0x03, 0x68, 0xc1, 0x17, 0x80, 0xa1, 0xed,
+	0x5a, 0xf1, 0x5d, 0xfe, 0x46, 0xc9, 0x8f, 0xad, 0xfe, 0xad, 0xb9, 0x6a, 0x6c, 0xe5, 0x1b, 0xdd,
+	0x95, 0xd7, 0xb5, 0xee, 0x12, 0x64, 0x47, 0x92, 0xb6, 0xf4, 0x84, 0x34, 0x57, 0x27, 0xc8, 0x3b,
+	0x37, 0x8f, 0x90, 0xbc, 0xc7, 0x11, 0xc5, 0xff, 0xa9, 0xfc, 0x77, 0x39, 0x36, 0x0c, 0x55, 0xfd,
+	0xe0, 0x4f, 0x2a, 0x66, 0x68, 0x68, 0xe4, 0x5e, 0x00, 0xe6, 0xf4, 0x69, 0x29, 0x4d, 0x7e, 0xf1,
+	0x72, 0x5e, 0x1c, 0xeb, 0xe3, 0xcd, 0x38, 0x53, 0x74, 0xe5, 0x79, 0xd9, 0xc5, 0xc2, 0x73, 0xb2,
+	0x27, 0xd5, 0x21, 0xd3, 0x7d, 0x1c, 0x7c, 0x7d, 0x55, 0x06, 0xb5, 0xb5, 0xb5, 0x02, 0x7e, 0x7c,
+	0x7c, 0x0d, 0xf9, 0xf7, 0x8e, 0x81, 0xef, 0x3c, 0x75, 0xbd, 0xf2, 0xdf, 0xc3, 0xfb, 0x05, 0xb3,
+	0xf5, 0x07, 0x94, 0xca, 0x72, 0x6a, 0x30, 0x0d, 0x8d, 0x52, 0xa9, 0xec, 0xc2, 0x4b, 0xb0, 0x7c,
+	0x50, 0xab, 0xc6, 0xcb, 0xbf, 0xac, 0xbd, 0x09, 0xbb, 0xf2, 0x28, 0x3b, 0x69, 0xdd, 0xf5, 0x6c,
+	0x45, 0x7a, 0x41, 0x32, 0xb2, 0xad, 0x17, 0xe4, 0x9d, 0x9b, 0x03, 0x95, 0x9f, 0xdf, 0xa1, 0xf0,
+	0xf5, 0xf2, 0xb1, 0x22, 0x1f, 0x42, 0x77, 0x8c, 0x30, 0x28, 0xff, 0xfd, 0x05, 0x1a, 0xba, 0x59,
+	0x2b, 0xdf, 0x68, 0xd6, 0x07, 0x28, 0xe6, 0x30, 0x34, 0x34, 0x72, 0x8b, 0xb2, 0x8d, 0xd2, 0x91,
+	0x2f, 0x00, 0x1b, 0x1c, 0x5b, 0x36, 0x58, 0xfe, 0x4b, 0x53, 0x95, 0x10, 0xc8, 0xc9, 0x6f, 0xb4,
+	0x2b, 0x8f, 0xfc, 0xbc, 0x2b, 0x2f, 0x12, 0x9e, 0x97, 0x1d, 0x49, 0x21, 0xf4, 0x86, 0x94, 0xed,
+	0xbd, 0xa1, 0xd8, 0x63, 0x0d, 0x7c, 0x7b, 0x55, 0x8e, 0x92, 0xff, 0x94, 0x2f, 0x2f, 0x4b, 0x21,
+	0xe3, 0xca, 0x7a, 0x83, 0xf2, 0x3f, 0xe0, 0x98, 0xd0, 0xc7, 0xfc, 0x05, 0xf9, 0xef, 0x67, 0xd9,
+	0xa3, 0x0c, 0x0d, 0x8d, 0x0c, 0x87, 0x00, 0x7d, 0xf8, 0x02, 0xb0, 0xd2, 0xb6, 0x55, 0x83, 0xf6,
+	0xec, 0xc7, 0x49, 0x3c, 0x61, 0xab, 0x3b, 0x35, 0xb1, 0x2b, 0x2f, 0x96, 0x9d, 0x17, 0x1e, 0x65,
+	0x4f, 0xd5, 0xd1, 0x87, 0x90, 0xb6, 0xa3, 0x0f, 0x7c, 0xa9, 0xc8, 0x43, 0xb9, 0x25, 0x53, 0x53,
+	0x5d, 0x05, 0x71, 0xee, 0x33, 0x44, 0xf2, 0x3f, 0x5c, 0x68, 0x09, 0xae, 0x63, 0x2c, 0xc8, 0x7d,
+	0x00, 0x8e, 0xe7, 0x0c, 0x0d, 0x8d, 0xdc, 0xc2, 0x75, 0x7d, 0xa7, 0xf1, 0x05, 0x60, 0xdb, 0xe0,
+	0x96, 0x92, 0xe4, 0xbf, 0xb2, 0xb0, 0x1f, 0x64, 0x07, 0x7b, 0x40, 0xd5, 0x8f, 0x6f, 0xf0, 0xfd,
+	0xf3, 0x07, 0x78, 0x53, 0x9e, 0x03, 0x79, 0xbe, 0x07, 0x21, 0x69, 0xc7, 0x00, 0xc9, 0x5d, 0x79,
+	0x71, 0xeb, 0xce, 0x8b, 0xce, 0x83, 0xb2, 0x23, 0x7d, 0xf5, 0xec, 0xec, 0x0b, 0x15, 0x01, 0x47,
+	0x51, 0xea, 0x06, 0xf3, 0xf1, 0x51, 0x16, 0x44, 0xbb, 0x8d, 0x17, 0xc8, 0x8f, 0x9c, 0x99, 0xaa,
+	0xbb, 0x0f, 0xf0, 0x43, 0xa9, 0x54, 0x5a, 0x30, 0x34, 0x34, 0x32, 0x5b, 0x10, 0xb4, 0x58, 0xbb,
+	0x57, 0x20, 0xec, 0x19, 0x66, 0x7c, 0xff, 0xbe, 0x93, 0x53, 0x2c, 0x21, 0xed, 0xde, 0x79, 0xa8,
+	0xae, 0xaa, 0x32, 0x28, 0xd9, 0xa7, 0x97, 0x8f, 0x21, 0xfd, 0xf4, 0x5c, 0xa9, 0x5d, 0x79, 0xa1,
+	0xec, 0xdb, 0xc5, 0xb2, 0xa7, 0xef, 0xec, 0x07, 0xe9, 0xbb, 0xf4, 0xe4, 0x1e, 0x1b, 0x0f, 0x9f,
+	0x9f, 0x64, 0x4b, 0x94, 0x5e, 0xcc, 0x93, 0x18, 0x2f, 0x81, 0xfc, 0xfe, 0x8b, 0xd4, 0x10, 0xc0,
+	0xd1, 0xd5, 0x4a, 0xf9, 0x4c, 0xf3, 0x34, 0x40, 0x39, 0x85, 0xa1, 0xa1, 0x91, 0xe3, 0x8a, 0x40,
+	0x6b, 0x73, 0xd6, 0xa8, 0xfc, 0x57, 0x97, 0x0c, 0x84, 0x0f, 0x2f, 0x1e, 0x4b, 0xea, 0x6e, 0x67,
+	0x5c, 0x5e, 0x2d, 0xa9, 0x2b, 0xaf, 0x97, 0x1d, 0xe9, 0x27, 0x10, 0x3e, 0x03, 0xd9, 0xdd, 0x1f,
+	0x32, 0xeb, 0xf0, 0x2c, 0xf4, 0x74, 0xa3, 0xe5, 0x47, 0xaa, 0xbe, 0xbc, 0x87, 0xa4, 0xa3, 0xb3,
+	0x04, 0xf2, 0x07, 0x2e, 0x56, 0xc3, 0x84, 0xbe, 0x16, 0x2f, 0xc9, 0x1e, 0x01, 0x0a, 0xf6, 0x30,
+	0x43, 0x43, 0x23, 0xb3, 0x02, 0xb0, 0x97, 0x1c, 0x26, 0x6a, 0xa9, 0xa8, 0x57, 0xfe, 0xc0, 0xa3,
+	0xcb, 0xe1, 0xdd, 0xb3, 0x52, 0xc9, 0xa2, 0x7d, 0x7e, 0xf3, 0x0c, 0x0a, 0xbc, 0xb6, 0x18, 0xeb,
+	0xca, 0x8b, 0x64, 0x37, 0x24, 0x7c, 0xd6, 0xee, 0x01, 0x90, 0xb5, 0x47, 0xcf, 0xb7, 0xd7, 0xe4,
+	0xc6, 0x5f, 0x93, 0xa8, 0x88, 0xf5, 0x16, 0xc8, 0x8f, 0x6c, 0x1c, 0xa1, 0xd6, 0xde, 0x07, 0x50,
+	0x46, 0x31, 0x34, 0x34, 0x72, 0x0a, 0xee, 0x8c, 0x83, 0x17, 0x7f, 0x27, 0x0b, 0x85, 0x41, 0xf9,
+	0x3d, 0xd7, 0x0e, 0x87, 0x37, 0x4f, 0x8a, 0x1a, 0x2c, 0xda, 0xbb, 0xc7, 0xf9, 0x90, 0x7d, 0x71,
+	0x99, 0xb8, 0x2b, 0x2f, 0x96, 0x9d, 0x07, 0x25, 0x17, 0x90, 0xbd, 0x67, 0x20, 0x64, 0xef, 0xd5,
+	0x50, 0xee, 0xbd, 0xae, 0xc9, 0xf2, 0x23, 0x1f, 0x4a, 0x53, 0x05, 0xf2, 0x07, 0x2d, 0xb1, 0x02,
+	0x9f, 0x79, 0x36, 0xd5, 0x75, 0xe6, 0x03, 0xfc, 0x33, 0x43, 0x43, 0x23, 0xa3, 0x1e, 0xc0, 0x19,
+	0xb2, 0x1c, 0xd8, 0x4a, 0x61, 0xf0, 0x86, 0x5f, 0xc6, 0xc3, 0x4b, 0x8d, 0x96, 0xed, 0x65, 0x7e,
+	0x02, 0x64, 0x9d, 0x9e, 0x25, 0x49, 0x76, 0x04, 0x45, 0xe7, 0xc9, 0x71, 0x1d, 0xa4, 0x23, 0xd7,
+	0xcd, 0x16, 0x5e, 0xc5, 0x5e, 0x33, 0x49, 0x01, 0xa8, 0xa9, 0xaa, 0x84, 0xf8, 0x7d, 0xe3, 0x74,
+	0xf2, 0x07, 0x6b, 0x51, 0xb1, 0x9a, 0x13, 0x95, 0x71, 0x5e, 0x04, 0x43, 0x43, 0x23, 0xa3, 0x02,
+	0x70, 0x99, 0x6c, 0x08, 0xd2, 0xbe, 0xad, 0x48, 0xfe, 0x33, 0x53, 0x6d, 0xf0, 0x4e, 0x7f, 0x93,
+	0x84, 0x7b, 0x57, 0x9e, 0x0d, 0x69, 0x7b, 0x1d, 0x8c, 0xc9, 0x8e, 0xd4, 0x95, 0x5d, 0x40, 0xde,
+	0x3e, 0x3b, 0xc2, 0xe7, 0xf2, 0xb4, 0x26, 0xcb, 0xcf, 0x53, 0xe4, 0xeb, 0xa6, 0x97, 0x1f, 0x59,
+	0xd5, 0x05, 0xba, 0x59, 0x9b, 0x97, 0x6b, 0x27, 0x04, 0x4d, 0x62, 0x68, 0x68, 0xe4, 0xf3, 0x18,
+	0x90, 0xbd, 0x86, 0x17, 0xfe, 0xc0, 0xf6, 0x0a, 0xd1, 0x72, 0xde, 0xfb, 0x6e, 0x73, 0x4c, 0x22,
+	0xdc, 0xd3, 0xd4, 0x40, 0xa9, 0xb2, 0x8b, 0xc8, 0xdf, 0x6f, 0x0f, 0x85, 0xee, 0xc3, 0xf1, 0xe6,
+	0xa2, 0xc9, 0x0a, 0xc0, 0xfb, 0xc2, 0x78, 0x9d, 0xfc, 0x21, 0x4b, 0xad, 0x20, 0xd0, 0x6d, 0x32,
+	0x8c, 0xea, 0xdf, 0xfe, 0x99, 0x76, 0xb3, 0xd0, 0xcd, 0x0c, 0x0d, 0x8d, 0x8c, 0x7a, 0x00, 0x1e,
+	0x64, 0x29, 0x70, 0x07, 0x85, 0x68, 0x2d, 0x7f, 0xda, 0xdd, 0xb3, 0xa6, 0x6b, 0x75, 0xef, 0x1c,
+	0x94, 0x22, 0xbb, 0x80, 0x02, 0xe4, 0x80, 0x03, 0x3c, 0xbb, 0xbf, 0x17, 0x3f, 0xc3, 0x64, 0x7c,
+	0x7b, 0x51, 0x02, 0xc1, 0x4b, 0xad, 0x89, 0xfc, 0xa1, 0xcb, 0xb8, 0x02, 0xb0, 0xcf, 0x19, 0x16,
+	0x8f, 0x1b, 0x40, 0x86, 0x00, 0xd8, 0x23, 0x62, 0x68, 0x68, 0x64, 0xb4, 0x23, 0x90, 0x17, 0x5e,
+	0xf8, 0x76, 0x1d, 0x15, 0x02, 0xf9, 0x91, 0xc2, 0x98, 0x7b, 0x26, 0x93, 0xee, 0xc3, 0xb3, 0x12,
+	0xc8, 0xbf, 0xbc, 0x54, 0x2f, 0xfb, 0x3e, 0xc3, 0xb2, 0x17, 0xd6, 0xe5, 0xa0, 0x03, 0x14, 0x1d,
+	0x74, 0x84, 0x37, 0xf1, 0xd7, 0xf1, 0x33, 0x4c, 0x4a, 0x82, 0xdb, 0x68, 0x22, 0x7f, 0xd8, 0x32,
+	0x6b, 0x08, 0x74, 0x9d, 0x0c, 0x3b, 0x97, 0x8c, 0xaf, 0xd5, 0x9e, 0x19, 0x10, 0xcd, 0xd0, 0xd0,
+	0xc8, 0x25, 0xca, 0xb6, 0xec, 0x4d, 0xbc, 0xf0, 0xed, 0x3b, 0xb6, 0x15, 0x6d, 0xde, 0x99, 0x17,
+	0xe6, 0x63, 0x52, 0xe9, 0x5e, 0x17, 0x24, 0x6a, 0x65, 0x47, 0x1c, 0xa0, 0xc0, 0x80, 0xec, 0x45,
+	0x87, 0xea, 0xe2, 0x04, 0xc5, 0x87, 0x9d, 0xe0, 0x53, 0x41, 0xa4, 0xc9, 0x0b, 0x40, 0x81, 0xc7,
+	0x46, 0x94, 0x9f, 0x10, 0xb4, 0x77, 0x3c, 0x9c, 0xde, 0x3e, 0x0f, 0xf8, 0x29, 0xc1, 0x6a, 0xb5,
+	0xfa, 0xaf, 0x18, 0x1a, 0x1a, 0x39, 0xc4, 0xbc, 0x2d, 0x7b, 0x41, 0x73, 0x13, 0x50, 0x21, 0xda,
+	0xb9, 0xf7, 0x51, 0xba, 0x69, 0xc5, 0xab, 0xa9, 0xae, 0x86, 0x22, 0xef, 0x2d, 0x5a, 0xd9, 0x11,
+	0x91, 0xec, 0x1c, 0x83, 0x75, 0x94, 0x20, 0xee, 0x43, 0xe0, 0xc7, 0xab, 0x52, 0x93, 0x17, 0x80,
+	0xe7, 0x51, 0xd7, 0x88, 0xfc, 0xe1, 0xcb, 0xad, 0x21, 0x64, 0xfb, 0x60, 0x78, 0x78, 0x66, 0x3d,
+	0xa8, 0x55, 0xe6, 0xdf, 0xf1, 0xff, 0x85, 0xaa, 0x4d, 0x1b, 0x6b, 0x86, 0x86, 0x46, 0x0e, 0x61,
+	0x15, 0xac, 0x1b, 0x5e, 0xf4, 0x7d, 0x6d, 0x14, 0xa2, 0x6d, 0xbb, 0x4d, 0xdd, 0x03, 0x40, 0xde,
+	0x3f, 0xce, 0x45, 0xd9, 0x45, 0xc2, 0x97, 0x10, 0x86, 0x40, 0xa9, 0xbb, 0x90, 0xb2, 0x23, 0x43,
+	0xa1, 0xd6, 0xc0, 0x0d, 0xc0, 0xcc, 0xcc, 0x4c, 0x18, 0x3b, 0x76, 0x2c, 0x58, 0x59, 0x59, 0x81,
+	0xad, 0xad, 0x2d, 0x1c, 0x3f, 0x7e, 0x1c, 0x2a, 0x2b, 0x2b, 0xa5, 0x3f, 0x9d, 0x28, 0x49, 0x21,
+	0xf2, 0x47, 0xac, 0xb0, 0x86, 0xd0, 0x2d, 0xb6, 0xa4, 0x00, 0x0c, 0xe8, 0xd1, 0xe9, 0xab, 0x2c,
+	0x97, 0x06, 0xd3, 0xd0, 0x99, 0x80, 0x7d, 0x6c, 0x14, 0x02, 0xf9, 0x91, 0xb2, 0xe4, 0x60, 0x94,
+	0xc5, 0xe4, 0x94, 0x78, 0xac, 0xd5, 0x08, 0xff, 0x4b, 0xd9, 0xdd, 0x87, 0xa2, 0xf0, 0x7a, 0x8e,
+	0x22, 0xc3, 0x44, 0xef, 0x3f, 0x7f, 0xfe, 0x3c, 0xfc, 0xf1, 0x1f, 0xff, 0x31, 0x30, 0x0c, 0x23,
+	0xa0, 0x7f, 0xff, 0xfe, 0xf0, 0xf5, 0xeb, 0x57, 0x69, 0x33, 0x02, 0x73, 0xe3, 0x20, 0x6c, 0x7d,
+	0x2f, 0x52, 0x00, 0xc2, 0x37, 0xf4, 0x21, 0x05, 0x60, 0xfe, 0xe4, 0xa1, 0x35, 0xda, 0x29, 0xc1,
+	0xe7, 0x19, 0x1a, 0x1a, 0x99, 0xcc, 0x04, 0x5c, 0x83, 0x17, 0x7d, 0x57, 0xb5, 0x42, 0xb4, 0x67,
+	0x7f, 0x7e, 0xb8, 0xe9, 0x7b, 0x00, 0xc8, 0xd3, 0x04, 0x5f, 0x14, 0x5e, 0x24, 0x3b, 0x52, 0xce,
+	0x09, 0x5f, 0x7e, 0x4c, 0xc3, 0x23, 0xe4, 0xb8, 0xb0, 0x00, 0x14, 0x14, 0x14, 0xc0, 0x5f, 0xff,
+	0xf5, 0x5f, 0xf3, 0xd2, 0x8b, 0xd8, 0xb6, 0x6d, 0x9b, 0xa4, 0xdf, 0xf0, 0xf6, 0x59, 0x19, 0x84,
+	0xec, 0x1a, 0x01, 0x91, 0x2b, 0x6c, 0x20, 0x62, 0x43, 0x6f, 0x52, 0x00, 0xdc, 0x56, 0xbb, 0x80,
+	0x76, 0x4a, 0x70, 0x2e, 0x3d, 0x36, 0x8c, 0x46, 0x16, 0x31, 0x67, 0xd9, 0xd9, 0x78, 0xd1, 0xdb,
+	0xa8, 0x58, 0xd1, 0x81, 0x1d, 0x69, 0x7e, 0x27, 0x7f, 0x2d, 0x05, 0xa0, 0xf2, 0xdb, 0x67, 0x81,
+	0xec, 0x42, 0xe1, 0x87, 0xc3, 0x63, 0x1d, 0x23, 0x10, 0xc1, 0x7b, 0x51, 0x70, 0x14, 0xbd, 0x3e,
+	0xfa, 0xf6, 0xed, 0x2b, 0xe9, 0x37, 0x7c, 0xfd, 0xf4, 0x1e, 0xfc, 0xcf, 0x6d, 0x86, 0xc0, 0x43,
+	0xb3, 0x39, 0xf9, 0x37, 0x90, 0x02, 0xe0, 0x7d, 0x78, 0x05, 0x74, 0xb0, 0xb1, 0xfe, 0x40, 0x86,
+	0x01, 0x6d, 0xdb, 0xda, 0x33, 0x34, 0x34, 0xcd, 0xff, 0x29, 0x80, 0x72, 0xac, 0xf6, 0xf1, 0x17,
+	0xb8, 0x8f, 0xd1, 0xcb, 0x8f, 0x24, 0x78, 0xb8, 0x35, 0x48, 0x6c, 0xec, 0x7e, 0xa3, 0xa0, 0x2a,
+	0x95, 0x8a, 0xb4, 0xd2, 0xdd, 0xbb, 0x77, 0xc7, 0xee, 0xba, 0xc1, 0xd7, 0x96, 0x5e, 0x9a, 0xcb,
+	0xcb, 0x2e, 0x10, 0xfe, 0xc9, 0x09, 0x64, 0xa4, 0x86, 0x93, 0x1a, 0x7e, 0xbc, 0xd4, 0xaf, 0x45,
+	0x58, 0xbf, 0x7e, 0xbd, 0xb1, 0x02, 0x80, 0xdf, 0x2b, 0x6d, 0x2e, 0xc0, 0xe7, 0x0f, 0x28, 0xbd,
+	0x88, 0x51, 0x4e, 0x03, 0xde, 0x68, 0x97, 0x47, 0x6f, 0x65, 0x68, 0x68, 0xe4, 0xb4, 0x27, 0xa0,
+	0xdb, 0x28, 0xe1, 0x39, 0x7d, 0xe1, 0x27, 0x56, 0x4a, 0x96, 0x1f, 0x6f, 0xc0, 0xf5, 0xee, 0xdd,
+	0xdb, 0xa0, 0x94, 0xf3, 0xe7, 0xcf, 0x17, 0xbd, 0xbe, 0xfc, 0xf6, 0x76, 0x78, 0xac, 0x93, 0x5d,
+	0x2f, 0x7c, 0xc5, 0xc9, 0x51, 0x50, 0x71, 0x4a, 0xcf, 0x53, 0x8e, 0xcf, 0x39, 0x01, 0xba, 0xf7,
+	0x5d, 0xbe, 0x7c, 0xd9, 0x68, 0x01, 0x68, 0xdf, 0xbe, 0xbd, 0xe4, 0xdf, 0x1c, 0x78, 0x71, 0xbb,
+	0xa8, 0x00, 0xec, 0x58, 0x3a, 0xe5, 0x57, 0xda, 0x82, 0x98, 0xc7, 0xd0, 0xd0, 0x34, 0xf7, 0x70,
+	0xad, 0xf5, 0x5f, 0xf3, 0x05, 0x60, 0x8d, 0x63, 0x5b, 0xc1, 0x21, 0x9d, 0x37, 0xd7, 0x38, 0x4a,
+	0x96, 0xc9, 0xdd, 0xdd, 0xdd, 0xa8, 0x98, 0xb1, 0xb1, 0xb1, 0x82, 0xd7, 0x3f, 0x0e, 0x3d, 0x0f,
+	0x4f, 0x44, 0xb2, 0x73, 0x9c, 0x1e, 0x0d, 0xcf, 0x7e, 0xc1, 0xc7, 0xd8, 0x8b, 0xfa, 0x9d, 0x7d,
+	0x3e, 0x7e, 0x84, 0xff, 0xfe, 0xef, 0xff, 0xae, 0xef, 0x7b, 0xf0, 0x77, 0x48, 0xfe, 0xcd, 0xa1,
+	0xd7, 0x5d, 0x45, 0x05, 0xc0, 0xc7, 0x7d, 0x25, 0xb6, 0xfe, 0xb5, 0xb2, 0x79, 0x1c, 0x48, 0x43,
+	0xa3, 0x54, 0xb0, 0xf9, 0x1c, 0x30, 0x6f, 0x40, 0x5b, 0x9d, 0xfc, 0xe7, 0x38, 0xae, 0xcc, 0x92,
+	0xdc, 0x9a, 0xe2, 0xa3, 0x38, 0xa3, 0x05, 0x60, 0xf5, 0xea, 0xd5, 0xc2, 0xdd, 0x79, 0x42, 0xcf,
+	0xa3, 0xec, 0x22, 0xe1, 0x9f, 0x9f, 0x19, 0x23, 0xe2, 0x85, 0xc7, 0x22, 0xa1, 0xb8, 0xa1, 0xa1,
+	0xf0, 0xcf, 0xff, 0xfc, 0xcf, 0xa2, 0xef, 0x98, 0x3d, 0x7b, 0x76, 0x83, 0x86, 0x2c, 0x11, 0x5e,
+	0x07, 0x51, 0x7a, 0x11, 0xc3, 0x9d, 0xec, 0x5e, 0x6b, 0x37, 0x0a, 0x3d, 0xc0, 0xd0, 0xd0, 0xc8,
+	0x60, 0x2e, 0x80, 0x1f, 0x5e, 0xf0, 0xe3, 0x7b, 0x2a, 0x74, 0xf2, 0x23, 0x17, 0x9c, 0x59, 0x78,
+	0x2f, 0x6d, 0x23, 0x10, 0x7c, 0x1e, 0x6f, 0xb4, 0x00, 0x38, 0x3b, 0x3b, 0x0b, 0x5e, 0x5f, 0xe6,
+	0xe7, 0x0a, 0xcf, 0xce, 0x18, 0x10, 0xfe, 0xec, 0x58, 0x78, 0x51, 0x87, 0x97, 0xe7, 0xc6, 0xc1,
+	0xf5, 0x2d, 0x2e, 0x50, 0x91, 0xfc, 0x50, 0xf0, 0xfe, 0x47, 0x8f, 0x1e, 0x81, 0xab, 0xab, 0x2b,
+	0xf9, 0xdc, 0xe5, 0xcb, 0x97, 0x43, 0x64, 0x64, 0xc3, 0x27, 0x2d, 0xc5, 0xf9, 0x9e, 0x34, 0x58,
+	0x00, 0xdc, 0xb6, 0xae, 0xe6, 0x67, 0x05, 0x16, 0xca, 0xe6, 0xbc, 0x00, 0x1a, 0x7a, 0x42, 0x30,
+	0xae, 0x07, 0x38, 0xf7, 0x8b, 0xb3, 0xf9, 0xcb, 0x93, 0x02, 0xa5, 0xc8, 0x84, 0x93, 0x72, 0x8c,
+	0x16, 0x80, 0x5d, 0xbb, 0x76, 0x09, 0x05, 0xf6, 0xdd, 0x89, 0xc2, 0x8b, 0x64, 0x27, 0x9c, 0x1f,
+	0x0f, 0xaf, 0x38, 0x5e, 0x5e, 0x72, 0x86, 0xb8, 0x63, 0xf3, 0x60, 0xd5, 0xe8, 0x9e, 0xb0, 0xd3,
+	0x65, 0x10, 0x54, 0x7e, 0x7c, 0x6d, 0xd2, 0xa7, 0x11, 0x69, 0x01, 0x57, 0x74, 0xd2, 0x87, 0x7b,
+	0x1d, 0x86, 0xb4, 0x68, 0x7f, 0x28, 0xce, 0xcf, 0x86, 0xa2, 0xc2, 0x42, 0xb0, 0xb7, 0xb3, 0xe3,
+	0x6f, 0x06, 0xae, 0x60, 0x68, 0x68, 0x9a, 0x79, 0x01, 0x98, 0xae, 0xd9, 0x16, 0x8c, 0xc5, 0x73,
+	0xfd, 0x74, 0xf2, 0x23, 0x19, 0x7e, 0x27, 0x24, 0xc9, 0x94, 0x98, 0x98, 0xc8, 0x4f, 0xce, 0x11,
+	0xf1, 0xf7, 0x7f, 0xff, 0xf7, 0x50, 0x52, 0x52, 0xa2, 0x7b, 0xed, 0xf7, 0x4f, 0x6f, 0xa1, 0xe2,
+	0xca, 0x6c, 0x5e, 0x78, 0x94, 0x5d, 0x47, 0xfe, 0xd1, 0x31, 0xe0, 0xb5, 0x7d, 0x3a, 0xb8, 0xcd,
+	0x1b, 0x0e, 0x0b, 0x1d, 0x6c, 0x38, 0xda, 0xc1, 0x62, 0xa7, 0x8e, 0x84, 0x63, 0x8b, 0x47, 0x40,
+	0xf5, 0xc7, 0x17, 0x26, 0x2b, 0x00, 0x19, 0x41, 0xd7, 0x20, 0xe0, 0xc2, 0x56, 0x48, 0x8d, 0xf2,
+	0x87, 0x47, 0xe5, 0xe5, 0x84, 0xc7, 0x8f, 0x1e, 0x11, 0x0e, 0x1d, 0x3c, 0xf8, 0x2b, 0xed, 0xb1,
+	0x61, 0x11, 0xad, 0x5b, 0xb7, 0xfe, 0x5b, 0x86, 0x86, 0x46, 0x0e, 0xc7, 0x83, 0xb9, 0x8e, 0xd2,
+	0xcb, 0x7f, 0x91, 0x23, 0xf2, 0xfc, 0x46, 0xc9, 0x42, 0xe1, 0x74, 0xdc, 0x3f, 0xff, 0xf3, 0x3f,
+	0x17, 0xc8, 0x8f, 0x63, 0xf5, 0x07, 0x0f, 0x1e, 0x08, 0x5e, 0x17, 0xed, 0x77, 0x09, 0xa2, 0xb6,
+	0xd9, 0x41, 0xc9, 0xb1, 0x91, 0x10, 0xb1, 0x79, 0x10, 0x5c, 0x9e, 0xd3, 0x05, 0xf6, 0xbb, 0xf4,
+	0x86, 0x23, 0x2b, 0xa7, 0xc0, 0x79, 0xb7, 0x4d, 0xe0, 0x7f, 0xeb, 0x06, 0xc4, 0x46, 0x84, 0x40,
+	0x4e, 0x76, 0x36, 0x21, 0x3b, 0x2b, 0x8b, 0x90, 0x95, 0x95, 0x09, 0x19, 0xe1, 0xb7, 0xe1, 0x55,
+	0xd2, 0x2d, 0xa8, 0xfe, 0xf4, 0xaa, 0xc9, 0x05, 0xa0, 0x38, 0x3f, 0x07, 0x4a, 0xb9, 0xc2, 0x54,
+	0x56, 0x5a, 0x4a, 0x28, 0x2f, 0x2b, 0xd3, 0x15, 0x02, 0xfc, 0xe7, 0x1d, 0xdb, 0x77, 0xa8, 0x22,
+	0x33, 0x03, 0x59, 0x76, 0x2a, 0x43, 0x43, 0xd3, 0x9c, 0x63, 0x6d, 0xa1, 0x39, 0x21, 0x67, 0xde,
+	0x40, 0x8d, 0xfc, 0x97, 0x5c, 0x54, 0x70, 0x7d, 0x51, 0x0f, 0x08, 0xbc, 0xb0, 0x05, 0x3e, 0xbc,
+	0x7e, 0x2a, 0x59, 0x2a, 0x9c, 0xa9, 0x77, 0xe0, 0xc0, 0x01, 0x7c, 0xf4, 0x47, 0xfe, 0xfc, 0xf6,
+	0xed, 0x5b, 0xe1, 0x14, 0xdc, 0xd2, 0x42, 0x98, 0xdd, 0xa7, 0x35, 0x4c, 0xed, 0xfa, 0xbf, 0x30,
+	0xa3, 0xa7, 0x19, 0xec, 0x9a, 0x35, 0x04, 0x7c, 0x2f, 0x9f, 0x82, 0xcc, 0xf4, 0x34, 0xc8, 0xcd,
+	0xc9, 0x11, 0x49, 0xcf, 0x8b, 0x4f, 0xc8, 0x24, 0x90, 0xd7, 0x66, 0x07, 0x5d, 0x87, 0xd7, 0x99,
+	0x41, 0x50, 0xf3, 0xfd, 0x73, 0xe3, 0xd6, 0x24, 0xbc, 0x7a, 0x0e, 0xc5, 0x45, 0x45, 0x50, 0x52,
+	0x5c, 0x8c, 0xe8, 0x0b, 0x01, 0x52, 0x56, 0x46, 0x8a, 0x81, 0x9b, 0xab, 0x6b, 0x8d, 0xf6, 0x91,
+	0xe0, 0x93, 0x16, 0x2d, 0x5a, 0xfc, 0x39, 0x43, 0x43, 0xd3, 0x5c, 0xd3, 0x59, 0xad, 0xd9, 0x18,
+	0xc4, 0xa9, 0x33, 0x0b, 0xb7, 0x77, 0x4e, 0x86, 0x87, 0xa7, 0xd7, 0xe9, 0xc6, 0xc7, 0xc5, 0x69,
+	0xe1, 0x26, 0xe9, 0x72, 0x3f, 0x29, 0xcc, 0x86, 0x25, 0xf6, 0x6a, 0xd8, 0x39, 0xdd, 0x11, 0x7c,
+	0x2f, 0x9d, 0x10, 0x4a, 0x2f, 0x6e, 0xed, 0xc5, 0xe2, 0x67, 0x64, 0xe8, 0xc8, 0x48, 0x4f, 0x27,
+	0xa4, 0x87, 0xdf, 0x85, 0xa2, 0xb0, 0xeb, 0xf0, 0x2e, 0x2f, 0x0a, 0xaa, 0xbf, 0xbc, 0x93, 0x26,
+	0xff, 0xcb, 0x0a, 0x28, 0xc8, 0xcf, 0xc3, 0xb1, 0x3e, 0x82, 0x85, 0x00, 0xe1, 0x0b, 0x81, 0xae,
+	0x18, 0xe0, 0x3f, 0xeb, 0xd2, 0xa9, 0xf3, 0x57, 0xed, 0x4e, 0x41, 0x5b, 0x18, 0x1a, 0x9a, 0xe6,
+	0x9a, 0x8e, 0x96, 0x8a, 0x83, 0x78, 0xa1, 0x77, 0xb3, 0x52, 0x8a, 0xee, 0x8a, 0x27, 0x3d, 0xbc,
+	0xd8, 0x64, 0xf9, 0x5f, 0x95, 0xe7, 0x42, 0x7c, 0xd0, 0x1d, 0x4e, 0xf2, 0x2c, 0x94, 0xbe, 0xe9,
+	0xe2, 0xa7, 0xa5, 0xe9, 0x48, 0x4b, 0x4d, 0x25, 0xa4, 0xc6, 0x45, 0x42, 0x46, 0xb0, 0x27, 0x14,
+	0x46, 0x78, 0x43, 0x79, 0x72, 0x10, 0x3c, 0xcd, 0x89, 0x87, 0x57, 0x65, 0xd9, 0x1c, 0x39, 0xe4,
+	0xfb, 0x9f, 0x16, 0x66, 0x40, 0x41, 0x56, 0x2a, 0xe4, 0xe7, 0xe5, 0x11, 0x0a, 0xf2, 0xf3, 0xa1,
+	0xb0, 0xa0, 0xc0, 0x68, 0x21, 0x38, 0x7f, 0xee, 0x1c, 0xb9, 0x17, 0xc0, 0xf1, 0x59, 0xa5, 0x52,
+	0xfd, 0x3b, 0x43, 0x43, 0xd3, 0x1c, 0x63, 0xa1, 0x54, 0xec, 0x20, 0x8b, 0x82, 0xac, 0x55, 0xa2,
+	0x02, 0xe0, 0x7f, 0x76, 0x23, 0x7c, 0xfb, 0xf2, 0xb1, 0xd1, 0xf2, 0xe7, 0x26, 0x86, 0xa3, 0xe4,
+	0x28, 0xbd, 0xe4, 0x6e, 0x3e, 0x22, 0x94, 0x9e, 0x20, 0x92, 0x1e, 0x49, 0x4d, 0x4d, 0xd1, 0x90,
+	0xa2, 0x27, 0x25, 0x39, 0x19, 0x92, 0x93, 0x92, 0x20, 0x31, 0x21, 0x01, 0xff, 0x1a, 0xbf, 0x43,
+	0xf0, 0x1b, 0xf2, 0x72, 0x73, 0x11, 0x41, 0x21, 0x40, 0x48, 0x21, 0x40, 0xea, 0x0c, 0x0f, 0x9c,
+	0xec, 0x1d, 0xc9, 0x76, 0x61, 0xb8, 0x77, 0x02, 0x43, 0x43, 0xd3, 0x4c, 0x9f, 0x04, 0x9c, 0x20,
+	0x3d, 0x80, 0x76, 0x6a, 0x94, 0x5e, 0x44, 0x69, 0x66, 0x74, 0x43, 0xc5, 0xc7, 0x23, 0xc4, 0x38,
+	0x69, 0xd3, 0x4c, 0x2f, 0xbe, 0x4e, 0x7a, 0x44, 0x28, 0x3d, 0xc2, 0xcb, 0x8f, 0x24, 0x25, 0x26,
+	0x22, 0xa4, 0x10, 0xc4, 0xc5, 0xc5, 0x92, 0x3f, 0x67, 0x64, 0x64, 0xd4, 0x57, 0x08, 0x0c, 0xf6,
+	0x0a, 0x02, 0x03, 0x02, 0x80, 0xbf, 0x49, 0x8a, 0x87, 0xa9, 0x32, 0x34, 0x34, 0xcd, 0x2d, 0x56,
+	0x6a, 0xb5, 0x3f, 0x5e, 0xe0, 0xfd, 0xba, 0xb6, 0x37, 0x58, 0x00, 0xa2, 0x7c, 0x0e, 0x37, 0x48,
+	0xfe, 0xef, 0xdf, 0xbf, 0xa3, 0xb0, 0x4d, 0xee, 0xe6, 0xa3, 0xc4, 0x71, 0xb1, 0xb1, 0x10, 0x15,
+	0x19, 0x09, 0x11, 0xe1, 0xe1, 0x10, 0x1a, 0x12, 0x02, 0x01, 0x01, 0xfe, 0xf0, 0xf0, 0xc1, 0x03,
+	0xb8, 0x7f, 0xef, 0x1e, 0xe1, 0xde, 0xdd, 0xbb, 0xe0, 0xe7, 0xeb, 0xab, 0xe3, 0x8e, 0x9f, 0x1f,
+	0x3c, 0xb8, 0x7f, 0x1f, 0xfc, 0x1f, 0x3e, 0x84, 0xa0, 0xc0, 0x40, 0x08, 0x0e, 0x0a, 0x82, 0xb0,
+	0xb0, 0x50, 0xee, 0xfd, 0x61, 0x10, 0x1d, 0x15, 0x45, 0x0a, 0x41, 0x6c, 0x4c, 0x0c, 0x7e, 0x2e,
+	0x16, 0x0b, 0xfc, 0x6d, 0x7c, 0x31, 0xa8, 0x77, 0x78, 0xb0, 0x74, 0xf1, 0x12, 0xfe, 0xf0, 0x90,
+	0x32, 0x9c, 0x3e, 0xcd, 0xd0, 0xd0, 0x34, 0xa7, 0x58, 0xaa, 0x2c, 0x32, 0xf0, 0x02, 0x1f, 0xd2,
+	0xbf, 0x9b, 0xc1, 0x21, 0x40, 0x84, 0xd7, 0x61, 0x78, 0x92, 0x97, 0x2a, 0x6d, 0x03, 0xd0, 0x0f,
+	0x1f, 0x50, 0x5e, 0xc9, 0xe2, 0xa3, 0xec, 0xd8, 0x32, 0xa3, 0xe4, 0x21, 0xc1, 0xc1, 0x28, 0x37,
+	0x91, 0xf8, 0xa6, 0x8f, 0x0f, 0xf8, 0x78, 0x7b, 0xff, 0x5a, 0xb8, 0x75, 0xf3, 0x26, 0x16, 0x0b,
+	0x52, 0x40, 0x02, 0xfc, 0xfd, 0x21, 0x2c, 0x34, 0x14, 0x12, 0xe2, 0xe3, 0xf1, 0x77, 0x1a, 0x1c,
+	0x1e, 0xe0, 0xef, 0xec, 0xd6, 0xa5, 0x6b, 0xa5, 0x76, 0x72, 0xd0, 0x11, 0x86, 0x86, 0xa6, 0xb9,
+	0x84, 0x9b, 0xe8, 0xf2, 0x2f, 0x16, 0x4a, 0xd5, 0x37, 0xbc, 0xb8, 0x17, 0x3a, 0x0f, 0xd7, 0x89,
+	0x1f, 0x7a, 0xe3, 0x00, 0x24, 0x47, 0xdc, 0x87, 0xbc, 0x9c, 0x6c, 0x5d, 0xcb, 0x58, 0x94, 0x91,
+	0x00, 0x55, 0xf5, 0x9c, 0x0e, 0xfc, 0xed, 0xeb, 0x57, 0x6c, 0x2d, 0x51, 0x22, 0xa3, 0xdd, 0x7c,
+	0x6c, 0x75, 0x63, 0xa2, 0xa3, 0xb1, 0x65, 0xc6, 0xd6, 0x9b, 0x08, 0xe9, 0xed, 0xe5, 0xf5, 0x5b,
+	0xe7, 0xc4, 0xf1, 0xe3, 0x30, 0x71, 0xc2, 0x44, 0x2c, 0x40, 0xa2, 0xe1, 0x01, 0x72, 0xf2, 0xf8,
+	0x09, 0x50, 0xb1, 0x4a, 0x7c, 0x34, 0xf8, 0x96, 0x65, 0xd9, 0x91, 0x0c, 0x0d, 0x4d, 0x73, 0x08,
+	0xde, 0xdd, 0x46, 0xf9, 0x91, 0xd5, 0xb3, 0x46, 0x43, 0xa8, 0xc7, 0x41, 0xc8, 0x4c, 0x8e, 0xc1,
+	0xd6, 0x0f, 0x2f, 0x7c, 0x11, 0xb9, 0x99, 0x69, 0x50, 0x96, 0x93, 0x0a, 0x6f, 0x5e, 0xbd, 0x84,
+	0x17, 0x2f, 0x5e, 0x40, 0x79, 0x79, 0x19, 0x0a, 0x23, 0x1c, 0xdf, 0xd7, 0x69, 0xed, 0xb1, 0x85,
+	0xc7, 0xee, 0x36, 0x8e, 0xa5, 0x6f, 0xdf, 0xba, 0x05, 0x5e, 0x9e, 0x9e, 0x92, 0xc0, 0xd7, 0x62,
+	0x91, 0xc0, 0x96, 0x39, 0x35, 0x35, 0x15, 0x3f, 0x9f, 0xdc, 0x99, 0xaf, 0xa8, 0xa8, 0x40, 0xf0,
+	0xbb, 0x11, 0xd2, 0xe3, 0xf8, 0xfc, 0xe9, 0x93, 0x80, 0xd7, 0xaf, 0x5f, 0xc3, 0xf3, 0xe7, 0xcf,
+	0xf1, 0xf5, 0xf8, 0xfd, 0xa4, 0xeb, 0xef, 0xeb, 0xeb, 0x5b, 0xef, 0x77, 0xe1, 0x90, 0xc1, 0x65,
+	0xaa, 0x0b, 0xd8, 0x0e, 0xb2, 0x85, 0x51, 0x23, 0x47, 0x61, 0x8f, 0xc0, 0xe0, 0x4d, 0xc3, 0x99,
+	0xd3, 0x66, 0x7c, 0xe3, 0x97, 0x0b, 0xd3, 0xb9, 0x01, 0x34, 0xcd, 0x65, 0x53, 0x90, 0x01, 0x7c,
+	0x01, 0x38, 0xb6, 0x7b, 0x35, 0xe4, 0xeb, 0x5a, 0x3d, 0x1d, 0xbc, 0x00, 0x88, 0xa4, 0xc7, 0x78,
+	0x28, 0x6c, 0x78, 0x78, 0x18, 0x76, 0xb1, 0x89, 0x60, 0x9e, 0x1e, 0x1e, 0x3f, 0x25, 0x88, 0x93,
+	0x1d, 0x7b, 0x08, 0x28, 0xf5, 0xb7, 0x6f, 0xdf, 0xfe, 0x9f, 0xbd, 0x6b, 0x00, 0x92, 0x24, 0x89,
+	0xa2, 0x75, 0xa1, 0x0b, 0x1f, 0x43, 0x67, 0x76, 0x57, 0xf7, 0xad, 0x86, 0x8b, 0xb1, 0x6d, 0x23,
+	0x6e, 0x6d, 0x7b, 0x6e, 0x6c, 0xac, 0x6d, 0xfb, 0xb8, 0xb6, 0x75, 0xb6, 0x6d, 0xdb, 0x52, 0x5e,
+	0xbf, 0x8a, 0xfe, 0x17, 0x35, 0x5b, 0xd9, 0xd5, 0x35, 0x8a, 0xc9, 0xb9, 0xcb, 0x17, 0xf1, 0x8e,
+	0x3b, 0xd3, 0x88, 0x7c, 0xaf, 0xfe, 0xff, 0xf9, 0xf3, 0x67, 0xa7, 0x4f, 0x22, 0xfa, 0xf3, 0xcf,
+	0x3f, 0xd9, 0x47, 0x1f, 0x7d, 0x84, 0xd0, 0xdf, 0xf0, 0xda, 0x3b, 0xb6, 0x6f, 0xd7, 0xc4, 0x4f,
+	0xcc, 0xcd, 0xc9, 0x65, 0x8f, 0x3e, 0xf2, 0x88, 0x61, 0xf7, 0x00, 0x35, 0x89, 0xfe, 0x01, 0x81,
+	0x5a, 0x2a, 0x80, 0x81, 0xaa, 0x8a, 0x84, 0xc4, 0x7f, 0x60, 0x30, 0x68, 0x39, 0x19, 0xc0, 0xa9,
+	0x63, 0x87, 0xad, 0x0a, 0xdf, 0x10, 0xe6, 0x3f, 0xf5, 0xd4, 0x93, 0xec, 0xec, 0xd9, 0x33, 0x06,
+	0xd1, 0xef, 0xda, 0xb9, 0x93, 0x4b, 0xfc, 0xbf, 0x33, 0xa7, 0x4f, 0xb3, 0xb7, 0xdf, 0x7e, 0x5b,
+	0x27, 0xf8, 0x2e, 0x27, 0x44, 0xdc, 0xfa, 0x7d, 0xb8, 0x58, 0x5d, 0x55, 0x0d, 0xe1, 0xb7, 0x62,
+	0x4d, 0x75, 0x0d, 0x72, 0x7f, 0x98, 0x12, 0x19, 0x81, 0xc6, 0xc5, 0x8b, 0x16, 0xa1, 0x37, 0x00,
+	0xfc, 0xdc, 0x61, 0x73, 0x64, 0x28, 0x12, 0x12, 0xff, 0x85, 0xbb, 0x01, 0xc2, 0x42, 0x42, 0x0d,
+	0xc2, 0x87, 0xe0, 0xbd, 0x08, 0x1f, 0x5b, 0x70, 0x08, 0xd5, 0x51, 0xb4, 0xe3, 0x0a, 0x7d, 0xe7,
+	0x8e, 0x1d, 0x7a, 0xa2, 0xc0, 0x87, 0xdf, 0xc3, 0x99, 0xe0, 0xdb, 0xb5, 0xfc, 0xf5, 0x97, 0x5f,
+	0x20, 0x68, 0xc3, 0xfb, 0x81, 0x59, 0x8d, 0x1a, 0x39, 0x0a, 0xa2, 0x37, 0x10, 0xef, 0x1f, 0x3f,
+	0xa3, 0x37, 0x02, 0x70, 0xfc, 0xd8, 0x71, 0xbf, 0xbb, 0x07, 0x88, 0x1e, 0xea, 0x75, 0x7b, 0xaf,
+	0x1b, 0x15, 0x09, 0x89, 0x9e, 0x0a, 0x87, 0xaa, 0x9e, 0xc5, 0x62, 0xce, 0xcb, 0xc9, 0x6d, 0x53,
+	0x98, 0xff, 0xe8, 0xa3, 0x8f, 0xa0, 0x82, 0x8e, 0x27, 0x39, 0x84, 0xe4, 0x91, 0x08, 0xaf, 0xf5,
+	0x44, 0x08, 0x8e, 0x9f, 0xc3, 0xb6, 0xde, 0x63, 0xee, 0x7d, 0xf9, 0x37, 0xdf, 0x7c, 0x53, 0xcb,
+	0xeb, 0xbf, 0xfa, 0xf2, 0x4b, 0xf6, 0xfd, 0xf7, 0xdf, 0x83, 0x1d, 0x36, 0x08, 0xfc, 0xfc, 0xe7,
+	0x9f, 0x7f, 0x8e, 0x2a, 0x3e, 0x6a, 0x10, 0x28, 0xf4, 0x69, 0xaf, 0xbf, 0x7d, 0xdb, 0xb6, 0x56,
+	0x5c, 0xbf, 0x6e, 0x1d, 0xc4, 0xce, 0xe5, 0x8c, 0xe9, 0xd3, 0xb1, 0xa3, 0x41, 0x5b, 0x93, 0x64,
+	0x04, 0xda, 0x67, 0x08, 0x0f, 0x0b, 0xfb, 0xd6, 0x7d, 0x9f, 0x60, 0xad, 0x22, 0x21, 0xd1, 0x43,
+	0x77, 0x00, 0x2e, 0xc7, 0x61, 0x17, 0x2c, 0xe4, 0x49, 0x13, 0x26, 0x5a, 0x12, 0xfe, 0xf3, 0xcf,
+	0x3f, 0x87, 0xd0, 0x1d, 0xa1, 0x33, 0x04, 0xd4, 0x25, 0xdc, 0xb6, 0x75, 0xab, 0x27, 0x62, 0x0b,
+	0x0f, 0x05, 0x42, 0x33, 0xd2, 0xef, 0xb0, 0x42, 0x84, 0xf4, 0x10, 0xbb, 0x47, 0x1e, 0x3c, 0x70,
+	0x10, 0xcd, 0x47, 0x06, 0x23, 0x98, 0x3f, 0x6f, 0x1e, 0x73, 0x1f, 0x19, 0xfe, 0xd4, 0x69, 0xb7,
+	0xa7, 0x29, 0x12, 0x12, 0x3d, 0x0d, 0xbd, 0xee, 0xbc, 0xd3, 0x41, 0xf9, 0x7f, 0x7d, 0x5d, 0x9d,
+	0xb7, 0x6e, 0x3d, 0x54, 0xe4, 0xf1, 0x24, 0xb5, 0x2c, 0xae, 0xad, 0x5b, 0xb6, 0x08, 0x4d, 0x44,
+	0x28, 0x53, 0x26, 0x4f, 0x36, 0x35, 0x80, 0xcd, 0x9b, 0x36, 0xb1, 0xa7, 0x9f, 0x7c, 0x12, 0xa9,
+	0x4e, 0x2b, 0x23, 0xc0, 0x3f, 0x0f, 0x1b, 0x32, 0xe4, 0x3b, 0xf7, 0xf8, 0xb0, 0x03, 0x36, 0x9b,
+	0xed, 0x7a, 0x45, 0x42, 0xa2, 0x27, 0xc1, 0x69, 0xb7, 0x17, 0x93, 0x01, 0xac, 0x59, 0xbd, 0xda,
+	0x6c, 0xff, 0x1e, 0x8d, 0x3a, 0x6d, 0x16, 0xf5, 0x96, 0xcd, 0x9b, 0x85, 0x26, 0xd2, 0x97, 0xac,
+	0xcc, 0x2c, 0x53, 0x03, 0x98, 0x37, 0x77, 0x2e, 0x0a, 0x87, 0xd4, 0x66, 0xdc, 0xca, 0x08, 0xd0,
+	0xc3, 0x10, 0x1c, 0x14, 0xfc, 0x95, 0xbb, 0x41, 0x48, 0x9e, 0x18, 0x94, 0xe8, 0x59, 0xc0, 0x31,
+	0x57, 0x32, 0x00, 0xe4, 0xe5, 0x9c, 0x6e, 0x3d, 0x2c, 0x76, 0xb4, 0xd5, 0xb6, 0x47, 0x60, 0x78,
+	0x7a, 0x0a, 0xcd, 0x65, 0x4b, 0x97, 0x42, 0xe4, 0x66, 0x84, 0x31, 0xe2, 0x3c, 0x01, 0x4c, 0xc0,
+	0x60, 0x04, 0xe0, 0xf2, 0x65, 0xcb, 0xa8, 0x4d, 0xf8, 0x0f, 0x39, 0x49, 0x58, 0xa2, 0x47, 0xc1,
+	0xa7, 0x6f, 0xbf, 0x97, 0xb0, 0x78, 0x43, 0x83, 0x43, 0x3c, 0x1d, 0xca, 0x41, 0x4e, 0xdd, 0x6e,
+	0x81, 0x6d, 0xda, 0xb8, 0x51, 0x68, 0xb6, 0x34, 0xb7, 0x78, 0x35, 0x80, 0x75, 0x6b, 0xd7, 0x21,
+	0xf5, 0x41, 0xbb, 0x32, 0xc8, 0x35, 0x83, 0x8c, 0xf4, 0x74, 0x2a, 0x08, 0xee, 0x56, 0x24, 0x24,
+	0x7a, 0x02, 0x6c, 0x36, 0x5b, 0x00, 0x3d, 0xfd, 0xcb, 0x4b, 0xcb, 0xb8, 0xa7, 0xf1, 0x10, 0xfe,
+	0xa6, 0x24, 0x27, 0xe3, 0x5c, 0x7c, 0xbb, 0x04, 0xb6, 0x91, 0xc7, 0x0d, 0x1b, 0x44, 0x20, 0xd2,
+	0x19, 0x6c, 0xe7, 0x99, 0x89, 0x1f, 0x0d, 0x41, 0x88, 0x7e, 0xd0, 0x14, 0x04, 0x13, 0xf0, 0x68,
+	0x04, 0xab, 0x57, 0xad, 0x62, 0x4e, 0xd5, 0x81, 0xfb, 0x04, 0x7e, 0x52, 0x55, 0x35, 0x45, 0x91,
+	0x90, 0xe8, 0x41, 0xf9, 0x3f, 0xc4, 0xaa, 0x17, 0x3e, 0x88, 0xfd, 0x7a, 0x6c, 0x75, 0xb1, 0x81,
+	0x03, 0x06, 0xb0, 0x91, 0x23, 0x46, 0x74, 0x96, 0xf0, 0x60, 0x26, 0x42, 0x10, 0xf9, 0x7f, 0x5a,
+	0x6a, 0xaa, 0x99, 0x01, 0xe0, 0x73, 0xe3, 0xdc, 0x02, 0x9d, 0x1e, 0xf4, 0x68, 0x04, 0x60, 0x7e,
+	0x6e, 0xde, 0xaf, 0xee, 0xef, 0xf3, 0xb4, 0x22, 0x21, 0x21, 0x3a, 0x5c, 0xe3, 0xae, 0x5e, 0xc3,
+	0x82, 0x75, 0xa5, 0x01, 0x58, 0xc8, 0x86, 0x63, 0xb8, 0xc3, 0x86, 0x0e, 0x65, 0x21, 0xc1, 0xc1,
+	0x6c, 0xd0, 0xc0, 0x81, 0x6c, 0x40, 0xff, 0x01, 0xac, 0xaa, 0xb2, 0xca, 0x93, 0x98, 0xb0, 0x97,
+	0xde, 0x25, 0x5c, 0xb7, 0x76, 0x6d, 0x97, 0x71, 0xe1, 0x82, 0x05, 0x5e, 0xc3, 0xff, 0x65, 0x4b,
+	0x97, 0xe1, 0x1c, 0x01, 0x4c, 0x40, 0x6f, 0x04, 0x3c, 0x33, 0x40, 0x41, 0xb0, 0xe7, 0xcd, 0x0d,
+	0x90, 0x90, 0x93, 0x80, 0x27, 0x4e, 0x98, 0x60, 0x18, 0xba, 0xb1, 0x67, 0xf7, 0x6e, 0x16, 0x19,
+	0x11, 0xc1, 0xc2, 0x42, 0x43, 0x59, 0x70, 0x50, 0x90, 0x16, 0x05, 0x44, 0x47, 0x45, 0xe3, 0xc4,
+	0x5c, 0xc7, 0x84, 0xb7, 0x66, 0x0d, 0x5b, 0x2b, 0x08, 0x6b, 0xaa, 0xab, 0x4d, 0xc5, 0x3f, 0x64,
+	0xf0, 0x60, 0x9c, 0x0c, 0xc4, 0xee, 0x07, 0x4c, 0x80, 0x48, 0x46, 0xc0, 0x8d, 0x0a, 0x8a, 0x0a,
+	0x0b, 0x99, 0xfb, 0x9c, 0xc0, 0x61, 0x45, 0x42, 0x42, 0x54, 0x04, 0x0d, 0x1a, 0xa4, 0xdd, 0x06,
+	0xe4, 0xdb, 0xcf, 0x07, 0xa1, 0xb0, 0x61, 0xda, 0xce, 0xec, 0x59, 0xb3, 0x58, 0x54, 0x64, 0xa4,
+	0x96, 0x02, 0x84, 0x86, 0x84, 0x30, 0xd7, 0x9f, 0x87, 0x09, 0xa0, 0x65, 0xb6, 0x23, 0xa2, 0x43,
+	0x45, 0x5d, 0x08, 0xc2, 0x8c, 0xa6, 0x4f, 0x9b, 0x6e, 0x6a, 0x00, 0xe5, 0x65, 0xe5, 0x68, 0x78,
+	0xd2, 0x3a, 0x16, 0xcf, 0x9d, 0x3d, 0x0b, 0x92, 0x19, 0xf0, 0xa2, 0x02, 0x18, 0x01, 0x26, 0x09,
+	0xbb, 0xa3, 0x00, 0xc7, 0xfb, 0xaa, 0xaa, 0xda, 0x14, 0x09, 0x09, 0x01, 0x8f, 0xff, 0xde, 0xe1,
+	0x0a, 0xfb, 0xbf, 0xc6, 0x42, 0x1d, 0x36, 0x64, 0x28, 0x77, 0xcc, 0xd6, 0x90, 0x21, 0x83, 0x59,
+	0x74, 0x54, 0x14, 0x45, 0x01, 0x94, 0x0a, 0x60, 0x28, 0x06, 0xab, 0xaf, 0xab, 0x6f, 0xaf, 0xf0,
+	0x50, 0x2c, 0x13, 0x82, 0x30, 0xa3, 0xc2, 0x82, 0x42, 0x8f, 0xe2, 0xc7, 0x5c, 0x00, 0x34, 0x3c,
+	0xe1, 0x58, 0xf0, 0xe9, 0xd3, 0xa7, 0xc9, 0x08, 0x40, 0x53, 0x23, 0xc0, 0x7c, 0x83, 0x90, 0xa0,
+	0x60, 0x14, 0x03, 0x99, 0xd3, 0x6e, 0x1f, 0xa3, 0x48, 0x48, 0x88, 0x86, 0xc8, 0xc8, 0xc8, 0x11,
+	0x14, 0xfe, 0xcf, 0x9b, 0x33, 0x97, 0x3b, 0x54, 0x33, 0x33, 0x33, 0x83, 0xc5, 0xc6, 0xc4, 0x68,
+	0x51, 0x40, 0x44, 0x78, 0xb8, 0x16, 0x05, 0x50, 0x2a, 0x90, 0x9f, 0x97, 0xcf, 0x56, 0x2c, 0x5f,
+	0xde, 0x2e, 0xe1, 0xad, 0x5a, 0xb9, 0x52, 0x04, 0xe2, 0xe6, 0x1f, 0xd3, 0xa7, 0x7f, 0x6d, 0x4d,
+	0x2d, 0xa6, 0x13, 0x61, 0x04, 0x19, 0x08, 0x23, 0x00, 0x61, 0x04, 0xa0, 0xde, 0x08, 0x0c, 0x66,
+	0x30, 0x66, 0xf4, 0x68, 0x8a, 0x02, 0xce, 0x2b, 0x12, 0x12, 0xa2, 0x61, 0xe0, 0x80, 0x81, 0xda,
+	0xf8, 0xaf, 0xd8, 0xe8, 0x18, 0x2c, 0x6e, 0xc3, 0x34, 0x5d, 0x30, 0x27, 0x27, 0x9b, 0xc5, 0xc5,
+	0xc5, 0xb2, 0x98, 0xe8, 0x68, 0x44, 0x01, 0x48, 0x05, 0x10, 0x05, 0x20, 0x15, 0xd0, 0x0a, 0x82,
+	0x33, 0x67, 0xcc, 0x68, 0x8f, 0xf0, 0x50, 0x43, 0x10, 0x81, 0xe8, 0xe3, 0xf7, 0x28, 0xfe, 0xd4,
+	0x94, 0x54, 0xd4, 0x40, 0x70, 0xc2, 0x11, 0x84, 0x11, 0x80, 0xa6, 0x46, 0xa0, 0x8f, 0x0a, 0x60,
+	0x2e, 0x6e, 0x83, 0xfd, 0xd2, 0x66, 0xb3, 0xf5, 0x55, 0x24, 0x24, 0x44, 0x9a, 0xfe, 0xe3, 0x54,
+	0x1d, 0x7f, 0x53, 0xf8, 0xef, 0x69, 0x9a, 0xee, 0xa8, 0x51, 0x23, 0x59, 0x42, 0x42, 0x3c, 0x8b,
+	0x8d, 0x8d, 0x41, 0x2a, 0x80, 0x28, 0x80, 0x0a, 0x82, 0x48, 0x05, 0xb0, 0x7d, 0x86, 0x1e, 0x81,
+	0xb6, 0x0a, 0x0f, 0x91, 0x83, 0x10, 0x9c, 0x35, 0x73, 0x16, 0x57, 0xfc, 0x29, 0x49, 0xc9, 0x38,
+	0x1c, 0x84, 0xae, 0x48, 0x4c, 0x30, 0xc2, 0x50, 0x51, 0x9e, 0x11, 0x80, 0x94, 0x1e, 0xf0, 0xa2,
+	0x02, 0x5c, 0x28, 0xf2, 0xa7, 0xfb, 0x42, 0x91, 0x09, 0x8a, 0x84, 0x84, 0x28, 0x08, 0x09, 0x0a,
+	0xda, 0xa6, 0xdb, 0xfb, 0xf7, 0x38, 0x46, 0xbb, 0xaa, 0xaa, 0x92, 0x25, 0x25, 0x25, 0xb2, 0xf8,
+	0xf8, 0x38, 0x16, 0x13, 0x13, 0xcd, 0x2d, 0x08, 0x8e, 0x1e, 0x35, 0xaa, 0x6d, 0xc2, 0x5b, 0xb6,
+	0x8c, 0x2d, 0x17, 0x80, 0x88, 0x44, 0x46, 0x8f, 0x1a, 0xcd, 0x35, 0x80, 0xd2, 0x7b, 0xee, 0x41,
+	0xe5, 0x1f, 0xcd, 0x3f, 0xa0, 0xde, 0x08, 0x40, 0xab, 0x51, 0x81, 0x7e, 0x37, 0x60, 0x83, 0x22,
+	0x21, 0x21, 0x0a, 0xfc, 0x7c, 0xfd, 0x3e, 0xc6, 0xc2, 0x0c, 0x1a, 0x38, 0x08, 0x82, 0x37, 0xce,
+	0xcf, 0x7f, 0xfc, 0x31, 0x50, 0xcb, 0xd7, 0x93, 0x93, 0x93, 0x58, 0x62, 0x62, 0x02, 0x52, 0x01,
+	0x6e, 0x41, 0x10, 0x82, 0xa9, 0xab, 0xad, 0x45, 0x3f, 0x7d, 0xd7, 0x70, 0xc9, 0x12, 0xb6, 0xb4,
+	0x0b, 0x08, 0x13, 0xc8, 0xc9, 0xce, 0x31, 0x88, 0x7f, 0xf8, 0xb0, 0xe1, 0x38, 0x46, 0x8c, 0xf9,
+	0x80, 0x30, 0x01, 0x83, 0x11, 0x90, 0x19, 0x78, 0x33, 0x02, 0x44, 0x05, 0xe8, 0xac, 0x74, 0xb7,
+	0x06, 0x7f, 0xa3, 0x48, 0x48, 0x88, 0x80, 0x7e, 0xb7, 0xdc, 0x72, 0x25, 0x3d, 0xfd, 0x4b, 0x66,
+	0xcd, 0x86, 0xe0, 0x0d, 0xc2, 0x7f, 0xec, 0xb1, 0x47, 0x41, 0x6d, 0xd8, 0x47, 0x51, 0x51, 0x21,
+	0xa2, 0x00, 0xa4, 0x02, 0x9e, 0x0a, 0x82, 0xa8, 0x96, 0x5b, 0x16, 0xde, 0x92, 0xc5, 0x8b, 0x45,
+	0x20, 0xcc, 0x8d, 0xfb, 0xf4, 0x5f, 0xbc, 0x68, 0x31, 0xdb, 0xbf, 0x6f, 0x1f, 0x2a, 0xf9, 0x18,
+	0x6b, 0x06, 0x23, 0x20, 0x33, 0x30, 0x8b, 0x0a, 0xb8, 0xe9, 0x01, 0x4c, 0x86, 0xbe, 0x6b, 0x9b,
+	0xcd, 0x76, 0xad, 0x22, 0x21, 0x21, 0xc0, 0xf0, 0xcf, 0x71, 0xb4, 0x28, 0x31, 0xea, 0x8a, 0x27,
+	0x7c, 0x90, 0x9a, 0x5a, 0xe6, 0xb4, 0xb4, 0xb0, 0x94, 0x94, 0x64, 0x2d, 0x0a, 0x88, 0x8f, 0x8b,
+	0xe3, 0x16, 0x04, 0x23, 0xc2, 0x23, 0x58, 0x59, 0x69, 0xa9, 0x15, 0xe1, 0x21, 0xb7, 0x16, 0x82,
+	0x2d, 0xcd, 0xcd, 0x9c, 0xd0, 0xbf, 0x14, 0xad, 0xcf, 0x20, 0x4c, 0x80, 0x8c, 0x80, 0xcc, 0xc0,
+	0xcc, 0x08, 0xb8, 0x51, 0x01, 0xd2, 0x2b, 0xfa, 0xae, 0x7b, 0xdb, 0x6c, 0xaa, 0x22, 0x21, 0xd1,
+	0xdd, 0x08, 0x0e, 0x0a, 0xde, 0x47, 0xad, 0xbf, 0x68, 0x5a, 0x81, 0xf0, 0x2f, 0x15, 0x3d, 0x88,
+	0xff, 0x07, 0xa2, 0xb9, 0x65, 0xf8, 0xf0, 0x61, 0x48, 0x05, 0x10, 0x05, 0xb8, 0x84, 0x12, 0xcb,
+	0x2d, 0x08, 0x66, 0x66, 0x64, 0x5a, 0x11, 0x1e, 0xaa, 0xe3, 0x42, 0xb0, 0x64, 0x76, 0x89, 0x61,
+	0xec, 0x17, 0xa6, 0x0c, 0xa1, 0xf2, 0x4f, 0xb7, 0x0b, 0x71, 0xcc, 0x80, 0x17, 0x15, 0x98, 0xa5,
+	0x07, 0x42, 0xb5, 0x05, 0x4b, 0x48, 0x5c, 0xe6, 0xeb, 0xe3, 0xf3, 0x21, 0x16, 0x24, 0x0e, 0xb8,
+	0x78, 0x13, 0x3e, 0x11, 0xa1, 0x2c, 0x7a, 0x02, 0xa8, 0x20, 0x48, 0xa9, 0x40, 0x78, 0x78, 0x38,
+	0x15, 0x04, 0x61, 0x04, 0xd8, 0x16, 0x34, 0x17, 0xde, 0x82, 0x05, 0x6c, 0xa1, 0x20, 0x9c, 0x3c,
+	0x69, 0x32, 0x89, 0x5f, 0xdb, 0xb3, 0xdf, 0xb4, 0x71, 0x13, 0x0c, 0x40, 0x3f, 0x6a, 0x0c, 0x66,
+	0x60, 0x66, 0x04, 0x5e, 0xa3, 0x02, 0xfc, 0x2c, 0x19, 0x80, 0x08, 0x1d, 0x81, 0x12, 0xb2, 0xf7,
+	0xdf, 0x8f, 0x16, 0x64, 0x7d, 0x7d, 0xbd, 0x5e, 0xf4, 0x06, 0xe1, 0xa3, 0xa3, 0x8d, 0x78, 0xf1,
+	0xe2, 0x05, 0x36, 0x65, 0xca, 0x64, 0x2a, 0x08, 0x72, 0x7b, 0x03, 0x10, 0x05, 0xa4, 0xa6, 0xa4,
+	0x98, 0x8a, 0x6e, 0xc1, 0xfc, 0xf9, 0xc2, 0x70, 0xec, 0x98, 0xb1, 0x9a, 0xf8, 0x13, 0xe2, 0xe2,
+	0x61, 0x70, 0xe8, 0xf8, 0xc3, 0x41, 0x1e, 0x4c, 0x35, 0x06, 0xf5, 0x66, 0xc0, 0x8b, 0x0a, 0x2c,
+	0xa5, 0x07, 0x98, 0x34, 0x4c, 0xdf, 0xb7, 0x9c, 0x1a, 0x2c, 0x21, 0x82, 0x01, 0x64, 0xd1, 0x82,
+	0xc4, 0x39, 0x78, 0xde, 0xd3, 0x5e, 0x2f, 0x7a, 0xe2, 0x85, 0x0b, 0xe7, 0x35, 0x71, 0x8c, 0x1f,
+	0x3f, 0x0e, 0x51, 0x80, 0x69, 0x6f, 0xc0, 0xd4, 0x29, 0x53, 0x3c, 0x89, 0x0e, 0x8d, 0x37, 0x22,
+	0x10, 0xa9, 0x08, 0x0a, 0x97, 0x94, 0xf7, 0x43, 0xa8, 0x20, 0x4c, 0xc0, 0x9b, 0x11, 0x80, 0x56,
+	0xd3, 0x03, 0x8c, 0x43, 0x13, 0xaa, 0x08, 0x28, 0x21, 0x0b, 0x80, 0xf9, 0xb4, 0x20, 0xd1, 0xa8,
+	0x62, 0x45, 0xf8, 0xe0, 0xf9, 0xf3, 0xe7, 0x40, 0x08, 0x01, 0xcd, 0x41, 0x5a, 0x14, 0xa0, 0xf5,
+	0x06, 0x44, 0x1b, 0x7b, 0x03, 0xb2, 0xb3, 0xb2, 0x50, 0x38, 0x44, 0x83, 0x50, 0x67, 0x10, 0x07,
+	0x6b, 0x3a, 0x9b, 0x88, 0x46, 0x30, 0xbd, 0x87, 0x15, 0x16, 0x14, 0xe0, 0x40, 0x10, 0x5d, 0x50,
+	0xc2, 0x33, 0x02, 0xbd, 0x19, 0x58, 0x4d, 0x0f, 0xc8, 0x0c, 0x60, 0xb2, 0xfa, 0x14, 0xe0, 0x16,
+	0x45, 0x42, 0xa2, 0x3b, 0xe1, 0xe7, 0xe3, 0x53, 0x83, 0xc5, 0x88, 0xc3, 0x3c, 0x9c, 0x30, 0x9f,
+	0x44, 0x6f, 0x10, 0x3e, 0xcc, 0x82, 0x88, 0xd0, 0x76, 0xf0, 0xe0, 0xbb, 0xa9, 0x20, 0xc8, 0xeb,
+	0x0d, 0x40, 0x14, 0xc0, 0x13, 0x1e, 0x8c, 0x41, 0x08, 0xd2, 0x08, 0xf0, 0xc9, 0x93, 0x26, 0xd1,
+	0x3d, 0x05, 0x98, 0x0c, 0x0c, 0x23, 0xe0, 0x99, 0x41, 0x7b, 0xd2, 0x03, 0x10, 0xcd, 0x46, 0x64,
+	0x00, 0xbf, 0xc8, 0x3b, 0x04, 0x25, 0xba, 0x1d, 0x7e, 0xfd, 0x7c, 0x77, 0x63, 0x41, 0xe6, 0xe6,
+	0xe4, 0xb4, 0x59, 0xf8, 0xd4, 0xeb, 0x8e, 0x6b, 0xbf, 0xf6, 0xec, 0xd9, 0xcd, 0xa6, 0x4d, 0x9d,
+	0x8a, 0x28, 0x80, 0xd7, 0x1b, 0x40, 0x51, 0x40, 0x6b, 0x36, 0x37, 0xb3, 0x16, 0x31, 0x48, 0x87,
+	0x80, 0x90, 0x96, 0xe8, 0xef, 0x21, 0x20, 0x23, 0x00, 0xad, 0x1a, 0x81, 0x69, 0x54, 0x30, 0x6d,
+	0xca, 0x54, 0x3a, 0x10, 0x74, 0x9f, 0x22, 0x21, 0xd1, 0xdd, 0xe8, 0xdb, 0xa7, 0xcf, 0x05, 0x2c,
+	0xc8, 0x11, 0xc3, 0x87, 0x7b, 0x08, 0xf3, 0x41, 0xa3, 0xe8, 0x49, 0xf8, 0x20, 0x2e, 0xfb, 0x24,
+	0x56, 0x54, 0x94, 0xc3, 0x04, 0xb8, 0xbd, 0x01, 0xd8, 0x11, 0xd0, 0x8b, 0xae, 0xb9, 0xa9, 0x49,
+	0x14, 0x42, 0xf8, 0x30, 0x00, 0x84, 0xff, 0x34, 0xba, 0x1c, 0xe1, 0xba, 0xde, 0x08, 0x40, 0xbd,
+	0x11, 0xb4, 0x2b, 0x2a, 0x28, 0x2e, 0x2c, 0xa2, 0x4e, 0xc0, 0x72, 0x45, 0x42, 0xa2, 0xbb, 0xe1,
+	0xeb, 0xe3, 0xab, 0x4d, 0xff, 0x1d, 0x35, 0x72, 0xa4, 0xd5, 0xa7, 0xbd, 0x41, 0xf8, 0xa7, 0x4f,
+	0x83, 0xa7, 0x34, 0x9e, 0x3a, 0x75, 0x92, 0x2d, 0x5c, 0xb8, 0x80, 0x15, 0xe4, 0xe7, 0x1b, 0x0a,
+	0x82, 0x88, 0x32, 0xf4, 0xa2, 0x6b, 0x6a, 0x6c, 0x14, 0x86, 0x28, 0x04, 0x66, 0xa4, 0x67, 0xa0,
+	0x51, 0x07, 0x53, 0x8b, 0x69, 0x7c, 0x39, 0xdf, 0x08, 0xda, 0x9f, 0x1e, 0x60, 0x87, 0x41, 0x33,
+	0x00, 0xbb, 0xdd, 0x9e, 0xad, 0x48, 0x48, 0x74, 0xff, 0x19, 0x00, 0xdf, 0x57, 0xb0, 0x20, 0x67,
+	0xcd, 0x9c, 0xd9, 0x0e, 0xe1, 0x9f, 0x6a, 0x25, 0x7c, 0x90, 0x5a, 0x5e, 0xf7, 0xef, 0xdf, 0xcf,
+	0x86, 0x0e, 0x19, 0x62, 0x28, 0x08, 0x62, 0xa2, 0x10, 0x89, 0xae, 0xb1, 0xa1, 0x41, 0x14, 0x22,
+	0x22, 0xc1, 0x20, 0x10, 0x0c, 0x27, 0x85, 0x09, 0x90, 0x11, 0x80, 0x7a, 0x23, 0x30, 0x31, 0x03,
+	0xef, 0x45, 0x43, 0xfc, 0x7b, 0x2f, 0xe7, 0x5d, 0xda, 0xe5, 0xa1, 0xae, 0xab, 0xd7, 0x6e, 0x50,
+	0x24, 0x24, 0xba, 0x1b, 0x01, 0x7e, 0xfe, 0x6f, 0x69, 0x67, 0x00, 0x66, 0xcf, 0xb6, 0x18, 0xe6,
+	0x9b, 0x0b, 0x1f, 0xa4, 0xfe, 0x77, 0x34, 0xbe, 0x54, 0x94, 0x97, 0xb3, 0xf4, 0xb4, 0x34, 0x2a,
+	0x08, 0x6a, 0x55, 0x76, 0x12, 0x5d, 0x43, 0x7d, 0xbd, 0x50, 0x9c, 0x32, 0x79, 0x0a, 0x06, 0x8e,
+	0x62, 0x98, 0xa9, 0x99, 0x11, 0xb4, 0x37, 0x2a, 0xc0, 0x15, 0x6b, 0x9f, 0xe3, 0xbb, 0xc6, 0x9d,
+	0x8b, 0x8a, 0x84, 0x84, 0x08, 0x08, 0xf4, 0x0f, 0x78, 0x5b, 0x8b, 0x00, 0x66, 0xcc, 0xb4, 0x28,
+	0x7c, 0x12, 0x3d, 0x68, 0x14, 0x3d, 0x78, 0xe2, 0xc4, 0x71, 0x8d, 0xc7, 0x8f, 0x1f, 0xd3, 0xb8,
+	0xc5, 0x25, 0x98, 0x8c, 0x8c, 0x74, 0x44, 0x01, 0x9a, 0x09, 0x94, 0x97, 0x95, 0x41, 0x70, 0x10,
+	0x84, 0x48, 0x44, 0x54, 0x42, 0x43, 0x4a, 0xf5, 0x46, 0xe0, 0x2d, 0x2a, 0xb0, 0x5c, 0x34, 0x4c,
+	0x8c, 0x4f, 0x78, 0xdc, 0x7d, 0x5f, 0xe0, 0x4e, 0x45, 0x42, 0x42, 0x04, 0x0c, 0x0c, 0x1c, 0xf0,
+	0x02, 0x16, 0xe5, 0x84, 0x71, 0xe3, 0x3d, 0x84, 0xf9, 0xed, 0x17, 0xfe, 0xb1, 0x63, 0x47, 0xff,
+	0xe5, 0xee, 0xdd, 0x0f, 0xb1, 0xcc, 0x8c, 0x0c, 0x8a, 0x02, 0x70, 0x5c, 0xb8, 0x5d, 0xac, 0xad,
+	0xa9, 0xe9, 0x2a, 0xe2, 0xf7, 0x63, 0x38, 0x09, 0xe6, 0x02, 0x1a, 0x8c, 0xa0, 0x83, 0x51, 0x01,
+	0x7e, 0xe6, 0x1b, 0xa7, 0xea, 0xf8, 0x14, 0xdf, 0x35, 0x8f, 0xee, 0x9b, 0x98, 0xdf, 0x21, 0x3a,
+	0x55, 0xc7, 0x7b, 0x77, 0xa9, 0xce, 0x0f, 0x5a, 0xd1, 0xe1, 0xfc, 0xd8, 0x95, 0x42, 0x7c, 0xf2,
+	0x2f, 0x1d, 0x77, 0x69, 0x11, 0x85, 0x05, 0xd2, 0xef, 0x3d, 0xed, 0x50, 0xd5, 0xe3, 0x0e, 0xbb,
+	0x7d, 0xad, 0x6a, 0x53, 0x4b, 0xd0, 0x03, 0x82, 0x41, 0x30, 0x8a, 0xc4, 0xff, 0x17, 0x81, 0x7e,
+	0xfe, 0x47, 0xb1, 0x48, 0x30, 0xeb, 0xdf, 0x62, 0x7e, 0x0f, 0xea, 0x45, 0x6f, 0x2a, 0xfc, 0xa3,
+	0x47, 0x8f, 0x80, 0xe8, 0x85, 0x47, 0x15, 0x1c, 0x26, 0xa0, 0xed, 0x0e, 0x54, 0x55, 0x56, 0x62,
+	0xfc, 0xb6, 0x70, 0x44, 0x43, 0x10, 0x0d, 0x2a, 0xd5, 0x8c, 0x00, 0x74, 0x1b, 0x01, 0x27, 0x3d,
+	0xb0, 0x5c, 0x34, 0x2c, 0x99, 0x3e, 0xf9, 0x23, 0xff, 0x5e, 0x2a, 0x5d, 0x10, 0x22, 0x0e, 0x6d,
+	0xea, 0x1b, 0x38, 0x0e, 0xae, 0x48, 0x88, 0x7d, 0x5e, 0x1f, 0x5d, 0x63, 0x97, 0xd2, 0xe1, 0x70,
+	0x0c, 0xc0, 0x89, 0x32, 0x3d, 0x1d, 0x36, 0x47, 0xb4, 0xaa, 0xaa, 0x43, 0x2e, 0x25, 0x46, 0x50,
+	0xb9, 0x58, 0x7d, 0x29, 0xef, 0x52, 0x1d, 0xcf, 0x63, 0x21, 0x14, 0x17, 0x15, 0x99, 0x0b, 0xdf,
+	0xfc, 0x69, 0x0f, 0x1a, 0x44, 0x4f, 0xc2, 0x07, 0x8f, 0x1c, 0x39, 0x0c, 0x22, 0x17, 0xd6, 0x9a,
+	0x85, 0xc6, 0x8d, 0x1d, 0xcb, 0xaa, 0xab, 0xab, 0x8d, 0xac, 0xaa, 0xea, 0x56, 0xfe, 0xd3, 0xde,
+	0x5b, 0x80, 0x37, 0x95, 0x6d, 0x61, 0xff, 0x7f, 0x97, 0xcf, 0xe5, 0x0a, 0x4e, 0x81, 0xb6, 0xd1,
+	0xba, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x52, 0x77, 0xa7, 0x48, 0x71, 0x37, 0x1b, 0x74, 0x1c, 0x1d,
+	0x77, 0x17, 0x18, 0x77, 0xbb, 0xee, 0x66, 0xa3, 0xf0, 0x7e, 0x6b, 0x9d, 0xe4, 0x94, 0x26, 0x24,
+	0x69, 0x9a, 0x06, 0xe8, 0x2d, 0x3d, 0xcf, 0xf3, 0xce, 0xa0, 0xa5, 0x39, 0xe7, 0xac, 0xdf, 0x5e,
+	0xef, 0xda, 0x6b, 0xef, 0x4d, 0x36, 0x80, 0x9b, 0x75, 0xc4, 0xcd, 0x4a, 0x45, 0x10, 0xb0, 0x4c,
+	0xb2, 0x07, 0xa2, 0xf6, 0x14, 0xbb, 0x7d, 0xbf, 0x27, 0xdd, 0x02, 0xfb, 0x33, 0x57, 0xe1, 0x60,
+	0xf6, 0x6a, 0x1c, 0xc9, 0x5d, 0x83, 0xc3, 0xb9, 0x96, 0xd8, 0x95, 0x65, 0x85, 0xbd, 0xd9, 0x12,
+	0x1c, 0xc8, 0x95, 0x62, 0x5f, 0xae, 0x0c, 0x9b, 0x33, 0xe5, 0xd8, 0x96, 0x25, 0xc7, 0x8e, 0x6c,
+	0x05, 0x76, 0xe5, 0xda, 0x60, 0x47, 0xbe, 0x13, 0x36, 0x14, 0x07, 0xa1, 0xa5, 0x22, 0xff, 0x7a,
+	0x4d, 0x75, 0x0d, 0xa6, 0x8a, 0x7b, 0x0a, 0xda, 0x5b, 0xdb, 0x0c, 0x8a, 0xff, 0x0c, 0xff, 0xd9,
+	0xea, 0xaa, 0x6a, 0x61, 0xab, 0xb7, 0xdc, 0xec, 0x1c, 0x24, 0xc6, 0x27, 0x7c, 0xe7, 0xef, 0xeb,
+	0xf7, 0x2b, 0xca, 0x06, 0xfe, 0x35, 0x07, 0xce, 0x2d, 0x5c, 0xb8, 0x14, 0x12, 0x49, 0x38, 0xa5,
+	0x80, 0x67, 0xd5, 0x69, 0x20, 0xee, 0x84, 0xa2, 0x22, 0x23, 0xc5, 0xa0, 0x37, 0x7b, 0xe0, 0x8b,
+	0xba, 0x74, 0xe9, 0x22, 0x8b, 0x0b, 0x80, 0x9c, 0x09, 0xdc, 0x1c, 0x80, 0x94, 0x15, 0xf4, 0xde,
+	0x59, 0xf1, 0xf7, 0xc1, 0x36, 0x80, 0x21, 0x60, 0x0c, 0x08, 0x8c, 0x2a, 0x1a, 0xee, 0x1d, 0x6d,
+	0xfd, 0xd7, 0xce, 0xd4, 0x95, 0x10, 0x00, 0x90, 0xb5, 0x1a, 0x87, 0xb2, 0xd7, 0xe0, 0x28, 0x05,
+	0xff, 0x3d, 0xf9, 0x56, 0x38, 0x55, 0x68, 0x8d, 0xb3, 0xc5, 0x12, 0xdc, 0x5f, 0x2a, 0xc3, 0x43,
+	0x15, 0x72, 0x9c, 0xaf, 0x92, 0xe3, 0x62, 0x8d, 0x02, 0x8f, 0xd4, 0xd9, 0xe0, 0xf1, 0x06, 0x5b,
+	0x3c, 0xd5, 0x64, 0x87, 0x67, 0xd7, 0xda, 0xe3, 0x85, 0x56, 0x47, 0x3c, 0xd0, 0x9d, 0x80, 0xf1,
+	0xc1, 0x9e, 0xef, 0x79, 0xfb, 0x75, 0x73, 0x28, 0x2f, 0x37, 0xef, 0x4e, 0x2f, 0x4d, 0x5e, 0xb8,
+	0xbc, 0xdd, 0x9c, 0x8f, 0xce, 0x85, 0x54, 0xd0, 0xc7, 0xcd, 0xf9, 0x07, 0x73, 0xa4, 0xf9, 0xa2,
+	0xb4, 0x83, 0x9e, 0x75, 0xf1, 0xe2, 0x05, 0x41, 0x17, 0x2e, 0x9c, 0xe7, 0xbd, 0xf1, 0x6e, 0x0a,
+	0xbe, 0x9e, 0xee, 0xee, 0xb9, 0x20, 0xee, 0x0a, 0xe4, 0xbd, 0x0a, 0x19, 0x04, 0xda, 0x30, 0x60,
+	0x10, 0xcc, 0x28, 0x2b, 0xd8, 0xbd, 0x65, 0xfc, 0xeb, 0xed, 0xa9, 0xab, 0xb1, 0x8b, 0x00, 0xb0,
+	0x37, 0xc3, 0x02, 0x07, 0x08, 0x00, 0x87, 0x73, 0xd6, 0xe0, 0x58, 0x9e, 0x25, 0x4e, 0x14, 0x58,
+	0xe1, 0x74, 0x91, 0x35, 0xee, 0x2d, 0x91, 0xe2, 0xfe, 0x32, 0x35, 0x00, 0xaa, 0x15, 0xb8, 0x54,
+	0xa3, 0xc4, 0xa3, 0x04, 0x80, 0x27, 0x1a, 0xec, 0xf0, 0x74, 0x93, 0x3d, 0x9e, 0x5b, 0xeb, 0x80,
+	0x17, 0xdb, 0x1c, 0xf1, 0x4a, 0x87, 0x33, 0x5e, 0xee, 0x72, 0xc7, 0xb1, 0xfe, 0xe2, 0x6b, 0xe6,
+	0x82, 0x00, 0xb7, 0x80, 0xdf, 0xa1, 0x73, 0x0b, 0x17, 0xae, 0xc2, 0xe4, 0x88, 0xb1, 0xc9, 0xdd,
+	0x61, 0x14, 0x4a, 0x84, 0x04, 0x87, 0xf0, 0x9e, 0x74, 0x7c, 0xf2, 0xac, 0xb6, 0x38, 0x75, 0xe3,
+	0x14, 0xee, 0x26, 0x95, 0x97, 0x96, 0x69, 0xa4, 0x85, 0x75, 0xe5, 0x45, 0x38, 0x58, 0xee, 0x8e,
+	0x33, 0x95, 0x0e, 0x38, 0x5f, 0x67, 0x8f, 0x87, 0x6b, 0xec, 0xf0, 0x60, 0x95, 0x2d, 0xee, 0xab,
+	0xb0, 0xc1, 0xd9, 0x72, 0x05, 0xee, 0x23, 0x5d, 0xae, 0x91, 0xe3, 0x42, 0x95, 0x14, 0xe7, 0x2a,
+	0x24, 0x78, 0xb0, 0xcc, 0x1a, 0xf7, 0x95, 0x58, 0xe1, 0xde, 0x72, 0xc5, 0x6f, 0x1f, 0x7b, 0xe0,
+	0x1e, 0x73, 0x07, 0x3e, 0x07, 0xbc, 0x46, 0xe0, 0xb3, 0xce, 0x9f, 0x3f, 0x27, 0x4c, 0x0f, 0xb6,
+	0xb7, 0xb5, 0x69, 0x04, 0x1e, 0xfd, 0xda, 0x5c, 0x10, 0xb7, 0x29, 0xf3, 0xde, 0x83, 0xbc, 0x24,
+	0x98, 0x41, 0xc0, 0x9a, 0x49, 0x56, 0x20, 0x16, 0x0d, 0xe9, 0xe7, 0x7b, 0xaf, 0x6d, 0xcd, 0x73,
+	0xc2, 0x8e, 0x94, 0x15, 0xd8, 0x9d, 0xb6, 0x12, 0xfb, 0xc4, 0xf4, 0x9f, 0x00, 0x70, 0x5c, 0x0b,
+	0x00, 0x0f, 0x10, 0x00, 0x1e, 0xae, 0xa4, 0xe7, 0x52, 0x4d, 0xcf, 0xa7, 0x56, 0x89, 0xc7, 0xea,
+	0x6d, 0xf1, 0x64, 0xa3, 0x1d, 0x9e, 0x69, 0x26, 0x00, 0xb4, 0x30, 0x00, 0x9c, 0xf0, 0x4a, 0xa7,
+	0x33, 0x5e, 0xef, 0x76, 0xc1, 0x95, 0x1e, 0x57, 0x3c, 0xde, 0x1f, 0x83, 0xf5, 0x83, 0xdd, 0xdf,
+	0xce, 0x16, 0x00, 0x7c, 0xa2, 0x93, 0xf8, 0x0e, 0x52, 0x41, 0xf0, 0x3f, 0x2d, 0x44, 0xe5, 0x6d,
+	0xf4, 0xf5, 0x76, 0x4a, 0xe5, 0xb7, 0x7c, 0xe3, 0x9d, 0x1d, 0x9d, 0xd0, 0xd9, 0xd1, 0x39, 0x7b,
+	0xa2, 0xf7, 0x74, 0xe0, 0xb9, 0xde, 0x00, 0xbc, 0xd9, 0xed, 0x8c, 0xd7, 0x3a, 0x9d, 0xf0, 0x72,
+	0x3b, 0xbd, 0x38, 0xad, 0x3c, 0x82, 0xf0, 0x48, 0x42, 0x2f, 0x54, 0x03, 0xbd, 0x58, 0x75, 0x2a,
+	0x00, 0x5c, 0x54, 0x03, 0xe0, 0x21, 0x02, 0xc0, 0xfd, 0x04, 0x80, 0xb3, 0x45, 0x6b, 0xf0, 0xc0,
+	0xc6, 0xfa, 0xbf, 0x98, 0x98, 0xe6, 0x1b, 0x1b, 0xf8, 0xa2, 0x38, 0x3d, 0xe6, 0x2d, 0xc3, 0x34,
+	0x02, 0x8f, 0xa6, 0x07, 0xe7, 0x82, 0x78, 0x36, 0x40, 0xdc, 0xaf, 0x50, 0x04, 0x01, 0xcb, 0x20,
+	0x08, 0xb4, 0x61, 0xb0, 0x6f, 0xcf, 0xee, 0x1f, 0xb6, 0x97, 0x07, 0x7d, 0xbb, 0x2d, 0x69, 0x05,
+	0x76, 0xa6, 0xac, 0x84, 0xe8, 0xff, 0x0f, 0xa9, 0xfd, 0xff, 0xf1, 0x7c, 0x4b, 0x9c, 0x2c, 0xb4,
+	0xc2, 0x19, 0x4a, 0xff, 0xef, 0x2b, 0x95, 0xe2, 0xc1, 0x72, 0x19, 0xce, 0x89, 0xe9, 0x3f, 0x01,
+	0xe0, 0x71, 0x02, 0xc0, 0x53, 0x6a, 0x00, 0x3c, 0x4f, 0x00, 0x78, 0xa9, 0xdd, 0x09, 0xaf, 0x12,
+	0x00, 0xde, 0x20, 0x00, 0x5c, 0xed, 0x75, 0xc5, 0x3b, 0xfd, 0x6e, 0x78, 0x73, 0xd0, 0x1f, 0x13,
+	0x43, 0x1d, 0xff, 0x9a, 0xcd, 0x3b, 0xd3, 0xd7, 0xdb, 0x37, 0x09, 0x00, 0xae, 0x29, 0xdd, 0xc6,
+	0x10, 0x58, 0xf0, 0xfd, 0x37, 0x0e, 0xe1, 0xac, 0x99, 0x75, 0xf0, 0xaf, 0xef, 0x6b, 0xc5, 0x13,
+	0x7d, 0xe1, 0x78, 0xab, 0xcf, 0x45, 0x00, 0xc0, 0xeb, 0x04, 0x80, 0x57, 0x04, 0x00, 0xf0, 0x0b,
+	0xc4, 0x2f, 0x12, 0xbf, 0x50, 0xe4, 0x2b, 0xeb, 0xf9, 0x05, 0xa3, 0x17, 0xad, 0x5a, 0x86, 0xf3,
+	0x95, 0x04, 0x80, 0x72, 0x02, 0x40, 0x29, 0x65, 0x00, 0xc5, 0x96, 0x38, 0x53, 0xa6, 0xfc, 0xc3,
+	0x63, 0x8f, 0x5c, 0xd4, 0x0c, 0x7c, 0xd3, 0xd3, 0xfc, 0x9b, 0x03, 0xff, 0xdc, 0xa4, 0x78, 0x6a,
+	0x8c, 0x01, 0x60, 0xaa, 0x78, 0x9b, 0xee, 0x5b, 0x25, 0xb6, 0x23, 0xbc, 0x3a, 0x90, 0xf7, 0x2b,
+	0xd4, 0x00, 0x01, 0x49, 0x03, 0x04, 0x7a, 0x60, 0xc0, 0xbf, 0xff, 0xb7, 0x1d, 0x8d, 0x49, 0xff,
+	0xda, 0x92, 0xb8, 0x1c, 0xdb, 0x93, 0x57, 0x60, 0xd7, 0x54, 0xff, 0x9f, 0x63, 0xc8, 0xff, 0x53,
+	0xfa, 0xaf, 0xc7, 0xff, 0xbf, 0xdc, 0xe1, 0x84, 0xd7, 0xba, 0x9c, 0xf1, 0x66, 0x8f, 0x0b, 0xde,
+	0x22, 0x00, 0xbc, 0x4b, 0x00, 0x78, 0x7f, 0xd0, 0x03, 0x57, 0x86, 0x02, 0xb0, 0xbb, 0x39, 0xe3,
+	0xbb, 0xe1, 0x81, 0x7e, 0x93, 0xdf, 0x1d, 0x27, 0x07, 0x47, 0xdc, 0xe6, 0xb3, 0x0a, 0x16, 0x2e,
+	0x5b, 0xa5, 0x72, 0x84, 0x6e, 0x3a, 0xdf, 0xfc, 0xd9, 0x8f, 0xfc, 0xbd, 0x5d, 0x78, 0x76, 0x30,
+	0x02, 0xef, 0x0e, 0xba, 0x11, 0x00, 0x38, 0x45, 0x24, 0x00, 0x74, 0x11, 0x00, 0x3a, 0x1c, 0xf1,
+	0x52, 0xdb, 0x74, 0x00, 0x90, 0xe0, 0x81, 0x52, 0x6b, 0x15, 0x00, 0x0a, 0xd7, 0xe0, 0xfe, 0x0d,
+	0xd5, 0x7f, 0xa7, 0x80, 0xbf, 0x55, 0x81, 0x4f, 0x2d, 0xc2, 0x0f, 0x0b, 0x3a, 0x71, 0xe2, 0x84,
+	0x66, 0xe0, 0x91, 0x1d, 0x68, 0x9f, 0x3b, 0xe2, 0x7d, 0x07, 0xb8, 0x16, 0xa0, 0x0b, 0x04, 0x86,
+	0xb2, 0x02, 0xd6, 0xf5, 0x1d, 0xf5, 0xf1, 0x7f, 0x99, 0x88, 0x5f, 0x06, 0x11, 0x00, 0xd3, 0xf9,
+	0xff, 0x07, 0xa6, 0xfa, 0xff, 0x5a, 0x7d, 0xfe, 0x9f, 0x9f, 0xa9, 0x0b, 0x01, 0xc0, 0x95, 0x9e,
+	0x31, 0x01, 0x60, 0xc0, 0x1d, 0x1f, 0x0c, 0x79, 0xe0, 0xe3, 0x11, 0x4f, 0xbc, 0xd0, 0xe5, 0x83,
+	0x63, 0x65, 0xae, 0xd7, 0xd7, 0xf5, 0xb4, 0x9a, 0xf2, 0xfe, 0x70, 0x06, 0x2a, 0x02, 0xa0, 0x6f,
+	0x21, 0x32, 0x6f, 0xd3, 0xa5, 0x54, 0x28, 0x1f, 0xe5, 0x9b, 0x1e, 0x16, 0x12, 0x3a, 0xab, 0xe0,
+	0x1f, 0xe9, 0xeb, 0xc2, 0xab, 0xc3, 0x21, 0xf8, 0x60, 0xd8, 0x5d, 0x00, 0xc0, 0xdb, 0x7d, 0xae,
+	0x04, 0x00, 0x17, 0xbc, 0x41, 0xa3, 0xc5, 0xab, 0x02, 0x00, 0x1c, 0xf0, 0x42, 0x8b, 0x3d, 0x9e,
+	0x6d, 0xb6, 0x13, 0x00, 0xf0, 0x44, 0x3d, 0xbd, 0x60, 0xb5, 0xf4, 0xa2, 0x09, 0x00, 0x90, 0xe2,
+	0x61, 0x2d, 0x00, 0x9c, 0x2c, 0xb2, 0xfe, 0xee, 0xd2, 0x43, 0x67, 0xcc, 0x92, 0xe6, 0x6b, 0x07,
+	0x3d, 0xeb, 0xe1, 0x87, 0x1f, 0x12, 0x74, 0xdf, 0x7d, 0xf7, 0x6a, 0x04, 0x1c, 0xb5, 0x22, 0xcf,
+	0x25, 0x71, 0xa7, 0xa2, 0xb8, 0x6d, 0x99, 0x06, 0x08, 0x0c, 0x64, 0x05, 0xfc, 0x67, 0xbe, 0x9b,
+	0xa8, 0x4e, 0xf8, 0xd7, 0x68, 0xc4, 0x62, 0x4c, 0x24, 0x2c, 0xc3, 0xd6, 0xa4, 0xe5, 0x37, 0xfb,
+	0xff, 0x5c, 0x95, 0xff, 0x3f, 0x69, 0xa4, 0xff, 0x7f, 0x9e, 0xfd, 0x7f, 0xfb, 0x14, 0xff, 0xdf,
+	0xeb, 0x4a, 0xcf, 0xd8, 0x0d, 0xef, 0x11, 0x00, 0x3e, 0x1c, 0xf2, 0xc4, 0x27, 0x23, 0x5e, 0xf8,
+	0x64, 0xd4, 0x0b, 0x67, 0x0a, 0x28, 0xa3, 0x28, 0x92, 0x61, 0x4b, 0x6b, 0xd1, 0xbf, 0x03, 0x00,
+	0x16, 0x2e, 0x7b, 0x3b, 0xfb, 0x4f, 0xf8, 0xa6, 0x67, 0xa6, 0x67, 0x98, 0x1c, 0xfc, 0x5b, 0x5b,
+	0xf2, 0xf0, 0x44, 0xbb, 0x0f, 0x3e, 0x1e, 0xf5, 0xc4, 0x87, 0xc3, 0x1e, 0x78, 0x8f, 0x01, 0xd0,
+	0x6f, 0x08, 0x00, 0xb6, 0x2a, 0x00, 0xd4, 0x11, 0x00, 0xd4, 0x85, 0xc0, 0x87, 0x2b, 0x08, 0x00,
+	0xea, 0x42, 0xe0, 0x19, 0xaa, 0x03, 0x9c, 0x2a, 0x58, 0x8d, 0x33, 0x1d, 0xf1, 0xdf, 0x5e, 0x3c,
+	0x73, 0xc4, 0x6c, 0x81, 0xcf, 0x01, 0x2f, 0xea, 0xa1, 0x87, 0x1e, 0x64, 0xf1, 0xfe, 0x01, 0x1a,
+	0x01, 0x47, 0x8b, 0x84, 0xe6, 0x92, 0xb8, 0x26, 0x21, 0x6e, 0x5b, 0xa6, 0x01, 0x02, 0x3d, 0x59,
+	0x01, 0xff, 0xfc, 0xda, 0xfa, 0xa2, 0xe0, 0x6f, 0xfb, 0x82, 0x7e, 0x0a, 0x06, 0xc0, 0xe6, 0x84,
+	0xe5, 0xb8, 0xd9, 0xff, 0xaf, 0x99, 0xde, 0xff, 0xd7, 0xd9, 0x18, 0xe5, 0xff, 0x39, 0xfd, 0xff,
+	0x68, 0xd8, 0x13, 0x9f, 0x52, 0xf0, 0x7f, 0xb1, 0xce, 0x9b, 0x40, 0x22, 0x67, 0x08, 0x08, 0xda,
+	0xd1, 0x9c, 0x69, 0xf4, 0x3b, 0xc4, 0x87, 0x9d, 0xda, 0x2a, 0x6d, 0x44, 0x00, 0x94, 0x2c, 0x44,
+	0xe6, 0xed, 0x02, 0x80, 0xad, 0x9d, 0xd0, 0x16, 0x9a, 0x9f, 0x9b, 0x37, 0xe3, 0xc0, 0x1f, 0xeb,
+	0xeb, 0xc4, 0x91, 0x4a, 0x1f, 0x0a, 0x5a, 0x19, 0x3e, 0x1d, 0xf3, 0xc6, 0x27, 0x63, 0x04, 0x80,
+	0x11, 0x02, 0xc0, 0x90, 0x3b, 0x03, 0x80, 0x5e, 0x12, 0x02, 0x80, 0xc1, 0x42, 0xa0, 0xee, 0x99,
+	0x80, 0xb3, 0x6a, 0x00, 0xdc, 0x93, 0xb7, 0x0a, 0xa7, 0x3a, 0x93, 0xbe, 0xbb, 0x70, 0xdf, 0x09,
+	0x13, 0xd3, 0x7c, 0xc3, 0x81, 0xcf, 0x3a, 0x7b, 0xf6, 0x8c, 0x46, 0xc0, 0xd1, 0x6a, 0xc4, 0xb9,
+	0x24, 0xfe, 0x9e, 0xc4, 0x6d, 0xcc, 0x78, 0xa9, 0xb0, 0x2e, 0x18, 0x88, 0x20, 0xe0, 0x9d, 0x8d,
+	0xbf, 0x1b, 0xcb, 0x70, 0xf9, 0x81, 0x83, 0x5f, 0x04, 0x80, 0x76, 0xfa, 0x3f, 0xe9, 0xff, 0xf3,
+	0x0c, 0xf9, 0x7f, 0x82, 0xf3, 0x74, 0xfe, 0xbf, 0x4f, 0xe5, 0xff, 0x3f, 0x98, 0x0a, 0x80, 0x71,
+	0x6f, 0xca, 0xe2, 0x6e, 0x00, 0xe0, 0x54, 0xb9, 0x13, 0xd6, 0x8f, 0x8d, 0x1a, 0xf5, 0x2e, 0x71,
+	0xf1, 0x79, 0x72, 0x16, 0x40, 0x22, 0x89, 0x5d, 0x88, 0xcc, 0xdb, 0x74, 0xb9, 0xb9, 0xb8, 0xfe,
+	0x56, 0x3c, 0x88, 0x73, 0xa6, 0x00, 0x38, 0x59, 0xe1, 0x22, 0x3c, 0xe8, 0xcb, 0x94, 0x32, 0x7e,
+	0x3e, 0xae, 0x02, 0xc0, 0x47, 0x04, 0x80, 0xf7, 0x09, 0x00, 0xef, 0x0c, 0xa8, 0x00, 0xf0, 0xe6,
+	0x2c, 0x01, 0x70, 0x34, 0x67, 0x25, 0x4e, 0xf7, 0x65, 0x5d, 0xbb, 0xf0, 0xe0, 0x19, 0x53, 0xd3,
+	0x7c, 0x0e, 0x78, 0xed, 0xc0, 0xe7, 0x35, 0x01, 0x2c, 0x06, 0x80, 0x46, 0xc0, 0xd1, 0x66, 0x21,
+	0x73, 0x4d, 0x5c, 0x0c, 0x14, 0xb7, 0x2e, 0xd3, 0x0b, 0x82, 0xf1, 0xde, 0xd6, 0xdf, 0x8f, 0x24,
+	0xd9, 0x5e, 0xe7, 0xc0, 0x17, 0x35, 0x1e, 0xb5, 0x04, 0x5b, 0x8d, 0xf6, 0xff, 0x9c, 0xfe, 0x4f,
+	0xf1, 0xff, 0xf5, 0xb6, 0x7a, 0xfd, 0xff, 0x15, 0xc1, 0xff, 0xbb, 0x69, 0xf8, 0xff, 0xcf, 0xc6,
+	0xbc, 0xf0, 0xe5, 0xb8, 0x37, 0x59, 0x38, 0xd9, 0x75, 0x21, 0xf8, 0x2b, 0x5d, 0x71, 0x78, 0xf7,
+	0x36, 0xee, 0x45, 0xe0, 0x29, 0x49, 0x2a, 0x4c, 0xee, 0x11, 0x4f, 0x5f, 0x66, 0xab, 0x42, 0x19,
+	0xcb, 0x36, 0x3e, 0xe9, 0x48, 0x00, 0xd8, 0xba, 0xb1, 0x75, 0x54, 0x7b, 0x69, 0xff, 0x7a, 0x12,
+	0x00, 0xd6, 0xd6, 0xde, 0x0b, 0x91, 0x79, 0x9b, 0x2e, 0x17, 0x67, 0xe7, 0x5f, 0xab, 0x7a, 0xf0,
+	0x0b, 0x8d, 0x0e, 0xfc, 0xe1, 0xa1, 0x61, 0xe1, 0xc1, 0x1d, 0x6d, 0x49, 0x9c, 0x31, 0x00, 0x9e,
+	0x27, 0x00, 0x3c, 0xa3, 0x06, 0xc0, 0xe3, 0x75, 0xfa, 0x67, 0x02, 0x4e, 0x17, 0xae, 0xc6, 0x89,
+	0xfc, 0x55, 0x38, 0x96, 0x6b, 0x81, 0x23, 0xd9, 0x2b, 0x70, 0xb2, 0x3b, 0xc3, 0x9c, 0x81, 0x2f,
+	0x8a, 0x6b, 0x00, 0x1a, 0xc1, 0x46, 0x87, 0x70, 0xcc, 0x35, 0xf1, 0xf7, 0xc5, 0xad, 0xc1, 0xe2,
+	0x16, 0x66, 0x1a, 0x20, 0x10, 0x36, 0x27, 0x6d, 0x29, 0xf9, 0x7b, 0x7f, 0x30, 0x07, 0xbd, 0xa6,
+	0xc6, 0x63, 0x96, 0xe8, 0xf7, 0xff, 0x9c, 0xfe, 0xf3, 0x48, 0x6d, 0xa4, 0xff, 0x7f, 0x69, 0x1a,
+	0xff, 0xff, 0xf9, 0x3a, 0x6f, 0xb2, 0x7f, 0x9e, 0x93, 0xa3, 0xff, 0xf1, 0xa1, 0x2a, 0x0e, 0x7e,
+	0xa3, 0xb4, 0x7b, 0xe7, 0xce, 0xeb, 0xb4, 0x1c, 0x5c, 0x3c, 0xac, 0xf4, 0x89, 0x85, 0x3e, 0x80,
+	0xdb, 0x9b, 0x01, 0x5c, 0x55, 0xed, 0xc5, 0x97, 0x6a, 0x28, 0xe0, 0x79, 0xa3, 0x0a, 0x7a, 0xd9,
+	0x36, 0x30, 0xb5, 0x79, 0x7e, 0x59, 0xf5, 0xf0, 0xf6, 0xef, 0xa5, 0xd1, 0x9a, 0x46, 0xef, 0x72,
+	0x19, 0xa7, 0x7f, 0x64, 0x03, 0x3c, 0x69, 0x34, 0xf0, 0xa0, 0x51, 0xc1, 0x9d, 0x46, 0x07, 0x13,
+	0x66, 0x02, 0xf4, 0x02, 0x60, 0x25, 0x0e, 0x65, 0xae, 0xc0, 0xf1, 0xb6, 0x24, 0x3c, 0x7c, 0xff,
+	0xe9, 0x99, 0xa6, 0xf9, 0x62, 0xe0, 0xeb, 0xd5, 0x64, 0xb0, 0x35, 0x36, 0xa2, 0x69, 0x6e, 0x88,
+	0xf7, 0x35, 0xd4, 0x10, 0xf7, 0x05, 0x88, 0x5b, 0x98, 0x89, 0x20, 0x18, 0x1b, 0x18, 0xf8, 0x7a,
+	0x2c, 0xd3, 0x5d, 0x48, 0xf9, 0x75, 0x69, 0x63, 0xec, 0x32, 0x5d, 0xfe, 0x9f, 0xa7, 0xff, 0xcc,
+	0xee, 0xff, 0xf9, 0xf9, 0xbf, 0xdc, 0xe9, 0x3e, 0x09, 0x80, 0x13, 0x1d, 0xa9, 0xd3, 0x05, 0x3e,
+	0x37, 0x28, 0x5d, 0xaf, 0xad, 0xaa, 0x86, 0x9d, 0x8d, 0x2d, 0x07, 0xff, 0x9d, 0x28, 0x00, 0x2e,
+	0x5c, 0xae, 0x2e, 0x2e, 0xc2, 0x71, 0xdc, 0x09, 0x71, 0xf1, 0x5c, 0x48, 0x12, 0x3b, 0xc9, 0x8c,
+	0xa5, 0x37, 0xf9, 0x47, 0x29, 0xce, 0xd2, 0x8b, 0xf4, 0xc5, 0x7a, 0x02, 0xc0, 0x3a, 0x2f, 0x2a,
+	0x04, 0x7a, 0x88, 0x33, 0x01, 0x7a, 0x00, 0x60, 0x8f, 0x67, 0x8c, 0x9d, 0x09, 0xc8, 0x5f, 0x8d,
+	0xe3, 0x53, 0x00, 0xb0, 0x3f, 0x6d, 0x39, 0x0e, 0x54, 0x78, 0x5d, 0x3b, 0xb3, 0xa5, 0xdb, 0x1c,
+	0x81, 0x2f, 0x8a, 0x03, 0xcc, 0x54, 0xf1, 0x2e, 0xc3, 0xb7, 0x45, 0xfc, 0x6f, 0x71, 0x16, 0xc0,
+	0x5b, 0x98, 0x8d, 0xf7, 0xf5, 0xe3, 0x9e, 0xe8, 0x44, 0xbc, 0x28, 0x73, 0xbe, 0xbe, 0x2b, 0x5c,
+	0xaa, 0x17, 0x00, 0x9b, 0x13, 0xb4, 0xd3, 0x7f, 0xe3, 0xfd, 0x3f, 0xa7, 0xff, 0x86, 0xfd, 0xbf,
+	0xbb, 0xe0, 0xff, 0x3f, 0x9e, 0x02, 0x80, 0x0b, 0x35, 0x0e, 0x2a, 0x00, 0xb0, 0x8a, 0x64, 0x38,
+	0xb2, 0x63, 0xa3, 0xae, 0x77, 0x86, 0xbb, 0x13, 0xaf, 0x77, 0x13, 0xd0, 0x1c, 0x55, 0xf3, 0xfe,
+	0xa2, 0xc4, 0xf4, 0xdf, 0x75, 0x21, 0x2a, 0x6f, 0xe3, 0xc5, 0x7b, 0xc2, 0xf1, 0x8d, 0xa7, 0x4c,
+	0x80, 0x5f, 0x34, 0x5e, 0x76, 0x6a, 0x5c, 0xf0, 0xb3, 0x36, 0x0d, 0x4c, 0x3e, 0xf0, 0x2f, 0xd7,
+	0xfb, 0xe0, 0x33, 0x02, 0x80, 0x51, 0x33, 0x01, 0x86, 0x00, 0x50, 0x46, 0x00, 0x50, 0xcf, 0x04,
+	0x9c, 0x2c, 0x20, 0x00, 0xa8, 0xeb, 0x00, 0x87, 0xb2, 0x56, 0xe0, 0x40, 0xfa, 0x72, 0xec, 0x4d,
+	0x5d, 0x86, 0xdd, 0xe9, 0x16, 0xd7, 0x8e, 0xf6, 0xe6, 0xe3, 0xfe, 0x13, 0x87, 0x0c, 0xa4, 0xf9,
+	0xc6, 0x4b, 0x0c, 0xb2, 0xfa, 0xa9, 0xaa, 0xab, 0x9b, 0x73, 0x1a, 0x19, 0x18, 0xc4, 0xc1, 0xb4,
+	0x6c, 0xbc, 0xa0, 0x70, 0xb9, 0xfe, 0x84, 0x9b, 0xef, 0xdf, 0xde, 0x49, 0x4f, 0xfb, 0xfa, 0x4f,
+	0x8d, 0x2d, 0x78, 0x24, 0x3f, 0xec, 0xa6, 0xe0, 0x1f, 0x0a, 0x5d, 0x24, 0xf8, 0xff, 0x1d, 0x33,
+	0xf0, 0xff, 0x17, 0x8c, 0xf4, 0xff, 0x6f, 0xeb, 0xf0, 0xff, 0x24, 0x82, 0xb6, 0x84, 0x32, 0x37,
+	0x29, 0x4e, 0x56, 0x79, 0xe2, 0x44, 0x7d, 0x08, 0x8e, 0xf6, 0x97, 0x72, 0x27, 0x22, 0x0e, 0xee,
+	0xdf, 0x77, 0x5d, 0x7c, 0x67, 0xc6, 0x87, 0x07, 0xbf, 0xa7, 0x77, 0x4d, 0xdf, 0x5a, 0x10, 0x3e,
+	0xd2, 0xed, 0xff, 0x5a, 0x88, 0xca, 0xdb, 0x78, 0x29, 0xac, 0x15, 0xae, 0xe2, 0x81, 0x9c, 0xfc,
+	0x7f, 0x9a, 0x15, 0x40, 0x75, 0x55, 0x95, 0x51, 0x59, 0xc0, 0xe9, 0x3a, 0x7f, 0x21, 0xf8, 0x1f,
+	0x2c, 0x95, 0xea, 0x00, 0x80, 0xe6, 0x4c, 0xc0, 0xab, 0xaa, 0x3a, 0x00, 0x8d, 0x26, 0x04, 0x00,
+	0x13, 0x0a, 0x81, 0x87, 0xa7, 0x02, 0x20, 0x79, 0x09, 0x76, 0x24, 0x2e, 0xc6, 0xae, 0x42, 0x67,
+	0x9c, 0x3d, 0xb8, 0xd5, 0xd4, 0xc0, 0x17, 0x75, 0x73, 0xb0, 0xd5, 0xd6, 0xa2, 0x6e, 0x0e, 0xa9,
+	0xb6, 0xa6, 0xe6, 0xeb, 0x8d, 0xa5, 0x05, 0x5f, 0x5c, 0x74, 0x0f, 0xf8, 0xf6, 0x71, 0x0f, 0xbf,
+	0xbf, 0x7d, 0x90, 0x95, 0xf5, 0xfd, 0xef, 0xcb, 0xeb, 0xf0, 0xc7, 0x9a, 0x26, 0xfc, 0xb9, 0xb1,
+	0x15, 0x7f, 0x6d, 0xe9, 0xc2, 0x13, 0x45, 0x91, 0x1a, 0x00, 0x18, 0x89, 0x58, 0x6c, 0x94, 0xff,
+	0xbf, 0xcf, 0x48, 0xff, 0xff, 0xea, 0x34, 0xfe, 0xff, 0xc9, 0x4e, 0x7a, 0x17, 0xaa, 0xdc, 0x71,
+	0xff, 0xa1, 0x6d, 0x78, 0xf0, 0xfe, 0xfb, 0xf0, 0x10, 0xdd, 0xd7, 0x87, 0xe9, 0x99, 0x9c, 0x23,
+	0x30, 0x5f, 0xa0, 0x4c, 0xed, 0x22, 0xd5, 0x6b, 0xf8, 0xd7, 0x86, 0x07, 0x07, 0x85, 0x6c, 0x53,
+	0x2e, 0x95, 0xdd, 0x14, 0xfc, 0x8e, 0x4a, 0xd9, 0xef, 0xef, 0x40, 0x08, 0x2c, 0x5c, 0xb6, 0x0a,
+	0xe5, 0xef, 0x6f, 0x7a, 0x18, 0xf6, 0x0e, 0xdc, 0x19, 0x67, 0x10, 0x00, 0xa7, 0x2a, 0xdd, 0x04,
+	0x00, 0xdc, 0x4f, 0x69, 0xe4, 0xe7, 0xeb, 0xbd, 0x6f, 0xe9, 0x4c, 0x80, 0x08, 0x80, 0x7d, 0x6a,
+	0x00, 0xec, 0x24, 0x00, 0x6c, 0x8b, 0x5f, 0x44, 0x69, 0xee, 0x92, 0xef, 0xf7, 0x34, 0x26, 0x5c,
+	0x3b, 0xb9, 0x7b, 0xbd, 0xa9, 0x00, 0xd0, 0x15, 0x70, 0x73, 0x42, 0x0d, 0x35, 0x55, 0xbf, 0xdf,
+	0x9b, 0x99, 0xf0, 0xdb, 0x47, 0xdc, 0x24, 0xd7, 0x2f, 0x2a, 0x7f, 0x82, 0x97, 0x7d, 0x9d, 0xf0,
+	0xab, 0xdc, 0x12, 0xfc, 0xa6, 0xb0, 0x02, 0xbf, 0x2b, 0xab, 0xc5, 0x1f, 0xaa, 0x1b, 0xf1, 0xa7,
+	0x86, 0x16, 0xfc, 0x65, 0x6d, 0x27, 0xfe, 0xd6, 0xde, 0x83, 0xfb, 0x33, 0xfc, 0x26, 0x01, 0x30,
+	0x16, 0xb9, 0x44, 0x9f, 0xff, 0xe7, 0xf4, 0xdf, 0xb0, 0xff, 0x6f, 0x50, 0xf9, 0xff, 0x67, 0x19,
+	0x00, 0xad, 0xd3, 0xfb, 0x7f, 0x06, 0xc0, 0xe9, 0x72, 0x47, 0x9c, 0xd8, 0x3a, 0x80, 0x93, 0x27,
+	0xee, 0xa1, 0xf6, 0xea, 0x13, 0x38, 0x73, 0xea, 0x24, 0xce, 0x9e, 0x3e, 0x85, 0xfb, 0x68, 0x96,
+	0xe5, 0xfe, 0x7b, 0xcf, 0xe2, 0x01, 0x2a, 0xb6, 0x32, 0x18, 0x44, 0x28, 0x4c, 0x6c, 0xdc, 0xc8,
+	0xfb, 0x33, 0x6a, 0xbc, 0x73, 0x0e, 0x4a, 0xd9, 0xef, 0x16, 0xa2, 0xf1, 0x0e, 0x5c, 0x54, 0x84,
+	0xb9, 0xa4, 0x2f, 0x25, 0x4b, 0x4f, 0x4d, 0xe3, 0x8d, 0x24, 0x34, 0xf6, 0x95, 0xe3, 0xdd, 0x65,
+	0x79, 0x7b, 0x69, 0xde, 0x59, 0x87, 0xf7, 0x99, 0x3f, 0x3b, 0x50, 0x80, 0x17, 0x3b, 0x3d, 0x4c,
+	0x02, 0x80, 0x30, 0x13, 0xa0, 0x67, 0x51, 0xd0, 0xe9, 0x82, 0x1b, 0x85, 0xc0, 0xc3, 0x34, 0x13,
+	0x70, 0x30, 0x83, 0x00, 0x90, 0xb6, 0x0c, 0x7b, 0x52, 0x96, 0x62, 0x67, 0x12, 0x01, 0x20, 0x81,
+	0x00, 0x10, 0xf7, 0x53, 0x6c, 0x8a, 0xf9, 0x31, 0x36, 0x24, 0xac, 0xf8, 0xe3, 0xf6, 0xa6, 0xb4,
+	0x7f, 0x9c, 0x3e, 0xb2, 0x67, 0xc6, 0x00, 0xd0, 0x0e, 0xbc, 0x9a, 0xea, 0xea, 0x3b, 0xa6, 0x86,
+	0xea, 0x8a, 0x5f, 0x6d, 0xce, 0x4e, 0xf9, 0xe5, 0x7d, 0x21, 0x6e, 0xdf, 0x5e, 0xb6, 0x59, 0x0c,
+	0x0e, 0x7c, 0xd6, 0x63, 0x0e, 0x2b, 0xf1, 0x55, 0x6a, 0x0e, 0x7e, 0x99, 0x53, 0x8c, 0x5f, 0x17,
+	0x94, 0xe3, 0x77, 0xa5, 0x35, 0xf8, 0x43, 0x55, 0x03, 0xfe, 0x54, 0xbf, 0x16, 0x7f, 0x69, 0xee,
+	0xc0, 0x3f, 0xda, 0x06, 0xf1, 0xf7, 0xb6, 0x01, 0x6c, 0x8a, 0xb4, 0x54, 0x17, 0x00, 0x97, 0xea,
+	0xf7, 0xff, 0x05, 0xc6, 0xf8, 0x7f, 0x7b, 0xa3, 0xfc, 0xff, 0x67, 0x04, 0x80, 0x7b, 0x3b, 0xe2,
+	0x71, 0x86, 0x2d, 0x45, 0x89, 0x12, 0x47, 0x37, 0x0f, 0xe0, 0xc8, 0xe1, 0x43, 0xb4, 0xc8, 0xea,
+	0x30, 0x8e, 0x1d, 0x3d, 0x42, 0xbb, 0x11, 0x1d, 0xa3, 0x9d, 0x88, 0x8e, 0x0b, 0x60, 0x38, 0xcd,
+	0x60, 0x20, 0x28, 0xdc, 0x7b, 0xe6, 0x34, 0x83, 0x41, 0xf8, 0x7f, 0x59, 0x49, 0x09, 0xe4, 0xea,
+	0x77, 0xcd, 0xdd, 0x5e, 0xf1, 0xd6, 0x42, 0x34, 0xde, 0x81, 0x8b, 0x2b, 0xaf, 0xda, 0x81, 0xef,
+	0xec, 0xe4, 0x84, 0x89, 0x75, 0x43, 0x1a, 0x81, 0x4e, 0xfb, 0xc9, 0xf3, 0xcf, 0x09, 0x00, 0xbc,
+	0xb5, 0xf4, 0x59, 0x7a, 0x98, 0x67, 0x08, 0x0a, 0xa7, 0x09, 0x0e, 0x04, 0x86, 0xce, 0x14, 0x7c,
+	0x32, 0xee, 0x8b, 0x4f, 0x19, 0x00, 0x93, 0x33, 0x01, 0xae, 0xaa, 0x45, 0x41, 0x53, 0x0a, 0x81,
+	0x2f, 0x9a, 0x3a, 0x13, 0xa0, 0x03, 0x00, 0xdb, 0x13, 0xa8, 0xd1, 0x45, 0x00, 0xc0, 0x4f, 0xb0,
+	0x21, 0xea, 0xc7, 0x58, 0x17, 0xf1, 0x23, 0x8c, 0x44, 0xfe, 0xf4, 0x57, 0x13, 0x7d, 0xcd, 0x7f,
+	0x38, 0x75, 0xf2, 0x9e, 0x6b, 0x46, 0x02, 0x40, 0x3b, 0x08, 0xd9, 0x02, 0xdd, 0x36, 0xd5, 0x55,
+	0x54, 0xfc, 0x61, 0x34, 0x3b, 0xfb, 0x77, 0xc7, 0x23, 0xa2, 0xfe, 0xf1, 0x84, 0xb3, 0xf7, 0xb5,
+	0xd7, 0xa4, 0x14, 0x78, 0x76, 0x12, 0x4c, 0x0d, 0xfe, 0x4b, 0x36, 0x3f, 0xc5, 0xfb, 0xe1, 0x11,
+	0xf8, 0x79, 0x5a, 0x2e, 0x7e, 0x99, 0x5d, 0x84, 0x5f, 0xe5, 0x97, 0xe1, 0xb7, 0x25, 0xd5, 0xf8,
+	0x7d, 0x65, 0x3d, 0xfe, 0x58, 0xd7, 0x8c, 0x3f, 0x37, 0xb5, 0x11, 0x00, 0x86, 0xf0, 0xcf, 0xb6,
+	0x61, 0xfc, 0xbc, 0xa9, 0x5e, 0x00, 0xc0, 0x96, 0x04, 0xf6, 0xff, 0x9c, 0xfe, 0x1b, 0xef, 0xff,
+	0x2f, 0x8b, 0xfe, 0xbf, 0xd1, 0xb0, 0xff, 0x7f, 0x6f, 0x8a, 0xff, 0x7f, 0x77, 0x24, 0x00, 0x47,
+	0x1a, 0xa3, 0x71, 0xb0, 0xa7, 0x04, 0x7b, 0x37, 0x8f, 0x63, 0x0f, 0xcd, 0xf5, 0xef, 0x25, 0xdf,
+	0xbf, 0x6f, 0xef, 0x1e, 0x1c, 0x20, 0x1b, 0x79, 0xf0, 0xc0, 0x7e, 0xca, 0x16, 0x0f, 0xe0, 0xf0,
+	0xa1, 0x83, 0x0c, 0x06, 0x86, 0x02, 0x0d, 0x28, 0x47, 0x05, 0x30, 0x9c, 0x24, 0x30, 0x70, 0xb6,
+	0x10, 0x1e, 0x1a, 0x06, 0xa1, 0x0e, 0x65, 0x27, 0xbf, 0xba, 0x10, 0x8d, 0x77, 0xe0, 0xe2, 0xcd,
+	0x19, 0xa7, 0x06, 0x7f, 0x51, 0x61, 0x21, 0xd1, 0xfa, 0xa4, 0xae, 0x40, 0x27, 0x92, 0x9f, 0x24,
+	0xa2, 0x9f, 0xa0, 0x07, 0x78, 0x0f, 0x3d, 0xc8, 0xe3, 0xf4, 0x40, 0x8f, 0xe1, 0xd8, 0xfe, 0xdd,
+	0x38, 0x5d, 0xe9, 0x8a, 0x47, 0xfb, 0xe3, 0x8c, 0x9a, 0x09, 0xd0, 0x06, 0xc0, 0xa3, 0xb5, 0xf2,
+	0x19, 0xcd, 0x04, 0x30, 0x00, 0x76, 0x25, 0x2d, 0xd1, 0x09, 0x80, 0xe1, 0xb0, 0xff, 0xf9, 0xf7,
+	0x68, 0xdb, 0x1f, 0x5f, 0x2f, 0xf6, 0xa6, 0xde, 0x81, 0xb6, 0x38, 0x9c, 0xdc, 0xda, 0x8b, 0xd3,
+	0x47, 0xf7, 0xe9, 0x0d, 0x7e, 0xee, 0x03, 0xd0, 0x0e, 0xca, 0xaa, 0xca, 0x4a, 0xb3, 0xab, 0xbe,
+	0xba, 0x02, 0xfd, 0x0d, 0xc5, 0xbf, 0xdf, 0xde, 0x9a, 0x7b, 0xf5, 0x4c, 0x4f, 0xfa, 0xb3, 0xcf,
+	0x8d, 0xc6, 0x5f, 0x7c, 0xd9, 0xde, 0x05, 0xaf, 0x59, 0xd9, 0xdf, 0x90, 0xb5, 0x03, 0xae, 0xda,
+	0xd2, 0x7d, 0x73, 0x0b, 0xc0, 0x47, 0x7e, 0xe1, 0x78, 0x2f, 0x20, 0x04, 0x6f, 0xfa, 0x7a, 0xe3,
+	0x6a, 0x80, 0x2f, 0xbe, 0x4c, 0xc8, 0xc0, 0xcf, 0x28, 0x03, 0xf8, 0x45, 0x56, 0x21, 0x7e, 0x95,
+	0x57, 0x8a, 0xdf, 0x14, 0x57, 0x61, 0x6a, 0x1d, 0xe0, 0xef, 0xad, 0xfd, 0xf8, 0xd7, 0x86, 0xbd,
+	0x82, 0x2e, 0xc4, 0xb9, 0x1a, 0xf6, 0xff, 0x85, 0xec, 0xff, 0x25, 0x64, 0xb5, 0x38, 0xfd, 0x37,
+	0xce, 0xff, 0xbf, 0x21, 0xfa, 0xff, 0x7e, 0x06, 0x80, 0x07, 0xf9, 0x7f, 0x06, 0xbd, 0x37, 0x36,
+	0x0e, 0x75, 0x71, 0x3f, 0x82, 0x46, 0x57, 0xe2, 0xb6, 0x2d, 0x5b, 0xb0, 0x9d, 0x66, 0x94, 0x76,
+	0x52, 0xc3, 0xcf, 0xae, 0x1d, 0x3b, 0x78, 0x9e, 0x9f, 0x1a, 0x81, 0x76, 0x51, 0x41, 0x70, 0x0f,
+	0x4f, 0xfd, 0x51, 0x63, 0x90, 0x1a, 0x0c, 0x6a, 0x28, 0xf0, 0xe1, 0x2d, 0x82, 0x05, 0x50, 0xc8,
+	0xbe, 0x5a, 0x88, 0xc6, 0x3b, 0x01, 0x00, 0xa9, 0xf4, 0x4d, 0x31, 0xf8, 0x3b, 0xdb, 0x3b, 0xf4,
+	0x05, 0x3a, 0xa5, 0x75, 0x47, 0xe9, 0x81, 0x1d, 0x21, 0x9a, 0x1f, 0x26, 0xaa, 0x1f, 0xe2, 0xe9,
+	0x1c, 0xa1, 0xcb, 0xeb, 0x78, 0x7b, 0x9a, 0x6a, 0x36, 0x80, 0x7c, 0xe0, 0x3b, 0xe3, 0xa1, 0x0c,
+	0x00, 0x13, 0x66, 0x02, 0x0c, 0x00, 0x20, 0x8f, 0x00, 0x90, 0xa3, 0x06, 0x80, 0xba, 0x10, 0xb8,
+	0x2b, 0x99, 0x00, 0x90, 0x48, 0x00, 0xa0, 0x3a, 0xc0, 0x44, 0xec, 0x4f, 0xb0, 0x31, 0xfa, 0xc7,
+	0x18, 0x8f, 0xfc, 0x11, 0x3a, 0x02, 0x7f, 0xf4, 0x4d, 0x90, 0xfc, 0xa7, 0xa8, 0xf4, 0xb3, 0xc0,
+	0x3d, 0xa5, 0x76, 0x38, 0x51, 0xa6, 0xd2, 0xc9, 0x6a, 0x9a, 0xa3, 0xee, 0x4a, 0xc2, 0xbd, 0x63,
+	0x65, 0x38, 0xb3, 0xa5, 0x13, 0x27, 0xf7, 0x6d, 0xc6, 0x89, 0xa3, 0x07, 0xaf, 0xf3, 0x5c, 0xb4,
+	0x56, 0xb0, 0xf2, 0x3e, 0x81, 0x26, 0xa9, 0xba, 0xa2, 0xfc, 0x77, 0xfd, 0xf5, 0x05, 0x9f, 0xec,
+	0x6d, 0xcf, 0xba, 0x72, 0x7f, 0x6f, 0xea, 0x2b, 0x4f, 0x0f, 0x27, 0xbc, 0xf1, 0xfa, 0xba, 0x98,
+	0x8f, 0xdf, 0x59, 0x1f, 0xfd, 0x87, 0xf7, 0x36, 0x44, 0x41, 0x5b, 0xaf, 0x3b, 0x3a, 0x69, 0x05,
+	0xbf, 0x07, 0xde, 0x71, 0xf1, 0xc5, 0xfb, 0x1e, 0x41, 0xf8, 0xd0, 0x37, 0x0c, 0x1f, 0x07, 0x46,
+	0xe1, 0xd3, 0xb0, 0x78, 0x7c, 0x1e, 0x9d, 0x8c, 0x2f, 0xe3, 0xd3, 0xf1, 0xb3, 0x94, 0x6c, 0xfc,
+	0x22, 0xb3, 0x40, 0x67, 0x1d, 0xe0, 0xaf, 0x1d, 0xfd, 0xf8, 0x7a, 0xeb, 0x51, 0x41, 0x5f, 0xd6,
+	0xd4, 0xe1, 0x62, 0xac, 0x52, 0x9f, 0xff, 0xe7, 0xf4, 0xdf, 0xb0, 0xff, 0x6f, 0x52, 0xf9, 0xff,
+	0x17, 0xa6, 0xf1, 0xff, 0x9b, 0x7b, 0x6a, 0x79, 0xb1, 0x12, 0x6f, 0xad, 0xc6, 0xd3, 0x93, 0xdc,
+	0xa3, 0x20, 0x36, 0x2a, 0x89, 0xdd, 0x8a, 0x93, 0x60, 0xd8, 0xca, 0x60, 0x20, 0x28, 0xec, 0xd8,
+	0xb6, 0x4d, 0x04, 0x83, 0x2a, 0x5b, 0xd8, 0xbd, 0x7b, 0x12, 0x00, 0xb6, 0x0a, 0xd9, 0xdb, 0x0b,
+	0xd1, 0x78, 0x07, 0x2e, 0x3e, 0x21, 0x96, 0x04, 0x5f, 0x1f, 0x5f, 0x0e, 0x72, 0xd2, 0x11, 0xde,
+	0x4b, 0x8e, 0xb7, 0x92, 0xe2, 0x62, 0x9f, 0x18, 0xe8, 0x3c, 0x33, 0xc0, 0x1b, 0x4d, 0xf0, 0x5a,
+	0x73, 0x5e, 0x73, 0x2e, 0xb6, 0x76, 0x0a, 0xda, 0xb3, 0x69, 0x18, 0x07, 0xbb, 0x0b, 0x71, 0xef,
+	0x60, 0xbe, 0x71, 0x53, 0x81, 0x6b, 0xd9, 0x67, 0xf2, 0x74, 0x93, 0xb8, 0x28, 0xc8, 0xb4, 0x99,
+	0x80, 0xad, 0x5a, 0x00, 0x48, 0x77, 0xfa, 0x31, 0x32, 0xdd, 0x96, 0xa3, 0x25, 0x8c, 0x46, 0x3b,
+	0x02, 0xc0, 0x3d, 0x65, 0x53, 0x20, 0x50, 0x6e, 0x8f, 0x53, 0xa4, 0xd3, 0x15, 0xf6, 0x38, 0x53,
+	0xe1, 0x80, 0xc3, 0xf9, 0x72, 0x2a, 0x22, 0x5a, 0xa0, 0x3f, 0xc2, 0x02, 0x1d, 0xb1, 0xb6, 0x68,
+	0x49, 0xf6, 0x42, 0x53, 0x66, 0x38, 0xea, 0x0a, 0x33, 0xbe, 0xad, 0x2a, 0x2f, 0xfd, 0x86, 0x83,
+	0xba, 0xae, 0xa2, 0xe4, 0xaf, 0x0d, 0x15, 0x85, 0xdf, 0x75, 0x94, 0x67, 0xfe, 0xd0, 0x5b, 0x96,
+	0x82, 0x81, 0xb2, 0x78, 0x8c, 0x97, 0x84, 0x61, 0xa2, 0x38, 0x10, 0x3b, 0x8b, 0x3c, 0xb1, 0xbf,
+	0xc8, 0x19, 0x47, 0x0b, 0x6d, 0x18, 0x80, 0x1a, 0x3a, 0x4b, 0x41, 0xf6, 0x60, 0xa9, 0xe2, 0xfa,
+	0x43, 0x15, 0xca, 0xef, 0x1e, 0x6d, 0x70, 0xfc, 0xc7, 0x73, 0x1d, 0x5e, 0xbf, 0x79, 0xb5, 0x3f,
+	0xe0, 0x67, 0xef, 0xac, 0x0b, 0x9f, 0x84, 0xc1, 0x6b, 0x4e, 0x8e, 0x93, 0x00, 0x78, 0x43, 0xea,
+	0x84, 0xb7, 0xec, 0x08, 0x00, 0xce, 0x3e, 0x78, 0xcf, 0x3d, 0x00, 0x1f, 0x7a, 0x87, 0xe2, 0xa3,
+	0x80, 0x48, 0x7c, 0x12, 0x1a, 0x87, 0xcf, 0xa2, 0x92, 0xf0, 0x45, 0x5c, 0x1a, 0xbe, 0x4a, 0xce,
+	0xc2, 0xcf, 0xd3, 0xf3, 0xf4, 0xd4, 0x01, 0xda, 0xf1, 0xf5, 0xe6, 0xc3, 0x02, 0x00, 0xfe, 0x45,
+	0xff, 0x7f, 0xc2, 0xc3, 0x8a, 0xee, 0x91, 0x66, 0xfa, 0x3f, 0xe9, 0xff, 0x8b, 0xd8, 0xff, 0x4b,
+	0x4d, 0xf3, 0xff, 0x03, 0x2a, 0xff, 0x7f, 0x7f, 0x6f, 0x0a, 0xba, 0x3a, 0x85, 0x8d, 0x54, 0x78,
+	0x17, 0x25, 0xde, 0xc3, 0x50, 0xdc, 0xd2, 0x9c, 0xcf, 0x36, 0x60, 0x28, 0x70, 0xdf, 0x82, 0x08,
+	0x06, 0xed, 0x36, 0x66, 0x8d, 0x35, 0x0c, 0x74, 0x72, 0x93, 0x7a, 0x0d, 0x80, 0xec, 0x67, 0x0b,
+	0xd1, 0x78, 0x9b, 0x2f, 0xde, 0xd5, 0x57, 0x1c, 0xfd, 0x1b, 0xea, 0xea, 0x0d, 0x05, 0x3a, 0x2f,
+	0x35, 0xe5, 0x3e, 0x6e, 0x5e, 0x75, 0xc6, 0x34, 0xe7, 0x87, 0xa7, 0xee, 0xe7, 0xde, 0x4c, 0xa4,
+	0x9f, 0xa0, 0x07, 0xbb, 0x49, 0x78, 0xd0, 0x17, 0x46, 0xb3, 0xf0, 0xa1, 0x58, 0x08, 0xec, 0x37,
+	0x61, 0x26, 0xc0, 0x44, 0x00, 0xf4, 0x85, 0xfe, 0xe8, 0x5a, 0xa0, 0xec, 0xa7, 0xc8, 0xf7, 0x5c,
+	0x81, 0x91, 0x44, 0x09, 0x8e, 0x97, 0xd8, 0x52, 0x16, 0xa0, 0x1f, 0x00, 0x67, 0x2b, 0x1d, 0x70,
+	0x2f, 0xab, 0xca, 0x11, 0xc7, 0x0a, 0x95, 0xd8, 0x95, 0x6e, 0x89, 0xf5, 0x31, 0xcb, 0x21, 0xb6,
+	0xd5, 0xf2, 0xff, 0x27, 0xe2, 0x56, 0x60, 0x4f, 0x2a, 0xa5, 0xd0, 0x19, 0xab, 0x70, 0x0f, 0x05,
+	0x11, 0x05, 0xf7, 0xac, 0x75, 0xbe, 0xd6, 0x11, 0x27, 0x8b, 0x6d, 0x71, 0xd6, 0xd5, 0x7a, 0x12,
+	0x00, 0x6f, 0x12, 0x00, 0x38, 0xfd, 0x7f, 0xdb, 0xd1, 0x9b, 0x2c, 0x80, 0x3f, 0x3e, 0xf0, 0x0a,
+	0xc1, 0x47, 0xfe, 0x11, 0xf8, 0x24, 0x24, 0x16, 0x9f, 0x45, 0x26, 0xe2, 0x8b, 0xd8, 0x54, 0x7c,
+	0x95, 0x98, 0xa9, 0xbb, 0x0e, 0x50, 0xab, 0xaa, 0x03, 0xfc, 0x73, 0x7c, 0xe7, 0x64, 0x16, 0xf0,
+	0x76, 0x7a, 0x22, 0xee, 0x8b, 0xb7, 0xc4, 0xbe, 0x19, 0xf8, 0xff, 0xc7, 0x44, 0xff, 0xdf, 0x6c,
+	0xd8, 0xff, 0x3f, 0xdd, 0x1b, 0x8a, 0x8e, 0xb6, 0x16, 0x9e, 0x25, 0xe2, 0x4d, 0x51, 0xc4, 0x1d,
+	0x8c, 0x44, 0x18, 0xb0, 0x34, 0x36, 0x37, 0xd5, 0x01, 0x07, 0x8d, 0x6c, 0xa1, 0x20, 0x2f, 0x7f,
+	0xf2, 0xdc, 0x80, 0x85, 0x88, 0xbc, 0xcd, 0x97, 0x8d, 0xb5, 0xb5, 0x54, 0x04, 0x00, 0x3d, 0x0c,
+	0x03, 0x81, 0xbe, 0x99, 0xa9, 0xcd, 0x29, 0x1d, 0x13, 0x5c, 0xdd, 0x87, 0xbe, 0x81, 0xfe, 0xce,
+	0x7a, 0x7a, 0x90, 0xe3, 0xbc, 0xa0, 0x83, 0x68, 0x3f, 0x46, 0xd4, 0x1f, 0xc5, 0xc8, 0xe0, 0x00,
+	0xae, 0x0e, 0xfb, 0xcf, 0x7e, 0x2a, 0x50, 0x9c, 0x09, 0x20, 0x00, 0x1c, 0x13, 0x00, 0xa0, 0x2e,
+	0x04, 0xa6, 0xea, 0x9e, 0x09, 0xc8, 0xa0, 0xd1, 0xbf, 0x90, 0xbc, 0x7f, 0xbe, 0x07, 0x55, 0xbf,
+	0x73, 0x14, 0x33, 0x02, 0xc0, 0x7d, 0xa4, 0xfb, 0xab, 0x1d, 0xf1, 0x40, 0x8d, 0xa3, 0xf0, 0x6b,
+	0xc7, 0x8a, 0x94, 0xd8, 0x97, 0x65, 0x2d, 0x64, 0x08, 0xa3, 0x11, 0x4b, 0x27, 0xa7, 0xd7, 0x06,
+	0x42, 0x16, 0x61, 0x24, 0x7c, 0x09, 0xd6, 0x47, 0x2f, 0x23, 0xf0, 0xac, 0xc0, 0xd6, 0x84, 0x95,
+	0xd8, 0x95, 0xb2, 0x8a, 0x2c, 0x89, 0x85, 0x5e, 0x31, 0x40, 0x76, 0xd2, 0xff, 0xb7, 0xc4, 0xaf,
+	0xc4, 0x18, 0x7d, 0x2d, 0xfe, 0x1a, 0x5b, 0x13, 0x2d, 0x70, 0x2e, 0x58, 0x71, 0x23, 0x03, 0x90,
+	0x38, 0xe2, 0xaa, 0x92, 0x32, 0x26, 0x07, 0x2f, 0xbc, 0xeb, 0xea, 0x87, 0xf7, 0x3d, 0x83, 0xf1,
+	0x21, 0xd5, 0x01, 0x3e, 0x0e, 0x8e, 0xc1, 0xa7, 0xe1, 0x09, 0xf8, 0x3c, 0x26, 0xe5, 0xe6, 0x3a,
+	0x40, 0x51, 0xa5, 0x46, 0x1d, 0xe0, 0x1f, 0x23, 0x5b, 0x26, 0x01, 0xf0, 0xab, 0xd6, 0x6e, 0x3c,
+	0x1d, 0x69, 0xaf, 0xdb, 0xff, 0x17, 0xdf, 0xf0, 0xff, 0xe7, 0x8c, 0xf4, 0xff, 0x57, 0x45, 0xff,
+	0x4f, 0xa3, 0xff, 0x50, 0x53, 0xa9, 0xd8, 0xb2, 0x2c, 0xae, 0x55, 0x10, 0x57, 0x2e, 0xf2, 0x92,
+	0x6a, 0x71, 0x6f, 0x05, 0x11, 0x10, 0x22, 0x1c, 0x58, 0x1a, 0x70, 0x10, 0xcf, 0x64, 0xc8, 0xcb,
+	0xcb, 0xbb, 0x83, 0x00, 0x58, 0xc8, 0x00, 0x6c, 0xe8, 0xc6, 0x73, 0x63, 0x06, 0xa7, 0x68, 0xda,
+	0x81, 0xae, 0x2f, 0xc8, 0x59, 0x44, 0xf2, 0x11, 0x5e, 0x27, 0xc0, 0xeb, 0x05, 0x88, 0xee, 0x83,
+	0xbc, 0xa6, 0x9b, 0x1e, 0x68, 0xbf, 0xb0, 0xbf, 0xdb, 0x58, 0x7f, 0xd7, 0x0d, 0x00, 0xe8, 0xd8,
+	0x1e, 0x4c, 0x5c, 0x14, 0xf4, 0x54, 0xc3, 0xec, 0x66, 0x02, 0x44, 0x00, 0x34, 0xfb, 0xff, 0xe4,
+	0x7a, 0xa2, 0xd3, 0xd2, 0x6f, 0xf2, 0x3d, 0x54, 0xe9, 0xff, 0xb1, 0x12, 0x5b, 0xdd, 0x00, 0x60,
+	0x55, 0x30, 0x04, 0x1c, 0x0c, 0x42, 0xe0, 0xc1, 0x1a, 0x27, 0x3c, 0x54, 0xeb, 0x84, 0x87, 0x49,
+	0xe7, 0xea, 0x9c, 0xf1, 0x20, 0xfd, 0xfa, 0xa9, 0x12, 0x1b, 0x1c, 0xc9, 0x93, 0x53, 0x5a, 0x6d,
+	0x4d, 0x53, 0x6c, 0xab, 0xb1, 0x21, 0x66, 0x05, 0xc3, 0x81, 0x81, 0xc0, 0x70, 0xd0, 0xd1, 0x8d,
+	0xb7, 0x18, 0xe3, 0x51, 0xcb, 0xb0, 0x99, 0x02, 0x7f, 0x77, 0x1a, 0xa7, 0xdf, 0x72, 0x9c, 0xa3,
+	0xaf, 0xf3, 0x4c, 0xab, 0x07, 0x9e, 0xef, 0xf0, 0xc4, 0x0b, 0xcd, 0x9e, 0x37, 0x00, 0x40, 0x35,
+	0x80, 0x2b, 0x0a, 0x9a, 0x35, 0xb1, 0xf7, 0x34, 0xaa, 0x0e, 0xf0, 0x4b, 0x1d, 0x75, 0x80, 0xbf,
+	0x0f, 0x6e, 0x14, 0x01, 0x20, 0xd8, 0x80, 0x27, 0xbd, 0x24, 0x3a, 0xfd, 0xff, 0xd9, 0xe9, 0xfc,
+	0xff, 0x5a, 0x95, 0xff, 0x7f, 0x59, 0x87, 0xff, 0x7f, 0xbc, 0x2b, 0x18, 0x75, 0x55, 0x65, 0xc2,
+	0xfe, 0xfe, 0x35, 0xea, 0x69, 0x53, 0xee, 0x9d, 0x10, 0x9b, 0xa8, 0xc4, 0xb6, 0x65, 0x6d, 0x38,
+	0x68, 0x03, 0x82, 0xe1, 0x20, 0x02, 0x22, 0x27, 0x2b, 0x7b, 0x0e, 0x00, 0x60, 0xc1, 0x02, 0x70,
+	0x40, 0x6b, 0x04, 0xba, 0x9e, 0x20, 0x9f, 0x1a, 0xe8, 0x44, 0xf1, 0x5e, 0xa2, 0x7a, 0x8f, 0x28,
+	0xfe, 0x39, 0xff, 0x9e, 0xf0, 0x67, 0x9f, 0x1f, 0x08, 0x36, 0x76, 0x26, 0xc0, 0x30, 0x00, 0x8c,
+	0x98, 0x09, 0xc8, 0x74, 0xfe, 0x09, 0x72, 0x29, 0xf8, 0x79, 0xf4, 0x1f, 0x4a, 0x90, 0xe0, 0x68,
+	0x89, 0x2d, 0x43, 0xc0, 0xe4, 0x2c, 0x40, 0x1b, 0x00, 0xac, 0xf3, 0xf5, 0xce, 0xb8, 0x50, 0xef,
+	0x82, 0x8b, 0x0d, 0x2e, 0xb8, 0xd4, 0xe8, 0x82, 0xcb, 0x8d, 0xae, 0x78, 0xa4, 0x89, 0x66, 0x3f,
+	0x58, 0xcd, 0x6e, 0x78, 0x4c, 0xad, 0xc7, 0xd7, 0xba, 0xe1, 0x89, 0xb5, 0xee, 0x78, 0xb2, 0xc5,
+	0x1d, 0x4f, 0xb5, 0x52, 0xca, 0x4c, 0x01, 0xff, 0x4c, 0x9b, 0x4a, 0xcf, 0xb6, 0x7b, 0xe2, 0x39,
+	0x92, 0x00, 0x00, 0xd2, 0x6b, 0x8e, 0xaa, 0x3a, 0xc0, 0xeb, 0x0c, 0x00, 0xb9, 0x8b, 0x46, 0x1d,
+	0xe0, 0x03, 0x5d, 0x75, 0x80, 0x24, 0xfd, 0x75, 0x80, 0xbf, 0xf7, 0x8e, 0x89, 0x00, 0x10, 0xf4,
+	0x84, 0xbb, 0x95, 0x46, 0xfa, 0x3f, 0xe9, 0xff, 0x4b, 0xf4, 0xfb, 0xff, 0xa7, 0x05, 0xff, 0xef,
+	0xa0, 0xd7, 0xff, 0x1f, 0x5d, 0x1b, 0x8d, 0xe2, 0xe2, 0x62, 0x52, 0x09, 0x4a, 0x4a, 0x4a, 0x50,
+	0x5a, 0x5a, 0x4a, 0x2a, 0x43, 0x59, 0x59, 0x39, 0x2a, 0xb8, 0x18, 0x5a, 0x59, 0x49, 0xaa, 0x12,
+	0x00, 0x51, 0x5d, 0x5d, 0x8d, 0x5a, 0x0d, 0x48, 0xe8, 0x04, 0x04, 0x17, 0x01, 0xef, 0x14, 0x00,
+	0x16, 0x2e, 0x5e, 0x7a, 0x29, 0x02, 0xa0, 0xbd, 0xad, 0x9d, 0x03, 0x5d, 0x0c, 0x76, 0x31, 0xe0,
+	0xf5, 0x4a, 0xfc, 0x33, 0xda, 0x3b, 0xbb, 0x30, 0x18, 0x98, 0xf6, 0xbb, 0xdb, 0xb3, 0x75, 0x00,
+	0xc0, 0x94, 0x99, 0x00, 0xc3, 0x00, 0xa8, 0xf7, 0xfb, 0x29, 0x12, 0x1c, 0x97, 0x7c, 0xcf, 0xc1,
+	0x5f, 0x41, 0xd5, 0xff, 0xdd, 0xb9, 0x0a, 0x1c, 0x2d, 0xbe, 0x15, 0x00, 0x60, 0xb9, 0xe8, 0x87,
+	0x80, 0x09, 0x00, 0x78, 0x25, 0xd2, 0x45, 0x05, 0x00, 0xd2, 0x9b, 0x32, 0x67, 0x5c, 0xb5, 0x31,
+	0xae, 0x0e, 0xf0, 0x8b, 0xa9, 0x75, 0x80, 0x0a, 0x55, 0x1d, 0xe0, 0x6f, 0x3d, 0xa3, 0x1a, 0x00,
+	0x78, 0x2e, 0xd0, 0x01, 0x47, 0x52, 0x57, 0x19, 0xed, 0xff, 0x9f, 0x14, 0xfd, 0x7f, 0x8b, 0x4e,
+	0xff, 0x4f, 0x19, 0x80, 0x07, 0x6a, 0x8a, 0x32, 0x91, 0x47, 0x9e, 0x3d, 0x3f, 0x9f, 0x55, 0x80,
+	0x82, 0x82, 0x42, 0x14, 0x16, 0x16, 0xa2, 0xa8, 0xa8, 0x48, 0x2f, 0x18, 0xca, 0xcb, 0x2b, 0x08,
+	0x0e, 0x2c, 0x11, 0x0e, 0x55, 0x1a, 0xd9, 0x43, 0x4a, 0x52, 0xf2, 0x1d, 0x06, 0xc0, 0xc2, 0x2c,
+	0xc0, 0x0f, 0x24, 0x94, 0x14, 0x97, 0xf0, 0x28, 0xce, 0x23, 0xb8, 0x4e, 0x89, 0xa3, 0x7c, 0x57,
+	0x67, 0x17, 0x8b, 0x81, 0x41, 0x81, 0xde, 0x4a, 0x14, 0x5f, 0x4b, 0x64, 0x6f, 0xa0, 0x07, 0x5a,
+	0x7b, 0x93, 0x1e, 0xeb, 0x0e, 0x99, 0x6e, 0x2a, 0xd0, 0xd0, 0xf6, 0x60, 0x86, 0x17, 0x05, 0x25,
+	0x0b, 0x00, 0xb8, 0x9e, 0xe4, 0xb0, 0xe8, 0xdb, 0x02, 0x4f, 0x95, 0xf7, 0xef, 0x88, 0xb4, 0xc4,
+	0x91, 0x62, 0x1b, 0xd3, 0x00, 0xc0, 0xaa, 0x9e, 0x16, 0x02, 0x66, 0x03, 0x80, 0x00, 0x81, 0x4e,
+	0x2f, 0x9a, 0x02, 0x9c, 0x2c, 0x04, 0xea, 0xae, 0x03, 0x04, 0x19, 0x57, 0x07, 0xf8, 0x6b, 0x7b,
+	0xbf, 0x06, 0x00, 0x9e, 0x0f, 0x72, 0xc2, 0xa9, 0x3c, 0x6b, 0xfd, 0xdb, 0x7f, 0x11, 0x00, 0x2e,
+	0x1a, 0xe9, 0xff, 0x39, 0xfd, 0x3f, 0xd4, 0x10, 0x86, 0x8c, 0xcc, 0x4c, 0x64, 0x66, 0x65, 0x21,
+	0x8b, 0xd2, 0xf6, 0xec, 0xec, 0x1c, 0x64, 0xe7, 0xe4, 0x20, 0x27, 0x27, 0x17, 0xb9, 0xb9, 0x79,
+	0x46, 0x80, 0xa1, 0x54, 0x27, 0x18, 0x62, 0xa3, 0xa3, 0xc4, 0xf3, 0x01, 0x5f, 0x5a, 0x88, 0xc6,
+	0x3b, 0x70, 0xd1, 0x8d, 0xe7, 0x6d, 0xc1, 0xf8, 0xd0, 0x8f, 0x29, 0xcd, 0x30, 0x53, 0x55, 0xa9,
+	0x57, 0x95, 0x15, 0x86, 0xe7, 0xcd, 0xb7, 0x36, 0xa5, 0xea, 0x5e, 0x14, 0x64, 0xa6, 0x99, 0x80,
+	0x0a, 0xef, 0x45, 0xc8, 0x76, 0x57, 0xa5, 0xfe, 0xac, 0xf1, 0x14, 0xa9, 0x7e, 0x00, 0xb0, 0x28,
+	0xf8, 0x0d, 0x43, 0xc0, 0xdc, 0x00, 0x60, 0x79, 0x18, 0xcc, 0x02, 0x5e, 0xf5, 0x77, 0xd6, 0x5f,
+	0x07, 0xf0, 0xd1, 0x5d, 0x07, 0xf8, 0x79, 0x46, 0xfe, 0x4d, 0x75, 0x80, 0x3f, 0x37, 0x77, 0x68,
+	0x00, 0xe0, 0x95, 0x58, 0x4f, 0xbc, 0x3f, 0x1c, 0x80, 0x07, 0xca, 0x15, 0xda, 0xcb, 0x7f, 0xa7,
+	0xf1, 0xff, 0x8e, 0x82, 0xff, 0x7f, 0x4d, 0x0b, 0x00, 0xad, 0x05, 0xb1, 0x48, 0x49, 0x4d, 0x45,
+	0x6a, 0x5a, 0x9a, 0xa0, 0x34, 0x4a, 0xdd, 0xd3, 0x33, 0x32, 0x58, 0xc6, 0x80, 0x81, 0xa0, 0xa0,
+	0x1b, 0x0c, 0x01, 0xbe, 0x3e, 0x50, 0x9f, 0x0d, 0xb8, 0xf3, 0xce, 0x44, 0xc0, 0x42, 0x06, 0xf0,
+	0x1a, 0x89, 0x0f, 0x6b, 0x44, 0x19, 0xd3, 0x59, 0x50, 0xe9, 0xa4, 0x4a, 0x4b, 0x0c, 0x89, 0xc8,
+	0x5e, 0xac, 0x5f, 0xd5, 0xa5, 0x85, 0xb8, 0xd4, 0x11, 0x68, 0xd6, 0xa9, 0x40, 0x71, 0x26, 0x60,
+	0x53, 0xdc, 0x92, 0x1f, 0xd2, 0x5c, 0x96, 0x7e, 0x27, 0x06, 0x7f, 0x5d, 0xd0, 0x6a, 0xec, 0x2f,
+	0x50, 0xe2, 0x70, 0x91, 0x8d, 0x21, 0x08, 0xdc, 0x22, 0x00, 0x98, 0x6e, 0x03, 0x5e, 0xaa, 0xf3,
+	0x04, 0xb7, 0x00, 0x33, 0x04, 0x26, 0xeb, 0x00, 0x4e, 0x33, 0xaf, 0x03, 0xfc, 0xb9, 0xb1, 0x8d,
+	0x8a, 0x7f, 0x87, 0x54, 0x00, 0xd8, 0x72, 0x04, 0xaf, 0xa5, 0xba, 0xe3, 0xa3, 0xd1, 0x40, 0xea,
+	0xca, 0xf4, 0x67, 0xdf, 0x7f, 0xc3, 0xff, 0x97, 0xe9, 0xf7, 0xff, 0xcf, 0xb1, 0xff, 0x6f, 0xbb,
+	0xc9, 0xff, 0x13, 0xc4, 0xdd, 0x91, 0x90, 0x90, 0x80, 0xf8, 0x84, 0x44, 0x24, 0x24, 0x26, 0x21,
+	0x31, 0x29, 0x09, 0x49, 0xc9, 0xc9, 0xa4, 0x14, 0x24, 0xa7, 0xa4, 0x18, 0x0d, 0x06, 0x86, 0x82,
+	0x36, 0x18, 0xfc, 0x3c, 0x5d, 0xc5, 0xdd, 0x80, 0xd6, 0xdf, 0x99, 0x08, 0x58, 0xe8, 0x04, 0x3c,
+	0x29, 0x6e, 0x0d, 0x5e, 0x54, 0x58, 0xc4, 0xdb, 0x83, 0x19, 0xad, 0x82, 0xfc, 0x82, 0x69, 0xb5,
+	0xa3, 0x2e, 0xc6, 0x84, 0x45, 0x41, 0x86, 0x67, 0x02, 0xf6, 0xa4, 0x2c, 0xfb, 0x26, 0xd5, 0x69,
+	0xd1, 0x77, 0xb9, 0xee, 0x1c, 0xfc, 0x2a, 0xf5, 0xc7, 0x59, 0xe1, 0x50, 0x91, 0x8d, 0xf9, 0x01,
+	0xc0, 0x62, 0x00, 0x18, 0x84, 0x80, 0xe9, 0x00, 0x78, 0x91, 0x6c, 0xc0, 0xab, 0x01, 0xce, 0xe2,
+	0x74, 0xa0, 0xfe, 0x3a, 0x40, 0x04, 0xd5, 0x01, 0x62, 0x52, 0x0c, 0xd6, 0x01, 0xfe, 0x3e, 0xb4,
+	0x59, 0x00, 0xc0, 0x3f, 0x37, 0xee, 0xc5, 0xd5, 0x2a, 0x0f, 0x01, 0x00, 0x1f, 0x8f, 0x05, 0xe2,
+	0xbe, 0x1a, 0x57, 0xe4, 0xf9, 0x4b, 0xd0, 0x1e, 0x23, 0xc5, 0xde, 0x9c, 0xe9, 0xfc, 0xbf, 0xd3,
+	0x4d, 0xfe, 0xff, 0x81, 0x26, 0x1f, 0x44, 0x45, 0xc7, 0x20, 0x2a, 0x26, 0x06, 0xd1, 0xb1, 0xb1,
+	0x88, 0x89, 0x8b, 0x43, 0x6c, 0x5c, 0x3c, 0xe2, 0xe2, 0x13, 0x58, 0xda, 0x60, 0x60, 0x28, 0x90,
+	0x52, 0x19, 0x0c, 0x22, 0x14, 0x58, 0x22, 0x14, 0x6e, 0x80, 0x21, 0x3b, 0x1b, 0xf6, 0x4a, 0xb9,
+	0xda, 0x02, 0x58, 0xc7, 0x2f, 0x44, 0xe3, 0x1d, 0xb8, 0xe4, 0x52, 0xe9, 0xa8, 0xd0, 0x09, 0xe8,
+	0xed, 0x83, 0x5c, 0xa2, 0xb3, 0xb6, 0x72, 0x88, 0xdc, 0x86, 0x94, 0x4d, 0x74, 0x37, 0xa4, 0xc6,
+	0xc2, 0x14, 0xbc, 0xd4, 0xed, 0x6e, 0x96, 0xed, 0xc1, 0xf6, 0x64, 0xac, 0xfc, 0x47, 0x43, 0xd8,
+	0xaa, 0xa7, 0x02, 0xed, 0x56, 0x7d, 0x1f, 0xe9, 0xb0, 0x8a, 0x03, 0x7f, 0x52, 0x3b, 0xb2, 0xe5,
+	0x26, 0x02, 0x80, 0xc5, 0x00, 0x30, 0x08, 0x01, 0xf3, 0x00, 0x80, 0x45, 0xc1, 0x2f, 0x40, 0xa0,
+	0x63, 0x0a, 0x04, 0x5a, 0xa9, 0x16, 0x20, 0x11, 0xb2, 0x00, 0x3d, 0x75, 0x80, 0x68, 0xae, 0x03,
+	0xb0, 0x0d, 0x30, 0xdc, 0x0f, 0xd0, 0x40, 0xfd, 0x00, 0x43, 0x9b, 0xf0, 0xcb, 0xca, 0x7a, 0xbc,
+	0xdf, 0xe3, 0x3f, 0x09, 0x80, 0x4f, 0x48, 0x05, 0x41, 0x0a, 0x88, 0x05, 0x5f, 0x57, 0x1b, 0x29,
+	0x32, 0xfc, 0x64, 0xe8, 0x4d, 0x90, 0xe3, 0x74, 0x99, 0xcd, 0xb4, 0xfe, 0xff, 0x64, 0x9d, 0x2f,
+	0x42, 0xc3, 0xc3, 0x11, 0x16, 0x1e, 0x81, 0xf0, 0x88, 0x48, 0x44, 0x44, 0x46, 0x21, 0x22, 0x2a,
+	0x0a, 0x91, 0xd1, 0xd1, 0x7a, 0xc1, 0x10, 0xaf, 0x91, 0x31, 0x24, 0xeb, 0x04, 0x43, 0x7c, 0x7c,
+	0xfc, 0xe4, 0xf7, 0xc4, 0xc7, 0xd4, 0xdd, 0x91, 0x00, 0x58, 0xa8, 0x01, 0xc8, 0x8a, 0xf9, 0x01,
+	0xf0, 0xc6, 0x8c, 0x99, 0x19, 0x99, 0x82, 0x32, 0xd2, 0x33, 0x8c, 0x52, 0x7a, 0x5a, 0xba, 0x51,
+	0x3a, 0xd9, 0x18, 0xa0, 0x0f, 0x00, 0x7a, 0x67, 0x02, 0x4e, 0x92, 0x67, 0x5d, 0x97, 0x6c, 0x85,
+	0xca, 0x10, 0xab, 0xdf, 0x06, 0x39, 0x4b, 0x3e, 0xb2, 0x95, 0x49, 0x7f, 0x29, 0xbe, 0x2c, 0x72,
+	0x52, 0x96, 0xdb, 0x4a, 0xdc, 0x48, 0xff, 0x69, 0xbe, 0xbb, 0x50, 0xa9, 0x0f, 0x00, 0xda, 0x6d,
+	0xc1, 0xb7, 0xaf, 0x0e, 0x30, 0x83, 0x2c, 0xe0, 0x95, 0x14, 0x57, 0xd5, 0x8c, 0x80, 0xc4, 0x71,
+	0xb2, 0x0e, 0xf0, 0x9e, 0x47, 0xa0, 0x66, 0x1d, 0x20, 0x2a, 0xc9, 0x60, 0x1d, 0xe0, 0x4f, 0xf5,
+	0x2d, 0xf8, 0x65, 0x7e, 0x09, 0xde, 0x89, 0xf0, 0xc5, 0x07, 0x23, 0x01, 0xd4, 0x91, 0x19, 0x38,
+	0x09, 0x81, 0xd7, 0x7a, 0x7c, 0xe0, 0x62, 0xa3, 0x7b, 0xd9, 0x77, 0x80, 0x93, 0x0c, 0xb5, 0x91,
+	0x4a, 0xec, 0x2f, 0xb4, 0xc3, 0x73, 0xad, 0x2a, 0xff, 0xff, 0xe6, 0x14, 0x00, 0x0c, 0xe6, 0xf9,
+	0x21, 0x30, 0x38, 0x58, 0x50, 0x50, 0x48, 0x08, 0x82, 0x43, 0x43, 0x11, 0x12, 0x1a, 0x86, 0xd0,
+	0x30, 0x01, 0x0a, 0xba, 0xc1, 0x10, 0xa3, 0x0f, 0x0c, 0x89, 0x93, 0x60, 0x08, 0x08, 0x08, 0x14,
+	0xfd, 0xff, 0x95, 0x85, 0x48, 0xbc, 0x43, 0x17, 0x6f, 0xc3, 0x2c, 0x9e, 0x0c, 0x2c, 0x9e, 0x0a,
+	0x4c, 0xff, 0x37, 0x4a, 0xc9, 0x44, 0xf6, 0x69, 0x95, 0x98, 0x8c, 0x91, 0x92, 0xf0, 0x69, 0x67,
+	0x02, 0x8e, 0x15, 0x29, 0xd0, 0x1d, 0x2f, 0x43, 0x92, 0xb7, 0xf4, 0x2f, 0x2e, 0x4a, 0xe9, 0x5f,
+	0x75, 0xbc, 0xa8, 0x5f, 0x88, 0x3f, 0xf6, 0xb7, 0x5b, 0x33, 0x75, 0xf4, 0x27, 0x50, 0x48, 0x18,
+	0x00, 0x24, 0x1b, 0x86, 0xc0, 0xed, 0xab, 0x03, 0x98, 0xd1, 0x06, 0xbc, 0xc4, 0x56, 0x20, 0x48,
+	0x65, 0x05, 0xae, 0x28, 0x5d, 0xf5, 0xd4, 0x01, 0xc8, 0x06, 0xc4, 0xa5, 0xea, 0xab, 0x03, 0x10,
+	0x08, 0x6a, 0xf0, 0xa6, 0x0d, 0xcd, 0xd9, 0xd7, 0xfb, 0xdc, 0x04, 0x80, 0x4f, 0x48, 0xeb, 0xd2,
+	0xed, 0x84, 0xfb, 0xa7, 0x94, 0x49, 0xff, 0xa1, 0xb0, 0xb2, 0xb2, 0xa7, 0xec, 0xaf, 0x99, 0x2c,
+	0xe0, 0x63, 0xf4, 0x6b, 0xdf, 0x90, 0xc4, 0x55, 0x79, 0xc8, 0x0a, 0xb0, 0xc1, 0x48, 0xba, 0x3d,
+	0x1e, 0xa0, 0xcf, 0x7d, 0xa5, 0xd7, 0x0d, 0x95, 0x49, 0x3e, 0xf0, 0xf5, 0xf3, 0x17, 0xe4, 0xe7,
+	0x1f, 0x00, 0x7f, 0x0a, 0x5c, 0xff, 0xc0, 0x40, 0x04, 0x04, 0x05, 0xcd, 0x0a, 0x0c, 0x7e, 0xee,
+	0x4e, 0x73, 0xc4, 0xff, 0x2f, 0xd8, 0x80, 0x8f, 0xf8, 0x41, 0x04, 0x05, 0x06, 0x21, 0x21, 0x3e,
+	0x41, 0x43, 0xf1, 0x44, 0xee, 0xe9, 0x14, 0x17, 0x1b, 0x67, 0x50, 0x29, 0xf1, 0x31, 0x54, 0x54,
+	0x72, 0x15, 0x67, 0x02, 0x28, 0xcd, 0x74, 0xa0, 0x00, 0xb4, 0x45, 0x7f, 0xb2, 0x12, 0x39, 0x01,
+	0x72, 0xb8, 0xda, 0xaa, 0xa6, 0x22, 0xa7, 0xe8, 0xef, 0xa4, 0xa7, 0xd8, 0x9e, 0xb0, 0x37, 0xb4,
+	0xb6, 0xb6, 0xfe, 0x11, 0x65, 0x2a, 0xc1, 0xba, 0x46, 0xff, 0x2a, 0x7f, 0x0b, 0xec, 0xcd, 0x53,
+	0xe0, 0x20, 0x03, 0x80, 0x64, 0x3e, 0x00, 0xb0, 0x9c, 0xf0, 0x60, 0xad, 0x01, 0x08, 0x98, 0x19,
+	0x00, 0xac, 0xd7, 0x1c, 0x84, 0xe6, 0x20, 0x5e, 0x1b, 0xa0, 0xa3, 0x0e, 0x90, 0x30, 0x59, 0x07,
+	0xf8, 0xd9, 0xd4, 0x3a, 0x80, 0x7a, 0x79, 0xf0, 0x3b, 0xae, 0xfe, 0x78, 0x3b, 0xc4, 0x87, 0xab,
+	0xff, 0x3a, 0x01, 0xc0, 0x05, 0xc1, 0x10, 0x67, 0xf5, 0x0e, 0xbc, 0x52, 0x69, 0xfe, 0xd4, 0x7e,
+	0x10, 0xfa, 0x79, 0x34, 0xdd, 0xef, 0x6d, 0x74, 0x7f, 0xaf, 0x4e, 0x7d, 0x16, 0xb6, 0x72, 0x19,
+	0xdc, 0xec, 0x95, 0xb0, 0xb7, 0x77, 0x80, 0x8b, 0x8b, 0x2b, 0x3c, 0xbc, 0xbc, 0xe1, 0xe5, 0xe3,
+	0x0b, 0x6f, 0x92, 0x8f, 0xaf, 0x9f, 0x0a, 0x0c, 0xfe, 0xba, 0xc1, 0x10, 0x14, 0x1c, 0xa2, 0x1b,
+	0x0c, 0x11, 0x11, 0x08, 0xa6, 0xdf, 0x93, 0x4b, 0x55, 0xff, 0x06, 0xc3, 0x68, 0x21, 0x0a, 0xef,
+	0x24, 0x00, 0x24, 0x92, 0x72, 0xc1, 0x87, 0xd9, 0xd9, 0x23, 0x26, 0x9a, 0xe8, 0x1c, 0x15, 0x6d,
+	0x94, 0xa2, 0x88, 0xec, 0xc6, 0x28, 0x32, 0x22, 0x0a, 0xdd, 0x99, 0xde, 0x18, 0x49, 0xb3, 0x43,
+	0x76, 0x80, 0x02, 0x4e, 0xca, 0x9b, 0xf6, 0x84, 0xfb, 0x35, 0x17, 0x23, 0xf9, 0xfb, 0xd0, 0xf7,
+	0x32, 0x50, 0x9a, 0xf8, 0x80, 0x30, 0xfa, 0xdb, 0x5b, 0x69, 0x8c, 0xfe, 0x4d, 0x21, 0xab, 0x71,
+	0xa0, 0x40, 0xa9, 0x0f, 0x00, 0x66, 0x68, 0x0b, 0x36, 0x1f, 0x00, 0x9e, 0x6e, 0x33, 0x02, 0x02,
+	0x4d, 0x34, 0x2b, 0x60, 0xa3, 0x82, 0xc0, 0x15, 0x82, 0x80, 0x50, 0x07, 0xf0, 0x55, 0xd5, 0x01,
+	0x38, 0x13, 0xe0, 0xa6, 0x20, 0xed, 0x3a, 0xc0, 0x57, 0xc9, 0xd9, 0xb8, 0x4a, 0x75, 0x83, 0x37,
+	0x29, 0x73, 0x78, 0xaf, 0x33, 0x40, 0x13, 0x00, 0xa4, 0x8f, 0xa7, 0x40, 0x60, 0x7b, 0xae, 0xfd,
+	0x3f, 0xf8, 0x3e, 0xda, 0xc9, 0x65, 0x57, 0x0c, 0x35, 0x88, 0xf1, 0xc9, 0xd1, 0xbc, 0x59, 0x8c,
+	0x8d, 0x4c, 0xfa, 0xb4, 0x42, 0xaa, 0x5a, 0x31, 0x2a, 0x4a, 0x21, 0x57, 0xc0, 0x8e, 0xde, 0x15,
+	0x27, 0x67, 0x17, 0xb8, 0x7b, 0x7a, 0xc1, 0x93, 0xa0, 0xe0, 0xe9, 0xed, 0x33, 0x23, 0x30, 0x38,
+	0x39, 0xd8, 0x43, 0xfd, 0x7d, 0x9c, 0x5e, 0x88, 0xc0, 0x3b, 0x7c, 0x59, 0x58, 0x58, 0xfc, 0x7f,
+	0xf4, 0x90, 0x7f, 0xa7, 0x5a, 0x16, 0xec, 0x87, 0x70, 0x22, 0xb5, 0xa8, 0xb0, 0x50, 0x03, 0x62,
+	0xaa, 0x87, 0xe8, 0x56, 0x60, 0x40, 0x10, 0x7c, 0x3c, 0x3d, 0x11, 0xe8, 0xee, 0x00, 0x67, 0x1b,
+	0x39, 0x34, 0x5e, 0x20, 0x89, 0xf4, 0xb7, 0x62, 0xc0, 0xd3, 0xe8, 0x2e, 0x35, 0xae, 0x65, 0x59,
+	0x22, 0x64, 0x09, 0xc9, 0x2e, 0x16, 0x1a, 0x00, 0x18, 0x4b, 0x92, 0xe8, 0x01, 0x00, 0xcb, 0x76,
+	0xee, 0xb7, 0x05, 0x6b, 0x03, 0xa0, 0xcb, 0x8b, 0x66, 0x4a, 0xbc, 0xf1, 0xba, 0x8f, 0x8b, 0x6a,
+	0x66, 0x40, 0xee, 0x8c, 0x77, 0x5d, 0xfc, 0x55, 0x75, 0x00, 0xb2, 0x01, 0x0c, 0x04, 0x06, 0xc1,
+	0x97, 0x64, 0x03, 0xbe, 0x48, 0x48, 0xc7, 0xbb, 0x1e, 0x41, 0x2a, 0x58, 0x38, 0x12, 0x2c, 0xd6,
+	0x86, 0xe0, 0xbd, 0x21, 0x7f, 0xbc, 0x47, 0x00, 0xd0, 0x97, 0x05, 0xbc, 0x3b, 0xe8, 0x0b, 0x2f,
+	0xfb, 0xc9, 0xb3, 0xf8, 0x95, 0xc6, 0xbc, 0x1f, 0xbc, 0x5b, 0x2f, 0x9f, 0xdb, 0x4f, 0x40, 0x68,
+	0xb3, 0x91, 0xcb, 0xde, 0x50, 0x48, 0x65, 0xdf, 0x6b, 0x03, 0xc1, 0xd6, 0xd6, 0x0e, 0x0e, 0x94,
+	0xbd, 0x38, 0xbb, 0xba, 0xc1, 0xdd, 0xc3, 0x13, 0x1e, 0x22, 0x14, 0x44, 0x30, 0x10, 0x14, 0x7c,
+	0xd4, 0x72, 0xb0, 0x77, 0x50, 0x5b, 0x11, 0xd9, 0x1f, 0x38, 0xbb, 0x9b, 0x03, 0x21, 0xb0, 0x70,
+	0x71, 0x4a, 0x28, 0xd6, 0x02, 0x82, 0x02, 0x83, 0xa7, 0x28, 0x48, 0x9f, 0x28, 0xc8, 0x59, 0x81,
+	0x82, 0xfc, 0x89, 0xf8, 0x1e, 0xee, 0x1e, 0x70, 0x71, 0x74, 0x84, 0x93, 0x8d, 0x42, 0x23, 0xe0,
+	0x95, 0x04, 0x17, 0x8d, 0x80, 0x37, 0x71, 0xa6, 0xc2, 0x51, 0x2e, 0xd1, 0x08, 0xfe, 0x02, 0x4f,
+	0x5e, 0xf9, 0x27, 0xc7, 0x81, 0x7c, 0x02, 0x80, 0x6e, 0x08, 0xcc, 0xd5, 0xb6, 0x60, 0xc3, 0x00,
+	0xe8, 0xf6, 0xc6, 0x2b, 0xa4, 0xd7, 0x93, 0xdc, 0x79, 0xb3, 0x90, 0xc9, 0x3d, 0x03, 0xae, 0xd8,
+	0xb8, 0x73, 0x91, 0xf0, 0xa6, 0x9d, 0x84, 0xde, 0xf6, 0xf7, 0xc5, 0x3b, 0xbd, 0xfe, 0x78, 0x77,
+	0xc8, 0x7f, 0x5a, 0x00, 0x7c, 0xba, 0x2e, 0x08, 0x8d, 0xd1, 0xca, 0x3f, 0xf3, 0xfd, 0xe4, 0x94,
+	0xdf, 0xd4, 0xf7, 0x85, 0x33, 0x35, 0x99, 0x44, 0xd6, 0x42, 0x30, 0x78, 0x51, 0x2e, 0x15, 0x6b,
+	0x08, 0x9a, 0x50, 0x50, 0x2a, 0x94, 0xb0, 0xb5, 0xb1, 0xe5, 0x6c, 0x81, 0x2d, 0x84, 0xea, 0xff,
+	0x4a, 0x85, 0x18, 0xfc, 0x7f, 0x9e, 0x43, 0xc7, 0x80, 0x2d, 0x5c, 0x4c, 0x79, 0x6e, 0xc7, 0xe4,
+	0x87, 0xe3, 0x44, 0x24, 0xf7, 0x23, 0x52, 0xb3, 0x7c, 0x7d, 0x74, 0xcb, 0xc7, 0xdb, 0x17, 0xee,
+	0x6e, 0xee, 0xc2, 0x01, 0x0f, 0x76, 0x4a, 0xa5, 0xc6, 0xc3, 0xb7, 0x91, 0xc9, 0xfe, 0x41, 0x7a,
+	0x40, 0x0c, 0x78, 0x33, 0xf4, 0x2a, 0xbc, 0xcc, 0x5f, 0x37, 0xd4, 0x41, 0xb3, 0xf8, 0xc7, 0x2b,
+	0xff, 0xf6, 0xe5, 0x2b, 0xb0, 0x9f, 0xa4, 0xd7, 0x06, 0xcc, 0xb1, 0xb6, 0x60, 0x0e, 0xfa, 0x17,
+	0xbb, 0x7c, 0xf0, 0x52, 0x8f, 0x2f, 0x05, 0xbf, 0x97, 0x46, 0x5b, 0xb0, 0x2e, 0x08, 0xbc, 0x56,
+	0xed, 0x89, 0x37, 0xdd, 0x85, 0x19, 0x02, 0x0d, 0x31, 0x08, 0xde, 0x0e, 0xf6, 0xc5, 0xdb, 0x0d,
+	0x7e, 0x78, 0x7b, 0xd0, 0x0f, 0xef, 0x0c, 0x1a, 0x0d, 0x00, 0xfa, 0x2c, 0xae, 0x3f, 0x37, 0x77,
+	0xff, 0x3d, 0x67, 0x13, 0x7c, 0xce, 0x84, 0x0a, 0xd6, 0xb2, 0x8b, 0x32, 0x09, 0xcf, 0xda, 0x68,
+	0xd7, 0x76, 0x18, 0x3a, 0x5c, 0xe0, 0x95, 0x1d, 0x9b, 0x83, 0x23, 0xff, 0xc2, 0xa5, 0x58, 0xa3,
+	0xb0, 0xa4, 0x0a, 0xf1, 0x1f, 0xc4, 0x4c, 0xc0, 0xc5, 0xc9, 0x85, 0x82, 0xdc, 0x03, 0x9e, 0xee,
+	0x9e, 0xc2, 0xe8, 0xee, 0xea, 0xe2, 0xca, 0xe9, 0x9b, 0xf0, 0x7b, 0x72, 0x8d, 0x80, 0x97, 0x7e,
+	0xe3, 0x6c, 0x2b, 0x7f, 0x9e, 0xab, 0xca, 0xe6, 0x2e, 0xe8, 0xb0, 0x1f, 0x15, 0x5f, 0xa4, 0x54,
+	0x57, 0xcd, 0xf4, 0xbf, 0x3f, 0xd6, 0xca, 0x10, 0x00, 0xe6, 0x54, 0x5b, 0x30, 0x8f, 0xf8, 0x6f,
+	0x8d, 0x86, 0xe1, 0xa3, 0x89, 0x18, 0x7c, 0xbc, 0x39, 0x76, 0x52, 0xef, 0x6f, 0x88, 0xc2, 0x95,
+	0xe1, 0x60, 0xbc, 0x42, 0x40, 0xd0, 0x05, 0x80, 0x57, 0x7b, 0xbc, 0x85, 0x29, 0xbc, 0xd7, 0x09,
+	0x1a, 0x6f, 0x94, 0x79, 0xe3, 0x4a, 0x8d, 0x0f, 0xde, 0xec, 0xf0, 0xc1, 0x95, 0x7e, 0x5f, 0x5c,
+	0x1d, 0xf0, 0xc3, 0x5b, 0x24, 0xbd, 0x00, 0xd0, 0x0d, 0x01, 0xfa, 0x7d, 0xbf, 0x3f, 0x38, 0x2a,
+	0x54, 0xcf, 0x8e, 0xed, 0xdf, 0xad, 0x5e, 0x70, 0xc6, 0x16, 0x8e, 0x47, 0x7b, 0x61, 0x30, 0x58,
+	0xb8, 0xe6, 0xf6, 0x65, 0x69, 0x69, 0xb9, 0x4c, 0x2e, 0x95, 0x6f, 0x94, 0x49, 0xc4, 0xa9, 0x38,
+	0x9d, 0xfa, 0x5e, 0x95, 0x2d, 0xc8, 0x06, 0xe9, 0xe1, 0xfa, 0xdf, 0xca, 0x97, 0x88, 0xb2, 0x88,
+	0x6c, 0xa1, 0x1a, 0x2d, 0xd5, 0x4c, 0xff, 0x59, 0x9b, 0xd2, 0xa4, 0xfa, 0x00, 0xc0, 0x9a, 0x33,
+	0x6d, 0xc1, 0x2f, 0x74, 0xfb, 0xe2, 0xdd, 0xf1, 0x08, 0x0e, 0x78, 0xbd, 0x62, 0x30, 0xbc, 0x31,
+	0x10, 0xa0, 0x1f, 0x00, 0xbd, 0x04, 0x00, 0xd2, 0x9b, 0x7d, 0xbe, 0x82, 0xae, 0x90, 0xae, 0xf6,
+	0xfb, 0x19, 0x86, 0x80, 0x4e, 0x00, 0xf0, 0x8f, 0x03, 0x10, 0xef, 0x25, 0x37, 0x5c, 0x81, 0x5f,
+	0xb8, 0x16, 0x0a, 0x83, 0x3c, 0x35, 0x44, 0x85, 0x9f, 0x6a, 0x9e, 0xa7, 0x95, 0x5b, 0x4b, 0x0f,
+	0x71, 0x7a, 0xc7, 0xd5, 0x61, 0xa6, 0xfa, 0x6c, 0xf6, 0x20, 0x98, 0x89, 0x28, 0xfd, 0x3f, 0xcf,
+	0x2f, 0xaa, 0x8f, 0x8d, 0xa5, 0x46, 0xf0, 0x97, 0xf9, 0xac, 0xe4, 0xa5, 0xbf, 0x0c, 0x00, 0x5d,
+	0x10, 0x98, 0x33, 0x6d, 0xc1, 0x4f, 0xb5, 0x79, 0xf0, 0x1e, 0x80, 0x1c, 0xe4, 0xd3, 0xea, 0x83,
+	0x8d, 0xd1, 0x78, 0xb9, 0xcb, 0xfb, 0x06, 0x00, 0x58, 0x3d, 0x0c, 0x01, 0x1f, 0x9d, 0x10, 0x30,
+	0x9c, 0x05, 0x18, 0xb6, 0x01, 0x95, 0x61, 0x2a, 0x2f, 0xce, 0x69, 0xfb, 0x3c, 0x7b, 0x75, 0x17,
+	0x2e, 0xf6, 0x57, 0x42, 0x83, 0x8f, 0xb5, 0x2c, 0x9d, 0xd3, 0x72, 0x9e, 0xce, 0xd1, 0x16, 0x8d,
+	0xde, 0xbb, 0x38, 0xa8, 0x6d, 0xe4, 0xd2, 0x7b, 0x1c, 0x14, 0xd2, 0xb3, 0xa2, 0x6c, 0x69, 0xda,
+	0x87, 0x52, 0xfa, 0x97, 0xb4, 0x45, 0xb3, 0x04, 0x5f, 0x92, 0x7e, 0xae, 0x2d, 0xb1, 0x3a, 0x7f,
+	0xab, 0x15, 0xeb, 0xa4, 0x99, 0xfe, 0x73, 0xf7, 0xdf, 0x1e, 0xde, 0xa1, 0x27, 0xcf, 0xac, 0x00,
+	0x60, 0x31, 0x00, 0xcc, 0x66, 0x03, 0xae, 0x8e, 0x86, 0x72, 0x70, 0x1b, 0xad, 0xb7, 0x47, 0x43,
+	0x75, 0x65, 0x01, 0xe6, 0x05, 0xc0, 0x58, 0x10, 0x5a, 0x62, 0x6d, 0xd4, 0x95, 0x7c, 0x49, 0xd7,
+	0x42, 0xc4, 0xcc, 0x97, 0x22, 0x9e, 0x44, 0x52, 0x4f, 0x81, 0xfd, 0x1c, 0x3f, 0xd8, 0xf9, 0x24,
+	0x7b, 0xc9, 0x6a, 0x64, 0xb9, 0x2d, 0x37, 0x16, 0x00, 0x73, 0xa6, 0x2d, 0xf8, 0xd9, 0x0e, 0xef,
+	0x99, 0x04, 0xbf, 0x98, 0x05, 0x70, 0xe0, 0xcf, 0x1e, 0x00, 0x86, 0x21, 0xc0, 0x5d, 0x81, 0xdf,
+	0xab, 0xbb, 0xf0, 0x2e, 0xb1, 0x8d, 0x63, 0x2b, 0xc0, 0x19, 0xd7, 0x6c, 0x45, 0x19, 0x85, 0x33,
+	0x7f, 0x3d, 0x6d, 0xb1, 0x95, 0xe3, 0x99, 0x26, 0x16, 0x43, 0x47, 0xd7, 0x60, 0x34, 0x55, 0xdc,
+	0x08, 0x26, 0x4a, 0x5d, 0x9c, 0xfe, 0x42, 0xa7, 0xac, 0xa5, 0x9f, 0xf0, 0x9f, 0xe1, 0xcf, 0xc1,
+	0x5f, 0x97, 0xbf, 0x87, 0xbb, 0x32, 0x5d, 0xa7, 0xa2, 0xdc, 0xd9, 0x9b, 0x2b, 0xae, 0x32, 0xb8,
+	0x38, 0xd8, 0xc3, 0xc5, 0xd1, 0x01, 0x9e, 0x6e, 0x6e, 0xf0, 0xf7, 0xf1, 0x81, 0xbf, 0xaf, 0x1f,
+	0x4b, 0x58, 0xfd, 0x17, 0x15, 0x11, 0x39, 0xa9, 0xe4, 0xc4, 0x24, 0xa4, 0x25, 0x27, 0x23, 0x2d,
+	0x31, 0x5e, 0x43, 0x85, 0xe1, 0xce, 0x28, 0x0d, 0xb6, 0x46, 0x43, 0x84, 0x15, 0x9a, 0x22, 0xad,
+	0xd0, 0x48, 0xff, 0xaf, 0x0f, 0xb7, 0x42, 0x5d, 0x98, 0x15, 0x6a, 0x43, 0xad, 0x50, 0x1d, 0x6a,
+	0x89, 0xaa, 0x60, 0x4b, 0x54, 0x90, 0xca, 0x03, 0xd7, 0xa0, 0x34, 0x60, 0x0d, 0x8a, 0x49, 0x35,
+	0xc1, 0xab, 0x50, 0x4d, 0xaa, 0x0c, 0xb4, 0x40, 0x79, 0x80, 0x05, 0x4a, 0xfd, 0x2d, 0x50, 0xe2,
+	0x67, 0x81, 0x22, 0x5f, 0x0b, 0x14, 0xf8, 0x58, 0x20, 0xcf, 0x6b, 0x25, 0x72, 0x3c, 0x57, 0x22,
+	0xcb, 0x63, 0x25, 0x32, 0xdd, 0x57, 0x22, 0xdd, 0x6d, 0x05, 0x15, 0xf9, 0x56, 0x20, 0xd9, 0x79,
+	0x05, 0x12, 0x9d, 0x97, 0x23, 0xde, 0x69, 0x39, 0x62, 0x1d, 0x96, 0x23, 0x9a, 0x14, 0x20, 0xfb,
+	0x29, 0xb2, 0xb5, 0x00, 0xd0, 0x16, 0xb1, 0x46, 0x1f, 0x00, 0xe6, 0x4c, 0x5b, 0xf0, 0x73, 0x9d,
+	0x3e, 0x33, 0x06, 0x00, 0xeb, 0xf5, 0x3e, 0xff, 0xe9, 0x00, 0x30, 0xeb, 0x2c, 0x60, 0x6f, 0xa1,
+	0xa3, 0x00, 0x80, 0x79, 0xa8, 0xaf, 0xd9, 0xb6, 0xde, 0x6d, 0x9b, 0x7a, 0x9c, 0x53, 0x7f, 0xf8,
+	0x6b, 0x89, 0x71, 0x71, 0x3f, 0xd4, 0x54, 0xd7, 0xa0, 0xbb, 0xab, 0x9b, 0xb7, 0xe9, 0x9a, 0xb5,
+	0x8e, 0x94, 0x39, 0xe3, 0x64, 0xa1, 0x25, 0x8e, 0x17, 0xac, 0xc1, 0x91, 0xfc, 0x35, 0x38, 0x94,
+	0xbb, 0x06, 0x07, 0xb2, 0x57, 0x63, 0x6f, 0xd6, 0x6a, 0xec, 0xce, 0x58, 0x8d, 0x1d, 0xe9, 0xab,
+	0xb0, 0x2d, 0x75, 0x15, 0x36, 0xa7, 0xac, 0xc2, 0xc6, 0x24, 0x0b, 0xac, 0x4f, 0xb0, 0xc0, 0xba,
+	0x78, 0x0b, 0x8c, 0xc4, 0xad, 0xc4, 0x50, 0xcc, 0x4a, 0xf4, 0x47, 0xaf, 0x40, 0x4f, 0xe4, 0x0a,
+	0x74, 0x45, 0xac, 0x40, 0x47, 0xf8, 0x0a, 0xb4, 0x86, 0x2e, 0x47, 0x73, 0xf0, 0x72, 0x34, 0x06,
+	0x2d, 0x47, 0x5d, 0xc0, 0x32, 0xd4, 0xf8, 0x2f, 0x43, 0x95, 0xdf, 0x32, 0x94, 0xfb, 0x2c, 0x45,
+	0xa9, 0xf7, 0x52, 0x14, 0x79, 0x2e, 0x45, 0xbe, 0xfb, 0x12, 0xe4, 0xba, 0x2d, 0x41, 0x96, 0xcb,
+	0x12, 0x64, 0x38, 0x2f, 0x46, 0xa8, 0x62, 0x11, 0xd2, 0x9c, 0x97, 0x69, 0x00, 0xa0, 0x2b, 0xca,
+	0x12, 0xbb, 0xf3, 0xe4, 0x86, 0x20, 0x60, 0x5e, 0x00, 0x98, 0xd0, 0x16, 0xfc, 0xac, 0x89, 0x00,
+	0xb8, 0x3a, 0x1c, 0x2c, 0x00, 0xe0, 0xa5, 0x6e, 0xef, 0x5b, 0x66, 0x03, 0x0e, 0x14, 0xda, 0xc3,
+	0x4e, 0x2e, 0xb9, 0x7e, 0xab, 0x03, 0xd2, 0x51, 0x29, 0x85, 0xb7, 0xbd, 0x0c, 0xde, 0x0e, 0x32,
+	0xf8, 0x90, 0x42, 0x5c, 0xe4, 0x08, 0xf7, 0x76, 0x82, 0x8f, 0x97, 0x37, 0x8b, 0x7b, 0x48, 0xb8,
+	0xa1, 0x4c, 0x94, 0x76, 0x2b, 0xba, 0xb0, 0xe8, 0x2c, 0x3b, 0x33, 0x6b, 0x5a, 0xf1, 0xba, 0x13,
+	0x67, 0x27, 0xe7, 0xc9, 0x7f, 0x97, 0xeb, 0x57, 0x77, 0xd5, 0xc6, 0x9e, 0x72, 0x0a, 0xfe, 0xd2,
+	0xe2, 0x12, 0x0e, 0x5a, 0xb3, 0x69, 0x53, 0x6b, 0x11, 0xce, 0x14, 0x5b, 0xe2, 0x54, 0x11, 0x6f,
+	0x2a, 0xb9, 0x06, 0x47, 0x09, 0x00, 0x87, 0xd5, 0x00, 0xd8, 0x47, 0x00, 0xd8, 0x93, 0xb9, 0x1a,
+	0x3b, 0x09, 0x00, 0xdb, 0xd3, 0x56, 0x61, 0x0b, 0x01, 0x60, 0x53, 0xb2, 0x05, 0x36, 0x24, 0x5a,
+	0x60, 0x9c, 0xb7, 0xd3, 0x8e, 0xb3, 0xc0, 0x50, 0xec, 0x4a, 0x0c, 0x44, 0xaf, 0x44, 0x6f, 0xd4,
+	0x0a, 0x74, 0x13, 0x04, 0x3a, 0x09, 0x00, 0x6d, 0x61, 0xcb, 0xb1, 0x36, 0x64, 0x39, 0x9a, 0x08,
+	0x00, 0xf5, 0x81, 0x37, 0x00, 0x50, 0x41, 0x00, 0x28, 0x23, 0x00, 0x14, 0x7b, 0x2d, 0x45, 0x81,
+	0xc7, 0x12, 0xe4, 0x11, 0x00, 0xb2, 0x5d, 0x97, 0x20, 0x93, 0x20, 0x10, 0x65, 0xbb, 0x08, 0xa9,
+	0xda, 0x00, 0x88, 0x26, 0x00, 0xe4, 0xea, 0x00, 0xc0, 0x1c, 0x6a, 0x0b, 0x7e, 0xba, 0xdd, 0xcb,
+	0x14, 0x00, 0xf0, 0xb4, 0xa0, 0xd9, 0xeb, 0x00, 0xda, 0x6d, 0xc1, 0x17, 0x6b, 0xed, 0xd0, 0x13,
+	0xb3, 0x02, 0xbd, 0xa4, 0x3e, 0x7a, 0x4e, 0x9d, 0xd1, 0x16, 0x68, 0x89, 0xb4, 0x40, 0x2b, 0xa9,
+	0x2d, 0xca, 0x02, 0xed, 0x2c, 0xfa, 0xb5, 0x8e, 0xe8, 0x55, 0xe8, 0x8c, 0x51, 0xa9, 0x8b, 0xd4,
+	0xad, 0x56, 0x4f, 0x2c, 0x3d, 0xef, 0x54, 0x2b, 0xec, 0xce, 0x92, 0x62, 0x5f, 0xb6, 0x0c, 0x07,
+	0xe8, 0x59, 0x1c, 0xa6, 0xfb, 0xff, 0x60, 0xb9, 0x12, 0x17, 0xab, 0x6d, 0x68, 0x79, 0xb7, 0x2d,
+	0x2d, 0xf3, 0xe6, 0xc5, 0x5e, 0xbc, 0xe8, 0x8b, 0x17, 0x7f, 0x39, 0xe2, 0x65, 0x5e, 0x69, 0xd8,
+	0xee, 0x8c, 0x37, 0x3b, 0x5d, 0xf0, 0x68, 0x67, 0xc4, 0xf5, 0xce, 0xf6, 0xf6, 0xeb, 0x1d, 0xed,
+	0x1d, 0x30, 0xa7, 0x18, 0x1a, 0x1c, 0x0f, 0x6c, 0x0d, 0xd8, 0x16, 0xdf, 0x0d, 0x67, 0xfb, 0x75,
+	0xf1, 0x07, 0x8e, 0x8f, 0x08, 0x31, 0x6b, 0xf0, 0x8f, 0xf4, 0x75, 0x51, 0x70, 0xd8, 0xe2, 0xac,
+	0x1a, 0x00, 0x27, 0x0a, 0xd7, 0xe0, 0x18, 0x01, 0xe0, 0x48, 0xde, 0x1a, 0x1c, 0xcc, 0x59, 0x8d,
+	0xfd, 0xd9, 0x2a, 0x00, 0xec, 0xa2, 0x2c, 0x80, 0x01, 0xb0, 0x95, 0xb2, 0x80, 0x89, 0x29, 0x59,
+	0xc0, 0x18, 0x65, 0x01, 0xc3, 0xf4, 0x62, 0x0d, 0x52, 0x16, 0xd0, 0x37, 0x05, 0x00, 0xed, 0x04,
+	0x80, 0x16, 0x75, 0x16, 0xd0, 0x40, 0x00, 0xa8, 0xa5, 0x2c, 0xa0, 0x9a, 0x00, 0x50, 0xe9, 0xbb,
+	0x0c, 0x65, 0x04, 0x81, 0x12, 0x02, 0x40, 0xa1, 0xc7, 0x52, 0xe4, 0x51, 0x16, 0x90, 0xe3, 0xa6,
+	0x02, 0x40, 0xb4, 0xf1, 0x00, 0x98, 0x53, 0x6d, 0xc1, 0x4f, 0xb4, 0x7a, 0xe0, 0x83, 0x4d, 0xd1,
+	0x33, 0x06, 0xc0, 0x6b, 0xfd, 0xfe, 0xa6, 0x01, 0x80, 0x44, 0x00, 0x30, 0x2a, 0x0b, 0x38, 0x5f,
+	0x63, 0xab, 0x01, 0x80, 0x7e, 0x56, 0x1c, 0x01, 0x9b, 0x34, 0x18, 0x4f, 0xd9, 0x1b, 0x69, 0x38,
+	0x61, 0x25, 0x46, 0x18, 0xe6, 0x04, 0xf5, 0x31, 0xd2, 0xba, 0xa4, 0x49, 0x51, 0x06, 0xc8, 0xef,
+	0x84, 0x04, 0xa7, 0x8b, 0xa4, 0xb8, 0xb7, 0x44, 0x86, 0x07, 0xca, 0xe4, 0x78, 0xb8, 0x42, 0x81,
+	0xf3, 0x95, 0x4a, 0x5c, 0x22, 0x00, 0x3c, 0x4a, 0x00, 0x78, 0xc2, 0x00, 0x00, 0xae, 0x76, 0xbb,
+	0xe2, 0xf1, 0x9e, 0x28, 0x61, 0x6b, 0x70, 0x73, 0x43, 0xc0, 0xd3, 0xd5, 0x45, 0x0d, 0x01, 0x59,
+	0xfa, 0xfc, 0x3f, 0xdf, 0x5f, 0x2e, 0xfd, 0x8c, 0x3e, 0x2c, 0xef, 0xcf, 0x67, 0xb6, 0xe0, 0x1f,
+	0xee, 0xef, 0xc3, 0xf1, 0x4a, 0x57, 0xdc, 0x5f, 0x6a, 0x49, 0x0f, 0xd7, 0x12, 0xa7, 0x09, 0x02,
+	0x93, 0x36, 0x20, 0xef, 0xf6, 0xdb, 0x80, 0x78, 0x87, 0xc5, 0x48, 0x71, 0x5e, 0xaa, 0x01, 0x80,
+	0x8e, 0xc8, 0x35, 0xba, 0x00, 0x30, 0xe7, 0xda, 0x82, 0xaf, 0xcc, 0x6c, 0x16, 0x80, 0xc5, 0x4d,
+	0x41, 0x7a, 0x01, 0xf0, 0x5a, 0xaf, 0x1a, 0x02, 0x7d, 0xb3, 0xb3, 0x01, 0xe7, 0xab, 0x4d, 0x07,
+	0xc0, 0x44, 0xea, 0x6a, 0x1c, 0xcf, 0xe7, 0x3d, 0x1b, 0xa4, 0x38, 0x53, 0x24, 0xd3, 0x00, 0xc0,
+	0x85, 0x2a, 0x02, 0x40, 0x0d, 0x01, 0xa0, 0xce, 0x56, 0x63, 0xab, 0xb1, 0x17, 0x09, 0x00, 0xaf,
+	0xb4, 0x39, 0xe1, 0xf5, 0x0e, 0x02, 0x40, 0x97, 0x0b, 0xde, 0xea, 0xa1, 0x65, 0xcb, 0xbd, 0x6e,
+	0xb8, 0xbf, 0x3f, 0xd3, 0xec, 0x00, 0x60, 0xdb, 0xa0, 0x9e, 0xe1, 0x78, 0x60, 0xbe, 0x6f, 0xeb,
+	0xbd, 0x48, 0xd5, 0x57, 0x2d, 0xe7, 0x9d, 0x7b, 0xcd, 0x12, 0xfc, 0xe3, 0x5d, 0xf5, 0x38, 0x52,
+	0x17, 0x80, 0x87, 0xca, 0xad, 0xe8, 0xa1, 0x5a, 0xe1, 0x5e, 0x82, 0x80, 0x7e, 0x1b, 0xc0, 0x00,
+	0xd0, 0x63, 0x03, 0xe2, 0x4d, 0xb3, 0x01, 0xa5, 0x3a, 0x6c, 0x40, 0x82, 0xfd, 0x22, 0x24, 0x39,
+	0x69, 0x02, 0x60, 0x6d, 0xd8, 0x6a, 0x06, 0x80, 0x06, 0x04, 0xe6, 0x4e, 0x5b, 0xb0, 0xe9, 0x36,
+	0xe0, 0xc3, 0x4d, 0xd1, 0x62, 0x5b, 0xf0, 0x2d, 0x9d, 0x0e, 0x7c, 0xa8, 0xca, 0x46, 0x0c, 0xfe,
+	0x19, 0x03, 0x60, 0x5f, 0xb6, 0xd5, 0x0d, 0x00, 0x14, 0xcb, 0x70, 0x5f, 0x89, 0x1c, 0x0f, 0x96,
+	0x29, 0x70, 0xae, 0x42, 0x49, 0x00, 0xb0, 0xc1, 0x65, 0xca, 0x2e, 0x1e, 0xab, 0xb3, 0xc3, 0x93,
+	0x0d, 0xf6, 0x78, 0xa6, 0xc9, 0x81, 0x0e, 0x82, 0x71, 0xc4, 0x4b, 0xad, 0x4e, 0x93, 0x00, 0xb8,
+	0x22, 0x02, 0xa0, 0xcf, 0x0d, 0x1f, 0xf0, 0x79, 0x03, 0xbd, 0x85, 0x66, 0x05, 0x40, 0x73, 0x53,
+	0x33, 0x68, 0x8d, 0x02, 0x78, 0x9f, 0x03, 0xee, 0x59, 0x99, 0xcf, 0xfe, 0xbf, 0x9a, 0x01, 0x10,
+	0x13, 0xe2, 0x6f, 0x96, 0xe0, 0x1f, 0x6d, 0xaf, 0xc5, 0xd1, 0x0a, 0x77, 0x5c, 0xa8, 0xb4, 0x26,
+	0x9a, 0x5b, 0xe1, 0x41, 0x02, 0xc0, 0x7d, 0x04, 0x00, 0xbd, 0x36, 0x20, 0x4b, 0x87, 0x0d, 0x48,
+	0x36, 0xd2, 0x06, 0x84, 0x18, 0x6f, 0x03, 0xd2, 0x9c, 0x96, 0x20, 0xdc, 0x66, 0x91, 0x06, 0x00,
+	0x1a, 0x43, 0x74, 0x00, 0x60, 0x8e, 0xb6, 0x05, 0xbf, 0x3e, 0x18, 0x3c, 0x13, 0xff, 0xcf, 0x8b,
+	0x83, 0xcc, 0x0f, 0x00, 0x2d, 0x08, 0x3c, 0x50, 0xa9, 0xd4, 0x3f, 0xfa, 0xb3, 0x12, 0x18, 0x00,
+	0x16, 0x37, 0x01, 0x60, 0x23, 0x41, 0xfe, 0x68, 0x9e, 0x35, 0x0d, 0x06, 0x12, 0x7a, 0x27, 0xa4,
+	0xf4, 0x6e, 0xc8, 0x28, 0x53, 0x94, 0xd3, 0x80, 0xc1, 0xe9, 0xbf, 0xca, 0xff, 0x5f, 0xae, 0x25,
+	0x00, 0xd4, 0x13, 0x00, 0x1a, 0x09, 0x00, 0xcd, 0x37, 0x00, 0xf0, 0x6a, 0x9b, 0x33, 0xde, 0xe8,
+	0x70, 0x21, 0x00, 0xb8, 0xe2, 0xed, 0x1e, 0x37, 0xbc, 0xd7, 0xe7, 0x8e, 0x0f, 0x07, 0x3c, 0xf0,
+	0xc9, 0x90, 0x27, 0xb6, 0x74, 0xd7, 0x9a, 0x15, 0x02, 0x41, 0x7e, 0xbe, 0xaa, 0x62, 0xa0, 0xb5,
+	0x34, 0x6f, 0x3e, 0x6f, 0xe4, 0xb1, 0x8d, 0x3f, 0x64, 0x66, 0x5a, 0xea, 0xec, 0x02, 0xbf, 0xa3,
+	0x1e, 0x23, 0x59, 0xf4, 0x10, 0xe2, 0x97, 0xe2, 0x91, 0x1a, 0x6b, 0x5c, 0xac, 0xb2, 0x26, 0x9a,
+	0x5b, 0x71, 0x16, 0x60, 0xd0, 0x06, 0xec, 0x37, 0xd5, 0x06, 0x84, 0xe9, 0xb6, 0x01, 0x95, 0x06,
+	0x6c, 0x40, 0xa8, 0x52, 0x03, 0x00, 0x7c, 0x08, 0x88, 0xb1, 0x00, 0x98, 0x02, 0x01, 0xdb, 0x3b,
+	0xd6, 0x16, 0xfc, 0xc6, 0x70, 0x08, 0x3e, 0x9a, 0x36, 0xf8, 0x43, 0xf4, 0xac, 0x0e, 0x34, 0x7f,
+	0x5b, 0xf0, 0xd1, 0x42, 0xa9, 0x29, 0xe9, 0x3f, 0xc1, 0x7e, 0x8d, 0x01, 0x00, 0x18, 0x57, 0x00,
+	0x64, 0xff, 0xff, 0x4e, 0x2f, 0x01, 0xa0, 0x9f, 0x00, 0x30, 0xa8, 0x02, 0xc0, 0xcb, 0x3d, 0xfe,
+	0x18, 0x6b, 0xa9, 0x34, 0x1b, 0x00, 0xb2, 0x33, 0x33, 0xc5, 0xed, 0xe3, 0xce, 0xce, 0xf7, 0x1d,
+	0x7d, 0xf9, 0x28, 0x26, 0xd3, 0x02, 0xbf, 0xbb, 0x15, 0x43, 0x49, 0xf6, 0xc2, 0x59, 0x76, 0xa3,
+	0xe1, 0x8b, 0xa9, 0x78, 0x63, 0x2d, 0x00, 0xe0, 0x52, 0x95, 0x35, 0x3d, 0x4c, 0xeb, 0x39, 0x65,
+	0x03, 0x62, 0xec, 0x16, 0x23, 0xd3, 0x55, 0xb3, 0x17, 0x60, 0x73, 0x86, 0x54, 0x03, 0x00, 0x73,
+	0xbd, 0x2d, 0xf8, 0xd9, 0x0e, 0x2f, 0xbc, 0x3d, 0x16, 0x7e, 0x53, 0xe0, 0xd3, 0xb1, 0xe1, 0x14,
+	0x00, 0x7e, 0x06, 0x96, 0x07, 0x9b, 0xbf, 0x2d, 0x78, 0x5f, 0xae, 0xf5, 0x8c, 0x01, 0xc0, 0xa3,
+	0xff, 0xc1, 0x1c, 0x2b, 0xca, 0x02, 0xad, 0x75, 0x14, 0x00, 0xd9, 0xff, 0x1b, 0x5f, 0x00, 0x64,
+	0x00, 0xbc, 0x4f, 0x00, 0xf8, 0x88, 0x00, 0xf0, 0xe9, 0xb0, 0x27, 0x41, 0xc0, 0x03, 0x03, 0x34,
+	0x30, 0xf4, 0xb6, 0xad, 0x35, 0x0b, 0x00, 0xea, 0x6a, 0x6a, 0xc5, 0x29, 0xc1, 0xdf, 0xcf, 0x5b,
+	0x00, 0xa8, 0x3b, 0xa5, 0x40, 0xf3, 0xfe, 0xfa, 0xab, 0xf9, 0x03, 0x7d, 0x18, 0x1b, 0xec, 0xc3,
+	0xf8, 0x50, 0x2f, 0xc6, 0x87, 0x07, 0xb0, 0x71, 0x74, 0x50, 0xd0, 0x96, 0x75, 0x03, 0xd8, 0x51,
+	0x15, 0xc9, 0xc1, 0x2f, 0x68, 0x2b, 0x8d, 0xfe, 0x4f, 0xd4, 0x49, 0xe8, 0xe1, 0x59, 0xe3, 0x32,
+	0x81, 0xc0, 0x1c, 0x36, 0x60, 0xdc, 0x8c, 0x36, 0x20, 0x81, 0x0a, 0x81, 0xe9, 0x2e, 0x9a, 0x33,
+	0x01, 0xa3, 0x89, 0xd6, 0x62, 0x16, 0x30, 0xa7, 0xdb, 0x82, 0xb5, 0x57, 0x07, 0x32, 0x08, 0x5e,
+	0xee, 0xf5, 0x13, 0x82, 0xfe, 0xf9, 0x4e, 0x6f, 0x7d, 0xbb, 0x05, 0xdf, 0xb2, 0x3a, 0xc0, 0x1b,
+	0x7d, 0xde, 0xd8, 0x9e, 0x69, 0x39, 0x63, 0x00, 0x6c, 0x4b, 0xe3, 0x93, 0x86, 0xad, 0xb5, 0xfd,
+	0xbf, 0xf1, 0x05, 0x40, 0x6d, 0xff, 0x4f, 0x00, 0xf8, 0x98, 0x00, 0xf0, 0x19, 0x01, 0xe0, 0x8b,
+	0x51, 0x2f, 0x8c, 0x84, 0x2f, 0x53, 0x1d, 0xcd, 0x5e, 0x99, 0x6d, 0xd2, 0xec, 0x40, 0x67, 0x47,
+	0x27, 0x9f, 0x4f, 0x29, 0xfe, 0x9c, 0x97, 0xa9, 0x0b, 0x6d, 0xea, 0x5c, 0x2b, 0x9b, 0xd7, 0x00,
+	0x68, 0x59, 0xdb, 0x72, 0x23, 0xe8, 0x07, 0x06, 0x31, 0x31, 0xdc, 0x83, 0x1d, 0x5b, 0x27, 0xb0,
+	0x7f, 0xdf, 0x7e, 0x1c, 0x3a, 0x78, 0xd0, 0xa0, 0x0e, 0x0e, 0xd5, 0xa2, 0x3f, 0x64, 0xb1, 0x70,
+	0x1e, 0xfe, 0x23, 0x14, 0xf8, 0x8f, 0x11, 0x00, 0x74, 0xd9, 0x80, 0xb3, 0x77, 0xd8, 0x06, 0xa4,
+	0x3a, 0x2e, 0x46, 0xbc, 0xc3, 0x12, 0xad, 0x99, 0x00, 0x4b, 0x13, 0x00, 0x30, 0xd7, 0x77, 0x0b,
+	0x36, 0x3f, 0x00, 0xb4, 0x21, 0xf0, 0x44, 0xb3, 0x33, 0x05, 0xf4, 0x2a, 0x8d, 0xe0, 0x67, 0x0d,
+	0xc4, 0xeb, 0x07, 0xc0, 0xfa, 0x64, 0x61, 0xea, 0x8f, 0x9e, 0x3b, 0x01, 0xa0, 0x80, 0x00, 0x50,
+	0x34, 0xa3, 0x02, 0x20, 0xfb, 0x7f, 0x02, 0x80, 0xcb, 0x4d, 0x05, 0xc0, 0x8f, 0x87, 0x08, 0x00,
+	0x23, 0x9e, 0xf8, 0x92, 0x00, 0x30, 0x91, 0xb0, 0x86, 0x01, 0xa0, 0x12, 0xbd, 0x1b, 0x7d, 0x55,
+	0x39, 0xe2, 0x61, 0xb4, 0xda, 0xa2, 0x5f, 0x57, 0x1d, 0x42, 0xcb, 0x87, 0xd7, 0xf2, 0x21, 0xb6,
+	0x7c, 0xa8, 0x2d, 0x9f, 0x70, 0xcd, 0x47, 0xd7, 0x8f, 0x8d, 0x8e, 0x0a, 0x00, 0xf0, 0x75, 0x73,
+	0xfe, 0xa7, 0xba, 0x29, 0xc8, 0x62, 0x5e, 0x03, 0xa0, 0xbd, 0xb5, 0x6d, 0x32, 0xf8, 0x77, 0x6f,
+	0x9b, 0xe0, 0xc0, 0x9e, 0x91, 0xf6, 0x75, 0xe6, 0x0b, 0x37, 0xfd, 0x74, 0xc1, 0x2a, 0x3c, 0x5e,
+	0x27, 0xb9, 0x2d, 0x36, 0xa0, 0xc3, 0x04, 0x1b, 0x10, 0xa2, 0xf8, 0xa9, 0x06, 0x00, 0x4a, 0x7d,
+	0x56, 0x4e, 0x07, 0x80, 0xf9, 0xb0, 0x5b, 0xb0, 0xd9, 0xdb, 0x82, 0x2f, 0xd5, 0x39, 0xcc, 0x78,
+	0xf4, 0xdf, 0x4c, 0x60, 0x3f, 0x94, 0x63, 0x35, 0xbd, 0xff, 0xd7, 0x2e, 0x00, 0xb6, 0x4c, 0x5f,
+	0x00, 0xfc, 0x7c, 0xc4, 0x8b, 0x00, 0xe0, 0x8d, 0x83, 0x99, 0x56, 0x93, 0x00, 0xe8, 0x8f, 0x5c,
+	0x8d, 0x0d, 0xfd, 0x9d, 0x7c, 0x4c, 0xbd, 0x49, 0xea, 0xeb, 0xed, 0x85, 0x9f, 0xbb, 0xeb, 0x5f,
+	0xe6, 0x35, 0x00, 0xb8, 0x05, 0x58, 0x3c, 0xd6, 0x4b, 0x48, 0xf7, 0x7b, 0xda, 0x38, 0xa0, 0x67,
+	0x0e, 0x80, 0xa1, 0x06, 0xe1, 0xa6, 0xef, 0x4d, 0x5d, 0x6e, 0x92, 0x0d, 0xd8, 0x67, 0x66, 0x1b,
+	0x50, 0xe1, 0xbb, 0xf4, 0x66, 0x1b, 0x40, 0x00, 0x88, 0xa6, 0x3a, 0x40, 0x86, 0x96, 0x0d, 0x18,
+	0x4f, 0x91, 0x30, 0x00, 0xe6, 0x56, 0x5b, 0xb0, 0x79, 0x01, 0x60, 0xf6, 0xb6, 0xe0, 0x07, 0x2a,
+	0x6d, 0x66, 0x0c, 0x80, 0x1d, 0xe9, 0xab, 0x71, 0x98, 0xfd, 0xbf, 0x99, 0x0a, 0x80, 0xef, 0x8b,
+	0x05, 0xc0, 0x61, 0x35, 0x00, 0xc6, 0xbc, 0x71, 0x3c, 0x47, 0x05, 0x80, 0x7e, 0x1a, 0xfd, 0x37,
+	0x0e, 0x74, 0x62, 0x62, 0xd3, 0x26, 0x93, 0xc5, 0x99, 0x81, 0xa7, 0x8b, 0xd3, 0x1f, 0xe6, 0x79,
+	0x06, 0x20, 0x3b, 0xc3, 0x1f, 0x30, 0x3c, 0x34, 0x4c, 0x58, 0xe0, 0xd3, 0x50, 0x57, 0x87, 0xf1,
+	0x81, 0xee, 0x19, 0x05, 0xff, 0xfe, 0x75, 0x9d, 0xe8, 0x0b, 0x5e, 0x2c, 0xdc, 0xf8, 0xcd, 0x71,
+	0xaa, 0x3a, 0xc0, 0x63, 0x02, 0x00, 0xe6, 0x9e, 0x0d, 0xc8, 0x74, 0x5d, 0x8a, 0x64, 0xad, 0x7e,
+	0x80, 0xce, 0x28, 0xbd, 0x36, 0x60, 0x9e, 0xec, 0x16, 0x6c, 0xfe, 0x3a, 0xc0, 0xa1, 0x7c, 0xc9,
+	0x0c, 0x00, 0x20, 0xa6, 0xff, 0x9c, 0xf1, 0x4d, 0x53, 0x00, 0x14, 0xfd, 0x7f, 0x3d, 0xf9, 0xff,
+	0x19, 0x14, 0x00, 0xd9, 0xff, 0x7f, 0x35, 0x05, 0x00, 0x83, 0xf1, 0x0a, 0x6c, 0x9e, 0x98, 0x98,
+	0x95, 0xca, 0xcb, 0xca, 0x60, 0xab, 0x50, 0xf0, 0xf6, 0xf2, 0x7f, 0x73, 0x5a, 0xe2, 0xf4, 0x1f,
+	0xe6, 0xf5, 0xb1, 0x5e, 0x0c, 0x00, 0x3e, 0x81, 0xc7, 0xc5, 0xd9, 0x05, 0x21, 0xc1, 0x21, 0xd8,
+	0xbe, 0xc5, 0x38, 0x1b, 0x70, 0x70, 0x13, 0x79, 0xa9, 0xf0, 0xe5, 0x7c, 0xd3, 0x27, 0xf5, 0x68,
+	0x8d, 0xb5, 0x49, 0x36, 0x60, 0xaf, 0x01, 0x1b, 0xb0, 0xce, 0x04, 0x1b, 0x50, 0xae, 0xc3, 0x06,
+	0x64, 0xb9, 0xf2, 0xba, 0x80, 0xc5, 0x1a, 0x00, 0xa8, 0x09, 0xa0, 0x8c, 0x23, 0x53, 0xa6, 0x0b,
+	0x00, 0xf3, 0x65, 0xb7, 0x60, 0xb3, 0xb6, 0x05, 0x3f, 0xd6, 0xe8, 0xc4, 0x81, 0x7d, 0xa3, 0x01,
+	0x28, 0x6e, 0x7a, 0x00, 0x4c, 0x10, 0xd0, 0x0f, 0x66, 0x5b, 0xe9, 0x2a, 0x00, 0xb2, 0xff, 0x37,
+	0x4b, 0x01, 0x90, 0x01, 0x70, 0x20, 0x6d, 0xb5, 0xf0, 0x0e, 0x0e, 0x25, 0x3b, 0x60, 0xcb, 0xe6,
+	0xcd, 0x26, 0x89, 0x47, 0xff, 0x9c, 0xac, 0x6c, 0x38, 0xd8, 0xd9, 0x43, 0xae, 0xda, 0xce, 0xfc,
+	0xeb, 0xf9, 0x7c, 0xac, 0x57, 0x15, 0x03, 0x80, 0x57, 0x54, 0x89, 0xe7, 0xf8, 0x05, 0x07, 0x05,
+	0xc3, 0xde, 0xd6, 0x0e, 0x65, 0xc5, 0x45, 0xd8, 0xb7, 0x7b, 0x97, 0xde, 0xe0, 0x3f, 0xb0, 0x91,
+	0x8a, 0x28, 0x11, 0x2b, 0x34, 0x82, 0x9f, 0x75, 0x6f, 0xd1, 0x6a, 0x3c, 0x6e, 0xc0, 0x06, 0x9c,
+	0x99, 0xa1, 0x0d, 0xd8, 0x60, 0x66, 0x1b, 0x90, 0xe0, 0xb8, 0xe4, 0x26, 0x1b, 0xd0, 0x17, 0xbd,
+	0x7a, 0xee, 0xb5, 0x05, 0xdf, 0x8e, 0x3a, 0x80, 0x09, 0x6d, 0xc1, 0x27, 0x8a, 0xe5, 0x46, 0x8f,
+	0xfe, 0xac, 0x31, 0x55, 0xf5, 0x9f, 0xfd, 0xff, 0x6c, 0x0a, 0x80, 0xa2, 0xff, 0xd7, 0x5b, 0x00,
+	0x64, 0x00, 0x4c, 0xc4, 0xde, 0x18, 0x8c, 0x46, 0x0b, 0xc3, 0xb1, 0x65, 0xd3, 0x06, 0x6c, 0xa5,
+	0xa0, 0x36, 0x56, 0xf5, 0xb5, 0xb5, 0xf0, 0xf6, 0xf4, 0xe4, 0xa5, 0xee, 0xbc, 0xb4, 0x5d, 0x9c,
+	0x06, 0x7c, 0x71, 0x9e, 0x86, 0xbf, 0xb8, 0x35, 0xb3, 0x14, 0xae, 0xce, 0x2e, 0x0c, 0x00, 0x51,
+	0x7c, 0x1a, 0x8f, 0xb0, 0x17, 0x80, 0x9d, 0x8d, 0x2d, 0xda, 0x1b, 0xaa, 0x75, 0x8f, 0xfe, 0x5b,
+	0x46, 0x70, 0x68, 0x53, 0x9f, 0xa0, 0x83, 0x63, 0x2d, 0xd8, 0xdb, 0x94, 0x84, 0xd1, 0xc8, 0x65,
+	0x38, 0x98, 0xb1, 0x72, 0x7a, 0x1b, 0x50, 0xa4, 0x65, 0x03, 0x72, 0x8c, 0xb4, 0x01, 0x0c, 0x00,
+	0x2d, 0x1b, 0xc0, 0x00, 0xd0, 0xb6, 0x01, 0xd5, 0x06, 0x6c, 0x00, 0x77, 0x05, 0x6a, 0xcf, 0x06,
+	0x34, 0x05, 0xae, 0xc0, 0xd6, 0x0c, 0xe9, 0xdc, 0x6c, 0x0b, 0x36, 0x1d, 0x00, 0x2c, 0xb3, 0xb6,
+	0x05, 0x3f, 0xde, 0xe4, 0x82, 0x4d, 0xa9, 0x6b, 0x66, 0xea, 0xff, 0xb9, 0xf9, 0x87, 0x01, 0x60,
+	0x7c, 0x03, 0xd0, 0x4c, 0x0b, 0x80, 0x14, 0xfc, 0xfc, 0x63, 0xed, 0xc1, 0x68, 0x30, 0x4e, 0x8e,
+	0x8d, 0xad, 0x15, 0xd8, 0xb6, 0x79, 0x02, 0xdb, 0xb6, 0x6c, 0xd1, 0xab, 0xae, 0x8e, 0x0e, 0x04,
+	0xf9, 0xfb, 0xf3, 0xe0, 0xc7, 0x07, 0xd2, 0x72, 0x0c, 0xf0, 0x11, 0x77, 0x6a, 0x00, 0xc8, 0x9e,
+	0x9b, 0xd7, 0x1b, 0x81, 0xf0, 0x87, 0xe4, 0x40, 0x17, 0x83, 0x3f, 0x36, 0x26, 0x56, 0x48, 0x7f,
+	0x52, 0x88, 0x80, 0x83, 0x03, 0x03, 0x33, 0xaa, 0x07, 0x1c, 0xdc, 0xbe, 0x9e, 0x28, 0xbc, 0x14,
+	0x4f, 0xd6, 0x4b, 0x6e, 0x8f, 0x0d, 0x88, 0x98, 0xb9, 0x0d, 0xc8, 0x76, 0x55, 0xb5, 0x05, 0xe7,
+	0xb8, 0x6b, 0x36, 0x05, 0xf5, 0x47, 0xac, 0x98, 0xb3, 0x6d, 0xc1, 0x86, 0x01, 0xc0, 0xf2, 0xb8,
+	0x2d, 0xd3, 0x81, 0xf7, 0x14, 0xc9, 0x66, 0xbc, 0x00, 0x68, 0x3c, 0xc9, 0x82, 0xe0, 0x6e, 0xa9,
+	0xf2, 0xff, 0x04, 0x80, 0x13, 0x04, 0x80, 0xd3, 0x66, 0x28, 0x00, 0x7e, 0x24, 0x16, 0x00, 0x47,
+	0x55, 0x00, 0x78, 0x9a, 0xfe, 0x1e, 0x07, 0xfd, 0x48, 0x8e, 0x1f, 0x26, 0x7a, 0x9a, 0xb0, 0xb1,
+	0xad, 0x12, 0x1b, 0x9a, 0x8b, 0x05, 0x4d, 0xf4, 0xae, 0xc5, 0xf6, 0xad, 0x5b, 0x6f, 0xd2, 0xa6,
+	0xd1, 0x21, 0x14, 0xc4, 0x05, 0xc2, 0xd3, 0xdd, 0x83, 0x2d, 0xb0, 0xc6, 0x20, 0xc8, 0x47, 0xd6,
+	0x71, 0x6c, 0x70, 0xb3, 0xdc, 0xfc, 0xb5, 0x00, 0x32, 0xd9, 0x62, 0xfe, 0x90, 0x9c, 0xf2, 0x73,
+	0xfa, 0xef, 0xe7, 0xe3, 0x8b, 0x20, 0xb2, 0x03, 0xeb, 0xc6, 0xc6, 0x4c, 0x9a, 0x0d, 0x38, 0xb8,
+	0x7b, 0x1b, 0x06, 0x43, 0x16, 0xe1, 0xa9, 0x7a, 0x89, 0x71, 0x36, 0xa0, 0xc0, 0x48, 0x1b, 0x90,
+	0x68, 0x5e, 0x1b, 0x90, 0xee, 0x72, 0x73, 0x31, 0xb0, 0x25, 0x70, 0x39, 0xfd, 0x3b, 0x96, 0x73,
+	0xb7, 0x2d, 0xd8, 0x54, 0x1b, 0x60, 0xa6, 0xb6, 0xe0, 0x4b, 0xf5, 0x0e, 0x18, 0x49, 0xb4, 0x98,
+	0xf1, 0x02, 0xa0, 0x4d, 0x04, 0xf1, 0x03, 0x04, 0x80, 0x99, 0x16, 0x00, 0x9f, 0x9b, 0x61, 0x01,
+	0xf0, 0x24, 0xc1, 0x65, 0x28, 0x4e, 0x46, 0xf5, 0xab, 0xcd, 0xd8, 0xb1, 0x6d, 0x9b, 0x51, 0xda,
+	0x30, 0x32, 0x04, 0x77, 0x7b, 0x25, 0x9f, 0x63, 0xa1, 0x0d, 0x00, 0xc1, 0x06, 0xdc, 0x15, 0x7b,
+	0x1e, 0x8a, 0x5b, 0x7f, 0x71, 0x01, 0x30, 0x9e, 0x52, 0xff, 0x3d, 0xbb, 0x77, 0x9b, 0x16, 0xfc,
+	0x5b, 0x46, 0xb1, 0x21, 0xc3, 0x99, 0x29, 0x4c, 0xa3, 0xbe, 0xd5, 0x2d, 0xb1, 0x01, 0x63, 0x66,
+	0xb2, 0x01, 0xbc, 0x36, 0x20, 0x92, 0x8a, 0x81, 0xb9, 0x53, 0xb2, 0x80, 0x02, 0x52, 0x6f, 0xc8,
+	0x12, 0xec, 0xca, 0x96, 0xce, 0xe9, 0xb6, 0x60, 0xd3, 0x01, 0x60, 0x7a, 0x5b, 0xf0, 0x6b, 0xf4,
+	0xf7, 0xf6, 0x64, 0x5b, 0xf1, 0xe8, 0x3f, 0xe3, 0x05, 0x40, 0x5b, 0xd3, 0x56, 0x1b, 0x2a, 0x00,
+	0x8a, 0xfe, 0x7f, 0xd6, 0x05, 0xc0, 0xf5, 0xb1, 0xab, 0xb1, 0xbe, 0x3a, 0x0d, 0x3b, 0x29, 0xb0,
+	0x77, 0x6e, 0xdf, 0x6e, 0xb4, 0xba, 0x3b, 0xda, 0xe1, 0xea, 0x60, 0xc7, 0x67, 0x55, 0xb0, 0xf5,
+	0x15, 0x01, 0xc0, 0xc5, 0x70, 0x11, 0x00, 0xf5, 0xf3, 0x36, 0xf8, 0x9d, 0x9c, 0x9c, 0xfe, 0x03,
+	0x7f, 0x48, 0xd1, 0x06, 0x98, 0x1c, 0xfc, 0x7b, 0x76, 0x60, 0x73, 0x55, 0x3c, 0x46, 0x33, 0xdc,
+	0x05, 0x00, 0x1c, 0xcf, 0xb5, 0x60, 0x1b, 0xc0, 0x00, 0xb8, 0xe5, 0x36, 0xa0, 0xcb, 0x58, 0x1b,
+	0xe0, 0xa9, 0x69, 0x03, 0x38, 0x0b, 0x48, 0xd0, 0xaa, 0x05, 0xd4, 0xfa, 0x2d, 0xc7, 0x60, 0xf8,
+	0xd2, 0xb9, 0xdd, 0x16, 0x6c, 0x18, 0x00, 0x66, 0x6f, 0x0b, 0x7e, 0xa1, 0xdd, 0x03, 0xc7, 0x69,
+	0xc4, 0xee, 0x26, 0xe0, 0x9a, 0xb2, 0xfe, 0x7f, 0x67, 0xc6, 0x1a, 0xdd, 0x05, 0xc0, 0x52, 0x53,
+	0x0a, 0x80, 0x6e, 0x3a, 0x0b, 0x80, 0x5c, 0x0f, 0xe0, 0xf7, 0x6e, 0x63, 0x73, 0x11, 0x76, 0x51,
+	0x50, 0xef, 0xda, 0xb1, 0x63, 0x46, 0x5a, 0x37, 0x3a, 0x8a, 0x98, 0x88, 0x70, 0x61, 0x20, 0x0c,
+	0xf4, 0x0f, 0x10, 0xb2, 0x61, 0x5f, 0x6f, 0xef, 0x6b, 0xea, 0x1e, 0x80, 0x98, 0xf9, 0x9c, 0x00,
+	0xfc, 0x1f, 0xe2, 0xa9, 0x39, 0x19, 0x69, 0xe9, 0x1c, 0xcc, 0xb3, 0xd2, 0xbe, 0xbd, 0x7b, 0xb1,
+	0x65, 0x6c, 0x40, 0x58, 0x20, 0xf4, 0x40, 0xc9, 0x9a, 0x5b, 0x62, 0x03, 0x46, 0xf5, 0xd8, 0x00,
+	0x06, 0x40, 0x8b, 0x00, 0x00, 0xe3, 0x6c, 0x00, 0xef, 0x14, 0x14, 0xae, 0xa4, 0x5a, 0x80, 0xd6,
+	0x66, 0xa1, 0xdd, 0xc1, 0x4b, 0xb1, 0x91, 0xfe, 0x9d, 0x85, 0xb6, 0x60, 0x5a, 0x5c, 0xd4, 0xe6,
+	0x86, 0x33, 0x14, 0xa8, 0xdd, 0x14, 0xf4, 0x26, 0x02, 0x80, 0x9e, 0xe5, 0x2c, 0x0b, 0x80, 0xed,
+	0xd3, 0x17, 0x00, 0x9f, 0x23, 0x60, 0x30, 0x00, 0x06, 0xa2, 0xd6, 0x60, 0x53, 0x53, 0x01, 0x76,
+	0xef, 0xdc, 0x69, 0x92, 0x3a, 0xdb, 0xda, 0xe1, 0xe1, 0x68, 0x0f, 0x17, 0x27, 0x67, 0xb8, 0xbb,
+	0xba, 0x08, 0x6d, 0xc0, 0x72, 0x2b, 0xb9, 0xdb, 0x7c, 0x3f, 0xdb, 0xff, 0xf7, 0xfc, 0x41, 0x87,
+	0x06, 0x07, 0x67, 0x0d, 0x00, 0xce, 0x20, 0x84, 0x4e, 0xaa, 0xf5, 0xeb, 0x30, 0x96, 0xe6, 0x24,
+	0x8c, 0xfc, 0x8f, 0xce, 0x61, 0x1b, 0x90, 0xe1, 0xb6, 0x94, 0xbb, 0x03, 0x35, 0x00, 0x50, 0xec,
+	0x49, 0x53, 0x49, 0xc1, 0x8b, 0x08, 0x3c, 0x56, 0x73, 0xa8, 0x2d, 0xd8, 0xf5, 0xb6, 0xb7, 0x05,
+	0xbf, 0xd2, 0xe9, 0xa9, 0x11, 0xfc, 0x26, 0x02, 0x40, 0xd3, 0xff, 0x17, 0xa8, 0xfd, 0xbf, 0x21,
+	0x00, 0x98, 0xd0, 0x00, 0xf4, 0x22, 0x65, 0x29, 0x1b, 0xab, 0x12, 0xb1, 0xa5, 0xb7, 0x11, 0x3b,
+	0xd6, 0xf5, 0x63, 0xcf, 0xae, 0x5d, 0x26, 0x6b, 0x62, 0xc3, 0x46, 0xb8, 0x3b, 0xd8, 0x80, 0x76,
+	0xca, 0x12, 0xce, 0x3f, 0x9c, 0xf7, 0xc7, 0x91, 0xc9, 0x25, 0x92, 0xdf, 0xd2, 0x07, 0xe5, 0xde,
+	0xe7, 0x19, 0x07, 0xfc, 0x81, 0xfd, 0xfb, 0xb1, 0x9b, 0x6e, 0xda, 0x36, 0xaa, 0xa8, 0xf2, 0x42,
+	0x8a, 0xf1, 0x75, 0xeb, 0xb8, 0x80, 0xa8, 0xd2, 0xf0, 0x20, 0x36, 0x67, 0xd8, 0xdc, 0x56, 0x1b,
+	0xd0, 0x3a, 0x43, 0x1b, 0x20, 0xee, 0x18, 0xac, 0xbd, 0x5f, 0x60, 0xbd, 0xef, 0x32, 0xf4, 0x13,
+	0x04, 0xb6, 0xa7, 0x5b, 0xdf, 0x95, 0x6d, 0xc1, 0x0f, 0x57, 0xdb, 0xe1, 0x00, 0x8d, 0xd8, 0x9d,
+	0x7c, 0x6f, 0xf5, 0x06, 0xbf, 0xb8, 0x00, 0xe8, 0xd6, 0x14, 0x00, 0x5f, 0x9c, 0x01, 0x00, 0x2e,
+	0x8f, 0x64, 0x4d, 0x06, 0xf0, 0xde, 0xdd, 0xbb, 0x67, 0xad, 0xf2, 0xc2, 0x3c, 0xd8, 0xca, 0x64,
+	0x5f, 0x6a, 0xb4, 0x01, 0xcf, 0xe3, 0x3d, 0x01, 0xde, 0xe4, 0x0f, 0xba, 0xb6, 0xa9, 0x19, 0x07,
+	0x0f, 0x1c, 0xb8, 0xd1, 0xe2, 0xbb, 0x6f, 0x1f, 0x8b, 0x47, 0x75, 0x21, 0xc8, 0x77, 0x92, 0x57,
+	0xe2, 0x40, 0xe7, 0x36, 0x49, 0x0e, 0xf6, 0xb1, 0xd1, 0x31, 0x8c, 0x0c, 0x0f, 0x73, 0xcf, 0x34,
+	0x4b, 0x5c, 0x4d, 0xc8, 0x2b, 0xac, 0xd4, 0x1a, 0xc0, 0x58, 0x4b, 0x19, 0x8e, 0x95, 0x3a, 0xce,
+	0x0d, 0x1b, 0xe0, 0xad, 0xdb, 0x06, 0xa4, 0x39, 0x2f, 0x41, 0xa0, 0xec, 0xa7, 0x37, 0x59, 0x81,
+	0xb6, 0xc0, 0x25, 0x18, 0x08, 0x59, 0x8c, 0x5d, 0x59, 0xd2, 0x7f, 0xcf, 0xb6, 0xe0, 0x76, 0xcf,
+	0x99, 0x37, 0x05, 0xd1, 0x8f, 0xcf, 0x92, 0x2f, 0xdf, 0x98, 0xba, 0x1a, 0x1d, 0x51, 0x2b, 0x44,
+	0x00, 0x98, 0x3c, 0xfa, 0x6f, 0x49, 0x35, 0xaa, 0x00, 0xc8, 0xfe, 0xdf, 0xe4, 0x02, 0xe0, 0x1b,
+	0x23, 0x91, 0x38, 0x3c, 0xde, 0x3e, 0x19, 0xbc, 0xfb, 0xf6, 0xec, 0x99, 0xb5, 0x86, 0xba, 0xdb,
+	0xa1, 0x50, 0x65, 0xc6, 0xff, 0x64, 0x9b, 0x3c, 0xdf, 0x77, 0x05, 0xbe, 0xc0, 0x00, 0xa8, 0x28,
+	0xaf, 0x30, 0x18, 0xcc, 0x03, 0xfd, 0xac, 0xa9, 0x4b, 0x2a, 0xfb, 0x28, 0x6b, 0x60, 0xf5, 0x0a,
+	0xea, 0xed, 0xe9, 0x11, 0xd4, 0xd3, 0xdd, 0x2d, 0xa8, 0xbb, 0xab, 0x4b, 0xd0, 0x68, 0x73, 0xd1,
+	0x9c, 0xb6, 0x01, 0xe9, 0x94, 0x05, 0x70, 0x7b, 0x70, 0x84, 0x8d, 0xa6, 0x15, 0x60, 0xf5, 0x04,
+	0x2f, 0xc1, 0x60, 0xe8, 0x62, 0xde, 0xba, 0x7a, 0xde, 0xb7, 0x05, 0x3f, 0x47, 0x7f, 0xf7, 0x1e,
+	0x1a, 0x9d, 0x7b, 0xe8, 0x9e, 0xb6, 0x47, 0xae, 0x30, 0x0b, 0x00, 0x78, 0x06, 0x40, 0xf0, 0xff,
+	0xba, 0x0a, 0x80, 0xe5, 0x33, 0x2a, 0x00, 0x8a, 0xfe, 0x5f, 0xa3, 0x00, 0xf8, 0xf1, 0xa8, 0x3f,
+	0x0e, 0x0c, 0xd5, 0x4e, 0x06, 0xee, 0x7e, 0xd6, 0xde, 0xbd, 0xb3, 0xd6, 0xa6, 0xc1, 0x4e, 0xde,
+	0x13, 0xf0, 0x4f, 0x52, 0x89, 0xf4, 0xb7, 0x62, 0x9c, 0xcc, 0xfb, 0x6d, 0xc1, 0x0a, 0x73, 0xb2,
+	0x74, 0x06, 0xb3, 0x76, 0x40, 0x77, 0x75, 0x76, 0xb2, 0x78, 0xc3, 0x05, 0xf5, 0xa6, 0x0b, 0xed,
+	0x82, 0xda, 0xdb, 0xda, 0x04, 0xb5, 0xb5, 0xb6, 0x0a, 0x6a, 0x6d, 0x61, 0xb5, 0x08, 0x3a, 0x54,
+	0x17, 0x64, 0x76, 0x1b, 0x30, 0x62, 0x46, 0x1b, 0xc0, 0x7b, 0x05, 0x70, 0x16, 0x10, 0x4d, 0x20,
+	0xc8, 0x9b, 0x02, 0x80, 0x22, 0xa1, 0x1e, 0xb0, 0x58, 0x80, 0xc0, 0xae, 0x4c, 0xc9, 0xbc, 0x6c,
+	0x0b, 0x7e, 0xb9, 0xcb, 0x13, 0xf7, 0xd2, 0x68, 0xbc, 0x23, 0xc3, 0x12, 0x6d, 0x14, 0xf8, 0x62,
+	0xf0, 0x9b, 0x01, 0x00, 0x04, 0x6f, 0x33, 0x14, 0x00, 0x3b, 0x09, 0x00, 0xdd, 0xba, 0x0b, 0x80,
+	0x7b, 0xfa, 0xaa, 0xb1, 0x7d, 0x62, 0x3d, 0x17, 0xf0, 0x84, 0xd1, 0xff, 0x00, 0x05, 0xef, 0x81,
+	0x7d, 0xfb, 0x66, 0xad, 0xd1, 0xee, 0x16, 0x28, 0x64, 0xd2, 0x5f, 0x8b, 0xeb, 0x00, 0xe6, 0x7b,
+	0x06, 0x30, 0xc6, 0x00, 0x28, 0xc8, 0x48, 0xd6, 0x11, 0xcc, 0x53, 0x03, 0xba, 0x45, 0x50, 0xcb,
+	0x5a, 0xd6, 0x5a, 0xac, 0x6d, 0x66, 0x35, 0xa3, 0xb9, 0x49, 0xa5, 0xa6, 0xc6, 0x26, 0x41, 0x8d,
+	0x0d, 0x8d, 0x82, 0x1a, 0xea, 0x1b, 0x04, 0xd5, 0xd7, 0xd7, 0xa3, 0xbf, 0x3a, 0x13, 0x97, 0x6b,
+	0xa5, 0x73, 0xd6, 0x06, 0x70, 0x16, 0x90, 0x68, 0xbf, 0x08, 0xbe, 0x92, 0x9f, 0x50, 0x26, 0xb0,
+	0x08, 0xb9, 0xee, 0x53, 0x4e, 0x11, 0xf6, 0x22, 0x08, 0xf0, 0x86, 0x27, 0x42, 0x61, 0xd0, 0x72,
+	0xde, 0xb4, 0x05, 0xbf, 0x48, 0x10, 0x38, 0x5f, 0x63, 0x87, 0x63, 0x14, 0x98, 0xdd, 0x04, 0xd1,
+	0xd6, 0x88, 0xe5, 0x22, 0x00, 0x0c, 0x04, 0xbf, 0xb8, 0x00, 0xc8, 0xe8, 0x16, 0x60, 0x9d, 0x05,
+	0xc0, 0x07, 0xcc, 0x50, 0x00, 0x7c, 0x72, 0x30, 0x41, 0x7c, 0x4f, 0xc5, 0xf7, 0x56, 0x18, 0x90,
+	0xba, 0x3b, 0x3b, 0x69, 0x10, 0xeb, 0xe1, 0xa2, 0x36, 0x6f, 0xec, 0x21, 0xd8, 0xd5, 0xad, 0x5b,
+	0xb6, 0xb0, 0x85, 0xe5, 0x59, 0x2a, 0xae, 0x5b, 0x4d, 0xab, 0xe6, 0x86, 0xba, 0xf9, 0xdf, 0x06,
+	0x2c, 0x5e, 0xb4, 0xeb, 0x69, 0x23, 0x7f, 0xd8, 0xf4, 0xf8, 0x88, 0x69, 0x83, 0x99, 0x55, 0x5f,
+	0x57, 0x2f, 0xa8, 0xae, 0xb6, 0x4e, 0x50, 0x6d, 0x4d, 0x2d, 0x8b, 0xb7, 0x15, 0x53, 0xab, 0x1a,
+	0xd5, 0x55, 0xac, 0x2a, 0x54, 0x55, 0x8a, 0xaa, 0xc4, 0x9e, 0x4a, 0x3f, 0x95, 0x0d, 0xa8, 0xbc,
+	0xf5, 0x36, 0xa0, 0xc5, 0x04, 0x1b, 0x90, 0xe6, 0xb4, 0x98, 0x32, 0x00, 0x15, 0x04, 0xb8, 0x30,
+	0x98, 0xe5, 0xba, 0x5c, 0x23, 0x13, 0xe8, 0x0c, 0x5c, 0x24, 0x4c, 0x35, 0x8d, 0x51, 0x20, 0x1c,
+	0xc8, 0x57, 0xfc, 0x5b, 0xb7, 0x05, 0x3f, 0x52, 0xef, 0x84, 0x23, 0x14, 0x94, 0xeb, 0x28, 0x50,
+	0x5b, 0xc2, 0xe9, 0x7e, 0x51, 0xf0, 0x1b, 0x01, 0x00, 0xe3, 0x17, 0x00, 0x89, 0x87, 0x7f, 0x64,
+	0xce, 0xa0, 0x00, 0x28, 0xfa, 0xff, 0x66, 0xb5, 0xff, 0x27, 0x00, 0xbc, 0xae, 0x07, 0x00, 0x1f,
+	0x8f, 0x78, 0x63, 0xa0, 0xa5, 0x9a, 0xde, 0xd5, 0x26, 0x16, 0x0f, 0x44, 0x2c, 0x1e, 0x98, 0x58,
+	0x3c, 0x50, 0x89, 0x12, 0x07, 0xb0, 0x49, 0x58, 0x0c, 0xf4, 0x74, 0xd1, 0xbc, 0xff, 0x08, 0x26,
+	0x36, 0x6e, 0xe4, 0x1e, 0x00, 0xc1, 0x3a, 0x1c, 0xa4, 0xa0, 0x17, 0xc5, 0xd9, 0x44, 0x75, 0x69,
+	0xe1, 0xf5, 0x79, 0xdf, 0x06, 0x2c, 0x5e, 0x7c, 0x5e, 0x3f, 0x7f, 0xd8, 0xe8, 0x40, 0x6f, 0x7d,
+	0xc1, 0xcc, 0xd2, 0x08, 0xe6, 0xca, 0x0a, 0x56, 0x05, 0xd5, 0x0d, 0x58, 0xe5, 0x2c, 0x5e, 0x3f,
+	0x2d, 0xa8, 0xac, 0xb4, 0x54, 0x50, 0x69, 0x09, 0xab, 0x44, 0x50, 0x49, 0x71, 0x09, 0xea, 0x8b,
+	0x32, 0x74, 0xdb, 0x80, 0x12, 0x55, 0x16, 0x70, 0xd2, 0xa0, 0x0d, 0x60, 0x00, 0xdc, 0x5a, 0x1b,
+	0xc0, 0x00, 0x60, 0x45, 0xd9, 0xa8, 0x20, 0xe0, 0x23, 0xf9, 0x29, 0x02, 0x15, 0x4b, 0x11, 0xeb,
+	0xb8, 0x42, 0xc8, 0x08, 0x0a, 0xb8, 0x30, 0x18, 0xa0, 0xda, 0xf7, 0xa0, 0x37, 0x68, 0x11, 0x86,
+	0xa2, 0x2d, 0x84, 0x19, 0x82, 0xc3, 0xc5, 0xff, 0x3e, 0x6d, 0xc1, 0x17, 0xeb, 0x1c, 0xe8, 0xfe,
+	0x4a, 0x30, 0x91, 0xb2, 0x1a, 0xcd, 0x7c, 0x8f, 0x28, 0xf8, 0xcd, 0x0a, 0x00, 0xed, 0xfd, 0xff,
+	0xb3, 0x2c, 0x8d, 0x29, 0x00, 0xb2, 0xff, 0x37, 0xae, 0x00, 0x38, 0xa0, 0x2a, 0x00, 0x9e, 0xeb,
+	0x8e, 0xa7, 0xc1, 0xa7, 0x96, 0x45, 0x83, 0x51, 0x9d, 0x28, 0x1a, 0xa0, 0xea, 0x59, 0x34, 0x68,
+	0x35, 0x88, 0xa2, 0x81, 0xac, 0x91, 0x65, 0x10, 0x16, 0x1d, 0x6d, 0x2d, 0xe8, 0xed, 0x6c, 0xc7,
+	0x50, 0x5f, 0x37, 0xfa, 0xbb, 0x3b, 0x51, 0x53, 0x90, 0xf5, 0x2d, 0xc7, 0x04, 0x9f, 0x32, 0x3c,
+	0xef, 0x01, 0x40, 0xf3, 0x9c, 0x3f, 0xe2, 0x0f, 0xeb, 0xe1, 0x68, 0xa7, 0x23, 0x98, 0xc5, 0x80,
+	0xd6, 0x08, 0x66, 0x52, 0x31, 0x8a, 0x8b, 0x58, 0x45, 0x28, 0x2a, 0x54, 0xa9, 0xb0, 0xa0, 0x50,
+	0x50, 0x41, 0x7e, 0x81, 0xa0, 0xfc, 0xfc, 0x7c, 0xe4, 0xe7, 0xa9, 0x94, 0x97, 0x9b, 0x27, 0x68,
+	0x4f, 0xa9, 0xab, 0x69, 0x36, 0x20, 0xfd, 0xd6, 0xd9, 0x80, 0x62, 0xaf, 0x65, 0x28, 0xf2, 0x59,
+	0x89, 0x1c, 0xef, 0xd5, 0x48, 0xf5, 0xb2, 0x42, 0xb8, 0xab, 0x04, 0xae, 0x36, 0x12, 0xc8, 0xb5,
+	0x0e, 0xa9, 0x74, 0xa0, 0x83, 0x30, 0xfd, 0xec, 0xad, 0x11, 0xe9, 0x64, 0x89, 0x54, 0x57, 0x0b,
+	0x02, 0x02, 0x7d, 0x7d, 0xbf, 0x25, 0xe8, 0x0a, 0x59, 0x86, 0xf5, 0xc9, 0x56, 0x94, 0x0d, 0xcc,
+	0xdd, 0xb6, 0xe0, 0x33, 0xf4, 0x6f, 0x6f, 0x49, 0x5b, 0x23, 0x04, 0x6b, 0x53, 0xd8, 0x72, 0xad,
+	0xe0, 0xbf, 0x35, 0x00, 0x18, 0x27, 0x4d, 0xfa, 0x7f, 0x5d, 0x05, 0xc0, 0x4a, 0x02, 0x40, 0xf5,
+	0xcc, 0x0a, 0x80, 0x1f, 0x12, 0x00, 0x5e, 0xee, 0x0d, 0x40, 0x4f, 0x5d, 0x21, 0x0f, 0x40, 0x3c,
+	0x18, 0xb1, 0x38, 0xdb, 0x64, 0xf1, 0x80, 0x25, 0x8a, 0x06, 0xb2, 0x1a, 0x16, 0x43, 0x62, 0xc6,
+	0xb0, 0x28, 0x49, 0x09, 0xff, 0x5a, 0x7d, 0x26, 0x40, 0xdf, 0x5d, 0x71, 0x40, 0xa8, 0x52, 0x2a,
+	0xfd, 0x0b, 0x15, 0x03, 0x39, 0x58, 0x75, 0x05, 0x33, 0x4b, 0x3b, 0x98, 0xc5, 0x9e, 0x69, 0x6e,
+	0x9b, 0x64, 0xf1, 0x32, 0x4a, 0xb5, 0xb2, 0x90, 0x95, 0xa9, 0x52, 0x66, 0x46, 0xa6, 0x5a, 0x19,
+	0xc2, 0x71, 0x4b, 0x9d, 0x39, 0x41, 0x26, 0xd9, 0x80, 0x5d, 0x06, 0x6c, 0xc0, 0xf0, 0x0c, 0x6c,
+	0x40, 0xb9, 0xef, 0x72, 0xe4, 0xf9, 0x58, 0x20, 0xcd, 0xcb, 0x12, 0x31, 0x6e, 0xd6, 0xf0, 0x73,
+	0x90, 0xc2, 0x46, 0x26, 0xd5, 0x75, 0xc2, 0x2d, 0xbd, 0x00, 0x92, 0x2b, 0x9c, 0x02, 0xb2, 0xe8,
+	0xe7, 0xaf, 0x91, 0xfe, 0x4e, 0x82, 0xb6, 0xe8, 0xde, 0x5d, 0xf7, 0xb0, 0x95, 0x20, 0xdc, 0x59,
+	0x82, 0xfc, 0x40, 0x39, 0xda, 0xe2, 0x94, 0x18, 0x49, 0xb5, 0xc1, 0xe6, 0x6c, 0x5b, 0xec, 0x2d,
+	0xb0, 0xbd, 0xed, 0x6d, 0xc1, 0x97, 0x9b, 0xdc, 0x70, 0xbc, 0xdc, 0x15, 0x1b, 0xb3, 0x9d, 0xd0,
+	0x9a, 0xe0, 0x80, 0xfc, 0x60, 0x5b, 0x44, 0x7b, 0x2a, 0x90, 0xea, 0xab, 0x40, 0xba, 0x9f, 0x1c,
+	0x05, 0x81, 0x32, 0x14, 0x05, 0x49, 0x50, 0x1c, 0x68, 0x85, 0x8a, 0xe0, 0xd5, 0x28, 0x0b, 0xb4,
+	0x40, 0x4d, 0xc8, 0x0a, 0x34, 0x87, 0x4f, 0x1b, 0xfc, 0xa6, 0x02, 0xc0, 0xf8, 0x2d, 0xc0, 0xf4,
+	0x15, 0x00, 0x7b, 0x6f, 0x14, 0x00, 0x1f, 0xec, 0x88, 0xe4, 0x01, 0x88, 0x25, 0x0e, 0x4a, 0xe2,
+	0x20, 0x25, 0x0e, 0x5c, 0x3c, 0x88, 0x89, 0x62, 0x50, 0xcc, 0x18, 0x16, 0x49, 0x61, 0xbe, 0x7f,
+	0xbb, 0x6b, 0xce, 0x06, 0xe4, 0xcb, 0x56, 0x26, 0x7d, 0x5a, 0x38, 0x21, 0x28, 0x2a, 0x5a, 0x0c,
+	0x66, 0x51, 0x7a, 0x82, 0x99, 0x95, 0x8e, 0xf4, 0x34, 0x56, 0x9a, 0xa0, 0xb4, 0xd4, 0x54, 0x41,
+	0xa9, 0x29, 0xac, 0x14, 0x16, 0x2f, 0x29, 0x16, 0x94, 0x9c, 0xc4, 0x4a, 0x42, 0x5a, 0x52, 0x02,
+	0x1e, 0xae, 0x94, 0xdc, 0x7a, 0x1b, 0x10, 0xb1, 0x12, 0xf5, 0xa1, 0xab, 0x50, 0x14, 0x60, 0x89,
+	0x64, 0x4f, 0x6b, 0x84, 0xba, 0x48, 0xe0, 0xa8, 0xd0, 0x19, 0xe8, 0xac, 0x2f, 0xf8, 0x0c, 0x38,
+	0xde, 0x1d, 0x49, 0x22, 0x91, 0x24, 0xd3, 0x0a, 0x49, 0x25, 0x9f, 0x0a, 0xab, 0xef, 0x28, 0x35,
+	0x6a, 0x0c, 0xf1, 0xa7, 0xe6, 0xa9, 0x72, 0x9a, 0x22, 0x5a, 0xcf, 0x7b, 0x2a, 0x52, 0xa6, 0xf0,
+	0x01, 0x7d, 0x0d, 0x83, 0x67, 0xe5, 0xbb, 0xd8, 0xa8, 0x8e, 0xb6, 0x8e, 0x70, 0x93, 0x23, 0x85,
+	0x02, 0x31, 0x3f, 0x48, 0x89, 0xaa, 0x70, 0x25, 0xda, 0xe3, 0x6d, 0x31, 0x90, 0x62, 0x87, 0x8d,
+	0x59, 0xf6, 0x14, 0xb0, 0xf6, 0xd8, 0x44, 0x9a, 0x20, 0x6d, 0x66, 0xe5, 0x38, 0x08, 0xda, 0x92,
+	0xeb, 0x80, 0xad, 0xb9, 0x8e, 0xd8, 0xc6, 0xca, 0x73, 0xc4, 0xf6, 0x3c, 0x27, 0x8c, 0x67, 0x3a,
+	0xa0, 0x37, 0xd9, 0x1e, 0x8d, 0x31, 0xf6, 0xc8, 0x0d, 0xb2, 0xfd, 0x57, 0xac, 0xa7, 0xf2, 0x2f,
+	0xfe, 0x4e, 0x8a, 0x3f, 0xd1, 0x51, 0xda, 0xff, 0x9a, 0xc5, 0x51, 0xdc, 0xdc, 0xfd, 0x76, 0x9d,
+	0xbe, 0xcf, 0x6b, 0xd1, 0x1e, 0x32, 0xa4, 0xf9, 0x48, 0x91, 0xeb, 0x6f, 0x45, 0xf7, 0x70, 0x15,
+	0x6a, 0x43, 0x84, 0xd3, 0x7e, 0x67, 0x74, 0x02, 0x10, 0x6f, 0x03, 0xa6, 0xed, 0xff, 0xc5, 0x02,
+	0xe0, 0xc3, 0xb3, 0x28, 0x00, 0x0e, 0x57, 0xa5, 0xd2, 0x80, 0x94, 0x2f, 0x8a, 0x06, 0xaa, 0x02,
+	0x51, 0x34, 0x78, 0x15, 0xb2, 0x38, 0x33, 0x15, 0x65, 0x34, 0x2c, 0x18, 0x12, 0xa2, 0x7c, 0x5d,
+	0xed, 0x85, 0xe6, 0x38, 0x7e, 0x17, 0xee, 0x0a, 0x00, 0x38, 0x28, 0xa4, 0x19, 0x82, 0x0d, 0x70,
+	0x71, 0x16, 0x83, 0x59, 0x94, 0xde, 0x60, 0x4e, 0x4a, 0x64, 0x25, 0x22, 0x31, 0x41, 0x90, 0xc6,
+	0x99, 0xec, 0xc9, 0xf1, 0x71, 0xc8, 0x48, 0x88, 0x12, 0x94, 0x9d, 0x10, 0x81, 0xbc, 0xf8, 0x10,
+	0xe4, 0xc5, 0x05, 0x22, 0x37, 0xd6, 0x1f, 0x1b, 0x72, 0x9d, 0x4d, 0xb4, 0x01, 0xab, 0x74, 0xda,
+	0x80, 0x9e, 0xe8, 0x55, 0xa8, 0x0a, 0xb1, 0x44, 0xae, 0x1f, 0xa5, 0xe7, 0x94, 0xbe, 0x7b, 0xd9,
+	0xf3, 0xea, 0x46, 0x5d, 0x2f, 0xb8, 0xe4, 0xcf, 0xbc, 0x0b, 0x32, 0x4f, 0x7b, 0x72, 0x00, 0xd3,
+	0xc3, 0x75, 0x37, 0xd7, 0xb9, 0x6f, 0x0c, 0x0c, 0x6e, 0x19, 0xa5, 0x2b, 0x9a, 0xbe, 0x7e, 0x33,
+	0xfd, 0x5b, 0x13, 0xec, 0x1f, 0xe9, 0xc7, 0xcf, 0x10, 0x5c, 0x3f, 0xb4, 0x51, 0x4d, 0x29, 0xe1,
+	0x76, 0x88, 0x81, 0xc4, 0x40, 0x53, 0x01, 0x4a, 0x56, 0xcc, 0x9f, 0x93, 0xbb, 0xd9, 0x58, 0x0a,
+	0x6b, 0x6b, 0x6f, 0xae, 0xf9, 0xd0, 0x8f, 0xf3, 0xf9, 0xfb, 0xe4, 0x14, 0x97, 0xbf, 0x4f, 0x3e,
+	0xfd, 0x86, 0xef, 0x8d, 0x1a, 0x66, 0x5f, 0xeb, 0x05, 0x84, 0x4c, 0xfa, 0x83, 0xb7, 0x83, 0xf4,
+	0xfb, 0x28, 0x37, 0xeb, 0xeb, 0x19, 0x3e, 0x6b, 0x50, 0x1e, 0xb4, 0x9a, 0x8f, 0x03, 0xd7, 0x77,
+	0x02, 0x30, 0x01, 0x7c, 0x86, 0x05, 0xc0, 0xb5, 0x86, 0x0b, 0x80, 0xef, 0x0d, 0x78, 0x22, 0x37,
+	0x2b, 0x93, 0xb3, 0x4c, 0x16, 0x0d, 0x56, 0xd9, 0x2c, 0xca, 0x44, 0x73, 0x58, 0x94, 0x99, 0xe6,
+	0xb2, 0x28, 0x53, 0xcd, 0x13, 0x65, 0x34, 0x2c, 0x18, 0x12, 0xa2, 0x94, 0x32, 0xd9, 0x5f, 0x19,
+	0xea, 0x77, 0xc5, 0xf1, 0xe0, 0xe2, 0x0b, 0x4c, 0x2f, 0xc4, 0xaf, 0x84, 0x2c, 0x20, 0x32, 0x0a,
+	0x45, 0x09, 0xc1, 0x28, 0x8e, 0x0f, 0x40, 0x61, 0x9c, 0x3f, 0xf2, 0x62, 0x54, 0xca, 0x88, 0x0a,
+	0xd0, 0x50, 0x6a, 0x54, 0x20, 0x12, 0x22, 0x82, 0x74, 0x2a, 0x26, 0x3c, 0x04, 0x61, 0xa1, 0x61,
+	0x3a, 0x95, 0x1b, 0x63, 0x78, 0x36, 0xe0, 0x84, 0x01, 0x1b, 0x30, 0x10, 0x6f, 0x89, 0xfa, 0x70,
+	0x2b, 0x64, 0xf8, 0x4a, 0x68, 0x54, 0x97, 0xd2, 0xa8, 0xae, 0xf3, 0x45, 0xfd, 0x46, 0x48, 0xdf,
+	0x25, 0xb2, 0x63, 0xfc, 0x92, 0x73, 0x50, 0xf2, 0xc8, 0x3d, 0x57, 0xea, 0x2d, 0x8a, 0x35, 0x0a,
+	0x4b, 0xce, 0x22, 0x38, 0xdb, 0xe0, 0x00, 0xe5, 0x20, 0x34, 0x45, 0x0c, 0x31, 0x4e, 0x51, 0xf9,
+	0x6b, 0x31, 0x7c, 0xcc, 0xf9, 0x19, 0xf9, 0x6b, 0x31, 0x38, 0xe8, 0xdf, 0xc8, 0xe6, 0xf5, 0xf0,
+	0xa4, 0x7d, 0x64, 0x85, 0x1e, 0xe3, 0x33, 0xf3, 0x39, 0x30, 0x74, 0x81, 0xc1, 0xdf, 0x49, 0xf6,
+	0x5d, 0xb2, 0xb7, 0xf4, 0x7a, 0x51, 0xa0, 0x35, 0x6a, 0xc2, 0xd6, 0xa0, 0x37, 0x76, 0x15, 0xf6,
+	0x64, 0x59, 0x1a, 0x7b, 0x08, 0xa8, 0x51, 0x05, 0xc0, 0x87, 0xd6, 0x06, 0x69, 0x0c, 0x4e, 0x62,
+	0xf6, 0xc9, 0xd9, 0x28, 0x8b, 0xb3, 0x53, 0x56, 0x56, 0x66, 0x26, 0x8b, 0x21, 0x31, 0x63, 0x58,
+	0xd4, 0xe6, 0xa7, 0x7e, 0xa7, 0xfe, 0x5c, 0xef, 0xcc, 0xf7, 0xb8, 0xd7, 0x9e, 0x0e, 0x6c, 0x13,
+	0xd2, 0x55, 0x47, 0xc7, 0x6f, 0x38, 0x50, 0x6f, 0xa5, 0xce, 0x94, 0xcb, 0x75, 0xda, 0x80, 0xd3,
+	0x6a, 0x1b, 0x70, 0x98, 0x82, 0x7f, 0x34, 0x99, 0x5e, 0xa4, 0x70, 0x09, 0x05, 0xbb, 0x14, 0xfe,
+	0x8e, 0x9c, 0x9e, 0xea, 0x0c, 0xf6, 0x3f, 0xa8, 0xb6, 0x36, 0x97, 0x0d, 0xea, 0x4b, 0xdf, 0x17,
+	0x2e, 0xf3, 0x0f, 0x16, 0x7c, 0x9f, 0xf9, 0x7e, 0xf3, 0x7d, 0xe7, 0x6c, 0x43, 0x9d, 0x39, 0x40,
+	0x5b, 0x0e, 0x0a, 0xd9, 0xb5, 0x58, 0x2f, 0x1b, 0x54, 0x47, 0xda, 0xa3, 0x3f, 0xc5, 0x1e, 0x3b,
+	0x73, 0xec, 0x70, 0x5f, 0xb9, 0xad, 0xc6, 0x21, 0xa0, 0xc6, 0x17, 0x00, 0x3d, 0xb0, 0xa3, 0x32,
+	0x84, 0xb2, 0xcd, 0x04, 0xce, 0x3c, 0x45, 0x71, 0x36, 0x2a, 0x4a, 0xcc, 0x52, 0xc5, 0xac, 0xd5,
+	0x24, 0x58, 0x24, 0x86, 0xf9, 0xfd, 0x91, 0xbf, 0x77, 0xb6, 0x84, 0x77, 0xd5, 0x83, 0xb5, 0xb7,
+	0xb0, 0xf8, 0x6f, 0x32, 0x89, 0x2a, 0x55, 0xf5, 0xf7, 0xf3, 0xbf, 0xa5, 0x00, 0xe8, 0xcb, 0xb8,
+	0x31, 0x1b, 0x70, 0x3f, 0x05, 0xff, 0x96, 0x0c, 0x6b, 0x34, 0x44, 0x4a, 0x04, 0xdf, 0x49, 0x29,
+	0x26, 0x14, 0x3a, 0x52, 0x78, 0x85, 0x44, 0xfa, 0x39, 0xa7, 0xaa, 0x3c, 0x22, 0xf1, 0xa8, 0xce,
+	0xa3, 0xe9, 0x42, 0x38, 0xce, 0x9d, 0x8b, 0xed, 0x14, 0x41, 0xc1, 0x99, 0xed, 0x05, 0x5b, 0x20,
+	0xb2, 0x20, 0x97, 0xf8, 0x5c, 0x3d, 0x9d, 0x35, 0x11, 0x5b, 0xf9, 0xf7, 0x49, 0x3e, 0x36, 0xd7,
+	0x9a, 0x62, 0x1d, 0x30, 0x9e, 0xe5, 0x84, 0x33, 0x95, 0x2e, 0x78, 0x66, 0xad, 0x33, 0x5e, 0x6a,
+	0x73, 0xd2, 0x28, 0x00, 0x5e, 0xd5, 0x2a, 0x00, 0x56, 0xa5, 0x86, 0x20, 0x3e, 0x26, 0x0a, 0x31,
+	0xd1, 0x31, 0x88, 0x89, 0x89, 0x41, 0x34, 0xd5, 0xac, 0x12, 0x63, 0xa3, 0x90, 0x49, 0x36, 0x33,
+	0x2d, 0x2e, 0x02, 0xe9, 0x9a, 0xa2, 0x5f, 0x8f, 0x44, 0x6a, 0x7c, 0x34, 0xe2, 0x63, 0x63, 0x11,
+	0x1f, 0x17, 0x27, 0xc2, 0xc3, 0x20, 0x2c, 0xec, 0x94, 0x8a, 0x3f, 0x4e, 0xae, 0x02, 0xbc, 0xdb,
+	0x2e, 0xc1, 0x33, 0x72, 0x4a, 0x67, 0x63, 0xfb, 0xf5, 0xad, 0x0a, 0xfe, 0xe0, 0xc0, 0x20, 0x24,
+	0x05, 0xb9, 0x20, 0x37, 0x40, 0x8a, 0x60, 0x67, 0x9d, 0x23, 0xfb, 0x0f, 0x0a, 0x1a, 0x51, 0x38,
+	0x85, 0xe7, 0xdd, 0x58, 0x38, 0xc5, 0x65, 0x38, 0x2d, 0x84, 0xd8, 0xbf, 0xef, 0x34, 0x33, 0x3f,
+	0x43, 0x7e, 0x96, 0xf4, 0x4c, 0x77, 0x51, 0xc6, 0xf6, 0x92, 0xbe, 0x19, 0x95, 0x60, 0x57, 0xe5,
+	0xf5, 0x82, 0x10, 0xca, 0x16, 0x52, 0x9d, 0x71, 0xa4, 0xcc, 0x8d, 0x66, 0x39, 0x3c, 0xf0, 0x76,
+	0xbf, 0x27, 0xf9, 0x7f, 0x0f, 0xa1, 0x00, 0x98, 0x1d, 0x17, 0x6a, 0x96, 0x77, 0x30, 0x32, 0x2c,
+	0x0c, 0x49, 0xd1, 0x61, 0xc8, 0x8a, 0x0f, 0xd7, 0x50, 0x68, 0x80, 0x9f, 0x90, 0xfe, 0xf3, 0xf7,
+	0x78, 0xf7, 0xa6, 0x77, 0x82, 0x7f, 0x96, 0xc2, 0xd3, 0xc3, 0x73, 0x56, 0x56, 0x20, 0x34, 0x24,
+	0x14, 0x01, 0xfe, 0x01, 0x08, 0xf2, 0x76, 0x47, 0xa0, 0xbb, 0x03, 0x3c, 0x1d, 0x94, 0xb0, 0x93,
+	0xcb, 0x74, 0x8e, 0xec, 0x3c, 0xd5, 0xc6, 0x2f, 0x08, 0x17, 0xa9, 0x84, 0xc2, 0xdc, 0xc2, 0x35,
+	0xef, 0x2f, 0x2e, 0x4a, 0x8a, 0x45, 0x53, 0x35, 0xec, 0xaf, 0xe8, 0x2a, 0x40, 0x2a, 0x68, 0x9a,
+	0x55, 0x04, 0x43, 0xa8, 0xb7, 0x2b, 0xbc, 0x3c, 0x3c, 0x39, 0x43, 0xe5, 0x1d, 0x7c, 0xcd, 0x3a,
+	0x30, 0xf1, 0xd7, 0xb3, 0x91, 0x2b, 0x84, 0xfa, 0x06, 0x0f, 0x84, 0x77, 0xed, 0x83, 0xe1, 0x34,
+	0x4e, 0x5d, 0xe8, 0xf9, 0x8e, 0xce, 0x0b, 0x98, 0x36, 0xc8, 0x83, 0xfc, 0x03, 0xbe, 0x0f, 0xf2,
+	0xf5, 0xfa, 0x3e, 0xd8, 0xdb, 0xf5, 0x87, 0x20, 0x0a, 0x74, 0x3f, 0x67, 0x1b, 0xb8, 0xdb, 0xc9,
+	0xf9, 0xe1, 0xe9, 0x0a, 0xf6, 0x9f, 0xb3, 0x67, 0x24, 0x75, 0x71, 0x35, 0x7a, 0x61, 0x64, 0x5f,
+	0xb8, 0x74, 0x64, 0x0c, 0x52, 0x99, 0xb5, 0x75, 0x3c, 0xd7, 0xa4, 0xd4, 0x03, 0xc3, 0x15, 0x7d,
+	0x19, 0x83, 0x9d, 0x42, 0x76, 0xdd, 0xd3, 0xc1, 0xe6, 0xba, 0xbf, 0x2b, 0xbd, 0x77, 0xee, 0xce,
+	0xf0, 0x76, 0x77, 0x87, 0xb7, 0xa7, 0x17, 0xfc, 0x7c, 0xfd, 0x40, 0xef, 0x2e, 0xef, 0xeb, 0x67,
+	0x34, 0x00, 0xec, 0x6d, 0x6d, 0xaf, 0x89, 0xa3, 0xff, 0x5d, 0x5f, 0x47, 0xe2, 0x9b, 0xaf, 0xde,
+	0x2c, 0xf4, 0x97, 0x76, 0x4a, 0xdb, 0xe7, 0x94, 0x0a, 0xe5, 0x7b, 0xa4, 0x0f, 0x94, 0x72, 0xc5,
+	0xc7, 0xb4, 0x4c, 0xf2, 0x77, 0xf4, 0xeb, 0xbf, 0x96, 0xd1, 0x72, 0x49, 0xfd, 0xd3, 0x51, 0x92,
+	0x1f, 0x88, 0xdc, 0xef, 0xf2, 0x14, 0x93, 0xb9, 0xd2, 0xf8, 0x85, 0x6b, 0x21, 0x63, 0xe0, 0x41,
+	0x83, 0xdf, 0x27, 0xf5, 0x0a, 0xd6, 0xa7, 0x48, 0xd3, 0x4d, 0xaf, 0xf2, 0x94, 0xde, 0x35, 0x47,
+	0x1b, 0xe5, 0x0f, 0xf6, 0x4a, 0xc5, 0x35, 0x67, 0x3b, 0xdb, 0x1f, 0x9c, 0xec, 0xed, 0xae, 0xb1,
+	0x1c, 0x1d, 0x1c, 0xe1, 0xec, 0xe4, 0xac, 0x92, 0x9d, 0x9d, 0x58, 0xf9, 0xff, 0x35, 0xcf, 0xd2,
+	0x2c, 0xdc, 0x6d, 0xba, 0x78, 0xda, 0xc7, 0xc0, 0x8d, 0xfd, 0x42, 0xad, 0xa7, 0x38, 0xc8, 0x79,
+	0x5a, 0x8a, 0x8b, 0x3f, 0x24, 0xff, 0x39, 0xb9, 0x83, 0xca, 0xc2, 0x35, 0xaf, 0xcf, 0xb6, 0x50,
+	0xdb, 0x09, 0x7f, 0x9e, 0x16, 0x55, 0x03, 0x62, 0x94, 0xdf, 0xcb, 0x29, 0xbd, 0x0d, 0x5f, 0x88,
+	0x59, 0x84, 0x01, 0xfd, 0x5a, 0xab, 0xf0, 0xb7, 0x50, 0xd5, 0xe5, 0x1b, 0x2b, 0x6a, 0x9e, 0xa5,
+	0x45, 0x0b, 0xd7, 0x42, 0x61, 0xd2, 0x82, 0xa5, 0x9e, 0xb9, 0xf0, 0xb7, 0xb4, 0xb4, 0x5c, 0x76,
+	0xa7, 0xbf, 0xaf, 0xff, 0x05, 0x8c, 0x81, 0x52, 0xd1, 0x86, 0x57, 0x5c, 0x7a, 0x00, 0x00, 0x00,
+	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_amule_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32,
+	0x35, 0x36, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x32, 0x35, 0x36, 0x22,
+	0x3e, 0x3c, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72,
+	0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x77, 0x22, 0x20, 0x78, 0x31,
+	0x3d, 0x22, 0x32, 0x37, 0x32, 0x2e, 0x37, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x33, 0x35, 0x37,
+	0x2e, 0x32, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32, 0x36, 0x39, 0x2e, 0x33, 0x22, 0x20, 0x79,
+	0x32, 0x3d, 0x22, 0x31, 0x39, 0x35, 0x2e, 0x37, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74,
+	0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e,
+	0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e,
+	0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e,
+	0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e,
+	0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x34, 0x37, 0x32, 0x62, 0x32, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38, 0x63, 0x35, 0x32, 0x32, 0x33,
+	0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x32,
+	0x34, 0x36, 0x2e, 0x34, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x34, 0x30, 0x2e, 0x36, 0x22,
+	0x20, 0x79, 0x31, 0x3d, 0x22, 0x37, 0x36, 0x32, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22,
+	0x37, 0x32, 0x35, 0x2e, 0x39, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78,
+	0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39,
+	0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31,
+	0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73,
+	0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65,
+	0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x37, 0x63, 0x37, 0x62, 0x37, 0x63, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x37, 0x62, 0x36, 0x62, 0x36, 0x22, 0x2f, 0x3e,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x32, 0x35, 0x35, 0x2e,
+	0x31, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x35, 0x33, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x31,
+	0x3d, 0x22, 0x38, 0x31, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x37, 0x36, 0x30,
+	0x2e, 0x37, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32,
+	0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20,
+	0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20,
+	0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75,
+	0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c,
+	0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x62, 0x33,
+	0x61, 0x33, 0x63, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x37, 0x35, 0x37, 0x34, 0x37, 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64,
+	0x3d, 0x22, 0x74, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x33, 0x39, 0x37, 0x2e, 0x33, 0x22, 0x20,
+	0x78, 0x32, 0x3d, 0x22, 0x32, 0x36, 0x39, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x37,
+	0x31, 0x36, 0x2e, 0x37, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x37, 0x33, 0x36, 0x2e, 0x37, 0x22,
+	0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f,
+	0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36,
+	0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e,
+	0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72,
+	0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38, 0x36, 0x34, 0x37, 0x31, 0x32,
+	0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x65, 0x31, 0x38, 0x63, 0x33, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65,
+	0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65,
+	0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73,
+	0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x34, 0x31, 0x39, 0x2e, 0x37, 0x22, 0x20, 0x78, 0x32, 0x3d,
+	0x22, 0x33, 0x39, 0x35, 0x2e, 0x31, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x36, 0x31, 0x30, 0x2e,
+	0x31, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x36, 0x32, 0x35, 0x2e, 0x33, 0x22, 0x20, 0x67, 0x72,
+	0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d,
+	0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30,
+	0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37,
+	0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61,
+	0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x37, 0x33, 0x36, 0x33, 0x37, 0x22, 0x2f, 0x3e,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x34, 0x65,
+	0x34, 0x65, 0x34, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x22, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x35, 0x37, 0x38, 0x2e, 0x34, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x36, 0x35,
+	0x39, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x36, 0x39, 0x36, 0x22, 0x20, 0x79, 0x32,
+	0x3d, 0x22, 0x35, 0x30, 0x30, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78,
+	0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39,
+	0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31,
+	0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73,
+	0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65,
+	0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x38, 0x38, 0x38, 0x37, 0x38, 0x37, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x32, 0x65, 0x31, 0x65, 0x31, 0x22, 0x2f, 0x3e,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x20, 0x69, 0x64, 0x3d, 0x22, 0x71, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x34, 0x39, 0x38, 0x2e,
+	0x37, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x34, 0x31, 0x39, 0x2e, 0x31, 0x22, 0x20, 0x79, 0x31,
+	0x3d, 0x22, 0x36, 0x37, 0x37, 0x2e, 0x37, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x34, 0x39, 0x36,
+	0x2e, 0x31, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32,
+	0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20,
+	0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20,
+	0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75,
+	0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c,
+	0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x66, 0x61,
+	0x66, 0x61, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x64, 0x61, 0x64, 0x39, 0x64, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64,
+	0x3d, 0x22, 0x70, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x35, 0x31, 0x36, 0x2e, 0x35, 0x22, 0x20,
+	0x78, 0x32, 0x3d, 0x22, 0x35, 0x36, 0x38, 0x2e, 0x35, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31,
+	0x33, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x35, 0x33, 0x22, 0x20, 0x67,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20,
+	0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35,
+	0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70,
+	0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x37, 0x34, 0x33, 0x62, 0x31, 0x31, 0x22, 0x2f,
+	0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61,
+	0x30, 0x35, 0x66, 0x32, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x22, 0x20,
+	0x78, 0x31, 0x3d, 0x22, 0x34, 0x38, 0x33, 0x2e, 0x35, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x35,
+	0x30, 0x38, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x33, 0x35, 0x39, 0x2e, 0x37, 0x22,
+	0x20, 0x79, 0x32, 0x3d, 0x22, 0x34, 0x37, 0x36, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74,
+	0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e,
+	0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e,
+	0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e,
+	0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e,
+	0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x63, 0x31, 0x37, 0x37, 0x33, 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x61, 0x39, 0x65, 0x35, 0x39,
+	0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x34,
+	0x33, 0x31, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x36, 0x34, 0x39, 0x22, 0x20, 0x79, 0x31, 0x3d,
+	0x22, 0x31, 0x37, 0x39, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x34, 0x30, 0x36, 0x2e,
+	0x38, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73,
+	0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35,
+	0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d,
+	0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73,
+	0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x37, 0x30, 0x33, 0x66,
+	0x31, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x63, 0x33, 0x37, 0x35, 0x33, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69,
+	0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69,
+	0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d,
+	0x22, 0x6d, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x35, 0x30, 0x32, 0x2e, 0x35, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x34, 0x39, 0x37, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x37, 0x33,
+	0x38, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x35, 0x30, 0x36, 0x2e, 0x38, 0x22, 0x20, 0x67, 0x72,
+	0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d,
+	0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30,
+	0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37,
+	0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61,
+	0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x36, 0x61, 0x36, 0x39, 0x36, 0x39, 0x22, 0x2f, 0x3e,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x65,
+	0x61, 0x64, 0x61, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x22, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x35, 0x37, 0x39, 0x2e, 0x37, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x36, 0x34,
+	0x34, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x37, 0x36, 0x39, 0x2e, 0x37, 0x22, 0x20,
+	0x79, 0x32, 0x3d, 0x22, 0x37, 0x35, 0x33, 0x2e, 0x31, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61,
+	0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20,
+	0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32,
+	0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55,
+	0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f,
+	0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x63, 0x64, 0x32, 0x36, 0x33, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x32, 0x37, 0x39, 0x37,
+	0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6b, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22,
+	0x37, 0x37, 0x39, 0x2e, 0x37, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x37, 0x38, 0x31, 0x2e, 0x33,
+	0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x37, 0x35, 0x38, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x32, 0x3d,
+	0x22, 0x37, 0x34, 0x35, 0x2e, 0x39, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69,
+	0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35,
+	0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33,
+	0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74,
+	0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73,
+	0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x36, 0x64, 0x36, 0x63, 0x36, 0x63, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38, 0x32, 0x38, 0x31, 0x38, 0x31, 0x22, 0x2f,
+	0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6a, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x37, 0x38, 0x33,
+	0x2e, 0x35, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x37, 0x38, 0x39, 0x2e, 0x32, 0x22, 0x20, 0x79,
+	0x31, 0x3d, 0x22, 0x37, 0x34, 0x38, 0x2e, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x37, 0x31,
+	0x36, 0x2e, 0x35, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e,
+	0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34,
+	0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22,
+	0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22,
+	0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x37, 0x64,
+	0x37, 0x63, 0x37, 0x63, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x62, 0x62, 0x39, 0x62, 0x38, 0x22, 0x2f, 0x3e, 0x3c, 0x2f,
+	0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c,
+	0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69,
+	0x64, 0x3d, 0x22, 0x69, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x37, 0x34, 0x32, 0x2e, 0x32, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x37, 0x35, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22,
+	0x37, 0x39, 0x39, 0x2e, 0x38, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x37, 0x35, 0x31, 0x2e, 0x33,
+	0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39,
+	0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37,
+	0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72,
+	0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65,
+	0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x32, 0x33, 0x34, 0x33,
+	0x35, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x36, 0x64, 0x36, 0x64, 0x36, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e,
+	0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e,
+	0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22,
+	0x68, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x36, 0x35, 0x33, 0x2e, 0x35, 0x22, 0x20, 0x78, 0x32,
+	0x3d, 0x22, 0x37, 0x35, 0x38, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x37, 0x30, 0x33,
+	0x2e, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x37, 0x33, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x67,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20,
+	0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35,
+	0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70,
+	0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38, 0x63, 0x34, 0x66, 0x31, 0x62, 0x22, 0x2f,
+	0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65,
+	0x31, 0x38, 0x62, 0x33, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x22, 0x20,
+	0x78, 0x31, 0x3d, 0x22, 0x31, 0x39, 0x37, 0x2e, 0x39, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31,
+	0x39, 0x34, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x39, 0x36, 0x31, 0x2e, 0x39, 0x22,
+	0x20, 0x79, 0x32, 0x3d, 0x22, 0x39, 0x31, 0x36, 0x2e, 0x39, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d,
+	0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30,
+	0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d,
+	0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65,
+	0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x34, 0x65, 0x34, 0x64, 0x34, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x39, 0x31, 0x39, 0x30,
+	0x39, 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x22, 0x20, 0x78, 0x31, 0x3d,
+	0x22, 0x38, 0x34, 0x37, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x38, 0x35, 0x31, 0x2e, 0x32, 0x22,
+	0x20, 0x79, 0x31, 0x3d, 0x22, 0x39, 0x38, 0x31, 0x2e, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22,
+	0x39, 0x33, 0x35, 0x2e, 0x33, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78,
+	0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39,
+	0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31,
+	0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73,
+	0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65,
+	0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x34, 0x35, 0x34, 0x34, 0x34, 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x37, 0x64, 0x37, 0x63, 0x37, 0x63, 0x22, 0x2f, 0x3e,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x38, 0x35, 0x38, 0x2e,
+	0x31, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x38, 0x36, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x79, 0x31,
+	0x3d, 0x22, 0x38, 0x33, 0x38, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x39, 0x34, 0x32,
+	0x2e, 0x38, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32,
+	0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20,
+	0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20,
+	0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75,
+	0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c,
+	0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38, 0x35, 0x38,
+	0x34, 0x38, 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x39, 0x66, 0x39, 0x64, 0x39, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64,
+	0x3d, 0x22, 0x64, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x35, 0x35, 0x38, 0x2e, 0x31, 0x22, 0x20,
+	0x78, 0x32, 0x3d, 0x22, 0x37, 0x32, 0x35, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x38,
+	0x36, 0x34, 0x2e, 0x37, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x39, 0x30, 0x33, 0x2e, 0x35, 0x22,
+	0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f,
+	0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36,
+	0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e,
+	0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72,
+	0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x36, 0x30, 0x33, 0x63, 0x31, 0x61,
+	0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x38, 0x39, 0x35, 0x33, 0x32, 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65,
+	0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65,
+	0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63,
+	0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x37, 0x32, 0x37, 0x2e, 0x38, 0x22, 0x20, 0x78, 0x32, 0x3d,
+	0x22, 0x38, 0x31, 0x39, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x38, 0x39, 0x35, 0x22,
+	0x20, 0x79, 0x32, 0x3d, 0x22, 0x39, 0x31, 0x33, 0x2e, 0x37, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d,
+	0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30,
+	0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d,
+	0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65,
+	0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x39, 0x62, 0x35, 0x61, 0x32, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x31, 0x38, 0x38,
+	0x33, 0x63, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x22, 0x20, 0x78, 0x31, 0x3d,
+	0x22, 0x33, 0x37, 0x31, 0x2e, 0x31, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x32, 0x35, 0x2e,
+	0x39, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x38, 0x36, 0x39, 0x2e, 0x38, 0x22, 0x20, 0x79, 0x32,
+	0x3d, 0x22, 0x39, 0x31, 0x37, 0x2e, 0x37, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72,
+	0x69, 0x78, 0x28, 0x2e, 0x32, 0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32,
+	0x35, 0x39, 0x32, 0x34, 0x20, 0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30,
+	0x33, 0x31, 0x29, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69,
+	0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55,
+	0x73, 0x65, 0x22, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x35, 0x37, 0x33, 0x33, 0x31, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70,
+	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x63, 0x30, 0x37, 0x31, 0x32, 0x37, 0x22,
+	0x2f, 0x3e, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x3e, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x33, 0x38,
+	0x39, 0x2e, 0x39, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x36, 0x38, 0x30, 0x22, 0x20, 0x79, 0x31,
+	0x3d, 0x22, 0x38, 0x37, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x37, 0x39, 0x33,
+	0x2e, 0x32, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x2e, 0x32,
+	0x35, 0x39, 0x36, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x35, 0x39, 0x32, 0x34, 0x20,
+	0x2d, 0x37, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x2d, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x29, 0x22, 0x20,
+	0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75,
+	0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x3e, 0x3c,
+	0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x39, 0x38, 0x35,
+	0x65, 0x32, 0x61, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x64, 0x63, 0x38, 0x39, 0x34, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x3c, 0x2f,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x61, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x36,
+	0x38, 0x2e, 0x34, 0x20, 0x31, 0x36, 0x38, 0x2e, 0x37, 0x63, 0x32, 0x2e, 0x39, 0x2d, 0x31, 0x2e,
+	0x31, 0x20, 0x38, 0x2e, 0x33, 0x2d, 0x2e, 0x36, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x2d, 0x2e, 0x34,
+	0x6c, 0x33, 0x2e, 0x39, 0x2e, 0x38, 0x63, 0x33, 0x2e, 0x37, 0x20, 0x32, 0x2e, 0x33, 0x20, 0x39,
+	0x2e, 0x31, 0x20, 0x34, 0x2e, 0x36, 0x20, 0x39, 0x2e, 0x31, 0x20, 0x39, 0x2e, 0x35, 0x2d, 0x2e,
+	0x33, 0x20, 0x31, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x31, 0x2e,
+	0x31, 0x20, 0x33, 0x2e, 0x36, 0x20, 0x30, 0x20, 0x30, 0x20, 0x35, 0x2e, 0x38, 0x20, 0x31, 0x2e,
+	0x31, 0x20, 0x38, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x38, 0x2e, 0x33, 0x2d, 0x2e, 0x37, 0x20, 0x35,
+	0x2d, 0x32, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x34, 0x2d, 0x34, 0x6c, 0x2e, 0x35, 0x2d, 0x2e, 0x33,
+	0x63, 0x2e, 0x33, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x31, 0x2d, 0x31, 0x2e,
+	0x37, 0x20, 0x32, 0x34, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x33, 0x20, 0x32, 0x2d, 0x32, 0x20, 0x32,
+	0x2e, 0x35, 0x2d, 0x34, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x32, 0x71, 0x2d, 0x32, 0x2e, 0x36, 0x20,
+	0x30, 0x2d, 0x35, 0x2d, 0x2e, 0x35, 0x63, 0x2d, 0x34, 0x2e, 0x37, 0x2d, 0x2e, 0x35, 0x2d, 0x31,
+	0x34, 0x2d, 0x32, 0x2e, 0x36, 0x2d, 0x31, 0x38, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x31, 0x6c, 0x2d,
+	0x32, 0x2e, 0x38, 0x2d, 0x2e, 0x39, 0x63, 0x2d, 0x31, 0x30, 0x2d, 0x34, 0x2e, 0x32, 0x2d, 0x33,
+	0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x37, 0x2d, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x32, 0x2e, 0x38, 0x20,
+	0x31, 0x20, 0x2e, 0x33, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x2e, 0x31, 0x20, 0x31, 0x38, 0x2e, 0x37,
+	0x2e, 0x35, 0x20, 0x34, 0x2e, 0x33, 0x2d, 0x2e, 0x31, 0x20, 0x38, 0x2e, 0x34, 0x2e, 0x32, 0x20,
+	0x31, 0x32, 0x2e, 0x37, 0x2e, 0x33, 0x20, 0x37, 0x2e, 0x32, 0x2e, 0x32, 0x20, 0x31, 0x34, 0x2e,
+	0x35, 0x2d, 0x32, 0x2e, 0x32, 0x20, 0x32, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x35,
+	0x2e, 0x39, 0x20, 0x35, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x34, 0x20, 0x31, 0x33, 0x2e, 0x37, 0x20,
+	0x32, 0x20, 0x32, 0x30, 0x2e, 0x38, 0x2d, 0x2e, 0x32, 0x20, 0x37, 0x2e, 0x31, 0x2e, 0x33, 0x20,
+	0x31, 0x32, 0x2e, 0x35, 0x2d, 0x34, 0x2e, 0x35, 0x20, 0x31, 0x38, 0x2e, 0x37, 0x2d, 0x31, 0x34,
+	0x2e, 0x31, 0x20, 0x31, 0x2e, 0x32, 0x2d, 0x32, 0x38, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x35, 0x2d,
+	0x34, 0x32, 0x2e, 0x39, 0x2d, 0x34, 0x2e, 0x38, 0x2d, 0x38, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x31,
+	0x2d, 0x31, 0x36, 0x2e, 0x34, 0x2d, 0x33, 0x2d, 0x32, 0x34, 0x2e, 0x39, 0x2d, 0x33, 0x2e, 0x34,
+	0x2d, 0x36, 0x2e, 0x32, 0x2d, 0x2e, 0x38, 0x2d, 0x31, 0x35, 0x2e, 0x34, 0x20, 0x31, 0x2d, 0x32,
+	0x31, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x33, 0x2d, 0x35, 0x2e, 0x34, 0x2e, 0x32, 0x2d, 0x39, 0x2e,
+	0x32, 0x2d, 0x2e, 0x33, 0x2d, 0x31, 0x35, 0x2e, 0x32, 0x2d, 0x2e, 0x34, 0x2d, 0x36, 0x2e, 0x36,
+	0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x38, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x36, 0x2e,
+	0x37, 0x2d, 0x32, 0x2e, 0x37, 0x2d, 0x31, 0x35, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x33,
+	0x33, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x35, 0x2d, 0x34, 0x39, 0x2e, 0x34, 0x20, 0x39, 0x2e, 0x35,
+	0x2d, 0x34, 0x2e, 0x38, 0x2e, 0x39, 0x2d, 0x31, 0x39, 0x2e, 0x36, 0x2d, 0x33, 0x2e, 0x36, 0x2d,
+	0x32, 0x30, 0x2e, 0x38, 0x2d, 0x36, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x38, 0x2e, 0x34,
+	0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x37, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x39, 0x2d, 0x32, 0x36,
+	0x2e, 0x37, 0x20, 0x31, 0x2e, 0x38, 0x2d, 0x31, 0x30, 0x2e, 0x33, 0x20, 0x32, 0x35, 0x2e, 0x31,
+	0x2d, 0x37, 0x2e, 0x31, 0x20, 0x33, 0x35, 0x2e, 0x39, 0x2d, 0x37, 0x2e, 0x35, 0x20, 0x35, 0x2e,
+	0x37, 0x2d, 0x2e, 0x34, 0x20, 0x31, 0x34, 0x2e, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x2e, 0x34,
+	0x2d, 0x2e, 0x32, 0x20, 0x32, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x34, 0x2d,
+	0x39, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x32, 0x2d, 0x31, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x38,
+	0x2d, 0x31, 0x2e, 0x33, 0x20, 0x36, 0x2e, 0x39, 0x2d, 0x31, 0x30, 0x2e, 0x38, 0x20, 0x36, 0x2e,
+	0x39, 0x2d, 0x31, 0x32, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x38,
+	0x2e, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x32, 0x6c, 0x36, 0x2e,
+	0x36, 0x20, 0x31, 0x2e, 0x32, 0x63, 0x32, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x33, 0x20, 0x36, 0x2e,
+	0x32, 0x2d, 0x31, 0x20, 0x39, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x31, 0x6c, 0x32, 0x2e, 0x34, 0x20,
+	0x30, 0x63, 0x32, 0x2e, 0x35, 0x20, 0x30, 0x20, 0x31, 0x31, 0x2e, 0x38, 0x2e, 0x39, 0x20, 0x31,
+	0x31, 0x2e, 0x38, 0x2e, 0x39, 0x2d, 0x2e, 0x31, 0x2d, 0x2e, 0x36, 0x2e, 0x31, 0x2d, 0x31, 0x2e,
+	0x39, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x36, 0x20, 0x31, 0x2d, 0x2e, 0x31, 0x20, 0x34, 0x2d, 0x2e,
+	0x39, 0x20, 0x35, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x35, 0x2d, 0x2e, 0x37,
+	0x20, 0x34, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x36, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x35,
+	0x6c, 0x31, 0x2e, 0x31, 0x2e, 0x34, 0x63, 0x31, 0x2e, 0x33, 0x2d, 0x2e, 0x38, 0x20, 0x33, 0x2d,
+	0x31, 0x2e, 0x35, 0x20, 0x34, 0x2e, 0x35, 0x2d, 0x32, 0x2e, 0x31, 0x6c, 0x2d, 0x2e, 0x37, 0x2d,
+	0x31, 0x2e, 0x31, 0x63, 0x33, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x33, 0x20, 0x34, 0x2e, 0x39, 0x2d,
+	0x33, 0x2e, 0x35, 0x20, 0x37, 0x2e, 0x37, 0x2d, 0x36, 0x2e, 0x33, 0x2e, 0x34, 0x2d, 0x2e, 0x35,
+	0x20, 0x34, 0x2e, 0x32, 0x2d, 0x34, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x31, 0x2d, 0x36, 0x2e, 0x36,
+	0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x23, 0x32, 0x39, 0x32, 0x37, 0x32, 0x38, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x34, 0x30, 0x20,
+	0x32, 0x33, 0x30, 0x2e, 0x36, 0x63, 0x2d, 0x34, 0x2e, 0x38, 0x2e, 0x39, 0x2d, 0x34, 0x2e, 0x38,
+	0x20, 0x39, 0x2e, 0x34, 0x2d, 0x39, 0x2e, 0x38, 0x20, 0x38, 0x2e, 0x39, 0x2d, 0x2e, 0x37, 0x2d,
+	0x35, 0x2e, 0x37, 0x2d, 0x2e, 0x37, 0x2d, 0x39, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x31,
+	0x36, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x75, 0x72, 0x6c, 0x28, 0x23, 0x62, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x38, 0x36, 0x2e,
+	0x33, 0x20, 0x32, 0x31, 0x32, 0x2e, 0x35, 0x63, 0x2e, 0x38, 0x20, 0x39, 0x20, 0x32, 0x2e, 0x32,
+	0x20, 0x31, 0x36, 0x20, 0x36, 0x2e, 0x37, 0x20, 0x32, 0x34, 0x20, 0x2e, 0x36, 0x20, 0x31, 0x20,
+	0x36, 0x2e, 0x33, 0x20, 0x35, 0x2e, 0x35, 0x20, 0x36, 0x2e, 0x34, 0x20, 0x36, 0x2e, 0x33, 0x2d,
+	0x31, 0x32, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x36, 0x2d, 0x32, 0x38, 0x2e, 0x33, 0x20, 0x34, 0x2e,
+	0x39, 0x2d, 0x34, 0x30, 0x2e, 0x37, 0x20, 0x37, 0x2e, 0x36, 0x2d, 0x2e, 0x33, 0x2d, 0x2e, 0x33,
+	0x2d, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x32, 0x2d,
+	0x31, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x31, 0x2d, 0x35, 0x2e, 0x37, 0x2d,
+	0x33, 0x2e, 0x38, 0x2d, 0x38, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x33, 0x2d,
+	0x32, 0x2e, 0x37, 0x2d, 0x33, 0x2e, 0x35, 0x2d, 0x34, 0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x35, 0x6c,
+	0x2d, 0x2e, 0x31, 0x2d, 0x2e, 0x31, 0x63, 0x2d, 0x2e, 0x39, 0x2d, 0x2e, 0x36, 0x2d, 0x31, 0x2e,
+	0x34, 0x2d, 0x2e, 0x35, 0x2d, 0x32, 0x2e, 0x36, 0x2d, 0x2e, 0x35, 0x6c, 0x2d, 0x2e, 0x34, 0x2d,
+	0x2e, 0x35, 0x63, 0x31, 0x2e, 0x33, 0x2d, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x31, 0x2d, 0x31, 0x2e,
+	0x34, 0x20, 0x32, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x39, 0x2d, 0x31, 0x2e,
+	0x32, 0x2d, 0x33, 0x2e, 0x33, 0x2d, 0x2e, 0x39, 0x2d, 0x35, 0x2e, 0x37, 0x2d, 0x2e, 0x39, 0x6c,
+	0x33, 0x2e, 0x38, 0x2d, 0x34, 0x63, 0x2d, 0x2e, 0x37, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x2e,
+	0x33, 0x2d, 0x32, 0x2d, 0x32, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x39, 0x2e, 0x35, 0x2d, 0x31, 0x20,
+	0x32, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x33, 0x2d, 0x31, 0x2e, 0x38, 0x6c, 0x32, 0x2e, 0x34, 0x2d,
+	0x31, 0x2e, 0x33, 0x63, 0x31, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x34, 0x2e, 0x39, 0x2d,
+	0x34, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x38, 0x2d, 0x36, 0x2e, 0x31, 0x20, 0x34, 0x2e, 0x37, 0x2d,
+	0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x30, 0x2e, 0x33, 0x2d, 0x2e, 0x31,
+	0x6c, 0x32, 0x30, 0x2e, 0x37, 0x2d, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x32, 0x2d, 0x2e, 0x31, 0x7a,
+	0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23,
+	0x38, 0x30, 0x34, 0x33, 0x31, 0x37, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x34, 0x39, 0x2e, 0x34,
+	0x20, 0x32, 0x31, 0x39, 0x2e, 0x31, 0x63, 0x30, 0x20, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x31, 0x20,
+	0x32, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x39, 0x20, 0x33, 0x20, 0x2e, 0x35, 0x2e, 0x37, 0x20, 0x32,
+	0x2e, 0x36, 0x20, 0x39, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x36, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x20,
+	0x31, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x38, 0x20,
+	0x33, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x35, 0x6c, 0x2d, 0x34, 0x2e, 0x32, 0x2d, 0x34, 0x63, 0x2d,
+	0x2e, 0x39, 0x2d, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x35, 0x2d, 0x31, 0x2d, 0x32, 0x2e, 0x36, 0x2d,
+	0x31, 0x6c, 0x2d, 0x2e, 0x34, 0x2d, 0x2e, 0x35, 0x63, 0x31, 0x2e, 0x33, 0x2d, 0x2e, 0x36, 0x20,
+	0x33, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x31, 0x2d,
+	0x31, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x33, 0x2d, 0x2e, 0x39, 0x2d, 0x35,
+	0x2e, 0x37, 0x2d, 0x2e, 0x39, 0x6c, 0x33, 0x2e, 0x38, 0x2d, 0x34, 0x63, 0x2d, 0x2e, 0x37, 0x2d,
+	0x31, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x33, 0x2d, 0x32, 0x2d, 0x32, 0x2e, 0x39, 0x2d, 0x32, 0x2e,
+	0x39, 0x2e, 0x35, 0x2d, 0x31, 0x20, 0x32, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x33, 0x2d, 0x31, 0x2e,
+	0x38, 0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x63, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x31, 0x37,
+	0x31, 0x2e, 0x37, 0x20, 0x32, 0x31, 0x33, 0x2e, 0x38, 0x2e, 0x34, 0x2e, 0x38, 0x63, 0x31, 0x2e,
+	0x39, 0x2e, 0x37, 0x20, 0x31, 0x36, 0x2e, 0x31, 0x2d, 0x2e, 0x38, 0x20, 0x31, 0x39, 0x2e, 0x34,
+	0x2d, 0x2e, 0x35, 0x20, 0x34, 0x2e, 0x33, 0x2d, 0x2e, 0x31, 0x20, 0x36, 0x2e, 0x38, 0x2d, 0x2e,
+	0x36, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x2d, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x31, 0x2e, 0x35, 0x20,
+	0x35, 0x2e, 0x31, 0x20, 0x35, 0x2e, 0x38, 0x20, 0x36, 0x2e, 0x31, 0x20, 0x36, 0x2e, 0x39, 0x2d,
+	0x2e, 0x32, 0x20, 0x31, 0x20, 0x2e, 0x37, 0x20, 0x36, 0x20, 0x2e, 0x35, 0x20, 0x36, 0x2e, 0x38,
+	0x20, 0x30, 0x20, 0x32, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x38, 0x20, 0x36, 0x2e, 0x32, 0x2d, 0x32,
+	0x2e, 0x33, 0x20, 0x38, 0x2e, 0x32, 0x2d, 0x2e, 0x35, 0x20, 0x31, 0x2d, 0x32, 0x20, 0x33, 0x2e,
+	0x31, 0x2d, 0x32, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x38, 0x20, 0x33, 0x2e,
+	0x32, 0x2d, 0x33, 0x2e, 0x33, 0x20, 0x36, 0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x38, 0x20, 0x31, 0x30,
+	0x2e, 0x34, 0x6c, 0x30, 0x20, 0x31, 0x2e, 0x35, 0x63, 0x2d, 0x32, 0x2e, 0x35, 0x2d, 0x31, 0x2d,
+	0x31, 0x33, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x31, 0x2d, 0x31, 0x37, 0x2e, 0x38, 0x2d, 0x33, 0x2e,
+	0x31, 0x2d, 0x33, 0x2d, 0x2e, 0x33, 0x2d, 0x38, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x37, 0x2d, 0x31,
+	0x31, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x33, 0x2d, 0x37, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x33, 0x2d,
+	0x31, 0x33, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x37, 0x2d, 0x32, 0x31, 0x2d, 0x32, 0x2e, 0x31, 0x20,
+	0x35, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x33, 0x20, 0x31, 0x34, 0x2d, 0x38, 0x2e, 0x32, 0x20, 0x31,
+	0x34, 0x2e, 0x37, 0x2d, 0x38, 0x2e, 0x38, 0x20, 0x36, 0x2e, 0x33, 0x2d, 0x36, 0x2e, 0x33, 0x20,
+	0x36, 0x2e, 0x39, 0x2d, 0x31, 0x33, 0x20, 0x37, 0x2d, 0x32, 0x31, 0x2e, 0x34, 0x7a, 0x22, 0x2f,
+	0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c,
+	0x28, 0x23, 0x64, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x31, 0x37, 0x31, 0x2e, 0x37, 0x20,
+	0x32, 0x31, 0x33, 0x2e, 0x38, 0x2e, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x36, 0x2e, 0x35, 0x63,
+	0x31, 0x2e, 0x39, 0x2e, 0x37, 0x20, 0x31, 0x37, 0x2e, 0x31, 0x2d, 0x2e, 0x32, 0x20, 0x31, 0x37,
+	0x2e, 0x31, 0x2d, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x37, 0x2d, 0x32, 0x2e,
+	0x33, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x35, 0x20, 0x34, 0x2e, 0x37, 0x2d, 0x34, 0x2e, 0x31, 0x20,
+	0x38, 0x2e, 0x34, 0x2d, 0x35, 0x2e, 0x37, 0x20, 0x31, 0x37, 0x2e, 0x31, 0x2d, 0x36, 0x2e, 0x32,
+	0x20, 0x32, 0x36, 0x2e, 0x34, 0x6c, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x35, 0x63, 0x2e, 0x37, 0x2e,
+	0x36, 0x2e, 0x32, 0x2d, 0x2e, 0x33, 0x2e, 0x39, 0x2e, 0x35, 0x2d, 0x33, 0x2d, 0x2e, 0x33, 0x2d,
+	0x31, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x35, 0x2d, 0x31, 0x34, 0x2e, 0x32, 0x2d, 0x32, 0x2d,
+	0x37, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x33, 0x2d, 0x39, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x32, 0x2d,
+	0x31, 0x37, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x32, 0x20, 0x35, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x36,
+	0x20, 0x31, 0x30, 0x2e, 0x32, 0x2d, 0x35, 0x2e, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x2d, 0x38,
+	0x2e, 0x38, 0x20, 0x36, 0x2e, 0x33, 0x2d, 0x36, 0x2e, 0x33, 0x20, 0x36, 0x2e, 0x39, 0x2d, 0x31,
+	0x33, 0x20, 0x37, 0x2d, 0x32, 0x31, 0x2e, 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x65, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x32, 0x32, 0x32, 0x2e, 0x31, 0x20, 0x32, 0x31, 0x34, 0x2e, 0x39, 0x63,
+	0x31, 0x2e, 0x34, 0x20, 0x30, 0x20, 0x32, 0x2e, 0x34, 0x2d, 0x2e, 0x37, 0x20, 0x33, 0x2e, 0x35,
+	0x2e, 0x34, 0x20, 0x32, 0x2e, 0x39, 0x20, 0x33, 0x20, 0x32, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x2e,
+	0x35, 0x20, 0x32, 0x2e, 0x34, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x6c, 0x2e, 0x32, 0x2e, 0x39, 0x63,
+	0x2d, 0x32, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x35,
+	0x2d, 0x35, 0x2e, 0x39, 0x20, 0x33, 0x2e, 0x31, 0x6c, 0x2d, 0x2e, 0x37, 0x2d, 0x2e, 0x36, 0x2d,
+	0x2e, 0x39, 0x2e, 0x36, 0x63, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x34, 0x2e, 0x36, 0x20,
+	0x31, 0x2e, 0x38, 0x20, 0x36, 0x2e, 0x33, 0x20, 0x35, 0x2e, 0x36, 0x20, 0x30, 0x20, 0x31, 0x2e,
+	0x36, 0x2d, 0x2e, 0x38, 0x20, 0x34, 0x2e, 0x35, 0x2d, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x32, 0x2d,
+	0x2e, 0x38, 0x2e, 0x35, 0x2d, 0x36, 0x2d, 0x2e, 0x33, 0x2d, 0x37, 0x2d, 0x2e, 0x36, 0x2d, 0x34,
+	0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x39, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x31,
+	0x34, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x37, 0x2e, 0x37, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x2e,
+	0x39, 0x2d, 0x33, 0x2e, 0x35, 0x20, 0x32, 0x2e, 0x39, 0x2d, 0x34, 0x2e, 0x37, 0x6c, 0x2d, 0x2e,
+	0x33, 0x20, 0x30, 0x63, 0x2d, 0x2e, 0x35, 0x2d, 0x32, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x32, 0x2d,
+	0x35, 0x2e, 0x32, 0x20, 0x32, 0x2e, 0x32, 0x2d, 0x37, 0x2e, 0x38, 0x2e, 0x32, 0x2d, 0x2e, 0x37,
+	0x2d, 0x2e, 0x36, 0x2d, 0x36, 0x2e, 0x32, 0x2d, 0x2e, 0x34, 0x2d, 0x37, 0x2e, 0x32, 0x2d, 0x2e,
+	0x39, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x35, 0x2e, 0x33, 0x2d, 0x36, 0x2e, 0x34, 0x2d, 0x36, 0x2e,
+	0x34, 0x2d, 0x36, 0x2e, 0x39, 0x2e, 0x33, 0x20, 0x30, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x2e, 0x36,
+	0x20, 0x31, 0x39, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x38, 0x30, 0x34, 0x33, 0x31, 0x37, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x30, 0x37, 0x2e, 0x39, 0x20, 0x32, 0x31, 0x39, 0x2e, 0x39,
+	0x63, 0x2d, 0x2e, 0x32, 0x20, 0x31, 0x20, 0x2e, 0x38, 0x20, 0x35, 0x2e, 0x37, 0x2e, 0x35, 0x20,
+	0x36, 0x2e, 0x34, 0x20, 0x30, 0x20, 0x32, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x31, 0x20, 0x37, 0x2e,
+	0x33, 0x2d, 0x31, 0x2e, 0x37, 0x20, 0x39, 0x2e, 0x34, 0x6c, 0x2e, 0x33, 0x20, 0x30, 0x63, 0x2e,
+	0x36, 0x2d, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x2e, 0x39, 0x2d, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x39,
+	0x2d, 0x2e, 0x38, 0x71, 0x2d, 0x2e, 0x36, 0x2d, 0x31, 0x2d, 0x31, 0x2e, 0x37, 0x2d, 0x31, 0x2e,
+	0x36, 0x63, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x36, 0x2e, 0x35, 0x2d, 0x32, 0x2e, 0x35, 0x20, 0x31,
+	0x2e, 0x39, 0x2d, 0x33, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x38, 0x2e, 0x33, 0x20, 0x33, 0x2e, 0x33,
+	0x2e, 0x33, 0x20, 0x35, 0x2e, 0x31, 0x2e, 0x33, 0x2d, 0x32, 0x2d, 0x2e, 0x39, 0x2d, 0x33, 0x2d,
+	0x31, 0x2e, 0x32, 0x2d, 0x34, 0x2e, 0x35, 0x2d, 0x32, 0x2e, 0x38, 0x6c, 0x2e, 0x32, 0x2d, 0x32,
+	0x63, 0x31, 0x2e, 0x37, 0x2d, 0x31, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x33,
+	0x20, 0x32, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x39, 0x2d, 0x2e, 0x35, 0x2d, 0x2e, 0x36, 0x2d, 0x31,
+	0x2e, 0x33, 0x2d, 0x2e, 0x38, 0x2d, 0x32, 0x2e, 0x31, 0x2d, 0x31, 0x2d, 0x31, 0x2e, 0x34, 0x2d,
+	0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x37, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x32,
+	0x2e, 0x37, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x23, 0x37, 0x61, 0x37, 0x39, 0x37, 0x61, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x32,
+	0x34, 0x2e, 0x38, 0x20, 0x32, 0x31, 0x33, 0x2e, 0x36, 0x73, 0x35, 0x20, 0x36, 0x20, 0x33, 0x2e,
+	0x32, 0x20, 0x31, 0x33, 0x2e, 0x34, 0x63, 0x2d, 0x31, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x39, 0x2d,
+	0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x34, 0x2e, 0x34, 0x2d, 0x32,
+	0x2e, 0x36, 0x20, 0x31, 0x2e, 0x33, 0x2d, 0x31, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x32, 0x2d,
+	0x31, 0x33, 0x2e, 0x35, 0x2e, 0x39, 0x2d, 0x36, 0x2e, 0x35, 0x2d, 0x33, 0x2e, 0x36, 0x2d, 0x34,
+	0x2e, 0x37, 0x2d, 0x35, 0x2e, 0x36, 0x2d, 0x31, 0x30, 0x2e, 0x37, 0x2d, 0x39, 0x2e, 0x37, 0x22,
+	0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x32,
+	0x39, 0x32, 0x37, 0x32, 0x38, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x32, 0x30, 0x2e, 0x35,
+	0x20, 0x32, 0x33, 0x30, 0x2e, 0x38, 0x63, 0x34, 0x2e, 0x39, 0x2d, 0x33, 0x2e, 0x31, 0x20, 0x37,
+	0x2d, 0x33, 0x2e, 0x32, 0x20, 0x37, 0x2e, 0x38, 0x2d, 0x35, 0x2e, 0x36, 0x6c, 0x2d, 0x2e, 0x33,
+	0x20, 0x32, 0x2e, 0x35, 0x63, 0x2d, 0x32, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x31, 0x2e, 0x38, 0x20,
+	0x35, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x37, 0x20, 0x31, 0x2d, 0x37,
+	0x2e, 0x36, 0x2d, 0x33, 0x2e, 0x36, 0x2d, 0x35, 0x2e, 0x32, 0x2d, 0x36, 0x2e, 0x32, 0x2d, 0x39,
+	0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x66, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x32, 0x30,
+	0x36, 0x2e, 0x38, 0x20, 0x32, 0x33, 0x35, 0x2e, 0x37, 0x2e, 0x34, 0x2d, 0x2e, 0x32, 0x63, 0x2d,
+	0x2e, 0x31, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x35, 0x20, 0x33, 0x2d, 0x32, 0x2e, 0x32,
+	0x20, 0x34, 0x2e, 0x32, 0x20, 0x37, 0x2e, 0x35, 0x2e, 0x35, 0x20, 0x39, 0x2e, 0x35, 0x2e, 0x37,
+	0x20, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x31, 0x2e, 0x32, 0x20,
+	0x35, 0x2e, 0x35, 0x20, 0x31, 0x20, 0x36, 0x2e, 0x33, 0x2e, 0x36, 0x2e, 0x32, 0x2d, 0x31, 0x2e,
+	0x36, 0x20, 0x31, 0x2d, 0x33, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x35, 0x2e, 0x33, 0x2e,
+	0x38, 0x20, 0x34, 0x2e, 0x31, 0x2d, 0x2e, 0x35, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x2d, 0x32, 0x2e,
+	0x31, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x20, 0x30, 0x2d, 0x2e, 0x31, 0x20, 0x30, 0x2d, 0x31, 0x2e,
+	0x36, 0x2d, 0x2e, 0x32, 0x2d, 0x31, 0x2d, 0x36, 0x20, 0x2e, 0x33, 0x2d, 0x31, 0x31, 0x2e, 0x36,
+	0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x31, 0x37, 0x2e, 0x38, 0x2d, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x32,
+	0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x36, 0x2e, 0x38, 0x2d, 0x35, 0x2e, 0x33, 0x2e, 0x36, 0x6c, 0x2d,
+	0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x37, 0x63, 0x2e, 0x35, 0x2d, 0x33, 0x2e, 0x36, 0x20, 0x31, 0x2e,
+	0x37, 0x2d, 0x35, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x35, 0x2d, 0x38, 0x2e, 0x39, 0x2e, 0x38, 0x2d,
+	0x2e, 0x37, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x38, 0x2d, 0x33,
+	0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x67, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x34, 0x37,
+	0x20, 0x32, 0x33, 0x33, 0x2e, 0x37, 0x63, 0x31, 0x2e, 0x31, 0x20, 0x30, 0x20, 0x31, 0x2e, 0x36,
+	0x2d, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x36, 0x2e, 0x35, 0x6c, 0x2e, 0x31, 0x2e, 0x31, 0x63, 0x31,
+	0x2e, 0x35, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x39, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x34, 0x2e, 0x31,
+	0x20, 0x34, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x37, 0x20, 0x32, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x36,
+	0x20, 0x35, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x37, 0x20, 0x38, 0x2e, 0x34, 0x6c, 0x2d, 0x2e, 0x39,
+	0x2d, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x33, 0x2e, 0x33, 0x63, 0x2d, 0x33, 0x2e, 0x36, 0x20, 0x31,
+	0x2d, 0x32, 0x30, 0x2e, 0x32, 0x2d, 0x2e, 0x33, 0x2d, 0x32, 0x32, 0x2e, 0x34, 0x20, 0x31, 0x2e,
+	0x37, 0x6c, 0x2d, 0x2e, 0x31, 0x2e, 0x37, 0x63, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x33, 0x2e, 0x36,
+	0x2d, 0x32, 0x2e, 0x31, 0x2d, 0x39, 0x2e, 0x37, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x33, 0x2e,
+	0x36, 0x20, 0x38, 0x2e, 0x35, 0x2d, 0x2e, 0x31, 0x20, 0x31, 0x30, 0x2e, 0x31, 0x2d, 0x2e, 0x31,
+	0x20, 0x31, 0x35, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x36, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x39, 0x66, 0x39, 0x65, 0x39, 0x65, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x34, 0x34, 0x20, 0x32, 0x32, 0x32, 0x2e, 0x33, 0x63, 0x31, 0x2e,
+	0x35, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x39, 0x20,
+	0x32, 0x2e, 0x39, 0x6c, 0x2d, 0x33, 0x2e, 0x38, 0x20, 0x34, 0x63, 0x32, 0x2e, 0x33, 0x20, 0x30,
+	0x20, 0x33, 0x2e, 0x37, 0x2d, 0x2e, 0x33, 0x20, 0x35, 0x2e, 0x37, 0x2e, 0x39, 0x20, 0x31, 0x20,
+	0x31, 0x2e, 0x37, 0x2d, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x35, 0x2d, 0x32, 0x2e, 0x31, 0x20, 0x33,
+	0x2e, 0x31, 0x6c, 0x2e, 0x34, 0x2e, 0x35, 0x63, 0x2e, 0x38, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x38,
+	0x2e, 0x35, 0x20, 0x32, 0x2e, 0x32, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x2e, 0x36, 0x20, 0x32, 0x2e,
+	0x34, 0x2d, 0x31, 0x34, 0x2e, 0x33, 0x20, 0x33, 0x2e, 0x32, 0x2d, 0x31, 0x37, 0x20, 0x33, 0x2e,
+	0x32, 0x2d, 0x2e, 0x37, 0x2d, 0x2e, 0x36, 0x2d, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x39, 0x2d, 0x31,
+	0x2d, 0x32, 0x2e, 0x38, 0x2e, 0x36, 0x2d, 0x33, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x37, 0x2d, 0x34,
+	0x2e, 0x35, 0x20, 0x36, 0x2e, 0x37, 0x2d, 0x35, 0x2e, 0x36, 0x2d, 0x32, 0x2d, 0x2e, 0x39, 0x2d,
+	0x32, 0x2e, 0x32, 0x2d, 0x2e, 0x38, 0x2d, 0x34, 0x2d, 0x32, 0x2e, 0x31, 0x2d, 0x2e, 0x33, 0x2d,
+	0x2e, 0x39, 0x2d, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x37, 0x2d, 0x31, 0x2e,
+	0x39, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x31, 0x20, 0x38, 0x2e, 0x37, 0x2d, 0x33, 0x2e,
+	0x33, 0x20, 0x31, 0x31, 0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x38, 0x34, 0x38, 0x33, 0x38, 0x34,
+	0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x39, 0x2e, 0x38, 0x20, 0x32, 0x32, 0x35, 0x63, 0x30,
+	0x2d, 0x2e, 0x34, 0x2d, 0x2e, 0x32, 0x2d, 0x37, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x37, 0x2d, 0x31,
+	0x30, 0x2e, 0x35, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x33, 0x20, 0x31, 0x36, 0x2e, 0x39,
+	0x2d, 0x31, 0x2e, 0x35, 0x20, 0x32, 0x30, 0x2e, 0x37, 0x2d, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x2e,
+	0x31, 0x20, 0x31, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x36, 0x20, 0x35, 0x2e, 0x31, 0x2d, 0x33, 0x2e,
+	0x38, 0x20, 0x36, 0x2e, 0x32, 0x6c, 0x2d, 0x32, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x33, 0x63, 0x2d,
+	0x31, 0x20, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x35, 0x2e, 0x39, 0x2d, 0x33, 0x20, 0x31, 0x2e, 0x38,
+	0x2d, 0x33, 0x2e, 0x31, 0x2e, 0x38, 0x2d, 0x31, 0x30, 0x2e, 0x34, 0x2d, 0x2e, 0x37, 0x2d, 0x31,
+	0x31, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x34, 0x2e, 0x38, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x32, 0x20,
+	0x31, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x39, 0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x34, 0x37, 0x34, 0x36, 0x34, 0x37,
+	0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x33, 0x32, 0x2e, 0x37, 0x20, 0x32, 0x34, 0x38, 0x2e, 0x38,
+	0x2e, 0x32, 0x2d, 0x2e, 0x36, 0x63, 0x32, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x39, 0x20, 0x31, 0x38,
+	0x2e, 0x38, 0x2d, 0x2e, 0x36, 0x20, 0x32, 0x32, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x37, 0x6c, 0x31,
+	0x2e, 0x33, 0x2d, 0x2e, 0x33, 0x2e, 0x39, 0x2e, 0x39, 0x63, 0x2e, 0x33, 0x2e, 0x38, 0x20, 0x31,
+	0x20, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x33, 0x20, 0x33, 0x2e, 0x35, 0x2d, 0x35, 0x2e, 0x39,
+	0x20, 0x31, 0x2e, 0x35, 0x2d, 0x31, 0x36, 0x2e, 0x35, 0x20, 0x33, 0x2d, 0x32, 0x32, 0x2e, 0x35,
+	0x20, 0x32, 0x2e, 0x37, 0x6d, 0x31, 0x36, 0x35, 0x2d, 0x33, 0x2e, 0x34, 0x63, 0x2e, 0x37, 0x20,
+	0x30, 0x20, 0x34, 0x2e, 0x34, 0x2d, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x35, 0x2d, 0x2e, 0x36, 0x20,
+	0x36, 0x2e, 0x32, 0x2d, 0x2e, 0x36, 0x20, 0x31, 0x32, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x38,
+	0x20, 0x2e, 0x39, 0x2e, 0x38, 0x20, 0x30, 0x2d, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x33, 0x2d, 0x32,
+	0x2e, 0x38, 0x20, 0x33, 0x2e, 0x37, 0x2d, 0x34, 0x2e, 0x33, 0x2e, 0x32, 0x2d, 0x31, 0x37, 0x2e,
+	0x31, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x32, 0x32, 0x2d, 0x32, 0x2e, 0x32, 0x20, 0x30, 0x2d, 0x2e,
+	0x35, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x38, 0x2e, 0x33, 0x2d, 0x33, 0x2e, 0x35, 0x22, 0x2f, 0x3e,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x35, 0x65, 0x35,
+	0x64, 0x35, 0x65, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x32, 0x38, 0x2e, 0x31, 0x20, 0x32,
+	0x32, 0x37, 0x2e, 0x37, 0x63, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x36, 0x20, 0x30, 0x20, 0x34, 0x2e,
+	0x37, 0x2d, 0x2e, 0x33, 0x20, 0x37, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x2e, 0x37, 0x2d,
+	0x34, 0x2e, 0x37, 0x2d, 0x33, 0x2e, 0x33, 0x2d, 0x35, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x32, 0x20,
+	0x32, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x37, 0x20, 0x33, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x31, 0x20,
+	0x36, 0x2e, 0x35, 0x2d, 0x33, 0x2e, 0x35, 0x4d, 0x32, 0x39, 0x2e, 0x38, 0x20, 0x32, 0x32, 0x35,
+	0x63, 0x2e, 0x39, 0x20, 0x32, 0x20, 0x33, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x35, 0x2e,
+	0x33, 0x20, 0x34, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x34, 0x2e, 0x39, 0x2d, 0x33, 0x2e, 0x34, 0x20,
+	0x32, 0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x33, 0x2d, 0x2e, 0x37, 0x2d, 0x32,
+	0x2d, 0x2e, 0x38, 0x2d, 0x35, 0x2e, 0x38, 0x2d, 0x2e, 0x38, 0x2d, 0x37, 0x2e, 0x38, 0x22, 0x2f,
+	0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c,
+	0x28, 0x23, 0x68, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x36, 0x38, 0x2e, 0x35, 0x20,
+	0x31, 0x36, 0x38, 0x2e, 0x37, 0x71, 0x34, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x35, 0x2e, 0x36,
+	0x2e, 0x31, 0x63, 0x33, 0x2e, 0x37, 0x20, 0x32, 0x2e, 0x33, 0x20, 0x38, 0x2e, 0x39, 0x20, 0x34,
+	0x2e, 0x39, 0x20, 0x38, 0x2e, 0x39, 0x20, 0x39, 0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x32, 0x20, 0x37,
+	0x2e, 0x34, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x34, 0x20, 0x36, 0x2e, 0x39, 0x20, 0x35, 0x2e, 0x34,
+	0x2e, 0x33, 0x2d, 0x2e, 0x37, 0x20, 0x35, 0x2d, 0x32, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x34, 0x2d,
+	0x34, 0x6c, 0x2e, 0x35, 0x2d, 0x2e, 0x33, 0x63, 0x2d, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x34, 0x2e,
+	0x38, 0x20, 0x32, 0x2e, 0x34, 0x20, 0x37, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x31, 0x20, 0x32, 0x33,
+	0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x33, 0x20, 0x32, 0x2d, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x38, 0x2d,
+	0x33, 0x2e, 0x39, 0x20, 0x33, 0x2e, 0x37, 0x2d, 0x2e, 0x37, 0x20, 0x30, 0x2d, 0x33, 0x2e, 0x37,
+	0x2d, 0x2e, 0x32, 0x2d, 0x35, 0x2e, 0x37, 0x2d, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x39, 0x2d, 0x2e,
+	0x38, 0x2d, 0x31, 0x32, 0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x31, 0x38, 0x2d, 0x34, 0x2e,
+	0x33, 0x6c, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x2e, 0x36, 0x63, 0x2d, 0x31, 0x2d, 0x2e, 0x35, 0x2d,
+	0x33, 0x2e, 0x33, 0x2d, 0x2e, 0x37, 0x2d, 0x34, 0x2e, 0x34, 0x2d, 0x2e, 0x38, 0x20, 0x32, 0x2e,
+	0x33, 0x20, 0x33, 0x2e, 0x38, 0x20, 0x33, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x32,
+	0x20, 0x31, 0x32, 0x2e, 0x37, 0x2d, 0x2e, 0x31, 0x20, 0x38, 0x2e, 0x34, 0x2d, 0x2e, 0x35, 0x20,
+	0x31, 0x35, 0x2e, 0x31, 0x2d, 0x36, 0x2e, 0x38, 0x20, 0x32, 0x31, 0x2e, 0x34, 0x2d, 0x2e, 0x34,
+	0x2e, 0x34, 0x2d, 0x39, 0x2e, 0x31, 0x20, 0x37, 0x2e, 0x37, 0x2d, 0x31, 0x34, 0x2e, 0x38, 0x20,
+	0x38, 0x2e, 0x37, 0x20, 0x36, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x39, 0x20, 0x31, 0x33, 0x2e, 0x32,
+	0x2d, 0x37, 0x2e, 0x31, 0x20, 0x31, 0x36, 0x2e, 0x36, 0x2d, 0x31, 0x31, 0x2e, 0x33, 0x20, 0x35,
+	0x2d, 0x35, 0x2e, 0x38, 0x20, 0x35, 0x2d, 0x31, 0x36, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x39, 0x2d,
+	0x32, 0x34, 0x2e, 0x32, 0x2d, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x38, 0x2d,
+	0x39, 0x2e, 0x31, 0x2d, 0x35, 0x2e, 0x36, 0x2d, 0x31, 0x30, 0x2e, 0x39, 0x61, 0x37, 0x20, 0x37,
+	0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x2d, 0x31, 0x2e, 0x31,
+	0x6c, 0x2d, 0x2e, 0x31, 0x2d, 0x2e, 0x38, 0x63, 0x2d, 0x2e, 0x32, 0x2d, 0x32, 0x20, 0x2e, 0x31,
+	0x2d, 0x31, 0x2d, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x31, 0x6c, 0x2d, 0x2e, 0x33, 0x2d, 0x31, 0x2e,
+	0x31, 0x63, 0x2d, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x35,
+	0x2d, 0x31, 0x2e, 0x35, 0x2d, 0x32, 0x2e, 0x38, 0x6c, 0x2d, 0x2e, 0x34, 0x2e, 0x32, 0x2d, 0x2e,
+	0x32, 0x2d, 0x2e, 0x35, 0x63, 0x2d, 0x2e, 0x37, 0x2d, 0x31, 0x2e, 0x33, 0x2d, 0x31, 0x2d, 0x31,
+	0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x39, 0x2d, 0x2e, 0x34, 0x2d, 0x31, 0x2d,
+	0x31, 0x2e, 0x39, 0x2d, 0x32, 0x2d, 0x32, 0x2e, 0x37, 0x2d, 0x32, 0x2e, 0x36, 0x6c, 0x2d, 0x2e,
+	0x37, 0x2d, 0x31, 0x2e, 0x31, 0x63, 0x33, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x33, 0x20, 0x34, 0x2e,
+	0x39, 0x2d, 0x33, 0x2e, 0x35, 0x20, 0x37, 0x2e, 0x37, 0x2d, 0x36, 0x2e, 0x33, 0x2e, 0x34, 0x2d,
+	0x2e, 0x35, 0x20, 0x35, 0x2e, 0x31, 0x2d, 0x36, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x31, 0x2d, 0x36,
+	0x2e, 0x37, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x69, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x30,
+	0x36, 0x2e, 0x32, 0x20, 0x31, 0x38, 0x30, 0x63, 0x31, 0x2e, 0x34, 0x2d, 0x2e, 0x38, 0x2d, 0x2e,
+	0x36, 0x20, 0x37, 0x2e, 0x39, 0x2e, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x34, 0x2d, 0x2e, 0x38, 0x20,
+	0x35, 0x2e, 0x36, 0x2d, 0x2e, 0x32, 0x20, 0x35, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x39, 0x20, 0x31,
+	0x31, 0x2e, 0x33, 0x2d, 0x32, 0x20, 0x34, 0x2d, 0x35, 0x2e, 0x35, 0x20, 0x34, 0x2e, 0x32, 0x2d,
+	0x39, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x33, 0x2d, 0x36, 0x2e, 0x36, 0x2d, 0x2e, 0x34, 0x2d, 0x31,
+	0x34, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x39, 0x2d, 0x31, 0x32, 0x2e, 0x39, 0x2d, 0x34, 0x2e, 0x31,
+	0x71, 0x2e, 0x33, 0x2d, 0x35, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x39, 0x2d, 0x31, 0x30, 0x6c, 0x31,
+	0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x35, 0x63, 0x31, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x38, 0x20, 0x33,
+	0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x34, 0x20, 0x34, 0x2e, 0x34, 0x2d, 0x36, 0x2e, 0x37, 0x6c, 0x31,
+	0x2d, 0x2e, 0x36, 0x63, 0x32, 0x2e, 0x34, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x34, 0x2e, 0x32, 0x20,
+	0x37, 0x2e, 0x37, 0x2e, 0x39, 0x2e, 0x33, 0x2d, 0x2e, 0x37, 0x20, 0x35, 0x2d, 0x32, 0x2e, 0x39,
+	0x20, 0x36, 0x2e, 0x34, 0x2d, 0x34, 0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x6a, 0x29, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x31, 0x39, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x38, 0x33, 0x2e, 0x37, 0x63, 0x32,
+	0x2e, 0x34, 0x2d, 0x31, 0x20, 0x36, 0x2e, 0x32, 0x2d, 0x2e, 0x35, 0x20, 0x38, 0x2e, 0x37, 0x2e,
+	0x32, 0x20, 0x31, 0x2e, 0x36, 0x2e, 0x37, 0x20, 0x34, 0x2e, 0x34, 0x2e, 0x31, 0x20, 0x35, 0x2e,
+	0x34, 0x20, 0x33, 0x2e, 0x34, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x35, 0x2e, 0x32, 0x20, 0x34, 0x2e,
+	0x31, 0x20, 0x30, 0x20, 0x35, 0x2e, 0x35, 0x6c, 0x2d, 0x2e, 0x35, 0x2e, 0x31, 0x2d, 0x34, 0x2e,
+	0x37, 0x2d, 0x2e, 0x38, 0x2d, 0x31, 0x33, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x37, 0x63, 0x31, 0x2e,
+	0x39, 0x2d, 0x32, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x34, 0x20, 0x34, 0x2e,
+	0x34, 0x2d, 0x36, 0x2e, 0x37, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x32, 0x39, 0x32, 0x37, 0x32, 0x38, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x32, 0x30, 0x36, 0x2e, 0x37, 0x20, 0x31, 0x37, 0x39, 0x2e, 0x37, 0x63, 0x2d, 0x32, 0x2e,
+	0x32, 0x20, 0x31, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x34, 0x2d, 0x36, 0x2e,
+	0x39, 0x20, 0x34, 0x2e, 0x32, 0x20, 0x31, 0x2e, 0x37, 0x2e, 0x38, 0x20, 0x34, 0x2e, 0x31, 0x20,
+	0x32, 0x2e, 0x31, 0x20, 0x35, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x32, 0x2e, 0x38, 0x20, 0x31, 0x2e,
+	0x36, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x20, 0x32, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x32, 0x2e,
+	0x33, 0x2d, 0x32, 0x2e, 0x35, 0x2d, 0x2e, 0x33, 0x2d, 0x33, 0x2e, 0x36, 0x2d, 0x2e, 0x37, 0x2d,
+	0x34, 0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x6b, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32,
+	0x30, 0x35, 0x2e, 0x33, 0x20, 0x31, 0x38, 0x37, 0x2e, 0x32, 0x63, 0x31, 0x2e, 0x35, 0x20, 0x33,
+	0x2e, 0x34, 0x2e, 0x36, 0x20, 0x37, 0x2e, 0x34, 0x2e, 0x33, 0x20, 0x31, 0x31, 0x6c, 0x2d, 0x2e,
+	0x36, 0x2d, 0x32, 0x2e, 0x32, 0x63, 0x2d, 0x35, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x31,
+	0x30, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x38, 0x2d, 0x31, 0x35, 0x2e, 0x37, 0x2d, 0x32, 0x2e, 0x32,
+	0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x35, 0x2d, 0x2e, 0x31, 0x2d, 0x34,
+	0x2e, 0x33, 0x2d, 0x2e, 0x39, 0x6c, 0x31, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x36, 0x63, 0x31, 0x34,
+	0x2e, 0x37, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x33, 0x2e, 0x33, 0x2e, 0x38, 0x20, 0x31, 0x38,
+	0x2e, 0x34, 0x20, 0x32, 0x2e, 0x32, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x37, 0x2e, 0x32, 0x2d, 0x35,
+	0x2e, 0x33, 0x2e, 0x32, 0x2d, 0x35, 0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x38, 0x30, 0x34, 0x33, 0x31, 0x37, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x31, 0x36, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x37, 0x35, 0x2e, 0x34, 0x63,
+	0x2e, 0x37, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x31, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x2d, 0x31, 0x2e,
+	0x37, 0x20, 0x31, 0x33, 0x2e, 0x33, 0x6c, 0x2d, 0x2e, 0x34, 0x2e, 0x32, 0x2d, 0x2e, 0x32, 0x2d,
+	0x2e, 0x35, 0x71, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x33, 0x2e, 0x34, 0x2d, 0x34, 0x2e, 0x36, 0x2d,
+	0x35, 0x2e, 0x36, 0x6c, 0x2d, 0x2e, 0x37, 0x2d, 0x31, 0x2e, 0x31, 0x63, 0x33, 0x2e, 0x33, 0x2d,
+	0x32, 0x2e, 0x33, 0x20, 0x34, 0x2e, 0x39, 0x2d, 0x33, 0x2e, 0x35, 0x20, 0x37, 0x2e, 0x37, 0x2d,
+	0x36, 0x2e, 0x33, 0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x6c, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x31, 0x35, 0x36, 0x2e, 0x34, 0x20, 0x31, 0x38, 0x32, 0x2e, 0x38, 0x63, 0x2e, 0x39, 0x2e, 0x36,
+	0x20, 0x32, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x37, 0x20, 0x32, 0x2e, 0x36,
+	0x2e, 0x39, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x31,
+	0x2e, 0x39, 0x20, 0x32, 0x2e, 0x39, 0x6c, 0x2e, 0x32, 0x2e, 0x35, 0x63, 0x35, 0x2e, 0x37, 0x20,
+	0x36, 0x2e, 0x34, 0x2d, 0x2e, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x2d, 0x2e, 0x34, 0x20, 0x31,
+	0x35, 0x2e, 0x38, 0x2d, 0x32, 0x2e, 0x39, 0x20, 0x33, 0x2d, 0x37, 0x2e, 0x33, 0x20, 0x34, 0x2e,
+	0x39, 0x2d, 0x31, 0x31, 0x2e, 0x32, 0x20, 0x32, 0x2e, 0x36, 0x2d, 0x35, 0x2e, 0x38, 0x2d, 0x33,
+	0x2e, 0x34, 0x2d, 0x38, 0x2e, 0x33, 0x2d, 0x39, 0x2e, 0x31, 0x2d, 0x31, 0x30, 0x2e, 0x32, 0x2d,
+	0x31, 0x35, 0x2e, 0x32, 0x6c, 0x2d, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x33, 0x63, 0x2d, 0x2e, 0x31,
+	0x2d, 0x2e, 0x36, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x39, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x36, 0x20,
+	0x31, 0x2d, 0x2e, 0x31, 0x20, 0x34, 0x2d, 0x2e, 0x39, 0x20, 0x35, 0x2e, 0x32, 0x2d, 0x31, 0x2e,
+	0x31, 0x20, 0x32, 0x2e, 0x35, 0x2d, 0x2e, 0x37, 0x20, 0x34, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x34,
+	0x20, 0x36, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x35, 0x6c, 0x31, 0x2e, 0x31, 0x2e, 0x34, 0x63, 0x31,
+	0x2e, 0x33, 0x2d, 0x2e, 0x38, 0x20, 0x33, 0x2d, 0x31, 0x2e, 0x35, 0x20, 0x34, 0x2e, 0x35, 0x2d,
+	0x32, 0x2e, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x23, 0x63, 0x62, 0x32, 0x35, 0x33, 0x30, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31,
+	0x33, 0x39, 0x2e, 0x31, 0x20, 0x31, 0x38, 0x38, 0x2e, 0x32, 0x63, 0x31, 0x2d, 0x2e, 0x31, 0x20,
+	0x34, 0x2d, 0x2e, 0x39, 0x20, 0x35, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x31, 0x6c, 0x31, 0x2e, 0x39,
+	0x2e, 0x39, 0x63, 0x2d, 0x33, 0x2e, 0x33, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x37, 0x20, 0x32, 0x2e,
+	0x31, 0x2d, 0x33, 0x2e, 0x39, 0x20, 0x35, 0x2e, 0x36, 0x20, 0x31, 0x20, 0x34, 0x2e, 0x33, 0x20,
+	0x32, 0x2e, 0x39, 0x20, 0x39, 0x2e, 0x31, 0x20, 0x36, 0x2e, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x35,
+	0x20, 0x31, 0x2e, 0x32, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x38, 0x20, 0x34,
+	0x2e, 0x38, 0x2e, 0x38, 0x61, 0x34, 0x39, 0x20, 0x34, 0x39, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31,
+	0x20, 0x2d, 0x31, 0x2e, 0x35, 0x20, 0x2d, 0x31, 0x2e, 0x32, 0x6c, 0x30, 0x2d, 0x2e, 0x33, 0x63,
+	0x31, 0x2e, 0x35, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x31, 0x20, 0x34, 0x2e,
+	0x32, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x32, 0x2e, 0x36, 0x2d, 0x2e, 0x39, 0x20, 0x34, 0x2e, 0x32,
+	0x2d, 0x32, 0x2e, 0x36, 0x20, 0x35, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x39, 0x6c, 0x2e, 0x38, 0x2d,
+	0x31, 0x2e, 0x39, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x32, 0x71, 0x2d, 0x2e, 0x36, 0x20, 0x32, 0x2e,
+	0x32, 0x2d, 0x32, 0x2e, 0x32, 0x20, 0x34, 0x2e, 0x34, 0x63, 0x2d, 0x32, 0x2e, 0x39, 0x20, 0x33,
+	0x2d, 0x37, 0x2e, 0x33, 0x20, 0x34, 0x2e, 0x39, 0x2d, 0x31, 0x31, 0x2e, 0x32, 0x20, 0x32, 0x2e,
+	0x36, 0x2d, 0x35, 0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x34, 0x2d, 0x38, 0x2e, 0x33, 0x2d, 0x39, 0x2e,
+	0x31, 0x2d, 0x31, 0x30, 0x2e, 0x32, 0x2d, 0x31, 0x35, 0x2e, 0x32, 0x6c, 0x2d, 0x2e, 0x36, 0x2d,
+	0x31, 0x2e, 0x33, 0x63, 0x2d, 0x2e, 0x31, 0x2d, 0x2e, 0x36, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x39,
+	0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x36, 0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x37, 0x39, 0x32, 0x61, 0x32, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x6d, 0x31, 0x35, 0x38, 0x2e, 0x38, 0x20, 0x31, 0x38, 0x39, 0x2e, 0x33, 0x2e, 0x35,
+	0x2d, 0x31, 0x2e, 0x32, 0x63, 0x2e, 0x37, 0x2d, 0x2e, 0x33, 0x2e, 0x38, 0x2d, 0x2e, 0x31, 0x20,
+	0x31, 0x2e, 0x38, 0x2e, 0x33, 0x6c, 0x2e, 0x32, 0x2e, 0x35, 0x2e, 0x34, 0x2d, 0x2e, 0x32, 0x63,
+	0x31, 0x20, 0x31, 0x2e, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x33, 0x20,
+	0x32, 0x2e, 0x37, 0x6c, 0x2e, 0x31, 0x2e, 0x39, 0x63, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x39, 0x2e,
+	0x34, 0x20, 0x31, 0x2e, 0x36, 0x2e, 0x35, 0x20, 0x34, 0x71, 0x2e, 0x31, 0x2e, 0x31, 0x2d, 0x2e,
+	0x36, 0x20, 0x32, 0x2e, 0x39, 0x6c, 0x2d, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x39, 0x2d, 0x32, 0x2d,
+	0x31, 0x2e, 0x38, 0x63, 0x2d, 0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x2e, 0x33, 0x2d, 0x36,
+	0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x39, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x62, 0x36, 0x32, 0x63, 0x31, 0x36,
+	0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x36, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x38, 0x38, 0x2e,
+	0x36, 0x63, 0x31, 0x20, 0x31, 0x2e, 0x33, 0x2e, 0x38, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x34, 0x20,
+	0x32, 0x2e, 0x33, 0x6c, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x71, 0x2d,
+	0x2e, 0x32, 0x20, 0x31, 0x2e, 0x36, 0x2d, 0x2e, 0x39, 0x20, 0x34, 0x2e, 0x32, 0x6c, 0x2d, 0x2e,
+	0x31, 0x2d, 0x31, 0x2e, 0x32, 0x63, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x38, 0x2d, 0x2e, 0x31, 0x2d,
+	0x36, 0x2e, 0x37, 0x2d, 0x32, 0x2e, 0x32, 0x2d, 0x31, 0x31, 0x2e, 0x31, 0x7a, 0x4d, 0x31, 0x34,
+	0x34, 0x2e, 0x32, 0x20, 0x31, 0x38, 0x37, 0x63, 0x32, 0x2e, 0x35, 0x2d, 0x2e, 0x37, 0x20, 0x34,
+	0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x36, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x35, 0x6c, 0x31,
+	0x2e, 0x31, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x36, 0x2d, 0x33, 0x2e, 0x33,
+	0x2d, 0x2e, 0x37, 0x2d, 0x31, 0x2e, 0x39, 0x2d, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x35, 0x37, 0x38, 0x38, 0x35,
+	0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x35, 0x39, 0x2e, 0x31, 0x20, 0x31, 0x38, 0x35, 0x2e,
+	0x34, 0x63, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x2e, 0x36,
+	0x20, 0x31, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x39, 0x2d, 0x2e, 0x39, 0x2d, 0x2e, 0x33, 0x2d, 0x31,
+	0x2d, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x38, 0x2d, 0x2e, 0x33, 0x6c, 0x2d, 0x2e, 0x35, 0x20, 0x31,
+	0x2e, 0x32, 0x63, 0x2d, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x32,
+	0x2e, 0x37, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x36, 0x30, 0x33, 0x39, 0x31, 0x65, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x6d, 0x39, 0x37, 0x2e, 0x33, 0x20, 0x31, 0x38, 0x37, 0x2e, 0x33, 0x20, 0x31,
+	0x2e, 0x36, 0x2e, 0x32, 0x63, 0x2d, 0x2e, 0x31, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x2d, 0x31, 0x38,
+	0x2e, 0x37, 0x20, 0x32, 0x36, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x39, 0x20, 0x35, 0x32, 0x2e, 0x37,
+	0x20, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x32, 0x20, 0x33, 0x2e,
+	0x38, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x20, 0x34, 0x2e, 0x33, 0x2d, 0x32, 0x2d, 0x2e, 0x31, 0x2d,
+	0x35, 0x2d, 0x2e, 0x34, 0x2d, 0x37, 0x2d, 0x2e, 0x38, 0x2d, 0x33, 0x2d, 0x2e, 0x33, 0x2d, 0x34,
+	0x2e, 0x33, 0x2d, 0x2e, 0x32, 0x2d, 0x37, 0x2e, 0x32, 0x2d, 0x2e, 0x35, 0x2d, 0x2e, 0x31, 0x2d,
+	0x2e, 0x38, 0x2d, 0x34, 0x2e, 0x35, 0x2d, 0x35, 0x2e, 0x37, 0x2d, 0x35, 0x2d, 0x36, 0x2e, 0x37,
+	0x2d, 0x34, 0x2e, 0x34, 0x2d, 0x38, 0x2d, 0x35, 0x2e, 0x39, 0x2d, 0x31, 0x35, 0x2d, 0x36, 0x2e,
+	0x37, 0x2d, 0x32, 0x34, 0x2d, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x31, 0x20, 0x33, 0x2d, 0x37, 0x2e,
+	0x33, 0x20, 0x33, 0x2e, 0x38, 0x2d, 0x31, 0x30, 0x2e, 0x39, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x37,
+	0x20, 0x39, 0x2e, 0x38, 0x2d, 0x31, 0x31, 0x2e, 0x37, 0x20, 0x37, 0x2e, 0x31, 0x2d, 0x31, 0x34,
+	0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x23, 0x33, 0x65, 0x32, 0x37, 0x31, 0x36, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x39, 0x37,
+	0x2e, 0x33, 0x20, 0x31, 0x38, 0x37, 0x2e, 0x33, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x31, 0x63, 0x2e,
+	0x35, 0x20, 0x32, 0x2e, 0x31, 0x2d, 0x35, 0x2e, 0x35, 0x20, 0x39, 0x2e, 0x39, 0x2d, 0x36, 0x2e,
+	0x38, 0x20, 0x31, 0x32, 0x2d, 0x32, 0x2e, 0x32, 0x20, 0x34, 0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x39,
+	0x20, 0x38, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x35, 0x20, 0x30, 0x20,
+	0x31, 0x30, 0x2e, 0x33, 0x20, 0x36, 0x2e, 0x36, 0x20, 0x32, 0x37, 0x2e, 0x33, 0x20, 0x31, 0x34,
+	0x2e, 0x37, 0x20, 0x32, 0x39, 0x2d, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x32, 0x2d, 0x33, 0x2e,
+	0x39, 0x20, 0x31, 0x2e, 0x32, 0x2d, 0x38, 0x2e, 0x38, 0x2d, 0x36, 0x2e, 0x34, 0x2d, 0x34, 0x2e,
+	0x34, 0x2d, 0x38, 0x2d, 0x36, 0x2e, 0x33, 0x2d, 0x31, 0x33, 0x2e, 0x38, 0x2d, 0x37, 0x2e, 0x33,
+	0x2d, 0x32, 0x35, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x37, 0x2e, 0x34, 0x20, 0x34, 0x2e,
+	0x34, 0x2d, 0x31, 0x31, 0x2e, 0x36, 0x20, 0x31, 0x31, 0x2e, 0x36, 0x2d, 0x32, 0x33, 0x2e, 0x39,
+	0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23,
+	0x38, 0x30, 0x34, 0x33, 0x31, 0x37, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x30, 0x35, 0x20,
+	0x32, 0x34, 0x33, 0x2e, 0x31, 0x63, 0x2d, 0x35, 0x2e, 0x32, 0x2d, 0x34, 0x2d, 0x38, 0x2e, 0x33,
+	0x2d, 0x38, 0x2e, 0x37, 0x2d, 0x31, 0x31, 0x2e, 0x34, 0x2d, 0x31, 0x35, 0x2e, 0x39, 0x20, 0x38,
+	0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x32, 0x2e, 0x37, 0x20, 0x31, 0x35, 0x20,
+	0x31, 0x38, 0x2e, 0x38, 0x20, 0x31, 0x37, 0x2e, 0x33, 0x2d, 0x32, 0x2d, 0x2e, 0x31, 0x2d, 0x35,
+	0x2e, 0x33, 0x2d, 0x31, 0x2d, 0x37, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x34, 0x7a, 0x22, 0x2f, 0x3e,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x61, 0x61, 0x36,
+	0x31, 0x32, 0x35, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x32, 0x37, 0x20, 0x31, 0x38, 0x39,
+	0x2e, 0x38, 0x63, 0x32, 0x2e, 0x35, 0x20, 0x30, 0x20, 0x39, 0x20, 0x30, 0x20, 0x31, 0x30, 0x2e,
+	0x38, 0x20, 0x31, 0x2e, 0x37, 0x6c, 0x2d, 0x31, 0x2e, 0x31, 0x2e, 0x38, 0x63, 0x2d, 0x35, 0x2e,
+	0x32, 0x2e, 0x36, 0x2d, 0x31, 0x37, 0x2e, 0x31, 0x2e, 0x35, 0x2d, 0x32, 0x31, 0x2e, 0x37, 0x2d,
+	0x31, 0x2e, 0x33, 0x20, 0x33, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x33, 0x20, 0x38, 0x2d, 0x31, 0x2e,
+	0x32, 0x20, 0x31, 0x31, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x32, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x38, 0x30, 0x34, 0x33, 0x31, 0x37,
+	0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x30, 0x36, 0x20, 0x31, 0x38, 0x39, 0x2e, 0x31, 0x63,
+	0x34, 0x2e, 0x37, 0x2d, 0x2e, 0x32, 0x20, 0x36, 0x2e, 0x38, 0x2e, 0x35, 0x20, 0x31, 0x30, 0x2e,
+	0x37, 0x20, 0x32, 0x2e, 0x32, 0x20, 0x34, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x31,
+	0x2e, 0x39, 0x20, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x36, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x31, 0x20,
+	0x32, 0x2e, 0x31, 0x20, 0x30, 0x20, 0x33, 0x2e, 0x37, 0x2d, 0x2e, 0x32, 0x20, 0x35, 0x2e, 0x37,
+	0x2d, 0x31, 0x2e, 0x38, 0x2e, 0x31, 0x2e, 0x33, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x37, 0x2e, 0x35,
+	0x20, 0x31, 0x2e, 0x37, 0x2d, 0x35, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x37, 0x2d, 0x31, 0x34, 0x2e,
+	0x38, 0x20, 0x33, 0x2e, 0x32, 0x2d, 0x33, 0x31, 0x2e, 0x38, 0x2d, 0x32, 0x61, 0x33, 0x2e, 0x34,
+	0x20, 0x33, 0x2e, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x2d, 0x31, 0x2e, 0x36, 0x20,
+	0x2d, 0x31, 0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x6d, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d,
+	0x31, 0x35, 0x30, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x31, 0x2e,
+	0x35, 0x63, 0x34, 0x2e, 0x39, 0x20, 0x31, 0x31, 0x2e, 0x37, 0x2d, 0x39, 0x2e, 0x35, 0x20, 0x34,
+	0x39, 0x2e, 0x35, 0x2d, 0x31, 0x31, 0x2e, 0x33, 0x20, 0x37, 0x32, 0x2e, 0x31, 0x2d, 0x2e, 0x32,
+	0x20, 0x34, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x38, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x37,
+	0x20, 0x31, 0x33, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x37, 0x20, 0x34, 0x2e, 0x38, 0x20,
+	0x39, 0x2e, 0x33, 0x20, 0x35, 0x2e, 0x39, 0x20, 0x31, 0x32, 0x2e, 0x37, 0x2e, 0x35, 0x20, 0x31,
+	0x2e, 0x38, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x37, 0x2e, 0x39, 0x20, 0x34, 0x2e, 0x35, 0x6c, 0x31,
+	0x2e, 0x32, 0x20, 0x36, 0x63, 0x31, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x33, 0x20, 0x34, 0x2e, 0x31,
+	0x20, 0x39, 0x2e, 0x38, 0x20, 0x36, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x20, 0x35, 0x2e,
+	0x34, 0x20, 0x38, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x39, 0x20,
+	0x31, 0x34, 0x2e, 0x31, 0x20, 0x32, 0x36, 0x2e, 0x31, 0x2d, 0x2e, 0x31, 0x20, 0x33, 0x2e, 0x34,
+	0x2e, 0x39, 0x20, 0x38, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x61,
+	0x33, 0x32, 0x20, 0x33, 0x32, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x2d, 0x31, 0x2e, 0x36,
+	0x20, 0x34, 0x63, 0x2d, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x39, 0x2d, 0x33, 0x20, 0x34, 0x2e, 0x37,
+	0x2d, 0x35, 0x2e, 0x31, 0x20, 0x36, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x38,
+	0x2d, 0x34, 0x2e, 0x34, 0x20, 0x34, 0x2e, 0x31, 0x2d, 0x37, 0x2e, 0x37, 0x20, 0x36, 0x2e, 0x33,
+	0x6c, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x31, 0x63, 0x2d, 0x31, 0x2e, 0x34, 0x2e, 0x36, 0x2d, 0x33,
+	0x2e, 0x32, 0x20, 0x31, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x35, 0x20, 0x32, 0x2e, 0x31, 0x6c, 0x2d,
+	0x31, 0x2e, 0x31, 0x2d, 0x2e, 0x34, 0x63, 0x2d, 0x32, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x31, 0x2d,
+	0x34, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x38, 0x2d, 0x36, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x35, 0x2d,
+	0x31, 0x2e, 0x31, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x32, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x35, 0x2e,
+	0x32, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x2e, 0x31, 0x2e, 0x37, 0x2d, 0x31, 0x36, 0x2e, 0x37, 0x20,
+	0x32, 0x2e, 0x35, 0x2d, 0x32, 0x33, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x39, 0x6c, 0x2d, 0x36, 0x2e,
+	0x35, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x36, 0x2d, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x37,
+	0x2d, 0x2e, 0x32, 0x63, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x37, 0x2d,
+	0x2e, 0x38, 0x2d, 0x35, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x33, 0x6c, 0x2d, 0x31, 0x2e, 0x35, 0x2d,
+	0x2e, 0x31, 0x61, 0x34, 0x20, 0x34, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2d, 0x31, 0x2e,
+	0x38, 0x20, 0x2d, 0x2e, 0x39, 0x63, 0x2d, 0x37, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x35, 0x2d, 0x31,
+	0x31, 0x2e, 0x38, 0x2d, 0x37, 0x2e, 0x35, 0x2d, 0x31, 0x34, 0x2e, 0x36, 0x2d, 0x31, 0x34, 0x2e,
+	0x37, 0x6c, 0x2d, 0x2e, 0x33, 0x2d, 0x2e, 0x35, 0x63, 0x2d, 0x33, 0x2e, 0x34, 0x2d, 0x2e, 0x39,
+	0x2d, 0x31, 0x2e, 0x33, 0x2d, 0x31, 0x31, 0x2e, 0x39, 0x2d, 0x2e, 0x39, 0x2d, 0x31, 0x34, 0x2e,
+	0x39, 0x20, 0x31, 0x2e, 0x32, 0x2d, 0x36, 0x2e, 0x33, 0x20, 0x34, 0x2e, 0x32, 0x2d, 0x31, 0x31,
+	0x20, 0x36, 0x2d, 0x31, 0x36, 0x2e, 0x37, 0x2e, 0x38, 0x2d, 0x32, 0x2e, 0x34, 0x2e, 0x39, 0x2d,
+	0x36, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x34, 0x2d, 0x39, 0x2e, 0x36, 0x2e, 0x34, 0x2d, 0x31, 0x2e,
+	0x39, 0x20, 0x30, 0x2d, 0x34, 0x2e, 0x38, 0x2d, 0x2e, 0x31, 0x2d, 0x36, 0x2e, 0x34, 0x2d, 0x2e,
+	0x38, 0x2d, 0x36, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x35, 0x2d, 0x31, 0x33, 0x2e, 0x39, 0x2d, 0x31,
+	0x2e, 0x32, 0x2d, 0x32, 0x30, 0x2e, 0x33, 0x6c, 0x2e, 0x33, 0x2d, 0x2e, 0x31, 0x2e, 0x35, 0x2d,
+	0x36, 0x2e, 0x32, 0x63, 0x2e, 0x36, 0x2d, 0x32, 0x20, 0x35, 0x2e, 0x32, 0x2d, 0x38, 0x2e, 0x31,
+	0x20, 0x36, 0x2e, 0x32, 0x2d, 0x31, 0x30, 0x2e, 0x35, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x34, 0x20,
+	0x33, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x34, 0x20, 0x34, 0x2e, 0x34, 0x2d, 0x34, 0x2e, 0x37, 0x2d,
+	0x31, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x38, 0x20,
+	0x38, 0x2e, 0x34, 0x2d, 0x36, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x32, 0x2e, 0x31, 0x2d, 0x33, 0x2e,
+	0x33, 0x20, 0x31, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x38, 0x20, 0x32, 0x2e,
+	0x32, 0x2d, 0x32, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x39, 0x20, 0x36, 0x2e,
+	0x34, 0x2d, 0x33, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x37, 0x2d, 0x35, 0x2e, 0x33, 0x20, 0x35, 0x2e,
+	0x31, 0x2d, 0x34, 0x2e, 0x39, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x2d, 0x33, 0x2e, 0x36, 0x6c, 0x2e,
+	0x38, 0x2d, 0x2e, 0x32, 0x63, 0x2d, 0x31, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x2e, 0x36, 0x2d, 0x31,
+	0x37, 0x20, 0x30, 0x2d, 0x32, 0x30, 0x2e, 0x36, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x35, 0x20, 0x31,
+	0x2e, 0x34, 0x2d, 0x35, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x36, 0x2d, 0x37, 0x2e, 0x35, 0x2e, 0x32,
+	0x2d, 0x2e, 0x38, 0x20, 0x32, 0x2d, 0x34, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x34, 0x2d, 0x35, 0x2e,
+	0x31, 0x20, 0x32, 0x2e, 0x38, 0x2d, 0x36, 0x2e, 0x34, 0x20, 0x36, 0x2e, 0x36, 0x2d, 0x31, 0x31,
+	0x2e, 0x38, 0x20, 0x31, 0x30, 0x2e, 0x33, 0x2d, 0x31, 0x37, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x34,
+	0x2d, 0x32, 0x2e, 0x33, 0x20, 0x34, 0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x39, 0x20, 0x35, 0x2e, 0x37,
+	0x2d, 0x36, 0x2e, 0x39, 0x20, 0x33, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x33, 0x20, 0x33, 0x2e, 0x34,
+	0x2d, 0x35, 0x2e, 0x32, 0x20, 0x37, 0x2e, 0x37, 0x2d, 0x38, 0x2e, 0x38, 0x7a, 0x22, 0x2f, 0x3e,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28,
+	0x23, 0x6e, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x34, 0x38, 0x2e, 0x32, 0x20, 0x33,
+	0x2e, 0x31, 0x63, 0x2d, 0x34, 0x2e, 0x35, 0x20, 0x33, 0x2d, 0x33, 0x2e, 0x39, 0x20, 0x34, 0x2d,
+	0x37, 0x2e, 0x32, 0x20, 0x38, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x36, 0x20, 0x32, 0x2d, 0x34, 0x2e,
+	0x35, 0x20, 0x35, 0x2e, 0x32, 0x2d, 0x36, 0x20, 0x37, 0x2e, 0x35, 0x2d, 0x33, 0x2e, 0x36, 0x20,
+	0x36, 0x2d, 0x37, 0x2e, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x2d, 0x31, 0x30, 0x2e, 0x33, 0x20,
+	0x31, 0x37, 0x2e, 0x39, 0x2d, 0x2e, 0x34, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x32, 0x20, 0x34, 0x2e,
+	0x33, 0x2d, 0x32, 0x2e, 0x34, 0x20, 0x35, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x32, 0x20, 0x32, 0x2e,
+	0x32, 0x2d, 0x32, 0x2e, 0x34, 0x20, 0x35, 0x2d, 0x32, 0x2e, 0x36, 0x20, 0x37, 0x2e, 0x35, 0x2d,
+	0x2e, 0x36, 0x20, 0x33, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x37, 0x2e, 0x37, 0x2d,
+	0x2e, 0x34, 0x20, 0x32, 0x30, 0x2e, 0x38, 0x2d, 0x35, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x32, 0x2d,
+	0x36, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x31, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x36,
+	0x43, 0x38, 0x30, 0x2e, 0x32, 0x20, 0x38, 0x39, 0x2e, 0x32, 0x20, 0x38, 0x35, 0x20, 0x31, 0x30,
+	0x30, 0x2e, 0x35, 0x20, 0x38, 0x37, 0x20, 0x31, 0x32, 0x39, 0x2e, 0x38, 0x6c, 0x31, 0x2e, 0x35,
+	0x20, 0x31, 0x2e, 0x38, 0x63, 0x2e, 0x38, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x20,
+	0x32, 0x20, 0x2e, 0x37, 0x2e, 0x32, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x33, 0x20, 0x31,
+	0x2e, 0x39, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x32, 0x20,
+	0x36, 0x2e, 0x33, 0x2d, 0x35, 0x2e, 0x38, 0x20, 0x32, 0x38, 0x2d, 0x31, 0x32, 0x2e, 0x34, 0x2e,
+	0x33, 0x2d, 0x2e, 0x31, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x33, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x38,
+	0x2e, 0x37, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x32, 0x20, 0x32,
+	0x2e, 0x34, 0x20, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x32, 0x2e, 0x38, 0x20, 0x38, 0x2e, 0x38, 0x20,
+	0x32, 0x35, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x32, 0x20, 0x32, 0x33, 0x2e, 0x34, 0x2d, 0x39, 0x2e,
+	0x37, 0x2d, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x39,
+	0x20, 0x31, 0x2e, 0x38, 0x2e, 0x38, 0x2d, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x38, 0x20, 0x33, 0x2e,
+	0x32, 0x2e, 0x35, 0x20, 0x32, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x38, 0x2d,
+	0x31, 0x38, 0x2e, 0x36, 0x2d, 0x36, 0x2e, 0x35, 0x2d, 0x32, 0x39, 0x2d, 0x38, 0x2e, 0x34, 0x2d,
+	0x33, 0x32, 0x2e, 0x37, 0x2e, 0x35, 0x2d, 0x39, 0x20, 0x33, 0x2d, 0x32, 0x34, 0x2e, 0x33, 0x20,
+	0x34, 0x2e, 0x38, 0x2d, 0x33, 0x33, 0x2e, 0x35, 0x20, 0x32, 0x2e, 0x36, 0x2d, 0x31, 0x36, 0x2e,
+	0x32, 0x20, 0x32, 0x2e, 0x31, 0x2d, 0x31, 0x37, 0x2e, 0x38, 0x20, 0x34, 0x2e, 0x36, 0x2d, 0x33,
+	0x34, 0x2e, 0x37, 0x2d, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x31, 0x2e, 0x33, 0x2d, 0x38, 0x2e, 0x36,
+	0x2d, 0x31, 0x2e, 0x33, 0x2d, 0x31, 0x30, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x38, 0x2d, 0x31, 0x2e,
+	0x34, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x2e, 0x34, 0x22,
+	0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72,
+	0x6c, 0x28, 0x23, 0x6f, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x39, 0x39, 0x2e, 0x36, 0x20,
+	0x39, 0x39, 0x2e, 0x39, 0x63, 0x31, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x38,
+	0x2d, 0x33, 0x2e, 0x37, 0x20, 0x34, 0x2e, 0x37, 0x2d, 0x34, 0x2e, 0x34, 0x20, 0x35, 0x2d, 0x33,
+	0x2e, 0x31, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x2d, 0x34, 0x2e, 0x38, 0x20, 0x32, 0x30, 0x2e, 0x36,
+	0x2d, 0x35, 0x2e, 0x35, 0x20, 0x34, 0x20, 0x30, 0x20, 0x38, 0x2e, 0x39, 0x2e, 0x31, 0x20, 0x31,
+	0x31, 0x2e, 0x33, 0x20, 0x33, 0x2e, 0x35, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x35, 0x2e, 0x32, 0x20,
+	0x31, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x38, 0x20, 0x37, 0x20, 0x33, 0x2e,
+	0x38, 0x20, 0x37, 0x2e, 0x32, 0x20, 0x39, 0x2e, 0x31, 0x20, 0x38, 0x2e, 0x38, 0x20, 0x31, 0x36,
+	0x20, 0x2e, 0x32, 0x20, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x31, 0x20, 0x39, 0x2e, 0x33, 0x2e,
+	0x39, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x35, 0x20, 0x34, 0x2e, 0x37, 0x2d, 0x36,
+	0x2e, 0x33, 0x20, 0x33, 0x2e, 0x38, 0x2d, 0x31, 0x30, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x33, 0x2d,
+	0x33, 0x2e, 0x39, 0x2d, 0x2e, 0x39, 0x2d, 0x35, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x33, 0x2d, 0x39,
+	0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x31, 0x2d, 0x31, 0x2e, 0x38,
+	0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x2e, 0x31, 0x2e,
+	0x35, 0x2d, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x37, 0x2d, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x38, 0x2d,
+	0x32, 0x2e, 0x32, 0x2e, 0x37, 0x2d, 0x39, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x37, 0x2d, 0x31, 0x31,
+	0x2e, 0x34, 0x20, 0x32, 0x2e, 0x36, 0x20, 0x33, 0x2d, 0x38, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x34,
+	0x2d, 0x31, 0x35, 0x2e, 0x35, 0x2d, 0x37, 0x2e, 0x39, 0x2d, 0x32, 0x31, 0x2e, 0x32, 0x2d, 0x31,
+	0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x39, 0x2d, 0x33, 0x2e, 0x36, 0x2d, 0x33, 0x2e, 0x32, 0x2d, 0x36,
+	0x2e, 0x32, 0x2d, 0x33, 0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x64, 0x66, 0x64, 0x66, 0x64, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x31, 0x33, 0x32, 0x2e, 0x34, 0x20, 0x39, 0x36, 0x2e, 0x31, 0x63, 0x32, 0x2e, 0x35, 0x2d,
+	0x2e, 0x35, 0x20, 0x33, 0x2e, 0x33, 0x2d, 0x2e, 0x33, 0x20, 0x35, 0x2e, 0x34, 0x2e, 0x31, 0x20,
+	0x37, 0x20, 0x33, 0x2e, 0x38, 0x20, 0x37, 0x2e, 0x32, 0x20, 0x39, 0x2e, 0x31, 0x20, 0x38, 0x2e,
+	0x38, 0x20, 0x31, 0x36, 0x20, 0x2e, 0x32, 0x20, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x31, 0x20,
+	0x39, 0x2e, 0x33, 0x2e, 0x39, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x35, 0x20, 0x34,
+	0x2e, 0x37, 0x2d, 0x36, 0x2e, 0x33, 0x20, 0x33, 0x2e, 0x38, 0x2d, 0x31, 0x30, 0x2e, 0x32, 0x20,
+	0x33, 0x2e, 0x33, 0x2d, 0x33, 0x2e, 0x39, 0x2d, 0x2e, 0x39, 0x2d, 0x35, 0x2e, 0x38, 0x2d, 0x31,
+	0x2e, 0x33, 0x2d, 0x39, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x31,
+	0x2d, 0x31, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x31,
+	0x71, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x37, 0x2d, 0x2e, 0x38, 0x2d, 0x37, 0x2e, 0x35,
+	0x63, 0x2e, 0x39, 0x2d, 0x35, 0x2e, 0x35, 0x20, 0x32, 0x2e, 0x32, 0x2d, 0x31, 0x32, 0x2e, 0x36,
+	0x20, 0x37, 0x2e, 0x35, 0x2d, 0x31, 0x36, 0x2e, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x70, 0x29, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x34, 0x38, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x38, 0x63, 0x2d,
+	0x33, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x36, 0x2d, 0x33, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x33, 0x2d,
+	0x31, 0x32, 0x2e, 0x38, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x2d, 0x35, 0x2e, 0x34, 0x20, 0x31, 0x30,
+	0x2e, 0x33, 0x2d, 0x31, 0x33, 0x2e, 0x37, 0x20, 0x32, 0x30, 0x2d, 0x31, 0x35, 0x2e, 0x39, 0x20,
+	0x33, 0x31, 0x2e, 0x37, 0x2d, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x31, 0x20,
+	0x31, 0x37, 0x2e, 0x36, 0x2d, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x2e, 0x37, 0x6c, 0x2d, 0x31, 0x2e,
+	0x32, 0x20, 0x31, 0x2e, 0x37, 0x71, 0x33, 0x2e, 0x39, 0x2e, 0x31, 0x20, 0x38, 0x2e, 0x35, 0x20,
+	0x31, 0x63, 0x31, 0x2e, 0x32, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x33, 0x2e, 0x38, 0x20, 0x36, 0x2e,
+	0x39, 0x20, 0x31, 0x2e, 0x34, 0x2d, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x39, 0x20, 0x31, 0x2d, 0x35,
+	0x2e, 0x39, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x39, 0x2e, 0x34, 0x2e, 0x38, 0x2d, 0x31, 0x33, 0x2e,
+	0x38, 0x20, 0x34, 0x2e, 0x36, 0x2d, 0x32, 0x36, 0x2e, 0x39, 0x20, 0x39, 0x2e, 0x32, 0x2d, 0x33,
+	0x39, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x36, 0x2e, 0x36, 0x20, 0x34, 0x2e, 0x39, 0x2d,
+	0x31, 0x33, 0x2e, 0x31, 0x20, 0x36, 0x2e, 0x35, 0x2d, 0x32, 0x30, 0x71, 0x2e, 0x32, 0x2d, 0x31,
+	0x2e, 0x37, 0x2d, 0x2e, 0x35, 0x2d, 0x32, 0x2e, 0x31, 0x73, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x2e,
+	0x31, 0x2d, 0x31, 0x2e, 0x38, 0x20, 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x64, 0x35, 0x38, 0x63, 0x34, 0x62, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x31, 0x32, 0x36, 0x2e, 0x38, 0x20, 0x37, 0x32, 0x2e, 0x38, 0x63, 0x2d, 0x2e,
+	0x31, 0x2d, 0x36, 0x2e, 0x34, 0x2e, 0x35, 0x2d, 0x31, 0x33, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x39,
+	0x2d, 0x32, 0x30, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x2d, 0x36, 0x2e, 0x33, 0x20, 0x34, 0x2e,
+	0x35, 0x2d, 0x31, 0x30, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x38, 0x2d, 0x31, 0x36, 0x2e, 0x37, 0x6c,
+	0x37, 0x2e, 0x38, 0x2d, 0x31, 0x39, 0x2e, 0x38, 0x63, 0x31, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x38,
+	0x20, 0x34, 0x2e, 0x34, 0x2d, 0x31, 0x32, 0x2e, 0x35, 0x20, 0x36, 0x2e, 0x35, 0x2d, 0x31, 0x32,
+	0x2e, 0x39, 0x2e, 0x35, 0x2e, 0x31, 0x2e, 0x36, 0x2e, 0x32, 0x2e, 0x37, 0x20, 0x32, 0x2e, 0x31,
+	0x2d, 0x31, 0x2e, 0x36, 0x20, 0x36, 0x2e, 0x39, 0x2d, 0x34, 0x20, 0x31, 0x32, 0x2e, 0x37, 0x2d,
+	0x36, 0x2e, 0x34, 0x20, 0x31, 0x39, 0x2e, 0x34, 0x2d, 0x34, 0x2e, 0x36, 0x20, 0x31, 0x33, 0x2d,
+	0x38, 0x2e, 0x34, 0x20, 0x32, 0x36, 0x2d, 0x39, 0x2e, 0x32, 0x20, 0x33, 0x39, 0x2e, 0x39, 0x61,
+	0x31, 0x32, 0x36, 0x20, 0x31, 0x32, 0x36, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2d, 0x2e,
+	0x31, 0x20, 0x31, 0x31, 0x63, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x31, 0x2d, 0x38, 0x2d, 0x32, 0x2e,
+	0x39, 0x2d, 0x38, 0x2d, 0x32, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x64, 0x66, 0x64, 0x66, 0x64, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x39, 0x39, 0x2e, 0x36, 0x20, 0x39, 0x39, 0x2e, 0x39, 0x63, 0x32, 0x2e, 0x36,
+	0x2d, 0x2e, 0x32, 0x20, 0x34, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x31, 0x20, 0x36, 0x2e, 0x32, 0x20,
+	0x33, 0x20, 0x35, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x37, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x20, 0x31,
+	0x33, 0x20, 0x37, 0x2e, 0x39, 0x20, 0x32, 0x31, 0x2e, 0x32, 0x2d, 0x2e, 0x39, 0x20, 0x31, 0x2d,
+	0x31, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x31, 0x2d,
+	0x2e, 0x39, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x37, 0x2d, 0x33, 0x2e, 0x32,
+	0x20, 0x32, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x36, 0x2d, 0x37, 0x2e, 0x38,
+	0x20, 0x36, 0x2e, 0x39, 0x2d, 0x31, 0x33, 0x20, 0x31, 0x2e, 0x38, 0x2d, 0x34, 0x2e, 0x38, 0x20,
+	0x30, 0x2d, 0x33, 0x2e, 0x34, 0x2d, 0x34, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x37, 0x2e,
+	0x32, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x33, 0x2d, 0x31, 0x32,
+	0x2e, 0x39, 0x2d, 0x2e, 0x37, 0x2d, 0x31, 0x37, 0x20, 0x31, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x35,
+	0x20, 0x34, 0x2e, 0x33, 0x2d, 0x35, 0x20, 0x37, 0x2e, 0x35, 0x2d, 0x36, 0x2e, 0x34, 0x7a, 0x22,
+	0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x36,
+	0x30, 0x33, 0x39, 0x31, 0x65, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x30, 0x39, 0x2e, 0x34,
+	0x20, 0x36, 0x36, 0x2e, 0x32, 0x61, 0x31, 0x37, 0x20, 0x31, 0x37, 0x20, 0x30, 0x20, 0x30, 0x20,
+	0x31, 0x20, 0x33, 0x2e, 0x34, 0x20, 0x2d, 0x2e, 0x36, 0x63, 0x34, 0x20, 0x32, 0x20, 0x33, 0x2e,
+	0x32, 0x20, 0x31, 0x2e, 0x33, 0x20, 0x36, 0x2e, 0x31, 0x20, 0x34, 0x2e, 0x34, 0x6c, 0x2e, 0x38,
+	0x2d, 0x2e, 0x31, 0x63, 0x2d, 0x2e, 0x32, 0x2e, 0x33, 0x2d, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x39,
+	0x2d, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x38, 0x2d, 0x35, 0x2e, 0x32, 0x2e, 0x35, 0x2d, 0x31, 0x32,
+	0x2e, 0x31, 0x20, 0x33, 0x2e, 0x35, 0x2d, 0x31, 0x33, 0x2e, 0x38, 0x20, 0x34, 0x2e, 0x36, 0x20,
+	0x31, 0x2d, 0x31, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x35, 0x20, 0x32, 0x2e,
+	0x31, 0x2d, 0x33, 0x2e, 0x35, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x2d, 0x35, 0x2e,
+	0x35, 0x20, 0x32, 0x2e, 0x31, 0x2d, 0x36, 0x2e, 0x36, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x62, 0x37, 0x39, 0x62, 0x37, 0x62, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x35, 0x30, 0x2e, 0x36, 0x20, 0x31, 0x32, 0x31, 0x2e, 0x39,
+	0x73, 0x2d, 0x31, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x2e,
+	0x33, 0x63, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x2e, 0x37, 0x2d, 0x38, 0x2e, 0x38, 0x2d,
+	0x2e, 0x39, 0x2d, 0x31, 0x30, 0x2e, 0x39, 0x20, 0x31, 0x20, 0x2e, 0x33, 0x2e, 0x34, 0x20, 0x32,
+	0x2e, 0x31, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x31, 0x2e, 0x38, 0x20, 0x30, 0x20, 0x31,
+	0x2e, 0x33, 0x2d, 0x2e, 0x35, 0x20, 0x32, 0x2d, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x39, 0x2d, 0x31,
+	0x36, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x34, 0x2d, 0x34, 0x2e, 0x33, 0x20, 0x33, 0x2e, 0x39, 0x20,
+	0x36, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x23, 0x66, 0x34, 0x64, 0x61, 0x62, 0x30, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x31,
+	0x32, 0x31, 0x2e, 0x32, 0x20, 0x37, 0x38, 0x2e, 0x35, 0x20, 0x37, 0x2e, 0x32, 0x20, 0x30, 0x63,
+	0x32, 0x2e, 0x32, 0x2d, 0x2e, 0x31, 0x20, 0x35, 0x2e, 0x38, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x37,
+	0x20, 0x33, 0x2e, 0x33, 0x2d, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x35, 0x2d, 0x37, 0x2e, 0x39, 0x2d,
+	0x31, 0x2e, 0x32, 0x2d, 0x39, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x37, 0x6c, 0x2d, 0x34, 0x2e, 0x34,
+	0x2d, 0x31, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x23, 0x63, 0x66, 0x62, 0x38, 0x38, 0x64, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d,
+	0x31, 0x32, 0x31, 0x2e, 0x32, 0x20, 0x37, 0x38, 0x2e, 0x35, 0x20, 0x37, 0x2e, 0x32, 0x20, 0x30,
+	0x63, 0x2d, 0x31, 0x2e, 0x35, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x32, 0x2e, 0x31, 0x2d, 0x32, 0x2e,
+	0x38, 0x20, 0x31, 0x2e, 0x35, 0x6c, 0x2d, 0x34, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x35, 0x7a, 0x22,
+	0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72,
+	0x6c, 0x28, 0x23, 0x71, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x32, 0x35, 0x20, 0x31,
+	0x32, 0x31, 0x2e, 0x35, 0x63, 0x2e, 0x33, 0x2d, 0x2e, 0x31, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x33,
+	0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x38, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x31,
+	0x20, 0x32, 0x2e, 0x32, 0x20, 0x32, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x31, 0x20, 0x33, 0x2e, 0x35,
+	0x20, 0x32, 0x2e, 0x34, 0x20, 0x36, 0x20, 0x32, 0x2e, 0x38, 0x20, 0x39, 0x2e, 0x39, 0x20, 0x33,
+	0x2e, 0x37, 0x20, 0x31, 0x2e, 0x39, 0x2e, 0x35, 0x20, 0x31, 0x33, 0x20, 0x34, 0x20, 0x31, 0x34,
+	0x2e, 0x38, 0x20, 0x34, 0x2e, 0x34, 0x6c, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x30, 0x63, 0x2d, 0x33,
+	0x2e, 0x34, 0x2d, 0x2e, 0x39, 0x2d, 0x34, 0x2e, 0x35, 0x2d, 0x2e, 0x38, 0x2d, 0x38, 0x2e, 0x36,
+	0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x32, 0x2d, 0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x33, 0x2d,
+	0x2e, 0x34, 0x2d, 0x36, 0x2e, 0x39, 0x2d, 0x2e, 0x35, 0x2d, 0x31, 0x31, 0x2e, 0x39, 0x2d, 0x2e,
+	0x31, 0x2d, 0x33, 0x35, 0x20, 0x33, 0x2e, 0x34, 0x2d, 0x34, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x37,
+	0x2d, 0x34, 0x2e, 0x39, 0x20, 0x35, 0x2e, 0x36, 0x2d, 0x33, 0x2e, 0x33, 0x20, 0x31, 0x30, 0x2e,
+	0x35, 0x2e, 0x35, 0x20, 0x31, 0x36, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x38, 0x20, 0x32, 0x20, 0x33,
+	0x20, 0x33, 0x2e, 0x31, 0x20, 0x35, 0x2e, 0x31, 0x20, 0x34, 0x2e, 0x38, 0x20, 0x34, 0x2e, 0x34,
+	0x20, 0x33, 0x2e, 0x35, 0x20, 0x37, 0x20, 0x33, 0x2e, 0x39, 0x20, 0x39, 0x2e, 0x36, 0x20, 0x38,
+	0x2e, 0x39, 0x6c, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x37, 0x63, 0x2e, 0x32, 0x20, 0x32, 0x2e, 0x34,
+	0x2e, 0x37, 0x20, 0x31, 0x34, 0x2e, 0x36, 0x2d, 0x2e, 0x31, 0x20, 0x31, 0x36, 0x2e, 0x36, 0x2d,
+	0x33, 0x2e, 0x31, 0x2d, 0x2e, 0x32, 0x2d, 0x37, 0x2e, 0x34, 0x2d, 0x2e, 0x37, 0x2d, 0x31, 0x31,
+	0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x38, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x35, 0x2d, 0x31,
+	0x34, 0x2e, 0x37, 0x2d, 0x37, 0x2e, 0x35, 0x2d, 0x31, 0x37, 0x2e, 0x31, 0x2d, 0x31, 0x36, 0x2d,
+	0x32, 0x2e, 0x38, 0x2d, 0x31, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x38, 0x2d, 0x32, 0x30, 0x2e,
+	0x39, 0x20, 0x35, 0x2e, 0x36, 0x2d, 0x33, 0x31, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x39, 0x2d, 0x31,
+	0x33, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x34, 0x2d, 0x38, 0x2e, 0x39, 0x20, 0x39, 0x2e, 0x32, 0x2d,
+	0x39, 0x2e, 0x33, 0x2e, 0x32, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x31, 0x20,
+	0x33, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x33, 0x20, 0x35, 0x2d, 0x2e, 0x39, 0x20, 0x35, 0x2e, 0x33,
+	0x2d, 0x2e, 0x35, 0x20, 0x39, 0x2e, 0x31, 0x2d, 0x34, 0x20, 0x2e, 0x37, 0x2d, 0x2e, 0x37, 0x20,
+	0x32, 0x2e, 0x34, 0x2d, 0x32, 0x20, 0x33, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x34, 0x2e, 0x39, 0x2d,
+	0x2e, 0x36, 0x20, 0x31, 0x31, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x37,
+	0x2d, 0x34, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x23, 0x62, 0x37, 0x39, 0x62, 0x37, 0x62, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x39, 0x32, 0x2e, 0x37, 0x20, 0x31, 0x32, 0x33, 0x2e, 0x31, 0x63, 0x2d, 0x2e, 0x32, 0x2e, 0x39,
+	0x2d, 0x2e, 0x35, 0x20, 0x31, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x2e,
+	0x32, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x38, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x35, 0x2e, 0x37, 0x6c,
+	0x2d, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x34, 0x63, 0x2d, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x37, 0x2d,
+	0x2e, 0x36, 0x20, 0x35, 0x2d, 0x2e, 0x38, 0x20, 0x37, 0x2e, 0x31, 0x6c, 0x31, 0x2d, 0x31, 0x2e,
+	0x37, 0x63, 0x31, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x33, 0x20, 0x35, 0x2e, 0x35, 0x2d, 0x32, 0x2e,
+	0x35, 0x20, 0x36, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x32, 0x2e,
+	0x35, 0x2d, 0x31, 0x2e, 0x38, 0x2d, 0x34, 0x2e, 0x37, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x37, 0x2e,
+	0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x23, 0x36, 0x30, 0x33, 0x39, 0x31, 0x65, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x31, 0x34,
+	0x2e, 0x33, 0x20, 0x31, 0x32, 0x33, 0x2e, 0x39, 0x63, 0x31, 0x2e, 0x38, 0x2e, 0x31, 0x20, 0x38,
+	0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x30, 0x2e, 0x37, 0x2d, 0x32, 0x2e, 0x34, 0x2e,
+	0x33, 0x2d, 0x2e, 0x31, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x33, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x38,
+	0x2e, 0x37, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x32, 0x20, 0x32,
+	0x2e, 0x34, 0x20, 0x33, 0x2e, 0x31, 0x2d, 0x35, 0x2e, 0x33, 0x2d, 0x2e, 0x33, 0x2d, 0x37, 0x2e,
+	0x33, 0x2e, 0x33, 0x2d, 0x31, 0x32, 0x2e, 0x35, 0x20, 0x32, 0x2d, 0x2e, 0x38, 0x2e, 0x33, 0x2d,
+	0x33, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x34, 0x2d, 0x34, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x33, 0x20,
+	0x31, 0x2e, 0x31, 0x2d, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x33, 0x20, 0x32,
+	0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x72, 0x29, 0x22, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x31, 0x35, 0x33, 0x2e, 0x38, 0x20, 0x31, 0x32, 0x30, 0x2e, 0x38, 0x63, 0x31, 0x2e,
+	0x34, 0x20, 0x31, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x32, 0x2e,
+	0x35, 0x20, 0x34, 0x2e, 0x38, 0x20, 0x35, 0x20, 0x37, 0x20, 0x38, 0x2e, 0x31, 0x20, 0x31, 0x32,
+	0x2e, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x37, 0x20, 0x31, 0x39, 0x2e, 0x32, 0x2e, 0x39, 0x20, 0x32,
+	0x2e, 0x37, 0x20, 0x32, 0x2e, 0x36, 0x20, 0x37, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x38, 0x20, 0x31,
+	0x30, 0x2d, 0x2e, 0x31, 0x20, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x31, 0x20, 0x37, 0x2e, 0x39,
+	0x2d, 0x31, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x61, 0x33, 0x32, 0x20, 0x33, 0x32, 0x20, 0x30, 0x20,
+	0x30, 0x20, 0x31, 0x20, 0x2d, 0x31, 0x2e, 0x36, 0x20, 0x34, 0x63, 0x2d, 0x2e, 0x39, 0x20, 0x31,
+	0x2e, 0x39, 0x2d, 0x33, 0x20, 0x34, 0x2e, 0x37, 0x2d, 0x35, 0x2e, 0x31, 0x20, 0x36, 0x2e, 0x36,
+	0x2d, 0x32, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x38, 0x2d, 0x34, 0x2e, 0x34, 0x20, 0x34, 0x2e, 0x31,
+	0x2d, 0x37, 0x2e, 0x37, 0x20, 0x36, 0x2e, 0x33, 0x6c, 0x2d, 0x34, 0x2e, 0x39, 0x20, 0x32, 0x2e,
+	0x38, 0x63, 0x2e, 0x34, 0x2d, 0x2e, 0x35, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x30, 0x2d,
+	0x32, 0x2e, 0x38, 0x2d, 0x33, 0x2d, 0x34, 0x2e, 0x36, 0x2d, 0x33, 0x2e, 0x32, 0x2d, 0x31, 0x31,
+	0x2d, 0x35, 0x2d, 0x31, 0x35, 0x2e, 0x37, 0x6c, 0x2d, 0x2e, 0x32, 0x2d, 0x2e, 0x31, 0x63, 0x2d,
+	0x33, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x31, 0x20, 0x33, 0x2e, 0x39, 0x2d, 0x33, 0x30, 0x2e, 0x38,
+	0x20, 0x36, 0x2d, 0x33, 0x35, 0x2e, 0x31, 0x6c, 0x31, 0x2e, 0x31, 0x20, 0x30, 0x63, 0x2d, 0x31,
+	0x2e, 0x38, 0x2d, 0x2e, 0x34, 0x2d, 0x31, 0x34, 0x2e, 0x37, 0x2d, 0x34, 0x2d, 0x31, 0x35, 0x2e,
+	0x33, 0x2d, 0x34, 0x2e, 0x35, 0x20, 0x34, 0x2e, 0x32, 0x2e, 0x33, 0x20, 0x38, 0x2e, 0x35, 0x20,
+	0x31, 0x2e, 0x33, 0x20, 0x31, 0x30, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x32,
+	0x2e, 0x35, 0x20, 0x32, 0x2e, 0x31, 0x2d, 0x2e, 0x37, 0x20, 0x33, 0x2e, 0x31, 0x2d, 0x31, 0x2e,
+	0x33, 0x20, 0x31, 0x2e, 0x34, 0x2d, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x31,
+	0x20, 0x33, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x34, 0x37, 0x34, 0x36, 0x34, 0x37, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x31, 0x35, 0x32, 0x2e, 0x37, 0x20, 0x31, 0x33, 0x31, 0x63, 0x36, 0x2e,
+	0x35, 0x20, 0x36, 0x2e, 0x33, 0x20, 0x35, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x33, 0x20, 0x31,
+	0x2e, 0x34, 0x20, 0x31, 0x38, 0x2d, 0x33, 0x2e, 0x34, 0x20, 0x36, 0x2e, 0x35, 0x2d, 0x39, 0x2e,
+	0x33, 0x20, 0x39, 0x2d, 0x38, 0x2e, 0x33, 0x20, 0x31, 0x37, 0x2e, 0x31, 0x6c, 0x2d, 0x2e, 0x32,
+	0x2d, 0x2e, 0x31, 0x63, 0x2d, 0x33, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x31, 0x20, 0x33, 0x2e, 0x39,
+	0x2d, 0x33, 0x30, 0x2e, 0x38, 0x20, 0x36, 0x2d, 0x33, 0x35, 0x2e, 0x31, 0x7a, 0x22, 0x2f, 0x3e,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x63, 0x62, 0x32,
+	0x35, 0x33, 0x30, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x31, 0x35, 0x35, 0x2e, 0x37, 0x20, 0x31,
+	0x38, 0x31, 0x2e, 0x37, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x31, 0x63, 0x2d, 0x31, 0x2e, 0x35, 0x2e,
+	0x36, 0x2d, 0x33, 0x2e, 0x32, 0x20, 0x31, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x35, 0x20, 0x32, 0x2e,
+	0x31, 0x6c, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x2e, 0x34, 0x2e, 0x31, 0x2d, 0x2e, 0x32, 0x7a, 0x22,
+	0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72,
+	0x6c, 0x28, 0x23, 0x73, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x39, 0x33, 0x2e, 0x31, 0x20,
+	0x31, 0x34, 0x31, 0x2e, 0x38, 0x63, 0x2d, 0x34, 0x2e, 0x39, 0x20, 0x35, 0x2e, 0x36, 0x2d, 0x33,
+	0x2e, 0x33, 0x20, 0x31, 0x30, 0x2e, 0x35, 0x2e, 0x35, 0x20, 0x31, 0x36, 0x2e, 0x31, 0x20, 0x31,
+	0x2e, 0x38, 0x20, 0x32, 0x20, 0x33, 0x20, 0x33, 0x2e, 0x31, 0x20, 0x35, 0x2e, 0x31, 0x20, 0x34,
+	0x2e, 0x38, 0x20, 0x34, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x37, 0x20, 0x34, 0x20, 0x39,
+	0x2e, 0x36, 0x20, 0x39, 0x6c, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x36, 0x2e, 0x33, 0x2d, 0x2e, 0x32,
+	0x71, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x33, 0x63, 0x2d,
+	0x32, 0x2d, 0x36, 0x2e, 0x34, 0x2d, 0x31, 0x31, 0x2e, 0x33, 0x2d, 0x32, 0x34, 0x2d, 0x31, 0x35,
+	0x2e, 0x35, 0x2d, 0x32, 0x39, 0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x64, 0x35, 0x38, 0x63, 0x34, 0x62, 0x22, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x31, 0x33, 0x39, 0x2e, 0x31, 0x20, 0x31, 0x38, 0x38, 0x2e, 0x32, 0x63, 0x2d, 0x2e,
+	0x31, 0x2e, 0x37, 0x2d, 0x2e, 0x32, 0x20, 0x32, 0x2d, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x36, 0x6c,
+	0x2d, 0x31, 0x20, 0x2e, 0x37, 0x63, 0x2d, 0x31, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x37, 0x2d, 0x38,
+	0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x30, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x37, 0x22,
+	0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66,
+	0x64, 0x66, 0x64, 0x66, 0x64, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x32, 0x39, 0x2e, 0x37,
+	0x20, 0x31, 0x33, 0x32, 0x2e, 0x34, 0x63, 0x33, 0x2e, 0x31, 0x2d, 0x2e, 0x33, 0x20, 0x31, 0x34,
+	0x2e, 0x34, 0x2d, 0x2e, 0x38, 0x20, 0x31, 0x36, 0x20, 0x31, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x31,
+	0x20, 0x33, 0x2e, 0x38, 0x2d, 0x31, 0x33, 0x2e, 0x33, 0x20, 0x33, 0x2d, 0x31, 0x36, 0x2e, 0x35,
+	0x20, 0x32, 0x2e, 0x39, 0x2d, 0x35, 0x2e, 0x31, 0x20, 0x30, 0x2d, 0x31, 0x31, 0x2d, 0x2e, 0x32,
+	0x2d, 0x31, 0x36, 0x2e, 0x31, 0x2d, 0x31, 0x20, 0x36, 0x2e, 0x37, 0x2d, 0x32, 0x2e, 0x38, 0x20,
+	0x39, 0x2e, 0x33, 0x2d, 0x33, 0x2e, 0x32, 0x20, 0x31, 0x36, 0x2e, 0x37, 0x2d, 0x33, 0x2e, 0x38,
+	0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75,
+	0x72, 0x6c, 0x28, 0x23, 0x74, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x37, 0x31, 0x2e, 0x35,
+	0x20, 0x31, 0x37, 0x30, 0x2e, 0x36, 0x20, 0x37, 0x2e, 0x32, 0x2e, 0x32, 0x63, 0x2e, 0x36, 0x2e,
+	0x34, 0x20, 0x31, 0x2e, 0x39, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x39, 0x2e, 0x37, 0x20, 0x32, 0x2e,
+	0x36, 0x20, 0x38, 0x2e, 0x33, 0x20, 0x39, 0x2e, 0x35, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x20, 0x31,
+	0x36, 0x2e, 0x37, 0x20, 0x31, 0x36, 0x2e, 0x31, 0x6c, 0x30, 0x20, 0x2e, 0x35, 0x63, 0x2d, 0x2e,
+	0x36, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x35, 0x2e, 0x31, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x2d, 0x36,
+	0x2e, 0x39, 0x20, 0x31, 0x32, 0x2e, 0x33, 0x2d, 0x2e, 0x33, 0x2e, 0x31, 0x2d, 0x31, 0x37, 0x2e,
+	0x34, 0x20, 0x35, 0x2e, 0x32, 0x2d, 0x31, 0x39, 0x2e, 0x36, 0x20, 0x35, 0x2e, 0x37, 0x2d, 0x31,
+	0x2e, 0x34, 0x2e, 0x34, 0x2d, 0x38, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x35, 0x2d, 0x39, 0x2e, 0x32,
+	0x20, 0x32, 0x2e, 0x35, 0x2d, 0x32, 0x2e, 0x34, 0x2e, 0x35, 0x2d, 0x35, 0x2e, 0x36, 0x2e, 0x36,
+	0x2d, 0x38, 0x2e, 0x31, 0x2e, 0x35, 0x6c, 0x2d, 0x33, 0x2e, 0x35, 0x2d, 0x2e, 0x33, 0x71, 0x2d,
+	0x31, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x35, 0x2d, 0x34, 0x2e, 0x31, 0x63,
+	0x2d, 0x32, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x31, 0x33, 0x2e,
+	0x32, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x37, 0x2e, 0x34, 0x2d, 0x2e, 0x36, 0x2d, 0x34, 0x2e,
+	0x35, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x39, 0x2e, 0x32, 0x2d, 0x2e, 0x36, 0x2d, 0x31, 0x34, 0x2e,
+	0x32, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x37, 0x20,
+	0x32, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x2d, 0x2e, 0x33, 0x20,
+	0x31, 0x39, 0x2e, 0x34, 0x2d, 0x2e, 0x37, 0x20, 0x32, 0x33, 0x2d, 0x2e, 0x37, 0x22, 0x2f, 0x3e,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28,
+	0x23, 0x75, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x36, 0x37, 0x2e, 0x38, 0x20, 0x31, 0x37,
+	0x31, 0x2e, 0x34, 0x2d, 0x34, 0x2e, 0x37, 0x20, 0x34, 0x2e, 0x39, 0x63, 0x2d, 0x31, 0x2e, 0x35,
+	0x20, 0x31, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x39, 0x2d, 0x33, 0x2e, 0x38,
+	0x20, 0x32, 0x2e, 0x38, 0x2d, 0x2e, 0x32, 0x2e, 0x36, 0x2d, 0x2e, 0x32, 0x2e, 0x33, 0x20, 0x30,
+	0x20, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x35, 0x2d, 0x2e, 0x36, 0x20, 0x34,
+	0x2e, 0x32, 0x2d, 0x2e, 0x32, 0x20, 0x35, 0x2e, 0x35, 0x2e, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x2e,
+	0x32, 0x2e, 0x32, 0x20, 0x32, 0x20, 0x2e, 0x34, 0x2e, 0x39, 0x2e, 0x38, 0x20, 0x31, 0x20, 0x31,
+	0x2e, 0x32, 0x20, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x39, 0x6c, 0x30, 0x20, 0x2e, 0x36, 0x2d,
+	0x31, 0x2e, 0x31, 0x2e, 0x37, 0x63, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x37,
+	0x2e, 0x39, 0x20, 0x32, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x36, 0x61, 0x34, 0x31, 0x20, 0x34, 0x31,
+	0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x32, 0x6c, 0x31, 0x20, 0x31,
+	0x2e, 0x35, 0x63, 0x31, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x37,
+	0x2e, 0x33, 0x20, 0x34, 0x2e, 0x32, 0x20, 0x31, 0x30, 0x2e, 0x31, 0x6c, 0x2e, 0x38, 0x2e, 0x34,
+	0x63, 0x2d, 0x31, 0x2e, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x30, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x34,
+	0x2d, 0x31, 0x32, 0x2e, 0x35, 0x20, 0x34, 0x20, 0x2e, 0x39, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x35,
+	0x2e, 0x38, 0x2d, 0x36, 0x20, 0x2e, 0x38, 0x6c, 0x2d, 0x32, 0x2e, 0x37, 0x2d, 0x2e, 0x34, 0x63,
+	0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x35, 0x2d, 0x32, 0x2e, 0x35,
+	0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x33,
+	0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x33, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x31, 0x37,
+	0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x39, 0x20, 0x31, 0x33, 0x2e, 0x33, 0x20,
+	0x39, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x33, 0x2d, 0x39, 0x2e, 0x38, 0x2e, 0x32, 0x2d, 0x31, 0x2e,
+	0x34, 0x2e, 0x31, 0x2d, 0x33, 0x20, 0x2e, 0x39, 0x2d, 0x34, 0x2e, 0x31, 0x2e, 0x36, 0x2d, 0x31,
+	0x2e, 0x31, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x39,
+	0x20, 0x31, 0x30, 0x2e, 0x36, 0x20, 0x30, 0x20, 0x32, 0x33, 0x2e, 0x31, 0x2d, 0x2e, 0x31, 0x20,
+	0x31, 0x39, 0x2e, 0x37, 0x2e, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x38, 0x34, 0x38, 0x33, 0x38, 0x34, 0x22, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x37, 0x38, 0x2e, 0x38, 0x20, 0x31, 0x37, 0x30, 0x2e, 0x38, 0x63, 0x2e, 0x36, 0x2e,
+	0x34, 0x2e, 0x38, 0x2e, 0x32, 0x20, 0x31, 0x2e, 0x37, 0x2e, 0x32, 0x6c, 0x2e, 0x32, 0x2e, 0x35,
+	0x63, 0x2d, 0x32, 0x2e, 0x33, 0x2d, 0x2e, 0x36, 0x2d, 0x31, 0x30, 0x2d, 0x2e, 0x32, 0x2d, 0x31,
+	0x32, 0x2e, 0x39, 0x20, 0x30, 0x6c, 0x2d, 0x34, 0x2e, 0x37, 0x20, 0x34, 0x2e, 0x39, 0x63, 0x2d,
+	0x2e, 0x39, 0x20, 0x31, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x33,
+	0x2e, 0x38, 0x20, 0x33, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x35, 0x2d, 0x2e,
+	0x36, 0x20, 0x34, 0x2e, 0x32, 0x2d, 0x2e, 0x32, 0x20, 0x35, 0x2e, 0x35, 0x2e, 0x39, 0x2e, 0x34,
+	0x20, 0x31, 0x2e, 0x32, 0x2e, 0x32, 0x20, 0x32, 0x20, 0x2e, 0x34, 0x6c, 0x2d, 0x35, 0x2e, 0x33,
+	0x2e, 0x34, 0x63, 0x2d, 0x2e, 0x37, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x31, 0x2e, 0x34, 0x2d, 0x32,
+	0x2e, 0x36, 0x2e, 0x34, 0x2d, 0x33, 0x20, 0x31, 0x2e, 0x34, 0x2d, 0x35, 0x2e, 0x37, 0x20, 0x32,
+	0x2e, 0x34, 0x2d, 0x36, 0x2e, 0x32, 0x20, 0x36, 0x6c, 0x2d, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x37,
+	0x63, 0x2d, 0x2e, 0x33, 0x2e, 0x38, 0x2d, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x37, 0x2d, 0x2e, 0x39,
+	0x20, 0x32, 0x2e, 0x37, 0x73, 0x2e, 0x37, 0x2d, 0x35, 0x2e, 0x33, 0x2e, 0x33, 0x2d, 0x39, 0x2e,
+	0x37, 0x63, 0x2d, 0x2e, 0x35, 0x2d, 0x33, 0x2e, 0x38, 0x2d, 0x32, 0x2e, 0x35, 0x2d, 0x36, 0x2e,
+	0x31, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x31, 0x30, 0x61, 0x32, 0x32, 0x2e, 0x37, 0x20, 0x32, 0x32,
+	0x2e, 0x37, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x31, 0x20, 0x2d, 0x34, 0x2e, 0x34, 0x63,
+	0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x39, 0x20, 0x32,
+	0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x39, 0x20, 0x31, 0x30, 0x2e, 0x32, 0x20, 0x30, 0x20, 0x33, 0x30,
+	0x2e, 0x34, 0x2d, 0x2e, 0x33, 0x20, 0x33, 0x30, 0x2e, 0x34, 0x2d, 0x2e, 0x33, 0x22, 0x2f, 0x3e,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x32, 0x39, 0x32,
+	0x37, 0x32, 0x38, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x34, 0x36, 0x2e, 0x34, 0x20, 0x31, 0x38,
+	0x37, 0x2e, 0x38, 0x63, 0x30, 0x20, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x38, 0x2e,
+	0x36, 0x2e, 0x37, 0x20, 0x34, 0x2e, 0x38, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x35, 0x20, 0x33, 0x2e,
+	0x32, 0x2d, 0x34, 0x2e, 0x36, 0x20, 0x36, 0x2e, 0x32, 0x2d, 0x36, 0x2d, 0x2e, 0x37, 0x2d, 0x31,
+	0x2d, 0x35, 0x2e, 0x35, 0x2d, 0x33, 0x2e, 0x33, 0x2d, 0x36, 0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x38,
+	0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23,
+	0x39, 0x66, 0x39, 0x65, 0x39, 0x65, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x35, 0x39, 0x2e, 0x32,
+	0x20, 0x31, 0x38, 0x30, 0x63, 0x32, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x35, 0x2d, 0x2e, 0x36, 0x20,
+	0x34, 0x2e, 0x32, 0x2d, 0x2e, 0x32, 0x20, 0x35, 0x2e, 0x35, 0x2e, 0x39, 0x2e, 0x34, 0x20, 0x31,
+	0x2e, 0x32, 0x2e, 0x32, 0x20, 0x32, 0x20, 0x2e, 0x34, 0x6c, 0x2d, 0x34, 0x2e, 0x35, 0x2e, 0x37,
+	0x63, 0x2d, 0x2e, 0x37, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x39, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x34,
+	0x2e, 0x32, 0x2d, 0x2e, 0x37, 0x2d, 0x31, 0x2d, 0x35, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x31, 0x2d,
+	0x36, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x36, 0x71, 0x2e, 0x33, 0x2d, 0x31, 0x20, 0x31, 0x2e, 0x32,
+	0x2d, 0x31, 0x2e, 0x31, 0x63, 0x33, 0x2e, 0x37, 0x2d, 0x2e, 0x35, 0x20, 0x38, 0x2e, 0x31, 0x2e,
+	0x35, 0x20, 0x31, 0x31, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x39, 0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x76,
+	0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x36, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x38, 0x35, 0x2e,
+	0x38, 0x63, 0x32, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x38, 0x20, 0x32, 0x20, 0x33, 0x2e,
+	0x34, 0x20, 0x34, 0x2e, 0x37, 0x61, 0x32, 0x32, 0x20, 0x32, 0x32, 0x20, 0x30, 0x20, 0x30, 0x20,
+	0x31, 0x20, 0x32, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x35, 0x63, 0x2d, 0x2e, 0x33, 0x2e, 0x37, 0x2d,
+	0x2e, 0x34, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x34, 0x2d, 0x31,
+	0x2e, 0x37, 0x2e, 0x37, 0x2d, 0x31, 0x36, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x37, 0x2d, 0x31, 0x37,
+	0x2e, 0x37, 0x20, 0x31, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x34, 0x2d,
+	0x31, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x31, 0x6c, 0x2e, 0x33, 0x2d, 0x31,
+	0x2e, 0x37, 0x63, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x32, 0x2d, 0x34, 0x2e,
+	0x36, 0x20, 0x36, 0x2e, 0x32, 0x2d, 0x36, 0x71, 0x33, 0x2e, 0x39, 0x2d, 0x2e, 0x37, 0x20, 0x37,
+	0x2e, 0x39, 0x2d, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x38, 0x34, 0x38, 0x33, 0x38, 0x34, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x6d, 0x36, 0x36, 0x20, 0x31, 0x39, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x63,
+	0x2d, 0x2e, 0x33, 0x2e, 0x37, 0x2d, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x31,
+	0x20, 0x31, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x37, 0x2e, 0x37, 0x2d, 0x31, 0x36, 0x2e, 0x34, 0x20,
+	0x31, 0x2e, 0x37, 0x2d, 0x31, 0x37, 0x2e, 0x37, 0x20, 0x31, 0x71, 0x2d, 0x31, 0x2d, 0x2e, 0x36,
+	0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x38, 0x6c, 0x2d, 0x2e, 0x31, 0x2d, 0x2e, 0x34, 0x2e,
+	0x33, 0x2d, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x20, 0x32, 0x2e, 0x38, 0x63, 0x32, 0x2e, 0x39, 0x2e,
+	0x31, 0x20, 0x31, 0x36, 0x2e, 0x31, 0x2d, 0x2e, 0x31, 0x20, 0x31, 0x37, 0x2e, 0x38, 0x2d, 0x31,
+	0x2e, 0x32, 0x2e, 0x33, 0x2d, 0x2e, 0x36, 0x2e, 0x33, 0x2d, 0x31, 0x20, 0x2e, 0x33, 0x2d, 0x31,
+	0x2e, 0x37, 0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x23, 0x61, 0x61, 0x36, 0x31, 0x32, 0x35, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x35,
+	0x39, 0x2e, 0x32, 0x20, 0x31, 0x38, 0x30, 0x63, 0x2d, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x32, 0x20,
+	0x32, 0x2e, 0x37, 0x2d, 0x32, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x36, 0x2d,
+	0x32, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x39, 0x2d, 0x2e, 0x33, 0x20, 0x34, 0x2d, 0x31, 0x2e, 0x32,
+	0x20, 0x38, 0x2e, 0x36, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x39, 0x20, 0x34,
+	0x2e, 0x32, 0x20, 0x32, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x2e,
+	0x36, 0x2d, 0x32, 0x2e, 0x37, 0x2d, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x35,
+	0x2e, 0x38, 0x2d, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x20, 0x31, 0x2e, 0x33, 0x2d,
+	0x31, 0x2e, 0x38, 0x2d, 0x2e, 0x37, 0x2d, 0x2e, 0x37, 0x2d, 0x2e, 0x35, 0x2d, 0x2e, 0x37, 0x2d,
+	0x31, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x2e, 0x38, 0x2d, 0x2e, 0x32, 0x2d, 0x31, 0x2e,
+	0x31, 0x2e, 0x31, 0x2d, 0x32, 0x2d, 0x2e, 0x34, 0x2d, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x33, 0x20,
+	0x32, 0x2e, 0x37, 0x2d, 0x33, 0x20, 0x2e, 0x32, 0x2d, 0x35, 0x2e, 0x35, 0x7a, 0x22, 0x2f, 0x3e,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28,
+	0x23, 0x77, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x37, 0x32, 0x2e, 0x38, 0x20, 0x37, 0x33,
+	0x2e, 0x31, 0x63, 0x2d, 0x37, 0x2e, 0x33, 0x2d, 0x37, 0x2e, 0x38, 0x2d, 0x31, 0x38, 0x2e, 0x35,
+	0x2d, 0x32, 0x38, 0x2e, 0x34, 0x2d, 0x31, 0x39, 0x2e, 0x35, 0x2d, 0x33, 0x31, 0x2e, 0x33, 0x2d,
+	0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x35, 0x2d, 0x33, 0x2e, 0x38, 0x2d, 0x38, 0x2e, 0x39, 0x2d, 0x32,
+	0x2e, 0x35, 0x2d, 0x31, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x33, 0x20,
+	0x35, 0x2e, 0x36, 0x2e, 0x35, 0x20, 0x37, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x33, 0x20, 0x37, 0x2e,
+	0x37, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x34, 0x2e, 0x39, 0x20, 0x38, 0x2e, 0x34, 0x20, 0x32,
+	0x31, 0x2e, 0x35, 0x20, 0x31, 0x33, 0x2e, 0x37, 0x71, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x39, 0x2e,
+	0x32, 0x20, 0x32, 0x32, 0x2e, 0x38, 0x20, 0x32, 0x30, 0x2e, 0x39, 0x6c, 0x32, 0x20, 0x34, 0x2e,
+	0x31, 0x63, 0x2e, 0x31, 0x20, 0x33, 0x2e, 0x37, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x35,
+	0x20, 0x31, 0x2e, 0x39, 0x20, 0x35, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x32,
+	0x2d, 0x35, 0x2e, 0x37, 0x20, 0x33, 0x2e, 0x38, 0x2d, 0x38, 0x2e, 0x31, 0x20, 0x35, 0x2e, 0x34,
+	0x2d, 0x32, 0x2e, 0x37, 0x20, 0x32, 0x2e, 0x37, 0x2d, 0x33, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x35,
+	0x2d, 0x35, 0x2e, 0x38, 0x20, 0x36, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x32,
+	0x2d, 0x35, 0x2e, 0x31, 0x20, 0x38, 0x2e, 0x31, 0x2d, 0x35, 0x2e, 0x37, 0x20, 0x31, 0x30, 0x2d,
+	0x2e, 0x32, 0x20, 0x32, 0x2d, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x36, 0x2d, 0x2e, 0x37, 0x20, 0x32,
+	0x2e, 0x33, 0x2e, 0x32, 0x2d, 0x39, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x35, 0x2d, 0x31, 0x33, 0x2e,
+	0x39, 0x2d, 0x35, 0x2e, 0x31, 0x2d, 0x31, 0x38, 0x2e, 0x33, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x32,
+	0x2e, 0x38, 0x2d, 0x35, 0x2e, 0x37, 0x2d, 0x35, 0x2d, 0x38, 0x2e, 0x31, 0x2d, 0x38, 0x2e, 0x32,
+	0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23,
+	0x61, 0x39, 0x36, 0x38, 0x33, 0x32, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x37, 0x39, 0x2e, 0x35,
+	0x20, 0x34, 0x35, 0x2e, 0x32, 0x71, 0x33, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x36, 0x20, 0x37, 0x2e,
+	0x34, 0x20, 0x36, 0x2e, 0x38, 0x6c, 0x34, 0x2e, 0x35, 0x20, 0x34, 0x2e, 0x33, 0x63, 0x33, 0x20,
+	0x33, 0x20, 0x36, 0x20, 0x35, 0x2e, 0x37, 0x20, 0x38, 0x2e, 0x37, 0x20, 0x39, 0x2e, 0x31, 0x6c,
+	0x33, 0x2e, 0x35, 0x20, 0x34, 0x2e, 0x36, 0x63, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x32,
+	0x20, 0x33, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x34, 0x20, 0x34, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x38,
+	0x2d, 0x34, 0x2e, 0x31, 0x2d, 0x35, 0x2d, 0x38, 0x2e, 0x35, 0x2d, 0x37, 0x2d, 0x31, 0x30, 0x2e,
+	0x37, 0x2d, 0x32, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x35, 0x2d, 0x35, 0x2d, 0x35, 0x2e, 0x36, 0x2d,
+	0x37, 0x2e, 0x31, 0x2d, 0x37, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x39, 0x2d,
+	0x38, 0x2e, 0x39, 0x2d, 0x37, 0x2e, 0x32, 0x2d, 0x31, 0x33, 0x2e, 0x35, 0x2d, 0x31, 0x30, 0x2e,
+	0x37, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x23, 0x61, 0x61, 0x36, 0x31, 0x32, 0x35, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x39, 0x39, 0x2e,
+	0x34, 0x20, 0x37, 0x33, 0x63, 0x2d, 0x2e, 0x36, 0x2e, 0x36, 0x2d, 0x32, 0x2e, 0x34, 0x20, 0x31,
+	0x2e, 0x33, 0x2d, 0x33, 0x2e, 0x32, 0x20, 0x31, 0x2d, 0x33, 0x2e, 0x33, 0x2d, 0x2e, 0x38, 0x2d,
+	0x33, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x34, 0x2d, 0x35, 0x2e, 0x31, 0x2d, 0x37, 0x2e, 0x35, 0x2d,
+	0x32, 0x2e, 0x39, 0x2d, 0x34, 0x2e, 0x39, 0x2d, 0x34, 0x2e, 0x32, 0x2d, 0x38, 0x2e, 0x32, 0x2d,
+	0x37, 0x2e, 0x35, 0x2d, 0x31, 0x32, 0x2e, 0x34, 0x6c, 0x2e, 0x31, 0x2d, 0x2e, 0x33, 0x63, 0x31,
+	0x2e, 0x34, 0x20, 0x30, 0x20, 0x34, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x38, 0x20, 0x35, 0x2e, 0x35,
+	0x20, 0x33, 0x2e, 0x39, 0x20, 0x33, 0x2e, 0x39, 0x20, 0x33, 0x2e, 0x31, 0x20, 0x39, 0x2e, 0x35,
+	0x20, 0x37, 0x2e, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x38, 0x2e, 0x33,
+	0x2e, 0x39, 0x2d, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x2e,
+	0x35, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x23, 0x66, 0x34, 0x64, 0x61, 0x62, 0x30, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x39, 0x39, 0x2e,
+	0x34, 0x20, 0x37, 0x33, 0x63, 0x2d, 0x2e, 0x37, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x32, 0x2e, 0x32,
+	0x2d, 0x31, 0x2e, 0x38, 0x2d, 0x2e, 0x31, 0x4c, 0x39, 0x34, 0x2e, 0x32, 0x20, 0x36, 0x36, 0x2e,
+	0x37, 0x63, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x32, 0x2d, 0x35,
+	0x2e, 0x38, 0x2d, 0x35, 0x2e, 0x35, 0x2d, 0x38, 0x2e, 0x31, 0x2d, 0x2e, 0x31, 0x2d, 0x2e, 0x32,
+	0x2e, 0x32, 0x2d, 0x2e, 0x35, 0x2e, 0x34, 0x2d, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x39, 0x20, 0x33,
+	0x2e, 0x31, 0x20, 0x39, 0x2e, 0x35, 0x20, 0x37, 0x2e, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x20,
+	0x31, 0x32, 0x2e, 0x38, 0x2e, 0x33, 0x2e, 0x39, 0x2d, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x39, 0x2d,
+	0x31, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x35, 0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x38, 0x34, 0x38, 0x33, 0x38, 0x34, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x31, 0x38, 0x35, 0x2e, 0x34, 0x20, 0x31, 0x36, 0x37, 0x2e, 0x36, 0x63,
+	0x32, 0x33, 0x2d, 0x2e, 0x32, 0x20, 0x32, 0x31, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x37, 0x20, 0x32,
+	0x32, 0x2e, 0x36, 0x20, 0x35, 0x2e, 0x35, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x37, 0x2e, 0x39, 0x20,
+	0x32, 0x2e, 0x36, 0x2d, 0x2e, 0x38, 0x20, 0x36, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x38, 0x20, 0x32,
+	0x2d, 0x37, 0x2e, 0x31, 0x20, 0x33, 0x2e, 0x38, 0x2d, 0x37, 0x2e, 0x34, 0x20, 0x34, 0x2e, 0x36,
+	0x2d, 0x32, 0x2e, 0x32, 0x2d, 0x2e, 0x37, 0x2d, 0x35, 0x2e, 0x33, 0x2d, 0x2e, 0x33, 0x2d, 0x37,
+	0x2e, 0x37, 0x2d, 0x2e, 0x38, 0x6c, 0x2d, 0x31, 0x20, 0x2e, 0x35, 0x61, 0x36, 0x2e, 0x33, 0x20,
+	0x36, 0x2e, 0x33, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x2d, 0x33,
+	0x6c, 0x2e, 0x36, 0x2d, 0x32, 0x63, 0x30, 0x2d, 0x34, 0x2e, 0x39, 0x2d, 0x35, 0x2e, 0x33, 0x2d,
+	0x37, 0x2e, 0x32, 0x2d, 0x39, 0x2e, 0x31, 0x2d, 0x39, 0x2e, 0x35, 0x2d, 0x36, 0x2e, 0x35, 0x2d,
+	0x31, 0x2e, 0x35, 0x2d, 0x36, 0x2e, 0x37, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x36, 0x2d,
+	0x31, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x23, 0x39, 0x66, 0x39, 0x65, 0x39, 0x65, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x31,
+	0x39, 0x34, 0x2e, 0x37, 0x20, 0x31, 0x37, 0x37, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x34, 0x2e, 0x38,
+	0x63, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x38, 0x2e, 0x38, 0x2e, 0x33, 0x20, 0x31,
+	0x30, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x31, 0x2d,
+	0x36, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x33, 0x2d, 0x36, 0x2e, 0x37, 0x20, 0x33, 0x2e, 0x39, 0x2d,
+	0x32, 0x2e, 0x35, 0x2d, 0x2e, 0x35, 0x2d, 0x34, 0x2e, 0x31, 0x2d, 0x2e, 0x33, 0x2d, 0x36, 0x2e,
+	0x35, 0x2d, 0x2e, 0x38, 0x2d, 0x2e, 0x32, 0x2d, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x35,
+	0x2e, 0x34, 0x20, 0x31, 0x2e, 0x33, 0x2d, 0x35, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x64, 0x61, 0x39, 0x30, 0x34, 0x65,
+	0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x33, 0x39, 0x2e, 0x33, 0x20, 0x32, 0x30, 0x37, 0x2e,
+	0x37, 0x63, 0x2d, 0x32, 0x2e, 0x33, 0x2d, 0x2e, 0x32, 0x2d, 0x34, 0x2e, 0x34, 0x20, 0x31, 0x2e,
+	0x32, 0x2d, 0x35, 0x2e, 0x36, 0x20, 0x33, 0x71, 0x2d, 0x31, 0x20, 0x31, 0x2e, 0x32, 0x2d, 0x31,
+	0x2e, 0x31, 0x20, 0x32, 0x2e, 0x38, 0x63, 0x2d, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x36, 0x2e, 0x38,
+	0x20, 0x35, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x37, 0x20, 0x37, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x31,
+	0x2e, 0x34, 0x20, 0x34, 0x20, 0x32, 0x2e, 0x32, 0x20, 0x36, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x36,
+	0x71, 0x32, 0x2e, 0x32, 0x2d, 0x2e, 0x37, 0x20, 0x33, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x33, 0x63,
+	0x2e, 0x36, 0x2d, 0x2e, 0x37, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x36, 0x2e, 0x38, 0x2d, 0x32, 0x2e,
+	0x34, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x38, 0x2e, 0x36, 0x2d, 0x33, 0x2e, 0x38, 0x2d, 0x2e, 0x33,
+	0x2d, 0x35, 0x2e, 0x35, 0x71, 0x2d, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x32, 0x2d, 0x33,
+	0x2d, 0x32, 0x2e, 0x32, 0x2d, 0x31, 0x2d, 0x34, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x32, 0x22, 0x2f,
+	0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x30, 0x35, 0x20, 0x31,
+	0x31, 0x36, 0x2e, 0x32, 0x61, 0x34, 0x2e, 0x33, 0x20, 0x34, 0x2e, 0x33, 0x20, 0x30, 0x20, 0x31,
+	0x20, 0x31, 0x20, 0x32, 0x2e, 0x39, 0x20, 0x38, 0x2e, 0x31, 0x20, 0x34, 0x2e, 0x33, 0x20, 0x34,
+	0x2e, 0x33, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x2d, 0x32, 0x2e, 0x39, 0x20, 0x2d, 0x38,
+	0x2e, 0x31, 0x6d, 0x32, 0x36, 0x2e, 0x33, 0x2d, 0x33, 0x2e, 0x39, 0x61, 0x34, 0x2e, 0x33, 0x20,
+	0x34, 0x2e, 0x33, 0x20, 0x30, 0x20, 0x31, 0x20, 0x31, 0x20, 0x32, 0x2e, 0x39, 0x20, 0x38, 0x2e,
+	0x31, 0x20, 0x34, 0x2e, 0x33, 0x20, 0x34, 0x2e, 0x33, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20,
+	0x2d, 0x32, 0x2e, 0x39, 0x20, 0x2d, 0x38, 0x2e, 0x31, 0x22, 0x20, 0x64, 0x69, 0x73, 0x70, 0x6c,
+	0x61, 0x79, 0x3d, 0x22, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x61, 0x39, 0x36, 0x38, 0x33, 0x32, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x35, 0x32, 0x2e, 0x32, 0x20, 0x38, 0x2e, 0x39, 0x63, 0x2d,
+	0x2e, 0x32, 0x20, 0x31, 0x30, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x32, 0x20, 0x32, 0x30, 0x2e, 0x31,
+	0x2d, 0x33, 0x2e, 0x36, 0x20, 0x33, 0x30, 0x2e, 0x31, 0x6c, 0x2d, 0x32, 0x2e, 0x34, 0x20, 0x31,
+	0x32, 0x2e, 0x34, 0x63, 0x2d, 0x2e, 0x38, 0x20, 0x34, 0x2d, 0x32, 0x2e, 0x33, 0x20, 0x31, 0x31,
+	0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x31, 0x2d,
+	0x34, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x38, 0x2d, 0x37, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x33, 0x2d,
+	0x31, 0x33, 0x2e, 0x36, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x31,
+	0x30, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x32, 0x2d, 0x31, 0x35, 0x2e, 0x31, 0x2e, 0x37, 0x2d, 0x33,
+	0x2e, 0x36, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x36, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x36, 0x2d, 0x31,
+	0x30, 0x2e, 0x38, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x39, 0x2e, 0x35, 0x2d, 0x34, 0x2e, 0x36, 0x2e,
+	0x38, 0x2d, 0x36, 0x2e, 0x39, 0x2e, 0x39, 0x2d, 0x36, 0x2e, 0x35, 0x2e, 0x37, 0x2d, 0x31, 0x30,
+	0x2e, 0x36, 0x2d, 0x2e, 0x33, 0x2d, 0x31, 0x36, 0x2e, 0x34, 0x2d, 0x2e, 0x39, 0x2d, 0x2e, 0x38,
+	0x2d, 0x31, 0x2d, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x31, 0x20, 0x30, 0x20,
+	0x30, 0x20, 0x31, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x32, 0x20, 0x33, 0x2e, 0x37, 0x7a,
+	0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23,
+	0x38, 0x30, 0x36, 0x33, 0x34, 0x64, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x31, 0x33, 0x2e,
+	0x31, 0x20, 0x36, 0x35, 0x2e, 0x39, 0x63, 0x34, 0x20, 0x31, 0x2e, 0x31, 0x20, 0x34, 0x2e, 0x36,
+	0x20, 0x32, 0x2e, 0x31, 0x20, 0x36, 0x2e, 0x33, 0x20, 0x35, 0x61, 0x34, 0x2e, 0x39, 0x20, 0x34,
+	0x2e, 0x39, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x2d, 0x32, 0x2e, 0x36, 0x20, 0x2d, 0x2e,
+	0x31, 0x63, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x38, 0x2d, 0x33,
+	0x2e, 0x33, 0x2d, 0x36, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x31, 0x6c, 0x2d, 0x2e, 0x31, 0x2d, 0x2e,
+	0x36, 0x20, 0x32, 0x2e, 0x37, 0x2d, 0x2e, 0x31, 0x7a, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x61, 0x61, 0x36, 0x31, 0x32, 0x35, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x39, 0x35, 0x2e, 0x37, 0x20, 0x31, 0x37, 0x38, 0x2e, 0x36,
+	0x63, 0x32, 0x2e, 0x31, 0x20, 0x30, 0x2d, 0x33, 0x2e, 0x35, 0x2d, 0x33, 0x2e, 0x38, 0x2d, 0x35,
+	0x2d, 0x34, 0x2e, 0x39, 0x20, 0x33, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x38, 0x2d, 0x2e, 0x39, 0x20,
+	0x31, 0x32, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x39, 0x20, 0x31, 0x34, 0x2e, 0x31, 0x20, 0x31, 0x2e,
+	0x36, 0x2d, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x36, 0x2d, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x39, 0x2d,
+	0x31, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x38, 0x2d, 0x2e,
+	0x35, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x2e, 0x38, 0x2d, 0x31, 0x2e,
+	0x33, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x36, 0x20, 0x34, 0x2e, 0x39, 0x2d, 0x31, 0x2e,
+	0x35, 0x2d, 0x33, 0x2e, 0x35, 0x2d, 0x33, 0x2e, 0x38, 0x2d, 0x2e, 0x32, 0x2d, 0x34, 0x2e, 0x39,
+	0x2d, 0x2e, 0x32, 0x2d, 0x34, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x32, 0x39, 0x32, 0x37, 0x32, 0x38, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x31, 0x34, 0x38, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x31, 0x68, 0x2d, 0x2e, 0x31,
+	0x6c, 0x2d, 0x2e, 0x31, 0x20, 0x30, 0x63, 0x2d, 0x32, 0x2e, 0x36, 0x2e, 0x36, 0x2d, 0x35, 0x20,
+	0x32, 0x2e, 0x39, 0x2d, 0x37, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x35, 0x71, 0x2d, 0x34, 0x20, 0x35,
+	0x2e, 0x32, 0x2d, 0x39, 0x2e, 0x36, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x6c, 0x2d, 0x2e, 0x31, 0x2d,
+	0x2e, 0x31, 0x2d, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x31, 0x63, 0x2d, 0x35, 0x2e, 0x37, 0x20, 0x39,
+	0x2e, 0x38, 0x2d, 0x37, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x2d, 0x31, 0x32, 0x2e, 0x32, 0x20, 0x32,
+	0x35, 0x6c, 0x2d, 0x2e, 0x31, 0x2e, 0x32, 0x63, 0x2d, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x32, 0x2d,
+	0x2e, 0x37, 0x20, 0x37, 0x2e, 0x38, 0x2d, 0x2e, 0x37, 0x20, 0x31, 0x32, 0x2e, 0x31, 0x20, 0x30,
+	0x20, 0x33, 0x20, 0x2e, 0x31, 0x20, 0x35, 0x2e, 0x31, 0x2e, 0x31, 0x20, 0x37, 0x2e, 0x32, 0x71,
+	0x2d, 0x2e, 0x38, 0x2d, 0x31, 0x2d, 0x33, 0x2e, 0x35, 0x2d, 0x32, 0x2e, 0x34, 0x6c, 0x2d, 0x2e,
+	0x33, 0x2d, 0x2e, 0x31, 0x71, 0x2d, 0x32, 0x2d, 0x2e, 0x33, 0x2d, 0x33, 0x2e, 0x35, 0x20, 0x30,
+	0x73, 0x2d, 0x31, 0x2e, 0x39, 0x2e, 0x37, 0x2d, 0x32, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x34, 0x6c,
+	0x2d, 0x2e, 0x31, 0x2e, 0x31, 0x2d, 0x2e, 0x31, 0x2e, 0x32, 0x71, 0x2d, 0x2e, 0x35, 0x2e, 0x39,
+	0x2d, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x35, 0x63, 0x2d, 0x2e, 0x31, 0x2e, 0x34, 0x2d, 0x2e, 0x31,
+	0x2e, 0x38, 0x2d, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x39, 0x6c, 0x2e, 0x31, 0x2d, 0x2e, 0x32, 0x2d,
+	0x2e, 0x33, 0x2e, 0x39, 0x2d, 0x2e, 0x34, 0x2d, 0x31, 0x61, 0x34, 0x34, 0x20, 0x34, 0x34, 0x20,
+	0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2d, 0x31, 0x2e, 0x32, 0x20, 0x2d, 0x32, 0x2e, 0x38, 0x71,
+	0x2d, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x32, 0x63, 0x2d, 0x33,
+	0x2e, 0x39, 0x2d, 0x34, 0x2e, 0x35, 0x2d, 0x32, 0x30, 0x2e, 0x32, 0x2d, 0x32, 0x31, 0x2e, 0x36,
+	0x2d, 0x34, 0x35, 0x2e, 0x33, 0x2d, 0x33, 0x35, 0x2e, 0x31, 0x6c, 0x30, 0x20, 0x30, 0x71, 0x2d,
+	0x34, 0x2e, 0x38, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x37, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x33, 0x61,
+	0x33, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2d, 0x31,
+	0x2e, 0x39, 0x20, 0x32, 0x2e, 0x32, 0x71, 0x2d, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x35, 0x2e, 0x32,
+	0x20, 0x33, 0x2e, 0x33, 0x63, 0x32, 0x2e, 0x34, 0x20, 0x38, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x37,
+	0x2e, 0x33, 0x20, 0x39, 0x2e, 0x35, 0x20, 0x32, 0x31, 0x2e, 0x33, 0x20, 0x35, 0x2e, 0x32, 0x20,
+	0x39, 0x20, 0x31, 0x30, 0x2e, 0x33, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x36,
+	0x20, 0x32, 0x30, 0x2e, 0x34, 0x73, 0x37, 0x2e, 0x35, 0x20, 0x37, 0x2e, 0x38, 0x20, 0x39, 0x20,
+	0x39, 0x2e, 0x36, 0x63, 0x33, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x37, 0x20, 0x33, 0x2e, 0x31, 0x20,
+	0x38, 0x2e, 0x31, 0x20, 0x33, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x76, 0x2d, 0x2e, 0x31, 0x63, 0x2d,
+	0x2e, 0x36, 0x20, 0x37, 0x2e, 0x33, 0x2d, 0x2e, 0x38, 0x20, 0x31, 0x36, 0x2e, 0x38, 0x20, 0x31,
+	0x2e, 0x31, 0x20, 0x32, 0x34, 0x2e, 0x32, 0x6c, 0x30, 0x20, 0x30, 0x76, 0x30, 0x63, 0x2e, 0x39,
+	0x20, 0x33, 0x20, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x33, 0x2e, 0x34, 0x20, 0x36, 0x2e, 0x37, 0x2d,
+	0x2e, 0x35, 0x20, 0x35, 0x2e, 0x36, 0x2d, 0x31, 0x2e, 0x38, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x2d,
+	0x34, 0x20, 0x31, 0x36, 0x2e, 0x38, 0x76, 0x30, 0x6c, 0x30, 0x20, 0x30, 0x63, 0x2d, 0x33, 0x2e,
+	0x32, 0x20, 0x37, 0x2d, 0x34, 0x2e, 0x37, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x39,
+	0x20, 0x32, 0x32, 0x2e, 0x34, 0x6c, 0x2d, 0x32, 0x38, 0x2e, 0x36, 0x2e, 0x36, 0x68, 0x30, 0x63,
+	0x2d, 0x32, 0x2e, 0x36, 0x2e, 0x32, 0x2d, 0x34, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x37, 0x2d, 0x34,
+	0x2e, 0x38, 0x20, 0x33, 0x2e, 0x35, 0x73, 0x2d, 0x2e, 0x37, 0x20, 0x33, 0x2e, 0x38, 0x2d, 0x2e,
+	0x38, 0x20, 0x35, 0x2e, 0x35, 0x76, 0x2e, 0x31, 0x63, 0x30, 0x20, 0x33, 0x2e, 0x34, 0x2e, 0x37,
+	0x20, 0x34, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x38, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x33,
+	0x20, 0x34, 0x2e, 0x35, 0x2d, 0x2e, 0x36, 0x20, 0x39, 0x2e, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x35,
+	0x6c, 0x2e, 0x31, 0x2e, 0x33, 0x63, 0x31, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x33, 0x20, 0x32, 0x2e,
+	0x33, 0x20, 0x35, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x38, 0x20, 0x36, 0x2e, 0x33, 0x73, 0x33, 0x2e,
+	0x32, 0x20, 0x31, 0x2e, 0x33, 0x20, 0x35, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x35, 0x6c, 0x2e, 0x33,
+	0x20, 0x30, 0x63, 0x31, 0x33, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x33, 0x20, 0x32, 0x32, 0x2e, 0x31,
+	0x2d, 0x35, 0x2e, 0x39, 0x20, 0x33, 0x32, 0x2e, 0x32, 0x2d, 0x37, 0x2e, 0x39, 0x6c, 0x2d, 0x31,
+	0x2e, 0x36, 0x20, 0x33, 0x2e, 0x38, 0x20, 0x30, 0x20, 0x2e, 0x31, 0x71, 0x2d, 0x31, 0x2e, 0x31,
+	0x20, 0x33, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x33, 0x20, 0x34, 0x2e, 0x33, 0x6c, 0x2d, 0x2e, 0x34,
+	0x2d, 0x2e, 0x31, 0x68, 0x2d, 0x2e, 0x31, 0x63, 0x2d, 0x31, 0x35, 0x2e, 0x33, 0x2e, 0x32, 0x2d,
+	0x33, 0x31, 0x2e, 0x38, 0x20, 0x30, 0x2d, 0x34, 0x37, 0x2e, 0x33, 0x2e, 0x37, 0x68, 0x30, 0x63,
+	0x2d, 0x31, 0x2e, 0x39, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x37, 0x2e, 0x33, 0x2d, 0x35, 0x2e, 0x32,
+	0x20, 0x31, 0x2e, 0x31, 0x71, 0x2d, 0x32, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x32, 0x2d, 0x33, 0x20,
+	0x34, 0x2e, 0x38, 0x63, 0x2d, 0x31, 0x2e, 0x36, 0x20, 0x34, 0x2e, 0x32, 0x2d, 0x31, 0x20, 0x39,
+	0x2d, 0x2e, 0x32, 0x20, 0x31, 0x32, 0x2e, 0x38, 0x2d, 0x2e, 0x33, 0x20, 0x34, 0x2e, 0x34, 0x2e,
+	0x35, 0x20, 0x38, 0x20, 0x2e, 0x37, 0x20, 0x31, 0x32, 0x76, 0x30, 0x63, 0x2e, 0x33, 0x20, 0x34,
+	0x2e, 0x36, 0x20, 0x33, 0x2e, 0x33, 0x20, 0x39, 0x2e, 0x32, 0x20, 0x35, 0x2e, 0x38, 0x20, 0x31,
+	0x32, 0x2e, 0x35, 0x6c, 0x2e, 0x33, 0x2e, 0x34, 0x2e, 0x35, 0x20, 0x30, 0x63, 0x39, 0x2e, 0x39,
+	0x2e, 0x31, 0x20, 0x31, 0x38, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x38, 0x20, 0x32, 0x39, 0x2e, 0x37,
+	0x2d, 0x34, 0x2e, 0x32, 0x61, 0x34, 0x32, 0x36, 0x20, 0x34, 0x32, 0x36, 0x20, 0x30, 0x20, 0x30,
+	0x20, 0x31, 0x20, 0x31, 0x33, 0x20, 0x2d, 0x32, 0x2e, 0x35, 0x68, 0x30, 0x6c, 0x32, 0x32, 0x2d,
+	0x33, 0x2e, 0x39, 0x63, 0x31, 0x37, 0x2e, 0x34, 0x20, 0x33, 0x20, 0x33, 0x33, 0x2e, 0x37, 0x20,
+	0x34, 0x2e, 0x35, 0x20, 0x34, 0x39, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x32, 0x36, 0x2e,
+	0x33, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x34, 0x38, 0x2e, 0x31, 0x20, 0x39, 0x2e, 0x32, 0x20, 0x37,
+	0x32, 0x2e, 0x34, 0x20, 0x39, 0x2e, 0x32, 0x68, 0x2e, 0x33, 0x6c, 0x2e, 0x33, 0x2d, 0x2e, 0x32,
+	0x63, 0x32, 0x2e, 0x34, 0x2d, 0x32, 0x20, 0x33, 0x2e, 0x36, 0x2d, 0x34, 0x2e, 0x35, 0x20, 0x34,
+	0x2e, 0x32, 0x2d, 0x37, 0x2e, 0x31, 0x73, 0x2e, 0x38, 0x2d, 0x35, 0x2e, 0x33, 0x20, 0x31, 0x2e,
+	0x32, 0x2d, 0x38, 0x6c, 0x30, 0x2d, 0x2e, 0x31, 0x76, 0x2d, 0x2e, 0x31, 0x63, 0x2e, 0x31, 0x2d,
+	0x35, 0x2e, 0x35, 0x2e, 0x38, 0x2d, 0x38, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x32, 0x2d, 0x31, 0x34,
+	0x2e, 0x36, 0x2e, 0x34, 0x2d, 0x33, 0x2d, 0x2e, 0x39, 0x2d, 0x36, 0x2e, 0x32, 0x2d, 0x31, 0x2e,
+	0x38, 0x2d, 0x38, 0x2e, 0x36, 0x71, 0x2d, 0x2e, 0x37, 0x2d, 0x32, 0x2e, 0x31, 0x2d, 0x31, 0x2e,
+	0x39, 0x2d, 0x33, 0x2e, 0x31, 0x61, 0x35, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x35, 0x20, 0x30, 0x20,
+	0x30, 0x20, 0x30, 0x20, 0x2d, 0x32, 0x2e, 0x39, 0x20, 0x2d, 0x31, 0x2e, 0x32, 0x63, 0x2d, 0x32,
+	0x2e, 0x31, 0x2d, 0x2e, 0x33, 0x2d, 0x34, 0x2e, 0x35, 0x20, 0x30, 0x2d, 0x37, 0x2e, 0x36, 0x2d,
+	0x2e, 0x31, 0x68, 0x30, 0x63, 0x2d, 0x32, 0x2e, 0x36, 0x20, 0x30, 0x2d, 0x31, 0x30, 0x20, 0x2e,
+	0x33, 0x2d, 0x31, 0x38, 0x2e, 0x34, 0x2e, 0x36, 0x2d, 0x38, 0x2e, 0x32, 0x2e, 0x32, 0x2d, 0x31,
+	0x37, 0x2e, 0x32, 0x2e, 0x33, 0x2d, 0x32, 0x33, 0x2e, 0x39, 0x20, 0x30, 0x2d, 0x2e, 0x32, 0x2d,
+	0x34, 0x2d, 0x31, 0x2e, 0x31, 0x2d, 0x37, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x39, 0x2d, 0x31, 0x30,
+	0x2e, 0x38, 0x20, 0x34, 0x20, 0x31, 0x20, 0x37, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x32, 0x20, 0x31,
+	0x31, 0x2e, 0x36, 0x20, 0x33, 0x6c, 0x30, 0x20, 0x30, 0x63, 0x35, 0x2e, 0x37, 0x20, 0x31, 0x2e,
+	0x32, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x31, 0x37, 0x2e, 0x36, 0x20,
+	0x33, 0x2e, 0x33, 0x68, 0x2e, 0x31, 0x71, 0x32, 0x2e, 0x35, 0x2d, 0x2e, 0x32, 0x20, 0x34, 0x2e,
+	0x31, 0x2d, 0x31, 0x2e, 0x37, 0x73, 0x31, 0x2e, 0x38, 0x2d, 0x32, 0x2e, 0x32, 0x20, 0x32, 0x2e,
+	0x33, 0x2d, 0x33, 0x2e, 0x36, 0x63, 0x31, 0x2d, 0x32, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x33, 0x2d,
+	0x35, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x35, 0x2d, 0x37, 0x2e, 0x38, 0x76, 0x30, 0x63, 0x2e, 0x32,
+	0x2d, 0x33, 0x2d, 0x2e, 0x32, 0x2d, 0x35, 0x2e, 0x37, 0x2d, 0x2e, 0x32, 0x2d, 0x38, 0x2e, 0x32,
+	0x73, 0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x34, 0x2d, 0x37, 0x6c, 0x2e, 0x31,
+	0x2d, 0x2e, 0x32, 0x20, 0x30, 0x2d, 0x2e, 0x32, 0x63, 0x2e, 0x35, 0x2d, 0x33, 0x2e, 0x36, 0x2e,
+	0x33, 0x2d, 0x36, 0x2d, 0x2e, 0x33, 0x2d, 0x37, 0x2e, 0x37, 0x73, 0x2d, 0x31, 0x2e, 0x35, 0x2d,
+	0x32, 0x2e, 0x38, 0x2d, 0x32, 0x2e, 0x33, 0x2d, 0x33, 0x2e, 0x37, 0x6c, 0x2d, 0x2e, 0x32, 0x2d,
+	0x2e, 0x33, 0x2d, 0x2e, 0x33, 0x2d, 0x2e, 0x31, 0x63, 0x2d, 0x33, 0x2e, 0x38, 0x2d, 0x2e, 0x38,
+	0x2d, 0x39, 0x2e, 0x37, 0x2d, 0x2e, 0x38, 0x2d, 0x31, 0x36, 0x2e, 0x32, 0x2d, 0x2e, 0x37, 0x2d,
+	0x36, 0x2e, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x32, 0x2e, 0x36, 0x2e, 0x32, 0x2d, 0x31, 0x38, 0x2e,
+	0x34, 0x2d, 0x2e, 0x31, 0x61, 0x33, 0x32, 0x2e, 0x33, 0x20, 0x33, 0x32, 0x2e, 0x33, 0x20, 0x30,
+	0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x2d, 0x36, 0x2e, 0x37, 0x63, 0x2e, 0x34,
+	0x2d, 0x33, 0x2e, 0x33, 0x2e, 0x34, 0x2d, 0x36, 0x2e, 0x39, 0x2d, 0x2e, 0x37, 0x2d, 0x31, 0x30,
+	0x2d, 0x32, 0x2d, 0x37, 0x2e, 0x34, 0x2d, 0x35, 0x2e, 0x39, 0x2d, 0x31, 0x32, 0x2e, 0x36, 0x2d,
+	0x39, 0x2e, 0x37, 0x2d, 0x31, 0x38, 0x2e, 0x31, 0x73, 0x2d, 0x37, 0x2e, 0x35, 0x2d, 0x31, 0x31,
+	0x2e, 0x34, 0x2d, 0x39, 0x2e, 0x34, 0x2d, 0x32, 0x30, 0x2e, 0x32, 0x63, 0x2d, 0x31, 0x2e, 0x32,
+	0x2d, 0x31, 0x30, 0x2e, 0x32, 0x2d, 0x34, 0x2e, 0x32, 0x2d, 0x32, 0x32, 0x2e, 0x33, 0x2d, 0x39,
+	0x2e, 0x37, 0x2d, 0x33, 0x31, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x35, 0x2d, 0x31, 0x30, 0x2e, 0x36,
+	0x20, 0x32, 0x2e, 0x34, 0x2d, 0x31, 0x36, 0x2e, 0x36, 0x20, 0x35, 0x2e, 0x31, 0x2d, 0x32, 0x36,
+	0x2e, 0x33, 0x6c, 0x30, 0x2d, 0x2e, 0x31, 0x63, 0x33, 0x2e, 0x31, 0x2d, 0x31, 0x36, 0x20, 0x36,
+	0x2e, 0x39, 0x2d, 0x33, 0x36, 0x2e, 0x38, 0x20, 0x35, 0x2e, 0x39, 0x2d, 0x34, 0x38, 0x2e, 0x35,
+	0x6c, 0x2d, 0x2e, 0x31, 0x2d, 0x2e, 0x33, 0x63, 0x2d, 0x2e, 0x33, 0x2d, 0x2e, 0x37, 0x2d, 0x2e,
+	0x34, 0x2d, 0x31, 0x2e, 0x37, 0x2d, 0x31, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x37, 0x73, 0x2d, 0x32,
+	0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x37, 0x2d, 0x34, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x36, 0x6d, 0x2e,
+	0x32, 0x20, 0x32, 0x63, 0x31, 0x2e, 0x36, 0x20, 0x30, 0x20, 0x32, 0x2e, 0x32, 0x2e, 0x34, 0x20,
+	0x32, 0x2e, 0x35, 0x2e, 0x38, 0x71, 0x2e, 0x35, 0x2e, 0x37, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x31,
+	0x63, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x38, 0x20, 0x33, 0x31, 0x2e, 0x39,
+	0x2d, 0x35, 0x2e, 0x38, 0x20, 0x34, 0x37, 0x2e, 0x38, 0x2d, 0x32, 0x2e, 0x38, 0x20, 0x39, 0x2e,
+	0x38, 0x2d, 0x33, 0x2e, 0x36, 0x20, 0x31, 0x36, 0x2d, 0x35, 0x2e, 0x32, 0x20, 0x32, 0x36, 0x2e,
+	0x37, 0x6c, 0x2d, 0x2e, 0x31, 0x2e, 0x34, 0x2e, 0x32, 0x2e, 0x33, 0x63, 0x35, 0x2e, 0x33, 0x20,
+	0x38, 0x2e, 0x37, 0x20, 0x38, 0x2e, 0x34, 0x20, 0x32, 0x30, 0x2e, 0x39, 0x20, 0x39, 0x2e, 0x36,
+	0x20, 0x33, 0x31, 0x6c, 0x30, 0x20, 0x2e, 0x31, 0x63, 0x32, 0x20, 0x39, 0x2e, 0x32, 0x20, 0x35,
+	0x2e, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x20, 0x39, 0x2e, 0x37, 0x20, 0x32, 0x30, 0x2e, 0x39,
+	0x73, 0x37, 0x2e, 0x35, 0x20, 0x31, 0x30, 0x2e, 0x35, 0x20, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x37,
+	0x2e, 0x36, 0x6c, 0x30, 0x20, 0x2e, 0x31, 0x63, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x36, 0x20, 0x31,
+	0x20, 0x36, 0x20, 0x2e, 0x36, 0x20, 0x39, 0x2e, 0x31, 0x73, 0x2d, 0x31, 0x2e, 0x32, 0x20, 0x36,
+	0x2d, 0x31, 0x2e, 0x38, 0x20, 0x37, 0x2e, 0x35, 0x6c, 0x2d, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x33,
+	0x20, 0x31, 0x2e, 0x34, 0x2e, 0x31, 0x63, 0x36, 0x2e, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x33, 0x2e,
+	0x33, 0x2e, 0x33, 0x20, 0x31, 0x39, 0x2e, 0x38, 0x2e, 0x32, 0x20, 0x36, 0x2e, 0x33, 0x2d, 0x2e,
+	0x31, 0x20, 0x31, 0x32, 0x2d, 0x2e, 0x31, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x2e, 0x36, 0x2e, 0x37,
+	0x2e, 0x39, 0x20, 0x31, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x37, 0x20, 0x32,
+	0x2e, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x33, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x33, 0x2e, 0x32,
+	0x20, 0x36, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x36,
+	0x20, 0x35, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x35, 0x20, 0x37, 0x2e, 0x37, 0x2e, 0x31, 0x20, 0x32,
+	0x2e, 0x37, 0x2e, 0x34, 0x20, 0x35, 0x2e, 0x33, 0x2e, 0x32, 0x20, 0x38, 0x2e, 0x31, 0x2d, 0x2e,
+	0x32, 0x20, 0x32, 0x2d, 0x2e, 0x34, 0x20, 0x35, 0x2d, 0x31, 0x2e, 0x33, 0x20, 0x37, 0x2e, 0x33,
+	0x71, 0x2d, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x39,
+	0x2d, 0x31, 0x20, 0x31, 0x2e, 0x31, 0x2d, 0x32, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x32, 0x63, 0x2d,
+	0x35, 0x2e, 0x37, 0x2d, 0x2e, 0x31, 0x2d, 0x31, 0x31, 0x2e, 0x33, 0x2d, 0x32, 0x2d, 0x31, 0x37,
+	0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x33, 0x68, 0x30, 0x63, 0x2d, 0x34, 0x2e, 0x39, 0x2d, 0x2e, 0x39,
+	0x2d, 0x38, 0x2e, 0x34, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x31, 0x33, 0x2e, 0x38, 0x2d, 0x33, 0x2e,
+	0x36, 0x6c, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x32, 0x63,
+	0x32, 0x2e, 0x38, 0x20, 0x34, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x37, 0x20, 0x37, 0x2e, 0x38, 0x20,
+	0x33, 0x2e, 0x39, 0x20, 0x31, 0x32, 0x2e, 0x38, 0x6c, 0x30, 0x20, 0x2e, 0x39, 0x2e, 0x39, 0x2e,
+	0x31, 0x63, 0x36, 0x2e, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x36, 0x2e, 0x34, 0x2e, 0x32, 0x20, 0x32,
+	0x34, 0x2e, 0x39, 0x20, 0x30, 0x73, 0x31, 0x36, 0x2d, 0x2e, 0x36, 0x20, 0x31, 0x38, 0x2e, 0x34,
+	0x2d, 0x2e, 0x36, 0x63, 0x33, 0x2e, 0x32, 0x2e, 0x31, 0x20, 0x35, 0x2e, 0x38, 0x2d, 0x2e, 0x32,
+	0x20, 0x37, 0x2e, 0x34, 0x20, 0x30, 0x71, 0x31, 0x2e, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x39,
+	0x2e, 0x38, 0x2e, 0x37, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x32, 0x6c, 0x30,
+	0x20, 0x30, 0x63, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x38, 0x20, 0x35, 0x2e,
+	0x31, 0x20, 0x31, 0x2e, 0x37, 0x20, 0x37, 0x2e, 0x38, 0x2d, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x38,
+	0x2d, 0x31, 0x2e, 0x31, 0x20, 0x38, 0x2e, 0x35, 0x2d, 0x31, 0x2e, 0x32, 0x20, 0x31, 0x34, 0x2e,
+	0x37, 0x2d, 0x2e, 0x35, 0x20, 0x32, 0x2e, 0x38, 0x2d, 0x2e, 0x36, 0x20, 0x35, 0x2e, 0x35, 0x2d,
+	0x31, 0x2e, 0x32, 0x20, 0x37, 0x2e, 0x38, 0x71, 0x2d, 0x2e, 0x37, 0x20, 0x33, 0x2e, 0x33, 0x2d,
+	0x33, 0x2e, 0x34, 0x20, 0x35, 0x2e, 0x38, 0x63, 0x2d, 0x32, 0x33, 0x2e, 0x37, 0x2d, 0x2e, 0x31,
+	0x2d, 0x34, 0x35, 0x2e, 0x35, 0x2d, 0x38, 0x2d, 0x37, 0x32, 0x2d, 0x39, 0x2e, 0x32, 0x6c, 0x2d,
+	0x2e, 0x32, 0x20, 0x30, 0x63, 0x2d, 0x31, 0x35, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x39, 0x2d, 0x33,
+	0x31, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x35, 0x2d, 0x34, 0x39, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x35,
+	0x6c, 0x2d, 0x2e, 0x32, 0x20, 0x30, 0x2d, 0x32, 0x32, 0x2e, 0x33, 0x20, 0x33, 0x2e, 0x39, 0x61,
+	0x34, 0x32, 0x38, 0x20, 0x34, 0x32, 0x38, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2d, 0x31,
+	0x33, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x35, 0x63, 0x2d, 0x31, 0x31, 0x2e, 0x34, 0x20, 0x32, 0x2e,
+	0x34, 0x2d, 0x31, 0x39, 0x2e, 0x33, 0x20, 0x34, 0x2e, 0x32, 0x2d, 0x32, 0x38, 0x2e, 0x37, 0x20,
+	0x34, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x34, 0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x34, 0x2e, 0x39, 0x2d,
+	0x37, 0x2e, 0x33, 0x2d, 0x35, 0x2e, 0x32, 0x2d, 0x31, 0x31, 0x2d, 0x2e, 0x32, 0x2d, 0x34, 0x2e,
+	0x32, 0x2d, 0x2e, 0x39, 0x2d, 0x37, 0x2e, 0x38, 0x2d, 0x2e, 0x37, 0x2d, 0x31, 0x31, 0x2e, 0x39,
+	0x6c, 0x30, 0x2d, 0x2e, 0x33, 0x63, 0x2d, 0x2e, 0x38, 0x2d, 0x33, 0x2e, 0x36, 0x2d, 0x31, 0x2e,
+	0x32, 0x2d, 0x38, 0x2e, 0x33, 0x2e, 0x32, 0x2d, 0x31, 0x31, 0x2e, 0x39, 0x71, 0x2e, 0x32, 0x2d,
+	0x32, 0x2e, 0x33, 0x20, 0x32, 0x2d, 0x33, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x35, 0x2d, 0x2e, 0x37,
+	0x20, 0x34, 0x2e, 0x35, 0x2d, 0x2e, 0x38, 0x63, 0x31, 0x35, 0x2e, 0x34, 0x2d, 0x2e, 0x37, 0x20,
+	0x33, 0x31, 0x2e, 0x39, 0x2d, 0x2e, 0x35, 0x20, 0x34, 0x37, 0x2e, 0x32, 0x2d, 0x2e, 0x37, 0x6c,
+	0x2d, 0x2e, 0x32, 0x20, 0x30, 0x20, 0x31, 0x2e, 0x33, 0x2e, 0x31, 0x71, 0x2e, 0x38, 0x2d, 0x2e,
+	0x33, 0x20, 0x31, 0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x31, 0x63, 0x2e, 0x34, 0x2d, 0x2e, 0x39, 0x2e,
+	0x37, 0x2d, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x2e, 0x34, 0x2d, 0x34, 0x2e, 0x36, 0x2e, 0x37, 0x2d,
+	0x31, 0x2e, 0x38, 0x2e, 0x39, 0x2d, 0x32, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x33, 0x2d, 0x35, 0x2e,
+	0x35, 0x6c, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x38, 0x2d, 0x32, 0x20, 0x2e, 0x34, 0x63, 0x2d, 0x31,
+	0x31, 0x20, 0x32, 0x2d, 0x32, 0x30, 0x2e, 0x32, 0x20, 0x34, 0x2e, 0x38, 0x2d, 0x33, 0x34, 0x20,
+	0x38, 0x2e, 0x33, 0x2d, 0x32, 0x2e, 0x36, 0x2d, 0x2e, 0x31, 0x2d, 0x33, 0x2e, 0x38, 0x2d, 0x2e,
+	0x33, 0x2d, 0x34, 0x2e, 0x37, 0x2d, 0x31, 0x73, 0x2d, 0x31, 0x2e, 0x37, 0x2d, 0x32, 0x2e, 0x33,
+	0x2d, 0x33, 0x2e, 0x31, 0x2d, 0x35, 0x2e, 0x35, 0x63, 0x2d, 0x2e, 0x38, 0x2d, 0x36, 0x2d, 0x31,
+	0x2e, 0x34, 0x2d, 0x31, 0x30, 0x2e, 0x33, 0x2d, 0x2e, 0x31, 0x2d, 0x31, 0x34, 0x2e, 0x33, 0x6c,
+	0x2e, 0x31, 0x2d, 0x2e, 0x32, 0x2d, 0x2e, 0x31, 0x2d, 0x2e, 0x32, 0x63, 0x2d, 0x2e, 0x38, 0x2d,
+	0x33, 0x2e, 0x38, 0x2d, 0x31, 0x2e, 0x34, 0x2d, 0x34, 0x2e, 0x39, 0x2d, 0x31, 0x2e, 0x34, 0x2d,
+	0x38, 0x2e, 0x31, 0x2e, 0x31, 0x2d, 0x31, 0x2e, 0x38, 0x2e, 0x32, 0x2d, 0x33, 0x2e, 0x37, 0x2e,
+	0x37, 0x2d, 0x34, 0x2e, 0x39, 0x73, 0x31, 0x2e, 0x31, 0x2d, 0x32, 0x20, 0x33, 0x2e, 0x31, 0x2d,
+	0x32, 0x2e, 0x32, 0x6c, 0x33, 0x30, 0x2e, 0x37, 0x2d, 0x2e, 0x36, 0x2d, 0x2e, 0x31, 0x2d, 0x31,
+	0x2e, 0x31, 0x63, 0x2d, 0x31, 0x2d, 0x37, 0x2e, 0x35, 0x2e, 0x34, 0x2d, 0x31, 0x35, 0x2e, 0x33,
+	0x20, 0x33, 0x2e, 0x37, 0x2d, 0x32, 0x32, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x35, 0x2d, 0x35, 0x2e,
+	0x31, 0x20, 0x33, 0x2e, 0x37, 0x2d, 0x31, 0x31, 0x2e, 0x37, 0x20, 0x34, 0x2e, 0x32, 0x2d, 0x31,
+	0x37, 0x2e, 0x35, 0x76, 0x30, 0x63, 0x2e, 0x34, 0x2d, 0x34, 0x2e, 0x34, 0x2e, 0x34, 0x2d, 0x34,
+	0x2e, 0x34, 0x2d, 0x2e, 0x35, 0x2d, 0x37, 0x2e, 0x34, 0x6c, 0x30, 0x20, 0x30, 0x63, 0x2d, 0x31,
+	0x2e, 0x38, 0x2d, 0x37, 0x2d, 0x31, 0x2e, 0x36, 0x2d, 0x31, 0x36, 0x2e, 0x34, 0x2d, 0x31, 0x2d,
+	0x32, 0x33, 0x2e, 0x36, 0x76, 0x2d, 0x2e, 0x31, 0x63, 0x2e, 0x31, 0x2d, 0x36, 0x2e, 0x32, 0x2e,
+	0x38, 0x2d, 0x38, 0x2e, 0x35, 0x2d, 0x33, 0x2e, 0x33, 0x2d, 0x31, 0x35, 0x2e, 0x35, 0x6c, 0x2d,
+	0x2e, 0x31, 0x2d, 0x2e, 0x31, 0x63, 0x2d, 0x31, 0x2e, 0x37, 0x2d, 0x32, 0x2d, 0x34, 0x2e, 0x39,
+	0x2d, 0x35, 0x2d, 0x39, 0x2e, 0x31, 0x2d, 0x39, 0x2e, 0x37, 0x73, 0x2d, 0x39, 0x2e, 0x32, 0x2d,
+	0x31, 0x31, 0x2e, 0x32, 0x2d, 0x31, 0x34, 0x2e, 0x33, 0x2d, 0x32, 0x30, 0x2e, 0x31, 0x63, 0x2d,
+	0x38, 0x2e, 0x31, 0x2d, 0x31, 0x33, 0x2e, 0x39, 0x2d, 0x36, 0x2e, 0x39, 0x2d, 0x31, 0x32, 0x2e,
+	0x38, 0x2d, 0x39, 0x2e, 0x33, 0x2d, 0x32, 0x30, 0x2e, 0x39, 0x71, 0x2d, 0x2e, 0x34, 0x2d, 0x31,
+	0x2e, 0x35, 0x2d, 0x2e, 0x32, 0x2d, 0x32, 0x2e, 0x32, 0x2e, 0x31, 0x2d, 0x2e, 0x36, 0x2e, 0x37,
+	0x2d, 0x2e, 0x38, 0x63, 0x2e, 0x38, 0x2d, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x39, 0x2d, 0x2e, 0x32,
+	0x20, 0x35, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x33, 0x68, 0x30, 0x63, 0x32, 0x34, 0x2e, 0x38, 0x20,
+	0x31, 0x33, 0x2e, 0x34, 0x20, 0x34, 0x30, 0x2e, 0x39, 0x20, 0x33, 0x30, 0x2e, 0x33, 0x20, 0x34,
+	0x34, 0x2e, 0x37, 0x20, 0x33, 0x34, 0x2e, 0x37, 0x71, 0x2e, 0x33, 0x2e, 0x33, 0x2e, 0x39, 0x20,
+	0x31, 0x2e, 0x36, 0x6c, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x37, 0x73, 0x2e, 0x37, 0x20, 0x31,
+	0x2e, 0x39, 0x20, 0x31, 0x20, 0x32, 0x2e, 0x37, 0x71, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x33, 0x2e,
+	0x34, 0x20, 0x31, 0x2e, 0x35, 0x76, 0x30, 0x6c, 0x30, 0x20, 0x2e, 0x32, 0x73, 0x30, 0x20, 0x2e,
+	0x32, 0x2e, 0x33, 0x2e, 0x35, 0x6c, 0x2e, 0x31, 0x2e, 0x31, 0x2e, 0x32, 0x2e, 0x31, 0x2e, 0x35,
+	0x20, 0x30, 0x73, 0x2e, 0x31, 0x20, 0x30, 0x20, 0x2e, 0x32, 0x2d, 0x2e, 0x31, 0x61, 0x31, 0x20,
+	0x31, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x33, 0x20, 0x2d, 0x2e, 0x32, 0x6c, 0x2e,
+	0x32, 0x2d, 0x2e, 0x33, 0x2e, 0x32, 0x2d, 0x2e, 0x35, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x34, 0x73,
+	0x2e, 0x32, 0x2d, 0x31, 0x2e, 0x31, 0x2e, 0x33, 0x2d, 0x31, 0x2e, 0x36, 0x6c, 0x2e, 0x31, 0x2d,
+	0x2e, 0x36, 0x71, 0x2e, 0x31, 0x2d, 0x2e, 0x33, 0x20, 0x30, 0x2d, 0x2e, 0x31, 0x6c, 0x2e, 0x31,
+	0x2d, 0x2e, 0x32, 0x71, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x36, 0x2e, 0x34, 0x2d, 0x31, 0x2e, 0x39,
+	0x6c, 0x2e, 0x34, 0x2d, 0x2e, 0x38, 0x71, 0x2e, 0x39, 0x2d, 0x2e, 0x37, 0x20, 0x31, 0x2e, 0x37,
+	0x2d, 0x2e, 0x39, 0x2e, 0x39, 0x2d, 0x2e, 0x32, 0x20, 0x32, 0x2e, 0x37, 0x20, 0x30, 0x63, 0x33,
+	0x2e, 0x32, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x32, 0x2e, 0x39, 0x20, 0x32, 0x2e, 0x33, 0x20, 0x33,
+	0x2e, 0x39, 0x20, 0x33, 0x2e, 0x34, 0x6c, 0x2e, 0x33, 0x2e, 0x38, 0x71, 0x2d, 0x2e, 0x31, 0x20,
+	0x30, 0x20, 0x2e, 0x32, 0x2e, 0x34, 0x61, 0x31, 0x20, 0x31, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30,
+	0x20, 0x2e, 0x33, 0x20, 0x2e, 0x32, 0x6c, 0x2e, 0x32, 0x2e, 0x31, 0x2e, 0x35, 0x20, 0x30, 0x20,
+	0x2e, 0x34, 0x2d, 0x2e, 0x32, 0x73, 0x2e, 0x31, 0x2d, 0x2e, 0x31, 0x2e, 0x31, 0x2d, 0x2e, 0x31,
+	0x61, 0x31, 0x20, 0x31, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2e, 0x31, 0x20, 0x2d, 0x2e,
+	0x33, 0x6c, 0x30, 0x2d, 0x2e, 0x38, 0x76, 0x2e, 0x31, 0x63, 0x30, 0x2d, 0x32, 0x2d, 0x2e, 0x32,
+	0x2d, 0x36, 0x2d, 0x2e, 0x32, 0x2d, 0x31, 0x30, 0x2e, 0x32, 0x73, 0x2e, 0x31, 0x2d, 0x38, 0x2e,
+	0x38, 0x2e, 0x36, 0x2d, 0x31, 0x31, 0x2e, 0x37, 0x63, 0x35, 0x2e, 0x31, 0x2d, 0x31, 0x33, 0x2e,
+	0x32, 0x20, 0x36, 0x2e, 0x34, 0x2d, 0x31, 0x34, 0x2e, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x39, 0x2d,
+	0x32, 0x34, 0x2e, 0x34, 0x6c, 0x2e, 0x31, 0x2d, 0x2e, 0x32, 0x71, 0x36, 0x2d, 0x39, 0x2e, 0x35,
+	0x20, 0x31, 0x30, 0x2e, 0x32, 0x2d, 0x31, 0x34, 0x2e, 0x38, 0x20, 0x34, 0x2e, 0x32, 0x2d, 0x35,
+	0x2e, 0x32, 0x20, 0x36, 0x2e, 0x37, 0x2d, 0x35, 0x2e, 0x38, 0x6d, 0x2d, 0x34, 0x31, 0x2e, 0x37,
+	0x20, 0x37, 0x31, 0x20, 0x30, 0x20, 0x2e, 0x31, 0x76, 0x30, 0x7a, 0x22, 0x20, 0x6f, 0x76, 0x65,
+	0x72, 0x66, 0x6c, 0x6f, 0x77, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x2f,
+	0x3e, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e
+};
+
+static const unsigned char icon_arrows_down_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x01, 0x7f, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xa5, 0x91, 0xcd, 0x2b, 0x44,
+	0x51, 0x18, 0xc6, 0x7f, 0xe7, 0xdc, 0x7b, 0x67, 0x06, 0xd3, 0x28, 0x0d, 0x2b, 0x59, 0x28, 0x0b,
+	0x91, 0x9d, 0x84, 0x62, 0x33, 0xdc, 0x99, 0x6e, 0x96, 0xfe, 0x00, 0x49, 0x64, 0x61, 0x37, 0x3b,
+	0x0b, 0x3b, 0x31, 0xb1, 0x91, 0xb2, 0xb2, 0x51, 0x2c, 0x44, 0xc9, 0xe7, 0xcc, 0x02, 0x49, 0x49,
+	0x0a, 0x0b, 0x7b, 0x2c, 0x2c, 0x28, 0xe3, 0x26, 0x1f, 0x19, 0xc6, 0xb1, 0x98, 0x70, 0x27, 0x77,
+	0x2e, 0xe5, 0xdd, 0xbd, 0xa7, 0xf3, 0x7b, 0x7a, 0x9e, 0xe7, 0x15, 0xb6, 0x6d, 0xf3, 0x9f, 0xd1,
+	0x9d, 0x8b, 0x19, 0xb7, 0x94, 0xd7, 0xe7, 0xe7, 0x8b, 0x2c, 0x7b, 0x8b, 0x5b, 0xc2, 0xf9, 0x26,
+	0x9d, 0x4b, 0x32, 0xb1, 0x2e, 0x00, 0xaa, 0xfb, 0x2b, 0x99, 0x9a, 0x9e, 0xa4, 0x64, 0x48, 0xa7,
+	0xb8, 0x5b, 0x47, 0xab, 0x15, 0xae, 0x30, 0x80, 0x70, 0x8b, 0x60, 0xc6, 0x2d, 0x55, 0x37, 0x50,
+	0xc3, 0x65, 0xd5, 0x39, 0xcf, 0x73, 0x59, 0x1e, 0x36, 0xdf, 0x5c, 0xe1, 0x3c, 0x01, 0xa7, 0xfd,
+	0xb7, 0x7b, 0x85, 0x1e, 0x12, 0x04, 0xa2, 0x1a, 0x77, 0x33, 0x19, 0x8c, 0x32, 0x89, 0x1e, 0x12,
+	0xae, 0x31, 0xbe, 0x22, 0x7c, 0xda, 0x0f, 0x44, 0x35, 0x06, 0x67, 0x7b, 0xa8, 0x68, 0x0f, 0x73,
+	0x37, 0x93, 0x21, 0x18, 0xd3, 0x09, 0xf5, 0x1a, 0x14, 0xb5, 0x68, 0xae, 0x31, 0x7e, 0x44, 0x30,
+	0xe3, 0x96, 0x0a, 0x44, 0x35, 0x12, 0x5d, 0x09, 0xc6, 0x16, 0x27, 0x48, 0x97, 0x5f, 0xa3, 0xae,
+	0x14, 0xe9, 0xf9, 0x8c, 0x7b, 0x07, 0x4d, 0x7d, 0xad, 0x79, 0xcd, 0x67, 0x1f, 0x14, 0x5a, 0x30,
+	0x67, 0xdf, 0xec, 0xe8, 0x24, 0xb5, 0x94, 0x22, 0x3d, 0x9f, 0xc1, 0x17, 0x96, 0x68, 0xc1, 0x1c,
+	0x2f, 0x9f, 0x04, 0x8f, 0x37, 0xb9, 0x5e, 0x84, 0x6d, 0xdb, 0x98, 0x71, 0x4b, 0x19, 0xcd, 0x12,
+	0x5f, 0xa3, 0xa4, 0xbf, 0x7e, 0x80, 0x9d, 0xe4, 0x3e, 0x27, 0x4b, 0xa7, 0x5f, 0x1d, 0x04, 0x63,
+	0x3a, 0xfe, 0x7a, 0x0d, 0x00, 0x75, 0xa4, 0x48, 0xef, 0x7e, 0xbb, 0xc9, 0x2b, 0xd1, 0x68, 0x96,
+	0xf8, 0xbb, 0x24, 0xa3, 0xa5, 0xe3, 0x2c, 0x6f, 0xaf, 0xb0, 0x31, 0xb1, 0xed, 0x09, 0xff, 0xe8,
+	0xc0, 0x29, 0xb2, 0x16, 0xde, 0x64, 0x78, 0x63, 0x84, 0x63, 0xe3, 0xb0, 0x20, 0x9c, 0x77, 0x85,
+	0xcf, 0x4b, 0xbc, 0x1e, 0xbc, 0xf3, 0xb2, 0xfa, 0x8e, 0x75, 0x16, 0x23, 0x16, 0x89, 0x78, 0xc2,
+	0xae, 0x57, 0x70, 0x3a, 0xf1, 0x35, 0x48, 0xd4, 0x91, 0xe2, 0x76, 0xd9, 0x1d, 0x2e, 0x28, 0xe0,
+	0x14, 0xb9, 0x5f, 0x78, 0x2d, 0x08, 0x7b, 0x0a, 0x00, 0xb4, 0x75, 0x47, 0x95, 0x17, 0xfc, 0xab,
+	0xc0, 0x5f, 0xe6, 0x03, 0x11, 0xe2, 0xce, 0x16, 0xf1, 0xcf, 0x1b, 0x55, 0x00, 0x00, 0x00, 0x00,
+	0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_arrows_down_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x68,
+	0x65, 0x76, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22,
+	0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x37, 0x39, 0x64, 0x38, 0x37, 0x33, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x62, 0x32, 0x34, 0x61, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x32, 0x63, 0x38, 0x36, 0x33, 0x36, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x30, 0x2e, 0x35,
+	0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x36, 0x20,
+	0x37, 0x2e, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x20, 0x37, 0x2e, 0x31, 0x20, 0x4c,
+	0x20, 0x38, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x63, 0x68, 0x65, 0x76, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x32, 0x34, 0x35, 0x62, 0x32, 0x62, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69,
+	0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x31, 0x31, 0x2e,
+	0x32, 0x35, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x30, 0x38, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x3d, 0x22, 0x23, 0x64, 0x33, 0x66, 0x35, 0x63, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20,
+	0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x32, 0x2e, 0x34, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+	0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x34, 0x20, 0x33, 0x2e, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x33,
+	0x2e, 0x36, 0x20, 0x33, 0x2e, 0x39, 0x20, 0x4c, 0x20, 0x38, 0x20, 0x39, 0x2e, 0x37, 0x20, 0x5a,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x63, 0x68, 0x65,
+	0x76, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x32, 0x34, 0x35,
+	0x62, 0x32, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20,
+	0x33, 0x2e, 0x34, 0x20, 0x36, 0x2e, 0x38, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x32, 0x20, 0x38, 0x2e,
+	0x30, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x64, 0x33, 0x66, 0x35, 0x63, 0x66, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30,
+	0x2e, 0x37, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x37,
+	0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61,
+	0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x33, 0x2e, 0x38, 0x20, 0x30, 0x2e, 0x37,
+	0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x20, 0x30, 0x2e, 0x37, 0x20, 0x4c, 0x20, 0x38, 0x20,
+	0x35, 0x2e, 0x37, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c,
+	0x28, 0x23, 0x63, 0x68, 0x65, 0x76, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x32, 0x34, 0x35, 0x62, 0x32, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x34, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x4c, 0x20, 0x35,
+	0x2e, 0x39, 0x20, 0x34, 0x2e, 0x33, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f,
+	0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x64, 0x33, 0x66,
+	0x35, 0x63, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69,
+	0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a,
+	0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_arrows_up_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x01, 0x63, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xa5, 0x92, 0xbf, 0x4b, 0x42,
+	0x51, 0x18, 0x86, 0xdf, 0x73, 0xaf, 0x1e, 0xb3, 0xc4, 0xf0, 0x16, 0x35, 0x14, 0xf4, 0x6b, 0xd5,
+	0x36, 0x87, 0x96, 0x4b, 0x93, 0x9d, 0x88, 0x96, 0xe2, 0x0c, 0x09, 0x36, 0xd6, 0x6d, 0x0e, 0x09,
+	0x6a, 0x8a, 0xa2, 0xa0, 0x96, 0xc6, 0xa6, 0x88, 0xc6, 0xa0, 0x29, 0xc4, 0x6b, 0x4a, 0x51, 0x7f,
+	0x83, 0x4d, 0x6e, 0x4e, 0x41, 0x11, 0x17, 0x71, 0xd0, 0xf2, 0x78, 0x1a, 0x4a, 0x52, 0xee, 0xb9,
+	0x16, 0xf5, 0xcd, 0xe7, 0x7d, 0xce, 0xfb, 0x7c, 0x7c, 0xc4, 0x71, 0x1c, 0xfc, 0x67, 0xb4, 0x9f,
+	0x1e, 0x98, 0x9c, 0xc9, 0x3f, 0x03, 0x4c, 0xce, 0x64, 0x78, 0xc5, 0x8f, 0xb9, 0xf4, 0x82, 0x27,
+	0xc4, 0x13, 0x60, 0x72, 0x26, 0x07, 0x96, 0x28, 0xe8, 0xb4, 0x06, 0xff, 0x8c, 0xe6, 0x09, 0x51,
+	0x02, 0x4c, 0xce, 0xa4, 0x31, 0x4b, 0x81, 0x29, 0x82, 0xed, 0xd8, 0x0e, 0x68, 0xdc, 0x1b, 0xe2,
+	0x02, 0xb4, 0xc2, 0x24, 0x4e, 0x00, 0x00, 0xd9, 0x42, 0x01, 0x99, 0x68, 0x16, 0x81, 0x45, 0x35,
+	0x44, 0xeb, 0x16, 0xae, 0x17, 0x05, 0xf2, 0x27, 0x0f, 0xd8, 0xcd, 0xed, 0xe3, 0xb0, 0xff, 0x48,
+	0x09, 0xd1, 0xba, 0x85, 0xab, 0xd9, 0x06, 0x22, 0x16, 0xc5, 0xdd, 0xd5, 0x3d, 0xce, 0x6e, 0x2f,
+	0xb0, 0x36, 0x68, 0xb9, 0x74, 0x88, 0xe3, 0x38, 0x30, 0x39, 0x93, 0x7d, 0x43, 0x3e, 0x34, 0x7b,
+	0x3f, 0xc1, 0xa2, 0x2a, 0xf1, 0xf6, 0xd2, 0x84, 0x91, 0xa4, 0x48, 0x2c, 0x27, 0x90, 0xcb, 0xdf,
+	0xa0, 0x66, 0x0b, 0x88, 0xaa, 0x84, 0x1e, 0x22, 0x1d, 0xca, 0x44, 0x75, 0x48, 0x26, 0x67, 0xd2,
+	0x48, 0x52, 0x90, 0x11, 0x02, 0xe3, 0x79, 0x18, 0x5b, 0x7c, 0x13, 0xe9, 0xeb, 0x34, 0x6a, 0xb6,
+	0x40, 0xee, 0x38, 0xd3, 0x41, 0x50, 0x2f, 0xf1, 0x2b, 0x5c, 0x2f, 0x0a, 0x94, 0xce, 0xcb, 0xd8,
+	0xbb, 0x3c, 0xc0, 0x2a, 0x4b, 0xa1, 0x87, 0xe9, 0xae, 0x25, 0x76, 0x34, 0x30, 0x39, 0x93, 0xc1,
+	0x71, 0x1d, 0x00, 0xd0, 0xa8, 0x48, 0xbc, 0xbf, 0x36, 0x11, 0xb1, 0x28, 0x6a, 0xb6, 0x40, 0xa3,
+	0x22, 0xe1, 0x0b, 0x7f, 0x7f, 0xde, 0x6a, 0xa2, 0x54, 0x68, 0xc1, 0x42, 0xf3, 0x3e, 0x04, 0x53,
+	0x3a, 0xc6, 0xca, 0x13, 0x78, 0x3c, 0x2d, 0xb9, 0xea, 0x2b, 0x15, 0xda, 0xc3, 0x81, 0xa8, 0x0e,
+	0xf9, 0x04, 0x58, 0xb1, 0x0d, 0x4c, 0xae, 0x8f, 0x2a, 0x0f, 0xc9, 0xd5, 0xa0, 0x5d, 0xc3, 0x6b,
+	0xda, 0x9b, 0x78, 0x2a, 0xfc, 0x76, 0x3e, 0x00, 0x49, 0x96, 0x98, 0xb9, 0x1b, 0x99, 0x25, 0xfd,
+	0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_arrows_up_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x68,
+	0x65, 0x76, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22,
+	0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x37, 0x39, 0x64, 0x38, 0x37, 0x33, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x62, 0x32, 0x34, 0x61, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x32, 0x63, 0x38, 0x36, 0x33, 0x36, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x30, 0x2e, 0x35,
+	0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x36, 0x20,
+	0x38, 0x2e, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x20, 0x38, 0x2e, 0x39, 0x20, 0x4c,
+	0x20, 0x38, 0x20, 0x30, 0x2e, 0x36, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x75, 0x72, 0x6c, 0x28, 0x23, 0x63, 0x68, 0x65, 0x76, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x3d, 0x22, 0x23, 0x32, 0x34, 0x35, 0x62, 0x32, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e,
+	0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x34, 0x2e, 0x37, 0x35,
+	0x20, 0x4c, 0x20, 0x34, 0x2e, 0x33, 0x20, 0x32, 0x2e, 0x39, 0x32, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x64, 0x33, 0x66, 0x35, 0x63, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x6f, 0x70, 0x61,
+	0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e,
+	0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x20, 0x32, 0x2e, 0x34, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+	0x30, 0x30, 0x30, 0x34, 0x20, 0x31, 0x32, 0x2e, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x36,
+	0x20, 0x31, 0x32, 0x2e, 0x31, 0x20, 0x4c, 0x20, 0x38, 0x20, 0x36, 0x2e, 0x33, 0x20, 0x5a, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x63, 0x68, 0x65, 0x76,
+	0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x32, 0x34, 0x35, 0x62,
+	0x32, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68,
+	0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c,
+	0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x33,
+	0x2e, 0x34, 0x20, 0x39, 0x2e, 0x32, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x32, 0x20, 0x37, 0x2e, 0x39,
+	0x32, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x64, 0x33, 0x66, 0x35, 0x63, 0x66, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e,
+	0x37, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x35,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70,
+	0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x33, 0x2e, 0x38, 0x20, 0x31, 0x35, 0x2e, 0x33,
+	0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x20, 0x4c, 0x20, 0x38,
+	0x20, 0x31, 0x30, 0x2e, 0x33, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75,
+	0x72, 0x6c, 0x28, 0x23, 0x63, 0x68, 0x65, 0x76, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x3d, 0x22, 0x23, 0x32, 0x34, 0x35, 0x62, 0x32, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d,
+	0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x34, 0x2e, 0x38, 0x20, 0x31, 0x32, 0x2e, 0x38, 0x20,
+	0x4c, 0x20, 0x35, 0x2e, 0x39, 0x20, 0x31, 0x31, 0x2e, 0x37, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x64, 0x33, 0x66, 0x35, 0x63, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63,
+	0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
 };
 
 static const unsigned char icon_chat_png = {
@@ -165,6 +3549,8888 @@
 	0x43, 0x6e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
 };
 
+static const unsigned char icon_client_badguy_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0xb1, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xa5, 0x92, 0xc1,
+	0x4e, 0x13, 0x61, 0x14, 0x85, 0xbf, 0xfb, 0x97, 0xbe, 0x01, 0x11, 0x33, 0x53, 0x81, 0x85, 0xc6,
+	0x68, 0x4c, 0x8c, 0xda, 0x96, 0xf9, 0x0b, 0x2b, 0xe2, 0xc6, 0xc4, 0x47, 0x70, 0xe5, 0xca, 0x85,
+	0x1b, 0x71, 0x43, 0x22, 0x06, 0xc1, 0x18, 0x0d, 0x46, 0x70, 0x47, 0x62, 0x62, 0x5c, 0xc1, 0x0b,
+	0xb8, 0x45, 0x90, 0xc4, 0xcc, 0x90, 0x19, 0x6a, 0x62, 0x7c, 0x04, 0x98, 0xa2, 0x20, 0x3e, 0x40,
+	0x61, 0xe6, 0xba, 0xa1, 0x75, 0x66, 0xda, 0xba, 0xf1, 0xee, 0xee, 0xb9, 0xe7, 0xdc, 0x73, 0xee,
+	0x9f, 0x1f, 0xfe, 0xb3, 0x64, 0xcf, 0x5a, 0x57, 0x38, 0x5d, 0x13, 0xb8, 0xa4, 0xc2, 0x72, 0xc5,
+	0x8f, 0xde, 0x0c, 0x22, 0xb7, 0x3c, 0xef, 0x8a, 0x4a, 0xb2, 0x06, 0x8c, 0x88, 0xb0, 0xe0, 0xf8,
+	0xd1, 0x3b, 0x69, 0xd9, 0xea, 0xaa, 0x22, 0x0f, 0xba, 0x1b, 0x45, 0x5f, 0x38, 0xfe, 0xee, 0xdc,
+	0x00, 0xf1, 0x26, 0x70, 0xfe, 0x0c, 0x4a, 0x52, 0x86, 0xce, 0x19, 0x85, 0x72, 0x96, 0xa8, 0x2a,
+	0x4f, 0x62, 0x5b, 0x7b, 0x99, 0xc5, 0x0e, 0x26, 0x26, 0xae, 0xaa, 0x24, 0x5b, 0x19, 0x31, 0x80,
+	0x96, 0xda, 0x6d, 0x63, 0x34, 0x31, 0x4b, 0xc0, 0x61, 0xc1, 0x70, 0x36, 0xb6, 0xf5, 0xa5, 0x8e,
+	0x73, 0x6a, 0xd2, 0x4f, 0xc0, 0x48, 0xfe, 0x78, 0x99, 0x73, 0x9a, 0xcd, 0x5f, 0x02, 0xf0, 0xa3,
+	0x51, 0xbd, 0x96, 0xa8, 0x6c, 0xf4, 0x90, 0x94, 0x0f, 0x08, 0x77, 0x0a, 0xce, 0x00, 0xf3, 0x6e,
+	0x10, 0x2d, 0x02, 0x48, 0x07, 0x89, 0x27, 0xab, 0x97, 0x49, 0x65, 0x13, 0x70, 0x8a, 0xf7, 0x17,
+	0x9c, 0x17, 0x5c, 0x3f, 0x7c, 0xd6, 0x6d, 0xb3, 0xb3, 0x3e, 0x0f, 0x55, 0xac, 0x45, 0x37, 0x88,
+	0xe6, 0x73, 0xfb, 0x8a, 0x8c, 0x7d, 0x5b, 0xbf, 0x2b, 0xe8, 0xc7, 0x1e, 0xa9, 0xb2, 0xe3, 0xee,
+	0x44, 0xb6, 0x08, 0x9b, 0x6c, 0xb3, 0x67, 0x6f, 0x5e, 0x14, 0x74, 0xb5, 0x7f, 0x74, 0xbc, 0xd8,
+	0xd6, 0x5e, 0xf7, 0xc2, 0x9d, 0xf8, 0x8d, 0x1b, 0x63, 0xaa, 0x43, 0x9f, 0x81, 0xf1, 0x01, 0xf1,
+	0xcf, 0x04, 0xb2, 0xe2, 0x04, 0xe1, 0x4c, 0x2e, 0xc1, 0x81, 0xe7, 0x8d, 0xab, 0x96, 0xb7, 0xfb,
+	0x88, 0xd7, 0x81, 0xdf, 0xf9, 0x4b, 0xf4, 0x51, 0xab, 0x51, 0xed, 0xfe, 0x56, 0xd3, 0x9a, 0xba,
+	0x35, 0x9a, 0x4a, 0xb2, 0x05, 0x3a, 0x96, 0x27, 0xf2, 0xd6, 0x09, 0xa2, 0x7b, 0xa0, 0xb7, 0x81,
+	0xe3, 0xdc, 0x4c, 0x65, 0x26, 0xf6, 0x6a, 0xaf, 0x00, 0x24, 0xb6, 0xf5, 0xf7, 0xa0, 0xf7, 0xff,
+	0x15, 0x73, 0x7f, 0xaa, 0x7e, 0x5d, 0x52, 0xdd, 0x40, 0x19, 0xce, 0xd0, 0xd2, 0xf2, 0x29, 0xae,
+	0x51, 0x38, 0xc9, 0x89, 0x45, 0x97, 0xb3, 0x62, 0x80, 0xca, 0x97, 0xf0, 0x5b, 0xaa, 0xe9, 0x34,
+	0x70, 0xf4, 0xd7, 0x84, 0xa4, 0x2d, 0x72, 0x62, 0x94, 0xd2, 0x73, 0x85, 0x6d, 0xe0, 0xa7, 0x0a,
+	0x4f, 0x1d, 0x7f, 0xf7, 0x31, 0x7d, 0xea, 0x42, 0xd0, 0xfc, 0x5e, 0x12, 0x9d, 0x06, 0xbe, 0x02,
+	0x87, 0x08, 0x0f, 0x2b, 0x61, 0x78, 0xfc, 0x07, 0xae, 0x30, 0xa5, 0x14, 0x43, 0xd7, 0x76, 0x1d,
+	0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_badguy_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x35,
+	0x35, 0x2c, 0x2d, 0x31, 0x36, 0x37, 0x37, 0x2e, 0x35, 0x36, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c,
+	0x65, 0x28, 0x32, 0x2e, 0x36, 0x39, 0x37, 0x35, 0x29, 0x22, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x32, 0x39, 0x2c, 0x35, 0x37, 0x2c, 0x35, 0x33,
+	0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x32, 0x35, 0x2e, 0x31, 0x31, 0x20,
+	0x38, 0x39, 0x31, 0x2e, 0x33, 0x36, 0x37, 0x20, 0x43, 0x20, 0x31, 0x30, 0x33, 0x33, 0x2e, 0x30,
+	0x36, 0x20, 0x38, 0x38, 0x32, 0x2e, 0x39, 0x39, 0x33, 0x20, 0x31, 0x30, 0x34, 0x33, 0x2e, 0x33,
+	0x31, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x31, 0x35, 0x36, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x37,
+	0x36, 0x20, 0x38, 0x36, 0x35, 0x2e, 0x36, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x30, 0x38, 0x30,
+	0x2e, 0x31, 0x20, 0x38, 0x33, 0x36, 0x2e, 0x36, 0x35, 0x31, 0x20, 0x31, 0x31, 0x30, 0x38, 0x2e,
+	0x36, 0x38, 0x20, 0x38, 0x30, 0x37, 0x2e, 0x38, 0x37, 0x32, 0x20, 0x31, 0x31, 0x33, 0x37, 0x2e,
+	0x34, 0x39, 0x20, 0x37, 0x37, 0x39, 0x2e, 0x33, 0x33, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x38,
+	0x36, 0x2e, 0x32, 0x32, 0x20, 0x37, 0x33, 0x30, 0x2e, 0x39, 0x34, 0x31, 0x20, 0x43, 0x20, 0x31,
+	0x32, 0x31, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x37, 0x30, 0x32, 0x2e, 0x33, 0x37, 0x31, 0x20, 0x31,
+	0x32, 0x33, 0x34, 0x2e, 0x35, 0x20, 0x36, 0x37, 0x33, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x32,
+	0x37, 0x37, 0x2e, 0x39, 0x35, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x38, 0x36, 0x38, 0x20, 0x43, 0x20,
+	0x31, 0x33, 0x30, 0x33, 0x2e, 0x31, 0x32, 0x20, 0x36, 0x36, 0x39, 0x2e, 0x33, 0x35, 0x33, 0x20,
+	0x31, 0x33, 0x32, 0x37, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x37, 0x37, 0x2e, 0x38, 0x33, 0x37, 0x20,
+	0x31, 0x33, 0x34, 0x36, 0x2e, 0x38, 0x32, 0x20, 0x36, 0x39, 0x34, 0x2e, 0x34, 0x37, 0x36, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x36, 0x36, 0x2e, 0x35, 0x38, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x31, 0x37,
+	0x35, 0x20, 0x31, 0x33, 0x37, 0x36, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x32, 0x39, 0x31, 0x20, 0x31,
+	0x33, 0x37, 0x37, 0x2e, 0x38, 0x31, 0x20, 0x37, 0x36, 0x31, 0x2e, 0x36, 0x33, 0x32, 0x20, 0x43,
+	0x20, 0x31, 0x33, 0x38, 0x31, 0x2e, 0x35, 0x36, 0x20, 0x38, 0x31, 0x34, 0x2e, 0x33, 0x30, 0x32,
+	0x20, 0x31, 0x33, 0x33, 0x34, 0x2e, 0x36, 0x39, 0x20, 0x38, 0x34, 0x34, 0x2e, 0x38, 0x34, 0x35,
+	0x20, 0x31, 0x33, 0x30, 0x31, 0x2e, 0x38, 0x32, 0x20, 0x38, 0x37, 0x39, 0x2e, 0x31, 0x32, 0x34,
+	0x20, 0x43, 0x20, 0x31, 0x32, 0x37, 0x30, 0x2e, 0x39, 0x37, 0x20, 0x39, 0x31, 0x31, 0x2e, 0x32,
+	0x39, 0x39, 0x20, 0x31, 0x32, 0x33, 0x36, 0x2e, 0x36, 0x34, 0x20, 0x39, 0x34, 0x33, 0x2e, 0x30,
+	0x35, 0x33, 0x20, 0x31, 0x32, 0x30, 0x36, 0x20, 0x39, 0x37, 0x35, 0x2e, 0x37, 0x34, 0x34, 0x20,
+	0x43, 0x20, 0x31, 0x31, 0x39, 0x31, 0x2e, 0x30, 0x39, 0x20, 0x39, 0x39, 0x31, 0x2e, 0x36, 0x35,
+	0x37, 0x20, 0x31, 0x31, 0x37, 0x32, 0x2e, 0x37, 0x38, 0x20, 0x31, 0x30, 0x30, 0x36, 0x2e, 0x35,
+	0x37, 0x20, 0x31, 0x31, 0x35, 0x38, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x37,
+	0x33, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x35, 0x37, 0x2e, 0x35, 0x32, 0x20, 0x31, 0x30, 0x32, 0x33,
+	0x2e, 0x37, 0x37, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x30,
+	0x34, 0x33, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x31, 0x39, 0x35, 0x2e, 0x31, 0x37, 0x20, 0x31, 0x30,
+	0x36, 0x32, 0x2e, 0x34, 0x33, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x30,
+	0x38, 0x31, 0x2e, 0x32, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x30, 0x33, 0x2e, 0x30, 0x31, 0x20,
+	0x31, 0x31, 0x36, 0x39, 0x2e, 0x35, 0x34, 0x20, 0x43, 0x20, 0x31, 0x33, 0x31, 0x36, 0x2e, 0x38,
+	0x33, 0x20, 0x31, 0x31, 0x38, 0x33, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x33, 0x33, 0x31, 0x2e, 0x33,
+	0x39, 0x20, 0x31, 0x31, 0x39, 0x38, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x36,
+	0x38, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x36, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x30, 0x36,
+	0x2e, 0x34, 0x36, 0x20, 0x31, 0x32, 0x36, 0x36, 0x2e, 0x38, 0x36, 0x20, 0x31, 0x33, 0x37, 0x37,
+	0x2e, 0x34, 0x38, 0x20, 0x31, 0x33, 0x36, 0x37, 0x2e, 0x38, 0x36, 0x20, 0x31, 0x32, 0x39, 0x33,
+	0x2e, 0x32, 0x34, 0x20, 0x31, 0x33, 0x37, 0x39, 0x2e, 0x37, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32,
+	0x39, 0x31, 0x2e, 0x33, 0x37, 0x20, 0x31, 0x33, 0x37, 0x39, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x32,
+	0x38, 0x39, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x33, 0x38, 0x30, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x32,
+	0x38, 0x37, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x33, 0x38, 0x30, 0x2e, 0x31, 0x20, 0x43, 0x20, 0x31,
+	0x32, 0x35, 0x39, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x33, 0x38, 0x31, 0x2e, 0x31, 0x33, 0x20, 0x31,
+	0x32, 0x33, 0x37, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x33, 0x37, 0x33, 0x2e, 0x31, 0x31, 0x20, 0x31,
+	0x32, 0x31, 0x38, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x33, 0x35, 0x32, 0x2e, 0x39, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x30, 0x33, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x33, 0x33, 0x37, 0x2e, 0x38, 0x36,
+	0x20, 0x31, 0x31, 0x38, 0x38, 0x2e, 0x33, 0x32, 0x20, 0x31, 0x33, 0x32, 0x32, 0x2e, 0x38, 0x35,
+	0x20, 0x31, 0x31, 0x37, 0x33, 0x2e, 0x34, 0x36, 0x20, 0x31, 0x33, 0x30, 0x38, 0x2e, 0x30, 0x31,
+	0x20, 0x4c, 0x20, 0x31, 0x31, 0x30, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x31, 0x32, 0x34, 0x33, 0x2e,
+	0x32, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x38, 0x30, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x32, 0x31,
+	0x35, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x30, 0x35, 0x32, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x31, 0x38,
+	0x36, 0x2e, 0x36, 0x32, 0x20, 0x31, 0x30, 0x32, 0x34, 0x2e, 0x31, 0x20, 0x31, 0x31, 0x36, 0x30,
+	0x2e, 0x36, 0x32, 0x20, 0x43, 0x20, 0x39, 0x36, 0x30, 0x2e, 0x39, 0x38, 0x36, 0x20, 0x31, 0x32,
+	0x31, 0x39, 0x2e, 0x39, 0x39, 0x20, 0x39, 0x30, 0x30, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x32, 0x38,
+	0x34, 0x2e, 0x34, 0x37, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x37, 0x33, 0x20, 0x31, 0x33, 0x34, 0x34,
+	0x2e, 0x39, 0x32, 0x20, 0x43, 0x20, 0x38, 0x31, 0x36, 0x2e, 0x35, 0x35, 0x37, 0x20, 0x31, 0x33,
+	0x36, 0x36, 0x2e, 0x34, 0x37, 0x20, 0x38, 0x30, 0x33, 0x2e, 0x34, 0x31, 0x38, 0x20, 0x31, 0x33,
+	0x37, 0x38, 0x2e, 0x34, 0x37, 0x20, 0x37, 0x37, 0x30, 0x2e, 0x36, 0x35, 0x31, 0x20, 0x31, 0x33,
+	0x37, 0x39, 0x2e, 0x38, 0x32, 0x20, 0x43, 0x20, 0x37, 0x34, 0x35, 0x2e, 0x32, 0x34, 0x38, 0x20,
+	0x31, 0x33, 0x38, 0x31, 0x2e, 0x30, 0x31, 0x20, 0x37, 0x32, 0x30, 0x2e, 0x34, 0x33, 0x33, 0x20,
+	0x31, 0x33, 0x37, 0x31, 0x2e, 0x39, 0x34, 0x20, 0x37, 0x30, 0x31, 0x2e, 0x37, 0x39, 0x35, 0x20,
+	0x31, 0x33, 0x35, 0x34, 0x2e, 0x36, 0x33, 0x20, 0x43, 0x20, 0x36, 0x38, 0x33, 0x2e, 0x30, 0x35,
+	0x34, 0x20, 0x31, 0x33, 0x33, 0x37, 0x2e, 0x32, 0x35, 0x20, 0x36, 0x37, 0x32, 0x2e, 0x31, 0x32,
+	0x33, 0x20, 0x31, 0x33, 0x31, 0x33, 0x2e, 0x30, 0x34, 0x20, 0x36, 0x37, 0x31, 0x2e, 0x34, 0x38,
+	0x20, 0x31, 0x32, 0x38, 0x37, 0x2e, 0x34, 0x39, 0x20, 0x43, 0x20, 0x36, 0x37, 0x31, 0x2e, 0x30,
+	0x33, 0x38, 0x20, 0x31, 0x32, 0x37, 0x33, 0x2e, 0x35, 0x35, 0x20, 0x36, 0x37, 0x36, 0x2e, 0x35,
+	0x34, 0x35, 0x20, 0x31, 0x32, 0x34, 0x35, 0x2e, 0x33, 0x39, 0x20, 0x36, 0x38, 0x35, 0x2e, 0x35,
+	0x35, 0x20, 0x31, 0x32, 0x33, 0x35, 0x2e, 0x34, 0x35, 0x20, 0x43, 0x20, 0x37, 0x34, 0x39, 0x2e,
+	0x33, 0x34, 0x34, 0x20, 0x31, 0x31, 0x36, 0x35, 0x20, 0x38, 0x32, 0x38, 0x2e, 0x30, 0x36, 0x38,
+	0x20, 0x31, 0x30, 0x39, 0x33, 0x2e, 0x39, 0x34, 0x20, 0x38, 0x39, 0x32, 0x2e, 0x37, 0x32, 0x31,
+	0x20, 0x31, 0x30, 0x32, 0x35, 0x2e, 0x36, 0x35, 0x20, 0x43, 0x20, 0x38, 0x35, 0x32, 0x2e, 0x37,
+	0x30, 0x31, 0x20, 0x39, 0x38, 0x38, 0x2e, 0x36, 0x33, 0x36, 0x20, 0x38, 0x30, 0x39, 0x2e, 0x33,
+	0x36, 0x31, 0x20, 0x39, 0x34, 0x32, 0x2e, 0x34, 0x33, 0x36, 0x20, 0x37, 0x37, 0x30, 0x2e, 0x30,
+	0x30, 0x38, 0x20, 0x39, 0x30, 0x33, 0x2e, 0x35, 0x39, 0x35, 0x20, 0x43, 0x20, 0x37, 0x35, 0x32,
+	0x2e, 0x34, 0x30, 0x33, 0x20, 0x38, 0x38, 0x36, 0x2e, 0x35, 0x35, 0x33, 0x20, 0x37, 0x33, 0x34,
+	0x2e, 0x39, 0x34, 0x20, 0x38, 0x36, 0x39, 0x2e, 0x33, 0x36, 0x34, 0x20, 0x37, 0x31, 0x37, 0x2e,
+	0x36, 0x32, 0x31, 0x20, 0x38, 0x35, 0x32, 0x2e, 0x30, 0x33, 0x31, 0x20, 0x43, 0x20, 0x36, 0x39,
+	0x34, 0x2e, 0x31, 0x37, 0x32, 0x20, 0x38, 0x32, 0x38, 0x2e, 0x37, 0x32, 0x37, 0x20, 0x36, 0x37,
+	0x37, 0x2e, 0x30, 0x38, 0x37, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x36, 0x34, 0x34, 0x20, 0x36, 0x37,
+	0x32, 0x2e, 0x30, 0x37, 0x37, 0x20, 0x37, 0x38, 0x30, 0x2e, 0x37, 0x32, 0x38, 0x20, 0x43, 0x20,
+	0x36, 0x36, 0x38, 0x2e, 0x34, 0x38, 0x32, 0x20, 0x37, 0x35, 0x34, 0x2e, 0x37, 0x39, 0x35, 0x20,
+	0x36, 0x37, 0x35, 0x2e, 0x33, 0x37, 0x31, 0x20, 0x37, 0x32, 0x38, 0x2e, 0x34, 0x39, 0x39, 0x20,
+	0x36, 0x39, 0x31, 0x2e, 0x32, 0x31, 0x39, 0x20, 0x37, 0x30, 0x37, 0x2e, 0x36, 0x35, 0x39, 0x20,
+	0x43, 0x20, 0x37, 0x30, 0x37, 0x2e, 0x33, 0x31, 0x38, 0x20, 0x36, 0x38, 0x36, 0x2e, 0x36, 0x34,
+	0x32, 0x20, 0x37, 0x33, 0x30, 0x2e, 0x31, 0x32, 0x37, 0x20, 0x36, 0x37, 0x34, 0x2e, 0x38, 0x35,
+	0x34, 0x20, 0x37, 0x35, 0x36, 0x2e, 0x30, 0x36, 0x38, 0x20, 0x36, 0x37, 0x31, 0x2e, 0x33, 0x34,
+	0x20, 0x43, 0x20, 0x37, 0x35, 0x39, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x36, 0x37, 0x31, 0x2e, 0x31,
+	0x32, 0x34, 0x20, 0x37, 0x36, 0x32, 0x2e, 0x30, 0x32, 0x36, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x39,
+	0x39, 0x33, 0x20, 0x37, 0x36, 0x35, 0x2e, 0x30, 0x31, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x39, 0x34,
+	0x38, 0x20, 0x43, 0x20, 0x37, 0x39, 0x33, 0x2e, 0x31, 0x39, 0x34, 0x20, 0x36, 0x37, 0x30, 0x2e,
+	0x37, 0x39, 0x36, 0x20, 0x38, 0x31, 0x34, 0x2e, 0x32, 0x39, 0x37, 0x20, 0x36, 0x38, 0x31, 0x2e,
+	0x37, 0x38, 0x36, 0x20, 0x38, 0x33, 0x33, 0x2e, 0x32, 0x37, 0x34, 0x20, 0x37, 0x30, 0x31, 0x2e,
+	0x37, 0x31, 0x37, 0x20, 0x43, 0x20, 0x38, 0x34, 0x35, 0x2e, 0x33, 0x32, 0x32, 0x20, 0x37, 0x31,
+	0x34, 0x2e, 0x33, 0x37, 0x31, 0x20, 0x38, 0x35, 0x38, 0x2e, 0x35, 0x35, 0x20, 0x37, 0x32, 0x37,
+	0x2e, 0x32, 0x38, 0x38, 0x20, 0x38, 0x37, 0x31, 0x2e, 0x30, 0x36, 0x39, 0x20, 0x37, 0x33, 0x39,
+	0x2e, 0x35, 0x30, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x32, 0x35, 0x2e, 0x31, 0x31, 0x20, 0x38,
+	0x39, 0x31, 0x2e, 0x33, 0x36, 0x37, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x67, 0x3e,
+	0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_client_commentonly_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x84, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x90, 0x3d,
+	0x4b, 0xc3, 0x50, 0x14, 0x86, 0xdf, 0x73, 0x13, 0x53, 0x6b, 0x52, 0x2b, 0xa8, 0x14, 0xa9, 0x41,
+	0x05, 0x3f, 0x3a, 0x88, 0xd4, 0x22, 0x38, 0x15, 0x17, 0xc5, 0x3f, 0xa1, 0x20, 0xae, 0x6e, 0x05,
+	0x05, 0xc1, 0x41, 0xdc, 0xc5, 0x3f, 0xa0, 0x20, 0xf8, 0x07, 0x1c, 0x75, 0x71, 0x71, 0xf6, 0x03,
+	0x75, 0x69, 0x45, 0x6c, 0xc1, 0x0e, 0xd5, 0x8a, 0xa5, 0xb1, 0x5f, 0x69, 0x72, 0xaf, 0x8b, 0x8d,
+	0x09, 0x8d, 0xba, 0xe9, 0xbb, 0xdc, 0x73, 0x5e, 0x38, 0xcf, 0x79, 0xef, 0x01, 0xfe, 0x5b, 0xe4,
+	0x6e, 0x36, 0x52, 0xa9, 0xcd, 0x5c, 0x3e, 0x7f, 0x3d, 0xac, 0xeb, 0x4b, 0xf7, 0x99, 0xcc, 0xfe,
+	0x68, 0x2c, 0xb6, 0xc8, 0x00, 0x33, 0xf7, 0xf8, 0x78, 0x3e, 0x3c, 0x32, 0xb2, 0xfa, 0x90, 0xcd,
+	0x1e, 0xe9, 0xd1, 0xe8, 0xcc, 0xee, 0xde, 0xde, 0x4e, 0x6b, 0x46, 0x6e, 0x15, 0xf1, 0xd9, 0x85,
+	0xb1, 0x67, 0x33, 0xb8, 0x5e, 0x97, 0xfb, 0x2a, 0xa2, 0x3b, 0x3a, 0x68, 0xb0, 0x42, 0xb2, 0xcc,
+	0xb5, 0x5e, 0xcb, 0xb2, 0x79, 0x89, 0xc2, 0x2b, 0xb6, 0x36, 0xa0, 0xbf, 0xe3, 0x2d, 0x59, 0xe2,
+	0xaa, 0x36, 0x31, 0x99, 0x38, 0x4e, 0xdf, 0x5d, 0xde, 0x78, 0x12, 0xcc, 0x2d, 0x6f, 0x5d, 0x28,
+	0x6a, 0x4f, 0x82, 0x88, 0x41, 0x52, 0x3a, 0x61, 0xd7, 0x2b, 0x20, 0x49, 0x02, 0xe7, 0x1c, 0x44,
+	0x02, 0x92, 0xa2, 0xc2, 0x36, 0xab, 0x20, 0x62, 0x68, 0x56, 0xcb, 0xb7, 0x67, 0x87, 0xdb, 0x53,
+	0x9e, 0x04, 0x4a, 0x50, 0x0b, 0x0d, 0x4c, 0x2f, 0x82, 0x88, 0x81, 0xdb, 0x4d, 0x30, 0x59, 0x01,
+	0xb7, 0x9b, 0x00, 0x00, 0xc6, 0x64, 0x70, 0x6e, 0x39, 0x6f, 0xe1, 0xea, 0x24, 0xd4, 0xf6, 0x05,
+	0x00, 0x20, 0x26, 0xc1, 0x6a, 0x54, 0x00, 0x21, 0xc0, 0x2d, 0xd3, 0xf1, 0x39, 0x1a, 0x00, 0x00,
+	0x41, 0x4d, 0x48, 0x81, 0x2e, 0xcf, 0x11, 0x3d, 0x00, 0x00, 0xb0, 0x6a, 0x06, 0x84, 0x10, 0xfe,
+	0x17, 0x27, 0xfa, 0x01, 0x20, 0x04, 0x01, 0x80, 0x55, 0xaf, 0x40, 0x08, 0xee, 0x0f, 0x00, 0x01,
+	0x3d, 0x5e, 0xef, 0x0b, 0x40, 0x24, 0x00, 0x40, 0xee, 0x54, 0xbf, 0x4f, 0xc0, 0x58, 0x9b, 0xe7,
+	0x4e, 0xf0, 0x09, 0x08, 0x01, 0xf0, 0x07, 0x80, 0xa8, 0xcd, 0x72, 0x00, 0xad, 0xad, 0x0d, 0xa3,
+	0xe8, 0x39, 0xa0, 0x5b, 0x52, 0x47, 0x00, 0x72, 0x40, 0xf5, 0x07, 0x98, 0xd5, 0x52, 0x1e, 0xc0,
+	0xb8, 0xda, 0x3f, 0xe4, 0xbf, 0xdd, 0xa5, 0x46, 0xf9, 0xf5, 0xc9, 0x09, 0xd5, 0x2a, 0x22, 0x91,
+	0x88, 0x3a, 0x14, 0x9f, 0x5f, 0x63, 0x4a, 0x30, 0xfc, 0xd3, 0xb0, 0x65, 0xd6, 0x5e, 0x8c, 0x8b,
+	0xd3, 0x83, 0x74, 0xb1, 0x68, 0xfc, 0xba, 0xe9, 0x4f, 0xf4, 0x01, 0xa4, 0xa5, 0x8f, 0x16, 0xbb,
+	0x0f, 0x60, 0x50, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_commentonly_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x32, 0x2c, 0x32,
+	0x38, 0x2c, 0x32, 0x38, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x34, 0x37, 0x34,
+	0x2e, 0x39, 0x39, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x36, 0x35, 0x20, 0x43, 0x20, 0x31, 0x34, 0x37,
+	0x34, 0x2e, 0x37, 0x35, 0x20, 0x33, 0x39, 0x34, 0x2e, 0x33, 0x39, 0x32, 0x20, 0x31, 0x34, 0x36,
+	0x38, 0x2e, 0x33, 0x38, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x39, 0x32, 0x35, 0x20, 0x31, 0x34, 0x39,
+	0x36, 0x2e, 0x32, 0x20, 0x33, 0x32, 0x36, 0x2e, 0x30, 0x38, 0x39, 0x20, 0x43, 0x20, 0x31, 0x35,
+	0x31, 0x31, 0x2e, 0x33, 0x39, 0x20, 0x33, 0x31, 0x30, 0x2e, 0x32, 0x38, 0x33, 0x20, 0x31, 0x35,
+	0x33, 0x32, 0x2e, 0x33, 0x34, 0x20, 0x33, 0x30, 0x31, 0x2e, 0x33, 0x31, 0x34, 0x20, 0x31, 0x35,
+	0x35, 0x34, 0x2e, 0x32, 0x37, 0x20, 0x33, 0x30, 0x31, 0x2e, 0x32, 0x33, 0x32, 0x20, 0x43, 0x20,
+	0x31, 0x35, 0x37, 0x36, 0x2e, 0x37, 0x39, 0x20, 0x33, 0x30, 0x30, 0x2e, 0x39, 0x36, 0x32, 0x20,
+	0x31, 0x35, 0x39, 0x35, 0x2e, 0x30, 0x36, 0x20, 0x33, 0x30, 0x39, 0x2e, 0x32, 0x30, 0x31, 0x20,
+	0x31, 0x36, 0x31, 0x31, 0x2e, 0x32, 0x20, 0x33, 0x32, 0x34, 0x2e, 0x37, 0x39, 0x31, 0x20, 0x43,
+	0x20, 0x31, 0x36, 0x34, 0x31, 0x2e, 0x37, 0x37, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x33, 0x32, 0x35,
+	0x20, 0x31, 0x36, 0x33, 0x34, 0x2e, 0x39, 0x31, 0x20, 0x33, 0x39, 0x36, 0x2e, 0x30, 0x34, 0x37,
+	0x20, 0x31, 0x36, 0x33, 0x35, 0x2e, 0x31, 0x33, 0x20, 0x34, 0x33, 0x36, 0x2e, 0x32, 0x34, 0x34,
+	0x20, 0x43, 0x20, 0x31, 0x36, 0x37, 0x36, 0x2e, 0x30, 0x31, 0x20, 0x34, 0x34, 0x37, 0x2e, 0x35,
+	0x33, 0x20, 0x31, 0x37, 0x30, 0x35, 0x2e, 0x35, 0x34, 0x20, 0x34, 0x36, 0x38, 0x2e, 0x33, 0x32,
+	0x37, 0x20, 0x31, 0x37, 0x33, 0x30, 0x2e, 0x32, 0x37, 0x20, 0x35, 0x30, 0x33, 0x2e, 0x30, 0x38,
+	0x32, 0x20, 0x43, 0x20, 0x31, 0x37, 0x36, 0x32, 0x2e, 0x34, 0x38, 0x20, 0x35, 0x34, 0x38, 0x2e,
+	0x33, 0x35, 0x32, 0x20, 0x31, 0x37, 0x35, 0x38, 0x2e, 0x35, 0x34, 0x20, 0x35, 0x39, 0x34, 0x2e,
+	0x34, 0x31, 0x35, 0x20, 0x31, 0x37, 0x35, 0x38, 0x2e, 0x37, 0x39, 0x20, 0x36, 0x34, 0x36, 0x2e,
+	0x37, 0x33, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x37, 0x35, 0x38, 0x2e, 0x39, 0x33, 0x20, 0x37, 0x38,
+	0x34, 0x2e, 0x38, 0x36, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x37, 0x35, 0x38, 0x2e, 0x39, 0x35, 0x20,
+	0x31, 0x32, 0x35, 0x37, 0x2e, 0x35, 0x20, 0x4c, 0x20, 0x31, 0x37, 0x35, 0x38, 0x2e, 0x38, 0x33,
+	0x20, 0x31, 0x34, 0x36, 0x36, 0x2e, 0x38, 0x35, 0x20, 0x43, 0x20, 0x31, 0x37, 0x35, 0x38, 0x2e,
+	0x37, 0x37, 0x20, 0x31, 0x34, 0x39, 0x34, 0x2e, 0x32, 0x39, 0x20, 0x31, 0x37, 0x36, 0x30, 0x2e,
+	0x35, 0x20, 0x31, 0x35, 0x34, 0x33, 0x2e, 0x31, 0x36, 0x20, 0x31, 0x37, 0x35, 0x37, 0x2e, 0x37,
+	0x36, 0x20, 0x31, 0x35, 0x36, 0x37, 0x2e, 0x39, 0x31, 0x20, 0x43, 0x20, 0x31, 0x37, 0x35, 0x36,
+	0x2e, 0x30, 0x34, 0x20, 0x31, 0x35, 0x38, 0x34, 0x2e, 0x39, 0x39, 0x20, 0x31, 0x37, 0x35, 0x31,
+	0x2e, 0x35, 0x33, 0x20, 0x31, 0x36, 0x30, 0x31, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x37, 0x34, 0x34,
+	0x2e, 0x34, 0x31, 0x20, 0x31, 0x36, 0x31, 0x37, 0x2e, 0x33, 0x20, 0x43, 0x20, 0x31, 0x37, 0x32,
+	0x36, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x36, 0x35, 0x37, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x36, 0x39,
+	0x33, 0x2e, 0x30, 0x39, 0x20, 0x31, 0x36, 0x38, 0x38, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x36, 0x35,
+	0x32, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x37, 0x30, 0x33, 0x2e, 0x38, 0x31, 0x20, 0x43, 0x20, 0x31,
+	0x36, 0x31, 0x33, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x37, 0x31, 0x37, 0x2e, 0x38, 0x38, 0x20, 0x31,
+	0x35, 0x36, 0x37, 0x2e, 0x37, 0x35, 0x20, 0x31, 0x37, 0x31, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x31,
+	0x35, 0x32, 0x36, 0x2e, 0x38, 0x39, 0x20, 0x31, 0x37, 0x31, 0x33, 0x2e, 0x37, 0x36, 0x20, 0x4c,
+	0x20, 0x31, 0x33, 0x38, 0x35, 0x2e, 0x37, 0x33, 0x20, 0x31, 0x37, 0x31, 0x33, 0x2e, 0x37, 0x33,
+	0x20, 0x4c, 0x20, 0x39, 0x36, 0x35, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x37, 0x31, 0x33, 0x2e, 0x36,
+	0x34, 0x20, 0x4c, 0x20, 0x36, 0x31, 0x38, 0x2e, 0x30, 0x32, 0x39, 0x20, 0x31, 0x37, 0x31, 0x33,
+	0x2e, 0x36, 0x37, 0x20, 0x4c, 0x20, 0x35, 0x31, 0x30, 0x2e, 0x31, 0x35, 0x31, 0x20, 0x31, 0x37,
+	0x31, 0x33, 0x2e, 0x38, 0x20, 0x43, 0x20, 0x34, 0x38, 0x39, 0x2e, 0x31, 0x30, 0x35, 0x20, 0x31,
+	0x37, 0x31, 0x33, 0x2e, 0x38, 0x33, 0x20, 0x34, 0x36, 0x38, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x37,
+	0x31, 0x34, 0x2e, 0x32, 0x31, 0x20, 0x34, 0x34, 0x37, 0x2e, 0x31, 0x36, 0x32, 0x20, 0x31, 0x37,
+	0x31, 0x33, 0x2e, 0x32, 0x37, 0x20, 0x43, 0x20, 0x33, 0x36, 0x33, 0x2e, 0x39, 0x38, 0x36, 0x20,
+	0x31, 0x37, 0x30, 0x39, 0x2e, 0x36, 0x32, 0x20, 0x32, 0x39, 0x36, 0x2e, 0x34, 0x35, 0x37, 0x20,
+	0x31, 0x36, 0x34, 0x30, 0x2e, 0x36, 0x32, 0x20, 0x32, 0x39, 0x33, 0x2e, 0x30, 0x34, 0x33, 0x20,
+	0x31, 0x35, 0x35, 0x37, 0x2e, 0x37, 0x37, 0x20, 0x43, 0x20, 0x32, 0x39, 0x32, 0x2e, 0x32, 0x31,
+	0x34, 0x20, 0x31, 0x35, 0x33, 0x37, 0x2e, 0x36, 0x35, 0x20, 0x32, 0x39, 0x32, 0x2e, 0x38, 0x30,
+	0x32, 0x20, 0x31, 0x35, 0x31, 0x36, 0x2e, 0x39, 0x35, 0x20, 0x32, 0x39, 0x32, 0x2e, 0x38, 0x33,
+	0x35, 0x20, 0x31, 0x34, 0x39, 0x36, 0x2e, 0x37, 0x32, 0x20, 0x4c, 0x20, 0x32, 0x39, 0x32, 0x2e,
+	0x39, 0x30, 0x38, 0x20, 0x31, 0x33, 0x38, 0x35, 0x2e, 0x38, 0x20, 0x4c, 0x20, 0x32, 0x39, 0x32,
+	0x2e, 0x37, 0x34, 0x35, 0x20, 0x31, 0x30, 0x32, 0x38, 0x2e, 0x30, 0x33, 0x20, 0x4c, 0x20, 0x32,
+	0x39, 0x32, 0x2e, 0x38, 0x32, 0x32, 0x20, 0x37, 0x34, 0x31, 0x2e, 0x31, 0x32, 0x38, 0x20, 0x4c,
+	0x20, 0x32, 0x39, 0x32, 0x2e, 0x35, 0x38, 0x31, 0x20, 0x36, 0x34, 0x31, 0x2e, 0x38, 0x33, 0x20,
+	0x43, 0x20, 0x32, 0x39, 0x32, 0x2e, 0x35, 0x33, 0x37, 0x20, 0x36, 0x32, 0x33, 0x2e, 0x39, 0x37,
+	0x36, 0x20, 0x32, 0x39, 0x31, 0x2e, 0x38, 0x35, 0x39, 0x20, 0x36, 0x30, 0x31, 0x2e, 0x33, 0x32,
+	0x32, 0x20, 0x32, 0x39, 0x33, 0x2e, 0x30, 0x38, 0x37, 0x20, 0x35, 0x38, 0x33, 0x2e, 0x39, 0x34,
+	0x34, 0x20, 0x43, 0x20, 0x32, 0x39, 0x34, 0x2e, 0x36, 0x38, 0x36, 0x20, 0x35, 0x36, 0x32, 0x2e,
+	0x39, 0x38, 0x31, 0x20, 0x33, 0x30, 0x30, 0x2e, 0x32, 0x35, 0x36, 0x20, 0x35, 0x34, 0x32, 0x2e,
+	0x35, 0x31, 0x34, 0x20, 0x33, 0x30, 0x39, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x35, 0x32, 0x33, 0x2e,
+	0x36, 0x33, 0x32, 0x20, 0x43, 0x20, 0x33, 0x32, 0x35, 0x2e, 0x36, 0x39, 0x38, 0x20, 0x34, 0x39,
+	0x30, 0x2e, 0x32, 0x34, 0x35, 0x20, 0x33, 0x35, 0x32, 0x2e, 0x38, 0x38, 0x20, 0x34, 0x36, 0x33,
+	0x2e, 0x34, 0x34, 0x31, 0x20, 0x33, 0x38, 0x36, 0x2e, 0x34, 0x39, 0x20, 0x34, 0x34, 0x37, 0x2e,
+	0x37, 0x31, 0x32, 0x20, 0x43, 0x20, 0x33, 0x39, 0x35, 0x2e, 0x35, 0x34, 0x38, 0x20, 0x34, 0x34,
+	0x33, 0x2e, 0x35, 0x32, 0x32, 0x20, 0x34, 0x30, 0x37, 0x2e, 0x35, 0x39, 0x20, 0x34, 0x33, 0x39,
+	0x2e, 0x35, 0x37, 0x36, 0x20, 0x34, 0x31, 0x37, 0x2e, 0x31, 0x35, 0x36, 0x20, 0x34, 0x33, 0x36,
+	0x2e, 0x32, 0x33, 0x20, 0x43, 0x20, 0x34, 0x32, 0x30, 0x2e, 0x38, 0x30, 0x36, 0x20, 0x33, 0x39,
+	0x38, 0x2e, 0x34, 0x36, 0x38, 0x20, 0x34, 0x30, 0x38, 0x2e, 0x36, 0x38, 0x38, 0x20, 0x33, 0x35,
+	0x39, 0x2e, 0x35, 0x30, 0x34, 0x20, 0x34, 0x33, 0x36, 0x2e, 0x30, 0x39, 0x34, 0x20, 0x33, 0x32,
+	0x39, 0x2e, 0x32, 0x39, 0x38, 0x20, 0x43, 0x20, 0x34, 0x35, 0x33, 0x2e, 0x31, 0x30, 0x34, 0x20,
+	0x33, 0x31, 0x30, 0x2e, 0x35, 0x35, 0x32, 0x20, 0x34, 0x37, 0x32, 0x2e, 0x31, 0x33, 0x39, 0x20,
+	0x33, 0x30, 0x32, 0x2e, 0x39, 0x37, 0x35, 0x20, 0x34, 0x39, 0x36, 0x2e, 0x37, 0x37, 0x36, 0x20,
+	0x33, 0x30, 0x31, 0x2e, 0x34, 0x32, 0x36, 0x20, 0x43, 0x20, 0x35, 0x31, 0x38, 0x2e, 0x39, 0x30,
+	0x39, 0x20, 0x33, 0x30, 0x31, 0x2e, 0x38, 0x38, 0x33, 0x20, 0x35, 0x33, 0x37, 0x2e, 0x30, 0x38,
+	0x32, 0x20, 0x33, 0x30, 0x38, 0x2e, 0x34, 0x39, 0x33, 0x20, 0x35, 0x35, 0x32, 0x2e, 0x39, 0x36,
+	0x36, 0x20, 0x33, 0x32, 0x34, 0x2e, 0x33, 0x34, 0x32, 0x20, 0x43, 0x20, 0x35, 0x38, 0x31, 0x2e,
+	0x35, 0x31, 0x33, 0x20, 0x33, 0x35, 0x32, 0x2e, 0x38, 0x32, 0x38, 0x20, 0x35, 0x37, 0x36, 0x2e,
+	0x30, 0x37, 0x31, 0x20, 0x33, 0x39, 0x34, 0x2e, 0x37, 0x31, 0x20, 0x35, 0x37, 0x36, 0x2e, 0x30,
+	0x32, 0x36, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x34, 0x35, 0x33, 0x20, 0x4c, 0x20, 0x36, 0x32, 0x39,
+	0x2e, 0x35, 0x38, 0x34, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x36, 0x37, 0x38, 0x20, 0x43, 0x20, 0x36,
+	0x33, 0x30, 0x2e, 0x36, 0x30, 0x33, 0x20, 0x33, 0x39, 0x34, 0x2e, 0x30, 0x38, 0x34, 0x20, 0x36,
+	0x32, 0x32, 0x2e, 0x37, 0x31, 0x35, 0x20, 0x33, 0x35, 0x35, 0x2e, 0x38, 0x30, 0x38, 0x20, 0x36,
+	0x35, 0x31, 0x2e, 0x36, 0x31, 0x36, 0x20, 0x33, 0x32, 0x36, 0x2e, 0x37, 0x37, 0x31, 0x20, 0x43,
+	0x20, 0x36, 0x36, 0x37, 0x2e, 0x38, 0x35, 0x38, 0x20, 0x33, 0x31, 0x30, 0x2e, 0x34, 0x35, 0x33,
+	0x20, 0x36, 0x38, 0x36, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x33, 0x30, 0x31, 0x2e, 0x36, 0x37, 0x32,
+	0x20, 0x37, 0x30, 0x39, 0x2e, 0x32, 0x35, 0x39, 0x20, 0x33, 0x30, 0x31, 0x2e, 0x33, 0x38, 0x33,
+	0x20, 0x43, 0x20, 0x37, 0x33, 0x30, 0x2e, 0x32, 0x33, 0x36, 0x20, 0x33, 0x30, 0x30, 0x2e, 0x39,
+	0x35, 0x33, 0x20, 0x37, 0x35, 0x30, 0x2e, 0x34, 0x37, 0x20, 0x33, 0x30, 0x39, 0x2e, 0x31, 0x35,
+	0x36, 0x20, 0x37, 0x36, 0x35, 0x2e, 0x32, 0x32, 0x36, 0x20, 0x33, 0x32, 0x34, 0x2e, 0x30, 0x37,
+	0x32, 0x20, 0x43, 0x20, 0x37, 0x39, 0x35, 0x2e, 0x32, 0x38, 0x31, 0x20, 0x33, 0x35, 0x34, 0x2e,
+	0x31, 0x33, 0x38, 0x20, 0x37, 0x38, 0x39, 0x2e, 0x31, 0x36, 0x36, 0x20, 0x33, 0x39, 0x32, 0x2e,
+	0x39, 0x30, 0x34, 0x20, 0x37, 0x38, 0x39, 0x2e, 0x30, 0x34, 0x20, 0x34, 0x33, 0x33, 0x2e, 0x30,
+	0x31, 0x33, 0x20, 0x4c, 0x20, 0x38, 0x34, 0x31, 0x2e, 0x38, 0x34, 0x35, 0x20, 0x34, 0x33, 0x32,
+	0x2e, 0x39, 0x36, 0x37, 0x20, 0x43, 0x20, 0x38, 0x34, 0x31, 0x2e, 0x39, 0x30, 0x38, 0x20, 0x33,
+	0x39, 0x34, 0x2e, 0x36, 0x36, 0x35, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x38, 0x37, 0x31, 0x20, 0x33,
+	0x35, 0x33, 0x2e, 0x36, 0x36, 0x35, 0x20, 0x38, 0x36, 0x33, 0x2e, 0x35, 0x34, 0x38, 0x20, 0x33,
+	0x32, 0x35, 0x2e, 0x35, 0x33, 0x38, 0x20, 0x43, 0x20, 0x38, 0x37, 0x39, 0x2e, 0x36, 0x37, 0x35,
+	0x20, 0x33, 0x30, 0x39, 0x2e, 0x37, 0x31, 0x39, 0x20, 0x38, 0x39, 0x38, 0x2e, 0x32, 0x38, 0x37,
+	0x20, 0x33, 0x30, 0x31, 0x2e, 0x36, 0x35, 0x32, 0x20, 0x39, 0x32, 0x30, 0x2e, 0x38, 0x36, 0x39,
+	0x20, 0x33, 0x30, 0x31, 0x2e, 0x34, 0x38, 0x20, 0x43, 0x20, 0x39, 0x34, 0x32, 0x2e, 0x32, 0x32,
+	0x31, 0x20, 0x33, 0x30, 0x31, 0x2e, 0x32, 0x36, 0x20, 0x39, 0x36, 0x32, 0x2e, 0x37, 0x35, 0x36,
+	0x20, 0x33, 0x30, 0x39, 0x2e, 0x36, 0x37, 0x35, 0x20, 0x39, 0x37, 0x37, 0x2e, 0x38, 0x31, 0x33,
+	0x20, 0x33, 0x32, 0x34, 0x2e, 0x38, 0x31, 0x36, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e,
+	0x32, 0x37, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x31, 0x37, 0x36, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e,
+	0x31, 0x37, 0x20, 0x33, 0x39, 0x32, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e,
+	0x33, 0x33, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x31, 0x34, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x35,
+	0x31, 0x2e, 0x38, 0x32, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x31, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31,
+	0x30, 0x35, 0x32, 0x2e, 0x32, 0x32, 0x20, 0x33, 0x39, 0x33, 0x2e, 0x32, 0x31, 0x35, 0x20, 0x31,
+	0x30, 0x34, 0x35, 0x2e, 0x34, 0x31, 0x20, 0x33, 0x35, 0x35, 0x2e, 0x31, 0x37, 0x33, 0x20, 0x31,
+	0x30, 0x37, 0x34, 0x2e, 0x34, 0x32, 0x20, 0x33, 0x32, 0x35, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20,
+	0x31, 0x30, 0x38, 0x39, 0x2e, 0x31, 0x32, 0x20, 0x33, 0x31, 0x30, 0x2e, 0x32, 0x35, 0x38, 0x20,
+	0x31, 0x31, 0x30, 0x39, 0x2e, 0x33, 0x31, 0x20, 0x33, 0x30, 0x31, 0x2e, 0x36, 0x35, 0x20, 0x31,
+	0x31, 0x33, 0x30, 0x2e, 0x34, 0x33, 0x20, 0x33, 0x30, 0x31, 0x2e, 0x35, 0x33, 0x38, 0x20, 0x43,
+	0x20, 0x31, 0x31, 0x35, 0x32, 0x2e, 0x34, 0x20, 0x33, 0x30, 0x31, 0x2e, 0x31, 0x35, 0x31, 0x20,
+	0x31, 0x31, 0x37, 0x33, 0x2e, 0x36, 0x31, 0x20, 0x33, 0x30, 0x39, 0x2e, 0x36, 0x31, 0x31, 0x20,
+	0x31, 0x31, 0x38, 0x39, 0x2e, 0x32, 0x38, 0x20, 0x33, 0x32, 0x35, 0x2e, 0x30, 0x31, 0x36, 0x20,
+	0x43, 0x20, 0x31, 0x32, 0x31, 0x38, 0x2e, 0x35, 0x36, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x32, 0x39,
+	0x36, 0x20, 0x31, 0x32, 0x31, 0x32, 0x2e, 0x31, 0x35, 0x20, 0x33, 0x39, 0x33, 0x2e, 0x32, 0x31,
+	0x34, 0x20, 0x31, 0x32, 0x31, 0x32, 0x2e, 0x31, 0x33, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x34, 0x35,
+	0x39, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x39, 0x2e, 0x35, 0x33, 0x20, 0x34, 0x33, 0x32, 0x2e,
+	0x38, 0x37, 0x37, 0x20, 0x31, 0x32, 0x34, 0x38, 0x2e, 0x34, 0x32, 0x20, 0x34, 0x33, 0x32, 0x2e,
+	0x35, 0x30, 0x32, 0x20, 0x31, 0x32, 0x36, 0x35, 0x2e, 0x39, 0x33, 0x20, 0x34, 0x33, 0x32, 0x2e,
+	0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x36, 0x35, 0x2e, 0x38, 0x34, 0x20, 0x33, 0x39, 0x34, 0x2e,
+	0x36, 0x30, 0x36, 0x20, 0x31, 0x32, 0x35, 0x39, 0x2e, 0x38, 0x33, 0x20, 0x33, 0x35, 0x33, 0x2e,
+	0x34, 0x33, 0x37, 0x20, 0x31, 0x32, 0x38, 0x37, 0x2e, 0x35, 0x32, 0x20, 0x33, 0x32, 0x35, 0x2e,
+	0x31, 0x35, 0x37, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x32, 0x2e, 0x34, 0x31, 0x20, 0x33, 0x31,
+	0x30, 0x2e, 0x31, 0x36, 0x33, 0x20, 0x31, 0x33, 0x32, 0x32, 0x2e, 0x36, 0x20, 0x33, 0x30, 0x31,
+	0x2e, 0x36, 0x34, 0x31, 0x20, 0x31, 0x33, 0x34, 0x33, 0x2e, 0x37, 0x33, 0x20, 0x33, 0x30, 0x31,
+	0x2e, 0x34, 0x33, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x36, 0x35, 0x2e, 0x33, 0x37, 0x20, 0x33,
+	0x30, 0x31, 0x2e, 0x34, 0x38, 0x34, 0x20, 0x31, 0x33, 0x38, 0x36, 0x2e, 0x31, 0x31, 0x20, 0x33,
+	0x31, 0x30, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x31, 0x34, 0x30, 0x31, 0x2e, 0x33, 0x38, 0x20, 0x33,
+	0x32, 0x35, 0x2e, 0x34, 0x38, 0x20, 0x43, 0x20, 0x31, 0x34, 0x33, 0x30, 0x2e, 0x35, 0x35, 0x20,
+	0x33, 0x35, 0x34, 0x2e, 0x39, 0x37, 0x37, 0x20, 0x31, 0x34, 0x32, 0x34, 0x2e, 0x34, 0x37, 0x20,
+	0x33, 0x39, 0x32, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x34, 0x32, 0x34, 0x2e, 0x33, 0x36, 0x20, 0x34,
+	0x33, 0x32, 0x2e, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x37, 0x34, 0x2e, 0x39, 0x39, 0x20, 0x34,
+	0x33, 0x32, 0x2e, 0x36, 0x35, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39, 0x35, 0x2c, 0x31, 0x35, 0x35, 0x2c, 0x32, 0x31, 0x34,
+	0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x30, 0x31, 0x20,
+	0x34, 0x35, 0x39, 0x2e, 0x37, 0x38, 0x31, 0x20, 0x43, 0x20, 0x31, 0x30, 0x31, 0x37, 0x2e, 0x30,
+	0x37, 0x20, 0x34, 0x35, 0x39, 0x2e, 0x32, 0x31, 0x37, 0x20, 0x31, 0x30, 0x33, 0x35, 0x2e, 0x37,
+	0x39, 0x20, 0x34, 0x35, 0x39, 0x2e, 0x37, 0x20, 0x31, 0x30, 0x35, 0x32, 0x2e, 0x30, 0x35, 0x20,
+	0x34, 0x35, 0x39, 0x2e, 0x37, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x35, 0x32, 0x2e, 0x31,
+	0x34, 0x20, 0x35, 0x33, 0x30, 0x2e, 0x32, 0x32, 0x34, 0x20, 0x43, 0x20, 0x31, 0x30, 0x35, 0x32,
+	0x2e, 0x31, 0x37, 0x20, 0x35, 0x34, 0x38, 0x2e, 0x36, 0x39, 0x34, 0x20, 0x31, 0x30, 0x35, 0x31,
+	0x2e, 0x32, 0x31, 0x20, 0x35, 0x37, 0x38, 0x2e, 0x34, 0x30, 0x36, 0x20, 0x31, 0x30, 0x35, 0x35,
+	0x2e, 0x37, 0x36, 0x20, 0x35, 0x39, 0x35, 0x2e, 0x35, 0x31, 0x32, 0x20, 0x43, 0x20, 0x31, 0x30,
+	0x35, 0x39, 0x2e, 0x31, 0x37, 0x20, 0x36, 0x30, 0x38, 0x2e, 0x34, 0x32, 0x37, 0x20, 0x31, 0x30,
+	0x36, 0x35, 0x2e, 0x38, 0x31, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x32, 0x36, 0x32, 0x20, 0x31, 0x30,
+	0x37, 0x35, 0x2e, 0x30, 0x36, 0x20, 0x36, 0x32, 0x39, 0x2e, 0x39, 0x30, 0x31, 0x20, 0x43, 0x20,
+	0x31, 0x31, 0x30, 0x35, 0x2e, 0x34, 0x34, 0x20, 0x36, 0x36, 0x31, 0x2e, 0x36, 0x32, 0x39, 0x20,
+	0x31, 0x31, 0x35, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x36, 0x36, 0x32, 0x2e, 0x37, 0x31, 0x38, 0x20,
+	0x31, 0x31, 0x38, 0x39, 0x2e, 0x31, 0x34, 0x20, 0x36, 0x33, 0x31, 0x2e, 0x35, 0x35, 0x32, 0x20,
+	0x43, 0x20, 0x31, 0x31, 0x39, 0x38, 0x2e, 0x38, 0x31, 0x20, 0x36, 0x32, 0x31, 0x2e, 0x37, 0x37,
+	0x39, 0x20, 0x31, 0x32, 0x30, 0x35, 0x2e, 0x36, 0x39, 0x20, 0x36, 0x30, 0x39, 0x2e, 0x35, 0x38,
+	0x37, 0x20, 0x31, 0x32, 0x30, 0x39, 0x2e, 0x30, 0x34, 0x20, 0x35, 0x39, 0x36, 0x2e, 0x32, 0x35,
+	0x31, 0x20, 0x43, 0x20, 0x31, 0x32, 0x31, 0x33, 0x2e, 0x30, 0x32, 0x20, 0x35, 0x38, 0x30, 0x2e,
+	0x33, 0x39, 0x31, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x38, 0x31, 0x20, 0x35, 0x35, 0x31, 0x2e,
+	0x36, 0x38, 0x34, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x37, 0x36, 0x20, 0x35, 0x33, 0x34, 0x2e,
+	0x36, 0x34, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x35, 0x37, 0x20, 0x34, 0x36,
+	0x31, 0x2e, 0x32, 0x37, 0x35, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x36, 0x35, 0x2e, 0x39, 0x37, 0x20,
+	0x34, 0x36, 0x31, 0x2e, 0x35, 0x39, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x36, 0x35, 0x2e, 0x38,
+	0x35, 0x20, 0x35, 0x33, 0x32, 0x2e, 0x38, 0x36, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x36, 0x35,
+	0x2e, 0x38, 0x32, 0x20, 0x35, 0x35, 0x31, 0x2e, 0x33, 0x37, 0x34, 0x20, 0x31, 0x32, 0x36, 0x34,
+	0x2e, 0x34, 0x31, 0x20, 0x35, 0x37, 0x39, 0x2e, 0x35, 0x33, 0x32, 0x20, 0x31, 0x32, 0x36, 0x38,
+	0x2e, 0x39, 0x33, 0x20, 0x35, 0x39, 0x36, 0x2e, 0x35, 0x33, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32,
+	0x37, 0x32, 0x2e, 0x33, 0x31, 0x20, 0x36, 0x30, 0x39, 0x2e, 0x30, 0x33, 0x32, 0x20, 0x31, 0x32,
+	0x37, 0x38, 0x2e, 0x38, 0x36, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x34, 0x34, 0x35, 0x20, 0x31, 0x32,
+	0x38, 0x37, 0x2e, 0x39, 0x35, 0x20, 0x36, 0x32, 0x39, 0x2e, 0x36, 0x37, 0x20, 0x43, 0x20, 0x31,
+	0x33, 0x30, 0x32, 0x2e, 0x38, 0x20, 0x36, 0x34, 0x34, 0x2e, 0x39, 0x31, 0x33, 0x20, 0x31, 0x33,
+	0x32, 0x33, 0x2e, 0x31, 0x31, 0x20, 0x36, 0x35, 0x33, 0x2e, 0x36, 0x32, 0x31, 0x20, 0x31, 0x33,
+	0x34, 0x34, 0x2e, 0x33, 0x39, 0x20, 0x36, 0x35, 0x33, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x43, 0x20,
+	0x31, 0x33, 0x36, 0x35, 0x2e, 0x37, 0x34, 0x20, 0x36, 0x35, 0x33, 0x2e, 0x39, 0x32, 0x34, 0x20,
+	0x31, 0x33, 0x38, 0x36, 0x2e, 0x32, 0x31, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x34, 0x31, 0x39, 0x20,
+	0x31, 0x34, 0x30, 0x31, 0x2e, 0x32, 0x34, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x32, 0x36, 0x20, 0x43,
+	0x20, 0x31, 0x34, 0x32, 0x39, 0x2e, 0x36, 0x31, 0x20, 0x36, 0x30, 0x31, 0x2e, 0x37, 0x39, 0x32,
+	0x20, 0x31, 0x34, 0x32, 0x34, 0x2e, 0x34, 0x35, 0x20, 0x35, 0x36, 0x36, 0x2e, 0x32, 0x33, 0x34,
+	0x20, 0x31, 0x34, 0x32, 0x34, 0x2e, 0x34, 0x31, 0x20, 0x35, 0x32, 0x38, 0x2e, 0x35, 0x39, 0x33,
+	0x20, 0x4c, 0x20, 0x31, 0x34, 0x32, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x34,
+	0x34, 0x31, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x31, 0x2e, 0x32, 0x35, 0x20, 0x34, 0x36, 0x31,
+	0x2e, 0x31, 0x38, 0x39, 0x20, 0x31, 0x34, 0x35, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x34, 0x36, 0x31,
+	0x2e, 0x36, 0x35, 0x32, 0x20, 0x31, 0x34, 0x37, 0x35, 0x2e, 0x39, 0x38, 0x20, 0x34, 0x36, 0x31,
+	0x2e, 0x37, 0x37, 0x34, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x37, 0x35, 0x2e, 0x39, 0x34, 0x20, 0x35,
+	0x33, 0x34, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x43, 0x20, 0x31, 0x34, 0x37, 0x35, 0x2e, 0x39, 0x34,
+	0x20, 0x35, 0x35, 0x32, 0x2e, 0x34, 0x35, 0x34, 0x20, 0x31, 0x34, 0x37, 0x34, 0x2e, 0x36, 0x33,
+	0x20, 0x35, 0x37, 0x39, 0x2e, 0x39, 0x35, 0x38, 0x20, 0x31, 0x34, 0x37, 0x39, 0x2e, 0x30, 0x31,
+	0x20, 0x35, 0x39, 0x36, 0x2e, 0x35, 0x34, 0x38, 0x20, 0x43, 0x20, 0x31, 0x34, 0x38, 0x32, 0x2e,
+	0x35, 0x35, 0x20, 0x36, 0x30, 0x39, 0x2e, 0x35, 0x38, 0x36, 0x20, 0x31, 0x34, 0x38, 0x39, 0x2e,
+	0x33, 0x38, 0x20, 0x36, 0x32, 0x31, 0x2e, 0x34, 0x39, 0x35, 0x20, 0x31, 0x34, 0x39, 0x38, 0x2e,
+	0x38, 0x35, 0x20, 0x36, 0x33, 0x31, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31,
+	0x33, 0x2e, 0x37, 0x39, 0x20, 0x36, 0x34, 0x36, 0x2e, 0x32, 0x30, 0x32, 0x20, 0x31, 0x35, 0x33,
+	0x34, 0x2e, 0x39, 0x32, 0x20, 0x36, 0x35, 0x34, 0x2e, 0x33, 0x34, 0x39, 0x20, 0x31, 0x35, 0x35,
+	0x36, 0x2e, 0x30, 0x36, 0x20, 0x36, 0x35, 0x34, 0x2e, 0x31, 0x39, 0x39, 0x20, 0x43, 0x20, 0x31,
+	0x35, 0x37, 0x36, 0x2e, 0x37, 0x33, 0x20, 0x36, 0x35, 0x34, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x31,
+	0x35, 0x39, 0x36, 0x2e, 0x35, 0x31, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x37, 0x35, 0x32, 0x20, 0x31,
+	0x36, 0x31, 0x30, 0x2e, 0x39, 0x33, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x39, 0x34, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x36, 0x33, 0x38, 0x2e, 0x36, 0x33, 0x20, 0x36, 0x30, 0x32, 0x2e, 0x38, 0x34, 0x31,
+	0x20, 0x31, 0x36, 0x33, 0x34, 0x2e, 0x32, 0x33, 0x20, 0x35, 0x36, 0x39, 0x2e, 0x39, 0x34, 0x32,
+	0x20, 0x31, 0x36, 0x33, 0x34, 0x2e, 0x31, 0x39, 0x20, 0x35, 0x33, 0x33, 0x2e, 0x35, 0x32, 0x33,
+	0x20, 0x4c, 0x20, 0x31, 0x36, 0x33, 0x34, 0x2e, 0x30, 0x38, 0x20, 0x34, 0x36, 0x37, 0x2e, 0x34,
+	0x35, 0x36, 0x20, 0x43, 0x20, 0x31, 0x36, 0x39, 0x36, 0x2e, 0x37, 0x37, 0x20, 0x34, 0x38, 0x38,
+	0x2e, 0x37, 0x38, 0x33, 0x20, 0x31, 0x37, 0x32, 0x39, 0x2e, 0x32, 0x39, 0x20, 0x35, 0x33, 0x38,
+	0x2e, 0x37, 0x35, 0x38, 0x20, 0x31, 0x37, 0x32, 0x39, 0x2e, 0x37, 0x36, 0x20, 0x36, 0x30, 0x33,
+	0x2e, 0x38, 0x39, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x37, 0x32, 0x39, 0x2e, 0x39, 0x36, 0x20, 0x31,
+	0x32, 0x37, 0x30, 0x2e, 0x39, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x37, 0x33, 0x30, 0x2e, 0x30, 0x39,
+	0x20, 0x31, 0x34, 0x36, 0x39, 0x2e, 0x38, 0x33, 0x20, 0x43, 0x20, 0x31, 0x37, 0x33, 0x30, 0x2e,
+	0x31, 0x31, 0x20, 0x31, 0x34, 0x39, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x37, 0x33, 0x31, 0x2e,
+	0x34, 0x38, 0x20, 0x31, 0x35, 0x35, 0x32, 0x2e, 0x33, 0x20, 0x31, 0x37, 0x32, 0x38, 0x2e, 0x33,
+	0x32, 0x20, 0x31, 0x35, 0x37, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20, 0x31, 0x37, 0x32, 0x34,
+	0x2e, 0x30, 0x31, 0x20, 0x31, 0x36, 0x30, 0x31, 0x2e, 0x35, 0x32, 0x20, 0x31, 0x37, 0x31, 0x31,
+	0x2e, 0x31, 0x32, 0x20, 0x31, 0x36, 0x32, 0x37, 0x2e, 0x32, 0x38, 0x20, 0x31, 0x36, 0x39, 0x31,
+	0x2e, 0x34, 0x35, 0x20, 0x31, 0x36, 0x34, 0x37, 0x2e, 0x33, 0x39, 0x20, 0x43, 0x20, 0x31, 0x36,
+	0x34, 0x37, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x36, 0x39, 0x31, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x36,
+	0x30, 0x37, 0x2e, 0x37, 0x38, 0x20, 0x31, 0x36, 0x38, 0x38, 0x2e, 0x31, 0x37, 0x20, 0x31, 0x35,
+	0x35, 0x31, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x36, 0x38, 0x38, 0x2e, 0x30, 0x38, 0x20, 0x4c, 0x20,
+	0x31, 0x34, 0x34, 0x36, 0x2e, 0x32, 0x31, 0x20, 0x31, 0x36, 0x38, 0x37, 0x2e, 0x39, 0x33, 0x20,
+	0x4c, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e, 0x35, 0x20, 0x31, 0x36, 0x38, 0x37, 0x2e, 0x38, 0x39,
+	0x20, 0x4c, 0x20, 0x36, 0x34, 0x31, 0x2e, 0x37, 0x30, 0x33, 0x20, 0x31, 0x36, 0x38, 0x37, 0x2e,
+	0x39, 0x33, 0x20, 0x4c, 0x20, 0x35, 0x31, 0x34, 0x2e, 0x38, 0x31, 0x39, 0x20, 0x31, 0x36, 0x38,
+	0x37, 0x2e, 0x39, 0x20, 0x43, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x35, 0x30, 0x38, 0x20, 0x31, 0x36,
+	0x38, 0x37, 0x2e, 0x39, 0x20, 0x34, 0x36, 0x32, 0x2e, 0x35, 0x33, 0x31, 0x20, 0x31, 0x36, 0x38,
+	0x38, 0x2e, 0x37, 0x39, 0x20, 0x34, 0x34, 0x32, 0x2e, 0x30, 0x36, 0x33, 0x20, 0x31, 0x36, 0x38,
+	0x36, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x34, 0x32, 0x35, 0x2e, 0x37, 0x37, 0x39, 0x20, 0x31,
+	0x36, 0x38, 0x35, 0x2e, 0x35, 0x34, 0x20, 0x34, 0x30, 0x39, 0x2e, 0x38, 0x35, 0x39, 0x20, 0x31,
+	0x36, 0x38, 0x31, 0x2e, 0x33, 0x34, 0x20, 0x33, 0x39, 0x34, 0x2e, 0x39, 0x39, 0x33, 0x20, 0x31,
+	0x36, 0x37, 0x34, 0x2e, 0x35, 0x35, 0x20, 0x43, 0x20, 0x33, 0x36, 0x34, 0x2e, 0x31, 0x35, 0x39,
+	0x20, 0x31, 0x36, 0x35, 0x39, 0x2e, 0x39, 0x37, 0x20, 0x33, 0x34, 0x30, 0x2e, 0x33, 0x35, 0x39,
+	0x20, 0x31, 0x36, 0x33, 0x33, 0x2e, 0x37, 0x36, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x38, 0x30, 0x38,
+	0x20, 0x31, 0x36, 0x30, 0x31, 0x2e, 0x36, 0x37, 0x20, 0x43, 0x20, 0x33, 0x31, 0x37, 0x2e, 0x37,
+	0x38, 0x35, 0x20, 0x31, 0x35, 0x37, 0x30, 0x2e, 0x38, 0x36, 0x20, 0x33, 0x32, 0x31, 0x2e, 0x30,
+	0x32, 0x39, 0x20, 0x31, 0x35, 0x32, 0x32, 0x2e, 0x34, 0x20, 0x33, 0x32, 0x31, 0x2e, 0x30, 0x38,
+	0x35, 0x20, 0x31, 0x34, 0x38, 0x38, 0x2e, 0x35, 0x36, 0x20, 0x4c, 0x20, 0x33, 0x32, 0x31, 0x2e,
+	0x33, 0x34, 0x32, 0x20, 0x31, 0x33, 0x35, 0x37, 0x2e, 0x36, 0x33, 0x20, 0x4c, 0x20, 0x33, 0x32,
+	0x31, 0x2e, 0x31, 0x33, 0x34, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x30, 0x32, 0x20, 0x4c, 0x20,
+	0x33, 0x32, 0x31, 0x2e, 0x32, 0x30, 0x34, 0x20, 0x37, 0x32, 0x39, 0x2e, 0x38, 0x33, 0x39, 0x20,
+	0x4c, 0x20, 0x33, 0x32, 0x31, 0x2e, 0x30, 0x33, 0x33, 0x20, 0x36, 0x33, 0x38, 0x2e, 0x33, 0x31,
+	0x35, 0x20, 0x43, 0x20, 0x33, 0x32, 0x30, 0x2e, 0x39, 0x37, 0x34, 0x20, 0x36, 0x30, 0x31, 0x2e,
+	0x37, 0x37, 0x35, 0x20, 0x33, 0x31, 0x37, 0x2e, 0x39, 0x30, 0x34, 0x20, 0x35, 0x37, 0x30, 0x2e,
+	0x33, 0x30, 0x38, 0x20, 0x33, 0x33, 0x34, 0x2e, 0x39, 0x38, 0x38, 0x20, 0x35, 0x33, 0x36, 0x2e,
+	0x33, 0x35, 0x38, 0x20, 0x43, 0x20, 0x33, 0x35, 0x33, 0x2e, 0x30, 0x35, 0x20, 0x35, 0x30, 0x30,
+	0x2e, 0x34, 0x36, 0x33, 0x20, 0x33, 0x37, 0x39, 0x2e, 0x39, 0x30, 0x39, 0x20, 0x34, 0x37, 0x39,
+	0x2e, 0x35, 0x34, 0x35, 0x20, 0x34, 0x31, 0x37, 0x2e, 0x33, 0x32, 0x31, 0x20, 0x34, 0x36, 0x36,
+	0x2e, 0x34, 0x32, 0x39, 0x20, 0x43, 0x20, 0x34, 0x31, 0x38, 0x2e, 0x30, 0x36, 0x38, 0x20, 0x34,
+	0x39, 0x30, 0x2e, 0x35, 0x32, 0x37, 0x20, 0x34, 0x31, 0x37, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x35,
+	0x31, 0x35, 0x2e, 0x33, 0x33, 0x38, 0x20, 0x34, 0x31, 0x37, 0x2e, 0x34, 0x33, 0x38, 0x20, 0x35,
+	0x33, 0x39, 0x2e, 0x34, 0x39, 0x35, 0x20, 0x43, 0x20, 0x34, 0x31, 0x37, 0x2e, 0x36, 0x36, 0x35,
+	0x20, 0x35, 0x35, 0x37, 0x2e, 0x36, 0x35, 0x34, 0x20, 0x34, 0x31, 0x36, 0x2e, 0x30, 0x39, 0x32,
+	0x20, 0x35, 0x37, 0x37, 0x2e, 0x37, 0x31, 0x33, 0x20, 0x34, 0x32, 0x30, 0x2e, 0x38, 0x39, 0x34,
+	0x20, 0x35, 0x39, 0x35, 0x2e, 0x32, 0x31, 0x32, 0x20, 0x43, 0x20, 0x34, 0x32, 0x34, 0x2e, 0x36,
+	0x33, 0x34, 0x20, 0x36, 0x30, 0x38, 0x2e, 0x35, 0x38, 0x33, 0x20, 0x34, 0x33, 0x31, 0x2e, 0x37,
+	0x36, 0x36, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x37, 0x36, 0x20, 0x34, 0x34, 0x31, 0x2e, 0x35, 0x39,
+	0x39, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x35, 0x36, 0x31, 0x20, 0x43, 0x20, 0x34, 0x35, 0x36, 0x2e,
+	0x33, 0x34, 0x36, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x33, 0x30, 0x31, 0x20, 0x34, 0x37, 0x36, 0x2e,
+	0x33, 0x35, 0x36, 0x20, 0x36, 0x35, 0x33, 0x2e, 0x35, 0x35, 0x39, 0x20, 0x34, 0x39, 0x37, 0x2e,
+	0x32, 0x30, 0x36, 0x20, 0x36, 0x35, 0x33, 0x2e, 0x35, 0x31, 0x20, 0x43, 0x20, 0x35, 0x31, 0x38,
+	0x2e, 0x32, 0x34, 0x36, 0x20, 0x36, 0x35, 0x33, 0x2e, 0x34, 0x37, 0x32, 0x20, 0x35, 0x33, 0x38,
+	0x2e, 0x33, 0x37, 0x33, 0x20, 0x36, 0x34, 0x34, 0x2e, 0x39, 0x30, 0x37, 0x20, 0x35, 0x35, 0x32,
+	0x2e, 0x39, 0x38, 0x38, 0x20, 0x36, 0x32, 0x39, 0x2e, 0x37, 0x37, 0x31, 0x20, 0x43, 0x20, 0x35,
+	0x36, 0x32, 0x2e, 0x35, 0x38, 0x36, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x30, 0x39, 0x34, 0x20, 0x35,
+	0x36, 0x39, 0x2e, 0x33, 0x38, 0x34, 0x20, 0x36, 0x30, 0x37, 0x2e, 0x39, 0x39, 0x38, 0x20, 0x35,
+	0x37, 0x32, 0x2e, 0x36, 0x36, 0x20, 0x35, 0x39, 0x34, 0x2e, 0x37, 0x36, 0x38, 0x20, 0x43, 0x20,
+	0x35, 0x37, 0x37, 0x2e, 0x30, 0x38, 0x37, 0x20, 0x35, 0x37, 0x37, 0x2e, 0x35, 0x33, 0x20, 0x35,
+	0x37, 0x36, 0x2e, 0x30, 0x30, 0x33, 0x20, 0x35, 0x34, 0x39, 0x2e, 0x30, 0x34, 0x39, 0x20, 0x35,
+	0x37, 0x35, 0x2e, 0x39, 0x31, 0x38, 0x20, 0x35, 0x33, 0x30, 0x2e, 0x34, 0x38, 0x20, 0x4c, 0x20,
+	0x35, 0x37, 0x35, 0x2e, 0x35, 0x31, 0x33, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x36, 0x36, 0x35, 0x20,
+	0x43, 0x20, 0x35, 0x39, 0x32, 0x2e, 0x32, 0x30, 0x35, 0x20, 0x34, 0x36, 0x30, 0x2e, 0x39, 0x36,
+	0x33, 0x20, 0x36, 0x31, 0x32, 0x2e, 0x39, 0x30, 0x31, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x35, 0x37,
+	0x31, 0x20, 0x36, 0x32, 0x39, 0x2e, 0x38, 0x39, 0x37, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x35, 0x39,
+	0x38, 0x20, 0x4c, 0x20, 0x36, 0x32, 0x39, 0x2e, 0x38, 0x36, 0x38, 0x20, 0x35, 0x33, 0x30, 0x2e,
+	0x35, 0x30, 0x37, 0x20, 0x43, 0x20, 0x36, 0x32, 0x39, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x35, 0x36,
+	0x37, 0x2e, 0x35, 0x35, 0x20, 0x36, 0x32, 0x35, 0x2e, 0x31, 0x32, 0x35, 0x20, 0x36, 0x30, 0x31,
+	0x2e, 0x30, 0x32, 0x34, 0x20, 0x36, 0x35, 0x32, 0x2e, 0x33, 0x36, 0x39, 0x20, 0x36, 0x32, 0x39,
+	0x2e, 0x36, 0x35, 0x31, 0x20, 0x43, 0x20, 0x36, 0x36, 0x37, 0x2e, 0x31, 0x31, 0x36, 0x20, 0x36,
+	0x34, 0x34, 0x2e, 0x39, 0x38, 0x36, 0x20, 0x36, 0x38, 0x37, 0x2e, 0x33, 0x33, 0x35, 0x20, 0x36,
+	0x35, 0x33, 0x2e, 0x38, 0x35, 0x37, 0x20, 0x37, 0x30, 0x38, 0x2e, 0x36, 0x30, 0x35, 0x20, 0x36,
+	0x35, 0x34, 0x2e, 0x33, 0x32, 0x36, 0x20, 0x43, 0x20, 0x37, 0x32, 0x39, 0x2e, 0x35, 0x33, 0x33,
+	0x20, 0x36, 0x35, 0x34, 0x2e, 0x36, 0x35, 0x33, 0x20, 0x37, 0x34, 0x39, 0x2e, 0x37, 0x31, 0x38,
+	0x20, 0x36, 0x34, 0x36, 0x2e, 0x35, 0x37, 0x31, 0x20, 0x37, 0x36, 0x34, 0x2e, 0x36, 0x33, 0x37,
+	0x20, 0x36, 0x33, 0x31, 0x2e, 0x38, 0x39, 0x20, 0x43, 0x20, 0x37, 0x39, 0x33, 0x2e, 0x39, 0x38,
+	0x38, 0x20, 0x36, 0x30, 0x32, 0x2e, 0x37, 0x37, 0x36, 0x20, 0x37, 0x38, 0x39, 0x2e, 0x31, 0x37,
+	0x37, 0x20, 0x35, 0x36, 0x36, 0x2e, 0x33, 0x34, 0x34, 0x20, 0x37, 0x38, 0x39, 0x2e, 0x31, 0x33,
+	0x36, 0x20, 0x35, 0x32, 0x38, 0x2e, 0x32, 0x38, 0x35, 0x20, 0x4c, 0x20, 0x37, 0x38, 0x39, 0x2e,
+	0x30, 0x34, 0x31, 0x20, 0x34, 0x36, 0x30, 0x2e, 0x39, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x38, 0x34,
+	0x31, 0x2e, 0x39, 0x30, 0x36, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x30, 0x36, 0x32, 0x20, 0x4c, 0x20,
+	0x38, 0x34, 0x31, 0x2e, 0x36, 0x37, 0x20, 0x35, 0x33, 0x36, 0x2e, 0x34, 0x33, 0x37, 0x20, 0x43,
+	0x20, 0x38, 0x34, 0x31, 0x2e, 0x36, 0x30, 0x33, 0x20, 0x35, 0x35, 0x33, 0x2e, 0x38, 0x35, 0x33,
+	0x20, 0x38, 0x34, 0x30, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x35, 0x37, 0x39, 0x2e, 0x31, 0x35, 0x31,
+	0x20, 0x38, 0x34, 0x34, 0x2e, 0x31, 0x31, 0x39, 0x20, 0x35, 0x39, 0x35, 0x2e, 0x34, 0x33, 0x20,
+	0x43, 0x20, 0x38, 0x34, 0x37, 0x2e, 0x32, 0x38, 0x35, 0x20, 0x36, 0x30, 0x38, 0x2e, 0x31, 0x30,
+	0x36, 0x20, 0x38, 0x35, 0x33, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x36, 0x31, 0x39, 0x2e, 0x37, 0x33,
+	0x34, 0x20, 0x38, 0x36, 0x32, 0x2e, 0x37, 0x35, 0x32, 0x20, 0x36, 0x32, 0x39, 0x2e, 0x31, 0x36,
+	0x32, 0x20, 0x43, 0x20, 0x38, 0x37, 0x37, 0x2e, 0x39, 0x33, 0x31, 0x20, 0x36, 0x34, 0x34, 0x2e,
+	0x38, 0x33, 0x31, 0x20, 0x38, 0x39, 0x38, 0x2e, 0x36, 0x39, 0x37, 0x20, 0x36, 0x35, 0x33, 0x2e,
+	0x38, 0x35, 0x20, 0x39, 0x32, 0x30, 0x2e, 0x35, 0x30, 0x38, 0x20, 0x36, 0x35, 0x34, 0x2e, 0x32,
+	0x34, 0x36, 0x20, 0x43, 0x20, 0x39, 0x34, 0x32, 0x2e, 0x30, 0x38, 0x39, 0x20, 0x36, 0x35, 0x34,
+	0x2e, 0x35, 0x31, 0x33, 0x20, 0x39, 0x36, 0x32, 0x2e, 0x38, 0x39, 0x20, 0x36, 0x34, 0x36, 0x2e,
+	0x31, 0x38, 0x34, 0x20, 0x39, 0x37, 0x38, 0x2e, 0x33, 0x32, 0x33, 0x20, 0x36, 0x33, 0x31, 0x2e,
+	0x30, 0x39, 0x36, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x39, 0x32, 0x20, 0x36, 0x30,
+	0x33, 0x2e, 0x35, 0x38, 0x35, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x31, 0x32, 0x20, 0x35, 0x36,
+	0x35, 0x2e, 0x34, 0x38, 0x33, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x30, 0x36, 0x20, 0x35, 0x32,
+	0x39, 0x2e, 0x32, 0x39, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x30, 0x31, 0x20,
+	0x34, 0x35, 0x39, 0x2e, 0x37, 0x38, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x32, 0x2c, 0x32, 0x38, 0x2c, 0x32, 0x38,
+	0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x32, 0x37, 0x2e, 0x35, 0x32, 0x37, 0x20,
+	0x31, 0x32, 0x36, 0x32, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x35, 0x38, 0x35, 0x2e, 0x33, 0x31,
+	0x34, 0x20, 0x31, 0x32, 0x36, 0x30, 0x2e, 0x34, 0x36, 0x20, 0x36, 0x35, 0x33, 0x2e, 0x32, 0x39,
+	0x37, 0x20, 0x31, 0x32, 0x36, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x37, 0x31, 0x31, 0x2e, 0x37, 0x36,
+	0x32, 0x20, 0x31, 0x32, 0x36, 0x32, 0x2e, 0x30, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x37, 0x30,
+	0x2e, 0x37, 0x20, 0x31, 0x32, 0x36, 0x32, 0x2e, 0x31, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x38,
+	0x34, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x32, 0x36, 0x32, 0x2e, 0x32, 0x33, 0x20, 0x4c, 0x20, 0x31,
+	0x34, 0x37, 0x38, 0x2e, 0x30, 0x37, 0x20, 0x31, 0x32, 0x36, 0x32, 0x2e, 0x34, 0x36, 0x20, 0x43,
+	0x20, 0x31, 0x34, 0x39, 0x30, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x32, 0x36, 0x32, 0x2e, 0x34, 0x38,
+	0x20, 0x31, 0x35, 0x32, 0x32, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x32, 0x35, 0x39, 0x2e, 0x36, 0x33,
+	0x20, 0x31, 0x35, 0x33, 0x31, 0x2e, 0x34, 0x38, 0x20, 0x31, 0x32, 0x36, 0x36, 0x2e, 0x37, 0x20,
+	0x43, 0x20, 0x31, 0x35, 0x34, 0x31, 0x2e, 0x37, 0x33, 0x20, 0x31, 0x32, 0x37, 0x34, 0x2e, 0x34,
+	0x36, 0x20, 0x31, 0x35, 0x33, 0x36, 0x2e, 0x32, 0x31, 0x20, 0x31, 0x32, 0x38, 0x36, 0x2e, 0x30,
+	0x31, 0x20, 0x31, 0x35, 0x32, 0x32, 0x2e, 0x34, 0x37, 0x20, 0x31, 0x32, 0x38, 0x37, 0x2e, 0x35,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x35, 0x35, 0x2e, 0x39, 0x20, 0x31, 0x32, 0x38, 0x38, 0x2e,
+	0x34, 0x32, 0x20, 0x31, 0x33, 0x38, 0x38, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x32, 0x38, 0x37, 0x2e,
+	0x38, 0x37, 0x20, 0x31, 0x33, 0x32, 0x31, 0x2e, 0x35, 0x32, 0x20, 0x31, 0x32, 0x38, 0x37, 0x2e,
+	0x39, 0x20, 0x4c, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x33, 0x31, 0x20, 0x31, 0x32, 0x38, 0x38, 0x2e,
+	0x30, 0x32, 0x20, 0x4c, 0x20, 0x36, 0x35, 0x37, 0x2e, 0x37, 0x32, 0x32, 0x20, 0x31, 0x32, 0x38,
+	0x37, 0x2e, 0x39, 0x36, 0x20, 0x4c, 0x20, 0x35, 0x36, 0x34, 0x2e, 0x30, 0x36, 0x34, 0x20, 0x31,
+	0x32, 0x38, 0x37, 0x2e, 0x39, 0x34, 0x20, 0x43, 0x20, 0x35, 0x35, 0x33, 0x2e, 0x33, 0x35, 0x38,
+	0x20, 0x31, 0x32, 0x38, 0x37, 0x2e, 0x39, 0x34, 0x20, 0x35, 0x30, 0x32, 0x2e, 0x30, 0x38, 0x37,
+	0x20, 0x31, 0x32, 0x39, 0x34, 0x2e, 0x32, 0x36, 0x20, 0x35, 0x31, 0x35, 0x2e, 0x33, 0x38, 0x36,
+	0x20, 0x31, 0x32, 0x36, 0x38, 0x2e, 0x33, 0x31, 0x20, 0x43, 0x20, 0x35, 0x31, 0x37, 0x2e, 0x32,
+	0x31, 0x32, 0x20, 0x31, 0x32, 0x36, 0x34, 0x2e, 0x37, 0x35, 0x20, 0x35, 0x32, 0x33, 0x2e, 0x36,
+	0x35, 0x36, 0x20, 0x31, 0x32, 0x36, 0x32, 0x2e, 0x39, 0x34, 0x20, 0x35, 0x32, 0x37, 0x2e, 0x35,
+	0x32, 0x37, 0x20, 0x31, 0x32, 0x36, 0x32, 0x2e, 0x34, 0x36, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d,
+	0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x32, 0x2c, 0x32, 0x38,
+	0x2c, 0x32, 0x38, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x32, 0x34, 0x2e, 0x34,
+	0x33, 0x31, 0x20, 0x31, 0x34, 0x34, 0x36, 0x2e, 0x33, 0x36, 0x20, 0x43, 0x20, 0x35, 0x37, 0x39,
+	0x2e, 0x38, 0x36, 0x32, 0x20, 0x31, 0x34, 0x34, 0x34, 0x2e, 0x39, 0x34, 0x20, 0x36, 0x33, 0x39,
+	0x2e, 0x33, 0x35, 0x39, 0x20, 0x31, 0x34, 0x34, 0x35, 0x2e, 0x39, 0x35, 0x20, 0x36, 0x39, 0x35,
+	0x2e, 0x30, 0x33, 0x32, 0x20, 0x31, 0x34, 0x34, 0x35, 0x2e, 0x39, 0x34, 0x20, 0x4c, 0x20, 0x31,
+	0x30, 0x33, 0x36, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x34, 0x34, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x34,
+	0x32, 0x37, 0x2e, 0x33, 0x32, 0x20, 0x31, 0x34, 0x34, 0x35, 0x2e, 0x38, 0x34, 0x20, 0x43, 0x20,
+	0x31, 0x34, 0x34, 0x33, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x34, 0x34, 0x35, 0x2e, 0x39, 0x32, 0x20,
+	0x31, 0x35, 0x31, 0x37, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x34, 0x34, 0x34, 0x2e, 0x32, 0x33, 0x20,
+	0x31, 0x35, 0x32, 0x36, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x34, 0x34, 0x37, 0x2e, 0x33, 0x35, 0x20,
+	0x43, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x34, 0x34, 0x38, 0x2e, 0x35,
+	0x32, 0x20, 0x31, 0x35, 0x33, 0x34, 0x2e, 0x31, 0x20, 0x31, 0x34, 0x35, 0x31, 0x2e, 0x31, 0x32,
+	0x20, 0x31, 0x35, 0x33, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x31, 0x34, 0x35, 0x34, 0x2e, 0x37, 0x33,
+	0x20, 0x43, 0x20, 0x31, 0x35, 0x33, 0x36, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x34, 0x35, 0x37, 0x2e,
+	0x38, 0x34, 0x20, 0x31, 0x35, 0x33, 0x36, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e,
+	0x37, 0x35, 0x20, 0x31, 0x35, 0x33, 0x35, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x36, 0x33, 0x2e,
+	0x36, 0x39, 0x20, 0x43, 0x20, 0x31, 0x35, 0x33, 0x32, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x34, 0x36,
+	0x37, 0x2e, 0x38, 0x39, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x36,
+	0x39, 0x2e, 0x37, 0x38, 0x20, 0x31, 0x35, 0x32, 0x35, 0x2e, 0x32, 0x20, 0x31, 0x34, 0x37, 0x31,
+	0x2e, 0x32, 0x38, 0x20, 0x43, 0x20, 0x31, 0x34, 0x31, 0x34, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x34,
+	0x37, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x33, 0x30, 0x32, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x34, 0x37,
+	0x31, 0x2e, 0x35, 0x39, 0x20, 0x31, 0x31, 0x39, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x34, 0x37, 0x31,
+	0x2e, 0x34, 0x35, 0x20, 0x4c, 0x20, 0x37, 0x35, 0x32, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x34, 0x37,
+	0x31, 0x2e, 0x36, 0x31, 0x20, 0x4c, 0x20, 0x35, 0x38, 0x37, 0x2e, 0x38, 0x32, 0x35, 0x20, 0x31,
+	0x34, 0x37, 0x31, 0x2e, 0x35, 0x38, 0x20, 0x43, 0x20, 0x35, 0x36, 0x36, 0x2e, 0x39, 0x36, 0x33,
+	0x20, 0x31, 0x34, 0x37, 0x31, 0x2e, 0x35, 0x37, 0x20, 0x35, 0x34, 0x33, 0x2e, 0x31, 0x37, 0x38,
+	0x20, 0x31, 0x34, 0x37, 0x32, 0x2e, 0x35, 0x38, 0x20, 0x35, 0x32, 0x32, 0x2e, 0x38, 0x32, 0x34,
+	0x20, 0x31, 0x34, 0x37, 0x30, 0x2e, 0x36, 0x36, 0x20, 0x43, 0x20, 0x35, 0x31, 0x33, 0x2e, 0x34,
+	0x34, 0x35, 0x20, 0x31, 0x34, 0x36, 0x39, 0x2e, 0x37, 0x38, 0x20, 0x35, 0x30, 0x38, 0x2e, 0x38,
+	0x33, 0x33, 0x20, 0x31, 0x34, 0x35, 0x32, 0x2e, 0x30, 0x38, 0x20, 0x35, 0x32, 0x34, 0x2e, 0x34,
+	0x33, 0x31, 0x20, 0x31, 0x34, 0x34, 0x36, 0x2e, 0x33, 0x36, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d,
+	0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x32, 0x2c, 0x32, 0x38,
+	0x2c, 0x32, 0x38, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x32, 0x32, 0x2e, 0x37,
+	0x32, 0x37, 0x20, 0x31, 0x30, 0x37, 0x34, 0x2e, 0x31, 0x38, 0x20, 0x43, 0x20, 0x35, 0x33, 0x37,
+	0x2e, 0x32, 0x33, 0x35, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x34, 0x31, 0x20, 0x35, 0x35, 0x36,
+	0x2e, 0x33, 0x39, 0x39, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x38, 0x37, 0x20, 0x35, 0x37, 0x31,
+	0x2e, 0x31, 0x34, 0x39, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x39, 0x20, 0x4c, 0x20, 0x36, 0x35,
+	0x35, 0x2e, 0x32, 0x39, 0x35, 0x20, 0x31, 0x30, 0x37, 0x34, 0x2e, 0x30, 0x33, 0x20, 0x4c, 0x20,
+	0x39, 0x30, 0x38, 0x2e, 0x30, 0x39, 0x39, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x39, 0x32, 0x20,
+	0x4c, 0x20, 0x31, 0x33, 0x32, 0x39, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x39,
+	0x32, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x36, 0x35, 0x2e, 0x33, 0x20, 0x31, 0x30, 0x37, 0x34, 0x2e,
+	0x30, 0x35, 0x20, 0x43, 0x20, 0x31, 0x34, 0x38, 0x32, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x30, 0x37,
+	0x34, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x34, 0x39, 0x39, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x30, 0x37,
+	0x34, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x35, 0x31, 0x36, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x30, 0x37,
+	0x33, 0x2e, 0x36, 0x37, 0x20, 0x43, 0x20, 0x31, 0x35, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x31, 0x30,
+	0x37, 0x33, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x35, 0x32, 0x35, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x30,
+	0x37, 0x34, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x30,
+	0x37, 0x36, 0x2e, 0x37, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x34, 0x31, 0x2e, 0x38, 0x31, 0x20,
+	0x31, 0x30, 0x38, 0x33, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x35, 0x33, 0x36, 0x2e, 0x39, 0x36, 0x20,
+	0x31, 0x30, 0x39, 0x35, 0x2e, 0x37, 0x38, 0x20, 0x31, 0x35, 0x32, 0x34, 0x2e, 0x37, 0x35, 0x20,
+	0x31, 0x30, 0x39, 0x38, 0x2e, 0x35, 0x34, 0x20, 0x4c, 0x20, 0x38, 0x36, 0x32, 0x2e, 0x37, 0x39,
+	0x33, 0x20, 0x31, 0x30, 0x39, 0x38, 0x2e, 0x36, 0x20, 0x4c, 0x20, 0x36, 0x36, 0x35, 0x2e, 0x34,
+	0x33, 0x33, 0x20, 0x31, 0x30, 0x39, 0x38, 0x2e, 0x35, 0x36, 0x20, 0x43, 0x20, 0x36, 0x32, 0x30,
+	0x2e, 0x38, 0x32, 0x36, 0x20, 0x31, 0x30, 0x39, 0x38, 0x2e, 0x36, 0x38, 0x20, 0x35, 0x37, 0x36,
+	0x2e, 0x32, 0x32, 0x32, 0x20, 0x31, 0x30, 0x39, 0x38, 0x2e, 0x35, 0x36, 0x20, 0x35, 0x33, 0x31,
+	0x2e, 0x36, 0x31, 0x39, 0x20, 0x31, 0x30, 0x39, 0x38, 0x2e, 0x36, 0x32, 0x20, 0x43, 0x20, 0x35,
+	0x31, 0x33, 0x2e, 0x36, 0x36, 0x32, 0x20, 0x31, 0x30, 0x39, 0x38, 0x2e, 0x36, 0x34, 0x20, 0x35,
+	0x30, 0x36, 0x2e, 0x33, 0x34, 0x37, 0x20, 0x31, 0x30, 0x38, 0x34, 0x2e, 0x35, 0x37, 0x20, 0x35,
+	0x32, 0x32, 0x2e, 0x37, 0x32, 0x37, 0x20, 0x31, 0x30, 0x37, 0x34, 0x2e, 0x31, 0x38, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33,
+	0x32, 0x2c, 0x32, 0x38, 0x2c, 0x32, 0x38, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37,
+	0x32, 0x31, 0x2e, 0x33, 0x32, 0x20, 0x38, 0x39, 0x30, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x4c, 0x20,
+	0x31, 0x32, 0x35, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x38, 0x39, 0x30, 0x2e, 0x33, 0x38, 0x35, 0x20,
+	0x4c, 0x20, 0x31, 0x34, 0x34, 0x30, 0x2e, 0x35, 0x34, 0x20, 0x38, 0x39, 0x30, 0x2e, 0x36, 0x38,
+	0x35, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x39, 0x36, 0x2e, 0x30, 0x34, 0x20, 0x38, 0x39, 0x30, 0x2e,
+	0x39, 0x36, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x30, 0x34, 0x2e, 0x32, 0x32, 0x20, 0x38, 0x39,
+	0x30, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x31, 0x35, 0x32, 0x36, 0x2e, 0x33, 0x36, 0x20, 0x38, 0x38,
+	0x38, 0x2e, 0x36, 0x33, 0x20, 0x31, 0x35, 0x33, 0x32, 0x2e, 0x36, 0x39, 0x20, 0x38, 0x39, 0x34,
+	0x2e, 0x30, 0x34, 0x20, 0x43, 0x20, 0x31, 0x35, 0x34, 0x32, 0x2e, 0x39, 0x36, 0x20, 0x39, 0x30,
+	0x32, 0x2e, 0x38, 0x31, 0x36, 0x20, 0x31, 0x35, 0x33, 0x34, 0x2e, 0x31, 0x36, 0x20, 0x39, 0x31,
+	0x32, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x31, 0x35, 0x32, 0x32, 0x2e, 0x35, 0x32, 0x20, 0x39, 0x31,
+	0x33, 0x2e, 0x30, 0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35, 0x30, 0x32, 0x2e, 0x30, 0x31, 0x20,
+	0x39, 0x31, 0x34, 0x2e, 0x30, 0x34, 0x31, 0x20, 0x31, 0x34, 0x38, 0x31, 0x2e, 0x31, 0x34, 0x20,
+	0x39, 0x31, 0x33, 0x2e, 0x32, 0x34, 0x32, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e, 0x34, 0x39, 0x20,
+	0x39, 0x31, 0x33, 0x2e, 0x32, 0x32, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x32, 0x38, 0x2e, 0x32,
+	0x35, 0x20, 0x39, 0x31, 0x33, 0x2e, 0x35, 0x38, 0x39, 0x20, 0x4c, 0x20, 0x37, 0x38, 0x38, 0x2e,
+	0x38, 0x39, 0x36, 0x20, 0x39, 0x31, 0x33, 0x2e, 0x33, 0x35, 0x36, 0x20, 0x4c, 0x20, 0x36, 0x31,
+	0x30, 0x2e, 0x35, 0x33, 0x31, 0x20, 0x39, 0x31, 0x33, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x35,
+	0x38, 0x34, 0x2e, 0x34, 0x36, 0x37, 0x20, 0x39, 0x31, 0x33, 0x2e, 0x33, 0x35, 0x34, 0x20, 0x35,
+	0x35, 0x38, 0x2e, 0x35, 0x37, 0x38, 0x20, 0x39, 0x31, 0x33, 0x2e, 0x32, 0x38, 0x38, 0x20, 0x35,
+	0x33, 0x32, 0x2e, 0x33, 0x32, 0x33, 0x20, 0x39, 0x31, 0x33, 0x2e, 0x37, 0x31, 0x38, 0x20, 0x43,
+	0x20, 0x35, 0x31, 0x39, 0x2e, 0x38, 0x34, 0x35, 0x20, 0x39, 0x31, 0x33, 0x2e, 0x39, 0x32, 0x33,
+	0x20, 0x35, 0x30, 0x35, 0x2e, 0x34, 0x30, 0x33, 0x20, 0x39, 0x30, 0x38, 0x2e, 0x35, 0x36, 0x35,
+	0x20, 0x35, 0x31, 0x37, 0x2e, 0x39, 0x34, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x36, 0x35, 0x35, 0x20,
+	0x43, 0x20, 0x35, 0x31, 0x39, 0x2e, 0x38, 0x32, 0x36, 0x20, 0x38, 0x39, 0x31, 0x2e, 0x34, 0x31,
+	0x32, 0x20, 0x35, 0x32, 0x35, 0x2e, 0x39, 0x39, 0x37, 0x20, 0x38, 0x39, 0x30, 0x2e, 0x36, 0x39,
+	0x33, 0x20, 0x35, 0x32, 0x38, 0x2e, 0x38, 0x38, 0x34, 0x20, 0x38, 0x39, 0x30, 0x2e, 0x36, 0x36,
+	0x32, 0x20, 0x43, 0x20, 0x35, 0x34, 0x37, 0x2e, 0x39, 0x38, 0x35, 0x20, 0x38, 0x39, 0x30, 0x2e,
+	0x34, 0x35, 0x37, 0x20, 0x35, 0x36, 0x37, 0x2e, 0x36, 0x35, 0x20, 0x38, 0x39, 0x30, 0x2e, 0x38,
+	0x31, 0x20, 0x35, 0x38, 0x36, 0x2e, 0x37, 0x31, 0x20, 0x38, 0x39, 0x30, 0x2e, 0x37, 0x36, 0x32,
+	0x20, 0x4c, 0x20, 0x37, 0x32, 0x31, 0x2e, 0x33, 0x32, 0x20, 0x38, 0x39, 0x30, 0x2e, 0x35, 0x30,
+	0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74,
+	0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67,
+	0x62, 0x28, 0x39, 0x35, 0x2c, 0x31, 0x35, 0x35, 0x2c, 0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x20, 0x38, 0x36, 0x37, 0x2e, 0x37, 0x35, 0x36, 0x20, 0x34, 0x36, 0x30, 0x2e,
+	0x39, 0x38, 0x32, 0x20, 0x4c, 0x20, 0x39, 0x37, 0x34, 0x2e, 0x37, 0x34, 0x38, 0x20, 0x34, 0x36,
+	0x31, 0x2e, 0x30, 0x34, 0x33, 0x20, 0x4c, 0x20, 0x39, 0x37, 0x34, 0x2e, 0x39, 0x32, 0x20, 0x35,
+	0x33, 0x36, 0x2e, 0x39, 0x31, 0x37, 0x20, 0x43, 0x20, 0x39, 0x37, 0x35, 0x2e, 0x30, 0x30, 0x31,
+	0x20, 0x35, 0x36, 0x35, 0x2e, 0x30, 0x33, 0x34, 0x20, 0x39, 0x37, 0x38, 0x2e, 0x39, 0x37, 0x36,
+	0x20, 0x35, 0x38, 0x39, 0x2e, 0x32, 0x35, 0x31, 0x20, 0x39, 0x35, 0x39, 0x2e, 0x36, 0x35, 0x39,
+	0x20, 0x36, 0x31, 0x32, 0x2e, 0x31, 0x39, 0x34, 0x20, 0x43, 0x20, 0x39, 0x33, 0x38, 0x2e, 0x32,
+	0x37, 0x37, 0x20, 0x36, 0x33, 0x32, 0x2e, 0x33, 0x38, 0x32, 0x20, 0x39, 0x30, 0x35, 0x2e, 0x38,
+	0x30, 0x34, 0x20, 0x36, 0x33, 0x34, 0x2e, 0x36, 0x38, 0x39, 0x20, 0x38, 0x38, 0x34, 0x2e, 0x31,
+	0x20, 0x36, 0x31, 0x33, 0x2e, 0x33, 0x39, 0x39, 0x20, 0x43, 0x20, 0x38, 0x37, 0x36, 0x2e, 0x38,
+	0x32, 0x34, 0x20, 0x36, 0x30, 0x36, 0x2e, 0x31, 0x37, 0x36, 0x20, 0x38, 0x37, 0x31, 0x2e, 0x37,
+	0x39, 0x35, 0x20, 0x35, 0x39, 0x37, 0x2e, 0x30, 0x30, 0x31, 0x20, 0x38, 0x36, 0x39, 0x2e, 0x36,
+	0x32, 0x32, 0x20, 0x35, 0x38, 0x36, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x43, 0x20, 0x38, 0x36, 0x36,
+	0x2e, 0x39, 0x39, 0x32, 0x20, 0x35, 0x37, 0x35, 0x2e, 0x32, 0x31, 0x34, 0x20, 0x38, 0x36, 0x37,
+	0x2e, 0x39, 0x30, 0x37, 0x20, 0x35, 0x35, 0x30, 0x2e, 0x37, 0x37, 0x34, 0x20, 0x38, 0x36, 0x37,
+	0x2e, 0x38, 0x38, 0x36, 0x20, 0x35, 0x33, 0x37, 0x2e, 0x36, 0x37, 0x39, 0x20, 0x4c, 0x20, 0x38,
+	0x36, 0x37, 0x2e, 0x37, 0x35, 0x36, 0x20, 0x34, 0x36, 0x30, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39,
+	0x35, 0x2c, 0x31, 0x35, 0x35, 0x2c, 0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x20, 0x31, 0x35, 0x30, 0x31, 0x2e, 0x34, 0x32, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x39, 0x33, 0x33,
+	0x20, 0x43, 0x20, 0x31, 0x35, 0x33, 0x35, 0x2e, 0x39, 0x32, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x30,
+	0x39, 0x36, 0x20, 0x31, 0x35, 0x37, 0x34, 0x2e, 0x30, 0x34, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x39,
+	0x39, 0x33, 0x20, 0x31, 0x36, 0x30, 0x38, 0x2e, 0x38, 0x33, 0x20, 0x34, 0x36, 0x32, 0x2e, 0x30,
+	0x36, 0x37, 0x20, 0x43, 0x20, 0x31, 0x36, 0x30, 0x39, 0x2e, 0x33, 0x38, 0x20, 0x34, 0x38, 0x32,
+	0x2e, 0x34, 0x38, 0x38, 0x20, 0x31, 0x36, 0x30, 0x39, 0x2e, 0x36, 0x20, 0x35, 0x30, 0x35, 0x2e,
+	0x38, 0x35, 0x39, 0x20, 0x31, 0x36, 0x30, 0x39, 0x2e, 0x30, 0x37, 0x20, 0x35, 0x32, 0x36, 0x2e,
+	0x32, 0x31, 0x35, 0x20, 0x43, 0x20, 0x31, 0x36, 0x30, 0x38, 0x2e, 0x32, 0x39, 0x20, 0x35, 0x35,
+	0x36, 0x2e, 0x35, 0x34, 0x34, 0x20, 0x31, 0x36, 0x31, 0x35, 0x2e, 0x34, 0x32, 0x20, 0x35, 0x38,
+	0x38, 0x2e, 0x35, 0x39, 0x33, 0x20, 0x31, 0x35, 0x39, 0x33, 0x2e, 0x32, 0x31, 0x20, 0x36, 0x31,
+	0x32, 0x2e, 0x35, 0x38, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35, 0x37, 0x31, 0x2e, 0x33, 0x20, 0x36,
+	0x33, 0x32, 0x2e, 0x39, 0x34, 0x33, 0x20, 0x31, 0x35, 0x33, 0x37, 0x2e, 0x37, 0x37, 0x20, 0x36,
+	0x33, 0x33, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x31, 0x35, 0x31, 0x36, 0x2e, 0x36, 0x32, 0x20, 0x36,
+	0x31, 0x31, 0x2e, 0x39, 0x36, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31, 0x30, 0x2e, 0x32, 0x32,
+	0x20, 0x36, 0x30, 0x35, 0x2e, 0x35, 0x32, 0x33, 0x20, 0x31, 0x35, 0x30, 0x35, 0x2e, 0x37, 0x33,
+	0x20, 0x35, 0x39, 0x37, 0x2e, 0x34, 0x33, 0x32, 0x20, 0x31, 0x35, 0x30, 0x33, 0x2e, 0x36, 0x36,
+	0x20, 0x35, 0x38, 0x38, 0x2e, 0x35, 0x39, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x30, 0x30, 0x2e,
+	0x38, 0x34, 0x20, 0x35, 0x37, 0x36, 0x2e, 0x39, 0x37, 0x38, 0x20, 0x31, 0x35, 0x30, 0x31, 0x2e,
+	0x39, 0x39, 0x20, 0x35, 0x35, 0x33, 0x2e, 0x35, 0x35, 0x37, 0x20, 0x31, 0x35, 0x30, 0x31, 0x2e,
+	0x39, 0x33, 0x20, 0x35, 0x34, 0x30, 0x2e, 0x35, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x30,
+	0x31, 0x2e, 0x34, 0x32, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x39, 0x33, 0x33, 0x20, 0x7a, 0x22, 0x2f,
+	0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72,
+	0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30,
+	0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39, 0x35, 0x2c,
+	0x31, 0x35, 0x35, 0x2c, 0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x34,
+	0x34, 0x33, 0x2e, 0x35, 0x38, 0x38, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x32, 0x30, 0x32, 0x20, 0x4c,
+	0x20, 0x35, 0x34, 0x39, 0x2e, 0x38, 0x31, 0x37, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x34, 0x32, 0x34,
+	0x20, 0x43, 0x20, 0x35, 0x34, 0x39, 0x2e, 0x35, 0x34, 0x34, 0x20, 0x34, 0x38, 0x36, 0x2e, 0x31,
+	0x39, 0x38, 0x20, 0x35, 0x35, 0x30, 0x2e, 0x33, 0x35, 0x33, 0x20, 0x35, 0x31, 0x31, 0x2e, 0x30,
+	0x37, 0x39, 0x20, 0x35, 0x34, 0x39, 0x2e, 0x39, 0x32, 0x39, 0x20, 0x35, 0x33, 0x35, 0x2e, 0x38,
+	0x31, 0x37, 0x20, 0x43, 0x20, 0x35, 0x34, 0x39, 0x2e, 0x34, 0x36, 0x31, 0x20, 0x35, 0x36, 0x33,
+	0x2e, 0x31, 0x34, 0x31, 0x20, 0x35, 0x35, 0x34, 0x2e, 0x35, 0x37, 0x32, 0x20, 0x35, 0x38, 0x39,
+	0x2e, 0x34, 0x34, 0x37, 0x20, 0x35, 0x33, 0x35, 0x2e, 0x31, 0x36, 0x37, 0x20, 0x36, 0x31, 0x31,
+	0x2e, 0x34, 0x32, 0x36, 0x20, 0x43, 0x20, 0x35, 0x30, 0x34, 0x2e, 0x32, 0x37, 0x33, 0x20, 0x36,
+	0x34, 0x30, 0x2e, 0x38, 0x34, 0x34, 0x20, 0x34, 0x35, 0x36, 0x2e, 0x38, 0x36, 0x31, 0x20, 0x36,
+	0x33, 0x30, 0x2e, 0x35, 0x39, 0x20, 0x34, 0x34, 0x35, 0x2e, 0x30, 0x36, 0x39, 0x20, 0x35, 0x38,
+	0x37, 0x2e, 0x31, 0x32, 0x32, 0x20, 0x43, 0x20, 0x34, 0x34, 0x32, 0x2e, 0x30, 0x31, 0x37, 0x20,
+	0x35, 0x37, 0x35, 0x2e, 0x38, 0x37, 0x31, 0x20, 0x34, 0x34, 0x33, 0x2e, 0x37, 0x38, 0x31, 0x20,
+	0x35, 0x35, 0x33, 0x2e, 0x35, 0x34, 0x20, 0x34, 0x34, 0x33, 0x2e, 0x37, 0x37, 0x34, 0x20, 0x35,
+	0x34, 0x30, 0x2e, 0x39, 0x32, 0x37, 0x20, 0x4c, 0x20, 0x34, 0x34, 0x33, 0x2e, 0x35, 0x38, 0x38,
+	0x20, 0x34, 0x36, 0x31, 0x2e, 0x32, 0x30, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39, 0x35, 0x2c, 0x31, 0x35, 0x35, 0x2c,
+	0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x37, 0x38, 0x2e,
+	0x33, 0x35, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x31, 0x30, 0x39, 0x20, 0x43, 0x20, 0x31, 0x31, 0x31,
+	0x32, 0x2e, 0x38, 0x36, 0x20, 0x34, 0x36, 0x30, 0x2e, 0x33, 0x31, 0x35, 0x20, 0x31, 0x31, 0x35,
+	0x30, 0x2e, 0x30, 0x31, 0x20, 0x34, 0x36, 0x30, 0x2e, 0x39, 0x39, 0x39, 0x20, 0x31, 0x31, 0x38,
+	0x34, 0x2e, 0x37, 0x32, 0x20, 0x34, 0x36, 0x30, 0x2e, 0x39, 0x38, 0x36, 0x20, 0x4c, 0x20, 0x31,
+	0x31, 0x38, 0x34, 0x2e, 0x38, 0x32, 0x20, 0x35, 0x33, 0x32, 0x2e, 0x35, 0x37, 0x31, 0x20, 0x43,
+	0x20, 0x31, 0x31, 0x38, 0x34, 0x2e, 0x38, 0x34, 0x20, 0x35, 0x36, 0x31, 0x2e, 0x30, 0x32, 0x31,
+	0x20, 0x31, 0x31, 0x38, 0x38, 0x2e, 0x36, 0x36, 0x20, 0x35, 0x38, 0x38, 0x2e, 0x33, 0x35, 0x20,
+	0x31, 0x31, 0x36, 0x39, 0x2e, 0x32, 0x39, 0x20, 0x36, 0x31, 0x31, 0x2e, 0x33, 0x32, 0x33, 0x20,
+	0x43, 0x20, 0x31, 0x31, 0x33, 0x39, 0x2e, 0x34, 0x33, 0x20, 0x36, 0x33, 0x39, 0x2e, 0x36, 0x37,
+	0x31, 0x20, 0x31, 0x30, 0x39, 0x31, 0x2e, 0x34, 0x20, 0x36, 0x32, 0x38, 0x2e, 0x36, 0x36, 0x20,
+	0x31, 0x30, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x20, 0x35, 0x38, 0x37, 0x2e, 0x31, 0x20, 0x43, 0x20,
+	0x31, 0x30, 0x37, 0x36, 0x2e, 0x39, 0x33, 0x20, 0x35, 0x37, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x31,
+	0x30, 0x37, 0x38, 0x2e, 0x35, 0x32, 0x20, 0x35, 0x35, 0x31, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x37,
+	0x38, 0x2e, 0x34, 0x36, 0x20, 0x35, 0x33, 0x37, 0x2e, 0x36, 0x33, 0x38, 0x20, 0x43, 0x20, 0x31,
+	0x30, 0x37, 0x38, 0x2e, 0x32, 0x31, 0x20, 0x35, 0x31, 0x32, 0x2e, 0x31, 0x32, 0x39, 0x20, 0x31,
+	0x30, 0x37, 0x38, 0x2e, 0x31, 0x38, 0x20, 0x34, 0x38, 0x36, 0x2e, 0x36, 0x31, 0x39, 0x20, 0x31,
+	0x30, 0x37, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x31, 0x30, 0x39, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39,
+	0x35, 0x2c, 0x31, 0x35, 0x35, 0x2c, 0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x20, 0x31, 0x32, 0x39, 0x32, 0x2e, 0x33, 0x37, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x37, 0x37, 0x36,
+	0x20, 0x4c, 0x20, 0x31, 0x33, 0x39, 0x38, 0x2e, 0x31, 0x34, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x38,
+	0x33, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x39, 0x38, 0x2e, 0x32, 0x34, 0x20, 0x35, 0x33, 0x37,
+	0x2e, 0x35, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x38, 0x2e, 0x32, 0x38, 0x20, 0x35,
+	0x36, 0x36, 0x2e, 0x37, 0x31, 0x33, 0x20, 0x31, 0x34, 0x30, 0x33, 0x2e, 0x32, 0x34, 0x20, 0x35,
+	0x38, 0x39, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x33, 0x38, 0x32, 0x2e, 0x36, 0x33, 0x20, 0x36, 0x31,
+	0x33, 0x2e, 0x31, 0x33, 0x32, 0x20, 0x43, 0x20, 0x31, 0x33, 0x36, 0x35, 0x2e, 0x32, 0x31, 0x20,
+	0x36, 0x32, 0x39, 0x2e, 0x39, 0x31, 0x38, 0x20, 0x31, 0x33, 0x34, 0x32, 0x2e, 0x30, 0x37, 0x20,
+	0x36, 0x33, 0x32, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x31, 0x33, 0x32, 0x30, 0x2e, 0x36, 0x33, 0x20,
+	0x36, 0x32, 0x32, 0x2e, 0x32, 0x36, 0x32, 0x20, 0x43, 0x20, 0x31, 0x32, 0x38, 0x37, 0x2e, 0x33,
+	0x37, 0x20, 0x36, 0x30, 0x36, 0x2e, 0x32, 0x36, 0x31, 0x20, 0x31, 0x32, 0x39, 0x32, 0x2e, 0x36,
+	0x31, 0x20, 0x35, 0x37, 0x30, 0x2e, 0x34, 0x31, 0x35, 0x20, 0x31, 0x32, 0x39, 0x32, 0x2e, 0x35,
+	0x34, 0x20, 0x35, 0x34, 0x30, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x39, 0x32,
+	0x2e, 0x33, 0x37, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x37, 0x37, 0x36, 0x20, 0x7a, 0x22, 0x2f, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39, 0x35, 0x2c, 0x31,
+	0x35, 0x35, 0x2c, 0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x35,
+	0x33, 0x2e, 0x35, 0x36, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x34, 0x38, 0x20, 0x4c, 0x20, 0x37, 0x36,
+	0x32, 0x2e, 0x33, 0x38, 0x31, 0x20, 0x34, 0x36, 0x31, 0x2e, 0x35, 0x30, 0x37, 0x20, 0x4c, 0x20,
+	0x37, 0x36, 0x32, 0x2e, 0x38, 0x30, 0x39, 0x20, 0x35, 0x33, 0x33, 0x2e, 0x32, 0x37, 0x37, 0x20,
+	0x43, 0x20, 0x37, 0x36, 0x32, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x35, 0x34, 0x36, 0x2e, 0x37, 0x39,
+	0x37, 0x20, 0x37, 0x36, 0x33, 0x2e, 0x36, 0x34, 0x39, 0x20, 0x35, 0x36, 0x39, 0x2e, 0x30, 0x36,
+	0x37, 0x20, 0x37, 0x36, 0x31, 0x2e, 0x35, 0x35, 0x35, 0x20, 0x35, 0x38, 0x31, 0x2e, 0x37, 0x31,
+	0x34, 0x20, 0x43, 0x20, 0x37, 0x36, 0x30, 0x2e, 0x33, 0x35, 0x39, 0x20, 0x35, 0x38, 0x39, 0x2e,
+	0x32, 0x38, 0x32, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x36, 0x37, 0x38, 0x20, 0x35, 0x39, 0x36, 0x2e,
+	0x35, 0x33, 0x39, 0x20, 0x37, 0x35, 0x33, 0x2e, 0x36, 0x36, 0x35, 0x20, 0x36, 0x30, 0x33, 0x2e,
+	0x30, 0x36, 0x36, 0x20, 0x43, 0x20, 0x37, 0x33, 0x37, 0x2e, 0x31, 0x38, 0x20, 0x36, 0x32, 0x39,
+	0x2e, 0x34, 0x37, 0x32, 0x20, 0x37, 0x30, 0x34, 0x2e, 0x34, 0x31, 0x35, 0x20, 0x36, 0x33, 0x34,
+	0x2e, 0x32, 0x39, 0x20, 0x36, 0x37, 0x38, 0x2e, 0x38, 0x30, 0x36, 0x20, 0x36, 0x31, 0x38, 0x2e,
+	0x31, 0x33, 0x36, 0x20, 0x43, 0x20, 0x36, 0x35, 0x30, 0x2e, 0x39, 0x34, 0x32, 0x20, 0x35, 0x39,
+	0x36, 0x2e, 0x35, 0x31, 0x31, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x37, 0x35, 0x39, 0x20, 0x35, 0x36,
+	0x38, 0x2e, 0x31, 0x34, 0x38, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x37, 0x36, 0x37, 0x20, 0x35, 0x33,
+	0x36, 0x2e, 0x34, 0x33, 0x37, 0x20, 0x4c, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x38, 0x34, 0x33, 0x20,
+	0x34, 0x36, 0x31, 0x2e, 0x37, 0x33, 0x33, 0x20, 0x43, 0x20, 0x36, 0x38, 0x38, 0x2e, 0x33, 0x33,
+	0x20, 0x34, 0x36, 0x31, 0x2e, 0x30, 0x34, 0x31, 0x20, 0x37, 0x32, 0x31, 0x2e, 0x36, 0x37, 0x31,
+	0x20, 0x34, 0x36, 0x31, 0x2e, 0x37, 0x39, 0x36, 0x20, 0x37, 0x35, 0x33, 0x2e, 0x35, 0x36, 0x20,
+	0x34, 0x36, 0x31, 0x2e, 0x34, 0x38, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32,
+	0x35, 0x35, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39, 0x31, 0x38, 0x2e, 0x39, 0x34,
+	0x31, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x33, 0x36, 0x20, 0x43, 0x20, 0x39, 0x33, 0x32, 0x2e, 0x33,
+	0x37, 0x34, 0x20, 0x33, 0x32, 0x36, 0x2e, 0x36, 0x38, 0x34, 0x20, 0x39, 0x34, 0x38, 0x2e, 0x39,
+	0x37, 0x37, 0x20, 0x33, 0x33, 0x33, 0x2e, 0x32, 0x36, 0x34, 0x20, 0x39, 0x35, 0x38, 0x2e, 0x34,
+	0x34, 0x37, 0x20, 0x33, 0x34, 0x32, 0x2e, 0x35, 0x35, 0x34, 0x20, 0x43, 0x20, 0x39, 0x38, 0x30,
+	0x2e, 0x35, 0x31, 0x34, 0x20, 0x33, 0x36, 0x34, 0x2e, 0x32, 0x30, 0x31, 0x20, 0x39, 0x37, 0x35,
+	0x2e, 0x30, 0x32, 0x34, 0x20, 0x34, 0x30, 0x33, 0x2e, 0x37, 0x37, 0x39, 0x20, 0x39, 0x37, 0x34,
+	0x2e, 0x39, 0x36, 0x39, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x36, 0x35, 0x36, 0x20, 0x4c, 0x20, 0x39,
+	0x32, 0x35, 0x2e, 0x35, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x37, 0x32, 0x35, 0x20, 0x4c, 0x20, 0x38,
+	0x36, 0x38, 0x2e, 0x33, 0x30, 0x38, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x36, 0x39, 0x36, 0x20, 0x43,
+	0x20, 0x38, 0x36, 0x38, 0x2e, 0x30, 0x35, 0x20, 0x33, 0x38, 0x38, 0x2e, 0x30, 0x37, 0x36, 0x20,
+	0x38, 0x35, 0x39, 0x2e, 0x31, 0x39, 0x33, 0x20, 0x33, 0x33, 0x36, 0x2e, 0x31, 0x31, 0x32, 0x20,
+	0x39, 0x31, 0x38, 0x2e, 0x39, 0x34, 0x31, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x33, 0x36, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32,
+	0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x20, 0x31, 0x31, 0x32, 0x34, 0x2e, 0x33, 0x34, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x31, 0x37,
+	0x39, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x34, 0x2e, 0x36, 0x38, 0x20, 0x33, 0x32, 0x35, 0x2e,
+	0x36, 0x37, 0x32, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x31, 0x32, 0x20, 0x33, 0x34, 0x34, 0x2e,
+	0x35, 0x38, 0x36, 0x20, 0x31, 0x31, 0x38, 0x33, 0x2e, 0x33, 0x33, 0x20, 0x33, 0x37, 0x34, 0x2e,
+	0x38, 0x33, 0x37, 0x20, 0x43, 0x20, 0x31, 0x31, 0x38, 0x35, 0x2e, 0x32, 0x31, 0x20, 0x33, 0x39,
+	0x32, 0x2e, 0x36, 0x33, 0x31, 0x20, 0x31, 0x31, 0x38, 0x34, 0x2e, 0x31, 0x33, 0x20, 0x34, 0x31,
+	0x34, 0x2e, 0x36, 0x36, 0x35, 0x20, 0x31, 0x31, 0x38, 0x34, 0x2e, 0x30, 0x37, 0x20, 0x34, 0x33,
+	0x32, 0x2e, 0x37, 0x34, 0x34, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x33, 0x39, 0x2e, 0x35, 0x20, 0x34,
+	0x33, 0x32, 0x2e, 0x37, 0x37, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x37, 0x38, 0x2e, 0x32, 0x38,
+	0x20, 0x34, 0x33, 0x32, 0x2e, 0x38, 0x36, 0x35, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x37, 0x2e,
+	0x37, 0x38, 0x20, 0x33, 0x38, 0x37, 0x2e, 0x39, 0x32, 0x20, 0x31, 0x30, 0x36, 0x37, 0x2e, 0x38,
+	0x34, 0x20, 0x33, 0x34, 0x31, 0x2e, 0x30, 0x33, 0x35, 0x20, 0x31, 0x31, 0x32, 0x34, 0x2e, 0x33,
+	0x34, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x31, 0x37, 0x39, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35,
+	0x35, 0x2c, 0x32, 0x35, 0x35, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x33, 0x33,
+	0x36, 0x2e, 0x30, 0x32, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x32, 0x32, 0x33, 0x20, 0x43, 0x20, 0x31,
+	0x33, 0x33, 0x38, 0x2e, 0x31, 0x35, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x31,
+	0x33, 0x34, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x39, 0x31, 0x34, 0x20, 0x31,
+	0x33, 0x34, 0x32, 0x2e, 0x34, 0x31, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x38, 0x33, 0x33, 0x20, 0x43,
+	0x20, 0x31, 0x33, 0x35, 0x31, 0x2e, 0x39, 0x32, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x35, 0x30, 0x34,
+	0x20, 0x31, 0x33, 0x36, 0x30, 0x2e, 0x35, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x39, 0x33, 0x39, 0x20,
+	0x31, 0x33, 0x36, 0x39, 0x2e, 0x31, 0x38, 0x20, 0x33, 0x33, 0x34, 0x2e, 0x30, 0x38, 0x31, 0x20,
+	0x43, 0x20, 0x31, 0x34, 0x30, 0x35, 0x2e, 0x39, 0x32, 0x20, 0x33, 0x35, 0x31, 0x2e, 0x36, 0x30,
+	0x36, 0x20, 0x31, 0x33, 0x39, 0x38, 0x2e, 0x33, 0x32, 0x20, 0x33, 0x39, 0x39, 0x2e, 0x30, 0x33,
+	0x34, 0x20, 0x31, 0x33, 0x39, 0x38, 0x2e, 0x31, 0x31, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x36, 0x35,
+	0x33, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x35, 0x35, 0x2e, 0x35, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x37,
+	0x33, 0x31, 0x20, 0x43, 0x20, 0x31, 0x33, 0x33, 0x34, 0x2e, 0x37, 0x32, 0x20, 0x34, 0x33, 0x32,
+	0x2e, 0x37, 0x31, 0x39, 0x20, 0x31, 0x33, 0x31, 0x32, 0x2e, 0x39, 0x39, 0x20, 0x34, 0x33, 0x33,
+	0x2e, 0x30, 0x33, 0x32, 0x20, 0x31, 0x32, 0x39, 0x32, 0x2e, 0x33, 0x31, 0x20, 0x34, 0x33, 0x32,
+	0x2e, 0x30, 0x32, 0x20, 0x43, 0x20, 0x31, 0x32, 0x39, 0x30, 0x2e, 0x39, 0x36, 0x20, 0x33, 0x38,
+	0x38, 0x2e, 0x37, 0x34, 0x34, 0x20, 0x31, 0x32, 0x38, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x33, 0x34,
+	0x32, 0x2e, 0x39, 0x32, 0x39, 0x20, 0x31, 0x33, 0x33, 0x36, 0x2e, 0x30, 0x32, 0x20, 0x33, 0x32,
+	0x39, 0x2e, 0x32, 0x32, 0x33, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35,
+	0x35, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x34, 0x38, 0x39, 0x2e, 0x34, 0x33, 0x33,
+	0x20, 0x33, 0x32, 0x39, 0x2e, 0x31, 0x35, 0x36, 0x20, 0x43, 0x20, 0x35, 0x30, 0x37, 0x2e, 0x36,
+	0x30, 0x35, 0x20, 0x33, 0x32, 0x37, 0x2e, 0x38, 0x31, 0x31, 0x20, 0x35, 0x32, 0x32, 0x2e, 0x38,
+	0x35, 0x36, 0x20, 0x33, 0x33, 0x32, 0x2e, 0x31, 0x30, 0x38, 0x20, 0x35, 0x33, 0x35, 0x2e, 0x35,
+	0x34, 0x32, 0x20, 0x33, 0x34, 0x35, 0x2e, 0x39, 0x33, 0x31, 0x20, 0x43, 0x20, 0x35, 0x35, 0x35,
+	0x2e, 0x31, 0x36, 0x36, 0x20, 0x33, 0x36, 0x37, 0x2e, 0x33, 0x31, 0x31, 0x20, 0x35, 0x34, 0x39,
+	0x2e, 0x39, 0x30, 0x35, 0x20, 0x34, 0x30, 0x35, 0x2e, 0x32, 0x37, 0x33, 0x20, 0x35, 0x34, 0x39,
+	0x2e, 0x37, 0x30, 0x33, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x37, 0x35, 0x31, 0x20, 0x4c, 0x20, 0x35,
+	0x30, 0x36, 0x2e, 0x30, 0x39, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x37, 0x30, 0x38, 0x20, 0x4c, 0x20,
+	0x34, 0x34, 0x33, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x39, 0x34, 0x39, 0x20,
+	0x43, 0x20, 0x34, 0x34, 0x33, 0x2e, 0x36, 0x30, 0x37, 0x20, 0x33, 0x38, 0x39, 0x2e, 0x31, 0x31,
+	0x20, 0x34, 0x33, 0x34, 0x2e, 0x31, 0x39, 0x33, 0x20, 0x33, 0x34, 0x31, 0x2e, 0x34, 0x37, 0x32,
+	0x20, 0x34, 0x38, 0x39, 0x2e, 0x34, 0x33, 0x33, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x31, 0x35, 0x36,
+	0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65,
+	0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62,
+	0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x29, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x20, 0x37, 0x30, 0x32, 0x2e, 0x39, 0x35, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x32,
+	0x35, 0x35, 0x20, 0x43, 0x20, 0x37, 0x34, 0x38, 0x2e, 0x31, 0x31, 0x38, 0x20, 0x33, 0x32, 0x34,
+	0x2e, 0x35, 0x39, 0x33, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x34, 0x32, 0x38, 0x20, 0x33, 0x36, 0x33,
+	0x2e, 0x30, 0x30, 0x36, 0x20, 0x37, 0x36, 0x32, 0x2e, 0x32, 0x34, 0x38, 0x20, 0x34, 0x30, 0x30,
+	0x2e, 0x38, 0x36, 0x35, 0x20, 0x43, 0x20, 0x37, 0x36, 0x31, 0x2e, 0x33, 0x31, 0x32, 0x20, 0x34,
+	0x30, 0x39, 0x2e, 0x33, 0x34, 0x35, 0x20, 0x37, 0x36, 0x32, 0x2e, 0x32, 0x30, 0x32, 0x20, 0x34,
+	0x32, 0x33, 0x2e, 0x36, 0x33, 0x36, 0x20, 0x37, 0x36, 0x32, 0x2e, 0x31, 0x36, 0x36, 0x20, 0x34,
+	0x33, 0x32, 0x2e, 0x37, 0x33, 0x31, 0x20, 0x4c, 0x20, 0x37, 0x31, 0x37, 0x2e, 0x35, 0x20, 0x34,
+	0x33, 0x32, 0x2e, 0x37, 0x39, 0x20, 0x4c, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x37, 0x31, 0x33, 0x20,
+	0x34, 0x33, 0x32, 0x2e, 0x38, 0x39, 0x39, 0x20, 0x43, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x35, 0x35,
+	0x38, 0x20, 0x33, 0x38, 0x39, 0x2e, 0x32, 0x34, 0x37, 0x20, 0x36, 0x34, 0x37, 0x2e, 0x33, 0x30,
+	0x37, 0x20, 0x33, 0x34, 0x30, 0x2e, 0x34, 0x34, 0x39, 0x20, 0x37, 0x30, 0x32, 0x2e, 0x39, 0x35,
+	0x20, 0x33, 0x32, 0x39, 0x2e, 0x32, 0x35, 0x35, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35,
+	0x2c, 0x32, 0x35, 0x35, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x35, 0x34, 0x37,
+	0x2e, 0x38, 0x39, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x33, 0x30, 0x31, 0x20, 0x43, 0x20, 0x31, 0x35,
+	0x34, 0x39, 0x2e, 0x39, 0x31, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x31, 0x32, 0x32, 0x20, 0x31, 0x35,
+	0x35, 0x31, 0x2e, 0x39, 0x37, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x39, 0x36, 0x31, 0x20, 0x31, 0x35,
+	0x35, 0x34, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x39, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x35, 0x36,
+	0x37, 0x2e, 0x39, 0x38, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x38, 0x36, 0x33, 0x20, 0x31, 0x35, 0x38,
+	0x31, 0x2e, 0x34, 0x32, 0x20, 0x33, 0x33, 0x34, 0x2e, 0x33, 0x31, 0x35, 0x20, 0x31, 0x35, 0x39,
+	0x31, 0x2e, 0x33, 0x39, 0x20, 0x33, 0x34, 0x34, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x43, 0x20, 0x31,
+	0x36, 0x31, 0x33, 0x2e, 0x34, 0x38, 0x20, 0x33, 0x36, 0x35, 0x2e, 0x37, 0x35, 0x33, 0x20, 0x31,
+	0x36, 0x30, 0x38, 0x2e, 0x31, 0x20, 0x34, 0x30, 0x32, 0x2e, 0x35, 0x39, 0x20, 0x31, 0x36, 0x30,
+	0x37, 0x2e, 0x39, 0x34, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x34, 0x39, 0x35, 0x20, 0x4c, 0x20, 0x31,
+	0x35, 0x36, 0x30, 0x2e, 0x38, 0x38, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x34, 0x39, 0x33, 0x20, 0x4c,
+	0x20, 0x31, 0x35, 0x30, 0x31, 0x2e, 0x38, 0x39, 0x20, 0x34, 0x33, 0x32, 0x2e, 0x36, 0x35, 0x33,
+	0x20, 0x43, 0x20, 0x31, 0x35, 0x30, 0x31, 0x2e, 0x35, 0x37, 0x20, 0x33, 0x39, 0x31, 0x2e, 0x30,
+	0x30, 0x37, 0x20, 0x31, 0x34, 0x39, 0x32, 0x2e, 0x37, 0x20, 0x33, 0x33, 0x39, 0x2e, 0x30, 0x31,
+	0x38, 0x20, 0x31, 0x35, 0x34, 0x37, 0x2e, 0x38, 0x39, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x33, 0x30,
+	0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e
+};
+
+static const unsigned char icon_client_creditsgrey_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0xec, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0x63, 0x60, 0x20,
+	0x01, 0xcc, 0x9b, 0x37, 0x4f, 0x0b, 0x5d, 0x8c, 0x89, 0x58, 0xcd, 0xab, 0x56, 0xad, 0x62, 0x66,
+	0x61, 0x61, 0x59, 0xb6, 0x6a, 0xd5, 0x2a, 0x66, 0xb2, 0x0c, 0xf8, 0xfa, 0xf5, 0xab, 0x93, 0x91,
+	0x91, 0x91, 0xfe, 0x97, 0x2f, 0x5f, 0x1c, 0x91, 0xc5, 0x19, 0xf1, 0x69, 0x9a, 0x3b, 0x77, 0x6e,
+	0x34, 0x0f, 0x0f, 0x8f, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x33, 0x33, 0xb3, 0x91, 0x8f, 0x8f, 0x8f,
+	0xc6, 0x96, 0x2d, 0x5b, 0x6e, 0xfc, 0xfb, 0xf7, 0xef, 0xc2, 0xf7, 0xef, 0xdf, 0x7f, 0x7c, 0xfd,
+	0xfa, 0x75, 0x3f, 0x33, 0x3e, 0x03, 0x62, 0x62, 0x62, 0xae, 0xfd, 0xff, 0xff, 0xdf, 0x58, 0x5f,
+	0x5f, 0x3f, 0xd3, 0xc2, 0xc2, 0x42, 0x94, 0x81, 0x81, 0x81, 0x41, 0x4d, 0x4d, 0x4d, 0x84, 0x99,
+	0x99, 0x59, 0xeb, 0xe9, 0xd3, 0xa7, 0xdb, 0x38, 0x39, 0x39, 0x27, 0x11, 0xe5, 0xfc, 0x79, 0xf3,
+	0xe6, 0x85, 0x3f, 0x7d, 0xfa, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x79, 0xf2, 0xe4, 0xff,
+	0xdc, 0xb9, 0x73, 0xc3, 0x60, 0x72, 0x44, 0x85, 0x01, 0x17, 0x17, 0x97, 0x31, 0x0b, 0x0b, 0x0b,
+	0xc3, 0xfe, 0xfd, 0xfb, 0xdf, 0xb2, 0xb1, 0xb1, 0x31, 0x70, 0x73, 0x73, 0x1b, 0x12, 0x6d, 0xc0,
+	0xff, 0xff, 0xff, 0x19, 0xff, 0xff, 0xff, 0xef, 0xbb, 0x7b, 0xf7, 0xee, 0xc2, 0x43, 0x87, 0x0e,
+	0x89, 0xed, 0xda, 0xb5, 0xab, 0xe4, 0xff, 0xff, 0xff, 0xfe, 0x44, 0x39, 0x1d, 0xea, 0x7c, 0x51,
+	0xf4, 0xf8, 0x5f, 0xb0, 0x60, 0x81, 0xf6, 0xcc, 0x99, 0x33, 0x45, 0x88, 0x36, 0x64, 0x14, 0x0c,
+	0x76, 0x00, 0x00, 0x98, 0x0a, 0x58, 0x44, 0x30, 0x34, 0x19, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x49,
+	0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_creditsgrey_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x37, 0x37, 0x33, 0x2e, 0x37, 0x37, 0x2c,
+	0x2d, 0x39, 0x37, 0x2e, 0x31, 0x32, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e,
+	0x36, 0x38, 0x30, 0x37, 0x29, 0x22, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61,
+	0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72,
+	0x67, 0x62, 0x28, 0x31, 0x35, 0x38, 0x2c, 0x31, 0x35, 0x38, 0x2c, 0x31, 0x35, 0x38, 0x29, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x32, 0x34, 0x2e, 0x36, 0x36, 0x20, 0x32, 0x30,
+	0x32, 0x2e, 0x36, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x30, 0x33, 0x30, 0x2e, 0x33, 0x31, 0x20,
+	0x32, 0x30, 0x39, 0x2e, 0x31, 0x35, 0x36, 0x20, 0x31, 0x30, 0x39, 0x33, 0x2e, 0x39, 0x38, 0x20,
+	0x33, 0x39, 0x35, 0x2e, 0x39, 0x32, 0x37, 0x20, 0x31, 0x31, 0x30, 0x31, 0x2e, 0x35, 0x33, 0x20,
+	0x34, 0x31, 0x37, 0x2e, 0x35, 0x32, 0x31, 0x20, 0x43, 0x20, 0x31, 0x31, 0x33, 0x37, 0x2e, 0x38,
+	0x39, 0x20, 0x35, 0x31, 0x38, 0x2e, 0x39, 0x32, 0x36, 0x20, 0x31, 0x31, 0x37, 0x33, 0x2e, 0x36,
+	0x32, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x35, 0x36, 0x31, 0x20, 0x31, 0x32, 0x30, 0x38, 0x2e, 0x36,
+	0x39, 0x20, 0x37, 0x32, 0x32, 0x2e, 0x34, 0x31, 0x39, 0x20, 0x43, 0x20, 0x31, 0x32, 0x31, 0x35,
+	0x2e, 0x34, 0x31, 0x20, 0x37, 0x34, 0x31, 0x2e, 0x39, 0x31, 0x34, 0x20, 0x31, 0x32, 0x32, 0x36,
+	0x2e, 0x31, 0x39, 0x20, 0x37, 0x36, 0x38, 0x2e, 0x31, 0x38, 0x36, 0x20, 0x31, 0x32, 0x33, 0x31,
+	0x2e, 0x35, 0x20, 0x37, 0x38, 0x37, 0x2e, 0x30, 0x33, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x33,
+	0x30, 0x2e, 0x30, 0x34, 0x20, 0x37, 0x38, 0x39, 0x2e, 0x33, 0x33, 0x33, 0x20, 0x31, 0x34, 0x33,
+	0x33, 0x2e, 0x31, 0x37, 0x20, 0x37, 0x38, 0x38, 0x2e, 0x31, 0x30, 0x38, 0x20, 0x31, 0x35, 0x33,
+	0x32, 0x2e, 0x30, 0x35, 0x20, 0x37, 0x38, 0x37, 0x2e, 0x37, 0x39, 0x33, 0x20, 0x43, 0x20, 0x31,
+	0x36, 0x34, 0x34, 0x2e, 0x36, 0x35, 0x20, 0x37, 0x38, 0x37, 0x2e, 0x34, 0x33, 0x34, 0x20, 0x31,
+	0x37, 0x35, 0x39, 0x2e, 0x35, 0x38, 0x20, 0x37, 0x38, 0x39, 0x2e, 0x30, 0x35, 0x38, 0x20, 0x31,
+	0x38, 0x37, 0x31, 0x2e, 0x39, 0x33, 0x20, 0x37, 0x38, 0x37, 0x2e, 0x35, 0x36, 0x33, 0x20, 0x43,
+	0x20, 0x31, 0x38, 0x34, 0x36, 0x2e, 0x38, 0x39, 0x20, 0x38, 0x30, 0x34, 0x2e, 0x30, 0x33, 0x38,
+	0x20, 0x31, 0x38, 0x31, 0x38, 0x2e, 0x35, 0x31, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x32, 0x34, 0x33,
+	0x20, 0x31, 0x37, 0x39, 0x33, 0x2e, 0x37, 0x35, 0x20, 0x38, 0x34, 0x32, 0x2e, 0x38, 0x31, 0x20,
+	0x4c, 0x20, 0x31, 0x36, 0x34, 0x31, 0x2e, 0x38, 0x35, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x30, 0x34,
+	0x34, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x34, 0x38, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x30, 0x38, 0x36,
+	0x2e, 0x37, 0x38, 0x20, 0x43, 0x20, 0x31, 0x34, 0x31, 0x32, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x31,
+	0x31, 0x32, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x33, 0x36, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x31, 0x34,
+	0x31, 0x2e, 0x30, 0x39, 0x20, 0x31, 0x33, 0x33, 0x34, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x31, 0x36,
+	0x38, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x31, 0x33, 0x36, 0x32, 0x2e, 0x36, 0x35, 0x20, 0x31,
+	0x32, 0x34, 0x36, 0x2e, 0x32, 0x20, 0x31, 0x33, 0x38, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x33, 0x32,
+	0x36, 0x2e, 0x31, 0x35, 0x20, 0x31, 0x34, 0x31, 0x37, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x30,
+	0x34, 0x2e, 0x35, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x34, 0x36, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x37,
+	0x37, 0x35, 0x2e, 0x30, 0x32, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31, 0x35, 0x2e, 0x34, 0x33, 0x20,
+	0x31, 0x37, 0x35, 0x34, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x38, 0x30, 0x2e, 0x30, 0x37, 0x20,
+	0x31, 0x37, 0x32, 0x37, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x34, 0x34, 0x38, 0x2e, 0x35, 0x37, 0x20,
+	0x31, 0x37, 0x30, 0x35, 0x2e, 0x32, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x32, 0x31, 0x2e, 0x39,
+	0x35, 0x20, 0x31, 0x34, 0x37, 0x35, 0x2e, 0x34, 0x35, 0x20, 0x43, 0x20, 0x31, 0x30, 0x39, 0x30,
+	0x2e, 0x31, 0x32, 0x20, 0x31, 0x34, 0x35, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x35, 0x37, 0x2e,
+	0x38, 0x32, 0x20, 0x31, 0x34, 0x32, 0x38, 0x2e, 0x32, 0x31, 0x20, 0x31, 0x30, 0x32, 0x35, 0x2e,
+	0x34, 0x35, 0x20, 0x31, 0x34, 0x30, 0x37, 0x2e, 0x33, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x32,
+	0x33, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x30, 0x36, 0x2e, 0x39, 0x33, 0x20, 0x43, 0x20, 0x31,
+	0x30, 0x31, 0x32, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x34, 0x31, 0x32, 0x2e, 0x31, 0x33, 0x20, 0x39,
+	0x37, 0x37, 0x2e, 0x32, 0x30, 0x34, 0x20, 0x31, 0x34, 0x33, 0x39, 0x2e, 0x31, 0x34, 0x20, 0x39,
+	0x36, 0x36, 0x2e, 0x30, 0x30, 0x32, 0x20, 0x31, 0x34, 0x34, 0x37, 0x2e, 0x32, 0x20, 0x4c, 0x20,
+	0x38, 0x34, 0x36, 0x2e, 0x35, 0x30, 0x34, 0x20, 0x31, 0x35, 0x33, 0x32, 0x2e, 0x34, 0x37, 0x20,
+	0x4c, 0x20, 0x35, 0x30, 0x33, 0x2e, 0x39, 0x31, 0x38, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x37,
+	0x34, 0x20, 0x43, 0x20, 0x35, 0x31, 0x30, 0x2e, 0x31, 0x35, 0x34, 0x20, 0x31, 0x37, 0x35, 0x33,
+	0x2e, 0x39, 0x37, 0x20, 0x35, 0x31, 0x38, 0x2e, 0x30, 0x33, 0x32, 0x20, 0x31, 0x37, 0x33, 0x33,
+	0x2e, 0x38, 0x34, 0x20, 0x35, 0x32, 0x35, 0x2e, 0x30, 0x39, 0x36, 0x20, 0x31, 0x37, 0x31, 0x33,
+	0x2e, 0x33, 0x20, 0x4c, 0x20, 0x35, 0x38, 0x30, 0x2e, 0x32, 0x31, 0x37, 0x20, 0x31, 0x35, 0x35,
+	0x37, 0x2e, 0x35, 0x38, 0x20, 0x43, 0x20, 0x35, 0x38, 0x38, 0x2e, 0x34, 0x30, 0x32, 0x20, 0x31,
+	0x35, 0x33, 0x34, 0x2e, 0x36, 0x38, 0x20, 0x35, 0x39, 0x35, 0x2e, 0x36, 0x32, 0x39, 0x20, 0x31,
+	0x35, 0x31, 0x31, 0x2e, 0x33, 0x31, 0x20, 0x36, 0x30, 0x33, 0x2e, 0x37, 0x38, 0x20, 0x31, 0x34,
+	0x38, 0x38, 0x2e, 0x33, 0x37, 0x20, 0x43, 0x20, 0x36, 0x34, 0x32, 0x2e, 0x30, 0x32, 0x33, 0x20,
+	0x31, 0x33, 0x38, 0x31, 0x2e, 0x34, 0x31, 0x20, 0x36, 0x37, 0x39, 0x2e, 0x36, 0x36, 0x35, 0x20,
+	0x31, 0x32, 0x37, 0x34, 0x2e, 0x32, 0x34, 0x20, 0x37, 0x31, 0x36, 0x2e, 0x37, 0x30, 0x34, 0x20,
+	0x31, 0x31, 0x36, 0x36, 0x2e, 0x38, 0x35, 0x20, 0x43, 0x20, 0x36, 0x39, 0x32, 0x2e, 0x34, 0x34,
+	0x39, 0x20, 0x31, 0x31, 0x34, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x36, 0x36, 0x31, 0x2e, 0x32, 0x31,
+	0x33, 0x20, 0x31, 0x31, 0x32, 0x38, 0x2e, 0x32, 0x38, 0x20, 0x36, 0x33, 0x35, 0x2e, 0x38, 0x38,
+	0x20, 0x31, 0x31, 0x31, 0x30, 0x2e, 0x33, 0x20, 0x4c, 0x20, 0x34, 0x32, 0x35, 0x2e, 0x33, 0x33,
+	0x20, 0x39, 0x36, 0x31, 0x2e, 0x36, 0x34, 0x39, 0x20, 0x4c, 0x20, 0x32, 0x36, 0x30, 0x2e, 0x38,
+	0x30, 0x34, 0x20, 0x38, 0x34, 0x35, 0x2e, 0x30, 0x38, 0x38, 0x20, 0x43, 0x20, 0x32, 0x33, 0x34,
+	0x2e, 0x31, 0x36, 0x31, 0x20, 0x38, 0x32, 0x36, 0x2e, 0x32, 0x35, 0x32, 0x20, 0x32, 0x30, 0x36,
+	0x2e, 0x36, 0x37, 0x35, 0x20, 0x38, 0x30, 0x35, 0x2e, 0x39, 0x35, 0x31, 0x20, 0x31, 0x37, 0x39,
+	0x2e, 0x35, 0x36, 0x36, 0x20, 0x37, 0x38, 0x38, 0x2e, 0x30, 0x36, 0x20, 0x4c, 0x20, 0x38, 0x31,
+	0x38, 0x2e, 0x32, 0x35, 0x39, 0x20, 0x37, 0x38, 0x37, 0x2e, 0x37, 0x34, 0x38, 0x20, 0x43, 0x20,
+	0x38, 0x32, 0x37, 0x2e, 0x34, 0x33, 0x34, 0x20, 0x37, 0x36, 0x30, 0x2e, 0x37, 0x35, 0x36, 0x20,
+	0x38, 0x33, 0x38, 0x2e, 0x33, 0x20, 0x37, 0x33, 0x33, 0x2e, 0x37, 0x30, 0x35, 0x20, 0x38, 0x34,
+	0x37, 0x2e, 0x37, 0x34, 0x33, 0x20, 0x37, 0x30, 0x36, 0x2e, 0x36, 0x39, 0x33, 0x20, 0x4c, 0x20,
+	0x39, 0x35, 0x34, 0x2e, 0x39, 0x38, 0x37, 0x20, 0x34, 0x30, 0x32, 0x2e, 0x34, 0x31, 0x37, 0x20,
+	0x43, 0x20, 0x39, 0x37, 0x38, 0x2e, 0x36, 0x33, 0x33, 0x20, 0x33, 0x33, 0x36, 0x2e, 0x31, 0x31,
+	0x39, 0x20, 0x31, 0x30, 0x30, 0x30, 0x2e, 0x34, 0x31, 0x20, 0x32, 0x36, 0x39, 0x2e, 0x30, 0x33,
+	0x36, 0x20, 0x31, 0x30, 0x32, 0x34, 0x2e, 0x36, 0x36, 0x20, 0x32, 0x30, 0x32, 0x2e, 0x36, 0x39,
+	0x35, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74,
+	0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67,
+	0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x32, 0x35, 0x2e, 0x32, 0x38, 0x20, 0x34, 0x36, 0x33,
+	0x2e, 0x36, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x37, 0x2e, 0x37, 0x37, 0x20, 0x34,
+	0x36, 0x36, 0x2e, 0x30, 0x33, 0x37, 0x20, 0x31, 0x31, 0x36, 0x30, 0x2e, 0x33, 0x33, 0x20, 0x38,
+	0x34, 0x36, 0x2e, 0x35, 0x35, 0x32, 0x20, 0x31, 0x31, 0x37, 0x32, 0x2e, 0x30, 0x35, 0x20, 0x38,
+	0x37, 0x38, 0x2e, 0x35, 0x33, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x36, 0x30, 0x32, 0x2e, 0x30, 0x33,
+	0x20, 0x38, 0x36, 0x39, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x43, 0x20, 0x31, 0x35, 0x39, 0x32, 0x2e,
+	0x30, 0x32, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x35, 0x32, 0x35, 0x20, 0x31, 0x35, 0x37, 0x35, 0x2e,
+	0x39, 0x35, 0x20, 0x38, 0x38, 0x39, 0x2e, 0x31, 0x37, 0x39, 0x20, 0x31, 0x35, 0x36, 0x34, 0x2e,
+	0x39, 0x36, 0x20, 0x38, 0x39, 0x36, 0x2e, 0x38, 0x34, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x30,
+	0x37, 0x2e, 0x33, 0x35, 0x20, 0x39, 0x33, 0x37, 0x2e, 0x33, 0x30, 0x36, 0x20, 0x4c, 0x20, 0x31,
+	0x33, 0x31, 0x38, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x30, 0x36, 0x39, 0x2e, 0x36, 0x36, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x38, 0x38, 0x2e, 0x35, 0x32, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x34, 0x31,
+	0x20, 0x31, 0x32, 0x35, 0x38, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x31, 0x30, 0x39, 0x2e, 0x34, 0x35,
+	0x20, 0x31, 0x32, 0x32, 0x39, 0x2e, 0x36, 0x33, 0x20, 0x31, 0x31, 0x33, 0x31, 0x2e, 0x32, 0x39,
+	0x20, 0x43, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x31, 0x35, 0x33, 0x2e,
+	0x39, 0x34, 0x20, 0x31, 0x32, 0x34, 0x35, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x31, 0x37, 0x38, 0x2e,
+	0x30, 0x36, 0x20, 0x31, 0x32, 0x35, 0x33, 0x2e, 0x33, 0x20, 0x31, 0x32, 0x30, 0x30, 0x2e, 0x39,
+	0x34, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x30, 0x38, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x33, 0x35, 0x39,
+	0x2e, 0x36, 0x31, 0x20, 0x43, 0x20, 0x31, 0x33, 0x32, 0x33, 0x2e, 0x33, 0x37, 0x20, 0x31, 0x33,
+	0x39, 0x39, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x33, 0x33, 0x37, 0x2e, 0x34, 0x38, 0x20, 0x31, 0x34,
+	0x33, 0x39, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x33, 0x35, 0x31, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x34,
+	0x38, 0x30, 0x2e, 0x31, 0x39, 0x20, 0x43, 0x20, 0x31, 0x33, 0x35, 0x38, 0x2e, 0x36, 0x33, 0x20,
+	0x31, 0x35, 0x30, 0x31, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x33, 0x36, 0x36, 0x2e, 0x36, 0x35, 0x20,
+	0x31, 0x35, 0x32, 0x32, 0x2e, 0x36, 0x32, 0x20, 0x31, 0x33, 0x37, 0x33, 0x2e, 0x33, 0x33, 0x20,
+	0x31, 0x35, 0x34, 0x33, 0x2e, 0x38, 0x34, 0x20, 0x43, 0x20, 0x31, 0x33, 0x33, 0x33, 0x2e, 0x30,
+	0x39, 0x20, 0x31, 0x35, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x31, 0x32, 0x37, 0x39, 0x2e, 0x37, 0x31,
+	0x20, 0x31, 0x34, 0x37, 0x37, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x32, 0x39,
+	0x20, 0x31, 0x34, 0x34, 0x37, 0x2e, 0x32, 0x37, 0x20, 0x43, 0x20, 0x31, 0x31, 0x36, 0x36, 0x2e,
+	0x30, 0x36, 0x20, 0x31, 0x33, 0x39, 0x36, 0x2e, 0x32, 0x39, 0x20, 0x31, 0x30, 0x39, 0x34, 0x2e,
+	0x35, 0x36, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e,
+	0x37, 0x38, 0x20, 0x31, 0x32, 0x39, 0x35, 0x2e, 0x34, 0x38, 0x20, 0x43, 0x20, 0x31, 0x30, 0x31,
+	0x38, 0x2e, 0x34, 0x32, 0x20, 0x31, 0x32, 0x39, 0x36, 0x2e, 0x35, 0x34, 0x20, 0x37, 0x30, 0x36,
+	0x2e, 0x30, 0x32, 0x39, 0x20, 0x31, 0x35, 0x32, 0x31, 0x2e, 0x39, 0x31, 0x20, 0x36, 0x37, 0x36,
+	0x2e, 0x33, 0x31, 0x37, 0x20, 0x31, 0x35, 0x34, 0x33, 0x2e, 0x36, 0x34, 0x20, 0x43, 0x20, 0x37,
+	0x32, 0x35, 0x2e, 0x33, 0x33, 0x31, 0x20, 0x31, 0x34, 0x30, 0x36, 0x2e, 0x37, 0x37, 0x20, 0x37,
+	0x37, 0x33, 0x2e, 0x35, 0x30, 0x32, 0x20, 0x31, 0x32, 0x36, 0x39, 0x2e, 0x36, 0x20, 0x38, 0x32,
+	0x30, 0x2e, 0x38, 0x32, 0x39, 0x20, 0x31, 0x31, 0x33, 0x32, 0x2e, 0x31, 0x33, 0x20, 0x43, 0x20,
+	0x38, 0x31, 0x33, 0x2e, 0x31, 0x31, 0x37, 0x20, 0x31, 0x31, 0x32, 0x34, 0x2e, 0x39, 0x39, 0x20,
+	0x37, 0x39, 0x32, 0x2e, 0x32, 0x34, 0x39, 0x20, 0x31, 0x31, 0x31, 0x31, 0x2e, 0x33, 0x38, 0x20,
+	0x37, 0x38, 0x32, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x31, 0x31, 0x30, 0x34, 0x2e, 0x39, 0x36, 0x20,
+	0x4c, 0x20, 0x37, 0x32, 0x36, 0x2e, 0x37, 0x33, 0x31, 0x20, 0x31, 0x30, 0x36, 0x35, 0x2e, 0x36,
+	0x31, 0x20, 0x43, 0x20, 0x36, 0x35, 0x35, 0x2e, 0x32, 0x30, 0x35, 0x20, 0x31, 0x30, 0x31, 0x36,
+	0x2e, 0x37, 0x20, 0x35, 0x38, 0x34, 0x2e, 0x32, 0x30, 0x31, 0x20, 0x39, 0x36, 0x37, 0x2e, 0x30,
+	0x33, 0x33, 0x20, 0x35, 0x31, 0x33, 0x2e, 0x37, 0x33, 0x20, 0x39, 0x31, 0x36, 0x2e, 0x36, 0x31,
+	0x33, 0x20, 0x43, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x30, 0x34, 0x37, 0x20, 0x39, 0x30, 0x31, 0x2e,
+	0x37, 0x33, 0x33, 0x20, 0x34, 0x36, 0x34, 0x2e, 0x38, 0x37, 0x20, 0x38, 0x38, 0x34, 0x2e, 0x38,
+	0x39, 0x38, 0x20, 0x34, 0x34, 0x36, 0x2e, 0x35, 0x30, 0x38, 0x20, 0x38, 0x36, 0x39, 0x2e, 0x37,
+	0x37, 0x39, 0x20, 0x43, 0x20, 0x35, 0x31, 0x37, 0x2e, 0x37, 0x31, 0x31, 0x20, 0x38, 0x37, 0x30,
+	0x2e, 0x32, 0x38, 0x37, 0x20, 0x35, 0x39, 0x31, 0x2e, 0x37, 0x36, 0x37, 0x20, 0x38, 0x37, 0x33,
+	0x2e, 0x30, 0x31, 0x32, 0x20, 0x36, 0x36, 0x32, 0x2e, 0x39, 0x37, 0x20, 0x38, 0x37, 0x34, 0x2e,
+	0x37, 0x36, 0x35, 0x20, 0x4c, 0x20, 0x38, 0x37, 0x39, 0x2e, 0x31, 0x37, 0x32, 0x20, 0x38, 0x37,
+	0x39, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x43, 0x20, 0x38, 0x39, 0x37, 0x2e, 0x31, 0x32, 0x31, 0x20,
+	0x38, 0x33, 0x34, 0x2e, 0x38, 0x38, 0x38, 0x20, 0x39, 0x31, 0x34, 0x2e, 0x36, 0x38, 0x35, 0x20,
+	0x37, 0x37, 0x39, 0x2e, 0x32, 0x34, 0x35, 0x20, 0x39, 0x33, 0x30, 0x2e, 0x33, 0x35, 0x38, 0x20,
+	0x37, 0x33, 0x33, 0x2e, 0x35, 0x32, 0x34, 0x20, 0x43, 0x20, 0x39, 0x36, 0x31, 0x2e, 0x31, 0x37,
+	0x34, 0x20, 0x36, 0x34, 0x33, 0x2e, 0x32, 0x37, 0x38, 0x20, 0x39, 0x39, 0x32, 0x2e, 0x38, 0x31,
+	0x37, 0x20, 0x35, 0x35, 0x33, 0x2e, 0x33, 0x31, 0x36, 0x20, 0x31, 0x30, 0x32, 0x35, 0x2e, 0x32,
+	0x38, 0x20, 0x34, 0x36, 0x33, 0x2e, 0x36, 0x34, 0x39, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_client_creditsyellow_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0xd6, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xed, 0x90, 0x31,
+	0x4e, 0x42, 0x41, 0x18, 0x84, 0xbf, 0xd9, 0x05, 0x21, 0x1c, 0x41, 0x5b, 0x81, 0x82, 0x84, 0x84,
+	0xb8, 0x62, 0xa9, 0x8d, 0x74, 0x56, 0xc6, 0x4b, 0x50, 0x71, 0x21, 0xbd, 0x07, 0x50, 0x51, 0x5a,
+	0x50, 0xe2, 0x7b, 0x91, 0xc2, 0xc6, 0x78, 0x02, 0x0b, 0x23, 0x8f, 0xfd, 0x2d, 0x10, 0x42, 0x28,
+	0x7c, 0x6b, 0x69, 0xe2, 0x34, 0x93, 0x7c, 0xc9, 0x4c, 0x26, 0x03, 0xbf, 0x50, 0x91, 0x9d, 0xdf,
+	0x1c, 0x32, 0xa5, 0x86, 0x2d, 0xef, 0x1d, 0x47, 0x2a, 0x4b, 0xe7, 0x5d, 0x5b, 0xcd, 0xc7, 0xd7,
+	0x2d, 0x77, 0xa9, 0x05, 0x11, 0x3f, 0x04, 0x1a, 0x31, 0xc6, 0x61, 0xf2, 0x82, 0x75, 0x1e, 0x46,
+	0x42, 0x03, 0xc3, 0x4e, 0x40, 0x2d, 0xa0, 0x0e, 0x7c, 0x80, 0x3d, 0x0b, 0xbd, 0x19, 0x36, 0xfe,
+	0x71, 0x81, 0xf3, 0xfe, 0x01, 0xa3, 0x0a, 0xea, 0x7e, 0x87, 0xd9, 0xb8, 0xba, 0x08, 0xef, 0xa8,
+	0xdd, 0x97, 0x7e, 0x60, 0x8b, 0xce, 0xd1, 0xda, 0x37, 0x26, 0x82, 0xcb, 0x1d, 0x83, 0x99, 0x7f,
+	0x8f, 0xd7, 0x0a, 0xf3, 0x55, 0xe9, 0x07, 0xea, 0x2c, 0x3e, 0x81, 0xca, 0x01, 0xae, 0x2a, 0xcc,
+	0x57, 0x90, 0x70, 0xa2, 0x2d, 0x4f, 0x6b, 0x82, 0x20, 0x31, 0x8d, 0xd1, 0x06, 0xc2, 0x26, 0x82,
+	0x33, 0x7b, 0xb9, 0xaa, 0x97, 0x65, 0x37, 0x05, 0x4f, 0x17, 0xcd, 0x22, 0xef, 0xdf, 0xed, 0xb3,
+	0x22, 0x0b, 0xb7, 0x96, 0xf5, 0x5b, 0x49, 0x05, 0xff, 0xfa, 0x0b, 0xfa, 0x02, 0xe2, 0xc2, 0x3c,
+	0xde, 0x3d, 0x57, 0xc1, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+	0x82
+};
+
+static const unsigned char icon_client_creditsyellow_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x37, 0x35, 0x31, 0x2e, 0x34, 0x30, 0x2c,
+	0x2d, 0x31, 0x31, 0x36, 0x2e, 0x31, 0x38, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30,
+	0x2e, 0x37, 0x30, 0x32, 0x31, 0x29, 0x22, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c,
+	0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x72, 0x67, 0x62, 0x28, 0x32, 0x35, 0x33, 0x2c, 0x32, 0x31, 0x36, 0x2c, 0x35, 0x33, 0x29, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x32, 0x36, 0x2e, 0x34, 0x32, 0x20, 0x31, 0x39,
+	0x37, 0x2e, 0x37, 0x31, 0x20, 0x43, 0x20, 0x31, 0x30, 0x33, 0x31, 0x2e, 0x37, 0x31, 0x20, 0x32,
+	0x30, 0x33, 0x2e, 0x37, 0x34, 0x31, 0x20, 0x31, 0x30, 0x36, 0x33, 0x2e, 0x35, 0x33, 0x20, 0x32,
+	0x37, 0x39, 0x2e, 0x36, 0x38, 0x32, 0x20, 0x31, 0x30, 0x36, 0x38, 0x2e, 0x34, 0x20, 0x32, 0x39,
+	0x30, 0x2e, 0x36, 0x33, 0x35, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x30, 0x35, 0x2e, 0x34, 0x34, 0x20,
+	0x36, 0x30, 0x31, 0x2e, 0x33, 0x30, 0x33, 0x20, 0x43, 0x20, 0x31, 0x32, 0x31, 0x38, 0x2e, 0x32,
+	0x36, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x35, 0x31, 0x33, 0x20, 0x31, 0x32, 0x33, 0x30, 0x2e, 0x33,
+	0x38, 0x20, 0x36, 0x36, 0x30, 0x2e, 0x31, 0x39, 0x33, 0x20, 0x31, 0x32, 0x34, 0x33, 0x2e, 0x30,
+	0x36, 0x20, 0x36, 0x38, 0x39, 0x2e, 0x34, 0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x34, 0x39,
+	0x2e, 0x36, 0x34, 0x20, 0x37, 0x30, 0x34, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x32, 0x35, 0x35, 0x2e,
+	0x34, 0x31, 0x20, 0x37, 0x31, 0x39, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x32, 0x36, 0x32, 0x2e, 0x38,
+	0x36, 0x20, 0x37, 0x33, 0x34, 0x2e, 0x37, 0x39, 0x31, 0x20, 0x43, 0x20, 0x31, 0x33, 0x31, 0x36,
+	0x2e, 0x39, 0x32, 0x20, 0x37, 0x34, 0x31, 0x2e, 0x30, 0x35, 0x39, 0x20, 0x31, 0x33, 0x37, 0x34,
+	0x2e, 0x38, 0x31, 0x20, 0x37, 0x34, 0x34, 0x2e, 0x38, 0x34, 0x36, 0x20, 0x31, 0x34, 0x32, 0x39,
+	0x2e, 0x33, 0x39, 0x20, 0x37, 0x34, 0x39, 0x2e, 0x39, 0x34, 0x20, 0x4c, 0x20, 0x31, 0x38, 0x34,
+	0x36, 0x2e, 0x37, 0x36, 0x20, 0x37, 0x38, 0x38, 0x2e, 0x31, 0x32, 0x36, 0x20, 0x43, 0x20, 0x31,
+	0x38, 0x31, 0x33, 0x2e, 0x34, 0x31, 0x20, 0x38, 0x31, 0x39, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x31,
+	0x37, 0x37, 0x31, 0x2e, 0x31, 0x20, 0x38, 0x35, 0x35, 0x2e, 0x35, 0x39, 0x31, 0x20, 0x31, 0x37,
+	0x33, 0x36, 0x2e, 0x31, 0x32, 0x20, 0x38, 0x38, 0x36, 0x2e, 0x34, 0x38, 0x37, 0x20, 0x4c, 0x20,
+	0x31, 0x35, 0x33, 0x38, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x30, 0x36, 0x32, 0x2e, 0x34, 0x36, 0x20,
+	0x43, 0x20, 0x31, 0x35, 0x30, 0x36, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x30, 0x38, 0x39, 0x2e, 0x39,
+	0x36, 0x20, 0x31, 0x34, 0x37, 0x35, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x37,
+	0x32, 0x20, 0x31, 0x34, 0x34, 0x34, 0x2e, 0x37, 0x31, 0x20, 0x31, 0x31, 0x34, 0x35, 0x2e, 0x37,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x33, 0x30, 0x2e, 0x36, 0x20, 0x31, 0x31, 0x35, 0x38, 0x2e,
+	0x32, 0x38, 0x20, 0x31, 0x34, 0x31, 0x36, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x31, 0x37, 0x30, 0x2e,
+	0x30, 0x37, 0x20, 0x31, 0x34, 0x30, 0x32, 0x2e, 0x32, 0x38, 0x20, 0x31, 0x31, 0x38, 0x33, 0x2e,
+	0x30, 0x35, 0x20, 0x43, 0x20, 0x31, 0x34, 0x30, 0x38, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x32, 0x30,
+	0x32, 0x2e, 0x34, 0x38, 0x20, 0x31, 0x34, 0x31, 0x34, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x32, 0x33,
+	0x33, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x34, 0x31, 0x38, 0x2e, 0x39, 0x32, 0x20, 0x31, 0x32, 0x35,
+	0x34, 0x2e, 0x31, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x34, 0x38, 0x2e, 0x36, 0x32, 0x20, 0x31,
+	0x33, 0x38, 0x33, 0x2e, 0x37, 0x34, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x33, 0x38, 0x2e, 0x38, 0x38,
+	0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x30, 0x34, 0x20, 0x43, 0x20, 0x31, 0x35, 0x32, 0x34, 0x2e,
+	0x31, 0x36, 0x20, 0x31, 0x37, 0x36, 0x35, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x35, 0x30, 0x37, 0x2e,
+	0x33, 0x39, 0x20, 0x31, 0x37, 0x35, 0x34, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x34, 0x39, 0x32, 0x2e,
+	0x36, 0x32, 0x20, 0x31, 0x37, 0x34, 0x34, 0x2e, 0x38, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x31,
+	0x33, 0x2e, 0x34, 0x33, 0x20, 0x31, 0x36, 0x39, 0x36, 0x2e, 0x36, 0x36, 0x20, 0x4c, 0x20, 0x31,
+	0x31, 0x37, 0x36, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x35, 0x35, 0x34, 0x2e, 0x35, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x31, 0x35, 0x39, 0x2e, 0x39, 0x36, 0x20, 0x31, 0x35, 0x34, 0x34, 0x2e, 0x33, 0x20,
+	0x31, 0x31, 0x34, 0x32, 0x2e, 0x36, 0x33, 0x20, 0x31, 0x35, 0x33, 0x34, 0x2e, 0x39, 0x31, 0x20,
+	0x31, 0x31, 0x32, 0x35, 0x2e, 0x38, 0x33, 0x20, 0x31, 0x35, 0x32, 0x34, 0x2e, 0x33, 0x38, 0x20,
+	0x43, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x35, 0x31, 0x32, 0x2e, 0x30,
+	0x32, 0x20, 0x31, 0x30, 0x38, 0x36, 0x2e, 0x31, 0x37, 0x20, 0x31, 0x34, 0x39, 0x39, 0x2e, 0x35,
+	0x35, 0x20, 0x31, 0x30, 0x36, 0x36, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x34, 0x38, 0x36, 0x2e, 0x39,
+	0x38, 0x20, 0x43, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x34, 0x38, 0x32,
+	0x2e, 0x36, 0x31, 0x20, 0x31, 0x30, 0x33, 0x33, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x34, 0x36, 0x33,
+	0x2e, 0x39, 0x31, 0x20, 0x31, 0x30, 0x32, 0x37, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x34, 0x36, 0x33,
+	0x2e, 0x38, 0x31, 0x20, 0x43, 0x20, 0x31, 0x30, 0x31, 0x32, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x34,
+	0x37, 0x31, 0x2e, 0x33, 0x34, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x34, 0x30, 0x35, 0x20, 0x31, 0x34,
+	0x38, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x39, 0x38, 0x35, 0x2e, 0x34, 0x36, 0x39, 0x20, 0x31, 0x34,
+	0x38, 0x38, 0x2e, 0x36, 0x38, 0x20, 0x4c, 0x20, 0x38, 0x39, 0x35, 0x2e, 0x32, 0x33, 0x35, 0x20,
+	0x31, 0x35, 0x34, 0x33, 0x2e, 0x33, 0x32, 0x20, 0x4c, 0x20, 0x35, 0x31, 0x34, 0x2e, 0x32, 0x31,
+	0x34, 0x20, 0x31, 0x37, 0x37, 0x33, 0x2e, 0x39, 0x35, 0x20, 0x43, 0x20, 0x35, 0x32, 0x31, 0x2e,
+	0x35, 0x32, 0x38, 0x20, 0x31, 0x37, 0x33, 0x38, 0x2e, 0x34, 0x38, 0x20, 0x35, 0x33, 0x31, 0x2e,
+	0x31, 0x35, 0x36, 0x20, 0x31, 0x37, 0x30, 0x32, 0x2e, 0x30, 0x39, 0x20, 0x35, 0x33, 0x39, 0x2e,
+	0x36, 0x33, 0x32, 0x20, 0x31, 0x36, 0x36, 0x36, 0x2e, 0x37, 0x39, 0x20, 0x4c, 0x20, 0x35, 0x37,
+	0x30, 0x2e, 0x34, 0x32, 0x36, 0x20, 0x31, 0x35, 0x33, 0x33, 0x2e, 0x30, 0x32, 0x20, 0x4c, 0x20,
+	0x36, 0x31, 0x30, 0x2e, 0x31, 0x30, 0x32, 0x20, 0x31, 0x33, 0x36, 0x32, 0x2e, 0x30, 0x39, 0x20,
+	0x4c, 0x20, 0x36, 0x33, 0x35, 0x2e, 0x35, 0x33, 0x32, 0x20, 0x31, 0x32, 0x35, 0x31, 0x2e, 0x37,
+	0x20, 0x43, 0x20, 0x36, 0x34, 0x30, 0x2e, 0x37, 0x39, 0x31, 0x20, 0x31, 0x32, 0x32, 0x38, 0x2e,
+	0x38, 0x31, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x31, 0x32, 0x30, 0x37, 0x2e,
+	0x35, 0x20, 0x36, 0x35, 0x31, 0x2e, 0x30, 0x36, 0x32, 0x20, 0x31, 0x31, 0x38, 0x34, 0x2e, 0x36,
+	0x20, 0x43, 0x20, 0x36, 0x33, 0x31, 0x2e, 0x39, 0x32, 0x34, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e,
+	0x38, 0x33, 0x20, 0x36, 0x30, 0x37, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x31, 0x34, 0x35, 0x2e, 0x35,
+	0x38, 0x20, 0x35, 0x38, 0x36, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x31, 0x31, 0x32, 0x37, 0x2e, 0x35,
+	0x31, 0x20, 0x43, 0x20, 0x35, 0x34, 0x36, 0x2e, 0x39, 0x33, 0x33, 0x20, 0x31, 0x30, 0x39, 0x31,
+	0x2e, 0x35, 0x39, 0x20, 0x35, 0x30, 0x36, 0x2e, 0x37, 0x36, 0x38, 0x20, 0x31, 0x30, 0x35, 0x35,
+	0x2e, 0x38, 0x39, 0x20, 0x34, 0x36, 0x36, 0x2e, 0x34, 0x30, 0x31, 0x20, 0x31, 0x30, 0x32, 0x30,
+	0x2e, 0x34, 0x33, 0x20, 0x4c, 0x20, 0x32, 0x30, 0x35, 0x2e, 0x39, 0x36, 0x31, 0x20, 0x37, 0x38,
+	0x38, 0x2e, 0x34, 0x30, 0x39, 0x20, 0x4c, 0x20, 0x35, 0x36, 0x37, 0x2e, 0x32, 0x39, 0x37, 0x20,
+	0x37, 0x35, 0x35, 0x2e, 0x31, 0x31, 0x36, 0x20, 0x4c, 0x20, 0x37, 0x32, 0x38, 0x2e, 0x31, 0x30,
+	0x37, 0x20, 0x37, 0x34, 0x30, 0x2e, 0x34, 0x37, 0x20, 0x43, 0x20, 0x37, 0x34, 0x38, 0x2e, 0x38,
+	0x34, 0x33, 0x20, 0x37, 0x33, 0x38, 0x2e, 0x36, 0x33, 0x35, 0x20, 0x37, 0x37, 0x30, 0x2e, 0x33,
+	0x36, 0x31, 0x20, 0x37, 0x33, 0x36, 0x2e, 0x30, 0x38, 0x36, 0x20, 0x37, 0x39, 0x31, 0x2e, 0x30,
+	0x31, 0x20, 0x37, 0x33, 0x34, 0x2e, 0x37, 0x30, 0x34, 0x20, 0x4c, 0x20, 0x39, 0x34, 0x34, 0x2e,
+	0x37, 0x30, 0x35, 0x20, 0x33, 0x38, 0x33, 0x2e, 0x31, 0x35, 0x20, 0x4c, 0x20, 0x39, 0x39, 0x38,
+	0x2e, 0x34, 0x35, 0x32, 0x20, 0x32, 0x36, 0x31, 0x2e, 0x30, 0x35, 0x37, 0x20, 0x43, 0x20, 0x31,
+	0x30, 0x30, 0x37, 0x2e, 0x33, 0x37, 0x20, 0x32, 0x34, 0x30, 0x2e, 0x37, 0x38, 0x33, 0x20, 0x31,
+	0x30, 0x31, 0x36, 0x2e, 0x37, 0x36, 0x20, 0x32, 0x31, 0x37, 0x2e, 0x33, 0x37, 0x20, 0x31, 0x30,
+	0x32, 0x36, 0x2e, 0x34, 0x32, 0x20, 0x31, 0x39, 0x37, 0x2e, 0x37, 0x31, 0x20, 0x7a, 0x22, 0x2f,
+	0x3e, 0x0a, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_client_edonkeyhybrid_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x68, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xbd, 0x91, 0xcd,
+	0x4e, 0xc2, 0x40, 0x14, 0x85, 0xef, 0x6d, 0x1b, 0x0a, 0x16, 0xca, 0x6f, 0x74, 0xe7, 0xdf, 0xde,
+	0x95, 0x4b, 0x37, 0xbe, 0x82, 0x49, 0x43, 0xe2, 0x86, 0x84, 0x79, 0x12, 0x56, 0xfa, 0x10, 0x14,
+	0x4a, 0x06, 0x97, 0x6e, 0x5c, 0xf8, 0x00, 0x3e, 0x80, 0x71, 0xe7, 0x42, 0x63, 0x22, 0x3b, 0x43,
+	0xb0, 0x9d, 0x02, 0xa6, 0x74, 0x08, 0xbd, 0x2e, 0x8c, 0x08, 0x34, 0x05, 0x13, 0x13, 0xcf, 0x6a,
+	0x72, 0xef, 0x39, 0xdf, 0x9c, 0xc9, 0x00, 0xfc, 0x51, 0xb8, 0x6e, 0xd9, 0x6c, 0x36, 0x0f, 0x34,
+	0x4d, 0xd3, 0x7b, 0xbd, 0xde, 0x53, 0xa3, 0xd1, 0x88, 0x7e, 0x0d, 0xe8, 0x74, 0x3a, 0xc7, 0x42,
+	0xf8, 0xb7, 0xb3, 0x59, 0xb4, 0x03, 0x08, 0xa0, 0x2a, 0xca, 0xc0, 0x34, 0x73, 0x16, 0x63, 0xec,
+	0x6e, 0x23, 0xc0, 0x71, 0x9c, 0x7d, 0xd7, 0x15, 0xcf, 0x85, 0x82, 0xa9, 0x21, 0x7e, 0xad, 0x89,
+	0x08, 0x5c, 0x4f, 0x44, 0xe5, 0x52, 0xf1, 0x88, 0x31, 0xf6, 0xb8, 0xe8, 0x57, 0x56, 0x01, 0x41,
+	0x10, 0x5c, 0x9a, 0x66, 0x6e, 0x1e, 0x06, 0x00, 0x40, 0x44, 0x28, 0x16, 0xf2, 0x4a, 0x10, 0x84,
+	0x17, 0xab, 0xfe, 0x18, 0x40, 0xca, 0xe9, 0xa9, 0xaa, 0xc6, 0xc6, 0xa0, 0x28, 0x0a, 0x84, 0xe1,
+	0xe4, 0x64, 0x23, 0x20, 0x8a, 0xa2, 0x74, 0x2c, 0xfd, 0xd3, 0x24, 0xb5, 0x11, 0x40, 0x40, 0x49,
+	0x79, 0x20, 0x8a, 0xfb, 0x63, 0x03, 0x44, 0xd4, 0x93, 0x01, 0xd1, 0xfa, 0x06, 0xb6, 0x6d, 0x97,
+	0x00, 0x30, 0x93, 0x58, 0x01, 0x31, 0xc5, 0x39, 0xdf, 0x4d, 0x04, 0x10, 0x91, 0xa5, 0xeb, 0xb1,
+	0x4b, 0xe6, 0x32, 0xb6, 0x32, 0x30, 0x99, 0xc8, 0xb3, 0x25, 0xe6, 0xf7, 0x81, 0x73, 0xbe, 0x3d,
+	0x78, 0x77, 0x5f, 0x0a, 0x79, 0x33, 0x4b, 0x44, 0xb0, 0xf8, 0x8d, 0x8b, 0x12, 0xc2, 0xff, 0xa8,
+	0x54, 0xca, 0x87, 0xb5, 0x5a, 0xad, 0x3f, 0x6f, 0xc0, 0x39, 0x37, 0x84, 0xf0, 0xef, 0x11, 0x31,
+	0x3b, 0x1c, 0x8e, 0xfb, 0x52, 0xca, 0xae, 0x27, 0xfc, 0x59, 0x18, 0x4a, 0x90, 0x72, 0x0a, 0x42,
+	0x0c, 0x67, 0x61, 0x38, 0xed, 0x8e, 0x46, 0xe3, 0x37, 0x44, 0x34, 0x3c, 0x4f, 0x3c, 0xb4, 0x5a,
+	0xad, 0xdc, 0x52, 0x83, 0x76, 0xbb, 0x6d, 0x21, 0x62, 0xc6, 0x30, 0x8c, 0xeb, 0x6a, 0xb5, 0x1a,
+	0xd8, 0xb6, 0xbd, 0x47, 0x44, 0xe7, 0x88, 0xa8, 0xa9, 0xaa, 0x7a, 0x55, 0xaf, 0xd7, 0x5f, 0x1d,
+	0xc7, 0x49, 0x13, 0x91, 0x05, 0x00, 0x23, 0xc6, 0xd8, 0x4d, 0xe2, 0x5b, 0xff, 0x55, 0x9f, 0x51,
+	0xc7, 0x90, 0xce, 0xc7, 0xc1, 0x04, 0xd2, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+	0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_edonkeyhybrid_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x35, 0x38, 0x2c,
+	0x31, 0x35, 0x38, 0x2c, 0x31, 0x35, 0x38, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31,
+	0x30, 0x30, 0x36, 0x2e, 0x35, 0x33, 0x20, 0x32, 0x32, 0x36, 0x2e, 0x34, 0x32, 0x31, 0x20, 0x43,
+	0x20, 0x31, 0x30, 0x31, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x32, 0x32, 0x35, 0x2e, 0x32, 0x30, 0x34,
+	0x20, 0x31, 0x30, 0x34, 0x33, 0x2e, 0x32, 0x39, 0x20, 0x32, 0x32, 0x36, 0x2e, 0x31, 0x37, 0x38,
+	0x20, 0x31, 0x30, 0x35, 0x36, 0x2e, 0x31, 0x20, 0x32, 0x32, 0x37, 0x2e, 0x30, 0x39, 0x20, 0x43,
+	0x20, 0x31, 0x31, 0x34, 0x36, 0x2e, 0x36, 0x39, 0x20, 0x32, 0x33, 0x34, 0x2e, 0x32, 0x31, 0x32,
+	0x20, 0x31, 0x32, 0x33, 0x33, 0x2e, 0x34, 0x34, 0x20, 0x32, 0x36, 0x36, 0x2e, 0x36, 0x38, 0x39,
+	0x20, 0x31, 0x33, 0x30, 0x36, 0x2e, 0x34, 0x33, 0x20, 0x33, 0x32, 0x30, 0x2e, 0x38, 0x30, 0x35,
+	0x20, 0x43, 0x20, 0x31, 0x33, 0x36, 0x36, 0x2e, 0x38, 0x31, 0x20, 0x33, 0x36, 0x35, 0x2e, 0x32,
+	0x36, 0x37, 0x20, 0x31, 0x34, 0x31, 0x36, 0x2e, 0x39, 0x34, 0x20, 0x34, 0x32, 0x32, 0x2e, 0x31,
+	0x38, 0x34, 0x20, 0x31, 0x34, 0x35, 0x33, 0x2e, 0x34, 0x31, 0x20, 0x34, 0x38, 0x37, 0x2e, 0x37,
+	0x30, 0x32, 0x20, 0x43, 0x20, 0x31, 0x34, 0x39, 0x32, 0x2e, 0x30, 0x37, 0x20, 0x35, 0x35, 0x38,
+	0x2e, 0x34, 0x33, 0x32, 0x20, 0x31, 0x35, 0x31, 0x34, 0x2e, 0x33, 0x33, 0x20, 0x36, 0x33, 0x36,
+	0x2e, 0x39, 0x34, 0x38, 0x20, 0x31, 0x35, 0x31, 0x38, 0x2e, 0x35, 0x35, 0x20, 0x37, 0x31, 0x37,
+	0x2e, 0x34, 0x34, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x32, 0x30, 0x2e, 0x32, 0x20, 0x37, 0x34,
+	0x37, 0x2e, 0x32, 0x38, 0x36, 0x20, 0x31, 0x35, 0x31, 0x39, 0x2e, 0x32, 0x31, 0x20, 0x37, 0x38,
+	0x36, 0x2e, 0x37, 0x36, 0x37, 0x20, 0x31, 0x35, 0x31, 0x39, 0x2e, 0x32, 0x38, 0x20, 0x38, 0x31,
+	0x37, 0x2e, 0x32, 0x32, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x31, 0x39, 0x2e, 0x33, 0x36, 0x20,
+	0x39, 0x34, 0x39, 0x2e, 0x35, 0x32, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31, 0x39, 0x2e, 0x33, 0x37,
+	0x20, 0x31, 0x30, 0x31, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x35, 0x31, 0x39, 0x2e, 0x39, 0x32, 0x20,
+	0x31, 0x30, 0x37, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x35, 0x32, 0x38, 0x2e, 0x37, 0x20, 0x31,
+	0x31, 0x33, 0x36, 0x2e, 0x30, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35, 0x34, 0x39, 0x2e, 0x33, 0x35,
+	0x20, 0x31, 0x32, 0x38, 0x33, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x36, 0x30, 0x38, 0x2e, 0x39, 0x36,
+	0x20, 0x31, 0x34, 0x34, 0x32, 0x2e, 0x36, 0x20, 0x31, 0x37, 0x32, 0x31, 0x2e, 0x33, 0x20, 0x31,
+	0x35, 0x34, 0x35, 0x2e, 0x32, 0x39, 0x20, 0x43, 0x20, 0x31, 0x37, 0x33, 0x31, 0x2e, 0x39, 0x35,
+	0x20, 0x31, 0x35, 0x35, 0x35, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x37, 0x34, 0x35, 0x2e, 0x31, 0x31,
+	0x20, 0x31, 0x35, 0x36, 0x34, 0x2e, 0x39, 0x36, 0x20, 0x31, 0x37, 0x35, 0x37, 0x2e, 0x34, 0x32,
+	0x20, 0x31, 0x35, 0x37, 0x32, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x31, 0x37, 0x36, 0x38, 0x2e,
+	0x35, 0x39, 0x20, 0x31, 0x35, 0x37, 0x39, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x37, 0x38, 0x31, 0x2e,
+	0x39, 0x34, 0x20, 0x31, 0x35, 0x38, 0x35, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x37, 0x39, 0x32, 0x2e,
+	0x32, 0x33, 0x20, 0x31, 0x35, 0x39, 0x32, 0x2e, 0x38, 0x36, 0x20, 0x43, 0x20, 0x31, 0x38, 0x30,
+	0x33, 0x2e, 0x37, 0x20, 0x31, 0x36, 0x30, 0x31, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x38, 0x31, 0x31,
+	0x2e, 0x31, 0x33, 0x20, 0x31, 0x36, 0x31, 0x34, 0x2e, 0x33, 0x36, 0x20, 0x31, 0x38, 0x31, 0x32,
+	0x2e, 0x37, 0x38, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x35, 0x39, 0x20, 0x43, 0x20, 0x31, 0x38,
+	0x31, 0x37, 0x2e, 0x34, 0x37, 0x20, 0x31, 0x36, 0x37, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x37, 0x37,
+	0x34, 0x2e, 0x37, 0x35, 0x20, 0x31, 0x36, 0x38, 0x39, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x37, 0x34,
+	0x32, 0x2e, 0x31, 0x32, 0x20, 0x31, 0x37, 0x30, 0x35, 0x2e, 0x36, 0x33, 0x20, 0x43, 0x20, 0x31,
+	0x36, 0x36, 0x38, 0x2e, 0x39, 0x32, 0x20, 0x31, 0x37, 0x34, 0x31, 0x2e, 0x31, 0x37, 0x20, 0x31,
+	0x35, 0x38, 0x30, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x37, 0x32, 0x37, 0x2e, 0x32, 0x38, 0x20, 0x31,
+	0x35, 0x31, 0x37, 0x2e, 0x30, 0x39, 0x20, 0x31, 0x36, 0x37, 0x38, 0x2e, 0x39, 0x36, 0x20, 0x43,
+	0x20, 0x31, 0x35, 0x30, 0x33, 0x2e, 0x39, 0x20, 0x31, 0x36, 0x36, 0x39, 0x20, 0x31, 0x34, 0x39,
+	0x30, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x36, 0x35, 0x36, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x34, 0x37,
+	0x38, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x36, 0x34, 0x36, 0x2e, 0x31, 0x33, 0x20, 0x43, 0x20, 0x31,
+	0x34, 0x32, 0x31, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x35, 0x39, 0x36, 0x2e, 0x36, 0x34, 0x20, 0x31,
+	0x33, 0x34, 0x39, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x35, 0x38, 0x34, 0x2e, 0x39, 0x36, 0x20, 0x31,
+	0x32, 0x38, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x38, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x35, 0x39, 0x2e, 0x32, 0x37, 0x20, 0x31, 0x36, 0x34, 0x36, 0x2e, 0x32, 0x35,
+	0x20, 0x31, 0x32, 0x34, 0x33, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x36, 0x36, 0x33, 0x2e, 0x37, 0x31,
+	0x20, 0x31, 0x32, 0x31, 0x34, 0x2e, 0x36, 0x32, 0x20, 0x31, 0x36, 0x37, 0x39, 0x2e, 0x39, 0x31,
+	0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x37, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x37, 0x31, 0x32, 0x2e,
+	0x33, 0x32, 0x20, 0x31, 0x31, 0x31, 0x33, 0x2e, 0x35, 0x36, 0x20, 0x31, 0x37, 0x32, 0x37, 0x2e,
+	0x37, 0x33, 0x20, 0x31, 0x30, 0x34, 0x38, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x37, 0x33, 0x33, 0x2e,
+	0x38, 0x20, 0x43, 0x20, 0x39, 0x37, 0x39, 0x2e, 0x33, 0x38, 0x32, 0x20, 0x31, 0x37, 0x33, 0x37,
+	0x2e, 0x35, 0x39, 0x20, 0x39, 0x31, 0x30, 0x2e, 0x38, 0x34, 0x32, 0x20, 0x31, 0x37, 0x32, 0x31,
+	0x2e, 0x38, 0x39, 0x20, 0x38, 0x35, 0x30, 0x2e, 0x34, 0x39, 0x39, 0x20, 0x31, 0x36, 0x38, 0x38,
+	0x2e, 0x34, 0x39, 0x20, 0x43, 0x20, 0x38, 0x33, 0x35, 0x2e, 0x36, 0x37, 0x34, 0x20, 0x31, 0x36,
+	0x38, 0x30, 0x2e, 0x31, 0x31, 0x20, 0x38, 0x31, 0x39, 0x2e, 0x30, 0x30, 0x34, 0x20, 0x31, 0x36,
+	0x36, 0x39, 0x2e, 0x34, 0x32, 0x20, 0x38, 0x30, 0x35, 0x2e, 0x30, 0x39, 0x31, 0x20, 0x31, 0x36,
+	0x35, 0x39, 0x2e, 0x35, 0x39, 0x20, 0x43, 0x20, 0x37, 0x39, 0x34, 0x2e, 0x30, 0x38, 0x33, 0x20,
+	0x31, 0x36, 0x35, 0x31, 0x2e, 0x32, 0x38, 0x20, 0x37, 0x38, 0x33, 0x20, 0x31, 0x36, 0x34, 0x32,
+	0x2e, 0x32, 0x34, 0x20, 0x37, 0x37, 0x31, 0x2e, 0x39, 0x37, 0x37, 0x20, 0x31, 0x36, 0x33, 0x34,
+	0x2e, 0x30, 0x34, 0x20, 0x43, 0x20, 0x37, 0x30, 0x37, 0x2e, 0x39, 0x32, 0x20, 0x31, 0x35, 0x38,
+	0x36, 0x2e, 0x33, 0x36, 0x20, 0x36, 0x33, 0x31, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x31, 0x35, 0x39,
+	0x32, 0x2e, 0x33, 0x31, 0x20, 0x35, 0x37, 0x32, 0x2e, 0x37, 0x31, 0x20, 0x31, 0x36, 0x34, 0x34,
+	0x2e, 0x37, 0x36, 0x20, 0x43, 0x20, 0x35, 0x36, 0x30, 0x2e, 0x31, 0x32, 0x38, 0x20, 0x31, 0x36,
+	0x35, 0x35, 0x2e, 0x39, 0x31, 0x20, 0x35, 0x34, 0x37, 0x2e, 0x36, 0x31, 0x38, 0x20, 0x31, 0x36,
+	0x36, 0x39, 0x2e, 0x30, 0x34, 0x20, 0x35, 0x33, 0x33, 0x2e, 0x38, 0x36, 0x31, 0x20, 0x31, 0x36,
+	0x37, 0x39, 0x2e, 0x31, 0x34, 0x20, 0x43, 0x20, 0x35, 0x30, 0x30, 0x2e, 0x30, 0x37, 0x35, 0x20,
+	0x31, 0x37, 0x30, 0x33, 0x2e, 0x39, 0x32, 0x20, 0x34, 0x35, 0x39, 0x2e, 0x34, 0x32, 0x20, 0x31,
+	0x37, 0x32, 0x30, 0x2e, 0x33, 0x37, 0x20, 0x34, 0x31, 0x37, 0x2e, 0x35, 0x35, 0x37, 0x20, 0x31,
+	0x37, 0x32, 0x34, 0x2e, 0x32, 0x36, 0x20, 0x43, 0x20, 0x33, 0x37, 0x30, 0x2e, 0x39, 0x34, 0x35,
+	0x20, 0x31, 0x37, 0x32, 0x38, 0x2e, 0x37, 0x33, 0x20, 0x33, 0x33, 0x32, 0x2e, 0x31, 0x33, 0x20,
+	0x31, 0x37, 0x31, 0x38, 0x2e, 0x35, 0x34, 0x20, 0x32, 0x39, 0x31, 0x2e, 0x32, 0x32, 0x39, 0x20,
+	0x31, 0x36, 0x39, 0x36, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x32, 0x37,
+	0x34, 0x20, 0x31, 0x36, 0x39, 0x30, 0x2e, 0x37, 0x20, 0x32, 0x36, 0x38, 0x2e, 0x35, 0x30, 0x36,
+	0x20, 0x31, 0x36, 0x38, 0x34, 0x2e, 0x37, 0x32, 0x20, 0x32, 0x35, 0x37, 0x2e, 0x38, 0x38, 0x34,
+	0x20, 0x31, 0x36, 0x37, 0x36, 0x2e, 0x31, 0x33, 0x20, 0x43, 0x20, 0x32, 0x33, 0x34, 0x2e, 0x37,
+	0x30, 0x34, 0x20, 0x31, 0x36, 0x35, 0x37, 0x2e, 0x34, 0x20, 0x32, 0x33, 0x32, 0x2e, 0x37, 0x30,
+	0x31, 0x20, 0x31, 0x36, 0x32, 0x33, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x35, 0x30, 0x2e, 0x38, 0x38,
+	0x32, 0x20, 0x31, 0x36, 0x30, 0x30, 0x2e, 0x38, 0x32, 0x20, 0x43, 0x20, 0x32, 0x36, 0x30, 0x2e,
+	0x34, 0x38, 0x38, 0x20, 0x31, 0x35, 0x38, 0x38, 0x2e, 0x38, 0x20, 0x32, 0x37, 0x38, 0x2e, 0x35,
+	0x39, 0x20, 0x31, 0x35, 0x38, 0x32, 0x2e, 0x32, 0x39, 0x20, 0x32, 0x39, 0x31, 0x2e, 0x31, 0x38,
+	0x34, 0x20, 0x31, 0x35, 0x37, 0x33, 0x2e, 0x37, 0x37, 0x20, 0x43, 0x20, 0x33, 0x30, 0x30, 0x2e,
+	0x36, 0x35, 0x20, 0x31, 0x35, 0x36, 0x37, 0x2e, 0x33, 0x37, 0x20, 0x33, 0x31, 0x30, 0x2e, 0x32,
+	0x33, 0x33, 0x20, 0x31, 0x35, 0x36, 0x30, 0x2e, 0x36, 0x32, 0x20, 0x33, 0x31, 0x39, 0x2e, 0x32,
+	0x33, 0x31, 0x20, 0x31, 0x35, 0x35, 0x33, 0x2e, 0x35, 0x31, 0x20, 0x43, 0x20, 0x33, 0x38, 0x32,
+	0x2e, 0x32, 0x34, 0x20, 0x31, 0x35, 0x30, 0x33, 0x2e, 0x32, 0x34, 0x20, 0x34, 0x33, 0x38, 0x2e,
+	0x30, 0x38, 0x37, 0x20, 0x31, 0x34, 0x31, 0x33, 0x2e, 0x31, 0x35, 0x20, 0x34, 0x36, 0x38, 0x2e,
+	0x32, 0x39, 0x32, 0x20, 0x31, 0x33, 0x33, 0x39, 0x2e, 0x32, 0x34, 0x20, 0x43, 0x20, 0x35, 0x30,
+	0x36, 0x2e, 0x31, 0x33, 0x38, 0x20, 0x31, 0x32, 0x34, 0x34, 0x2e, 0x36, 0x31, 0x20, 0x35, 0x32,
+	0x37, 0x2e, 0x33, 0x30, 0x38, 0x20, 0x31, 0x31, 0x34, 0x34, 0x2e, 0x31, 0x34, 0x20, 0x35, 0x33,
+	0x30, 0x2e, 0x38, 0x36, 0x33, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x32, 0x39, 0x20, 0x43, 0x20,
+	0x35, 0x33, 0x32, 0x2e, 0x31, 0x38, 0x31, 0x20, 0x31, 0x30, 0x31, 0x30, 0x2e, 0x39, 0x39, 0x20,
+	0x35, 0x33, 0x31, 0x2e, 0x35, 0x31, 0x34, 0x20, 0x39, 0x37, 0x37, 0x2e, 0x35, 0x35, 0x37, 0x20,
+	0x35, 0x33, 0x31, 0x2e, 0x34, 0x31, 0x31, 0x20, 0x39, 0x34, 0x36, 0x2e, 0x30, 0x36, 0x34, 0x20,
+	0x4c, 0x20, 0x35, 0x33, 0x31, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x38, 0x30, 0x37, 0x2e, 0x39, 0x31,
+	0x31, 0x20, 0x43, 0x20, 0x35, 0x33, 0x31, 0x2e, 0x31, 0x30, 0x39, 0x20, 0x37, 0x37, 0x32, 0x2e,
+	0x31, 0x30, 0x35, 0x20, 0x35, 0x33, 0x30, 0x2e, 0x30, 0x36, 0x33, 0x20, 0x37, 0x33, 0x35, 0x2e,
+	0x34, 0x31, 0x38, 0x20, 0x35, 0x33, 0x33, 0x2e, 0x33, 0x37, 0x34, 0x20, 0x36, 0x39, 0x39, 0x2e,
+	0x38, 0x35, 0x39, 0x20, 0x43, 0x20, 0x35, 0x34, 0x33, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x35, 0x38,
+	0x34, 0x2e, 0x31, 0x31, 0x33, 0x20, 0x35, 0x39, 0x30, 0x2e, 0x35, 0x31, 0x39, 0x20, 0x34, 0x37,
+	0x34, 0x2e, 0x37, 0x34, 0x39, 0x20, 0x36, 0x36, 0x38, 0x2e, 0x33, 0x33, 0x36, 0x20, 0x33, 0x38,
+	0x38, 0x2e, 0x35, 0x31, 0x34, 0x20, 0x43, 0x20, 0x37, 0x35, 0x35, 0x2e, 0x33, 0x32, 0x31, 0x20,
+	0x32, 0x39, 0x32, 0x2e, 0x30, 0x35, 0x20, 0x38, 0x37, 0x36, 0x2e, 0x38, 0x35, 0x33, 0x20, 0x32,
+	0x33, 0x33, 0x2e, 0x38, 0x30, 0x32, 0x20, 0x31, 0x30, 0x30, 0x36, 0x2e, 0x35, 0x33, 0x20, 0x32,
+	0x32, 0x36, 0x2e, 0x34, 0x32, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x30, 0x34, 0x2c, 0x31, 0x30, 0x35, 0x2c, 0x31,
+	0x30, 0x39, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x35,
+	0x31, 0x20, 0x32, 0x39, 0x32, 0x2e, 0x34, 0x31, 0x32, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x32,
+	0x2e, 0x38, 0x20, 0x32, 0x38, 0x37, 0x2e, 0x37, 0x38, 0x32, 0x20, 0x31, 0x31, 0x35, 0x34, 0x2e,
+	0x32, 0x36, 0x20, 0x33, 0x30, 0x36, 0x2e, 0x38, 0x35, 0x39, 0x20, 0x31, 0x32, 0x31, 0x34, 0x20,
+	0x33, 0x33, 0x37, 0x2e, 0x34, 0x37, 0x33, 0x20, 0x43, 0x20, 0x31, 0x32, 0x37, 0x34, 0x2e, 0x33,
+	0x20, 0x33, 0x36, 0x38, 0x2e, 0x30, 0x32, 0x38, 0x20, 0x31, 0x33, 0x32, 0x36, 0x2e, 0x37, 0x35,
+	0x20, 0x34, 0x31, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x33, 0x36, 0x37, 0x2e, 0x33, 0x32, 0x20,
+	0x34, 0x36, 0x36, 0x2e, 0x31, 0x30, 0x37, 0x20, 0x43, 0x20, 0x31, 0x34, 0x32, 0x31, 0x2e, 0x31,
+	0x33, 0x20, 0x35, 0x33, 0x37, 0x2e, 0x38, 0x36, 0x34, 0x20, 0x31, 0x34, 0x35, 0x32, 0x2e, 0x39,
+	0x36, 0x20, 0x36, 0x32, 0x33, 0x2e, 0x36, 0x38, 0x36, 0x20, 0x31, 0x34, 0x35, 0x38, 0x2e, 0x39,
+	0x37, 0x20, 0x37, 0x31, 0x33, 0x2e, 0x31, 0x37, 0x32, 0x20, 0x43, 0x20, 0x31, 0x34, 0x36, 0x31,
+	0x2e, 0x32, 0x34, 0x20, 0x37, 0x34, 0x35, 0x2e, 0x36, 0x35, 0x38, 0x20, 0x31, 0x34, 0x35, 0x39,
+	0x2e, 0x39, 0x37, 0x20, 0x37, 0x38, 0x34, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x31, 0x34, 0x35, 0x39,
+	0x2e, 0x39, 0x38, 0x20, 0x38, 0x31, 0x37, 0x2e, 0x34, 0x38, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x34,
+	0x36, 0x30, 0x2e, 0x36, 0x31, 0x20, 0x39, 0x33, 0x30, 0x2e, 0x37, 0x37, 0x33, 0x20, 0x43, 0x20,
+	0x31, 0x34, 0x36, 0x30, 0x2e, 0x36, 0x32, 0x20, 0x39, 0x36, 0x35, 0x2e, 0x32, 0x30, 0x33, 0x20,
+	0x31, 0x34, 0x36, 0x30, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x30, 0x30, 0x2e, 0x31, 0x32, 0x20,
+	0x31, 0x34, 0x36, 0x31, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x33, 0x34, 0x2e, 0x35, 0x34, 0x20,
+	0x43, 0x20, 0x31, 0x34, 0x36, 0x34, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x31, 0x32, 0x37, 0x2e, 0x30,
+	0x38, 0x20, 0x31, 0x34, 0x38, 0x30, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x32, 0x31, 0x38, 0x2e, 0x37,
+	0x34, 0x20, 0x31, 0x35, 0x30, 0x38, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x33, 0x30, 0x37, 0x2e, 0x30,
+	0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x34, 0x33, 0x2e, 0x34, 0x35, 0x20, 0x31, 0x34, 0x31, 0x34,
+	0x2e, 0x35, 0x32, 0x20, 0x31, 0x36, 0x30, 0x39, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x35, 0x33, 0x30,
+	0x2e, 0x35, 0x37, 0x20, 0x31, 0x37, 0x30, 0x30, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x36, 0x30, 0x30,
+	0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x37, 0x31, 0x36, 0x2e, 0x34, 0x38, 0x20, 0x31, 0x36,
+	0x31, 0x32, 0x2e, 0x38, 0x32, 0x20, 0x31, 0x37, 0x33, 0x32, 0x2e, 0x30, 0x39, 0x20, 0x31, 0x36,
+	0x32, 0x31, 0x2e, 0x31, 0x32, 0x20, 0x31, 0x37, 0x34, 0x39, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x36,
+	0x33, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x43, 0x20, 0x31, 0x37, 0x33, 0x35, 0x2e, 0x35, 0x36, 0x20,
+	0x31, 0x36, 0x34, 0x31, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x37, 0x32, 0x31, 0x2e, 0x34, 0x33, 0x20,
+	0x31, 0x36, 0x34, 0x37, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x37, 0x30, 0x34, 0x2e, 0x30, 0x34, 0x20,
+	0x31, 0x36, 0x35, 0x33, 0x2e, 0x34, 0x31, 0x20, 0x43, 0x20, 0x31, 0x36, 0x34, 0x37, 0x2e, 0x36,
+	0x31, 0x20, 0x31, 0x36, 0x37, 0x31, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x36, 0x30, 0x31, 0x2e, 0x32,
+	0x38, 0x20, 0x31, 0x36, 0x35, 0x38, 0x2e, 0x32, 0x38, 0x20, 0x31, 0x35, 0x35, 0x33, 0x2e, 0x35,
+	0x38, 0x20, 0x31, 0x36, 0x32, 0x35, 0x2e, 0x32, 0x20, 0x43, 0x20, 0x31, 0x35, 0x32, 0x38, 0x2e,
+	0x35, 0x34, 0x20, 0x31, 0x36, 0x30, 0x37, 0x2e, 0x38, 0x33, 0x20, 0x31, 0x35, 0x30, 0x34, 0x2e,
+	0x30, 0x34, 0x20, 0x31, 0x35, 0x38, 0x33, 0x2e, 0x30, 0x37, 0x20, 0x31, 0x34, 0x37, 0x38, 0x2e,
+	0x36, 0x39, 0x20, 0x31, 0x35, 0x36, 0x38, 0x2e, 0x30, 0x35, 0x20, 0x43, 0x20, 0x31, 0x34, 0x35,
+	0x31, 0x2e, 0x37, 0x31, 0x20, 0x31, 0x35, 0x35, 0x33, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x32,
+	0x32, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x35, 0x34, 0x33, 0x2e, 0x37, 0x38, 0x20, 0x31, 0x33, 0x39,
+	0x32, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x35, 0x34, 0x30, 0x2e, 0x36, 0x31, 0x20, 0x43, 0x20, 0x31,
+	0x33, 0x33, 0x39, 0x2e, 0x34, 0x32, 0x20, 0x31, 0x35, 0x33, 0x34, 0x2e, 0x36, 0x36, 0x20, 0x31,
+	0x32, 0x37, 0x37, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x35, 0x35, 0x34, 0x2e, 0x31, 0x32, 0x20, 0x31,
+	0x32, 0x33, 0x35, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x35, 0x38, 0x37, 0x2e, 0x30, 0x39, 0x20, 0x43,
+	0x20, 0x31, 0x31, 0x37, 0x37, 0x2e, 0x34, 0x35, 0x20, 0x31, 0x36, 0x33, 0x33, 0x2e, 0x31, 0x34,
+	0x20, 0x31, 0x31, 0x32, 0x32, 0x2e, 0x37, 0x33, 0x20, 0x31, 0x36, 0x37, 0x30, 0x2e, 0x31, 0x32,
+	0x20, 0x31, 0x30, 0x34, 0x33, 0x2e, 0x39, 0x20, 0x31, 0x36, 0x37, 0x33, 0x2e, 0x31, 0x38, 0x20,
+	0x43, 0x20, 0x39, 0x38, 0x32, 0x2e, 0x30, 0x35, 0x35, 0x20, 0x31, 0x36, 0x37, 0x38, 0x2e, 0x33,
+	0x20, 0x39, 0x30, 0x39, 0x2e, 0x37, 0x34, 0x36, 0x20, 0x31, 0x36, 0x35, 0x36, 0x2e, 0x32, 0x33,
+	0x20, 0x38, 0x35, 0x39, 0x2e, 0x35, 0x31, 0x36, 0x20, 0x31, 0x36, 0x32, 0x30, 0x2e, 0x30, 0x32,
+	0x20, 0x43, 0x20, 0x37, 0x39, 0x36, 0x2e, 0x32, 0x37, 0x32, 0x20, 0x31, 0x35, 0x37, 0x34, 0x2e,
+	0x34, 0x32, 0x20, 0x37, 0x35, 0x32, 0x2e, 0x34, 0x30, 0x31, 0x20, 0x31, 0x35, 0x33, 0x35, 0x2e,
+	0x31, 0x37, 0x20, 0x36, 0x36, 0x37, 0x2e, 0x35, 0x31, 0x35, 0x20, 0x31, 0x35, 0x33, 0x39, 0x2e,
+	0x38, 0x33, 0x20, 0x43, 0x20, 0x36, 0x32, 0x34, 0x2e, 0x35, 0x30, 0x38, 0x20, 0x31, 0x35, 0x34,
+	0x32, 0x2e, 0x33, 0x35, 0x20, 0x35, 0x38, 0x33, 0x2e, 0x32, 0x39, 0x34, 0x20, 0x31, 0x35, 0x35,
+	0x37, 0x2e, 0x39, 0x34, 0x20, 0x35, 0x34, 0x39, 0x2e, 0x33, 0x37, 0x37, 0x20, 0x31, 0x35, 0x38,
+	0x34, 0x2e, 0x35, 0x20, 0x43, 0x20, 0x35, 0x30, 0x36, 0x2e, 0x33, 0x35, 0x37, 0x20, 0x31, 0x36,
+	0x31, 0x37, 0x2e, 0x35, 0x39, 0x20, 0x34, 0x38, 0x31, 0x2e, 0x37, 0x33, 0x35, 0x20, 0x31, 0x36,
+	0x35, 0x33, 0x2e, 0x37, 0x37, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x34, 0x31, 0x35, 0x20, 0x31, 0x36,
+	0x36, 0x31, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x33, 0x37, 0x38, 0x2e, 0x39, 0x35, 0x31, 0x20,
+	0x31, 0x36, 0x36, 0x37, 0x2e, 0x32, 0x38, 0x20, 0x33, 0x33, 0x33, 0x2e, 0x31, 0x32, 0x33, 0x20,
+	0x31, 0x36, 0x35, 0x35, 0x2e, 0x38, 0x31, 0x20, 0x33, 0x30, 0x30, 0x2e, 0x37, 0x31, 0x38, 0x20,
+	0x31, 0x36, 0x33, 0x30, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20, 0x33, 0x31, 0x37, 0x2e, 0x39, 0x31,
+	0x31, 0x20, 0x31, 0x36, 0x32, 0x31, 0x2e, 0x36, 0x39, 0x20, 0x33, 0x33, 0x39, 0x2e, 0x32, 0x36,
+	0x33, 0x20, 0x31, 0x36, 0x31, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x37, 0x32,
+	0x38, 0x20, 0x31, 0x35, 0x39, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x43, 0x20, 0x34, 0x30, 0x36, 0x2e,
+	0x39, 0x34, 0x32, 0x20, 0x31, 0x35, 0x35, 0x38, 0x2e, 0x36, 0x38, 0x20, 0x34, 0x35, 0x30, 0x2e,
+	0x30, 0x39, 0x36, 0x20, 0x31, 0x34, 0x39, 0x37, 0x2e, 0x39, 0x34, 0x20, 0x34, 0x38, 0x31, 0x2e,
+	0x36, 0x34, 0x32, 0x20, 0x31, 0x34, 0x34, 0x31, 0x2e, 0x32, 0x20, 0x43, 0x20, 0x35, 0x34, 0x30,
+	0x2e, 0x38, 0x31, 0x31, 0x20, 0x31, 0x33, 0x33, 0x32, 0x2e, 0x38, 0x34, 0x20, 0x35, 0x37, 0x36,
+	0x2e, 0x31, 0x37, 0x32, 0x20, 0x31, 0x32, 0x31, 0x33, 0x2e, 0x31, 0x20, 0x35, 0x38, 0x35, 0x2e,
+	0x33, 0x36, 0x31, 0x20, 0x31, 0x30, 0x38, 0x39, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x35, 0x39,
+	0x32, 0x2e, 0x38, 0x36, 0x35, 0x20, 0x39, 0x39, 0x38, 0x2e, 0x36, 0x37, 0x35, 0x20, 0x35, 0x38,
+	0x39, 0x2e, 0x35, 0x33, 0x35, 0x20, 0x39, 0x30, 0x39, 0x2e, 0x35, 0x34, 0x39, 0x20, 0x35, 0x39,
+	0x30, 0x2e, 0x34, 0x38, 0x37, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x31, 0x38, 0x36, 0x20, 0x43, 0x20,
+	0x35, 0x39, 0x30, 0x2e, 0x38, 0x35, 0x34, 0x20, 0x37, 0x38, 0x33, 0x2e, 0x30, 0x31, 0x35, 0x20,
+	0x35, 0x38, 0x39, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x37, 0x34, 0x30, 0x2e, 0x35, 0x36, 0x39, 0x20,
+	0x35, 0x39, 0x31, 0x2e, 0x38, 0x32, 0x36, 0x20, 0x37, 0x30, 0x35, 0x2e, 0x38, 0x32, 0x32, 0x20,
+	0x43, 0x20, 0x35, 0x39, 0x38, 0x2e, 0x39, 0x37, 0x38, 0x20, 0x36, 0x30, 0x38, 0x2e, 0x39, 0x33,
+	0x39, 0x20, 0x36, 0x33, 0x37, 0x2e, 0x31, 0x35, 0x35, 0x20, 0x35, 0x31, 0x36, 0x2e, 0x39, 0x33,
+	0x37, 0x20, 0x37, 0x30, 0x30, 0x2e, 0x36, 0x39, 0x38, 0x20, 0x34, 0x34, 0x33, 0x2e, 0x34, 0x35,
+	0x34, 0x20, 0x43, 0x20, 0x37, 0x38, 0x30, 0x2e, 0x34, 0x39, 0x35, 0x20, 0x33, 0x35, 0x33, 0x2e,
+	0x30, 0x30, 0x34, 0x20, 0x38, 0x38, 0x34, 0x2e, 0x39, 0x38, 0x31, 0x20, 0x33, 0x30, 0x30, 0x2e,
+	0x30, 0x34, 0x38, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x35, 0x31, 0x20, 0x32, 0x39, 0x32, 0x2e,
+	0x34, 0x31, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c,
+	0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x72, 0x67, 0x62, 0x28, 0x31, 0x35, 0x38, 0x2c, 0x31, 0x35, 0x38, 0x2c, 0x31, 0x35, 0x38, 0x29,
+	0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x31, 0x30, 0x2e, 0x31, 0x20, 0x33, 0x30,
+	0x34, 0x2e, 0x34, 0x34, 0x38, 0x20, 0x43, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x34, 0x33, 0x20,
+	0x32, 0x39, 0x37, 0x2e, 0x39, 0x34, 0x38, 0x20, 0x31, 0x34, 0x31, 0x39, 0x2e, 0x32, 0x38, 0x20,
+	0x34, 0x37, 0x31, 0x2e, 0x36, 0x35, 0x34, 0x20, 0x31, 0x34, 0x34, 0x35, 0x2e, 0x32, 0x31, 0x20,
+	0x36, 0x39, 0x33, 0x2e, 0x31, 0x36, 0x39, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x39, 0x2e, 0x39,
+	0x31, 0x20, 0x37, 0x33, 0x33, 0x2e, 0x33, 0x38, 0x36, 0x20, 0x31, 0x34, 0x34, 0x37, 0x2e, 0x30,
+	0x39, 0x20, 0x37, 0x37, 0x32, 0x2e, 0x37, 0x35, 0x36, 0x20, 0x31, 0x34, 0x34, 0x37, 0x2e, 0x36,
+	0x20, 0x38, 0x31, 0x32, 0x2e, 0x39, 0x38, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x38, 0x2e,
+	0x34, 0x20, 0x38, 0x37, 0x35, 0x2e, 0x34, 0x34, 0x35, 0x20, 0x31, 0x34, 0x34, 0x37, 0x2e, 0x33,
+	0x32, 0x20, 0x39, 0x33, 0x38, 0x2e, 0x30, 0x38, 0x32, 0x20, 0x31, 0x34, 0x34, 0x38, 0x2e, 0x34,
+	0x37, 0x20, 0x31, 0x30, 0x30, 0x30, 0x2e, 0x35, 0x31, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x39,
+	0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x38, 0x32, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x34, 0x35, 0x39,
+	0x2e, 0x34, 0x33, 0x20, 0x31, 0x31, 0x36, 0x33, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x37, 0x38, 0x2e,
+	0x35, 0x31, 0x20, 0x31, 0x32, 0x34, 0x33, 0x2e, 0x30, 0x37, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31,
+	0x33, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x33, 0x39, 0x31, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x35, 0x39,
+	0x33, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x35, 0x34, 0x39, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x37, 0x32,
+	0x36, 0x2e, 0x33, 0x36, 0x20, 0x31, 0x36, 0x33, 0x31, 0x2e, 0x38, 0x37, 0x20, 0x43, 0x20, 0x31,
+	0x36, 0x36, 0x38, 0x2e, 0x31, 0x37, 0x20, 0x31, 0x36, 0x36, 0x33, 0x2e, 0x38, 0x34, 0x20, 0x31,
+	0x36, 0x30, 0x33, 0x2e, 0x34, 0x33, 0x20, 0x31, 0x36, 0x34, 0x39, 0x2e, 0x34, 0x36, 0x20, 0x31,
+	0x35, 0x35, 0x33, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x36, 0x31, 0x30, 0x2e, 0x32, 0x32, 0x20, 0x43,
+	0x20, 0x31, 0x35, 0x33, 0x34, 0x2e, 0x34, 0x37, 0x20, 0x31, 0x35, 0x39, 0x35, 0x2e, 0x31, 0x39,
+	0x20, 0x31, 0x35, 0x30, 0x33, 0x2e, 0x35, 0x36, 0x20, 0x31, 0x35, 0x36, 0x39, 0x20, 0x31, 0x34,
+	0x38, 0x33, 0x2e, 0x38, 0x39, 0x20, 0x31, 0x35, 0x35, 0x37, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20,
+	0x31, 0x34, 0x34, 0x38, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x35, 0x33, 0x37, 0x2e, 0x36, 0x38, 0x20,
+	0x31, 0x34, 0x30, 0x38, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x35, 0x32, 0x37, 0x2e, 0x34, 0x34, 0x20,
+	0x31, 0x33, 0x36, 0x38, 0x2e, 0x34, 0x38, 0x20, 0x31, 0x35, 0x32, 0x38, 0x2e, 0x30, 0x37, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x32, 0x35, 0x2e, 0x38, 0x32, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x32,
+	0x39, 0x20, 0x31, 0x32, 0x38, 0x34, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x35, 0x34, 0x31, 0x2e, 0x37,
+	0x39, 0x20, 0x31, 0x32, 0x34, 0x37, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x35, 0x36, 0x34, 0x2e, 0x33,
+	0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x39, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x35, 0x37, 0x35, 0x2e,
+	0x37, 0x20, 0x31, 0x32, 0x31, 0x32, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x35, 0x39, 0x30, 0x2e, 0x34,
+	0x37, 0x20, 0x31, 0x31, 0x39, 0x34, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x36, 0x30, 0x33, 0x2e, 0x33,
+	0x33, 0x20, 0x43, 0x20, 0x31, 0x31, 0x34, 0x37, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x36, 0x33, 0x37,
+	0x2e, 0x37, 0x35, 0x20, 0x31, 0x31, 0x30, 0x30, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x36, 0x35, 0x38,
+	0x2e, 0x30, 0x35, 0x20, 0x31, 0x30, 0x34, 0x31, 0x2e, 0x31, 0x35, 0x20, 0x31, 0x36, 0x36, 0x31,
+	0x2e, 0x31, 0x37, 0x20, 0x43, 0x20, 0x39, 0x37, 0x36, 0x2e, 0x30, 0x38, 0x33, 0x20, 0x31, 0x36,
+	0x36, 0x36, 0x2e, 0x33, 0x20, 0x39, 0x31, 0x32, 0x2e, 0x37, 0x30, 0x38, 0x20, 0x31, 0x36, 0x34,
+	0x33, 0x2e, 0x31, 0x20, 0x38, 0x36, 0x30, 0x2e, 0x34, 0x32, 0x34, 0x20, 0x31, 0x36, 0x30, 0x35,
+	0x2e, 0x35, 0x34, 0x20, 0x43, 0x20, 0x38, 0x33, 0x31, 0x2e, 0x30, 0x32, 0x31, 0x20, 0x31, 0x35,
+	0x38, 0x34, 0x2e, 0x34, 0x32, 0x20, 0x38, 0x30, 0x34, 0x2e, 0x33, 0x33, 0x34, 0x20, 0x31, 0x35,
+	0x36, 0x32, 0x2e, 0x37, 0x39, 0x20, 0x37, 0x37, 0x31, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x31, 0x35,
+	0x34, 0x37, 0x2e, 0x35, 0x20, 0x43, 0x20, 0x36, 0x39, 0x35, 0x2e, 0x35, 0x30, 0x33, 0x20, 0x31,
+	0x35, 0x31, 0x33, 0x2e, 0x32, 0x39, 0x20, 0x36, 0x30, 0x37, 0x2e, 0x30, 0x35, 0x38, 0x20, 0x31,
+	0x35, 0x32, 0x34, 0x2e, 0x31, 0x34, 0x20, 0x35, 0x34, 0x31, 0x2e, 0x38, 0x39, 0x39, 0x20, 0x31,
+	0x35, 0x37, 0x35, 0x2e, 0x36, 0x34, 0x20, 0x43, 0x20, 0x35, 0x31, 0x30, 0x2e, 0x39, 0x31, 0x38,
+	0x20, 0x31, 0x35, 0x39, 0x39, 0x2e, 0x37, 0x36, 0x20, 0x34, 0x38, 0x36, 0x2e, 0x35, 0x32, 0x37,
+	0x20, 0x31, 0x36, 0x32, 0x39, 0x2e, 0x35, 0x32, 0x20, 0x34, 0x34, 0x37, 0x2e, 0x34, 0x39, 0x34,
+	0x20, 0x31, 0x36, 0x34, 0x32, 0x2e, 0x38, 0x37, 0x20, 0x43, 0x20, 0x34, 0x30, 0x31, 0x2e, 0x35,
+	0x36, 0x39, 0x20, 0x31, 0x36, 0x35, 0x38, 0x2e, 0x35, 0x37, 0x20, 0x33, 0x36, 0x36, 0x2e, 0x39,
+	0x36, 0x32, 0x20, 0x31, 0x36, 0x35, 0x31, 0x2e, 0x38, 0x37, 0x20, 0x33, 0x32, 0x34, 0x2e, 0x38,
+	0x39, 0x38, 0x20, 0x31, 0x36, 0x33, 0x32, 0x2e, 0x35, 0x31, 0x20, 0x43, 0x20, 0x33, 0x39, 0x36,
+	0x2e, 0x38, 0x31, 0x31, 0x20, 0x31, 0x35, 0x39, 0x30, 0x2e, 0x36, 0x36, 0x20, 0x34, 0x34, 0x33,
+	0x2e, 0x38, 0x32, 0x35, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x38, 0x33, 0x20, 0x34, 0x38, 0x35,
+	0x2e, 0x35, 0x39, 0x36, 0x20, 0x31, 0x34, 0x35, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x43, 0x20, 0x35,
+	0x36, 0x30, 0x2e, 0x36, 0x30, 0x37, 0x20, 0x31, 0x33, 0x33, 0x32, 0x2e, 0x33, 0x32, 0x20, 0x35,
+	0x39, 0x35, 0x2e, 0x33, 0x32, 0x31, 0x20, 0x31, 0x31, 0x37, 0x39, 0x2e, 0x39, 0x39, 0x20, 0x36,
+	0x30, 0x30, 0x2e, 0x36, 0x20, 0x31, 0x30, 0x33, 0x33, 0x2e, 0x36, 0x33, 0x20, 0x43, 0x20, 0x36,
+	0x30, 0x33, 0x2e, 0x32, 0x35, 0x38, 0x20, 0x39, 0x35, 0x39, 0x2e, 0x39, 0x36, 0x37, 0x20, 0x36,
+	0x30, 0x31, 0x2e, 0x31, 0x33, 0x35, 0x20, 0x38, 0x38, 0x34, 0x2e, 0x36, 0x30, 0x31, 0x20, 0x36,
+	0x30, 0x32, 0x2e, 0x31, 0x31, 0x35, 0x20, 0x38, 0x31, 0x30, 0x2e, 0x37, 0x38, 0x39, 0x20, 0x43,
+	0x20, 0x36, 0x30, 0x32, 0x2e, 0x35, 0x37, 0x39, 0x20, 0x37, 0x37, 0x35, 0x2e, 0x39, 0x30, 0x39,
+	0x20, 0x36, 0x30, 0x30, 0x2e, 0x39, 0x30, 0x38, 0x20, 0x37, 0x33, 0x38, 0x2e, 0x38, 0x36, 0x31,
+	0x20, 0x36, 0x30, 0x33, 0x2e, 0x38, 0x38, 0x34, 0x20, 0x37, 0x30, 0x34, 0x2e, 0x32, 0x36, 0x34,
+	0x20, 0x43, 0x20, 0x36, 0x31, 0x31, 0x2e, 0x39, 0x32, 0x20, 0x36, 0x30, 0x36, 0x2e, 0x32, 0x38,
+	0x31, 0x20, 0x36, 0x35, 0x32, 0x2e, 0x35, 0x33, 0x35, 0x20, 0x35, 0x31, 0x33, 0x2e, 0x38, 0x31,
+	0x20, 0x37, 0x31, 0x39, 0x2e, 0x32, 0x35, 0x31, 0x20, 0x34, 0x34, 0x31, 0x2e, 0x35, 0x39, 0x39,
+	0x20, 0x43, 0x20, 0x37, 0x39, 0x35, 0x2e, 0x32, 0x37, 0x31, 0x20, 0x33, 0x35, 0x39, 0x2e, 0x34,
+	0x32, 0x36, 0x20, 0x38, 0x39, 0x37, 0x2e, 0x38, 0x34, 0x31, 0x20, 0x33, 0x30, 0x38, 0x2e, 0x38,
+	0x36, 0x37, 0x20, 0x31, 0x30, 0x31, 0x30, 0x2e, 0x31, 0x20, 0x33, 0x30, 0x34, 0x2e, 0x34, 0x34,
+	0x38, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e
+};
+
+static const unsigned char icon_client_encryption_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x79, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0x63, 0x60, 0x18,
+	0x68, 0xc0, 0xac, 0xaf, 0x6f, 0x29, 0x2d, 0xa9, 0xa6, 0x9b, 0x29, 0x26, 0xc0, 0x75, 0xe1, 0xe5,
+	0xcb, 0x97, 0xbf, 0x49, 0x35, 0x80, 0xd1, 0x36, 0xb1, 0xe9, 0xbb, 0x98, 0x9e, 0x33, 0xc7, 0xe3,
+	0x33, 0xdb, 0x7e, 0x7c, 0x7d, 0xf3, 0xf4, 0x05, 0x23, 0x33, 0x3b, 0xc7, 0xdf, 0xcf, 0xcf, 0x77,
+	0x5e, 0x3f, 0xbc, 0x29, 0x81, 0x18, 0x03, 0x58, 0xfe, 0xfc, 0xfe, 0xf9, 0xff, 0xe7, 0xcf, 0x9f,
+	0x0c, 0x3f, 0xbf, 0x7d, 0xfd, 0xfd, 0xef, 0xeb, 0xeb, 0xe3, 0xff, 0xfe, 0xfe, 0xe7, 0xfa, 0xff,
+	0xff, 0x3f, 0x3b, 0xd1, 0x2e, 0x30, 0xb4, 0xb5, 0x15, 0xfd, 0xf3, 0x8f, 0x2b, 0x5c, 0x98, 0xf5,
+	0xe7, 0x9c, 0x03, 0x07, 0x0e, 0xfc, 0x20, 0xd5, 0x0b, 0xa3, 0x60, 0x14, 0x0c, 0x0e, 0x00, 0x00,
+	0x20, 0x36, 0x32, 0xad, 0xc4, 0xe2, 0xa9, 0xde, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
+	0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_encryption_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x31, 0x35, 0x33, 0x2e, 0x35, 0x38,
+	0x2c, 0x2d, 0x32, 0x2e, 0x37, 0x39, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e,
+	0x35, 0x30, 0x31, 0x39, 0x29, 0x22, 0x3e, 0x0a, 0x3c, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x09,
+	0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20,
+	0x69, 0x64, 0x3d, 0x22, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x31, 0x22, 0x20, 0x67,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73,
+	0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20, 0x78, 0x31,
+	0x3d, 0x22, 0x31, 0x33, 0x33, 0x33, 0x2e, 0x31, 0x35, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31,
+	0x33, 0x39, 0x39, 0x2e, 0x33, 0x31, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x36, 0x37, 0x36, 0x2e,
+	0x32, 0x36, 0x32, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x36, 0x32, 0x34, 0x2e, 0x35, 0x31, 0x36,
+	0x22, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73,
+	0x3d, 0x22, 0x73, 0x74, 0x6f, 0x70, 0x30, 0x22, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x72, 0x67, 0x62, 0x28, 0x35, 0x33, 0x2c, 0x31, 0x31, 0x33, 0x2c, 0x31, 0x36, 0x38, 0x29,
+	0x22, 0x2f, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x63, 0x6c, 0x61, 0x73,
+	0x73, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x70, 0x31, 0x22, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74,
+	0x79, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39, 0x31, 0x2c, 0x31, 0x35, 0x31, 0x2c, 0x32, 0x30, 0x35,
+	0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x09, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72,
+	0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d,
+	0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x35, 0x31, 0x2c, 0x35, 0x31,
+	0x2c, 0x35, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x37, 0x37, 0x2e, 0x30,
+	0x36, 0x32, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x35, 0x33, 0x33, 0x20, 0x43, 0x20, 0x35, 0x38, 0x37,
+	0x2e, 0x39, 0x33, 0x34, 0x20, 0x36, 0x38, 0x36, 0x2e, 0x36, 0x36, 0x33, 0x20, 0x36, 0x30, 0x35,
+	0x2e, 0x39, 0x33, 0x37, 0x20, 0x36, 0x38, 0x33, 0x2e, 0x36, 0x39, 0x38, 0x20, 0x36, 0x31, 0x37,
+	0x2e, 0x36, 0x31, 0x37, 0x20, 0x36, 0x38, 0x31, 0x2e, 0x39, 0x35, 0x33, 0x20, 0x43, 0x20, 0x36,
+	0x38, 0x33, 0x2e, 0x31, 0x37, 0x35, 0x20, 0x36, 0x37, 0x32, 0x2e, 0x31, 0x36, 0x32, 0x20, 0x37,
+	0x35, 0x34, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x38, 0x31, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x38, 0x31,
+	0x35, 0x2e, 0x30, 0x30, 0x39, 0x20, 0x37, 0x30, 0x39, 0x2e, 0x39, 0x39, 0x36, 0x20, 0x43, 0x20,
+	0x38, 0x31, 0x37, 0x2e, 0x32, 0x35, 0x39, 0x20, 0x37, 0x31, 0x31, 0x2e, 0x30, 0x34, 0x38, 0x20,
+	0x38, 0x32, 0x30, 0x2e, 0x36, 0x36, 0x32, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x37, 0x34, 0x39, 0x20,
+	0x38, 0x32, 0x32, 0x2e, 0x37, 0x30, 0x37, 0x20, 0x37, 0x31, 0x34, 0x2e, 0x30, 0x34, 0x34, 0x20,
+	0x43, 0x20, 0x38, 0x33, 0x30, 0x2e, 0x37, 0x32, 0x35, 0x20, 0x37, 0x31, 0x36, 0x2e, 0x39, 0x33,
+	0x38, 0x20, 0x38, 0x34, 0x39, 0x2e, 0x38, 0x35, 0x39, 0x20, 0x37, 0x32, 0x37, 0x2e, 0x37, 0x37,
+	0x39, 0x20, 0x38, 0x35, 0x37, 0x2e, 0x30, 0x31, 0x39, 0x20, 0x37, 0x33, 0x32, 0x2e, 0x36, 0x36,
+	0x34, 0x20, 0x43, 0x20, 0x38, 0x36, 0x36, 0x2e, 0x39, 0x33, 0x34, 0x20, 0x37, 0x33, 0x38, 0x2e,
+	0x31, 0x30, 0x38, 0x20, 0x38, 0x37, 0x39, 0x2e, 0x33, 0x33, 0x20, 0x37, 0x34, 0x37, 0x2e, 0x34,
+	0x38, 0x33, 0x20, 0x38, 0x38, 0x38, 0x2e, 0x33, 0x31, 0x36, 0x20, 0x37, 0x35, 0x34, 0x2e, 0x36,
+	0x32, 0x31, 0x20, 0x43, 0x20, 0x39, 0x33, 0x30, 0x2e, 0x30, 0x31, 0x36, 0x20, 0x37, 0x38, 0x37,
+	0x2e, 0x37, 0x34, 0x36, 0x20, 0x39, 0x35, 0x35, 0x2e, 0x30, 0x37, 0x34, 0x20, 0x38, 0x32, 0x31,
+	0x2e, 0x35, 0x32, 0x37, 0x20, 0x39, 0x37, 0x39, 0x2e, 0x39, 0x37, 0x35, 0x20, 0x38, 0x36, 0x37,
+	0x2e, 0x39, 0x36, 0x37, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x39, 0x2e, 0x38, 0x20, 0x38, 0x36,
+	0x35, 0x2e, 0x31, 0x32, 0x31, 0x20, 0x31, 0x31, 0x38, 0x33, 0x2e, 0x30, 0x38, 0x20, 0x38, 0x36,
+	0x36, 0x2e, 0x31, 0x32, 0x38, 0x20, 0x31, 0x32, 0x38, 0x33, 0x2e, 0x32, 0x34, 0x20, 0x38, 0x36,
+	0x34, 0x2e, 0x35, 0x33, 0x34, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x39, 0x31, 0x20,
+	0x38, 0x36, 0x31, 0x2e, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35, 0x36, 0x38, 0x2e, 0x39, 0x35, 0x20,
+	0x38, 0x36, 0x31, 0x2e, 0x31, 0x30, 0x39, 0x20, 0x31, 0x36, 0x31, 0x33, 0x2e, 0x31, 0x32, 0x20,
+	0x38, 0x35, 0x39, 0x2e, 0x36, 0x34, 0x34, 0x20, 0x31, 0x36, 0x35, 0x31, 0x2e, 0x36, 0x38, 0x20,
+	0x38, 0x36, 0x30, 0x2e, 0x32, 0x39, 0x20, 0x43, 0x20, 0x31, 0x36, 0x36, 0x38, 0x2e, 0x32, 0x20,
+	0x38, 0x37, 0x32, 0x2e, 0x36, 0x38, 0x35, 0x20, 0x31, 0x36, 0x39, 0x35, 0x2e, 0x37, 0x37, 0x20,
+	0x39, 0x30, 0x31, 0x2e, 0x30, 0x30, 0x39, 0x20, 0x31, 0x37, 0x31, 0x31, 0x2e, 0x35, 0x34, 0x20,
+	0x39, 0x31, 0x35, 0x2e, 0x38, 0x39, 0x32, 0x20, 0x43, 0x20, 0x31, 0x37, 0x35, 0x32, 0x2e, 0x35,
+	0x34, 0x20, 0x39, 0x35, 0x35, 0x2e, 0x32, 0x31, 0x36, 0x20, 0x31, 0x37, 0x39, 0x34, 0x2e, 0x30,
+	0x35, 0x20, 0x39, 0x39, 0x33, 0x2e, 0x39, 0x39, 0x33, 0x20, 0x31, 0x38, 0x33, 0x36, 0x2e, 0x30,
+	0x38, 0x20, 0x31, 0x30, 0x33, 0x32, 0x2e, 0x32, 0x31, 0x20, 0x43, 0x20, 0x31, 0x38, 0x30, 0x38,
+	0x2e, 0x37, 0x35, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x37, 0x37, 0x35,
+	0x2e, 0x38, 0x32, 0x20, 0x31, 0x30, 0x38, 0x37, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x37, 0x34, 0x37,
+	0x2e, 0x32, 0x39, 0x20, 0x31, 0x31, 0x31, 0x34, 0x2e, 0x32, 0x34, 0x20, 0x43, 0x20, 0x31, 0x37,
+	0x32, 0x33, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x31, 0x33, 0x36, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x36,
+	0x39, 0x38, 0x2e, 0x38, 0x36, 0x20, 0x31, 0x31, 0x35, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x36,
+	0x37, 0x34, 0x2e, 0x34, 0x36, 0x20, 0x31, 0x31, 0x38, 0x31, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x36, 0x36, 0x31, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x31, 0x39, 0x33, 0x2e, 0x35, 0x32, 0x20,
+	0x31, 0x36, 0x34, 0x37, 0x2e, 0x33, 0x37, 0x20, 0x31, 0x32, 0x30, 0x36, 0x2e, 0x39, 0x34, 0x20,
+	0x31, 0x36, 0x33, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x32, 0x31, 0x38, 0x2e, 0x33, 0x39, 0x20,
+	0x43, 0x20, 0x31, 0x36, 0x31, 0x38, 0x2e, 0x39, 0x39, 0x20, 0x31, 0x32, 0x30, 0x34, 0x2e, 0x32,
+	0x20, 0x31, 0x36, 0x30, 0x34, 0x2e, 0x32, 0x20, 0x31, 0x31, 0x38, 0x37, 0x2e, 0x34, 0x39, 0x20,
+	0x31, 0x35, 0x39, 0x30, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x31, 0x37, 0x32, 0x2e, 0x32, 0x36, 0x20,
+	0x43, 0x20, 0x31, 0x35, 0x37, 0x32, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x31, 0x35, 0x32, 0x2e, 0x37,
+	0x31, 0x20, 0x31, 0x35, 0x35, 0x34, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x31, 0x33, 0x33, 0x2e, 0x33,
+	0x32, 0x20, 0x31, 0x35, 0x33, 0x36, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x31, 0x31, 0x34, 0x2e, 0x30,
+	0x38, 0x20, 0x43, 0x20, 0x31, 0x35, 0x32, 0x38, 0x2e, 0x34, 0x36, 0x20, 0x31, 0x31, 0x30, 0x35,
+	0x2e, 0x37, 0x34, 0x20, 0x31, 0x35, 0x31, 0x39, 0x2e, 0x32, 0x20, 0x31, 0x30, 0x39, 0x35, 0x2e,
+	0x31, 0x37, 0x20, 0x31, 0x35, 0x31, 0x31, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x30, 0x38, 0x37, 0x2e,
+	0x34, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x36, 0x36, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x31, 0x32,
+	0x39, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x34, 0x32, 0x33, 0x2e, 0x32, 0x38, 0x20, 0x31, 0x31, 0x37,
+	0x33, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x33, 0x37, 0x38, 0x2e, 0x37, 0x31, 0x20, 0x31, 0x32, 0x31,
+	0x34, 0x2e, 0x37, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x30, 0x38, 0x2e, 0x32, 0x33, 0x20, 0x31,
+	0x31, 0x33, 0x38, 0x2e, 0x35, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x39, 0x32, 0x2e, 0x31, 0x35,
+	0x20, 0x31, 0x31, 0x32, 0x31, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x32, 0x37, 0x34, 0x2e, 0x32, 0x39,
+	0x20, 0x31, 0x31, 0x30, 0x30, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x32, 0x35, 0x37, 0x2e, 0x35, 0x36,
+	0x20, 0x31, 0x30, 0x38, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x33, 0x36, 0x2e,
+	0x36, 0x34, 0x20, 0x31, 0x31, 0x30, 0x34, 0x2e, 0x33, 0x20, 0x31, 0x32, 0x31, 0x35, 0x2e, 0x35,
+	0x34, 0x20, 0x31, 0x31, 0x32, 0x34, 0x2e, 0x33, 0x37, 0x20, 0x31, 0x31, 0x39, 0x34, 0x2e, 0x32,
+	0x37, 0x20, 0x31, 0x31, 0x34, 0x34, 0x2e, 0x32, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x38, 0x36,
+	0x2e, 0x35, 0x33, 0x20, 0x31, 0x31, 0x35, 0x31, 0x2e, 0x36, 0x32, 0x20, 0x31, 0x31, 0x37, 0x35,
+	0x2e, 0x32, 0x39, 0x20, 0x31, 0x31, 0x36, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x31, 0x36, 0x37,
+	0x2e, 0x38, 0x36, 0x20, 0x31, 0x31, 0x36, 0x39, 0x2e, 0x39, 0x39, 0x20, 0x43, 0x20, 0x31, 0x31,
+	0x30, 0x34, 0x2e, 0x37, 0x35, 0x20, 0x31, 0x31, 0x37, 0x30, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30,
+	0x34, 0x30, 0x2e, 0x38, 0x39, 0x20, 0x31, 0x31, 0x36, 0x37, 0x2e, 0x39, 0x31, 0x20, 0x39, 0x37,
+	0x37, 0x2e, 0x36, 0x34, 0x37, 0x20, 0x31, 0x31, 0x36, 0x37, 0x2e, 0x34, 0x38, 0x20, 0x43, 0x20,
+	0x39, 0x33, 0x39, 0x2e, 0x34, 0x32, 0x36, 0x20, 0x31, 0x32, 0x35, 0x32, 0x2e, 0x35, 0x39, 0x20,
+	0x38, 0x38, 0x30, 0x2e, 0x31, 0x36, 0x35, 0x20, 0x31, 0x33, 0x31, 0x32, 0x2e, 0x32, 0x39, 0x20,
+	0x37, 0x39, 0x31, 0x2e, 0x39, 0x31, 0x31, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x39, 0x37, 0x20,
+	0x43, 0x20, 0x37, 0x30, 0x34, 0x2e, 0x37, 0x36, 0x39, 0x20, 0x31, 0x33, 0x37, 0x39, 0x2e, 0x30,
+	0x39, 0x20, 0x36, 0x30, 0x38, 0x2e, 0x30, 0x38, 0x31, 0x20, 0x31, 0x33, 0x37, 0x36, 0x2e, 0x35,
+	0x20, 0x35, 0x32, 0x32, 0x2e, 0x38, 0x33, 0x33, 0x20, 0x31, 0x33, 0x33, 0x38, 0x2e, 0x37, 0x38,
+	0x20, 0x43, 0x20, 0x34, 0x34, 0x30, 0x2e, 0x33, 0x35, 0x34, 0x20, 0x31, 0x33, 0x30, 0x31, 0x2e,
+	0x37, 0x31, 0x20, 0x33, 0x37, 0x31, 0x2e, 0x30, 0x39, 0x33, 0x20, 0x31, 0x32, 0x33, 0x32, 0x2e,
+	0x37, 0x34, 0x20, 0x33, 0x33, 0x38, 0x2e, 0x38, 0x37, 0x35, 0x20, 0x31, 0x31, 0x34, 0x37, 0x2e,
+	0x37, 0x38, 0x20, 0x43, 0x20, 0x33, 0x30, 0x35, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x30, 0x36, 0x32,
+	0x2e, 0x35, 0x37, 0x20, 0x33, 0x30, 0x38, 0x2e, 0x35, 0x37, 0x32, 0x20, 0x39, 0x36, 0x37, 0x2e,
+	0x37, 0x33, 0x20, 0x33, 0x34, 0x36, 0x2e, 0x30, 0x37, 0x34, 0x20, 0x38, 0x38, 0x34, 0x2e, 0x34,
+	0x34, 0x32, 0x20, 0x43, 0x20, 0x33, 0x36, 0x35, 0x2e, 0x34, 0x30, 0x39, 0x20, 0x38, 0x34, 0x32,
+	0x2e, 0x33, 0x32, 0x37, 0x20, 0x33, 0x39, 0x32, 0x2e, 0x36, 0x38, 0x38, 0x20, 0x38, 0x30, 0x34,
+	0x2e, 0x33, 0x33, 0x38, 0x20, 0x34, 0x32, 0x36, 0x2e, 0x34, 0x31, 0x36, 0x20, 0x37, 0x37, 0x32,
+	0x2e, 0x35, 0x35, 0x39, 0x20, 0x43, 0x20, 0x34, 0x33, 0x30, 0x2e, 0x31, 0x30, 0x36, 0x20, 0x37,
+	0x36, 0x39, 0x2e, 0x31, 0x30, 0x38, 0x20, 0x34, 0x34, 0x32, 0x2e, 0x34, 0x31, 0x34, 0x20, 0x37,
+	0x35, 0x38, 0x2e, 0x30, 0x36, 0x20, 0x34, 0x34, 0x36, 0x2e, 0x33, 0x37, 0x32, 0x20, 0x37, 0x35,
+	0x35, 0x2e, 0x37, 0x34, 0x20, 0x43, 0x20, 0x34, 0x35, 0x38, 0x2e, 0x31, 0x32, 0x36, 0x20, 0x37,
+	0x34, 0x35, 0x2e, 0x33, 0x33, 0x39, 0x20, 0x34, 0x38, 0x36, 0x2e, 0x30, 0x36, 0x38, 0x20, 0x37,
+	0x32, 0x36, 0x2e, 0x38, 0x32, 0x35, 0x20, 0x35, 0x30, 0x30, 0x2e, 0x36, 0x39, 0x39, 0x20, 0x37,
+	0x32, 0x30, 0x2e, 0x33, 0x32, 0x35, 0x20, 0x43, 0x20, 0x35, 0x30, 0x33, 0x2e, 0x30, 0x32, 0x34,
+	0x20, 0x37, 0x31, 0x37, 0x2e, 0x38, 0x37, 0x33, 0x20, 0x35, 0x31, 0x39, 0x2e, 0x39, 0x34, 0x33,
+	0x20, 0x37, 0x31, 0x30, 0x2e, 0x32, 0x39, 0x32, 0x20, 0x35, 0x32, 0x34, 0x2e, 0x30, 0x30, 0x32,
+	0x20, 0x37, 0x30, 0x38, 0x2e, 0x36, 0x37, 0x32, 0x20, 0x43, 0x20, 0x35, 0x33, 0x37, 0x2e, 0x33,
+	0x37, 0x38, 0x20, 0x37, 0x30, 0x32, 0x2e, 0x34, 0x31, 0x35, 0x20, 0x35, 0x36, 0x32, 0x2e, 0x37,
+	0x36, 0x34, 0x20, 0x36, 0x39, 0x33, 0x2e, 0x35, 0x36, 0x39, 0x20, 0x35, 0x37, 0x37, 0x2e, 0x30,
+	0x36, 0x32, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x35, 0x33, 0x33, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d,
+	0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x31, 0x2c, 0x31,
+	0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x30, 0x30, 0x2e, 0x36, 0x39, 0x39, 0x20,
+	0x37, 0x32, 0x30, 0x2e, 0x33, 0x32, 0x35, 0x20, 0x43, 0x20, 0x35, 0x30, 0x30, 0x2e, 0x33, 0x38,
+	0x20, 0x37, 0x32, 0x34, 0x2e, 0x32, 0x32, 0x20, 0x34, 0x39, 0x31, 0x2e, 0x32, 0x34, 0x20, 0x37,
+	0x32, 0x37, 0x2e, 0x38, 0x39, 0x37, 0x20, 0x34, 0x38, 0x37, 0x2e, 0x33, 0x36, 0x32, 0x20, 0x37,
+	0x33, 0x30, 0x2e, 0x31, 0x33, 0x35, 0x20, 0x43, 0x20, 0x34, 0x38, 0x30, 0x2e, 0x32, 0x39, 0x32,
+	0x20, 0x37, 0x33, 0x34, 0x2e, 0x32, 0x31, 0x37, 0x20, 0x34, 0x37, 0x34, 0x2e, 0x32, 0x32, 0x39,
+	0x20, 0x37, 0x33, 0x38, 0x2e, 0x33, 0x39, 0x36, 0x20, 0x34, 0x36, 0x37, 0x2e, 0x34, 0x33, 0x34,
+	0x20, 0x37, 0x34, 0x32, 0x2e, 0x37, 0x32, 0x33, 0x20, 0x4c, 0x20, 0x34, 0x36, 0x34, 0x2e, 0x34,
+	0x33, 0x35, 0x20, 0x37, 0x34, 0x34, 0x2e, 0x37, 0x32, 0x34, 0x20, 0x4c, 0x20, 0x34, 0x36, 0x33,
+	0x2e, 0x30, 0x32, 0x37, 0x20, 0x37, 0x34, 0x35, 0x2e, 0x36, 0x36, 0x34, 0x20, 0x43, 0x20, 0x34,
+	0x35, 0x37, 0x2e, 0x30, 0x31, 0x35, 0x20, 0x37, 0x34, 0x39, 0x2e, 0x33, 0x36, 0x32, 0x20, 0x34,
+	0x35, 0x33, 0x2e, 0x31, 0x36, 0x34, 0x20, 0x37, 0x35, 0x35, 0x2e, 0x31, 0x32, 0x20, 0x34, 0x34,
+	0x36, 0x2e, 0x33, 0x37, 0x32, 0x20, 0x37, 0x35, 0x35, 0x2e, 0x37, 0x34, 0x20, 0x43, 0x20, 0x34,
+	0x35, 0x38, 0x2e, 0x31, 0x32, 0x36, 0x20, 0x37, 0x34, 0x35, 0x2e, 0x33, 0x33, 0x39, 0x20, 0x34,
+	0x38, 0x36, 0x2e, 0x30, 0x36, 0x38, 0x20, 0x37, 0x32, 0x36, 0x2e, 0x38, 0x32, 0x35, 0x20, 0x35,
+	0x30, 0x30, 0x2e, 0x36, 0x39, 0x39, 0x20, 0x37, 0x32, 0x30, 0x2e, 0x33, 0x32, 0x35, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31,
+	0x2c, 0x31, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x32, 0x34, 0x2e,
+	0x30, 0x30, 0x32, 0x20, 0x37, 0x30, 0x38, 0x2e, 0x36, 0x37, 0x32, 0x20, 0x43, 0x20, 0x35, 0x33,
+	0x37, 0x2e, 0x33, 0x37, 0x38, 0x20, 0x37, 0x30, 0x32, 0x2e, 0x34, 0x31, 0x35, 0x20, 0x35, 0x36,
+	0x32, 0x2e, 0x37, 0x36, 0x34, 0x20, 0x36, 0x39, 0x33, 0x2e, 0x35, 0x36, 0x39, 0x20, 0x35, 0x37,
+	0x37, 0x2e, 0x30, 0x36, 0x32, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x35, 0x33, 0x33, 0x20, 0x43, 0x20,
+	0x35, 0x37, 0x37, 0x2e, 0x36, 0x37, 0x39, 0x20, 0x36, 0x39, 0x33, 0x2e, 0x32, 0x31, 0x35, 0x20,
+	0x35, 0x37, 0x32, 0x2e, 0x39, 0x31, 0x37, 0x20, 0x36, 0x39, 0x34, 0x2e, 0x33, 0x38, 0x38, 0x20,
+	0x35, 0x37, 0x30, 0x2e, 0x35, 0x33, 0x34, 0x20, 0x36, 0x39, 0x35, 0x2e, 0x30, 0x38, 0x36, 0x20,
+	0x43, 0x20, 0x35, 0x35, 0x36, 0x2e, 0x39, 0x30, 0x33, 0x20, 0x36, 0x39, 0x39, 0x2e, 0x30, 0x38,
+	0x31, 0x20, 0x35, 0x34, 0x33, 0x2e, 0x32, 0x35, 0x35, 0x20, 0x37, 0x30, 0x33, 0x2e, 0x36, 0x32,
+	0x34, 0x20, 0x35, 0x32, 0x39, 0x2e, 0x39, 0x35, 0x36, 0x20, 0x37, 0x30, 0x38, 0x2e, 0x33, 0x36,
+	0x38, 0x20, 0x43, 0x20, 0x35, 0x32, 0x35, 0x2e, 0x39, 0x31, 0x36, 0x20, 0x37, 0x30, 0x39, 0x2e,
+	0x38, 0x31, 0x20, 0x35, 0x32, 0x37, 0x2e, 0x38, 0x33, 0x37, 0x20, 0x37, 0x31, 0x31, 0x2e, 0x30,
+	0x31, 0x20, 0x35, 0x32, 0x34, 0x2e, 0x30, 0x30, 0x32, 0x20, 0x37, 0x30, 0x38, 0x2e, 0x36, 0x37,
+	0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74,
+	0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67,
+	0x62, 0x28, 0x31, 0x2c, 0x31, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38,
+	0x32, 0x32, 0x2e, 0x37, 0x30, 0x37, 0x20, 0x37, 0x31, 0x34, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x43,
+	0x20, 0x38, 0x33, 0x30, 0x2e, 0x37, 0x32, 0x35, 0x20, 0x37, 0x31, 0x36, 0x2e, 0x39, 0x33, 0x38,
+	0x20, 0x38, 0x34, 0x39, 0x2e, 0x38, 0x35, 0x39, 0x20, 0x37, 0x32, 0x37, 0x2e, 0x37, 0x37, 0x39,
+	0x20, 0x38, 0x35, 0x37, 0x2e, 0x30, 0x31, 0x39, 0x20, 0x37, 0x33, 0x32, 0x2e, 0x36, 0x36, 0x34,
+	0x20, 0x43, 0x20, 0x38, 0x35, 0x32, 0x2e, 0x38, 0x35, 0x31, 0x20, 0x37, 0x33, 0x34, 0x2e, 0x37,
+	0x39, 0x37, 0x20, 0x38, 0x34, 0x36, 0x2e, 0x39, 0x34, 0x33, 0x20, 0x37, 0x32, 0x38, 0x2e, 0x37,
+	0x35, 0x38, 0x20, 0x38, 0x34, 0x33, 0x2e, 0x34, 0x30, 0x37, 0x20, 0x37, 0x32, 0x36, 0x2e, 0x32,
+	0x34, 0x36, 0x20, 0x43, 0x20, 0x38, 0x34, 0x33, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x37, 0x32, 0x36,
+	0x2e, 0x34, 0x35, 0x36, 0x20, 0x38, 0x34, 0x32, 0x2e, 0x37, 0x35, 0x31, 0x20, 0x37, 0x32, 0x36,
+	0x2e, 0x36, 0x36, 0x36, 0x20, 0x38, 0x34, 0x32, 0x2e, 0x34, 0x32, 0x33, 0x20, 0x37, 0x32, 0x36,
+	0x2e, 0x38, 0x37, 0x37, 0x20, 0x43, 0x20, 0x38, 0x34, 0x32, 0x2e, 0x33, 0x39, 0x36, 0x20, 0x37,
+	0x32, 0x36, 0x2e, 0x38, 0x36, 0x39, 0x20, 0x38, 0x33, 0x32, 0x2e, 0x34, 0x31, 0x33, 0x20, 0x37,
+	0x32, 0x31, 0x2e, 0x30, 0x39, 0x20, 0x38, 0x33, 0x31, 0x2e, 0x30, 0x33, 0x31, 0x20, 0x37, 0x32,
+	0x30, 0x2e, 0x34, 0x33, 0x34, 0x20, 0x4c, 0x20, 0x38, 0x32, 0x39, 0x2e, 0x35, 0x38, 0x37, 0x20,
+	0x37, 0x31, 0x39, 0x2e, 0x37, 0x30, 0x31, 0x20, 0x43, 0x20, 0x38, 0x32, 0x37, 0x2e, 0x36, 0x39,
+	0x20, 0x37, 0x31, 0x38, 0x2e, 0x37, 0x35, 0x37, 0x20, 0x38, 0x32, 0x32, 0x2e, 0x32, 0x31, 0x32,
+	0x20, 0x37, 0x31, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x38, 0x32, 0x32, 0x2e, 0x37, 0x30, 0x37, 0x20,
+	0x37, 0x31, 0x34, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x31, 0x2c, 0x31, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x36, 0x35, 0x37, 0x2e, 0x36, 0x32, 0x32, 0x20, 0x37, 0x32, 0x32,
+	0x2e, 0x34, 0x32, 0x38, 0x20, 0x43, 0x20, 0x36, 0x39, 0x36, 0x2e, 0x34, 0x38, 0x33, 0x20, 0x37,
+	0x32, 0x30, 0x2e, 0x31, 0x31, 0x36, 0x20, 0x37, 0x35, 0x30, 0x2e, 0x34, 0x32, 0x39, 0x20, 0x37,
+	0x33, 0x32, 0x2e, 0x32, 0x31, 0x37, 0x20, 0x37, 0x38, 0x36, 0x2e, 0x31, 0x38, 0x36, 0x20, 0x37,
+	0x34, 0x37, 0x2e, 0x36, 0x34, 0x34, 0x20, 0x43, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x30, 0x36, 0x20,
+	0x37, 0x38, 0x31, 0x2e, 0x32, 0x34, 0x33, 0x20, 0x39, 0x31, 0x37, 0x2e, 0x33, 0x35, 0x34, 0x20,
+	0x38, 0x33, 0x37, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x39, 0x34, 0x38, 0x2e, 0x38, 0x36, 0x32, 0x20,
+	0x39, 0x31, 0x36, 0x2e, 0x30, 0x36, 0x32, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x31,
+	0x34, 0x20, 0x39, 0x31, 0x36, 0x2e, 0x31, 0x35, 0x20, 0x31, 0x30, 0x35, 0x32, 0x2e, 0x30, 0x38,
+	0x20, 0x39, 0x31, 0x34, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x31, 0x30, 0x34, 0x20, 0x39, 0x31,
+	0x34, 0x2e, 0x30, 0x39, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x38, 0x33, 0x2e, 0x37, 0x34, 0x20,
+	0x39, 0x31, 0x31, 0x2e, 0x36, 0x38, 0x36, 0x20, 0x43, 0x20, 0x31, 0x34, 0x36, 0x37, 0x2e, 0x34,
+	0x20, 0x39, 0x30, 0x39, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x35, 0x35, 0x31, 0x2e, 0x30, 0x36, 0x20,
+	0x39, 0x30, 0x38, 0x2e, 0x36, 0x32, 0x31, 0x20, 0x31, 0x36, 0x33, 0x34, 0x2e, 0x37, 0x34, 0x20,
+	0x39, 0x30, 0x38, 0x2e, 0x30, 0x32, 0x37, 0x20, 0x43, 0x20, 0x31, 0x36, 0x37, 0x37, 0x2e, 0x39,
+	0x31, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x30, 0x33, 0x38, 0x20, 0x31, 0x37, 0x32, 0x32, 0x2e, 0x30,
+	0x35, 0x20, 0x39, 0x39, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x31, 0x37, 0x36, 0x35, 0x2e, 0x32,
+	0x36, 0x20, 0x31, 0x30, 0x33, 0x32, 0x2e, 0x31, 0x20, 0x43, 0x20, 0x31, 0x37, 0x35, 0x34, 0x20,
+	0x31, 0x30, 0x34, 0x34, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x37, 0x33, 0x39, 0x2e, 0x33, 0x37, 0x20,
+	0x31, 0x30, 0x35, 0x36, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x37, 0x32, 0x37, 0x2e, 0x32, 0x35, 0x20,
+	0x31, 0x30, 0x36, 0x37, 0x2e, 0x37, 0x38, 0x20, 0x43, 0x20, 0x31, 0x36, 0x39, 0x37, 0x2e, 0x30,
+	0x34, 0x20, 0x31, 0x30, 0x39, 0x35, 0x2e, 0x39, 0x32, 0x20, 0x31, 0x36, 0x36, 0x33, 0x2e, 0x38,
+	0x36, 0x20, 0x31, 0x31, 0x32, 0x33, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x36, 0x33, 0x34, 0x2e, 0x38,
+	0x38, 0x20, 0x31, 0x31, 0x35, 0x32, 0x2e, 0x33, 0x31, 0x20, 0x43, 0x20, 0x31, 0x36, 0x31, 0x35,
+	0x2e, 0x37, 0x34, 0x20, 0x31, 0x31, 0x33, 0x34, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x35, 0x39, 0x31,
+	0x2e, 0x36, 0x31, 0x20, 0x31, 0x31, 0x30, 0x36, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x35, 0x37, 0x33,
+	0x2e, 0x34, 0x35, 0x20, 0x31, 0x30, 0x38, 0x36, 0x2e, 0x32, 0x34, 0x20, 0x43, 0x20, 0x31, 0x35,
+	0x35, 0x34, 0x2e, 0x33, 0x37, 0x20, 0x31, 0x30, 0x36, 0x35, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x35,
+	0x32, 0x39, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x30, 0x33, 0x39, 0x2e, 0x34, 0x37, 0x20, 0x31, 0x35,
+	0x31, 0x31, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x30, 0x31, 0x37, 0x2e, 0x38, 0x38, 0x20, 0x43, 0x20,
+	0x31, 0x34, 0x36, 0x38, 0x2e, 0x32, 0x39, 0x20, 0x31, 0x30, 0x36, 0x31, 0x2e, 0x35, 0x32, 0x20,
+	0x31, 0x34, 0x32, 0x34, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x31, 0x30, 0x34, 0x2e, 0x33, 0x36, 0x20,
+	0x31, 0x33, 0x37, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x31, 0x34, 0x36, 0x2e, 0x33, 0x38, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x36, 0x38, 0x2e, 0x34, 0x36, 0x20, 0x31, 0x31, 0x33, 0x36, 0x2e, 0x30,
+	0x39, 0x20, 0x31, 0x33, 0x35, 0x33, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x31, 0x31, 0x38, 0x2e, 0x32,
+	0x20, 0x31, 0x33, 0x34, 0x32, 0x2e, 0x37, 0x35, 0x20, 0x31, 0x31, 0x30, 0x36, 0x2e, 0x38, 0x34,
+	0x20, 0x43, 0x20, 0x31, 0x33, 0x33, 0x38, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x31, 0x30, 0x30, 0x2e,
+	0x38, 0x37, 0x20, 0x31, 0x33, 0x32, 0x32, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x30, 0x38, 0x34, 0x2e,
+	0x31, 0x33, 0x20, 0x31, 0x33, 0x31, 0x36, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x30, 0x37, 0x37, 0x2e,
+	0x38, 0x38, 0x20, 0x43, 0x20, 0x31, 0x32, 0x39, 0x37, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x30, 0x35,
+	0x37, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x32, 0x37, 0x38, 0x2e, 0x31, 0x38, 0x20, 0x31, 0x30, 0x33,
+	0x36, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x32, 0x35, 0x39, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x30, 0x31,
+	0x35, 0x2e, 0x30, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x33, 0x32, 0x2e, 0x35, 0x33, 0x20, 0x31,
+	0x30, 0x34, 0x33, 0x2e, 0x32, 0x31, 0x20, 0x31, 0x32, 0x30, 0x33, 0x2e, 0x35, 0x38, 0x20, 0x31,
+	0x30, 0x36, 0x39, 0x2e, 0x31, 0x36, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x39, 0x39, 0x20, 0x31,
+	0x30, 0x39, 0x36, 0x2e, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x36, 0x37, 0x2e, 0x39, 0x35, 0x20,
+	0x31, 0x31, 0x30, 0x34, 0x2e, 0x36, 0x20, 0x31, 0x31, 0x35, 0x37, 0x2e, 0x36, 0x36, 0x20, 0x31,
+	0x31, 0x31, 0x34, 0x2e, 0x39, 0x36, 0x20, 0x31, 0x31, 0x34, 0x38, 0x2e, 0x36, 0x39, 0x20, 0x31,
+	0x31, 0x32, 0x31, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x33, 0x32, 0x2e, 0x32, 0x31,
+	0x20, 0x31, 0x31, 0x32, 0x32, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x39, 0x39, 0x2e, 0x34, 0x32, 0x20,
+	0x31, 0x31, 0x32, 0x30, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x30, 0x38, 0x31, 0x2e, 0x30, 0x35, 0x20,
+	0x31, 0x31, 0x32, 0x30, 0x2e, 0x33, 0x38, 0x20, 0x43, 0x20, 0x31, 0x30, 0x33, 0x37, 0x2e, 0x34,
+	0x37, 0x20, 0x31, 0x31, 0x32, 0x30, 0x2e, 0x33, 0x38, 0x20, 0x39, 0x39, 0x33, 0x2e, 0x33, 0x39,
+	0x31, 0x20, 0x31, 0x31, 0x32, 0x30, 0x2e, 0x31, 0x38, 0x20, 0x39, 0x34, 0x39, 0x2e, 0x39, 0x31,
+	0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x39, 0x33, 0x39, 0x2e, 0x31,
+	0x38, 0x33, 0x20, 0x31, 0x31, 0x35, 0x32, 0x2e, 0x39, 0x20, 0x39, 0x31, 0x38, 0x2e, 0x38, 0x31,
+	0x35, 0x20, 0x31, 0x31, 0x38, 0x38, 0x2e, 0x36, 0x38, 0x20, 0x38, 0x39, 0x34, 0x2e, 0x38, 0x30,
+	0x34, 0x20, 0x31, 0x32, 0x31, 0x36, 0x2e, 0x30, 0x38, 0x20, 0x43, 0x20, 0x38, 0x34, 0x31, 0x2e,
+	0x37, 0x36, 0x37, 0x20, 0x31, 0x32, 0x37, 0x37, 0x2e, 0x33, 0x35, 0x20, 0x37, 0x36, 0x36, 0x2e,
+	0x33, 0x34, 0x31, 0x20, 0x31, 0x33, 0x31, 0x34, 0x2e, 0x37, 0x34, 0x20, 0x36, 0x38, 0x35, 0x2e,
+	0x34, 0x36, 0x37, 0x20, 0x31, 0x33, 0x31, 0x39, 0x2e, 0x38, 0x36, 0x20, 0x43, 0x20, 0x36, 0x30,
+	0x33, 0x2e, 0x34, 0x35, 0x37, 0x20, 0x31, 0x33, 0x32, 0x35, 0x2e, 0x31, 0x38, 0x20, 0x35, 0x32,
+	0x32, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x32, 0x39, 0x37, 0x2e, 0x33, 0x38, 0x20, 0x34, 0x36, 0x31,
+	0x2e, 0x34, 0x30, 0x37, 0x20, 0x31, 0x32, 0x34, 0x32, 0x2e, 0x36, 0x38, 0x20, 0x43, 0x20, 0x33,
+	0x34, 0x36, 0x2e, 0x36, 0x30, 0x39, 0x20, 0x31, 0x31, 0x34, 0x30, 0x2e, 0x39, 0x38, 0x20, 0x33,
+	0x33, 0x31, 0x2e, 0x32, 0x37, 0x33, 0x20, 0x39, 0x36, 0x31, 0x2e, 0x38, 0x31, 0x39, 0x20, 0x34,
+	0x32, 0x34, 0x2e, 0x37, 0x38, 0x35, 0x20, 0x38, 0x34, 0x31, 0x2e, 0x33, 0x20, 0x43, 0x20, 0x34,
+	0x38, 0x33, 0x2e, 0x38, 0x39, 0x38, 0x20, 0x37, 0x36, 0x35, 0x2e, 0x31, 0x31, 0x33, 0x20, 0x35,
+	0x36, 0x32, 0x2e, 0x30, 0x32, 0x33, 0x20, 0x37, 0x32, 0x37, 0x2e, 0x36, 0x36, 0x36, 0x20, 0x36,
+	0x35, 0x37, 0x2e, 0x36, 0x32, 0x32, 0x20, 0x37, 0x32, 0x32, 0x2e, 0x34, 0x32, 0x38, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x20, 0x36, 0x34, 0x37, 0x2e, 0x34, 0x36, 0x36, 0x20, 0x37, 0x32, 0x36, 0x2e, 0x34, 0x30, 0x32,
+	0x20, 0x43, 0x20, 0x36, 0x39, 0x38, 0x2e, 0x37, 0x35, 0x39, 0x20, 0x37, 0x32, 0x31, 0x2e, 0x31,
+	0x38, 0x34, 0x20, 0x37, 0x36, 0x35, 0x2e, 0x36, 0x35, 0x33, 0x20, 0x37, 0x33, 0x38, 0x2e, 0x38,
+	0x33, 0x20, 0x38, 0x31, 0x30, 0x2e, 0x37, 0x39, 0x36, 0x20, 0x37, 0x36, 0x33, 0x2e, 0x31, 0x35,
+	0x20, 0x43, 0x20, 0x38, 0x36, 0x38, 0x2e, 0x31, 0x31, 0x35, 0x20, 0x37, 0x39, 0x34, 0x2e, 0x30,
+	0x33, 0x20, 0x39, 0x32, 0x37, 0x2e, 0x32, 0x36, 0x33, 0x20, 0x38, 0x35, 0x36, 0x2e, 0x33, 0x31,
+	0x32, 0x20, 0x39, 0x34, 0x35, 0x2e, 0x39, 0x32, 0x38, 0x20, 0x39, 0x31, 0x39, 0x2e, 0x37, 0x32,
+	0x36, 0x20, 0x43, 0x20, 0x39, 0x36, 0x30, 0x2e, 0x35, 0x31, 0x36, 0x20, 0x39, 0x31, 0x38, 0x2e,
+	0x37, 0x34, 0x34, 0x20, 0x39, 0x38, 0x30, 0x2e, 0x37, 0x32, 0x20, 0x39, 0x31, 0x39, 0x2e, 0x31,
+	0x38, 0x39, 0x20, 0x39, 0x39, 0x35, 0x2e, 0x36, 0x34, 0x34, 0x20, 0x39, 0x31, 0x39, 0x2e, 0x31,
+	0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x33, 0x2e, 0x35, 0x32, 0x20, 0x39, 0x31, 0x39, 0x2e,
+	0x31, 0x30, 0x36, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x33, 0x39, 0x20, 0x39, 0x31, 0x38, 0x2e,
+	0x38, 0x32, 0x37, 0x20, 0x31, 0x30, 0x37, 0x39, 0x2e, 0x32, 0x36, 0x20, 0x39, 0x31, 0x38, 0x2e,
+	0x32, 0x39, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x36, 0x38, 0x2e, 0x39, 0x35, 0x20, 0x39, 0x31,
+	0x33, 0x2e, 0x33, 0x30, 0x34, 0x20, 0x43, 0x20, 0x31, 0x35, 0x32, 0x31, 0x2e, 0x37, 0x31, 0x20,
+	0x39, 0x31, 0x32, 0x2e, 0x35, 0x36, 0x36, 0x20, 0x31, 0x35, 0x38, 0x31, 0x2e, 0x32, 0x33, 0x20,
+	0x39, 0x31, 0x34, 0x2e, 0x30, 0x34, 0x31, 0x20, 0x31, 0x36, 0x33, 0x33, 0x2e, 0x33, 0x38, 0x20,
+	0x39, 0x31, 0x31, 0x2e, 0x32, 0x35, 0x33, 0x20, 0x43, 0x20, 0x31, 0x36, 0x35, 0x35, 0x2e, 0x32,
+	0x36, 0x20, 0x39, 0x33, 0x32, 0x2e, 0x39, 0x32, 0x36, 0x20, 0x31, 0x36, 0x37, 0x38, 0x2e, 0x31,
+	0x20, 0x39, 0x35, 0x34, 0x2e, 0x31, 0x35, 0x32, 0x20, 0x31, 0x37, 0x30, 0x30, 0x2e, 0x34, 0x33,
+	0x20, 0x39, 0x37, 0x35, 0x2e, 0x34, 0x35, 0x32, 0x20, 0x43, 0x20, 0x31, 0x37, 0x31, 0x39, 0x2e,
+	0x38, 0x33, 0x20, 0x39, 0x39, 0x33, 0x2e, 0x39, 0x35, 0x39, 0x20, 0x31, 0x37, 0x34, 0x31, 0x2e,
+	0x31, 0x39, 0x20, 0x31, 0x30, 0x31, 0x35, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x37, 0x36, 0x31, 0x2e,
+	0x36, 0x35, 0x20, 0x31, 0x30, 0x33, 0x32, 0x2e, 0x32, 0x20, 0x43, 0x20, 0x31, 0x37, 0x35, 0x30,
+	0x2e, 0x35, 0x38, 0x20, 0x31, 0x30, 0x34, 0x30, 0x2e, 0x33, 0x31, 0x20, 0x31, 0x37, 0x32, 0x37,
+	0x2e, 0x36, 0x36, 0x20, 0x31, 0x30, 0x36, 0x32, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x37, 0x31, 0x36,
+	0x2e, 0x38, 0x20, 0x31, 0x30, 0x37, 0x32, 0x2e, 0x34, 0x20, 0x43, 0x20, 0x31, 0x36, 0x38, 0x39,
+	0x2e, 0x31, 0x36, 0x20, 0x31, 0x30, 0x39, 0x37, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x36, 0x36, 0x31,
+	0x2e, 0x37, 0x37, 0x20, 0x31, 0x31, 0x32, 0x32, 0x2e, 0x34, 0x20, 0x31, 0x36, 0x33, 0x34, 0x2e,
+	0x36, 0x33, 0x20, 0x31, 0x31, 0x34, 0x37, 0x2e, 0x38, 0x20, 0x43, 0x20, 0x31, 0x35, 0x39, 0x34,
+	0x2e, 0x31, 0x37, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x35, 0x35, 0x30,
+	0x2e, 0x34, 0x20, 0x31, 0x30, 0x35, 0x36, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x35, 0x31, 0x31, 0x2e,
+	0x33, 0x36, 0x20, 0x31, 0x30, 0x31, 0x33, 0x2e, 0x30, 0x31, 0x20, 0x43, 0x20, 0x31, 0x34, 0x37,
+	0x30, 0x2e, 0x35, 0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x31, 0x34, 0x32, 0x32,
+	0x2e, 0x33, 0x34, 0x20, 0x31, 0x31, 0x30, 0x31, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x33, 0x37, 0x39,
+	0x2e, 0x35, 0x20, 0x31, 0x31, 0x34, 0x32, 0x2e, 0x31, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x35,
+	0x30, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x31, 0x30, 0x39, 0x2e, 0x37, 0x36, 0x20, 0x43, 0x20, 0x31,
+	0x33, 0x31, 0x39, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x30, 0x37, 0x37, 0x2e, 0x32, 0x34, 0x20, 0x31,
+	0x32, 0x39, 0x30, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x30, 0x34, 0x33, 0x2e, 0x31, 0x35, 0x20, 0x31,
+	0x32, 0x35, 0x39, 0x2e, 0x36, 0x20, 0x31, 0x30, 0x31, 0x30, 0x2e, 0x39, 0x31, 0x20, 0x4c, 0x20,
+	0x31, 0x31, 0x38, 0x35, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x30, 0x38, 0x32, 0x20, 0x43, 0x20, 0x31,
+	0x31, 0x37, 0x33, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x30, 0x39, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x31,
+	0x31, 0x36, 0x30, 0x2e, 0x36, 0x33, 0x20, 0x31, 0x31, 0x30, 0x37, 0x2e, 0x33, 0x36, 0x20, 0x31,
+	0x31, 0x34, 0x37, 0x2e, 0x38, 0x37, 0x20, 0x31, 0x31, 0x31, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x43,
+	0x20, 0x31, 0x31, 0x33, 0x30, 0x2e, 0x33, 0x31, 0x20, 0x31, 0x31, 0x31, 0x38, 0x2e, 0x34, 0x33,
+	0x20, 0x31, 0x31, 0x30, 0x37, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x34, 0x37,
+	0x20, 0x31, 0x30, 0x38, 0x39, 0x2e, 0x39, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x32, 0x39, 0x20,
+	0x43, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x31, 0x31, 0x36, 0x2e, 0x37,
+	0x36, 0x20, 0x39, 0x39, 0x35, 0x2e, 0x30, 0x38, 0x37, 0x20, 0x31, 0x31, 0x31, 0x35, 0x2e, 0x39,
+	0x39, 0x20, 0x39, 0x34, 0x37, 0x2e, 0x36, 0x38, 0x35, 0x20, 0x31, 0x31, 0x31, 0x34, 0x2e, 0x39,
+	0x37, 0x20, 0x43, 0x20, 0x39, 0x33, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x31, 0x35, 0x33, 0x2e, 0x37,
+	0x20, 0x39, 0x32, 0x31, 0x2e, 0x39, 0x30, 0x34, 0x20, 0x31, 0x31, 0x37, 0x38, 0x2e, 0x35, 0x34,
+	0x20, 0x38, 0x39, 0x34, 0x2e, 0x32, 0x39, 0x38, 0x20, 0x31, 0x32, 0x31, 0x30, 0x2e, 0x39, 0x31,
+	0x20, 0x43, 0x20, 0x38, 0x34, 0x32, 0x2e, 0x33, 0x35, 0x36, 0x20, 0x31, 0x32, 0x37, 0x32, 0x2e,
+	0x39, 0x20, 0x37, 0x36, 0x37, 0x2e, 0x33, 0x38, 0x37, 0x20, 0x31, 0x33, 0x31, 0x31, 0x2e, 0x30,
+	0x35, 0x20, 0x36, 0x38, 0x36, 0x2e, 0x36, 0x39, 0x33, 0x20, 0x31, 0x33, 0x31, 0x36, 0x2e, 0x35,
+	0x34, 0x20, 0x43, 0x20, 0x36, 0x30, 0x37, 0x2e, 0x32, 0x32, 0x36, 0x20, 0x31, 0x33, 0x32, 0x32,
+	0x2e, 0x32, 0x35, 0x20, 0x35, 0x32, 0x38, 0x2e, 0x37, 0x33, 0x20, 0x31, 0x32, 0x39, 0x36, 0x2e,
+	0x32, 0x36, 0x20, 0x34, 0x36, 0x38, 0x2e, 0x33, 0x38, 0x35, 0x20, 0x31, 0x32, 0x34, 0x34, 0x2e,
+	0x32, 0x34, 0x20, 0x43, 0x20, 0x34, 0x30, 0x39, 0x2e, 0x38, 0x30, 0x32, 0x20, 0x31, 0x31, 0x39,
+	0x33, 0x2e, 0x39, 0x39, 0x20, 0x33, 0x37, 0x33, 0x2e, 0x35, 0x38, 0x39, 0x20, 0x31, 0x31, 0x32,
+	0x32, 0x2e, 0x35, 0x32, 0x20, 0x33, 0x36, 0x37, 0x2e, 0x37, 0x31, 0x39, 0x20, 0x31, 0x30, 0x34,
+	0x35, 0x2e, 0x35, 0x36, 0x20, 0x43, 0x20, 0x33, 0x36, 0x31, 0x2e, 0x35, 0x31, 0x37, 0x20, 0x39,
+	0x36, 0x37, 0x2e, 0x31, 0x34, 0x37, 0x20, 0x33, 0x38, 0x36, 0x2e, 0x38, 0x34, 0x38, 0x20, 0x38,
+	0x38, 0x39, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x34, 0x33, 0x38, 0x2e, 0x30, 0x39, 0x37, 0x20, 0x38,
+	0x32, 0x39, 0x2e, 0x38, 0x33, 0x32, 0x20, 0x43, 0x20, 0x34, 0x39, 0x32, 0x2e, 0x38, 0x32, 0x33,
+	0x20, 0x37, 0x36, 0x36, 0x2e, 0x36, 0x32, 0x31, 0x20, 0x35, 0x36, 0x34, 0x2e, 0x35, 0x30, 0x39,
+	0x20, 0x37, 0x33, 0x32, 0x2e, 0x34, 0x36, 0x39, 0x20, 0x36, 0x34, 0x37, 0x2e, 0x34, 0x36, 0x36,
+	0x20, 0x37, 0x32, 0x36, 0x2e, 0x34, 0x30, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f,
+	0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_client_excellentrating_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x02, 0x41, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x52, 0x3f,
+	0x4c, 0x13, 0x51, 0x1c, 0xfe, 0xee, 0xdd, 0xd9, 0x5a, 0xbc, 0x83, 0x2b, 0x2d, 0xa5, 0x57, 0xae,
+	0xa5, 0xb5, 0x60, 0x22, 0x25, 0x31, 0x0c, 0xc6, 0xc9, 0x51, 0x4c, 0x0c, 0x83, 0x2e, 0x86, 0x90,
+	0xe8, 0xec, 0x44, 0xa2, 0x24, 0x9a, 0x38, 0x39, 0x6a, 0x74, 0xd7, 0x59, 0x17, 0x13, 0x07, 0x09,
+	0x89, 0x31, 0x1a, 0x93, 0x1a, 0xac, 0x21, 0x01, 0x0a, 0x22, 0x39, 0x5c, 0x68, 0xa9, 0xed, 0xd1,
+	0x6b, 0x25, 0xb6, 0xa5, 0xc0, 0x95, 0xbb, 0xe3, 0xfa, 0x1c, 0xea, 0x11, 0x28, 0xbb, 0x7e, 0xd3,
+	0xcb, 0xfb, 0xbe, 0xf7, 0xfd, 0xfe, 0x7c, 0x0f, 0xf8, 0xdf, 0x60, 0x9c, 0x43, 0x34, 0x18, 0x8c,
+	0x12, 0x42, 0x06, 0x00, 0x80, 0x21, 0x24, 0x97, 0x51, 0xd5, 0xf5, 0xa3, 0xc2, 0x68, 0xb4, 0x27,
+	0x48, 0xcc, 0x53, 0xc3, 0x00, 0x70, 0xc0, 0x35, 0xb5, 0x7c, 0xbe, 0xa4, 0x00, 0x00, 0xe7, 0x08,
+	0x06, 0x65, 0x66, 0x71, 0x74, 0xc4, 0xe5, 0x03, 0x80, 0x8f, 0xcb, 0xfb, 0xdb, 0x19, 0x15, 0xe2,
+	0x51, 0x83, 0xbe, 0x4e, 0xf6, 0xd3, 0xf5, 0x4b, 0xae, 0x04, 0x00, 0x7c, 0xfd, 0x61, 0xd8, 0x82,
+	0x90, 0xe8, 0x50, 0x14, 0xc5, 0x24, 0x8e, 0xa0, 0x54, 0xc3, 0x87, 0xb9, 0x9f, 0x3e, 0x2c, 0x6e,
+	0x06, 0xa0, 0x55, 0x49, 0xb2, 0xbd, 0xd5, 0xad, 0x3a, 0x3b, 0x93, 0xca, 0x76, 0x61, 0xb9, 0x14,
+	0xc2, 0x86, 0x46, 0x97, 0x14, 0x45, 0x31, 0x8f, 0x09, 0xfa, 0x65, 0xe9, 0xc6, 0xc2, 0xfc, 0x3c,
+	0x5d, 0x53, 0x14, 0x1a, 0xeb, 0x93, 0x6e, 0xb5, 0x1b, 0x9c, 0x0d, 0x07, 0x2f, 0xce, 0x4c, 0x4f,
+	0xd3, 0x4a, 0xa5, 0x42, 0xfb, 0xfb, 0xa4, 0x87, 0xce, 0xfd, 0xe1, 0x08, 0x04, 0x8c, 0x4f, 0x14,
+	0x45, 0xb8, 0xdd, 0x6e, 0x50, 0x10, 0x7f, 0xbb, 0x41, 0x13, 0x4c, 0xb7, 0xd7, 0xeb, 0x85, 0xc7,
+	0xe3, 0x41, 0x87, 0xc7, 0xd3, 0x73, 0xdc, 0x5d, 0x96, 0x07, 0xef, 0x4e, 0x4e, 0x56, 0xe9, 0x5f,
+	0xdc, 0x9f, 0xba, 0x57, 0x8b, 0x44, 0x82, 0x09, 0x87, 0x8f, 0x05, 0x02, 0xbd, 0xb7, 0x27, 0x26,
+	0xf2, 0x96, 0x65, 0x51, 0x4a, 0x29, 0x7d, 0xfa, 0xe4, 0xb1, 0x11, 0x93, 0xa4, 0xcb, 0x00, 0xc0,
+	0x9e, 0x0b, 0x85, 0xfc, 0x4d, 0x9e, 0x5d, 0xe8, 0x1e, 0xf0, 0xf9, 0x53, 0xc9, 0x59, 0x30, 0x36,
+	0x83, 0x6b, 0x63, 0x63, 0xa7, 0xbf, 0x2f, 0x7d, 0x1b, 0x6f, 0x18, 0xc6, 0x2b, 0x41, 0x10, 0x6c,
+	0x72, 0x86, 0x9d, 0xeb, 0x3d, 0x2f, 0xc5, 0x53, 0xb3, 0x5f, 0x60, 0xe9, 0x26, 0x46, 0x47, 0xaf,
+	0xb2, 0xb9, 0x7c, 0x7e, 0xfc, 0x77, 0xb5, 0x3c, 0xcd, 0xc4, 0x62, 0xa1, 0x67, 0x83, 0x8f, 0x2e,
+	0x4c, 0xb9, 0x3a, 0xdd, 0x00, 0x80, 0xed, 0x4c, 0x0d, 0x0d, 0x55, 0x87, 0x4b, 0x74, 0xa3, 0xf8,
+	0x72, 0xfd, 0x05, 0x0c, 0xac, 0x44, 0x1f, 0x24, 0x9e, 0xf3, 0x61, 0x1e, 0x00, 0xb0, 0x5b, 0xd8,
+	0xc1, 0x5e, 0x6e, 0x07, 0x9c, 0xe0, 0x42, 0xf9, 0x6d, 0x3e, 0xc9, 0x31, 0x3c, 0x37, 0xe2, 0x3c,
+	0x06, 0x80, 0xae, 0xb8, 0x88, 0xae, 0x78, 0x2b, 0xc1, 0x92, 0x58, 0x48, 0x58, 0x65, 0xa3, 0xc1,
+	0xcb, 0xfc, 0x21, 0xcf, 0x87, 0x05, 0xf0, 0x61, 0xa1, 0x95, 0xcc, 0xe7, 0x62, 0x9c, 0xa0, 0x66,
+	0xbf, 0xd3, 0x8b, 0x7b, 0xed, 0x3b, 0x43, 0xa3, 0xa4, 0x03, 0x15, 0xeb, 0x3d, 0x61, 0x90, 0xaa,
+	0xae, 0x55, 0x4e, 0xf0, 0x66, 0xdd, 0x84, 0xad, 0x59, 0x49, 0x36, 0x14, 0x8e, 0xa4, 0xb7, 0x56,
+	0xb4, 0x2b, 0x94, 0x85, 0x7c, 0xa0, 0x5b, 0xd0, 0x35, 0x1d, 0x3b, 0xd9, 0x3a, 0x8a, 0x6f, 0x72,
+	0xe9, 0xfd, 0xba, 0x7d, 0x47, 0xdd, 0xd4, 0x56, 0xb9, 0x32, 0x1d, 0xb6, 0x99, 0xe6, 0x90, 0x6d,
+	0xd8, 0xd0, 0x8b, 0x3a, 0x76, 0x0b, 0xbb, 0x28, 0xbe, 0xce, 0x6e, 0x90, 0x5f, 0xe6, 0x4d, 0xe7,
+	0x2b, 0x33, 0x91, 0x48, 0x70, 0x88, 0x3b, 0x20, 0x52, 0x2b, 0x53, 0x52, 0xce, 0xaa, 0xea, 0xea,
+	0xd1, 0x8a, 0x71, 0x59, 0x1e, 0xa0, 0xcd, 0x66, 0x14, 0x00, 0xc0, 0xd2, 0x5a, 0xb6, 0xa0, 0xa5,
+	0x01, 0xd0, 0x13, 0xad, 0xfd, 0x73, 0xfc, 0x01, 0x7b, 0x10, 0xed, 0x54, 0x8d, 0xb8, 0x83, 0xba,
+	0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_excellentrating_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x34, 0x31, 0x38, 0x2e, 0x31, 0x37,
+	0x2c, 0x31, 0x35, 0x37, 0x2e, 0x39, 0x37, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30,
+	0x2e, 0x39, 0x30, 0x39, 0x29, 0x22, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61,
+	0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72,
+	0x67, 0x62, 0x28, 0x33, 0x32, 0x2c, 0x32, 0x37, 0x2c, 0x32, 0x36, 0x29, 0x22, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39, 0x2e, 0x33,
+	0x37, 0x31, 0x20, 0x43, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x32, 0x30, 0x38,
+	0x2e, 0x30, 0x34, 0x38, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x34, 0x33, 0x20, 0x32, 0x30, 0x38, 0x2e,
+	0x38, 0x39, 0x35, 0x20, 0x39, 0x32, 0x31, 0x2e, 0x39, 0x34, 0x38, 0x20, 0x32, 0x30, 0x38, 0x2e,
+	0x39, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x30, 0x35, 0x20, 0x32, 0x30, 0x38,
+	0x2e, 0x39, 0x39, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x34, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x32,
+	0x30, 0x38, 0x2e, 0x39, 0x31, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x36, 0x37,
+	0x20, 0x32, 0x30, 0x38, 0x2e, 0x38, 0x38, 0x35, 0x20, 0x31, 0x32, 0x30, 0x38, 0x2e, 0x33, 0x32,
+	0x20, 0x32, 0x30, 0x35, 0x2e, 0x35, 0x31, 0x38, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x33,
+	0x20, 0x32, 0x32, 0x30, 0x2e, 0x32, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x36, 0x33, 0x2e,
+	0x30, 0x33, 0x20, 0x32, 0x33, 0x33, 0x2e, 0x33, 0x34, 0x34, 0x20, 0x31, 0x32, 0x38, 0x32, 0x2e,
+	0x31, 0x36, 0x20, 0x32, 0x35, 0x36, 0x2e, 0x30, 0x32, 0x34, 0x20, 0x31, 0x32, 0x39, 0x30, 0x2e,
+	0x37, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x32, 0x36, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x39,
+	0x39, 0x20, 0x33, 0x30, 0x38, 0x2e, 0x39, 0x32, 0x33, 0x20, 0x31, 0x32, 0x39, 0x34, 0x2e, 0x35,
+	0x36, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x33, 0x38, 0x37, 0x20, 0x31, 0x32, 0x39, 0x36, 0x2e, 0x33,
+	0x32, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x36, 0x35, 0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x30,
+	0x2e, 0x37, 0x39, 0x20, 0x34, 0x31, 0x38, 0x2e, 0x39, 0x33, 0x35, 0x20, 0x31, 0x32, 0x38, 0x33,
+	0x2e, 0x30, 0x38, 0x20, 0x34, 0x37, 0x32, 0x2e, 0x30, 0x38, 0x35, 0x20, 0x31, 0x32, 0x31, 0x34,
+	0x2e, 0x38, 0x39, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x31,
+	0x34, 0x2e, 0x39, 0x37, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x39, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31,
+	0x32, 0x31, 0x34, 0x2e, 0x39, 0x39, 0x20, 0x36, 0x36, 0x39, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x31,
+	0x32, 0x31, 0x31, 0x2e, 0x31, 0x31, 0x20, 0x37, 0x31, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x31,
+	0x32, 0x32, 0x33, 0x2e, 0x35, 0x35, 0x20, 0x37, 0x36, 0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x32, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x30, 0x34, 0x37,
+	0x20, 0x31, 0x32, 0x36, 0x36, 0x2e, 0x38, 0x31, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x33, 0x35, 0x36,
+	0x20, 0x31, 0x33, 0x30, 0x33, 0x2e, 0x38, 0x36, 0x20, 0x38, 0x37, 0x30, 0x2e, 0x33, 0x31, 0x33,
+	0x20, 0x43, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x38, 0x39, 0x20, 0x39, 0x31, 0x30, 0x2e, 0x38,
+	0x36, 0x39, 0x20, 0x31, 0x33, 0x38, 0x36, 0x2e, 0x30, 0x39, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x36,
+	0x39, 0x38, 0x20, 0x31, 0x34, 0x32, 0x38, 0x2e, 0x31, 0x32, 0x20, 0x39, 0x39, 0x34, 0x2e, 0x32,
+	0x31, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x39, 0x31, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x30, 0x35,
+	0x35, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x35, 0x33, 0x32, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x31, 0x34,
+	0x37, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x35, 0x34, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x32, 0x33,
+	0x34, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x35, 0x35, 0x39, 0x2e, 0x30, 0x34, 0x20, 0x31,
+	0x33, 0x34, 0x35, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x35, 0x34, 0x20, 0x31,
+	0x34, 0x35, 0x36, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x34, 0x36, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31,
+	0x35, 0x34, 0x34, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x34, 0x2e, 0x35, 0x34,
+	0x20, 0x31, 0x36, 0x33, 0x31, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x38, 0x38,
+	0x20, 0x31, 0x36, 0x38, 0x31, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x31, 0x31,
+	0x20, 0x31, 0x36, 0x39, 0x35, 0x2e, 0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x34, 0x2e,
+	0x36, 0x37, 0x20, 0x31, 0x36, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e,
+	0x37, 0x37, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x36, 0x33, 0x2e, 0x35,
+	0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e,
+	0x32, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x36, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x31, 0x34, 0x20,
+	0x31, 0x36, 0x39, 0x38, 0x2e, 0x37, 0x32, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x38, 0x34, 0x39, 0x20,
+	0x31, 0x36, 0x39, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x37, 0x38, 0x38, 0x2e, 0x31, 0x33,
+	0x32, 0x20, 0x31, 0x36, 0x39, 0x36, 0x2e, 0x35, 0x33, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x38, 0x32,
+	0x37, 0x20, 0x31, 0x36, 0x35, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x36, 0x31, 0x37, 0x2e, 0x37, 0x37,
+	0x36, 0x20, 0x31, 0x35, 0x37, 0x37, 0x2e, 0x30, 0x32, 0x20, 0x43, 0x20, 0x35, 0x30, 0x31, 0x2e,
+	0x39, 0x34, 0x35, 0x20, 0x31, 0x34, 0x35, 0x33, 0x2e, 0x30, 0x36, 0x20, 0x34, 0x37, 0x31, 0x2e,
+	0x36, 0x32, 0x39, 0x20, 0x31, 0x32, 0x37, 0x31, 0x2e, 0x37, 0x38, 0x20, 0x35, 0x34, 0x30, 0x2e,
+	0x38, 0x32, 0x34, 0x20, 0x31, 0x31, 0x31, 0x36, 0x2e, 0x38, 0x37, 0x20, 0x43, 0x20, 0x35, 0x35,
+	0x36, 0x2e, 0x39, 0x36, 0x34, 0x20, 0x31, 0x30, 0x37, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x35, 0x37,
+	0x39, 0x2e, 0x33, 0x38, 0x32, 0x20, 0x31, 0x30, 0x33, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x30,
+	0x38, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x31, 0x31, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x36,
+	0x32, 0x30, 0x2e, 0x32, 0x31, 0x31, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x36, 0x33,
+	0x32, 0x2e, 0x34, 0x33, 0x20, 0x39, 0x38, 0x37, 0x2e, 0x32, 0x31, 0x38, 0x20, 0x36, 0x34, 0x34,
+	0x2e, 0x34, 0x38, 0x20, 0x39, 0x37, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x37, 0x35,
+	0x33, 0x2e, 0x33, 0x30, 0x36, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20, 0x37,
+	0x37, 0x39, 0x2e, 0x32, 0x34, 0x31, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x32, 0x33, 0x20, 0x38, 0x30,
+	0x35, 0x2e, 0x33, 0x39, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x36, 0x35, 0x35, 0x20, 0x38, 0x32, 0x30,
+	0x2e, 0x38, 0x36, 0x34, 0x20, 0x37, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x34, 0x20, 0x43, 0x20, 0x38,
+	0x34, 0x31, 0x2e, 0x38, 0x39, 0x32, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x38, 0x35, 0x33, 0x20, 0x38,
+	0x33, 0x37, 0x2e, 0x34, 0x34, 0x36, 0x20, 0x36, 0x39, 0x31, 0x2e, 0x31, 0x31, 0x31, 0x20, 0x38,
+	0x33, 0x37, 0x2e, 0x32, 0x34, 0x38, 0x20, 0x36, 0x34, 0x30, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x43,
+	0x20, 0x38, 0x33, 0x36, 0x2e, 0x39, 0x36, 0x20, 0x35, 0x39, 0x31, 0x2e, 0x35, 0x39, 0x32, 0x20,
+	0x38, 0x33, 0x37, 0x2e, 0x32, 0x30, 0x32, 0x20, 0x35, 0x34, 0x32, 0x2e, 0x36, 0x38, 0x32, 0x20,
+	0x38, 0x33, 0x37, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x37, 0x37, 0x39, 0x20,
+	0x43, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x31, 0x32, 0x32, 0x20, 0x34, 0x37, 0x30, 0x2e, 0x38, 0x36,
+	0x33, 0x20, 0x37, 0x35, 0x34, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x34, 0x32, 0x32, 0x2e, 0x31, 0x34,
+	0x34, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x37, 0x32,
+	0x38, 0x20, 0x43, 0x20, 0x37, 0x35, 0x38, 0x2e, 0x35, 0x35, 0x33, 0x20, 0x33, 0x31, 0x35, 0x2e,
+	0x37, 0x31, 0x34, 0x20, 0x37, 0x35, 0x31, 0x2e, 0x34, 0x36, 0x37, 0x20, 0x32, 0x38, 0x33, 0x2e,
+	0x38, 0x38, 0x39, 0x20, 0x37, 0x37, 0x39, 0x2e, 0x36, 0x39, 0x38, 0x20, 0x32, 0x34, 0x39, 0x2e,
+	0x38, 0x35, 0x38, 0x20, 0x43, 0x20, 0x38, 0x30, 0x30, 0x2e, 0x35, 0x35, 0x38, 0x20, 0x32, 0x32,
+	0x34, 0x2e, 0x37, 0x31, 0x33, 0x20, 0x38, 0x32, 0x32, 0x2e, 0x37, 0x33, 0x35, 0x20, 0x32, 0x31,
+	0x33, 0x2e, 0x32, 0x36, 0x31, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30,
+	0x39, 0x2e, 0x33, 0x37, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e,
+	0x34, 0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x33, 0x2e, 0x38, 0x31, 0x37, 0x20, 0x31, 0x30, 0x34,
+	0x35, 0x2e, 0x35, 0x33, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x30, 0x36,
+	0x31, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38,
+	0x35, 0x2e, 0x39, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x36, 0x31, 0x20, 0x31,
+	0x30, 0x39, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x30, 0x33, 0x38, 0x2e, 0x33, 0x32, 0x20, 0x31,
+	0x31, 0x30, 0x33, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x34, 0x31, 0x20, 0x31,
+	0x31, 0x31, 0x31, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x35, 0x2e, 0x37, 0x36,
+	0x20, 0x31, 0x31, 0x35, 0x37, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x32, 0x36, 0x39, 0x2e, 0x34, 0x32,
+	0x20, 0x31, 0x31, 0x36, 0x32, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x33, 0x37, 0x35, 0x2e, 0x37, 0x36,
+	0x20, 0x31, 0x31, 0x33, 0x35, 0x2e, 0x38, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x35, 0x2e,
+	0x34, 0x34, 0x20, 0x31, 0x31, 0x33, 0x31, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x31, 0x33, 0x2e,
+	0x35, 0x20, 0x31, 0x31, 0x32, 0x34, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x34, 0x33, 0x32, 0x2e, 0x35,
+	0x32, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x33, 0x2e,
+	0x32, 0x33, 0x20, 0x31, 0x31, 0x33, 0x30, 0x2e, 0x33, 0x36, 0x20, 0x31, 0x34, 0x35, 0x34, 0x2e,
+	0x38, 0x37, 0x20, 0x31, 0x31, 0x36, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e,
+	0x31, 0x31, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x35, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31,
+	0x35, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x33, 0x35, 0x36, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x34, 0x32,
+	0x39, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x35, 0x36, 0x31, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x32, 0x34,
+	0x34, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x36, 0x31, 0x34, 0x2e, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31,
+	0x31, 0x39, 0x36, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x38, 0x20, 0x31,
+	0x31, 0x35, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x33, 0x20, 0x31,
+	0x31, 0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x4c,
+	0x20, 0x31, 0x30, 0x30, 0x38, 0x2e, 0x37, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20,
+	0x43, 0x20, 0x38, 0x38, 0x35, 0x2e, 0x33, 0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x31,
+	0x34, 0x20, 0x37, 0x38, 0x35, 0x2e, 0x33, 0x30, 0x31, 0x20, 0x31, 0x36, 0x33, 0x38, 0x2e, 0x31,
+	0x35, 0x20, 0x36, 0x38, 0x35, 0x2e, 0x38, 0x38, 0x39, 0x20, 0x31, 0x35, 0x34, 0x38, 0x2e, 0x34,
+	0x38, 0x20, 0x43, 0x20, 0x35, 0x35, 0x38, 0x2e, 0x32, 0x39, 0x33, 0x20, 0x31, 0x34, 0x33, 0x33,
+	0x2e, 0x33, 0x38, 0x20, 0x35, 0x34, 0x31, 0x2e, 0x39, 0x33, 0x32, 0x20, 0x31, 0x32, 0x34, 0x31,
+	0x2e, 0x34, 0x39, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x30, 0x37, 0x37, 0x20, 0x31, 0x30, 0x39, 0x38,
+	0x2e, 0x30, 0x37, 0x20, 0x43, 0x20, 0x36, 0x33, 0x36, 0x2e, 0x39, 0x35, 0x35, 0x20, 0x31, 0x30,
+	0x38, 0x36, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x36, 0x31, 0x36, 0x20, 0x31, 0x30,
+	0x38, 0x37, 0x2e, 0x35, 0x36, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x38, 0x33,
+	0x2e, 0x32, 0x35, 0x20, 0x43, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x30, 0x36,
+	0x31, 0x2e, 0x38, 0x37, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x31, 0x30, 0x34,
+	0x39, 0x2e, 0x31, 0x34, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34,
+	0x37, 0x2e, 0x34, 0x38, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x72, 0x67, 0x62, 0x28, 0x37, 0x36, 0x2c, 0x31, 0x37, 0x35, 0x2c, 0x38, 0x30, 0x29, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x31, 0x30,
+	0x35, 0x31, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x38, 0x31, 0x34, 0x2e, 0x38, 0x38, 0x33, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x36, 0x33, 0x20, 0x38, 0x32, 0x37, 0x2e, 0x36, 0x39, 0x36, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x37, 0x38, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x38, 0x32, 0x33, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x38, 0x31, 0x20, 0x43, 0x20, 0x38, 0x39, 0x32, 0x2e, 0x37, 0x36,
+	0x39, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x33, 0x37, 0x20, 0x39, 0x34, 0x39, 0x2e, 0x39, 0x36,
+	0x20, 0x31, 0x30, 0x36, 0x34, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x37, 0x33,
+	0x20, 0x31, 0x30, 0x38, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x31, 0x2e,
+	0x39, 0x38, 0x20, 0x31, 0x30, 0x39, 0x36, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x30, 0x34, 0x30, 0x2e,
+	0x31, 0x35, 0x20, 0x31, 0x31, 0x30, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x36, 0x30, 0x2e,
+	0x35, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35,
+	0x2e, 0x32, 0x31, 0x20, 0x31, 0x31, 0x36, 0x38, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x33, 0x31, 0x35,
+	0x2e, 0x32, 0x37, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x35, 0x36, 0x20, 0x31, 0x34, 0x33, 0x31,
+	0x2e, 0x34, 0x39, 0x20, 0x31, 0x31, 0x32, 0x31, 0x2e, 0x33, 0x31, 0x20, 0x43, 0x20, 0x31, 0x34,
+	0x33, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x31, 0x33, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x34, 0x34,
+	0x34, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x31, 0x34, 0x37, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x34, 0x34,
+	0x39, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x31, 0x35, 0x39, 0x2e, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31,
+	0x35, 0x31, 0x35, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x33, 0x33, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x31,
+	0x34, 0x34, 0x31, 0x2e, 0x34, 0x35, 0x20, 0x31, 0x35, 0x33, 0x37, 0x2e, 0x35, 0x35, 0x20, 0x31,
+	0x32, 0x36, 0x30, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x36, 0x30, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x34, 0x39, 0x2e, 0x38, 0x33, 0x20, 0x31, 0x36, 0x30, 0x39, 0x2e, 0x39, 0x38,
+	0x20, 0x31, 0x32, 0x33, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x31, 0x36, 0x31, 0x33, 0x20, 0x31, 0x32,
+	0x32, 0x37, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x36, 0x31, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x43, 0x20,
+	0x31, 0x31, 0x36, 0x35, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x39, 0x35, 0x20,
+	0x31, 0x30, 0x38, 0x35, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x36, 0x32, 0x33, 0x2e, 0x39, 0x34, 0x20,
+	0x31, 0x30, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x4c,
+	0x20, 0x39, 0x34, 0x30, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x34, 0x35,
+	0x20, 0x43, 0x20, 0x39, 0x30, 0x30, 0x2e, 0x30, 0x34, 0x36, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e,
+	0x36, 0x39, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x36, 0x32, 0x35, 0x2e, 0x35,
+	0x37, 0x20, 0x38, 0x33, 0x33, 0x2e, 0x36, 0x37, 0x36, 0x20, 0x31, 0x36, 0x31, 0x37, 0x2e, 0x38,
+	0x31, 0x20, 0x43, 0x20, 0x37, 0x39, 0x34, 0x2e, 0x36, 0x31, 0x32, 0x20, 0x31, 0x36, 0x31, 0x30,
+	0x2e, 0x34, 0x38, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x33, 0x35, 0x33, 0x20, 0x31, 0x35, 0x39, 0x35,
+	0x2e, 0x36, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x39, 0x38, 0x38, 0x20, 0x31, 0x35, 0x37, 0x34, 0x2e,
+	0x30, 0x31, 0x20, 0x43, 0x20, 0x36, 0x35, 0x32, 0x2e, 0x34, 0x35, 0x37, 0x20, 0x31, 0x35, 0x32,
+	0x37, 0x2e, 0x39, 0x37, 0x20, 0x36, 0x30, 0x34, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x35, 0x31,
+	0x2e, 0x37, 0x20, 0x35, 0x38, 0x36, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x31, 0x33, 0x36, 0x39, 0x2e,
+	0x32, 0x39, 0x20, 0x43, 0x20, 0x35, 0x36, 0x35, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x31, 0x32, 0x37,
+	0x34, 0x2e, 0x35, 0x33, 0x20, 0x35, 0x38, 0x33, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x31, 0x31, 0x37,
+	0x35, 0x2e, 0x34, 0x34, 0x20, 0x36, 0x33, 0x36, 0x2e, 0x37, 0x39, 0x34, 0x20, 0x31, 0x30, 0x39,
+	0x34, 0x2e, 0x30, 0x39, 0x20, 0x43, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x31,
+	0x30, 0x38, 0x39, 0x2e, 0x36, 0x35, 0x20, 0x36, 0x36, 0x30, 0x2e, 0x37, 0x38, 0x37, 0x20, 0x31,
+	0x30, 0x38, 0x34, 0x2e, 0x37, 0x35, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x34, 0x33, 0x35, 0x20, 0x31,
+	0x30, 0x38, 0x31, 0x2e, 0x34, 0x37, 0x20, 0x43, 0x20, 0x37, 0x31, 0x38, 0x2e, 0x30, 0x37, 0x39,
+	0x20, 0x31, 0x30, 0x36, 0x35, 0x2e, 0x33, 0x20, 0x37, 0x35, 0x38, 0x2e, 0x32, 0x34, 0x32, 0x20,
+	0x31, 0x30, 0x35, 0x35, 0x2e, 0x31, 0x32, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20,
+	0x31, 0x30, 0x35, 0x31, 0x2e, 0x34, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c,
+	0x32, 0x35, 0x35, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39, 0x31, 0x35, 0x2e, 0x30,
+	0x30, 0x36, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x35,
+	0x30, 0x2e, 0x30, 0x39, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x32, 0x38, 0x20, 0x43, 0x20, 0x31, 0x30,
+	0x37, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x32, 0x37, 0x31, 0x20, 0x31, 0x31,
+	0x30, 0x39, 0x2e, 0x39, 0x34, 0x20, 0x34, 0x39, 0x34, 0x2e, 0x36, 0x36, 0x33, 0x20, 0x31, 0x31,
+	0x33, 0x38, 0x2e, 0x31, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x37, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x31,
+	0x33, 0x37, 0x2e, 0x39, 0x35, 0x20, 0x36, 0x34, 0x33, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x31, 0x33, 0x38, 0x2e, 0x30, 0x32, 0x20, 0x37, 0x30, 0x33, 0x2e, 0x32, 0x32, 0x37, 0x20,
+	0x31, 0x31, 0x33, 0x35, 0x2e, 0x34, 0x33, 0x20, 0x37, 0x36, 0x34, 0x2e, 0x31, 0x35, 0x38, 0x20,
+	0x31, 0x31, 0x36, 0x34, 0x2e, 0x34, 0x32, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x37, 0x31, 0x32,
+	0x20, 0x31, 0x32, 0x32, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x39, 0x30, 0x32, 0x2e, 0x33, 0x30, 0x33,
+	0x20, 0x31, 0x32, 0x37, 0x36, 0x2e, 0x37, 0x37, 0x20, 0x39, 0x34, 0x38, 0x2e, 0x39, 0x32, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x31, 0x34, 0x2e, 0x35, 0x37, 0x20, 0x39, 0x38, 0x35, 0x2e, 0x33, 0x31,
+	0x35, 0x20, 0x31, 0x33, 0x35, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x30,
+	0x34, 0x20, 0x31, 0x33, 0x38, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x31,
+	0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x39, 0x34, 0x2e, 0x30,
+	0x38, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x30,
+	0x33, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x30, 0x35, 0x33, 0x2e, 0x39,
+	0x37, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x36,
+	0x2e, 0x36, 0x31, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x33, 0x36,
+	0x2e, 0x30, 0x39, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x30, 0x32, 0x38,
+	0x2e, 0x31, 0x31, 0x20, 0x43, 0x20, 0x39, 0x39, 0x36, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x30, 0x30,
+	0x36, 0x2e, 0x31, 0x36, 0x20, 0x39, 0x34, 0x37, 0x2e, 0x31, 0x34, 0x39, 0x20, 0x39, 0x39, 0x32,
+	0x2e, 0x30, 0x30, 0x39, 0x20, 0x38, 0x39, 0x36, 0x2e, 0x34, 0x32, 0x20, 0x39, 0x38, 0x36, 0x2e,
+	0x32, 0x33, 0x35, 0x20, 0x43, 0x20, 0x38, 0x35, 0x36, 0x2e, 0x30, 0x34, 0x20, 0x39, 0x38, 0x31,
+	0x2e, 0x34, 0x39, 0x31, 0x20, 0x38, 0x31, 0x33, 0x2e, 0x37, 0x39, 0x39, 0x20, 0x39, 0x38, 0x31,
+	0x2e, 0x36, 0x32, 0x39, 0x20, 0x37, 0x37, 0x33, 0x2e, 0x34, 0x35, 0x39, 0x20, 0x39, 0x38, 0x37,
+	0x2e, 0x34, 0x30, 0x36, 0x20, 0x43, 0x20, 0x37, 0x36, 0x35, 0x2e, 0x35, 0x31, 0x32, 0x20, 0x39,
+	0x38, 0x38, 0x2e, 0x35, 0x34, 0x35, 0x20, 0x37, 0x32, 0x38, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x39,
+	0x39, 0x37, 0x2e, 0x33, 0x38, 0x39, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39,
+	0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43, 0x20, 0x37, 0x34, 0x31, 0x2e, 0x36, 0x37, 0x32,
+	0x20, 0x39, 0x38, 0x31, 0x2e, 0x38, 0x34, 0x36, 0x20, 0x37, 0x36, 0x33, 0x2e, 0x39, 0x33, 0x36,
+	0x20, 0x39, 0x35, 0x37, 0x2e, 0x30, 0x37, 0x35, 0x20, 0x37, 0x38, 0x31, 0x2e, 0x35, 0x33, 0x32,
+	0x20, 0x39, 0x34, 0x31, 0x2e, 0x33, 0x34, 0x31, 0x20, 0x43, 0x20, 0x38, 0x34, 0x38, 0x2e, 0x31,
+	0x34, 0x20, 0x38, 0x38, 0x31, 0x2e, 0x37, 0x38, 0x32, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x31, 0x35,
+	0x37, 0x20, 0x38, 0x32, 0x39, 0x2e, 0x32, 0x38, 0x38, 0x20, 0x39, 0x31, 0x32, 0x2e, 0x36, 0x38,
+	0x31, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x32, 0x34, 0x35, 0x20, 0x43, 0x20, 0x39, 0x31, 0x36, 0x2e,
+	0x33, 0x32, 0x32, 0x20, 0x37, 0x30, 0x35, 0x2e, 0x35, 0x33, 0x31, 0x20, 0x39, 0x31, 0x34, 0x2e,
+	0x39, 0x36, 0x34, 0x20, 0x36, 0x37, 0x32, 0x2e, 0x36, 0x33, 0x32, 0x20, 0x39, 0x31, 0x34, 0x2e,
+	0x39, 0x36, 0x20, 0x36, 0x34, 0x32, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x4c, 0x20, 0x39, 0x31, 0x35,
+	0x2e, 0x30, 0x30, 0x36, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x7a, 0x22, 0x2f,
+	0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72,
+	0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30,
+	0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30,
+	0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x34, 0x37,
+	0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x43, 0x20, 0x38, 0x36, 0x34, 0x2e,
+	0x35, 0x34, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x39, 0x20, 0x38, 0x36, 0x34, 0x2e,
+	0x36, 0x32, 0x32, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x31, 0x20, 0x38, 0x36, 0x34, 0x2e,
+	0x36, 0x39, 0x34, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x38, 0x33, 0x20, 0x43, 0x20, 0x38, 0x38,
+	0x39, 0x2e, 0x32, 0x36, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x37, 0x36, 0x33, 0x20, 0x39, 0x31,
+	0x34, 0x2e, 0x39, 0x36, 0x38, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x39, 0x33,
+	0x39, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x32, 0x35, 0x20, 0x43, 0x20,
+	0x39, 0x37, 0x36, 0x2e, 0x33, 0x38, 0x31, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x33, 0x38, 0x20,
+	0x31, 0x30, 0x31, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x35, 0x36, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x33, 0x31, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x37, 0x39, 0x20,
+	0x4c, 0x20, 0x31, 0x31, 0x34, 0x30, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x39,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x33, 0x2e, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30,
+	0x34, 0x34, 0x20, 0x31, 0x32, 0x32, 0x36, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x31, 0x2e, 0x36,
+	0x30, 0x36, 0x20, 0x31, 0x32, 0x32, 0x35, 0x2e, 0x39, 0x31, 0x20, 0x33, 0x32, 0x32, 0x2e, 0x38,
+	0x35, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x35, 0x2e, 0x36, 0x31, 0x20, 0x33, 0x34, 0x37,
+	0x2e, 0x30, 0x34, 0x32, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33,
+	0x2e, 0x33, 0x30, 0x34, 0x20, 0x31, 0x32, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x33, 0x39, 0x37,
+	0x2e, 0x30, 0x33, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x34, 0x20, 0x34,
+	0x31, 0x34, 0x2e, 0x35, 0x37, 0x37, 0x20, 0x31, 0x32, 0x30, 0x35, 0x2e, 0x31, 0x39, 0x20, 0x34,
+	0x32, 0x31, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x31, 0x38, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x34, 0x32,
+	0x32, 0x2e, 0x30, 0x30, 0x38, 0x20, 0x4c, 0x20, 0x39, 0x36, 0x31, 0x2e, 0x39, 0x39, 0x39, 0x20,
+	0x34, 0x32, 0x33, 0x2e, 0x30, 0x31, 0x36, 0x20, 0x4c, 0x20, 0x38, 0x39, 0x34, 0x2e, 0x34, 0x38,
+	0x32, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x31, 0x34, 0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x32, 0x2e,
+	0x36, 0x37, 0x33, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x31, 0x37, 0x33, 0x20, 0x38, 0x34, 0x36, 0x2e,
+	0x38, 0x37, 0x34, 0x20, 0x34, 0x32, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x38, 0x33, 0x37, 0x2e,
+	0x39, 0x33, 0x39, 0x20, 0x34, 0x31, 0x38, 0x2e, 0x36, 0x37, 0x38, 0x20, 0x43, 0x20, 0x38, 0x32,
+	0x30, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x34, 0x30, 0x35, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x38, 0x32,
+	0x34, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33, 0x2e, 0x33, 0x37, 0x39, 0x20, 0x38, 0x32,
+	0x34, 0x2e, 0x39, 0x35, 0x31, 0x20, 0x33, 0x35, 0x33, 0x2e, 0x39, 0x39, 0x38, 0x20, 0x43, 0x20,
+	0x38, 0x32, 0x35, 0x2e, 0x30, 0x31, 0x32, 0x20, 0x33, 0x31, 0x37, 0x2e, 0x32, 0x39, 0x36, 0x20,
+	0x38, 0x31, 0x38, 0x2e, 0x31, 0x32, 0x33, 0x20, 0x32, 0x38, 0x34, 0x2e, 0x35, 0x32, 0x20, 0x38,
+	0x36, 0x34, 0x2e, 0x34, 0x37, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31,
+	0x38, 0x37, 0x2c, 0x31, 0x33, 0x36, 0x2c, 0x34, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x20, 0x38, 0x37, 0x39, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33,
+	0x20, 0x4c, 0x20, 0x31, 0x30, 0x38, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36,
+	0x31, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x35, 0x32, 0x2e, 0x34, 0x32, 0x20, 0x32, 0x38, 0x33, 0x2e,
+	0x36, 0x34, 0x31, 0x20, 0x43, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x32, 0x38,
+	0x33, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x32, 0x38, 0x33,
+	0x2e, 0x31, 0x36, 0x37, 0x20, 0x31, 0x31, 0x39, 0x33, 0x2e, 0x33, 0x34, 0x20, 0x32, 0x38, 0x34,
+	0x2e, 0x33, 0x37, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x36, 0x20, 0x32, 0x38,
+	0x36, 0x2e, 0x30, 0x36, 0x38, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x34, 0x31, 0x20, 0x33, 0x30,
+	0x34, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x30, 0x38, 0x20, 0x33, 0x32,
+	0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x37, 0x20,
+	0x33, 0x33, 0x37, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x31, 0x35, 0x20,
+	0x33, 0x35, 0x31, 0x2e, 0x39, 0x34, 0x33, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x39, 0x35, 0x20,
+	0x33, 0x36, 0x37, 0x2e, 0x31, 0x32, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37,
+	0x37, 0x20, 0x33, 0x38, 0x31, 0x2e, 0x32, 0x32, 0x31, 0x20, 0x31, 0x32, 0x32, 0x33, 0x2e, 0x38,
+	0x35, 0x20, 0x33, 0x39, 0x39, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x32, 0x31, 0x33, 0x2e, 0x33, 0x37,
+	0x20, 0x34, 0x31, 0x30, 0x2e, 0x34, 0x33, 0x32, 0x20, 0x43, 0x20, 0x31, 0x32, 0x30, 0x32, 0x2e,
+	0x39, 0x31, 0x20, 0x34, 0x32, 0x31, 0x2e, 0x31, 0x35, 0x33, 0x20, 0x31, 0x31, 0x38, 0x36, 0x2e,
+	0x32, 0x33, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x33, 0x35, 0x35, 0x20, 0x31, 0x31, 0x37, 0x32, 0x2e,
+	0x35, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x31, 0x39, 0x32, 0x20, 0x4c, 0x20, 0x39, 0x35, 0x31, 0x2e,
+	0x34, 0x37, 0x32, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x38,
+	0x35, 0x2e, 0x37, 0x38, 0x33, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x32, 0x37, 0x20, 0x43, 0x20, 0x38,
+	0x36, 0x31, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x33, 0x34, 0x35, 0x20, 0x38,
+	0x32, 0x38, 0x2e, 0x33, 0x30, 0x36, 0x20, 0x34, 0x32, 0x36, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x38,
+	0x32, 0x38, 0x2e, 0x38, 0x31, 0x36, 0x20, 0x33, 0x39, 0x30, 0x2e, 0x31, 0x35, 0x20, 0x43, 0x20,
+	0x38, 0x32, 0x39, 0x2e, 0x32, 0x30, 0x34, 0x20, 0x33, 0x36, 0x32, 0x2e, 0x38, 0x37, 0x20, 0x38,
+	0x32, 0x36, 0x2e, 0x37, 0x39, 0x33, 0x20, 0x33, 0x33, 0x33, 0x2e, 0x30, 0x31, 0x34, 0x20, 0x38,
+	0x33, 0x30, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x33, 0x30, 0x36, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x43,
+	0x20, 0x38, 0x33, 0x32, 0x2e, 0x38, 0x34, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x39, 0x36, 0x35,
+	0x20, 0x38, 0x36, 0x33, 0x2e, 0x30, 0x35, 0x34, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x37,
+	0x20, 0x38, 0x37, 0x39, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33,
+	0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65,
+	0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62,
+	0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x31,
+	0x32, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39, 0x20, 0x43, 0x20,
+	0x37, 0x31, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x37,
+	0x32, 0x30, 0x2e, 0x34, 0x36, 0x35, 0x20, 0x39, 0x39, 0x31, 0x2e, 0x39, 0x34, 0x32, 0x20, 0x37,
+	0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39, 0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43,
+	0x20, 0x37, 0x32, 0x33, 0x2e, 0x33, 0x34, 0x38, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x36, 0x36,
+	0x20, 0x37, 0x31, 0x37, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x31, 0x30, 0x30, 0x33, 0x2e, 0x32, 0x35,
+	0x20, 0x37, 0x31, 0x32, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39,
+	0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61,
+	0x74, 0x65, 0x28, 0x36, 0x32, 0x30, 0x2e, 0x32, 0x39, 0x2c, 0x31, 0x35, 0x37, 0x2e, 0x39, 0x37,
+	0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e, 0x39, 0x30, 0x39, 0x29, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x32, 0x2c, 0x32,
+	0x37, 0x2c, 0x32, 0x36, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x35, 0x34, 0x2e,
+	0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39, 0x2e, 0x33, 0x37, 0x31, 0x20, 0x43, 0x20, 0x38, 0x37,
+	0x34, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x30, 0x34, 0x38, 0x20, 0x39, 0x30,
+	0x31, 0x2e, 0x34, 0x33, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x39, 0x32, 0x31,
+	0x2e, 0x39, 0x34, 0x38, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x39, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30,
+	0x34, 0x32, 0x2e, 0x30, 0x35, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x39, 0x39, 0x36, 0x20, 0x4c, 0x20,
+	0x31, 0x31, 0x34, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x39, 0x31, 0x35, 0x20,
+	0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x36, 0x37, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x38, 0x38,
+	0x35, 0x20, 0x31, 0x32, 0x30, 0x38, 0x2e, 0x33, 0x32, 0x20, 0x32, 0x30, 0x35, 0x2e, 0x35, 0x31,
+	0x38, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x33, 0x20, 0x32, 0x32, 0x30, 0x2e, 0x32, 0x35,
+	0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x36, 0x33, 0x2e, 0x30, 0x33, 0x20, 0x32, 0x33, 0x33, 0x2e,
+	0x33, 0x34, 0x34, 0x20, 0x31, 0x32, 0x38, 0x32, 0x2e, 0x31, 0x36, 0x20, 0x32, 0x35, 0x36, 0x2e,
+	0x30, 0x32, 0x34, 0x20, 0x31, 0x32, 0x39, 0x30, 0x2e, 0x37, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e,
+	0x32, 0x36, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x39, 0x39, 0x20, 0x33, 0x30, 0x38, 0x2e, 0x39,
+	0x32, 0x33, 0x20, 0x31, 0x32, 0x39, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x33,
+	0x38, 0x37, 0x20, 0x31, 0x32, 0x39, 0x36, 0x2e, 0x33, 0x32, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x36,
+	0x35, 0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x30, 0x2e, 0x37, 0x39, 0x20, 0x34, 0x31, 0x38,
+	0x2e, 0x39, 0x33, 0x35, 0x20, 0x31, 0x32, 0x38, 0x33, 0x2e, 0x30, 0x38, 0x20, 0x34, 0x37, 0x32,
+	0x2e, 0x30, 0x38, 0x35, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e, 0x38, 0x39, 0x20, 0x34, 0x39, 0x33,
+	0x2e, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e, 0x39, 0x37, 0x20, 0x36, 0x32,
+	0x30, 0x2e, 0x39, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e, 0x39, 0x39, 0x20,
+	0x36, 0x36, 0x39, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x31, 0x31, 0x20,
+	0x37, 0x31, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x31, 0x32, 0x32, 0x33, 0x2e, 0x35, 0x35, 0x20,
+	0x37, 0x36, 0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36,
+	0x32, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x30, 0x34, 0x37, 0x20, 0x31, 0x32, 0x36, 0x36, 0x2e, 0x38,
+	0x31, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x33, 0x35, 0x36, 0x20, 0x31, 0x33, 0x30, 0x33, 0x2e, 0x38,
+	0x36, 0x20, 0x38, 0x37, 0x30, 0x2e, 0x33, 0x31, 0x33, 0x20, 0x43, 0x20, 0x31, 0x33, 0x34, 0x35,
+	0x2e, 0x38, 0x39, 0x20, 0x39, 0x31, 0x30, 0x2e, 0x38, 0x36, 0x39, 0x20, 0x31, 0x33, 0x38, 0x36,
+	0x2e, 0x30, 0x39, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x36, 0x39, 0x38, 0x20, 0x31, 0x34, 0x32, 0x38,
+	0x2e, 0x31, 0x32, 0x20, 0x39, 0x39, 0x34, 0x2e, 0x32, 0x31, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34,
+	0x39, 0x31, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x35,
+	0x33, 0x32, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x31, 0x34, 0x37, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x35,
+	0x34, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x32, 0x33, 0x34, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20,
+	0x31, 0x35, 0x35, 0x39, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x31, 0x31, 0x20,
+	0x31, 0x35, 0x32, 0x39, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x34, 0x35, 0x36, 0x2e, 0x36, 0x38, 0x20,
+	0x31, 0x34, 0x36, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x35, 0x34, 0x34, 0x2e, 0x39, 0x38, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x39, 0x34, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x36, 0x33, 0x31, 0x2e, 0x39,
+	0x33, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x36, 0x38, 0x31, 0x2e, 0x39,
+	0x37, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x36, 0x39, 0x35, 0x2e, 0x37,
+	0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x34, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x36, 0x39, 0x39,
+	0x2e, 0x39, 0x33, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x36, 0x39, 0x38,
+	0x2e, 0x34, 0x20, 0x31, 0x30, 0x36, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x34,
+	0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e, 0x32, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e,
+	0x36, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x37, 0x32,
+	0x20, 0x38, 0x39, 0x33, 0x2e, 0x38, 0x34, 0x39, 0x20, 0x31, 0x36, 0x39, 0x37, 0x2e, 0x39, 0x36,
+	0x20, 0x43, 0x20, 0x37, 0x38, 0x38, 0x2e, 0x31, 0x33, 0x32, 0x20, 0x31, 0x36, 0x39, 0x36, 0x2e,
+	0x35, 0x33, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x38, 0x32, 0x37, 0x20, 0x31, 0x36, 0x35, 0x33, 0x2e,
+	0x37, 0x39, 0x20, 0x36, 0x31, 0x37, 0x2e, 0x37, 0x37, 0x36, 0x20, 0x31, 0x35, 0x37, 0x37, 0x2e,
+	0x30, 0x32, 0x20, 0x43, 0x20, 0x35, 0x30, 0x31, 0x2e, 0x39, 0x34, 0x35, 0x20, 0x31, 0x34, 0x35,
+	0x33, 0x2e, 0x30, 0x36, 0x20, 0x34, 0x37, 0x31, 0x2e, 0x36, 0x32, 0x39, 0x20, 0x31, 0x32, 0x37,
+	0x31, 0x2e, 0x37, 0x38, 0x20, 0x35, 0x34, 0x30, 0x2e, 0x38, 0x32, 0x34, 0x20, 0x31, 0x31, 0x31,
+	0x36, 0x2e, 0x38, 0x37, 0x20, 0x43, 0x20, 0x35, 0x35, 0x36, 0x2e, 0x39, 0x36, 0x34, 0x20, 0x31,
+	0x30, 0x37, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x35, 0x37, 0x39, 0x2e, 0x33, 0x38, 0x32, 0x20, 0x31,
+	0x30, 0x33, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x30, 0x38, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30,
+	0x31, 0x31, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x32, 0x31, 0x31, 0x20,
+	0x39, 0x39, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x36, 0x33, 0x32, 0x2e, 0x34, 0x33, 0x20, 0x39, 0x38,
+	0x37, 0x2e, 0x32, 0x31, 0x38, 0x20, 0x36, 0x34, 0x34, 0x2e, 0x34, 0x38, 0x20, 0x39, 0x37, 0x35,
+	0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x37, 0x35, 0x33, 0x2e, 0x33, 0x30, 0x36, 0x20, 0x38,
+	0x36, 0x34, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20, 0x37, 0x37, 0x39, 0x2e, 0x32, 0x34, 0x31, 0x20,
+	0x38, 0x33, 0x38, 0x2e, 0x32, 0x33, 0x20, 0x38, 0x30, 0x35, 0x2e, 0x33, 0x39, 0x20, 0x38, 0x31,
+	0x38, 0x2e, 0x36, 0x35, 0x35, 0x20, 0x38, 0x32, 0x30, 0x2e, 0x38, 0x36, 0x34, 0x20, 0x37, 0x38,
+	0x33, 0x2e, 0x35, 0x35, 0x34, 0x20, 0x43, 0x20, 0x38, 0x34, 0x31, 0x2e, 0x38, 0x39, 0x32, 0x20,
+	0x37, 0x33, 0x35, 0x2e, 0x38, 0x35, 0x33, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x34, 0x34, 0x36, 0x20,
+	0x36, 0x39, 0x31, 0x2e, 0x31, 0x31, 0x31, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x32, 0x34, 0x38, 0x20,
+	0x36, 0x34, 0x30, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x43, 0x20, 0x38, 0x33, 0x36, 0x2e, 0x39, 0x36,
+	0x20, 0x35, 0x39, 0x31, 0x2e, 0x35, 0x39, 0x32, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x32, 0x30, 0x32,
+	0x20, 0x35, 0x34, 0x32, 0x2e, 0x36, 0x38, 0x32, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x39, 0x37, 0x33,
+	0x20, 0x34, 0x39, 0x33, 0x2e, 0x37, 0x37, 0x39, 0x20, 0x43, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x31,
+	0x32, 0x32, 0x20, 0x34, 0x37, 0x30, 0x2e, 0x38, 0x36, 0x33, 0x20, 0x37, 0x35, 0x34, 0x2e, 0x37,
+	0x30, 0x39, 0x20, 0x34, 0x32, 0x32, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x31,
+	0x34, 0x34, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x37, 0x32, 0x38, 0x20, 0x43, 0x20, 0x37, 0x35, 0x38,
+	0x2e, 0x35, 0x35, 0x33, 0x20, 0x33, 0x31, 0x35, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x37, 0x35, 0x31,
+	0x2e, 0x34, 0x36, 0x37, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x38, 0x38, 0x39, 0x20, 0x37, 0x37, 0x39,
+	0x2e, 0x36, 0x39, 0x38, 0x20, 0x32, 0x34, 0x39, 0x2e, 0x38, 0x35, 0x38, 0x20, 0x43, 0x20, 0x38,
+	0x30, 0x30, 0x2e, 0x35, 0x35, 0x38, 0x20, 0x32, 0x32, 0x34, 0x2e, 0x37, 0x31, 0x33, 0x20, 0x38,
+	0x32, 0x32, 0x2e, 0x37, 0x33, 0x35, 0x20, 0x32, 0x31, 0x33, 0x2e, 0x32, 0x36, 0x31, 0x20, 0x38,
+	0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39, 0x2e, 0x33, 0x37, 0x31, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31,
+	0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x32, 0x35, 0x2e,
+	0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e, 0x34, 0x38, 0x20, 0x43, 0x20, 0x38, 0x38,
+	0x33, 0x2e, 0x38, 0x31, 0x37, 0x20, 0x31, 0x30, 0x34, 0x35, 0x2e, 0x35, 0x33, 0x20, 0x39, 0x35,
+	0x33, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x30, 0x36, 0x31, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x30,
+	0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38, 0x35, 0x2e, 0x39, 0x33, 0x20, 0x43, 0x20,
+	0x31, 0x30, 0x32, 0x32, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x30, 0x39, 0x33, 0x2e, 0x37, 0x32, 0x20,
+	0x31, 0x30, 0x33, 0x38, 0x2e, 0x33, 0x32, 0x20, 0x31, 0x31, 0x30, 0x33, 0x2e, 0x36, 0x34, 0x20,
+	0x31, 0x30, 0x35, 0x35, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x31, 0x31, 0x31, 0x2e, 0x34, 0x36, 0x20,
+	0x43, 0x20, 0x31, 0x31, 0x35, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x31, 0x35, 0x37, 0x2e, 0x33,
+	0x38, 0x20, 0x31, 0x32, 0x36, 0x39, 0x2e, 0x34, 0x32, 0x20, 0x31, 0x31, 0x36, 0x32, 0x2e, 0x31,
+	0x34, 0x20, 0x31, 0x33, 0x37, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x31, 0x33, 0x35, 0x2e, 0x38,
+	0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x35, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x31, 0x33, 0x31,
+	0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x31, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x31, 0x32, 0x34, 0x2e,
+	0x33, 0x34, 0x20, 0x31, 0x34, 0x33, 0x32, 0x2e, 0x35, 0x32, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e,
+	0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x33, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x31, 0x33, 0x30,
+	0x2e, 0x33, 0x36, 0x20, 0x31, 0x34, 0x35, 0x34, 0x2e, 0x38, 0x37, 0x20, 0x31, 0x31, 0x36, 0x33,
+	0x2e, 0x38, 0x35, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x31, 0x38, 0x30,
+	0x2e, 0x35, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31, 0x35, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x33,
+	0x35, 0x36, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x34, 0x32, 0x39, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x35,
+	0x36, 0x31, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x32, 0x34, 0x34, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x36,
+	0x31, 0x34, 0x2e, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x39, 0x38, 0x20,
+	0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x31, 0x35, 0x34, 0x2e, 0x30, 0x31, 0x20,
+	0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x35, 0x35, 0x20,
+	0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x30, 0x38, 0x2e, 0x37,
+	0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x43, 0x20, 0x38, 0x38, 0x35, 0x2e, 0x33,
+	0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x31, 0x34, 0x20, 0x37, 0x38, 0x35, 0x2e, 0x33,
+	0x30, 0x31, 0x20, 0x31, 0x36, 0x33, 0x38, 0x2e, 0x31, 0x35, 0x20, 0x36, 0x38, 0x35, 0x2e, 0x38,
+	0x38, 0x39, 0x20, 0x31, 0x35, 0x34, 0x38, 0x2e, 0x34, 0x38, 0x20, 0x43, 0x20, 0x35, 0x35, 0x38,
+	0x2e, 0x32, 0x39, 0x33, 0x20, 0x31, 0x34, 0x33, 0x33, 0x2e, 0x33, 0x38, 0x20, 0x35, 0x34, 0x31,
+	0x2e, 0x39, 0x33, 0x32, 0x20, 0x31, 0x32, 0x34, 0x31, 0x2e, 0x34, 0x39, 0x20, 0x36, 0x33, 0x30,
+	0x2e, 0x30, 0x37, 0x37, 0x20, 0x31, 0x30, 0x39, 0x38, 0x2e, 0x30, 0x37, 0x20, 0x43, 0x20, 0x36,
+	0x33, 0x36, 0x2e, 0x39, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38, 0x36, 0x2e, 0x38, 0x37, 0x20, 0x36,
+	0x34, 0x35, 0x2e, 0x36, 0x31, 0x36, 0x20, 0x31, 0x30, 0x38, 0x37, 0x2e, 0x35, 0x36, 0x20, 0x36,
+	0x35, 0x36, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x38, 0x33, 0x2e, 0x32, 0x35, 0x20, 0x43, 0x20, 0x37,
+	0x31, 0x32, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x30, 0x36, 0x31, 0x2e, 0x38, 0x37, 0x20, 0x37, 0x36,
+	0x36, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x31, 0x30, 0x34, 0x39, 0x2e, 0x31, 0x34, 0x20, 0x38, 0x32,
+	0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e, 0x34, 0x38, 0x20, 0x7a, 0x22,
+	0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f,
+	0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c,
+	0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x37, 0x36,
+	0x2c, 0x31, 0x37, 0x35, 0x2c, 0x38, 0x30, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38,
+	0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x34, 0x32, 0x20, 0x43,
+	0x20, 0x38, 0x31, 0x34, 0x2e, 0x38, 0x38, 0x33, 0x20, 0x31, 0x30, 0x35, 0x30, 0x2e, 0x36, 0x33,
+	0x20, 0x38, 0x32, 0x37, 0x2e, 0x36, 0x39, 0x36, 0x20, 0x31, 0x30, 0x35, 0x30, 0x2e, 0x37, 0x38,
+	0x20, 0x38, 0x33, 0x34, 0x2e, 0x38, 0x32, 0x33, 0x20, 0x31, 0x30, 0x35, 0x30, 0x2e, 0x38, 0x31,
+	0x20, 0x43, 0x20, 0x38, 0x39, 0x32, 0x2e, 0x37, 0x36, 0x39, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e,
+	0x33, 0x37, 0x20, 0x39, 0x34, 0x39, 0x2e, 0x39, 0x36, 0x20, 0x31, 0x30, 0x36, 0x34, 0x2e, 0x30,
+	0x32, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x37, 0x33, 0x20, 0x31, 0x30, 0x38, 0x37, 0x2e, 0x39,
+	0x36, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x31, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x30, 0x39, 0x36,
+	0x2e, 0x35, 0x38, 0x20, 0x31, 0x30, 0x34, 0x30, 0x2e, 0x31, 0x35, 0x20, 0x31, 0x31, 0x30, 0x38,
+	0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x36, 0x30, 0x2e, 0x35, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e,
+	0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x32, 0x31, 0x20, 0x31, 0x31, 0x36,
+	0x38, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x33, 0x31, 0x35, 0x2e, 0x32, 0x37, 0x20, 0x31, 0x31, 0x36,
+	0x35, 0x2e, 0x35, 0x36, 0x20, 0x31, 0x34, 0x33, 0x31, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x31, 0x32,
+	0x31, 0x2e, 0x33, 0x31, 0x20, 0x43, 0x20, 0x31, 0x34, 0x33, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x31,
+	0x31, 0x33, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x34, 0x34, 0x34, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x31,
+	0x34, 0x37, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x34, 0x34, 0x39, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x31,
+	0x35, 0x39, 0x2e, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31, 0x35, 0x2e, 0x37, 0x34, 0x20,
+	0x31, 0x33, 0x33, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x34, 0x34, 0x31, 0x2e, 0x34, 0x35, 0x20,
+	0x31, 0x35, 0x33, 0x37, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x32, 0x36, 0x30, 0x2e, 0x37, 0x36, 0x20,
+	0x31, 0x36, 0x30, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32, 0x34, 0x39, 0x2e, 0x38,
+	0x33, 0x20, 0x31, 0x36, 0x30, 0x39, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x32, 0x33, 0x38, 0x2e, 0x37,
+	0x35, 0x20, 0x31, 0x36, 0x31, 0x33, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e, 0x35, 0x34, 0x20, 0x31,
+	0x36, 0x31, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x39, 0x31,
+	0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x30, 0x38, 0x35, 0x2e, 0x30, 0x35,
+	0x20, 0x31, 0x36, 0x32, 0x33, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x30, 0x32, 0x30, 0x2e, 0x38, 0x20,
+	0x31, 0x36, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x4c, 0x20, 0x39, 0x34, 0x30, 0x2e, 0x38, 0x39,
+	0x34, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x34, 0x35, 0x20, 0x43, 0x20, 0x39, 0x30, 0x30, 0x2e,
+	0x30, 0x34, 0x36, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x36, 0x39, 0x20, 0x38, 0x37, 0x34, 0x2e,
+	0x30, 0x36, 0x20, 0x31, 0x36, 0x32, 0x35, 0x2e, 0x35, 0x37, 0x20, 0x38, 0x33, 0x33, 0x2e, 0x36,
+	0x37, 0x36, 0x20, 0x31, 0x36, 0x31, 0x37, 0x2e, 0x38, 0x31, 0x20, 0x43, 0x20, 0x37, 0x39, 0x34,
+	0x2e, 0x36, 0x31, 0x32, 0x20, 0x31, 0x36, 0x31, 0x30, 0x2e, 0x34, 0x38, 0x20, 0x37, 0x35, 0x37,
+	0x2e, 0x33, 0x35, 0x33, 0x20, 0x31, 0x35, 0x39, 0x35, 0x2e, 0x36, 0x20, 0x37, 0x32, 0x33, 0x2e,
+	0x39, 0x38, 0x38, 0x20, 0x31, 0x35, 0x37, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x43, 0x20, 0x36, 0x35,
+	0x32, 0x2e, 0x34, 0x35, 0x37, 0x20, 0x31, 0x35, 0x32, 0x37, 0x2e, 0x39, 0x37, 0x20, 0x36, 0x30,
+	0x34, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x35, 0x31, 0x2e, 0x37, 0x20, 0x35, 0x38, 0x36, 0x2e,
+	0x35, 0x32, 0x36, 0x20, 0x31, 0x33, 0x36, 0x39, 0x2e, 0x32, 0x39, 0x20, 0x43, 0x20, 0x35, 0x36,
+	0x35, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x31, 0x32, 0x37, 0x34, 0x2e, 0x35, 0x33, 0x20, 0x35, 0x38,
+	0x33, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x34, 0x34, 0x20, 0x36, 0x33,
+	0x36, 0x2e, 0x37, 0x39, 0x34, 0x20, 0x31, 0x30, 0x39, 0x34, 0x2e, 0x30, 0x39, 0x20, 0x43, 0x20,
+	0x36, 0x34, 0x35, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x31, 0x30, 0x38, 0x39, 0x2e, 0x36, 0x35, 0x20,
+	0x36, 0x36, 0x30, 0x2e, 0x37, 0x38, 0x37, 0x20, 0x31, 0x30, 0x38, 0x34, 0x2e, 0x37, 0x35, 0x20,
+	0x36, 0x37, 0x30, 0x2e, 0x34, 0x33, 0x35, 0x20, 0x31, 0x30, 0x38, 0x31, 0x2e, 0x34, 0x37, 0x20,
+	0x43, 0x20, 0x37, 0x31, 0x38, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x31, 0x30, 0x36, 0x35, 0x2e, 0x33,
+	0x20, 0x37, 0x35, 0x38, 0x2e, 0x32, 0x34, 0x32, 0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x31, 0x32,
+	0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x34, 0x32,
+	0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65,
+	0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62,
+	0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x29, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x20, 0x39, 0x31, 0x35, 0x2e, 0x30, 0x30, 0x36, 0x20, 0x34, 0x39, 0x35, 0x2e,
+	0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x35, 0x30, 0x2e, 0x30, 0x39, 0x20, 0x34, 0x39,
+	0x35, 0x2e, 0x32, 0x38, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x34,
+	0x39, 0x35, 0x2e, 0x32, 0x37, 0x31, 0x20, 0x31, 0x31, 0x30, 0x39, 0x2e, 0x39, 0x34, 0x20, 0x34,
+	0x39, 0x34, 0x2e, 0x36, 0x36, 0x33, 0x20, 0x31, 0x31, 0x33, 0x38, 0x2e, 0x31, 0x20, 0x34, 0x39,
+	0x35, 0x2e, 0x37, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x33, 0x37, 0x2e, 0x39, 0x35, 0x20, 0x36,
+	0x34, 0x33, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x33, 0x38, 0x2e, 0x30, 0x32,
+	0x20, 0x37, 0x30, 0x33, 0x2e, 0x32, 0x32, 0x37, 0x20, 0x31, 0x31, 0x33, 0x35, 0x2e, 0x34, 0x33,
+	0x20, 0x37, 0x36, 0x34, 0x2e, 0x31, 0x35, 0x38, 0x20, 0x31, 0x31, 0x36, 0x34, 0x2e, 0x34, 0x32,
+	0x20, 0x38, 0x31, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x34,
+	0x36, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x37, 0x31, 0x32, 0x20, 0x31, 0x32, 0x32, 0x39, 0x2e, 0x32,
+	0x35, 0x20, 0x39, 0x30, 0x32, 0x2e, 0x33, 0x30, 0x33, 0x20, 0x31, 0x32, 0x37, 0x36, 0x2e, 0x37,
+	0x37, 0x20, 0x39, 0x34, 0x38, 0x2e, 0x39, 0x32, 0x20, 0x43, 0x20, 0x31, 0x33, 0x31, 0x34, 0x2e,
+	0x35, 0x37, 0x20, 0x39, 0x38, 0x35, 0x2e, 0x33, 0x31, 0x35, 0x20, 0x31, 0x33, 0x35, 0x32, 0x2e,
+	0x30, 0x34, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x33, 0x38, 0x39, 0x2e,
+	0x31, 0x39, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x31, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x34,
+	0x2e, 0x34, 0x20, 0x31, 0x30, 0x39, 0x34, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e,
+	0x31, 0x34, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e,
+	0x39, 0x38, 0x20, 0x31, 0x30, 0x35, 0x33, 0x2e, 0x39, 0x37, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37,
+	0x33, 0x2e, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x36, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x30, 0x35,
+	0x39, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x33, 0x36, 0x2e, 0x30, 0x39, 0x20, 0x31, 0x30, 0x34,
+	0x32, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x30, 0x32, 0x38, 0x2e, 0x31, 0x31, 0x20, 0x43, 0x20, 0x39,
+	0x39, 0x36, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x30, 0x30, 0x36, 0x2e, 0x31, 0x36, 0x20, 0x39, 0x34,
+	0x37, 0x2e, 0x31, 0x34, 0x39, 0x20, 0x39, 0x39, 0x32, 0x2e, 0x30, 0x30, 0x39, 0x20, 0x38, 0x39,
+	0x36, 0x2e, 0x34, 0x32, 0x20, 0x39, 0x38, 0x36, 0x2e, 0x32, 0x33, 0x35, 0x20, 0x43, 0x20, 0x38,
+	0x35, 0x36, 0x2e, 0x30, 0x34, 0x20, 0x39, 0x38, 0x31, 0x2e, 0x34, 0x39, 0x31, 0x20, 0x38, 0x31,
+	0x33, 0x2e, 0x37, 0x39, 0x39, 0x20, 0x39, 0x38, 0x31, 0x2e, 0x36, 0x32, 0x39, 0x20, 0x37, 0x37,
+	0x33, 0x2e, 0x34, 0x35, 0x39, 0x20, 0x39, 0x38, 0x37, 0x2e, 0x34, 0x30, 0x36, 0x20, 0x43, 0x20,
+	0x37, 0x36, 0x35, 0x2e, 0x35, 0x31, 0x32, 0x20, 0x39, 0x38, 0x38, 0x2e, 0x35, 0x34, 0x35, 0x20,
+	0x37, 0x32, 0x38, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x39, 0x39, 0x37, 0x2e, 0x33, 0x38, 0x39, 0x20,
+	0x37, 0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39, 0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20,
+	0x43, 0x20, 0x37, 0x34, 0x31, 0x2e, 0x36, 0x37, 0x32, 0x20, 0x39, 0x38, 0x31, 0x2e, 0x38, 0x34,
+	0x36, 0x20, 0x37, 0x36, 0x33, 0x2e, 0x39, 0x33, 0x36, 0x20, 0x39, 0x35, 0x37, 0x2e, 0x30, 0x37,
+	0x35, 0x20, 0x37, 0x38, 0x31, 0x2e, 0x35, 0x33, 0x32, 0x20, 0x39, 0x34, 0x31, 0x2e, 0x33, 0x34,
+	0x31, 0x20, 0x43, 0x20, 0x38, 0x34, 0x38, 0x2e, 0x31, 0x34, 0x20, 0x38, 0x38, 0x31, 0x2e, 0x37,
+	0x38, 0x32, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x38, 0x32, 0x39, 0x2e, 0x32,
+	0x38, 0x38, 0x20, 0x39, 0x31, 0x32, 0x2e, 0x36, 0x38, 0x31, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x32,
+	0x34, 0x35, 0x20, 0x43, 0x20, 0x39, 0x31, 0x36, 0x2e, 0x33, 0x32, 0x32, 0x20, 0x37, 0x30, 0x35,
+	0x2e, 0x35, 0x33, 0x31, 0x20, 0x39, 0x31, 0x34, 0x2e, 0x39, 0x36, 0x34, 0x20, 0x36, 0x37, 0x32,
+	0x2e, 0x36, 0x33, 0x32, 0x20, 0x39, 0x31, 0x34, 0x2e, 0x39, 0x36, 0x20, 0x36, 0x34, 0x32, 0x2e,
+	0x30, 0x34, 0x34, 0x20, 0x4c, 0x20, 0x39, 0x31, 0x35, 0x2e, 0x30, 0x30, 0x36, 0x20, 0x34, 0x39,
+	0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x34, 0x37, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x34,
+	0x30, 0x38, 0x20, 0x43, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x35, 0x34, 0x39, 0x20, 0x32, 0x38, 0x30,
+	0x2e, 0x33, 0x39, 0x39, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x36, 0x32, 0x32, 0x20, 0x32, 0x38, 0x30,
+	0x2e, 0x33, 0x39, 0x31, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x36, 0x39, 0x34, 0x20, 0x32, 0x38, 0x30,
+	0x2e, 0x33, 0x38, 0x33, 0x20, 0x43, 0x20, 0x38, 0x38, 0x39, 0x2e, 0x32, 0x36, 0x36, 0x20, 0x32,
+	0x37, 0x39, 0x2e, 0x37, 0x36, 0x33, 0x20, 0x39, 0x31, 0x34, 0x2e, 0x39, 0x36, 0x38, 0x20, 0x32,
+	0x37, 0x39, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x39, 0x33, 0x39, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x32,
+	0x38, 0x30, 0x2e, 0x30, 0x32, 0x35, 0x20, 0x43, 0x20, 0x39, 0x37, 0x36, 0x2e, 0x33, 0x38, 0x31,
+	0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x33, 0x38, 0x20, 0x31, 0x30, 0x31, 0x33, 0x2e, 0x33, 0x35,
+	0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x35, 0x36, 0x20, 0x31, 0x30, 0x35, 0x30, 0x2e, 0x33, 0x31,
+	0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x34, 0x30, 0x2e,
+	0x35, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x39, 0x34, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37,
+	0x33, 0x2e, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x31, 0x32, 0x32, 0x36,
+	0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x31, 0x2e, 0x36, 0x30, 0x36, 0x20, 0x31, 0x32, 0x32, 0x35,
+	0x2e, 0x39, 0x31, 0x20, 0x33, 0x32, 0x32, 0x2e, 0x38, 0x35, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32,
+	0x32, 0x35, 0x2e, 0x36, 0x31, 0x20, 0x33, 0x34, 0x37, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x31, 0x32,
+	0x32, 0x37, 0x2e, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33, 0x2e, 0x33, 0x30, 0x34, 0x20, 0x31, 0x32,
+	0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x33, 0x39, 0x37, 0x2e, 0x30, 0x33, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x34, 0x20, 0x34, 0x31, 0x34, 0x2e, 0x35, 0x37, 0x37, 0x20,
+	0x31, 0x32, 0x30, 0x35, 0x2e, 0x31, 0x39, 0x20, 0x34, 0x32, 0x31, 0x2e, 0x35, 0x38, 0x20, 0x31,
+	0x31, 0x38, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x34, 0x32, 0x32, 0x2e, 0x30, 0x30, 0x38, 0x20, 0x4c,
+	0x20, 0x39, 0x36, 0x31, 0x2e, 0x39, 0x39, 0x39, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x30, 0x31, 0x36,
+	0x20, 0x4c, 0x20, 0x38, 0x39, 0x34, 0x2e, 0x34, 0x38, 0x32, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x31,
+	0x34, 0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x32, 0x2e, 0x36, 0x37, 0x33, 0x20, 0x34, 0x32, 0x33,
+	0x2e, 0x31, 0x37, 0x33, 0x20, 0x38, 0x34, 0x36, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x34, 0x32, 0x34,
+	0x2e, 0x38, 0x37, 0x39, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x34, 0x31, 0x38,
+	0x2e, 0x36, 0x37, 0x38, 0x20, 0x43, 0x20, 0x38, 0x32, 0x30, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x34,
+	0x30, 0x35, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x38, 0x32, 0x34, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x33,
+	0x37, 0x33, 0x2e, 0x33, 0x37, 0x39, 0x20, 0x38, 0x32, 0x34, 0x2e, 0x39, 0x35, 0x31, 0x20, 0x33,
+	0x35, 0x33, 0x2e, 0x39, 0x39, 0x38, 0x20, 0x43, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x30, 0x31, 0x32,
+	0x20, 0x33, 0x31, 0x37, 0x2e, 0x32, 0x39, 0x36, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x31, 0x32, 0x33,
+	0x20, 0x32, 0x38, 0x34, 0x2e, 0x35, 0x32, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x34, 0x37, 0x37, 0x20,
+	0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x38, 0x37, 0x2c, 0x31, 0x33, 0x36, 0x2c,
+	0x34, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x37, 0x39, 0x2e, 0x35, 0x32,
+	0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x38, 0x33,
+	0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x35,
+	0x32, 0x2e, 0x34, 0x32, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36, 0x34, 0x31, 0x20, 0x43, 0x20, 0x31,
+	0x31, 0x36, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x31,
+	0x38, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x31, 0x36, 0x37, 0x20, 0x31, 0x31,
+	0x39, 0x33, 0x2e, 0x33, 0x34, 0x20, 0x32, 0x38, 0x34, 0x2e, 0x33, 0x37, 0x37, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x31, 0x31, 0x2e, 0x36, 0x20, 0x32, 0x38, 0x36, 0x2e, 0x30, 0x36, 0x38, 0x20, 0x31,
+	0x32, 0x32, 0x32, 0x2e, 0x34, 0x31, 0x20, 0x33, 0x30, 0x34, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x31,
+	0x32, 0x32, 0x32, 0x2e, 0x30, 0x38, 0x20, 0x33, 0x32, 0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x37, 0x20, 0x33, 0x33, 0x37, 0x2e, 0x31, 0x31, 0x34,
+	0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x31, 0x35, 0x20, 0x33, 0x35, 0x31, 0x2e, 0x39, 0x34, 0x33,
+	0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x39, 0x35, 0x20, 0x33, 0x36, 0x37, 0x2e, 0x31, 0x32, 0x34,
+	0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x37, 0x20, 0x33, 0x38, 0x31, 0x2e, 0x32,
+	0x32, 0x31, 0x20, 0x31, 0x32, 0x32, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x33, 0x39, 0x39, 0x2e, 0x34,
+	0x34, 0x20, 0x31, 0x32, 0x31, 0x33, 0x2e, 0x33, 0x37, 0x20, 0x34, 0x31, 0x30, 0x2e, 0x34, 0x33,
+	0x32, 0x20, 0x43, 0x20, 0x31, 0x32, 0x30, 0x32, 0x2e, 0x39, 0x31, 0x20, 0x34, 0x32, 0x31, 0x2e,
+	0x31, 0x35, 0x33, 0x20, 0x31, 0x31, 0x38, 0x36, 0x2e, 0x32, 0x33, 0x20, 0x34, 0x31, 0x39, 0x2e,
+	0x33, 0x35, 0x35, 0x20, 0x31, 0x31, 0x37, 0x32, 0x2e, 0x35, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x31,
+	0x39, 0x32, 0x20, 0x4c, 0x20, 0x39, 0x35, 0x31, 0x2e, 0x34, 0x37, 0x32, 0x20, 0x34, 0x31, 0x39,
+	0x2e, 0x31, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x38, 0x35, 0x2e, 0x37, 0x38, 0x33, 0x20, 0x34,
+	0x31, 0x39, 0x2e, 0x32, 0x37, 0x20, 0x43, 0x20, 0x38, 0x36, 0x31, 0x2e, 0x33, 0x30, 0x35, 0x20,
+	0x34, 0x31, 0x39, 0x2e, 0x33, 0x34, 0x35, 0x20, 0x38, 0x32, 0x38, 0x2e, 0x33, 0x30, 0x36, 0x20,
+	0x34, 0x32, 0x36, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x38, 0x32, 0x38, 0x2e, 0x38, 0x31, 0x36, 0x20,
+	0x33, 0x39, 0x30, 0x2e, 0x31, 0x35, 0x20, 0x43, 0x20, 0x38, 0x32, 0x39, 0x2e, 0x32, 0x30, 0x34,
+	0x20, 0x33, 0x36, 0x32, 0x2e, 0x38, 0x37, 0x20, 0x38, 0x32, 0x36, 0x2e, 0x37, 0x39, 0x33, 0x20,
+	0x33, 0x33, 0x33, 0x2e, 0x30, 0x31, 0x34, 0x20, 0x38, 0x33, 0x30, 0x2e, 0x31, 0x31, 0x34, 0x20,
+	0x33, 0x30, 0x36, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x43, 0x20, 0x38, 0x33, 0x32, 0x2e, 0x38, 0x34,
+	0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x39, 0x36, 0x35, 0x20, 0x38, 0x36, 0x33, 0x2e, 0x30, 0x35,
+	0x34, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x37, 0x20, 0x38, 0x37, 0x39, 0x2e, 0x35, 0x32,
+	0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29,
+	0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31,
+	0x30, 0x30, 0x32, 0x2e, 0x36, 0x39, 0x20, 0x43, 0x20, 0x37, 0x31, 0x34, 0x2e, 0x35, 0x36, 0x20,
+	0x39, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x37, 0x32, 0x30, 0x2e, 0x34, 0x36, 0x35, 0x20,
+	0x39, 0x39, 0x31, 0x2e, 0x39, 0x34, 0x32, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20,
+	0x39, 0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x33, 0x34,
+	0x38, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x36, 0x36, 0x20, 0x37, 0x31, 0x37, 0x2e, 0x33, 0x37,
+	0x33, 0x20, 0x31, 0x30, 0x30, 0x33, 0x2e, 0x32, 0x35, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x33, 0x30,
+	0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_client_extendedprotocol_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x3e, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0x63, 0x60, 0x18,
+	0xf2, 0x80, 0x91, 0x90, 0x82, 0xa7, 0x96, 0x26, 0xeb, 0x19, 0x18, 0x18, 0xed, 0x19, 0x18, 0x18,
+	0x98, 0x19, 0x18, 0x18, 0xf8, 0x90, 0xa4, 0xbe, 0xfd, 0xff, 0xcf, 0x98, 0xc5, 0x42, 0x84, 0x1d,
+	0x2c, 0x0c, 0x0c, 0x0c, 0x82, 0x58, 0x24, 0x98, 0x19, 0x18, 0xfe, 0x13, 0x74, 0xc0, 0x28, 0x18,
+	0x05, 0x43, 0x04, 0x00, 0x00, 0xd2, 0x34, 0x06, 0xd0, 0x84, 0xfd, 0xc3, 0x20, 0x00, 0x00, 0x00,
+	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_extendedprotocol_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x39, 0x32, 0x32, 0x2e, 0x30, 0x36, 0x2c,
+	0x2d, 0x37, 0x38, 0x2e, 0x39, 0x32, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e,
+	0x35, 0x37, 0x37, 0x36, 0x29, 0x22, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61,
+	0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72,
+	0x67, 0x62, 0x28, 0x32, 0x32, 0x39, 0x2c, 0x35, 0x37, 0x2c, 0x35, 0x33, 0x29, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x20, 0x33, 0x39, 0x31, 0x2e, 0x33, 0x35, 0x38, 0x20, 0x38, 0x30, 0x39, 0x2e,
+	0x34, 0x30, 0x36, 0x20, 0x43, 0x20, 0x34, 0x30, 0x34, 0x2e, 0x38, 0x38, 0x31, 0x20, 0x38, 0x30,
+	0x37, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x34, 0x34, 0x35, 0x2e, 0x32, 0x38, 0x38, 0x20, 0x38, 0x30,
+	0x38, 0x2e, 0x38, 0x36, 0x20, 0x34, 0x36, 0x30, 0x2e, 0x38, 0x30, 0x31, 0x20, 0x38, 0x30, 0x38,
+	0x2e, 0x38, 0x37, 0x39, 0x20, 0x4c, 0x20, 0x35, 0x39, 0x34, 0x2e, 0x32, 0x30, 0x39, 0x20, 0x38,
+	0x30, 0x38, 0x2e, 0x38, 0x31, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x35, 0x30, 0x2e, 0x38, 0x33,
+	0x20, 0x38, 0x30, 0x38, 0x2e, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x36, 0x37, 0x2e, 0x33,
+	0x37, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x37, 0x36, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x39, 0x35,
+	0x2e, 0x38, 0x39, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x37, 0x30, 0x37, 0x20, 0x43, 0x20, 0x31, 0x36,
+	0x35, 0x37, 0x2e, 0x35, 0x32, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x37, 0x34, 0x32, 0x20, 0x31, 0x37,
+	0x30, 0x30, 0x2e, 0x38, 0x32, 0x20, 0x38, 0x30, 0x35, 0x2e, 0x35, 0x31, 0x35, 0x20, 0x31, 0x37,
+	0x35, 0x36, 0x2e, 0x35, 0x32, 0x20, 0x38, 0x33, 0x39, 0x2e, 0x31, 0x39, 0x35, 0x20, 0x43, 0x20,
+	0x31, 0x39, 0x34, 0x39, 0x2e, 0x32, 0x20, 0x39, 0x35, 0x35, 0x2e, 0x37, 0x30, 0x31, 0x20, 0x31,
+	0x38, 0x38, 0x30, 0x2e, 0x36, 0x20, 0x31, 0x32, 0x31, 0x32, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x36,
+	0x36, 0x30, 0x2e, 0x36, 0x20, 0x31, 0x32, 0x33, 0x38, 0x2e, 0x39, 0x20, 0x43, 0x20, 0x31, 0x36,
+	0x32, 0x30, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x32, 0x34, 0x30, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x35,
+	0x38, 0x30, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x32, 0x33, 0x39, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x35,
+	0x34, 0x30, 0x2e, 0x35, 0x20, 0x31, 0x32, 0x33, 0x39, 0x2e, 0x38, 0x38, 0x20, 0x4c, 0x20, 0x31,
+	0x33, 0x36, 0x30, 0x2e, 0x32, 0x20, 0x31, 0x32, 0x33, 0x39, 0x2e, 0x39, 0x33, 0x20, 0x4c, 0x20,
+	0x38, 0x30, 0x37, 0x2e, 0x33, 0x30, 0x32, 0x20, 0x31, 0x32, 0x33, 0x39, 0x2e, 0x39, 0x39, 0x20,
+	0x4c, 0x20, 0x35, 0x31, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x32, 0x33, 0x39, 0x2e, 0x38, 0x33,
+	0x20, 0x4c, 0x20, 0x34, 0x33, 0x30, 0x2e, 0x38, 0x39, 0x33, 0x20, 0x31, 0x32, 0x33, 0x39, 0x2e,
+	0x38, 0x34, 0x20, 0x43, 0x20, 0x34, 0x31, 0x30, 0x2e, 0x37, 0x32, 0x37, 0x20, 0x31, 0x32, 0x33,
+	0x39, 0x2e, 0x38, 0x34, 0x20, 0x33, 0x38, 0x37, 0x2e, 0x33, 0x32, 0x35, 0x20, 0x31, 0x32, 0x34,
+	0x30, 0x2e, 0x34, 0x38, 0x20, 0x33, 0x36, 0x37, 0x2e, 0x34, 0x36, 0x39, 0x20, 0x31, 0x32, 0x33,
+	0x37, 0x2e, 0x37, 0x37, 0x20, 0x43, 0x20, 0x33, 0x32, 0x35, 0x2e, 0x39, 0x39, 0x34, 0x20, 0x31,
+	0x32, 0x33, 0x32, 0x2e, 0x31, 0x32, 0x20, 0x32, 0x38, 0x38, 0x2e, 0x38, 0x30, 0x38, 0x20, 0x31,
+	0x32, 0x31, 0x33, 0x2e, 0x32, 0x33, 0x20, 0x32, 0x35, 0x36, 0x2e, 0x39, 0x30, 0x35, 0x20, 0x31,
+	0x31, 0x38, 0x36, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x32, 0x31, 0x33, 0x2e, 0x34, 0x30, 0x38,
+	0x20, 0x31, 0x31, 0x34, 0x39, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x38, 0x36, 0x2e, 0x31, 0x34, 0x36,
+	0x20, 0x31, 0x30, 0x39, 0x37, 0x2e, 0x35, 0x36, 0x20, 0x31, 0x38, 0x31, 0x2e, 0x30, 0x37, 0x20,
+	0x31, 0x30, 0x34, 0x30, 0x2e, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x37, 0x36, 0x2e, 0x34, 0x36,
+	0x39, 0x20, 0x39, 0x38, 0x36, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x31, 0x39, 0x34, 0x2e, 0x39, 0x38,
+	0x32, 0x20, 0x39, 0x33, 0x34, 0x2e, 0x39, 0x34, 0x35, 0x20, 0x32, 0x32, 0x39, 0x2e, 0x38, 0x32,
+	0x31, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x36, 0x33, 0x32, 0x20, 0x43, 0x20, 0x32, 0x37, 0x34, 0x2e,
+	0x38, 0x32, 0x33, 0x20, 0x38, 0x34, 0x30, 0x2e, 0x32, 0x36, 0x38, 0x20, 0x33, 0x32, 0x31, 0x2e,
+	0x32, 0x31, 0x36, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x32, 0x20, 0x33, 0x39, 0x31, 0x2e, 0x33, 0x35,
+	0x38, 0x20, 0x38, 0x30, 0x39, 0x2e, 0x34, 0x30, 0x36, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_client_fairrating_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x66, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x92, 0xbf,
+	0x4b, 0x02, 0x61, 0x1c, 0xc6, 0x9f, 0x3b, 0x3b, 0x52, 0x94, 0xe2, 0x14, 0x31, 0xef, 0xfc, 0xd1,
+	0x0f, 0x07, 0x11, 0xa2, 0x21, 0x5a, 0x5a, 0x1b, 0xc2, 0xe6, 0x1a, 0x9a, 0x82, 0x08, 0x5a, 0xfa,
+	0x0b, 0x82, 0x82, 0x86, 0x20, 0xe8, 0x9f, 0x68, 0x8a, 0x86, 0xd6, 0x06, 0x07, 0x2b, 0xc1, 0x5a,
+	0x22, 0x0c, 0x0c, 0x53, 0x0a, 0x2e, 0x13, 0x2e, 0x35, 0xed, 0xcc, 0xeb, 0x20, 0xbd, 0xf3, 0xde,
+	0x86, 0x08, 0xcc, 0xf3, 0x1d, 0x9a, 0x7c, 0xc6, 0xf7, 0xfd, 0xbc, 0xdf, 0x1f, 0xcf, 0xf3, 0x02,
+	0x83, 0x16, 0x43, 0xbb, 0x88, 0x88, 0x62, 0xc0, 0x24, 0x24, 0x0a, 0x00, 0x04, 0x28, 0x49, 0xb2,
+	0x5c, 0xe8, 0xc7, 0x0d, 0xd1, 0x0a, 0x04, 0xbd, 0x9d, 0xf4, 0xd2, 0x9c, 0x3d, 0x0c, 0x00, 0x17,
+	0xd9, 0x56, 0x5b, 0x92, 0x31, 0xdc, 0x8f, 0x63, 0x69, 0x05, 0xaa, 0x4d, 0x9c, 0x5d, 0x3f, 0xf3,
+	0xb8, 0x7d, 0x1d, 0x43, 0xa9, 0xc6, 0xa4, 0x69, 0x1c, 0x55, 0x21, 0x51, 0x5c, 0x38, 0x4f, 0x26,
+	0xc9, 0x4b, 0xb1, 0x48, 0x26, 0x04, 0x61, 0x8b, 0xc6, 0x51, 0x27, 0xb0, 0x01, 0x1e, 0x9e, 0xe7,
+	0xe1, 0x72, 0xb9, 0xc0, 0xb0, 0xac, 0xe7, 0x5f, 0xdd, 0xa7, 0x04, 0x21, 0xb8, 0xb9, 0xb1, 0x5e,
+	0x31, 0x4d, 0x93, 0x10, 0x42, 0xc8, 0xde, 0xee, 0x8e, 0x16, 0xf2, 0xfb, 0x67, 0x29, 0x8d, 0xfe,
+	0x2a, 0xe2, 0x76, 0x8f, 0x38, 0x9c, 0xec, 0xcd, 0x4c, 0x98, 0x17, 0x2f, 0x53, 0x29, 0x7c, 0x19,
+	0xc0, 0x62, 0x3c, 0xce, 0x3d, 0x16, 0xf2, 0xab, 0xcd, 0x5a, 0xfd, 0xe4, 0x43, 0xd3, 0x1a, 0xdd,
+	0xbc, 0x25, 0xc6, 0x88, 0xe8, 0xdf, 0x3e, 0x5e, 0xe6, 0xf6, 0x03, 0xa3, 0x3f, 0x01, 0xe5, 0x2a,
+	0x3a, 0xf2, 0x6f, 0x06, 0xbc, 0x4e, 0x1b, 0x0e, 0xd2, 0xc6, 0x69, 0x46, 0x2a, 0xaf, 0x74, 0xf3,
+	0x96, 0x18, 0xed, 0x1c, 0x99, 0xfe, 0x7d, 0x0c, 0x00, 0x31, 0x1f, 0x87, 0x98, 0x8f, 0x03, 0x00,
+	0x1c, 0xdd, 0xe9, 0xd1, 0x5e, 0xde, 0x62, 0xe2, 0xa7, 0x6e, 0x4b, 0xdc, 0x97, 0xdb, 0x96, 0x5d,
+	0xcb, 0xaa, 0x01, 0xa9, 0xc9, 0x24, 0x7a, 0xcf, 0x2d, 0x1e, 0x34, 0x54, 0x35, 0xfb, 0xa4, 0x3a,
+	0xe6, 0x39, 0x74, 0x26, 0xb5, 0x16, 0x81, 0xa4, 0x18, 0x78, 0xa8, 0x1a, 0x38, 0xbc, 0xd2, 0x73,
+	0xef, 0xa6, 0x73, 0x4d, 0x51, 0x94, 0x56, 0x37, 0x4f, 0xfd, 0xca, 0xe3, 0x82, 0x10, 0x65, 0x81,
+	0x00, 0x00, 0x74, 0x80, 0x7a, 0x51, 0x96, 0x33, 0x34, 0x76, 0xb0, 0xfa, 0x06, 0x9c, 0xe7, 0x7c,
+	0x96, 0x8f, 0x52, 0xa7, 0x46, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+	0x82
+};
+
+static const unsigned char icon_client_fairrating_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x31, 0x30, 0x31, 0x2e, 0x30, 0x36, 0x2c,
+	0x31, 0x35, 0x37, 0x2e, 0x39, 0x37, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e,
+	0x39, 0x30, 0x39, 0x29, 0x22, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74,
+	0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67,
+	0x62, 0x28, 0x33, 0x32, 0x2c, 0x32, 0x37, 0x2c, 0x32, 0x36, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39, 0x2e, 0x33, 0x37,
+	0x31, 0x20, 0x43, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x32, 0x30, 0x38, 0x2e,
+	0x30, 0x34, 0x38, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x34, 0x33, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x38,
+	0x39, 0x35, 0x20, 0x39, 0x32, 0x31, 0x2e, 0x39, 0x34, 0x38, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x39,
+	0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x30, 0x35, 0x20, 0x32, 0x30, 0x38, 0x2e,
+	0x39, 0x39, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x34, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x32, 0x30,
+	0x38, 0x2e, 0x39, 0x31, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x36, 0x37, 0x20,
+	0x32, 0x30, 0x38, 0x2e, 0x38, 0x38, 0x35, 0x20, 0x31, 0x32, 0x30, 0x38, 0x2e, 0x33, 0x32, 0x20,
+	0x32, 0x30, 0x35, 0x2e, 0x35, 0x31, 0x38, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x33, 0x20,
+	0x32, 0x32, 0x30, 0x2e, 0x32, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x36, 0x33, 0x2e, 0x30,
+	0x33, 0x20, 0x32, 0x33, 0x33, 0x2e, 0x33, 0x34, 0x34, 0x20, 0x31, 0x32, 0x38, 0x32, 0x2e, 0x31,
+	0x36, 0x20, 0x32, 0x35, 0x36, 0x2e, 0x30, 0x32, 0x34, 0x20, 0x31, 0x32, 0x39, 0x30, 0x2e, 0x37,
+	0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x32, 0x36, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x39, 0x39,
+	0x20, 0x33, 0x30, 0x38, 0x2e, 0x39, 0x32, 0x33, 0x20, 0x31, 0x32, 0x39, 0x34, 0x2e, 0x35, 0x36,
+	0x20, 0x33, 0x32, 0x39, 0x2e, 0x33, 0x38, 0x37, 0x20, 0x31, 0x32, 0x39, 0x36, 0x2e, 0x33, 0x32,
+	0x20, 0x33, 0x35, 0x34, 0x2e, 0x36, 0x35, 0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x30, 0x2e,
+	0x37, 0x39, 0x20, 0x34, 0x31, 0x38, 0x2e, 0x39, 0x33, 0x35, 0x20, 0x31, 0x32, 0x38, 0x33, 0x2e,
+	0x30, 0x38, 0x20, 0x34, 0x37, 0x32, 0x2e, 0x30, 0x38, 0x35, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e,
+	0x38, 0x39, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x31, 0x34,
+	0x2e, 0x39, 0x37, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x39, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32,
+	0x31, 0x34, 0x2e, 0x39, 0x39, 0x20, 0x36, 0x36, 0x39, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x31, 0x32,
+	0x31, 0x31, 0x2e, 0x31, 0x31, 0x20, 0x37, 0x31, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x31, 0x32,
+	0x32, 0x33, 0x2e, 0x35, 0x35, 0x20, 0x37, 0x36, 0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x32, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x30, 0x34, 0x37, 0x20,
+	0x31, 0x32, 0x36, 0x36, 0x2e, 0x38, 0x31, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x33, 0x35, 0x36, 0x20,
+	0x31, 0x33, 0x30, 0x33, 0x2e, 0x38, 0x36, 0x20, 0x38, 0x37, 0x30, 0x2e, 0x33, 0x31, 0x33, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x38, 0x39, 0x20, 0x39, 0x31, 0x30, 0x2e, 0x38, 0x36,
+	0x39, 0x20, 0x31, 0x33, 0x38, 0x36, 0x2e, 0x30, 0x39, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x36, 0x39,
+	0x38, 0x20, 0x31, 0x34, 0x32, 0x38, 0x2e, 0x31, 0x32, 0x20, 0x39, 0x39, 0x34, 0x2e, 0x32, 0x31,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x39, 0x31, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x30, 0x35, 0x35,
+	0x2e, 0x36, 0x39, 0x20, 0x31, 0x35, 0x33, 0x32, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x31, 0x34, 0x37,
+	0x2e, 0x32, 0x35, 0x20, 0x31, 0x35, 0x34, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x32, 0x33, 0x34,
+	0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x35, 0x35, 0x39, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x33,
+	0x34, 0x35, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x34,
+	0x35, 0x36, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x34, 0x36, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x35,
+	0x34, 0x34, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x34, 0x2e, 0x35, 0x34, 0x20,
+	0x31, 0x36, 0x33, 0x31, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x38, 0x38, 0x20,
+	0x31, 0x36, 0x38, 0x31, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x31, 0x31, 0x20,
+	0x31, 0x36, 0x39, 0x35, 0x2e, 0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x34, 0x2e, 0x36,
+	0x37, 0x20, 0x31, 0x36, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x37,
+	0x37, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x36, 0x33, 0x2e, 0x35, 0x20,
+	0x31, 0x36, 0x39, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e, 0x32,
+	0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x36, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x31, 0x34, 0x20, 0x31,
+	0x36, 0x39, 0x38, 0x2e, 0x37, 0x32, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x38, 0x34, 0x39, 0x20, 0x31,
+	0x36, 0x39, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x37, 0x38, 0x38, 0x2e, 0x31, 0x33, 0x32,
+	0x20, 0x31, 0x36, 0x39, 0x36, 0x2e, 0x35, 0x33, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x38, 0x32, 0x37,
+	0x20, 0x31, 0x36, 0x35, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x36, 0x31, 0x37, 0x2e, 0x37, 0x37, 0x36,
+	0x20, 0x31, 0x35, 0x37, 0x37, 0x2e, 0x30, 0x32, 0x20, 0x43, 0x20, 0x35, 0x30, 0x31, 0x2e, 0x39,
+	0x34, 0x35, 0x20, 0x31, 0x34, 0x35, 0x33, 0x2e, 0x30, 0x36, 0x20, 0x34, 0x37, 0x31, 0x2e, 0x36,
+	0x32, 0x39, 0x20, 0x31, 0x32, 0x37, 0x31, 0x2e, 0x37, 0x38, 0x20, 0x35, 0x34, 0x30, 0x2e, 0x38,
+	0x32, 0x34, 0x20, 0x31, 0x31, 0x31, 0x36, 0x2e, 0x38, 0x37, 0x20, 0x43, 0x20, 0x35, 0x35, 0x36,
+	0x2e, 0x39, 0x36, 0x34, 0x20, 0x31, 0x30, 0x37, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x35, 0x37, 0x39,
+	0x2e, 0x33, 0x38, 0x32, 0x20, 0x31, 0x30, 0x33, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x30, 0x38,
+	0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x31, 0x31, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x36, 0x32,
+	0x30, 0x2e, 0x32, 0x31, 0x31, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x36, 0x33, 0x32,
+	0x2e, 0x34, 0x33, 0x20, 0x39, 0x38, 0x37, 0x2e, 0x32, 0x31, 0x38, 0x20, 0x36, 0x34, 0x34, 0x2e,
+	0x34, 0x38, 0x20, 0x39, 0x37, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x37, 0x35, 0x33,
+	0x2e, 0x33, 0x30, 0x36, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20, 0x37, 0x37,
+	0x39, 0x2e, 0x32, 0x34, 0x31, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x32, 0x33, 0x20, 0x38, 0x30, 0x35,
+	0x2e, 0x33, 0x39, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x36, 0x35, 0x35, 0x20, 0x38, 0x32, 0x30, 0x2e,
+	0x38, 0x36, 0x34, 0x20, 0x37, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x34, 0x20, 0x43, 0x20, 0x38, 0x34,
+	0x31, 0x2e, 0x38, 0x39, 0x32, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x38, 0x35, 0x33, 0x20, 0x38, 0x33,
+	0x37, 0x2e, 0x34, 0x34, 0x36, 0x20, 0x36, 0x39, 0x31, 0x2e, 0x31, 0x31, 0x31, 0x20, 0x38, 0x33,
+	0x37, 0x2e, 0x32, 0x34, 0x38, 0x20, 0x36, 0x34, 0x30, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x43, 0x20,
+	0x38, 0x33, 0x36, 0x2e, 0x39, 0x36, 0x20, 0x35, 0x39, 0x31, 0x2e, 0x35, 0x39, 0x32, 0x20, 0x38,
+	0x33, 0x37, 0x2e, 0x32, 0x30, 0x32, 0x20, 0x35, 0x34, 0x32, 0x2e, 0x36, 0x38, 0x32, 0x20, 0x38,
+	0x33, 0x37, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x37, 0x37, 0x39, 0x20, 0x43,
+	0x20, 0x37, 0x36, 0x36, 0x2e, 0x31, 0x32, 0x32, 0x20, 0x34, 0x37, 0x30, 0x2e, 0x38, 0x36, 0x33,
+	0x20, 0x37, 0x35, 0x34, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x34, 0x32, 0x32, 0x2e, 0x31, 0x34, 0x34,
+	0x20, 0x37, 0x35, 0x37, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x37, 0x32, 0x38,
+	0x20, 0x43, 0x20, 0x37, 0x35, 0x38, 0x2e, 0x35, 0x35, 0x33, 0x20, 0x33, 0x31, 0x35, 0x2e, 0x37,
+	0x31, 0x34, 0x20, 0x37, 0x35, 0x31, 0x2e, 0x34, 0x36, 0x37, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x38,
+	0x38, 0x39, 0x20, 0x37, 0x37, 0x39, 0x2e, 0x36, 0x39, 0x38, 0x20, 0x32, 0x34, 0x39, 0x2e, 0x38,
+	0x35, 0x38, 0x20, 0x43, 0x20, 0x38, 0x30, 0x30, 0x2e, 0x35, 0x35, 0x38, 0x20, 0x32, 0x32, 0x34,
+	0x2e, 0x37, 0x31, 0x33, 0x20, 0x38, 0x32, 0x32, 0x2e, 0x37, 0x33, 0x35, 0x20, 0x32, 0x31, 0x33,
+	0x2e, 0x32, 0x36, 0x31, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39,
+	0x2e, 0x33, 0x37, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e, 0x34,
+	0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x33, 0x2e, 0x38, 0x31, 0x37, 0x20, 0x31, 0x30, 0x34, 0x35,
+	0x2e, 0x35, 0x33, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x30, 0x36, 0x31,
+	0x2e, 0x33, 0x38, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38, 0x35,
+	0x2e, 0x39, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x30,
+	0x39, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x30, 0x33, 0x38, 0x2e, 0x33, 0x32, 0x20, 0x31, 0x31,
+	0x30, 0x33, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x31,
+	0x31, 0x31, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x35, 0x2e, 0x37, 0x36, 0x20,
+	0x31, 0x31, 0x35, 0x37, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x32, 0x36, 0x39, 0x2e, 0x34, 0x32, 0x20,
+	0x31, 0x31, 0x36, 0x32, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x33, 0x37, 0x35, 0x2e, 0x37, 0x36, 0x20,
+	0x31, 0x31, 0x33, 0x35, 0x2e, 0x38, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x35, 0x2e, 0x34,
+	0x34, 0x20, 0x31, 0x31, 0x33, 0x31, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x31, 0x33, 0x2e, 0x35,
+	0x20, 0x31, 0x31, 0x32, 0x34, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x34, 0x33, 0x32, 0x2e, 0x35, 0x32,
+	0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x33, 0x2e, 0x32,
+	0x33, 0x20, 0x31, 0x31, 0x33, 0x30, 0x2e, 0x33, 0x36, 0x20, 0x31, 0x34, 0x35, 0x34, 0x2e, 0x38,
+	0x37, 0x20, 0x31, 0x31, 0x36, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e, 0x31,
+	0x31, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x35, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31, 0x35,
+	0x2e, 0x32, 0x32, 0x20, 0x31, 0x33, 0x35, 0x36, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x34, 0x32, 0x39,
+	0x2e, 0x35, 0x38, 0x20, 0x31, 0x35, 0x36, 0x31, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x32, 0x34, 0x34,
+	0x2e, 0x32, 0x36, 0x20, 0x31, 0x36, 0x31, 0x34, 0x2e, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31,
+	0x39, 0x36, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x31,
+	0x35, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x31,
+	0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x4c, 0x20,
+	0x31, 0x30, 0x30, 0x38, 0x2e, 0x37, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x43,
+	0x20, 0x38, 0x38, 0x35, 0x2e, 0x33, 0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x31, 0x34,
+	0x20, 0x37, 0x38, 0x35, 0x2e, 0x33, 0x30, 0x31, 0x20, 0x31, 0x36, 0x33, 0x38, 0x2e, 0x31, 0x35,
+	0x20, 0x36, 0x38, 0x35, 0x2e, 0x38, 0x38, 0x39, 0x20, 0x31, 0x35, 0x34, 0x38, 0x2e, 0x34, 0x38,
+	0x20, 0x43, 0x20, 0x35, 0x35, 0x38, 0x2e, 0x32, 0x39, 0x33, 0x20, 0x31, 0x34, 0x33, 0x33, 0x2e,
+	0x33, 0x38, 0x20, 0x35, 0x34, 0x31, 0x2e, 0x39, 0x33, 0x32, 0x20, 0x31, 0x32, 0x34, 0x31, 0x2e,
+	0x34, 0x39, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x30, 0x37, 0x37, 0x20, 0x31, 0x30, 0x39, 0x38, 0x2e,
+	0x30, 0x37, 0x20, 0x43, 0x20, 0x36, 0x33, 0x36, 0x2e, 0x39, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38,
+	0x36, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x36, 0x31, 0x36, 0x20, 0x31, 0x30, 0x38,
+	0x37, 0x2e, 0x35, 0x36, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x38, 0x33, 0x2e,
+	0x32, 0x35, 0x20, 0x43, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x30, 0x36, 0x31,
+	0x2e, 0x38, 0x37, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x31, 0x30, 0x34, 0x39,
+	0x2e, 0x31, 0x34, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37,
+	0x2e, 0x34, 0x38, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c,
+	0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x72, 0x67, 0x62, 0x28, 0x32, 0x33, 0x30, 0x2c, 0x31, 0x32, 0x36, 0x2c, 0x33, 0x34, 0x29, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x31, 0x30,
+	0x35, 0x31, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x38, 0x31, 0x34, 0x2e, 0x38, 0x38, 0x33, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x36, 0x33, 0x20, 0x38, 0x32, 0x37, 0x2e, 0x36, 0x39, 0x36, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x37, 0x38, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x38, 0x32, 0x33, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x38, 0x31, 0x20, 0x43, 0x20, 0x38, 0x39, 0x32, 0x2e, 0x37, 0x36,
+	0x39, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x33, 0x37, 0x20, 0x39, 0x34, 0x39, 0x2e, 0x39, 0x36,
+	0x20, 0x31, 0x30, 0x36, 0x34, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x37, 0x33,
+	0x20, 0x31, 0x30, 0x38, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x31, 0x2e,
+	0x39, 0x38, 0x20, 0x31, 0x30, 0x39, 0x36, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x30, 0x34, 0x30, 0x2e,
+	0x31, 0x35, 0x20, 0x31, 0x31, 0x30, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x36, 0x30, 0x2e,
+	0x35, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35,
+	0x2e, 0x32, 0x31, 0x20, 0x31, 0x31, 0x36, 0x38, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x33, 0x31, 0x35,
+	0x2e, 0x32, 0x37, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x35, 0x36, 0x20, 0x31, 0x34, 0x33, 0x31,
+	0x2e, 0x34, 0x39, 0x20, 0x31, 0x31, 0x32, 0x31, 0x2e, 0x33, 0x31, 0x20, 0x43, 0x20, 0x31, 0x34,
+	0x33, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x31, 0x33, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x34, 0x34,
+	0x34, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x31, 0x34, 0x37, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x34, 0x34,
+	0x39, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x31, 0x35, 0x39, 0x2e, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31,
+	0x35, 0x31, 0x35, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x33, 0x33, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x31,
+	0x34, 0x34, 0x31, 0x2e, 0x34, 0x35, 0x20, 0x31, 0x35, 0x33, 0x37, 0x2e, 0x35, 0x35, 0x20, 0x31,
+	0x32, 0x36, 0x30, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x36, 0x30, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x34, 0x39, 0x2e, 0x38, 0x33, 0x20, 0x31, 0x36, 0x30, 0x39, 0x2e, 0x39, 0x38,
+	0x20, 0x31, 0x32, 0x33, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x31, 0x36, 0x31, 0x33, 0x20, 0x31, 0x32,
+	0x32, 0x37, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x36, 0x31, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x43, 0x20,
+	0x31, 0x31, 0x36, 0x35, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x39, 0x35, 0x20,
+	0x31, 0x30, 0x38, 0x35, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x36, 0x32, 0x33, 0x2e, 0x39, 0x34, 0x20,
+	0x31, 0x30, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x4c,
+	0x20, 0x39, 0x34, 0x30, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x34, 0x35,
+	0x20, 0x43, 0x20, 0x39, 0x30, 0x30, 0x2e, 0x30, 0x34, 0x36, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e,
+	0x36, 0x39, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x36, 0x32, 0x35, 0x2e, 0x35,
+	0x37, 0x20, 0x38, 0x33, 0x33, 0x2e, 0x36, 0x37, 0x36, 0x20, 0x31, 0x36, 0x31, 0x37, 0x2e, 0x38,
+	0x31, 0x20, 0x43, 0x20, 0x37, 0x39, 0x34, 0x2e, 0x36, 0x31, 0x32, 0x20, 0x31, 0x36, 0x31, 0x30,
+	0x2e, 0x34, 0x38, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x33, 0x35, 0x33, 0x20, 0x31, 0x35, 0x39, 0x35,
+	0x2e, 0x36, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x39, 0x38, 0x38, 0x20, 0x31, 0x35, 0x37, 0x34, 0x2e,
+	0x30, 0x31, 0x20, 0x43, 0x20, 0x36, 0x35, 0x32, 0x2e, 0x34, 0x35, 0x37, 0x20, 0x31, 0x35, 0x32,
+	0x37, 0x2e, 0x39, 0x37, 0x20, 0x36, 0x30, 0x34, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x35, 0x31,
+	0x2e, 0x37, 0x20, 0x35, 0x38, 0x36, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x31, 0x33, 0x36, 0x39, 0x2e,
+	0x32, 0x39, 0x20, 0x43, 0x20, 0x35, 0x36, 0x35, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x31, 0x32, 0x37,
+	0x34, 0x2e, 0x35, 0x33, 0x20, 0x35, 0x38, 0x33, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x31, 0x31, 0x37,
+	0x35, 0x2e, 0x34, 0x34, 0x20, 0x36, 0x33, 0x36, 0x2e, 0x37, 0x39, 0x34, 0x20, 0x31, 0x30, 0x39,
+	0x34, 0x2e, 0x30, 0x39, 0x20, 0x43, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x31,
+	0x30, 0x38, 0x39, 0x2e, 0x36, 0x35, 0x20, 0x36, 0x36, 0x30, 0x2e, 0x37, 0x38, 0x37, 0x20, 0x31,
+	0x30, 0x38, 0x34, 0x2e, 0x37, 0x35, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x34, 0x33, 0x35, 0x20, 0x31,
+	0x30, 0x38, 0x31, 0x2e, 0x34, 0x37, 0x20, 0x43, 0x20, 0x37, 0x31, 0x38, 0x2e, 0x30, 0x37, 0x39,
+	0x20, 0x31, 0x30, 0x36, 0x35, 0x2e, 0x33, 0x20, 0x37, 0x35, 0x38, 0x2e, 0x32, 0x34, 0x32, 0x20,
+	0x31, 0x30, 0x35, 0x35, 0x2e, 0x31, 0x32, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20,
+	0x31, 0x30, 0x35, 0x31, 0x2e, 0x34, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c,
+	0x32, 0x35, 0x35, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39, 0x31, 0x35, 0x2e, 0x30,
+	0x30, 0x36, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x35,
+	0x30, 0x2e, 0x30, 0x39, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x32, 0x38, 0x20, 0x43, 0x20, 0x31, 0x30,
+	0x37, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x32, 0x37, 0x31, 0x20, 0x31, 0x31,
+	0x30, 0x39, 0x2e, 0x39, 0x34, 0x20, 0x34, 0x39, 0x34, 0x2e, 0x36, 0x36, 0x33, 0x20, 0x31, 0x31,
+	0x33, 0x38, 0x2e, 0x31, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x37, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x31,
+	0x33, 0x37, 0x2e, 0x39, 0x35, 0x20, 0x36, 0x34, 0x33, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x31, 0x33, 0x38, 0x2e, 0x30, 0x32, 0x20, 0x37, 0x30, 0x33, 0x2e, 0x32, 0x32, 0x37, 0x20,
+	0x31, 0x31, 0x33, 0x35, 0x2e, 0x34, 0x33, 0x20, 0x37, 0x36, 0x34, 0x2e, 0x31, 0x35, 0x38, 0x20,
+	0x31, 0x31, 0x36, 0x34, 0x2e, 0x34, 0x32, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x37, 0x31, 0x32,
+	0x20, 0x31, 0x32, 0x32, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x39, 0x30, 0x32, 0x2e, 0x33, 0x30, 0x33,
+	0x20, 0x31, 0x32, 0x37, 0x36, 0x2e, 0x37, 0x37, 0x20, 0x39, 0x34, 0x38, 0x2e, 0x39, 0x32, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x31, 0x34, 0x2e, 0x35, 0x37, 0x20, 0x39, 0x38, 0x35, 0x2e, 0x33, 0x31,
+	0x35, 0x20, 0x31, 0x33, 0x35, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x30,
+	0x34, 0x20, 0x31, 0x33, 0x38, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x31,
+	0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x39, 0x34, 0x2e, 0x30,
+	0x38, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x30,
+	0x33, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x30, 0x35, 0x33, 0x2e, 0x39,
+	0x37, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x36,
+	0x2e, 0x36, 0x31, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x33, 0x36,
+	0x2e, 0x30, 0x39, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x30, 0x32, 0x38,
+	0x2e, 0x31, 0x31, 0x20, 0x43, 0x20, 0x39, 0x39, 0x36, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x30, 0x30,
+	0x36, 0x2e, 0x31, 0x36, 0x20, 0x39, 0x34, 0x37, 0x2e, 0x31, 0x34, 0x39, 0x20, 0x39, 0x39, 0x32,
+	0x2e, 0x30, 0x30, 0x39, 0x20, 0x38, 0x39, 0x36, 0x2e, 0x34, 0x32, 0x20, 0x39, 0x38, 0x36, 0x2e,
+	0x32, 0x33, 0x35, 0x20, 0x43, 0x20, 0x38, 0x35, 0x36, 0x2e, 0x30, 0x34, 0x20, 0x39, 0x38, 0x31,
+	0x2e, 0x34, 0x39, 0x31, 0x20, 0x38, 0x31, 0x33, 0x2e, 0x37, 0x39, 0x39, 0x20, 0x39, 0x38, 0x31,
+	0x2e, 0x36, 0x32, 0x39, 0x20, 0x37, 0x37, 0x33, 0x2e, 0x34, 0x35, 0x39, 0x20, 0x39, 0x38, 0x37,
+	0x2e, 0x34, 0x30, 0x36, 0x20, 0x43, 0x20, 0x37, 0x36, 0x35, 0x2e, 0x35, 0x31, 0x32, 0x20, 0x39,
+	0x38, 0x38, 0x2e, 0x35, 0x34, 0x35, 0x20, 0x37, 0x32, 0x38, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x39,
+	0x39, 0x37, 0x2e, 0x33, 0x38, 0x39, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39,
+	0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43, 0x20, 0x37, 0x34, 0x31, 0x2e, 0x36, 0x37, 0x32,
+	0x20, 0x39, 0x38, 0x31, 0x2e, 0x38, 0x34, 0x36, 0x20, 0x37, 0x36, 0x33, 0x2e, 0x39, 0x33, 0x36,
+	0x20, 0x39, 0x35, 0x37, 0x2e, 0x30, 0x37, 0x35, 0x20, 0x37, 0x38, 0x31, 0x2e, 0x35, 0x33, 0x32,
+	0x20, 0x39, 0x34, 0x31, 0x2e, 0x33, 0x34, 0x31, 0x20, 0x43, 0x20, 0x38, 0x34, 0x38, 0x2e, 0x31,
+	0x34, 0x20, 0x38, 0x38, 0x31, 0x2e, 0x37, 0x38, 0x32, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x31, 0x35,
+	0x37, 0x20, 0x38, 0x32, 0x39, 0x2e, 0x32, 0x38, 0x38, 0x20, 0x39, 0x31, 0x32, 0x2e, 0x36, 0x38,
+	0x31, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x32, 0x34, 0x35, 0x20, 0x43, 0x20, 0x39, 0x31, 0x36, 0x2e,
+	0x33, 0x32, 0x32, 0x20, 0x37, 0x30, 0x35, 0x2e, 0x35, 0x33, 0x31, 0x20, 0x39, 0x31, 0x34, 0x2e,
+	0x39, 0x36, 0x34, 0x20, 0x36, 0x37, 0x32, 0x2e, 0x36, 0x33, 0x32, 0x20, 0x39, 0x31, 0x34, 0x2e,
+	0x39, 0x36, 0x20, 0x36, 0x34, 0x32, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x4c, 0x20, 0x39, 0x31, 0x35,
+	0x2e, 0x30, 0x30, 0x36, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x7a, 0x22, 0x2f,
+	0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72,
+	0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30,
+	0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30,
+	0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x34, 0x37,
+	0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x43, 0x20, 0x38, 0x36, 0x34, 0x2e,
+	0x35, 0x34, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x39, 0x20, 0x38, 0x36, 0x34, 0x2e,
+	0x36, 0x32, 0x32, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x31, 0x20, 0x38, 0x36, 0x34, 0x2e,
+	0x36, 0x39, 0x34, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x38, 0x33, 0x20, 0x43, 0x20, 0x38, 0x38,
+	0x39, 0x2e, 0x32, 0x36, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x37, 0x36, 0x33, 0x20, 0x39, 0x31,
+	0x34, 0x2e, 0x39, 0x36, 0x38, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x39, 0x33,
+	0x39, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x32, 0x35, 0x20, 0x43, 0x20,
+	0x39, 0x37, 0x36, 0x2e, 0x33, 0x38, 0x31, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x33, 0x38, 0x20,
+	0x31, 0x30, 0x31, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x35, 0x36, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x33, 0x31, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x37, 0x39, 0x20,
+	0x4c, 0x20, 0x31, 0x31, 0x34, 0x30, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x39,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x33, 0x2e, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30,
+	0x34, 0x34, 0x20, 0x31, 0x32, 0x32, 0x36, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x31, 0x2e, 0x36,
+	0x30, 0x36, 0x20, 0x31, 0x32, 0x32, 0x35, 0x2e, 0x39, 0x31, 0x20, 0x33, 0x32, 0x32, 0x2e, 0x38,
+	0x35, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x35, 0x2e, 0x36, 0x31, 0x20, 0x33, 0x34, 0x37,
+	0x2e, 0x30, 0x34, 0x32, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33,
+	0x2e, 0x33, 0x30, 0x34, 0x20, 0x31, 0x32, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x33, 0x39, 0x37,
+	0x2e, 0x30, 0x33, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x34, 0x20, 0x34,
+	0x31, 0x34, 0x2e, 0x35, 0x37, 0x37, 0x20, 0x31, 0x32, 0x30, 0x35, 0x2e, 0x31, 0x39, 0x20, 0x34,
+	0x32, 0x31, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x31, 0x38, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x34, 0x32,
+	0x32, 0x2e, 0x30, 0x30, 0x38, 0x20, 0x4c, 0x20, 0x39, 0x36, 0x31, 0x2e, 0x39, 0x39, 0x39, 0x20,
+	0x34, 0x32, 0x33, 0x2e, 0x30, 0x31, 0x36, 0x20, 0x4c, 0x20, 0x38, 0x39, 0x34, 0x2e, 0x34, 0x38,
+	0x32, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x31, 0x34, 0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x32, 0x2e,
+	0x36, 0x37, 0x33, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x31, 0x37, 0x33, 0x20, 0x38, 0x34, 0x36, 0x2e,
+	0x38, 0x37, 0x34, 0x20, 0x34, 0x32, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x38, 0x33, 0x37, 0x2e,
+	0x39, 0x33, 0x39, 0x20, 0x34, 0x31, 0x38, 0x2e, 0x36, 0x37, 0x38, 0x20, 0x43, 0x20, 0x38, 0x32,
+	0x30, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x34, 0x30, 0x35, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x38, 0x32,
+	0x34, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33, 0x2e, 0x33, 0x37, 0x39, 0x20, 0x38, 0x32,
+	0x34, 0x2e, 0x39, 0x35, 0x31, 0x20, 0x33, 0x35, 0x33, 0x2e, 0x39, 0x39, 0x38, 0x20, 0x43, 0x20,
+	0x38, 0x32, 0x35, 0x2e, 0x30, 0x31, 0x32, 0x20, 0x33, 0x31, 0x37, 0x2e, 0x32, 0x39, 0x36, 0x20,
+	0x38, 0x31, 0x38, 0x2e, 0x31, 0x32, 0x33, 0x20, 0x32, 0x38, 0x34, 0x2e, 0x35, 0x32, 0x20, 0x38,
+	0x36, 0x34, 0x2e, 0x34, 0x37, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31,
+	0x38, 0x37, 0x2c, 0x31, 0x33, 0x36, 0x2c, 0x34, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x20, 0x38, 0x37, 0x39, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33,
+	0x20, 0x4c, 0x20, 0x31, 0x30, 0x38, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36,
+	0x31, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x35, 0x32, 0x2e, 0x34, 0x32, 0x20, 0x32, 0x38, 0x33, 0x2e,
+	0x36, 0x34, 0x31, 0x20, 0x43, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x32, 0x38,
+	0x33, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x32, 0x38, 0x33,
+	0x2e, 0x31, 0x36, 0x37, 0x20, 0x31, 0x31, 0x39, 0x33, 0x2e, 0x33, 0x34, 0x20, 0x32, 0x38, 0x34,
+	0x2e, 0x33, 0x37, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x36, 0x20, 0x32, 0x38,
+	0x36, 0x2e, 0x30, 0x36, 0x38, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x34, 0x31, 0x20, 0x33, 0x30,
+	0x34, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x30, 0x38, 0x20, 0x33, 0x32,
+	0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x37, 0x20,
+	0x33, 0x33, 0x37, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x31, 0x35, 0x20,
+	0x33, 0x35, 0x31, 0x2e, 0x39, 0x34, 0x33, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x39, 0x35, 0x20,
+	0x33, 0x36, 0x37, 0x2e, 0x31, 0x32, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37,
+	0x37, 0x20, 0x33, 0x38, 0x31, 0x2e, 0x32, 0x32, 0x31, 0x20, 0x31, 0x32, 0x32, 0x33, 0x2e, 0x38,
+	0x35, 0x20, 0x33, 0x39, 0x39, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x32, 0x31, 0x33, 0x2e, 0x33, 0x37,
+	0x20, 0x34, 0x31, 0x30, 0x2e, 0x34, 0x33, 0x32, 0x20, 0x43, 0x20, 0x31, 0x32, 0x30, 0x32, 0x2e,
+	0x39, 0x31, 0x20, 0x34, 0x32, 0x31, 0x2e, 0x31, 0x35, 0x33, 0x20, 0x31, 0x31, 0x38, 0x36, 0x2e,
+	0x32, 0x33, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x33, 0x35, 0x35, 0x20, 0x31, 0x31, 0x37, 0x32, 0x2e,
+	0x35, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x31, 0x39, 0x32, 0x20, 0x4c, 0x20, 0x39, 0x35, 0x31, 0x2e,
+	0x34, 0x37, 0x32, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x38,
+	0x35, 0x2e, 0x37, 0x38, 0x33, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x32, 0x37, 0x20, 0x43, 0x20, 0x38,
+	0x36, 0x31, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x33, 0x34, 0x35, 0x20, 0x38,
+	0x32, 0x38, 0x2e, 0x33, 0x30, 0x36, 0x20, 0x34, 0x32, 0x36, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x38,
+	0x32, 0x38, 0x2e, 0x38, 0x31, 0x36, 0x20, 0x33, 0x39, 0x30, 0x2e, 0x31, 0x35, 0x20, 0x43, 0x20,
+	0x38, 0x32, 0x39, 0x2e, 0x32, 0x30, 0x34, 0x20, 0x33, 0x36, 0x32, 0x2e, 0x38, 0x37, 0x20, 0x38,
+	0x32, 0x36, 0x2e, 0x37, 0x39, 0x33, 0x20, 0x33, 0x33, 0x33, 0x2e, 0x30, 0x31, 0x34, 0x20, 0x38,
+	0x33, 0x30, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x33, 0x30, 0x36, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x43,
+	0x20, 0x38, 0x33, 0x32, 0x2e, 0x38, 0x34, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x39, 0x36, 0x35,
+	0x20, 0x38, 0x36, 0x33, 0x2e, 0x30, 0x35, 0x34, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x37,
+	0x20, 0x38, 0x37, 0x39, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33,
+	0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65,
+	0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62,
+	0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x31,
+	0x32, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39, 0x20, 0x43, 0x20,
+	0x37, 0x31, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x37,
+	0x32, 0x30, 0x2e, 0x34, 0x36, 0x35, 0x20, 0x39, 0x39, 0x31, 0x2e, 0x39, 0x34, 0x32, 0x20, 0x37,
+	0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39, 0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43,
+	0x20, 0x37, 0x32, 0x33, 0x2e, 0x33, 0x34, 0x38, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x36, 0x36,
+	0x20, 0x37, 0x31, 0x37, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x31, 0x30, 0x30, 0x33, 0x2e, 0x32, 0x35,
+	0x20, 0x37, 0x31, 0x32, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39,
+	0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67,
+	0x3e, 0x0a
+};
+
+static const unsigned char icon_client_friend_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x54, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xb5, 0x92, 0xb1,
+	0x4b, 0x42, 0x51, 0x18, 0xc5, 0x7f, 0xdf, 0xf3, 0x69, 0x1a, 0x15, 0x34, 0x15, 0x41, 0x43, 0xb5,
+	0x59, 0x08, 0x46, 0x11, 0x4e, 0x0d, 0x2d, 0xd1, 0xd0, 0x5c, 0x0d, 0xa9, 0x10, 0xd1, 0x56, 0xb4,
+	0x34, 0x34, 0x15, 0x89, 0x7f, 0x40, 0x10, 0x98, 0x43, 0x36, 0xb7, 0xb5, 0x07, 0x6d, 0x36, 0xa4,
+	0x90, 0xd1, 0x83, 0xa8, 0x10, 0x22, 0x29, 0x5a, 0x82, 0x8a, 0x0c, 0xcd, 0x7b, 0x1b, 0x0a, 0x31,
+	0x7d, 0x2a, 0x04, 0x7e, 0xdb, 0xfd, 0x71, 0xce, 0xb9, 0xe7, 0xbb, 0x5c, 0x68, 0xd5, 0x84, 0x0e,
+	0xb2, 0xee, 0x85, 0xbd, 0x4c, 0x77, 0x33, 0x9d, 0xd8, 0xc1, 0xc5, 0x7d, 0x6b, 0x43, 0x84, 0x6d,
+	0xc0, 0x85, 0xc8, 0xf1, 0xc7, 0x6b, 0xc7, 0xdc, 0xd1, 0x7a, 0x7f, 0xde, 0x4e, 0x6b, 0x54, 0x83,
+	0x70, 0xcc, 0x1a, 0x15, 0x21, 0x0a, 0xb8, 0x00, 0xd0, 0x7a, 0xb6, 0xbd, 0xeb, 0x7d, 0xad, 0x5e,
+	0x03, 0xb3, 0x1a, 0x28, 0x83, 0x91, 0xda, 0x66, 0xda, 0x07, 0x90, 0x0b, 0x8c, 0xf9, 0x15, 0xce,
+	0x67, 0x87, 0x2e, 0xf4, 0xf4, 0x9d, 0xa5, 0xd2, 0xb6, 0x0d, 0xa4, 0x44, 0x12, 0x28, 0xfc, 0xb1,
+	0xa3, 0x4f, 0x73, 0x81, 0x31, 0x3f, 0x48, 0xda, 0xe0, 0xeb, 0x5e, 0x8b, 0x91, 0x7a, 0x0c, 0x8c,
+	0x4f, 0xda, 0x06, 0x24, 0x56, 0xbc, 0x37, 0x68, 0x59, 0xd0, 0x70, 0x0d, 0x3c, 0xa1, 0x75, 0x74,
+	0xf0, 0xc1, 0x1b, 0x2f, 0xb4, 0x7d, 0x65, 0x01, 0xeb, 0xc7, 0x23, 0xb7, 0xba, 0xa0, 0xae, 0xa8,
+	0xad, 0x0a, 0xa1, 0x7d, 0x6b, 0x4e, 0xc1, 0x8c, 0x88, 0xb8, 0x7f, 0xef, 0xd7, 0x1a, 0x7d, 0x61,
+	0x1a, 0x8e, 0xdd, 0x48, 0x62, 0xde, 0xad, 0x8a, 0x66, 0x44, 0x89, 0xb9, 0xd5, 0x9f, 0x4c, 0xe6,
+	0x6a, 0x02, 0x82, 0x71, 0x6b, 0x07, 0xd8, 0xb4, 0x7f, 0x2e, 0x32, 0x62, 0x7a, 0x26, 0x12, 0xe1,
+	0x81, 0xcf, 0x4a, 0x58, 0x5e, 0x61, 0x39, 0x76, 0xee, 0x04, 0x56, 0xeb, 0x98, 0x01, 0x7c, 0x94,
+	0xf2, 0xd3, 0xd5, 0xb0, 0x1c, 0x50, 0x72, 0x78, 0x3a, 0x81, 0x8e, 0x06, 0x01, 0xa0, 0x74, 0x6f,
+	0xdd, 0x80, 0xa2, 0xd3, 0xb0, 0xfd, 0x54, 0xcd, 0xa6, 0x1c, 0x90, 0xf7, 0xa8, 0x37, 0xe0, 0xa5,
+	0xa1, 0x5a, 0xe4, 0xae, 0x06, 0x55, 0x1e, 0x82, 0xb1, 0xcb, 0x21, 0x0c, 0x73, 0xca, 0xde, 0xac,
+	0xee, 0x0e, 0x97, 0x86, 0x4f, 0xfe, 0xd3, 0xb2, 0xb5, 0xf3, 0x0d, 0xc0, 0x7a, 0x67, 0x0b, 0x82,
+	0x49, 0x4e, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_friend_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39, 0x35, 0x2c, 0x31,
+	0x35, 0x35, 0x2c, 0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x34,
+	0x39, 0x2e, 0x38, 0x32, 0x33, 0x20, 0x39, 0x33, 0x38, 0x2e, 0x34, 0x39, 0x34, 0x20, 0x4c, 0x20,
+	0x39, 0x38, 0x38, 0x2e, 0x37, 0x34, 0x39, 0x20, 0x39, 0x33, 0x38, 0x2e, 0x32, 0x34, 0x31, 0x20,
+	0x4c, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x33, 0x33, 0x20, 0x39, 0x33, 0x38, 0x2e, 0x34, 0x32,
+	0x35, 0x20, 0x43, 0x20, 0x31, 0x30, 0x39, 0x32, 0x2e, 0x39, 0x38, 0x20, 0x39, 0x33, 0x38, 0x2e,
+	0x34, 0x37, 0x32, 0x20, 0x31, 0x31, 0x31, 0x34, 0x2e, 0x32, 0x33, 0x20, 0x39, 0x33, 0x38, 0x2e,
+	0x31, 0x31, 0x37, 0x20, 0x31, 0x31, 0x33, 0x33, 0x2e, 0x36, 0x39, 0x20, 0x39, 0x33, 0x39, 0x2e,
+	0x37, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x32, 0x31, 0x38, 0x2e, 0x38, 0x32, 0x20, 0x39, 0x34,
+	0x37, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x32, 0x39, 0x38, 0x2e, 0x36, 0x31, 0x20, 0x39, 0x38, 0x34,
+	0x2e, 0x33, 0x34, 0x34, 0x20, 0x31, 0x33, 0x35, 0x38, 0x2e, 0x39, 0x20, 0x31, 0x30, 0x34, 0x34,
+	0x2e, 0x38, 0x39, 0x20, 0x43, 0x20, 0x31, 0x34, 0x31, 0x31, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x30,
+	0x39, 0x36, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x34, 0x34, 0x35, 0x2e, 0x36, 0x33, 0x20, 0x31, 0x31,
+	0x36, 0x33, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x34, 0x35, 0x36, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x32,
+	0x33, 0x36, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x34, 0x35, 0x39, 0x2e, 0x39, 0x35, 0x20,
+	0x31, 0x32, 0x35, 0x39, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e, 0x32, 0x20, 0x31,
+	0x32, 0x38, 0x30, 0x2e, 0x32, 0x39, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e, 0x33, 0x35, 0x20, 0x31,
+	0x33, 0x30, 0x33, 0x2e, 0x34, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e, 0x36, 0x39,
+	0x20, 0x31, 0x34, 0x37, 0x30, 0x2e, 0x30, 0x39, 0x20, 0x43, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e,
+	0x38, 0x20, 0x31, 0x35, 0x34, 0x30, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x34, 0x36, 0x39, 0x2e, 0x39,
+	0x31, 0x20, 0x31, 0x36, 0x30, 0x36, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x34, 0x31, 0x34, 0x2e, 0x38,
+	0x20, 0x31, 0x36, 0x36, 0x31, 0x2e, 0x37, 0x37, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x30, 0x2e,
+	0x39, 0x35, 0x20, 0x31, 0x36, 0x38, 0x35, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x33, 0x36, 0x30, 0x2e,
+	0x38, 0x34, 0x20, 0x31, 0x37, 0x30, 0x32, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x33, 0x32, 0x37, 0x2e,
+	0x38, 0x39, 0x20, 0x31, 0x37, 0x31, 0x30, 0x2e, 0x34, 0x31, 0x20, 0x43, 0x20, 0x31, 0x32, 0x39,
+	0x37, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x37, 0x31, 0x37, 0x2e, 0x38, 0x37, 0x20, 0x31, 0x32, 0x34,
+	0x36, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x37, 0x31, 0x35, 0x2e, 0x37, 0x31, 0x20, 0x31, 0x32, 0x31,
+	0x33, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x37, 0x31, 0x35, 0x2e, 0x36, 0x32, 0x20, 0x4c, 0x20, 0x31,
+	0x30, 0x38, 0x35, 0x2e, 0x35, 0x20, 0x31, 0x37, 0x31, 0x35, 0x2e, 0x33, 0x39, 0x20, 0x4c, 0x20,
+	0x36, 0x38, 0x39, 0x2e, 0x32, 0x38, 0x20, 0x31, 0x37, 0x31, 0x35, 0x2e, 0x34, 0x36, 0x20, 0x4c,
+	0x20, 0x35, 0x39, 0x31, 0x2e, 0x33, 0x33, 0x38, 0x20, 0x31, 0x37, 0x31, 0x35, 0x2e, 0x36, 0x35,
+	0x20, 0x43, 0x20, 0x35, 0x36, 0x37, 0x2e, 0x37, 0x31, 0x33, 0x20, 0x31, 0x37, 0x31, 0x35, 0x2e,
+	0x37, 0x20, 0x35, 0x33, 0x35, 0x2e, 0x31, 0x32, 0x20, 0x31, 0x37, 0x31, 0x36, 0x2e, 0x36, 0x33,
+	0x20, 0x35, 0x31, 0x32, 0x2e, 0x34, 0x36, 0x31, 0x20, 0x31, 0x37, 0x31, 0x32, 0x2e, 0x33, 0x32,
+	0x20, 0x43, 0x20, 0x34, 0x37, 0x39, 0x2e, 0x37, 0x32, 0x38, 0x20, 0x31, 0x37, 0x30, 0x36, 0x2e,
+	0x31, 0x34, 0x20, 0x34, 0x34, 0x39, 0x2e, 0x34, 0x35, 0x39, 0x20, 0x31, 0x36, 0x39, 0x30, 0x2e,
+	0x36, 0x39, 0x20, 0x34, 0x32, 0x35, 0x2e, 0x32, 0x35, 0x39, 0x20, 0x31, 0x36, 0x36, 0x37, 0x2e,
+	0x38, 0x31, 0x20, 0x43, 0x20, 0x33, 0x39, 0x32, 0x2e, 0x35, 0x36, 0x36, 0x20, 0x31, 0x36, 0x33,
+	0x36, 0x2e, 0x34, 0x32, 0x20, 0x33, 0x37, 0x33, 0x2e, 0x36, 0x37, 0x31, 0x20, 0x31, 0x35, 0x39,
+	0x34, 0x20, 0x33, 0x37, 0x34, 0x2e, 0x30, 0x35, 0x35, 0x20, 0x31, 0x35, 0x34, 0x39, 0x2e, 0x30,
+	0x32, 0x20, 0x43, 0x20, 0x33, 0x37, 0x34, 0x2e, 0x35, 0x33, 0x36, 0x20, 0x31, 0x34, 0x39, 0x32,
+	0x2e, 0x37, 0x34, 0x20, 0x33, 0x37, 0x34, 0x2e, 0x30, 0x35, 0x31, 0x20, 0x31, 0x34, 0x33, 0x35,
+	0x2e, 0x34, 0x36, 0x20, 0x33, 0x37, 0x34, 0x2e, 0x33, 0x35, 0x35, 0x20, 0x31, 0x33, 0x37, 0x39,
+	0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x33, 0x37, 0x34, 0x2e, 0x38, 0x33, 0x33, 0x20, 0x31, 0x32,
+	0x39, 0x31, 0x2e, 0x32, 0x32, 0x20, 0x33, 0x36, 0x35, 0x2e, 0x39, 0x30, 0x32, 0x20, 0x31, 0x32,
+	0x31, 0x37, 0x2e, 0x36, 0x20, 0x34, 0x30, 0x39, 0x2e, 0x32, 0x36, 0x34, 0x20, 0x31, 0x31, 0x33,
+	0x36, 0x2e, 0x34, 0x35, 0x20, 0x43, 0x20, 0x34, 0x33, 0x30, 0x2e, 0x32, 0x39, 0x37, 0x20, 0x31,
+	0x30, 0x39, 0x37, 0x2e, 0x30, 0x38, 0x20, 0x34, 0x34, 0x33, 0x2e, 0x30, 0x30, 0x36, 0x20, 0x31,
+	0x30, 0x37, 0x37, 0x2e, 0x38, 0x39, 0x20, 0x34, 0x37, 0x34, 0x2e, 0x39, 0x36, 0x39, 0x20, 0x31,
+	0x30, 0x34, 0x35, 0x2e, 0x32, 0x20, 0x43, 0x20, 0x35, 0x33, 0x35, 0x2e, 0x31, 0x30, 0x31, 0x20,
+	0x39, 0x38, 0x33, 0x2e, 0x37, 0x30, 0x33, 0x20, 0x36, 0x31, 0x33, 0x2e, 0x33, 0x33, 0x32, 0x20,
+	0x39, 0x34, 0x39, 0x2e, 0x39, 0x39, 0x33, 0x20, 0x36, 0x39, 0x38, 0x2e, 0x30, 0x34, 0x37, 0x20,
+	0x39, 0x34, 0x30, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x43, 0x20, 0x37, 0x31, 0x34, 0x2e, 0x32, 0x30,
+	0x36, 0x20, 0x39, 0x33, 0x38, 0x2e, 0x32, 0x32, 0x37, 0x20, 0x37, 0x33, 0x33, 0x2e, 0x33, 0x33,
+	0x38, 0x20, 0x39, 0x33, 0x38, 0x2e, 0x35, 0x38, 0x32, 0x20, 0x37, 0x34, 0x39, 0x2e, 0x38, 0x32,
+	0x33, 0x20, 0x39, 0x33, 0x38, 0x2e, 0x34, 0x39, 0x34, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39, 0x35, 0x2c, 0x31, 0x35, 0x35,
+	0x2c, 0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39, 0x30, 0x37, 0x2e,
+	0x39, 0x33, 0x38, 0x20, 0x32, 0x33, 0x38, 0x2e, 0x32, 0x35, 0x36, 0x20, 0x43, 0x20, 0x31, 0x30,
+	0x38, 0x39, 0x2e, 0x31, 0x32, 0x20, 0x32, 0x33, 0x34, 0x2e, 0x36, 0x31, 0x32, 0x20, 0x31, 0x32,
+	0x33, 0x38, 0x2e, 0x39, 0x31, 0x20, 0x33, 0x37, 0x38, 0x2e, 0x36, 0x32, 0x31, 0x20, 0x31, 0x32,
+	0x34, 0x32, 0x2e, 0x33, 0x39, 0x20, 0x35, 0x35, 0x39, 0x2e, 0x38, 0x30, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x34, 0x35, 0x2e, 0x38, 0x38, 0x20, 0x37, 0x34, 0x30, 0x2e, 0x39, 0x39, 0x31, 0x20,
+	0x31, 0x31, 0x30, 0x31, 0x2e, 0x37, 0x33, 0x20, 0x38, 0x39, 0x30, 0x2e, 0x36, 0x35, 0x32, 0x20,
+	0x39, 0x32, 0x30, 0x2e, 0x35, 0x34, 0x37, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x39, 0x37, 0x36, 0x20,
+	0x43, 0x20, 0x37, 0x33, 0x39, 0x2e, 0x35, 0x38, 0x35, 0x20, 0x38, 0x39, 0x37, 0x2e, 0x32, 0x39,
+	0x36, 0x20, 0x35, 0x39, 0x30, 0x2e, 0x31, 0x35, 0x31, 0x20, 0x37, 0x35, 0x33, 0x2e, 0x33, 0x37,
+	0x34, 0x20, 0x35, 0x38, 0x36, 0x2e, 0x36, 0x37, 0x31, 0x20, 0x35, 0x37, 0x32, 0x2e, 0x34, 0x31,
+	0x35, 0x20, 0x43, 0x20, 0x35, 0x38, 0x33, 0x2e, 0x31, 0x39, 0x32, 0x20, 0x33, 0x39, 0x31, 0x2e,
+	0x34, 0x35, 0x36, 0x20, 0x37, 0x32, 0x36, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x32, 0x34, 0x31, 0x2e,
+	0x38, 0x39, 0x36, 0x20, 0x39, 0x30, 0x37, 0x2e, 0x39, 0x33, 0x38, 0x20, 0x32, 0x33, 0x38, 0x2e,
+	0x32, 0x35, 0x36, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c,
+	0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x72, 0x67, 0x62, 0x28, 0x32, 0x32, 0x39, 0x2c, 0x35, 0x37, 0x2c, 0x35, 0x33, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x34, 0x39, 0x33, 0x2e, 0x31, 0x37, 0x20, 0x36, 0x30, 0x34,
+	0x2e, 0x33, 0x38, 0x31, 0x20, 0x43, 0x20, 0x31, 0x35, 0x33, 0x32, 0x2e, 0x36, 0x33, 0x20, 0x35,
+	0x39, 0x39, 0x2e, 0x30, 0x38, 0x35, 0x20, 0x31, 0x35, 0x37, 0x39, 0x2e, 0x39, 0x20, 0x36, 0x31,
+	0x37, 0x2e, 0x32, 0x36, 0x33, 0x20, 0x31, 0x36, 0x30, 0x33, 0x2e, 0x32, 0x34, 0x20, 0x36, 0x35,
+	0x30, 0x2e, 0x31, 0x33, 0x34, 0x20, 0x43, 0x20, 0x31, 0x36, 0x31, 0x35, 0x2e, 0x36, 0x31, 0x20,
+	0x36, 0x33, 0x32, 0x2e, 0x36, 0x35, 0x34, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x31, 0x34, 0x20,
+	0x36, 0x32, 0x33, 0x2e, 0x37, 0x36, 0x31, 0x20, 0x31, 0x36, 0x34, 0x38, 0x2e, 0x32, 0x34, 0x20,
+	0x36, 0x31, 0x34, 0x2e, 0x39, 0x34, 0x33, 0x20, 0x43, 0x20, 0x31, 0x37, 0x33, 0x33, 0x2e, 0x34,
+	0x38, 0x20, 0x35, 0x37, 0x37, 0x2e, 0x35, 0x34, 0x36, 0x20, 0x31, 0x38, 0x33, 0x38, 0x2e, 0x38,
+	0x31, 0x20, 0x36, 0x34, 0x31, 0x2e, 0x34, 0x34, 0x33, 0x20, 0x31, 0x38, 0x33, 0x37, 0x2e, 0x33,
+	0x34, 0x20, 0x37, 0x33, 0x36, 0x2e, 0x37, 0x33, 0x35, 0x20, 0x43, 0x20, 0x31, 0x38, 0x33, 0x36,
+	0x2e, 0x34, 0x31, 0x20, 0x37, 0x39, 0x37, 0x2e, 0x31, 0x38, 0x37, 0x20, 0x31, 0x38, 0x30, 0x31,
+	0x2e, 0x34, 0x35, 0x20, 0x38, 0x32, 0x30, 0x2e, 0x30, 0x35, 0x35, 0x20, 0x31, 0x37, 0x36, 0x31,
+	0x2e, 0x35, 0x39, 0x20, 0x38, 0x35, 0x38, 0x2e, 0x34, 0x33, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x36,
+	0x39, 0x33, 0x2e, 0x37, 0x20, 0x39, 0x32, 0x35, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x43, 0x20, 0x31,
+	0x36, 0x38, 0x34, 0x2e, 0x32, 0x34, 0x20, 0x39, 0x33, 0x34, 0x2e, 0x33, 0x36, 0x38, 0x20, 0x31,
+	0x36, 0x37, 0x34, 0x2e, 0x38, 0x38, 0x20, 0x39, 0x34, 0x33, 0x2e, 0x37, 0x33, 0x34, 0x20, 0x31,
+	0x36, 0x36, 0x35, 0x2e, 0x36, 0x33, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x32, 0x31, 0x20, 0x43, 0x20,
+	0x31, 0x36, 0x34, 0x39, 0x2e, 0x34, 0x35, 0x20, 0x39, 0x36, 0x39, 0x2e, 0x36, 0x33, 0x32, 0x20,
+	0x31, 0x36, 0x33, 0x37, 0x2e, 0x37, 0x32, 0x20, 0x39, 0x38, 0x34, 0x2e, 0x36, 0x37, 0x39, 0x20,
+	0x31, 0x36, 0x31, 0x33, 0x2e, 0x36, 0x20, 0x39, 0x38, 0x38, 0x2e, 0x34, 0x34, 0x38, 0x20, 0x43,
+	0x20, 0x31, 0x36, 0x30, 0x30, 0x2e, 0x33, 0x33, 0x20, 0x39, 0x39, 0x30, 0x2e, 0x35, 0x32, 0x31,
+	0x20, 0x31, 0x35, 0x37, 0x37, 0x2e, 0x35, 0x31, 0x20, 0x39, 0x38, 0x36, 0x2e, 0x34, 0x32, 0x36,
+	0x20, 0x31, 0x35, 0x36, 0x37, 0x2e, 0x37, 0x33, 0x20, 0x39, 0x37, 0x37, 0x2e, 0x36, 0x38, 0x20,
+	0x43, 0x20, 0x31, 0x35, 0x35, 0x32, 0x2e, 0x34, 0x38, 0x20, 0x39, 0x36, 0x34, 0x2e, 0x30, 0x34,
+	0x36, 0x20, 0x31, 0x35, 0x33, 0x36, 0x2e, 0x35, 0x38, 0x20, 0x39, 0x34, 0x37, 0x2e, 0x31, 0x30,
+	0x31, 0x20, 0x31, 0x35, 0x32, 0x31, 0x2e, 0x35, 0x33, 0x20, 0x39, 0x33, 0x32, 0x2e, 0x37, 0x33,
+	0x20, 0x4c, 0x20, 0x31, 0x34, 0x34, 0x33, 0x2e, 0x31, 0x32, 0x20, 0x38, 0x35, 0x37, 0x2e, 0x37,
+	0x35, 0x38, 0x20, 0x43, 0x20, 0x31, 0x34, 0x30, 0x37, 0x2e, 0x37, 0x38, 0x20, 0x38, 0x32, 0x34,
+	0x2e, 0x33, 0x36, 0x31, 0x20, 0x31, 0x33, 0x37, 0x35, 0x2e, 0x38, 0x39, 0x20, 0x38, 0x30, 0x33,
+	0x2e, 0x33, 0x38, 0x20, 0x31, 0x33, 0x36, 0x39, 0x20, 0x37, 0x35, 0x31, 0x2e, 0x32, 0x37, 0x38,
+	0x20, 0x43, 0x20, 0x31, 0x33, 0x36, 0x34, 0x2e, 0x36, 0x31, 0x20, 0x37, 0x31, 0x39, 0x2e, 0x32,
+	0x31, 0x31, 0x20, 0x31, 0x33, 0x37, 0x33, 0x2e, 0x32, 0x38, 0x20, 0x36, 0x38, 0x36, 0x2e, 0x37,
+	0x32, 0x35, 0x20, 0x31, 0x33, 0x39, 0x33, 0x2e, 0x30, 0x35, 0x20, 0x36, 0x36, 0x31, 0x2e, 0x31,
+	0x30, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x31, 0x38, 0x2e, 0x32, 0x35, 0x20, 0x36, 0x32, 0x38,
+	0x2e, 0x37, 0x33, 0x36, 0x20, 0x31, 0x34, 0x35, 0x32, 0x2e, 0x35, 0x32, 0x20, 0x36, 0x30, 0x39,
+	0x2e, 0x32, 0x31, 0x33, 0x20, 0x31, 0x34, 0x39, 0x33, 0x2e, 0x31, 0x37, 0x20, 0x36, 0x30, 0x34,
+	0x2e, 0x33, 0x38, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e,
+};
+
+static const unsigned char icon_client_goodrating_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x62, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x91, 0xbf,
+	0x4b, 0x02, 0x61, 0x18, 0xc7, 0xbf, 0x77, 0xa6, 0x96, 0xe8, 0xd1, 0x29, 0x82, 0xde, 0xa9, 0xa9,
+	0x09, 0x09, 0xd1, 0x14, 0x2d, 0xad, 0x0d, 0x61, 0x7b, 0x43, 0x53, 0x10, 0x41, 0x4b, 0x7f, 0x41,
+	0x50, 0xd1, 0xd0, 0xdf, 0x92, 0x43, 0x6b, 0x83, 0x83, 0xfd, 0x20, 0x69, 0x89, 0x68, 0x10, 0x22,
+	0x69, 0x38, 0x2f, 0xeb, 0x0e, 0x45, 0x51, 0xef, 0x3c, 0x51, 0xf1, 0xee, 0x6d, 0x29, 0x50, 0xcf,
+	0x77, 0x68, 0xf2, 0x33, 0xbe, 0xef, 0xe7, 0x7d, 0xbe, 0xcf, 0xfb, 0x3c, 0xc0, 0xac, 0x61, 0x68,
+	0x17, 0x29, 0x51, 0x8c, 0x58, 0x84, 0xa4, 0x01, 0x80, 0x00, 0x15, 0x49, 0x51, 0x4a, 0xd3, 0xbc,
+	0x39, 0x5a, 0x81, 0x68, 0xd0, 0x2c, 0xec, 0x6c, 0xcc, 0x2f, 0x01, 0xc0, 0x5d, 0xb1, 0x3f, 0x90,
+	0x14, 0xb8, 0xa7, 0x79, 0x2c, 0xad, 0x40, 0x4d, 0xc3, 0xcd, 0x53, 0x99, 0xc7, 0x8b, 0x1a, 0x42,
+	0xa5, 0xce, 0x14, 0x68, 0x1e, 0x95, 0x98, 0x28, 0x6e, 0xdd, 0xe6, 0xf3, 0xe4, 0x53, 0x96, 0x49,
+	0x42, 0x10, 0x8e, 0x69, 0x1e, 0xb5, 0x03, 0x07, 0x10, 0xe0, 0x79, 0x1e, 0x5e, 0xaf, 0x17, 0x0c,
+	0xcb, 0x06, 0xfe, 0x95, 0xbe, 0x2c, 0x08, 0xd1, 0xa3, 0xc3, 0x83, 0xaa, 0x65, 0x59, 0x84, 0x10,
+	0x42, 0x2e, 0xce, 0x4e, 0x8d, 0x58, 0x38, 0xbc, 0x4e, 0x09, 0x1a, 0x27, 0xe5, 0xf7, 0x73, 0x26,
+	0xe7, 0x7a, 0x0e, 0xae, 0x84, 0xc4, 0xc7, 0xfb, 0x07, 0x90, 0x81, 0x85, 0xed, 0x4c, 0xc6, 0xf9,
+	0x51, 0x7a, 0xdf, 0xd3, 0xea, 0x8d, 0x6c, 0xdb, 0x30, 0x5a, 0xa3, 0xbe, 0x6d, 0x8d, 0x09, 0x51,
+	0x3c, 0x49, 0x9e, 0xaf, 0x5e, 0x2e, 0x04, 0x3d, 0x00, 0x00, 0xbd, 0xac, 0xc1, 0x90, 0x3b, 0x70,
+	0x2d, 0xba, 0xa1, 0x5e, 0x49, 0xd7, 0x52, 0xe9, 0x6b, 0x77, 0xd4, 0xb7, 0xad, 0xd1, 0xf2, 0x60,
+	0xed, 0xef, 0x31, 0x00, 0xf8, 0xe2, 0x1c, 0x7c, 0x71, 0x0e, 0x00, 0x50, 0xcd, 0x7d, 0xa7, 0x27,
+	0x7d, 0xdb, 0x10, 0x99, 0x2e, 0x72, 0x9a, 0xd4, 0xb6, 0xfd, 0xb5, 0xd7, 0xe8, 0x61, 0x58, 0xeb,
+	0xe7, 0x26, 0xcf, 0x6d, 0x33, 0x68, 0xe9, 0x7a, 0xd1, 0xa1, 0x5a, 0x9b, 0x26, 0x4b, 0x92, 0xc3,
+	0xde, 0x10, 0x5d, 0xb5, 0x8b, 0x8e, 0xac, 0x43, 0xc9, 0x4a, 0x6f, 0x4c, 0xcf, 0xb9, 0xdf, 0x6c,
+	0x36, 0xfb, 0x63, 0x81, 0xb6, 0xa8, 0x5f, 0xe2, 0x82, 0x90, 0x66, 0x81, 0x08, 0x00, 0x98, 0x40,
+	0x43, 0x56, 0x94, 0x57, 0x9a, 0x3b, 0x5b, 0x7e, 0x00, 0xb4, 0xb8, 0x7e, 0xf6, 0x47, 0x0d, 0x37,
+	0xd8, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_goodrating_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x31, 0x30, 0x31, 0x2e, 0x30, 0x36, 0x2c,
+	0x31, 0x35, 0x37, 0x2e, 0x39, 0x37, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e,
+	0x39, 0x30, 0x39, 0x29, 0x22, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74,
+	0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67,
+	0x62, 0x28, 0x33, 0x32, 0x2c, 0x32, 0x37, 0x2c, 0x32, 0x36, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39, 0x2e, 0x33, 0x37,
+	0x31, 0x20, 0x43, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x32, 0x30, 0x38, 0x2e,
+	0x30, 0x34, 0x38, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x34, 0x33, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x38,
+	0x39, 0x35, 0x20, 0x39, 0x32, 0x31, 0x2e, 0x39, 0x34, 0x38, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x39,
+	0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x30, 0x35, 0x20, 0x32, 0x30, 0x38, 0x2e,
+	0x39, 0x39, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x34, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x32, 0x30,
+	0x38, 0x2e, 0x39, 0x31, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x36, 0x37, 0x20,
+	0x32, 0x30, 0x38, 0x2e, 0x38, 0x38, 0x35, 0x20, 0x31, 0x32, 0x30, 0x38, 0x2e, 0x33, 0x32, 0x20,
+	0x32, 0x30, 0x35, 0x2e, 0x35, 0x31, 0x38, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x33, 0x20,
+	0x32, 0x32, 0x30, 0x2e, 0x32, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x36, 0x33, 0x2e, 0x30,
+	0x33, 0x20, 0x32, 0x33, 0x33, 0x2e, 0x33, 0x34, 0x34, 0x20, 0x31, 0x32, 0x38, 0x32, 0x2e, 0x31,
+	0x36, 0x20, 0x32, 0x35, 0x36, 0x2e, 0x30, 0x32, 0x34, 0x20, 0x31, 0x32, 0x39, 0x30, 0x2e, 0x37,
+	0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x32, 0x36, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x39, 0x39,
+	0x20, 0x33, 0x30, 0x38, 0x2e, 0x39, 0x32, 0x33, 0x20, 0x31, 0x32, 0x39, 0x34, 0x2e, 0x35, 0x36,
+	0x20, 0x33, 0x32, 0x39, 0x2e, 0x33, 0x38, 0x37, 0x20, 0x31, 0x32, 0x39, 0x36, 0x2e, 0x33, 0x32,
+	0x20, 0x33, 0x35, 0x34, 0x2e, 0x36, 0x35, 0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x30, 0x2e,
+	0x37, 0x39, 0x20, 0x34, 0x31, 0x38, 0x2e, 0x39, 0x33, 0x35, 0x20, 0x31, 0x32, 0x38, 0x33, 0x2e,
+	0x30, 0x38, 0x20, 0x34, 0x37, 0x32, 0x2e, 0x30, 0x38, 0x35, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e,
+	0x38, 0x39, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x31, 0x34,
+	0x2e, 0x39, 0x37, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x39, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32,
+	0x31, 0x34, 0x2e, 0x39, 0x39, 0x20, 0x36, 0x36, 0x39, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x31, 0x32,
+	0x31, 0x31, 0x2e, 0x31, 0x31, 0x20, 0x37, 0x31, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x31, 0x32,
+	0x32, 0x33, 0x2e, 0x35, 0x35, 0x20, 0x37, 0x36, 0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x32, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x30, 0x34, 0x37, 0x20,
+	0x31, 0x32, 0x36, 0x36, 0x2e, 0x38, 0x31, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x33, 0x35, 0x36, 0x20,
+	0x31, 0x33, 0x30, 0x33, 0x2e, 0x38, 0x36, 0x20, 0x38, 0x37, 0x30, 0x2e, 0x33, 0x31, 0x33, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x38, 0x39, 0x20, 0x39, 0x31, 0x30, 0x2e, 0x38, 0x36,
+	0x39, 0x20, 0x31, 0x33, 0x38, 0x36, 0x2e, 0x30, 0x39, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x36, 0x39,
+	0x38, 0x20, 0x31, 0x34, 0x32, 0x38, 0x2e, 0x31, 0x32, 0x20, 0x39, 0x39, 0x34, 0x2e, 0x32, 0x31,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x39, 0x31, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x30, 0x35, 0x35,
+	0x2e, 0x36, 0x39, 0x20, 0x31, 0x35, 0x33, 0x32, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x31, 0x34, 0x37,
+	0x2e, 0x32, 0x35, 0x20, 0x31, 0x35, 0x34, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x32, 0x33, 0x34,
+	0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x35, 0x35, 0x39, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x33,
+	0x34, 0x35, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x34,
+	0x35, 0x36, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x34, 0x36, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x35,
+	0x34, 0x34, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x34, 0x2e, 0x35, 0x34, 0x20,
+	0x31, 0x36, 0x33, 0x31, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x38, 0x38, 0x20,
+	0x31, 0x36, 0x38, 0x31, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x31, 0x31, 0x20,
+	0x31, 0x36, 0x39, 0x35, 0x2e, 0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x34, 0x2e, 0x36,
+	0x37, 0x20, 0x31, 0x36, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x37,
+	0x37, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x36, 0x33, 0x2e, 0x35, 0x20,
+	0x31, 0x36, 0x39, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e, 0x32,
+	0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x36, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x31, 0x34, 0x20, 0x31,
+	0x36, 0x39, 0x38, 0x2e, 0x37, 0x32, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x38, 0x34, 0x39, 0x20, 0x31,
+	0x36, 0x39, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x37, 0x38, 0x38, 0x2e, 0x31, 0x33, 0x32,
+	0x20, 0x31, 0x36, 0x39, 0x36, 0x2e, 0x35, 0x33, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x38, 0x32, 0x37,
+	0x20, 0x31, 0x36, 0x35, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x36, 0x31, 0x37, 0x2e, 0x37, 0x37, 0x36,
+	0x20, 0x31, 0x35, 0x37, 0x37, 0x2e, 0x30, 0x32, 0x20, 0x43, 0x20, 0x35, 0x30, 0x31, 0x2e, 0x39,
+	0x34, 0x35, 0x20, 0x31, 0x34, 0x35, 0x33, 0x2e, 0x30, 0x36, 0x20, 0x34, 0x37, 0x31, 0x2e, 0x36,
+	0x32, 0x39, 0x20, 0x31, 0x32, 0x37, 0x31, 0x2e, 0x37, 0x38, 0x20, 0x35, 0x34, 0x30, 0x2e, 0x38,
+	0x32, 0x34, 0x20, 0x31, 0x31, 0x31, 0x36, 0x2e, 0x38, 0x37, 0x20, 0x43, 0x20, 0x35, 0x35, 0x36,
+	0x2e, 0x39, 0x36, 0x34, 0x20, 0x31, 0x30, 0x37, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x35, 0x37, 0x39,
+	0x2e, 0x33, 0x38, 0x32, 0x20, 0x31, 0x30, 0x33, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x30, 0x38,
+	0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x31, 0x31, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x36, 0x32,
+	0x30, 0x2e, 0x32, 0x31, 0x31, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x36, 0x33, 0x32,
+	0x2e, 0x34, 0x33, 0x20, 0x39, 0x38, 0x37, 0x2e, 0x32, 0x31, 0x38, 0x20, 0x36, 0x34, 0x34, 0x2e,
+	0x34, 0x38, 0x20, 0x39, 0x37, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x37, 0x35, 0x33,
+	0x2e, 0x33, 0x30, 0x36, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20, 0x37, 0x37,
+	0x39, 0x2e, 0x32, 0x34, 0x31, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x32, 0x33, 0x20, 0x38, 0x30, 0x35,
+	0x2e, 0x33, 0x39, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x36, 0x35, 0x35, 0x20, 0x38, 0x32, 0x30, 0x2e,
+	0x38, 0x36, 0x34, 0x20, 0x37, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x34, 0x20, 0x43, 0x20, 0x38, 0x34,
+	0x31, 0x2e, 0x38, 0x39, 0x32, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x38, 0x35, 0x33, 0x20, 0x38, 0x33,
+	0x37, 0x2e, 0x34, 0x34, 0x36, 0x20, 0x36, 0x39, 0x31, 0x2e, 0x31, 0x31, 0x31, 0x20, 0x38, 0x33,
+	0x37, 0x2e, 0x32, 0x34, 0x38, 0x20, 0x36, 0x34, 0x30, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x43, 0x20,
+	0x38, 0x33, 0x36, 0x2e, 0x39, 0x36, 0x20, 0x35, 0x39, 0x31, 0x2e, 0x35, 0x39, 0x32, 0x20, 0x38,
+	0x33, 0x37, 0x2e, 0x32, 0x30, 0x32, 0x20, 0x35, 0x34, 0x32, 0x2e, 0x36, 0x38, 0x32, 0x20, 0x38,
+	0x33, 0x37, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x37, 0x37, 0x39, 0x20, 0x43,
+	0x20, 0x37, 0x36, 0x36, 0x2e, 0x31, 0x32, 0x32, 0x20, 0x34, 0x37, 0x30, 0x2e, 0x38, 0x36, 0x33,
+	0x20, 0x37, 0x35, 0x34, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x34, 0x32, 0x32, 0x2e, 0x31, 0x34, 0x34,
+	0x20, 0x37, 0x35, 0x37, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x37, 0x32, 0x38,
+	0x20, 0x43, 0x20, 0x37, 0x35, 0x38, 0x2e, 0x35, 0x35, 0x33, 0x20, 0x33, 0x31, 0x35, 0x2e, 0x37,
+	0x31, 0x34, 0x20, 0x37, 0x35, 0x31, 0x2e, 0x34, 0x36, 0x37, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x38,
+	0x38, 0x39, 0x20, 0x37, 0x37, 0x39, 0x2e, 0x36, 0x39, 0x38, 0x20, 0x32, 0x34, 0x39, 0x2e, 0x38,
+	0x35, 0x38, 0x20, 0x43, 0x20, 0x38, 0x30, 0x30, 0x2e, 0x35, 0x35, 0x38, 0x20, 0x32, 0x32, 0x34,
+	0x2e, 0x37, 0x31, 0x33, 0x20, 0x38, 0x32, 0x32, 0x2e, 0x37, 0x33, 0x35, 0x20, 0x32, 0x31, 0x33,
+	0x2e, 0x32, 0x36, 0x31, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39,
+	0x2e, 0x33, 0x37, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e, 0x34,
+	0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x33, 0x2e, 0x38, 0x31, 0x37, 0x20, 0x31, 0x30, 0x34, 0x35,
+	0x2e, 0x35, 0x33, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x30, 0x36, 0x31,
+	0x2e, 0x33, 0x38, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38, 0x35,
+	0x2e, 0x39, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x30,
+	0x39, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x30, 0x33, 0x38, 0x2e, 0x33, 0x32, 0x20, 0x31, 0x31,
+	0x30, 0x33, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x31,
+	0x31, 0x31, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x35, 0x2e, 0x37, 0x36, 0x20,
+	0x31, 0x31, 0x35, 0x37, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x32, 0x36, 0x39, 0x2e, 0x34, 0x32, 0x20,
+	0x31, 0x31, 0x36, 0x32, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x33, 0x37, 0x35, 0x2e, 0x37, 0x36, 0x20,
+	0x31, 0x31, 0x33, 0x35, 0x2e, 0x38, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x35, 0x2e, 0x34,
+	0x34, 0x20, 0x31, 0x31, 0x33, 0x31, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x31, 0x33, 0x2e, 0x35,
+	0x20, 0x31, 0x31, 0x32, 0x34, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x34, 0x33, 0x32, 0x2e, 0x35, 0x32,
+	0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x33, 0x2e, 0x32,
+	0x33, 0x20, 0x31, 0x31, 0x33, 0x30, 0x2e, 0x33, 0x36, 0x20, 0x31, 0x34, 0x35, 0x34, 0x2e, 0x38,
+	0x37, 0x20, 0x31, 0x31, 0x36, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e, 0x31,
+	0x31, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x35, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31, 0x35,
+	0x2e, 0x32, 0x32, 0x20, 0x31, 0x33, 0x35, 0x36, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x34, 0x32, 0x39,
+	0x2e, 0x35, 0x38, 0x20, 0x31, 0x35, 0x36, 0x31, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x32, 0x34, 0x34,
+	0x2e, 0x32, 0x36, 0x20, 0x31, 0x36, 0x31, 0x34, 0x2e, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31,
+	0x39, 0x36, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x31,
+	0x35, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x31,
+	0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x4c, 0x20,
+	0x31, 0x30, 0x30, 0x38, 0x2e, 0x37, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x43,
+	0x20, 0x38, 0x38, 0x35, 0x2e, 0x33, 0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x31, 0x34,
+	0x20, 0x37, 0x38, 0x35, 0x2e, 0x33, 0x30, 0x31, 0x20, 0x31, 0x36, 0x33, 0x38, 0x2e, 0x31, 0x35,
+	0x20, 0x36, 0x38, 0x35, 0x2e, 0x38, 0x38, 0x39, 0x20, 0x31, 0x35, 0x34, 0x38, 0x2e, 0x34, 0x38,
+	0x20, 0x43, 0x20, 0x35, 0x35, 0x38, 0x2e, 0x32, 0x39, 0x33, 0x20, 0x31, 0x34, 0x33, 0x33, 0x2e,
+	0x33, 0x38, 0x20, 0x35, 0x34, 0x31, 0x2e, 0x39, 0x33, 0x32, 0x20, 0x31, 0x32, 0x34, 0x31, 0x2e,
+	0x34, 0x39, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x30, 0x37, 0x37, 0x20, 0x31, 0x30, 0x39, 0x38, 0x2e,
+	0x30, 0x37, 0x20, 0x43, 0x20, 0x36, 0x33, 0x36, 0x2e, 0x39, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38,
+	0x36, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x36, 0x31, 0x36, 0x20, 0x31, 0x30, 0x38,
+	0x37, 0x2e, 0x35, 0x36, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x38, 0x33, 0x2e,
+	0x32, 0x35, 0x20, 0x43, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x30, 0x36, 0x31,
+	0x2e, 0x38, 0x37, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x31, 0x30, 0x34, 0x39,
+	0x2e, 0x31, 0x34, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37,
+	0x2e, 0x34, 0x38, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c,
+	0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x72, 0x67, 0x62, 0x28, 0x37, 0x36, 0x2c, 0x31, 0x37, 0x35, 0x2c, 0x38, 0x30, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x31, 0x30, 0x35,
+	0x31, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x38, 0x31, 0x34, 0x2e, 0x38, 0x38, 0x33, 0x20, 0x31,
+	0x30, 0x35, 0x30, 0x2e, 0x36, 0x33, 0x20, 0x38, 0x32, 0x37, 0x2e, 0x36, 0x39, 0x36, 0x20, 0x31,
+	0x30, 0x35, 0x30, 0x2e, 0x37, 0x38, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x38, 0x32, 0x33, 0x20, 0x31,
+	0x30, 0x35, 0x30, 0x2e, 0x38, 0x31, 0x20, 0x43, 0x20, 0x38, 0x39, 0x32, 0x2e, 0x37, 0x36, 0x39,
+	0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x33, 0x37, 0x20, 0x39, 0x34, 0x39, 0x2e, 0x39, 0x36, 0x20,
+	0x31, 0x30, 0x36, 0x34, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x37, 0x33, 0x20,
+	0x31, 0x30, 0x38, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x31, 0x2e, 0x39,
+	0x38, 0x20, 0x31, 0x30, 0x39, 0x36, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x30, 0x34, 0x30, 0x2e, 0x31,
+	0x35, 0x20, 0x31, 0x31, 0x30, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x36, 0x30, 0x2e, 0x35,
+	0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e,
+	0x32, 0x31, 0x20, 0x31, 0x31, 0x36, 0x38, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x33, 0x31, 0x35, 0x2e,
+	0x32, 0x37, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x35, 0x36, 0x20, 0x31, 0x34, 0x33, 0x31, 0x2e,
+	0x34, 0x39, 0x20, 0x31, 0x31, 0x32, 0x31, 0x2e, 0x33, 0x31, 0x20, 0x43, 0x20, 0x31, 0x34, 0x33,
+	0x38, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x31, 0x33, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x34, 0x34, 0x34,
+	0x2e, 0x36, 0x35, 0x20, 0x31, 0x31, 0x34, 0x37, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x34, 0x34, 0x39,
+	0x2e, 0x33, 0x33, 0x20, 0x31, 0x31, 0x35, 0x39, 0x2e, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35,
+	0x31, 0x35, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x33, 0x33, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x34,
+	0x34, 0x31, 0x2e, 0x34, 0x35, 0x20, 0x31, 0x35, 0x33, 0x37, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x32,
+	0x36, 0x30, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x36, 0x30, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x34, 0x39, 0x2e, 0x38, 0x33, 0x20, 0x31, 0x36, 0x30, 0x39, 0x2e, 0x39, 0x38, 0x20,
+	0x31, 0x32, 0x33, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x31, 0x36, 0x31, 0x33, 0x20, 0x31, 0x32, 0x32,
+	0x37, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x36, 0x31, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x43, 0x20, 0x31,
+	0x31, 0x36, 0x35, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x39, 0x35, 0x20, 0x31,
+	0x30, 0x38, 0x35, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x36, 0x32, 0x33, 0x2e, 0x39, 0x34, 0x20, 0x31,
+	0x30, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x4c, 0x20,
+	0x39, 0x34, 0x30, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x34, 0x35, 0x20,
+	0x43, 0x20, 0x39, 0x30, 0x30, 0x2e, 0x30, 0x34, 0x36, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x36,
+	0x39, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x36, 0x32, 0x35, 0x2e, 0x35, 0x37,
+	0x20, 0x38, 0x33, 0x33, 0x2e, 0x36, 0x37, 0x36, 0x20, 0x31, 0x36, 0x31, 0x37, 0x2e, 0x38, 0x31,
+	0x20, 0x43, 0x20, 0x37, 0x39, 0x34, 0x2e, 0x36, 0x31, 0x32, 0x20, 0x31, 0x36, 0x31, 0x30, 0x2e,
+	0x34, 0x38, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x33, 0x35, 0x33, 0x20, 0x31, 0x35, 0x39, 0x35, 0x2e,
+	0x36, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x39, 0x38, 0x38, 0x20, 0x31, 0x35, 0x37, 0x34, 0x2e, 0x30,
+	0x31, 0x20, 0x43, 0x20, 0x36, 0x35, 0x32, 0x2e, 0x34, 0x35, 0x37, 0x20, 0x31, 0x35, 0x32, 0x37,
+	0x2e, 0x39, 0x37, 0x20, 0x36, 0x30, 0x34, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x35, 0x31, 0x2e,
+	0x37, 0x20, 0x35, 0x38, 0x36, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x31, 0x33, 0x36, 0x39, 0x2e, 0x32,
+	0x39, 0x20, 0x43, 0x20, 0x35, 0x36, 0x35, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x31, 0x32, 0x37, 0x34,
+	0x2e, 0x35, 0x33, 0x20, 0x35, 0x38, 0x33, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x31, 0x31, 0x37, 0x35,
+	0x2e, 0x34, 0x34, 0x20, 0x36, 0x33, 0x36, 0x2e, 0x37, 0x39, 0x34, 0x20, 0x31, 0x30, 0x39, 0x34,
+	0x2e, 0x30, 0x39, 0x20, 0x43, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x31, 0x30,
+	0x38, 0x39, 0x2e, 0x36, 0x35, 0x20, 0x36, 0x36, 0x30, 0x2e, 0x37, 0x38, 0x37, 0x20, 0x31, 0x30,
+	0x38, 0x34, 0x2e, 0x37, 0x35, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x34, 0x33, 0x35, 0x20, 0x31, 0x30,
+	0x38, 0x31, 0x2e, 0x34, 0x37, 0x20, 0x43, 0x20, 0x37, 0x31, 0x38, 0x2e, 0x30, 0x37, 0x39, 0x20,
+	0x31, 0x30, 0x36, 0x35, 0x2e, 0x33, 0x20, 0x37, 0x35, 0x38, 0x2e, 0x32, 0x34, 0x32, 0x20, 0x31,
+	0x30, 0x35, 0x35, 0x2e, 0x31, 0x32, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x31,
+	0x30, 0x35, 0x31, 0x2e, 0x34, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32,
+	0x35, 0x35, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39, 0x31, 0x35, 0x2e, 0x30, 0x30,
+	0x36, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x35, 0x30,
+	0x2e, 0x30, 0x39, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x32, 0x38, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37,
+	0x38, 0x2e, 0x34, 0x39, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x32, 0x37, 0x31, 0x20, 0x31, 0x31, 0x30,
+	0x39, 0x2e, 0x39, 0x34, 0x20, 0x34, 0x39, 0x34, 0x2e, 0x36, 0x36, 0x33, 0x20, 0x31, 0x31, 0x33,
+	0x38, 0x2e, 0x31, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x37, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x33,
+	0x37, 0x2e, 0x39, 0x35, 0x20, 0x36, 0x34, 0x33, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x43, 0x20, 0x31,
+	0x31, 0x33, 0x38, 0x2e, 0x30, 0x32, 0x20, 0x37, 0x30, 0x33, 0x2e, 0x32, 0x32, 0x37, 0x20, 0x31,
+	0x31, 0x33, 0x35, 0x2e, 0x34, 0x33, 0x20, 0x37, 0x36, 0x34, 0x2e, 0x31, 0x35, 0x38, 0x20, 0x31,
+	0x31, 0x36, 0x34, 0x2e, 0x34, 0x32, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x43, 0x20,
+	0x31, 0x31, 0x39, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x37, 0x31, 0x32, 0x20,
+	0x31, 0x32, 0x32, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x39, 0x30, 0x32, 0x2e, 0x33, 0x30, 0x33, 0x20,
+	0x31, 0x32, 0x37, 0x36, 0x2e, 0x37, 0x37, 0x20, 0x39, 0x34, 0x38, 0x2e, 0x39, 0x32, 0x20, 0x43,
+	0x20, 0x31, 0x33, 0x31, 0x34, 0x2e, 0x35, 0x37, 0x20, 0x39, 0x38, 0x35, 0x2e, 0x33, 0x31, 0x35,
+	0x20, 0x31, 0x33, 0x35, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x30, 0x34,
+	0x20, 0x31, 0x33, 0x38, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x31, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x39, 0x34, 0x2e, 0x30, 0x38,
+	0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x30, 0x33,
+	0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x30, 0x35, 0x33, 0x2e, 0x39, 0x37,
+	0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x36, 0x2e,
+	0x36, 0x31, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x33, 0x36, 0x2e,
+	0x30, 0x39, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x30, 0x32, 0x38, 0x2e,
+	0x31, 0x31, 0x20, 0x43, 0x20, 0x39, 0x39, 0x36, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x30, 0x30, 0x36,
+	0x2e, 0x31, 0x36, 0x20, 0x39, 0x34, 0x37, 0x2e, 0x31, 0x34, 0x39, 0x20, 0x39, 0x39, 0x32, 0x2e,
+	0x30, 0x30, 0x39, 0x20, 0x38, 0x39, 0x36, 0x2e, 0x34, 0x32, 0x20, 0x39, 0x38, 0x36, 0x2e, 0x32,
+	0x33, 0x35, 0x20, 0x43, 0x20, 0x38, 0x35, 0x36, 0x2e, 0x30, 0x34, 0x20, 0x39, 0x38, 0x31, 0x2e,
+	0x34, 0x39, 0x31, 0x20, 0x38, 0x31, 0x33, 0x2e, 0x37, 0x39, 0x39, 0x20, 0x39, 0x38, 0x31, 0x2e,
+	0x36, 0x32, 0x39, 0x20, 0x37, 0x37, 0x33, 0x2e, 0x34, 0x35, 0x39, 0x20, 0x39, 0x38, 0x37, 0x2e,
+	0x34, 0x30, 0x36, 0x20, 0x43, 0x20, 0x37, 0x36, 0x35, 0x2e, 0x35, 0x31, 0x32, 0x20, 0x39, 0x38,
+	0x38, 0x2e, 0x35, 0x34, 0x35, 0x20, 0x37, 0x32, 0x38, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x39, 0x39,
+	0x37, 0x2e, 0x33, 0x38, 0x39, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39, 0x39,
+	0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43, 0x20, 0x37, 0x34, 0x31, 0x2e, 0x36, 0x37, 0x32, 0x20,
+	0x39, 0x38, 0x31, 0x2e, 0x38, 0x34, 0x36, 0x20, 0x37, 0x36, 0x33, 0x2e, 0x39, 0x33, 0x36, 0x20,
+	0x39, 0x35, 0x37, 0x2e, 0x30, 0x37, 0x35, 0x20, 0x37, 0x38, 0x31, 0x2e, 0x35, 0x33, 0x32, 0x20,
+	0x39, 0x34, 0x31, 0x2e, 0x33, 0x34, 0x31, 0x20, 0x43, 0x20, 0x38, 0x34, 0x38, 0x2e, 0x31, 0x34,
+	0x20, 0x38, 0x38, 0x31, 0x2e, 0x37, 0x38, 0x32, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x31, 0x35, 0x37,
+	0x20, 0x38, 0x32, 0x39, 0x2e, 0x32, 0x38, 0x38, 0x20, 0x39, 0x31, 0x32, 0x2e, 0x36, 0x38, 0x31,
+	0x20, 0x37, 0x33, 0x35, 0x2e, 0x32, 0x34, 0x35, 0x20, 0x43, 0x20, 0x39, 0x31, 0x36, 0x2e, 0x33,
+	0x32, 0x32, 0x20, 0x37, 0x30, 0x35, 0x2e, 0x35, 0x33, 0x31, 0x20, 0x39, 0x31, 0x34, 0x2e, 0x39,
+	0x36, 0x34, 0x20, 0x36, 0x37, 0x32, 0x2e, 0x36, 0x33, 0x32, 0x20, 0x39, 0x31, 0x34, 0x2e, 0x39,
+	0x36, 0x20, 0x36, 0x34, 0x32, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x4c, 0x20, 0x39, 0x31, 0x35, 0x2e,
+	0x30, 0x30, 0x36, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30, 0x2c,
+	0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x34, 0x37, 0x37,
+	0x20, 0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x43, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x35,
+	0x34, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x39, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x36,
+	0x32, 0x32, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x31, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x36,
+	0x39, 0x34, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x38, 0x33, 0x20, 0x43, 0x20, 0x38, 0x38, 0x39,
+	0x2e, 0x32, 0x36, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x37, 0x36, 0x33, 0x20, 0x39, 0x31, 0x34,
+	0x2e, 0x39, 0x36, 0x38, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x39, 0x33, 0x39,
+	0x2e, 0x34, 0x31, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x32, 0x35, 0x20, 0x43, 0x20, 0x39,
+	0x37, 0x36, 0x2e, 0x33, 0x38, 0x31, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x33, 0x38, 0x20, 0x31,
+	0x30, 0x31, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x35, 0x36, 0x20, 0x31,
+	0x30, 0x35, 0x30, 0x2e, 0x33, 0x31, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x4c,
+	0x20, 0x31, 0x31, 0x34, 0x30, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x39, 0x34,
+	0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x33, 0x2e, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x34,
+	0x34, 0x20, 0x31, 0x32, 0x32, 0x36, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x31, 0x2e, 0x36, 0x30,
+	0x36, 0x20, 0x31, 0x32, 0x32, 0x35, 0x2e, 0x39, 0x31, 0x20, 0x33, 0x32, 0x32, 0x2e, 0x38, 0x35,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x35, 0x2e, 0x36, 0x31, 0x20, 0x33, 0x34, 0x37, 0x2e,
+	0x30, 0x34, 0x32, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33, 0x2e,
+	0x33, 0x30, 0x34, 0x20, 0x31, 0x32, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x33, 0x39, 0x37, 0x2e,
+	0x30, 0x33, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x34, 0x20, 0x34, 0x31,
+	0x34, 0x2e, 0x35, 0x37, 0x37, 0x20, 0x31, 0x32, 0x30, 0x35, 0x2e, 0x31, 0x39, 0x20, 0x34, 0x32,
+	0x31, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x31, 0x38, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x34, 0x32, 0x32,
+	0x2e, 0x30, 0x30, 0x38, 0x20, 0x4c, 0x20, 0x39, 0x36, 0x31, 0x2e, 0x39, 0x39, 0x39, 0x20, 0x34,
+	0x32, 0x33, 0x2e, 0x30, 0x31, 0x36, 0x20, 0x4c, 0x20, 0x38, 0x39, 0x34, 0x2e, 0x34, 0x38, 0x32,
+	0x20, 0x34, 0x32, 0x33, 0x2e, 0x31, 0x34, 0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x32, 0x2e, 0x36,
+	0x37, 0x33, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x31, 0x37, 0x33, 0x20, 0x38, 0x34, 0x36, 0x2e, 0x38,
+	0x37, 0x34, 0x20, 0x34, 0x32, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x39,
+	0x33, 0x39, 0x20, 0x34, 0x31, 0x38, 0x2e, 0x36, 0x37, 0x38, 0x20, 0x43, 0x20, 0x38, 0x32, 0x30,
+	0x2e, 0x38, 0x39, 0x34, 0x20, 0x34, 0x30, 0x35, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x38, 0x32, 0x34,
+	0x2e, 0x39, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33, 0x2e, 0x33, 0x37, 0x39, 0x20, 0x38, 0x32, 0x34,
+	0x2e, 0x39, 0x35, 0x31, 0x20, 0x33, 0x35, 0x33, 0x2e, 0x39, 0x39, 0x38, 0x20, 0x43, 0x20, 0x38,
+	0x32, 0x35, 0x2e, 0x30, 0x31, 0x32, 0x20, 0x33, 0x31, 0x37, 0x2e, 0x32, 0x39, 0x36, 0x20, 0x38,
+	0x31, 0x38, 0x2e, 0x31, 0x32, 0x33, 0x20, 0x32, 0x38, 0x34, 0x2e, 0x35, 0x32, 0x20, 0x38, 0x36,
+	0x34, 0x2e, 0x34, 0x37, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x7a, 0x22,
+	0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f,
+	0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c,
+	0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x38,
+	0x37, 0x2c, 0x31, 0x33, 0x36, 0x2c, 0x34, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20,
+	0x38, 0x37, 0x39, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33, 0x20,
+	0x4c, 0x20, 0x31, 0x30, 0x38, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36, 0x31,
+	0x20, 0x4c, 0x20, 0x31, 0x31, 0x35, 0x32, 0x2e, 0x34, 0x32, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36,
+	0x34, 0x31, 0x20, 0x43, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x32, 0x38, 0x33,
+	0x2e, 0x36, 0x36, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e,
+	0x31, 0x36, 0x37, 0x20, 0x31, 0x31, 0x39, 0x33, 0x2e, 0x33, 0x34, 0x20, 0x32, 0x38, 0x34, 0x2e,
+	0x33, 0x37, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x36, 0x20, 0x32, 0x38, 0x36,
+	0x2e, 0x30, 0x36, 0x38, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x34, 0x31, 0x20, 0x33, 0x30, 0x34,
+	0x2e, 0x39, 0x33, 0x39, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x30, 0x38, 0x20, 0x33, 0x32, 0x31,
+	0x2e, 0x38, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x37, 0x20, 0x33,
+	0x33, 0x37, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x31, 0x35, 0x20, 0x33,
+	0x35, 0x31, 0x2e, 0x39, 0x34, 0x33, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x39, 0x35, 0x20, 0x33,
+	0x36, 0x37, 0x2e, 0x31, 0x32, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x37,
+	0x20, 0x33, 0x38, 0x31, 0x2e, 0x32, 0x32, 0x31, 0x20, 0x31, 0x32, 0x32, 0x33, 0x2e, 0x38, 0x35,
+	0x20, 0x33, 0x39, 0x39, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x32, 0x31, 0x33, 0x2e, 0x33, 0x37, 0x20,
+	0x34, 0x31, 0x30, 0x2e, 0x34, 0x33, 0x32, 0x20, 0x43, 0x20, 0x31, 0x32, 0x30, 0x32, 0x2e, 0x39,
+	0x31, 0x20, 0x34, 0x32, 0x31, 0x2e, 0x31, 0x35, 0x33, 0x20, 0x31, 0x31, 0x38, 0x36, 0x2e, 0x32,
+	0x33, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x33, 0x35, 0x35, 0x20, 0x31, 0x31, 0x37, 0x32, 0x2e, 0x35,
+	0x20, 0x34, 0x31, 0x39, 0x2e, 0x31, 0x39, 0x32, 0x20, 0x4c, 0x20, 0x39, 0x35, 0x31, 0x2e, 0x34,
+	0x37, 0x32, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x38, 0x35,
+	0x2e, 0x37, 0x38, 0x33, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x32, 0x37, 0x20, 0x43, 0x20, 0x38, 0x36,
+	0x31, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x33, 0x34, 0x35, 0x20, 0x38, 0x32,
+	0x38, 0x2e, 0x33, 0x30, 0x36, 0x20, 0x34, 0x32, 0x36, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x38, 0x32,
+	0x38, 0x2e, 0x38, 0x31, 0x36, 0x20, 0x33, 0x39, 0x30, 0x2e, 0x31, 0x35, 0x20, 0x43, 0x20, 0x38,
+	0x32, 0x39, 0x2e, 0x32, 0x30, 0x34, 0x20, 0x33, 0x36, 0x32, 0x2e, 0x38, 0x37, 0x20, 0x38, 0x32,
+	0x36, 0x2e, 0x37, 0x39, 0x33, 0x20, 0x33, 0x33, 0x33, 0x2e, 0x30, 0x31, 0x34, 0x20, 0x38, 0x33,
+	0x30, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x33, 0x30, 0x36, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x43, 0x20,
+	0x38, 0x33, 0x32, 0x2e, 0x38, 0x34, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x39, 0x36, 0x35, 0x20,
+	0x38, 0x36, 0x33, 0x2e, 0x30, 0x35, 0x34, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x37, 0x20,
+	0x38, 0x37, 0x39, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33, 0x20,
+	0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28,
+	0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28,
+	0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x31, 0x32,
+	0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39, 0x20, 0x43, 0x20, 0x37,
+	0x31, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x37, 0x32,
+	0x30, 0x2e, 0x34, 0x36, 0x35, 0x20, 0x39, 0x39, 0x31, 0x2e, 0x39, 0x34, 0x32, 0x20, 0x37, 0x32,
+	0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39, 0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43, 0x20,
+	0x37, 0x32, 0x33, 0x2e, 0x33, 0x34, 0x38, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x36, 0x36, 0x20,
+	0x37, 0x31, 0x37, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x31, 0x30, 0x30, 0x33, 0x2e, 0x32, 0x35, 0x20,
+	0x37, 0x31, 0x32, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39, 0x20,
+	0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e,
+	0x0a
+};
+
+static const unsigned char icon_client_green_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0xca, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xcd, 0x92, 0xcd,
+	0x6b, 0x53, 0x41, 0x14, 0xc5, 0x7f, 0x33, 0xf3, 0xbe, 0x12, 0xd4, 0x40, 0x4b, 0x53, 0xd1, 0x88,
+	0xa2, 0x35, 0x8b, 0xc6, 0xc4, 0x50, 0xc4, 0x75, 0x74, 0xe9, 0x56, 0x02, 0x2a, 0x0a, 0xe2, 0x42,
+	0xfc, 0xc8, 0x9f, 0x23, 0xa1, 0x0b, 0x41, 0xdd, 0xb8, 0xc9, 0xde, 0x85, 0xa0, 0xc4, 0xad, 0xa6,
+	0xa4, 0xd1, 0x52, 0x2d, 0xa1, 0x85, 0x22, 0x18, 0x6a, 0x92, 0x92, 0x56, 0x6b, 0xbe, 0xde, 0xcc,
+	0x73, 0xd3, 0xf7, 0xa0, 0xa4, 0x5d, 0xeb, 0x59, 0xdd, 0x39, 0x73, 0xcf, 0xb9, 0x67, 0x86, 0x0b,
+	0xff, 0x1a, 0xe2, 0x10, 0x4e, 0xe6, 0xaf, 0xe6, 0xee, 0x8d, 0x73, 0xa3, 0x92, 0x9e, 0xd1, 0x69,
+	0x21, 0x09, 0x44, 0x5b, 0xad, 0xbb, 0xcb, 0xb1, 0x72, 0x22, 0x9e, 0x78, 0x55, 0xad, 0x56, 0xfd,
+	0x23, 0x0d, 0x32, 0x99, 0xcc, 0x14, 0x0b, 0xfa, 0xfd, 0xe0, 0xce, 0xde, 0xe5, 0x60, 0x46, 0x1f,
+	0x74, 0xed, 0x28, 0xbc, 0xd7, 0xc7, 0x56, 0xec, 0x2f, 0xde, 0xf5, 0x7a, 0xbd, 0xde, 0x9e, 0x30,
+	0x28, 0x16, 0x8b, 0x6a, 0x35, 0xb6, 0x52, 0xeb, 0x3f, 0xde, 0xc9, 0x63, 0x1f, 0x91, 0xd7, 0x87,
+	0xd8, 0x62, 0x62, 0x75, 0x7e, 0xef, 0x52, 0xae, 0x52, 0xa9, 0x68, 0x00, 0x19, 0xde, 0x35, 0x37,
+	0xd7, 0xee, 0x0e, 0x6e, 0xfd, 0x8a, 0xc4, 0xd6, 0x92, 0x8b, 0x18, 0x48, 0x18, 0x08, 0xac, 0x9a,
+	0xb3, 0x4f, 0xc2, 0xf0, 0xf6, 0xef, 0xf9, 0xe6, 0xf7, 0xe6, 0x83, 0x28, 0x59, 0x58, 0x8c, 0xb3,
+	0xa3, 0x52, 0x90, 0x34, 0xd1, 0x30, 0xfb, 0x93, 0x8b, 0xe8, 0x09, 0xc4, 0xae, 0xc0, 0xfe, 0x18,
+	0x8b, 0x78, 0x33, 0xad, 0x19, 0xe7, 0x07, 0xa5, 0xf0, 0x6c, 0x85, 0x85, 0x9e, 0xd5, 0x17, 0xc3,
+	0x98, 0x58, 0xd0, 0x7f, 0xb4, 0x1b, 0x89, 0xfa, 0x4f, 0x76, 0xf6, 0x9b, 0x00, 0x05, 0x26, 0xe9,
+	0xcf, 0x4d, 0x24, 0x08, 0xe1, 0xbc, 0x8d, 0x43, 0x70, 0xc8, 0xfb, 0x0d, 0x38, 0x6f, 0xe2, 0x00,
+	0x04, 0x81, 0x88, 0x3a, 0x22, 0x03, 0xd9, 0x51, 0xeb, 0x00, 0xfe, 0xc2, 0x10, 0x6b, 0xc9, 0x99,
+	0xd0, 0x5b, 0x75, 0x17, 0x3f, 0x3b, 0x02, 0x40, 0xb4, 0xe5, 0xc6, 0x84, 0x81, 0x5d, 0xb7, 0x9f,
+	0xc9, 0x8e, 0xc2, 0x9c, 0xd4, 0x20, 0x04, 0xce, 0xbb, 0x18, 0xb2, 0xab, 0x90, 0x5d, 0x85, 0xfd,
+	0xc1, 0x43, 0x18, 0x30, 0xe7, 0x7c, 0xc4, 0xb6, 0xc4, 0x59, 0xf6, 0xca, 0xa1, 0x4e, 0x85, 0xc5,
+	0xd6, 0x8f, 0x9f, 0x9f, 0x4f, 0x89, 0xd3, 0x37, 0xc7, 0x57, 0x86, 0x49, 0x93, 0xd2, 0x98, 0x69,
+	0x83, 0xb5, 0xe6, 0x20, 0xb7, 0x15, 0x7e, 0x76, 0x84, 0x3e, 0xef, 0x83, 0x86, 0xd8, 0xcb, 0x13,
+	0x5f, 0x9d, 0x96, 0xfb, 0xb0, 0xd5, 0x6a, 0x99, 0x03, 0x06, 0x40, 0x70, 0xc6, 0x3e, 0x5b, 0x91,
+	0x9b, 0xea, 0x86, 0xbe, 0xe0, 0x27, 0x83, 0x29, 0x83, 0x49, 0xf9, 0x98, 0x94, 0x0f, 0x5e, 0x80,
+	0xec, 0x2a, 0xbc, 0x17, 0xc7, 0xbf, 0x89, 0x9a, 0x75, 0xad, 0xd1, 0x68, 0x44, 0x3f, 0x3c, 0xb1,
+	0xca, 0x85, 0x42, 0xc1, 0xea, 0xfd, 0xe9, 0xdd, 0x1f, 0xe7, 0x87, 0x4f, 0xcd, 0xac, 0x3f, 0x87,
+	0x04, 0xb9, 0xa5, 0x36, 0xac, 0x86, 0x5b, 0x4e, 0xa7, 0xd2, 0xcf, 0xc3, 0x05, 0xfa, 0x7f, 0xf0,
+	0x17, 0xd3, 0x10, 0xa8, 0xaa, 0xca, 0xc1, 0x0a, 0x55, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+	0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_green_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x34, 0x37, 0x2c, 0x34,
+	0x36, 0x2c, 0x34, 0x37, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x30, 0x33,
+	0x2e, 0x34, 0x33, 0x20, 0x32, 0x36, 0x34, 0x2e, 0x30, 0x33, 0x36, 0x20, 0x43, 0x20, 0x31, 0x34,
+	0x32, 0x34, 0x2e, 0x30, 0x32, 0x20, 0x32, 0x35, 0x31, 0x2e, 0x35, 0x35, 0x37, 0x20, 0x31, 0x37,
+	0x37, 0x35, 0x2e, 0x31, 0x35, 0x20, 0x35, 0x38, 0x32, 0x2e, 0x32, 0x36, 0x36, 0x20, 0x31, 0x37,
+	0x38, 0x37, 0x2e, 0x38, 0x36, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x38, 0x35, 0x20, 0x43, 0x20,
+	0x31, 0x38, 0x30, 0x30, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x34, 0x32, 0x33, 0x2e, 0x34, 0x32, 0x20,
+	0x31, 0x34, 0x37, 0x30, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x37, 0x34, 0x20,
+	0x31, 0x30, 0x34, 0x39, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x37, 0x38, 0x37, 0x2e, 0x36, 0x39, 0x20,
+	0x43, 0x20, 0x36, 0x32, 0x38, 0x2e, 0x35, 0x38, 0x36, 0x20, 0x31, 0x38, 0x30, 0x30, 0x2e, 0x36,
+	0x35, 0x20, 0x32, 0x37, 0x36, 0x2e, 0x39, 0x33, 0x31, 0x20, 0x31, 0x34, 0x36, 0x39, 0x2e, 0x38,
+	0x32, 0x20, 0x32, 0x36, 0x34, 0x2e, 0x32, 0x30, 0x37, 0x20, 0x31, 0x30, 0x34, 0x38, 0x2e, 0x39,
+	0x31, 0x20, 0x43, 0x20, 0x32, 0x35, 0x31, 0x2e, 0x34, 0x38, 0x33, 0x20, 0x36, 0x32, 0x37, 0x2e,
+	0x39, 0x39, 0x35, 0x20, 0x35, 0x38, 0x32, 0x2e, 0x35, 0x31, 0x31, 0x20, 0x32, 0x37, 0x36, 0x2e,
+	0x35, 0x32, 0x35, 0x20, 0x31, 0x30, 0x30, 0x33, 0x2e, 0x34, 0x33, 0x20, 0x32, 0x36, 0x34, 0x2e,
+	0x30, 0x33, 0x36, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c,
+	0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x72, 0x67, 0x62, 0x28, 0x33, 0x34, 0x2c, 0x32, 0x30, 0x34, 0x2c, 0x32, 0x36, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39, 0x39, 0x31, 0x2e, 0x34, 0x31, 0x31, 0x20, 0x33, 0x31, 0x39,
+	0x2e, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x33, 0x38, 0x31, 0x2e, 0x32, 0x35, 0x20, 0x33, 0x30,
+	0x30, 0x2e, 0x37, 0x39, 0x34, 0x20, 0x31, 0x37, 0x31, 0x32, 0x2e, 0x37, 0x38, 0x20, 0x36, 0x30,
+	0x31, 0x2e, 0x33, 0x33, 0x36, 0x20, 0x31, 0x37, 0x33, 0x31, 0x2e, 0x38, 0x35, 0x20, 0x39, 0x39,
+	0x31, 0x2e, 0x31, 0x37, 0x38, 0x20, 0x43, 0x20, 0x31, 0x37, 0x35, 0x30, 0x2e, 0x39, 0x32, 0x20,
+	0x31, 0x33, 0x38, 0x31, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x35, 0x30, 0x2e, 0x33, 0x31, 0x20,
+	0x31, 0x37, 0x31, 0x32, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x30, 0x36, 0x30, 0x2e, 0x34, 0x36, 0x20,
+	0x31, 0x37, 0x33, 0x31, 0x2e, 0x34, 0x37, 0x20, 0x43, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x37, 0x33,
+	0x38, 0x20, 0x31, 0x37, 0x35, 0x30, 0x2e, 0x34, 0x35, 0x20, 0x33, 0x33, 0x39, 0x2e, 0x33, 0x39,
+	0x35, 0x20, 0x31, 0x34, 0x34, 0x39, 0x2e, 0x39, 0x35, 0x20, 0x33, 0x32, 0x30, 0x2e, 0x33, 0x33,
+	0x20, 0x31, 0x30, 0x36, 0x30, 0x2e, 0x32, 0x33, 0x20, 0x43, 0x20, 0x33, 0x30, 0x31, 0x2e, 0x32,
+	0x36, 0x34, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x35, 0x30, 0x39, 0x20, 0x36, 0x30, 0x31, 0x2e, 0x36,
+	0x39, 0x34, 0x20, 0x33, 0x33, 0x39, 0x2e, 0x31, 0x30, 0x31, 0x20, 0x39, 0x39, 0x31, 0x2e, 0x34,
+	0x31, 0x31, 0x20, 0x33, 0x31, 0x39, 0x2e, 0x39, 0x35, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x34, 0x37, 0x2c, 0x34, 0x36, 0x2c,
+	0x34, 0x37, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x38, 0x35, 0x2e, 0x32, 0x38,
+	0x35, 0x20, 0x31, 0x30, 0x31, 0x30, 0x2e, 0x32, 0x31, 0x20, 0x43, 0x20, 0x36, 0x31, 0x37, 0x2e,
+	0x38, 0x30, 0x33, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e, 0x38, 0x34, 0x20, 0x36, 0x31, 0x39, 0x2e,
+	0x31, 0x35, 0x38, 0x20, 0x31, 0x30, 0x32, 0x38, 0x2e, 0x34, 0x35, 0x20, 0x36, 0x32, 0x31, 0x2e,
+	0x39, 0x37, 0x39, 0x20, 0x31, 0x30, 0x35, 0x33, 0x2e, 0x35, 0x37, 0x20, 0x43, 0x20, 0x36, 0x32,
+	0x39, 0x2e, 0x37, 0x33, 0x31, 0x20, 0x31, 0x31, 0x32, 0x32, 0x2e, 0x35, 0x39, 0x20, 0x36, 0x35,
+	0x37, 0x2e, 0x36, 0x32, 0x32, 0x20, 0x31, 0x31, 0x39, 0x31, 0x2e, 0x38, 0x20, 0x37, 0x30, 0x30,
+	0x2e, 0x34, 0x33, 0x35, 0x20, 0x31, 0x32, 0x34, 0x36, 0x2e, 0x35, 0x34, 0x20, 0x43, 0x20, 0x37,
+	0x36, 0x38, 0x2e, 0x30, 0x34, 0x39, 0x20, 0x31, 0x33, 0x33, 0x33, 0x2e, 0x31, 0x35, 0x20, 0x38,
+	0x36, 0x37, 0x2e, 0x34, 0x20, 0x31, 0x33, 0x38, 0x39, 0x2e, 0x32, 0x33, 0x20, 0x39, 0x37, 0x36,
+	0x2e, 0x34, 0x38, 0x38, 0x20, 0x31, 0x34, 0x30, 0x32, 0x2e, 0x33, 0x37, 0x20, 0x43, 0x20, 0x31,
+	0x30, 0x38, 0x36, 0x2e, 0x39, 0x36, 0x20, 0x31, 0x34, 0x31, 0x35, 0x2e, 0x34, 0x35, 0x20, 0x31,
+	0x31, 0x39, 0x38, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x33, 0x38, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x31,
+	0x32, 0x38, 0x35, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x33, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x33, 0x36, 0x38, 0x2e, 0x37, 0x38, 0x20, 0x31, 0x32, 0x34, 0x38, 0x2e, 0x35, 0x39, 0x20,
+	0x31, 0x34, 0x32, 0x36, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x31, 0x34, 0x35, 0x2e, 0x31, 0x33, 0x20,
+	0x31, 0x34, 0x33, 0x32, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x30, 0x33, 0x38, 0x2e, 0x32, 0x37, 0x20,
+	0x43, 0x20, 0x31, 0x34, 0x33, 0x33, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x30, 0x32, 0x39, 0x2e, 0x33,
+	0x36, 0x20, 0x31, 0x34, 0x33, 0x37, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x30, 0x32, 0x31, 0x2e, 0x34,
+	0x20, 0x31, 0x34, 0x34, 0x34, 0x2e, 0x33, 0x20, 0x31, 0x30, 0x31, 0x36, 0x2e, 0x30, 0x33, 0x20,
+	0x43, 0x20, 0x31, 0x34, 0x35, 0x31, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x31, 0x30, 0x2e, 0x39,
+	0x34, 0x20, 0x31, 0x34, 0x35, 0x39, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x30, 0x30, 0x38, 0x2e, 0x39,
+	0x35, 0x20, 0x31, 0x34, 0x36, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x31, 0x30, 0x31, 0x30, 0x2e, 0x35,
+	0x36, 0x20, 0x43, 0x20, 0x31, 0x35, 0x30, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x31, 0x37,
+	0x2e, 0x33, 0x36, 0x20, 0x31, 0x34, 0x39, 0x30, 0x2e, 0x38, 0x37, 0x20, 0x31, 0x30, 0x36, 0x32,
+	0x2e, 0x35, 0x32, 0x20, 0x31, 0x34, 0x38, 0x36, 0x2e, 0x34, 0x33, 0x20, 0x31, 0x30, 0x38, 0x37,
+	0x2e, 0x30, 0x39, 0x20, 0x43, 0x20, 0x31, 0x34, 0x37, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x31, 0x31,
+	0x32, 0x33, 0x2e, 0x34, 0x36, 0x20, 0x31, 0x34, 0x36, 0x35, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x31,
+	0x36, 0x31, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x34, 0x34, 0x39, 0x2e, 0x38, 0x39, 0x20, 0x31, 0x31,
+	0x39, 0x34, 0x2e, 0x39, 0x39, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x35, 0x2e, 0x30, 0x36, 0x20,
+	0x31, 0x33, 0x30, 0x38, 0x2e, 0x31, 0x37, 0x20, 0x31, 0x32, 0x39, 0x37, 0x2e, 0x35, 0x38, 0x20,
+	0x31, 0x33, 0x39, 0x34, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x31, 0x37, 0x38, 0x2e, 0x38, 0x33, 0x20,
+	0x31, 0x34, 0x33, 0x36, 0x2e, 0x33, 0x36, 0x20, 0x43, 0x20, 0x31, 0x30, 0x39, 0x35, 0x2e, 0x32,
+	0x37, 0x20, 0x31, 0x34, 0x36, 0x35, 0x2e, 0x34, 0x38, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x31,
+	0x35, 0x20, 0x31, 0x34, 0x37, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x39, 0x31, 0x38, 0x2e, 0x39, 0x37,
+	0x32, 0x20, 0x31, 0x34, 0x35, 0x30, 0x2e, 0x31, 0x39, 0x20, 0x43, 0x20, 0x38, 0x38, 0x37, 0x2e,
+	0x36, 0x36, 0x35, 0x20, 0x31, 0x34, 0x34, 0x32, 0x2e, 0x35, 0x37, 0x20, 0x38, 0x35, 0x30, 0x2e,
+	0x30, 0x39, 0x32, 0x20, 0x31, 0x34, 0x32, 0x38, 0x2e, 0x32, 0x33, 0x20, 0x38, 0x32, 0x30, 0x2e,
+	0x39, 0x37, 0x31, 0x20, 0x31, 0x34, 0x31, 0x34, 0x2e, 0x32, 0x33, 0x20, 0x43, 0x20, 0x37, 0x30,
+	0x39, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x33, 0x35, 0x39, 0x2e, 0x38, 0x38, 0x20, 0x36, 0x32, 0x33,
+	0x2e, 0x39, 0x32, 0x32, 0x20, 0x31, 0x32, 0x36, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x35, 0x38, 0x32,
+	0x2e, 0x37, 0x32, 0x31, 0x20, 0x31, 0x31, 0x34, 0x36, 0x2e, 0x38, 0x39, 0x20, 0x43, 0x20, 0x35,
+	0x37, 0x33, 0x2e, 0x38, 0x32, 0x31, 0x20, 0x31, 0x31, 0x32, 0x31, 0x2e, 0x32, 0x37, 0x20, 0x35,
+	0x35, 0x34, 0x2e, 0x31, 0x31, 0x33, 0x20, 0x31, 0x30, 0x35, 0x32, 0x20, 0x35, 0x36, 0x34, 0x2e,
+	0x37, 0x36, 0x31, 0x20, 0x31, 0x30, 0x32, 0x35, 0x2e, 0x35, 0x36, 0x20, 0x43, 0x20, 0x35, 0x36,
+	0x37, 0x2e, 0x38, 0x36, 0x20, 0x31, 0x30, 0x31, 0x37, 0x2e, 0x38, 0x36, 0x20, 0x35, 0x37, 0x37,
+	0x2e, 0x34, 0x36, 0x31, 0x20, 0x31, 0x30, 0x31, 0x32, 0x2e, 0x39, 0x20, 0x35, 0x38, 0x35, 0x2e,
+	0x32, 0x38, 0x35, 0x20, 0x31, 0x30, 0x31, 0x30, 0x2e, 0x32, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x34, 0x37, 0x2c, 0x34,
+	0x36, 0x2c, 0x34, 0x37, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x34, 0x35, 0x2e,
+	0x31, 0x36, 0x38, 0x20, 0x37, 0x30, 0x38, 0x2e, 0x34, 0x36, 0x37, 0x20, 0x43, 0x20, 0x38, 0x39,
+	0x30, 0x2e, 0x36, 0x39, 0x32, 0x20, 0x37, 0x30, 0x33, 0x2e, 0x38, 0x34, 0x36, 0x20, 0x39, 0x33,
+	0x31, 0x2e, 0x33, 0x31, 0x38, 0x20, 0x37, 0x33, 0x37, 0x2e, 0x30, 0x36, 0x33, 0x20, 0x39, 0x33,
+	0x35, 0x2e, 0x38, 0x33, 0x31, 0x20, 0x37, 0x38, 0x32, 0x2e, 0x35, 0x39, 0x38, 0x20, 0x43, 0x20,
+	0x39, 0x34, 0x30, 0x2e, 0x33, 0x34, 0x35, 0x20, 0x38, 0x32, 0x38, 0x2e, 0x31, 0x33, 0x32, 0x20,
+	0x39, 0x30, 0x37, 0x2e, 0x30, 0x33, 0x32, 0x20, 0x38, 0x36, 0x38, 0x2e, 0x36, 0x37, 0x39, 0x20,
+	0x38, 0x36, 0x31, 0x2e, 0x34, 0x38, 0x37, 0x20, 0x38, 0x37, 0x33, 0x2e, 0x30, 0x38, 0x35, 0x20,
+	0x43, 0x20, 0x38, 0x31, 0x36, 0x2e, 0x30, 0x39, 0x34, 0x20, 0x38, 0x37, 0x37, 0x2e, 0x34, 0x37,
+	0x37, 0x20, 0x37, 0x37, 0x35, 0x2e, 0x37, 0x31, 0x31, 0x20, 0x38, 0x34, 0x34, 0x2e, 0x32, 0x39,
+	0x38, 0x20, 0x37, 0x37, 0x31, 0x2e, 0x32, 0x31, 0x33, 0x20, 0x37, 0x39, 0x38, 0x2e, 0x39, 0x31,
+	0x36, 0x20, 0x43, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x37, 0x35, 0x33, 0x2e,
+	0x35, 0x33, 0x34, 0x20, 0x37, 0x39, 0x39, 0x2e, 0x37, 0x39, 0x37, 0x20, 0x37, 0x31, 0x33, 0x2e,
+	0x30, 0x37, 0x33, 0x20, 0x38, 0x34, 0x35, 0x2e, 0x31, 0x36, 0x38, 0x20, 0x37, 0x30, 0x38, 0x2e,
+	0x34, 0x36, 0x37, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c,
+	0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x72, 0x67, 0x62, 0x28, 0x34, 0x37, 0x2c, 0x34, 0x36, 0x2c, 0x34, 0x37, 0x29, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x20, 0x31, 0x31, 0x38, 0x39, 0x2e, 0x36, 0x35, 0x20, 0x37, 0x30, 0x38, 0x2e,
+	0x35, 0x33, 0x33, 0x20, 0x43, 0x20, 0x31, 0x32, 0x33, 0x35, 0x2e, 0x33, 0x20, 0x37, 0x30, 0x34,
+	0x2e, 0x31, 0x33, 0x33, 0x20, 0x31, 0x32, 0x37, 0x35, 0x2e, 0x38, 0x31, 0x20, 0x37, 0x33, 0x37,
+	0x2e, 0x37, 0x33, 0x20, 0x31, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x32, 0x20, 0x37, 0x38, 0x33, 0x2e,
+	0x34, 0x30, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x38, 0x34, 0x2e, 0x30, 0x34, 0x20, 0x38, 0x32,
+	0x39, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x32, 0x35, 0x30, 0x2e, 0x32, 0x20, 0x38, 0x36, 0x39, 0x2e,
+	0x33, 0x38, 0x20, 0x31, 0x32, 0x30, 0x34, 0x2e, 0x35, 0x20, 0x38, 0x37, 0x33, 0x2e, 0x32, 0x31,
+	0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x38, 0x37, 0x37, 0x2e,
+	0x30, 0x31, 0x38, 0x20, 0x31, 0x31, 0x31, 0x39, 0x2e, 0x33, 0x32, 0x20, 0x38, 0x34, 0x33, 0x2e,
+	0x35, 0x33, 0x20, 0x31, 0x31, 0x31, 0x35, 0x2e, 0x32, 0x34, 0x20, 0x37, 0x39, 0x38, 0x2e, 0x32,
+	0x35, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x31, 0x31, 0x2e, 0x31, 0x36, 0x20, 0x37, 0x35, 0x32,
+	0x2e, 0x39, 0x37, 0x33, 0x20, 0x31, 0x31, 0x34, 0x34, 0x2e, 0x34, 0x20, 0x37, 0x31, 0x32, 0x2e,
+	0x38, 0x39, 0x34, 0x20, 0x31, 0x31, 0x38, 0x39, 0x2e, 0x36, 0x35, 0x20, 0x37, 0x30, 0x38, 0x2e,
+	0x35, 0x33, 0x33, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e
+};
+
+static const unsigned char icon_client_grey_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0xca, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x51, 0xbf,
+	0x6f, 0xda, 0x40, 0x14, 0xfe, 0xae, 0x86, 0x01, 0x89, 0x00, 0x41, 0x20, 0x6c, 0xf0, 0x05, 0x1b,
+	0x24, 0xb0, 0x52, 0x09, 0xa9, 0x1d, 0x3a, 0xa5, 0x92, 0x87, 0xb6, 0x62, 0xea, 0x96, 0x4a, 0xa1,
+	0x52, 0xe6, 0x34, 0xf9, 0x7f, 0xe8, 0xd8, 0xa5, 0x73, 0x05, 0x5b, 0xb0, 0x51, 0xc3, 0x7f, 0xe0,
+	0x21, 0x4c, 0x96, 0x25, 0xec, 0x80, 0x14, 0x0b, 0x63, 0x7b, 0xe8, 0x58, 0xd7, 0xd7, 0x21, 0xb2,
+	0x53, 0x27, 0xcd, 0x9c, 0x37, 0xbd, 0x7b, 0x77, 0xdf, 0x8f, 0xf7, 0x1d, 0xf0, 0xdc, 0x45, 0xfe,
+	0x33, 0x7b, 0x21, 0xcb, 0xf2, 0xa8, 0xdb, 0xe9, 0x5e, 0xec, 0x57, 0xf7, 0xfb, 0x84, 0x10, 0xe2,
+	0xef, 0x7c, 0xf3, 0xc6, 0xb9, 0xf9, 0xda, 0xa2, 0xad, 0xef, 0x8b, 0xc5, 0x22, 0x7a, 0x92, 0x40,
+	0x14, 0xc5, 0x6a, 0x47, 0xee, 0xe8, 0xc3, 0xe1, 0xf0, 0x35, 0x2f, 0xf0, 0x19, 0x56, 0xd7, 0x75,
+	0x31, 0xbb, 0x9c, 0x19, 0xb7, 0xee, 0xed, 0x07, 0xd3, 0x34, 0x77, 0xa9, 0xda, 0x3f, 0x6f, 0x38,
+	0x59, 0x92, 0xb5, 0x93, 0xd1, 0xc9, 0x23, 0x30, 0x00, 0xf0, 0x3c, 0x8f, 0xd1, 0xe7, 0xd1, 0xab,
+	0xa6, 0xd0, 0x9c, 0x03, 0xe0, 0x52, 0x50, 0xd2, 0xf4, 0xba, 0xbd, 0xd3, 0xe3, 0x4f, 0xc7, 0xe7,
+	0x95, 0x4a, 0x05, 0x8c, 0xb1, 0x3b, 0x7b, 0xe4, 0xce, 0x20, 0x63, 0x0c, 0x84, 0x10, 0x70, 0x1c,
+	0x07, 0x5e, 0xe0, 0x79, 0xc7, 0x71, 0x9c, 0x20, 0x08, 0x8c, 0x8c, 0x03, 0x7a, 0x40, 0xcf, 0x12,
+	0xe5, 0xf9, 0x7c, 0x0e, 0x6d, 0xa6, 0xa5, 0xea, 0xba, 0xa6, 0x43, 0xd7, 0x74, 0x00, 0x40, 0xa3,
+	0xd1, 0x80, 0x24, 0x49, 0x17, 0xc9, 0x5d, 0x2e, 0x69, 0xaa, 0xb5, 0xaa, 0x92, 0xf4, 0x8a, 0xa2,
+	0x20, 0x8a, 0xee, 0xb3, 0xea, 0x2b, 0x7d, 0x80, 0xdd, 0xaf, 0x53, 0xab, 0xd5, 0x7a, 0x8f, 0x08,
+	0x12, 0xbb, 0x00, 0x40, 0x29, 0xcd, 0xec, 0xdf, 0x6e, 0xb7, 0x33, 0x67, 0x42, 0x48, 0x4a, 0x97,
+	0x12, 0xf8, 0x3b, 0xdf, 0x04, 0xf0, 0x06, 0x00, 0xe2, 0x38, 0xc6, 0xf2, 0x7a, 0x89, 0x20, 0x0c,
+	0x90, 0xe3, 0x72, 0xd8, 0x2b, 0xed, 0x61, 0x30, 0x18, 0xa4, 0x22, 0x9e, 0xe7, 0x59, 0x09, 0x2e,
+	0xcd, 0x60, 0xed, 0xac, 0xc7, 0xae, 0xeb, 0x82, 0x31, 0x86, 0xab, 0x9f, 0x57, 0x10, 0x9a, 0x02,
+	0x54, 0x55, 0xc5, 0xd1, 0xdb, 0x23, 0x50, 0x4a, 0xa1, 0xeb, 0x3a, 0xe2, 0x38, 0xc6, 0x76, 0xbb,
+	0x85, 0x6d, 0xdb, 0xe3, 0x04, 0x97, 0xfe, 0x82, 0x1f, 0xfa, 0xcb, 0xe8, 0x77, 0xf4, 0xf1, 0xf0,
+	0xe5, 0x21, 0x2f, 0x8a, 0x22, 0xca, 0xe5, 0x72, 0x6a, 0xb9, 0x50, 0x28, 0xa0, 0xd5, 0x6a, 0x81,
+	0x31, 0x86, 0xc9, 0x64, 0x72, 0x5d, 0x2a, 0x95, 0xbe, 0xd8, 0xb6, 0x1d, 0x67, 0x08, 0x00, 0xb0,
+	0x7c, 0x3e, 0xff, 0xc3, 0xb1, 0x9d, 0xf7, 0xf4, 0x80, 0xf2, 0xc5, 0x62, 0x31, 0xb3, 0x77, 0x18,
+	0x86, 0x98, 0x4e, 0xa7, 0xcb, 0xf5, 0x7a, 0xfd, 0xce, 0x30, 0x8c, 0x5f, 0x69, 0x1e, 0x78, 0x50,
+	0xaa, 0xaa, 0xe6, 0x36, 0x9b, 0xcd, 0xa9, 0x24, 0x49, 0xe7, 0xf5, 0x7a, 0xbd, 0x47, 0x40, 0xe0,
+	0xed, 0x3c, 0x6b, 0xb5, 0x5a, 0x8d, 0x2d, 0xcb, 0xfa, 0x06, 0xe0, 0xcf, 0x43, 0xcc, 0xf3, 0xd6,
+	0x5f, 0x5a, 0x7a, 0xa0, 0x00, 0xe0, 0x96, 0x32, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+	0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_grey_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x34, 0x2c, 0x33,
+	0x33, 0x2c, 0x33, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x30, 0x37,
+	0x2e, 0x37, 0x33, 0x20, 0x32, 0x36, 0x34, 0x2e, 0x30, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x34,
+	0x32, 0x38, 0x2e, 0x33, 0x20, 0x32, 0x35, 0x34, 0x2e, 0x31, 0x38, 0x37, 0x20, 0x31, 0x37, 0x37,
+	0x37, 0x2e, 0x32, 0x39, 0x20, 0x35, 0x38, 0x37, 0x2e, 0x30, 0x31, 0x32, 0x20, 0x31, 0x37, 0x38,
+	0x37, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e, 0x35, 0x38, 0x20, 0x43, 0x20, 0x31,
+	0x37, 0x39, 0x37, 0x2e, 0x34, 0x37, 0x20, 0x31, 0x34, 0x32, 0x38, 0x2e, 0x31, 0x35, 0x20, 0x31,
+	0x34, 0x36, 0x34, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x37, 0x37, 0x37, 0x2e, 0x33, 0x33, 0x20, 0x31,
+	0x30, 0x34, 0x34, 0x2e, 0x32, 0x38, 0x20, 0x31, 0x37, 0x38, 0x37, 0x2e, 0x36, 0x35, 0x20, 0x43,
+	0x20, 0x36, 0x32, 0x33, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x37, 0x39, 0x37, 0x2e, 0x39, 0x38, 0x20,
+	0x32, 0x37, 0x33, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x31, 0x34, 0x36, 0x35, 0x2e, 0x30, 0x33, 0x20,
+	0x32, 0x36, 0x33, 0x2e, 0x37, 0x38, 0x31, 0x20, 0x31, 0x30, 0x34, 0x34, 0x2e, 0x31, 0x33, 0x20,
+	0x43, 0x20, 0x32, 0x35, 0x33, 0x2e, 0x36, 0x38, 0x33, 0x20, 0x36, 0x32, 0x33, 0x2e, 0x32, 0x33,
+	0x39, 0x20, 0x35, 0x38, 0x36, 0x2e, 0x38, 0x32, 0x35, 0x20, 0x32, 0x37, 0x33, 0x2e, 0x39, 0x31,
+	0x32, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e, 0x37, 0x33, 0x20, 0x32, 0x36, 0x34, 0x2e, 0x30, 0x34,
+	0x36, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74,
+	0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67,
+	0x62, 0x28, 0x31, 0x35, 0x38, 0x2c, 0x31, 0x35, 0x38, 0x2c, 0x31, 0x35, 0x38, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39, 0x39, 0x38, 0x2e, 0x38, 0x36, 0x20, 0x33, 0x32, 0x38, 0x2e,
+	0x31, 0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x38, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x33, 0x31, 0x33,
+	0x2e, 0x33, 0x30, 0x32, 0x20, 0x31, 0x37, 0x30, 0x38, 0x2e, 0x34, 0x32, 0x20, 0x36, 0x31, 0x33,
+	0x2e, 0x33, 0x39, 0x37, 0x20, 0x31, 0x37, 0x32, 0x33, 0x2e, 0x35, 0x20, 0x39, 0x39, 0x38, 0x2e,
+	0x35, 0x38, 0x32, 0x20, 0x43, 0x20, 0x31, 0x37, 0x33, 0x38, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x33,
+	0x38, 0x33, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x34, 0x33, 0x38, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x37,
+	0x30, 0x38, 0x2e, 0x33, 0x31, 0x20, 0x31, 0x30, 0x35, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x37, 0x32,
+	0x33, 0x2e, 0x36, 0x31, 0x20, 0x43, 0x20, 0x36, 0x36, 0x38, 0x2e, 0x30, 0x30, 0x37, 0x20, 0x31,
+	0x37, 0x33, 0x38, 0x2e, 0x39, 0x33, 0x20, 0x33, 0x34, 0x33, 0x2e, 0x31, 0x34, 0x33, 0x20, 0x31,
+	0x34, 0x33, 0x38, 0x2e, 0x37, 0x32, 0x20, 0x33, 0x32, 0x38, 0x2e, 0x30, 0x34, 0x38, 0x20, 0x31,
+	0x30, 0x35, 0x33, 0x2e, 0x32, 0x32, 0x20, 0x43, 0x20, 0x33, 0x31, 0x32, 0x2e, 0x39, 0x35, 0x34,
+	0x20, 0x36, 0x36, 0x37, 0x2e, 0x37, 0x32, 0x20, 0x36, 0x31, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x33,
+	0x34, 0x33, 0x2e, 0x30, 0x33, 0x31, 0x20, 0x39, 0x39, 0x38, 0x2e, 0x38, 0x36, 0x20, 0x33, 0x32,
+	0x38, 0x2e, 0x31, 0x36, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x34, 0x2c, 0x33, 0x33, 0x2c, 0x33, 0x34, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x31, 0x31, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x31, 0x38,
+	0x35, 0x2e, 0x34, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x31, 0x33, 0x2e, 0x31, 0x31, 0x20, 0x31,
+	0x31, 0x38, 0x35, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x30, 0x31, 0x34, 0x2e, 0x35, 0x35, 0x20, 0x31,
+	0x31, 0x38, 0x35, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x30, 0x31, 0x36, 0x20, 0x31, 0x31, 0x38, 0x35,
+	0x2e, 0x32, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x34, 0x33, 0x2e, 0x34, 0x37, 0x20, 0x31, 0x31,
+	0x38, 0x32, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x32, 0x36, 0x36, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x32,
+	0x33, 0x30, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x33, 0x35, 0x39, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x33,
+	0x31, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x43, 0x20, 0x31, 0x33, 0x37, 0x36, 0x2e, 0x36, 0x37, 0x20,
+	0x31, 0x33, 0x33, 0x34, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x34, 0x31, 0x39, 0x2e, 0x39, 0x37, 0x20,
+	0x31, 0x33, 0x37, 0x39, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x34, 0x31, 0x39, 0x2e, 0x39, 0x33, 0x20,
+	0x31, 0x34, 0x30, 0x32, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20, 0x31, 0x34, 0x31, 0x39, 0x2e, 0x39,
+	0x39, 0x20, 0x31, 0x34, 0x31, 0x31, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x34, 0x31, 0x36, 0x2e, 0x33,
+	0x37, 0x20, 0x31, 0x34, 0x31, 0x39, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x34, 0x30, 0x39, 0x2e, 0x39,
+	0x36, 0x20, 0x31, 0x34, 0x32, 0x35, 0x2e, 0x35, 0x31, 0x20, 0x43, 0x20, 0x31, 0x34, 0x30, 0x34,
+	0x2e, 0x35, 0x38, 0x20, 0x31, 0x34, 0x33, 0x30, 0x2e, 0x33, 0x37, 0x20, 0x31, 0x33, 0x39, 0x37,
+	0x2e, 0x37, 0x36, 0x20, 0x31, 0x34, 0x33, 0x33, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x33, 0x39, 0x30,
+	0x2e, 0x35, 0x33, 0x20, 0x31, 0x34, 0x33, 0x34, 0x2e, 0x32, 0x31, 0x20, 0x43, 0x20, 0x31, 0x33,
+	0x36, 0x38, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x34, 0x33, 0x36, 0x2e, 0x31, 0x38, 0x20, 0x31, 0x33,
+	0x35, 0x37, 0x2e, 0x38, 0x33, 0x20, 0x31, 0x34, 0x31, 0x34, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x34,
+	0x36, 0x2e, 0x34, 0x36, 0x20, 0x31, 0x33, 0x39, 0x39, 0x2e, 0x32, 0x31, 0x20, 0x43, 0x20, 0x31,
+	0x32, 0x37, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x33, 0x30, 0x35, 0x2e, 0x33, 0x35, 0x20, 0x31,
+	0x31, 0x35, 0x38, 0x2e, 0x38, 0x20, 0x31, 0x32, 0x35, 0x33, 0x2e, 0x37, 0x20, 0x31, 0x30, 0x34,
+	0x33, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x32, 0x34, 0x38, 0x2e, 0x39, 0x39, 0x20, 0x43, 0x20, 0x31,
+	0x30, 0x31, 0x37, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x32, 0x34, 0x37, 0x2e, 0x38, 0x37, 0x20, 0x39,
+	0x39, 0x30, 0x2e, 0x37, 0x31, 0x36, 0x20, 0x31, 0x32, 0x34, 0x39, 0x2e, 0x32, 0x20, 0x39, 0x36,
+	0x34, 0x2e, 0x37, 0x32, 0x31, 0x20, 0x31, 0x32, 0x35, 0x32, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20,
+	0x38, 0x37, 0x34, 0x2e, 0x39, 0x33, 0x38, 0x20, 0x31, 0x32, 0x36, 0x36, 0x2e, 0x35, 0x37, 0x20,
+	0x37, 0x38, 0x39, 0x2e, 0x31, 0x32, 0x31, 0x20, 0x31, 0x33, 0x30, 0x36, 0x2e, 0x35, 0x34, 0x20,
+	0x37, 0x32, 0x36, 0x2e, 0x30, 0x39, 0x38, 0x20, 0x31, 0x33, 0x37, 0x33, 0x2e, 0x32, 0x39, 0x20,
+	0x43, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x33, 0x32, 0x31, 0x20, 0x31, 0x33, 0x38, 0x37, 0x2e, 0x36,
+	0x34, 0x20, 0x37, 0x30, 0x32, 0x2e, 0x30, 0x39, 0x31, 0x20, 0x31, 0x34, 0x30, 0x34, 0x2e, 0x32,
+	0x38, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x37, 0x37, 0x37, 0x20, 0x31, 0x34, 0x32, 0x30, 0x2e, 0x34,
+	0x36, 0x20, 0x43, 0x20, 0x36, 0x37, 0x39, 0x2e, 0x34, 0x38, 0x32, 0x20, 0x31, 0x34, 0x33, 0x36,
+	0x2e, 0x36, 0x31, 0x20, 0x36, 0x35, 0x38, 0x2e, 0x33, 0x33, 0x32, 0x20, 0x31, 0x34, 0x33, 0x39,
+	0x2e, 0x34, 0x31, 0x20, 0x36, 0x34, 0x33, 0x2e, 0x31, 0x39, 0x32, 0x20, 0x31, 0x34, 0x32, 0x36,
+	0x2e, 0x37, 0x36, 0x20, 0x43, 0x20, 0x36, 0x33, 0x36, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x34, 0x32,
+	0x31, 0x2e, 0x31, 0x39, 0x20, 0x36, 0x33, 0x32, 0x2e, 0x36, 0x30, 0x34, 0x20, 0x31, 0x34, 0x31,
+	0x33, 0x2e, 0x31, 0x20, 0x36, 0x33, 0x32, 0x2e, 0x32, 0x32, 0x38, 0x20, 0x31, 0x34, 0x30, 0x34,
+	0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x36, 0x33, 0x31, 0x2e, 0x32, 0x31, 0x35, 0x20, 0x31, 0x33,
+	0x38, 0x35, 0x2e, 0x33, 0x31, 0x20, 0x36, 0x35, 0x35, 0x2e, 0x35, 0x34, 0x31, 0x20, 0x31, 0x33,
+	0x35, 0x38, 0x2e, 0x31, 0x39, 0x20, 0x36, 0x36, 0x38, 0x2e, 0x30, 0x32, 0x34, 0x20, 0x31, 0x33,
+	0x34, 0x33, 0x2e, 0x38, 0x39, 0x20, 0x43, 0x20, 0x37, 0x32, 0x39, 0x2e, 0x39, 0x36, 0x36, 0x20,
+	0x31, 0x32, 0x37, 0x32, 0x2e, 0x39, 0x34, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x30, 0x35, 0x38, 0x20,
+	0x31, 0x32, 0x32, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x39, 0x30, 0x35, 0x2e, 0x39, 0x37, 0x37, 0x20,
+	0x31, 0x32, 0x30, 0x30, 0x2e, 0x37, 0x35, 0x20, 0x43, 0x20, 0x39, 0x34, 0x31, 0x2e, 0x32, 0x37,
+	0x38, 0x20, 0x31, 0x31, 0x39, 0x31, 0x2e, 0x37, 0x39, 0x20, 0x39, 0x37, 0x35, 0x2e, 0x35, 0x32,
+	0x20, 0x31, 0x31, 0x38, 0x37, 0x2e, 0x39, 0x20, 0x31, 0x30, 0x31, 0x31, 0x2e, 0x36, 0x37, 0x20,
+	0x31, 0x31, 0x38, 0x35, 0x2e, 0x34, 0x33, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x34, 0x2c, 0x33, 0x33, 0x2c, 0x33, 0x34,
+	0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x36, 0x30, 0x2e, 0x37, 0x32, 0x34, 0x20,
+	0x37, 0x35, 0x39, 0x2e, 0x38, 0x37, 0x31, 0x20, 0x43, 0x20, 0x38, 0x31, 0x37, 0x2e, 0x31, 0x31,
+	0x34, 0x20, 0x37, 0x35, 0x34, 0x2e, 0x32, 0x33, 0x34, 0x20, 0x38, 0x36, 0x37, 0x2e, 0x33, 0x35,
+	0x39, 0x20, 0x37, 0x39, 0x35, 0x2e, 0x34, 0x37, 0x31, 0x20, 0x38, 0x37, 0x32, 0x2e, 0x38, 0x32,
+	0x39, 0x20, 0x38, 0x35, 0x31, 0x2e, 0x38, 0x37, 0x38, 0x20, 0x43, 0x20, 0x38, 0x37, 0x38, 0x2e,
+	0x32, 0x39, 0x39, 0x20, 0x39, 0x30, 0x38, 0x2e, 0x32, 0x38, 0x35, 0x20, 0x38, 0x33, 0x36, 0x2e,
+	0x39, 0x31, 0x34, 0x20, 0x39, 0x35, 0x38, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x37, 0x38, 0x30, 0x2e,
+	0x34, 0x39, 0x31, 0x20, 0x39, 0x36, 0x33, 0x2e, 0x37, 0x31, 0x20, 0x43, 0x20, 0x37, 0x32, 0x34,
+	0x2e, 0x33, 0x30, 0x34, 0x20, 0x39, 0x36, 0x38, 0x2e, 0x39, 0x39, 0x31, 0x20, 0x36, 0x37, 0x34,
+	0x2e, 0x34, 0x33, 0x36, 0x20, 0x39, 0x32, 0x37, 0x2e, 0x38, 0x31, 0x36, 0x20, 0x36, 0x36, 0x38,
+	0x2e, 0x39, 0x38, 0x39, 0x20, 0x38, 0x37, 0x31, 0x2e, 0x36, 0x34, 0x35, 0x20, 0x43, 0x20, 0x36,
+	0x36, 0x33, 0x2e, 0x35, 0x34, 0x32, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x34, 0x37, 0x34, 0x20, 0x37,
+	0x30, 0x34, 0x2e, 0x35, 0x36, 0x39, 0x20, 0x37, 0x36, 0x35, 0x2e, 0x34, 0x38, 0x34, 0x20, 0x37,
+	0x36, 0x30, 0x2e, 0x37, 0x32, 0x34, 0x20, 0x37, 0x35, 0x39, 0x2e, 0x38, 0x37, 0x31, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31,
+	0x35, 0x38, 0x2c, 0x31, 0x35, 0x38, 0x2c, 0x31, 0x35, 0x38, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x20, 0x37, 0x36, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x38, 0x32, 0x32, 0x2e, 0x34, 0x31, 0x36,
+	0x20, 0x43, 0x20, 0x37, 0x39, 0x30, 0x2e, 0x38, 0x39, 0x38, 0x20, 0x38, 0x32, 0x31, 0x2e, 0x34,
+	0x39, 0x36, 0x20, 0x38, 0x30, 0x39, 0x2e, 0x32, 0x34, 0x32, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x33,
+	0x34, 0x39, 0x20, 0x38, 0x31, 0x30, 0x2e, 0x31, 0x36, 0x20, 0x38, 0x36, 0x30, 0x2e, 0x30, 0x35,
+	0x37, 0x20, 0x43, 0x20, 0x38, 0x31, 0x31, 0x2e, 0x30, 0x37, 0x38, 0x20, 0x38, 0x38, 0x31, 0x2e,
+	0x37, 0x36, 0x35, 0x20, 0x37, 0x39, 0x34, 0x2e, 0x32, 0x32, 0x33, 0x20, 0x39, 0x30, 0x30, 0x2e,
+	0x31, 0x30, 0x37, 0x20, 0x37, 0x37, 0x32, 0x2e, 0x35, 0x31, 0x35, 0x20, 0x39, 0x30, 0x31, 0x2e,
+	0x30, 0x32, 0x33, 0x20, 0x43, 0x20, 0x37, 0x35, 0x30, 0x2e, 0x38, 0x30, 0x39, 0x20, 0x39, 0x30,
+	0x31, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x37, 0x33, 0x32, 0x2e, 0x34, 0x37, 0x31, 0x20, 0x38, 0x38,
+	0x35, 0x2e, 0x30, 0x38, 0x37, 0x20, 0x37, 0x33, 0x31, 0x2e, 0x35, 0x35, 0x33, 0x20, 0x38, 0x36,
+	0x33, 0x2e, 0x33, 0x38, 0x31, 0x20, 0x43, 0x20, 0x37, 0x33, 0x30, 0x2e, 0x36, 0x33, 0x35, 0x20,
+	0x38, 0x34, 0x31, 0x2e, 0x36, 0x37, 0x36, 0x20, 0x37, 0x34, 0x37, 0x2e, 0x34, 0x38, 0x35, 0x20,
+	0x38, 0x32, 0x33, 0x2e, 0x33, 0x33, 0x36, 0x20, 0x37, 0x36, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x38,
+	0x32, 0x32, 0x2e, 0x34, 0x31, 0x36, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x34, 0x2c, 0x33, 0x33, 0x2c, 0x33, 0x34, 0x29,
+	0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x32, 0x37, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x37,
+	0x36, 0x30, 0x2e, 0x32, 0x36, 0x31, 0x20, 0x43, 0x20, 0x31, 0x33, 0x32, 0x36, 0x2e, 0x37, 0x35,
+	0x20, 0x37, 0x35, 0x34, 0x2e, 0x39, 0x31, 0x35, 0x20, 0x31, 0x33, 0x37, 0x36, 0x2e, 0x36, 0x32,
+	0x20, 0x37, 0x39, 0x36, 0x2e, 0x31, 0x39, 0x34, 0x20, 0x31, 0x33, 0x38, 0x31, 0x2e, 0x38, 0x37,
+	0x20, 0x38, 0x35, 0x32, 0x2e, 0x34, 0x30, 0x34, 0x20, 0x43, 0x20, 0x31, 0x33, 0x38, 0x37, 0x2e,
+	0x31, 0x32, 0x20, 0x39, 0x30, 0x38, 0x2e, 0x36, 0x31, 0x34, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e,
+	0x37, 0x36, 0x20, 0x39, 0x35, 0x38, 0x2e, 0x34, 0x31, 0x35, 0x20, 0x31, 0x32, 0x38, 0x39, 0x2e,
+	0x35, 0x34, 0x20, 0x39, 0x36, 0x33, 0x2e, 0x35, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x33, 0x33,
+	0x2e, 0x34, 0x35, 0x20, 0x39, 0x36, 0x38, 0x2e, 0x37, 0x31, 0x33, 0x20, 0x31, 0x31, 0x38, 0x33,
+	0x2e, 0x38, 0x20, 0x39, 0x32, 0x37, 0x2e, 0x34, 0x37, 0x20, 0x31, 0x31, 0x37, 0x38, 0x2e, 0x35,
+	0x36, 0x20, 0x38, 0x37, 0x31, 0x2e, 0x33, 0x39, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x33,
+	0x2e, 0x33, 0x32, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x33, 0x32, 0x31, 0x20, 0x31, 0x32, 0x31, 0x34,
+	0x2e, 0x34, 0x38, 0x20, 0x37, 0x36, 0x35, 0x2e, 0x35, 0x39, 0x35, 0x20, 0x31, 0x32, 0x37, 0x30,
+	0x2e, 0x35, 0x35, 0x20, 0x37, 0x36, 0x30, 0x2e, 0x32, 0x36, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x35, 0x38, 0x2c,
+	0x31, 0x35, 0x38, 0x2c, 0x31, 0x35, 0x38, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31,
+	0x32, 0x37, 0x32, 0x2e, 0x33, 0x20, 0x38, 0x32, 0x33, 0x2e, 0x34, 0x34, 0x35, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x39, 0x33, 0x2e, 0x32, 0x39, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x38, 0x39, 0x32, 0x20,
+	0x31, 0x33, 0x31, 0x34, 0x2e, 0x30, 0x32, 0x20, 0x38, 0x33, 0x32, 0x2e, 0x31, 0x31, 0x33, 0x20,
+	0x31, 0x33, 0x31, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x38, 0x35, 0x33, 0x2e, 0x30, 0x36, 0x34, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x32, 0x33, 0x2e, 0x34, 0x38, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x30, 0x31,
+	0x35, 0x20, 0x31, 0x33, 0x31, 0x30, 0x2e, 0x34, 0x33, 0x20, 0x38, 0x39, 0x34, 0x2e, 0x38, 0x35,
+	0x39, 0x20, 0x31, 0x32, 0x38, 0x39, 0x2e, 0x35, 0x32, 0x20, 0x38, 0x39, 0x39, 0x2e, 0x37, 0x36,
+	0x20, 0x43, 0x20, 0x31, 0x32, 0x36, 0x38, 0x2e, 0x33, 0x36, 0x20, 0x39, 0x30, 0x34, 0x2e, 0x37,
+	0x31, 0x39, 0x20, 0x31, 0x32, 0x34, 0x37, 0x2e, 0x32, 0x32, 0x20, 0x38, 0x39, 0x31, 0x2e, 0x34,
+	0x38, 0x32, 0x20, 0x31, 0x32, 0x34, 0x32, 0x2e, 0x34, 0x33, 0x20, 0x38, 0x37, 0x30, 0x2e, 0x32,
+	0x38, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x35, 0x20, 0x38, 0x34, 0x39,
+	0x2e, 0x30, 0x38, 0x35, 0x20, 0x31, 0x32, 0x35, 0x31, 0x2e, 0x30, 0x36, 0x20, 0x38, 0x32, 0x38,
+	0x2e, 0x30, 0x35, 0x31, 0x20, 0x31, 0x32, 0x37, 0x32, 0x2e, 0x33, 0x20, 0x38, 0x32, 0x33, 0x2e,
+	0x34, 0x34, 0x35, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e
+};
+
+static const unsigned char icon_client_invalidrating_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x02, 0x36, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x52, 0x4d,
+	0x4f, 0x13, 0x51, 0x14, 0x3d, 0xf3, 0xde, 0x4c, 0xc7, 0x29, 0x99, 0x52, 0x3e, 0x9d, 0x69, 0xa7,
+	0xa5, 0x95, 0x42, 0x0c, 0x65, 0xc3, 0xc2, 0xb8, 0x72, 0x29, 0x26, 0x86, 0x85, 0x6e, 0x0c, 0x21,
+	0xd1, 0xb5, 0x2b, 0x12, 0x6d, 0xe2, 0xc2, 0xf8, 0x03, 0x34, 0xba, 0xd7, 0xbd, 0x71, 0xa3, 0x1b,
+	0x24, 0x1a, 0xa3, 0x31, 0x21, 0x48, 0x0d, 0x09, 0x9f, 0x0a, 0x19, 0xdc, 0xf0, 0x65, 0x3b, 0x38,
+	0x34, 0x6a, 0x29, 0x90, 0x58, 0xa7, 0x33, 0xf3, 0x9e, 0x0b, 0x3a, 0xa6, 0x94, 0xbd, 0x9e, 0xd5,
+	0x7d, 0xf7, 0x9e, 0x7b, 0xee, 0xb9, 0xef, 0x3d, 0xe0, 0x7f, 0x43, 0x08, 0x82, 0x94, 0xa6, 0xa5,
+	0x08, 0x21, 0x19, 0x00, 0x10, 0x08, 0xd9, 0xde, 0xb0, 0xac, 0xf5, 0x46, 0x62, 0x2a, 0xd5, 0xa5,
+	0x91, 0x9a, 0x34, 0x08, 0x00, 0x9e, 0xc8, 0xec, 0x42, 0x61, 0xd7, 0x04, 0x00, 0x31, 0x20, 0xf4,
+	0x19, 0xc2, 0xc2, 0xf0, 0x50, 0xa8, 0x03, 0x00, 0xde, 0x2d, 0xff, 0xde, 0xdf, 0xb0, 0x10, 0x6d,
+	0x14, 0x88, 0x47, 0xe8, 0xfb, 0x2b, 0xe7, 0x43, 0x59, 0x00, 0xf8, 0xf8, 0xc5, 0xf1, 0x55, 0x35,
+	0x1b, 0x36, 0x4d, 0xb3, 0x46, 0x02, 0xc2, 0x6e, 0x05, 0x6f, 0x67, 0xbf, 0x76, 0x60, 0x61, 0xa7,
+	0x1b, 0xf6, 0x1e, 0x99, 0x6a, 0xb6, 0xfa, 0xfd, 0x80, 0x4e, 0xe6, 0x37, 0x5b, 0xb1, 0xbc, 0x1b,
+	0xc3, 0x96, 0xcd, 0x97, 0x4c, 0xd3, 0xac, 0x1d, 0x23, 0xf4, 0x18, 0xfa, 0xd5, 0xf9, 0xb9, 0x39,
+	0xbe, 0x66, 0x9a, 0x3c, 0x1d, 0xd7, 0xaf, 0x37, 0x0b, 0x9c, 0x49, 0x68, 0xe7, 0x26, 0x27, 0x26,
+	0x78, 0xb9, 0x5c, 0xe6, 0x3d, 0x71, 0xfd, 0x6e, 0x90, 0xff, 0xbb, 0x02, 0x81, 0xd0, 0x11, 0x8d,
+	0x46, 0x21, 0xcb, 0x32, 0x38, 0x48, 0x67, 0xb3, 0x00, 0x83, 0xd0, 0xde, 0xd6, 0xd6, 0x06, 0x45,
+	0x51, 0x10, 0x56, 0x94, 0xae, 0xe3, 0xea, 0x86, 0xd1, 0x77, 0x6b, 0x7c, 0x7c, 0x8f, 0xd7, 0x71,
+	0x27, 0x77, 0xbb, 0x92, 0x4c, 0x6a, 0xd9, 0xa0, 0x9e, 0xee, 0xee, 0x3e, 0x7d, 0x63, 0x6c, 0xac,
+	0xe0, 0xba, 0x2e, 0xe7, 0x9c, 0xf3, 0x87, 0x0f, 0xee, 0x3b, 0x69, 0x5d, 0xbf, 0x00, 0x00, 0xb4,
+	0x3f, 0x16, 0xeb, 0x94, 0x7d, 0x36, 0x9f, 0x0e, 0xab, 0x9d, 0xd3, 0xf9, 0x19, 0x30, 0x4a, 0x71,
+	0x79, 0x64, 0xe4, 0xd4, 0xca, 0xd2, 0xa7, 0xd1, 0xaa, 0xe3, 0x3c, 0x55, 0x55, 0xd5, 0x57, 0x80,
+	0xd9, 0xb3, 0xad, 0xed, 0xbd, 0xf9, 0x99, 0x0f, 0xf8, 0xc5, 0x3c, 0x0c, 0x0f, 0x5f, 0xa2, 0xdb,
+	0x85, 0xc2, 0xe8, 0xcf, 0xbd, 0xd2, 0x84, 0xd0, 0xaf, 0x69, 0x8f, 0xee, 0x55, 0x43, 0xb9, 0x88,
+	0x40, 0x01, 0x00, 0xeb, 0xac, 0x86, 0x6f, 0xf0, 0x11, 0x05, 0xc5, 0xb3, 0xb0, 0xfb, 0xc4, 0xa1,
+	0xf4, 0x73, 0xee, 0x90, 0x3e, 0x4e, 0x10, 0x09, 0x00, 0x50, 0x64, 0x2e, 0xb6, 0xe1, 0x23, 0xc2,
+	0x09, 0x5e, 0xca, 0xde, 0x94, 0xd8, 0xe2, 0xf1, 0xa1, 0xa0, 0x19, 0x00, 0x32, 0x24, 0x84, 0x4c,
+	0x3d, 0x7e, 0xe5, 0xb9, 0xd9, 0x92, 0x80, 0xaa, 0x51, 0x6f, 0x06, 0x80, 0x04, 0x91, 0x90, 0xc0,
+	0xd1, 0x79, 0xda, 0x77, 0x7a, 0xc9, 0xbe, 0x4c, 0x5e, 0xdb, 0xcc, 0x6b, 0xbe, 0x33, 0x94, 0x98,
+	0x87, 0x8a, 0x24, 0xbd, 0x01, 0x45, 0x7e, 0x8d, 0xd5, 0x4e, 0xd4, 0x0f, 0xb8, 0x8f, 0x92, 0x24,
+	0x4e, 0xd1, 0x58, 0xb2, 0x67, 0x71, 0xc5, 0x39, 0xbc, 0x48, 0x5d, 0xdf, 0xa8, 0x72, 0x1f, 0x36,
+	0x7c, 0x6c, 0x71, 0x0f, 0x2f, 0x42, 0xfe, 0x62, 0x59, 0x14, 0x6e, 0x5a, 0x3b, 0xf6, 0xea, 0x8f,
+	0x48, 0xcb, 0xa0, 0xe0, 0x79, 0x03, 0x0e, 0xe3, 0xb0, 0xb9, 0x87, 0x22, 0x7c, 0x3c, 0x17, 0x6b,
+	0x5b, 0x07, 0xa2, 0x70, 0x2d, 0xf8, 0xca, 0x42, 0x32, 0xa9, 0x0d, 0x88, 0x1e, 0xd1, 0x8f, 0xde,
+	0x94, 0x94, 0x36, 0x2d, 0x6b, 0xb5, 0x71, 0x62, 0xaf, 0x61, 0x64, 0x38, 0x63, 0x29, 0x00, 0x00,
+	0xe5, 0x95, 0xcd, 0xa2, 0xbd, 0x08, 0x80, 0x9f, 0xb0, 0xf6, 0xcf, 0xf1, 0x07, 0x90, 0x7b, 0xe4,
+	0x2b, 0x4f, 0xde, 0xc5, 0x5d, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+	0x82
+};
+
+static const unsigned char icon_client_invalidrating_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x34, 0x31, 0x38, 0x2e, 0x31, 0x37,
+	0x2c, 0x31, 0x35, 0x37, 0x2e, 0x39, 0x37, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30,
+	0x2e, 0x39, 0x30, 0x39, 0x29, 0x22, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61,
+	0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72,
+	0x67, 0x62, 0x28, 0x33, 0x32, 0x2c, 0x32, 0x37, 0x2c, 0x32, 0x36, 0x29, 0x22, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39, 0x2e, 0x33,
+	0x37, 0x31, 0x20, 0x43, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x32, 0x30, 0x38,
+	0x2e, 0x30, 0x34, 0x38, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x34, 0x33, 0x20, 0x32, 0x30, 0x38, 0x2e,
+	0x38, 0x39, 0x35, 0x20, 0x39, 0x32, 0x31, 0x2e, 0x39, 0x34, 0x38, 0x20, 0x32, 0x30, 0x38, 0x2e,
+	0x39, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x30, 0x35, 0x20, 0x32, 0x30, 0x38,
+	0x2e, 0x39, 0x39, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x34, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x32,
+	0x30, 0x38, 0x2e, 0x39, 0x31, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x36, 0x37,
+	0x20, 0x32, 0x30, 0x38, 0x2e, 0x38, 0x38, 0x35, 0x20, 0x31, 0x32, 0x30, 0x38, 0x2e, 0x33, 0x32,
+	0x20, 0x32, 0x30, 0x35, 0x2e, 0x35, 0x31, 0x38, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x33,
+	0x20, 0x32, 0x32, 0x30, 0x2e, 0x32, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x36, 0x33, 0x2e,
+	0x30, 0x33, 0x20, 0x32, 0x33, 0x33, 0x2e, 0x33, 0x34, 0x34, 0x20, 0x31, 0x32, 0x38, 0x32, 0x2e,
+	0x31, 0x36, 0x20, 0x32, 0x35, 0x36, 0x2e, 0x30, 0x32, 0x34, 0x20, 0x31, 0x32, 0x39, 0x30, 0x2e,
+	0x37, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x32, 0x36, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x39,
+	0x39, 0x20, 0x33, 0x30, 0x38, 0x2e, 0x39, 0x32, 0x33, 0x20, 0x31, 0x32, 0x39, 0x34, 0x2e, 0x35,
+	0x36, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x33, 0x38, 0x37, 0x20, 0x31, 0x32, 0x39, 0x36, 0x2e, 0x33,
+	0x32, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x36, 0x35, 0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x30,
+	0x2e, 0x37, 0x39, 0x20, 0x34, 0x31, 0x38, 0x2e, 0x39, 0x33, 0x35, 0x20, 0x31, 0x32, 0x38, 0x33,
+	0x2e, 0x30, 0x38, 0x20, 0x34, 0x37, 0x32, 0x2e, 0x30, 0x38, 0x35, 0x20, 0x31, 0x32, 0x31, 0x34,
+	0x2e, 0x38, 0x39, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x31,
+	0x34, 0x2e, 0x39, 0x37, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x39, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31,
+	0x32, 0x31, 0x34, 0x2e, 0x39, 0x39, 0x20, 0x36, 0x36, 0x39, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x31,
+	0x32, 0x31, 0x31, 0x2e, 0x31, 0x31, 0x20, 0x37, 0x31, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x31,
+	0x32, 0x32, 0x33, 0x2e, 0x35, 0x35, 0x20, 0x37, 0x36, 0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x32, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x30, 0x34, 0x37,
+	0x20, 0x31, 0x32, 0x36, 0x36, 0x2e, 0x38, 0x31, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x33, 0x35, 0x36,
+	0x20, 0x31, 0x33, 0x30, 0x33, 0x2e, 0x38, 0x36, 0x20, 0x38, 0x37, 0x30, 0x2e, 0x33, 0x31, 0x33,
+	0x20, 0x43, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x38, 0x39, 0x20, 0x39, 0x31, 0x30, 0x2e, 0x38,
+	0x36, 0x39, 0x20, 0x31, 0x33, 0x38, 0x36, 0x2e, 0x30, 0x39, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x36,
+	0x39, 0x38, 0x20, 0x31, 0x34, 0x32, 0x38, 0x2e, 0x31, 0x32, 0x20, 0x39, 0x39, 0x34, 0x2e, 0x32,
+	0x31, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x39, 0x31, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x30, 0x35,
+	0x35, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x35, 0x33, 0x32, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x31, 0x34,
+	0x37, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x35, 0x34, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x32, 0x33,
+	0x34, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x35, 0x35, 0x39, 0x2e, 0x30, 0x34, 0x20, 0x31,
+	0x33, 0x34, 0x35, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x35, 0x34, 0x20, 0x31,
+	0x34, 0x35, 0x36, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x34, 0x36, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31,
+	0x35, 0x34, 0x34, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x34, 0x2e, 0x35, 0x34,
+	0x20, 0x31, 0x36, 0x33, 0x31, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x38, 0x38,
+	0x20, 0x31, 0x36, 0x38, 0x31, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x31, 0x31,
+	0x20, 0x31, 0x36, 0x39, 0x35, 0x2e, 0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x34, 0x2e,
+	0x36, 0x37, 0x20, 0x31, 0x36, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e,
+	0x37, 0x37, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x36, 0x33, 0x2e, 0x35,
+	0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e,
+	0x32, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x36, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x31, 0x34, 0x20,
+	0x31, 0x36, 0x39, 0x38, 0x2e, 0x37, 0x32, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x38, 0x34, 0x39, 0x20,
+	0x31, 0x36, 0x39, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x37, 0x38, 0x38, 0x2e, 0x31, 0x33,
+	0x32, 0x20, 0x31, 0x36, 0x39, 0x36, 0x2e, 0x35, 0x33, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x38, 0x32,
+	0x37, 0x20, 0x31, 0x36, 0x35, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x36, 0x31, 0x37, 0x2e, 0x37, 0x37,
+	0x36, 0x20, 0x31, 0x35, 0x37, 0x37, 0x2e, 0x30, 0x32, 0x20, 0x43, 0x20, 0x35, 0x30, 0x31, 0x2e,
+	0x39, 0x34, 0x35, 0x20, 0x31, 0x34, 0x35, 0x33, 0x2e, 0x30, 0x36, 0x20, 0x34, 0x37, 0x31, 0x2e,
+	0x36, 0x32, 0x39, 0x20, 0x31, 0x32, 0x37, 0x31, 0x2e, 0x37, 0x38, 0x20, 0x35, 0x34, 0x30, 0x2e,
+	0x38, 0x32, 0x34, 0x20, 0x31, 0x31, 0x31, 0x36, 0x2e, 0x38, 0x37, 0x20, 0x43, 0x20, 0x35, 0x35,
+	0x36, 0x2e, 0x39, 0x36, 0x34, 0x20, 0x31, 0x30, 0x37, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x35, 0x37,
+	0x39, 0x2e, 0x33, 0x38, 0x32, 0x20, 0x31, 0x30, 0x33, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x30,
+	0x38, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x31, 0x31, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x36,
+	0x32, 0x30, 0x2e, 0x32, 0x31, 0x31, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x36, 0x33,
+	0x32, 0x2e, 0x34, 0x33, 0x20, 0x39, 0x38, 0x37, 0x2e, 0x32, 0x31, 0x38, 0x20, 0x36, 0x34, 0x34,
+	0x2e, 0x34, 0x38, 0x20, 0x39, 0x37, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x37, 0x35,
+	0x33, 0x2e, 0x33, 0x30, 0x36, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20, 0x37,
+	0x37, 0x39, 0x2e, 0x32, 0x34, 0x31, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x32, 0x33, 0x20, 0x38, 0x30,
+	0x35, 0x2e, 0x33, 0x39, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x36, 0x35, 0x35, 0x20, 0x38, 0x32, 0x30,
+	0x2e, 0x38, 0x36, 0x34, 0x20, 0x37, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x34, 0x20, 0x43, 0x20, 0x38,
+	0x34, 0x31, 0x2e, 0x38, 0x39, 0x32, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x38, 0x35, 0x33, 0x20, 0x38,
+	0x33, 0x37, 0x2e, 0x34, 0x34, 0x36, 0x20, 0x36, 0x39, 0x31, 0x2e, 0x31, 0x31, 0x31, 0x20, 0x38,
+	0x33, 0x37, 0x2e, 0x32, 0x34, 0x38, 0x20, 0x36, 0x34, 0x30, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x43,
+	0x20, 0x38, 0x33, 0x36, 0x2e, 0x39, 0x36, 0x20, 0x35, 0x39, 0x31, 0x2e, 0x35, 0x39, 0x32, 0x20,
+	0x38, 0x33, 0x37, 0x2e, 0x32, 0x30, 0x32, 0x20, 0x35, 0x34, 0x32, 0x2e, 0x36, 0x38, 0x32, 0x20,
+	0x38, 0x33, 0x37, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x37, 0x37, 0x39, 0x20,
+	0x43, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x31, 0x32, 0x32, 0x20, 0x34, 0x37, 0x30, 0x2e, 0x38, 0x36,
+	0x33, 0x20, 0x37, 0x35, 0x34, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x34, 0x32, 0x32, 0x2e, 0x31, 0x34,
+	0x34, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x37, 0x32,
+	0x38, 0x20, 0x43, 0x20, 0x37, 0x35, 0x38, 0x2e, 0x35, 0x35, 0x33, 0x20, 0x33, 0x31, 0x35, 0x2e,
+	0x37, 0x31, 0x34, 0x20, 0x37, 0x35, 0x31, 0x2e, 0x34, 0x36, 0x37, 0x20, 0x32, 0x38, 0x33, 0x2e,
+	0x38, 0x38, 0x39, 0x20, 0x37, 0x37, 0x39, 0x2e, 0x36, 0x39, 0x38, 0x20, 0x32, 0x34, 0x39, 0x2e,
+	0x38, 0x35, 0x38, 0x20, 0x43, 0x20, 0x38, 0x30, 0x30, 0x2e, 0x35, 0x35, 0x38, 0x20, 0x32, 0x32,
+	0x34, 0x2e, 0x37, 0x31, 0x33, 0x20, 0x38, 0x32, 0x32, 0x2e, 0x37, 0x33, 0x35, 0x20, 0x32, 0x31,
+	0x33, 0x2e, 0x32, 0x36, 0x31, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30,
+	0x39, 0x2e, 0x33, 0x37, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e,
+	0x34, 0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x33, 0x2e, 0x38, 0x31, 0x37, 0x20, 0x31, 0x30, 0x34,
+	0x35, 0x2e, 0x35, 0x33, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x30, 0x36,
+	0x31, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38,
+	0x35, 0x2e, 0x39, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x36, 0x31, 0x20, 0x31,
+	0x30, 0x39, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x30, 0x33, 0x38, 0x2e, 0x33, 0x32, 0x20, 0x31,
+	0x31, 0x30, 0x33, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x34, 0x31, 0x20, 0x31,
+	0x31, 0x31, 0x31, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x35, 0x2e, 0x37, 0x36,
+	0x20, 0x31, 0x31, 0x35, 0x37, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x32, 0x36, 0x39, 0x2e, 0x34, 0x32,
+	0x20, 0x31, 0x31, 0x36, 0x32, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x33, 0x37, 0x35, 0x2e, 0x37, 0x36,
+	0x20, 0x31, 0x31, 0x33, 0x35, 0x2e, 0x38, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x35, 0x2e,
+	0x34, 0x34, 0x20, 0x31, 0x31, 0x33, 0x31, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x31, 0x33, 0x2e,
+	0x35, 0x20, 0x31, 0x31, 0x32, 0x34, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x34, 0x33, 0x32, 0x2e, 0x35,
+	0x32, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x33, 0x2e,
+	0x32, 0x33, 0x20, 0x31, 0x31, 0x33, 0x30, 0x2e, 0x33, 0x36, 0x20, 0x31, 0x34, 0x35, 0x34, 0x2e,
+	0x38, 0x37, 0x20, 0x31, 0x31, 0x36, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e,
+	0x31, 0x31, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x35, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31,
+	0x35, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x33, 0x35, 0x36, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x34, 0x32,
+	0x39, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x35, 0x36, 0x31, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x32, 0x34,
+	0x34, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x36, 0x31, 0x34, 0x2e, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31,
+	0x31, 0x39, 0x36, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x38, 0x20, 0x31,
+	0x31, 0x35, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x33, 0x20, 0x31,
+	0x31, 0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x4c,
+	0x20, 0x31, 0x30, 0x30, 0x38, 0x2e, 0x37, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20,
+	0x43, 0x20, 0x38, 0x38, 0x35, 0x2e, 0x33, 0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x31,
+	0x34, 0x20, 0x37, 0x38, 0x35, 0x2e, 0x33, 0x30, 0x31, 0x20, 0x31, 0x36, 0x33, 0x38, 0x2e, 0x31,
+	0x35, 0x20, 0x36, 0x38, 0x35, 0x2e, 0x38, 0x38, 0x39, 0x20, 0x31, 0x35, 0x34, 0x38, 0x2e, 0x34,
+	0x38, 0x20, 0x43, 0x20, 0x35, 0x35, 0x38, 0x2e, 0x32, 0x39, 0x33, 0x20, 0x31, 0x34, 0x33, 0x33,
+	0x2e, 0x33, 0x38, 0x20, 0x35, 0x34, 0x31, 0x2e, 0x39, 0x33, 0x32, 0x20, 0x31, 0x32, 0x34, 0x31,
+	0x2e, 0x34, 0x39, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x30, 0x37, 0x37, 0x20, 0x31, 0x30, 0x39, 0x38,
+	0x2e, 0x30, 0x37, 0x20, 0x43, 0x20, 0x36, 0x33, 0x36, 0x2e, 0x39, 0x35, 0x35, 0x20, 0x31, 0x30,
+	0x38, 0x36, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x36, 0x31, 0x36, 0x20, 0x31, 0x30,
+	0x38, 0x37, 0x2e, 0x35, 0x36, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x38, 0x33,
+	0x2e, 0x32, 0x35, 0x20, 0x43, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x30, 0x36,
+	0x31, 0x2e, 0x38, 0x37, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x31, 0x30, 0x34,
+	0x39, 0x2e, 0x31, 0x34, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34,
+	0x37, 0x2e, 0x34, 0x38, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x37, 0x36, 0x2c, 0x31, 0x36, 0x2c, 0x33, 0x33, 0x29, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x31, 0x30,
+	0x35, 0x31, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x38, 0x31, 0x34, 0x2e, 0x38, 0x38, 0x33, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x36, 0x33, 0x20, 0x38, 0x32, 0x37, 0x2e, 0x36, 0x39, 0x36, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x37, 0x38, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x38, 0x32, 0x33, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x38, 0x31, 0x20, 0x43, 0x20, 0x38, 0x39, 0x32, 0x2e, 0x37, 0x36,
+	0x39, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x33, 0x37, 0x20, 0x39, 0x34, 0x39, 0x2e, 0x39, 0x36,
+	0x20, 0x31, 0x30, 0x36, 0x34, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x37, 0x33,
+	0x20, 0x31, 0x30, 0x38, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x31, 0x2e,
+	0x39, 0x38, 0x20, 0x31, 0x30, 0x39, 0x36, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x30, 0x34, 0x30, 0x2e,
+	0x31, 0x35, 0x20, 0x31, 0x31, 0x30, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x36, 0x30, 0x2e,
+	0x35, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35,
+	0x2e, 0x32, 0x31, 0x20, 0x31, 0x31, 0x36, 0x38, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x33, 0x31, 0x35,
+	0x2e, 0x32, 0x37, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x35, 0x36, 0x20, 0x31, 0x34, 0x33, 0x31,
+	0x2e, 0x34, 0x39, 0x20, 0x31, 0x31, 0x32, 0x31, 0x2e, 0x33, 0x31, 0x20, 0x43, 0x20, 0x31, 0x34,
+	0x33, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x31, 0x33, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x34, 0x34,
+	0x34, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x31, 0x34, 0x37, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x34, 0x34,
+	0x39, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x31, 0x35, 0x39, 0x2e, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31,
+	0x35, 0x31, 0x35, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x33, 0x33, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x31,
+	0x34, 0x34, 0x31, 0x2e, 0x34, 0x35, 0x20, 0x31, 0x35, 0x33, 0x37, 0x2e, 0x35, 0x35, 0x20, 0x31,
+	0x32, 0x36, 0x30, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x36, 0x30, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x34, 0x39, 0x2e, 0x38, 0x33, 0x20, 0x31, 0x36, 0x30, 0x39, 0x2e, 0x39, 0x38,
+	0x20, 0x31, 0x32, 0x33, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x31, 0x36, 0x31, 0x33, 0x20, 0x31, 0x32,
+	0x32, 0x37, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x36, 0x31, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x43, 0x20,
+	0x31, 0x31, 0x36, 0x35, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x39, 0x35, 0x20,
+	0x31, 0x30, 0x38, 0x35, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x36, 0x32, 0x33, 0x2e, 0x39, 0x34, 0x20,
+	0x31, 0x30, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x4c,
+	0x20, 0x39, 0x34, 0x30, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x34, 0x35,
+	0x20, 0x43, 0x20, 0x39, 0x30, 0x30, 0x2e, 0x30, 0x34, 0x36, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e,
+	0x36, 0x39, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x36, 0x32, 0x35, 0x2e, 0x35,
+	0x37, 0x20, 0x38, 0x33, 0x33, 0x2e, 0x36, 0x37, 0x36, 0x20, 0x31, 0x36, 0x31, 0x37, 0x2e, 0x38,
+	0x31, 0x20, 0x43, 0x20, 0x37, 0x39, 0x34, 0x2e, 0x36, 0x31, 0x32, 0x20, 0x31, 0x36, 0x31, 0x30,
+	0x2e, 0x34, 0x38, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x33, 0x35, 0x33, 0x20, 0x31, 0x35, 0x39, 0x35,
+	0x2e, 0x36, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x39, 0x38, 0x38, 0x20, 0x31, 0x35, 0x37, 0x34, 0x2e,
+	0x30, 0x31, 0x20, 0x43, 0x20, 0x36, 0x35, 0x32, 0x2e, 0x34, 0x35, 0x37, 0x20, 0x31, 0x35, 0x32,
+	0x37, 0x2e, 0x39, 0x37, 0x20, 0x36, 0x30, 0x34, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x35, 0x31,
+	0x2e, 0x37, 0x20, 0x35, 0x38, 0x36, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x31, 0x33, 0x36, 0x39, 0x2e,
+	0x32, 0x39, 0x20, 0x43, 0x20, 0x35, 0x36, 0x35, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x31, 0x32, 0x37,
+	0x34, 0x2e, 0x35, 0x33, 0x20, 0x35, 0x38, 0x33, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x31, 0x31, 0x37,
+	0x35, 0x2e, 0x34, 0x34, 0x20, 0x36, 0x33, 0x36, 0x2e, 0x37, 0x39, 0x34, 0x20, 0x31, 0x30, 0x39,
+	0x34, 0x2e, 0x30, 0x39, 0x20, 0x43, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x31,
+	0x30, 0x38, 0x39, 0x2e, 0x36, 0x35, 0x20, 0x36, 0x36, 0x30, 0x2e, 0x37, 0x38, 0x37, 0x20, 0x31,
+	0x30, 0x38, 0x34, 0x2e, 0x37, 0x35, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x34, 0x33, 0x35, 0x20, 0x31,
+	0x30, 0x38, 0x31, 0x2e, 0x34, 0x37, 0x20, 0x43, 0x20, 0x37, 0x31, 0x38, 0x2e, 0x30, 0x37, 0x39,
+	0x20, 0x31, 0x30, 0x36, 0x35, 0x2e, 0x33, 0x20, 0x37, 0x35, 0x38, 0x2e, 0x32, 0x34, 0x32, 0x20,
+	0x31, 0x30, 0x35, 0x35, 0x2e, 0x31, 0x32, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20,
+	0x31, 0x30, 0x35, 0x31, 0x2e, 0x34, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c,
+	0x32, 0x35, 0x35, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39, 0x31, 0x35, 0x2e, 0x30,
+	0x30, 0x36, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x35,
+	0x30, 0x2e, 0x30, 0x39, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x32, 0x38, 0x20, 0x43, 0x20, 0x31, 0x30,
+	0x37, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x32, 0x37, 0x31, 0x20, 0x31, 0x31,
+	0x30, 0x39, 0x2e, 0x39, 0x34, 0x20, 0x34, 0x39, 0x34, 0x2e, 0x36, 0x36, 0x33, 0x20, 0x31, 0x31,
+	0x33, 0x38, 0x2e, 0x31, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x37, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x31,
+	0x33, 0x37, 0x2e, 0x39, 0x35, 0x20, 0x36, 0x34, 0x33, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x31, 0x33, 0x38, 0x2e, 0x30, 0x32, 0x20, 0x37, 0x30, 0x33, 0x2e, 0x32, 0x32, 0x37, 0x20,
+	0x31, 0x31, 0x33, 0x35, 0x2e, 0x34, 0x33, 0x20, 0x37, 0x36, 0x34, 0x2e, 0x31, 0x35, 0x38, 0x20,
+	0x31, 0x31, 0x36, 0x34, 0x2e, 0x34, 0x32, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x37, 0x31, 0x32,
+	0x20, 0x31, 0x32, 0x32, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x39, 0x30, 0x32, 0x2e, 0x33, 0x30, 0x33,
+	0x20, 0x31, 0x32, 0x37, 0x36, 0x2e, 0x37, 0x37, 0x20, 0x39, 0x34, 0x38, 0x2e, 0x39, 0x32, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x31, 0x34, 0x2e, 0x35, 0x37, 0x20, 0x39, 0x38, 0x35, 0x2e, 0x33, 0x31,
+	0x35, 0x20, 0x31, 0x33, 0x35, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x30,
+	0x34, 0x20, 0x31, 0x33, 0x38, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x31,
+	0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x39, 0x34, 0x2e, 0x30,
+	0x38, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x30,
+	0x33, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x30, 0x35, 0x33, 0x2e, 0x39,
+	0x37, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x36,
+	0x2e, 0x36, 0x31, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x33, 0x36,
+	0x2e, 0x30, 0x39, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x30, 0x32, 0x38,
+	0x2e, 0x31, 0x31, 0x20, 0x43, 0x20, 0x39, 0x39, 0x36, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x30, 0x30,
+	0x36, 0x2e, 0x31, 0x36, 0x20, 0x39, 0x34, 0x37, 0x2e, 0x31, 0x34, 0x39, 0x20, 0x39, 0x39, 0x32,
+	0x2e, 0x30, 0x30, 0x39, 0x20, 0x38, 0x39, 0x36, 0x2e, 0x34, 0x32, 0x20, 0x39, 0x38, 0x36, 0x2e,
+	0x32, 0x33, 0x35, 0x20, 0x43, 0x20, 0x38, 0x35, 0x36, 0x2e, 0x30, 0x34, 0x20, 0x39, 0x38, 0x31,
+	0x2e, 0x34, 0x39, 0x31, 0x20, 0x38, 0x31, 0x33, 0x2e, 0x37, 0x39, 0x39, 0x20, 0x39, 0x38, 0x31,
+	0x2e, 0x36, 0x32, 0x39, 0x20, 0x37, 0x37, 0x33, 0x2e, 0x34, 0x35, 0x39, 0x20, 0x39, 0x38, 0x37,
+	0x2e, 0x34, 0x30, 0x36, 0x20, 0x43, 0x20, 0x37, 0x36, 0x35, 0x2e, 0x35, 0x31, 0x32, 0x20, 0x39,
+	0x38, 0x38, 0x2e, 0x35, 0x34, 0x35, 0x20, 0x37, 0x32, 0x38, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x39,
+	0x39, 0x37, 0x2e, 0x33, 0x38, 0x39, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39,
+	0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43, 0x20, 0x37, 0x34, 0x31, 0x2e, 0x36, 0x37, 0x32,
+	0x20, 0x39, 0x38, 0x31, 0x2e, 0x38, 0x34, 0x36, 0x20, 0x37, 0x36, 0x33, 0x2e, 0x39, 0x33, 0x36,
+	0x20, 0x39, 0x35, 0x37, 0x2e, 0x30, 0x37, 0x35, 0x20, 0x37, 0x38, 0x31, 0x2e, 0x35, 0x33, 0x32,
+	0x20, 0x39, 0x34, 0x31, 0x2e, 0x33, 0x34, 0x31, 0x20, 0x43, 0x20, 0x38, 0x34, 0x38, 0x2e, 0x31,
+	0x34, 0x20, 0x38, 0x38, 0x31, 0x2e, 0x37, 0x38, 0x32, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x31, 0x35,
+	0x37, 0x20, 0x38, 0x32, 0x39, 0x2e, 0x32, 0x38, 0x38, 0x20, 0x39, 0x31, 0x32, 0x2e, 0x36, 0x38,
+	0x31, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x32, 0x34, 0x35, 0x20, 0x43, 0x20, 0x39, 0x31, 0x36, 0x2e,
+	0x33, 0x32, 0x32, 0x20, 0x37, 0x30, 0x35, 0x2e, 0x35, 0x33, 0x31, 0x20, 0x39, 0x31, 0x34, 0x2e,
+	0x39, 0x36, 0x34, 0x20, 0x36, 0x37, 0x32, 0x2e, 0x36, 0x33, 0x32, 0x20, 0x39, 0x31, 0x34, 0x2e,
+	0x39, 0x36, 0x20, 0x36, 0x34, 0x32, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x4c, 0x20, 0x39, 0x31, 0x35,
+	0x2e, 0x30, 0x30, 0x36, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x7a, 0x22, 0x2f,
+	0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72,
+	0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30,
+	0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30,
+	0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x34, 0x37,
+	0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x43, 0x20, 0x38, 0x36, 0x34, 0x2e,
+	0x35, 0x34, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x39, 0x20, 0x38, 0x36, 0x34, 0x2e,
+	0x36, 0x32, 0x32, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x31, 0x20, 0x38, 0x36, 0x34, 0x2e,
+	0x36, 0x39, 0x34, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x38, 0x33, 0x20, 0x43, 0x20, 0x38, 0x38,
+	0x39, 0x2e, 0x32, 0x36, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x37, 0x36, 0x33, 0x20, 0x39, 0x31,
+	0x34, 0x2e, 0x39, 0x36, 0x38, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x39, 0x33,
+	0x39, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x32, 0x35, 0x20, 0x43, 0x20,
+	0x39, 0x37, 0x36, 0x2e, 0x33, 0x38, 0x31, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x33, 0x38, 0x20,
+	0x31, 0x30, 0x31, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x35, 0x36, 0x20,
+	0x31, 0x30, 0x35, 0x30, 0x2e, 0x33, 0x31, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x37, 0x39, 0x20,
+	0x4c, 0x20, 0x31, 0x31, 0x34, 0x30, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x39,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x33, 0x2e, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30,
+	0x34, 0x34, 0x20, 0x31, 0x32, 0x32, 0x36, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x31, 0x2e, 0x36,
+	0x30, 0x36, 0x20, 0x31, 0x32, 0x32, 0x35, 0x2e, 0x39, 0x31, 0x20, 0x33, 0x32, 0x32, 0x2e, 0x38,
+	0x35, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x35, 0x2e, 0x36, 0x31, 0x20, 0x33, 0x34, 0x37,
+	0x2e, 0x30, 0x34, 0x32, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33,
+	0x2e, 0x33, 0x30, 0x34, 0x20, 0x31, 0x32, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x33, 0x39, 0x37,
+	0x2e, 0x30, 0x33, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x34, 0x20, 0x34,
+	0x31, 0x34, 0x2e, 0x35, 0x37, 0x37, 0x20, 0x31, 0x32, 0x30, 0x35, 0x2e, 0x31, 0x39, 0x20, 0x34,
+	0x32, 0x31, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x31, 0x38, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x34, 0x32,
+	0x32, 0x2e, 0x30, 0x30, 0x38, 0x20, 0x4c, 0x20, 0x39, 0x36, 0x31, 0x2e, 0x39, 0x39, 0x39, 0x20,
+	0x34, 0x32, 0x33, 0x2e, 0x30, 0x31, 0x36, 0x20, 0x4c, 0x20, 0x38, 0x39, 0x34, 0x2e, 0x34, 0x38,
+	0x32, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x31, 0x34, 0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x32, 0x2e,
+	0x36, 0x37, 0x33, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x31, 0x37, 0x33, 0x20, 0x38, 0x34, 0x36, 0x2e,
+	0x38, 0x37, 0x34, 0x20, 0x34, 0x32, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x38, 0x33, 0x37, 0x2e,
+	0x39, 0x33, 0x39, 0x20, 0x34, 0x31, 0x38, 0x2e, 0x36, 0x37, 0x38, 0x20, 0x43, 0x20, 0x38, 0x32,
+	0x30, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x34, 0x30, 0x35, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x38, 0x32,
+	0x34, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33, 0x2e, 0x33, 0x37, 0x39, 0x20, 0x38, 0x32,
+	0x34, 0x2e, 0x39, 0x35, 0x31, 0x20, 0x33, 0x35, 0x33, 0x2e, 0x39, 0x39, 0x38, 0x20, 0x43, 0x20,
+	0x38, 0x32, 0x35, 0x2e, 0x30, 0x31, 0x32, 0x20, 0x33, 0x31, 0x37, 0x2e, 0x32, 0x39, 0x36, 0x20,
+	0x38, 0x31, 0x38, 0x2e, 0x31, 0x32, 0x33, 0x20, 0x32, 0x38, 0x34, 0x2e, 0x35, 0x32, 0x20, 0x38,
+	0x36, 0x34, 0x2e, 0x34, 0x37, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31,
+	0x38, 0x37, 0x2c, 0x31, 0x33, 0x36, 0x2c, 0x34, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x20, 0x38, 0x37, 0x39, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33,
+	0x20, 0x4c, 0x20, 0x31, 0x30, 0x38, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36,
+	0x31, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x35, 0x32, 0x2e, 0x34, 0x32, 0x20, 0x32, 0x38, 0x33, 0x2e,
+	0x36, 0x34, 0x31, 0x20, 0x43, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x32, 0x38,
+	0x33, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x32, 0x38, 0x33,
+	0x2e, 0x31, 0x36, 0x37, 0x20, 0x31, 0x31, 0x39, 0x33, 0x2e, 0x33, 0x34, 0x20, 0x32, 0x38, 0x34,
+	0x2e, 0x33, 0x37, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x36, 0x20, 0x32, 0x38,
+	0x36, 0x2e, 0x30, 0x36, 0x38, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x34, 0x31, 0x20, 0x33, 0x30,
+	0x34, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x30, 0x38, 0x20, 0x33, 0x32,
+	0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x37, 0x20,
+	0x33, 0x33, 0x37, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x31, 0x35, 0x20,
+	0x33, 0x35, 0x31, 0x2e, 0x39, 0x34, 0x33, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x39, 0x35, 0x20,
+	0x33, 0x36, 0x37, 0x2e, 0x31, 0x32, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37,
+	0x37, 0x20, 0x33, 0x38, 0x31, 0x2e, 0x32, 0x32, 0x31, 0x20, 0x31, 0x32, 0x32, 0x33, 0x2e, 0x38,
+	0x35, 0x20, 0x33, 0x39, 0x39, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x32, 0x31, 0x33, 0x2e, 0x33, 0x37,
+	0x20, 0x34, 0x31, 0x30, 0x2e, 0x34, 0x33, 0x32, 0x20, 0x43, 0x20, 0x31, 0x32, 0x30, 0x32, 0x2e,
+	0x39, 0x31, 0x20, 0x34, 0x32, 0x31, 0x2e, 0x31, 0x35, 0x33, 0x20, 0x31, 0x31, 0x38, 0x36, 0x2e,
+	0x32, 0x33, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x33, 0x35, 0x35, 0x20, 0x31, 0x31, 0x37, 0x32, 0x2e,
+	0x35, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x31, 0x39, 0x32, 0x20, 0x4c, 0x20, 0x39, 0x35, 0x31, 0x2e,
+	0x34, 0x37, 0x32, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x38,
+	0x35, 0x2e, 0x37, 0x38, 0x33, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x32, 0x37, 0x20, 0x43, 0x20, 0x38,
+	0x36, 0x31, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x33, 0x34, 0x35, 0x20, 0x38,
+	0x32, 0x38, 0x2e, 0x33, 0x30, 0x36, 0x20, 0x34, 0x32, 0x36, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x38,
+	0x32, 0x38, 0x2e, 0x38, 0x31, 0x36, 0x20, 0x33, 0x39, 0x30, 0x2e, 0x31, 0x35, 0x20, 0x43, 0x20,
+	0x38, 0x32, 0x39, 0x2e, 0x32, 0x30, 0x34, 0x20, 0x33, 0x36, 0x32, 0x2e, 0x38, 0x37, 0x20, 0x38,
+	0x32, 0x36, 0x2e, 0x37, 0x39, 0x33, 0x20, 0x33, 0x33, 0x33, 0x2e, 0x30, 0x31, 0x34, 0x20, 0x38,
+	0x33, 0x30, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x33, 0x30, 0x36, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x43,
+	0x20, 0x38, 0x33, 0x32, 0x2e, 0x38, 0x34, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x39, 0x36, 0x35,
+	0x20, 0x38, 0x36, 0x33, 0x2e, 0x30, 0x35, 0x34, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x37,
+	0x20, 0x38, 0x37, 0x39, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33,
+	0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65,
+	0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62,
+	0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x31,
+	0x32, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39, 0x20, 0x43, 0x20,
+	0x37, 0x31, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x37,
+	0x32, 0x30, 0x2e, 0x34, 0x36, 0x35, 0x20, 0x39, 0x39, 0x31, 0x2e, 0x39, 0x34, 0x32, 0x20, 0x37,
+	0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39, 0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43,
+	0x20, 0x37, 0x32, 0x33, 0x2e, 0x33, 0x34, 0x38, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x36, 0x36,
+	0x20, 0x37, 0x31, 0x37, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x31, 0x30, 0x30, 0x33, 0x2e, 0x32, 0x35,
+	0x20, 0x37, 0x31, 0x32, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39,
+	0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61,
+	0x74, 0x65, 0x28, 0x36, 0x32, 0x30, 0x2e, 0x32, 0x39, 0x2c, 0x31, 0x35, 0x37, 0x2e, 0x39, 0x37,
+	0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e, 0x39, 0x30, 0x39, 0x29, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x32, 0x2c, 0x32,
+	0x37, 0x2c, 0x32, 0x36, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x35, 0x34, 0x2e,
+	0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39, 0x2e, 0x33, 0x37, 0x31, 0x20, 0x43, 0x20, 0x38, 0x37,
+	0x34, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x30, 0x34, 0x38, 0x20, 0x39, 0x30,
+	0x31, 0x2e, 0x34, 0x33, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x39, 0x32, 0x31,
+	0x2e, 0x39, 0x34, 0x38, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x39, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30,
+	0x34, 0x32, 0x2e, 0x30, 0x35, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x39, 0x39, 0x36, 0x20, 0x4c, 0x20,
+	0x31, 0x31, 0x34, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x39, 0x31, 0x35, 0x20,
+	0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x36, 0x37, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x38, 0x38,
+	0x35, 0x20, 0x31, 0x32, 0x30, 0x38, 0x2e, 0x33, 0x32, 0x20, 0x32, 0x30, 0x35, 0x2e, 0x35, 0x31,
+	0x38, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x33, 0x20, 0x32, 0x32, 0x30, 0x2e, 0x32, 0x35,
+	0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x36, 0x33, 0x2e, 0x30, 0x33, 0x20, 0x32, 0x33, 0x33, 0x2e,
+	0x33, 0x34, 0x34, 0x20, 0x31, 0x32, 0x38, 0x32, 0x2e, 0x31, 0x36, 0x20, 0x32, 0x35, 0x36, 0x2e,
+	0x30, 0x32, 0x34, 0x20, 0x31, 0x32, 0x39, 0x30, 0x2e, 0x37, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e,
+	0x32, 0x36, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x39, 0x39, 0x20, 0x33, 0x30, 0x38, 0x2e, 0x39,
+	0x32, 0x33, 0x20, 0x31, 0x32, 0x39, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x33, 0x32, 0x39, 0x2e, 0x33,
+	0x38, 0x37, 0x20, 0x31, 0x32, 0x39, 0x36, 0x2e, 0x33, 0x32, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x36,
+	0x35, 0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x30, 0x2e, 0x37, 0x39, 0x20, 0x34, 0x31, 0x38,
+	0x2e, 0x39, 0x33, 0x35, 0x20, 0x31, 0x32, 0x38, 0x33, 0x2e, 0x30, 0x38, 0x20, 0x34, 0x37, 0x32,
+	0x2e, 0x30, 0x38, 0x35, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e, 0x38, 0x39, 0x20, 0x34, 0x39, 0x33,
+	0x2e, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e, 0x39, 0x37, 0x20, 0x36, 0x32,
+	0x30, 0x2e, 0x39, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e, 0x39, 0x39, 0x20,
+	0x36, 0x36, 0x39, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x31, 0x31, 0x20,
+	0x37, 0x31, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x31, 0x32, 0x32, 0x33, 0x2e, 0x35, 0x35, 0x20,
+	0x37, 0x36, 0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36,
+	0x32, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x30, 0x34, 0x37, 0x20, 0x31, 0x32, 0x36, 0x36, 0x2e, 0x38,
+	0x31, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x33, 0x35, 0x36, 0x20, 0x31, 0x33, 0x30, 0x33, 0x2e, 0x38,
+	0x36, 0x20, 0x38, 0x37, 0x30, 0x2e, 0x33, 0x31, 0x33, 0x20, 0x43, 0x20, 0x31, 0x33, 0x34, 0x35,
+	0x2e, 0x38, 0x39, 0x20, 0x39, 0x31, 0x30, 0x2e, 0x38, 0x36, 0x39, 0x20, 0x31, 0x33, 0x38, 0x36,
+	0x2e, 0x30, 0x39, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x36, 0x39, 0x38, 0x20, 0x31, 0x34, 0x32, 0x38,
+	0x2e, 0x31, 0x32, 0x20, 0x39, 0x39, 0x34, 0x2e, 0x32, 0x31, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34,
+	0x39, 0x31, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x35,
+	0x33, 0x32, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x31, 0x34, 0x37, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x35,
+	0x34, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x32, 0x33, 0x34, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20,
+	0x31, 0x35, 0x35, 0x39, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x31, 0x31, 0x20,
+	0x31, 0x35, 0x32, 0x39, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x34, 0x35, 0x36, 0x2e, 0x36, 0x38, 0x20,
+	0x31, 0x34, 0x36, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x35, 0x34, 0x34, 0x2e, 0x39, 0x38, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x39, 0x34, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x36, 0x33, 0x31, 0x2e, 0x39,
+	0x33, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x36, 0x38, 0x31, 0x2e, 0x39,
+	0x37, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x36, 0x39, 0x35, 0x2e, 0x37,
+	0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x34, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x36, 0x39, 0x39,
+	0x2e, 0x39, 0x33, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x36, 0x39, 0x38,
+	0x2e, 0x34, 0x20, 0x31, 0x30, 0x36, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x34,
+	0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e, 0x32, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e,
+	0x36, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x37, 0x32,
+	0x20, 0x38, 0x39, 0x33, 0x2e, 0x38, 0x34, 0x39, 0x20, 0x31, 0x36, 0x39, 0x37, 0x2e, 0x39, 0x36,
+	0x20, 0x43, 0x20, 0x37, 0x38, 0x38, 0x2e, 0x31, 0x33, 0x32, 0x20, 0x31, 0x36, 0x39, 0x36, 0x2e,
+	0x35, 0x33, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x38, 0x32, 0x37, 0x20, 0x31, 0x36, 0x35, 0x33, 0x2e,
+	0x37, 0x39, 0x20, 0x36, 0x31, 0x37, 0x2e, 0x37, 0x37, 0x36, 0x20, 0x31, 0x35, 0x37, 0x37, 0x2e,
+	0x30, 0x32, 0x20, 0x43, 0x20, 0x35, 0x30, 0x31, 0x2e, 0x39, 0x34, 0x35, 0x20, 0x31, 0x34, 0x35,
+	0x33, 0x2e, 0x30, 0x36, 0x20, 0x34, 0x37, 0x31, 0x2e, 0x36, 0x32, 0x39, 0x20, 0x31, 0x32, 0x37,
+	0x31, 0x2e, 0x37, 0x38, 0x20, 0x35, 0x34, 0x30, 0x2e, 0x38, 0x32, 0x34, 0x20, 0x31, 0x31, 0x31,
+	0x36, 0x2e, 0x38, 0x37, 0x20, 0x43, 0x20, 0x35, 0x35, 0x36, 0x2e, 0x39, 0x36, 0x34, 0x20, 0x31,
+	0x30, 0x37, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x35, 0x37, 0x39, 0x2e, 0x33, 0x38, 0x32, 0x20, 0x31,
+	0x30, 0x33, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x30, 0x38, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30,
+	0x31, 0x31, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x32, 0x31, 0x31, 0x20,
+	0x39, 0x39, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x36, 0x33, 0x32, 0x2e, 0x34, 0x33, 0x20, 0x39, 0x38,
+	0x37, 0x2e, 0x32, 0x31, 0x38, 0x20, 0x36, 0x34, 0x34, 0x2e, 0x34, 0x38, 0x20, 0x39, 0x37, 0x35,
+	0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x37, 0x35, 0x33, 0x2e, 0x33, 0x30, 0x36, 0x20, 0x38,
+	0x36, 0x34, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20, 0x37, 0x37, 0x39, 0x2e, 0x32, 0x34, 0x31, 0x20,
+	0x38, 0x33, 0x38, 0x2e, 0x32, 0x33, 0x20, 0x38, 0x30, 0x35, 0x2e, 0x33, 0x39, 0x20, 0x38, 0x31,
+	0x38, 0x2e, 0x36, 0x35, 0x35, 0x20, 0x38, 0x32, 0x30, 0x2e, 0x38, 0x36, 0x34, 0x20, 0x37, 0x38,
+	0x33, 0x2e, 0x35, 0x35, 0x34, 0x20, 0x43, 0x20, 0x38, 0x34, 0x31, 0x2e, 0x38, 0x39, 0x32, 0x20,
+	0x37, 0x33, 0x35, 0x2e, 0x38, 0x35, 0x33, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x34, 0x34, 0x36, 0x20,
+	0x36, 0x39, 0x31, 0x2e, 0x31, 0x31, 0x31, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x32, 0x34, 0x38, 0x20,
+	0x36, 0x34, 0x30, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x43, 0x20, 0x38, 0x33, 0x36, 0x2e, 0x39, 0x36,
+	0x20, 0x35, 0x39, 0x31, 0x2e, 0x35, 0x39, 0x32, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x32, 0x30, 0x32,
+	0x20, 0x35, 0x34, 0x32, 0x2e, 0x36, 0x38, 0x32, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x39, 0x37, 0x33,
+	0x20, 0x34, 0x39, 0x33, 0x2e, 0x37, 0x37, 0x39, 0x20, 0x43, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x31,
+	0x32, 0x32, 0x20, 0x34, 0x37, 0x30, 0x2e, 0x38, 0x36, 0x33, 0x20, 0x37, 0x35, 0x34, 0x2e, 0x37,
+	0x30, 0x39, 0x20, 0x34, 0x32, 0x32, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x31,
+	0x34, 0x34, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x37, 0x32, 0x38, 0x20, 0x43, 0x20, 0x37, 0x35, 0x38,
+	0x2e, 0x35, 0x35, 0x33, 0x20, 0x33, 0x31, 0x35, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x37, 0x35, 0x31,
+	0x2e, 0x34, 0x36, 0x37, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x38, 0x38, 0x39, 0x20, 0x37, 0x37, 0x39,
+	0x2e, 0x36, 0x39, 0x38, 0x20, 0x32, 0x34, 0x39, 0x2e, 0x38, 0x35, 0x38, 0x20, 0x43, 0x20, 0x38,
+	0x30, 0x30, 0x2e, 0x35, 0x35, 0x38, 0x20, 0x32, 0x32, 0x34, 0x2e, 0x37, 0x31, 0x33, 0x20, 0x38,
+	0x32, 0x32, 0x2e, 0x37, 0x33, 0x35, 0x20, 0x32, 0x31, 0x33, 0x2e, 0x32, 0x36, 0x31, 0x20, 0x38,
+	0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39, 0x2e, 0x33, 0x37, 0x31, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31,
+	0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x32, 0x35, 0x2e,
+	0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e, 0x34, 0x38, 0x20, 0x43, 0x20, 0x38, 0x38,
+	0x33, 0x2e, 0x38, 0x31, 0x37, 0x20, 0x31, 0x30, 0x34, 0x35, 0x2e, 0x35, 0x33, 0x20, 0x39, 0x35,
+	0x33, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x30, 0x36, 0x31, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x30,
+	0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38, 0x35, 0x2e, 0x39, 0x33, 0x20, 0x43, 0x20,
+	0x31, 0x30, 0x32, 0x32, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x30, 0x39, 0x33, 0x2e, 0x37, 0x32, 0x20,
+	0x31, 0x30, 0x33, 0x38, 0x2e, 0x33, 0x32, 0x20, 0x31, 0x31, 0x30, 0x33, 0x2e, 0x36, 0x34, 0x20,
+	0x31, 0x30, 0x35, 0x35, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x31, 0x31, 0x31, 0x2e, 0x34, 0x36, 0x20,
+	0x43, 0x20, 0x31, 0x31, 0x35, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x31, 0x35, 0x37, 0x2e, 0x33,
+	0x38, 0x20, 0x31, 0x32, 0x36, 0x39, 0x2e, 0x34, 0x32, 0x20, 0x31, 0x31, 0x36, 0x32, 0x2e, 0x31,
+	0x34, 0x20, 0x31, 0x33, 0x37, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x31, 0x33, 0x35, 0x2e, 0x38,
+	0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x35, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x31, 0x33, 0x31,
+	0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x31, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x31, 0x32, 0x34, 0x2e,
+	0x33, 0x34, 0x20, 0x31, 0x34, 0x33, 0x32, 0x2e, 0x35, 0x32, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e,
+	0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x33, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x31, 0x33, 0x30,
+	0x2e, 0x33, 0x36, 0x20, 0x31, 0x34, 0x35, 0x34, 0x2e, 0x38, 0x37, 0x20, 0x31, 0x31, 0x36, 0x33,
+	0x2e, 0x38, 0x35, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x31, 0x38, 0x30,
+	0x2e, 0x35, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31, 0x35, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x33,
+	0x35, 0x36, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x34, 0x32, 0x39, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x35,
+	0x36, 0x31, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x32, 0x34, 0x34, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x36,
+	0x31, 0x34, 0x2e, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x39, 0x38, 0x20,
+	0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x31, 0x35, 0x34, 0x2e, 0x30, 0x31, 0x20,
+	0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x35, 0x35, 0x20,
+	0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x30, 0x38, 0x2e, 0x37,
+	0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x43, 0x20, 0x38, 0x38, 0x35, 0x2e, 0x33,
+	0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x31, 0x34, 0x20, 0x37, 0x38, 0x35, 0x2e, 0x33,
+	0x30, 0x31, 0x20, 0x31, 0x36, 0x33, 0x38, 0x2e, 0x31, 0x35, 0x20, 0x36, 0x38, 0x35, 0x2e, 0x38,
+	0x38, 0x39, 0x20, 0x31, 0x35, 0x34, 0x38, 0x2e, 0x34, 0x38, 0x20, 0x43, 0x20, 0x35, 0x35, 0x38,
+	0x2e, 0x32, 0x39, 0x33, 0x20, 0x31, 0x34, 0x33, 0x33, 0x2e, 0x33, 0x38, 0x20, 0x35, 0x34, 0x31,
+	0x2e, 0x39, 0x33, 0x32, 0x20, 0x31, 0x32, 0x34, 0x31, 0x2e, 0x34, 0x39, 0x20, 0x36, 0x33, 0x30,
+	0x2e, 0x30, 0x37, 0x37, 0x20, 0x31, 0x30, 0x39, 0x38, 0x2e, 0x30, 0x37, 0x20, 0x43, 0x20, 0x36,
+	0x33, 0x36, 0x2e, 0x39, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38, 0x36, 0x2e, 0x38, 0x37, 0x20, 0x36,
+	0x34, 0x35, 0x2e, 0x36, 0x31, 0x36, 0x20, 0x31, 0x30, 0x38, 0x37, 0x2e, 0x35, 0x36, 0x20, 0x36,
+	0x35, 0x36, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x38, 0x33, 0x2e, 0x32, 0x35, 0x20, 0x43, 0x20, 0x37,
+	0x31, 0x32, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x30, 0x36, 0x31, 0x2e, 0x38, 0x37, 0x20, 0x37, 0x36,
+	0x36, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x31, 0x30, 0x34, 0x39, 0x2e, 0x31, 0x34, 0x20, 0x38, 0x32,
+	0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e, 0x34, 0x38, 0x20, 0x7a, 0x22,
+	0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f,
+	0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c,
+	0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x37,
+	0x36, 0x2c, 0x31, 0x36, 0x2c, 0x33, 0x33, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38,
+	0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x34, 0x32, 0x20, 0x43,
+	0x20, 0x38, 0x31, 0x34, 0x2e, 0x38, 0x38, 0x33, 0x20, 0x31, 0x30, 0x35, 0x30, 0x2e, 0x36, 0x33,
+	0x20, 0x38, 0x32, 0x37, 0x2e, 0x36, 0x39, 0x36, 0x20, 0x31, 0x30, 0x35, 0x30, 0x2e, 0x37, 0x38,
+	0x20, 0x38, 0x33, 0x34, 0x2e, 0x38, 0x32, 0x33, 0x20, 0x31, 0x30, 0x35, 0x30, 0x2e, 0x38, 0x31,
+	0x20, 0x43, 0x20, 0x38, 0x39, 0x32, 0x2e, 0x37, 0x36, 0x39, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e,
+	0x33, 0x37, 0x20, 0x39, 0x34, 0x39, 0x2e, 0x39, 0x36, 0x20, 0x31, 0x30, 0x36, 0x34, 0x2e, 0x30,
+	0x32, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x37, 0x33, 0x20, 0x31, 0x30, 0x38, 0x37, 0x2e, 0x39,
+	0x36, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x31, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x30, 0x39, 0x36,
+	0x2e, 0x35, 0x38, 0x20, 0x31, 0x30, 0x34, 0x30, 0x2e, 0x31, 0x35, 0x20, 0x31, 0x31, 0x30, 0x38,
+	0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x36, 0x30, 0x2e, 0x35, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e,
+	0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x32, 0x31, 0x20, 0x31, 0x31, 0x36,
+	0x38, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x33, 0x31, 0x35, 0x2e, 0x32, 0x37, 0x20, 0x31, 0x31, 0x36,
+	0x35, 0x2e, 0x35, 0x36, 0x20, 0x31, 0x34, 0x33, 0x31, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x31, 0x32,
+	0x31, 0x2e, 0x33, 0x31, 0x20, 0x43, 0x20, 0x31, 0x34, 0x33, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x31,
+	0x31, 0x33, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x34, 0x34, 0x34, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x31,
+	0x34, 0x37, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x34, 0x34, 0x39, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x31,
+	0x35, 0x39, 0x2e, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31, 0x35, 0x2e, 0x37, 0x34, 0x20,
+	0x31, 0x33, 0x33, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x34, 0x34, 0x31, 0x2e, 0x34, 0x35, 0x20,
+	0x31, 0x35, 0x33, 0x37, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x32, 0x36, 0x30, 0x2e, 0x37, 0x36, 0x20,
+	0x31, 0x36, 0x30, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32, 0x34, 0x39, 0x2e, 0x38,
+	0x33, 0x20, 0x31, 0x36, 0x30, 0x39, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x32, 0x33, 0x38, 0x2e, 0x37,
+	0x35, 0x20, 0x31, 0x36, 0x31, 0x33, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e, 0x35, 0x34, 0x20, 0x31,
+	0x36, 0x31, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x39, 0x31,
+	0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x30, 0x38, 0x35, 0x2e, 0x30, 0x35,
+	0x20, 0x31, 0x36, 0x32, 0x33, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x30, 0x32, 0x30, 0x2e, 0x38, 0x20,
+	0x31, 0x36, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x4c, 0x20, 0x39, 0x34, 0x30, 0x2e, 0x38, 0x39,
+	0x34, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x34, 0x35, 0x20, 0x43, 0x20, 0x39, 0x30, 0x30, 0x2e,
+	0x30, 0x34, 0x36, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x36, 0x39, 0x20, 0x38, 0x37, 0x34, 0x2e,
+	0x30, 0x36, 0x20, 0x31, 0x36, 0x32, 0x35, 0x2e, 0x35, 0x37, 0x20, 0x38, 0x33, 0x33, 0x2e, 0x36,
+	0x37, 0x36, 0x20, 0x31, 0x36, 0x31, 0x37, 0x2e, 0x38, 0x31, 0x20, 0x43, 0x20, 0x37, 0x39, 0x34,
+	0x2e, 0x36, 0x31, 0x32, 0x20, 0x31, 0x36, 0x31, 0x30, 0x2e, 0x34, 0x38, 0x20, 0x37, 0x35, 0x37,
+	0x2e, 0x33, 0x35, 0x33, 0x20, 0x31, 0x35, 0x39, 0x35, 0x2e, 0x36, 0x20, 0x37, 0x32, 0x33, 0x2e,
+	0x39, 0x38, 0x38, 0x20, 0x31, 0x35, 0x37, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x43, 0x20, 0x36, 0x35,
+	0x32, 0x2e, 0x34, 0x35, 0x37, 0x20, 0x31, 0x35, 0x32, 0x37, 0x2e, 0x39, 0x37, 0x20, 0x36, 0x30,
+	0x34, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x35, 0x31, 0x2e, 0x37, 0x20, 0x35, 0x38, 0x36, 0x2e,
+	0x35, 0x32, 0x36, 0x20, 0x31, 0x33, 0x36, 0x39, 0x2e, 0x32, 0x39, 0x20, 0x43, 0x20, 0x35, 0x36,
+	0x35, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x31, 0x32, 0x37, 0x34, 0x2e, 0x35, 0x33, 0x20, 0x35, 0x38,
+	0x33, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x34, 0x34, 0x20, 0x36, 0x33,
+	0x36, 0x2e, 0x37, 0x39, 0x34, 0x20, 0x31, 0x30, 0x39, 0x34, 0x2e, 0x30, 0x39, 0x20, 0x43, 0x20,
+	0x36, 0x34, 0x35, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x31, 0x30, 0x38, 0x39, 0x2e, 0x36, 0x35, 0x20,
+	0x36, 0x36, 0x30, 0x2e, 0x37, 0x38, 0x37, 0x20, 0x31, 0x30, 0x38, 0x34, 0x2e, 0x37, 0x35, 0x20,
+	0x36, 0x37, 0x30, 0x2e, 0x34, 0x33, 0x35, 0x20, 0x31, 0x30, 0x38, 0x31, 0x2e, 0x34, 0x37, 0x20,
+	0x43, 0x20, 0x37, 0x31, 0x38, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x31, 0x30, 0x36, 0x35, 0x2e, 0x33,
+	0x20, 0x37, 0x35, 0x38, 0x2e, 0x32, 0x34, 0x32, 0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x31, 0x32,
+	0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x34, 0x32,
+	0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65,
+	0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62,
+	0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x29, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x20, 0x39, 0x31, 0x35, 0x2e, 0x30, 0x30, 0x36, 0x20, 0x34, 0x39, 0x35, 0x2e,
+	0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x35, 0x30, 0x2e, 0x30, 0x39, 0x20, 0x34, 0x39,
+	0x35, 0x2e, 0x32, 0x38, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x34,
+	0x39, 0x35, 0x2e, 0x32, 0x37, 0x31, 0x20, 0x31, 0x31, 0x30, 0x39, 0x2e, 0x39, 0x34, 0x20, 0x34,
+	0x39, 0x34, 0x2e, 0x36, 0x36, 0x33, 0x20, 0x31, 0x31, 0x33, 0x38, 0x2e, 0x31, 0x20, 0x34, 0x39,
+	0x35, 0x2e, 0x37, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x33, 0x37, 0x2e, 0x39, 0x35, 0x20, 0x36,
+	0x34, 0x33, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x33, 0x38, 0x2e, 0x30, 0x32,
+	0x20, 0x37, 0x30, 0x33, 0x2e, 0x32, 0x32, 0x37, 0x20, 0x31, 0x31, 0x33, 0x35, 0x2e, 0x34, 0x33,
+	0x20, 0x37, 0x36, 0x34, 0x2e, 0x31, 0x35, 0x38, 0x20, 0x31, 0x31, 0x36, 0x34, 0x2e, 0x34, 0x32,
+	0x20, 0x38, 0x31, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x34,
+	0x36, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x37, 0x31, 0x32, 0x20, 0x31, 0x32, 0x32, 0x39, 0x2e, 0x32,
+	0x35, 0x20, 0x39, 0x30, 0x32, 0x2e, 0x33, 0x30, 0x33, 0x20, 0x31, 0x32, 0x37, 0x36, 0x2e, 0x37,
+	0x37, 0x20, 0x39, 0x34, 0x38, 0x2e, 0x39, 0x32, 0x20, 0x43, 0x20, 0x31, 0x33, 0x31, 0x34, 0x2e,
+	0x35, 0x37, 0x20, 0x39, 0x38, 0x35, 0x2e, 0x33, 0x31, 0x35, 0x20, 0x31, 0x33, 0x35, 0x32, 0x2e,
+	0x30, 0x34, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x33, 0x38, 0x39, 0x2e,
+	0x31, 0x39, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x31, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x34,
+	0x2e, 0x34, 0x20, 0x31, 0x30, 0x39, 0x34, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e,
+	0x31, 0x34, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e,
+	0x39, 0x38, 0x20, 0x31, 0x30, 0x35, 0x33, 0x2e, 0x39, 0x37, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37,
+	0x33, 0x2e, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x36, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x30, 0x35,
+	0x39, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x33, 0x36, 0x2e, 0x30, 0x39, 0x20, 0x31, 0x30, 0x34,
+	0x32, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x30, 0x32, 0x38, 0x2e, 0x31, 0x31, 0x20, 0x43, 0x20, 0x39,
+	0x39, 0x36, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x30, 0x30, 0x36, 0x2e, 0x31, 0x36, 0x20, 0x39, 0x34,
+	0x37, 0x2e, 0x31, 0x34, 0x39, 0x20, 0x39, 0x39, 0x32, 0x2e, 0x30, 0x30, 0x39, 0x20, 0x38, 0x39,
+	0x36, 0x2e, 0x34, 0x32, 0x20, 0x39, 0x38, 0x36, 0x2e, 0x32, 0x33, 0x35, 0x20, 0x43, 0x20, 0x38,
+	0x35, 0x36, 0x2e, 0x30, 0x34, 0x20, 0x39, 0x38, 0x31, 0x2e, 0x34, 0x39, 0x31, 0x20, 0x38, 0x31,
+	0x33, 0x2e, 0x37, 0x39, 0x39, 0x20, 0x39, 0x38, 0x31, 0x2e, 0x36, 0x32, 0x39, 0x20, 0x37, 0x37,
+	0x33, 0x2e, 0x34, 0x35, 0x39, 0x20, 0x39, 0x38, 0x37, 0x2e, 0x34, 0x30, 0x36, 0x20, 0x43, 0x20,
+	0x37, 0x36, 0x35, 0x2e, 0x35, 0x31, 0x32, 0x20, 0x39, 0x38, 0x38, 0x2e, 0x35, 0x34, 0x35, 0x20,
+	0x37, 0x32, 0x38, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x39, 0x39, 0x37, 0x2e, 0x33, 0x38, 0x39, 0x20,
+	0x37, 0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39, 0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20,
+	0x43, 0x20, 0x37, 0x34, 0x31, 0x2e, 0x36, 0x37, 0x32, 0x20, 0x39, 0x38, 0x31, 0x2e, 0x38, 0x34,
+	0x36, 0x20, 0x37, 0x36, 0x33, 0x2e, 0x39, 0x33, 0x36, 0x20, 0x39, 0x35, 0x37, 0x2e, 0x30, 0x37,
+	0x35, 0x20, 0x37, 0x38, 0x31, 0x2e, 0x35, 0x33, 0x32, 0x20, 0x39, 0x34, 0x31, 0x2e, 0x33, 0x34,
+	0x31, 0x20, 0x43, 0x20, 0x38, 0x34, 0x38, 0x2e, 0x31, 0x34, 0x20, 0x38, 0x38, 0x31, 0x2e, 0x37,
+	0x38, 0x32, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x38, 0x32, 0x39, 0x2e, 0x32,
+	0x38, 0x38, 0x20, 0x39, 0x31, 0x32, 0x2e, 0x36, 0x38, 0x31, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x32,
+	0x34, 0x35, 0x20, 0x43, 0x20, 0x39, 0x31, 0x36, 0x2e, 0x33, 0x32, 0x32, 0x20, 0x37, 0x30, 0x35,
+	0x2e, 0x35, 0x33, 0x31, 0x20, 0x39, 0x31, 0x34, 0x2e, 0x39, 0x36, 0x34, 0x20, 0x36, 0x37, 0x32,
+	0x2e, 0x36, 0x33, 0x32, 0x20, 0x39, 0x31, 0x34, 0x2e, 0x39, 0x36, 0x20, 0x36, 0x34, 0x32, 0x2e,
+	0x30, 0x34, 0x34, 0x20, 0x4c, 0x20, 0x39, 0x31, 0x35, 0x2e, 0x30, 0x30, 0x36, 0x20, 0x34, 0x39,
+	0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x34, 0x37, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x34,
+	0x30, 0x38, 0x20, 0x43, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x35, 0x34, 0x39, 0x20, 0x32, 0x38, 0x30,
+	0x2e, 0x33, 0x39, 0x39, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x36, 0x32, 0x32, 0x20, 0x32, 0x38, 0x30,
+	0x2e, 0x33, 0x39, 0x31, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x36, 0x39, 0x34, 0x20, 0x32, 0x38, 0x30,
+	0x2e, 0x33, 0x38, 0x33, 0x20, 0x43, 0x20, 0x38, 0x38, 0x39, 0x2e, 0x32, 0x36, 0x36, 0x20, 0x32,
+	0x37, 0x39, 0x2e, 0x37, 0x36, 0x33, 0x20, 0x39, 0x31, 0x34, 0x2e, 0x39, 0x36, 0x38, 0x20, 0x32,
+	0x37, 0x39, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x39, 0x33, 0x39, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x32,
+	0x38, 0x30, 0x2e, 0x30, 0x32, 0x35, 0x20, 0x43, 0x20, 0x39, 0x37, 0x36, 0x2e, 0x33, 0x38, 0x31,
+	0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x33, 0x38, 0x20, 0x31, 0x30, 0x31, 0x33, 0x2e, 0x33, 0x35,
+	0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x35, 0x36, 0x20, 0x31, 0x30, 0x35, 0x30, 0x2e, 0x33, 0x31,
+	0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x34, 0x30, 0x2e,
+	0x35, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x39, 0x34, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37,
+	0x33, 0x2e, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x31, 0x32, 0x32, 0x36,
+	0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x31, 0x2e, 0x36, 0x30, 0x36, 0x20, 0x31, 0x32, 0x32, 0x35,
+	0x2e, 0x39, 0x31, 0x20, 0x33, 0x32, 0x32, 0x2e, 0x38, 0x35, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32,
+	0x32, 0x35, 0x2e, 0x36, 0x31, 0x20, 0x33, 0x34, 0x37, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x31, 0x32,
+	0x32, 0x37, 0x2e, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33, 0x2e, 0x33, 0x30, 0x34, 0x20, 0x31, 0x32,
+	0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x33, 0x39, 0x37, 0x2e, 0x30, 0x33, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x34, 0x20, 0x34, 0x31, 0x34, 0x2e, 0x35, 0x37, 0x37, 0x20,
+	0x31, 0x32, 0x30, 0x35, 0x2e, 0x31, 0x39, 0x20, 0x34, 0x32, 0x31, 0x2e, 0x35, 0x38, 0x20, 0x31,
+	0x31, 0x38, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x34, 0x32, 0x32, 0x2e, 0x30, 0x30, 0x38, 0x20, 0x4c,
+	0x20, 0x39, 0x36, 0x31, 0x2e, 0x39, 0x39, 0x39, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x30, 0x31, 0x36,
+	0x20, 0x4c, 0x20, 0x38, 0x39, 0x34, 0x2e, 0x34, 0x38, 0x32, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x31,
+	0x34, 0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x32, 0x2e, 0x36, 0x37, 0x33, 0x20, 0x34, 0x32, 0x33,
+	0x2e, 0x31, 0x37, 0x33, 0x20, 0x38, 0x34, 0x36, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x34, 0x32, 0x34,
+	0x2e, 0x38, 0x37, 0x39, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x34, 0x31, 0x38,
+	0x2e, 0x36, 0x37, 0x38, 0x20, 0x43, 0x20, 0x38, 0x32, 0x30, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x34,
+	0x30, 0x35, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x38, 0x32, 0x34, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x33,
+	0x37, 0x33, 0x2e, 0x33, 0x37, 0x39, 0x20, 0x38, 0x32, 0x34, 0x2e, 0x39, 0x35, 0x31, 0x20, 0x33,
+	0x35, 0x33, 0x2e, 0x39, 0x39, 0x38, 0x20, 0x43, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x30, 0x31, 0x32,
+	0x20, 0x33, 0x31, 0x37, 0x2e, 0x32, 0x39, 0x36, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x31, 0x32, 0x33,
+	0x20, 0x32, 0x38, 0x34, 0x2e, 0x35, 0x32, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x34, 0x37, 0x37, 0x20,
+	0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x38, 0x37, 0x2c, 0x31, 0x33, 0x36, 0x2c,
+	0x34, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x37, 0x39, 0x2e, 0x35, 0x32,
+	0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x38, 0x33,
+	0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x35,
+	0x32, 0x2e, 0x34, 0x32, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36, 0x34, 0x31, 0x20, 0x43, 0x20, 0x31,
+	0x31, 0x36, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x31,
+	0x38, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x31, 0x36, 0x37, 0x20, 0x31, 0x31,
+	0x39, 0x33, 0x2e, 0x33, 0x34, 0x20, 0x32, 0x38, 0x34, 0x2e, 0x33, 0x37, 0x37, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x31, 0x31, 0x2e, 0x36, 0x20, 0x32, 0x38, 0x36, 0x2e, 0x30, 0x36, 0x38, 0x20, 0x31,
+	0x32, 0x32, 0x32, 0x2e, 0x34, 0x31, 0x20, 0x33, 0x30, 0x34, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x31,
+	0x32, 0x32, 0x32, 0x2e, 0x30, 0x38, 0x20, 0x33, 0x32, 0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x37, 0x20, 0x33, 0x33, 0x37, 0x2e, 0x31, 0x31, 0x34,
+	0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x31, 0x35, 0x20, 0x33, 0x35, 0x31, 0x2e, 0x39, 0x34, 0x33,
+	0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x39, 0x35, 0x20, 0x33, 0x36, 0x37, 0x2e, 0x31, 0x32, 0x34,
+	0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x37, 0x20, 0x33, 0x38, 0x31, 0x2e, 0x32,
+	0x32, 0x31, 0x20, 0x31, 0x32, 0x32, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x33, 0x39, 0x39, 0x2e, 0x34,
+	0x34, 0x20, 0x31, 0x32, 0x31, 0x33, 0x2e, 0x33, 0x37, 0x20, 0x34, 0x31, 0x30, 0x2e, 0x34, 0x33,
+	0x32, 0x20, 0x43, 0x20, 0x31, 0x32, 0x30, 0x32, 0x2e, 0x39, 0x31, 0x20, 0x34, 0x32, 0x31, 0x2e,
+	0x31, 0x35, 0x33, 0x20, 0x31, 0x31, 0x38, 0x36, 0x2e, 0x32, 0x33, 0x20, 0x34, 0x31, 0x39, 0x2e,
+	0x33, 0x35, 0x35, 0x20, 0x31, 0x31, 0x37, 0x32, 0x2e, 0x35, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x31,
+	0x39, 0x32, 0x20, 0x4c, 0x20, 0x39, 0x35, 0x31, 0x2e, 0x34, 0x37, 0x32, 0x20, 0x34, 0x31, 0x39,
+	0x2e, 0x31, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x38, 0x35, 0x2e, 0x37, 0x38, 0x33, 0x20, 0x34,
+	0x31, 0x39, 0x2e, 0x32, 0x37, 0x20, 0x43, 0x20, 0x38, 0x36, 0x31, 0x2e, 0x33, 0x30, 0x35, 0x20,
+	0x34, 0x31, 0x39, 0x2e, 0x33, 0x34, 0x35, 0x20, 0x38, 0x32, 0x38, 0x2e, 0x33, 0x30, 0x36, 0x20,
+	0x34, 0x32, 0x36, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x38, 0x32, 0x38, 0x2e, 0x38, 0x31, 0x36, 0x20,
+	0x33, 0x39, 0x30, 0x2e, 0x31, 0x35, 0x20, 0x43, 0x20, 0x38, 0x32, 0x39, 0x2e, 0x32, 0x30, 0x34,
+	0x20, 0x33, 0x36, 0x32, 0x2e, 0x38, 0x37, 0x20, 0x38, 0x32, 0x36, 0x2e, 0x37, 0x39, 0x33, 0x20,
+	0x33, 0x33, 0x33, 0x2e, 0x30, 0x31, 0x34, 0x20, 0x38, 0x33, 0x30, 0x2e, 0x31, 0x31, 0x34, 0x20,
+	0x33, 0x30, 0x36, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x43, 0x20, 0x38, 0x33, 0x32, 0x2e, 0x38, 0x34,
+	0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x39, 0x36, 0x35, 0x20, 0x38, 0x36, 0x33, 0x2e, 0x30, 0x35,
+	0x34, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x37, 0x20, 0x38, 0x37, 0x39, 0x2e, 0x35, 0x32,
+	0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29,
+	0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31,
+	0x30, 0x30, 0x32, 0x2e, 0x36, 0x39, 0x20, 0x43, 0x20, 0x37, 0x31, 0x34, 0x2e, 0x35, 0x36, 0x20,
+	0x39, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x37, 0x32, 0x30, 0x2e, 0x34, 0x36, 0x35, 0x20,
+	0x39, 0x39, 0x31, 0x2e, 0x39, 0x34, 0x32, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20,
+	0x39, 0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x33, 0x34,
+	0x38, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x36, 0x36, 0x20, 0x37, 0x31, 0x37, 0x2e, 0x33, 0x37,
+	0x33, 0x20, 0x31, 0x30, 0x30, 0x33, 0x2e, 0x32, 0x35, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x33, 0x30,
+	0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_client_mldonkey_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0xc0, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x92, 0x4b,
+	0x4b, 0x1b, 0x51, 0x18, 0x86, 0x5f, 0x33, 0x6a, 0x35, 0xa1, 0x0b, 0x33, 0x3a, 0x51, 0x49, 0x8a,
+	0x50, 0xad, 0x5a, 0x15, 0x17, 0xe2, 0xce, 0xfb, 0x2f, 0xe8, 0xc6, 0x1f, 0x50, 0x5a, 0x02, 0x82,
+	0x83, 0x64, 0x61, 0x2c, 0x5d, 0x94, 0x2c, 0x84, 0xec, 0x94, 0x18, 0xc5, 0x8d, 0x44, 0xfd, 0x09,
+	0xba, 0xf1, 0x92, 0x8b, 0x51, 0x14, 0x5a, 0x69, 0x42, 0xa1, 0x75, 0xb4, 0xb7, 0xd5, 0x44, 0x27,
+	0x63, 0x18, 0x2f, 0x09, 0x03, 0x0a, 0x73, 0xe6, 0x74, 0x11, 0x52, 0x35, 0x27, 0xae, 0x7d, 0x57,
+	0x87, 0x03, 0xcf, 0xf3, 0x71, 0xbe, 0xf7, 0x00, 0x4f, 0x9d, 0xb2, 0xe2, 0x0b, 0xb7, 0xdb, 0x5d,
+	0xd1, 0xd5, 0xdd, 0xf3, 0xb1, 0xbd, 0xad, 0xf5, 0x3d, 0xcf, 0xdb, 0xeb, 0x01, 0x50, 0xed, 0xe2,
+	0x32, 0x7d, 0x74, 0x24, 0x85, 0xfe, 0xfc, 0x92, 0xfc, 0xc1, 0x60, 0xf0, 0xf6, 0x51, 0xdb, 0xf8,
+	0xb8, 0xb7, 0x71, 0x6b, 0x3b, 0x76, 0x66, 0x18, 0x06, 0x2d, 0x0e, 0x21, 0x84, 0x46, 0xa2, 0x71,
+	0x45, 0x14, 0xbd, 0xce, 0x92, 0xb0, 0x28, 0x8a, 0xcf, 0xb6, 0x23, 0xb1, 0x53, 0x86, 0x2c, 0x4a,
+	0x38, 0xba, 0x93, 0x1e, 0xf5, 0xf9, 0x2a, 0x0b, 0x9c, 0xa5, 0x70, 0x78, 0xd9, 0xd2, 0x31, 0x35,
+	0x32, 0x34, 0xd0, 0x58, 0x4a, 0x6e, 0x52, 0x13, 0x4b, 0xdf, 0x97, 0x21, 0xe7, 0x52, 0x18, 0x1e,
+	0xec, 0x77, 0x0c, 0x38, 0x9c, 0x9f, 0x18, 0x41, 0x67, 0x47, 0xfb, 0x3b, 0x8e, 0xe3, 0x4a, 0xc2,
+	0xb3, 0xc9, 0x00, 0xd6, 0xfe, 0xae, 0x63, 0x36, 0x19, 0x00, 0xc7, 0x71, 0x78, 0xdd, 0xfa, 0xea,
+	0x2d, 0x23, 0xe0, 0xf9, 0x9a, 0x06, 0x00, 0xb8, 0xbe, 0xbd, 0x46, 0xe8, 0xc7, 0x2a, 0x0c, 0xd3,
+	0x80, 0x49, 0x4d, 0xcc, 0x24, 0x02, 0x88, 0xcb, 0x7b, 0x10, 0xac, 0x75, 0xf8, 0xd0, 0x3b, 0x09,
+	0x00, 0xa8, 0xad, 0xe5, 0x1d, 0x05, 0xae, 0xfc, 0x6e, 0x56, 0xbe, 0x90, 0xf9, 0x6f, 0x8b, 0xf8,
+	0xac, 0x7c, 0x81, 0x9c, 0x93, 0x61, 0xab, 0xb0, 0x61, 0x37, 0x95, 0x87, 0xfd, 0x7d, 0xd3, 0x10,
+	0xac, 0x02, 0x00, 0x80, 0xd2, 0x3b, 0xea, 0xbf, 0x40, 0xd3, 0x34, 0x15, 0x80, 0x73, 0xac, 0xdb,
+	0x0d, 0x39, 0x97, 0xc2, 0x57, 0x35, 0x01, 0x00, 0x0c, 0x0c, 0x00, 0xda, 0xa5, 0xa6, 0x32, 0x4f,
+	0x90, 0x8e, 0x4f, 0x42, 0x84, 0x10, 0xd8, 0xab, 0xec, 0xf0, 0xf7, 0x4d, 0xc3, 0xf5, 0xdc, 0x05,
+	0xc1, 0x2a, 0x30, 0xb0, 0x69, 0x9a, 0x38, 0x96, 0x7e, 0xae, 0x30, 0xcb, 0x1a, 0xf5, 0xf9, 0x2a,
+	0xc3, 0x91, 0x1d, 0xa5, 0x50, 0xd7, 0xd5, 0xcd, 0x15, 0x55, 0xf5, 0x73, 0xa6, 0xc6, 0x68, 0x6c,
+	0x4f, 0xf5, 0x78, 0x3c, 0xd5, 0x8c, 0x00, 0x00, 0x44, 0xd1, 0xeb, 0x8c, 0x44, 0xe3, 0x0a, 0x21,
+	0xe4, 0x91, 0x8f, 0xb4, 0xab, 0x4e, 0x4c, 0x4c, 0xbd, 0xb8, 0xcf, 0x3c, 0xe8, 0xed, 0xf0, 0xf0,
+	0x20, 0x6b, 0xb1, 0x34, 0x2d, 0x9c, 0x2a, 0xbf, 0xa9, 0xae, 0xeb, 0xcd, 0xd9, 0xac, 0x6e, 0xcb,
+	0x64, 0x32, 0x90, 0xa4, 0x93, 0xf4, 0xc6, 0x66, 0x78, 0xfe, 0x60, 0x3f, 0xfe, 0x66, 0x6e, 0x6e,
+	0xe6, 0xa2, 0xe4, 0xf4, 0x27, 0xcb, 0x3f, 0xd2, 0x63, 0x13, 0xc3, 0xeb, 0x2f, 0xd6, 0x9e, 0x00,
+	0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_mldonkey_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x30, 0x34, 0x2c,
+	0x31, 0x30, 0x37, 0x2c, 0x31, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39,
+	0x39, 0x33, 0x2e, 0x39, 0x38, 0x37, 0x20, 0x32, 0x35, 0x37, 0x2e, 0x38, 0x37, 0x33, 0x20, 0x43,
+	0x20, 0x31, 0x34, 0x31, 0x37, 0x2e, 0x37, 0x34, 0x20, 0x32, 0x34, 0x30, 0x2e, 0x33, 0x36, 0x32,
+	0x20, 0x31, 0x37, 0x37, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x35, 0x36, 0x39, 0x2e, 0x35, 0x33, 0x36,
+	0x20, 0x31, 0x37, 0x39, 0x33, 0x2e, 0x33, 0x31, 0x20, 0x39, 0x39, 0x33, 0x2e, 0x32, 0x37, 0x35,
+	0x20, 0x43, 0x20, 0x31, 0x38, 0x31, 0x31, 0x2e, 0x30, 0x39, 0x20, 0x31, 0x34, 0x31, 0x37, 0x2e,
+	0x30, 0x31, 0x20, 0x31, 0x34, 0x38, 0x32, 0x2e, 0x31, 0x35, 0x20, 0x31, 0x37, 0x37, 0x35, 0x2e,
+	0x30, 0x31, 0x20, 0x31, 0x30, 0x35, 0x38, 0x2e, 0x34, 0x32, 0x20, 0x31, 0x37, 0x39, 0x33, 0x2e,
+	0x30, 0x37, 0x20, 0x43, 0x20, 0x36, 0x33, 0x34, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x38, 0x31,
+	0x31, 0x2e, 0x31, 0x34, 0x20, 0x32, 0x37, 0x35, 0x2e, 0x39, 0x31, 0x31, 0x20, 0x31, 0x34, 0x38,
+	0x31, 0x2e, 0x38, 0x33, 0x20, 0x32, 0x35, 0x38, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x30, 0x35, 0x37,
+	0x2e, 0x37, 0x31, 0x20, 0x43, 0x20, 0x32, 0x34, 0x30, 0x2e, 0x33, 0x31, 0x20, 0x36, 0x33, 0x33,
+	0x2e, 0x35, 0x38, 0x31, 0x20, 0x35, 0x36, 0x39, 0x2e, 0x38, 0x35, 0x20, 0x32, 0x37, 0x35, 0x2e,
+	0x34, 0x20, 0x39, 0x39, 0x33, 0x2e, 0x39, 0x38, 0x37, 0x20, 0x32, 0x35, 0x37, 0x2e, 0x38, 0x37,
+	0x33, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74,
+	0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67,
+	0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x38, 0x37, 0x20, 0x32, 0x39, 0x32,
+	0x2e, 0x36, 0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x34, 0x31, 0x30, 0x2e, 0x38, 0x32, 0x20, 0x32,
+	0x38, 0x31, 0x2e, 0x37, 0x37, 0x35, 0x20, 0x31, 0x37, 0x34, 0x37, 0x2e, 0x38, 0x36, 0x20, 0x36,
+	0x30, 0x31, 0x2e, 0x33, 0x35, 0x34, 0x20, 0x31, 0x37, 0x35, 0x38, 0x2e, 0x35, 0x31, 0x20, 0x31,
+	0x30, 0x30, 0x36, 0x2e, 0x33, 0x31, 0x20, 0x43, 0x20, 0x31, 0x37, 0x36, 0x39, 0x2e, 0x31, 0x37,
+	0x20, 0x31, 0x34, 0x31, 0x31, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x34, 0x34, 0x39, 0x2e, 0x34, 0x32,
+	0x20, 0x31, 0x37, 0x34, 0x38, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x30, 0x34, 0x34, 0x2e, 0x34, 0x36,
+	0x20, 0x31, 0x37, 0x35, 0x38, 0x2e, 0x35, 0x38, 0x20, 0x43, 0x20, 0x36, 0x33, 0x39, 0x2e, 0x37,
+	0x39, 0x34, 0x20, 0x31, 0x37, 0x36, 0x39, 0x2e, 0x30, 0x33, 0x20, 0x33, 0x30, 0x33, 0x2e, 0x32,
+	0x32, 0x35, 0x20, 0x31, 0x34, 0x34, 0x39, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x39, 0x32, 0x2e, 0x35,
+	0x37, 0x33, 0x20, 0x31, 0x30, 0x34, 0x34, 0x2e, 0x39, 0x20, 0x43, 0x20, 0x32, 0x38, 0x31, 0x2e,
+	0x39, 0x32, 0x32, 0x20, 0x36, 0x34, 0x30, 0x2e, 0x32, 0x33, 0x34, 0x20, 0x36, 0x30, 0x31, 0x2e,
+	0x32, 0x31, 0x39, 0x20, 0x33, 0x30, 0x33, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x31, 0x30, 0x30, 0x35,
+	0x2e, 0x38, 0x37, 0x20, 0x32, 0x39, 0x32, 0x2e, 0x36, 0x34, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x37, 0x36, 0x2c, 0x31,
+	0x37, 0x35, 0x2c, 0x38, 0x30, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x33, 0x36,
+	0x39, 0x2e, 0x39, 0x32, 0x20, 0x36, 0x35, 0x39, 0x2e, 0x37, 0x38, 0x33, 0x20, 0x43, 0x20, 0x31,
+	0x33, 0x39, 0x30, 0x2e, 0x35, 0x34, 0x20, 0x36, 0x37, 0x36, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x31,
+	0x34, 0x31, 0x37, 0x2e, 0x33, 0x35, 0x20, 0x37, 0x30, 0x35, 0x2e, 0x36, 0x35, 0x37, 0x20, 0x31,
+	0x34, 0x33, 0x36, 0x2e, 0x38, 0x37, 0x20, 0x37, 0x32, 0x34, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x43,
+	0x20, 0x31, 0x34, 0x37, 0x31, 0x2e, 0x38, 0x38, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x39, 0x34, 0x37,
+	0x20, 0x31, 0x35, 0x30, 0x36, 0x2e, 0x37, 0x39, 0x20, 0x37, 0x39, 0x33, 0x2e, 0x39, 0x30, 0x33,
+	0x20, 0x31, 0x35, 0x34, 0x32, 0x2e, 0x31, 0x39, 0x20, 0x38, 0x32, 0x36, 0x2e, 0x39, 0x32, 0x35,
+	0x20, 0x43, 0x20, 0x31, 0x35, 0x33, 0x32, 0x2e, 0x38, 0x37, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x34,
+	0x30, 0x34, 0x20, 0x31, 0x35, 0x32, 0x30, 0x2e, 0x33, 0x34, 0x20, 0x38, 0x34, 0x37, 0x2e, 0x38,
+	0x38, 0x39, 0x20, 0x31, 0x35, 0x31, 0x30, 0x2e, 0x33, 0x32, 0x20, 0x38, 0x35, 0x38, 0x2e, 0x35,
+	0x34, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x37, 0x31, 0x2e, 0x31, 0x38, 0x20, 0x39, 0x30, 0x30,
+	0x2e, 0x31, 0x39, 0x20, 0x31, 0x34, 0x32, 0x38, 0x2e, 0x36, 0x33, 0x20, 0x39, 0x33, 0x39, 0x2e,
+	0x33, 0x30, 0x38, 0x20, 0x31, 0x33, 0x38, 0x38, 0x2e, 0x35, 0x35, 0x20, 0x39, 0x37, 0x39, 0x2e,
+	0x37, 0x36, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x37, 0x30, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x32,
+	0x39, 0x37, 0x2e, 0x33, 0x32, 0x20, 0x43, 0x20, 0x31, 0x30, 0x31, 0x34, 0x2e, 0x36, 0x37, 0x20,
+	0x31, 0x33, 0x35, 0x33, 0x2e, 0x33, 0x33, 0x20, 0x39, 0x35, 0x36, 0x2e, 0x38, 0x39, 0x31, 0x20,
+	0x31, 0x34, 0x30, 0x38, 0x2e, 0x39, 0x34, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x37, 0x32, 0x34, 0x20,
+	0x31, 0x34, 0x36, 0x36, 0x20, 0x43, 0x20, 0x38, 0x38, 0x32, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x31,
+	0x34, 0x34, 0x37, 0x2e, 0x39, 0x34, 0x20, 0x38, 0x36, 0x30, 0x2e, 0x35, 0x30, 0x35, 0x20, 0x31,
+	0x34, 0x32, 0x35, 0x2e, 0x38, 0x37, 0x20, 0x38, 0x34, 0x31, 0x2e, 0x31, 0x39, 0x36, 0x20, 0x31,
+	0x34, 0x30, 0x37, 0x2e, 0x31, 0x33, 0x20, 0x4c, 0x20, 0x36, 0x39, 0x32, 0x2e, 0x36, 0x34, 0x31,
+	0x20, 0x31, 0x32, 0x36, 0x31, 0x2e, 0x30, 0x37, 0x20, 0x43, 0x20, 0x36, 0x33, 0x35, 0x2e, 0x30,
+	0x38, 0x38, 0x20, 0x31, 0x32, 0x30, 0x36, 0x2e, 0x31, 0x20, 0x35, 0x37, 0x37, 0x2e, 0x36, 0x32,
+	0x38, 0x20, 0x31, 0x31, 0x34, 0x36, 0x2e, 0x31, 0x32, 0x20, 0x35, 0x31, 0x39, 0x2e, 0x38, 0x31,
+	0x36, 0x20, 0x31, 0x30, 0x39, 0x32, 0x2e, 0x30, 0x39, 0x20, 0x43, 0x20, 0x35, 0x32, 0x37, 0x2e,
+	0x36, 0x38, 0x34, 0x20, 0x31, 0x30, 0x38, 0x31, 0x2e, 0x35, 0x36, 0x20, 0x35, 0x36, 0x35, 0x2e,
+	0x37, 0x39, 0x39, 0x20, 0x31, 0x30, 0x34, 0x33, 0x2e, 0x39, 0x36, 0x20, 0x35, 0x37, 0x37, 0x2e,
+	0x38, 0x32, 0x36, 0x20, 0x31, 0x30, 0x33, 0x32, 0x2e, 0x35, 0x32, 0x20, 0x43, 0x20, 0x36, 0x31,
+	0x35, 0x2e, 0x35, 0x36, 0x32, 0x20, 0x39, 0x39, 0x36, 0x2e, 0x36, 0x33, 0x33, 0x20, 0x36, 0x35,
+	0x33, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x39, 0x35, 0x36, 0x2e, 0x36, 0x30, 0x34, 0x20, 0x36, 0x39,
+	0x30, 0x2e, 0x38, 0x38, 0x34, 0x20, 0x39, 0x32, 0x31, 0x2e, 0x34, 0x31, 0x33, 0x20, 0x43, 0x20,
+	0x37, 0x31, 0x33, 0x2e, 0x30, 0x32, 0x20, 0x39, 0x34, 0x31, 0x2e, 0x39, 0x33, 0x34, 0x20, 0x37,
+	0x33, 0x34, 0x2e, 0x35, 0x37, 0x35, 0x20, 0x39, 0x36, 0x33, 0x2e, 0x37, 0x30, 0x38, 0x20, 0x37,
+	0x35, 0x36, 0x2e, 0x32, 0x31, 0x32, 0x20, 0x39, 0x38, 0x34, 0x2e, 0x37, 0x38, 0x20, 0x4c, 0x20,
+	0x38, 0x34, 0x37, 0x2e, 0x30, 0x32, 0x31, 0x20, 0x31, 0x30, 0x37, 0x32, 0x2e, 0x33, 0x32, 0x20,
+	0x43, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x37, 0x36, 0x34, 0x20, 0x31, 0x30, 0x38, 0x39, 0x2e, 0x34,
+	0x36, 0x20, 0x38, 0x38, 0x33, 0x2e, 0x39, 0x32, 0x20, 0x31, 0x31, 0x30, 0x39, 0x2e, 0x34, 0x36,
+	0x20, 0x39, 0x30, 0x32, 0x2e, 0x31, 0x37, 0x20, 0x31, 0x31, 0x32, 0x35, 0x2e, 0x35, 0x35, 0x20,
+	0x43, 0x20, 0x39, 0x39, 0x35, 0x2e, 0x32, 0x37, 0x35, 0x20, 0x31, 0x30, 0x33, 0x31, 0x2e, 0x35,
+	0x32, 0x20, 0x31, 0x30, 0x38, 0x38, 0x2e, 0x38, 0x39, 0x20, 0x39, 0x33, 0x37, 0x2e, 0x39, 0x39,
+	0x33, 0x20, 0x31, 0x31, 0x38, 0x33, 0x2e, 0x30, 0x32, 0x20, 0x38, 0x34, 0x34, 0x2e, 0x39, 0x38,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x34, 0x33, 0x2e, 0x33, 0x20, 0x37, 0x38, 0x34, 0x2e, 0x39,
+	0x35, 0x38, 0x20, 0x31, 0x33, 0x30, 0x37, 0x2e, 0x39, 0x33, 0x20, 0x37, 0x31, 0x37, 0x2e, 0x33,
+	0x36, 0x36, 0x20, 0x31, 0x33, 0x36, 0x39, 0x2e, 0x39, 0x32, 0x20, 0x36, 0x35, 0x39, 0x2e, 0x37,
+	0x38, 0x33, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e
+};
+
+static const unsigned char icon_client_poorrating_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x5c, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x92, 0x4d,
+	0x4b, 0x02, 0x41, 0x1c, 0xc6, 0x9f, 0x9d, 0x75, 0xd1, 0x68, 0x7b, 0x59, 0x45, 0x68, 0x77, 0xd5,
+	0xb4, 0x24, 0xbc, 0x74, 0x8a, 0x2e, 0x5d, 0x3b, 0x84, 0xdd, 0x3b, 0x74, 0x0a, 0x22, 0xe8, 0xd2,
+	0x27, 0x10, 0x0a, 0x3a, 0xf4, 0x5d, 0x2a, 0xba, 0x76, 0xf0, 0x50, 0x91, 0x48, 0x97, 0x88, 0x0e,
+	0x52, 0x24, 0x41, 0xbe, 0xc1, 0x8a, 0xa6, 0x68, 0xca, 0x82, 0xba, 0xbb, 0x33, 0x1d, 0x22, 0x30,
+	0xd7, 0x39, 0x74, 0xf2, 0x39, 0xce, 0xfc, 0xe6, 0xff, 0xf2, 0x3c, 0x03, 0x4c, 0x5a, 0x02, 0xef,
+	0x22, 0xae, 0xeb, 0x21, 0xca, 0x58, 0x02, 0x00, 0x18, 0x50, 0x29, 0x18, 0x46, 0x7e, 0x1c, 0xe7,
+	0xe1, 0x15, 0x08, 0x07, 0x9d, 0xec, 0xf6, 0xba, 0x6f, 0x11, 0x00, 0xee, 0x72, 0xfd, 0x41, 0xc1,
+	0x80, 0x77, 0x1c, 0x47, 0x78, 0x05, 0xea, 0x1d, 0x5c, 0x3f, 0x14, 0x15, 0x3c, 0x55, 0x17, 0x50,
+	0x69, 0x08, 0x59, 0x1e, 0xc7, 0x55, 0x44, 0xd7, 0x37, 0x6f, 0x6f, 0x6e, 0x58, 0xb9, 0x54, 0x62,
+	0x31, 0x4d, 0x3b, 0xe2, 0x71, 0xdc, 0x09, 0x44, 0x20, 0xa0, 0x28, 0x0a, 0x64, 0x59, 0x86, 0x40,
+	0x48, 0xe0, 0x5f, 0xdd, 0x97, 0x35, 0x2d, 0x7c, 0x78, 0xb0, 0x5f, 0xa3, 0x94, 0x32, 0xc6, 0x18,
+	0x3b, 0x3d, 0x39, 0x36, 0x23, 0xaa, 0xba, 0xc6, 0x69, 0xf4, 0x57, 0x71, 0xbf, 0x7f, 0x56, 0x22,
+	0xe4, 0x71, 0x65, 0x46, 0xd1, 0x33, 0x99, 0x7b, 0x0c, 0x04, 0x60, 0x2b, 0x99, 0x94, 0xde, 0xf3,
+	0x6f, 0xbb, 0x9d, 0x46, 0xf3, 0xfc, 0xcb, 0x34, 0xdb, 0xc3, 0xbc, 0x2b, 0xc6, 0x98, 0xaa, 0xa6,
+	0x52, 0xa6, 0xe7, 0x2c, 0x48, 0x7e, 0x02, 0x2a, 0x52, 0x0b, 0x65, 0xd8, 0x98, 0x87, 0x88, 0x0b,
+	0xaf, 0x75, 0xf5, 0xf2, 0x59, 0xdf, 0x19, 0xe6, 0x5d, 0x31, 0x7a, 0x29, 0x5b, 0xfd, 0x7d, 0x0c,
+	0x00, 0x51, 0x22, 0x21, 0x0a, 0x09, 0x00, 0x90, 0x76, 0xec, 0xc4, 0x28, 0xef, 0x32, 0xb1, 0xe7,
+	0x11, 0xd3, 0x1f, 0xd4, 0x72, 0xed, 0xda, 0xa4, 0x0e, 0x6a, 0x3e, 0x21, 0x3d, 0x7a, 0xee, 0xf2,
+	0xa0, 0xdd, 0xed, 0xe6, 0xea, 0x73, 0x53, 0x1b, 0xe2, 0xc0, 0x59, 0xea, 0x31, 0x8a, 0x2a, 0x6c,
+	0x94, 0x99, 0x8d, 0x4b, 0xc9, 0x7a, 0x35, 0xe5, 0xe9, 0xbd, 0x56, 0xab, 0xd5, 0x1f, 0xe6, 0xb9,
+	0x5f, 0x39, 0xaa, 0x69, 0x09, 0x02, 0x84, 0x00, 0xc0, 0x01, 0x9a, 0x25, 0xc3, 0x78, 0xe6, 0xb1,
+	0x93, 0xd5, 0x37, 0x80, 0x37, 0x77, 0x99, 0x9f, 0x90, 0x6a, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x49,
+	0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_poorrating_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x31, 0x30, 0x31, 0x2e, 0x30, 0x36, 0x2c,
+	0x31, 0x35, 0x37, 0x2e, 0x39, 0x37, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e,
+	0x39, 0x30, 0x39, 0x29, 0x22, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74,
+	0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67,
+	0x62, 0x28, 0x33, 0x32, 0x2c, 0x32, 0x37, 0x2c, 0x32, 0x36, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39, 0x2e, 0x33, 0x37,
+	0x31, 0x20, 0x43, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x32, 0x30, 0x38, 0x2e,
+	0x30, 0x34, 0x38, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x34, 0x33, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x38,
+	0x39, 0x35, 0x20, 0x39, 0x32, 0x31, 0x2e, 0x39, 0x34, 0x38, 0x20, 0x32, 0x30, 0x38, 0x2e, 0x39,
+	0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x30, 0x35, 0x20, 0x32, 0x30, 0x38, 0x2e,
+	0x39, 0x39, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x34, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x32, 0x30,
+	0x38, 0x2e, 0x39, 0x31, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x36, 0x37, 0x20,
+	0x32, 0x30, 0x38, 0x2e, 0x38, 0x38, 0x35, 0x20, 0x31, 0x32, 0x30, 0x38, 0x2e, 0x33, 0x32, 0x20,
+	0x32, 0x30, 0x35, 0x2e, 0x35, 0x31, 0x38, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x33, 0x20,
+	0x32, 0x32, 0x30, 0x2e, 0x32, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x36, 0x33, 0x2e, 0x30,
+	0x33, 0x20, 0x32, 0x33, 0x33, 0x2e, 0x33, 0x34, 0x34, 0x20, 0x31, 0x32, 0x38, 0x32, 0x2e, 0x31,
+	0x36, 0x20, 0x32, 0x35, 0x36, 0x2e, 0x30, 0x32, 0x34, 0x20, 0x31, 0x32, 0x39, 0x30, 0x2e, 0x37,
+	0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x32, 0x36, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x39, 0x39,
+	0x20, 0x33, 0x30, 0x38, 0x2e, 0x39, 0x32, 0x33, 0x20, 0x31, 0x32, 0x39, 0x34, 0x2e, 0x35, 0x36,
+	0x20, 0x33, 0x32, 0x39, 0x2e, 0x33, 0x38, 0x37, 0x20, 0x31, 0x32, 0x39, 0x36, 0x2e, 0x33, 0x32,
+	0x20, 0x33, 0x35, 0x34, 0x2e, 0x36, 0x35, 0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x30, 0x2e,
+	0x37, 0x39, 0x20, 0x34, 0x31, 0x38, 0x2e, 0x39, 0x33, 0x35, 0x20, 0x31, 0x32, 0x38, 0x33, 0x2e,
+	0x30, 0x38, 0x20, 0x34, 0x37, 0x32, 0x2e, 0x30, 0x38, 0x35, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e,
+	0x38, 0x39, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x31, 0x34,
+	0x2e, 0x39, 0x37, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x39, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32,
+	0x31, 0x34, 0x2e, 0x39, 0x39, 0x20, 0x36, 0x36, 0x39, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x31, 0x32,
+	0x31, 0x31, 0x2e, 0x31, 0x31, 0x20, 0x37, 0x31, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x31, 0x32,
+	0x32, 0x33, 0x2e, 0x35, 0x35, 0x20, 0x37, 0x36, 0x31, 0x2e, 0x38, 0x39, 0x35, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x33, 0x37, 0x2e, 0x36, 0x32, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x30, 0x34, 0x37, 0x20,
+	0x31, 0x32, 0x36, 0x36, 0x2e, 0x38, 0x31, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x33, 0x35, 0x36, 0x20,
+	0x31, 0x33, 0x30, 0x33, 0x2e, 0x38, 0x36, 0x20, 0x38, 0x37, 0x30, 0x2e, 0x33, 0x31, 0x33, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x38, 0x39, 0x20, 0x39, 0x31, 0x30, 0x2e, 0x38, 0x36,
+	0x39, 0x20, 0x31, 0x33, 0x38, 0x36, 0x2e, 0x30, 0x39, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x36, 0x39,
+	0x38, 0x20, 0x31, 0x34, 0x32, 0x38, 0x2e, 0x31, 0x32, 0x20, 0x39, 0x39, 0x34, 0x2e, 0x32, 0x31,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x39, 0x31, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x30, 0x35, 0x35,
+	0x2e, 0x36, 0x39, 0x20, 0x31, 0x35, 0x33, 0x32, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x31, 0x34, 0x37,
+	0x2e, 0x32, 0x35, 0x20, 0x31, 0x35, 0x34, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x32, 0x33, 0x34,
+	0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x35, 0x35, 0x39, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x33,
+	0x34, 0x35, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x34,
+	0x35, 0x36, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x34, 0x36, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x35,
+	0x34, 0x34, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x34, 0x2e, 0x35, 0x34, 0x20,
+	0x31, 0x36, 0x33, 0x31, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x38, 0x38, 0x20,
+	0x31, 0x36, 0x38, 0x31, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x31, 0x31, 0x20,
+	0x31, 0x36, 0x39, 0x35, 0x2e, 0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x34, 0x2e, 0x36,
+	0x37, 0x20, 0x31, 0x36, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x37,
+	0x37, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x36, 0x33, 0x2e, 0x35, 0x20,
+	0x31, 0x36, 0x39, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e, 0x32,
+	0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x36, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x31, 0x34, 0x20, 0x31,
+	0x36, 0x39, 0x38, 0x2e, 0x37, 0x32, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x38, 0x34, 0x39, 0x20, 0x31,
+	0x36, 0x39, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x37, 0x38, 0x38, 0x2e, 0x31, 0x33, 0x32,
+	0x20, 0x31, 0x36, 0x39, 0x36, 0x2e, 0x35, 0x33, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x38, 0x32, 0x37,
+	0x20, 0x31, 0x36, 0x35, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x36, 0x31, 0x37, 0x2e, 0x37, 0x37, 0x36,
+	0x20, 0x31, 0x35, 0x37, 0x37, 0x2e, 0x30, 0x32, 0x20, 0x43, 0x20, 0x35, 0x30, 0x31, 0x2e, 0x39,
+	0x34, 0x35, 0x20, 0x31, 0x34, 0x35, 0x33, 0x2e, 0x30, 0x36, 0x20, 0x34, 0x37, 0x31, 0x2e, 0x36,
+	0x32, 0x39, 0x20, 0x31, 0x32, 0x37, 0x31, 0x2e, 0x37, 0x38, 0x20, 0x35, 0x34, 0x30, 0x2e, 0x38,
+	0x32, 0x34, 0x20, 0x31, 0x31, 0x31, 0x36, 0x2e, 0x38, 0x37, 0x20, 0x43, 0x20, 0x35, 0x35, 0x36,
+	0x2e, 0x39, 0x36, 0x34, 0x20, 0x31, 0x30, 0x37, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x35, 0x37, 0x39,
+	0x2e, 0x33, 0x38, 0x32, 0x20, 0x31, 0x30, 0x33, 0x39, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x30, 0x38,
+	0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x31, 0x31, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x36, 0x32,
+	0x30, 0x2e, 0x32, 0x31, 0x31, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x36, 0x33, 0x32,
+	0x2e, 0x34, 0x33, 0x20, 0x39, 0x38, 0x37, 0x2e, 0x32, 0x31, 0x38, 0x20, 0x36, 0x34, 0x34, 0x2e,
+	0x34, 0x38, 0x20, 0x39, 0x37, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x37, 0x35, 0x33,
+	0x2e, 0x33, 0x30, 0x36, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x37, 0x32, 0x20, 0x43, 0x20, 0x37, 0x37,
+	0x39, 0x2e, 0x32, 0x34, 0x31, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x32, 0x33, 0x20, 0x38, 0x30, 0x35,
+	0x2e, 0x33, 0x39, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x36, 0x35, 0x35, 0x20, 0x38, 0x32, 0x30, 0x2e,
+	0x38, 0x36, 0x34, 0x20, 0x37, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x34, 0x20, 0x43, 0x20, 0x38, 0x34,
+	0x31, 0x2e, 0x38, 0x39, 0x32, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x38, 0x35, 0x33, 0x20, 0x38, 0x33,
+	0x37, 0x2e, 0x34, 0x34, 0x36, 0x20, 0x36, 0x39, 0x31, 0x2e, 0x31, 0x31, 0x31, 0x20, 0x38, 0x33,
+	0x37, 0x2e, 0x32, 0x34, 0x38, 0x20, 0x36, 0x34, 0x30, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x43, 0x20,
+	0x38, 0x33, 0x36, 0x2e, 0x39, 0x36, 0x20, 0x35, 0x39, 0x31, 0x2e, 0x35, 0x39, 0x32, 0x20, 0x38,
+	0x33, 0x37, 0x2e, 0x32, 0x30, 0x32, 0x20, 0x35, 0x34, 0x32, 0x2e, 0x36, 0x38, 0x32, 0x20, 0x38,
+	0x33, 0x37, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x34, 0x39, 0x33, 0x2e, 0x37, 0x37, 0x39, 0x20, 0x43,
+	0x20, 0x37, 0x36, 0x36, 0x2e, 0x31, 0x32, 0x32, 0x20, 0x34, 0x37, 0x30, 0x2e, 0x38, 0x36, 0x33,
+	0x20, 0x37, 0x35, 0x34, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x34, 0x32, 0x32, 0x2e, 0x31, 0x34, 0x34,
+	0x20, 0x37, 0x35, 0x37, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x37, 0x32, 0x38,
+	0x20, 0x43, 0x20, 0x37, 0x35, 0x38, 0x2e, 0x35, 0x35, 0x33, 0x20, 0x33, 0x31, 0x35, 0x2e, 0x37,
+	0x31, 0x34, 0x20, 0x37, 0x35, 0x31, 0x2e, 0x34, 0x36, 0x37, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x38,
+	0x38, 0x39, 0x20, 0x37, 0x37, 0x39, 0x2e, 0x36, 0x39, 0x38, 0x20, 0x32, 0x34, 0x39, 0x2e, 0x38,
+	0x35, 0x38, 0x20, 0x43, 0x20, 0x38, 0x30, 0x30, 0x2e, 0x35, 0x35, 0x38, 0x20, 0x32, 0x32, 0x34,
+	0x2e, 0x37, 0x31, 0x33, 0x20, 0x38, 0x32, 0x32, 0x2e, 0x37, 0x33, 0x35, 0x20, 0x32, 0x31, 0x33,
+	0x2e, 0x32, 0x36, 0x31, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x32, 0x30, 0x39,
+	0x2e, 0x33, 0x37, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e, 0x34,
+	0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x33, 0x2e, 0x38, 0x31, 0x37, 0x20, 0x31, 0x30, 0x34, 0x35,
+	0x2e, 0x35, 0x33, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x30, 0x36, 0x31,
+	0x2e, 0x33, 0x38, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38, 0x35,
+	0x2e, 0x39, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x30,
+	0x39, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x30, 0x33, 0x38, 0x2e, 0x33, 0x32, 0x20, 0x31, 0x31,
+	0x30, 0x33, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x31,
+	0x31, 0x31, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x35, 0x2e, 0x37, 0x36, 0x20,
+	0x31, 0x31, 0x35, 0x37, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x32, 0x36, 0x39, 0x2e, 0x34, 0x32, 0x20,
+	0x31, 0x31, 0x36, 0x32, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x33, 0x37, 0x35, 0x2e, 0x37, 0x36, 0x20,
+	0x31, 0x31, 0x33, 0x35, 0x2e, 0x38, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x35, 0x2e, 0x34,
+	0x34, 0x20, 0x31, 0x31, 0x33, 0x31, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x34, 0x31, 0x33, 0x2e, 0x35,
+	0x20, 0x31, 0x31, 0x32, 0x34, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x34, 0x33, 0x32, 0x2e, 0x35, 0x32,
+	0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x33, 0x2e, 0x32,
+	0x33, 0x20, 0x31, 0x31, 0x33, 0x30, 0x2e, 0x33, 0x36, 0x20, 0x31, 0x34, 0x35, 0x34, 0x2e, 0x38,
+	0x37, 0x20, 0x31, 0x31, 0x36, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e, 0x31,
+	0x31, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x35, 0x33, 0x20, 0x43, 0x20, 0x31, 0x35, 0x31, 0x35,
+	0x2e, 0x32, 0x32, 0x20, 0x31, 0x33, 0x35, 0x36, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x34, 0x32, 0x39,
+	0x2e, 0x35, 0x38, 0x20, 0x31, 0x35, 0x36, 0x31, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x32, 0x34, 0x34,
+	0x2e, 0x32, 0x36, 0x20, 0x31, 0x36, 0x31, 0x34, 0x2e, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31,
+	0x39, 0x36, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x31,
+	0x35, 0x34, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x31,
+	0x30, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x4c, 0x20,
+	0x31, 0x30, 0x30, 0x38, 0x2e, 0x37, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x43,
+	0x20, 0x38, 0x38, 0x35, 0x2e, 0x33, 0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x31, 0x34,
+	0x20, 0x37, 0x38, 0x35, 0x2e, 0x33, 0x30, 0x31, 0x20, 0x31, 0x36, 0x33, 0x38, 0x2e, 0x31, 0x35,
+	0x20, 0x36, 0x38, 0x35, 0x2e, 0x38, 0x38, 0x39, 0x20, 0x31, 0x35, 0x34, 0x38, 0x2e, 0x34, 0x38,
+	0x20, 0x43, 0x20, 0x35, 0x35, 0x38, 0x2e, 0x32, 0x39, 0x33, 0x20, 0x31, 0x34, 0x33, 0x33, 0x2e,
+	0x33, 0x38, 0x20, 0x35, 0x34, 0x31, 0x2e, 0x39, 0x33, 0x32, 0x20, 0x31, 0x32, 0x34, 0x31, 0x2e,
+	0x34, 0x39, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x30, 0x37, 0x37, 0x20, 0x31, 0x30, 0x39, 0x38, 0x2e,
+	0x30, 0x37, 0x20, 0x43, 0x20, 0x36, 0x33, 0x36, 0x2e, 0x39, 0x35, 0x35, 0x20, 0x31, 0x30, 0x38,
+	0x36, 0x2e, 0x38, 0x37, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x36, 0x31, 0x36, 0x20, 0x31, 0x30, 0x38,
+	0x37, 0x2e, 0x35, 0x36, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x38, 0x33, 0x2e,
+	0x32, 0x35, 0x20, 0x43, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x30, 0x36, 0x31,
+	0x2e, 0x38, 0x37, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x31, 0x30, 0x34, 0x39,
+	0x2e, 0x31, 0x34, 0x20, 0x38, 0x32, 0x35, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x37,
+	0x2e, 0x34, 0x38, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c,
+	0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x72, 0x67, 0x62, 0x28, 0x31, 0x37, 0x36, 0x2c, 0x31, 0x36, 0x2c, 0x33, 0x33, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x31, 0x30, 0x35,
+	0x31, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x38, 0x31, 0x34, 0x2e, 0x38, 0x38, 0x33, 0x20, 0x31,
+	0x30, 0x35, 0x30, 0x2e, 0x36, 0x33, 0x20, 0x38, 0x32, 0x37, 0x2e, 0x36, 0x39, 0x36, 0x20, 0x31,
+	0x30, 0x35, 0x30, 0x2e, 0x37, 0x38, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x38, 0x32, 0x33, 0x20, 0x31,
+	0x30, 0x35, 0x30, 0x2e, 0x38, 0x31, 0x20, 0x43, 0x20, 0x38, 0x39, 0x32, 0x2e, 0x37, 0x36, 0x39,
+	0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x33, 0x37, 0x20, 0x39, 0x34, 0x39, 0x2e, 0x39, 0x36, 0x20,
+	0x31, 0x30, 0x36, 0x34, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x37, 0x33, 0x20,
+	0x31, 0x30, 0x38, 0x37, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x31, 0x2e, 0x39,
+	0x38, 0x20, 0x31, 0x30, 0x39, 0x36, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x30, 0x34, 0x30, 0x2e, 0x31,
+	0x35, 0x20, 0x31, 0x31, 0x30, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x36, 0x30, 0x2e, 0x35,
+	0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x35, 0x2e,
+	0x32, 0x31, 0x20, 0x31, 0x31, 0x36, 0x38, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x33, 0x31, 0x35, 0x2e,
+	0x32, 0x37, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x35, 0x36, 0x20, 0x31, 0x34, 0x33, 0x31, 0x2e,
+	0x34, 0x39, 0x20, 0x31, 0x31, 0x32, 0x31, 0x2e, 0x33, 0x31, 0x20, 0x43, 0x20, 0x31, 0x34, 0x33,
+	0x38, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x31, 0x33, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x34, 0x34, 0x34,
+	0x2e, 0x36, 0x35, 0x20, 0x31, 0x31, 0x34, 0x37, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x34, 0x34, 0x39,
+	0x2e, 0x33, 0x33, 0x20, 0x31, 0x31, 0x35, 0x39, 0x2e, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35,
+	0x31, 0x35, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x33, 0x33, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x34,
+	0x34, 0x31, 0x2e, 0x34, 0x35, 0x20, 0x31, 0x35, 0x33, 0x37, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x32,
+	0x36, 0x30, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x36, 0x30, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x34, 0x39, 0x2e, 0x38, 0x33, 0x20, 0x31, 0x36, 0x30, 0x39, 0x2e, 0x39, 0x38, 0x20,
+	0x31, 0x32, 0x33, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x31, 0x36, 0x31, 0x33, 0x20, 0x31, 0x32, 0x32,
+	0x37, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x36, 0x31, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x43, 0x20, 0x31,
+	0x31, 0x36, 0x35, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x39, 0x35, 0x20, 0x31,
+	0x30, 0x38, 0x35, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x36, 0x32, 0x33, 0x2e, 0x39, 0x34, 0x20, 0x31,
+	0x30, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x4c, 0x20,
+	0x39, 0x34, 0x30, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x34, 0x35, 0x20,
+	0x43, 0x20, 0x39, 0x30, 0x30, 0x2e, 0x30, 0x34, 0x36, 0x20, 0x31, 0x36, 0x32, 0x34, 0x2e, 0x36,
+	0x39, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x36, 0x32, 0x35, 0x2e, 0x35, 0x37,
+	0x20, 0x38, 0x33, 0x33, 0x2e, 0x36, 0x37, 0x36, 0x20, 0x31, 0x36, 0x31, 0x37, 0x2e, 0x38, 0x31,
+	0x20, 0x43, 0x20, 0x37, 0x39, 0x34, 0x2e, 0x36, 0x31, 0x32, 0x20, 0x31, 0x36, 0x31, 0x30, 0x2e,
+	0x34, 0x38, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x33, 0x35, 0x33, 0x20, 0x31, 0x35, 0x39, 0x35, 0x2e,
+	0x36, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x39, 0x38, 0x38, 0x20, 0x31, 0x35, 0x37, 0x34, 0x2e, 0x30,
+	0x31, 0x20, 0x43, 0x20, 0x36, 0x35, 0x32, 0x2e, 0x34, 0x35, 0x37, 0x20, 0x31, 0x35, 0x32, 0x37,
+	0x2e, 0x39, 0x37, 0x20, 0x36, 0x30, 0x34, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x35, 0x31, 0x2e,
+	0x37, 0x20, 0x35, 0x38, 0x36, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x31, 0x33, 0x36, 0x39, 0x2e, 0x32,
+	0x39, 0x20, 0x43, 0x20, 0x35, 0x36, 0x35, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x31, 0x32, 0x37, 0x34,
+	0x2e, 0x35, 0x33, 0x20, 0x35, 0x38, 0x33, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x31, 0x31, 0x37, 0x35,
+	0x2e, 0x34, 0x34, 0x20, 0x36, 0x33, 0x36, 0x2e, 0x37, 0x39, 0x34, 0x20, 0x31, 0x30, 0x39, 0x34,
+	0x2e, 0x30, 0x39, 0x20, 0x43, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x31, 0x30,
+	0x38, 0x39, 0x2e, 0x36, 0x35, 0x20, 0x36, 0x36, 0x30, 0x2e, 0x37, 0x38, 0x37, 0x20, 0x31, 0x30,
+	0x38, 0x34, 0x2e, 0x37, 0x35, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x34, 0x33, 0x35, 0x20, 0x31, 0x30,
+	0x38, 0x31, 0x2e, 0x34, 0x37, 0x20, 0x43, 0x20, 0x37, 0x31, 0x38, 0x2e, 0x30, 0x37, 0x39, 0x20,
+	0x31, 0x30, 0x36, 0x35, 0x2e, 0x33, 0x20, 0x37, 0x35, 0x38, 0x2e, 0x32, 0x34, 0x32, 0x20, 0x31,
+	0x30, 0x35, 0x35, 0x2e, 0x31, 0x32, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x31,
+	0x30, 0x35, 0x31, 0x2e, 0x34, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32,
+	0x35, 0x35, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39, 0x31, 0x35, 0x2e, 0x30, 0x30,
+	0x36, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x35, 0x30,
+	0x2e, 0x30, 0x39, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x32, 0x38, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37,
+	0x38, 0x2e, 0x34, 0x39, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x32, 0x37, 0x31, 0x20, 0x31, 0x31, 0x30,
+	0x39, 0x2e, 0x39, 0x34, 0x20, 0x34, 0x39, 0x34, 0x2e, 0x36, 0x36, 0x33, 0x20, 0x31, 0x31, 0x33,
+	0x38, 0x2e, 0x31, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x37, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x33,
+	0x37, 0x2e, 0x39, 0x35, 0x20, 0x36, 0x34, 0x33, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x43, 0x20, 0x31,
+	0x31, 0x33, 0x38, 0x2e, 0x30, 0x32, 0x20, 0x37, 0x30, 0x33, 0x2e, 0x32, 0x32, 0x37, 0x20, 0x31,
+	0x31, 0x33, 0x35, 0x2e, 0x34, 0x33, 0x20, 0x37, 0x36, 0x34, 0x2e, 0x31, 0x35, 0x38, 0x20, 0x31,
+	0x31, 0x36, 0x34, 0x2e, 0x34, 0x32, 0x20, 0x38, 0x31, 0x38, 0x2e, 0x37, 0x35, 0x20, 0x43, 0x20,
+	0x31, 0x31, 0x39, 0x36, 0x2e, 0x34, 0x36, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x37, 0x31, 0x32, 0x20,
+	0x31, 0x32, 0x32, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x39, 0x30, 0x32, 0x2e, 0x33, 0x30, 0x33, 0x20,
+	0x31, 0x32, 0x37, 0x36, 0x2e, 0x37, 0x37, 0x20, 0x39, 0x34, 0x38, 0x2e, 0x39, 0x32, 0x20, 0x43,
+	0x20, 0x31, 0x33, 0x31, 0x34, 0x2e, 0x35, 0x37, 0x20, 0x39, 0x38, 0x35, 0x2e, 0x33, 0x31, 0x35,
+	0x20, 0x31, 0x33, 0x35, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x30, 0x34,
+	0x20, 0x31, 0x33, 0x38, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x31, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x39, 0x34, 0x2e, 0x30, 0x38,
+	0x20, 0x31, 0x31, 0x37, 0x35, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x30, 0x33,
+	0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x30, 0x35, 0x33, 0x2e, 0x39, 0x37,
+	0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x38, 0x32, 0x20, 0x31, 0x30, 0x34, 0x36, 0x2e,
+	0x36, 0x31, 0x20, 0x31, 0x30, 0x35, 0x39, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x33, 0x36, 0x2e,
+	0x30, 0x39, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x30, 0x32, 0x38, 0x2e,
+	0x31, 0x31, 0x20, 0x43, 0x20, 0x39, 0x39, 0x36, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x30, 0x30, 0x36,
+	0x2e, 0x31, 0x36, 0x20, 0x39, 0x34, 0x37, 0x2e, 0x31, 0x34, 0x39, 0x20, 0x39, 0x39, 0x32, 0x2e,
+	0x30, 0x30, 0x39, 0x20, 0x38, 0x39, 0x36, 0x2e, 0x34, 0x32, 0x20, 0x39, 0x38, 0x36, 0x2e, 0x32,
+	0x33, 0x35, 0x20, 0x43, 0x20, 0x38, 0x35, 0x36, 0x2e, 0x30, 0x34, 0x20, 0x39, 0x38, 0x31, 0x2e,
+	0x34, 0x39, 0x31, 0x20, 0x38, 0x31, 0x33, 0x2e, 0x37, 0x39, 0x39, 0x20, 0x39, 0x38, 0x31, 0x2e,
+	0x36, 0x32, 0x39, 0x20, 0x37, 0x37, 0x33, 0x2e, 0x34, 0x35, 0x39, 0x20, 0x39, 0x38, 0x37, 0x2e,
+	0x34, 0x30, 0x36, 0x20, 0x43, 0x20, 0x37, 0x36, 0x35, 0x2e, 0x35, 0x31, 0x32, 0x20, 0x39, 0x38,
+	0x38, 0x2e, 0x35, 0x34, 0x35, 0x20, 0x37, 0x32, 0x38, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x39, 0x39,
+	0x37, 0x2e, 0x33, 0x38, 0x39, 0x20, 0x37, 0x32, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39, 0x39,
+	0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43, 0x20, 0x37, 0x34, 0x31, 0x2e, 0x36, 0x37, 0x32, 0x20,
+	0x39, 0x38, 0x31, 0x2e, 0x38, 0x34, 0x36, 0x20, 0x37, 0x36, 0x33, 0x2e, 0x39, 0x33, 0x36, 0x20,
+	0x39, 0x35, 0x37, 0x2e, 0x30, 0x37, 0x35, 0x20, 0x37, 0x38, 0x31, 0x2e, 0x35, 0x33, 0x32, 0x20,
+	0x39, 0x34, 0x31, 0x2e, 0x33, 0x34, 0x31, 0x20, 0x43, 0x20, 0x38, 0x34, 0x38, 0x2e, 0x31, 0x34,
+	0x20, 0x38, 0x38, 0x31, 0x2e, 0x37, 0x38, 0x32, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x31, 0x35, 0x37,
+	0x20, 0x38, 0x32, 0x39, 0x2e, 0x32, 0x38, 0x38, 0x20, 0x39, 0x31, 0x32, 0x2e, 0x36, 0x38, 0x31,
+	0x20, 0x37, 0x33, 0x35, 0x2e, 0x32, 0x34, 0x35, 0x20, 0x43, 0x20, 0x39, 0x31, 0x36, 0x2e, 0x33,
+	0x32, 0x32, 0x20, 0x37, 0x30, 0x35, 0x2e, 0x35, 0x33, 0x31, 0x20, 0x39, 0x31, 0x34, 0x2e, 0x39,
+	0x36, 0x34, 0x20, 0x36, 0x37, 0x32, 0x2e, 0x36, 0x33, 0x32, 0x20, 0x39, 0x31, 0x34, 0x2e, 0x39,
+	0x36, 0x20, 0x36, 0x34, 0x32, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x4c, 0x20, 0x39, 0x31, 0x35, 0x2e,
+	0x30, 0x30, 0x36, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x2c, 0x30, 0x2c,
+	0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x34, 0x37, 0x37,
+	0x20, 0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x43, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x35,
+	0x34, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x39, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x36,
+	0x32, 0x32, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x31, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x36,
+	0x39, 0x34, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x33, 0x38, 0x33, 0x20, 0x43, 0x20, 0x38, 0x38, 0x39,
+	0x2e, 0x32, 0x36, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x37, 0x36, 0x33, 0x20, 0x39, 0x31, 0x34,
+	0x2e, 0x39, 0x36, 0x38, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x39, 0x33, 0x39,
+	0x2e, 0x34, 0x31, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x32, 0x35, 0x20, 0x43, 0x20, 0x39,
+	0x37, 0x36, 0x2e, 0x33, 0x38, 0x31, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x33, 0x38, 0x20, 0x31,
+	0x30, 0x31, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x32, 0x35, 0x36, 0x20, 0x31,
+	0x30, 0x35, 0x30, 0x2e, 0x33, 0x31, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x4c,
+	0x20, 0x31, 0x31, 0x34, 0x30, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x39, 0x2e, 0x39, 0x39, 0x34,
+	0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x33, 0x2e, 0x39, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x30, 0x34,
+	0x34, 0x20, 0x31, 0x32, 0x32, 0x36, 0x2e, 0x35, 0x36, 0x20, 0x32, 0x37, 0x31, 0x2e, 0x36, 0x30,
+	0x36, 0x20, 0x31, 0x32, 0x32, 0x35, 0x2e, 0x39, 0x31, 0x20, 0x33, 0x32, 0x32, 0x2e, 0x38, 0x35,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x35, 0x2e, 0x36, 0x31, 0x20, 0x33, 0x34, 0x37, 0x2e,
+	0x30, 0x34, 0x32, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33, 0x2e,
+	0x33, 0x30, 0x34, 0x20, 0x31, 0x32, 0x32, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x33, 0x39, 0x37, 0x2e,
+	0x30, 0x33, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x34, 0x20, 0x34, 0x31,
+	0x34, 0x2e, 0x35, 0x37, 0x37, 0x20, 0x31, 0x32, 0x30, 0x35, 0x2e, 0x31, 0x39, 0x20, 0x34, 0x32,
+	0x31, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x31, 0x38, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x34, 0x32, 0x32,
+	0x2e, 0x30, 0x30, 0x38, 0x20, 0x4c, 0x20, 0x39, 0x36, 0x31, 0x2e, 0x39, 0x39, 0x39, 0x20, 0x34,
+	0x32, 0x33, 0x2e, 0x30, 0x31, 0x36, 0x20, 0x4c, 0x20, 0x38, 0x39, 0x34, 0x2e, 0x34, 0x38, 0x32,
+	0x20, 0x34, 0x32, 0x33, 0x2e, 0x31, 0x34, 0x38, 0x20, 0x43, 0x20, 0x38, 0x38, 0x32, 0x2e, 0x36,
+	0x37, 0x33, 0x20, 0x34, 0x32, 0x33, 0x2e, 0x31, 0x37, 0x33, 0x20, 0x38, 0x34, 0x36, 0x2e, 0x38,
+	0x37, 0x34, 0x20, 0x34, 0x32, 0x34, 0x2e, 0x38, 0x37, 0x39, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x39,
+	0x33, 0x39, 0x20, 0x34, 0x31, 0x38, 0x2e, 0x36, 0x37, 0x38, 0x20, 0x43, 0x20, 0x38, 0x32, 0x30,
+	0x2e, 0x38, 0x39, 0x34, 0x20, 0x34, 0x30, 0x35, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x38, 0x32, 0x34,
+	0x2e, 0x39, 0x31, 0x39, 0x20, 0x33, 0x37, 0x33, 0x2e, 0x33, 0x37, 0x39, 0x20, 0x38, 0x32, 0x34,
+	0x2e, 0x39, 0x35, 0x31, 0x20, 0x33, 0x35, 0x33, 0x2e, 0x39, 0x39, 0x38, 0x20, 0x43, 0x20, 0x38,
+	0x32, 0x35, 0x2e, 0x30, 0x31, 0x32, 0x20, 0x33, 0x31, 0x37, 0x2e, 0x32, 0x39, 0x36, 0x20, 0x38,
+	0x31, 0x38, 0x2e, 0x31, 0x32, 0x33, 0x20, 0x32, 0x38, 0x34, 0x2e, 0x35, 0x32, 0x20, 0x38, 0x36,
+	0x34, 0x2e, 0x34, 0x37, 0x37, 0x20, 0x32, 0x38, 0x30, 0x2e, 0x34, 0x30, 0x38, 0x20, 0x7a, 0x22,
+	0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f,
+	0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c,
+	0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x38,
+	0x37, 0x2c, 0x31, 0x33, 0x36, 0x2c, 0x34, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20,
+	0x38, 0x37, 0x39, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33, 0x20,
+	0x4c, 0x20, 0x31, 0x30, 0x38, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36, 0x31,
+	0x20, 0x4c, 0x20, 0x31, 0x31, 0x35, 0x32, 0x2e, 0x34, 0x32, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x36,
+	0x34, 0x31, 0x20, 0x43, 0x20, 0x31, 0x31, 0x36, 0x35, 0x2e, 0x37, 0x36, 0x20, 0x32, 0x38, 0x33,
+	0x2e, 0x36, 0x36, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e,
+	0x31, 0x36, 0x37, 0x20, 0x31, 0x31, 0x39, 0x33, 0x2e, 0x33, 0x34, 0x20, 0x32, 0x38, 0x34, 0x2e,
+	0x33, 0x37, 0x37, 0x20, 0x43, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x36, 0x20, 0x32, 0x38, 0x36,
+	0x2e, 0x30, 0x36, 0x38, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x34, 0x31, 0x20, 0x33, 0x30, 0x34,
+	0x2e, 0x39, 0x33, 0x39, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x30, 0x38, 0x20, 0x33, 0x32, 0x31,
+	0x2e, 0x38, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x37, 0x20, 0x33,
+	0x33, 0x37, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x31, 0x32, 0x32, 0x32, 0x2e, 0x31, 0x35, 0x20, 0x33,
+	0x35, 0x31, 0x2e, 0x39, 0x34, 0x33, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x39, 0x35, 0x20, 0x33,
+	0x36, 0x37, 0x2e, 0x31, 0x32, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x37, 0x37,
+	0x20, 0x33, 0x38, 0x31, 0x2e, 0x32, 0x32, 0x31, 0x20, 0x31, 0x32, 0x32, 0x33, 0x2e, 0x38, 0x35,
+	0x20, 0x33, 0x39, 0x39, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x32, 0x31, 0x33, 0x2e, 0x33, 0x37, 0x20,
+	0x34, 0x31, 0x30, 0x2e, 0x34, 0x33, 0x32, 0x20, 0x43, 0x20, 0x31, 0x32, 0x30, 0x32, 0x2e, 0x39,
+	0x31, 0x20, 0x34, 0x32, 0x31, 0x2e, 0x31, 0x35, 0x33, 0x20, 0x31, 0x31, 0x38, 0x36, 0x2e, 0x32,
+	0x33, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x33, 0x35, 0x35, 0x20, 0x31, 0x31, 0x37, 0x32, 0x2e, 0x35,
+	0x20, 0x34, 0x31, 0x39, 0x2e, 0x31, 0x39, 0x32, 0x20, 0x4c, 0x20, 0x39, 0x35, 0x31, 0x2e, 0x34,
+	0x37, 0x32, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x38, 0x35,
+	0x2e, 0x37, 0x38, 0x33, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x32, 0x37, 0x20, 0x43, 0x20, 0x38, 0x36,
+	0x31, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x34, 0x31, 0x39, 0x2e, 0x33, 0x34, 0x35, 0x20, 0x38, 0x32,
+	0x38, 0x2e, 0x33, 0x30, 0x36, 0x20, 0x34, 0x32, 0x36, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x38, 0x32,
+	0x38, 0x2e, 0x38, 0x31, 0x36, 0x20, 0x33, 0x39, 0x30, 0x2e, 0x31, 0x35, 0x20, 0x43, 0x20, 0x38,
+	0x32, 0x39, 0x2e, 0x32, 0x30, 0x34, 0x20, 0x33, 0x36, 0x32, 0x2e, 0x38, 0x37, 0x20, 0x38, 0x32,
+	0x36, 0x2e, 0x37, 0x39, 0x33, 0x20, 0x33, 0x33, 0x33, 0x2e, 0x30, 0x31, 0x34, 0x20, 0x38, 0x33,
+	0x30, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x33, 0x30, 0x36, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x43, 0x20,
+	0x38, 0x33, 0x32, 0x2e, 0x38, 0x34, 0x38, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x39, 0x36, 0x35, 0x20,
+	0x38, 0x36, 0x33, 0x2e, 0x30, 0x35, 0x34, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x35, 0x35, 0x37, 0x20,
+	0x38, 0x37, 0x39, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x32, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x33, 0x20,
+	0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28,
+	0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28,
+	0x31, 0x2c, 0x30, 0x2c, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x31, 0x32,
+	0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39, 0x20, 0x43, 0x20, 0x37,
+	0x31, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x37, 0x32,
+	0x30, 0x2e, 0x34, 0x36, 0x35, 0x20, 0x39, 0x39, 0x31, 0x2e, 0x39, 0x34, 0x32, 0x20, 0x37, 0x32,
+	0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39, 0x39, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43, 0x20,
+	0x37, 0x32, 0x33, 0x2e, 0x33, 0x34, 0x38, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x36, 0x36, 0x20,
+	0x37, 0x31, 0x37, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x31, 0x30, 0x30, 0x33, 0x2e, 0x32, 0x35, 0x20,
+	0x37, 0x31, 0x32, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x36, 0x39, 0x20,
+	0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e,
+	0x0a
+};
+
+static const unsigned char icon_client_red_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x84, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x92, 0xbd,
+	0x4e, 0xc2, 0x60, 0x18, 0x85, 0x4f, 0x8b, 0xd2, 0x96, 0x40, 0x2a, 0x44, 0x03, 0x58, 0xb0, 0xc4,
+	0x28, 0x83, 0x33, 0x8b, 0xce, 0x72, 0x0b, 0xdc, 0x00, 0x89, 0x84, 0x41, 0x63, 0x62, 0x48, 0x1c,
+	0x8c, 0x89, 0xba, 0x68, 0x74, 0x31, 0x51, 0x23, 0xe0, 0x0d, 0xe8, 0x35, 0xc0, 0x66, 0xe2, 0xe4,
+	0xe8, 0x40, 0xe2, 0x20, 0x94, 0xf2, 0x27, 0xa1, 0x10, 0x11, 0x0a, 0x96, 0xd6, 0xa9, 0x15, 0x10,
+	0x3a, 0xea, 0x99, 0xde, 0x7c, 0xef, 0xf9, 0xce, 0xfb, 0x7c, 0x3f, 0xc0, 0x7f, 0x8b, 0x98, 0xb0,
+	0x36, 0x1b, 0x64, 0x98, 0x9d, 0xb0, 0x8b, 0x8d, 0xfb, 0x29, 0xda, 0x47, 0x00, 0x28, 0xf4, 0xe4,
+	0x62, 0xa6, 0xd1, 0x4a, 0xe6, 0xba, 0xdd, 0x4b, 0x00, 0x7d, 0xb3, 0x00, 0x6f, 0xd4, 0xeb, 0x7e,
+	0x4a, 0xf8, 0x39, 0xde, 0x61, 0xb1, 0x8c, 0x34, 0xda, 0x83, 0x01, 0x2e, 0x84, 0x52, 0x3e, 0x5d,
+	0xae, 0x6c, 0x00, 0x28, 0x4d, 0x0a, 0xb0, 0x46, 0xbd, 0xee, 0xdc, 0x71, 0x60, 0x29, 0x60, 0x86,
+	0x7c, 0xf4, 0x26, 0x08, 0xa9, 0x72, 0x65, 0x45, 0x27, 0x31, 0xc6, 0x04, 0x19, 0x66, 0xf7, 0x6a,
+	0x75, 0x39, 0x42, 0x91, 0xa4, 0xd9, 0x7e, 0x84, 0x1c, 0x76, 0x36, 0xd3, 0x94, 0xba, 0xf5, 0x2f,
+	0xe5, 0x11, 0x00, 0x0c, 0x77, 0xd8, 0xc5, 0xc6, 0x75, 0xec, 0x54, 0xb5, 0x86, 0x7d, 0xa1, 0x68,
+	0x6c, 0x3a, 0x28, 0x88, 0xb8, 0xa9, 0xd6, 0x00, 0x00, 0x76, 0x8b, 0x05, 0xe1, 0x39, 0x67, 0x4c,
+	0xef, 0xcd, 0xe8, 0x05, 0x4f, 0xd1, 0x3e, 0xbd, 0x6e, 0x29, 0x2a, 0x24, 0x45, 0x35, 0x02, 0x24,
+	0x55, 0x01, 0xa3, 0xfc, 0x90, 0xf1, 0x34, 0xcd, 0xfd, 0x0a, 0x20, 0x86, 0x6e, 0x23, 0xc1, 0x79,
+	0x46, 0xb0, 0xaf, 0x03, 0xfc, 0xd4, 0x23, 0x19, 0xb1, 0x79, 0xb9, 0x27, 0x4e, 0x75, 0x8d, 0xa9,
+	0x20, 0xcb, 0x86, 0xd7, 0x20, 0xc8, 0x36, 0x9b, 0xc9, 0x6d, 0xce, 0x7b, 0x46, 0x93, 0x24, 0x1e,
+	0xde, 0xeb, 0x50, 0xb5, 0xb1, 0x49, 0x04, 0x10, 0x59, 0x98, 0x47, 0x5f, 0xd3, 0x90, 0x95, 0x5a,
+	0x77, 0x06, 0xf9, 0x90, 0xc7, 0x1a, 0x5b, 0xf4, 0xbc, 0x1e, 0xf2, 0x7e, 0xbf, 0xd9, 0xf4, 0x93,
+	0x7c, 0x51, 0xbc, 0x2d, 0x95, 0x57, 0x00, 0xc8, 0xc0, 0xd0, 0x33, 0x02, 0x18, 0x3c, 0x7f, 0xb4,
+	0xef, 0x3b, 0xaa, 0x1a, 0x09, 0x39, 0x1c, 0xac, 0x95, 0x1c, 0xfd, 0x63, 0x9f, 0x03, 0x15, 0xa7,
+	0x82, 0x20, 0x26, 0x4b, 0x95, 0x75, 0x00, 0x8d, 0x49, 0x04, 0xba, 0xa8, 0x35, 0x9b, 0x6d, 0x6f,
+	0xd3, 0xc9, 0x6e, 0xf1, 0x0c, 0xcd, 0x11, 0x9a, 0x46, 0xe4, 0xe5, 0xbe, 0x98, 0x91, 0x9a, 0xe9,
+	0x97, 0x4e, 0xe7, 0x1c, 0x40, 0xcf, 0x8c, 0xf0, 0xef, 0xf5, 0x0d, 0x78, 0x45, 0x83, 0x48, 0x85,
+	0x8f, 0x6b, 0xeb, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_red_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x30, 0x2c, 0x30, 0x2c,
+	0x30, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x38, 0x34,
+	0x20, 0x32, 0x35, 0x38, 0x2e, 0x36, 0x32, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x32, 0x39, 0x2e,
+	0x36, 0x31, 0x20, 0x32, 0x34, 0x37, 0x2e, 0x36, 0x32, 0x31, 0x20, 0x31, 0x37, 0x38, 0x32, 0x2e,
+	0x30, 0x35, 0x20, 0x35, 0x38, 0x32, 0x2e, 0x32, 0x35, 0x39, 0x20, 0x31, 0x37, 0x39, 0x33, 0x2e,
+	0x30, 0x31, 0x20, 0x31, 0x30, 0x30, 0x36, 0x2e, 0x30, 0x33, 0x20, 0x43, 0x20, 0x31, 0x38, 0x30,
+	0x33, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x34, 0x32, 0x39, 0x2e, 0x38, 0x20, 0x31, 0x34, 0x36, 0x39,
+	0x2e, 0x32, 0x39, 0x20, 0x31, 0x37, 0x38, 0x32, 0x2e, 0x32, 0x20, 0x31, 0x30, 0x34, 0x35, 0x2e,
+	0x35, 0x32, 0x20, 0x31, 0x37, 0x39, 0x33, 0x2e, 0x31, 0x31, 0x20, 0x43, 0x20, 0x36, 0x32, 0x31,
+	0x2e, 0x38, 0x31, 0x33, 0x20, 0x31, 0x38, 0x30, 0x34, 0x2e, 0x30, 0x32, 0x20, 0x32, 0x36, 0x39,
+	0x2e, 0x34, 0x37, 0x34, 0x20, 0x31, 0x34, 0x36, 0x39, 0x2e, 0x34, 0x31, 0x20, 0x32, 0x35, 0x38,
+	0x2e, 0x35, 0x31, 0x39, 0x20, 0x31, 0x30, 0x34, 0x35, 0x2e, 0x37, 0x20, 0x43, 0x20, 0x32, 0x34,
+	0x37, 0x2e, 0x35, 0x36, 0x34, 0x20, 0x36, 0x32, 0x31, 0x2e, 0x39, 0x39, 0x38, 0x20, 0x35, 0x38,
+	0x32, 0x2e, 0x31, 0x34, 0x20, 0x32, 0x36, 0x39, 0x2e, 0x36, 0x32, 0x34, 0x20, 0x31, 0x30, 0x30,
+	0x35, 0x2e, 0x38, 0x34, 0x20, 0x32, 0x35, 0x38, 0x2e, 0x36, 0x32, 0x33, 0x20, 0x7a, 0x22, 0x2f,
+	0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72,
+	0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30,
+	0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x32, 0x39,
+	0x2c, 0x35, 0x37, 0x2c, 0x35, 0x33, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30,
+	0x31, 0x31, 0x2e, 0x38, 0x31, 0x20, 0x33, 0x30, 0x33, 0x2e, 0x34, 0x33, 0x31, 0x20, 0x43, 0x20,
+	0x31, 0x34, 0x31, 0x31, 0x20, 0x32, 0x39, 0x35, 0x2e, 0x38, 0x38, 0x35, 0x20, 0x31, 0x37, 0x34,
+	0x30, 0x2e, 0x36, 0x37, 0x20, 0x36, 0x31, 0x33, 0x2e, 0x34, 0x36, 0x31, 0x20, 0x31, 0x37, 0x34,
+	0x38, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x30, 0x31, 0x32, 0x2e, 0x36, 0x35, 0x20, 0x43, 0x20, 0x31,
+	0x37, 0x35, 0x35, 0x2e, 0x34, 0x33, 0x20, 0x31, 0x34, 0x31, 0x31, 0x2e, 0x38, 0x34, 0x20, 0x31,
+	0x34, 0x33, 0x37, 0x2e, 0x37, 0x31, 0x20, 0x31, 0x37, 0x34, 0x31, 0x2e, 0x33, 0x38, 0x20, 0x31,
+	0x30, 0x33, 0x38, 0x2e, 0x35, 0x32, 0x20, 0x31, 0x37, 0x34, 0x38, 0x2e, 0x35, 0x39, 0x20, 0x43,
+	0x20, 0x36, 0x33, 0x39, 0x2e, 0x35, 0x36, 0x39, 0x20, 0x31, 0x37, 0x35, 0x35, 0x2e, 0x37, 0x39,
+	0x20, 0x33, 0x31, 0x30, 0x2e, 0x32, 0x36, 0x37, 0x20, 0x31, 0x34, 0x33, 0x38, 0x2e, 0x33, 0x31,
+	0x20, 0x33, 0x30, 0x32, 0x2e, 0x38, 0x39, 0x34, 0x20, 0x31, 0x30, 0x33, 0x39, 0x2e, 0x33, 0x36,
+	0x20, 0x43, 0x20, 0x32, 0x39, 0x35, 0x2e, 0x35, 0x32, 0x31, 0x20, 0x36, 0x34, 0x30, 0x2e, 0x34,
+	0x30, 0x38, 0x20, 0x36, 0x31, 0x32, 0x2e, 0x38, 0x36, 0x37, 0x20, 0x33, 0x31, 0x30, 0x2e, 0x39,
+	0x37, 0x32, 0x20, 0x31, 0x30, 0x31, 0x31, 0x2e, 0x38, 0x31, 0x20, 0x33, 0x30, 0x33, 0x2e, 0x34,
+	0x33, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61,
+	0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72,
+	0x67, 0x62, 0x28, 0x30, 0x2c, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20,
+	0x36, 0x35, 0x34, 0x2e, 0x34, 0x34, 0x32, 0x20, 0x31, 0x32, 0x39, 0x37, 0x2e, 0x34, 0x35, 0x20,
+	0x4c, 0x20, 0x31, 0x31, 0x34, 0x35, 0x2e, 0x37, 0x35, 0x20, 0x31, 0x32, 0x39, 0x37, 0x2e, 0x31,
+	0x37, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x31, 0x36, 0x2e, 0x34, 0x37, 0x20, 0x31, 0x32, 0x39, 0x37,
+	0x2e, 0x31, 0x37, 0x20, 0x43, 0x20, 0x31, 0x33, 0x34, 0x34, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x32,
+	0x39, 0x37, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x33, 0x37, 0x32, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x32,
+	0x39, 0x37, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x33, 0x39, 0x39, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x32,
+	0x39, 0x37, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x34, 0x31, 0x31, 0x2e, 0x35, 0x38, 0x20,
+	0x31, 0x32, 0x39, 0x37, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x34, 0x32, 0x31, 0x2e, 0x35, 0x33, 0x20,
+	0x31, 0x33, 0x30, 0x36, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x32, 0x32, 0x2e, 0x36, 0x38, 0x20,
+	0x31, 0x33, 0x31, 0x38, 0x2e, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x32, 0x33, 0x2e, 0x32, 0x38,
+	0x20, 0x31, 0x33, 0x32, 0x34, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x34, 0x32, 0x31, 0x2e, 0x32, 0x37,
+	0x20, 0x31, 0x33, 0x33, 0x31, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x34, 0x31, 0x37, 0x2e, 0x31, 0x33,
+	0x20, 0x31, 0x33, 0x33, 0x35, 0x2e, 0x38, 0x38, 0x20, 0x43, 0x20, 0x31, 0x34, 0x31, 0x31, 0x2e,
+	0x39, 0x34, 0x20, 0x31, 0x33, 0x34, 0x32, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x34, 0x30, 0x36, 0x2e,
+	0x37, 0x37, 0x20, 0x31, 0x33, 0x34, 0x33, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x33, 0x39, 0x39, 0x2e,
+	0x31, 0x32, 0x20, 0x31, 0x33, 0x34, 0x34, 0x2e, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x39, 0x37,
+	0x2e, 0x35, 0x34, 0x31, 0x20, 0x31, 0x33, 0x34, 0x34, 0x2e, 0x31, 0x37, 0x20, 0x4c, 0x20, 0x37,
+	0x33, 0x35, 0x2e, 0x32, 0x31, 0x37, 0x20, 0x31, 0x33, 0x34, 0x34, 0x2e, 0x32, 0x31, 0x20, 0x43,
+	0x20, 0x37, 0x30, 0x37, 0x2e, 0x32, 0x39, 0x38, 0x20, 0x31, 0x33, 0x34, 0x34, 0x2e, 0x32, 0x20,
+	0x36, 0x37, 0x39, 0x2e, 0x33, 0x37, 0x31, 0x20, 0x31, 0x33, 0x34, 0x34, 0x2e, 0x33, 0x31, 0x20,
+	0x36, 0x35, 0x31, 0x2e, 0x34, 0x36, 0x31, 0x20, 0x31, 0x33, 0x34, 0x33, 0x2e, 0x38, 0x36, 0x20,
+	0x43, 0x20, 0x36, 0x34, 0x30, 0x2e, 0x30, 0x37, 0x38, 0x20, 0x31, 0x33, 0x34, 0x33, 0x2e, 0x36,
+	0x38, 0x20, 0x36, 0x32, 0x39, 0x2e, 0x36, 0x39, 0x31, 0x20, 0x31, 0x33, 0x33, 0x34, 0x2e, 0x35,
+	0x32, 0x20, 0x36, 0x32, 0x38, 0x2e, 0x32, 0x30, 0x38, 0x20, 0x31, 0x33, 0x32, 0x33, 0x2e, 0x32,
+	0x39, 0x20, 0x43, 0x20, 0x36, 0x32, 0x37, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x31, 0x33, 0x31, 0x37,
+	0x2e, 0x32, 0x33, 0x20, 0x36, 0x32, 0x39, 0x2e, 0x32, 0x31, 0x38, 0x20, 0x31, 0x33, 0x31, 0x31,
+	0x2e, 0x31, 0x32, 0x20, 0x36, 0x33, 0x33, 0x2e, 0x31, 0x36, 0x39, 0x20, 0x31, 0x33, 0x30, 0x36,
+	0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x36, 0x33, 0x39, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x32,
+	0x39, 0x38, 0x2e, 0x39, 0x33, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x34, 0x39, 0x39, 0x20, 0x31, 0x32,
+	0x39, 0x38, 0x2e, 0x31, 0x33, 0x20, 0x36, 0x35, 0x34, 0x2e, 0x34, 0x34, 0x32, 0x20, 0x31, 0x32,
+	0x39, 0x37, 0x2e, 0x34, 0x35, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x30, 0x2c, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x20, 0x31, 0x32, 0x36, 0x33, 0x2e, 0x34, 0x20, 0x37, 0x39, 0x34, 0x2e, 0x34, 0x30,
+	0x33, 0x20, 0x43, 0x20, 0x31, 0x33, 0x32, 0x32, 0x2e, 0x35, 0x32, 0x20, 0x37, 0x38, 0x39, 0x2e,
+	0x39, 0x34, 0x36, 0x20, 0x31, 0x33, 0x37, 0x34, 0x2e, 0x31, 0x31, 0x20, 0x38, 0x33, 0x34, 0x2e,
+	0x31, 0x31, 0x33, 0x20, 0x31, 0x33, 0x37, 0x38, 0x2e, 0x38, 0x33, 0x20, 0x38, 0x39, 0x33, 0x2e,
+	0x32, 0x30, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x38, 0x33, 0x2e, 0x35, 0x34, 0x20, 0x39, 0x35,
+	0x32, 0x2e, 0x33, 0x30, 0x33, 0x20, 0x31, 0x33, 0x33, 0x39, 0x2e, 0x36, 0x20, 0x31, 0x30, 0x30,
+	0x34, 0x2e, 0x30, 0x39, 0x20, 0x31, 0x32, 0x38, 0x30, 0x2e, 0x35, 0x32, 0x20, 0x31, 0x30, 0x30,
+	0x39, 0x2e, 0x30, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32, 0x32, 0x31, 0x2e, 0x30, 0x39, 0x20, 0x31,
+	0x30, 0x31, 0x34, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x31, 0x36, 0x38, 0x2e, 0x39, 0x31, 0x20, 0x39,
+	0x36, 0x39, 0x2e, 0x37, 0x38, 0x38, 0x20, 0x31, 0x31, 0x36, 0x34, 0x2e, 0x31, 0x37, 0x20, 0x39,
+	0x31, 0x30, 0x2e, 0x33, 0x33, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x39, 0x2e, 0x34, 0x32, 0x20,
+	0x38, 0x35, 0x30, 0x2e, 0x38, 0x37, 0x31, 0x20, 0x31, 0x32, 0x30, 0x33, 0x2e, 0x39, 0x32, 0x20,
+	0x37, 0x39, 0x38, 0x2e, 0x38, 0x38, 0x37, 0x20, 0x31, 0x32, 0x36, 0x33, 0x2e, 0x34, 0x20, 0x37,
+	0x39, 0x34, 0x2e, 0x34, 0x30, 0x33, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x38, 0x2c, 0x32, 0x39, 0x2c, 0x32, 0x38, 0x29,
+	0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x32, 0x36, 0x35, 0x2e, 0x30, 0x36, 0x20, 0x38,
+	0x33, 0x38, 0x2e, 0x32, 0x31, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x30, 0x2e, 0x30, 0x38,
+	0x20, 0x38, 0x33, 0x34, 0x2e, 0x31, 0x36, 0x20, 0x31, 0x33, 0x33, 0x31, 0x2e, 0x37, 0x39, 0x20,
+	0x38, 0x35, 0x39, 0x2e, 0x31, 0x35, 0x39, 0x20, 0x31, 0x33, 0x33, 0x36, 0x2e, 0x30, 0x33, 0x20,
+	0x38, 0x39, 0x34, 0x2e, 0x31, 0x35, 0x35, 0x20, 0x43, 0x20, 0x31, 0x33, 0x34, 0x30, 0x2e, 0x32,
+	0x36, 0x20, 0x39, 0x32, 0x39, 0x2e, 0x31, 0x35, 0x31, 0x20, 0x31, 0x33, 0x31, 0x35, 0x2e, 0x34,
+	0x32, 0x20, 0x39, 0x36, 0x30, 0x2e, 0x39, 0x38, 0x39, 0x20, 0x31, 0x32, 0x38, 0x30, 0x2e, 0x34,
+	0x34, 0x20, 0x39, 0x36, 0x35, 0x2e, 0x33, 0x39, 0x36, 0x20, 0x43, 0x20, 0x31, 0x32, 0x34, 0x35,
+	0x2e, 0x32, 0x32, 0x20, 0x39, 0x36, 0x39, 0x2e, 0x38, 0x33, 0x33, 0x20, 0x31, 0x32, 0x31, 0x33,
+	0x2e, 0x31, 0x31, 0x20, 0x39, 0x34, 0x34, 0x2e, 0x37, 0x37, 0x39, 0x20, 0x31, 0x32, 0x30, 0x38,
+	0x2e, 0x38, 0x35, 0x20, 0x39, 0x30, 0x39, 0x2e, 0x35, 0x33, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32,
+	0x30, 0x34, 0x2e, 0x35, 0x38, 0x20, 0x38, 0x37, 0x34, 0x2e, 0x32, 0x39, 0x32, 0x20, 0x31, 0x32,
+	0x32, 0x39, 0x2e, 0x38, 0x20, 0x38, 0x34, 0x32, 0x2e, 0x33, 0x30, 0x35, 0x20, 0x31, 0x32, 0x36,
+	0x35, 0x2e, 0x30, 0x36, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x32, 0x31, 0x38, 0x20, 0x7a, 0x22, 0x2f,
+	0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72,
+	0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30,
+	0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x30, 0x2c, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x37, 0x32, 0x2e, 0x38, 0x33,
+	0x34, 0x20, 0x37, 0x39, 0x34, 0x2e, 0x33, 0x36, 0x32, 0x20, 0x43, 0x20, 0x38, 0x33, 0x32, 0x2e,
+	0x31, 0x36, 0x34, 0x20, 0x37, 0x39, 0x30, 0x2e, 0x35, 0x31, 0x34, 0x20, 0x38, 0x38, 0x33, 0x2e,
+	0x33, 0x36, 0x34, 0x20, 0x38, 0x33, 0x35, 0x2e, 0x35, 0x32, 0x35, 0x20, 0x38, 0x38, 0x37, 0x2e,
+	0x31, 0x34, 0x39, 0x20, 0x38, 0x39, 0x34, 0x2e, 0x38, 0x35, 0x39, 0x20, 0x43, 0x20, 0x38, 0x39,
+	0x30, 0x2e, 0x39, 0x33, 0x35, 0x20, 0x39, 0x35, 0x34, 0x2e, 0x31, 0x39, 0x33, 0x20, 0x38, 0x34,
+	0x35, 0x2e, 0x38, 0x37, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x33, 0x35, 0x20, 0x37, 0x38, 0x36,
+	0x2e, 0x35, 0x33, 0x32, 0x20, 0x31, 0x30, 0x30, 0x39, 0x2e, 0x30, 0x37, 0x20, 0x43, 0x20, 0x37,
+	0x32, 0x37, 0x2e, 0x32, 0x38, 0x33, 0x20, 0x31, 0x30, 0x31, 0x32, 0x2e, 0x37, 0x39, 0x20, 0x36,
+	0x37, 0x36, 0x2e, 0x32, 0x32, 0x33, 0x20, 0x39, 0x36, 0x37, 0x2e, 0x38, 0x30, 0x32, 0x20, 0x36,
+	0x37, 0x32, 0x2e, 0x34, 0x34, 0x33, 0x20, 0x39, 0x30, 0x38, 0x2e, 0x35, 0x35, 0x37, 0x20, 0x43,
+	0x20, 0x36, 0x36, 0x38, 0x2e, 0x36, 0x36, 0x33, 0x20, 0x38, 0x34, 0x39, 0x2e, 0x33, 0x31, 0x32,
+	0x20, 0x37, 0x31, 0x33, 0x2e, 0x35, 0x39, 0x32, 0x20, 0x37, 0x39, 0x38, 0x2e, 0x32, 0x30, 0x34,
+	0x20, 0x37, 0x37, 0x32, 0x2e, 0x38, 0x33, 0x34, 0x20, 0x37, 0x39, 0x34, 0x2e, 0x33, 0x36, 0x32,
+	0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65,
+	0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62,
+	0x28, 0x33, 0x38, 0x2c, 0x32, 0x39, 0x2c, 0x32, 0x38, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x20, 0x37, 0x37, 0x32, 0x2e, 0x33, 0x39, 0x31, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x37, 0x30, 0x37,
+	0x20, 0x43, 0x20, 0x38, 0x30, 0x37, 0x2e, 0x31, 0x35, 0x39, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x35,
+	0x33, 0x31, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x37, 0x38, 0x33, 0x20, 0x38, 0x35, 0x39, 0x2e, 0x31,
+	0x38, 0x38, 0x20, 0x38, 0x34, 0x33, 0x2e, 0x32, 0x31, 0x32, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x39,
+	0x32, 0x34, 0x20, 0x43, 0x20, 0x38, 0x34, 0x37, 0x2e, 0x36, 0x34, 0x31, 0x20, 0x39, 0x32, 0x38,
+	0x2e, 0x36, 0x36, 0x20, 0x38, 0x32, 0x33, 0x2e, 0x32, 0x31, 0x35, 0x20, 0x39, 0x36, 0x30, 0x2e,
+	0x34, 0x36, 0x33, 0x20, 0x37, 0x38, 0x38, 0x2e, 0x35, 0x31, 0x32, 0x20, 0x39, 0x36, 0x35, 0x2e,
+	0x31, 0x34, 0x34, 0x20, 0x43, 0x20, 0x37, 0x35, 0x33, 0x2e, 0x34, 0x35, 0x20, 0x39, 0x36, 0x39,
+	0x2e, 0x38, 0x37, 0x33, 0x20, 0x37, 0x32, 0x31, 0x2e, 0x32, 0x34, 0x37, 0x20, 0x39, 0x34, 0x35,
+	0x2e, 0x31, 0x34, 0x20, 0x37, 0x31, 0x36, 0x2e, 0x37, 0x37, 0x32, 0x20, 0x39, 0x31, 0x30, 0x2e,
+	0x30, 0x34, 0x35, 0x20, 0x43, 0x20, 0x37, 0x31, 0x32, 0x2e, 0x32, 0x39, 0x38, 0x20, 0x38, 0x37,
+	0x34, 0x2e, 0x39, 0x35, 0x20, 0x37, 0x33, 0x37, 0x2e, 0x32, 0x36, 0x35, 0x20, 0x38, 0x34, 0x32,
+	0x2e, 0x39, 0x32, 0x37, 0x20, 0x37, 0x37, 0x32, 0x2e, 0x33, 0x39, 0x31, 0x20, 0x38, 0x33, 0x38,
+	0x2e, 0x37, 0x30, 0x37, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e,
+};
+
+static const unsigned char icon_client_secident_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x8f, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0x63, 0x60, 0x18,
+	0x05, 0xa3, 0x60, 0xd0, 0x82, 0x27, 0x66, 0x66, 0xc2, 0xcf, 0x2c, 0xcd, 0xa2, 0x88, 0x51, 0xcb,
+	0x82, 0x4d, 0x33, 0x23, 0xd3, 0xff, 0xbd, 0xff, 0x18, 0x18, 0x7e, 0x31, 0x30, 0x30, 0x2c, 0x23,
+	0x64, 0x00, 0xd3, 0x53, 0x2b, 0xd3, 0xc4, 0xa7, 0xe6, 0x26, 0xae, 0x70, 0xcd, 0xcc, 0xff, 0xf7,
+	0x30, 0x30, 0x30, 0x30, 0x30, 0xfd, 0xfa, 0xe7, 0x45, 0x8c, 0x0b, 0x98, 0x18, 0xfe, 0xfd, 0x97,
+	0x63, 0x60, 0x62, 0xdc, 0xfc, 0xcc, 0xd2, 0x2c, 0x8a, 0x91, 0xf9, 0xff, 0x6e, 0x46, 0x06, 0x06,
+	0x66, 0xc6, 0xdf, 0xff, 0x5c, 0xa4, 0xce, 0x9e, 0x7d, 0x43, 0x8c, 0x01, 0x8c, 0x0c, 0x0c, 0x0c,
+	0x0c, 0x4f, 0xad, 0x4c, 0x3a, 0x19, 0xfe, 0x33, 0x96, 0x31, 0x30, 0x30, 0x5c, 0x65, 0x66, 0x64,
+	0x75, 0x92, 0x38, 0x76, 0xec, 0x15, 0x31, 0x9a, 0x51, 0xc0, 0x53, 0x0b, 0xd3, 0xf0, 0x17, 0x56,
+	0x56, 0x62, 0xa4, 0xea, 0x03, 0x00, 0x1d, 0x2c, 0x26, 0xc7, 0x31, 0x05, 0xca, 0x12, 0x00, 0x00,
+	0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_secident_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x31, 0x30, 0x32, 0x2e, 0x39, 0x39,
+	0x2c, 0x31, 0x31, 0x31, 0x34, 0x2e, 0x37, 0x39, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28,
+	0x30, 0x2e, 0x35, 0x34, 0x31, 0x34, 0x29, 0x22, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x32, 0x39, 0x2c, 0x35, 0x37, 0x2c, 0x35, 0x33, 0x29, 0x22,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x36, 0x38, 0x33, 0x2e, 0x31, 0x32, 0x20, 0x34, 0x32,
+	0x33, 0x2e, 0x34, 0x30, 0x35, 0x20, 0x43, 0x20, 0x31, 0x37, 0x36, 0x36, 0x2e, 0x34, 0x39, 0x20,
+	0x34, 0x31, 0x34, 0x2e, 0x37, 0x30, 0x33, 0x20, 0x31, 0x38, 0x34, 0x34, 0x2e, 0x31, 0x38, 0x20,
+	0x34, 0x38, 0x35, 0x2e, 0x36, 0x37, 0x38, 0x20, 0x31, 0x38, 0x34, 0x34, 0x2e, 0x39, 0x39, 0x20,
+	0x35, 0x36, 0x39, 0x2e, 0x34, 0x36, 0x34, 0x20, 0x43, 0x20, 0x31, 0x38, 0x34, 0x35, 0x2e, 0x33,
+	0x36, 0x20, 0x36, 0x30, 0x32, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x38, 0x33, 0x34, 0x2e, 0x37, 0x39,
+	0x20, 0x36, 0x33, 0x35, 0x2e, 0x32, 0x37, 0x38, 0x20, 0x31, 0x38, 0x31, 0x34, 0x2e, 0x39, 0x31,
+	0x20, 0x36, 0x36, 0x32, 0x2e, 0x30, 0x30, 0x31, 0x20, 0x43, 0x20, 0x31, 0x38, 0x30, 0x30, 0x2e,
+	0x38, 0x20, 0x36, 0x38, 0x30, 0x2e, 0x37, 0x30, 0x32, 0x20, 0x31, 0x37, 0x37, 0x38, 0x2e, 0x38,
+	0x34, 0x20, 0x36, 0x39, 0x39, 0x2e, 0x39, 0x37, 0x32, 0x20, 0x31, 0x37, 0x36, 0x31, 0x2e, 0x39,
+	0x39, 0x20, 0x37, 0x31, 0x36, 0x2e, 0x37, 0x39, 0x37, 0x20, 0x43, 0x20, 0x31, 0x37, 0x34, 0x32,
+	0x2e, 0x38, 0x35, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x39, 0x32, 0x36, 0x20, 0x31, 0x37, 0x32, 0x33,
+	0x2e, 0x38, 0x37, 0x20, 0x37, 0x35, 0x35, 0x2e, 0x32, 0x35, 0x33, 0x20, 0x31, 0x37, 0x30, 0x34,
+	0x2e, 0x36, 0x38, 0x20, 0x37, 0x37, 0x34, 0x2e, 0x33, 0x31, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x35,
+	0x30, 0x35, 0x2e, 0x30, 0x34, 0x20, 0x39, 0x37, 0x34, 0x2e, 0x34, 0x34, 0x37, 0x20, 0x4c, 0x20,
+	0x39, 0x33, 0x37, 0x2e, 0x36, 0x34, 0x38, 0x20, 0x31, 0x35, 0x35, 0x30, 0x2e, 0x39, 0x34, 0x20,
+	0x43, 0x20, 0x38, 0x38, 0x35, 0x2e, 0x38, 0x32, 0x31, 0x20, 0x31, 0x36, 0x30, 0x33, 0x2e, 0x34,
+	0x31, 0x20, 0x38, 0x30, 0x31, 0x2e, 0x36, 0x35, 0x39, 0x20, 0x31, 0x36, 0x31, 0x34, 0x2e, 0x33,
+	0x32, 0x20, 0x37, 0x34, 0x30, 0x2e, 0x31, 0x31, 0x37, 0x20, 0x31, 0x35, 0x37, 0x32, 0x2e, 0x33,
+	0x35, 0x20, 0x43, 0x20, 0x37, 0x33, 0x34, 0x2e, 0x35, 0x31, 0x35, 0x20, 0x31, 0x35, 0x36, 0x38,
+	0x2e, 0x35, 0x33, 0x20, 0x37, 0x32, 0x35, 0x2e, 0x30, 0x34, 0x33, 0x20, 0x31, 0x35, 0x36, 0x31,
+	0x2e, 0x34, 0x37, 0x20, 0x37, 0x32, 0x30, 0x2e, 0x37, 0x39, 0x39, 0x20, 0x31, 0x35, 0x35, 0x36,
+	0x2e, 0x32, 0x31, 0x20, 0x43, 0x20, 0x36, 0x39, 0x38, 0x2e, 0x33, 0x34, 0x37, 0x20, 0x31, 0x35,
+	0x32, 0x38, 0x2e, 0x34, 0x32, 0x20, 0x36, 0x37, 0x32, 0x2e, 0x36, 0x37, 0x34, 0x20, 0x31, 0x35,
+	0x30, 0x34, 0x2e, 0x32, 0x31, 0x20, 0x36, 0x34, 0x37, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x31, 0x34,
+	0x37, 0x39, 0x2e, 0x30, 0x31, 0x20, 0x4c, 0x20, 0x34, 0x30, 0x30, 0x2e, 0x33, 0x37, 0x20, 0x31,
+	0x32, 0x33, 0x34, 0x2e, 0x38, 0x38, 0x20, 0x43, 0x20, 0x33, 0x36, 0x33, 0x2e, 0x35, 0x39, 0x38,
+	0x20, 0x31, 0x31, 0x39, 0x37, 0x2e, 0x32, 0x38, 0x20, 0x33, 0x32, 0x33, 0x2e, 0x37, 0x32, 0x33,
+	0x20, 0x31, 0x31, 0x36, 0x31, 0x2e, 0x38, 0x20, 0x32, 0x38, 0x36, 0x2e, 0x38, 0x30, 0x37, 0x20,
+	0x31, 0x31, 0x32, 0x34, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x39, 0x30, 0x2e, 0x32, 0x35,
+	0x32, 0x20, 0x31, 0x30, 0x32, 0x36, 0x2e, 0x38, 0x20, 0x32, 0x36, 0x32, 0x2e, 0x33, 0x31, 0x35,
+	0x20, 0x38, 0x36, 0x32, 0x2e, 0x37, 0x35, 0x38, 0x20, 0x33, 0x39, 0x39, 0x2e, 0x39, 0x30, 0x39,
+	0x20, 0x38, 0x36, 0x35, 0x2e, 0x38, 0x37, 0x37, 0x20, 0x43, 0x20, 0x34, 0x33, 0x30, 0x2e, 0x36,
+	0x37, 0x39, 0x20, 0x38, 0x36, 0x36, 0x2e, 0x32, 0x37, 0x35, 0x20, 0x34, 0x36, 0x30, 0x2e, 0x36,
+	0x34, 0x37, 0x20, 0x38, 0x37, 0x35, 0x2e, 0x37, 0x34, 0x37, 0x20, 0x34, 0x38, 0x36, 0x2e, 0x30,
+	0x35, 0x37, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x31, 0x30, 0x36, 0x20, 0x43, 0x20, 0x35, 0x30, 0x33,
+	0x2e, 0x34, 0x36, 0x31, 0x20, 0x39, 0x30, 0x35, 0x2e, 0x30, 0x37, 0x33, 0x20, 0x35, 0x31, 0x34,
+	0x2e, 0x32, 0x36, 0x37, 0x20, 0x39, 0x32, 0x30, 0x2e, 0x35, 0x34, 0x36, 0x20, 0x35, 0x32, 0x38,
+	0x2e, 0x35, 0x38, 0x38, 0x20, 0x39, 0x33, 0x34, 0x2e, 0x38, 0x36, 0x31, 0x20, 0x43, 0x20, 0x35,
+	0x34, 0x37, 0x2e, 0x33, 0x39, 0x35, 0x20, 0x39, 0x35, 0x33, 0x2e, 0x36, 0x35, 0x38, 0x20, 0x35,
+	0x36, 0x36, 0x2e, 0x30, 0x39, 0x37, 0x20, 0x39, 0x37, 0x32, 0x2e, 0x35, 0x34, 0x31, 0x20, 0x35,
+	0x38, 0x34, 0x2e, 0x38, 0x35, 0x31, 0x20, 0x39, 0x39, 0x31, 0x2e, 0x33, 0x38, 0x37, 0x20, 0x4c,
+	0x20, 0x37, 0x31, 0x37, 0x2e, 0x38, 0x36, 0x33, 0x20, 0x31, 0x31, 0x32, 0x35, 0x2e, 0x33, 0x20,
+	0x43, 0x20, 0x37, 0x35, 0x35, 0x2e, 0x30, 0x34, 0x31, 0x20, 0x31, 0x31, 0x36, 0x32, 0x2e, 0x33,
+	0x38, 0x20, 0x37, 0x39, 0x31, 0x2e, 0x39, 0x38, 0x33, 0x20, 0x31, 0x31, 0x39, 0x39, 0x2e, 0x37,
+	0x20, 0x38, 0x32, 0x38, 0x2e, 0x36, 0x38, 0x35, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x32, 0x35,
+	0x20, 0x43, 0x20, 0x38, 0x39, 0x31, 0x2e, 0x30, 0x31, 0x36, 0x20, 0x31, 0x31, 0x36, 0x38, 0x2e,
+	0x37, 0x36, 0x20, 0x39, 0x35, 0x35, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e,
+	0x31, 0x38, 0x20, 0x31, 0x30, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x33, 0x39, 0x2e, 0x33,
+	0x35, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x37, 0x32, 0x2e, 0x33, 0x38, 0x20, 0x36, 0x38, 0x35, 0x2e,
+	0x33, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x37, 0x38, 0x20, 0x35, 0x32, 0x35,
+	0x2e, 0x38, 0x32, 0x36, 0x20, 0x43, 0x20, 0x31, 0x35, 0x34, 0x32, 0x2e, 0x32, 0x20, 0x35, 0x31,
+	0x33, 0x2e, 0x31, 0x33, 0x31, 0x20, 0x31, 0x35, 0x35, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x35, 0x30,
+	0x30, 0x2e, 0x33, 0x37, 0x32, 0x20, 0x31, 0x35, 0x36, 0x36, 0x2e, 0x38, 0x35, 0x20, 0x34, 0x38,
+	0x37, 0x2e, 0x35, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x36, 0x30, 0x34, 0x2e, 0x38, 0x31, 0x20,
+	0x34, 0x34, 0x37, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x36, 0x32, 0x35, 0x2e, 0x31, 0x33, 0x20, 0x34,
+	0x32, 0x38, 0x2e, 0x37, 0x37, 0x34, 0x20, 0x31, 0x36, 0x38, 0x33, 0x2e, 0x31, 0x32, 0x20, 0x34,
+	0x32, 0x33, 0x2e, 0x34, 0x30, 0x35, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x67, 0x3e,
+	0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_client_unknown_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0xcf, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0x63, 0x60, 0x18,
+	0x68, 0xc0, 0x88, 0x4d, 0x30, 0x2f, 0x3b, 0x2f, 0xcc, 0xd4, 0xdc, 0xa4, 0x44, 0x52, 0x52, 0x4a,
+	0x91, 0x81, 0x81, 0x81, 0xf1, 0xc5, 0x8b, 0xe7, 0x0f, 0x4e, 0x9e, 0x3a, 0xd5, 0x3b, 0x79, 0xf2,
+	0xe4, 0xe5, 0x78, 0x4d, 0x53, 0x50, 0x50, 0xe0, 0x58, 0x30, 0x77, 0xde, 0xb9, 0x1f, 0x3f, 0x7e,
+	0xfc, 0x47, 0x07, 0xbf, 0x7e, 0xfd, 0xfa, 0xbf, 0x78, 0xd1, 0xa2, 0x4b, 0x52, 0x52, 0x52, 0x5c,
+	0x38, 0x0d, 0x58, 0xb8, 0x60, 0xc1, 0x45, 0x98, 0x86, 0x65, 0xf3, 0xe6, 0xfc, 0x6f, 0x2b, 0xce,
+	0xfd, 0xdf, 0x5e, 0x92, 0xf7, 0x7f, 0x5a, 0x6f, 0xd7, 0xff, 0x7f, 0xff, 0xfe, 0xfd, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x25, 0x8b, 0x17, 0x5f, 0x43, 0xd6, 0xc3, 0x0c, 0x63, 0x14, 0x15, 0x14, 0x25,
+	0x14, 0x97, 0x14, 0xa7, 0x33, 0x31, 0x31, 0x31, 0x1c, 0xda, 0xbf, 0x97, 0xe1, 0xe9, 0xa5, 0xb3,
+	0x0c, 0xdc, 0x12, 0xd2, 0x0c, 0x82, 0xe2, 0x92, 0x0c, 0x7f, 0xdf, 0xbd, 0x64, 0x78, 0xf4, 0xf2,
+	0x35, 0x83, 0xa6, 0x8e, 0x2e, 0x83, 0x96, 0x96, 0x96, 0xe8, 0x8f, 0xaf, 0x5f, 0x5f, 0x1d, 0x3b,
+	0x7e, 0xfc, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x13, 0xcc, 0x00, 0x33, 0x73, 0xd3, 0x12, 0x66, 0x66,
+	0x88, 0x79, 0x5f, 0x3f, 0x7f, 0x61, 0xf8, 0xc3, 0xcd, 0xcf, 0x90, 0x9a, 0x57, 0xc8, 0x10, 0x9b,
+	0x9a, 0xce, 0xf0, 0xf9, 0xeb, 0x77, 0x86, 0x97, 0x4f, 0x1f, 0x33, 0x30, 0x30, 0x30, 0x30, 0xb0,
+	0xb0, 0xb0, 0x30, 0x98, 0x5b, 0x58, 0x14, 0xc0, 0xf4, 0xb1, 0xc0, 0x18, 0x52, 0xd2, 0xd2, 0xf2,
+	0x30, 0xb6, 0xa7, 0x9f, 0x3f, 0x03, 0x03, 0x83, 0x3f, 0xc3, 0xaf, 0x5f, 0xbf, 0x18, 0xfa, 0x9a,
+	0xea, 0x19, 0x3e, 0x7d, 0xf8, 0xc8, 0xe0, 0x13, 0x9f, 0x0a, 0x77, 0xb6, 0xb4, 0x8c, 0x8c, 0x2c,
+	0x86, 0x01, 0x4c, 0x8c, 0x4c, 0x18, 0x31, 0xb2, 0x70, 0xc6, 0x54, 0x06, 0x6e, 0xc6, 0xbf, 0x0c,
+	0xae, 0x49, 0x69, 0x0c, 0x1a, 0x5a, 0x5a, 0x70, 0x71, 0x26, 0x26, 0x84, 0x5a, 0xb8, 0x17, 0x5e,
+	0xbd, 0x7a, 0xf5, 0x02, 0xdd, 0x80, 0x3f, 0x7f, 0xff, 0x32, 0x30, 0xf1, 0x0a, 0x31, 0x18, 0x9b,
+	0x5b, 0xa0, 0x88, 0x3f, 0x7f, 0xf1, 0x02, 0xae, 0x16, 0x6e, 0xc0, 0xb9, 0xb3, 0xe7, 0x66, 0xff,
+	0xff, 0xff, 0x1f, 0x45, 0x21, 0x17, 0x17, 0x17, 0x03, 0x37, 0x2f, 0x2f, 0xba, 0xb9, 0x0c, 0x67,
+	0xce, 0x9c, 0x59, 0x80, 0x21, 0xc8, 0xc0, 0xc0, 0xc0, 0xb4, 0x71, 0xc3, 0xc6, 0xa7, 0xc8, 0x71,
+	0xdf, 0x5c, 0x56, 0xf4, 0xbf, 0xb9, 0xb4, 0x00, 0x25, 0x3d, 0x6c, 0xdd, 0xb2, 0xe5, 0x85, 0x83,
+	0x83, 0x03, 0x0b, 0x36, 0x03, 0x18, 0xfc, 0x9c, 0xfd, 0xc4, 0xb7, 0x6c, 0xde, 0xfc, 0x02, 0x59,
+	0xc3, 0xdf, 0xbf, 0x7f, 0xe1, 0xec, 0xed, 0xdb, 0xb6, 0xbd, 0xf2, 0xf1, 0xf1, 0x91, 0x46, 0xd6,
+	0xc3, 0x8c, 0xcc, 0xb9, 0x79, 0xff, 0xe6, 0xd7, 0x9b, 0xb7, 0x6e, 0x4d, 0x7c, 0xf5, 0xe2, 0x05,
+	0xcb, 0xb7, 0x6f, 0xdf, 0x54, 0x7e, 0xfc, 0xfc, 0xc9, 0xf9, 0xe2, 0xc5, 0x8b, 0xff, 0x17, 0xcf,
+	0x9f, 0x7f, 0xbd, 0x72, 0xc5, 0xaa, 0x19, 0x8b, 0x97, 0x2c, 0xf6, 0xda, 0xb5, 0x6b, 0xd7, 0x47,
+	0xac, 0xb6, 0x0f, 0x18, 0x00, 0x00, 0x3c, 0xb5, 0xf3, 0x05, 0xe8, 0xc9, 0xa9, 0xf5, 0x00, 0x00,
+	0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_unknown_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x36, 0x2c, 0x33,
+	0x33, 0x2c, 0x33, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39, 0x39, 0x36, 0x2e,
+	0x32, 0x34, 0x34, 0x20, 0x32, 0x37, 0x37, 0x2e, 0x36, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x34,
+	0x31, 0x33, 0x2e, 0x38, 0x20, 0x32, 0x36, 0x31, 0x2e, 0x31, 0x38, 0x31, 0x20, 0x31, 0x37, 0x36,
+	0x35, 0x2e, 0x36, 0x33, 0x20, 0x35, 0x38, 0x36, 0x2e, 0x33, 0x38, 0x33, 0x20, 0x31, 0x37, 0x38,
+	0x32, 0x20, 0x31, 0x30, 0x30, 0x33, 0x2e, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x37, 0x39, 0x38,
+	0x2e, 0x33, 0x37, 0x20, 0x31, 0x34, 0x32, 0x31, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x37, 0x33,
+	0x2e, 0x30, 0x39, 0x20, 0x31, 0x37, 0x37, 0x33, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x30, 0x35, 0x35,
+	0x2e, 0x35, 0x32, 0x20, 0x31, 0x37, 0x38, 0x39, 0x2e, 0x35, 0x33, 0x20, 0x43, 0x20, 0x36, 0x33,
+	0x38, 0x2e, 0x30, 0x38, 0x39, 0x20, 0x31, 0x38, 0x30, 0x35, 0x2e, 0x38, 0x20, 0x32, 0x38, 0x36,
+	0x2e, 0x34, 0x38, 0x31, 0x20, 0x31, 0x34, 0x38, 0x30, 0x2e, 0x36, 0x35, 0x20, 0x32, 0x37, 0x30,
+	0x2e, 0x31, 0x31, 0x35, 0x20, 0x31, 0x30, 0x36, 0x33, 0x2e, 0x32, 0x32, 0x20, 0x43, 0x20, 0x32,
+	0x35, 0x33, 0x2e, 0x37, 0x35, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x37, 0x39, 0x34, 0x20, 0x35, 0x37,
+	0x38, 0x2e, 0x38, 0x32, 0x31, 0x20, 0x32, 0x39, 0x34, 0x2e, 0x31, 0x31, 0x31, 0x20, 0x39, 0x39,
+	0x36, 0x2e, 0x32, 0x34, 0x34, 0x20, 0x32, 0x37, 0x37, 0x2e, 0x36, 0x34, 0x39, 0x20, 0x7a, 0x22,
+	0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f,
+	0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c,
+	0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x35,
+	0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x20, 0x39, 0x38, 0x36, 0x2e, 0x31, 0x35, 0x39, 0x20, 0x32, 0x39, 0x37, 0x2e, 0x35, 0x34, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x39, 0x32, 0x2e, 0x38, 0x31, 0x20, 0x32, 0x37, 0x35, 0x2e, 0x35, 0x32,
+	0x33, 0x20, 0x31, 0x37, 0x34, 0x30, 0x2e, 0x32, 0x38, 0x20, 0x35, 0x38, 0x37, 0x2e, 0x33, 0x38,
+	0x33, 0x20, 0x31, 0x37, 0x36, 0x32, 0x2e, 0x32, 0x20, 0x39, 0x39, 0x34, 0x2e, 0x30, 0x33, 0x37,
+	0x20, 0x43, 0x20, 0x31, 0x37, 0x38, 0x34, 0x2e, 0x31, 0x32, 0x20, 0x31, 0x34, 0x30, 0x30, 0x2e,
+	0x36, 0x39, 0x20, 0x31, 0x34, 0x37, 0x32, 0x2e, 0x31, 0x37, 0x20, 0x31, 0x37, 0x34, 0x38, 0x2e,
+	0x30, 0x39, 0x20, 0x31, 0x30, 0x36, 0x35, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x37, 0x36, 0x39, 0x2e,
+	0x39, 0x31, 0x20, 0x43, 0x20, 0x36, 0x35, 0x38, 0x2e, 0x39, 0x39, 0x35, 0x20, 0x31, 0x37, 0x39,
+	0x31, 0x2e, 0x37, 0x31, 0x20, 0x33, 0x31, 0x31, 0x2e, 0x37, 0x34, 0x33, 0x20, 0x31, 0x34, 0x37,
+	0x39, 0x2e, 0x39, 0x20, 0x32, 0x38, 0x39, 0x2e, 0x38, 0x33, 0x34, 0x20, 0x31, 0x30, 0x37, 0x33,
+	0x2e, 0x33, 0x39, 0x20, 0x43, 0x20, 0x32, 0x36, 0x37, 0x2e, 0x39, 0x32, 0x35, 0x20, 0x36, 0x36,
+	0x36, 0x2e, 0x38, 0x37, 0x38, 0x20, 0x35, 0x37, 0x39, 0x2e, 0x36, 0x35, 0x33, 0x20, 0x33, 0x31,
+	0x39, 0x2e, 0x35, 0x34, 0x39, 0x20, 0x39, 0x38, 0x36, 0x2e, 0x31, 0x35, 0x39, 0x20, 0x32, 0x39,
+	0x37, 0x2e, 0x35, 0x34, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x36, 0x2c, 0x33, 0x33, 0x2c, 0x33, 0x34, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x31, 0x37, 0x2e, 0x33, 0x32, 0x20, 0x35, 0x31, 0x34,
+	0x2e, 0x34, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x39, 0x35, 0x2e, 0x30, 0x39, 0x20, 0x35,
+	0x31, 0x31, 0x2e, 0x38, 0x38, 0x39, 0x20, 0x31, 0x31, 0x36, 0x31, 0x2e, 0x38, 0x35, 0x20, 0x35,
+	0x33, 0x30, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x31, 0x32, 0x32, 0x36, 0x2e, 0x31, 0x35, 0x20, 0x35,
+	0x37, 0x34, 0x2e, 0x35, 0x37, 0x20, 0x43, 0x20, 0x31, 0x33, 0x35, 0x37, 0x2e, 0x32, 0x37, 0x20,
+	0x36, 0x36, 0x33, 0x2e, 0x30, 0x36, 0x36, 0x20, 0x31, 0x33, 0x39, 0x34, 0x2e, 0x38, 0x39, 0x20,
+	0x38, 0x33, 0x32, 0x2e, 0x34, 0x37, 0x39, 0x20, 0x31, 0x33, 0x30, 0x32, 0x2e, 0x37, 0x31, 0x20,
+	0x39, 0x36, 0x33, 0x2e, 0x32, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x38, 0x30, 0x2e, 0x36, 0x37,
+	0x20, 0x39, 0x39, 0x34, 0x2e, 0x35, 0x32, 0x34, 0x20, 0x31, 0x32, 0x34, 0x31, 0x2e, 0x39, 0x39,
+	0x20, 0x31, 0x30, 0x33, 0x32, 0x2e, 0x38, 0x20, 0x31, 0x32, 0x30, 0x39, 0x2e, 0x32, 0x31, 0x20,
+	0x31, 0x30, 0x35, 0x31, 0x2e, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x34, 0x39, 0x2e, 0x38,
+	0x31, 0x20, 0x31, 0x30, 0x38, 0x36, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x31, 0x31, 0x34, 0x2e, 0x31,
+	0x34, 0x20, 0x31, 0x31, 0x34, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x31, 0x31, 0x31, 0x2e, 0x37,
+	0x37, 0x20, 0x31, 0x32, 0x31, 0x30, 0x2e, 0x31, 0x20, 0x43, 0x20, 0x31, 0x31, 0x31, 0x31, 0x2e,
+	0x34, 0x32, 0x20, 0x31, 0x32, 0x32, 0x30, 0x2e, 0x32, 0x39, 0x20, 0x31, 0x31, 0x31, 0x32, 0x2e,
+	0x33, 0x39, 0x20, 0x31, 0x32, 0x33, 0x36, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x31, 0x30, 0x36, 0x2e,
+	0x34, 0x37, 0x20, 0x31, 0x32, 0x34, 0x34, 0x2e, 0x36, 0x34, 0x20, 0x43, 0x20, 0x31, 0x31, 0x30,
+	0x33, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x32, 0x34, 0x36, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x30, 0x39,
+	0x38, 0x2e, 0x31, 0x20, 0x31, 0x32, 0x34, 0x36, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x30, 0x39, 0x34,
+	0x2e, 0x36, 0x34, 0x20, 0x31, 0x32, 0x34, 0x36, 0x2e, 0x37, 0x39, 0x20, 0x43, 0x20, 0x31, 0x30,
+	0x34, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x32, 0x34, 0x36, 0x2e, 0x38, 0x20, 0x39, 0x39, 0x32,
+	0x2e, 0x38, 0x33, 0x31, 0x20, 0x31, 0x32, 0x34, 0x37, 0x2e, 0x33, 0x33, 0x20, 0x39, 0x34, 0x31,
+	0x2e, 0x39, 0x39, 0x35, 0x20, 0x31, 0x32, 0x34, 0x36, 0x2e, 0x39, 0x20, 0x43, 0x20, 0x39, 0x33,
+	0x32, 0x2e, 0x39, 0x31, 0x32, 0x20, 0x31, 0x32, 0x34, 0x36, 0x2e, 0x33, 0x38, 0x20, 0x39, 0x33,
+	0x31, 0x2e, 0x38, 0x36, 0x37, 0x20, 0x31, 0x32, 0x33, 0x34, 0x2e, 0x39, 0x32, 0x20, 0x39, 0x33,
+	0x31, 0x2e, 0x38, 0x32, 0x32, 0x20, 0x31, 0x32, 0x32, 0x38, 0x2e, 0x32, 0x39, 0x20, 0x43, 0x20,
+	0x39, 0x33, 0x31, 0x2e, 0x32, 0x37, 0x32, 0x20, 0x31, 0x31, 0x34, 0x37, 0x2e, 0x37, 0x38, 0x20,
+	0x39, 0x34, 0x35, 0x2e, 0x36, 0x36, 0x38, 0x20, 0x31, 0x30, 0x37, 0x33, 0x2e, 0x33, 0x34, 0x20,
+	0x31, 0x30, 0x30, 0x33, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x30, 0x31, 0x33, 0x2e, 0x30, 0x37, 0x20,
+	0x43, 0x20, 0x31, 0x30, 0x32, 0x31, 0x2e, 0x34, 0x20, 0x39, 0x39, 0x35, 0x2e, 0x32, 0x35, 0x20,
+	0x31, 0x30, 0x34, 0x32, 0x2e, 0x38, 0x37, 0x20, 0x39, 0x37, 0x38, 0x2e, 0x32, 0x32, 0x38, 0x20,
+	0x31, 0x30, 0x36, 0x34, 0x2e, 0x38, 0x39, 0x20, 0x39, 0x36, 0x35, 0x2e, 0x37, 0x32, 0x31, 0x20,
+	0x43, 0x20, 0x31, 0x31, 0x33, 0x33, 0x2e, 0x31, 0x31, 0x20, 0x39, 0x32, 0x36, 0x2e, 0x39, 0x38,
+	0x33, 0x20, 0x31, 0x31, 0x38, 0x35, 0x2e, 0x37, 0x34, 0x20, 0x38, 0x36, 0x32, 0x2e, 0x36, 0x30,
+	0x36, 0x20, 0x31, 0x31, 0x36, 0x36, 0x2e, 0x35, 0x31, 0x20, 0x37, 0x37, 0x39, 0x2e, 0x33, 0x33,
+	0x38, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x38, 0x2e, 0x31, 0x33, 0x20, 0x37, 0x34, 0x34, 0x2e,
+	0x31, 0x31, 0x38, 0x20, 0x31, 0x31, 0x33, 0x36, 0x2e, 0x30, 0x31, 0x20, 0x37, 0x31, 0x33, 0x2e,
+	0x37, 0x31, 0x34, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x30, 0x38, 0x20, 0x36, 0x39, 0x34, 0x2e,
+	0x39, 0x30, 0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x31, 0x35, 0x2e, 0x35, 0x34, 0x20, 0x36, 0x33,
+	0x39, 0x2e, 0x36, 0x31, 0x39, 0x20, 0x39, 0x30, 0x34, 0x2e, 0x33, 0x34, 0x36, 0x20, 0x36, 0x39,
+	0x37, 0x2e, 0x31, 0x36, 0x37, 0x20, 0x38, 0x38, 0x31, 0x2e, 0x31, 0x31, 0x37, 0x20, 0x37, 0x39,
+	0x34, 0x2e, 0x34, 0x33, 0x32, 0x20, 0x43, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x38, 0x34, 0x39, 0x20,
+	0x38, 0x30, 0x33, 0x2e, 0x39, 0x33, 0x20, 0x38, 0x37, 0x33, 0x2e, 0x38, 0x32, 0x33, 0x20, 0x38,
+	0x33, 0x32, 0x2e, 0x36, 0x36, 0x37, 0x20, 0x38, 0x36, 0x39, 0x2e, 0x36, 0x34, 0x20, 0x38, 0x33,
+	0x39, 0x2e, 0x34, 0x36, 0x31, 0x20, 0x43, 0x20, 0x38, 0x36, 0x34, 0x2e, 0x33, 0x39, 0x20, 0x38,
+	0x34, 0x30, 0x2e, 0x36, 0x33, 0x39, 0x20, 0x38, 0x35, 0x39, 0x2e, 0x31, 0x35, 0x38, 0x20, 0x38,
+	0x34, 0x31, 0x2e, 0x32, 0x34, 0x39, 0x20, 0x38, 0x35, 0x33, 0x2e, 0x37, 0x38, 0x36, 0x20, 0x38,
+	0x34, 0x31, 0x2e, 0x34, 0x37, 0x31, 0x20, 0x43, 0x20, 0x38, 0x34, 0x31, 0x2e, 0x30, 0x31, 0x34,
+	0x20, 0x38, 0x34, 0x32, 0x2e, 0x30, 0x30, 0x31, 0x20, 0x37, 0x30, 0x34, 0x2e, 0x33, 0x34, 0x35,
+	0x20, 0x38, 0x34, 0x32, 0x2e, 0x35, 0x36, 0x39, 0x20, 0x37, 0x30, 0x30, 0x2e, 0x36, 0x32, 0x34,
+	0x20, 0x38, 0x34, 0x30, 0x2e, 0x34, 0x32, 0x32, 0x20, 0x43, 0x20, 0x36, 0x39, 0x36, 0x2e, 0x37,
+	0x36, 0x33, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x31, 0x39, 0x34, 0x20, 0x36, 0x39, 0x35, 0x2e, 0x34,
+	0x38, 0x38, 0x20, 0x38, 0x33, 0x31, 0x2e, 0x34, 0x33, 0x38, 0x20, 0x36, 0x39, 0x35, 0x2e, 0x32,
+	0x31, 0x35, 0x20, 0x38, 0x32, 0x37, 0x2e, 0x34, 0x36, 0x36, 0x20, 0x43, 0x20, 0x36, 0x39, 0x34,
+	0x2e, 0x33, 0x37, 0x32, 0x20, 0x38, 0x31, 0x35, 0x2e, 0x32, 0x31, 0x32, 0x20, 0x36, 0x39, 0x37,
+	0x2e, 0x33, 0x20, 0x38, 0x30, 0x31, 0x2e, 0x35, 0x35, 0x35, 0x20, 0x36, 0x39, 0x39, 0x2e, 0x36,
+	0x39, 0x20, 0x37, 0x38, 0x39, 0x2e, 0x35, 0x30, 0x35, 0x20, 0x43, 0x20, 0x37, 0x31, 0x32, 0x2e,
+	0x32, 0x31, 0x31, 0x20, 0x37, 0x32, 0x36, 0x2e, 0x33, 0x36, 0x34, 0x20, 0x37, 0x34, 0x34, 0x2e,
+	0x30, 0x36, 0x38, 0x20, 0x36, 0x36, 0x37, 0x2e, 0x35, 0x36, 0x35, 0x20, 0x37, 0x38, 0x37, 0x2e,
+	0x33, 0x36, 0x33, 0x20, 0x36, 0x32, 0x30, 0x2e, 0x32, 0x31, 0x32, 0x20, 0x43, 0x20, 0x38, 0x34,
+	0x36, 0x2e, 0x37, 0x35, 0x20, 0x35, 0x35, 0x35, 0x2e, 0x35, 0x37, 0x34, 0x20, 0x39, 0x32, 0x39,
+	0x2e, 0x35, 0x39, 0x33, 0x20, 0x35, 0x31, 0x37, 0x2e, 0x34, 0x37, 0x33, 0x20, 0x31, 0x30, 0x31,
+	0x37, 0x2e, 0x33, 0x32, 0x20, 0x35, 0x31, 0x34, 0x2e, 0x34, 0x34, 0x39, 0x20, 0x7a, 0x22, 0x2f,
+	0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72,
+	0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30,
+	0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x36, 0x31,
+	0x2c, 0x31, 0x33, 0x36, 0x2c, 0x31, 0x32, 0x37, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20,
+	0x31, 0x30, 0x31, 0x39, 0x2e, 0x36, 0x38, 0x20, 0x35, 0x33, 0x33, 0x2e, 0x34, 0x34, 0x32, 0x20,
+	0x43, 0x20, 0x31, 0x30, 0x32, 0x36, 0x2e, 0x37, 0x36, 0x20, 0x35, 0x33, 0x33, 0x2e, 0x32, 0x20,
+	0x31, 0x30, 0x33, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x35, 0x33, 0x33, 0x2e, 0x32, 0x32, 0x36, 0x20,
+	0x31, 0x30, 0x34, 0x30, 0x2e, 0x39, 0x33, 0x20, 0x35, 0x33, 0x33, 0x2e, 0x35, 0x32, 0x20, 0x43,
+	0x20, 0x31, 0x30, 0x36, 0x37, 0x2e, 0x38, 0x35, 0x20, 0x35, 0x33, 0x34, 0x2e, 0x34, 0x39, 0x38,
+	0x20, 0x31, 0x30, 0x39, 0x33, 0x2e, 0x35, 0x20, 0x35, 0x33, 0x37, 0x2e, 0x35, 0x32, 0x33, 0x20,
+	0x31, 0x31, 0x31, 0x39, 0x2e, 0x34, 0x39, 0x20, 0x35, 0x34, 0x35, 0x2e, 0x30, 0x32, 0x38, 0x20,
+	0x43, 0x20, 0x31, 0x33, 0x33, 0x31, 0x2e, 0x33, 0x39, 0x20, 0x36, 0x30, 0x36, 0x2e, 0x32, 0x33,
+	0x20, 0x31, 0x34, 0x31, 0x34, 0x2e, 0x31, 0x20, 0x38, 0x34, 0x32, 0x2e, 0x38, 0x35, 0x35, 0x20,
+	0x31, 0x32, 0x34, 0x31, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x30, 0x30, 0x32, 0x2e, 0x35, 0x35, 0x20,
+	0x43, 0x20, 0x31, 0x32, 0x31, 0x31, 0x2e, 0x37, 0x35, 0x20, 0x39, 0x37, 0x36, 0x2e, 0x32, 0x36,
+	0x32, 0x20, 0x31, 0x31, 0x37, 0x36, 0x2e, 0x36, 0x36, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x33, 0x33,
+	0x35, 0x20, 0x31, 0x31, 0x34, 0x38, 0x2e, 0x39, 0x34, 0x20, 0x39, 0x32, 0x32, 0x2e, 0x33, 0x33,
+	0x33, 0x20, 0x43, 0x20, 0x31, 0x31, 0x39, 0x33, 0x2e, 0x34, 0x38, 0x20, 0x38, 0x36, 0x34, 0x2e,
+	0x33, 0x37, 0x31, 0x20, 0x31, 0x32, 0x30, 0x31, 0x2e, 0x36, 0x38, 0x20, 0x38, 0x30, 0x32, 0x2e,
+	0x35, 0x33, 0x38, 0x20, 0x31, 0x31, 0x37, 0x30, 0x2e, 0x32, 0x39, 0x20, 0x37, 0x33, 0x36, 0x2e,
+	0x32, 0x33, 0x20, 0x43, 0x20, 0x31, 0x31, 0x34, 0x39, 0x2e, 0x32, 0x37, 0x20, 0x36, 0x39, 0x36,
+	0x2e, 0x35, 0x39, 0x38, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x36, 0x35, 0x20, 0x36, 0x36, 0x36,
+	0x2e, 0x35, 0x37, 0x20, 0x31, 0x30, 0x36, 0x31, 0x2e, 0x39, 0x38, 0x20, 0x36, 0x35, 0x37, 0x2e,
+	0x39, 0x38, 0x32, 0x20, 0x43, 0x20, 0x31, 0x30, 0x31, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x36, 0x34,
+	0x39, 0x2e, 0x37, 0x34, 0x39, 0x20, 0x39, 0x37, 0x32, 0x2e, 0x35, 0x36, 0x38, 0x20, 0x36, 0x35,
+	0x39, 0x2e, 0x32, 0x32, 0x31, 0x20, 0x39, 0x33, 0x35, 0x2e, 0x35, 0x34, 0x38, 0x20, 0x36, 0x38,
+	0x34, 0x2e, 0x33, 0x33, 0x36, 0x20, 0x43, 0x20, 0x38, 0x38, 0x35, 0x2e, 0x30, 0x32, 0x38, 0x20,
+	0x37, 0x31, 0x38, 0x2e, 0x34, 0x35, 0x37, 0x20, 0x38, 0x36, 0x36, 0x2e, 0x30, 0x32, 0x33, 0x20,
+	0x37, 0x36, 0x35, 0x2e, 0x33, 0x30, 0x37, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x38, 0x37, 0x20, 0x38,
+	0x32, 0x32, 0x2e, 0x36, 0x35, 0x31, 0x20, 0x43, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x31, 0x36, 0x34,
+	0x20, 0x38, 0x32, 0x31, 0x2e, 0x39, 0x36, 0x20, 0x37, 0x36, 0x31, 0x2e, 0x34, 0x35, 0x20, 0x38,
+	0x32, 0x31, 0x2e, 0x39, 0x38, 0x37, 0x20, 0x37, 0x31, 0x34, 0x2e, 0x37, 0x34, 0x34, 0x20, 0x38,
+	0x32, 0x32, 0x2e, 0x37, 0x33, 0x33, 0x20, 0x43, 0x20, 0x37, 0x32, 0x39, 0x2e, 0x35, 0x34, 0x33,
+	0x20, 0x36, 0x36, 0x33, 0x2e, 0x32, 0x33, 0x36, 0x20, 0x38, 0x35, 0x39, 0x2e, 0x36, 0x32, 0x33,
+	0x20, 0x35, 0x34, 0x31, 0x2e, 0x32, 0x33, 0x39, 0x20, 0x31, 0x30, 0x31, 0x39, 0x2e, 0x36, 0x38,
+	0x20, 0x35, 0x33, 0x33, 0x2e, 0x34, 0x34, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x36, 0x31, 0x2c, 0x31, 0x33, 0x36,
+	0x2c, 0x31, 0x32, 0x37, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x31, 0x33, 0x35,
+	0x2e, 0x34, 0x20, 0x39, 0x33, 0x37, 0x2e, 0x31, 0x33, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x34,
+	0x30, 0x2e, 0x37, 0x20, 0x39, 0x34, 0x30, 0x2e, 0x36, 0x32, 0x20, 0x31, 0x31, 0x35, 0x38, 0x2e,
+	0x36, 0x33, 0x20, 0x39, 0x35, 0x36, 0x2e, 0x38, 0x32, 0x38, 0x20, 0x31, 0x31, 0x36, 0x34, 0x2e,
+	0x32, 0x39, 0x20, 0x39, 0x36, 0x31, 0x2e, 0x37, 0x31, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x32,
+	0x37, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x30, 0x31, 0x36, 0x2e, 0x31, 0x32, 0x20, 0x43, 0x20, 0x31,
+	0x32, 0x30, 0x35, 0x2e, 0x37, 0x33, 0x20, 0x31, 0x30, 0x33, 0x34, 0x2e, 0x36, 0x20, 0x31, 0x31,
+	0x38, 0x32, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x30, 0x34, 0x31, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x31,
+	0x35, 0x39, 0x2e, 0x37, 0x33, 0x20, 0x31, 0x30, 0x36, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x43, 0x20,
+	0x31, 0x31, 0x30, 0x36, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x31, 0x31, 0x35, 0x2e, 0x35, 0x34, 0x20,
+	0x31, 0x30, 0x39, 0x34, 0x2e, 0x34, 0x37, 0x20, 0x31, 0x31, 0x35, 0x36, 0x2e, 0x35, 0x39, 0x20,
+	0x31, 0x30, 0x39, 0x31, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e, 0x32, 0x35, 0x20,
+	0x43, 0x20, 0x31, 0x30, 0x37, 0x36, 0x2e, 0x32, 0x39, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e, 0x39,
+	0x20, 0x31, 0x30, 0x36, 0x30, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e, 0x38, 0x32,
+	0x20, 0x31, 0x30, 0x34, 0x34, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e, 0x39, 0x33,
+	0x20, 0x43, 0x20, 0x31, 0x30, 0x31, 0x33, 0x2e, 0x31, 0x37, 0x20, 0x31, 0x32, 0x32, 0x38, 0x2e,
+	0x30, 0x36, 0x20, 0x39, 0x38, 0x32, 0x2e, 0x30, 0x30, 0x33, 0x20, 0x31, 0x32, 0x32, 0x38, 0x2e,
+	0x30, 0x32, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x38, 0x34, 0x31, 0x20, 0x31, 0x32, 0x32, 0x37, 0x2e,
+	0x38, 0x31, 0x20, 0x43, 0x20, 0x39, 0x35, 0x30, 0x2e, 0x37, 0x39, 0x32, 0x20, 0x31, 0x32, 0x31,
+	0x34, 0x2e, 0x30, 0x37, 0x20, 0x39, 0x35, 0x31, 0x2e, 0x32, 0x39, 0x32, 0x20, 0x31, 0x32, 0x30,
+	0x30, 0x2e, 0x33, 0x34, 0x20, 0x39, 0x35, 0x32, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x31, 0x38, 0x36,
+	0x2e, 0x36, 0x34, 0x20, 0x43, 0x20, 0x39, 0x35, 0x37, 0x2e, 0x38, 0x33, 0x34, 0x20, 0x31, 0x31,
+	0x31, 0x30, 0x2e, 0x32, 0x20, 0x39, 0x38, 0x32, 0x2e, 0x37, 0x36, 0x32, 0x20, 0x31, 0x30, 0x34,
+	0x39, 0x2e, 0x31, 0x36, 0x20, 0x31, 0x30, 0x34, 0x35, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x30, 0x30,
+	0x31, 0x2e, 0x32, 0x31, 0x20, 0x43, 0x20, 0x31, 0x30, 0x36, 0x31, 0x2e, 0x33, 0x34, 0x20, 0x39,
+	0x38, 0x39, 0x2e, 0x33, 0x37, 0x37, 0x20, 0x31, 0x30, 0x37, 0x39, 0x2e, 0x37, 0x33, 0x20, 0x39,
+	0x37, 0x39, 0x2e, 0x37, 0x32, 0x31, 0x20, 0x31, 0x30, 0x39, 0x35, 0x2e, 0x39, 0x32, 0x20, 0x39,
+	0x36, 0x38, 0x2e, 0x36, 0x37, 0x32, 0x20, 0x43, 0x20, 0x31, 0x31, 0x31, 0x30, 0x2e, 0x33, 0x32,
+	0x20, 0x39, 0x35, 0x38, 0x2e, 0x38, 0x34, 0x33, 0x20, 0x31, 0x31, 0x32, 0x32, 0x2e, 0x32, 0x38,
+	0x20, 0x39, 0x34, 0x38, 0x2e, 0x35, 0x30, 0x37, 0x20, 0x31, 0x31, 0x33, 0x35, 0x2e, 0x34, 0x20,
+	0x39, 0x33, 0x37, 0x2e, 0x31, 0x33, 0x32, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x33, 0x36, 0x2c, 0x33, 0x33, 0x2c, 0x33, 0x34,
+	0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x31, 0x31, 0x2e, 0x39, 0x32, 0x20,
+	0x31, 0x33, 0x31, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x35, 0x2e, 0x33,
+	0x20, 0x31, 0x33, 0x30, 0x36, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x31, 0x33, 0x32, 0x2e, 0x38, 0x37,
+	0x20, 0x31, 0x33, 0x35, 0x31, 0x2e, 0x36, 0x20, 0x31, 0x31, 0x34, 0x30, 0x2e, 0x35, 0x31, 0x20,
+	0x31, 0x34, 0x31, 0x34, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x31, 0x31, 0x34, 0x38, 0x2e, 0x31,
+	0x34, 0x20, 0x31, 0x34, 0x37, 0x38, 0x2e, 0x33, 0x36, 0x20, 0x31, 0x31, 0x30, 0x32, 0x2e, 0x39,
+	0x35, 0x20, 0x31, 0x35, 0x33, 0x35, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x30, 0x33, 0x39, 0x2e, 0x35,
+	0x37, 0x20, 0x31, 0x35, 0x34, 0x33, 0x2e, 0x35, 0x35, 0x20, 0x43, 0x20, 0x39, 0x37, 0x36, 0x2e,
+	0x31, 0x39, 0x36, 0x20, 0x31, 0x35, 0x35, 0x31, 0x2e, 0x31, 0x38, 0x20, 0x39, 0x31, 0x38, 0x2e,
+	0x36, 0x34, 0x32, 0x20, 0x31, 0x35, 0x30, 0x35, 0x2e, 0x39, 0x39, 0x20, 0x39, 0x31, 0x31, 0x2e,
+	0x30, 0x31, 0x20, 0x31, 0x34, 0x34, 0x32, 0x2e, 0x36, 0x32, 0x20, 0x43, 0x20, 0x39, 0x30, 0x33,
+	0x2e, 0x33, 0x37, 0x37, 0x20, 0x31, 0x33, 0x37, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x39, 0x34, 0x38,
+	0x2e, 0x35, 0x35, 0x36, 0x20, 0x31, 0x33, 0x32, 0x31, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x30, 0x31,
+	0x31, 0x2e, 0x39, 0x32, 0x20, 0x31, 0x33, 0x31, 0x34, 0x2e, 0x30, 0x35, 0x20, 0x7a, 0x22, 0x2f,
+	0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72,
+	0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30,
+	0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x36, 0x31,
+	0x2c, 0x31, 0x33, 0x36, 0x2c, 0x31, 0x32, 0x37, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20,
+	0x31, 0x30, 0x31, 0x33, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x33, 0x33, 0x32, 0x2e, 0x39, 0x31, 0x20,
+	0x43, 0x20, 0x31, 0x30, 0x36, 0x36, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x33, 0x32, 0x36, 0x2e, 0x31,
+	0x36, 0x20, 0x31, 0x31, 0x31, 0x35, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x33, 0x36, 0x33, 0x2e, 0x37,
+	0x32, 0x20, 0x31, 0x31, 0x32, 0x31, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x34, 0x31, 0x36, 0x2e, 0x37,
+	0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x32, 0x38, 0x2e, 0x34, 0x36, 0x20, 0x31, 0x34, 0x36, 0x39,
+	0x2e, 0x38, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x35, 0x31, 0x38, 0x2e,
+	0x31, 0x39, 0x20, 0x31, 0x30, 0x33, 0x37, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x35, 0x32, 0x34, 0x2e,
+	0x37, 0x39, 0x20, 0x43, 0x20, 0x39, 0x38, 0x34, 0x2e, 0x38, 0x34, 0x31, 0x20, 0x31, 0x35, 0x33,
+	0x31, 0x2e, 0x33, 0x38, 0x20, 0x39, 0x33, 0x36, 0x2e, 0x35, 0x36, 0x35, 0x20, 0x31, 0x34, 0x39,
+	0x33, 0x2e, 0x38, 0x34, 0x20, 0x39, 0x32, 0x39, 0x2e, 0x39, 0x30, 0x33, 0x20, 0x31, 0x34, 0x34,
+	0x30, 0x2e, 0x39, 0x31, 0x20, 0x43, 0x20, 0x39, 0x32, 0x33, 0x2e, 0x32, 0x34, 0x31, 0x20, 0x31,
+	0x33, 0x38, 0x37, 0x2e, 0x39, 0x37, 0x20, 0x39, 0x36, 0x30, 0x2e, 0x37, 0x31, 0x31, 0x20, 0x31,
+	0x33, 0x33, 0x39, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x30, 0x31, 0x33, 0x2e, 0x36, 0x34, 0x20, 0x31,
+	0x33, 0x33, 0x32, 0x2e, 0x39, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76,
+	0x67, 0x3e
+};
+
+static const unsigned char icon_client_upload_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x95, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x92, 0xbd,
+	0x6b, 0x53, 0x61, 0x14, 0xc6, 0x7f, 0xe7, 0xbc, 0x69, 0x87, 0x38, 0x17, 0x83, 0x45, 0x9c, 0x42,
+	0x2f, 0x76, 0x90, 0x92, 0xde, 0x44, 0x1d, 0xb4, 0x71, 0xd2, 0x41, 0x1c, 0x6c, 0x45, 0xf0, 0xbf,
+	0x70, 0xf0, 0x6b, 0x70, 0x71, 0x10, 0xad, 0x05, 0xa9, 0xab, 0x0e, 0x0e, 0x82, 0x28, 0xa5, 0x54,
+	0x74, 0x72, 0x09, 0xe2, 0x52, 0x12, 0x28, 0xb4, 0x94, 0xdc, 0x8a, 0x9d, 0x15, 0xba, 0x49, 0xa6,
+	0xe4, 0xde, 0x73, 0x1c, 0x6c, 0xd2, 0xd8, 0x24, 0x3a, 0x89, 0xcf, 0xf8, 0x3e, 0x1f, 0x3c, 0xe7,
+	0xe1, 0x85, 0x7f, 0x09, 0xdf, 0xaa, 0x1c, 0xf5, 0x9d, 0x33, 0x93, 0x7f, 0xd2, 0xe8, 0x28, 0xa2,
+	0x93, 0x94, 0x2f, 0xd8, 0x98, 0xed, 0x9a, 0xa7, 0xbb, 0x69, 0x33, 0xbe, 0x3c, 0x4a, 0x27, 0xc3,
+	0xcd, 0x95, 0xaa, 0x62, 0xef, 0x81, 0xfc, 0xfe, 0x53, 0xdb, 0xf1, 0x85, 0x5c, 0xd4, 0x78, 0xf7,
+	0xd7, 0x80, 0x4e, 0x73, 0x76, 0x4e, 0x45, 0x3e, 0xf4, 0x99, 0xbb, 0x68, 0x3b, 0x7e, 0x2d, 0x17,
+	0x35, 0xd6, 0x46, 0x9e, 0xd0, 0x49, 0x2a, 0xd5, 0x3e, 0xf3, 0xd3, 0x3e, 0x6a, 0x19, 0x18, 0x17,
+	0xe4, 0x4d, 0x9a, 0xcc, 0x5e, 0x19, 0x1a, 0xe0, 0x5f, 0x4a, 0x95, 0xbe, 0xda, 0x8f, 0x94, 0x74,
+	0xb1, 0x27, 0x0a, 0xb6, 0x0c, 0x3c, 0xe8, 0x86, 0x78, 0x33, 0x3e, 0x3f, 0x10, 0x60, 0x16, 0xe6,
+	0x7e, 0x99, 0xfd, 0x71, 0x88, 0xea, 0x77, 0x32, 0x09, 0xa7, 0xba, 0x5c, 0x96, 0xc9, 0x4c, 0x88,
+	0xea, 0xf7, 0x11, 0x1e, 0x02, 0xe3, 0x06, 0x67, 0x07, 0x02, 0x74, 0xea, 0xc4, 0x13, 0xcd, 0xb2,
+	0x62, 0x88, 0x1a, 0xb7, 0x01, 0xc4, 0x75, 0xfe, 0x60, 0x28, 0x59, 0x00, 0x08, 0x53, 0xf5, 0x7b,
+	0xaa, 0xe1, 0xa4, 0x7e, 0x3f, 0xb2, 0x78, 0xc0, 0x0d, 0x81, 0x6f, 0xc7, 0xd3, 0x16, 0xd8, 0xd8,
+	0xe7, 0x0d, 0x50, 0x45, 0x4b, 0x12, 0xad, 0x6f, 0x1e, 0xd6, 0x0e, 0xfc, 0x03, 0x4f, 0x66, 0x8e,
+	0x59, 0x60, 0x05, 0x18, 0x03, 0x79, 0x81, 0xf0, 0x0c, 0xc8, 0x99, 0xf8, 0x8a, 0x7f, 0x8d, 0x8f,
+	0x1f, 0xd6, 0xf7, 0x1a, 0xb8, 0xa3, 0x59, 0x52, 0xbe, 0x2e, 0xe2, 0x4b, 0x40, 0x01, 0xbc, 0xa9,
+	0x21, 0x9c, 0xa6, 0xdd, 0x32, 0x0b, 0xf9, 0x1a, 0x50, 0x02, 0xf6, 0x1c, 0xb9, 0x1b, 0xbe, 0xe5,
+	0x5f, 0x4a, 0xb5, 0x96, 0xfe, 0x3e, 0x62, 0x12, 0xdf, 0x14, 0xf1, 0x57, 0x40, 0xc1, 0x9d, 0x4f,
+	0x2a, 0x7e, 0x4e, 0x8a, 0xeb, 0x3f, 0x64, 0x7a, 0xbb, 0xa5, 0x21, 0xbd, 0x24, 0xc2, 0x47, 0x60,
+	0x42, 0xf0, 0xe7, 0x56, 0x68, 0xdd, 0xea, 0xfa, 0x72, 0xbd, 0x5b, 0x5c, 0x3f, 0x3b, 0xb6, 0x6a,
+	0xf8, 0xdb, 0x10, 0x35, 0x5e, 0x8b, 0xe0, 0xbd, 0x9a, 0xc5, 0x8d, 0x3d, 0x77, 0x2e, 0xda, 0x4e,
+	0xf9, 0xaa, 0xc2, 0x0d, 0x81, 0xda, 0xb0, 0xed, 0xfe, 0x0f, 0x7e, 0x02, 0x8b, 0x20, 0x8f, 0xa8,
+	0xc5, 0x48, 0xf9, 0xfa, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+static const unsigned char icon_client_upload_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x32, 0x35, 0x33, 0x2c,
+	0x32, 0x31, 0x36, 0x2c, 0x35, 0x33, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30,
+	0x31, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x32, 0x32, 0x35, 0x2e, 0x33, 0x39, 0x35, 0x20, 0x43, 0x20,
+	0x31, 0x30, 0x32, 0x31, 0x2e, 0x37, 0x39, 0x20, 0x32, 0x32, 0x34, 0x2e, 0x38, 0x33, 0x36, 0x20,
+	0x31, 0x30, 0x32, 0x39, 0x2e, 0x32, 0x20, 0x32, 0x32, 0x34, 0x2e, 0x38, 0x20, 0x31, 0x30, 0x33,
+	0x35, 0x2e, 0x34, 0x38, 0x20, 0x32, 0x32, 0x35, 0x20, 0x43, 0x20, 0x31, 0x30, 0x36, 0x35, 0x2e,
+	0x35, 0x32, 0x20, 0x32, 0x32, 0x36, 0x2e, 0x31, 0x37, 0x39, 0x20, 0x31, 0x30, 0x39, 0x34, 0x2e,
+	0x35, 0x31, 0x20, 0x32, 0x33, 0x36, 0x2e, 0x34, 0x30, 0x35, 0x20, 0x31, 0x31, 0x31, 0x38, 0x2e,
+	0x36, 0x35, 0x20, 0x32, 0x35, 0x34, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x31, 0x31, 0x33, 0x32,
+	0x2e, 0x32, 0x39, 0x20, 0x32, 0x36, 0x34, 0x2e, 0x33, 0x33, 0x33, 0x20, 0x31, 0x31, 0x34, 0x32,
+	0x2e, 0x37, 0x33, 0x20, 0x32, 0x37, 0x35, 0x2e, 0x33, 0x39, 0x36, 0x20, 0x31, 0x31, 0x35, 0x34,
+	0x2e, 0x37, 0x32, 0x20, 0x32, 0x38, 0x37, 0x2e, 0x31, 0x30, 0x38, 0x20, 0x43, 0x20, 0x31, 0x31,
+	0x37, 0x30, 0x2e, 0x34, 0x36, 0x20, 0x33, 0x30, 0x32, 0x2e, 0x33, 0x30, 0x37, 0x20, 0x31, 0x31,
+	0x38, 0x35, 0x2e, 0x39, 0x39, 0x20, 0x33, 0x31, 0x37, 0x2e, 0x37, 0x31, 0x39, 0x20, 0x31, 0x32,
+	0x30, 0x31, 0x2e, 0x33, 0x20, 0x33, 0x33, 0x33, 0x2e, 0x33, 0x34, 0x32, 0x20, 0x4c, 0x20, 0x31,
+	0x33, 0x32, 0x37, 0x2e, 0x39, 0x32, 0x20, 0x34, 0x35, 0x39, 0x2e, 0x37, 0x38, 0x36, 0x20, 0x4c,
+	0x20, 0x31, 0x35, 0x35, 0x37, 0x2e, 0x38, 0x31, 0x20, 0x36, 0x38, 0x39, 0x2e, 0x31, 0x38, 0x33,
+	0x20, 0x4c, 0x20, 0x31, 0x36, 0x35, 0x35, 0x2e, 0x30, 0x32, 0x20, 0x37, 0x38, 0x36, 0x2e, 0x34,
+	0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x36, 0x39, 0x38, 0x2e, 0x35, 0x32, 0x20, 0x38, 0x33, 0x30,
+	0x2e, 0x32, 0x33, 0x33, 0x20, 0x31, 0x37, 0x34, 0x34, 0x2e, 0x31, 0x39, 0x20, 0x38, 0x36, 0x34,
+	0x2e, 0x34, 0x33, 0x34, 0x20, 0x31, 0x37, 0x34, 0x31, 0x2e, 0x33, 0x35, 0x20, 0x39, 0x33, 0x32,
+	0x2e, 0x37, 0x35, 0x39, 0x20, 0x43, 0x20, 0x31, 0x37, 0x33, 0x39, 0x2e, 0x39, 0x31, 0x20, 0x39,
+	0x36, 0x36, 0x2e, 0x31, 0x37, 0x39, 0x20, 0x31, 0x37, 0x32, 0x35, 0x2e, 0x32, 0x33, 0x20, 0x39,
+	0x39, 0x37, 0x2e, 0x36, 0x35, 0x34, 0x20, 0x31, 0x37, 0x30, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x31,
+	0x30, 0x32, 0x30, 0x2e, 0x32, 0x33, 0x20, 0x43, 0x20, 0x31, 0x36, 0x37, 0x35, 0x2e, 0x33, 0x31,
+	0x20, 0x31, 0x30, 0x34, 0x33, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x36, 0x34, 0x31, 0x2e, 0x37, 0x38,
+	0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x36, 0x30, 0x37, 0x2e, 0x34, 0x39,
+	0x20, 0x31, 0x30, 0x35, 0x33, 0x2e, 0x39, 0x37, 0x20, 0x43, 0x20, 0x31, 0x35, 0x35, 0x30, 0x2e,
+	0x39, 0x33, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x35, 0x32, 0x34, 0x2e,
+	0x35, 0x34, 0x20, 0x31, 0x30, 0x31, 0x37, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x34, 0x38, 0x38, 0x2e,
+	0x33, 0x32, 0x20, 0x39, 0x38, 0x30, 0x2e, 0x39, 0x35, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x39,
+	0x36, 0x2e, 0x33, 0x34, 0x20, 0x38, 0x38, 0x36, 0x2e, 0x39, 0x35, 0x34, 0x20, 0x4c, 0x20, 0x31,
+	0x32, 0x36, 0x39, 0x2e, 0x36, 0x33, 0x20, 0x37, 0x35, 0x37, 0x2e, 0x31, 0x37, 0x38, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x33, 0x34, 0x2e, 0x31, 0x37, 0x20, 0x37, 0x32, 0x31, 0x2e, 0x34, 0x36, 0x37,
+	0x20, 0x31, 0x31, 0x39, 0x32, 0x2e, 0x31, 0x36, 0x20, 0x36, 0x38, 0x30, 0x2e, 0x37, 0x35, 0x20,
+	0x31, 0x31, 0x35, 0x38, 0x2e, 0x38, 0x32, 0x20, 0x36, 0x34, 0x33, 0x2e, 0x38, 0x33, 0x36, 0x20,
+	0x43, 0x20, 0x31, 0x31, 0x33, 0x37, 0x2e, 0x30, 0x35, 0x20, 0x39, 0x38, 0x31, 0x2e, 0x38, 0x33,
+	0x20, 0x31, 0x32, 0x38, 0x31, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x33, 0x32, 0x36, 0x2e, 0x39, 0x20,
+	0x31, 0x35, 0x39, 0x31, 0x2e, 0x34, 0x36, 0x20, 0x31, 0x34, 0x38, 0x34, 0x2e, 0x35, 0x34, 0x20,
+	0x43, 0x20, 0x31, 0x36, 0x34, 0x36, 0x2e, 0x34, 0x33, 0x20, 0x31, 0x35, 0x31, 0x32, 0x2e, 0x34,
+	0x35, 0x20, 0x31, 0x37, 0x30, 0x33, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x35, 0x32, 0x31, 0x2e, 0x33,
+	0x36, 0x20, 0x31, 0x37, 0x33, 0x30, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x35, 0x38, 0x33, 0x2e, 0x30,
+	0x34, 0x20, 0x43, 0x20, 0x31, 0x37, 0x37, 0x39, 0x2e, 0x32, 0x32, 0x20, 0x31, 0x36, 0x39, 0x31,
+	0x2e, 0x34, 0x33, 0x20, 0x31, 0x36, 0x36, 0x36, 0x2e, 0x34, 0x33, 0x20, 0x31, 0x37, 0x39, 0x35,
+	0x2e, 0x38, 0x39, 0x20, 0x31, 0x35, 0x36, 0x30, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x37, 0x35, 0x31,
+	0x2e, 0x30, 0x33, 0x20, 0x43, 0x20, 0x31, 0x33, 0x32, 0x34, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x36,
+	0x36, 0x30, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x31, 0x33, 0x36, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x34,
+	0x39, 0x30, 0x2e, 0x37, 0x31, 0x20, 0x31, 0x30, 0x33, 0x32, 0x2e, 0x39, 0x39, 0x20, 0x31, 0x32,
+	0x35, 0x39, 0x2e, 0x35, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x32, 0x36, 0x2e, 0x36, 0x33, 0x20,
+	0x31, 0x32, 0x34, 0x34, 0x2e, 0x36, 0x35, 0x20, 0x43, 0x20, 0x39, 0x37, 0x39, 0x2e, 0x36, 0x37,
+	0x37, 0x20, 0x31, 0x33, 0x34, 0x37, 0x2e, 0x30, 0x32, 0x20, 0x39, 0x33, 0x33, 0x2e, 0x30, 0x33,
+	0x20, 0x31, 0x34, 0x32, 0x34, 0x2e, 0x32, 0x39, 0x20, 0x38, 0x35, 0x36, 0x2e, 0x33, 0x30, 0x38,
+	0x20, 0x31, 0x35, 0x30, 0x37, 0x2e, 0x30, 0x38, 0x20, 0x43, 0x20, 0x37, 0x36, 0x34, 0x2e, 0x32,
+	0x34, 0x34, 0x20, 0x31, 0x36, 0x30, 0x35, 0x2e, 0x36, 0x33, 0x20, 0x36, 0x35, 0x32, 0x2e, 0x32,
+	0x39, 0x20, 0x31, 0x36, 0x38, 0x33, 0x2e, 0x35, 0x20, 0x35, 0x32, 0x37, 0x2e, 0x38, 0x36, 0x34,
+	0x20, 0x31, 0x37, 0x33, 0x35, 0x2e, 0x35, 0x31, 0x20, 0x43, 0x20, 0x34, 0x39, 0x38, 0x2e, 0x33,
+	0x38, 0x35, 0x20, 0x31, 0x37, 0x34, 0x37, 0x2e, 0x38, 0x34, 0x20, 0x34, 0x37, 0x35, 0x2e, 0x38,
+	0x35, 0x39, 0x20, 0x31, 0x37, 0x35, 0x39, 0x2e, 0x39, 0x20, 0x34, 0x34, 0x32, 0x2e, 0x35, 0x37,
+	0x36, 0x20, 0x31, 0x37, 0x36, 0x31, 0x2e, 0x31, 0x39, 0x20, 0x43, 0x20, 0x33, 0x32, 0x34, 0x2e,
+	0x33, 0x34, 0x36, 0x20, 0x31, 0x37, 0x36, 0x35, 0x2e, 0x38, 0x35, 0x20, 0x32, 0x36, 0x33, 0x2e,
+	0x30, 0x31, 0x38, 0x20, 0x31, 0x36, 0x32, 0x30, 0x2e, 0x31, 0x36, 0x20, 0x33, 0x35, 0x32, 0x2e,
+	0x35, 0x33, 0x34, 0x20, 0x31, 0x35, 0x34, 0x30, 0x2e, 0x39, 0x31, 0x20, 0x43, 0x20, 0x33, 0x38,
+	0x31, 0x2e, 0x35, 0x33, 0x32, 0x20, 0x31, 0x35, 0x31, 0x35, 0x2e, 0x32, 0x34, 0x20, 0x34, 0x32,
+	0x35, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x35, 0x30, 0x33, 0x2e, 0x31, 0x39, 0x20, 0x34, 0x36, 0x30,
+	0x2e, 0x34, 0x31, 0x32, 0x20, 0x31, 0x34, 0x38, 0x35, 0x2e, 0x35, 0x38, 0x20, 0x43, 0x20, 0x35,
+	0x33, 0x36, 0x2e, 0x30, 0x39, 0x33, 0x20, 0x31, 0x34, 0x34, 0x36, 0x2e, 0x35, 0x36, 0x20, 0x36,
+	0x30, 0x34, 0x2e, 0x35, 0x38, 0x38, 0x20, 0x31, 0x33, 0x39, 0x34, 0x2e, 0x39, 0x35, 0x20, 0x36,
+	0x36, 0x32, 0x2e, 0x39, 0x36, 0x39, 0x20, 0x31, 0x33, 0x33, 0x32, 0x2e, 0x39, 0x37, 0x20, 0x43,
+	0x20, 0x38, 0x30, 0x36, 0x2e, 0x38, 0x36, 0x32, 0x20, 0x31, 0x31, 0x38, 0x31, 0x2e, 0x36, 0x39,
+	0x20, 0x38, 0x37, 0x38, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x39, 0x38, 0x33, 0x2e, 0x31, 0x31, 0x37,
+	0x20, 0x38, 0x39, 0x31, 0x2e, 0x30, 0x37, 0x37, 0x20, 0x37, 0x37, 0x36, 0x2e, 0x38, 0x39, 0x34,
+	0x20, 0x43, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x37, 0x32, 0x39, 0x20, 0x37, 0x33, 0x33, 0x2e, 0x33,
+	0x30, 0x38, 0x20, 0x38, 0x39, 0x33, 0x2e, 0x31, 0x37, 0x31, 0x20, 0x36, 0x39, 0x31, 0x2e, 0x30,
+	0x39, 0x36, 0x20, 0x38, 0x39, 0x32, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x36, 0x34, 0x37, 0x2e, 0x35,
+	0x31, 0x37, 0x20, 0x43, 0x20, 0x38, 0x36, 0x33, 0x2e, 0x31, 0x39, 0x37, 0x20, 0x36, 0x37, 0x37,
+	0x2e, 0x38, 0x32, 0x20, 0x38, 0x33, 0x33, 0x2e, 0x35, 0x38, 0x35, 0x20, 0x37, 0x30, 0x35, 0x2e,
+	0x39, 0x36, 0x34, 0x20, 0x38, 0x30, 0x34, 0x2e, 0x32, 0x31, 0x39, 0x20, 0x37, 0x33, 0x35, 0x2e,
+	0x35, 0x37, 0x39, 0x20, 0x4c, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x36, 0x36, 0x35, 0x20, 0x39, 0x31,
+	0x30, 0x2e, 0x34, 0x35, 0x33, 0x20, 0x4c, 0x20, 0x35, 0x34, 0x39, 0x2e, 0x30, 0x33, 0x33, 0x20,
+	0x39, 0x39, 0x32, 0x2e, 0x30, 0x36, 0x34, 0x20, 0x43, 0x20, 0x35, 0x31, 0x36, 0x2e, 0x37, 0x36,
+	0x33, 0x20, 0x31, 0x30, 0x32, 0x33, 0x2e, 0x37, 0x36, 0x20, 0x34, 0x39, 0x38, 0x2e, 0x31, 0x31,
+	0x32, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e, 0x31, 0x31, 0x20, 0x34, 0x34, 0x39, 0x2e, 0x39, 0x34,
+	0x20, 0x31, 0x30, 0x35, 0x32, 0x2e, 0x39, 0x37, 0x20, 0x43, 0x20, 0x34, 0x31, 0x37, 0x2e, 0x30,
+	0x38, 0x37, 0x20, 0x31, 0x30, 0x35, 0x36, 0x2e, 0x36, 0x35, 0x20, 0x33, 0x38, 0x34, 0x2e, 0x31,
+	0x32, 0x38, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e, 0x30, 0x33, 0x20, 0x33, 0x35, 0x38, 0x2e, 0x34,
+	0x30, 0x38, 0x20, 0x31, 0x30, 0x32, 0x36, 0x2e, 0x32, 0x36, 0x20, 0x43, 0x20, 0x33, 0x33, 0x32,
+	0x2e, 0x31, 0x35, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x36, 0x35, 0x20, 0x33, 0x31, 0x35, 0x2e,
+	0x34, 0x33, 0x32, 0x20, 0x39, 0x37, 0x35, 0x2e, 0x32, 0x31, 0x38, 0x20, 0x33, 0x31, 0x32, 0x2e,
+	0x31, 0x31, 0x34, 0x20, 0x39, 0x34, 0x32, 0x2e, 0x30, 0x30, 0x31, 0x20, 0x43, 0x20, 0x33, 0x30,
+	0x35, 0x2e, 0x36, 0x38, 0x39, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x36, 0x35, 0x32, 0x20, 0x33, 0x33,
+	0x36, 0x2e, 0x30, 0x39, 0x33, 0x20, 0x38, 0x35, 0x32, 0x2e, 0x38, 0x36, 0x20, 0x33, 0x37, 0x36,
+	0x2e, 0x37, 0x39, 0x32, 0x20, 0x38, 0x31, 0x31, 0x2e, 0x37, 0x38, 0x38, 0x20, 0x43, 0x20, 0x33,
+	0x39, 0x36, 0x2e, 0x33, 0x34, 0x35, 0x20, 0x37, 0x39, 0x31, 0x2e, 0x39, 0x33, 0x31, 0x20, 0x34,
+	0x31, 0x36, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x37, 0x37, 0x32, 0x2e, 0x31, 0x39, 0x39, 0x20, 0x34,
+	0x33, 0x35, 0x2e, 0x38, 0x32, 0x34, 0x20, 0x37, 0x35, 0x32, 0x2e, 0x35, 0x39, 0x20, 0x4c, 0x20,
+	0x36, 0x31, 0x34, 0x2e, 0x38, 0x32, 0x34, 0x20, 0x35, 0x37, 0x33, 0x2e, 0x38, 0x38, 0x32, 0x20,
+	0x4c, 0x20, 0x38, 0x33, 0x38, 0x2e, 0x34, 0x37, 0x20, 0x33, 0x34, 0x39, 0x2e, 0x35, 0x30, 0x35,
+	0x20, 0x43, 0x20, 0x38, 0x35, 0x35, 0x2e, 0x36, 0x31, 0x36, 0x20, 0x33, 0x33, 0x32, 0x2e, 0x36,
+	0x33, 0x32, 0x20, 0x38, 0x37, 0x32, 0x2e, 0x36, 0x32, 0x35, 0x20, 0x33, 0x31, 0x35, 0x2e, 0x36,
+	0x32, 0x33, 0x20, 0x38, 0x38, 0x39, 0x2e, 0x34, 0x39, 0x38, 0x20, 0x32, 0x39, 0x38, 0x2e, 0x34,
+	0x37, 0x38, 0x20, 0x43, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x33, 0x31, 0x39, 0x20, 0x32, 0x38, 0x36,
+	0x2e, 0x34, 0x32, 0x38, 0x20, 0x39, 0x31, 0x37, 0x2e, 0x33, 0x38, 0x20, 0x32, 0x36, 0x38, 0x2e,
+	0x39, 0x35, 0x32, 0x20, 0x39, 0x33, 0x30, 0x2e, 0x33, 0x39, 0x31, 0x20, 0x32, 0x35, 0x38, 0x2e,
+	0x39, 0x35, 0x35, 0x20, 0x43, 0x20, 0x39, 0x35, 0x34, 0x2e, 0x39, 0x39, 0x36, 0x20, 0x32, 0x33,
+	0x39, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39, 0x38, 0x34, 0x2e, 0x35, 0x34, 0x35, 0x20, 0x32, 0x32,
+	0x38, 0x2e, 0x32, 0x33, 0x31, 0x20, 0x31, 0x30, 0x31, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x32, 0x32,
+	0x35, 0x2e, 0x33, 0x39, 0x35, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67,
+	0x3e
+};
+
+static const unsigned char icon_client_white_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0xd2, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xcd, 0x52, 0x3d,
+	0x8f, 0x12, 0x51, 0x14, 0x3d, 0x6f, 0x80, 0x10, 0xc3, 0xc8, 0xec, 0xca, 0x6c, 0x22, 0x0f, 0x64,
+	0x3f, 0x94, 0xbc, 0x50, 0x0b, 0xfc, 0x00, 0xf7, 0x27, 0x18, 0x94, 0xc4, 0xcf, 0xc6, 0x44, 0x0b,
+	0x12, 0x63, 0x65, 0x49, 0x67, 0x81, 0x5b, 0x6d, 0xc3, 0x26, 0xd8, 0xfa, 0x17, 0x58, 0xac, 0x48,
+	0xd4, 0x6a, 0x37, 0xd0, 0x30, 0x10, 0xc6, 0x4d, 0xa6, 0x50, 0x67, 0x86, 0x0e, 0x36, 0xf3, 0x26,
+	0x99, 0x55, 0xde, 0x58, 0x6c, 0x86, 0x30, 0x3b, 0xb1, 0xd6, 0x5b, 0xdd, 0x77, 0xee, 0x3d, 0xe7,
+	0xdc, 0x9b, 0xfb, 0x80, 0x7f, 0x1d, 0xe4, 0x2a, 0x50, 0xab, 0xd5, 0x62, 0x8c, 0xb1, 0x37, 0xd9,
+	0x6c, 0xf6, 0x65, 0x2a, 0x95, 0xa2, 0x84, 0x10, 0x70, 0xce, 0x2d, 0xdb, 0xb6, 0x8f, 0x24, 0x49,
+	0x3a, 0x68, 0x36, 0x9b, 0xbf, 0xff, 0x2a, 0xd0, 0x68, 0x34, 0xb6, 0x18, 0x63, 0xa7, 0x8c, 0xb1,
+	0x82, 0x24, 0x49, 0x21, 0x61, 0xdf, 0xf7, 0x31, 0x9d, 0x4e, 0x7f, 0x0c, 0x87, 0xc3, 0x72, 0xa7,
+	0xd3, 0x99, 0x05, 0x78, 0x6c, 0xdd, 0xb9, 0x5c, 0x2e, 0x8f, 0x4a, 0xa5, 0xd2, 0x36, 0x21, 0x04,
+	0xa6, 0x69, 0xe1, 0xf8, 0xb8, 0x07, 0x4d, 0x1b, 0x43, 0x51, 0xd2, 0x50, 0x14, 0x05, 0xaa, 0xaa,
+	0xa6, 0x93, 0xc9, 0x64, 0xbd, 0x52, 0xa9, 0x1c, 0xf6, 0xfb, 0x7d, 0x01, 0x00, 0x2b, 0x1b, 0xc6,
+	0xd8, 0x6b, 0xc6, 0xd8, 0x36, 0x00, 0xcc, 0xe7, 0x0b, 0x74, 0xbb, 0x5d, 0x38, 0x9c, 0x83, 0xbb,
+	0x1c, 0xbd, 0xde, 0x27, 0xcc, 0x17, 0x0b, 0x00, 0x40, 0xb1, 0x58, 0xcc, 0x2f, 0x97, 0xcb, 0xb7,
+	0x01, 0x6f, 0x25, 0x40, 0x29, 0x7d, 0x45, 0xc8, 0xe5, 0x46, 0x9c, 0x3b, 0x88, 0xc5, 0xe3, 0x78,
+	0xf2, 0xf8, 0x11, 0xea, 0x0f, 0x1f, 0x00, 0xf0, 0x71, 0xf6, 0xed, 0xec, 0x72, 0x67, 0x42, 0x40,
+	0x29, 0x7d, 0x11, 0xf0, 0xe2, 0x41, 0x22, 0xcb, 0x32, 0x0d, 0xf2, 0x5c, 0x2e, 0x87, 0xe7, 0xcf,
+	0x9e, 0xc2, 0x30, 0x0c, 0x7c, 0xfe, 0xf2, 0x15, 0x00, 0xb0, 0x77, 0x7b, 0x0f, 0x6b, 0xbd, 0x37,
+	0x23, 0x13, 0x08, 0x21, 0x22, 0x17, 0x39, 0x39, 0x39, 0xc5, 0xaf, 0x8b, 0x0b, 0xdc, 0xdb, 0xdf,
+	0xc7, 0x8d, 0xcd, 0xcd, 0xab, 0xe5, 0xf0, 0x04, 0xae, 0xeb, 0x5a, 0x00, 0x76, 0xd7, 0x8b, 0xaa,
+	0xba, 0x05, 0x65, 0x63, 0x03, 0xbb, 0x3b, 0x3b, 0x21, 0x92, 0xe3, 0x38, 0x76, 0x64, 0x02, 0xdb,
+	0xb6, 0x8f, 0x84, 0x10, 0xa1, 0x46, 0x59, 0x4e, 0xe1, 0xba, 0x2c, 0x87, 0x30, 0xdf, 0xf7, 0x31,
+	0x9b, 0xcd, 0x3e, 0x44, 0x04, 0x26, 0x93, 0xc9, 0x7b, 0x5d, 0xd7, 0xbf, 0xaf, 0x37, 0x0b, 0x21,
+	0x20, 0x7c, 0x3f, 0x24, 0xa0, 0xeb, 0xba, 0x69, 0x9a, 0xe6, 0xbb, 0xe0, 0xbd, 0xfa, 0x07, 0xe3,
+	0xf1, 0xd8, 0xa7, 0x94, 0x7e, 0x4c, 0x24, 0x12, 0xf5, 0x4c, 0x26, 0x93, 0x26, 0x84, 0x20, 0x9f,
+	0xcf, 0xa3, 0x50, 0xb8, 0xb5, 0x72, 0xd6, 0x75, 0xdd, 0x1c, 0x8d, 0x46, 0x77, 0xdb, 0xed, 0xf6,
+	0x79, 0x44, 0x00, 0x00, 0x06, 0x83, 0x01, 0xaf, 0x56, 0xab, 0x87, 0x86, 0x61, 0x78, 0x9e, 0xe7,
+	0xdd, 0xf1, 0x3c, 0xef, 0x1a, 0xe7, 0x5c, 0x58, 0x96, 0xf5, 0x53, 0xd3, 0xb4, 0x03, 0xd7, 0x75,
+	0xef, 0xb7, 0x5a, 0xad, 0x73, 0xfc, 0x57, 0xf1, 0x07, 0x63, 0xa3, 0xb4, 0x5f, 0xf2, 0x8d, 0x88,
+	0xad, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_white_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39, 0x37, 0x2c, 0x39,
+	0x37, 0x2c, 0x39, 0x37, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x31, 0x36,
+	0x2e, 0x30, 0x37, 0x20, 0x32, 0x36, 0x32, 0x2e, 0x34, 0x39, 0x35, 0x20, 0x43, 0x20, 0x31, 0x34,
+	0x33, 0x37, 0x2e, 0x34, 0x35, 0x20, 0x32, 0x35, 0x37, 0x2e, 0x31, 0x33, 0x36, 0x20, 0x31, 0x37,
+	0x38, 0x33, 0x2e, 0x34, 0x20, 0x35, 0x39, 0x34, 0x2e, 0x33, 0x38, 0x37, 0x20, 0x31, 0x37, 0x38,
+	0x38, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x30, 0x31, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x43, 0x20, 0x31,
+	0x37, 0x39, 0x34, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x34, 0x33, 0x37, 0x2e, 0x31, 0x35, 0x20, 0x31,
+	0x34, 0x35, 0x36, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x37, 0x38, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x30,
+	0x33, 0x35, 0x2e, 0x35, 0x20, 0x31, 0x37, 0x38, 0x38, 0x2e, 0x34, 0x37, 0x20, 0x43, 0x20, 0x36,
+	0x31, 0x34, 0x2e, 0x31, 0x30, 0x38, 0x20, 0x31, 0x37, 0x39, 0x33, 0x2e, 0x38, 0x34, 0x20, 0x32,
+	0x36, 0x38, 0x2e, 0x31, 0x35, 0x20, 0x31, 0x34, 0x35, 0x36, 0x2e, 0x35, 0x39, 0x20, 0x32, 0x36,
+	0x32, 0x2e, 0x37, 0x38, 0x35, 0x20, 0x31, 0x30, 0x33, 0x35, 0x2e, 0x32, 0x20, 0x43, 0x20, 0x32,
+	0x35, 0x37, 0x2e, 0x34, 0x32, 0x20, 0x36, 0x31, 0x33, 0x2e, 0x38, 0x30, 0x37, 0x20, 0x35, 0x39,
+	0x34, 0x2e, 0x36, 0x37, 0x39, 0x20, 0x32, 0x36, 0x37, 0x2e, 0x38, 0x35, 0x34, 0x20, 0x31, 0x30,
+	0x31, 0x36, 0x2e, 0x30, 0x37, 0x20, 0x32, 0x36, 0x32, 0x2e, 0x34, 0x39, 0x35, 0x20, 0x7a, 0x22,
+	0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f,
+	0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c,
+	0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x31, 0x38,
+	0x39, 0x2c, 0x31, 0x38, 0x39, 0x2c, 0x31, 0x38, 0x39, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x20, 0x39, 0x39, 0x38, 0x2e, 0x33, 0x35, 0x37, 0x20, 0x32, 0x39, 0x32, 0x2e, 0x33, 0x33, 0x31,
+	0x20, 0x43, 0x20, 0x31, 0x34, 0x30, 0x33, 0x2e, 0x32, 0x32, 0x20, 0x32, 0x37, 0x37, 0x2e, 0x30,
+	0x39, 0x20, 0x31, 0x37, 0x34, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x35, 0x39, 0x32, 0x2e, 0x38, 0x30,
+	0x33, 0x20, 0x31, 0x37, 0x35, 0x39, 0x2e, 0x33, 0x35, 0x20, 0x39, 0x39, 0x37, 0x2e, 0x36, 0x35,
+	0x37, 0x20, 0x43, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x34, 0x30, 0x32,
+	0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x35, 0x39, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x37, 0x34, 0x33,
+	0x2e, 0x33, 0x34, 0x20, 0x31, 0x30, 0x35, 0x34, 0x2e, 0x35, 0x20, 0x31, 0x37, 0x35, 0x39, 0x2e,
+	0x30, 0x39, 0x20, 0x43, 0x20, 0x36, 0x34, 0x39, 0x2e, 0x32, 0x39, 0x36, 0x20, 0x31, 0x37, 0x37,
+	0x34, 0x2e, 0x38, 0x36, 0x20, 0x33, 0x30, 0x38, 0x2e, 0x30, 0x39, 0x34, 0x20, 0x31, 0x34, 0x35,
+	0x39, 0x2e, 0x30, 0x32, 0x20, 0x32, 0x39, 0x32, 0x2e, 0x35, 0x38, 0x32, 0x20, 0x31, 0x30, 0x35,
+	0x33, 0x2e, 0x38, 0x20, 0x43, 0x20, 0x32, 0x37, 0x37, 0x2e, 0x30, 0x37, 0x31, 0x20, 0x36, 0x34,
+	0x38, 0x2e, 0x35, 0x38, 0x36, 0x20, 0x35, 0x39, 0x33, 0x2e, 0x31, 0x33, 0x20, 0x33, 0x30, 0x37,
+	0x2e, 0x35, 0x38, 0x35, 0x20, 0x39, 0x39, 0x38, 0x2e, 0x33, 0x35, 0x37, 0x20, 0x32, 0x39, 0x32,
+	0x2e, 0x33, 0x33, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x72, 0x67, 0x62, 0x28, 0x35, 0x37, 0x2c, 0x35, 0x38, 0x2c, 0x36, 0x31, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x30, 0x30, 0x2e, 0x35, 0x31, 0x20, 0x35, 0x35, 0x30,
+	0x2e, 0x34, 0x31, 0x31, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x36, 0x2e, 0x32, 0x33, 0x20, 0x35,
+	0x34, 0x39, 0x2e, 0x36, 0x36, 0x33, 0x20, 0x31, 0x30, 0x32, 0x30, 0x2e, 0x35, 0x36, 0x20, 0x35,
+	0x34, 0x39, 0x2e, 0x34, 0x39, 0x37, 0x20, 0x31, 0x30, 0x32, 0x36, 0x2e, 0x35, 0x34, 0x20, 0x35,
+	0x34, 0x39, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x39, 0x2e, 0x36, 0x31,
+	0x20, 0x35, 0x34, 0x39, 0x2e, 0x36, 0x30, 0x39, 0x20, 0x31, 0x31, 0x33, 0x31, 0x2e, 0x37, 0x38,
+	0x20, 0x35, 0x36, 0x33, 0x2e, 0x32, 0x30, 0x31, 0x20, 0x31, 0x31, 0x37, 0x38, 0x2e, 0x31, 0x36,
+	0x20, 0x35, 0x38, 0x39, 0x2e, 0x30, 0x30, 0x32, 0x20, 0x43, 0x20, 0x31, 0x33, 0x30, 0x37, 0x2e,
+	0x34, 0x37, 0x20, 0x36, 0x36, 0x31, 0x2e, 0x35, 0x32, 0x32, 0x20, 0x31, 0x33, 0x37, 0x32, 0x2e,
+	0x39, 0x38, 0x20, 0x38, 0x31, 0x33, 0x2e, 0x32, 0x30, 0x39, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e,
+	0x38, 0x33, 0x20, 0x39, 0x35, 0x31, 0x2e, 0x30, 0x37, 0x39, 0x20, 0x43, 0x20, 0x31, 0x32, 0x36,
+	0x34, 0x2e, 0x38, 0x39, 0x20, 0x31, 0x30, 0x33, 0x31, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x31, 0x39,
+	0x39, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x30, 0x38, 0x33, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x31, 0x31,
+	0x32, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x31, 0x30, 0x37, 0x2e, 0x32, 0x33, 0x20, 0x43, 0x20, 0x31,
+	0x31, 0x31, 0x32, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x31, 0x36, 0x36, 0x20, 0x31, 0x31, 0x32, 0x34,
+	0x2e, 0x31, 0x33, 0x20, 0x31, 0x32, 0x33, 0x32, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x30, 0x35, 0x36,
+	0x2e, 0x39, 0x37, 0x20, 0x31, 0x32, 0x35, 0x38, 0x2e, 0x39, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30,
+	0x33, 0x36, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x32, 0x36, 0x37, 0x2e, 0x33, 0x31, 0x20, 0x31, 0x30,
+	0x31, 0x32, 0x2e, 0x39, 0x39, 0x20, 0x31, 0x32, 0x36, 0x36, 0x2e, 0x38, 0x35, 0x20, 0x39, 0x39,
+	0x32, 0x2e, 0x36, 0x31, 0x33, 0x20, 0x31, 0x32, 0x35, 0x37, 0x2e, 0x36, 0x35, 0x20, 0x43, 0x20,
+	0x39, 0x33, 0x32, 0x2e, 0x30, 0x32, 0x33, 0x20, 0x31, 0x32, 0x33, 0x31, 0x2e, 0x30, 0x32, 0x20,
+	0x39, 0x33, 0x39, 0x2e, 0x35, 0x34, 0x31, 0x20, 0x31, 0x31, 0x37, 0x31, 0x2e, 0x35, 0x39, 0x20,
+	0x39, 0x34, 0x30, 0x2e, 0x32, 0x33, 0x31, 0x20, 0x31, 0x31, 0x31, 0x36, 0x2e, 0x32, 0x32, 0x20,
+	0x43, 0x20, 0x39, 0x34, 0x30, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x30, 0x38, 0x31, 0x2e, 0x30, 0x33,
+	0x20, 0x39, 0x33, 0x34, 0x2e, 0x38, 0x36, 0x31, 0x20, 0x31, 0x30, 0x34, 0x32, 0x2e, 0x31, 0x32,
+	0x20, 0x39, 0x34, 0x39, 0x2e, 0x31, 0x34, 0x33, 0x20, 0x31, 0x30, 0x30, 0x39, 0x2e, 0x33, 0x37,
+	0x20, 0x43, 0x20, 0x39, 0x36, 0x32, 0x2e, 0x32, 0x38, 0x32, 0x20, 0x39, 0x38, 0x32, 0x2e, 0x33,
+	0x38, 0x35, 0x20, 0x39, 0x38, 0x38, 0x2e, 0x37, 0x36, 0x34, 0x20, 0x39, 0x36, 0x33, 0x2e, 0x32,
+	0x36, 0x32, 0x20, 0x31, 0x30, 0x31, 0x38, 0x2e, 0x34, 0x34, 0x20, 0x39, 0x35, 0x38, 0x2e, 0x37,
+	0x37, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x32, 0x37, 0x2e, 0x36, 0x38, 0x20, 0x39, 0x35, 0x37,
+	0x2e, 0x33, 0x37, 0x36, 0x20, 0x31, 0x30, 0x33, 0x38, 0x2e, 0x30, 0x37, 0x20, 0x39, 0x35, 0x37,
+	0x2e, 0x33, 0x38, 0x37, 0x20, 0x31, 0x30, 0x34, 0x37, 0x2e, 0x34, 0x37, 0x20, 0x39, 0x35, 0x36,
+	0x2e, 0x35, 0x37, 0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x38, 0x2e, 0x35, 0x20, 0x39, 0x35,
+	0x33, 0x2e, 0x36, 0x33, 0x37, 0x20, 0x31, 0x31, 0x30, 0x37, 0x2e, 0x31, 0x20, 0x39, 0x33, 0x38,
+	0x2e, 0x35, 0x31, 0x31, 0x20, 0x31, 0x31, 0x32, 0x36, 0x2e, 0x39, 0x39, 0x20, 0x39, 0x31, 0x34,
+	0x2e, 0x35, 0x31, 0x37, 0x20, 0x43, 0x20, 0x31, 0x31, 0x34, 0x38, 0x2e, 0x30, 0x39, 0x20, 0x38,
+	0x38, 0x39, 0x2e, 0x33, 0x39, 0x32, 0x20, 0x31, 0x31, 0x35, 0x36, 0x2e, 0x31, 0x35, 0x20, 0x38,
+	0x35, 0x39, 0x2e, 0x32, 0x39, 0x33, 0x20, 0x31, 0x31, 0x35, 0x32, 0x2e, 0x39, 0x36, 0x20, 0x38,
+	0x32, 0x36, 0x2e, 0x38, 0x34, 0x34, 0x20, 0x43, 0x20, 0x31, 0x31, 0x34, 0x39, 0x2e, 0x35, 0x20,
+	0x37, 0x39, 0x33, 0x2e, 0x39, 0x32, 0x36, 0x20, 0x31, 0x31, 0x33, 0x33, 0x2e, 0x30, 0x31, 0x20,
+	0x37, 0x36, 0x33, 0x2e, 0x37, 0x36, 0x20, 0x31, 0x31, 0x30, 0x37, 0x2e, 0x31, 0x38, 0x20, 0x37,
+	0x34, 0x33, 0x2e, 0x30, 0x37, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x37, 0x39, 0x2e, 0x35, 0x39,
+	0x20, 0x37, 0x32, 0x30, 0x2e, 0x36, 0x30, 0x34, 0x20, 0x31, 0x30, 0x34, 0x34, 0x2e, 0x31, 0x38,
+	0x20, 0x37, 0x31, 0x30, 0x2e, 0x30, 0x35, 0x39, 0x20, 0x31, 0x30, 0x30, 0x38, 0x2e, 0x38, 0x20,
+	0x37, 0x31, 0x33, 0x2e, 0x37, 0x37, 0x31, 0x20, 0x43, 0x20, 0x39, 0x36, 0x32, 0x2e, 0x33, 0x31,
+	0x33, 0x20, 0x37, 0x31, 0x38, 0x2e, 0x39, 0x36, 0x32, 0x20, 0x39, 0x32, 0x32, 0x2e, 0x32, 0x39,
+	0x34, 0x20, 0x37, 0x34, 0x38, 0x2e, 0x39, 0x34, 0x31, 0x20, 0x39, 0x30, 0x34, 0x2e, 0x32, 0x34,
+	0x36, 0x20, 0x37, 0x39, 0x32, 0x2e, 0x30, 0x39, 0x32, 0x20, 0x43, 0x20, 0x38, 0x39, 0x35, 0x2e,
+	0x32, 0x39, 0x31, 0x20, 0x38, 0x31, 0x33, 0x2e, 0x39, 0x33, 0x37, 0x20, 0x38, 0x39, 0x34, 0x2e,
+	0x31, 0x33, 0x35, 0x20, 0x38, 0x32, 0x39, 0x2e, 0x35, 0x36, 0x36, 0x20, 0x38, 0x37, 0x38, 0x2e,
+	0x34, 0x33, 0x32, 0x20, 0x38, 0x34, 0x39, 0x2e, 0x31, 0x35, 0x39, 0x20, 0x43, 0x20, 0x38, 0x36,
+	0x33, 0x2e, 0x34, 0x33, 0x32, 0x20, 0x38, 0x36, 0x38, 0x2e, 0x31, 0x31, 0x35, 0x20, 0x38, 0x34,
+	0x31, 0x2e, 0x33, 0x37, 0x36, 0x20, 0x38, 0x38, 0x30, 0x2e, 0x31, 0x36, 0x35, 0x20, 0x38, 0x31,
+	0x37, 0x2e, 0x33, 0x32, 0x31, 0x20, 0x38, 0x38, 0x32, 0x2e, 0x35, 0x34, 0x36, 0x20, 0x43, 0x20,
+	0x37, 0x36, 0x33, 0x2e, 0x32, 0x32, 0x37, 0x20, 0x38, 0x38, 0x37, 0x2e, 0x38, 0x35, 0x34, 0x20,
+	0x37, 0x31, 0x35, 0x2e, 0x30, 0x36, 0x31, 0x20, 0x38, 0x33, 0x39, 0x2e, 0x31, 0x36, 0x39, 0x20,
+	0x37, 0x32, 0x34, 0x2e, 0x31, 0x37, 0x31, 0x20, 0x37, 0x38, 0x34, 0x2e, 0x39, 0x37, 0x36, 0x20,
+	0x43, 0x20, 0x37, 0x33, 0x31, 0x2e, 0x38, 0x37, 0x38, 0x20, 0x37, 0x33, 0x39, 0x2e, 0x31, 0x32,
+	0x39, 0x20, 0x37, 0x35, 0x39, 0x2e, 0x31, 0x31, 0x36, 0x20, 0x36, 0x39, 0x30, 0x2e, 0x34, 0x32,
+	0x35, 0x20, 0x37, 0x38, 0x39, 0x2e, 0x35, 0x37, 0x39, 0x20, 0x36, 0x35, 0x35, 0x2e, 0x31, 0x37,
+	0x36, 0x20, 0x43, 0x20, 0x38, 0x34, 0x32, 0x2e, 0x34, 0x39, 0x31, 0x20, 0x35, 0x39, 0x33, 0x2e,
+	0x39, 0x35, 0x20, 0x39, 0x32, 0x30, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x35, 0x35, 0x36, 0x2e, 0x35,
+	0x32, 0x31, 0x20, 0x31, 0x30, 0x30, 0x30, 0x2e, 0x35, 0x31, 0x20, 0x35, 0x35, 0x30, 0x2e, 0x34,
+	0x31, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61,
+	0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72,
+	0x67, 0x62, 0x28, 0x39, 0x37, 0x2c, 0x39, 0x37, 0x2c, 0x39, 0x37, 0x29, 0x22, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x20, 0x31, 0x30, 0x31, 0x38, 0x2e, 0x37, 0x32, 0x20, 0x35, 0x37, 0x38, 0x2e, 0x34,
+	0x36, 0x31, 0x20, 0x43, 0x20, 0x31, 0x30, 0x38, 0x30, 0x2e, 0x38, 0x38, 0x20, 0x35, 0x37, 0x37,
+	0x2e, 0x30, 0x32, 0x34, 0x20, 0x31, 0x31, 0x34, 0x31, 0x2e, 0x38, 0x34, 0x20, 0x35, 0x39, 0x35,
+	0x2e, 0x36, 0x37, 0x33, 0x20, 0x31, 0x31, 0x39, 0x32, 0x2e, 0x35, 0x35, 0x20, 0x36, 0x33, 0x31,
+	0x2e, 0x36, 0x34, 0x20, 0x43, 0x20, 0x31, 0x32, 0x34, 0x36, 0x2e, 0x30, 0x33, 0x20, 0x36, 0x36,
+	0x39, 0x2e, 0x39, 0x34, 0x32, 0x20, 0x31, 0x32, 0x38, 0x39, 0x2e, 0x33, 0x38, 0x20, 0x37, 0x33,
+	0x32, 0x2e, 0x34, 0x35, 0x39, 0x20, 0x31, 0x32, 0x39, 0x39, 0x2e, 0x33, 0x33, 0x20, 0x37, 0x39,
+	0x37, 0x2e, 0x38, 0x39, 0x33, 0x20, 0x43, 0x20, 0x31, 0x33, 0x32, 0x30, 0x2e, 0x33, 0x39, 0x20,
+	0x39, 0x33, 0x36, 0x2e, 0x33, 0x39, 0x33, 0x20, 0x31, 0x32, 0x31, 0x36, 0x2e, 0x39, 0x39, 0x20,
+	0x31, 0x30, 0x36, 0x31, 0x2e, 0x39, 0x36, 0x20, 0x31, 0x30, 0x38, 0x32, 0x2e, 0x36, 0x37, 0x20,
+	0x31, 0x30, 0x38, 0x33, 0x2e, 0x37, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x38, 0x32, 0x2e, 0x39,
+	0x37, 0x20, 0x31, 0x31, 0x34, 0x34, 0x2e, 0x32, 0x35, 0x20, 0x43, 0x20, 0x31, 0x30, 0x38, 0x33,
+	0x2e, 0x30, 0x33, 0x20, 0x31, 0x31, 0x35, 0x37, 0x2e, 0x36, 0x36, 0x20, 0x31, 0x30, 0x38, 0x33,
+	0x2e, 0x38, 0x39, 0x20, 0x31, 0x31, 0x37, 0x39, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x30, 0x38, 0x31,
+	0x2e, 0x30, 0x37, 0x20, 0x31, 0x31, 0x39, 0x31, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x30,
+	0x37, 0x39, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x32, 0x30, 0x30, 0x2e, 0x34, 0x32, 0x20, 0x31, 0x30,
+	0x37, 0x34, 0x2e, 0x38, 0x33, 0x20, 0x31, 0x32, 0x30, 0x38, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x30,
+	0x36, 0x38, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x32, 0x31, 0x35, 0x2e, 0x36, 0x37, 0x20, 0x43, 0x20,
+	0x31, 0x30, 0x34, 0x37, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x32, 0x34, 0x30, 0x2e, 0x30, 0x34, 0x20,
+	0x31, 0x30, 0x31, 0x31, 0x2e, 0x39, 0x20, 0x31, 0x32, 0x34, 0x32, 0x2e, 0x34, 0x38, 0x20, 0x39,
+	0x38, 0x37, 0x2e, 0x38, 0x37, 0x20, 0x31, 0x32, 0x32, 0x30, 0x2e, 0x35, 0x33, 0x20, 0x43, 0x20,
+	0x39, 0x36, 0x31, 0x2e, 0x32, 0x38, 0x39, 0x20, 0x31, 0x31, 0x39, 0x36, 0x2e, 0x32, 0x35, 0x20,
+	0x39, 0x37, 0x31, 0x2e, 0x32, 0x34, 0x34, 0x20, 0x31, 0x31, 0x34, 0x33, 0x2e, 0x36, 0x35, 0x20,
+	0x39, 0x36, 0x39, 0x2e, 0x34, 0x33, 0x37, 0x20, 0x31, 0x31, 0x31, 0x30, 0x2e, 0x38, 0x34, 0x20,
+	0x43, 0x20, 0x39, 0x36, 0x38, 0x2e, 0x33, 0x37, 0x36, 0x20, 0x31, 0x30, 0x39, 0x31, 0x2e, 0x35,
+	0x37, 0x20, 0x39, 0x36, 0x37, 0x2e, 0x37, 0x37, 0x38, 0x20, 0x31, 0x30, 0x35, 0x31, 0x2e, 0x36,
+	0x39, 0x20, 0x39, 0x37, 0x31, 0x2e, 0x36, 0x39, 0x33, 0x20, 0x31, 0x30, 0x33, 0x34, 0x2e, 0x36,
+	0x20, 0x43, 0x20, 0x39, 0x37, 0x34, 0x2e, 0x31, 0x36, 0x35, 0x20, 0x31, 0x30, 0x32, 0x33, 0x2e,
+	0x34, 0x38, 0x20, 0x39, 0x37, 0x39, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x31, 0x30, 0x31, 0x33, 0x2e,
+	0x32, 0x32, 0x20, 0x39, 0x38, 0x37, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x30, 0x30, 0x34, 0x2e, 0x39,
+	0x32, 0x20, 0x43, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x33, 0x37, 0x20, 0x39, 0x39, 0x30, 0x2e,
+	0x32, 0x31, 0x31, 0x20, 0x31, 0x30, 0x31, 0x37, 0x2e, 0x38, 0x37, 0x20, 0x39, 0x38, 0x36, 0x2e,
+	0x32, 0x39, 0x36, 0x20, 0x31, 0x30, 0x33, 0x37, 0x2e, 0x32, 0x35, 0x20, 0x39, 0x38, 0x35, 0x2e,
+	0x39, 0x30, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x32, 0x32, 0x2e, 0x30, 0x36, 0x20, 0x39, 0x38,
+	0x36, 0x2e, 0x36, 0x31, 0x32, 0x20, 0x31, 0x31, 0x39, 0x30, 0x2e, 0x31, 0x38, 0x20, 0x39, 0x31,
+	0x32, 0x2e, 0x34, 0x36, 0x38, 0x20, 0x31, 0x31, 0x38, 0x32, 0x2e, 0x34, 0x36, 0x20, 0x38, 0x32,
+	0x37, 0x2e, 0x39, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x31, 0x37, 0x38, 0x2e, 0x33, 0x38, 0x20,
+	0x37, 0x38, 0x36, 0x2e, 0x33, 0x33, 0x37, 0x20, 0x31, 0x31, 0x35, 0x38, 0x2e, 0x30, 0x35, 0x20,
+	0x37, 0x34, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x31, 0x32, 0x35, 0x2e, 0x39, 0x20, 0x37, 0x32,
+	0x31, 0x2e, 0x32, 0x38, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x34, 0x34, 0x2e, 0x34, 0x39, 0x20,
+	0x36, 0x35, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x39, 0x32, 0x30, 0x2e, 0x39, 0x39, 0x38, 0x20,
+	0x36, 0x37, 0x38, 0x2e, 0x39, 0x35, 0x32, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x35, 0x33, 0x35, 0x20,
+	0x37, 0x37, 0x37, 0x2e, 0x39, 0x39, 0x37, 0x20, 0x43, 0x20, 0x38, 0x37, 0x30, 0x2e, 0x35, 0x37,
+	0x20, 0x37, 0x39, 0x36, 0x2e, 0x35, 0x37, 0x38, 0x20, 0x38, 0x36, 0x37, 0x2e, 0x38, 0x33, 0x39,
+	0x20, 0x38, 0x31, 0x36, 0x2e, 0x33, 0x30, 0x37, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x36, 0x33, 0x20,
+	0x38, 0x33, 0x32, 0x2e, 0x35, 0x37, 0x35, 0x20, 0x43, 0x20, 0x38, 0x33, 0x35, 0x2e, 0x35, 0x36,
+	0x33, 0x20, 0x38, 0x35, 0x36, 0x2e, 0x30, 0x35, 0x36, 0x20, 0x37, 0x39, 0x36, 0x2e, 0x32, 0x36,
+	0x32, 0x20, 0x38, 0x36, 0x30, 0x2e, 0x36, 0x36, 0x34, 0x20, 0x37, 0x37, 0x32, 0x2e, 0x38, 0x31,
+	0x35, 0x20, 0x38, 0x34, 0x31, 0x2e, 0x32, 0x37, 0x32, 0x20, 0x43, 0x20, 0x37, 0x33, 0x39, 0x2e,
+	0x33, 0x33, 0x38, 0x20, 0x38, 0x31, 0x31, 0x2e, 0x35, 0x39, 0x33, 0x20, 0x37, 0x35, 0x35, 0x2e,
+	0x35, 0x30, 0x39, 0x20, 0x37, 0x36, 0x38, 0x2e, 0x39, 0x38, 0x33, 0x20, 0x37, 0x37, 0x31, 0x2e,
+	0x35, 0x38, 0x20, 0x37, 0x33, 0x35, 0x2e, 0x30, 0x36, 0x39, 0x20, 0x43, 0x20, 0x38, 0x31, 0x37,
+	0x2e, 0x36, 0x30, 0x34, 0x20, 0x36, 0x33, 0x37, 0x2e, 0x39, 0x34, 0x35, 0x20, 0x39, 0x31, 0x32,
+	0x2e, 0x38, 0x32, 0x20, 0x35, 0x38, 0x32, 0x2e, 0x31, 0x35, 0x31, 0x20, 0x31, 0x30, 0x31, 0x38,
+	0x2e, 0x37, 0x32, 0x20, 0x35, 0x37, 0x38, 0x2e, 0x34, 0x36, 0x31, 0x20, 0x7a, 0x22, 0x2f, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x35, 0x37, 0x2c, 0x35,
+	0x38, 0x2c, 0x36, 0x31, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x31, 0x38,
+	0x2e, 0x30, 0x38, 0x20, 0x31, 0x33, 0x31, 0x36, 0x2e, 0x34, 0x37, 0x20, 0x43, 0x20, 0x31, 0x30,
+	0x36, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x33, 0x31, 0x31, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x31,
+	0x31, 0x34, 0x2e, 0x33, 0x31, 0x20, 0x31, 0x33, 0x34, 0x39, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x31,
+	0x31, 0x38, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x34, 0x30, 0x30, 0x2e, 0x38, 0x20, 0x43, 0x20, 0x31,
+	0x31, 0x32, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x34, 0x35, 0x31, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x30,
+	0x38, 0x35, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x34, 0x39, 0x37, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x30,
+	0x33, 0x34, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x35, 0x30, 0x31, 0x2e, 0x35, 0x38, 0x20, 0x43, 0x20,
+	0x39, 0x38, 0x33, 0x2e, 0x34, 0x31, 0x36, 0x20, 0x31, 0x35, 0x30, 0x36, 0x2e, 0x31, 0x34, 0x20,
+	0x39, 0x33, 0x38, 0x2e, 0x32, 0x38, 0x36, 0x20, 0x31, 0x34, 0x36, 0x38, 0x2e, 0x33, 0x38, 0x20,
+	0x39, 0x33, 0x33, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x34, 0x31, 0x37, 0x2e, 0x32, 0x36, 0x20, 0x43,
+	0x20, 0x39, 0x32, 0x39, 0x2e, 0x31, 0x39, 0x34, 0x20, 0x31, 0x33, 0x36, 0x36, 0x2e, 0x31, 0x34,
+	0x20, 0x39, 0x36, 0x36, 0x2e, 0x39, 0x35, 0x34, 0x20, 0x31, 0x33, 0x32, 0x31, 0x2e, 0x30, 0x31,
+	0x20, 0x31, 0x30, 0x31, 0x38, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x33, 0x31, 0x36, 0x2e, 0x34, 0x37,
+	0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65,
+	0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62,
+	0x28, 0x39, 0x37, 0x2c, 0x39, 0x37, 0x2c, 0x39, 0x37, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x20, 0x31, 0x30, 0x31, 0x38, 0x2e, 0x31, 0x37, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x39, 0x39,
+	0x20, 0x43, 0x20, 0x31, 0x30, 0x35, 0x33, 0x2e, 0x30, 0x37, 0x20, 0x31, 0x33, 0x34, 0x31, 0x2e,
+	0x35, 0x39, 0x20, 0x31, 0x30, 0x38, 0x34, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x33, 0x36, 0x36, 0x2e,
+	0x34, 0x31, 0x20, 0x31, 0x30, 0x38, 0x39, 0x2e, 0x31, 0x35, 0x20, 0x31, 0x34, 0x30, 0x31, 0x2e,
+	0x33, 0x34, 0x20, 0x43, 0x20, 0x31, 0x30, 0x39, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x34, 0x33, 0x36,
+	0x2e, 0x32, 0x36, 0x20, 0x31, 0x30, 0x36, 0x38, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x34, 0x36, 0x37,
+	0x2e, 0x39, 0x39, 0x20, 0x31, 0x30, 0x33, 0x33, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x34, 0x37, 0x32,
+	0x2e, 0x30, 0x38, 0x20, 0x43, 0x20, 0x39, 0x39, 0x38, 0x2e, 0x37, 0x36, 0x37, 0x20, 0x31, 0x34,
+	0x37, 0x36, 0x2e, 0x31, 0x34, 0x20, 0x39, 0x36, 0x37, 0x2e, 0x32, 0x38, 0x39, 0x20, 0x31, 0x34,
+	0x35, 0x31, 0x2e, 0x33, 0x37, 0x20, 0x39, 0x36, 0x33, 0x2e, 0x30, 0x37, 0x20, 0x31, 0x34, 0x31,
+	0x36, 0x2e, 0x36, 0x36, 0x20, 0x43, 0x20, 0x39, 0x35, 0x38, 0x2e, 0x38, 0x35, 0x31, 0x20, 0x31,
+	0x33, 0x38, 0x31, 0x2e, 0x39, 0x36, 0x20, 0x39, 0x38, 0x33, 0x2e, 0x34, 0x37, 0x39, 0x20, 0x31,
+	0x33, 0x35, 0x30, 0x2e, 0x33, 0x37, 0x20, 0x31, 0x30, 0x31, 0x38, 0x2e, 0x31, 0x37, 0x20, 0x31,
+	0x33, 0x34, 0x35, 0x2e, 0x39, 0x39, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76,
+	0x67, 0x3e
+};
+
+static const unsigned char icon_client_yellow_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x93, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x52, 0x3d,
+	0x2c, 0x03, 0x61, 0x18, 0x7e, 0x5a, 0x95, 0x4f, 0xe3, 0xef, 0x44, 0x2a, 0x69, 0xf4, 0x5a, 0x69,
+	0xb1, 0x37, 0x8d, 0x89, 0x49, 0x18, 0x9b, 0x48, 0x2a, 0x62, 0x24, 0x51, 0xd1, 0xa1, 0x11, 0x11,
+	0xb3, 0x48, 0x17, 0x89, 0x8d, 0x44, 0x43, 0x0d, 0x0c, 0x3a, 0x54, 0x90, 0x38, 0x03, 0x83, 0x1a,
+	0x0c, 0x12, 0x83, 0x8d, 0x08, 0x21, 0xce, 0xf5, 0xd0, 0x3f, 0x3d, 0x45, 0xda, 0x2b, 0xcd, 0x19,
+	0xb8, 0xa3, 0x7a, 0xd8, 0x78, 0x92, 0x2f, 0xf9, 0x9e, 0xf7, 0xef, 0x7b, 0xde, 0xf7, 0x7b, 0x81,
+	0xff, 0x86, 0x46, 0xc5, 0x56, 0x6a, 0xa9, 0x27, 0x5e, 0x67, 0x3b, 0xe5, 0xb1, 0xd2, 0xc4, 0x2c,
+	0x49, 0xc0, 0x65, 0x44, 0xe4, 0x36, 0x76, 0x84, 0x39, 0xf6, 0x5a, 0x9c, 0x01, 0x90, 0xfd, 0xa9,
+	0xa0, 0xb1, 0xcf, 0x65, 0xb8, 0x88, 0xee, 0xdb, 0xa5, 0xfc, 0x49, 0x4b, 0xc1, 0x49, 0x1c, 0xd8,
+	0x25, 0x77, 0x4f, 0x1d, 0x0b, 0xc0, 0xf4, 0x9d, 0x02, 0xd2, 0xef, 0x32, 0x1c, 0xcf, 0xfb, 0x1a,
+	0xac, 0x5a, 0xad, 0x7a, 0x75, 0x49, 0x02, 0x3c, 0xe3, 0xec, 0x55, 0x20, 0x14, 0x6b, 0x06, 0x20,
+	0x02, 0x40, 0x89, 0xec, 0xa4, 0x8d, 0x64, 0x78, 0x65, 0xda, 0xd6, 0x5b, 0xae, 0xff, 0x26, 0x1b,
+	0x80, 0x46, 0x03, 0xb4, 0x3a, 0x2a, 0xaa, 0xd7, 0xb6, 0x84, 0xcc, 0x5d, 0xfa, 0x65, 0x0f, 0x00,
+	0x94, 0xe8, 0xae, 0x4e, 0x6a, 0xa8, 0x96, 0xd2, 0x01, 0x00, 0xf8, 0x68, 0x0e, 0x91, 0xdb, 0x9c,
+	0x92, 0xc8, 0x47, 0x73, 0xe0, 0x6e, 0xde, 0x78, 0x4d, 0x95, 0x0e, 0xce, 0x0e, 0x6a, 0x50, 0xf6,
+	0x29, 0x05, 0xac, 0x26, 0x62, 0x96, 0xef, 0x41, 0x26, 0x89, 0xc5, 0xb5, 0x04, 0x3e, 0xf3, 0xa5,
+	0xf5, 0x0f, 0x6e, 0xa3, 0x89, 0x49, 0x6e, 0x5f, 0xa7, 0x36, 0x8f, 0xb1, 0x01, 0x63, 0x81, 0xf4,
+	0xaf, 0xfc, 0x1d, 0x52, 0x81, 0x82, 0x4b, 0x5e, 0x8c, 0xa8, 0x77, 0x5e, 0x8c, 0x73, 0x4e, 0xe4,
+	0x8b, 0x5a, 0x60, 0x76, 0x53, 0xf3, 0xa9, 0xf4, 0x8b, 0x12, 0xc4, 0x84, 0x05, 0x04, 0x42, 0x71,
+	0x04, 0x42, 0x71, 0xac, 0x6e, 0xa7, 0x14, 0x7b, 0xfa, 0x31, 0x8f, 0xcd, 0xb0, 0xb0, 0x50, 0x24,
+	0x1b, 0x00, 0x71, 0xf7, 0xd4, 0x9d, 0xfa, 0x27, 0x2c, 0x66, 0x8d, 0xda, 0x7a, 0xbd, 0xc3, 0xeb,
+	0x63, 0xf9, 0xd9, 0xe5, 0x58, 0x13, 0x80, 0x0c, 0xf0, 0xe9, 0x1b, 0x01, 0xe4, 0x0f, 0x8f, 0x9e,
+	0x56, 0xa3, 0xc9, 0xe7, 0xee, 0x36, 0x47, 0x65, 0x75, 0x19, 0x29, 0xfc, 0xce, 0xfb, 0x87, 0x3c,
+	0x46, 0x27, 0x39, 0xde, 0x1f, 0x8c, 0xb5, 0x02, 0x50, 0x26, 0xaa, 0xf6, 0x96, 0xbe, 0x91, 0x2e,
+	0x1b, 0x71, 0x76, 0x50, 0x6e, 0x1b, 0x4d, 0x68, 0x00, 0xb8, 0xe0, 0xc4, 0x6b, 0x26, 0x2c, 0x04,
+	0xce, 0xd8, 0xec, 0x14, 0x7e, 0x59, 0xe5, 0xbf, 0xc7, 0x2b, 0x1f, 0xd3, 0x96, 0xa8, 0x26, 0xeb,
+	0x57, 0xd6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_client_yellow_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x30, 0x2c, 0x30, 0x2c,
+	0x30, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x30, 0x37, 0x2e, 0x37, 0x35,
+	0x20, 0x32, 0x35, 0x37, 0x2e, 0x35, 0x31, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x33, 0x32, 0x2e,
+	0x33, 0x35, 0x20, 0x32, 0x34, 0x37, 0x2e, 0x34, 0x38, 0x38, 0x20, 0x31, 0x37, 0x38, 0x34, 0x2e,
+	0x36, 0x35, 0x20, 0x35, 0x38, 0x33, 0x2e, 0x36, 0x34, 0x39, 0x20, 0x31, 0x37, 0x39, 0x34, 0x2e,
+	0x35, 0x33, 0x20, 0x31, 0x30, 0x30, 0x38, 0x2e, 0x32, 0x36, 0x20, 0x43, 0x20, 0x31, 0x38, 0x30,
+	0x34, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x34, 0x33, 0x32, 0x2e, 0x38, 0x36, 0x20, 0x31, 0x34, 0x36,
+	0x38, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x37, 0x38, 0x35, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x30, 0x34,
+	0x33, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x37, 0x39, 0x34, 0x2e, 0x37, 0x38, 0x20, 0x43, 0x20, 0x36,
+	0x31, 0x39, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x31, 0x38, 0x30, 0x34, 0x2e, 0x35, 0x20, 0x32, 0x36,
+	0x37, 0x2e, 0x31, 0x34, 0x32, 0x20, 0x31, 0x34, 0x36, 0x38, 0x2e, 0x34, 0x32, 0x20, 0x32, 0x35,
+	0x37, 0x2e, 0x32, 0x36, 0x38, 0x20, 0x31, 0x30, 0x34, 0x34, 0x2e, 0x30, 0x32, 0x20, 0x43, 0x20,
+	0x32, 0x34, 0x37, 0x2e, 0x33, 0x39, 0x35, 0x20, 0x36, 0x31, 0x39, 0x2e, 0x36, 0x32, 0x32, 0x20,
+	0x35, 0x38, 0x33, 0x2e, 0x33, 0x35, 0x35, 0x20, 0x32, 0x36, 0x37, 0x2e, 0x35, 0x33, 0x35, 0x20,
+	0x31, 0x30, 0x30, 0x37, 0x2e, 0x37, 0x35, 0x20, 0x32, 0x35, 0x37, 0x2e, 0x35, 0x31, 0x34, 0x20,
+	0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28,
+	0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28,
+	0x32, 0x35, 0x33, 0x2c, 0x32, 0x31, 0x36, 0x2c, 0x35, 0x33, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x34, 0x35, 0x31, 0x20, 0x33, 0x30, 0x38, 0x2e, 0x34, 0x34,
+	0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x39, 0x35, 0x2e, 0x35, 0x32, 0x20, 0x32, 0x39, 0x33, 0x2e,
+	0x38, 0x32, 0x31, 0x20, 0x31, 0x37, 0x32, 0x38, 0x2e, 0x36, 0x20, 0x36, 0x30, 0x32, 0x2e, 0x37,
+	0x33, 0x35, 0x20, 0x31, 0x37, 0x34, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x39, 0x39, 0x38, 0x2e, 0x37,
+	0x38, 0x20, 0x43, 0x20, 0x31, 0x37, 0x35, 0x38, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x33, 0x39, 0x34,
+	0x2e, 0x38, 0x32, 0x20, 0x31, 0x34, 0x35, 0x30, 0x2e, 0x35, 0x33, 0x20, 0x31, 0x37, 0x32, 0x38,
+	0x2e, 0x33, 0x34, 0x20, 0x31, 0x30, 0x35, 0x34, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x37, 0x34, 0x34,
+	0x2e, 0x30, 0x39, 0x20, 0x43, 0x20, 0x36, 0x35, 0x37, 0x2e, 0x36, 0x39, 0x32, 0x20, 0x31, 0x37,
+	0x35, 0x39, 0x2e, 0x38, 0x38, 0x20, 0x33, 0x32, 0x33, 0x2e, 0x33, 0x35, 0x38, 0x20, 0x31, 0x34,
+	0x35, 0x30, 0x2e, 0x36, 0x38, 0x20, 0x33, 0x30, 0x38, 0x2e, 0x31, 0x33, 0x39, 0x20, 0x31, 0x30,
+	0x35, 0x33, 0x2e, 0x38, 0x34, 0x20, 0x43, 0x20, 0x32, 0x39, 0x32, 0x2e, 0x39, 0x31, 0x39, 0x20,
+	0x36, 0x35, 0x36, 0x2e, 0x39, 0x39, 0x39, 0x20, 0x36, 0x30, 0x32, 0x2e, 0x35, 0x38, 0x39, 0x20,
+	0x33, 0x32, 0x33, 0x2e, 0x31, 0x30, 0x34, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x34, 0x35, 0x31, 0x20,
+	0x33, 0x30, 0x38, 0x2e, 0x34, 0x34, 0x38, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x30, 0x2c, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x38, 0x30, 0x37, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x31, 0x32, 0x39,
+	0x35, 0x2e, 0x34, 0x20, 0x43, 0x20, 0x38, 0x33, 0x37, 0x2e, 0x37, 0x33, 0x33, 0x20, 0x31, 0x32,
+	0x39, 0x34, 0x2e, 0x31, 0x38, 0x20, 0x38, 0x37, 0x31, 0x2e, 0x36, 0x31, 0x36, 0x20, 0x31, 0x32,
+	0x39, 0x34, 0x2e, 0x38, 0x32, 0x20, 0x39, 0x30, 0x31, 0x2e, 0x39, 0x35, 0x34, 0x20, 0x31, 0x32,
+	0x39, 0x34, 0x2e, 0x38, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x34, 0x39, 0x2e, 0x38, 0x39, 0x20,
+	0x31, 0x32, 0x39, 0x35, 0x2e, 0x30, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x37, 0x33, 0x2e, 0x30,
+	0x37, 0x20, 0x31, 0x32, 0x39, 0x34, 0x2e, 0x39, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x39, 0x35,
+	0x2e, 0x34, 0x35, 0x20, 0x31, 0x32, 0x39, 0x34, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x32, 0x31, 0x38,
+	0x2e, 0x32, 0x33, 0x20, 0x31, 0x32, 0x39, 0x34, 0x2e, 0x36, 0x34, 0x20, 0x31, 0x32, 0x34, 0x30,
+	0x2e, 0x35, 0x39, 0x20, 0x31, 0x32, 0x39, 0x35, 0x2e, 0x31, 0x31, 0x20, 0x43, 0x20, 0x31, 0x32,
+	0x34, 0x36, 0x2e, 0x34, 0x33, 0x20, 0x31, 0x32, 0x39, 0x35, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x32,
+	0x35, 0x33, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x32, 0x39, 0x35, 0x2e, 0x34, 0x38, 0x20, 0x31, 0x32,
+	0x35, 0x38, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x32, 0x39, 0x39, 0x2e, 0x33, 0x33, 0x20, 0x43, 0x20,
+	0x31, 0x32, 0x36, 0x39, 0x2e, 0x34, 0x33, 0x20, 0x31, 0x33, 0x30, 0x38, 0x2e, 0x34, 0x34, 0x20,
+	0x31, 0x32, 0x37, 0x31, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x33, 0x32, 0x34, 0x2e, 0x37, 0x35, 0x20,
+	0x31, 0x32, 0x36, 0x32, 0x2e, 0x31, 0x35, 0x20, 0x31, 0x33, 0x33, 0x35, 0x2e, 0x37, 0x39, 0x20,
+	0x43, 0x20, 0x31, 0x32, 0x35, 0x35, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x33, 0x34, 0x32, 0x2e, 0x37,
+	0x38, 0x20, 0x31, 0x32, 0x35, 0x33, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x33, 0x34, 0x33, 0x2e, 0x35,
+	0x31, 0x20, 0x31, 0x32, 0x34, 0x33, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x33, 0x34, 0x34, 0x2e, 0x35,
+	0x33, 0x20, 0x43, 0x20, 0x31, 0x32, 0x30, 0x35, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x33, 0x34, 0x33,
+	0x2e, 0x35, 0x38, 0x20, 0x31, 0x31, 0x36, 0x36, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x33, 0x34, 0x34,
+	0x2e, 0x33, 0x35, 0x20, 0x31, 0x31, 0x32, 0x38, 0x2e, 0x31, 0x20, 0x31, 0x33, 0x34, 0x34, 0x2e,
+	0x33, 0x39, 0x20, 0x4c, 0x20, 0x39, 0x31, 0x37, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x33, 0x34, 0x34,
+	0x2e, 0x31, 0x35, 0x20, 0x4c, 0x20, 0x38, 0x34, 0x37, 0x2e, 0x31, 0x32, 0x33, 0x20, 0x31, 0x33,
+	0x34, 0x34, 0x2e, 0x32, 0x39, 0x20, 0x43, 0x20, 0x38, 0x33, 0x35, 0x2e, 0x33, 0x32, 0x20, 0x31,
+	0x33, 0x34, 0x34, 0x2e, 0x33, 0x33, 0x20, 0x38, 0x30, 0x30, 0x2e, 0x38, 0x32, 0x36, 0x20, 0x31,
+	0x33, 0x34, 0x36, 0x2e, 0x33, 0x38, 0x20, 0x37, 0x39, 0x33, 0x2e, 0x32, 0x38, 0x36, 0x20, 0x31,
+	0x33, 0x34, 0x30, 0x2e, 0x30, 0x36, 0x20, 0x43, 0x20, 0x37, 0x37, 0x33, 0x2e, 0x32, 0x31, 0x32,
+	0x20, 0x31, 0x33, 0x32, 0x33, 0x2e, 0x32, 0x34, 0x20, 0x37, 0x38, 0x32, 0x2e, 0x31, 0x30, 0x34,
+	0x20, 0x31, 0x32, 0x39, 0x38, 0x2e, 0x33, 0x37, 0x20, 0x38, 0x30, 0x37, 0x2e, 0x35, 0x38, 0x37,
+	0x20, 0x31, 0x32, 0x39, 0x35, 0x2e, 0x34, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x30, 0x2c, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x32, 0x37, 0x39, 0x2e, 0x33, 0x39, 0x20, 0x38, 0x35, 0x34,
+	0x2e, 0x37, 0x31, 0x33, 0x20, 0x43, 0x20, 0x31, 0x33, 0x32, 0x34, 0x2e, 0x36, 0x33, 0x20, 0x38,
+	0x35, 0x33, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x31, 0x33, 0x36, 0x32, 0x2e, 0x34, 0x35, 0x20, 0x38,
+	0x38, 0x38, 0x2e, 0x38, 0x32, 0x38, 0x20, 0x31, 0x33, 0x36, 0x34, 0x2e, 0x31, 0x33, 0x20, 0x39,
+	0x33, 0x34, 0x2e, 0x30, 0x34, 0x39, 0x20, 0x43, 0x20, 0x31, 0x33, 0x36, 0x35, 0x2e, 0x38, 0x31,
+	0x20, 0x39, 0x37, 0x39, 0x2e, 0x32, 0x37, 0x20, 0x31, 0x33, 0x33, 0x30, 0x2e, 0x37, 0x32, 0x20,
+	0x31, 0x30, 0x31, 0x37, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x32, 0x38, 0x35, 0x2e, 0x35, 0x31, 0x20,
+	0x31, 0x30, 0x31, 0x39, 0x2e, 0x34, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x33, 0x39, 0x2e, 0x37,
+	0x36, 0x20, 0x31, 0x30, 0x32, 0x31, 0x2e, 0x35, 0x34, 0x20, 0x31, 0x32, 0x30, 0x31, 0x2e, 0x30,
+	0x38, 0x20, 0x39, 0x38, 0x35, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x31, 0x39, 0x39, 0x2e, 0x33, 0x38,
+	0x20, 0x39, 0x34, 0x30, 0x2e, 0x31, 0x36, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x39, 0x37, 0x2e,
+	0x36, 0x39, 0x20, 0x38, 0x39, 0x34, 0x2e, 0x34, 0x30, 0x31, 0x20, 0x31, 0x32, 0x33, 0x33, 0x2e,
+	0x36, 0x32, 0x20, 0x38, 0x35, 0x36, 0x2e, 0x30, 0x32, 0x35, 0x20, 0x31, 0x32, 0x37, 0x39, 0x2e,
+	0x33, 0x39, 0x20, 0x38, 0x35, 0x34, 0x2e, 0x37, 0x31, 0x33, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d,
+	0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x30, 0x2c, 0x30, 0x2c, 0x30,
+	0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x37, 0x36, 0x34, 0x2e, 0x38, 0x31, 0x34, 0x20,
+	0x38, 0x35, 0x35, 0x2e, 0x30, 0x30, 0x33, 0x20, 0x43, 0x20, 0x38, 0x31, 0x30, 0x2e, 0x31, 0x33,
+	0x33, 0x20, 0x38, 0x35, 0x32, 0x2e, 0x31, 0x34, 0x31, 0x20, 0x38, 0x34, 0x39, 0x2e, 0x32, 0x31,
+	0x31, 0x20, 0x38, 0x38, 0x36, 0x2e, 0x35, 0x31, 0x36, 0x20, 0x38, 0x35, 0x32, 0x2e, 0x31, 0x35,
+	0x31, 0x20, 0x39, 0x33, 0x31, 0x2e, 0x38, 0x33, 0x20, 0x43, 0x20, 0x38, 0x35, 0x35, 0x2e, 0x30,
+	0x39, 0x32, 0x20, 0x39, 0x37, 0x37, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x38, 0x32, 0x30, 0x2e, 0x37,
+	0x38, 0x36, 0x20, 0x31, 0x30, 0x31, 0x36, 0x2e, 0x32, 0x38, 0x20, 0x37, 0x37, 0x35, 0x2e, 0x34,
+	0x37, 0x37, 0x20, 0x31, 0x30, 0x31, 0x39, 0x2e, 0x33, 0x20, 0x43, 0x20, 0x37, 0x33, 0x30, 0x2e,
+	0x30, 0x35, 0x36, 0x20, 0x31, 0x30, 0x32, 0x32, 0x2e, 0x33, 0x33, 0x20, 0x36, 0x39, 0x30, 0x2e,
+	0x38, 0x30, 0x31, 0x20, 0x39, 0x38, 0x37, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x36, 0x38, 0x37, 0x2e,
+	0x38, 0x35, 0x33, 0x20, 0x39, 0x34, 0x32, 0x2e, 0x34, 0x39, 0x33, 0x20, 0x43, 0x20, 0x36, 0x38,
+	0x34, 0x2e, 0x39, 0x30, 0x35, 0x20, 0x38, 0x39, 0x37, 0x2e, 0x30, 0x36, 0x37, 0x20, 0x37, 0x31,
+	0x39, 0x2e, 0x33, 0x38, 0x33, 0x20, 0x38, 0x35, 0x37, 0x2e, 0x38, 0x37, 0x32, 0x20, 0x37, 0x36,
+	0x34, 0x2e, 0x38, 0x31, 0x34, 0x20, 0x38, 0x35, 0x35, 0x2e, 0x30, 0x30, 0x33, 0x20, 0x7a, 0x22,
+	0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e
+};
+
+static const unsigned char icon_folder_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x25, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x90, 0xcd,
+	0x4a, 0xc3, 0x40, 0x14, 0x85, 0x4f, 0x66, 0xc6, 0x92, 0x18, 0x2b, 0xe2, 0x5f, 0x51, 0x2b, 0x54,
+	0x34, 0xab, 0xa2, 0xa0, 0x1b, 0x17, 0xba, 0xf7, 0x0d, 0x7c, 0x08, 0x1f, 0xc0, 0x85, 0xab, 0x3c,
+	0x84, 0x6b, 0x5f, 0xc0, 0x57, 0x10, 0x04, 0xb1, 0x60, 0xf7, 0x06, 0x2c, 0x2a, 0xd5, 0x2a, 0x08,
+	0x42, 0xbb, 0x68, 0x6c, 0xa6, 0x74, 0x32, 0x77, 0x5c, 0x94, 0x88, 0x56, 0xda, 0xd8, 0x2a, 0x78,
+	0x56, 0xf7, 0x32, 0x9c, 0x73, 0xbe, 0xb9, 0xc0, 0x2f, 0x65, 0x25, 0xc3, 0xd5, 0xd1, 0x4a, 0x8e,
+	0x67, 0xb4, 0x9b, 0xec, 0xd5, 0xa0, 0xf6, 0xb8, 0x7f, 0x0a, 0x9d, 0x1a, 0x70, 0xee, 0x43, 0xcc,
+	0xb8, 0xc5, 0xb3, 0xec, 0xf4, 0xa4, 0x07, 0xc6, 0x19, 0x00, 0xc0, 0x18, 0x84, 0xf5, 0xc6, 0x0d,
+	0x6f, 0xb1, 0xbd, 0xa2, 0x1f, 0x74, 0x06, 0x05, 0x08, 0x1b, 0x85, 0xdd, 0x5c, 0x21, 0xbf, 0x3d,
+	0x97, 0x5f, 0xb4, 0x3f, 0x3f, 0x44, 0xcd, 0x70, 0xf6, 0xa9, 0x72, 0x77, 0x5d, 0x39, 0xde, 0x8c,
+	0x7b, 0x4d, 0x64, 0x0c, 0xc5, 0x52, 0x5d, 0xac, 0x1f, 0x06, 0x07, 0x82, 0x13, 0x65, 0x85, 0x10,
+	0x36, 0xe9, 0xaf, 0xb4, 0xb6, 0x3b, 0x2e, 0xbc, 0xad, 0x0d, 0xaf, 0x5f, 0xf3, 0x4b, 0xb5, 0xb6,
+	0x54, 0xf6, 0x97, 0x4f, 0x04, 0x00, 0x18, 0xad, 0x61, 0xe2, 0x6f, 0x45, 0x03, 0xe5, 0x38, 0xf6,
+	0x94, 0x45, 0xd6, 0x82, 0xe8, 0x32, 0x11, 0x8c, 0x4e, 0xbd, 0x57, 0xcf, 0x3f, 0x08, 0x00, 0x30,
+	0x32, 0x41, 0x52, 0xd8, 0x0d, 0x18, 0x81, 0xc0, 0xfc, 0x29, 0xc1, 0xff, 0xde, 0x40, 0x33, 0x16,
+	0x2a, 0xa5, 0x24, 0x69, 0xed, 0x0c, 0x13, 0xa0, 0x94, 0x92, 0x30, 0xd4, 0x14, 0x6d, 0x3c, 0x5c,
+	0xd6, 0x1b, 0xa2, 0x2c, 0xa5, 0x5c, 0x63, 0x16, 0xb7, 0xd2, 0xad, 0x00, 0x19, 0x6d, 0xa2, 0xa8,
+	0x7d, 0xdb, 0xe2, 0xcf, 0xa5, 0x0f, 0x43, 0xc9, 0x5f, 0x9d, 0xcf, 0x40, 0x4d, 0xfc, 0x24, 0xa0,
+	0x83, 0xb1, 0xb7, 0x1d, 0xff, 0xfe, 0x75, 0x18, 0xe2, 0xbe, 0x7a, 0x07, 0xe8, 0xda, 0x94, 0xbc,
+	0xc5, 0x5f, 0xf2, 0xee, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+static const unsigned char icon_folder_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x6f,
+	0x6c, 0x64, 0x65, 0x72, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x63, 0x63, 0x36, 0x36, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x32, 0x61, 0x33, 0x33, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x20, 0x33, 0x2e, 0x37,
+	0x20, 0x43, 0x31, 0x20, 0x32, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x37, 0x20, 0x32, 0x2e, 0x32, 0x20,
+	0x32, 0x2e, 0x35, 0x20, 0x32, 0x2e, 0x32, 0x20, 0x4c, 0x36, 0x20, 0x32, 0x2e, 0x32, 0x20, 0x4c,
+	0x37, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x34, 0x20, 0x4c, 0x31, 0x33, 0x2e, 0x35, 0x20, 0x33, 0x2e,
+	0x34, 0x20, 0x43, 0x31, 0x34, 0x2e, 0x33, 0x20, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x35, 0x20, 0x34,
+	0x2e, 0x31, 0x20, 0x31, 0x35, 0x20, 0x34, 0x2e, 0x39, 0x20, 0x4c, 0x31, 0x35, 0x20, 0x31, 0x32,
+	0x2e, 0x33, 0x20, 0x43, 0x31, 0x35, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x34, 0x2e, 0x33,
+	0x20, 0x31, 0x33, 0x2e, 0x38, 0x20, 0x31, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x20,
+	0x4c, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x20, 0x43, 0x31, 0x2e, 0x37, 0x20, 0x31,
+	0x33, 0x2e, 0x38, 0x20, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x20, 0x31, 0x32, 0x2e,
+	0x33, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x63, 0x39, 0x37, 0x66, 0x31, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f,
+	0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_folder_shared_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x30, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xa5, 0x90, 0x4f,
+	0x4b, 0x02, 0x51, 0x14, 0xc5, 0xcf, 0x7b, 0xf3, 0x08, 0xc5, 0x19, 0x18, 0x30, 0x1a, 0xa2, 0x16,
+	0x2e, 0x52, 0x5c, 0x98, 0x8b, 0x36, 0x6d, 0x66, 0x21, 0xb3, 0x69, 0xdf, 0xc2, 0x0f, 0xd1, 0x87,
+	0xea, 0x0b, 0x08, 0x81, 0xfb, 0x20, 0x8c, 0x22, 0xc2, 0x9d, 0x8c, 0x50, 0xb4, 0xa9, 0x8d, 0x88,
+	0x39, 0x20, 0xf6, 0xd0, 0x66, 0xe6, 0xfd, 0x69, 0x51, 0xc6, 0x28, 0xd8, 0x38, 0x79, 0x56, 0xf7,
+	0x72, 0x39, 0xbf, 0x7b, 0xee, 0x05, 0xb6, 0x14, 0x59, 0x14, 0xed, 0x5a, 0xcd, 0x31, 0x08, 0x29,
+	0x2c, 0xfa, 0x59, 0xb5, 0xfa, 0xd6, 0x6c, 0xb5, 0x64, 0x2a, 0xe0, 0xa6, 0xd1, 0x60, 0x94, 0x90,
+	0x6b, 0xdb, 0x71, 0xca, 0xc4, 0x30, 0x28, 0x00, 0x40, 0x29, 0x04, 0x83, 0xc1, 0xd3, 0xfb, 0x78,
+	0x7c, 0xd6, 0xec, 0xf7, 0xa3, 0xbf, 0x00, 0x8c, 0x4f, 0x26, 0xee, 0xb1, 0xeb, 0x9e, 0x1e, 0x56,
+	0x2a, 0xb9, 0xe4, 0x60, 0x1a, 0x04, 0xbb, 0xcf, 0xdd, 0xae, 0xff, 0x50, 0x2a, 0x89, 0x55, 0x93,
+	0x06, 0xd4, 0x27, 0xe7, 0xb7, 0x5e, 0xa7, 0x73, 0xc1, 0xa0, 0x94, 0xc5, 0x18, 0xcb, 0xc9, 0x68,
+	0x79, 0x51, 0xc1, 0xb2, 0xd8, 0x89, 0xe7, 0x95, 0xd7, 0x6d, 0x7e, 0xf5, 0xfd, 0x83, 0x76, 0x10,
+	0x5c, 0x32, 0x00, 0x50, 0x42, 0x60, 0x15, 0x90, 0xa6, 0xbc, 0x69, 0xda, 0x94, 0xd2, 0xfd, 0x6f,
+	0x40, 0x1c, 0x43, 0x65, 0x04, 0xa8, 0x38, 0x06, 0x00, 0xfc, 0x3b, 0x81, 0x12, 0x22, 0x01, 0x90,
+	0x12, 0xf2, 0x87, 0xb8, 0x31, 0x40, 0xca, 0x04, 0x20, 0x8e, 0xb3, 0x27, 0x48, 0x9e, 0xa0, 0x85,
+	0xc8, 0xfc, 0x03, 0xbd, 0x74, 0xc2, 0x56, 0x3f, 0xa0, 0xf4, 0x23, 0x0a, 0xc3, 0xb9, 0x8c, 0xa2,
+	0x7c, 0x16, 0x40, 0x18, 0x86, 0x73, 0xad, 0xf5, 0x94, 0x99, 0xb6, 0x7d, 0x37, 0x1a, 0x0e, 0x1f,
+	0x67, 0x9c, 0x1f, 0x51, 0x42, 0x48, 0xba, 0x15, 0x50, 0x5a, 0x6b, 0xce, 0xf9, 0x8b, 0x55, 0x2c,
+	0xde, 0xff, 0x1a, 0xae, 0xea, 0xf5, 0xbd, 0x1d, 0xad, 0xcd, 0x4d, 0x00, 0x11, 0x21, 0xfc, 0xbc,
+	0xd7, 0x1b, 0x65, 0x49, 0xbc, 0x56, 0x5f, 0xed, 0xaa, 0x97, 0x8d, 0x81, 0xb2, 0xc0, 0x46, 0x00,
+	0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_folder_shared_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x6f,
+	0x6c, 0x64, 0x65, 0x72, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x39, 0x61, 0x39, 0x61, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x30, 0x35, 0x35, 0x35, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x20, 0x33, 0x2e, 0x37,
+	0x20, 0x43, 0x31, 0x20, 0x32, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x37, 0x20, 0x32, 0x2e, 0x32, 0x20,
+	0x32, 0x2e, 0x35, 0x20, 0x32, 0x2e, 0x32, 0x20, 0x4c, 0x36, 0x20, 0x32, 0x2e, 0x32, 0x20, 0x4c,
+	0x37, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x34, 0x20, 0x4c, 0x31, 0x33, 0x2e, 0x35, 0x20, 0x33, 0x2e,
+	0x34, 0x20, 0x43, 0x31, 0x34, 0x2e, 0x33, 0x20, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x35, 0x20, 0x34,
+	0x2e, 0x31, 0x20, 0x31, 0x35, 0x20, 0x34, 0x2e, 0x39, 0x20, 0x4c, 0x31, 0x35, 0x20, 0x31, 0x32,
+	0x2e, 0x33, 0x20, 0x43, 0x31, 0x35, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x34, 0x2e, 0x33,
+	0x20, 0x31, 0x33, 0x2e, 0x38, 0x20, 0x31, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x20,
+	0x4c, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x20, 0x43, 0x31, 0x2e, 0x37, 0x20, 0x31,
+	0x33, 0x2e, 0x38, 0x20, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x20, 0x31, 0x32, 0x2e,
+	0x33, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x62, 0x33, 0x32, 0x65, 0x32, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f,
+	0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_friends_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x02, 0x44, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x91, 0x4b,
+	0x68, 0x13, 0x51, 0x14, 0x86, 0xff, 0x3b, 0x33, 0xc9, 0xf4, 0x66, 0x66, 0x92, 0xd4, 0x98, 0x16,
+	0x5b, 0xed, 0xc3, 0x20, 0x58, 0x4a, 0x1f, 0x94, 0xe2, 0x42, 0xb0, 0x14, 0x45, 0x4b, 0xc1, 0xad,
+	0x50, 0x74, 0xa3, 0x50, 0x14, 0xd4, 0x66, 0x6b, 0xd5, 0x4d, 0x16, 0x2e, 0xea, 0x4a, 0xa8, 0x50,
+	0x14, 0x17, 0x75, 0xab, 0x16, 0x5c, 0x56, 0xbb, 0x10, 0x17, 0x0a, 0xee, 0xa4, 0x88, 0xb5, 0x84,
+	0x9a, 0x96, 0x66, 0x4c, 0xd2, 0xa7, 0x79, 0xcc, 0x33, 0x93, 0xc9, 0x75, 0x21, 0x89, 0x49, 0x6d,
+	0x17, 0xae, 0xfc, 0xe1, 0xc0, 0xe5, 0x70, 0xcf, 0x77, 0xfe, 0x9f, 0x03, 0xfc, 0x6f, 0x91, 0xbd,
+	0x8d, 0xe1, 0xab, 0xb3, 0x0d, 0xae, 0xe2, 0xed, 0x65, 0x02, 0xb6, 0x3f, 0x3c, 0xba, 0x92, 0x00,
+	0x80, 0x07, 0x4f, 0x5e, 0x0c, 0xf9, 0x04, 0x61, 0xc8, 0x72, 0xed, 0xb9, 0x7b, 0x37, 0x2e, 0x2f,
+	0x1f, 0x08, 0xb8, 0x78, 0xff, 0xf5, 0x29, 0x59, 0xa6, 0xcf, 0x3b, 0x3a, 0x5a, 0xdb, 0x34, 0xdd,
+	0x34, 0x54, 0x35, 0xf5, 0xe9, 0xf4, 0xd1, 0xd2, 0xe7, 0xce, 0xf6, 0x63, 0xd1, 0x50, 0x63, 0x20,
+	0xb8, 0xae, 0x66, 0x52, 0x99, 0xcd, 0xcc, 0xf8, 0xe4, 0xf5, 0xb1, 0xf9, 0xca, 0x8c, 0x50, 0x0b,
+	0x10, 0x45, 0xcf, 0xcc, 0xc0, 0x60, 0x5f, 0x17, 0x21, 0x04, 0xa1, 0x30, 0xa4, 0x40, 0xc0, 0x3f,
+	0xa2, 0xaa, 0xcb, 0x83, 0xfd, 0x7e, 0x7f, 0xb0, 0xe4, 0x32, 0xb4, 0x1c, 0x69, 0x6e, 0xc9, 0xe5,
+	0xf2, 0xb7, 0x01, 0xfc, 0x0d, 0x18, 0x9d, 0x98, 0x16, 0xbd, 0x0d, 0xf4, 0xb0, 0x6e, 0x95, 0xaa,
+	0x40, 0xa1, 0x41, 0xf2, 0x66, 0x0d, 0x50, 0xdd, 0xb4, 0x00, 0x00, 0x8c, 0x31, 0x14, 0x8b, 0x8e,
+	0x5d, 0xbb, 0x94, 0xab, 0x3c, 0xe6, 0x1f, 0x47, 0x6d, 0xc3, 0xb0, 0x0a, 0x9a, 0xe9, 0xa0, 0x52,
+	0xbb, 0xd9, 0x02, 0x33, 0x6c, 0xe7, 0xe3, 0xda, 0xda, 0x7a, 0x62, 0x73, 0x6b, 0xdb, 0x48, 0x7c,
+	0x5f, 0xfd, 0xaa, 0xdb, 0xda, 0x64, 0x2d, 0xa0, 0x2e, 0x82, 0xa1, 0x99, 0x0f, 0x13, 0xf1, 0x95,
+	0xa9, 0x60, 0x53, 0x73, 0xab, 0xe3, 0x38, 0xee, 0xd6, 0x8f, 0xe4, 0xa2, 0x9d, 0x65, 0x63, 0x19,
+	0x5f, 0x86, 0xa7, 0xa2, 0x27, 0x82, 0x1c, 0x59, 0x8a, 0xc5, 0xae, 0x59, 0xfb, 0x3a, 0x00, 0x00,
+	0x87, 0x15, 0xdf, 0xb8, 0xa6, 0xf6, 0x36, 0x97, 0x4e, 0xc6, 0xf5, 0xad, 0xd4, 0xa2, 0xc0, 0x8a,
+	0xd3, 0xef, 0x67, 0x2e, 0xe9, 0x54, 0x69, 0x74, 0x4b, 0x82, 0xf0, 0x13, 0x90, 0xca, 0xd8, 0xa3,
+	0xea, 0x15, 0x46, 0xee, 0xbe, 0x3a, 0x13, 0x6a, 0x0c, 0xce, 0xf6, 0xf5, 0x9c, 0x8c, 0xf8, 0x24,
+	0x0a, 0xc6, 0x18, 0xd2, 0xa9, 0x4d, 0x53, 0x5d, 0x5d, 0xd1, 0xce, 0x75, 0xc9, 0xa6, 0x8f, 0x52,
+	0x5a, 0xd0, 0xf4, 0x5c, 0x21, 0x97, 0x5f, 0xc8, 0x26, 0xbf, 0x4c, 0xc4, 0x62, 0xb1, 0x72, 0x35,
+	0xc2, 0xf0, 0xcd, 0x97, 0xb2, 0x5f, 0x92, 0x9f, 0xf5, 0xf6, 0x77, 0x47, 0x00, 0x02, 0xc3, 0x72,
+	0x00, 0x00, 0xc1, 0xd0, 0x21, 0x2a, 0x88, 0xdd, 0x34, 0xbe, 0xa3, 0xe2, 0xc2, 0x40, 0x18, 0x4d,
+	0x4d, 0xe1, 0xb0, 0xae, 0x1b, 0x6d, 0xdf, 0x58, 0x19, 0x00, 0x6e, 0x55, 0x23, 0x50, 0x85, 0x8f,
+	0xb6, 0x1d, 0xef, 0x3c, 0x61, 0x58, 0x2e, 0x74, 0xab, 0x54, 0x57, 0x44, 0x10, 0xb1, 0xa1, 0x95,
+	0x91, 0xd5, 0x4c, 0x18, 0x96, 0x0d, 0xc2, 0xf3, 0x5e, 0x45, 0x51, 0x46, 0xef, 0x4c, 0x3d, 0x0d,
+	0x54, 0x1d, 0x70, 0x5e, 0xcf, 0x59, 0x08, 0x22, 0x57, 0x7b, 0xc2, 0xba, 0x9c, 0x34, 0x80, 0x44,
+	0x3a, 0x8b, 0xf6, 0xb0, 0x0c, 0x00, 0x90, 0x24, 0xa5, 0x5d, 0x56, 0xfc, 0xe7, 0x01, 0xcc, 0x09,
+	0x00, 0x40, 0x08, 0xef, 0xaf, 0xd8, 0xde, 0x57, 0x9c, 0x07, 0xc9, 0x8d, 0x3c, 0x64, 0xee, 0xf7,
+	0x1f, 0xb7, 0xec, 0x72, 0x3c, 0x21, 0x3d, 0x55, 0x80, 0x65, 0x19, 0xf1, 0xd5, 0xe5, 0xa5, 0xdd,
+	0xda, 0x19, 0x9e, 0x83, 0xcc, 0x81, 0x89, 0x00, 0x50, 0x06, 0x88, 0xc6, 0x59, 0x0b, 0x01, 0x77,
+	0xe7, 0xdd, 0x1f, 0x28, 0x89, 0x1f, 0xbc, 0xf1, 0x1f, 0xf4, 0x0b, 0x15, 0x51, 0xfe, 0x7d, 0xb3,
+	0xf9, 0xf9, 0x05, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_friends_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x61,
+	0x63, 0x6b, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x63, 0x64, 0x64, 0x39, 0x65, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x39, 0x66, 0x62, 0x32, 0x63, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72,
+	0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x72, 0x6f, 0x6e, 0x74,
+	0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x39, 0x64, 0x63, 0x39, 0x66, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x35, 0x66, 0x39, 0x62, 0x64, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69,
+	0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x63,
+	0x79, 0x3d, 0x22, 0x34, 0x2e, 0x39, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x32, 0x2e, 0x31, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x62, 0x61, 0x63, 0x6b, 0x29,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x66, 0x38, 0x66, 0x61,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x36, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x20, 0x43, 0x36, 0x2e, 0x36, 0x20,
+	0x31, 0x30, 0x2e, 0x38, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x39, 0x2e, 0x31, 0x20, 0x31, 0x30, 0x2e,
+	0x34, 0x20, 0x39, 0x2e, 0x31, 0x20, 0x43, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x39, 0x2e, 0x31, 0x20,
+	0x31, 0x34, 0x2e, 0x32, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x20, 0x31, 0x34, 0x2e, 0x32, 0x20, 0x31,
+	0x34, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x62, 0x61, 0x63, 0x6b, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23,
+	0x37, 0x66, 0x38, 0x66, 0x61, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x35, 0x2e, 0x38, 0x22, 0x20,
+	0x63, 0x79, 0x3d, 0x22, 0x35, 0x2e, 0x36, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x32, 0x2e, 0x36, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x66, 0x72, 0x6f, 0x6e,
+	0x74, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x36,
+	0x65, 0x61, 0x33, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x20,
+	0x43, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x33, 0x20, 0x38, 0x2e,
+	0x36, 0x20, 0x35, 0x2e, 0x38, 0x20, 0x38, 0x2e, 0x36, 0x20, 0x43, 0x38, 0x2e, 0x33, 0x20, 0x38,
+	0x2e, 0x36, 0x20, 0x31, 0x30, 0x2e, 0x32, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x20, 0x31, 0x30, 0x2e,
+	0x32, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x75, 0x72, 0x6c, 0x28, 0x23, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x36, 0x65, 0x61, 0x33, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_message_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x88, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xcd, 0x92, 0xbb,
+	0x4b, 0x03, 0x41, 0x10, 0xc6, 0xbf, 0x3d, 0xcf, 0xc8, 0x25, 0xbe, 0xc5, 0x43, 0x02, 0x0a, 0xa2,
+	0x01, 0x63, 0x50, 0x6b, 0x9b, 0xb4, 0x22, 0x68, 0xa1, 0x68, 0xeb, 0x23, 0x85, 0x18, 0xb0, 0x12,
+	0xc4, 0x42, 0xf0, 0x2f, 0x10, 0x7b, 0x0d, 0xa8, 0xb1, 0x10, 0xb4, 0x11, 0xac, 0x2c, 0xac, 0x7c,
+	0x80, 0x8d, 0x85, 0xa0, 0x51, 0x50, 0xc1, 0x07, 0x49, 0x8c, 0xaf, 0x8b, 0x92, 0xe0, 0xe5, 0xbc,
+	0xdb, 0xb1, 0x30, 0x26, 0xe6, 0x2e, 0xa6, 0xd5, 0x0f, 0x16, 0x96, 0x99, 0x6f, 0x7f, 0x33, 0xcc,
+	0x2c, 0xf0, 0xd7, 0x62, 0xe6, 0xc0, 0xe0, 0xfc, 0x9d, 0x24, 0x95, 0xbf, 0xb5, 0x30, 0x12, 0x04,
+	0x8b, 0x59, 0xc7, 0xf3, 0x8a, 0xdf, 0x7d, 0xfd, 0x2b, 0x60, 0x38, 0x10, 0x9a, 0x69, 0x92, 0xa5,
+	0xd9, 0xfa, 0xea, 0x12, 0x5b, 0xbe, 0x6a, 0xea, 0x07, 0xc7, 0xf1, 0x6d, 0xe2, 0x48, 0x7d, 0xa7,
+	0x01, 0x33, 0x08, 0x23, 0x81, 0xb3, 0xfe, 0xe0, 0x7e, 0x94, 0x38, 0x15, 0x56, 0x58, 0x51, 0x69,
+	0x3c, 0x78, 0x7e, 0xf0, 0xfd, 0x4e, 0xfc, 0xbe, 0x10, 0xa8, 0xaf, 0xbb, 0xbd, 0x06, 0x0c, 0xc0,
+	0xda, 0x61, 0x0c, 0x61, 0x25, 0x65, 0xe9, 0xa0, 0xa7, 0xa3, 0x06, 0x6e, 0xa7, 0x03, 0x1e, 0x67,
+	0x69, 0xe7, 0xe8, 0xd2, 0x45, 0xed, 0xb2, 0xcf, 0xf5, 0x98, 0x01, 0x80, 0xb1, 0x72, 0xbb, 0x4d,
+	0xc8, 0x18, 0x53, 0x3a, 0x59, 0x00, 0x95, 0xf6, 0x2f, 0xbb, 0x64, 0x13, 0x98, 0xa1, 0xeb, 0x55,
+	0x00, 0x7e, 0x00, 0x00, 0xb0, 0xf4, 0x44, 0x76, 0x42, 0x0a, 0xa2, 0x71, 0xcd, 0x02, 0xe8, 0x6a,
+	0xab, 0x46, 0xb3, 0x2c, 0xe5, 0xc4, 0x72, 0x00, 0x94, 0x2e, 0x5a, 0xe5, 0x10, 0x61, 0x70, 0x6b,
+	0x07, 0x25, 0x22, 0x4b, 0xfb, 0xb2, 0xb9, 0x0c, 0x80, 0x81, 0x5f, 0xde, 0x3c, 0xab, 0x68, 0x75,
+	0x3a, 0xd0, 0x2c, 0x4b, 0x90, 0xcb, 0xac, 0x8b, 0xa8, 0xb4, 0x17, 0x83, 0x08, 0xb8, 0x7e, 0x4a,
+	0xbd, 0x57, 0xa8, 0xe2, 0x4d, 0x4e, 0x72, 0x68, 0xe1, 0xb4, 0x61, 0x6a, 0xfd, 0x52, 0x39, 0x8b,
+	0x24, 0x49, 0xd3, 0xbf, 0x76, 0xf1, 0xa1, 0x73, 0x4a, 0xa8, 0x7a, 0xe6, 0x3c, 0xbc, 0x69, 0xb4,
+	0xb4, 0x1b, 0xa1, 0xa1, 0xc5, 0xd0, 0x74, 0xb6, 0xb0, 0x09, 0x02, 0x81, 0x4d, 0xb8, 0x64, 0xfb,
+	0xa4, 0xcf, 0x5b, 0x57, 0x34, 0xb7, 0x7d, 0x77, 0xff, 0x92, 0xd0, 0xf7, 0xb2, 0x43, 0xe2, 0x49,
+	0x70, 0x6c, 0x06, 0xc7, 0x3c, 0x5b, 0x79, 0x01, 0x00, 0x30, 0xb8, 0x41, 0x45, 0x8d, 0x74, 0xa5,
+	0x69, 0x06, 0x0f, 0xc7, 0x5f, 0x0d, 0xaf, 0xe5, 0xc3, 0x98, 0x24, 0x5a, 0x22, 0x8f, 0x21, 0x29,
+	0x66, 0x63, 0x27, 0xc4, 0xa9, 0x77, 0xd5, 0xef, 0xb9, 0x2d, 0xf4, 0xf8, 0x7f, 0xe8, 0x13, 0x0f,
+	0xae, 0xc3, 0xce, 0xe1, 0x49, 0xb2, 0x41, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+	0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_message_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39, 0x35, 0x2c, 0x31,
+	0x35, 0x35, 0x2c, 0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x36, 0x36,
+	0x35, 0x2e, 0x33, 0x20, 0x33, 0x36, 0x30, 0x2e, 0x34, 0x32, 0x35, 0x20, 0x43, 0x20, 0x36, 0x39,
+	0x31, 0x2e, 0x39, 0x30, 0x37, 0x20, 0x33, 0x35, 0x39, 0x2e, 0x33, 0x31, 0x32, 0x20, 0x37, 0x32,
+	0x32, 0x2e, 0x31, 0x38, 0x31, 0x20, 0x33, 0x35, 0x39, 0x2e, 0x39, 0x37, 0x36, 0x20, 0x37, 0x34,
+	0x38, 0x2e, 0x39, 0x39, 0x38, 0x20, 0x33, 0x35, 0x39, 0x2e, 0x39, 0x38, 0x38, 0x20, 0x4c, 0x20,
+	0x38, 0x39, 0x30, 0x2e, 0x32, 0x39, 0x33, 0x20, 0x33, 0x36, 0x30, 0x2e, 0x30, 0x33, 0x39, 0x20,
+	0x4c, 0x20, 0x31, 0x33, 0x33, 0x31, 0x2e, 0x36, 0x37, 0x20, 0x33, 0x35, 0x39, 0x2e, 0x39, 0x35,
+	0x35, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x30, 0x31, 0x2e, 0x39, 0x34, 0x20, 0x33, 0x35, 0x39, 0x2e,
+	0x39, 0x37, 0x37, 0x20, 0x43, 0x20, 0x31, 0x34, 0x31, 0x36, 0x2e, 0x30, 0x36, 0x20, 0x33, 0x35,
+	0x39, 0x2e, 0x39, 0x38, 0x35, 0x20, 0x31, 0x34, 0x33, 0x31, 0x2e, 0x38, 0x31, 0x20, 0x33, 0x35,
+	0x39, 0x2e, 0x35, 0x36, 0x32, 0x20, 0x31, 0x34, 0x34, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x33, 0x36,
+	0x30, 0x2e, 0x35, 0x37, 0x34, 0x20, 0x43, 0x20, 0x31, 0x35, 0x33, 0x39, 0x2e, 0x38, 0x37, 0x20,
+	0x33, 0x36, 0x36, 0x2e, 0x35, 0x35, 0x34, 0x20, 0x31, 0x36, 0x32, 0x38, 0x2e, 0x35, 0x36, 0x20,
+	0x34, 0x30, 0x36, 0x2e, 0x36, 0x39, 0x20, 0x31, 0x36, 0x39, 0x35, 0x2e, 0x31, 0x36, 0x20, 0x34,
+	0x37, 0x33, 0x2e, 0x34, 0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x37, 0x36, 0x36, 0x2e, 0x31, 0x38,
+	0x20, 0x35, 0x34, 0x34, 0x2e, 0x33, 0x35, 0x32, 0x20, 0x31, 0x38, 0x30, 0x34, 0x2e, 0x34, 0x31,
+	0x20, 0x36, 0x33, 0x33, 0x2e, 0x37, 0x37, 0x33, 0x20, 0x31, 0x38, 0x31, 0x30, 0x2e, 0x35, 0x36,
+	0x20, 0x37, 0x33, 0x33, 0x2e, 0x36, 0x30, 0x38, 0x20, 0x43, 0x20, 0x31, 0x38, 0x31, 0x31, 0x2e,
+	0x35, 0x31, 0x20, 0x37, 0x34, 0x38, 0x2e, 0x39, 0x38, 0x36, 0x20, 0x31, 0x38, 0x31, 0x31, 0x2e,
+	0x31, 0x33, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x37, 0x35, 0x38, 0x20, 0x31, 0x38, 0x31, 0x31, 0x2e,
+	0x31, 0x34, 0x20, 0x37, 0x38, 0x32, 0x2e, 0x33, 0x33, 0x34, 0x20, 0x4c, 0x20, 0x31, 0x38, 0x31,
+	0x31, 0x2e, 0x31, 0x38, 0x20, 0x38, 0x35, 0x39, 0x2e, 0x39, 0x31, 0x35, 0x20, 0x4c, 0x20, 0x31,
+	0x38, 0x31, 0x31, 0x2e, 0x38, 0x37, 0x20, 0x31, 0x30, 0x37, 0x39, 0x2e, 0x35, 0x36, 0x20, 0x43,
+	0x20, 0x31, 0x38, 0x31, 0x31, 0x2e, 0x39, 0x31, 0x20, 0x31, 0x31, 0x30, 0x31, 0x2e, 0x38, 0x34,
+	0x20, 0x31, 0x38, 0x31, 0x31, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x31, 0x32, 0x31, 0x2e, 0x39, 0x32,
+	0x20, 0x31, 0x38, 0x30, 0x39, 0x2e, 0x36, 0x32, 0x20, 0x31, 0x31, 0x34, 0x34, 0x2e, 0x31, 0x33,
+	0x20, 0x43, 0x20, 0x31, 0x38, 0x30, 0x31, 0x2e, 0x34, 0x31, 0x20, 0x31, 0x32, 0x33, 0x34, 0x2e,
+	0x30, 0x37, 0x20, 0x31, 0x37, 0x36, 0x33, 0x2e, 0x33, 0x36, 0x20, 0x31, 0x33, 0x31, 0x38, 0x2e,
+	0x32, 0x36, 0x20, 0x31, 0x36, 0x39, 0x39, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x33, 0x38, 0x32, 0x2e,
+	0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x36, 0x33, 0x34, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x34, 0x34,
+	0x36, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x35, 0x34, 0x39, 0x2e, 0x38, 0x38, 0x20, 0x31, 0x34, 0x38,
+	0x36, 0x2e, 0x36, 0x32, 0x20, 0x31, 0x34, 0x35, 0x39, 0x2e, 0x31, 0x34, 0x20, 0x31, 0x34, 0x39,
+	0x34, 0x2e, 0x34, 0x36, 0x20, 0x43, 0x20, 0x31, 0x34, 0x32, 0x30, 0x2e, 0x36, 0x32, 0x20, 0x31,
+	0x34, 0x39, 0x38, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x33, 0x37, 0x30, 0x2e, 0x33, 0x34, 0x20, 0x31,
+	0x34, 0x39, 0x36, 0x2e, 0x39, 0x38, 0x20, 0x31, 0x33, 0x33, 0x31, 0x2e, 0x30, 0x34, 0x20, 0x31,
+	0x34, 0x39, 0x36, 0x2e, 0x39, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x33, 0x30, 0x2e, 0x35, 0x20,
+	0x31, 0x34, 0x39, 0x36, 0x2e, 0x38, 0x38, 0x20, 0x43, 0x20, 0x31, 0x30, 0x38, 0x37, 0x2e, 0x35,
+	0x36, 0x20, 0x31, 0x34, 0x39, 0x36, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x30, 0x34, 0x34, 0x2e, 0x36,
+	0x31, 0x20, 0x31, 0x34, 0x39, 0x36, 0x2e, 0x38, 0x35, 0x20, 0x31, 0x30, 0x30, 0x31, 0x2e, 0x36,
+	0x37, 0x20, 0x31, 0x34, 0x39, 0x37, 0x2e, 0x32, 0x39, 0x20, 0x43, 0x20, 0x39, 0x38, 0x39, 0x2e,
+	0x36, 0x30, 0x31, 0x20, 0x31, 0x35, 0x30, 0x37, 0x2e, 0x31, 0x38, 0x20, 0x39, 0x37, 0x37, 0x2e,
+	0x31, 0x38, 0x33, 0x20, 0x31, 0x35, 0x32, 0x30, 0x2e, 0x34, 0x36, 0x20, 0x39, 0x36, 0x35, 0x2e,
+	0x38, 0x35, 0x36, 0x20, 0x31, 0x35, 0x33, 0x31, 0x2e, 0x35, 0x39, 0x20, 0x4c, 0x20, 0x39, 0x30,
+	0x39, 0x2e, 0x31, 0x33, 0x39, 0x20, 0x31, 0x35, 0x38, 0x37, 0x2e, 0x31, 0x38, 0x20, 0x4c, 0x20,
+	0x37, 0x32, 0x37, 0x2e, 0x32, 0x30, 0x35, 0x20, 0x31, 0x37, 0x36, 0x36, 0x2e, 0x33, 0x36, 0x20,
+	0x43, 0x20, 0x37, 0x31, 0x33, 0x2e, 0x32, 0x20, 0x31, 0x37, 0x38, 0x30, 0x2e, 0x33, 0x35, 0x20,
+	0x37, 0x30, 0x31, 0x2e, 0x30, 0x30, 0x39, 0x20, 0x31, 0x37, 0x39, 0x30, 0x2e, 0x34, 0x35, 0x20,
+	0x36, 0x37, 0x39, 0x2e, 0x35, 0x30, 0x32, 0x20, 0x31, 0x37, 0x39, 0x30, 0x2e, 0x32, 0x38, 0x20,
+	0x43, 0x20, 0x36, 0x36, 0x35, 0x2e, 0x35, 0x38, 0x33, 0x20, 0x31, 0x37, 0x39, 0x30, 0x2e, 0x31,
+	0x37, 0x20, 0x36, 0x35, 0x32, 0x2e, 0x32, 0x34, 0x38, 0x20, 0x31, 0x37, 0x38, 0x34, 0x2e, 0x33,
+	0x35, 0x20, 0x36, 0x34, 0x32, 0x2e, 0x37, 0x35, 0x37, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x30,
+	0x38, 0x20, 0x43, 0x20, 0x36, 0x33, 0x34, 0x2e, 0x39, 0x38, 0x31, 0x20, 0x31, 0x37, 0x36, 0x35,
+	0x2e, 0x36, 0x32, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x31, 0x37, 0x35, 0x34,
+	0x2e, 0x38, 0x39, 0x20, 0x36, 0x32, 0x38, 0x2e, 0x38, 0x37, 0x20, 0x31, 0x37, 0x34, 0x33, 0x2e,
+	0x34, 0x37, 0x20, 0x43, 0x20, 0x36, 0x32, 0x36, 0x2e, 0x37, 0x37, 0x37, 0x20, 0x31, 0x37, 0x32,
+	0x35, 0x2e, 0x32, 0x38, 0x20, 0x36, 0x33, 0x32, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x31, 0x36, 0x38,
+	0x37, 0x2e, 0x39, 0x36, 0x20, 0x36, 0x33, 0x33, 0x2e, 0x39, 0x35, 0x33, 0x20, 0x31, 0x36, 0x36,
+	0x38, 0x2e, 0x30, 0x35, 0x20, 0x43, 0x20, 0x36, 0x33, 0x37, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x36,
+	0x31, 0x31, 0x2e, 0x39, 0x39, 0x20, 0x36, 0x34, 0x35, 0x2e, 0x31, 0x32, 0x32, 0x20, 0x31, 0x35,
+	0x35, 0x33, 0x2e, 0x32, 0x20, 0x36, 0x34, 0x37, 0x2e, 0x31, 0x35, 0x32, 0x20, 0x31, 0x34, 0x39,
+	0x37, 0x2e, 0x32, 0x38, 0x20, 0x43, 0x20, 0x36, 0x34, 0x31, 0x2e, 0x38, 0x35, 0x33, 0x20, 0x31,
+	0x34, 0x39, 0x36, 0x2e, 0x33, 0x20, 0x36, 0x33, 0x35, 0x2e, 0x37, 0x32, 0x36, 0x20, 0x31, 0x34,
+	0x39, 0x35, 0x2e, 0x32, 0x37, 0x20, 0x36, 0x33, 0x30, 0x2e, 0x34, 0x34, 0x37, 0x20, 0x31, 0x34,
+	0x39, 0x34, 0x2e, 0x35, 0x38, 0x20, 0x43, 0x20, 0x34, 0x35, 0x30, 0x2e, 0x35, 0x31, 0x39, 0x20,
+	0x31, 0x34, 0x37, 0x31, 0x2e, 0x31, 0x33, 0x20, 0x33, 0x30, 0x36, 0x2e, 0x34, 0x36, 0x34, 0x20,
+	0x31, 0x33, 0x32, 0x36, 0x2e, 0x33, 0x31, 0x20, 0x32, 0x39, 0x35, 0x2e, 0x36, 0x30, 0x34, 0x20,
+	0x31, 0x31, 0x34, 0x33, 0x2e, 0x32, 0x37, 0x20, 0x43, 0x20, 0x32, 0x39, 0x34, 0x2e, 0x30, 0x34,
+	0x34, 0x20, 0x31, 0x31, 0x31, 0x36, 0x2e, 0x39, 0x38, 0x20, 0x32, 0x39, 0x34, 0x2e, 0x39, 0x36,
+	0x35, 0x20, 0x31, 0x30, 0x38, 0x38, 0x2e, 0x36, 0x37, 0x20, 0x32, 0x39, 0x34, 0x2e, 0x39, 0x36,
+	0x35, 0x20, 0x31, 0x30, 0x36, 0x31, 0x2e, 0x39, 0x33, 0x20, 0x4c, 0x20, 0x32, 0x39, 0x34, 0x2e,
+	0x38, 0x39, 0x33, 0x20, 0x39, 0x32, 0x33, 0x2e, 0x30, 0x32, 0x39, 0x20, 0x4c, 0x20, 0x32, 0x39,
+	0x35, 0x2e, 0x30, 0x32, 0x39, 0x20, 0x38, 0x30, 0x38, 0x2e, 0x30, 0x33, 0x33, 0x20, 0x43, 0x20,
+	0x32, 0x39, 0x35, 0x2e, 0x30, 0x36, 0x35, 0x20, 0x37, 0x37, 0x36, 0x2e, 0x38, 0x39, 0x32, 0x20,
+	0x32, 0x39, 0x34, 0x2e, 0x31, 0x35, 0x32, 0x20, 0x37, 0x34, 0x31, 0x2e, 0x30, 0x38, 0x34, 0x20,
+	0x32, 0x39, 0x37, 0x2e, 0x33, 0x34, 0x34, 0x20, 0x37, 0x31, 0x30, 0x2e, 0x33, 0x34, 0x37, 0x20,
+	0x43, 0x20, 0x33, 0x30, 0x36, 0x2e, 0x36, 0x34, 0x39, 0x20, 0x36, 0x32, 0x38, 0x2e, 0x35, 0x32,
+	0x37, 0x20, 0x33, 0x34, 0x30, 0x2e, 0x38, 0x33, 0x33, 0x20, 0x35, 0x35, 0x31, 0x2e, 0x35, 0x33,
+	0x31, 0x20, 0x33, 0x39, 0x35, 0x2e, 0x32, 0x38, 0x33, 0x20, 0x34, 0x38, 0x39, 0x2e, 0x37, 0x35,
+	0x34, 0x20, 0x43, 0x20, 0x34, 0x36, 0x36, 0x2e, 0x30, 0x32, 0x35, 0x20, 0x34, 0x31, 0x30, 0x2e,
+	0x35, 0x30, 0x38, 0x20, 0x35, 0x35, 0x39, 0x2e, 0x35, 0x30, 0x34, 0x20, 0x33, 0x36, 0x36, 0x2e,
+	0x36, 0x38, 0x37, 0x20, 0x36, 0x36, 0x35, 0x2e, 0x33, 0x20, 0x33, 0x36, 0x30, 0x2e, 0x34, 0x32,
+	0x35, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74,
+	0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67,
+	0x62, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x2c, 0x32, 0x35, 0x35, 0x29, 0x22, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x36, 0x36, 0x31, 0x2e, 0x39, 0x30, 0x32, 0x20, 0x34, 0x35, 0x38,
+	0x2e, 0x34, 0x32, 0x31, 0x20, 0x43, 0x20, 0x36, 0x36, 0x35, 0x2e, 0x32, 0x33, 0x32, 0x20, 0x34,
+	0x35, 0x38, 0x2e, 0x31, 0x30, 0x31, 0x20, 0x36, 0x36, 0x38, 0x2e, 0x31, 0x39, 0x31, 0x20, 0x34,
+	0x35, 0x37, 0x2e, 0x39, 0x39, 0x37, 0x20, 0x36, 0x37, 0x31, 0x2e, 0x35, 0x32, 0x37, 0x20, 0x34,
+	0x35, 0x37, 0x2e, 0x39, 0x39, 0x36, 0x20, 0x43, 0x20, 0x37, 0x34, 0x38, 0x2e, 0x39, 0x38, 0x35,
+	0x20, 0x34, 0x35, 0x37, 0x2e, 0x39, 0x35, 0x35, 0x20, 0x38, 0x32, 0x36, 0x2e, 0x35, 0x32, 0x37,
+	0x20, 0x34, 0x35, 0x38, 0x2e, 0x38, 0x20, 0x39, 0x30, 0x33, 0x2e, 0x39, 0x38, 0x34, 0x20, 0x34,
+	0x35, 0x38, 0x2e, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x33, 0x39, 0x2e, 0x33, 0x35, 0x20, 0x34,
+	0x35, 0x38, 0x2e, 0x36, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x37, 0x38, 0x2e, 0x31, 0x34, 0x20,
+	0x34, 0x35, 0x38, 0x2e, 0x35, 0x38, 0x35, 0x20, 0x43, 0x20, 0x31, 0x34, 0x31, 0x33, 0x2e, 0x33,
+	0x34, 0x20, 0x34, 0x35, 0x38, 0x2e, 0x37, 0x36, 0x39, 0x20, 0x31, 0x34, 0x34, 0x34, 0x2e, 0x33,
+	0x34, 0x20, 0x34, 0x35, 0x37, 0x2e, 0x34, 0x31, 0x36, 0x20, 0x31, 0x34, 0x37, 0x39, 0x2e, 0x32,
+	0x20, 0x34, 0x36, 0x34, 0x2e, 0x35, 0x30, 0x39, 0x20, 0x43, 0x20, 0x31, 0x35, 0x33, 0x35, 0x2e,
+	0x34, 0x37, 0x20, 0x34, 0x37, 0x35, 0x2e, 0x36, 0x33, 0x32, 0x20, 0x31, 0x35, 0x38, 0x37, 0x2e,
+	0x32, 0x20, 0x35, 0x30, 0x33, 0x2e, 0x31, 0x32, 0x37, 0x20, 0x31, 0x36, 0x32, 0x37, 0x2e, 0x38,
+	0x39, 0x20, 0x35, 0x34, 0x33, 0x2e, 0x35, 0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x36, 0x37, 0x32,
+	0x2e, 0x35, 0x37, 0x20, 0x35, 0x38, 0x37, 0x2e, 0x33, 0x30, 0x33, 0x20, 0x31, 0x37, 0x30, 0x31,
+	0x2e, 0x34, 0x34, 0x20, 0x36, 0x34, 0x34, 0x2e, 0x36, 0x37, 0x31, 0x20, 0x31, 0x37, 0x30, 0x39,
+	0x2e, 0x39, 0x35, 0x20, 0x37, 0x30, 0x36, 0x2e, 0x36, 0x32, 0x37, 0x20, 0x43, 0x20, 0x31, 0x37,
+	0x31, 0x33, 0x2e, 0x31, 0x33, 0x20, 0x37, 0x32, 0x39, 0x2e, 0x39, 0x37, 0x39, 0x20, 0x31, 0x37,
+	0x31, 0x33, 0x2e, 0x31, 0x36, 0x20, 0x37, 0x34, 0x38, 0x2e, 0x34, 0x36, 0x38, 0x20, 0x31, 0x37,
+	0x31, 0x33, 0x2e, 0x33, 0x31, 0x20, 0x37, 0x37, 0x31, 0x2e, 0x38, 0x36, 0x36, 0x20, 0x4c, 0x20,
+	0x31, 0x37, 0x31, 0x33, 0x2e, 0x32, 0x20, 0x39, 0x37, 0x37, 0x2e, 0x34, 0x30, 0x34, 0x20, 0x4c,
+	0x20, 0x31, 0x37, 0x31, 0x33, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x30, 0x36, 0x32, 0x2e, 0x32, 0x35,
+	0x20, 0x43, 0x20, 0x31, 0x37, 0x31, 0x33, 0x2e, 0x34, 0x34, 0x20, 0x31, 0x30, 0x37, 0x32, 0x2e,
+	0x32, 0x34, 0x20, 0x31, 0x37, 0x31, 0x32, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x30, 0x38, 0x34, 0x2e,
+	0x31, 0x34, 0x20, 0x31, 0x37, 0x31, 0x33, 0x2e, 0x35, 0x37, 0x20, 0x31, 0x30, 0x39, 0x34, 0x20,
+	0x43, 0x20, 0x31, 0x37, 0x32, 0x32, 0x2e, 0x39, 0x32, 0x20, 0x31, 0x32, 0x34, 0x36, 0x2e, 0x38,
+	0x20, 0x31, 0x36, 0x30, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x33, 0x38, 0x33, 0x2e, 0x39, 0x35, 0x20,
+	0x31, 0x34, 0x35, 0x31, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x34, 0x30, 0x30, 0x2e, 0x36, 0x32, 0x20,
+	0x43, 0x20, 0x31, 0x34, 0x32, 0x32, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x34, 0x30, 0x33, 0x2e, 0x38,
+	0x33, 0x20, 0x31, 0x33, 0x38, 0x36, 0x2e, 0x32, 0x39, 0x20, 0x31, 0x34, 0x30, 0x31, 0x2e, 0x39,
+	0x38, 0x20, 0x31, 0x33, 0x35, 0x36, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x34, 0x30, 0x31, 0x2e, 0x39,
+	0x38, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x30, 0x38, 0x2e, 0x35, 0x20, 0x31, 0x34, 0x30, 0x31, 0x2e,
+	0x39, 0x35, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x34, 0x30,
+	0x32, 0x2e, 0x33, 0x33, 0x20, 0x43, 0x20, 0x31, 0x30, 0x33, 0x30, 0x2e, 0x37, 0x20, 0x31, 0x34,
+	0x30, 0x32, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x30, 0x35, 0x2e, 0x38, 0x20, 0x31, 0x34, 0x30,
+	0x31, 0x2e, 0x38, 0x33, 0x20, 0x39, 0x38, 0x30, 0x2e, 0x39, 0x36, 0x36, 0x20, 0x31, 0x34, 0x30,
+	0x32, 0x2e, 0x30, 0x31, 0x20, 0x43, 0x20, 0x39, 0x36, 0x38, 0x2e, 0x34, 0x36, 0x39, 0x20, 0x31,
+	0x34, 0x30, 0x32, 0x2e, 0x31, 0x20, 0x39, 0x36, 0x33, 0x2e, 0x30, 0x39, 0x39, 0x20, 0x31, 0x34,
+	0x30, 0x32, 0x2e, 0x39, 0x37, 0x20, 0x39, 0x35, 0x32, 0x2e, 0x37, 0x30, 0x34, 0x20, 0x31, 0x34,
+	0x31, 0x30, 0x2e, 0x36, 0x20, 0x43, 0x20, 0x39, 0x34, 0x32, 0x2e, 0x31, 0x30, 0x37, 0x20, 0x31,
+	0x34, 0x31, 0x38, 0x2e, 0x33, 0x37, 0x20, 0x39, 0x33, 0x31, 0x2e, 0x33, 0x33, 0x31, 0x20, 0x31,
+	0x34, 0x32, 0x39, 0x2e, 0x36, 0x38, 0x20, 0x39, 0x32, 0x31, 0x2e, 0x37, 0x38, 0x39, 0x20, 0x31,
+	0x34, 0x33, 0x38, 0x2e, 0x39, 0x39, 0x20, 0x4c, 0x20, 0x38, 0x37, 0x35, 0x2e, 0x35, 0x38, 0x39,
+	0x20, 0x31, 0x34, 0x38, 0x34, 0x2e, 0x31, 0x37, 0x20, 0x4c, 0x20, 0x37, 0x39, 0x31, 0x2e, 0x32,
+	0x39, 0x36, 0x20, 0x31, 0x35, 0x36, 0x37, 0x2e, 0x31, 0x35, 0x20, 0x43, 0x20, 0x37, 0x37, 0x31,
+	0x2e, 0x31, 0x37, 0x34, 0x20, 0x31, 0x35, 0x38, 0x36, 0x2e, 0x38, 0x36, 0x20, 0x37, 0x35, 0x30,
+	0x2e, 0x30, 0x32, 0x39, 0x20, 0x31, 0x36, 0x30, 0x36, 0x2e, 0x38, 0x35, 0x20, 0x37, 0x33, 0x30,
+	0x2e, 0x37, 0x33, 0x20, 0x31, 0x36, 0x32, 0x37, 0x2e, 0x31, 0x38, 0x20, 0x43, 0x20, 0x37, 0x33,
+	0x31, 0x2e, 0x30, 0x39, 0x39, 0x20, 0x31, 0x36, 0x31, 0x35, 0x2e, 0x34, 0x39, 0x20, 0x37, 0x33,
+	0x33, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x35, 0x39, 0x37, 0x2e, 0x37, 0x20, 0x37, 0x33, 0x34, 0x2e,
+	0x34, 0x39, 0x34, 0x20, 0x31, 0x35, 0x38, 0x35, 0x2e, 0x34, 0x37, 0x20, 0x4c, 0x20, 0x37, 0x34,
+	0x32, 0x2e, 0x32, 0x37, 0x38, 0x20, 0x31, 0x34, 0x39, 0x38, 0x2e, 0x35, 0x37, 0x20, 0x43, 0x20,
+	0x37, 0x34, 0x33, 0x2e, 0x36, 0x39, 0x34, 0x20, 0x31, 0x34, 0x38, 0x32, 0x2e, 0x35, 0x38, 0x20,
+	0x37, 0x34, 0x36, 0x2e, 0x33, 0x33, 0x32, 0x20, 0x31, 0x34, 0x36, 0x33, 0x2e, 0x38, 0x37, 0x20,
+	0x37, 0x34, 0x35, 0x2e, 0x32, 0x34, 0x35, 0x20, 0x31, 0x34, 0x34, 0x38, 0x2e, 0x34, 0x39, 0x20,
+	0x43, 0x20, 0x37, 0x34, 0x32, 0x2e, 0x35, 0x39, 0x39, 0x20, 0x31, 0x34, 0x31, 0x37, 0x2e, 0x39,
+	0x32, 0x20, 0x37, 0x31, 0x38, 0x2e, 0x33, 0x34, 0x20, 0x31, 0x34, 0x30, 0x30, 0x2e, 0x38, 0x32,
+	0x20, 0x36, 0x38, 0x39, 0x2e, 0x30, 0x30, 0x36, 0x20, 0x31, 0x34, 0x30, 0x31, 0x2e, 0x37, 0x37,
+	0x20, 0x43, 0x20, 0x36, 0x31, 0x38, 0x2e, 0x33, 0x35, 0x39, 0x20, 0x31, 0x34, 0x30, 0x34, 0x2e,
+	0x30, 0x37, 0x20, 0x35, 0x35, 0x30, 0x2e, 0x31, 0x34, 0x35, 0x20, 0x31, 0x33, 0x38, 0x30, 0x2e,
+	0x38, 0x36, 0x20, 0x34, 0x39, 0x35, 0x2e, 0x39, 0x33, 0x37, 0x20, 0x31, 0x33, 0x33, 0x35, 0x2e,
+	0x34, 0x37, 0x20, 0x43, 0x20, 0x34, 0x33, 0x36, 0x2e, 0x38, 0x34, 0x32, 0x20, 0x31, 0x32, 0x38,
+	0x36, 0x2e, 0x37, 0x35, 0x20, 0x33, 0x39, 0x39, 0x2e, 0x37, 0x39, 0x39, 0x20, 0x31, 0x32, 0x31,
+	0x36, 0x2e, 0x33, 0x33, 0x20, 0x33, 0x39, 0x33, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x31, 0x31, 0x34,
+	0x30, 0x2e, 0x30, 0x33, 0x20, 0x43, 0x20, 0x33, 0x39, 0x31, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x31,
+	0x31, 0x36, 0x2e, 0x30, 0x34, 0x20, 0x33, 0x39, 0x31, 0x2e, 0x38, 0x38, 0x34, 0x20, 0x31, 0x30,
+	0x38, 0x36, 0x2e, 0x39, 0x31, 0x20, 0x33, 0x39, 0x31, 0x2e, 0x38, 0x39, 0x36, 0x20, 0x31, 0x30,
+	0x36, 0x32, 0x2e, 0x34, 0x33, 0x20, 0x4c, 0x20, 0x33, 0x39, 0x31, 0x2e, 0x39, 0x35, 0x39, 0x20,
+	0x39, 0x34, 0x30, 0x2e, 0x38, 0x35, 0x32, 0x20, 0x4c, 0x20, 0x33, 0x39, 0x31, 0x2e, 0x39, 0x33,
+	0x39, 0x20, 0x38, 0x30, 0x37, 0x2e, 0x30, 0x33, 0x20, 0x43, 0x20, 0x33, 0x39, 0x31, 0x2e, 0x39,
+	0x32, 0x37, 0x20, 0x37, 0x36, 0x38, 0x2e, 0x34, 0x37, 0x37, 0x20, 0x33, 0x39, 0x30, 0x2e, 0x32,
+	0x33, 0x34, 0x20, 0x37, 0x32, 0x34, 0x2e, 0x34, 0x33, 0x33, 0x20, 0x33, 0x39, 0x38, 0x2e, 0x30,
+	0x33, 0x36, 0x20, 0x36, 0x38, 0x37, 0x2e, 0x30, 0x33, 0x32, 0x20, 0x43, 0x20, 0x34, 0x30, 0x37,
+	0x2e, 0x39, 0x30, 0x39, 0x20, 0x36, 0x34, 0x31, 0x2e, 0x33, 0x36, 0x36, 0x20, 0x34, 0x32, 0x38,
+	0x2e, 0x37, 0x30, 0x35, 0x20, 0x35, 0x39, 0x38, 0x2e, 0x37, 0x37, 0x34, 0x20, 0x34, 0x35, 0x38,
+	0x2e, 0x36, 0x34, 0x33, 0x20, 0x35, 0x36, 0x32, 0x2e, 0x39, 0x30, 0x36, 0x20, 0x43, 0x20, 0x35,
+	0x31, 0x31, 0x2e, 0x39, 0x33, 0x33, 0x20, 0x35, 0x30, 0x30, 0x2e, 0x31, 0x36, 0x36, 0x20, 0x35,
+	0x37, 0x39, 0x2e, 0x36, 0x36, 0x37, 0x20, 0x34, 0x36, 0x34, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x36,
+	0x36, 0x31, 0x2e, 0x39, 0x30, 0x32, 0x20, 0x34, 0x35, 0x38, 0x2e, 0x34, 0x32, 0x31, 0x20, 0x7a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30,
+	0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x39,
+	0x35, 0x2c, 0x31, 0x35, 0x35, 0x2c, 0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x20, 0x37, 0x34, 0x35, 0x2e, 0x36, 0x32, 0x39, 0x20, 0x31, 0x30, 0x38, 0x35, 0x2e, 0x35, 0x31,
+	0x20, 0x4c, 0x20, 0x31, 0x31, 0x39, 0x38, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x30, 0x38, 0x35, 0x2e,
+	0x32, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x35, 0x31, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x30, 0x38,
+	0x35, 0x2e, 0x34, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x37, 0x34, 0x2e, 0x37, 0x20, 0x31, 0x30,
+	0x38, 0x35, 0x2e, 0x36, 0x32, 0x20, 0x31, 0x33, 0x39, 0x39, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x30,
+	0x38, 0x34, 0x2e, 0x39, 0x39, 0x20, 0x31, 0x34, 0x32, 0x32, 0x2e, 0x30, 0x34, 0x20, 0x31, 0x30,
+	0x38, 0x36, 0x2e, 0x34, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x33, 0x31, 0x2e, 0x37, 0x20, 0x31,
+	0x30, 0x38, 0x37, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x34, 0x34, 0x32, 0x2e, 0x31, 0x39, 0x20, 0x31,
+	0x30, 0x39, 0x33, 0x2e, 0x31, 0x32, 0x20, 0x31, 0x34, 0x34, 0x39, 0x2e, 0x31, 0x37, 0x20, 0x31,
+	0x30, 0x39, 0x39, 0x2e, 0x38, 0x36, 0x20, 0x43, 0x20, 0x31, 0x34, 0x35, 0x39, 0x2e, 0x31, 0x39,
+	0x20, 0x31, 0x31, 0x30, 0x39, 0x2e, 0x36, 0x33, 0x20, 0x31, 0x34, 0x36, 0x34, 0x2e, 0x38, 0x37,
+	0x20, 0x31, 0x31, 0x32, 0x33, 0x2e, 0x30, 0x31, 0x20, 0x31, 0x34, 0x36, 0x34, 0x2e, 0x39, 0x34,
+	0x20, 0x31, 0x31, 0x33, 0x37, 0x20, 0x43, 0x20, 0x31, 0x34, 0x36, 0x35, 0x2e, 0x30, 0x38, 0x20,
+	0x31, 0x31, 0x35, 0x39, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x34, 0x34, 0x39, 0x2e, 0x35, 0x35, 0x20,
+	0x31, 0x31, 0x38, 0x30, 0x2e, 0x38, 0x20, 0x31, 0x34, 0x32, 0x37, 0x2e, 0x39, 0x35, 0x20, 0x31,
+	0x31, 0x38, 0x34, 0x2e, 0x36, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x31, 0x32, 0x2e, 0x30, 0x32,
+	0x20, 0x31, 0x31, 0x38, 0x37, 0x2e, 0x34, 0x36, 0x20, 0x31, 0x33, 0x38, 0x39, 0x2e, 0x36, 0x36,
+	0x20, 0x31, 0x31, 0x38, 0x36, 0x2e, 0x31, 0x38, 0x20, 0x31, 0x33, 0x37, 0x33, 0x2e, 0x30, 0x37,
+	0x20, 0x31, 0x31, 0x38, 0x36, 0x2e, 0x30, 0x36, 0x20, 0x4c, 0x20, 0x39, 0x31, 0x33, 0x2e, 0x35,
+	0x39, 0x35, 0x20, 0x31, 0x31, 0x38, 0x36, 0x2e, 0x30, 0x31, 0x20, 0x4c, 0x20, 0x37, 0x37, 0x32,
+	0x2e, 0x32, 0x35, 0x20, 0x31, 0x31, 0x38, 0x36, 0x2e, 0x36, 0x34, 0x20, 0x43, 0x20, 0x37, 0x34,
+	0x38, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x31, 0x38, 0x36, 0x2e, 0x36, 0x35, 0x20, 0x37, 0x32, 0x33,
+	0x2e, 0x38, 0x37, 0x31, 0x20, 0x31, 0x31, 0x38, 0x37, 0x2e, 0x33, 0x35, 0x20, 0x37, 0x30, 0x30,
+	0x2e, 0x30, 0x39, 0x34, 0x20, 0x31, 0x31, 0x38, 0x35, 0x2e, 0x36, 0x33, 0x20, 0x43, 0x20, 0x36,
+	0x35, 0x38, 0x2e, 0x37, 0x32, 0x35, 0x20, 0x31, 0x31, 0x38, 0x32, 0x2e, 0x35, 0x37, 0x20, 0x36,
+	0x34, 0x31, 0x2e, 0x36, 0x39, 0x35, 0x20, 0x31, 0x31, 0x33, 0x30, 0x2e, 0x35, 0x34, 0x20, 0x36,
+	0x37, 0x30, 0x2e, 0x30, 0x35, 0x38, 0x20, 0x31, 0x31, 0x30, 0x31, 0x2e, 0x32, 0x20, 0x43, 0x20,
+	0x36, 0x38, 0x39, 0x2e, 0x36, 0x30, 0x33, 0x20, 0x31, 0x30, 0x38, 0x30, 0x2e, 0x39, 0x38, 0x20,
+	0x37, 0x31, 0x39, 0x2e, 0x34, 0x31, 0x32, 0x20, 0x31, 0x30, 0x38, 0x35, 0x2e, 0x35, 0x35, 0x20,
+	0x37, 0x34, 0x35, 0x2e, 0x36, 0x32, 0x39, 0x20, 0x31, 0x30, 0x38, 0x35, 0x2e, 0x35, 0x31, 0x20,
+	0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28,
+	0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28,
+	0x39, 0x35, 0x2c, 0x31, 0x35, 0x35, 0x2c, 0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x20, 0x37, 0x33, 0x36, 0x2e, 0x35, 0x37, 0x32, 0x20, 0x38, 0x37, 0x37, 0x2e, 0x35, 0x20,
+	0x4c, 0x20, 0x31, 0x31, 0x39, 0x33, 0x2e, 0x36, 0x32, 0x20, 0x38, 0x37, 0x37, 0x2e, 0x35, 0x33,
+	0x32, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x34, 0x35, 0x2e, 0x31, 0x35, 0x20, 0x38, 0x37, 0x37, 0x2e,
+	0x33, 0x32, 0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x36, 0x39, 0x2e, 0x36, 0x33, 0x20, 0x38, 0x37,
+	0x37, 0x2e, 0x33, 0x33, 0x36, 0x20, 0x31, 0x33, 0x39, 0x35, 0x2e, 0x33, 0x36, 0x20, 0x38, 0x37,
+	0x36, 0x2e, 0x39, 0x32, 0x38, 0x20, 0x31, 0x34, 0x31, 0x39, 0x2e, 0x37, 0x39, 0x20, 0x38, 0x37,
+	0x38, 0x2e, 0x31, 0x32, 0x20, 0x43, 0x20, 0x31, 0x34, 0x32, 0x39, 0x2e, 0x36, 0x34, 0x20, 0x38,
+	0x37, 0x38, 0x2e, 0x36, 0x30, 0x31, 0x20, 0x31, 0x34, 0x34, 0x30, 0x2e, 0x32, 0x37, 0x20, 0x38,
+	0x38, 0x33, 0x2e, 0x37, 0x31, 0x39, 0x20, 0x31, 0x34, 0x34, 0x37, 0x2e, 0x36, 0x35, 0x20, 0x38,
+	0x39, 0x30, 0x2e, 0x33, 0x34, 0x32, 0x20, 0x43, 0x20, 0x31, 0x34, 0x35, 0x37, 0x2e, 0x35, 0x38,
+	0x20, 0x38, 0x39, 0x39, 0x2e, 0x32, 0x31, 0x36, 0x20, 0x31, 0x34, 0x36, 0x33, 0x2e, 0x35, 0x36,
+	0x20, 0x39, 0x31, 0x31, 0x2e, 0x36, 0x38, 0x20, 0x31, 0x34, 0x36, 0x34, 0x2e, 0x32, 0x38, 0x20,
+	0x39, 0x32, 0x34, 0x2e, 0x39, 0x37, 0x38, 0x20, 0x43, 0x20, 0x31, 0x34, 0x36, 0x34, 0x2e, 0x39,
+	0x39, 0x20, 0x39, 0x33, 0x38, 0x2e, 0x37, 0x39, 0x31, 0x20, 0x31, 0x34, 0x36, 0x30, 0x2e, 0x34,
+	0x31, 0x20, 0x39, 0x35, 0x32, 0x2e, 0x34, 0x35, 0x33, 0x20, 0x31, 0x34, 0x35, 0x30, 0x2e, 0x38,
+	0x31, 0x20, 0x39, 0x36, 0x32, 0x2e, 0x35, 0x36, 0x33, 0x20, 0x43, 0x20, 0x31, 0x34, 0x33, 0x33,
+	0x2e, 0x38, 0x37, 0x20, 0x39, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x33, 0x20, 0x31, 0x34, 0x30, 0x39,
+	0x2e, 0x34, 0x20, 0x39, 0x37, 0x37, 0x2e, 0x37, 0x37, 0x35, 0x20, 0x31, 0x33, 0x38, 0x36, 0x2e,
+	0x37, 0x34, 0x20, 0x39, 0x37, 0x37, 0x2e, 0x38, 0x31, 0x36, 0x20, 0x4c, 0x20, 0x39, 0x30, 0x37,
+	0x2e, 0x38, 0x32, 0x37, 0x20, 0x39, 0x37, 0x37, 0x2e, 0x36, 0x38, 0x34, 0x20, 0x4c, 0x20, 0x37,
+	0x37, 0x38, 0x2e, 0x33, 0x36, 0x38, 0x20, 0x39, 0x37, 0x37, 0x2e, 0x34, 0x34, 0x32, 0x20, 0x43,
+	0x20, 0x37, 0x35, 0x32, 0x2e, 0x36, 0x33, 0x39, 0x20, 0x39, 0x37, 0x37, 0x2e, 0x35, 0x39, 0x33,
+	0x20, 0x37, 0x32, 0x36, 0x2e, 0x34, 0x36, 0x33, 0x20, 0x39, 0x37, 0x38, 0x2e, 0x34, 0x37, 0x34,
+	0x20, 0x37, 0x30, 0x30, 0x2e, 0x38, 0x31, 0x32, 0x20, 0x39, 0x37, 0x37, 0x2e, 0x32, 0x30, 0x32,
+	0x20, 0x43, 0x20, 0x36, 0x37, 0x36, 0x2e, 0x30, 0x38, 0x31, 0x20, 0x39, 0x37, 0x35, 0x2e, 0x39,
+	0x37, 0x35, 0x20, 0x36, 0x35, 0x37, 0x2e, 0x35, 0x38, 0x39, 0x20, 0x39, 0x35, 0x34, 0x2e, 0x33,
+	0x30, 0x33, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x36, 0x36, 0x37, 0x20, 0x39, 0x32, 0x39, 0x2e, 0x39,
+	0x39, 0x39, 0x20, 0x43, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x31, 0x32, 0x36, 0x20, 0x39, 0x31, 0x36,
+	0x2e, 0x32, 0x20, 0x36, 0x36, 0x31, 0x2e, 0x32, 0x33, 0x34, 0x20, 0x39, 0x30, 0x32, 0x2e, 0x37,
+	0x37, 0x38, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x38, 0x31, 0x32, 0x20, 0x38, 0x39, 0x32, 0x2e, 0x38,
+	0x33, 0x20, 0x43, 0x20, 0x36, 0x38, 0x38, 0x2e, 0x33, 0x32, 0x35, 0x20, 0x38, 0x37, 0x34, 0x2e,
+	0x36, 0x38, 0x32, 0x20, 0x37, 0x31, 0x33, 0x2e, 0x31, 0x35, 0x31, 0x20, 0x38, 0x37, 0x37, 0x2e,
+	0x36, 0x31, 0x35, 0x20, 0x37, 0x33, 0x36, 0x2e, 0x35, 0x37, 0x32, 0x20, 0x38, 0x37, 0x37, 0x2e,
+	0x35, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74,
+	0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67,
+	0x62, 0x28, 0x39, 0x35, 0x2c, 0x31, 0x35, 0x35, 0x2c, 0x32, 0x31, 0x34, 0x29, 0x22, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x20, 0x36, 0x39, 0x39, 0x2e, 0x32, 0x36, 0x39, 0x20, 0x36, 0x37, 0x30, 0x2e,
+	0x31, 0x39, 0x20, 0x43, 0x20, 0x37, 0x31, 0x31, 0x2e, 0x34, 0x34, 0x39, 0x20, 0x36, 0x36, 0x39,
+	0x2e, 0x34, 0x32, 0x35, 0x20, 0x37, 0x32, 0x37, 0x2e, 0x38, 0x33, 0x33, 0x20, 0x36, 0x36, 0x39,
+	0x2e, 0x38, 0x34, 0x32, 0x20, 0x37, 0x34, 0x30, 0x2e, 0x31, 0x38, 0x36, 0x20, 0x36, 0x36, 0x39,
+	0x2e, 0x38, 0x35, 0x39, 0x20, 0x4c, 0x20, 0x38, 0x31, 0x31, 0x2e, 0x31, 0x34, 0x35, 0x20, 0x36,
+	0x36, 0x39, 0x2e, 0x39, 0x37, 0x35, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x32, 0x35, 0x2e, 0x36, 0x31,
+	0x20, 0x36, 0x37, 0x30, 0x2e, 0x30, 0x30, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x38, 0x34, 0x2e,
+	0x33, 0x35, 0x20, 0x36, 0x36, 0x39, 0x2e, 0x38, 0x38, 0x20, 0x43, 0x20, 0x31, 0x33, 0x32, 0x37,
+	0x2e, 0x35, 0x35, 0x20, 0x36, 0x36, 0x39, 0x2e, 0x38, 0x37, 0x35, 0x20, 0x31, 0x33, 0x37, 0x31,
+	0x2e, 0x31, 0x34, 0x20, 0x36, 0x36, 0x39, 0x2e, 0x37, 0x33, 0x36, 0x20, 0x31, 0x34, 0x31, 0x34,
+	0x2e, 0x33, 0x35, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x31, 0x30, 0x36, 0x20, 0x43, 0x20, 0x31, 0x34,
+	0x32, 0x34, 0x2e, 0x30, 0x33, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x37, 0x31, 0x34, 0x20, 0x31, 0x34,
+	0x33, 0x30, 0x2e, 0x31, 0x33, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x34, 0x32, 0x37, 0x20, 0x31, 0x34,
+	0x33, 0x38, 0x2e, 0x36, 0x38, 0x20, 0x36, 0x37, 0x35, 0x2e, 0x37, 0x37, 0x20, 0x43, 0x20, 0x31,
+	0x34, 0x37, 0x39, 0x2e, 0x36, 0x35, 0x20, 0x37, 0x30, 0x31, 0x2e, 0x33, 0x39, 0x31, 0x20, 0x31,
+	0x34, 0x37, 0x30, 0x2e, 0x39, 0x33, 0x20, 0x37, 0x35, 0x38, 0x2e, 0x39, 0x30, 0x38, 0x20, 0x31,
+	0x34, 0x32, 0x33, 0x2e, 0x31, 0x35, 0x20, 0x37, 0x36, 0x38, 0x2e, 0x39, 0x32, 0x36, 0x20, 0x43,
+	0x20, 0x31, 0x34, 0x31, 0x34, 0x2e, 0x35, 0x34, 0x20, 0x37, 0x36, 0x39, 0x2e, 0x36, 0x32, 0x20,
+	0x31, 0x34, 0x30, 0x32, 0x2e, 0x33, 0x32, 0x20, 0x37, 0x36, 0x39, 0x2e, 0x32, 0x32, 0x35, 0x20,
+	0x31, 0x33, 0x39, 0x33, 0x2e, 0x34, 0x34, 0x20, 0x37, 0x36, 0x39, 0x2e, 0x32, 0x33, 0x36, 0x20,
+	0x4c, 0x20, 0x31, 0x33, 0x33, 0x39, 0x2e, 0x34, 0x20, 0x37, 0x36, 0x39, 0x2e, 0x33, 0x32, 0x32,
+	0x20, 0x4c, 0x20, 0x31, 0x31, 0x36, 0x34, 0x2e, 0x34, 0x34, 0x20, 0x37, 0x36, 0x39, 0x2e, 0x35,
+	0x36, 0x39, 0x20, 0x4c, 0x20, 0x38, 0x37, 0x30, 0x2e, 0x38, 0x36, 0x32, 0x20, 0x37, 0x36, 0x39,
+	0x2e, 0x37, 0x36, 0x32, 0x20, 0x43, 0x20, 0x38, 0x31, 0x37, 0x2e, 0x31, 0x39, 0x20, 0x37, 0x36,
+	0x39, 0x2e, 0x37, 0x32, 0x35, 0x20, 0x37, 0x36, 0x33, 0x2e, 0x35, 0x30, 0x32, 0x20, 0x37, 0x36,
+	0x39, 0x2e, 0x32, 0x33, 0x37, 0x20, 0x37, 0x30, 0x39, 0x2e, 0x38, 0x33, 0x35, 0x20, 0x37, 0x36,
+	0x39, 0x2e, 0x32, 0x32, 0x33, 0x20, 0x43, 0x20, 0x36, 0x38, 0x35, 0x2e, 0x31, 0x31, 0x34, 0x20,
+	0x37, 0x36, 0x39, 0x2e, 0x32, 0x31, 0x37, 0x20, 0x36, 0x36, 0x35, 0x2e, 0x30, 0x38, 0x31, 0x20,
+	0x37, 0x35, 0x37, 0x2e, 0x30, 0x31, 0x39, 0x20, 0x36, 0x35, 0x38, 0x2e, 0x32, 0x37, 0x37, 0x20,
+	0x37, 0x33, 0x32, 0x2e, 0x31, 0x35, 0x33, 0x20, 0x43, 0x20, 0x36, 0x35, 0x34, 0x2e, 0x36, 0x38,
+	0x38, 0x20, 0x37, 0x31, 0x38, 0x2e, 0x39, 0x32, 0x37, 0x20, 0x36, 0x35, 0x36, 0x2e, 0x37, 0x34,
+	0x38, 0x20, 0x37, 0x30, 0x34, 0x2e, 0x38, 0x30, 0x35, 0x20, 0x36, 0x36, 0x33, 0x2e, 0x39, 0x36,
+	0x34, 0x20, 0x36, 0x39, 0x33, 0x2e, 0x31, 0x35, 0x34, 0x20, 0x43, 0x20, 0x36, 0x37, 0x32, 0x2e,
+	0x34, 0x31, 0x34, 0x20, 0x36, 0x37, 0x39, 0x2e, 0x35, 0x36, 0x31, 0x20, 0x36, 0x38, 0x34, 0x2e,
+	0x32, 0x35, 0x31, 0x20, 0x36, 0x37, 0x33, 0x2e, 0x34, 0x36, 0x31, 0x20, 0x36, 0x39, 0x39, 0x2e,
+	0x32, 0x36, 0x39, 0x20, 0x36, 0x37, 0x30, 0x2e, 0x31, 0x39, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a,
+	0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e
+};
+
+static const unsigned char icon_prefs_advanced_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x01, 0x4e, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0xc5, 0x92, 0xb1,
+	0x4b, 0x02, 0x61, 0x18, 0x87, 0x5f, 0xa2, 0x21, 0xfa, 0x0b, 0x22, 0xa1, 0x12, 0x1a, 0x03, 0x85,
+	0x84, 0x1b, 0xa2, 0x21, 0xa2, 0xa0, 0x24, 0x68, 0x89, 0xa0, 0xfe, 0x83, 0xa6, 0x90, 0x16, 0x9b,
+	0xb4, 0xa5, 0x21, 0xa9, 0x25, 0x0b, 0x5a, 0x4c, 0xa5, 0xc5, 0x68, 0x88, 0x68, 0x11, 0x0c, 0x24,
+	0x84, 0x1a, 0xa4, 0xa0, 0x41, 0x1a, 0x2a, 0x82, 0x50, 0x21, 0x97, 0x0a, 0x31, 0x08, 0x7b, 0xe2,
+	0xcb, 0x3b, 0x39, 0xaf, 0x3b, 0x69, 0x08, 0x7a, 0xe0, 0x83, 0xfb, 0xee, 0xf7, 0x7b, 0x1f, 0xb8,
+	0xef, 0x3b, 0x91, 0xbf, 0x00, 0x11, 0x8c, 0x65, 0xcd, 0x9c, 0x68, 0xe9, 0x86, 0x4d, 0x82, 0xcf,
+	0x5f, 0x48, 0x54, 0x2f, 0x68, 0xed, 0x1d, 0xe9, 0x82, 0x5d, 0x7d, 0xb5, 0x84, 0x26, 0x16, 0x44,
+	0xd8, 0x6c, 0xe4, 0x3f, 0x3b, 0x19, 0x11, 0x2a, 0x22, 0xd4, 0x45, 0xb8, 0xb2, 0x29, 0xac, 0x8b,
+	0xb0, 0xe6, 0x34, 0x6c, 0x90, 0x73, 0xbb, 0x29, 0x26, 0x12, 0xbc, 0xa7, 0x52, 0x6c, 0xf5, 0xf6,
+	0x7e, 0x17, 0x4f, 0x7d, 0x3e, 0x1e, 0x42, 0x21, 0x0a, 0x7e, 0x3f, 0x73, 0xed, 0x86, 0x23, 0x2e,
+	0x17, 0x54, 0xab, 0x18, 0x94, 0xe2, 0x49, 0x4e, 0x3c, 0x9e, 0xe6, 0x5e, 0xf1, 0x1c, 0xdb, 0x77,
+	0x16, 0x14, 0xa3, 0x3b, 0x8d, 0xd6, 0x4d, 0x01, 0x34, 0x8d, 0xbb, 0xc9, 0x29, 0x72, 0xc1, 0x55,
+	0x08, 0x04, 0xc0, 0xe3, 0x45, 0xa9, 0x5f, 0x80, 0xc4, 0xd8, 0x84, 0xbd, 0xe4, 0xfe, 0xf0, 0x98,
+	0x27, 0xe0, 0xf1, 0x3c, 0x4f, 0x7d, 0x74, 0x9c, 0xfc, 0x90, 0x97, 0x6c, 0xff, 0x00, 0x95, 0xa5,
+	0x65, 0x3e, 0xa6, 0x67, 0xc8, 0x03, 0x17, 0x40, 0x6c, 0x76, 0xde, 0x5e, 0xb0, 0x31, 0xac, 0x71,
+	0x56, 0x7e, 0x25, 0x53, 0x83, 0xbd, 0x70, 0x84, 0x15, 0xfd, 0x66, 0xd2, 0xda, 0x08, 0x07, 0xd9,
+	0x4b, 0xe2, 0xe5, 0x37, 0xe2, 0xd1, 0x84, 0xfd, 0xb0, 0x41, 0xb2, 0xa3, 0x93, 0xc5, 0xae, 0x6e,
+	0x7a, 0xf4, 0xc3, 0x52, 0x57, 0xa6, 0x24, 0xd7, 0x22, 0x64, 0xdb, 0x1d, 0xa0, 0xe2, 0x56, 0x84,
+	0x3e, 0x9b, 0x6b, 0x4a, 0x9b, 0x7e, 0xb4, 0x92, 0x9d, 0x64, 0x5b, 0x0f, 0x06, 0x6d, 0x86, 0x0d,
+	0x8a, 0x26, 0x89, 0x7a, 0x6e, 0x06, 0x35, 0xfd, 0xa5, 0xe6, 0x30, 0x68, 0xc5, 0x90, 0xa8, 0x4f,
+	0xb2, 0x66, 0xff, 0xc3, 0x17, 0x17, 0x12, 0xea, 0x10, 0xc6, 0x1d, 0xc3, 0x46, 0x00, 0x00, 0x00,
+	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_advanced_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x78, 0x62,
+	0x61, 0x72, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x37, 0x62, 0x36, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x34, 0x32, 0x61, 0x32, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x61, 0x30, 0x31, 0x30, 0x30, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x67, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x30, 0x63, 0x30,
+	0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e,
+	0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x33, 0x2e, 0x32,
+	0x20, 0x31, 0x2e, 0x36, 0x20, 0x4c, 0x38, 0x20, 0x36, 0x2e, 0x34, 0x20, 0x4c, 0x31, 0x32, 0x2e,
+	0x38, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x32, 0x20,
+	0x4c, 0x39, 0x2e, 0x36, 0x20, 0x38, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x31, 0x32, 0x2e,
+	0x38, 0x20, 0x4c, 0x31, 0x32, 0x2e, 0x38, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x4c, 0x38, 0x20,
+	0x39, 0x2e, 0x36, 0x20, 0x4c, 0x33, 0x2e, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x4c, 0x31,
+	0x2e, 0x36, 0x20, 0x31, 0x32, 0x2e, 0x38, 0x20, 0x4c, 0x36, 0x2e, 0x34, 0x20, 0x38, 0x20, 0x4c,
+	0x31, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x78, 0x62, 0x61, 0x72, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x33, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x34, 0x20, 0x4c, 0x37, 0x2e, 0x34, 0x20, 0x36,
+	0x2e, 0x34, 0x20, 0x4c, 0x36, 0x2e, 0x36, 0x20, 0x37, 0x2e, 0x32, 0x20, 0x4c, 0x32, 0x2e, 0x36,
+	0x20, 0x33, 0x2e, 0x32, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22,
+	0x30, 0x2e, 0x33, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x34, 0x20, 0x4c, 0x31, 0x33,
+	0x2e, 0x36, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x4c, 0x39, 0x2e, 0x36, 0x20, 0x37, 0x2e, 0x32, 0x20,
+	0x4c, 0x38, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x35, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69,
+	0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x67,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63,
+	0x78, 0x3d, 0x22, 0x36, 0x2e, 0x31, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x38, 0x2e, 0x35, 0x22,
+	0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x38, 0x35, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x31,
+	0x2e, 0x34, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x65, 0x61, 0x66, 0x37,
+	0x66, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x30,
+	0x63, 0x30, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x39, 0x2e, 0x39, 0x22,
+	0x20, 0x63, 0x79, 0x3d, 0x22, 0x38, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e,
+	0x38, 0x35, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x65, 0x61, 0x66, 0x37, 0x66, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x30, 0x63, 0x30, 0x36, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x35,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20,
+	0x63, 0x78, 0x3d, 0x22, 0x36, 0x2e, 0x34, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x38, 0x2e, 0x36,
+	0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x23, 0x64, 0x30, 0x31, 0x38, 0x31, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x39, 0x2e, 0x36,
+	0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x38, 0x2e, 0x36, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30,
+	0x2e, 0x37, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x64, 0x30, 0x31, 0x38,
+	0x31, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x34, 0x2e, 0x31, 0x20, 0x37, 0x2e, 0x37, 0x20, 0x51, 0x36, 0x2e, 0x31,
+	0x20, 0x35, 0x2e, 0x34, 0x20, 0x38, 0x2e, 0x31, 0x20, 0x37, 0x2e, 0x31, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x3d, 0x22, 0x23, 0x38, 0x66, 0x30, 0x64, 0x30, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x35, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x37, 0x2e, 0x39, 0x20, 0x37, 0x2e, 0x31, 0x20, 0x51, 0x39,
+	0x2e, 0x39, 0x20, 0x35, 0x2e, 0x34, 0x20, 0x31, 0x31, 0x2e, 0x39, 0x20, 0x37, 0x2e, 0x37, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x38, 0x66, 0x30, 0x64, 0x30, 0x35, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x35,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70,
+	0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67,
+	0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_connection_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x02, 0xa4, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0x8d, 0xd2, 0x7d,
+	0x4c, 0xcc, 0x71, 0x00, 0xc7, 0xf1, 0x6c, 0xd8, 0x6c, 0x86, 0x25, 0x7f, 0x18, 0x6d, 0xac, 0x0d,
+	0x5b, 0x87, 0x0b, 0x95, 0xf5, 0x24, 0xad, 0x90, 0x93, 0x95, 0x50, 0x61, 0x8b, 0x8a, 0x23, 0x8d,
+	0x1e, 0x4e, 0xcf, 0xae, 0x93, 0xa5, 0x5a, 0x52, 0x7a, 0xc2, 0x29, 0xd2, 0xa4, 0x34, 0xb5, 0x59,
+	0xbb, 0xd9, 0x12, 0xe3, 0x2a, 0x91, 0x52, 0x93, 0x53, 0x0a, 0x3d, 0xd3, 0xc3, 0x29, 0x4a, 0xa9,
+	0xac, 0xde, 0xd6, 0x6d, 0x2d, 0xa7, 0x98, 0xf7, 0xf6, 0xdd, 0x7e, 0xdb, 0x77, 0x9f, 0xd7, 0x1f,
+	0xdf, 0xfd, 0x74, 0x74, 0x66, 0xc8, 0x2b, 0x28, 0x8f, 0xc8, 0xe4, 0x62, 0xa2, 0x52, 0x8a, 0xf0,
+	0x0e, 0xcf, 0xe1, 0xcf, 0xfb, 0xbf, 0x26, 0x4d, 0x78, 0x48, 0x47, 0xe7, 0x00, 0x23, 0xa3, 0x63,
+	0x8c, 0x8f, 0x8d, 0x33, 0xd1, 0xd8, 0x18, 0xa8, 0xbf, 0xfe, 0x24, 0x39, 0xa3, 0xe8, 0xdf, 0x50,
+	0xdc, 0x35, 0x25, 0xbd, 0x7d, 0xc3, 0xd4, 0x37, 0x76, 0x50, 0xf1, 0xea, 0x3d, 0x35, 0xaa, 0x36,
+	0xba, 0x7b, 0x06, 0xe9, 0x9a, 0x38, 0xdd, 0x83, 0xf4, 0x7f, 0x87, 0x5b, 0xf7, 0x5e, 0xcd, 0x8c,
+	0xd8, 0x1f, 0x48, 0xe1, 0x71, 0x59, 0x33, 0x77, 0x0a, 0x9e, 0x92, 0x9e, 0xf3, 0x84, 0x2b, 0xb7,
+	0x4b, 0x78, 0xfc, 0xac, 0x11, 0x55, 0xfd, 0x27, 0x6a, 0x54, 0xed, 0x54, 0xd7, 0xb6, 0x53, 0xff,
+	0x5e, 0x4d, 0xc3, 0x87, 0x01, 0x5c, 0x8e, 0x5d, 0x9b, 0x8e, 0xec, 0xf6, 0xba, 0x4b, 0x48, 0x74,
+	0x1e, 0x61, 0x17, 0x0b, 0x91, 0x26, 0x16, 0x51, 0xf8, 0xa8, 0x9e, 0x96, 0xf6, 0x6f, 0x34, 0xb5,
+	0xf4, 0xf2, 0xfa, 0xed, 0x27, 0x6a, 0xeb, 0xba, 0xa8, 0x79, 0xd3, 0x49, 0x45, 0xf5, 0x67, 0x62,
+	0xd3, 0xaa, 0xb4, 0x81, 0xd5, 0x9b, 0xbd, 0xd9, 0xb2, 0x5f, 0x8e, 0x8d, 0x6b, 0x02, 0x6e, 0xbe,
+	0x39, 0x1c, 0xf2, 0xcb, 0xa5, 0xbc, 0xaa, 0x95, 0x91, 0x91, 0x71, 0xbe, 0xf4, 0x0d, 0xd3, 0xda,
+	0xd1, 0x4f, 0x5d, 0x83, 0x9a, 0x92, 0xe7, 0x4d, 0x14, 0x28, 0x54, 0xc4, 0xa6, 0x56, 0x22, 0xb4,
+	0xf2, 0x99, 0x42, 0xb6, 0xee, 0x89, 0x25, 0x29, 0xbd, 0x8a, 0xb8, 0x34, 0x25, 0x8e, 0x9e, 0x69,
+	0x08, 0x77, 0xc5, 0xe3, 0xe0, 0x75, 0x93, 0x73, 0x89, 0x0f, 0xa8, 0xa8, 0x6e, 0xa6, 0x5b, 0x3d,
+	0x84, 0xea, 0x5d, 0x0f, 0xc5, 0xca, 0x8f, 0x1c, 0x0f, 0xcc, 0xc6, 0xe5, 0x44, 0x2e, 0x6b, 0xad,
+	0x83, 0xa7, 0x00, 0xdb, 0xbd, 0x31, 0xa4, 0xde, 0xa8, 0x21, 0x5f, 0xd1, 0x48, 0xe2, 0xd5, 0x22,
+	0x96, 0x08, 0xfd, 0x59, 0x24, 0x8c, 0x40, 0x67, 0x85, 0x84, 0xb3, 0xf1, 0x0a, 0x7a, 0xfb, 0x7e,
+	0x50, 0x5b, 0xa7, 0xc6, 0x3f, 0x4a, 0xc1, 0x72, 0x93, 0x60, 0xcc, 0x9c, 0xe5, 0xcc, 0xd6, 0x3f,
+	0x38, 0x05, 0x08, 0x2d, 0xc5, 0x24, 0x67, 0xd4, 0x22, 0xcf, 0x7a, 0x89, 0x9d, 0x6b, 0x02, 0x73,
+	0x56, 0x49, 0x98, 0x2f, 0x08, 0x67, 0x96, 0x41, 0x10, 0x8e, 0xe2, 0x9b, 0xb4, 0xb4, 0xf7, 0x93,
+	0x75, 0xff, 0x2d, 0xcb, 0x0c, 0xfd, 0x30, 0xb5, 0x93, 0x12, 0x18, 0x5d, 0x8c, 0x5f, 0x58, 0x92,
+	0xf6, 0x3b, 0x84, 0xc6, 0x28, 0xd9, 0x2c, 0x8a, 0x64, 0xee, 0x2a, 0x09, 0x0b, 0xd6, 0x49, 0xd1,
+	0x35, 0x8a, 0x40, 0x77, 0x83, 0x0c, 0x7d, 0xf3, 0x0b, 0x84, 0x26, 0x29, 0xc9, 0xb4, 0xf7, 0xa0,
+	0x5c, 0xb0, 0x18, 0x85, 0x93, 0x48, 0xf3, 0x6f, 0xc8, 0xce, 0xcb, 0xb4, 0x01, 0x23, 0x9b, 0x00,
+	0x36, 0x3a, 0xa4, 0xb0, 0xd4, 0x44, 0xc6, 0x4a, 0xab, 0x18, 0x0c, 0xb7, 0xc5, 0x63, 0x24, 0xba,
+	0xcc, 0x9a, 0x9d, 0xc9, 0xec, 0x30, 0x0b, 0x61, 0xe8, 0xe8, 0x76, 0x46, 0xd3, 0x1d, 0x35, 0xe3,
+	0x52, 0x79, 0x34, 0xfb, 0xf5, 0xe6, 0x69, 0xbe, 0xb5, 0x10, 0x03, 0xb3, 0x40, 0xac, 0xdc, 0x32,
+	0x11, 0x79, 0x66, 0xe2, 0x24, 0xce, 0x62, 0x9f, 0x77, 0x36, 0xf6, 0x3e, 0x79, 0x64, 0x5a, 0x1c,
+	0x82, 0x33, 0x07, 0xe8, 0xca, 0xf3, 0xd5, 0x8c, 0xda, 0xb2, 0x3d, 0x68, 0x7b, 0x98, 0x3b, 0x1d,
+	0x98, 0x48, 0x60, 0x21, 0xc6, 0x43, 0x92, 0x8f, 0x34, 0xa1, 0x14, 0x59, 0x4a, 0x39, 0x21, 0x89,
+	0xa5, 0x54, 0x8a, 0x0e, 0x82, 0x97, 0x3b, 0x5c, 0x17, 0x43, 0x59, 0x80, 0x66, 0x38, 0x91, 0xd4,
+	0xdc, 0x70, 0x3a, 0x30, 0x99, 0xa5, 0x8d, 0x3b, 0xa7, 0x5c, 0x42, 0x38, 0xe2, 0x2c, 0x41, 0x61,
+	0x6c, 0x01, 0xa6, 0xeb, 0xc1, 0xe7, 0x30, 0x64, 0x07, 0xd0, 0xf9, 0x34, 0x8e, 0xde, 0x17, 0x71,
+	0x54, 0x7a, 0xda, 0xfe, 0x1d, 0xf8, 0xbd, 0x74, 0xbd, 0x85, 0x60, 0x6d, 0x0c, 0xee, 0x4e, 0x10,
+	0x71, 0x1a, 0xe4, 0xa1, 0x0c, 0x5c, 0x3a, 0x89, 0xd8, 0x40, 0xff, 0xff, 0x80, 0xc9, 0x52, 0x8d,
+	0x05, 0xa4, 0x59, 0x9b, 0xe0, 0xbf, 0x49, 0xa0, 0x35, 0xfc, 0x05, 0x55, 0x90, 0xe0, 0x41, 0x3a,
+	0x2f, 0xe0, 0x50, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_connection_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x6c,
+	0x6f, 0x62, 0x65, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x36, 0x22, 0x20, 0x63,
+	0x79, 0x3d, 0x22, 0x30, 0x2e, 0x32, 0x38, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x32,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x61, 0x66, 0x32, 0x66, 0x63, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x39, 0x33, 0x62, 0x34, 0x65, 0x32, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x36, 0x63, 0x62, 0x35, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x32, 0x34, 0x34, 0x64, 0x38, 0x66, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6c,
+	0x75, 0x67, 0x62, 0x6f, 0x64, 0x79, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79,
+	0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d,
+	0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70,
+	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x64, 0x39, 0x38, 0x61, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70,
+	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x30, 0x61, 0x38, 0x32, 0x38, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x30, 0x36, 0x66, 0x31, 0x32, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65,
+	0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70,
+	0x72, 0x6f, 0x6e, 0x67, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x30, 0x66, 0x30, 0x66, 0x34, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x38, 0x62, 0x63, 0x63, 0x36, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x37, 0x63, 0x38, 0x30, 0x39, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x33, 0x22,
+	0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x32, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x38,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x67, 0x6c, 0x6f,
+	0x62, 0x65, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x64,
+	0x33, 0x66, 0x37, 0x38, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x67, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x65, 0x65, 0x66, 0x34, 0x66, 0x63, 0x22, 0x20, 0x6f,
+	0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x32, 0x22, 0x20, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61,
+	0x74, 0x65, 0x28, 0x2d, 0x32, 0x2e, 0x39, 0x20, 0x2d, 0x30, 0x2e, 0x34, 0x35, 0x29, 0x20, 0x73,
+	0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e, 0x39, 0x35, 0x35, 0x29, 0x22, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x32, 0x2e, 0x36,
+	0x20, 0x39, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x33, 0x2e, 0x36, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x31,
+	0x35, 0x2e, 0x38, 0x20, 0x38, 0x20, 0x51, 0x31, 0x38, 0x2e, 0x34, 0x20, 0x37, 0x2e, 0x38, 0x20,
+	0x31, 0x39, 0x2e, 0x38, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x51, 0x32, 0x31, 0x2e, 0x32, 0x20, 0x39,
+	0x2e, 0x36, 0x20, 0x32, 0x30, 0x2e, 0x34, 0x20, 0x31, 0x31, 0x20, 0x51, 0x31, 0x39, 0x2e, 0x35,
+	0x20, 0x31, 0x32, 0x20, 0x31, 0x39, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x51, 0x31,
+	0x39, 0x20, 0x31, 0x35, 0x2e, 0x38, 0x20, 0x31, 0x37, 0x2e, 0x33, 0x20, 0x31, 0x37, 0x2e, 0x38,
+	0x20, 0x51, 0x31, 0x36, 0x2e, 0x33, 0x20, 0x31, 0x38, 0x2e, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x39,
+	0x20, 0x31, 0x37, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x35, 0x2e, 0x35, 0x20, 0x31, 0x35, 0x20, 0x31,
+	0x34, 0x2e, 0x37, 0x20, 0x31, 0x34, 0x20, 0x51, 0x31, 0x33, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e,
+	0x36, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x31, 0x2e,
+	0x37, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x39, 0x2e, 0x32, 0x20,
+	0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73,
+	0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22,
+	0x31, 0x35, 0x2e, 0x38, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x20,
+	0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x33, 0x35, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x28, 0x31, 0x38, 0x20, 0x32,
+	0x30, 0x2e, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x38, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x33, 0x2e, 0x39, 0x20,
+	0x36, 0x2e, 0x34, 0x20, 0x51, 0x31, 0x35, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x32, 0x20, 0x31, 0x38,
+	0x20, 0x35, 0x2e, 0x36, 0x20, 0x51, 0x31, 0x39, 0x2e, 0x36, 0x20, 0x36, 0x20, 0x31, 0x39, 0x2e,
+	0x31, 0x20, 0x37, 0x2e, 0x31, 0x20, 0x51, 0x31, 0x36, 0x2e, 0x39, 0x20, 0x37, 0x2e, 0x35, 0x20,
+	0x31, 0x34, 0x2e, 0x37, 0x20, 0x37, 0x2e, 0x35, 0x20, 0x51, 0x31, 0x33, 0x2e, 0x38, 0x20, 0x37,
+	0x2e, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x34, 0x20, 0x5a, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32,
+	0x30, 0x2e, 0x38, 0x20, 0x37, 0x2e, 0x34, 0x20, 0x51, 0x32, 0x32, 0x2e, 0x36, 0x20, 0x37, 0x20,
+	0x32, 0x33, 0x2e, 0x36, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x51, 0x32, 0x32, 0x2e, 0x39, 0x20, 0x39,
+	0x2e, 0x33, 0x20, 0x32, 0x31, 0x2e, 0x34, 0x20, 0x38, 0x2e, 0x39, 0x20, 0x51, 0x32, 0x30, 0x2e,
+	0x35, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x37, 0x2e, 0x34, 0x20, 0x5a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x39, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x30, 0x2e, 0x37,
+	0x20, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x20,
+	0x51, 0x31, 0x30, 0x2e, 0x37, 0x20, 0x31, 0x37, 0x2e, 0x32, 0x20, 0x39, 0x2e, 0x36, 0x20, 0x31,
+	0x37, 0x2e, 0x39, 0x20, 0x51, 0x38, 0x2e, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x20, 0x39, 0x2e,
+	0x33, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x20, 0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f,
+	0x67, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78,
+	0x3d, 0x22, 0x38, 0x2e, 0x34, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x36, 0x2e, 0x32, 0x22, 0x20,
+	0x72, 0x78, 0x3d, 0x22, 0x34, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x32, 0x2e, 0x33,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22,
+	0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65,
+	0x28, 0x2d, 0x33, 0x32, 0x20, 0x38, 0x2e, 0x34, 0x20, 0x36, 0x2e, 0x32, 0x29, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x35, 0x20,
+	0x32, 0x34, 0x20, 0x51, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x32, 0x37, 0x20, 0x32, 0x36, 0x20, 0x32,
+	0x39, 0x2e, 0x34, 0x20, 0x51, 0x32, 0x33, 0x2e, 0x38, 0x20, 0x33, 0x30, 0x2e, 0x34, 0x20, 0x32,
+	0x31, 0x20, 0x32, 0x39, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f,
+	0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x38, 0x61, 0x30,
+	0x66, 0x30, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c,
+	0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x35, 0x20,
+	0x32, 0x34, 0x20, 0x51, 0x32, 0x39, 0x20, 0x32, 0x37, 0x20, 0x32, 0x35, 0x2e, 0x38, 0x20, 0x32,
+	0x39, 0x2e, 0x31, 0x20, 0x51, 0x32, 0x34, 0x20, 0x33, 0x30, 0x20, 0x32, 0x31, 0x2e, 0x37, 0x20,
+	0x32, 0x39, 0x2e, 0x31, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x65, 0x63, 0x33, 0x62, 0x31,
+	0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x32, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63,
+	0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74,
+	0x61, 0x74, 0x65, 0x28, 0x34, 0x35, 0x20, 0x32, 0x32, 0x20, 0x32, 0x31, 0x29, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x31, 0x37, 0x2e,
+	0x32, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x31, 0x39, 0x2e, 0x31, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x34, 0x2e, 0x32, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22,
+	0x31, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x70, 0x72, 0x6f, 0x6e, 0x67, 0x29, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x35, 0x63, 0x36, 0x30, 0x37, 0x30,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74,
+	0x20, 0x78, 0x3d, 0x22, 0x31, 0x37, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x32, 0x31, 0x2e,
+	0x34, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x34, 0x2e, 0x32, 0x22, 0x20, 0x68,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x31, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22,
+	0x30, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x70, 0x72, 0x6f, 0x6e, 0x67, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x35, 0x63, 0x36, 0x30, 0x37, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x38, 0x22,
+	0x20, 0x79, 0x3d, 0x22, 0x31, 0x37, 0x2e, 0x36, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x36, 0x2e, 0x34, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x36, 0x2e,
+	0x38, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x32, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x70, 0x6c, 0x75, 0x67, 0x62, 0x6f, 0x64, 0x79, 0x29,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x34, 0x61, 0x31,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x30, 0x2e, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63,
+	0x74, 0x20, 0x78, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x31, 0x38,
+	0x2e, 0x34, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x38, 0x22, 0x20,
+	0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x35, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x78, 0x3d,
+	0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e,
+	0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76,
+	0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_debug_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x02, 0x1c, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0xb5, 0x92, 0xdf,
+	0x4f, 0x92, 0x71, 0x14, 0xc6, 0x5d, 0x17, 0x5d, 0xb4, 0x9c, 0x5b, 0x9b, 0xab, 0xa5, 0xe5, 0x56,
+	0xb3, 0x28, 0x54, 0x42, 0x7d, 0x41, 0x90, 0x1f, 0xd3, 0x77, 0x35, 0xb4, 0xbd, 0x64, 0x65, 0x89,
+	0x80, 0x80, 0x60, 0x20, 0x22, 0xc2, 0xc0, 0x86, 0xa3, 0x74, 0xb3, 0x88, 0xd4, 0x68, 0x5a, 0x0d,
+	0x15, 0x84, 0xb9, 0x31, 0xd7, 0xe6, 0x95, 0x8b, 0x69, 0xb7, 0xdc, 0x79, 0xd5, 0xff, 0xf4, 0x69,
+	0xbc, 0x2d, 0x9b, 0x89, 0xad, 0xb5, 0xf5, 0xdc, 0x7c, 0xf7, 0x3d, 0xcf, 0x73, 0x3e, 0x3b, 0x67,
+	0x3b, 0x75, 0x75, 0xff, 0x43, 0xeb, 0x85, 0x1c, 0x9e, 0xe0, 0x14, 0x13, 0xe1, 0xe7, 0x8c, 0xba,
+	0x43, 0xbc, 0x5a, 0xfa, 0xc8, 0xef, 0x99, 0x53, 0x15, 0x9f, 0x7b, 0x41, 0x70, 0x26, 0xc1, 0xe6,
+	0xf6, 0x1e, 0xb9, 0xed, 0x03, 0xbc, 0xfe, 0x05, 0xd4, 0x82, 0x05, 0xfb, 0xd8, 0xd4, 0xdf, 0x41,
+	0x6c, 0x8e, 0x10, 0xe5, 0x83, 0x6f, 0xac, 0x65, 0xf7, 0x71, 0xf9, 0xd2, 0x18, 0xcd, 0x5e, 0x74,
+	0x06, 0x1b, 0x4d, 0x57, 0x55, 0xe4, 0x8b, 0x9f, 0x6b, 0x43, 0x02, 0xfe, 0xa0, 0x6c, 0xbc, 0xcf,
+	0xe4, 0x89, 0x44, 0x97, 0xd9, 0x2a, 0x54, 0xb0, 0x39, 0xd2, 0x68, 0x7a, 0x26, 0xd1, 0x68, 0x7d,
+	0xe8, 0x0d, 0x4e, 0x74, 0x86, 0x07, 0x98, 0xfa, 0x2c, 0x72, 0xae, 0x58, 0x2c, 0xb2, 0xb3, 0xb3,
+	0xf3, 0x0b, 0x16, 0x0e, 0xcd, 0xc8, 0x9f, 0xf9, 0xf9, 0x77, 0x3c, 0x1e, 0x8e, 0x10, 0x08, 0xac,
+	0x22, 0x68, 0xfc, 0x18, 0xcd, 0x31, 0x74, 0xfa, 0x00, 0x7d, 0xa2, 0x8f, 0x0e, 0x75, 0x3f, 0x1a,
+	0xbd, 0x51, 0xce, 0xc5, 0xe3, 0xb1, 0xe3, 0x93, 0x64, 0x32, 0x4b, 0xbc, 0x49, 0xbf, 0x65, 0x77,
+	0x77, 0x9f, 0xc6, 0xc6, 0x76, 0x14, 0x0a, 0x2b, 0xed, 0x2a, 0x17, 0x7a, 0x43, 0x98, 0x2e, 0xc1,
+	0x45, 0xab, 0xe2, 0x2e, 0xf5, 0x0d, 0xcd, 0x3c, 0x19, 0x1d, 0x91, 0x1b, 0x27, 0x9e, 0x4d, 0x9c,
+	0x5c, 0xc5, 0x66, 0x7f, 0xca, 0xc0, 0xc0, 0x10, 0xe7, 0xce, 0xb7, 0xa0, 0xd1, 0xda, 0x58, 0xc9,
+	0x7c, 0x25, 0x34, 0x93, 0x47, 0xd0, 0x3a, 0xb9, 0xd8, 0xd4, 0xc9, 0x99, 0xb3, 0xf5, 0xf4, 0x18,
+	0x05, 0xb4, 0x06, 0x81, 0x42, 0x21, 0x7f, 0x12, 0x50, 0xd5, 0x97, 0x72, 0x99, 0x41, 0xab, 0x9d,
+	0xe1, 0x91, 0x08, 0x6e, 0xdf, 0x6b, 0x7a, 0xcd, 0x5e, 0xcc, 0xa2, 0x9b, 0x4e, 0xad, 0x05, 0x93,
+	0x78, 0x8f, 0xd5, 0xec, 0x4a, 0xed, 0xc6, 0x54, 0xea, 0x25, 0xb1, 0x44, 0x88, 0xd9, 0xc4, 0x2c,
+	0x77, 0xba, 0x7b, 0xb9, 0xdc, 0xdc, 0x41, 0xeb, 0x6d, 0x11, 0x55, 0xf7, 0x10, 0xed, 0xea, 0x41,
+	0x2e, 0x35, 0x2b, 0xb9, 0xa1, 0xec, 0xc0, 0xe3, 0x1f, 0x93, 0x73, 0x91, 0x48, 0x98, 0x54, 0x2a,
+	0x75, 0x1c, 0x56, 0xde, 0xdf, 0xc3, 0x31, 0xe6, 0x40, 0x7a, 0x34, 0xc2, 0x95, 0x96, 0x36, 0x94,
+	0x2a, 0x11, 0x8f, 0x7f, 0x81, 0xeb, 0x37, 0x4d, 0x34, 0x5c, 0xb8, 0x86, 0xce, 0x24, 0x22, 0x3d,
+	0x94, 0xc8, 0x7c, 0x58, 0xae, 0x3d, 0x45, 0x71, 0xbb, 0xc0, 0x5c, 0x32, 0x29, 0x9b, 0x2e, 0x5f,
+	0x94, 0x71, 0x7f, 0x52, 0x06, 0xa8, 0x35, 0x56, 0x79, 0x85, 0x6a, 0x7d, 0x63, 0x6b, 0x0b, 0xa7,
+	0xc7, 0x59, 0x1b, 0x50, 0xa9, 0x54, 0x70, 0x7b, 0xc6, 0x65, 0x33, 0xbd, 0xb2, 0x86, 0xb1, 0xdf,
+	0x8a, 0xaa, 0x4b, 0x44, 0xe8, 0xb1, 0x70, 0x5f, 0xb2, 0xcb, 0xf5, 0x4f, 0xeb, 0x1b, 0x6c, 0xe6,
+	0x72, 0xb5, 0x01, 0x55, 0x49, 0x92, 0x74, 0x64, 0xea, 0xf5, 0x46, 0x14, 0xb7, 0xda, 0xa8, 0xbe,
+	0x3f, 0x6b, 0x93, 0xc1, 0x1f, 0x07, 0x77, 0xaa, 0x16, 0x17, 0x17, 0x89, 0x46, 0xa3, 0x1c, 0x1e,
+	0x1e, 0xca, 0xc1, 0x52, 0xa9, 0x74, 0xd4, 0x90, 0xcd, 0x66, 0x99, 0x9e, 0x9e, 0xfe, 0x33, 0xe0,
+	0x5f, 0xf4, 0x1d, 0x18, 0x9a, 0x14, 0x58, 0x17, 0x2d, 0xd0, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x49,
+	0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_debug_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f,
+	0x64, 0x79, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x35, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x35, 0x61, 0x35, 0x66, 0x37, 0x61, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x32, 0x65, 0x33, 0x33, 0x35, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x31, 0x34, 0x31, 0x36, 0x32, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74,
+	0x61, 0x74, 0x65, 0x28, 0x31, 0x38, 0x30, 0x20, 0x38, 0x20, 0x38, 0x29, 0x22, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x67, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x34,
+	0x61, 0x34, 0x66, 0x36, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69,
+	0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x35, 0x20, 0x36, 0x20, 0x4c, 0x31, 0x2e, 0x36, 0x20, 0x34, 0x2e, 0x32, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x35, 0x20, 0x38, 0x20, 0x4c, 0x31, 0x2e, 0x32, 0x20, 0x38, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x35, 0x20, 0x31, 0x30, 0x20, 0x4c, 0x31, 0x2e, 0x38, 0x20, 0x31, 0x32, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x31, 0x31, 0x20, 0x36, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x34, 0x2e, 0x32, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x31, 0x31, 0x20, 0x38, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x38, 0x20, 0x38, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x31, 0x31, 0x20, 0x31, 0x30, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x32, 0x20, 0x31, 0x32,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x38, 0x22,
+	0x20, 0x63, 0x79, 0x3d, 0x22, 0x38, 0x2e, 0x34, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x34, 0x22,
+	0x20, 0x72, 0x79, 0x3d, 0x22, 0x35, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x75, 0x72, 0x6c, 0x28, 0x23, 0x62, 0x6f, 0x64, 0x79, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x3d, 0x22, 0x23, 0x30, 0x66, 0x31, 0x31, 0x32, 0x32, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63,
+	0x78, 0x3d, 0x22, 0x38, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x33, 0x2e, 0x36, 0x22, 0x20, 0x72,
+	0x78, 0x3d, 0x22, 0x32, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x38, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x32, 0x33, 0x32, 0x37, 0x34, 0x31, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x30, 0x66, 0x31, 0x31, 0x32, 0x32, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30,
+	0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20,
+	0x78, 0x31, 0x3d, 0x22, 0x38, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x34, 0x22, 0x20, 0x78, 0x32,
+	0x3d, 0x22, 0x38, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x33, 0x2e, 0x32, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x32, 0x31, 0x34, 0x32, 0x61, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e,
+	0x37, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65,
+	0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x36, 0x2e, 0x36, 0x22, 0x20,
+	0x63, 0x79, 0x3d, 0x22, 0x36, 0x2e, 0x36, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x31,
+	0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74,
+	0x79, 0x3d, 0x22, 0x30, 0x2e, 0x32, 0x32, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f,
+	0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x31, 0x38, 0x20, 0x36,
+	0x2e, 0x36, 0x20, 0x36, 0x2e, 0x36, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67,
+	0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_directories_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x01, 0x5e, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0xdd, 0x8c, 0x3f,
+	0x48, 0x02, 0x71, 0x00, 0x46, 0x8f, 0xda, 0xa2, 0xa1, 0xc1, 0xc0, 0x3f, 0x10, 0x0e, 0x4d, 0x61,
+	0xa5, 0xb5, 0x26, 0x81, 0x43, 0x04, 0x86, 0x41, 0x64, 0x61, 0x43, 0x20, 0x45, 0x43, 0x0d, 0x42,
+	0x2e, 0x59, 0xa2, 0x2e, 0x6e, 0x2d, 0x91, 0x59, 0xd9, 0x54, 0xd4, 0x92, 0xa0, 0x44, 0x88, 0x68,
+	0x9d, 0xa9, 0xa4, 0x19, 0x65, 0xd6, 0x11, 0xa5, 0x39, 0x0b, 0xa1, 0x34, 0x44, 0x75, 0x1e, 0x22,
+	0x7d, 0xf1, 0x6b, 0x38, 0x54, 0xe2, 0x1a, 0x83, 0x3e, 0x78, 0xdb, 0xfb, 0x1e, 0x45, 0xfd, 0x8f,
+	0x1d, 0xcc, 0xb5, 0x8a, 0x68, 0x4b, 0xfb, 0x58, 0x78, 0x49, 0xac, 0xa7, 0x57, 0xc4, 0xfa, 0xc0,
+	0xa2, 0x68, 0xa4, 0xd1, 0x11, 0x5c, 0x6a, 0xb5, 0x2b, 0x80, 0xc4, 0x28, 0xd8, 0x88, 0x0e, 0xdc,
+	0x99, 0x0e, 0x95, 0x88, 0x16, 0x71, 0x67, 0xe7, 0x2e, 0x45, 0x51, 0xcd, 0x8d, 0xee, 0x8f, 0x63,
+	0x36, 0x55, 0x59, 0xa4, 0x0d, 0x60, 0xe3, 0xe3, 0xdf, 0x54, 0x92, 0x93, 0x78, 0x0d, 0x0e, 0xe3,
+	0x66, 0xbd, 0xe7, 0xf1, 0x76, 0x43, 0x99, 0xa9, 0x85, 0x71, 0xab, 0x32, 0xf9, 0x1d, 0xe5, 0x55,
+	0xcc, 0xd1, 0x31, 0xc3, 0x07, 0x32, 0xae, 0x5e, 0x86, 0x3b, 0x1d, 0x42, 0xd1, 0x37, 0x80, 0xa2,
+	0x5f, 0x8d, 0xa2, 0x4f, 0x8d, 0x97, 0xa3, 0x41, 0xb0, 0x21, 0x0d, 0xca, 0x0d, 0x70, 0x21, 0x0d,
+	0x70, 0xa1, 0x45, 0x7a, 0x4d, 0x91, 0xe3, 0x03, 0x09, 0xa7, 0x9c, 0x79, 0x3e, 0x36, 0xa0, 0x40,
+	0x9b, 0x51, 0x08, 0x9b, 0x84, 0xa1, 0xcd, 0x20, 0x6e, 0xd2, 0x29, 0xbf, 0xe7, 0x03, 0x31, 0xbb,
+	0x84, 0x29, 0x5f, 0x5b, 0x80, 0x92, 0x17, 0x28, 0xec, 0x09, 0x53, 0xf2, 0x82, 0xb8, 0x31, 0x9b,
+	0x84, 0xa9, 0x09, 0xc8, 0x98, 0xf7, 0xa8, 0x11, 0x9f, 0x0f, 0x0e, 0x54, 0xee, 0x96, 0x05, 0x21,
+	0xce, 0x47, 0xd4, 0x08, 0xf2, 0xa9, 0x0b, 0xbc, 0x9d, 0x4c, 0xa0, 0x9a, 0x36, 0x81, 0xbb, 0x9c,
+	0x17, 0x84, 0x38, 0xc4, 0xad, 0x0f, 0xd8, 0x64, 0x79, 0x36, 0xa8, 0x05, 0x52, 0xd3, 0xa8, 0x9e,
+	0x4f, 0x09, 0x42, 0x1c, 0xe2, 0x92, 0x0f, 0x1f, 0x88, 0x58, 0xa5, 0x9e, 0x27, 0xb7, 0x02, 0x39,
+	0x4f, 0x3f, 0xb2, 0x5b, 0x7d, 0x82, 0x10, 0x87, 0xb8, 0xb4, 0x55, 0xba, 0xcd, 0x07, 0xec, 0x14,
+	0xd5, 0xe4, 0x5f, 0x68, 0xeb, 0x3e, 0x9c, 0x6d, 0x51, 0xee, 0xff, 0x02, 0x71, 0x88, 0x4b, 0x3e,
+	0x7c, 0xe0, 0x4f, 0xf7, 0x05, 0x0e, 0x63, 0x6d, 0x9b, 0xec, 0xaf, 0x3e, 0x4b, 0x00, 0x00, 0x00,
+	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_directories_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69,
+	0x72, 0x42, 0x61, 0x63, 0x6b, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22,
+	0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x36, 0x63, 0x36, 0x35, 0x62, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x30, 0x39, 0x35, 0x31, 0x66, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69,
+	0x72, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79,
+	0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d,
+	0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70,
+	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x65, 0x36, 0x61, 0x33, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x34, 0x62, 0x35, 0x34, 0x34, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x42, 0x61, 0x63, 0x6b, 0x20, 0x70, 0x61, 0x6e,
+	0x65, 0x6c, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x6f, 0x6c, 0x64,
+	0x65, 0x72, 0x20, 0x74, 0x61, 0x62, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x2e, 0x34, 0x20, 0x34, 0x2e, 0x39, 0x20, 0x61,
+	0x31, 0x20, 0x31, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x31, 0x20, 0x2d, 0x31, 0x20, 0x68,
+	0x33, 0x2e, 0x31, 0x20, 0x61, 0x30, 0x2e, 0x36, 0x20, 0x30, 0x2e, 0x36, 0x20, 0x30, 0x20, 0x30,
+	0x20, 0x31, 0x20, 0x30, 0x2e, 0x34, 0x34, 0x20, 0x30, 0x2e, 0x31, 0x39, 0x20, 0x6c, 0x31, 0x2e,
+	0x32, 0x32, 0x20, 0x31, 0x2e, 0x33, 0x31, 0x20, 0x48, 0x31, 0x33, 0x2e, 0x36, 0x20, 0x61, 0x31,
+	0x20, 0x31, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x31, 0x20, 0x31, 0x20, 0x76, 0x35, 0x2e,
+	0x35, 0x20, 0x61, 0x31, 0x20, 0x31, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x2d, 0x31, 0x20,
+	0x31, 0x20, 0x48, 0x32, 0x2e, 0x34, 0x20, 0x61, 0x31, 0x20, 0x31, 0x20, 0x30, 0x20, 0x30, 0x20,
+	0x31, 0x20, 0x2d, 0x31, 0x20, 0x2d, 0x31, 0x20, 0x5a, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x64, 0x69,
+	0x72, 0x42, 0x61, 0x63, 0x6b, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x62, 0x39, 0x37, 0x39, 0x31, 0x61, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x20, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x20,
+	0x70, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x2e, 0x31, 0x20, 0x37, 0x2e, 0x33, 0x35, 0x20,
+	0x48, 0x31, 0x33, 0x2e, 0x39, 0x20, 0x76, 0x34, 0x2e, 0x34, 0x20, 0x61, 0x30, 0x2e, 0x38, 0x35,
+	0x20, 0x30, 0x2e, 0x38, 0x35, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x2d, 0x30, 0x2e, 0x38,
+	0x35, 0x20, 0x30, 0x2e, 0x38, 0x35, 0x20, 0x48, 0x32, 0x2e, 0x39, 0x35, 0x20, 0x61, 0x30, 0x2e,
+	0x38, 0x35, 0x20, 0x30, 0x2e, 0x38, 0x35, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x2d, 0x30,
+	0x2e, 0x38, 0x35, 0x20, 0x2d, 0x30, 0x2e, 0x38, 0x35, 0x20, 0x5a, 0x22, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x64, 0x69, 0x72, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x3d, 0x22, 0x23, 0x63, 0x38, 0x38, 0x39, 0x32, 0x61, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x53, 0x6f, 0x66, 0x74, 0x20, 0x74, 0x6f, 0x70,
+	0x20, 0x68, 0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x6f, 0x6e, 0x20, 0x74, 0x68,
+	0x65, 0x20, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x20, 0x65, 0x64, 0x67, 0x65, 0x20, 0x2d, 0x2d, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x2e, 0x37,
+	0x20, 0x37, 0x2e, 0x39, 0x20, 0x48, 0x31, 0x33, 0x2e, 0x33, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x66, 0x66, 0x66, 0x33, 0x64, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75,
+	0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x37,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_events_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x01, 0xa8, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0xb5, 0x91, 0x4d,
+	0x28, 0x83, 0x71, 0x1c, 0xc7, 0x9f, 0xc8, 0xc9, 0x38, 0x60, 0xb6, 0xe5, 0xe5, 0xf2, 0xac, 0x11,
+	0x8a, 0xcc, 0x69, 0xb1, 0x83, 0x28, 0x4a, 0xd3, 0x72, 0x51, 0x1c, 0x24, 0x94, 0x27, 0xca, 0x45,
+	0x39, 0xa9, 0xe5, 0x25, 0xa5, 0x6c, 0x8a, 0x83, 0x97, 0x24, 0x89, 0x91, 0x90, 0x62, 0x24, 0x8a,
+	0x07, 0x5b, 0xd3, 0x66, 0x5a, 0x2e, 0xe4, 0xdd, 0x81, 0xc4, 0x92, 0xb1, 0x03, 0xf6, 0xd5, 0x6f,
+	0x8a, 0xfa, 0x3f, 0xe2, 0xc2, 0xa7, 0x3e, 0xf5, 0xed, 0xf7, 0xfd, 0xfe, 0x4f, 0x7f, 0x8e, 0xfb,
+	0x2f, 0xea, 0xb4, 0x5c, 0x84, 0xd3, 0x9c, 0xd1, 0xea, 0x30, 0xa7, 0xb5, 0x52, 0x66, 0xfb, 0x5f,
+	0x99, 0xa8, 0x0a, 0x2f, 0xf4, 0x2f, 0xea, 0x40, 0x52, 0x66, 0xfb, 0x1f, 0x19, 0x2d, 0xe7, 0xd2,
+	0xbd, 0x83, 0x99, 0x07, 0xb7, 0xab, 0x06, 0x90, 0xde, 0xa1, 0x9c, 0x03, 0xba, 0xb1, 0xbb, 0x6f,
+	0x69, 0x54, 0x73, 0xd1, 0x9e, 0x81, 0xec, 0x63, 0xdc, 0xb4, 0x00, 0x47, 0x02, 0x70, 0x54, 0x0f,
+	0x5c, 0x09, 0xf0, 0x0c, 0x68, 0x8f, 0x9b, 0x53, 0xb8, 0x28, 0x76, 0x2f, 0x61, 0xb1, 0x49, 0x56,
+	0x83, 0xfd, 0x3a, 0x04, 0x2f, 0x7b, 0x10, 0x70, 0x96, 0x21, 0xb0, 0x5b, 0x8e, 0x97, 0xfd, 0x4a,
+	0xc0, 0x69, 0x84, 0xad, 0x39, 0xbe, 0x86, 0xdd, 0x4b, 0xb0, 0x77, 0x25, 0x8c, 0xe3, 0xa2, 0x1d,
+	0x01, 0x77, 0x2d, 0xfc, 0x62, 0x31, 0xfc, 0xdb, 0x06, 0x3c, 0xed, 0x18, 0x80, 0x3d, 0x23, 0xec,
+	0xdd, 0x9a, 0x71, 0x76, 0x2f, 0x61, 0xd7, 0xcc, 0xaf, 0xe0, 0xbc, 0x13, 0x8f, 0x9b, 0xa5, 0x78,
+	0x58, 0xcb, 0xc7, 0xc3, 0x7a, 0x41, 0x48, 0x38, 0x8a, 0xe0, 0xb2, 0xa4, 0x2e, 0xb3, 0x7b, 0x09,
+	0x2e, 0xb3, 0x5a, 0x7c, 0xb3, 0x97, 0xc0, 0x67, 0xcb, 0xc5, 0xfd, 0x92, 0x2e, 0xa4, 0xcf, 0xa6,
+	0xc3, 0xeb, 0x46, 0x1e, 0x5c, 0x16, 0xcd, 0x26, 0xbb, 0x67, 0x09, 0x73, 0x5b, 0xf8, 0x93, 0x67,
+	0x5b, 0x26, 0x6e, 0xe7, 0xb2, 0xbe, 0x9c, 0xcf, 0xc2, 0xf3, 0xb2, 0x16, 0x2e, 0x0b, 0x7f, 0x42,
+	0x1b, 0xf6, 0xd1, 0x27, 0x33, 0x42, 0x9c, 0xfe, 0x7c, 0x84, 0x0f, 0xde, 0xcd, 0xa4, 0xe0, 0xda,
+	0xaa, 0xc1, 0xcd, 0xd4, 0x87, 0x94, 0xe9, 0x76, 0x36, 0xc2, 0x07, 0xad, 0x42, 0x9c, 0x9e, 0x7d,
+	0x17, 0xa2, 0xb7, 0x22, 0x26, 0xda, 0xd1, 0xa9, 0xba, 0x0a, 0x2e, 0x24, 0xe3, 0x71, 0x3a, 0x09,
+	0x3e, 0x6b, 0x22, 0x4e, 0x07, 0x95, 0x21, 0x29, 0xd3, 0x8d, 0x3a, 0xda, 0x0c, 0x57, 0xc7, 0x4a,
+	0xbf, 0x73, 0x5a, 0x90, 0xcb, 0x44, 0x93, 0x6a, 0xd2, 0xdd, 0xa5, 0x5c, 0x77, 0x74, 0x28, 0x56,
+	0xb7, 0x4c, 0x72, 0xef, 0xe1, 0xa8, 0x16, 0x24, 0x65, 0xba, 0x51, 0x27, 0x9a, 0x94, 0x93, 0x7d,
+	0x82, 0x5c, 0xc6, 0xbe, 0x97, 0x30, 0xdb, 0xa0, 0x2c, 0x86, 0xa8, 0x07, 0x49, 0x99, 0xed, 0x7f,
+	0x65, 0xac, 0x52, 0x11, 0xb9, 0xd3, 0xa6, 0xea, 0x27, 0x29, 0xb3, 0xfd, 0x9f, 0xf1, 0x0e, 0x28,
+	0x40, 0xfa, 0x25, 0x01, 0xa2, 0x1d, 0x64, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+	0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_events_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x65,
+	0x6c, 0x6c, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x64, 0x64, 0x37, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x65, 0x32, 0x39, 0x61, 0x31, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x21, 0x2d, 0x2d, 0x20, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x72, 0x20, 0x6c, 0x6f, 0x6f, 0x70, 0x20,
+	0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x70, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x38, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x61, 0x31, 0x2e,
+	0x31, 0x35, 0x20, 0x31, 0x2e, 0x31, 0x35, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x2d, 0x31,
+	0x2e, 0x31, 0x35, 0x20, 0x31, 0x2e, 0x31, 0x35, 0x20, 0x61, 0x31, 0x2e, 0x31, 0x35, 0x20, 0x31,
+	0x2e, 0x31, 0x35, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x32, 0x2e, 0x33, 0x20, 0x30, 0x20,
+	0x41, 0x31, 0x2e, 0x31, 0x35, 0x20, 0x31, 0x2e, 0x31, 0x35, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30,
+	0x20, 0x38, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x5a, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x62, 0x65, 0x6c,
+	0x6c, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x62, 0x39, 0x37,
+	0x39, 0x31, 0x61, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d,
+	0x2d, 0x20, 0x62, 0x65, 0x6c, 0x6c, 0x20, 0x62, 0x6f, 0x64, 0x79, 0x3a, 0x20, 0x64, 0x6f, 0x6d,
+	0x65, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x66, 0x6c, 0x61, 0x72, 0x65, 0x73, 0x20, 0x74, 0x6f,
+	0x20, 0x61, 0x20, 0x72, 0x69, 0x6d, 0x20, 0x61, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x6f,
+	0x74, 0x74, 0x6f, 0x6d, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x38, 0x20, 0x33, 0x2e, 0x31, 0x20, 0x43, 0x35, 0x2e, 0x35, 0x20,
+	0x33, 0x2e, 0x31, 0x20, 0x34, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x34, 0x20, 0x34, 0x2e, 0x35, 0x20,
+	0x37, 0x2e, 0x39, 0x20, 0x43, 0x34, 0x2e, 0x35, 0x20, 0x39, 0x2e, 0x39, 0x20, 0x34, 0x2e, 0x30,
+	0x35, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x20, 0x33, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x35,
+	0x35, 0x20, 0x41, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x30, 0x20, 0x30,
+	0x20, 0x30, 0x20, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x32, 0x2e, 0x35, 0x20, 0x48, 0x31, 0x32,
+	0x2e, 0x32, 0x38, 0x20, 0x41, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x30,
+	0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x35,
+	0x20, 0x43, 0x31, 0x31, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x20, 0x31, 0x31, 0x2e,
+	0x35, 0x20, 0x39, 0x2e, 0x39, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x20, 0x37, 0x2e, 0x39, 0x20, 0x43,
+	0x31, 0x31, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x35, 0x20, 0x33, 0x2e,
+	0x31, 0x20, 0x38, 0x20, 0x33, 0x2e, 0x31, 0x20, 0x5a, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x62, 0x65,
+	0x6c, 0x6c, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x62, 0x39,
+	0x37, 0x39, 0x31, 0x61, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d,
+	0x2d, 0x20, 0x63, 0x6c, 0x61, 0x70, 0x70, 0x65, 0x72, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x38, 0x22, 0x20, 0x63,
+	0x79, 0x3d, 0x22, 0x31, 0x33, 0x2e, 0x33, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x31, 0x2e, 0x31,
+	0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x62, 0x65,
+	0x6c, 0x6c, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x62, 0x39,
+	0x37, 0x39, 0x31, 0x61, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21,
+	0x2d, 0x2d, 0x20, 0x6c, 0x65, 0x66, 0x74, 0x2d, 0x73, 0x69, 0x64, 0x65, 0x20, 0x68, 0x69, 0x67,
+	0x68, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x36, 0x2e, 0x35, 0x20, 0x35, 0x20, 0x43, 0x35, 0x2e,
+	0x38, 0x35, 0x20, 0x35, 0x2e, 0x39, 0x20, 0x35, 0x2e, 0x36, 0x20, 0x36, 0x2e, 0x39, 0x20, 0x35,
+	0x2e, 0x36, 0x20, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x34, 0x63,
+	0x63, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e,
+	0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61,
+	0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73,
+	0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_files_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x02, 0xc3, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0x85, 0xd2, 0x79,
+	0x4c, 0x0e, 0x00, 0x18, 0xc7, 0xf1, 0xfe, 0xe0, 0x1f, 0x0c, 0x1b, 0x72, 0xd4, 0xe6, 0x78, 0x69,
+	0xcd, 0x11, 0x8b, 0x96, 0xe6, 0x98, 0x34, 0x57, 0x6e, 0xb9, 0x79, 0x9b, 0x1a, 0x2a, 0xd7, 0x7a,
+	0x73, 0x25, 0x51, 0x48, 0x87, 0x8a, 0x22, 0x6f, 0xbc, 0x44, 0xbd, 0xa5, 0xf2, 0xa6, 0xc2, 0xab,
+	0x24, 0xde, 0x21, 0x6f, 0x69, 0x72, 0xf5, 0x46, 0x2c, 0x4b, 0x94, 0x2b, 0x79, 0x6d, 0x84, 0x21,
+	0x9e, 0xaf, 0xe9, 0xb5, 0xa1, 0x39, 0x7e, 0xff, 0x3e, 0xfb, 0x7d, 0x9e, 0x3d, 0xdb, 0x63, 0x65,
+	0xf5, 0x9f, 0xd8, 0x4c, 0xd3, 0xd3, 0x43, 0x59, 0x46, 0xf7, 0xa9, 0x79, 0xb4, 0x9c, 0xfd, 0x33,
+	0x3d, 0xe7, 0x5f, 0xc0, 0xce, 0xbf, 0x0a, 0xa7, 0x98, 0x4f, 0xb8, 0xaa, 0x05, 0xa7, 0xd8, 0x26,
+	0xba, 0xcd, 0x30, 0xd0, 0xc9, 0xf1, 0xe0, 0xdf, 0x21, 0xc5, 0xa2, 0x73, 0x28, 0x96, 0x96, 0x32,
+	0x2c, 0xa4, 0x96, 0x49, 0x87, 0x9a, 0x98, 0xa5, 0x15, 0x66, 0xa4, 0x08, 0xd3, 0x92, 0x05, 0xf7,
+	0x24, 0x61, 0xac, 0xfa, 0x2b, 0xbd, 0xbc, 0x6f, 0xd3, 0xc1, 0xa1, 0x05, 0xd2, 0xcf, 0xcb, 0x80,
+	0xbd, 0xbf, 0x89, 0xd1, 0x31, 0x66, 0x66, 0xa7, 0x7d, 0xc1, 0x33, 0x4b, 0xf0, 0xca, 0x16, 0xbc,
+	0xb3, 0x85, 0x25, 0x27, 0x04, 0xa5, 0x4e, 0x98, 0x97, 0x2e, 0xcc, 0xd4, 0x0a, 0xee, 0x87, 0x85,
+	0x41, 0x1b, 0xeb, 0x68, 0xe7, 0x90, 0xf4, 0x13, 0xb1, 0xf3, 0x31, 0xe1, 0x9b, 0xfd, 0xb5, 0xb9,
+	0xe4, 0x77, 0x5a, 0x58, 0x93, 0x2f, 0x04, 0x9c, 0x83, 0xb5, 0x85, 0xa0, 0x2a, 0x80, 0x55, 0x79,
+	0xc2, 0xf2, 0x93, 0xd2, 0x0c, 0xcf, 0x49, 0x13, 0x26, 0x27, 0x09, 0xce, 0x91, 0x8d, 0xb4, 0xed,
+	0xaf, 0xb5, 0x20, 0x7d, 0xbc, 0xee, 0x31, 0x6a, 0xab, 0x10, 0x90, 0x23, 0x04, 0x1a, 0x20, 0xa4,
+	0x08, 0xc2, 0x4a, 0x60, 0x67, 0x09, 0x6c, 0x37, 0x42, 0xf0, 0x25, 0x58, 0x57, 0x08, 0x2b, 0xf4,
+	0xc2, 0xdc, 0x54, 0x61, 0x54, 0xe8, 0x1b, 0x06, 0x2b, 0x2b, 0x68, 0x3f, 0x24, 0xd7, 0x02, 0xd8,
+	0x2f, 0xbd, 0xcb, 0xc4, 0x70, 0x61, 0xca, 0x2e, 0x61, 0x63, 0x8e, 0xa0, 0x2e, 0x07, 0xb5, 0x09,
+	0x0e, 0x54, 0x40, 0x42, 0x39, 0x44, 0x97, 0x81, 0xea, 0x0c, 0x4c, 0x08, 0x7b, 0x81, 0x6f, 0x6c,
+	0x0d, 0x9a, 0x9c, 0x47, 0x04, 0x44, 0xdf, 0xa5, 0x55, 0xf7, 0x04, 0x0b, 0x30, 0xc8, 0xe7, 0x0e,
+	0x73, 0xf6, 0x0a, 0x0b, 0xd4, 0x82, 0x52, 0x23, 0xa8, 0x74, 0x42, 0x7a, 0x15, 0x64, 0x54, 0x43,
+	0xa4, 0x11, 0x16, 0xc6, 0x3f, 0x67, 0x7b, 0x6a, 0x0d, 0x3a, 0xa3, 0x99, 0xad, 0x69, 0x4f, 0x19,
+	0x19, 0xf4, 0x8c, 0x7e, 0x1e, 0x57, 0x69, 0x6d, 0x1d, 0x67, 0x01, 0x1c, 0x57, 0x94, 0xe3, 0x7d,
+	0x44, 0xf0, 0x49, 0x15, 0x56, 0xa6, 0x0b, 0xab, 0x8f, 0x0b, 0x81, 0x27, 0x61, 0x83, 0xae, 0x91,
+	0xac, 0xab, 0x66, 0xf4, 0x15, 0x8d, 0x6c, 0x3e, 0xd5, 0x80, 0xa3, 0x4f, 0x11, 0x9d, 0x07, 0x24,
+	0xe0, 0xba, 0xa9, 0x1a, 0x1b, 0x97, 0x4c, 0x3a, 0xda, 0x27, 0x5b, 0x00, 0xe7, 0xd5, 0xb7, 0x59,
+	0x73, 0x5c, 0x58, 0x97, 0x0b, 0x81, 0x7a, 0xd8, 0x9c, 0x0f, 0x5b, 0xce, 0x82, 0xaf, 0xd6, 0xcc,
+	0xe5, 0xea, 0x0f, 0xec, 0x34, 0xbc, 0x62, 0x55, 0x46, 0x1d, 0x6e, 0xaa, 0x62, 0x9c, 0x17, 0xe6,
+	0xb1, 0x29, 0xc2, 0x48, 0x50, 0xf4, 0x75, 0xda, 0xd8, 0xc4, 0x5b, 0x80, 0x11, 0xfe, 0x37, 0x09,
+	0x3a, 0x03, 0xa1, 0x85, 0x10, 0x7e, 0x11, 0xa2, 0x8a, 0x20, 0xda, 0x08, 0xaa, 0x8c, 0x97, 0x98,
+	0x6a, 0xdf, 0xe1, 0xb7, 0xe7, 0x06, 0x0b, 0xb6, 0x18, 0x89, 0xcb, 0xb8, 0x4f, 0x56, 0xe9, 0x7b,
+	0xa6, 0x47, 0xd4, 0xd3, 0xd7, 0xa3, 0x94, 0xb6, 0x3d, 0x76, 0xff, 0x38, 0xc1, 0xfb, 0x12, 0xc1,
+	0x67, 0x9b, 0x88, 0x29, 0x86, 0x7d, 0x65, 0x90, 0x78, 0x0b, 0x34, 0xe5, 0x10, 0xac, 0x7f, 0x45,
+	0x64, 0x6a, 0x25, 0xba, 0xe2, 0x7a, 0x8e, 0x94, 0xbc, 0xc5, 0x7d, 0xdb, 0x1d, 0xba, 0x38, 0x24,
+	0xe2, 0x16, 0xf2, 0x04, 0xc5, 0xc4, 0x02, 0x3a, 0x2a, 0xf6, 0xff, 0xfc, 0x05, 0xc7, 0xc5, 0x05,
+	0x84, 0x16, 0xbc, 0xe5, 0x68, 0x25, 0x1c, 0x7b, 0x00, 0x99, 0x0f, 0x21, 0xea, 0xa2, 0x99, 0x6b,
+	0x75, 0x1f, 0x09, 0x39, 0x6f, 0x66, 0x59, 0x4a, 0x2d, 0x63, 0x54, 0xc5, 0x0c, 0x5f, 0x62, 0xc0,
+	0xce, 0x2d, 0x8b, 0xae, 0x03, 0x35, 0x58, 0x59, 0x05, 0xfc, 0xfe, 0x91, 0xbd, 0x5d, 0xb5, 0xa8,
+	0x92, 0xab, 0xc8, 0xaf, 0x13, 0xae, 0xd4, 0xc3, 0xe1, 0x2b, 0x0d, 0xdc, 0x7c, 0xfc, 0x9e, 0xf0,
+	0xdc, 0x1a, 0x3c, 0x63, 0x6f, 0xa1, 0x70, 0xd1, 0x60, 0xeb, 0xf0, 0x7d, 0x6b, 0x8b, 0xe2, 0xaf,
+	0x69, 0xd7, 0x6b, 0x17, 0xca, 0xf5, 0xe7, 0xa9, 0x6c, 0xf8, 0x8c, 0xa1, 0xe2, 0x35, 0xbb, 0x53,
+	0x4c, 0x0c, 0x1d, 0x7f, 0x94, 0x6e, 0x8a, 0xa8, 0xbf, 0x97, 0xfe, 0x94, 0x91, 0xe3, 0x0e, 0x31,
+	0xcf, 0x33, 0x13, 0x6b, 0xdb, 0x1d, 0xff, 0x2c, 0x7e, 0x03, 0x5c, 0xb2, 0x12, 0x6f, 0xb4, 0x4d,
+	0x61, 0x40, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_files_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f,
+	0x70, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x32, 0x66, 0x32, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x39, 0x64, 0x36, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x35, 0x61, 0x61, 0x37, 0x66, 0x65, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x34, 0x30, 0x39, 0x32, 0x66, 0x61, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74,
+	0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d,
+	0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22,
+	0x20, 0x78, 0x31, 0x3d, 0x22, 0x37, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x39, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x39, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x33, 0x31, 0x22, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x38, 0x36, 0x63, 0x34, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x35, 0x34, 0x61, 0x34, 0x66, 0x65, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x33, 0x63, 0x38, 0x39, 0x66, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20,
+	0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75,
+	0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x32, 0x31, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x30, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x32, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x33, 0x31, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x34, 0x30, 0x39, 0x30, 0x66, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x32, 0x65, 0x36, 0x65, 0x64, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x65, 0x72,
+	0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x66, 0x30, 0x66, 0x61, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x2e, 0x33, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x63, 0x30, 0x65, 0x34, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x38, 0x36, 0x63, 0x32, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x36, 0x33, 0x61, 0x61, 0x66, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x37, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x34, 0x20,
+	0x4c, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x39, 0x20, 0x4c, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x32, 0x33,
+	0x2e, 0x38, 0x20, 0x4c, 0x31, 0x33, 0x20, 0x33, 0x30, 0x2e, 0x36, 0x20, 0x4c, 0x32, 0x20, 0x32,
+	0x33, 0x2e, 0x38, 0x20, 0x4c, 0x32, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x3d, 0x22, 0x23, 0x31, 0x63, 0x34, 0x37, 0x61, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30,
+	0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x31, 0x37, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x4c, 0x32, 0x39, 0x2e, 0x35,
+	0x20, 0x39, 0x20, 0x4c, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x32, 0x33, 0x2e, 0x38, 0x20, 0x4c, 0x31,
+	0x33, 0x20, 0x33, 0x30, 0x2e, 0x36, 0x20, 0x4c, 0x32, 0x20, 0x32, 0x33, 0x2e, 0x38, 0x20, 0x4c,
+	0x32, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23,
+	0x31, 0x63, 0x34, 0x37, 0x61, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x31, 0x63, 0x34, 0x37, 0x61, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75,
+	0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x32, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x4c, 0x31, 0x33, 0x20, 0x31, 0x34, 0x2e, 0x35,
+	0x20, 0x4c, 0x31, 0x33, 0x20, 0x33, 0x30, 0x2e, 0x36, 0x20, 0x4c, 0x32, 0x20, 0x32, 0x33, 0x2e,
+	0x38, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x6c, 0x65, 0x66, 0x74, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x33, 0x20, 0x31, 0x34, 0x2e, 0x35, 0x20, 0x4c, 0x32, 0x39,
+	0x2e, 0x35, 0x20, 0x39, 0x20, 0x4c, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x32, 0x33, 0x2e, 0x38, 0x20,
+	0x4c, 0x31, 0x33, 0x20, 0x33, 0x30, 0x2e, 0x36, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x72, 0x69, 0x67, 0x68, 0x74, 0x29, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x37, 0x2e,
+	0x35, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x4c, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x39, 0x20, 0x4c, 0x31,
+	0x33, 0x20, 0x31, 0x34, 0x2e, 0x35, 0x20, 0x4c, 0x32, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x5a, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x74, 0x6f, 0x70, 0x29,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63,
+	0x78, 0x3d, 0x22, 0x36, 0x2e, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x35,
+	0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x34, 0x2e, 0x38, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x36,
+	0x2e, 0x32, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x62, 0x63, 0x64, 0x39, 0x66,
+	0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x32, 0x32,
+	0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74,
+	0x61, 0x74, 0x65, 0x28, 0x2d, 0x33, 0x38, 0x20, 0x36, 0x2e, 0x35, 0x20, 0x32, 0x31, 0x2e, 0x35,
+	0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32, 0x30, 0x2e, 0x34, 0x20, 0x4c, 0x32, 0x38, 0x2e, 0x34,
+	0x20, 0x31, 0x35, 0x2e, 0x37, 0x20, 0x4c, 0x32, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x36, 0x2e, 0x38,
+	0x20, 0x4c, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32, 0x31, 0x2e, 0x35, 0x20, 0x5a, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x32, 0x34, 0x35, 0x36, 0x62, 0x64, 0x22, 0x20, 0x6f, 0x70,
+	0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32,
+	0x36, 0x2e, 0x32, 0x20, 0x4c, 0x32, 0x38, 0x2e, 0x34, 0x20, 0x32, 0x31, 0x2e, 0x35, 0x20, 0x4c,
+	0x32, 0x38, 0x2e, 0x34, 0x20, 0x32, 0x32, 0x2e, 0x36, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x34, 0x20,
+	0x32, 0x37, 0x2e, 0x33, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x32,
+	0x34, 0x35, 0x36, 0x62, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22,
+	0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x31, 0x35, 0x2e, 0x38, 0x20, 0x4c, 0x32, 0x38,
+	0x2e, 0x34, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x20, 0x4c, 0x32, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x35,
+	0x2e, 0x37, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32, 0x30, 0x2e, 0x34, 0x20, 0x5a, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x64, 0x72, 0x61, 0x77,
+	0x65, 0x72, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x32, 0x61,
+	0x35, 0x66, 0x63, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32, 0x31, 0x2e, 0x36,
+	0x20, 0x4c, 0x32, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x36, 0x2e, 0x39, 0x20, 0x4c, 0x32, 0x38, 0x2e,
+	0x34, 0x20, 0x32, 0x31, 0x2e, 0x35, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32, 0x36, 0x2e,
+	0x32, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x64, 0x72, 0x61, 0x77, 0x65, 0x72, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x32, 0x61, 0x35, 0x66, 0x63, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x35, 0x22, 0x20, 0x79,
+	0x31, 0x3d, 0x22, 0x31, 0x36, 0x2e, 0x31, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x37, 0x2e,
+	0x38, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x38, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22,
+	0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x35, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x35,
+	0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x39, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22,
+	0x32, 0x37, 0x2e, 0x38, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x37, 0x2e, 0x36, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30,
+	0x2e, 0x39, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38,
+	0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d,
+	0x22, 0x32, 0x30, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x36, 0x2e, 0x31, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x35, 0x2e,
+	0x32, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x36, 0x33, 0x36,
+	0x38, 0x63, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68,
+	0x3d, 0x22, 0x31, 0x2e, 0x37, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69,
+	0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x32,
+	0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x39, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22,
+	0x32, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x36, 0x33, 0x36, 0x38, 0x63, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x37, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22,
+	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x6f, 0x6c, 0x79,
+	0x6c, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x32, 0x2c, 0x38,
+	0x2e, 0x32, 0x20, 0x31, 0x33, 0x2c, 0x31, 0x34, 0x2e, 0x35, 0x20, 0x32, 0x39, 0x2e, 0x35, 0x2c,
+	0x39, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x64, 0x37, 0x65, 0x64, 0x66, 0x66, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e,
+	0x33, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f,
+	0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69,
+	0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c,
+	0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x33, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22,
+	0x31, 0x34, 0x2e, 0x35, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x33, 0x22, 0x20, 0x79, 0x32,
+	0x3d, 0x22, 0x33, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x39, 0x63, 0x63, 0x64, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63,
+	0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63,
+	0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x33, 0x22, 0x20, 0x63, 0x79,
+	0x3d, 0x22, 0x31, 0x34, 0x2e, 0x37, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x31, 0x2e, 0x31, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x65, 0x63, 0x66, 0x38, 0x66, 0x66, 0x22, 0x20, 0x6f,
+	0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_filters_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x01, 0xea, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0x8d, 0x93, 0x51,
+	0x4b, 0x53, 0x61, 0x00, 0x86, 0xbd, 0xed, 0x2f, 0x04, 0xd1, 0xcd, 0xa8, 0x10, 0x84, 0x28, 0x92,
+	0x4c, 0x2c, 0x64, 0xa5, 0x6c, 0x73, 0xb3, 0x0e, 0xcd, 0xa6, 0x2d, 0x99, 0xae, 0x4d, 0x02, 0x25,
+	0x2b, 0x87, 0x9b, 0x23, 0xe6, 0xd8, 0x98, 0x6c, 0x07, 0xdc, 0x3c, 0xac, 0x11, 0x99, 0x39, 0xcb,
+	0x8b, 0xca, 0x24, 0xb2, 0xae, 0x8a, 0x95, 0x06, 0x49, 0xda, 0x52, 0x19, 0xa1, 0x95, 0x05, 0xc2,
+	0x1a, 0x5e, 0x98, 0x59, 0x78, 0x13, 0x45, 0x3d, 0x71, 0x4e, 0xd0, 0xc5, 0x9a, 0xec, 0x3c, 0xd7,
+	0xef, 0xf3, 0xf2, 0xbd, 0xdf, 0xc7, 0x57, 0x52, 0xa2, 0x92, 0xb3, 0x43, 0xbf, 0x48, 0xbd, 0x83,
+	0xa9, 0xf7, 0x70, 0x6f, 0x01, 0xc4, 0x27, 0xd0, 0x71, 0x07, 0xf2, 0x73, 0x5b, 0x12, 0x7b, 0xf0,
+	0x19, 0xf1, 0xc6, 0x14, 0x42, 0x8b, 0x0f, 0xe9, 0xd1, 0x06, 0xe7, 0x47, 0x7f, 0x63, 0x1f, 0xfc,
+	0xa1, 0xae, 0xc0, 0x39, 0x0c, 0x15, 0xe6, 0x08, 0xce, 0xde, 0x09, 0x6a, 0x5a, 0x12, 0xb4, 0xf5,
+	0x2f, 0x62, 0x11, 0x73, 0x08, 0xc1, 0x0f, 0xea, 0x0a, 0xac, 0xd2, 0x17, 0x0e, 0x9d, 0x49, 0xa2,
+	0x6d, 0x1b, 0x47, 0x73, 0xf8, 0x22, 0xc6, 0xee, 0x69, 0xf4, 0xee, 0x34, 0x3a, 0xd7, 0x8c, 0xba,
+	0x02, 0xd3, 0xe5, 0x0c, 0x75, 0x9e, 0x34, 0x55, 0xf6, 0x31, 0x8e, 0x38, 0x1f, 0x62, 0xf7, 0x4f,
+	0x52, 0x65, 0x9f, 0x40, 0xd7, 0xf5, 0x52, 0x5d, 0x81, 0x4d, 0x5a, 0xc3, 0xe4, 0x7e, 0xc1, 0x7e,
+	0xf3, 0x75, 0x6a, 0xec, 0x49, 0xda, 0xc5, 0x59, 0x4a, 0x75, 0x51, 0xea, 0x7a, 0xe6, 0x8b, 0x17,
+	0x58, 0x07, 0xd6, 0x69, 0x95, 0x56, 0x39, 0xd1, 0xfb, 0x16, 0x8b, 0x7f, 0x0e, 0xd7, 0x95, 0x37,
+	0x54, 0x5a, 0x6f, 0xb2, 0xef, 0xe4, 0x10, 0xf5, 0xbe, 0xc5, 0xe2, 0x05, 0x8e, 0xc4, 0x3a, 0x8d,
+	0xe1, 0x15, 0x8c, 0xde, 0x05, 0x4e, 0x07, 0xd2, 0x98, 0xdd, 0x29, 0x76, 0x1e, 0xf4, 0xa0, 0xed,
+	0x78, 0x5a, 0x5c, 0xbe, 0x30, 0xb2, 0x89, 0x23, 0xbe, 0xca, 0x71, 0xdf, 0x12, 0x86, 0xee, 0x19,
+	0x9a, 0x02, 0xf3, 0xec, 0x28, 0x77, 0x71, 0xa0, 0xf1, 0x96, 0x72, 0x89, 0xf9, 0xf9, 0x7f, 0xc8,
+	0xcf, 0xe6, 0xbd, 0xfb, 0x93, 0xae, 0x91, 0xaf, 0x34, 0x84, 0x3e, 0x2a, 0x5b, 0x05, 0xff, 0x12,
+	0x9a, 0xea, 0x00, 0xa5, 0xfa, 0x28, 0x7a, 0xf7, 0xab, 0xc2, 0x72, 0xfb, 0x6d, 0x18, 0x78, 0x06,
+	0xb1, 0xc7, 0x10, 0x18, 0xff, 0x8e, 0x2d, 0x96, 0x53, 0x76, 0x9e, 0x0a, 0x67, 0xd9, 0xa5, 0x0d,
+	0xb1, 0xfb, 0x68, 0x18, 0x83, 0x67, 0xee, 0x7f, 0x59, 0x9a, 0x04, 0xef, 0xd5, 0x0c, 0x9d, 0xe2,
+	0x73, 0xca, 0x6b, 0x7b, 0xe8, 0xbc, 0x96, 0x43, 0xde, 0x2e, 0x8b, 0x0d, 0xe1, 0x2c, 0x7b, 0x8e,
+	0x45, 0x28, 0x33, 0xc6, 0x91, 0x9f, 0x33, 0xdf, 0x55, 0xe8, 0x4f, 0x41, 0x5f, 0x32, 0xc3, 0xb6,
+	0xed, 0xf5, 0xec, 0x15, 0x06, 0x31, 0x78, 0x5e, 0x63, 0x4b, 0x6c, 0x52, 0x7b, 0x69, 0x1a, 0x4d,
+	0x75, 0x90, 0xca, 0xd6, 0xfb, 0x08, 0xc1, 0xe5, 0xc2, 0xb2, 0x8c, 0x7c, 0xf4, 0x73, 0xa3, 0xe0,
+	0x18, 0x86, 0xa6, 0xd8, 0x9a, 0x22, 0x96, 0x99, 0x12, 0x54, 0x34, 0x8f, 0xfd, 0x9d, 0x10, 0xf9,
+	0xb4, 0xb5, 0x2c, 0x13, 0x4d, 0x2e, 0x63, 0x09, 0x65, 0xb1, 0x4a, 0x1b, 0x98, 0xfb, 0x56, 0x14,
+	0xa9, 0x39, 0xfe, 0x0d, 0xf9, 0x07, 0xe6, 0x67, 0x0b, 0x22, 0x08, 0xa2, 0xba, 0x60, 0x01, 0xfe,
+	0x00, 0xd5, 0x3f, 0x3c, 0x8f, 0xf9, 0x22, 0x77, 0xd1, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+	0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_filters_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x6f,
+	0x6e, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x63, 0x66, 0x65, 0x34, 0x66, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x35, 0x62, 0x39, 0x61, 0x65, 0x36, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x32, 0x61, 0x35, 0x64, 0x61, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x74,
+	0x68, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x31, 0x63, 0x34, 0x61, 0x38, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x33, 0x66, 0x37, 0x36, 0x63, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x2e, 0x32, 0x20, 0x33, 0x2e, 0x34, 0x20,
+	0x41, 0x35, 0x2e, 0x38, 0x20, 0x31, 0x2e, 0x38, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31,
+	0x33, 0x2e, 0x38, 0x20, 0x33, 0x2e, 0x34, 0x20, 0x4c, 0x39, 0x2e, 0x31, 0x20, 0x39, 0x2e, 0x38,
+	0x20, 0x4c, 0x39, 0x2e, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x20, 0x51, 0x39, 0x2e, 0x31, 0x20,
+	0x31, 0x34, 0x2e, 0x38, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x20, 0x4c, 0x37,
+	0x2e, 0x39, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x20, 0x51, 0x37, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x20,
+	0x37, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x20, 0x4c, 0x37, 0x20, 0x39, 0x2e, 0x38, 0x20, 0x5a, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x63, 0x6f, 0x6e, 0x65,
+	0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x63, 0x34, 0x61,
+	0x38, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68,
+	0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c,
+	0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d,
+	0x22, 0x38, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x72, 0x78, 0x3d,
+	0x22, 0x35, 0x2e, 0x38, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x38, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x29,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x63, 0x34, 0x61, 0x38,
+	0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69,
+	0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x38, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x33,
+	0x2e, 0x35, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x34, 0x2e, 0x36, 0x22, 0x20, 0x72, 0x79, 0x3d,
+	0x22, 0x31, 0x2e, 0x32, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x37,
+	0x36, 0x63, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73,
+	0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x36, 0x2e, 0x34, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x33,
+	0x2e, 0x31, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x32, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x39, 0x65, 0x63,
+	0x34, 0x65, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e,
+	0x38, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f,
+	0x74, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x34, 0x20, 0x36, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x31, 0x29,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x34, 0x2e, 0x34, 0x20, 0x35, 0x2e, 0x36, 0x20, 0x51, 0x35, 0x2e, 0x36, 0x20, 0x37, 0x2e, 0x34,
+	0x20, 0x37, 0x2e, 0x32, 0x20, 0x38, 0x2e, 0x36, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69,
+	0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22,
+	0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x37, 0x2e,
+	0x35, 0x35, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x20, 0x4c, 0x37, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x33,
+	0x2e, 0x36, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30,
+	0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65,
+	0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63,
+	0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76,
+	0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_general_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x02, 0x93, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0x85, 0x92, 0x5b,
+	0x48, 0x93, 0x61, 0x18, 0xc7, 0x77, 0x2d, 0xde, 0x74, 0x2b, 0x14, 0x76, 0x51, 0xa8, 0xd0, 0x44,
+	0x42, 0x6d, 0xdd, 0x78, 0x80, 0x29, 0x18, 0x85, 0x8c, 0x3e, 0x4d, 0x87, 0x12, 0x15, 0xa2, 0x26,
+	0xa1, 0x83, 0x86, 0x17, 0x5a, 0xd8, 0x0c, 0x71, 0x93, 0x85, 0x81, 0xb9, 0x19, 0x58, 0x76, 0x58,
+	0xea, 0x9c, 0xb2, 0xe5, 0x3c, 0xf0, 0x4d, 0x91, 0x72, 0x6a, 0xa6, 0xc8, 0x0e, 0x3a, 0x9b, 0xa7,
+	0x82, 0x6c, 0x1d, 0x57, 0x24, 0x28, 0xd4, 0xc5, 0x2f, 0xfc, 0x20, 0xc5, 0x96, 0xf5, 0xbf, 0x7b,
+	0x78, 0x9f, 0xdf, 0xff, 0x7d, 0x4e, 0x32, 0xd9, 0x3e, 0x3a, 0x76, 0x4c, 0x85, 0x52, 0x59, 0xcf,
+	0xef, 0x58, 0x10, 0x1a, 0x29, 0x2f, 0x6f, 0xde, 0x89, 0xff, 0xa9, 0xa3, 0x47, 0x05, 0x72, 0x72,
+	0x9a, 0x28, 0x28, 0x68, 0xa1, 0xa8, 0xe8, 0x2e, 0x65, 0x65, 0x16, 0xae, 0x5d, 0x7b, 0x8a, 0xc9,
+	0x34, 0x45, 0x71, 0x71, 0xdd, 0xfe, 0x26, 0x0a, 0xc5, 0x65, 0x12, 0x13, 0x4b, 0xc9, 0xc8, 0xa8,
+	0xe7, 0xe2, 0xc5, 0x36, 0x34, 0x9a, 0x6d, 0xd0, 0x4e, 0x43, 0xc3, 0x30, 0x4d, 0x4d, 0x2e, 0xfa,
+	0xfa, 0xbc, 0xf4, 0xf4, 0x04, 0x38, 0x7c, 0xf8, 0x4c, 0xa4, 0x89, 0x5c, 0x7e, 0x81, 0xb4, 0xb4,
+	0x7a, 0x72, 0x73, 0x0d, 0xb4, 0xb7, 0xbb, 0x19, 0x1f, 0x5f, 0x63, 0x6c, 0x6c, 0x99, 0xae, 0xae,
+	0x39, 0x5a, 0x5a, 0x9e, 0xd1, 0xd6, 0x36, 0x81, 0xc5, 0x32, 0x4b, 0x77, 0xb7, 0x97, 0x8a, 0x0a,
+	0x73, 0xa4, 0x41, 0x5c, 0x5c, 0x11, 0x82, 0xd0, 0xcc, 0xd0, 0xd0, 0x3c, 0xa3, 0xa3, 0x4b, 0x34,
+	0x36, 0x8a, 0x94, 0x96, 0x3e, 0x92, 0x0c, 0x0d, 0x86, 0x01, 0x7a, 0x7b, 0xbd, 0xd8, 0x6c, 0x1e,
+	0x46, 0x46, 0x96, 0x08, 0x04, 0xbe, 0xa1, 0xd5, 0x76, 0xec, 0x9a, 0xc4, 0xc6, 0x2a, 0x39, 0x75,
+	0x4a, 0x4f, 0x67, 0xe7, 0x0c, 0xa2, 0x18, 0xa4, 0xba, 0xda, 0x4e, 0x56, 0x56, 0x1d, 0xf1, 0xf1,
+	0x85, 0x52, 0xd2, 0x89, 0x13, 0x85, 0xd8, 0x6c, 0x01, 0x5c, 0xae, 0x25, 0xdc, 0xee, 0x35, 0x56,
+	0x56, 0xc2, 0x74, 0x76, 0xfa, 0x88, 0x89, 0x49, 0x41, 0x96, 0x98, 0x78, 0x16, 0x41, 0xb8, 0x83,
+	0x46, 0xf3, 0x84, 0x89, 0x89, 0xd7, 0xe8, 0x74, 0x43, 0x64, 0x67, 0xdf, 0x24, 0x3a, 0xfa, 0xd0,
+	0xce, 0x0f, 0x72, 0xf9, 0x69, 0x1c, 0x8e, 0x65, 0x66, 0x66, 0xde, 0xe2, 0xf1, 0x84, 0x78, 0xfe,
+	0x7c, 0x15, 0xab, 0xd5, 0x83, 0x4a, 0x65, 0x44, 0x26, 0x08, 0xad, 0x94, 0x97, 0x3f, 0xa4, 0xb9,
+	0x79, 0x14, 0xa7, 0x33, 0x40, 0x5e, 0xde, 0x6d, 0xa2, 0xa2, 0x0e, 0xee, 0xe9, 0xb1, 0xa1, 0xa1,
+	0x8f, 0xe9, 0xe9, 0x75, 0x09, 0xee, 0xef, 0x5f, 0xc0, 0x60, 0x10, 0xa9, 0xaa, 0xea, 0x26, 0x33,
+	0xb3, 0x16, 0x59, 0x56, 0x96, 0x56, 0x0a, 0x8c, 0x46, 0x97, 0x34, 0x24, 0xa5, 0xf2, 0xc6, 0x1e,
+	0xd8, 0x68, 0x1c, 0xc6, 0xeb, 0xfd, 0x4c, 0x30, 0xf8, 0x89, 0xd9, 0xd9, 0xb7, 0xe8, 0xf5, 0x22,
+	0x6a, 0xb5, 0x99, 0x93, 0x27, 0xb5, 0xbb, 0x79, 0x55, 0x55, 0x3d, 0x98, 0x4c, 0x6e, 0xee, 0xdf,
+	0x9f, 0x26, 0x3f, 0xff, 0x96, 0xf4, 0x90, 0x9a, 0x7a, 0x0e, 0xbd, 0xde, 0x8e, 0xcf, 0xf7, 0x05,
+	0x9f, 0x2f, 0xc4, 0xbb, 0x77, 0xdf, 0x09, 0x85, 0x36, 0xa8, 0xa9, 0xb1, 0x93, 0x9c, 0x5c, 0xb9,
+	0x77, 0x0b, 0x75, 0x75, 0x03, 0xdc, 0xbb, 0xf7, 0x42, 0x5a, 0x99, 0xc5, 0xf2, 0x92, 0xea, 0xea,
+	0x07, 0x88, 0xe2, 0x1b, 0x3c, 0x9e, 0x0f, 0xac, 0xae, 0x86, 0x25, 0x78, 0x73, 0xf3, 0x27, 0x1b,
+	0x1b, 0x3f, 0xd0, 0xe9, 0x1c, 0x1c, 0x38, 0x70, 0x64, 0xd7, 0xa0, 0xa2, 0xc2, 0x48, 0x47, 0xc7,
+	0x1c, 0x83, 0x83, 0x8b, 0x38, 0x9d, 0x0b, 0xb8, 0x5c, 0x41, 0xa6, 0xa6, 0xd6, 0x99, 0x9f, 0xff,
+	0x40, 0x20, 0xf0, 0x11, 0xaf, 0x37, 0xc4, 0xd7, 0xaf, 0x5b, 0x84, 0xc3, 0x5b, 0xd8, 0xed, 0x7e,
+	0x4c, 0xa6, 0x49, 0xd2, 0xd3, 0xaf, 0xec, 0xad, 0x40, 0xad, 0xbe, 0x4e, 0x6f, 0xef, 0x2b, 0x9c,
+	0xce, 0x45, 0xe6, 0xe6, 0xde, 0xe3, 0xf7, 0xbf, 0x67, 0x71, 0xf1, 0x23, 0x0e, 0x87, 0x5f, 0x1a,
+	0xd8, 0xf6, 0x15, 0x5a, 0xad, 0x3e, 0x5a, 0x5b, 0x27, 0x29, 0x29, 0x79, 0x4c, 0x5c, 0x9c, 0x3a,
+	0xf2, 0x90, 0x92, 0x92, 0xce, 0x4b, 0xfd, 0x8b, 0xe2, 0x02, 0xe1, 0xf0, 0x4f, 0x69, 0x55, 0xbf,
+	0x07, 0x96, 0x92, 0xa2, 0x41, 0xa9, 0xd4, 0x72, 0xfc, 0xf8, 0x25, 0x12, 0x12, 0x8a, 0x22, 0xe1,
+	0x3f, 0x65, 0x36, 0x8f, 0x4b, 0x27, 0x5b, 0x59, 0xd9, 0x85, 0x42, 0x71, 0xf5, 0xff, 0xc0, 0xdf,
+	0xa4, 0x52, 0xdd, 0x22, 0x23, 0xa3, 0xf6, 0xbf, 0xf0, 0x2f, 0x76, 0x1f, 0xd0, 0x5b, 0x79, 0xdc,
+	0x72, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_general_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x69,
+	0x6e, 0x67, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x38, 0x22, 0x20, 0x63, 0x79,
+	0x3d, 0x22, 0x30, 0x2e, 0x33, 0x32, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35, 0x22,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x63, 0x64, 0x65, 0x65, 0x65, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x39, 0x35, 0x39, 0x38, 0x62, 0x38, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x35, 0x38, 0x35, 0x61, 0x38, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x72, 0x75, 0x6c, 0x65,
+	0x3d, 0x22, 0x65, 0x76, 0x65, 0x6e, 0x6f, 0x64, 0x64, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x72, 0x69, 0x6e, 0x67, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x33, 0x38, 0x33, 0x61, 0x36, 0x30, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69,
+	0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x33, 0x2e, 0x39, 0x37, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x4c, 0x33, 0x2e, 0x39, 0x34,
+	0x20, 0x31, 0x2e, 0x33, 0x39, 0x20, 0x4c, 0x35, 0x2e, 0x38, 0x20, 0x30, 0x2e, 0x36, 0x33, 0x20,
+	0x4c, 0x37, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x2e, 0x39, 0x33, 0x20, 0x41, 0x35, 0x2e, 0x37, 0x20,
+	0x35, 0x2e, 0x37, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x38, 0x2e, 0x31, 0x35, 0x20, 0x31,
+	0x2e, 0x39, 0x33, 0x20, 0x4c, 0x39, 0x2e, 0x34, 0x20, 0x30, 0x2e, 0x36, 0x33, 0x20, 0x4c, 0x31,
+	0x31, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x2e, 0x33, 0x39, 0x20, 0x4c, 0x31, 0x31, 0x2e, 0x32, 0x33,
+	0x20, 0x33, 0x2e, 0x32, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x41, 0x35, 0x2e, 0x37,
+	0x20, 0x35, 0x2e, 0x37, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x20,
+	0x33, 0x2e, 0x39, 0x38, 0x20, 0x4c, 0x31, 0x33, 0x2e, 0x38, 0x31, 0x20, 0x33, 0x2e, 0x39, 0x34,
+	0x20, 0x4c, 0x31, 0x34, 0x2e, 0x35, 0x37, 0x20, 0x35, 0x2e, 0x38, 0x20, 0x4c, 0x31, 0x33, 0x2e,
+	0x32, 0x37, 0x20, 0x37, 0x2e, 0x30, 0x35, 0x20, 0x41, 0x35, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x37,
+	0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x37, 0x20, 0x38, 0x2e, 0x31,
+	0x35, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x35, 0x37, 0x20,
+	0x39, 0x2e, 0x34, 0x20, 0x4c, 0x31, 0x33, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x32, 0x36,
+	0x20, 0x4c, 0x31, 0x32, 0x2e, 0x30, 0x20, 0x31, 0x31, 0x2e, 0x32, 0x32, 0x20, 0x41, 0x35, 0x2e,
+	0x37, 0x20, 0x35, 0x2e, 0x37, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x32,
+	0x33, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x20, 0x4c, 0x31, 0x31, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x33,
+	0x2e, 0x38, 0x31, 0x20, 0x4c, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x34, 0x2e, 0x35, 0x37, 0x20, 0x4c,
+	0x38, 0x2e, 0x31, 0x35, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x37, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x41, 0x35, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x37, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31,
+	0x20, 0x37, 0x2e, 0x30, 0x35, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x37, 0x20, 0x4c, 0x35, 0x2e, 0x38,
+	0x20, 0x31, 0x34, 0x2e, 0x35, 0x37, 0x20, 0x4c, 0x33, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x33, 0x2e,
+	0x38, 0x31, 0x20, 0x4c, 0x33, 0x2e, 0x39, 0x37, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x20, 0x41, 0x35,
+	0x2e, 0x37, 0x20, 0x35, 0x2e, 0x37, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x33, 0x2e, 0x32,
+	0x20, 0x31, 0x31, 0x2e, 0x32, 0x32, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x31,
+	0x2e, 0x33, 0x39, 0x20, 0x31, 0x31, 0x2e, 0x32, 0x36, 0x20, 0x4c, 0x30, 0x2e, 0x36, 0x33, 0x20,
+	0x39, 0x2e, 0x34, 0x20, 0x4c, 0x31, 0x2e, 0x39, 0x33, 0x20, 0x38, 0x2e, 0x31, 0x35, 0x20, 0x41,
+	0x35, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x37, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x31, 0x2e,
+	0x39, 0x33, 0x20, 0x37, 0x2e, 0x30, 0x35, 0x20, 0x4c, 0x30, 0x2e, 0x36, 0x33, 0x20, 0x35, 0x2e,
+	0x38, 0x20, 0x4c, 0x31, 0x2e, 0x33, 0x39, 0x20, 0x33, 0x2e, 0x39, 0x34, 0x20, 0x4c, 0x33, 0x2e,
+	0x32, 0x20, 0x33, 0x2e, 0x39, 0x37, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x41, 0x35,
+	0x2e, 0x37, 0x20, 0x35, 0x2e, 0x37, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x33, 0x2e, 0x39,
+	0x37, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x5a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4d,
+	0x31, 0x30, 0x2e, 0x33, 0x35, 0x20, 0x37, 0x2e, 0x34, 0x20, 0x61, 0x32, 0x2e, 0x39, 0x35, 0x20,
+	0x32, 0x2e, 0x39, 0x35, 0x20, 0x30, 0x20, 0x31, 0x20, 0x30, 0x20, 0x2d, 0x35, 0x2e, 0x39, 0x20,
+	0x30, 0x20, 0x61, 0x32, 0x2e, 0x39, 0x35, 0x20, 0x32, 0x2e, 0x39, 0x35, 0x20, 0x30, 0x20, 0x31,
+	0x20, 0x30, 0x20, 0x35, 0x2e, 0x39, 0x20, 0x30, 0x20, 0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x36, 0x2e, 0x31, 0x38, 0x20, 0x32,
+	0x2e, 0x38, 0x36, 0x20, 0x41, 0x34, 0x2e, 0x37, 0x20, 0x34, 0x2e, 0x37, 0x20, 0x30, 0x20, 0x30,
+	0x20, 0x30, 0x20, 0x32, 0x2e, 0x39, 0x38, 0x20, 0x35, 0x2e, 0x37, 0x39, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x33, 0x22, 0x20, 0x6f, 0x70,
+	0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e,
+	0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_interface_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x02, 0x1f, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0x8d, 0x92, 0xdd,
+	0x4b, 0x93, 0x61, 0x18, 0xc6, 0xdf, 0xfe, 0x82, 0x8e, 0xec, 0x38, 0x83, 0x85, 0x07, 0x9d, 0xcc,
+	0x13, 0x41, 0x58, 0x1e, 0xa8, 0x2c, 0x08, 0x25, 0x8b, 0x3e, 0x0c, 0xfa, 0x12, 0xac, 0x30, 0x4a,
+	0x0d, 0x29, 0xa2, 0xa0, 0x61, 0xa3, 0x28, 0x64, 0xb3, 0x02, 0xb3, 0x5c, 0xb6, 0x45, 0xe6, 0x8a,
+	0xc0, 0x4a, 0xb7, 0xd2, 0x77, 0x39, 0x34, 0x92, 0x70, 0x36, 0xcb, 0x2d, 0x27, 0xad, 0xf9, 0x31,
+	0x2d, 0x27, 0x1a, 0x5b, 0xed, 0x95, 0x70, 0xdb, 0xdb, 0x2f, 0x9c, 0x6c, 0xf3, 0x63, 0x94, 0x17,
+	0xdc, 0x27, 0xcf, 0x75, 0x5f, 0xbf, 0xe7, 0x79, 0xb8, 0x6f, 0x41, 0xf8, 0x87, 0x34, 0x1a, 0x0d,
+	0xe9, 0x6a, 0x75, 0xdf, 0x1a, 0x2d, 0x6f, 0x96, 0xc6, 0xb4, 0x10, 0xbc, 0xcb, 0xe0, 0xd0, 0x00,
+	0x6f, 0x9d, 0x3f, 0xff, 0x0f, 0x5a, 0x34, 0xba, 0xad, 0x45, 0x3c, 0x73, 0x57, 0x72, 0xcf, 0x73,
+	0x8b, 0x76, 0x67, 0x15, 0x81, 0x51, 0x2d, 0x4f, 0x2c, 0x5e, 0xb4, 0x66, 0xb8, 0xd2, 0x12, 0x65,
+	0x76, 0xae, 0x3b, 0x3d, 0x24, 0x71, 0x78, 0xae, 0x6b, 0x3b, 0x2a, 0x71, 0x27, 0xbb, 0xed, 0xfb,
+	0xa9, 0xb3, 0x1f, 0x62, 0xc1, 0xaf, 0x45, 0x6f, 0x1a, 0x42, 0x59, 0x01, 0x79, 0x95, 0x0b, 0x88,
+	0xfd, 0x1f, 0x91, 0xbe, 0x99, 0x56, 0x02, 0x12, 0x61, 0xdc, 0x7b, 0x79, 0x6e, 0xcb, 0x43, 0x30,
+	0x6c, 0x40, 0x68, 0x12, 0xb8, 0xde, 0x99, 0x0f, 0x01, 0x1d, 0xcd, 0xad, 0xbd, 0xa8, 0xcf, 0x86,
+	0x11, 0x7b, 0xac, 0xc8, 0x11, 0x2b, 0xc8, 0x62, 0x0a, 0x90, 0x08, 0xc7, 0xee, 0x57, 0x43, 0xfd,
+	0x1e, 0xde, 0x3d, 0x55, 0x61, 0x78, 0xa5, 0xc2, 0x6c, 0x53, 0x63, 0x7c, 0x53, 0x04, 0xfe, 0xab,
+	0x30, 0xa7, 0x23, 0xe0, 0x7d, 0x80, 0xf4, 0xe3, 0x31, 0xb0, 0x08, 0xe8, 0x5a, 0x02, 0x24, 0x6f,
+	0x2e, 0xda, 0x06, 0x85, 0xc5, 0x44, 0x72, 0x55, 0x48, 0x0f, 0x77, 0x80, 0xe7, 0x04, 0x8c, 0x54,
+	0x83, 0xef, 0x22, 0x8c, 0xd7, 0xc2, 0xb4, 0x0e, 0x42, 0x8d, 0x20, 0x3d, 0x82, 0x58, 0x07, 0x72,
+	0xb8, 0x2d, 0x05, 0x90, 0x5b, 0xb7, 0x22, 0xe7, 0x6c, 0x24, 0x26, 0x08, 0x04, 0x8f, 0x66, 0x12,
+	0xed, 0x2b, 0x01, 0xe7, 0x61, 0x70, 0x9d, 0x84, 0x2f, 0x35, 0x30, 0x76, 0x19, 0xa6, 0x6e, 0xc0,
+	0x6c, 0x03, 0x84, 0x4c, 0x80, 0x85, 0xef, 0x9f, 0xea, 0x52, 0x00, 0x7a, 0xb3, 0x88, 0x95, 0x6d,
+	0x22, 0x54, 0x90, 0xc1, 0x2f, 0xbd, 0x92, 0x3f, 0x1f, 0x76, 0x81, 0xe3, 0x20, 0x0c, 0x95, 0x83,
+	0xa7, 0x0a, 0x7c, 0x97, 0x60, 0xf2, 0x1a, 0xcc, 0xdc, 0x86, 0x60, 0x33, 0xc8, 0x2f, 0xb0, 0x37,
+	0x95, 0x2e, 0x03, 0xbc, 0x56, 0x10, 0x69, 0xc8, 0x64, 0xa1, 0x2d, 0x1b, 0xfa, 0xf2, 0x61, 0xa0,
+	0x04, 0xfa, 0xf7, 0xc1, 0x60, 0x19, 0x0c, 0x9f, 0x86, 0xaf, 0x17, 0xc0, 0xaf, 0x85, 0xe9, 0x7a,
+	0x08, 0x1b, 0x89, 0x4e, 0xde, 0x4c, 0x8d, 0x31, 0x0e, 0xb0, 0x28, 0xa0, 0x43, 0x01, 0x62, 0x36,
+	0x13, 0x2d, 0xb9, 0x7c, 0x36, 0x17, 0x83, 0xe3, 0xc0, 0xd2, 0x37, 0x46, 0x4e, 0x81, 0xef, 0x3c,
+	0x8c, 0x6b, 0x60, 0x46, 0x0f, 0xf3, 0x86, 0x95, 0x3b, 0x10, 0x07, 0xd8, 0x94, 0xf0, 0x72, 0x33,
+	0xde, 0x3b, 0x59, 0xc9, 0xb9, 0xce, 0xb6, 0xab, 0xc1, 0x7d, 0x04, 0xe9, 0x7d, 0x39, 0xbf, 0x5d,
+	0x35, 0x10, 0xd0, 0xc2, 0x54, 0xed, 0xda, 0x05, 0x8a, 0x03, 0x1c, 0xa5, 0xd0, 0xb9, 0x85, 0xc6,
+	0xe3, 0x19, 0x49, 0x23, 0x22, 0x16, 0xd2, 0xa3, 0xcf, 0x49, 0x06, 0x96, 0x57, 0x32, 0x9c, 0x00,
+	0xc4, 0x21, 0xe3, 0x15, 0xb8, 0x0c, 0xca, 0xb8, 0x39, 0x61, 0x54, 0x12, 0xb1, 0x15, 0xa4, 0x0f,
+	0xa4, 0x53, 0xa2, 0x71, 0x7e, 0xa0, 0x02, 0x46, 0xcf, 0xc0, 0xf0, 0xb1, 0xf5, 0x87, 0x13, 0x5a,
+	0xfd, 0xcc, 0xf5, 0x86, 0xff, 0x02, 0xb3, 0x31, 0x2a, 0xcf, 0xc8, 0x47, 0x77, 0xf0, 0x00, 0x00,
+	0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_interface_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f,
+	0x61, 0x72, 0x64, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x38, 0x22, 0x20, 0x63,
+	0x79, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x32, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x35,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x35, 0x62, 0x30, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x65, 0x32, 0x38, 0x38, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x63, 0x64, 0x35, 0x63, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x64, 0x62, 0x30, 0x34, 0x33, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x38, 0x2e, 0x32, 0x20,
+	0x31, 0x2e, 0x37, 0x20, 0x43, 0x31, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x33,
+	0x2e, 0x39, 0x20, 0x33, 0x2e, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x34, 0x20,
+	0x43, 0x31, 0x34, 0x2e, 0x39, 0x20, 0x37, 0x2e, 0x35, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x20, 0x39,
+	0x2e, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x20, 0x31, 0x30, 0x2e, 0x33, 0x20, 0x43, 0x31, 0x30,
+	0x2e, 0x33, 0x20, 0x31, 0x31, 0x2e, 0x32, 0x20, 0x38, 0x2e, 0x36, 0x20, 0x31, 0x31, 0x2e, 0x33,
+	0x20, 0x37, 0x2e, 0x36, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x43, 0x37, 0x2e, 0x31, 0x20, 0x31,
+	0x33, 0x2e, 0x34, 0x20, 0x37, 0x2e, 0x30, 0x20, 0x31, 0x34, 0x2e, 0x33, 0x20, 0x36, 0x2e, 0x32,
+	0x20, 0x31, 0x34, 0x2e, 0x39, 0x20, 0x43, 0x35, 0x2e, 0x35, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x20,
+	0x34, 0x2e, 0x35, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x38, 0x20, 0x31, 0x35, 0x2e,
+	0x30, 0x20, 0x43, 0x33, 0x2e, 0x30, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32, 0x2e, 0x34, 0x20,
+	0x31, 0x33, 0x2e, 0x33, 0x20, 0x31, 0x2e, 0x39, 0x20, 0x31, 0x32, 0x2e, 0x33, 0x20, 0x43, 0x31,
+	0x2e, 0x36, 0x20, 0x31, 0x31, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x37,
+	0x20, 0x31, 0x2e, 0x33, 0x20, 0x39, 0x2e, 0x38, 0x20, 0x43, 0x31, 0x2e, 0x31, 0x20, 0x38, 0x2e,
+	0x32, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x36, 0x2e, 0x36, 0x20, 0x32, 0x2e, 0x31, 0x20, 0x35, 0x2e,
+	0x33, 0x20, 0x43, 0x32, 0x2e, 0x39, 0x20, 0x33, 0x2e, 0x39, 0x20, 0x34, 0x2e, 0x33, 0x20, 0x32,
+	0x2e, 0x37, 0x20, 0x35, 0x2e, 0x38, 0x20, 0x32, 0x2e, 0x31, 0x20, 0x43, 0x36, 0x2e, 0x36, 0x20,
+	0x31, 0x2e, 0x38, 0x20, 0x37, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x37, 0x20, 0x38, 0x2e, 0x32, 0x20,
+	0x31, 0x2e, 0x37, 0x20, 0x5a, 0x20, 0x4d, 0x35, 0x2e, 0x39, 0x32, 0x20, 0x31, 0x32, 0x2e, 0x35,
+	0x35, 0x20, 0x41, 0x30, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x2d, 0x31, 0x35, 0x20,
+	0x31, 0x20, 0x30, 0x20, 0x34, 0x2e, 0x30, 0x38, 0x20, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x20, 0x41,
+	0x30, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x2e, 0x35, 0x20, 0x2d, 0x31, 0x35, 0x20, 0x31, 0x20, 0x30,
+	0x20, 0x35, 0x2e, 0x39, 0x32, 0x20, 0x31, 0x32, 0x2e, 0x35, 0x35, 0x20, 0x5a, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x72, 0x75, 0x6c, 0x65, 0x3d, 0x22, 0x65, 0x76, 0x65,
+	0x6e, 0x6f, 0x64, 0x64, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37,
+	0x62, 0x37, 0x62, 0x37, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69,
+	0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78,
+	0x3d, 0x22, 0x37, 0x2e, 0x33, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x33, 0x2e, 0x39, 0x22, 0x20,
+	0x72, 0x3d, 0x22, 0x31, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23,
+	0x31, 0x66, 0x39, 0x65, 0x31, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72,
+	0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x36, 0x2e, 0x39, 0x35, 0x22, 0x20, 0x63, 0x79,
+	0x3d, 0x22, 0x33, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x38, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x61, 0x38, 0x64, 0x39, 0x36, 0x38, 0x22, 0x20,
+	0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x31,
+	0x2e, 0x32, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x34, 0x2e, 0x36, 0x22, 0x20, 0x72, 0x3d, 0x22,
+	0x31, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x36,
+	0x66, 0x66, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65,
+	0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x38, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22,
+	0x34, 0x2e, 0x32, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x38, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x61, 0x34, 0x62, 0x62, 0x66, 0x63, 0x22, 0x20, 0x6f, 0x70,
+	0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x33, 0x2e, 0x37, 0x22,
+	0x20, 0x63, 0x79, 0x3d, 0x22, 0x36, 0x2e, 0x33, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x31, 0x2e, 0x34,
+	0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x32, 0x31, 0x30, 0x30, 0x30,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78,
+	0x3d, 0x22, 0x33, 0x2e, 0x33, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x35, 0x2e, 0x39, 0x35,
+	0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x23, 0x66, 0x66, 0x38, 0x61, 0x36, 0x36, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74,
+	0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72,
+	0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x39, 0x2e, 0x39, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x31, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x39, 0x39, 0x37, 0x31, 0x64, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x33, 0x2e,
+	0x30, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x39, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x72, 0x3d,
+	0x22, 0x30, 0x2e, 0x36, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66,
+	0x64, 0x30, 0x37, 0x30, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30,
+	0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_ip2country_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x44, 0x65, 0x58, 0x49, 0x66, 0x4d, 0x4d, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x08, 0x00, 0x01,
+	0x87, 0x69, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x03, 0xa0, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0xa0, 0x02,
+	0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0xa0, 0x03, 0x00, 0x04, 0x00, 0x00,
+	0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x55, 0x71, 0xf2, 0x00, 0x00,
+	0x02, 0x33, 0x49, 0x44, 0x41, 0x54, 0x38, 0x11, 0x6d, 0x52, 0xcf, 0x6b, 0x13, 0x41, 0x14, 0x7e,
+	0x6f, 0x66, 0x77, 0xd3, 0x46, 0x11, 0x35, 0x4d, 0x8a, 0x2d, 0x51, 0x4a, 0x3d, 0x59, 0x2f, 0x42,
+	0x24, 0x47, 0x85, 0xf6, 0xa0, 0xff, 0x86, 0x82, 0x9e, 0x3c, 0xf9, 0x03, 0x2f, 0x1e, 0x44, 0xbc,
+	0xe9, 0xc5, 0x9b, 0x87, 0x1e, 0x84, 0x1e, 0xc4, 0xb3, 0xe0, 0xa5, 0x29, 0x45, 0xd4, 0x40, 0xd3,
+	0xe0, 0x0f, 0x14, 0x45, 0x84, 0x82, 0xb6, 0x90, 0xd5, 0x9a, 0xc6, 0x54, 0xba, 0xc9, 0x66, 0x77,
+	0x9e, 0xef, 0x6d, 0x98, 0x25, 0x8d, 0x99, 0xe5, 0xed, 0xcc, 0xbc, 0xef, 0xbd, 0xef, 0xcd, 0x7c,
+	0xf3, 0x10, 0x46, 0x0c, 0x7f, 0xbe, 0x3c, 0x99, 0x41, 0x73, 0x2e, 0x04, 0xba, 0xac, 0x49, 0xb5,
+	0x15, 0xe2, 0x52, 0x13, 0xa2, 0xd5, 0xd9, 0xe5, 0xfa, 0x9f, 0xe1, 0x70, 0x1c, 0x76, 0xf8, 0xf3,
+	0xa5, 0xab, 0x1e, 0xaa, 0x3b, 0x8e, 0xc2, 0xe9, 0x98, 0x08, 0x30, 0xf9, 0x00, 0x78, 0xfd, 0x35,
+	0x22, 0xb8, 0x9e, 0xaf, 0xac, 0x3d, 0x1f, 0xcc, 0xd9, 0x47, 0xd0, 0x58, 0x28, 0x5d, 0xca, 0xa2,
+	0x5e, 0x8c, 0x38, 0x51, 0x4c, 0xa9, 0x3e, 0x6c, 0x0c, 0x81, 0xc7, 0x6b, 0x76, 0x05, 0x3d, 0x43,
+	0x17, 0x0a, 0x2b, 0xb5, 0x97, 0x96, 0x24, 0x25, 0xf8, 0x7d, 0xb1, 0x7c, 0x28, 0x0a, 0xe3, 0x0f,
+	0x5c, 0xfd, 0x44, 0x8f, 0x23, 0x89, 0x6d, 0xbb, 0xf5, 0x37, 0x89, 0x9b, 0x38, 0x7c, 0x10, 0x10,
+	0x11, 0xc6, 0x94, 0x82, 0x8e, 0x31, 0x6f, 0xbe, 0xb7, 0xcc, 0xf9, 0x52, 0xbd, 0xde, 0x13, 0xd0,
+	0xb1, 0x4c, 0x26, 0x32, 0x67, 0x5c, 0x4e, 0x96, 0xca, 0xc2, 0xfa, 0x69, 0xa3, 0x01, 0x9b, 0xfe,
+	0x4e, 0x02, 0x17, 0x27, 0x8f, 0xc0, 0xdc, 0xec, 0x31, 0xe8, 0x1a, 0x03, 0xac, 0x47, 0xf9, 0xf8,
+	0x51, 0x35, 0xc7, 0xc0, 0x3b, 0x01, 0x55, 0x12, 0xc1, 0x3f, 0x3e, 0x65, 0xce, 0xe1, 0x2a, 0x5c,
+	0x0a, 0x3a, 0x61, 0x04, 0x7e, 0xb3, 0x0d, 0x4a, 0xab, 0xc4, 0xfc, 0xe6, 0x6e, 0xe2, 0x13, 0xcc,
+	0x43, 0xd4, 0x14, 0xe3, 0x8c, 0xcd, 0x4b, 0x09, 0x34, 0xc1, 0x8f, 0x50, 0x2e, 0x0b, 0x04, 0xae,
+	0xa3, 0x21, 0x9b, 0xf1, 0x20, 0x8e, 0x4d, 0x62, 0xe3, 0x63, 0x2e, 0xb8, 0x5a, 0x33, 0x44, 0x22,
+	0x26, 0x90, 0xa6, 0xb6, 0x25, 0x48, 0xaf, 0x10, 0xec, 0x39, 0x1f, 0xbd, 0x6c, 0xf4, 0x39, 0x83,
+	0x78, 0x0a, 0x34, 0xc2, 0xe9, 0x93, 0x53, 0xb0, 0xb1, 0xb5, 0xcd, 0x71, 0x08, 0x33, 0xd3, 0x39,
+	0xd0, 0x72, 0x1a, 0xde, 0x85, 0x44, 0x3f, 0xb3, 0x91, 0x79, 0x6f, 0x09, 0x52, 0x11, 0xc5, 0xf1,
+	0x6b, 0xe1, 0xec, 0x15, 0x16, 0xea, 0x71, 0xc0, 0x95, 0x45, 0x34, 0xb9, 0x91, 0x0c, 0x2e, 0x9a,
+	0x88, 0x7a, 0x80, 0x49, 0xf6, 0x62, 0xf3, 0x30, 0x5f, 0xa9, 0xdd, 0xe8, 0x23, 0x03, 0x1a, 0x88,
+	0x63, 0xc2, 0xdd, 0x79, 0x12, 0x18, 0xf3, 0x5a, 0xd4, 0x96, 0x57, 0x90, 0x1b, 0x89, 0xc9, 0xda,
+	0x65, 0xb6, 0x20, 0xa6, 0x4d, 0x8a, 0xe1, 0x81, 0x4d, 0x96, 0x39, 0xd5, 0x40, 0x36, 0xf8, 0xe2,
+	0x5b, 0x97, 0x6b, 0x5d, 0xe3, 0x97, 0xd8, 0xd5, 0xb6, 0xbc, 0xf8, 0xc5, 0xf8, 0xc7, 0x74, 0x37,
+	0x0b, 0xab, 0xb5, 0x86, 0xc4, 0xda, 0xb1, 0x8f, 0x40, 0x9c, 0x85, 0xe5, 0xf5, 0xb7, 0xdc, 0x07,
+	0x77, 0xa5, 0x71, 0xec, 0x18, 0xe7, 0xa3, 0x73, 0x03, 0x2d, 0xe5, 0x2b, 0xeb, 0x4f, 0xad, 0xcf,
+	0xce, 0xff, 0x11, 0x08, 0x50, 0x68, 0x99, 0x47, 0x41, 0x1c, 0xbf, 0xca, 0xf0, 0x55, 0xe4, 0x69,
+	0x59, 0x93, 0x46, 0x87, 0x9c, 0xdb, 0x36, 0x69, 0x70, 0x1e, 0x49, 0x80, 0xdc, 0x65, 0x1a, 0xd4,
+	0x2d, 0x03, 0x14, 0xf6, 0x5b, 0x98, 0xee, 0x17, 0x57, 0xaa, 0x5b, 0x83, 0x89, 0x76, 0x3d, 0x92,
+	0x40, 0xc0, 0x5c, 0x65, 0xad, 0x1a, 0x1a, 0x7a, 0xc6, 0xa2, 0x7e, 0xe9, 0x06, 0xee, 0xa2, 0x4d,
+	0x18, 0x9e, 0xd3, 0x3e, 0x18, 0x06, 0x64, 0xaf, 0x00, 0xef, 0x71, 0x8f, 0x4e, 0x15, 0xab, 0xd5,
+	0x60, 0x14, 0x2e, 0xbe, 0x7f, 0xbe, 0xf4, 0xf5, 0x7f, 0xf7, 0xe4, 0x62, 0xcb, 0x00, 0x00, 0x00,
+	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_ip2country_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65,
+	0x61, 0x64, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x38, 0x22, 0x20, 0x63, 0x79,
+	0x3d, 0x22, 0x30, 0x2e, 0x33, 0x32, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35, 0x22,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x38, 0x61, 0x38, 0x30, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x34, 0x34, 0x33, 0x33, 0x36, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x63, 0x36, 0x32, 0x38, 0x32, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x38, 0x20, 0x31, 0x2e, 0x32,
+	0x20, 0x43, 0x34, 0x2e, 0x39, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x32, 0x2e, 0x36, 0x20, 0x33, 0x2e,
+	0x35, 0x20, 0x32, 0x2e, 0x36, 0x20, 0x36, 0x2e, 0x34, 0x20, 0x43, 0x32, 0x2e, 0x36, 0x20, 0x38,
+	0x2e, 0x36, 0x20, 0x34, 0x2e, 0x31, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x20, 0x35, 0x2e, 0x36, 0x20,
+	0x31, 0x32, 0x20, 0x43, 0x36, 0x2e, 0x36, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x20, 0x37, 0x2e, 0x35,
+	0x20, 0x31, 0x34, 0x2e, 0x31, 0x20, 0x38, 0x20, 0x31, 0x35, 0x20, 0x43, 0x38, 0x2e, 0x35, 0x20,
+	0x31, 0x34, 0x2e, 0x31, 0x20, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x30,
+	0x2e, 0x34, 0x20, 0x31, 0x32, 0x20, 0x43, 0x31, 0x31, 0x2e, 0x39, 0x20, 0x31, 0x30, 0x2e, 0x34,
+	0x20, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x38, 0x2e, 0x36, 0x20, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x36,
+	0x2e, 0x34, 0x20, 0x43, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x31, 0x2e,
+	0x31, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x38, 0x20, 0x31, 0x2e, 0x32, 0x20, 0x5a, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x68, 0x65, 0x61, 0x64, 0x29, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x38, 0x65, 0x31, 0x61, 0x31, 0x32,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65,
+	0x20, 0x63, 0x78, 0x3d, 0x22, 0x38, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x36, 0x2e, 0x33, 0x22,
+	0x20, 0x72, 0x3d, 0x22, 0x32, 0x2e, 0x31, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23,
+	0x37, 0x66, 0x31, 0x32, 0x30, 0x63, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x38, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69,
+	0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x36, 0x2e, 0x31, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x33, 0x2e, 0x39, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x35, 0x22, 0x20, 0x72,
+	0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22,
+	0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d,
+	0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x33, 0x32, 0x20, 0x36, 0x2e, 0x31, 0x20,
+	0x33, 0x2e, 0x39, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_onlinesig_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x01, 0x7c, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0xb5, 0xd0, 0xdd,
+	0x2b, 0x83, 0x51, 0x1c, 0x07, 0x70, 0x7f, 0x80, 0x25, 0x6e, 0x5d, 0xb8, 0x70, 0x85, 0x2b, 0x71,
+	0xa9, 0x70, 0xc7, 0xda, 0xc5, 0x88, 0x1b, 0x25, 0x8c, 0xe4, 0x65, 0xc6, 0xc6, 0x52, 0x1e, 0x79,
+	0x2b, 0xb5, 0xec, 0x79, 0xd2, 0x66, 0x45, 0x68, 0xa6, 0x3c, 0xde, 0xa6, 0x4d, 0xb1, 0x0b, 0x69,
+	0x6f, 0x36, 0x2f, 0x17, 0xa4, 0x25, 0x22, 0x8c, 0xa4, 0x29, 0xb7, 0x62, 0x2d, 0x7b, 0xce, 0x57,
+	0x9b, 0x66, 0x9e, 0x6d, 0x61, 0x2b, 0xdf, 0xfa, 0x76, 0xea, 0x9c, 0xf3, 0xfb, 0x74, 0x3a, 0x69,
+	0x69, 0xff, 0x95, 0xd7, 0x67, 0x2f, 0x7c, 0xf6, 0x19, 0x78, 0x3d, 0x87, 0x88, 0x3d, 0xfb, 0x53,
+	0xae, 0x1d, 0x2c, 0xac, 0x2d, 0x02, 0x18, 0x69, 0x59, 0xf2, 0xc0, 0x8a, 0x4a, 0x0e, 0x9d, 0x54,
+	0x08, 0x59, 0x69, 0x36, 0x5a, 0xcb, 0x73, 0x40, 0xd5, 0x16, 0x81, 0x69, 0x17, 0x42, 0xdb, 0x2f,
+	0xc1, 0x9a, 0x66, 0x18, 0x43, 0xb5, 0xc5, 0x7c, 0x74, 0x58, 0x5c, 0x80, 0x59, 0xaa, 0x09, 0x2c,
+	0x43, 0xc1, 0xb2, 0x38, 0x85, 0x83, 0x9d, 0x0d, 0x5c, 0x1c, 0xef, 0xe3, 0xf1, 0xfe, 0x16, 0x6f,
+	0x2f, 0x7e, 0x70, 0xc1, 0x77, 0x10, 0xc2, 0x81, 0x10, 0x02, 0x8e, 0x70, 0xd0, 0x28, 0xea, 0xf8,
+	0x40, 0x4f, 0x45, 0x1e, 0x02, 0x01, 0x3f, 0x38, 0x42, 0xc2, 0x97, 0x22, 0xe5, 0xb8, 0xcf, 0x7e,
+	0xdf, 0x0b, 0x95, 0xa5, 0x07, 0xe0, 0x32, 0xcd, 0x45, 0x91, 0x81, 0xea, 0x22, 0xf8, 0x1e, 0xbc,
+	0xbc, 0xc1, 0xc8, 0x1a, 0x0c, 0xc6, 0x03, 0x9b, 0x86, 0x69, 0x2c, 0xa9, 0xfb, 0xa3, 0x00, 0xd3,
+	0x21, 0x86, 0xe7, 0x68, 0x2f, 0xee, 0xe2, 0x57, 0x63, 0x5e, 0xe1, 0xda, 0xdd, 0xc6, 0x02, 0xd5,
+	0x18, 0x05, 0x42, 0x9f, 0x63, 0x33, 0xb3, 0x48, 0x94, 0x38, 0x8c, 0x10, 0x5c, 0x9d, 0x7b, 0x30,
+	0x52, 0x5f, 0xc6, 0x07, 0x42, 0x4d, 0x94, 0x9b, 0xb3, 0x53, 0x9c, 0xd8, 0x2d, 0x70, 0x6f, 0xea,
+	0xb1, 0x35, 0x3b, 0x8e, 0xf9, 0x31, 0x29, 0xe8, 0xce, 0x2a, 0xe8, 0x07, 0x1b, 0xf8, 0x1f, 0x19,
+	0x41, 0x74, 0xf2, 0x1a, 0x4c, 0x34, 0x96, 0x40, 0x29, 0xca, 0x87, 0xb2, 0x32, 0x17, 0x5d, 0xa2,
+	0x42, 0xcc, 0x8d, 0xb6, 0x85, 0xcf, 0x78, 0x03, 0xbf, 0xc5, 0x61, 0x36, 0x40, 0x2d, 0xca, 0x82,
+	0x41, 0xd5, 0x97, 0xdc, 0x60, 0x24, 0xb7, 0xce, 0x65, 0x1c, 0xb4, 0x66, 0xc0, 0xc8, 0x28, 0x52,
+	0x03, 0x9e, 0x8e, 0xd6, 0xe1, 0x68, 0xce, 0xc4, 0x3a, 0x9d, 0x22, 0x70, 0xe7, 0x5e, 0x85, 0x53,
+	0x22, 0x80, 0x69, 0xb2, 0x3b, 0x35, 0xe0, 0xd2, 0xba, 0x04, 0x9b, 0x24, 0x1d, 0xdb, 0xda, 0xde,
+	0x1f, 0x81, 0x0f, 0x44, 0xb1, 0x85, 0x65, 0xcb, 0x53, 0xa9, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x49,
+	0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_onlinesig_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f,
+	0x73, 0x74, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x38, 0x38, 0x37, 0x35, 0x61, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38, 0x61, 0x35, 0x61, 0x32, 0x65, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x35, 0x65, 0x33, 0x61, 0x31, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72,
+	0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x61, 0x72, 0x64,
+	0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x64, 0x39, 0x64, 0x32, 0x63, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65,
+	0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x37, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x36, 0x22,
+	0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x37, 0x22, 0x20, 0x68, 0x65, 0x69,
+	0x67, 0x68, 0x74, 0x3d, 0x22, 0x39, 0x2e, 0x34, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e,
+	0x33, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x70, 0x6f,
+	0x73, 0x74, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x34, 0x65,
+	0x33, 0x32, 0x31, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x67, 0x20,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74,
+	0x65, 0x28, 0x2d, 0x35, 0x20, 0x38, 0x20, 0x34, 0x2e, 0x36, 0x29, 0x22, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x32, 0x2e, 0x32, 0x22, 0x20,
+	0x79, 0x3d, 0x22, 0x31, 0x2e, 0x36, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31,
+	0x31, 0x2e, 0x36, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x36, 0x22, 0x20,
+	0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75,
+	0x72, 0x6c, 0x28, 0x23, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x35, 0x61, 0x33, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22,
+	0x33, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x33, 0x2e, 0x33, 0x22, 0x20, 0x78, 0x32,
+	0x3d, 0x22, 0x31, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x33, 0x2e, 0x33, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x39, 0x61, 0x61, 0x30, 0x62, 0x30,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x37, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65,
+	0x20, 0x78, 0x31, 0x3d, 0x22, 0x33, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x34, 0x2e,
+	0x36, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x32, 0x3d,
+	0x22, 0x34, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x39,
+	0x61, 0x61, 0x30, 0x62, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69,
+	0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x33, 0x2e, 0x36, 0x22, 0x20, 0x79,
+	0x31, 0x3d, 0x22, 0x35, 0x2e, 0x39, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x39, 0x2e, 0x36, 0x22,
+	0x20, 0x79, 0x32, 0x3d, 0x22, 0x35, 0x2e, 0x39, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x3d, 0x22, 0x23, 0x39, 0x61, 0x61, 0x30, 0x62, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_pathmapping_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0xef, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xd5, 0x90, 0x3b,
+	0x4c, 0x53, 0x51, 0x18, 0xc7, 0xff, 0xe7, 0x9e, 0x73, 0x73, 0x29, 0xed, 0xbd, 0xf5, 0x51, 0x81,
+	0x46, 0xc0, 0x47, 0xb5, 0x2e, 0x9a, 0xa8, 0x89, 0x84, 0x88, 0xa3, 0xc0, 0xe6, 0x2b, 0x9a, 0x98,
+	0x08, 0x0b, 0x83, 0xe2, 0x48, 0x18, 0x34, 0xea, 0xe4, 0xe0, 0x23, 0x26, 0xc6, 0x84, 0x45, 0x63,
+	0x62, 0xe2, 0xa0, 0x31, 0x1a, 0x59, 0x1c, 0x94, 0x44, 0x8c, 0x83, 0x22, 0x3e, 0x12, 0xe9, 0x20,
+	0x43, 0x11, 0x53, 0x1a, 0x4a, 0x05, 0x5a, 0x7b, 0x2b, 0xf4, 0xe2, 0xbd, 0xe7, 0xdc, 0x73, 0x1c,
+	0x0c, 0x44, 0x14, 0xb0, 0xab, 0xff, 0xf1, 0xcb, 0xf7, 0xfb, 0x7d, 0x0f, 0xe0, 0xbf, 0x0f, 0xd9,
+	0xd6, 0x71, 0xd5, 0x5c, 0x53, 0x5b, 0xdf, 0x67, 0xae, 0xb2, 0x42, 0x00, 0xa0, 0xa4, 0x92, 0xd3,
+	0xb9, 0xc2, 0xbd, 0xa1, 0x2b, 0xed, 0xd7, 0xca, 0x11, 0x30, 0x4f, 0x37, 0x76, 0xc5, 0xe2, 0x5b,
+	0x1a, 0xab, 0xab, 0xaa, 0xc8, 0x7c, 0x71, 0x2c, 0x35, 0xb6, 0x3e, 0x78, 0xf1, 0xe1, 0x7e, 0xa2,
+	0x69, 0xfe, 0x9f, 0x00, 0xf7, 0xb8, 0x9c, 0x2d, 0x14, 0xcf, 0x7f, 0xea, 0xe9, 0x4c, 0x00, 0x00,
+	0x53, 0x44, 0x69, 0x1e, 0xf7, 0x49, 0xe9, 0x87, 0xb7, 0xd0, 0x14, 0xa9, 0x89, 0x46, 0x22, 0x35,
+	0xd1, 0x96, 0x25, 0x47, 0x2a, 0xe0, 0xfd, 0xe0, 0x20, 0x07, 0x70, 0x18, 0x00, 0x18, 0x00, 0x08,
+	0x10, 0x40, 0xf2, 0xb2, 0x6e, 0x2e, 0xce, 0x71, 0x28, 0x42, 0x8c, 0x85, 0x13, 0x00, 0x40, 0x67,
+	0x14, 0x07, 0x77, 0x6f, 0x5c, 0x16, 0x12, 0x33, 0x39, 0x38, 0x89, 0xfb, 0xf0, 0xf3, 0x23, 0x18,
+	0x25, 0x9b, 0x91, 0x94, 0xd5, 0x74, 0x91, 0xc0, 0x13, 0x12, 0xf9, 0xd2, 0xd2, 0x1b, 0x88, 0xf1,
+	0xb7, 0x08, 0x7c, 0xb8, 0x8c, 0xa6, 0x86, 0x5a, 0x58, 0x31, 0x03, 0xd9, 0xcc, 0x00, 0xac, 0xe4,
+	0x97, 0xbd, 0x6d, 0x47, 0x2a, 0xa3, 0x5d, 0xbd, 0x4e, 0x96, 0x01, 0x80, 0x2b, 0x24, 0xbe, 0x39,
+	0xe2, 0x6f, 0x5a, 0x0a, 0x58, 0x03, 0x97, 0x70, 0xe0, 0x68, 0x23, 0xf4, 0xe8, 0x21, 0x48, 0x67,
+	0x1c, 0x9b, 0xea, 0x0c, 0x1c, 0x0f, 0xdd, 0x0e, 0x3d, 0xe9, 0x9d, 0xba, 0x0b, 0x38, 0x2d, 0x0c,
+	0x40, 0xca, 0xb6, 0xed, 0x99, 0x37, 0x23, 0x13, 0x26, 0xa3, 0xda, 0x22, 0xbe, 0xc2, 0x4e, 0xa2,
+	0x23, 0x5e, 0x07, 0x23, 0x7e, 0x0e, 0x20, 0x14, 0x50, 0x14, 0x74, 0xf5, 0x4e, 0xac, 0x35, 0xb7,
+	0x23, 0xdc, 0xbf, 0x2f, 0x76, 0xeb, 0x24, 0x74, 0x96, 0xba, 0xd9, 0x95, 0x22, 0xa7, 0x6f, 0xec,
+	0x99, 0x9e, 0x9c, 0x68, 0xd5, 0x98, 0x6e, 0xfc, 0x2e, 0xd8, 0x3a, 0xfb, 0xba, 0x3e, 0xd8, 0x1a,
+	0x3a, 0x45, 0x68, 0x40, 0x57, 0xbe, 0x0b, 0xe8, 0x16, 0x94, 0x92, 0xd0, 0x2a, 0xd6, 0x81, 0x31,
+	0x42, 0x4b, 0x85, 0x5f, 0x2f, 0x58, 0x36, 0xd7, 0x8f, 0x21, 0xf0, 0xe0, 0xcc, 0x86, 0x51, 0x67,
+	0xa8, 0x5b, 0xf9, 0xa5, 0xb4, 0xf2, 0xb2, 0xcf, 0x15, 0xcf, 0x7f, 0x54, 0xb9, 0x67, 0xcd, 0xea,
+	0x4e, 0x67, 0xf8, 0x1d, 0x00, 0xd0, 0x95, 0x04, 0x7d, 0xc3, 0x10, 0xcd, 0x3b, 0x34, 0xb7, 0x38,
+	0x95, 0x69, 0x88, 0xc8, 0x57, 0x41, 0x3e, 0xf9, 0x12, 0xc5, 0xcf, 0x8f, 0xf1, 0xa2, 0x7f, 0x38,
+	0x6d, 0x7f, 0x77, 0xdb, 0x9e, 0x26, 0xf8, 0x57, 0xb2, 0x92, 0x60, 0x3e, 0x3d, 0x27, 0xcc, 0xa6,
+	0x4a, 0x4b, 0xbf, 0xc0, 0x28, 0xc2, 0x9e, 0xcb, 0x33, 0x79, 0x5b, 0x74, 0x9f, 0x7d, 0x34, 0x97,
+	0x2e, 0x87, 0xfd, 0x67, 0x7e, 0x02, 0xb2, 0xb9, 0xbd, 0x0f, 0x72, 0xe9, 0x8b, 0x8d, 0x00, 0x00,
+	0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_pathmapping_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6d,
+	0x42, 0x61, 0x63, 0x6b, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x37, 0x66, 0x63, 0x34, 0x65, 0x38, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x32, 0x66, 0x38, 0x36, 0x62, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6d, 0x46,
+	0x72, 0x6f, 0x6e, 0x74, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x63, 0x39, 0x65, 0x63, 0x66, 0x62, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x37, 0x39, 0x62, 0x66, 0x65, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6d, 0x42,
+	0x61, 0x64, 0x67, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x65, 0x33, 0x38, 0x61, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x38, 0x61, 0x37, 0x32, 0x31, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2c, 0x20, 0x73, 0x61,
+	0x6d, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20,
+	0x61, 0x73, 0x20, 0x70, 0x72, 0x65, 0x66, 0x73, 0x5f, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f,
+	0x72, 0x69, 0x65, 0x73, 0x2e, 0x73, 0x76, 0x67, 0x20, 0x62, 0x75, 0x74, 0x20, 0x69, 0x6e, 0x20,
+	0x61, 0x20, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2d, 0x62, 0x6c, 0x75, 0x65, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x20, 0x73, 0x6f,
+	0x20, 0x74, 0x68, 0x65, 0x20, 0x74, 0x77, 0x6f, 0x20, 0x70, 0x61, 0x67, 0x65, 0x73, 0x20, 0x72,
+	0x65, 0x61, 0x64, 0x20, 0x61, 0x73, 0x20, 0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x20,
+	0x61, 0x74, 0x20, 0x61, 0x20, 0x67, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x20, 0x2d, 0x2d, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x20, 0x34,
+	0x2e, 0x33, 0x20, 0x61, 0x31, 0x20, 0x31, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x31, 0x20,
+	0x2d, 0x31, 0x20, 0x68, 0x32, 0x2e, 0x36, 0x20, 0x61, 0x30, 0x2e, 0x36, 0x20, 0x30, 0x2e, 0x36,
+	0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x30, 0x2e, 0x34, 0x34, 0x20, 0x30, 0x2e, 0x31, 0x39,
+	0x20, 0x6c, 0x31, 0x20, 0x31, 0x2e, 0x30, 0x36, 0x20, 0x48, 0x31, 0x32, 0x2e, 0x34, 0x20, 0x61,
+	0x31, 0x20, 0x31, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x31, 0x20, 0x31, 0x20, 0x76, 0x34,
+	0x2e, 0x35, 0x20, 0x61, 0x31, 0x20, 0x31, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x2d, 0x31,
+	0x20, 0x31, 0x20, 0x48, 0x32, 0x20, 0x61, 0x31, 0x20, 0x31, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31,
+	0x20, 0x2d, 0x31, 0x20, 0x2d, 0x31, 0x20, 0x5a, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x70, 0x6d, 0x42,
+	0x61, 0x63, 0x6b, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31,
+	0x66, 0x36, 0x36, 0x39, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69,
+	0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x2e, 0x36, 0x20, 0x36, 0x2e, 0x35, 0x20,
+	0x48, 0x31, 0x32, 0x2e, 0x38, 0x20, 0x76, 0x33, 0x2e, 0x35, 0x20, 0x61, 0x30, 0x2e, 0x38, 0x35,
+	0x20, 0x30, 0x2e, 0x38, 0x35, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x2d, 0x30, 0x2e, 0x38,
+	0x35, 0x20, 0x30, 0x2e, 0x38, 0x35, 0x20, 0x48, 0x32, 0x2e, 0x34, 0x35, 0x20, 0x61, 0x30, 0x2e,
+	0x38, 0x35, 0x20, 0x30, 0x2e, 0x38, 0x35, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x2d, 0x30,
+	0x2e, 0x38, 0x35, 0x20, 0x2d, 0x30, 0x2e, 0x38, 0x35, 0x20, 0x5a, 0x22, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x70, 0x6d, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x3d, 0x22, 0x23, 0x33, 0x61, 0x39, 0x34, 0x63, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2d, 0x74, 0x6f,
+	0x2d, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x62, 0x61, 0x64, 0x67, 0x65, 0x2c, 0x20, 0x69, 0x6e,
+	0x20, 0x74, 0x68, 0x65, 0x20, 0x77, 0x61, 0x72, 0x6d, 0x20, 0x74, 0x6f, 0x6e, 0x65, 0x20, 0x74,
+	0x68, 0x65, 0x20, 0x6d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x27,
+	0x73, 0x20, 0x6f, 0x77, 0x6e, 0x20, 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x6c, 0x65, 0x73, 0x73, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x6f, 0x77, 0x73, 0x20, 0x64, 0x6f, 0x6e, 0x27,
+	0x74, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x77, 0x69, 0x73, 0x65, 0x20, 0x62, 0x6f, 0x72, 0x72,
+	0x6f, 0x77, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x2e, 0x20, 0x54, 0x68, 0x65, 0x20, 0x67, 0x6c, 0x79,
+	0x70, 0x68, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x20, 0x64, 0x6f,
+	0x75, 0x62, 0x6c, 0x65, 0x2d, 0x68, 0x65, 0x61, 0x64, 0x65, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x20, 0x72, 0x61, 0x74, 0x68, 0x65, 0x72, 0x20,
+	0x74, 0x68, 0x61, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x75, 0x61, 0x6c, 0x20, 0x70,
+	0x61, 0x69, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x63, 0x75, 0x72, 0x76, 0x65, 0x64, 0x20, 0x73, 0x79,
+	0x6e, 0x63, 0x20, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x73, 0x3a, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20,
+	0x73, 0x68, 0x69, 0x70, 0x73, 0x20, 0x61, 0x74, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x31, 0x36, 0x78, 0x31, 0x36, 0x2c, 0x20, 0x77, 0x68, 0x65, 0x72, 0x65, 0x20, 0x74, 0x68, 0x65,
+	0x20, 0x62, 0x61, 0x64, 0x67, 0x65, 0x20, 0x69, 0x73, 0x20, 0x62, 0x61, 0x72, 0x65, 0x6c, 0x79,
+	0x20, 0x37, 0x70, 0x78, 0x20, 0x61, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20,
+	0x61, 0x6e, 0x79, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x77,
+	0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74,
+	0x65, 0x20, 0x61, 0x72, 0x63, 0x73, 0x20, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x20, 0x69, 0x74,
+	0x20, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x20, 0x61, 0x73, 0x20, 0x61, 0x20, 0x66, 0x65,
+	0x61, 0x74, 0x75, 0x72, 0x65, 0x6c, 0x65, 0x73, 0x73, 0x20, 0x64, 0x69, 0x73, 0x63, 0x2e, 0x20,
+	0x4f, 0x6e, 0x65, 0x20, 0x73, 0x74, 0x72, 0x61, 0x69, 0x67, 0x68, 0x74, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x73, 0x68, 0x61, 0x66, 0x74, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x61,
+	0x20, 0x68, 0x65, 0x61, 0x64, 0x20, 0x61, 0x74, 0x20, 0x65, 0x61, 0x63, 0x68, 0x20, 0x65, 0x6e,
+	0x64, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6d, 0x6f, 0x73, 0x74, 0x20, 0x64, 0x65,
+	0x74, 0x61, 0x69, 0x6c, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x73, 0x75, 0x72, 0x76, 0x69, 0x76,
+	0x65, 0x73, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x77,
+	0x68, 0x69, 0x74, 0x65, 0x20, 0x6f, 0x6e, 0x20, 0x61, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x68, 0x6f,
+	0x6c, 0x64, 0x73, 0x20, 0x75, 0x70, 0x20, 0x77, 0x68, 0x65, 0x72, 0x65, 0x20, 0x61, 0x20, 0x64,
+	0x61, 0x72, 0x6b, 0x2d, 0x6f, 0x6e, 0x2d, 0x61, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x75, 0x74,
+	0x6c, 0x69, 0x6e, 0x65, 0x20, 0x67, 0x72, 0x65, 0x79, 0x73, 0x20, 0x6f, 0x75, 0x74, 0x2e, 0x20,
+	0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78,
+	0x3d, 0x22, 0x31, 0x31, 0x2e, 0x34, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x31,
+	0x22, 0x20, 0x72, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x75, 0x72, 0x6c, 0x28, 0x23, 0x70, 0x6d, 0x42, 0x61, 0x64, 0x67, 0x65, 0x29, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x38, 0x61, 0x35, 0x36, 0x30, 0x36, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e,
+	0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x20, 0x48, 0x31, 0x33, 0x2e, 0x34, 0x22,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e,
+	0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x33, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x30,
+	0x2e, 0x37, 0x20, 0x39, 0x2e, 0x39, 0x20, 0x4c, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x31, 0x2e, 0x31,
+	0x20, 0x4c, 0x31, 0x30, 0x2e, 0x37, 0x20, 0x31, 0x32, 0x2e, 0x33, 0x20, 0x4d, 0x31, 0x32, 0x2e,
+	0x31, 0x20, 0x39, 0x2e, 0x39, 0x20, 0x4c, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x31, 0x2e, 0x31,
+	0x20, 0x4c, 0x31, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x32, 0x2e, 0x33, 0x22, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x31, 0x2e, 0x33, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65,
+	0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75,
+	0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_proxy_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x02, 0x4e, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0xa5, 0x93, 0xed,
+	0x4b, 0x53, 0x61, 0x18, 0xc6, 0xcf, 0x7f, 0xd2, 0xbf, 0xd2, 0x47, 0x03, 0x0b, 0xb4, 0x22, 0xa4,
+	0x20, 0x94, 0x81, 0x45, 0xa0, 0xa2, 0xa4, 0x89, 0x0e, 0x9d, 0xe6, 0x10, 0xb7, 0xa6, 0xc1, 0x5e,
+	0x8e, 0x13, 0xce, 0x39, 0x1e, 0xc7, 0x98, 0x7b, 0x41, 0x59, 0x13, 0xe6, 0x18, 0xf3, 0x65, 0x48,
+	0x6e, 0xb8, 0x86, 0xb8, 0xcd, 0x41, 0x4e, 0xd4, 0x90, 0xb2, 0x21, 0x26, 0x9b, 0x21, 0x1a, 0xfc,
+	0xc2, 0x33, 0x99, 0xac, 0xbe, 0xf4, 0x72, 0x7d, 0x7b, 0xae, 0xfb, 0xba, 0x7f, 0xdc, 0xf7, 0x0d,
+	0x8f, 0x20, 0xfc, 0xaf, 0x94, 0x26, 0x23, 0xbf, 0x7a, 0x7f, 0x2a, 0xb5, 0x4e, 0x87, 0xa0, 0x34,
+	0x75, 0x10, 0xe8, 0x79, 0xfb, 0x57, 0x10, 0xa7, 0xd3, 0xa9, 0xe5, 0xd5, 0x86, 0x57, 0x08, 0x96,
+	0x47, 0x9d, 0xe4, 0xdd, 0xcb, 0x9a, 0xf1, 0x25, 0x94, 0xc2, 0x2f, 0xba, 0x90, 0x65, 0xb9, 0x0a,
+	0x54, 0x5c, 0x6a, 0x0d, 0x7c, 0xc6, 0xe6, 0x24, 0x23, 0x2f, 0xe2, 0xef, 0xb5, 0x11, 0x1f, 0x56,
+	0x11, 0x74, 0xb7, 0x74, 0xa4, 0x2d, 0x73, 0x94, 0x97, 0xf2, 0xb0, 0x77, 0x46, 0xd6, 0x1d, 0x43,
+	0x34, 0x5b, 0xb5, 0x26, 0xc5, 0x29, 0xe1, 0x31, 0x89, 0x28, 0x92, 0xa4, 0xbd, 0x45, 0xbb, 0x48,
+	0x4a, 0x0d, 0xc3, 0xc1, 0x77, 0x0a, 0x4a, 0x8c, 0x5d, 0xcf, 0x6a, 0x05, 0xee, 0x6e, 0xec, 0xab,
+	0x02, 0x3e, 0x4a, 0x51, 0xd6, 0x8c, 0x6e, 0x16, 0x87, 0x24, 0x62, 0x7a, 0x89, 0xcb, 0xbe, 0x08,
+	0xc1, 0x41, 0x91, 0x90, 0x49, 0x26, 0x6c, 0x98, 0x62, 0x6f, 0x36, 0x0e, 0xdb, 0x27, 0x5c, 0xac,
+	0x14, 0x88, 0xcf, 0x04, 0x6f, 0xa6, 0xcb, 0x3a, 0x16, 0xa0, 0x50, 0x86, 0x0f, 0x47, 0xb0, 0x79,
+	0xcc, 0xf9, 0xe8, 0x12, 0xfb, 0xdd, 0x5e, 0x98, 0x48, 0x91, 0xeb, 0x98, 0xe6, 0xc2, 0xfe, 0x1e,
+	0xd2, 0x45, 0xca, 0x91, 0x1c, 0xec, 0x94, 0x28, 0xce, 0xa7, 0x70, 0xb6, 0x1a, 0x2a, 0x00, 0xa3,
+	0xd1, 0x48, 0xd2, 0x11, 0x80, 0x7c, 0x99, 0x62, 0x20, 0xc5, 0x42, 0x8b, 0x99, 0xdc, 0x0b, 0x19,
+	0xac, 0x09, 0xb0, 0x25, 0x61, 0x7c, 0x9d, 0x5c, 0xbb, 0x42, 0xd6, 0x3c, 0x0f, 0xd9, 0x6f, 0x90,
+	0x39, 0x21, 0xda, 0x5e, 0x59, 0x53, 0xd0, 0xe9, 0x74, 0xcc, 0x0e, 0xd9, 0x38, 0x0d, 0x6e, 0xc1,
+	0xe6, 0x09, 0x21, 0xc3, 0x64, 0xe5, 0xc2, 0xcf, 0x8c, 0x94, 0xc6, 0x97, 0x41, 0xdd, 0xa6, 0x60,
+	0x08, 0x60, 0x6d, 0xea, 0x40, 0x6c, 0xee, 0xe7, 0xd0, 0xb5, 0x06, 0x89, 0x23, 0xbc, 0x9d, 0x96,
+	0x0a, 0x20, 0xf0, 0xe4, 0x35, 0x17, 0x0b, 0x79, 0x2e, 0x23, 0x05, 0xce, 0xfc, 0x69, 0x96, 0x1d,
+	0xbe, 0xea, 0x5e, 0x3b, 0x63, 0x41, 0x50, 0xb3, 0x04, 0x46, 0x2a, 0xd0, 0x2b, 0x7d, 0x9a, 0x59,
+	0x85, 0xcd, 0x53, 0x92, 0x6f, 0xfc, 0x88, 0xbd, 0xa3, 0x08, 0x99, 0x11, 0x1f, 0x25, 0x5f, 0x1a,
+	0x57, 0xa3, 0x9e, 0x95, 0x36, 0x3b, 0xc7, 0x9e, 0x84, 0x16, 0xf6, 0x8e, 0x4d, 0x72, 0xa9, 0xa4,
+	0xc0, 0xbf, 0x43, 0x64, 0x44, 0xd1, 0xbc, 0x77, 0x13, 0x2a, 0x67, 0xde, 0x34, 0xfb, 0x8e, 0x28,
+	0xac, 0x1e, 0x12, 0x6e, 0x31, 0x23, 0x84, 0x5b, 0x2d, 0xf8, 0x1e, 0x0c, 0x68, 0x01, 0xf9, 0xde,
+	0x4b, 0x4a, 0xca, 0x3a, 0x1b, 0x26, 0x1f, 0xa7, 0xd3, 0xeb, 0xec, 0x1a, 0x83, 0x6c, 0xf5, 0xbb,
+	0x39, 0x77, 0xa5, 0xf0, 0x0d, 0xd8, 0x28, 0x2a, 0x6b, 0x6c, 0xf4, 0x28, 0x48, 0x77, 0x3a, 0xf9,
+	0x3a, 0xb9, 0xc2, 0x67, 0x6b, 0x14, 0x61, 0x6a, 0xf0, 0x7a, 0x97, 0x6b, 0xc5, 0x9f, 0xdb, 0x21,
+	0x7c, 0xc0, 0xf1, 0x54, 0x1c, 0xe9, 0x6e, 0x17, 0x72, 0x7d, 0x97, 0x06, 0xfb, 0xe1, 0xc9, 0x70,
+	0x62, 0x89, 0x21, 0xdf, 0xed, 0xd1, 0xf2, 0xfe, 0x86, 0x41, 0x72, 0x7d, 0x9e, 0x9a, 0x5e, 0x4d,
+	0x6a, 0x5d, 0x17, 0xc9, 0x6e, 0x05, 0xcf, 0x43, 0x7d, 0xb5, 0x38, 0xf7, 0xd4, 0x48, 0x59, 0x4a,
+	0x10, 0x7a, 0x7c, 0xf3, 0x6f, 0xae, 0x8e, 0xef, 0x6e, 0x1e, 0xfe, 0x1d, 0x70, 0x25, 0x67, 0x7d,
+	0x5b, 0x4d, 0xc1, 0x74, 0x5b, 0x87, 0xe7, 0xbe, 0x1e, 0xb1, 0xae, 0xbd, 0xc6, 0x57, 0xac, 0x37,
+	0xc7, 0xfd, 0x67, 0xfd, 0x04, 0x37, 0x9d, 0xcd, 0x96, 0x19, 0xef, 0x61, 0x7a, 0x00, 0x00, 0x00,
+	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_proxy_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x77, 0x69,
+	0x72, 0x65, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74,
+	0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73,
+	0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x36, 0x22,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x65, 0x34, 0x66, 0x34, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x62, 0x38, 0x65, 0x32, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x30, 0x38, 0x38, 0x62, 0x64, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x63, 0x39, 0x36, 0x36, 0x39, 0x37, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x67, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x61, 0x33, 0x35,
+	0x31, 0x37, 0x63, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x31, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f,
+	0x6e, 0x65, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x37, 0x2e, 0x31, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e,
+	0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x36, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x31, 0x32, 0x2e, 0x36, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x34,
+	0x2e, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20,
+	0x78, 0x31, 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x39, 0x2e, 0x39,
+	0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x34, 0x2e, 0x31, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x39, 0x2e, 0x39, 0x35, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22,
+	0x39, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22,
+	0x33, 0x2e, 0x33, 0x37, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x36, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22,
+	0x31, 0x35, 0x2e, 0x31, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x78, 0x32, 0x3d,
+	0x22, 0x38, 0x2e, 0x38, 0x37, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x36, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x67, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x77, 0x69, 0x72, 0x65,
+	0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e,
+	0x65, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31,
+	0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x78, 0x32,
+	0x3d, 0x22, 0x37, 0x2e, 0x31, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x36,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31,
+	0x3d, 0x22, 0x36, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x78, 0x32,
+	0x3d, 0x22, 0x31, 0x32, 0x2e, 0x36, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e,
+	0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22, 0x20,
+	0x78, 0x32, 0x3d, 0x22, 0x31, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x39, 0x2e, 0x39, 0x35,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31,
+	0x3d, 0x22, 0x34, 0x2e, 0x31, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x78, 0x32,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x39, 0x2e, 0x39, 0x35, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x39,
+	0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x33,
+	0x2e, 0x33, 0x37, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x36, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31,
+	0x35, 0x2e, 0x31, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22,
+	0x38, 0x2e, 0x38, 0x37, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x36, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63,
+	0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x32, 0x2e, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22,
+	0x34, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x65, 0x36, 0x66, 0x36, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63,
+	0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x38, 0x22, 0x20, 0x63, 0x79,
+	0x3d, 0x22, 0x34, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x39, 0x65, 0x64, 0x32, 0x22, 0x20, 0x6f,
+	0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x35, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x33,
+	0x2e, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x34, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22,
+	0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x38, 0x62,
+	0x38, 0x64, 0x61, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e,
+	0x37, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_remote_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x01, 0x74, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0x85, 0x93, 0x3d,
+	0x4b, 0xc3, 0x50, 0x14, 0x86, 0xf3, 0x23, 0xc4, 0xa9, 0x08, 0x05, 0x5b, 0xa1, 0x83, 0x5f, 0x45,
+	0x1d, 0x4a, 0xb0, 0x20, 0xe2, 0xe0, 0xe2, 0x2a, 0xe4, 0x07, 0x04, 0x1d, 0x15, 0x3a, 0xb8, 0x88,
+	0x10, 0x11, 0x07, 0x0b, 0x2e, 0x15, 0xa9, 0x41, 0x50, 0x41, 0x28, 0x26, 0x74, 0x48, 0x87, 0x38,
+	0x14, 0x3a, 0x14, 0xa9, 0x68, 0x51, 0x8b, 0x28, 0x04, 0x2c, 0x88, 0xd4, 0x2f, 0x52, 0xb7, 0x8e,
+	0x47, 0xde, 0x03, 0x37, 0x90, 0x9a, 0xc4, 0x17, 0x9e, 0xd2, 0x9b, 0x9e, 0xf7, 0x69, 0x72, 0x93,
+	0x48, 0x52, 0x48, 0xa6, 0x76, 0x12, 0x04, 0xd2, 0x5b, 0xc3, 0xcc, 0xd8, 0x7a, 0x9c, 0x49, 0x2a,
+	0x31, 0xa6, 0x7f, 0xde, 0x17, 0x14, 0xe7, 0xcd, 0xc9, 0x50, 0x22, 0x05, 0x28, 0xaf, 0xd4, 0x96,
+	0x43, 0x89, 0x14, 0xa0, 0xbc, 0xd1, 0x58, 0xa5, 0xed, 0x66, 0x2e, 0x10, 0xe5, 0x72, 0x91, 0x32,
+	0x47, 0xa9, 0x68, 0x41, 0xe3, 0xab, 0x16, 0x48, 0xee, 0x4a, 0xe5, 0x7f, 0x9f, 0xde, 0x4d, 0xfe,
+	0x2f, 0x10, 0x69, 0x75, 0x9b, 0x3e, 0x01, 0xca, 0x8a, 0xa2, 0xd0, 0xd0, 0xc2, 0xe0, 0x5f, 0x81,
+	0xaa, 0xaa, 0xbc, 0xeb, 0x42, 0xa0, 0x3f, 0xef, 0xfb, 0x24, 0x42, 0x60, 0x59, 0x16, 0x61, 0x56,
+	0xc0, 0x45, 0xe0, 0x38, 0x0e, 0xdf, 0x2e, 0x0c, 0xbf, 0xf7, 0xde, 0x28, 0xad, 0x25, 0x58, 0xf2,
+	0xd1, 0xeb, 0xd0, 0xbd, 0x7b, 0xed, 0x13, 0x60, 0x16, 0x71, 0x5d, 0x97, 0x24, 0x7c, 0x20, 0x42,
+	0x50, 0xed, 0x54, 0xa8, 0xd5, 0xbd, 0xe5, 0xeb, 0x14, 0x12, 0x9c, 0x85, 0x10, 0x14, 0x0a, 0x05,
+	0xd2, 0x75, 0x9d, 0x0c, 0xc3, 0x20, 0xdb, 0xb6, 0x49, 0x2a, 0x97, 0xcb, 0x7c, 0x00, 0x66, 0x08,
+	0xac, 0xd7, 0x12, 0x4b, 0xc4, 0x03, 0x03, 0x89, 0xd9, 0x3e, 0xf1, 0x04, 0x9a, 0xa6, 0x91, 0x2c,
+	0xcb, 0x1e, 0x92, 0xf8, 0x02, 0x09, 0x9e, 0x34, 0xb3, 0x7d, 0xc6, 0x92, 0xd8, 0xec, 0x00, 0xb3,
+	0x74, 0x9e, 0xa5, 0x9b, 0xef, 0xba, 0x27, 0xc0, 0x6c, 0xe0, 0x26, 0xe2, 0x07, 0x08, 0x4a, 0x2f,
+	0xc7, 0x0c, 0xca, 0xd9, 0xc3, 0x71, 0x7a, 0xfc, 0xb9, 0xe3, 0x35, 0x04, 0x99, 0x62, 0x8a, 0x46,
+	0xd7, 0xe2, 0xc1, 0x02, 0x04, 0x82, 0xe2, 0x53, 0x9e, 0x99, 0xc9, 0x8f, 0x50, 0xfd, 0xb3, 0xca,
+	0x65, 0xac, 0x21, 0x98, 0xbb, 0x98, 0xe0, 0xb3, 0x08, 0x15, 0xe0, 0x9a, 0x85, 0x00, 0xc5, 0x53,
+	0xe7, 0xc0, 0x5b, 0x0b, 0x41, 0x68, 0x19, 0x81, 0x60, 0xef, 0x61, 0x33, 0x10, 0xbc, 0x07, 0x91,
+	0x65, 0x44, 0xec, 0x3c, 0xc0, 0x70, 0x3f, 0xfd, 0xf3, 0xc8, 0x2f, 0xcc, 0x79, 0xd2, 0x33, 0xa3,
+	0x56, 0x80, 0x45, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_remote_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x62,
+	0x6f, 0x78, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38, 0x65, 0x65, 0x30, 0x36, 0x61, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x34, 0x63, 0x61, 0x66, 0x33, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x32, 0x63, 0x37, 0x64, 0x31, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72,
+	0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x6f, 0x64, 0x22, 0x20,
+	0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x65, 0x36, 0x65, 0x36, 0x65, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30,
+	0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x39, 0x61, 0x39, 0x61, 0x61, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x35,
+	0x63, 0x35, 0x63, 0x36, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74,
+	0x20, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x37, 0x22, 0x20, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x38, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x3d, 0x22, 0x32, 0x2e, 0x31, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x72, 0x6f, 0x64, 0x29, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x34, 0x61, 0x34, 0x61, 0x35, 0x34,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78,
+	0x3d, 0x22, 0x34, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x38, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x39,
+	0x2e, 0x32, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x36, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x72, 0x62, 0x6f, 0x78, 0x29, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x32, 0x31, 0x35, 0x66, 0x31, 0x32, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e,
+	0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x34, 0x2e, 0x34, 0x20, 0x34, 0x2e, 0x32, 0x20, 0x51, 0x38, 0x20, 0x33, 0x2e, 0x32, 0x20,
+	0x31, 0x31, 0x2e, 0x36, 0x20, 0x34, 0x2e, 0x32, 0x20, 0x56, 0x36, 0x20, 0x51, 0x38, 0x20, 0x35,
+	0x2e, 0x32, 0x20, 0x34, 0x2e, 0x34, 0x20, 0x36, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69,
+	0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x32, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x36, 0x2e, 0x36, 0x20, 0x35, 0x2e, 0x37, 0x20,
+	0x4c, 0x31, 0x30, 0x2e, 0x34, 0x20, 0x38, 0x20, 0x4c, 0x36, 0x2e, 0x36, 0x20, 0x31, 0x30, 0x2e,
+	0x33, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x31, 0x36, 0x34, 0x61,
+	0x30, 0x61, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_security_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x01, 0xe0, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0xb5, 0x92, 0xbd,
+	0x6b, 0x53, 0x61, 0x14, 0xc6, 0x9f, 0xc4, 0xe4, 0xe6, 0xde, 0x0c, 0x49, 0x9b, 0x60, 0x93, 0x6a,
+	0x2c, 0x56, 0xbb, 0x14, 0xac, 0x83, 0xfe, 0x39, 0xe2, 0xe6, 0x20, 0x42, 0x40, 0xdb, 0x92, 0x36,
+	0x35, 0x5f, 0xcd, 0xd7, 0x4d, 0xf3, 0xd1, 0x34, 0xa1, 0x28, 0x15, 0x57, 0x67, 0xc7, 0x4e, 0x0e,
+	0x2a, 0xb8, 0xba, 0x54, 0x70, 0x72, 0x13, 0x45, 0xd0, 0x86, 0x62, 0xd2, 0xb4, 0x4d, 0xf3, 0x93,
+	0x52, 0x50, 0xf4, 0x06, 0xed, 0xe2, 0xb3, 0x1c, 0xde, 0x73, 0xce, 0xfb, 0x7b, 0xce, 0x79, 0x79,
+	0xa5, 0xff, 0xa5, 0x42, 0x36, 0x46, 0xa5, 0x2a, 0xf2, 0x69, 0xd1, 0xc8, 0x86, 0xf8, 0xb3, 0xfe,
+	0x57, 0xad, 0xb6, 0x2e, 0xf1, 0xe6, 0xd5, 0x33, 0x4c, 0x5d, 0xc7, 0x2f, 0x37, 0x85, 0x62, 0x8c,
+	0xa9, 0x68, 0xf0, 0x6c, 0x90, 0x5b, 0x8b, 0x06, 0x2f, 0x5f, 0xec, 0x12, 0x9e, 0xf8, 0x75, 0x61,
+	0x7e, 0x5d, 0xa4, 0xca, 0x16, 0x86, 0xf4, 0x6f, 0x48, 0xa2, 0x2d, 0x02, 0x81, 0x80, 0xa3, 0x31,
+	0x5d, 0x17, 0xe6, 0x59, 0x00, 0x85, 0xe6, 0xe8, 0xc6, 0xe5, 0xe5, 0x28, 0xa6, 0xae, 0x3a, 0xf2,
+	0x0e, 0xc5, 0x17, 0x44, 0xd4, 0x3d, 0x49, 0xde, 0xb6, 0x48, 0xd9, 0xa2, 0xf5, 0xe8, 0x06, 0xb5,
+	0x66, 0x84, 0xca, 0x9a, 0xc5, 0x4c, 0xc4, 0xe0, 0xee, 0x7d, 0x27, 0xfc, 0xa7, 0x1a, 0x1b, 0x37,
+	0xa9, 0x37, 0x67, 0x78, 0xb0, 0x22, 0xec, 0xf2, 0x35, 0x0a, 0xa5, 0x08, 0xe5, 0xba, 0x49, 0x22,
+	0x69, 0x50, 0xab, 0xf9, 0xb8, 0x73, 0xfb, 0x3c, 0xa5, 0xa7, 0x22, 0xe8, 0x37, 0x9c, 0x90, 0xf9,
+	0x8a, 0x18, 0x1c, 0x7c, 0x86, 0x3e, 0xc0, 0x2e, 0xf0, 0x1e, 0xba, 0x40, 0xef, 0xe4, 0xbc, 0x73,
+	0x1a, 0x7b, 0x90, 0x6b, 0x09, 0x8f, 0xae, 0x8c, 0x00, 0x14, 0x05, 0xfb, 0xd0, 0x1d, 0x8e, 0x73,
+	0x74, 0xe4, 0xe3, 0xf8, 0x50, 0x30, 0x08, 0x72, 0x8c, 0xd8, 0x47, 0xec, 0x1d, 0xbb, 0xe8, 0x0c,
+	0xa6, 0x48, 0xd5, 0x84, 0xcb, 0x35, 0x62, 0x0d, 0x7b, 0xcb, 0xe2, 0xfb, 0x07, 0x68, 0x6f, 0x8a,
+	0x0d, 0x5b, 0xb4, 0x2b, 0x62, 0xfd, 0x61, 0x88, 0xb5, 0x8c, 0x68, 0xd8, 0xa2, 0x9a, 0x16, 0x9f,
+	0xde, 0xbe, 0x66, 0x39, 0x2b, 0xc2, 0x63, 0x96, 0x13, 0xb0, 0x50, 0x16, 0xf0, 0x85, 0x9d, 0x8f,
+	0x2e, 0xfa, 0x04, 0x4f, 0x5d, 0x0f, 0xc7, 0xd9, 0x1b, 0x84, 0x80, 0x59, 0x86, 0x88, 0x01, 0x1e,
+	0x96, 0x96, 0x84, 0xa1, 0x88, 0x13, 0xb0, 0x5a, 0x9c, 0x84, 0x4e, 0x8f, 0xc7, 0xad, 0x69, 0x5a,
+	0xc5, 0x18, 0xc5, 0x15, 0xd1, 0x2e, 0x8f, 0x51, 0x2d, 0x8a, 0x42, 0x5e, 0x94, 0x93, 0xe2, 0xdd,
+	0xf6, 0x36, 0xf5, 0x96, 0x08, 0xba, 0xc3, 0x4e, 0x40, 0x2e, 0xe3, 0x03, 0x9e, 0xd3, 0xe9, 0xce,
+	0x02, 0x61, 0xbe, 0xf5, 0x44, 0x6f, 0x28, 0xfa, 0x9c, 0x4c, 0xe6, 0x63, 0xc8, 0x1c, 0x5f, 0x0f,
+	0xc2, 0x34, 0x1a, 0x17, 0xf1, 0x8d, 0x7a, 0x83, 0xc5, 0xa4, 0x78, 0xb2, 0x75, 0x81, 0xf8, 0x3d,
+	0x51, 0xc8, 0x58, 0x34, 0xed, 0x28, 0x9b, 0xf5, 0x69, 0x72, 0x89, 0x73, 0x64, 0x13, 0x22, 0x5d,
+	0x12, 0xf9, 0xdc, 0x1c, 0xf1, 0xb4, 0x08, 0x7a, 0x2f, 0x3b, 0x01, 0x96, 0x26, 0xf0, 0xbb, 0x85,
+	0xe1, 0x12, 0xa6, 0xf7, 0x34, 0x9e, 0xfc, 0x7d, 0x9f, 0xdc, 0x84, 0x8d, 0x28, 0x96, 0x29, 0xbc,
+	0x1e, 0xe1, 0x35, 0x7f, 0x77, 0xff, 0x01, 0xfd, 0x43, 0x36, 0xd4, 0xa5, 0x81, 0xfb, 0xf0, 0x00,
+	0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_security_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x68,
+	0x61, 0x63, 0x6b, 0x6c, 0x65, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55,
+	0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f,
+	0x6e, 0x55, 0x73, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x34, 0x2e, 0x35, 0x22, 0x20, 0x79,
+	0x31, 0x3d, 0x22, 0x31, 0x2e, 0x35, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x35,
+	0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x36, 0x2e, 0x35, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x39, 0x31, 0x38, 0x61, 0x33, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e,
+	0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x34, 0x63, 0x34, 0x35, 0x32, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x30,
+	0x64, 0x30, 0x39, 0x30, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x64, 0x79, 0x22, 0x20, 0x67, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72,
+	0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22,
+	0x38, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x36, 0x2e, 0x39, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22,
+	0x38, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x35, 0x22, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x63, 0x39, 0x62, 0x39, 0x33, 0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x2e, 0x31, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x66, 0x34, 0x65, 0x62, 0x36, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x2e, 0x33, 0x32, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x66, 0x65, 0x66, 0x66, 0x32, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x2e, 0x36, 0x32, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x32, 0x65, 0x38, 0x30, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x38, 0x39, 0x63, 0x30, 0x30, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x36, 0x61, 0x36, 0x30, 0x30, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x69, 0x6d, 0x22,
+	0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22,
+	0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20,
+	0x78, 0x31, 0x3d, 0x22, 0x33, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x37, 0x22, 0x20, 0x78, 0x32,
+	0x3d, 0x22, 0x31, 0x34, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x35, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38, 0x64, 0x38, 0x36, 0x32, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x34, 0x66, 0x34, 0x61, 0x30, 0x38, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x31, 0x35, 0x31, 0x30, 0x30, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x35, 0x20, 0x37, 0x2e, 0x34, 0x20,
+	0x56, 0x34, 0x2e, 0x36, 0x20, 0x41, 0x33, 0x20, 0x33, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20,
+	0x31, 0x31, 0x20, 0x34, 0x2e, 0x36, 0x20, 0x56, 0x37, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x73, 0x68, 0x61, 0x63, 0x6b, 0x6c, 0x65, 0x29, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e,
+	0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x35, 0x2e, 0x37, 0x20, 0x34, 0x2e, 0x35, 0x20, 0x41, 0x32, 0x2e, 0x33, 0x20, 0x32, 0x2e,
+	0x33, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x38, 0x2e, 0x31, 0x20, 0x32, 0x2e, 0x33, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x64, 0x38, 0x64, 0x33, 0x62, 0x32, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d,
+	0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20,
+	0x78, 0x3d, 0x22, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x36, 0x2e, 0x39, 0x22, 0x20,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x32, 0x22, 0x20, 0x68, 0x65, 0x69,
+	0x67, 0x68, 0x74, 0x3d, 0x22, 0x38, 0x2e, 0x36, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e,
+	0x37, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x62, 0x6f,
+	0x64, 0x79, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x75, 0x72, 0x6c,
+	0x28, 0x23, 0x72, 0x69, 0x6d, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x34, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x31,
+	0x3d, 0x22, 0x38, 0x2e, 0x34, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x38, 0x22,
+	0x20, 0x79, 0x32, 0x3d, 0x22, 0x38, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x63, 0x65, 0x61, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x31, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f,
+	0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e,
+	0x39, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31,
+	0x3d, 0x22, 0x33, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x36, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x38, 0x61,
+	0x38, 0x33, 0x30, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x33, 0x2e,
+	0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x32, 0x2e, 0x36, 0x22, 0x20, 0x78, 0x32, 0x3d,
+	0x22, 0x31, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x32, 0x2e, 0x36, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x38, 0x61, 0x38, 0x33, 0x30, 0x30,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x39, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65,
+	0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f,
+	0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_prefs_servers_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x02, 0x37, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0xa5, 0x93, 0x5d,
+	0x48, 0xd3, 0x51, 0x1c, 0x40, 0xf7, 0x26, 0x64, 0x94, 0x3d, 0xf4, 0x60, 0x2f, 0x46, 0x98, 0x9a,
+	0x9a, 0x66, 0x42, 0xa8, 0x51, 0x89, 0xfe, 0x53, 0x2a, 0x93, 0x1e, 0x14, 0xa3, 0x16, 0x8d, 0x8c,
+	0x19, 0xa5, 0x98, 0xc8, 0x22, 0x4d, 0xe7, 0xd0, 0x64, 0xf3, 0xa3, 0xd0, 0x94, 0xb2, 0x99, 0x53,
+	0x23, 0x25, 0xcd, 0x6c, 0x8b, 0xc4, 0x24, 0x2b, 0x34, 0xb2, 0x50, 0x71, 0x89, 0x5f, 0x1b, 0x18,
+	0xe6, 0xc7, 0x94, 0x9c, 0x1f, 0xe5, 0xc2, 0x4c, 0xd3, 0x13, 0x06, 0xa2, 0x39, 0x09, 0xa9, 0x03,
+	0x97, 0xfb, 0x74, 0xce, 0xe5, 0xf7, 0x83, 0x2b, 0x52, 0x28, 0x14, 0x88, 0x44, 0x22, 0xd1, 0xbf,
+	0xde, 0x56, 0x94, 0xeb, 0xf4, 0x58, 0xbe, 0xcd, 0x31, 0x3b, 0x3b, 0xcf, 0xcc, 0x8f, 0x9f, 0x2c,
+	0xcc, 0x03, 0x0b, 0x60, 0x99, 0x86, 0xb2, 0x27, 0xcd, 0x6b, 0x4b, 0x4b, 0x54, 0xd7, 0xf5, 0xd2,
+	0x3f, 0x38, 0xce, 0xdb, 0xe6, 0x1e, 0x9e, 0xbf, 0x6e, 0xa7, 0xe5, 0x43, 0x3f, 0xa6, 0x91, 0x29,
+	0x4c, 0x23, 0x16, 0x06, 0x4c, 0x5f, 0x19, 0x9f, 0x9c, 0xa3, 0xaa, 0xd6, 0xb8, 0x76, 0x44, 0x12,
+	0xf7, 0x88, 0xaa, 0x1a, 0x3d, 0x79, 0x9a, 0x5a, 0x72, 0x8b, 0x5e, 0x71, 0xa7, 0xec, 0x1d, 0xad,
+	0xed, 0x43, 0x74, 0xf4, 0x98, 0x68, 0xd1, 0x7f, 0xa2, 0xad, 0x63, 0x88, 0x2e, 0x83, 0x99, 0x2e,
+	0xe3, 0x17, 0xce, 0x44, 0x97, 0x58, 0x47, 0xf6, 0x87, 0xa9, 0x11, 0xc7, 0xaa, 0x89, 0x4d, 0xd5,
+	0x11, 0x9f, 0x5e, 0x43, 0x5b, 0xc7, 0x30, 0x13, 0x93, 0x33, 0xbf, 0x5f, 0x37, 0x7e, 0x1c, 0xa3,
+	0xd3, 0x30, 0x4a, 0xb3, 0xde, 0x44, 0x43, 0xd3, 0x00, 0xe9, 0xb7, 0x56, 0x8d, 0xb2, 0x37, 0x48,
+	0x8e, 0xf4, 0x8a, 0x96, 0x53, 0xd1, 0xa5, 0x1c, 0x91, 0xa8, 0x09, 0x3e, 0x5b, 0x44, 0x41, 0xd9,
+	0x7b, 0x7a, 0xfb, 0xcc, 0x7c, 0x36, 0x5b, 0x18, 0x1c, 0x9e, 0xa2, 0xd3, 0x60, 0xa6, 0xa1, 0xa9,
+	0x0f, 0x65, 0x6e, 0x1d, 0xb1, 0x29, 0xf5, 0xec, 0xf4, 0x16, 0x2f, 0x47, 0x84, 0xb0, 0x2c, 0x0a,
+	0x1f, 0x74, 0x52, 0xa1, 0xed, 0x46, 0x96, 0x5a, 0x89, 0x83, 0x9f, 0x9c, 0xed, 0x07, 0x55, 0x38,
+	0x07, 0x28, 0x79, 0xa8, 0x6b, 0x65, 0x6c, 0xe2, 0x3b, 0xdd, 0xc6, 0x31, 0xf2, 0x8b, 0x9b, 0xf0,
+	0x10, 0x52, 0x10, 0xc4, 0x25, 0x6c, 0x75, 0x8a, 0x58, 0x0e, 0xf8, 0x06, 0x27, 0x90, 0xaf, 0x69,
+	0xa7, 0x52, 0x67, 0x20, 0x4a, 0x56, 0x8a, 0x8d, 0x53, 0x1c, 0xb6, 0xee, 0xc9, 0x88, 0x1c, 0xe2,
+	0x89, 0x96, 0x3f, 0x66, 0xd4, 0x3c, 0x4d, 0xfd, 0x9b, 0x3e, 0xdc, 0x03, 0x15, 0xf8, 0x85, 0xaa,
+	0x38, 0x16, 0x59, 0x81, 0x8d, 0xbd, 0xf0, 0xe7, 0x18, 0xaa, 0xfc, 0x56, 0xc2, 0xce, 0xdf, 0x66,
+	0x8b, 0x67, 0x02, 0xb6, 0x6e, 0x49, 0x6c, 0xf6, 0x90, 0xb3, 0xc1, 0xf5, 0x1a, 0x5e, 0x21, 0x39,
+	0x68, 0xeb, 0x0c, 0x9c, 0x88, 0xba, 0xcf, 0x46, 0xe7, 0x18, 0xc4, 0x97, 0x34, 0x24, 0xaa, 0x1a,
+	0xad, 0x97, 0x18, 0x14, 0x71, 0x13, 0x57, 0x21, 0x03, 0x3b, 0xcf, 0x44, 0xb6, 0xf9, 0xa4, 0xe3,
+	0xe8, 0x9f, 0xc9, 0x2e, 0xe1, 0x06, 0x4e, 0x01, 0x59, 0xb8, 0x04, 0x66, 0xb3, 0xc9, 0x23, 0x99,
+	0x1d, 0x87, 0x54, 0xb8, 0x04, 0xe5, 0x61, 0xbf, 0xfb, 0x82, 0x75, 0x60, 0x11, 0x37, 0x21, 0x03,
+	0xdf, 0xf0, 0x42, 0x04, 0xf1, 0x3d, 0x8e, 0x4a, 0x34, 0x84, 0x46, 0x96, 0x10, 0x72, 0xae, 0x18,
+	0xe1, 0x74, 0x21, 0xfe, 0x27, 0xd5, 0x78, 0x1d, 0x2f, 0xc0, 0xce, 0xed, 0xf2, 0xda, 0xf2, 0x12,
+	0xde, 0x87, 0x65, 0x48, 0x13, 0x9e, 0x92, 0x94, 0xdd, 0xc8, 0x55, 0xe5, 0x0b, 0x12, 0x33, 0x5f,
+	0x12, 0x7f, 0xbd, 0x9e, 0xf0, 0x8b, 0xe5, 0x38, 0xee, 0x93, 0xfe, 0x5d, 0x5e, 0xc9, 0x01, 0x41,
+	0x82, 0x2a, 0xe7, 0x19, 0x31, 0xb2, 0xbb, 0xec, 0xf1, 0x09, 0x5f, 0xbf, 0xb8, 0x92, 0xc5, 0x0f,
+	0x93, 0x96, 0xa6, 0x5c, 0xbf, 0xbc, 0x28, 0xac, 0xe7, 0xac, 0xf6, 0xfe, 0x8b, 0x5f, 0xae, 0x23,
+	0x8f, 0x0a, 0xf4, 0x55, 0x02, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+	0x60, 0x82
+};
+
+static const unsigned char icon_prefs_servers_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x6c,
+	0x6f, 0x62, 0x65, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x36, 0x22, 0x20, 0x63,
+	0x79, 0x3d, 0x22, 0x30, 0x2e, 0x32, 0x38, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x32,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x61, 0x66, 0x32, 0x66, 0x63, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x39, 0x33, 0x62, 0x34, 0x65, 0x32, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x36, 0x63, 0x62, 0x35, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x32, 0x34, 0x34, 0x64, 0x38, 0x66, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x68,
+	0x72, 0x6f, 0x6d, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x65, 0x65, 0x65, 0x66, 0x32, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x39, 0x63, 0x39, 0x63, 0x61, 0x34, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x35, 0x61, 0x35, 0x61, 0x36, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x31, 0x35, 0x22, 0x20, 0x79, 0x3d,
+	0x22, 0x32, 0x31, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x22, 0x20, 0x68,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x36, 0x2e, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x29, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x37, 0x2e, 0x35,
+	0x22, 0x20, 0x79, 0x3d, 0x22, 0x32, 0x36, 0x2e, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68,
+	0x3d, 0x22, 0x31, 0x37, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x2e,
+	0x34, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x29, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x34, 0x61, 0x34, 0x61, 0x35, 0x32, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30,
+	0x2e, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20,
+	0x63, 0x78, 0x3d, 0x22, 0x31, 0x36, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x32, 0x2e, 0x35,
+	0x22, 0x20, 0x72, 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x67, 0x6c, 0x6f, 0x62, 0x65, 0x29, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x64, 0x33, 0x66, 0x37, 0x38, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x38,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x67, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23,
+	0x65, 0x65, 0x66, 0x34, 0x66, 0x63, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x39, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x39, 0x2e, 0x32, 0x20, 0x51,
+	0x31, 0x33, 0x2e, 0x36, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x31, 0x35, 0x2e, 0x38, 0x20, 0x38, 0x20,
+	0x51, 0x31, 0x38, 0x2e, 0x34, 0x20, 0x37, 0x2e, 0x38, 0x20, 0x31, 0x39, 0x2e, 0x38, 0x20, 0x38,
+	0x2e, 0x32, 0x20, 0x51, 0x32, 0x31, 0x2e, 0x32, 0x20, 0x39, 0x2e, 0x36, 0x20, 0x32, 0x30, 0x2e,
+	0x34, 0x20, 0x31, 0x31, 0x20, 0x51, 0x31, 0x39, 0x2e, 0x35, 0x20, 0x31, 0x32, 0x20, 0x31, 0x39,
+	0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x51, 0x31, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x38,
+	0x20, 0x31, 0x37, 0x2e, 0x33, 0x20, 0x31, 0x37, 0x2e, 0x38, 0x20, 0x51, 0x31, 0x36, 0x2e, 0x33,
+	0x20, 0x31, 0x38, 0x2e, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x39, 0x20, 0x31, 0x37, 0x2e, 0x32, 0x20,
+	0x51, 0x31, 0x35, 0x2e, 0x35, 0x20, 0x31, 0x35, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x20, 0x31, 0x34,
+	0x20, 0x51, 0x31, 0x33, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x36, 0x20, 0x31, 0x33, 0x2e, 0x31,
+	0x20, 0x31, 0x32, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x30, 0x2e, 0x36,
+	0x20, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x39, 0x2e, 0x32, 0x20, 0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22,
+	0x32, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x38, 0x22, 0x20,
+	0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e,
+	0x33, 0x35, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72,
+	0x6f, 0x74, 0x61, 0x74, 0x65, 0x28, 0x31, 0x38, 0x20, 0x32, 0x30, 0x2e, 0x37, 0x20, 0x31, 0x35,
+	0x2e, 0x38, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x33, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x34, 0x20, 0x51, 0x31,
+	0x35, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x32, 0x20, 0x31, 0x38, 0x20, 0x35, 0x2e, 0x36, 0x20, 0x51,
+	0x31, 0x39, 0x2e, 0x36, 0x20, 0x36, 0x20, 0x31, 0x39, 0x2e, 0x31, 0x20, 0x37, 0x2e, 0x31, 0x20,
+	0x51, 0x31, 0x36, 0x2e, 0x39, 0x20, 0x37, 0x2e, 0x35, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x20, 0x37,
+	0x2e, 0x35, 0x20, 0x51, 0x31, 0x33, 0x2e, 0x38, 0x20, 0x37, 0x2e, 0x31, 0x20, 0x31, 0x33, 0x2e,
+	0x39, 0x20, 0x36, 0x2e, 0x34, 0x20, 0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x37, 0x2e,
+	0x34, 0x20, 0x51, 0x32, 0x32, 0x2e, 0x36, 0x20, 0x37, 0x20, 0x32, 0x33, 0x2e, 0x36, 0x20, 0x38,
+	0x2e, 0x32, 0x20, 0x51, 0x32, 0x32, 0x2e, 0x39, 0x20, 0x39, 0x2e, 0x33, 0x20, 0x32, 0x31, 0x2e,
+	0x34, 0x20, 0x38, 0x2e, 0x39, 0x20, 0x51, 0x32, 0x30, 0x2e, 0x35, 0x20, 0x38, 0x2e, 0x32, 0x20,
+	0x32, 0x30, 0x2e, 0x38, 0x20, 0x37, 0x2e, 0x34, 0x20, 0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x39, 0x2e, 0x33, 0x20,
+	0x31, 0x33, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x30, 0x2e, 0x37, 0x20, 0x31, 0x33, 0x2e, 0x34, 0x20,
+	0x31, 0x30, 0x2e, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x30, 0x2e, 0x37, 0x20,
+	0x31, 0x37, 0x2e, 0x32, 0x20, 0x39, 0x2e, 0x36, 0x20, 0x31, 0x37, 0x2e, 0x39, 0x20, 0x51, 0x38,
+	0x2e, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x20, 0x39, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x32,
+	0x20, 0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x31, 0x22, 0x20,
+	0x63, 0x79, 0x3d, 0x22, 0x36, 0x2e, 0x36, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x34, 0x2e, 0x34,
+	0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74,
+	0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72,
+	0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x33, 0x32, 0x20, 0x31, 0x31,
+	0x20, 0x36, 0x2e, 0x36, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a,
+};
+
+static const unsigned char icon_prefs_statistics_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x01, 0x9f, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0x63, 0x60, 0xa0,
+	0x16, 0xc8, 0x89, 0x0f, 0xff, 0x4f, 0x0a, 0xc6, 0xd0, 0xbc, 0x67, 0xe5, 0xf4, 0xff, 0xcf, 0x2f,
+	0xec, 0xfc, 0x7f, 0xf7, 0xf8, 0x46, 0x30, 0xbe, 0xb4, 0x77, 0x05, 0x18, 0x1f, 0xd9, 0x38, 0x17,
+	0x8c, 0xb7, 0x2f, 0x9d, 0x04, 0xc7, 0xf3, 0xfa, 0xea, 0xfe, 0x07, 0x7a, 0x78, 0x40, 0x0c, 0x41,
+	0xd6, 0x5c, 0xdd, 0x93, 0xfc, 0xdf, 0x3d, 0xd2, 0x1e, 0x8c, 0x3d, 0x62, 0xed, 0xb0, 0xe2, 0xf6,
+	0xf6, 0x6c, 0xb0, 0x21, 0x53, 0xdb, 0x2a, 0x21, 0x86, 0x80, 0x0c, 0x00, 0x6b, 0xee, 0x4c, 0x01,
+	0x6b, 0xd4, 0x2f, 0xd5, 0xfd, 0x6f, 0x5c, 0xaf, 0x85, 0x15, 0x5b, 0x17, 0x1a, 0xfd, 0x77, 0x4a,
+	0xb6, 0x04, 0xab, 0x05, 0x19, 0x82, 0x62, 0x00, 0x48, 0xb3, 0x4e, 0x8e, 0xc1, 0x7f, 0xe5, 0x16,
+	0xd5, 0xff, 0x11, 0x87, 0x6d, 0xff, 0x8b, 0xcc, 0x90, 0xc4, 0x8a, 0xf5, 0xab, 0xb4, 0xff, 0x5b,
+	0x26, 0x5b, 0xa0, 0x1a, 0x00, 0xf2, 0xab, 0x6b, 0x88, 0x03, 0xd8, 0x00, 0xaf, 0xf5, 0x96, 0xff,
+	0xb7, 0xff, 0x2f, 0xff, 0x1f, 0xba, 0xcb, 0xe1, 0xbf, 0x40, 0x8f, 0x0c, 0x06, 0xf6, 0xdb, 0x6a,
+	0xfb, 0xdf, 0x22, 0xc1, 0xe2, 0xff, 0xfa, 0xb9, 0xdd, 0x68, 0x06, 0x04, 0x39, 0xfe, 0xb7, 0xeb,
+	0x32, 0xff, 0x3f, 0xfb, 0x75, 0xf2, 0x7f, 0xab, 0xc5, 0x46, 0x60, 0x43, 0xac, 0x97, 0x1a, 0xff,
+	0xe7, 0x69, 0x94, 0x87, 0x63, 0xa3, 0x79, 0xfa, 0x60, 0x71, 0x8b, 0x58, 0x4b, 0x54, 0x03, 0x40,
+	0xa1, 0xec, 0x12, 0xe8, 0xf8, 0x3f, 0x7d, 0x8d, 0xc7, 0x7f, 0xdd, 0xa9, 0xfa, 0xff, 0xb9, 0x2a,
+	0x15, 0xff, 0x5b, 0xce, 0x33, 0xfe, 0x3f, 0xf7, 0x6d, 0xea, 0x7f, 0xdd, 0x69, 0x10, 0xbe, 0xfa,
+	0x44, 0x9d, 0xff, 0xb3, 0x5f, 0x25, 0x83, 0xe5, 0xcd, 0xa3, 0xac, 0xb0, 0x18, 0x10, 0xe0, 0xf4,
+	0xdf, 0xac, 0xd2, 0xfc, 0x3f, 0x47, 0x91, 0x32, 0x1c, 0xeb, 0x4e, 0x32, 0xfc, 0xdf, 0x7a, 0x3b,
+	0xfc, 0xbf, 0xc9, 0x0c, 0x93, 0xff, 0x2d, 0x37, 0xc3, 0xfe, 0xeb, 0x4c, 0x30, 0x00, 0x8b, 0x9b,
+	0x45, 0x58, 0xff, 0x5f, 0x36, 0xb5, 0x05, 0x61, 0x00, 0x28, 0x40, 0x9c, 0xfd, 0x9c, 0xfe, 0xab,
+	0xc5, 0x98, 0xfc, 0x67, 0xcd, 0x51, 0x41, 0xc1, 0x2a, 0xed, 0xfa, 0xff, 0x73, 0x8f, 0xf9, 0xfc,
+	0x57, 0xe9, 0xd0, 0x87, 0x8b, 0x99, 0x86, 0x62, 0x31, 0xa0, 0xac, 0x26, 0xfd, 0xbf, 0x83, 0xbf,
+	0xe3, 0x7f, 0xe6, 0x34, 0x75, 0x0c, 0x2c, 0x53, 0xa3, 0x0f, 0x67, 0xab, 0x45, 0x98, 0x82, 0xd5,
+	0xa2, 0x18, 0x30, 0xb5, 0xad, 0x1c, 0x6c, 0x48, 0x69, 0x75, 0xfa, 0x7f, 0xe3, 0x40, 0x1b, 0xbc,
+	0x18, 0xa4, 0x06, 0xa4, 0xb9, 0xb3, 0xba, 0x10, 0x91, 0x1a, 0x41, 0x0c, 0x90, 0x00, 0x72, 0x72,
+	0x05, 0x61, 0x50, 0x40, 0xc1, 0x30, 0x48, 0x13, 0x0c, 0xa3, 0x68, 0x86, 0x01, 0x90, 0x00, 0x29,
+	0x18, 0x45, 0x33, 0x25, 0x00, 0x00, 0x70, 0xfc, 0xcc, 0x73, 0xd2, 0x62, 0x0e, 0x60, 0x00, 0x00,
+	0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_prefs_statistics_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x72,
+	0x6d, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x37, 0x64, 0x36, 0x66, 0x36, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x34, 0x36, 0x33, 0x64, 0x33, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x61, 0x73, 0x22, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d,
+	0x22, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x65, 0x66, 0x64, 0x39, 0x63, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e,
+	0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x63, 0x31, 0x62, 0x30, 0x39, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x39, 0x62,
+	0x38, 0x61, 0x37, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69,
+	0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x72, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x35, 0x32, 0x36, 0x30,
+	0x33, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x31, 0x36, 0x22, 0x20,
+	0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x35, 0x38,
+	0x31, 0x32, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x32, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x31, 0x32,
+	0x39, 0x32, 0x31, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x30, 0x34, 0x35, 0x61,
+	0x32, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65,
+	0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d,
+	0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x31, 0x22, 0x20, 0x77, 0x69,
+	0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x32, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68,
+	0x74, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x32, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x66, 0x72, 0x6d, 0x29, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x31, 0x2e,
+	0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x32, 0x2e, 0x31, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68,
+	0x3d, 0x22, 0x31, 0x33, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x31, 0x32,
+	0x2e, 0x31, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x32, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x63, 0x61, 0x73, 0x29, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x32, 0x2e, 0x39, 0x22, 0x20,
+	0x79, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31,
+	0x30, 0x2e, 0x32, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x39, 0x2e, 0x35,
+	0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x73, 0x63, 0x72, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x3d, 0x22, 0x23, 0x33, 0x64, 0x34, 0x62, 0x33, 0x39, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x6f, 0x6c, 0x79, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x6f,
+	0x69, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x33, 0x2e, 0x37, 0x2c, 0x37, 0x2e, 0x35, 0x20, 0x35, 0x2e,
+	0x32, 0x2c, 0x35, 0x2e, 0x34, 0x20, 0x39, 0x2e, 0x36, 0x2c, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x32,
+	0x2e, 0x35, 0x2c, 0x36, 0x2e, 0x32, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f,
+	0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x35, 0x35, 0x63,
+	0x31, 0x33, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x31, 0x2e, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c,
+	0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22,
+	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x6f, 0x6c, 0x79,
+	0x6c, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x33, 0x2e, 0x37,
+	0x2c, 0x37, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x32, 0x2c, 0x35, 0x2e, 0x34, 0x20, 0x39, 0x2e, 0x36,
+	0x2c, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x32, 0x2e, 0x35, 0x2c, 0x36, 0x2e, 0x32, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x3d, 0x22, 0x23, 0x63, 0x39, 0x66, 0x66, 0x38, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22,
+	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69,
+	0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e,
+	0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_reload_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x01, 0x96, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xc5, 0x90, 0x31,
+	0x6b, 0x14, 0x61, 0x10, 0x86, 0x9f, 0xd9, 0x5d, 0x73, 0xc6, 0x3b, 0x14, 0x49, 0x02, 0x29, 0x62,
+	0x61, 0x21, 0x58, 0x68, 0xb5, 0x8d, 0x07, 0x97, 0xbb, 0x0d, 0x8a, 0x68, 0x52, 0x08, 0x29, 0xee,
+	0x04, 0xc1, 0x52, 0x89, 0x06, 0x05, 0x11, 0x3b, 0xc1, 0x42, 0x21, 0x69, 0x55, 0x30, 0x7f, 0x40,
+	0x90, 0x0d, 0xa4, 0x89, 0x55, 0x50, 0x92, 0x6f, 0xaf, 0xb1, 0x30, 0xa5, 0x9d, 0x3f, 0x40, 0xd4,
+	0x20, 0xc6, 0xdc, 0x11, 0x39, 0xd9, 0xd7, 0x42, 0x13, 0xbe, 0x70, 0x7b, 0x75, 0xde, 0x6a, 0xbe,
+	0x99, 0x6f, 0x9e, 0x79, 0x67, 0xe0, 0xb0, 0x65, 0x45, 0xc9, 0x24, 0x4d, 0xae, 0x48, 0xba, 0x03,
+	0xc4, 0x88, 0x1e, 0xc6, 0x27, 0x60, 0xc9, 0x35, 0xdd, 0xdb, 0xda, 0x4a, 0xed, 0x74, 0xd8, 0x0b,
+	0x63, 0x77, 0xdd, 0x2d, 0x17, 0x02, 0xea, 0x6f, 0xea, 0x2f, 0xcc, 0x6c, 0x7e, 0xc0, 0xc0, 0x77,
+	0x40, 0x0c, 0x6c, 0xb9, 0x96, 0x3b, 0x03, 0x10, 0xf8, 0xd5, 0x46, 0xda, 0x98, 0x33, 0xb3, 0x79,
+	0x21, 0x67, 0x66, 0x57, 0xa3, 0x23, 0xd1, 0x68, 0x68, 0xe1, 0x04, 0x70, 0x0b, 0xd8, 0x05, 0x2e,
+	0x01, 0x27, 0xfd, 0xc1, 0xd1, 0x5e, 0x10, 0xaf, 0xc6, 0xc7, 0xe8, 0xb2, 0x20, 0xe9, 0x65, 0xd6,
+	0xca, 0xee, 0x61, 0x08, 0xa0, 0x9a, 0x56, 0x87, 0x87, 0x18, 0x9a, 0x06, 0x8e, 0x16, 0x59, 0xda,
+	0x77, 0x50, 0xe9, 0x56, 0xae, 0x01, 0x9f, 0x3b, 0x3f, 0x3b, 0x0f, 0xf6, 0x9a, 0xff, 0x4d, 0x88,
+	0x2a, 0x80, 0x80, 0xed, 0x22, 0x40, 0xe4, 0xc5, 0x3b, 0xc0, 0xc3, 0xcd, 0xdb, 0x9b, 0x3d, 0xff,
+	0x43, 0xbb, 0xd9, 0xfe, 0x06, 0xcc, 0x26, 0xeb, 0x49, 0xa4, 0x2f, 0xaa, 0x2a, 0xd0, 0x65, 0x33,
+	0xdb, 0xee, 0x07, 0x88, 0x53, 0x18, 0xe3, 0x49, 0x9a, 0xf4, 0x18, 0xe3, 0xc3, 0xc6, 0xd4, 0xc6,
+	0x1f, 0x1f, 0xf4, 0xff, 0xdd, 0x4e, 0xd2, 0x44, 0x96, 0xdb, 0x48, 0xdf, 0x0a, 0x18, 0x77, 0x81,
+	0xc7, 0x92, 0xda, 0xfa, 0xaa, 0xef, 0x8d, 0xb4, 0x91, 0x4e, 0xa6, 0x93, 0x63, 0x07, 0xfc, 0x3e,
+	0x21, 0x10, 0x5a, 0xcc, 0x83, 0xfc, 0x78, 0x3f, 0xe0, 0xa0, 0x4e, 0x20, 0xca, 0xdd, 0xe1, 0x6e,
+	0xc7, 0x4f, 0xd6, 0xcf, 0xd6, 0x9f, 0x21, 0xce, 0x95, 0x76, 0x4b, 0x2b, 0x45, 0x37, 0xf0, 0xf5,
+	0xdb, 0xb0, 0xd5, 0xf2, 0x4e, 0x79, 0xa4, 0xf6, 0xba, 0x56, 0x0a, 0xa2, 0xe0, 0x3c, 0xf0, 0xc8,
+	0xb0, 0x19, 0xe0, 0xfe, 0xda, 0xcd, 0xb5, 0xce, 0x20, 0xc0, 0x2f, 0xe0, 0x23, 0x30, 0x25, 0xf4,
+	0xca, 0x02, 0x23, 0x0c, 0xc2, 0xfd, 0xa2, 0xd0, 0x52, 0xd6, 0xca, 0x9e, 0xfb, 0x0d, 0xfe, 0x0a,
+	0x4f, 0x73, 0xcb, 0x2f, 0xb8, 0xa6, 0xbb, 0x28, 0xd3, 0x0d, 0x60, 0x1d, 0xd8, 0x02, 0x7e, 0xc8,
+	0xf4, 0x1e, 0x63, 0x36, 0x6b, 0x65, 0x73, 0x03, 0x1c, 0x1f, 0xa2, 0xfe, 0x02, 0xe2, 0xdb, 0x86,
+	0xfc, 0x64, 0xda, 0x60, 0x11, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+	0x82
+};
+
+static const unsigned char icon_reload_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x32, 0x30, 0x34, 0x38, 0x20, 0x32, 0x30, 0x34, 0x38, 0x22, 0x3e,
+	0x0a, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x36, 0x33, 0x2c, 0x31,
+	0x36, 0x39, 0x2c, 0x36, 0x33, 0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x36, 0x36,
+	0x39, 0x2e, 0x36, 0x37, 0x20, 0x31, 0x30, 0x36, 0x30, 0x2e, 0x33, 0x38, 0x20, 0x43, 0x20, 0x31,
+	0x37, 0x30, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x30, 0x36, 0x30, 0x2e, 0x31, 0x37, 0x20, 0x31, 0x37,
+	0x33, 0x31, 0x2e, 0x30, 0x37, 0x20, 0x31, 0x30, 0x38, 0x34, 0x2e, 0x34, 0x35, 0x20, 0x31, 0x37,
+	0x33, 0x32, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x31, 0x31, 0x38, 0x2e, 0x30, 0x31, 0x20, 0x43, 0x20,
+	0x31, 0x37, 0x33, 0x33, 0x2e, 0x35, 0x38, 0x20, 0x31, 0x31, 0x34, 0x30, 0x2e, 0x33, 0x20, 0x31,
+	0x37, 0x32, 0x35, 0x2e, 0x32, 0x31, 0x20, 0x31, 0x31, 0x37, 0x33, 0x2e, 0x33, 0x36, 0x20, 0x31,
+	0x37, 0x32, 0x30, 0x2e, 0x33, 0x33, 0x20, 0x31, 0x31, 0x39, 0x35, 0x2e, 0x33, 0x33, 0x20, 0x43,
+	0x20, 0x31, 0x36, 0x34, 0x39, 0x2e, 0x37, 0x39, 0x20, 0x31, 0x35, 0x31, 0x33, 0x2e, 0x31, 0x37,
+	0x20, 0x31, 0x33, 0x38, 0x39, 0x2e, 0x36, 0x33, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x30, 0x37,
+	0x20, 0x31, 0x30, 0x35, 0x35, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x37, 0x38, 0x39, 0x2e, 0x31, 0x35,
+	0x20, 0x43, 0x20, 0x38, 0x36, 0x36, 0x2e, 0x37, 0x38, 0x35, 0x20, 0x31, 0x37, 0x39, 0x37, 0x2e,
+	0x37, 0x37, 0x20, 0x36, 0x38, 0x32, 0x2e, 0x39, 0x36, 0x34, 0x20, 0x31, 0x37, 0x33, 0x30, 0x2e,
+	0x32, 0x33, 0x20, 0x35, 0x34, 0x35, 0x2e, 0x30, 0x35, 0x35, 0x20, 0x31, 0x36, 0x30, 0x31, 0x2e,
+	0x37, 0x37, 0x20, 0x43, 0x20, 0x35, 0x30, 0x35, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x31, 0x36, 0x33,
+	0x30, 0x2e, 0x39, 0x31, 0x20, 0x34, 0x36, 0x37, 0x2e, 0x36, 0x35, 0x35, 0x20, 0x31, 0x36, 0x36,
+	0x34, 0x2e, 0x38, 0x39, 0x20, 0x34, 0x32, 0x37, 0x2e, 0x37, 0x36, 0x35, 0x20, 0x31, 0x36, 0x39,
+	0x34, 0x2e, 0x33, 0x34, 0x20, 0x43, 0x20, 0x34, 0x30, 0x32, 0x2e, 0x37, 0x39, 0x34, 0x20, 0x31,
+	0x37, 0x31, 0x32, 0x2e, 0x37, 0x38, 0x20, 0x33, 0x39, 0x30, 0x2e, 0x31, 0x36, 0x38, 0x20, 0x31,
+	0x37, 0x33, 0x33, 0x2e, 0x39, 0x35, 0x20, 0x33, 0x35, 0x36, 0x2e, 0x31, 0x32, 0x39, 0x20, 0x31,
+	0x37, 0x33, 0x34, 0x2e, 0x32, 0x35, 0x20, 0x43, 0x20, 0x33, 0x33, 0x35, 0x2e, 0x34, 0x31, 0x35,
+	0x20, 0x31, 0x37, 0x33, 0x34, 0x2e, 0x34, 0x36, 0x20, 0x33, 0x31, 0x35, 0x2e, 0x34, 0x37, 0x32,
+	0x20, 0x31, 0x37, 0x32, 0x36, 0x2e, 0x34, 0x20, 0x33, 0x30, 0x30, 0x2e, 0x37, 0x31, 0x37, 0x20,
+	0x31, 0x37, 0x31, 0x31, 0x2e, 0x38, 0x36, 0x20, 0x43, 0x20, 0x32, 0x37, 0x34, 0x2e, 0x31, 0x33,
+	0x38, 0x20, 0x31, 0x36, 0x38, 0x35, 0x2e, 0x33, 0x31, 0x20, 0x32, 0x37, 0x36, 0x2e, 0x36, 0x38,
+	0x31, 0x20, 0x31, 0x36, 0x35, 0x37, 0x2e, 0x35, 0x38, 0x20, 0x32, 0x37, 0x36, 0x2e, 0x36, 0x39,
+	0x31, 0x20, 0x31, 0x36, 0x32, 0x32, 0x2e, 0x37, 0x35, 0x20, 0x4c, 0x20, 0x32, 0x37, 0x36, 0x2e,
+	0x37, 0x35, 0x39, 0x20, 0x31, 0x35, 0x36, 0x32, 0x2e, 0x31, 0x31, 0x20, 0x4c, 0x20, 0x32, 0x37,
+	0x36, 0x2e, 0x38, 0x36, 0x31, 0x20, 0x31, 0x33, 0x33, 0x37, 0x2e, 0x35, 0x20, 0x4c, 0x20, 0x32,
+	0x37, 0x36, 0x2e, 0x37, 0x39, 0x39, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e, 0x30, 0x39, 0x20, 0x43,
+	0x20, 0x32, 0x37, 0x36, 0x2e, 0x37, 0x38, 0x37, 0x20, 0x31, 0x31, 0x39, 0x32, 0x2e, 0x38, 0x31,
+	0x20, 0x32, 0x37, 0x36, 0x2e, 0x35, 0x35, 0x35, 0x20, 0x31, 0x31, 0x37, 0x31, 0x2e, 0x31, 0x35,
+	0x20, 0x32, 0x37, 0x36, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x31, 0x34, 0x39, 0x2e, 0x38, 0x39, 0x20,
+	0x43, 0x20, 0x32, 0x37, 0x37, 0x2e, 0x33, 0x35, 0x32, 0x20, 0x31, 0x31, 0x32, 0x38, 0x2e, 0x31,
+	0x38, 0x20, 0x32, 0x38, 0x38, 0x2e, 0x31, 0x36, 0x35, 0x20, 0x31, 0x31, 0x30, 0x35, 0x2e, 0x30,
+	0x34, 0x20, 0x33, 0x30, 0x34, 0x2e, 0x35, 0x20, 0x31, 0x30, 0x39, 0x30, 0x2e, 0x34, 0x34, 0x20,
+	0x43, 0x20, 0x33, 0x32, 0x33, 0x2e, 0x32, 0x31, 0x35, 0x20, 0x31, 0x30, 0x37, 0x34, 0x2e, 0x30,
+	0x34, 0x20, 0x33, 0x34, 0x37, 0x2e, 0x37, 0x31, 0x35, 0x20, 0x31, 0x30, 0x36, 0x35, 0x2e, 0x38,
+	0x32, 0x20, 0x33, 0x37, 0x32, 0x2e, 0x35, 0x33, 0x32, 0x20, 0x31, 0x30, 0x36, 0x37, 0x2e, 0x36,
+	0x31, 0x20, 0x43, 0x20, 0x33, 0x39, 0x33, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x31, 0x30, 0x36, 0x38,
+	0x2e, 0x39, 0x34, 0x20, 0x34, 0x33, 0x38, 0x2e, 0x37, 0x34, 0x31, 0x20, 0x31, 0x30, 0x38, 0x33,
+	0x2e, 0x33, 0x32, 0x20, 0x34, 0x36, 0x30, 0x2e, 0x39, 0x36, 0x37, 0x20, 0x31, 0x30, 0x38, 0x39,
+	0x2e, 0x36, 0x36, 0x20, 0x4c, 0x20, 0x35, 0x38, 0x33, 0x2e, 0x36, 0x33, 0x36, 0x20, 0x31, 0x31,
+	0x32, 0x34, 0x2e, 0x31, 0x31, 0x20, 0x4c, 0x20, 0x37, 0x38, 0x32, 0x2e, 0x32, 0x31, 0x32, 0x20,
+	0x31, 0x31, 0x37, 0x39, 0x2e, 0x33, 0x35, 0x20, 0x4c, 0x20, 0x38, 0x34, 0x38, 0x2e, 0x38, 0x39,
+	0x33, 0x20, 0x31, 0x31, 0x39, 0x37, 0x2e, 0x39, 0x38, 0x20, 0x43, 0x20, 0x38, 0x37, 0x30, 0x2e,
+	0x35, 0x38, 0x39, 0x20, 0x31, 0x32, 0x30, 0x34, 0x2e, 0x30, 0x37, 0x20, 0x38, 0x39, 0x36, 0x2e,
+	0x36, 0x33, 0x39, 0x20, 0x31, 0x32, 0x30, 0x38, 0x2e, 0x30, 0x32, 0x20, 0x39, 0x31, 0x31, 0x2e,
+	0x37, 0x32, 0x36, 0x20, 0x31, 0x32, 0x32, 0x35, 0x2e, 0x35, 0x34, 0x20, 0x43, 0x20, 0x39, 0x32,
+	0x33, 0x2e, 0x31, 0x37, 0x36, 0x20, 0x31, 0x32, 0x33, 0x38, 0x2e, 0x36, 0x31, 0x20, 0x39, 0x32,
+	0x38, 0x2e, 0x37, 0x33, 0x35, 0x20, 0x31, 0x32, 0x35, 0x35, 0x2e, 0x38, 0x32, 0x20, 0x39, 0x32,
+	0x37, 0x2e, 0x30, 0x39, 0x35, 0x20, 0x31, 0x32, 0x37, 0x33, 0x2e, 0x31, 0x32, 0x20, 0x43, 0x20,
+	0x39, 0x32, 0x35, 0x2e, 0x35, 0x31, 0x20, 0x31, 0x32, 0x39, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x39,
+	0x31, 0x36, 0x2e, 0x39, 0x35, 0x33, 0x20, 0x31, 0x33, 0x30, 0x34, 0x2e, 0x34, 0x20, 0x39, 0x30,
+	0x33, 0x2e, 0x34, 0x33, 0x32, 0x20, 0x31, 0x33, 0x31, 0x35, 0x2e, 0x30, 0x33, 0x20, 0x43, 0x20,
+	0x38, 0x34, 0x39, 0x2e, 0x36, 0x35, 0x38, 0x20, 0x31, 0x33, 0x35, 0x37, 0x2e, 0x33, 0x32, 0x20,
+	0x37, 0x39, 0x35, 0x2e, 0x38, 0x39, 0x31, 0x20, 0x31, 0x33, 0x39, 0x39, 0x2e, 0x39, 0x39, 0x20,
+	0x37, 0x34, 0x32, 0x2e, 0x39, 0x37, 0x36, 0x20, 0x31, 0x34, 0x34, 0x33, 0x2e, 0x33, 0x33, 0x20,
+	0x43, 0x20, 0x37, 0x36, 0x36, 0x2e, 0x31, 0x39, 0x39, 0x20, 0x31, 0x34, 0x35, 0x37, 0x2e, 0x30,
+	0x34, 0x20, 0x37, 0x38, 0x35, 0x2e, 0x31, 0x36, 0x20, 0x31, 0x34, 0x36, 0x38, 0x2e, 0x33, 0x39,
+	0x20, 0x38, 0x30, 0x39, 0x2e, 0x38, 0x33, 0x33, 0x20, 0x31, 0x34, 0x37, 0x39, 0x2e, 0x39, 0x31,
+	0x20, 0x43, 0x20, 0x39, 0x30, 0x38, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x31, 0x35, 0x32, 0x35, 0x2e,
+	0x39, 0x39, 0x20, 0x31, 0x30, 0x31, 0x38, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x35, 0x34, 0x33, 0x2e,
+	0x31, 0x20, 0x31, 0x31, 0x32, 0x36, 0x2e, 0x34, 0x38, 0x20, 0x31, 0x35, 0x32, 0x39, 0x2e, 0x32,
+	0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x31, 0x32, 0x2e, 0x34, 0x35, 0x20, 0x31, 0x35, 0x30, 0x35,
+	0x2e, 0x39, 0x35, 0x20, 0x31, 0x34, 0x38, 0x30, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x33, 0x37, 0x37,
+	0x2e, 0x37, 0x37, 0x20, 0x31, 0x35, 0x36, 0x38, 0x2e, 0x37, 0x20, 0x31, 0x32, 0x31, 0x34, 0x2e,
+	0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35, 0x38, 0x30, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x31, 0x39,
+	0x31, 0x2e, 0x37, 0x37, 0x20, 0x31, 0x35, 0x39, 0x32, 0x2e, 0x31, 0x33, 0x20, 0x31, 0x31, 0x36,
+	0x38, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x36, 0x30, 0x32, 0x2e, 0x32, 0x34, 0x20, 0x31, 0x31, 0x34,
+	0x34, 0x2e, 0x32, 0x36, 0x20, 0x43, 0x20, 0x31, 0x36, 0x31, 0x37, 0x2e, 0x39, 0x32, 0x20, 0x31,
+	0x31, 0x30, 0x36, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x36, 0x31, 0x38, 0x2e, 0x38, 0x37, 0x20, 0x31,
+	0x30, 0x36, 0x34, 0x2e, 0x39, 0x34, 0x20, 0x31, 0x36, 0x36, 0x39, 0x2e, 0x36, 0x37, 0x20, 0x31,
+	0x30, 0x36, 0x30, 0x2e, 0x33, 0x38, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x30, 0x29, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x72, 0x67, 0x62, 0x28, 0x36, 0x33, 0x2c, 0x31, 0x36, 0x39, 0x2c, 0x36, 0x33,
+	0x29, 0x22, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x31, 0x38, 0x2e, 0x39, 0x20, 0x32,
+	0x36, 0x32, 0x2e, 0x34, 0x36, 0x35, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x36, 0x2e, 0x38, 0x39,
+	0x20, 0x32, 0x36, 0x31, 0x2e, 0x32, 0x30, 0x34, 0x20, 0x31, 0x32, 0x39, 0x32, 0x2e, 0x32, 0x36,
+	0x20, 0x33, 0x30, 0x30, 0x2e, 0x30, 0x39, 0x39, 0x20, 0x31, 0x34, 0x30, 0x38, 0x2e, 0x35, 0x34,
+	0x20, 0x33, 0x37, 0x34, 0x2e, 0x34, 0x31, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x34, 0x32, 0x2e,
+	0x30, 0x32, 0x20, 0x33, 0x39, 0x35, 0x2e, 0x36, 0x33, 0x39, 0x20, 0x31, 0x34, 0x37, 0x37, 0x2e,
+	0x33, 0x31, 0x20, 0x34, 0x32, 0x31, 0x2e, 0x37, 0x39, 0x32, 0x20, 0x31, 0x35, 0x30, 0x35, 0x2e,
+	0x38, 0x39, 0x20, 0x34, 0x34, 0x39, 0x2e, 0x32, 0x39, 0x32, 0x20, 0x43, 0x20, 0x31, 0x35, 0x34,
+	0x30, 0x2e, 0x30, 0x31, 0x20, 0x34, 0x32, 0x32, 0x2e, 0x33, 0x38, 0x20, 0x31, 0x35, 0x37, 0x34,
+	0x2e, 0x31, 0x32, 0x20, 0x33, 0x39, 0x35, 0x2e, 0x35, 0x32, 0x36, 0x20, 0x31, 0x36, 0x30, 0x38,
+	0x2e, 0x33, 0x32, 0x20, 0x33, 0x36, 0x38, 0x2e, 0x36, 0x32, 0x20, 0x43, 0x20, 0x31, 0x36, 0x32,
+	0x35, 0x2e, 0x37, 0x20, 0x33, 0x35, 0x34, 0x2e, 0x39, 0x34, 0x35, 0x20, 0x31, 0x36, 0x34, 0x35,
+	0x2e, 0x37, 0x31, 0x20, 0x33, 0x33, 0x36, 0x2e, 0x33, 0x35, 0x37, 0x20, 0x31, 0x36, 0x36, 0x34,
+	0x2e, 0x32, 0x39, 0x20, 0x33, 0x32, 0x34, 0x2e, 0x38, 0x30, 0x35, 0x20, 0x43, 0x20, 0x31, 0x36,
+	0x37, 0x32, 0x2e, 0x34, 0x32, 0x20, 0x33, 0x31, 0x39, 0x2e, 0x37, 0x35, 0x34, 0x20, 0x31, 0x36,
+	0x39, 0x31, 0x2e, 0x31, 0x38, 0x20, 0x33, 0x31, 0x36, 0x2e, 0x39, 0x33, 0x31, 0x20, 0x31, 0x37,
+	0x30, 0x31, 0x2e, 0x31, 0x20, 0x33, 0x31, 0x37, 0x2e, 0x34, 0x33, 0x34, 0x20, 0x43, 0x20, 0x31,
+	0x37, 0x32, 0x31, 0x2e, 0x34, 0x38, 0x20, 0x33, 0x31, 0x38, 0x2e, 0x36, 0x31, 0x34, 0x20, 0x31,
+	0x37, 0x34, 0x30, 0x2e, 0x35, 0x33, 0x20, 0x33, 0x32, 0x37, 0x2e, 0x39, 0x36, 0x39, 0x20, 0x31,
+	0x37, 0x35, 0x33, 0x2e, 0x39, 0x32, 0x20, 0x33, 0x34, 0x33, 0x2e, 0x33, 0x38, 0x20, 0x43, 0x20,
+	0x31, 0x37, 0x38, 0x30, 0x2e, 0x30, 0x37, 0x20, 0x33, 0x37, 0x32, 0x2e, 0x39, 0x30, 0x33, 0x20,
+	0x31, 0x37, 0x37, 0x33, 0x2e, 0x34, 0x35, 0x20, 0x34, 0x30, 0x35, 0x2e, 0x39, 0x36, 0x36, 0x20,
+	0x31, 0x37, 0x37, 0x34, 0x2e, 0x34, 0x31, 0x20, 0x34, 0x34, 0x32, 0x2e, 0x33, 0x32, 0x37, 0x20,
+	0x43, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x35, 0x35, 0x20, 0x34, 0x34, 0x37, 0x2e, 0x39, 0x34,
+	0x36, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x34, 0x33, 0x20, 0x34, 0x35, 0x33, 0x2e, 0x36, 0x32,
+	0x32, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x34, 0x34, 0x20, 0x34, 0x35, 0x39, 0x2e, 0x32, 0x34,
+	0x38, 0x20, 0x4c, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x34, 0x35, 0x20, 0x36, 0x30, 0x38, 0x2e,
+	0x39, 0x39, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x33, 0x33, 0x20, 0x38, 0x31,
+	0x38, 0x2e, 0x33, 0x35, 0x33, 0x20, 0x43, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x31, 0x34, 0x20,
+	0x38, 0x34, 0x36, 0x2e, 0x35, 0x31, 0x32, 0x20, 0x31, 0x37, 0x37, 0x34, 0x2e, 0x38, 0x32, 0x20,
+	0x38, 0x37, 0x35, 0x2e, 0x33, 0x36, 0x34, 0x20, 0x31, 0x37, 0x37, 0x33, 0x2e, 0x38, 0x36, 0x20,
+	0x39, 0x30, 0x33, 0x2e, 0x33, 0x38, 0x38, 0x20, 0x43, 0x20, 0x31, 0x37, 0x37, 0x32, 0x2e, 0x36,
+	0x31, 0x20, 0x39, 0x32, 0x34, 0x2e, 0x39, 0x32, 0x35, 0x20, 0x31, 0x37, 0x36, 0x30, 0x2e, 0x31,
+	0x33, 0x20, 0x39, 0x34, 0x38, 0x2e, 0x32, 0x37, 0x34, 0x20, 0x31, 0x37, 0x34, 0x34, 0x2e, 0x31,
+	0x20, 0x39, 0x36, 0x32, 0x2e, 0x32, 0x34, 0x34, 0x20, 0x43, 0x20, 0x31, 0x37, 0x30, 0x31, 0x2e,
+	0x30, 0x32, 0x20, 0x39, 0x39, 0x39, 0x2e, 0x37, 0x37, 0x34, 0x20, 0x31, 0x36, 0x34, 0x32, 0x2e,
+	0x30, 0x31, 0x20, 0x39, 0x37, 0x33, 0x2e, 0x35, 0x36, 0x31, 0x20, 0x31, 0x35, 0x39, 0x34, 0x2e,
+	0x36, 0x38, 0x20, 0x39, 0x36, 0x30, 0x2e, 0x37, 0x39, 0x35, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x38,
+	0x39, 0x2e, 0x35, 0x33, 0x20, 0x39, 0x30, 0x33, 0x2e, 0x35, 0x31, 0x39, 0x20, 0x4c, 0x20, 0x31,
+	0x32, 0x32, 0x39, 0x2e, 0x30, 0x39, 0x20, 0x38, 0x35, 0x39, 0x2e, 0x36, 0x36, 0x32, 0x20, 0x43,
+	0x20, 0x31, 0x32, 0x30, 0x31, 0x2e, 0x34, 0x38, 0x20, 0x38, 0x35, 0x31, 0x2e, 0x39, 0x35, 0x33,
+	0x20, 0x31, 0x31, 0x35, 0x36, 0x2e, 0x33, 0x39, 0x20, 0x38, 0x34, 0x35, 0x2e, 0x33, 0x37, 0x34,
+	0x20, 0x31, 0x31, 0x33, 0x37, 0x2e, 0x35, 0x38, 0x20, 0x38, 0x32, 0x33, 0x2e, 0x33, 0x34, 0x36,
+	0x20, 0x43, 0x20, 0x31, 0x31, 0x31, 0x39, 0x2e, 0x38, 0x38, 0x20, 0x38, 0x30, 0x34, 0x2e, 0x30,
+	0x31, 0x33, 0x20, 0x31, 0x31, 0x31, 0x37, 0x2e, 0x33, 0x36, 0x20, 0x37, 0x36, 0x33, 0x2e, 0x35,
+	0x34, 0x31, 0x20, 0x31, 0x31, 0x33, 0x36, 0x2e, 0x30, 0x37, 0x20, 0x37, 0x34, 0x34, 0x2e, 0x30,
+	0x32, 0x38, 0x20, 0x43, 0x20, 0x31, 0x31, 0x35, 0x33, 0x2e, 0x31, 0x37, 0x20, 0x37, 0x32, 0x36,
+	0x2e, 0x31, 0x39, 0x36, 0x20, 0x31, 0x31, 0x38, 0x30, 0x2e, 0x38, 0x20, 0x37, 0x30, 0x36, 0x2e,
+	0x39, 0x36, 0x36, 0x20, 0x31, 0x32, 0x30, 0x30, 0x2e, 0x38, 0x35, 0x20, 0x36, 0x39, 0x31, 0x2e,
+	0x33, 0x31, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x33, 0x37, 0x2e, 0x31, 0x35, 0x20, 0x36, 0x36,
+	0x33, 0x2e, 0x31, 0x34, 0x34, 0x20, 0x31, 0x32, 0x37, 0x33, 0x2e, 0x30, 0x34, 0x20, 0x36, 0x33,
+	0x34, 0x2e, 0x34, 0x33, 0x37, 0x20, 0x31, 0x33, 0x30, 0x38, 0x2e, 0x34, 0x39, 0x20, 0x36, 0x30,
+	0x35, 0x2e, 0x32, 0x30, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x39, 0x38, 0x2e, 0x38, 0x20, 0x35,
+	0x39, 0x39, 0x2e, 0x39, 0x31, 0x20, 0x43, 0x20, 0x31, 0x32, 0x36, 0x32, 0x2e, 0x34, 0x32, 0x20,
+	0x35, 0x37, 0x39, 0x2e, 0x30, 0x32, 0x20, 0x31, 0x32, 0x32, 0x39, 0x2e, 0x32, 0x35, 0x20, 0x35,
+	0x36, 0x32, 0x2e, 0x37, 0x34, 0x36, 0x20, 0x31, 0x31, 0x38, 0x39, 0x2e, 0x36, 0x34, 0x20, 0x35,
+	0x34, 0x38, 0x2e, 0x36, 0x38, 0x33, 0x20, 0x43, 0x20, 0x39, 0x30, 0x37, 0x2e, 0x33, 0x36, 0x38,
+	0x20, 0x34, 0x34, 0x38, 0x2e, 0x34, 0x35, 0x20, 0x36, 0x31, 0x38, 0x2e, 0x30, 0x35, 0x34, 0x20,
+	0x35, 0x38, 0x31, 0x2e, 0x34, 0x39, 0x39, 0x20, 0x34, 0x37, 0x39, 0x2e, 0x34, 0x35, 0x37, 0x20,
+	0x38, 0x33, 0x39, 0x2e, 0x39, 0x32, 0x32, 0x20, 0x43, 0x20, 0x34, 0x36, 0x39, 0x2e, 0x31, 0x38,
+	0x31, 0x20, 0x38, 0x35, 0x39, 0x2e, 0x30, 0x37, 0x32, 0x20, 0x34, 0x35, 0x39, 0x2e, 0x39, 0x37,
+	0x36, 0x20, 0x38, 0x37, 0x38, 0x2e, 0x37, 0x37, 0x37, 0x20, 0x34, 0x35, 0x31, 0x2e, 0x38, 0x38,
+	0x33, 0x20, 0x38, 0x39, 0x38, 0x2e, 0x39, 0x34, 0x36, 0x20, 0x43, 0x20, 0x34, 0x33, 0x36, 0x2e,
+	0x33, 0x38, 0x20, 0x39, 0x33, 0x36, 0x2e, 0x36, 0x38, 0x39, 0x20, 0x34, 0x33, 0x31, 0x2e, 0x32,
+	0x38, 0x34, 0x20, 0x39, 0x38, 0x35, 0x2e, 0x33, 0x35, 0x39, 0x20, 0x33, 0x38, 0x32, 0x2e, 0x37,
+	0x32, 0x36, 0x20, 0x39, 0x38, 0x39, 0x2e, 0x30, 0x36, 0x34, 0x20, 0x43, 0x20, 0x33, 0x35, 0x30,
+	0x2e, 0x31, 0x35, 0x37, 0x20, 0x39, 0x39, 0x31, 0x2e, 0x35, 0x34, 0x38, 0x20, 0x33, 0x31, 0x37,
+	0x2e, 0x38, 0x34, 0x37, 0x20, 0x39, 0x36, 0x32, 0x2e, 0x36, 0x37, 0x35, 0x20, 0x33, 0x31, 0x38,
+	0x2e, 0x31, 0x35, 0x33, 0x20, 0x39, 0x33, 0x30, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x43, 0x20, 0x33,
+	0x31, 0x38, 0x2e, 0x33, 0x39, 0x32, 0x20, 0x39, 0x30, 0x35, 0x2e, 0x32, 0x34, 0x32, 0x20, 0x33,
+	0x32, 0x36, 0x2e, 0x32, 0x35, 0x37, 0x20, 0x38, 0x37, 0x30, 0x2e, 0x37, 0x36, 0x39, 0x20, 0x33,
+	0x33, 0x32, 0x2e, 0x31, 0x34, 0x35, 0x20, 0x38, 0x34, 0x36, 0x2e, 0x31, 0x39, 0x32, 0x20, 0x43,
+	0x20, 0x33, 0x36, 0x34, 0x2e, 0x39, 0x37, 0x37, 0x20, 0x37, 0x30, 0x37, 0x2e, 0x36, 0x32, 0x39,
+	0x20, 0x34, 0x33, 0x33, 0x2e, 0x37, 0x32, 0x34, 0x20, 0x35, 0x38, 0x30, 0x2e, 0x31, 0x35, 0x37,
+	0x20, 0x35, 0x33, 0x31, 0x2e, 0x34, 0x36, 0x38, 0x20, 0x34, 0x37, 0x36, 0x2e, 0x36, 0x30, 0x31,
+	0x20, 0x43, 0x20, 0x36, 0x35, 0x38, 0x2e, 0x36, 0x37, 0x33, 0x20, 0x33, 0x34, 0x32, 0x2e, 0x37,
+	0x37, 0x32, 0x20, 0x38, 0x33, 0x34, 0x2e, 0x32, 0x38, 0x36, 0x20, 0x32, 0x36, 0x35, 0x2e, 0x36,
+	0x32, 0x31, 0x20, 0x31, 0x30, 0x31, 0x38, 0x2e, 0x39, 0x20, 0x32, 0x36, 0x32, 0x2e, 0x34, 0x36,
+	0x35, 0x20, 0x7a, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e
+};
+
 static const unsigned char icon_sort_dn_png = {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
 	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x98, 0xa0,
@@ -264,198 +12530,4767 @@
 	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
 };
 
-static const unsigned char icon_tray_disconnected_png = {
+static const unsigned char icon_status_conn_base_png = {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-	0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 0x08, 0x03, 0x00, 0x00, 0x00, 0xf3, 0x6a, 0x9c,
-	0x09, 0x00, 0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4d, 0x00, 0x00, 0x7a, 0x26, 0x00, 0x00, 0x80,
-	0x84, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x00, 0x80, 0xe8, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xea,
-	0x60, 0x00, 0x00, 0x3a, 0x98, 0x00, 0x00, 0x17, 0x70, 0x9c, 0xba, 0x51, 0x3c, 0x00, 0x00, 0x01,
-	0x41, 0x50, 0x4c, 0x54, 0x45, 0xff, 0x00, 0x00, 0x3b, 0x3b, 0x3b, 0x3e, 0x3e, 0x3e, 0x3d, 0x3d,
-	0x3d, 0x4c, 0x4c, 0x4c, 0x3f, 0x3f, 0x3f, 0x3c, 0x3c, 0x3c, 0x71, 0x71, 0x71, 0x5d, 0x5d, 0x5d,
-	0x46, 0x46, 0x46, 0x78, 0x78, 0x78, 0xc5, 0xc5, 0xc5, 0xb5, 0xb5, 0xb5, 0xa6, 0xa6, 0xa6, 0x8f,
-	0x8f, 0x8f, 0x77, 0x77, 0x77, 0x56, 0x56, 0x56, 0x6e, 0x6e, 0x6e, 0x50, 0x50, 0x50, 0x7e, 0x7e,
-	0x7e, 0xb6, 0xb6, 0xb6, 0xbc, 0xbc, 0xbc, 0xac, 0xac, 0xac, 0x94, 0x94, 0x94, 0x63, 0x63, 0x63,
-	0x4f, 0x4f, 0x4f, 0x48, 0x48, 0x48, 0x40, 0x40, 0x40, 0x59, 0x59, 0x59, 0x7d, 0x7d, 0x7d, 0x7f,
-	0x7f, 0x7f, 0xa2, 0xa2, 0xa2, 0xa9, 0xa9, 0xa9, 0x81, 0x81, 0x81, 0x69, 0x69, 0x69, 0x5c, 0x5c,
-	0x5c, 0x44, 0x44, 0x44, 0x6f, 0x6f, 0x6f, 0x89, 0x89, 0x89, 0x95, 0x95, 0x95, 0x73, 0x73, 0x73,
-	0x49, 0x49, 0x49, 0x87, 0x87, 0x87, 0x84, 0x84, 0x84, 0x6b, 0x6b, 0x6b, 0x83, 0x83, 0x83, 0x57,
-	0x57, 0x57, 0x88, 0x88, 0x88, 0xa8, 0xa8, 0xa8, 0x53, 0x53, 0x53, 0x41, 0x41, 0x41, 0x4b, 0x4b,
-	0x4b, 0x92, 0x92, 0x92, 0x85, 0x85, 0x85, 0xd8, 0xd8, 0xd8, 0xf4, 0xf4, 0xf4, 0x70, 0x70, 0x70,
-	0x36, 0x36, 0x36, 0x4d, 0x4d, 0x4d, 0x9a, 0x9a, 0x9a, 0x9f, 0x9f, 0x9f, 0xd1, 0xd1, 0xd1, 0x55,
-	0x55, 0x55, 0x97, 0x97, 0x97, 0xaa, 0xaa, 0xaa, 0xc3, 0xc3, 0xc3, 0xbb, 0xbb, 0xbb, 0xab, 0xab,
-	0xab, 0xb7, 0xb7, 0xb7, 0xb9, 0xb9, 0xb9, 0x9c, 0x9c, 0x9c, 0x8a, 0x8a, 0x8a, 0x99, 0x99, 0x99,
-	0xa7, 0xa7, 0xa7, 0xb4, 0xb4, 0xb4, 0xaf, 0xaf, 0xaf, 0xc8, 0xc8, 0xc8, 0x93, 0x93, 0x93, 0x80,
-	0x80, 0x80, 0x96, 0x96, 0x96, 0x9e, 0x9e, 0x9e, 0xbe, 0xbe, 0xbe, 0x52, 0x52, 0x52, 0x98, 0x98,
-	0x98, 0xad, 0xad, 0xad, 0xa1, 0xa1, 0xa1, 0x8d, 0x8d, 0x8d, 0x7b, 0x7b, 0x7b, 0x76, 0x76, 0x76,
-	0xa4, 0xa4, 0xa4, 0xbf, 0xbf, 0xbf, 0xcd, 0xcd, 0xcd, 0x37, 0x37, 0x37, 0x4a, 0x4a, 0x4a, 0x67,
-	0x67, 0x67, 0x86, 0x86, 0x86, 0x6c, 0x6c, 0x6c, 0xd2, 0xd2, 0xd2, 0xd9, 0xd9, 0xd9, 0xd5, 0xd5,
-	0xd5, 0x43, 0x43, 0x43, 0x4e, 0x4e, 0x4e, 0x64, 0x64, 0x64, 0x54, 0x54, 0x54, 0x42, 0x42, 0x42,
-	0x68, 0x68, 0x68, 0xff, 0xff, 0xff, 0xb1, 0xd6, 0x35, 0x83, 0x00, 0x00, 0x00, 0x01, 0x62, 0x4b,
-	0x47, 0x44, 0x6a, 0x25, 0x62, 0x95, 0x0e, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07,
-	0xea, 0x05, 0x07, 0x15, 0x1c, 0x21, 0x9e, 0xcf, 0x09, 0x15, 0x00, 0x00, 0x00, 0x25, 0x74, 0x45,
-	0x58, 0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x00, 0x32, 0x30,
-	0x32, 0x36, 0x2d, 0x30, 0x35, 0x2d, 0x30, 0x37, 0x54, 0x32, 0x31, 0x3a, 0x32, 0x35, 0x3a, 0x34,
-	0x30, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0xbb, 0xe9, 0x28, 0xea, 0x00, 0x00, 0x00, 0x25, 0x74,
-	0x45, 0x58, 0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x00, 0x32,
-	0x30, 0x32, 0x36, 0x2d, 0x30, 0x35, 0x2d, 0x30, 0x37, 0x54, 0x32, 0x31, 0x3a, 0x32, 0x35, 0x3a,
-	0x34, 0x30, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0xca, 0xb4, 0x90, 0x56, 0x00, 0x00, 0x00, 0x28,
-	0x74, 0x45, 0x58, 0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
-	0x6d, 0x70, 0x00, 0x32, 0x30, 0x32, 0x36, 0x2d, 0x30, 0x35, 0x2d, 0x30, 0x37, 0x54, 0x32, 0x31,
-	0x3a, 0x32, 0x38, 0x3a, 0x33, 0x33, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0x53, 0x72, 0x29, 0xbd,
-	0x00, 0x00, 0x00, 0xf0, 0x49, 0x44, 0x41, 0x54, 0x18, 0xd3, 0x63, 0x60, 0xa0, 0x1a, 0x60, 0x24,
-	0x45, 0x98, 0x91, 0x09, 0xab, 0x28, 0x33, 0x0b, 0x03, 0x03, 0x2b, 0x2b, 0x13, 0x13, 0x33, 0x1b,
-	0x23, 0x92, 0x3e, 0x66, 0x76, 0x0e, 0x4e, 0x2e, 0x6e, 0x1e, 0x5e, 0x3e, 0x7e, 0x01, 0x24, 0x51,
-	0x56, 0x16, 0x41, 0x21, 0x61, 0x11, 0x51, 0x31, 0x71, 0x09, 0x49, 0x29, 0x24, 0x33, 0xa4, 0x65,
-	0x64, 0xe5, 0xe4, 0x15, 0x14, 0x95, 0x94, 0xa5, 0x50, 0x8c, 0x56, 0x51, 0x55, 0x53, 0xe7, 0xd3,
-	0x10, 0x62, 0x44, 0x75, 0x0e, 0xa3, 0xa6, 0x96, 0xb6, 0x8e, 0x8e, 0x04, 0x0b, 0x9a, 0x33, 0x18,
-	0x35, 0xb5, 0x75, 0xf5, 0xf4, 0x0d, 0xf8, 0x0d, 0x8d, 0x50, 0x25, 0x8c, 0x4d, 0x4c, 0xe5, 0xcd,
-	0xcc, 0x19, 0x2c, 0x54, 0x55, 0x2c, 0x2d, 0x2d, 0x11, 0xaa, 0xad, 0xac, 0x6d, 0x0c, 0x6c, 0x45,
-	0xec, 0x4c, 0xed, 0x1d, 0x1c, 0x9d, 0xd4, 0x10, 0xe2, 0x42, 0xce, 0xdc, 0x2e, 0xae, 0x6e, 0x82,
-	0xee, 0x1e, 0xf6, 0x8a, 0x9e, 0x5e, 0x70, 0x61, 0x66, 0x43, 0x6f, 0x1f, 0x27, 0x05, 0x5f, 0x3f,
-	0x45, 0x0f, 0x7f, 0xc1, 0x80, 0x40, 0x98, 0x30, 0x23, 0x73, 0x50, 0xb0, 0x43, 0x48, 0x68, 0x58,
-	0x78, 0x44, 0x24, 0x77, 0x54, 0xb4, 0x4b, 0x0c, 0x3c, 0x98, 0x62, 0xe3, 0xdc, 0xf9, 0xe2, 0xf9,
-	0x13, 0x34, 0x42, 0x12, 0x93, 0x92, 0x9d, 0x61, 0x8e, 0x67, 0x4c, 0x49, 0x65, 0x63, 0x66, 0x62,
-	0x66, 0xd6, 0xe4, 0x0f, 0x35, 0xf0, 0x8c, 0x80, 0x7b, 0x89, 0x91, 0x93, 0x43, 0x29, 0x2d, 0x3d,
-	0x85, 0x91, 0x21, 0x23, 0xd6, 0xd8, 0x18, 0xe1, 0x7d, 0x46, 0xa9, 0x38, 0x45, 0xbf, 0x4c, 0x63,
-	0xb4, 0x88, 0x00, 0x00, 0xc6, 0xf5, 0x20, 0x48, 0x22, 0xbb, 0x5a, 0x78, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x02, 0xfa, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x5d, 0x93, 0x5d, 0x68, 0x53,
+	0x77, 0x18, 0xc6, 0x7f, 0xe7, 0x24, 0x39, 0x69, 0x6c, 0xe2, 0x4e, 0x53, 0xad, 0xd4, 0x59, 0xb5,
+	0xd5, 0xb8, 0xe2, 0xb4, 0x92, 0x5a, 0x85, 0x22, 0x99, 0x1f, 0xc5, 0x6e, 0x2b, 0x4c, 0x51, 0xc1,
+	0xf9, 0x05, 0x0a, 0x9d, 0xa0, 0x57, 0x8a, 0x77, 0x7a, 0x61, 0x57, 0x61, 0x0a, 0x7a, 0xe7, 0x95,
+	0x32, 0x4a, 0x61, 0x30, 0xd6, 0x4d, 0x41, 0x89, 0x82, 0xb5, 0x50, 0xa5, 0xc6, 0x6e, 0x74, 0x55,
+	0xab, 0xa1, 0xb4, 0xe9, 0x16, 0x67, 0xad, 0x61, 0x6b, 0xfa, 0xe5, 0x49, 0x66, 0x72, 0x92, 0xd3,
+	0x93, 0xf3, 0xdf, 0x45, 0xec, 0x87, 0x7b, 0x6f, 0x5e, 0x78, 0xe1, 0x79, 0x78, 0x78, 0x9f, 0xe7,
+	0x91, 0x34, 0x4d, 0xe3, 0xff, 0xa3, 0x36, 0x34, 0x09, 0x72, 0x02, 0x4c, 0x1d, 0x14, 0x67, 0xfe,
+	0x28, 0x1c, 0x68, 0xed, 0x4d, 0x92, 0xba, 0xf5, 0xa4, 0x20, 0xde, 0x8f, 0x16, 0x09, 0x49, 0x00,
+	0xd2, 0x7c, 0x02, 0xf5, 0x8b, 0x66, 0x81, 0x6c, 0xa1, 0xf8, 0x6a, 0x50, 0x6a, 0x76, 0x72, 0x7e,
+	0x63, 0x82, 0x60, 0xe6, 0x07, 0x5e, 0x3c, 0x3b, 0x80, 0xde, 0xdb, 0x85, 0x19, 0xe9, 0xa6, 0x31,
+	0x1a, 0x04, 0xa0, 0xc5, 0x53, 0x81, 0x16, 0x09, 0x49, 0xf2, 0x2c, 0xb8, 0xbe, 0x59, 0x54, 0x7d,
+	0x9e, 0xe4, 0xc4, 0x0d, 0x37, 0xc6, 0xa6, 0x0a, 0xd2, 0xab, 0x96, 0xd0, 0xe5, 0x1c, 0xa0, 0x7f,
+	0x7c, 0x19, 0xa9, 0x8e, 0x9b, 0x98, 0xf1, 0x29, 0x36, 0x7c, 0x35, 0x45, 0xcb, 0xea, 0x5d, 0xd4,
+	0x3a, 0x1c, 0x9c, 0x4b, 0x0d, 0xa3, 0x56, 0x06, 0x84, 0x3c, 0x03, 0x0e, 0x7c, 0x96, 0xe5, 0xf1,
+	0xb7, 0xe7, 0xb8, 0x39, 0x59, 0x03, 0x9e, 0x52, 0xdc, 0xc5, 0x49, 0x3c, 0xae, 0x20, 0x5a, 0x97,
+	0x0f, 0x80, 0x7f, 0xb7, 0xe6, 0x78, 0x71, 0xc7, 0xcb, 0xf1, 0x68, 0x90, 0xf5, 0x8a, 0x42, 0x99,
+	0xcd, 0x06, 0xc0, 0xac, 0x82, 0xaf, 0x4f, 0xac, 0x65, 0xed, 0xf3, 0x5f, 0x98, 0x08, 0xaf, 0x82,
+	0xea, 0xe5, 0x24, 0xbd, 0x12, 0x6d, 0xed, 0x07, 0x59, 0xb4, 0xd4, 0xc2, 0x32, 0x6c, 0xb8, 0x8e,
+	0x1e, 0x25, 0xe1, 0x77, 0x72, 0x49, 0x55, 0x59, 0xed, 0x76, 0x53, 0x34, 0x43, 0xa0, 0x36, 0x34,
+	0x09, 0xaa, 0x56, 0xd0, 0x66, 0x25, 0x88, 0x3d, 0xdf, 0xc3, 0x42, 0xdf, 0x0a, 0x0e, 0x95, 0xda,
+	0x20, 0xb3, 0x00, 0xb9, 0x72, 0x27, 0x1f, 0xf9, 0xf2, 0x0a, 0x6c, 0xe5, 0xe5, 0x38, 0xea, 0xea,
+	0x70, 0x04, 0x02, 0x68, 0xba, 0xce, 0x01, 0xc7, 0x52, 0x90, 0xec, 0xc8, 0x64, 0xd3, 0x50, 0x92,
+	0xe5, 0xf1, 0xed, 0x35, 0xa0, 0x8f, 0x62, 0x48, 0x69, 0xde, 0x8d, 0x0c, 0x53, 0xa0, 0x8f, 0x93,
+	0xda, 0xfe, 0x27, 0xc7, 0x36, 0xb7, 0x02, 0x90, 0xbd, 0x7b, 0x97, 0xe9, 0xce, 0x4e, 0xde, 0x3d,
+	0x7a, 0x44, 0x28, 0x9b, 0xcd, 0xcb, 0x76, 0xba, 0x90, 0xd8, 0x76, 0x41, 0xcc, 0xb7, 0x50, 0x56,
+	0x72, 0x58, 0x86, 0x0d, 0x22, 0x37, 0x38, 0xd5, 0xf7, 0x09, 0x77, 0xe2, 0xbf, 0xf3, 0xd7, 0xe9,
+	0x6f, 0xd0, 0x8a, 0xfa, 0x48, 0xf5, 0xf4, 0x10, 0x33, 0x4d, 0x12, 0x42, 0xd0, 0x95, 0xc9, 0xf0,
+	0x5d, 0xe1, 0x4a, 0xec, 0x00, 0x5a, 0x51, 0x1f, 0xce, 0x23, 0x47, 0x28, 0xd8, 0xbb, 0x17, 0x73,
+	0x68, 0x88, 0xd4, 0xd9, 0xb3, 0xa8, 0xc0, 0xf7, 0xa1, 0x2f, 0xb1, 0x06, 0xad, 0xbc, 0x4b, 0xbf,
+	0x45, 0x81, 0xe2, 0xb9, 0xaf, 0x15, 0xe6, 0x97, 0x9d, 0xb7, 0x83, 0xa8, 0xf8, 0xd1, 0x5a, 0x5b,
+	0xb1, 0x62, 0x31, 0x8c, 0x7b, 0xf7, 0x48, 0x87, 0xc3, 0x40, 0x31, 0xe9, 0x37, 0x3b, 0x58, 0x64,
+	0xaf, 0x46, 0xd9, 0x32, 0x4a, 0x72, 0x49, 0x19, 0x4c, 0x03, 0xd9, 0x14, 0xa4, 0xa6, 0xc0, 0x4c,
+	0xc0, 0xc8, 0x03, 0xec, 0x08, 0x3b, 0x00, 0xb9, 0x81, 0x01, 0x84, 0x69, 0x92, 0x0e, 0x87, 0x89,
+	0x99, 0x26, 0xc8, 0x70, 0xb9, 0xd6, 0xa0, 0xd1, 0x6f, 0x70, 0xec, 0xd7, 0x2b, 0x0c, 0x7d, 0x7c,
+	0x98, 0xa9, 0x51, 0x3f, 0x13, 0x51, 0x0b, 0xdc, 0x7f, 0xc0, 0x68, 0x0f, 0xd8, 0x55, 0xec, 0x78,
+	0x7d, 0x04, 0xfb, 0xaf, 0x32, 0xe9, 0x70, 0xf0, 0xcf, 0xd3, 0xa7, 0x74, 0x64, 0x32, 0xac, 0x57,
+	0x14, 0x90, 0xa1, 0xa4, 0xe0, 0x3a, 0x5b, 0x42, 0xdd, 0x98, 0xba, 0xce, 0xba, 0xaa, 0x0b, 0x4c,
+	0x7a, 0x3e, 0xa5, 0x3b, 0x7e, 0x06, 0x91, 0x5a, 0x88, 0x18, 0x0b, 0xa3, 0x3d, 0xbb, 0x95, 0x4f,
+	0x62, 0x7b, 0x26, 0xc3, 0x58, 0x2e, 0xc7, 0xfd, 0xf7, 0x8f, 0x09, 0x1b, 0x06, 0x00, 0x3f, 0xbe,
+	0xec, 0x00, 0x3d, 0x81, 0x57, 0x52, 0x78, 0x3d, 0x5c, 0xca, 0x9b, 0xa1, 0x12, 0xa4, 0x9c, 0x8e,
+	0x94, 0xec, 0x07, 0x53, 0x99, 0x0b, 0x92, 0x0c, 0x44, 0x0c, 0x83, 0x8b, 0x85, 0x2b, 0xc1, 0x7f,
+	0x3c, 0xbf, 0x01, 0x6d, 0xbc, 0x1e, 0xd7, 0x84, 0x8a, 0x19, 0x5f, 0xcc, 0xdb, 0xc1, 0xcd, 0x8c,
+	0xbc, 0xda, 0x8d, 0x18, 0x79, 0x82, 0x35, 0xf8, 0x10, 0xad, 0xf7, 0xe7, 0xb9, 0x32, 0xa9, 0x95,
+	0x01, 0xb1, 0x3f, 0x11, 0xc5, 0x2b, 0xcb, 0x5c, 0xf3, 0x54, 0x40, 0xc5, 0x0e, 0x28, 0xab, 0x03,
+	0xc0, 0xa5, 0xbc, 0xc4, 0x92, 0x5c, 0x98, 0x7f, 0xbf, 0x22, 0xf7, 0x3a, 0x9c, 0x27, 0xee, 0xfd,
+	0x49, 0x9a, 0xb1, 0x7d, 0xb6, 0x8d, 0x6a, 0x65, 0x40, 0x00, 0x68, 0x91, 0x90, 0xa4, 0x6e, 0xdc,
+	0x27, 0x50, 0x2c, 0x10, 0xca, 0xfb, 0x70, 0xc8, 0x30, 0xfd, 0x21, 0x70, 0x66, 0xfe, 0x03, 0x23,
+	0x99, 0x46, 0xd0, 0xc0, 0x8c, 0xf4, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+	0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_conn_base_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65,
+	0x61, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x33, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x39, 0x61, 0x63, 0x62, 0x65, 0x65, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x34, 0x34, 0x38, 0x35, 0x63, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x31, 0x38, 0x35, 0x31, 0x38, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x72, 0x72, 0x5f, 0x62, 0x61,
+	0x73, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22,
+	0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x64, 0x34, 0x64, 0x34, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70,
+	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x32, 0x36, 0x32, 0x36, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x38, 0x31, 0x36, 0x31, 0x36, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x38,
+	0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x38, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x37, 0x2e, 0x33, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x73, 0x65, 0x61, 0x29,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x32, 0x33, 0x35, 0x62, 0x39,
+	0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x39, 0x2e, 0x34, 0x38, 0x33, 0x20, 0x34, 0x2e, 0x31, 0x33, 0x33,
+	0x20, 0x4c, 0x20, 0x39, 0x2e, 0x34, 0x33, 0x32, 0x20, 0x34, 0x2e, 0x34, 0x37, 0x39, 0x20, 0x4c,
+	0x20, 0x39, 0x2e, 0x37, 0x31, 0x31, 0x20, 0x34, 0x2e, 0x34, 0x32, 0x31, 0x20, 0x4c, 0x20, 0x39,
+	0x2e, 0x39, 0x31, 0x35, 0x20, 0x34, 0x2e, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x37, 0x33,
+	0x37, 0x20, 0x34, 0x2e, 0x30, 0x34, 0x37, 0x20, 0x43, 0x20, 0x39, 0x2e, 0x36, 0x37, 0x37, 0x20,
+	0x33, 0x2e, 0x38, 0x38, 0x38, 0x20, 0x39, 0x2e, 0x36, 0x30, 0x38, 0x20, 0x33, 0x2e, 0x37, 0x34,
+	0x20, 0x39, 0x2e, 0x35, 0x33, 0x33, 0x20, 0x33, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x4c, 0x20, 0x39,
+	0x2e, 0x33, 0x38, 0x31, 0x20, 0x33, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x33,
+	0x38, 0x31, 0x20, 0x33, 0x2e, 0x37, 0x35, 0x39, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x34, 0x38, 0x33,
+	0x20, 0x33, 0x2e, 0x38, 0x37, 0x35, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x34, 0x38, 0x33, 0x20, 0x34,
+	0x2e, 0x31, 0x33, 0x33, 0x20, 0x4d, 0x20, 0x35, 0x2e, 0x37, 0x32, 0x20, 0x39, 0x2e, 0x36, 0x30,
+	0x31, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x35, 0x31, 0x37, 0x20, 0x39, 0x2e, 0x31, 0x39, 0x38, 0x20,
+	0x4c, 0x20, 0x35, 0x2e, 0x31, 0x33, 0x35, 0x20, 0x39, 0x2e, 0x31, 0x31, 0x32, 0x20, 0x4c, 0x20,
+	0x34, 0x2e, 0x39, 0x33, 0x32, 0x20, 0x38, 0x2e, 0x35, 0x36, 0x35, 0x20, 0x4c, 0x20, 0x34, 0x2e,
+	0x34, 0x32, 0x34, 0x20, 0x38, 0x2e, 0x36, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x39, 0x39,
+	0x32, 0x20, 0x38, 0x2e, 0x33, 0x30, 0x36, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x35, 0x33, 0x34, 0x20,
+	0x38, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x35, 0x33, 0x34, 0x20, 0x38, 0x2e,
+	0x37, 0x37, 0x32, 0x20, 0x43, 0x20, 0x33, 0x2e, 0x33, 0x39, 0x35, 0x20, 0x38, 0x2e, 0x37, 0x33,
+	0x32, 0x20, 0x33, 0x2e, 0x32, 0x32, 0x35, 0x20, 0x38, 0x2e, 0x37, 0x32, 0x37, 0x20, 0x33, 0x2e,
+	0x31, 0x30, 0x32, 0x20, 0x38, 0x2e, 0x36, 0x35, 0x31, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x30, 0x20,
+	0x38, 0x2e, 0x33, 0x36, 0x34, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x30, 0x20, 0x38, 0x2e, 0x30, 0x34,
+	0x37, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x36, 0x39, 0x35, 0x20, 0x38, 0x2e, 0x30, 0x37, 0x36, 0x20,
+	0x43, 0x20, 0x32, 0x2e, 0x37, 0x32, 0x20, 0x37, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x32, 0x2e, 0x37,
+	0x34, 0x36, 0x20, 0x37, 0x2e, 0x36, 0x37, 0x33, 0x20, 0x32, 0x2e, 0x37, 0x37, 0x31, 0x20, 0x37,
+	0x2e, 0x34, 0x37, 0x31, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x35, 0x39, 0x33, 0x20, 0x37, 0x2e, 0x34,
+	0x37, 0x31, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x34, 0x31, 0x35, 0x20, 0x37, 0x2e, 0x37, 0x30, 0x32,
+	0x20, 0x4c, 0x20, 0x32, 0x2e, 0x32, 0x33, 0x37, 0x20, 0x37, 0x2e, 0x37, 0x38, 0x38, 0x20, 0x4c,
+	0x20, 0x31, 0x2e, 0x39, 0x38, 0x33, 0x20, 0x37, 0x2e, 0x36, 0x34, 0x34, 0x20, 0x4c, 0x20, 0x31,
+	0x2e, 0x39, 0x35, 0x38, 0x20, 0x37, 0x2e, 0x33, 0x32, 0x38, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x30,
+	0x30, 0x38, 0x20, 0x36, 0x2e, 0x39, 0x38, 0x32, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x33, 0x39, 0x20,
+	0x36, 0x2e, 0x36, 0x39, 0x35, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x36, 0x39, 0x35, 0x20, 0x36, 0x2e,
+	0x36, 0x39, 0x35, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x37, 0x34, 0x36, 0x20, 0x36, 0x2e, 0x35, 0x32,
+	0x32, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x31, 0x32, 0x37, 0x20, 0x36, 0x2e, 0x36, 0x30, 0x38, 0x20,
+	0x4c, 0x20, 0x33, 0x2e, 0x34, 0x30, 0x37, 0x20, 0x36, 0x2e, 0x39, 0x35, 0x34, 0x20, 0x4c, 0x20,
+	0x33, 0x2e, 0x34, 0x35, 0x38, 0x20, 0x36, 0x2e, 0x33, 0x37, 0x38, 0x20, 0x4c, 0x20, 0x33, 0x2e,
+	0x39, 0x34, 0x31, 0x20, 0x35, 0x2e, 0x39, 0x37, 0x35, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x31, 0x31,
+	0x39, 0x20, 0x35, 0x2e, 0x35, 0x34, 0x34, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x34, 0x37, 0x34, 0x20,
+	0x35, 0x2e, 0x34, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x36, 0x37, 0x38, 0x20, 0x35, 0x2e, 0x31, 0x31,
+	0x32, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x31, 0x33, 0x35, 0x20, 0x35, 0x2e, 0x30, 0x32, 0x35, 0x20,
+	0x4c, 0x20, 0x35, 0x2e, 0x33, 0x36, 0x34, 0x20, 0x34, 0x2e, 0x36, 0x38, 0x20, 0x4c, 0x20, 0x34,
+	0x2e, 0x36, 0x37, 0x38, 0x20, 0x34, 0x2e, 0x36, 0x38, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x31, 0x31,
+	0x20, 0x34, 0x2e, 0x34, 0x37, 0x39, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x34, 0x31, 0x35, 0x20, 0x34,
+	0x2e, 0x34, 0x37, 0x39, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x38, 0x34, 0x37, 0x20, 0x34, 0x2e, 0x33,
+	0x33, 0x35, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x38, 0x39, 0x38, 0x20, 0x34, 0x2e, 0x31, 0x36, 0x33,
+	0x20, 0x4c, 0x20, 0x35, 0x2e, 0x37, 0x34, 0x35, 0x20, 0x34, 0x2e, 0x30, 0x31, 0x39, 0x20, 0x4c,
+	0x20, 0x35, 0x2e, 0x35, 0x36, 0x38, 0x20, 0x33, 0x2e, 0x39, 0x36, 0x31, 0x20, 0x4c, 0x20, 0x35,
+	0x2e, 0x36, 0x31, 0x38, 0x20, 0x33, 0x2e, 0x37, 0x38, 0x38, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x34,
+	0x39, 0x31, 0x20, 0x33, 0x2e, 0x35, 0x33, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x31, 0x38, 0x36, 0x20,
+	0x33, 0x2e, 0x36, 0x34, 0x34, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x32, 0x33, 0x37, 0x20, 0x33, 0x2e,
+	0x34, 0x31, 0x34, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x38, 0x38, 0x31, 0x20, 0x33, 0x2e, 0x32, 0x31,
+	0x33, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x36, 0x30, 0x32, 0x20, 0x33, 0x2e, 0x37, 0x30, 0x32, 0x20,
+	0x4c, 0x20, 0x34, 0x2e, 0x36, 0x32, 0x37, 0x20, 0x33, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x4c, 0x20,
+	0x34, 0x2e, 0x33, 0x34, 0x37, 0x20, 0x33, 0x2e, 0x39, 0x39, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x31,
+	0x36, 0x39, 0x20, 0x34, 0x2e, 0x33, 0x36, 0x34, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x30, 0x39, 0x33,
+	0x20, 0x34, 0x2e, 0x30, 0x31, 0x39, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x36, 0x31, 0x20, 0x33, 0x2e,
+	0x38, 0x31, 0x37, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x35, 0x33, 0x34, 0x20, 0x33, 0x2e, 0x35, 0x35,
+	0x38, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x31, 0x36, 0x39, 0x20, 0x33, 0x2e, 0x31, 0x38, 0x34, 0x20,
+	0x4c, 0x20, 0x34, 0x2e, 0x34, 0x34, 0x39, 0x20, 0x32, 0x2e, 0x39, 0x32, 0x35, 0x20, 0x4c, 0x20,
+	0x34, 0x2e, 0x34, 0x37, 0x34, 0x20, 0x32, 0x2e, 0x36, 0x30, 0x39, 0x20, 0x4c, 0x20, 0x34, 0x2e,
+	0x33, 0x32, 0x32, 0x20, 0x32, 0x2e, 0x35, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x31, 0x31,
+	0x39, 0x20, 0x32, 0x2e, 0x34, 0x39, 0x33, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x39, 0x39, 0x32, 0x20,
+	0x32, 0x2e, 0x38, 0x31, 0x20, 0x43, 0x20, 0x33, 0x2e, 0x39, 0x39, 0x32, 0x20, 0x32, 0x2e, 0x38,
+	0x31, 0x20, 0x33, 0x2e, 0x37, 0x37, 0x39, 0x20, 0x32, 0x2e, 0x38, 0x35, 0x32, 0x20, 0x33, 0x2e,
+	0x37, 0x32, 0x34, 0x20, 0x32, 0x2e, 0x38, 0x36, 0x35, 0x20, 0x43, 0x20, 0x33, 0x2e, 0x30, 0x32,
+	0x36, 0x20, 0x33, 0x2e, 0x35, 0x30, 0x38, 0x20, 0x31, 0x2e, 0x36, 0x31, 0x36, 0x20, 0x34, 0x2e,
+	0x38, 0x39, 0x37, 0x20, 0x31, 0x2e, 0x32, 0x38, 0x38, 0x20, 0x37, 0x2e, 0x35, 0x31, 0x39, 0x20,
+	0x43, 0x20, 0x31, 0x2e, 0x33, 0x30, 0x31, 0x20, 0x37, 0x2e, 0x35, 0x37, 0x39, 0x20, 0x31, 0x2e,
+	0x35, 0x32, 0x36, 0x20, 0x37, 0x2e, 0x39, 0x33, 0x32, 0x20, 0x31, 0x2e, 0x35, 0x32, 0x36, 0x20,
+	0x37, 0x2e, 0x39, 0x33, 0x32, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x30, 0x35, 0x39, 0x20, 0x38, 0x2e,
+	0x32, 0x34, 0x38, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x35, 0x39, 0x33, 0x20, 0x38, 0x2e, 0x33, 0x39,
+	0x32, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x38, 0x32, 0x32, 0x20, 0x38, 0x2e, 0x36, 0x38, 0x20, 0x4c,
+	0x20, 0x33, 0x2e, 0x31, 0x37, 0x38, 0x20, 0x38, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x4c, 0x20, 0x33,
+	0x2e, 0x33, 0x38, 0x31, 0x20, 0x38, 0x2e, 0x39, 0x31, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x35, 0x33,
+	0x34, 0x20, 0x38, 0x2e, 0x39, 0x37, 0x39, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x35, 0x33, 0x34, 0x20,
+	0x39, 0x2e, 0x30, 0x32, 0x35, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x33, 0x33, 0x20, 0x39, 0x2e, 0x35,
+	0x37, 0x32, 0x20, 0x4c, 0x20, 0x33, 0x2e, 0x31, 0x37, 0x38, 0x20, 0x39, 0x2e, 0x38, 0x30, 0x32,
+	0x20, 0x4c, 0x20, 0x33, 0x2e, 0x32, 0x32, 0x39, 0x20, 0x39, 0x2e, 0x39, 0x31, 0x38, 0x20, 0x4c,
+	0x20, 0x33, 0x2e, 0x31, 0x30, 0x32, 0x20, 0x31, 0x30, 0x2e, 0x33, 0x34, 0x39, 0x20, 0x4c, 0x20,
+	0x33, 0x2e, 0x35, 0x35, 0x39, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x38, 0x33, 0x20, 0x4c, 0x20, 0x34,
+	0x2e, 0x30, 0x31, 0x37, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x38, 0x36, 0x20, 0x4c, 0x20, 0x34, 0x2e,
+	0x32, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x38, 0x37, 0x34, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x31, 0x39,
+	0x35, 0x20, 0x31, 0x32, 0x2e, 0x34, 0x37, 0x38, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x33, 0x34, 0x37,
+	0x20, 0x31, 0x32, 0x2e, 0x38, 0x32, 0x33, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x31, 0x39, 0x35, 0x20,
+	0x31, 0x33, 0x2e, 0x34, 0x38, 0x35, 0x20, 0x43, 0x20, 0x34, 0x2e, 0x31, 0x39, 0x35, 0x20, 0x31,
+	0x33, 0x2e, 0x34, 0x38, 0x35, 0x20, 0x34, 0x2e, 0x31, 0x38, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x34,
+	0x38, 0x31, 0x20, 0x34, 0x2e, 0x32, 0x30, 0x32, 0x20, 0x31, 0x33, 0x2e, 0x35, 0x34, 0x37, 0x20,
+	0x43, 0x20, 0x34, 0x2e, 0x32, 0x32, 0x32, 0x20, 0x31, 0x33, 0x2e, 0x36, 0x31, 0x34, 0x20, 0x35,
+	0x2e, 0x30, 0x31, 0x37, 0x20, 0x31, 0x34, 0x2e, 0x30, 0x35, 0x35, 0x20, 0x35, 0x2e, 0x30, 0x36,
+	0x37, 0x20, 0x31, 0x34, 0x2e, 0x30, 0x31, 0x37, 0x20, 0x43, 0x20, 0x35, 0x2e, 0x31, 0x31, 0x38,
+	0x20, 0x31, 0x33, 0x2e, 0x39, 0x37, 0x39, 0x20, 0x35, 0x2e, 0x31, 0x36, 0x31, 0x20, 0x31, 0x33,
+	0x2e, 0x39, 0x34, 0x36, 0x20, 0x35, 0x2e, 0x31, 0x36, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x34,
+	0x36, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x31, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x30, 0x32, 0x20,
+	0x4c, 0x20, 0x35, 0x2e, 0x33, 0x31, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x36, 0x30, 0x31, 0x20, 0x4c,
+	0x20, 0x35, 0x2e, 0x33, 0x39, 0x20, 0x31, 0x33, 0x2e, 0x33, 0x39, 0x39, 0x20, 0x4c, 0x20, 0x35,
+	0x2e, 0x37, 0x32, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x38, 0x34, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x39,
+	0x37, 0x34, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x35, 0x31, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x38, 0x39,
+	0x38, 0x20, 0x31, 0x32, 0x2e, 0x34, 0x37, 0x38, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x30, 0x37, 0x36,
+	0x20, 0x31, 0x32, 0x2e, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x34, 0x35, 0x37, 0x20, 0x31,
+	0x32, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x36, 0x36, 0x31, 0x20, 0x31, 0x31,
+	0x2e, 0x36, 0x37, 0x32, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x36, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x30,
+	0x39, 0x37, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x39, 0x31, 0x35, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x36,
+	0x36, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x39, 0x36, 0x36, 0x20, 0x31, 0x30, 0x2e, 0x32, 0x33, 0x34,
+	0x20, 0x43, 0x20, 0x36, 0x2e, 0x35, 0x34, 0x38, 0x20, 0x31, 0x30, 0x2e, 0x30, 0x32, 0x37, 0x20,
+	0x36, 0x2e, 0x31, 0x33, 0x34, 0x20, 0x39, 0x2e, 0x38, 0x31, 0x34, 0x20, 0x35, 0x2e, 0x37, 0x32,
+	0x20, 0x39, 0x2e, 0x36, 0x30, 0x31, 0x20, 0x4d, 0x20, 0x35, 0x2e, 0x31, 0x36, 0x31, 0x20, 0x33,
+	0x2e, 0x30, 0x36, 0x39, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x34, 0x31, 0x35, 0x20, 0x33, 0x2e, 0x32,
+	0x34, 0x31, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x36, 0x31, 0x39, 0x20, 0x33, 0x2e, 0x32, 0x34, 0x31,
+	0x20, 0x4c, 0x20, 0x35, 0x2e, 0x36, 0x31, 0x39, 0x20, 0x33, 0x2e, 0x30, 0x34, 0x20, 0x4c, 0x20,
+	0x35, 0x2e, 0x33, 0x36, 0x34, 0x20, 0x32, 0x2e, 0x39, 0x32, 0x35, 0x20, 0x4c, 0x20, 0x35, 0x2e,
+	0x31, 0x36, 0x31, 0x20, 0x33, 0x2e, 0x30, 0x36, 0x39, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x23, 0x36, 0x33, 0x62, 0x35, 0x36, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x30, 0x39, 0x20,
+	0x36, 0x2e, 0x39, 0x37, 0x20, 0x43, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x37, 0x2e,
+	0x30, 0x36, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x36, 0x2e, 0x39, 0x37, 0x20,
+	0x31, 0x34, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x36, 0x2e, 0x39, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x34,
+	0x2e, 0x35, 0x31, 0x38, 0x20, 0x37, 0x2e, 0x31, 0x38, 0x36, 0x20, 0x43, 0x20, 0x31, 0x34, 0x2e,
+	0x34, 0x30, 0x31, 0x20, 0x37, 0x2e, 0x30, 0x34, 0x38, 0x20, 0x31, 0x34, 0x2e, 0x32, 0x37, 0x20,
+	0x36, 0x2e, 0x39, 0x33, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x36, 0x2e, 0x38,
+	0x31, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x34, 0x35, 0x20, 0x36, 0x2e, 0x38, 0x35,
+	0x34, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x35, 0x37, 0x38, 0x20, 0x36, 0x2e, 0x35, 0x35, 0x32,
+	0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x35, 0x37, 0x38, 0x20, 0x36, 0x2e, 0x39, 0x32, 0x36, 0x20,
+	0x4c, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x30, 0x36, 0x20, 0x37, 0x2e, 0x30, 0x39, 0x39, 0x20, 0x4c,
+	0x20, 0x31, 0x33, 0x2e, 0x39, 0x35, 0x39, 0x20, 0x37, 0x2e, 0x32, 0x37, 0x32, 0x20, 0x4c, 0x20,
+	0x31, 0x34, 0x2e, 0x31, 0x36, 0x32, 0x20, 0x37, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x43, 0x20, 0x31,
+	0x34, 0x2e, 0x32, 0x31, 0x33, 0x20, 0x37, 0x2e, 0x31, 0x33, 0x38, 0x20, 0x31, 0x34, 0x2e, 0x32,
+	0x36, 0x34, 0x20, 0x37, 0x2e, 0x32, 0x33, 0x34, 0x20, 0x31, 0x34, 0x2e, 0x33, 0x31, 0x35, 0x20,
+	0x37, 0x2e, 0x33, 0x32, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x2e, 0x33, 0x31, 0x35, 0x20, 0x37,
+	0x2e, 0x36, 0x31, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x34, 0x2e, 0x30, 0x38, 0x36, 0x20, 0x37, 0x2e,
+	0x38, 0x37, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x36, 0x36, 0x36, 0x20, 0x38, 0x2e, 0x31,
+	0x36, 0x34, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x33, 0x34, 0x39, 0x20, 0x38, 0x2e, 0x34, 0x38,
+	0x31, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x34, 0x35, 0x20, 0x38, 0x2e, 0x32, 0x35, 0x20,
+	0x4c, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x34, 0x37, 0x20, 0x37, 0x2e, 0x39, 0x39, 0x31, 0x20, 0x4c,
+	0x20, 0x31, 0x33, 0x2e, 0x30, 0x34, 0x34, 0x20, 0x37, 0x2e, 0x37, 0x36, 0x31, 0x20, 0x4c, 0x20,
+	0x31, 0x32, 0x2e, 0x37, 0x20, 0x37, 0x2e, 0x30, 0x32, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e,
+	0x34, 0x30, 0x38, 0x20, 0x36, 0x2e, 0x36, 0x39, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x33,
+	0x33, 0x32, 0x20, 0x36, 0x2e, 0x37, 0x38, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x34, 0x34,
+	0x36, 0x20, 0x37, 0x2e, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x36, 0x32, 0x20, 0x37,
+	0x2e, 0x34, 0x34, 0x35, 0x20, 0x43, 0x20, 0x31, 0x32, 0x2e, 0x37, 0x38, 0x35, 0x20, 0x37, 0x2e,
+	0x38, 0x20, 0x31, 0x32, 0x2e, 0x39, 0x30, 0x37, 0x20, 0x38, 0x2e, 0x31, 0x34, 0x31, 0x20, 0x31,
+	0x33, 0x2e, 0x30, 0x36, 0x39, 0x20, 0x38, 0x2e, 0x34, 0x38, 0x31, 0x20, 0x43, 0x20, 0x31, 0x33,
+	0x2e, 0x33, 0x32, 0x20, 0x38, 0x2e, 0x34, 0x38, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x35, 0x35, 0x37,
+	0x20, 0x38, 0x2e, 0x34, 0x35, 0x34, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x30, 0x36, 0x20, 0x38, 0x2e,
+	0x34, 0x32, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x30, 0x36, 0x20, 0x38, 0x2e, 0x36,
+	0x32, 0x34, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x39, 0x2e, 0x33, 0x37,
+	0x32, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x32, 0x32, 0x20, 0x39, 0x2e, 0x36, 0x38, 0x39,
+	0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x39, 0x39, 0x33, 0x20, 0x31, 0x30, 0x2e, 0x31, 0x37, 0x38,
+	0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x39, 0x39, 0x33, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x38, 0x34,
+	0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x30, 0x36, 0x39, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x30, 0x31,
+	0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x39, 0x34, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x34, 0x34,
+	0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x36, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x36, 0x31, 0x37,
+	0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x33, 0x37, 0x20, 0x31, 0x31, 0x2e, 0x38, 0x36, 0x31, 0x20,
+	0x4c, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x31, 0x32, 0x20, 0x31, 0x32, 0x2e, 0x31, 0x33, 0x35, 0x20,
+	0x4c, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x38, 0x31, 0x20, 0x31, 0x32, 0x2e, 0x34, 0x32, 0x33, 0x20,
+	0x4c, 0x20, 0x31, 0x32, 0x2e, 0x33, 0x34, 0x35, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x30, 0x39, 0x20,
+	0x4c, 0x20, 0x31, 0x31, 0x2e, 0x38, 0x34, 0x39, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x37, 0x31, 0x20,
+	0x4c, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x31, 0x38, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x37, 0x31, 0x20,
+	0x4c, 0x20, 0x31, 0x31, 0x2e, 0x32, 0x33, 0x39, 0x20, 0x31, 0x33, 0x2e, 0x33, 0x34, 0x34, 0x20,
+	0x4c, 0x20, 0x31, 0x31, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x33, 0x2e, 0x33, 0x34, 0x34, 0x20, 0x4c,
+	0x20, 0x31, 0x31, 0x2e, 0x30, 0x36, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x31, 0x34, 0x20, 0x4c, 0x20,
+	0x31, 0x30, 0x2e, 0x39, 0x38, 0x35, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x35, 0x32, 0x20, 0x43, 0x20,
+	0x31, 0x30, 0x2e, 0x38, 0x38, 0x36, 0x20, 0x31, 0x32, 0x2e, 0x33, 0x36, 0x33, 0x20, 0x31, 0x30,
+	0x2e, 0x37, 0x38, 0x34, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x37, 0x37, 0x20, 0x31, 0x30, 0x2e, 0x36,
+	0x38, 0x20, 0x31, 0x31, 0x2e, 0x37, 0x39, 0x20, 0x43, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x38, 0x20,
+	0x31, 0x31, 0x2e, 0x35, 0x37, 0x38, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x39, 0x32, 0x20, 0x31, 0x31,
+	0x2e, 0x33, 0x36, 0x38, 0x20, 0x31, 0x30, 0x2e, 0x37, 0x30, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x31,
+	0x35, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x33, 0x32, 0x20, 0x31, 0x30, 0x2e, 0x38,
+	0x36, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x35, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x35,
+	0x32, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x36, 0x37, 0x20, 0x31, 0x30, 0x2e, 0x30,
+	0x34, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x32, 0x35, 0x20, 0x39, 0x2e, 0x37, 0x37,
+	0x35, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x35, 0x34, 0x36, 0x20, 0x39, 0x2e, 0x33, 0x38, 0x20,
+	0x4c, 0x20, 0x31, 0x30, 0x2e, 0x33, 0x34, 0x39, 0x20, 0x39, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x4c,
+	0x20, 0x31, 0x30, 0x2e, 0x30, 0x30, 0x36, 0x20, 0x39, 0x2e, 0x31, 0x35, 0x37, 0x20, 0x4c, 0x20,
+	0x39, 0x2e, 0x38, 0x39, 0x31, 0x20, 0x39, 0x2e, 0x30, 0x32, 0x37, 0x20, 0x4c, 0x20, 0x39, 0x2e,
+	0x35, 0x34, 0x38, 0x20, 0x39, 0x2e, 0x32, 0x34, 0x33, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x34, 0x30,
+	0x38, 0x20, 0x39, 0x2e, 0x30, 0x38, 0x35, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x30, 0x39, 0x31, 0x20,
+	0x39, 0x2e, 0x33, 0x35, 0x38, 0x20, 0x43, 0x20, 0x38, 0x2e, 0x38, 0x37, 0x35, 0x20, 0x39, 0x2e,
+	0x31, 0x31, 0x33, 0x20, 0x38, 0x2e, 0x36, 0x35, 0x38, 0x20, 0x38, 0x2e, 0x38, 0x36, 0x39, 0x20,
+	0x38, 0x2e, 0x34, 0x34, 0x32, 0x20, 0x38, 0x2e, 0x36, 0x32, 0x34, 0x20, 0x4c, 0x20, 0x38, 0x2e,
+	0x31, 0x38, 0x38, 0x20, 0x38, 0x2e, 0x30, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x34, 0x31, 0x37,
+	0x20, 0x37, 0x2e, 0x36, 0x37, 0x35, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x32, 0x39, 0x20, 0x37, 0x2e,
+	0x35, 0x33, 0x31, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x35, 0x36, 0x39, 0x20, 0x36, 0x2e, 0x38, 0x36,
+	0x39, 0x20, 0x43, 0x20, 0x38, 0x2e, 0x37, 0x39, 0x39, 0x20, 0x36, 0x2e, 0x35, 0x38, 0x33, 0x20,
+	0x39, 0x2e, 0x30, 0x33, 0x39, 0x20, 0x36, 0x2e, 0x33, 0x30, 0x39, 0x20, 0x39, 0x2e, 0x32, 0x38,
+	0x31, 0x20, 0x36, 0x2e, 0x30, 0x33, 0x34, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x37, 0x31, 0x33, 0x20,
+	0x35, 0x2e, 0x39, 0x31, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x31, 0x39, 0x36, 0x20, 0x35,
+	0x2e, 0x38, 0x36, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x35, 0x32, 0x37, 0x20, 0x35, 0x2e,
+	0x39, 0x34, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x39, 0x37, 0x20, 0x36, 0x2e, 0x34,
+	0x32, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x36, 0x33, 0x20, 0x36, 0x2e, 0x32, 0x33,
+	0x36, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x39, 0x31, 0x20, 0x36, 0x2e, 0x32, 0x30, 0x37,
+	0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e, 0x38, 0x32, 0x33, 0x20, 0x36, 0x2e, 0x33, 0x35, 0x31, 0x20,
+	0x4c, 0x20, 0x31, 0x32, 0x2e, 0x31, 0x35, 0x34, 0x20, 0x36, 0x2e, 0x33, 0x35, 0x31, 0x20, 0x4c,
+	0x20, 0x31, 0x32, 0x2e, 0x33, 0x38, 0x33, 0x20, 0x36, 0x2e, 0x31, 0x34, 0x39, 0x20, 0x4c, 0x20,
+	0x31, 0x32, 0x2e, 0x34, 0x38, 0x35, 0x20, 0x36, 0x2e, 0x30, 0x30, 0x36, 0x20, 0x4c, 0x20, 0x31,
+	0x32, 0x2e, 0x32, 0x35, 0x35, 0x20, 0x35, 0x2e, 0x38, 0x36, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x31,
+	0x2e, 0x38, 0x37, 0x34, 0x20, 0x35, 0x2e, 0x38, 0x33, 0x33, 0x20, 0x43, 0x20, 0x31, 0x31, 0x2e,
+	0x37, 0x36, 0x38, 0x20, 0x35, 0x2e, 0x36, 0x38, 0x36, 0x20, 0x31, 0x31, 0x2e, 0x36, 0x37, 0x20,
+	0x35, 0x2e, 0x35, 0x33, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x34, 0x34, 0x20, 0x35, 0x2e, 0x34,
+	0x30, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x35, 0x2e, 0x34, 0x35,
+	0x39, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x36, 0x36, 0x20, 0x35, 0x2e, 0x38, 0x33, 0x33,
+	0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x35, 0x2e, 0x35, 0x37, 0x34, 0x20,
+	0x4c, 0x20, 0x31, 0x31, 0x2e, 0x30, 0x38, 0x36, 0x20, 0x35, 0x2e, 0x32, 0x38, 0x36, 0x20, 0x4c,
+	0x20, 0x31, 0x30, 0x2e, 0x38, 0x33, 0x32, 0x20, 0x35, 0x2e, 0x30, 0x38, 0x35, 0x20, 0x4c, 0x20,
+	0x31, 0x30, 0x2e, 0x37, 0x33, 0x20, 0x35, 0x2e, 0x30, 0x38, 0x35, 0x20, 0x4c, 0x20, 0x31, 0x30,
+	0x2e, 0x39, 0x38, 0x35, 0x20, 0x35, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e,
+	0x38, 0x38, 0x33, 0x20, 0x35, 0x2e, 0x36, 0x33, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x36,
+	0x38, 0x20, 0x35, 0x2e, 0x36, 0x38, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x30, 0x37,
+	0x20, 0x35, 0x2e, 0x34, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x35, 0x37, 0x37, 0x20, 0x35,
+	0x2e, 0x33, 0x31, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x33, 0x37, 0x35, 0x20, 0x35, 0x2e,
+	0x30, 0x38, 0x35, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x39, 0x39, 0x33, 0x20, 0x35, 0x2e, 0x31, 0x37,
+	0x31, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x39, 0x34, 0x32, 0x20, 0x35, 0x2e, 0x32, 0x38, 0x36, 0x20,
+	0x4c, 0x20, 0x39, 0x2e, 0x37, 0x31, 0x33, 0x20, 0x35, 0x2e, 0x34, 0x33, 0x20, 0x4c, 0x20, 0x39,
+	0x2e, 0x35, 0x38, 0x36, 0x20, 0x35, 0x2e, 0x37, 0x34, 0x37, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x32,
+	0x36, 0x39, 0x20, 0x35, 0x2e, 0x39, 0x30, 0x35, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x31, 0x32, 0x39,
+	0x20, 0x35, 0x2e, 0x37, 0x34, 0x37, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x39, 0x37, 0x36, 0x20, 0x35,
+	0x2e, 0x37, 0x34, 0x37, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x39, 0x37, 0x36, 0x20, 0x35, 0x2e, 0x32,
+	0x32, 0x39, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x33, 0x30, 0x37, 0x20, 0x35, 0x2e, 0x30, 0x35, 0x36,
+	0x20, 0x4c, 0x20, 0x39, 0x2e, 0x35, 0x36, 0x31, 0x20, 0x35, 0x2e, 0x30, 0x35, 0x36, 0x20, 0x4c,
+	0x20, 0x39, 0x2e, 0x35, 0x31, 0x20, 0x34, 0x2e, 0x38, 0x35, 0x35, 0x20, 0x4c, 0x20, 0x39, 0x2e,
+	0x33, 0x30, 0x37, 0x20, 0x34, 0x2e, 0x36, 0x35, 0x33, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x36, 0x35,
+	0x20, 0x34, 0x2e, 0x35, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x38, 0x34, 0x20, 0x34, 0x2e,
+	0x33, 0x36, 0x36, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x39, 0x39, 0x33, 0x20, 0x34, 0x2e, 0x31, 0x30,
+	0x37, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x32, 0x37, 0x33, 0x20, 0x34, 0x2e, 0x31, 0x30, 0x37,
+	0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x31, 0x39, 0x36, 0x20, 0x33, 0x2e, 0x39, 0x30, 0x35, 0x20,
+	0x4c, 0x20, 0x31, 0x30, 0x2e, 0x33, 0x37, 0x35, 0x20, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x4c, 0x20,
+	0x31, 0x30, 0x2e, 0x33, 0x37, 0x35, 0x20, 0x34, 0x2e, 0x30, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x30,
+	0x2e, 0x37, 0x35, 0x36, 0x20, 0x34, 0x2e, 0x31, 0x30, 0x37, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e,
+	0x31, 0x33, 0x37, 0x20, 0x33, 0x2e, 0x37, 0x39, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x36,
+	0x32, 0x20, 0x33, 0x2e, 0x36, 0x34, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x39, 0x33,
+	0x20, 0x33, 0x2e, 0x34, 0x31, 0x36, 0x20, 0x43, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x37, 0x33, 0x20,
+	0x33, 0x2e, 0x34, 0x33, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x32, 0x35, 0x34, 0x20, 0x33, 0x2e, 0x34,
+	0x34, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x33, 0x2e, 0x34, 0x37, 0x34, 0x20,
+	0x4c, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x33, 0x2e, 0x32, 0x31, 0x35, 0x20, 0x4c,
+	0x20, 0x31, 0x31, 0x2e, 0x32, 0x36, 0x34, 0x20, 0x32, 0x2e, 0x39, 0x32, 0x37, 0x20, 0x4c, 0x20,
+	0x31, 0x31, 0x2e, 0x31, 0x33, 0x37, 0x20, 0x32, 0x2e, 0x39, 0x32, 0x37, 0x20, 0x4c, 0x20, 0x31,
+	0x30, 0x2e, 0x38, 0x35, 0x38, 0x20, 0x33, 0x2e, 0x31, 0x38, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x30,
+	0x2e, 0x37, 0x38, 0x31, 0x20, 0x33, 0x2e, 0x33, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x38,
+	0x35, 0x38, 0x20, 0x33, 0x2e, 0x35, 0x33, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x37, 0x33,
+	0x20, 0x33, 0x2e, 0x38, 0x37, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x35, 0x32, 0x37, 0x20,
+	0x33, 0x2e, 0x37, 0x36, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x33, 0x34, 0x39, 0x20, 0x33,
+	0x2e, 0x35, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x30, 0x36, 0x39, 0x20, 0x33, 0x2e, 0x37,
+	0x36, 0x31, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x39, 0x36, 0x38, 0x20, 0x33, 0x2e, 0x33, 0x30, 0x31,
+	0x20, 0x4c, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x35, 0x20, 0x32, 0x2e, 0x39, 0x38, 0x34, 0x20, 0x4c,
+	0x20, 0x31, 0x30, 0x2e, 0x34, 0x35, 0x20, 0x32, 0x2e, 0x38, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x31,
+	0x30, 0x2e, 0x37, 0x35, 0x36, 0x20, 0x32, 0x2e, 0x36, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e,
+	0x32, 0x33, 0x39, 0x20, 0x32, 0x2e, 0x34, 0x39, 0x35, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e, 0x35,
+	0x36, 0x39, 0x20, 0x32, 0x2e, 0x36, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x31, 0x37, 0x39,
+	0x20, 0x32, 0x2e, 0x37, 0x32, 0x35, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x32, 0x37, 0x20,
+	0x32, 0x2e, 0x38, 0x39, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x31, 0x2e, 0x36, 0x39, 0x36, 0x20, 0x32,
+	0x2e, 0x38, 0x39, 0x38, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x32, 0x37, 0x20, 0x33, 0x2e,
+	0x32, 0x34, 0x33, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x38, 0x31, 0x20, 0x32, 0x2e, 0x39,
+	0x35, 0x36, 0x20, 0x4c, 0x20, 0x31, 0x32, 0x2e, 0x33, 0x35, 0x38, 0x20, 0x32, 0x2e, 0x38, 0x32,
+	0x39, 0x20, 0x43, 0x20, 0x31, 0x32, 0x2e, 0x33, 0x35, 0x38, 0x20, 0x32, 0x2e, 0x38, 0x32, 0x39,
+	0x20, 0x31, 0x33, 0x2e, 0x33, 0x33, 0x33, 0x20, 0x33, 0x2e, 0x37, 0x30, 0x33, 0x20, 0x31, 0x33,
+	0x2e, 0x38, 0x39, 0x20, 0x34, 0x2e, 0x36, 0x35, 0x38, 0x20, 0x43, 0x20, 0x31, 0x34, 0x2e, 0x34,
+	0x34, 0x37, 0x20, 0x35, 0x2e, 0x36, 0x31, 0x34, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x30, 0x39, 0x20,
+	0x36, 0x2e, 0x37, 0x34, 0x31, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x30, 0x39, 0x20, 0x36, 0x2e, 0x39,
+	0x37, 0x20, 0x5a, 0x20, 0x4d, 0x20, 0x38, 0x2e, 0x34, 0x31, 0x33, 0x20, 0x32, 0x2e, 0x39, 0x35,
+	0x36, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x33, 0x38, 0x38, 0x20, 0x33, 0x2e, 0x31, 0x32, 0x38, 0x20,
+	0x4c, 0x20, 0x38, 0x2e, 0x35, 0x36, 0x36, 0x20, 0x33, 0x2e, 0x32, 0x34, 0x33, 0x20, 0x4c, 0x20,
+	0x38, 0x2e, 0x38, 0x37, 0x31, 0x20, 0x33, 0x2e, 0x30, 0x34, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x2e,
+	0x37, 0x31, 0x38, 0x20, 0x32, 0x2e, 0x38, 0x36, 0x39, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x35, 0x31,
+	0x35, 0x20, 0x32, 0x2e, 0x39, 0x38, 0x34, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x34, 0x31, 0x33, 0x20,
+	0x32, 0x2e, 0x39, 0x35, 0x36, 0x20, 0x4d, 0x20, 0x38, 0x2e, 0x36, 0x39, 0x33, 0x20, 0x31, 0x2e,
+	0x37, 0x37, 0x36, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x30, 0x33, 0x32, 0x20, 0x31, 0x2e, 0x35, 0x31,
+	0x37, 0x20, 0x4c, 0x20, 0x37, 0x2e, 0x32, 0x36, 0x39, 0x20, 0x31, 0x2e, 0x36, 0x30, 0x33, 0x20,
+	0x4c, 0x20, 0x36, 0x2e, 0x33, 0x32, 0x39, 0x20, 0x31, 0x2e, 0x38, 0x36, 0x32, 0x20, 0x4c, 0x20,
+	0x36, 0x2e, 0x31, 0x35, 0x31, 0x20, 0x32, 0x2e, 0x30, 0x33, 0x35, 0x20, 0x4c, 0x20, 0x36, 0x2e,
+	0x37, 0x33, 0x35, 0x20, 0x32, 0x2e, 0x34, 0x33, 0x38, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x37, 0x33,
+	0x35, 0x20, 0x32, 0x2e, 0x36, 0x36, 0x38, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x35, 0x30, 0x36, 0x20,
+	0x32, 0x2e, 0x38, 0x39, 0x38, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x38, 0x31, 0x32, 0x20, 0x33, 0x2e,
+	0x35, 0x30, 0x33, 0x20, 0x4c, 0x20, 0x37, 0x2e, 0x30, 0x31, 0x35, 0x20, 0x33, 0x2e, 0x33, 0x38,
+	0x37, 0x20, 0x4c, 0x20, 0x37, 0x2e, 0x32, 0x36, 0x39, 0x20, 0x32, 0x2e, 0x39, 0x38, 0x34, 0x20,
+	0x43, 0x20, 0x37, 0x2e, 0x36, 0x36, 0x32, 0x20, 0x32, 0x2e, 0x38, 0x36, 0x33, 0x20, 0x38, 0x2e,
+	0x30, 0x31, 0x34, 0x20, 0x32, 0x2e, 0x37, 0x32, 0x35, 0x20, 0x38, 0x2e, 0x33, 0x38, 0x38, 0x20,
+	0x32, 0x2e, 0x35, 0x35, 0x33, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x36, 0x39, 0x33, 0x20, 0x31, 0x2e,
+	0x37, 0x37, 0x36, 0x20, 0x4d, 0x20, 0x39, 0x2e, 0x33, 0x37, 0x39, 0x20, 0x34, 0x2e, 0x31, 0x39,
+	0x33, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x32, 0x37, 0x38, 0x20, 0x33, 0x2e, 0x39, 0x33, 0x34, 0x20,
+	0x4c, 0x20, 0x39, 0x2e, 0x30, 0x39, 0x39, 0x20, 0x33, 0x2e, 0x39, 0x39, 0x32, 0x20, 0x4c, 0x20,
+	0x39, 0x2e, 0x31, 0x35, 0x31, 0x20, 0x34, 0x2e, 0x33, 0x30, 0x38, 0x20, 0x4c, 0x20, 0x39, 0x2e,
+	0x33, 0x37, 0x39, 0x20, 0x34, 0x2e, 0x31, 0x39, 0x33, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x23, 0x36, 0x33, 0x62, 0x35, 0x36, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x34, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x32,
+	0x2e, 0x38, 0x33, 0x39, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x33, 0x37, 0x34, 0x20, 0x33, 0x2e, 0x31,
+	0x35, 0x35, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x36, 0x32, 0x38, 0x20, 0x33, 0x2e, 0x31, 0x35, 0x35,
+	0x20, 0x4c, 0x20, 0x34, 0x2e, 0x37, 0x35, 0x35, 0x20, 0x32, 0x2e, 0x38, 0x36, 0x37, 0x20, 0x43,
+	0x20, 0x34, 0x2e, 0x38, 0x36, 0x35, 0x20, 0x32, 0x2e, 0x37, 0x39, 0x20, 0x34, 0x2e, 0x39, 0x37,
+	0x34, 0x20, 0x32, 0x2e, 0x37, 0x31, 0x32, 0x20, 0x35, 0x2e, 0x30, 0x38, 0x36, 0x20, 0x32, 0x2e,
+	0x36, 0x33, 0x37, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x33, 0x34, 0x20, 0x32, 0x2e, 0x37, 0x32, 0x34,
+	0x20, 0x43, 0x20, 0x35, 0x2e, 0x35, 0x30, 0x39, 0x20, 0x32, 0x2e, 0x38, 0x33, 0x39, 0x20, 0x35,
+	0x2e, 0x36, 0x37, 0x39, 0x20, 0x32, 0x2e, 0x39, 0x35, 0x34, 0x20, 0x35, 0x2e, 0x38, 0x34, 0x38,
+	0x20, 0x33, 0x2e, 0x30, 0x36, 0x39, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x31, 0x30, 0x33, 0x20, 0x32,
+	0x2e, 0x38, 0x33, 0x39, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x38, 0x32, 0x33, 0x20, 0x32, 0x2e, 0x37,
+	0x32, 0x34, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x36, 0x39, 0x36, 0x20, 0x32, 0x2e, 0x34, 0x36, 0x35,
+	0x20, 0x4c, 0x20, 0x35, 0x2e, 0x32, 0x31, 0x33, 0x20, 0x32, 0x2e, 0x34, 0x30, 0x37, 0x20, 0x4c,
+	0x20, 0x35, 0x2e, 0x31, 0x38, 0x37, 0x20, 0x32, 0x2e, 0x32, 0x36, 0x33, 0x20, 0x4c, 0x20, 0x34,
+	0x2e, 0x39, 0x35, 0x38, 0x20, 0x32, 0x2e, 0x33, 0x32, 0x31, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x38,
+	0x35, 0x37, 0x20, 0x32, 0x2e, 0x35, 0x32, 0x32, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x37, 0x33, 0x20,
+	0x32, 0x2e, 0x32, 0x36, 0x33, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x36, 0x37, 0x39, 0x20, 0x32, 0x2e,
+	0x33, 0x37, 0x38, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x37, 0x30, 0x34, 0x20, 0x32, 0x2e, 0x36, 0x36,
+	0x36, 0x20, 0x4c, 0x20, 0x34, 0x2e, 0x35, 0x30, 0x31, 0x20, 0x32, 0x2e, 0x38, 0x33, 0x39, 0x20,
+	0x4d, 0x20, 0x35, 0x2e, 0x34, 0x31, 0x36, 0x20, 0x32, 0x2e, 0x31, 0x31, 0x39, 0x20, 0x4c, 0x20,
+	0x35, 0x2e, 0x35, 0x34, 0x33, 0x20, 0x32, 0x2e, 0x30, 0x30, 0x34, 0x20, 0x4c, 0x20, 0x35, 0x2e,
+	0x37, 0x39, 0x37, 0x20, 0x31, 0x2e, 0x39, 0x34, 0x37, 0x20, 0x43, 0x20, 0x35, 0x2e, 0x39, 0x37,
+	0x32, 0x20, 0x31, 0x2e, 0x38, 0x36, 0x32, 0x20, 0x36, 0x2e, 0x31, 0x34, 0x36, 0x20, 0x31, 0x2e,
+	0x38, 0x30, 0x35, 0x20, 0x36, 0x2e, 0x33, 0x33, 0x31, 0x20, 0x31, 0x2e, 0x37, 0x34, 0x35, 0x20,
+	0x4c, 0x20, 0x36, 0x2e, 0x32, 0x33, 0x20, 0x31, 0x2e, 0x35, 0x37, 0x33, 0x20, 0x4c, 0x20, 0x35,
+	0x2e, 0x39, 0x30, 0x32, 0x20, 0x31, 0x2e, 0x36, 0x32, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x37, 0x34,
+	0x36, 0x20, 0x31, 0x2e, 0x37, 0x37, 0x34, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x34, 0x39, 0x31, 0x20,
+	0x31, 0x2e, 0x38, 0x31, 0x31, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x32, 0x36, 0x34, 0x20, 0x31, 0x2e,
+	0x39, 0x31, 0x38, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x31, 0x35, 0x33, 0x20, 0x31, 0x2e, 0x39, 0x37,
+	0x31, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x30, 0x38, 0x36, 0x20, 0x32, 0x2e, 0x30, 0x36, 0x32, 0x20,
+	0x4c, 0x20, 0x35, 0x2e, 0x34, 0x31, 0x36, 0x20, 0x32, 0x2e, 0x31, 0x31, 0x39, 0x20, 0x4d, 0x20,
+	0x35, 0x2e, 0x38, 0x34, 0x38, 0x20, 0x34, 0x2e, 0x38, 0x35, 0x33, 0x20, 0x4c, 0x20, 0x36, 0x2e,
+	0x30, 0x30, 0x31, 0x20, 0x34, 0x2e, 0x36, 0x32, 0x33, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x37, 0x37,
+	0x32, 0x20, 0x34, 0x2e, 0x34, 0x35, 0x20, 0x4c, 0x20, 0x35, 0x2e, 0x38, 0x34, 0x38, 0x20, 0x34,
+	0x2e, 0x38, 0x35, 0x33, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x36, 0x33, 0x62,
+	0x35, 0x36, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x65, 0x44,
+	0x32, 0x6b, 0x20, 0x28, 0x53, 0x57, 0x29, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x39,
+	0x2e, 0x38, 0x31, 0x39, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x37, 0x34, 0x32, 0x20, 0x31, 0x31, 0x2e,
+	0x33, 0x32, 0x38, 0x20, 0x43, 0x20, 0x36, 0x2e, 0x38, 0x31, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x33,
+	0x38, 0x31, 0x20, 0x36, 0x2e, 0x39, 0x30, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x31, 0x37, 0x20,
+	0x36, 0x2e, 0x39, 0x38, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x30, 0x34, 0x20, 0x43, 0x20, 0x37,
+	0x2e, 0x31, 0x37, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x36, 0x35, 0x20, 0x37, 0x2e, 0x33, 0x32,
+	0x32, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x38, 0x35, 0x20, 0x37, 0x2e, 0x33, 0x31, 0x38, 0x20, 0x31,
+	0x31, 0x2e, 0x30, 0x32, 0x37, 0x20, 0x4c, 0x20, 0x37, 0x2e, 0x34, 0x33, 0x38, 0x20, 0x34, 0x2e,
+	0x36, 0x38, 0x20, 0x4c, 0x20, 0x37, 0x2e, 0x34, 0x32, 0x34, 0x20, 0x34, 0x2e, 0x36, 0x33, 0x36,
+	0x20, 0x43, 0x20, 0x37, 0x2e, 0x34, 0x31, 0x20, 0x34, 0x2e, 0x34, 0x36, 0x37, 0x20, 0x37, 0x2e,
+	0x32, 0x33, 0x32, 0x20, 0x34, 0x2e, 0x33, 0x39, 0x34, 0x20, 0x37, 0x2e, 0x30, 0x36, 0x36, 0x20,
+	0x34, 0x2e, 0x34, 0x34, 0x39, 0x20, 0x4c, 0x20, 0x30, 0x2e, 0x36, 0x38, 0x36, 0x20, 0x36, 0x2e,
+	0x35, 0x39, 0x31, 0x20, 0x43, 0x20, 0x30, 0x2e, 0x35, 0x38, 0x39, 0x20, 0x36, 0x2e, 0x36, 0x31,
+	0x35, 0x20, 0x30, 0x2e, 0x35, 0x20, 0x36, 0x2e, 0x36, 0x37, 0x39, 0x20, 0x30, 0x2e, 0x34, 0x34,
+	0x33, 0x20, 0x36, 0x2e, 0x37, 0x37, 0x35, 0x20, 0x43, 0x20, 0x30, 0x2e, 0x33, 0x35, 0x32, 0x20,
+	0x36, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x30, 0x2e, 0x34, 0x31, 0x33, 0x20, 0x37, 0x2e, 0x31, 0x32,
+	0x39, 0x20, 0x30, 0x2e, 0x35, 0x33, 0x39, 0x20, 0x37, 0x2e, 0x31, 0x38, 0x38, 0x20, 0x4c, 0x20,
+	0x32, 0x2e, 0x33, 0x34, 0x34, 0x20, 0x37, 0x2e, 0x38, 0x38, 0x34, 0x20, 0x43, 0x20, 0x32, 0x2e,
+	0x30, 0x39, 0x32, 0x20, 0x38, 0x2e, 0x32, 0x37, 0x39, 0x20, 0x31, 0x2e, 0x38, 0x33, 0x39, 0x20,
+	0x38, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x2e, 0x36, 0x33, 0x39, 0x20, 0x39, 0x2e, 0x32, 0x32, 0x36,
+	0x20, 0x43, 0x20, 0x31, 0x2e, 0x31, 0x31, 0x33, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x38, 0x39, 0x20,
+	0x30, 0x2e, 0x38, 0x30, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x34, 0x36, 0x20, 0x30, 0x2e, 0x39,
+	0x37, 0x37, 0x20, 0x31, 0x33, 0x2e, 0x35, 0x31, 0x31, 0x20, 0x43, 0x20, 0x31, 0x2e, 0x31, 0x34,
+	0x38, 0x20, 0x31, 0x34, 0x2e, 0x39, 0x37, 0x38, 0x20, 0x31, 0x2e, 0x32, 0x36, 0x33, 0x20, 0x31,
+	0x35, 0x2e, 0x31, 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x35,
+	0x30, 0x36, 0x20, 0x43, 0x20, 0x31, 0x2e, 0x36, 0x32, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x36,
+	0x38, 0x20, 0x31, 0x2e, 0x39, 0x35, 0x32, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x32, 0x38, 0x20, 0x32,
+	0x2e, 0x30, 0x35, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x32, 0x35, 0x20, 0x43, 0x20, 0x32, 0x2e,
+	0x31, 0x36, 0x32, 0x20, 0x31, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x32, 0x2e, 0x32, 0x31, 0x34,
+	0x20, 0x31, 0x34, 0x2e, 0x38, 0x36, 0x39, 0x20, 0x32, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x34, 0x2e,
+	0x34, 0x37, 0x37, 0x20, 0x43, 0x20, 0x32, 0x2e, 0x31, 0x33, 0x34, 0x20, 0x31, 0x33, 0x2e, 0x36,
+	0x38, 0x37, 0x20, 0x32, 0x2e, 0x35, 0x31, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x39, 0x34, 0x39, 0x20,
+	0x33, 0x2e, 0x33, 0x30, 0x33, 0x20, 0x31, 0x31, 0x2e, 0x30, 0x32, 0x31, 0x20, 0x43, 0x20, 0x33,
+	0x2e, 0x37, 0x39, 0x37, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x35, 0x35, 0x20, 0x34, 0x2e, 0x33, 0x37,
+	0x33, 0x20, 0x31, 0x30, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x35, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x39,
+	0x2e, 0x38, 0x31, 0x39, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72,
+	0x6c, 0x28, 0x23, 0x61, 0x72, 0x72, 0x5f, 0x62, 0x61, 0x73, 0x65, 0x29, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x30, 0x64, 0x30, 0x64, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69,
+	0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21,
+	0x2d, 0x2d, 0x20, 0x4b, 0x61, 0x64, 0x20, 0x28, 0x4e, 0x45, 0x29, 0x20, 0x2d, 0x2d, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x2e,
+	0x38, 0x31, 0x38, 0x20, 0x36, 0x2e, 0x31, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x32, 0x35,
+	0x38, 0x20, 0x34, 0x2e, 0x36, 0x37, 0x32, 0x20, 0x43, 0x20, 0x39, 0x2e, 0x31, 0x38, 0x35, 0x20,
+	0x34, 0x2e, 0x36, 0x31, 0x39, 0x20, 0x39, 0x2e, 0x30, 0x39, 0x38, 0x20, 0x34, 0x2e, 0x35, 0x38,
+	0x33, 0x20, 0x39, 0x2e, 0x30, 0x31, 0x39, 0x20, 0x34, 0x2e, 0x35, 0x39, 0x36, 0x20, 0x43, 0x20,
+	0x38, 0x2e, 0x38, 0x32, 0x35, 0x20, 0x34, 0x2e, 0x36, 0x33, 0x35, 0x20, 0x38, 0x2e, 0x36, 0x37,
+	0x38, 0x20, 0x34, 0x2e, 0x38, 0x31, 0x35, 0x20, 0x38, 0x2e, 0x36, 0x38, 0x32, 0x20, 0x34, 0x2e,
+	0x39, 0x37, 0x33, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x35, 0x36, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x33,
+	0x32, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x36, 0x34,
+	0x20, 0x43, 0x20, 0x38, 0x2e, 0x35, 0x39, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x33, 0x33, 0x20, 0x38,
+	0x2e, 0x37, 0x36, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x36, 0x30, 0x36, 0x20, 0x38, 0x2e, 0x39, 0x33,
+	0x34, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x35, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x31,
+	0x34, 0x20, 0x39, 0x2e, 0x34, 0x30, 0x39, 0x20, 0x43, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x31, 0x31,
+	0x20, 0x39, 0x2e, 0x33, 0x38, 0x35, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x20, 0x39, 0x2e, 0x33, 0x32,
+	0x31, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x35, 0x37, 0x20, 0x39, 0x2e, 0x32, 0x32, 0x35, 0x20, 0x43,
+	0x20, 0x31, 0x35, 0x2e, 0x36, 0x34, 0x38, 0x20, 0x39, 0x2e, 0x30, 0x36, 0x31, 0x20, 0x31, 0x35,
+	0x2e, 0x35, 0x38, 0x37, 0x20, 0x38, 0x2e, 0x38, 0x37, 0x31, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x36,
+	0x31, 0x20, 0x38, 0x2e, 0x38, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x36, 0x35, 0x36,
+	0x20, 0x38, 0x2e, 0x31, 0x31, 0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x30, 0x38, 0x20,
+	0x37, 0x2e, 0x37, 0x32, 0x31, 0x20, 0x31, 0x34, 0x2e, 0x31, 0x36, 0x31, 0x20, 0x37, 0x2e, 0x32,
+	0x36, 0x20, 0x31, 0x34, 0x2e, 0x33, 0x36, 0x31, 0x20, 0x36, 0x2e, 0x37, 0x37, 0x34, 0x20, 0x43,
+	0x20, 0x31, 0x34, 0x2e, 0x38, 0x38, 0x37, 0x20, 0x35, 0x2e, 0x35, 0x31, 0x31, 0x20, 0x31, 0x35,
+	0x2e, 0x31, 0x39, 0x37, 0x20, 0x33, 0x2e, 0x39, 0x35, 0x34, 0x20, 0x31, 0x35, 0x2e, 0x30, 0x32,
+	0x33, 0x20, 0x32, 0x2e, 0x34, 0x38, 0x39, 0x20, 0x43, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x35, 0x32,
+	0x20, 0x31, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x33, 0x37, 0x20, 0x30, 0x2e,
+	0x38, 0x31, 0x39, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x39, 0x34, 0x20, 0x30, 0x2e, 0x34, 0x39, 0x34,
+	0x20, 0x43, 0x20, 0x31, 0x34, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x30, 0x2e, 0x33, 0x33, 0x32, 0x20,
+	0x31, 0x34, 0x2e, 0x30, 0x34, 0x38, 0x20, 0x30, 0x2e, 0x33, 0x37, 0x32, 0x20, 0x31, 0x33, 0x2e,
+	0x39, 0x34, 0x31, 0x20, 0x30, 0x2e, 0x36, 0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x33, 0x2e, 0x38,
+	0x33, 0x38, 0x20, 0x30, 0x2e, 0x39, 0x37, 0x38, 0x20, 0x31, 0x33, 0x2e, 0x37, 0x38, 0x36, 0x20,
+	0x31, 0x2e, 0x31, 0x33, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x32,
+	0x33, 0x20, 0x43, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x36, 0x36, 0x20, 0x32, 0x2e, 0x33, 0x31, 0x33,
+	0x20, 0x31, 0x33, 0x2e, 0x34, 0x38, 0x32, 0x20, 0x34, 0x2e, 0x30, 0x35, 0x31, 0x20, 0x31, 0x32,
+	0x2e, 0x36, 0x39, 0x37, 0x20, 0x34, 0x2e, 0x39, 0x37, 0x39, 0x20, 0x43, 0x20, 0x31, 0x32, 0x2e,
+	0x32, 0x30, 0x33, 0x20, 0x35, 0x2e, 0x35, 0x34, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x36, 0x32, 0x37,
+	0x20, 0x35, 0x2e, 0x38, 0x36, 0x37, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x31, 0x38, 0x20, 0x36, 0x2e,
+	0x31, 0x38, 0x31, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c,
+	0x28, 0x23, 0x61, 0x72, 0x72, 0x5f, 0x62, 0x61, 0x73, 0x65, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x30, 0x64, 0x30, 0x64, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e,
+	0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67,
+	0x3e, 0x0a
+};
+
+static const unsigned char icon_status_conn_ed2k_connecting_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x9d, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x63, 0x60, 0x18, 0x05, 0xa3,
+	0x80, 0x81, 0x81, 0x91, 0x81, 0x81, 0x81, 0xe1, 0x7a, 0x9b, 0xf6, 0x7f, 0x29, 0x41, 0x56, 0x06,
+	0x5e, 0x0e, 0x26, 0x86, 0x9b, 0xcf, 0x7f, 0x32, 0x30, 0x30, 0x30, 0x30, 0x68, 0x56, 0x5d, 0x65,
+	0x24, 0xc6, 0x00, 0x26, 0x98, 0xe2, 0x27, 0xef, 0x7e, 0x31, 0xdc, 0x7c, 0xfe, 0x93, 0xe1, 0xdf,
+	0xff, 0xff, 0x0c, 0x1f, 0xbe, 0xfd, 0x21, 0xda, 0x05, 0x4c, 0x30, 0xc6, 0x8f, 0xdf, 0xff, 0x19,
+	0xfe, 0xfd, 0xff, 0xcf, 0xf0, 0xe9, 0xfb, 0x5f, 0x06, 0x01, 0x2e, 0x16, 0xd2, 0x0c, 0xb8, 0xde,
+	0xa6, 0xfd, 0x9f, 0x8b, 0x8d, 0x89, 0x81, 0x89, 0x91, 0x91, 0x61, 0xda, 0xbe, 0xd7, 0x0c, 0xcf,
+	0x3e, 0xfc, 0x22, 0xcd, 0x80, 0xaa, 0x35, 0x4f, 0x19, 0x18, 0x18, 0x18, 0x18, 0xda, 0xb6, 0x3c,
+	0x67, 0x58, 0x7c, 0xec, 0x1d, 0x51, 0x7e, 0x47, 0x01, 0x41, 0xc6, 0x02, 0xff, 0xaf, 0xb7, 0x69,
+	0xff, 0x27, 0x59, 0x23, 0x32, 0x70, 0xd4, 0xe0, 0xfd, 0x1f, 0x68, 0x24, 0x40, 0x99, 0x21, 0xe4,
+	0x00, 0x00, 0x08, 0x9e, 0x32, 0x2a, 0x50, 0xe3, 0x67, 0x4a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
+	0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_conn_ed2k_connecting_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x72,
+	0x72, 0x5f, 0x65, 0x64, 0x32, 0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6e,
+	0x67, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x65, 0x34, 0x62, 0x36, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x39, 0x63, 0x32, 0x65, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x34, 0x37, 0x61, 0x31, 0x32, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x2e, 0x31,
+	0x38, 0x32, 0x20, 0x39, 0x2e, 0x38, 0x31, 0x39, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x37, 0x34, 0x32,
+	0x20, 0x31, 0x31, 0x2e, 0x33, 0x32, 0x38, 0x20, 0x43, 0x20, 0x36, 0x2e, 0x38, 0x31, 0x35, 0x20,
+	0x31, 0x31, 0x2e, 0x33, 0x38, 0x31, 0x20, 0x36, 0x2e, 0x39, 0x30, 0x32, 0x20, 0x31, 0x31, 0x2e,
+	0x34, 0x31, 0x37, 0x20, 0x36, 0x2e, 0x39, 0x38, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x30, 0x34,
+	0x20, 0x43, 0x20, 0x37, 0x2e, 0x31, 0x37, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x36, 0x35, 0x20,
+	0x37, 0x2e, 0x33, 0x32, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x38, 0x35, 0x20, 0x37, 0x2e, 0x33,
+	0x31, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x30, 0x32, 0x37, 0x20, 0x4c, 0x20, 0x37, 0x2e, 0x34, 0x33,
+	0x38, 0x20, 0x34, 0x2e, 0x36, 0x38, 0x20, 0x4c, 0x20, 0x37, 0x2e, 0x34, 0x32, 0x34, 0x20, 0x34,
+	0x2e, 0x36, 0x33, 0x36, 0x20, 0x43, 0x20, 0x37, 0x2e, 0x34, 0x31, 0x20, 0x34, 0x2e, 0x34, 0x36,
+	0x37, 0x20, 0x37, 0x2e, 0x32, 0x33, 0x32, 0x20, 0x34, 0x2e, 0x33, 0x39, 0x34, 0x20, 0x37, 0x2e,
+	0x30, 0x36, 0x36, 0x20, 0x34, 0x2e, 0x34, 0x34, 0x39, 0x20, 0x4c, 0x20, 0x30, 0x2e, 0x36, 0x38,
+	0x36, 0x20, 0x36, 0x2e, 0x35, 0x39, 0x31, 0x20, 0x43, 0x20, 0x30, 0x2e, 0x35, 0x38, 0x39, 0x20,
+	0x36, 0x2e, 0x36, 0x31, 0x35, 0x20, 0x30, 0x2e, 0x35, 0x20, 0x36, 0x2e, 0x36, 0x37, 0x39, 0x20,
+	0x30, 0x2e, 0x34, 0x34, 0x33, 0x20, 0x36, 0x2e, 0x37, 0x37, 0x35, 0x20, 0x43, 0x20, 0x30, 0x2e,
+	0x33, 0x35, 0x32, 0x20, 0x36, 0x2e, 0x39, 0x33, 0x39, 0x20, 0x30, 0x2e, 0x34, 0x31, 0x33, 0x20,
+	0x37, 0x2e, 0x31, 0x32, 0x39, 0x20, 0x30, 0x2e, 0x35, 0x33, 0x39, 0x20, 0x37, 0x2e, 0x31, 0x38,
+	0x38, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x33, 0x34, 0x34, 0x20, 0x37, 0x2e, 0x38, 0x38, 0x34, 0x20,
+	0x43, 0x20, 0x32, 0x2e, 0x30, 0x39, 0x32, 0x20, 0x38, 0x2e, 0x32, 0x37, 0x39, 0x20, 0x31, 0x2e,
+	0x38, 0x33, 0x39, 0x20, 0x38, 0x2e, 0x37, 0x34, 0x20, 0x31, 0x2e, 0x36, 0x33, 0x39, 0x20, 0x39,
+	0x2e, 0x32, 0x32, 0x36, 0x20, 0x43, 0x20, 0x31, 0x2e, 0x31, 0x31, 0x33, 0x20, 0x31, 0x30, 0x2e,
+	0x34, 0x38, 0x39, 0x20, 0x30, 0x2e, 0x38, 0x30, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x34, 0x36,
+	0x20, 0x30, 0x2e, 0x39, 0x37, 0x37, 0x20, 0x31, 0x33, 0x2e, 0x35, 0x31, 0x31, 0x20, 0x43, 0x20,
+	0x31, 0x2e, 0x31, 0x34, 0x38, 0x20, 0x31, 0x34, 0x2e, 0x39, 0x37, 0x38, 0x20, 0x31, 0x2e, 0x32,
+	0x36, 0x33, 0x20, 0x31, 0x35, 0x2e, 0x31, 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x36, 0x20,
+	0x31, 0x35, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x43, 0x20, 0x31, 0x2e, 0x36, 0x32, 0x37, 0x20, 0x31,
+	0x35, 0x2e, 0x36, 0x36, 0x38, 0x20, 0x31, 0x2e, 0x39, 0x35, 0x32, 0x20, 0x31, 0x35, 0x2e, 0x36,
+	0x32, 0x38, 0x20, 0x32, 0x2e, 0x30, 0x35, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x32, 0x35, 0x20,
+	0x43, 0x20, 0x32, 0x2e, 0x31, 0x36, 0x32, 0x20, 0x31, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x32,
+	0x2e, 0x32, 0x31, 0x34, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x36, 0x39, 0x20, 0x32, 0x2e, 0x31, 0x39,
+	0x20, 0x31, 0x34, 0x2e, 0x34, 0x37, 0x37, 0x20, 0x43, 0x20, 0x32, 0x2e, 0x31, 0x33, 0x34, 0x20,
+	0x31, 0x33, 0x2e, 0x36, 0x38, 0x37, 0x20, 0x32, 0x2e, 0x35, 0x31, 0x38, 0x20, 0x31, 0x31, 0x2e,
+	0x39, 0x34, 0x39, 0x20, 0x33, 0x2e, 0x33, 0x30, 0x33, 0x20, 0x31, 0x31, 0x2e, 0x30, 0x32, 0x31,
+	0x20, 0x43, 0x20, 0x33, 0x2e, 0x37, 0x39, 0x37, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x35, 0x35, 0x20,
+	0x34, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x31, 0x30, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x35, 0x2e, 0x31,
+	0x38, 0x32, 0x20, 0x39, 0x2e, 0x38, 0x31, 0x39, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x61, 0x72, 0x72, 0x5f, 0x65, 0x64, 0x32, 0x6b, 0x5f,
+	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6e, 0x67, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x34, 0x35, 0x32, 0x62, 0x30, 0x64, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e,
+	0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67,
+	0x3e, 0x0a
+};
+
+static const unsigned char icon_status_conn_ed2k_high_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x72, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x63, 0x60, 0x18, 0x05, 0xa3,
+	0x00, 0x0a, 0xb4, 0x4e, 0x6b, 0xfd, 0x3f, 0xfd, 0x7f, 0xcf, 0x7f, 0xe7, 0x3f, 0xf6, 0x70, 0x4c,
+	0xac, 0x5e, 0x46, 0x18, 0xc3, 0xe2, 0x9b, 0xe5, 0x7f, 0x6e, 0x36, 0x36, 0xb8, 0xc4, 0x5e, 0x96,
+	0x83, 0x8c, 0x58, 0x75, 0xa0, 0x01, 0x26, 0x18, 0x03, 0xa6, 0xf9, 0xf9, 0xf9, 0xd7, 0xc4, 0x5a,
+	0x8e, 0x30, 0x40, 0x75, 0x92, 0x01, 0xdc, 0xc9, 0x6f, 0x66, 0xb0, 0x92, 0x6e, 0xc0, 0xdb, 0x43,
+	0x10, 0xfd, 0xe7, 0x33, 0x39, 0x18, 0x5e, 0xcd, 0xbd, 0xc8, 0x48, 0xaa, 0x2b, 0x18, 0x04, 0x22,
+	0x4c, 0xff, 0x4b, 0x37, 0x9a, 0x11, 0x1d, 0x70, 0x58, 0x81, 0xb0, 0xa7, 0xf3, 0x7f, 0xc1, 0x60,
+	0x27, 0xca, 0x0c, 0x21, 0x07, 0x00, 0x00, 0x6d, 0xbd, 0x26, 0xe1, 0x95, 0x7d, 0xa9, 0xc6, 0x00,
+	0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_conn_ed2k_high_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x72,
+	0x72, 0x5f, 0x65, 0x64, 0x32, 0x6b, 0x5f, 0x68, 0x69, 0x67, 0x68, 0x22, 0x20, 0x78, 0x31, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30,
+	0x2e, 0x35, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x64, 0x30, 0x66, 0x66, 0x63, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30,
+	0x2e, 0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x34, 0x64, 0x66, 0x66, 0x34, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x32, 0x30, 0x63, 0x65, 0x33, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f,
+	0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x39, 0x2e, 0x38,
+	0x31, 0x39, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x37, 0x34, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x32,
+	0x38, 0x20, 0x43, 0x20, 0x36, 0x2e, 0x38, 0x31, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x38, 0x31,
+	0x20, 0x36, 0x2e, 0x39, 0x30, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x36, 0x2e,
+	0x39, 0x38, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x30, 0x34, 0x20, 0x43, 0x20, 0x37, 0x2e, 0x31,
+	0x37, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x36, 0x35, 0x20, 0x37, 0x2e, 0x33, 0x32, 0x32, 0x20,
+	0x31, 0x31, 0x2e, 0x31, 0x38, 0x35, 0x20, 0x37, 0x2e, 0x33, 0x31, 0x38, 0x20, 0x31, 0x31, 0x2e,
+	0x30, 0x32, 0x37, 0x20, 0x4c, 0x20, 0x37, 0x2e, 0x34, 0x33, 0x38, 0x20, 0x34, 0x2e, 0x36, 0x38,
+	0x20, 0x4c, 0x20, 0x37, 0x2e, 0x34, 0x32, 0x34, 0x20, 0x34, 0x2e, 0x36, 0x33, 0x36, 0x20, 0x43,
+	0x20, 0x37, 0x2e, 0x34, 0x31, 0x20, 0x34, 0x2e, 0x34, 0x36, 0x37, 0x20, 0x37, 0x2e, 0x32, 0x33,
+	0x32, 0x20, 0x34, 0x2e, 0x33, 0x39, 0x34, 0x20, 0x37, 0x2e, 0x30, 0x36, 0x36, 0x20, 0x34, 0x2e,
+	0x34, 0x34, 0x39, 0x20, 0x4c, 0x20, 0x30, 0x2e, 0x36, 0x38, 0x36, 0x20, 0x36, 0x2e, 0x35, 0x39,
+	0x31, 0x20, 0x43, 0x20, 0x30, 0x2e, 0x35, 0x38, 0x39, 0x20, 0x36, 0x2e, 0x36, 0x31, 0x35, 0x20,
+	0x30, 0x2e, 0x35, 0x20, 0x36, 0x2e, 0x36, 0x37, 0x39, 0x20, 0x30, 0x2e, 0x34, 0x34, 0x33, 0x20,
+	0x36, 0x2e, 0x37, 0x37, 0x35, 0x20, 0x43, 0x20, 0x30, 0x2e, 0x33, 0x35, 0x32, 0x20, 0x36, 0x2e,
+	0x39, 0x33, 0x39, 0x20, 0x30, 0x2e, 0x34, 0x31, 0x33, 0x20, 0x37, 0x2e, 0x31, 0x32, 0x39, 0x20,
+	0x30, 0x2e, 0x35, 0x33, 0x39, 0x20, 0x37, 0x2e, 0x31, 0x38, 0x38, 0x20, 0x4c, 0x20, 0x32, 0x2e,
+	0x33, 0x34, 0x34, 0x20, 0x37, 0x2e, 0x38, 0x38, 0x34, 0x20, 0x43, 0x20, 0x32, 0x2e, 0x30, 0x39,
+	0x32, 0x20, 0x38, 0x2e, 0x32, 0x37, 0x39, 0x20, 0x31, 0x2e, 0x38, 0x33, 0x39, 0x20, 0x38, 0x2e,
+	0x37, 0x34, 0x20, 0x31, 0x2e, 0x36, 0x33, 0x39, 0x20, 0x39, 0x2e, 0x32, 0x32, 0x36, 0x20, 0x43,
+	0x20, 0x31, 0x2e, 0x31, 0x31, 0x33, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x38, 0x39, 0x20, 0x30, 0x2e,
+	0x38, 0x30, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x34, 0x36, 0x20, 0x30, 0x2e, 0x39, 0x37, 0x37,
+	0x20, 0x31, 0x33, 0x2e, 0x35, 0x31, 0x31, 0x20, 0x43, 0x20, 0x31, 0x2e, 0x31, 0x34, 0x38, 0x20,
+	0x31, 0x34, 0x2e, 0x39, 0x37, 0x38, 0x20, 0x31, 0x2e, 0x32, 0x36, 0x33, 0x20, 0x31, 0x35, 0x2e,
+	0x31, 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x30, 0x36,
+	0x20, 0x43, 0x20, 0x31, 0x2e, 0x36, 0x32, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x36, 0x38, 0x20,
+	0x31, 0x2e, 0x39, 0x35, 0x32, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x32, 0x38, 0x20, 0x32, 0x2e, 0x30,
+	0x35, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x32, 0x35, 0x20, 0x43, 0x20, 0x32, 0x2e, 0x31, 0x36,
+	0x32, 0x20, 0x31, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x32, 0x2e, 0x32, 0x31, 0x34, 0x20, 0x31,
+	0x34, 0x2e, 0x38, 0x36, 0x39, 0x20, 0x32, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x37,
+	0x37, 0x20, 0x43, 0x20, 0x32, 0x2e, 0x31, 0x33, 0x34, 0x20, 0x31, 0x33, 0x2e, 0x36, 0x38, 0x37,
+	0x20, 0x32, 0x2e, 0x35, 0x31, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x39, 0x34, 0x39, 0x20, 0x33, 0x2e,
+	0x33, 0x30, 0x33, 0x20, 0x31, 0x31, 0x2e, 0x30, 0x32, 0x31, 0x20, 0x43, 0x20, 0x33, 0x2e, 0x37,
+	0x39, 0x37, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x35, 0x35, 0x20, 0x34, 0x2e, 0x33, 0x37, 0x33, 0x20,
+	0x31, 0x30, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x35, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x39, 0x2e, 0x38,
+	0x31, 0x39, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28,
+	0x23, 0x61, 0x72, 0x72, 0x5f, 0x65, 0x64, 0x32, 0x6b, 0x5f, 0x68, 0x69, 0x67, 0x68, 0x29, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x30, 0x63, 0x33, 0x66, 0x31, 0x63,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65,
+	0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_status_conn_ed2k_low_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x9b, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x63, 0x60, 0x18, 0x05, 0xa3,
+	0x00, 0x0a, 0x3e, 0xbc, 0x74, 0xfe, 0xff, 0xeb, 0xc7, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xe1, 0xa5, 0xeb, 0xff, 0x0f, 0x2f, 0x9d, 0xff, 0x13, 0xab, 0x97, 0x85, 0x81, 0x81, 0x81, 0x41,
+	0x40, 0x7c, 0x2f, 0xe3, 0xfb, 0xe7, 0x3f, 0xfe, 0x33, 0x32, 0x71, 0x31, 0xfc, 0xff, 0xf7, 0x8d,
+	0xe1, 0xeb, 0x97, 0x1b, 0x44, 0x5b, 0xce, 0x04, 0x63, 0xfc, 0xfd, 0x73, 0x1f, 0xae, 0x99, 0x87,
+	0xcf, 0x88, 0x34, 0x03, 0x3e, 0xbc, 0x74, 0xfd, 0xcf, 0xc2, 0xa6, 0xcd, 0xc0, 0xc8, 0xc4, 0xc5,
+	0xd0, 0xd9, 0xf7, 0x8d, 0xe1, 0xd5, 0x8b, 0xb3, 0x44, 0x1b, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x10,
+	0x17, 0xc5, 0xf1, 0xff, 0xc3, 0x4b, 0xd7, 0xff, 0xb9, 0x99, 0x9c, 0xff, 0x19, 0x18, 0x18, 0x18,
+	0x6e, 0x5d, 0x14, 0x22, 0x3a, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x12, 0x62, 0x20, 0x06, 0x90,
+	0x66, 0x2d, 0x1a, 0xf0, 0xf1, 0x64, 0xff, 0x1f, 0x17, 0xc5, 0x41, 0x99, 0x21, 0xe4, 0x00, 0x00,
+	0x81, 0xe9, 0x3e, 0x10, 0x89, 0xa2, 0xf1, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
+	0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_conn_ed2k_low_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x72,
+	0x72, 0x5f, 0x65, 0x64, 0x32, 0x6b, 0x5f, 0x6c, 0x6f, 0x77, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22,
+	0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e,
+	0x35, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x66, 0x66, 0x66, 0x36, 0x63, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e,
+	0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x66, 0x66, 0x65, 0x36, 0x33, 0x61, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64,
+	0x63, 0x63, 0x37, 0x31, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x39, 0x2e, 0x38, 0x31,
+	0x39, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x37, 0x34, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x32, 0x38,
+	0x20, 0x43, 0x20, 0x36, 0x2e, 0x38, 0x31, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x38, 0x31, 0x20,
+	0x36, 0x2e, 0x39, 0x30, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x36, 0x2e, 0x39,
+	0x38, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x30, 0x34, 0x20, 0x43, 0x20, 0x37, 0x2e, 0x31, 0x37,
+	0x35, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x36, 0x35, 0x20, 0x37, 0x2e, 0x33, 0x32, 0x32, 0x20, 0x31,
+	0x31, 0x2e, 0x31, 0x38, 0x35, 0x20, 0x37, 0x2e, 0x33, 0x31, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x30,
+	0x32, 0x37, 0x20, 0x4c, 0x20, 0x37, 0x2e, 0x34, 0x33, 0x38, 0x20, 0x34, 0x2e, 0x36, 0x38, 0x20,
+	0x4c, 0x20, 0x37, 0x2e, 0x34, 0x32, 0x34, 0x20, 0x34, 0x2e, 0x36, 0x33, 0x36, 0x20, 0x43, 0x20,
+	0x37, 0x2e, 0x34, 0x31, 0x20, 0x34, 0x2e, 0x34, 0x36, 0x37, 0x20, 0x37, 0x2e, 0x32, 0x33, 0x32,
+	0x20, 0x34, 0x2e, 0x33, 0x39, 0x34, 0x20, 0x37, 0x2e, 0x30, 0x36, 0x36, 0x20, 0x34, 0x2e, 0x34,
+	0x34, 0x39, 0x20, 0x4c, 0x20, 0x30, 0x2e, 0x36, 0x38, 0x36, 0x20, 0x36, 0x2e, 0x35, 0x39, 0x31,
+	0x20, 0x43, 0x20, 0x30, 0x2e, 0x35, 0x38, 0x39, 0x20, 0x36, 0x2e, 0x36, 0x31, 0x35, 0x20, 0x30,
+	0x2e, 0x35, 0x20, 0x36, 0x2e, 0x36, 0x37, 0x39, 0x20, 0x30, 0x2e, 0x34, 0x34, 0x33, 0x20, 0x36,
+	0x2e, 0x37, 0x37, 0x35, 0x20, 0x43, 0x20, 0x30, 0x2e, 0x33, 0x35, 0x32, 0x20, 0x36, 0x2e, 0x39,
+	0x33, 0x39, 0x20, 0x30, 0x2e, 0x34, 0x31, 0x33, 0x20, 0x37, 0x2e, 0x31, 0x32, 0x39, 0x20, 0x30,
+	0x2e, 0x35, 0x33, 0x39, 0x20, 0x37, 0x2e, 0x31, 0x38, 0x38, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x33,
+	0x34, 0x34, 0x20, 0x37, 0x2e, 0x38, 0x38, 0x34, 0x20, 0x43, 0x20, 0x32, 0x2e, 0x30, 0x39, 0x32,
+	0x20, 0x38, 0x2e, 0x32, 0x37, 0x39, 0x20, 0x31, 0x2e, 0x38, 0x33, 0x39, 0x20, 0x38, 0x2e, 0x37,
+	0x34, 0x20, 0x31, 0x2e, 0x36, 0x33, 0x39, 0x20, 0x39, 0x2e, 0x32, 0x32, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x2e, 0x31, 0x31, 0x33, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x38, 0x39, 0x20, 0x30, 0x2e, 0x38,
+	0x30, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x34, 0x36, 0x20, 0x30, 0x2e, 0x39, 0x37, 0x37, 0x20,
+	0x31, 0x33, 0x2e, 0x35, 0x31, 0x31, 0x20, 0x43, 0x20, 0x31, 0x2e, 0x31, 0x34, 0x38, 0x20, 0x31,
+	0x34, 0x2e, 0x39, 0x37, 0x38, 0x20, 0x31, 0x2e, 0x32, 0x36, 0x33, 0x20, 0x31, 0x35, 0x2e, 0x31,
+	0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x30, 0x36, 0x20,
+	0x43, 0x20, 0x31, 0x2e, 0x36, 0x32, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x36, 0x38, 0x20, 0x31,
+	0x2e, 0x39, 0x35, 0x32, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x32, 0x38, 0x20, 0x32, 0x2e, 0x30, 0x35,
+	0x39, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x32, 0x35, 0x20, 0x43, 0x20, 0x32, 0x2e, 0x31, 0x36, 0x32,
+	0x20, 0x31, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x32, 0x2e, 0x32, 0x31, 0x34, 0x20, 0x31, 0x34,
+	0x2e, 0x38, 0x36, 0x39, 0x20, 0x32, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x37, 0x37,
+	0x20, 0x43, 0x20, 0x32, 0x2e, 0x31, 0x33, 0x34, 0x20, 0x31, 0x33, 0x2e, 0x36, 0x38, 0x37, 0x20,
+	0x32, 0x2e, 0x35, 0x31, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x39, 0x34, 0x39, 0x20, 0x33, 0x2e, 0x33,
+	0x30, 0x33, 0x20, 0x31, 0x31, 0x2e, 0x30, 0x32, 0x31, 0x20, 0x43, 0x20, 0x33, 0x2e, 0x37, 0x39,
+	0x37, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x35, 0x35, 0x20, 0x34, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x31,
+	0x30, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x35, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x39, 0x2e, 0x38, 0x31,
+	0x39, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x61, 0x72, 0x72, 0x5f, 0x65, 0x64, 0x32, 0x6b, 0x5f, 0x6c, 0x6f, 0x77, 0x29, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x34, 0x61, 0x34, 0x36, 0x30, 0x35, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e,
+	0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f,
+	0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73,
+	0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_status_conn_ed2k_off_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0xa1, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0xd0, 0x41, 0x0a, 0x82,
+	0x50, 0x10, 0x80, 0xe1, 0xdf, 0x10, 0x41, 0x74, 0xe1, 0xc2, 0x6b, 0x74, 0x98, 0xb7, 0xe9, 0x0c,
+	0x2d, 0xba, 0x46, 0xb7, 0xe8, 0x0a, 0x22, 0xb4, 0xb1, 0xba, 0x83, 0x9b, 0xb7, 0x10, 0x0f, 0x20,
+	0x04, 0x41, 0x20, 0x08, 0xfa, 0xd0, 0x67, 0xd3, 0xa6, 0x76, 0x2d, 0x5e, 0xb5, 0xf5, 0x5b, 0xcd,
+	0x66, 0xfe, 0x81, 0x81, 0xc5, 0xe2, 0xa5, 0x55, 0x4a, 0x86, 0x2c, 0x13, 0x11, 0x91, 0xa9, 0xae,
+	0xa5, 0x55, 0x4a, 0x5c, 0x77, 0x7d, 0x80, 0x24, 0xcf, 0xbd, 0x76, 0x9a, 0xe4, 0xd1, 0x34, 0x8c,
+	0x45, 0x41, 0xaf, 0xb5, 0xf3, 0x71, 0xff, 0x3d, 0xcc, 0x55, 0x85, 0x58, 0x4b, 0xaf, 0x35, 0x8d,
+	0xb5, 0xdf, 0x05, 0x8e, 0x69, 0x2a, 0xf7, 0x61, 0xe0, 0x5a, 0x96, 0x5c, 0x8c, 0x61, 0x1d, 0x04,
+	0xce, 0x81, 0x15, 0xc0, 0xc9, 0x18, 0x6e, 0xf3, 0xcc, 0xd9, 0x18, 0xf6, 0x5d, 0xe7, 0xe9, 0x71,
+	0x74, 0x0e, 0x00, 0xb0, 0x8b, 0x63, 0x39, 0x24, 0x89, 0xf3, 0xe3, 0x3e, 0xda, 0x84, 0xa1, 0x6c,
+	0xa3, 0xe8, 0xbf, 0xc8, 0x2f, 0x9e, 0x82, 0x24, 0x45, 0xfa, 0xb5, 0xec, 0xa9, 0x16, 0x00, 0x00,
+	0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_conn_ed2k_off_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x72,
+	0x72, 0x5f, 0x65, 0x64, 0x32, 0x6b, 0x5f, 0x6f, 0x66, 0x66, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22,
+	0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e,
+	0x35, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x66, 0x66, 0x64, 0x34, 0x64, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e,
+	0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x66, 0x66, 0x32, 0x36, 0x32, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64,
+	0x38, 0x31, 0x36, 0x31, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x35, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x39, 0x2e, 0x38, 0x31,
+	0x39, 0x20, 0x4c, 0x20, 0x36, 0x2e, 0x37, 0x34, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x32, 0x38,
+	0x20, 0x43, 0x20, 0x36, 0x2e, 0x38, 0x31, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x38, 0x31, 0x20,
+	0x36, 0x2e, 0x39, 0x30, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x31, 0x37, 0x20, 0x36, 0x2e, 0x39,
+	0x38, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x30, 0x34, 0x20, 0x43, 0x20, 0x37, 0x2e, 0x31, 0x37,
+	0x35, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x36, 0x35, 0x20, 0x37, 0x2e, 0x33, 0x32, 0x32, 0x20, 0x31,
+	0x31, 0x2e, 0x31, 0x38, 0x35, 0x20, 0x37, 0x2e, 0x33, 0x31, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x30,
+	0x32, 0x37, 0x20, 0x4c, 0x20, 0x37, 0x2e, 0x34, 0x33, 0x38, 0x20, 0x34, 0x2e, 0x36, 0x38, 0x20,
+	0x4c, 0x20, 0x37, 0x2e, 0x34, 0x32, 0x34, 0x20, 0x34, 0x2e, 0x36, 0x33, 0x36, 0x20, 0x43, 0x20,
+	0x37, 0x2e, 0x34, 0x31, 0x20, 0x34, 0x2e, 0x34, 0x36, 0x37, 0x20, 0x37, 0x2e, 0x32, 0x33, 0x32,
+	0x20, 0x34, 0x2e, 0x33, 0x39, 0x34, 0x20, 0x37, 0x2e, 0x30, 0x36, 0x36, 0x20, 0x34, 0x2e, 0x34,
+	0x34, 0x39, 0x20, 0x4c, 0x20, 0x30, 0x2e, 0x36, 0x38, 0x36, 0x20, 0x36, 0x2e, 0x35, 0x39, 0x31,
+	0x20, 0x43, 0x20, 0x30, 0x2e, 0x35, 0x38, 0x39, 0x20, 0x36, 0x2e, 0x36, 0x31, 0x35, 0x20, 0x30,
+	0x2e, 0x35, 0x20, 0x36, 0x2e, 0x36, 0x37, 0x39, 0x20, 0x30, 0x2e, 0x34, 0x34, 0x33, 0x20, 0x36,
+	0x2e, 0x37, 0x37, 0x35, 0x20, 0x43, 0x20, 0x30, 0x2e, 0x33, 0x35, 0x32, 0x20, 0x36, 0x2e, 0x39,
+	0x33, 0x39, 0x20, 0x30, 0x2e, 0x34, 0x31, 0x33, 0x20, 0x37, 0x2e, 0x31, 0x32, 0x39, 0x20, 0x30,
+	0x2e, 0x35, 0x33, 0x39, 0x20, 0x37, 0x2e, 0x31, 0x38, 0x38, 0x20, 0x4c, 0x20, 0x32, 0x2e, 0x33,
+	0x34, 0x34, 0x20, 0x37, 0x2e, 0x38, 0x38, 0x34, 0x20, 0x43, 0x20, 0x32, 0x2e, 0x30, 0x39, 0x32,
+	0x20, 0x38, 0x2e, 0x32, 0x37, 0x39, 0x20, 0x31, 0x2e, 0x38, 0x33, 0x39, 0x20, 0x38, 0x2e, 0x37,
+	0x34, 0x20, 0x31, 0x2e, 0x36, 0x33, 0x39, 0x20, 0x39, 0x2e, 0x32, 0x32, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x2e, 0x31, 0x31, 0x33, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x38, 0x39, 0x20, 0x30, 0x2e, 0x38,
+	0x30, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x30, 0x34, 0x36, 0x20, 0x30, 0x2e, 0x39, 0x37, 0x37, 0x20,
+	0x31, 0x33, 0x2e, 0x35, 0x31, 0x31, 0x20, 0x43, 0x20, 0x31, 0x2e, 0x31, 0x34, 0x38, 0x20, 0x31,
+	0x34, 0x2e, 0x39, 0x37, 0x38, 0x20, 0x31, 0x2e, 0x32, 0x36, 0x33, 0x20, 0x31, 0x35, 0x2e, 0x31,
+	0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x30, 0x36, 0x20,
+	0x43, 0x20, 0x31, 0x2e, 0x36, 0x32, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x36, 0x38, 0x20, 0x31,
+	0x2e, 0x39, 0x35, 0x32, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x32, 0x38, 0x20, 0x32, 0x2e, 0x30, 0x35,
+	0x39, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x32, 0x35, 0x20, 0x43, 0x20, 0x32, 0x2e, 0x31, 0x36, 0x32,
+	0x20, 0x31, 0x35, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x32, 0x2e, 0x32, 0x31, 0x34, 0x20, 0x31, 0x34,
+	0x2e, 0x38, 0x36, 0x39, 0x20, 0x32, 0x2e, 0x31, 0x39, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x37, 0x37,
+	0x20, 0x43, 0x20, 0x32, 0x2e, 0x31, 0x33, 0x34, 0x20, 0x31, 0x33, 0x2e, 0x36, 0x38, 0x37, 0x20,
+	0x32, 0x2e, 0x35, 0x31, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x39, 0x34, 0x39, 0x20, 0x33, 0x2e, 0x33,
+	0x30, 0x33, 0x20, 0x31, 0x31, 0x2e, 0x30, 0x32, 0x31, 0x20, 0x43, 0x20, 0x33, 0x2e, 0x37, 0x39,
+	0x37, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x35, 0x35, 0x20, 0x34, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x31,
+	0x30, 0x2e, 0x31, 0x33, 0x33, 0x20, 0x35, 0x2e, 0x31, 0x38, 0x32, 0x20, 0x39, 0x2e, 0x38, 0x31,
+	0x39, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x61, 0x72, 0x72, 0x5f, 0x65, 0x64, 0x32, 0x6b, 0x5f, 0x6f, 0x66, 0x66, 0x29, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x30, 0x64, 0x30, 0x64, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e,
+	0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f,
+	0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73,
+	0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_status_conn_kad_firewalled_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x7b, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x63, 0x60, 0xa0, 0x37, 0x88,
+	0x0e, 0xe7, 0xf8, 0x1f, 0x1a, 0xc4, 0xfe, 0x9f, 0x22, 0x43, 0x3e, 0xbc, 0x74, 0xfd, 0xff, 0xe1,
+	0xa5, 0xeb, 0x7f, 0x06, 0x06, 0x06, 0x06, 0x26, 0x62, 0x35, 0x7d, 0x7e, 0x9b, 0xff, 0x1f, 0xe6,
+	0x02, 0x64, 0x71, 0x16, 0x62, 0x0d, 0xe0, 0xe2, 0x2f, 0x66, 0xf8, 0xf8, 0xea, 0xf1, 0xff, 0x5f,
+	0x3f, 0x0e, 0xa2, 0x88, 0x33, 0x12, 0x6b, 0x00, 0xcc, 0xc9, 0x30, 0x20, 0x20, 0xbe, 0x9b, 0x91,
+	0x24, 0x17, 0x70, 0x0b, 0xb4, 0x33, 0x7c, 0xfd, 0x50, 0xc9, 0xb0, 0x76, 0xdd, 0x09, 0x86, 0xef,
+	0xdf, 0xc9, 0x08, 0xc3, 0x0f, 0x2f, 0x9d, 0xff, 0x3f, 0xb9, 0x2d, 0xfc, 0xff, 0xc3, 0x4b, 0xd7,
+	0xff, 0x9b, 0x56, 0xf3, 0xff, 0xcf, 0xcd, 0xe4, 0xa4, 0x2c, 0x26, 0x46, 0xc1, 0xb0, 0x02, 0x00,
+	0x12, 0x71, 0x2f, 0x11, 0x33, 0x7a, 0x4f, 0xe1, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
+	0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_conn_kad_firewalled_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x72,
+	0x72, 0x5f, 0x6b, 0x61, 0x64, 0x5f, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x64,
+	0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x36, 0x63, 0x38, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x65, 0x36, 0x33, 0x61, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x63, 0x63, 0x37, 0x31, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x2e, 0x38,
+	0x31, 0x38, 0x20, 0x36, 0x2e, 0x31, 0x38, 0x31, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x32, 0x35, 0x38,
+	0x20, 0x34, 0x2e, 0x36, 0x37, 0x32, 0x20, 0x43, 0x20, 0x39, 0x2e, 0x31, 0x38, 0x35, 0x20, 0x34,
+	0x2e, 0x36, 0x31, 0x39, 0x20, 0x39, 0x2e, 0x30, 0x39, 0x38, 0x20, 0x34, 0x2e, 0x35, 0x38, 0x33,
+	0x20, 0x39, 0x2e, 0x30, 0x31, 0x39, 0x20, 0x34, 0x2e, 0x35, 0x39, 0x36, 0x20, 0x43, 0x20, 0x38,
+	0x2e, 0x38, 0x32, 0x35, 0x20, 0x34, 0x2e, 0x36, 0x33, 0x35, 0x20, 0x38, 0x2e, 0x36, 0x37, 0x38,
+	0x20, 0x34, 0x2e, 0x38, 0x31, 0x35, 0x20, 0x38, 0x2e, 0x36, 0x38, 0x32, 0x20, 0x34, 0x2e, 0x39,
+	0x37, 0x33, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x35, 0x36, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x32,
+	0x20, 0x4c, 0x20, 0x38, 0x2e, 0x35, 0x37, 0x36, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x36, 0x34, 0x20,
+	0x43, 0x20, 0x38, 0x2e, 0x35, 0x39, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x33, 0x33, 0x20, 0x38, 0x2e,
+	0x37, 0x36, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x36, 0x30, 0x36, 0x20, 0x38, 0x2e, 0x39, 0x33, 0x34,
+	0x20, 0x31, 0x31, 0x2e, 0x35, 0x35, 0x31, 0x20, 0x4c, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x31, 0x34,
+	0x20, 0x39, 0x2e, 0x34, 0x30, 0x39, 0x20, 0x43, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x31, 0x31, 0x20,
+	0x39, 0x2e, 0x33, 0x38, 0x35, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x20, 0x39, 0x2e, 0x33, 0x32, 0x31,
+	0x20, 0x31, 0x35, 0x2e, 0x35, 0x35, 0x37, 0x20, 0x39, 0x2e, 0x32, 0x32, 0x35, 0x20, 0x43, 0x20,
+	0x31, 0x35, 0x2e, 0x36, 0x34, 0x38, 0x20, 0x39, 0x2e, 0x30, 0x36, 0x31, 0x20, 0x31, 0x35, 0x2e,
+	0x35, 0x38, 0x37, 0x20, 0x38, 0x2e, 0x38, 0x37, 0x31, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x36, 0x31,
+	0x20, 0x38, 0x2e, 0x38, 0x31, 0x32, 0x20, 0x4c, 0x20, 0x31, 0x33, 0x2e, 0x36, 0x35, 0x36, 0x20,
+	0x38, 0x2e, 0x31, 0x31, 0x36, 0x20, 0x43, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x30, 0x38, 0x20, 0x37,
+	0x2e, 0x37, 0x32, 0x31, 0x20, 0x31, 0x34, 0x2e, 0x31, 0x36, 0x31, 0x20, 0x37, 0x2e, 0x32, 0x36,
+	0x20, 0x31, 0x34, 0x2e, 0x33, 0x36, 0x31, 0x20, 0x36, 0x2e, 0x37, 0x37, 0x34, 0x20, 0x43, 0x20,
+	0x31, 0x34, 0x2e, 0x38, 0x38, 0x37, 0x20, 0x35, 0x2e, 0x35, 0x31, 0x31, 0x20, 0x31, 0x35, 0x2e,
+	0x31, 0x39, 0x37, 0x20, 0x33, 0x2e, 0x39, 0x35, 0x34, 0x20, 0x31, 0x35, 0x2e, 0x30, 0x32, 0x33,
+	0x20, 0x32, 0x2e, 0x34, 0x38, 0x39, 0x20, 0x43, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x35, 0x32, 0x20,
+	0x31, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x33, 0x37, 0x20, 0x30, 0x2e, 0x38,
+	0x31, 0x39, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x39, 0x34, 0x20, 0x30, 0x2e, 0x34, 0x39, 0x34, 0x20,
+	0x43, 0x20, 0x31, 0x34, 0x2e, 0x33, 0x37, 0x33, 0x20, 0x30, 0x2e, 0x33, 0x33, 0x32, 0x20, 0x31,
+	0x34, 0x2e, 0x30, 0x34, 0x38, 0x20, 0x30, 0x2e, 0x33, 0x37, 0x32, 0x20, 0x31, 0x33, 0x2e, 0x39,
+	0x34, 0x31, 0x20, 0x30, 0x2e, 0x36, 0x37, 0x35, 0x20, 0x43, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x33,
+	0x38, 0x20, 0x30, 0x2e, 0x39, 0x37, 0x38, 0x20, 0x31, 0x33, 0x2e, 0x37, 0x38, 0x36, 0x20, 0x31,
+	0x2e, 0x31, 0x33, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x32, 0x33,
+	0x20, 0x43, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x36, 0x36, 0x20, 0x32, 0x2e, 0x33, 0x31, 0x33, 0x20,
+	0x31, 0x33, 0x2e, 0x34, 0x38, 0x32, 0x20, 0x34, 0x2e, 0x30, 0x35, 0x31, 0x20, 0x31, 0x32, 0x2e,
+	0x36, 0x39, 0x37, 0x20, 0x34, 0x2e, 0x39, 0x37, 0x39, 0x20, 0x43, 0x20, 0x31, 0x32, 0x2e, 0x32,
+	0x30, 0x33, 0x20, 0x35, 0x2e, 0x35, 0x34, 0x35, 0x20, 0x31, 0x31, 0x2e, 0x36, 0x32, 0x37, 0x20,
+	0x35, 0x2e, 0x38, 0x36, 0x37, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x31, 0x38, 0x20, 0x36, 0x2e, 0x31,
+	0x38, 0x31, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28,
+	0x23, 0x61, 0x72, 0x72, 0x5f, 0x6b, 0x61, 0x64, 0x5f, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c,
+	0x6c, 0x65, 0x64, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x34,
+	0x61, 0x34, 0x36, 0x30, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69,
+	0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_status_conn_kad_off_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x9a, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x90, 0x41, 0x0a, 0x82,
+	0x50, 0x14, 0x45, 0x4f, 0xfd, 0x50, 0xe2, 0x23, 0x38, 0x35, 0x68, 0x09, 0xed, 0xc7, 0x99, 0x03,
+	0x69, 0x13, 0x35, 0x70, 0x23, 0xe1, 0xc4, 0x2d, 0x38, 0x52, 0x9c, 0xd8, 0x3a, 0x24, 0x84, 0x36,
+	0xf0, 0x49, 0xa2, 0x8f, 0xc2, 0x6b, 0x12, 0x8e, 0x7f, 0x04, 0x8d, 0x3c, 0xc3, 0x07, 0xf7, 0xf0,
+	0xee, 0x85, 0x7f, 0x93, 0x6a, 0x2d, 0xa9, 0xd6, 0xf2, 0x93, 0xe4, 0x12, 0x86, 0x72, 0x0a, 0x02,
+	0x01, 0x58, 0xbb, 0x86, 0x1e, 0x59, 0x26, 0x00, 0x47, 0xad, 0xe5, 0xe0, 0x79, 0xec, 0x95, 0x02,
+	0x60, 0xe3, 0x2a, 0xd8, 0x26, 0x09, 0xa6, 0xef, 0x65, 0xac, 0x6b, 0x56, 0xbe, 0xcf, 0xcd, 0x98,
+	0xef, 0xde, 0x16, 0x11, 0x79, 0x16, 0x85, 0x98, 0x38, 0x96, 0x2e, 0x8a, 0xe6, 0x0d, 0x9c, 0x2b,
+	0xd8, 0xb2, 0x64, 0x6c, 0x1a, 0x86, 0xb6, 0xe5, 0x6a, 0xed, 0x7c, 0x77, 0x16, 0xbc, 0xf2, 0x9c,
+	0xa1, 0xaa, 0xb8, 0x4f, 0x13, 0x3b, 0xa5, 0x38, 0x7f, 0x46, 0x5c, 0x58, 0x00, 0x78, 0x03, 0x24,
+	0x67, 0x33, 0xdd, 0x9c, 0x08, 0xde, 0x02, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+	0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_conn_kad_off_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x72,
+	0x72, 0x5f, 0x6b, 0x61, 0x64, 0x5f, 0x6f, 0x66, 0x66, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35,
+	0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66,
+	0x66, 0x64, 0x34, 0x64, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34,
+	0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x66, 0x66, 0x32, 0x36, 0x32, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x38,
+	0x31, 0x36, 0x31, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69,
+	0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x31, 0x38, 0x20, 0x36, 0x2e, 0x31, 0x38,
+	0x31, 0x20, 0x4c, 0x20, 0x39, 0x2e, 0x32, 0x35, 0x38, 0x20, 0x34, 0x2e, 0x36, 0x37, 0x32, 0x20,
+	0x43, 0x20, 0x39, 0x2e, 0x31, 0x38, 0x35, 0x20, 0x34, 0x2e, 0x36, 0x31, 0x39, 0x20, 0x39, 0x2e,
+	0x30, 0x39, 0x38, 0x20, 0x34, 0x2e, 0x35, 0x38, 0x33, 0x20, 0x39, 0x2e, 0x30, 0x31, 0x39, 0x20,
+	0x34, 0x2e, 0x35, 0x39, 0x36, 0x20, 0x43, 0x20, 0x38, 0x2e, 0x38, 0x32, 0x35, 0x20, 0x34, 0x2e,
+	0x36, 0x33, 0x35, 0x20, 0x38, 0x2e, 0x36, 0x37, 0x38, 0x20, 0x34, 0x2e, 0x38, 0x31, 0x35, 0x20,
+	0x38, 0x2e, 0x36, 0x38, 0x32, 0x20, 0x34, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x4c, 0x20, 0x38, 0x2e,
+	0x35, 0x36, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x35, 0x37,
+	0x36, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x36, 0x34, 0x20, 0x43, 0x20, 0x38, 0x2e, 0x35, 0x39, 0x20,
+	0x31, 0x31, 0x2e, 0x35, 0x33, 0x33, 0x20, 0x38, 0x2e, 0x37, 0x36, 0x38, 0x20, 0x31, 0x31, 0x2e,
+	0x36, 0x30, 0x36, 0x20, 0x38, 0x2e, 0x39, 0x33, 0x34, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x35, 0x31,
+	0x20, 0x4c, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x31, 0x34, 0x20, 0x39, 0x2e, 0x34, 0x30, 0x39, 0x20,
+	0x43, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x31, 0x31, 0x20, 0x39, 0x2e, 0x33, 0x38, 0x35, 0x20, 0x31,
+	0x35, 0x2e, 0x35, 0x20, 0x39, 0x2e, 0x33, 0x32, 0x31, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x35, 0x37,
+	0x20, 0x39, 0x2e, 0x32, 0x32, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x34, 0x38, 0x20,
+	0x39, 0x2e, 0x30, 0x36, 0x31, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x38, 0x2e, 0x38,
+	0x37, 0x31, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x36, 0x31, 0x20, 0x38, 0x2e, 0x38, 0x31, 0x32, 0x20,
+	0x4c, 0x20, 0x31, 0x33, 0x2e, 0x36, 0x35, 0x36, 0x20, 0x38, 0x2e, 0x31, 0x31, 0x36, 0x20, 0x43,
+	0x20, 0x31, 0x33, 0x2e, 0x39, 0x30, 0x38, 0x20, 0x37, 0x2e, 0x37, 0x32, 0x31, 0x20, 0x31, 0x34,
+	0x2e, 0x31, 0x36, 0x31, 0x20, 0x37, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x33, 0x36, 0x31,
+	0x20, 0x36, 0x2e, 0x37, 0x37, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x38, 0x37, 0x20,
+	0x35, 0x2e, 0x35, 0x31, 0x31, 0x20, 0x31, 0x35, 0x2e, 0x31, 0x39, 0x37, 0x20, 0x33, 0x2e, 0x39,
+	0x35, 0x34, 0x20, 0x31, 0x35, 0x2e, 0x30, 0x32, 0x33, 0x20, 0x32, 0x2e, 0x34, 0x38, 0x39, 0x20,
+	0x43, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x35, 0x32, 0x20, 0x31, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x31,
+	0x34, 0x2e, 0x37, 0x33, 0x37, 0x20, 0x30, 0x2e, 0x38, 0x31, 0x39, 0x20, 0x31, 0x34, 0x2e, 0x34,
+	0x39, 0x34, 0x20, 0x30, 0x2e, 0x34, 0x39, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x2e, 0x33, 0x37,
+	0x33, 0x20, 0x30, 0x2e, 0x33, 0x33, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x30, 0x34, 0x38, 0x20, 0x30,
+	0x2e, 0x33, 0x37, 0x32, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x34, 0x31, 0x20, 0x30, 0x2e, 0x36, 0x37,
+	0x35, 0x20, 0x43, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x33, 0x38, 0x20, 0x30, 0x2e, 0x39, 0x37, 0x38,
+	0x20, 0x31, 0x33, 0x2e, 0x37, 0x38, 0x36, 0x20, 0x31, 0x2e, 0x31, 0x33, 0x31, 0x20, 0x31, 0x33,
+	0x2e, 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x32, 0x33, 0x20, 0x43, 0x20, 0x31, 0x33, 0x2e, 0x38,
+	0x36, 0x36, 0x20, 0x32, 0x2e, 0x33, 0x31, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x34, 0x38, 0x32, 0x20,
+	0x34, 0x2e, 0x30, 0x35, 0x31, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x39, 0x37, 0x20, 0x34, 0x2e, 0x39,
+	0x37, 0x39, 0x20, 0x43, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x30, 0x33, 0x20, 0x35, 0x2e, 0x35, 0x34,
+	0x35, 0x20, 0x31, 0x31, 0x2e, 0x36, 0x32, 0x37, 0x20, 0x35, 0x2e, 0x38, 0x36, 0x37, 0x20, 0x31,
+	0x30, 0x2e, 0x38, 0x31, 0x38, 0x20, 0x36, 0x2e, 0x31, 0x38, 0x31, 0x20, 0x5a, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x61, 0x72, 0x72, 0x5f, 0x6b, 0x61,
+	0x64, 0x5f, 0x6f, 0x66, 0x66, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x37, 0x61, 0x30, 0x64, 0x30, 0x64, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75,
+	0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_status_conn_kad_ok_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x77, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x63, 0x60, 0xa0, 0x37, 0xe0,
+	0x0b, 0x72, 0xfd, 0x2f, 0xec, 0xe9, 0xfc, 0x9f, 0x22, 0x43, 0x9c, 0xff, 0xd8, 0xff, 0x37, 0x5c,
+	0xe9, 0xf8, 0x9f, 0x81, 0x81, 0x81, 0x81, 0x89, 0x14, 0x4d, 0xc8, 0xb4, 0x50, 0xf0, 0x3f, 0x06,
+	0x92, 0x0c, 0x60, 0x60, 0x60, 0x60, 0xd0, 0x3a, 0xad, 0x05, 0x77, 0xfa, 0xa3, 0xce, 0xbf, 0x0c,
+	0x0c, 0x0c, 0x0c, 0x0c, 0x8c, 0xa4, 0xba, 0x00, 0x06, 0xf6, 0xb2, 0x1c, 0x64, 0x64, 0x60, 0x60,
+	0x60, 0x60, 0x21, 0xc5, 0x05, 0x0c, 0x0c, 0x0c, 0x0c, 0xcf, 0xcf, 0xbf, 0x66, 0xf8, 0xba, 0x8d,
+	0x15, 0xce, 0x27, 0xd9, 0x00, 0x49, 0x43, 0x51, 0x06, 0x06, 0x43, 0x06, 0x86, 0xef, 0x8f, 0xf4,
+	0xff, 0xbf, 0x9a, 0x7b, 0x91, 0x68, 0x1f, 0x8c, 0x82, 0xe1, 0x0d, 0x00, 0x87, 0x6f, 0x21, 0x0b,
+	0x81, 0xf0, 0x54, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+static const unsigned char icon_status_conn_kad_ok_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x72,
+	0x72, 0x5f, 0x6b, 0x61, 0x64, 0x5f, 0x6f, 0x6b, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35,
+	0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x30,
+	0x66, 0x66, 0x63, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x34,
+	0x64, 0x66, 0x66, 0x34, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20,
+	0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x32, 0x30, 0x63,
+	0x65, 0x33, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e,
+	0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x31, 0x38, 0x20, 0x36, 0x2e, 0x31, 0x38, 0x31,
+	0x20, 0x4c, 0x20, 0x39, 0x2e, 0x32, 0x35, 0x38, 0x20, 0x34, 0x2e, 0x36, 0x37, 0x32, 0x20, 0x43,
+	0x20, 0x39, 0x2e, 0x31, 0x38, 0x35, 0x20, 0x34, 0x2e, 0x36, 0x31, 0x39, 0x20, 0x39, 0x2e, 0x30,
+	0x39, 0x38, 0x20, 0x34, 0x2e, 0x35, 0x38, 0x33, 0x20, 0x39, 0x2e, 0x30, 0x31, 0x39, 0x20, 0x34,
+	0x2e, 0x35, 0x39, 0x36, 0x20, 0x43, 0x20, 0x38, 0x2e, 0x38, 0x32, 0x35, 0x20, 0x34, 0x2e, 0x36,
+	0x33, 0x35, 0x20, 0x38, 0x2e, 0x36, 0x37, 0x38, 0x20, 0x34, 0x2e, 0x38, 0x31, 0x35, 0x20, 0x38,
+	0x2e, 0x36, 0x38, 0x32, 0x20, 0x34, 0x2e, 0x39, 0x37, 0x33, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x35,
+	0x36, 0x32, 0x20, 0x31, 0x31, 0x2e, 0x33, 0x32, 0x20, 0x4c, 0x20, 0x38, 0x2e, 0x35, 0x37, 0x36,
+	0x20, 0x31, 0x31, 0x2e, 0x33, 0x36, 0x34, 0x20, 0x43, 0x20, 0x38, 0x2e, 0x35, 0x39, 0x20, 0x31,
+	0x31, 0x2e, 0x35, 0x33, 0x33, 0x20, 0x38, 0x2e, 0x37, 0x36, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x36,
+	0x30, 0x36, 0x20, 0x38, 0x2e, 0x39, 0x33, 0x34, 0x20, 0x31, 0x31, 0x2e, 0x35, 0x35, 0x31, 0x20,
+	0x4c, 0x20, 0x31, 0x35, 0x2e, 0x33, 0x31, 0x34, 0x20, 0x39, 0x2e, 0x34, 0x30, 0x39, 0x20, 0x43,
+	0x20, 0x31, 0x35, 0x2e, 0x34, 0x31, 0x31, 0x20, 0x39, 0x2e, 0x33, 0x38, 0x35, 0x20, 0x31, 0x35,
+	0x2e, 0x35, 0x20, 0x39, 0x2e, 0x33, 0x32, 0x31, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x35, 0x37, 0x20,
+	0x39, 0x2e, 0x32, 0x32, 0x35, 0x20, 0x43, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x34, 0x38, 0x20, 0x39,
+	0x2e, 0x30, 0x36, 0x31, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x38, 0x37, 0x20, 0x38, 0x2e, 0x38, 0x37,
+	0x31, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x36, 0x31, 0x20, 0x38, 0x2e, 0x38, 0x31, 0x32, 0x20, 0x4c,
+	0x20, 0x31, 0x33, 0x2e, 0x36, 0x35, 0x36, 0x20, 0x38, 0x2e, 0x31, 0x31, 0x36, 0x20, 0x43, 0x20,
+	0x31, 0x33, 0x2e, 0x39, 0x30, 0x38, 0x20, 0x37, 0x2e, 0x37, 0x32, 0x31, 0x20, 0x31, 0x34, 0x2e,
+	0x31, 0x36, 0x31, 0x20, 0x37, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x33, 0x36, 0x31, 0x20,
+	0x36, 0x2e, 0x37, 0x37, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x2e, 0x38, 0x38, 0x37, 0x20, 0x35,
+	0x2e, 0x35, 0x31, 0x31, 0x20, 0x31, 0x35, 0x2e, 0x31, 0x39, 0x37, 0x20, 0x33, 0x2e, 0x39, 0x35,
+	0x34, 0x20, 0x31, 0x35, 0x2e, 0x30, 0x32, 0x33, 0x20, 0x32, 0x2e, 0x34, 0x38, 0x39, 0x20, 0x43,
+	0x20, 0x31, 0x34, 0x2e, 0x38, 0x35, 0x32, 0x20, 0x31, 0x2e, 0x30, 0x32, 0x32, 0x20, 0x31, 0x34,
+	0x2e, 0x37, 0x33, 0x37, 0x20, 0x30, 0x2e, 0x38, 0x31, 0x39, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x39,
+	0x34, 0x20, 0x30, 0x2e, 0x34, 0x39, 0x34, 0x20, 0x43, 0x20, 0x31, 0x34, 0x2e, 0x33, 0x37, 0x33,
+	0x20, 0x30, 0x2e, 0x33, 0x33, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x30, 0x34, 0x38, 0x20, 0x30, 0x2e,
+	0x33, 0x37, 0x32, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x34, 0x31, 0x20, 0x30, 0x2e, 0x36, 0x37, 0x35,
+	0x20, 0x43, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x33, 0x38, 0x20, 0x30, 0x2e, 0x39, 0x37, 0x38, 0x20,
+	0x31, 0x33, 0x2e, 0x37, 0x38, 0x36, 0x20, 0x31, 0x2e, 0x31, 0x33, 0x31, 0x20, 0x31, 0x33, 0x2e,
+	0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x32, 0x33, 0x20, 0x43, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x36,
+	0x36, 0x20, 0x32, 0x2e, 0x33, 0x31, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x34, 0x38, 0x32, 0x20, 0x34,
+	0x2e, 0x30, 0x35, 0x31, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x39, 0x37, 0x20, 0x34, 0x2e, 0x39, 0x37,
+	0x39, 0x20, 0x43, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x30, 0x33, 0x20, 0x35, 0x2e, 0x35, 0x34, 0x35,
+	0x20, 0x31, 0x31, 0x2e, 0x36, 0x32, 0x37, 0x20, 0x35, 0x2e, 0x38, 0x36, 0x37, 0x20, 0x31, 0x30,
+	0x2e, 0x38, 0x31, 0x38, 0x20, 0x36, 0x2e, 0x31, 0x38, 0x31, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x61, 0x72, 0x72, 0x5f, 0x6b, 0x61, 0x64,
+	0x5f, 0x6f, 0x6b, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x30,
+	0x63, 0x33, 0x66, 0x31, 0x63, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69,
+	0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_status_log_info_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x08, 0x06, 0x00, 0x00, 0x00, 0x3b, 0xd6, 0x95,
+	0x4a, 0x00, 0x00, 0x00, 0x5a, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x63, 0x8c, 0x8e, 0xfa, 0xff,
+	0x9f, 0x81, 0x0c, 0xb0, 0x74, 0x19, 0x03, 0x03, 0x0b, 0x03, 0x03, 0x03, 0x83, 0x7f, 0x39, 0x79,
+	0x9a, 0x99, 0xf0, 0x29, 0x08, 0xd3, 0x87, 0x60, 0x5c, 0x00, 0xa7, 0xe6, 0xa2, 0x1d, 0x10, 0x5a,
+	0xa6, 0x93, 0x0c, 0xcd, 0x30, 0x8d, 0x7d, 0x1e, 0x64, 0x68, 0xee, 0xf3, 0x60, 0x60, 0x78, 0x52,
+	0x4e, 0xa1, 0xb3, 0xf1, 0x01, 0xbc, 0xce, 0x1e, 0xa9, 0x9a, 0x69, 0x16, 0xcf, 0x2c, 0xb8, 0x24,
+	0xf0, 0x69, 0x82, 0x01, 0x46, 0x06, 0x06, 0xf2, 0x72, 0x15, 0x03, 0x03, 0x03, 0x03, 0x00, 0x40,
+	0xda, 0x13, 0x58, 0xce, 0x1f, 0xc4, 0x33, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+	0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_log_info_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x35, 0x20, 0x31, 0x35, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x79, 0x3d, 0x22,
+	0x30, 0x2e, 0x38, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x33, 0x2e, 0x34,
+	0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x31, 0x33, 0x2e, 0x34, 0x22, 0x20,
+	0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23,
+	0x61, 0x61, 0x64, 0x31, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x30, 0x30, 0x30, 0x30, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x74, 0x68, 0x65, 0x20, 0x27, 0x69, 0x27, 0x20, 0x67, 0x6c, 0x79,
+	0x70, 0x68, 0x2c, 0x20, 0x61, 0x73, 0x20, 0x70, 0x61, 0x74, 0x68, 0x73, 0x20, 0x28, 0x64, 0x6f,
+	0x74, 0x20, 0x2b, 0x20, 0x73, 0x65, 0x72, 0x69, 0x66, 0x20, 0x73, 0x74, 0x65, 0x6d, 0x29, 0x20,
+	0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x36,
+	0x2e, 0x32, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x32, 0x2e, 0x35, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22,
+	0x32, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x30, 0x30, 0x30, 0x30, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x35, 0x2e, 0x36, 0x20, 0x35,
+	0x2e, 0x39, 0x20, 0x48, 0x38, 0x2e, 0x37, 0x20, 0x56, 0x31, 0x31, 0x20, 0x48, 0x39, 0x2e, 0x36,
+	0x20, 0x56, 0x31, 0x32, 0x2e, 0x34, 0x20, 0x48, 0x35, 0x2e, 0x36, 0x20, 0x56, 0x31, 0x31, 0x20,
+	0x48, 0x36, 0x2e, 0x35, 0x20, 0x56, 0x37, 0x2e, 0x33, 0x20, 0x48, 0x35, 0x2e, 0x36, 0x20, 0x5a,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x30, 0x30, 0x30, 0x30, 0x66, 0x66, 0x22,
+	0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_status_speed_both_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0x9c, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xa5, 0x93, 0xb1, 0x0e, 0xc2,
+	0x30, 0x0c, 0x44, 0x0f, 0xc4, 0xda, 0xb1, 0x43, 0x22, 0x26, 0x8f, 0xac, 0xf7, 0x4f, 0x5e, 0xfb,
+	0x9f, 0x48, 0xde, 0x98, 0x3a, 0x64, 0x8d, 0xf8, 0x0a, 0x33, 0xa0, 0x22, 0x44, 0x53, 0xc9, 0x24,
+	0x37, 0x9e, 0x7c, 0xcf, 0x56, 0xec, 0x00, 0x51, 0x2d, 0xf0, 0x70, 0x6d, 0x33, 0xec, 0xf0, 0x3e,
+	0xc8, 0x16, 0xbe, 0xf7, 0x40, 0xbe, 0xc3, 0xcb, 0xbf, 0x90, 0xdf, 0xf0, 0xe6, 0x75, 0x4d, 0x02,
+	0x40, 0x55, 0x9d, 0xe4, 0x2e, 0x74, 0x8e, 0x02, 0x44, 0x04, 0x66, 0x76, 0x0a, 0x01, 0x52, 0x4a,
+	0x4e, 0xd2, 0x53, 0x4a, 0x9f, 0x8e, 0xa5, 0x94, 0x26, 0xf8, 0xd2, 0x32, 0x73, 0xce, 0x20, 0x09,
+	0x00, 0xa8, 0xb5, 0x82, 0xa4, 0x9b, 0x59, 0x1c, 0x30, 0x5d, 0x27, 0x88, 0x08, 0xd6, 0xe7, 0x0a,
+	0x18, 0x9a, 0xa3, 0xef, 0x35, 0xc3, 0x71, 0x83, 0x63, 0x7e, 0xbf, 0xae, 0xaa, 0x7a, 0xcb, 0x3f,
+	0xd6, 0xd1, 0xda, 0x1e, 0x23, 0xbb, 0x1f, 0xbe, 0xbe, 0xe1, 0xfb, 0x1f, 0xfe, 0x81, 0x01, 0xbd,
+	0x00, 0x92, 0x8e, 0x74, 0x5e, 0x0a, 0xbb, 0x0e, 0xf6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+	0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_speed_both_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x75,
+	0x5f, 0x62, 0x6f, 0x74, 0x68, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x79,
+	0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x39, 0x66, 0x66, 0x63,
+	0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x34, 0x33, 0x66, 0x63,
+	0x33, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x31, 0x64, 0x61, 0x33, 0x32, 0x63,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64,
+	0x3d, 0x22, 0x73, 0x64, 0x5f, 0x62, 0x6f, 0x74, 0x68, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35,
+	0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64,
+	0x39, 0x66, 0x66, 0x63, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34,
+	0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x34, 0x33, 0x66, 0x63, 0x33, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x31, 0x64,
+	0x61, 0x33, 0x32, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69,
+	0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x75,
+	0x70, 0x6c, 0x6f, 0x61, 0x64, 0x20, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2c, 0x20, 0x74, 0x6f, 0x70,
+	0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65,
+	0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x38, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x35,
+	0x2e, 0x33, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x35, 0x22,
+	0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x39, 0x30, 0x39, 0x30, 0x39, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x33, 0x66, 0x33, 0x66, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x39, 0x2e,
+	0x31, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x35, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d,
+	0x22, 0x33, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x63, 0x38, 0x63, 0x38, 0x63,
+	0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x31, 0x30, 0x20, 0x30, 0x2e, 0x33, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x35, 0x2e,
+	0x34, 0x35, 0x20, 0x48, 0x35, 0x2e, 0x34, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x73, 0x75, 0x5f, 0x62, 0x6f, 0x74, 0x68, 0x29, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x34, 0x35, 0x38, 0x32, 0x61, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30,
+	0x2e, 0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65,
+	0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x20, 0x61,
+	0x72, 0x72, 0x6f, 0x77, 0x2c, 0x20, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x20, 0x6c, 0x65, 0x66,
+	0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d,
+	0x22, 0x34, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x37, 0x2e, 0x32, 0x35, 0x22, 0x20,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x35, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x23, 0x39, 0x30, 0x39, 0x30, 0x39, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x33, 0x66, 0x33, 0x66, 0x33, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x35, 0x2e, 0x31, 0x35, 0x22, 0x20,
+	0x79, 0x3d, 0x22, 0x37, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x37, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x63, 0x38, 0x63, 0x38, 0x63, 0x38, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x36, 0x20, 0x31,
+	0x35, 0x2e, 0x37, 0x20, 0x4c, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x48,
+	0x31, 0x30, 0x2e, 0x36, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72,
+	0x6c, 0x28, 0x23, 0x73, 0x64, 0x5f, 0x62, 0x6f, 0x74, 0x68, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x34, 0x35, 0x38, 0x32, 0x61, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69,
+	0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76,
+	0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_status_speed_down_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0xad, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x9d, 0xd1, 0xb1, 0x11, 0x83,
+	0x30, 0x0c, 0x40, 0xd1, 0x9f, 0x5c, 0x16, 0x70, 0x41, 0x61, 0x97, 0x2a, 0x69, 0xb5, 0x06, 0x73,
+	0xb0, 0x42, 0x8e, 0x8e, 0xad, 0x98, 0xc2, 0x2b, 0xd0, 0x52, 0x30, 0x84, 0xd2, 0x24, 0x9c, 0xe1,
+	0x94, 0x3b, 0x1b, 0x95, 0x3a, 0xff, 0xa7, 0xc2, 0x50, 0x39, 0x13, 0x58, 0xed, 0x5b, 0x37, 0x36,
+	0xb0, 0x5b, 0xc8, 0x2f, 0x5e, 0xee, 0x20, 0x65, 0x3c, 0xb5, 0x22, 0xd7, 0xb8, 0xef, 0xfb, 0x76,
+	0xa4, 0x9c, 0x71, 0x1c, 0xdd, 0xe0, 0x59, 0x0b, 0x88, 0x88, 0xbb, 0x77, 0x81, 0x18, 0xa3, 0xa9,
+	0xaa, 0xc5, 0x18, 0x8f, 0xab, 0xeb, 0xba, 0xba, 0xc0, 0xcb, 0x5b, 0xa6, 0x94, 0x50, 0x55, 0x00,
+	0xb6, 0x6d, 0x43, 0x55, 0x2d, 0xe7, 0x5c, 0x0f, 0x84, 0x10, 0x10, 0x91, 0xe3, 0x6a, 0xce, 0xf9,
+	0xe1, 0xd6, 0x27, 0xa0, 0xc3, 0xe8, 0x80, 0x9d, 0x23, 0x16, 0x91, 0xd3, 0x9e, 0x9d, 0xbf, 0x10,
+	0xcc, 0x18, 0x86, 0xb1, 0x60, 0x61, 0x08, 0xa6, 0xaa, 0x16, 0x86, 0x60, 0x2c, 0xdf, 0xfd, 0x5c,
+	0xf3, 0x6d, 0x05, 0xc2, 0x9b, 0xc6, 0xd8, 0x43, 0x9a, 0xe3, 0x2b, 0x72, 0x2b, 0x2e, 0x91, 0x8a,
+	0xf9, 0x00, 0x80, 0x78, 0x72, 0x9a, 0x97, 0x38, 0x2a, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
+	0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_speed_down_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x75,
+	0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x79,
+	0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x63, 0x39, 0x63,
+	0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x32, 0x32, 0x35,
+	0x32, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x38, 0x31, 0x31, 0x31, 0x31,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64,
+	0x3d, 0x22, 0x73, 0x64, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35,
+	0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64,
+	0x39, 0x66, 0x66, 0x63, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34,
+	0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x34, 0x33, 0x66, 0x63, 0x33, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x31, 0x64,
+	0x61, 0x33, 0x32, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69,
+	0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x75,
+	0x70, 0x6c, 0x6f, 0x61, 0x64, 0x20, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2c, 0x20, 0x74, 0x6f, 0x70,
+	0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65,
+	0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x38, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x35,
+	0x2e, 0x33, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x35, 0x22,
+	0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x39, 0x30, 0x39, 0x30, 0x39, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x33, 0x66, 0x33, 0x66, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x39, 0x2e,
+	0x31, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x35, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d,
+	0x22, 0x33, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x63, 0x38, 0x63, 0x38, 0x63,
+	0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x31, 0x30, 0x20, 0x30, 0x2e, 0x33, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x35, 0x2e,
+	0x34, 0x35, 0x20, 0x48, 0x35, 0x2e, 0x34, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x73, 0x75, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x29, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x30, 0x64, 0x30, 0x64, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30,
+	0x2e, 0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65,
+	0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x20, 0x61,
+	0x72, 0x72, 0x6f, 0x77, 0x2c, 0x20, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x20, 0x6c, 0x65, 0x66,
+	0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d,
+	0x22, 0x34, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x37, 0x2e, 0x32, 0x35, 0x22, 0x20,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x35, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x23, 0x39, 0x30, 0x39, 0x30, 0x39, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x33, 0x66, 0x33, 0x66, 0x33, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x35, 0x2e, 0x31, 0x35, 0x22, 0x20,
+	0x79, 0x3d, 0x22, 0x37, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x37, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x63, 0x38, 0x63, 0x38, 0x63, 0x38, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x36, 0x20, 0x31,
+	0x35, 0x2e, 0x37, 0x20, 0x4c, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x48,
+	0x31, 0x30, 0x2e, 0x36, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72,
+	0x6c, 0x28, 0x23, 0x73, 0x64, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x34, 0x35, 0x38, 0x32, 0x61, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69,
+	0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76,
+	0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_status_speed_idle_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0xc7, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x9d, 0x93, 0x2d, 0x12, 0xc2,
+	0x30, 0x10, 0x85, 0x3f, 0x18, 0x2e, 0x10, 0x99, 0xca, 0xc8, 0xda, 0xbd, 0x40, 0x25, 0x82, 0x73,
+	0xc4, 0x72, 0x04, 0x90, 0x15, 0xbd, 0x14, 0x58, 0x26, 0x17, 0xa8, 0xa8, 0xa4, 0xc7, 0x58, 0x04,
+	0x6d, 0x86, 0x96, 0xf4, 0xf7, 0x99, 0x24, 0x3b, 0xfb, 0xbe, 0x64, 0xde, 0x4e, 0x60, 0xa5, 0x2a,
+	0xd0, 0xb5, 0xbd, 0x7f, 0xba, 0x81, 0xea, 0x17, 0xb0, 0x1d, 0xd2, 0x9b, 0x1f, 0x13, 0x90, 0xd3,
+	0x92, 0xf9, 0x0e, 0x3c, 0x81, 0x57, 0x57, 0x53, 0xe0, 0x10, 0x97, 0x79, 0xc5, 0x9b, 0x2b, 0xd0,
+	0x3c, 0xcf, 0xb5, 0x9a, 0x79, 0x49, 0x12, 0x00, 0xa8, 0x88, 0x28, 0xa0, 0xde, 0xfb, 0xb8, 0x67,
+	0x47, 0x1e, 0x5a, 0x96, 0x65, 0xd2, 0x74, 0x4c, 0x75, 0x5b, 0x6b, 0x55, 0x44, 0xd4, 0x5a, 0x1b,
+	0x0d, 0x4d, 0xd3, 0x24, 0xc9, 0xc9, 0x10, 0xb3, 0x2c, 0x43, 0x44, 0x00, 0x68, 0xdb, 0x16, 0x11,
+	0x21, 0x84, 0xb0, 0x1e, 0x60, 0x8c, 0xc1, 0x39, 0xc7, 0xbb, 0xae, 0x01, 0x08, 0x21, 0x2c, 0x26,
+	0x8e, 0x01, 0x75, 0xa0, 0xa6, 0x0b, 0xc8, 0x7b, 0xaf, 0x74, 0xe7, 0x9f, 0xfa, 0xb4, 0xae, 0xe7,
+	0xf3, 0x60, 0x6c, 0x22, 0x32, 0x18, 0xdb, 0xa5, 0x28, 0x96, 0x53, 0x1f, 0x43, 0x36, 0x99, 0x53,
+	0x90, 0xcd, 0xe6, 0x31, 0x64, 0x97, 0xb9, 0xd7, 0xda, 0xef, 0xfb, 0x01, 0x7a, 0xf6, 0x7d, 0x1e,
+	0xca, 0xe3, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+static const unsigned char icon_status_speed_idle_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x75,
+	0x5f, 0x69, 0x64, 0x6c, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x79,
+	0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x63, 0x39, 0x63,
+	0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x32, 0x32, 0x35,
+	0x32, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x38, 0x31, 0x31, 0x31, 0x31,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64,
+	0x3d, 0x22, 0x73, 0x64, 0x5f, 0x69, 0x64, 0x6c, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35,
+	0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66,
+	0x66, 0x63, 0x39, 0x63, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34,
+	0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x66, 0x32, 0x32, 0x35, 0x32, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x38,
+	0x31, 0x31, 0x31, 0x31, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69,
+	0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x75,
+	0x70, 0x6c, 0x6f, 0x61, 0x64, 0x20, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2c, 0x20, 0x74, 0x6f, 0x70,
+	0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65,
+	0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x38, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x35,
+	0x2e, 0x33, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x35, 0x22,
+	0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x39, 0x30, 0x39, 0x30, 0x39, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x33, 0x66, 0x33, 0x66, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x39, 0x2e,
+	0x31, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x35, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d,
+	0x22, 0x33, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x63, 0x38, 0x63, 0x38, 0x63,
+	0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x31, 0x30, 0x20, 0x30, 0x2e, 0x33, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x35, 0x2e,
+	0x34, 0x35, 0x20, 0x48, 0x35, 0x2e, 0x34, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x73, 0x75, 0x5f, 0x69, 0x64, 0x6c, 0x65, 0x29, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x30, 0x64, 0x30, 0x64, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30,
+	0x2e, 0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65,
+	0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x20, 0x61,
+	0x72, 0x72, 0x6f, 0x77, 0x2c, 0x20, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x20, 0x6c, 0x65, 0x66,
+	0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d,
+	0x22, 0x34, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x37, 0x2e, 0x32, 0x35, 0x22, 0x20,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x35, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x23, 0x39, 0x30, 0x39, 0x30, 0x39, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x33, 0x66, 0x33, 0x66, 0x33, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x35, 0x2e, 0x31, 0x35, 0x22, 0x20,
+	0x79, 0x3d, 0x22, 0x37, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x37, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x63, 0x38, 0x63, 0x38, 0x63, 0x38, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x36, 0x20, 0x31,
+	0x35, 0x2e, 0x37, 0x20, 0x4c, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x48,
+	0x31, 0x30, 0x2e, 0x36, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72,
+	0x6c, 0x28, 0x23, 0x73, 0x64, 0x5f, 0x69, 0x64, 0x6c, 0x65, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x30, 0x64, 0x30, 0x64, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69,
+	0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76,
+	0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_status_speed_up_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x00, 0xae, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x9d, 0xce, 0xbb, 0x11, 0x83,
+	0x30, 0x10, 0x45, 0xd1, 0x6b, 0x8f, 0x1b, 0x50, 0x28, 0xc2, 0x0d, 0x49, 0xb7, 0x09, 0x2a, 0x21,
+	0x75, 0x48, 0x4a, 0x45, 0x6e, 0xc0, 0x35, 0xa8, 0x05, 0x52, 0x42, 0x4a, 0x78, 0x4e, 0x80, 0xc1,
+	0x7c, 0x66, 0x84, 0x36, 0xd3, 0x8e, 0xee, 0x91, 0x20, 0x77, 0x7a, 0x94, 0x7d, 0xf7, 0x34, 0x16,
+	0x2a, 0x43, 0x96, 0xf8, 0x53, 0x82, 0x6c, 0xe3, 0xfe, 0x2e, 0xb2, 0x8b, 0xeb, 0xba, 0x2e, 0x40,
+	0x36, 0xd3, 0xb6, 0xad, 0xdc, 0xfd, 0x10, 0x3d, 0x73, 0x01, 0x33, 0x23, 0xa5, 0xf4, 0xc8, 0x02,
+	0x62, 0x8c, 0x72, 0x77, 0xc5, 0x18, 0xd7, 0x17, 0x87, 0x61, 0x38, 0x85, 0x5f, 0x67, 0xcb, 0xaa,
+	0xaa, 0x70, 0x77, 0x00, 0xc6, 0x71, 0xc4, 0xdd, 0x95, 0x52, 0xca, 0x07, 0x42, 0x08, 0x98, 0xd9,
+	0xfa, 0xea, 0xd9, 0xd7, 0x0f, 0x40, 0x00, 0x05, 0x60, 0x82, 0x35, 0x36, 0xb3, 0xbf, 0xfd, 0x04,
+	0x97, 0x10, 0xef, 0xa6, 0x91, 0x40, 0x5f, 0x50, 0x07, 0x72, 0x77, 0x75, 0xf3, 0x59, 0xf3, 0xee,
+	0x32, 0xbe, 0x42, 0x6e, 0xc5, 0xcb, 0x74, 0x73, 0x54, 0x14, 0xef, 0x91, 0xa2, 0x78, 0x8b, 0xe4,
+	0xdc, 0xfb, 0x01, 0xf0, 0xb2, 0x77, 0xa2, 0xff, 0x51, 0xaf, 0x92, 0x00, 0x00, 0x00, 0x00, 0x49,
+	0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_speed_up_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x75,
+	0x5f, 0x75, 0x70, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22,
+	0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d,
+	0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70,
+	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x39, 0x66, 0x66, 0x63, 0x66, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x34, 0x33, 0x66, 0x63, 0x33, 0x66,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x31, 0x64, 0x61, 0x33, 0x32, 0x63, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72,
+	0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e,
+	0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22,
+	0x73, 0x64, 0x5f, 0x75, 0x70, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x79,
+	0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x63, 0x39, 0x63,
+	0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x32, 0x32, 0x35,
+	0x32, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x38, 0x31, 0x31, 0x31, 0x31,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65,
+	0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x75, 0x70, 0x6c, 0x6f, 0x61,
+	0x64, 0x20, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2c, 0x20, 0x74, 0x6f, 0x70, 0x20, 0x72, 0x69, 0x67,
+	0x68, 0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78,
+	0x3d, 0x22, 0x38, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x35, 0x2e, 0x33, 0x35, 0x22,
+	0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x35, 0x22, 0x20, 0x68, 0x65, 0x69,
+	0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x23, 0x39, 0x30, 0x39, 0x30, 0x39, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x33, 0x66, 0x33, 0x66, 0x33, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x39, 0x2e, 0x31, 0x35, 0x22, 0x20,
+	0x79, 0x3d, 0x22, 0x35, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x37, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x63, 0x38, 0x63, 0x38, 0x63, 0x38, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x30, 0x20,
+	0x30, 0x2e, 0x33, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x35, 0x2e, 0x34, 0x35, 0x20, 0x48,
+	0x35, 0x2e, 0x34, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c,
+	0x28, 0x23, 0x73, 0x75, 0x5f, 0x75, 0x70, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x3d, 0x22, 0x23, 0x31, 0x34, 0x35, 0x38, 0x32, 0x61, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22,
+	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20,
+	0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x20, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2c, 0x20,
+	0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x20, 0x6c, 0x65, 0x66, 0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x34, 0x2e, 0x37, 0x35, 0x22,
+	0x20, 0x79, 0x3d, 0x22, 0x37, 0x2e, 0x32, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x32, 0x2e, 0x35, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x2e,
+	0x34, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x39, 0x30, 0x39, 0x30, 0x39,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x33, 0x66,
+	0x33, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68,
+	0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74,
+	0x20, 0x78, 0x3d, 0x22, 0x35, 0x2e, 0x31, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x37, 0x2e, 0x34,
+	0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x68,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x23, 0x63, 0x38, 0x63, 0x38, 0x63, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x37, 0x20, 0x4c, 0x31,
+	0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x35, 0x35, 0x20, 0x48, 0x31, 0x30, 0x2e, 0x36, 0x20, 0x5a,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x73, 0x64, 0x5f,
+	0x75, 0x70, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61,
+	0x30, 0x64, 0x30, 0x64, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_status_users_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+	0x61, 0x00, 0x00, 0x01, 0xfe, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x85, 0x93, 0xbd, 0x6b, 0x13,
+	0x71, 0x18, 0xc7, 0x3f, 0xa9, 0x21, 0x91, 0xb4, 0x21, 0x95, 0x4b, 0xd2, 0x96, 0xa4, 0xd8, 0xc1,
+	0xfa, 0x52, 0x0b, 0x29, 0xf4, 0x0c, 0x48, 0xc4, 0x49, 0x8b, 0x93, 0x83, 0x28, 0xe2, 0x22, 0xb8,
+	0xb9, 0xc4, 0xcd, 0xff, 0xc2, 0x3f, 0xa0, 0x9b, 0xe0, 0x52, 0x70, 0x10, 0xa1, 0x62, 0x21, 0x53,
+	0x87, 0x8a, 0x58, 0x33, 0x34, 0xb4, 0x43, 0x8b, 0xa9, 0x90, 0xda, 0xbb, 0xbc, 0xc7, 0x5c, 0xbd,
+	0x24, 0x77, 0x97, 0x4b, 0xce, 0x21, 0xe6, 0xec, 0x35, 0x27, 0x3e, 0xe3, 0xf3, 0x7c, 0x9f, 0xcf,
+	0xef, 0x79, 0xf9, 0x3d, 0x9e, 0x66, 0xb3, 0x89, 0x9b, 0x89, 0xe9, 0x94, 0xd5, 0x6f, 0xf7, 0xe8,
+	0xb7, 0x7b, 0x00, 0xec, 0xac, 0x7d, 0xf5, 0xb8, 0xe9, 0x3c, 0x6e, 0x00, 0x31, 0x9d, 0xb2, 0xae,
+	0xde, 0xb9, 0x07, 0xb3, 0x21, 0xf2, 0x6a, 0x89, 0xfd, 0xcd, 0x2c, 0xf1, 0xad, 0x32, 0x7b, 0x99,
+	0xdc, 0x08, 0x64, 0xec, 0x5f, 0xc9, 0xeb, 0x4f, 0x5f, 0xf1, 0x68, 0x66, 0x99, 0xbb, 0x91, 0x30,
+	0x88, 0x31, 0x8e, 0x6f, 0x4d, 0xb1, 0xb8, 0x92, 0xb0, 0xfe, 0x0b, 0x00, 0x60, 0x36, 0x44, 0xe6,
+	0xe8, 0x0b, 0x85, 0x5f, 0x45, 0x00, 0x6e, 0x86, 0x74, 0x10, 0x63, 0xae, 0x52, 0xef, 0x59, 0x87,
+	0xaa, 0xf6, 0xc9, 0xab, 0x25, 0x3e, 0xc8, 0x1f, 0x01, 0x90, 0x3b, 0x45, 0x47, 0x7c, 0x58, 0xc5,
+	0xb0, 0x9d, 0x11, 0x40, 0xab, 0x65, 0xa1, 0xe7, 0x76, 0x79, 0x7f, 0x7d, 0x92, 0xb8, 0x7f, 0x30,
+	0xc0, 0xcf, 0x8a, 0x1f, 0xb2, 0x12, 0x00, 0xd5, 0xcb, 0x93, 0x8c, 0xab, 0x26, 0x8b, 0x2b, 0x09,
+	0x6b, 0x2f, 0x93, 0xf3, 0x38, 0x00, 0x62, 0x3a, 0x65, 0x99, 0x41, 0x2f, 0xa1, 0xf5, 0x23, 0x8a,
+	0xa6, 0x87, 0x1f, 0x57, 0x84, 0x41, 0x20, 0x2b, 0x11, 0xdf, 0x2a, 0x23, 0x27, 0x23, 0x8c, 0x09,
+	0x01, 0xf4, 0x4a, 0x8b, 0x80, 0xac, 0x3a, 0x5b, 0x10, 0xd3, 0x29, 0x4b, 0x4f, 0x08, 0x78, 0x4e,
+	0xba, 0x94, 0x27, 0xbc, 0x4c, 0x6f, 0x14, 0x60, 0xa3, 0x60, 0xc3, 0xe5, 0x64, 0x84, 0xd8, 0x5c,
+	0x80, 0xc6, 0x61, 0x0b, 0x3d, 0x3a, 0x0e, 0xd4, 0xfe, 0x02, 0xc4, 0x74, 0xca, 0x7a, 0xf0, 0xe2,
+	0x31, 0xe1, 0xf3, 0x02, 0x6f, 0xb2, 0xef, 0xa8, 0x04, 0xbd, 0x1c, 0x0b, 0x3e, 0x3b, 0x39, 0x3a,
+	0xe3, 0x67, 0x21, 0xec, 0x43, 0xa9, 0x77, 0xf1, 0xfe, 0xec, 0xa2, 0x47, 0x5d, 0x86, 0xf8, 0x70,
+	0xee, 0x3e, 0xaf, 0xf3, 0x6b, 0xf8, 0x9a, 0x5d, 0x16, 0x2e, 0x4d, 0xf1, 0x2c, 0xb1, 0x8c, 0xd4,
+	0x2e, 0x51, 0xd2, 0x2a, 0x04, 0x82, 0x7e, 0xaa, 0x54, 0x50, 0xea, 0x5d, 0xce, 0x69, 0x3d, 0xc7,
+	0xcc, 0xec, 0x35, 0x6e, 0x96, 0x3e, 0x51, 0xe9, 0x34, 0xd0, 0x0e, 0x54, 0x84, 0xd0, 0x05, 0x5e,
+	0xde, 0x7e, 0x4e, 0x72, 0x7e, 0x89, 0x6b, 0x17, 0xe7, 0x09, 0x4c, 0xf8, 0xed, 0x84, 0x61, 0xef,
+	0x23, 0x80, 0x9a, 0x56, 0x47, 0xee, 0x48, 0x68, 0x07, 0x4e, 0x81, 0x9b, 0x4d, 0x9f, 0x9a, 0x8d,
+	0xdd, 0x82, 0xd4, 0x1e, 0xec, 0xdb, 0x68, 0xe9, 0x00, 0x34, 0xf4, 0x26, 0x4d, 0x43, 0x71, 0x05,
+	0x9c, 0xfe, 0xd2, 0x76, 0x05, 0xdf, 0xd5, 0x82, 0x43, 0xb4, 0x5d, 0xdd, 0x41, 0x35, 0x4f, 0xa8,
+	0x1a, 0x65, 0x00, 0xcc, 0xba, 0x81, 0xf5, 0xd6, 0xa9, 0xb1, 0x2b, 0x30, 0x6b, 0x86, 0xc3, 0x29,
+	0x77, 0x24, 0xf6, 0x95, 0x6f, 0xd4, 0x35, 0x05, 0xe5, 0xb0, 0xc1, 0xee, 0xea, 0xb6, 0xeb, 0xeb,
+	0xf0, 0xe7, 0x1a, 0x97, 0x9e, 0xdc, 0xb0, 0xcc, 0xba, 0x61, 0x0b, 0xce, 0x1e, 0x8d, 0xdb, 0x15,
+	0x0e, 0xed, 0x37, 0x0e, 0xff, 0xe0, 0xe1, 0x2a, 0x9a, 0x39, 0xa5, 0x00, 0x00, 0x00, 0x00, 0x49,
+	0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_status_users_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x36, 0x20, 0x31, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, 0x42,
+	0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x36, 0x62, 0x63, 0x65, 0x37, 0x64, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x37, 0x62, 0x30, 0x34, 0x38, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x31, 0x37, 0x38, 0x30, 0x33, 0x61, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, 0x48,
+	0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x32, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22,
+	0x30, 0x2e, 0x33, 0x36, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x32, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x63, 0x32, 0x65, 0x66, 0x63, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x34, 0x36, 0x62, 0x38, 0x35, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x31, 0x37, 0x38, 0x30, 0x33, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21,
+	0x2d, 0x2d, 0x20, 0x62, 0x6f, 0x74, 0x68, 0x20, 0x61, 0x72, 0x6d, 0x73, 0x3a, 0x20, 0x72, 0x6f,
+	0x75, 0x6e, 0x64, 0x65, 0x64, 0x2c, 0x20, 0x61, 0x6e, 0x67, 0x6c, 0x65, 0x64, 0x20, 0x73, 0x6c,
+	0x69, 0x67, 0x68, 0x74, 0x6c, 0x79, 0x20, 0x6f, 0x75, 0x74, 0x77, 0x61, 0x72, 0x64, 0x20, 0x2d,
+	0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x35,
+	0x2e, 0x37, 0x33, 0x20, 0x37, 0x2e, 0x36, 0x35, 0x20, 0x43, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x38,
+	0x2e, 0x35, 0x39, 0x20, 0x32, 0x2e, 0x34, 0x36, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x33, 0x20, 0x31,
+	0x2e, 0x38, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x37, 0x34, 0x20, 0x43, 0x31, 0x2e, 0x35, 0x37, 0x20,
+	0x31, 0x35, 0x2e, 0x30, 0x33, 0x20, 0x32, 0x2e, 0x38, 0x33, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x39,
+	0x20, 0x33, 0x2e, 0x35, 0x39, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x34, 0x20, 0x43, 0x34, 0x2e, 0x33,
+	0x35, 0x20, 0x31, 0x32, 0x2e, 0x31, 0x20, 0x35, 0x2e, 0x33, 0x35, 0x20, 0x31, 0x30, 0x2e, 0x31,
+	0x31, 0x20, 0x36, 0x2e, 0x37, 0x34, 0x20, 0x38, 0x2e, 0x39, 0x34, 0x20, 0x5a, 0x22, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c,
+	0x28, 0x23, 0x75, 0x42, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23,
+	0x30, 0x66, 0x35, 0x61, 0x32, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75,
+	0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x31, 0x30, 0x2e, 0x32, 0x37, 0x20, 0x37, 0x2e, 0x36, 0x35, 0x20, 0x43, 0x31, 0x32,
+	0x2e, 0x32, 0x38, 0x20, 0x38, 0x2e, 0x35, 0x39, 0x20, 0x31, 0x33, 0x2e, 0x35, 0x34, 0x20, 0x31,
+	0x30, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x34, 0x2e, 0x31, 0x37, 0x20, 0x31, 0x33, 0x2e, 0x37, 0x34,
+	0x20, 0x43, 0x31, 0x34, 0x2e, 0x34, 0x33, 0x20, 0x31, 0x35, 0x2e, 0x30, 0x33, 0x20, 0x31, 0x33,
+	0x2e, 0x31, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x39, 0x20, 0x31, 0x32, 0x2e, 0x34, 0x31, 0x20,
+	0x31, 0x34, 0x2e, 0x34, 0x34, 0x20, 0x43, 0x31, 0x31, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x32, 0x2e,
+	0x31, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x35, 0x20, 0x31, 0x30, 0x2e, 0x31, 0x31, 0x20, 0x39, 0x2e,
+	0x32, 0x36, 0x20, 0x38, 0x2e, 0x39, 0x34, 0x20, 0x5a, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x75, 0x42,
+	0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x30, 0x66, 0x35, 0x61,
+	0x32, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68,
+	0x3d, 0x22, 0x30, 0x2e, 0x36, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c,
+	0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x74, 0x6f, 0x72, 0x73, 0x6f, 0x2c, 0x20,
+	0x66, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x20, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x3b, 0x20, 0x63, 0x75,
+	0x74, 0x20, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, 0x65,
+	0x20, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61,
+	0x72, 0x6d, 0x73, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x38, 0x2e, 0x30, 0x20, 0x36, 0x2e, 0x39, 0x35, 0x20, 0x43, 0x31, 0x30,
+	0x2e, 0x35, 0x32, 0x20, 0x36, 0x2e, 0x39, 0x35, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x38, 0x20, 0x38,
+	0x2e, 0x35, 0x39, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x38, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x36, 0x20,
+	0x4c, 0x31, 0x32, 0x2e, 0x31, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x51, 0x31, 0x32,
+	0x2e, 0x31, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x36, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x20, 0x31,
+	0x35, 0x2e, 0x32, 0x36, 0x20, 0x4c, 0x34, 0x2e, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x36, 0x20,
+	0x51, 0x33, 0x2e, 0x38, 0x34, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x36, 0x20, 0x33, 0x2e, 0x38, 0x34,
+	0x20, 0x31, 0x34, 0x2e, 0x35, 0x36, 0x20, 0x4c, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x31, 0x31, 0x2e,
+	0x31, 0x36, 0x20, 0x43, 0x33, 0x2e, 0x37, 0x32, 0x20, 0x38, 0x2e, 0x35, 0x39, 0x20, 0x35, 0x2e,
+	0x34, 0x38, 0x20, 0x36, 0x2e, 0x39, 0x35, 0x20, 0x38, 0x2e, 0x30, 0x20, 0x36, 0x2e, 0x39, 0x35,
+	0x20, 0x5a, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x75, 0x42, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x3d, 0x22, 0x23, 0x30, 0x66, 0x35, 0x61, 0x32, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x35, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e,
+	0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d,
+	0x2d, 0x20, 0x68, 0x65, 0x61, 0x64, 0x2c, 0x20, 0x66, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x20, 0x66,
+	0x72, 0x6f, 0x6e, 0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69,
+	0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x38, 0x2e, 0x30, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x33, 0x2e, 0x37, 0x39, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x33, 0x2e, 0x36, 0x35, 0x22,
+	0x20, 0x72, 0x79, 0x3d, 0x22, 0x33, 0x2e, 0x33, 0x39, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d,
+	0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x75, 0x48, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x3d, 0x22, 0x23, 0x30, 0x66, 0x35, 0x61, 0x32, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x35, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x67, 0x6c, 0x6f, 0x73, 0x73, 0x20, 0x2d,
+	0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78,
+	0x3d, 0x22, 0x36, 0x2e, 0x36, 0x31, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x32, 0x2e, 0x37, 0x34,
+	0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22,
+	0x31, 0x2e, 0x35, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e,
+	0x35, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d,
+	0x22, 0x37, 0x2e, 0x31, 0x32, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x38, 0x2e, 0x38, 0x32, 0x22, 0x20,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x37, 0x36, 0x22, 0x20, 0x68, 0x65, 0x69,
+	0x67, 0x68, 0x74, 0x3d, 0x22, 0x35, 0x2e, 0x31, 0x35, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30,
+	0x2e, 0x38, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66,
+	0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x32,
+	0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_about_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x05, 0xd4, 0x49, 0x44, 0x41, 0x54, 0x58, 0x85, 0xed, 0x97, 0x4d,
+	0x6c, 0x5c, 0x57, 0x15, 0xc7, 0x7f, 0xe7, 0xce, 0x3c, 0x8f, 0xed, 0xf1, 0xc4, 0x8e, 0x23, 0xa7,
+	0x8e, 0x8d, 0x89, 0x8b, 0x83, 0x4a, 0x1a, 0x22, 0x17, 0xaa, 0x50, 0xb1, 0x69, 0x1d, 0x54, 0x81,
+	0x84, 0x04, 0x74, 0x83, 0x10, 0x52, 0x24, 0x6a, 0xc4, 0x06, 0xaa, 0x8a, 0x56, 0x41, 0x04, 0x55,
+	0x05, 0x45, 0x15, 0x62, 0xd5, 0x06, 0xc1, 0xb2, 0x6a, 0x13, 0x15, 0xa4, 0x4a, 0xa8, 0x0b, 0xc4,
+	0x0a, 0x81, 0x40, 0x82, 0x80, 0x8a, 0x58, 0x54, 0x8d, 0x92, 0x38, 0x55, 0x23, 0x87, 0x34, 0xfe,
+	0x1a, 0xdb, 0xf8, 0x73, 0x3c, 0x1e, 0xcf, 0xcc, 0x7b, 0xf7, 0x1c, 0x16, 0xf7, 0x8d, 0x67, 0x92,
+	0x49, 0xd2, 0x04, 0xc1, 0x0a, 0x9e, 0x74, 0x75, 0x9f, 0xde, 0xbd, 0xe7, 0xfc, 0xff, 0xe7, 0xeb,
+	0x9e, 0xfb, 0xe0, 0x7f, 0xfd, 0x91, 0xfb, 0x15, 0x98, 0x38, 0x6d, 0xd9, 0x4a, 0x85, 0x47, 0x34,
+	0xc3, 0x90, 0x28, 0xc3, 0x2a, 0x98, 0x28, 0x0b, 0xea, 0x98, 0x1f, 0xbb, 0xc6, 0x85, 0xb7, 0xde,
+	0x12, 0xff, 0x5f, 0x21, 0xf0, 0xd8, 0x0b, 0x76, 0x1c, 0xd5, 0x6f, 0x9a, 0x93, 0x2f, 0x9b, 0xb2,
+	0xc7, 0x0c, 0x32, 0x8e, 0xc4, 0x0c, 0xf1, 0x4a, 0xc6, 0x0c, 0x80, 0x92, 0x89, 0xfd, 0xc6, 0xd4,
+	0x9d, 0xbd, 0xf0, 0xb2, 0xfc, 0xe9, 0x3f, 0x42, 0xe0, 0xb3, 0xa7, 0xec, 0xa8, 0x39, 0x3b, 0xa3,
+	0xc6, 0x93, 0x7d, 0x05, 0xe2, 0xb1, 0xfd, 0x12, 0x3d, 0x34, 0x04, 0xfb, 0x0a, 0x50, 0xe8, 0x84,
+	0x6a, 0x0c, 0x9b, 0x15, 0x58, 0xdc, 0x80, 0xe9, 0x22, 0xcc, 0xae, 0x59, 0xbc, 0x5e, 0x26, 0x12,
+	0xf8, 0xbd, 0x22, 0x27, 0x2f, 0xbe, 0x2c, 0x97, 0xff, 0x6d, 0x02, 0xc7, 0x5e, 0xb0, 0x13, 0xa2,
+	0x76, 0xf6, 0x81, 0x3e, 0x38, 0xf1, 0xb8, 0x44, 0x9f, 0x1a, 0x85, 0xfe, 0x02, 0xb8, 0x74, 0xdd,
+	0x5a, 0xf6, 0x1a, 0x50, 0xaa, 0xc0, 0xf5, 0x65, 0xf8, 0xe3, 0x65, 0xe3, 0xfc, 0x65, 0x8b, 0x4b,
+	0x55, 0xcc, 0xd4, 0x26, 0x2f, 0xfd, 0x34, 0xfb, 0xe6, 0x7d, 0x13, 0x78, 0xec, 0x07, 0xf6, 0x43,
+	0xc5, 0x5e, 0xfa, 0xdc, 0x27, 0xe1, 0xe9, 0x09, 0xa1, 0xab, 0x23, 0x15, 0x10, 0xc8, 0xe7, 0xa0,
+	0x3b, 0x07, 0x51, 0x06, 0xd4, 0x60, 0xa7, 0x0e, 0xa5, 0x1d, 0x88, 0x3d, 0x98, 0x81, 0x57, 0x78,
+	0xe7, 0x1a, 0xfc, 0xea, 0x6d, 0xb3, 0x6b, 0x8b, 0x86, 0x39, 0x7e, 0x34, 0xf5, 0x4a, 0xe6, 0xc7,
+	0xf7, 0x4c, 0xe0, 0xd8, 0x29, 0x3b, 0x81, 0xd8, 0x2f, 0x3e, 0x33, 0x26, 0x32, 0x79, 0x1c, 0x3a,
+	0x22, 0x70, 0x02, 0xd9, 0x0c, 0x0c, 0xf7, 0x43, 0xbe, 0xb3, 0x5d, 0xc6, 0x2b, 0xcc, 0xae, 0xc0,
+	0xc6, 0x76, 0x20, 0xa5, 0x06, 0x6f, 0xbf, 0x0f, 0x7f, 0xbb, 0x6a, 0x5c, 0xba, 0x61, 0x26, 0x66,
+	0x27, 0xa6, 0x7e, 0xd6, 0xee, 0x09, 0x77, 0xeb, 0x87, 0x47, 0x4f, 0xd9, 0x51, 0xb0, 0xb3, 0x1f,
+	0x3f, 0x00, 0x47, 0x3e, 0x0a, 0x3b, 0x31, 0x94, 0xab, 0x50, 0xae, 0x05, 0xf7, 0x77, 0xe7, 0x82,
+	0x95, 0xb7, 0x0e, 0x27, 0xf0, 0x91, 0x7d, 0xc1, 0x0b, 0xa5, 0x9d, 0x90, 0x17, 0x1d, 0x59, 0x38,
+	0x34, 0x28, 0x8c, 0x3e, 0x20, 0x98, 0xc8, 0xb9, 0x87, 0x9f, 0xb7, 0x23, 0x1f, 0x4a, 0x20, 0x2b,
+	0x76, 0x66, 0x4f, 0x1e, 0x3e, 0xfd, 0xa0, 0x48, 0xe2, 0x61, 0x79, 0x13, 0xb6, 0xab, 0x20, 0x06,
+	0xfd, 0xf9, 0x26, 0xe0, 0xfc, 0x1a, 0x5c, 0xb8, 0x0e, 0x53, 0xb3, 0xb0, 0x53, 0x6b, 0x92, 0x18,
+	0xec, 0x0b, 0x04, 0x56, 0x4a, 0xb0, 0xb6, 0x1d, 0xbe, 0x1d, 0x1d, 0x11, 0xc9, 0xe7, 0x70, 0xe6,
+	0xed, 0xcc, 0x5d, 0x09, 0x3c, 0xfa, 0x7d, 0x3b, 0x9e, 0x28, 0x4f, 0x8e, 0x1f, 0x94, 0x28, 0xe3,
+	0xc0, 0x39, 0x58, 0x2d, 0xc3, 0xca, 0x16, 0xe4, 0xbb, 0x9a, 0xae, 0x5d, 0x2e, 0xc1, 0xf4, 0x22,
+	0xac, 0x6f, 0x43, 0x71, 0x1d, 0xde, 0xfd, 0xa0, 0xb9, 0xd6, 0xdf, 0x03, 0xff, 0x2c, 0xc1, 0xdc,
+	0x2a, 0x98, 0x86, 0x9c, 0x71, 0x02, 0x0f, 0x8f, 0x48, 0xd6, 0x9b, 0x7e, 0xfe, 0xd0, 0xb3, 0xf1,
+	0x13, 0x77, 0x24, 0x60, 0x4e, 0x27, 0xfb, 0x7a, 0x88, 0x07, 0xfb, 0x9a, 0x82, 0x22, 0x50, 0x4f,
+	0x20, 0x49, 0x42, 0x9c, 0xbd, 0xc2, 0x5a, 0x19, 0xe2, 0x24, 0x94, 0x60, 0xa5, 0x06, 0x8b, 0x9b,
+	0xcd, 0x35, 0x11, 0x28, 0xef, 0x80, 0x12, 0xde, 0x25, 0x9d, 0x07, 0xf6, 0x08, 0x85, 0x4e, 0x89,
+	0xc5, 0x64, 0xf2, 0xb6, 0x04, 0x26, 0x4e, 0x5b, 0x56, 0xbc, 0x7c, 0x65, 0xb8, 0x5f, 0xa2, 0xd6,
+	0x0d, 0x0d, 0x05, 0x4b, 0xa5, 0x90, 0xd9, 0xe7, 0xaf, 0xc0, 0xfc, 0x6a, 0x4a, 0x38, 0xb5, 0x7a,
+	0xa0, 0xd0, 0x0c, 0x4d, 0xa5, 0xd6, 0x04, 0xde, 0x55, 0x90, 0x4e, 0x07, 0x82, 0xee, 0xa7, 0x26,
+	0x4e, 0x5b, 0xb6, 0x8d, 0x40, 0x69, 0x8b, 0x71, 0x85, 0x3d, 0x83, 0xbd, 0x2d, 0x1e, 0xa1, 0xa9,
+	0x78, 0x6d, 0x2b, 0x58, 0x5a, 0x8d, 0x21, 0xf1, 0x61, 0x18, 0x70, 0x70, 0x00, 0x1e, 0x19, 0x6d,
+	0x86, 0xe0, 0x1f, 0x4b, 0xa9, 0x4c, 0xab, 0x92, 0x74, 0x1a, 0x28, 0x80, 0x2a, 0xbd, 0x73, 0x8b,
+	0xf1, 0xd1, 0xc6, 0xf2, 0x2e, 0x13, 0xcd, 0x30, 0x82, 0x86, 0x12, 0x6b, 0x58, 0xd6, 0x00, 0xd7,
+	0xb4, 0xb6, 0x9d, 0x06, 0x4b, 0x34, 0x4d, 0xb8, 0xf1, 0x51, 0xd8, 0xd7, 0xd3, 0xf4, 0xc6, 0x76,
+	0x0d, 0xa6, 0x66, 0x6e, 0x26, 0xde, 0x78, 0x07, 0xe8, 0xea, 0x14, 0x0c, 0x50, 0x71, 0x23, 0xc0,
+	0xbb, 0x37, 0x11, 0x10, 0xe3, 0x80, 0x08, 0x89, 0x08, 0xd9, 0x06, 0xb8, 0x2a, 0x78, 0x17, 0x80,
+	0x9d, 0x80, 0xa4, 0x07, 0x8d, 0xd3, 0x50, 0x72, 0x7b, 0xf3, 0x81, 0x0c, 0x80, 0xf7, 0xf0, 0xe7,
+	0x29, 0x28, 0xd7, 0x83, 0xdc, 0xed, 0x4a, 0x35, 0x13, 0xf2, 0x2a, 0x49, 0x4c, 0x86, 0xda, 0x3d,
+	0xa0, 0x98, 0xcb, 0x18, 0xaa, 0x82, 0xba, 0xd4, 0x62, 0x49, 0xad, 0x4e, 0x63, 0x6a, 0x61, 0x1f,
+	0x22, 0xd0, 0x95, 0x6b, 0xba, 0x79, 0xad, 0x0c, 0x7f, 0xbf, 0x0a, 0xab, 0x5b, 0x61, 0x5d, 0xad,
+	0x65, 0x6e, 0x19, 0xbb, 0xa1, 0xb1, 0x66, 0x84, 0x76, 0x09, 0x98, 0xf9, 0x85, 0x24, 0x91, 0x6c,
+	0xec, 0x21, 0xe3, 0xc0, 0x4b, 0xd3, 0xea, 0x46, 0x10, 0xd5, 0xc2, 0x77, 0x91, 0x60, 0x71, 0xc3,
+	0xfa, 0xe9, 0x62, 0x28, 0xd7, 0x44, 0xc3, 0xf0, 0x0a, 0xde, 0xda, 0x89, 0xc4, 0x21, 0x77, 0xb2,
+	0x66, 0xb6, 0xd0, 0x4e, 0x40, 0x32, 0xf3, 0xa6, 0xca, 0x56, 0x05, 0xa2, 0x42, 0x6a, 0x75, 0xcb,
+	0x41, 0x6d, 0x16, 0x94, 0xba, 0xd4, 0x1b, 0xde, 0x9a, 0xb1, 0xf5, 0xa9, 0x72, 0xdf, 0x18, 0xda,
+	0x1c, 0xbb, 0x24, 0x14, 0xca, 0x55, 0xc3, 0xcc, 0x10, 0xb1, 0xb9, 0x86, 0xde, 0xdd, 0x2a, 0xf8,
+	0xc4, 0x0c, 0x17, 0x44, 0xd8, 0x5c, 0x58, 0xb7, 0x5d, 0xe1, 0x46, 0xb6, 0xc7, 0x3e, 0xd4, 0x7d,
+	0x9c, 0x84, 0x33, 0xa1, 0x9e, 0x40, 0x2d, 0x0e, 0x15, 0x51, 0x8d, 0xc3, 0x7b, 0x92, 0xa4, 0x16,
+	0xa6, 0x72, 0xad, 0x24, 0x7c, 0x4a, 0x62, 0x71, 0xdd, 0x10, 0xd8, 0xbc, 0x31, 0x18, 0x5d, 0xda,
+	0xcd, 0x3d, 0x5a, 0x9e, 0xc3, 0xdf, 0xf5, 0x6f, 0xf4, 0xe5, 0xf9, 0xfa, 0xc4, 0x11, 0x17, 0x65,
+	0x33, 0x21, 0x14, 0x8d, 0xe1, 0x5c, 0x9a, 0x13, 0xd2, 0x22, 0xd5, 0x1a, 0xe3, 0x16, 0xc0, 0x44,
+	0x83, 0x27, 0x92, 0x94, 0x50, 0xea, 0x7a, 0xfe, 0x32, 0xe5, 0xe3, 0x8d, 0x1d, 0xde, 0x9c, 0x7f,
+	0x35, 0xfb, 0x74, 0x9b, 0x07, 0x42, 0x18, 0xf4, 0xdc, 0xc6, 0x36, 0x51, 0x71, 0xc3, 0x48, 0x7c,
+	0x38, 0x54, 0xea, 0x71, 0x53, 0x41, 0xec, 0x83, 0xf5, 0x71, 0x12, 0xc0, 0x0f, 0x1d, 0x80, 0xd1,
+	0xfd, 0x01, 0xac, 0xb1, 0x27, 0x69, 0x01, 0xae, 0xfb, 0xd0, 0xaa, 0xbd, 0x87, 0xa5, 0x0d, 0x63,
+	0xb3, 0x62, 0x91, 0x13, 0x3b, 0xdb, 0x8a, 0xd9, 0xd6, 0x8e, 0x0f, 0x3f, 0xa7, 0xbf, 0xeb, 0xc9,
+	0xd9, 0xf1, 0xc7, 0x0f, 0xbb, 0x68, 0x7a, 0x09, 0x3a, 0x23, 0xf8, 0xd8, 0xfe, 0xd0, 0x92, 0x1b,
+	0x79, 0x21, 0xc0, 0x97, 0x8e, 0x85, 0xc6, 0x03, 0x70, 0x69, 0x26, 0x9c, 0x90, 0xad, 0x5e, 0xa8,
+	0xc5, 0x30, 0xbb, 0x0a, 0xd5, 0x3a, 0x0c, 0xef, 0x83, 0xbf, 0x5e, 0xf1, 0xf1, 0x76, 0xcd, 0xfe,
+	0x30, 0xf7, 0x6a, 0xf4, 0xc5, 0x56, 0xbc, 0xb6, 0x6e, 0x88, 0xca, 0xc9, 0x52, 0x15, 0xbb, 0x38,
+	0xa7, 0xd6, 0xd3, 0x09, 0x95, 0x3a, 0x4c, 0x2f, 0x85, 0x76, 0xdc, 0xc8, 0x85, 0xc4, 0x60, 0x7f,
+	0x6f, 0xb3, 0xbe, 0x87, 0xfa, 0x5b, 0x72, 0xc0, 0x07, 0x99, 0x99, 0x95, 0x00, 0x9e, 0xef, 0x84,
+	0xa9, 0x59, 0xb5, 0x72, 0xd5, 0xd4, 0xab, 0x9e, 0xbc, 0x15, 0xae, 0x8d, 0xc0, 0x7b, 0x3f, 0x97,
+	0xcb, 0xea, 0x6d, 0xf2, 0x83, 0x45, 0x63, 0xab, 0x62, 0x14, 0xba, 0x82, 0x1b, 0xaf, 0x2e, 0x84,
+	0xce, 0x57, 0x8d, 0xa1, 0x56, 0x87, 0x1b, 0xcb, 0xcd, 0xf8, 0x4f, 0x17, 0xd3, 0xf0, 0xc4, 0xb0,
+	0xb4, 0x09, 0xd7, 0x97, 0x52, 0xf0, 0x1c, 0x6c, 0x6e, 0x29, 0x33, 0xcb, 0x8a, 0x99, 0x7c, 0xa3,
+	0xf8, 0x5a, 0xee, 0xbd, 0x5b, 0xf1, 0xee, 0x78, 0x25, 0x1b, 0x7b, 0xd6, 0xbf, 0x88, 0xda, 0x4b,
+	0x07, 0x07, 0x84, 0x91, 0x01, 0x27, 0x6b, 0xe9, 0x21, 0x03, 0xc1, 0xaa, 0x9e, 0x4e, 0x18, 0x7f,
+	0x10, 0xaa, 0xe9, 0xf1, 0xbb, 0x5d, 0x87, 0x4a, 0x35, 0x3d, 0x68, 0x04, 0x7a, 0xbb, 0xe1, 0xc6,
+	0x92, 0xda, 0xcc, 0x8a, 0x62, 0xf0, 0x62, 0xf1, 0xb5, 0xe8, 0x27, 0xb7, 0xc3, 0xb9, 0xeb, 0xa5,
+	0x74, 0xec, 0x3b, 0xc9, 0xd7, 0x10, 0xde, 0xe8, 0xee, 0x20, 0x33, 0x36, 0xe8, 0xb2, 0xdd, 0x39,
+	0xa1, 0x5c, 0x0d, 0xd6, 0x02, 0xd0, 0xd2, 0x74, 0xcc, 0x20, 0x9b, 0x85, 0xee, 0x0e, 0xa8, 0xc5,
+	0xc6, 0xfb, 0xf3, 0x1a, 0x97, 0x77, 0xcc, 0xd4, 0xe4, 0x5b, 0xc5, 0xd7, 0xb3, 0xbf, 0xbc, 0x13,
+	0xc6, 0x87, 0x5e, 0xcb, 0x0f, 0x3d, 0x53, 0x3b, 0xe2, 0xc9, 0xbc, 0x62, 0x9e, 0x2f, 0x14, 0xba,
+	0x24, 0x1e, 0xdc, 0x2b, 0x51, 0x5f, 0x1e, 0x3a, 0x32, 0x72, 0x53, 0xa3, 0xa9, 0x27, 0xc6, 0xda,
+	0x96, 0x51, 0xdc, 0xb0, 0xb8, 0x54, 0xb1, 0x48, 0x84, 0xdf, 0xfa, 0x44, 0xbf, 0xb7, 0x78, 0x2e,
+	0x77, 0xe5, 0x6e, 0xfa, 0xef, 0xf9, 0xc7, 0x64, 0xf4, 0xdb, 0xf1, 0x13, 0xea, 0x65, 0xd2, 0x39,
+	0x7b, 0xca, 0x2b, 0xbd, 0x00, 0xce, 0x91, 0x18, 0xe0, 0x3d, 0xd9, 0xf4, 0x4a, 0xb6, 0xa9, 0x2a,
+	0xbf, 0x36, 0xec, 0x5c, 0xf1, 0xf5, 0xe8, 0xfc, 0xbd, 0xe8, 0xbd, 0xef, 0x5f, 0x33, 0xbe, 0x6a,
+	0x99, 0xa1, 0xbd, 0xf1, 0x38, 0xde, 0x0d, 0x8b, 0xd3, 0x61, 0x00, 0x53, 0x37, 0x0f, 0x3a, 0xb7,
+	0x50, 0x8a, 0x2e, 0x72, 0x9f, 0xbf, 0x66, 0xff, 0x7f, 0xfe, 0x05, 0xc4, 0xb9, 0x93, 0xf1, 0x51,
+	0x4c, 0xcc, 0x15, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_about_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x72,
+	0x62, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x32, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x33, 0x36, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x63, 0x64, 0x32, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38, 0x61, 0x62, 0x31, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x35, 0x64, 0x39, 0x32, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x33, 0x62, 0x37, 0x63, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x69, 0x6d, 0x22,
+	0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x33, 0x62, 0x37, 0x63, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x31, 0x61, 0x36, 0x34, 0x66, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x68, 0x69, 0x6e, 0x65, 0x22,
+	0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x6f,
+	0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70,
+	0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x6c, 0x79,
+	0x70, 0x68, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74,
+	0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73,
+	0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x35,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32, 0x37,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x32, 0x65, 0x64, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x31, 0x2e, 0x36, 0x30, 0x30, 0x20, 0x31,
+	0x2e, 0x36, 0x30, 0x30, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e, 0x39, 0x30,
+	0x30, 0x30, 0x29, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20,
+	0x63, 0x78, 0x3d, 0x22, 0x31, 0x36, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x36, 0x22, 0x20,
+	0x72, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x32, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75,
+	0x72, 0x6c, 0x28, 0x23, 0x6f, 0x72, 0x62, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x72, 0x69, 0x6d, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x35, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x36, 0x2e,
+	0x39, 0x20, 0x32, 0x33, 0x2e, 0x34, 0x20, 0x41, 0x31, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x31, 0x2e,
+	0x37, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x32, 0x35, 0x2e, 0x31, 0x20, 0x32, 0x33, 0x2e,
+	0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x32, 0x62, 0x37, 0x31, 0x66, 0x66, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d,
+	0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x39, 0x2e, 0x39, 0x33, 0x20, 0x31, 0x32, 0x2e, 0x31, 0x33, 0x20,
+	0x41, 0x35, 0x2e, 0x39, 0x20, 0x35, 0x2e, 0x39, 0x20, 0x30, 0x20, 0x31, 0x20, 0x31, 0x20, 0x32,
+	0x30, 0x2e, 0x38, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x38, 0x35, 0x20, 0x51, 0x31, 0x39, 0x2e, 0x33,
+	0x20, 0x31, 0x36, 0x2e, 0x32, 0x20, 0x31, 0x37, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x36, 0x2e, 0x39,
+	0x20, 0x4c, 0x31, 0x37, 0x2e, 0x35, 0x35, 0x20, 0x32, 0x30, 0x2e, 0x34, 0x20, 0x4c, 0x31, 0x34,
+	0x2e, 0x32, 0x35, 0x20, 0x32, 0x30, 0x2e, 0x34, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x32, 0x35, 0x20,
+	0x31, 0x36, 0x2e, 0x33, 0x35, 0x20, 0x51, 0x31, 0x34, 0x2e, 0x32, 0x35, 0x20, 0x31, 0x34, 0x2e,
+	0x36, 0x20, 0x31, 0x36, 0x2e, 0x33, 0x36, 0x20, 0x31, 0x33, 0x2e, 0x33, 0x36, 0x20, 0x41, 0x32,
+	0x2e, 0x35, 0x35, 0x20, 0x32, 0x2e, 0x35, 0x35, 0x20, 0x30, 0x20, 0x31, 0x20, 0x30, 0x20, 0x31,
+	0x33, 0x2e, 0x32, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x34, 0x33, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x67, 0x6c, 0x79, 0x70, 0x68, 0x29, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d,
+	0x22, 0x31, 0x35, 0x2e, 0x39, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x32, 0x34, 0x2e, 0x33, 0x22,
+	0x20, 0x72, 0x3d, 0x22, 0x32, 0x2e, 0x32, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75,
+	0x72, 0x6c, 0x28, 0x23, 0x67, 0x6c, 0x79, 0x70, 0x68, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x35, 0x2e,
+	0x36, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x37, 0x2e, 0x34, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22,
+	0x38, 0x2e, 0x37, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x73, 0x68, 0x69, 0x6e, 0x65, 0x29, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_blink_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x03, 0x87, 0x49, 0x44, 0x41, 0x54, 0x58, 0x47, 0xd5, 0x97, 0x4f,
+	0x48, 0x54, 0x51, 0x14, 0xc6, 0xef, 0x3c, 0x67, 0x1c, 0x15, 0x51, 0x11, 0x11, 0x71, 0xa1, 0x1b,
+	0xdd, 0x89, 0xb8, 0x31, 0x08, 0x41, 0x08, 0xa4, 0x8d, 0xbb, 0x81, 0x59, 0x44, 0x6b, 0x69, 0x11,
+	0xd2, 0x4e, 0xc2, 0x6d, 0xe0, 0x42, 0xda, 0x84, 0x8b, 0x88, 0x88, 0x90, 0x16, 0x91, 0xc4, 0x50,
+	0xb4, 0xb0, 0x45, 0x20, 0x4c, 0x0c, 0x34, 0x50, 0x10, 0x43, 0x98, 0x50, 0x19, 0x65, 0x90, 0x81,
+	0xf4, 0x17, 0xa7, 0x1c, 0x67, 0xe6, 0xc4, 0xef, 0xda, 0x79, 0x3c, 0x2f, 0x66, 0xbe, 0x99, 0xe7,
+	0xa2, 0x03, 0x1f, 0x6f, 0xe6, 0xcd, 0x7d, 0xe7, 0x7c, 0xef, 0x9c, 0x73, 0xcf, 0x77, 0xc7, 0x98,
+	0xff, 0xcd, 0x5e, 0x0e, 0x0e, 0x4a, 0x79, 0x63, 0x43, 0xa4, 0x5c, 0x16, 0xa9, 0x56, 0xf7, 0x50,
+	0x2a, 0x49, 0xa9, 0x50, 0x90, 0x95, 0xd6, 0x56, 0x71, 0xd7, 0x47, 0x6a, 0xbf, 0x56, 0x56, 0x64,
+	0x77, 0x75, 0x55, 0x7e, 0x2e, 0x2f, 0x4b, 0x31, 0x93, 0xd9, 0x07, 0xee, 0x95, 0xd7, 0xd7, 0xe5,
+	0xdb, 0xdc, 0xdc, 0xf1, 0x90, 0xf8, 0x3c, 0x3d, 0x2d, 0x9f, 0xd2, 0x69, 0xd9, 0x4c, 0xa5, 0x0e,
+	0xc5, 0xd6, 0xd4, 0x94, 0xbc, 0x1b, 0x1b, 0x8b, 0x96, 0xc4, 0xfd, 0x64, 0x52, 0x5e, 0x0f, 0x0f,
+	0xcb, 0x8b, 0xfe, 0x7e, 0x1f, 0xab, 0x03, 0x03, 0xfb, 0xa0, 0xf7, 0x0b, 0x7d, 0x7d, 0xf2, 0x66,
+	0x64, 0x44, 0x2e, 0xc7, 0x62, 0xd1, 0x91, 0x80, 0x00, 0xf5, 0x05, 0x8f, 0xdb, 0xdb, 0xe5, 0x49,
+	0x67, 0xa7, 0xe4, 0xbb, 0xba, 0x7c, 0xf0, 0x1d, 0xf0, 0x1b, 0x6b, 0xb2, 0x6d, 0x6d, 0x72, 0xdd,
+	0xf3, 0xa2, 0x21, 0x70, 0xca, 0x18, 0xb9, 0xe6, 0x79, 0x72, 0xaf, 0xb1, 0x51, 0x20, 0xf2, 0xb0,
+	0xb9, 0x59, 0x1e, 0xb5, 0xb4, 0xf8, 0x84, 0x00, 0xdf, 0xc1, 0x72, 0x53, 0x93, 0x5d, 0x93, 0x49,
+	0x24, 0x64, 0xce, 0x18, 0x39, 0x61, 0x4c, 0xfd, 0x24, 0xd2, 0xc6, 0xc8, 0x45, 0x63, 0xe4, 0x56,
+	0x43, 0x83, 0xdc, 0x89, 0xc7, 0x7d, 0x22, 0x04, 0x0b, 0x82, 0x7b, 0x77, 0x13, 0x09, 0xb9, 0x1d,
+	0x8f, 0x5b, 0xc2, 0xe7, 0x8c, 0x91, 0x54, 0x14, 0x04, 0xce, 0x1b, 0x23, 0xb3, 0xc6, 0xc8, 0x95,
+	0x58, 0xec, 0x40, 0x12, 0x0f, 0x92, 0x49, 0xfb, 0x5d, 0x83, 0x93, 0x7a, 0xea, 0x7f, 0xc1, 0x18,
+	0xe1, 0x59, 0xd7, 0x5f, 0x68, 0xbb, 0xf4, 0x27, 0xf8, 0x0d, 0xcf, 0xb3, 0xc1, 0x0f, 0x2a, 0x83,
+	0xa6, 0x9f, 0xd4, 0x43, 0xf2, 0x6a, 0x2c, 0x66, 0x49, 0x90, 0x39, 0xd7, 0x5f, 0x68, 0xd3, 0xf4,
+	0xf3, 0x86, 0x04, 0xa6, 0xc1, 0x68, 0xbc, 0xe7, 0xbd, 0xbd, 0x3e, 0x9e, 0xf5, 0xf4, 0xd8, 0x26,
+	0x84, 0x0c, 0x19, 0x21, 0x13, 0x10, 0xa6, 0x0c, 0xae, 0xbf, 0x9a, 0x4c, 0x9b, 0x2c, 0xd7, 0xd1,
+	0x61, 0xb7, 0xd9, 0xab, 0xa1, 0x21, 0x79, 0x3b, 0x3a, 0xea, 0x83, 0x6d, 0xc7, 0x56, 0x84, 0x88,
+	0x92, 0x20, 0x53, 0xae, 0x9f, 0x9a, 0x8d, 0x1a, 0x33, 0x82, 0x09, 0x42, 0xb0, 0x8f, 0x93, 0x93,
+	0x76, 0xe0, 0x28, 0x18, 0x50, 0xef, 0xc7, 0xc7, 0x2d, 0x31, 0x32, 0xf2, 0xb4, 0xbb, 0xdb, 0x66,
+	0xc1, 0xf5, 0x53, 0x97, 0x41, 0x80, 0x69, 0x08, 0x18, 0xb7, 0xdb, 0x8b, 0x8b, 0x52, 0x5c, 0x5a,
+	0xb2, 0xf8, 0xb1, 0xb0, 0x20, 0x5f, 0x66, 0x66, 0x2c, 0x19, 0xa6, 0x21, 0x24, 0xdc, 0xe7, 0x23,
+	0x31, 0x32, 0xb0, 0x93, 0xcf, 0x5b, 0x31, 0x02, 0x95, 0xcd, 0x4d, 0x0b, 0x3e, 0xa3, 0x11, 0x10,
+	0x39, 0xb6, 0xe0, 0xd8, 0x49, 0x63, 0xec, 0x4e, 0xf8, 0x30, 0x31, 0x21, 0x3b, 0xd9, 0xac, 0x15,
+	0x9f, 0xdd, 0xb5, 0x35, 0x2b, 0x46, 0xcc, 0x7f, 0x9a, 0xf4, 0x74, 0x54, 0x8d, 0xe7, 0x1a, 0x93,
+	0x0d, 0x3d, 0xa0, 0x09, 0x75, 0xda, 0x05, 0x87, 0x10, 0x4d, 0xca, 0xef, 0x94, 0x8a, 0x19, 0xe0,
+	0x3e, 0x5f, 0x97, 0xe1, 0x90, 0xc0, 0x34, 0x9f, 0x82, 0x2c, 0xf0, 0xd6, 0x34, 0x25, 0x57, 0xbd,
+	0xc7, 0x95, 0xdd, 0x70, 0x26, 0x2a, 0x12, 0xa4, 0x94, 0x5d, 0x80, 0xd2, 0x51, 0xdf, 0xa0, 0x1a,
+	0xf2, 0xb6, 0xba, 0x3b, 0x54, 0x09, 0x75, 0x0d, 0xa5, 0x42, 0x47, 0x5c, 0x7f, 0xa1, 0x8d, 0x29,
+	0x48, 0x6d, 0x51, 0x3a, 0xe6, 0x80, 0xab, 0x84, 0xae, 0x2a, 0xb2, 0x0e, 0x30, 0x0b, 0x98, 0xa2,
+	0xae, 0xbf, 0x50, 0xc6, 0x14, 0x64, 0xb6, 0x1f, 0x34, 0x7e, 0x83, 0x63, 0x38, 0xf8, 0x99, 0x75,
+	0x3a, 0x96, 0x21, 0x5f, 0xd7, 0x34, 0xbc, 0xe9, 0x79, 0x96, 0x00, 0xe9, 0xd4, 0xa6, 0x23, 0xc0,
+	0xdf, 0x10, 0x54, 0x45, 0xc6, 0x37, 0xcf, 0x42, 0xc2, 0xf5, 0x7b, 0x24, 0xa3, 0xf1, 0x70, 0x02,
+	0x08, 0x1e, 0xcc, 0x40, 0xf0, 0x50, 0x12, 0x4c, 0x3b, 0xbf, 0xb1, 0x0e, 0x12, 0x90, 0x56, 0x12,
+	0x67, 0x6b, 0xc9, 0x02, 0x0e, 0x54, 0xfd, 0x34, 0x30, 0xc1, 0xe8, 0x70, 0x9a, 0x2d, 0x78, 0x2c,
+	0xd3, 0x06, 0x65, 0x04, 0x43, 0x44, 0x4b, 0xa1, 0xea, 0xc8, 0xf9, 0xc0, 0xf5, 0xff, 0x4f, 0x53,
+	0x41, 0xc1, 0x19, 0x4e, 0x09, 0x4c, 0x20, 0xba, 0x9e, 0xad, 0x07, 0x82, 0x62, 0x84, 0x0e, 0x40,
+	0x06, 0x22, 0x64, 0x06, 0xc2, 0x94, 0x84, 0x72, 0xf0, 0x22, 0xae, 0xff, 0x43, 0x8d, 0xc6, 0xd1,
+	0x74, 0x6a, 0x70, 0x15, 0x22, 0xf6, 0x3c, 0xfb, 0x3d, 0x78, 0x12, 0xd6, 0x19, 0x00, 0x19, 0x88,
+	0x90, 0x21, 0x25, 0xa1, 0x2f, 0x12, 0x6a, 0x2e, 0xc0, 0x5a, 0x1d, 0x70, 0xd5, 0xe0, 0x04, 0x41,
+	0xf9, 0x10, 0x9d, 0xaf, 0xb3, 0xb3, 0x3e, 0x54, 0x88, 0x20, 0xa2, 0x24, 0xc8, 0x84, 0xf6, 0x05,
+	0xdb, 0x37, 0xd4, 0x29, 0x99, 0xc1, 0x83, 0xbc, 0x6a, 0x7d, 0x71, 0xc8, 0x9b, 0x13, 0x9c, 0x60,
+	0x88, 0x8e, 0x2a, 0x21, 0x40, 0x19, 0xbf, 0xcf, 0xcf, 0xfb, 0x24, 0xf4, 0x7c, 0x00, 0x94, 0xcc,
+	0x42, 0x18, 0x02, 0x18, 0xec, 0x91, 0x5d, 0x1c, 0x13, 0x14, 0xf0, 0xd9, 0x06, 0xcd, 0x64, 0xac,
+	0x18, 0xed, 0xe4, 0x72, 0x16, 0xfc, 0x63, 0xe2, 0x1e, 0xc4, 0xc8, 0x08, 0x92, 0xad, 0x67, 0x05,
+	0x32, 0x42, 0x1f, 0xb9, 0xfe, 0x8f, 0x6c, 0xa4, 0x10, 0x22, 0xc8, 0x30, 0xd2, 0x5b, 0x2d, 0x16,
+	0xed, 0x7f, 0x41, 0xfb, 0xdf, 0xb0, 0x52, 0xd9, 0xbb, 0x96, 0x4a, 0x52, 0xdd, 0xde, 0x96, 0xca,
+	0xd6, 0x96, 0x55, 0x47, 0x08, 0xf1, 0x0c, 0xbd, 0xe3, 0xfa, 0xab, 0xdb, 0x28, 0x0f, 0x7d, 0x41,
+	0x6a, 0x75, 0x37, 0x00, 0x1a, 0x8f, 0x5a, 0x47, 0x7e, 0x12, 0x3a, 0x6e, 0xfb, 0x0d, 0xe6, 0x0b,
+	0xeb, 0xef, 0xc8, 0xe1, 0x17, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+	0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_blink_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65,
+	0x61, 0x64, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x33, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x66, 0x39, 0x62, 0x63, 0x62, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x2e, 0x32, 0x38, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x66, 0x37, 0x37, 0x37, 0x37, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x30, 0x32, 0x30, 0x32, 0x30, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x34, 0x30, 0x38, 0x30, 0x38, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x39, 0x63, 0x30, 0x32, 0x30, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x64, 0x79,
+	0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d,
+	0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22,
+	0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31,
+	0x34, 0x2e, 0x36, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x36, 0x22, 0x20, 0x79,
+	0x32, 0x3d, 0x22, 0x33, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x39, 0x33, 0x38,
+	0x33, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x66, 0x30, 0x63,
+	0x30, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x35, 0x22, 0x20,
+	0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x62, 0x30,
+	0x35, 0x30, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x64, 0x30, 0x66, 0x30,
+	0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69,
+	0x64, 0x3d, 0x22, 0x67, 0x6c, 0x6f, 0x77, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x35,
+	0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e,
+	0x35, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x64, 0x32, 0x64, 0x32, 0x22, 0x20,
+	0x73, 0x74, 0x6f, 0x70, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e,
+	0x39, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x39, 0x61, 0x36,
+	0x61, 0x36, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79,
+	0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20,
+	0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x39, 0x61,
+	0x36, 0x61, 0x36, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74,
+	0x79, 0x3d, 0x22, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61,
+	0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20,
+	0x64, 0x3d, 0x22, 0x4d, 0x31, 0x35, 0x2e, 0x36, 0x20, 0x33, 0x30, 0x2e, 0x39, 0x20, 0x43, 0x31,
+	0x32, 0x2e, 0x34, 0x20, 0x33, 0x30, 0x2e, 0x39, 0x20, 0x39, 0x2e, 0x36, 0x20, 0x33, 0x30, 0x2e,
+	0x34, 0x20, 0x37, 0x2e, 0x38, 0x20, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x43, 0x36, 0x2e, 0x31, 0x20,
+	0x32, 0x38, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x32, 0x20, 0x32, 0x37, 0x2e, 0x36, 0x20, 0x35, 0x2e,
+	0x32, 0x20, 0x32, 0x36, 0x2e, 0x32, 0x20, 0x43, 0x35, 0x2e, 0x32, 0x20, 0x32, 0x34, 0x2e, 0x31,
+	0x20, 0x36, 0x2e, 0x33, 0x20, 0x32, 0x30, 0x2e, 0x35, 0x20, 0x37, 0x2e, 0x38, 0x20, 0x31, 0x38,
+	0x2e, 0x32, 0x20, 0x43, 0x39, 0x2e, 0x31, 0x20, 0x31, 0x36, 0x2e, 0x31, 0x20, 0x31, 0x31, 0x2e,
+	0x31, 0x20, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x31, 0x33, 0x2e, 0x33, 0x20, 0x31, 0x34, 0x2e, 0x36,
+	0x20, 0x4c, 0x31, 0x37, 0x2e, 0x39, 0x20, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x43, 0x32, 0x30, 0x2e,
+	0x31, 0x20, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x32, 0x32, 0x2e, 0x31, 0x20, 0x31, 0x36, 0x2e, 0x31,
+	0x20, 0x32, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x38, 0x2e, 0x32, 0x20, 0x43, 0x32, 0x34, 0x2e, 0x39,
+	0x20, 0x32, 0x30, 0x2e, 0x35, 0x20, 0x32, 0x36, 0x20, 0x32, 0x34, 0x2e, 0x31, 0x20, 0x32, 0x36,
+	0x20, 0x32, 0x36, 0x2e, 0x32, 0x20, 0x43, 0x32, 0x36, 0x20, 0x32, 0x37, 0x2e, 0x36, 0x20, 0x32,
+	0x35, 0x2e, 0x31, 0x20, 0x32, 0x38, 0x2e, 0x37, 0x20, 0x32, 0x33, 0x2e, 0x34, 0x20, 0x32, 0x39,
+	0x2e, 0x35, 0x20, 0x43, 0x32, 0x31, 0x2e, 0x36, 0x20, 0x33, 0x30, 0x2e, 0x34, 0x20, 0x31, 0x38,
+	0x2e, 0x38, 0x20, 0x33, 0x30, 0x2e, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x20, 0x33, 0x30, 0x2e,
+	0x39, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x62, 0x6f, 0x64, 0x79, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23,
+	0x38, 0x34, 0x30, 0x31, 0x30, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x36,
+	0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x32, 0x38, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22,
+	0x36, 0x2e, 0x38, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x32, 0x2e, 0x36, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x67, 0x6c, 0x6f, 0x77, 0x29, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x37, 0x2e,
+	0x39, 0x20, 0x31, 0x39, 0x2e, 0x38, 0x20, 0x43, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x36, 0x2e, 0x36,
+	0x20, 0x31, 0x31, 0x2e, 0x38, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x20,
+	0x31, 0x35, 0x2e, 0x34, 0x20, 0x43, 0x31, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x20,
+	0x32, 0x31, 0x2e, 0x38, 0x20, 0x31, 0x36, 0x2e, 0x36, 0x20, 0x32, 0x33, 0x2e, 0x33, 0x20, 0x31,
+	0x39, 0x2e, 0x38, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x33, 0x61, 0x31, 0x61, 0x31,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x31, 0x2e, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65,
+	0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63,
+	0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65,
+	0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x36, 0x22,
+	0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x34,
+	0x2e, 0x38, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x36, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x23, 0x37, 0x34, 0x30, 0x30, 0x30, 0x30, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63,
+	0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x36, 0x22,
+	0x20, 0x63, 0x79, 0x3d, 0x22, 0x37, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x37, 0x2e, 0x34,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x68, 0x65, 0x61,
+	0x64, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x38, 0x62, 0x30,
+	0x31, 0x30, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x20, 0x43, 0x31,
+	0x32, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x31, 0x20, 0x31, 0x34,
+	0x2e, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x39, 0x20, 0x43, 0x31, 0x37,
+	0x2e, 0x31, 0x20, 0x31, 0x34, 0x2e, 0x39, 0x20, 0x31, 0x38, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x2e,
+	0x36, 0x20, 0x32, 0x30, 0x2e, 0x32, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x66, 0x37, 0x62, 0x30, 0x62, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+	0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f,
+	0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_clients_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x04, 0xd9, 0x49, 0x44, 0x41, 0x54, 0x58, 0x85, 0xc5, 0x97, 0x5b,
+	0x68, 0x9c, 0x45, 0x14, 0xc7, 0xff, 0xe7, 0xcc, 0x7c, 0xdf, 0xde, 0xbb, 0x69, 0x9a, 0x4b, 0xdb,
+	0xd4, 0x34, 0xa4, 0xad, 0x4a, 0xd0, 0x07, 0x0b, 0x6d, 0x41, 0x10, 0x89, 0x3e, 0x54, 0x44, 0x68,
+	0x0b, 0x52, 0x51, 0x14, 0x41, 0xc1, 0x22, 0xbe, 0x89, 0xd0, 0x58, 0x15, 0x22, 0xd4, 0x4b, 0x45,
+	0x28, 0x82, 0x16, 0xaa, 0xaf, 0x05, 0xa5, 0xa2, 0x20, 0xa4, 0xd5, 0x3e, 0x45, 0x1f, 0x45, 0x7d,
+	0xac, 0x78, 0x41, 0xa2, 0x4d, 0xa5, 0x9b, 0x8b, 0x49, 0x76, 0xb3, 0xfb, 0xed, 0x7e, 0xdf, 0x5c,
+	0x8e, 0x0f, 0xbb, 0xa5, 0x15, 0x9a, 0x64, 0x73, 0x91, 0x0e, 0x1c, 0x66, 0x60, 0x66, 0xfe, 0xe7,
+	0x77, 0x86, 0xf3, 0xcd, 0x9c, 0x0f, 0xb8, 0xcd, 0x8d, 0xd6, 0xb2, 0x69, 0x74, 0x5c, 0x74, 0xad,
+	0x32, 0x7d, 0xc0, 0x13, 0x06, 0x01, 0x40, 0x3c, 0xfe, 0x98, 0x4c, 0x7a, 0xbe, 0xff, 0xfc, 0x28,
+	0xb9, 0xff, 0x15, 0x60, 0xf4, 0xfc, 0xe5, 0xd0, 0xe4, 0xbb, 0x5e, 0x63, 0xa6, 0x17, 0xb7, 0x17,
+	0x03, 0xee, 0xce, 0xeb, 0x82, 0x08, 0x50, 0x5a, 0x34, 0x8b, 0xa5, 0x8a, 0xf1, 0xe2, 0xf1, 0xd1,
+	0xec, 0xd5, 0x9e, 0xb7, 0x3f, 0x3e, 0x46, 0x66, 0xc3, 0x01, 0x8e, 0x9f, 0x9f, 0x2b, 0x86, 0x05,
+	0xfb, 0xdd, 0xbd, 0xdb, 0x32, 0x7b, 0xf6, 0x0f, 0xa4, 0xb3, 0x81, 0x22, 0x88, 0x00, 0x4e, 0x00,
+	0xe3, 0x04, 0xd5, 0xc4, 0xe3, 0xc7, 0xc9, 0x7a, 0x34, 0x31, 0x93, 0xfc, 0x6a, 0xab, 0x7a, 0xf8,
+	0xd4, 0xd1, 0xce, 0x72, 0x3b, 0xba, 0xdc, 0x96, 0x77, 0x11, 0x0a, 0xf2, 0xc9, 0xa5, 0x07, 0x76,
+	0xe5, 0x86, 0xee, 0x1f, 0xcc, 0x64, 0x33, 0x01, 0x23, 0xa5, 0x08, 0x29, 0x4d, 0x08, 0x18, 0xd0,
+	0x4c, 0x48, 0x6b, 0xc6, 0x7d, 0x3b, 0xb2, 0xd9, 0xa1, 0xbe, 0xec, 0x3d, 0x9c, 0x35, 0x5f, 0x43,
+	0xa4, 0xad, 0xe0, 0xda, 0x02, 0x38, 0x71, 0x71, 0xea, 0xc9, 0xfe, 0x2d, 0xa9, 0xbb, 0xef, 0xec,
+	0x49, 0x05, 0x8a, 0x09, 0x01, 0x5f, 0x77, 0x4e, 0x50, 0x4c, 0x50, 0x04, 0x28, 0x06, 0x14, 0x01,
+	0x3b, 0x37, 0x07, 0x41, 0x57, 0x41, 0x0f, 0x1d, 0xbf, 0x30, 0xf5, 0xc4, 0x86, 0x01, 0x28, 0xa6,
+	0x13, 0x7b, 0x77, 0x64, 0x8a, 0x37, 0x87, 0x44, 0x4b, 0xf4, 0x00, 0xb0, 0xab, 0x37, 0x53, 0x64,
+	0xa6, 0x13, 0x1b, 0x02, 0x30, 0x7a, 0xfe, 0x72, 0xc8, 0x44, 0xbd, 0x99, 0x90, 0xe1, 0x45, 0xe0,
+	0xbd, 0xc0, 0x7a, 0x41, 0xec, 0x04, 0xc6, 0x0b, 0xac, 0x6f, 0xe6, 0x81, 0x6b, 0xf5, 0x5e, 0x80,
+	0x50, 0x33, 0x18, 0xd8, 0xfe, 0xc2, 0x59, 0x09, 0xd6, 0x0d, 0x50, 0xce, 0xf4, 0x76, 0xa7, 0x35,
+	0x7b, 0xe3, 0x00, 0xe3, 0x9b, 0x96, 0x38, 0x41, 0x6c, 0x05, 0x89, 0xbd, 0x0e, 0x21, 0x48, 0x5a,
+	0xbd, 0x15, 0x81, 0xf3, 0x02, 0xad, 0xd8, 0xe5, 0xb6, 0xff, 0xd3, 0xb3, 0x92, 0xbe, 0x5e, 0x69,
+	0x41, 0x58, 0xe7, 0x6a, 0x12, 0x5a, 0x8a, 0x9d, 0x80, 0x09, 0x10, 0x34, 0x23, 0x65, 0xb4, 0xc6,
+	0x1e, 0x88, 0x9d, 0x20, 0xb6, 0x40, 0xe2, 0x9a, 0x66, 0x3c, 0xe0, 0xbc, 0x50, 0xe0, 0x51, 0x59,
+	0xf7, 0x09, 0x9c, 0x3a, 0xda, 0x59, 0x4e, 0x1c, 0x5c, 0x64, 0x04, 0x91, 0x15, 0x44, 0xa6, 0x69,
+	0xb5, 0x9b, 0x2c, 0xb2, 0x82, 0xba, 0x15, 0x34, 0xac, 0x20, 0x71, 0x82, 0xc4, 0x7a, 0x58, 0x27,
+	0xee, 0xbd, 0x43, 0xdd, 0x8b, 0xeb, 0x06, 0x00, 0x00, 0x11, 0x8c, 0xfd, 0x35, 0x67, 0x6c, 0x64,
+	0x04, 0xb5, 0x44, 0x50, 0x4d, 0x04, 0xd5, 0xd6, 0xb8, 0x66, 0x04, 0x91, 0x01, 0xea, 0x2d, 0x88,
+	0xd8, 0x0a, 0xa6, 0xcb, 0xd6, 0x0a, 0xf0, 0x55, 0x3b, 0xda, 0x6d, 0x01, 0xd4, 0xac, 0xbc, 0xfe,
+	0x5b, 0x29, 0x9a, 0x2f, 0x37, 0x3c, 0xaa, 0xa6, 0x05, 0xd0, 0x82, 0xa8, 0x26, 0x4d, 0x90, 0xc8,
+	0x08, 0x1a, 0x46, 0x50, 0x6b, 0x78, 0x5c, 0x5b, 0x68, 0xcc, 0x33, 0xfb, 0x37, 0x36, 0x0c, 0xe0,
+	0x83, 0x43, 0xbd, 0x53, 0xc6, 0xca, 0x73, 0xb3, 0xe5, 0x64, 0xd1, 0x58, 0xfc, 0x07, 0xa2, 0x79,
+	0x02, 0x1e, 0xf5, 0xc4, 0x83, 0x44, 0x10, 0x27, 0x66, 0x31, 0x71, 0xf4, 0xec, 0x3b, 0x8f, 0x6e,
+	0x9b, 0x69, 0x47, 0x7b, 0x55, 0x6f, 0xc1, 0xb9, 0x9f, 0xca, 0x4f, 0x0f, 0x74, 0xa7, 0x3f, 0xa9,
+	0xd4, 0x9d, 0xae, 0x24, 0xa2, 0x05, 0xcd, 0xcf, 0x0e, 0x10, 0x14, 0x43, 0xb2, 0x1d, 0x59, 0x6d,
+	0xae, 0xcc, 0x36, 0x9e, 0x7f, 0x6a, 0x6f, 0xf1, 0xd3, 0x76, 0x35, 0xdb, 0x06, 0x18, 0x19, 0x5b,
+	0xd8, 0x1c, 0x06, 0xc9, 0x69, 0x26, 0x39, 0xb2, 0xa7, 0x27, 0x93, 0xe9, 0xdd, 0xa4, 0x75, 0x36,
+	0x60, 0x02, 0x80, 0x7a, 0x22, 0x52, 0xaa, 0x18, 0xfb, 0xfb, 0x54, 0xa3, 0x2e, 0x8c, 0x2f, 0xe3,
+	0x24, 0x7c, 0xf9, 0xdd, 0xc7, 0x3a, 0xe6, 0x37, 0x0c, 0x60, 0x64, 0x6c, 0x6a, 0x30, 0x97, 0x55,
+	0xdf, 0xee, 0xeb, 0xcf, 0xf7, 0x59, 0x67, 0x39, 0x4a, 0x3c, 0x9c, 0x17, 0xc8, 0x4d, 0x22, 0x8a,
+	0x09, 0xd9, 0x90, 0xa0, 0x94, 0xf6, 0x3f, 0xfc, 0x59, 0xfd, 0x3b, 0x71, 0xee, 0xc1, 0x93, 0x07,
+	0xb7, 0x4e, 0xac, 0x1b, 0xe0, 0x95, 0x4b, 0xa5, 0x5c, 0x67, 0x2a, 0xf8, 0x79, 0xf8, 0xae, 0x62,
+	0xbf, 0xf5, 0x40, 0xb9, 0xe1, 0x90, 0x38, 0x0f, 0x6b, 0x05, 0x5e, 0x9a, 0x08, 0x4c, 0x04, 0xad,
+	0x09, 0xa1, 0x62, 0x14, 0x33, 0x0a, 0x1a, 0x82, 0xf1, 0x5f, 0x2a, 0x57, 0xe6, 0x8c, 0x19, 0x7a,
+	0xff, 0xe0, 0xd6, 0xda, 0x72, 0xfa, 0x2b, 0x26, 0x61, 0x8e, 0xf5, 0x99, 0xfd, 0x03, 0x85, 0xbe,
+	0x6a, 0x2c, 0x28, 0x2d, 0x5a, 0xd4, 0x8d, 0xc0, 0x79, 0x02, 0x31, 0x43, 0x29, 0x05, 0xa5, 0x14,
+	0x88, 0x19, 0xce, 0x13, 0xea, 0x46, 0x50, 0xaa, 0x58, 0xd4, 0x2c, 0x70, 0x60, 0x77, 0xa1, 0x2f,
+	0x07, 0x3e, 0xb3, 0x92, 0xfe, 0xb2, 0x00, 0x23, 0x63, 0x53, 0x83, 0xbd, 0x85, 0xe0, 0x70, 0x18,
+	0x90, 0x2a, 0x55, 0x0d, 0x1a, 0xd6, 0xb7, 0x65, 0xd7, 0x2a, 0x06, 0xa1, 0x22, 0xd5, 0xd3, 0x11,
+	0x1e, 0x1e, 0xf9, 0x66, 0x7a, 0xf7, 0x9a, 0x01, 0xb4, 0xe6, 0x93, 0x61, 0xc8, 0x85, 0xab, 0x0b,
+	0x06, 0xd6, 0xc9, 0xaa, 0x6c, 0x72, 0xc1, 0x20, 0xd4, 0xaa, 0x10, 0x80, 0xde, 0x5c, 0xce, 0xc7,
+	0x92, 0x39, 0x30, 0x3a, 0x3e, 0x91, 0xb6, 0x71, 0x7e, 0xb2, 0xbf, 0x27, 0xd3, 0xb5, 0xa6, 0xc2,
+	0x11, 0xcd, 0xb7, 0xe2, 0xca, 0x4c, 0x7d, 0xa6, 0x56, 0x6e, 0xec, 0x3c, 0x7d, 0xf4, 0x8e, 0xfa,
+	0x2d, 0x83, 0x5c, 0x6a, 0x73, 0x12, 0xe7, 0x1f, 0xce, 0xa7, 0x55, 0xe0, 0xbd, 0x2c, 0xb5, 0xa4,
+	0xad, 0x96, 0x09, 0x38, 0xf4, 0x9b, 0xd2, 0x0f, 0x01, 0xb8, 0xb0, 0x2a, 0x00, 0x26, 0x39, 0x12,
+	0x6a, 0x2e, 0x5a, 0xb7, 0x3e, 0x80, 0x54, 0xa0, 0x8a, 0xf5, 0x86, 0x3f, 0xb4, 0x6a, 0x00, 0xf1,
+	0xb4, 0x8f, 0x09, 0xb0, 0xeb, 0x3c, 0x01, 0x62, 0x40, 0x18, 0xfb, 0x97, 0x9a, 0x5f, 0xba, 0x1e,
+	0x10, 0x6c, 0x51, 0x8a, 0x6f, 0x99, 0x24, 0x4c, 0x04, 0xcd, 0xcd, 0xcb, 0x07, 0x00, 0x9c, 0x17,
+	0x38, 0x11, 0x38, 0x7f, 0x8b, 0xb5, 0x4c, 0x80, 0x47, 0xd7, 0xaa, 0x01, 0x88, 0x31, 0x45, 0x84,
+	0x3e, 0xad, 0x6e, 0x20, 0xe4, 0x53, 0x8c, 0x7c, 0x4a, 0x21, 0x97, 0x62, 0x04, 0x0c, 0x28, 0x6a,
+	0x01, 0x88, 0xc0, 0x78, 0xa0, 0x16, 0x7b, 0x54, 0x63, 0x87, 0x6a, 0x7c, 0x83, 0xc4, 0x3a, 0x01,
+	0x29, 0x94, 0x56, 0x0d, 0xe0, 0xc9, 0x8f, 0xcc, 0x55, 0xcc, 0x67, 0xdb, 0x3a, 0xd3, 0x9d, 0xcc,
+	0x40, 0x5a, 0x33, 0x36, 0x65, 0x18, 0xb9, 0x90, 0x91, 0x0d, 0x09, 0x19, 0x4d, 0xc8, 0x06, 0x4d,
+	0x80, 0xc8, 0x34, 0x6b, 0x01, 0x45, 0xcd, 0x2a, 0x99, 0xc9, 0xa1, 0x6e, 0x04, 0xde, 0x03, 0xd3,
+	0xe5, 0xfa, 0xbc, 0xf7, 0x74, 0x7c, 0xc9, 0x40, 0x97, 0x9a, 0x00, 0x80, 0x57, 0x2f, 0x4e, 0x3f,
+	0xae, 0x15, 0x7d, 0x58, 0xcc, 0x05, 0x9b, 0x3a, 0xf2, 0x61, 0xa6, 0x98, 0x55, 0xc8, 0x06, 0x84,
+	0x6c, 0xc0, 0xd0, 0x0a, 0xd0, 0xad, 0x5b, 0xc4, 0x7a, 0xc0, 0x3a, 0x20, 0x32, 0x1e, 0x91, 0x11,
+	0x54, 0x22, 0x8b, 0xb9, 0x9a, 0x8d, 0xca, 0x35, 0xb3, 0x28, 0x9e, 0x5e, 0x7a, 0xeb, 0x91, 0x2d,
+	0x5f, 0xac, 0x09, 0x00, 0x00, 0x46, 0xc7, 0xa7, 0xf3, 0x71, 0xc2, 0xcf, 0x68, 0x91, 0x63, 0x00,
+	0xfa, 0x52, 0xa1, 0xf6, 0x85, 0x0c, 0xa7, 0xd2, 0xa1, 0x4a, 0xa5, 0x34, 0x85, 0x00, 0x10, 0x5b,
+	0x49, 0x1a, 0x89, 0x8b, 0x17, 0x23, 0x1f, 0x27, 0xce, 0xb2, 0x07, 0xae, 0x5a, 0x8f, 0xb3, 0xe9,
+	0x94, 0x9c, 0x1b, 0x1d, 0xee, 0xa9, 0x2e, 0xa7, 0xbf, 0xba, 0x7f, 0xc3, 0x71, 0xd1, 0x71, 0x34,
+	0x3b, 0x28, 0xe4, 0x07, 0x58, 0xa8, 0xc3, 0x33, 0x75, 0x00, 0x00, 0x7b, 0x59, 0xf0, 0x24, 0x0b,
+	0xda, 0xd1, 0x84, 0xce, 0x77, 0x4f, 0x8c, 0x0e, 0x93, 0x5d, 0x8d, 0xee, 0x6d, 0x6d, 0xff, 0x02,
+	0x8a, 0x75, 0xc5, 0x73, 0x9f, 0x09, 0xe4, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
+	0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_clients_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65,
+	0x61, 0x64, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x33, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x66, 0x37, 0x66, 0x63, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x2e, 0x33, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x64, 0x63, 0x65, 0x65, 0x66, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x61, 0x65, 0x64, 0x38, 0x66, 0x37, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x37, 0x64, 0x62, 0x38, 0x65, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x64, 0x79, 0x22, 0x20,
+	0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75,
+	0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x34, 0x2e,
+	0x36, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d,
+	0x22, 0x33, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x63, 0x34, 0x65, 0x37, 0x66, 0x63,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x32, 0x64, 0x33, 0x66, 0x36,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x35, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38, 0x66, 0x63, 0x36, 0x66,
+	0x31, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70,
+	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x36, 0x64, 0x38, 0x66, 0x39, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61,
+	0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d,
+	0x22, 0x67, 0x6c, 0x6f, 0x77, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20,
+	0x63, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x32, 0x66, 0x36, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20,
+	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x35, 0x66, 0x31, 0x66, 0x66,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22,
+	0x30, 0x2e, 0x35, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x35, 0x66, 0x31,
+	0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79,
+	0x3d, 0x22, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64,
+	0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65,
+	0x28, 0x31, 0x2e, 0x38, 0x31, 0x38, 0x20, 0x31, 0x2e, 0x39, 0x30, 0x39, 0x29, 0x20, 0x73, 0x63,
+	0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e, 0x39, 0x30, 0x39, 0x31, 0x29, 0x22, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x35, 0x2e, 0x36,
+	0x20, 0x33, 0x30, 0x2e, 0x39, 0x20, 0x43, 0x31, 0x32, 0x2e, 0x34, 0x20, 0x33, 0x30, 0x2e, 0x39,
+	0x20, 0x39, 0x2e, 0x36, 0x20, 0x33, 0x30, 0x2e, 0x34, 0x20, 0x37, 0x2e, 0x38, 0x20, 0x32, 0x39,
+	0x2e, 0x35, 0x20, 0x43, 0x36, 0x2e, 0x31, 0x20, 0x32, 0x38, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x32,
+	0x20, 0x32, 0x37, 0x2e, 0x36, 0x20, 0x35, 0x2e, 0x32, 0x20, 0x32, 0x36, 0x2e, 0x32, 0x20, 0x43,
+	0x35, 0x2e, 0x32, 0x20, 0x32, 0x34, 0x2e, 0x31, 0x20, 0x36, 0x2e, 0x33, 0x20, 0x32, 0x30, 0x2e,
+	0x35, 0x20, 0x37, 0x2e, 0x38, 0x20, 0x31, 0x38, 0x2e, 0x32, 0x20, 0x43, 0x39, 0x2e, 0x31, 0x20,
+	0x31, 0x36, 0x2e, 0x31, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x20, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x31,
+	0x33, 0x2e, 0x33, 0x20, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x4c, 0x31, 0x37, 0x2e, 0x39, 0x20, 0x31,
+	0x34, 0x2e, 0x36, 0x20, 0x43, 0x32, 0x30, 0x2e, 0x31, 0x20, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x32,
+	0x32, 0x2e, 0x31, 0x20, 0x31, 0x36, 0x2e, 0x31, 0x20, 0x32, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x38,
+	0x2e, 0x32, 0x20, 0x43, 0x32, 0x34, 0x2e, 0x39, 0x20, 0x32, 0x30, 0x2e, 0x35, 0x20, 0x32, 0x36,
+	0x20, 0x32, 0x34, 0x2e, 0x31, 0x20, 0x32, 0x36, 0x20, 0x32, 0x36, 0x2e, 0x32, 0x20, 0x43, 0x32,
+	0x36, 0x20, 0x32, 0x37, 0x2e, 0x36, 0x20, 0x32, 0x35, 0x2e, 0x31, 0x20, 0x32, 0x38, 0x2e, 0x37,
+	0x20, 0x32, 0x33, 0x2e, 0x34, 0x20, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x43, 0x32, 0x31, 0x2e, 0x36,
+	0x20, 0x33, 0x30, 0x2e, 0x34, 0x20, 0x31, 0x38, 0x2e, 0x38, 0x20, 0x33, 0x30, 0x2e, 0x39, 0x20,
+	0x31, 0x35, 0x2e, 0x36, 0x20, 0x33, 0x30, 0x2e, 0x39, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x62, 0x6f, 0x64, 0x79, 0x29, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x39, 0x62, 0x36, 0x65, 0x61, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e,
+	0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73,
+	0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x36, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22,
+	0x32, 0x38, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x36, 0x2e, 0x38, 0x22, 0x20, 0x72,
+	0x79, 0x3d, 0x22, 0x32, 0x2e, 0x36, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72,
+	0x6c, 0x28, 0x23, 0x67, 0x6c, 0x6f, 0x77, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x37, 0x2e, 0x39, 0x20, 0x31, 0x39,
+	0x2e, 0x38, 0x20, 0x43, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x36, 0x2e, 0x36, 0x20, 0x31, 0x31, 0x2e,
+	0x38, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x34,
+	0x20, 0x43, 0x31, 0x39, 0x2e, 0x34, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x20, 0x32, 0x31, 0x2e, 0x38,
+	0x20, 0x31, 0x36, 0x2e, 0x36, 0x20, 0x32, 0x33, 0x2e, 0x33, 0x20, 0x31, 0x39, 0x2e, 0x38, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x64, 0x39, 0x66, 0x31, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x31, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d,
+	0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x65, 0x6c,
+	0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x36, 0x22, 0x20,
+	0x63, 0x79, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x34, 0x2e,
+	0x38, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x36, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x23, 0x35, 0x66, 0x39, 0x65, 0x64, 0x38, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69,
+	0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x36, 0x22,
+	0x20, 0x63, 0x79, 0x3d, 0x22, 0x37, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x37, 0x2e, 0x34,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x68, 0x65, 0x61,
+	0x64, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x34, 0x62,
+	0x32, 0x65, 0x38, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x20,
+	0x43, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x31, 0x20,
+	0x31, 0x34, 0x2e, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x39, 0x20, 0x43,
+	0x31, 0x37, 0x2e, 0x31, 0x20, 0x31, 0x34, 0x2e, 0x39, 0x20, 0x31, 0x38, 0x2e, 0x36, 0x20, 0x31,
+	0x34, 0x2e, 0x36, 0x20, 0x32, 0x30, 0x2e, 0x32, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x3d, 0x22, 0x23, 0x65, 0x36, 0x66, 0x36, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75,
+	0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67,
+	0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_connect_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x07, 0x87, 0x49, 0x44, 0x41, 0x54, 0x58, 0x47, 0xed, 0x96, 0x69,
+	0x50, 0x14, 0x67, 0x1e, 0x87, 0xa9, 0x5a, 0x53, 0xd1, 0x75, 0xa3, 0xc9, 0x5a, 0x6b, 0xb2, 0x1a,
+	0x8c, 0xd9, 0x68, 0xca, 0x88, 0x91, 0x88, 0x8a, 0x07, 0x78, 0xc5, 0xdb, 0x55, 0x82, 0x78, 0xc4,
+	0x2b, 0xba, 0x2a, 0xa2, 0x80, 0xa2, 0x22, 0x97, 0xc8, 0x18, 0x04, 0x66, 0x04, 0x04, 0x15, 0xe4,
+	0x12, 0xd4, 0xa0, 0x22, 0xa8, 0x28, 0x8a, 0x06, 0x10, 0x23, 0x20, 0xb7, 0x72, 0x38, 0xdc, 0x88,
+	0x80, 0x72, 0x0f, 0x03, 0x23, 0x0c, 0xb7, 0x82, 0xf8, 0x6c, 0x4d, 0x47, 0xad, 0x64, 0xd7, 0x23,
+	0x1e, 0x1f, 0xf6, 0xc3, 0xfe, 0xaa, 0x9e, 0xea, 0xea, 0xaa, 0xae, 0xfe, 0x3d, 0xf5, 0x7f, 0xdf,
+	0x7e, 0xab, 0xd5, 0xd4, 0xfe, 0x9f, 0x37, 0x48, 0x75, 0x6d, 0x13, 0xca, 0xe6, 0x0e, 0x94, 0x4d,
+	0x1d, 0xc8, 0x15, 0x6d, 0x02, 0xff, 0xf9, 0xcc, 0x3b, 0x4d, 0x46, 0x4e, 0x15, 0x0f, 0x1f, 0x3e,
+	0x42, 0x95, 0xae, 0xae, 0x6e, 0xda, 0xda, 0x1f, 0xd2, 0xda, 0xde, 0x49, 0x7b, 0x7b, 0x27, 0x9d,
+	0x9d, 0x8f, 0x04, 0x9e, 0xa6, 0x4a, 0xde, 0xfe, 0x6e, 0x65, 0x3a, 0x1e, 0x3c, 0x42, 0x45, 0x53,
+	0xf3, 0x43, 0xee, 0x37, 0x76, 0x50, 0xa7, 0x68, 0x43, 0x56, 0xd7, 0x4c, 0x6d, 0x5d, 0x0b, 0x8d,
+	0x4d, 0x0f, 0x50, 0x3e, 0xa1, 0x41, 0xd9, 0x41, 0xa3, 0xb2, 0x83, 0x96, 0xd6, 0x4e, 0x1e, 0x3d,
+	0x82, 0xb4, 0x9c, 0xba, 0xb7, 0x17, 0x69, 0x69, 0xe9, 0x44, 0x5e, 0xdf, 0x46, 0x6d, 0x7d, 0x1b,
+	0x15, 0x55, 0x8d, 0x94, 0x55, 0xdc, 0xe7, 0x76, 0x89, 0x9c, 0xc2, 0x12, 0x39, 0xd5, 0xb5, 0xcd,
+	0xd4, 0xdf, 0x6f, 0x7f, 0xb6, 0x04, 0xb5, 0x75, 0x6d, 0xc8, 0xe4, 0xad, 0xd4, 0xd4, 0xb6, 0x08,
+	0x34, 0x2a, 0x1f, 0x50, 0x50, 0xac, 0x7c, 0x73, 0x89, 0xba, 0xfa, 0x76, 0xca, 0x2b, 0x9b, 0xc8,
+	0x2f, 0x92, 0x91, 0x9a, 0x71, 0x87, 0x98, 0x84, 0x2c, 0xae, 0xc4, 0x66, 0x10, 0x15, 0x23, 0x25,
+	0x32, 0x26, 0x8b, 0xac, 0xbc, 0x4a, 0x64, 0x75, 0xad, 0xd4, 0xc8, 0x5b, 0x04, 0xaa, 0x6a, 0x9a,
+	0xa9, 0xac, 0x69, 0xa6, 0xa2, 0xba, 0x89, 0x7b, 0x15, 0x8d, 0x94, 0x96, 0x35, 0x50, 0x2d, 0x6b,
+	0x21, 0x26, 0xa9, 0xea, 0xf5, 0x25, 0xa4, 0xb9, 0x72, 0xa4, 0x79, 0x32, 0xae, 0xc4, 0x66, 0x13,
+	0x12, 0x76, 0x9d, 0xa0, 0xd0, 0x18, 0x82, 0xc3, 0x12, 0x08, 0x09, 0xbf, 0x41, 0x48, 0x78, 0xba,
+	0x40, 0x66, 0x6e, 0x25, 0x95, 0x35, 0xbf, 0x96, 0xa9, 0x50, 0x95, 0xdd, 0x29, 0x55, 0x90, 0x57,
+	0x28, 0xa3, 0xf8, 0x6e, 0x03, 0x85, 0xc5, 0x0a, 0xf2, 0x8b, 0xea, 0xb9, 0x53, 0xd2, 0xf0, 0xfa,
+	0x02, 0x11, 0x31, 0x45, 0xf8, 0x1c, 0xbf, 0x86, 0xa7, 0xff, 0x45, 0xbc, 0x8f, 0x45, 0xe2, 0x73,
+	0x22, 0x0e, 0xdf, 0xa0, 0x14, 0x7c, 0x82, 0x52, 0xf1, 0xf8, 0x29, 0x89, 0x90, 0xcb, 0xd9, 0x94,
+	0x57, 0x37, 0x91, 0x9c, 0x56, 0x4c, 0xd4, 0xb5, 0x5b, 0x02, 0x71, 0x49, 0x05, 0x82, 0x70, 0x6e,
+	0x41, 0x2d, 0x85, 0x77, 0x14, 0xe4, 0x16, 0xca, 0x91, 0xe6, 0xd6, 0x92, 0x9d, 0x2f, 0x27, 0x38,
+	0xac, 0xf0, 0x8f, 0x4b, 0x6c, 0x11, 0x45, 0xe0, 0xea, 0x7b, 0x15, 0x47, 0xf7, 0x60, 0xc4, 0x9e,
+	0x97, 0x91, 0xf8, 0xc4, 0x20, 0xf1, 0x8d, 0x43, 0xec, 0x1d, 0x83, 0x83, 0xe7, 0x35, 0x82, 0x2f,
+	0x65, 0x51, 0x54, 0xaa, 0x10, 0xc6, 0x7d, 0xaf, 0xbc, 0x81, 0xbb, 0x4f, 0x88, 0x49, 0xcc, 0x27,
+	0xa7, 0x40, 0xf6, 0xa4, 0xbc, 0x4e, 0x28, 0x4f, 0x97, 0xd6, 0x90, 0x26, 0xad, 0x21, 0x38, 0x2c,
+	0xff, 0x8f, 0x0b, 0xe8, 0x2c, 0xf6, 0xc3, 0xd8, 0xf6, 0x27, 0xac, 0x1c, 0x43, 0xb0, 0x72, 0x8e,
+	0xc4, 0xca, 0x39, 0x02, 0x8b, 0xbd, 0x3f, 0x63, 0xed, 0x1c, 0x49, 0x64, 0x6c, 0x91, 0x50, 0xac,
+	0xda, 0x64, 0xaa, 0x35, 0xaf, 0x96, 0x35, 0x0b, 0x57, 0x15, 0xe5, 0x55, 0xcd, 0xdc, 0xb9, 0xdb,
+	0x20, 0x8c, 0x5d, 0x9a, 0x2b, 0x23, 0x23, 0x5b, 0x46, 0x4a, 0x7a, 0x25, 0x09, 0x37, 0x2a, 0xf0,
+	0x0f, 0x92, 0x22, 0x72, 0x49, 0x7c, 0xb5, 0x84, 0xd6, 0x7c, 0x6f, 0xd4, 0xd4, 0x37, 0x32, 0x69,
+	0xa1, 0x03, 0x9b, 0x76, 0x9d, 0xc5, 0x70, 0xe7, 0x39, 0x0c, 0x6d, 0x42, 0x59, 0x6b, 0x75, 0x16,
+	0x63, 0x51, 0x18, 0x45, 0x25, 0x0a, 0x6a, 0x55, 0x1b, 0xaf, 0xb6, 0x45, 0xf8, 0x0c, 0x55, 0x3c,
+	0xdd, 0xf5, 0x77, 0xcb, 0x1b, 0x29, 0x2a, 0xb9, 0x4f, 0xde, 0xed, 0x7a, 0x52, 0xd3, 0xcb, 0xb9,
+	0x9e, 0x72, 0x8f, 0xa4, 0xb4, 0x2a, 0x7e, 0x89, 0x2f, 0xe3, 0xa0, 0x7f, 0x1a, 0xce, 0x1e, 0xa9,
+	0xaf, 0x16, 0x30, 0xb1, 0x8d, 0x60, 0x8a, 0x81, 0x1b, 0x9f, 0x4f, 0xb4, 0x65, 0xfa, 0xaa, 0xc3,
+	0x18, 0x18, 0x9f, 0x64, 0x91, 0xc9, 0x49, 0x0c, 0x8c, 0x4f, 0xa0, 0xb7, 0x21, 0x10, 0xd7, 0xc3,
+	0xf1, 0xc2, 0x39, 0xd0, 0xdc, 0xdc, 0x49, 0x4b, 0x6b, 0x97, 0x70, 0x36, 0xa8, 0xee, 0x55, 0xdc,
+	0xab, 0x50, 0x0a, 0x02, 0xaa, 0xf1, 0xdf, 0xc8, 0xac, 0xe2, 0xd4, 0xf9, 0x9b, 0x44, 0xc5, 0x16,
+	0x23, 0x3e, 0x70, 0x05, 0xc9, 0xc1, 0x78, 0xdc, 0x7d, 0xd2, 0x58, 0xbb, 0x23, 0xea, 0xe5, 0x12,
+	0x07, 0xfc, 0xd2, 0xf0, 0x0d, 0xbc, 0x85, 0xbb, 0x5f, 0x32, 0x66, 0x76, 0xe7, 0x98, 0xb5, 0xf2,
+	0x20, 0xba, 0x4b, 0xbd, 0x98, 0xb6, 0xd2, 0x9f, 0xa9, 0x2b, 0xfc, 0x98, 0xb8, 0xc4, 0x1b, 0x89,
+	0x77, 0x2c, 0xb9, 0x85, 0x55, 0x64, 0x66, 0x95, 0x52, 0x54, 0x22, 0xa3, 0xa9, 0xe5, 0xa1, 0x80,
+	0x4a, 0xe0, 0x76, 0xb1, 0x82, 0xac, 0x3c, 0xb9, 0xb0, 0xee, 0x97, 0xa3, 0x0b, 0x08, 0xb9, 0x90,
+	0x83, 0xc1, 0x5a, 0x4f, 0x0c, 0x77, 0x9c, 0x61, 0xee, 0xea, 0x40, 0x36, 0xda, 0x44, 0xbf, 0x5c,
+	0xc0, 0xe5, 0x50, 0x0a, 0x9e, 0x01, 0xe9, 0x04, 0x9e, 0xce, 0xe5, 0x52, 0x74, 0x29, 0xdb, 0x76,
+	0x9d, 0xe0, 0x73, 0x6d, 0x53, 0x34, 0x66, 0xbb, 0x31, 0x6a, 0xfe, 0x41, 0x34, 0xe7, 0x1d, 0x60,
+	0xc4, 0x1c, 0x77, 0xc6, 0xe8, 0xb9, 0x31, 0x7c, 0x86, 0x98, 0x1d, 0x4e, 0xe7, 0x69, 0xef, 0xe8,
+	0x12, 0x50, 0x09, 0xa8, 0x36, 0x60, 0x66, 0x8e, 0x8c, 0xa4, 0x9b, 0x95, 0x5c, 0x8d, 0x2f, 0xc3,
+	0xd4, 0x2e, 0x9c, 0x45, 0x86, 0x7e, 0x8c, 0x98, 0xe1, 0xc8, 0x04, 0x03, 0x5f, 0x66, 0xfd, 0x70,
+	0xea, 0xe5, 0x02, 0xae, 0x5e, 0x29, 0x78, 0x1e, 0x49, 0xe7, 0xc8, 0xa9, 0x2c, 0x42, 0x2e, 0xe4,
+	0x13, 0x15, 0x7b, 0x0f, 0xcf, 0x80, 0x18, 0x06, 0x68, 0x1a, 0xd1, 0x7f, 0xcc, 0x6e, 0x3e, 0xd5,
+	0x91, 0xa0, 0xae, 0x23, 0x66, 0xe0, 0x44, 0x31, 0xfd, 0xb5, 0x1d, 0x19, 0xab, 0xe7, 0x46, 0x55,
+	0x8d, 0x52, 0xa0, 0xe4, 0x5e, 0xe3, 0xb3, 0xf1, 0x27, 0xa4, 0x56, 0xb2, 0x79, 0xf7, 0x25, 0x7a,
+	0x0c, 0x5a, 0x83, 0xfa, 0x68, 0x13, 0xb6, 0xee, 0x8e, 0x60, 0x83, 0x55, 0x38, 0x83, 0x27, 0xef,
+	0x7f, 0xb9, 0xc0, 0x3e, 0xef, 0x54, 0x3c, 0x02, 0xd2, 0x08, 0x08, 0x92, 0x12, 0x1c, 0x96, 0xc7,
+	0xcf, 0xd7, 0x4a, 0xb1, 0x15, 0x9f, 0xe5, 0xa3, 0xe1, 0x1b, 0xf8, 0xb3, 0x86, 0x2d, 0x7d, 0x46,
+	0x8a, 0xe8, 0xab, 0x42, 0x73, 0x37, 0x1f, 0x7c, 0x2d, 0xa2, 0x9f, 0x96, 0x1d, 0xd7, 0x93, 0x6f,
+	0x0b, 0xdc, 0x2e, 0xbe, 0xcf, 0xad, 0x1c, 0x19, 0x19, 0x59, 0x32, 0x4e, 0x87, 0xe7, 0xd1, 0x4f,
+	0xd3, 0x92, 0xbf, 0x7c, 0xb5, 0x1d, 0x9d, 0x45, 0x5e, 0x7c, 0x31, 0xc5, 0x85, 0x41, 0x3a, 0x7b,
+	0xf9, 0xd3, 0x30, 0xfb, 0xff, 0x75, 0x01, 0xaf, 0x9b, 0x1c, 0x3a, 0x92, 0x8e, 0x6f, 0x60, 0x26,
+	0xce, 0x9e, 0xbf, 0xa0, 0xbf, 0xde, 0x9f, 0x9e, 0x5f, 0x9a, 0x09, 0xc5, 0xcf, 0xe3, 0xbd, 0x2f,
+	0x6d, 0xd8, 0xb6, 0xe7, 0x92, 0x80, 0xea, 0xf8, 0x8e, 0x49, 0x2e, 0x67, 0xab, 0x5b, 0x1c, 0x1f,
+	0x8e, 0x75, 0xa2, 0xc7, 0x3f, 0x36, 0xa1, 0xf6, 0xa9, 0x3e, 0x26, 0xf6, 0xe1, 0xf8, 0x04, 0x4a,
+	0x09, 0x38, 0x11, 0x47, 0xa3, 0xb2, 0x89, 0xa0, 0xa0, 0xa0, 0x17, 0x4b, 0xd8, 0xbb, 0xa5, 0x72,
+	0xf8, 0x78, 0x16, 0x26, 0xd6, 0xa7, 0xe8, 0x3d, 0x78, 0x29, 0xbd, 0x35, 0x6c, 0xe8, 0xa3, 0x69,
+	0xff, 0x5f, 0xc5, 0x7d, 0x47, 0xee, 0x16, 0xa6, 0xd0, 0x5b, 0xc3, 0x0e, 0xf5, 0x09, 0x0e, 0x02,
+	0xd2, 0x7c, 0x05, 0xbb, 0xf6, 0x45, 0x63, 0xf3, 0xcd, 0xf7, 0x1c, 0xef, 0xa1, 0x4e, 0x58, 0xef,
+	0xbf, 0x23, 0xe9, 0x35, 0x08, 0x89, 0x9e, 0x39, 0x47, 0x4f, 0xc6, 0xd2, 0xd4, 0xa4, 0x04, 0x1e,
+	0xe3, 0xe6, 0xb6, 0xef, 0xc5, 0x02, 0xaa, 0xb8, 0xfb, 0xa6, 0x33, 0x7a, 0x9e, 0x98, 0xf7, 0xd4,
+	0x97, 0xf3, 0xc1, 0x08, 0xbb, 0x67, 0xa5, 0x1f, 0x8d, 0xfa, 0x91, 0xbf, 0x8d, 0x71, 0xe0, 0x93,
+	0x71, 0x8e, 0x0c, 0x18, 0x2f, 0x66, 0xe0, 0x04, 0x31, 0x03, 0xc6, 0x3b, 0xf1, 0xf1, 0x58, 0x07,
+	0x81, 0xef, 0xcc, 0x42, 0xb1, 0x1c, 0xb5, 0x9c, 0x07, 0xbd, 0xd4, 0x60, 0x66, 0x2f, 0x58, 0xff,
+	0x31, 0xcc, 0xed, 0x89, 0x74, 0xf1, 0x6c, 0x6a, 0x6a, 0xe5, 0x34, 0xb4, 0xb6, 0x22, 0x72, 0x72,
+	0x7a, 0x79, 0xb9, 0x2a, 0xe6, 0x0e, 0x71, 0x8c, 0x5e, 0x70, 0x88, 0x81, 0xa3, 0xb7, 0xd1, 0x47,
+	0x63, 0x3b, 0x1f, 0x7e, 0xb3, 0x87, 0x4f, 0xb4, 0x1d, 0xf9, 0x4c, 0x77, 0x2f, 0x43, 0xa6, 0xba,
+	0x30, 0x6c, 0xc6, 0x3e, 0x86, 0xcf, 0x74, 0x47, 0x63, 0xd6, 0xaf, 0x7c, 0x35, 0xd3, 0x4d, 0x40,
+	0x53, 0x57, 0x84, 0x62, 0x9d, 0x11, 0xe8, 0xab, 0xc3, 0xa9, 0xf9, 0x74, 0x9d, 0xd0, 0x23, 0x3b,
+	0x70, 0x1b, 0xe5, 0x35, 0x95, 0x94, 0xd5, 0xd6, 0x11, 0x66, 0x6b, 0xf5, 0xbb, 0xf2, 0xcc, 0xcc,
+	0x4c, 0x22, 0x23, 0x23, 0x9f, 0x2f, 0xb4, 0xc4, 0x38, 0x94, 0x21, 0xd3, 0x5c, 0x18, 0x36, 0xdd,
+	0x85, 0x21, 0x53, 0x5d, 0x19, 0x3a, 0xcd, 0x15, 0x8d, 0x59, 0xfb, 0xd1, 0x9a, 0xef, 0x81, 0xb6,
+	0xbe, 0x17, 0x13, 0x16, 0x7a, 0x33, 0xd1, 0xc0, 0x87, 0x09, 0x06, 0xde, 0x8c, 0x5b, 0xe8, 0x25,
+	0xe0, 0xae, 0xbb, 0x12, 0xac, 0xcc, 0xc1, 0x7c, 0x1c, 0xdd, 0xa1, 0xdf, 0x93, 0x15, 0x68, 0x49,
+	0x56, 0xc1, 0x1d, 0xb2, 0x0b, 0x8a, 0x09, 0xf6, 0x93, 0x90, 0xb4, 0x45, 0x9b, 0xc4, 0x41, 0x3d,
+	0x85, 0xc2, 0xf0, 0x2b, 0x57, 0x84, 0xdf, 0xb7, 0xe2, 0xe2, 0xe2, 0xe7, 0x0b, 0xa8, 0x32, 0x78,
+	0xb2, 0x2b, 0xe3, 0xf4, 0xbd, 0x98, 0xba, 0xec, 0xf0, 0x33, 0xbe, 0x5d, 0xee, 0xcf, 0xcc, 0x55,
+	0x47, 0x98, 0xb3, 0xfa, 0x28, 0x73, 0x56, 0x1f, 0x13, 0xae, 0x33, 0x7e, 0x38, 0x26, 0x20, 0x1d,
+	0x38, 0x14, 0xac, 0xac, 0x61, 0xb3, 0x2e, 0x5d, 0x61, 0x2b, 0x48, 0x38, 0x7d, 0x90, 0xa8, 0xeb,
+	0x69, 0x04, 0x79, 0x39, 0x92, 0xe1, 0xb5, 0x0c, 0xf9, 0x05, 0x23, 0xca, 0xf7, 0xe9, 0x21, 0x0d,
+	0x3c, 0x4a, 0x37, 0x90, 0x9b, 0x97, 0xf7, 0xe2, 0xf2, 0xa7, 0x19, 0xad, 0xe7, 0x2d, 0x94, 0x2c,
+	0x36, 0x3e, 0xc9, 0x0a, 0xb3, 0x10, 0x56, 0x6f, 0x3f, 0xc3, 0xbf, 0x76, 0x84, 0xb2, 0xf6, 0x37,
+	0xac, 0xb2, 0xba, 0x28, 0xd0, 0xfc, 0xfe, 0xfb, 0xe0, 0x28, 0x06, 0xa3, 0xef, 0x20, 0x6c, 0x0d,
+	0x8a, 0xf3, 0xa6, 0xdc, 0x08, 0xb4, 0xa4, 0xfe, 0xc2, 0x66, 0x48, 0xb0, 0x44, 0x11, 0x61, 0xce,
+	0xcd, 0xf8, 0x8b, 0x28, 0x1f, 0x74, 0x91, 0x9c, 0x98, 0xfc, 0xea, 0xf2, 0xdf, 0x66, 0xa9, 0x49,
+	0x30, 0x86, 0xd6, 0xe7, 0x85, 0xd3, 0xcd, 0xdc, 0xe1, 0x32, 0x56, 0x92, 0x08, 0x6c, 0x24, 0x91,
+	0x58, 0x4b, 0x22, 0xd9, 0xea, 0x1a, 0x2b, 0xf0, 0xf8, 0x8b, 0xcf, 0xc0, 0xdf, 0x0f, 0x76, 0xd9,
+	0x80, 0xb3, 0x01, 0x24, 0x9a, 0x43, 0x82, 0x05, 0xa4, 0xd8, 0xa2, 0xb8, 0xba, 0x93, 0xc4, 0xa8,
+	0x33, 0x94, 0x57, 0xd7, 0x13, 0x93, 0x10, 0xc7, 0xe9, 0x45, 0xb3, 0x5f, 0x4f, 0xe0, 0x69, 0x7e,
+	0x74, 0x4b, 0x60, 0xcf, 0xfe, 0x78, 0xc4, 0x1e, 0xf1, 0x38, 0x79, 0x5e, 0x47, 0x72, 0x28, 0x81,
+	0x5d, 0x3e, 0x69, 0x02, 0x7c, 0x3b, 0x09, 0xfe, 0x39, 0x0b, 0x4c, 0x36, 0x82, 0x95, 0x11, 0x84,
+	0x6e, 0x82, 0x9b, 0x22, 0x48, 0x13, 0x91, 0x79, 0xd1, 0x99, 0xf8, 0x1b, 0xb9, 0x5c, 0xb8, 0x78,
+	0x89, 0x73, 0x01, 0x96, 0x94, 0x5a, 0xcc, 0x79, 0x33, 0x81, 0xa7, 0x11, 0xb9, 0xc6, 0x23, 0x72,
+	0x4b, 0x42, 0xe4, 0x96, 0x8c, 0xc5, 0x81, 0x34, 0x01, 0x26, 0x69, 0x83, 0xe6, 0x30, 0x18, 0xaf,
+	0x09, 0xa2, 0x9d, 0x60, 0xb1, 0x16, 0xce, 0x6f, 0x81, 0x02, 0x67, 0xee, 0x27, 0xef, 0x25, 0xfa,
+	0x8c, 0x07, 0x89, 0x67, 0xec, 0x69, 0x48, 0x17, 0xf3, 0x38, 0xec, 0xf7, 0x5f, 0xc4, 0x1b, 0xc5,
+	0x6f, 0xc4, 0x64, 0x0c, 0x47, 0x4c, 0x79, 0xf6, 0xa2, 0x6e, 0xad, 0xaf, 0x61, 0xec, 0x08, 0x98,
+	0xa8, 0x09, 0x7a, 0xd3, 0xc1, 0x5e, 0x25, 0xb1, 0x01, 0x3c, 0xd7, 0x41, 0x86, 0x13, 0x94, 0x1c,
+	0x80, 0x32, 0x6f, 0x90, 0x05, 0x80, 0xaf, 0xe9, 0xdb, 0x0b, 0x98, 0xaa, 0xa9, 0x91, 0xac, 0xa6,
+	0xf6, 0xec, 0x45, 0xca, 0xe1, 0x43, 0x41, 0x57, 0x0b, 0x66, 0x4e, 0x84, 0x05, 0x53, 0x61, 0xe5,
+	0x02, 0xb0, 0xb7, 0x80, 0xdd, 0x16, 0x60, 0xb7, 0x1e, 0xfc, 0xcd, 0x20, 0xd4, 0x1a, 0xfc, 0xcc,
+	0x78, 0xb4, 0x4e, 0xff, 0xed, 0x05, 0x54, 0xd9, 0xd0, 0xa3, 0x07, 0xc1, 0xfd, 0xfa, 0x0a, 0x1c,
+	0xef, 0xff, 0x57, 0xd0, 0xd1, 0x02, 0xfd, 0xe9, 0xb0, 0x6c, 0x1e, 0xac, 0x37, 0x00, 0xd3, 0xe5,
+	0x60, 0x6f, 0x06, 0x87, 0x1c, 0xc1, 0x5b, 0x0c, 0xfb, 0xed, 0x28, 0x59, 0xb1, 0xe0, 0xdd, 0x94,
+	0xbf, 0x28, 0x05, 0xe3, 0x46, 0xd2, 0xb9, 0x74, 0x2e, 0xdd, 0x46, 0x4b, 0xe8, 0xde, 0xbe, 0x86,
+	0x2e, 0x1b, 0x43, 0xe4, 0x5b, 0x56, 0x10, 0xad, 0x3f, 0xfd, 0xb9, 0xc5, 0xff, 0x06, 0x52, 0xb6,
+	0xc7, 0xc0, 0x7a, 0xbd, 0xc3, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+	0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_connect_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x6c,
+	0x6f, 0x62, 0x65, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x36, 0x22, 0x20, 0x63,
+	0x79, 0x3d, 0x22, 0x30, 0x2e, 0x32, 0x38, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x32,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x61, 0x66, 0x32, 0x66, 0x63, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x39, 0x33, 0x62, 0x34, 0x65, 0x32, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x36, 0x63, 0x62, 0x35, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x32, 0x34, 0x34, 0x64, 0x38, 0x66, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6c,
+	0x75, 0x67, 0x62, 0x6f, 0x64, 0x79, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79,
+	0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d,
+	0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70,
+	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x64, 0x39, 0x38, 0x61, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70,
+	0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x30, 0x61, 0x38, 0x32, 0x38, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x30, 0x36, 0x66, 0x31, 0x32, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65,
+	0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70,
+	0x72, 0x6f, 0x6e, 0x67, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x30, 0x66, 0x30, 0x66, 0x34, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x38, 0x62, 0x63, 0x63, 0x36, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x37, 0x63, 0x38, 0x30, 0x39, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x33, 0x22,
+	0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x32, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x38,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x67, 0x6c, 0x6f,
+	0x62, 0x65, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x64,
+	0x33, 0x66, 0x37, 0x38, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x67, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x65, 0x65, 0x66, 0x34, 0x66, 0x63, 0x22, 0x20, 0x6f,
+	0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x32, 0x22, 0x20, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61,
+	0x74, 0x65, 0x28, 0x2d, 0x32, 0x2e, 0x39, 0x20, 0x2d, 0x30, 0x2e, 0x34, 0x35, 0x29, 0x20, 0x73,
+	0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e, 0x39, 0x35, 0x35, 0x29, 0x22, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x32, 0x2e, 0x36,
+	0x20, 0x39, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x33, 0x2e, 0x36, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x31,
+	0x35, 0x2e, 0x38, 0x20, 0x38, 0x20, 0x51, 0x31, 0x38, 0x2e, 0x34, 0x20, 0x37, 0x2e, 0x38, 0x20,
+	0x31, 0x39, 0x2e, 0x38, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x51, 0x32, 0x31, 0x2e, 0x32, 0x20, 0x39,
+	0x2e, 0x36, 0x20, 0x32, 0x30, 0x2e, 0x34, 0x20, 0x31, 0x31, 0x20, 0x51, 0x31, 0x39, 0x2e, 0x35,
+	0x20, 0x31, 0x32, 0x20, 0x31, 0x39, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x51, 0x31,
+	0x39, 0x20, 0x31, 0x35, 0x2e, 0x38, 0x20, 0x31, 0x37, 0x2e, 0x33, 0x20, 0x31, 0x37, 0x2e, 0x38,
+	0x20, 0x51, 0x31, 0x36, 0x2e, 0x33, 0x20, 0x31, 0x38, 0x2e, 0x36, 0x20, 0x31, 0x35, 0x2e, 0x39,
+	0x20, 0x31, 0x37, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x35, 0x2e, 0x35, 0x20, 0x31, 0x35, 0x20, 0x31,
+	0x34, 0x2e, 0x37, 0x20, 0x31, 0x34, 0x20, 0x51, 0x31, 0x33, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e,
+	0x36, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x31, 0x2e,
+	0x37, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x39, 0x2e, 0x32, 0x20,
+	0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73,
+	0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22,
+	0x31, 0x35, 0x2e, 0x38, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x20,
+	0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x33, 0x35, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x28, 0x31, 0x38, 0x20, 0x32,
+	0x30, 0x2e, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x38, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x33, 0x2e, 0x39, 0x20,
+	0x36, 0x2e, 0x34, 0x20, 0x51, 0x31, 0x35, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x32, 0x20, 0x31, 0x38,
+	0x20, 0x35, 0x2e, 0x36, 0x20, 0x51, 0x31, 0x39, 0x2e, 0x36, 0x20, 0x36, 0x20, 0x31, 0x39, 0x2e,
+	0x31, 0x20, 0x37, 0x2e, 0x31, 0x20, 0x51, 0x31, 0x36, 0x2e, 0x39, 0x20, 0x37, 0x2e, 0x35, 0x20,
+	0x31, 0x34, 0x2e, 0x37, 0x20, 0x37, 0x2e, 0x35, 0x20, 0x51, 0x31, 0x33, 0x2e, 0x38, 0x20, 0x37,
+	0x2e, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x34, 0x20, 0x5a, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32,
+	0x30, 0x2e, 0x38, 0x20, 0x37, 0x2e, 0x34, 0x20, 0x51, 0x32, 0x32, 0x2e, 0x36, 0x20, 0x37, 0x20,
+	0x32, 0x33, 0x2e, 0x36, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x51, 0x32, 0x32, 0x2e, 0x39, 0x20, 0x39,
+	0x2e, 0x33, 0x20, 0x32, 0x31, 0x2e, 0x34, 0x20, 0x38, 0x2e, 0x39, 0x20, 0x51, 0x32, 0x30, 0x2e,
+	0x35, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x37, 0x2e, 0x34, 0x20, 0x5a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x39, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x30, 0x2e, 0x37,
+	0x20, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x32, 0x20,
+	0x51, 0x31, 0x30, 0x2e, 0x37, 0x20, 0x31, 0x37, 0x2e, 0x32, 0x20, 0x39, 0x2e, 0x36, 0x20, 0x31,
+	0x37, 0x2e, 0x39, 0x20, 0x51, 0x38, 0x2e, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x34, 0x20, 0x39, 0x2e,
+	0x33, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x20, 0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f,
+	0x67, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78,
+	0x3d, 0x22, 0x38, 0x2e, 0x34, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x36, 0x2e, 0x32, 0x22, 0x20,
+	0x72, 0x78, 0x3d, 0x22, 0x34, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x32, 0x2e, 0x33,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22,
+	0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65,
+	0x28, 0x2d, 0x33, 0x32, 0x20, 0x38, 0x2e, 0x34, 0x20, 0x36, 0x2e, 0x32, 0x29, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x35, 0x20,
+	0x32, 0x34, 0x20, 0x51, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x32, 0x37, 0x20, 0x32, 0x36, 0x20, 0x32,
+	0x39, 0x2e, 0x34, 0x20, 0x51, 0x32, 0x33, 0x2e, 0x38, 0x20, 0x33, 0x30, 0x2e, 0x34, 0x20, 0x32,
+	0x31, 0x20, 0x32, 0x39, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f,
+	0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x38, 0x61, 0x30,
+	0x66, 0x30, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c,
+	0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x35, 0x20,
+	0x32, 0x34, 0x20, 0x51, 0x32, 0x39, 0x20, 0x32, 0x37, 0x20, 0x32, 0x35, 0x2e, 0x38, 0x20, 0x32,
+	0x39, 0x2e, 0x31, 0x20, 0x51, 0x32, 0x34, 0x20, 0x33, 0x30, 0x20, 0x32, 0x31, 0x2e, 0x37, 0x20,
+	0x32, 0x39, 0x2e, 0x31, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x65, 0x63, 0x33, 0x62, 0x31,
+	0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x32, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63,
+	0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74,
+	0x61, 0x74, 0x65, 0x28, 0x34, 0x35, 0x20, 0x32, 0x32, 0x20, 0x32, 0x31, 0x29, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x31, 0x37, 0x2e,
+	0x32, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x31, 0x39, 0x2e, 0x31, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x34, 0x2e, 0x32, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22,
+	0x31, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x70, 0x72, 0x6f, 0x6e, 0x67, 0x29, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x35, 0x63, 0x36, 0x30, 0x37, 0x30,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74,
+	0x20, 0x78, 0x3d, 0x22, 0x31, 0x37, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x32, 0x31, 0x2e,
+	0x34, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x34, 0x2e, 0x32, 0x22, 0x20, 0x68,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x31, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22,
+	0x30, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x70, 0x72, 0x6f, 0x6e, 0x67, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x35, 0x63, 0x36, 0x30, 0x37, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x38, 0x22,
+	0x20, 0x79, 0x3d, 0x22, 0x31, 0x37, 0x2e, 0x36, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x36, 0x2e, 0x34, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x36, 0x2e,
+	0x38, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x32, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x70, 0x6c, 0x75, 0x67, 0x62, 0x6f, 0x64, 0x79, 0x29,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x61, 0x34, 0x61, 0x31,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x30, 0x2e, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63,
+	0x74, 0x20, 0x78, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x31, 0x38,
+	0x2e, 0x34, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x38, 0x22, 0x20,
+	0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x35, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x78, 0x3d,
+	0x22, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e,
+	0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76,
+	0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_connecting_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x00, 0xd7, 0x49, 0x44, 0x41, 0x54, 0x58, 0x47, 0xed, 0x8e, 0x41,
+	0x0e, 0x84, 0x30, 0x0c, 0x03, 0x79, 0x7a, 0x9f, 0xc6, 0xcf, 0x76, 0x95, 0x83, 0x25, 0x30, 0x09,
+	0x71, 0xd2, 0xf6, 0xb0, 0xd2, 0x5a, 0x9a, 0x0b, 0x35, 0xf1, 0x1c, 0xc7, 0x3f, 0x62, 0xc6, 0x18,
+	0x9f, 0x0e, 0x7c, 0xa7, 0x15, 0x3b, 0x74, 0x9e, 0x67, 0x8b, 0x69, 0x89, 0x99, 0xf1, 0x69, 0x89,
+	0x15, 0xe3, 0xa0, 0x2c, 0xb1, 0x72, 0x1c, 0xc8, 0x12, 0x3b, 0xc6, 0x41, 0x2a, 0xb1, 0x73, 0x1c,
+	0x84, 0x12, 0xd9, 0xb8, 0x85, 0xbf, 0x45, 0x64, 0xdd, 0x87, 0x84, 0x32, 0x8e, 0xf0, 0x1b, 0xa3,
+	0x76, 0x6f, 0x12, 0x6f, 0x02, 0x5e, 0xb8, 0xd3, 0xe9, 0xca, 0x02, 0xea, 0x61, 0x2f, 0xdc, 0xb9,
+	0x52, 0x12, 0xc8, 0x06, 0xbc, 0xf0, 0xff, 0x4c, 0x59, 0xc0, 0x50, 0xc3, 0xff, 0x79, 0xb4, 0x04,
+	0x8c, 0x2c, 0xdc, 0x8f, 0x68, 0x0b, 0x18, 0x51, 0xb8, 0xf7, 0xc6, 0xef, 0x0a, 0x64, 0xe1, 0x7e,
+	0x44, 0x4b, 0x40, 0x0d, 0xff, 0xe7, 0x51, 0x16, 0xf0, 0xa2, 0xbc, 0x45, 0x94, 0x04, 0xbc, 0x74,
+	0x3a, 0x57, 0x64, 0x01, 0x2f, 0xdc, 0xe9, 0x74, 0x65, 0x01, 0x3e, 0xcc, 0x6f, 0x8c, 0xda, 0xbd,
+	0x09, 0xa8, 0x12, 0xfc, 0x2d, 0x22, 0xeb, 0x3e, 0xc6, 0x91, 0x4c, 0x62, 0x05, 0xe1, 0x38, 0xb2,
+	0x53, 0x22, 0x1d, 0x47, 0x76, 0x48, 0xc8, 0xe3, 0xc8, 0x4a, 0x89, 0xf2, 0x38, 0xb2, 0x42, 0xa2,
+	0x3d, 0x8e, 0xcc, 0x48, 0x4c, 0x8f, 0x23, 0x76, 0xa8, 0x03, 0xdf, 0xe1, 0x7c, 0x01, 0x71, 0x43,
+	0xb3, 0x20, 0x82, 0x4c, 0xdc, 0x39, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+	0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_connecting_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x63,
+	0x74, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x65, 0x39, 0x65, 0x39, 0x65, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x62, 0x39, 0x62, 0x39, 0x62, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x38, 0x37, 0x38, 0x37, 0x38, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x30, 0x20, 0x32, 0x2e, 0x35, 0x20, 0x48,
+	0x32, 0x34, 0x20, 0x4c, 0x33, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x30, 0x20, 0x56, 0x32, 0x34, 0x20,
+	0x4c, 0x32, 0x34, 0x20, 0x33, 0x31, 0x2e, 0x35, 0x20, 0x48, 0x31, 0x30, 0x20, 0x4c, 0x32, 0x2e,
+	0x35, 0x20, 0x32, 0x34, 0x20, 0x56, 0x31, 0x30, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x6f, 0x63, 0x74, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x36, 0x65, 0x36, 0x65, 0x37, 0x36, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x30, 0x2e,
+	0x34, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x48, 0x32, 0x33, 0x2e, 0x36, 0x20, 0x4c, 0x33, 0x30, 0x2e,
+	0x35, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x20, 0x56, 0x31, 0x35, 0x2e, 0x35, 0x20, 0x51, 0x31, 0x36,
+	0x20, 0x31, 0x32, 0x20, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x20, 0x56, 0x31, 0x30,
+	0x2e, 0x34, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e,
+	0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d,
+	0x22, 0x31, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x36, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32,
+	0x33, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x34, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x62, 0x75, 0x74, 0x74, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x32, 0x33, 0x2e,
+	0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x78, 0x32, 0x3d,
+	0x22, 0x31, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32, 0x33, 0x2e, 0x34, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x34, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65,
+	0x63, 0x61, 0x70, 0x3d, 0x22, 0x62, 0x75, 0x74, 0x74, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73,
+	0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_disconnect_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x03, 0x8a, 0x49, 0x44, 0x41, 0x54, 0x58, 0x47, 0xed, 0x96, 0xcf,
+	0x4f, 0x54, 0x57, 0x1c, 0xc5, 0x0f, 0xc4, 0x0d, 0x1b, 0x7d, 0xac, 0x58, 0x80, 0x60, 0x48, 0xc6,
+	0x90, 0x00, 0x0b, 0x85, 0xa5, 0x4b, 0x49, 0xdc, 0xb9, 0x30, 0xfe, 0x0d, 0x24, 0xec, 0x58, 0x34,
+	0x71, 0xa9, 0x4b, 0x5b, 0xb5, 0x60, 0xfc, 0x49, 0xdb, 0x4c, 0xa1, 0x75, 0x52, 0xb5, 0xa1, 0xd0,
+	0xb4, 0x41, 0x69, 0x81, 0xa0, 0xa2, 0x14, 0x42, 0x06, 0xe2, 0x44, 0x51, 0xb0, 0xad, 0x2d, 0x4a,
+	0x43, 0x34, 0x31, 0x0a, 0x21, 0x22, 0xbc, 0xd3, 0x9c, 0x37, 0xf3, 0xde, 0xdc, 0x77, 0xe7, 0x0d,
+	0x0c, 0x83, 0x49, 0x37, 0x3d, 0xc9, 0x27, 0x33, 0xb9, 0xf7, 0x7b, 0xbf, 0xe7, 0xe4, 0xcd, 0xbc,
+	0x7b, 0x2f, 0xf0, 0xbf, 0x0a, 0xd4, 0x38, 0xc0, 0x09, 0x80, 0xfa, 0xbc, 0x0f, 0x70, 0x0c, 0xe0,
+	0x5d, 0x80, 0x77, 0x32, 0x8c, 0x00, 0x1c, 0x02, 0xf8, 0x0b, 0xc0, 0x41, 0x80, 0xb7, 0x00, 0xf6,
+	0x03, 0xb4, 0xfb, 0x14, 0x25, 0xdf, 0xfc, 0x4f, 0x80, 0x8b, 0x19, 0x5e, 0x5a, 0xbc, 0xc8, 0xb0,
+	0x90, 0x61, 0x16, 0xe0, 0xcf, 0x00, 0xbf, 0xdd, 0x69, 0x08, 0x99, 0xff, 0xa6, 0xe6, 0x8d, 0x8d,
+	0x74, 0x17, 0x16, 0xc8, 0xe5, 0xe5, 0x82, 0x50, 0xed, 0xb3, 0xc6, 0x46, 0xfe, 0x08, 0xb0, 0xbb,
+	0xd8, 0x10, 0x81, 0x79, 0x7d, 0x3d, 0xdd, 0xd9, 0x59, 0x72, 0x71, 0x71, 0x5b, 0x68, 0xcd, 0x7c,
+	0x7d, 0x3d, 0x7f, 0x00, 0xf8, 0xd5, 0x76, 0x43, 0x04, 0xe6, 0x75, 0x75, 0x74, 0x27, 0x27, 0xc9,
+	0x27, 0x4f, 0x8a, 0x42, 0x6b, 0xe7, 0xea, 0xea, 0xf8, 0x3d, 0xc0, 0x2f, 0x0a, 0x0d, 0x11, 0x98,
+	0xc7, 0x62, 0x74, 0x87, 0x86, 0xc8, 0x89, 0x89, 0x1d, 0xa1, 0x1e, 0x4f, 0x63, 0x31, 0x5e, 0x07,
+	0x78, 0x65, 0xab, 0x10, 0x81, 0x79, 0x6d, 0x2d, 0xdd, 0xde, 0x5e, 0x72, 0x70, 0x30, 0xcb, 0xcc,
+	0x0c, 0x39, 0x32, 0x12, 0x1e, 0x8b, 0x42, 0x35, 0xe3, 0xe3, 0xa1, 0x31, 0xf5, 0x9a, 0xad, 0xad,
+	0x65, 0x02, 0xe0, 0xc5, 0x7c, 0x21, 0x02, 0xf3, 0x9a, 0x1a, 0xba, 0xf1, 0x38, 0x79, 0xe3, 0x46,
+	0x16, 0xfd, 0x0c, 0xd2, 0x9b, 0x37, 0x64, 0x5f, 0x5f, 0x78, 0xce, 0x44, 0x73, 0xaa, 0x91, 0xb4,
+	0xc6, 0x98, 0x53, 0xcf, 0xc7, 0x35, 0x35, 0xfc, 0x06, 0xe0, 0x79, 0x3b, 0x44, 0x60, 0x5e, 0x55,
+	0x45, 0xb7, 0xa3, 0x83, 0xec, 0xea, 0xca, 0x32, 0x3a, 0x9a, 0x6e, 0xe8, 0xeb, 0xf5, 0x6b, 0xb2,
+	0xbb, 0x3b, 0x5c, 0x23, 0x34, 0xa6, 0x39, 0x53, 0x5a, 0x6b, 0xd4, 0xa8, 0xf7, 0xa3, 0xaa, 0x2a,
+	0x7e, 0x0d, 0xb0, 0xc3, 0x0c, 0x21, 0x73, 0xbd, 0xe7, 0xee, 0xc9, 0x93, 0xe4, 0xe9, 0xd3, 0x59,
+	0xf4, 0x24, 0xa2, 0xb4, 0xb4, 0x44, 0x76, 0x76, 0x66, 0xeb, 0xf4, 0x5d, 0x63, 0x51, 0x52, 0x0f,
+	0xa3, 0xe7, 0x7a, 0x6b, 0x2b, 0xa7, 0x00, 0x7e, 0x69, 0x06, 0x78, 0x90, 0xd9, 0x60, 0x78, 0xe2,
+	0x44, 0x2e, 0xfe, 0xe3, 0xb7, 0xa5, 0xd7, 0xed, 0xd4, 0xa9, 0x34, 0xfa, 0x1e, 0xa5, 0xc9, 0x49,
+	0x6e, 0xb4, 0xb5, 0xf1, 0x7d, 0x4b, 0x0b, 0x57, 0xf6, 0xed, 0xe3, 0x5b, 0xc0, 0x63, 0xde, 0x7e,
+	0x2b, 0xb4, 0xbd, 0x7a, 0x01, 0x5a, 0x5b, 0xa3, 0x19, 0x1b, 0xb3, 0x5b, 0xa7, 0xa5, 0xcd, 0x49,
+	0x44, 0xe8, 0x43, 0x22, 0xc1, 0x95, 0xca, 0xca, 0xc0, 0xd4, 0x44, 0x01, 0xae, 0x9a, 0x01, 0xee,
+	0x65, 0xb6, 0x54, 0x1e, 0x3f, 0x9e, 0x9f, 0xe1, 0x61, 0xdb, 0x23, 0xaf, 0xd6, 0xe2, 0xf1, 0x1c,
+	0x53, 0x3b, 0x40, 0xe8, 0x95, 0xd4, 0x81, 0xe2, 0x05, 0x38, 0x7c, 0x78, 0x73, 0x06, 0x06, 0x6c,
+	0xaf, 0x1c, 0x6d, 0x65, 0x2e, 0xe6, 0x00, 0x5e, 0x32, 0x03, 0x8c, 0xfa, 0x01, 0x0e, 0x1e, 0xdc,
+	0x9a, 0xfe, 0x7e, 0xdb, 0x33, 0x50, 0x21, 0xe6, 0x7e, 0x80, 0xd0, 0x7e, 0xf0, 0x9f, 0x07, 0x18,
+	0xf6, 0x03, 0xec, 0xde, 0x9d, 0x9f, 0xbd, 0x7b, 0xc9, 0x87, 0x0f, 0x6d, 0xcf, 0x1c, 0x6d, 0x24,
+	0x93, 0x5c, 0x76, 0x1c, 0xbe, 0x03, 0xf2, 0xa2, 0x00, 0x9d, 0x66, 0x80, 0x5f, 0x01, 0xfe, 0xa3,
+	0x00, 0x25, 0x25, 0xd1, 0x94, 0x97, 0x93, 0xd3, 0xd3, 0xb6, 0x57, 0x5e, 0x29, 0xc4, 0xaa, 0xe3,
+	0x70, 0x15, 0x88, 0xe4, 0x99, 0xbd, 0x11, 0xe9, 0x26, 0xb3, 0x04, 0xf0, 0x03, 0xc0, 0x75, 0x80,
+	0x1b, 0x25, 0x25, 0x01, 0xeb, 0x8e, 0x43, 0x26, 0x93, 0xb6, 0x87, 0xa7, 0x8d, 0x78, 0xdc, 0x23,
+	0x4a, 0x6e, 0x32, 0xc9, 0x35, 0xc7, 0xe1, 0x1a, 0x90, 0xc3, 0x1f, 0x00, 0xcf, 0x99, 0x01, 0x6e,
+	0x03, 0x7c, 0x25, 0x63, 0x9b, 0x4d, 0xcc, 0xb5, 0xb7, 0xfb, 0x75, 0xde, 0xd9, 0x11, 0xa5, 0x64,
+	0xd2, 0xeb, 0x61, 0xf7, 0x7d, 0x0e, 0xf0, 0xac, 0x19, 0x60, 0x40, 0xa9, 0x4a, 0x4b, 0xc9, 0x5d,
+	0xbb, 0xc2, 0x34, 0x35, 0xd9, 0x2d, 0xd3, 0xea, 0xe9, 0xc9, 0xad, 0xd5, 0x58, 0x94, 0xd4, 0xc3,
+	0xaa, 0x9d, 0x2a, 0x2d, 0xe5, 0x67, 0x66, 0x80, 0x3e, 0x80, 0x3f, 0x01, 0xfc, 0xab, 0xac, 0x8c,
+	0xdc, 0xb3, 0x27, 0x4c, 0x5b, 0x5b, 0xb8, 0x61, 0x22, 0x91, 0x5b, 0xe3, 0xa3, 0x39, 0x53, 0x5a,
+	0x6b, 0xd5, 0xa4, 0xca, 0xca, 0x3c, 0xf3, 0x4f, 0xec, 0x13, 0x51, 0x17, 0x48, 0xdd, 0x64, 0x9f,
+	0xeb, 0xb1, 0x57, 0x56, 0x86, 0x69, 0x6f, 0x4f, 0x37, 0xd4, 0xd1, 0x6a, 0xcf, 0xd9, 0xa8, 0x46,
+	0xd2, 0x1a, 0x6b, 0x2e, 0xe5, 0x38, 0xd1, 0xe6, 0xbe, 0x74, 0x4c, 0xf6, 0xea, 0x64, 0xac, 0xa8,
+	0x20, 0xf7, 0xef, 0x0f, 0x73, 0xf4, 0x68, 0xee, 0x58, 0x3e, 0x22, 0x6a, 0x53, 0x15, 0x15, 0x9b,
+	0x9b, 0xfb, 0xd2, 0x05, 0xf2, 0xa6, 0xfe, 0x13, 0xd5, 0xd5, 0xe4, 0x81, 0x03, 0x1f, 0x85, 0x54,
+	0x75, 0x75, 0x61, 0xe6, 0xbe, 0xba, 0x00, 0x7e, 0x07, 0xf0, 0xf7, 0x58, 0x8c, 0x3c, 0x74, 0x68,
+	0x47, 0xa4, 0x62, 0x31, 0x7e, 0xba, 0x1d, 0x73, 0x5f, 0x97, 0x01, 0x5e, 0xd3, 0xa6, 0xd1, 0xd0,
+	0x40, 0x1e, 0x39, 0x52, 0x14, 0xa9, 0x86, 0x86, 0xe2, 0xcc, 0x7d, 0x5d, 0x00, 0xd8, 0xa3, 0xad,
+	0x53, 0xaf, 0xd2, 0xb1, 0x63, 0xdb, 0x22, 0xd5, 0xd4, 0xb4, 0x33, 0x73, 0x5f, 0xba, 0x40, 0xc6,
+	0x01, 0xa6, 0x9a, 0x9b, 0xf9, 0xb2, 0xa5, 0xc5, 0xe3, 0x45, 0x86, 0x05, 0x83, 0xbf, 0x0d, 0xa6,
+	0x9a, 0x9b, 0x3f, 0x8e, 0xb9, 0xaf, 0xcf, 0x33, 0x57, 0x28, 0xfd, 0x37, 0x74, 0x91, 0xd0, 0xcf,
+	0xa3, 0xd3, 0x4c, 0x4f, 0x48, 0xe8, 0x60, 0x51, 0x8d, 0xb6, 0xd7, 0x33, 0x40, 0xc1, 0xe6, 0xff,
+	0x02, 0x62, 0x95, 0xfb, 0x9a, 0x6d, 0xfe, 0xcb, 0xb7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+	0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_disconnect_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x63,
+	0x74, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x37, 0x62, 0x37, 0x62, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x65, 0x34, 0x32, 0x61, 0x32, 0x61, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x39, 0x65, 0x30, 0x64, 0x30, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70,
+	0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x30, 0x20, 0x32, 0x2e, 0x35, 0x20, 0x48,
+	0x32, 0x34, 0x20, 0x4c, 0x33, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x30, 0x20, 0x56, 0x32, 0x34, 0x20,
+	0x4c, 0x32, 0x34, 0x20, 0x33, 0x31, 0x2e, 0x35, 0x20, 0x48, 0x31, 0x30, 0x20, 0x4c, 0x32, 0x2e,
+	0x35, 0x20, 0x32, 0x34, 0x20, 0x56, 0x31, 0x30, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x6f, 0x63, 0x74, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x37, 0x38, 0x30, 0x61, 0x30, 0x61, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x30, 0x2e,
+	0x34, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x48, 0x32, 0x33, 0x2e, 0x36, 0x20, 0x4c, 0x33, 0x30, 0x2e,
+	0x35, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x20, 0x56, 0x31, 0x35, 0x2e, 0x35, 0x20, 0x51, 0x31, 0x36,
+	0x20, 0x31, 0x32, 0x20, 0x32, 0x2e, 0x35, 0x20, 0x31, 0x35, 0x2e, 0x35, 0x20, 0x56, 0x31, 0x30,
+	0x2e, 0x34, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e,
+	0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d,
+	0x22, 0x31, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x36, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32,
+	0x33, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x34, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x62, 0x75, 0x74, 0x74, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x32, 0x33, 0x2e,
+	0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x78, 0x32, 0x3d,
+	0x22, 0x31, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32, 0x33, 0x2e, 0x34, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x34, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65,
+	0x63, 0x61, 0x70, 0x3d, 0x22, 0x62, 0x75, 0x74, 0x74, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73,
+	0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_import_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x04, 0x4d, 0x49, 0x44, 0x41, 0x54, 0x58, 0x85, 0xed, 0x96, 0x5d,
+	0x6c, 0x14, 0x55, 0x14, 0xc7, 0xff, 0x77, 0xee, 0xcc, 0xee, 0xce, 0x6e, 0xb7, 0x5b, 0xfa, 0x2d,
+	0x49, 0xa5, 0x1f, 0x54, 0x92, 0xb6, 0x44, 0xa8, 0x94, 0x06, 0xda, 0xb4, 0x8b, 0x80, 0x56, 0x63,
+	0x2a, 0x3e, 0xac, 0x89, 0x22, 0x89, 0x3e, 0x18, 0xf5, 0xc1, 0x18, 0xa2, 0x60, 0x8c, 0x51, 0xaa,
+	0x31, 0x18, 0x5f, 0x48, 0xf4, 0x81, 0x57, 0x4c, 0x04, 0x35, 0xd1, 0x04, 0x1f, 0x24, 0x08, 0x58,
+	0xe8, 0x03, 0xa9, 0x6d, 0xa4, 0x2d, 0x88, 0x40, 0x49, 0x3f, 0xa8, 0xb5, 0xa5, 0xed, 0x76, 0x5d,
+	0xb2, 0x5f, 0xdd, 0xbd, 0x3b, 0x73, 0xef, 0xf5, 0x61, 0x35, 0xb6, 0xb5, 0xdb, 0x9d, 0xa9, 0xf1,
+	0x49, 0xff, 0xc9, 0x24, 0xf3, 0x30, 0xe7, 0xfe, 0x7f, 0xf7, 0x9c, 0x73, 0xcf, 0x5c, 0xe0, 0x7f,
+	0xfd, 0xd7, 0x45, 0xac, 0x7e, 0x58, 0x5f, 0xdf, 0xe5, 0x08, 0xf9, 0xbc, 0x2f, 0x17, 0x97, 0x95,
+	0x76, 0xa8, 0x0a, 0xd1, 0xd7, 0x6a, 0x18, 0x8b, 0xc6, 0x6e, 0xc7, 0xa3, 0xf1, 0xe3, 0xc1, 0xfe,
+	0x43, 0x3f, 0xd9, 0x00, 0x90, 0xa4, 0x71, 0xff, 0x37, 0xd7, 0xea, 0x77, 0xf9, 0x1b, 0x5c, 0x4e,
+	0xcd, 0x32, 0xf4, 0x8a, 0x22, 0xc0, 0xd8, 0xcd, 0x51, 0x7e, 0xbd, 0xfb, 0x7b, 0xff, 0x7c, 0xff,
+	0x1b, 0x97, 0x55, 0x2b, 0x31, 0x65, 0xcd, 0xc7, 0x9a, 0x0b, 0xab, 0x3b, 0xea, 0x34, 0x85, 0x90,
+	0x75, 0x2e, 0x89, 0x22, 0x8f, 0x82, 0xd9, 0x08, 0x87, 0x4a, 0x09, 0x0a, 0x3d, 0x0a, 0xe6, 0xa2,
+	0x1c, 0x2e, 0x8d, 0xc0, 0xe7, 0x56, 0x30, 0x17, 0xe1, 0x39, 0x01, 0xf2, 0xcb, 0x2b, 0xe8, 0xfa,
+	0x0d, 0x15, 0xc7, 0xe6, 0xfb, 0xb1, 0xdd, 0x12, 0x80, 0x14, 0xb2, 0x46, 0x75, 0x38, 0xc8, 0xaf,
+	0xf3, 0x0b, 0xd8, 0x59, 0xe3, 0x45, 0x67, 0xa3, 0x1b, 0xef, 0x9f, 0xfe, 0x0d, 0x5b, 0x2a, 0x5c,
+	0x78, 0xec, 0x41, 0x37, 0xde, 0xf9, 0x3a, 0x84, 0xed, 0x95, 0x6e, 0xec, 0x69, 0x70, 0xe3, 0xf0,
+	0x97, 0xf3, 0x98, 0x0e, 0x9b, 0xb9, 0x17, 0xa5, 0x5a, 0x15, 0x00, 0x58, 0x02, 0x00, 0x08, 0x61,
+	0x8c, 0x83, 0x73, 0x03, 0xdd, 0x57, 0x63, 0x60, 0x8c, 0x63, 0x78, 0x72, 0x01, 0xf7, 0x22, 0x69,
+	0xc4, 0x12, 0x26, 0x46, 0xa6, 0x92, 0x48, 0x2e, 0x98, 0x08, 0x45, 0x0c, 0x4c, 0xce, 0xa4, 0x60,
+	0x0a, 0x99, 0x73, 0x45, 0x93, 0x4b, 0x62, 0x03, 0x00, 0xf0, 0x85, 0x06, 0x10, 0xcc, 0x6b, 0xc0,
+	0x58, 0xd2, 0x8d, 0xb1, 0xbb, 0x09, 0x00, 0x40, 0x34, 0xc6, 0x30, 0x32, 0x95, 0x79, 0x1f, 0x8e,
+	0x33, 0x0c, 0x4f, 0xc6, 0xad, 0x2e, 0x07, 0x61, 0x0a, 0xd8, 0x02, 0xd8, 0x3b, 0xf1, 0x16, 0xf1,
+	0xe8, 0x0a, 0xd8, 0xbe, 0x13, 0x90, 0x65, 0x9b, 0x2d, 0x1b, 0xad, 0xa4, 0xe9, 0xd9, 0x28, 0xbe,
+	0xb8, 0x16, 0x35, 0x6c, 0x01, 0x68, 0xc4, 0x90, 0x35, 0xb5, 0xc5, 0x64, 0xe2, 0xd4, 0x13, 0x68,
+	0x78, 0xfe, 0x03, 0xd4, 0x3e, 0xf5, 0x1a, 0x40, 0xd6, 0x76, 0x20, 0x06, 0x6f, 0x30, 0x9c, 0xfa,
+	0x34, 0x61, 0x02, 0x80, 0x7a, 0x62, 0x27, 0xb6, 0x48, 0x05, 0xc5, 0xab, 0x05, 0x74, 0xf3, 0x73,
+	0xf5, 0xc4, 0x4c, 0x91, 0xda, 0x6d, 0x55, 0xa8, 0x6b, 0x79, 0x00, 0x3d, 0x9f, 0x7d, 0x88, 0xb9,
+	0xc1, 0x73, 0xd8, 0x76, 0xe8, 0x24, 0x1c, 0xf9, 0x45, 0xb6, 0x01, 0xe4, 0xa2, 0x16, 0x51, 0x89,
+	0x53, 0xb9, 0x50, 0xb4, 0xbe, 0xd4, 0xad, 0x17, 0x14, 0x88, 0x6c, 0x01, 0x07, 0xf8, 0xa4, 0x1a,
+	0x0f, 0x6b, 0xc4, 0xe3, 0xe4, 0xc8, 0x5b, 0xe7, 0x44, 0xe7, 0x2b, 0x2d, 0xe8, 0xfb, 0xf6, 0x06,
+	0x2e, 0xbc, 0x58, 0x87, 0xa6, 0xb7, 0xbf, 0x42, 0xf1, 0xe6, 0x36, 0x5b, 0x00, 0x62, 0x09, 0x00,
+	0x88, 0xba, 0xe7, 0xa5, 0xa7, 0xdd, 0xfa, 0x7d, 0x55, 0xab, 0x20, 0x0b, 0x60, 0xf2, 0x12, 0xc0,
+	0xd3, 0x40, 0x32, 0x02, 0x15, 0x40, 0x6b, 0x47, 0x25, 0x26, 0x86, 0xe7, 0xd0, 0xfb, 0xee, 0xe3,
+	0xa8, 0xde, 0x77, 0x10, 0x9b, 0x9e, 0xeb, 0x02, 0x51, 0xa8, 0x35, 0x82, 0xc5, 0x00, 0x90, 0x12,
+	0x6c, 0xf4, 0x12, 0xf4, 0x70, 0x9f, 0xad, 0x5d, 0x00, 0x40, 0xe5, 0x06, 0x27, 0x8a, 0x9e, 0xd9,
+	0x88, 0x8b, 0x67, 0x8f, 0x23, 0x38, 0x74, 0x1e, 0x3b, 0x8e, 0x76, 0x83, 0xba, 0x3c, 0x39, 0xe3,
+	0xc4, 0xa2, 0x1a, 0xa8, 0x00, 0x20, 0x59, 0x12, 0x32, 0x95, 0xb5, 0x02, 0xab, 0x4a, 0xb2, 0x74,
+	0x26, 0x43, 0x00, 0x04, 0x00, 0x92, 0x7b, 0x04, 0x60, 0xb1, 0x93, 0x0a, 0x48, 0x08, 0xd3, 0x04,
+	0x37, 0x14, 0xdb, 0xe6, 0xbf, 0xdc, 0x89, 0xa3, 0xef, 0xf2, 0x3d, 0x54, 0x3e, 0x79, 0x10, 0xb5,
+	0xfb, 0xdf, 0x03, 0x51, 0xe8, 0x92, 0x06, 0xcb, 0x4e, 0xbd, 0x08, 0x40, 0x4a, 0x98, 0xdd, 0x67,
+	0xa6, 0x12, 0x0a, 0x25, 0x59, 0x87, 0xb8, 0x00, 0xd5, 0x88, 0xaa, 0xe9, 0xbb, 0x1f, 0x2e, 0x80,
+	0x27, 0x4f, 0x85, 0x69, 0x4a, 0x5c, 0xf9, 0x31, 0x86, 0xbb, 0x73, 0x04, 0x8d, 0x47, 0xce, 0xa2,
+	0xb0, 0xa1, 0x0d, 0x12, 0xb0, 0x66, 0x8e, 0x65, 0x4d, 0x28, 0x0d, 0xb9, 0x37, 0xc1, 0xcd, 0x1c,
+	0xc7, 0x70, 0xd7, 0xee, 0x76, 0x77, 0xff, 0x9b, 0xb1, 0x08, 0x23, 0xa9, 0x85, 0x34, 0x7a, 0x7b,
+	0x13, 0xd0, 0x6b, 0x76, 0xa0, 0xe5, 0xc8, 0xe7, 0xd0, 0xf2, 0x8b, 0x60, 0xb7, 0x78, 0x12, 0x7f,
+	0x25, 0x41, 0x7d, 0xa1, 0x17, 0x57, 0x73, 0x05, 0x94, 0x36, 0x3d, 0x5a, 0xde, 0x46, 0x07, 0xe5,
+	0xf8, 0x48, 0x8c, 0x4c, 0xcd, 0x48, 0x6c, 0x3c, 0x70, 0x14, 0xf7, 0x77, 0x66, 0x06, 0x91, 0x85,
+	0xb1, 0xff, 0x37, 0x2d, 0xc9, 0x80, 0xd5, 0x20, 0x2e, 0x15, 0x04, 0x93, 0x25, 0x78, 0xe8, 0xa3,
+	0xd3, 0xc8, 0xaf, 0xde, 0x9a, 0xd9, 0xc1, 0x1a, 0xcc, 0x97, 0x87, 0x59, 0xee, 0xbc, 0x1f, 0xca,
+	0x5f, 0x4d, 0x35, 0x7d, 0xf2, 0x33, 0xf2, 0xaa, 0xb6, 0x42, 0x48, 0xfc, 0xa3, 0x47, 0xda, 0xcd,
+	0x00, 0x21, 0x42, 0x84, 0x1c, 0xb5, 0x5c, 0x71, 0xe6, 0xad, 0x29, 0xe5, 0xcb, 0x65, 0x72, 0x09,
+	0x90, 0x4c, 0xeb, 0x58, 0x02, 0xe0, 0x84, 0xdc, 0x1e, 0x99, 0x08, 0xd1, 0x14, 0x33, 0xe1, 0x74,
+	0x58, 0xae, 0x5a, 0x56, 0x5d, 0xbf, 0x35, 0x2b, 0x20, 0x71, 0x13, 0xb0, 0x71, 0x29, 0xad, 0x6c,
+	0xff, 0xf8, 0x4c, 0x69, 0x71, 0x7e, 0xfb, 0x23, 0xfe, 0x4d, 0x1e, 0x4a, 0xed, 0xcf, 0x8c, 0x3f,
+	0x35, 0x3d, 0x13, 0x31, 0xbe, 0xbb, 0x78, 0xcb, 0x60, 0x8c, 0xb7, 0xce, 0x5f, 0x79, 0x7d, 0xc8,
+	0xc6, 0xff, 0xb4, 0x4b, 0x29, 0x6d, 0xf2, 0x3e, 0xeb, 0x74, 0xd0, 0x56, 0xa2, 0x10, 0xd7, 0x5a,
+	0x01, 0x4c, 0x43, 0xdc, 0x31, 0x0d, 0xe3, 0x64, 0x70, 0xe0, 0xf0, 0x18, 0x60, 0x23, 0x03, 0x2b,
+	0x29, 0x10, 0x08, 0xd0, 0xf1, 0xf1, 0x71, 0x25, 0x95, 0x4a, 0x91, 0x92, 0x92, 0x92, 0x25, 0x69,
+	0xd1, 0x75, 0x5d, 0x06, 0x83, 0x41, 0xe1, 0xf5, 0x7a, 0x65, 0x4f, 0x4f, 0x0f, 0x47, 0x96, 0x33,
+	0x63, 0x15, 0x80, 0x34, 0x37, 0x37, 0x7b, 0x01, 0xe8, 0x9a, 0xa6, 0x39, 0x01, 0xa8, 0x86, 0x61,
+	0x50, 0x4d, 0xb3, 0x7e, 0x45, 0xe7, 0x9c, 0x0b, 0x29, 0xa5, 0x49, 0x29, 0x4d, 0x1b, 0x86, 0xc1,
+	0xc2, 0xe1, 0x70, 0x7c, 0x74, 0x74, 0x94, 0x59, 0xea, 0x28, 0xbf, 0xdf, 0x4f, 0x39, 0xe7, 0x1e,
+	0x42, 0x88, 0x4b, 0x08, 0xa1, 0x01, 0x80, 0xa6, 0x69, 0x56, 0xbd, 0x01, 0x00, 0x34, 0xd3, 0x38,
+	0x0e, 0xce, 0xb9, 0xea, 0x72, 0xb9, 0xa8, 0xcf, 0xe7, 0x33, 0x01, 0x30, 0xdb, 0x25, 0x08, 0x04,
+	0x02, 0x74, 0x68, 0x68, 0x48, 0xf5, 0xf9, 0x7c, 0x54, 0x55, 0x55, 0x55, 0xd7, 0x75, 0x85, 0x31,
+	0xa6, 0x00, 0x00, 0xe7, 0x9c, 0xb8, 0xdd, 0x6e, 0xc2, 0x18, 0x13, 0x7f, 0x98, 0xca, 0x64, 0x32,
+	0x29, 0xbc, 0x5e, 0x2f, 0x67, 0x8c, 0xf1, 0x74, 0x3a, 0x6d, 0x0e, 0x0c, 0x0c, 0x18, 0x76, 0x3d,
+	0xff, 0x55, 0xfd, 0x0e, 0x58, 0xc5, 0xde, 0xf5, 0x34, 0x01, 0x4a, 0xe9, 0x00, 0x00, 0x00, 0x00,
 	0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
 };
 
+static const unsigned char icon_toolbar_import_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x61,
+	0x72, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x35, 0x61, 0x61, 0x30, 0x66, 0x35, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x32, 0x65, 0x36, 0x65, 0x64,
+	0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69,
+	0x64, 0x3d, 0x22, 0x67, 0x6c, 0x61, 0x73, 0x73, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79,
+	0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66,
+	0x66, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x64, 0x62, 0x65, 0x61, 0x66, 0x65, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x72, 0x22, 0x20, 0x78, 0x31,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22,
+	0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66,
+	0x66, 0x65, 0x30, 0x38, 0x61, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x61, 0x62, 0x32, 0x65, 0x22, 0x2f,
+	0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65,
+	0x66, 0x38, 0x61, 0x31, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x67, 0x20, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61,
+	0x74, 0x65, 0x28, 0x2d, 0x30, 0x2e, 0x39, 0x36, 0x30, 0x20, 0x2d, 0x30, 0x2e, 0x39, 0x36, 0x30,
+	0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x31, 0x2e, 0x30, 0x36, 0x30, 0x30, 0x29, 0x22,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d,
+	0x22, 0x32, 0x30, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x32, 0x38, 0x2e, 0x34, 0x22, 0x20, 0x72,
+	0x78, 0x3d, 0x22, 0x31, 0x30, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x33, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x33, 0x61, 0x33, 0x61, 0x33, 0x61, 0x22, 0x20, 0x6f,
+	0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x31, 0x35, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x35, 0x22,
+	0x20, 0x79, 0x3d, 0x22, 0x35, 0x2e, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x31, 0x39, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x32, 0x30, 0x22, 0x20,
+	0x72, 0x78, 0x3d, 0x22, 0x32, 0x2e, 0x32, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75,
+	0x72, 0x6c, 0x28, 0x23, 0x67, 0x6c, 0x61, 0x73, 0x73, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x36, 0x33, 0x36, 0x38, 0x63, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x30, 0x2e, 0x35,
+	0x20, 0x37, 0x2e, 0x37, 0x20, 0x51, 0x31, 0x30, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x35, 0x20, 0x31,
+	0x32, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x35, 0x20, 0x4c, 0x32, 0x37, 0x2e, 0x33, 0x20, 0x35, 0x2e,
+	0x35, 0x20, 0x51, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x35, 0x20, 0x32, 0x39, 0x2e, 0x35,
+	0x20, 0x37, 0x2e, 0x37, 0x20, 0x4c, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x20,
+	0x4c, 0x31, 0x30, 0x2e, 0x35, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x62, 0x61, 0x72, 0x29, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x67, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x65, 0x61, 0x66,
+	0x33, 0x66, 0x66, 0x22, 0x3e, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d,
+	0x22, 0x31, 0x33, 0x2e, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x38, 0x2e, 0x31, 0x22, 0x20,
+	0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65,
+	0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x36, 0x2e, 0x33, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x38,
+	0x2e, 0x31, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x69,
+	0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x39, 0x2e, 0x31, 0x22, 0x20, 0x63,
+	0x79, 0x3d, 0x22, 0x38, 0x2e, 0x31, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f,
+	0x3e, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31,
+	0x3d, 0x22, 0x31, 0x32, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x36, 0x2e, 0x37, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x32, 0x38, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x36, 0x2e, 0x37, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x62, 0x63, 0x64, 0x37, 0x66, 0x66, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30,
+	0x2e, 0x38, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63,
+	0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69,
+	0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x6f,
+	0x6c, 0x79, 0x67, 0x6f, 0x6e, 0x20, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x31, 0x2e,
+	0x35, 0x2c, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x31, 0x2c, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x31,
+	0x31, 0x2c, 0x31, 0x30, 0x2e, 0x35, 0x20, 0x31, 0x38, 0x2e, 0x35, 0x2c, 0x31, 0x36, 0x20, 0x31,
+	0x31, 0x2c, 0x32, 0x31, 0x2e, 0x35, 0x20, 0x31, 0x31, 0x2c, 0x31, 0x38, 0x2e, 0x36, 0x20, 0x31,
+	0x2e, 0x35, 0x2c, 0x31, 0x38, 0x2e, 0x36, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6c,
+	0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x61, 0x72, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x39, 0x64, 0x33, 0x63, 0x30, 0x30, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22,
+	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x32, 0x2e, 0x36, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x4c, 0x31,
+	0x30, 0x20, 0x31, 0x34, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x66, 0x66, 0x65, 0x39, 0x62, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22,
+	0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_messages_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x05, 0x7e, 0x49, 0x44, 0x41, 0x54, 0x58, 0x85, 0xed, 0x55, 0x4d,
+	0x6c, 0x5c, 0xd5, 0x15, 0xfe, 0xce, 0xb9, 0xef, 0xcd, 0x9b, 0x3f, 0x62, 0x7b, 0x6c, 0x67, 0x0c,
+	0xf9, 0xc1, 0x2d, 0x85, 0x82, 0x9c, 0x84, 0x40, 0x21, 0xa5, 0x08, 0x55, 0x55, 0x37, 0x95, 0x10,
+	0x41, 0x5d, 0x00, 0x12, 0xaa, 0x84, 0xa0, 0x1b, 0x04, 0xb4, 0x55, 0x45, 0xb7, 0x5d, 0xa0, 0x4a,
+	0xad, 0xba, 0x68, 0x37, 0x54, 0x51, 0x25, 0x16, 0xf4, 0x27, 0x8b, 0x56, 0x85, 0x56, 0xa8, 0x45,
+	0x74, 0x53, 0xa9, 0x3f, 0x8b, 0x04, 0x24, 0x8c, 0x92, 0x28, 0x3f, 0xa6, 0x31, 0x38, 0x49, 0x4d,
+	0x6c, 0x8f, 0x1d, 0xdb, 0x33, 0x9e, 0x99, 0xf7, 0x73, 0xdf, 0x3d, 0xa7, 0x8b, 0xf7, 0x1c, 0xcf,
+	0x24, 0x99, 0x52, 0x54, 0x10, 0x5d, 0xe4, 0x48, 0x47, 0xef, 0xce, 0xcc, 0x79, 0xf7, 0xfb, 0xee,
+	0x77, 0xbe, 0x7b, 0x06, 0xb8, 0x1e, 0x9f, 0x72, 0xd0, 0x7f, 0x53, 0x34, 0xf5, 0xe4, 0xa1, 0x09,
+	0x00, 0x07, 0x3d, 0xf6, 0xbe, 0xc4, 0x86, 0xef, 0x11, 0xd1, 0x09, 0x51, 0xa9, 0xa8, 0x48, 0x00,
+	0x00, 0xc4, 0x1c, 0x33, 0x71, 0x87, 0x09, 0x8b, 0xa9, 0xe8, 0xdb, 0x92, 0xba, 0x23, 0x60, 0x7d,
+	0xfd, 0xd4, 0x2f, 0x9f, 0x5b, 0xfc, 0x9f, 0x08, 0x4c, 0x3d, 0x71, 0xe8, 0x01, 0xbf, 0x10, 0xfc,
+	0x54, 0xc4, 0xed, 0x9b, 0xa8, 0x6f, 0x77, 0x3b, 0x6f, 0x1c, 0xaf, 0xdc, 0x7c, 0xd3, 0x28, 0xea,
+	0x23, 0x15, 0x94, 0x8b, 0x05, 0x04, 0x05, 0x03, 0xc3, 0x04, 0xe7, 0x04, 0x51, 0x62, 0x11, 0xc6,
+	0x16, 0x67, 0xe6, 0x96, 0x71, 0xfc, 0x9f, 0xe7, 0x3b, 0x97, 0x56, 0x2e, 0x19, 0x26, 0x3a, 0xee,
+	0xc4, 0x3e, 0x7f, 0xf2, 0x17, 0xcf, 0x1d, 0xf9, 0x48, 0x04, 0xa6, 0x1e, 0xfd, 0x5d, 0xc1, 0xdb,
+	0xb6, 0xf6, 0x6b, 0x66, 0x3e, 0x78, 0xd7, 0xfe, 0xbd, 0xa5, 0x7b, 0xef, 0xd8, 0x45, 0x3b, 0x6a,
+	0x65, 0x0c, 0x95, 0x0d, 0x40, 0x40, 0x64, 0x15, 0x89, 0x15, 0x24, 0x4e, 0x90, 0x58, 0x01, 0x40,
+	0x10, 0x15, 0x28, 0x08, 0x0b, 0xeb, 0x11, 0xe6, 0x57, 0x23, 0x44, 0x49, 0x8a, 0xc5, 0x85, 0x25,
+	0x3d, 0x37, 0x7b, 0x36, 0x54, 0xc8, 0x6b, 0xae, 0x35, 0xf2, 0xd4, 0xa9, 0x57, 0x1e, 0x4b, 0x3e,
+	0x94, 0xc0, 0xe7, 0xbe, 0xfd, 0x62, 0x50, 0xe9, 0x04, 0x7f, 0x1e, 0x1d, 0xad, 0x1d, 0x38, 0x70,
+	0xef, 0xfe, 0xca, 0x9e, 0x5d, 0xc3, 0xb8, 0xa9, 0x16, 0x60, 0xb5, 0x6d, 0xd1, 0xec, 0x5a, 0x84,
+	0x56, 0xa1, 0x9a, 0xd5, 0xaa, 0x2a, 0x9c, 0x2a, 0x52, 0xa7, 0xb0, 0x4e, 0x61, 0x53, 0x41, 0x92,
+	0x67, 0x9c, 0x0a, 0x62, 0x2b, 0x08, 0xe3, 0x04, 0x67, 0xcf, 0x9c, 0xee, 0x76, 0x9a, 0xcd, 0x37,
+	0xbb, 0xd5, 0xe8, 0xc1, 0xd9, 0x9f, 0x7d, 0x27, 0xee, 0xc5, 0x33, 0x57, 0x12, 0xd8, 0xb9, 0xe7,
+	0xe1, 0x1f, 0x8c, 0xd4, 0x6a, 0x8f, 0xdc, 0x77, 0xe0, 0x0b, 0x95, 0x62, 0xe0, 0xa3, 0x9b, 0x08,
+	0x56, 0x36, 0x2c, 0x3a, 0xb1, 0x03, 0x88, 0xe0, 0x1b, 0x46, 0xc1, 0x63, 0xf8, 0x86, 0x61, 0x0c,
+	0xc1, 0x30, 0x81, 0x00, 0x10, 0x11, 0x72, 0x5e, 0x50, 0x55, 0x28, 0x90, 0x13, 0x65, 0x0c, 0xd7,
+	0xc6, 0xfc, 0x56, 0x73, 0xbd, 0xae, 0xed, 0xd4, 0x6f, 0x1c, 0x7b, 0xfd, 0xaf, 0xbd, 0x78, 0xdc,
+	0xfb, 0x61, 0xdf, 0x37, 0x5e, 0xdc, 0x09, 0xf0, 0x77, 0xf7, 0xef, 0xdb, 0x53, 0xf6, 0x7d, 0x03,
+	0x8f, 0x09, 0x86, 0x01, 0xc3, 0x40, 0xc1, 0x67, 0x04, 0x1e, 0xa3, 0xe8, 0x1b, 0x94, 0x0a, 0x8c,
+	0x52, 0x21, 0x5b, 0x07, 0x1e, 0xa3, 0xe0, 0x33, 0x7c, 0x43, 0xf0, 0x0d, 0xc1, 0x63, 0x82, 0x67,
+	0x38, 0x7f, 0x37, 0x7b, 0x9f, 0x98, 0x71, 0xf3, 0x2d, 0xb7, 0x96, 0x01, 0x7a, 0xfe, 0xce, 0x27,
+	0x7e, 0xbe, 0x63, 0x20, 0x01, 0xf5, 0xbd, 0xc7, 0xea, 0x13, 0x75, 0x2a, 0x95, 0x8a, 0x30, 0x04,
+	0x18, 0xde, 0xda, 0x70, 0xf3, 0xe4, 0x81, 0x9f, 0x01, 0x17, 0x7d, 0x83, 0xc0, 0xdf, 0x52, 0xa3,
+	0x0f, 0x94, 0x00, 0x26, 0xea, 0x4b, 0x3f, 0x28, 0x62, 0xa8, 0x36, 0x46, 0xca, 0xfa, 0xe8, 0x40,
+	0x02, 0xc6, 0x14, 0x1e, 0x9f, 0x98, 0xa8, 0x97, 0x88, 0x32, 0x49, 0x99, 0x00, 0x66, 0x02, 0x73,
+	0x4e, 0xc6, 0x10, 0x0a, 0x66, 0x8b, 0x40, 0xc1, 0x30, 0xbc, 0xbc, 0x0d, 0xcc, 0x79, 0x6d, 0xfe,
+	0x6e, 0xb6, 0x47, 0x7f, 0x0e, 0xd5, 0x46, 0x4b, 0x60, 0xef, 0xf1, 0x5e, 0x4c, 0xaf, 0x4f, 0x01,
+	0xb8, 0xc9, 0x6a, 0xb5, 0x8a, 0xcb, 0xde, 0xa4, 0xec, 0x79, 0xff, 0x2d, 0x37, 0x60, 0x77, 0x2d,
+	0xc0, 0x62, 0xcb, 0x62, 0x66, 0x31, 0x06, 0x33, 0x30, 0x54, 0x32, 0xb8, 0xbd, 0x5e, 0x86, 0xa8,
+	0xe2, 0xe8, 0x7b, 0x6d, 0x5c, 0x5c, 0x17, 0x00, 0xc0, 0x57, 0xef, 0x18, 0xc6, 0xe4, 0x58, 0x80,
+	0x99, 0x85, 0x10, 0xaf, 0x4d, 0x2f, 0xf7, 0xf9, 0xab, 0x58, 0x2e, 0x43, 0x55, 0x27, 0x07, 0x2a,
+	0xe0, 0x9c, 0x0c, 0x15, 0x0a, 0x05, 0x28, 0x36, 0x4d, 0xa4, 0xd8, 0x5d, 0x0b, 0xb0, 0x77, 0x47,
+	0x19, 0x43, 0x25, 0x83, 0xcf, 0xd7, 0x8b, 0x18, 0xad, 0x78, 0x88, 0xad, 0xe0, 0xf6, 0x7a, 0x80,
+	0x91, 0xb2, 0xc1, 0x68, 0xc5, 0xc3, 0x17, 0x3f, 0x53, 0x81, 0xe4, 0xb5, 0xf7, 0x4c, 0x56, 0x31,
+	0x56, 0xf5, 0xf1, 0xc0, 0xad, 0xdb, 0x70, 0xdb, 0x8d, 0xe5, 0x1e, 0x33, 0x02, 0x9e, 0xe7, 0x41,
+	0x55, 0x87, 0x07, 0x12, 0x00, 0x48, 0x9d, 0x28, 0x44, 0x00, 0x11, 0x85, 0x93, 0xec, 0x9a, 0xf5,
+	0x46, 0xe2, 0x1c, 0xc2, 0xc4, 0x41, 0x7a, 0xbe, 0x17, 0x05, 0x52, 0x77, 0x75, 0xad, 0xe4, 0x7b,
+	0xa9, 0xe6, 0x57, 0x57, 0x01, 0x50, 0x7f, 0x51, 0x1f, 0x01, 0x36, 0xdc, 0x8c, 0xe2, 0x18, 0x4e,
+	0x14, 0x69, 0x9e, 0xb3, 0x4b, 0x21, 0xa6, 0xcf, 0xb7, 0xb1, 0xd6, 0x4d, 0x71, 0x62, 0xbe, 0x8b,
+	0x73, 0xcb, 0x31, 0x22, 0x2b, 0x38, 0x32, 0xdb, 0x46, 0x63, 0xc3, 0x62, 0xa9, 0x65, 0xf1, 0xf7,
+	0x77, 0x5b, 0xb0, 0x4e, 0x30, 0xbb, 0x14, 0xe2, 0xcd, 0xf7, 0x37, 0xb0, 0xbc, 0x61, 0xf1, 0xb7,
+	0x99, 0x26, 0x4e, 0x5f, 0xec, 0x40, 0x54, 0x21, 0xaa, 0x50, 0x55, 0x58, 0x9b, 0x80, 0x40, 0xcd,
+	0x5e, 0xcc, 0x3e, 0x0f, 0x10, 0xf8, 0xfd, 0x56, 0xab, 0x3d, 0x5e, 0xa9, 0x94, 0x61, 0x1c, 0x60,
+	0x88, 0xc0, 0x50, 0xfc, 0xe5, 0xf4, 0x7a, 0xee, 0xf4, 0xdc, 0x70, 0x44, 0x98, 0x4f, 0x1c, 0x2e,
+	0xbc, 0x1d, 0x65, 0x64, 0x9d, 0xc2, 0x3a, 0x81, 0x4d, 0x15, 0x6f, 0x1c, 0x5f, 0x45, 0x9c, 0x3a,
+	0xc4, 0xa9, 0x20, 0x75, 0xd9, 0x21, 0x34, 0x27, 0x10, 0x76, 0xbb, 0x20, 0xe2, 0xb9, 0x81, 0x04,
+	0xd4, 0x25, 0xbf, 0x5d, 0x6e, 0x34, 0xf6, 0x8e, 0x6f, 0x1f, 0x2f, 0x33, 0x29, 0x88, 0x32, 0x63,
+	0x29, 0x28, 0x93, 0x59, 0xb6, 0x06, 0x0f, 0x72, 0x45, 0x5d, 0xde, 0xaa, 0x34, 0x27, 0x90, 0x38,
+	0x81, 0x75, 0x5b, 0xd3, 0xd1, 0x39, 0xc9, 0x5b, 0xa1, 0x68, 0xae, 0xad, 0x84, 0x10, 0xf9, 0xcd,
+	0xc0, 0x16, 0x08, 0xe9, 0xef, 0x57, 0x96, 0x1b, 0xe8, 0x84, 0x71, 0xcf, 0x48, 0x75, 0x88, 0xac,
+	0x20, 0xb2, 0x2e, 0xcb, 0xc4, 0x5d, 0x7b, 0x6d, 0xb3, 0xda, 0xa4, 0x67, 0x1c, 0xdb, 0x4d, 0x70,
+	0x55, 0xc4, 0x71, 0x88, 0xd6, 0xda, 0xaa, 0x92, 0xe8, 0xab, 0xbd, 0x98, 0x7d, 0xa3, 0xb8, 0x71,
+	0xec, 0x8d, 0xd6, 0xf6, 0xbb, 0x1e, 0x9a, 0x88, 0xba, 0xd1, 0x9d, 0x23, 0x63, 0xe3, 0x9e, 0x6a,
+	0xe6, 0x60, 0xd5, 0x7e, 0x63, 0xa6, 0xd2, 0x33, 0xff, 0xf3, 0x93, 0x6f, 0x3e, 0x93, 0xcb, 0x6b,
+	0x81, 0x48, 0x96, 0x2e, 0x75, 0xf8, 0xd7, 0x7b, 0xef, 0x76, 0x53, 0x9b, 0xfc, 0xe4, 0xc4, 0xaf,
+	0x9e, 0xf9, 0xe3, 0x40, 0x05, 0x00, 0x20, 0x8a, 0x93, 0xef, 0xaf, 0xad, 0xae, 0xcc, 0x9f, 0x9f,
+	0x3b, 0x67, 0x37, 0x7b, 0xb9, 0xa5, 0x80, 0x20, 0xb4, 0x0e, 0x61, 0x22, 0x59, 0x5a, 0xd7, 0xf7,
+	0x5b, 0x9c, 0x6e, 0xa9, 0xe0, 0x44, 0xe0, 0x9c, 0x20, 0xb5, 0x16, 0xe7, 0x67, 0x67, 0xba, 0x61,
+	0xb7, 0x7b, 0x44, 0xda, 0xb5, 0x1f, 0x5e, 0x89, 0x77, 0xcd, 0xbf, 0xe3, 0x3d, 0x4f, 0x1d, 0xda,
+	0xa5, 0x4a, 0xe7, 0xee, 0xbe, 0xef, 0xcb, 0x6c, 0x3c, 0xce, 0x67, 0xfa, 0xe6, 0x58, 0xcd, 0x26,
+	0x1d, 0x90, 0x2b, 0xa3, 0x80, 0xa8, 0x5e, 0xf6, 0x42, 0xd6, 0xef, 0xec, 0xd4, 0xab, 0x97, 0x96,
+	0x75, 0xe1, 0xc2, 0x5c, 0xa8, 0xa2, 0x7f, 0x28, 0xf8, 0xf8, 0xe6, 0xf4, 0x4b, 0x4f, 0xdb, 0x2b,
+	0xb1, 0xbc, 0xab, 0xd0, 0x01, 0xa8, 0xf0, 0xee, 0xa0, 0x58, 0x6c, 0x3b, 0x95, 0x6d, 0x9a, 0x02,
+	0x0e, 0x40, 0x63, 0xe9, 0x03, 0x47, 0x4e, 0xa8, 0x54, 0xad, 0x72, 0xb1, 0x5c, 0x86, 0xef, 0x79,
+	0x20, 0xe3, 0x01, 0x0a, 0x58, 0xe7, 0xe0, 0xac, 0x45, 0x14, 0x85, 0x08, 0xdb, 0x6d, 0x74, 0x5a,
+	0xcd, 0x4e, 0xb3, 0xb9, 0x6e, 0x98, 0x79, 0x3a, 0x4d, 0x92, 0xef, 0x9d, 0x3e, 0xfc, 0xad, 0xb7,
+	0xae, 0x85, 0x33, 0x90, 0x00, 0x88, 0x0e, 0x56, 0x87, 0x47, 0xca, 0x2e, 0x15, 0x44, 0x36, 0xc4,
+	0x85, 0xb3, 0x33, 0x9d, 0x24, 0x8e, 0x8f, 0x89, 0x4b, 0x8f, 0x1a, 0xdf, 0xbb, 0x5f, 0x45, 0x3f,
+	0x2b, 0xaa, 0x55, 0x88, 0x16, 0x41, 0x4a, 0x44, 0x26, 0x22, 0xa0, 0x4b, 0x4c, 0x1f, 0xa8, 0x93,
+	0x69, 0x51, 0x77, 0x94, 0x85, 0xff, 0x74, 0xe2, 0xf0, 0xd3, 0x8d, 0x41, 0xc0, 0xff, 0x91, 0x00,
+	0x1b, 0x7a, 0xa4, 0x52, 0x1d, 0xf6, 0x56, 0x1b, 0x4b, 0xba, 0x34, 0x3f, 0x17, 0x89, 0xd2, 0x8f,
+	0x4e, 0x4e, 0x2e, 0xfc, 0x18, 0x2f, 0xbc, 0x20, 0x1f, 0xb6, 0xe1, 0x47, 0x8d, 0xab, 0x3c, 0x30,
+	0xf5, 0xe4, 0xa1, 0x09, 0x52, 0x9e, 0x2f, 0xdf, 0xb0, 0x2d, 0x09, 0x3b, 0xed, 0x8b, 0x69, 0x2a,
+	0x5f, 0x3f, 0x73, 0xf8, 0x99, 0x93, 0x1f, 0x37, 0xf0, 0x66, 0x5c, 0x75, 0x0b, 0x20, 0xf4, 0x35,
+	0x85, 0x72, 0xd8, 0xdd, 0x78, 0x39, 0xac, 0xc6, 0x53, 0x9f, 0x24, 0x38, 0x70, 0x8d, 0x16, 0x30,
+	0xbb, 0x77, 0x52, 0xa5, 0xaf, 0x9c, 0x7a, 0xf9, 0xd9, 0x7f, 0x7c, 0x92, 0xc0, 0xd7, 0xe3, 0x7a,
+	0xfc, 0xdf, 0xc4, 0xbf, 0x01, 0x9e, 0x41, 0x5c, 0x75, 0xab, 0xda, 0x63, 0xfa, 0x00, 0x00, 0x00,
+	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_messages_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x75,
+	0x62, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x32, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x33, 0x34, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x63, 0x64, 0x38, 0x66, 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x35, 0x66,
+	0x39, 0x62, 0x64, 0x36, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x36, 0x37, 0x33, 0x62, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x36, 0x20, 0x33, 0x2e,
+	0x35, 0x20, 0x51, 0x32, 0x38, 0x2e, 0x35, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x32, 0x38, 0x2e, 0x35,
+	0x20, 0x31, 0x33, 0x20, 0x51, 0x32, 0x38, 0x2e, 0x35, 0x20, 0x32, 0x32, 0x2e, 0x35, 0x20, 0x31,
+	0x36, 0x20, 0x32, 0x32, 0x2e, 0x35, 0x20, 0x51, 0x31, 0x33, 0x2e, 0x32, 0x20, 0x32, 0x32, 0x2e,
+	0x35, 0x20, 0x31, 0x30, 0x2e, 0x38, 0x20, 0x32, 0x31, 0x2e, 0x39, 0x20, 0x4c, 0x35, 0x20, 0x32,
+	0x36, 0x20, 0x4c, 0x36, 0x2e, 0x36, 0x20, 0x32, 0x30, 0x2e, 0x34, 0x20, 0x51, 0x33, 0x2e, 0x35,
+	0x20, 0x31, 0x37, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x33, 0x20, 0x51, 0x33, 0x2e,
+	0x35, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x31, 0x36, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x5a, 0x22, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x62,
+	0x75, 0x62, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x32, 0x62,
+	0x35, 0x66, 0x39, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69,
+	0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x39, 0x20, 0x36,
+	0x2e, 0x35, 0x20, 0x51, 0x31, 0x33, 0x20, 0x34, 0x2e, 0x35, 0x20, 0x32, 0x30, 0x20, 0x35, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x65, 0x30, 0x65, 0x65, 0x66, 0x62, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x33, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d,
+	0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x36, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x67, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x30,
+	0x2e, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x33, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x31,
+	0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c,
+	0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x36, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x33,
+	0x22, 0x20, 0x72, 0x3d, 0x22, 0x31, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x35,
+	0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x33, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x31, 0x2e, 0x39,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67,
+	0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_network_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x07, 0x42, 0x49, 0x44, 0x41, 0x54, 0x58, 0x85, 0xa5, 0x97, 0x5d,
+	0x6c, 0x1c, 0x57, 0x15, 0xc7, 0xff, 0x77, 0xee, 0xcc, 0xce, 0xcc, 0xee, 0xda, 0xeb, 0xf5, 0xc7,
+	0x6e, 0x1c, 0xa7, 0x4e, 0xb6, 0x75, 0xda, 0x24, 0x4d, 0xd4, 0x2a, 0x16, 0x54, 0x29, 0x50, 0x9a,
+	0x0f, 0x28, 0x0f, 0xa8, 0x20, 0x90, 0x23, 0x21, 0x54, 0x21, 0x3e, 0xa4, 0xf6, 0x09, 0x14, 0xb5,
+	0x12, 0x4d, 0xdb, 0x48, 0x11, 0xa0, 0xb6, 0x82, 0x48, 0x7d, 0x00, 0x21, 0xfa, 0x50, 0x81, 0x84,
+	0x00, 0xd1, 0x48, 0x3c, 0xc1, 0x0b, 0x55, 0x88, 0xd5, 0x08, 0xa5, 0x02, 0x42, 0x45, 0xa8, 0xd2,
+	0x7c, 0xdb, 0xde, 0x78, 0x6d, 0x6f, 0xbc, 0xb6, 0xb3, 0xf6, 0xec, 0x7c, 0xdd, 0x8f, 0xc3, 0xc3,
+	0xec, 0x6e, 0x9c, 0xc4, 0x9b, 0x38, 0xe5, 0x4a, 0xb3, 0xb3, 0xda, 0x3b, 0x73, 0xfe, 0xbf, 0x73,
+	0xee, 0x39, 0xe7, 0xde, 0x65, 0xb8, 0xcf, 0xb1, 0xf9, 0x73, 0xaf, 0x0c, 0x92, 0x41, 0x07, 0x2c,
+	0xdb, 0x7a, 0xc4, 0xb6, 0xad, 0x12, 0x08, 0x88, 0x62, 0x31, 0x21, 0x22, 0x71, 0xc1, 0x60, 0xf2,
+	0xbd, 0xc9, 0xf1, 0x9f, 0xcd, 0xdd, 0x8f, 0x3d, 0xb6, 0xde, 0xe7, 0x4a, 0xfb, 0x8f, 0x7c, 0xd3,
+	0xb5, 0xad, 0x23, 0xb6, 0x93, 0xea, 0x7f, 0x6c, 0xe7, 0x56, 0xb7, 0x38, 0xd0, 0xeb, 0xa6, 0x33,
+	0x2e, 0xa4, 0x06, 0xea, 0xf5, 0x06, 0xe6, 0xae, 0x2f, 0x04, 0xe7, 0xce, 0x5f, 0x0e, 0x44, 0x24,
+	0x6a, 0xa1, 0x08, 0x7e, 0x34, 0x75, 0xe2, 0xcd, 0xdf, 0x03, 0xa0, 0xff, 0x1b, 0x60, 0x78, 0xef,
+	0xcb, 0xa3, 0xae, 0xe3, 0xfe, 0x71, 0xdb, 0xc8, 0x03, 0xfd, 0x5f, 0x7f, 0xf6, 0xa9, 0x5c, 0xa1,
+	0x2f, 0x0f, 0x02, 0xa0, 0x35, 0x41, 0x2a, 0x42, 0x2c, 0x35, 0x62, 0xa9, 0x11, 0x89, 0xe4, 0x9a,
+	0xbb, 0xbe, 0x80, 0xf1, 0xf1, 0x0f, 0xea, 0x95, 0xca, 0xec, 0xbc, 0x08, 0xa3, 0x83, 0x53, 0xef,
+	0xbf, 0xf9, 0xe1, 0xdd, 0xec, 0xf3, 0xbb, 0x4d, 0x3e, 0xb8, 0xef, 0xd5, 0x6f, 0x64, 0xb3, 0xe9,
+	0x3f, 0x1c, 0x7a, 0x7e, 0x6c, 0xe8, 0xcb, 0x5f, 0xf8, 0xb4, 0xb3, 0xa9, 0xd0, 0x85, 0x7c, 0xd6,
+	0x44, 0xc6, 0x31, 0x41, 0x94, 0xe0, 0xb3, 0xa6, 0x0b, 0x44, 0xc9, 0x65, 0x3b, 0x0e, 0x4a, 0xa5,
+	0x2d, 0xce, 0x40, 0xb1, 0xd0, 0x5b, 0x2e, 0x4f, 0x1f, 0xcc, 0x0d, 0x3f, 0x59, 0x5e, 0x9a, 0x38,
+	0xf5, 0xd1, 0x7d, 0x03, 0x3c, 0xb4, 0xff, 0xd5, 0x6f, 0x0d, 0x14, 0xf2, 0xbf, 0x78, 0xed, 0xc5,
+	0xe7, 0xf2, 0x8f, 0x3f, 0x5c, 0xc4, 0x60, 0x3e, 0x85, 0x6e, 0xd7, 0x84, 0x6b, 0x73, 0x64, 0x6c,
+	0x0e, 0x3b, 0x65, 0x20, 0x88, 0x93, 0x08, 0x53, 0x1b, 0x80, 0xa0, 0x35, 0x41, 0x11, 0xc1, 0xb6,
+	0x5d, 0x6c, 0x7a, 0x60, 0xd8, 0xbd, 0x76, 0x6d, 0xfa, 0x80, 0xb3, 0xe9, 0x89, 0xe9, 0xfa, 0xc4,
+	0xa9, 0xb3, 0xeb, 0x06, 0x18, 0xde, 0xfb, 0xf2, 0x68, 0x36, 0x9b, 0xf9, 0xdd, 0x91, 0x43, 0xcf,
+	0xf5, 0xec, 0x2c, 0xf5, 0xa2, 0xcb, 0xe5, 0x30, 0x39, 0x83, 0xc9, 0x19, 0xb8, 0x61, 0xc0, 0x30,
+	0xd0, 0x76, 0xbb, 0xcb, 0x35, 0xe1, 0x3a, 0x89, 0x99, 0x20, 0xd2, 0x50, 0x44, 0x50, 0x1a, 0x50,
+	0x52, 0x03, 0x8c, 0xa3, 0x38, 0x38, 0xe4, 0x94, 0x27, 0xa6, 0xf6, 0xba, 0x83, 0x9f, 0x3a, 0xb9,
+	0x5c, 0xfe, 0x7b, 0xe5, 0xde, 0x00, 0x4f, 0x1f, 0x35, 0x37, 0x38, 0xd6, 0xe9, 0x1f, 0xbc, 0x70,
+	0xb0, 0xb8, 0xfb, 0x91, 0x02, 0x5c, 0xfb, 0xa6, 0x78, 0xeb, 0x32, 0x0c, 0x86, 0x94, 0xc1, 0xd0,
+	0x95, 0x36, 0x91, 0x4d, 0x9b, 0xe8, 0x49, 0x5b, 0xd8, 0x90, 0x4f, 0x21, 0x88, 0x35, 0xea, 0x0d,
+	0x09, 0xa9, 0x08, 0x52, 0x69, 0x48, 0xa5, 0x41, 0xc4, 0xd0, 0xdd, 0xd3, 0xe7, 0xce, 0xce, 0x54,
+	0xbe, 0xb8, 0x34, 0x5a, 0xf8, 0x39, 0xce, 0x9d, 0xbb, 0x25, 0x31, 0xcd, 0x3b, 0x42, 0x6f, 0x8a,
+	0x17, 0x76, 0xee, 0xd8, 0xde, 0xb3, 0xad, 0x54, 0x84, 0x6d, 0x19, 0x60, 0x2c, 0xc9, 0x54, 0x83,
+	0x31, 0x70, 0x23, 0x01, 0x08, 0x62, 0x8d, 0x50, 0x12, 0xa8, 0x99, 0x84, 0x81, 0xd0, 0xf0, 0x7c,
+	0x89, 0x7a, 0x43, 0x82, 0x31, 0xa0, 0xb4, 0x21, 0x0d, 0xd2, 0x0e, 0x2e, 0x94, 0x97, 0xd1, 0x08,
+	0x62, 0xe4, 0x7a, 0x72, 0xe8, 0x2b, 0x14, 0x7b, 0xe5, 0x8c, 0xfe, 0x5e, 0x19, 0x78, 0x7b, 0xb5,
+	0x9e, 0x71, 0x3b, 0x00, 0x37, 0xad, 0x57, 0x9e, 0x39, 0xf0, 0x64, 0x97, 0x63, 0xdd, 0x3a, 0x45,
+	0x04, 0x68, 0x22, 0xf8, 0x91, 0x86, 0x1f, 0x29, 0x68, 0x4d, 0x20, 0x30, 0xa4, 0x4c, 0x03, 0x5d,
+	0xae, 0x89, 0x81, 0x5c, 0x0a, 0xa5, 0xa2, 0x8b, 0xac, 0xc3, 0x31, 0x94, 0xb7, 0x31, 0x3a, 0x92,
+	0xc3, 0x57, 0x3f, 0xb3, 0x11, 0xa6, 0x69, 0x80, 0x08, 0x78, 0x70, 0xeb, 0xf6, 0x2e, 0x93, 0xb3,
+	0x23, 0xb7, 0xeb, 0xdd, 0x12, 0x81, 0xe1, 0xbd, 0x3f, 0x7c, 0x34, 0x9f, 0xef, 0x49, 0xa5, 0xd3,
+	0x2e, 0x16, 0x3d, 0x81, 0xee, 0xb4, 0x09, 0xce, 0x09, 0x42, 0x01, 0x91, 0x90, 0x10, 0x0a, 0x49,
+	0x12, 0x3a, 0x3c, 0x29, 0x70, 0x02, 0x08, 0x2c, 0xa9, 0x88, 0x14, 0x43, 0xd6, 0xe5, 0xc8, 0xd8,
+	0x26, 0x4e, 0xfc, 0x67, 0x01, 0x5d, 0x0e, 0x43, 0xa5, 0xe6, 0x43, 0x08, 0x05, 0x22, 0xc0, 0x4a,
+	0xd9, 0xb0, 0x5c, 0xd7, 0xd9, 0xf2, 0xf4, 0xe1, 0x6d, 0x93, 0xe3, 0x6f, 0x9c, 0x5f, 0x13, 0xc0,
+	0xb4, 0xec, 0x67, 0x77, 0xee, 0xd8, 0x9a, 0x53, 0x9a, 0xe0, 0x05, 0x0a, 0x97, 0x67, 0x7d, 0xa4,
+	0x6d, 0x8e, 0x94, 0x65, 0xc0, 0x36, 0x0d, 0x98, 0x9c, 0x21, 0x9f, 0xb5, 0x40, 0x74, 0x33, 0xfb,
+	0x5b, 0xad, 0xa6, 0xf9, 0x13, 0xb2, 0x69, 0x0e, 0xa1, 0x14, 0xa6, 0xae, 0xc7, 0xf0, 0x83, 0x18,
+	0x5a, 0x13, 0x34, 0x11, 0x88, 0x08, 0x7d, 0x03, 0x1b, 0x72, 0xd3, 0x9e, 0xf7, 0x15, 0x00, 0x6b,
+	0x03, 0xa4, 0x4c, 0x6b, 0x57, 0x4f, 0xbe, 0xc7, 0x94, 0x8a, 0x20, 0x94, 0x06, 0x57, 0x0c, 0x91,
+	0xd0, 0xcd, 0xc6, 0x03, 0x98, 0x9c, 0x41, 0x2a, 0x0d, 0xce, 0x5b, 0xc5, 0xdf, 0xd2, 0xbf, 0xf9,
+	0x59, 0x5d, 0x8a, 0x10, 0x0b, 0x05, 0xd5, 0x4c, 0x42, 0xa5, 0x08, 0x5a, 0x6b, 0x28, 0xad, 0x91,
+	0x72, 0xb2, 0x26, 0x37, 0xcd, 0x5d, 0x1d, 0x97, 0x00, 0x44, 0xc3, 0xae, 0xeb, 0x40, 0x28, 0x02,
+	0x97, 0x04, 0x83, 0x69, 0x30, 0x00, 0x9a, 0x00, 0xc5, 0x09, 0xdc, 0x60, 0xa8, 0xd4, 0x42, 0x0c,
+	0x17, 0xdc, 0x55, 0x3d, 0x96, 0xda, 0xde, 0x6b, 0x45, 0xf8, 0xf7, 0xe5, 0x65, 0x08, 0xa9, 0x21,
+	0xa4, 0x6a, 0x57, 0x42, 0x0b, 0xc4, 0xe0, 0x16, 0x00, 0x63, 0xb8, 0x23, 0x80, 0x26, 0xb2, 0x94,
+	0x22, 0xc4, 0x42, 0xb7, 0x3b, 0x1c, 0x63, 0x0c, 0x4a, 0x2b, 0xc8, 0x66, 0xf9, 0x85, 0x42, 0xa1,
+	0x98, 0xb7, 0x91, 0xb2, 0x58, 0x5b, 0xb8, 0xe5, 0xfd, 0xfc, 0xb2, 0xc0, 0xc2, 0x4a, 0x88, 0x58,
+	0x28, 0x08, 0xa9, 0x21, 0xa5, 0x86, 0x54, 0x2a, 0xb9, 0x4b, 0x0d, 0x22, 0x02, 0x41, 0xa7, 0x56,
+	0x6b, 0xde, 0x92, 0xea, 0x8c, 0xb1, 0xf2, 0x8d, 0xe5, 0x06, 0xa2, 0x58, 0xb6, 0x7b, 0x7b, 0x4f,
+	0xc6, 0xc4, 0xe3, 0xa5, 0x6e, 0x44, 0x82, 0x10, 0x44, 0x0a, 0x7e, 0xa8, 0xf0, 0xe1, 0xd5, 0x65,
+	0x2c, 0x7a, 0xb2, 0x2d, 0x4c, 0x94, 0x7c, 0x99, 0x5b, 0x0a, 0x11, 0xc7, 0x0a, 0xb1, 0x90, 0x88,
+	0x85, 0x4a, 0x40, 0x44, 0x2b, 0x1a, 0x0a, 0x61, 0x10, 0x02, 0x60, 0x53, 0x1d, 0x01, 0x84, 0x94,
+	0x97, 0x16, 0x97, 0xea, 0x14, 0x46, 0x02, 0x61, 0x28, 0x10, 0xc4, 0x0a, 0x26, 0x67, 0xc8, 0xa6,
+	0x39, 0x7a, 0x32, 0x26, 0xfc, 0x48, 0xc1, 0x8f, 0x35, 0x6a, 0xcb, 0x31, 0xfe, 0x79, 0xa1, 0x8e,
+	0x58, 0x52, 0x3b, 0x0f, 0x08, 0x84, 0xe9, 0x6a, 0x03, 0xb6, 0x65, 0x60, 0xcf, 0xf6, 0x3e, 0xc4,
+	0xb1, 0x6c, 0x83, 0x08, 0xa1, 0x11, 0x0b, 0x8d, 0x28, 0x08, 0x89, 0xb4, 0xb8, 0xd4, 0x11, 0x40,
+	0x4a, 0xf1, 0x97, 0xab, 0x57, 0x27, 0x16, 0xc3, 0x48, 0x22, 0x88, 0x04, 0x82, 0x50, 0x20, 0x8c,
+	0x92, 0x32, 0x52, 0x9a, 0x10, 0x34, 0x7b, 0x40, 0x10, 0x69, 0xd4, 0x7d, 0x81, 0xc9, 0xb9, 0x06,
+	0x08, 0xc9, 0x2e, 0x54, 0x6f, 0x08, 0x4c, 0x56, 0x3d, 0x8c, 0x8e, 0xe4, 0xf0, 0xd0, 0x60, 0x16,
+	0x51, 0x2c, 0x57, 0x45, 0x43, 0x42, 0x08, 0x05, 0x6f, 0xb9, 0xba, 0x28, 0xb5, 0xfc, 0x73, 0x47,
+	0x80, 0xf2, 0x49, 0xfb, 0xf4, 0xe2, 0xfc, 0x02, 0x3c, 0x3f, 0x44, 0x10, 0x4a, 0xf8, 0x61, 0x8c,
+	0x5a, 0x3d, 0x04, 0x11, 0x61, 0xaa, 0xda, 0x40, 0x23, 0x88, 0xe1, 0x07, 0x02, 0x8d, 0x30, 0xb9,
+	0x4f, 0x56, 0xfd, 0x64, 0x13, 0x02, 0x70, 0xfa, 0xa3, 0x1a, 0x82, 0x50, 0xc2, 0xe4, 0x0c, 0xff,
+	0xba, 0x58, 0x43, 0x18, 0xcb, 0x64, 0x29, 0xe3, 0xe6, 0x52, 0xc4, 0x31, 0xa2, 0xc0, 0x43, 0x65,
+	0x3c, 0xfd, 0x8f, 0xd5, 0x9a, 0xb7, 0xed, 0x05, 0xe3, 0xd4, 0x5b, 0xfa, 0x7c, 0x41, 0x2a, 0xbd,
+	0x3b, 0xdf, 0xdb, 0x6f, 0x6a, 0x4d, 0xf0, 0x82, 0x64, 0xad, 0x2f, 0x4d, 0xaf, 0x40, 0xc8, 0x24,
+	0xb9, 0x62, 0xa1, 0x11, 0x0b, 0x85, 0x1b, 0x5e, 0x84, 0x1d, 0xc3, 0x39, 0x5c, 0xaa, 0xac, 0xe0,
+	0xd4, 0xd9, 0xeb, 0x88, 0x84, 0xc4, 0xd9, 0xcb, 0x8b, 0x38, 0x3f, 0x75, 0x03, 0x51, 0x24, 0xdb,
+	0x10, 0x71, 0x2c, 0xb1, 0x38, 0x5f, 0x0e, 0x85, 0xef, 0xfd, 0xea, 0xc6, 0xe4, 0x8f, 0xdf, 0xbb,
+	0x25, 0xef, 0x70, 0xdb, 0x18, 0x79, 0xe2, 0x68, 0x37, 0x75, 0xeb, 0xab, 0x9f, 0xdd, 0x77, 0xa0,
+	0x2f, 0x93, 0x4e, 0xc3, 0xe4, 0x06, 0x38, 0x37, 0x60, 0x18, 0x0c, 0x06, 0xbb, 0xf9, 0xb8, 0x6e,
+	0x6e, 0xbd, 0x29, 0xce, 0xe0, 0x05, 0x22, 0x01, 0x93, 0x0a, 0x42, 0xa8, 0xb6, 0xe7, 0x51, 0x13,
+	0x40, 0x44, 0x3e, 0x2a, 0x57, 0xce, 0xd6, 0x7c, 0xcd, 0x4b, 0xf3, 0xe3, 0x47, 0xbd, 0xbb, 0x44,
+	0x00, 0x58, 0xac, 0x8c, 0x47, 0x5d, 0xa5, 0xa7, 0x66, 0x6a, 0xd5, 0xea, 0xbe, 0x81, 0xe2, 0x46,
+	0x47, 0xe9, 0xe6, 0xce, 0x26, 0x93, 0x7a, 0x4e, 0xa2, 0xd0, 0x14, 0x12, 0x0a, 0x7e, 0xd0, 0x14,
+	0x13, 0x12, 0x51, 0xa4, 0x9a, 0x5e, 0x27, 0xe2, 0xb1, 0x90, 0x50, 0x42, 0x60, 0x6e, 0xf2, 0x5c,
+	0x5d, 0xcb, 0xf0, 0xfb, 0x33, 0xe3, 0x3f, 0x39, 0x73, 0xbb, 0xde, 0x9a, 0xe7, 0x81, 0xfa, 0xc4,
+	0xfb, 0x67, 0x33, 0x9b, 0xf6, 0x6c, 0xac, 0xd7, 0xeb, 0x8f, 0xe6, 0xf2, 0x85, 0x94, 0xd2, 0x09,
+	0x40, 0xab, 0xc1, 0x88, 0x66, 0x89, 0xc5, 0x42, 0x35, 0xd7, 0xb8, 0x25, 0xba, 0xca, 0x6b, 0x21,
+	0x21, 0x85, 0xc0, 0xfc, 0xcc, 0x25, 0x4f, 0x44, 0xfe, 0x3b, 0x53, 0x27, 0x5f, 0x3f, 0xb6, 0x96,
+	0x56, 0xc7, 0x13, 0xd1, 0x8d, 0x89, 0x7d, 0x7f, 0x75, 0x07, 0xbd, 0x8d, 0xb5, 0xeb, 0xd5, 0xad,
+	0x99, 0xee, 0x7e, 0x57, 0x13, 0x6b, 0x8b, 0x0b, 0xa9, 0xda, 0x79, 0x90, 0x94, 0x5b, 0x12, 0x8d,
+	0x56, 0xe6, 0x2b, 0x29, 0x21, 0xa2, 0x10, 0xd5, 0xf2, 0xc7, 0x75, 0x11, 0x7a, 0xbf, 0x9d, 0x3a,
+	0x69, 0x1d, 0x02, 0xc6, 0xd7, 0x3c, 0xa0, 0xde, 0xf3, 0x50, 0xba, 0x79, 0xff, 0x6b, 0xdf, 0x65,
+	0xcc, 0xf8, 0xe9, 0xc0, 0xe0, 0x96, 0x6c, 0x7f, 0x71, 0x63, 0x0a, 0x8c, 0xa3, 0xd5, 0x7e, 0xb5,
+	0x6e, 0x1e, 0xc1, 0xb4, 0x86, 0x52, 0x1a, 0xa4, 0x35, 0xb4, 0x92, 0xa8, 0x2f, 0xcd, 0xc4, 0x2b,
+	0x0b, 0x55, 0x4f, 0x43, 0xbd, 0x78, 0xed, 0x6f, 0xaf, 0xff, 0xe6, 0x6e, 0xf6, 0xd7, 0x75, 0x2c,
+	0x1f, 0xda, 0x7f, 0xb8, 0xcf, 0x24, 0xfe, 0x06, 0x03, 0x1b, 0x73, 0xbb, 0x7b, 0x59, 0xb6, 0xbb,
+	0x2f, 0x67, 0x5a, 0x0e, 0xb8, 0x65, 0x81, 0x34, 0x20, 0x45, 0x88, 0x38, 0xf2, 0xd1, 0x58, 0x59,
+	0xa8, 0x47, 0xde, 0x32, 0x11, 0xe8, 0x5d, 0x1d, 0xfa, 0x87, 0xa7, 0x4f, 0xbf, 0xb5, 0x78, 0x2f,
+	0xdb, 0xeb, 0xfd, 0x5f, 0x00, 0x00, 0xd8, 0xb4, 0xe7, 0x90, 0x6b, 0xa4, 0x52, 0x07, 0x18, 0xb7,
+	0xc7, 0x38, 0xc7, 0x8e, 0x2e, 0xd7, 0x1c, 0x05, 0x80, 0x95, 0x40, 0x9c, 0x51, 0x8a, 0xce, 0x91,
+	0x56, 0xef, 0xea, 0x28, 0x3c, 0x31, 0x7d, 0xfa, 0xad, 0x60, 0xbd, 0x36, 0xef, 0x0b, 0x60, 0xf5,
+	0x38, 0x76, 0xec, 0xed, 0x7e, 0xce, 0xf5, 0x3c, 0x00, 0x28, 0x65, 0x0c, 0xbc, 0xf4, 0xd2, 0xf3,
+	0xb5, 0x4f, 0x62, 0xe7, 0x8e, 0x33, 0xe1, 0x7a, 0x87, 0xe7, 0xcd, 0x42, 0xca, 0xe4, 0x75, 0xd3,
+	0x94, 0x9f, 0xd4, 0x4c, 0xe7, 0x08, 0x8c, 0x8d, 0x8d, 0xb9, 0x23, 0x23, 0xbb, 0xfe, 0x34, 0x34,
+	0xb4, 0x61, 0x3b, 0x40, 0x77, 0x80, 0x12, 0xc1, 0x90, 0x52, 0x0e, 0x26, 0x00, 0xe6, 0x2c, 0x63,
+	0xd0, 0x6b, 0x98, 0x97, 0xb3, 0xb3, 0x73, 0x1f, 0x5f, 0xbc, 0xf8, 0xdf, 0xaf, 0x1d, 0x3f, 0x7e,
+	0x7c, 0xcd, 0x65, 0xe9, 0x18, 0x01, 0xc7, 0xc9, 0x7f, 0x67, 0xf7, 0xee, 0xc7, 0xbe, 0x94, 0x4e,
+	0x67, 0xd6, 0xe3, 0xc8, 0x60, 0xa7, 0x89, 0x42, 0xa1, 0xb8, 0xf9, 0xda, 0xb5, 0xca, 0xb7, 0x01,
+	0xfc, 0xf2, 0xbe, 0x00, 0x84, 0x88, 0xdc, 0x2b, 0x57, 0xae, 0xc2, 0x34, 0xad, 0xf5, 0x00, 0x74,
+	0x1c, 0x42, 0xc4, 0x88, 0xa2, 0xc8, 0xe9, 0x34, 0xdf, 0x11, 0x60, 0x65, 0xa5, 0xf6, 0xce, 0x99,
+	0x33, 0x67, 0x0e, 0xba, 0x6e, 0xfa, 0xe1, 0xb5, 0x96, 0x60, 0x7d, 0x83, 0xc9, 0x46, 0xc3, 0xbf,
+	0x18, 0x86, 0x4b, 0xbf, 0xee, 0xf4, 0xc4, 0xff, 0x00, 0x6e, 0xec, 0x79, 0x2d, 0x98, 0xe5, 0x57,
+	0x91, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_network_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x6c,
+	0x6f, 0x62, 0x65, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x36, 0x22, 0x20, 0x63,
+	0x79, 0x3d, 0x22, 0x30, 0x2e, 0x32, 0x38, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x32,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x61, 0x66, 0x32, 0x66, 0x63, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x39, 0x33, 0x62, 0x34, 0x65, 0x32, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x66, 0x36, 0x63, 0x62, 0x35, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x32, 0x34, 0x34, 0x64, 0x38, 0x66, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x68,
+	0x72, 0x6f, 0x6d, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x65, 0x65, 0x65, 0x66, 0x32, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x39, 0x63, 0x39, 0x63, 0x61, 0x34, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x35, 0x61, 0x35, 0x61, 0x36, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x67, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x31, 0x2e, 0x32, 0x38, 0x30, 0x20,
+	0x2d, 0x30, 0x2e, 0x33, 0x39, 0x30, 0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x31, 0x2e,
+	0x30, 0x38, 0x30, 0x30, 0x29, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20,
+	0x78, 0x3d, 0x22, 0x31, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x32, 0x31, 0x22, 0x20, 0x77, 0x69,
+	0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22,
+	0x36, 0x2e, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65,
+	0x63, 0x74, 0x20, 0x78, 0x3d, 0x22, 0x37, 0x2e, 0x35, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x32, 0x36,
+	0x2e, 0x35, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x37, 0x22, 0x20, 0x68,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22,
+	0x31, 0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x34, 0x61, 0x34, 0x61, 0x35, 0x32, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x36, 0x22,
+	0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x32, 0x2e, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x31, 0x31,
+	0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x67,
+	0x6c, 0x6f, 0x62, 0x65, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23,
+	0x31, 0x64, 0x33, 0x66, 0x37, 0x38, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x67, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x65, 0x65, 0x66, 0x34, 0x66, 0x63, 0x22,
+	0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x32, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31,
+	0x32, 0x2e, 0x36, 0x20, 0x39, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x33, 0x2e, 0x36, 0x20, 0x38, 0x2e,
+	0x32, 0x20, 0x31, 0x35, 0x2e, 0x38, 0x20, 0x38, 0x20, 0x51, 0x31, 0x38, 0x2e, 0x34, 0x20, 0x37,
+	0x2e, 0x38, 0x20, 0x31, 0x39, 0x2e, 0x38, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x51, 0x32, 0x31, 0x2e,
+	0x32, 0x20, 0x39, 0x2e, 0x36, 0x20, 0x32, 0x30, 0x2e, 0x34, 0x20, 0x31, 0x31, 0x20, 0x51, 0x31,
+	0x39, 0x2e, 0x35, 0x20, 0x31, 0x32, 0x20, 0x31, 0x39, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x34,
+	0x20, 0x51, 0x31, 0x39, 0x20, 0x31, 0x35, 0x2e, 0x38, 0x20, 0x31, 0x37, 0x2e, 0x33, 0x20, 0x31,
+	0x37, 0x2e, 0x38, 0x20, 0x51, 0x31, 0x36, 0x2e, 0x33, 0x20, 0x31, 0x38, 0x2e, 0x36, 0x20, 0x31,
+	0x35, 0x2e, 0x39, 0x20, 0x31, 0x37, 0x2e, 0x32, 0x20, 0x51, 0x31, 0x35, 0x2e, 0x35, 0x20, 0x31,
+	0x35, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x20, 0x31, 0x34, 0x20, 0x51, 0x31, 0x33, 0x2e, 0x33, 0x20,
+	0x31, 0x33, 0x2e, 0x36, 0x20, 0x31, 0x33, 0x2e, 0x31, 0x20, 0x31, 0x32, 0x2e, 0x32, 0x20, 0x51,
+	0x31, 0x31, 0x2e, 0x37, 0x20, 0x31, 0x30, 0x2e, 0x36, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x39,
+	0x2e, 0x32, 0x20, 0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c,
+	0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x63,
+	0x79, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x38, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x37,
+	0x35, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x33, 0x35, 0x22, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x28, 0x31,
+	0x38, 0x20, 0x32, 0x30, 0x2e, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x38, 0x29, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x33,
+	0x2e, 0x39, 0x20, 0x36, 0x2e, 0x34, 0x20, 0x51, 0x31, 0x35, 0x2e, 0x37, 0x20, 0x35, 0x2e, 0x32,
+	0x20, 0x31, 0x38, 0x20, 0x35, 0x2e, 0x36, 0x20, 0x51, 0x31, 0x39, 0x2e, 0x36, 0x20, 0x36, 0x20,
+	0x31, 0x39, 0x2e, 0x31, 0x20, 0x37, 0x2e, 0x31, 0x20, 0x51, 0x31, 0x36, 0x2e, 0x39, 0x20, 0x37,
+	0x2e, 0x35, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x20, 0x37, 0x2e, 0x35, 0x20, 0x51, 0x31, 0x33, 0x2e,
+	0x38, 0x20, 0x37, 0x2e, 0x31, 0x20, 0x31, 0x33, 0x2e, 0x39, 0x20, 0x36, 0x2e, 0x34, 0x20, 0x5a,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x37, 0x2e, 0x34, 0x20, 0x51, 0x32, 0x32, 0x2e, 0x36,
+	0x20, 0x37, 0x20, 0x32, 0x33, 0x2e, 0x36, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x51, 0x32, 0x32, 0x2e,
+	0x39, 0x20, 0x39, 0x2e, 0x33, 0x20, 0x32, 0x31, 0x2e, 0x34, 0x20, 0x38, 0x2e, 0x39, 0x20, 0x51,
+	0x32, 0x30, 0x2e, 0x35, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x32, 0x30, 0x2e, 0x38, 0x20, 0x37, 0x2e,
+	0x34, 0x20, 0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x39, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x20, 0x51, 0x31,
+	0x30, 0x2e, 0x37, 0x20, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e, 0x39, 0x20, 0x31, 0x35,
+	0x2e, 0x32, 0x20, 0x51, 0x31, 0x30, 0x2e, 0x37, 0x20, 0x31, 0x37, 0x2e, 0x32, 0x20, 0x39, 0x2e,
+	0x36, 0x20, 0x31, 0x37, 0x2e, 0x39, 0x20, 0x51, 0x38, 0x2e, 0x37, 0x20, 0x31, 0x35, 0x2e, 0x34,
+	0x20, 0x39, 0x2e, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x20, 0x5a, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65,
+	0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x31, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x36, 0x2e, 0x36,
+	0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x34, 0x2e, 0x34, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x32,
+	0x2e, 0x34, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66,
+	0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22,
+	0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61,
+	0x74, 0x65, 0x28, 0x2d, 0x33, 0x32, 0x20, 0x31, 0x31, 0x20, 0x36, 0x2e, 0x36, 0x29, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a,
+};
+
+static const unsigned char icon_toolbar_prefs_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x05, 0x6c, 0x49, 0x44, 0x41, 0x54, 0x58, 0x85, 0xed, 0x96, 0x5d,
+	0x4c, 0x53, 0x67, 0x18, 0xc7, 0xff, 0xa7, 0x3d, 0x55, 0xaa, 0xd0, 0x2f, 0x3e, 0x44, 0x59, 0x4b,
+	0x04, 0x1c, 0xe1, 0xc3, 0x98, 0x88, 0x99, 0xf1, 0x82, 0x65, 0xe8, 0xaa, 0x31, 0x8b, 0x57, 0x0c,
+	0x26, 0x4b, 0xdc, 0x62, 0x9c, 0xb8, 0x39, 0xb7, 0xdd, 0x4e, 0x26, 0x9b, 0x99, 0xbb, 0x58, 0x16,
+	0x93, 0x5d, 0x18, 0x58, 0x40, 0xe2, 0x85, 0x18, 0x34, 0x10, 0x74, 0x4d, 0x68, 0x65, 0x20, 0x09,
+	0xc1, 0xa9, 0x61, 0xa2, 0x33, 0xc2, 0x06, 0x41, 0x70, 0xd0, 0xda, 0xf2, 0x51, 0x28, 0x3d, 0xfd,
+	0x3c, 0xef, 0xf9, 0xe8, 0xbb, 0x9b, 0xc1, 0x40, 0x0a, 0xb6, 0x4e, 0x97, 0x2c, 0xd9, 0xff, 0xea,
+	0xe4, 0x9c, 0xe7, 0x7d, 0xfe, 0xbf, 0xf3, 0x3c, 0xe7, 0x79, 0xcf, 0x0b, 0xfc, 0xaf, 0x97, 0xa4,
+	0xb6, 0xb6, 0xb6, 0x2c, 0x8b, 0xc5, 0x92, 0xf4, 0xaf, 0x1b, 0xb7, 0xb7, 0xb7, 0xe7, 0xf4, 0xf7,
+	0xf7, 0x77, 0x4c, 0x4d, 0x4d, 0x79, 0x87, 0x87, 0x87, 0x07, 0xbb, 0xbb, 0xbb, 0x2b, 0x56, 0x8b,
+	0x57, 0x3c, 0x7d, 0xc3, 0xe5, 0x72, 0x15, 0xbb, 0xdd, 0xee, 0x0f, 0x9e, 0xc7, 0xdc, 0x66, 0xb3,
+	0x69, 0x36, 0x6f, 0xde, 0x7c, 0x35, 0x2f, 0x2f, 0xcf, 0xac, 0xd7, 0xeb, 0xb5, 0x94, 0x52, 0xea,
+	0xf7, 0xfb, 0x6f, 0xc5, 0x9c, 0x60, 0x7a, 0x7a, 0x3a, 0xd1, 0xed, 0x76, 0xbb, 0x39, 0x8e, 0x8b,
+	0xf0, 0x3c, 0x7f, 0x2c, 0x5e, 0x80, 0xde, 0xde, 0xde, 0x6f, 0x09, 0x21, 0x94, 0x10, 0x42, 0x9d,
+	0x4e, 0xe7, 0xdc, 0x8d, 0x1b, 0x37, 0xcc, 0xf3, 0xcf, 0xac, 0x56, 0x6b, 0x66, 0xb4, 0x35, 0x4b,
+	0x2a, 0x90, 0x96, 0x96, 0x16, 0x50, 0xa9, 0x54, 0xef, 0xae, 0x59, 0xb3, 0x86, 0x67, 0x59, 0xf6,
+	0x07, 0x41, 0x10, 0x3e, 0x8e, 0x07, 0x20, 0x21, 0x21, 0x21, 0x87, 0x52, 0x0a, 0x49, 0x92, 0xe0,
+	0xf3, 0xf9, 0xdc, 0x82, 0x20, 0xf4, 0x50, 0x4a, 0x99, 0xae, 0xae, 0xae, 0xd3, 0x3a, 0x9d, 0xae,
+	0xc7, 0x62, 0xb1, 0xe4, 0xac, 0x0a, 0x00, 0x00, 0x3a, 0x9d, 0xae, 0x33, 0x1c, 0x0e, 0xbf, 0xdd,
+	0xdb, 0xdb, 0x2b, 0x8a, 0xa2, 0x78, 0xce, 0xe3, 0xf1, 0xc4, 0x0c, 0xc1, 0x30, 0x8c, 0x2c, 0x49,
+	0x12, 0x24, 0x49, 0x42, 0x6a, 0x6a, 0xea, 0x96, 0xe4, 0xe4, 0x64, 0xdb, 0xed, 0xdb, 0xb7, 0xaf,
+	0xa7, 0xa7, 0xa7, 0x57, 0x25, 0x25, 0x25, 0x99, 0x54, 0x2a, 0xd5, 0xe1, 0x67, 0x02, 0x00, 0x80,
+	0xc1, 0x60, 0xb0, 0x75, 0x76, 0x76, 0x36, 0x74, 0x74, 0x74, 0x48, 0x84, 0x90, 0x73, 0x63, 0x63,
+	0x63, 0x31, 0x41, 0x30, 0x0c, 0x23, 0xf2, 0x3c, 0x0f, 0x51, 0x14, 0x41, 0x08, 0x41, 0x6a, 0x6a,
+	0xea, 0x6e, 0xbd, 0x5e, 0xbf, 0x4f, 0x10, 0x04, 0x15, 0xc7, 0x71, 0x21, 0x42, 0x88, 0x65, 0xd9,
+	0x9a, 0xd5, 0x12, 0x56, 0x57, 0x57, 0xd7, 0xe4, 0xe7, 0xe7, 0x1f, 0x2d, 0x2a, 0x2a, 0x62, 0x25,
+	0x49, 0x3a, 0x91, 0x9f, 0x9f, 0x5f, 0xbb, 0x52, 0x2c, 0xa5, 0xf4, 0x7d, 0x9e, 0xe7, 0x2f, 0x8c,
+	0x8e, 0x8e, 0x2a, 0x12, 0x13, 0x13, 0x17, 0x20, 0x78, 0x9e, 0x47, 0x38, 0x1c, 0xa6, 0x5e, 0xaf,
+	0xb7, 0xee, 0xc0, 0x81, 0x03, 0x1f, 0xc5, 0x05, 0x00, 0x00, 0x55, 0x55, 0x55, 0x35, 0xb9, 0xb9,
+	0xb9, 0x47, 0x77, 0xed, 0xda, 0xc5, 0x2a, 0x95, 0xca, 0x13, 0xd9, 0xd9, 0xd9, 0xcb, 0x20, 0x28,
+	0xa5, 0x07, 0x05, 0x41, 0xb8, 0x24, 0x08, 0x82, 0xd2, 0xe3, 0xf1, 0x60, 0x6c, 0x6c, 0x8c, 0x03,
+	0xe0, 0x04, 0x90, 0x14, 0x0c, 0x06, 0xa7, 0x04, 0x41, 0x68, 0xd5, 0x6a, 0xb5, 0x67, 0x4b, 0x4a,
+	0x4a, 0xa4, 0x67, 0xf9, 0x45, 0xd5, 0xc9, 0x93, 0x27, 0x6b, 0x9b, 0x9a, 0x9a, 0x04, 0xbb, 0xdd,
+	0x1e, 0x99, 0x98, 0x98, 0x38, 0xfe, 0xb4, 0x39, 0x21, 0x44, 0xf2, 0xfb, 0xfd, 0xd4, 0xe1, 0x70,
+	0xd0, 0xbe, 0xbe, 0xbe, 0xe1, 0xae, 0xae, 0xae, 0x0c, 0x4a, 0x29, 0x53, 0x57, 0x57, 0xb7, 0xee,
+	0xb9, 0x0c, 0xa3, 0xa9, 0xaa, 0xaa, 0xaa, 0xb6, 0xb9, 0xb9, 0x59, 0x98, 0x9e, 0x9e, 0x8e, 0x78,
+	0x3c, 0x9e, 0xe3, 0xab, 0x99, 0xbf, 0x30, 0xd3, 0xa7, 0x75, 0xea, 0xd4, 0xa9, 0xda, 0x6b, 0xd7,
+	0xae, 0x09, 0x4e, 0xa7, 0x33, 0x32, 0x31, 0x31, 0x71, 0x21, 0x18, 0x0c, 0xfe, 0x63, 0x73, 0x65,
+	0x3c, 0xc1, 0x3d, 0x3d, 0x3d, 0xd6, 0x82, 0x82, 0x02, 0x43, 0x56, 0x56, 0xd6, 0x0e, 0xb5, 0x5a,
+	0x5d, 0x34, 0x3c, 0x3c, 0xac, 0x50, 0x2a, 0x95, 0x70, 0xbb, 0xdd, 0x8f, 0x38, 0x8e, 0x2b, 0xd9,
+	0xb3, 0x67, 0x8f, 0x33, 0x5e, 0x00, 0x36, 0x9e, 0xe0, 0xb2, 0xb2, 0x32, 0xa5, 0xd9, 0x6c, 0x76,
+	0xcc, 0xcd, 0xcd, 0xb1, 0x3e, 0x9f, 0x0f, 0x79, 0x79, 0x79, 0x18, 0xfc, 0xfd, 0x41, 0x38, 0xc7,
+	0xfb, 0xe9, 0x7d, 0x9f, 0xc3, 0x11, 0x88, 0xd7, 0x1c, 0x88, 0x61, 0x0a, 0x16, 0x4b, 0x92, 0xa4,
+	0x0a, 0xbb, 0xdd, 0x7e, 0x29, 0x14, 0x0a, 0x29, 0x86, 0x86, 0x86, 0x90, 0xb9, 0x49, 0x43, 0xb7,
+	0xa7, 0xb5, 0xb9, 0x14, 0x19, 0xef, 0x65, 0x78, 0xbb, 0x0f, 0xdd, 0xf7, 0xfd, 0xe1, 0x7a, 0x33,
+	0xf3, 0x38, 0x37, 0x17, 0x4f, 0xce, 0xa8, 0x1b, 0x51, 0x34, 0x51, 0x4a, 0x0f, 0xca, 0xb2, 0xdc,
+	0xa8, 0xd5, 0x6a, 0x15, 0xc1, 0x60, 0x10, 0x09, 0x0a, 0xfe, 0x89, 0xae, 0xbf, 0xc2, 0x1e, 0x7e,
+	0xd4, 0x91, 0x01, 0xee, 0x01, 0x74, 0x6f, 0x5c, 0xdc, 0x9e, 0x68, 0x4a, 0xbe, 0x3e, 0x5a, 0xa7,
+	0xd7, 0xbe, 0x70, 0x80, 0xc5, 0x73, 0x1e, 0x0a, 0x85, 0x40, 0x29, 0x1d, 0x19, 0x1c, 0x7a, 0x5c,
+	0x3e, 0xe9, 0xf2, 0xf6, 0xce, 0xd8, 0x1d, 0x08, 0xfe, 0x7a, 0x16, 0x70, 0xd4, 0xc0, 0x50, 0xfc,
+	0xcd, 0x4e, 0x7d, 0x86, 0xa1, 0x6b, 0xbc, 0x56, 0xab, 0x8f, 0x15, 0x60, 0xd9, 0x37, 0x60, 0xb3,
+	0xd9, 0x34, 0x7a, 0xbd, 0xbe, 0x4a, 0xad, 0x56, 0x6f, 0xa1, 0x94, 0xca, 0x2c, 0xcb, 0x0a, 0x3c,
+	0xcf, 0x1f, 0x94, 0x24, 0x49, 0xe9, 0xf5, 0x7a, 0xf1, 0xf0, 0xe1, 0xc3, 0xb1, 0x2b, 0x57, 0xae,
+	0x54, 0x37, 0x36, 0x36, 0xde, 0x69, 0x2e, 0xc3, 0x2f, 0x0a, 0x26, 0x2c, 0x03, 0x8e, 0x0a, 0x00,
+	0x58, 0x4f, 0x45, 0xe8, 0x8b, 0xcf, 0x14, 0xe1, 0x66, 0x75, 0xe7, 0x78, 0x2d, 0xcc, 0xb1, 0xb4,
+	0x63, 0x09, 0x40, 0x7b, 0x7b, 0x7b, 0x8e, 0xc9, 0x64, 0xba, 0x6a, 0x34, 0x1a, 0xb7, 0x52, 0x4a,
+	0x11, 0x89, 0x44, 0x40, 0x08, 0xc1, 0xc8, 0xc8, 0x08, 0x34, 0x1a, 0x0d, 0x06, 0x06, 0x06, 0xc6,
+	0x1b, 0x1a, 0x1a, 0x6a, 0x58, 0x96, 0x6d, 0x01, 0x80, 0xf2, 0x16, 0xc8, 0xcd, 0x88, 0x1c, 0x02,
+	0xc2, 0x58, 0x80, 0x00, 0xe2, 0x82, 0x58, 0xd2, 0x82, 0x0d, 0x1b, 0x36, 0xd4, 0x1a, 0x8d, 0xc6,
+	0xad, 0xb2, 0x2c, 0x43, 0x92, 0x24, 0x88, 0xa2, 0x08, 0x4a, 0x29, 0x74, 0x3a, 0x1d, 0xfa, 0xfb,
+	0xfb, 0xfd, 0xe7, 0xcf, 0x9f, 0xaf, 0x65, 0x59, 0xf6, 0xfb, 0x96, 0x96, 0x16, 0x79, 0x7e, 0x4d,
+	0x79, 0x0b, 0x64, 0xe7, 0x6f, 0x91, 0x43, 0xce, 0x89, 0xf0, 0xe5, 0x19, 0xbb, 0x03, 0xc1, 0xc7,
+	0xf7, 0x80, 0x49, 0x2b, 0xf4, 0xc5, 0x67, 0x8a, 0x92, 0x4c, 0x29, 0x9d, 0xcf, 0x6a, 0xc7, 0xc2,
+	0x14, 0xb4, 0xb5, 0xb5, 0x65, 0x15, 0x16, 0x16, 0xde, 0xd7, 0x6a, 0xb5, 0x5a, 0x8f, 0xc7, 0xc3,
+	0x05, 0x02, 0x81, 0x69, 0x83, 0xc1, 0xb0, 0x85, 0x61, 0x18, 0x10, 0x42, 0x60, 0xb7, 0xdb, 0x07,
+	0xdd, 0x6e, 0xf7, 0xd6, 0xf2, 0xf2, 0x72, 0x39, 0x5a, 0xa2, 0xe6, 0x32, 0x28, 0x33, 0x0a, 0x14,
+	0x8d, 0x19, 0x1b, 0xd5, 0x15, 0x29, 0x26, 0x23, 0xd6, 0x67, 0x15, 0x01, 0xe9, 0x6f, 0x61, 0xee,
+	0x66, 0xf5, 0x3d, 0xbf, 0x7d, 0x66, 0xc5, 0x4a, 0x2c, 0xb4, 0x40, 0x96, 0x65, 0xb7, 0xcf, 0xe7,
+	0x73, 0x71, 0x1c, 0xe7, 0x9a, 0x9c, 0x9c, 0xfc, 0x4c, 0x96, 0xe5, 0x9e, 0x40, 0x20, 0x60, 0x4b,
+	0x49, 0x49, 0xd9, 0x4d, 0x08, 0x81, 0x42, 0xa1, 0x48, 0x54, 0xab, 0xd5, 0x6b, 0x01, 0x84, 0xa2,
+	0x25, 0x5a, 0xad, 0x1d, 0xf4, 0xe7, 0xea, 0x5b, 0xae, 0xba, 0xc8, 0xeb, 0x9b, 0x8e, 0xf9, 0x67,
+	0x56, 0xac, 0x00, 0x00, 0x74, 0x74, 0x74, 0x54, 0x30, 0x0c, 0x73, 0xcb, 0x6c, 0x36, 0xdb, 0x29,
+	0xa5, 0x4c, 0x77, 0x77, 0xf7, 0x75, 0x8d, 0x46, 0xb3, 0x8f, 0x10, 0x02, 0x8e, 0xe3, 0xee, 0xee,
+	0xdf, 0xbf, 0xff, 0xb5, 0xd5, 0xca, 0x09, 0x00, 0x7d, 0x95, 0x50, 0xf1, 0x9b, 0x98, 0xcb, 0xaf,
+	0x6c, 0x5c, 0x57, 0xba, 0xb8, 0x12, 0x9e, 0x9b, 0x5f, 0x0e, 0x18, 0xfa, 0x46, 0xb6, 0x31, 0xa7,
+	0x11, 0x89, 0x5a, 0x01, 0x00, 0xd8, 0xbb, 0x77, 0xef, 0xe5, 0xf9, 0x6b, 0xab, 0xd5, 0x5a, 0xad,
+	0xd3, 0xe9, 0x76, 0x07, 0x02, 0x01, 0xf0, 0x3c, 0x4f, 0x83, 0xc1, 0xe0, 0xb2, 0xc3, 0x44, 0x34,
+	0xed, 0xa8, 0x87, 0xd8, 0x5c, 0x46, 0xdf, 0x61, 0x10, 0x6e, 0x5c, 0x5c, 0x09, 0x43, 0xf1, 0xd7,
+	0x85, 0xb3, 0xf8, 0x2a, 0x17, 0x78, 0x34, 0xb8, 0x22, 0xc0, 0xbc, 0x5a, 0x5b, 0x5b, 0x33, 0x55,
+	0x2a, 0xd5, 0x11, 0x42, 0x88, 0x2a, 0x14, 0x0a, 0x85, 0x08, 0x21, 0x17, 0x67, 0x67, 0x67, 0xbf,
+	0x8b, 0x05, 0x00, 0xf8, 0xbb, 0x1d, 0x34, 0x12, 0xce, 0x07, 0x1c, 0xdb, 0xfe, 0x82, 0xf0, 0x24,
+	0xef, 0xfc, 0xfc, 0x09, 0x70, 0x64, 0x49, 0xec, 0x8a, 0x5b, 0xb1, 0xc5, 0x62, 0xc9, 0x91, 0x24,
+	0xe9, 0x30, 0x80, 0x1f, 0x4b, 0x4b, 0x4b, 0xef, 0xc6, 0x6a, 0xbe, 0x58, 0xb6, 0x4f, 0x72, 0xd6,
+	0x46, 0x92, 0x66, 0xbe, 0x30, 0x6d, 0x54, 0x66, 0xcf, 0xaa, 0x5e, 0x6d, 0x2c, 0xf9, 0xf0, 0xce,
+	0x4f, 0x00, 0x68, 0x4c, 0x00, 0x2f, 0x4a, 0x95, 0x95, 0x95, 0xeb, 0x42, 0xa1, 0x90, 0x51, 0x96,
+	0x65, 0x86, 0x61, 0x98, 0xa9, 0xa6, 0xa6, 0xa6, 0x25, 0xd3, 0x10, 0xf3, 0xbf, 0xe0, 0x79, 0x55,
+	0x5f, 0x5f, 0x1f, 0x62, 0x59, 0x76, 0x9c, 0x52, 0x1a, 0x14, 0x45, 0xf1, 0xa5, 0xbf, 0xf0, 0x7f,
+	0x4f, 0x7f, 0x02, 0xec, 0x75, 0xf2, 0xb0, 0xda, 0x55, 0x4b, 0xf2, 0x00, 0x00, 0x00, 0x00, 0x49,
+	0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_prefs_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x68,
+	0x61, 0x66, 0x74, 0x67, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e,
+	0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e,
+	0x55, 0x73, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x33, 0x2e, 0x37, 0x22, 0x20, 0x79,
+	0x31, 0x3d, 0x22, 0x31, 0x33, 0x2e, 0x37, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x36, 0x2e,
+	0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x36, 0x2e, 0x33, 0x22, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x66, 0x31, 0x66, 0x31, 0x66, 0x31, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x2e, 0x38, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x64, 0x36, 0x64, 0x36, 0x64, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23,
+	0x62, 0x63, 0x62, 0x63, 0x62, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f,
+	0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69,
+	0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x31, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53,
+	0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x32,
+	0x32, 0x2e, 0x35, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x2e, 0x35, 0x22, 0x20, 0x78, 0x32,
+	0x3d, 0x22, 0x32, 0x37, 0x2e, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x38, 0x2e, 0x35, 0x22,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x66, 0x65, 0x66, 0x65, 0x66, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x63, 0x32, 0x63, 0x32, 0x63, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x32, 0x22, 0x20,
+	0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75,
+	0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x32, 0x2e, 0x35, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x35,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x37, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32, 0x39, 0x22,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x37, 0x66, 0x37, 0x66, 0x37, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x33, 0x65, 0x33, 0x65, 0x33, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x62, 0x30, 0x62, 0x30, 0x62, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6c, 0x61, 0x64,
+	0x65, 0x67, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74,
+	0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73,
+	0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22,
+	0x32, 0x2e, 0x39, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x36, 0x22, 0x20, 0x79,
+	0x32, 0x3d, 0x22, 0x31, 0x35, 0x2e, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x37,
+	0x65, 0x37, 0x65, 0x37, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x32, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x35,
+	0x64, 0x35, 0x64, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x65,
+	0x65, 0x65, 0x65, 0x65, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x63, 0x63, 0x63, 0x63,
+	0x63, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65,
+	0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20,
+	0x69, 0x64, 0x3d, 0x22, 0x66, 0x65, 0x72, 0x67, 0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61,
+	0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x34, 0x22,
+	0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x36, 0x2e, 0x35, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31,
+	0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x35, 0x22, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x38, 0x65, 0x38, 0x65, 0x38, 0x65, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x65, 0x63, 0x65, 0x63, 0x65, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x66, 0x38, 0x66, 0x38, 0x66, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x61, 0x32, 0x61, 0x32, 0x61, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x61, 0x6e, 0x64, 0x67, 0x22,
+	0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22,
+	0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20,
+	0x78, 0x31, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x30, 0x37, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32,
+	0x33, 0x2e, 0x38, 0x33, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x33, 0x2e, 0x33, 0x33, 0x22,
+	0x20, 0x79, 0x32, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x35, 0x37, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x62, 0x66, 0x37, 0x61, 0x30, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30,
+	0x2e, 0x33, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x65, 0x64, 0x61, 0x35, 0x30, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30,
+	0x2e, 0x35, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x66, 0x66, 0x64, 0x35, 0x34, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22,
+	0x30, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x33, 0x61, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x2e, 0x39, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x66, 0x36, 0x63, 0x32, 0x32, 0x63, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x64, 0x64, 0x39, 0x64, 0x31, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x67, 0x20,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x6c, 0x61, 0x74, 0x65, 0x28, 0x32, 0x2e, 0x34, 0x30, 0x30, 0x20, 0x32, 0x2e, 0x34, 0x30, 0x30,
+	0x29, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x28, 0x30, 0x2e, 0x38, 0x35, 0x30, 0x30, 0x29, 0x22,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d,
+	0x22, 0x32, 0x37, 0x2e, 0x34, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x33, 0x30, 0x22, 0x20, 0x72,
+	0x78, 0x3d, 0x22, 0x33, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x31, 0x2e, 0x33, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x35, 0x61, 0x35, 0x61, 0x35, 0x61, 0x22, 0x20, 0x6f, 0x70,
+	0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x31, 0x36, 0x22, 0x20, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x28, 0x34,
+	0x35, 0x20, 0x32, 0x37, 0x2e, 0x34, 0x20, 0x33, 0x30, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x32, 0x32, 0x2e, 0x34, 0x22, 0x20,
+	0x79, 0x31, 0x3d, 0x22, 0x37, 0x2e, 0x36, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x37, 0x2e, 0x36,
+	0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x73, 0x68, 0x61, 0x66, 0x74, 0x67, 0x29,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x33, 0x2e, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x32, 0x34, 0x2e, 0x31, 0x33, 0x20, 0x30, 0x2e, 0x36, 0x33, 0x20, 0x41, 0x34,
+	0x2e, 0x37, 0x20, 0x34, 0x2e, 0x37, 0x20, 0x30, 0x20, 0x31, 0x20, 0x30, 0x20, 0x32, 0x39, 0x2e,
+	0x33, 0x37, 0x20, 0x35, 0x2e, 0x38, 0x37, 0x20, 0x4c, 0x32, 0x38, 0x2e, 0x34, 0x35, 0x20, 0x34,
+	0x2e, 0x31, 0x20, 0x4c, 0x32, 0x36, 0x2e, 0x35, 0x20, 0x35, 0x2e, 0x36, 0x39, 0x20, 0x41, 0x31,
+	0x2e, 0x35, 0x35, 0x20, 0x31, 0x2e, 0x35, 0x35, 0x20, 0x30, 0x20, 0x30, 0x20, 0x31, 0x20, 0x32,
+	0x34, 0x2e, 0x33, 0x31, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x4c, 0x32, 0x35, 0x2e, 0x39, 0x20, 0x31,
+	0x2e, 0x35, 0x35, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c,
+	0x28, 0x23, 0x68, 0x31, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23,
+	0x61, 0x62, 0x61, 0x62, 0x61, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e,
+	0x64, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74,
+	0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74,
+	0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x35, 0x2e, 0x38, 0x37, 0x20, 0x32, 0x39, 0x2e, 0x33, 0x37,
+	0x20, 0x41, 0x34, 0x2e, 0x37, 0x20, 0x34, 0x2e, 0x37, 0x20, 0x30, 0x20, 0x31, 0x20, 0x30, 0x20,
+	0x30, 0x2e, 0x36, 0x33, 0x20, 0x32, 0x34, 0x2e, 0x31, 0x33, 0x20, 0x4c, 0x31, 0x2e, 0x35, 0x35,
+	0x20, 0x32, 0x35, 0x2e, 0x39, 0x20, 0x4c, 0x33, 0x2e, 0x35, 0x20, 0x32, 0x34, 0x2e, 0x33, 0x31,
+	0x20, 0x41, 0x31, 0x2e, 0x35, 0x35, 0x20, 0x31, 0x2e, 0x35, 0x35, 0x20, 0x30, 0x20, 0x30, 0x20,
+	0x31, 0x20, 0x35, 0x2e, 0x36, 0x39, 0x20, 0x32, 0x36, 0x2e, 0x35, 0x20, 0x4c, 0x34, 0x2e, 0x31,
+	0x20, 0x32, 0x38, 0x2e, 0x34, 0x35, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x75, 0x72, 0x6c, 0x28, 0x23, 0x68, 0x32, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x3d, 0x22, 0x23, 0x61, 0x62, 0x61, 0x62, 0x61, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6f, 0x70, 0x61,
+	0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x32, 0x2e, 0x39, 0x22, 0x20, 0x79,
+	0x31, 0x3d, 0x22, 0x32, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x30, 0x22, 0x20, 0x79,
+	0x32, 0x3d, 0x22, 0x32, 0x32, 0x2e, 0x39, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x33, 0x66, 0x33, 0x66, 0x33, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75,
+	0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x36,
+	0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20,
+	0x63, 0x78, 0x3d, 0x22, 0x31, 0x33, 0x2e, 0x32, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x31, 0x37,
+	0x2e, 0x31, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x32, 0x2e, 0x37, 0x22, 0x20, 0x72, 0x79, 0x3d,
+	0x22, 0x31, 0x2e, 0x31, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x35, 0x61,
+	0x35, 0x61, 0x35, 0x61, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30,
+	0x2e, 0x32, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72,
+	0x6f, 0x74, 0x61, 0x74, 0x65, 0x28, 0x34, 0x35, 0x20, 0x31, 0x33, 0x2e, 0x32, 0x20, 0x31, 0x37,
+	0x2e, 0x31, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32, 0x2e, 0x39, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31,
+	0x35, 0x2e, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x75, 0x72, 0x6c,
+	0x28, 0x23, 0x62, 0x6c, 0x61, 0x64, 0x65, 0x67, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x32, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x34, 0x2e, 0x35, 0x22,
+	0x20, 0x79, 0x31, 0x3d, 0x22, 0x36, 0x2e, 0x33, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x32,
+	0x2e, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x31, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x35, 0x37, 0x35, 0x37, 0x35, 0x37, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x38,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70,
+	0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79,
+	0x3d, 0x22, 0x30, 0x2e, 0x38, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e,
+	0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x33, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22,
+	0x31, 0x34, 0x2e, 0x34, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x36, 0x2e, 0x32, 0x22, 0x20,
+	0x79, 0x32, 0x3d, 0x22, 0x31, 0x36, 0x2e, 0x37, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x66, 0x65, 0x72, 0x67, 0x29, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x39, 0x22,
+	0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31,
+	0x36, 0x2e, 0x31, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x36, 0x2e, 0x36, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x32, 0x36, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32, 0x37, 0x2e,
+	0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x68, 0x61, 0x6e, 0x64, 0x67, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x34, 0x2e, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x32, 0x36, 0x2e, 0x39, 0x22,
+	0x20, 0x63, 0x79, 0x3d, 0x22, 0x32, 0x37, 0x2e, 0x34, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x32, 0x2e,
+	0x33, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x68, 0x61,
+	0x6e, 0x64, 0x67, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70,
+	0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x38, 0x2e, 0x31, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x31, 0x37, 0x2e, 0x34, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x35, 0x22, 0x20,
+	0x72, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22,
+	0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79,
+	0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d,
+	0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x28, 0x34, 0x35, 0x20, 0x31, 0x38, 0x2e, 0x31,
+	0x20, 0x31, 0x37, 0x2e, 0x34, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x67, 0x3e,
+	0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_search_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x04, 0x8a, 0x49, 0x44, 0x41, 0x54, 0x58, 0x47, 0xcd, 0x95, 0xdb,
+	0x4f, 0x54, 0x57, 0x14, 0x87, 0xfd, 0x3f, 0xf0, 0xa1, 0xb5, 0x2d, 0xd2, 0x36, 0xe9, 0x43, 0xfb,
+	0x66, 0xd3, 0x5b, 0xb4, 0x0f, 0xa6, 0x49, 0x93, 0xc6, 0x44, 0xa9, 0x0f, 0x8d, 0x69, 0xa4, 0xad,
+	0xfa, 0x40, 0x24, 0xb6, 0x8d, 0x1a, 0xa8, 0x51, 0xa8, 0xa2, 0x88, 0xd3, 0x26, 0x56, 0xca, 0x45,
+	0x1c, 0x14, 0xd4, 0x62, 0x51, 0x69, 0x07, 0x54, 0x18, 0x6e, 0xc2, 0x60, 0x1d, 0x50, 0x11, 0xb9,
+	0xc8, 0x55, 0x41, 0x28, 0x0c, 0x08, 0x1c, 0x50, 0x86, 0x39, 0xb7, 0xaf, 0x59, 0x7b, 0x8e, 0x49,
+	0x33, 0x49, 0x13, 0x60, 0x80, 0x74, 0x25, 0x2b, 0xe7, 0x9c, 0x7d, 0xce, 0xec, 0xf5, 0xed, 0x75,
+	0xf9, 0xcd, 0xaa, 0x55, 0xff, 0x67, 0xcb, 0xf0, 0x0c, 0x90, 0x71, 0x73, 0x86, 0xc3, 0x0d, 0xb3,
+	0x1c, 0xbb, 0x15, 0x24, 0xd3, 0x1f, 0x54, 0xd7, 0x9c, 0x86, 0x00, 0x91, 0xdf, 0x2e, 0xa9, 0xa5,
+	0x95, 0x0e, 0x72, 0xc4, 0x37, 0x4b, 0x76, 0x5b, 0x88, 0xd3, 0x9d, 0x21, 0xdc, 0xdd, 0x3a, 0xe7,
+	0x7a, 0x75, 0xce, 0x3f, 0xd2, 0xb9, 0x38, 0x60, 0x50, 0x3c, 0x68, 0xa8, 0xb5, 0x5f, 0x9b, 0xb5,
+	0xa5, 0x07, 0xd9, 0x57, 0xa6, 0x71, 0xea, 0xfe, 0x1c, 0xf9, 0x0f, 0x43, 0x14, 0xf6, 0xe9, 0xfc,
+	0x36, 0x60, 0x70, 0xe9, 0x89, 0x41, 0xc9, 0x90, 0x41, 0x41, 0x4f, 0xf8, 0xf9, 0xf2, 0xb0, 0xc1,
+	0x1f, 0x01, 0x93, 0xd2, 0x51, 0x93, 0xa2, 0x7e, 0x7d, 0xe9, 0x20, 0xf6, 0x7a, 0xa6, 0xc8, 0x6a,
+	0x9d, 0xe3, 0x5c, 0x9f, 0xae, 0x82, 0x94, 0x3d, 0x35, 0xa9, 0x98, 0xb2, 0xb8, 0x36, 0x61, 0x71,
+	0x63, 0xca, 0xc2, 0x33, 0x6e, 0x72, 0xa6, 0x2b, 0xc4, 0xd9, 0x1e, 0x5d, 0x65, 0x41, 0xbd, 0xd7,
+	0x2c, 0xf5, 0x6d, 0xe4, 0x5e, 0x0b, 0xb6, 0xe4, 0x92, 0x41, 0x4e, 0xb6, 0xcc, 0x71, 0xb6, 0x57,
+	0xe7, 0xea, 0xa8, 0x49, 0xd5, 0x8c, 0x45, 0xa3, 0x61, 0xd3, 0x64, 0xa1, 0x5c, 0xb2, 0xd0, 0x10,
+	0xb2, 0x15, 0xcc, 0xef, 0x43, 0x06, 0x57, 0x46, 0xc2, 0x19, 0x10, 0x80, 0xda, 0xe7, 0x36, 0xa5,
+	0x43, 0xc1, 0xe8, 0x20, 0xd2, 0x7d, 0x41, 0x72, 0x3b, 0x42, 0x6a, 0x73, 0xef, 0xb4, 0x85, 0xdf,
+	0x82, 0x76, 0xa0, 0xc7, 0x71, 0x8f, 0x04, 0x9b, 0xb4, 0x68, 0x36, 0xa1, 0x7c, 0x22, 0x9c, 0x19,
+	0xf9, 0x4e, 0x40, 0x05, 0xec, 0x66, 0xd0, 0x5e, 0x3c, 0x40, 0x72, 0x51, 0xbb, 0x4a, 0xbd, 0x34,
+	0x96, 0xd4, 0xb6, 0x7e, 0xce, 0xe6, 0x01, 0xf0, 0x18, 0x18, 0x73, 0xbc, 0x7a, 0xd2, 0x52, 0x81,
+	0x3b, 0x6d, 0xa8, 0x9b, 0xb5, 0x55, 0x50, 0xc9, 0xd0, 0x2d, 0x13, 0xe5, 0xcd, 0xb0, 0x78, 0x80,
+	0xf4, 0x9a, 0x29, 0x72, 0xda, 0x43, 0x14, 0xf6, 0xeb, 0xaa, 0xce, 0x8d, 0x06, 0x74, 0x02, 0x7f,
+	0x03, 0xb3, 0xc0, 0x84, 0x85, 0xea, 0x81, 0x9a, 0xe7, 0x36, 0xdd, 0x16, 0xf8, 0x6d, 0xb8, 0x03,
+	0xdc, 0xfb, 0x97, 0xb7, 0x10, 0x5e, 0x8b, 0xdc, 0x7b, 0x5e, 0x76, 0xc4, 0x17, 0x54, 0xe3, 0x76,
+	0xe1, 0xb1, 0x41, 0x69, 0xc0, 0xc4, 0x17, 0xb2, 0x69, 0x03, 0x9e, 0x00, 0x23, 0x16, 0x34, 0xcc,
+	0x58, 0xd4, 0xce, 0xda, 0xf8, 0x4d, 0x18, 0x02, 0xee, 0x83, 0xca, 0x90, 0x94, 0xa8, 0xc3, 0x71,
+	0xb9, 0x97, 0xdf, 0x44, 0xee, 0x3d, 0x2f, 0x73, 0x35, 0x05, 0x55, 0x77, 0xcb, 0x8c, 0x97, 0x0c,
+	0x87, 0xc7, 0xed, 0xca, 0xb0, 0xc1, 0x8d, 0x71, 0x93, 0xf2, 0xa7, 0xa6, 0x3a, 0xb9, 0xa4, 0x79,
+	0x00, 0xe8, 0x73, 0x02, 0x76, 0x03, 0xbd, 0xce, 0xb3, 0xb8, 0xf4, 0x89, 0xac, 0x45, 0xee, 0x3d,
+	0x2f, 0x13, 0x75, 0x7b, 0x31, 0xe3, 0xd2, 0x03, 0x65, 0xe3, 0xa6, 0x1a, 0x33, 0xc9, 0x46, 0xe5,
+	0xb4, 0x85, 0x4f, 0xb7, 0x55, 0xb0, 0x51, 0xc2, 0xa5, 0x91, 0xfb, 0x47, 0xc0, 0xa0, 0x93, 0x25,
+	0x71, 0x81, 0x93, 0xb5, 0xc8, 0xbd, 0xe7, 0x65, 0x87, 0x6b, 0x27, 0x95, 0xd2, 0x49, 0xd0, 0xbc,
+	0x8e, 0x10, 0x7f, 0x8e, 0x99, 0xdc, 0x32, 0x6c, 0xfc, 0xba, 0x4d, 0x9b, 0x09, 0x3d, 0x36, 0x74,
+	0x39, 0x27, 0x97, 0xe0, 0x12, 0x6c, 0xd8, 0x01, 0x7a, 0xd1, 0xa4, 0x23, 0x0e, 0x48, 0xe4, 0xde,
+	0xf3, 0xb2, 0x94, 0xc2, 0x7b, 0x4a, 0xf5, 0x64, 0xd6, 0x05, 0x44, 0x5c, 0x4a, 0x71, 0x7d, 0xd2,
+	0xe2, 0xe6, 0x9c, 0x4d, 0xb3, 0x0d, 0xad, 0x84, 0x21, 0xe4, 0x94, 0x12, 0x5c, 0x82, 0x4e, 0x02,
+	0xd3, 0x80, 0x26, 0x8d, 0x2a, 0xef, 0x9e, 0x47, 0xa1, 0x05, 0x79, 0x9d, 0x61, 0x0d, 0x90, 0xc0,
+	0x22, 0xaf, 0x22, 0x34, 0x32, 0xeb, 0x32, 0x6e, 0xd2, 0xdd, 0xd2, 0x60, 0x52, 0x63, 0x39, 0xbd,
+	0x9c, 0x56, 0x02, 0x3e, 0x03, 0xe6, 0x80, 0xa0, 0x03, 0x52, 0x56, 0x77, 0x67, 0xf1, 0x00, 0x29,
+	0x97, 0x3a, 0x54, 0x09, 0x24, 0xfd, 0xc5, 0x4f, 0x0c, 0xae, 0x0a, 0x80, 0x16, 0xae, 0xff, 0x5d,
+	0x07, 0x40, 0x1a, 0x4d, 0xea, 0x2e, 0xa9, 0x9f, 0x72, 0x46, 0xd4, 0x04, 0x74, 0x20, 0xf0, 0x2c,
+	0xc8, 0x8e, 0x5d, 0xe9, 0x8b, 0x07, 0x10, 0x3b, 0x75, 0x47, 0x53, 0x4d, 0x28, 0xa9, 0x97, 0xeb,
+	0x7c, 0x32, 0x20, 0xa7, 0x17, 0x10, 0xd7, 0xc9, 0x62, 0x76, 0xef, 0xce, 0x8c, 0x0e, 0x40, 0x2c,
+	0xaf, 0x75, 0x5a, 0x29, 0x5e, 0xf5, 0x33, 0x4b, 0x4d, 0x80, 0x48, 0x6c, 0x93, 0xd3, 0x03, 0x0f,
+	0x9d, 0x1e, 0x10, 0x2d, 0x08, 0x38, 0x3d, 0x20, 0xf5, 0x97, 0xe0, 0x89, 0x89, 0x19, 0x9c, 0x3f,
+	0x7f, 0x3d, 0x7a, 0x00, 0x31, 0x57, 0x45, 0x97, 0x1a, 0x45, 0x91, 0x64, 0x51, 0x45, 0x01, 0x10,
+	0xa5, 0x93, 0x29, 0x90, 0x32, 0x88, 0x44, 0x4b, 0x23, 0xb6, 0x07, 0x26, 0x48, 0x3d, 0x5a, 0x40,
+	0x52, 0xd2, 0x09, 0xca, 0xcb, 0x7d, 0x64, 0x67, 0x5f, 0x56, 0x10, 0x5e, 0xef, 0x6d, 0x7c, 0xc7,
+	0xd6, 0xd1, 0x98, 0xf6, 0x46, 0x74, 0x40, 0xbf, 0x54, 0xb4, 0x52, 0xad, 0xe9, 0x34, 0xea, 0xb6,
+	0x92, 0x5b, 0x51, 0x3f, 0xd1, 0x81, 0xda, 0xee, 0x01, 0x5c, 0x39, 0x57, 0xf8, 0x62, 0xdb, 0x01,
+	0xb6, 0x6f, 0x4f, 0x55, 0x41, 0xd3, 0xd2, 0x4e, 0x53, 0x55, 0xe5, 0xc7, 0xe3, 0xa9, 0xa7, 0x36,
+	0xeb, 0x1b, 0x5a, 0x32, 0x62, 0xb9, 0x77, 0x78, 0x35, 0x55, 0x29, 0xaf, 0x47, 0x07, 0xb1, 0x10,
+	0x4b, 0x4f, 0x77, 0x53, 0xe6, 0x4a, 0xe0, 0x6e, 0xee, 0xa7, 0x68, 0x15, 0x9b, 0x19, 0x3b, 0xf3,
+	0x12, 0xb7, 0x0f, 0xc6, 0xe0, 0xf9, 0x7e, 0x85, 0x20, 0x8a, 0x12, 0xdf, 0xa6, 0x29, 0x7f, 0x0b,
+	0xa6, 0x56, 0x4d, 0xb0, 0x23, 0x03, 0xad, 0x72, 0x33, 0x63, 0xee, 0x97, 0xa9, 0x4f, 0x59, 0x4d,
+	0x71, 0xe2, 0x0a, 0x40, 0x9c, 0xdd, 0x11, 0x47, 0xcf, 0x85, 0xf5, 0x30, 0xe6, 0x76, 0x20, 0x8e,
+	0xa3, 0x55, 0x6e, 0x61, 0xcc, 0xbd, 0x86, 0xaa, 0xbd, 0x31, 0xb8, 0xbf, 0x8e, 0x5b, 0x7e, 0x88,
+	0xec, 0x2f, 0xe3, 0xe8, 0x2c, 0x5c, 0x0f, 0x81, 0x33, 0x0e, 0x44, 0x26, 0x5a, 0x65, 0x3c, 0xe3,
+	0xee, 0x35, 0x5c, 0xdb, 0x13, 0x43, 0xd6, 0xb6, 0x15, 0x80, 0x70, 0x6d, 0x5d, 0xcb, 0x83, 0x82,
+	0x8f, 0x20, 0x90, 0x8f, 0xa9, 0xd5, 0x10, 0xec, 0xcc, 0x44, 0xf3, 0xc6, 0x33, 0x5e, 0xf0, 0x0a,
+	0xa5, 0x89, 0x31, 0x64, 0xc6, 0xaf, 0x5d, 0x7e, 0x88, 0x1f, 0x37, 0xad, 0xa5, 0x25, 0xff, 0x43,
+	0x18, 0x3d, 0x8d, 0xa5, 0x20, 0x4e, 0xa0, 0x79, 0x3f, 0x67, 0xbc, 0xe0, 0x55, 0x8a, 0x77, 0xc5,
+	0x90, 0xfa, 0xd9, 0x0a, 0x40, 0x24, 0x7f, 0x12, 0x4b, 0x73, 0xee, 0x07, 0x30, 0x9a, 0x87, 0x35,
+	0x2d, 0x10, 0x2e, 0x34, 0xef, 0x56, 0x05, 0x51, 0xf4, 0x55, 0x0c, 0xfb, 0x37, 0xc6, 0x2e, 0x3f,
+	0xc4, 0xb7, 0x1b, 0x62, 0xf1, 0x67, 0xbf, 0x0f, 0xa3, 0x39, 0x58, 0xd3, 0xb5, 0x04, 0x1f, 0xba,
+	0xd0, 0xaa, 0xb6, 0xd2, 0xf6, 0xd3, 0x6b, 0x7c, 0xb7, 0xf1, 0xad, 0xe5, 0x07, 0x10, 0xdb, 0xb3,
+	0x21, 0x96, 0xba, 0x9f, 0xdf, 0x83, 0x91, 0x6c, 0x05, 0xd1, 0xef, 0x4d, 0xe6, 0xc0, 0xa6, 0x77,
+	0x38, 0xf2, 0xc3, 0xf1, 0x95, 0x01, 0x10, 0x13, 0x88, 0x0b, 0xfb, 0xd6, 0x31, 0xf4, 0xd7, 0x21,
+	0x0e, 0xc5, 0xbf, 0x4b, 0xe9, 0xc5, 0x12, 0x76, 0xee, 0x8c, 0xf2, 0xdf, 0x73, 0xa1, 0x26, 0x10,
+	0x49, 0x1f, 0xbf, 0x49, 0xea, 0xfe, 0xa3, 0x24, 0x24, 0xa4, 0xad, 0x6c, 0xf0, 0xff, 0xb2, 0x7f,
+	0x00, 0xb4, 0xec, 0x5f, 0xc2, 0x8b, 0xe5, 0x8f, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+	0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_search_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x65,
+	0x6e, 0x73, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x32, 0x22, 0x20, 0x63, 0x79,
+	0x3d, 0x22, 0x30, 0x2e, 0x36, 0x36, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x34, 0x66, 0x66, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x63, 0x66, 0x39, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x62, 0x66, 0x65, 0x61, 0x66, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x39, 0x61, 0x64, 0x32, 0x66, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72,
+	0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x69, 0x6d, 0x22, 0x20,
+	0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x61, 0x61, 0x62, 0x33, 0x63, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x35,
+	0x65, 0x36, 0x30, 0x38, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x20, 0x67,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73,
+	0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20, 0x78, 0x31,
+	0x3d, 0x22, 0x32, 0x31, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32, 0x36, 0x2e, 0x34,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x36, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22,
+	0x32, 0x31, 0x2e, 0x36, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38, 0x66, 0x35, 0x61, 0x31,
+	0x65, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x63, 0x64, 0x38, 0x36, 0x31,
+	0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x32, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x34, 0x62, 0x35,
+	0x34, 0x65, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x36, 0x36, 0x22, 0x20,
+	0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x65,
+	0x63, 0x39, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74,
+	0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x32, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x38,
+	0x61, 0x31, 0x32, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73,
+	0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73,
+	0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x34, 0x36, 0x37,
+	0x31, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65,
+	0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20,
+	0x69, 0x64, 0x3d, 0x22, 0x66, 0x65, 0x72, 0x72, 0x75, 0x6c, 0x65, 0x22, 0x20, 0x67, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72,
+	0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22,
+	0x31, 0x38, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22,
+	0x32, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x38, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x36, 0x66, 0x37, 0x35, 0x39, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30,
+	0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x63, 0x36, 0x63, 0x63, 0x64, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31,
+	0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x38,
+	0x61, 0x39, 0x30, 0x61, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c,
+	0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65,
+	0x20, 0x78, 0x31, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32,
+	0x30, 0x2e, 0x34, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x37, 0x2e, 0x35, 0x22, 0x20, 0x79,
+	0x32, 0x3d, 0x22, 0x32, 0x37, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x37, 0x61, 0x34, 0x61, 0x32, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x36, 0x2e, 0x38, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75,
+	0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31,
+	0x3d, 0x22, 0x32, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x37,
+	0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x37, 0x2e, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22,
+	0x32, 0x37, 0x2e, 0x33, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x75, 0x72,
+	0x6c, 0x28, 0x23, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x35, 0x2e, 0x34, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20,
+	0x78, 0x31, 0x3d, 0x22, 0x31, 0x37, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x37,
+	0x2e, 0x32, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x32,
+	0x3d, 0x22, 0x32, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x35, 0x65, 0x36, 0x30, 0x38, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x34, 0x2e, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x37, 0x2e, 0x35, 0x22, 0x20,
+	0x79, 0x31, 0x3d, 0x22, 0x31, 0x37, 0x2e, 0x35, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x30,
+	0x2e, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x33, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x66, 0x65, 0x72, 0x72, 0x75,
+	0x6c, 0x65, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x33, 0x2e, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72,
+	0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x63, 0x79,
+	0x3d, 0x22, 0x31, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x38, 0x2e, 0x38, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x6c, 0x65, 0x6e, 0x73, 0x29,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x72,
+	0x69, 0x6d, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x31, 0x2e, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72,
+	0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x63, 0x79,
+	0x3d, 0x22, 0x31, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x37, 0x2e, 0x39, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x3d, 0x22, 0x23, 0x38, 0x62, 0x63, 0x38, 0x66, 0x37, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x36, 0x22, 0x20,
+	0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x37,
+	0x2e, 0x34, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x37, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x3d, 0x22,
+	0x33, 0x2e, 0x33, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x31, 0x2e, 0x32, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e,
+	0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x34, 0x2e, 0x33, 0x20, 0x38, 0x2e, 0x31, 0x20, 0x41, 0x33, 0x2e, 0x33, 0x20, 0x33, 0x2e,
+	0x33, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, 0x20, 0x37, 0x2e, 0x39, 0x20, 0x31, 0x30, 0x2e, 0x34,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x35,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70,
+	0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79,
+	0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69,
+	0x70, 0x73, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x36, 0x2e, 0x32, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x36, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x31, 0x22, 0x20, 0x72, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30,
+	0x2e, 0x38, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72,
+	0x6f, 0x74, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x34, 0x30, 0x20, 0x36, 0x2e, 0x32, 0x20, 0x36, 0x29,
+	0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_shared_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+	0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61, 0x05, 0x00, 0x00,
+	0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e, 0xc3, 0x01, 0xc7,
+	0x6f, 0xa8, 0x64, 0x00, 0x00, 0x08, 0xb5, 0x49, 0x44, 0x41, 0x54, 0x58, 0x47, 0xb5, 0x96, 0x0d,
+	0x58, 0x8e, 0xe7, 0x1e, 0xc0, 0x5f, 0x33, 0x3b, 0xe6, 0xcc, 0xe5, 0xda, 0xd8, 0x9a, 0x99, 0x85,
+	0x66, 0x6c, 0xb3, 0xc3, 0x46, 0x32, 0xa7, 0x42, 0x8d, 0x28, 0xa3, 0x92, 0x94, 0xad, 0xc8, 0xc8,
+	0x42, 0x5e, 0x29, 0xe9, 0x43, 0x51, 0x24, 0xd1, 0xca, 0x91, 0xf4, 0xa1, 0x22, 0x1f, 0xc9, 0xab,
+	0x54, 0xa2, 0xd2, 0x07, 0x7d, 0x2d, 0xef, 0x0a, 0xcb, 0x94, 0x24, 0x1f, 0x07, 0x29, 0xf5, 0xf6,
+	0xb1, 0x1d, 0xc2, 0x76, 0xe6, 0xfe, 0x9d, 0xeb, 0x79, 0x9f, 0x5c, 0x97, 0xd6, 0xce, 0xb9, 0x76,
+	0xce, 0xe1, 0x7f, 0x5d, 0xff, 0xeb, 0xbd, 0xaf, 0xff, 0x7d, 0xdf, 0xcf, 0xef, 0x77, 0xff, 0xef,
+	0xe7, 0xb9, 0xae, 0x57, 0xa1, 0xf8, 0x3f, 0xe3, 0xed, 0xe9, 0x2a, 0x06, 0x99, 0x25, 0xf3, 0xd6,
+	0x67, 0x87, 0xd0, 0x31, 0x8a, 0xe5, 0xb7, 0xf3, 0xcf, 0x2d, 0x06, 0x5b, 0xa8, 0x78, 0xdb, 0x5c,
+	0xc5, 0x40, 0xbb, 0x52, 0xde, 0xf5, 0x6e, 0x65, 0x84, 0x57, 0x13, 0x3a, 0x26, 0x87, 0x78, 0x63,
+	0x62, 0xf4, 0xf3, 0x95, 0xd0, 0x9d, 0x9d, 0xca, 0x60, 0xcb, 0x63, 0xe8, 0x3a, 0x95, 0xf3, 0x97,
+	0x80, 0x36, 0x0c, 0x23, 0x1e, 0x63, 0xbc, 0x53, 0x60, 0x14, 0x21, 0x18, 0xbb, 0xe5, 0x01, 0x3a,
+	0x33, 0x32, 0x19, 0xa0, 0xff, 0x1c, 0x24, 0x86, 0x58, 0xa7, 0xa3, 0x3b, 0xe7, 0x38, 0xef, 0x2d,
+	0xbb, 0x80, 0xc1, 0xb6, 0xfb, 0x98, 0xed, 0x16, 0x98, 0xc5, 0x0a, 0xa6, 0xc5, 0x0a, 0x3e, 0x8b,
+	0x11, 0x98, 0x46, 0x09, 0xa6, 0xec, 0x12, 0x18, 0xee, 0x78, 0xcc, 0x3b, 0xf3, 0x4a, 0xe8, 0xff,
+	0x49, 0xcc, 0xb3, 0x91, 0x18, 0x3a, 0xf7, 0x18, 0x43, 0xec, 0x73, 0x19, 0xe5, 0x59, 0x87, 0x69,
+	0xd4, 0x2f, 0xcc, 0xde, 0x2b, 0xb4, 0x39, 0x4b, 0xca, 0x3d, 0x82, 0x99, 0x7b, 0x04, 0x16, 0xf1,
+	0x82, 0x19, 0x71, 0xb2, 0x90, 0x24, 0x63, 0x12, 0x25, 0x78, 0xef, 0xeb, 0x2a, 0x5e, 0xfd, 0x38,
+	0x96, 0x7e, 0xef, 0x6d, 0xfe, 0xdf, 0x44, 0x86, 0xd9, 0x67, 0x31, 0xcc, 0xa9, 0x14, 0x7d, 0xbf,
+	0xeb, 0x58, 0xc4, 0xff, 0x93, 0xb9, 0x07, 0x05, 0xb6, 0x52, 0x26, 0x09, 0xe6, 0x25, 0xc9, 0x63,
+	0xa9, 0x66, 0xb3, 0x5f, 0x60, 0xbd, 0x4f, 0x60, 0x99, 0x28, 0xf8, 0xbc, 0x53, 0x46, 0xea, 0x8e,
+	0x24, 0xf2, 0x89, 0x5f, 0x23, 0xfd, 0x0d, 0xf6, 0xd3, 0x57, 0x2f, 0xe4, 0x8f, 0x49, 0xbc, 0xeb,
+	0x90, 0x8b, 0x9e, 0x43, 0x0e, 0x23, 0x9c, 0xcf, 0x60, 0x10, 0xd4, 0x88, 0x55, 0xe2, 0xaf, 0xd8,
+	0x1f, 0x12, 0x7c, 0x71, 0x58, 0xe0, 0xa0, 0x12, 0x38, 0x1e, 0x91, 0x73, 0x41, 0xe7, 0xaf, 0x54,
+	0x93, 0xe6, 0xec, 0x93, 0x65, 0x29, 0x9b, 0x03, 0x02, 0xab, 0x7d, 0x72, 0x67, 0xcc, 0xe3, 0xe5,
+	0xeb, 0xf9, 0x74, 0xdb, 0x7d, 0x74, 0x4c, 0x8e, 0xf2, 0x8a, 0xee, 0x7f, 0x90, 0x18, 0xee, 0x94,
+	0xcf, 0xf0, 0x05, 0x79, 0x8c, 0x70, 0xfd, 0x1e, 0xa3, 0xd0, 0x56, 0x6c, 0x0e, 0x3c, 0xd6, 0x3e,
+	0x58, 0x82, 0x38, 0xa5, 0x0a, 0xbe, 0x3a, 0x2a, 0x58, 0x92, 0x2e, 0x70, 0xce, 0x10, 0x2c, 0xed,
+	0x4c, 0x69, 0x2c, 0xd5, 0xbe, 0x4a, 0x93, 0xd7, 0x48, 0x6b, 0xa5, 0x3d, 0x4f, 0x44, 0xa4, 0x8e,
+	0x58, 0x24, 0xc8, 0xdd, 0x98, 0x1c, 0xf9, 0x98, 0x21, 0x36, 0x45, 0xf4, 0x19, 0x14, 0x4c, 0xef,
+	0xd7, 0xd7, 0x74, 0x17, 0x19, 0xbe, 0x30, 0x1f, 0xb7, 0x7d, 0xb7, 0xb1, 0xde, 0xff, 0x98, 0xf9,
+	0xc9, 0xf2, 0xc3, 0x16, 0x75, 0x42, 0x5d, 0x8e, 0x09, 0x96, 0x1f, 0x17, 0xb8, 0x66, 0x09, 0x94,
+	0xd9, 0x82, 0x55, 0xd9, 0x68, 0x53, 0x1a, 0x4b, 0x35, 0x69, 0x4e, 0x5a, 0xe3, 0x9c, 0x2e, 0xef,
+	0x91, 0xf6, 0x4a, 0xcf, 0x90, 0xae, 0xc7, 0x2a, 0x51, 0x30, 0x33, 0x41, 0x30, 0x7d, 0xb7, 0xc0,
+	0x34, 0x5a, 0xf0, 0xbe, 0x4b, 0x35, 0x2f, 0x0f, 0x0a, 0xa1, 0xf7, 0x6b, 0x3e, 0x5d, 0x25, 0xde,
+	0x75, 0xcc, 0xc5, 0x36, 0xa4, 0x95, 0xdc, 0x6a, 0x70, 0xcf, 0x12, 0x2c, 0x4e, 0x13, 0xb8, 0x64,
+	0x0a, 0x5c, 0x4f, 0x08, 0xdc, 0x72, 0xc0, 0x3d, 0x17, 0x3c, 0xf3, 0xc1, 0xab, 0x00, 0xbc, 0x4e,
+	0x75, 0x66, 0x81, 0x5c, 0xf3, 0xc8, 0x45, 0xbb, 0x46, 0x5a, 0x2b, 0xed, 0x59, 0x92, 0x26, 0x58,
+	0x98, 0x22, 0x77, 0x43, 0x7a, 0x4f, 0xa4, 0x2b, 0x91, 0x24, 0xa4, 0x4e, 0xd8, 0xed, 0x15, 0xe8,
+	0x2b, 0x9b, 0xf9, 0xd3, 0xab, 0xeb, 0xbb, 0x0a, 0xe8, 0x7d, 0x71, 0x92, 0x8f, 0x95, 0x2d, 0x7c,
+	0xb6, 0x41, 0x90, 0xa2, 0x86, 0x98, 0x0a, 0xe9, 0xa4, 0x02, 0x8f, 0x3c, 0x19, 0xb4, 0xae, 0x10,
+	0xfc, 0x8b, 0x61, 0x43, 0x09, 0x04, 0x94, 0x42, 0x60, 0xa9, 0x3c, 0x5e, 0x5f, 0x2c, 0xcf, 0x79,
+	0x17, 0xa0, 0x5d, 0x2b, 0x75, 0x46, 0xea, 0x88, 0xd4, 0x0d, 0xe9, 0x5a, 0x9e, 0x48, 0x2c, 0xd8,
+	0x27, 0x70, 0xdc, 0x29, 0xd0, 0x5f, 0x23, 0x75, 0xe1, 0x11, 0x2f, 0xf5, 0xf3, 0xef, 0x2a, 0x30,
+	0xcc, 0x3e, 0x1b, 0xfd, 0xd5, 0x2d, 0x18, 0xfb, 0x09, 0x26, 0xaf, 0x17, 0x84, 0x64, 0x08, 0xd2,
+	0x2e, 0x81, 0x6f, 0xa1, 0x0c, 0xda, 0x54, 0x06, 0xc1, 0x6a, 0x08, 0x29, 0x87, 0x6d, 0x9d, 0xb9,
+	0xb5, 0x5c, 0xae, 0x49, 0x73, 0xd2, 0x1a, 0x49, 0x64, 0x6d, 0xbe, 0xdc, 0x8d, 0x15, 0xc7, 0x05,
+	0xde, 0xb9, 0x82, 0xaf, 0xa5, 0x2f, 0x26, 0x5c, 0x30, 0x6e, 0xe5, 0x8f, 0xe8, 0x4e, 0x3b, 0xc5,
+	0x18, 0x8b, 0x4c, 0x86, 0xcc, 0xfb, 0x3b, 0xbd, 0xfa, 0xae, 0xeb, 0x2a, 0x30, 0x74, 0xde, 0x09,
+	0x26, 0x7a, 0x6a, 0x98, 0xba, 0x51, 0x60, 0x16, 0x24, 0x98, 0x11, 0x2c, 0x70, 0xdd, 0x23, 0x38,
+	0x55, 0x07, 0xe1, 0x15, 0x10, 0x5a, 0x01, 0xdb, 0xcf, 0x43, 0x44, 0x25, 0xec, 0xbc, 0x20, 0xa7,
+	0x34, 0x96, 0x6a, 0xd2, 0xdc, 0x16, 0x35, 0x6c, 0xfc, 0x16, 0xfc, 0x8a, 0x20, 0xa8, 0x18, 0x94,
+	0x87, 0x05, 0x73, 0xc2, 0x04, 0x13, 0x94, 0x77, 0x18, 0x63, 0x57, 0xcc, 0x0a, 0xbf, 0xd3, 0xe4,
+	0x97, 0xb7, 0xe2, 0xe0, 0x9a, 0xc7, 0x60, 0xcb, 0x1a, 0x5e, 0xec, 0xf3, 0x9b, 0x77, 0x60, 0x88,
+	0x4d, 0x26, 0x93, 0x7c, 0x34, 0x58, 0x84, 0x08, 0x66, 0x85, 0x0a, 0x2c, 0xc3, 0x04, 0xd6, 0xe1,
+	0x02, 0xc7, 0x68, 0x41, 0xce, 0x45, 0x48, 0xae, 0x85, 0x98, 0x2a, 0x88, 0xbb, 0x04, 0x09, 0x97,
+	0xe5, 0x8c, 0xab, 0x91, 0x6b, 0x92, 0x4c, 0xf8, 0x39, 0xd8, 0x5b, 0x09, 0x9e, 0xa9, 0x02, 0xeb,
+	0xed, 0x82, 0x89, 0xca, 0x3a, 0x8c, 0xbe, 0x2a, 0x62, 0x6b, 0x5c, 0x25, 0x25, 0x17, 0xef, 0x11,
+	0x9a, 0xfe, 0x13, 0x13, 0xdc, 0x1b, 0x79, 0x7d, 0x42, 0x1a, 0x43, 0xac, 0x2e, 0xd1, 0xb3, 0xb7,
+	0x57, 0x57, 0x01, 0x5d, 0xeb, 0x0c, 0x4c, 0xfd, 0x9b, 0xb5, 0x50, 0x9b, 0x1d, 0x02, 0xdb, 0x9d,
+	0x02, 0xbb, 0x48, 0xc1, 0xfc, 0x28, 0xc1, 0x17, 0xd1, 0x82, 0xd8, 0x42, 0x41, 0x61, 0x3d, 0x1c,
+	0xbc, 0x06, 0xc9, 0x37, 0xe4, 0x94, 0xc6, 0x87, 0xae, 0x42, 0xe4, 0x77, 0xe0, 0x93, 0x26, 0xb0,
+	0x8f, 0xfc, 0x19, 0x63, 0x8f, 0x5a, 0xe6, 0x7a, 0x95, 0x11, 0x9b, 0x7a, 0x85, 0xf2, 0x6b, 0x3f,
+	0x13, 0x90, 0xf2, 0x23, 0xc6, 0x7e, 0x8d, 0x4c, 0xf0, 0xbc, 0xc3, 0xc7, 0xca, 0x7a, 0x74, 0xc6,
+	0x1f, 0x41, 0x6f, 0x4e, 0x15, 0x2f, 0xf4, 0xf2, 0xfc, 0x8d, 0x80, 0x65, 0x3a, 0xd3, 0x03, 0x9b,
+	0xb5, 0x50, 0x09, 0xe8, 0x10, 0x2b, 0x58, 0x10, 0x27, 0x70, 0x8a, 0x17, 0x2c, 0xda, 0x23, 0x58,
+	0xbc, 0x57, 0x10, 0x98, 0x29, 0xb8, 0xa8, 0x81, 0x22, 0x0d, 0xe4, 0x37, 0xc2, 0x81, 0x0b, 0xb0,
+	0x46, 0xfa, 0xfe, 0x63, 0x3a, 0x30, 0xf2, 0xb8, 0x88, 0x72, 0x7b, 0x25, 0xd9, 0xea, 0xbb, 0x14,
+	0xd4, 0x3c, 0xc4, 0x27, 0xa5, 0x9d, 0xd9, 0x61, 0x4d, 0x18, 0x7b, 0xd4, 0x60, 0x1a, 0xd0, 0x80,
+	0xa1, 0x77, 0x3d, 0xfa, 0xab, 0x6f, 0xf3, 0xe6, 0x78, 0x15, 0x23, 0x6c, 0xab, 0xe8, 0xd1, 0xd3,
+	0xa3, 0xab, 0xc0, 0x3b, 0x9f, 0x1f, 0x65, 0x66, 0x50, 0x33, 0x0b, 0x76, 0x0b, 0x9c, 0x12, 0x64,
+	0xa0, 0xf3, 0x3e, 0xc1, 0xd7, 0x07, 0x04, 0xcb, 0x0e, 0x0a, 0x96, 0x27, 0x09, 0x56, 0x1c, 0x12,
+	0x5a, 0x60, 0xeb, 0x7d, 0x08, 0xcc, 0x82, 0x2f, 0xa3, 0xdb, 0xb0, 0xd8, 0x78, 0x19, 0xdf, 0xf8,
+	0x6a, 0x2a, 0xae, 0xde, 0x23, 0xbf, 0xf6, 0x21, 0x6b, 0xd3, 0xda, 0x70, 0xda, 0xa3, 0xc1, 0x2c,
+	0xa0, 0x06, 0x3d, 0xf3, 0x54, 0x7a, 0x0f, 0x08, 0xc4, 0x6c, 0xd3, 0x1d, 0xa6, 0xac, 0xab, 0x67,
+	0xe2, 0x9a, 0x5b, 0x0c, 0xf8, 0x20, 0x8e, 0xd1, 0x8b, 0xae, 0xa1, 0xe8, 0xe1, 0xde, 0x55, 0x60,
+	0xb0, 0x45, 0x0a, 0x56, 0x21, 0x4d, 0x2c, 0x49, 0x14, 0x2c, 0xdd, 0x2f, 0x58, 0x96, 0x24, 0x70,
+	0x4d, 0x16, 0x28, 0x55, 0x82, 0x55, 0x47, 0x60, 0x75, 0x2a, 0xb8, 0x1f, 0x95, 0xf3, 0x64, 0x0d,
+	0x78, 0x66, 0x80, 0x65, 0xc0, 0x59, 0xaa, 0x1a, 0x1e, 0x72, 0xfc, 0xf2, 0x03, 0xfc, 0x72, 0xdb,
+	0x70, 0x4b, 0x6f, 0x61, 0x85, 0x4a, 0xc3, 0x28, 0xe7, 0x42, 0x74, 0x8c, 0x12, 0x19, 0xf0, 0x61,
+	0x04, 0xe3, 0xe6, 0xe7, 0x61, 0xe6, 0x7f, 0x8d, 0x0f, 0x66, 0x9f, 0x44, 0xd7, 0xe0, 0x20, 0xa3,
+	0x66, 0x17, 0x60, 0xec, 0xdd, 0x8e, 0x42, 0xb1, 0xba, 0xab, 0xc0, 0xdb, 0x33, 0x54, 0xcc, 0x0d,
+	0x6d, 0xd2, 0x9e, 0x74, 0xe5, 0x61, 0x81, 0x5b, 0x8a, 0x0c, 0xf3, 0x4c, 0x87, 0xb5, 0xc7, 0xc0,
+	0x3b, 0x13, 0x7c, 0x8e, 0x83, 0xcf, 0x09, 0x28, 0xb8, 0x02, 0xfe, 0x39, 0x60, 0x1b, 0xa0, 0xa6,
+	0xe0, 0xea, 0x03, 0x36, 0x9f, 0x6e, 0xc3, 0x3f, 0xb7, 0x85, 0xb5, 0x27, 0x34, 0xb8, 0x1d, 0x6d,
+	0x46, 0x7f, 0x49, 0x01, 0xe6, 0xbe, 0xe7, 0xb0, 0x0e, 0xae, 0x65, 0xac, 0x6d, 0x36, 0x23, 0x4c,
+	0x54, 0x0c, 0x9d, 0x94, 0x8c, 0x83, 0x6b, 0x16, 0xf3, 0x9d, 0x33, 0x18, 0xbb, 0xb8, 0xa6, 0xbb,
+	0xc0, 0xa0, 0x69, 0xc9, 0xd8, 0x6f, 0xbf, 0xab, 0x05, 0x7b, 0xa4, 0xc9, 0x50, 0x09, 0xb8, 0x2e,
+	0x4b, 0x86, 0x6d, 0xc8, 0x85, 0x80, 0x3c, 0x08, 0xcc, 0x83, 0xc2, 0x6b, 0xb0, 0xe9, 0x14, 0xd8,
+	0xf8, 0x96, 0x72, 0xe6, 0x46, 0x07, 0xbb, 0x4a, 0x5a, 0x09, 0x3d, 0xa5, 0x61, 0x43, 0x4e, 0x33,
+	0x9e, 0xc7, 0x9a, 0xf8, 0x32, 0xbc, 0x9a, 0x4f, 0xbf, 0xcc, 0xe2, 0x43, 0xf3, 0x54, 0xc6, 0x58,
+	0xa5, 0xe3, 0xfb, 0x8d, 0x9a, 0xb3, 0x97, 0xef, 0x13, 0x7c, 0xe4, 0x27, 0x3e, 0x32, 0xcf, 0x64,
+	0xbc, 0xf3, 0xa5, 0xee, 0x02, 0xd2, 0xff, 0x39, 0x87, 0x88, 0x26, 0xd6, 0x66, 0xc8, 0xa7, 0xf4,
+	0xcb, 0x96, 0xa1, 0x1b, 0x0b, 0x20, 0xe8, 0x34, 0x04, 0x17, 0xc2, 0x96, 0x22, 0x08, 0x29, 0x86,
+	0xd2, 0x9b, 0xb0, 0xad, 0x14, 0xac, 0x3d, 0x0b, 0xa9, 0xbc, 0xd5, 0xc1, 0x81, 0x33, 0x1a, 0xa2,
+	0x8a, 0x9a, 0x59, 0xb4, 0xed, 0x2c, 0x53, 0x97, 0x9f, 0x62, 0x94, 0x65, 0x1a, 0x46, 0x8b, 0x72,
+	0x88, 0x56, 0x5d, 0xe6, 0x87, 0x9b, 0xbf, 0xb0, 0x2e, 0xa9, 0x9d, 0xc9, 0xeb, 0x1a, 0x19, 0xed,
+	0x7a, 0x87, 0x37, 0x0c, 0x52, 0xf9, 0x74, 0x69, 0x75, 0x77, 0x81, 0x81, 0x26, 0x07, 0x71, 0xda,
+	0x75, 0x57, 0x7b, 0xe2, 0x27, 0x60, 0x09, 0x2a, 0x01, 0x43, 0xbf, 0x85, 0xb0, 0x32, 0x08, 0x57,
+	0xc3, 0x76, 0x35, 0xa8, 0xeb, 0x61, 0x47, 0x39, 0x58, 0xad, 0xca, 0xe3, 0xdc, 0x95, 0x76, 0xdc,
+	0xc3, 0xcb, 0x31, 0x75, 0xc9, 0x67, 0xdc, 0xc2, 0x5c, 0x6c, 0x7d, 0x4a, 0x38, 0x51, 0xd6, 0x48,
+	0x49, 0xed, 0x23, 0xfc, 0x53, 0xda, 0x99, 0xb6, 0xf9, 0x2e, 0x93, 0xd7, 0x37, 0x32, 0xd1, 0xeb,
+	0x0e, 0x63, 0x57, 0xdd, 0x46, 0x67, 0xbc, 0x8a, 0xbf, 0xba, 0x54, 0x75, 0x17, 0x78, 0x73, 0xd2,
+	0x7e, 0x9c, 0xa2, 0x1a, 0xb4, 0x2d, 0xde, 0x7c, 0x5a, 0x06, 0x7f, 0x53, 0x26, 0x03, 0x77, 0x54,
+	0xc0, 0xce, 0x73, 0xb0, 0xeb, 0x3c, 0x44, 0x7d, 0x0f, 0x15, 0x8d, 0x10, 0x73, 0x01, 0x66, 0x79,
+	0x96, 0x30, 0x4d, 0x79, 0x1a, 0x43, 0x65, 0x29, 0x2b, 0xc2, 0xcf, 0xf3, 0xc3, 0x8d, 0x7b, 0xe4,
+	0x54, 0x3f, 0xc4, 0x2b, 0xb5, 0x0d, 0xbb, 0xa8, 0x66, 0x4c, 0x7d, 0xaa, 0xd1, 0x9d, 0x94, 0xc4,
+	0xd4, 0xc0, 0x06, 0x8c, 0x7d, 0xeb, 0x31, 0x70, 0xbf, 0xc5, 0x40, 0x03, 0x15, 0xc6, 0xcb, 0x7f,
+	0x47, 0x40, 0xc7, 0x30, 0x81, 0x51, 0xf6, 0x39, 0xb8, 0x1d, 0xb9, 0xa7, 0x6d, 0xaf, 0x74, 0xda,
+	0x88, 0x0a, 0x19, 0x2a, 0xc1, 0x76, 0x5f, 0x84, 0xf8, 0x2a, 0x48, 0xb8, 0x04, 0xdf, 0x37, 0xc3,
+	0xde, 0x1a, 0xb0, 0x0b, 0xbf, 0x44, 0x88, 0xaa, 0x8e, 0xda, 0xbb, 0x8f, 0x48, 0xaf, 0xea, 0xc0,
+	0x3f, 0xab, 0x1d, 0x97, 0x64, 0x0d, 0x33, 0xb7, 0x5e, 0x61, 0xa4, 0x5d, 0x16, 0xfd, 0x46, 0xfe,
+	0x8d, 0xbe, 0x03, 0x83, 0x99, 0x11, 0x74, 0x07, 0x13, 0xbf, 0xdb, 0x0c, 0x37, 0xcf, 0x41, 0x57,
+	0x3f, 0x91, 0x29, 0xab, 0x6b, 0xbb, 0x0b, 0x48, 0xd1, 0xff, 0x93, 0x6f, 0x18, 0x36, 0x5d, 0xc5,
+	0xd2, 0xf8, 0x7a, 0x22, 0xcf, 0x41, 0x4c, 0x25, 0xc4, 0x55, 0xc1, 0x9e, 0x1a, 0xd8, 0x57, 0x0b,
+	0x07, 0xea, 0xe0, 0xe0, 0x55, 0xf8, 0xa1, 0x0d, 0x0e, 0x5d, 0x07, 0xdb, 0x8d, 0x15, 0x9c, 0xb9,
+	0xf5, 0x88, 0xcd, 0x85, 0xed, 0xf8, 0xe4, 0xb4, 0xe2, 0x91, 0xd9, 0x82, 0x32, 0xa5, 0x19, 0x5d,
+	0xab, 0x0c, 0x86, 0x4d, 0x4d, 0xc2, 0xd0, 0xb9, 0x88, 0xd9, 0xc1, 0xd7, 0x19, 0x31, 0x35, 0x85,
+	0x71, 0x56, 0x99, 0x4c, 0x71, 0x29, 0xe7, 0xad, 0x31, 0x09, 0x28, 0x14, 0x4a, 0x14, 0x8a, 0xb9,
+	0xdd, 0x05, 0x9e, 0xc4, 0x9b, 0x06, 0xb1, 0x58, 0x07, 0x9c, 0x67, 0xf7, 0x45, 0xa1, 0x05, 0x27,
+	0x5d, 0x85, 0xc3, 0x37, 0x20, 0xe5, 0x26, 0x1c, 0xbd, 0x05, 0x35, 0x3f, 0x41, 0xc6, 0x6d, 0x98,
+	0xeb, 0x5f, 0x46, 0xf1, 0xf5, 0x07, 0x84, 0x15, 0xb5, 0x12, 0x94, 0xdf, 0x82, 0x6f, 0x76, 0x33,
+	0x1e, 0xe9, 0x4d, 0x38, 0x46, 0xd6, 0x31, 0x3f, 0xfc, 0x0a, 0xa3, 0x3f, 0x4f, 0x61, 0xea, 0xd2,
+	0xd3, 0x98, 0x38, 0x17, 0xd3, 0x7f, 0x68, 0x18, 0x0a, 0x85, 0x2b, 0x0a, 0x85, 0xed, 0xbf, 0x07,
+	0x3f, 0x1d, 0xfd, 0xde, 0x0f, 0x63, 0x82, 0x43, 0x26, 0xd1, 0xe7, 0x3a, 0x48, 0xbd, 0x09, 0xc7,
+	0xeb, 0x21, 0xb7, 0x01, 0x0a, 0x1a, 0xe1, 0xc6, 0x3d, 0x28, 0xbc, 0x0b, 0x73, 0xbc, 0x8b, 0x39,
+	0x7b, 0xb3, 0x83, 0xf8, 0xb2, 0x16, 0x76, 0x14, 0x6a, 0x08, 0xca, 0x6d, 0xc2, 0x21, 0xac, 0x12,
+	0x43, 0x87, 0x4c, 0x6c, 0x7c, 0xd5, 0x58, 0xac, 0x2c, 0xe2, 0xcf, 0xaf, 0x6d, 0xe8, 0x04, 0x9b,
+	0xff, 0x31, 0xf0, 0xd3, 0xd1, 0x57, 0x6f, 0x13, 0x7a, 0x93, 0x12, 0x08, 0xcd, 0xaa, 0xa7, 0xa8,
+	0x09, 0xd4, 0x1a, 0x38, 0xdb, 0x0a, 0x0d, 0x0f, 0xe0, 0x7c, 0x1b, 0x58, 0xbb, 0x17, 0x50, 0x75,
+	0xfb, 0x3e, 0xaa, 0xef, 0x34, 0x2c, 0xdd, 0xa2, 0x66, 0xa6, 0x32, 0x8f, 0xc5, 0x61, 0x95, 0x98,
+	0x3a, 0x1e, 0xe3, 0xa5, 0x3e, 0xde, 0x28, 0x14, 0xce, 0xff, 0x3d, 0xf4, 0xf7, 0x62, 0xc0, 0xc8,
+	0x70, 0xd6, 0x46, 0x9c, 0xe5, 0x42, 0xab, 0xa0, 0xee, 0x1f, 0xd0, 0xf6, 0x33, 0x5c, 0xbd, 0x07,
+	0x26, 0x8b, 0x32, 0xf1, 0x09, 0x53, 0xb3, 0x6c, 0xcb, 0x19, 0x02, 0x92, 0x6a, 0xd1, 0x37, 0x4f,
+	0xec, 0x7c, 0xb9, 0x1c, 0x9f, 0x0d, 0xf8, 0xe9, 0xe8, 0x33, 0x70, 0x23, 0x96, 0x4e, 0xa9, 0xd4,
+	0x34, 0x3c, 0xa0, 0xe3, 0x57, 0x68, 0x7e, 0x08, 0x27, 0xcf, 0x6b, 0xd8, 0x9a, 0x50, 0xc9, 0xb8,
+	0x29, 0xb1, 0xf4, 0xe8, 0xe9, 0x86, 0xa2, 0xc7, 0xc2, 0x67, 0x0f, 0x7e, 0x3a, 0x7a, 0xf7, 0xf7,
+	0xe1, 0x23, 0x83, 0x9d, 0xe4, 0xe4, 0xd7, 0x11, 0x16, 0x79, 0x86, 0x91, 0xa3, 0xc3, 0x78, 0xe1,
+	0x25, 0x0f, 0x7a, 0xf4, 0xb4, 0x7b, 0xbe, 0xe0, 0xa7, 0xa3, 0x57, 0xdf, 0x95, 0xf4, 0x7a, 0xc5,
+	0x97, 0x17, 0x5f, 0x76, 0xe7, 0x85, 0x5e, 0xb3, 0x9e, 0x09, 0xf8, 0x5f, 0x74, 0xbe, 0xd4, 0x44,
+	0x8c, 0x07, 0xea, 0x09, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+static const unsigned char icon_toolbar_shared_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x61, 0x64, 0x69, 0x61,
+	0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f,
+	0x70, 0x22, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d,
+	0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x35, 0x22, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x32, 0x66, 0x32, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x61, 0x39, 0x64, 0x36, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f,
+	0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x35, 0x61, 0x61, 0x37, 0x66, 0x65, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x34, 0x30, 0x39, 0x32, 0x66, 0x61, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x2f, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65,
+	0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47,
+	0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74,
+	0x22, 0x20, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d,
+	0x22, 0x75, 0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22,
+	0x20, 0x78, 0x31, 0x3d, 0x22, 0x37, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x39, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x39, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x33, 0x31, 0x22, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x38, 0x36, 0x63, 0x34, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x35, 0x34, 0x61, 0x34, 0x66, 0x65, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x33, 0x63, 0x38, 0x39, 0x66, 0x32, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e,
+	0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20,
+	0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x3d, 0x22, 0x75,
+	0x73, 0x65, 0x72, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x6e, 0x55, 0x73, 0x65, 0x22, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x32, 0x31, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x30, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x32, 0x31, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x33, 0x31, 0x22, 0x3e, 0x0a,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x3d, 0x22, 0x23, 0x34, 0x30, 0x39, 0x30, 0x66, 0x34, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x32, 0x65, 0x36, 0x65, 0x64, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x65, 0x72,
+	0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x66, 0x30, 0x66, 0x61, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x2e, 0x33, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x63, 0x30, 0x65, 0x34, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x38, 0x36, 0x63, 0x32, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x36, 0x33, 0x61, 0x61, 0x66, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x37, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x34, 0x20,
+	0x4c, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x39, 0x20, 0x4c, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x32, 0x33,
+	0x2e, 0x38, 0x20, 0x4c, 0x31, 0x33, 0x20, 0x33, 0x30, 0x2e, 0x36, 0x20, 0x4c, 0x32, 0x20, 0x32,
+	0x33, 0x2e, 0x38, 0x20, 0x4c, 0x32, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69,
+	0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x3d, 0x22, 0x23, 0x31, 0x63, 0x34, 0x37, 0x61, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b,
+	0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30,
+	0x2e, 0x33, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x31, 0x37, 0x2e, 0x35, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x4c, 0x32, 0x39, 0x2e, 0x35,
+	0x20, 0x39, 0x20, 0x4c, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x32, 0x33, 0x2e, 0x38, 0x20, 0x4c, 0x31,
+	0x33, 0x20, 0x33, 0x30, 0x2e, 0x36, 0x20, 0x4c, 0x32, 0x20, 0x32, 0x33, 0x2e, 0x38, 0x20, 0x4c,
+	0x32, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23,
+	0x31, 0x63, 0x34, 0x37, 0x61, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x31, 0x63, 0x34, 0x37, 0x61, 0x62, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75,
+	0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d,
+	0x22, 0x4d, 0x32, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x4c, 0x31, 0x33, 0x20, 0x31, 0x34, 0x2e, 0x35,
+	0x20, 0x4c, 0x31, 0x33, 0x20, 0x33, 0x30, 0x2e, 0x36, 0x20, 0x4c, 0x32, 0x20, 0x32, 0x33, 0x2e,
+	0x38, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x6c, 0x65, 0x66, 0x74, 0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68,
+	0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x33, 0x20, 0x31, 0x34, 0x2e, 0x35, 0x20, 0x4c, 0x32, 0x39,
+	0x2e, 0x35, 0x20, 0x39, 0x20, 0x4c, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x32, 0x33, 0x2e, 0x38, 0x20,
+	0x4c, 0x31, 0x33, 0x20, 0x33, 0x30, 0x2e, 0x36, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c,
+	0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x72, 0x69, 0x67, 0x68, 0x74, 0x29, 0x22, 0x2f, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x37, 0x2e,
+	0x35, 0x20, 0x31, 0x2e, 0x34, 0x20, 0x4c, 0x32, 0x39, 0x2e, 0x35, 0x20, 0x39, 0x20, 0x4c, 0x31,
+	0x33, 0x20, 0x31, 0x34, 0x2e, 0x35, 0x20, 0x4c, 0x32, 0x20, 0x38, 0x2e, 0x32, 0x20, 0x5a, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x74, 0x6f, 0x70, 0x29,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x65, 0x20, 0x63,
+	0x78, 0x3d, 0x22, 0x36, 0x2e, 0x35, 0x22, 0x20, 0x63, 0x79, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x35,
+	0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x34, 0x2e, 0x38, 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x36,
+	0x2e, 0x32, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x62, 0x63, 0x64, 0x39, 0x66,
+	0x66, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x32, 0x32,
+	0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x72, 0x6f, 0x74,
+	0x61, 0x74, 0x65, 0x28, 0x2d, 0x33, 0x38, 0x20, 0x36, 0x2e, 0x35, 0x20, 0x32, 0x31, 0x2e, 0x35,
+	0x29, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22,
+	0x4d, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32, 0x30, 0x2e, 0x34, 0x20, 0x4c, 0x32, 0x38, 0x2e, 0x34,
+	0x20, 0x31, 0x35, 0x2e, 0x37, 0x20, 0x4c, 0x32, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x36, 0x2e, 0x38,
+	0x20, 0x4c, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32, 0x31, 0x2e, 0x35, 0x20, 0x5a, 0x22, 0x20, 0x66,
+	0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x32, 0x34, 0x35, 0x36, 0x62, 0x64, 0x22, 0x20, 0x6f, 0x70,
+	0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20,
+	0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32,
+	0x36, 0x2e, 0x32, 0x20, 0x4c, 0x32, 0x38, 0x2e, 0x34, 0x20, 0x32, 0x31, 0x2e, 0x35, 0x20, 0x4c,
+	0x32, 0x38, 0x2e, 0x34, 0x20, 0x32, 0x32, 0x2e, 0x36, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x34, 0x20,
+	0x32, 0x37, 0x2e, 0x33, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x32,
+	0x34, 0x35, 0x36, 0x62, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22,
+	0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64,
+	0x3d, 0x22, 0x4d, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x31, 0x35, 0x2e, 0x38, 0x20, 0x4c, 0x32, 0x38,
+	0x2e, 0x34, 0x20, 0x31, 0x31, 0x2e, 0x31, 0x20, 0x4c, 0x32, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x35,
+	0x2e, 0x37, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32, 0x30, 0x2e, 0x34, 0x20, 0x5a, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x64, 0x72, 0x61, 0x77,
+	0x65, 0x72, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x32, 0x61,
+	0x35, 0x66, 0x63, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32, 0x31, 0x2e, 0x36,
+	0x20, 0x4c, 0x32, 0x38, 0x2e, 0x34, 0x20, 0x31, 0x36, 0x2e, 0x39, 0x20, 0x4c, 0x32, 0x38, 0x2e,
+	0x34, 0x20, 0x32, 0x31, 0x2e, 0x35, 0x20, 0x4c, 0x31, 0x34, 0x2e, 0x34, 0x20, 0x32, 0x36, 0x2e,
+	0x32, 0x20, 0x5a, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23,
+	0x64, 0x72, 0x61, 0x77, 0x65, 0x72, 0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d,
+	0x22, 0x23, 0x32, 0x61, 0x35, 0x66, 0x63, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65,
+	0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x35, 0x22, 0x20, 0x79,
+	0x31, 0x3d, 0x22, 0x31, 0x36, 0x2e, 0x31, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x37, 0x2e,
+	0x38, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x38, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22,
+	0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x35, 0x22, 0x2f,
+	0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x35,
+	0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x39, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22,
+	0x32, 0x37, 0x2e, 0x38, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x37, 0x2e, 0x36, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30,
+	0x2e, 0x39, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x38,
+	0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d,
+	0x22, 0x32, 0x30, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x36, 0x2e, 0x31, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x35, 0x2e,
+	0x32, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x36, 0x33, 0x36,
+	0x38, 0x63, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68,
+	0x3d, 0x22, 0x31, 0x2e, 0x37, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69,
+	0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a,
+	0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x32, 0x30, 0x2e, 0x32,
+	0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x39, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22,
+	0x32, 0x33, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f,
+	0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x36, 0x33, 0x36, 0x38, 0x63, 0x22, 0x20, 0x73, 0x74, 0x72,
+	0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x37, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22,
+	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x6f, 0x6c, 0x79,
+	0x6c, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x32, 0x2c, 0x38,
+	0x2e, 0x32, 0x20, 0x31, 0x33, 0x2c, 0x31, 0x34, 0x2e, 0x35, 0x20, 0x32, 0x39, 0x2e, 0x35, 0x2c,
+	0x39, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x64, 0x37, 0x65, 0x64, 0x66, 0x66, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e,
+	0x33, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f,
+	0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69,
+	0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c,
+	0x69, 0x6e, 0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x31, 0x33, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22,
+	0x31, 0x34, 0x2e, 0x35, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x33, 0x22, 0x20, 0x79, 0x32,
+	0x3d, 0x22, 0x33, 0x30, 0x2e, 0x36, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22,
+	0x23, 0x39, 0x63, 0x63, 0x64, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63,
+	0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x63,
+	0x69, 0x72, 0x63, 0x6c, 0x65, 0x20, 0x63, 0x78, 0x3d, 0x22, 0x31, 0x33, 0x22, 0x20, 0x63, 0x79,
+	0x3d, 0x22, 0x31, 0x34, 0x2e, 0x37, 0x22, 0x20, 0x72, 0x3d, 0x22, 0x31, 0x2e, 0x31, 0x22, 0x20,
+	0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x23, 0x65, 0x63, 0x66, 0x38, 0x66, 0x66, 0x22, 0x20, 0x6f,
+	0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x3c,
+	0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_stats_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x03, 0x42, 0x49, 0x44, 0x41, 0x54, 0x58, 0x85, 0xed, 0x96, 0xcd,
+	0x6b, 0x5c, 0x65, 0x14, 0xc6, 0x7f, 0xf7, 0xce, 0x74, 0x26, 0x99, 0xa4, 0x3a, 0x0d, 0x8d, 0xc1,
+	0x62, 0x91, 0x58, 0xa8, 0x18, 0x4b, 0x49, 0x11, 0x22, 0x2e, 0x0a, 0x42, 0x05, 0x3f, 0x40, 0x17,
+	0x85, 0x40, 0x09, 0x5d, 0xd8, 0xe2, 0xa2, 0xcb, 0xae, 0xfc, 0x17, 0xdc, 0x14, 0xaa, 0xae, 0x5c,
+	0xb9, 0xeb, 0xc6, 0x85, 0x2e, 0xc4, 0x52, 0x04, 0x91, 0xd2, 0x95, 0x82, 0xb1, 0x8e, 0x16, 0x15,
+	0x4d, 0x09, 0x96, 0x1a, 0x9b, 0x64, 0x9a, 0xaf, 0x99, 0xc9, 0x7d, 0xef, 0x7b, 0xde, 0x73, 0x5c,
+	0xdc, 0x9b, 0xcc, 0x8c, 0xd6, 0x08, 0xcd, 0xa4, 0xd9, 0xe4, 0xec, 0xce, 0xcb, 0xbd, 0xe7, 0xfc,
+	0xde, 0xe7, 0x79, 0x2e, 0x5c, 0xd8, 0xab, 0xee, 0x8a, 0xa6, 0xa6, 0xce, 0xbd, 0x3a, 0x39, 0x39,
+	0xd9, 0xff, 0xa8, 0x16, 0xc6, 0x9d, 0xcd, 0x99, 0x33, 0xe7, 0x26, 0x20, 0xba, 0x56, 0x2a, 0xed,
+	0x3f, 0xbf, 0x2b, 0x00, 0xc5, 0x62, 0xa1, 0x1f, 0xc0, 0x2c, 0xda, 0x1d, 0x05, 0x76, 0xa3, 0x8a,
+	0xbd, 0x1e, 0x38, 0x7e, 0xb1, 0x3a, 0x1e, 0xd4, 0x26, 0x36, 0xfa, 0x42, 0x1c, 0x7d, 0x7b, 0xf3,
+	0xfd, 0xe5, 0x9b, 0x8f, 0x04, 0xe0, 0xf8, 0x85, 0xc1, 0x27, 0x86, 0x0f, 0x1c, 0xfc, 0xf2, 0xb5,
+	0x93, 0xa7, 0x86, 0x37, 0xce, 0xae, 0xdd, 0xf8, 0x6a, 0xe1, 0xf8, 0x05, 0x39, 0x56, 0xfb, 0xa8,
+	0x31, 0xbf, 0xe3, 0x00, 0x56, 0x2a, 0x1c, 0x1e, 0x3f, 0x7a, 0x22, 0x7e, 0x63, 0xe2, 0x34, 0x75,
+	0x3f, 0x03, 0xc0, 0xad, 0xdb, 0x3f, 0xf3, 0x57, 0x7d, 0xe1, 0x30, 0xb0, 0xf3, 0x00, 0x00, 0x62,
+	0x81, 0x34, 0x24, 0xb4, 0x7c, 0x13, 0x80, 0x60, 0x61, 0xcb, 0xe7, 0x7b, 0x0e, 0xa0, 0x16, 0x48,
+	0x83, 0x63, 0x7d, 0x03, 0x40, 0x7d, 0xef, 0x01, 0x3e, 0x99, 0xa4, 0xd0, 0x98, 0xe3, 0x75, 0xe0,
+	0x50, 0x7e, 0xe4, 0x83, 0xe7, 0xea, 0x87, 0x40, 0xd0, 0x80, 0x93, 0xb6, 0x02, 0x12, 0x76, 0x40,
+	0x81, 0xe4, 0x7e, 0xdf, 0xdb, 0xa3, 0x2f, 0x1e, 0xfd, 0xe0, 0xc9, 0xe7, 0x46, 0x07, 0x00, 0x54,
+	0x42, 0xa8, 0x7d, 0x71, 0xe3, 0x16, 0x70, 0x3e, 0x98, 0xef, 0x56, 0xc0, 0xa4, 0xf7, 0x00, 0xc5,
+	0x72, 0x61, 0xec, 0xf9, 0x37, 0x27, 0x07, 0x86, 0x9f, 0xaa, 0x80, 0x9b, 0x07, 0x28, 0xd4, 0xae,
+	0x5e, 0x3f, 0x08, 0x31, 0xaa, 0x8a, 0x0b, 0x8e, 0x96, 0x6f, 0x65, 0x00, 0xba, 0x13, 0x19, 0x50,
+	0x05, 0x71, 0xe0, 0x80, 0x64, 0x2d, 0x3b, 0x33, 0x03, 0x40, 0x54, 0x48, 0xa5, 0xad, 0x80, 0xec,
+	0x44, 0x06, 0x20, 0x07, 0x48, 0x05, 0x5c, 0x37, 0x40, 0x20, 0x0b, 0x61, 0x4f, 0xbe, 0x82, 0xea,
+	0xf8, 0xe5, 0x6a, 0xa9, 0xa4, 0x6f, 0x45, 0x91, 0xf5, 0x01, 0x18, 0x51, 0x7d, 0xb8, 0xb1, 0xf6,
+	0x39, 0xf6, 0x1e, 0x48, 0x0a, 0xa9, 0x76, 0x28, 0xa0, 0x19, 0x9a, 0x0a, 0x4e, 0x92, 0x8e, 0xaf,
+	0x60, 0x1b, 0x19, 0x18, 0x19, 0xa9, 0x7c, 0xfa, 0xca, 0xa9, 0x13, 0x27, 0xfb, 0xfa, 0x4b, 0x45,
+	0x80, 0x3b, 0x77, 0x16, 0x92, 0xef, 0xa6, 0x7f, 0xbb, 0xd4, 0x56, 0x20, 0x6d, 0x2b, 0x40, 0xa6,
+	0x80, 0x9a, 0x21, 0x21, 0x90, 0x7a, 0xbf, 0xd9, 0x3f, 0x34, 0x80, 0x97, 0xf0, 0xcc, 0xd4, 0xe9,
+	0x17, 0x8a, 0xb5, 0xbb, 0xd9, 0x90, 0xca, 0xd0, 0x7c, 0xdf, 0xf7, 0x3f, 0xcc, 0x8c, 0x01, 0xb3,
+	0x48, 0x0a, 0xae, 0xd9, 0x56, 0x40, 0x73, 0x80, 0xa0, 0x88, 0x04, 0xd2, 0x54, 0xf2, 0x7e, 0x1b,
+	0x16, 0xa8, 0x1a, 0xab, 0x09, 0xcc, 0xad, 0x64, 0xc3, 0x17, 0x1b, 0x46, 0x50, 0x00, 0xc3, 0x42,
+	0x8a, 0xf9, 0x04, 0xd2, 0x2c, 0xed, 0xe4, 0x5e, 0xab, 0x82, 0x88, 0xe2, 0xd2, 0xac, 0xcf, 0x9e,
+	0x7f, 0x58, 0x00, 0x83, 0xd5, 0x75, 0x63, 0x6e, 0x25, 0x9b, 0xb2, 0xdc, 0x50, 0x42, 0x00, 0x0a,
+	0xd9, 0x64, 0x15, 0x01, 0xdf, 0xed, 0xb1, 0xaa, 0x22, 0xa2, 0x6d, 0x05, 0x74, 0x6b, 0x82, 0x2d,
+	0x01, 0x82, 0xc1, 0x6a, 0xd2, 0x06, 0x68, 0x36, 0x8c, 0x60, 0x99, 0xdb, 0xaa, 0x8a, 0x85, 0x80,
+	0x49, 0xb6, 0x68, 0xc3, 0x6a, 0x35, 0xeb, 0xb6, 0x40, 0xb7, 0x91, 0x01, 0x14, 0x44, 0x04, 0x97,
+	0xa4, 0x00, 0xa4, 0xa9, 0xcf, 0x34, 0x46, 0x31, 0x55, 0x82, 0x0f, 0xd8, 0xa6, 0x02, 0x79, 0x06,
+	0x94, 0x3c, 0x84, 0x3d, 0x00, 0x30, 0x0c, 0xf1, 0x82, 0x4b, 0x12, 0x00, 0x7c, 0xea, 0xb2, 0x9b,
+	0x2a, 0x98, 0x2a, 0x16, 0x04, 0x15, 0xdf, 0xb9, 0x3f, 0xb7, 0x20, 0xf4, 0xc6, 0x02, 0x33, 0x43,
+	0x44, 0x48, 0x13, 0x97, 0x01, 0x38, 0x8f, 0xe6, 0x9b, 0x2c, 0xcf, 0x80, 0xfe, 0x43, 0x01, 0x0b,
+	0xd6, 0x95, 0x81, 0x10, 0xb6, 0x63, 0x41, 0x1c, 0x2f, 0x5d, 0xff, 0xe6, 0x8f, 0xa7, 0x1b, 0x8b,
+	0x99, 0x05, 0x7e, 0x6d, 0xd9, 0x4c, 0x6d, 0x2e, 0x04, 0xfe, 0xbc, 0xf7, 0xeb, 0x8f, 0xa2, 0x8f,
+	0xbb, 0xa2, 0x26, 0x49, 0xe6, 0x8a, 0x91, 0x14, 0xe2, 0xa8, 0xbe, 0xb8, 0xbc, 0x18, 0xd5, 0x66,
+	0xa7, 0x69, 0xad, 0x65, 0xef, 0x88, 0x0b, 0x71, 0x21, 0x8e, 0xea, 0xff, 0xb5, 0x22, 0xea, 0x6c,
+	0xce, 0x9e, 0x7d, 0xe7, 0x65, 0x55, 0xfd, 0x1a, 0xa8, 0x03, 0x2b, 0x0d, 0xd7, 0x57, 0x9a, 0x5d,
+	0x3b, 0x54, 0x0d, 0x16, 0x47, 0x00, 0xe5, 0xd8, 0x87, 0xd1, 0xea, 0xdd, 0xa5, 0xc1, 0xa8, 0x69,
+	0xcf, 0x36, 0xa7, 0x0f, 0x54, 0xb4, 0x51, 0x04, 0xb0, 0xa8, 0x68, 0xbf, 0x97, 0xc7, 0x56, 0x96,
+	0xca, 0x23, 0xee, 0x7e, 0x65, 0xe6, 0xb1, 0x66, 0xf9, 0xde, 0xe6, 0x5f, 0xf5, 0x80, 0x1b, 0x59,
+	0x1f, 0x6a, 0x1d, 0x59, 0xcd, 0x5b, 0x8d, 0x22, 0x3e, 0xbb, 0x72, 0xe5, 0xe3, 0x77, 0x1f, 0xa8,
+	0x80, 0x73, 0xf2, 0xcb, 0xbe, 0x7d, 0xf1, 0x34, 0x50, 0x05, 0x18, 0x2c, 0x27, 0xe9, 0xb1, 0xf2,
+	0xed, 0x7f, 0xfd, 0x4a, 0x79, 0xca, 0xfc, 0xb4, 0xff, 0xa5, 0x07, 0xde, 0x6a, 0xa8, 0x75, 0x64,
+	0xb5, 0x63, 0xe1, 0x5e, 0xed, 0xd5, 0xff, 0xd6, 0xdf, 0x09, 0x63, 0x2a, 0x4b, 0xa4, 0x1f, 0x20,
+	0xc3, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_stats_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x22,
+	0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x62, 0x63, 0x64, 0x37, 0x66, 0x66, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70,
+	0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74,
+	0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x34, 0x61, 0x39, 0x33, 0x66,
+	0x37, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d,
+	0x22, 0x23, 0x32, 0x65, 0x36, 0x65, 0x64, 0x36, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74,
+	0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x22, 0x20, 0x78, 0x31, 0x3d,
+	0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30,
+	0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66,
+	0x65, 0x30, 0x38, 0x61, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66,
+	0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63,
+	0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x61, 0x62, 0x32, 0x65, 0x22, 0x2f, 0x3e,
+	0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22,
+	0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x65, 0x66,
+	0x38, 0x61, 0x31, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69,
+	0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20,
+	0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e,
+	0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32,
+	0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x64, 0x32, 0x66, 0x37, 0x61, 0x36,
+	0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x37, 0x37, 0x63, 0x37, 0x33, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x6f,
+	0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f,
+	0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, 0x23, 0x33, 0x64, 0x38, 0x66, 0x31, 0x38,
+	0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72,
+	0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65,
+	0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d,
+	0x34, 0x2e, 0x36, 0x20, 0x33, 0x2e, 0x35, 0x20, 0x4c, 0x34, 0x2e, 0x36, 0x20, 0x32, 0x37, 0x20,
+	0x4c, 0x32, 0x38, 0x20, 0x32, 0x37, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f,
+	0x6e, 0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x35, 0x61, 0x35,
+	0x61, 0x36, 0x32, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74,
+	0x68, 0x3d, 0x22, 0x31, 0x2e, 0x37, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c,
+	0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22,
+	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74,
+	0x20, 0x78, 0x3d, 0x22, 0x37, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x31, 0x37, 0x22, 0x20,
+	0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x34, 0x2e, 0x36, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x3d, 0x22, 0x39, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x38,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x62, 0x29, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x31, 0x36, 0x33, 0x36, 0x38, 0x63,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78,
+	0x3d, 0x22, 0x31, 0x33, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x31, 0x32, 0x22, 0x20, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x34, 0x2e, 0x36, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68,
+	0x74, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x38,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x61, 0x29, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x39, 0x64, 0x33, 0x63, 0x30, 0x30,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22,
+	0x30, 0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63, 0x74, 0x20, 0x78,
+	0x3d, 0x22, 0x32, 0x30, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x37, 0x22, 0x20, 0x77, 0x69,
+	0x64, 0x74, 0x68, 0x3d, 0x22, 0x34, 0x2e, 0x36, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74,
+	0x3d, 0x22, 0x31, 0x39, 0x2e, 0x32, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22,
+	0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x67, 0x29, 0x22, 0x20,
+	0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x32, 0x65, 0x36, 0x65, 0x30, 0x66, 0x22,
+	0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30,
+	0x2e, 0x38, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78, 0x31,
+	0x3d, 0x22, 0x38, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x38, 0x22, 0x20, 0x78,
+	0x32, 0x3d, 0x22, 0x38, 0x2e, 0x36, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32, 0x35, 0x2e, 0x34,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66,
+	0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, 0x30,
+	0x2e, 0x35, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x78,
+	0x31, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x31, 0x33, 0x22,
+	0x20, 0x78, 0x32, 0x3d, 0x22, 0x31, 0x34, 0x2e, 0x39, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x32,
+	0x35, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79,
+	0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e,
+	0x65, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22,
+	0x38, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x31, 0x2e, 0x32, 0x22, 0x20, 0x79, 0x32, 0x3d,
+	0x22, 0x32, 0x35, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69,
+	0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x35, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76,
+	0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_toolbar_transfers_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+	0xf4, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+	0xbd, 0xa7, 0x93, 0x00, 0x00, 0x03, 0x34, 0x49, 0x44, 0x41, 0x54, 0x58, 0x85, 0xcd, 0x56, 0x59,
+	0x68, 0x13, 0x41, 0x18, 0xfe, 0x66, 0x77, 0x13, 0xd3, 0x26, 0x11, 0x45, 0x82, 0x8a, 0x14, 0x6b,
+	0xad, 0x07, 0x78, 0x3c, 0x28, 0xb5, 0x58, 0x54, 0x50, 0x51, 0x5f, 0xaa, 0xa2, 0x22, 0x54, 0x14,
+	0x5b, 0xb5, 0x20, 0xfa, 0xe2, 0x9b, 0x20, 0x22, 0xf8, 0x22, 0x82, 0xef, 0xea, 0x8b, 0xa0, 0xa2,
+	0x2f, 0x1e, 0x60, 0xbd, 0x90, 0x7a, 0xd0, 0x6a, 0xaa, 0x51, 0xd1, 0x40, 0xeb, 0x81, 0x78, 0x94,
+	0x96, 0x52, 0x6d, 0x1a, 0xdb, 0xc6, 0x66, 0x37, 0xd9, 0x23, 0x33, 0xbf, 0x0f, 0xb5, 0x5e, 0x64,
+	0x93, 0xdd, 0x5e, 0xfa, 0xc1, 0x2c, 0x33, 0xec, 0x37, 0xdf, 0xff, 0xcd, 0x3f, 0xff, 0x30, 0x03,
+	0xfc, 0x63, 0x30, 0xa7, 0xc4, 0x8b, 0xe5, 0x18, 0xcf, 0x03, 0xde, 0x57, 0x92, 0x24, 0x15, 0xe6,
+	0xe2, 0x09, 0x21, 0x52, 0xb2, 0x6a, 0x2e, 0xd8, 0xf1, 0x0c, 0xfd, 0x4e, 0x74, 0x15, 0xa7, 0x06,
+	0x0c, 0x05, 0x01, 0x0f, 0x63, 0xa1, 0xcd, 0x27, 0x0e, 0x15, 0x00, 0x00, 0xd7, 0xbf, 0x65, 0xe5,
+	0xd5, 0x1d, 0x39, 0x99, 0x36, 0x14, 0x04, 0x80, 0x11, 0x36, 0x00, 0x00, 0x4c, 0x62, 0x54, 0x38,
+	0x31, 0x34, 0x30, 0x48, 0x9b, 0xb6, 0x1c, 0x37, 0x9a, 0xae, 0x0c, 0x00, 0x04, 0x88, 0xcc, 0x40,
+	0x37, 0xa3, 0xdb, 0x73, 0x46, 0xcf, 0x00, 0x7e, 0x19, 0xb0, 0xec, 0x0c, 0xb8, 0x83, 0x3b, 0x03,
+	0x44, 0x80, 0xe0, 0x03, 0x7d, 0xbb, 0x0c, 0xd0, 0x98, 0x65, 0xc0, 0x70, 0x3d, 0x75, 0x04, 0x0c,
+	0xfc, 0x0f, 0x35, 0xc0, 0xff, 0x79, 0x0d, 0xe4, 0xc9, 0xc0, 0xd8, 0xd5, 0xc0, 0x28, 0x66, 0xe0,
+	0xfc, 0x4a, 0xb9, 0x5e, 0x62, 0x58, 0x04, 0x00, 0x4a, 0x41, 0x21, 0x0b, 0x4e, 0x0e, 0x49, 0x04,
+	0x30, 0x45, 0x66, 0x32, 0x98, 0x07, 0xe0, 0x69, 0xdb, 0x0c, 0x28, 0x0a, 0x93, 0xc8, 0x27, 0xb7,
+	0x5c, 0x58, 0xf5, 0x67, 0x31, 0x08, 0x42, 0xb4, 0xba, 0x81, 0xaf, 0x73, 0x64, 0x80, 0x67, 0xf8,
+	0x29, 0x28, 0xd2, 0xe5, 0xb5, 0x1b, 0x8b, 0xbd, 0x13, 0xe6, 0xad, 0x80, 0xb7, 0x64, 0x19, 0x00,
+	0x80, 0xb1, 0x1f, 0x9f, 0xf8, 0x2b, 0xdb, 0x53, 0xb0, 0x69, 0xfb, 0x2c, 0x9f, 0xa9, 0x73, 0xdf,
+	0xe0, 0x58, 0xd3, 0x2c, 0xdc, 0xad, 0x6b, 0xb3, 0x38, 0x17, 0xa7, 0xb2, 0xf1, 0x6d, 0x2f, 0xa3,
+	0x73, 0x2b, 0xa5, 0x43, 0x01, 0xbf, 0x72, 0x78, 0x7d, 0xd5, 0x4c, 0xbf, 0xa2, 0x48, 0x76, 0xb4,
+	0x9c, 0xe0, 0x19, 0x81, 0x9b, 0x57, 0x5a, 0xb5, 0x64, 0xc2, 0x3a, 0x56, 0xf3, 0x50, 0x1c, 0xcf,
+	0xc6, 0x91, 0xed, 0x26, 0xd7, 0xb5, 0x51, 0x53, 0xe5, 0x34, 0x9a, 0xf3, 0x35, 0x96, 0x2a, 0x2d,
+	0x9e, 0x19, 0xf4, 0x82, 0x08, 0xae, 0x9a, 0x20, 0x34, 0xd4, 0x77, 0x6a, 0x89, 0xaf, 0xfa, 0xed,
+	0xea, 0x46, 0x71, 0xc0, 0x2e, 0x4e, 0xce, 0xa5, 0xa5, 0xfb, 0x45, 0x6d, 0xd7, 0x17, 0xfd, 0x4d,
+	0x34, 0x12, 0x33, 0x88, 0x0b, 0xb8, 0x69, 0x2f, 0x9e, 0xc6, 0xcc, 0xae, 0x4e, 0xed, 0x7d, 0xdf,
+	0x38, 0xb1, 0x33, 0x57, 0x8c, 0xbc, 0xef, 0x81, 0xf3, 0x4b, 0x30, 0x89, 0xfc, 0xac, 0xa5, 0xbc,
+	0x22, 0x34, 0xa5, 0xa4, 0x34, 0xe8, 0x68, 0x2f, 0xda, 0x5b, 0x55, 0x8a, 0x34, 0x75, 0xc7, 0x78,
+	0x86, 0x16, 0xee, 0x0e, 0x23, 0x9e, 0x8b, 0x9b, 0x57, 0xb0, 0xfa, 0x39, 0x7a, 0x48, 0xa7, 0xd5,
+	0xcf, 0x1f, 0xc7, 0x53, 0xb1, 0xce, 0x54, 0xde, 0x95, 0xc7, 0xbb, 0x52, 0x88, 0x84, 0xbb, 0x35,
+	0xcb, 0xa0, 0x35, 0xf9, 0x82, 0x3b, 0x32, 0x00, 0x00, 0xbb, 0x22, 0x78, 0x97, 0x31, 0x69, 0x4b,
+	0xe3, 0x83, 0x58, 0x3a, 0xf9, 0xcd, 0x00, 0x09, 0x9e, 0xb5, 0xa9, 0xfd, 0x06, 0x1a, 0xee, 0xc6,
+	0xd2, 0x16, 0xa7, 0xaa, 0xda, 0x27, 0x78, 0xed, 0x44, 0xdb, 0xb6, 0x08, 0xff, 0xc6, 0x8d, 0x0e,
+	0x7c, 0xda, 0x50, 0xcc, 0xb4, 0x8e, 0x76, 0x6d, 0xf9, 0x8c, 0x92, 0x42, 0xaf, 0xc4, 0x00, 0x22,
+	0xfa, 0xd9, 0x2c, 0x53, 0xe0, 0x7e, 0x7d, 0xb7, 0x66, 0xe8, 0x74, 0x78, 0x4f, 0x98, 0x2e, 0x38,
+	0xd5, 0x75, 0x6c, 0x00, 0x00, 0xae, 0xb7, 0xd1, 0xd3, 0x0d, 0x45, 0xac, 0xa4, 0x3b, 0xa6, 0xcf,
+	0x9d, 0x3e, 0xdd, 0xe7, 0x19, 0xac, 0x78, 0x12, 0x84, 0xf0, 0xa3, 0x9e, 0x54, 0x32, 0xc9, 0xeb,
+	0x6a, 0x1e, 0x8a, 0x83, 0x6e, 0x34, 0x5d, 0x1f, 0x70, 0x5f, 0x48, 0xec, 0xed, 0x4d, 0x58, 0x2f,
+	0xa2, 0xd1, 0x84, 0x21, 0x38, 0x87, 0xe0, 0x1c, 0xd1, 0x97, 0x09, 0xb3, 0xa7, 0xd7, 0x6c, 0x6e,
+	0x25, 0x51, 0xe3, 0x56, 0xcf, 0xf1, 0xab, 0xf8, 0x77, 0x5c, 0x2c, 0xc7, 0x78, 0x51, 0xc0, 0x5a,
+	0xe6, 0xcf, 0xf7, 0x17, 0xc9, 0x32, 0xd0, 0xdc, 0xac, 0x7d, 0x56, 0x33, 0xb4, 0x70, 0x7f, 0x13,
+	0xfa, 0xc6, 0xc4, 0x00, 0x00, 0x9c, 0x59, 0x8a, 0x52, 0x8f, 0x87, 0xbd, 0x04, 0x00, 0xcb, 0xa2,
+	0xc5, 0xb5, 0x11, 0x7c, 0x1c, 0xaa, 0xd6, 0x90, 0x71, 0xb6, 0x02, 0x65, 0x67, 0x2b, 0x50, 0x36,
+	0xe6, 0x81, 0x47, 0x12, 0x59, 0xb7, 0xe0, 0xf2, 0x56, 0xc8, 0xa6, 0x1a, 0x38, 0x4d, 0x82, 0x57,
+	0x42, 0x90, 0x67, 0x58, 0x11, 0x24, 0x66, 0x49, 0x92, 0x7c, 0xf3, 0xc3, 0x1d, 0x75, 0xdf, 0x51,
+	0x40, 0xfc, 0xfd, 0x3b, 0xeb, 0x75, 0xac, 0x76, 0x61, 0x53, 0xd1, 0x6c, 0x7f, 0xd5, 0x8a, 0xea,
+	0xca, 0xa0, 0x14, 0x9c, 0x3a, 0xac, 0xf8, 0x22, 0xf9, 0x05, 0x8d, 0xe7, 0x6e, 0x6d, 0x33, 0x96,
+	0xab, 0xf7, 0x10, 0xc6, 0x55, 0x47, 0x06, 0x00, 0x80, 0x6b, 0x49, 0xa6, 0xbf, 0x7d, 0x00, 0x36,
+	0xf4, 0x3a, 0x05, 0x00, 0x10, 0x08, 0x94, 0x56, 0x41, 0x36, 0xaf, 0xd5, 0xac, 0x06, 0x02, 0x53,
+	0x70, 0x2d, 0x1e, 0xd7, 0xd7, 0x5c, 0xbf, 0xd4, 0xbe, 0x1e, 0x84, 0xe1, 0x6d, 0x01, 0x83, 0xc5,
+	0xc0, 0x6e, 0x74, 0x84, 0x71, 0x6d, 0x58, 0x3a, 0xa3, 0x85, 0xef, 0x47, 0xc9, 0xdc, 0x84, 0x76,
+	0x4a, 0x74, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_toolbar_transfers_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x33, 0x32, 0x20, 0x33, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x61,
+	0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x72,
+	0x22, 0x20, 0x78, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x30, 0x22, 0x20,
+	0x78, 0x32, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x79, 0x32, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x66, 0x66, 0x65, 0x30, 0x38, 0x61, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x30, 0x2e, 0x35, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+	0x3d, 0x22, 0x23, 0x66, 0x66, 0x61, 0x62, 0x32, 0x65, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x3c, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x3d,
+	0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22,
+	0x23, 0x65, 0x66, 0x38, 0x61, 0x31, 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
+	0x2f, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x47, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x3e,
+	0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x61,
+	0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x2e, 0x36, 0x20,
+	0x4c, 0x32, 0x30, 0x2e, 0x36, 0x20, 0x31, 0x2e, 0x36, 0x20, 0x4c, 0x32, 0x30, 0x2e, 0x36, 0x20,
+	0x31, 0x32, 0x2e, 0x36, 0x20, 0x4c, 0x32, 0x36, 0x2e, 0x34, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x20,
+	0x4c, 0x31, 0x36, 0x20, 0x32, 0x35, 0x20, 0x4c, 0x35, 0x2e, 0x36, 0x20, 0x31, 0x32, 0x2e, 0x36,
+	0x20, 0x4c, 0x31, 0x31, 0x2e, 0x34, 0x20, 0x31, 0x32, 0x2e, 0x36, 0x20, 0x5a, 0x22, 0x0a, 0x20,
+	0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x61, 0x72,
+	0x29, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x39, 0x64, 0x33, 0x63,
+	0x30, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68,
+	0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65,
+	0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a, 0x20,
+	0x20, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x31, 0x33, 0x20, 0x33, 0x20,
+	0x4c, 0x31, 0x33, 0x20, 0x31, 0x33, 0x2e, 0x34, 0x20, 0x4c, 0x39, 0x20, 0x31, 0x33, 0x2e, 0x34,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e, 0x65, 0x22, 0x20, 0x73, 0x74,
+	0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x66, 0x66, 0x65, 0x39, 0x62, 0x30, 0x22, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x31, 0x2e, 0x32,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70,
+	0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79,
+	0x3d, 0x22, 0x30, 0x2e, 0x38, 0x35, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x72, 0x65, 0x63,
+	0x74, 0x20, 0x78, 0x3d, 0x22, 0x36, 0x22, 0x20, 0x79, 0x3d, 0x22, 0x32, 0x37, 0x2e, 0x36, 0x22,
+	0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x30, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x3d, 0x22, 0x32, 0x2e, 0x38, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x31, 0x2e, 0x34,
+	0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x75, 0x72, 0x6c, 0x28, 0x23, 0x61, 0x72, 0x29,
+	0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x39, 0x64, 0x33, 0x63, 0x30,
+	0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d,
+	0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6c, 0x69, 0x6e, 0x65, 0x20,
+	0x78, 0x31, 0x3d, 0x22, 0x37, 0x2e, 0x35, 0x22, 0x20, 0x79, 0x31, 0x3d, 0x22, 0x32, 0x38, 0x2e,
+	0x34, 0x22, 0x20, 0x78, 0x32, 0x3d, 0x22, 0x32, 0x34, 0x2e, 0x35, 0x22, 0x20, 0x79, 0x32, 0x3d,
+	0x22, 0x32, 0x38, 0x2e, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23,
+	0x66, 0x66, 0x65, 0x39, 0x62, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77,
+	0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x20, 0x6f, 0x70, 0x61, 0x63, 0x69,
+	0x74, 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x37, 0x22, 0x2f, 0x3e, 0x0a, 0x3c, 0x2f, 0x73, 0x76, 0x67,
+	0x3e, 0x0a
+};
+
+static const unsigned char icon_transfer_clear_completed_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x13, 0x08, 0x06, 0x00, 0x00, 0x00, 0x9d, 0x92, 0x5d,
+	0xf2, 0x00, 0x00, 0x00, 0xb5, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x63, 0x60, 0x18, 0x68, 0x60,
+	0x79, 0xc7, 0xf2, 0x3f, 0xc3, 0x25, 0x06, 0x08, 0x26, 0x1b, 0xc0, 0x0c, 0xb8, 0xc4, 0xf0, 0xbf,
+	0xe8, 0x59, 0x11, 0x79, 0x06, 0xc9, 0x5e, 0x97, 0x85, 0x1b, 0x12, 0xfa, 0x30, 0x94, 0x3c, 0x43,
+	0x90, 0xbd, 0x23, 0x7b, 0x5d, 0x16, 0xc5, 0x10, 0x46, 0x92, 0x4c, 0x42, 0x0e, 0x0f, 0x3d, 0x54,
+	0xbd, 0x4c, 0xe4, 0x18, 0xb2, 0x4a, 0x6e, 0x15, 0x49, 0xf6, 0xc3, 0x01, 0x72, 0xb8, 0x90, 0x1d,
+	0xb8, 0xa1, 0x0f, 0x43, 0xe1, 0x86, 0x58, 0xde, 0xb1, 0xa4, 0x3c, 0xaa, 0xd1, 0x03, 0x17, 0x1d,
+	0xe0, 0x0d, 0x23, 0x64, 0xcd, 0xbd, 0x92, 0xbd, 0x84, 0x2d, 0x45, 0x76, 0x3e, 0x36, 0x31, 0x62,
+	0xd2, 0x0b, 0x24, 0x0a, 0xb1, 0x45, 0x2b, 0x54, 0x4c, 0x96, 0x55, 0x96, 0xe1, 0xb1, 0xe6, 0x63,
+	0x82, 0xc9, 0x04, 0xc3, 0x6b, 0xe8, 0x61, 0x41, 0x6c, 0x54, 0x33, 0x31, 0x30, 0x30, 0x30, 0x58,
+	0x72, 0x59, 0xc2, 0x05, 0x1e, 0xff, 0x7e, 0x0c, 0x77, 0x4d, 0x91, 0x48, 0x11, 0x83, 0x25, 0xb7,
+	0x25, 0x51, 0x89, 0x16, 0xa1, 0x08, 0x2d, 0x17, 0x13, 0xeb, 0x25, 0x14, 0x17, 0x61, 0x03, 0x64,
+	0xa7, 0x5e, 0xb8, 0xab, 0x28, 0xc9, 0xd5, 0xd4, 0x00, 0x00, 0x48, 0xef, 0x68, 0x26, 0xe4, 0x4b,
+	0x8a, 0x11, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+static const unsigned char icon_transfer_clear_completed_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x38, 0x20, 0x31, 0x39, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e,
+	0x32, 0x20, 0x4c, 0x37, 0x2e, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x20, 0x4c, 0x31, 0x34, 0x2e,
+	0x39, 0x20, 0x34, 0x2e, 0x30, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e,
+	0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x30, 0x30, 0x64, 0x32,
+	0x30, 0x30, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68,
+	0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e,
+	0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a,
+	0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_transfer_clear_completed_disabled_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x13, 0x08, 0x06, 0x00, 0x00, 0x00, 0x9d, 0x92, 0x5d,
+	0xf2, 0x00, 0x00, 0x00, 0xb7, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xad, 0x93, 0x31, 0x0e, 0xc2,
+	0x30, 0x0c, 0x45, 0x5f, 0x2a, 0x36, 0xee, 0xd1, 0xa5, 0x52, 0xf7, 0xde, 0x83, 0x0b, 0x20, 0x10,
+	0x23, 0xdd, 0x39, 0x00, 0x7b, 0x3b, 0x22, 0x8e, 0xd0, 0xd3, 0x54, 0xea, 0xd2, 0xcb, 0x84, 0xa1,
+	0x32, 0xb2, 0x9c, 0x21, 0x0e, 0xf4, 0x4f, 0x91, 0x22, 0x3f, 0xff, 0xef, 0x38, 0xb0, 0x93, 0xc2,
+	0xaf, 0x85, 0xc3, 0x34, 0xc6, 0x65, 0x9d, 0x01, 0x78, 0x3d, 0xde, 0xa1, 0xfa, 0x17, 0xd2, 0xd4,
+	0x2d, 0x00, 0xc5, 0xa0, 0x61, 0x1a, 0xa3, 0x9c, 0x9b, 0xba, 0xa5, 0x3f, 0xdd, 0x43, 0x31, 0x48,
+	0x20, 0xe2, 0x46, 0x20, 0x00, 0x87, 0x12, 0x90, 0x00, 0x60, 0x9b, 0x8b, 0xbe, 0x73, 0x3b, 0xb2,
+	0x91, 0xac, 0x5c, 0x20, 0x3b, 0x5c, 0x1d, 0xc9, 0x0d, 0xf2, 0x40, 0xdc, 0x8e, 0x72, 0x90, 0x2c,
+	0x48, 0xbb, 0xc9, 0x29, 0xd8, 0x02, 0x79, 0x0d, 0x6f, 0x24, 0x97, 0x23, 0x51, 0x0e, 0xf2, 0x05,
+	0x69, 0xfb, 0x76, 0xe9, 0xce, 0xfd, 0xc5, 0xd3, 0x2b, 0x75, 0xb4, 0xac, 0x33, 0xb7, 0xe7, 0x35,
+	0xc2, 0x16, 0xa9, 0x3b, 0x76, 0xae, 0x8f, 0x5d, 0x41, 0xba, 0xa5, 0x22, 0x4f, 0xa4, 0xc4, 0x91,
+	0xdd, 0x56, 0x6f, 0xa4, 0x04, 0xa4, 0xbb, 0x97, 0x44, 0xda, 0x5d, 0x1f, 0x49, 0xee, 0x59, 0x36,
+	0x70, 0xdf, 0x63, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+static const unsigned char icon_transfer_clear_completed_disabled_svg = {
+	0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70,
+	0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30,
+	0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x76, 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d,
+	0x22, 0x30, 0x20, 0x30, 0x20, 0x31, 0x38, 0x20, 0x31, 0x39, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c,
+	0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x4d, 0x33, 0x2e, 0x34, 0x20, 0x31, 0x30, 0x2e,
+	0x32, 0x20, 0x4c, 0x37, 0x2e, 0x32, 0x20, 0x31, 0x34, 0x2e, 0x37, 0x20, 0x4c, 0x31, 0x34, 0x2e,
+	0x39, 0x20, 0x34, 0x2e, 0x30, 0x22, 0x20, 0x66, 0x69, 0x6c, 0x6c, 0x3d, 0x22, 0x6e, 0x6f, 0x6e,
+	0x65, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3d, 0x22, 0x23, 0x36, 0x36, 0x38, 0x36,
+	0x36, 0x34, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68,
+	0x3d, 0x22, 0x33, 0x2e, 0x34, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73,
+	0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x61, 0x70, 0x3d, 0x22, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x22, 0x20, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6c, 0x69, 0x6e,
+	0x65, 0x6a, 0x6f, 0x69, 0x6e, 0x3d, 0x22, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 0x0a,
+	0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a
+};
+
+static const unsigned char icon_tray_disconnected_png = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+	0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c,
+	0x3b, 0x00, 0x00, 0x01, 0x7d, 0x69, 0x43, 0x43, 0x50, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6f,
+	0x66, 0x69, 0x6c, 0x65, 0x00, 0x00, 0x28, 0x91, 0x95, 0x91, 0xbd, 0x4b, 0x42, 0x51, 0x18, 0xc6,
+	0x7f, 0xf7, 0x5a, 0x24, 0xa1, 0x34, 0x64, 0x10, 0xd1, 0x70, 0x07, 0x6b, 0xca, 0xa5, 0x22, 0x1a,
+	0xcd, 0x02, 0x09, 0x0a, 0xc4, 0x0c, 0xb4, 0x1a, 0xba, 0x1f, 0x69, 0x82, 0xf7, 0x2a, 0xf7, 0x5e,
+	0x69, 0x71, 0x0c, 0x5a, 0x83, 0x86, 0x3e, 0x96, 0xac, 0x86, 0x96, 0xe6, 0x5a, 0x1b, 0x5a, 0x83,
+	0x20, 0xe8, 0x03, 0xa2, 0x3f, 0x20, 0x9a, 0x8a, 0x5a, 0x22, 0x6e, 0x1c, 0x15, 0x94, 0xc0, 0xa0,
+	0x77, 0x39, 0x3f, 0x9e, 0x73, 0x9e, 0x97, 0xf7, 0x7d, 0x0e, 0xc8, 0xd5, 0x82, 0x6e, 0x3a, 0x1d,
+	0x51, 0x30, 0x2d, 0xd7, 0x4e, 0xc6, 0x63, 0x4a, 0x3a, 0xb3, 0xa4, 0x74, 0xbd, 0xe0, 0x27, 0x44,
+	0x07, 0x3e, 0xfa, 0x54, 0xdd, 0x29, 0x4d, 0x25, 0x12, 0x73, 0xb4, 0xad, 0xcf, 0x3b, 0x24, 0x71,
+	0xde, 0x46, 0x44, 0x2f, 0xfe, 0x57, 0x41, 0x63, 0xcd, 0xd1, 0x41, 0x52, 0x80, 0xa8, 0x5e, 0xb2,
+	0x5d, 0x90, 0x56, 0x81, 0x89, 0x0d, 0xb7, 0x24, 0x78, 0x0f, 0x08, 0xe9, 0xeb, 0xaa, 0x01, 0xd2,
+	0x19, 0x30, 0x62, 0xa7, 0x33, 0x4b, 0x20, 0x3d, 0x08, 0x5d, 0xab, 0xf3, 0xab, 0xe0, 0x5c, 0x8d,
+	0x65, 0xd1, 0x33, 0x64, 0xa7, 0x92, 0xd3, 0x20, 0x87, 0x00, 0x25, 0xd7, 0xc2, 0x5a, 0x0b, 0xeb,
+	0xeb, 0xb6, 0x09, 0xf2, 0x38, 0x10, 0x36, 0x4c, 0xcb, 0x00, 0x39, 0x5d, 0x67, 0x43, 0x70, 0x45,
+	0xb0, 0x59, 0x28, 0xeb, 0x8d, 0x39, 0xc5, 0x86, 0x81, 0x35, 0x6b, 0x71, 0x41, 0xe8, 0xc0, 0x20,
+	0x71, 0x66, 0x99, 0x27, 0x81, 0x82, 0x46, 0x99, 0x3c, 0x05, 0x5c, 0x22, 0xe4, 0xb1, 0x50, 0x70,
+	0x48, 0x12, 0x27, 0xd6, 0xc6, 0x3f, 0x50, 0xf3, 0x27, 0x28, 0xa3, 0x51, 0x20, 0x8f, 0x8e, 0xc2,
+	0x0c, 0x45, 0x4c, 0xd4, 0x9a, 0x1f, 0xf1, 0x07, 0xfc, 0xca, 0xd6, 0xc9, 0x8e, 0x8d, 0xd6, 0x3b,
+	0x05, 0x62, 0xd0, 0xf9, 0xec, 0x79, 0xef, 0x43, 0xd0, 0xb5, 0x03, 0xdf, 0xdb, 0x9e, 0xf7, 0x75,
+	0xe4, 0x79, 0xdf, 0xc7, 0xe0, 0x7b, 0x82, 0x4b, 0xab, 0xe9, 0x2f, 0x56, 0x61, 0xf2, 0x03, 0x7c,
+	0xdb, 0x4d, 0x2d, 0x7c, 0x08, 0x3d, 0x9b, 0x70, 0x7e, 0xd5, 0xd4, 0xb4, 0x5d, 0xb8, 0xd8, 0x82,
+	0xfe, 0xc7, 0x92, 0x6a, 0xab, 0x35, 0xc9, 0x07, 0xc8, 0xd9, 0x2c, 0xbc, 0x9d, 0x42, 0x30, 0x03,
+	0xbd, 0x37, 0xd0, 0xbd, 0x5c, 0xcf, 0xad, 0x71, 0xcf, 0xc9, 0x3d, 0xa4, 0x2a, 0x30, 0x77, 0x0d,
+	0xfb, 0x07, 0x30, 0x9c, 0x83, 0x9e, 0x95, 0x36, 0x7b, 0xfb, 0x5b, 0x73, 0xfb, 0xf3, 0x4d, 0x23,
+	0xbf, 0x1f, 0x2e, 0xdf, 0x72, 0x8b, 0x6e, 0x19, 0x87, 0xbd, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48,
+	0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00,
+	0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xea, 0x08, 0x14, 0x04, 0x24, 0x04, 0x65, 0x8c,
+	0x94, 0x2e, 0x00, 0x00, 0x03, 0xa7, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0x95, 0x55, 0xcf, 0x4b,
+	0xe3, 0x78, 0x14, 0x7f, 0xdf, 0x24, 0x6d, 0x63, 0x5b, 0x5b, 0x1b, 0xed, 0xd2, 0x56, 0x54, 0x46,
+	0xd8, 0x2a, 0xac, 0x1d, 0x4f, 0x1e, 0x9c, 0xcb, 0x8a, 0x87, 0x95, 0xbd, 0xec, 0xc1, 0x3d, 0xac,
+	0xa0, 0x88, 0x08, 0xf5, 0xe6, 0xc5, 0x83, 0x20, 0xc3, 0xb2, 0xc7, 0xb9, 0xed, 0xae, 0xb0, 0x97,
+	0xfd, 0x03, 0x16, 0x47, 0x10, 0xa4, 0x5e, 0x06, 0x3a, 0xa8, 0xa8, 0xb0, 0x20, 0xee, 0x41, 0x16,
+	0xb6, 0xeb, 0x41, 0x46, 0xc7, 0xda, 0xdf, 0x31, 0xc1, 0x26, 0x6d, 0x6a, 0x93, 0x26, 0xcb, 0xcb,
+	0x4c, 0x8a, 0xb6, 0xa6, 0xb0, 0x1f, 0x08, 0x24, 0xf9, 0x7e, 0xdf, 0xe7, 0x7d, 0xf2, 0x79, 0xef,
+	0x7d, 0x43, 0xc3, 0xff, 0x80, 0x61, 0x18, 0x44, 0x51, 0x14, 0x75, 0x6a, 0x6a, 0x4a, 0x39, 0x39,
+	0x39, 0xf9, 0xb3, 0x53, 0x28, 0xd5, 0x69, 0xb1, 0x15, 0xf1, 0x78, 0xfc, 0x5f, 0x96, 0x65, 0x19,
+	0x96, 0x65, 0xeb, 0xad, 0x6b, 0xad, 0x68, 0x23, 0x9e, 0x9d, 0x9d, 0xfd, 0x75, 0x69, 0x69, 0xe9,
+	0xbb, 0xd6, 0x8d, 0xeb, 0xeb, 0xeb, 0x2f, 0x69, 0x9a, 0x8e, 0x1a, 0x86, 0x01, 0x0c, 0xc3, 0x24,
+	0x5b, 0xd7, 0x5b, 0xd1, 0x46, 0x2c, 0x49, 0x92, 0x2a, 0x49, 0x52, 0x62, 0x79, 0x79, 0xf9, 0xed,
+	0xf6, 0xf6, 0x36, 0x6d, 0x05, 0x08, 0x82, 0xf0, 0x6e, 0x68, 0x68, 0x88, 0x54, 0x2a, 0x15, 0x75,
+	0x63, 0x63, 0xe3, 0xc2, 0x7a, 0x6f, 0x87, 0x36, 0x62, 0x5d, 0xd7, 0x7f, 0x92, 0x65, 0x39, 0x27,
+	0x49, 0xd2, 0x0f, 0x47, 0x47, 0x47, 0xa9, 0xb5, 0xb5, 0xb5, 0x01, 0x0c, 0xd6, 0x75, 0xfd, 0x8b,
+	0x40, 0x20, 0x00, 0x2c, 0xcb, 0x0a, 0x76, 0x64, 0x8f, 0xd1, 0x46, 0xbc, 0xbf, 0xbf, 0x5f, 0x95,
+	0x65, 0x79, 0x4e, 0x92, 0xa4, 0xba, 0x2c, 0xcb, 0xd1, 0x48, 0x24, 0xf2, 0xcf, 0xfc, 0xfc, 0xfc,
+	0x07, 0xa7, 0xd3, 0x49, 0xd0, 0x06, 0x96, 0x65, 0x53, 0x8f, 0x09, 0xec, 0xd0, 0xfc, 0xd4, 0xc7,
+	0x48, 0xa7, 0xd3, 0x1f, 0x7b, 0x7b, 0x7b, 0xab, 0x00, 0xf0, 0x8d, 0xaa, 0xaa, 0x55, 0x9a, 0xa6,
+	0x43, 0x1c, 0xc7, 0x51, 0x84, 0x10, 0xe8, 0xea, 0xea, 0xda, 0x4e, 0x26, 0x93, 0xfb, 0x8f, 0xf7,
+	0x3f, 0x87, 0x36, 0xc5, 0x16, 0x4e, 0x4f, 0x4f, 0x7f, 0x06, 0x80, 0x14, 0x45, 0x51, 0x81, 0x40,
+	0x20, 0x40, 0x3c, 0x1e, 0x0f, 0xa8, 0xaa, 0x0a, 0x8d, 0x46, 0xe3, 0x7b, 0x6b, 0x4f, 0x27, 0x30,
+	0x9d, 0x16, 0x47, 0x47, 0x47, 0xfd, 0x13, 0x13, 0x13, 0xa0, 0x28, 0x8a, 0xb9, 0x6d, 0x7a, 0x7a,
+	0x1a, 0x13, 0x0e, 0x77, 0x8a, 0xb1, 0x60, 0xab, 0x18, 0xd1, 0xd7, 0xd7, 0xe7, 0x9c, 0x9b, 0x9b,
+	0x83, 0xc9, 0xc9, 0x49, 0x08, 0x87, 0xc3, 0x50, 0x2a, 0x95, 0x60, 0x7c, 0x7c, 0x9c, 0xde, 0xdc,
+	0xdc, 0xfc, 0xd6, 0x22, 0xb0, 0x43, 0x47, 0x62, 0x00, 0x20, 0x0f, 0x0f, 0x0f, 0x70, 0x78, 0x78,
+	0x08, 0x9a, 0xa6, 0xc1, 0xd9, 0xd9, 0x99, 0x69, 0xc7, 0xe0, 0xe0, 0xe0, 0xef, 0x76, 0x84, 0x16,
+	0x88, 0x75, 0xf3, 0x1c, 0xf6, 0xf6, 0xf6, 0x8a, 0xe1, 0x70, 0x38, 0x58, 0x2e, 0x97, 0x21, 0x14,
+	0x0a, 0x81, 0xd3, 0xe9, 0x84, 0x4c, 0x26, 0x03, 0xb7, 0xb7, 0xb7, 0x06, 0x00, 0xbc, 0x5e, 0x58,
+	0x58, 0x78, 0xf3, 0x5c, 0x1c, 0xa2, 0xa3, 0xc7, 0xb5, 0x5a, 0xad, 0xe7, 0xf8, 0xf8, 0x18, 0x2d,
+	0x41, 0x32, 0x33, 0x00, 0x9f, 0x63, 0xb1, 0x18, 0xe1, 0x38, 0xee, 0x47, 0x00, 0xb0, 0x25, 0xb6,
+	0xb5, 0x62, 0x75, 0x75, 0x35, 0x1e, 0x89, 0x44, 0x1c, 0xa9, 0x54, 0x0a, 0x50, 0xb1, 0x75, 0x05,
+	0x83, 0x41, 0x88, 0x46, 0xa3, 0x40, 0x51, 0x94, 0xcb, 0x4e, 0x2d, 0xe2, 0x89, 0x15, 0x2b, 0x2b,
+	0x2b, 0x2f, 0x42, 0xa1, 0xd0, 0x1f, 0x85, 0x42, 0xa1, 0x1f, 0x00, 0xca, 0x8b, 0x8b, 0x8b, 0x5f,
+	0x95, 0xcb, 0x65, 0x72, 0x7e, 0x7e, 0x8e, 0x27, 0x9b, 0x19, 0xe0, 0x70, 0x38, 0xcc, 0x42, 0xf2,
+	0x3c, 0x2f, 0xe7, 0xf3, 0x79, 0x51, 0xd3, 0xb4, 0x8f, 0xf5, 0x7a, 0xfd, 0xae, 0x54, 0x2a, 0x2d,
+	0x6f, 0x6d, 0x6d, 0x35, 0xa7, 0xf2, 0x89, 0x15, 0x0c, 0xc3, 0xfc, 0xe2, 0xf7, 0xfb, 0x27, 0x7b,
+	0x7a, 0x7a, 0x70, 0x84, 0x71, 0x0a, 0x01, 0xdb, 0xcd, 0xed, 0x76, 0x43, 0x2e, 0x97, 0xfb, 0xa4,
+	0x84, 0x10, 0xc0, 0x82, 0xf2, 0x3c, 0xef, 0x1d, 0x18, 0x18, 0xf0, 0xfa, 0x7c, 0xbe, 0x90, 0x24,
+	0x49, 0x7a, 0x36, 0x9b, 0x75, 0x03, 0x40, 0x93, 0xf8, 0x89, 0x15, 0x8a, 0xa2, 0xfc, 0x4d, 0x51,
+	0x14, 0x0e, 0x01, 0x26, 0x81, 0x6a, 0xb5, 0x0a, 0xbb, 0xbb, 0xbb, 0x50, 0x2c, 0x16, 0xcd, 0x6e,
+	0xc0, 0xe2, 0x71, 0x1c, 0x07, 0x63, 0x63, 0x63, 0xcd, 0x62, 0x5e, 0x5d, 0x5d, 0x39, 0x72, 0xb9,
+	0x9c, 0x73, 0x67, 0x67, 0xe7, 0x53, 0x11, 0x3e, 0xe3, 0x89, 0xe2, 0x44, 0x22, 0xf1, 0xdb, 0xdd,
+	0xdd, 0xdd, 0x6b, 0x8f, 0xc7, 0xa3, 0x73, 0x1c, 0x47, 0x8b, 0xa2, 0x48, 0x50, 0x3d, 0x12, 0xfa,
+	0x7c, 0x3e, 0x70, 0xb9, 0x5c, 0x80, 0x8a, 0xef, 0xef, 0xef, 0xcd, 0xf0, 0x5a, 0xad, 0x06, 0x97,
+	0x97, 0x97, 0x7a, 0xa3, 0xd1, 0xd0, 0x2c, 0x42, 0x0b, 0x4d, 0x8f, 0x67, 0x66, 0x66, 0x0e, 0x46,
+	0x46, 0x46, 0xbe, 0x2e, 0x16, 0x8b, 0xba, 0x61, 0x18, 0x94, 0x28, 0x8a, 0x14, 0x2a, 0x8f, 0xc5,
+	0x62, 0xe0, 0xf7, 0xfb, 0xf1, 0xf0, 0x31, 0x0b, 0x87, 0x49, 0x70, 0xb4, 0x0b, 0x85, 0x02, 0x1c,
+	0x1c, 0x1c, 0x00, 0x4d, 0xd3, 0x12, 0x7e, 0x1d, 0x4d, 0xd3, 0x34, 0x21, 0x44, 0x48, 0x24, 0x12,
+	0xe6, 0x69, 0xd8, 0x54, 0x5c, 0xa9, 0x54, 0x5e, 0xba, 0xdd, 0x6e, 0x2a, 0x1a, 0x8d, 0x52, 0xb2,
+	0x2c, 0x9b, 0x45, 0xba, 0xb9, 0xb9, 0x31, 0x49, 0xd0, 0x6f, 0x4c, 0x82, 0x9d, 0x81, 0xaa, 0x91,
+	0x3c, 0x9b, 0xcd, 0xe2, 0xa0, 0xc0, 0xf0, 0xf0, 0x70, 0x37, 0xf6, 0x38, 0x4e, 0xe5, 0xc5, 0xc5,
+	0x45, 0x97, 0xa5, 0xb8, 0xe9, 0x71, 0x77, 0x77, 0xb7, 0x19, 0x8c, 0x45, 0xc2, 0x60, 0xbc, 0xbc,
+	0x5e, 0xaf, 0xf9, 0x5c, 0xaf, 0xd7, 0xcd, 0xae, 0xc0, 0xe9, 0xc3, 0x04, 0x3c, 0xcf, 0xe3, 0xc1,
+	0x6f, 0x26, 0xc0, 0x24, 0xf9, 0x7c, 0x1e, 0x7f, 0x10, 0x28, 0x4e, 0xb7, 0x88, 0x9b, 0x8a, 0x05,
+	0x41, 0xf8, 0x2b, 0x99, 0x4c, 0xce, 0x68, 0x9a, 0x66, 0xf4, 0xf7, 0xf7, 0x2b, 0xa2, 0x28, 0x7e,
+	0x10, 0x04, 0xe1, 0x3c, 0x9d, 0x4e, 0xbf, 0x77, 0xb9, 0x5c, 0x4c, 0x3c, 0x1e, 0x57, 0x79, 0x9e,
+	0x0f, 0x5c, 0x5f, 0x5f, 0xbf, 0xc0, 0x02, 0x07, 0x83, 0xc1, 0x57, 0x82, 0x20, 0x7c, 0x99, 0xc9,
+	0x64, 0x3c, 0x84, 0x10, 0xb4, 0x8e, 0x66, 0x18, 0x46, 0xb6, 0x88, 0xff, 0x03, 0xa5, 0x06, 0xa6,
+	0xd4, 0xe3, 0xc6, 0x0c, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+	0x82
+};
+
 static const unsigned char icon_tray_high_png = {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-	0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 0x08, 0x03, 0x00, 0x00, 0x00, 0xf3, 0x6a, 0x9c,
-	0x09, 0x00, 0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4d, 0x00, 0x00, 0x7a, 0x26, 0x00, 0x00, 0x80,
-	0x84, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x00, 0x80, 0xe8, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xea,
-	0x60, 0x00, 0x00, 0x3a, 0x98, 0x00, 0x00, 0x17, 0x70, 0x9c, 0xba, 0x51, 0x3c, 0x00, 0x00, 0x01,
-	0xfe, 0x50, 0x4c, 0x54, 0x45, 0xff, 0x00, 0x00, 0x64, 0x29, 0x09, 0x68, 0x2c, 0x0a, 0x66, 0x2b,
-	0x0a, 0x79, 0x39, 0x10, 0x68, 0x2e, 0x0d, 0x67, 0x2d, 0x0c, 0x67, 0x2c, 0x0c, 0x67, 0x2c, 0x0b,
-	0x65, 0x2a, 0x09, 0xa6, 0x5c, 0x24, 0x8e, 0x4a, 0x18, 0x72, 0x34, 0x0d, 0x99, 0x6c, 0x47, 0xdd,
-	0xbf, 0x93, 0xd7, 0xad, 0x7b, 0xd0, 0x9b, 0x63, 0xc4, 0x7f, 0x42, 0xae, 0x65, 0x2b, 0x87, 0x44,
-	0x17, 0x69, 0x2d, 0x0b, 0x79, 0x39, 0x11, 0xa5, 0x5c, 0x23, 0x7f, 0x3e, 0x13, 0x9f, 0x72, 0x4b,
-	0xd4, 0xaf, 0x80, 0xe2, 0xb3, 0x7a, 0xda, 0x9f, 0x63, 0xc8, 0x81, 0x43, 0x93, 0x51, 0x22, 0x7d,
-	0x3d, 0x14, 0x75, 0x36, 0x10, 0x6b, 0x2e, 0x0b, 0x89, 0x46, 0x17, 0xb5, 0x6b, 0x2f, 0xae, 0x70,
-	0x3d, 0xc8, 0x96, 0x62, 0xd1, 0x9c, 0x66, 0xaf, 0x70, 0x3c, 0x96, 0x57, 0x2a, 0x8c, 0x49, 0x1b,
-	0x74, 0x35, 0x10, 0x70, 0x32, 0x0e, 0xc2, 0x76, 0x36, 0xc9, 0x87, 0x4a, 0xbf, 0x7f, 0x47, 0xa2,
-	0x60, 0x2e, 0x7d, 0x3c, 0x13, 0x76, 0x37, 0x10, 0xc4, 0x74, 0x30, 0xbd, 0x6e, 0x2d, 0xa1, 0x5a,
-	0x23, 0x99, 0x58, 0x2a, 0x8d, 0x50, 0x29, 0x78, 0x3d, 0x1a, 0x74, 0x36, 0x10, 0xbd, 0x6e, 0x2e,
-	0xbc, 0x6d, 0x2d, 0x80, 0x47, 0x1e, 0xaa, 0x7a, 0x55, 0xd0, 0x9d, 0x73, 0xa7, 0x6d, 0x43, 0x80,
-	0x42, 0x1a, 0x6b, 0x2f, 0x0d, 0x77, 0x38, 0x12, 0xc9, 0x7a, 0x38, 0xbe, 0x6f, 0x2e, 0xce, 0x94,
-	0x65, 0xeb, 0xd2, 0xbf, 0xf9, 0xf2, 0xed, 0x93, 0x66, 0x42, 0xa0, 0x5d, 0x2a, 0x4e, 0x40, 0x38,
-	0x32, 0x37, 0x3e, 0x78, 0x3a, 0x14, 0xd0, 0x87, 0x46, 0xd2, 0x8e, 0x4f, 0xd8, 0x9a, 0x60, 0xe6,
-	0xcc, 0xb2, 0xb6, 0xb5, 0xb5, 0x63, 0x4f, 0x40, 0xb8, 0x75, 0x3d, 0xc2, 0x84, 0x45, 0xbd, 0xa4,
-	0x88, 0xc7, 0xc2, 0xbd, 0xbb, 0xbc, 0xbc, 0x88, 0x8a, 0x8a, 0x7a, 0x3e, 0x19, 0xda, 0x9e, 0x61,
-	0xe6, 0xbd, 0x88, 0xe0, 0xac, 0x72, 0xdf, 0xb0, 0x80, 0xbd, 0x93, 0x6e, 0x94, 0x60, 0x34, 0xc1,
-	0x79, 0x37, 0xc5, 0x8c, 0x51, 0xa5, 0x93, 0x7f, 0x83, 0x80, 0x7c, 0xa7, 0xa7, 0xa5, 0xb3, 0xb5,
-	0xb6, 0x7e, 0x42, 0x1b, 0xdd, 0xa4, 0x67, 0xe8, 0xc1, 0x8c, 0xe2, 0xb2, 0x78, 0xda, 0x9d, 0x60,
-	0xc8, 0x82, 0x44, 0xb4, 0x69, 0x2c, 0xb6, 0x6f, 0x31, 0xc0, 0x92, 0x65, 0x9e, 0x94, 0x8a, 0x6d,
-	0x6d, 0x6c, 0x9d, 0x9c, 0x9b, 0xbd, 0xbf, 0xc0, 0x67, 0x2c, 0x0a, 0x7f, 0x41, 0x18, 0xcb, 0x89,
-	0x4d, 0xd9, 0x9e, 0x60, 0xdb, 0xa1, 0x64, 0xd4, 0x91, 0x51, 0xc3, 0x78, 0x39, 0xaf, 0x64, 0x29,
-	0xaa, 0x64, 0x2d, 0xc0, 0xa0, 0x81, 0xcb, 0xc5, 0xbb, 0xbe, 0xbe, 0xbc, 0xcc, 0xcc, 0xca, 0xb4,
-	0xb6, 0xb7, 0x79, 0x3a, 0x11, 0xa0, 0x58, 0x22, 0xbf, 0x78, 0x3d, 0xc4, 0x7d, 0x41, 0xbe, 0x74,
-	0x35, 0xb1, 0x65, 0x28, 0xa2, 0x5c, 0x25, 0xa3, 0x67, 0x38, 0xbe, 0xaa, 0x96, 0xd6, 0xd3, 0xcc,
-	0xdd, 0xdd, 0xda, 0xd6, 0xd6, 0xd4, 0xa5, 0xa7, 0xa7, 0x6d, 0x30, 0x0c, 0x7b, 0x3b, 0x10, 0x66,
-	0x2a, 0x0a, 0x67, 0x2b, 0x0b, 0x67, 0x2b, 0x0a, 0x69, 0x3c, 0x23, 0x77, 0x77, 0x77, 0x9d, 0x9d,
-	0x9b, 0xa9, 0xa9, 0xa5, 0xa8, 0xa9, 0xa5, 0x74, 0x77, 0x78, 0x37, 0x3c, 0x42, 0x71, 0x34, 0x0e,
-	0x8f, 0x4b, 0x19, 0x9f, 0x57, 0x21, 0x9a, 0x53, 0x1f, 0x83, 0x41, 0x15, 0x6e, 0x31, 0x0d, 0x3e,
-	0x43, 0x49, 0x46, 0x4a, 0x4f, 0x48, 0x4c, 0x51, 0x47, 0x4c, 0x51, 0x44, 0x49, 0x4e, 0x72, 0x34,
-	0x0e, 0x96, 0x51, 0x1c, 0xba, 0x6e, 0x2b, 0xb5, 0x68, 0x2a, 0x9b, 0x54, 0x1f, 0x78, 0x39, 0x11,
-	0xff, 0xff, 0xff, 0x86, 0xfc, 0x3b, 0x56, 0x00, 0x00, 0x00, 0x01, 0x62, 0x4b, 0x47, 0x44, 0xa9,
-	0x27, 0x0f, 0x06, 0x04, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xea, 0x05, 0x07,
-	0x15, 0x1c, 0x21, 0x9e, 0xcf, 0x09, 0x15, 0x00, 0x00, 0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x64,
-	0x61, 0x74, 0x65, 0x3a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x00, 0x32, 0x30, 0x32, 0x36, 0x2d,
-	0x30, 0x35, 0x2d, 0x30, 0x37, 0x54, 0x32, 0x31, 0x3a, 0x32, 0x35, 0x3a, 0x34, 0x30, 0x2b, 0x30,
-	0x30, 0x3a, 0x30, 0x30, 0xbb, 0xe9, 0x28, 0xea, 0x00, 0x00, 0x00, 0x25, 0x74, 0x45, 0x58, 0x74,
-	0x64, 0x61, 0x74, 0x65, 0x3a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x00, 0x32, 0x30, 0x32, 0x36,
-	0x2d, 0x30, 0x35, 0x2d, 0x30, 0x37, 0x54, 0x32, 0x31, 0x3a, 0x32, 0x35, 0x3a, 0x34, 0x30, 0x2b,
-	0x30, 0x30, 0x3a, 0x30, 0x30, 0xca, 0xb4, 0x90, 0x56, 0x00, 0x00, 0x00, 0x28, 0x74, 0x45, 0x58,
-	0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x00,
-	0x32, 0x30, 0x32, 0x36, 0x2d, 0x30, 0x35, 0x2d, 0x30, 0x37, 0x54, 0x32, 0x31, 0x3a, 0x32, 0x38,
-	0x3a, 0x33, 0x33, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0x53, 0x72, 0x29, 0xbd, 0x00, 0x00, 0x00,
-	0xf1, 0x49, 0x44, 0x41, 0x54, 0x18, 0xd3, 0x63, 0x60, 0xa0, 0x1a, 0x60, 0x24, 0x45, 0x98, 0x91,
-	0x09, 0xab, 0x28, 0x33, 0x0b, 0x03, 0x03, 0x2b, 0x1b, 0x3b, 0x07, 0x33, 0x27, 0x23, 0x92, 0x3e,
-	0x66, 0x2e, 0x6e, 0x1e, 0x5e, 0x3e, 0x7e, 0x01, 0x41, 0x21, 0x61, 0x24, 0x51, 0x11, 0x51, 0x31,
-	0x71, 0x09, 0x49, 0x29, 0x69, 0x19, 0x59, 0x39, 0x79, 0x24, 0x33, 0x14, 0x14, 0x95, 0x94, 0x55,
-	0x54, 0xd5, 0xd4, 0x35, 0x34, 0x51, 0x8c, 0xd6, 0x12, 0xd3, 0xd6, 0xd1, 0xd5, 0xd3, 0x67, 0x44,
-	0x75, 0x0e, 0xa3, 0x81, 0xa1, 0x91, 0xb1, 0x89, 0xa9, 0x19, 0x9a, 0x33, 0x18, 0xcd, 0x2d, 0x2c,
-	0xad, 0xac, 0x6d, 0x6c, 0xed, 0xec, 0x51, 0x25, 0x1c, 0x1c, 0x9d, 0x9c, 0x5d, 0x5c, 0x19, 0xdc,
-	0xdc, 0x3d, 0x3c, 0x3d, 0x3d, 0x11, 0xaa, 0xbd, 0xbc, 0x7d, 0x7c, 0xfd, 0xfc, 0x03, 0x02, 0x83,
-	0x82, 0x43, 0x42, 0xc3, 0x10, 0xe2, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, 0x09,
-	0x89, 0x49, 0xc9, 0x70, 0x61, 0xe6, 0x94, 0xd4, 0xb4, 0xf4, 0x8c, 0xcc, 0xac, 0xec, 0x9c, 0xdc,
-	0xbc, 0xfc, 0x02, 0x98, 0x30, 0x63, 0x61, 0x51, 0x71, 0x49, 0x69, 0x59, 0x79, 0x45, 0x65, 0x55,
-	0x75, 0x4d, 0x6d, 0x1d, 0x5c, 0x98, 0xa9, 0xbe, 0xa1, 0xb1, 0xa9, 0xb9, 0xa5, 0xb5, 0xad, 0xbd,
-	0xa3, 0xb3, 0xab, 0x1b, 0x2e, 0xdc, 0xd3, 0xdb, 0xd7, 0xcf, 0x31, 0x81, 0x79, 0xe2, 0xa4, 0xc9,
-	0x53, 0xa6, 0x4e, 0x9b, 0x0e, 0xb7, 0x71, 0xc6, 0xcc, 0x59, 0xb3, 0xe7, 0xcc, 0x65, 0x64, 0x98,
-	0x37, 0x7f, 0xc1, 0xc2, 0x45, 0x08, 0xef, 0x2c, 0x5e, 0xb2, 0x74, 0xd9, 0xf2, 0x15, 0x68, 0x11,
-	0x01, 0x00, 0xcd, 0xda, 0x39, 0xb5, 0x80, 0x76, 0xde, 0x22, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
-	0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+	0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c,
+	0x3b, 0x00, 0x00, 0x01, 0x7d, 0x69, 0x43, 0x43, 0x50, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6f,
+	0x66, 0x69, 0x6c, 0x65, 0x00, 0x00, 0x28, 0x91, 0x95, 0x91, 0xbd, 0x4b, 0x42, 0x51, 0x18, 0xc6,
+	0x7f, 0xf7, 0x5a, 0x24, 0xa1, 0x34, 0x64, 0x10, 0xd1, 0x70, 0x07, 0x6b, 0xca, 0xa5, 0x22, 0x1a,
+	0xcd, 0x02, 0x09, 0x0a, 0xc4, 0x0c, 0xb4, 0x1a, 0xba, 0x1f, 0x69, 0x82, 0xf7, 0x2a, 0xf7, 0x5e,
+	0x69, 0x71, 0x0c, 0x5a, 0x83, 0x86, 0x3e, 0x96, 0xac, 0x86, 0x96, 0xe6, 0x5a, 0x1b, 0x5a, 0x83,
+	0x20, 0xe8, 0x03, 0xa2, 0x3f, 0x20, 0x9a, 0x8a, 0x5a, 0x22, 0x6e, 0x1c, 0x15, 0x94, 0xc0, 0xa0,
+	0x77, 0x39, 0x3f, 0x9e, 0x73, 0x9e, 0x97, 0xf7, 0x7d, 0x0e, 0xc8, 0xd5, 0x82, 0x6e, 0x3a, 0x1d,
+	0x51, 0x30, 0x2d, 0xd7, 0x4e, 0xc6, 0x63, 0x4a, 0x3a, 0xb3, 0xa4, 0x74, 0xbd, 0xe0, 0x27, 0x44,
+	0x07, 0x3e, 0xfa, 0x54, 0xdd, 0x29, 0x4d, 0x25, 0x12, 0x73, 0xb4, 0xad, 0xcf, 0x3b, 0x24, 0x71,
+	0xde, 0x46, 0x44, 0x2f, 0xfe, 0x57, 0x41, 0x63, 0xcd, 0xd1, 0x41, 0x52, 0x80, 0xa8, 0x5e, 0xb2,
+	0x5d, 0x90, 0x56, 0x81, 0x89, 0x0d, 0xb7, 0x24, 0x78, 0x0f, 0x08, 0xe9, 0xeb, 0xaa, 0x01, 0xd2,
+	0x19, 0x30, 0x62, 0xa7, 0x33, 0x4b, 0x20, 0x3d, 0x08, 0x5d, 0xab, 0xf3, 0xab, 0xe0, 0x5c, 0x8d,
+	0x65, 0xd1, 0x33, 0x64, 0xa7, 0x92, 0xd3, 0x20, 0x87, 0x00, 0x25, 0xd7, 0xc2, 0x5a, 0x0b, 0xeb,
+	0xeb, 0xb6, 0x09, 0xf2, 0x38, 0x10, 0x36, 0x4c, 0xcb, 0x00, 0x39, 0x5d, 0x67, 0x43, 0x70, 0x45,
+	0xb0, 0x59, 0x28, 0xeb, 0x8d, 0x39, 0xc5, 0x86, 0x81, 0x35, 0x6b, 0x71, 0x41, 0xe8, 0xc0, 0x20,
+	0x71, 0x66, 0x99, 0x27, 0x81, 0x82, 0x46, 0x99, 0x3c, 0x05, 0x5c, 0x22, 0xe4, 0xb1, 0x50, 0x70,
+	0x48, 0x12, 0x27, 0xd6, 0xc6, 0x3f, 0x50, 0xf3, 0x27, 0x28, 0xa3, 0x51, 0x20, 0x8f, 0x8e, 0xc2,
+	0x0c, 0x45, 0x4c, 0xd4, 0x9a, 0x1f, 0xf1, 0x07, 0xfc, 0xca, 0xd6, 0xc9, 0x8e, 0x8d, 0xd6, 0x3b,
+	0x05, 0x62, 0xd0, 0xf9, 0xec, 0x79, 0xef, 0x43, 0xd0, 0xb5, 0x03, 0xdf, 0xdb, 0x9e, 0xf7, 0x75,
+	0xe4, 0x79, 0xdf, 0xc7, 0xe0, 0x7b, 0x82, 0x4b, 0xab, 0xe9, 0x2f, 0x56, 0x61, 0xf2, 0x03, 0x7c,
+	0xdb, 0x4d, 0x2d, 0x7c, 0x08, 0x3d, 0x9b, 0x70, 0x7e, 0xd5, 0xd4, 0xb4, 0x5d, 0xb8, 0xd8, 0x82,
+	0xfe, 0xc7, 0x92, 0x6a, 0xab, 0x35, 0xc9, 0x07, 0xc8, 0xd9, 0x2c, 0xbc, 0x9d, 0x42, 0x30, 0x03,
+	0xbd, 0x37, 0xd0, 0xbd, 0x5c, 0xcf, 0xad, 0x71, 0xcf, 0xc9, 0x3d, 0xa4, 0x2a, 0x30, 0x77, 0x0d,
+	0xfb, 0x07, 0x30, 0x9c, 0x83, 0x9e, 0x95, 0x36, 0x7b, 0xfb, 0x5b, 0x73, 0xfb, 0xf3, 0x4d, 0x23,
+	0xbf, 0x1f, 0x2e, 0xdf, 0x72, 0x8b, 0x6e, 0x19, 0x87, 0xbd, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48,
+	0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00,
+	0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xea, 0x08, 0x14, 0x04, 0x0e, 0x1f, 0x80, 0x82,
+	0x91, 0xea, 0x00, 0x00, 0x04, 0x07, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0x95, 0x94, 0x5d, 0x68,
+	0x5b, 0x65, 0x18, 0xc7, 0xff, 0xe7, 0x3d, 0x5f, 0xc9, 0xc9, 0x47, 0x93, 0xa6, 0x6d, 0x4e, 0x9a,
+	0x7e, 0xac, 0xda, 0x64, 0x6a, 0x5d, 0x95, 0x7d, 0x54, 0x1c, 0xb2, 0x31, 0xa6, 0x55, 0x2f, 0xe6,
+	0xd4, 0x0a, 0xba, 0x1b, 0xc1, 0xa2, 0x68, 0x41, 0x44, 0x10, 0x14, 0x14, 0x71, 0x62, 0x41, 0xf4,
+	0xc2, 0x8a, 0x77, 0xbb, 0xf0, 0xc2, 0x0b, 0x45, 0xed, 0xc6, 0x98, 0x32, 0xba, 0x4d, 0x37, 0xf0,
+	0xa3, 0xca, 0x74, 0xed, 0x56, 0x75, 0x6d, 0xec, 0xba, 0xce, 0x6c, 0x69, 0x9a, 0xa6, 0x4d, 0xd2,
+	0x9e, 0x24, 0x27, 0xc9, 0xf9, 0x94, 0x04, 0x13, 0xda, 0xb4, 0x09, 0xf8, 0x83, 0x17, 0x0e, 0xe7,
+	0x79, 0x9e, 0xdf, 0xfb, 0x9c, 0x87, 0xf3, 0xbe, 0x34, 0xfe, 0x07, 0xa6, 0x69, 0x52, 0x6d, 0xe1,
+	0x6f, 0xd5, 0xfe, 0xfd, 0x7d, 0xb9, 0xb1, 0x8b, 0x7f, 0xff, 0x52, 0xaf, 0x94, 0xd4, 0x0b, 0x56,
+	0xf3, 0xee, 0xc0, 0xce, 0x19, 0x1b, 0x6b, 0x30, 0xac, 0x60, 0x53, 0xaa, 0x63, 0xd5, 0x6c, 0x12,
+	0xbf, 0x7c, 0xa0, 0xfb, 0xe3, 0xa3, 0x87, 0xba, 0x1f, 0xab, 0x4e, 0x1c, 0x79, 0xe9, 0x91, 0x5e,
+	0xbb, 0x9e, 0x0a, 0x1a, 0x30, 0xd1, 0xac, 0x5f, 0x3f, 0x57, 0x1d, 0xaf, 0x66, 0x93, 0x38, 0x99,
+	0x35, 0xd5, 0x54, 0xc6, 0x38, 0xf5, 0xde, 0xa1, 0xee, 0x2f, 0x4d, 0x80, 0x2e, 0x17, 0x48, 0xcb,
+	0xd1, 0xb1, 0xee, 0x8e, 0x16, 0x6a, 0xb5, 0x40, 0xd4, 0x81, 0x0f, 0x2f, 0x86, 0xca, 0xef, 0x6b,
+	0xb1, 0x49, 0x9c, 0xf2, 0x50, 0xef, 0xa4, 0x64, 0x6a, 0x31, 0x29, 0x1b, 0x4f, 0x8f, 0x3c, 0x15,
+	0x98, 0x3e, 0x76, 0x24, 0xd8, 0x5e, 0x2c, 0x26, 0x4a, 0xae, 0xa5, 0xc9, 0x6d, 0x03, 0x6f, 0xb5,
+	0x25, 0x6b, 0xc9, 0xd6, 0xb3, 0x49, 0x3c, 0x36, 0x36, 0x27, 0x27, 0x72, 0x78, 0x26, 0x29, 0x43,
+	0x59, 0x95, 0x8d, 0xa0, 0xd8, 0xb9, 0xed, 0xea, 0xab, 0x8f, 0xef, 0x9e, 0xe7, 0x59, 0x42, 0x19,
+	0x86, 0x09, 0x4e, 0x70, 0x4c, 0xaf, 0x17, 0xd4, 0xa2, 0xf2, 0xa9, 0xeb, 0xb9, 0xb6, 0x94, 0x0a,
+	0x8b, 0x2e, 0x87, 0x0c, 0x93, 0xf4, 0xab, 0x8a, 0x22, 0x5b, 0x4c, 0x59, 0x6c, 0x71, 0xf1, 0xc4,
+	0xa4, 0x39, 0x10, 0xbb, 0xf8, 0xd5, 0xf1, 0x1f, 0xff, 0x3c, 0xbf, 0x3e, 0x7f, 0x2b, 0x36, 0x75,
+	0x5c, 0xe6, 0xec, 0x5f, 0x37, 0x3f, 0x52, 0x69, 0xcb, 0x34, 0x6f, 0xa4, 0xdd, 0x3e, 0x9b, 0x49,
+	0xb9, 0x78, 0x03, 0x46, 0x2e, 0x05, 0x46, 0x49, 0x0e, 0x94, 0x73, 0xea, 0xc1, 0xd4, 0x0b, 0xde,
+	0x13, 0xf4, 0x35, 0xec, 0xea, 0xeb, 0x83, 0x2d, 0x31, 0x09, 0x46, 0xcf, 0xa3, 0xf3, 0xc9, 0xa3,
+	0xb8, 0xfe, 0xd3, 0x89, 0xdb, 0xea, 0xd5, 0x94, 0xa9, 0xd9, 0x71, 0x11, 0xb7, 0xd7, 0xcb, 0xed,
+	0x7b, 0x7e, 0x18, 0xad, 0x0f, 0xbd, 0x02, 0x4f, 0xc7, 0x9d, 0xb8, 0x91, 0x50, 0xd0, 0xbe, 0xa7,
+	0x9f, 0xfe, 0xf4, 0x83, 0xd7, 0x1f, 0x2d, 0x0b, 0x6a, 0x51, 0x57, 0xac, 0x53, 0x0c, 0x95, 0x91,
+	0x56, 0x31, 0xf6, 0xf3, 0x15, 0x84, 0xf9, 0x1e, 0x5c, 0x9e, 0xb8, 0x84, 0xbc, 0x4a, 0xc1, 0xdb,
+	0x19, 0x38, 0x56, 0x4b, 0x58, 0x86, 0x2a, 0x3f, 0x6c, 0xc5, 0xa9, 0xaf, 0xbf, 0x88, 0xfb, 0x45,
+	0x4f, 0x73, 0x3c, 0xad, 0xc1, 0x2b, 0x8a, 0xe0, 0x58, 0x16, 0xd1, 0x68, 0x14, 0x0b, 0xd1, 0xa8,
+	0x09, 0xe0, 0xad, 0xc1, 0xc1, 0xc1, 0xf7, 0xb7, 0xaa, 0x2b, 0x52, 0x77, 0xc6, 0xe9, 0x82, 0xee,
+	0xfa, 0x7e, 0x7c, 0x12, 0x1e, 0x8f, 0x07, 0x0b, 0x0b, 0x0b, 0xa5, 0x82, 0xf1, 0xf1, 0x71, 0xdc,
+	0xd5, 0xd3, 0x43, 0x35, 0xba, 0xdd, 0x6f, 0x03, 0xa8, 0x29, 0xae, 0x39, 0x8a, 0xa1, 0xa1, 0xa1,
+	0x17, 0x7c, 0xad, 0x3e, 0x36, 0x14, 0x0a, 0x21, 0x9d, 0x4e, 0x57, 0x56, 0x53, 0x53, 0x13, 0x82,
+	0x81, 0x00, 0x08, 0x21, 0x7c, 0xad, 0x6e, 0x8b, 0x6c, 0x18, 0xc5, 0x9b, 0x47, 0x0e, 0x76, 0xd9,
+	0xdb, 0xee, 0xf8, 0x3c, 0xb2, 0x22, 0xf9, 0x59, 0x33, 0x2f, 0x1d, 0x7e, 0xf6, 0xc5, 0x9e, 0xb4,
+	0x94, 0xa1, 0xa6, 0xa6, 0xa6, 0x8a, 0x37, 0x5b, 0xa9, 0x80, 0x65, 0x59, 0x88, 0xa2, 0x88, 0x4c,
+	0x62, 0x21, 0xc3, 0xcf, 0x9d, 0x4d, 0x2d, 0x72, 0x5d, 0xe1, 0xb8, 0xe6, 0x4c, 0x2c, 0x27, 0x96,
+	0x07, 0x47, 0x47, 0x47, 0x2b, 0xa7, 0x72, 0xc3, 0x28, 0xf2, 0xb6, 0xe6, 0x11, 0x67, 0x63, 0xfb,
+	0xfd, 0x07, 0x2d, 0x97, 0xe0, 0x4c, 0xcf, 0x20, 0x7c, 0xfa, 0x13, 0x34, 0xee, 0x7b, 0x0e, 0x82,
+	0x20, 0x20, 0x16, 0x8b, 0x95, 0xc4, 0xc5, 0x13, 0xe5, 0x4c, 0xc4, 0xc1, 0x46, 0xbe, 0xb1, 0xdf,
+	0xee, 0x77, 0xd8, 0xfd, 0x6d, 0x0d, 0x62, 0x48, 0x6d, 0x35, 0x16, 0x97, 0x16, 0x05, 0x00, 0x5b,
+	0x8b, 0x33, 0x79, 0xe5, 0x0f, 0x2f, 0xa1, 0x0e, 0xaf, 0xb0, 0x7e, 0x78, 0xe8, 0x59, 0xd0, 0x4b,
+	0x53, 0x98, 0xfe, 0xec, 0x0d, 0x58, 0x3b, 0x76, 0xc0, 0x9f, 0x4e, 0xc0, 0x29, 0xb0, 0xb8, 0xfb,
+	0xd7, 0x14, 0xb6, 0xdd, 0xf7, 0x00, 0x26, 0x1a, 0xbc, 0xe0, 0x38, 0x15, 0xe7, 0x63, 0x3c, 0xab,
+	0x28, 0x71, 0xf3, 0xe4, 0xc9, 0x93, 0x91, 0xd2, 0xce, 0xff, 0xb1, 0xe1, 0x48, 0xcf, 0xdf, 0x8a,
+	0x5d, 0x65, 0x34, 0xf9, 0xb5, 0x64, 0x62, 0x45, 0x57, 0x73, 0x12, 0xf5, 0x4f, 0x52, 0xa3, 0x1c,
+	0x56, 0x16, 0x6d, 0x5c, 0x06, 0xa2, 0xa0, 0xa1, 0xd9, 0xa2, 0x81, 0xe3, 0x01, 0xa6, 0x40, 0x23,
+	0x2e, 0x64, 0xa0, 0x32, 0x34, 0x7e, 0xbf, 0xb6, 0x64, 0x64, 0x13, 0x11, 0x6d, 0x6a, 0xf6, 0xd6,
+	0x70, 0x59, 0x5a, 0xa4, 0x32, 0xe3, 0x27, 0x0e, 0xec, 0xba, 0xe0, 0xdf, 0xbe, 0x7b, 0xbf, 0x19,
+	0xbd, 0x6c, 0x08, 0xb9, 0x08, 0x59, 0x4a, 0x1b, 0x44, 0xd3, 0x09, 0xf6, 0x06, 0x1b, 0xe0, 0x71,
+	0xf0, 0x10, 0x38, 0x1a, 0x3e, 0x8f, 0x13, 0x3c, 0xc7, 0x40, 0x2f, 0x14, 0x70, 0x73, 0x25, 0x8b,
+	0xe3, 0xbf, 0x45, 0x40, 0x13, 0x2a, 0x4d, 0x59, 0x9c, 0x58, 0x13, 0x3a, 0x69, 0x42, 0xe9, 0xc9,
+	0x13, 0xa7, 0x2f, 0x94, 0x6e, 0xc3, 0xca, 0x8c, 0x25, 0x59, 0xeb, 0x0d, 0x08, 0x02, 0xd9, 0xe9,
+	0x5d, 0x23, 0x6b, 0x59, 0x0b, 0x78, 0x46, 0xc3, 0x4c, 0x2c, 0x8f, 0x82, 0x6a, 0xa0, 0x78, 0xab,
+	0xe9, 0x86, 0x89, 0x35, 0x49, 0x86, 0x85, 0x23, 0xb0, 0x70, 0x0c, 0xe6, 0x57, 0x32, 0xd8, 0xee,
+	0xb3, 0xa2, 0xd7, 0x67, 0x73, 0x74, 0xb4, 0xd8, 0xf0, 0x03, 0x76, 0x60, 0x72, 0x2e, 0x6a, 0x2d,
+	0x77, 0x5d, 0xf9, 0xdd, 0x1c, 0x0e, 0x3b, 0x34, 0xc3, 0xc4, 0x44, 0xae, 0x13, 0x56, 0x96, 0x2a,
+	0x2d, 0x97, 0x95, 0x46, 0x38, 0x2e, 0xa3, 0xa0, 0xe8, 0x30, 0x4c, 0x13, 0x8a, 0x61, 0x94, 0x72,
+	0xa2, 0xa9, 0x1c, 0xe2, 0x6b, 0x79, 0x58, 0x58, 0x0a, 0x3c, 0x4b, 0x30, 0x2b, 0x59, 0x11, 0xcb,
+	0x01, 0x79, 0x59, 0x32, 0xca, 0xe2, 0xca, 0x28, 0x1e, 0xbc, 0xb7, 0xeb, 0xcc, 0x92, 0x6e, 0x7f,
+	0x58, 0xd7, 0x14, 0x73, 0x4f, 0x43, 0x32, 0x17, 0x4b, 0xeb, 0xf3, 0x31, 0x49, 0xbb, 0x12, 0x5a,
+	0x94, 0xbf, 0xb3, 0xf1, 0x60, 0x86, 0x07, 0x02, 0x6a, 0x74, 0xb5, 0xe0, 0x9e, 0x8e, 0x64, 0xbb,
+	0x08, 0x21, 0x68, 0x77, 0x73, 0x7b, 0x29, 0x98, 0x81, 0x8c, 0xa2, 0xdb, 0x0a, 0xac, 0x87, 0xdc,
+	0xc8, 0x5a, 0x68, 0x81, 0xe8, 0xd2, 0x99, 0xf1, 0x09, 0x57, 0x51, 0xfe, 0x2f, 0x55, 0x29, 0xa7,
+	0x22, 0xcd, 0xa6, 0xc6, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+	0x82
 };
 
 static const unsigned char icon_tray_low_png = {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-	0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 0x08, 0x03, 0x00, 0x00, 0x00, 0xf3, 0x6a, 0x9c,
-	0x09, 0x00, 0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4d, 0x00, 0x00, 0x7a, 0x26, 0x00, 0x00, 0x80,
-	0x84, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x00, 0x80, 0xe8, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xea,
-	0x60, 0x00, 0x00, 0x3a, 0x98, 0x00, 0x00, 0x17, 0x70, 0x9c, 0xba, 0x51, 0x3c, 0x00, 0x00, 0x01,
-	0xf5, 0x50, 0x4c, 0x54, 0x45, 0xff, 0x00, 0x00, 0x62, 0x4e, 0x09, 0x66, 0x52, 0x0a, 0x64, 0x50,
-	0x0a, 0x77, 0x66, 0x10, 0x66, 0x52, 0x0d, 0x65, 0x52, 0x0c, 0x65, 0x51, 0x0b, 0x63, 0x4f, 0x09,
-	0xa4, 0x94, 0x24, 0x8d, 0x7d, 0x18, 0x70, 0x5e, 0x0d, 0x95, 0x8b, 0x46, 0xd7, 0xda, 0x92, 0xd5,
-	0xd3, 0x7b, 0xce, 0xc9, 0x62, 0xc2, 0xb5, 0x42, 0xad, 0x9e, 0x2b, 0x85, 0x74, 0x17, 0x67, 0x53,
-	0x0b, 0x77, 0x64, 0x11, 0xa3, 0x93, 0x23, 0x7d, 0x6b, 0x13, 0x9b, 0x92, 0x4b, 0xcf, 0xce, 0x7f,
-	0xe0, 0xdd, 0x79, 0xd8, 0xd1, 0x62, 0xc6, 0xbb, 0x42, 0x91, 0x80, 0x22, 0x7b, 0x69, 0x14, 0x73,
-	0x61, 0x10, 0x69, 0x55, 0x0b, 0x87, 0x75, 0x17, 0xb4, 0xa4, 0x2f, 0xac, 0xa0, 0x3c, 0xc5, 0xbf,
-	0x61, 0xce, 0xc8, 0x65, 0xae, 0xa1, 0x3c, 0x94, 0x84, 0x29, 0x8a, 0x79, 0x1a, 0x72, 0x5f, 0x10,
-	0x6e, 0x5b, 0x0e, 0xa4, 0x94, 0x23, 0xc1, 0xb2, 0x36, 0xc7, 0xbd, 0x4a, 0xbe, 0xb2, 0x46, 0xa0,
-	0x90, 0x2d, 0x7b, 0x68, 0x13, 0x74, 0x61, 0x10, 0xc3, 0xb4, 0x30, 0xbb, 0xac, 0x2d, 0x9f, 0x90,
-	0x23, 0x97, 0x87, 0x29, 0x8b, 0x7a, 0x28, 0x76, 0x63, 0x1a, 0xbb, 0xac, 0x2e, 0xba, 0xab, 0x2d,
-	0x7f, 0x70, 0x1d, 0xa9, 0x9e, 0x54, 0xcd, 0xbe, 0x76, 0xa5, 0x8f, 0x4d, 0x7f, 0x6c, 0x19, 0x69,
-	0x56, 0x0d, 0x75, 0x62, 0x12, 0xc8, 0xb9, 0x38, 0xbc, 0xad, 0x2e, 0xcc, 0xc1, 0x65, 0xea, 0xe6,
-	0xbe, 0xd5, 0xa0, 0xf1, 0x96, 0x30, 0xc4, 0x92, 0x88, 0x41, 0x9f, 0x8f, 0x2a, 0x4e, 0x4d, 0x38,
-	0x32, 0x37, 0x3d, 0x76, 0x64, 0x14, 0xcf, 0xc3, 0x46, 0xd1, 0xc7, 0x4f, 0xd7, 0xce, 0x5f, 0xe5,
-	0xe2, 0xb1, 0xb2, 0xa4, 0xbb, 0x6b, 0x4e, 0x60, 0xb7, 0xaa, 0x3c, 0xc1, 0xba, 0x45, 0xbc, 0xbc,
-	0x88, 0xc7, 0xc8, 0xbc, 0xba, 0xbb, 0xbc, 0x86, 0x89, 0x8a, 0x78, 0x66, 0x19, 0xd9, 0xd3, 0x60,
-	0xe2, 0xe2, 0x87, 0xde, 0xda, 0x71, 0xde, 0xd8, 0x7f, 0xbc, 0xb5, 0x6d, 0x93, 0x88, 0x34, 0xc0,
-	0xb3, 0x36, 0xc4, 0xbe, 0x51, 0xa5, 0xa4, 0x7f, 0x82, 0x82, 0x7b, 0xa6, 0xa7, 0xa5, 0xb3, 0xb5,
-	0xb5, 0x65, 0x51, 0x0a, 0x7c, 0x6c, 0x1b, 0xdc, 0xd6, 0x66, 0xe3, 0xe4, 0x8b, 0xe0, 0xde, 0x77,
-	0xd9, 0xd2, 0x5f, 0xc7, 0xbb, 0x44, 0xb3, 0xa3, 0x2c, 0xb4, 0xa7, 0x30, 0xbf, 0xb9, 0x64, 0x9d,
-	0x9d, 0x89, 0x6c, 0x6d, 0x6b, 0x9c, 0x9c, 0x9b, 0xbd, 0xbe, 0xc0, 0x66, 0x53, 0x0a, 0x7e, 0x6e,
-	0x18, 0xca, 0xc0, 0x4c, 0xd8, 0xd1, 0x60, 0xda, 0xd4, 0x63, 0xd3, 0xca, 0x51, 0xc2, 0xb5, 0x39,
-	0xae, 0x9e, 0x29, 0xa8, 0x99, 0x2d, 0xbf, 0xba, 0x80, 0xca, 0xc9, 0xbb, 0xbd, 0xbd, 0xbb, 0xcb,
-	0xcb, 0xc9, 0xb3, 0xb5, 0xb6, 0x67, 0x54, 0x0a, 0x78, 0x67, 0x11, 0x9e, 0x8e, 0x22, 0xbd, 0xb1,
-	0x3d, 0xc2, 0xb6, 0x41, 0xbd, 0xaf, 0x35, 0xb0, 0xa0, 0x28, 0xa1, 0x92, 0x25, 0xa2, 0x95, 0x38,
-	0xbd, 0xbb, 0x96, 0xd5, 0xd5, 0xcb, 0xdb, 0xdc, 0xd9, 0xd4, 0xd5, 0xd3, 0xa4, 0xa6, 0xa6, 0x6c,
-	0x59, 0x0c, 0x7a, 0x69, 0x10, 0x68, 0x59, 0x23, 0x77, 0x78, 0x76, 0x9c, 0x9d, 0x9b, 0xa7, 0xa8,
-	0xa5, 0x73, 0x76, 0x77, 0x37, 0x3c, 0x41, 0x70, 0x5d, 0x0e, 0x8d, 0x7d, 0x19, 0x9d, 0x8e, 0x21,
-	0x99, 0x87, 0x1f, 0x82, 0x6f, 0x15, 0x6c, 0x59, 0x0d, 0x3e, 0x43, 0x48, 0x45, 0x4a, 0x4e, 0x47,
-	0x4c, 0x50, 0x47, 0x4b, 0x50, 0x44, 0x48, 0x4d, 0x94, 0x84, 0x1c, 0xb9, 0xac, 0x2b, 0xb3, 0xa4,
-	0x2a, 0x9a, 0x89, 0x1f, 0x76, 0x64, 0x11, 0xff, 0xff, 0xff, 0xb5, 0x34, 0x74, 0x63, 0x00, 0x00,
-	0x00, 0x01, 0x62, 0x4b, 0x47, 0x44, 0xa6, 0xb7, 0xb0, 0x1b, 0x95, 0x00, 0x00, 0x00, 0x07, 0x74,
-	0x49, 0x4d, 0x45, 0x07, 0xea, 0x05, 0x07, 0x15, 0x1c, 0x21, 0x9e, 0xcf, 0x09, 0x15, 0x00, 0x00,
-	0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x63, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x00, 0x32, 0x30, 0x32, 0x36, 0x2d, 0x30, 0x35, 0x2d, 0x30, 0x37, 0x54, 0x32, 0x31, 0x3a,
-	0x32, 0x35, 0x3a, 0x34, 0x30, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0xbb, 0xe9, 0x28, 0xea, 0x00,
-	0x00, 0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x6d, 0x6f, 0x64, 0x69,
-	0x66, 0x79, 0x00, 0x32, 0x30, 0x32, 0x36, 0x2d, 0x30, 0x35, 0x2d, 0x30, 0x37, 0x54, 0x32, 0x31,
-	0x3a, 0x32, 0x35, 0x3a, 0x34, 0x30, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0xca, 0xb4, 0x90, 0x56,
-	0x00, 0x00, 0x00, 0x28, 0x74, 0x45, 0x58, 0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x74, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x00, 0x32, 0x30, 0x32, 0x36, 0x2d, 0x30, 0x35, 0x2d, 0x30,
-	0x37, 0x54, 0x32, 0x31, 0x3a, 0x32, 0x38, 0x3a, 0x33, 0x33, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30,
-	0x53, 0x72, 0x29, 0xbd, 0x00, 0x00, 0x00, 0xf1, 0x49, 0x44, 0x41, 0x54, 0x18, 0xd3, 0x63, 0x60,
-	0xa0, 0x1a, 0x60, 0x24, 0x45, 0x98, 0x91, 0x09, 0xab, 0x28, 0x33, 0x0b, 0x03, 0x03, 0x2b, 0x1b,
-	0x1b, 0x3b, 0x33, 0x07, 0x23, 0x92, 0x3e, 0x66, 0x4e, 0x2e, 0x6e, 0x1e, 0x5e, 0x3e, 0x7e, 0x01,
-	0x41, 0x21, 0x24, 0x51, 0x61, 0x11, 0x51, 0x31, 0x71, 0x09, 0x49, 0x29, 0x69, 0x19, 0x59, 0x39,
-	0x24, 0x33, 0xe4, 0x15, 0x14, 0x95, 0x94, 0x55, 0x54, 0xd5, 0xd4, 0x35, 0x50, 0x8c, 0xd6, 0xd4,
-	0xd2, 0xd6, 0xd1, 0xd5, 0xd3, 0x67, 0x44, 0x75, 0x0e, 0xa3, 0x81, 0xa1, 0x91, 0xb1, 0x89, 0xa9,
-	0x19, 0x9a, 0x33, 0x18, 0x35, 0xcc, 0x2d, 0x2c, 0xad, 0xac, 0x6d, 0x6c, 0xed, 0x50, 0x25, 0xec,
-	0x1d, 0x1c, 0x9d, 0x9c, 0x5d, 0x5c, 0xdd, 0xdc, 0x3d, 0x3c, 0x3d, 0x3d, 0x11, 0xaa, 0xbd, 0xbc,
-	0x7d, 0x7c, 0xfd, 0xfc, 0x03, 0x02, 0x83, 0x82, 0x43, 0x42, 0xc3, 0x10, 0xe2, 0xe1, 0x11, 0x91,
-	0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, 0x09, 0x89, 0x49, 0xc9, 0x70, 0xe1, 0x94, 0xd4, 0xb4, 0xf4,
-	0x8c, 0xcc, 0xac, 0xec, 0x9c, 0xdc, 0xbc, 0xfc, 0x82, 0x42, 0x98, 0x30, 0x63, 0x51, 0x71, 0x49,
-	0x69, 0x59, 0x79, 0x45, 0x65, 0x55, 0x75, 0x4d, 0x6d, 0x5d, 0x3d, 0x5c, 0xb8, 0xa1, 0xb1, 0xa9,
-	0xb9, 0xa5, 0xb5, 0xad, 0xbd, 0xa3, 0xb3, 0xab, 0xbb, 0xa7, 0x17, 0x2e, 0xdc, 0xd7, 0xcf, 0xcc,
-	0xce, 0x9e, 0xc2, 0x3c, 0x61, 0xe2, 0xa4, 0xc9, 0x93, 0xa7, 0x4c, 0x85, 0xdb, 0x38, 0x6d, 0xfa,
-	0x8c, 0x99, 0xb3, 0x66, 0x33, 0x32, 0xcc, 0x99, 0x3b, 0x6f, 0xfe, 0x02, 0x84, 0x77, 0xa6, 0x2d,
-	0x5c, 0xb4, 0x78, 0xc9, 0x52, 0xb4, 0x88, 0x00, 0x00, 0xf0, 0xf3, 0x39, 0x69, 0x8c, 0x20, 0x60,
-	0x7c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+	0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c,
+	0x3b, 0x00, 0x00, 0x01, 0x7d, 0x69, 0x43, 0x43, 0x50, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6f,
+	0x66, 0x69, 0x6c, 0x65, 0x00, 0x00, 0x28, 0x91, 0x95, 0x91, 0xbd, 0x4b, 0x42, 0x51, 0x18, 0xc6,
+	0x7f, 0xf7, 0x5a, 0x24, 0xa1, 0x34, 0x64, 0x10, 0xd1, 0x70, 0x07, 0x6b, 0xca, 0xa5, 0x22, 0x1a,
+	0xcd, 0x02, 0x09, 0x0a, 0xc4, 0x0c, 0xb4, 0x1a, 0xba, 0x1f, 0x69, 0x82, 0xf7, 0x2a, 0xf7, 0x5e,
+	0x69, 0x71, 0x0c, 0x5a, 0x83, 0x86, 0x3e, 0x96, 0xac, 0x86, 0x96, 0xe6, 0x5a, 0x1b, 0x5a, 0x83,
+	0x20, 0xe8, 0x03, 0xa2, 0x3f, 0x20, 0x9a, 0x8a, 0x5a, 0x22, 0x6e, 0x1c, 0x15, 0x94, 0xc0, 0xa0,
+	0x77, 0x39, 0x3f, 0x9e, 0x73, 0x9e, 0x97, 0xf7, 0x7d, 0x0e, 0xc8, 0xd5, 0x82, 0x6e, 0x3a, 0x1d,
+	0x51, 0x30, 0x2d, 0xd7, 0x4e, 0xc6, 0x63, 0x4a, 0x3a, 0xb3, 0xa4, 0x74, 0xbd, 0xe0, 0x27, 0x44,
+	0x07, 0x3e, 0xfa, 0x54, 0xdd, 0x29, 0x4d, 0x25, 0x12, 0x73, 0xb4, 0xad, 0xcf, 0x3b, 0x24, 0x71,
+	0xde, 0x46, 0x44, 0x2f, 0xfe, 0x57, 0x41, 0x63, 0xcd, 0xd1, 0x41, 0x52, 0x80, 0xa8, 0x5e, 0xb2,
+	0x5d, 0x90, 0x56, 0x81, 0x89, 0x0d, 0xb7, 0x24, 0x78, 0x0f, 0x08, 0xe9, 0xeb, 0xaa, 0x01, 0xd2,
+	0x19, 0x30, 0x62, 0xa7, 0x33, 0x4b, 0x20, 0x3d, 0x08, 0x5d, 0xab, 0xf3, 0xab, 0xe0, 0x5c, 0x8d,
+	0x65, 0xd1, 0x33, 0x64, 0xa7, 0x92, 0xd3, 0x20, 0x87, 0x00, 0x25, 0xd7, 0xc2, 0x5a, 0x0b, 0xeb,
+	0xeb, 0xb6, 0x09, 0xf2, 0x38, 0x10, 0x36, 0x4c, 0xcb, 0x00, 0x39, 0x5d, 0x67, 0x43, 0x70, 0x45,
+	0xb0, 0x59, 0x28, 0xeb, 0x8d, 0x39, 0xc5, 0x86, 0x81, 0x35, 0x6b, 0x71, 0x41, 0xe8, 0xc0, 0x20,
+	0x71, 0x66, 0x99, 0x27, 0x81, 0x82, 0x46, 0x99, 0x3c, 0x05, 0x5c, 0x22, 0xe4, 0xb1, 0x50, 0x70,
+	0x48, 0x12, 0x27, 0xd6, 0xc6, 0x3f, 0x50, 0xf3, 0x27, 0x28, 0xa3, 0x51, 0x20, 0x8f, 0x8e, 0xc2,
+	0x0c, 0x45, 0x4c, 0xd4, 0x9a, 0x1f, 0xf1, 0x07, 0xfc, 0xca, 0xd6, 0xc9, 0x8e, 0x8d, 0xd6, 0x3b,
+	0x05, 0x62, 0xd0, 0xf9, 0xec, 0x79, 0xef, 0x43, 0xd0, 0xb5, 0x03, 0xdf, 0xdb, 0x9e, 0xf7, 0x75,
+	0xe4, 0x79, 0xdf, 0xc7, 0xe0, 0x7b, 0x82, 0x4b, 0xab, 0xe9, 0x2f, 0x56, 0x61, 0xf2, 0x03, 0x7c,
+	0xdb, 0x4d, 0x2d, 0x7c, 0x08, 0x3d, 0x9b, 0x70, 0x7e, 0xd5, 0xd4, 0xb4, 0x5d, 0xb8, 0xd8, 0x82,
+	0xfe, 0xc7, 0x92, 0x6a, 0xab, 0x35, 0xc9, 0x07, 0xc8, 0xd9, 0x2c, 0xbc, 0x9d, 0x42, 0x30, 0x03,
+	0xbd, 0x37, 0xd0, 0xbd, 0x5c, 0xcf, 0xad, 0x71, 0xcf, 0xc9, 0x3d, 0xa4, 0x2a, 0x30, 0x77, 0x0d,
+	0xfb, 0x07, 0x30, 0x9c, 0x83, 0x9e, 0x95, 0x36, 0x7b, 0xfb, 0x5b, 0x73, 0xfb, 0xf3, 0x4d, 0x23,
+	0xbf, 0x1f, 0x2e, 0xdf, 0x72, 0x8b, 0x6e, 0x19, 0x87, 0xbd, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48,
+	0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00,
+	0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xea, 0x08, 0x14, 0x04, 0x29, 0x0e, 0x30, 0xf7,
+	0x03, 0x7d, 0x00, 0x00, 0x03, 0xff, 0x49, 0x44, 0x41, 0x54, 0x38, 0x4f, 0x95, 0x94, 0x5b, 0x68,
+	0x1c, 0x65, 0x14, 0xc7, 0xff, 0xdf, 0x37, 0x33, 0x7b, 0x99, 0xcd, 0x66, 0xb3, 0xb7, 0x64, 0xb7,
+	0x9b, 0x6b, 0x9b, 0x6c, 0x4c, 0x62, 0x42, 0xa1, 0x4d, 0x4b, 0x52, 0xa4, 0xe0, 0xa5, 0x45, 0x2b,
+	0x16, 0x5b, 0xa4, 0x45, 0x14, 0xa9, 0xb6, 0x0f, 0x1a, 0x50, 0x5f, 0x4b, 0x09, 0x82, 0x7d, 0xd0,
+	0x17, 0xb5, 0x0f, 0x8a, 0xa8, 0x48, 0x9e, 0x84, 0x28, 0x01, 0x15, 0x4c, 0x5b, 0x1b, 0x5a, 0xb1,
+	0xa5, 0x11, 0x24, 0xb6, 0x69, 0x6a, 0xb2, 0x09, 0xb6, 0x0d, 0x49, 0xdc, 0x6c, 0x76, 0x33, 0xbb,
+	0x49, 0xf6, 0x9e, 0xd9, 0x99, 0xf9, 0x64, 0x03, 0xb3, 0x6c, 0x37, 0xd9, 0x05, 0x7f, 0x30, 0x0f,
+	0x73, 0xce, 0xf9, 0x7e, 0x9c, 0x73, 0x98, 0xf9, 0x38, 0xfc, 0x0f, 0x18, 0x63, 0xa4, 0x99, 0x1f,
+	0xcd, 0x3d, 0xdb, 0xd7, 0x97, 0xb9, 0x72, 0x2b, 0x30, 0x5e, 0xe9, 0x28, 0xad, 0x94, 0x2c, 0xe5,
+	0xe2, 0x3b, 0x07, 0x02, 0x56, 0x8b, 0xc2, 0xf3, 0x26, 0x8b, 0x5c, 0x9a, 0x2b, 0x65, 0x9b, 0xf8,
+	0xbd, 0x97, 0x3b, 0x2e, 0x5d, 0x7c, 0xb5, 0xe3, 0xa5, 0xd2, 0xc2, 0x4b, 0xef, 0xbe, 0xd8, 0xe3,
+	0xb6, 0x45, 0xfc, 0x2a, 0x03, 0xea, 0x94, 0x87, 0xd7, 0x4a, 0xf3, 0xa5, 0x6c, 0x13, 0xc7, 0xe2,
+	0xc8, 0x6d, 0x50, 0xf5, 0xe7, 0x8f, 0xcf, 0x3d, 0x31, 0xcc, 0x9a, 0x6d, 0x9c, 0x7e, 0x20, 0xa1,
+	0x85, 0xae, 0x34, 0x36, 0x7a, 0x48, 0x6c, 0x43, 0xc8, 0x9d, 0xf8, 0xf0, 0xf6, 0xac, 0x1e, 0x2f,
+	0xc7, 0x76, 0xb1, 0x99, 0x7c, 0x10, 0x8b, 0xd1, 0x50, 0x54, 0xd6, 0x4e, 0x7d, 0xf1, 0x8a, 0x67,
+	0xe6, 0x9b, 0x33, 0x5d, 0x0d, 0xf9, 0xc3, 0x06, 0x9a, 0xac, 0xb5, 0xd9, 0xab, 0x21, 0x08, 0x96,
+	0x58, 0x39, 0x59, 0x31, 0xdb, 0xc4, 0xa3, 0xbf, 0xcc, 0xa4, 0x25, 0x89, 0x9c, 0x8e, 0xad, 0x11,
+	0x79, 0x3d, 0xc5, 0xfc, 0xb5, 0x07, 0x9b, 0xa6, 0xdf, 0x3f, 0xd3, 0xff, 0xc8, 0x68, 0xa0, 0x04,
+	0x4c, 0x83, 0xc0, 0x55, 0xcf, 0x14, 0x0b, 0xca, 0x51, 0x18, 0xb5, 0x98, 0xb9, 0xa0, 0xb4, 0xe0,
+	0xb5, 0x39, 0xd2, 0x0c, 0xf4, 0x88, 0x22, 0xcb, 0x69, 0x8b, 0x29, 0xe5, 0x71, 0xd7, 0x1a, 0xa8,
+	0x06, 0x23, 0xa0, 0x78, 0xbf, 0x1f, 0x19, 0x9b, 0xbc, 0x5e, 0x5c, 0xbf, 0x13, 0xdb, 0x3a, 0xd6,
+	0xb9, 0xfc, 0xe7, 0x3f, 0x9f, 0x6e, 0x2a, 0xe6, 0x99, 0x2a, 0x71, 0xdd, 0xde, 0x58, 0x27, 0x13,
+	0x97, 0x2d, 0x07, 0x1e, 0xab, 0x10, 0x4c, 0xd1, 0x93, 0x7a, 0x4d, 0x25, 0xca, 0x8a, 0xf3, 0x74,
+	0x77, 0x79, 0x6c, 0xfe, 0x7d, 0x6f, 0xa0, 0xb1, 0xad, 0x1b, 0x75, 0x5e, 0x1f, 0x7a, 0x8f, 0x7d,
+	0x0d, 0x57, 0x43, 0xd7, 0xee, 0x4a, 0x42, 0x9d, 0x8a, 0x62, 0x9b, 0xdb, 0x63, 0x78, 0xee, 0xe4,
+	0x20, 0x1a, 0x9f, 0x7c, 0x1b, 0x46, 0xdb, 0x3e, 0x2c, 0x86, 0x32, 0x68, 0xee, 0x7a, 0x9a, 0xfb,
+	0xf6, 0x93, 0xf3, 0xcf, 0xeb, 0x82, 0x72, 0x54, 0x14, 0x2b, 0x8c, 0x27, 0xc9, 0xc4, 0x1a, 0xc6,
+	0x7e, 0xfb, 0x0b, 0xd1, 0x4c, 0x13, 0x26, 0xef, 0x4c, 0x40, 0x96, 0x19, 0x6a, 0x77, 0xfb, 0xbf,
+	0x2a, 0x27, 0xd4, 0xa9, 0x28, 0xf6, 0xed, 0x79, 0x06, 0x73, 0x81, 0xbb, 0xa8, 0x6f, 0xee, 0x81,
+	0xcd, 0x7b, 0x00, 0x7d, 0x4f, 0x1d, 0xc3, 0x7c, 0x10, 0x90, 0xd6, 0x51, 0x3f, 0x34, 0x34, 0x74,
+	0x5e, 0x97, 0xec, 0x04, 0xbf, 0x53, 0x50, 0x27, 0x91, 0x56, 0x6b, 0x66, 0x7f, 0x9f, 0x80, 0xc3,
+	0xe1, 0x44, 0x30, 0x18, 0xdc, 0x0a, 0x8f, 0x8f, 0x8f, 0xa3, 0xa3, 0xb3, 0x93, 0x38, 0xec, 0xf6,
+	0x41, 0x00, 0x1f, 0xe9, 0xb5, 0xa5, 0x94, 0xed, 0x78, 0x60, 0x60, 0xe0, 0x9c, 0x67, 0x97, 0x57,
+	0x98, 0x9d, 0x9d, 0x43, 0x32, 0x99, 0x28, 0x3c, 0x2e, 0x97, 0x0b, 0xfe, 0xb6, 0x36, 0x50, 0x4a,
+	0x8d, 0xa5, 0xb2, 0x62, 0x48, 0xf1, 0xcb, 0x85, 0xd7, 0x8f, 0xb6, 0x58, 0x9a, 0xda, 0xbf, 0x5b,
+	0x8e, 0xc4, 0x7d, 0x1c, 0xd9, 0x8c, 0x1f, 0x3f, 0x7d, 0xb6, 0x2b, 0x19, 0x4f, 0x92, 0xa9, 0xa9,
+	0x7b, 0xf9, 0x9b, 0x6d, 0xab, 0x54, 0x10, 0x04, 0xd4, 0xd5, 0x79, 0x90, 0xd8, 0x08, 0x25, 0x4d,
+	0xf1, 0x6b, 0x6b, 0xcb, 0xc9, 0x96, 0x05, 0x29, 0x65, 0x89, 0x4a, 0xb1, 0xe8, 0x9b, 0xc3, 0xc3,
+	0xc3, 0x85, 0xbf, 0xf2, 0xb1, 0x55, 0x64, 0xac, 0xee, 0xcf, 0x6c, 0x55, 0xbe, 0xbe, 0xc3, 0x3e,
+	0x09, 0xf5, 0x35, 0x77, 0x30, 0x33, 0xf1, 0x25, 0x5c, 0xed, 0xaf, 0x41, 0x14, 0x45, 0xac, 0xac,
+	0x84, 0xb7, 0xc4, 0x1c, 0x01, 0x6c, 0xe9, 0x30, 0x1c, 0xc6, 0x9f, 0xaa, 0xf6, 0xb4, 0x5a, 0xaa,
+	0x5c, 0xb9, 0x5e, 0xcf, 0xfc, 0xaa, 0x53, 0x5b, 0x89, 0x84, 0x45, 0x00, 0x3b, 0x8b, 0x53, 0x19,
+	0x79, 0x0a, 0x94, 0x1c, 0x97, 0x32, 0xbb, 0xd0, 0xe2, 0xbc, 0x0b, 0x8f, 0xe9, 0x36, 0x02, 0x37,
+	0xa7, 0x41, 0xab, 0xf7, 0xc2, 0x6b, 0x90, 0x60, 0xb5, 0x0a, 0x78, 0x2b, 0x75, 0x0b, 0x21, 0xef,
+	0x59, 0x3c, 0xc8, 0x39, 0xc1, 0x09, 0x0c, 0x13, 0xf7, 0x21, 0xe4, 0xe4, 0x08, 0x1b, 0x19, 0x19,
+	0xf9, 0xb7, 0x78, 0xfa, 0xc7, 0x3a, 0x1e, 0x1d, 0x1b, 0xff, 0xfc, 0x60, 0x2c, 0x7e, 0xa1, 0xc6,
+	0x4a, 0xb5, 0xac, 0x64, 0xe0, 0x24, 0xc9, 0x4a, 0xdc, 0x4e, 0x8a, 0x26, 0xfb, 0x1c, 0x44, 0x33,
+	0x85, 0xd9, 0xc8, 0x23, 0x94, 0x74, 0x23, 0x91, 0x8d, 0x22, 0xcb, 0x1b, 0x91, 0x4e, 0x70, 0x58,
+	0x59, 0xbc, 0xa7, 0xa9, 0x9a, 0xa2, 0x14, 0x4b, 0xf3, 0x14, 0x76, 0x7c, 0xe2, 0x85, 0xbe, 0x1b,
+	0xf5, 0x2d, 0x7b, 0x0f, 0xab, 0xc9, 0xfb, 0x5a, 0x8d, 0x69, 0x89, 0x86, 0x22, 0xa0, 0x4a, 0x8e,
+	0xe2, 0xd0, 0x7e, 0x11, 0x4e, 0xbb, 0x01, 0xa2, 0x89, 0x83, 0xdd, 0xe1, 0x02, 0xe1, 0x44, 0x08,
+	0x2c, 0x8e, 0x70, 0x64, 0x0d, 0x3f, 0x5c, 0x5d, 0x05, 0x47, 0x49, 0x42, 0xa3, 0xd5, 0x88, 0xab,
+	0xf5, 0x1c, 0x21, 0x5a, 0x6c, 0xe4, 0xc7, 0x5f, 0xb7, 0x6e, 0xc3, 0x42, 0xc7, 0x89, 0x94, 0xd2,
+	0x23, 0x8a, 0x22, 0xed, 0xef, 0x8c, 0xd0, 0x8d, 0x38, 0x85, 0x91, 0x07, 0xa6, 0x1f, 0xaa, 0xd8,
+	0x94, 0x19, 0x34, 0x8d, 0x41, 0xd5, 0x18, 0xe4, 0x54, 0x0c, 0x26, 0xf3, 0x3a, 0x18, 0x6f, 0xc6,
+	0x83, 0x60, 0x06, 0x1d, 0xad, 0x02, 0xf6, 0xb7, 0xf3, 0x56, 0x8f, 0xd7, 0x84, 0xb1, 0xbf, 0xbb,
+	0x31, 0x19, 0x08, 0x9a, 0xf5, 0xce, 0x0b, 0x9f, 0x5b, 0x95, 0xd5, 0x02, 0x45, 0x65, 0xb8, 0x39,
+	0xed, 0x87, 0xc5, 0xcc, 0x60, 0x31, 0x03, 0x76, 0x2b, 0xc1, 0xc2, 0x52, 0x16, 0xf2, 0xa6, 0xba,
+	0x25, 0xdf, 0x54, 0x81, 0xfc, 0xd0, 0x11, 0x29, 0x89, 0x48, 0x54, 0x86, 0xc9, 0x44, 0x60, 0x30,
+	0x52, 0x4c, 0xcf, 0x57, 0x23, 0xbc, 0xc1, 0x90, 0xc9, 0x24, 0x34, 0x5d, 0x5c, 0x58, 0xc5, 0x91,
+	0x43, 0x1d, 0x57, 0xa5, 0x8c, 0xf9, 0xa8, 0xaa, 0xe6, 0x58, 0x6f, 0xeb, 0x7a, 0x66, 0x39, 0xc2,
+	0x1e, 0x85, 0x25, 0x6d, 0x72, 0x69, 0x55, 0x1e, 0x13, 0x78, 0xc2, 0x0f, 0x9e, 0xf2, 0xe6, 0x96,
+	0xd7, 0x64, 0x7b, 0x60, 0x29, 0xdb, 0x42, 0x09, 0x41, 0x83, 0x8f, 0xef, 0xa7, 0xbc, 0xd6, 0x96,
+	0xc8, 0x32, 0x4b, 0x3a, 0xe7, 0xa4, 0x8b, 0xab, 0x06, 0xce, 0xcc, 0x6b, 0xf1, 0xcb, 0xd7, 0xff,
+	0xa8, 0xc9, 0xcb, 0xff, 0x03, 0x82, 0x7e, 0x94, 0xfb, 0xdc, 0x6e, 0xf0, 0x48, 0x00, 0x00, 0x00,
+	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
 };
 
 static const unsigned char icon_flag_ad_png = {
@@ -13778,264 +30613,494 @@
 };
 
 static const struct AMuleIconEntry icons = {
-	{ "amule", icon_amule_png, sizeof icon_amule_png },
-	{ "chat", icon_chat_png, sizeof icon_chat_png },
-	{ "sort_dn", icon_sort_dn_png, sizeof icon_sort_dn_png },
-	{ "sort_dnx2", icon_sort_dnx2_png, sizeof icon_sort_dnx2_png },
-	{ "sort_up", icon_sort_up_png, sizeof icon_sort_up_png },
-	{ "sort_upx2", icon_sort_upx2_png, sizeof icon_sort_upx2_png },
-	{ "tray_disconnected", icon_tray_disconnected_png, sizeof icon_tray_disconnected_png },
-	{ "tray_high", icon_tray_high_png, sizeof icon_tray_high_png },
-	{ "tray_low", icon_tray_low_png, sizeof icon_tray_low_png },
-	{ "flag_ad", icon_flag_ad_png, sizeof icon_flag_ad_png },
-	{ "flag_ae", icon_flag_ae_png, sizeof icon_flag_ae_png },
-	{ "flag_af", icon_flag_af_png, sizeof icon_flag_af_png },
-	{ "flag_ag", icon_flag_ag_png, sizeof icon_flag_ag_png },
-	{ "flag_ai", icon_flag_ai_png, sizeof icon_flag_ai_png },
-	{ "flag_al", icon_flag_al_png, sizeof icon_flag_al_png },
-	{ "flag_am", icon_flag_am_png, sizeof icon_flag_am_png },
-	{ "flag_an", icon_flag_an_png, sizeof icon_flag_an_png },
-	{ "flag_ao", icon_flag_ao_png, sizeof icon_flag_ao_png },
-	{ "flag_ar", icon_flag_ar_png, sizeof icon_flag_ar_png },
-	{ "flag_as", icon_flag_as_png, sizeof icon_flag_as_png },
-	{ "flag_at", icon_flag_at_png, sizeof icon_flag_at_png },
-	{ "flag_au", icon_flag_au_png, sizeof icon_flag_au_png },
-	{ "flag_aw", icon_flag_aw_png, sizeof icon_flag_aw_png },
-	{ "flag_ax", icon_flag_ax_png, sizeof icon_flag_ax_png },
-	{ "flag_az", icon_flag_az_png, sizeof icon_flag_az_png },
-	{ "flag_ba", icon_flag_ba_png, sizeof icon_flag_ba_png },
-	{ "flag_bb", icon_flag_bb_png, sizeof icon_flag_bb_png },
-	{ "flag_bd", icon_flag_bd_png, sizeof icon_flag_bd_png },
-	{ "flag_be", icon_flag_be_png, sizeof icon_flag_be_png },
-	{ "flag_bf", icon_flag_bf_png, sizeof icon_flag_bf_png },
-	{ "flag_bg", icon_flag_bg_png, sizeof icon_flag_bg_png },
-	{ "flag_bh", icon_flag_bh_png, sizeof icon_flag_bh_png },
-	{ "flag_bi", icon_flag_bi_png, sizeof icon_flag_bi_png },
-	{ "flag_bj", icon_flag_bj_png, sizeof icon_flag_bj_png },
-	{ "flag_bm", icon_flag_bm_png, sizeof icon_flag_bm_png },
-	{ "flag_bn", icon_flag_bn_png, sizeof icon_flag_bn_png },
-	{ "flag_bo", icon_flag_bo_png, sizeof icon_flag_bo_png },
-	{ "flag_bq", icon_flag_bq_png, sizeof icon_flag_bq_png },
-	{ "flag_br", icon_flag_br_png, sizeof icon_flag_br_png },
-	{ "flag_bs", icon_flag_bs_png, sizeof icon_flag_bs_png },
-	{ "flag_bt", icon_flag_bt_png, sizeof icon_flag_bt_png },
-	{ "flag_bv", icon_flag_bv_png, sizeof icon_flag_bv_png },
-	{ "flag_bw", icon_flag_bw_png, sizeof icon_flag_bw_png },
-	{ "flag_by", icon_flag_by_png, sizeof icon_flag_by_png },
-	{ "flag_bz", icon_flag_bz_png, sizeof icon_flag_bz_png },
-	{ "flag_ca", icon_flag_ca_png, sizeof icon_flag_ca_png },
-	{ "flag_cc", icon_flag_cc_png, sizeof icon_flag_cc_png },
-	{ "flag_cd", icon_flag_cd_png, sizeof icon_flag_cd_png },
-	{ "flag_cf", icon_flag_cf_png, sizeof icon_flag_cf_png },
-	{ "flag_cg", icon_flag_cg_png, sizeof icon_flag_cg_png },
-	{ "flag_ch", icon_flag_ch_png, sizeof icon_flag_ch_png },
-	{ "flag_ci", icon_flag_ci_png, sizeof icon_flag_ci_png },
-	{ "flag_ck", icon_flag_ck_png, sizeof icon_flag_ck_png },
-	{ "flag_cl", icon_flag_cl_png, sizeof icon_flag_cl_png },
-	{ "flag_cm", icon_flag_cm_png, sizeof icon_flag_cm_png },
-	{ "flag_cn", icon_flag_cn_png, sizeof icon_flag_cn_png },
-	{ "flag_co", icon_flag_co_png, sizeof icon_flag_co_png },
-	{ "flag_cr", icon_flag_cr_png, sizeof icon_flag_cr_png },
-	{ "flag_cu", icon_flag_cu_png, sizeof icon_flag_cu_png },
-	{ "flag_cv", icon_flag_cv_png, sizeof icon_flag_cv_png },
-	{ "flag_cw", icon_flag_cw_png, sizeof icon_flag_cw_png },
-	{ "flag_cx", icon_flag_cx_png, sizeof icon_flag_cx_png },
-	{ "flag_cy", icon_flag_cy_png, sizeof icon_flag_cy_png },
-	{ "flag_cz", icon_flag_cz_png, sizeof icon_flag_cz_png },
-	{ "flag_de", icon_flag_de_png, sizeof icon_flag_de_png },
-	{ "flag_dj", icon_flag_dj_png, sizeof icon_flag_dj_png },
-	{ "flag_dk", icon_flag_dk_png, sizeof icon_flag_dk_png },
-	{ "flag_dm", icon_flag_dm_png, sizeof icon_flag_dm_png },
-	{ "flag_do", icon_flag_do_png, sizeof icon_flag_do_png },
-	{ "flag_dz", icon_flag_dz_png, sizeof icon_flag_dz_png },
-	{ "flag_ec", icon_flag_ec_png, sizeof icon_flag_ec_png },
-	{ "flag_ee", icon_flag_ee_png, sizeof icon_flag_ee_png },
-	{ "flag_eg", icon_flag_eg_png, sizeof icon_flag_eg_png },
-	{ "flag_eh", icon_flag_eh_png, sizeof icon_flag_eh_png },
-	{ "flag_er", icon_flag_er_png, sizeof icon_flag_er_png },
-	{ "flag_es", icon_flag_es_png, sizeof icon_flag_es_png },
-	{ "flag_et", icon_flag_et_png, sizeof icon_flag_et_png },
-	{ "flag_eu", icon_flag_eu_png, sizeof icon_flag_eu_png },
-	{ "flag_fi", icon_flag_fi_png, sizeof icon_flag_fi_png },
-	{ "flag_fj", icon_flag_fj_png, sizeof icon_flag_fj_png },
-	{ "flag_fk", icon_flag_fk_png, sizeof icon_flag_fk_png },
-	{ "flag_fm", icon_flag_fm_png, sizeof icon_flag_fm_png },
-	{ "flag_fo", icon_flag_fo_png, sizeof icon_flag_fo_png },
-	{ "flag_fr", icon_flag_fr_png, sizeof icon_flag_fr_png },
-	{ "flag_ga", icon_flag_ga_png, sizeof icon_flag_ga_png },
-	{ "flag_gb", icon_flag_gb_png, sizeof icon_flag_gb_png },
-	{ "flag_gd", icon_flag_gd_png, sizeof icon_flag_gd_png },
-	{ "flag_ge", icon_flag_ge_png, sizeof icon_flag_ge_png },
-	{ "flag_gf", icon_flag_gf_png, sizeof icon_flag_gf_png },
-	{ "flag_gg", icon_flag_gg_png, sizeof icon_flag_gg_png },
-	{ "flag_gh", icon_flag_gh_png, sizeof icon_flag_gh_png },
-	{ "flag_gi", icon_flag_gi_png, sizeof icon_flag_gi_png },
-	{ "flag_gl", icon_flag_gl_png, sizeof icon_flag_gl_png },
-	{ "flag_gm", icon_flag_gm_png, sizeof icon_flag_gm_png },
-	{ "flag_gn", icon_flag_gn_png, sizeof icon_flag_gn_png },
-	{ "flag_gp", icon_flag_gp_png, sizeof icon_flag_gp_png },
-	{ "flag_gq", icon_flag_gq_png, sizeof icon_flag_gq_png },
-	{ "flag_gr", icon_flag_gr_png, sizeof icon_flag_gr_png },
-	{ "flag_gs", icon_flag_gs_png, sizeof icon_flag_gs_png },
-	{ "flag_gt", icon_flag_gt_png, sizeof icon_flag_gt_png },
-	{ "flag_gu", icon_flag_gu_png, sizeof icon_flag_gu_png },
-	{ "flag_gw", icon_flag_gw_png, sizeof icon_flag_gw_png },
-	{ "flag_gy", icon_flag_gy_png, sizeof icon_flag_gy_png },
-	{ "flag_hk", icon_flag_hk_png, sizeof icon_flag_hk_png },
-	{ "flag_hm", icon_flag_hm_png, sizeof icon_flag_hm_png },
-	{ "flag_hn", icon_flag_hn_png, sizeof icon_flag_hn_png },
-	{ "flag_hr", icon_flag_hr_png, sizeof icon_flag_hr_png },
-	{ "flag_ht", icon_flag_ht_png, sizeof icon_flag_ht_png },
-	{ "flag_hu", icon_flag_hu_png, sizeof icon_flag_hu_png },
-	{ "flag_id", icon_flag_id_png, sizeof icon_flag_id_png },
-	{ "flag_ie", icon_flag_ie_png, sizeof icon_flag_ie_png },
-	{ "flag_il", icon_flag_il_png, sizeof icon_flag_il_png },
-	{ "flag_im", icon_flag_im_png, sizeof icon_flag_im_png },
-	{ "flag_in", icon_flag_in_png, sizeof icon_flag_in_png },
-	{ "flag_io", icon_flag_io_png, sizeof icon_flag_io_png },
-	{ "flag_iq", icon_flag_iq_png, sizeof icon_flag_iq_png },
-	{ "flag_ir", icon_flag_ir_png, sizeof icon_flag_ir_png },
-	{ "flag_is", icon_flag_is_png, sizeof icon_flag_is_png },
-	{ "flag_it", icon_flag_it_png, sizeof icon_flag_it_png },
-	{ "flag_je", icon_flag_je_png, sizeof icon_flag_je_png },
-	{ "flag_jm", icon_flag_jm_png, sizeof icon_flag_jm_png },
-	{ "flag_jo", icon_flag_jo_png, sizeof icon_flag_jo_png },
-	{ "flag_jp", icon_flag_jp_png, sizeof icon_flag_jp_png },
-	{ "flag_ke", icon_flag_ke_png, sizeof icon_flag_ke_png },
-	{ "flag_kg", icon_flag_kg_png, sizeof icon_flag_kg_png },
-	{ "flag_kh", icon_flag_kh_png, sizeof icon_flag_kh_png },
-	{ "flag_ki", icon_flag_ki_png, sizeof icon_flag_ki_png },
-	{ "flag_km", icon_flag_km_png, sizeof icon_flag_km_png },
-	{ "flag_kn", icon_flag_kn_png, sizeof icon_flag_kn_png },
-	{ "flag_kp", icon_flag_kp_png, sizeof icon_flag_kp_png },
-	{ "flag_kr", icon_flag_kr_png, sizeof icon_flag_kr_png },
-	{ "flag_kw", icon_flag_kw_png, sizeof icon_flag_kw_png },
-	{ "flag_ky", icon_flag_ky_png, sizeof icon_flag_ky_png },
-	{ "flag_kz", icon_flag_kz_png, sizeof icon_flag_kz_png },
-	{ "flag_la", icon_flag_la_png, sizeof icon_flag_la_png },
-	{ "flag_lb", icon_flag_lb_png, sizeof icon_flag_lb_png },
-	{ "flag_lc", icon_flag_lc_png, sizeof icon_flag_lc_png },
-	{ "flag_li", icon_flag_li_png, sizeof icon_flag_li_png },
-	{ "flag_lk", icon_flag_lk_png, sizeof icon_flag_lk_png },
-	{ "flag_lr", icon_flag_lr_png, sizeof icon_flag_lr_png },
-	{ "flag_ls", icon_flag_ls_png, sizeof icon_flag_ls_png },
-	{ "flag_lt", icon_flag_lt_png, sizeof icon_flag_lt_png },
-	{ "flag_lu", icon_flag_lu_png, sizeof icon_flag_lu_png },
-	{ "flag_lv", icon_flag_lv_png, sizeof icon_flag_lv_png },
-	{ "flag_ly", icon_flag_ly_png, sizeof icon_flag_ly_png },
-	{ "flag_ma", icon_flag_ma_png, sizeof icon_flag_ma_png },
-	{ "flag_mc", icon_flag_mc_png, sizeof icon_flag_mc_png },
-	{ "flag_md", icon_flag_md_png, sizeof icon_flag_md_png },
-	{ "flag_me", icon_flag_me_png, sizeof icon_flag_me_png },
-	{ "flag_mg", icon_flag_mg_png, sizeof icon_flag_mg_png },
-	{ "flag_mh", icon_flag_mh_png, sizeof icon_flag_mh_png },
-	{ "flag_mk", icon_flag_mk_png, sizeof icon_flag_mk_png },
-	{ "flag_ml", icon_flag_ml_png, sizeof icon_flag_ml_png },
-	{ "flag_mm", icon_flag_mm_png, sizeof icon_flag_mm_png },
-	{ "flag_mn", icon_flag_mn_png, sizeof icon_flag_mn_png },
-	{ "flag_mo", icon_flag_mo_png, sizeof icon_flag_mo_png },
-	{ "flag_mp", icon_flag_mp_png, sizeof icon_flag_mp_png },
-	{ "flag_mq", icon_flag_mq_png, sizeof icon_flag_mq_png },
-	{ "flag_mr", icon_flag_mr_png, sizeof icon_flag_mr_png },
-	{ "flag_ms", icon_flag_ms_png, sizeof icon_flag_ms_png },
-	{ "flag_mt", icon_flag_mt_png, sizeof icon_flag_mt_png },
-	{ "flag_mu", icon_flag_mu_png, sizeof icon_flag_mu_png },
-	{ "flag_mv", icon_flag_mv_png, sizeof icon_flag_mv_png },
-	{ "flag_mw", icon_flag_mw_png, sizeof icon_flag_mw_png },
-	{ "flag_mx", icon_flag_mx_png, sizeof icon_flag_mx_png },
-	{ "flag_my", icon_flag_my_png, sizeof icon_flag_my_png },
-	{ "flag_mz", icon_flag_mz_png, sizeof icon_flag_mz_png },
-	{ "flag_na", icon_flag_na_png, sizeof icon_flag_na_png },
-	{ "flag_nc", icon_flag_nc_png, sizeof icon_flag_nc_png },
-	{ "flag_ne", icon_flag_ne_png, sizeof icon_flag_ne_png },
-	{ "flag_nf", icon_flag_nf_png, sizeof icon_flag_nf_png },
-	{ "flag_ng", icon_flag_ng_png, sizeof icon_flag_ng_png },
-	{ "flag_ni", icon_flag_ni_png, sizeof icon_flag_ni_png },
-	{ "flag_nl", icon_flag_nl_png, sizeof icon_flag_nl_png },
-	{ "flag_no", icon_flag_no_png, sizeof icon_flag_no_png },
-	{ "flag_np", icon_flag_np_png, sizeof icon_flag_np_png },
-	{ "flag_nr", icon_flag_nr_png, sizeof icon_flag_nr_png },
-	{ "flag_nu", icon_flag_nu_png, sizeof icon_flag_nu_png },
-	{ "flag_nz", icon_flag_nz_png, sizeof icon_flag_nz_png },
-	{ "flag_om", icon_flag_om_png, sizeof icon_flag_om_png },
-	{ "flag_pa", icon_flag_pa_png, sizeof icon_flag_pa_png },
-	{ "flag_pe", icon_flag_pe_png, sizeof icon_flag_pe_png },
-	{ "flag_pf", icon_flag_pf_png, sizeof icon_flag_pf_png },
-	{ "flag_pg", icon_flag_pg_png, sizeof icon_flag_pg_png },
-	{ "flag_ph", icon_flag_ph_png, sizeof icon_flag_ph_png },
-	{ "flag_pk", icon_flag_pk_png, sizeof icon_flag_pk_png },
-	{ "flag_pl", icon_flag_pl_png, sizeof icon_flag_pl_png },
-	{ "flag_pm", icon_flag_pm_png, sizeof icon_flag_pm_png },
-	{ "flag_pn", icon_flag_pn_png, sizeof icon_flag_pn_png },
-	{ "flag_pr", icon_flag_pr_png, sizeof icon_flag_pr_png },
-	{ "flag_ps", icon_flag_ps_png, sizeof icon_flag_ps_png },
-	{ "flag_pt", icon_flag_pt_png, sizeof icon_flag_pt_png },
-	{ "flag_pw", icon_flag_pw_png, sizeof icon_flag_pw_png },
-	{ "flag_py", icon_flag_py_png, sizeof icon_flag_py_png },
-	{ "flag_qa", icon_flag_qa_png, sizeof icon_flag_qa_png },
-	{ "flag_re", icon_flag_re_png, sizeof icon_flag_re_png },
-	{ "flag_ro", icon_flag_ro_png, sizeof icon_flag_ro_png },
-	{ "flag_rs", icon_flag_rs_png, sizeof icon_flag_rs_png },
-	{ "flag_ru", icon_flag_ru_png, sizeof icon_flag_ru_png },
-	{ "flag_rw", icon_flag_rw_png, sizeof icon_flag_rw_png },
-	{ "flag_sa", icon_flag_sa_png, sizeof icon_flag_sa_png },
-	{ "flag_sb", icon_flag_sb_png, sizeof icon_flag_sb_png },
-	{ "flag_sc", icon_flag_sc_png, sizeof icon_flag_sc_png },
-	{ "flag_sd", icon_flag_sd_png, sizeof icon_flag_sd_png },
-	{ "flag_se", icon_flag_se_png, sizeof icon_flag_se_png },
-	{ "flag_sg", icon_flag_sg_png, sizeof icon_flag_sg_png },
-	{ "flag_sh", icon_flag_sh_png, sizeof icon_flag_sh_png },
-	{ "flag_si", icon_flag_si_png, sizeof icon_flag_si_png },
-	{ "flag_sj", icon_flag_sj_png, sizeof icon_flag_sj_png },
-	{ "flag_sk", icon_flag_sk_png, sizeof icon_flag_sk_png },
-	{ "flag_sl", icon_flag_sl_png, sizeof icon_flag_sl_png },
-	{ "flag_sm", icon_flag_sm_png, sizeof icon_flag_sm_png },
-	{ "flag_sn", icon_flag_sn_png, sizeof icon_flag_sn_png },
-	{ "flag_so", icon_flag_so_png, sizeof icon_flag_so_png },
-	{ "flag_sr", icon_flag_sr_png, sizeof icon_flag_sr_png },
-	{ "flag_ss", icon_flag_ss_png, sizeof icon_flag_ss_png },
-	{ "flag_st", icon_flag_st_png, sizeof icon_flag_st_png },
-	{ "flag_sv", icon_flag_sv_png, sizeof icon_flag_sv_png },
-	{ "flag_sx", icon_flag_sx_png, sizeof icon_flag_sx_png },
-	{ "flag_sy", icon_flag_sy_png, sizeof icon_flag_sy_png },
-	{ "flag_sz", icon_flag_sz_png, sizeof icon_flag_sz_png },
-	{ "flag_tc", icon_flag_tc_png, sizeof icon_flag_tc_png },
-	{ "flag_td", icon_flag_td_png, sizeof icon_flag_td_png },
-	{ "flag_tf", icon_flag_tf_png, sizeof icon_flag_tf_png },
-	{ "flag_tg", icon_flag_tg_png, sizeof icon_flag_tg_png },
-	{ "flag_th", icon_flag_th_png, sizeof icon_flag_th_png },
-	{ "flag_tj", icon_flag_tj_png, sizeof icon_flag_tj_png },
-	{ "flag_tk", icon_flag_tk_png, sizeof icon_flag_tk_png },
-	{ "flag_tl", icon_flag_tl_png, sizeof icon_flag_tl_png },
-	{ "flag_tm", icon_flag_tm_png, sizeof icon_flag_tm_png },
-	{ "flag_tn", icon_flag_tn_png, sizeof icon_flag_tn_png },
-	{ "flag_to", icon_flag_to_png, sizeof icon_flag_to_png },
-	{ "flag_tr", icon_flag_tr_png, sizeof icon_flag_tr_png },
-	{ "flag_tt", icon_flag_tt_png, sizeof icon_flag_tt_png },
-	{ "flag_tv", icon_flag_tv_png, sizeof icon_flag_tv_png },
-	{ "flag_tw", icon_flag_tw_png, sizeof icon_flag_tw_png },
-	{ "flag_tz", icon_flag_tz_png, sizeof icon_flag_tz_png },
-	{ "flag_ua", icon_flag_ua_png, sizeof icon_flag_ua_png },
-	{ "flag_ug", icon_flag_ug_png, sizeof icon_flag_ug_png },
-	{ "flag_um", icon_flag_um_png, sizeof icon_flag_um_png },
-	{ "flag_unknown", icon_flag_unknown_png, sizeof icon_flag_unknown_png },
-	{ "flag_us", icon_flag_us_png, sizeof icon_flag_us_png },
-	{ "flag_uy", icon_flag_uy_png, sizeof icon_flag_uy_png },
-	{ "flag_uz", icon_flag_uz_png, sizeof icon_flag_uz_png },
-	{ "flag_va", icon_flag_va_png, sizeof icon_flag_va_png },
-	{ "flag_vc", icon_flag_vc_png, sizeof icon_flag_vc_png },
-	{ "flag_ve", icon_flag_ve_png, sizeof icon_flag_ve_png },
-	{ "flag_vg", icon_flag_vg_png, sizeof icon_flag_vg_png },
-	{ "flag_vi", icon_flag_vi_png, sizeof icon_flag_vi_png },
-	{ "flag_vn", icon_flag_vn_png, sizeof icon_flag_vn_png },
-	{ "flag_vu", icon_flag_vu_png, sizeof icon_flag_vu_png },
-	{ "flag_wf", icon_flag_wf_png, sizeof icon_flag_wf_png },
-	{ "flag_ws", icon_flag_ws_png, sizeof icon_flag_ws_png },
-	{ "flag_ye", icon_flag_ye_png, sizeof icon_flag_ye_png },
-	{ "flag_yt", icon_flag_yt_png, sizeof icon_flag_yt_png },
-	{ "flag_za", icon_flag_za_png, sizeof icon_flag_za_png },
-	{ "flag_zm", icon_flag_zm_png, sizeof icon_flag_zm_png },
-	{ "flag_zw", icon_flag_zw_png, sizeof icon_flag_zw_png },
+	{ "amule", icon_amule_png,
+		sizeof icon_amule_png, icon_amule_svg,
+		sizeof icon_amule_svg },
+	{ "arrows_down", icon_arrows_down_png,
+		sizeof icon_arrows_down_png, icon_arrows_down_svg,
+		sizeof icon_arrows_down_svg },
+	{ "arrows_up", icon_arrows_up_png,
+		sizeof icon_arrows_up_png, icon_arrows_up_svg,
+		sizeof icon_arrows_up_svg },
+	{ "chat", icon_chat_png, sizeof icon_chat_png, 0, 0 },
+	{ "client_badguy", icon_client_badguy_png,
+		sizeof icon_client_badguy_png, icon_client_badguy_svg,
+		sizeof icon_client_badguy_svg },
+	{ "client_commentonly", icon_client_commentonly_png,
+		sizeof icon_client_commentonly_png, icon_client_commentonly_svg,
+		sizeof icon_client_commentonly_svg },
+	{ "client_creditsgrey", icon_client_creditsgrey_png,
+		sizeof icon_client_creditsgrey_png, icon_client_creditsgrey_svg,
+		sizeof icon_client_creditsgrey_svg },
+	{ "client_creditsyellow", icon_client_creditsyellow_png,
+		sizeof icon_client_creditsyellow_png, icon_client_creditsyellow_svg,
+		sizeof icon_client_creditsyellow_svg },
+	{ "client_edonkeyhybrid", icon_client_edonkeyhybrid_png,
+		sizeof icon_client_edonkeyhybrid_png, icon_client_edonkeyhybrid_svg,
+		sizeof icon_client_edonkeyhybrid_svg },
+	{ "client_encryption", icon_client_encryption_png,
+		sizeof icon_client_encryption_png, icon_client_encryption_svg,
+		sizeof icon_client_encryption_svg },
+	{ "client_excellentrating", icon_client_excellentrating_png,
+		sizeof icon_client_excellentrating_png, icon_client_excellentrating_svg,
+		sizeof icon_client_excellentrating_svg },
+	{ "client_extendedprotocol", icon_client_extendedprotocol_png,
+		sizeof icon_client_extendedprotocol_png, icon_client_extendedprotocol_svg,
+		sizeof icon_client_extendedprotocol_svg },
+	{ "client_fairrating", icon_client_fairrating_png,
+		sizeof icon_client_fairrating_png, icon_client_fairrating_svg,
+		sizeof icon_client_fairrating_svg },
+	{ "client_friend", icon_client_friend_png,
+		sizeof icon_client_friend_png, icon_client_friend_svg,
+		sizeof icon_client_friend_svg },
+	{ "client_goodrating", icon_client_goodrating_png,
+		sizeof icon_client_goodrating_png, icon_client_goodrating_svg,
+		sizeof icon_client_goodrating_svg },
+	{ "client_green", icon_client_green_png,
+		sizeof icon_client_green_png, icon_client_green_svg,
+		sizeof icon_client_green_svg },
+	{ "client_grey", icon_client_grey_png,
+		sizeof icon_client_grey_png, icon_client_grey_svg,
+		sizeof icon_client_grey_svg },
+	{ "client_invalidrating", icon_client_invalidrating_png,
+		sizeof icon_client_invalidrating_png, icon_client_invalidrating_svg,
+		sizeof icon_client_invalidrating_svg },
+	{ "client_mldonkey", icon_client_mldonkey_png,
+		sizeof icon_client_mldonkey_png, icon_client_mldonkey_svg,
+		sizeof icon_client_mldonkey_svg },
+	{ "client_poorrating", icon_client_poorrating_png,
+		sizeof icon_client_poorrating_png, icon_client_poorrating_svg,
+		sizeof icon_client_poorrating_svg },
+	{ "client_red", icon_client_red_png,
+		sizeof icon_client_red_png, icon_client_red_svg,
+		sizeof icon_client_red_svg },
+	{ "client_secident", icon_client_secident_png,
+		sizeof icon_client_secident_png, icon_client_secident_svg,
+		sizeof icon_client_secident_svg },
+	{ "client_unknown", icon_client_unknown_png,
+		sizeof icon_client_unknown_png, icon_client_unknown_svg,
+		sizeof icon_client_unknown_svg },
+	{ "client_upload", icon_client_upload_png,
+		sizeof icon_client_upload_png, icon_client_upload_svg,
+		sizeof icon_client_upload_svg },
+	{ "client_white", icon_client_white_png,
+		sizeof icon_client_white_png, icon_client_white_svg,
+		sizeof icon_client_white_svg },
+	{ "client_yellow", icon_client_yellow_png,
+		sizeof icon_client_yellow_png, icon_client_yellow_svg,
+		sizeof icon_client_yellow_svg },
+	{ "folder", icon_folder_png,
+		sizeof icon_folder_png, icon_folder_svg,
+		sizeof icon_folder_svg },
+	{ "folder_shared", icon_folder_shared_png,
+		sizeof icon_folder_shared_png, icon_folder_shared_svg,
+		sizeof icon_folder_shared_svg },
+	{ "friends", icon_friends_png,
+		sizeof icon_friends_png, icon_friends_svg,
+		sizeof icon_friends_svg },
+	{ "message", icon_message_png,
+		sizeof icon_message_png, icon_message_svg,
+		sizeof icon_message_svg },
+	{ "prefs_advanced", icon_prefs_advanced_png,
+		sizeof icon_prefs_advanced_png, icon_prefs_advanced_svg,
+		sizeof icon_prefs_advanced_svg },
+	{ "prefs_connection", icon_prefs_connection_png,
+		sizeof icon_prefs_connection_png, icon_prefs_connection_svg,
+		sizeof icon_prefs_connection_svg },
+	{ "prefs_debug", icon_prefs_debug_png,
+		sizeof icon_prefs_debug_png, icon_prefs_debug_svg,
+		sizeof icon_prefs_debug_svg },
+	{ "prefs_directories", icon_prefs_directories_png,
+		sizeof icon_prefs_directories_png, icon_prefs_directories_svg,
+		sizeof icon_prefs_directories_svg },
+	{ "prefs_events", icon_prefs_events_png,
+		sizeof icon_prefs_events_png, icon_prefs_events_svg,
+		sizeof icon_prefs_events_svg },
+	{ "prefs_files", icon_prefs_files_png,
+		sizeof icon_prefs_files_png, icon_prefs_files_svg,
+		sizeof icon_prefs_files_svg },
+	{ "prefs_filters", icon_prefs_filters_png,
+		sizeof icon_prefs_filters_png, icon_prefs_filters_svg,
+		sizeof icon_prefs_filters_svg },
+	{ "prefs_general", icon_prefs_general_png,
+		sizeof icon_prefs_general_png, icon_prefs_general_svg,
+		sizeof icon_prefs_general_svg },
+	{ "prefs_interface", icon_prefs_interface_png,
+		sizeof icon_prefs_interface_png, icon_prefs_interface_svg,
+		sizeof icon_prefs_interface_svg },
+	{ "prefs_ip2country", icon_prefs_ip2country_png,
+		sizeof icon_prefs_ip2country_png, icon_prefs_ip2country_svg,
+		sizeof icon_prefs_ip2country_svg },
+	{ "prefs_onlinesig", icon_prefs_onlinesig_png,
+		sizeof icon_prefs_onlinesig_png, icon_prefs_onlinesig_svg,
+		sizeof icon_prefs_onlinesig_svg },
+	{ "prefs_pathmapping", icon_prefs_pathmapping_png,
+		sizeof icon_prefs_pathmapping_png, icon_prefs_pathmapping_svg,
+		sizeof icon_prefs_pathmapping_svg },
+	{ "prefs_proxy", icon_prefs_proxy_png,
+		sizeof icon_prefs_proxy_png, icon_prefs_proxy_svg,
+		sizeof icon_prefs_proxy_svg },
+	{ "prefs_remote", icon_prefs_remote_png,
+		sizeof icon_prefs_remote_png, icon_prefs_remote_svg,
+		sizeof icon_prefs_remote_svg },
+	{ "prefs_security", icon_prefs_security_png,
+		sizeof icon_prefs_security_png, icon_prefs_security_svg,
+		sizeof icon_prefs_security_svg },
+	{ "prefs_servers", icon_prefs_servers_png,
+		sizeof icon_prefs_servers_png, icon_prefs_servers_svg,
+		sizeof icon_prefs_servers_svg },
+	{ "prefs_statistics", icon_prefs_statistics_png,
+		sizeof icon_prefs_statistics_png, icon_prefs_statistics_svg,
+		sizeof icon_prefs_statistics_svg },
+	{ "reload", icon_reload_png,
+		sizeof icon_reload_png, icon_reload_svg,
+		sizeof icon_reload_svg },
+	{ "sort_dn", icon_sort_dn_png, sizeof icon_sort_dn_png, 0, 0 },
+	{ "sort_dnx2", icon_sort_dnx2_png, sizeof icon_sort_dnx2_png, 0, 0 },
+	{ "sort_up", icon_sort_up_png, sizeof icon_sort_up_png, 0, 0 },
+	{ "sort_upx2", icon_sort_upx2_png, sizeof icon_sort_upx2_png, 0, 0 },
+	{ "status_conn_base", icon_status_conn_base_png,
+		sizeof icon_status_conn_base_png, icon_status_conn_base_svg,
+		sizeof icon_status_conn_base_svg },
+	{ "status_conn_ed2k_connecting", icon_status_conn_ed2k_connecting_png,
+		sizeof icon_status_conn_ed2k_connecting_png, icon_status_conn_ed2k_connecting_svg,
+		sizeof icon_status_conn_ed2k_connecting_svg },
+	{ "status_conn_ed2k_high", icon_status_conn_ed2k_high_png,
+		sizeof icon_status_conn_ed2k_high_png, icon_status_conn_ed2k_high_svg,
+		sizeof icon_status_conn_ed2k_high_svg },
+	{ "status_conn_ed2k_low", icon_status_conn_ed2k_low_png,
+		sizeof icon_status_conn_ed2k_low_png, icon_status_conn_ed2k_low_svg,
+		sizeof icon_status_conn_ed2k_low_svg },
+	{ "status_conn_ed2k_off", icon_status_conn_ed2k_off_png,
+		sizeof icon_status_conn_ed2k_off_png, icon_status_conn_ed2k_off_svg,
+		sizeof icon_status_conn_ed2k_off_svg },
+	{ "status_conn_kad_firewalled", icon_status_conn_kad_firewalled_png,
+		sizeof icon_status_conn_kad_firewalled_png, icon_status_conn_kad_firewalled_svg,
+		sizeof icon_status_conn_kad_firewalled_svg },
+	{ "status_conn_kad_off", icon_status_conn_kad_off_png,
+		sizeof icon_status_conn_kad_off_png, icon_status_conn_kad_off_svg,
+		sizeof icon_status_conn_kad_off_svg },
+	{ "status_conn_kad_ok", icon_status_conn_kad_ok_png,
+		sizeof icon_status_conn_kad_ok_png, icon_status_conn_kad_ok_svg,
+		sizeof icon_status_conn_kad_ok_svg },
+	{ "status_log_info", icon_status_log_info_png,
+		sizeof icon_status_log_info_png, icon_status_log_info_svg,
+		sizeof icon_status_log_info_svg },
+	{ "status_speed_both", icon_status_speed_both_png,
+		sizeof icon_status_speed_both_png, icon_status_speed_both_svg,
+		sizeof icon_status_speed_both_svg },
+	{ "status_speed_down", icon_status_speed_down_png,
+		sizeof icon_status_speed_down_png, icon_status_speed_down_svg,
+		sizeof icon_status_speed_down_svg },
+	{ "status_speed_idle", icon_status_speed_idle_png,
+		sizeof icon_status_speed_idle_png, icon_status_speed_idle_svg,
+		sizeof icon_status_speed_idle_svg },
+	{ "status_speed_up", icon_status_speed_up_png,
+		sizeof icon_status_speed_up_png, icon_status_speed_up_svg,
+		sizeof icon_status_speed_up_svg },
+	{ "status_users", icon_status_users_png,
+		sizeof icon_status_users_png, icon_status_users_svg,
+		sizeof icon_status_users_svg },
+	{ "toolbar_about", icon_toolbar_about_png,
+		sizeof icon_toolbar_about_png, icon_toolbar_about_svg,
+		sizeof icon_toolbar_about_svg },
+	{ "toolbar_blink", icon_toolbar_blink_png,
+		sizeof icon_toolbar_blink_png, icon_toolbar_blink_svg,
+		sizeof icon_toolbar_blink_svg },
+	{ "toolbar_clients", icon_toolbar_clients_png,
+		sizeof icon_toolbar_clients_png, icon_toolbar_clients_svg,
+		sizeof icon_toolbar_clients_svg },
+	{ "toolbar_connect", icon_toolbar_connect_png,
+		sizeof icon_toolbar_connect_png, icon_toolbar_connect_svg,
+		sizeof icon_toolbar_connect_svg },
+	{ "toolbar_connecting", icon_toolbar_connecting_png,
+		sizeof icon_toolbar_connecting_png, icon_toolbar_connecting_svg,
+		sizeof icon_toolbar_connecting_svg },
+	{ "toolbar_disconnect", icon_toolbar_disconnect_png,
+		sizeof icon_toolbar_disconnect_png, icon_toolbar_disconnect_svg,
+		sizeof icon_toolbar_disconnect_svg },
+	{ "toolbar_import", icon_toolbar_import_png,
+		sizeof icon_toolbar_import_png, icon_toolbar_import_svg,
+		sizeof icon_toolbar_import_svg },
+	{ "toolbar_messages", icon_toolbar_messages_png,
+		sizeof icon_toolbar_messages_png, icon_toolbar_messages_svg,
+		sizeof icon_toolbar_messages_svg },
+	{ "toolbar_network", icon_toolbar_network_png,
+		sizeof icon_toolbar_network_png, icon_toolbar_network_svg,
+		sizeof icon_toolbar_network_svg },
+	{ "toolbar_prefs", icon_toolbar_prefs_png,
+		sizeof icon_toolbar_prefs_png, icon_toolbar_prefs_svg,
+		sizeof icon_toolbar_prefs_svg },
+	{ "toolbar_search", icon_toolbar_search_png,
+		sizeof icon_toolbar_search_png, icon_toolbar_search_svg,
+		sizeof icon_toolbar_search_svg },
+	{ "toolbar_shared", icon_toolbar_shared_png,
+		sizeof icon_toolbar_shared_png, icon_toolbar_shared_svg,
+		sizeof icon_toolbar_shared_svg },
+	{ "toolbar_stats", icon_toolbar_stats_png,
+		sizeof icon_toolbar_stats_png, icon_toolbar_stats_svg,
+		sizeof icon_toolbar_stats_svg },
+	{ "toolbar_transfers", icon_toolbar_transfers_png,
+		sizeof icon_toolbar_transfers_png, icon_toolbar_transfers_svg,
+		sizeof icon_toolbar_transfers_svg },
+	{ "transfer_clear_completed", icon_transfer_clear_completed_png,
+		sizeof icon_transfer_clear_completed_png, icon_transfer_clear_completed_svg,
+		sizeof icon_transfer_clear_completed_svg },
+	{ "transfer_clear_completed_disabled", icon_transfer_clear_completed_disabled_png,
+		sizeof icon_transfer_clear_completed_disabled_png, icon_transfer_clear_completed_disabled_svg,
+		sizeof icon_transfer_clear_completed_disabled_svg },
+	{ "tray_disconnected", icon_tray_disconnected_png, sizeof icon_tray_disconnected_png, 0, 0 },
+	{ "tray_high", icon_tray_high_png, sizeof icon_tray_high_png, 0, 0 },
+	{ "tray_low", icon_tray_low_png, sizeof icon_tray_low_png, 0, 0 },
+	{ "flag_ad", icon_flag_ad_png, sizeof icon_flag_ad_png, 0, 0 },
+	{ "flag_ae", icon_flag_ae_png, sizeof icon_flag_ae_png, 0, 0 },
+	{ "flag_af", icon_flag_af_png, sizeof icon_flag_af_png, 0, 0 },
+	{ "flag_ag", icon_flag_ag_png, sizeof icon_flag_ag_png, 0, 0 },
+	{ "flag_ai", icon_flag_ai_png, sizeof icon_flag_ai_png, 0, 0 },
+	{ "flag_al", icon_flag_al_png, sizeof icon_flag_al_png, 0, 0 },
+	{ "flag_am", icon_flag_am_png, sizeof icon_flag_am_png, 0, 0 },
+	{ "flag_an", icon_flag_an_png, sizeof icon_flag_an_png, 0, 0 },
+	{ "flag_ao", icon_flag_ao_png, sizeof icon_flag_ao_png, 0, 0 },
+	{ "flag_ar", icon_flag_ar_png, sizeof icon_flag_ar_png, 0, 0 },
+	{ "flag_as", icon_flag_as_png, sizeof icon_flag_as_png, 0, 0 },
+	{ "flag_at", icon_flag_at_png, sizeof icon_flag_at_png, 0, 0 },
+	{ "flag_au", icon_flag_au_png, sizeof icon_flag_au_png, 0, 0 },
+	{ "flag_aw", icon_flag_aw_png, sizeof icon_flag_aw_png, 0, 0 },
+	{ "flag_ax", icon_flag_ax_png, sizeof icon_flag_ax_png, 0, 0 },
+	{ "flag_az", icon_flag_az_png, sizeof icon_flag_az_png, 0, 0 },
+	{ "flag_ba", icon_flag_ba_png, sizeof icon_flag_ba_png, 0, 0 },
+	{ "flag_bb", icon_flag_bb_png, sizeof icon_flag_bb_png, 0, 0 },
+	{ "flag_bd", icon_flag_bd_png, sizeof icon_flag_bd_png, 0, 0 },
+	{ "flag_be", icon_flag_be_png, sizeof icon_flag_be_png, 0, 0 },
+	{ "flag_bf", icon_flag_bf_png, sizeof icon_flag_bf_png, 0, 0 },
+	{ "flag_bg", icon_flag_bg_png, sizeof icon_flag_bg_png, 0, 0 },
+	{ "flag_bh", icon_flag_bh_png, sizeof icon_flag_bh_png, 0, 0 },
+	{ "flag_bi", icon_flag_bi_png, sizeof icon_flag_bi_png, 0, 0 },
+	{ "flag_bj", icon_flag_bj_png, sizeof icon_flag_bj_png, 0, 0 },
+	{ "flag_bm", icon_flag_bm_png, sizeof icon_flag_bm_png, 0, 0 },
+	{ "flag_bn", icon_flag_bn_png, sizeof icon_flag_bn_png, 0, 0 },
+	{ "flag_bo", icon_flag_bo_png, sizeof icon_flag_bo_png, 0, 0 },
+	{ "flag_bq", icon_flag_bq_png, sizeof icon_flag_bq_png, 0, 0 },
+	{ "flag_br", icon_flag_br_png, sizeof icon_flag_br_png, 0, 0 },
+	{ "flag_bs", icon_flag_bs_png, sizeof icon_flag_bs_png, 0, 0 },
+	{ "flag_bt", icon_flag_bt_png, sizeof icon_flag_bt_png, 0, 0 },
+	{ "flag_bv", icon_flag_bv_png, sizeof icon_flag_bv_png, 0, 0 },
+	{ "flag_bw", icon_flag_bw_png, sizeof icon_flag_bw_png, 0, 0 },
+	{ "flag_by", icon_flag_by_png, sizeof icon_flag_by_png, 0, 0 },
+	{ "flag_bz", icon_flag_bz_png, sizeof icon_flag_bz_png, 0, 0 },
+	{ "flag_ca", icon_flag_ca_png, sizeof icon_flag_ca_png, 0, 0 },
+	{ "flag_cc", icon_flag_cc_png, sizeof icon_flag_cc_png, 0, 0 },
+	{ "flag_cd", icon_flag_cd_png, sizeof icon_flag_cd_png, 0, 0 },
+	{ "flag_cf", icon_flag_cf_png, sizeof icon_flag_cf_png, 0, 0 },
+	{ "flag_cg", icon_flag_cg_png, sizeof icon_flag_cg_png, 0, 0 },
+	{ "flag_ch", icon_flag_ch_png, sizeof icon_flag_ch_png, 0, 0 },
+	{ "flag_ci", icon_flag_ci_png, sizeof icon_flag_ci_png, 0, 0 },
+	{ "flag_ck", icon_flag_ck_png, sizeof icon_flag_ck_png, 0, 0 },
+	{ "flag_cl", icon_flag_cl_png, sizeof icon_flag_cl_png, 0, 0 },
+	{ "flag_cm", icon_flag_cm_png, sizeof icon_flag_cm_png, 0, 0 },
+	{ "flag_cn", icon_flag_cn_png, sizeof icon_flag_cn_png, 0, 0 },
+	{ "flag_co", icon_flag_co_png, sizeof icon_flag_co_png, 0, 0 },
+	{ "flag_cr", icon_flag_cr_png, sizeof icon_flag_cr_png, 0, 0 },
+	{ "flag_cu", icon_flag_cu_png, sizeof icon_flag_cu_png, 0, 0 },
+	{ "flag_cv", icon_flag_cv_png, sizeof icon_flag_cv_png, 0, 0 },
+	{ "flag_cw", icon_flag_cw_png, sizeof icon_flag_cw_png, 0, 0 },
+	{ "flag_cx", icon_flag_cx_png, sizeof icon_flag_cx_png, 0, 0 },
+	{ "flag_cy", icon_flag_cy_png, sizeof icon_flag_cy_png, 0, 0 },
+	{ "flag_cz", icon_flag_cz_png, sizeof icon_flag_cz_png, 0, 0 },
+	{ "flag_de", icon_flag_de_png, sizeof icon_flag_de_png, 0, 0 },
+	{ "flag_dj", icon_flag_dj_png, sizeof icon_flag_dj_png, 0, 0 },
+	{ "flag_dk", icon_flag_dk_png, sizeof icon_flag_dk_png, 0, 0 },
+	{ "flag_dm", icon_flag_dm_png, sizeof icon_flag_dm_png, 0, 0 },
+	{ "flag_do", icon_flag_do_png, sizeof icon_flag_do_png, 0, 0 },
+	{ "flag_dz", icon_flag_dz_png, sizeof icon_flag_dz_png, 0, 0 },
+	{ "flag_ec", icon_flag_ec_png, sizeof icon_flag_ec_png, 0, 0 },
+	{ "flag_ee", icon_flag_ee_png, sizeof icon_flag_ee_png, 0, 0 },
+	{ "flag_eg", icon_flag_eg_png, sizeof icon_flag_eg_png, 0, 0 },
+	{ "flag_eh", icon_flag_eh_png, sizeof icon_flag_eh_png, 0, 0 },
+	{ "flag_er", icon_flag_er_png, sizeof icon_flag_er_png, 0, 0 },
+	{ "flag_es", icon_flag_es_png, sizeof icon_flag_es_png, 0, 0 },
+	{ "flag_et", icon_flag_et_png, sizeof icon_flag_et_png, 0, 0 },
+	{ "flag_eu", icon_flag_eu_png, sizeof icon_flag_eu_png, 0, 0 },
+	{ "flag_fi", icon_flag_fi_png, sizeof icon_flag_fi_png, 0, 0 },
+	{ "flag_fj", icon_flag_fj_png, sizeof icon_flag_fj_png, 0, 0 },
+	{ "flag_fk", icon_flag_fk_png, sizeof icon_flag_fk_png, 0, 0 },
+	{ "flag_fm", icon_flag_fm_png, sizeof icon_flag_fm_png, 0, 0 },
+	{ "flag_fo", icon_flag_fo_png, sizeof icon_flag_fo_png, 0, 0 },
+	{ "flag_fr", icon_flag_fr_png, sizeof icon_flag_fr_png, 0, 0 },
+	{ "flag_ga", icon_flag_ga_png, sizeof icon_flag_ga_png, 0, 0 },
+	{ "flag_gb", icon_flag_gb_png, sizeof icon_flag_gb_png, 0, 0 },
+	{ "flag_gd", icon_flag_gd_png, sizeof icon_flag_gd_png, 0, 0 },
+	{ "flag_ge", icon_flag_ge_png, sizeof icon_flag_ge_png, 0, 0 },
+	{ "flag_gf", icon_flag_gf_png, sizeof icon_flag_gf_png, 0, 0 },
+	{ "flag_gg", icon_flag_gg_png, sizeof icon_flag_gg_png, 0, 0 },
+	{ "flag_gh", icon_flag_gh_png, sizeof icon_flag_gh_png, 0, 0 },
+	{ "flag_gi", icon_flag_gi_png, sizeof icon_flag_gi_png, 0, 0 },
+	{ "flag_gl", icon_flag_gl_png, sizeof icon_flag_gl_png, 0, 0 },
+	{ "flag_gm", icon_flag_gm_png, sizeof icon_flag_gm_png, 0, 0 },
+	{ "flag_gn", icon_flag_gn_png, sizeof icon_flag_gn_png, 0, 0 },
+	{ "flag_gp", icon_flag_gp_png, sizeof icon_flag_gp_png, 0, 0 },
+	{ "flag_gq", icon_flag_gq_png, sizeof icon_flag_gq_png, 0, 0 },
+	{ "flag_gr", icon_flag_gr_png, sizeof icon_flag_gr_png, 0, 0 },
+	{ "flag_gs", icon_flag_gs_png, sizeof icon_flag_gs_png, 0, 0 },
+	{ "flag_gt", icon_flag_gt_png, sizeof icon_flag_gt_png, 0, 0 },
+	{ "flag_gu", icon_flag_gu_png, sizeof icon_flag_gu_png, 0, 0 },
+	{ "flag_gw", icon_flag_gw_png, sizeof icon_flag_gw_png, 0, 0 },
+	{ "flag_gy", icon_flag_gy_png, sizeof icon_flag_gy_png, 0, 0 },
+	{ "flag_hk", icon_flag_hk_png, sizeof icon_flag_hk_png, 0, 0 },
+	{ "flag_hm", icon_flag_hm_png, sizeof icon_flag_hm_png, 0, 0 },
+	{ "flag_hn", icon_flag_hn_png, sizeof icon_flag_hn_png, 0, 0 },
+	{ "flag_hr", icon_flag_hr_png, sizeof icon_flag_hr_png, 0, 0 },
+	{ "flag_ht", icon_flag_ht_png, sizeof icon_flag_ht_png, 0, 0 },
+	{ "flag_hu", icon_flag_hu_png, sizeof icon_flag_hu_png, 0, 0 },
+	{ "flag_id", icon_flag_id_png, sizeof icon_flag_id_png, 0, 0 },
+	{ "flag_ie", icon_flag_ie_png, sizeof icon_flag_ie_png, 0, 0 },
+	{ "flag_il", icon_flag_il_png, sizeof icon_flag_il_png, 0, 0 },
+	{ "flag_im", icon_flag_im_png, sizeof icon_flag_im_png, 0, 0 },
+	{ "flag_in", icon_flag_in_png, sizeof icon_flag_in_png, 0, 0 },
+	{ "flag_io", icon_flag_io_png, sizeof icon_flag_io_png, 0, 0 },
+	{ "flag_iq", icon_flag_iq_png, sizeof icon_flag_iq_png, 0, 0 },
+	{ "flag_ir", icon_flag_ir_png, sizeof icon_flag_ir_png, 0, 0 },
+	{ "flag_is", icon_flag_is_png, sizeof icon_flag_is_png, 0, 0 },
+	{ "flag_it", icon_flag_it_png, sizeof icon_flag_it_png, 0, 0 },
+	{ "flag_je", icon_flag_je_png, sizeof icon_flag_je_png, 0, 0 },
+	{ "flag_jm", icon_flag_jm_png, sizeof icon_flag_jm_png, 0, 0 },
+	{ "flag_jo", icon_flag_jo_png, sizeof icon_flag_jo_png, 0, 0 },
+	{ "flag_jp", icon_flag_jp_png, sizeof icon_flag_jp_png, 0, 0 },
+	{ "flag_ke", icon_flag_ke_png, sizeof icon_flag_ke_png, 0, 0 },
+	{ "flag_kg", icon_flag_kg_png, sizeof icon_flag_kg_png, 0, 0 },
+	{ "flag_kh", icon_flag_kh_png, sizeof icon_flag_kh_png, 0, 0 },
+	{ "flag_ki", icon_flag_ki_png, sizeof icon_flag_ki_png, 0, 0 },
+	{ "flag_km", icon_flag_km_png, sizeof icon_flag_km_png, 0, 0 },
+	{ "flag_kn", icon_flag_kn_png, sizeof icon_flag_kn_png, 0, 0 },
+	{ "flag_kp", icon_flag_kp_png, sizeof icon_flag_kp_png, 0, 0 },
+	{ "flag_kr", icon_flag_kr_png, sizeof icon_flag_kr_png, 0, 0 },
+	{ "flag_kw", icon_flag_kw_png, sizeof icon_flag_kw_png, 0, 0 },
+	{ "flag_ky", icon_flag_ky_png, sizeof icon_flag_ky_png, 0, 0 },
+	{ "flag_kz", icon_flag_kz_png, sizeof icon_flag_kz_png, 0, 0 },
+	{ "flag_la", icon_flag_la_png, sizeof icon_flag_la_png, 0, 0 },
+	{ "flag_lb", icon_flag_lb_png, sizeof icon_flag_lb_png, 0, 0 },
+	{ "flag_lc", icon_flag_lc_png, sizeof icon_flag_lc_png, 0, 0 },
+	{ "flag_li", icon_flag_li_png, sizeof icon_flag_li_png, 0, 0 },
+	{ "flag_lk", icon_flag_lk_png, sizeof icon_flag_lk_png, 0, 0 },
+	{ "flag_lr", icon_flag_lr_png, sizeof icon_flag_lr_png, 0, 0 },
+	{ "flag_ls", icon_flag_ls_png, sizeof icon_flag_ls_png, 0, 0 },
+	{ "flag_lt", icon_flag_lt_png, sizeof icon_flag_lt_png, 0, 0 },
+	{ "flag_lu", icon_flag_lu_png, sizeof icon_flag_lu_png, 0, 0 },
+	{ "flag_lv", icon_flag_lv_png, sizeof icon_flag_lv_png, 0, 0 },
+	{ "flag_ly", icon_flag_ly_png, sizeof icon_flag_ly_png, 0, 0 },
+	{ "flag_ma", icon_flag_ma_png, sizeof icon_flag_ma_png, 0, 0 },
+	{ "flag_mc", icon_flag_mc_png, sizeof icon_flag_mc_png, 0, 0 },
+	{ "flag_md", icon_flag_md_png, sizeof icon_flag_md_png, 0, 0 },
+	{ "flag_me", icon_flag_me_png, sizeof icon_flag_me_png, 0, 0 },
+	{ "flag_mg", icon_flag_mg_png, sizeof icon_flag_mg_png, 0, 0 },
+	{ "flag_mh", icon_flag_mh_png, sizeof icon_flag_mh_png, 0, 0 },
+	{ "flag_mk", icon_flag_mk_png, sizeof icon_flag_mk_png, 0, 0 },
+	{ "flag_ml", icon_flag_ml_png, sizeof icon_flag_ml_png, 0, 0 },
+	{ "flag_mm", icon_flag_mm_png, sizeof icon_flag_mm_png, 0, 0 },
+	{ "flag_mn", icon_flag_mn_png, sizeof icon_flag_mn_png, 0, 0 },
+	{ "flag_mo", icon_flag_mo_png, sizeof icon_flag_mo_png, 0, 0 },
+	{ "flag_mp", icon_flag_mp_png, sizeof icon_flag_mp_png, 0, 0 },
+	{ "flag_mq", icon_flag_mq_png, sizeof icon_flag_mq_png, 0, 0 },
+	{ "flag_mr", icon_flag_mr_png, sizeof icon_flag_mr_png, 0, 0 },
+	{ "flag_ms", icon_flag_ms_png, sizeof icon_flag_ms_png, 0, 0 },
+	{ "flag_mt", icon_flag_mt_png, sizeof icon_flag_mt_png, 0, 0 },
+	{ "flag_mu", icon_flag_mu_png, sizeof icon_flag_mu_png, 0, 0 },
+	{ "flag_mv", icon_flag_mv_png, sizeof icon_flag_mv_png, 0, 0 },
+	{ "flag_mw", icon_flag_mw_png, sizeof icon_flag_mw_png, 0, 0 },
+	{ "flag_mx", icon_flag_mx_png, sizeof icon_flag_mx_png, 0, 0 },
+	{ "flag_my", icon_flag_my_png, sizeof icon_flag_my_png, 0, 0 },
+	{ "flag_mz", icon_flag_mz_png, sizeof icon_flag_mz_png, 0, 0 },
+	{ "flag_na", icon_flag_na_png, sizeof icon_flag_na_png, 0, 0 },
+	{ "flag_nc", icon_flag_nc_png, sizeof icon_flag_nc_png, 0, 0 },
+	{ "flag_ne", icon_flag_ne_png, sizeof icon_flag_ne_png, 0, 0 },
+	{ "flag_nf", icon_flag_nf_png, sizeof icon_flag_nf_png, 0, 0 },
+	{ "flag_ng", icon_flag_ng_png, sizeof icon_flag_ng_png, 0, 0 },
+	{ "flag_ni", icon_flag_ni_png, sizeof icon_flag_ni_png, 0, 0 },
+	{ "flag_nl", icon_flag_nl_png, sizeof icon_flag_nl_png, 0, 0 },
+	{ "flag_no", icon_flag_no_png, sizeof icon_flag_no_png, 0, 0 },
+	{ "flag_np", icon_flag_np_png, sizeof icon_flag_np_png, 0, 0 },
+	{ "flag_nr", icon_flag_nr_png, sizeof icon_flag_nr_png, 0, 0 },
+	{ "flag_nu", icon_flag_nu_png, sizeof icon_flag_nu_png, 0, 0 },
+	{ "flag_nz", icon_flag_nz_png, sizeof icon_flag_nz_png, 0, 0 },
+	{ "flag_om", icon_flag_om_png, sizeof icon_flag_om_png, 0, 0 },
+	{ "flag_pa", icon_flag_pa_png, sizeof icon_flag_pa_png, 0, 0 },
+	{ "flag_pe", icon_flag_pe_png, sizeof icon_flag_pe_png, 0, 0 },
+	{ "flag_pf", icon_flag_pf_png, sizeof icon_flag_pf_png, 0, 0 },
+	{ "flag_pg", icon_flag_pg_png, sizeof icon_flag_pg_png, 0, 0 },
+	{ "flag_ph", icon_flag_ph_png, sizeof icon_flag_ph_png, 0, 0 },
+	{ "flag_pk", icon_flag_pk_png, sizeof icon_flag_pk_png, 0, 0 },
+	{ "flag_pl", icon_flag_pl_png, sizeof icon_flag_pl_png, 0, 0 },
+	{ "flag_pm", icon_flag_pm_png, sizeof icon_flag_pm_png, 0, 0 },
+	{ "flag_pn", icon_flag_pn_png, sizeof icon_flag_pn_png, 0, 0 },
+	{ "flag_pr", icon_flag_pr_png, sizeof icon_flag_pr_png, 0, 0 },
+	{ "flag_ps", icon_flag_ps_png, sizeof icon_flag_ps_png, 0, 0 },
+	{ "flag_pt", icon_flag_pt_png, sizeof icon_flag_pt_png, 0, 0 },
+	{ "flag_pw", icon_flag_pw_png, sizeof icon_flag_pw_png, 0, 0 },
+	{ "flag_py", icon_flag_py_png, sizeof icon_flag_py_png, 0, 0 },
+	{ "flag_qa", icon_flag_qa_png, sizeof icon_flag_qa_png, 0, 0 },
+	{ "flag_re", icon_flag_re_png, sizeof icon_flag_re_png, 0, 0 },
+	{ "flag_ro", icon_flag_ro_png, sizeof icon_flag_ro_png, 0, 0 },
+	{ "flag_rs", icon_flag_rs_png, sizeof icon_flag_rs_png, 0, 0 },
+	{ "flag_ru", icon_flag_ru_png, sizeof icon_flag_ru_png, 0, 0 },
+	{ "flag_rw", icon_flag_rw_png, sizeof icon_flag_rw_png, 0, 0 },
+	{ "flag_sa", icon_flag_sa_png, sizeof icon_flag_sa_png, 0, 0 },
+	{ "flag_sb", icon_flag_sb_png, sizeof icon_flag_sb_png, 0, 0 },
+	{ "flag_sc", icon_flag_sc_png, sizeof icon_flag_sc_png, 0, 0 },
+	{ "flag_sd", icon_flag_sd_png, sizeof icon_flag_sd_png, 0, 0 },
+	{ "flag_se", icon_flag_se_png, sizeof icon_flag_se_png, 0, 0 },
+	{ "flag_sg", icon_flag_sg_png, sizeof icon_flag_sg_png, 0, 0 },
+	{ "flag_sh", icon_flag_sh_png, sizeof icon_flag_sh_png, 0, 0 },
+	{ "flag_si", icon_flag_si_png, sizeof icon_flag_si_png, 0, 0 },
+	{ "flag_sj", icon_flag_sj_png, sizeof icon_flag_sj_png, 0, 0 },
+	{ "flag_sk", icon_flag_sk_png, sizeof icon_flag_sk_png, 0, 0 },
+	{ "flag_sl", icon_flag_sl_png, sizeof icon_flag_sl_png, 0, 0 },
+	{ "flag_sm", icon_flag_sm_png, sizeof icon_flag_sm_png, 0, 0 },
+	{ "flag_sn", icon_flag_sn_png, sizeof icon_flag_sn_png, 0, 0 },
+	{ "flag_so", icon_flag_so_png, sizeof icon_flag_so_png, 0, 0 },
+	{ "flag_sr", icon_flag_sr_png, sizeof icon_flag_sr_png, 0, 0 },
+	{ "flag_ss", icon_flag_ss_png, sizeof icon_flag_ss_png, 0, 0 },
+	{ "flag_st", icon_flag_st_png, sizeof icon_flag_st_png, 0, 0 },
+	{ "flag_sv", icon_flag_sv_png, sizeof icon_flag_sv_png, 0, 0 },
+	{ "flag_sx", icon_flag_sx_png, sizeof icon_flag_sx_png, 0, 0 },
+	{ "flag_sy", icon_flag_sy_png, sizeof icon_flag_sy_png, 0, 0 },
+	{ "flag_sz", icon_flag_sz_png, sizeof icon_flag_sz_png, 0, 0 },
+	{ "flag_tc", icon_flag_tc_png, sizeof icon_flag_tc_png, 0, 0 },
+	{ "flag_td", icon_flag_td_png, sizeof icon_flag_td_png, 0, 0 },
+	{ "flag_tf", icon_flag_tf_png, sizeof icon_flag_tf_png, 0, 0 },
+	{ "flag_tg", icon_flag_tg_png, sizeof icon_flag_tg_png, 0, 0 },
+	{ "flag_th", icon_flag_th_png, sizeof icon_flag_th_png, 0, 0 },
+	{ "flag_tj", icon_flag_tj_png, sizeof icon_flag_tj_png, 0, 0 },
+	{ "flag_tk", icon_flag_tk_png, sizeof icon_flag_tk_png, 0, 0 },
+	{ "flag_tl", icon_flag_tl_png, sizeof icon_flag_tl_png, 0, 0 },
+	{ "flag_tm", icon_flag_tm_png, sizeof icon_flag_tm_png, 0, 0 },
+	{ "flag_tn", icon_flag_tn_png, sizeof icon_flag_tn_png, 0, 0 },
+	{ "flag_to", icon_flag_to_png, sizeof icon_flag_to_png, 0, 0 },
+	{ "flag_tr", icon_flag_tr_png, sizeof icon_flag_tr_png, 0, 0 },
+	{ "flag_tt", icon_flag_tt_png, sizeof icon_flag_tt_png, 0, 0 },
+	{ "flag_tv", icon_flag_tv_png, sizeof icon_flag_tv_png, 0, 0 },
+	{ "flag_tw", icon_flag_tw_png, sizeof icon_flag_tw_png, 0, 0 },
+	{ "flag_tz", icon_flag_tz_png, sizeof icon_flag_tz_png, 0, 0 },
+	{ "flag_ua", icon_flag_ua_png, sizeof icon_flag_ua_png, 0, 0 },
+	{ "flag_ug", icon_flag_ug_png, sizeof icon_flag_ug_png, 0, 0 },
+	{ "flag_um", icon_flag_um_png, sizeof icon_flag_um_png, 0, 0 },
+	{ "flag_unknown", icon_flag_unknown_png, sizeof icon_flag_unknown_png, 0, 0 },
+	{ "flag_us", icon_flag_us_png, sizeof icon_flag_us_png, 0, 0 },
+	{ "flag_uy", icon_flag_uy_png, sizeof icon_flag_uy_png, 0, 0 },
+	{ "flag_uz", icon_flag_uz_png, sizeof icon_flag_uz_png, 0, 0 },
+	{ "flag_va", icon_flag_va_png, sizeof icon_flag_va_png, 0, 0 },
+	{ "flag_vc", icon_flag_vc_png, sizeof icon_flag_vc_png, 0, 0 },
+	{ "flag_ve", icon_flag_ve_png, sizeof icon_flag_ve_png, 0, 0 },
+	{ "flag_vg", icon_flag_vg_png, sizeof icon_flag_vg_png, 0, 0 },
+	{ "flag_vi", icon_flag_vi_png, sizeof icon_flag_vi_png, 0, 0 },
+	{ "flag_vn", icon_flag_vn_png, sizeof icon_flag_vn_png, 0, 0 },
+	{ "flag_vu", icon_flag_vu_png, sizeof icon_flag_vu_png, 0, 0 },
+	{ "flag_wf", icon_flag_wf_png, sizeof icon_flag_wf_png, 0, 0 },
+	{ "flag_ws", icon_flag_ws_png, sizeof icon_flag_ws_png, 0, 0 },
+	{ "flag_ye", icon_flag_ye_png, sizeof icon_flag_ye_png, 0, 0 },
+	{ "flag_yt", icon_flag_yt_png, sizeof icon_flag_yt_png, 0, 0 },
+	{ "flag_za", icon_flag_za_png, sizeof icon_flag_za_png, 0, 0 },
+	{ "flag_zm", icon_flag_zm_png, sizeof icon_flag_zm_png, 0, 0 },
+	{ "flag_zw", icon_flag_zw_png, sizeof icon_flag_zw_png, 0, 0 },
 };
 
 static const int icons_count = (int) (sizeof icons / sizeof icons0);

amule-3.0.1.tar.gz/src/icons/icon_data.h -> amule-3.1.0.tar.gz/src/icons/icon_data.h Changed

@@ -1,12 +1,13 @@
 /*
- * icon_data.h — public C-API for the embedded PNG icon set.
+ * icon_data.h: public C-API for the embedded PNG icon set.
  *
  * The icon data itself lives in icon_data.c, which is build-time-
  * generated by src/icons/embed_icons.py from every .png under
- * src/icons/.  Each PNG becomes a static byte array; collectively
- * they're indexed in a lookup table accessible through this API.
+ * src/icons/ plus each icon's optional same-name .svg twin.  Each
+ * file becomes a static byte array; collectively they're indexed in
+ * a lookup table accessible through this API.
  *
- * Consumers normally don't touch this directly — they go through
+ * Consumers normally don't touch this directly -- they go through
  * CamuleArtProvider, which wraps amule_find_icon() in a wxArtProvider
  * subclass and decodes the embedded PNG bytes via wxImage.  The
  * direct-table API (amule_get_all_icons) is exposed for cases where a
@@ -14,7 +15,7 @@
  * src/IP2Country.cpp iterating over country-flag icons whose codes
  * are stored as part of the icon name itself, e.g. "flag_us").
  *
- * Compiled as C — the byte arrays are pure data with no string
+ * Compiled as C: the byte arrays are pure data with no string
  * literals, so the choice of TU language is mostly stylistic, but
  * keeping it C matches src/xpm_data.c's pattern (icons-as-data live
  * in C TUs) and avoids any future C++ deprecation friction.
@@ -27,10 +28,18 @@
 extern "C" {
 #endif
 
-struct AMuleIconEntry {
-	const char *name;            /* art id, e.g. "amule" or "flag_us" */
+struct AMuleIconEntry
+{
+	const char *name; /* art id, e.g. "amule" or "flag_us" */
 	const unsigned char *png_data;
 	unsigned int png_len;
+	/*
+	 * Optional vector twin (NanoSVG-subset SVG bytes); NULL/0 when the
+	 * icon ships as PNG only.  CamuleArtProvider prefers it for
+	 * wxBitmapBundle requests on wx builds with SVG support.
+	 */
+	const unsigned char *svg_data;
+	unsigned int svg_len;
 };
 
 /*

amule-3.1.0.tar.gz/src/icons/message.png Added

amule-3.1.0.tar.gz/src/icons/message.svg Added

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 665.3 360.425 C 691.907 359.312 722.181 359.976 748.998 359.988 L 890.293 360.039 L 1331.67 359.955 L 1401.94 359.977 C 1416.06 359.985 1431.81 359.562 1445.77 360.574 C 1539.87 366.554 1628.56 406.69 1695.16 473.442 C 1766.18 544.352 1804.41 633.773 1810.56 733.608 C 1811.51 748.986 1811.13 766.758 1811.14 782.334 L 1811.18 859.915 L 1811.87 1079.56 C 1811.91 1101.84 1811.65 1121.92 1809.62 1144.13 C 1801.41 1234.07 1763.36 1318.26 1699.23 1382.42 C 1634.93 1446.93 1549.88 1486.62 1459.14 1494.46 C 1420.62 1498.05 1370.34 1496.98 1331.04 1496.98 L 1130.5 1496.88 C 1087.56 1496.72 1044.61 1496.85 1001.67 1497.29 C 989.601 1507.18 977.183 1520.46 965.856 1531.59 L 909.139 1587.18 L 727.205 1766.36 C 713.2 1780.35 701.009 1790.45 679.502 1790.28 C 665.583 1790.17 652.248 1784.35 642.757 1774.08 C 634.981 1765.62 630.114 1754.89 628.87 1743.47 C 626.777 1725.28 632.714 1687.96 633.953 1668.05 C 637.44 1611.99 645.122 1553.2 647.152 1497.28 C 641.853 1496.3 635.726 1495.27 630.447 1494.58 C 450.519 1471.13 306.464 1326.31 295.604 1143.27 C 294.044 1116.98 294.965 1088.67 294.965 1061.93 L 294.893 923.029 L 295.029 808.033 C 295.065 776.892 294.152 741.084 297.344 710.347 C 306.649 628.527 340.833 551.531 395.283 489.754 C 466.025 410.508 559.504 366.687 665.3 360.425 z"/>
+<path transform="translate(0,0)" fill="rgb(255,255,255)" d="M 661.902 458.421 C 665.232 458.101 668.191 457.997 671.527 457.996 C 748.985 457.955 826.527 458.8 903.984 458.9 L 1239.35 458.67 L 1378.14 458.585 C 1413.34 458.769 1444.34 457.416 1479.2 464.509 C 1535.47 475.632 1587.2 503.127 1627.89 543.542 C 1672.57 587.303 1701.44 644.671 1709.95 706.627 C 1713.13 729.979 1713.16 748.468 1713.31 771.866 L 1713.2 977.404 L 1713.39 1062.25 C 1713.44 1072.24 1712.97 1084.14 1713.57 1094 C 1722.92 1246.8 1602.5 1383.95 1451.58 1400.62 C 1422.51 1403.83 1386.29 1401.98 1356.25 1401.98 L 1208.5 1401.95 L 1055.55 1402.33 C 1030.7 1402.35 1005.8 1401.83 980.966 1402.01 C 968.469 1402.1 963.099 1402.97 952.704 1410.6 C 942.107 1418.37 931.331 1429.68 921.789 1438.99 L 875.589 1484.17 L 791.296 1567.15 C 771.174 1586.86 750.029 1606.85 730.73 1627.18 C 731.099 1615.49 733.39 1597.7 734.494 1585.47 L 742.278 1498.57 C 743.694 1482.58 746.332 1463.87 745.245 1448.49 C 742.599 1417.92 718.34 1400.82 689.006 1401.77 C 618.359 1404.07 550.145 1380.86 495.937 1335.47 C 436.842 1286.75 399.799 1216.33 393.133 1140.03 C 391.08 1116.04 391.884 1086.91 391.896 1062.43 L 391.959 940.852 L 391.939 807.03 C 391.927 768.477 390.234 724.433 398.036 687.032 C 407.909 641.366 428.705 598.774 458.643 562.906 C 511.933 500.166 579.667 464.982 661.902 458.421 z"/>
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 745.629 1085.51 L 1198.81 1085.22 L 1351.81 1085.48 C 1374.7 1085.62 1399.23 1084.99 1422.04 1086.44 C 1431.7 1087.05 1442.19 1093.12 1449.17 1099.86 C 1459.19 1109.63 1464.87 1123.01 1464.94 1137 C 1465.08 1159.19 1449.55 1180.8 1427.95 1184.63 C 1412.02 1187.46 1389.66 1186.18 1373.07 1186.06 L 913.595 1186.01 L 772.25 1186.64 C 748.25 1186.65 723.871 1187.35 700.094 1185.63 C 658.725 1182.57 641.695 1130.54 670.058 1101.2 C 689.603 1080.98 719.412 1085.55 745.629 1085.51 z"/>
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 736.572 877.5 L 1193.62 877.532 L 1345.15 877.326 C 1369.63 877.336 1395.36 876.928 1419.79 878.12 C 1429.64 878.601 1440.27 883.719 1447.65 890.342 C 1457.58 899.216 1463.56 911.68 1464.28 924.978 C 1464.99 938.791 1460.41 952.453 1450.81 962.563 C 1433.87 980.393 1409.4 977.775 1386.74 977.816 L 907.827 977.684 L 778.368 977.442 C 752.639 977.593 726.463 978.474 700.812 977.202 C 676.081 975.975 657.589 954.303 656.667 929.999 C 656.126 916.2 661.234 902.778 670.812 892.83 C 688.325 874.682 713.151 877.615 736.572 877.5 z"/>
+<path transform="translate(0,0)" fill="rgb(95,155,214)" d="M 699.269 670.19 C 711.449 669.425 727.833 669.842 740.186 669.859 L 811.145 669.975 L 1025.61 670.006 L 1284.35 669.88 C 1327.55 669.875 1371.14 669.736 1414.35 670.106 C 1424.03 670.714 1430.13 670.427 1438.68 675.77 C 1479.65 701.391 1470.93 758.908 1423.15 768.926 C 1414.54 769.62 1402.32 769.225 1393.44 769.236 L 1339.4 769.322 L 1164.44 769.569 L 870.862 769.762 C 817.19 769.725 763.502 769.237 709.835 769.223 C 685.114 769.217 665.081 757.019 658.277 732.153 C 654.688 718.927 656.748 704.805 663.964 693.154 C 672.414 679.561 684.251 673.461 699.269 670.19 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/prefs_advanced.png Added

amule-3.1.0.tar.gz/src/icons/prefs_advanced.svg Added

@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="xbar" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#ff7b6b"/>
+      <stop offset="0.5" stop-color="#e42a24"/>
+      <stop offset="1" stop-color="#a01008"/>
+    </linearGradient>
+  </defs>
+  <g stroke="#7a0c06" stroke-width="0.5" stroke-linejoin="round">
+    <path d="M3.2 1.6 L8 6.4 L12.8 1.6 L14.4 3.2 L9.6 8 L14.4 12.8 L12.8 14.4 L8 9.6 L3.2 14.4 L1.6 12.8 L6.4 8 L1.6 3.2 Z" fill="url(#xbar)"/>
+  </g>
+  <path d="M3.4 2.4 L7.4 6.4 L6.6 7.2 L2.6 3.2 Z" fill="#ffffff" opacity="0.35"/>
+  <path d="M12.6 2.4 L13.6 3.2 L9.6 7.2 L8.9 6.5 Z" fill="#ffffff" opacity="0.35"/>
+  <g>
+    <ellipse cx="6.1" cy="8.5" rx="1.85" ry="1.45" fill="#eaf7fb" stroke="#7a0c06" stroke-width="0.35"/>
+    <ellipse cx="9.9" cy="8.5" rx="1.85" ry="1.45" fill="#eaf7fb" stroke="#7a0c06" stroke-width="0.35"/>
+    <circle cx="6.4" cy="8.65" r="0.78" fill="#d01810"/>
+    <circle cx="9.6" cy="8.65" r="0.78" fill="#d01810"/>
+    <path d="M4.1 7.7 Q6.1 5.4 8.1 7.1" fill="none" stroke="#8f0d05" stroke-width="1.05" stroke-linecap="round"/>
+    <path d="M7.9 7.1 Q9.9 5.4 11.9 7.7" fill="none" stroke="#8f0d05" stroke-width="1.05" stroke-linecap="round"/>
+  </g>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_connection.png Added

amule-3.1.0.tar.gz/src/icons/prefs_connection.svg Added

@@ -0,0 +1,37 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <radialGradient id="globe" cx="0.36" cy="0.28" r="0.92">
+      <stop offset="0" stop-color="#eaf2fc"/>
+      <stop offset="0.4" stop-color="#93b4e2"/>
+      <stop offset="0.74" stop-color="#3f6cb5"/>
+      <stop offset="1" stop-color="#244d8f"/>
+    </radialGradient>
+    <linearGradient id="plugbody" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="#ffd98a"/>
+      <stop offset="0.5" stop-color="#f0a828"/>
+      <stop offset="1" stop-color="#b06f12"/>
+    </linearGradient>
+    <linearGradient id="prong" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="#f0f0f4"/>
+      <stop offset="0.5" stop-color="#b8bcc6"/>
+      <stop offset="1" stop-color="#7c8090"/>
+    </linearGradient>
+  </defs>
+  <circle cx="13" cy="12" r="10.8" fill="url(#globe)" stroke="#1d3f78" stroke-width="0.8"/>
+  <g fill="#eef4fc" opacity="0.92" transform="translate(-2.9 -0.45) scale(0.955)">
+    <path d="M12.6 9.2 Q13.6 8.2 15.8 8 Q18.4 7.8 19.8 8.2 Q21.2 9.6 20.4 11 Q19.5 12 19.3 13.4 Q19 15.8 17.3 17.8 Q16.3 18.6 15.9 17.2 Q15.5 15 14.7 14 Q13.3 13.6 13.1 12.2 Q11.7 10.6 12.6 9.2 Z"/>
+    <ellipse cx="20.7" cy="15.8" rx="0.75" ry="1.35" transform="rotate(18 20.7 15.8)"/>
+    <path d="M13.9 6.4 Q15.7 5.2 18 5.6 Q19.6 6 19.1 7.1 Q16.9 7.5 14.7 7.5 Q13.8 7.1 13.9 6.4 Z"/>
+    <path d="M20.8 7.4 Q22.6 7 23.6 8.2 Q22.9 9.3 21.4 8.9 Q20.5 8.2 20.8 7.4 Z"/>
+    <path d="M9.3 13.2 Q10.7 13.4 10.9 15.2 Q10.7 17.2 9.6 17.9 Q8.7 15.4 9.3 13.2 Z"/>
+  </g>
+  <ellipse cx="8.4" cy="6.2" rx="4.2" ry="2.3" fill="#ffffff" opacity="0.5" transform="rotate(-32 8.4 6.2)"/>
+  <path d="M25 24 Q29.5 27 26 29.4 Q23.8 30.4 21 29.4" fill="none" stroke="#8a0f06" stroke-width="3.4" stroke-linecap="round"/>
+  <path d="M25 24 Q29 27 25.8 29.1 Q24 30 21.7 29.1" fill="none" stroke="#ec3b1e" stroke-width="2" stroke-linecap="round"/>
+  <g transform="rotate(45 22 21)">
+    <rect x="17.2" y="19.1" width="4.2" height="1.5" rx="0.4" fill="url(#prong)" stroke="#5c6070" stroke-width="0.3"/>
+    <rect x="17.2" y="21.4" width="4.2" height="1.5" rx="0.4" fill="url(#prong)" stroke="#5c6070" stroke-width="0.3"/>
+    <rect x="20.8" y="17.6" width="6.4" height="6.8" rx="1.2" fill="url(#plugbody)" stroke="#7a4a10" stroke-width="0.6"/>
+    <rect x="21.4" y="18.4" width="1.8" height="5.2" rx="0.6" fill="#ffffff" opacity="0.3"/>
+  </g>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_debug.png Added

amule-3.1.0.tar.gz/src/icons/prefs_debug.svg Added

@@ -0,0 +1,23 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <radialGradient id="body" cx="0.6" cy="0.7" r="0.85">
+      <stop offset="0" stop-color="#5a5f7a"/>
+      <stop offset="0.55" stop-color="#2e3350"/>
+      <stop offset="1" stop-color="#14162c"/>
+    </radialGradient>
+  </defs>
+  <g transform="rotate(180 8 8)">
+    <g stroke="#4a4f66" stroke-width="0.9" stroke-linecap="round">
+      <path d="M5 6 L1.6 4.2"/>
+      <path d="M5 8 L1.2 8"/>
+      <path d="M5 10 L1.8 12"/>
+      <path d="M11 6 L14.4 4.2"/>
+      <path d="M11 8 L14.8 8"/>
+      <path d="M11 10 L14.2 12"/>
+    </g>
+    <ellipse cx="8" cy="8.4" rx="4" ry="5.4" fill="url(#body)" stroke="#0f1122" stroke-width="0.5"/>
+    <ellipse cx="8" cy="3.6" rx="2.2" ry="1.8" fill="#232741" stroke="#0f1122" stroke-width="0.5"/>
+    <line x1="8" y1="4" x2="8" y2="13.2" stroke="#12142a" stroke-width="0.7"/>
+  </g>
+  <ellipse cx="6.6" cy="6.6" rx="1.1" ry="1.8" fill="#ffffff" opacity="0.22" transform="rotate(-18 6.6 6.6)"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_directories.png Added

amule-3.1.0.tar.gz/src/icons/prefs_directories.svg Added

@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="dirBack" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#f6c65b"/>
+      <stop offset="1" stop-color="#e0951f"/>
+    </linearGradient>
+    <linearGradient id="dirFront" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#ffe6a3"/>
+      <stop offset="1" stop-color="#f4b544"/>
+    </linearGradient>
+  </defs>
+  
+  <path d="M1.4 4.9 a1 1 0 0 1 1 -1 h3.1 a0.6 0.6 0 0 1 0.44 0.19 l1.22 1.31 H13.6 a1 1 0 0 1 1 1 v5.5 a1 1 0 0 1 -1 1 H2.4 a1 1 0 0 1 -1 -1 Z"
+        fill="url(#dirBack)" stroke="#b9791a" stroke-width="0.5"/>
+  
+  <path d="M2.1 7.35 H13.9 v4.4 a0.85 0.85 0 0 1 -0.85 0.85 H2.95 a0.85 0.85 0 0 1 -0.85 -0.85 Z"
+        fill="url(#dirFront)" stroke="#c8892a" stroke-width="0.5"/>
+  
+  <path d="M2.7 7.9 H13.3" fill="none" stroke="#fff3d4" stroke-width="0.55" stroke-linecap="round" opacity="0.7"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_events.png Added

amule-3.1.0.tar.gz/src/icons/prefs_events.svg Added

@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="bell" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#ffdd70"/>
+      <stop offset="1" stop-color="#e29a12"/>
+    </linearGradient>
+  </defs>
+  
+  <path d="M8 1.6 a1.15 1.15 0 0 0 -1.15 1.15 a1.15 1.15 0 0 0 2.3 0 A1.15 1.15 0 0 0 8 1.6 Z"
+        fill="url(#bell)" stroke="#b9791a" stroke-width="0.45"/>
+  
+  <path d="M8 3.1 C5.5 3.1 4.5 5.4 4.5 7.9 C4.5 9.9 4.05 10.9 3.35 11.55 A0.55 0.55 0 0 0 3.72 12.5 H12.28 A0.55 0.55 0 0 0 12.65 11.55 C11.95 10.9 11.5 9.9 11.5 7.9 C11.5 5.4 10.5 3.1 8 3.1 Z"
+        fill="url(#bell)" stroke="#b9791a" stroke-width="0.5"/>
+  
+  <circle cx="8" cy="13.35" r="1.15" fill="url(#bell)" stroke="#b9791a" stroke-width="0.45"/>
+  
+  <path d="M6.5 5 C5.85 5.9 5.6 6.9 5.6 8" fill="none" stroke="#fff4cc" stroke-width="0.6" stroke-linecap="round" opacity="0.8"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_files.png Added

amule-3.1.0.tar.gz/src/icons/prefs_files.svg Added

@@ -0,0 +1,42 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <radialGradient id="top" cx="0.45" cy="0.55" r="0.75">
+      <stop offset="0" stop-color="#e2f2ff"/>
+      <stop offset="0.35" stop-color="#a9d6ff"/>
+      <stop offset="0.7" stop-color="#5aa7fe"/>
+      <stop offset="1" stop-color="#4092fa"/>
+    </radialGradient>
+    <linearGradient id="left" gradientUnits="userSpaceOnUse" x1="7" y1="9" x2="9" y2="31">
+      <stop offset="0" stop-color="#86c4ff"/>
+      <stop offset="0.4" stop-color="#54a4fe"/>
+      <stop offset="1" stop-color="#3c89f2"/>
+    </linearGradient>
+    <linearGradient id="right" gradientUnits="userSpaceOnUse" x1="21" y1="10" x2="21" y2="31">
+      <stop offset="0" stop-color="#4090f4"/>
+      <stop offset="1" stop-color="#2e6ed6"/>
+    </linearGradient>
+    <linearGradient id="drawer" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#f0faff"/>
+      <stop offset="0.3" stop-color="#c0e4ff"/>
+      <stop offset="0.7" stop-color="#86c2ff"/>
+      <stop offset="1" stop-color="#63aaf8"/>
+    </linearGradient>
+  </defs>
+  <path d="M17.5 1.4 L29.5 9 L29.5 23.8 L13 30.6 L2 23.8 L2 8.2 Z" fill="none" stroke="#1c47ab" stroke-width="2.4" stroke-linejoin="round" opacity="0.3"/>
+  <path d="M17.5 1.4 L29.5 9 L29.5 23.8 L13 30.6 L2 23.8 L2 8.2 Z" fill="#1c47ab" stroke="#1c47ab" stroke-width="1.5" stroke-linejoin="round"/>
+  <path d="M2 8.2 L13 14.5 L13 30.6 L2 23.8 Z" fill="url(#left)"/>
+  <path d="M13 14.5 L29.5 9 L29.5 23.8 L13 30.6 Z" fill="url(#right)"/>
+  <path d="M17.5 1.4 L29.5 9 L13 14.5 L2 8.2 Z" fill="url(#top)"/>
+  <ellipse cx="6.5" cy="21.5" rx="4.8" ry="6.2" fill="#bcd9ff" opacity="0.22" transform="rotate(-38 6.5 21.5)"/>
+  <path d="M14.4 20.4 L28.4 15.7 L28.4 16.8 L14.4 21.5 Z" fill="#2456bd" opacity="0.8"/>
+  <path d="M14.4 26.2 L28.4 21.5 L28.4 22.6 L14.4 27.3 Z" fill="#2456bd" opacity="0.8"/>
+  <path d="M14.4 15.8 L28.4 11.1 L28.4 15.7 L14.4 20.4 Z" fill="url(#drawer)" stroke="#2a5fc4" stroke-width="0.9"/>
+  <path d="M14.4 21.6 L28.4 16.9 L28.4 21.5 L14.4 26.2 Z" fill="url(#drawer)" stroke="#2a5fc4" stroke-width="0.9"/>
+  <line x1="15" y1="16.1" x2="27.8" y2="11.8" stroke="#ffffff" stroke-width="0.9" opacity="0.85"/>
+  <line x1="15" y1="21.9" x2="27.8" y2="17.6" stroke="#ffffff" stroke-width="0.9" opacity="0.85"/>
+  <line x1="20.2" y1="16.1" x2="23" y2="15.2" stroke="#16368c" stroke-width="1.7" stroke-linecap="round"/>
+  <line x1="20.2" y1="21.9" x2="23" y2="21" stroke="#16368c" stroke-width="1.7" stroke-linecap="round"/>
+  <polyline points="2,8.2 13,14.5 29.5,9" fill="none" stroke="#d7edff" stroke-width="1.3" stroke-linejoin="round" opacity="0.95"/>
+  <line x1="13" y1="14.5" x2="13" y2="30.6" stroke="#9ccdff" stroke-width="0.9" opacity="0.5"/>
+  <circle cx="13" cy="14.7" r="1.1" fill="#ecf8ff" opacity="0.9"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_filters.png Added

amule-3.1.0.tar.gz/src/icons/prefs_filters.svg Added

@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="cone" x1="0" y1="0" x2="1" y2="0">
+      <stop offset="0" stop-color="#cfe4fb"/>
+      <stop offset="0.45" stop-color="#5b9ae6"/>
+      <stop offset="1" stop-color="#2a5da8"/>
+    </linearGradient>
+    <linearGradient id="mouth" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#1c4a86"/>
+      <stop offset="1" stop-color="#3f76c4"/>
+    </linearGradient>
+  </defs>
+  <path d="M2.2 3.4 A5.8 1.8 0 0 0 13.8 3.4 L9.1 9.8 L9.1 13.9 Q9.1 14.8 8.2 14.8 L7.9 14.8 Q7 14.8 7 13.9 L7 9.8 Z" fill="url(#cone)" stroke="#1c4a86" stroke-width="0.55" stroke-linejoin="round"/>
+  <ellipse cx="8" cy="3.4" rx="5.8" ry="1.8" fill="url(#mouth)" stroke="#1c4a86" stroke-width="0.55"/>
+  <ellipse cx="8" cy="3.5" rx="4.6" ry="1.2" fill="#3f76c4"/>
+  <ellipse cx="6.4" cy="3.1" rx="2.2" ry="0.6" fill="#9ec4ef" opacity="0.8" transform="rotate(-4 6.4 3.1)"/>
+  <path d="M4.4 5.6 Q5.6 7.4 7.2 8.6" fill="none" stroke="#ffffff" stroke-width="0.8" stroke-linecap="round" opacity="0.55"/>
+  <path d="M7.55 10.4 L7.55 13.6" fill="none" stroke="#ffffff" stroke-width="0.55" stroke-linecap="round" opacity="0.5"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_general.png Added

amule-3.1.0.tar.gz/src/icons/prefs_general.svg Added

@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <radialGradient id="ring" cx="0.38" cy="0.32" r="0.95">
+      <stop offset="0" stop-color="#dcdeee"/>
+      <stop offset="0.55" stop-color="#9598b8"/>
+      <stop offset="1" stop-color="#585a82"/>
+    </radialGradient>
+  </defs>
+  <path fill-rule="evenodd" fill="url(#ring)" stroke="#383a60" stroke-width="0.45" stroke-linejoin="round"
+    d="M3.97 3.2 L3.94 1.39 L5.8 0.63 L7.05 1.93 A5.7 5.7 0 0 1 8.15 1.93 L9.4 0.63 L11.26 1.39 L11.23 3.2
+       A5.7 5.7 0 0 1 12.0 3.98 L13.81 3.94 L14.57 5.8 L13.27 7.05 A5.7 5.7 0 0 1 13.27 8.15
+       L14.57 9.4 L13.81 11.26 L12.0 11.22 A5.7 5.7 0 0 1 11.23 12.0 L11.26 13.81 L9.4 14.57 L8.15 13.27
+       A5.7 5.7 0 0 1 7.05 13.27 L5.8 14.57 L3.94 13.81 L3.97 12.0 A5.7 5.7 0 0 1 3.2 11.22
+       L1.39 11.26 L0.63 9.4 L1.93 8.15 A5.7 5.7 0 0 1 1.93 7.05 L0.63 5.8 L1.39 3.94 L3.2 3.97
+       A5.7 5.7 0 0 1 3.97 3.2 Z
+       M10.35 7.4 a2.95 2.95 0 1 0 -5.9 0 a2.95 2.95 0 1 0 5.9 0 Z"/>
+  <path d="M6.18 2.86 A4.7 4.7 0 0 0 2.98 5.79" fill="none" stroke="#ffffff" stroke-width="1.3" opacity="0.5" stroke-linecap="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_interface.png Added

amule-3.1.0.tar.gz/src/icons/prefs_interface.svg Added

@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <radialGradient id="board" cx="0.68" cy="0.42" r="0.75">
+      <stop offset="0" stop-color="#fff5b0"/>
+      <stop offset="0.4" stop-color="#ffe288"/>
+      <stop offset="0.75" stop-color="#ffcd5c"/>
+      <stop offset="1" stop-color="#edb043"/>
+    </radialGradient>
+  </defs>
+  <path d="M8.2 1.7 C11.4 1.7 13.9 3.2 14.5 5.4 C14.9 7.5 13.9 9.3 12.0 10.3 C10.3 11.2 8.6 11.3 7.6 12.6 C7.1 13.4 7.0 14.3 6.2 14.9 C5.5 15.4 4.5 15.5 3.8 15.0 C3.0 14.4 2.4 13.3 1.9 12.3 C1.6 11.6 1.4 10.7 1.3 9.8 C1.1 8.2 1.4 6.6 2.1 5.3 C2.9 3.9 4.3 2.7 5.8 2.1 C6.6 1.8 7.4 1.7 8.2 1.7 Z M5.92 12.55 A0.95 1.5 -15 1 0 4.08 13.05 A0.95 1.5 -15 1 0 5.92 12.55 Z" fill="url(#board)" fill-rule="evenodd" stroke="#7b7b7b" stroke-width="0.9" stroke-linejoin="round"/>
+  <circle cx="7.3" cy="3.9" r="1.45" fill="#1f9e10"/>
+  <circle cx="6.95" cy="3.55" r="0.68" fill="#a8d968" opacity="0.9"/>
+  <circle cx="11.2" cy="4.6" r="1.45" fill="#3f6ff9"/>
+  <circle cx="10.85" cy="4.25" r="0.68" fill="#a4bbfc" opacity="0.9"/>
+  <circle cx="3.7" cy="6.3" r="1.45" fill="#f21000"/>
+  <circle cx="3.35" cy="5.95" r="0.68" fill="#ff8a66" opacity="0.9"/>
+  <circle cx="3.4" cy="9.9" r="1.45" fill="#f9971d"/>
+  <circle cx="3.05" cy="9.55" r="0.68" fill="#ffd070" opacity="0.9"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_ip2country.svg Added

amule-3.1.0.tar.gz/src/icons/prefs_onlinesig.png Added

amule-3.1.0.tar.gz/src/icons/prefs_onlinesig.svg Added

@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="post" x1="0" y1="0" x2="1" y2="0">
+      <stop offset="0" stop-color="#b8875a"/>
+      <stop offset="0.5" stop-color="#8a5a2e"/>
+      <stop offset="1" stop-color="#5e3a18"/>
+    </linearGradient>
+    <linearGradient id="board" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#ffffff"/>
+      <stop offset="1" stop-color="#d9d2c2"/>
+    </linearGradient>
+  </defs>
+  <rect x="7.2" y="6" width="1.7" height="9.4" rx="0.3" fill="url(#post)" stroke="#4e3214" stroke-width="0.3"/>
+  <g transform="rotate(-5 8 4.6)">
+    <rect x="2.2" y="1.6" width="11.6" height="6" rx="0.8" fill="url(#board)" stroke="#7a5a34" stroke-width="0.6"/>
+    <line x1="3.6" y1="3.3" x2="12.4" y2="3.3" stroke="#9aa0b0" stroke-width="0.7"/>
+    <line x1="3.6" y1="4.6" x2="12.4" y2="4.6" stroke="#9aa0b0" stroke-width="0.7"/>
+    <line x1="3.6" y1="5.9" x2="9.6" y2="5.9" stroke="#9aa0b0" stroke-width="0.7"/>
+  </g>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_pathmapping.png Added

amule-3.1.0.tar.gz/src/icons/prefs_pathmapping.svg Added

@@ -0,0 +1,34 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="pmBack" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#7fc4e8"/>
+      <stop offset="1" stop-color="#2f86bb"/>
+    </linearGradient>
+    <linearGradient id="pmFront" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#c9ecfb"/>
+      <stop offset="1" stop-color="#79bfe6"/>
+    </linearGradient>
+    <linearGradient id="pmBadge" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="#ffe38a"/>
+      <stop offset="1" stop-color="#e8a721"/>
+    </linearGradient>
+  </defs>
+  
+  <path d="M1 4.3 a1 1 0 0 1 1 -1 h2.6 a0.6 0.6 0 0 1 0.44 0.19 l1 1.06 H12.4 a1 1 0 0 1 1 1 v4.5 a1 1 0 0 1 -1 1 H2 a1 1 0 0 1 -1 -1 Z"
+        fill="url(#pmBack)" stroke="#1f6690" stroke-width="0.5"/>
+  <path d="M1.6 6.5 H12.8 v3.5 a0.85 0.85 0 0 1 -0.85 0.85 H2.45 a0.85 0.85 0 0 1 -0.85 -0.85 Z"
+        fill="url(#pmFront)" stroke="#3a94c4" stroke-width="0.5"/>
+  
+  <circle cx="11.4" cy="11.1" r="3.4" fill="url(#pmBadge)" stroke="#8a5606" stroke-width="0.6"/>
+  <path d="M9.4 11.1 H13.4"
+        fill="none" stroke="#ffffff" stroke-width="1.3" stroke-linecap="round"/>
+  <path d="M10.7 9.9 L9.4 11.1 L10.7 12.3 M12.1 9.9 L13.4 11.1 L12.1 12.3"
+        fill="none" stroke="#ffffff" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_proxy.png Added

amule-3.1.0.tar.gz/src/icons/prefs_proxy.svg Added

@@ -0,0 +1,29 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="wire" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="16" y2="16">
+      <stop offset="0" stop-color="#ffe4f4"/>
+      <stop offset="0.35" stop-color="#ffb8e2"/>
+      <stop offset="0.7" stop-color="#f088bd"/>
+      <stop offset="1" stop-color="#c96697"/>
+    </linearGradient>
+  </defs>
+  <g stroke="#a3517c" stroke-width="1.4" fill="none">
+    <line x1="0.9" y1="1" x2="7.13" y2="14.6"/>
+    <line x1="6.4" y1="1" x2="12.63" y2="14.6"/>
+    <line x1="11.9" y1="1" x2="16" y2="9.95"/>
+    <line x1="4.1" y1="1" x2="0" y2="9.95"/>
+    <line x1="9.6" y1="1" x2="3.37" y2="14.6"/>
+    <line x1="15.1" y1="1" x2="8.87" y2="14.6"/>
+  </g>
+  <g stroke="url(#wire)" stroke-width="0.75" fill="none">
+    <line x1="0.9" y1="1" x2="7.13" y2="14.6"/>
+    <line x1="6.4" y1="1" x2="12.63" y2="14.6"/>
+    <line x1="11.9" y1="1" x2="16" y2="9.95"/>
+    <line x1="4.1" y1="1" x2="0" y2="9.95"/>
+    <line x1="9.6" y1="1" x2="3.37" y2="14.6"/>
+    <line x1="15.1" y1="1" x2="8.87" y2="14.6"/>
+  </g>
+  <circle cx="2.5" cy="4.5" r="0.6" fill="#ffe6f6" opacity="0.95"/>
+  <circle cx="8" cy="4.5" r="0.55" fill="#ff9ed2" opacity="0.85"/>
+  <circle cx="13.5" cy="4.5" r="0.55" fill="#f8b8da" opacity="0.75"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_remote.png Added

amule-3.1.0.tar.gz/src/icons/prefs_remote.svg Added

amule-3.1.0.tar.gz/src/icons/prefs_security.png Added

amule-3.1.0.tar.gz/src/icons/prefs_security.svg Added

@@ -0,0 +1,28 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="shackle" gradientUnits="userSpaceOnUse" x1="4.5" y1="1.5" x2="11.5" y2="6.5">
+      <stop offset="0" stop-color="#918a3c"/>
+      <stop offset="0.45" stop-color="#4c4522"/>
+      <stop offset="1" stop-color="#0d0906"/>
+    </linearGradient>
+    <linearGradient id="body" gradientUnits="userSpaceOnUse" x1="8" y1="6.9" x2="8" y2="15.5">
+      <stop offset="0" stop-color="#c9b933"/>
+      <stop offset="0.14" stop-color="#f4eb6d"/>
+      <stop offset="0.32" stop-color="#feff2b"/>
+      <stop offset="0.62" stop-color="#f2e800"/>
+      <stop offset="0.85" stop-color="#a89c00"/>
+      <stop offset="1" stop-color="#6a6000"/>
+    </linearGradient>
+    <linearGradient id="rim" gradientUnits="userSpaceOnUse" x1="3" y1="7" x2="14" y2="15.5">
+      <stop offset="0" stop-color="#8d8620"/>
+      <stop offset="0.55" stop-color="#4f4a08"/>
+      <stop offset="1" stop-color="#151004"/>
+    </linearGradient>
+  </defs>
+  <path d="M5 7.4 V4.6 A3 3 0 0 1 11 4.6 V7.4" fill="none" stroke="url(#shackle)" stroke-width="1.8"/>
+  <path d="M5.7 4.5 A2.3 2.3 0 0 1 8.1 2.3" fill="none" stroke="#d8d3b2" stroke-width="0.5" stroke-linecap="round" opacity="0.9"/>
+  <rect x="2.4" y="6.9" width="11.2" height="8.6" rx="1.7" fill="url(#body)" stroke="url(#rim)" stroke-width="0.8"/>
+  <line x1="4.2" y1="8.4" x2="11.8" y2="8.4" stroke="#fffcea" stroke-width="1.1" stroke-linecap="round" opacity="0.95"/>
+  <line x1="3.6" y1="10.6" x2="12.4" y2="10.6" stroke="#8a8300" stroke-width="0.9" stroke-linecap="round"/>
+  <line x1="3.6" y1="12.6" x2="12.4" y2="12.6" stroke="#8a8300" stroke-width="0.9" stroke-linecap="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_servers.png Added

amule-3.1.0.tar.gz/src/icons/prefs_servers.svg Added

@@ -0,0 +1,26 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <radialGradient id="globe" cx="0.36" cy="0.28" r="0.92">
+      <stop offset="0" stop-color="#eaf2fc"/>
+      <stop offset="0.4" stop-color="#93b4e2"/>
+      <stop offset="0.74" stop-color="#3f6cb5"/>
+      <stop offset="1" stop-color="#244d8f"/>
+    </radialGradient>
+    <linearGradient id="chrome" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#eeeef2"/>
+      <stop offset="0.5" stop-color="#9c9ca4"/>
+      <stop offset="1" stop-color="#5a5a62"/>
+    </linearGradient>
+  </defs>
+  <rect x="15" y="21" width="2" height="6.5" fill="url(#chrome)"/>
+  <rect x="7.5" y="26.5" width="17" height="3.4" rx="1.4" fill="url(#chrome)" stroke="#4a4a52" stroke-width="0.4"/>
+  <circle cx="16" cy="12.5" r="11.4" fill="url(#globe)" stroke="#1d3f78" stroke-width="0.8"/>
+  <g fill="#eef4fc" opacity="0.92">
+    <path d="M12.6 9.2 Q13.6 8.2 15.8 8 Q18.4 7.8 19.8 8.2 Q21.2 9.6 20.4 11 Q19.5 12 19.3 13.4 Q19 15.8 17.3 17.8 Q16.3 18.6 15.9 17.2 Q15.5 15 14.7 14 Q13.3 13.6 13.1 12.2 Q11.7 10.6 12.6 9.2 Z"/>
+    <ellipse cx="20.7" cy="15.8" rx="0.75" ry="1.35" transform="rotate(18 20.7 15.8)"/>
+    <path d="M13.9 6.4 Q15.7 5.2 18 5.6 Q19.6 6 19.1 7.1 Q16.9 7.5 14.7 7.5 Q13.8 7.1 13.9 6.4 Z"/>
+    <path d="M20.8 7.4 Q22.6 7 23.6 8.2 Q22.9 9.3 21.4 8.9 Q20.5 8.2 20.8 7.4 Z"/>
+    <path d="M9.3 13.2 Q10.7 13.4 10.9 15.2 Q10.7 17.2 9.6 17.9 Q8.7 15.4 9.3 13.2 Z"/>
+  </g>
+  <ellipse cx="11" cy="6.6" rx="4.4" ry="2.4" fill="#ffffff" opacity="0.5" transform="rotate(-32 11 6.6)"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/prefs_statistics.png Added

amule-3.1.0.tar.gz/src/icons/prefs_statistics.svg Added

@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="frm" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="#7d6f64"/>
+      <stop offset="1" stop-color="#463d3d"/>
+    </linearGradient>
+    <linearGradient id="cas" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="#efd9c2"/>
+      <stop offset="0.5" stop-color="#c1b09c"/>
+      <stop offset="1" stop-color="#9b8a79"/>
+    </linearGradient>
+    <linearGradient id="scr" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#52603f"/>
+      <stop offset="0.16" stop-color="#35812b"/>
+      <stop offset="0.42" stop-color="#12921b"/>
+      <stop offset="1" stop-color="#045a20"/>
+    </linearGradient>
+  </defs>
+  <rect x="0.4" y="1.1" width="15.2" height="14.2" rx="2" fill="url(#frm)"/>
+  <rect x="1.5" y="2.1" width="13" height="12.1" rx="1.2" fill="url(#cas)"/>
+  <rect x="2.9" y="3.4" width="10.2" height="9.5" rx="0.8" fill="url(#scr)" stroke="#3d4b39" stroke-width="0.7"/>
+  <polyline points="3.7,7.5 5.2,5.4 9.6,9.4 12.5,6.2" fill="none" stroke="#55c130" stroke-width="1.1" stroke-linecap="round" stroke-linejoin="round"/>
+  <polyline points="3.7,7.5 5.2,5.4 9.6,9.4 12.5,6.2" fill="none" stroke="#c9ff8f" stroke-width="0.45" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/reload.png Added

amule-3.1.0.tar.gz/src/icons/reload.svg Added

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048">
+<path transform="translate(0,0)" fill="rgb(63,169,63)" d="M 1669.67 1060.38 C 1702.1 1060.17 1731.07 1084.45 1732.58 1118.01 C 1733.58 1140.3 1725.21 1173.36 1720.33 1195.33 C 1649.79 1513.17 1389.63 1774.07 1055.06 1789.15 C 866.785 1797.77 682.964 1730.23 545.055 1601.77 C 505.137 1630.91 467.655 1664.89 427.765 1694.34 C 402.794 1712.78 390.168 1733.95 356.129 1734.25 C 335.415 1734.46 315.472 1726.4 300.717 1711.86 C 274.138 1685.31 276.681 1657.58 276.691 1622.75 L 276.759 1562.11 L 276.861 1337.5 L 276.799 1214.09 C 276.787 1192.81 276.555 1171.15 276.95 1149.89 C 277.352 1128.18 288.165 1105.04 304.5 1090.44 C 323.215 1074.04 347.715 1065.82 372.532 1067.61 C 393.144 1068.94 438.741 1083.32 460.967 1089.66 L 583.636 1124.11 L 782.212 1179.35 L 848.893 1197.98 C 870.589 1204.07 896.639 1208.02 911.726 1225.54 C 923.176 1238.61 928.735 1255.82 927.095 1273.12 C 925.51 1290.55 916.953 1304.4 903.432 1315.03 C 849.658 1357.32 795.891 1399.99 742.976 1443.33 C 766.199 1457.04 785.16 1468.39 809.833 1479.91 C 908.587 1525.99 1018.39 1543.1 1126.48 1529.26 C 1312.45 1505.95 1480.39 1377.77 1568.7 1214.75 C 1580.94 1191.77 1592.13 1168.25 1602.24 1144.26 C 1617.92 1106.19 1618.87 1064.94 1669.67 1060.38 z"/>
+<path transform="translate(0,0)" fill="rgb(63,169,63)" d="M 1018.9 262.465 C 1156.89 261.204 1292.26 300.099 1408.54 374.414 C 1442.02 395.639 1477.31 421.792 1505.89 449.292 C 1540.01 422.38 1574.12 395.526 1608.32 368.62 C 1625.7 354.945 1645.71 336.357 1664.29 324.805 C 1672.42 319.754 1691.18 316.931 1701.1 317.434 C 1721.48 318.614 1740.53 327.969 1753.92 343.38 C 1780.07 372.903 1773.45 405.966 1774.41 442.327 C 1774.55 447.946 1774.43 453.622 1774.44 459.248 L 1774.45 608.996 L 1774.33 818.353 C 1774.14 846.512 1774.82 875.364 1773.86 903.388 C 1772.61 924.925 1760.13 948.274 1744.1 962.244 C 1701.02 999.774 1642.01 973.561 1594.68 960.795 L 1389.53 903.519 L 1229.09 859.662 C 1201.48 851.953 1156.39 845.374 1137.58 823.346 C 1119.88 804.013 1117.36 763.541 1136.07 744.028 C 1153.17 726.196 1180.8 706.966 1200.85 691.315 C 1237.15 663.144 1273.04 634.437 1308.49 605.201 L 1298.8 599.91 C 1262.42 579.02 1229.25 562.746 1189.64 548.683 C 907.368 448.45 618.054 581.499 479.457 839.922 C 469.181 859.072 459.976 878.777 451.883 898.946 C 436.38 936.689 431.284 985.359 382.726 989.064 C 350.157 991.548 317.847 962.675 318.153 930.417 C 318.392 905.242 326.257 870.769 332.145 846.192 C 364.977 707.629 433.724 580.157 531.468 476.601 C 658.673 342.772 834.286 265.621 1018.9 262.465 z"/>
+</svg>
\ No newline at end of file

amule-3.1.0.tar.gz/src/icons/status_conn_base.png Added

amule-3.1.0.tar.gz/src/icons/status_conn_base.svg Added

@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <radialGradient id="sea" cx="0.35" cy="0.3" r="0.95">
+      <stop offset="0" stop-color="#9acbee"/>
+      <stop offset="0.5" stop-color="#4485c6"/>
+      <stop offset="1" stop-color="#18518d"/>
+    </radialGradient>
+    <linearGradient id="arr_base" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#ffd4d4"/>
+      <stop offset="0.45" stop-color="#ff2626"/>
+      <stop offset="1" stop-color="#d81616"/>
+    </linearGradient>
+  </defs>
+  <circle cx="8" cy="8" r="7.3" fill="url(#sea)" stroke="#235b95" stroke-width="0.8"/>
+  <path d="M 9.483 4.133 L 9.432 4.479 L 9.711 4.421 L 9.915 4.22 L 9.737 4.047 C 9.677 3.888 9.608 3.74 9.533 3.587 L 9.381 3.587 L 9.381 3.759 L 9.483 3.875 L 9.483 4.133 M 5.72 9.601 L 5.517 9.198 L 5.135 9.112 L 4.932 8.565 L 4.424 8.622 L 3.992 8.306 L 3.534 8.709 L 3.534 8.772 C 3.395 8.732 3.225 8.727 3.102 8.651 L 3.0 8.364 L 3.0 8.047 L 2.695 8.076 C 2.72 7.874 2.746 7.673 2.771 7.471 L 2.593 7.471 L 2.415 7.702 L 2.237 7.788 L 1.983 7.644 L 1.958 7.328 L 2.008 6.982 L 2.39 6.695 L 2.695 6.695 L 2.746 6.522 L 3.127 6.608 L 3.407 6.954 L 3.458 6.378 L 3.941 5.975 L 4.119 5.544 L 4.474 5.4 L 4.678 5.112 L 5.135 5.025 L 5.364 4.68 L 4.678 4.68 L 5.11 4.479 L 5.415 4.479 L 5.847 4.335 L 5.898 4.163 L 5.745 4.019 L 5.568 3.961 L 5.618 3.788 L 5.491 3.53 L 5.186 3.644 L 5.237 3.414 L 4.881 3.213 L 4.602 3.702 L 4.627 3.874 L 4.347 3.99 L 4.169 4.364 L 4.093 4.019 L 3.61 3.817 L 3.534 3.558 L 4.169 3.184 L 4.449 2.925 L 4.474 2.609 L 4.322 2.522 L 4.119 2.493 L 3.992 2.81 C 3.992 2.81 3.779 2.852 3.724 2.865 C 3.026 3.508 1.616 4.897 1.288 7.519 C 1.301 7.579 1.526 7.932 1.526 7.932 L 2.059 8.248 L 2.593 8.392 L 2.822 8.68 L 3.178 8.939 L 3.381 8.91 L 3.534 8.979 L 3.534 9.025 L 3.33 9.572 L 3.178 9.802 L 3.229 9.918 L 3.102 10.349 L 3.559 11.183 L 4.017 11.586 L 4.22 11.874 L 4.195 12.478 L 4.347 12.823 L 4.195 13.485 C 4.195 13.485 4.183 13.481 4.202 13.547 C 4.222 13.614 5.017 14.055 5.067 14.017 C 5.118 13.979 5.161 13.946 5.161 13.946 L 5.11 13.802 L 5.313 13.601 L 5.39 13.399 L 5.72 13.284 L 5.974 12.651 L 5.898 12.478 L 6.076 12.22 L 6.457 12.133 L 6.661 11.672 L 6.61 11.097 L 6.915 10.666 L 6.966 10.234 C 6.548 10.027 6.134 9.814 5.72 9.601 M 5.161 3.069 L 5.415 3.241 L 5.619 3.241 L 5.619 3.04 L 5.364 2.925 L 5.161 3.069" fill="#63b56b"/>
+  <path d="M 14.709 6.97 C 14.709 7.062 14.709 6.97 14.709 6.97 L 14.518 7.186 C 14.401 7.048 14.27 6.932 14.137 6.811 L 13.845 6.854 L 13.578 6.552 L 13.578 6.926 L 13.806 7.099 L 13.959 7.272 L 14.162 7.042 C 14.213 7.138 14.264 7.234 14.315 7.329 L 14.315 7.617 L 14.086 7.876 L 13.666 8.164 L 13.349 8.481 L 13.145 8.25 L 13.247 7.991 L 13.044 7.761 L 12.7 7.027 L 12.408 6.697 L 12.332 6.783 L 12.446 7.2 L 12.662 7.445 C 12.785 7.8 12.907 8.141 13.069 8.481 C 13.32 8.481 13.557 8.454 13.806 8.423 L 13.806 8.624 L 13.501 9.372 L 13.222 9.689 L 12.993 10.178 L 12.993 10.984 L 13.069 11.301 L 12.942 11.444 L 12.662 11.617 L 12.37 11.861 L 12.612 12.135 L 12.281 12.423 L 12.345 12.609 L 11.849 13.171 L 11.518 13.171 L 11.239 13.344 L 11.06 13.344 L 11.06 13.114 L 10.985 12.652 C 10.886 12.363 10.784 12.077 10.68 11.79 C 10.68 11.578 10.692 11.368 10.705 11.157 L 10.832 10.869 L 10.654 10.523 L 10.667 10.049 L 10.425 9.775 L 10.546 9.38 L 10.349 9.157 L 10.006 9.157 L 9.891 9.027 L 9.548 9.243 L 9.408 9.085 L 9.091 9.358 C 8.875 9.113 8.658 8.869 8.442 8.624 L 8.188 8.02 L 8.417 7.675 L 8.29 7.531 L 8.569 6.869 C 8.799 6.583 9.039 6.309 9.281 6.034 L 9.713 5.919 L 10.196 5.862 L 10.527 5.948 L 10.997 6.423 L 11.163 6.236 L 11.391 6.207 L 11.823 6.351 L 12.154 6.351 L 12.383 6.149 L 12.485 6.006 L 12.255 5.862 L 11.874 5.833 C 11.768 5.686 11.67 5.532 11.544 5.402 L 11.417 5.459 L 11.366 5.833 L 11.137 5.574 L 11.086 5.286 L 10.832 5.085 L 10.73 5.085 L 10.985 5.373 L 10.883 5.632 L 10.68 5.689 L 10.807 5.43 L 10.577 5.316 L 10.375 5.085 L 9.993 5.171 L 9.942 5.286 L 9.713 5.43 L 9.586 5.747 L 9.269 5.905 L 9.129 5.747 L 8.976 5.747 L 8.976 5.229 L 9.307 5.056 L 9.561 5.056 L 9.51 4.855 L 9.307 4.653 L 9.65 4.581 L 9.84 4.366 L 9.993 4.107 L 10.273 4.107 L 10.196 3.905 L 10.375 3.79 L 10.375 4.02 L 10.756 4.107 L 11.137 3.79 L 11.162 3.646 L 11.493 3.416 C 11.373 3.431 11.254 3.442 11.137 3.474 L 11.137 3.215 L 11.264 2.927 L 11.137 2.927 L 10.858 3.186 L 10.781 3.33 L 10.858 3.531 L 10.73 3.876 L 10.527 3.761 L 10.349 3.56 L 10.069 3.761 L 9.968 3.301 L 10.45 2.984 L 10.45 2.812 L 10.756 2.61 L 11.239 2.495 L 11.569 2.61 L 12.179 2.725 L 12.027 2.898 L 11.696 2.898 L 12.027 3.243 L 12.281 2.956 L 12.358 2.829 C 12.358 2.829 13.333 3.703 13.89 4.658 C 14.447 5.614 14.709 6.741 14.709 6.97 Z M 8.413 2.956 L 8.388 3.128 L 8.566 3.243 L 8.871 3.042 L 8.718 2.869 L 8.515 2.984 L 8.413 2.956 M 8.693 1.776 L 8.032 1.517 L 7.269 1.603 L 6.329 1.862 L 6.151 2.035 L 6.735 2.438 L 6.735 2.668 L 6.506 2.898 L 6.812 3.503 L 7.015 3.387 L 7.269 2.984 C 7.662 2.863 8.014 2.725 8.388 2.553 L 8.693 1.776 M 9.379 4.193 L 9.278 3.934 L 9.099 3.992 L 9.151 4.308 L 9.379 4.193" fill="#63b56b"/>
+  <path d="M 4.501 2.839 L 4.374 3.155 L 4.628 3.155 L 4.755 2.867 C 4.865 2.79 4.974 2.712 5.086 2.637 L 5.34 2.724 C 5.509 2.839 5.679 2.954 5.848 3.069 L 6.103 2.839 L 5.823 2.724 L 5.696 2.465 L 5.213 2.407 L 5.187 2.263 L 4.958 2.321 L 4.857 2.522 L 4.73 2.263 L 4.679 2.378 L 4.704 2.666 L 4.501 2.839 M 5.416 2.119 L 5.543 2.004 L 5.797 1.947 C 5.972 1.862 6.146 1.805 6.331 1.745 L 6.23 1.573 L 5.902 1.62 L 5.746 1.774 L 5.491 1.811 L 5.264 1.918 L 5.153 1.971 L 5.086 2.062 L 5.416 2.119 M 5.848 4.853 L 6.001 4.623 L 5.772 4.45 L 5.848 4.853" fill="#63b56b"/>
+  
+  <path d="M 5.182 9.819 L 6.742 11.328 C 6.815 11.381 6.902 11.417 6.981 11.404 C 7.175 11.365 7.322 11.185 7.318 11.027 L 7.438 4.68 L 7.424 4.636 C 7.41 4.467 7.232 4.394 7.066 4.449 L 0.686 6.591 C 0.589 6.615 0.5 6.679 0.443 6.775 C 0.352 6.939 0.413 7.129 0.539 7.188 L 2.344 7.884 C 2.092 8.279 1.839 8.74 1.639 9.226 C 1.113 10.489 0.803 12.046 0.977 13.511 C 1.148 14.978 1.263 15.181 1.506 15.506 C 1.627 15.668 1.952 15.628 2.059 15.325 C 2.162 15.022 2.214 14.869 2.19 14.477 C 2.134 13.687 2.518 11.949 3.303 11.021 C 3.797 10.455 4.373 10.133 5.182 9.819 Z" fill="url(#arr_base)" stroke="#7a0d0d" stroke-width="0.6" stroke-linejoin="round"/>
+  
+  <path d="M 10.818 6.181 L 9.258 4.672 C 9.185 4.619 9.098 4.583 9.019 4.596 C 8.825 4.635 8.678 4.815 8.682 4.973 L 8.562 11.32 L 8.576 11.364 C 8.59 11.533 8.768 11.606 8.934 11.551 L 15.314 9.409 C 15.411 9.385 15.5 9.321 15.557 9.225 C 15.648 9.061 15.587 8.871 15.461 8.812 L 13.656 8.116 C 13.908 7.721 14.161 7.26 14.361 6.774 C 14.887 5.511 15.197 3.954 15.023 2.489 C 14.852 1.022 14.737 0.819 14.494 0.494 C 14.373 0.332 14.048 0.372 13.941 0.675 C 13.838 0.978 13.786 1.131 13.81 1.523 C 13.866 2.313 13.482 4.051 12.697 4.979 C 12.203 5.545 11.627 5.867 10.818 6.181 Z" fill="url(#arr_base)" stroke="#7a0d0d" stroke-width="0.6" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_conn_ed2k_connecting.png Added

amule-3.1.0.tar.gz/src/icons/status_conn_ed2k_connecting.svg Added

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="arr_ed2k_connecting" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#ffe4b6"/>
+      <stop offset="0.45" stop-color="#ff9c2e"/>
+      <stop offset="1" stop-color="#d47a12"/>
+    </linearGradient>
+  </defs>
+  <path d="M 5.182 9.819 L 6.742 11.328 C 6.815 11.381 6.902 11.417 6.981 11.404 C 7.175 11.365 7.322 11.185 7.318 11.027 L 7.438 4.68 L 7.424 4.636 C 7.41 4.467 7.232 4.394 7.066 4.449 L 0.686 6.591 C 0.589 6.615 0.5 6.679 0.443 6.775 C 0.352 6.939 0.413 7.129 0.539 7.188 L 2.344 7.884 C 2.092 8.279 1.839 8.74 1.639 9.226 C 1.113 10.489 0.803 12.046 0.977 13.511 C 1.148 14.978 1.263 15.181 1.506 15.506 C 1.627 15.668 1.952 15.628 2.059 15.325 C 2.162 15.022 2.214 14.869 2.19 14.477 C 2.134 13.687 2.518 11.949 3.303 11.021 C 3.797 10.455 4.373 10.133 5.182 9.819 Z" fill="url(#arr_ed2k_connecting)" stroke="#452b0d" stroke-width="0.6" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_conn_ed2k_high.png Added

amule-3.1.0.tar.gz/src/icons/status_conn_ed2k_high.svg Added

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="arr_ed2k_high" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#d0ffc6"/>
+      <stop offset="0.45" stop-color="#4dff48"/>
+      <stop offset="1" stop-color="#20ce34"/>
+    </linearGradient>
+  </defs>
+  <path d="M 5.182 9.819 L 6.742 11.328 C 6.815 11.381 6.902 11.417 6.981 11.404 C 7.175 11.365 7.322 11.185 7.318 11.027 L 7.438 4.68 L 7.424 4.636 C 7.41 4.467 7.232 4.394 7.066 4.449 L 0.686 6.591 C 0.589 6.615 0.5 6.679 0.443 6.775 C 0.352 6.939 0.413 7.129 0.539 7.188 L 2.344 7.884 C 2.092 8.279 1.839 8.74 1.639 9.226 C 1.113 10.489 0.803 12.046 0.977 13.511 C 1.148 14.978 1.263 15.181 1.506 15.506 C 1.627 15.668 1.952 15.628 2.059 15.325 C 2.162 15.022 2.214 14.869 2.19 14.477 C 2.134 13.687 2.518 11.949 3.303 11.021 C 3.797 10.455 4.373 10.133 5.182 9.819 Z" fill="url(#arr_ed2k_high)" stroke="#0c3f1c" stroke-width="0.6" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_conn_ed2k_low.png Added

amule-3.1.0.tar.gz/src/icons/status_conn_ed2k_low.svg Added

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="arr_ed2k_low" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#fff6c8"/>
+      <stop offset="0.45" stop-color="#ffe63a"/>
+      <stop offset="1" stop-color="#dcc714"/>
+    </linearGradient>
+  </defs>
+  <path d="M 5.182 9.819 L 6.742 11.328 C 6.815 11.381 6.902 11.417 6.981 11.404 C 7.175 11.365 7.322 11.185 7.318 11.027 L 7.438 4.68 L 7.424 4.636 C 7.41 4.467 7.232 4.394 7.066 4.449 L 0.686 6.591 C 0.589 6.615 0.5 6.679 0.443 6.775 C 0.352 6.939 0.413 7.129 0.539 7.188 L 2.344 7.884 C 2.092 8.279 1.839 8.74 1.639 9.226 C 1.113 10.489 0.803 12.046 0.977 13.511 C 1.148 14.978 1.263 15.181 1.506 15.506 C 1.627 15.668 1.952 15.628 2.059 15.325 C 2.162 15.022 2.214 14.869 2.19 14.477 C 2.134 13.687 2.518 11.949 3.303 11.021 C 3.797 10.455 4.373 10.133 5.182 9.819 Z" fill="url(#arr_ed2k_low)" stroke="#4a4605" stroke-width="0.6" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_conn_ed2k_off.png Added

amule-3.1.0.tar.gz/src/icons/status_conn_ed2k_off.svg Added

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="arr_ed2k_off" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#ffd4d4"/>
+      <stop offset="0.45" stop-color="#ff2626"/>
+      <stop offset="1" stop-color="#d81616"/>
+    </linearGradient>
+  </defs>
+  <path d="M 5.182 9.819 L 6.742 11.328 C 6.815 11.381 6.902 11.417 6.981 11.404 C 7.175 11.365 7.322 11.185 7.318 11.027 L 7.438 4.68 L 7.424 4.636 C 7.41 4.467 7.232 4.394 7.066 4.449 L 0.686 6.591 C 0.589 6.615 0.5 6.679 0.443 6.775 C 0.352 6.939 0.413 7.129 0.539 7.188 L 2.344 7.884 C 2.092 8.279 1.839 8.74 1.639 9.226 C 1.113 10.489 0.803 12.046 0.977 13.511 C 1.148 14.978 1.263 15.181 1.506 15.506 C 1.627 15.668 1.952 15.628 2.059 15.325 C 2.162 15.022 2.214 14.869 2.19 14.477 C 2.134 13.687 2.518 11.949 3.303 11.021 C 3.797 10.455 4.373 10.133 5.182 9.819 Z" fill="url(#arr_ed2k_off)" stroke="#7a0d0d" stroke-width="0.6" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_conn_kad_firewalled.png Added

amule-3.1.0.tar.gz/src/icons/status_conn_kad_firewalled.svg Added

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="arr_kad_firewalled" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#fff6c8"/>
+      <stop offset="0.45" stop-color="#ffe63a"/>
+      <stop offset="1" stop-color="#dcc714"/>
+    </linearGradient>
+  </defs>
+  <path d="M 10.818 6.181 L 9.258 4.672 C 9.185 4.619 9.098 4.583 9.019 4.596 C 8.825 4.635 8.678 4.815 8.682 4.973 L 8.562 11.32 L 8.576 11.364 C 8.59 11.533 8.768 11.606 8.934 11.551 L 15.314 9.409 C 15.411 9.385 15.5 9.321 15.557 9.225 C 15.648 9.061 15.587 8.871 15.461 8.812 L 13.656 8.116 C 13.908 7.721 14.161 7.26 14.361 6.774 C 14.887 5.511 15.197 3.954 15.023 2.489 C 14.852 1.022 14.737 0.819 14.494 0.494 C 14.373 0.332 14.048 0.372 13.941 0.675 C 13.838 0.978 13.786 1.131 13.81 1.523 C 13.866 2.313 13.482 4.051 12.697 4.979 C 12.203 5.545 11.627 5.867 10.818 6.181 Z" fill="url(#arr_kad_firewalled)" stroke="#4a4605" stroke-width="0.6" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_conn_kad_off.png Added

amule-3.1.0.tar.gz/src/icons/status_conn_kad_off.svg Added

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="arr_kad_off" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#ffd4d4"/>
+      <stop offset="0.45" stop-color="#ff2626"/>
+      <stop offset="1" stop-color="#d81616"/>
+    </linearGradient>
+  </defs>
+  <path d="M 10.818 6.181 L 9.258 4.672 C 9.185 4.619 9.098 4.583 9.019 4.596 C 8.825 4.635 8.678 4.815 8.682 4.973 L 8.562 11.32 L 8.576 11.364 C 8.59 11.533 8.768 11.606 8.934 11.551 L 15.314 9.409 C 15.411 9.385 15.5 9.321 15.557 9.225 C 15.648 9.061 15.587 8.871 15.461 8.812 L 13.656 8.116 C 13.908 7.721 14.161 7.26 14.361 6.774 C 14.887 5.511 15.197 3.954 15.023 2.489 C 14.852 1.022 14.737 0.819 14.494 0.494 C 14.373 0.332 14.048 0.372 13.941 0.675 C 13.838 0.978 13.786 1.131 13.81 1.523 C 13.866 2.313 13.482 4.051 12.697 4.979 C 12.203 5.545 11.627 5.867 10.818 6.181 Z" fill="url(#arr_kad_off)" stroke="#7a0d0d" stroke-width="0.6" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_conn_kad_ok.png Added

amule-3.1.0.tar.gz/src/icons/status_conn_kad_ok.svg Added

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="arr_kad_ok" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#d0ffc6"/>
+      <stop offset="0.45" stop-color="#4dff48"/>
+      <stop offset="1" stop-color="#20ce34"/>
+    </linearGradient>
+  </defs>
+  <path d="M 10.818 6.181 L 9.258 4.672 C 9.185 4.619 9.098 4.583 9.019 4.596 C 8.825 4.635 8.678 4.815 8.682 4.973 L 8.562 11.32 L 8.576 11.364 C 8.59 11.533 8.768 11.606 8.934 11.551 L 15.314 9.409 C 15.411 9.385 15.5 9.321 15.557 9.225 C 15.648 9.061 15.587 8.871 15.461 8.812 L 13.656 8.116 C 13.908 7.721 14.161 7.26 14.361 6.774 C 14.887 5.511 15.197 3.954 15.023 2.489 C 14.852 1.022 14.737 0.819 14.494 0.494 C 14.373 0.332 14.048 0.372 13.941 0.675 C 13.838 0.978 13.786 1.131 13.81 1.523 C 13.866 2.313 13.482 4.051 12.697 4.979 C 12.203 5.545 11.627 5.867 10.818 6.181 Z" fill="url(#arr_kad_ok)" stroke="#0c3f1c" stroke-width="0.6" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_log_info.png Added

amule-3.1.0.tar.gz/src/icons/status_log_info.svg Added

amule-3.1.0.tar.gz/src/icons/status_speed_both.png Added

amule-3.1.0.tar.gz/src/icons/status_speed_both.svg Added

@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="su_both" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#d9ffcf"/>
+      <stop offset="0.45" stop-color="#43fc3f"/>
+      <stop offset="1" stop-color="#1da32c"/>
+    </linearGradient>
+    <linearGradient id="sd_both" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#d9ffcf"/>
+      <stop offset="0.45" stop-color="#43fc3f"/>
+      <stop offset="1" stop-color="#1da32c"/>
+    </linearGradient>
+  </defs>
+  
+  <rect x="8.75" y="5.35" width="2.5" height="3.4" fill="#909090" stroke="#3f3f3f" stroke-width="0.4"/>
+  <rect x="9.15" y="5.55" width="0.7" height="3" fill="#c8c8c8"/>
+  <path d="M10 0.3 L14.6 5.45 H5.4 Z" fill="url(#su_both)" stroke="#14582a" stroke-width="0.45" stroke-linejoin="round"/>
+  
+  <rect x="4.75" y="7.25" width="2.5" height="3.45" fill="#909090" stroke="#3f3f3f" stroke-width="0.4"/>
+  <rect x="5.15" y="7.45" width="0.7" height="3" fill="#c8c8c8"/>
+  <path d="M6 15.7 L1.4 10.55 H10.6 Z" fill="url(#sd_both)" stroke="#14582a" stroke-width="0.45" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_speed_down.png Added

amule-3.1.0.tar.gz/src/icons/status_speed_down.svg Added

@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="su_down" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#ffc9c9"/>
+      <stop offset="0.45" stop-color="#f22525"/>
+      <stop offset="1" stop-color="#a81111"/>
+    </linearGradient>
+    <linearGradient id="sd_down" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#d9ffcf"/>
+      <stop offset="0.45" stop-color="#43fc3f"/>
+      <stop offset="1" stop-color="#1da32c"/>
+    </linearGradient>
+  </defs>
+  
+  <rect x="8.75" y="5.35" width="2.5" height="3.4" fill="#909090" stroke="#3f3f3f" stroke-width="0.4"/>
+  <rect x="9.15" y="5.55" width="0.7" height="3" fill="#c8c8c8"/>
+  <path d="M10 0.3 L14.6 5.45 H5.4 Z" fill="url(#su_down)" stroke="#7a0d0d" stroke-width="0.45" stroke-linejoin="round"/>
+  
+  <rect x="4.75" y="7.25" width="2.5" height="3.45" fill="#909090" stroke="#3f3f3f" stroke-width="0.4"/>
+  <rect x="5.15" y="7.45" width="0.7" height="3" fill="#c8c8c8"/>
+  <path d="M6 15.7 L1.4 10.55 H10.6 Z" fill="url(#sd_down)" stroke="#14582a" stroke-width="0.45" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_speed_idle.png Added

amule-3.1.0.tar.gz/src/icons/status_speed_idle.svg Added

@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="su_idle" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#ffc9c9"/>
+      <stop offset="0.45" stop-color="#f22525"/>
+      <stop offset="1" stop-color="#a81111"/>
+    </linearGradient>
+    <linearGradient id="sd_idle" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#ffc9c9"/>
+      <stop offset="0.45" stop-color="#f22525"/>
+      <stop offset="1" stop-color="#a81111"/>
+    </linearGradient>
+  </defs>
+  
+  <rect x="8.75" y="5.35" width="2.5" height="3.4" fill="#909090" stroke="#3f3f3f" stroke-width="0.4"/>
+  <rect x="9.15" y="5.55" width="0.7" height="3" fill="#c8c8c8"/>
+  <path d="M10 0.3 L14.6 5.45 H5.4 Z" fill="url(#su_idle)" stroke="#7a0d0d" stroke-width="0.45" stroke-linejoin="round"/>
+  
+  <rect x="4.75" y="7.25" width="2.5" height="3.45" fill="#909090" stroke="#3f3f3f" stroke-width="0.4"/>
+  <rect x="5.15" y="7.45" width="0.7" height="3" fill="#c8c8c8"/>
+  <path d="M6 15.7 L1.4 10.55 H10.6 Z" fill="url(#sd_idle)" stroke="#7a0d0d" stroke-width="0.45" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_speed_up.png Added

amule-3.1.0.tar.gz/src/icons/status_speed_up.svg Added

@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="su_up" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#d9ffcf"/>
+      <stop offset="0.45" stop-color="#43fc3f"/>
+      <stop offset="1" stop-color="#1da32c"/>
+    </linearGradient>
+    <linearGradient id="sd_up" x1="0" y1="0" x2="0.55" y2="1">
+      <stop offset="0" stop-color="#ffc9c9"/>
+      <stop offset="0.45" stop-color="#f22525"/>
+      <stop offset="1" stop-color="#a81111"/>
+    </linearGradient>
+  </defs>
+  
+  <rect x="8.75" y="5.35" width="2.5" height="3.4" fill="#909090" stroke="#3f3f3f" stroke-width="0.4"/>
+  <rect x="9.15" y="5.55" width="0.7" height="3" fill="#c8c8c8"/>
+  <path d="M10 0.3 L14.6 5.45 H5.4 Z" fill="url(#su_up)" stroke="#14582a" stroke-width="0.45" stroke-linejoin="round"/>
+  
+  <rect x="4.75" y="7.25" width="2.5" height="3.45" fill="#909090" stroke="#3f3f3f" stroke-width="0.4"/>
+  <rect x="5.15" y="7.45" width="0.7" height="3" fill="#c8c8c8"/>
+  <path d="M6 15.7 L1.4 10.55 H10.6 Z" fill="url(#sd_up)" stroke="#7a0d0d" stroke-width="0.45" stroke-linejoin="round"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/status_users.png Added

amule-3.1.0.tar.gz/src/icons/status_users.svg Added

@@ -0,0 +1,27 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <linearGradient id="uB" x1="0.2" y1="0" x2="0.8" y2="1">
+      <stop offset="0" stop-color="#6bce7d"/>
+      <stop offset="0.55" stop-color="#37b048"/>
+      <stop offset="1" stop-color="#17803a"/>
+    </linearGradient>
+    <radialGradient id="uH" cx="0.42" cy="0.36" r="0.92">
+      <stop offset="0" stop-color="#c2efc9"/>
+      <stop offset="0.5" stop-color="#46b854"/>
+      <stop offset="1" stop-color="#178036"/>
+    </radialGradient>
+  </defs>
+  
+  <path d="M5.73 7.65 C3.72 8.59 2.46 10.93 1.83 13.74 C1.57 15.03 2.83 15.49 3.59 14.44 C4.35 12.1 5.35 10.11 6.74 8.94 Z"
+        fill="url(#uB)" stroke="#0f5a24" stroke-width="0.65" stroke-linejoin="round"/>
+  <path d="M10.27 7.65 C12.28 8.59 13.54 10.93 14.17 13.74 C14.43 15.03 13.17 15.49 12.41 14.44 C11.65 12.1 10.65 10.11 9.26 8.94 Z"
+        fill="url(#uB)" stroke="#0f5a24" stroke-width="0.65" stroke-linejoin="round"/>
+  
+  <path d="M8.0 6.95 C10.52 6.95 12.28 8.59 12.28 11.16 L12.16 14.56 Q12.16 15.26 11.4 15.26 L4.6 15.26 Q3.84 15.26 3.84 14.56 L3.72 11.16 C3.72 8.59 5.48 6.95 8.0 6.95 Z"
+        fill="url(#uB)" stroke="#0f5a24" stroke-width="0.65" stroke-linejoin="round"/>
+  
+  <ellipse cx="8.0" cy="3.79" rx="3.65" ry="3.39" fill="url(#uH)" stroke="#0f5a24" stroke-width="0.65"/>
+  
+  <ellipse cx="6.61" cy="2.74" rx="1.45" ry="1.58" fill="#ffffff" opacity="0.55"/>
+  <rect x="7.12" y="8.82" width="1.76" height="5.15" rx="0.88" fill="#ffffff" opacity="0.26"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/toolbar_about.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_about.svg Added

@@ -0,0 +1,29 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <radialGradient id="orb" cx="0.42" cy="0.36" r="0.95">
+      <stop offset="0" stop-color="#bcd2ff"/>
+      <stop offset="0.35" stop-color="#8ab1ff"/>
+      <stop offset="0.7" stop-color="#5d92ff"/>
+      <stop offset="1" stop-color="#3b7cff"/>
+    </radialGradient>
+    <linearGradient id="rim" x1="0" y1="0" x2="0.6" y2="1">
+      <stop offset="0" stop-color="#3b7cff"/>
+      <stop offset="1" stop-color="#1a64fb"/>
+    </linearGradient>
+    <linearGradient id="shine" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#ffffff" stop-opacity="0.95"/>
+      <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="glyph" gradientUnits="userSpaceOnUse" x1="16" y1="5" x2="16" y2="27">
+      <stop offset="0" stop-color="#ffffff"/>
+      <stop offset="1" stop-color="#e2edff"/>
+    </linearGradient>
+  </defs>
+  <g transform="translate(1.600 1.600) scale(0.9000)">
+  <circle cx="16" cy="16" r="14.2" fill="url(#orb)" stroke="url(#rim)" stroke-width="1.5"/>
+  <path d="M6.9 23.4 A11.7 11.7 0 0 0 25.1 23.4" fill="none" stroke="#2b71ff" stroke-width="2" stroke-linecap="round" opacity="0.55"/>
+  <path d="M9.93 12.13 A5.9 5.9 0 1 1 20.81 13.85 Q19.3 16.2 17.55 16.9 L17.55 20.4 L14.25 20.4 L14.25 16.35 Q14.25 14.6 16.36 13.36 A2.55 2.55 0 1 0 13.21 11.43 Z" fill="url(#glyph)"/>
+  <circle cx="15.9" cy="24.3" r="2.2" fill="url(#glyph)"/>
+  <ellipse cx="15.6" cy="7.4" rx="8.7" ry="4" fill="url(#shine)"/>
+  </g>
+</svg>

amule-3.1.0.tar.gz/src/icons/toolbar_blink.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_blink.svg Added

@@ -0,0 +1,28 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <radialGradient id="head" cx="0.4" cy="0.3" r="0.95">
+      <stop offset="0" stop-color="#f9bcbc"/>
+      <stop offset="0.28" stop-color="#ef7777"/>
+      <stop offset="0.55" stop-color="#d02020"/>
+      <stop offset="0.8" stop-color="#b40808"/>
+      <stop offset="1" stop-color="#9c0202"/>
+    </radialGradient>
+    <linearGradient id="body" gradientUnits="userSpaceOnUse" x1="15.6" y1="14.6" x2="15.6" y2="31">
+      <stop offset="0" stop-color="#d93838"/>
+      <stop offset="0.3" stop-color="#bf0c0c"/>
+      <stop offset="0.65" stop-color="#ab0505"/>
+      <stop offset="1" stop-color="#bd0f0f"/>
+    </linearGradient>
+    <radialGradient id="glow" cx="0.5" cy="0.5" r="0.5">
+      <stop offset="0" stop-color="#ffd2d2" stop-opacity="0.95"/>
+      <stop offset="0.6" stop-color="#f9a6a6" stop-opacity="0.5"/>
+      <stop offset="1" stop-color="#f9a6a6" stop-opacity="0"/>
+    </radialGradient>
+  </defs>
+  <path d="M15.6 30.9 C12.4 30.9 9.6 30.4 7.8 29.5 C6.1 28.7 5.2 27.6 5.2 26.2 C5.2 24.1 6.3 20.5 7.8 18.2 C9.1 16.1 11.1 14.6 13.3 14.6 L17.9 14.6 C20.1 14.6 22.1 16.1 23.4 18.2 C24.9 20.5 26 24.1 26 26.2 C26 27.6 25.1 28.7 23.4 29.5 C21.6 30.4 18.8 30.9 15.6 30.9 Z" fill="url(#body)" stroke="#840101" stroke-width="0.9"/>
+  <ellipse cx="15.6" cy="28.2" rx="6.8" ry="2.6" fill="url(#glow)"/>
+  <path d="M7.9 19.8 C9.4 16.6 11.8 15.4 15.6 15.4 C19.4 15.4 21.8 16.6 23.3 19.8" fill="none" stroke="#f3a1a1" stroke-width="1.1" stroke-linecap="round" opacity="0.7"/>
+  <ellipse cx="15.6" cy="15.5" rx="4.8" ry="1.6" fill="#740000" opacity="0.35"/>
+  <circle cx="15.6" cy="7.5" r="7.4" fill="url(#head)" stroke="#8b0101" stroke-width="0.9"/>
+  <path d="M11 13.1 C12.6 14.6 14.1 14.9 15.6 14.9 C17.1 14.9 18.6 14.6 20.2 13.1" fill="none" stroke="#f7b0b0" stroke-width="1" stroke-linecap="round" opacity="0.8"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/toolbar_clients.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_clients.svg Added

@@ -0,0 +1,29 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <radialGradient id="head" cx="0.4" cy="0.3" r="0.95">
+      <stop offset="0" stop-color="#f7fcff"/>
+      <stop offset="0.3" stop-color="#dceefb"/>
+      <stop offset="0.6" stop-color="#aed8f7"/>
+      <stop offset="1" stop-color="#7db8ec"/>
+    </radialGradient>
+    <linearGradient id="body" gradientUnits="userSpaceOnUse" x1="15.6" y1="14.6" x2="15.6" y2="31">
+      <stop offset="0" stop-color="#c4e7fc"/>
+      <stop offset="0.3" stop-color="#a2d3f6"/>
+      <stop offset="0.65" stop-color="#8fc6f1"/>
+      <stop offset="1" stop-color="#a6d8f9"/>
+    </linearGradient>
+    <radialGradient id="glow" cx="0.5" cy="0.5" r="0.5">
+      <stop offset="0" stop-color="#e2f6ff" stop-opacity="0.95"/>
+      <stop offset="0.6" stop-color="#d5f1ff" stop-opacity="0.55"/>
+      <stop offset="1" stop-color="#d5f1ff" stop-opacity="0"/>
+    </radialGradient>
+  </defs>
+  <g transform="translate(1.818 1.909) scale(0.9091)">
+    <path d="M15.6 30.9 C12.4 30.9 9.6 30.4 7.8 29.5 C6.1 28.7 5.2 27.6 5.2 26.2 C5.2 24.1 6.3 20.5 7.8 18.2 C9.1 16.1 11.1 14.6 13.3 14.6 L17.9 14.6 C20.1 14.6 22.1 16.1 23.4 18.2 C24.9 20.5 26 24.1 26 26.2 C26 27.6 25.1 28.7 23.4 29.5 C21.6 30.4 18.8 30.9 15.6 30.9 Z" fill="url(#body)" stroke="#79b6ea" stroke-width="0.9"/>
+    <ellipse cx="15.6" cy="28.2" rx="6.8" ry="2.6" fill="url(#glow)"/>
+    <path d="M7.9 19.8 C9.4 16.6 11.8 15.4 15.6 15.4 C19.4 15.4 21.8 16.6 23.3 19.8" fill="none" stroke="#d9f1ff" stroke-width="1.1" stroke-linecap="round" opacity="0.75"/>
+    <ellipse cx="15.6" cy="15.5" rx="4.8" ry="1.6" fill="#5f9ed8" opacity="0.3"/>
+    <circle cx="15.6" cy="7.5" r="7.4" fill="url(#head)" stroke="#74b2e8" stroke-width="0.9"/>
+    <path d="M11 13.1 C12.6 14.6 14.1 14.9 15.6 14.9 C17.1 14.9 18.6 14.6 20.2 13.1" fill="none" stroke="#e6f6ff" stroke-width="1" stroke-linecap="round" opacity="0.8"/>
+  </g>
+</svg>

amule-3.1.0.tar.gz/src/icons/toolbar_connect.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_connect.svg Added

amule-3.1.0.tar.gz/src/icons/toolbar_connecting.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_connecting.svg Added

amule-3.1.0.tar.gz/src/icons/toolbar_disconnect.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_disconnect.svg Added

amule-3.1.0.tar.gz/src/icons/toolbar_import.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_import.svg Added

@@ -0,0 +1,23 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <linearGradient id="bar" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#5aa0f5"/><stop offset="1" stop-color="#2e6ed6"/>
+    </linearGradient>
+    <linearGradient id="glass" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#ffffff"/><stop offset="1" stop-color="#dbeafe"/>
+    </linearGradient>
+    <linearGradient id="ar" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#ffe08a"/><stop offset="0.5" stop-color="#ffab2e"/><stop offset="1" stop-color="#ef8a10"/>
+    </linearGradient>
+  </defs>
+  <g transform="translate(-0.960 -0.960) scale(1.0600)">
+  <ellipse cx="20" cy="28.4" rx="10" ry="1.3" fill="#3a3a3a" opacity="0.15"/>
+  <rect x="10.5" y="5.5" width="19" height="20" rx="2.2" fill="url(#glass)" stroke="#16368c" stroke-width="1"/>
+  <path d="M10.5 7.7 Q10.5 5.5 12.7 5.5 L27.3 5.5 Q29.5 5.5 29.5 7.7 L29.5 10.8 L10.5 10.8 Z" fill="url(#bar)"/>
+  <g fill="#eaf3ff"><circle cx="13.5" cy="8.1" r="0.9"/><circle cx="16.3" cy="8.1" r="0.9"/><circle cx="19.1" cy="8.1" r="0.9"/></g>
+  <line x1="12" y1="6.7" x2="28" y2="6.7" stroke="#bcd7ff" stroke-width="0.8" stroke-linecap="round" opacity="0.6"/>
+  <polygon points="1.5,13.4 11,13.4 11,10.5 18.5,16 11,21.5 11,18.6 1.5,18.6"
+    fill="url(#ar)" stroke="#9d3c00" stroke-width="1" stroke-linejoin="round"/>
+  <path d="M2.6 14.4 L10 14.4" stroke="#ffe9b0" stroke-width="1" stroke-linecap="round" opacity="0.8"/>
+  </g>
+</svg>

amule-3.1.0.tar.gz/src/icons/toolbar_messages.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_messages.svg Added

amule-3.1.0.tar.gz/src/icons/toolbar_network.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_network.svg Added

@@ -0,0 +1,28 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <radialGradient id="globe" cx="0.36" cy="0.28" r="0.92">
+      <stop offset="0" stop-color="#eaf2fc"/>
+      <stop offset="0.4" stop-color="#93b4e2"/>
+      <stop offset="0.74" stop-color="#3f6cb5"/>
+      <stop offset="1" stop-color="#244d8f"/>
+    </radialGradient>
+    <linearGradient id="chrome" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#eeeef2"/>
+      <stop offset="0.5" stop-color="#9c9ca4"/>
+      <stop offset="1" stop-color="#5a5a62"/>
+    </linearGradient>
+  </defs>
+  <g transform="translate(-1.280 -0.390) scale(1.0800)">
+  <rect x="15" y="21" width="2" height="6.5" fill="url(#chrome)"/>
+  <rect x="7.5" y="26.5" width="17" height="3.4" rx="1.4" fill="url(#chrome)" stroke="#4a4a52" stroke-width="0.4"/>
+  <circle cx="16" cy="12.5" r="11.4" fill="url(#globe)" stroke="#1d3f78" stroke-width="0.8"/>
+  <g fill="#eef4fc" opacity="0.92">
+    <path d="M12.6 9.2 Q13.6 8.2 15.8 8 Q18.4 7.8 19.8 8.2 Q21.2 9.6 20.4 11 Q19.5 12 19.3 13.4 Q19 15.8 17.3 17.8 Q16.3 18.6 15.9 17.2 Q15.5 15 14.7 14 Q13.3 13.6 13.1 12.2 Q11.7 10.6 12.6 9.2 Z"/>
+    <ellipse cx="20.7" cy="15.8" rx="0.75" ry="1.35" transform="rotate(18 20.7 15.8)"/>
+    <path d="M13.9 6.4 Q15.7 5.2 18 5.6 Q19.6 6 19.1 7.1 Q16.9 7.5 14.7 7.5 Q13.8 7.1 13.9 6.4 Z"/>
+    <path d="M20.8 7.4 Q22.6 7 23.6 8.2 Q22.9 9.3 21.4 8.9 Q20.5 8.2 20.8 7.4 Z"/>
+    <path d="M9.3 13.2 Q10.7 13.4 10.9 15.2 Q10.7 17.2 9.6 17.9 Q8.7 15.4 9.3 13.2 Z"/>
+  </g>
+  <ellipse cx="11" cy="6.6" rx="4.4" ry="2.4" fill="#ffffff" opacity="0.5" transform="rotate(-32 11 6.6)"/>
+  </g>
+</svg>

amule-3.1.0.tar.gz/src/icons/toolbar_prefs.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_prefs.svg Added

@@ -0,0 +1,55 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <linearGradient id="shaftg" gradientUnits="userSpaceOnUse" x1="13.7" y1="13.7" x2="16.3" y2="16.3">
+      <stop offset="0" stop-color="#ffffff"/>
+      <stop offset="0.5" stop-color="#f1f1f1"/>
+      <stop offset="0.8" stop-color="#d6d6d6"/>
+      <stop offset="1" stop-color="#bcbcbc"/>
+    </linearGradient>
+    <linearGradient id="h1" gradientUnits="userSpaceOnUse" x1="22.5" y1="1.5" x2="27.5" y2="8.5">
+      <stop offset="0" stop-color="#ffffff"/>
+      <stop offset="0.5" stop-color="#efefef"/>
+      <stop offset="1" stop-color="#c2c2c2"/>
+    </linearGradient>
+    <linearGradient id="h2" gradientUnits="userSpaceOnUse" x1="2.5" y1="21.5" x2="7" y2="29">
+      <stop offset="0" stop-color="#f7f7f7"/>
+      <stop offset="0.5" stop-color="#e3e3e3"/>
+      <stop offset="1" stop-color="#b0b0b0"/>
+    </linearGradient>
+    <linearGradient id="bladeg" gradientUnits="userSpaceOnUse" x1="2.4" y1="2.9" x2="14.6" y2="15.1">
+      <stop offset="0" stop-color="#e7e7e7"/>
+      <stop offset="0.2" stop-color="#ffffff"/>
+      <stop offset="0.5" stop-color="#d5d5d5"/>
+      <stop offset="0.8" stop-color="#eeeeee"/>
+      <stop offset="1" stop-color="#cccccc"/>
+    </linearGradient>
+    <linearGradient id="ferg" gradientUnits="userSpaceOnUse" x1="14" y1="16.5" x2="16" y2="14.5">
+      <stop offset="0" stop-color="#8e8e8e"/>
+      <stop offset="0.55" stop-color="#ececec"/>
+      <stop offset="0.75" stop-color="#f8f8f8"/>
+      <stop offset="1" stop-color="#a2a2a2"/>
+    </linearGradient>
+    <linearGradient id="handg" gradientUnits="userSpaceOnUse" x1="20.07" y1="23.83" x2="23.33" y2="20.57">
+      <stop offset="0" stop-color="#bf7a00"/>
+      <stop offset="0.3" stop-color="#eda50f"/>
+      <stop offset="0.55" stop-color="#ffd54f"/>
+      <stop offset="0.75" stop-color="#fff3ac"/>
+      <stop offset="0.9" stop-color="#f6c22c"/>
+      <stop offset="1" stop-color="#dd9d14"/>
+    </linearGradient>
+  </defs>
+  <g transform="translate(2.400 2.400) scale(0.8500)">
+  <ellipse cx="27.4" cy="30" rx="3" ry="1.3" fill="#5a5a5a" opacity="0.16" transform="rotate(45 27.4 30)"/>
+  <line x1="22.4" y1="7.6" x2="7.6" y2="22.4" stroke="url(#shaftg)" stroke-width="3.6"/>
+  <path d="M24.13 0.63 A4.7 4.7 0 1 0 29.37 5.87 L28.45 4.1 L26.5 5.69 A1.55 1.55 0 0 1 24.31 3.5 L25.9 1.55 Z" fill="url(#h1)" stroke="#ababab" stroke-width="0.5" stroke-linejoin="round" stroke-opacity="0.8"/>
+  <path d="M5.87 29.37 A4.7 4.7 0 1 0 0.63 24.13 L1.55 25.9 L3.5 24.31 A1.55 1.55 0 0 1 5.69 26.5 L4.1 28.45 Z" fill="url(#h2)" stroke="#ababab" stroke-width="0.5" stroke-linejoin="round" stroke-opacity="0.8"/>
+  <line x1="12.9" y1="20" x2="10" y2="22.9" stroke="#3f3f3f" stroke-width="0.7" stroke-linecap="round" opacity="0.65"/>
+  <ellipse cx="13.2" cy="17.1" rx="2.7" ry="1.15" fill="#5a5a5a" opacity="0.2" transform="rotate(45 13.2 17.1)"/>
+  <line x1="2.4" y1="2.9" x2="14.6" y2="15.1" stroke="url(#bladeg)" stroke-width="2.2"/>
+  <line x1="4.5" y1="6.3" x2="12.3" y2="14.1" stroke="#575757" stroke-width="0.8" stroke-linecap="round" opacity="0.85"/>
+  <line x1="13.9" y1="14.4" x2="16.2" y2="16.7" stroke="url(#ferg)" stroke-width="2.9"/>
+  <line x1="16.1" y1="16.6" x2="26.9" y2="27.4" stroke="url(#handg)" stroke-width="4.6"/>
+  <circle cx="26.9" cy="27.4" r="2.3" fill="url(#handg)"/>
+  <ellipse cx="18.1" cy="17.4" rx="1.5" ry="0.55" fill="#ffffff" opacity="0.8" transform="rotate(45 18.1 17.4)"/>
+  </g>
+</svg>

amule-3.1.0.tar.gz/src/icons/toolbar_search.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_search.svg Added

@@ -0,0 +1,36 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <radialGradient id="lens" cx="0.62" cy="0.66" r="0.9">
+      <stop offset="0" stop-color="#f4ffff"/>
+      <stop offset="0.5" stop-color="#dcf9ff"/>
+      <stop offset="0.8" stop-color="#bfeafd"/>
+      <stop offset="1" stop-color="#9ad2f6"/>
+    </radialGradient>
+    <linearGradient id="rim" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="#aab3c6"/>
+      <stop offset="1" stop-color="#5e6080"/>
+    </linearGradient>
+    <linearGradient id="handle" gradientUnits="userSpaceOnUse" x1="21.6" y1="26.4" x2="26.4" y2="21.6">
+      <stop offset="0" stop-color="#8f5a1e"/>
+      <stop offset="0.3" stop-color="#cd861d"/>
+      <stop offset="0.52" stop-color="#f4b54e"/>
+      <stop offset="0.66" stop-color="#ffec9f"/>
+      <stop offset="0.82" stop-color="#e8a125"/>
+      <stop offset="1" stop-color="#a4671f"/>
+    </linearGradient>
+    <linearGradient id="ferrule" gradientUnits="userSpaceOnUse" x1="18" y1="20" x2="20" y2="18">
+      <stop offset="0" stop-color="#6f7590"/>
+      <stop offset="0.5" stop-color="#c6ccd9"/>
+      <stop offset="1" stop-color="#8a90a6"/>
+    </linearGradient>
+  </defs>
+  <line x1="20.4" y1="20.4" x2="27.5" y2="27.5" stroke="#7a4a24" stroke-width="6.8" stroke-linecap="round"/>
+  <line x1="20.7" y1="20.7" x2="27.3" y2="27.3" stroke="url(#handle)" stroke-width="5.4" stroke-linecap="round"/>
+  <line x1="17.2" y1="17.2" x2="20.6" y2="20.6" stroke="#5e6080" stroke-width="4.6"/>
+  <line x1="17.5" y1="17.5" x2="20.3" y2="20.3" stroke="url(#ferrule)" stroke-width="3.2"/>
+  <circle cx="10.7" cy="10.7" r="8.8" fill="url(#lens)" stroke="url(#rim)" stroke-width="1.4"/>
+  <circle cx="10.7" cy="10.7" r="7.9" fill="none" stroke="#8bc8f7" stroke-width="1.6" opacity="0.45"/>
+  <circle cx="7.4" cy="7.2" r="3.3" fill="none" stroke="#ffffff" stroke-width="1.2" opacity="0.5"/>
+  <path d="M4.3 8.1 A3.3 3.3 0 0 0 7.9 10.4" fill="none" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" opacity="0.9"/>
+  <ellipse cx="6.2" cy="6" rx="1.1" ry="0.75" fill="#ffffff" opacity="0.8" transform="rotate(-40 6.2 6)"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/toolbar_shared.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_shared.svg Added

amule-3.1.0.tar.gz/src/icons/toolbar_stats.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_stats.svg Added

@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <linearGradient id="b" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#bcd7ff"/><stop offset="0.5" stop-color="#4a93f7"/><stop offset="1" stop-color="#2e6ed6"/>
+    </linearGradient>
+    <linearGradient id="a" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#ffe08a"/><stop offset="0.5" stop-color="#ffab2e"/><stop offset="1" stop-color="#ef8a10"/>
+    </linearGradient>
+    <linearGradient id="g" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0" stop-color="#d2f7a6"/><stop offset="0.5" stop-color="#77c73e"/><stop offset="1" stop-color="#3d8f18"/>
+    </linearGradient>
+  </defs>
+  <path d="M4.6 3.5 L4.6 27 L28 27" fill="none" stroke="#5a5a62" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
+  <rect x="7.6" y="17" width="4.6" height="9.2" rx="0.8" fill="url(#b)" stroke="#16368c" stroke-width="0.8"/>
+  <rect x="13.9" y="12" width="4.6" height="14.2" rx="0.8" fill="url(#a)" stroke="#9d3c00" stroke-width="0.8"/>
+  <rect x="20.2" y="7" width="4.6" height="19.2" rx="0.8" fill="url(#g)" stroke="#2e6e0f" stroke-width="0.8"/>
+  <line x1="8.6" y1="18" x2="8.6" y2="25.4" stroke="#ffffff" stroke-width="0.8" opacity="0.55"/>
+  <line x1="14.9" y1="13" x2="14.9" y2="25.4" stroke="#ffffff" stroke-width="0.8" opacity="0.55"/>
+  <line x1="21.2" y1="8" x2="21.2" y2="25.4" stroke="#ffffff" stroke-width="0.8" opacity="0.55"/>
+</svg>

amule-3.1.0.tar.gz/src/icons/toolbar_transfers.png Added

amule-3.1.0.tar.gz/src/icons/toolbar_transfers.svg Added

amule-3.1.0.tar.gz/src/icons/transfer_clear_completed.png Added

amule-3.1.0.tar.gz/src/icons/transfer_clear_completed.svg Added

amule-3.1.0.tar.gz/src/icons/transfer_clear_completed_disabled.png Added

amule-3.1.0.tar.gz/src/icons/transfer_clear_completed_disabled.svg Added

amule-3.0.1.tar.gz/src/icons/tray_disconnected.png -> amule-3.1.0.tar.gz/src/icons/tray_disconnected.png Changed

amule-3.0.1.tar.gz/src/icons/tray_high.png -> amule-3.1.0.tar.gz/src/icons/tray_high.png Changed

amule-3.0.1.tar.gz/src/icons/tray_low.png -> amule-3.1.0.tar.gz/src/icons/tray_low.png Changed

amule-3.0.1.tar.gz/src/include/common/ClientVersion.h -> amule-3.1.0.tar.gz/src/include/common/ClientVersion.h Changed

@@ -26,49 +26,46 @@
 #ifndef CLIENTVERSION_H
 #define CLIENTVERSION_H
 
-// RC_INVOKED is defined by windres when processing a .rc resource
-// file. The Windows version-info resource (version.rc.in) only needs
-// the VERSION_MJR/MIN/UPDATE macros below; pulling in config.h drags
-// in -I${CMAKE_BINARY_DIR} which isn't on the windres command line for
-// every Windows target (e.g. ed2k).
+// RC_INVOKED is defined by windres when processing a .rc resource file. The Windows version-info
+// resource (version.rc.in) only needs the VERSION_MJR/MIN/UPDATE macros below; pulling in config.h
+// drags in -I${CMAKE_BINARY_DIR}, which is not on the windres command line for every Windows target
+// (ed2k, for one).
 #ifndef RC_INVOKED
-#include "config.h"		// Needed for VERSION
+#include "config.h" // Needed for VERSION
 #endif
 
 // eMule version used on old MuleInfo packet (unimportant).
-#define	CURRENT_VERSION_SHORT			0x47
+#define CURRENT_VERSION_SHORT 0x47
 
 // This is only used to server login. It has no real "version" meaning anymore.
-#define	EDONKEYVERSION				0x3c
+#define EDONKEYVERSION 0x3c
 
 // aMule version
 
 // No more Mod Version unless we're cvs
 
-// __GIT__ marks dev builds (MOD_VERSION_LONG = "aMule GIT").  CMake
-// derives AMULE_TAGGED_RELEASE from `git describe --tags --exact-match`
-// at configure time and forwards it via config.h, which makes the
-// __GIT__ flag self-managing: tagged release builds suppress it
-// automatically; source/dev builds keep it.  Manual override is still
-// possible by setting -DAMULE_TAGGED_RELEASE on the cmake command line
-// (e.g. when building from a tarball with no .git directory).
+// __GIT__ marks dev builds (MOD_VERSION_LONG = "aMule GIT"). CMake derives AMULE_TAGGED_RELEASE
+// from `git describe --tags --exact-match` at configure time and forwards it via config.h, which
+// makes the __GIT__ flag self-managing: tagged release builds suppress it automatically, source/dev
+// builds keep it. Manual override is still possible by setting -DAMULE_TAGGED_RELEASE on the cmake
+// command line, e.g. when building from a tarball with no .git directory.
 #ifndef AMULE_TAGGED_RELEASE
 #define __GIT__
 #endif
 
 #ifndef VERSION
-	#define VERSION "3.0.0-dev"
+#define VERSION "3.1.0-dev"
 #endif
 
 #ifdef __GIT__
-	#define	MOD_VERSION_LONG		"aMule GIT"
+#define MOD_VERSION_LONG "aMule GIT"
 #else
-	#define	MOD_VERSION_LONG		("aMule " VERSION)
+#define MOD_VERSION_LONG ("aMule " VERSION)
 #endif
 
-#define	VERSION_MJR		3
-#define	VERSION_MIN		0
-#define	VERSION_UPDATE		1
+#define VERSION_MJR 3
+#define VERSION_MIN 1
+#define VERSION_UPDATE 0
 
 #ifndef PACKAGE
 #define PACKAGE "amule"

amule-3.0.1.tar.gz/src/include/common/Constants.h -> amule-3.1.0.tar.gz/src/include/common/Constants.h Changed

amule-3.0.1.tar.gz/src/include/common/DataFileVersion.h -> amule-3.1.0.tar.gz/src/include/common/DataFileVersion.h Changed

@@ -26,27 +26,37 @@
 #ifndef DATAFILEVERSION_H
 #define DATAFILEVERSION_H
 
-enum PreferencesDatFileVersions {
-	PREFFILE_VERSION		= 0x14 //<<-- last change: reduced .dat, by using .ini
+enum PreferencesDatFileVersions
+{
+	PREFFILE_VERSION = 0x14 //<<-- last change: reduced .dat, by using .ini
 };
 
-enum PartMetFileVersions {
-	PARTFILE_VERSION			= 0xe0,
-	PARTFILE_SPLITTEDVERSION	= 0xe1, // For edonkey part files importing.
-	PARTFILE_VERSION_LARGEFILE	= 0xe2
+enum PartMetFileVersions
+{
+	PARTFILE_VERSION = 0xe0,
+	PARTFILE_SPLITTEDVERSION = 0xe1, // For edonkey part files importing.
+	PARTFILE_VERSION_LARGEFILE = 0xe2
 };
 
-enum CreditFileVersions {
-	CREDITFILE_VERSION		= 0x12
+enum CreditFileVersions
+{
+	CREDITFILE_VERSION = 0x12
 };
 
-enum KnownFileListVersions {
-	MET_HEADER					= 0x0E,
-	MET_HEADER_WITH_LARGEFILES	= 0x0F
+enum KnownFileListVersions
+{
+	MET_HEADER = 0x0E,
+	MET_HEADER_WITH_LARGEFILES = 0x0F
 };
 
-enum CanceledFileListVersions {
-	CANCELEDFILE_VERSION	= 0x21
+enum CanceledFileListVersions
+{
+	CANCELEDFILE_VERSION = 0x21
+};
+
+enum StoredSearchesFileVersions
+{
+	STOREDSEARCHES_VERSION = 0x01
 };
 
 #endif // DATAFILEVERSION_H

amule-3.0.1.tar.gz/src/include/common/EventIDs.h -> amule-3.1.0.tar.gz/src/include/common/EventIDs.h Changed

amule-3.0.1.tar.gz/src/include/common/Macros.h -> amule-3.1.0.tar.gz/src/include/common/Macros.h Changed

@@ -26,28 +26,27 @@
 #ifndef COMMONMACROS_H
 #define COMMONMACROS_H
 
-#define	SEC2MS(sec)		((sec)*1000)
-#define	MIN2MS(min)		SEC2MS((min)*60)
-#define	HR2MS(hr)		MIN2MS((hr)*60)
-#define	DAY2MS(day)		HR2MS((day)*24)
-#define	SEC(sec)		(sec)
-#define	MIN2S(min)		((min)*60)
-#define	HR2S(hr)		MIN2S((hr)*60)
-#define	DAY2S(day)		HR2S((day)*24)
-
-#define COMPILE_DATE				__DATE__
-#define COMPILE_TIME				__TIME__
-
+#define SEC2MS(sec) ((sec) * 1000)
+#define MIN2MS(min) SEC2MS((min) * 60)
+#define HR2MS(hr) MIN2MS((hr) * 60)
+#define DAY2MS(day) HR2MS((day) * 24)
+#define SEC(sec) (sec)
+#define MIN2S(min) ((min) * 60)
+#define HR2S(hr) MIN2S((hr) * 60)
+#define DAY2S(day) HR2S((day) * 24)
+
+#define COMPILE_DATE __DATE__
+#define COMPILE_TIME __TIME__
 
 //! Returns the number of items in an array.
-#define itemsof(x)	(sizeof(x) / sizeof(x0))
+#define itemsof(x) (sizeof(x) / sizeof(x0))
 
 // Build type specific macro
 
 #ifdef __DEBUG__
-#	define DEBUG_ONLY(x)	x
+#define DEBUG_ONLY(x) x
 #else
-#	define DEBUG_ONLY(x)	/* nothing */
+#define DEBUG_ONLY(x) /* nothing */
 #endif
 
 #endif // COMMONMACROS_H

amule-3.0.1.tar.gz/src/include/common/MacrosProgramSpecific.h -> amule-3.1.0.tar.gz/src/include/common/MacrosProgramSpecific.h Changed

amule-3.0.1.tar.gz/src/include/common/MenuIDs.h -> amule-3.1.0.tar.gz/src/include/common/MenuIDs.h Changed

@@ -26,9 +26,10 @@
 #ifndef COMMONMENUIDS_H
 #define COMMONMENUIDS_H
 
-#include <wx/defs.h>	// To access wxID_HIGHEST menu item constant
+#include <wx/defs.h> // To access wxID_HIGHEST menu item constant
 
-enum {
+enum
+{
 	MP_MESSAGE = wxID_HIGHEST + 1, // Start ID at next free value (defined by wx)
 	MP_DETAIL,
 	MP_ADDFRIEND,
@@ -36,20 +37,27 @@
 	MP_SHOWLIST,
 	MP_FRIENDSLOT,
 	MP_CHANGE2FILE,
+	// Explains the colours of a chunk-bar column. Only the client lists that
+	// actually draw one offer it -- see CGenericClientListCtrl.
+	MP_BARLEGEND,
 	MP_CANCEL,
 	MP_STOP,
 	MP_RESUME,
 	MP_PAUSE,
 	MP_CLEARCOMPLETED,
 	MP_VIEW,
+	MP_SHOWINFOLDER,
 	MP_SENDMESSAGE,
 	MP_WS,
 	MP_RAZORSTATS,
 	MP_ADDCOLLECTION,
+	MP_EXPORTCOLLECTION,
 	MP_GETCOMMENTS,
 	MP_SEARCHRELATED,
-	MP_MARK_AS_KNOWN,
-//For comments
+	// Folder rows in a browse tab (CBrowseListModel)
+	MP_EXPANDALL,
+	MP_COLLAPSEALL,
+	// For comments
 	MP_CMT,
 
 	MP_PRIOVERYLOW,
@@ -83,16 +91,13 @@
 	MP_CLOSE_ALL_TABS,
 	MP_CLOSE_OTHER_TABS,
 	MP_RENAME,
+	MP_VERIFY,
+	MP_REFRESHMEDIAMETA,
 
-/* Razor 1a - Modif by MikaelB
-     Opcodes for :
-      - Drop No Needed Sources now
-      - Drop Full Queue Sources now
-      - Drop High Queue Rating Sources now
-      - Clean Up Sources now ( drop NNS, FQS and HQRS )
-      - Swap every A4AF to this file now
-      - Swap every A4AF to this file ( AUTO )
-      - Swap every A4AF to any other file now   */
+	/* Razor 1a - Modif by MikaelB
+	     Opcodes for dropping no-needed / full-queue / high-queue-rating sources now, cleaning
+	     up sources (all three at once), and swapping every A4AF to this file now, to this file
+	     automatically, or to any other file now. */
 	MP_DROP_NO_NEEDED_SOURCES,
 	MP_DROP_FULL_QUEUE_SOURCES,
 	MP_DROP_HIGH_QUEUE_RATING_SOURCES,
@@ -101,12 +106,12 @@
 	MP_SWAP_A4AF_TO_THIS_AUTO,
 	MP_SWAP_A4AF_TO_ANY_OTHER,
 
-//menus
+	// menus
 	MP_MENU_PRIO,
 	MP_MENU_EXTD,
 	MP_MENU_CATS,
 
-// CMuleListCtrl tabs.
+	// CMuleListCtrl tabs.
 	MP_LISTCOL_1,
 	MP_LISTCOL_2,
 	MP_LISTCOL_3,
@@ -122,16 +127,25 @@
 	MP_LISTCOL_13,
 	MP_LISTCOL_14,
 	MP_LISTCOL_15,
+	// The header show/hide menu offers one entry per column, so this range has to be at least
+	// as long as the longest list. The server list reached 16 columns and the 16th was silently
+	// dropped from the menu; the spares are headroom so the next column added does not repeat
+	// that.
+	MP_LISTCOL_16,
+	MP_LISTCOL_17,
+	MP_LISTCOL_18,
+	MP_LISTCOL_19,
+	MP_LISTCOL_20,
 
-	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 = MP_LISTCOL_20 + 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,
 
-// Pop-up menu clickable entries
+	// 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_CLIENTINFO_ITEM = MP_SWITCHCTRL_9 + 1, // continue from MP_SWITCHCTRL_9
 	TRAY_MENU_DISCONNECT,
 	TRAY_MENU_CONNECT,
 	TRAY_MENU_HIDE,

amule-3.0.1.tar.gz/src/include/protocol/Protocols.h -> amule-3.1.0.tar.gz/src/include/protocol/Protocols.h Changed

@@ -27,28 +27,53 @@
 #define ED2KPROTOCOLS_H
 
 // For MuleInfoPacket (OLD - DEPRECATED.)
-#define	EMULE_PROTOCOL				0x01
+#define EMULE_PROTOCOL 0x01
 
 // Known protocols
-enum Protocols {
-	OP_EDONKEYHEADER		= 0xE3,
-	OP_EDONKEYPROT			= OP_EDONKEYHEADER,
-	OP_PACKEDPROT			= 0xD4,
-	OP_EMULEPROT			= 0xC5,
+enum Protocols
+{
+	OP_EDONKEYHEADER = 0xE3,
+	OP_EDONKEYPROT = OP_EDONKEYHEADER,
+	OP_PACKEDPROT = 0xD4,
+	OP_EMULEPROT = 0xC5,
 
 	// Reserved for later UDP headers (important for EncryptedDatagramSocket)
 	OP_UDPRESERVEDPROT1 = 0xA3,
 	OP_UDPRESERVEDPROT2 = 0xB2,
 
 	// Kademlia 1/2
-	OP_KADEMLIAHEADER		= 0xE4,
-	OP_KADEMLIAPACKEDPROT	= 0xE5,
+	OP_KADEMLIAHEADER = 0xE4,
+	OP_KADEMLIAPACKEDPROT = 0xE5,
 
 	// Kry tests
-	OP_ED2KV2HEADER			= 0xF4,
-	OP_ED2KV2PACKEDPROT		= 0xF5,
+	OP_ED2KV2HEADER = 0xF4,
+	OP_ED2KV2PACKEDPROT = 0xF5,
 
-	OP_MLDONKEYPROT			= 0x00
+	OP_MLDONKEYPROT = 0x00
+};
+
+// OP_UDPRESERVEDPROT2 frame types.
+//
+// 0xB2 is the one UDP protocol byte not followed by an eD2k opcode: the next byte selects a frame
+// type and the rest is that frame's payload. These are the types eMuleAI defines, and they are a
+// separate namespace from Protocols above -- OP_NATT_FRAME_UTP and OP_MLDONKEYPROT are both 0x00
+// and mean unrelated things at different offsets.
+//
+// aMule implements none of the transports behind them yet; it recognises them so an eMuleAI peer's
+// NAT traversal traffic is dropped as a known frame it cannot serve rather than treated as
+// malformed. See src/ReservedProtocolFrames.h.
+enum ReservedProt2FrameTypes
+{
+	//! Legacy uTP NAT-T frame.
+	OP_NATT_FRAME_UTP = 0x00,
+	//! QUIC NAT-T frame.
+	OP_NATT_FRAME_QUIC = 0x01,
+	//! Direct peer NAT-T capability negotiation.
+	OP_NATT_FRAME_CAPS = 0x02,
+	//! Direct peer NAT-T capability negotiation acknowledgement.
+	OP_NATT_FRAME_CAPS_ACK = 0x03,
+	//! NAT-T key frame.
+	OP_NATT_FRAME_KEY = 0xFF
 };
 
 #endif // ED2KPROTOCOLS_H

amule-3.0.1.tar.gz/src/include/protocol/ed2k/Client2Client/TCP.h -> amule-3.1.0.tar.gz/src/include/protocol/ed2k/Client2Client/TCP.h Changed

@@ -27,78 +27,80 @@
 #define ED2KC2CTCP_H
 
 // Client <-> Client
-enum ED2KStandardClientTCP {
-	OP_HELLO					= 0x01,	// 0x10<HASH 16><ID 4><PORT 2><1 Tag_set>
-	OP_SENDINGPART				= 0x46,	// <HASH 16><von 4><bis 4><Daten len:(von-bis)>
-	OP_REQUESTPARTS				= 0x47,	// <HASH 16><von3 4*3><bis3 4*3>
-	OP_FILEREQANSNOFIL			= 0x48,	// <HASH 16>
-	OP_END_OF_DOWNLOAD		= 0x49,	// <HASH 16> // Unused for sending
-	OP_ASKSHAREDFILES			= 0x4A,	// (null)
-	OP_ASKSHAREDFILESANSWER		= 0x4B,	// <count 4>(<HASH 16><ID 4><PORT 2><1 Tag_set>)count
-	OP_HELLOANSWER				= 0x4C,	// <HASH 16><ID 4><PORT 2><1 Tag_set><SERVER_IP 4><SERVER_PORT 2>
-	OP_CHANGE_CLIENT_ID		= 0x4D,	// <ID_old 4><ID_new 4> // Unused for sending
-	OP_MESSAGE					= 0x4E,	// <len 2><Message len>
-	OP_SETREQFILEID				= 0x4F,	// <HASH 16>
-	OP_FILESTATUS				= 0x50,	// <HASH 16><count 2><status(bit array) len:((count+7)/8)>
-	OP_HASHSETREQUEST			= 0x51,	// <HASH 16>
-	OP_HASHSETANSWER			= 0x52,	// <count 2><HASHcount 16*count>
-	OP_STARTUPLOADREQ			= 0x54,	// <HASH 16>
-	OP_ACCEPTUPLOADREQ			= 0x55,	// (null)
-	OP_CANCELTRANSFER			= 0x56,	// (null)
-	OP_OUTOFPARTREQS			= 0x57,	// (null)
-	OP_REQUESTFILENAME			= 0x58,	// <HASH 16>	(more correctly file_name_request)
-	OP_REQFILENAMEANSWER		= 0x59,	// <HASH 16><len 4><NAME len>
-	OP_CHANGE_SLOT				= 0x5B,	// <HASH 16> // Not used for sending
-	OP_QUEUERANK				= 0x5C,	// <wert  4> (slot index of the request) // Not used for sending
-	OP_ASKSHAREDDIRS			= 0x5D,	// (null)
-	OP_ASKSHAREDFILESDIR		= 0x5E,	// <len 2><Directory len>
-	OP_ASKSHAREDDIRSANS			= 0x5F,	// <count 4>(<len 2><Directory len>)count
-	OP_ASKSHAREDFILESDIRANS		= 0x60,	// <len 2><Directory len><count 4>(<HASH 16><ID 4><PORT 2><1 T
-	OP_ASKSHAREDDENIEDANS		= 0x61	// (null)
+enum ED2KStandardClientTCP
+{
+	OP_HELLO = 0x01,                // 0x10<HASH 16><ID 4><PORT 2><1 Tag_set>
+	OP_SENDINGPART = 0x46,          // <HASH 16><von 4><bis 4><Daten len:(von-bis)>
+	OP_REQUESTPARTS = 0x47,         // <HASH 16><von3 4*3><bis3 4*3>
+	OP_FILEREQANSNOFIL = 0x48,      // <HASH 16>
+	OP_END_OF_DOWNLOAD = 0x49,      // <HASH 16> // Unused for sending
+	OP_ASKSHAREDFILES = 0x4A,       // (null)
+	OP_ASKSHAREDFILESANSWER = 0x4B, // <count 4>(<HASH 16><ID 4><PORT 2><1 Tag_set>)count
+	OP_HELLOANSWER = 0x4C,          // <HASH 16><ID 4><PORT 2><1 Tag_set><SERVER_IP 4><SERVER_PORT 2>
+	OP_CHANGE_CLIENT_ID = 0x4D,     // <ID_old 4><ID_new 4> // Unused for sending
+	OP_MESSAGE = 0x4E,              // <len 2><Message len>
+	OP_SETREQFILEID = 0x4F,         // <HASH 16>
+	OP_FILESTATUS = 0x50,           // <HASH 16><count 2><status(bit array) len:((count+7)/8)>
+	OP_HASHSETREQUEST = 0x51,       // <HASH 16>
+	OP_HASHSETANSWER = 0x52,        // <count 2><HASHcount 16*count>
+	OP_STARTUPLOADREQ = 0x54,       // <HASH 16>
+	OP_ACCEPTUPLOADREQ = 0x55,      // (null)
+	OP_CANCELTRANSFER = 0x56,       // (null)
+	OP_OUTOFPARTREQS = 0x57,        // (null)
+	OP_REQUESTFILENAME = 0x58,      // <HASH 16>	(more correctly file_name_request)
+	OP_REQFILENAMEANSWER = 0x59,    // <HASH 16><len 4><NAME len>
+	OP_CHANGE_SLOT = 0x5B,          // <HASH 16> // Not used for sending
+	OP_QUEUERANK = 0x5C,            // <wert  4> (slot index of the request) // Not used for sending
+	OP_ASKSHAREDDIRS = 0x5D,        // (null)
+	OP_ASKSHAREDFILESDIR = 0x5E,    // <len 2><Directory len>
+	OP_ASKSHAREDDIRSANS = 0x5F,     // <count 4>(<len 2><Directory len>)count
+	OP_ASKSHAREDFILESDIRANS = 0x60, // <len 2><Directory len><count 4>(<HASH 16><ID 4><PORT 2><1 T
+	OP_ASKSHAREDDENIEDANS = 0x61    // (null)
 };
 
 // Extended prot client <-> Extended prot client
-enum ED2KExtendedClientTCP {
-	OP_EMULEINFO				= 0x01,	//
-	OP_EMULEINFOANSWER			= 0x02,	//
-	OP_COMPRESSEDPART			= 0x40,	//
-	OP_QUEUERANKING				= 0x60,	// <RANG 2>
-	OP_FILEDESC					= 0x61,	// <len 2><NAME len>
-	OP_VERIFYUPSREQ				= 0x71,	// (never used)
-	OP_VERIFYUPSANSWER			= 0x72,	// (never used)
-	OP_UDPVERIFYUPREQ			= 0x73,	// (never used)
-	OP_UDPVERIFYUPA				= 0x74,	// (never used)
-	OP_REQUESTSOURCES			= 0x81,	// <HASH 16>
-	OP_ANSWERSOURCES			= 0x82,	//
-	OP_REQUESTSOURCES2			= 0x83,	// <HASH 16>
-	OP_ANSWERSOURCES2			= 0x84,	//
-	OP_PUBLICKEY				= 0x85,	// <len 1><pubkey len>
-	OP_SIGNATURE				= 0x86,	// v1: <len 1><signature len>
-										// v2:<len 1><signature len><sigIPused 1>
-	OP_SECIDENTSTATE			= 0x87,	// <state 1><rndchallenge 4>
-	OP_REQUESTPREVIEW			= 0x90,	// <HASH 16> // Never used for sending on aMule
-	OP_PREVIEWANSWER			= 0x91,	// <HASH 16><frames 1>{frames * <len 4><frame len>} // Never used for sending on aMule
-	OP_MULTIPACKET				= 0x92,
-	OP_MULTIPACKETANSWER		= 0x93,
-//	OP_PEERCACHE_QUERY			= 0x94, // Unused on aMule - no PeerCache
-//	OP_PEERCACHE_ANSWER			= 0x95, // Unused on aMule - no PeerCache
-//	OP_PEERCACHE_ACK			= 0x96, // Unused on aMule - no PeerCache
-	OP_PUBLICIP_REQ				= 0x97,
-	OP_PUBLICIP_ANSWER			= 0x98,
-	OP_CALLBACK					= 0x99,	// <HASH 16><HASH 16><uint 16>
-	OP_REASKCALLBACKTCP			= 0x9A,
-	OP_AICHREQUEST				= 0x9B,	// <HASH 16><uint16><HASH aichhashlen>
-	OP_AICHANSWER				= 0x9C,	// <HASH 16><uint16><HASH aichhashlen> <data>
-	OP_AICHFILEHASHANS			= 0x9D,
-	OP_AICHFILEHASHREQ			= 0x9E,
-	OP_BUDDYPING				= 0x9F,
-	OP_BUDDYPONG				= 0xA0,
-	OP_COMPRESSEDPART_I64		= 0xA1,	// <HASH 16><von 8><size 4><Data len:size>
-	OP_SENDINGPART_I64			= 0xA2,	// <HASH 16><start 8><end 8><Data len:(end-start)>
-	OP_REQUESTPARTS_I64			= 0xA3,	// <HASH 16><start3 8*3><end3 8*3>
-	OP_MULTIPACKET_EXT			= 0xA4,
-	OP_CHATCAPTCHAREQ			= 0xA5,
-	OP_CHATCAPTCHARES			= 0xA6,
+enum ED2KExtendedClientTCP
+{
+	OP_EMULEINFO = 0x01,       //
+	OP_EMULEINFOANSWER = 0x02, //
+	OP_COMPRESSEDPART = 0x40,  //
+	OP_QUEUERANKING = 0x60,    // <RANG 2>
+	OP_FILEDESC = 0x61,        // <len 2><NAME len>
+	OP_VERIFYUPSREQ = 0x71,    // (never used)
+	OP_VERIFYUPSANSWER = 0x72, // (never used)
+	OP_UDPVERIFYUPREQ = 0x73,  // (never used)
+	OP_UDPVERIFYUPA = 0x74,    // (never used)
+	OP_REQUESTSOURCES = 0x81,  // <HASH 16>
+	OP_ANSWERSOURCES = 0x82,   //
+	OP_REQUESTSOURCES2 = 0x83, // <HASH 16>
+	OP_ANSWERSOURCES2 = 0x84,  //
+	OP_PUBLICKEY = 0x85,       // <len 1><pubkey len>
+	OP_SIGNATURE = 0x86,       // v1: <len 1><signature len>
+				   // v2:<len 1><signature len><sigIPused 1>
+	OP_SECIDENTSTATE = 0x87,   // <state 1><rndchallenge 4>
+	OP_REQUESTPREVIEW = 0x90,  // <HASH 16> // Never used for sending on aMule
+	OP_PREVIEWANSWER =
+		0x91, // <HASH 16><frames 1>{frames * <len 4><frame len>} // Never used for sending on aMule
+	OP_MULTIPACKET = 0x92,
+	OP_MULTIPACKETANSWER = 0x93,
+	//	Unused on aMule -- no PeerCache: OP_PEERCACHE_QUERY = 0x94,
+	//	OP_PEERCACHE_ANSWER = 0x95, OP_PEERCACHE_ACK = 0x96.
+	OP_PUBLICIP_REQ = 0x97,
+	OP_PUBLICIP_ANSWER = 0x98,
+	OP_CALLBACK = 0x99, // <HASH 16><HASH 16><uint 16>
+	OP_REASKCALLBACKTCP = 0x9A,
+	OP_AICHREQUEST = 0x9B, // <HASH 16><uint16><HASH aichhashlen>
+	OP_AICHANSWER = 0x9C,  // <HASH 16><uint16><HASH aichhashlen> <data>
+	OP_AICHFILEHASHANS = 0x9D,
+	OP_AICHFILEHASHREQ = 0x9E,
+	OP_BUDDYPING = 0x9F,
+	OP_BUDDYPONG = 0xA0,
+	OP_COMPRESSEDPART_I64 = 0xA1, // <HASH 16><von 8><size 4><Data len:size>
+	OP_SENDINGPART_I64 = 0xA2,    // <HASH 16><start 8><end 8><Data len:(end-start)>
+	OP_REQUESTPARTS_I64 = 0xA3,   // <HASH 16><start3 8*3><end3 8*3>
+	OP_MULTIPACKET_EXT = 0xA4,
+	OP_CHATCAPTCHAREQ = 0xA5,
+	OP_CHATCAPTCHARES = 0xA6,
 };
 
 #endif // ED2KC2CTCP_H

amule-3.0.1.tar.gz/src/include/protocol/ed2k/Client2Client/UDP.h -> amule-3.1.0.tar.gz/src/include/protocol/ed2k/Client2Client/UDP.h Changed

amule-3.0.1.tar.gz/src/include/protocol/ed2k/Client2Server/TCP.h -> amule-3.1.0.tar.gz/src/include/protocol/ed2k/Client2Server/TCP.h Changed

@@ -26,48 +26,47 @@
 #ifndef ED2KC2STCP_H
 #define ED2KC2STCP_H
 
-enum OP_ClientToServerTCP {
-	OP_LOGINREQUEST				= 0x01,	// <HASH 16><ID 4><PORT 2><1 Tag_set>
-	OP_REJECT					= 0x05,	// (null)
-	OP_GETSERVERLIST			= 0x14,	// (null)client->server
-	OP_OFFERFILES				= 0x15,	// <count 4>(<HASH 16><ID 4><PORT 2><1 Tag_set>)count
-	OP_SEARCHREQUEST			= 0x16,	// <Query_Tree>
-	OP_DISCONNECT				= 0x18,	// (not verified)
-	OP_GETSOURCES				= 0x19,	// <HASH 16>
-										// v2 <HASH 16><SIZE_4> (17.3) (mandatory on 17.8)
-										// v2large <HASH 16><FILESIZE 4(0)><FILESIZE 8> (17.9) (large files only)
-	OP_SEARCH_USER				= 0x1A,	// <Query_Tree>
-	OP_CALLBACKREQUEST			= 0x1C,	// <ID 4>
-//	OP_QUERY_CHATS				= 0x1D,	// (deprecated, not supported by server any longer)
-//	OP_CHAT_MESSAGE				= 0x1E,	// (deprecated, not supported by server any longer)
-//	OP_JOIN_ROOM				= 0x1F,	// (deprecated, not supported by server any longer)
-	OP_QUERY_MORE_RESULT		= 0x21,	// (null)
-	OP_GETSOURCES_OBFU	= 0x23,
-	OP_SERVERLIST				= 0x32,	// <count 1>(<IP 4><PORT 2>)count server->client
-	OP_SEARCHRESULT				= 0x33,	// <count 4>(<HASH 16><ID 4><PORT 2><1 Tag_set>)count
-	OP_SERVERSTATUS				= 0x34,	// <USER 4><FILES 4>
-	OP_CALLBACKREQUESTED		= 0x35,	// <IP 4><PORT 2>
-	OP_CALLBACK_FAIL			= 0x36,	// (null notverified)
-	OP_SERVERMESSAGE			= 0x38,	// <len 2><Message len>
-//	OP_CHAT_ROOM_REQUEST		= 0x39,	// (deprecated, not supported by server any longer)
-//	OP_CHAT_BROADCAST			= 0x3A,	// (deprecated, not supported by server any longer)
-//	OP_CHAT_USER_JOIN			= 0x3B,	// (deprecated, not supported by server any longer)
-//	OP_CHAT_USER_LEAVE			= 0x3C,	// (deprecated, not supported by server any longer)
-//	OP_CHAT_USER				= 0x3D,	// (deprecated, not supported by server any longer)
-	OP_IDCHANGE					= 0x40,	// <NEW_ID 4>
-	OP_SERVERIDENT				= 0x41,	// <HASH 16><IP 4><PORT 2>{1 TAG_SET}
-	OP_FOUNDSOURCES				= 0x42,	// <HASH 16><count 1>(<ID 4><PORT 2>)count
-	OP_USERS_LIST				= 0x43,	// <count 4>(<HASH 16><ID 4><PORT 2><1 Tag_set>)count
-	OP_FOUNDSOURCES_OBFU = 0x44    // <HASH 16><count 1>(<ID 4><PORT 2><obf settings 1>(UserHash16 if obf&0x08))count
+enum OP_ClientToServerTCP
+{
+	OP_LOGINREQUEST = 0x01,    // <HASH 16><ID 4><PORT 2><1 Tag_set>
+	OP_REJECT = 0x05,          // (null)
+	OP_GETSERVERLIST = 0x14,   // (null)client->server
+	OP_OFFERFILES = 0x15,      // <count 4>(<HASH 16><ID 4><PORT 2><1 Tag_set>)count
+	OP_SEARCHREQUEST = 0x16,   // <Query_Tree>
+	OP_DISCONNECT = 0x18,      // (not verified)
+	OP_GETSOURCES = 0x19,      // <HASH 16>
+				   // v2 <HASH 16><SIZE_4> (17.3) (mandatory on 17.8)
+				   // v2large <HASH 16><FILESIZE 4(0)><FILESIZE 8> (17.9) (large files only)
+	OP_SEARCH_USER = 0x1A,     // <Query_Tree>
+	OP_CALLBACKREQUEST = 0x1C, // <ID 4>
+	// Deprecated, no longer supported by any server: OP_QUERY_CHATS = 0x1D,
+	// OP_CHAT_MESSAGE = 0x1E, OP_JOIN_ROOM = 0x1F.
+	OP_QUERY_MORE_RESULT = 0x21, // (null)
+	OP_GETSOURCES_OBFU = 0x23,
+	OP_SERVERLIST = 0x32,        // <count 1>(<IP 4><PORT 2>)count server->client
+	OP_SEARCHRESULT = 0x33,      // <count 4>(<HASH 16><ID 4><PORT 2><1 Tag_set>)count
+	OP_SERVERSTATUS = 0x34,      // <USER 4><FILES 4>
+	OP_CALLBACKREQUESTED = 0x35, // <IP 4><PORT 2>
+	OP_CALLBACK_FAIL = 0x36,     // (null notverified)
+	OP_SERVERMESSAGE = 0x38,     // <len 2><Message len>
+	// Deprecated, no longer supported by any server: OP_CHAT_ROOM_REQUEST = 0x39,
+	// OP_CHAT_BROADCAST = 0x3A, OP_CHAT_USER_JOIN = 0x3B, OP_CHAT_USER_LEAVE = 0x3C,
+	// OP_CHAT_USER = 0x3D.
+	OP_IDCHANGE = 0x40,     // <NEW_ID 4>
+	OP_SERVERIDENT = 0x41,  // <HASH 16><IP 4><PORT 2>{1 TAG_SET}
+	OP_FOUNDSOURCES = 0x42, // <HASH 16><count 1>(<ID 4><PORT 2>)count
+	OP_USERS_LIST = 0x43,   // <count 4>(<HASH 16><ID 4><PORT 2><1 Tag_set>)count
+	OP_FOUNDSOURCES_OBFU =
+		0x44 // <HASH 16><count 1>(<ID 4><PORT 2><obf settings 1>(UserHash16 if obf&0x08))count
 };
 
 // Server TCP flags
-#define SRV_TCPFLG_COMPRESSION          0x00000001
-#define SRV_TCPFLG_NEWTAGS                      0x00000008
-#define SRV_TCPFLG_UNICODE                      0x00000010
-#define SRV_TCPFLG_RELATEDSEARCH        0x00000040
-#define SRV_TCPFLG_TYPETAGINTEGER       0x00000080
-#define SRV_TCPFLG_LARGEFILES           0x00000100
-#define SRV_TCPFLG_TCPOBFUSCATION	0x00000400
+#define SRV_TCPFLG_COMPRESSION 0x00000001
+#define SRV_TCPFLG_NEWTAGS 0x00000008
+#define SRV_TCPFLG_UNICODE 0x00000010
+#define SRV_TCPFLG_RELATEDSEARCH 0x00000040
+#define SRV_TCPFLG_TYPETAGINTEGER 0x00000080
+#define SRV_TCPFLG_LARGEFILES 0x00000100
+#define SRV_TCPFLG_TCPOBFUSCATION 0x00000400
 
 #endif // ED2KC2STCP_H

amule-3.0.1.tar.gz/src/include/protocol/ed2k/Client2Server/UDP.h -> amule-3.1.0.tar.gz/src/include/protocol/ed2k/Client2Server/UDP.h Changed

@@ -26,34 +26,35 @@
 #ifndef ED2KC2SUDP_H
 #define ED2KC2SUDP_H
 
-enum OP_ClientToServerUDP {
-	OP_GLOBSEARCHREQ3			= 0x90, // <1 tag set><search_tree>
-	OP_GLOBSEARCHREQ2			= 0x92, // <search_tree>
-	OP_GLOBGETSOURCES2			= 0x94,	// <HASH 16><FILESIZE 4>
-										// largefiles only: <HASH 16><FILESIZE 4(0)><FILESIZE 8> (17.8)
-	OP_GLOBSERVSTATREQ			= 0x96,	// (null)
-	OP_GLOBSERVSTATRES			= 0x97,	// <USER 4><FILES 4>
-	OP_GLOBSEARCHREQ			= 0x98,	// <search_tree>
-	OP_GLOBSEARCHRES			= 0x99,	//
-	OP_GLOBGETSOURCES			= 0x9A,	// <HASH 16>
-	OP_GLOBFOUNDSOURCES			= 0x9B,	//
-	OP_GLOBCALLBACKREQ			= 0x9C,	// <IP 4><PORT 2><client_ID 4>
-	OP_INVALID_LOWID			= 0x9E,	// <ID 4>
-	OP_SERVER_LIST_REQ			= 0xA0,	// <IP 4><PORT 2>
-	OP_SERVER_LIST_RES			= 0xA1,	// <count 1> (<ip 4><port 2>)count
-	OP_SERVER_DESC_REQ			= 0xA2,	// (null)
-	OP_SERVER_DESC_RES			= 0xA3,	// <name_len 2><name name_len><desc_len 2 desc_en>
-	OP_SERVER_LIST_REQ2			= 0xA4	// (null)
+enum OP_ClientToServerUDP
+{
+	OP_GLOBSEARCHREQ3 = 0x90,   // <1 tag set><search_tree>
+	OP_GLOBSEARCHREQ2 = 0x92,   // <search_tree>
+	OP_GLOBGETSOURCES2 = 0x94,  // <HASH 16><FILESIZE 4>
+				    // largefiles only: <HASH 16><FILESIZE 4(0)><FILESIZE 8> (17.8)
+	OP_GLOBSERVSTATREQ = 0x96,  // (null)
+	OP_GLOBSERVSTATRES = 0x97,  // <USER 4><FILES 4>
+	OP_GLOBSEARCHREQ = 0x98,    // <search_tree>
+	OP_GLOBSEARCHRES = 0x99,    //
+	OP_GLOBGETSOURCES = 0x9A,   // <HASH 16>
+	OP_GLOBFOUNDSOURCES = 0x9B, //
+	OP_GLOBCALLBACKREQ = 0x9C,  // <IP 4><PORT 2><client_ID 4>
+	OP_INVALID_LOWID = 0x9E,    // <ID 4>
+	OP_SERVER_LIST_REQ = 0xA0,  // <IP 4><PORT 2>
+	OP_SERVER_LIST_RES = 0xA1,  // <count 1> (<ip 4><port 2>)count
+	OP_SERVER_DESC_REQ = 0xA2,  // (null)
+	OP_SERVER_DESC_RES = 0xA3,  // <name_len 2><name name_len><desc_len 2 desc_en>
+	OP_SERVER_LIST_REQ2 = 0xA4  // (null)
 };
 
 // Server UDP flags
-#define SRV_UDPFLG_EXT_GETSOURCES	0x00000001
-#define SRV_UDPFLG_EXT_GETFILES		0x00000002
-#define SRV_UDPFLG_NEWTAGS		0x00000008
-#define SRV_UDPFLG_UNICODE		0x00000010
-#define SRV_UDPFLG_EXT_GETSOURCES2	0x00000020
-#define SRV_UDPFLG_LARGEFILES		0x00000100
-#define SRV_UDPFLG_UDPOBFUSCATION	0x00000200
-#define SRV_UDPFLG_TCPOBFUSCATION	0x00000400
+#define SRV_UDPFLG_EXT_GETSOURCES 0x00000001
+#define SRV_UDPFLG_EXT_GETFILES 0x00000002
+#define SRV_UDPFLG_NEWTAGS 0x00000008
+#define SRV_UDPFLG_UNICODE 0x00000010
+#define SRV_UDPFLG_EXT_GETSOURCES2 0x00000020
+#define SRV_UDPFLG_LARGEFILES 0x00000100
+#define SRV_UDPFLG_UDPOBFUSCATION 0x00000200
+#define SRV_UDPFLG_TCPOBFUSCATION 0x00000400
 
 #endif // ED2KC2SUDP_H

amule-3.0.1.tar.gz/src/include/protocol/ed2k/ClientSoftware.h -> amule-3.1.0.tar.gz/src/include/protocol/ed2k/ClientSoftware.h Changed

amule-3.0.1.tar.gz/src/include/protocol/ed2k/Constants.h -> amule-3.1.0.tar.gz/src/include/protocol/ed2k/Constants.h Changed

@@ -31,47 +31,59 @@
 // MOD Note: Do not change this part - Merkur
 
 // Timeouts & Reask times
-#define	CONNECTION_TIMEOUT			40000	// set this lower if you want less connections at once, set  it higher if you have enough sockets (edonkey has its own timeout too, so a very high value won't effect this)
-#define	FILEREASKTIME				1300000	// 1300000 <- original value ***
-#define	SERVERREASKTIME				800000  // don't set this too low, it wont speed up anything, but it could kill amule or your internetconnection
-#define	UDPSERVERREASKTIME			1300000	// 1300000 <- original value ***
-#define	SOURCECLIENTREASKS			MIN2MS(40)	//40 mins
-#define	SOURCECLIENTREASKF			MIN2MS(5)	//5 mins
-#define	UDPSERVERSTATTIME		SEC2MS(5)	//5 secs
-#define	UDPSERVSTATREASKTIME	HR2S(4.5)	//4.5 hours - server last ping timestamp. Stored on server.met, which follows the eMule format (seconds from epoch)
-#define	UDPSERVSTATMINREASKTIME	MIN2S(20)	//in seconds, same logic as UDPSERVSTATREASKTIME
-#define	MINCOMMONPENALTY		4 // For file sources reask
-
-#define	ED2KREPUBLISHTIME		MIN2MS(1)	//1 min
-
-#define	UDPMAXQUEUETIME			SEC2MS(30)	//30 Seconds
-
-#define	RSAKEYSIZE				384			//384 bits
-
-#define	MAX_SOURCES_FILE_SOFT	500
-#define	MAX_SOURCES_FILE_UDP	50
-
-#define	MAXFILECOMMENTLEN		50
-
-#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 from SX1
+#define CONNECTION_TIMEOUT \
+	40000 // set this lower if you want less connections at once, set  it higher if you have enough
+	      // sockets (edonkey has its own timeout too, so a very high value won't effect this)
+// The source re-ask interval (formerly FILEREASKTIME) is now a user preference:
+// thePrefs::GetSourceReaskTime(). Its lower bound is clamped above the ~10 min
+// reask-ban floor.
+#define SERVERREASKTIME \
+	800000 // don't set this too low, it wont speed up anything, but it could kill amule or your
+	       // internetconnection
+#define UDPSERVERREASKTIME 1300000    // 1300000 <- original value ***
+#define SOURCECLIENTREASKS MIN2MS(40) // 40 mins
+#define SOURCECLIENTREASKF MIN2MS(5)  // 5 mins
+#define UDPSERVERSTATTIME SEC2MS(5)   // 5 secs
+#define UDPSERVSTATREASKTIME \
+	HR2S(4.5) // 4.5 hours - server last ping timestamp. Stored on server.met, which follows the eMule
+		  // format (seconds from epoch)
+#define UDPSERVSTATMINREASKTIME MIN2S(20) // in seconds, same logic as UDPSERVSTATREASKTIME
+#define MINCOMMONPENALTY 4                // For file sources reask
+
+#define ED2KREPUBLISHTIME MIN2MS(1) // 1 min
+
+#define UDPMAXQUEUETIME SEC2MS(30) // 30 Seconds
+
+#define RSAKEYSIZE 384 // 384 bits
+
+#define MAX_SOURCES_FILE_SOFT 500
+#define MAX_SOURCES_FILE_UDP 50
+
+#define MAXFILECOMMENTLEN 50
+
+#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 from SX1
 
 // MOD Note: end
 
-#define	MAXCONPER5SEC				20
-#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
-#define	RARE_FILE				50
-#define	MIN_REQUESTTIME				590000
-#define	MAX_PURGEQUEUETIME			HR2MS(1)
-#define	PURGESOURCESWAPSTOP			MIN2MS(15)	// How long forbid swapping a source to a certain file (NNP,...)
-#define	CONNECTION_LATENCY			22050	// latency for responses
-#define	CLIENTBANTIME				HR2MS(2) // 2h
-#define	TRACKED_CLEANUP_TIME			HR2MS(1)
-#define	KEEPTRACK_TIME				HR2MS(2) // how long to keep track of clients which were once in the uploadqueue
-#define	CLIENTLIST_CLEANUP_TIME	MIN2MS(34)	// 34 min
+#define MAXCONPER5SEC 50
+#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
+#define RARE_FILE 50
+#define MIN_REQUESTTIME 590000
+#define MAX_PURGEQUEUETIME HR2MS(1)
+#define PURGESOURCESWAPSTOP MIN2MS(15) // How long forbid swapping a source to a certain file (NNP,...)
+#define CONNECTION_LATENCY 22050       // latency for responses
+#define CLIENTBANTIME HR2MS(2)         // 2h
+#define TRACKED_CLEANUP_TIME HR2MS(1)
+#define KEEPTRACK_TIME HR2MS(2) // how long to keep track of clients which were once in the uploadqueue
+#define CLIENTLIST_CLEANUP_TIME MIN2MS(34) // 34 min
 
 // (4294967295/PARTSIZE)*PARTSIZE = ~4GB
 #define OLD_MAX_FILE_SIZE 4290048000ull
@@ -79,24 +91,25 @@
 // = 2^38 = 256GB
 #define MAX_FILE_SIZE 0x4000000000ull
 
-const uint64 PARTSIZE		= 9728000ull;
-const uint32 BLOCKSIZE		= 184320u;
-const uint32 EMBLOCKSIZE	= 184320u;
+const uint64 PARTSIZE = 9728000ull;
+const uint32 BLOCKSIZE = 184320u;
+const uint32 EMBLOCKSIZE = 184320u;
 
-#define INV_SERV_DESC_LEN			0xF0FF	// Used as an 'invalid' string len for OP_SERVER_DESC_REQ/RES
+#define INV_SERV_DESC_LEN 0xF0FF // Used as an 'invalid' string len for OP_SERVER_DESC_REQ/RES
 
-// This 'identifier' is used for referencing shared part (incomplete) files with the OP_ASKSHAREDDIRS and related opcodes
-// it was introduced with eDonkeyHybrid and is considered as part of the protocol.
+// This 'identifier' is used for referencing shared part (incomplete) files with the OP_ASKSHAREDDIRS and
+// related opcodes it was introduced with eDonkeyHybrid and is considered as part of the protocol.
 #define OP_INCOMPLETE_SHARED_FILES "!Incomplete Files"
 
 // ed2k search expression comparison operators
 // kad operators used to be different, but are the same since eMule 0.47a
-enum ed2k_search_compare {
-	ED2K_SEARCH_OP_EQUAL		=	0, // eserver 16.45+
-	ED2K_SEARCH_OP_GREATER,		// dserver
-	ED2K_SEARCH_OP_LESS,		// dserver
-	ED2K_SEARCH_OP_GREATER_EQUAL,	// eserver 16.45+
-	ED2K_SEARCH_OP_LESS_EQUAL,	// eserver 16.45+
+enum ed2k_search_compare
+{
+	ED2K_SEARCH_OP_EQUAL = 0,     // eserver 16.45+
+	ED2K_SEARCH_OP_GREATER,       // dserver
+	ED2K_SEARCH_OP_LESS,          // dserver
+	ED2K_SEARCH_OP_GREATER_EQUAL, // eserver 16.45+
+	ED2K_SEARCH_OP_LESS_EQUAL,    // eserver 16.45+
 	ED2K_SEARCH_OP_NOTEQUAL
 };

amule-3.0.1.tar.gz/src/include/protocol/kad/Client2Client/UDP.h -> amule-3.1.0.tar.gz/src/include/protocol/kad/Client2Client/UDP.h Changed

@@ -26,36 +26,41 @@
 #ifndef KADC2CUDP_H
 #define KADC2CUDP_H
 
-enum KademliaV1OPcodes {
-	KADEMLIA_BOOTSTRAP_REQ_DEPRECATED	= 0x00,	// <PEER (sender) 25>
-	KADEMLIA_BOOTSTRAP_RES_DEPRECATED	= 0x08,	// <CNT 2> <PEER 25>*(CNT)
+enum KademliaV1OPcodes
+{
+	KADEMLIA_BOOTSTRAP_REQ_DEPRECATED = 0x00, // <PEER (sender) 25>
+	KADEMLIA_BOOTSTRAP_RES_DEPRECATED = 0x08, // <CNT 2> <PEER 25>*(CNT)
 
-	KADEMLIA_HELLO_REQ_DEPRECATED		= 0x10,	// <PEER (sender) 25>
-	KADEMLIA_HELLO_RES_DEPRECATED		= 0x18,	// <PEER (receiver) 25>
+	KADEMLIA_HELLO_REQ_DEPRECATED = 0x10, // <PEER (sender) 25>
+	KADEMLIA_HELLO_RES_DEPRECATED = 0x18, // <PEER (receiver) 25>
 
-	KADEMLIA_REQ_DEPRECATED			= 0x20,	// <TYPE 1> <HASH (target) 16> <HASH (receiver) 16>
-	KADEMLIA_RES_DEPRECATED			= 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_DEPRECATED	= 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_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>
+	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-3.0.1.tar.gz/src/include/protocol/kad/Constants.h -> amule-3.1.0.tar.gz/src/include/protocol/kad/Constants.h Changed

@@ -30,28 +30,29 @@
 
 // MOD Note: Do not change this part - Merkur
 
-#define	KADEMLIAASKTIME			SEC2MS(1)	//1 second
-#define	KADEMLIATOTALFILE		5		//Total files to search sources for.
-#define	KADEMLIAREASKTIME		HR2MS(1)	//1 hour
-#define	KADEMLIAPUBLISHTIME		SEC(2)		//2 second
-#define	KADEMLIATOTALSTORENOTES		1		//Total hashes to store.
-#define	KADEMLIATOTALSTORESRC		3		//Total hashes to store.
-#define	KADEMLIATOTALSTOREKEY		2		//Total hashes to store.
-#define	KADEMLIAREPUBLISHTIMES		HR2S(5)		//5 hours
-#define	KADEMLIAREPUBLISHTIMEN		HR2S(24)	//24 hours
-#define	KADEMLIAREPUBLISHTIMEK		HR2S(24)	//24 hours
-#define	KADEMLIADISCONNECTDELAY		MIN2S(20)	//20 mins
-#define	KADEMLIAMAXINDEX		50000		//Total keyword indexes.
-#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 KADEMLIAASKTIME SEC2MS(1) // 1 second
+// The concurrent-file cap (formerly KADEMLIATOTALFILE) and per-file re-search interval (formerly
+// KADEMLIAREASKTIME) are now preferences: thePrefs::GetKadMaxSourceSearches() and
+// GetKadSourceReaskTime().
+#define KADEMLIAPUBLISHTIME SEC(2)        // 2 second
+#define KADEMLIATOTALSTORENOTES 1         // Total hashes to store.
+#define KADEMLIATOTALSTORESRC 3           // Total hashes to store.
+#define KADEMLIATOTALSTOREKEY 2           // Total hashes to store.
+#define KADEMLIAREPUBLISHTIMES HR2S(5)    // 5 hours
+#define KADEMLIAREPUBLISHTIMEN HR2S(24)   // 24 hours
+#define KADEMLIAREPUBLISHTIMEK HR2S(24)   // 24 hours
+#define KADEMLIADISCONNECTDELAY MIN2S(20) // 20 mins
+#define KADEMLIAMAXINDEX 50000            // Total keyword indexes.
+#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
 // 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
+#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-3.0.1.tar.gz/src/include/protocol/kad2/Client2Client/TCP.h -> amule-3.1.0.tar.gz/src/include/protocol/kad2/Client2Client/TCP.h Changed

amule-3.0.1.tar.gz/src/include/protocol/kad2/Client2Client/UDP.h -> amule-3.1.0.tar.gz/src/include/protocol/kad2/Client2Client/UDP.h Changed

@@ -26,31 +26,33 @@
 #ifndef KAD2C2CUDP_H
 #define KAD2C2CUDP_H
 
-enum Ed2kUDPOpcodesForKademliaV2 {
-	OP_DIRECTCALLBACKREQ		= 0x95	// <TCPPort 2><Userhash 16><ConnectionOptions 1>
+enum Ed2kUDPOpcodesForKademliaV2
+{
+	OP_DIRECTCALLBACKREQ = 0x95 // <TCPPort 2><Userhash 16><ConnectionOptions 1>
 };
 
-enum Kademlia2Opcodes {
-	KADEMLIA2_BOOTSTRAP_REQ		= 0x01,
-	KADEMLIA2_BOOTSTRAP_RES		= 0x09,
-	KADEMLIA2_HELLO_REQ		= 0x11,
-	KADEMLIA2_HELLO_RES		= 0x19,
-	KADEMLIA2_REQ			= 0x21,
-	KADEMLIA2_HELLO_RES_ACK		= 0x22,	// <NodeID><uint8 tags>
-	KADEMLIA2_RES			= 0x29,
-	KADEMLIA2_SEARCH_KEY_REQ	= 0x33,
-	KADEMLIA2_SEARCH_SOURCE_REQ	= 0x34,
-	KADEMLIA2_SEARCH_NOTES_REQ	= 0x35,
-	KADEMLIA2_SEARCH_RES		= 0x3B,
-	KADEMLIA2_PUBLISH_KEY_REQ	= 0x43,
-	KADEMLIA2_PUBLISH_SOURCE_REQ	= 0x44,
-	KADEMLIA2_PUBLISH_NOTES_REQ	= 0x45,
-	KADEMLIA2_PUBLISH_RES		= 0x4B,
-	KADEMLIA2_PUBLISH_RES_ACK	= 0x4C,	// (null)
-	KADEMLIA_FIREWALLED2_REQ	= 0x53,	// <TCPPORT (sender) 2><userhash><connectoptions 1>
-	KADEMLIA2_PING			= 0x60,	// (null)
-	KADEMLIA2_PONG			= 0x61,	// (null)
-	KADEMLIA2_FIREWALLUDP		= 0x62	// <errorcode 1><UDPPort_Used 2>
+enum Kademlia2Opcodes
+{
+	KADEMLIA2_BOOTSTRAP_REQ = 0x01,
+	KADEMLIA2_BOOTSTRAP_RES = 0x09,
+	KADEMLIA2_HELLO_REQ = 0x11,
+	KADEMLIA2_HELLO_RES = 0x19,
+	KADEMLIA2_REQ = 0x21,
+	KADEMLIA2_HELLO_RES_ACK = 0x22, // <NodeID><uint8 tags>
+	KADEMLIA2_RES = 0x29,
+	KADEMLIA2_SEARCH_KEY_REQ = 0x33,
+	KADEMLIA2_SEARCH_SOURCE_REQ = 0x34,
+	KADEMLIA2_SEARCH_NOTES_REQ = 0x35,
+	KADEMLIA2_SEARCH_RES = 0x3B,
+	KADEMLIA2_PUBLISH_KEY_REQ = 0x43,
+	KADEMLIA2_PUBLISH_SOURCE_REQ = 0x44,
+	KADEMLIA2_PUBLISH_NOTES_REQ = 0x45,
+	KADEMLIA2_PUBLISH_RES = 0x4B,
+	KADEMLIA2_PUBLISH_RES_ACK = 0x4C, // (null)
+	KADEMLIA_FIREWALLED2_REQ = 0x53,  // <TCPPORT (sender) 2><userhash><connectoptions 1>
+	KADEMLIA2_PING = 0x60,            // (null)
+	KADEMLIA2_PONG = 0x61,            // (null)
+	KADEMLIA2_FIREWALLUDP = 0x62      // <errorcode 1><UDPPort_Used 2>
 };
 
 #endif // KAD2C2CUDP_H

amule-3.0.1.tar.gz/src/include/protocol/kad2/Constants.h -> amule-3.1.0.tar.gz/src/include/protocol/kad2/Constants.h Changed

@@ -26,6 +26,34 @@
 #ifndef KAD2CONSTANTS_H
 #define KAD2CONSTANTS_H
 
-#define KADEMLIA_VERSION	0x08	/* 0.49b */
+// Kad protocol versions, as advertised in the version byte of every Kad2 contact record and
+// compared against CContact::GetVersion(). The named constants exist so version gates read as
+// protocol requirements rather than magic numbers: a peer at 0x08 must not be sent 0x09 features.
+#define KADEMLIA_VERSION1_46c 0x01 /* 45b - 46c */
+#define KADEMLIA_VERSION2_47a 0x02 /* 47a */
+#define KADEMLIA_VERSION3_47b 0x03 /* 47b */
+#define KADEMLIA_VERSION4_47c 0x04 /* 47c */
+#define KADEMLIA_VERSION5_48a 0x05 /* -0.48a */
+#define KADEMLIA_VERSION6_49aBETA \
+	0x06                       /* -0.49aBETA1: OP_FWCHECKUDPREQ, obfuscation, direct callbacks, \
+				      source type 6, UDP firewall check */
+#define KADEMLIA_VERSION7_49a 0x07 /* -0.49a: OP_KAD_FWTCPCHECK_ACK, KADEMLIA_FIREWALLED2_REQ */
+#define KADEMLIA_VERSION8_49b 0x08 /* TAG_KADMISCOPTIONS, KADEMLIA2_HELLO_RES_ACK */
+#define KADEMLIA_VERSION9_50a 0x09 /* AICH hashes on keyword storage */
+
+// Our own advertised version. 0x0a alongside the AICH keyword-storage support 0x09 introduced; 0x0a
+// adds no further wire element of its own and is the level eMule/eMuleAI advertise.
+//
+// Gated on ENABLE_KAD_PROTOCOL_10 (configure-time, OFF by default) because this byte goes out in
+// every Kad2 hello: without the switch we keep advertising 0x08, which is what a build without the
+// 0x09 features can honestly claim.
+//
+// Note for a future bump: CT_EMULE_MISCOPTIONS2 has to change once the Kad version reaches 0x0F,
+// the eD2k capability field reserving only four bits for it.
+#ifdef ENABLE_KAD_PROTOCOL_10
+#define KADEMLIA_VERSION 0x0a
+#else
+#define KADEMLIA_VERSION 0x08 /* 0.49b */
+#endif
 
 #endif // KAD2CONSTANTS_H

amule-3.0.1.tar.gz/src/include/tags/ClientTags.h -> amule-3.1.0.tar.gz/src/include/tags/ClientTags.h Changed

@@ -26,70 +26,97 @@
 #ifndef CLIENTTAGS_H
 #define CLIENTTAGS_H
 
-enum client_tags {
-	CT_NAME				= 0x01,
-	CT_SERVER_UDPSEARCH_FLAGS	= 0x0E,
-	CT_PORT				= 0x0F,
-	CT_VERSION			= 0x11,
-	CT_SERVER_FLAGS			= 0x20,	// currently only used to inform a server about supported features
-	CT_EMULECOMPAT_OPTIONS		= 0xEF,
-	CT_EMULE_RESERVED1		= 0xF0,
-	CT_EMULE_RESERVED2		= 0xF1,
-	CT_EMULE_RESERVED3		= 0xF2,
-	CT_EMULE_RESERVED4		= 0xF3,
-	CT_EMULE_RESERVED5		= 0xF4,
-	CT_EMULE_RESERVED6		= 0xF5,
-	CT_EMULE_RESERVED7		= 0xF6,
-	CT_EMULE_RESERVED8		= 0xF7,
-	CT_EMULE_RESERVED9		= 0xF8,
-	CT_EMULE_UDPPORTS		= 0xF9,
-	CT_EMULE_MISCOPTIONS1		= 0xFA,
-	CT_EMULE_VERSION		= 0xFB,
-	CT_EMULE_BUDDYIP		= 0xFC,
-	CT_EMULE_BUDDYUDP		= 0xFD,
-	CT_EMULE_MISCOPTIONS2		= 0xFE,
-	CT_EMULE_RESERVED13		= 0xFF
+enum client_tags
+{
+	CT_NAME = 0x01,
+	CT_SERVER_UDPSEARCH_FLAGS = 0x0E,
+	CT_PORT = 0x0F,
+	CT_VERSION = 0x11,
+	CT_SERVER_FLAGS = 0x20, // currently only used to inform a server about supported features
+
+	// eMuleAI vendor tags. The 0xA? range is unclaimed by the major mods, which is why the
+	// reference implementation took it. Bit meanings for CT_MOD_MISCOPTIONS live in
+	// src/PeerCapabilities.h -- they are wire format, and a wrong bit position has no runtime
+	// signal.
+	//
+	// <hash> the peer's serving buddy's IPv6 address, 16 bytes. The v6 counterpart of
+	// CT_EMULE_BUDDYIP (0xFC) below, and the hello-side counterpart of the "bi6" Kad tag.
+	CT_EMULE_SERVINGBUDDYIPV6 = 0xA0,
+	CT_MOD_MISCOPTIONS = 0xAA, // <uint32> capability bitfield
+	// <hash> the address the peer observed this client arriving from, 16 bytes. Only the hash
+	// form is read; see src/PublicIPv6Corroboration.h for why, and for why one peer saying it
+	// is not enough.
+	CT_MOD_YOUR_IP = 0xAD,
+	CT_MOD_IP_V6 = 0xAE, // <hash> client IPv6 address, 16 bytes
+	// 0xAF is deliberately not named here. eMuleAI defines it, but nothing in its tree writes
+	// it and its hello path never reads it as an address: the one case that mentions it sits in
+	// the reserved-for-future-releases block and only flags the sender as running an unofficial
+	// build. emule-qt gives the same id a server->client meaning (the server's own public
+	// IPv6), which aMule would be recording from a peer. Reading it as either would state
+	// something the wire does not say, so it falls through to the unknown-vendor-tag log in
+	// BaseClient.cpp like any other unhandled 0xA? id.
+
+	CT_EMULECOMPAT_OPTIONS = 0xEF,
+	CT_EMULE_RESERVED1 = 0xF0,
+	CT_EMULE_RESERVED2 = 0xF1,
+	CT_EMULE_RESERVED3 = 0xF2,
+	CT_EMULE_RESERVED4 = 0xF3,
+	CT_EMULE_RESERVED5 = 0xF4,
+	CT_EMULE_RESERVED6 = 0xF5,
+	CT_EMULE_RESERVED7 = 0xF6,
+	CT_EMULE_RESERVED8 = 0xF7,
+	CT_EMULE_RESERVED9 = 0xF8,
+	CT_EMULE_UDPPORTS = 0xF9,
+	CT_EMULE_MISCOPTIONS1 = 0xFA,
+	CT_EMULE_VERSION = 0xFB,
+	CT_EMULE_BUDDYIP = 0xFC,
+	CT_EMULE_BUDDYUDP = 0xFD,
+	CT_EMULE_MISCOPTIONS2 = 0xFE,
+	CT_EMULE_RESERVED13 = 0xFF
 };
 
 // Old MuleInfo tags
-enum MuleInfo_tags {
-	ET_COMPRESSION		= 0x20u,
-	ET_UDPPORT		= 0x21u,
-	ET_UDPVER		= 0x22u,
-	ET_SOURCEEXCHANGE	= 0x23u,
-	ET_COMMENTS		= 0x24u,
-	ET_EXTENDEDREQUEST	= 0x25u,
-	ET_COMPATIBLECLIENT	= 0x26u,
-	ET_FEATURES		= 0x27u,	//! bit 0: SecIdent v1 - bit 1: SecIdent v2
-	ET_MOD_VERSION		= 0x55u,
+enum MuleInfo_tags
+{
+	ET_COMPRESSION = 0x20u,
+	ET_UDPPORT = 0x21u,
+	ET_UDPVER = 0x22u,
+	ET_SOURCEEXCHANGE = 0x23u,
+	ET_COMMENTS = 0x24u,
+	ET_EXTENDEDREQUEST = 0x25u,
+	ET_COMPATIBLECLIENT = 0x26u,
+	ET_FEATURES = 0x27u, //! bit 0: SecIdent v1 - bit 1: SecIdent v2
+	ET_MOD_VERSION = 0x55u,
 	// ET_FEATURESET	= 0x54u,	// int - Bloodymad Featureset // UNUSED
-	ET_OS_INFO		= 0x94u		// Reused rand tag (MOD_OXY), because the type is unknown
+	ET_OS_INFO = 0x94u // Reused rand tag (MOD_OXY), because the type is unknown
 };
 
 // Server capabilities, values for CT_SERVER_FLAGS
-enum ServerCapabilites {
-	SRVCAP_ZLIB		= 0x0001,
-	SRVCAP_IP_IN_LOGIN	= 0x0002,
-	SRVCAP_AUXPORT		= 0x0004,
-	SRVCAP_NEWTAGS		= 0x0008,
-	SRVCAP_UNICODE		= 0x0010,
-	SRVCAP_LARGEFILES	= 0x0100,
-	SRVCAP_SUPPORTCRYPT	= 0x0200,
-	SRVCAP_REQUESTCRYPT	= 0x0400,
-	SRVCAP_REQUIRECRYPT	= 0x0800
+enum ServerCapabilites
+{
+	SRVCAP_ZLIB = 0x0001,
+	SRVCAP_IP_IN_LOGIN = 0x0002,
+	SRVCAP_AUXPORT = 0x0004,
+	SRVCAP_NEWTAGS = 0x0008,
+	SRVCAP_UNICODE = 0x0010,
+	SRVCAP_LARGEFILES = 0x0100,
+	SRVCAP_SUPPORTCRYPT = 0x0200,
+	SRVCAP_REQUESTCRYPT = 0x0400,
+	SRVCAP_REQUIRECRYPT = 0x0800
 };
 
 // aMule used to use these names
-#define CAPABLE_ZLIB			SRVCAP_ZLIB
-#define CAPABLE_IP_IN_LOGIN_FRAME	SRVCAP_IP_IN_LOGIN
-#define CAPABLE_AUXPORT			SRVCAP_AUXPORT
-#define CAPABLE_NEWTAGS			SRVCAP_NEWTAGS
-#define CAPABLE_UNICODE			SRVCAP_UNICODE
-#define CAPABLE_LARGEFILES		SRVCAP_LARGEFILES
+#define CAPABLE_ZLIB SRVCAP_ZLIB
+#define CAPABLE_IP_IN_LOGIN_FRAME SRVCAP_IP_IN_LOGIN
+#define CAPABLE_AUXPORT SRVCAP_AUXPORT
+#define CAPABLE_NEWTAGS SRVCAP_NEWTAGS
+#define CAPABLE_UNICODE SRVCAP_UNICODE
+#define CAPABLE_LARGEFILES SRVCAP_LARGEFILES
 
 // Server capabilities, values for CT_SERVER_UDPSEARCH_FLAGS
-enum ServerUDPCapabilities {
-	SRVCAP_UDP_NEWTAGS_LARGEFILES	= 0x01
+enum ServerUDPCapabilities
+{
+	SRVCAP_UDP_NEWTAGS_LARGEFILES = 0x01
 };
 
 #endif // CLIENTTAGS_H

amule-3.0.1.tar.gz/src/include/tags/FileTags.h -> amule-3.1.0.tar.gz/src/include/tags/FileTags.h Changed

@@ -27,117 +27,148 @@
 #define FILETAGS_H
 
 // ED2K search + known.met + .part.met
-#define	FT_FILENAME			0x01	// <string>
-#define	FT_FILESIZE			0x02	// <uint32>
-#define	FT_FILESIZE_HI			0x3A	// <uint32>
-#define	FT_FILETYPE			0x03	// <string> or <uint32>
-#define	FT_FILEFORMAT			0x04	// <string>
-#define	FT_LASTSEENCOMPLETE		0x05	// <uint32>
-#define	FT_TRANSFERRED			0x08	// <uint32>
-#define	FT_GAPSTART			0x09	// <uint32>
-#define	FT_GAPEND			0x0A	// <uint32>
-#define	FT_PARTFILENAME			0x12	// <string>
-#define	FT_OLDDLPRIORITY		0x13	// Not used anymore
-#define	FT_STATUS			0x14	// <uint32>
-#define	FT_SOURCES			0x15	// <uint32>
-#define	FT_PERMISSIONS			0x16	// <uint32>
-#define	FT_OLDULPRIORITY		0x17	// Not used anymore
-#define	FT_DLPRIORITY			0x18	// Was 13
-#define	FT_ULPRIORITY			0x19	// Was 17
-#define	FT_KADLASTPUBLISHKEY		0x20	// <uint32>
-#define	FT_KADLASTPUBLISHSRC		0x21	// <uint32>
-#define	FT_FLAGS			0x22	// <uint32>
-#define	FT_DL_ACTIVE_TIME		0x23	// <uint32>
-#define	FT_CORRUPTEDPARTS		0x24	// <string>
-#define	FT_DL_PREVIEW			0x25
-#define	FT_KADLASTPUBLISHNOTES		0x26	// <uint32>
-#define	FT_AICH_HASH			0x27
-// Per-record "last seen alive" timestamp written by aMule's KnownFileList
-// so the dedup-list cap/TTL can drop entries whose file hasn't existed
-// for the user-configured window. aMule-internal; eMule and older
-// aMule binaries ignore unknown tags on load.
-#define	FT_LASTSEEN			0x28	// <uint32>
-#define	FT_COMPLETE_SOURCES		0x30	// nr. of sources which share a
-						// complete version of the
-						// associated file (supported
-						// by eserver 16.46+) statistic
-
-#define	FT_PUBLISHINFO			0x33	// <uint32>
-#define	FT_ATTRANSFERRED		0x50	// <uint32>
-#define	FT_ATREQUESTED			0x51	// <uint32>
-#define	FT_ATACCEPTED			0x52	// <uint32>
-#define	FT_CATEGORY			0x53	// <uint32>
-#define	FT_ATTRANSFERREDHI		0x54	// <uint32>
-#define	FT_MEDIA_ARTIST			0xD0	// <string>
-#define	FT_MEDIA_ALBUM			0xD1	// <string>
-#define	FT_MEDIA_TITLE			0xD2	// <string>
-#define	FT_MEDIA_LENGTH			0xD3	// <uint32> !!!
-#define	FT_MEDIA_BITRATE		0xD4	// <uint32>
-#define	FT_MEDIA_CODEC			0xD5	// <string>
-#define	FT_FILERATING			0xF7	// <uint8>
+#define FT_FILENAME 0x01          // <string>
+#define FT_FILESIZE 0x02          // <uint32>
+#define FT_FILESIZE_HI 0x3A       // <uint32>
+#define FT_FILETYPE 0x03          // <string> or <uint32>
+#define FT_FILEFORMAT 0x04        // <string>
+#define FT_LASTSEENCOMPLETE 0x05  // <uint32>
+#define FT_TRANSFERRED 0x08       // <uint32>
+#define FT_GAPSTART 0x09          // <uint32>
+#define FT_GAPEND 0x0A            // <uint32>
+#define FT_PARTFILENAME 0x12      // <string>
+#define FT_OLDDLPRIORITY 0x13     // Not used anymore
+#define FT_STATUS 0x14            // <uint32>
+#define FT_SOURCES 0x15           // <uint32>
+#define FT_PERMISSIONS 0x16       // <uint32>
+#define FT_OLDULPRIORITY 0x17     // Not used anymore
+#define FT_DLPRIORITY 0x18        // Was 13
+#define FT_ULPRIORITY 0x19        // Was 17
+#define FT_KADLASTPUBLISHKEY 0x20 // <uint32>
+#define FT_KADLASTPUBLISHSRC 0x21 // <uint32>
+#define FT_FLAGS 0x22             // <uint32>
+#define FT_DL_ACTIVE_TIME 0x23    // <uint32>
+#define FT_CORRUPTEDPARTS 0x24    // <string>
+#define FT_DL_PREVIEW 0x25
+#define FT_KADLASTPUBLISHNOTES 0x26 // <uint32>
+#define FT_AICH_HASH 0x27
+// Per-record "last seen alive" timestamp written by aMule's KnownFileList, so the dedup-list
+// cap/TTL can drop entries whose file has not existed for the user-configured window. aMule-
+// internal; eMule and older aMule binaries ignore unknown tags on load.
+#define FT_LASTSEEN 0x28 // <uint32>
+#define FT_COMPLETE_SOURCES \
+	0x30 // nr. of sources which share a
+	     // complete version of the
+	     // associated file (supported
+	     // by eserver 16.46+) statistic
 
+#define FT_PUBLISHINFO 0x33     // <uint32>
+#define FT_ATTRANSFERRED 0x50   // <uint32>
+#define FT_ATREQUESTED 0x51     // <uint32>
+#define FT_ATACCEPTED 0x52      // <uint32>
+#define FT_CATEGORY 0x53        // <uint32>
+#define FT_ATTRANSFERREDHI 0x54 // <uint32>
+#define FT_LASTUPLOADED 0x55    // <uint32> last time data was uploaded for this file (issue #466)
+#define FT_SHAREDSINCE 0x56     // <uint32> when the file was completed / first shared (issue #466)
+#define FT_MEDIA_ARTIST 0xD0    // <string>
+#define FT_MEDIA_ALBUM 0xD1     // <string>
+#define FT_MEDIA_TITLE 0xD2     // <string>
+#define FT_MEDIA_LENGTH 0xD3    // <uint32> !!!
+#define FT_MEDIA_BITRATE 0xD4   // <uint32>
+#define FT_MEDIA_CODEC 0xD5     // <string>
+// Set when ffprobe ran on this file and produced nothing usable -- a broken or truncated container,
+// an unreadable file, a binary that errored out. Without it such a file is indistinguishable from
+// one never probed, so the "already probed" gate re-queues it on every share reload and every
+// restart, forever, to fail the same way (issue #1116).
+//
+// aMule-internal, like FT_LASTSEEN: stored in known.met and NOT published -- the ed2k and Kad
+// publishers build their tag lists by explicit allow-list, so a peer never sees it. Deliberately
+// NOT counted by GetMetaDataVer(): "we tried and failed" is not metadata, and a file carrying only
+// this must still read as having none.
+//
+// A media refresh (issue #1079) ignores it and clears it on success, so the marker is a default,
+// never a life sentence.
+#define FT_MEDIA_PROBE_FAILED 0x57 // <uint32> aMule-internal, see above
+#define FT_FILERATING 0xF7         // <uint8>
 
 // Kad search + some unused tags to mirror the ed2k ones.
-#define	TAG_FILENAME			wxT("\x01")	// <string>
-#define	TAG_FILESIZE			wxT("\x02")	// <uint32>
-#define	TAG_FILESIZE_HI			wxT("\x3A")	// <uint32>
-#define	TAG_FILETYPE			wxT("\x03")	// <string>
-#define	TAG_FILEFORMAT			wxT("\x04")	// <string>
-#define	TAG_COLLECTION			wxT("\x05")
-#define	TAG_PART_PATH			wxT("\x06")	// <string>
-#define	TAG_PART_HASH			wxT("\x07")
-#define	TAG_COPIED			wxT("\x08")	// <uint32>
-#define	TAG_GAP_START			wxT("\x09")	// <uint32>
-#define	TAG_GAP_END			wxT("\x0A")	// <uint32>
-#define	TAG_DESCRIPTION			wxT("\x0B")	// <string>
-#define	TAG_PING			wxT("\x0C")
-#define	TAG_FAIL			wxT("\x0D")
-#define	TAG_PREFERENCE			wxT("\x0E")
-#define	TAG_PORT			wxT("\x0F")
-#define	TAG_IP_ADDRESS			wxT("\x10")
-#define	TAG_VERSION			wxT("\x11")	// <string>
-#define	TAG_TEMPFILE			wxT("\x12")	// <string>
-#define	TAG_PRIORITY			wxT("\x13")	// <uint32>
-#define	TAG_STATUS			wxT("\x14")	// <uint32>
-#define	TAG_SOURCES			wxT("\x15")	// <uint32>
-#define	TAG_AVAILABILITY		wxT("\x15")	// <uint32>
-#define	TAG_PERMISSIONS			wxT("\x16")
-#define	TAG_QTIME			wxT("\x16")
-#define	TAG_PARTS			wxT("\x17")
-#define	TAG_PUBLISHINFO			wxT("\x33")	// <uint32>
-#define	TAG_MEDIA_ARTIST		wxT("\xD0")	// <string>
-#define	TAG_MEDIA_ALBUM			wxT("\xD1")	// <string>
-#define	TAG_MEDIA_TITLE			wxT("\xD2")	// <string>
-#define	TAG_MEDIA_LENGTH		wxT("\xD3")	// <uint32> !!!
-#define	TAG_MEDIA_BITRATE		wxT("\xD4")	// <uint32>
-#define	TAG_MEDIA_CODEC			wxT("\xD5")	// <string>
-#define	TAG_KADMISCOPTIONS		wxT("\xF2")	// <uint8>
-#define	TAG_ENCRYPTION			wxT("\xF3")	// <uint8>
-#define	TAG_FILERATING			wxT("\xF7")	// <uint8>
-#define	TAG_BUDDYHASH			wxT("\xF8")	// <string>
-#define	TAG_CLIENTLOWID			wxT("\xF9")	// <uint32>
-#define	TAG_SERVERPORT			wxT("\xFA")	// <uint16>
-#define	TAG_SERVERIP			wxT("\xFB")	// <uint32>
-#define	TAG_SOURCEUPORT			wxT("\xFC")	// <uint16>
-#define	TAG_SOURCEPORT			wxT("\xFD")	// <uint16>
-#define	TAG_SOURCEIP			wxT("\xFE")	// <uint32>
-#define	TAG_SOURCETYPE			wxT("\xFF")	// <uint8>
+#define TAG_FILENAME wxT("\x01")    // <string>
+#define TAG_FILESIZE wxT("\x02")    // <uint32>
+#define TAG_FILESIZE_HI wxT("\x3A") // <uint32>
+#define TAG_FILETYPE wxT("\x03")    // <string>
+#define TAG_FILEFORMAT wxT("\x04")  // <string>
+#define TAG_COLLECTION wxT("\x05")
+#define TAG_PART_PATH wxT("\x06") // <string>
+#define TAG_PART_HASH wxT("\x07")
+#define TAG_COPIED wxT("\x08")      // <uint32>
+#define TAG_GAP_START wxT("\x09")   // <uint32>
+#define TAG_GAP_END wxT("\x0A")     // <uint32>
+#define TAG_DESCRIPTION wxT("\x0B") // <string>
+#define TAG_PING wxT("\x0C")
+#define TAG_FAIL wxT("\x0D")
+#define TAG_PREFERENCE wxT("\x0E")
+#define TAG_PORT wxT("\x0F")
+#define TAG_IP_ADDRESS wxT("\x10")
+#define TAG_VERSION wxT("\x11")      // <string>
+#define TAG_TEMPFILE wxT("\x12")     // <string>
+#define TAG_PRIORITY wxT("\x13")     // <uint32>
+#define TAG_STATUS wxT("\x14")       // <uint32>
+#define TAG_SOURCES wxT("\x15")      // <uint32>
+#define TAG_AVAILABILITY wxT("\x15") // <uint32>
+#define TAG_PERMISSIONS wxT("\x16")
+#define TAG_QTIME wxT("\x16")
+#define TAG_PARTS wxT("\x17")
+#define TAG_PUBLISHINFO wxT("\x33") // <uint32>
+// AICH hashes on Kad keyword storage, introduced by Kad protocol version 0x09. Both are gated on
+// the peer's advertised Kad version (KADEMLIA_VERSION9_50a): the publish tag only goes to peers at
+// 0x09 or above, and the result tag is only honoured from senders at 0x09 or above.
+#define TAG_KADAICHHASHPUB wxT("\x36")    // <AICH Hash> (BSOB, 20 bytes)
+#define TAG_KADAICHHASHRESULT wxT("\x37") // <Count 1>{<Publishers 1><AICH Hash 20>} Count (BSOB)
+// Not a Kad wire tag: the AICH root hash a Kad search result agreed on, handed from the Kad layer
+// to CSearchList in the same in-process tag list the other result metadata travels in. It shares
+// FT_AICH_HASH's id (0x27) so a search result carries its AICH hash under the same tag name as
+// everywhere else.
+#define TAG_AICHHASH wxT("\x27")       // <string> (base32)
+#define TAG_MEDIA_ARTIST wxT("\xD0")   // <string>
+#define TAG_MEDIA_ALBUM wxT("\xD1")    // <string>
+#define TAG_MEDIA_TITLE wxT("\xD2")    // <string>
+#define TAG_MEDIA_LENGTH wxT("\xD3")   // <uint32> !!!
+#define TAG_MEDIA_BITRATE wxT("\xD4")  // <uint32>
+#define TAG_MEDIA_CODEC wxT("\xD5")    // <string>
+#define TAG_KADMISCOPTIONS wxT("\xF2") // <uint8>
+#define TAG_ENCRYPTION wxT("\xF3")     // <uint8>
+#define TAG_FILERATING wxT("\xF7")     // <uint8>
+#define TAG_BUDDYHASH wxT("\xF8")      // <string>
+#define TAG_CLIENTLOWID wxT("\xF9")    // <uint32>
+#define TAG_SERVERPORT wxT("\xFA")     // <uint16>
+#define TAG_SERVERIP wxT("\xFB")       // <uint32>
+#define TAG_SOURCEUPORT wxT("\xFC")    // <uint16>
+#define TAG_SOURCEPORT wxT("\xFD")     // <uint16>
+#define TAG_SOURCEIP wxT("\xFE")       // <uint32>
+#define TAG_SOURCETYPE wxT("\xFF")     // <uint8>
+
+// eMuleAI vendor tags in Kad source publish/search results. Multi-character names, deliberately:
+// the single-byte space above is full. Both carry a 128-bit address as exactly 32 hexadecimal
+// characters, most significant byte first -- see DecodeIPv6HexTag() in src/PeerCapabilities.h.
+// aMule reads them but cannot yet route to an IPv6 source, so it records and drops.
+#define TAG_IPV6 wxT("ip6")             // <string> unfirewalled IPv6
+#define TAG_SERVINGBUDDYIPV6 wxT("bi6") // <string> serving buddy IPv6
 
 // Media values for FT_FILETYPE
-#define	ED2KFTSTR_AUDIO			wxT("Audio")
-#define	ED2KFTSTR_VIDEO			wxT("Video")
-#define	ED2KFTSTR_IMAGE			wxT("Image")
-#define	ED2KFTSTR_DOCUMENT		wxT("Doc")
-#define	ED2KFTSTR_PROGRAM		wxT("Pro")
-#define	ED2KFTSTR_ARCHIVE		wxT("Arc")	// *Mule internal use only
-#define	ED2KFTSTR_CDIMAGE		wxT("Iso")	// *Mule internal use only
+#define ED2KFTSTR_AUDIO wxT("Audio")
+#define ED2KFTSTR_VIDEO wxT("Video")
+#define ED2KFTSTR_IMAGE wxT("Image")
+#define ED2KFTSTR_DOCUMENT wxT("Doc")
+#define ED2KFTSTR_PROGRAM wxT("Pro")
+#define ED2KFTSTR_ARCHIVE wxT("Arc") // *Mule internal use only
+#define ED2KFTSTR_CDIMAGE wxT("Iso") // *Mule internal use only
 
 // Additional media meta data tags from eDonkeyHybrid (note also the uppercase/lowercase)
-#define	FT_ED2K_MEDIA_ARTIST		"Artist"	// <string>
-#define	FT_ED2K_MEDIA_ALBUM		"Album"		// <string>
-#define	FT_ED2K_MEDIA_TITLE		"Title"		// <string>
-#define	FT_ED2K_MEDIA_LENGTH		"length"	// <string> !!!
-#define	FT_ED2K_MEDIA_BITRATE		"bitrate"	// <uint32>
-#define	FT_ED2K_MEDIA_CODEC		"codec"		// <string>
+#define FT_ED2K_MEDIA_ARTIST "Artist"   // <string>
+#define FT_ED2K_MEDIA_ALBUM "Album"     // <string>
+#define FT_ED2K_MEDIA_TITLE "Title"     // <string>
+#define FT_ED2K_MEDIA_LENGTH "length"   // <string> !!!
+#define FT_ED2K_MEDIA_BITRATE "bitrate" // <uint32>
+#define FT_ED2K_MEDIA_CODEC "codec"     // <string>
 
 #endif // FILETAGS_H

amule-3.0.1.tar.gz/src/include/tags/ServerTags.h -> amule-3.1.0.tar.gz/src/include/tags/ServerTags.h Changed

@@ -27,29 +27,30 @@
 #define SERVERTAGS_H
 
 // server.met and server status.
-enum Server_tags {
-	ST_SERVERNAME		= 0x01,	// <string>
+enum Server_tags
+{
+	ST_SERVERNAME = 0x01, // <string>
 	// Unused (0x02-0x0A)
-	ST_DESCRIPTION		= 0x0B,	// <string>
-	ST_PING			= 0x0C,	// <uint32>
-	ST_FAIL			= 0x0D,	// <uint32>
-	ST_PREFERENCE		= 0x0E,	// <uint32>
+	ST_DESCRIPTION = 0x0B, // <string>
+	ST_PING = 0x0C,        // <uint32>
+	ST_FAIL = 0x0D,        // <uint32>
+	ST_PREFERENCE = 0x0E,  // <uint32>
 	// Unused (0x0F-0x84)
-	ST_DYNIP		= 0x85,
-	ST_LASTPING_DEPRECATED	= 0x86,	// <uint32> // DEPRECATED, use 0x90
-	ST_MAXUSERS		= 0x87,
-	ST_SOFTFILES		= 0x88,
-	ST_HARDFILES		= 0x89,
+	ST_DYNIP = 0x85,
+	ST_LASTPING_DEPRECATED = 0x86, // <uint32> // DEPRECATED, use 0x90
+	ST_MAXUSERS = 0x87,
+	ST_SOFTFILES = 0x88,
+	ST_HARDFILES = 0x89,
 	// Unused (0x8A-0x8F)
-	ST_LASTPING		= 0x90,	// <uint32>
-	ST_VERSION		= 0x91,	// <string>
-	ST_UDPFLAGS		= 0x92,	// <uint32>
-	ST_AUXPORTSLIST		= 0x93,	// <string>
-	ST_LOWIDUSERS		= 0x94,	// <uint32>
-	ST_UDPKEY		= 0x95,	// <uint32>
-	ST_UDPKEYIP		= 0x96,	// <uint32>
-	ST_TCPPORTOBFUSCATION	= 0x97,	// <uint16>
-	ST_UDPPORTOBFUSCATION	= 0x98	// <uint16>
+	ST_LASTPING = 0x90,           // <uint32>
+	ST_VERSION = 0x91,            // <string>
+	ST_UDPFLAGS = 0x92,           // <uint32>
+	ST_AUXPORTSLIST = 0x93,       // <string>
+	ST_LOWIDUSERS = 0x94,         // <uint32>
+	ST_UDPKEY = 0x95,             // <uint32>
+	ST_UDPKEYIP = 0x96,           // <uint32>
+	ST_TCPPORTOBFUSCATION = 0x97, // <uint16>
+	ST_UDPPORTOBFUSCATION = 0x98  // <uint16>
 };
 
 #endif // SERVERTAGS_H

amule-3.0.1.tar.gz/src/include/tags/TagTypes.h -> amule-3.1.0.tar.gz/src/include/tags/TagTypes.h Changed

@@ -26,21 +26,22 @@
 #ifndef COMMONTAGTYPES_H
 #define COMMONTAGTYPES_H
 
-enum Tag_Types {
-	TAGTYPE_HASH16		= 0x01,
-	TAGTYPE_STRING		= 0x02,
-	TAGTYPE_UINT32		= 0x03,
-	TAGTYPE_FLOAT32		= 0x04,
-	TAGTYPE_BOOL		= 0x05,
-	TAGTYPE_BOOLARRAY	= 0x06,
-	TAGTYPE_BLOB		= 0x07,
-	TAGTYPE_UINT16		= 0x08,
-	TAGTYPE_UINT8		= 0x09,
-	TAGTYPE_BSOB		= 0x0A,
-	TAGTYPE_UINT64		= 0x0B,
+enum Tag_Types
+{
+	TAGTYPE_HASH16 = 0x01,
+	TAGTYPE_STRING = 0x02,
+	TAGTYPE_UINT32 = 0x03,
+	TAGTYPE_FLOAT32 = 0x04,
+	TAGTYPE_BOOL = 0x05,
+	TAGTYPE_BOOLARRAY = 0x06,
+	TAGTYPE_BLOB = 0x07,
+	TAGTYPE_UINT16 = 0x08,
+	TAGTYPE_UINT8 = 0x09,
+	TAGTYPE_BSOB = 0x0A,
+	TAGTYPE_UINT64 = 0x0B,
 
 	// Compressed string types
-	TAGTYPE_STR1		= 0x11,
+	TAGTYPE_STR1 = 0x11,
 	TAGTYPE_STR2,
 	TAGTYPE_STR3,
 	TAGTYPE_STR4,
@@ -56,24 +57,24 @@
 	TAGTYPE_STR14,
 	TAGTYPE_STR15,
 	TAGTYPE_STR16,
-	TAGTYPE_STR17,	// accepted by eMule 0.42f (02-Mai-2004) in receiving code
-			// only because of a flaw, those tags are handled correctly,
-			// but should not be handled at all
-	TAGTYPE_STR18,	// accepted by eMule 0.42f (02-Mai-2004) in receiving code
-			//  only because of a flaw, those tags are handled correctly,
-			// but should not be handled at all
-	TAGTYPE_STR19,	// accepted by eMule 0.42f (02-Mai-2004) in receiving code
-			// only because of a flaw, those tags are handled correctly,
-			// but should not be handled at all
-	TAGTYPE_STR20,	// accepted by eMule 0.42f (02-Mai-2004) in receiving code
-			// only because of a flaw, those tags are handled correctly,
-			// but should not be handled at all
-	TAGTYPE_STR21,	// accepted by eMule 0.42f (02-Mai-2004) in receiving code
-			// only because of a flaw, those tags are handled correctly,
-			// but should not be handled at all
-	TAGTYPE_STR22	// accepted by eMule 0.42f (02-Mai-2004) in receiving code
-			// only because of a flaw, those tags are handled correctly,
-			// but should not be handled at all
+	TAGTYPE_STR17, // accepted by eMule 0.42f (02-Mai-2004) in receiving code
+		       // only because of a flaw, those tags are handled correctly,
+		       // but should not be handled at all
+	TAGTYPE_STR18, // accepted by eMule 0.42f (02-Mai-2004) in receiving code
+		       //  only because of a flaw, those tags are handled correctly,
+		       // but should not be handled at all
+	TAGTYPE_STR19, // accepted by eMule 0.42f (02-Mai-2004) in receiving code
+		       // only because of a flaw, those tags are handled correctly,
+		       // but should not be handled at all
+	TAGTYPE_STR20, // accepted by eMule 0.42f (02-Mai-2004) in receiving code
+		       // only because of a flaw, those tags are handled correctly,
+		       // but should not be handled at all
+	TAGTYPE_STR21, // accepted by eMule 0.42f (02-Mai-2004) in receiving code
+		       // only because of a flaw, those tags are handled correctly,
+		       // but should not be handled at all
+	TAGTYPE_STR22 // accepted by eMule 0.42f (02-Mai-2004) in receiving code
+		      // only because of a flaw, those tags are handled correctly,
+		      // but should not be handled at all
 };
 
 #endif // COMMONTAGTYPES_H

amule-3.0.1.tar.gz/src/inetdownload.h -> amule-3.1.0.tar.gz/src/inetdownload.h Changed

@@ -24,1063 +24,16881 @@
 #ifndef INETDOWNLOAD_H
 #define INETDOWNLOAD_H
 
-static unsigned char inetDownload = {
-0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x72, 0x00,  0x28, 0x00, 0x84, 0x0a, 0x00, 0x00, 0xff, 0xff,
-0x00, 0x00, 0x00, 0xcf, 0xcf, 0xcf, 0xb0, 0xb0,  0xb0, 0x9f, 0x9f, 0x9f, 0xa0, 0xa0, 0xa0, 0x20,
-0x20, 0x20, 0x8f, 0x8f, 0x8f, 0x5f, 0x5f, 0x5f,  0xd0, 0xd0, 0xd0, 0xff, 0xff, 0xff, 0xbf, 0xbf,
-0xbf, 0x6f, 0x6f, 0x6f, 0xef, 0xef, 0xef, 0xe0,  0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80,
-0xff, 0xf0, 0xef, 0xff, 0xef, 0xd0, 0xff, 0xd0,  0xd0, 0xff, 0xaf, 0xc0, 0x70, 0x70, 0x70, 0xff,
-0xaf, 0xaf, 0xff, 0xc0, 0xaf, 0x9a, 0x9a, 0x9a,  0x89, 0x89, 0x89, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  0xff, 0xff, 0xff, 0xff, 0xff, 0x21, 0xff, 0x0b,
-0x4e, 0x45, 0x54, 0x53, 0x43, 0x41, 0x50, 0x45,  0x32, 0x2e, 0x30, 0x03, 0x01, 0x00, 0x00, 0x00,
-0x21, 0xf9, 0x04, 0x09, 0x24, 0x00, 0x1f, 0x00,  0x2c, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x28,
-0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27, 0x8e, 0x64,  0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c, 0xeb, 0xbe,
-0x70, 0x2c, 0xcf, 0x74, 0x6d, 0xdf, 0x78, 0xae,  0xef, 0x7c, 0xef, 0xff, 0xc0, 0xa0, 0x30, 0x67,
-0x30, 0x0c, 0x8f, 0x06, 0xc2, 0xc2, 0x78, 0xe4,  0x05, 0x9e, 0xa2, 0xe4, 0x62, 0xd9, 0xd4, 0x05,
-0x26, 0x93, 0x43, 0xe0, 0x23, 0xa5, 0x56, 0x6f,  0x57, 0x6c, 0xf6, 0x13, 0x20, 0x0c, 0xbc, 0xdf,
-0xda, 0x95, 0x82, 0xd5, 0x96, 0xcf, 0xcc, 0x34,  0x6d, 0xcd, 0xae, 0x94, 0xcd, 0x83, 0xb8, 0x5c,
-0x16, 0xb0, 0x50, 0x2c, 0x16, 0x76, 0x04, 0x66,  0x7a, 0x7b, 0x31, 0x57, 0x80, 0x13, 0x76, 0x10,
-0x83, 0x85, 0x86, 0x2f, 0x6b, 0x58, 0x8b, 0x8d,  0x8f, 0x29, 0x45, 0x97, 0x7a, 0x01, 0x15, 0x75,
-0x05, 0x01, 0x10, 0x8c, 0x8e, 0x95, 0x45, 0x09,  0xa4, 0xa4, 0x08, 0x97, 0x64, 0x15, 0x8a, 0x05,
-0x9d, 0x9f, 0x10, 0xa1, 0x86, 0x06, 0xa4, 0x53,  0x0b, 0x03, 0x02, 0x0a, 0xb8, 0x0a, 0x06, 0x01,
-0x05, 0x15, 0xac, 0x5a, 0x9f, 0x0b, 0x0c, 0xb0,  0x69, 0xb2, 0x02, 0x02, 0xb4, 0x0b, 0xb9, 0xb8,
-0x0e, 0xc7, 0xac, 0x03, 0x08, 0xbc, 0xb8, 0xc3,  0x95, 0x51, 0x09, 0xc7, 0xc9, 0xca, 0xcb, 0xcd,
-0x03, 0xdd, 0xb6, 0xc7, 0x0a, 0x0d, 0x0d, 0xd4,  0x8f, 0xc6, 0xc7, 0xc8, 0x53, 0xcb, 0xcc, 0xde,
-0xec, 0x02, 0xe2, 0xe3, 0xc4, 0x43, 0xb2, 0xd7,  0xdf, 0xe9, 0xea, 0x0a, 0x0e, 0xde, 0x4f, 0x01,
-0xdf, 0xef, 0x0c, 0x5b, 0x7b, 0xcc, 0x2d, 0x40,  0xa7, 0x4d, 0x5d, 0xbe, 0x6e, 0x4f, 0x14, 0xf0,
-0x73, 0xd7, 0xc0, 0xc1, 0xbf, 0x58, 0xd7, 0x90,  0x61, 0xbb, 0xb7, 0x0e, 0xe1, 0x3e, 0x5b, 0x0e,
-0x32, 0x3a, 0x00, 0x58, 0x2c, 0xc1, 0x00, 0x02,  0xe8, 0xce, 0x50, 0xc4, 0x27, 0x40, 0xdf, 0x13,
-0x8c, 0x1a, 0xb7, 0x39, 0x56, 0x09, 0x60, 0xa0,  0x1b, 0xc8, 0x29, 0xdd, 0xee, 0x45, 0x20, 0xc9,
-0x8e, 0x9d, 0xc6, 0x8d, 0x69, 0xf8, 0xb5, 0xfc,  0x48, 0x70, 0x80, 0xcc, 0x08, 0x19, 0x4b, 0xd6,
-0x7c, 0x97, 0x51, 0xe5, 0x11, 0x9d, 0x2e, 0x05,  0x28, 0xa9, 0xe5, 0x53, 0xc1, 0x4c, 0xa7, 0x11,
-0x80, 0x72, 0xf3, 0x86, 0x2b, 0xc2, 0x04, 0x71,  0x46, 0x87, 0xe8, 0x84, 0x30, 0xe0, 0xc0, 0xa0,
-0x03, 0x30, 0xab, 0x46, 0x1d, 0x2b, 0x55, 0xe8,  0xad, 0x08, 0x17, 0xd2, 0xc6, 0x03, 0xc2, 0x92,
-0xeb, 0xc7, 0xaf, 0x0b, 0xcc, 0x40, 0x25, 0x3b,  0xf3, 0xa6, 0x03, 0xa8, 0x15, 0x22, 0xac, 0xfd,
-0xd1, 0x96, 0xdd, 0xd7, 0x03, 0x3e, 0xc7, 0x3a,  0x9d, 0x1b, 0x41, 0x42, 0x84, 0x03, 0xc3, 0x76,
-0xed, 0x0d, 0x62, 0xe0, 0x80, 0xe3, 0x9a, 0x81,  0xc9, 0x8a, 0x95, 0x20, 0xc1, 0xf1, 0x62, 0x24,
-0x8e, 0x33, 0x0f, 0xa5, 0x1b, 0xb5, 0x41, 0x85,  0x03, 0xe2, 0x2e, 0x63, 0xce, 0xfc, 0xd8, 0x1b,
-0x26, 0x03, 0xef, 0x1a, 0x38, 0x0e, 0x5d, 0x8d,  0x44, 0x00, 0xd2, 0xa4, 0x19, 0x30, 0x60, 0x8d,
-0x3a, 0x75, 0x01, 0xd6, 0xad, 0xb9, 0xc8, 0xde,  0xcd, 0x3b, 0xb5, 0x91, 0xda, 0xef, 0x50, 0xe5,
-0xde, 0x47, 0xfc, 0xc9, 0x69, 0x26, 0xc7, 0xab,  0x85, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x0c,
-0x00, 0x1f, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00,  0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0,
-0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae,  0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d,
-0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef, 0x9f, 0x06,  0xc3, 0x6f, 0x88, 0x32, 0x10, 0x16, 0x42, 0xe2,
-0x2f, 0xc0, 0x14, 0x19, 0x17, 0x48, 0x65, 0x2f,  0x30, 0x99, 0x1c, 0x02, 0x9f, 0x67, 0x54, 0xaa,
-0xa3, 0x56, 0xad, 0x9f, 0x00, 0x61, 0xb0, 0xe5,  0xe2, 0xa8, 0x94, 0xea, 0x55, 0x4c, 0x4e, 0x9a,
-0x6f, 0xe8, 0x74, 0x45, 0x3c, 0x1e, 0xb8, 0xdf,  0xb5, 0x80, 0x85, 0x62, 0xb1, 0xcc, 0x09, 0x63,
-0x77, 0x78, 0x34, 0x54, 0x7d, 0x13, 0x73, 0x10,  0x80, 0x82, 0x83, 0x32, 0x68, 0x55, 0x88, 0x8a,
-0x8c, 0x36, 0x01, 0x15, 0x72, 0x05, 0x01, 0x10,  0x89, 0x8b, 0x92, 0x2f, 0x94, 0x87, 0x05, 0x97,
-0x99, 0x10, 0x9b, 0x9c, 0x23, 0x41, 0xa7, 0x6e,  0x06, 0x01, 0x05, 0x15, 0xa0, 0x57, 0x99, 0x0b,
-0x0c, 0xa4, 0x92, 0x41, 0x09, 0xb6, 0xb6, 0x08,  0xa7, 0x0e, 0x02, 0x02, 0xa0, 0x03, 0x08, 0xab,
-0x0a, 0x0a, 0xb2, 0xa5, 0x25, 0x06, 0xb6, 0x50,  0x0b, 0x03, 0x02, 0xc2, 0xc2, 0xbb, 0x03, 0xd0,
-0xcb, 0xbc, 0x0a, 0x0d, 0x0d, 0xc4, 0xc5, 0x59,  0x09, 0xbc, 0xc9, 0x0b, 0xcd, 0xce, 0xd1, 0xe0,
-0x02, 0xd5, 0xd6, 0xb3, 0x66, 0xc7, 0xdb, 0xdc,  0xde, 0x0a, 0x0e, 0xd1, 0x4c, 0x01, 0xd2, 0xe3,
-0x0c, 0x58, 0x9c, 0xe7, 0xbc, 0x02, 0xc9, 0xea,  0xeb, 0xed, 0x01, 0x0a, 0xef, 0xe2, 0x0d, 0x0e,
-0xe4, 0xd1, 0xb3, 0x25, 0x40, 0x1a, 0x94, 0x7c,  0xfa, 0xa0, 0xb9, 0xf3, 0xe7, 0xa0, 0xa1, 0x83,
-0x79, 0x8c, 0xea, 0x2d, 0xb8, 0x77, 0x30, 0xdf,  0x33, 0x85, 0x4c, 0x96, 0x39, 0x7c, 0x38, 0x70,
-0xdb, 0x36, 0x84, 0xeb, 0x0a, 0x82, 0x8b, 0xb6,  0x11, 0x22, 0x9e, 0x63, 0x03, 0xbe, 0x08, 0x50,
-0x24, 0x03, 0xb2, 0xa1, 0x48, 0x70, 0xe3, 0x1a,  0x9a, 0x34, 0x13, 0xc0, 0x00, 0x34, 0x95, 0x50,
-0xa0, 0xe5, 0x8b, 0xa0, 0x20, 0x82, 0x4b, 0x70,  0xc2, 0x22, 0x4c, 0xa8, 0x36, 0x53, 0xca, 0x3b,
-0x9b, 0x29, 0x29, 0x2a, 0xdb, 0x19, 0xa1, 0xe9,  0xcf, 0x65, 0x3d, 0x2f, 0x48, 0x2d, 0xb7, 0xc4,
-0xce, 0x4d, 0x01, 0x47, 0x94, 0x0d, 0x08, 0x1a,  0xb4, 0x29, 0xcf, 0x8d, 0x0e, 0x7a, 0x46, 0xa8,
-0x10, 0x81, 0xaa, 0x8f, 0xa3, 0x10, 0x06, 0x1c,  0x00, 0x74, 0x20, 0x67, 0x57, 0xaf, 0x62, 0x9b,
-0x4a, 0x88, 0x70, 0x40, 0x96, 0x2a, 0xb3, 0x67,  0x47, 0xa5, 0x4d, 0xc9, 0x76, 0xc1, 0x98, 0xb8,
-0x4d, 0xbb, 0x4a, 0x90, 0x70, 0xe0, 0x00, 0x5e,  0x25, 0x35, 0xf7, 0xde, 0x24, 0x50, 0x78, 0x2b,
-0x5c, 0xaf, 0x11, 0x1a, 0x54, 0x38, 0x50, 0xed,  0xb0, 0x14, 0x03, 0x85, 0x0f, 0x8c, 0x74, 0x0c,
-0xd9, 0xc0, 0xb8, 0x06, 0x85, 0x2b, 0x63, 0x73,  0x92, 0xb9, 0x31, 0x4c, 0xaf, 0x4c, 0x3c, 0x7f,
-0x2e, 0x20, 0x7a, 0x34, 0xe6, 0xd2, 0x9a, 0xa3,  0xa1, 0x72, 0xf2, 0xb9, 0xc1, 0xa9, 0xd1, 0x22,
-0x02, 0xc0, 0xce, 0xcc, 0x80, 0x41, 0xeb, 0x2c,  0xa8, 0x2c, 0x73, 0x31, 0xd0, 0xbb, 0xb8, 0xf1,
-0xcf, 0x45, 0x71, 0x97, 0x58, 0xc8, 0x3c, 0xb8,  0x72, 0x13, 0x21, 0x00, 0x00, 0x21, 0xf9, 0x04,
-0x09, 0x0c, 0x00, 0x1f, 0x00, 0x2c, 0x00, 0x00,  0x00, 0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05,
-0xfe, 0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68,  0xaa, 0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf,
-0x74, 0x6d, 0xdf, 0x78, 0xae, 0xef, 0xb4, 0x61,  0xf0, 0x40, 0x97, 0x81, 0xb0, 0xf8, 0x05, 0x8f,
-0xa3, 0x80, 0x52, 0x34, 0x5c, 0x14, 0x91, 0xc7,  0xc0, 0x64, 0x72, 0x08, 0x7c, 0x9a, 0x4f, 0x28,
-0x4f, 0x3a, 0xa5, 0x7e, 0x02, 0x84, 0x41, 0x56,  0xab, 0x93, 0x52, 0xa6, 0x55, 0xb0, 0xd8, 0x48,
-0xce, 0x99, 0xcf, 0x15, 0x70, 0x78, 0xc0, 0x6e,  0xdf, 0x02, 0x16, 0x8a, 0xc5, 0x12, 0x27, 0x84,
-0xeb, 0x76, 0x36, 0x52, 0x7b, 0x13, 0x71, 0x10,  0x7e, 0x80, 0x81, 0x34, 0x66, 0x53, 0x86, 0x88,
-0x8a, 0x38, 0x01, 0x15, 0x70, 0x05, 0x01, 0x10,  0x87, 0x89, 0x90, 0x31, 0x92, 0x85, 0x05, 0x95,
-0x97, 0x10, 0x99, 0x9a, 0x25, 0x3e, 0xa5, 0x6c,  0x06, 0x01, 0x05, 0x15, 0x9e, 0x55, 0x97, 0x0b,
-0x0c, 0xa2, 0xa3, 0x3e, 0x09, 0xb4, 0xb4, 0x08,  0xa5, 0x0e, 0x02, 0x02, 0x9e, 0x03, 0x08, 0xa9,
-0x0a, 0x0a, 0xb0, 0xa3, 0x27, 0x06, 0xb4, 0x4e,  0x0b, 0x03, 0x02, 0xc0, 0xc0, 0xb9, 0x03, 0xce,
-0xc9, 0xba, 0x0a, 0x0d, 0x0d, 0xc2, 0xc3, 0x23,  0xc5, 0xba, 0xc7, 0x0b, 0xcb, 0xcc, 0xcf, 0xde,
-0x02, 0xd3, 0xd4, 0xb1, 0x76, 0xd8, 0x02, 0xda,  0xdb, 0xdc, 0x0e, 0xcf, 0x4a, 0x01, 0xd0, 0xe1,
-0x0c, 0x56, 0xc3, 0xe5, 0xd9, 0x4e, 0xdc, 0xdd,  0xce, 0x4a, 0x0a, 0xed, 0xe0, 0x0d, 0x0e, 0xf0,
-0xf2, 0xb4, 0x04, 0x40, 0xab, 0x67, 0x4f, 0x81,  0x3a, 0x7c, 0xec, 0x92, 0x39, 0x58, 0xe8, 0x20,
-0x9e, 0xa6, 0x72, 0x0b, 0xcc, 0x11, 0xb4, 0xd7,  0x0c, 0xe1, 0x3e, 0x86, 0x0d, 0x01, 0x66, 0xcb,
-0x56, 0x90, 0x99, 0x40, 0x6f, 0xcf, 0x30, 0x3a,  0x54, 0x54, 0x6c, 0x00, 0x01, 0x89, 0x62, 0xca,
-0x3a, 0x1a, 0xac, 0xe8, 0x2d, 0xdc, 0xc2, 0x91,  0x76, 0x02, 0x18, 0x70, 0x76, 0xd2, 0x89, 0xb3,
-0x82, 0x11, 0x14, 0x44, 0x58, 0xf8, 0xf1, 0xa6,  0xce, 0x09, 0xd3, 0x60, 0x92, 0x69, 0x37, 0xd3,
-0xa4, 0x44, 0x64, 0x38, 0x23, 0x28, 0xe5, 0xe9,  0x4c, 0x59, 0x84, 0x0b, 0x50, 0xc7, 0x45, 0xa1,
-0x43, 0x53, 0x00, 0x11, 0x64, 0x03, 0x80, 0xe5,  0xd4, 0xa9, 0x34, 0x27, 0x46, 0x07, 0x5c, 0x2b,
-0x44, 0x90, 0x1a, 0x84, 0x28, 0x84, 0x01, 0x07,  0xfc, 0x1c, 0xb0, 0xa9, 0xb5, 0x6b, 0x4e, 0xb7,
-0x12, 0x22, 0x1c, 0x80, 0x85, 0x8a, 0x6c, 0xd9,  0x50, 0x67, 0x4d, 0xaa, 0x5d, 0x10, 0x86, 0x6b,
-0xd7, 0xb6, 0x12, 0x24, 0x1c, 0x38, 0x60, 0x57,  0x8b, 0xcc, 0xbc, 0x34, 0x09, 0x0c, 0xce, 0xfa,
-0xd7, 0x6d, 0x83, 0x0a, 0x07, 0xa6, 0x15, 0x26,  0x63, 0x60, 0x31, 0x48, 0xc6, 0x01, 0xba, 0x1a,
-0x08, 0xd7, 0x20, 0x40, 0xe4, 0x06, 0x93, 0xa1,  0x54, 0x3e, 0xe0, 0x8c, 0xf4, 0x3a, 0x76, 0xec,
-0x0c, 0x40, 0x08, 0x9a, 0xaa, 0xb3, 0x35, 0x52,  0xde, 0x16, 0x2f, 0x31, 0xb1, 0xd9, 0x75, 0x80,
-0x07, 0xa1, 0xa1, 0x78, 0x5e, 0x3c, 0x98, 0xdd,  0x09, 0x4b, 0x0f, 0xe2, 0x09, 0xb5, 0xb6, 0x7b,
-0xb0, 0x71, 0x06, 0xf0, 0x64, 0x96, 0x98, 0xfd,  0x1a, 0x85, 0x12, 0xe4, 0xd0, 0x19, 0x70, 0x1e,
-0xde, 0x5c, 0x05, 0x6a, 0x99, 0xa6, 0xaa, 0xab,  0x08, 0x01, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x0c,
-0x00, 0x1f, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00,  0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0,
-0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae,  0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d,
-0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef, 0xc3, 0x06,  0xc3, 0x6f, 0x88, 0x32, 0x10, 0x16, 0x42, 0xe2,
-0x2f, 0xc0, 0x14, 0x19, 0x17, 0x48, 0x65, 0x2f,  0x30, 0x99, 0x1c, 0x02, 0x9f, 0x67, 0x54, 0xaa,
-0xa3, 0x56, 0xad, 0x9f, 0x00, 0x61, 0xb0, 0xe5,  0xe2, 0xa8, 0x94, 0xea, 0x55, 0x4c, 0x4e, 0x9a,
-0x6f, 0xe8, 0x74, 0x45, 0x3c, 0x1e, 0xb8, 0xdf,  0xa7, 0x60, 0x33, 0x15, 0xb0, 0x50, 0x2c, 0x16,
-0x73, 0x04, 0x63, 0x77, 0x78, 0x25, 0x06, 0x09,  0x89, 0x09, 0x41, 0x41, 0x26, 0x54, 0x80, 0x13,
-0x73, 0x10, 0x83, 0x85, 0x86, 0x4e, 0x09, 0x02,  0x02, 0x8a, 0x8a, 0x08, 0x77, 0x68, 0x55, 0x92,
-0x94, 0x96, 0x87, 0x98, 0x02, 0x0b, 0x09, 0x50,  0x0b, 0x03, 0x02, 0x0a, 0x0a, 0x58, 0x22, 0x01,
-0x15, 0x72, 0x05, 0x01, 0x10, 0x93, 0x95, 0x78,  0x88, 0x99, 0x99, 0xa9, 0x50, 0xad, 0xad, 0xaf,
-0xb1, 0x91, 0x05, 0xb4, 0xb6, 0x10, 0xb8, 0x66,  0x88, 0x98, 0xab, 0x9a, 0xbd, 0xbf, 0xc0, 0x06,
-0x01, 0x05, 0x15, 0xc4, 0x57, 0xb6, 0x0b, 0x0c,  0xc8, 0x52, 0xba, 0xa6, 0xa6, 0xa8, 0xbe, 0xcf,
-0xad, 0x0e, 0x99, 0xc4, 0x03, 0x08, 0xd2, 0xad,  0xd9, 0xa3, 0x59, 0xa5, 0x0b, 0xcd, 0xe0, 0xe1,
-0x0a, 0xe3, 0x03, 0xf4, 0xcc, 0xac, 0x0d, 0x0d,  0xea, 0x86, 0x88, 0x03, 0x04, 0xa6, 0xa7, 0xa9,
-0xe2, 0x89, 0xab, 0x47, 0x50, 0x00, 0xbe, 0x7c,  0xda, 0x96, 0x18, 0xa0, 0xe7, 0x0f, 0x0a, 0x99,
-0x05, 0x02, 0x07, 0x12, 0xa4, 0x97, 0xe9, 0x20,  0x83, 0x57, 0x5c, 0x02, 0xd8, 0x61, 0xf8, 0x2f,
-0x60, 0x44, 0x07, 0x04, 0x99, 0x50, 0xc4, 0xe7,  0xe0, 0xe2, 0x1b, 0x8d, 0x0b, 0xd5, 0xfb, 0x09,
-0x38, 0xe2, 0x30, 0x5e, 0x04, 0x89, 0xf5, 0x44,  0x0a, 0x70, 0x40, 0xd3, 0x01, 0x46, 0x29, 0x28,
-0x21, 0x0c, 0x38, 0x30, 0xe8, 0x40, 0xcb, 0x70,  0x2f, 0xe5, 0x09, 0x98, 0xa8, 0x71, 0x66, 0xcd,
-0x9b, 0x38, 0x0d, 0xe8, 0xec, 0xd7, 0xb3, 0x4e,  0xab, 0xa0, 0x41, 0xe7, 0x4d, 0xa4, 0x57, 0xd3,
-0x26, 0x9e, 0x00, 0x4a, 0x09, 0x0e, 0x3a, 0x32,  0xe0, 0x69, 0x84, 0xaf, 0xe2, 0xa4, 0x12, 0x3c,
-0x48, 0x13, 0x29, 0x17, 0x03, 0x07, 0x0e, 0x68,  0x5d, 0x30, 0x46, 0xc1, 0x57, 0xb0, 0x6e, 0x69,
-0x0e, 0xad, 0xf7, 0x74, 0x02, 0x3e, 0xb3, 0xdb,  0xd2, 0xd2, 0x53, 0xbb, 0x53, 0xad, 0x5b, 0xb8,
-0x6f, 0xe5, 0x52, 0x74, 0x7b, 0xa1, 0x70, 0x42,  0x22, 0x01, 0xf8, 0xf6, 0xd5, 0xd8, 0x35, 0x42,
-0x00, 0xb0, 0x6f, 0xe5, 0x55, 0xfd, 0x5b, 0x21,  0xc2, 0xe1, 0x21, 0x89, 0xd3, 0xa6, 0x65, 0xc2,
-0xb9, 0xb3, 0xdb, 0xbf, 0x5f, 0x25, 0x44, 0x38,  0x90, 0x2d, 0xda, 0x65, 0xcc, 0x99, 0x99, 0x5c,
-0x39, 0xf1, 0xf8, 0xaf, 0x04, 0x09, 0x69, 0x4f,  0x67, 0x4c, 0x9c, 0x9a, 0xcf, 0xd7, 0x06, 0x15,
-0x0e, 0xe0, 0x93, 0x8d, 0x93, 0xf6, 0x6a, 0x15,  0x01, 0x0e, 0x26, 0x6e, 0x80, 0x77, 0x54, 0x70,
-0xe2, 0xc5, 0x4b, 0x1c, 0x67, 0x52, 0x80, 0xf8,  0x3a, 0xe5, 0x77, 0x5d, 0x44, 0x6b, 0xe0, 0x2a,
-0xc0, 0x03, 0xde, 0x4a, 0xf6, 0xb8, 0xb0, 0xee,  0x2a, 0x4c, 0xf2, 0xe7, 0x2f, 0xb4, 0x83, 0x1f,
-0x5f, 0x23, 0x04, 0x00, 0x21, 0xf9, 0x04, 0x09,  0x0c, 0x00, 0x1f, 0x00, 0x2c, 0x00, 0x00, 0x00,
-0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe,  0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa,
-0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74,  0x6d, 0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef, 0xff,
-0x40, 0xa0, 0xc1, 0x10, 0x2c, 0x92, 0x0c, 0x84,  0x05, 0xd1, 0xd8, 0x0b, 0x38, 0x45, 0xc8, 0x85,
-0x92, 0xb9, 0x0b, 0x4c, 0x26, 0x87, 0xc0, 0x27,  0x3a, 0xa5, 0xe2, 0xac, 0x57, 0xec, 0x27, 0x40,
-0x18, 0x74, 0xbd, 0x36, 0x2b, 0xe5, 0x9a, 0x25,  0x9b, 0x97, 0x68, 0xd3, 0xd0, 0xa9, 0x4d, 0xa9,
-0xd7, 0x15, 0x72, 0x79, 0x00, 0x8f, 0x8f, 0x0c,  0x09, 0x81, 0x81, 0x43, 0x7d, 0x23, 0x01, 0x16,
-0x14, 0x16, 0x16, 0x79, 0x04, 0x65, 0x85, 0x7e,  0x80, 0x02, 0x02, 0x82, 0x82, 0x08, 0x85, 0x56,
-0x8a, 0x13, 0x79, 0x10, 0x8d, 0x8f, 0x68, 0x91,  0x02, 0x0b, 0x09, 0x52, 0x0b, 0x03, 0x02, 0x0a,
-0x0a, 0x75, 0x22, 0x6a, 0x57, 0x9b, 0x9d, 0x7e,  0x7f, 0x09, 0x92, 0x92, 0xa4, 0x52, 0xa8, 0xa8,
-0x4f, 0x63, 0x15, 0x78, 0x05, 0x01, 0x10, 0x9c,  0x9e, 0x4c, 0x80, 0xb2, 0xa6, 0x93, 0xb5, 0xb7,
-0xb7, 0x5a, 0x01, 0x15, 0x9a, 0x05, 0xbd, 0xbf,  0x10, 0xc1, 0x46, 0xa0, 0x0b, 0xa1, 0xa3, 0xb6,
-0xc8, 0xb7, 0x06, 0x01, 0x05, 0x15, 0xce, 0x59,  0xbf, 0x0b, 0x0c, 0xd2, 0x41, 0xd4, 0xc6, 0xd8,
-0xd9, 0xa8, 0x0e, 0x92, 0xce, 0x03, 0x08, 0xdc,  0xa8, 0xe3, 0x90, 0x09, 0x03, 0x04, 0xa1, 0xa2,
-0xa4, 0xe9, 0xb7, 0xeb, 0x03, 0xfd, 0xc5, 0xa7,  0x0d, 0x1a, 0xc8, 0xa3, 0xa2, 0xc5, 0x40, 0x3f,
-0x7b, 0x52, 0xcc, 0x2c, 0xd0, 0xb7, 0xcf, 0x9f,  0x43, 0x01, 0x01, 0x05, 0x92, 0xab, 0xf2, 0x20,
-0x80, 0xc1, 0x7a, 0xf7, 0xf2, 0x31, 0x54, 0xe0,  0xc0, 0x1f, 0x9d, 0x62, 0x11, 0x19, 0xa8, 0x0a,
-0x12, 0xe0, 0x01, 0x9f, 0x83, 0x02, 0xdb, 0x92,  0x24, 0xdc, 0xc8, 0xd1, 0x63, 0x80, 0x54, 0xa6,
-0x02, 0x3a, 0x10, 0xc9, 0xc4, 0x17, 0x1f, 0x08,  0x03, 0x0e, 0x34, 0x3a, 0xb0, 0x32, 0x5d, 0x04,
-0x75, 0x2e, 0x9d, 0x98, 0x72, 0x40, 0xd4, 0xc1,  0x48, 0x92, 0xd1, 0x70, 0xd6, 0xdb, 0xb9, 0x07,
-0xd5, 0x4f, 0xa7, 0xea, 0x04, 0x04, 0x1d, 0x5a,  0xf4, 0x28, 0x49, 0x03, 0x4a, 0x0f, 0x36, 0x2a,
-0xe5, 0x34, 0xc2, 0xcf, 0xa7, 0xfc, 0x1c, 0xfa,  0x2b, 0x6a, 0x34, 0x8e, 0x81, 0x03, 0x07, 0x1c,
-0x26, 0x29, 0xa3, 0xc0, 0xeb, 0x57, 0x75, 0x61,  0x1d, 0x46, 0x24, 0x6a, 0xb5, 0xc8, 0xd9, 0xb4,
-0x39, 0xfb, 0xa1, 0x1d, 0x10, 0x20, 0x81, 0x57,  0xbf, 0x4e, 0x89, 0x4a, 0xf5, 0xe7, 0x74, 0x42,
-0xc0, 0xba, 0x45, 0x02, 0xe0, 0xcd, 0x79, 0x00,  0x27, 0x1d, 0x3a, 0x09, 0xda, 0x7a, 0x15, 0xdc,
-0xef, 0x54, 0x84, 0x0b, 0x98, 0x27, 0xfe, 0x50,  0x8c, 0x16, 0x2d, 0x1d, 0x13, 0x2f, 0xdd, 0x72,
-0x24, 0x2b, 0xb9, 0x42, 0x04, 0xcd, 0x3e, 0x7c,  0x79, 0xce, 0x75, 0x22, 0xc0, 0x57, 0xb7, 0x12,
-0x22, 0x1c, 0x18, 0xb7, 0x0d, 0x75, 0x6a, 0x08,  0x59, 0x3c, 0xab, 0x78, 0x29, 0x59, 0x82, 0x04,
-0xb4, 0xb6, 0x91, 0xe6, 0x46, 0x4c, 0xc2, 0x75,  0x84, 0x06, 0x15, 0x0e, 0x04, 0x0c, 0x0e, 0x24,
-0xc0, 0x61, 0xe2, 0x25, 0x9c, 0x07, 0x44, 0xbb,  0x1c, 0x56, 0xf1, 0xc3, 0x30, 0xa4, 0x07, 0x2c,
-0x50, 0xdd, 0xfa, 0x2a, 0xe8, 0x28, 0xb4, 0x5b,  0x64, 0xee, 0x1d, 0x05, 0x21, 0xf2, 0xe5, 0xcb,
-0x87, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x2e,  0x00, 0x1f, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00,
-0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0,  0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae,
-0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d,  0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef, 0xff, 0xc0,
-0xa0, 0x70, 0x88, 0x32, 0x18, 0x88, 0x43, 0x03,  0x61, 0x71, 0x44, 0xee, 0x02, 0x50, 0x91, 0x72,
-0xc1, 0x74, 0xe6, 0x02, 0x93, 0xc9, 0x21, 0xf0,  0x99, 0x56, 0xad, 0x36, 0x6c, 0x56, 0xfb, 0x09,
-0x10, 0x06, 0x5f, 0x30, 0x0d, 0x4b, 0xc9, 0x6e,  0xcd, 0xe8, 0xa6, 0x7a, 0xc6, 0x6e, 0x57, 0xcc,
-0xe7, 0x81, 0x7c, 0x1e, 0x0b, 0x58, 0x28, 0x16,  0x16, 0x77, 0x04, 0x67, 0x7b, 0x7c, 0x30, 0x58,
-0x81, 0x13, 0x77, 0x10, 0x84, 0x86, 0x87, 0x2e,  0x6c, 0x59, 0x8c, 0x8e, 0x90, 0x45, 0x46, 0x98,
-0x24, 0x01, 0x15, 0x76, 0x05, 0x01, 0x10, 0x8d,  0x8f, 0x90, 0x46, 0x09, 0xa5, 0xa5, 0x08, 0x99,
-0x9b, 0x8b, 0x05, 0x9e, 0xa0, 0x10, 0xa2, 0x7c,  0x06, 0xa5, 0x54, 0x0b, 0x03, 0x02, 0x0a, 0xb8,
-0x0a, 0x06, 0x01, 0x05, 0x15, 0xac, 0x5b, 0xa0,  0x0b, 0x0c, 0xb0, 0x60, 0xb2, 0x02, 0x02, 0xb4,
-0x0b, 0xb9, 0xb8, 0x0e, 0xc7, 0xac, 0x03, 0x08,  0xbc, 0xb8, 0xc3, 0x96, 0x5d, 0x09, 0xc7, 0xc9,
-0xca, 0xcb, 0xcd, 0x03, 0xdd, 0xb6, 0xc7, 0x0a,  0x0d, 0x0d, 0xd4, 0x87, 0xc6, 0xc7, 0xc8, 0x54,
-0xcb, 0xcc, 0xde, 0xec, 0x02, 0xe2, 0xe3, 0xc4,  0x49, 0xa5, 0x02, 0xdf, 0xe9, 0xea, 0x0a, 0x0e,
-0xde, 0x50, 0x01, 0xdf, 0xef, 0x0c, 0x5c, 0x73,  0xcc, 0x2d, 0x40, 0xa7, 0x4d, 0x5d, 0xbe, 0x6e,
-0x01, 0x14, 0x40, 0xb1, 0x25, 0xce, 0xc1, 0xbf,  0x58, 0xd7, 0x90, 0x61, 0xbb, 0xb7, 0x0e, 0xe1,
-0x3e, 0x5b, 0x0e, 0x32, 0x3a, 0x00, 0x58, 0x2c,  0xc1, 0x00, 0x02, 0xe8, 0xd0, 0x50, 0xc4, 0x47,
-0xcf, 0x22, 0x3f, 0x01, 0x1a, 0xc0, 0x37, 0xaa,  0x09, 0x60, 0xa0, 0x1b, 0x48, 0x2a, 0xdd, 0xee,
-0x45, 0x20, 0xc9, 0x8e, 0x5d, 0x4a, 0x8e, 0x48,  0x02, 0x3c, 0x68, 0xf9, 0x91, 0xe0, 0x00, 0x99,
-0x11, 0x32, 0x96, 0x64, 0xf7, 0x2e, 0x23, 0x4e,  0x22, 0x3a, 0x79, 0x82, 0x5c, 0x52, 0xeb, 0xa7,
-0x82, 0x99, 0x4f, 0x23, 0x04, 0xe5, 0xe6, 0x0d,  0x57, 0x84, 0x09, 0xe2, 0x8e, 0x0e, 0x49, 0x0a,
-0x61, 0xc0, 0x01, 0x42, 0x07, 0x60, 0x5a, 0x95,  0x4a, 0x76, 0x6a, 0xc9, 0x5b, 0x11, 0x2e, 0xa8,
-0x8d, 0x07, 0x84, 0x65, 0xd7, 0x8f, 0x60, 0x17,  0x9c, 0x89, 0x5a, 0x76, 0x66, 0x4a, 0x07, 0x51,
-0x2b, 0x44, 0x60, 0x0b, 0xc4, 0xc0, 0x5b, 0x97,  0x04, 0x0e, 0x1c, 0xf8, 0x49, 0xf6, 0x29, 0xdd,
-0x08, 0x12, 0x22, 0x1c, 0x18, 0xb6, 0x8b, 0x6f,  0x10, 0x03, 0x82, 0x07, 0xd7, 0x3c, 0x0c, 0x55,
-0xaa, 0x04, 0x09, 0x82, 0x1d, 0x13, 0x81, 0x1c,  0x59, 0xb2, 0xb7, 0x06, 0x75, 0xa5, 0x36, 0xa8,
-0x70, 0x40, 0x9c, 0xe6, 0xcd, 0x9d, 0x05, 0xb3,  0xc3, 0x64, 0xe4, 0x5d, 0x03, 0xc1, 0xa6, 0xab,
-0x8d, 0x08, 0x90, 0x3a, 0x32, 0x03, 0x06, 0xb1,  0x0d, 0xb8, 0x6e, 0x50, 0x20, 0xb6, 0x6c, 0x03,
-0xb7, 0x83, 0x0b, 0x77, 0x7d, 0x44, 0x37, 0x71,  0x23, 0xb2, 0xcb, 0xec, 0x5b, 0xce, 0x92, 0x75,
-0x13, 0xe7, 0xa7, 0x5b, 0x84, 0x00, 0x00, 0x21,  0xf9, 0x04, 0x09, 0x0a, 0x00, 0x1f, 0x00, 0x2c,
-0x00, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x28, 0x00,  0x00, 0x05, 0xfe, 0xe0, 0x27, 0x8e, 0x64, 0x69,
-0x9e, 0x68, 0xaa, 0xae, 0x6c, 0xeb, 0xbe, 0x70,  0x2c, 0xcf, 0x74, 0x6d, 0xdf, 0x78, 0xae, 0xef,
-0x7c, 0xef, 0xe3, 0x06, 0xc3, 0x6f, 0x88, 0x32,  0x10, 0x16, 0x42, 0xe2, 0x2f, 0xc0, 0x14, 0x19,
-0x17, 0x48, 0x65, 0x2f, 0x30, 0x99, 0x1c, 0x02,  0x9f, 0x67, 0x54, 0xaa, 0xa3, 0x56, 0xad, 0x9f,
-0x00, 0x61, 0xb0, 0xe5, 0xe2, 0xa8, 0x94, 0xea,  0x55, 0x4c, 0x4e, 0x9a, 0x6f, 0xe8, 0x74, 0x45,
-0x3c, 0x1e, 0xb8, 0xdf, 0xb5, 0x80, 0x85, 0x62,  0xb1, 0xcc, 0x09, 0x63, 0x77, 0x78, 0x34, 0x54,
-0x7d, 0x13, 0x73, 0x10, 0x80, 0x82, 0x83, 0x32,  0x68, 0x55, 0x88, 0x8a, 0x8c, 0x36, 0x01, 0x15,
-0x72, 0x05, 0x01, 0x10, 0x89, 0x8b, 0x92, 0x2f,  0x94, 0x87, 0x05, 0x97, 0x99, 0x10, 0x9b, 0x9c,
-0x23, 0x41, 0xa7, 0x6e, 0x06, 0x01, 0x05, 0x15,  0xa0, 0x57, 0x99, 0x0b, 0x0c, 0xa4, 0x92, 0x41,
-0x09, 0xb6, 0xb6, 0x08, 0xa7, 0x0e, 0x02, 0x02,  0xa0, 0x03, 0x08, 0xab, 0x0a, 0x0a, 0xb2, 0xa5,
-0x25, 0x06, 0xb6, 0x50, 0x0b, 0x03, 0x02, 0xc2,  0xc2, 0xbb, 0x03, 0xd0, 0xcb, 0xbc, 0x0a, 0x0d,
-0x0d, 0xc4, 0xc5, 0x59, 0x09, 0xbc, 0xc9, 0x0b,  0xcd, 0xce, 0xd1, 0xe0, 0x02, 0xd5, 0xd6, 0xb3,
-0x66, 0xc7, 0xdb, 0xdc, 0xde, 0x0a, 0x0e, 0xd1,  0x4c, 0x01, 0xd2, 0xe3, 0x0c, 0x58, 0x9c, 0xe7,
-0xbc, 0x02, 0xc9, 0xea, 0xeb, 0xed, 0x01, 0x0a,  0xef, 0xe2, 0x0d, 0x0e, 0xe4, 0xd1, 0xb3, 0x25,
-0x40, 0x1a, 0x94, 0x7c, 0xfa, 0xa0, 0xb9, 0xf3,  0xe7, 0xa0, 0xa1, 0x83, 0x79, 0x8c, 0xea, 0x2d,
-0xb8, 0x77, 0x30, 0xdf, 0x33, 0x85, 0x4c, 0x96,  0x39, 0x7c, 0x38, 0x70, 0xdb, 0x36, 0x84, 0xeb,
-0x0a, 0x82, 0x8b, 0xb6, 0x11, 0x22, 0x9e, 0x63,  0x03, 0xc1, 0x08, 0x50, 0x24, 0x03, 0xb2, 0xa1,
-0x48, 0x70, 0xe3, 0x1a, 0x9a, 0x34, 0x13, 0xc0,  0x00, 0x34, 0x95, 0x50, 0xa0, 0xe5, 0x8b, 0xa0,
-0x20, 0x82, 0x4b, 0x70, 0xc2, 0x22, 0x4c, 0xa8,  0x36, 0x53, 0xca, 0x3b, 0x9b, 0x29, 0x29, 0x2a,
-0xdb, 0x19, 0xa1, 0xe9, 0xcf, 0x65, 0x3d, 0x2f,  0x48, 0x2d, 0xb7, 0xc4, 0xce, 0x4d, 0x01, 0x47,
-0x94, 0x0d, 0x08, 0x1a, 0xb4, 0x29, 0xcf, 0x8d,  0x0e, 0x7a, 0x46, 0xa8, 0x10, 0x81, 0xaa, 0x8f,
-0xa3, 0x10, 0x06, 0x1c, 0x00, 0x74, 0x20, 0x67,  0x57, 0xaf, 0x62, 0x9b, 0x4a, 0x88, 0x70, 0x40,
-0x96, 0x2a, 0xb3, 0x4b, 0x0c, 0xa4, 0x4d, 0xc9,  0x76, 0xc1, 0x98, 0xb8, 0x4d, 0xbb, 0x4a, 0x90,
-0x70, 0xe0, 0x00, 0x5e, 0x25, 0x35, 0xf7, 0xde,  0x24, 0x50, 0x78, 0x2b, 0x5c, 0xaf, 0x11, 0x1a,
-0x54, 0x38, 0x50, 0xed, 0xb0, 0x14, 0x03, 0x85,  0x0f, 0x8c, 0x74, 0x0c, 0xd9, 0xc0, 0xb8, 0x06,
-0x01, 0x28, 0x37, 0xb0, 0x4c, 0x04, 0x73, 0x66,  0xcd, 0x30, 0xbd, 0x32, 0x51, 0x35, 0x8e, 0x49,
-0x65, 0x6c, 0x4e, 0x4e, 0x37, 0x8e, 0x86, 0x6a,  0x44, 0x00, 0xa2, 0xae, 0x49, 0x13, 0x09, 0x2d,
-0xbb, 0x30, 0x03, 0x06, 0xaf, 0x6d, 0x8f, 0x16,  0x51, 0xb4, 0x94, 0x81, 0xdf, 0xc8, 0x93, 0x7f,
-0x36, 0x59, 0x1c, 0xf6, 0xc2, 0xe7, 0xa8, 0x74,  0xd7, 0x08, 0x01, 0x00, 0x21, 0xf9, 0x04, 0x09,
-0x0c, 0x00, 0x1f, 0x00, 0x2c, 0x00, 0x00, 0x00,  0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe,
-0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa,  0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74,
-0x6d, 0xdf, 0x78, 0xae, 0xef, 0xbc, 0x6a, 0x18,  0xbd, 0x20, 0xcb, 0x40, 0x58, 0x00, 0x85, 0xc8,
-0x4f, 0x60, 0x29, 0x22, 0x2e, 0x8c, 0xc9, 0x60,  0x60, 0x32, 0x39, 0x04, 0x3e, 0x4e, 0x68, 0x74,
-0x37, 0xa5, 0x56, 0x95, 0x84, 0x81, 0x76, 0x9b,  0x9b, 0x52, 0xa8, 0xd6, 0x40, 0x78, 0x4c, 0xbe,
-0x99, 0xcf, 0x15, 0x75, 0x78, 0x70, 0x6c, 0xbb,  0x2d, 0x14, 0x8b, 0x25, 0x4e, 0x08, 0xd7, 0xed,
-0x36, 0x53, 0x7a, 0x13, 0x71, 0x10, 0x7d, 0x7f,  0x80, 0x34, 0x66, 0x54, 0x85, 0x87, 0x89, 0x6e,
-0x15, 0x70, 0x05, 0x01, 0x10, 0x86, 0x88, 0x8f,  0x31, 0x01, 0x15, 0x84, 0x05, 0x93, 0x95, 0x10,
-0x97, 0x98, 0x25, 0x3f, 0xa4, 0x75, 0x06, 0x01,  0x05, 0x15, 0x9d, 0x56, 0x95, 0x0b, 0x0c, 0xa1,
-0xa2, 0x3f, 0x09, 0xb3, 0xb3, 0x08, 0xa4, 0x0e,  0x02, 0x02, 0x9d, 0x03, 0x08, 0xa8, 0x0a, 0x0a,
-0xaf, 0xa2, 0x26, 0x06, 0xb3, 0x4f, 0x0b, 0x03,  0x02, 0xbf, 0xbf, 0xb8, 0x03, 0xcd, 0xc8, 0xb9,
-0x0a, 0x0d, 0x0d, 0xc1, 0xc2, 0x4d, 0x09, 0xb9,  0xc6, 0x0b, 0xca, 0xcb, 0xce, 0xdd, 0x02, 0xd2,
-0xd3, 0xb0, 0x76, 0xc4, 0xd8, 0xd9, 0xdb, 0x0a,  0x0e, 0xce, 0x4b, 0x01, 0xcf, 0xe0, 0x0c, 0x57,
-0xb1, 0xd7, 0xb9, 0x02, 0xc6, 0xe7, 0xe8, 0xea,  0x01, 0x0a, 0xec, 0xdf, 0x0d, 0x0e, 0xef, 0xf1,
-0xd7, 0x9e, 0x3d, 0xb1, 0x77, 0xaf, 0xd9, 0xba,  0x7d, 0x0e, 0x12, 0x3a, 0x80, 0xf7, 0x88, 0x1c,
-0x3d, 0x7a, 0x03, 0xed, 0x31, 0x33, 0xb8, 0x04,  0x99, 0xc2, 0x85, 0xf1, 0xb0, 0x61, 0x23, 0x88,
-0x4e, 0x40, 0xb7, 0x6e, 0x17, 0x19, 0x02, 0x22,  0x36, 0x80, 0x00, 0x44, 0x31, 0x1c, 0xc3, 0x13,
-0x7a, 0xfc, 0x08, 0x2e, 0xa1, 0xc8, 0x36, 0x01,  0x0c, 0x34, 0x33, 0xf9, 0xa4, 0x99, 0xbd, 0x08,
-0x0a, 0x22, 0xa8, 0xec, 0xf6, 0x2b, 0xc2, 0x04,  0x69, 0x2f, 0xb7, 0xb0, 0x93, 0x59, 0x12, 0xe2,
-0xb1, 0x9b, 0x11, 0x92, 0xee, 0x44, 0x96, 0xf3,  0x82, 0x53, 0x71, 0x48, 0x86, 0xce, 0x14, 0x50,
-0xe4, 0xd8, 0x80, 0x9e, 0x3d, 0x93, 0xe2, 0xbc,  0xe8, 0x20, 0x67, 0x84, 0x0a, 0x11, 0xa0, 0x0a,
-0x19, 0x0a, 0x61, 0xc0, 0x81, 0x3e, 0x07, 0x6a,  0x66, 0xd5, 0xea, 0x35, 0xa9, 0x84, 0x08, 0x07,
-0x5e, 0x9d, 0x12, 0x1b, 0xd5, 0x40, 0xd9, 0x92,  0x68, 0x17, 0x84, 0x69, 0x9b, 0x34, 0xab, 0x04,
-0x09, 0x07, 0x0e, 0xd0, 0x15, 0x6a, 0xb7, 0x1b,  0xda, 0x03, 0x57, 0xd9, 0x6a, 0x8d, 0xd0, 0xa0,
-0xc2, 0x01, 0x69, 0x83, 0xc9, 0x18, 0x08, 0xfc,  0xd1, 0x66, 0x84, 0x00, 0x5a, 0x0d, 0x80, 0x6b,
-0x10, 0xe0, 0x71, 0x83, 0xc8, 0x51, 0x26, 0x23,  0x36, 0xdb, 0xed, 0xe0, 0xba, 0x53, 0xe0, 0x96,
-0x40, 0xae, 0x36, 0x82, 0x68, 0x33, 0xca, 0x4c,  0x4e, 0x04, 0x00, 0xaa, 0x1a, 0x74, 0x92, 0xce,
-0x94, 0x03, 0xaf, 0x4b, 0x31, 0xfb, 0x48, 0x50,  0x51, 0xb8, 0x03, 0x0b, 0x67, 0xf0, 0x2e, 0xa6,
-0x6c, 0xd6, 0x28, 0x96, 0x10, 0x5f, 0xce, 0x60,  0xf3, 0x6f, 0xe4, 0xbc, 0x0f, 0x96, 0xb2, 0x7d,
-0x23, 0x04, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x0c,  0x00, 0x1f, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00,
-0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0,  0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae,
-0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d,  0xdf, 0x9f, 0x61, 0xe0, 0xbc, 0x6d, 0x10, 0x8b,
-0x5d, 0x6f, 0xb8, 0x0a, 0x18, 0x45, 0xbf, 0x45,  0x90, 0xc8, 0x34, 0x05, 0x26, 0x93, 0x43, 0x20,
-0x07, 0x5c, 0x36, 0xaf, 0x4f, 0x68, 0xf4, 0x13,  0x20, 0x0c, 0xac, 0x57, 0xe6, 0x93, 0x02, 0x95,
-0x76, 0xbf, 0xc2, 0x30, 0x71, 0x4c, 0xae, 0x74,  0xbd, 0x83, 0xb4, 0x9a, 0xa5, 0x3b, 0xa6, 0x02,
-0x16, 0x8a, 0xc5, 0xe2, 0x26, 0x78, 0xe5, 0x73,  0x2a, 0x06, 0x09, 0x84, 0x09, 0x3a, 0x3a, 0x4e,
-0x13, 0x7b, 0x13, 0x6e, 0x10, 0x7e, 0x80, 0x81,  0x27, 0x83, 0x02, 0x02, 0x85, 0x85, 0x08, 0x72,
-0x63, 0x50, 0x8d, 0x8f, 0x91, 0x82, 0x09, 0x94,  0x0b, 0x09, 0x4a, 0x0b, 0x03, 0x02, 0x0a, 0x0a,
-0x53, 0x22, 0x01, 0x15, 0x6d, 0x05, 0x01, 0x10,  0x8e, 0x90, 0x9e, 0x48, 0xa0, 0x94, 0x02, 0xa4,
-0x4a, 0xa8, 0xa8, 0xaa, 0xac, 0x8c, 0x05, 0xaf,  0xb1, 0x10, 0xb3, 0x9e, 0x83, 0xa0, 0xa6, 0x95,
-0xb9, 0xbb, 0xbc, 0x06, 0x01, 0x05, 0x15, 0xc0,  0x52, 0xb1, 0x0b, 0x0c, 0xc4, 0x81, 0x93, 0xb8,
-0xb8, 0xa3, 0xba, 0xcb, 0xa8, 0x0e, 0x94, 0xc0,  0x03, 0x08, 0xce, 0xa8, 0xd5, 0xb4, 0x25, 0xd8,
-0x0b, 0xc9, 0xdc, 0xdd, 0x0a, 0xdf, 0x03, 0xf0,  0xc8, 0xa7, 0x0d, 0x0d, 0xe6, 0xe7, 0x39, 0x09,
-0x03, 0x04, 0xb8, 0xa2, 0xa4, 0xed, 0xde, 0xf1,  0x02, 0x0a, 0xa0, 0x57, 0xcf, 0x1a, 0x16, 0x03,
-0xf0, 0xf6, 0x29, 0xf9, 0xb2, 0xe0, 0x1f, 0xc0,  0x80, 0xf0, 0x28, 0x11, 0x64, 0xa0, 0x2a, 0x52,
-0x80, 0x38, 0x09, 0xf9, 0xf9, 0x73, 0xe8, 0x20,  0xa0, 0x91, 0x88, 0xf4, 0x1c, 0x50, 0xa4, 0x75,
-0x11, 0xa1, 0x3e, 0x01, 0x55, 0xd2, 0x4a, 0xb5,  0x8b, 0xf0, 0x30, 0xde, 0x47, 0x01, 0x0e, 0x62,
-0x3a, 0xa8, 0x18, 0xa8, 0x24, 0x84, 0x01, 0x07,  0xfc, 0x1c, 0x58, 0xb8, 0xd2, 0x9b, 0x00, 0x88,
-0x17, 0x61, 0xca, 0xa4, 0x59, 0xd3, 0xc0, 0x4d,  0x7d, 0x3a, 0xe1, 0xa0, 0x62, 0xa9, 0x80, 0xe9,
-0x3b, 0x88, 0xf0, 0x64, 0xce, 0x3c, 0x17, 0xc0,  0x68, 0x40, 0x3f, 0x40, 0x06, 0x2c, 0x8d, 0xc0,
-0xd5, 0xdb, 0xd3, 0x80, 0x04, 0x63, 0x12, 0x8d,  0x64, 0xe0, 0xc0, 0x81, 0xab, 0x0b, 0xbc, 0x34,
-0xe5, 0xca, 0x34, 0x42, 0xcc, 0x9f, 0xf1, 0x96,  0x4e, 0xa0, 0x37, 0xf6, 0x9a, 0x59, 0x78, 0x67,
-0x71, 0x9e, 0x5d, 0xdb, 0x96, 0xeb, 0xdb, 0x88,  0x4d, 0x2f, 0x08, 0x36, 0xa8, 0x26, 0x40, 0x5e,
-0xbd, 0x17, 0xb5, 0x46, 0x08, 0xd0, 0x95, 0xad,  0x3b, 0xa9, 0x6b, 0x2b, 0x44, 0x20, 0x1c, 0xc6,
-0xb0, 0x59, 0xb3, 0x46, 0x32, 0x6b, 0x6e, 0xca,  0x37, 0x82, 0x84, 0x08, 0x07, 0xaa, 0x35, 0xa3,
-0x5c, 0xd9, 0xb2, 0x11, 0x29, 0x27, 0x18, 0x6f,  0x95, 0x20, 0xc1, 0x2c, 0xe9, 0x9a, 0x86, 0x4d,
-0xdf, 0x61, 0xdb, 0xa0, 0xc2, 0x01, 0x7a, 0xaf,  0xe7, 0x9c, 0x8e, 0xbd, 0xc2, 0x00, 0xc1, 0x06,
-0x66, 0x71, 0xdf, 0x4b, 0x4d, 0xb7, 0xae, 0x09,  0xdf, 0xbf, 0x0b, 0x08, 0x1f, 0x4e, 0x22, 0x00,
-0xdd, 0x17, 0xc8, 0x09, 0x1e, 0x62, 0x5e, 0xc2,  0x0e, 0xf4, 0x43, 0x88, 0xa8, 0x6b, 0xdf, 0xce,
-0xbd, 0xbb, 0xf7, 0xef, 0xe0, 0x61, 0x84, 0x00,  0x00, 0x21, 0xf9, 0x04, 0x09, 0x0c, 0x00, 0x1f,
-0x00, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x00,  0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27, 0x8e,
-0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c, 0xeb,  0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d, 0xdf, 0x78,
-0xae, 0xef, 0x7c, 0xef, 0xff, 0xc0, 0x20, 0xcd,  0x60, 0x10, 0x1a, 0x45, 0x06, 0xc2, 0xa2, 0x78,
-0xe4, 0x05, 0x9e, 0x48, 0xe5, 0xb2, 0xa9, 0x0b,  0x4c, 0x26, 0x87, 0xc0, 0x27, 0xb9, 0x98, 0x52,
-0x6f, 0xd6, 0x2b, 0xf6, 0x13, 0x20, 0x0c, 0xbc,  0xdf, 0x9a, 0x95, 0x72, 0xcd, 0x96, 0xcf, 0xcc,
-0x74, 0x89, 0xf8, 0xd4, 0xa6, 0xd6, 0xec, 0x4a,  0xd9, 0x3c, 0x88, 0xcb, 0x91, 0x09, 0x81, 0x81,
-0x44, 0x7e, 0x23, 0x01, 0x16, 0x14, 0x16, 0x16,  0x7a, 0x04, 0x66, 0x85, 0x72, 0x06, 0x09, 0x02,
-0x02, 0x82, 0x82, 0x08, 0x85, 0x56, 0x8a, 0x13,  0x7a, 0x10, 0x8d, 0x8f, 0x5f, 0x91, 0x93, 0x0b,
-0x09, 0x5d, 0x0b, 0x03, 0x02, 0x0a, 0x0a, 0x76,  0x22, 0x6b, 0x57, 0x9c, 0x9e, 0x7f, 0x80, 0x93,
-0xa2, 0xa5, 0x0b, 0xa9, 0xa9, 0x50, 0x64, 0x15,  0x79, 0x05, 0x01, 0x10, 0x9d, 0x9f, 0x47, 0x91,
-0x92, 0xa7, 0x94, 0xb5, 0xb7, 0xb7, 0x5a, 0x01,  0x15, 0x9b, 0x05, 0xbd, 0xbf, 0x10, 0xc1, 0x46,
-0xa1, 0x02, 0x0b, 0xd5, 0xa4, 0x5d, 0xc8, 0xc8,  0x06, 0x01, 0x05, 0x15, 0xce, 0x59, 0xbf, 0x0b,
-0x0c, 0xd2, 0x41, 0xd4, 0xd6, 0xd8, 0xb6, 0xda,  0xb7, 0x0e, 0x93, 0xce, 0x03, 0x08, 0xdd, 0xa9,
-0xe4, 0x90, 0x09, 0x03, 0x04, 0xd5, 0xa3, 0xa5,  0xeb, 0xec, 0x02, 0x03, 0xff, 0xc5, 0x50, 0x35,
-0x68, 0x40, 0xaf, 0x89, 0x16, 0x03, 0xff, 0xf0,  0x75, 0x39, 0xa3, 0x8e, 0x9f, 0x02, 0x07, 0x00,
-0x23, 0x0a, 0x18, 0x48, 0xb0, 0xdc, 0x8e, 0x00,  0x0f, 0x02, 0x20, 0xbc, 0x97, 0x6f, 0x9f, 0xc3,
-0x87, 0x00, 0xeb, 0x14, 0xa3, 0xc8, 0x60, 0x55,  0x10, 0x8c, 0x7d, 0xdd, 0x12, 0x0a, 0x90, 0x62,
-0xea, 0x23, 0xc8, 0x7f, 0x4f, 0x54, 0x9d, 0x1a,  0xe8, 0xa0, 0xe4, 0x11, 0x5f, 0x7d, 0x20, 0x0c,
-0x38, 0xd0, 0xe8, 0xc0, 0x42, 0x7e, 0x11, 0x52,  0x41, 0x84, 0x29, 0x52, 0x80, 0x83, 0xa3, 0x0e,
-0x4c, 0x9e, 0x8c, 0xa6, 0xf3, 0x5e, 0x4f, 0x3e,  0xa9, 0x82, 0x46, 0x15, 0xea, 0x8f, 0x68, 0x80,
-0x53, 0x48, 0x93, 0x52, 0xd1, 0xd8, 0x34, 0x61,  0xa3, 0x96, 0x0a, 0x22, 0x88, 0x0d, 0x4b, 0x35,
-0x62, 0xc4, 0xac, 0x4a, 0xa7, 0x1d, 0x38, 0x10,  0x51, 0x89, 0x99, 0xb0, 0x63, 0xa5, 0x1e, 0xad,
-0x1a, 0x91, 0xe2, 0xd1, 0xb4, 0x42, 0x0c, 0xac,  0xfd, 0xc7, 0x76, 0x27, 0xdb, 0x00, 0x09, 0xc4,
-0x06, 0x8e, 0x3a, 0x37, 0x62, 0xd4, 0x09, 0x03,  0xf1, 0x0a, 0x09, 0xd0, 0xd7, 0xaf, 0xce, 0x3a,
-0x75, 0x12, 0xc0, 0x8d, 0x50, 0xf8, 0x54, 0xd8,  0x0b, 0x98, 0x2d, 0xfe, 0x60, 0xbc, 0x76, 0x6d,
-0x1d, 0x13, 0x01, 0x26, 0x3f, 0xcc, 0x0a, 0xb7,  0x42, 0x04, 0xcd, 0x3e, 0x7c, 0x79, 0xce, 0x75,
-0x22, 0x40, 0x50, 0xb1, 0x62, 0x25, 0x44, 0x38,  0x40, 0x8e, 0x1b, 0xea, 0xd4, 0x10, 0xb2, 0x78,
-0x56, 0x11, 0x1a, 0xae, 0x04, 0x09, 0x6b, 0x6f,  0x2f, 0xd5, 0xad, 0x98, 0x84, 0xeb, 0x08, 0x0d,
-0x2a, 0x1c, 0x18, 0x28, 0x1c, 0x48, 0x80, 0xc4,  0xc5, 0x4b, 0x3c, 0x1f, 0xb8, 0x96, 0x79, 0x2c,
-0x43, 0x89, 0x61, 0x4c, 0x1f, 0x58, 0xc0, 0xfa,  0x75, 0x32, 0xd1, 0x4f, 0x18, 0xa0, 0xc8, 0x9c,
-0xc8, 0xf7, 0x1a, 0x84, 0x08, 0x9d, 0xff, 0x12,  0x02, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x2e, 0x00,
-0x1f, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x4a,  0x00, 0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27,
-0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c,  0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d, 0xdf,
-0x78, 0xae, 0xef, 0x7c, 0xef, 0xff, 0xc0, 0xa0,  0x70, 0xe8, 0x33, 0x18, 0x88, 0x43, 0x03, 0x61,
-0x71, 0x44, 0xee, 0x02, 0x50, 0x91, 0x72, 0xc1,  0x74, 0xe6, 0x02, 0x93, 0xc9, 0x21, 0xf0, 0x99,
-0x56, 0xad, 0x36, 0x6c, 0x56, 0xfb, 0x09, 0x10,  0x06, 0x5f, 0x30, 0x0d, 0x4b, 0xc9, 0x6e, 0xcd,
-0xe8, 0xa6, 0x7a, 0xc6, 0x6e, 0x57, 0xcc, 0xe7,  0x81, 0x7c, 0x1e, 0x0b, 0x58, 0x28, 0x16, 0x16,
-0x77, 0x04, 0x67, 0x7b, 0x7c, 0x30, 0x58, 0x81,  0x13, 0x77, 0x10, 0x84, 0x86, 0x87, 0x2e, 0x6c,
-0x59, 0x8c, 0x8e, 0x90, 0x28, 0x46, 0x98, 0x7b,  0x01, 0x15, 0x76, 0x05, 0x01, 0x10, 0x8d, 0x8f,
-0x90, 0x46, 0x09, 0xa5, 0xa5, 0x08, 0x98, 0x65,  0x15, 0x8b, 0x05, 0x9e, 0xa0, 0x10, 0xa2, 0x7c,
-0x06, 0xa5, 0x54, 0x0b, 0x03, 0x02, 0x0a, 0xb9,  0x0a, 0x06, 0x01, 0x05, 0x15, 0xad, 0x5b, 0xa0,
-0x0b, 0x0c, 0xb1, 0x60, 0xb3, 0x02, 0x02, 0xb5,  0x0b, 0xba, 0xb9, 0x0e, 0xc8, 0xad, 0x03, 0x08,
-0xbd, 0xb9, 0xc4, 0x96, 0x5d, 0x09, 0xc8, 0xca,  0xcb, 0xcc, 0xce, 0x03, 0xde, 0xb7, 0xc8, 0x0a,
-0x0d, 0x0d, 0xd5, 0x87, 0xc7, 0xc8, 0xc9, 0x54,  0xcc, 0xcd, 0xdf, 0xed, 0x02, 0xe3, 0xe4, 0xc5,
-0x49, 0xa5, 0x02, 0xe0, 0xea, 0xeb, 0x0a, 0x0e,  0xdf, 0x50, 0x01, 0xe0, 0xf0, 0x0c, 0x5c, 0xe6,
-0x9c, 0x5b, 0x90, 0x6e, 0xdb, 0x3a, 0x7d, 0xde,  0x02, 0x28, 0x80, 0x72, 0x6b, 0x9c, 0x03, 0x80,
-0xb2, 0xb0, 0x25, 0xcb, 0x86, 0x8f, 0x5d, 0x42,  0x7e, 0xb7, 0x1c, 0x68, 0x74, 0x10, 0xd0, 0x58,
-0x82, 0x01, 0x04, 0xd2, 0xa1, 0xa9, 0x98, 0xaf,  0xde, 0xc5, 0x7e, 0x02, 0xbe, 0x36, 0x72, 0x54,
-0x13, 0xc0, 0x80, 0xb7, 0x90, 0x54, 0xbc, 0xe1,  0x8b, 0x50, 0xb2, 0x5d, 0x3b, 0x95, 0x1d, 0x91,
-0x04, 0x78, 0xe0, 0x12, 0x64, 0xc1, 0x01, 0x33,  0x23, 0x68, 0x34, 0xd9, 0x0e, 0x9e, 0xc6, 0x9c,
-0x44, 0x76, 0xf6, 0x0c, 0xb9, 0xc4, 0x16, 0x50,  0x05, 0x34, 0xa1, 0x46, 0x10, 0xda, 0xed, 0x5b,
-0xae, 0x08, 0x13, 0xc6, 0x21, 0x1d, 0xa2, 0x14,  0xc2, 0x80, 0x03, 0x84, 0x0e, 0xc4, 0xbc, 0x3a,
-0xb5, 0x2c, 0x55, 0x93, 0xb8, 0x22, 0x5c, 0x58,  0x2b, 0x0f, 0x48, 0x4b, 0xaf, 0x20, 0xc3, 0x2e,
-0x38, 0x23, 0xd5, 0x2c, 0x4d, 0x95, 0x0e, 0xa4,  0x56, 0x88, 0xd0, 0x16, 0x88, 0x01, 0xb8, 0x2f,
-0x09, 0x1c, 0x38, 0x00, 0xb4, 0x2c, 0xd4, 0xba,  0x11, 0x24, 0x44, 0x38, 0x40, 0x8c, 0x57, 0xdf,
-0x20, 0x06, 0x06, 0x13, 0xb6, 0x89, 0x38, 0xea,  0x54, 0x09, 0x12, 0x06, 0x3f, 0x26, 0x12, 0x59,
-0xf2, 0xe4, 0x6f, 0x0d, 0xec, 0x4e, 0x6d, 0x50,  0xe1, 0xc0, 0xb8, 0xcd, 0x9c, 0x3d, 0x0f, 0x6e,
-0x97, 0xc9, 0x00, 0xbc, 0x06, 0x83, 0x4f, 0x5b,  0x1b, 0x11, 0x40, 0xb5, 0x64, 0x06, 0x0c, 0x64,
-0xbb, 0x7e, 0x5d, 0x40, 0xf6, 0x6c, 0x03, 0xb8,  0x83, 0x0b, 0x7f, 0x7d, 0x64, 0x37, 0xbc, 0x54,
-0xb3, 0xf9, 0x29, 0x87, 0xd2, 0xba, 0x49, 0x73,  0x13, 0x21, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x09,
-0x0c, 0x00, 0x1f, 0x00, 0x2c, 0x28, 0x00, 0x00,  0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe,
-0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa,  0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74,
-0x6d, 0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef, 0x9f,  0x06, 0xc3, 0x6f, 0x88, 0x32, 0x10, 0x16, 0x42,
-0xe2, 0x2f, 0xc0, 0x14, 0x19, 0x17, 0x48, 0x65,  0x2f, 0x30, 0x99, 0x1c, 0x02, 0x9f, 0x67, 0x54,
-0xaa, 0xa3, 0x56, 0xad, 0x9f, 0x00, 0x61, 0xb0,  0xe5, 0xe2, 0xa8, 0x94, 0xea, 0x55, 0x4c, 0x4e,
-0x9a, 0x6f, 0xe8, 0x74, 0x45, 0x3c, 0x1e, 0xb8,  0xdf, 0xb5, 0x80, 0x85, 0x62, 0xb1, 0xcc, 0x09,
-0x63, 0x77, 0x78, 0x34, 0x54, 0x7d, 0x13, 0x73,  0x10, 0x80, 0x82, 0x83, 0x32, 0x68, 0x55, 0x88,
-0x8a, 0x8c, 0x36, 0x01, 0x15, 0x72, 0x05, 0x01,  0x10, 0x89, 0x8b, 0x92, 0x2f, 0x94, 0x87, 0x05,
-0x97, 0x99, 0x10, 0x9b, 0x9c, 0x23, 0x41, 0xa7,  0x6e, 0x06, 0x01, 0x05, 0x15, 0xa0, 0x57, 0x99,
-0x0b, 0x0c, 0xa4, 0x92, 0x41, 0x09, 0xb6, 0xb6,  0x08, 0xa7, 0x0e, 0x02, 0x02, 0xa0, 0x03, 0x08,
-0xab, 0x0a, 0x0a, 0xb2, 0xa5, 0x25, 0x06, 0xb6,  0x50, 0x0b, 0x03, 0x02, 0xc2, 0xc2, 0xbb, 0x03,
-0xd0, 0xcb, 0xbc, 0x0a, 0x0d, 0x0d, 0xc4, 0xc5,  0x59, 0x09, 0xbc, 0xc9, 0x0b, 0xcd, 0xce, 0xd1,
-0xe0, 0x02, 0xd5, 0xd6, 0xb3, 0x66, 0xc7, 0xdb,  0xdc, 0xde, 0x0a, 0x0e, 0xd1, 0x4c, 0x01, 0xd2,
-0xe3, 0x0c, 0x58, 0x9c, 0xe7, 0xbc, 0x02, 0xc9,  0xea, 0xeb, 0xed, 0x01, 0x0a, 0xef, 0xe2, 0x0d,
-0x0e, 0xe4, 0xd1, 0xb3, 0x25, 0x40, 0x1a, 0x94,  0x7c, 0xfa, 0xa0, 0xb9, 0xf3, 0xe7, 0xa0, 0xa1,
-0x83, 0x79, 0x8c, 0xea, 0x2d, 0xb8, 0x77, 0x30,  0xdf, 0x33, 0x85, 0x4c, 0x96, 0x39, 0x7c, 0x38,
-0x70, 0xdb, 0x36, 0x84, 0xeb, 0x0a, 0x82, 0x8b,  0xb6, 0x11, 0x22, 0x9e, 0x63, 0x03, 0xbe, 0x08,
-0x50, 0x24, 0x03, 0xb2, 0xa1, 0x48, 0x70, 0xe3,  0x1a, 0x9a, 0x34, 0x13, 0xc0, 0x00, 0x34, 0x95,
-0x50, 0xa0, 0xe5, 0x8b, 0xa0, 0x20, 0x82, 0x4b,  0x70, 0xc2, 0x22, 0x4c, 0xa8, 0x36, 0x53, 0xca,
-0x3b, 0x9b, 0x29, 0x29, 0x2a, 0xdb, 0x19, 0xa1,  0xe9, 0xcf, 0x65, 0x3d, 0x2f, 0x48, 0x2d, 0xb7,
-0xc4, 0xce, 0x4d, 0x01, 0x47, 0x94, 0x0d, 0x08,  0x1a, 0xb4, 0x29, 0xcf, 0x8d, 0x0e, 0x7a, 0x46,
-0xa8, 0x10, 0x81, 0xaa, 0x8f, 0xa3, 0x10, 0x06,  0x1c, 0x00, 0x74, 0x20, 0x67, 0x57, 0xaf, 0x62,
-0x9b, 0x4a, 0x88, 0x70, 0x40, 0x96, 0x2a, 0xb3,  0x67, 0x47, 0xa5, 0x4d, 0xc9, 0x76, 0xc1, 0x98,
-0xb8, 0x4d, 0xbb, 0x4a, 0x90, 0x70, 0xe0, 0x00,  0x5e, 0x25, 0x35, 0xf7, 0xde, 0x24, 0x50, 0x78,
-0x2b, 0x5c, 0xaf, 0x11, 0x1a, 0x54, 0x38, 0x50,  0xed, 0xb0, 0x14, 0x03, 0x85, 0x0f, 0x8c, 0x74,
-0x0c, 0xd9, 0xc0, 0xb8, 0x06, 0x85, 0x2b, 0x63,  0x73, 0x92, 0xb9, 0x31, 0x4c, 0xaf, 0x4c, 0x3c,
-0x7f, 0x2e, 0x20, 0x7a, 0x34, 0xe6, 0xd2, 0x9a,  0xa3, 0xa1, 0x72, 0xf2, 0xb9, 0xc1, 0xa9, 0xd1,
-0x22, 0x02, 0xc0, 0xce, 0xcc, 0x80, 0x41, 0xeb,  0x2c, 0xa8, 0x2c, 0x73, 0x31, 0xd0, 0xbb, 0xb8,
-0xf1, 0xcf, 0x45, 0x71, 0x97, 0x58, 0xc8, 0x3c,  0xb8, 0x72, 0x13, 0x21, 0x00, 0x00, 0x21, 0xf9,
-0x04, 0x09, 0x0c, 0x00, 0x1f, 0x00, 0x2c, 0x28,  0x00, 0x00, 0x00, 0x4a, 0x00, 0x28, 0x00, 0x00,
-0x05, 0xfe, 0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e,  0x68, 0xaa, 0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c,
-0xcf, 0x74, 0x6d, 0xdf, 0x78, 0xae, 0xef, 0xb4,  0x61, 0xf0, 0x40, 0x97, 0x81, 0xb0, 0xf8, 0x05,
-0x8f, 0xa3, 0x80, 0x52, 0x34, 0x5c, 0x14, 0x91,  0xc7, 0xc0, 0x64, 0x72, 0x08, 0x7c, 0x9a, 0x4f,
-0x28, 0x4f, 0x3a, 0xa5, 0x7e, 0x02, 0x84, 0x41,  0x56, 0xab, 0x93, 0x52, 0xa6, 0x55, 0xb0, 0xd8,
-0x48, 0xce, 0x99, 0xcf, 0x15, 0x70, 0x78, 0xc0,  0x6e, 0xdf, 0x02, 0x16, 0x8a, 0xc5, 0x12, 0x27,
-0x84, 0xeb, 0x76, 0x36, 0x52, 0x7b, 0x13, 0x71,  0x10, 0x7e, 0x80, 0x81, 0x34, 0x66, 0x53, 0x86,
-0x88, 0x8a, 0x38, 0x01, 0x15, 0x70, 0x05, 0x01,  0x10, 0x87, 0x89, 0x90, 0x31, 0x92, 0x85, 0x05,
-0x95, 0x97, 0x10, 0x99, 0x9a, 0x25, 0x3e, 0xa5,  0x6c, 0x06, 0x01, 0x05, 0x15, 0x9e, 0x55, 0x97,
-0x0b, 0x0c, 0xa2, 0xa3, 0x3e, 0x09, 0xb4, 0xb4,  0x08, 0xa5, 0x0e, 0x02, 0x02, 0x9e, 0x03, 0x08,
-0xa9, 0x0a, 0x0a, 0xb0, 0xa3, 0x27, 0x06, 0xb4,  0x4e, 0x0b, 0x03, 0x02, 0xc0, 0xc0, 0xb9, 0x03,
-0xce, 0xc9, 0xba, 0x0a, 0x0d, 0x0d, 0xc2, 0xc3,  0x23, 0xc5, 0xba, 0xc7, 0x0b, 0xcb, 0xcc, 0xcf,
-0xde, 0x02, 0xd3, 0xd4, 0xb1, 0x76, 0xd8, 0x02,  0xda, 0xdb, 0xdc, 0x0e, 0xcf, 0x4a, 0x01, 0xd0,
-0xe1, 0x0c, 0x56, 0xc3, 0xe5, 0xd9, 0x4e, 0xdc,  0xdd, 0xce, 0x4a, 0x0a, 0xed, 0xe0, 0x0d, 0x0e,
-0xf0, 0xf2, 0xb4, 0x04, 0x40, 0xab, 0x67, 0x4f,  0x81, 0x3a, 0x7c, 0xec, 0x92, 0x39, 0x58, 0xe8,
-0x20, 0x9e, 0xa6, 0x72, 0x0b, 0xcc, 0x11, 0xb4,  0xd7, 0x0c, 0xe1, 0x3e, 0x86, 0x0d, 0x01, 0x66,
-0xcb, 0x56, 0x90, 0x99, 0x40, 0x6f, 0xcf, 0x30,  0x3a, 0x54, 0x54, 0x6c, 0x00, 0x01, 0x89, 0x62,
-0xca, 0x3a, 0x1a, 0xac, 0xe8, 0x2d, 0xdc, 0xc2,  0x91, 0x76, 0x02, 0x18, 0x70, 0x76, 0xd2, 0x89,
-0xb3, 0x82, 0x11, 0x14, 0x44, 0x58, 0xf8, 0xf1,  0xa6, 0xce, 0x09, 0xd3, 0x60, 0x92, 0x69, 0x37,
-0xd3, 0xa4, 0x44, 0x64, 0x38, 0x23, 0x28, 0xe5,  0xe9, 0x4c, 0x59, 0x84, 0x0b, 0x50, 0xc7, 0x45,
-0xa1, 0x43, 0x53, 0x00, 0x11, 0x64, 0x03, 0x80,  0xe5, 0xd4, 0xa9, 0x34, 0x27, 0x46, 0x07, 0x5c,
-0x2b, 0x44, 0x90, 0x1a, 0x84, 0x28, 0x84, 0x01,  0x07, 0xfc, 0x1c, 0xb0, 0xa9, 0xb5, 0x6b, 0x4e,
-0xb7, 0x12, 0x22, 0x1c, 0x80, 0x85, 0x8a, 0x6c,  0xd9, 0x50, 0x67, 0x4d, 0xaa, 0x5d, 0x10, 0x86,
-0x6b, 0xd7, 0xb6, 0x12, 0x24, 0x1c, 0x38, 0x60,  0x57, 0x8b, 0xcc, 0xbc, 0x34, 0x09, 0x0c, 0xce,
-0xfa, 0xd7, 0x6d, 0x83, 0x0a, 0x07, 0xa6, 0x15,  0x26, 0x63, 0x60, 0x31, 0x48, 0xc6, 0x01, 0xba,
-0x1a, 0x08, 0xd7, 0x20, 0x40, 0xe4, 0x06, 0x93,  0xa1, 0x54, 0x3e, 0xe0, 0x8c, 0xf4, 0x3a, 0x76,
-0xec, 0x0c, 0x40, 0x08, 0x9a, 0xaa, 0xb3, 0x35,  0x52, 0xde, 0x16, 0x2f, 0x31, 0xb1, 0xd9, 0x75,
-0x80, 0x07, 0xa1, 0xa1, 0x78, 0x5e, 0x3c, 0x98,  0xdd, 0x09, 0x4b, 0x0f, 0xe2, 0x09, 0xb5, 0xb6,
-0x7b, 0xb0, 0x71, 0x06, 0xf0, 0x64, 0x96, 0x98,  0xfd, 0x1a, 0x85, 0x12, 0xe4, 0xd0, 0x19, 0x70,
-0x1e, 0xde, 0x5c, 0x05, 0x6a, 0x99, 0xa6, 0xaa,  0xab, 0x08, 0x01, 0x00, 0x21, 0xf9, 0x04, 0x09,
-0x0c, 0x00, 0x1f, 0x00, 0x2c, 0x28, 0x00, 0x00,  0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe,
-0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa,  0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74,
-0x6d, 0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef, 0xc3,  0x06, 0xc3, 0x6f, 0x88, 0x32, 0x10, 0x16, 0x42,
-0xe2, 0x2f, 0xc0, 0x14, 0x19, 0x17, 0x48, 0x65,  0x2f, 0x30, 0x99, 0x1c, 0x02, 0x9f, 0x67, 0x54,
-0xaa, 0xa3, 0x56, 0xad, 0x9f, 0x00, 0x61, 0xb0,  0xe5, 0xe2, 0xa8, 0x94, 0xea, 0x55, 0x4c, 0x4e,
-0x9a, 0x6f, 0xe8, 0x74, 0x45, 0x3c, 0x1e, 0xb8,  0xdf, 0xa7, 0x60, 0x33, 0x15, 0xb0, 0x50, 0x2c,
-0x16, 0x73, 0x04, 0x63, 0x77, 0x78, 0x25, 0x06,  0x09, 0x89, 0x09, 0x41, 0x41, 0x26, 0x54, 0x80,
-0x13, 0x73, 0x10, 0x83, 0x85, 0x86, 0x4e, 0x09,  0x02, 0x02, 0x8a, 0x8a, 0x08, 0x77, 0x68, 0x55,
-0x92, 0x94, 0x96, 0x87, 0x98, 0x02, 0x0b, 0x09,  0x50, 0x0b, 0x03, 0x02, 0x0a, 0x0a, 0x58, 0x22,
-0x01, 0x15, 0x72, 0x05, 0x01, 0x10, 0x93, 0x95,  0x78, 0x88, 0x99, 0x99, 0xa9, 0x50, 0xad, 0xad,
-0xaf, 0xb1, 0x91, 0x05, 0xb4, 0xb6, 0x10, 0xb8,  0x66, 0x88, 0x98, 0xab, 0x9a, 0xbd, 0xbf, 0xc0,
-0x06, 0x01, 0x05, 0x15, 0xc4, 0x57, 0xb6, 0x0b,  0x0c, 0xc8, 0x52, 0xba, 0xa6, 0xa6, 0xa8, 0xbe,
-0xcf, 0xad, 0x0e, 0x99, 0xc4, 0x03, 0x08, 0xd2,  0xad, 0xd9, 0xa3, 0x59, 0xa5, 0x0b, 0xcd, 0xe0,
-0xe1, 0x0a, 0xe3, 0x03, 0xf4, 0xcc, 0xac, 0x0d,  0x0d, 0xea, 0x86, 0x88, 0x03, 0x04, 0xa6, 0xa7,
-0xa9, 0xe2, 0x89, 0xab, 0x47, 0x50, 0x00, 0xbe,  0x7c, 0xda, 0x96, 0x18, 0xa0, 0xe7, 0x0f, 0x0a,
-0x99, 0x05, 0x02, 0x07, 0x12, 0xa4, 0x97, 0xe9,  0x20, 0x83, 0x57, 0x5c, 0x02, 0xd8, 0x61, 0xf8,
-0x2f, 0x60, 0x44, 0x07, 0x04, 0x99, 0x50, 0xc4,  0xe7, 0xe0, 0xe2, 0x1b, 0x8d, 0x0b, 0xd5, 0xfb,
-0x09, 0x38, 0xe2, 0x30, 0x5e, 0x04, 0x89, 0xf5,  0x44, 0x0a, 0x70, 0x40, 0xd3, 0x01, 0x46, 0x29,
-0x28, 0x21, 0x0c, 0x38, 0x30, 0xe8, 0x40, 0xcb,  0x70, 0x2f, 0xe5, 0x09, 0x98, 0xa8, 0x71, 0x66,
-0xcd, 0x9b, 0x38, 0x0d, 0xe8, 0xec, 0xd7, 0xb3,  0x4e, 0xab, 0xa0, 0x41, 0xe7, 0x4d, 0xa4, 0x57,
-0xd3, 0x26, 0x9e, 0x00, 0x4a, 0x09, 0x0e, 0x3a,  0x32, 0xe0, 0x69, 0x84, 0xaf, 0xe2, 0xa4, 0x12,
-0x3c, 0x48, 0x13, 0x29, 0x17, 0x03, 0x07, 0x0e,  0x68, 0x5d, 0x30, 0x46, 0xc1, 0x57, 0xb0, 0x6e,
-0x69, 0x0e, 0xad, 0xf7, 0x74, 0x02, 0x3e, 0xb3,  0xdb, 0xd2, 0xd2, 0x53, 0xbb, 0x53, 0xad, 0x5b,
-0xb8, 0x6f, 0xe5, 0x52, 0x74, 0x7b, 0xa1, 0x70,  0x42, 0x22, 0x01, 0xf8, 0xf6, 0xd5, 0xd8, 0x35,
-0x42, 0x00, 0xb0, 0x6f, 0xe5, 0x55, 0xfd, 0x5b,  0x21, 0xc2, 0xe1, 0x21, 0x89, 0xd3, 0xa6, 0x65,
-0xc2, 0xb9, 0xb3, 0xdb, 0xbf, 0x5f, 0x25, 0x44,  0x38, 0x90, 0x2d, 0xda, 0x65, 0xcc, 0x99, 0x99,
-0x5c, 0x39, 0xf1, 0xf8, 0xaf, 0x04, 0x09, 0x69,  0x4f, 0x67, 0x4c, 0x9c, 0x9a, 0xcf, 0xd7, 0x06,
-0x15, 0x0e, 0xe0, 0x93, 0x8d, 0x93, 0xf6, 0x6a,  0x15, 0x01, 0x0e, 0x26, 0x6e, 0x80, 0x77, 0x54,
-0x70, 0xe2, 0xc5, 0x4b, 0x1c, 0x67, 0x52, 0x80,  0xf8, 0x3a, 0xe5, 0x77, 0x5d, 0x44, 0x6b, 0xe0,
-0x2a, 0xc0, 0x03, 0xde, 0x4a, 0xf6, 0xb8, 0xb0,  0xee, 0x2a, 0x4c, 0xf2, 0xe7, 0x2f, 0xb4, 0x83,
-0x1f, 0x5f, 0x23, 0x04, 0x00, 0x21, 0xf9, 0x04,  0x09, 0x0c, 0x00, 0x1f, 0x00, 0x2c, 0x28, 0x00,
-0x00, 0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05,  0xfe, 0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68,
-0xaa, 0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf,  0x74, 0x6d, 0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef,
-0xff, 0x40, 0xa0, 0xc1, 0x10, 0x2c, 0x92, 0x0c,  0x84, 0x05, 0xd1, 0xd8, 0x0b, 0x38, 0x45, 0xc8,
-0x85, 0x92, 0xb9, 0x0b, 0x4c, 0x26, 0x87, 0xc0,  0x27, 0x3a, 0xa5, 0xe2, 0xac, 0x57, 0xec, 0x27,
-0x40, 0x18, 0x74, 0xbd, 0x36, 0x2b, 0xe5, 0x9a,  0x25, 0x9b, 0x97, 0x68, 0xd3, 0xd0, 0xa9, 0x4d,
-0xa9, 0xd7, 0x15, 0x72, 0x79, 0x00, 0x8f, 0x8f,  0x0c, 0x09, 0x81, 0x81, 0x43, 0x7d, 0x23, 0x01,
-0x16, 0x14, 0x16, 0x16, 0x79, 0x04, 0x65, 0x85,  0x7e, 0x80, 0x02, 0x02, 0x82, 0x82, 0x08, 0x85,
-0x56, 0x8a, 0x13, 0x79, 0x10, 0x8d, 0x8f, 0x68,  0x91, 0x02, 0x0b, 0x09, 0x52, 0x0b, 0x03, 0x02,
-0x0a, 0x0a, 0x75, 0x22, 0x6a, 0x57, 0x9b, 0x9d,  0x7e, 0x7f, 0x09, 0x92, 0x92, 0xa4, 0x52, 0xa8,
-0xa8, 0x4f, 0x63, 0x15, 0x78, 0x05, 0x01, 0x10,  0x9c, 0x9e, 0x4c, 0x80, 0xb2, 0xa6, 0x93, 0xb5,
-0xb7, 0xb7, 0x5a, 0x01, 0x15, 0x9a, 0x05, 0xbd,  0xbf, 0x10, 0xc1, 0x46, 0xa0, 0x0b, 0xa1, 0xa3,
-0xb6, 0xc8, 0xb7, 0x06, 0x01, 0x05, 0x15, 0xce,  0x59, 0xbf, 0x0b, 0x0c, 0xd2, 0x41, 0xd4, 0xc6,
-0xd8, 0xd9, 0xa8, 0x0e, 0x92, 0xce, 0x03, 0x08,  0xdc, 0xa8, 0xe3, 0x90, 0x09, 0x03, 0x04, 0xa1,
-0xa2, 0xa4, 0xe9, 0xb7, 0xeb, 0x03, 0xfd, 0xc5,  0xa7, 0x0d, 0x1a, 0xc8, 0xa3, 0xa2, 0xc5, 0x40,
-0x3f, 0x7b, 0x52, 0xcc, 0x2c, 0xd0, 0xb7, 0xcf,  0x9f, 0x43, 0x01, 0x01, 0x05, 0x92, 0xab, 0xf2,
-0x20, 0x80, 0xc1, 0x7a, 0xf7, 0xf2, 0x31, 0x54,  0xe0, 0xc0, 0x1f, 0x9d, 0x62, 0x11, 0x19, 0xa8,
-0x0a, 0x12, 0xe0, 0x01, 0x9f, 0x83, 0x02, 0xdb,  0x92, 0x24, 0xdc, 0xc8, 0xd1, 0x63, 0x80, 0x54,
-0xa6, 0x02, 0x3a, 0x10, 0xc9, 0xc4, 0x17, 0x1f,  0x08, 0x03, 0x0e, 0x34, 0x3a, 0xb0, 0x32, 0x5d,
-0x04, 0x75, 0x2e, 0x9d, 0x98, 0x72, 0x40, 0xd4,  0xc1, 0x48, 0x92, 0xd1, 0x70, 0xd6, 0xdb, 0xb9,
-0x07, 0xd5, 0x4f, 0xa7, 0xea, 0x04, 0x04, 0x1d,  0x5a, 0xf4, 0x28, 0x49, 0x03, 0x4a, 0x0f, 0x36,
-0x2a, 0xe5, 0x34, 0xc2, 0xcf, 0xa7, 0xfc, 0x1c,  0xfa, 0x2b, 0x6a, 0x34, 0x8e, 0x81, 0x03, 0x07,
-0x1c, 0x26, 0x29, 0xa3, 0xc0, 0xeb, 0x57, 0x75,  0x61, 0x1d, 0x46, 0x24, 0x6a, 0xb5, 0xc8, 0xd9,
-0xb4, 0x39, 0xfb, 0xa1, 0x1d, 0x10, 0x20, 0x81,  0x57, 0xbf, 0x4e, 0x89, 0x4a, 0xf5, 0xe7, 0x74,
-0x42, 0xc0, 0xba, 0x45, 0x02, 0xe0, 0xcd, 0x79,  0x00, 0x27, 0x1d, 0x3a, 0x09, 0xda, 0x7a, 0x15,
-0xdc, 0xef, 0x54, 0x84, 0x0b, 0x98, 0x27, 0xfe,  0x50, 0x8c, 0x16, 0x2d, 0x1d, 0x13, 0x2f, 0xdd,
-0x72, 0x24, 0x2b, 0xb9, 0x42, 0x04, 0xcd, 0x3e,  0x7c, 0x79, 0xce, 0x75, 0x22, 0xc0, 0x57, 0xb7,
-0x12, 0x22, 0x1c, 0x18, 0xb7, 0x0d, 0x75, 0x6a,  0x08, 0x59, 0x3c, 0xab, 0x78, 0x29, 0x59, 0x82,
-0x04, 0xb4, 0xb6, 0x91, 0xe6, 0x46, 0x4c, 0xc2,  0x75, 0x84, 0x06, 0x15, 0x0e, 0x04, 0x0c, 0x0e,
-0x24, 0xc0, 0x61, 0xe2, 0x25, 0x9c, 0x07, 0x44,  0xbb, 0x1c, 0x56, 0xf1, 0xc3, 0x30, 0xa4, 0x07,
-0x2c, 0x50, 0xdd, 0xfa, 0x2a, 0xe8, 0x28, 0xb4,  0x5b, 0x64, 0xee, 0x1d, 0x05, 0x21, 0xf2, 0xe5,
-0xcb, 0x87, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x09,  0x2e, 0x00, 0x1f, 0x00, 0x2c, 0x28, 0x00, 0x00,
-0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe,  0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa,
-0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74,  0x6d, 0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef, 0xff,
-0xc0, 0xa0, 0x70, 0x88, 0x32, 0x18, 0x88, 0x43,  0x03, 0x61, 0x71, 0x44, 0xee, 0x02, 0x50, 0x91,
-0x72, 0xc1, 0x74, 0xe6, 0x02, 0x93, 0xc9, 0x21,  0xf0, 0x99, 0x56, 0xad, 0x36, 0x6c, 0x56, 0xfb,
-0x09, 0x10, 0x06, 0x5f, 0x30, 0x0d, 0x4b, 0xc9,  0x6e, 0xcd, 0xe8, 0xa6, 0x7a, 0xc6, 0x6e, 0x57,
-0xcc, 0xe7, 0x81, 0x7c, 0x1e, 0x0b, 0x58, 0x28,  0x16, 0x16, 0x77, 0x04, 0x67, 0x7b, 0x7c, 0x30,
-0x58, 0x81, 0x13, 0x77, 0x10, 0x84, 0x86, 0x87,  0x2e, 0x6c, 0x59, 0x8c, 0x8e, 0x90, 0x45, 0x46,
-0x98, 0x24, 0x01, 0x15, 0x76, 0x05, 0x01, 0x10,  0x8d, 0x8f, 0x90, 0x46, 0x09, 0xa5, 0xa5, 0x08,
-0x99, 0x9b, 0x8b, 0x05, 0x9e, 0xa0, 0x10, 0xa2,  0x7c, 0x06, 0xa5, 0x54, 0x0b, 0x03, 0x02, 0x0a,
-0xb8, 0x0a, 0x06, 0x01, 0x05, 0x15, 0xac, 0x5b,  0xa0, 0x0b, 0x0c, 0xb0, 0x60, 0xb2, 0x02, 0x02,
-0xb4, 0x0b, 0xb9, 0xb8, 0x0e, 0xc7, 0xac, 0x03,  0x08, 0xbc, 0xb8, 0xc3, 0x96, 0x5d, 0x09, 0xc7,
-0xc9, 0xca, 0xcb, 0xcd, 0x03, 0xdd, 0xb6, 0xc7,  0x0a, 0x0d, 0x0d, 0xd4, 0x87, 0xc6, 0xc7, 0xc8,
-0x54, 0xcb, 0xcc, 0xde, 0xec, 0x02, 0xe2, 0xe3,  0xc4, 0x49, 0xa5, 0x02, 0xdf, 0xe9, 0xea, 0x0a,
-0x0e, 0xde, 0x50, 0x01, 0xdf, 0xef, 0x0c, 0x5c,  0x73, 0xcc, 0x2d, 0x40, 0xa7, 0x4d, 0x5d, 0xbe,
-0x6e, 0x01, 0x14, 0x40, 0xb1, 0x25, 0xce, 0xc1,  0xbf, 0x58, 0xd7, 0x90, 0x61, 0xbb, 0xb7, 0x0e,
-0xe1, 0x3e, 0x5b, 0x0e, 0x32, 0x3a, 0x00, 0x58,  0x2c, 0xc1, 0x00, 0x02, 0xe8, 0xd0, 0x50, 0xc4,
-0x47, 0xcf, 0x22, 0x3f, 0x01, 0x1a, 0xc0, 0x37,  0xaa, 0x09, 0x60, 0xa0, 0x1b, 0x48, 0x2a, 0xdd,
-0xee, 0x45, 0x20, 0xc9, 0x8e, 0x5d, 0x4a, 0x8e,  0x48, 0x02, 0x3c, 0x68, 0xf9, 0x91, 0xe0, 0x00,
-0x99, 0x11, 0x32, 0x96, 0x64, 0xf7, 0x2e, 0x23,  0x4e, 0x22, 0x3a, 0x79, 0x82, 0x5c, 0x52, 0xeb,
-0xa7, 0x82, 0x99, 0x4f, 0x23, 0x04, 0xe5, 0xe6,  0x0d, 0x57, 0x84, 0x09, 0xe2, 0x8e, 0x0e, 0x49,
-0x0a, 0x61, 0xc0, 0x01, 0x42, 0x07, 0x60, 0x5a,  0x95, 0x4a, 0x76, 0x6a, 0xc9, 0x5b, 0x11, 0x2e,
-0xa8, 0x8d, 0x07, 0x84, 0x65, 0xd7, 0x8f, 0x60,  0x17, 0x9c, 0x89, 0x5a, 0x76, 0x66, 0x4a, 0x07,
-0x51, 0x2b, 0x44, 0x60, 0x0b, 0xc4, 0xc0, 0x5b,  0x97, 0x04, 0x0e, 0x1c, 0xf8, 0x49, 0xf6, 0x29,
-0xdd, 0x08, 0x12, 0x22, 0x1c, 0x18, 0xb6, 0x8b,  0x6f, 0x10, 0x03, 0x82, 0x07, 0xd7, 0x3c, 0x0c,
-0x55, 0xaa, 0x04, 0x09, 0x82, 0x1d, 0x13, 0x81,  0x1c, 0x59, 0xb2, 0xb7, 0x06, 0x75, 0xa5, 0x36,
-0xa8, 0x70, 0x40, 0x9c, 0xe6, 0xcd, 0x9d, 0x05,  0xb3, 0xc3, 0x64, 0xe4, 0x5d, 0x03, 0xc1, 0xa6,
-0xab, 0x8d, 0x08, 0x90, 0x3a, 0x32, 0x03, 0x06,  0xb1, 0x0d, 0xb8, 0x6e, 0x50, 0x20, 0xb6, 0x6c,
-0x03, 0xb7, 0x83, 0x0b, 0x77, 0x7d, 0x44, 0x37,  0x71, 0x23, 0xb2, 0xcb, 0xec, 0x5b, 0xce, 0x92,
-0x75, 0x13, 0xe7, 0xa7, 0x5b, 0x84, 0x00, 0x00,  0x21, 0xf9, 0x04, 0x09, 0x0a, 0x00, 0x1f, 0x00,
-0x2c, 0x28, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x28,  0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27, 0x8e, 0x64,
-0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c, 0xeb, 0xbe,  0x70, 0x2c, 0xcf, 0x74, 0x6d, 0xdf, 0x78, 0xae,
-0xef, 0x7c, 0xef, 0xe3, 0x06, 0xc3, 0x6f, 0x88,  0x32, 0x10, 0x16, 0x42, 0xe2, 0x2f, 0xc0, 0x14,
-0x19, 0x17, 0x48, 0x65, 0x2f, 0x30, 0x99, 0x1c,  0x02, 0x9f, 0x67, 0x54, 0xaa, 0xa3, 0x56, 0xad,
-0x9f, 0x00, 0x61, 0xb0, 0xe5, 0xe2, 0xa8, 0x94,  0xea, 0x55, 0x4c, 0x4e, 0x9a, 0x6f, 0xe8, 0x74,
-0x45, 0x3c, 0x1e, 0xb8, 0xdf, 0xb5, 0x80, 0x85,  0x62, 0xb1, 0xcc, 0x09, 0x63, 0x77, 0x78, 0x34,
-0x54, 0x7d, 0x13, 0x73, 0x10, 0x80, 0x82, 0x83,  0x32, 0x68, 0x55, 0x88, 0x8a, 0x8c, 0x36, 0x01,
-0x15, 0x72, 0x05, 0x01, 0x10, 0x89, 0x8b, 0x92,  0x2f, 0x94, 0x87, 0x05, 0x97, 0x99, 0x10, 0x9b,
-0x9c, 0x23, 0x41, 0xa7, 0x6e, 0x06, 0x01, 0x05,  0x15, 0xa0, 0x57, 0x99, 0x0b, 0x0c, 0xa4, 0x92,
-0x41, 0x09, 0xb6, 0xb6, 0x08, 0xa7, 0x0e, 0x02,  0x02, 0xa0, 0x03, 0x08, 0xab, 0x0a, 0x0a, 0xb2,
-0xa5, 0x25, 0x06, 0xb6, 0x50, 0x0b, 0x03, 0x02,  0xc2, 0xc2, 0xbb, 0x03, 0xd0, 0xcb, 0xbc, 0x0a,
-0x0d, 0x0d, 0xc4, 0xc5, 0x59, 0x09, 0xbc, 0xc9,  0x0b, 0xcd, 0xce, 0xd1, 0xe0, 0x02, 0xd5, 0xd6,
-0xb3, 0x66, 0xc7, 0xdb, 0xdc, 0xde, 0x0a, 0x0e,  0xd1, 0x4c, 0x01, 0xd2, 0xe3, 0x0c, 0x58, 0x9c,
-0xe7, 0xbc, 0x02, 0xc9, 0xea, 0xeb, 0xed, 0x01,  0x0a, 0xef, 0xe2, 0x0d, 0x0e, 0xe4, 0xd1, 0xb3,
-0x25, 0x40, 0x1a, 0x94, 0x7c, 0xfa, 0xa0, 0xb9,  0xf3, 0xe7, 0xa0, 0xa1, 0x83, 0x79, 0x8c, 0xea,
-0x2d, 0xb8, 0x77, 0x30, 0xdf, 0x33, 0x85, 0x4c,  0x96, 0x39, 0x7c, 0x38, 0x70, 0xdb, 0x36, 0x84,
-0xeb, 0x0a, 0x82, 0x8b, 0xb6, 0x11, 0x22, 0x9e,  0x63, 0x03, 0xc1, 0x08, 0x50, 0x24, 0x03, 0xb2,
-0xa1, 0x48, 0x70, 0xe3, 0x1a, 0x9a, 0x34, 0x13,  0xc0, 0x00, 0x34, 0x95, 0x50, 0xa0, 0xe5, 0x8b,
-0xa0, 0x20, 0x82, 0x4b, 0x70, 0xc2, 0x22, 0x4c,  0xa8, 0x36, 0x53, 0xca, 0x3b, 0x9b, 0x29, 0x29,
-0x2a, 0xdb, 0x19, 0xa1, 0xe9, 0xcf, 0x65, 0x3d,  0x2f, 0x48, 0x2d, 0xb7, 0xc4, 0xce, 0x4d, 0x01,
-0x47, 0x94, 0x0d, 0x08, 0x1a, 0xb4, 0x29, 0xcf,  0x8d, 0x0e, 0x7a, 0x46, 0xa8, 0x10, 0x81, 0xaa,
-0x8f, 0xa3, 0x10, 0x06, 0x1c, 0x00, 0x74, 0x20,  0x67, 0x57, 0xaf, 0x62, 0x9b, 0x4a, 0x88, 0x70,
-0x40, 0x96, 0x2a, 0xb3, 0x4b, 0x0c, 0xa4, 0x4d,  0xc9, 0x76, 0xc1, 0x98, 0xb8, 0x4d, 0xbb, 0x4a,
-0x90, 0x70, 0xe0, 0x00, 0x5e, 0x25, 0x35, 0xf7,  0xde, 0x24, 0x50, 0x78, 0x2b, 0x5c, 0xaf, 0x11,
-0x1a, 0x54, 0x38, 0x50, 0xed, 0xb0, 0x14, 0x03,  0x85, 0x0f, 0x8c, 0x74, 0x0c, 0xd9, 0xc0, 0xb8,
-0x06, 0x01, 0x28, 0x37, 0xb0, 0x4c, 0x04, 0x73,  0x66, 0xcd, 0x30, 0xbd, 0x32, 0x51, 0x35, 0x8e,
-0x49, 0x65, 0x6c, 0x4e, 0x4e, 0x37, 0x8e, 0x86,  0x6a, 0x44, 0x00, 0xa2, 0xae, 0x49, 0x13, 0x09,
-0x2d, 0xbb, 0x30, 0x03, 0x06, 0xaf, 0x6d, 0x8f,  0x16, 0x51, 0xb4, 0x94, 0x81, 0xdf, 0xc8, 0x93,
-0x7f, 0x36, 0x59, 0x1c, 0xf6, 0xc2, 0xe7, 0xa8,  0x74, 0xd7, 0x08, 0x01, 0x00, 0x21, 0xf9, 0x04,
-0x09, 0x0c, 0x00, 0x1f, 0x00, 0x2c, 0x28, 0x00,  0x00, 0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05,
-0xfe, 0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68,  0xaa, 0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf,
-0x74, 0x6d, 0xdf, 0x78, 0xae, 0xef, 0xbc, 0x6a,  0x18, 0xbd, 0x20, 0xcb, 0x40, 0x58, 0x00, 0x85,
-0xc8, 0x4f, 0x60, 0x29, 0x22, 0x2e, 0x8c, 0xc9,  0x60, 0x60, 0x32, 0x39, 0x04, 0x3e, 0x4e, 0x68,
-0x74, 0x37, 0xa5, 0x56, 0x95, 0x84, 0x81, 0x76,  0x9b, 0x9b, 0x52, 0xa8, 0xd6, 0x40, 0x78, 0x4c,
-0xbe, 0x99, 0xcf, 0x15, 0x75, 0x78, 0x70, 0x6c,  0xbb, 0x2d, 0x14, 0x8b, 0x25, 0x4e, 0x08, 0xd7,
-0xed, 0x36, 0x53, 0x7a, 0x13, 0x71, 0x10, 0x7d,  0x7f, 0x80, 0x34, 0x66, 0x54, 0x85, 0x87, 0x89,
-0x6e, 0x15, 0x70, 0x05, 0x01, 0x10, 0x86, 0x88,  0x8f, 0x31, 0x01, 0x15, 0x84, 0x05, 0x93, 0x95,
-0x10, 0x97, 0x98, 0x25, 0x3f, 0xa4, 0x75, 0x06,  0x01, 0x05, 0x15, 0x9d, 0x56, 0x95, 0x0b, 0x0c,
-0xa1, 0xa2, 0x3f, 0x09, 0xb3, 0xb3, 0x08, 0xa4,  0x0e, 0x02, 0x02, 0x9d, 0x03, 0x08, 0xa8, 0x0a,
-0x0a, 0xaf, 0xa2, 0x26, 0x06, 0xb3, 0x4f, 0x0b,  0x03, 0x02, 0xbf, 0xbf, 0xb8, 0x03, 0xcd, 0xc8,
-0xb9, 0x0a, 0x0d, 0x0d, 0xc1, 0xc2, 0x4d, 0x09,  0xb9, 0xc6, 0x0b, 0xca, 0xcb, 0xce, 0xdd, 0x02,
-0xd2, 0xd3, 0xb0, 0x76, 0xc4, 0xd8, 0xd9, 0xdb,  0x0a, 0x0e, 0xce, 0x4b, 0x01, 0xcf, 0xe0, 0x0c,
-0x57, 0xb1, 0xd7, 0xb9, 0x02, 0xc6, 0xe7, 0xe8,  0xea, 0x01, 0x0a, 0xec, 0xdf, 0x0d, 0x0e, 0xef,
-0xf1, 0xd7, 0x9e, 0x3d, 0xb1, 0x77, 0xaf, 0xd9,  0xba, 0x7d, 0x0e, 0x12, 0x3a, 0x80, 0xf7, 0x88,
-0x1c, 0x3d, 0x7a, 0x03, 0xed, 0x31, 0x33, 0xb8,  0x04, 0x99, 0xc2, 0x85, 0xf1, 0xb0, 0x61, 0x23,
-0x88, 0x4e, 0x40, 0xb7, 0x6e, 0x17, 0x19, 0x02,  0x22, 0x36, 0x80, 0x00, 0x44, 0x31, 0x1c, 0xc3,
-0x13, 0x7a, 0xfc, 0x08, 0x2e, 0xa1, 0xc8, 0x36,  0x01, 0x0c, 0x34, 0x33, 0xf9, 0xa4, 0x99, 0xbd,
-0x08, 0x0a, 0x22, 0xa8, 0xec, 0xf6, 0x2b, 0xc2,  0x04, 0x69, 0x2f, 0xb7, 0xb0, 0x93, 0x59, 0x12,
-0xe2, 0xb1, 0x9b, 0x11, 0x92, 0xee, 0x44, 0x96,  0xf3, 0x82, 0x53, 0x71, 0x48, 0x86, 0xce, 0x14,
-0x50, 0xe4, 0xd8, 0x80, 0x9e, 0x3d, 0x93, 0xe2,  0xbc, 0xe8, 0x20, 0x67, 0x84, 0x0a, 0x11, 0xa0,
-0x0a, 0x19, 0x0a, 0x61, 0xc0, 0x81, 0x3e, 0x07,  0x6a, 0x66, 0xd5, 0xea, 0x35, 0xa9, 0x84, 0x08,
-0x07, 0x5e, 0x9d, 0x12, 0x1b, 0xd5, 0x40, 0xd9,  0x92, 0x68, 0x17, 0x84, 0x69, 0x9b, 0x34, 0xab,
-0x04, 0x09, 0x07, 0x0e, 0xd0, 0x15, 0x6a, 0xb7,  0x1b, 0xda, 0x03, 0x57, 0xd9, 0x6a, 0x8d, 0xd0,
-0xa0, 0xc2, 0x01, 0x69, 0x83, 0xc9, 0x18, 0x08,  0xfc, 0xd1, 0x66, 0x84, 0x00, 0x5a, 0x0d, 0x80,
-0x6b, 0x10, 0xe0, 0x71, 0x83, 0xc8, 0x51, 0x26,  0x23, 0x36, 0xdb, 0xed, 0xe0, 0xba, 0x53, 0xe0,
-0x96, 0x40, 0xae, 0x36, 0x82, 0x68, 0x33, 0xca,  0x4c, 0x4e, 0x04, 0x00, 0xaa, 0x1a, 0x74, 0x92,
-0xce, 0x94, 0x03, 0xaf, 0x4b, 0x31, 0xfb, 0x48,  0x50, 0x51, 0xb8, 0x03, 0x0b, 0x67, 0xf0, 0x2e,
-0xa6, 0x6c, 0xd6, 0x28, 0x96, 0x10, 0x5f, 0xce,  0x60, 0xf3, 0x6f, 0xe4, 0xbc, 0x0f, 0x96, 0xb2,
-0x7d, 0x23, 0x04, 0x00, 0x21, 0xf9, 0x04, 0x09,  0x0c, 0x00, 0x1f, 0x00, 0x2c, 0x28, 0x00, 0x00,
-0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe,  0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa,
-0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74,  0x6d, 0xdf, 0x9f, 0x61, 0xe0, 0xbc, 0x6d, 0x10,
-0x8b, 0x5d, 0x6f, 0xb8, 0x0a, 0x18, 0x45, 0xbf,  0x45, 0x90, 0xc8, 0x34, 0x05, 0x26, 0x93, 0x43,
-0x20, 0x07, 0x5c, 0x36, 0xaf, 0x4f, 0x68, 0xf4,  0x13, 0x20, 0x0c, 0xac, 0x57, 0xe6, 0x93, 0x02,
-0x95, 0x76, 0xbf, 0xc2, 0x30, 0x71, 0x4c, 0xae,  0x74, 0xbd, 0x83, 0xb4, 0x9a, 0xa5, 0x3b, 0xa6,
-0x02, 0x16, 0x8a, 0xc5, 0xe2, 0x26, 0x78, 0xe5,  0x73, 0x2a, 0x06, 0x09, 0x84, 0x09, 0x3a, 0x3a,
-0x4e, 0x13, 0x7b, 0x13, 0x6e, 0x10, 0x7e, 0x80,  0x81, 0x27, 0x83, 0x02, 0x02, 0x85, 0x85, 0x08,
-0x72, 0x63, 0x50, 0x8d, 0x8f, 0x91, 0x82, 0x09,  0x94, 0x0b, 0x09, 0x4a, 0x0b, 0x03, 0x02, 0x0a,
-0x0a, 0x53, 0x22, 0x01, 0x15, 0x6d, 0x05, 0x01,  0x10, 0x8e, 0x90, 0x9e, 0x48, 0xa0, 0x94, 0x02,
-0xa4, 0x4a, 0xa8, 0xa8, 0xaa, 0xac, 0x8c, 0x05,  0xaf, 0xb1, 0x10, 0xb3, 0x9e, 0x83, 0xa0, 0xa6,
-0x95, 0xb9, 0xbb, 0xbc, 0x06, 0x01, 0x05, 0x15,  0xc0, 0x52, 0xb1, 0x0b, 0x0c, 0xc4, 0x81, 0x93,
-0xb8, 0xb8, 0xa3, 0xba, 0xcb, 0xa8, 0x0e, 0x94,  0xc0, 0x03, 0x08, 0xce, 0xa8, 0xd5, 0xb4, 0x25,
-0xd8, 0x0b, 0xc9, 0xdc, 0xdd, 0x0a, 0xdf, 0x03,  0xf0, 0xc8, 0xa7, 0x0d, 0x0d, 0xe6, 0xe7, 0x39,
-0x09, 0x03, 0x04, 0xb8, 0xa2, 0xa4, 0xed, 0xde,  0xf1, 0x02, 0x0a, 0xa0, 0x57, 0xcf, 0x1a, 0x16,
-0x03, 0xf0, 0xf6, 0x29, 0xf9, 0xb2, 0xe0, 0x1f,  0xc0, 0x80, 0xf0, 0x28, 0x11, 0x64, 0xa0, 0x2a,
-0x52, 0x80, 0x38, 0x09, 0xf9, 0xf9, 0x73, 0xe8,  0x20, 0xa0, 0x91, 0x88, 0xf4, 0x1c, 0x50, 0xa4,
-0x75, 0x11, 0xa1, 0x3e, 0x01, 0x55, 0xd2, 0x4a,  0xb5, 0x8b, 0xf0, 0x30, 0xde, 0x47, 0x01, 0x0e,
-0x62, 0x3a, 0xa8, 0x18, 0xa8, 0x24, 0x84, 0x01,  0x07, 0xfc, 0x1c, 0x58, 0xb8, 0xd2, 0x9b, 0x00,
-0x88, 0x17, 0x61, 0xca, 0xa4, 0x59, 0xd3, 0xc0,  0x4d, 0x7d, 0x3a, 0xe1, 0xa0, 0x62, 0xa9, 0x80,
-0xe9, 0x3b, 0x88, 0xf0, 0x64, 0xce, 0x3c, 0x17,  0xc0, 0x68, 0x40, 0x3f, 0x40, 0x06, 0x2c, 0x8d,
-0xc0, 0xd5, 0xdb, 0xd3, 0x80, 0x04, 0x63, 0x12,  0x8d, 0x64, 0xe0, 0xc0, 0x81, 0xab, 0x0b, 0xbc,
-0x34, 0xe5, 0xca, 0x34, 0x42, 0xcc, 0x9f, 0xf1,  0x96, 0x4e, 0xa0, 0x37, 0xf6, 0x9a, 0x59, 0x78,
-0x67, 0x71, 0x9e, 0x5d, 0xdb, 0x96, 0xeb, 0xdb,  0x88, 0x4d, 0x2f, 0x08, 0x36, 0xa8, 0x26, 0x40,
-0x5e, 0xbd, 0x17, 0xb5, 0x46, 0x08, 0xd0, 0x95,  0xad, 0x3b, 0xa9, 0x6b, 0x2b, 0x44, 0x20, 0x1c,
-0xc6, 0xb0, 0x59, 0xb3, 0x46, 0x32, 0x6b, 0x6e,  0xca, 0x37, 0x82, 0x84, 0x08, 0x07, 0xaa, 0x35,
-0xa3, 0x5c, 0xd9, 0xb2, 0x11, 0x29, 0x27, 0x18,  0x6f, 0x95, 0x20, 0xc1, 0x2c, 0xe9, 0x9a, 0x86,
-0x4d, 0xdf, 0x61, 0xdb, 0xa0, 0xc2, 0x01, 0x7a,  0xaf, 0xe7, 0x9c, 0x8e, 0xbd, 0xc2, 0x00, 0xc1,
-0x06, 0x66, 0x71, 0xdf, 0x4b, 0x4d, 0xb7, 0xae,  0x09, 0xdf, 0xbf, 0x0b, 0x08, 0x1f, 0x4e, 0x22,
-0x00, 0xdd, 0x17, 0xc8, 0x09, 0x1e, 0x62, 0x5e,  0xc2, 0x0e, 0xf4, 0x43, 0x88, 0xa8, 0x6b, 0xdf,
-0xce, 0xbd, 0xbb, 0xf7, 0xef, 0xe0, 0x61, 0x84,  0x00, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x0c, 0x00,
-0x1f, 0x00, 0x2c, 0x28, 0x00, 0x00, 0x00, 0x4a,  0x00, 0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27,
-0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c,  0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d, 0xdf,
-0x78, 0xae, 0xef, 0x7c, 0xef, 0xff, 0xc0, 0x20,  0xcd, 0x60, 0x10, 0x1a, 0x45, 0x06, 0xc2, 0xa2,
-0x78, 0xe4, 0x05, 0x9e, 0x48, 0xe5, 0xb2, 0xa9,  0x0b, 0x4c, 0x26, 0x87, 0xc0, 0x27, 0xb9, 0x98,
-0x52, 0x6f, 0xd6, 0x2b, 0xf6, 0x13, 0x20, 0x0c,  0xbc, 0xdf, 0x9a, 0x95, 0x72, 0xcd, 0x96, 0xcf,
-0xcc, 0x74, 0x89, 0xf8, 0xd4, 0xa6, 0xd6, 0xec,  0x4a, 0xd9, 0x3c, 0x88, 0xcb, 0x91, 0x09, 0x81,
-0x81, 0x44, 0x7e, 0x23, 0x01, 0x16, 0x14, 0x16,  0x16, 0x7a, 0x04, 0x66, 0x85, 0x72, 0x06, 0x09,
-0x02, 0x02, 0x82, 0x82, 0x08, 0x85, 0x56, 0x8a,  0x13, 0x7a, 0x10, 0x8d, 0x8f, 0x5f, 0x91, 0x93,
-0x0b, 0x09, 0x5d, 0x0b, 0x03, 0x02, 0x0a, 0x0a,  0x76, 0x22, 0x6b, 0x57, 0x9c, 0x9e, 0x7f, 0x80,
-0x93, 0xa2, 0xa5, 0x0b, 0xa9, 0xa9, 0x50, 0x64,  0x15, 0x79, 0x05, 0x01, 0x10, 0x9d, 0x9f, 0x47,
-0x91, 0x92, 0xa7, 0x94, 0xb5, 0xb7, 0xb7, 0x5a,  0x01, 0x15, 0x9b, 0x05, 0xbd, 0xbf, 0x10, 0xc1,
-0x46, 0xa1, 0x02, 0x0b, 0xd5, 0xa4, 0x5d, 0xc8,  0xc8, 0x06, 0x01, 0x05, 0x15, 0xce, 0x59, 0xbf,
-0x0b, 0x0c, 0xd2, 0x41, 0xd4, 0xd6, 0xd8, 0xb6,  0xda, 0xb7, 0x0e, 0x93, 0xce, 0x03, 0x08, 0xdd,
-0xa9, 0xe4, 0x90, 0x09, 0x03, 0x04, 0xd5, 0xa3,  0xa5, 0xeb, 0xec, 0x02, 0x03, 0xff, 0xc5, 0x50,
-0x35, 0x68, 0x40, 0xaf, 0x89, 0x16, 0x03, 0xff,  0xf0, 0x75, 0x39, 0xa3, 0x8e, 0x9f, 0x02, 0x07,
-0x00, 0x23, 0x0a, 0x18, 0x48, 0xb0, 0xdc, 0x8e,  0x00, 0x0f, 0x02, 0x20, 0xbc, 0x97, 0x6f, 0x9f,
-0xc3, 0x87, 0x00, 0xeb, 0x14, 0xa3, 0xc8, 0x60,  0x55, 0x10, 0x8c, 0x7d, 0xdd, 0x12, 0x0a, 0x90,
-0x62, 0xea, 0x23, 0xc8, 0x7f, 0x4f, 0x54, 0x9d,  0x1a, 0xe8, 0xa0, 0xe4, 0x11, 0x5f, 0x7d, 0x20,
-0x0c, 0x38, 0xd0, 0xe8, 0xc0, 0x42, 0x7e, 0x11,  0x52, 0x41, 0x84, 0x29, 0x52, 0x80, 0x83, 0xa3,
-0x0e, 0x4c, 0x9e, 0x8c, 0xa6, 0xf3, 0x5e, 0x4f,  0x3e, 0xa9, 0x82, 0x46, 0x15, 0xea, 0x8f, 0x68,
-0x80, 0x53, 0x48, 0x93, 0x52, 0xd1, 0xd8, 0x34,  0x61, 0xa3, 0x96, 0x0a, 0x22, 0x88, 0x0d, 0x4b,
-0x35, 0x62, 0xc4, 0xac, 0x4a, 0xa7, 0x1d, 0x38,  0x10, 0x51, 0x89, 0x99, 0xb0, 0x63, 0xa5, 0x1e,
-0xad, 0x1a, 0x91, 0xe2, 0xd1, 0xb4, 0x42, 0x0c,  0xac, 0xfd, 0xc7, 0x76, 0x27, 0xdb, 0x00, 0x09,
-0xc4, 0x06, 0x8e, 0x3a, 0x37, 0x62, 0xd4, 0x09,  0x03, 0xf1, 0x0a, 0x09, 0xd0, 0xd7, 0xaf, 0xce,
-0x3a, 0x75, 0x12, 0xc0, 0x8d, 0x50, 0xf8, 0x54,  0xd8, 0x0b, 0x98, 0x2d, 0xfe, 0x60, 0xbc, 0x76,
-0x6d, 0x1d, 0x13, 0x01, 0x26, 0x3f, 0xcc, 0x0a,  0xb7, 0x42, 0x04, 0xcd, 0x3e, 0x7c, 0x79, 0xce,
-0x75, 0x22, 0x40, 0x50, 0xb1, 0x62, 0x25, 0x44,  0x38, 0x40, 0x8e, 0x1b, 0xea, 0xd4, 0x10, 0xb2,
-0x78, 0x56, 0x11, 0x1a, 0xae, 0x04, 0x09, 0x6b,  0x6f, 0x2f, 0xd5, 0xad, 0x98, 0x84, 0xeb, 0x08,
-0x0d, 0x2a, 0x1c, 0x18, 0x28, 0x1c, 0x48, 0x80,  0xc4, 0xc5, 0x4b, 0x3c, 0x1f, 0xb8, 0x96, 0x79,
-0x2c, 0x43, 0x89, 0x61, 0x4c, 0x1f, 0x58, 0xc0,  0xfa, 0x75, 0x32, 0xd1, 0x4f, 0x18, 0xa0, 0xc8,
-0x9c, 0xc8, 0xf7, 0x1a, 0x84, 0x08, 0x9d, 0xff,  0x12, 0x02, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x2e,
-0x00, 0x1f, 0x00, 0x2c, 0x28, 0x00, 0x00, 0x00,  0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0,
-0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae,  0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d,
-0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef, 0xff, 0xc0,  0xa0, 0x70, 0xe8, 0x33, 0x18, 0x88, 0x43, 0x03,
-0x61, 0x71, 0x44, 0xee, 0x02, 0x50, 0x91, 0x72,  0xc1, 0x74, 0xe6, 0x02, 0x93, 0xc9, 0x21, 0xf0,
-0x99, 0x56, 0xad, 0x36, 0x6c, 0x56, 0xfb, 0x09,  0x10, 0x06, 0x5f, 0x30, 0x0d, 0x4b, 0xc9, 0x6e,
-0xcd, 0xe8, 0xa6, 0x7a, 0xc6, 0x6e, 0x57, 0xcc,  0xe7, 0x81, 0x7c, 0x1e, 0x0b, 0x58, 0x28, 0x16,
-0x16, 0x77, 0x04, 0x67, 0x7b, 0x7c, 0x30, 0x58,  0x81, 0x13, 0x77, 0x10, 0x84, 0x86, 0x87, 0x2e,
-0x6c, 0x59, 0x8c, 0x8e, 0x90, 0x28, 0x46, 0x98,  0x7b, 0x01, 0x15, 0x76, 0x05, 0x01, 0x10, 0x8d,
-0x8f, 0x90, 0x46, 0x09, 0xa5, 0xa5, 0x08, 0x98,  0x65, 0x15, 0x8b, 0x05, 0x9e, 0xa0, 0x10, 0xa2,
-0x7c, 0x06, 0xa5, 0x54, 0x0b, 0x03, 0x02, 0x0a,  0xb9, 0x0a, 0x06, 0x01, 0x05, 0x15, 0xad, 0x5b,
-0xa0, 0x0b, 0x0c, 0xb1, 0x60, 0xb3, 0x02, 0x02,  0xb5, 0x0b, 0xba, 0xb9, 0x0e, 0xc8, 0xad, 0x03,
-0x08, 0xbd, 0xb9, 0xc4, 0x96, 0x5d, 0x09, 0xc8,  0xca, 0xcb, 0xcc, 0xce, 0x03, 0xde, 0xb7, 0xc8,
-0x0a, 0x0d, 0x0d, 0xd5, 0x87, 0xc7, 0xc8, 0xc9,  0x54, 0xcc, 0xcd, 0xdf, 0xed, 0x02, 0xe3, 0xe4,
-0xc5, 0x49, 0xa5, 0x02, 0xe0, 0xea, 0xeb, 0x0a,  0x0e, 0xdf, 0x50, 0x01, 0xe0, 0xf0, 0x0c, 0x5c,
-0xe6, 0x9c, 0x5b, 0x90, 0x6e, 0xdb, 0x3a, 0x7d,  0xde, 0x02, 0x28, 0x80, 0x72, 0x6b, 0x9c, 0x03,
-0x80, 0xb2, 0xb0, 0x25, 0xcb, 0x86, 0x8f, 0x5d,  0x42, 0x7e, 0xb7, 0x1c, 0x68, 0x74, 0x10, 0xd0,
-0x58, 0x82, 0x01, 0x04, 0xd2, 0xa1, 0xa9, 0x98,  0xaf, 0xde, 0xc5, 0x7e, 0x02, 0xbe, 0x36, 0x72,
-0x54, 0x13, 0xc0, 0x80, 0xb7, 0x90, 0x54, 0xbc,  0xe1, 0x8b, 0x50, 0xb2, 0x5d, 0x3b, 0x95, 0x1d,
-0x91, 0x04, 0x78, 0xe0, 0x12, 0x64, 0xc1, 0x01,  0x33, 0x23, 0x68, 0x34, 0xd9, 0x0e, 0x9e, 0xc6,
-0x9c, 0x44, 0x76, 0xf6, 0x0c, 0xb9, 0xc4, 0x16,  0x50, 0x05, 0x34, 0xa1, 0x46, 0x10, 0xda, 0xed,
-0x5b, 0xae, 0x08, 0x13, 0xc6, 0x21, 0x1d, 0xa2,  0x14, 0xc2, 0x80, 0x03, 0x84, 0x0e, 0xc4, 0xbc,
-0x3a, 0xb5, 0x2c, 0x55, 0x93, 0xb8, 0x22, 0x5c,  0x58, 0x2b, 0x0f, 0x48, 0x4b, 0xaf, 0x20, 0xc3,
-0x2e, 0x38, 0x23, 0xd5, 0x2c, 0x4d, 0x95, 0x0e,  0xa4, 0x56, 0x88, 0xd0, 0x16, 0x88, 0x01, 0xb8,
-0x2f, 0x09, 0x1c, 0x38, 0x00, 0xb4, 0x2c, 0xd4,  0xba, 0x11, 0x24, 0x44, 0x38, 0x40, 0x8c, 0x57,
-0xdf, 0x20, 0x06, 0x06, 0x13, 0xb6, 0x89, 0x38,  0xea, 0x54, 0x09, 0x12, 0x06, 0x3f, 0x26, 0x12,
-0x59, 0xf2, 0xe4, 0x6f, 0x0d, 0xec, 0x4e, 0x6d,  0x50, 0xe1, 0xc0, 0xb8, 0xcd, 0x9c, 0x3d, 0x0f,
-0x6e, 0x97, 0xc9, 0x00, 0xbc, 0x06, 0x83, 0x4f,  0x5b, 0x1b, 0x11, 0x40, 0xb5, 0x64, 0x06, 0x0c,
-0x64, 0xbb, 0x7e, 0x5d, 0x40, 0xf6, 0x6c, 0x03,  0xb8, 0x83, 0x0b, 0x7f, 0x7d, 0x64, 0x37, 0xbc,
-0x54, 0xb3, 0xf9, 0x29, 0x87, 0xd2, 0xba, 0x49,  0x73, 0x13, 0x21, 0x00, 0x00, 0x21, 0xf9, 0x04,
-0x09, 0x12, 0x00, 0x1f, 0x00, 0x2c, 0x28, 0x00,  0x00, 0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05,
-0xfe, 0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68,  0xaa, 0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf,
-0x74, 0x6d, 0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef,  0xff, 0xc0, 0xa0, 0x70, 0x48, 0x2c, 0x1a, 0x8f,
-0xb7, 0x80, 0x48, 0x89, 0xe4, 0x05, 0x06, 0x81,  0x80, 0x80, 0xd9, 0xc4, 0x3d, 0xa1, 0x04, 0xc2,
-0xb4, 0x6a, 0x1d, 0x60, 0xb5, 0x54, 0x2e, 0xed,  0x1a, 0xc8, 0x6e, 0xc5, 0xb6, 0x67, 0x19, 0x8c,
-0x4e, 0x7b, 0xd7, 0xe1, 0xb6, 0x4c, 0x4d, 0x28,  0xc4, 0xe5, 0x23, 0x83, 0x7e, 0x7f, 0xa2, 0xdb,
-0xf1, 0x25, 0x7a, 0x09, 0x83, 0x83, 0x08, 0x7c,  0x23, 0x6a, 0x05, 0x07, 0x77, 0x6d, 0x06, 0x83,
-0x0b, 0x90, 0x03, 0x02, 0x0a, 0x94, 0x53, 0x4a,  0x51, 0x01, 0x07, 0x03, 0x08, 0x51, 0x80, 0x1f,
-0x8e, 0x02, 0x02, 0x90, 0x90, 0x94, 0x95, 0xa1,  0x51, 0x02, 0x5e, 0xaa, 0x67, 0x8d, 0x09, 0xa1,
-0xa3, 0xa4, 0xa5, 0x0a, 0xa1, 0xa1, 0xaa, 0xab,  0xac, 0x5c, 0xa0, 0xb4, 0xa3, 0xb2, 0xa6, 0xa9,
-0xb6, 0x5e, 0xa1, 0x0c, 0x06, 0x62, 0x8e, 0xae,  0x92, 0xa2, 0x0b, 0xbd, 0x94, 0x0e, 0xb5, 0xb6,
-0x98, 0x03, 0x0d, 0x0c, 0xc5, 0xae, 0xa2, 0xc9,  0xca, 0xcb, 0xcd, 0xbf, 0x5e, 0x0f, 0x51, 0x0a,
-0x52, 0x0c, 0x8c, 0x44, 0xba, 0x0b, 0xaf, 0xcb,  0xcc, 0xce, 0xdc, 0x98, 0x01, 0x0e, 0x0e, 0xe2,
-0x42, 0x8e, 0x03, 0x5a, 0x91, 0xd8, 0xd9, 0xb4,  0xaa, 0x0f, 0xdd, 0x51, 0xed, 0xef, 0x40, 0x01,
-0x06, 0x5e, 0xe6, 0x2d, 0xf0, 0xb2, 0x2c, 0x82,  0x02, 0x6d, 0xdb, 0xf2, 0x41, 0x80, 0x30, 0x80,
-0x1f, 0x92, 0x00, 0x0f, 0x00, 0xca, 0xbb, 0x36,  0xa0, 0x60, 0x84, 0x76, 0xe9, 0x80, 0x39, 0x3c,
-0x02, 0x51, 0xa2, 0x16, 0x02, 0x91, 0x2a, 0x2a,  0x30, 0x38, 0x32, 0xc2, 0x45, 0x5a, 0xdb, 0x83,
-0xbc, 0x34, 0x58, 0xd9, 0xcf, 0x47, 0x47, 0x86,  0x07, 0xb2, 0x1c, 0x88, 0x44, 0xc9, 0xa4, 0x4d,
-0x93, 0x18, 0xd3, 0x51, 0x6a, 0x40, 0xac, 0xc9,  0x3f, 0x86, 0xf2, 0x64, 0x2e, 0x20, 0x50, 0xf1,
-0xa6, 0xcd, 0x83, 0xed, 0xda, 0x95, 0xec, 0x94,  0x0b, 0x68, 0x40, 0x02, 0x07, 0x34, 0x95, 0x34,
-0x48, 0xd5, 0xa6, 0x84, 0x08, 0x07, 0x86, 0xf5,  0x44, 0x63, 0x20, 0xaa, 0x26, 0x60, 0x53, 0x4d,
-0xd6, 0x8c, 0x20, 0x41, 0x42, 0xd4, 0xad, 0x8d,  0xbc, 0x46, 0x05, 0xd6, 0xc0, 0xa8, 0xc9, 0x95,
-0x0d, 0x02, 0xf0, 0xf4, 0xd4, 0x55, 0xed, 0x57,  0x2f, 0x7b, 0xf4, 0x44, 0x81, 0xbb, 0x68, 0x2e,
-0xa0, 0x4c, 0x76, 0xa3, 0x32, 0x60, 0xb0, 0x72,  0xab, 0xdc, 0x95, 0x76, 0xfc, 0xca, 0x31, 0x30,
-0xb8, 0xb1, 0x63, 0xb8, 0x8a, 0x0f, 0xf3, 0xd4,  0xf3, 0x77, 0xdd, 0xba, 0xbc, 0x94, 0xf3, 0x1c,
-0x22, 0x11, 0x02, 0x00, 0x21, 0xf9, 0x04, 0x09,  0x12, 0x00, 0x1f, 0x00, 0x2c, 0x28, 0x00, 0x00,
-0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe,  0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa,
-0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74,  0x6d, 0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef, 0xff,
-0xc0, 0xa0, 0x70, 0x58, 0x0b, 0x88, 0x8c, 0x44,  0x60, 0x60, 0x10, 0x08, 0x08, 0x90, 0x49, 0xde,
-0x92, 0x49, 0x20, 0x3c, 0xa3, 0xd2, 0x01, 0xd5,  0x0a, 0xc5, 0xe2, 0xa6, 0x81, 0xea, 0xd5, 0xab,
-0x5b, 0x86, 0xb9, 0xe4, 0xb2, 0xf6, 0xdc, 0x4d,  0xdb, 0xcc, 0x84, 0x42, 0xdb, 0x4d, 0x83, 0xcb,
-0xe9, 0x5f, 0x66, 0xe1, 0x30, 0xc7, 0xa3, 0x0c,  0x80, 0x81, 0x4d, 0x83, 0x07, 0x04, 0x08, 0x4d,
-0x7e, 0x2a, 0x80, 0x09, 0x8c, 0x8c, 0x08, 0x81,  0x55, 0x91, 0x55, 0x7d, 0x89, 0x06, 0x8c, 0x0b,
-0x0b, 0x09, 0x03, 0x02, 0x0b, 0x0a, 0x0a, 0x4f,  0x92, 0x93, 0x89, 0x26, 0x96, 0x02, 0x9c, 0x98,
-0xa8, 0x9e, 0xa6, 0x02, 0x91, 0x5a, 0x4c, 0xa3,  0x23, 0xa5, 0xa7, 0x09, 0x99, 0x09, 0x9e, 0xaa,
-0xa6, 0x04, 0xae, 0xaf, 0xb0, 0xb2, 0xa6, 0xa8,  0x98, 0xb7, 0x9f, 0xb9, 0xbb, 0x94, 0x64, 0x96,
-0x09, 0x02, 0x9b, 0xb3, 0xc1, 0xb7, 0x0e, 0xa6,  0xbb, 0xbc, 0x95, 0xc9, 0x9c, 0xcc, 0xcd, 0x9e,
-0xcf, 0xca, 0xae, 0x0f, 0xc6, 0x5e, 0xb2, 0x0b,  0xbf, 0xc0, 0x9d, 0xd8, 0xd0, 0xdb, 0xdd, 0x58,
-0x96, 0x9b, 0x98, 0x03, 0xe2, 0xe3, 0x0a, 0xd9,  0xda, 0x03, 0xdc, 0xa3, 0x01, 0x06, 0x4b, 0xa7,
-0x5a, 0xe2, 0x0a, 0x11, 0xef, 0xab, 0x6b, 0xe7,  0x49, 0x02, 0x3c, 0x78, 0xc0, 0xe4, 0xd4, 0x02,
-0x76, 0xc0, 0xf6, 0x45, 0x70, 0x90, 0x6d, 0x0d,  0x2c, 0x81, 0x04, 0xd5, 0xad, 0xd3, 0x17, 0xa1,
-0x22, 0x3c, 0x80, 0x51, 0x04, 0x6a, 0x79, 0x80,  0xe9, 0x40, 0xbb, 0x8a, 0x20, 0x17, 0x3e, 0xc3,
-0x98, 0x51, 0x0b, 0x04, 0x08, 0x1d, 0x59, 0x17,  0x10, 0x40, 0x45, 0x20, 0x24, 0x3f, 0x07, 0x24,
-0xd1, 0x9d, 0x84, 0xc0, 0x8e, 0xc0, 0x81, 0x03,  0x35, 0x5b, 0x2a, 0x94, 0x20, 0x21, 0x26, 0xba,
-0x03, 0x34, 0x5d, 0x85, 0x0a, 0xd9, 0xa0, 0xa8,  0xcf, 0x28, 0x06, 0x80, 0x42, 0xb8, 0xb9, 0x0b,
-0x13, 0xd1, 0xa2, 0x7c, 0x60, 0x95, 0x48, 0x8a,  0x53, 0x4b, 0x55, 0x2d, 0x81, 0xec, 0x05, 0x30,
-0x2a, 0xb5, 0x44, 0x80, 0x9b, 0x60, 0xc1, 0x32,  0x60, 0x50, 0xd4, 0xc0, 0x11, 0x44, 0x5d, 0x63,
-0x8d, 0x5d, 0xcb, 0xb6, 0x68, 0xd9, 0xb4, 0x27,  0x06, 0xc9, 0x6d, 0x92, 0x15, 0x90, 0x8b, 0x10,
-0x00, 0x21, 0xf9, 0x04, 0x09, 0x12, 0x00, 0x1f,  0x00, 0x2c, 0x28, 0x00, 0x00, 0x00, 0x4a, 0x00,
-0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27, 0x8e,  0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c, 0xeb,
-0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d, 0xdf, 0x78,  0xae, 0xef, 0x7c, 0xef, 0xff, 0xc0, 0xa0, 0x70,
-0xd8, 0x0a, 0x04, 0x48, 0x47, 0x62, 0x2f, 0x20,  0x48, 0x7e, 0x98, 0x4e, 0x25, 0x2e, 0x40, 0x20,
-0x34, 0x9f, 0x82, 0x6a, 0x54, 0x5a, 0xa3, 0x5a,  0x8f, 0x4c, 0x2d, 0x77, 0x5a, 0xbd, 0x86, 0x09,
-0xdb, 0xb1, 0xcc, 0x6b, 0xce, 0xa2, 0xd5, 0x37,  0x2f, 0x58, 0x0c, 0xb7, 0x51, 0x0b, 0xe0, 0xc2,
-0xbb, 0xde, 0x25, 0xe0, 0x9f, 0x7a, 0x69, 0x7c,  0x2f, 0x01, 0x05, 0x07, 0x60, 0x07, 0x7f, 0x83,
-0x33, 0x46, 0x8d, 0x01, 0x08, 0x46, 0x8b, 0x31,  0x06, 0x06, 0x0f, 0x96, 0x97, 0x96, 0x68, 0x82,
-0x92, 0x26, 0x06, 0x09, 0x09, 0x96, 0x09, 0x03,  0x02, 0x0b, 0x96, 0x02, 0x0f, 0x7b, 0x9c, 0x28,
-0x9e, 0xa7, 0x0f, 0x0b, 0xaf, 0xaf, 0xa6, 0x02,  0x59, 0x9b, 0x9c, 0xac, 0xa4, 0x0b, 0x09, 0xb9,
-0xa0, 0x97, 0xb3, 0xb4, 0xaa, 0x25, 0xb7, 0xa7,  0xb0, 0xb1, 0xbd, 0xb3, 0xa9, 0xc0, 0x9e, 0x09,
-0x02, 0xa3, 0xb8, 0xba, 0xa5, 0x97, 0x0e, 0xb3,  0x03, 0x03, 0xb5, 0x75, 0x9e, 0x0f, 0xa4, 0xa4,
-0x9e, 0xa3, 0xd0, 0xc6, 0xd4, 0xd6, 0x70, 0xd8,  0xae, 0x4d, 0x06, 0x01, 0xdd, 0xde, 0xd9, 0x0f,
-0xe0, 0xc0, 0x4f, 0x18, 0x97, 0x0b, 0x01, 0x96,  0xd5, 0xb8, 0x98, 0xa7, 0xcc, 0xd5, 0xc0, 0xf2,
-0xf0, 0xfb, 0xe0, 0xc5, 0xa6, 0xd9, 0x06, 0x3c,  0x08, 0xc7, 0x65, 0x9f, 0xa5, 0x78, 0xeb, 0x04,
-0x06, 0xf8, 0xd7, 0xeb, 0x01, 0x06, 0x82, 0x52,  0x02, 0x60, 0x78, 0xe7, 0x2a, 0x1e, 0x35, 0x08,
-0x07, 0x18, 0x9a, 0x9a, 0x08, 0x51, 0x49, 0x80,  0x03, 0x14, 0x17, 0x1c, 0x18, 0x29, 0x32, 0x23,
-0xa6, 0x4b, 0x1c, 0x4c, 0x3b, 0x12, 0xf9, 0x38,  0x71, 0x60, 0x86, 0x91, 0x30, 0x1d, 0x1a, 0x41,
-0x89, 0xe1, 0x50, 0xbb, 0x0f, 0x06, 0x40, 0x06,  0xc8, 0x90, 0xe1, 0x23, 0x4c, 0x90, 0x3c, 0x25,
-0x4e, 0xb4, 0x79, 0x33, 0x27, 0x84, 0x9d, 0x3d,  0xab, 0x54, 0x39, 0x14, 0xb4, 0x26, 0xd1, 0x9b,
-0x4f, 0x8e, 0x8e, 0xf4, 0x09, 0x13, 0xe9, 0xc7,  0x48, 0x50, 0x47, 0x18, 0x09, 0xea, 0x68, 0x6b,
-0x4f, 0x95, 0x83, 0xac, 0x96, 0x10, 0x9b, 0xf5,  0x04, 0xd6, 0xb1, 0x60, 0xcb, 0xce, 0x08, 0x01,
-0x00, 0x21, 0xf9, 0x04, 0x09, 0x0c, 0x00, 0x1f,  0x00, 0x2c, 0x28, 0x00, 0x00, 0x00, 0x4a, 0x00,
-0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27, 0x8e,  0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c, 0xeb,
-0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d, 0xdf, 0x78,  0xae, 0xef, 0x7c, 0xef, 0xff, 0xc0, 0xa0, 0x70,
-0x58, 0x0a, 0x88, 0x8c, 0x44, 0x60, 0x40, 0x10,  0x08, 0x0c, 0x90, 0x49, 0xde, 0x92, 0x40, 0x70,
-0x3e, 0xa3, 0x52, 0x01, 0xd5, 0x0a, 0xc5, 0xe2,  0xa6, 0xd5, 0xc1, 0xd5, 0x9b, 0x03, 0x3b, 0xbb,
-0x64, 0x5b, 0x60, 0x2b, 0x46, 0x06, 0x0c, 0xf0,  0x78, 0x1a, 0x16, 0x28, 0x84, 0xdd, 0x06, 0x44,
-0x62, 0xbf, 0x87, 0xcf, 0x5b, 0x75, 0x77, 0x1f,  0x01, 0x0a, 0x0a, 0x0b, 0x02, 0x03, 0x09, 0x0b,
-0x0b, 0x7d, 0x7f, 0x2b, 0x01, 0x07, 0x05, 0x67,  0x84, 0x85, 0x8b, 0x96, 0x87, 0x02, 0x09, 0x06,
-0x8e, 0x28, 0x4d, 0x08, 0x04, 0x07, 0x4d, 0x94,  0x85, 0x7b, 0x8c, 0x8b, 0x02, 0x99, 0x9b, 0x9c,
-0x24, 0x6b, 0x54, 0xae, 0x04, 0x85, 0xb1, 0x97,  0x98, 0xa8, 0x9a, 0xab, 0x23, 0xad, 0xaf, 0xa3,
-0x95, 0xa6, 0x98, 0x03, 0x99, 0xb6, 0xab, 0x56,  0x03, 0xae, 0xa8, 0xb1, 0xbc, 0xbd, 0x02, 0x98,
-0xc1, 0x9c, 0xc3, 0xc4, 0xa8, 0x02, 0xc7, 0xb3,  0x98, 0xcb, 0xaa, 0xcd, 0x62, 0x62, 0x04, 0xd0,
-0xd2, 0xb3, 0x03, 0xa7, 0x89, 0xd6, 0x8e, 0xce,  0xbf, 0x02, 0x0e, 0xdc, 0x96, 0x62, 0xdf, 0x6f,
-0x68, 0x69, 0x01, 0x0f, 0xd8, 0xe4, 0xe6, 0xb2,  0x97, 0xde, 0xa7, 0x4e, 0x0f, 0x0f, 0xec, 0x5e,
-0xee, 0xf0, 0xa8, 0xf2, 0xc8, 0x8b, 0xea, 0x1d,  0x12, 0x83, 0x4f, 0x1f, 0x16, 0x7e, 0x62, 0xa0,
-0xfd, 0x8b, 0x10, 0x61, 0xda, 0x81, 0x45, 0xef,  0x06, 0xe4, 0x13, 0x66, 0x45, 0xa1, 0x82, 0x08,
-0x17, 0x09, 0x58, 0xd2, 0xf8, 0x70, 0x01, 0x04,  0x08, 0x6d, 0x6e, 0x0d, 0x4a, 0x58, 0xce, 0x01,
-0xc3, 0x8c, 0x1a, 0x69, 0x07, 0x1c, 0x38, 0x90,  0xf2, 0x23, 0x84, 0x70, 0xc2, 0x14, 0x32, 0x9c,
-0x19, 0xe1, 0x15, 0x01, 0x78, 0x10, 0x0e, 0xc0,  0x6c, 0x56, 0x92, 0xe6, 0xcc, 0x80, 0xd8, 0x56,
-0x7e, 0xd4, 0x29, 0x12, 0x97, 0x39, 0x9f, 0x70,  0xe0, 0x1d, 0x08, 0x4a, 0xb4, 0x28, 0x2e, 0x09,
-0x12, 0x68, 0x36, 0x60, 0xc0, 0x20, 0x14, 0xa4,  0x95, 0x90, 0x0c, 0x0a, 0x6b, 0xc0, 0x55, 0x54,
-0x13, 0x06, 0x01, 0xa8, 0x5a, 0x3d, 0xc0, 0x60,  0xe7, 0x2d, 0x48, 0x5d, 0x03, 0x44, 0x50, 0xd5,
-0x04, 0xeb, 0xd5, 0x26, 0x4e, 0x71, 0x75, 0xfd,  0x60, 0x40, 0x81, 0x1b, 0xbb, 0x57, 0x43, 0xc5,
-0x65, 0x05, 0x97, 0x2e, 0x14, 0xb8, 0x5e, 0xf7,  0x0a, 0x1e, 0xfc, 0x21, 0x04, 0x00, 0x21, 0xf9,
-0x04, 0x09, 0x2e, 0x00, 0x1f, 0x00, 0x2c, 0x28,  0x00, 0x00, 0x00, 0x4a, 0x00, 0x28, 0x00, 0x00,
-0x05, 0xfe, 0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e,  0x68, 0xaa, 0xae, 0x6c, 0xeb, 0xbe, 0x70, 0x2c,
-0xcf, 0x74, 0x6d, 0xdf, 0x78, 0xae, 0xef, 0x7c,  0xef, 0xbf, 0x06, 0xc3, 0x6f, 0x88, 0x32, 0x2c,
-0x08, 0x42, 0xa2, 0xf2, 0x63, 0x3c, 0x26, 0x03,  0xd0, 0x65, 0xaf, 0x89, 0xfc, 0x04, 0x0e, 0x93,
-0x49, 0x40, 0xba, 0x33, 0x0e, 0x08, 0x5b, 0x6c,  0x56, 0xcb, 0xcd, 0x79, 0xc1, 0xd7, 0x2c, 0x85,
-0x5c, 0xbe, 0x19, 0x06, 0x5f, 0x70, 0x65, 0x42,  0x59, 0x6f, 0xdb, 0xee, 0x78, 0xa0, 0x62, 0xb1,
-0x50, 0x2c, 0x77, 0x78, 0x35, 0x06, 0x04, 0x04,  0x10, 0x7b, 0x13, 0x7d, 0x6c, 0x82, 0x34, 0x84,
-0x86, 0x88, 0x74, 0x8b, 0x8c, 0x32, 0x84, 0x10,  0x87, 0x05, 0x73, 0x14, 0x15, 0x81, 0x4c, 0x41,
-0x9e, 0x93, 0x2a, 0x06, 0x96, 0x97, 0x98, 0x13,  0x9b, 0x9d, 0x06, 0x08, 0x09, 0xab, 0xab, 0x41,
-0xa0, 0x26, 0x06, 0x0c, 0x0b, 0x96, 0x57, 0x05,  0x98, 0x05, 0x01, 0x06, 0x0a, 0xbb, 0x0a, 0x02,
-0x03, 0x0b, 0xc0, 0xad, 0xaf, 0x24, 0xb1, 0xbb,  0xb8, 0x08, 0x03, 0xb6, 0x02, 0x02, 0x0e, 0xbc,
-0xbb, 0xc0, 0xc0, 0xcb, 0x09, 0x49, 0xaf, 0xb1,  0x0d, 0x0d, 0xbd, 0xcb, 0x70, 0x70, 0xcc, 0xce,
-0x0a, 0xd0, 0xd1, 0x02, 0xd3, 0xc3, 0xd6, 0xd7,  0xbe, 0xdb, 0xdb, 0xcd, 0xde, 0xd0, 0xcb, 0xd2,
-0xd4, 0x82, 0x01, 0x0c, 0xd7, 0x0d, 0xda, 0x50,  0x01, 0xe9, 0xde, 0xcf, 0x0b, 0xda, 0xe2, 0xe3,
-0x8c, 0xf1, 0x0e, 0xcc, 0x0d, 0x08, 0xa0, 0x00,  0x0a, 0xbe, 0x7c, 0xec, 0xf6, 0x89, 0x7b, 0xd7,
-0x26, 0x80, 0x83, 0x87, 0x0e, 0x7c, 0xd9, 0xbb,  0x07, 0x47, 0x1d, 0xc2, 0x65, 0x0a, 0xfd, 0xc1,
-0x83, 0x18, 0x71, 0xa0, 0x41, 0x6e, 0x16, 0xd7,  0xfd, 0xda, 0x47, 0x60, 0x80, 0xc6, 0x86, 0x1c,
-0xb7, 0xd1, 0xa1, 0xeb, 0x16, 0x21, 0x1f, 0x9c,  0x68, 0x25, 0x07, 0x18, 0xe0, 0xc4, 0xc5, 0x61,
-0xc0, 0x6b, 0x2a, 0x07, 0x30, 0x73, 0x10, 0xa1,  0xa5, 0xb7, 0x91, 0x24, 0xe1, 0xbc, 0xa1, 0xb9,
-0x24, 0xc0, 0xb5, 0x09, 0x3e, 0x57, 0x3e, 0xec,  0xe9, 0x33, 0xe9, 0x48, 0x02, 0x02, 0x62, 0x0e,
-0x15, 0x64, 0xe0, 0x82, 0xd5, 0x96, 0xe7, 0x76,  0x32, 0xdd, 0xba, 0x6b, 0xe4, 0x81, 0x42, 0x07,
-0x06, 0x40, 0x98, 0x8a, 0xc7, 0x40, 0x84, 0x0a,  0x3d, 0x15, 0x70, 0x6c, 0xb6, 0x95, 0xa9, 0x82,
-0x2f, 0x0b, 0xbe, 0x16, 0x82, 0x33, 0x96, 0x28,  0x97, 0x99, 0x41, 0x18, 0x1c, 0x88, 0x20, 0x81,
-0x6b, 0x4b, 0xb7, 0x03, 0x0e, 0xc8, 0x45, 0x57,  0x77, 0x18, 0x13, 0xc1, 0x12, 0xfa, 0x36, 0xe5,
-0x9a, 0x53, 0xf0, 0x01, 0x86, 0xa0, 0x0c, 0x5c,  0x3b, 0x50, 0xa1, 0x41, 0xdb, 0x9e, 0x0d, 0x54,
-0x3a, 0x16, 0x0c, 0x99, 0x91, 0xe4, 0x06, 0x82,  0xe7, 0x35, 0xf0, 0x14, 0x04, 0xdd, 0x66, 0xce,
-0x86, 0x99, 0x5c, 0x2b, 0x20, 0x7a, 0xb4, 0xea,  0x06, 0x0c, 0xf4, 0x9e, 0x16, 0x6c, 0xd7, 0x73,
-0x90, 0xd6, 0x42, 0x3e, 0x5f, 0x8b, 0xcd, 0xbb,  0x77, 0xe7, 0xc8, 0xa4, 0x93, 0x04, 0x9f, 0x39,
-0x71, 0x62, 0xea, 0xe3, 0xc8, 0x5d, 0x84, 0x00,  0x00, 0x21, 0xf9, 0x04, 0x09, 0x0c, 0x00, 0x1f,
-0x00, 0x2c, 0x28, 0x00, 0x00, 0x00, 0x4a, 0x00,  0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27, 0x8e,
-0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c, 0xeb,  0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d, 0x93, 0x86,
-0x71, 0xef, 0xbb, 0xb1, 0x10, 0x3a, 0x9e, 0x30,  0xe6, 0xfb, 0x05, 0x03, 0xc8, 0xa1, 0x32, 0x55,
-0x04, 0x7e, 0x02, 0x87, 0xc9, 0x24, 0xb0, 0xac,  0xe2, 0x16, 0x03, 0x02, 0x35, 0x2a, 0x9d, 0x5a,
-0xad, 0xbe, 0x2c, 0x92, 0x4b, 0xf1, 0x7e, 0x97,  0x86, 0x41, 0x56, 0x5b, 0x99, 0x50, 0xca, 0xd4,
-0x33, 0x7a, 0x1d, 0xa8, 0x58, 0x2c, 0x14, 0x4b,  0x5c, 0x3e, 0x34, 0x10, 0x08, 0x10, 0x75, 0x13,
-0x77, 0x66, 0x7c, 0x42, 0x7e, 0x80, 0x82, 0x6e,  0x85, 0x86, 0x3d, 0x80, 0x81, 0x05, 0x6d, 0x14,
-0x15, 0x7b, 0x8d, 0x37, 0x06, 0x10, 0x99, 0x01,  0x05, 0x91, 0x13, 0x94, 0x96, 0x3d, 0x0c, 0x0b,
-0x9a, 0x07, 0x9c, 0x15, 0x05, 0x01, 0x41, 0x1f,  0x39, 0xac, 0xaa, 0xa0, 0x2a, 0x06, 0x0c, 0x0a,
-0x0a, 0xa8, 0x08, 0x03, 0x9c, 0x02, 0x02, 0x0e,  0xac, 0x08, 0x09, 0xbe, 0xbe, 0x39, 0xaf, 0x4c,
-0x0c, 0x0d, 0x0d, 0x0a, 0xb9, 0x02, 0x6a, 0x6a,  0xba, 0xb3, 0xb3, 0xc9, 0x0b, 0xd0, 0xc0, 0xc2,
-0x27, 0xb1, 0xc5, 0x0d, 0xc9, 0xca, 0xca, 0x0e,  0xcd, 0xb3, 0xd0, 0xd0, 0xb9, 0x09, 0xae, 0xd3,
-0x01, 0xc4, 0xc5, 0xb9, 0x03, 0x48, 0x01, 0xda,  0xdc, 0x0a, 0xde, 0xdf, 0x02, 0xe1, 0xd3, 0x23,
-0xe4, 0x0e, 0xe6, 0xe8, 0x0a, 0x48, 0xeb, 0xec,  0xde, 0xc8, 0xf0, 0xe2, 0xa0, 0x01, 0x1c, 0x08,
-0x74, 0x90, 0x2c, 0x9d, 0x3a, 0x35, 0xdb, 0xd8,  0xb5, 0x5b, 0x70, 0x0e, 0x5e, 0xbc, 0x71, 0x03,
-0x09, 0xa2, 0xcb, 0xb7, 0x2c, 0xe1, 0xbe, 0x6f,  0x0c, 0xfd, 0xc9, 0x0b, 0x38, 0x30, 0x5b, 0x36,
-0x66, 0x0a, 0xdb, 0xe5, 0xca, 0xf8, 0x50, 0x18,  0x47, 0x6b, 0x1e, 0xc9, 0x07, 0xe8, 0xb2, 0xb8,
-0x6f, 0xc0, 0x37, 0x02, 0x03, 0x4a, 0x02, 0x2c,  0x36, 0x21, 0xc2, 0xac, 0x8f, 0x02, 0x6d, 0xda,
-0x64, 0xa7, 0xe6, 0xa5, 0x1a, 0x03, 0x95, 0x2c,  0x19, 0xb8, 0x40, 0xd4, 0x26, 0xb6, 0x95, 0x11,
-0x92, 0xee, 0xe4, 0xe6, 0xd2, 0xe7, 0x80, 0x34,  0x41, 0x0d, 0x19, 0x88, 0x50, 0x21, 0xa9, 0x82,
-0x88, 0xdb, 0x94, 0xee, 0xdc, 0xd9, 0xf3, 0x87,  0x00, 0x98, 0x4f, 0xd1, 0x4d, 0x03, 0x9a, 0x83,
-0xc1, 0x81, 0x08, 0x12, 0xb4, 0x2a, 0xd0, 0xca,  0x15, 0xda, 0x81, 0x3f, 0x07, 0x06, 0x40, 0x80,
-0x2a, 0x6f, 0x84, 0x81, 0x03, 0x07, 0x24, 0xa4,  0xdd, 0xaa, 0x36, 0xcb, 0x82, 0xb7, 0x7f, 0xd4,
-0xcc, 0x0d, 0x54, 0x57, 0x84, 0x81, 0x62, 0x07,  0x2a, 0x34, 0x50, 0xab, 0x54, 0xc1, 0x00, 0xbc,
-0x81, 0x95, 0xcd, 0x8d, 0xfa, 0xea, 0x70, 0x03,  0xbc, 0xd6, 0x1a, 0x4c, 0x4d, 0x1a, 0xc0, 0x66,
-0xca, 0xc7, 0x07, 0xfe, 0x8d, 0x6b, 0x50, 0x20,  0xb3, 0x66, 0x83, 0xe9, 0xb2, 0xc5, 0x05, 0x2d,
-0x5a, 0xd8, 0xe1, 0x00, 0x99, 0x45, 0xe7, 0xc3,  0x9b, 0xad, 0xb5, 0xc9, 0x06, 0xb0, 0x35, 0xb7,
-0x4e, 0x47, 0x1b, 0xef, 0x01, 0xca, 0x1b, 0x9f,  0x50, 0x06, 0x4a, 0xce, 0xac, 0x6f, 0xdf, 0xc0,
-0x0b, 0x9f, 0xc8, 0x5d, 0x8c, 0x81, 0xf3, 0xe7,  0x49, 0x94, 0xbf, 0x68, 0x45, 0x3c, 0x9d, 0xf4,
-0xeb, 0xd8, 0x69, 0x84, 0x00, 0x00, 0x21, 0xf9,  0x04, 0x09, 0x0e, 0x00, 0x1f, 0x00, 0x2c, 0x28,
-0x00, 0x00, 0x00, 0x4a, 0x00, 0x28, 0x00, 0x00,  0x05, 0xfe, 0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e,
-0x68, 0xaa, 0xae, 0x6c, 0xeb, 0xbe, 0x70, 0xfc,  0x1a, 0x86, 0x6c, 0xdf, 0xae, 0xb1, 0x10, 0x35,
-0xee, 0xff, 0x22, 0xdd, 0xae, 0x17, 0x28, 0x02,  0x8f, 0xb3, 0xc5, 0xf0, 0x13, 0x38, 0x4c, 0x26,
-0x01, 0xa4, 0x54, 0xa5, 0x1b, 0x10, 0xa2, 0xce,  0x27, 0x74, 0xca, 0x2d, 0x55, 0xaf, 0xcd, 0x27,
-0x65, 0xdb, 0x2d, 0x1b, 0x06, 0xd6, 0x6b, 0x65,  0x42, 0x19, 0x47, 0xcb, 0xe6, 0x74, 0xa0, 0x62,
-0xb1, 0x50, 0x2c, 0x6f, 0x54, 0x91, 0x06, 0x8f,  0x19, 0x08, 0x04, 0x10, 0x73, 0x13, 0x75, 0x64,
-0x24, 0x34, 0x34, 0x09, 0x8a, 0x09, 0x3d, 0x7d,  0x2d, 0x7f, 0x81, 0x83, 0x6c, 0x86, 0x1f, 0x06,
-0x08, 0x8b, 0x8b, 0x02, 0x02, 0x8c, 0x8e, 0x8f,  0x81, 0x82, 0x05, 0x6b, 0x14, 0x15, 0x79, 0x01,
-0x0a, 0x0a, 0x02, 0x03, 0x4a, 0x0b, 0x09, 0x0b,  0x9a, 0x9c, 0x9d, 0x54, 0x10, 0xb3, 0x01, 0x05,
-0xa1, 0x13, 0xa4, 0x22, 0xa6, 0xa7, 0x0a, 0xab,  0x4a, 0x9a, 0xaf, 0x8d, 0xb1, 0x5e, 0x0c, 0x0b,
-0xb4, 0x07, 0xb6, 0x15, 0x05, 0x01, 0x06, 0xbb,  0xbc, 0xbe, 0x09, 0x9a, 0x03, 0x9b, 0xb0, 0xc3,
-0x87, 0x0c, 0xa7, 0xcb, 0x08, 0x03, 0xb6, 0x9a,  0x0e, 0xbc, 0xe0, 0xab, 0xad, 0x02, 0xae, 0x9b,
-0xc2, 0xd6, 0x06, 0x0c, 0x0d, 0x0d, 0xa8, 0xd2,  0x68, 0xd3, 0xdf, 0xe0, 0xcf, 0x4a, 0xd1, 0xe5,
-0xd5, 0xd6, 0x95, 0xea, 0xeb, 0xa9, 0xef, 0xef,  0xf1, 0xf2, 0xbd, 0xe8, 0xfd, 0x22, 0x30, 0xe0,
-0x5e, 0xac, 0x00, 0xfa, 0x1a, 0xb8, 0xeb, 0x37,  0xe0, 0x1f, 0x40, 0x25, 0xaa, 0x5c, 0x11, 0x1c,
-0xd0, 0x0c, 0x1f, 0x42, 0x07, 0xfb, 0xd0, 0x14,  0xe9, 0xe7, 0x50, 0x9e, 0x2f, 0x89, 0x68, 0xce,
-0xe4, 0xe9, 0x14, 0xc0, 0x81, 0x49, 0x07, 0xa9,  0xd6, 0x36, 0x72, 0x3c, 0x15, 0x01, 0x60, 0xc4,
-0x1d, 0x02, 0x26, 0x8a, 0xb4, 0x56, 0xf2, 0x64,  0x4a, 0x86, 0x02, 0xe2, 0xb5, 0x94, 0x17, 0xf1,
-0x00, 0xa0, 0x03, 0x03, 0x20, 0xcc, 0x1c, 0x56,  0xd3, 0x24, 0xc3, 0x77, 0x39, 0x59, 0x2a, 0x55,
-0x80, 0x86, 0x80, 0x4f, 0x40, 0x68, 0x84, 0x8e,  0x24, 0x69, 0x72, 0x5d, 0x83, 0xa3, 0x39, 0x75,
-0x46, 0xd8, 0x7a, 0x4a, 0x15, 0xa0, 0x89, 0x51,  0x2b, 0xd2, 0x5c, 0x37, 0x61, 0x67, 0xbf, 0xac,
-0x3b, 0xb7, 0x72, 0xb5, 0xb2, 0xa3, 0xdf, 0x81,  0x03, 0xe7, 0x86, 0x19, 0xb8, 0x40, 0xb7, 0x25,
-0x3f, 0xb4, 0x5c, 0x15, 0xa8, 0x65, 0xfa, 0x16,  0x0d, 0xd0, 0x01, 0x6f, 0xe3, 0xc6, 0x32, 0x10,
-0xa1, 0x02, 0xd7, 0x93, 0x26, 0xf5, 0x72, 0xdd,  0x1a, 0xa0, 0xa5, 0xc6, 0xbe, 0x7e, 0xa7, 0xe2,
-0x6b, 0x46, 0x83, 0xc1, 0x81, 0x08, 0x12, 0xd4,  0xb6, 0x6c, 0x59, 0xa4, 0xb3, 0xe7, 0xb7, 0xa0,
-0x25, 0xe3, 0x1b, 0x61, 0xe0, 0xad, 0x84, 0xcc,  0x69, 0x45, 0x37, 0x29, 0xf2, 0xd6, 0xc8, 0xe8,
-0x13, 0x06, 0xd6, 0x1d, 0xa8, 0xd0, 0x40, 0xad,  0x68, 0x5d, 0xad, 0x0f, 0xb8, 0x7e, 0x7d, 0x48,
-0xf6, 0x01, 0xab, 0x0d, 0x04, 0x93, 0x58, 0xad,  0xfb, 0x36, 0xba, 0x75, 0x05, 0x80, 0x07, 0x6f,
-0x51, 0x64, 0x9d, 0x71, 0xb9, 0x34, 0x94, 0x0b,  0x3f, 0x11, 0xc0, 0x39, 0x6f, 0x13, 0x88, 0x10,
-0xc5, 0xd8, 0x7d, 0xbd, 0xbb, 0xf7, 0xef, 0xe0,  0xc3, 0x8b, 0x1f, 0x4f, 0xde, 0x7b, 0x08, 0x00,
-0x21, 0xf9, 0x04, 0x09, 0x0e, 0x00, 0x1f, 0x00,  0x2c, 0x28, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x28,
-0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27, 0x8e, 0x64,  0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c, 0xeb, 0xbe,
-0x70, 0x2c, 0xcf, 0x74, 0x6d, 0xdf, 0x78, 0xae,  0xef, 0x7c, 0x7f, 0x1b, 0x06, 0x9f, 0x50, 0x65,
-0x58, 0x10, 0x82, 0xc3, 0xe4, 0xa8, 0x68, 0x44,  0x06, 0x9e, 0x4a, 0x1f, 0xf3, 0xf8, 0x09, 0x1c,
-0x26, 0x93, 0x40, 0x94, 0x57, 0x1c, 0x10, 0xb4,  0x57, 0x6c, 0x76, 0xab, 0xeb, 0x7e, 0xad, 0x58,
-0xca, 0x98, 0x8c, 0x33, 0x0c, 0xbc, 0xdf, 0xca,  0x84, 0xa2, 0xd6, 0xa6, 0x9e, 0x01, 0x20, 0x9b,
-0x08, 0x0f, 0x54, 0x2c, 0x16, 0x14, 0x16, 0x76,  0x25, 0x40, 0x06, 0x09, 0x88, 0x88, 0x48, 0x7b,
-0x26, 0x06, 0x04, 0x04, 0x10, 0x7e, 0x13, 0x80,  0x6b, 0x4b, 0x08, 0x89, 0x89, 0x02, 0x02, 0x09,
-0x8b, 0x8c, 0x4b, 0x8f, 0x91, 0x72, 0x73, 0x95,  0x55, 0x0a, 0x0a, 0x02, 0x03, 0x0b, 0xaa, 0x09,
-0x0b, 0x9a, 0x9c, 0x9e, 0x24, 0x8e, 0x10, 0x91,  0x05, 0x72, 0x14, 0x15, 0x76, 0x4f, 0xa6, 0xa6,
-0xaa, 0xbd, 0x9a, 0xae, 0x9d, 0x8c, 0x06, 0xb3,  0xb4, 0xb5, 0x13, 0xb8, 0xa5, 0xbb, 0xbc, 0xbd,
-0x09, 0x9a, 0x03, 0x9b, 0xaf, 0x9e, 0x06, 0x0c,  0x0b, 0xb3, 0x56, 0x05, 0xb5, 0x05, 0x79, 0xca,
-0xca, 0xcc, 0xad, 0xad, 0x9b, 0xc1, 0x64, 0xd3,  0xa6, 0xda, 0x08, 0x03, 0xd8, 0x9a, 0x0e, 0xdc,
-0xdd, 0xab, 0x02, 0xe0, 0xd1, 0x7b, 0xd3, 0x0d,  0x0d, 0xa7, 0xce, 0x6f, 0xcf, 0xeb, 0xec, 0xcb,
-0x0b, 0xac, 0xad, 0x04, 0x03, 0xe2, 0x8d, 0x63,  0x40, 0xaf, 0x01, 0x2a, 0x7c, 0xf8, 0xf4, 0xed,
-0x53, 0xa0, 0x2a, 0xd5, 0xbf, 0x37, 0x41, 0x08,  0x29, 0x09, 0x40, 0x90, 0x9e, 0x33, 0x3c, 0x09,
-0x17, 0xf2, 0x53, 0x25, 0x00, 0xe0, 0x00, 0x03,  0x01, 0x1e, 0x48, 0x1c, 0x42, 0xd1, 0x81, 0xc5,
-0x01, 0x01, 0xdf, 0x14, 0x3c, 0xc9, 0xa8, 0xd1,  0xa1, 0x91, 0x8e, 0x10, 0x07, 0x88, 0xdc, 0x12,
-0xc0, 0x81, 0x4d, 0x07, 0xa8, 0xf0, 0x04, 0x60,  0x19, 0x61, 0x9f, 0xc3, 0x03, 0x8f, 0x0e, 0x0c,
-0x80, 0xe0, 0x26, 0x12, 0xcd, 0x9b, 0x38, 0x51,  0xae, 0x7c, 0x23, 0x40, 0x5f, 0x4f, 0x53, 0x4f,
-0xdf, 0x10, 0x00, 0xfa, 0xe8, 0x0d, 0x51, 0xa3,  0x47, 0x6f, 0x22, 0x44, 0xd8, 0x14, 0xaa, 0x82,
-0x08, 0x60, 0x4d, 0xa5, 0x7a, 0xe4, 0xd1, 0x2a,  0x48, 0x36, 0x35, 0x4d, 0xd2, 0xdb, 0x9a, 0xcf,
-0xe9, 0xd7, 0xb0, 0x5e, 0x8c, 0x20, 0x3c, 0x70,  0x40, 0xdc, 0x44, 0x7a, 0x13, 0xa2, 0xe2, 0x6b,
-0xea, 0xe0, 0x69, 0x84, 0x04, 0x60, 0x13, 0xec,  0xa4, 0xfb, 0x46, 0xe8, 0x00, 0xba, 0x76, 0x95,
-0x18, 0xb8, 0xc0, 0xb8, 0xe7, 0x41, 0xbe, 0x60,  0x7b, 0x0a, 0xd6, 0xb9, 0x13, 0x02, 0xe1, 0xc2,
-0x23, 0xc7, 0x45, 0xa8, 0x10, 0x16, 0xe9, 0xba,  0xc8, 0x2a, 0x4d, 0xe0, 0xa1, 0x4b, 0x3a, 0xf3,
-0xb8, 0x3c, 0xd3, 0x0e, 0x44, 0x90, 0x10, 0xb9,  0x67, 0x04, 0xd3, 0x22, 0x46, 0x1f, 0xc0, 0x0a,
-0x6b, 0x09, 0x5d, 0x09, 0xac, 0x9f, 0xc2, 0x8e,  0x4d, 0xd7, 0x0a, 0xed, 0xda, 0x1f, 0x0c, 0xd0,
-0x3b, 0x50, 0xa1, 0x01, 0xd8, 0xdd, 0x23, 0xac,  0xf8, 0x46, 0xbe, 0x45, 0x78, 0x03, 0xba, 0x05,
-0x99, 0x27, 0x0f, 0x40, 0x4f, 0x7a, 0x12, 0xe7,  0x05, 0x0a, 0x36, 0xb0, 0x9e, 0xbc, 0x3a, 0xf0,
-0xe0, 0x40, 0xb4, 0x37, 0x48, 0x7c, 0x87, 0xbb,  0x62, 0x43, 0x7a, 0xbe, 0xab, 0x5f, 0xcf, 0xbe,
-0x45, 0x08, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x2e,  0x00, 0x1f, 0x00, 0x2c, 0x28, 0x00, 0x00, 0x00,
-0x4a, 0x00, 0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0,  0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae,
-0x6c, 0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d,  0xdf, 0x78, 0xae, 0xef, 0x7c, 0xef, 0xff, 0x40,
-0x83, 0x01, 0x48, 0x34, 0x19, 0x16, 0x84, 0x61,  0xb1, 0x78, 0x44, 0x2a, 0x03, 0xd0, 0x65, 0xaf,
-0x99, 0xfc, 0x04, 0x0e, 0x93, 0x49, 0x40, 0xba,  0x3b, 0x0e, 0x08, 0x5b, 0x6c, 0x56, 0xcb, 0xcd,
-0x79, 0xc1, 0xd7, 0x2c, 0x85, 0x5c, 0xbe, 0x19,  0x06, 0x5f, 0x70, 0x65, 0x42, 0x59, 0x6f, 0xdb,
-0xee, 0x78, 0xa0, 0x62, 0xb1, 0x50, 0x2c, 0x77,  0x78, 0x35, 0x06, 0x04, 0x04, 0x10, 0x7b, 0x13,
-0x7d, 0x6c, 0x82, 0x34, 0x84, 0x86, 0x88, 0x74,  0x8b, 0x8c, 0x32, 0x84, 0x10, 0x87, 0x05, 0x73,
-0x14, 0x15, 0x81, 0x1f, 0x42, 0x9e, 0x4a, 0x93,  0x28, 0x06, 0x96, 0x97, 0x98, 0x13, 0x9b, 0x9d,
-0x42, 0x08, 0x09, 0xac, 0xac, 0x42, 0xa1, 0x46,  0x0c, 0x0b, 0x96, 0x57, 0x05, 0x98, 0x05, 0x01,
-0x06, 0x0a, 0xbb, 0x0a, 0x02, 0x03, 0x0b, 0xc0,  0xae, 0xb0, 0x24, 0x06, 0x0c, 0xbb, 0xb8, 0x08,
-0x03, 0xb6, 0x02, 0x02, 0x0e, 0xbc, 0xbb, 0xc0,  0xc0, 0xcc, 0x09, 0xa0, 0xa1, 0xc5, 0x0d, 0x0d,
-0xbd, 0xcc, 0x70, 0x70, 0xcd, 0xcf, 0x0a, 0xd1,  0xd2, 0x02, 0xd4, 0xc3, 0xd7, 0xd8, 0xbe, 0xdc,
-0xdc, 0xce, 0xdf, 0xd1, 0xcc, 0xd3, 0xd5, 0x78,  0x01, 0x0c, 0xd8, 0x0d, 0xdb, 0x50, 0x01, 0xea,
-0xdf, 0xd0, 0x0b, 0xdb, 0xe3, 0xe4, 0x8c, 0xf2,  0x1c, 0x9c, 0x1b, 0x10, 0x40, 0x01, 0x94, 0x7c,
-0xfa, 0xda, 0xf1, 0x1b, 0x07, 0xaf, 0x4c, 0x00,  0x07, 0x10, 0x1d, 0xf8, 0xba, 0x87, 0x0f, 0xce,
-0xba, 0x84, 0xcc, 0x16, 0xfe, 0x13, 0xf4, 0x30,  0xe2, 0xc4, 0x83, 0xdd, 0x2e, 0xb2, 0xfb, 0xc5,
-0x8f, 0xc0, 0x80, 0x8d, 0x6d, 0xb9, 0x3a, 0x42,  0x4c, 0x97, 0xce, 0x5b, 0x04, 0x7d, 0x70, 0xa4,
-0x99, 0x1c, 0x60, 0x80, 0x13, 0x97, 0x8e, 0xf4,  0x58, 0x0e, 0x68, 0xe6, 0x20, 0xc2, 0xcb, 0x6f,
-0x24, 0x4b, 0xc2, 0x31, 0xf0, 0xc0, 0xe6, 0x92,  0x00, 0xd8, 0x26, 0xfc, 0x6c, 0x09, 0xd1, 0xe7,
-0xcf, 0xa5, 0x24, 0x09, 0x08, 0x98, 0x49, 0xd4,  0xe8, 0x12, 0x03, 0x17, 0xb2, 0xbe, 0x44, 0xc7,
-0xd3, 0xa9, 0xd7, 0x5d, 0x24, 0x0f, 0x14, 0x3a,  0x30, 0x00, 0x42, 0x55, 0x41, 0x06, 0x22, 0x54,
-0xf0, 0xa9, 0x20, 0x22, 0x44, 0x05, 0x5e, 0x9d,  0x2a, 0xf8, 0xb2, 0x40, 0x6c, 0x21, 0x38, 0x66,
-0xad, 0x4a, 0xa9, 0x29, 0x84, 0xc1, 0x81, 0x08,  0x12, 0xbe, 0xbe, 0x94, 0x3b, 0xe0, 0x80, 0xdd,
-0x74, 0x66, 0x87, 0x89, 0x30, 0x60, 0x58, 0x42,  0xe0, 0xa7, 0x5f, 0x75, 0x1a, 0x3e, 0xd0, 0x70,
-0x92, 0x01, 0x6c, 0x07, 0x2a, 0x34, 0x88, 0xeb,  0xb3, 0x01, 0xcb, 0xc9, 0x86, 0x2b, 0xa3, 0xc5,
-0x7c, 0x80, 0x5e, 0x83, 0x4f, 0x6f, 0xb8, 0x81,  0x0e, 0xad, 0xb8, 0x13, 0xb6, 0x02, 0xa6, 0x4f,
-0xbb, 0x6e, 0xc0, 0xc0, 0xef, 0x6a, 0xc3, 0x7a,  0xd1, 0x0a, 0x89, 0x3d, 0xe4, 0x32, 0xbd, 0xda,
-0xc0, 0x83, 0x8b, 0xb6, 0x8c, 0x7a, 0x31, 0x6a,  0x8a, 0xc8, 0x5b, 0x2b, 0x87, 0x11, 0x02, 0x00,
-0x21, 0xf9, 0x04, 0x09, 0x0c, 0x00, 0x1f, 0x00,  0x2c, 0x0d, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x28,
-0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27, 0x8e, 0x64,  0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c, 0xeb, 0xbe,
-0x70, 0x2c, 0xcf, 0x74, 0x6d, 0x93, 0x86, 0x71,  0xef, 0xbb, 0xb1, 0x10, 0x3a, 0x9e, 0x30, 0xe6,
-0xfb, 0x05, 0x03, 0xc8, 0xa1, 0x32, 0x55, 0x04,  0x7e, 0x02, 0x87, 0xc9, 0x24, 0xb0, 0xac, 0xe2,
-0x16, 0x03, 0x02, 0x35, 0x2a, 0x9d, 0x5a, 0xad,  0xbe, 0x2c, 0x92, 0x4b, 0xf1, 0x7e, 0x97, 0x86,
-0x41, 0x56, 0x5b, 0x99, 0x50, 0xca, 0xd4, 0x33,  0x7a, 0x1d, 0xa8, 0x58, 0x2c, 0x14, 0x4b, 0x5c,
-0x3e, 0x34, 0x10, 0x08, 0x10, 0x75, 0x13, 0x77,  0x66, 0x7c, 0x42, 0x7e, 0x80, 0x82, 0x6e, 0x85,
-0x86, 0x3d, 0x80, 0x81, 0x05, 0x6d, 0x14, 0x15,  0x7b, 0x8d, 0x37, 0x06, 0x10, 0x99, 0x01, 0x05,
-0x91, 0x13, 0x94, 0x96, 0x3d, 0x0c, 0x0b, 0x9a,  0x07, 0x9c, 0x15, 0x05, 0x01, 0x41, 0x1f, 0x39,
-0xac, 0xaa, 0xa0, 0x2a, 0x06, 0x0c, 0x0a, 0x0a,  0xa8, 0x08, 0x03, 0x9c, 0x02, 0x02, 0x0e, 0xac,
-0x08, 0x09, 0xbe, 0xbe, 0x39, 0xaf, 0x4c, 0x0c,  0x0d, 0x0d, 0x0a, 0xb9, 0x02, 0x6a, 0x6a, 0xba,
-0xb3, 0xb3, 0xc9, 0x0b, 0xd0, 0xc0, 0xc2, 0x27,  0xb1, 0xc5, 0x0d, 0xc9, 0xca, 0xca, 0x0e, 0xcd,
-0xb3, 0xd0, 0xd0, 0xb9, 0x09, 0xae, 0xd3, 0x01,  0xc4, 0xc5, 0xb9, 0x03, 0x48, 0x01, 0xda, 0xdc,
-0x0a, 0xde, 0xdf, 0x02, 0xe1, 0xd3, 0x23, 0xe4,  0x0e, 0xe6, 0xe8, 0x0a, 0x48, 0xeb, 0xec, 0xde,
-0xc8, 0xf0, 0xe2, 0xa0, 0x01, 0x1c, 0x08, 0x74,  0x90, 0x2c, 0x9d, 0x3a, 0x35, 0xdb, 0xd8, 0xb5,
-0x5b, 0x70, 0x0e, 0x5e, 0xbc, 0x71, 0x03, 0x09,  0xa2, 0xcb, 0xb7, 0x2c, 0xe1, 0xbe, 0x6f, 0x0c,
-0xfd, 0xc9, 0x0b, 0x38, 0x30, 0x5b, 0x36, 0x66,  0x0a, 0xdb, 0xe5, 0xca, 0xf8, 0x50, 0x18, 0x47,
-0x6b, 0x1e, 0xc9, 0x07, 0xe8, 0xb2, 0xb8, 0x6f,  0xc0, 0x37, 0x02, 0x03, 0x4a, 0x02, 0x2c, 0x36,
-0x21, 0xc2, 0xac, 0x8f, 0x02, 0x6d, 0xda, 0x64,  0xa7, 0xe6, 0xa5, 0x1a, 0x03, 0x95, 0x2c, 0x19,
-0xb8, 0x40, 0xd4, 0x26, 0xb6, 0x95, 0x11, 0x92,  0xee, 0xe4, 0xe6, 0xd2, 0xe7, 0x80, 0x34, 0x41,
-0x0d, 0x19, 0x88, 0x50, 0x21, 0xa9, 0x82, 0x88,  0xdb, 0x94, 0xee, 0xdc, 0xd9, 0xf3, 0x87, 0x00,
-0x98, 0x4f, 0xd1, 0x4d, 0x03, 0x9a, 0x83, 0xc1,  0x81, 0x08, 0x12, 0xb4, 0x2a, 0xd0, 0xca, 0x15,
-0xda, 0x81, 0x3f, 0x07, 0x06, 0x40, 0x80, 0x2a,  0x6f, 0x84, 0x81, 0x03, 0x07, 0x24, 0xa4, 0xdd,
-0xaa, 0x36, 0xcb, 0x82, 0xb7, 0x7f, 0xd4, 0xcc,  0x0d, 0x54, 0x57, 0x84, 0x81, 0x62, 0x07, 0x2a,
-0x34, 0x50, 0xab, 0x54, 0xc1, 0x00, 0xbc, 0x81,  0x95, 0xcd, 0x8d, 0xfa, 0xea, 0x70, 0x03, 0xbc,
-0xd6, 0x1a, 0x4c, 0x4d, 0x1a, 0xc0, 0x66, 0xca,  0xc7, 0x07, 0xfe, 0x8d, 0x6b, 0x50, 0x20, 0xb3,
-0x66, 0x83, 0xe9, 0xb2, 0xc5, 0x05, 0x2d, 0x5a,  0xd8, 0xe1, 0x00, 0x99, 0x45, 0xe7, 0xc3, 0x9b,
-0xad, 0xb5, 0xc9, 0x06, 0xb0, 0x35, 0xb7, 0x4e,  0x47, 0x1b, 0xef, 0x01, 0xca, 0x1b, 0x9f, 0x50,
-0x06, 0x4a, 0xce, 0xac, 0x6f, 0xdf, 0xc0, 0x0b,  0x9f, 0xc8, 0x5d, 0x8c, 0x81, 0xf3, 0xe7, 0x49,
-0x94, 0xbf, 0x68, 0x45, 0x3c, 0x9d, 0xf4, 0xeb,  0xd8, 0x69, 0x84, 0x00, 0x00, 0x21, 0xf9, 0x04,
-0x09, 0x0e, 0x00, 0x1f, 0x00, 0x2c, 0x0b, 0x00,  0x00, 0x00, 0x4a, 0x00, 0x28, 0x00, 0x00, 0x05,
-0xfe, 0xe0, 0x27, 0x8e, 0x64, 0x69, 0x9e, 0x68,  0xaa, 0xae, 0x6c, 0xeb, 0xbe, 0x70, 0xfc, 0x1a,
-0x86, 0x6c, 0xdf, 0xae, 0xb1, 0x10, 0x35, 0xee,  0xff, 0x22, 0xdd, 0xae, 0x17, 0x28, 0x02, 0x8f,
-0xb3, 0xc5, 0xf0, 0x13, 0x38, 0x4c, 0x26, 0x01,  0xa4, 0x54, 0xa5, 0x1b, 0x10, 0xa2, 0xce, 0x27,
-0x74, 0xca, 0x2d, 0x55, 0xaf, 0xcd, 0x27, 0x65,  0xdb, 0x2d, 0x1b, 0x06, 0xd6, 0x6b, 0x65, 0x42,
-0x19, 0x47, 0xcb, 0xe6, 0x74, 0xa0, 0x62, 0xb1,  0x50, 0x2c, 0x6f, 0x54, 0x91, 0x06, 0x8f, 0x19,
-0x08, 0x04, 0x10, 0x73, 0x13, 0x75, 0x64, 0x24,  0x34, 0x34, 0x09, 0x8a, 0x09, 0x3d, 0x7d, 0x2d,
-0x7f, 0x81, 0x83, 0x6c, 0x86, 0x1f, 0x06, 0x08,  0x8b, 0x8b, 0x02, 0x02, 0x8c, 0x8e, 0x8f, 0x81,
-0x82, 0x05, 0x6b, 0x14, 0x15, 0x79, 0x01, 0x0a,  0x0a, 0x02, 0x03, 0x4a, 0x0b, 0x09, 0x0b, 0x9a,
-0x9c, 0x9d, 0x54, 0x10, 0xb3, 0x01, 0x05, 0xa1,  0x13, 0xa4, 0x22, 0xa6, 0xa7, 0x0a, 0xab, 0x4a,
-0x9a, 0xaf, 0x8d, 0xb1, 0x5e, 0x0c, 0x0b, 0xb4,  0x07, 0xb6, 0x15, 0x05, 0x01, 0x06, 0xbb, 0xbc,
-0xbe, 0x09, 0x9a, 0x03, 0x9b, 0xb0, 0xc3, 0x87,  0x0c, 0xa7, 0xcb, 0x08, 0x03, 0xb6, 0x9a, 0x0e,
-0xbc, 0xe0, 0xab, 0xad, 0x02, 0xae, 0x9b, 0xc2,  0xd6, 0x06, 0x0c, 0x0d, 0x0d, 0xa8, 0xd2, 0x68,
-0xd3, 0xdf, 0xe0, 0xcf, 0x4a, 0xd1, 0xe5, 0xd5,  0xd6, 0x95, 0xea, 0xeb, 0xa9, 0xef, 0xef, 0xf1,
-0xf2, 0xbd, 0xe8, 0xfd, 0x22, 0x30, 0xe0, 0x5e,  0xac, 0x00, 0xfa, 0x1a, 0xb8, 0xeb, 0x37, 0xe0,
-0x1f, 0x40, 0x25, 0xaa, 0x5c, 0x11, 0x1c, 0xd0,  0x0c, 0x1f, 0x42, 0x07, 0xfb, 0xd0, 0x14, 0xe9,
-0xe7, 0x50, 0x9e, 0x2f, 0x89, 0x68, 0xce, 0xe4,  0xe9, 0x14, 0xc0, 0x81, 0x49, 0x07, 0xa9, 0xd6,
-0x36, 0x72, 0x3c, 0x15, 0x01, 0x60, 0xc4, 0x1d,  0x02, 0x26, 0x8a, 0xb4, 0x56, 0xf2, 0x64, 0x4a,
-0x86, 0x02, 0xe2, 0xb5, 0x94, 0x17, 0xf1, 0x00,  0xa0, 0x03, 0x03, 0x20, 0xcc, 0x1c, 0x56, 0xd3,
-0x24, 0xc3, 0x77, 0x39, 0x59, 0x2a, 0x55, 0x80,  0x86, 0x80, 0x4f, 0x40, 0x68, 0x84, 0x8e, 0x24,
-0x69, 0x72, 0x5d, 0x83, 0xa3, 0x39, 0x75, 0x46,  0xd8, 0x7a, 0x4a, 0x15, 0xa0, 0x89, 0x51, 0x2b,
-0xd2, 0x5c, 0x37, 0x61, 0x67, 0xbf, 0xac, 0x3b,  0xb7, 0x72, 0xb5, 0xb2, 0xa3, 0xdf, 0x81, 0x03,
-0xe7, 0x86, 0x19, 0xb8, 0x40, 0xb7, 0x25, 0x3f,  0xb4, 0x5c, 0x15, 0xa8, 0x65, 0xfa, 0x16, 0x0d,
-0xd0, 0x01, 0x6f, 0xe3, 0xc6, 0x32, 0x10, 0xa1,  0x02, 0xd7, 0x93, 0x26, 0xf5, 0x72, 0xdd, 0x1a,
-0xa0, 0xa5, 0xc6, 0xbe, 0x7e, 0xa7, 0xe2, 0x6b,  0x46, 0x83, 0xc1, 0x81, 0x08, 0x12, 0xd4, 0xb6,
-0x6c, 0x59, 0xa4, 0xb3, 0xe7, 0xb7, 0xa0, 0x25,  0xe3, 0x1b, 0x61, 0xe0, 0xad, 0x84, 0xcc, 0x69,
-0x45, 0x37, 0x29, 0xf2, 0xd6, 0xc8, 0xe8, 0x13,  0x06, 0xd6, 0x1d, 0xa8, 0xd0, 0x40, 0xad, 0x68,
-0x5d, 0xad, 0x0f, 0xb8, 0x7e, 0x7d, 0x48, 0xf6,  0x01, 0xab, 0x0d, 0x04, 0x93, 0x58, 0xad, 0xfb,
-0x36, 0xba, 0x75, 0x05, 0x80, 0x07, 0x6f, 0x51,  0x64, 0x9d, 0x71, 0xb9, 0x34, 0x94, 0x0b, 0x3f,
-0x11, 0xc0, 0x39, 0x6f, 0x13, 0x88, 0x10, 0xc5,  0xd8, 0x7d, 0xbd, 0xbb, 0xf7, 0xef, 0xe0, 0xc3,
-0x8b, 0x1f, 0x4f, 0xde, 0x7b, 0x08, 0x00, 0x21,  0xf9, 0x04, 0x09, 0x0e, 0x00, 0x1f, 0x00, 0x2c,
-0x09, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x28, 0x00,  0x00, 0x05, 0xfe, 0xe0, 0x27, 0x8e, 0x64, 0x69,
-0x9e, 0x68, 0xaa, 0xae, 0x6c, 0xeb, 0xbe, 0x70,  0x2c, 0xcf, 0x74, 0x6d, 0xdf, 0x78, 0xae, 0xef,
-0x7c, 0x7f, 0x1b, 0x06, 0x9f, 0x50, 0x65, 0x58,  0x10, 0x82, 0xc3, 0xe4, 0xa8, 0x68, 0x44, 0x06,
-0x9e, 0x4a, 0x1f, 0xf3, 0xf8, 0x09, 0x1c, 0x26,  0x93, 0x40, 0x94, 0x57, 0x1c, 0x10, 0xb4, 0x57,
-0x6c, 0x76, 0xab, 0xeb, 0x7e, 0xad, 0x58, 0xca,  0x98, 0x8c, 0x33, 0x0c, 0xbc, 0xdf, 0xca, 0x84,
-0xa2, 0xd6, 0xa6, 0x9e, 0x01, 0x20, 0x9b, 0x08,  0x0f, 0x54, 0x2c, 0x16, 0x14, 0x16, 0x76, 0x25,
-0x40, 0x06, 0x09, 0x88, 0x88, 0x48, 0x7b, 0x26,  0x06, 0x04, 0x04, 0x10, 0x7e, 0x13, 0x80, 0x6b,
-0x4b, 0x08, 0x89, 0x89, 0x02, 0x02, 0x09, 0x8b,  0x8c, 0x4b, 0x8f, 0x91, 0x72, 0x73, 0x95, 0x55,
-0x0a, 0x0a, 0x02, 0x03, 0x0b, 0xaa, 0x09, 0x0b,  0x9a, 0x9c, 0x9e, 0x24, 0x8e, 0x10, 0x91, 0x05,
-0x72, 0x14, 0x15, 0x76, 0x4f, 0xa6, 0xa6, 0xaa,  0xbd, 0x9a, 0xae, 0x9d, 0x8c, 0x06, 0xb3, 0xb4,
-0xb5, 0x13, 0xb8, 0xa5, 0xbb, 0xbc, 0xbd, 0x09,  0x9a, 0x03, 0x9b, 0xaf, 0x9e, 0x06, 0x0c, 0x0b,
-0xb3, 0x56, 0x05, 0xb5, 0x05, 0x79, 0xca, 0xca,  0xcc, 0xad, 0xad, 0x9b, 0xc1, 0x64, 0xd3, 0xa6,
-0xda, 0x08, 0x03, 0xd8, 0x9a, 0x0e, 0xdc, 0xdd,  0xab, 0x02, 0xe0, 0xd1, 0x7b, 0xd3, 0x0d, 0x0d,
-0xa7, 0xce, 0x6f, 0xcf, 0xeb, 0xec, 0xcb, 0x0b,  0xac, 0xad, 0x04, 0x03, 0xe2, 0x8d, 0x63, 0x40,
-0xaf, 0x01, 0x2a, 0x7c, 0xf8, 0xf4, 0xed, 0x53,  0xa0, 0x2a, 0xd5, 0xbf, 0x37, 0x41, 0x08, 0x29,
-0x09, 0x40, 0x90, 0x9e, 0x33, 0x3c, 0x09, 0x17,  0xf2, 0x53, 0x25, 0x00, 0xe0, 0x00, 0x03, 0x01,
-0x1e, 0x48, 0x1c, 0x42, 0xd1, 0x81, 0xc5, 0x01,  0x01, 0xdf, 0x14, 0x3c, 0xc9, 0xa8, 0xd1, 0xa1,
-0x91, 0x8e, 0x10, 0x07, 0x88, 0xdc, 0x12, 0xc0,  0x81, 0x4d, 0x07, 0xa8, 0xf0, 0x04, 0x60, 0x19,
-0x61, 0x9f, 0xc3, 0x03, 0x8f, 0x0e, 0x0c, 0x80,  0xe0, 0x26, 0x12, 0xcd, 0x9b, 0x38, 0x51, 0xae,
-0x7c, 0x23, 0x40, 0x5f, 0x4f, 0x53, 0x4f, 0xdf,  0x10, 0x00, 0xfa, 0xe8, 0x0d, 0x51, 0xa3, 0x47,
-0x6f, 0x22, 0x44, 0xd8, 0x14, 0xaa, 0x82, 0x08,  0x60, 0x4d, 0xa5, 0x7a, 0xe4, 0xd1, 0x2a, 0x48,
-0x36, 0x35, 0x4d, 0xd2, 0xdb, 0x9a, 0xcf, 0xe9,  0xd7, 0xb0, 0x5e, 0x8c, 0x20, 0x3c, 0x70, 0x40,
-0xdc, 0x44, 0x7a, 0x13, 0xa2, 0xe2, 0x6b, 0xea,  0xe0, 0x69, 0x84, 0x04, 0x60, 0x13, 0xec, 0xa4,
-0xfb, 0x46, 0xe8, 0x00, 0xba, 0x76, 0x95, 0x18,  0xb8, 0xc0, 0xb8, 0xe7, 0x41, 0xbe, 0x60, 0x7b,
-0x0a, 0xd6, 0xb9, 0x13, 0x02, 0xe1, 0xc2, 0x23,  0xc7, 0x45, 0xa8, 0x10, 0x16, 0xe9, 0xba, 0xc8,
-0x2a, 0x4d, 0xe0, 0xa1, 0x4b, 0x3a, 0xf3, 0xb8,  0x3c, 0xd3, 0x0e, 0x44, 0x90, 0x10, 0xb9, 0x67,
-0x04, 0xd3, 0x22, 0x46, 0x1f, 0xc0, 0x0a, 0x6b,  0x09, 0x5d, 0x09, 0xac, 0x9f, 0xc2, 0x8e, 0x4d,
-0xd7, 0x0a, 0xed, 0xda, 0x1f, 0x0c, 0xd0, 0x3b,  0x50, 0xa1, 0x01, 0xd8, 0xdd, 0x23, 0xac, 0xf8,
-0x46, 0xbe, 0x45, 0x78, 0x03, 0xba, 0x05, 0x99,  0x27, 0x0f, 0x40, 0x4f, 0x7a, 0x12, 0xe7, 0x05,
-0x0a, 0x36, 0xb0, 0x9e, 0xbc, 0x3a, 0xf0, 0xe0,  0x40, 0xb4, 0x37, 0x48, 0x7c, 0x87, 0xbb, 0x62,
-0x43, 0x7a, 0xbe, 0xab, 0x5f, 0xcf, 0xbe, 0x45,  0x08, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x2e, 0x00,
-0x1f, 0x00, 0x2c, 0x07, 0x00, 0x00, 0x00, 0x4a,  0x00, 0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27,
-0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c,  0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d, 0xdf,
-0x78, 0xae, 0xef, 0x7c, 0xef, 0xff, 0x40, 0x83,  0x01, 0x48, 0x34, 0x19, 0x16, 0x84, 0x61, 0xb1,
-0x78, 0x44, 0x2a, 0x03, 0xd0, 0x65, 0xaf, 0x99,  0xfc, 0x04, 0x0e, 0x93, 0x49, 0x40, 0xba, 0x3b,
-0x0e, 0x08, 0x5b, 0x6c, 0x56, 0xcb, 0xcd, 0x79,  0xc1, 0xd7, 0x2c, 0x85, 0x5c, 0xbe, 0x19, 0x06,
-0x5f, 0x70, 0x65, 0x42, 0x59, 0x6f, 0xdb, 0xee,  0x78, 0xa0, 0x62, 0xb1, 0x50, 0x2c, 0x77, 0x78,
-0x35, 0x06, 0x04, 0x04, 0x10, 0x7b, 0x13, 0x7d,  0x6c, 0x82, 0x34, 0x84, 0x86, 0x88, 0x74, 0x8b,
-0x8c, 0x32, 0x84, 0x10, 0x87, 0x05, 0x73, 0x14,  0x15, 0x81, 0x1f, 0x42, 0x9e, 0x4a, 0x93, 0x28,
-0x06, 0x96, 0x97, 0x98, 0x13, 0x9b, 0x9d, 0x42,  0x08, 0x09, 0xac, 0xac, 0x42, 0xa1, 0x46, 0x0c,
-0x0b, 0x96, 0x57, 0x05, 0x98, 0x05, 0x01, 0x06,  0x0a, 0xbb, 0x0a, 0x02, 0x03, 0x0b, 0xc0, 0xae,
-0xb0, 0x24, 0x06, 0x0c, 0xbb, 0xb8, 0x08, 0x03,  0xb6, 0x02, 0x02, 0x0e, 0xbc, 0xbb, 0xc0, 0xc0,
-0xcc, 0x09, 0xa0, 0xa1, 0xc5, 0x0d, 0x0d, 0xbd,  0xcc, 0x70, 0x70, 0xcd, 0xcf, 0x0a, 0xd1, 0xd2,
-0x02, 0xd4, 0xc3, 0xd7, 0xd8, 0xbe, 0xdc, 0xdc,  0xce, 0xdf, 0xd1, 0xcc, 0xd3, 0xd5, 0x78, 0x01,
-0x0c, 0xd8, 0x0d, 0xdb, 0x50, 0x01, 0xea, 0xdf,  0xd0, 0x0b, 0xdb, 0xe3, 0xe4, 0x8c, 0xf2, 0x1c,
-0x9c, 0x1b, 0x10, 0x40, 0x01, 0x94, 0x7c, 0xfa,  0xda, 0xf1, 0x1b, 0x07, 0xaf, 0x4c, 0x00, 0x07,
-0x10, 0x1d, 0xf8, 0xba, 0x87, 0x0f, 0xce, 0xba,  0x84, 0xcc, 0x16, 0xfe, 0x13, 0xf4, 0x30, 0xe2,
-0xc4, 0x83, 0xdd, 0x2e, 0xb2, 0xfb, 0xc5, 0x8f,  0xc0, 0x80, 0x8d, 0x6d, 0xb9, 0x3a, 0x42, 0x4c,
-0x97, 0xce, 0x5b, 0x04, 0x7d, 0x70, 0xa4, 0x99,  0x1c, 0x60, 0x80, 0x13, 0x97, 0x8e, 0xf4, 0x58,
-0x0e, 0x68, 0xe6, 0x20, 0xc2, 0xcb, 0x6f, 0x24,  0x4b, 0xc2, 0x31, 0xf0, 0xc0, 0xe6, 0x92, 0x00,
-0xd8, 0x26, 0xfc, 0x6c, 0x09, 0xd1, 0xe7, 0xcf,  0xa5, 0x24, 0x09, 0x08, 0x98, 0x49, 0xd4, 0xe8,
-0x12, 0x03, 0x17, 0xb2, 0xbe, 0x44, 0xc7, 0xd3,  0xa9, 0xd7, 0x5d, 0x24, 0x0f, 0x14, 0x3a, 0x30,
-0x00, 0x42, 0x55, 0x41, 0x06, 0x22, 0x54, 0xf0,  0xa9, 0x20, 0x22, 0x44, 0x05, 0x5e, 0x9d, 0x2a,
-0xf8, 0xb2, 0x40, 0x6c, 0x21, 0x38, 0x66, 0xad,  0x4a, 0xa9, 0x29, 0x84, 0xc1, 0x81, 0x08, 0x12,
-0xbe, 0xbe, 0x94, 0x3b, 0xe0, 0x80, 0xdd, 0x74,  0x66, 0x87, 0x89, 0x30, 0x60, 0x58, 0x42, 0xe0,
-0xa7, 0x5f, 0x75, 0x1a, 0x3e, 0xd0, 0x70, 0x92,  0x01, 0x6c, 0x07, 0x2a, 0x34, 0x88, 0xeb, 0xb3,
-0x01, 0xcb, 0xc9, 0x86, 0x2b, 0xa3, 0xc5, 0x7c,  0x80, 0x5e, 0x83, 0x4f, 0x6f, 0xb8, 0x81, 0x0e,
-0xad, 0xb8, 0x13, 0xb6, 0x02, 0xa6, 0x4f, 0xbb,  0x6e, 0xc0, 0xc0, 0xef, 0x6a, 0xc3, 0x7a, 0xd1,
-0x0a, 0x89, 0x3d, 0xe4, 0x32, 0xbd, 0xda, 0xc0,  0x83, 0x8b, 0xb6, 0x8c, 0x7a, 0x31, 0x6a, 0x8a,
-0xc8, 0x5b, 0x2b, 0x87, 0x11, 0x02, 0x00, 0x21,  0xf9, 0x04, 0x09, 0x0c, 0x00, 0x1f, 0x00, 0x2c,
-0x03, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x28, 0x00,  0x00, 0x05, 0xfe, 0xe0, 0x27, 0x8e, 0x64, 0x69,
-0x9e, 0x68, 0xaa, 0xae, 0x6c, 0xeb, 0xbe, 0x70,  0x2c, 0xcf, 0x74, 0x6d, 0xdf, 0x78, 0x6a, 0x18,
-0x79, 0x4f, 0x1b, 0x0b, 0x02, 0xcf, 0x47, 0x6c,  0x01, 0x83, 0xc3, 0x80, 0xb2, 0xc8, 0x2c, 0x1d,
-0x85, 0x9f, 0xc0, 0x61, 0x32, 0x09, 0x34, 0xaf,  0xc0, 0x01, 0xc1, 0x3a, 0xa5, 0x56, 0xaf, 0xcc,
-0xec, 0x56, 0x4a, 0xa5, 0x7c, 0xc1, 0x44, 0xc3,  0x40, 0xbb, 0xad, 0x4c, 0x28, 0x66, 0x2b, 0x3a,
-0xcd, 0x0e, 0x54, 0x2c, 0x16, 0x8a, 0x45, 0x3e,  0xef, 0x19, 0x08, 0x04, 0x10, 0x76, 0x13, 0x78,
-0x67, 0x7d, 0x39, 0x7f, 0x81, 0x83, 0x6f, 0x86,  0x87, 0x37, 0x7f, 0x10, 0x82, 0x05, 0x6e, 0x14,
-0x15, 0x7c, 0x8e, 0x36, 0x06, 0x91, 0x92, 0x93,  0x13, 0x96, 0x98, 0x8f, 0x0c, 0x0b, 0x91, 0x52,
-0x05, 0x93, 0x05, 0x01, 0x06, 0x97, 0xa0, 0x30,  0x06, 0x0c, 0x0a, 0x0a, 0xa8, 0x08, 0x03, 0xa6,
-0x02, 0x02, 0x0e, 0x0a, 0xa9, 0x3b, 0x43, 0xac,  0x2b, 0xae, 0x0d, 0x0d, 0x0a, 0xb6, 0x02, 0x6b,
-0x6b, 0xb7, 0xb0, 0x09, 0xc9, 0x09, 0x3b, 0xbd,  0x2a, 0xbf, 0xc0, 0xc4, 0xc5, 0xc5, 0xb8, 0x0a,
-0x03, 0x0b, 0xd7, 0xc9, 0xbc, 0xcd, 0x24, 0x01,  0x0c, 0xc0, 0x0d, 0xb6, 0x03, 0x4a, 0x01, 0xd3,
-0xb0, 0xd7, 0xd7, 0xb6, 0xcb, 0xdb, 0x25, 0xdd,  0x0e, 0xd0, 0xe2, 0xb9, 0xe4, 0x6b, 0xd4, 0xe7,
-0xe8, 0x02, 0xea, 0xeb, 0x22, 0x01, 0x0e, 0xfc,  0x0e, 0xc4, 0xe3, 0xf2, 0x06, 0x50, 0x53, 0x70,
-0x6e, 0xd8, 0x3d, 0x6d, 0xcd, 0xf6, 0xf5, 0xfb,  0xa7, 0xa4, 0xd8, 0x31, 0x58, 0x04, 0x17, 0x84,
-0xbb, 0x87, 0x6f, 0x9b, 0x42, 0x7e, 0xd2, 0xa4,  0x1d, 0x8b, 0x60, 0x0e, 0x9d, 0xc4, 0x83, 0xf9,
-0x14, 0x7e, 0xcb, 0x38, 0xe0, 0x96, 0x83, 0x08,  0x1c, 0xbf, 0xcd, 0xd9, 0xfa, 0x98, 0xa0, 0xc1,
-0x2a, 0x50, 0x01, 0x80, 0x4d, 0x48, 0xa9, 0x91,  0x1f, 0xca, 0x94, 0x04, 0xad, 0x49, 0x24, 0x30,
-0xa0, 0x62, 0x33, 0x03, 0x17, 0x82, 0x72, 0x8c,  0x66, 0xf2, 0x26, 0xce, 0x35, 0xe8, 0x78, 0x0e,
-0x50, 0xb5, 0xce, 0x40, 0x84, 0x0a, 0x28, 0x15,  0xf4, 0xe3, 0xa7, 0xc0, 0x28, 0x2c, 0xa4, 0x49,
-0xd7, 0x18, 0x78, 0xf0, 0x12, 0x93, 0xaa, 0x1d,  0x0c, 0x0e, 0x44, 0x90, 0x60, 0x95, 0x26, 0x56,
-0x02, 0x02, 0x94, 0x6e, 0xed, 0xda, 0xcb, 0xc0,  0x81, 0x03, 0x12, 0xc8, 0xa6, 0x8c, 0x8a, 0xf5,
-0x00, 0xa0, 0x03, 0x03, 0x20, 0xac, 0xcd, 0x37,  0xc2, 0x00, 0xb0, 0x03, 0x15, 0x1a, 0x18, 0x8d,
-0xb0, 0x86, 0xc0, 0x02, 0xbb, 0x80, 0xd6, 0xe8,  0x65, 0xdb, 0x2b, 0xe6, 0x81, 0x98, 0xc0, 0x74,
-0x15, 0x7b, 0x9b, 0xb8, 0x98, 0x5e, 0xbe, 0x23,  0x62, 0xe6, 0xfa, 0x36, 0x4e, 0x0d, 0xc9, 0x01,
-0x6f, 0x0f, 0x20, 0x0c, 0x19, 0x0c, 0xb2, 0x1c,  0x35, 0x01, 0xd7, 0x84, 0x7e, 0x3b, 0x7a, 0x5d,
-0xcc, 0x54, 0xc0, 0x78, 0x8c, 0x23, 0xac, 0x7a,  0xb5, 0x68, 0xcc, 0xdc, 0xac, 0x8c, 0xd3, 0x87,
-0xf2, 0x81, 0xed, 0xd0, 0x8c, 0x71, 0x67, 0x06,  0xc6, 0xa0, 0xb8, 0x71, 0xe3, 0xad, 0x85, 0x3b,
-0xd9, 0x01, 0xb0, 0xb9, 0xf2, 0xe7, 0x2a, 0x42,  0x00, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x0c, 0x00,
-0x1f, 0x00, 0x2c, 0x02, 0x00, 0x00, 0x00, 0x4a,  0x00, 0x28, 0x00, 0x00, 0x05, 0xfe, 0xe0, 0x27,
-0x8e, 0x64, 0x69, 0x9e, 0x68, 0xaa, 0xae, 0x6c,  0xeb, 0xbe, 0x70, 0x2c, 0xcf, 0x74, 0x6d, 0xdf,
-0x78, 0xae, 0xef, 0xb2, 0x61, 0xf0, 0x40, 0x97,  0x81, 0xb0, 0xf8, 0x05, 0x8f, 0xa3, 0x80, 0x52,
-0x34, 0x5c, 0x14, 0x91, 0xc7, 0xc0, 0x64, 0x72,  0x08, 0x7c, 0x9a, 0x4f, 0x28, 0x4f, 0x3a, 0xa5,
-0x7e, 0x02, 0x84, 0x41, 0x56, 0xab, 0x93, 0x52,  0xa6, 0x55, 0xb0, 0xd8, 0x48, 0xce, 0x99, 0xcf,
-0x15, 0x70, 0x78, 0xc0, 0x6e, 0xdf, 0x02, 0x16,  0x8a, 0xc5, 0x12, 0x27, 0x84, 0xeb, 0x76, 0x31,
-0x4a, 0x83, 0x52, 0x7b, 0x13, 0x71, 0x10, 0x7e,  0x80, 0x81, 0x2d, 0x4a, 0x02, 0x8f, 0x8f, 0x66,
-0x53, 0x88, 0x8a, 0x8c, 0x30, 0x8e, 0x90, 0x02,  0x0f, 0x01, 0x15, 0x70, 0x05, 0x01, 0x10, 0x89,
-0x8b, 0x96, 0x28, 0x06, 0x09, 0x99, 0x8f, 0x0a,  0x9c, 0x87, 0x05, 0x9f, 0xa1, 0x10, 0xa3, 0xa4,
-0x25, 0xa6, 0xa8, 0x02, 0x0a, 0x06, 0x01, 0x05,  0x15, 0xad, 0x55, 0xa1, 0x0b, 0x0c, 0xb1, 0xb2,
-0x57, 0x09, 0xa7, 0x03, 0xc4, 0xb6, 0x0a, 0x0e,  0x8f, 0xad, 0x03, 0x08, 0xb9, 0x0a, 0x0a, 0xc0,
-0xc2, 0xa5, 0xa7, 0x02, 0xc6, 0xa9, 0xc9, 0xd6,  0x03, 0xdb, 0x90, 0x0a, 0x0d, 0x0d, 0xd2, 0xd3,
-0x24, 0x01, 0x0d, 0xd5, 0xd7, 0xc8, 0x0e, 0xdb,  0xea, 0xdc, 0xdf, 0xe0, 0xc1, 0x96, 0x6a, 0x04,
-0xda, 0xf2, 0xd0, 0xe9, 0xdb, 0x83, 0x03, 0x8f,  0xed, 0x0c, 0x56, 0xe2, 0x22, 0x01, 0xdb, 0xe4,
-0xa9, 0x43, 0xa7, 0x4e, 0x89, 0xaa, 0x7c, 0xdf,  0x1c, 0xf0, 0xf3, 0xf7, 0x2f, 0xa0, 0xb6, 0x6d,
-0xf5, 0x0a, 0xe2, 0x13, 0xe0, 0xa0, 0xa2, 0x83,  0x7e, 0xfe, 0x00, 0x0e, 0x10, 0xa8, 0xae, 0xde,
-0xc3, 0x89, 0x16, 0x2f, 0x32, 0xfc, 0x02, 0x61,  0xc0, 0x81, 0x75, 0x10, 0x9c, 0x95, 0xa1, 0x54,
-0x17, 0x12, 0xa3, 0x38, 0x50, 0x2b, 0xb7, 0x45,  0xa8, 0xf8, 0x60, 0x65, 0xbb, 0x8a, 0x2e, 0xa7,
-0xc1, 0xdc, 0x38, 0x07, 0xe2, 0xcc, 0x07, 0x0f,  0x07, 0x40, 0x8b, 0x30, 0xe1, 0x5b, 0xce, 0x69,
-0x06, 0x0e, 0x1c, 0xf0, 0x33, 0x67, 0x68, 0x84,  0x07, 0x50, 0xb9, 0x29, 0x88, 0x70, 0xa1, 0xea,
-0x3b, 0x4b, 0x49, 0x95, 0x32, 0x95, 0x19, 0x21,  0x42, 0xb2, 0x90, 0x53, 0x23, 0x54, 0x88, 0x70,
-0x15, 0xab, 0xd2, 0xa5, 0x7e, 0x06, 0x78, 0xed,  0xda, 0x55, 0x42, 0x84, 0x03, 0xc0, 0x70, 0x95,
-0x85, 0x17, 0xe0, 0x2c, 0xd3, 0x07, 0x4e, 0x25,  0x48, 0x50, 0x3a, 0x57, 0xe7, 0x59, 0xbb, 0x01,
-0xf0, 0x42, 0x1d, 0xdc, 0x57, 0x98, 0x92, 0x34,  0x4a, 0x7c, 0x08, 0x56, 0xf2, 0xa0, 0xc1, 0xd1,
-0x91, 0x49, 0x94, 0xf6, 0x0b, 0x80, 0x0b, 0xef,  0x64, 0x6f, 0x8f, 0x21, 0x07, 0x50, 0x95, 0x64,
-0x40, 0x60, 0xce, 0x5f, 0x30, 0x43, 0x3e, 0xb1,  0x64, 0xdc, 0x67, 0x8c, 0xe4, 0x32, 0x8f, 0x26,
-0x9d, 0xb3, 0xf4, 0xea, 0xd7, 0xb0, 0xed, 0x84,  0x00, 0x00, 0x3b
-};
+static unsigned char inetDownload = { 0x47,
+	0x49,
+	0x46,
+	0x38,
+	0x39,
+	0x61,
+	0x72,
+	0x00,
+	0x28,
+	0x00,
+	0x84,
+	0x0a,
+	0x00,
+	0x00,
+	0xff,
+	0xff,
+	0x00,
+	0x00,
+	0x00,
+	0xcf,
+	0xcf,
+	0xcf,
+	0xb0,
+	0xb0,
+	0xb0,
+	0x9f,
+	0x9f,
+	0x9f,
+	0xa0,
+	0xa0,
+	0xa0,
+	0x20,
+	0x20,
+	0x20,
+	0x8f,
+	0x8f,
+	0x8f,
+	0x5f,
+	0x5f,
+	0x5f,
+	0xd0,
+	0xd0,
+	0xd0,
+	0xff,
+	0xff,
+	0xff,
+	0xbf,
+	0xbf,
+	0xbf,
+	0x6f,
+	0x6f,
+	0x6f,
+	0xef,
+	0xef,
+	0xef,
+	0xe0,
+	0xe0,
+	0xe0,
+	0xc0,
+	0xc0,
+	0xc0,
+	0x80,
+	0x80,
+	0x80,
+	0xff,
+	0xf0,
+	0xef,
+	0xff,
+	0xef,
+	0xd0,
+	0xff,
+	0xd0,
+	0xd0,
+	0xff,
+	0xaf,
+	0xc0,
+	0x70,
+	0x70,
+	0x70,
+	0xff,
+	0xaf,
+	0xaf,
+	0xff,
+	0xc0,
+	0xaf,
+	0x9a,
+	0x9a,
+	0x9a,
+	0x89,
+	0x89,
+	0x89,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0xff,
+	0x21,
+	0xff,
+	0x0b,
+	0x4e,
+	0x45,
+	0x54,
+	0x53,
+	0x43,
+	0x41,
+	0x50,
+	0x45,
+	0x32,
+	0x2e,
+	0x30,
+	0x03,
+	0x01,
+	0x00,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x24,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0xc0,
+	0xa0,
+	0x30,
+	0x67,
+	0x30,
+	0x0c,
+	0x8f,
+	0x06,
+	0xc2,
+	0xc2,
+	0x78,
+	0xe4,
+	0x05,
+	0x9e,
+	0xa2,
+	0xe4,
+	0x62,
+	0xd9,
+	0xd4,
+	0x05,
+	0x26,
+	0x93,
+	0x43,
+	0xe0,
+	0x23,
+	0xa5,
+	0x56,
+	0x6f,
+	0x57,
+	0x6c,
+	0xf6,
+	0x13,
+	0x20,
+	0x0c,
+	0xbc,
+	0xdf,
+	0xda,
+	0x95,
+	0x82,
+	0xd5,
+	0x96,
+	0xcf,
+	0xcc,
+	0x34,
+	0x6d,
+	0xcd,
+	0xae,
+	0x94,
+	0xcd,
+	0x83,
+	0xb8,
+	0x5c,
+	0x16,
+	0xb0,
+	0x50,
+	0x2c,
+	0x16,
+	0x76,
+	0x04,
+	0x66,
+	0x7a,
+	0x7b,
+	0x31,
+	0x57,
+	0x80,
+	0x13,
+	0x76,
+	0x10,
+	0x83,
+	0x85,
+	0x86,
+	0x2f,
+	0x6b,
+	0x58,
+	0x8b,
+	0x8d,
+	0x8f,
+	0x29,
+	0x45,
+	0x97,
+	0x7a,
+	0x01,
+	0x15,
+	0x75,
+	0x05,
+	0x01,
+	0x10,
+	0x8c,
+	0x8e,
+	0x95,
+	0x45,
+	0x09,
+	0xa4,
+	0xa4,
+	0x08,
+	0x97,
+	0x64,
+	0x15,
+	0x8a,
+	0x05,
+	0x9d,
+	0x9f,
+	0x10,
+	0xa1,
+	0x86,
+	0x06,
+	0xa4,
+	0x53,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0xb8,
+	0x0a,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xac,
+	0x5a,
+	0x9f,
+	0x0b,
+	0x0c,
+	0xb0,
+	0x69,
+	0xb2,
+	0x02,
+	0x02,
+	0xb4,
+	0x0b,
+	0xb9,
+	0xb8,
+	0x0e,
+	0xc7,
+	0xac,
+	0x03,
+	0x08,
+	0xbc,
+	0xb8,
+	0xc3,
+	0x95,
+	0x51,
+	0x09,
+	0xc7,
+	0xc9,
+	0xca,
+	0xcb,
+	0xcd,
+	0x03,
+	0xdd,
+	0xb6,
+	0xc7,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xd4,
+	0x8f,
+	0xc6,
+	0xc7,
+	0xc8,
+	0x53,
+	0xcb,
+	0xcc,
+	0xde,
+	0xec,
+	0x02,
+	0xe2,
+	0xe3,
+	0xc4,
+	0x43,
+	0xb2,
+	0xd7,
+	0xdf,
+	0xe9,
+	0xea,
+	0x0a,
+	0x0e,
+	0xde,
+	0x4f,
+	0x01,
+	0xdf,
+	0xef,
+	0x0c,
+	0x5b,
+	0x7b,
+	0xcc,
+	0x2d,
+	0x40,
+	0xa7,
+	0x4d,
+	0x5d,
+	0xbe,
+	0x6e,
+	0x4f,
+	0x14,
+	0xf0,
+	0x73,
+	0xd7,
+	0xc0,
+	0xc1,
+	0xbf,
+	0x58,
+	0xd7,
+	0x90,
+	0x61,
+	0xbb,
+	0xb7,
+	0x0e,
+	0xe1,
+	0x3e,
+	0x5b,
+	0x0e,
+	0x32,
+	0x3a,
+	0x00,
+	0x58,
+	0x2c,
+	0xc1,
+	0x00,
+	0x02,
+	0xe8,
+	0xce,
+	0x50,
+	0xc4,
+	0x27,
+	0x40,
+	0xdf,
+	0x13,
+	0x8c,
+	0x1a,
+	0xb7,
+	0x39,
+	0x56,
+	0x09,
+	0x60,
+	0xa0,
+	0x1b,
+	0xc8,
+	0x29,
+	0xdd,
+	0xee,
+	0x45,
+	0x20,
+	0xc9,
+	0x8e,
+	0x9d,
+	0xc6,
+	0x8d,
+	0x69,
+	0xf8,
+	0xb5,
+	0xfc,
+	0x48,
+	0x70,
+	0x80,
+	0xcc,
+	0x08,
+	0x19,
+	0x4b,
+	0xd6,
+	0x7c,
+	0x97,
+	0x51,
+	0xe5,
+	0x11,
+	0x9d,
+	0x2e,
+	0x05,
+	0x28,
+	0xa9,
+	0xe5,
+	0x53,
+	0xc1,
+	0x4c,
+	0xa7,
+	0x11,
+	0x80,
+	0x72,
+	0xf3,
+	0x86,
+	0x2b,
+	0xc2,
+	0x04,
+	0x71,
+	0x46,
+	0x87,
+	0xe8,
+	0x84,
+	0x30,
+	0xe0,
+	0xc0,
+	0xa0,
+	0x03,
+	0x30,
+	0xab,
+	0x46,
+	0x1d,
+	0x2b,
+	0x55,
+	0xe8,
+	0xad,
+	0x08,
+	0x17,
+	0xd2,
+	0xc6,
+	0x03,
+	0xc2,
+	0x92,
+	0xeb,
+	0xc7,
+	0xaf,
+	0x0b,
+	0xcc,
+	0x40,
+	0x25,
+	0x3b,
+	0xf3,
+	0xa6,
+	0x03,
+	0xa8,
+	0x15,
+	0x22,
+	0xac,
+	0xfd,
+	0xd1,
+	0x96,
+	0xdd,
+	0xd7,
+	0x03,
+	0x3e,
+	0xc7,
+	0x3a,
+	0x9d,
+	0x1b,
+	0x41,
+	0x42,
+	0x84,
+	0x03,
+	0xc3,
+	0x76,
+	0xed,
+	0x0d,
+	0x62,
+	0xe0,
+	0x80,
+	0xe3,
+	0x9a,
+	0x81,
+	0xc9,
+	0x8a,
+	0x95,
+	0x20,
+	0xc1,
+	0xf1,
+	0x62,
+	0x24,
+	0x8e,
+	0x33,
+	0x0f,
+	0xa5,
+	0x1b,
+	0xb5,
+	0x41,
+	0x85,
+	0x03,
+	0xe2,
+	0x2e,
+	0x63,
+	0xce,
+	0xfc,
+	0xd8,
+	0x1b,
+	0x26,
+	0x03,
+	0xef,
+	0x1a,
+	0x38,
+	0x0e,
+	0x5d,
+	0x8d,
+	0x44,
+	0x00,
+	0xd2,
+	0xa4,
+	0x19,
+	0x30,
+	0x60,
+	0x8d,
+	0x3a,
+	0x75,
+	0x01,
+	0xd6,
+	0xad,
+	0xb9,
+	0xc8,
+	0xde,
+	0xcd,
+	0x3b,
+	0xb5,
+	0x91,
+	0xda,
+	0xef,
+	0x50,
+	0xe5,
+	0xde,
+	0x47,
+	0xfc,
+	0xc9,
+	0x69,
+	0x26,
+	0xc7,
+	0xab,
+	0x85,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0x9f,
+	0x06,
+	0xc3,
+	0x6f,
+	0x88,
+	0x32,
+	0x10,
+	0x16,
+	0x42,
+	0xe2,
+	0x2f,
+	0xc0,
+	0x14,
+	0x19,
+	0x17,
+	0x48,
+	0x65,
+	0x2f,
+	0x30,
+	0x99,
+	0x1c,
+	0x02,
+	0x9f,
+	0x67,
+	0x54,
+	0xaa,
+	0xa3,
+	0x56,
+	0xad,
+	0x9f,
+	0x00,
+	0x61,
+	0xb0,
+	0xe5,
+	0xe2,
+	0xa8,
+	0x94,
+	0xea,
+	0x55,
+	0x4c,
+	0x4e,
+	0x9a,
+	0x6f,
+	0xe8,
+	0x74,
+	0x45,
+	0x3c,
+	0x1e,
+	0xb8,
+	0xdf,
+	0xb5,
+	0x80,
+	0x85,
+	0x62,
+	0xb1,
+	0xcc,
+	0x09,
+	0x63,
+	0x77,
+	0x78,
+	0x34,
+	0x54,
+	0x7d,
+	0x13,
+	0x73,
+	0x10,
+	0x80,
+	0x82,
+	0x83,
+	0x32,
+	0x68,
+	0x55,
+	0x88,
+	0x8a,
+	0x8c,
+	0x36,
+	0x01,
+	0x15,
+	0x72,
+	0x05,
+	0x01,
+	0x10,
+	0x89,
+	0x8b,
+	0x92,
+	0x2f,
+	0x94,
+	0x87,
+	0x05,
+	0x97,
+	0x99,
+	0x10,
+	0x9b,
+	0x9c,
+	0x23,
+	0x41,
+	0xa7,
+	0x6e,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xa0,
+	0x57,
+	0x99,
+	0x0b,
+	0x0c,
+	0xa4,
+	0x92,
+	0x41,
+	0x09,
+	0xb6,
+	0xb6,
+	0x08,
+	0xa7,
+	0x0e,
+	0x02,
+	0x02,
+	0xa0,
+	0x03,
+	0x08,
+	0xab,
+	0x0a,
+	0x0a,
+	0xb2,
+	0xa5,
+	0x25,
+	0x06,
+	0xb6,
+	0x50,
+	0x0b,
+	0x03,
+	0x02,
+	0xc2,
+	0xc2,
+	0xbb,
+	0x03,
+	0xd0,
+	0xcb,
+	0xbc,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xc4,
+	0xc5,
+	0x59,
+	0x09,
+	0xbc,
+	0xc9,
+	0x0b,
+	0xcd,
+	0xce,
+	0xd1,
+	0xe0,
+	0x02,
+	0xd5,
+	0xd6,
+	0xb3,
+	0x66,
+	0xc7,
+	0xdb,
+	0xdc,
+	0xde,
+	0x0a,
+	0x0e,
+	0xd1,
+	0x4c,
+	0x01,
+	0xd2,
+	0xe3,
+	0x0c,
+	0x58,
+	0x9c,
+	0xe7,
+	0xbc,
+	0x02,
+	0xc9,
+	0xea,
+	0xeb,
+	0xed,
+	0x01,
+	0x0a,
+	0xef,
+	0xe2,
+	0x0d,
+	0x0e,
+	0xe4,
+	0xd1,
+	0xb3,
+	0x25,
+	0x40,
+	0x1a,
+	0x94,
+	0x7c,
+	0xfa,
+	0xa0,
+	0xb9,
+	0xf3,
+	0xe7,
+	0xa0,
+	0xa1,
+	0x83,
+	0x79,
+	0x8c,
+	0xea,
+	0x2d,
+	0xb8,
+	0x77,
+	0x30,
+	0xdf,
+	0x33,
+	0x85,
+	0x4c,
+	0x96,
+	0x39,
+	0x7c,
+	0x38,
+	0x70,
+	0xdb,
+	0x36,
+	0x84,
+	0xeb,
+	0x0a,
+	0x82,
+	0x8b,
+	0xb6,
+	0x11,
+	0x22,
+	0x9e,
+	0x63,
+	0x03,
+	0xbe,
+	0x08,
+	0x50,
+	0x24,
+	0x03,
+	0xb2,
+	0xa1,
+	0x48,
+	0x70,
+	0xe3,
+	0x1a,
+	0x9a,
+	0x34,
+	0x13,
+	0xc0,
+	0x00,
+	0x34,
+	0x95,
+	0x50,
+	0xa0,
+	0xe5,
+	0x8b,
+	0xa0,
+	0x20,
+	0x82,
+	0x4b,
+	0x70,
+	0xc2,
+	0x22,
+	0x4c,
+	0xa8,
+	0x36,
+	0x53,
+	0xca,
+	0x3b,
+	0x9b,
+	0x29,
+	0x29,
+	0x2a,
+	0xdb,
+	0x19,
+	0xa1,
+	0xe9,
+	0xcf,
+	0x65,
+	0x3d,
+	0x2f,
+	0x48,
+	0x2d,
+	0xb7,
+	0xc4,
+	0xce,
+	0x4d,
+	0x01,
+	0x47,
+	0x94,
+	0x0d,
+	0x08,
+	0x1a,
+	0xb4,
+	0x29,
+	0xcf,
+	0x8d,
+	0x0e,
+	0x7a,
+	0x46,
+	0xa8,
+	0x10,
+	0x81,
+	0xaa,
+	0x8f,
+	0xa3,
+	0x10,
+	0x06,
+	0x1c,
+	0x00,
+	0x74,
+	0x20,
+	0x67,
+	0x57,
+	0xaf,
+	0x62,
+	0x9b,
+	0x4a,
+	0x88,
+	0x70,
+	0x40,
+	0x96,
+	0x2a,
+	0xb3,
+	0x67,
+	0x47,
+	0xa5,
+	0x4d,
+	0xc9,
+	0x76,
+	0xc1,
+	0x98,
+	0xb8,
+	0x4d,
+	0xbb,
+	0x4a,
+	0x90,
+	0x70,
+	0xe0,
+	0x00,
+	0x5e,
+	0x25,
+	0x35,
+	0xf7,
+	0xde,
+	0x24,
+	0x50,
+	0x78,
+	0x2b,
+	0x5c,
+	0xaf,
+	0x11,
+	0x1a,
+	0x54,
+	0x38,
+	0x50,
+	0xed,
+	0xb0,
+	0x14,
+	0x03,
+	0x85,
+	0x0f,
+	0x8c,
+	0x74,
+	0x0c,
+	0xd9,
+	0xc0,
+	0xb8,
+	0x06,
+	0x85,
+	0x2b,
+	0x63,
+	0x73,
+	0x92,
+	0xb9,
+	0x31,
+	0x4c,
+	0xaf,
+	0x4c,
+	0x3c,
+	0x7f,
+	0x2e,
+	0x20,
+	0x7a,
+	0x34,
+	0xe6,
+	0xd2,
+	0x9a,
+	0xa3,
+	0xa1,
+	0x72,
+	0xf2,
+	0xb9,
+	0xc1,
+	0xa9,
+	0xd1,
+	0x22,
+	0x02,
+	0xc0,
+	0xce,
+	0xcc,
+	0x80,
+	0x41,
+	0xeb,
+	0x2c,
+	0xa8,
+	0x2c,
+	0x73,
+	0x31,
+	0xd0,
+	0xbb,
+	0xb8,
+	0xf1,
+	0xcf,
+	0x45,
+	0x71,
+	0x97,
+	0x58,
+	0xc8,
+	0x3c,
+	0xb8,
+	0x72,
+	0x13,
+	0x21,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0xb4,
+	0x61,
+	0xf0,
+	0x40,
+	0x97,
+	0x81,
+	0xb0,
+	0xf8,
+	0x05,
+	0x8f,
+	0xa3,
+	0x80,
+	0x52,
+	0x34,
+	0x5c,
+	0x14,
+	0x91,
+	0xc7,
+	0xc0,
+	0x64,
+	0x72,
+	0x08,
+	0x7c,
+	0x9a,
+	0x4f,
+	0x28,
+	0x4f,
+	0x3a,
+	0xa5,
+	0x7e,
+	0x02,
+	0x84,
+	0x41,
+	0x56,
+	0xab,
+	0x93,
+	0x52,
+	0xa6,
+	0x55,
+	0xb0,
+	0xd8,
+	0x48,
+	0xce,
+	0x99,
+	0xcf,
+	0x15,
+	0x70,
+	0x78,
+	0xc0,
+	0x6e,
+	0xdf,
+	0x02,
+	0x16,
+	0x8a,
+	0xc5,
+	0x12,
+	0x27,
+	0x84,
+	0xeb,
+	0x76,
+	0x36,
+	0x52,
+	0x7b,
+	0x13,
+	0x71,
+	0x10,
+	0x7e,
+	0x80,
+	0x81,
+	0x34,
+	0x66,
+	0x53,
+	0x86,
+	0x88,
+	0x8a,
+	0x38,
+	0x01,
+	0x15,
+	0x70,
+	0x05,
+	0x01,
+	0x10,
+	0x87,
+	0x89,
+	0x90,
+	0x31,
+	0x92,
+	0x85,
+	0x05,
+	0x95,
+	0x97,
+	0x10,
+	0x99,
+	0x9a,
+	0x25,
+	0x3e,
+	0xa5,
+	0x6c,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0x9e,
+	0x55,
+	0x97,
+	0x0b,
+	0x0c,
+	0xa2,
+	0xa3,
+	0x3e,
+	0x09,
+	0xb4,
+	0xb4,
+	0x08,
+	0xa5,
+	0x0e,
+	0x02,
+	0x02,
+	0x9e,
+	0x03,
+	0x08,
+	0xa9,
+	0x0a,
+	0x0a,
+	0xb0,
+	0xa3,
+	0x27,
+	0x06,
+	0xb4,
+	0x4e,
+	0x0b,
+	0x03,
+	0x02,
+	0xc0,
+	0xc0,
+	0xb9,
+	0x03,
+	0xce,
+	0xc9,
+	0xba,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xc2,
+	0xc3,
+	0x23,
+	0xc5,
+	0xba,
+	0xc7,
+	0x0b,
+	0xcb,
+	0xcc,
+	0xcf,
+	0xde,
+	0x02,
+	0xd3,
+	0xd4,
+	0xb1,
+	0x76,
+	0xd8,
+	0x02,
+	0xda,
+	0xdb,
+	0xdc,
+	0x0e,
+	0xcf,
+	0x4a,
+	0x01,
+	0xd0,
+	0xe1,
+	0x0c,
+	0x56,
+	0xc3,
+	0xe5,
+	0xd9,
+	0x4e,
+	0xdc,
+	0xdd,
+	0xce,
+	0x4a,
+	0x0a,
+	0xed,
+	0xe0,
+	0x0d,
+	0x0e,
+	0xf0,
+	0xf2,
+	0xb4,
+	0x04,
+	0x40,
+	0xab,
+	0x67,
+	0x4f,
+	0x81,
+	0x3a,
+	0x7c,
+	0xec,
+	0x92,
+	0x39,
+	0x58,
+	0xe8,
+	0x20,
+	0x9e,
+	0xa6,
+	0x72,
+	0x0b,
+	0xcc,
+	0x11,
+	0xb4,
+	0xd7,
+	0x0c,
+	0xe1,
+	0x3e,
+	0x86,
+	0x0d,
+	0x01,
+	0x66,
+	0xcb,
+	0x56,
+	0x90,
+	0x99,
+	0x40,
+	0x6f,
+	0xcf,
+	0x30,
+	0x3a,
+	0x54,
+	0x54,
+	0x6c,
+	0x00,
+	0x01,
+	0x89,
+	0x62,
+	0xca,
+	0x3a,
+	0x1a,
+	0xac,
+	0xe8,
+	0x2d,
+	0xdc,
+	0xc2,
+	0x91,
+	0x76,
+	0x02,
+	0x18,
+	0x70,
+	0x76,
+	0xd2,
+	0x89,
+	0xb3,
+	0x82,
+	0x11,
+	0x14,
+	0x44,
+	0x58,
+	0xf8,
+	0xf1,
+	0xa6,
+	0xce,
+	0x09,
+	0xd3,
+	0x60,
+	0x92,
+	0x69,
+	0x37,
+	0xd3,
+	0xa4,
+	0x44,
+	0x64,
+	0x38,
+	0x23,
+	0x28,
+	0xe5,
+	0xe9,
+	0x4c,
+	0x59,
+	0x84,
+	0x0b,
+	0x50,
+	0xc7,
+	0x45,
+	0xa1,
+	0x43,
+	0x53,
+	0x00,
+	0x11,
+	0x64,
+	0x03,
+	0x80,
+	0xe5,
+	0xd4,
+	0xa9,
+	0x34,
+	0x27,
+	0x46,
+	0x07,
+	0x5c,
+	0x2b,
+	0x44,
+	0x90,
+	0x1a,
+	0x84,
+	0x28,
+	0x84,
+	0x01,
+	0x07,
+	0xfc,
+	0x1c,
+	0xb0,
+	0xa9,
+	0xb5,
+	0x6b,
+	0x4e,
+	0xb7,
+	0x12,
+	0x22,
+	0x1c,
+	0x80,
+	0x85,
+	0x8a,
+	0x6c,
+	0xd9,
+	0x50,
+	0x67,
+	0x4d,
+	0xaa,
+	0x5d,
+	0x10,
+	0x86,
+	0x6b,
+	0xd7,
+	0xb6,
+	0x12,
+	0x24,
+	0x1c,
+	0x38,
+	0x60,
+	0x57,
+	0x8b,
+	0xcc,
+	0xbc,
+	0x34,
+	0x09,
+	0x0c,
+	0xce,
+	0xfa,
+	0xd7,
+	0x6d,
+	0x83,
+	0x0a,
+	0x07,
+	0xa6,
+	0x15,
+	0x26,
+	0x63,
+	0x60,
+	0x31,
+	0x48,
+	0xc6,
+	0x01,
+	0xba,
+	0x1a,
+	0x08,
+	0xd7,
+	0x20,
+	0x40,
+	0xe4,
+	0x06,
+	0x93,
+	0xa1,
+	0x54,
+	0x3e,
+	0xe0,
+	0x8c,
+	0xf4,
+	0x3a,
+	0x76,
+	0xec,
+	0x0c,
+	0x40,
+	0x08,
+	0x9a,
+	0xaa,
+	0xb3,
+	0x35,
+	0x52,
+	0xde,
+	0x16,
+	0x2f,
+	0x31,
+	0xb1,
+	0xd9,
+	0x75,
+	0x80,
+	0x07,
+	0xa1,
+	0xa1,
+	0x78,
+	0x5e,
+	0x3c,
+	0x98,
+	0xdd,
+	0x09,
+	0x4b,
+	0x0f,
+	0xe2,
+	0x09,
+	0xb5,
+	0xb6,
+	0x7b,
+	0xb0,
+	0x71,
+	0x06,
+	0xf0,
+	0x64,
+	0x96,
+	0x98,
+	0xfd,
+	0x1a,
+	0x85,
+	0x12,
+	0xe4,
+	0xd0,
+	0x19,
+	0x70,
+	0x1e,
+	0xde,
+	0x5c,
+	0x05,
+	0x6a,
+	0x99,
+	0xa6,
+	0xaa,
+	0xab,
+	0x08,
+	0x01,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xc3,
+	0x06,
+	0xc3,
+	0x6f,
+	0x88,
+	0x32,
+	0x10,
+	0x16,
+	0x42,
+	0xe2,
+	0x2f,
+	0xc0,
+	0x14,
+	0x19,
+	0x17,
+	0x48,
+	0x65,
+	0x2f,
+	0x30,
+	0x99,
+	0x1c,
+	0x02,
+	0x9f,
+	0x67,
+	0x54,
+	0xaa,
+	0xa3,
+	0x56,
+	0xad,
+	0x9f,
+	0x00,
+	0x61,
+	0xb0,
+	0xe5,
+	0xe2,
+	0xa8,
+	0x94,
+	0xea,
+	0x55,
+	0x4c,
+	0x4e,
+	0x9a,
+	0x6f,
+	0xe8,
+	0x74,
+	0x45,
+	0x3c,
+	0x1e,
+	0xb8,
+	0xdf,
+	0xa7,
+	0x60,
+	0x33,
+	0x15,
+	0xb0,
+	0x50,
+	0x2c,
+	0x16,
+	0x73,
+	0x04,
+	0x63,
+	0x77,
+	0x78,
+	0x25,
+	0x06,
+	0x09,
+	0x89,
+	0x09,
+	0x41,
+	0x41,
+	0x26,
+	0x54,
+	0x80,
+	0x13,
+	0x73,
+	0x10,
+	0x83,
+	0x85,
+	0x86,
+	0x4e,
+	0x09,
+	0x02,
+	0x02,
+	0x8a,
+	0x8a,
+	0x08,
+	0x77,
+	0x68,
+	0x55,
+	0x92,
+	0x94,
+	0x96,
+	0x87,
+	0x98,
+	0x02,
+	0x0b,
+	0x09,
+	0x50,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0x0a,
+	0x58,
+	0x22,
+	0x01,
+	0x15,
+	0x72,
+	0x05,
+	0x01,
+	0x10,
+	0x93,
+	0x95,
+	0x78,
+	0x88,
+	0x99,
+	0x99,
+	0xa9,
+	0x50,
+	0xad,
+	0xad,
+	0xaf,
+	0xb1,
+	0x91,
+	0x05,
+	0xb4,
+	0xb6,
+	0x10,
+	0xb8,
+	0x66,
+	0x88,
+	0x98,
+	0xab,
+	0x9a,
+	0xbd,
+	0xbf,
+	0xc0,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xc4,
+	0x57,
+	0xb6,
+	0x0b,
+	0x0c,
+	0xc8,
+	0x52,
+	0xba,
+	0xa6,
+	0xa6,
+	0xa8,
+	0xbe,
+	0xcf,
+	0xad,
+	0x0e,
+	0x99,
+	0xc4,
+	0x03,
+	0x08,
+	0xd2,
+	0xad,
+	0xd9,
+	0xa3,
+	0x59,
+	0xa5,
+	0x0b,
+	0xcd,
+	0xe0,
+	0xe1,
+	0x0a,
+	0xe3,
+	0x03,
+	0xf4,
+	0xcc,
+	0xac,
+	0x0d,
+	0x0d,
+	0xea,
+	0x86,
+	0x88,
+	0x03,
+	0x04,
+	0xa6,
+	0xa7,
+	0xa9,
+	0xe2,
+	0x89,
+	0xab,
+	0x47,
+	0x50,
+	0x00,
+	0xbe,
+	0x7c,
+	0xda,
+	0x96,
+	0x18,
+	0xa0,
+	0xe7,
+	0x0f,
+	0x0a,
+	0x99,
+	0x05,
+	0x02,
+	0x07,
+	0x12,
+	0xa4,
+	0x97,
+	0xe9,
+	0x20,
+	0x83,
+	0x57,
+	0x5c,
+	0x02,
+	0xd8,
+	0x61,
+	0xf8,
+	0x2f,
+	0x60,
+	0x44,
+	0x07,
+	0x04,
+	0x99,
+	0x50,
+	0xc4,
+	0xe7,
+	0xe0,
+	0xe2,
+	0x1b,
+	0x8d,
+	0x0b,
+	0xd5,
+	0xfb,
+	0x09,
+	0x38,
+	0xe2,
+	0x30,
+	0x5e,
+	0x04,
+	0x89,
+	0xf5,
+	0x44,
+	0x0a,
+	0x70,
+	0x40,
+	0xd3,
+	0x01,
+	0x46,
+	0x29,
+	0x28,
+	0x21,
+	0x0c,
+	0x38,
+	0x30,
+	0xe8,
+	0x40,
+	0xcb,
+	0x70,
+	0x2f,
+	0xe5,
+	0x09,
+	0x98,
+	0xa8,
+	0x71,
+	0x66,
+	0xcd,
+	0x9b,
+	0x38,
+	0x0d,
+	0xe8,
+	0xec,
+	0xd7,
+	0xb3,
+	0x4e,
+	0xab,
+	0xa0,
+	0x41,
+	0xe7,
+	0x4d,
+	0xa4,
+	0x57,
+	0xd3,
+	0x26,
+	0x9e,
+	0x00,
+	0x4a,
+	0x09,
+	0x0e,
+	0x3a,
+	0x32,
+	0xe0,
+	0x69,
+	0x84,
+	0xaf,
+	0xe2,
+	0xa4,
+	0x12,
+	0x3c,
+	0x48,
+	0x13,
+	0x29,
+	0x17,
+	0x03,
+	0x07,
+	0x0e,
+	0x68,
+	0x5d,
+	0x30,
+	0x46,
+	0xc1,
+	0x57,
+	0xb0,
+	0x6e,
+	0x69,
+	0x0e,
+	0xad,
+	0xf7,
+	0x74,
+	0x02,
+	0x3e,
+	0xb3,
+	0xdb,
+	0xd2,
+	0xd2,
+	0x53,
+	0xbb,
+	0x53,
+	0xad,
+	0x5b,
+	0xb8,
+	0x6f,
+	0xe5,
+	0x52,
+	0x74,
+	0x7b,
+	0xa1,
+	0x70,
+	0x42,
+	0x22,
+	0x01,
+	0xf8,
+	0xf6,
+	0xd5,
+	0xd8,
+	0x35,
+	0x42,
+	0x00,
+	0xb0,
+	0x6f,
+	0xe5,
+	0x55,
+	0xfd,
+	0x5b,
+	0x21,
+	0xc2,
+	0xe1,
+	0x21,
+	0x89,
+	0xd3,
+	0xa6,
+	0x65,
+	0xc2,
+	0xb9,
+	0xb3,
+	0xdb,
+	0xbf,
+	0x5f,
+	0x25,
+	0x44,
+	0x38,
+	0x90,
+	0x2d,
+	0xda,
+	0x65,
+	0xcc,
+	0x99,
+	0x99,
+	0x5c,
+	0x39,
+	0xf1,
+	0xf8,
+	0xaf,
+	0x04,
+	0x09,
+	0x69,
+	0x4f,
+	0x67,
+	0x4c,
+	0x9c,
+	0x9a,
+	0xcf,
+	0xd7,
+	0x06,
+	0x15,
+	0x0e,
+	0xe0,
+	0x93,
+	0x8d,
+	0x93,
+	0xf6,
+	0x6a,
+	0x15,
+	0x01,
+	0x0e,
+	0x26,
+	0x6e,
+	0x80,
+	0x77,
+	0x54,
+	0x70,
+	0xe2,
+	0xc5,
+	0x4b,
+	0x1c,
+	0x67,
+	0x52,
+	0x80,
+	0xf8,
+	0x3a,
+	0xe5,
+	0x77,
+	0x5d,
+	0x44,
+	0x6b,
+	0xe0,
+	0x2a,
+	0xc0,
+	0x03,
+	0xde,
+	0x4a,
+	0xf6,
+	0xb8,
+	0xb0,
+	0xee,
+	0x2a,
+	0x4c,
+	0xf2,
+	0xe7,
+	0x2f,
+	0xb4,
+	0x83,
+	0x1f,
+	0x5f,
+	0x23,
+	0x04,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0x40,
+	0xa0,
+	0xc1,
+	0x10,
+	0x2c,
+	0x92,
+	0x0c,
+	0x84,
+	0x05,
+	0xd1,
+	0xd8,
+	0x0b,
+	0x38,
+	0x45,
+	0xc8,
+	0x85,
+	0x92,
+	0xb9,
+	0x0b,
+	0x4c,
+	0x26,
+	0x87,
+	0xc0,
+	0x27,
+	0x3a,
+	0xa5,
+	0xe2,
+	0xac,
+	0x57,
+	0xec,
+	0x27,
+	0x40,
+	0x18,
+	0x74,
+	0xbd,
+	0x36,
+	0x2b,
+	0xe5,
+	0x9a,
+	0x25,
+	0x9b,
+	0x97,
+	0x68,
+	0xd3,
+	0xd0,
+	0xa9,
+	0x4d,
+	0xa9,
+	0xd7,
+	0x15,
+	0x72,
+	0x79,
+	0x00,
+	0x8f,
+	0x8f,
+	0x0c,
+	0x09,
+	0x81,
+	0x81,
+	0x43,
+	0x7d,
+	0x23,
+	0x01,
+	0x16,
+	0x14,
+	0x16,
+	0x16,
+	0x79,
+	0x04,
+	0x65,
+	0x85,
+	0x7e,
+	0x80,
+	0x02,
+	0x02,
+	0x82,
+	0x82,
+	0x08,
+	0x85,
+	0x56,
+	0x8a,
+	0x13,
+	0x79,
+	0x10,
+	0x8d,
+	0x8f,
+	0x68,
+	0x91,
+	0x02,
+	0x0b,
+	0x09,
+	0x52,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0x0a,
+	0x75,
+	0x22,
+	0x6a,
+	0x57,
+	0x9b,
+	0x9d,
+	0x7e,
+	0x7f,
+	0x09,
+	0x92,
+	0x92,
+	0xa4,
+	0x52,
+	0xa8,
+	0xa8,
+	0x4f,
+	0x63,
+	0x15,
+	0x78,
+	0x05,
+	0x01,
+	0x10,
+	0x9c,
+	0x9e,
+	0x4c,
+	0x80,
+	0xb2,
+	0xa6,
+	0x93,
+	0xb5,
+	0xb7,
+	0xb7,
+	0x5a,
+	0x01,
+	0x15,
+	0x9a,
+	0x05,
+	0xbd,
+	0xbf,
+	0x10,
+	0xc1,
+	0x46,
+	0xa0,
+	0x0b,
+	0xa1,
+	0xa3,
+	0xb6,
+	0xc8,
+	0xb7,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xce,
+	0x59,
+	0xbf,
+	0x0b,
+	0x0c,
+	0xd2,
+	0x41,
+	0xd4,
+	0xc6,
+	0xd8,
+	0xd9,
+	0xa8,
+	0x0e,
+	0x92,
+	0xce,
+	0x03,
+	0x08,
+	0xdc,
+	0xa8,
+	0xe3,
+	0x90,
+	0x09,
+	0x03,
+	0x04,
+	0xa1,
+	0xa2,
+	0xa4,
+	0xe9,
+	0xb7,
+	0xeb,
+	0x03,
+	0xfd,
+	0xc5,
+	0xa7,
+	0x0d,
+	0x1a,
+	0xc8,
+	0xa3,
+	0xa2,
+	0xc5,
+	0x40,
+	0x3f,
+	0x7b,
+	0x52,
+	0xcc,
+	0x2c,
+	0xd0,
+	0xb7,
+	0xcf,
+	0x9f,
+	0x43,
+	0x01,
+	0x01,
+	0x05,
+	0x92,
+	0xab,
+	0xf2,
+	0x20,
+	0x80,
+	0xc1,
+	0x7a,
+	0xf7,
+	0xf2,
+	0x31,
+	0x54,
+	0xe0,
+	0xc0,
+	0x1f,
+	0x9d,
+	0x62,
+	0x11,
+	0x19,
+	0xa8,
+	0x0a,
+	0x12,
+	0xe0,
+	0x01,
+	0x9f,
+	0x83,
+	0x02,
+	0xdb,
+	0x92,
+	0x24,
+	0xdc,
+	0xc8,
+	0xd1,
+	0x63,
+	0x80,
+	0x54,
+	0xa6,
+	0x02,
+	0x3a,
+	0x10,
+	0xc9,
+	0xc4,
+	0x17,
+	0x1f,
+	0x08,
+	0x03,
+	0x0e,
+	0x34,
+	0x3a,
+	0xb0,
+	0x32,
+	0x5d,
+	0x04,
+	0x75,
+	0x2e,
+	0x9d,
+	0x98,
+	0x72,
+	0x40,
+	0xd4,
+	0xc1,
+	0x48,
+	0x92,
+	0xd1,
+	0x70,
+	0xd6,
+	0xdb,
+	0xb9,
+	0x07,
+	0xd5,
+	0x4f,
+	0xa7,
+	0xea,
+	0x04,
+	0x04,
+	0x1d,
+	0x5a,
+	0xf4,
+	0x28,
+	0x49,
+	0x03,
+	0x4a,
+	0x0f,
+	0x36,
+	0x2a,
+	0xe5,
+	0x34,
+	0xc2,
+	0xcf,
+	0xa7,
+	0xfc,
+	0x1c,
+	0xfa,
+	0x2b,
+	0x6a,
+	0x34,
+	0x8e,
+	0x81,
+	0x03,
+	0x07,
+	0x1c,
+	0x26,
+	0x29,
+	0xa3,
+	0xc0,
+	0xeb,
+	0x57,
+	0x75,
+	0x61,
+	0x1d,
+	0x46,
+	0x24,
+	0x6a,
+	0xb5,
+	0xc8,
+	0xd9,
+	0xb4,
+	0x39,
+	0xfb,
+	0xa1,
+	0x1d,
+	0x10,
+	0x20,
+	0x81,
+	0x57,
+	0xbf,
+	0x4e,
+	0x89,
+	0x4a,
+	0xf5,
+	0xe7,
+	0x74,
+	0x42,
+	0xc0,
+	0xba,
+	0x45,
+	0x02,
+	0xe0,
+	0xcd,
+	0x79,
+	0x00,
+	0x27,
+	0x1d,
+	0x3a,
+	0x09,
+	0xda,
+	0x7a,
+	0x15,
+	0xdc,
+	0xef,
+	0x54,
+	0x84,
+	0x0b,
+	0x98,
+	0x27,
+	0xfe,
+	0x50,
+	0x8c,
+	0x16,
+	0x2d,
+	0x1d,
+	0x13,
+	0x2f,
+	0xdd,
+	0x72,
+	0x24,
+	0x2b,
+	0xb9,
+	0x42,
+	0x04,
+	0xcd,
+	0x3e,
+	0x7c,
+	0x79,
+	0xce,
+	0x75,
+	0x22,
+	0xc0,
+	0x57,
+	0xb7,
+	0x12,
+	0x22,
+	0x1c,
+	0x18,
+	0xb7,
+	0x0d,
+	0x75,
+	0x6a,
+	0x08,
+	0x59,
+	0x3c,
+	0xab,
+	0x78,
+	0x29,
+	0x59,
+	0x82,
+	0x04,
+	0xb4,
+	0xb6,
+	0x91,
+	0xe6,
+	0x46,
+	0x4c,
+	0xc2,
+	0x75,
+	0x84,
+	0x06,
+	0x15,
+	0x0e,
+	0x04,
+	0x0c,
+	0x0e,
+	0x24,
+	0xc0,
+	0x61,
+	0xe2,
+	0x25,
+	0x9c,
+	0x07,
+	0x44,
+	0xbb,
+	0x1c,
+	0x56,
+	0xf1,
+	0xc3,
+	0x30,
+	0xa4,
+	0x07,
+	0x2c,
+	0x50,
+	0xdd,
+	0xfa,
+	0x2a,
+	0xe8,
+	0x28,
+	0xb4,
+	0x5b,
+	0x64,
+	0xee,
+	0x1d,
+	0x05,
+	0x21,
+	0xf2,
+	0xe5,
+	0xcb,
+	0x87,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x2e,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0xc0,
+	0xa0,
+	0x70,
+	0x88,
+	0x32,
+	0x18,
+	0x88,
+	0x43,
+	0x03,
+	0x61,
+	0x71,
+	0x44,
+	0xee,
+	0x02,
+	0x50,
+	0x91,
+	0x72,
+	0xc1,
+	0x74,
+	0xe6,
+	0x02,
+	0x93,
+	0xc9,
+	0x21,
+	0xf0,
+	0x99,
+	0x56,
+	0xad,
+	0x36,
+	0x6c,
+	0x56,
+	0xfb,
+	0x09,
+	0x10,
+	0x06,
+	0x5f,
+	0x30,
+	0x0d,
+	0x4b,
+	0xc9,
+	0x6e,
+	0xcd,
+	0xe8,
+	0xa6,
+	0x7a,
+	0xc6,
+	0x6e,
+	0x57,
+	0xcc,
+	0xe7,
+	0x81,
+	0x7c,
+	0x1e,
+	0x0b,
+	0x58,
+	0x28,
+	0x16,
+	0x16,
+	0x77,
+	0x04,
+	0x67,
+	0x7b,
+	0x7c,
+	0x30,
+	0x58,
+	0x81,
+	0x13,
+	0x77,
+	0x10,
+	0x84,
+	0x86,
+	0x87,
+	0x2e,
+	0x6c,
+	0x59,
+	0x8c,
+	0x8e,
+	0x90,
+	0x45,
+	0x46,
+	0x98,
+	0x24,
+	0x01,
+	0x15,
+	0x76,
+	0x05,
+	0x01,
+	0x10,
+	0x8d,
+	0x8f,
+	0x90,
+	0x46,
+	0x09,
+	0xa5,
+	0xa5,
+	0x08,
+	0x99,
+	0x9b,
+	0x8b,
+	0x05,
+	0x9e,
+	0xa0,
+	0x10,
+	0xa2,
+	0x7c,
+	0x06,
+	0xa5,
+	0x54,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0xb8,
+	0x0a,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xac,
+	0x5b,
+	0xa0,
+	0x0b,
+	0x0c,
+	0xb0,
+	0x60,
+	0xb2,
+	0x02,
+	0x02,
+	0xb4,
+	0x0b,
+	0xb9,
+	0xb8,
+	0x0e,
+	0xc7,
+	0xac,
+	0x03,
+	0x08,
+	0xbc,
+	0xb8,
+	0xc3,
+	0x96,
+	0x5d,
+	0x09,
+	0xc7,
+	0xc9,
+	0xca,
+	0xcb,
+	0xcd,
+	0x03,
+	0xdd,
+	0xb6,
+	0xc7,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xd4,
+	0x87,
+	0xc6,
+	0xc7,
+	0xc8,
+	0x54,
+	0xcb,
+	0xcc,
+	0xde,
+	0xec,
+	0x02,
+	0xe2,
+	0xe3,
+	0xc4,
+	0x49,
+	0xa5,
+	0x02,
+	0xdf,
+	0xe9,
+	0xea,
+	0x0a,
+	0x0e,
+	0xde,
+	0x50,
+	0x01,
+	0xdf,
+	0xef,
+	0x0c,
+	0x5c,
+	0x73,
+	0xcc,
+	0x2d,
+	0x40,
+	0xa7,
+	0x4d,
+	0x5d,
+	0xbe,
+	0x6e,
+	0x01,
+	0x14,
+	0x40,
+	0xb1,
+	0x25,
+	0xce,
+	0xc1,
+	0xbf,
+	0x58,
+	0xd7,
+	0x90,
+	0x61,
+	0xbb,
+	0xb7,
+	0x0e,
+	0xe1,
+	0x3e,
+	0x5b,
+	0x0e,
+	0x32,
+	0x3a,
+	0x00,
+	0x58,
+	0x2c,
+	0xc1,
+	0x00,
+	0x02,
+	0xe8,
+	0xd0,
+	0x50,
+	0xc4,
+	0x47,
+	0xcf,
+	0x22,
+	0x3f,
+	0x01,
+	0x1a,
+	0xc0,
+	0x37,
+	0xaa,
+	0x09,
+	0x60,
+	0xa0,
+	0x1b,
+	0x48,
+	0x2a,
+	0xdd,
+	0xee,
+	0x45,
+	0x20,
+	0xc9,
+	0x8e,
+	0x5d,
+	0x4a,
+	0x8e,
+	0x48,
+	0x02,
+	0x3c,
+	0x68,
+	0xf9,
+	0x91,
+	0xe0,
+	0x00,
+	0x99,
+	0x11,
+	0x32,
+	0x96,
+	0x64,
+	0xf7,
+	0x2e,
+	0x23,
+	0x4e,
+	0x22,
+	0x3a,
+	0x79,
+	0x82,
+	0x5c,
+	0x52,
+	0xeb,
+	0xa7,
+	0x82,
+	0x99,
+	0x4f,
+	0x23,
+	0x04,
+	0xe5,
+	0xe6,
+	0x0d,
+	0x57,
+	0x84,
+	0x09,
+	0xe2,
+	0x8e,
+	0x0e,
+	0x49,
+	0x0a,
+	0x61,
+	0xc0,
+	0x01,
+	0x42,
+	0x07,
+	0x60,
+	0x5a,
+	0x95,
+	0x4a,
+	0x76,
+	0x6a,
+	0xc9,
+	0x5b,
+	0x11,
+	0x2e,
+	0xa8,
+	0x8d,
+	0x07,
+	0x84,
+	0x65,
+	0xd7,
+	0x8f,
+	0x60,
+	0x17,
+	0x9c,
+	0x89,
+	0x5a,
+	0x76,
+	0x66,
+	0x4a,
+	0x07,
+	0x51,
+	0x2b,
+	0x44,
+	0x60,
+	0x0b,
+	0xc4,
+	0xc0,
+	0x5b,
+	0x97,
+	0x04,
+	0x0e,
+	0x1c,
+	0xf8,
+	0x49,
+	0xf6,
+	0x29,
+	0xdd,
+	0x08,
+	0x12,
+	0x22,
+	0x1c,
+	0x18,
+	0xb6,
+	0x8b,
+	0x6f,
+	0x10,
+	0x03,
+	0x82,
+	0x07,
+	0xd7,
+	0x3c,
+	0x0c,
+	0x55,
+	0xaa,
+	0x04,
+	0x09,
+	0x82,
+	0x1d,
+	0x13,
+	0x81,
+	0x1c,
+	0x59,
+	0xb2,
+	0xb7,
+	0x06,
+	0x75,
+	0xa5,
+	0x36,
+	0xa8,
+	0x70,
+	0x40,
+	0x9c,
+	0xe6,
+	0xcd,
+	0x9d,
+	0x05,
+	0xb3,
+	0xc3,
+	0x64,
+	0xe4,
+	0x5d,
+	0x03,
+	0xc1,
+	0xa6,
+	0xab,
+	0x8d,
+	0x08,
+	0x90,
+	0x3a,
+	0x32,
+	0x03,
+	0x06,
+	0xb1,
+	0x0d,
+	0xb8,
+	0x6e,
+	0x50,
+	0x20,
+	0xb6,
+	0x6c,
+	0x03,
+	0xb7,
+	0x83,
+	0x0b,
+	0x77,
+	0x7d,
+	0x44,
+	0x37,
+	0x71,
+	0x23,
+	0xb2,
+	0xcb,
+	0xec,
+	0x5b,
+	0xce,
+	0x92,
+	0x75,
+	0x13,
+	0xe7,
+	0xa7,
+	0x5b,
+	0x84,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0a,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xe3,
+	0x06,
+	0xc3,
+	0x6f,
+	0x88,
+	0x32,
+	0x10,
+	0x16,
+	0x42,
+	0xe2,
+	0x2f,
+	0xc0,
+	0x14,
+	0x19,
+	0x17,
+	0x48,
+	0x65,
+	0x2f,
+	0x30,
+	0x99,
+	0x1c,
+	0x02,
+	0x9f,
+	0x67,
+	0x54,
+	0xaa,
+	0xa3,
+	0x56,
+	0xad,
+	0x9f,
+	0x00,
+	0x61,
+	0xb0,
+	0xe5,
+	0xe2,
+	0xa8,
+	0x94,
+	0xea,
+	0x55,
+	0x4c,
+	0x4e,
+	0x9a,
+	0x6f,
+	0xe8,
+	0x74,
+	0x45,
+	0x3c,
+	0x1e,
+	0xb8,
+	0xdf,
+	0xb5,
+	0x80,
+	0x85,
+	0x62,
+	0xb1,
+	0xcc,
+	0x09,
+	0x63,
+	0x77,
+	0x78,
+	0x34,
+	0x54,
+	0x7d,
+	0x13,
+	0x73,
+	0x10,
+	0x80,
+	0x82,
+	0x83,
+	0x32,
+	0x68,
+	0x55,
+	0x88,
+	0x8a,
+	0x8c,
+	0x36,
+	0x01,
+	0x15,
+	0x72,
+	0x05,
+	0x01,
+	0x10,
+	0x89,
+	0x8b,
+	0x92,
+	0x2f,
+	0x94,
+	0x87,
+	0x05,
+	0x97,
+	0x99,
+	0x10,
+	0x9b,
+	0x9c,
+	0x23,
+	0x41,
+	0xa7,
+	0x6e,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xa0,
+	0x57,
+	0x99,
+	0x0b,
+	0x0c,
+	0xa4,
+	0x92,
+	0x41,
+	0x09,
+	0xb6,
+	0xb6,
+	0x08,
+	0xa7,
+	0x0e,
+	0x02,
+	0x02,
+	0xa0,
+	0x03,
+	0x08,
+	0xab,
+	0x0a,
+	0x0a,
+	0xb2,
+	0xa5,
+	0x25,
+	0x06,
+	0xb6,
+	0x50,
+	0x0b,
+	0x03,
+	0x02,
+	0xc2,
+	0xc2,
+	0xbb,
+	0x03,
+	0xd0,
+	0xcb,
+	0xbc,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xc4,
+	0xc5,
+	0x59,
+	0x09,
+	0xbc,
+	0xc9,
+	0x0b,
+	0xcd,
+	0xce,
+	0xd1,
+	0xe0,
+	0x02,
+	0xd5,
+	0xd6,
+	0xb3,
+	0x66,
+	0xc7,
+	0xdb,
+	0xdc,
+	0xde,
+	0x0a,
+	0x0e,
+	0xd1,
+	0x4c,
+	0x01,
+	0xd2,
+	0xe3,
+	0x0c,
+	0x58,
+	0x9c,
+	0xe7,
+	0xbc,
+	0x02,
+	0xc9,
+	0xea,
+	0xeb,
+	0xed,
+	0x01,
+	0x0a,
+	0xef,
+	0xe2,
+	0x0d,
+	0x0e,
+	0xe4,
+	0xd1,
+	0xb3,
+	0x25,
+	0x40,
+	0x1a,
+	0x94,
+	0x7c,
+	0xfa,
+	0xa0,
+	0xb9,
+	0xf3,
+	0xe7,
+	0xa0,
+	0xa1,
+	0x83,
+	0x79,
+	0x8c,
+	0xea,
+	0x2d,
+	0xb8,
+	0x77,
+	0x30,
+	0xdf,
+	0x33,
+	0x85,
+	0x4c,
+	0x96,
+	0x39,
+	0x7c,
+	0x38,
+	0x70,
+	0xdb,
+	0x36,
+	0x84,
+	0xeb,
+	0x0a,
+	0x82,
+	0x8b,
+	0xb6,
+	0x11,
+	0x22,
+	0x9e,
+	0x63,
+	0x03,
+	0xc1,
+	0x08,
+	0x50,
+	0x24,
+	0x03,
+	0xb2,
+	0xa1,
+	0x48,
+	0x70,
+	0xe3,
+	0x1a,
+	0x9a,
+	0x34,
+	0x13,
+	0xc0,
+	0x00,
+	0x34,
+	0x95,
+	0x50,
+	0xa0,
+	0xe5,
+	0x8b,
+	0xa0,
+	0x20,
+	0x82,
+	0x4b,
+	0x70,
+	0xc2,
+	0x22,
+	0x4c,
+	0xa8,
+	0x36,
+	0x53,
+	0xca,
+	0x3b,
+	0x9b,
+	0x29,
+	0x29,
+	0x2a,
+	0xdb,
+	0x19,
+	0xa1,
+	0xe9,
+	0xcf,
+	0x65,
+	0x3d,
+	0x2f,
+	0x48,
+	0x2d,
+	0xb7,
+	0xc4,
+	0xce,
+	0x4d,
+	0x01,
+	0x47,
+	0x94,
+	0x0d,
+	0x08,
+	0x1a,
+	0xb4,
+	0x29,
+	0xcf,
+	0x8d,
+	0x0e,
+	0x7a,
+	0x46,
+	0xa8,
+	0x10,
+	0x81,
+	0xaa,
+	0x8f,
+	0xa3,
+	0x10,
+	0x06,
+	0x1c,
+	0x00,
+	0x74,
+	0x20,
+	0x67,
+	0x57,
+	0xaf,
+	0x62,
+	0x9b,
+	0x4a,
+	0x88,
+	0x70,
+	0x40,
+	0x96,
+	0x2a,
+	0xb3,
+	0x4b,
+	0x0c,
+	0xa4,
+	0x4d,
+	0xc9,
+	0x76,
+	0xc1,
+	0x98,
+	0xb8,
+	0x4d,
+	0xbb,
+	0x4a,
+	0x90,
+	0x70,
+	0xe0,
+	0x00,
+	0x5e,
+	0x25,
+	0x35,
+	0xf7,
+	0xde,
+	0x24,
+	0x50,
+	0x78,
+	0x2b,
+	0x5c,
+	0xaf,
+	0x11,
+	0x1a,
+	0x54,
+	0x38,
+	0x50,
+	0xed,
+	0xb0,
+	0x14,
+	0x03,
+	0x85,
+	0x0f,
+	0x8c,
+	0x74,
+	0x0c,
+	0xd9,
+	0xc0,
+	0xb8,
+	0x06,
+	0x01,
+	0x28,
+	0x37,
+	0xb0,
+	0x4c,
+	0x04,
+	0x73,
+	0x66,
+	0xcd,
+	0x30,
+	0xbd,
+	0x32,
+	0x51,
+	0x35,
+	0x8e,
+	0x49,
+	0x65,
+	0x6c,
+	0x4e,
+	0x4e,
+	0x37,
+	0x8e,
+	0x86,
+	0x6a,
+	0x44,
+	0x00,
+	0xa2,
+	0xae,
+	0x49,
+	0x13,
+	0x09,
+	0x2d,
+	0xbb,
+	0x30,
+	0x03,
+	0x06,
+	0xaf,
+	0x6d,
+	0x8f,
+	0x16,
+	0x51,
+	0xb4,
+	0x94,
+	0x81,
+	0xdf,
+	0xc8,
+	0x93,
+	0x7f,
+	0x36,
+	0x59,
+	0x1c,
+	0xf6,
+	0xc2,
+	0xe7,
+	0xa8,
+	0x74,
+	0xd7,
+	0x08,
+	0x01,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0xbc,
+	0x6a,
+	0x18,
+	0xbd,
+	0x20,
+	0xcb,
+	0x40,
+	0x58,
+	0x00,
+	0x85,
+	0xc8,
+	0x4f,
+	0x60,
+	0x29,
+	0x22,
+	0x2e,
+	0x8c,
+	0xc9,
+	0x60,
+	0x60,
+	0x32,
+	0x39,
+	0x04,
+	0x3e,
+	0x4e,
+	0x68,
+	0x74,
+	0x37,
+	0xa5,
+	0x56,
+	0x95,
+	0x84,
+	0x81,
+	0x76,
+	0x9b,
+	0x9b,
+	0x52,
+	0xa8,
+	0xd6,
+	0x40,
+	0x78,
+	0x4c,
+	0xbe,
+	0x99,
+	0xcf,
+	0x15,
+	0x75,
+	0x78,
+	0x70,
+	0x6c,
+	0xbb,
+	0x2d,
+	0x14,
+	0x8b,
+	0x25,
+	0x4e,
+	0x08,
+	0xd7,
+	0xed,
+	0x36,
+	0x53,
+	0x7a,
+	0x13,
+	0x71,
+	0x10,
+	0x7d,
+	0x7f,
+	0x80,
+	0x34,
+	0x66,
+	0x54,
+	0x85,
+	0x87,
+	0x89,
+	0x6e,
+	0x15,
+	0x70,
+	0x05,
+	0x01,
+	0x10,
+	0x86,
+	0x88,
+	0x8f,
+	0x31,
+	0x01,
+	0x15,
+	0x84,
+	0x05,
+	0x93,
+	0x95,
+	0x10,
+	0x97,
+	0x98,
+	0x25,
+	0x3f,
+	0xa4,
+	0x75,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0x9d,
+	0x56,
+	0x95,
+	0x0b,
+	0x0c,
+	0xa1,
+	0xa2,
+	0x3f,
+	0x09,
+	0xb3,
+	0xb3,
+	0x08,
+	0xa4,
+	0x0e,
+	0x02,
+	0x02,
+	0x9d,
+	0x03,
+	0x08,
+	0xa8,
+	0x0a,
+	0x0a,
+	0xaf,
+	0xa2,
+	0x26,
+	0x06,
+	0xb3,
+	0x4f,
+	0x0b,
+	0x03,
+	0x02,
+	0xbf,
+	0xbf,
+	0xb8,
+	0x03,
+	0xcd,
+	0xc8,
+	0xb9,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xc1,
+	0xc2,
+	0x4d,
+	0x09,
+	0xb9,
+	0xc6,
+	0x0b,
+	0xca,
+	0xcb,
+	0xce,
+	0xdd,
+	0x02,
+	0xd2,
+	0xd3,
+	0xb0,
+	0x76,
+	0xc4,
+	0xd8,
+	0xd9,
+	0xdb,
+	0x0a,
+	0x0e,
+	0xce,
+	0x4b,
+	0x01,
+	0xcf,
+	0xe0,
+	0x0c,
+	0x57,
+	0xb1,
+	0xd7,
+	0xb9,
+	0x02,
+	0xc6,
+	0xe7,
+	0xe8,
+	0xea,
+	0x01,
+	0x0a,
+	0xec,
+	0xdf,
+	0x0d,
+	0x0e,
+	0xef,
+	0xf1,
+	0xd7,
+	0x9e,
+	0x3d,
+	0xb1,
+	0x77,
+	0xaf,
+	0xd9,
+	0xba,
+	0x7d,
+	0x0e,
+	0x12,
+	0x3a,
+	0x80,
+	0xf7,
+	0x88,
+	0x1c,
+	0x3d,
+	0x7a,
+	0x03,
+	0xed,
+	0x31,
+	0x33,
+	0xb8,
+	0x04,
+	0x99,
+	0xc2,
+	0x85,
+	0xf1,
+	0xb0,
+	0x61,
+	0x23,
+	0x88,
+	0x4e,
+	0x40,
+	0xb7,
+	0x6e,
+	0x17,
+	0x19,
+	0x02,
+	0x22,
+	0x36,
+	0x80,
+	0x00,
+	0x44,
+	0x31,
+	0x1c,
+	0xc3,
+	0x13,
+	0x7a,
+	0xfc,
+	0x08,
+	0x2e,
+	0xa1,
+	0xc8,
+	0x36,
+	0x01,
+	0x0c,
+	0x34,
+	0x33,
+	0xf9,
+	0xa4,
+	0x99,
+	0xbd,
+	0x08,
+	0x0a,
+	0x22,
+	0xa8,
+	0xec,
+	0xf6,
+	0x2b,
+	0xc2,
+	0x04,
+	0x69,
+	0x2f,
+	0xb7,
+	0xb0,
+	0x93,
+	0x59,
+	0x12,
+	0xe2,
+	0xb1,
+	0x9b,
+	0x11,
+	0x92,
+	0xee,
+	0x44,
+	0x96,
+	0xf3,
+	0x82,
+	0x53,
+	0x71,
+	0x48,
+	0x86,
+	0xce,
+	0x14,
+	0x50,
+	0xe4,
+	0xd8,
+	0x80,
+	0x9e,
+	0x3d,
+	0x93,
+	0xe2,
+	0xbc,
+	0xe8,
+	0x20,
+	0x67,
+	0x84,
+	0x0a,
+	0x11,
+	0xa0,
+	0x0a,
+	0x19,
+	0x0a,
+	0x61,
+	0xc0,
+	0x81,
+	0x3e,
+	0x07,
+	0x6a,
+	0x66,
+	0xd5,
+	0xea,
+	0x35,
+	0xa9,
+	0x84,
+	0x08,
+	0x07,
+	0x5e,
+	0x9d,
+	0x12,
+	0x1b,
+	0xd5,
+	0x40,
+	0xd9,
+	0x92,
+	0x68,
+	0x17,
+	0x84,
+	0x69,
+	0x9b,
+	0x34,
+	0xab,
+	0x04,
+	0x09,
+	0x07,
+	0x0e,
+	0xd0,
+	0x15,
+	0x6a,
+	0xb7,
+	0x1b,
+	0xda,
+	0x03,
+	0x57,
+	0xd9,
+	0x6a,
+	0x8d,
+	0xd0,
+	0xa0,
+	0xc2,
+	0x01,
+	0x69,
+	0x83,
+	0xc9,
+	0x18,
+	0x08,
+	0xfc,
+	0xd1,
+	0x66,
+	0x84,
+	0x00,
+	0x5a,
+	0x0d,
+	0x80,
+	0x6b,
+	0x10,
+	0xe0,
+	0x71,
+	0x83,
+	0xc8,
+	0x51,
+	0x26,
+	0x23,
+	0x36,
+	0xdb,
+	0xed,
+	0xe0,
+	0xba,
+	0x53,
+	0xe0,
+	0x96,
+	0x40,
+	0xae,
+	0x36,
+	0x82,
+	0x68,
+	0x33,
+	0xca,
+	0x4c,
+	0x4e,
+	0x04,
+	0x00,
+	0xaa,
+	0x1a,
+	0x74,
+	0x92,
+	0xce,
+	0x94,
+	0x03,
+	0xaf,
+	0x4b,
+	0x31,
+	0xfb,
+	0x48,
+	0x50,
+	0x51,
+	0xb8,
+	0x03,
+	0x0b,
+	0x67,
+	0xf0,
+	0x2e,
+	0xa6,
+	0x6c,
+	0xd6,
+	0x28,
+	0x96,
+	0x10,
+	0x5f,
+	0xce,
+	0x60,
+	0xf3,
+	0x6f,
+	0xe4,
+	0xbc,
+	0x0f,
+	0x96,
+	0xb2,
+	0x7d,
+	0x23,
+	0x04,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x9f,
+	0x61,
+	0xe0,
+	0xbc,
+	0x6d,
+	0x10,
+	0x8b,
+	0x5d,
+	0x6f,
+	0xb8,
+	0x0a,
+	0x18,
+	0x45,
+	0xbf,
+	0x45,
+	0x90,
+	0xc8,
+	0x34,
+	0x05,
+	0x26,
+	0x93,
+	0x43,
+	0x20,
+	0x07,
+	0x5c,
+	0x36,
+	0xaf,
+	0x4f,
+	0x68,
+	0xf4,
+	0x13,
+	0x20,
+	0x0c,
+	0xac,
+	0x57,
+	0xe6,
+	0x93,
+	0x02,
+	0x95,
+	0x76,
+	0xbf,
+	0xc2,
+	0x30,
+	0x71,
+	0x4c,
+	0xae,
+	0x74,
+	0xbd,
+	0x83,
+	0xb4,
+	0x9a,
+	0xa5,
+	0x3b,
+	0xa6,
+	0x02,
+	0x16,
+	0x8a,
+	0xc5,
+	0xe2,
+	0x26,
+	0x78,
+	0xe5,
+	0x73,
+	0x2a,
+	0x06,
+	0x09,
+	0x84,
+	0x09,
+	0x3a,
+	0x3a,
+	0x4e,
+	0x13,
+	0x7b,
+	0x13,
+	0x6e,
+	0x10,
+	0x7e,
+	0x80,
+	0x81,
+	0x27,
+	0x83,
+	0x02,
+	0x02,
+	0x85,
+	0x85,
+	0x08,
+	0x72,
+	0x63,
+	0x50,
+	0x8d,
+	0x8f,
+	0x91,
+	0x82,
+	0x09,
+	0x94,
+	0x0b,
+	0x09,
+	0x4a,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0x0a,
+	0x53,
+	0x22,
+	0x01,
+	0x15,
+	0x6d,
+	0x05,
+	0x01,
+	0x10,
+	0x8e,
+	0x90,
+	0x9e,
+	0x48,
+	0xa0,
+	0x94,
+	0x02,
+	0xa4,
+	0x4a,
+	0xa8,
+	0xa8,
+	0xaa,
+	0xac,
+	0x8c,
+	0x05,
+	0xaf,
+	0xb1,
+	0x10,
+	0xb3,
+	0x9e,
+	0x83,
+	0xa0,
+	0xa6,
+	0x95,
+	0xb9,
+	0xbb,
+	0xbc,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xc0,
+	0x52,
+	0xb1,
+	0x0b,
+	0x0c,
+	0xc4,
+	0x81,
+	0x93,
+	0xb8,
+	0xb8,
+	0xa3,
+	0xba,
+	0xcb,
+	0xa8,
+	0x0e,
+	0x94,
+	0xc0,
+	0x03,
+	0x08,
+	0xce,
+	0xa8,
+	0xd5,
+	0xb4,
+	0x25,
+	0xd8,
+	0x0b,
+	0xc9,
+	0xdc,
+	0xdd,
+	0x0a,
+	0xdf,
+	0x03,
+	0xf0,
+	0xc8,
+	0xa7,
+	0x0d,
+	0x0d,
+	0xe6,
+	0xe7,
+	0x39,
+	0x09,
+	0x03,
+	0x04,
+	0xb8,
+	0xa2,
+	0xa4,
+	0xed,
+	0xde,
+	0xf1,
+	0x02,
+	0x0a,
+	0xa0,
+	0x57,
+	0xcf,
+	0x1a,
+	0x16,
+	0x03,
+	0xf0,
+	0xf6,
+	0x29,
+	0xf9,
+	0xb2,
+	0xe0,
+	0x1f,
+	0xc0,
+	0x80,
+	0xf0,
+	0x28,
+	0x11,
+	0x64,
+	0xa0,
+	0x2a,
+	0x52,
+	0x80,
+	0x38,
+	0x09,
+	0xf9,
+	0xf9,
+	0x73,
+	0xe8,
+	0x20,
+	0xa0,
+	0x91,
+	0x88,
+	0xf4,
+	0x1c,
+	0x50,
+	0xa4,
+	0x75,
+	0x11,
+	0xa1,
+	0x3e,
+	0x01,
+	0x55,
+	0xd2,
+	0x4a,
+	0xb5,
+	0x8b,
+	0xf0,
+	0x30,
+	0xde,
+	0x47,
+	0x01,
+	0x0e,
+	0x62,
+	0x3a,
+	0xa8,
+	0x18,
+	0xa8,
+	0x24,
+	0x84,
+	0x01,
+	0x07,
+	0xfc,
+	0x1c,
+	0x58,
+	0xb8,
+	0xd2,
+	0x9b,
+	0x00,
+	0x88,
+	0x17,
+	0x61,
+	0xca,
+	0xa4,
+	0x59,
+	0xd3,
+	0xc0,
+	0x4d,
+	0x7d,
+	0x3a,
+	0xe1,
+	0xa0,
+	0x62,
+	0xa9,
+	0x80,
+	0xe9,
+	0x3b,
+	0x88,
+	0xf0,
+	0x64,
+	0xce,
+	0x3c,
+	0x17,
+	0xc0,
+	0x68,
+	0x40,
+	0x3f,
+	0x40,
+	0x06,
+	0x2c,
+	0x8d,
+	0xc0,
+	0xd5,
+	0xdb,
+	0xd3,
+	0x80,
+	0x04,
+	0x63,
+	0x12,
+	0x8d,
+	0x64,
+	0xe0,
+	0xc0,
+	0x81,
+	0xab,
+	0x0b,
+	0xbc,
+	0x34,
+	0xe5,
+	0xca,
+	0x34,
+	0x42,
+	0xcc,
+	0x9f,
+	0xf1,
+	0x96,
+	0x4e,
+	0xa0,
+	0x37,
+	0xf6,
+	0x9a,
+	0x59,
+	0x78,
+	0x67,
+	0x71,
+	0x9e,
+	0x5d,
+	0xdb,
+	0x96,
+	0xeb,
+	0xdb,
+	0x88,
+	0x4d,
+	0x2f,
+	0x08,
+	0x36,
+	0xa8,
+	0x26,
+	0x40,
+	0x5e,
+	0xbd,
+	0x17,
+	0xb5,
+	0x46,
+	0x08,
+	0xd0,
+	0x95,
+	0xad,
+	0x3b,
+	0xa9,
+	0x6b,
+	0x2b,
+	0x44,
+	0x20,
+	0x1c,
+	0xc6,
+	0xb0,
+	0x59,
+	0xb3,
+	0x46,
+	0x32,
+	0x6b,
+	0x6e,
+	0xca,
+	0x37,
+	0x82,
+	0x84,
+	0x08,
+	0x07,
+	0xaa,
+	0x35,
+	0xa3,
+	0x5c,
+	0xd9,
+	0xb2,
+	0x11,
+	0x29,
+	0x27,
+	0x18,
+	0x6f,
+	0x95,
+	0x20,
+	0xc1,
+	0x2c,
+	0xe9,
+	0x9a,
+	0x86,
+	0x4d,
+	0xdf,
+	0x61,
+	0xdb,
+	0xa0,
+	0xc2,
+	0x01,
+	0x7a,
+	0xaf,
+	0xe7,
+	0x9c,
+	0x8e,
+	0xbd,
+	0xc2,
+	0x00,
+	0xc1,
+	0x06,
+	0x66,
+	0x71,
+	0xdf,
+	0x4b,
+	0x4d,
+	0xb7,
+	0xae,
+	0x09,
+	0xdf,
+	0xbf,
+	0x0b,
+	0x08,
+	0x1f,
+	0x4e,
+	0x22,
+	0x00,
+	0xdd,
+	0x17,
+	0xc8,
+	0x09,
+	0x1e,
+	0x62,
+	0x5e,
+	0xc2,
+	0x0e,
+	0xf4,
+	0x43,
+	0x88,
+	0xa8,
+	0x6b,
+	0xdf,
+	0xce,
+	0xbd,
+	0xbb,
+	0xf7,
+	0xef,
+	0xe0,
+	0x61,
+	0x84,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0xc0,
+	0x20,
+	0xcd,
+	0x60,
+	0x10,
+	0x1a,
+	0x45,
+	0x06,
+	0xc2,
+	0xa2,
+	0x78,
+	0xe4,
+	0x05,
+	0x9e,
+	0x48,
+	0xe5,
+	0xb2,
+	0xa9,
+	0x0b,
+	0x4c,
+	0x26,
+	0x87,
+	0xc0,
+	0x27,
+	0xb9,
+	0x98,
+	0x52,
+	0x6f,
+	0xd6,
+	0x2b,
+	0xf6,
+	0x13,
+	0x20,
+	0x0c,
+	0xbc,
+	0xdf,
+	0x9a,
+	0x95,
+	0x72,
+	0xcd,
+	0x96,
+	0xcf,
+	0xcc,
+	0x74,
+	0x89,
+	0xf8,
+	0xd4,
+	0xa6,
+	0xd6,
+	0xec,
+	0x4a,
+	0xd9,
+	0x3c,
+	0x88,
+	0xcb,
+	0x91,
+	0x09,
+	0x81,
+	0x81,
+	0x44,
+	0x7e,
+	0x23,
+	0x01,
+	0x16,
+	0x14,
+	0x16,
+	0x16,
+	0x7a,
+	0x04,
+	0x66,
+	0x85,
+	0x72,
+	0x06,
+	0x09,
+	0x02,
+	0x02,
+	0x82,
+	0x82,
+	0x08,
+	0x85,
+	0x56,
+	0x8a,
+	0x13,
+	0x7a,
+	0x10,
+	0x8d,
+	0x8f,
+	0x5f,
+	0x91,
+	0x93,
+	0x0b,
+	0x09,
+	0x5d,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0x0a,
+	0x76,
+	0x22,
+	0x6b,
+	0x57,
+	0x9c,
+	0x9e,
+	0x7f,
+	0x80,
+	0x93,
+	0xa2,
+	0xa5,
+	0x0b,
+	0xa9,
+	0xa9,
+	0x50,
+	0x64,
+	0x15,
+	0x79,
+	0x05,
+	0x01,
+	0x10,
+	0x9d,
+	0x9f,
+	0x47,
+	0x91,
+	0x92,
+	0xa7,
+	0x94,
+	0xb5,
+	0xb7,
+	0xb7,
+	0x5a,
+	0x01,
+	0x15,
+	0x9b,
+	0x05,
+	0xbd,
+	0xbf,
+	0x10,
+	0xc1,
+	0x46,
+	0xa1,
+	0x02,
+	0x0b,
+	0xd5,
+	0xa4,
+	0x5d,
+	0xc8,
+	0xc8,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xce,
+	0x59,
+	0xbf,
+	0x0b,
+	0x0c,
+	0xd2,
+	0x41,
+	0xd4,
+	0xd6,
+	0xd8,
+	0xb6,
+	0xda,
+	0xb7,
+	0x0e,
+	0x93,
+	0xce,
+	0x03,
+	0x08,
+	0xdd,
+	0xa9,
+	0xe4,
+	0x90,
+	0x09,
+	0x03,
+	0x04,
+	0xd5,
+	0xa3,
+	0xa5,
+	0xeb,
+	0xec,
+	0x02,
+	0x03,
+	0xff,
+	0xc5,
+	0x50,
+	0x35,
+	0x68,
+	0x40,
+	0xaf,
+	0x89,
+	0x16,
+	0x03,
+	0xff,
+	0xf0,
+	0x75,
+	0x39,
+	0xa3,
+	0x8e,
+	0x9f,
+	0x02,
+	0x07,
+	0x00,
+	0x23,
+	0x0a,
+	0x18,
+	0x48,
+	0xb0,
+	0xdc,
+	0x8e,
+	0x00,
+	0x0f,
+	0x02,
+	0x20,
+	0xbc,
+	0x97,
+	0x6f,
+	0x9f,
+	0xc3,
+	0x87,
+	0x00,
+	0xeb,
+	0x14,
+	0xa3,
+	0xc8,
+	0x60,
+	0x55,
+	0x10,
+	0x8c,
+	0x7d,
+	0xdd,
+	0x12,
+	0x0a,
+	0x90,
+	0x62,
+	0xea,
+	0x23,
+	0xc8,
+	0x7f,
+	0x4f,
+	0x54,
+	0x9d,
+	0x1a,
+	0xe8,
+	0xa0,
+	0xe4,
+	0x11,
+	0x5f,
+	0x7d,
+	0x20,
+	0x0c,
+	0x38,
+	0xd0,
+	0xe8,
+	0xc0,
+	0x42,
+	0x7e,
+	0x11,
+	0x52,
+	0x41,
+	0x84,
+	0x29,
+	0x52,
+	0x80,
+	0x83,
+	0xa3,
+	0x0e,
+	0x4c,
+	0x9e,
+	0x8c,
+	0xa6,
+	0xf3,
+	0x5e,
+	0x4f,
+	0x3e,
+	0xa9,
+	0x82,
+	0x46,
+	0x15,
+	0xea,
+	0x8f,
+	0x68,
+	0x80,
+	0x53,
+	0x48,
+	0x93,
+	0x52,
+	0xd1,
+	0xd8,
+	0x34,
+	0x61,
+	0xa3,
+	0x96,
+	0x0a,
+	0x22,
+	0x88,
+	0x0d,
+	0x4b,
+	0x35,
+	0x62,
+	0xc4,
+	0xac,
+	0x4a,
+	0xa7,
+	0x1d,
+	0x38,
+	0x10,
+	0x51,
+	0x89,
+	0x99,
+	0xb0,
+	0x63,
+	0xa5,
+	0x1e,
+	0xad,
+	0x1a,
+	0x91,
+	0xe2,
+	0xd1,
+	0xb4,
+	0x42,
+	0x0c,
+	0xac,
+	0xfd,
+	0xc7,
+	0x76,
+	0x27,
+	0xdb,
+	0x00,
+	0x09,
+	0xc4,
+	0x06,
+	0x8e,
+	0x3a,
+	0x37,
+	0x62,
+	0xd4,
+	0x09,
+	0x03,
+	0xf1,
+	0x0a,
+	0x09,
+	0xd0,
+	0xd7,
+	0xaf,
+	0xce,
+	0x3a,
+	0x75,
+	0x12,
+	0xc0,
+	0x8d,
+	0x50,
+	0xf8,
+	0x54,
+	0xd8,
+	0x0b,
+	0x98,
+	0x2d,
+	0xfe,
+	0x60,
+	0xbc,
+	0x76,
+	0x6d,
+	0x1d,
+	0x13,
+	0x01,
+	0x26,
+	0x3f,
+	0xcc,
+	0x0a,
+	0xb7,
+	0x42,
+	0x04,
+	0xcd,
+	0x3e,
+	0x7c,
+	0x79,
+	0xce,
+	0x75,
+	0x22,
+	0x40,
+	0x50,
+	0xb1,
+	0x62,
+	0x25,
+	0x44,
+	0x38,
+	0x40,
+	0x8e,
+	0x1b,
+	0xea,
+	0xd4,
+	0x10,
+	0xb2,
+	0x78,
+	0x56,
+	0x11,
+	0x1a,
+	0xae,
+	0x04,
+	0x09,
+	0x6b,
+	0x6f,
+	0x2f,
+	0xd5,
+	0xad,
+	0x98,
+	0x84,
+	0xeb,
+	0x08,
+	0x0d,
+	0x2a,
+	0x1c,
+	0x18,
+	0x28,
+	0x1c,
+	0x48,
+	0x80,
+	0xc4,
+	0xc5,
+	0x4b,
+	0x3c,
+	0x1f,
+	0xb8,
+	0x96,
+	0x79,
+	0x2c,
+	0x43,
+	0x89,
+	0x61,
+	0x4c,
+	0x1f,
+	0x58,
+	0xc0,
+	0xfa,
+	0x75,
+	0x32,
+	0xd1,
+	0x4f,
+	0x18,
+	0xa0,
+	0xc8,
+	0x9c,
+	0xc8,
+	0xf7,
+	0x1a,
+	0x84,
+	0x08,
+	0x9d,
+	0xff,
+	0x12,
+	0x02,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x2e,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0xc0,
+	0xa0,
+	0x70,
+	0xe8,
+	0x33,
+	0x18,
+	0x88,
+	0x43,
+	0x03,
+	0x61,
+	0x71,
+	0x44,
+	0xee,
+	0x02,
+	0x50,
+	0x91,
+	0x72,
+	0xc1,
+	0x74,
+	0xe6,
+	0x02,
+	0x93,
+	0xc9,
+	0x21,
+	0xf0,
+	0x99,
+	0x56,
+	0xad,
+	0x36,
+	0x6c,
+	0x56,
+	0xfb,
+	0x09,
+	0x10,
+	0x06,
+	0x5f,
+	0x30,
+	0x0d,
+	0x4b,
+	0xc9,
+	0x6e,
+	0xcd,
+	0xe8,
+	0xa6,
+	0x7a,
+	0xc6,
+	0x6e,
+	0x57,
+	0xcc,
+	0xe7,
+	0x81,
+	0x7c,
+	0x1e,
+	0x0b,
+	0x58,
+	0x28,
+	0x16,
+	0x16,
+	0x77,
+	0x04,
+	0x67,
+	0x7b,
+	0x7c,
+	0x30,
+	0x58,
+	0x81,
+	0x13,
+	0x77,
+	0x10,
+	0x84,
+	0x86,
+	0x87,
+	0x2e,
+	0x6c,
+	0x59,
+	0x8c,
+	0x8e,
+	0x90,
+	0x28,
+	0x46,
+	0x98,
+	0x7b,
+	0x01,
+	0x15,
+	0x76,
+	0x05,
+	0x01,
+	0x10,
+	0x8d,
+	0x8f,
+	0x90,
+	0x46,
+	0x09,
+	0xa5,
+	0xa5,
+	0x08,
+	0x98,
+	0x65,
+	0x15,
+	0x8b,
+	0x05,
+	0x9e,
+	0xa0,
+	0x10,
+	0xa2,
+	0x7c,
+	0x06,
+	0xa5,
+	0x54,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0xb9,
+	0x0a,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xad,
+	0x5b,
+	0xa0,
+	0x0b,
+	0x0c,
+	0xb1,
+	0x60,
+	0xb3,
+	0x02,
+	0x02,
+	0xb5,
+	0x0b,
+	0xba,
+	0xb9,
+	0x0e,
+	0xc8,
+	0xad,
+	0x03,
+	0x08,
+	0xbd,
+	0xb9,
+	0xc4,
+	0x96,
+	0x5d,
+	0x09,
+	0xc8,
+	0xca,
+	0xcb,
+	0xcc,
+	0xce,
+	0x03,
+	0xde,
+	0xb7,
+	0xc8,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xd5,
+	0x87,
+	0xc7,
+	0xc8,
+	0xc9,
+	0x54,
+	0xcc,
+	0xcd,
+	0xdf,
+	0xed,
+	0x02,
+	0xe3,
+	0xe4,
+	0xc5,
+	0x49,
+	0xa5,
+	0x02,
+	0xe0,
+	0xea,
+	0xeb,
+	0x0a,
+	0x0e,
+	0xdf,
+	0x50,
+	0x01,
+	0xe0,
+	0xf0,
+	0x0c,
+	0x5c,
+	0xe6,
+	0x9c,
+	0x5b,
+	0x90,
+	0x6e,
+	0xdb,
+	0x3a,
+	0x7d,
+	0xde,
+	0x02,
+	0x28,
+	0x80,
+	0x72,
+	0x6b,
+	0x9c,
+	0x03,
+	0x80,
+	0xb2,
+	0xb0,
+	0x25,
+	0xcb,
+	0x86,
+	0x8f,
+	0x5d,
+	0x42,
+	0x7e,
+	0xb7,
+	0x1c,
+	0x68,
+	0x74,
+	0x10,
+	0xd0,
+	0x58,
+	0x82,
+	0x01,
+	0x04,
+	0xd2,
+	0xa1,
+	0xa9,
+	0x98,
+	0xaf,
+	0xde,
+	0xc5,
+	0x7e,
+	0x02,
+	0xbe,
+	0x36,
+	0x72,
+	0x54,
+	0x13,
+	0xc0,
+	0x80,
+	0xb7,
+	0x90,
+	0x54,
+	0xbc,
+	0xe1,
+	0x8b,
+	0x50,
+	0xb2,
+	0x5d,
+	0x3b,
+	0x95,
+	0x1d,
+	0x91,
+	0x04,
+	0x78,
+	0xe0,
+	0x12,
+	0x64,
+	0xc1,
+	0x01,
+	0x33,
+	0x23,
+	0x68,
+	0x34,
+	0xd9,
+	0x0e,
+	0x9e,
+	0xc6,
+	0x9c,
+	0x44,
+	0x76,
+	0xf6,
+	0x0c,
+	0xb9,
+	0xc4,
+	0x16,
+	0x50,
+	0x05,
+	0x34,
+	0xa1,
+	0x46,
+	0x10,
+	0xda,
+	0xed,
+	0x5b,
+	0xae,
+	0x08,
+	0x13,
+	0xc6,
+	0x21,
+	0x1d,
+	0xa2,
+	0x14,
+	0xc2,
+	0x80,
+	0x03,
+	0x84,
+	0x0e,
+	0xc4,
+	0xbc,
+	0x3a,
+	0xb5,
+	0x2c,
+	0x55,
+	0x93,
+	0xb8,
+	0x22,
+	0x5c,
+	0x58,
+	0x2b,
+	0x0f,
+	0x48,
+	0x4b,
+	0xaf,
+	0x20,
+	0xc3,
+	0x2e,
+	0x38,
+	0x23,
+	0xd5,
+	0x2c,
+	0x4d,
+	0x95,
+	0x0e,
+	0xa4,
+	0x56,
+	0x88,
+	0xd0,
+	0x16,
+	0x88,
+	0x01,
+	0xb8,
+	0x2f,
+	0x09,
+	0x1c,
+	0x38,
+	0x00,
+	0xb4,
+	0x2c,
+	0xd4,
+	0xba,
+	0x11,
+	0x24,
+	0x44,
+	0x38,
+	0x40,
+	0x8c,
+	0x57,
+	0xdf,
+	0x20,
+	0x06,
+	0x06,
+	0x13,
+	0xb6,
+	0x89,
+	0x38,
+	0xea,
+	0x54,
+	0x09,
+	0x12,
+	0x06,
+	0x3f,
+	0x26,
+	0x12,
+	0x59,
+	0xf2,
+	0xe4,
+	0x6f,
+	0x0d,
+	0xec,
+	0x4e,
+	0x6d,
+	0x50,
+	0xe1,
+	0xc0,
+	0xb8,
+	0xcd,
+	0x9c,
+	0x3d,
+	0x0f,
+	0x6e,
+	0x97,
+	0xc9,
+	0x00,
+	0xbc,
+	0x06,
+	0x83,
+	0x4f,
+	0x5b,
+	0x1b,
+	0x11,
+	0x40,
+	0xb5,
+	0x64,
+	0x06,
+	0x0c,
+	0x64,
+	0xbb,
+	0x7e,
+	0x5d,
+	0x40,
+	0xf6,
+	0x6c,
+	0x03,
+	0xb8,
+	0x83,
+	0x0b,
+	0x7f,
+	0x7d,
+	0x64,
+	0x37,
+	0xbc,
+	0x54,
+	0xb3,
+	0xf9,
+	0x29,
+	0x87,
+	0xd2,
+	0xba,
+	0x49,
+	0x73,
+	0x13,
+	0x21,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0x9f,
+	0x06,
+	0xc3,
+	0x6f,
+	0x88,
+	0x32,
+	0x10,
+	0x16,
+	0x42,
+	0xe2,
+	0x2f,
+	0xc0,
+	0x14,
+	0x19,
+	0x17,
+	0x48,
+	0x65,
+	0x2f,
+	0x30,
+	0x99,
+	0x1c,
+	0x02,
+	0x9f,
+	0x67,
+	0x54,
+	0xaa,
+	0xa3,
+	0x56,
+	0xad,
+	0x9f,
+	0x00,
+	0x61,
+	0xb0,
+	0xe5,
+	0xe2,
+	0xa8,
+	0x94,
+	0xea,
+	0x55,
+	0x4c,
+	0x4e,
+	0x9a,
+	0x6f,
+	0xe8,
+	0x74,
+	0x45,
+	0x3c,
+	0x1e,
+	0xb8,
+	0xdf,
+	0xb5,
+	0x80,
+	0x85,
+	0x62,
+	0xb1,
+	0xcc,
+	0x09,
+	0x63,
+	0x77,
+	0x78,
+	0x34,
+	0x54,
+	0x7d,
+	0x13,
+	0x73,
+	0x10,
+	0x80,
+	0x82,
+	0x83,
+	0x32,
+	0x68,
+	0x55,
+	0x88,
+	0x8a,
+	0x8c,
+	0x36,
+	0x01,
+	0x15,
+	0x72,
+	0x05,
+	0x01,
+	0x10,
+	0x89,
+	0x8b,
+	0x92,
+	0x2f,
+	0x94,
+	0x87,
+	0x05,
+	0x97,
+	0x99,
+	0x10,
+	0x9b,
+	0x9c,
+	0x23,
+	0x41,
+	0xa7,
+	0x6e,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xa0,
+	0x57,
+	0x99,
+	0x0b,
+	0x0c,
+	0xa4,
+	0x92,
+	0x41,
+	0x09,
+	0xb6,
+	0xb6,
+	0x08,
+	0xa7,
+	0x0e,
+	0x02,
+	0x02,
+	0xa0,
+	0x03,
+	0x08,
+	0xab,
+	0x0a,
+	0x0a,
+	0xb2,
+	0xa5,
+	0x25,
+	0x06,
+	0xb6,
+	0x50,
+	0x0b,
+	0x03,
+	0x02,
+	0xc2,
+	0xc2,
+	0xbb,
+	0x03,
+	0xd0,
+	0xcb,
+	0xbc,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xc4,
+	0xc5,
+	0x59,
+	0x09,
+	0xbc,
+	0xc9,
+	0x0b,
+	0xcd,
+	0xce,
+	0xd1,
+	0xe0,
+	0x02,
+	0xd5,
+	0xd6,
+	0xb3,
+	0x66,
+	0xc7,
+	0xdb,
+	0xdc,
+	0xde,
+	0x0a,
+	0x0e,
+	0xd1,
+	0x4c,
+	0x01,
+	0xd2,
+	0xe3,
+	0x0c,
+	0x58,
+	0x9c,
+	0xe7,
+	0xbc,
+	0x02,
+	0xc9,
+	0xea,
+	0xeb,
+	0xed,
+	0x01,
+	0x0a,
+	0xef,
+	0xe2,
+	0x0d,
+	0x0e,
+	0xe4,
+	0xd1,
+	0xb3,
+	0x25,
+	0x40,
+	0x1a,
+	0x94,
+	0x7c,
+	0xfa,
+	0xa0,
+	0xb9,
+	0xf3,
+	0xe7,
+	0xa0,
+	0xa1,
+	0x83,
+	0x79,
+	0x8c,
+	0xea,
+	0x2d,
+	0xb8,
+	0x77,
+	0x30,
+	0xdf,
+	0x33,
+	0x85,
+	0x4c,
+	0x96,
+	0x39,
+	0x7c,
+	0x38,
+	0x70,
+	0xdb,
+	0x36,
+	0x84,
+	0xeb,
+	0x0a,
+	0x82,
+	0x8b,
+	0xb6,
+	0x11,
+	0x22,
+	0x9e,
+	0x63,
+	0x03,
+	0xbe,
+	0x08,
+	0x50,
+	0x24,
+	0x03,
+	0xb2,
+	0xa1,
+	0x48,
+	0x70,
+	0xe3,
+	0x1a,
+	0x9a,
+	0x34,
+	0x13,
+	0xc0,
+	0x00,
+	0x34,
+	0x95,
+	0x50,
+	0xa0,
+	0xe5,
+	0x8b,
+	0xa0,
+	0x20,
+	0x82,
+	0x4b,
+	0x70,
+	0xc2,
+	0x22,
+	0x4c,
+	0xa8,
+	0x36,
+	0x53,
+	0xca,
+	0x3b,
+	0x9b,
+	0x29,
+	0x29,
+	0x2a,
+	0xdb,
+	0x19,
+	0xa1,
+	0xe9,
+	0xcf,
+	0x65,
+	0x3d,
+	0x2f,
+	0x48,
+	0x2d,
+	0xb7,
+	0xc4,
+	0xce,
+	0x4d,
+	0x01,
+	0x47,
+	0x94,
+	0x0d,
+	0x08,
+	0x1a,
+	0xb4,
+	0x29,
+	0xcf,
+	0x8d,
+	0x0e,
+	0x7a,
+	0x46,
+	0xa8,
+	0x10,
+	0x81,
+	0xaa,
+	0x8f,
+	0xa3,
+	0x10,
+	0x06,
+	0x1c,
+	0x00,
+	0x74,
+	0x20,
+	0x67,
+	0x57,
+	0xaf,
+	0x62,
+	0x9b,
+	0x4a,
+	0x88,
+	0x70,
+	0x40,
+	0x96,
+	0x2a,
+	0xb3,
+	0x67,
+	0x47,
+	0xa5,
+	0x4d,
+	0xc9,
+	0x76,
+	0xc1,
+	0x98,
+	0xb8,
+	0x4d,
+	0xbb,
+	0x4a,
+	0x90,
+	0x70,
+	0xe0,
+	0x00,
+	0x5e,
+	0x25,
+	0x35,
+	0xf7,
+	0xde,
+	0x24,
+	0x50,
+	0x78,
+	0x2b,
+	0x5c,
+	0xaf,
+	0x11,
+	0x1a,
+	0x54,
+	0x38,
+	0x50,
+	0xed,
+	0xb0,
+	0x14,
+	0x03,
+	0x85,
+	0x0f,
+	0x8c,
+	0x74,
+	0x0c,
+	0xd9,
+	0xc0,
+	0xb8,
+	0x06,
+	0x85,
+	0x2b,
+	0x63,
+	0x73,
+	0x92,
+	0xb9,
+	0x31,
+	0x4c,
+	0xaf,
+	0x4c,
+	0x3c,
+	0x7f,
+	0x2e,
+	0x20,
+	0x7a,
+	0x34,
+	0xe6,
+	0xd2,
+	0x9a,
+	0xa3,
+	0xa1,
+	0x72,
+	0xf2,
+	0xb9,
+	0xc1,
+	0xa9,
+	0xd1,
+	0x22,
+	0x02,
+	0xc0,
+	0xce,
+	0xcc,
+	0x80,
+	0x41,
+	0xeb,
+	0x2c,
+	0xa8,
+	0x2c,
+	0x73,
+	0x31,
+	0xd0,
+	0xbb,
+	0xb8,
+	0xf1,
+	0xcf,
+	0x45,
+	0x71,
+	0x97,
+	0x58,
+	0xc8,
+	0x3c,
+	0xb8,
+	0x72,
+	0x13,
+	0x21,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0xb4,
+	0x61,
+	0xf0,
+	0x40,
+	0x97,
+	0x81,
+	0xb0,
+	0xf8,
+	0x05,
+	0x8f,
+	0xa3,
+	0x80,
+	0x52,
+	0x34,
+	0x5c,
+	0x14,
+	0x91,
+	0xc7,
+	0xc0,
+	0x64,
+	0x72,
+	0x08,
+	0x7c,
+	0x9a,
+	0x4f,
+	0x28,
+	0x4f,
+	0x3a,
+	0xa5,
+	0x7e,
+	0x02,
+	0x84,
+	0x41,
+	0x56,
+	0xab,
+	0x93,
+	0x52,
+	0xa6,
+	0x55,
+	0xb0,
+	0xd8,
+	0x48,
+	0xce,
+	0x99,
+	0xcf,
+	0x15,
+	0x70,
+	0x78,
+	0xc0,
+	0x6e,
+	0xdf,
+	0x02,
+	0x16,
+	0x8a,
+	0xc5,
+	0x12,
+	0x27,
+	0x84,
+	0xeb,
+	0x76,
+	0x36,
+	0x52,
+	0x7b,
+	0x13,
+	0x71,
+	0x10,
+	0x7e,
+	0x80,
+	0x81,
+	0x34,
+	0x66,
+	0x53,
+	0x86,
+	0x88,
+	0x8a,
+	0x38,
+	0x01,
+	0x15,
+	0x70,
+	0x05,
+	0x01,
+	0x10,
+	0x87,
+	0x89,
+	0x90,
+	0x31,
+	0x92,
+	0x85,
+	0x05,
+	0x95,
+	0x97,
+	0x10,
+	0x99,
+	0x9a,
+	0x25,
+	0x3e,
+	0xa5,
+	0x6c,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0x9e,
+	0x55,
+	0x97,
+	0x0b,
+	0x0c,
+	0xa2,
+	0xa3,
+	0x3e,
+	0x09,
+	0xb4,
+	0xb4,
+	0x08,
+	0xa5,
+	0x0e,
+	0x02,
+	0x02,
+	0x9e,
+	0x03,
+	0x08,
+	0xa9,
+	0x0a,
+	0x0a,
+	0xb0,
+	0xa3,
+	0x27,
+	0x06,
+	0xb4,
+	0x4e,
+	0x0b,
+	0x03,
+	0x02,
+	0xc0,
+	0xc0,
+	0xb9,
+	0x03,
+	0xce,
+	0xc9,
+	0xba,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xc2,
+	0xc3,
+	0x23,
+	0xc5,
+	0xba,
+	0xc7,
+	0x0b,
+	0xcb,
+	0xcc,
+	0xcf,
+	0xde,
+	0x02,
+	0xd3,
+	0xd4,
+	0xb1,
+	0x76,
+	0xd8,
+	0x02,
+	0xda,
+	0xdb,
+	0xdc,
+	0x0e,
+	0xcf,
+	0x4a,
+	0x01,
+	0xd0,
+	0xe1,
+	0x0c,
+	0x56,
+	0xc3,
+	0xe5,
+	0xd9,
+	0x4e,
+	0xdc,
+	0xdd,
+	0xce,
+	0x4a,
+	0x0a,
+	0xed,
+	0xe0,
+	0x0d,
+	0x0e,
+	0xf0,
+	0xf2,
+	0xb4,
+	0x04,
+	0x40,
+	0xab,
+	0x67,
+	0x4f,
+	0x81,
+	0x3a,
+	0x7c,
+	0xec,
+	0x92,
+	0x39,
+	0x58,
+	0xe8,
+	0x20,
+	0x9e,
+	0xa6,
+	0x72,
+	0x0b,
+	0xcc,
+	0x11,
+	0xb4,
+	0xd7,
+	0x0c,
+	0xe1,
+	0x3e,
+	0x86,
+	0x0d,
+	0x01,
+	0x66,
+	0xcb,
+	0x56,
+	0x90,
+	0x99,
+	0x40,
+	0x6f,
+	0xcf,
+	0x30,
+	0x3a,
+	0x54,
+	0x54,
+	0x6c,
+	0x00,
+	0x01,
+	0x89,
+	0x62,
+	0xca,
+	0x3a,
+	0x1a,
+	0xac,
+	0xe8,
+	0x2d,
+	0xdc,
+	0xc2,
+	0x91,
+	0x76,
+	0x02,
+	0x18,
+	0x70,
+	0x76,
+	0xd2,
+	0x89,
+	0xb3,
+	0x82,
+	0x11,
+	0x14,
+	0x44,
+	0x58,
+	0xf8,
+	0xf1,
+	0xa6,
+	0xce,
+	0x09,
+	0xd3,
+	0x60,
+	0x92,
+	0x69,
+	0x37,
+	0xd3,
+	0xa4,
+	0x44,
+	0x64,
+	0x38,
+	0x23,
+	0x28,
+	0xe5,
+	0xe9,
+	0x4c,
+	0x59,
+	0x84,
+	0x0b,
+	0x50,
+	0xc7,
+	0x45,
+	0xa1,
+	0x43,
+	0x53,
+	0x00,
+	0x11,
+	0x64,
+	0x03,
+	0x80,
+	0xe5,
+	0xd4,
+	0xa9,
+	0x34,
+	0x27,
+	0x46,
+	0x07,
+	0x5c,
+	0x2b,
+	0x44,
+	0x90,
+	0x1a,
+	0x84,
+	0x28,
+	0x84,
+	0x01,
+	0x07,
+	0xfc,
+	0x1c,
+	0xb0,
+	0xa9,
+	0xb5,
+	0x6b,
+	0x4e,
+	0xb7,
+	0x12,
+	0x22,
+	0x1c,
+	0x80,
+	0x85,
+	0x8a,
+	0x6c,
+	0xd9,
+	0x50,
+	0x67,
+	0x4d,
+	0xaa,
+	0x5d,
+	0x10,
+	0x86,
+	0x6b,
+	0xd7,
+	0xb6,
+	0x12,
+	0x24,
+	0x1c,
+	0x38,
+	0x60,
+	0x57,
+	0x8b,
+	0xcc,
+	0xbc,
+	0x34,
+	0x09,
+	0x0c,
+	0xce,
+	0xfa,
+	0xd7,
+	0x6d,
+	0x83,
+	0x0a,
+	0x07,
+	0xa6,
+	0x15,
+	0x26,
+	0x63,
+	0x60,
+	0x31,
+	0x48,
+	0xc6,
+	0x01,
+	0xba,
+	0x1a,
+	0x08,
+	0xd7,
+	0x20,
+	0x40,
+	0xe4,
+	0x06,
+	0x93,
+	0xa1,
+	0x54,
+	0x3e,
+	0xe0,
+	0x8c,
+	0xf4,
+	0x3a,
+	0x76,
+	0xec,
+	0x0c,
+	0x40,
+	0x08,
+	0x9a,
+	0xaa,
+	0xb3,
+	0x35,
+	0x52,
+	0xde,
+	0x16,
+	0x2f,
+	0x31,
+	0xb1,
+	0xd9,
+	0x75,
+	0x80,
+	0x07,
+	0xa1,
+	0xa1,
+	0x78,
+	0x5e,
+	0x3c,
+	0x98,
+	0xdd,
+	0x09,
+	0x4b,
+	0x0f,
+	0xe2,
+	0x09,
+	0xb5,
+	0xb6,
+	0x7b,
+	0xb0,
+	0x71,
+	0x06,
+	0xf0,
+	0x64,
+	0x96,
+	0x98,
+	0xfd,
+	0x1a,
+	0x85,
+	0x12,
+	0xe4,
+	0xd0,
+	0x19,
+	0x70,
+	0x1e,
+	0xde,
+	0x5c,
+	0x05,
+	0x6a,
+	0x99,
+	0xa6,
+	0xaa,
+	0xab,
+	0x08,
+	0x01,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xc3,
+	0x06,
+	0xc3,
+	0x6f,
+	0x88,
+	0x32,
+	0x10,
+	0x16,
+	0x42,
+	0xe2,
+	0x2f,
+	0xc0,
+	0x14,
+	0x19,
+	0x17,
+	0x48,
+	0x65,
+	0x2f,
+	0x30,
+	0x99,
+	0x1c,
+	0x02,
+	0x9f,
+	0x67,
+	0x54,
+	0xaa,
+	0xa3,
+	0x56,
+	0xad,
+	0x9f,
+	0x00,
+	0x61,
+	0xb0,
+	0xe5,
+	0xe2,
+	0xa8,
+	0x94,
+	0xea,
+	0x55,
+	0x4c,
+	0x4e,
+	0x9a,
+	0x6f,
+	0xe8,
+	0x74,
+	0x45,
+	0x3c,
+	0x1e,
+	0xb8,
+	0xdf,
+	0xa7,
+	0x60,
+	0x33,
+	0x15,
+	0xb0,
+	0x50,
+	0x2c,
+	0x16,
+	0x73,
+	0x04,
+	0x63,
+	0x77,
+	0x78,
+	0x25,
+	0x06,
+	0x09,
+	0x89,
+	0x09,
+	0x41,
+	0x41,
+	0x26,
+	0x54,
+	0x80,
+	0x13,
+	0x73,
+	0x10,
+	0x83,
+	0x85,
+	0x86,
+	0x4e,
+	0x09,
+	0x02,
+	0x02,
+	0x8a,
+	0x8a,
+	0x08,
+	0x77,
+	0x68,
+	0x55,
+	0x92,
+	0x94,
+	0x96,
+	0x87,
+	0x98,
+	0x02,
+	0x0b,
+	0x09,
+	0x50,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0x0a,
+	0x58,
+	0x22,
+	0x01,
+	0x15,
+	0x72,
+	0x05,
+	0x01,
+	0x10,
+	0x93,
+	0x95,
+	0x78,
+	0x88,
+	0x99,
+	0x99,
+	0xa9,
+	0x50,
+	0xad,
+	0xad,
+	0xaf,
+	0xb1,
+	0x91,
+	0x05,
+	0xb4,
+	0xb6,
+	0x10,
+	0xb8,
+	0x66,
+	0x88,
+	0x98,
+	0xab,
+	0x9a,
+	0xbd,
+	0xbf,
+	0xc0,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xc4,
+	0x57,
+	0xb6,
+	0x0b,
+	0x0c,
+	0xc8,
+	0x52,
+	0xba,
+	0xa6,
+	0xa6,
+	0xa8,
+	0xbe,
+	0xcf,
+	0xad,
+	0x0e,
+	0x99,
+	0xc4,
+	0x03,
+	0x08,
+	0xd2,
+	0xad,
+	0xd9,
+	0xa3,
+	0x59,
+	0xa5,
+	0x0b,
+	0xcd,
+	0xe0,
+	0xe1,
+	0x0a,
+	0xe3,
+	0x03,
+	0xf4,
+	0xcc,
+	0xac,
+	0x0d,
+	0x0d,
+	0xea,
+	0x86,
+	0x88,
+	0x03,
+	0x04,
+	0xa6,
+	0xa7,
+	0xa9,
+	0xe2,
+	0x89,
+	0xab,
+	0x47,
+	0x50,
+	0x00,
+	0xbe,
+	0x7c,
+	0xda,
+	0x96,
+	0x18,
+	0xa0,
+	0xe7,
+	0x0f,
+	0x0a,
+	0x99,
+	0x05,
+	0x02,
+	0x07,
+	0x12,
+	0xa4,
+	0x97,
+	0xe9,
+	0x20,
+	0x83,
+	0x57,
+	0x5c,
+	0x02,
+	0xd8,
+	0x61,
+	0xf8,
+	0x2f,
+	0x60,
+	0x44,
+	0x07,
+	0x04,
+	0x99,
+	0x50,
+	0xc4,
+	0xe7,
+	0xe0,
+	0xe2,
+	0x1b,
+	0x8d,
+	0x0b,
+	0xd5,
+	0xfb,
+	0x09,
+	0x38,
+	0xe2,
+	0x30,
+	0x5e,
+	0x04,
+	0x89,
+	0xf5,
+	0x44,
+	0x0a,
+	0x70,
+	0x40,
+	0xd3,
+	0x01,
+	0x46,
+	0x29,
+	0x28,
+	0x21,
+	0x0c,
+	0x38,
+	0x30,
+	0xe8,
+	0x40,
+	0xcb,
+	0x70,
+	0x2f,
+	0xe5,
+	0x09,
+	0x98,
+	0xa8,
+	0x71,
+	0x66,
+	0xcd,
+	0x9b,
+	0x38,
+	0x0d,
+	0xe8,
+	0xec,
+	0xd7,
+	0xb3,
+	0x4e,
+	0xab,
+	0xa0,
+	0x41,
+	0xe7,
+	0x4d,
+	0xa4,
+	0x57,
+	0xd3,
+	0x26,
+	0x9e,
+	0x00,
+	0x4a,
+	0x09,
+	0x0e,
+	0x3a,
+	0x32,
+	0xe0,
+	0x69,
+	0x84,
+	0xaf,
+	0xe2,
+	0xa4,
+	0x12,
+	0x3c,
+	0x48,
+	0x13,
+	0x29,
+	0x17,
+	0x03,
+	0x07,
+	0x0e,
+	0x68,
+	0x5d,
+	0x30,
+	0x46,
+	0xc1,
+	0x57,
+	0xb0,
+	0x6e,
+	0x69,
+	0x0e,
+	0xad,
+	0xf7,
+	0x74,
+	0x02,
+	0x3e,
+	0xb3,
+	0xdb,
+	0xd2,
+	0xd2,
+	0x53,
+	0xbb,
+	0x53,
+	0xad,
+	0x5b,
+	0xb8,
+	0x6f,
+	0xe5,
+	0x52,
+	0x74,
+	0x7b,
+	0xa1,
+	0x70,
+	0x42,
+	0x22,
+	0x01,
+	0xf8,
+	0xf6,
+	0xd5,
+	0xd8,
+	0x35,
+	0x42,
+	0x00,
+	0xb0,
+	0x6f,
+	0xe5,
+	0x55,
+	0xfd,
+	0x5b,
+	0x21,
+	0xc2,
+	0xe1,
+	0x21,
+	0x89,
+	0xd3,
+	0xa6,
+	0x65,
+	0xc2,
+	0xb9,
+	0xb3,
+	0xdb,
+	0xbf,
+	0x5f,
+	0x25,
+	0x44,
+	0x38,
+	0x90,
+	0x2d,
+	0xda,
+	0x65,
+	0xcc,
+	0x99,
+	0x99,
+	0x5c,
+	0x39,
+	0xf1,
+	0xf8,
+	0xaf,
+	0x04,
+	0x09,
+	0x69,
+	0x4f,
+	0x67,
+	0x4c,
+	0x9c,
+	0x9a,
+	0xcf,
+	0xd7,
+	0x06,
+	0x15,
+	0x0e,
+	0xe0,
+	0x93,
+	0x8d,
+	0x93,
+	0xf6,
+	0x6a,
+	0x15,
+	0x01,
+	0x0e,
+	0x26,
+	0x6e,
+	0x80,
+	0x77,
+	0x54,
+	0x70,
+	0xe2,
+	0xc5,
+	0x4b,
+	0x1c,
+	0x67,
+	0x52,
+	0x80,
+	0xf8,
+	0x3a,
+	0xe5,
+	0x77,
+	0x5d,
+	0x44,
+	0x6b,
+	0xe0,
+	0x2a,
+	0xc0,
+	0x03,
+	0xde,
+	0x4a,
+	0xf6,
+	0xb8,
+	0xb0,
+	0xee,
+	0x2a,
+	0x4c,
+	0xf2,
+	0xe7,
+	0x2f,
+	0xb4,
+	0x83,
+	0x1f,
+	0x5f,
+	0x23,
+	0x04,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0x40,
+	0xa0,
+	0xc1,
+	0x10,
+	0x2c,
+	0x92,
+	0x0c,
+	0x84,
+	0x05,
+	0xd1,
+	0xd8,
+	0x0b,
+	0x38,
+	0x45,
+	0xc8,
+	0x85,
+	0x92,
+	0xb9,
+	0x0b,
+	0x4c,
+	0x26,
+	0x87,
+	0xc0,
+	0x27,
+	0x3a,
+	0xa5,
+	0xe2,
+	0xac,
+	0x57,
+	0xec,
+	0x27,
+	0x40,
+	0x18,
+	0x74,
+	0xbd,
+	0x36,
+	0x2b,
+	0xe5,
+	0x9a,
+	0x25,
+	0x9b,
+	0x97,
+	0x68,
+	0xd3,
+	0xd0,
+	0xa9,
+	0x4d,
+	0xa9,
+	0xd7,
+	0x15,
+	0x72,
+	0x79,
+	0x00,
+	0x8f,
+	0x8f,
+	0x0c,
+	0x09,
+	0x81,
+	0x81,
+	0x43,
+	0x7d,
+	0x23,
+	0x01,
+	0x16,
+	0x14,
+	0x16,
+	0x16,
+	0x79,
+	0x04,
+	0x65,
+	0x85,
+	0x7e,
+	0x80,
+	0x02,
+	0x02,
+	0x82,
+	0x82,
+	0x08,
+	0x85,
+	0x56,
+	0x8a,
+	0x13,
+	0x79,
+	0x10,
+	0x8d,
+	0x8f,
+	0x68,
+	0x91,
+	0x02,
+	0x0b,
+	0x09,
+	0x52,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0x0a,
+	0x75,
+	0x22,
+	0x6a,
+	0x57,
+	0x9b,
+	0x9d,
+	0x7e,
+	0x7f,
+	0x09,
+	0x92,
+	0x92,
+	0xa4,
+	0x52,
+	0xa8,
+	0xa8,
+	0x4f,
+	0x63,
+	0x15,
+	0x78,
+	0x05,
+	0x01,
+	0x10,
+	0x9c,
+	0x9e,
+	0x4c,
+	0x80,
+	0xb2,
+	0xa6,
+	0x93,
+	0xb5,
+	0xb7,
+	0xb7,
+	0x5a,
+	0x01,
+	0x15,
+	0x9a,
+	0x05,
+	0xbd,
+	0xbf,
+	0x10,
+	0xc1,
+	0x46,
+	0xa0,
+	0x0b,
+	0xa1,
+	0xa3,
+	0xb6,
+	0xc8,
+	0xb7,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xce,
+	0x59,
+	0xbf,
+	0x0b,
+	0x0c,
+	0xd2,
+	0x41,
+	0xd4,
+	0xc6,
+	0xd8,
+	0xd9,
+	0xa8,
+	0x0e,
+	0x92,
+	0xce,
+	0x03,
+	0x08,
+	0xdc,
+	0xa8,
+	0xe3,
+	0x90,
+	0x09,
+	0x03,
+	0x04,
+	0xa1,
+	0xa2,
+	0xa4,
+	0xe9,
+	0xb7,
+	0xeb,
+	0x03,
+	0xfd,
+	0xc5,
+	0xa7,
+	0x0d,
+	0x1a,
+	0xc8,
+	0xa3,
+	0xa2,
+	0xc5,
+	0x40,
+	0x3f,
+	0x7b,
+	0x52,
+	0xcc,
+	0x2c,
+	0xd0,
+	0xb7,
+	0xcf,
+	0x9f,
+	0x43,
+	0x01,
+	0x01,
+	0x05,
+	0x92,
+	0xab,
+	0xf2,
+	0x20,
+	0x80,
+	0xc1,
+	0x7a,
+	0xf7,
+	0xf2,
+	0x31,
+	0x54,
+	0xe0,
+	0xc0,
+	0x1f,
+	0x9d,
+	0x62,
+	0x11,
+	0x19,
+	0xa8,
+	0x0a,
+	0x12,
+	0xe0,
+	0x01,
+	0x9f,
+	0x83,
+	0x02,
+	0xdb,
+	0x92,
+	0x24,
+	0xdc,
+	0xc8,
+	0xd1,
+	0x63,
+	0x80,
+	0x54,
+	0xa6,
+	0x02,
+	0x3a,
+	0x10,
+	0xc9,
+	0xc4,
+	0x17,
+	0x1f,
+	0x08,
+	0x03,
+	0x0e,
+	0x34,
+	0x3a,
+	0xb0,
+	0x32,
+	0x5d,
+	0x04,
+	0x75,
+	0x2e,
+	0x9d,
+	0x98,
+	0x72,
+	0x40,
+	0xd4,
+	0xc1,
+	0x48,
+	0x92,
+	0xd1,
+	0x70,
+	0xd6,
+	0xdb,
+	0xb9,
+	0x07,
+	0xd5,
+	0x4f,
+	0xa7,
+	0xea,
+	0x04,
+	0x04,
+	0x1d,
+	0x5a,
+	0xf4,
+	0x28,
+	0x49,
+	0x03,
+	0x4a,
+	0x0f,
+	0x36,
+	0x2a,
+	0xe5,
+	0x34,
+	0xc2,
+	0xcf,
+	0xa7,
+	0xfc,
+	0x1c,
+	0xfa,
+	0x2b,
+	0x6a,
+	0x34,
+	0x8e,
+	0x81,
+	0x03,
+	0x07,
+	0x1c,
+	0x26,
+	0x29,
+	0xa3,
+	0xc0,
+	0xeb,
+	0x57,
+	0x75,
+	0x61,
+	0x1d,
+	0x46,
+	0x24,
+	0x6a,
+	0xb5,
+	0xc8,
+	0xd9,
+	0xb4,
+	0x39,
+	0xfb,
+	0xa1,
+	0x1d,
+	0x10,
+	0x20,
+	0x81,
+	0x57,
+	0xbf,
+	0x4e,
+	0x89,
+	0x4a,
+	0xf5,
+	0xe7,
+	0x74,
+	0x42,
+	0xc0,
+	0xba,
+	0x45,
+	0x02,
+	0xe0,
+	0xcd,
+	0x79,
+	0x00,
+	0x27,
+	0x1d,
+	0x3a,
+	0x09,
+	0xda,
+	0x7a,
+	0x15,
+	0xdc,
+	0xef,
+	0x54,
+	0x84,
+	0x0b,
+	0x98,
+	0x27,
+	0xfe,
+	0x50,
+	0x8c,
+	0x16,
+	0x2d,
+	0x1d,
+	0x13,
+	0x2f,
+	0xdd,
+	0x72,
+	0x24,
+	0x2b,
+	0xb9,
+	0x42,
+	0x04,
+	0xcd,
+	0x3e,
+	0x7c,
+	0x79,
+	0xce,
+	0x75,
+	0x22,
+	0xc0,
+	0x57,
+	0xb7,
+	0x12,
+	0x22,
+	0x1c,
+	0x18,
+	0xb7,
+	0x0d,
+	0x75,
+	0x6a,
+	0x08,
+	0x59,
+	0x3c,
+	0xab,
+	0x78,
+	0x29,
+	0x59,
+	0x82,
+	0x04,
+	0xb4,
+	0xb6,
+	0x91,
+	0xe6,
+	0x46,
+	0x4c,
+	0xc2,
+	0x75,
+	0x84,
+	0x06,
+	0x15,
+	0x0e,
+	0x04,
+	0x0c,
+	0x0e,
+	0x24,
+	0xc0,
+	0x61,
+	0xe2,
+	0x25,
+	0x9c,
+	0x07,
+	0x44,
+	0xbb,
+	0x1c,
+	0x56,
+	0xf1,
+	0xc3,
+	0x30,
+	0xa4,
+	0x07,
+	0x2c,
+	0x50,
+	0xdd,
+	0xfa,
+	0x2a,
+	0xe8,
+	0x28,
+	0xb4,
+	0x5b,
+	0x64,
+	0xee,
+	0x1d,
+	0x05,
+	0x21,
+	0xf2,
+	0xe5,
+	0xcb,
+	0x87,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x2e,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0xc0,
+	0xa0,
+	0x70,
+	0x88,
+	0x32,
+	0x18,
+	0x88,
+	0x43,
+	0x03,
+	0x61,
+	0x71,
+	0x44,
+	0xee,
+	0x02,
+	0x50,
+	0x91,
+	0x72,
+	0xc1,
+	0x74,
+	0xe6,
+	0x02,
+	0x93,
+	0xc9,
+	0x21,
+	0xf0,
+	0x99,
+	0x56,
+	0xad,
+	0x36,
+	0x6c,
+	0x56,
+	0xfb,
+	0x09,
+	0x10,
+	0x06,
+	0x5f,
+	0x30,
+	0x0d,
+	0x4b,
+	0xc9,
+	0x6e,
+	0xcd,
+	0xe8,
+	0xa6,
+	0x7a,
+	0xc6,
+	0x6e,
+	0x57,
+	0xcc,
+	0xe7,
+	0x81,
+	0x7c,
+	0x1e,
+	0x0b,
+	0x58,
+	0x28,
+	0x16,
+	0x16,
+	0x77,
+	0x04,
+	0x67,
+	0x7b,
+	0x7c,
+	0x30,
+	0x58,
+	0x81,
+	0x13,
+	0x77,
+	0x10,
+	0x84,
+	0x86,
+	0x87,
+	0x2e,
+	0x6c,
+	0x59,
+	0x8c,
+	0x8e,
+	0x90,
+	0x45,
+	0x46,
+	0x98,
+	0x24,
+	0x01,
+	0x15,
+	0x76,
+	0x05,
+	0x01,
+	0x10,
+	0x8d,
+	0x8f,
+	0x90,
+	0x46,
+	0x09,
+	0xa5,
+	0xa5,
+	0x08,
+	0x99,
+	0x9b,
+	0x8b,
+	0x05,
+	0x9e,
+	0xa0,
+	0x10,
+	0xa2,
+	0x7c,
+	0x06,
+	0xa5,
+	0x54,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0xb8,
+	0x0a,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xac,
+	0x5b,
+	0xa0,
+	0x0b,
+	0x0c,
+	0xb0,
+	0x60,
+	0xb2,
+	0x02,
+	0x02,
+	0xb4,
+	0x0b,
+	0xb9,
+	0xb8,
+	0x0e,
+	0xc7,
+	0xac,
+	0x03,
+	0x08,
+	0xbc,
+	0xb8,
+	0xc3,
+	0x96,
+	0x5d,
+	0x09,
+	0xc7,
+	0xc9,
+	0xca,
+	0xcb,
+	0xcd,
+	0x03,
+	0xdd,
+	0xb6,
+	0xc7,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xd4,
+	0x87,
+	0xc6,
+	0xc7,
+	0xc8,
+	0x54,
+	0xcb,
+	0xcc,
+	0xde,
+	0xec,
+	0x02,
+	0xe2,
+	0xe3,
+	0xc4,
+	0x49,
+	0xa5,
+	0x02,
+	0xdf,
+	0xe9,
+	0xea,
+	0x0a,
+	0x0e,
+	0xde,
+	0x50,
+	0x01,
+	0xdf,
+	0xef,
+	0x0c,
+	0x5c,
+	0x73,
+	0xcc,
+	0x2d,
+	0x40,
+	0xa7,
+	0x4d,
+	0x5d,
+	0xbe,
+	0x6e,
+	0x01,
+	0x14,
+	0x40,
+	0xb1,
+	0x25,
+	0xce,
+	0xc1,
+	0xbf,
+	0x58,
+	0xd7,
+	0x90,
+	0x61,
+	0xbb,
+	0xb7,
+	0x0e,
+	0xe1,
+	0x3e,
+	0x5b,
+	0x0e,
+	0x32,
+	0x3a,
+	0x00,
+	0x58,
+	0x2c,
+	0xc1,
+	0x00,
+	0x02,
+	0xe8,
+	0xd0,
+	0x50,
+	0xc4,
+	0x47,
+	0xcf,
+	0x22,
+	0x3f,
+	0x01,
+	0x1a,
+	0xc0,
+	0x37,
+	0xaa,
+	0x09,
+	0x60,
+	0xa0,
+	0x1b,
+	0x48,
+	0x2a,
+	0xdd,
+	0xee,
+	0x45,
+	0x20,
+	0xc9,
+	0x8e,
+	0x5d,
+	0x4a,
+	0x8e,
+	0x48,
+	0x02,
+	0x3c,
+	0x68,
+	0xf9,
+	0x91,
+	0xe0,
+	0x00,
+	0x99,
+	0x11,
+	0x32,
+	0x96,
+	0x64,
+	0xf7,
+	0x2e,
+	0x23,
+	0x4e,
+	0x22,
+	0x3a,
+	0x79,
+	0x82,
+	0x5c,
+	0x52,
+	0xeb,
+	0xa7,
+	0x82,
+	0x99,
+	0x4f,
+	0x23,
+	0x04,
+	0xe5,
+	0xe6,
+	0x0d,
+	0x57,
+	0x84,
+	0x09,
+	0xe2,
+	0x8e,
+	0x0e,
+	0x49,
+	0x0a,
+	0x61,
+	0xc0,
+	0x01,
+	0x42,
+	0x07,
+	0x60,
+	0x5a,
+	0x95,
+	0x4a,
+	0x76,
+	0x6a,
+	0xc9,
+	0x5b,
+	0x11,
+	0x2e,
+	0xa8,
+	0x8d,
+	0x07,
+	0x84,
+	0x65,
+	0xd7,
+	0x8f,
+	0x60,
+	0x17,
+	0x9c,
+	0x89,
+	0x5a,
+	0x76,
+	0x66,
+	0x4a,
+	0x07,
+	0x51,
+	0x2b,
+	0x44,
+	0x60,
+	0x0b,
+	0xc4,
+	0xc0,
+	0x5b,
+	0x97,
+	0x04,
+	0x0e,
+	0x1c,
+	0xf8,
+	0x49,
+	0xf6,
+	0x29,
+	0xdd,
+	0x08,
+	0x12,
+	0x22,
+	0x1c,
+	0x18,
+	0xb6,
+	0x8b,
+	0x6f,
+	0x10,
+	0x03,
+	0x82,
+	0x07,
+	0xd7,
+	0x3c,
+	0x0c,
+	0x55,
+	0xaa,
+	0x04,
+	0x09,
+	0x82,
+	0x1d,
+	0x13,
+	0x81,
+	0x1c,
+	0x59,
+	0xb2,
+	0xb7,
+	0x06,
+	0x75,
+	0xa5,
+	0x36,
+	0xa8,
+	0x70,
+	0x40,
+	0x9c,
+	0xe6,
+	0xcd,
+	0x9d,
+	0x05,
+	0xb3,
+	0xc3,
+	0x64,
+	0xe4,
+	0x5d,
+	0x03,
+	0xc1,
+	0xa6,
+	0xab,
+	0x8d,
+	0x08,
+	0x90,
+	0x3a,
+	0x32,
+	0x03,
+	0x06,
+	0xb1,
+	0x0d,
+	0xb8,
+	0x6e,
+	0x50,
+	0x20,
+	0xb6,
+	0x6c,
+	0x03,
+	0xb7,
+	0x83,
+	0x0b,
+	0x77,
+	0x7d,
+	0x44,
+	0x37,
+	0x71,
+	0x23,
+	0xb2,
+	0xcb,
+	0xec,
+	0x5b,
+	0xce,
+	0x92,
+	0x75,
+	0x13,
+	0xe7,
+	0xa7,
+	0x5b,
+	0x84,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0a,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xe3,
+	0x06,
+	0xc3,
+	0x6f,
+	0x88,
+	0x32,
+	0x10,
+	0x16,
+	0x42,
+	0xe2,
+	0x2f,
+	0xc0,
+	0x14,
+	0x19,
+	0x17,
+	0x48,
+	0x65,
+	0x2f,
+	0x30,
+	0x99,
+	0x1c,
+	0x02,
+	0x9f,
+	0x67,
+	0x54,
+	0xaa,
+	0xa3,
+	0x56,
+	0xad,
+	0x9f,
+	0x00,
+	0x61,
+	0xb0,
+	0xe5,
+	0xe2,
+	0xa8,
+	0x94,
+	0xea,
+	0x55,
+	0x4c,
+	0x4e,
+	0x9a,
+	0x6f,
+	0xe8,
+	0x74,
+	0x45,
+	0x3c,
+	0x1e,
+	0xb8,
+	0xdf,
+	0xb5,
+	0x80,
+	0x85,
+	0x62,
+	0xb1,
+	0xcc,
+	0x09,
+	0x63,
+	0x77,
+	0x78,
+	0x34,
+	0x54,
+	0x7d,
+	0x13,
+	0x73,
+	0x10,
+	0x80,
+	0x82,
+	0x83,
+	0x32,
+	0x68,
+	0x55,
+	0x88,
+	0x8a,
+	0x8c,
+	0x36,
+	0x01,
+	0x15,
+	0x72,
+	0x05,
+	0x01,
+	0x10,
+	0x89,
+	0x8b,
+	0x92,
+	0x2f,
+	0x94,
+	0x87,
+	0x05,
+	0x97,
+	0x99,
+	0x10,
+	0x9b,
+	0x9c,
+	0x23,
+	0x41,
+	0xa7,
+	0x6e,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xa0,
+	0x57,
+	0x99,
+	0x0b,
+	0x0c,
+	0xa4,
+	0x92,
+	0x41,
+	0x09,
+	0xb6,
+	0xb6,
+	0x08,
+	0xa7,
+	0x0e,
+	0x02,
+	0x02,
+	0xa0,
+	0x03,
+	0x08,
+	0xab,
+	0x0a,
+	0x0a,
+	0xb2,
+	0xa5,
+	0x25,
+	0x06,
+	0xb6,
+	0x50,
+	0x0b,
+	0x03,
+	0x02,
+	0xc2,
+	0xc2,
+	0xbb,
+	0x03,
+	0xd0,
+	0xcb,
+	0xbc,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xc4,
+	0xc5,
+	0x59,
+	0x09,
+	0xbc,
+	0xc9,
+	0x0b,
+	0xcd,
+	0xce,
+	0xd1,
+	0xe0,
+	0x02,
+	0xd5,
+	0xd6,
+	0xb3,
+	0x66,
+	0xc7,
+	0xdb,
+	0xdc,
+	0xde,
+	0x0a,
+	0x0e,
+	0xd1,
+	0x4c,
+	0x01,
+	0xd2,
+	0xe3,
+	0x0c,
+	0x58,
+	0x9c,
+	0xe7,
+	0xbc,
+	0x02,
+	0xc9,
+	0xea,
+	0xeb,
+	0xed,
+	0x01,
+	0x0a,
+	0xef,
+	0xe2,
+	0x0d,
+	0x0e,
+	0xe4,
+	0xd1,
+	0xb3,
+	0x25,
+	0x40,
+	0x1a,
+	0x94,
+	0x7c,
+	0xfa,
+	0xa0,
+	0xb9,
+	0xf3,
+	0xe7,
+	0xa0,
+	0xa1,
+	0x83,
+	0x79,
+	0x8c,
+	0xea,
+	0x2d,
+	0xb8,
+	0x77,
+	0x30,
+	0xdf,
+	0x33,
+	0x85,
+	0x4c,
+	0x96,
+	0x39,
+	0x7c,
+	0x38,
+	0x70,
+	0xdb,
+	0x36,
+	0x84,
+	0xeb,
+	0x0a,
+	0x82,
+	0x8b,
+	0xb6,
+	0x11,
+	0x22,
+	0x9e,
+	0x63,
+	0x03,
+	0xc1,
+	0x08,
+	0x50,
+	0x24,
+	0x03,
+	0xb2,
+	0xa1,
+	0x48,
+	0x70,
+	0xe3,
+	0x1a,
+	0x9a,
+	0x34,
+	0x13,
+	0xc0,
+	0x00,
+	0x34,
+	0x95,
+	0x50,
+	0xa0,
+	0xe5,
+	0x8b,
+	0xa0,
+	0x20,
+	0x82,
+	0x4b,
+	0x70,
+	0xc2,
+	0x22,
+	0x4c,
+	0xa8,
+	0x36,
+	0x53,
+	0xca,
+	0x3b,
+	0x9b,
+	0x29,
+	0x29,
+	0x2a,
+	0xdb,
+	0x19,
+	0xa1,
+	0xe9,
+	0xcf,
+	0x65,
+	0x3d,
+	0x2f,
+	0x48,
+	0x2d,
+	0xb7,
+	0xc4,
+	0xce,
+	0x4d,
+	0x01,
+	0x47,
+	0x94,
+	0x0d,
+	0x08,
+	0x1a,
+	0xb4,
+	0x29,
+	0xcf,
+	0x8d,
+	0x0e,
+	0x7a,
+	0x46,
+	0xa8,
+	0x10,
+	0x81,
+	0xaa,
+	0x8f,
+	0xa3,
+	0x10,
+	0x06,
+	0x1c,
+	0x00,
+	0x74,
+	0x20,
+	0x67,
+	0x57,
+	0xaf,
+	0x62,
+	0x9b,
+	0x4a,
+	0x88,
+	0x70,
+	0x40,
+	0x96,
+	0x2a,
+	0xb3,
+	0x4b,
+	0x0c,
+	0xa4,
+	0x4d,
+	0xc9,
+	0x76,
+	0xc1,
+	0x98,
+	0xb8,
+	0x4d,
+	0xbb,
+	0x4a,
+	0x90,
+	0x70,
+	0xe0,
+	0x00,
+	0x5e,
+	0x25,
+	0x35,
+	0xf7,
+	0xde,
+	0x24,
+	0x50,
+	0x78,
+	0x2b,
+	0x5c,
+	0xaf,
+	0x11,
+	0x1a,
+	0x54,
+	0x38,
+	0x50,
+	0xed,
+	0xb0,
+	0x14,
+	0x03,
+	0x85,
+	0x0f,
+	0x8c,
+	0x74,
+	0x0c,
+	0xd9,
+	0xc0,
+	0xb8,
+	0x06,
+	0x01,
+	0x28,
+	0x37,
+	0xb0,
+	0x4c,
+	0x04,
+	0x73,
+	0x66,
+	0xcd,
+	0x30,
+	0xbd,
+	0x32,
+	0x51,
+	0x35,
+	0x8e,
+	0x49,
+	0x65,
+	0x6c,
+	0x4e,
+	0x4e,
+	0x37,
+	0x8e,
+	0x86,
+	0x6a,
+	0x44,
+	0x00,
+	0xa2,
+	0xae,
+	0x49,
+	0x13,
+	0x09,
+	0x2d,
+	0xbb,
+	0x30,
+	0x03,
+	0x06,
+	0xaf,
+	0x6d,
+	0x8f,
+	0x16,
+	0x51,
+	0xb4,
+	0x94,
+	0x81,
+	0xdf,
+	0xc8,
+	0x93,
+	0x7f,
+	0x36,
+	0x59,
+	0x1c,
+	0xf6,
+	0xc2,
+	0xe7,
+	0xa8,
+	0x74,
+	0xd7,
+	0x08,
+	0x01,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0xbc,
+	0x6a,
+	0x18,
+	0xbd,
+	0x20,
+	0xcb,
+	0x40,
+	0x58,
+	0x00,
+	0x85,
+	0xc8,
+	0x4f,
+	0x60,
+	0x29,
+	0x22,
+	0x2e,
+	0x8c,
+	0xc9,
+	0x60,
+	0x60,
+	0x32,
+	0x39,
+	0x04,
+	0x3e,
+	0x4e,
+	0x68,
+	0x74,
+	0x37,
+	0xa5,
+	0x56,
+	0x95,
+	0x84,
+	0x81,
+	0x76,
+	0x9b,
+	0x9b,
+	0x52,
+	0xa8,
+	0xd6,
+	0x40,
+	0x78,
+	0x4c,
+	0xbe,
+	0x99,
+	0xcf,
+	0x15,
+	0x75,
+	0x78,
+	0x70,
+	0x6c,
+	0xbb,
+	0x2d,
+	0x14,
+	0x8b,
+	0x25,
+	0x4e,
+	0x08,
+	0xd7,
+	0xed,
+	0x36,
+	0x53,
+	0x7a,
+	0x13,
+	0x71,
+	0x10,
+	0x7d,
+	0x7f,
+	0x80,
+	0x34,
+	0x66,
+	0x54,
+	0x85,
+	0x87,
+	0x89,
+	0x6e,
+	0x15,
+	0x70,
+	0x05,
+	0x01,
+	0x10,
+	0x86,
+	0x88,
+	0x8f,
+	0x31,
+	0x01,
+	0x15,
+	0x84,
+	0x05,
+	0x93,
+	0x95,
+	0x10,
+	0x97,
+	0x98,
+	0x25,
+	0x3f,
+	0xa4,
+	0x75,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0x9d,
+	0x56,
+	0x95,
+	0x0b,
+	0x0c,
+	0xa1,
+	0xa2,
+	0x3f,
+	0x09,
+	0xb3,
+	0xb3,
+	0x08,
+	0xa4,
+	0x0e,
+	0x02,
+	0x02,
+	0x9d,
+	0x03,
+	0x08,
+	0xa8,
+	0x0a,
+	0x0a,
+	0xaf,
+	0xa2,
+	0x26,
+	0x06,
+	0xb3,
+	0x4f,
+	0x0b,
+	0x03,
+	0x02,
+	0xbf,
+	0xbf,
+	0xb8,
+	0x03,
+	0xcd,
+	0xc8,
+	0xb9,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xc1,
+	0xc2,
+	0x4d,
+	0x09,
+	0xb9,
+	0xc6,
+	0x0b,
+	0xca,
+	0xcb,
+	0xce,
+	0xdd,
+	0x02,
+	0xd2,
+	0xd3,
+	0xb0,
+	0x76,
+	0xc4,
+	0xd8,
+	0xd9,
+	0xdb,
+	0x0a,
+	0x0e,
+	0xce,
+	0x4b,
+	0x01,
+	0xcf,
+	0xe0,
+	0x0c,
+	0x57,
+	0xb1,
+	0xd7,
+	0xb9,
+	0x02,
+	0xc6,
+	0xe7,
+	0xe8,
+	0xea,
+	0x01,
+	0x0a,
+	0xec,
+	0xdf,
+	0x0d,
+	0x0e,
+	0xef,
+	0xf1,
+	0xd7,
+	0x9e,
+	0x3d,
+	0xb1,
+	0x77,
+	0xaf,
+	0xd9,
+	0xba,
+	0x7d,
+	0x0e,
+	0x12,
+	0x3a,
+	0x80,
+	0xf7,
+	0x88,
+	0x1c,
+	0x3d,
+	0x7a,
+	0x03,
+	0xed,
+	0x31,
+	0x33,
+	0xb8,
+	0x04,
+	0x99,
+	0xc2,
+	0x85,
+	0xf1,
+	0xb0,
+	0x61,
+	0x23,
+	0x88,
+	0x4e,
+	0x40,
+	0xb7,
+	0x6e,
+	0x17,
+	0x19,
+	0x02,
+	0x22,
+	0x36,
+	0x80,
+	0x00,
+	0x44,
+	0x31,
+	0x1c,
+	0xc3,
+	0x13,
+	0x7a,
+	0xfc,
+	0x08,
+	0x2e,
+	0xa1,
+	0xc8,
+	0x36,
+	0x01,
+	0x0c,
+	0x34,
+	0x33,
+	0xf9,
+	0xa4,
+	0x99,
+	0xbd,
+	0x08,
+	0x0a,
+	0x22,
+	0xa8,
+	0xec,
+	0xf6,
+	0x2b,
+	0xc2,
+	0x04,
+	0x69,
+	0x2f,
+	0xb7,
+	0xb0,
+	0x93,
+	0x59,
+	0x12,
+	0xe2,
+	0xb1,
+	0x9b,
+	0x11,
+	0x92,
+	0xee,
+	0x44,
+	0x96,
+	0xf3,
+	0x82,
+	0x53,
+	0x71,
+	0x48,
+	0x86,
+	0xce,
+	0x14,
+	0x50,
+	0xe4,
+	0xd8,
+	0x80,
+	0x9e,
+	0x3d,
+	0x93,
+	0xe2,
+	0xbc,
+	0xe8,
+	0x20,
+	0x67,
+	0x84,
+	0x0a,
+	0x11,
+	0xa0,
+	0x0a,
+	0x19,
+	0x0a,
+	0x61,
+	0xc0,
+	0x81,
+	0x3e,
+	0x07,
+	0x6a,
+	0x66,
+	0xd5,
+	0xea,
+	0x35,
+	0xa9,
+	0x84,
+	0x08,
+	0x07,
+	0x5e,
+	0x9d,
+	0x12,
+	0x1b,
+	0xd5,
+	0x40,
+	0xd9,
+	0x92,
+	0x68,
+	0x17,
+	0x84,
+	0x69,
+	0x9b,
+	0x34,
+	0xab,
+	0x04,
+	0x09,
+	0x07,
+	0x0e,
+	0xd0,
+	0x15,
+	0x6a,
+	0xb7,
+	0x1b,
+	0xda,
+	0x03,
+	0x57,
+	0xd9,
+	0x6a,
+	0x8d,
+	0xd0,
+	0xa0,
+	0xc2,
+	0x01,
+	0x69,
+	0x83,
+	0xc9,
+	0x18,
+	0x08,
+	0xfc,
+	0xd1,
+	0x66,
+	0x84,
+	0x00,
+	0x5a,
+	0x0d,
+	0x80,
+	0x6b,
+	0x10,
+	0xe0,
+	0x71,
+	0x83,
+	0xc8,
+	0x51,
+	0x26,
+	0x23,
+	0x36,
+	0xdb,
+	0xed,
+	0xe0,
+	0xba,
+	0x53,
+	0xe0,
+	0x96,
+	0x40,
+	0xae,
+	0x36,
+	0x82,
+	0x68,
+	0x33,
+	0xca,
+	0x4c,
+	0x4e,
+	0x04,
+	0x00,
+	0xaa,
+	0x1a,
+	0x74,
+	0x92,
+	0xce,
+	0x94,
+	0x03,
+	0xaf,
+	0x4b,
+	0x31,
+	0xfb,
+	0x48,
+	0x50,
+	0x51,
+	0xb8,
+	0x03,
+	0x0b,
+	0x67,
+	0xf0,
+	0x2e,
+	0xa6,
+	0x6c,
+	0xd6,
+	0x28,
+	0x96,
+	0x10,
+	0x5f,
+	0xce,
+	0x60,
+	0xf3,
+	0x6f,
+	0xe4,
+	0xbc,
+	0x0f,
+	0x96,
+	0xb2,
+	0x7d,
+	0x23,
+	0x04,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x9f,
+	0x61,
+	0xe0,
+	0xbc,
+	0x6d,
+	0x10,
+	0x8b,
+	0x5d,
+	0x6f,
+	0xb8,
+	0x0a,
+	0x18,
+	0x45,
+	0xbf,
+	0x45,
+	0x90,
+	0xc8,
+	0x34,
+	0x05,
+	0x26,
+	0x93,
+	0x43,
+	0x20,
+	0x07,
+	0x5c,
+	0x36,
+	0xaf,
+	0x4f,
+	0x68,
+	0xf4,
+	0x13,
+	0x20,
+	0x0c,
+	0xac,
+	0x57,
+	0xe6,
+	0x93,
+	0x02,
+	0x95,
+	0x76,
+	0xbf,
+	0xc2,
+	0x30,
+	0x71,
+	0x4c,
+	0xae,
+	0x74,
+	0xbd,
+	0x83,
+	0xb4,
+	0x9a,
+	0xa5,
+	0x3b,
+	0xa6,
+	0x02,
+	0x16,
+	0x8a,
+	0xc5,
+	0xe2,
+	0x26,
+	0x78,
+	0xe5,
+	0x73,
+	0x2a,
+	0x06,
+	0x09,
+	0x84,
+	0x09,
+	0x3a,
+	0x3a,
+	0x4e,
+	0x13,
+	0x7b,
+	0x13,
+	0x6e,
+	0x10,
+	0x7e,
+	0x80,
+	0x81,
+	0x27,
+	0x83,
+	0x02,
+	0x02,
+	0x85,
+	0x85,
+	0x08,
+	0x72,
+	0x63,
+	0x50,
+	0x8d,
+	0x8f,
+	0x91,
+	0x82,
+	0x09,
+	0x94,
+	0x0b,
+	0x09,
+	0x4a,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0x0a,
+	0x53,
+	0x22,
+	0x01,
+	0x15,
+	0x6d,
+	0x05,
+	0x01,
+	0x10,
+	0x8e,
+	0x90,
+	0x9e,
+	0x48,
+	0xa0,
+	0x94,
+	0x02,
+	0xa4,
+	0x4a,
+	0xa8,
+	0xa8,
+	0xaa,
+	0xac,
+	0x8c,
+	0x05,
+	0xaf,
+	0xb1,
+	0x10,
+	0xb3,
+	0x9e,
+	0x83,
+	0xa0,
+	0xa6,
+	0x95,
+	0xb9,
+	0xbb,
+	0xbc,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xc0,
+	0x52,
+	0xb1,
+	0x0b,
+	0x0c,
+	0xc4,
+	0x81,
+	0x93,
+	0xb8,
+	0xb8,
+	0xa3,
+	0xba,
+	0xcb,
+	0xa8,
+	0x0e,
+	0x94,
+	0xc0,
+	0x03,
+	0x08,
+	0xce,
+	0xa8,
+	0xd5,
+	0xb4,
+	0x25,
+	0xd8,
+	0x0b,
+	0xc9,
+	0xdc,
+	0xdd,
+	0x0a,
+	0xdf,
+	0x03,
+	0xf0,
+	0xc8,
+	0xa7,
+	0x0d,
+	0x0d,
+	0xe6,
+	0xe7,
+	0x39,
+	0x09,
+	0x03,
+	0x04,
+	0xb8,
+	0xa2,
+	0xa4,
+	0xed,
+	0xde,
+	0xf1,
+	0x02,
+	0x0a,
+	0xa0,
+	0x57,
+	0xcf,
+	0x1a,
+	0x16,
+	0x03,
+	0xf0,
+	0xf6,
+	0x29,
+	0xf9,
+	0xb2,
+	0xe0,
+	0x1f,
+	0xc0,
+	0x80,
+	0xf0,
+	0x28,
+	0x11,
+	0x64,
+	0xa0,
+	0x2a,
+	0x52,
+	0x80,
+	0x38,
+	0x09,
+	0xf9,
+	0xf9,
+	0x73,
+	0xe8,
+	0x20,
+	0xa0,
+	0x91,
+	0x88,
+	0xf4,
+	0x1c,
+	0x50,
+	0xa4,
+	0x75,
+	0x11,
+	0xa1,
+	0x3e,
+	0x01,
+	0x55,
+	0xd2,
+	0x4a,
+	0xb5,
+	0x8b,
+	0xf0,
+	0x30,
+	0xde,
+	0x47,
+	0x01,
+	0x0e,
+	0x62,
+	0x3a,
+	0xa8,
+	0x18,
+	0xa8,
+	0x24,
+	0x84,
+	0x01,
+	0x07,
+	0xfc,
+	0x1c,
+	0x58,
+	0xb8,
+	0xd2,
+	0x9b,
+	0x00,
+	0x88,
+	0x17,
+	0x61,
+	0xca,
+	0xa4,
+	0x59,
+	0xd3,
+	0xc0,
+	0x4d,
+	0x7d,
+	0x3a,
+	0xe1,
+	0xa0,
+	0x62,
+	0xa9,
+	0x80,
+	0xe9,
+	0x3b,
+	0x88,
+	0xf0,
+	0x64,
+	0xce,
+	0x3c,
+	0x17,
+	0xc0,
+	0x68,
+	0x40,
+	0x3f,
+	0x40,
+	0x06,
+	0x2c,
+	0x8d,
+	0xc0,
+	0xd5,
+	0xdb,
+	0xd3,
+	0x80,
+	0x04,
+	0x63,
+	0x12,
+	0x8d,
+	0x64,
+	0xe0,
+	0xc0,
+	0x81,
+	0xab,
+	0x0b,
+	0xbc,
+	0x34,
+	0xe5,
+	0xca,
+	0x34,
+	0x42,
+	0xcc,
+	0x9f,
+	0xf1,
+	0x96,
+	0x4e,
+	0xa0,
+	0x37,
+	0xf6,
+	0x9a,
+	0x59,
+	0x78,
+	0x67,
+	0x71,
+	0x9e,
+	0x5d,
+	0xdb,
+	0x96,
+	0xeb,
+	0xdb,
+	0x88,
+	0x4d,
+	0x2f,
+	0x08,
+	0x36,
+	0xa8,
+	0x26,
+	0x40,
+	0x5e,
+	0xbd,
+	0x17,
+	0xb5,
+	0x46,
+	0x08,
+	0xd0,
+	0x95,
+	0xad,
+	0x3b,
+	0xa9,
+	0x6b,
+	0x2b,
+	0x44,
+	0x20,
+	0x1c,
+	0xc6,
+	0xb0,
+	0x59,
+	0xb3,
+	0x46,
+	0x32,
+	0x6b,
+	0x6e,
+	0xca,
+	0x37,
+	0x82,
+	0x84,
+	0x08,
+	0x07,
+	0xaa,
+	0x35,
+	0xa3,
+	0x5c,
+	0xd9,
+	0xb2,
+	0x11,
+	0x29,
+	0x27,
+	0x18,
+	0x6f,
+	0x95,
+	0x20,
+	0xc1,
+	0x2c,
+	0xe9,
+	0x9a,
+	0x86,
+	0x4d,
+	0xdf,
+	0x61,
+	0xdb,
+	0xa0,
+	0xc2,
+	0x01,
+	0x7a,
+	0xaf,
+	0xe7,
+	0x9c,
+	0x8e,
+	0xbd,
+	0xc2,
+	0x00,
+	0xc1,
+	0x06,
+	0x66,
+	0x71,
+	0xdf,
+	0x4b,
+	0x4d,
+	0xb7,
+	0xae,
+	0x09,
+	0xdf,
+	0xbf,
+	0x0b,
+	0x08,
+	0x1f,
+	0x4e,
+	0x22,
+	0x00,
+	0xdd,
+	0x17,
+	0xc8,
+	0x09,
+	0x1e,
+	0x62,
+	0x5e,
+	0xc2,
+	0x0e,
+	0xf4,
+	0x43,
+	0x88,
+	0xa8,
+	0x6b,
+	0xdf,
+	0xce,
+	0xbd,
+	0xbb,
+	0xf7,
+	0xef,
+	0xe0,
+	0x61,
+	0x84,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0xc0,
+	0x20,
+	0xcd,
+	0x60,
+	0x10,
+	0x1a,
+	0x45,
+	0x06,
+	0xc2,
+	0xa2,
+	0x78,
+	0xe4,
+	0x05,
+	0x9e,
+	0x48,
+	0xe5,
+	0xb2,
+	0xa9,
+	0x0b,
+	0x4c,
+	0x26,
+	0x87,
+	0xc0,
+	0x27,
+	0xb9,
+	0x98,
+	0x52,
+	0x6f,
+	0xd6,
+	0x2b,
+	0xf6,
+	0x13,
+	0x20,
+	0x0c,
+	0xbc,
+	0xdf,
+	0x9a,
+	0x95,
+	0x72,
+	0xcd,
+	0x96,
+	0xcf,
+	0xcc,
+	0x74,
+	0x89,
+	0xf8,
+	0xd4,
+	0xa6,
+	0xd6,
+	0xec,
+	0x4a,
+	0xd9,
+	0x3c,
+	0x88,
+	0xcb,
+	0x91,
+	0x09,
+	0x81,
+	0x81,
+	0x44,
+	0x7e,
+	0x23,
+	0x01,
+	0x16,
+	0x14,
+	0x16,
+	0x16,
+	0x7a,
+	0x04,
+	0x66,
+	0x85,
+	0x72,
+	0x06,
+	0x09,
+	0x02,
+	0x02,
+	0x82,
+	0x82,
+	0x08,
+	0x85,
+	0x56,
+	0x8a,
+	0x13,
+	0x7a,
+	0x10,
+	0x8d,
+	0x8f,
+	0x5f,
+	0x91,
+	0x93,
+	0x0b,
+	0x09,
+	0x5d,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0x0a,
+	0x76,
+	0x22,
+	0x6b,
+	0x57,
+	0x9c,
+	0x9e,
+	0x7f,
+	0x80,
+	0x93,
+	0xa2,
+	0xa5,
+	0x0b,
+	0xa9,
+	0xa9,
+	0x50,
+	0x64,
+	0x15,
+	0x79,
+	0x05,
+	0x01,
+	0x10,
+	0x9d,
+	0x9f,
+	0x47,
+	0x91,
+	0x92,
+	0xa7,
+	0x94,
+	0xb5,
+	0xb7,
+	0xb7,
+	0x5a,
+	0x01,
+	0x15,
+	0x9b,
+	0x05,
+	0xbd,
+	0xbf,
+	0x10,
+	0xc1,
+	0x46,
+	0xa1,
+	0x02,
+	0x0b,
+	0xd5,
+	0xa4,
+	0x5d,
+	0xc8,
+	0xc8,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xce,
+	0x59,
+	0xbf,
+	0x0b,
+	0x0c,
+	0xd2,
+	0x41,
+	0xd4,
+	0xd6,
+	0xd8,
+	0xb6,
+	0xda,
+	0xb7,
+	0x0e,
+	0x93,
+	0xce,
+	0x03,
+	0x08,
+	0xdd,
+	0xa9,
+	0xe4,
+	0x90,
+	0x09,
+	0x03,
+	0x04,
+	0xd5,
+	0xa3,
+	0xa5,
+	0xeb,
+	0xec,
+	0x02,
+	0x03,
+	0xff,
+	0xc5,
+	0x50,
+	0x35,
+	0x68,
+	0x40,
+	0xaf,
+	0x89,
+	0x16,
+	0x03,
+	0xff,
+	0xf0,
+	0x75,
+	0x39,
+	0xa3,
+	0x8e,
+	0x9f,
+	0x02,
+	0x07,
+	0x00,
+	0x23,
+	0x0a,
+	0x18,
+	0x48,
+	0xb0,
+	0xdc,
+	0x8e,
+	0x00,
+	0x0f,
+	0x02,
+	0x20,
+	0xbc,
+	0x97,
+	0x6f,
+	0x9f,
+	0xc3,
+	0x87,
+	0x00,
+	0xeb,
+	0x14,
+	0xa3,
+	0xc8,
+	0x60,
+	0x55,
+	0x10,
+	0x8c,
+	0x7d,
+	0xdd,
+	0x12,
+	0x0a,
+	0x90,
+	0x62,
+	0xea,
+	0x23,
+	0xc8,
+	0x7f,
+	0x4f,
+	0x54,
+	0x9d,
+	0x1a,
+	0xe8,
+	0xa0,
+	0xe4,
+	0x11,
+	0x5f,
+	0x7d,
+	0x20,
+	0x0c,
+	0x38,
+	0xd0,
+	0xe8,
+	0xc0,
+	0x42,
+	0x7e,
+	0x11,
+	0x52,
+	0x41,
+	0x84,
+	0x29,
+	0x52,
+	0x80,
+	0x83,
+	0xa3,
+	0x0e,
+	0x4c,
+	0x9e,
+	0x8c,
+	0xa6,
+	0xf3,
+	0x5e,
+	0x4f,
+	0x3e,
+	0xa9,
+	0x82,
+	0x46,
+	0x15,
+	0xea,
+	0x8f,
+	0x68,
+	0x80,
+	0x53,
+	0x48,
+	0x93,
+	0x52,
+	0xd1,
+	0xd8,
+	0x34,
+	0x61,
+	0xa3,
+	0x96,
+	0x0a,
+	0x22,
+	0x88,
+	0x0d,
+	0x4b,
+	0x35,
+	0x62,
+	0xc4,
+	0xac,
+	0x4a,
+	0xa7,
+	0x1d,
+	0x38,
+	0x10,
+	0x51,
+	0x89,
+	0x99,
+	0xb0,
+	0x63,
+	0xa5,
+	0x1e,
+	0xad,
+	0x1a,
+	0x91,
+	0xe2,
+	0xd1,
+	0xb4,
+	0x42,
+	0x0c,
+	0xac,
+	0xfd,
+	0xc7,
+	0x76,
+	0x27,
+	0xdb,
+	0x00,
+	0x09,
+	0xc4,
+	0x06,
+	0x8e,
+	0x3a,
+	0x37,
+	0x62,
+	0xd4,
+	0x09,
+	0x03,
+	0xf1,
+	0x0a,
+	0x09,
+	0xd0,
+	0xd7,
+	0xaf,
+	0xce,
+	0x3a,
+	0x75,
+	0x12,
+	0xc0,
+	0x8d,
+	0x50,
+	0xf8,
+	0x54,
+	0xd8,
+	0x0b,
+	0x98,
+	0x2d,
+	0xfe,
+	0x60,
+	0xbc,
+	0x76,
+	0x6d,
+	0x1d,
+	0x13,
+	0x01,
+	0x26,
+	0x3f,
+	0xcc,
+	0x0a,
+	0xb7,
+	0x42,
+	0x04,
+	0xcd,
+	0x3e,
+	0x7c,
+	0x79,
+	0xce,
+	0x75,
+	0x22,
+	0x40,
+	0x50,
+	0xb1,
+	0x62,
+	0x25,
+	0x44,
+	0x38,
+	0x40,
+	0x8e,
+	0x1b,
+	0xea,
+	0xd4,
+	0x10,
+	0xb2,
+	0x78,
+	0x56,
+	0x11,
+	0x1a,
+	0xae,
+	0x04,
+	0x09,
+	0x6b,
+	0x6f,
+	0x2f,
+	0xd5,
+	0xad,
+	0x98,
+	0x84,
+	0xeb,
+	0x08,
+	0x0d,
+	0x2a,
+	0x1c,
+	0x18,
+	0x28,
+	0x1c,
+	0x48,
+	0x80,
+	0xc4,
+	0xc5,
+	0x4b,
+	0x3c,
+	0x1f,
+	0xb8,
+	0x96,
+	0x79,
+	0x2c,
+	0x43,
+	0x89,
+	0x61,
+	0x4c,
+	0x1f,
+	0x58,
+	0xc0,
+	0xfa,
+	0x75,
+	0x32,
+	0xd1,
+	0x4f,
+	0x18,
+	0xa0,
+	0xc8,
+	0x9c,
+	0xc8,
+	0xf7,
+	0x1a,
+	0x84,
+	0x08,
+	0x9d,
+	0xff,
+	0x12,
+	0x02,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x2e,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0xc0,
+	0xa0,
+	0x70,
+	0xe8,
+	0x33,
+	0x18,
+	0x88,
+	0x43,
+	0x03,
+	0x61,
+	0x71,
+	0x44,
+	0xee,
+	0x02,
+	0x50,
+	0x91,
+	0x72,
+	0xc1,
+	0x74,
+	0xe6,
+	0x02,
+	0x93,
+	0xc9,
+	0x21,
+	0xf0,
+	0x99,
+	0x56,
+	0xad,
+	0x36,
+	0x6c,
+	0x56,
+	0xfb,
+	0x09,
+	0x10,
+	0x06,
+	0x5f,
+	0x30,
+	0x0d,
+	0x4b,
+	0xc9,
+	0x6e,
+	0xcd,
+	0xe8,
+	0xa6,
+	0x7a,
+	0xc6,
+	0x6e,
+	0x57,
+	0xcc,
+	0xe7,
+	0x81,
+	0x7c,
+	0x1e,
+	0x0b,
+	0x58,
+	0x28,
+	0x16,
+	0x16,
+	0x77,
+	0x04,
+	0x67,
+	0x7b,
+	0x7c,
+	0x30,
+	0x58,
+	0x81,
+	0x13,
+	0x77,
+	0x10,
+	0x84,
+	0x86,
+	0x87,
+	0x2e,
+	0x6c,
+	0x59,
+	0x8c,
+	0x8e,
+	0x90,
+	0x28,
+	0x46,
+	0x98,
+	0x7b,
+	0x01,
+	0x15,
+	0x76,
+	0x05,
+	0x01,
+	0x10,
+	0x8d,
+	0x8f,
+	0x90,
+	0x46,
+	0x09,
+	0xa5,
+	0xa5,
+	0x08,
+	0x98,
+	0x65,
+	0x15,
+	0x8b,
+	0x05,
+	0x9e,
+	0xa0,
+	0x10,
+	0xa2,
+	0x7c,
+	0x06,
+	0xa5,
+	0x54,
+	0x0b,
+	0x03,
+	0x02,
+	0x0a,
+	0xb9,
+	0x0a,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xad,
+	0x5b,
+	0xa0,
+	0x0b,
+	0x0c,
+	0xb1,
+	0x60,
+	0xb3,
+	0x02,
+	0x02,
+	0xb5,
+	0x0b,
+	0xba,
+	0xb9,
+	0x0e,
+	0xc8,
+	0xad,
+	0x03,
+	0x08,
+	0xbd,
+	0xb9,
+	0xc4,
+	0x96,
+	0x5d,
+	0x09,
+	0xc8,
+	0xca,
+	0xcb,
+	0xcc,
+	0xce,
+	0x03,
+	0xde,
+	0xb7,
+	0xc8,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xd5,
+	0x87,
+	0xc7,
+	0xc8,
+	0xc9,
+	0x54,
+	0xcc,
+	0xcd,
+	0xdf,
+	0xed,
+	0x02,
+	0xe3,
+	0xe4,
+	0xc5,
+	0x49,
+	0xa5,
+	0x02,
+	0xe0,
+	0xea,
+	0xeb,
+	0x0a,
+	0x0e,
+	0xdf,
+	0x50,
+	0x01,
+	0xe0,
+	0xf0,
+	0x0c,
+	0x5c,
+	0xe6,
+	0x9c,
+	0x5b,
+	0x90,
+	0x6e,
+	0xdb,
+	0x3a,
+	0x7d,
+	0xde,
+	0x02,
+	0x28,
+	0x80,
+	0x72,
+	0x6b,
+	0x9c,
+	0x03,
+	0x80,
+	0xb2,
+	0xb0,
+	0x25,
+	0xcb,
+	0x86,
+	0x8f,
+	0x5d,
+	0x42,
+	0x7e,
+	0xb7,
+	0x1c,
+	0x68,
+	0x74,
+	0x10,
+	0xd0,
+	0x58,
+	0x82,
+	0x01,
+	0x04,
+	0xd2,
+	0xa1,
+	0xa9,
+	0x98,
+	0xaf,
+	0xde,
+	0xc5,
+	0x7e,
+	0x02,
+	0xbe,
+	0x36,
+	0x72,
+	0x54,
+	0x13,
+	0xc0,
+	0x80,
+	0xb7,
+	0x90,
+	0x54,
+	0xbc,
+	0xe1,
+	0x8b,
+	0x50,
+	0xb2,
+	0x5d,
+	0x3b,
+	0x95,
+	0x1d,
+	0x91,
+	0x04,
+	0x78,
+	0xe0,
+	0x12,
+	0x64,
+	0xc1,
+	0x01,
+	0x33,
+	0x23,
+	0x68,
+	0x34,
+	0xd9,
+	0x0e,
+	0x9e,
+	0xc6,
+	0x9c,
+	0x44,
+	0x76,
+	0xf6,
+	0x0c,
+	0xb9,
+	0xc4,
+	0x16,
+	0x50,
+	0x05,
+	0x34,
+	0xa1,
+	0x46,
+	0x10,
+	0xda,
+	0xed,
+	0x5b,
+	0xae,
+	0x08,
+	0x13,
+	0xc6,
+	0x21,
+	0x1d,
+	0xa2,
+	0x14,
+	0xc2,
+	0x80,
+	0x03,
+	0x84,
+	0x0e,
+	0xc4,
+	0xbc,
+	0x3a,
+	0xb5,
+	0x2c,
+	0x55,
+	0x93,
+	0xb8,
+	0x22,
+	0x5c,
+	0x58,
+	0x2b,
+	0x0f,
+	0x48,
+	0x4b,
+	0xaf,
+	0x20,
+	0xc3,
+	0x2e,
+	0x38,
+	0x23,
+	0xd5,
+	0x2c,
+	0x4d,
+	0x95,
+	0x0e,
+	0xa4,
+	0x56,
+	0x88,
+	0xd0,
+	0x16,
+	0x88,
+	0x01,
+	0xb8,
+	0x2f,
+	0x09,
+	0x1c,
+	0x38,
+	0x00,
+	0xb4,
+	0x2c,
+	0xd4,
+	0xba,
+	0x11,
+	0x24,
+	0x44,
+	0x38,
+	0x40,
+	0x8c,
+	0x57,
+	0xdf,
+	0x20,
+	0x06,
+	0x06,
+	0x13,
+	0xb6,
+	0x89,
+	0x38,
+	0xea,
+	0x54,
+	0x09,
+	0x12,
+	0x06,
+	0x3f,
+	0x26,
+	0x12,
+	0x59,
+	0xf2,
+	0xe4,
+	0x6f,
+	0x0d,
+	0xec,
+	0x4e,
+	0x6d,
+	0x50,
+	0xe1,
+	0xc0,
+	0xb8,
+	0xcd,
+	0x9c,
+	0x3d,
+	0x0f,
+	0x6e,
+	0x97,
+	0xc9,
+	0x00,
+	0xbc,
+	0x06,
+	0x83,
+	0x4f,
+	0x5b,
+	0x1b,
+	0x11,
+	0x40,
+	0xb5,
+	0x64,
+	0x06,
+	0x0c,
+	0x64,
+	0xbb,
+	0x7e,
+	0x5d,
+	0x40,
+	0xf6,
+	0x6c,
+	0x03,
+	0xb8,
+	0x83,
+	0x0b,
+	0x7f,
+	0x7d,
+	0x64,
+	0x37,
+	0xbc,
+	0x54,
+	0xb3,
+	0xf9,
+	0x29,
+	0x87,
+	0xd2,
+	0xba,
+	0x49,
+	0x73,
+	0x13,
+	0x21,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x12,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0xc0,
+	0xa0,
+	0x70,
+	0x48,
+	0x2c,
+	0x1a,
+	0x8f,
+	0xb7,
+	0x80,
+	0x48,
+	0x89,
+	0xe4,
+	0x05,
+	0x06,
+	0x81,
+	0x80,
+	0x80,
+	0xd9,
+	0xc4,
+	0x3d,
+	0xa1,
+	0x04,
+	0xc2,
+	0xb4,
+	0x6a,
+	0x1d,
+	0x60,
+	0xb5,
+	0x54,
+	0x2e,
+	0xed,
+	0x1a,
+	0xc8,
+	0x6e,
+	0xc5,
+	0xb6,
+	0x67,
+	0x19,
+	0x8c,
+	0x4e,
+	0x7b,
+	0xd7,
+	0xe1,
+	0xb6,
+	0x4c,
+	0x4d,
+	0x28,
+	0xc4,
+	0xe5,
+	0x23,
+	0x83,
+	0x7e,
+	0x7f,
+	0xa2,
+	0xdb,
+	0xf1,
+	0x25,
+	0x7a,
+	0x09,
+	0x83,
+	0x83,
+	0x08,
+	0x7c,
+	0x23,
+	0x6a,
+	0x05,
+	0x07,
+	0x77,
+	0x6d,
+	0x06,
+	0x83,
+	0x0b,
+	0x90,
+	0x03,
+	0x02,
+	0x0a,
+	0x94,
+	0x53,
+	0x4a,
+	0x51,
+	0x01,
+	0x07,
+	0x03,
+	0x08,
+	0x51,
+	0x80,
+	0x1f,
+	0x8e,
+	0x02,
+	0x02,
+	0x90,
+	0x90,
+	0x94,
+	0x95,
+	0xa1,
+	0x51,
+	0x02,
+	0x5e,
+	0xaa,
+	0x67,
+	0x8d,
+	0x09,
+	0xa1,
+	0xa3,
+	0xa4,
+	0xa5,
+	0x0a,
+	0xa1,
+	0xa1,
+	0xaa,
+	0xab,
+	0xac,
+	0x5c,
+	0xa0,
+	0xb4,
+	0xa3,
+	0xb2,
+	0xa6,
+	0xa9,
+	0xb6,
+	0x5e,
+	0xa1,
+	0x0c,
+	0x06,
+	0x62,
+	0x8e,
+	0xae,
+	0x92,
+	0xa2,
+	0x0b,
+	0xbd,
+	0x94,
+	0x0e,
+	0xb5,
+	0xb6,
+	0x98,
+	0x03,
+	0x0d,
+	0x0c,
+	0xc5,
+	0xae,
+	0xa2,
+	0xc9,
+	0xca,
+	0xcb,
+	0xcd,
+	0xbf,
+	0x5e,
+	0x0f,
+	0x51,
+	0x0a,
+	0x52,
+	0x0c,
+	0x8c,
+	0x44,
+	0xba,
+	0x0b,
+	0xaf,
+	0xcb,
+	0xcc,
+	0xce,
+	0xdc,
+	0x98,
+	0x01,
+	0x0e,
+	0x0e,
+	0xe2,
+	0x42,
+	0x8e,
+	0x03,
+	0x5a,
+	0x91,
+	0xd8,
+	0xd9,
+	0xb4,
+	0xaa,
+	0x0f,
+	0xdd,
+	0x51,
+	0xed,
+	0xef,
+	0x40,
+	0x01,
+	0x06,
+	0x5e,
+	0xe6,
+	0x2d,
+	0xf0,
+	0xb2,
+	0x2c,
+	0x82,
+	0x02,
+	0x6d,
+	0xdb,
+	0xf2,
+	0x41,
+	0x80,
+	0x30,
+	0x80,
+	0x1f,
+	0x92,
+	0x00,
+	0x0f,
+	0x00,
+	0xca,
+	0xbb,
+	0x36,
+	0xa0,
+	0x60,
+	0x84,
+	0x76,
+	0xe9,
+	0x80,
+	0x39,
+	0x3c,
+	0x02,
+	0x51,
+	0xa2,
+	0x16,
+	0x02,
+	0x91,
+	0x2a,
+	0x2a,
+	0x30,
+	0x38,
+	0x32,
+	0xc2,
+	0x45,
+	0x5a,
+	0xdb,
+	0x83,
+	0xbc,
+	0x34,
+	0x58,
+	0xd9,
+	0xcf,
+	0x47,
+	0x47,
+	0x86,
+	0x07,
+	0xb2,
+	0x1c,
+	0x88,
+	0x44,
+	0xc9,
+	0xa4,
+	0x4d,
+	0x93,
+	0x18,
+	0xd3,
+	0x51,
+	0x6a,
+	0x40,
+	0xac,
+	0xc9,
+	0x3f,
+	0x86,
+	0xf2,
+	0x64,
+	0x2e,
+	0x20,
+	0x50,
+	0xf1,
+	0xa6,
+	0xcd,
+	0x83,
+	0xed,
+	0xda,
+	0x95,
+	0xec,
+	0x94,
+	0x0b,
+	0x68,
+	0x40,
+	0x02,
+	0x07,
+	0x34,
+	0x95,
+	0x34,
+	0x48,
+	0xd5,
+	0xa6,
+	0x84,
+	0x08,
+	0x07,
+	0x86,
+	0xf5,
+	0x44,
+	0x63,
+	0x20,
+	0xaa,
+	0x26,
+	0x60,
+	0x53,
+	0x4d,
+	0xd6,
+	0x8c,
+	0x20,
+	0x41,
+	0x42,
+	0xd4,
+	0xad,
+	0x8d,
+	0xbc,
+	0x46,
+	0x05,
+	0xd6,
+	0xc0,
+	0xa8,
+	0xc9,
+	0x95,
+	0x0d,
+	0x02,
+	0xf0,
+	0xf4,
+	0xd4,
+	0x55,
+	0xed,
+	0x57,
+	0x2f,
+	0x7b,
+	0xf4,
+	0x44,
+	0x81,
+	0xbb,
+	0x68,
+	0x2e,
+	0xa0,
+	0x4c,
+	0x76,
+	0xa3,
+	0x32,
+	0x60,
+	0xb0,
+	0x72,
+	0xab,
+	0xdc,
+	0x95,
+	0x76,
+	0xfc,
+	0xca,
+	0x31,
+	0x30,
+	0xb8,
+	0xb1,
+	0x63,
+	0xb8,
+	0x8a,
+	0x0f,
+	0xf3,
+	0xd4,
+	0xf3,
+	0x77,
+	0xdd,
+	0xba,
+	0xbc,
+	0x94,
+	0xf3,
+	0x1c,
+	0x22,
+	0x11,
+	0x02,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x12,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0xc0,
+	0xa0,
+	0x70,
+	0x58,
+	0x0b,
+	0x88,
+	0x8c,
+	0x44,
+	0x60,
+	0x60,
+	0x10,
+	0x08,
+	0x08,
+	0x90,
+	0x49,
+	0xde,
+	0x92,
+	0x49,
+	0x20,
+	0x3c,
+	0xa3,
+	0xd2,
+	0x01,
+	0xd5,
+	0x0a,
+	0xc5,
+	0xe2,
+	0xa6,
+	0x81,
+	0xea,
+	0xd5,
+	0xab,
+	0x5b,
+	0x86,
+	0xb9,
+	0xe4,
+	0xb2,
+	0xf6,
+	0xdc,
+	0x4d,
+	0xdb,
+	0xcc,
+	0x84,
+	0x42,
+	0xdb,
+	0x4d,
+	0x83,
+	0xcb,
+	0xe9,
+	0x5f,
+	0x66,
+	0xe1,
+	0x30,
+	0xc7,
+	0xa3,
+	0x0c,
+	0x80,
+	0x81,
+	0x4d,
+	0x83,
+	0x07,
+	0x04,
+	0x08,
+	0x4d,
+	0x7e,
+	0x2a,
+	0x80,
+	0x09,
+	0x8c,
+	0x8c,
+	0x08,
+	0x81,
+	0x55,
+	0x91,
+	0x55,
+	0x7d,
+	0x89,
+	0x06,
+	0x8c,
+	0x0b,
+	0x0b,
+	0x09,
+	0x03,
+	0x02,
+	0x0b,
+	0x0a,
+	0x0a,
+	0x4f,
+	0x92,
+	0x93,
+	0x89,
+	0x26,
+	0x96,
+	0x02,
+	0x9c,
+	0x98,
+	0xa8,
+	0x9e,
+	0xa6,
+	0x02,
+	0x91,
+	0x5a,
+	0x4c,
+	0xa3,
+	0x23,
+	0xa5,
+	0xa7,
+	0x09,
+	0x99,
+	0x09,
+	0x9e,
+	0xaa,
+	0xa6,
+	0x04,
+	0xae,
+	0xaf,
+	0xb0,
+	0xb2,
+	0xa6,
+	0xa8,
+	0x98,
+	0xb7,
+	0x9f,
+	0xb9,
+	0xbb,
+	0x94,
+	0x64,
+	0x96,
+	0x09,
+	0x02,
+	0x9b,
+	0xb3,
+	0xc1,
+	0xb7,
+	0x0e,
+	0xa6,
+	0xbb,
+	0xbc,
+	0x95,
+	0xc9,
+	0x9c,
+	0xcc,
+	0xcd,
+	0x9e,
+	0xcf,
+	0xca,
+	0xae,
+	0x0f,
+	0xc6,
+	0x5e,
+	0xb2,
+	0x0b,
+	0xbf,
+	0xc0,
+	0x9d,
+	0xd8,
+	0xd0,
+	0xdb,
+	0xdd,
+	0x58,
+	0x96,
+	0x9b,
+	0x98,
+	0x03,
+	0xe2,
+	0xe3,
+	0x0a,
+	0xd9,
+	0xda,
+	0x03,
+	0xdc,
+	0xa3,
+	0x01,
+	0x06,
+	0x4b,
+	0xa7,
+	0x5a,
+	0xe2,
+	0x0a,
+	0x11,
+	0xef,
+	0xab,
+	0x6b,
+	0xe7,
+	0x49,
+	0x02,
+	0x3c,
+	0x78,
+	0xc0,
+	0xe4,
+	0xd4,
+	0x02,
+	0x76,
+	0xc0,
+	0xf6,
+	0x45,
+	0x70,
+	0x90,
+	0x6d,
+	0x0d,
+	0x2c,
+	0x81,
+	0x04,
+	0xd5,
+	0xad,
+	0xd3,
+	0x17,
+	0xa1,
+	0x22,
+	0x3c,
+	0x80,
+	0x51,
+	0x04,
+	0x6a,
+	0x79,
+	0x80,
+	0xe9,
+	0x40,
+	0xbb,
+	0x8a,
+	0x20,
+	0x17,
+	0x3e,
+	0xc3,
+	0x98,
+	0x51,
+	0x0b,
+	0x04,
+	0x08,
+	0x1d,
+	0x59,
+	0x17,
+	0x10,
+	0x40,
+	0x45,
+	0x20,
+	0x24,
+	0x3f,
+	0x07,
+	0x24,
+	0xd1,
+	0x9d,
+	0x84,
+	0xc0,
+	0x8e,
+	0xc0,
+	0x81,
+	0x03,
+	0x35,
+	0x5b,
+	0x2a,
+	0x94,
+	0x20,
+	0x21,
+	0x26,
+	0xba,
+	0x03,
+	0x34,
+	0x5d,
+	0x85,
+	0x0a,
+	0xd9,
+	0xa0,
+	0xa8,
+	0xcf,
+	0x28,
+	0x06,
+	0x80,
+	0x42,
+	0xb8,
+	0xb9,
+	0x0b,
+	0x13,
+	0xd1,
+	0xa2,
+	0x7c,
+	0x60,
+	0x95,
+	0x48,
+	0x8a,
+	0x53,
+	0x4b,
+	0x55,
+	0x2d,
+	0x81,
+	0xec,
+	0x05,
+	0x30,
+	0x2a,
+	0xb5,
+	0x44,
+	0x80,
+	0x9b,
+	0x60,
+	0xc1,
+	0x32,
+	0x60,
+	0x50,
+	0xd4,
+	0xc0,
+	0x11,
+	0x44,
+	0x5d,
+	0x63,
+	0x8d,
+	0x5d,
+	0xcb,
+	0xb6,
+	0x68,
+	0xd9,
+	0xb4,
+	0x27,
+	0x06,
+	0xc9,
+	0x6d,
+	0x92,
+	0x15,
+	0x90,
+	0x8b,
+	0x10,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x12,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0xc0,
+	0xa0,
+	0x70,
+	0xd8,
+	0x0a,
+	0x04,
+	0x48,
+	0x47,
+	0x62,
+	0x2f,
+	0x20,
+	0x48,
+	0x7e,
+	0x98,
+	0x4e,
+	0x25,
+	0x2e,
+	0x40,
+	0x20,
+	0x34,
+	0x9f,
+	0x82,
+	0x6a,
+	0x54,
+	0x5a,
+	0xa3,
+	0x5a,
+	0x8f,
+	0x4c,
+	0x2d,
+	0x77,
+	0x5a,
+	0xbd,
+	0x86,
+	0x09,
+	0xdb,
+	0xb1,
+	0xcc,
+	0x6b,
+	0xce,
+	0xa2,
+	0xd5,
+	0x37,
+	0x2f,
+	0x58,
+	0x0c,
+	0xb7,
+	0x51,
+	0x0b,
+	0xe0,
+	0xc2,
+	0xbb,
+	0xde,
+	0x25,
+	0xe0,
+	0x9f,
+	0x7a,
+	0x69,
+	0x7c,
+	0x2f,
+	0x01,
+	0x05,
+	0x07,
+	0x60,
+	0x07,
+	0x7f,
+	0x83,
+	0x33,
+	0x46,
+	0x8d,
+	0x01,
+	0x08,
+	0x46,
+	0x8b,
+	0x31,
+	0x06,
+	0x06,
+	0x0f,
+	0x96,
+	0x97,
+	0x96,
+	0x68,
+	0x82,
+	0x92,
+	0x26,
+	0x06,
+	0x09,
+	0x09,
+	0x96,
+	0x09,
+	0x03,
+	0x02,
+	0x0b,
+	0x96,
+	0x02,
+	0x0f,
+	0x7b,
+	0x9c,
+	0x28,
+	0x9e,
+	0xa7,
+	0x0f,
+	0x0b,
+	0xaf,
+	0xaf,
+	0xa6,
+	0x02,
+	0x59,
+	0x9b,
+	0x9c,
+	0xac,
+	0xa4,
+	0x0b,
+	0x09,
+	0xb9,
+	0xa0,
+	0x97,
+	0xb3,
+	0xb4,
+	0xaa,
+	0x25,
+	0xb7,
+	0xa7,
+	0xb0,
+	0xb1,
+	0xbd,
+	0xb3,
+	0xa9,
+	0xc0,
+	0x9e,
+	0x09,
+	0x02,
+	0xa3,
+	0xb8,
+	0xba,
+	0xa5,
+	0x97,
+	0x0e,
+	0xb3,
+	0x03,
+	0x03,
+	0xb5,
+	0x75,
+	0x9e,
+	0x0f,
+	0xa4,
+	0xa4,
+	0x9e,
+	0xa3,
+	0xd0,
+	0xc6,
+	0xd4,
+	0xd6,
+	0x70,
+	0xd8,
+	0xae,
+	0x4d,
+	0x06,
+	0x01,
+	0xdd,
+	0xde,
+	0xd9,
+	0x0f,
+	0xe0,
+	0xc0,
+	0x4f,
+	0x18,
+	0x97,
+	0x0b,
+	0x01,
+	0x96,
+	0xd5,
+	0xb8,
+	0x98,
+	0xa7,
+	0xcc,
+	0xd5,
+	0xc0,
+	0xf2,
+	0xf0,
+	0xfb,
+	0xe0,
+	0xc5,
+	0xa6,
+	0xd9,
+	0x06,
+	0x3c,
+	0x08,
+	0xc7,
+	0x65,
+	0x9f,
+	0xa5,
+	0x78,
+	0xeb,
+	0x04,
+	0x06,
+	0xf8,
+	0xd7,
+	0xeb,
+	0x01,
+	0x06,
+	0x82,
+	0x52,
+	0x02,
+	0x60,
+	0x78,
+	0xe7,
+	0x2a,
+	0x1e,
+	0x35,
+	0x08,
+	0x07,
+	0x18,
+	0x9a,
+	0x9a,
+	0x08,
+	0x51,
+	0x49,
+	0x80,
+	0x03,
+	0x14,
+	0x17,
+	0x1c,
+	0x18,
+	0x29,
+	0x32,
+	0x23,
+	0xa6,
+	0x4b,
+	0x1c,
+	0x4c,
+	0x3b,
+	0x12,
+	0xf9,
+	0x38,
+	0x71,
+	0x60,
+	0x86,
+	0x91,
+	0x30,
+	0x1d,
+	0x1a,
+	0x41,
+	0x89,
+	0xe1,
+	0x50,
+	0xbb,
+	0x0f,
+	0x06,
+	0x40,
+	0x06,
+	0xc8,
+	0x90,
+	0xe1,
+	0x23,
+	0x4c,
+	0x90,
+	0x3c,
+	0x25,
+	0x4e,
+	0xb4,
+	0x79,
+	0x33,
+	0x27,
+	0x84,
+	0x9d,
+	0x3d,
+	0xab,
+	0x54,
+	0x39,
+	0x14,
+	0xb4,
+	0x26,
+	0xd1,
+	0x9b,
+	0x4f,
+	0x8e,
+	0x8e,
+	0xf4,
+	0x09,
+	0x13,
+	0xe9,
+	0xc7,
+	0x48,
+	0x50,
+	0x47,
+	0x18,
+	0x09,
+	0xea,
+	0x68,
+	0x6b,
+	0x4f,
+	0x95,
+	0x83,
+	0xac,
+	0x96,
+	0x10,
+	0x9b,
+	0xf5,
+	0x04,
+	0xd6,
+	0xb1,
+	0x60,
+	0xcb,
+	0xce,
+	0x08,
+	0x01,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0xc0,
+	0xa0,
+	0x70,
+	0x58,
+	0x0a,
+	0x88,
+	0x8c,
+	0x44,
+	0x60,
+	0x40,
+	0x10,
+	0x08,
+	0x0c,
+	0x90,
+	0x49,
+	0xde,
+	0x92,
+	0x40,
+	0x70,
+	0x3e,
+	0xa3,
+	0x52,
+	0x01,
+	0xd5,
+	0x0a,
+	0xc5,
+	0xe2,
+	0xa6,
+	0xd5,
+	0xc1,
+	0xd5,
+	0x9b,
+	0x03,
+	0x3b,
+	0xbb,
+	0x64,
+	0x5b,
+	0x60,
+	0x2b,
+	0x46,
+	0x06,
+	0x0c,
+	0xf0,
+	0x78,
+	0x1a,
+	0x16,
+	0x28,
+	0x84,
+	0xdd,
+	0x06,
+	0x44,
+	0x62,
+	0xbf,
+	0x87,
+	0xcf,
+	0x5b,
+	0x75,
+	0x77,
+	0x1f,
+	0x01,
+	0x0a,
+	0x0a,
+	0x0b,
+	0x02,
+	0x03,
+	0x09,
+	0x0b,
+	0x0b,
+	0x7d,
+	0x7f,
+	0x2b,
+	0x01,
+	0x07,
+	0x05,
+	0x67,
+	0x84,
+	0x85,
+	0x8b,
+	0x96,
+	0x87,
+	0x02,
+	0x09,
+	0x06,
+	0x8e,
+	0x28,
+	0x4d,
+	0x08,
+	0x04,
+	0x07,
+	0x4d,
+	0x94,
+	0x85,
+	0x7b,
+	0x8c,
+	0x8b,
+	0x02,
+	0x99,
+	0x9b,
+	0x9c,
+	0x24,
+	0x6b,
+	0x54,
+	0xae,
+	0x04,
+	0x85,
+	0xb1,
+	0x97,
+	0x98,
+	0xa8,
+	0x9a,
+	0xab,
+	0x23,
+	0xad,
+	0xaf,
+	0xa3,
+	0x95,
+	0xa6,
+	0x98,
+	0x03,
+	0x99,
+	0xb6,
+	0xab,
+	0x56,
+	0x03,
+	0xae,
+	0xa8,
+	0xb1,
+	0xbc,
+	0xbd,
+	0x02,
+	0x98,
+	0xc1,
+	0x9c,
+	0xc3,
+	0xc4,
+	0xa8,
+	0x02,
+	0xc7,
+	0xb3,
+	0x98,
+	0xcb,
+	0xaa,
+	0xcd,
+	0x62,
+	0x62,
+	0x04,
+	0xd0,
+	0xd2,
+	0xb3,
+	0x03,
+	0xa7,
+	0x89,
+	0xd6,
+	0x8e,
+	0xce,
+	0xbf,
+	0x02,
+	0x0e,
+	0xdc,
+	0x96,
+	0x62,
+	0xdf,
+	0x6f,
+	0x68,
+	0x69,
+	0x01,
+	0x0f,
+	0xd8,
+	0xe4,
+	0xe6,
+	0xb2,
+	0x97,
+	0xde,
+	0xa7,
+	0x4e,
+	0x0f,
+	0x0f,
+	0xec,
+	0x5e,
+	0xee,
+	0xf0,
+	0xa8,
+	0xf2,
+	0xc8,
+	0x8b,
+	0xea,
+	0x1d,
+	0x12,
+	0x83,
+	0x4f,
+	0x1f,
+	0x16,
+	0x7e,
+	0x62,
+	0xa0,
+	0xfd,
+	0x8b,
+	0x10,
+	0x61,
+	0xda,
+	0x81,
+	0x45,
+	0xef,
+	0x06,
+	0xe4,
+	0x13,
+	0x66,
+	0x45,
+	0xa1,
+	0x82,
+	0x08,
+	0x17,
+	0x09,
+	0x58,
+	0xd2,
+	0xf8,
+	0x70,
+	0x01,
+	0x04,
+	0x08,
+	0x6d,
+	0x6e,
+	0x0d,
+	0x4a,
+	0x58,
+	0xce,
+	0x01,
+	0xc3,
+	0x8c,
+	0x1a,
+	0x69,
+	0x07,
+	0x1c,
+	0x38,
+	0x90,
+	0xf2,
+	0x23,
+	0x84,
+	0x70,
+	0xc2,
+	0x14,
+	0x32,
+	0x9c,
+	0x19,
+	0xe1,
+	0x15,
+	0x01,
+	0x78,
+	0x10,
+	0x0e,
+	0xc0,
+	0x6c,
+	0x56,
+	0x92,
+	0xe6,
+	0xcc,
+	0x80,
+	0xd8,
+	0x56,
+	0x7e,
+	0xd4,
+	0x29,
+	0x12,
+	0x97,
+	0x39,
+	0x9f,
+	0x70,
+	0xe0,
+	0x1d,
+	0x08,
+	0x4a,
+	0xb4,
+	0x28,
+	0x2e,
+	0x09,
+	0x12,
+	0x68,
+	0x36,
+	0x60,
+	0xc0,
+	0x20,
+	0x14,
+	0xa4,
+	0x95,
+	0x90,
+	0x0c,
+	0x0a,
+	0x6b,
+	0xc0,
+	0x55,
+	0x54,
+	0x13,
+	0x06,
+	0x01,
+	0xa8,
+	0x5a,
+	0x3d,
+	0xc0,
+	0x60,
+	0xe7,
+	0x2d,
+	0x48,
+	0x5d,
+	0x03,
+	0x44,
+	0x50,
+	0xd5,
+	0x04,
+	0xeb,
+	0xd5,
+	0x26,
+	0x4e,
+	0x71,
+	0x75,
+	0xfd,
+	0x60,
+	0x40,
+	0x81,
+	0x1b,
+	0xbb,
+	0x57,
+	0x43,
+	0xc5,
+	0x65,
+	0x05,
+	0x97,
+	0x2e,
+	0x14,
+	0xb8,
+	0x5e,
+	0xf7,
+	0x0a,
+	0x1e,
+	0xfc,
+	0x21,
+	0x04,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x2e,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xbf,
+	0x06,
+	0xc3,
+	0x6f,
+	0x88,
+	0x32,
+	0x2c,
+	0x08,
+	0x42,
+	0xa2,
+	0xf2,
+	0x63,
+	0x3c,
+	0x26,
+	0x03,
+	0xd0,
+	0x65,
+	0xaf,
+	0x89,
+	0xfc,
+	0x04,
+	0x0e,
+	0x93,
+	0x49,
+	0x40,
+	0xba,
+	0x33,
+	0x0e,
+	0x08,
+	0x5b,
+	0x6c,
+	0x56,
+	0xcb,
+	0xcd,
+	0x79,
+	0xc1,
+	0xd7,
+	0x2c,
+	0x85,
+	0x5c,
+	0xbe,
+	0x19,
+	0x06,
+	0x5f,
+	0x70,
+	0x65,
+	0x42,
+	0x59,
+	0x6f,
+	0xdb,
+	0xee,
+	0x78,
+	0xa0,
+	0x62,
+	0xb1,
+	0x50,
+	0x2c,
+	0x77,
+	0x78,
+	0x35,
+	0x06,
+	0x04,
+	0x04,
+	0x10,
+	0x7b,
+	0x13,
+	0x7d,
+	0x6c,
+	0x82,
+	0x34,
+	0x84,
+	0x86,
+	0x88,
+	0x74,
+	0x8b,
+	0x8c,
+	0x32,
+	0x84,
+	0x10,
+	0x87,
+	0x05,
+	0x73,
+	0x14,
+	0x15,
+	0x81,
+	0x4c,
+	0x41,
+	0x9e,
+	0x93,
+	0x2a,
+	0x06,
+	0x96,
+	0x97,
+	0x98,
+	0x13,
+	0x9b,
+	0x9d,
+	0x06,
+	0x08,
+	0x09,
+	0xab,
+	0xab,
+	0x41,
+	0xa0,
+	0x26,
+	0x06,
+	0x0c,
+	0x0b,
+	0x96,
+	0x57,
+	0x05,
+	0x98,
+	0x05,
+	0x01,
+	0x06,
+	0x0a,
+	0xbb,
+	0x0a,
+	0x02,
+	0x03,
+	0x0b,
+	0xc0,
+	0xad,
+	0xaf,
+	0x24,
+	0xb1,
+	0xbb,
+	0xb8,
+	0x08,
+	0x03,
+	0xb6,
+	0x02,
+	0x02,
+	0x0e,
+	0xbc,
+	0xbb,
+	0xc0,
+	0xc0,
+	0xcb,
+	0x09,
+	0x49,
+	0xaf,
+	0xb1,
+	0x0d,
+	0x0d,
+	0xbd,
+	0xcb,
+	0x70,
+	0x70,
+	0xcc,
+	0xce,
+	0x0a,
+	0xd0,
+	0xd1,
+	0x02,
+	0xd3,
+	0xc3,
+	0xd6,
+	0xd7,
+	0xbe,
+	0xdb,
+	0xdb,
+	0xcd,
+	0xde,
+	0xd0,
+	0xcb,
+	0xd2,
+	0xd4,
+	0x82,
+	0x01,
+	0x0c,
+	0xd7,
+	0x0d,
+	0xda,
+	0x50,
+	0x01,
+	0xe9,
+	0xde,
+	0xcf,
+	0x0b,
+	0xda,
+	0xe2,
+	0xe3,
+	0x8c,
+	0xf1,
+	0x0e,
+	0xcc,
+	0x0d,
+	0x08,
+	0xa0,
+	0x00,
+	0x0a,
+	0xbe,
+	0x7c,
+	0xec,
+	0xf6,
+	0x89,
+	0x7b,
+	0xd7,
+	0x26,
+	0x80,
+	0x83,
+	0x87,
+	0x0e,
+	0x7c,
+	0xd9,
+	0xbb,
+	0x07,
+	0x47,
+	0x1d,
+	0xc2,
+	0x65,
+	0x0a,
+	0xfd,
+	0xc1,
+	0x83,
+	0x18,
+	0x71,
+	0xa0,
+	0x41,
+	0x6e,
+	0x16,
+	0xd7,
+	0xfd,
+	0xda,
+	0x47,
+	0x60,
+	0x80,
+	0xc6,
+	0x86,
+	0x1c,
+	0xb7,
+	0xd1,
+	0xa1,
+	0xeb,
+	0x16,
+	0x21,
+	0x1f,
+	0x9c,
+	0x68,
+	0x25,
+	0x07,
+	0x18,
+	0xe0,
+	0xc4,
+	0xc5,
+	0x61,
+	0xc0,
+	0x6b,
+	0x2a,
+	0x07,
+	0x30,
+	0x73,
+	0x10,
+	0xa1,
+	0xa5,
+	0xb7,
+	0x91,
+	0x24,
+	0xe1,
+	0xbc,
+	0xa1,
+	0xb9,
+	0x24,
+	0xc0,
+	0xb5,
+	0x09,
+	0x3e,
+	0x57,
+	0x3e,
+	0xec,
+	0xe9,
+	0x33,
+	0xe9,
+	0x48,
+	0x02,
+	0x02,
+	0x62,
+	0x0e,
+	0x15,
+	0x64,
+	0xe0,
+	0x82,
+	0xd5,
+	0x96,
+	0xe7,
+	0x76,
+	0x32,
+	0xdd,
+	0xba,
+	0x6b,
+	0xe4,
+	0x81,
+	0x42,
+	0x07,
+	0x06,
+	0x40,
+	0x98,
+	0x8a,
+	0xc7,
+	0x40,
+	0x84,
+	0x0a,
+	0x3d,
+	0x15,
+	0x70,
+	0x6c,
+	0xb6,
+	0x95,
+	0xa9,
+	0x82,
+	0x2f,
+	0x0b,
+	0xbe,
+	0x16,
+	0x82,
+	0x33,
+	0x96,
+	0x28,
+	0x97,
+	0x99,
+	0x41,
+	0x18,
+	0x1c,
+	0x88,
+	0x20,
+	0x81,
+	0x6b,
+	0x4b,
+	0xb7,
+	0x03,
+	0x0e,
+	0xc8,
+	0x45,
+	0x57,
+	0x77,
+	0x18,
+	0x13,
+	0xc1,
+	0x12,
+	0xfa,
+	0x36,
+	0xe5,
+	0x9a,
+	0x53,
+	0xf0,
+	0x01,
+	0x86,
+	0xa0,
+	0x0c,
+	0x5c,
+	0x3b,
+	0x50,
+	0xa1,
+	0x41,
+	0xdb,
+	0x9e,
+	0x0d,
+	0x54,
+	0x3a,
+	0x16,
+	0x0c,
+	0x99,
+	0x91,
+	0xe4,
+	0x06,
+	0x82,
+	0xe7,
+	0x35,
+	0xf0,
+	0x14,
+	0x04,
+	0xdd,
+	0x66,
+	0xce,
+	0x86,
+	0x99,
+	0x5c,
+	0x2b,
+	0x20,
+	0x7a,
+	0xb4,
+	0xea,
+	0x06,
+	0x0c,
+	0xf4,
+	0x9e,
+	0x16,
+	0x6c,
+	0xd7,
+	0x73,
+	0x90,
+	0xd6,
+	0x42,
+	0x3e,
+	0x5f,
+	0x8b,
+	0xcd,
+	0xbb,
+	0x77,
+	0xe7,
+	0xc8,
+	0xa4,
+	0x93,
+	0x04,
+	0x9f,
+	0x39,
+	0x71,
+	0x62,
+	0xea,
+	0xe3,
+	0xc8,
+	0x5d,
+	0x84,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0x93,
+	0x86,
+	0x71,
+	0xef,
+	0xbb,
+	0xb1,
+	0x10,
+	0x3a,
+	0x9e,
+	0x30,
+	0xe6,
+	0xfb,
+	0x05,
+	0x03,
+	0xc8,
+	0xa1,
+	0x32,
+	0x55,
+	0x04,
+	0x7e,
+	0x02,
+	0x87,
+	0xc9,
+	0x24,
+	0xb0,
+	0xac,
+	0xe2,
+	0x16,
+	0x03,
+	0x02,
+	0x35,
+	0x2a,
+	0x9d,
+	0x5a,
+	0xad,
+	0xbe,
+	0x2c,
+	0x92,
+	0x4b,
+	0xf1,
+	0x7e,
+	0x97,
+	0x86,
+	0x41,
+	0x56,
+	0x5b,
+	0x99,
+	0x50,
+	0xca,
+	0xd4,
+	0x33,
+	0x7a,
+	0x1d,
+	0xa8,
+	0x58,
+	0x2c,
+	0x14,
+	0x4b,
+	0x5c,
+	0x3e,
+	0x34,
+	0x10,
+	0x08,
+	0x10,
+	0x75,
+	0x13,
+	0x77,
+	0x66,
+	0x7c,
+	0x42,
+	0x7e,
+	0x80,
+	0x82,
+	0x6e,
+	0x85,
+	0x86,
+	0x3d,
+	0x80,
+	0x81,
+	0x05,
+	0x6d,
+	0x14,
+	0x15,
+	0x7b,
+	0x8d,
+	0x37,
+	0x06,
+	0x10,
+	0x99,
+	0x01,
+	0x05,
+	0x91,
+	0x13,
+	0x94,
+	0x96,
+	0x3d,
+	0x0c,
+	0x0b,
+	0x9a,
+	0x07,
+	0x9c,
+	0x15,
+	0x05,
+	0x01,
+	0x41,
+	0x1f,
+	0x39,
+	0xac,
+	0xaa,
+	0xa0,
+	0x2a,
+	0x06,
+	0x0c,
+	0x0a,
+	0x0a,
+	0xa8,
+	0x08,
+	0x03,
+	0x9c,
+	0x02,
+	0x02,
+	0x0e,
+	0xac,
+	0x08,
+	0x09,
+	0xbe,
+	0xbe,
+	0x39,
+	0xaf,
+	0x4c,
+	0x0c,
+	0x0d,
+	0x0d,
+	0x0a,
+	0xb9,
+	0x02,
+	0x6a,
+	0x6a,
+	0xba,
+	0xb3,
+	0xb3,
+	0xc9,
+	0x0b,
+	0xd0,
+	0xc0,
+	0xc2,
+	0x27,
+	0xb1,
+	0xc5,
+	0x0d,
+	0xc9,
+	0xca,
+	0xca,
+	0x0e,
+	0xcd,
+	0xb3,
+	0xd0,
+	0xd0,
+	0xb9,
+	0x09,
+	0xae,
+	0xd3,
+	0x01,
+	0xc4,
+	0xc5,
+	0xb9,
+	0x03,
+	0x48,
+	0x01,
+	0xda,
+	0xdc,
+	0x0a,
+	0xde,
+	0xdf,
+	0x02,
+	0xe1,
+	0xd3,
+	0x23,
+	0xe4,
+	0x0e,
+	0xe6,
+	0xe8,
+	0x0a,
+	0x48,
+	0xeb,
+	0xec,
+	0xde,
+	0xc8,
+	0xf0,
+	0xe2,
+	0xa0,
+	0x01,
+	0x1c,
+	0x08,
+	0x74,
+	0x90,
+	0x2c,
+	0x9d,
+	0x3a,
+	0x35,
+	0xdb,
+	0xd8,
+	0xb5,
+	0x5b,
+	0x70,
+	0x0e,
+	0x5e,
+	0xbc,
+	0x71,
+	0x03,
+	0x09,
+	0xa2,
+	0xcb,
+	0xb7,
+	0x2c,
+	0xe1,
+	0xbe,
+	0x6f,
+	0x0c,
+	0xfd,
+	0xc9,
+	0x0b,
+	0x38,
+	0x30,
+	0x5b,
+	0x36,
+	0x66,
+	0x0a,
+	0xdb,
+	0xe5,
+	0xca,
+	0xf8,
+	0x50,
+	0x18,
+	0x47,
+	0x6b,
+	0x1e,
+	0xc9,
+	0x07,
+	0xe8,
+	0xb2,
+	0xb8,
+	0x6f,
+	0xc0,
+	0x37,
+	0x02,
+	0x03,
+	0x4a,
+	0x02,
+	0x2c,
+	0x36,
+	0x21,
+	0xc2,
+	0xac,
+	0x8f,
+	0x02,
+	0x6d,
+	0xda,
+	0x64,
+	0xa7,
+	0xe6,
+	0xa5,
+	0x1a,
+	0x03,
+	0x95,
+	0x2c,
+	0x19,
+	0xb8,
+	0x40,
+	0xd4,
+	0x26,
+	0xb6,
+	0x95,
+	0x11,
+	0x92,
+	0xee,
+	0xe4,
+	0xe6,
+	0xd2,
+	0xe7,
+	0x80,
+	0x34,
+	0x41,
+	0x0d,
+	0x19,
+	0x88,
+	0x50,
+	0x21,
+	0xa9,
+	0x82,
+	0x88,
+	0xdb,
+	0x94,
+	0xee,
+	0xdc,
+	0xd9,
+	0xf3,
+	0x87,
+	0x00,
+	0x98,
+	0x4f,
+	0xd1,
+	0x4d,
+	0x03,
+	0x9a,
+	0x83,
+	0xc1,
+	0x81,
+	0x08,
+	0x12,
+	0xb4,
+	0x2a,
+	0xd0,
+	0xca,
+	0x15,
+	0xda,
+	0x81,
+	0x3f,
+	0x07,
+	0x06,
+	0x40,
+	0x80,
+	0x2a,
+	0x6f,
+	0x84,
+	0x81,
+	0x03,
+	0x07,
+	0x24,
+	0xa4,
+	0xdd,
+	0xaa,
+	0x36,
+	0xcb,
+	0x82,
+	0xb7,
+	0x7f,
+	0xd4,
+	0xcc,
+	0x0d,
+	0x54,
+	0x57,
+	0x84,
+	0x81,
+	0x62,
+	0x07,
+	0x2a,
+	0x34,
+	0x50,
+	0xab,
+	0x54,
+	0xc1,
+	0x00,
+	0xbc,
+	0x81,
+	0x95,
+	0xcd,
+	0x8d,
+	0xfa,
+	0xea,
+	0x70,
+	0x03,
+	0xbc,
+	0xd6,
+	0x1a,
+	0x4c,
+	0x4d,
+	0x1a,
+	0xc0,
+	0x66,
+	0xca,
+	0xc7,
+	0x07,
+	0xfe,
+	0x8d,
+	0x6b,
+	0x50,
+	0x20,
+	0xb3,
+	0x66,
+	0x83,
+	0xe9,
+	0xb2,
+	0xc5,
+	0x05,
+	0x2d,
+	0x5a,
+	0xd8,
+	0xe1,
+	0x00,
+	0x99,
+	0x45,
+	0xe7,
+	0xc3,
+	0x9b,
+	0xad,
+	0xb5,
+	0xc9,
+	0x06,
+	0xb0,
+	0x35,
+	0xb7,
+	0x4e,
+	0x47,
+	0x1b,
+	0xef,
+	0x01,
+	0xca,
+	0x1b,
+	0x9f,
+	0x50,
+	0x06,
+	0x4a,
+	0xce,
+	0xac,
+	0x6f,
+	0xdf,
+	0xc0,
+	0x0b,
+	0x9f,
+	0xc8,
+	0x5d,
+	0x8c,
+	0x81,
+	0xf3,
+	0xe7,
+	0x49,
+	0x94,
+	0xbf,
+	0x68,
+	0x45,
+	0x3c,
+	0x9d,
+	0xf4,
+	0xeb,
+	0xd8,
+	0x69,
+	0x84,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0e,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0xfc,
+	0x1a,
+	0x86,
+	0x6c,
+	0xdf,
+	0xae,
+	0xb1,
+	0x10,
+	0x35,
+	0xee,
+	0xff,
+	0x22,
+	0xdd,
+	0xae,
+	0x17,
+	0x28,
+	0x02,
+	0x8f,
+	0xb3,
+	0xc5,
+	0xf0,
+	0x13,
+	0x38,
+	0x4c,
+	0x26,
+	0x01,
+	0xa4,
+	0x54,
+	0xa5,
+	0x1b,
+	0x10,
+	0xa2,
+	0xce,
+	0x27,
+	0x74,
+	0xca,
+	0x2d,
+	0x55,
+	0xaf,
+	0xcd,
+	0x27,
+	0x65,
+	0xdb,
+	0x2d,
+	0x1b,
+	0x06,
+	0xd6,
+	0x6b,
+	0x65,
+	0x42,
+	0x19,
+	0x47,
+	0xcb,
+	0xe6,
+	0x74,
+	0xa0,
+	0x62,
+	0xb1,
+	0x50,
+	0x2c,
+	0x6f,
+	0x54,
+	0x91,
+	0x06,
+	0x8f,
+	0x19,
+	0x08,
+	0x04,
+	0x10,
+	0x73,
+	0x13,
+	0x75,
+	0x64,
+	0x24,
+	0x34,
+	0x34,
+	0x09,
+	0x8a,
+	0x09,
+	0x3d,
+	0x7d,
+	0x2d,
+	0x7f,
+	0x81,
+	0x83,
+	0x6c,
+	0x86,
+	0x1f,
+	0x06,
+	0x08,
+	0x8b,
+	0x8b,
+	0x02,
+	0x02,
+	0x8c,
+	0x8e,
+	0x8f,
+	0x81,
+	0x82,
+	0x05,
+	0x6b,
+	0x14,
+	0x15,
+	0x79,
+	0x01,
+	0x0a,
+	0x0a,
+	0x02,
+	0x03,
+	0x4a,
+	0x0b,
+	0x09,
+	0x0b,
+	0x9a,
+	0x9c,
+	0x9d,
+	0x54,
+	0x10,
+	0xb3,
+	0x01,
+	0x05,
+	0xa1,
+	0x13,
+	0xa4,
+	0x22,
+	0xa6,
+	0xa7,
+	0x0a,
+	0xab,
+	0x4a,
+	0x9a,
+	0xaf,
+	0x8d,
+	0xb1,
+	0x5e,
+	0x0c,
+	0x0b,
+	0xb4,
+	0x07,
+	0xb6,
+	0x15,
+	0x05,
+	0x01,
+	0x06,
+	0xbb,
+	0xbc,
+	0xbe,
+	0x09,
+	0x9a,
+	0x03,
+	0x9b,
+	0xb0,
+	0xc3,
+	0x87,
+	0x0c,
+	0xa7,
+	0xcb,
+	0x08,
+	0x03,
+	0xb6,
+	0x9a,
+	0x0e,
+	0xbc,
+	0xe0,
+	0xab,
+	0xad,
+	0x02,
+	0xae,
+	0x9b,
+	0xc2,
+	0xd6,
+	0x06,
+	0x0c,
+	0x0d,
+	0x0d,
+	0xa8,
+	0xd2,
+	0x68,
+	0xd3,
+	0xdf,
+	0xe0,
+	0xcf,
+	0x4a,
+	0xd1,
+	0xe5,
+	0xd5,
+	0xd6,
+	0x95,
+	0xea,
+	0xeb,
+	0xa9,
+	0xef,
+	0xef,
+	0xf1,
+	0xf2,
+	0xbd,
+	0xe8,
+	0xfd,
+	0x22,
+	0x30,
+	0xe0,
+	0x5e,
+	0xac,
+	0x00,
+	0xfa,
+	0x1a,
+	0xb8,
+	0xeb,
+	0x37,
+	0xe0,
+	0x1f,
+	0x40,
+	0x25,
+	0xaa,
+	0x5c,
+	0x11,
+	0x1c,
+	0xd0,
+	0x0c,
+	0x1f,
+	0x42,
+	0x07,
+	0xfb,
+	0xd0,
+	0x14,
+	0xe9,
+	0xe7,
+	0x50,
+	0x9e,
+	0x2f,
+	0x89,
+	0x68,
+	0xce,
+	0xe4,
+	0xe9,
+	0x14,
+	0xc0,
+	0x81,
+	0x49,
+	0x07,
+	0xa9,
+	0xd6,
+	0x36,
+	0x72,
+	0x3c,
+	0x15,
+	0x01,
+	0x60,
+	0xc4,
+	0x1d,
+	0x02,
+	0x26,
+	0x8a,
+	0xb4,
+	0x56,
+	0xf2,
+	0x64,
+	0x4a,
+	0x86,
+	0x02,
+	0xe2,
+	0xb5,
+	0x94,
+	0x17,
+	0xf1,
+	0x00,
+	0xa0,
+	0x03,
+	0x03,
+	0x20,
+	0xcc,
+	0x1c,
+	0x56,
+	0xd3,
+	0x24,
+	0xc3,
+	0x77,
+	0x39,
+	0x59,
+	0x2a,
+	0x55,
+	0x80,
+	0x86,
+	0x80,
+	0x4f,
+	0x40,
+	0x68,
+	0x84,
+	0x8e,
+	0x24,
+	0x69,
+	0x72,
+	0x5d,
+	0x83,
+	0xa3,
+	0x39,
+	0x75,
+	0x46,
+	0xd8,
+	0x7a,
+	0x4a,
+	0x15,
+	0xa0,
+	0x89,
+	0x51,
+	0x2b,
+	0xd2,
+	0x5c,
+	0x37,
+	0x61,
+	0x67,
+	0xbf,
+	0xac,
+	0x3b,
+	0xb7,
+	0x72,
+	0xb5,
+	0xb2,
+	0xa3,
+	0xdf,
+	0x81,
+	0x03,
+	0xe7,
+	0x86,
+	0x19,
+	0xb8,
+	0x40,
+	0xb7,
+	0x25,
+	0x3f,
+	0xb4,
+	0x5c,
+	0x15,
+	0xa8,
+	0x65,
+	0xfa,
+	0x16,
+	0x0d,
+	0xd0,
+	0x01,
+	0x6f,
+	0xe3,
+	0xc6,
+	0x32,
+	0x10,
+	0xa1,
+	0x02,
+	0xd7,
+	0x93,
+	0x26,
+	0xf5,
+	0x72,
+	0xdd,
+	0x1a,
+	0xa0,
+	0xa5,
+	0xc6,
+	0xbe,
+	0x7e,
+	0xa7,
+	0xe2,
+	0x6b,
+	0x46,
+	0x83,
+	0xc1,
+	0x81,
+	0x08,
+	0x12,
+	0xd4,
+	0xb6,
+	0x6c,
+	0x59,
+	0xa4,
+	0xb3,
+	0xe7,
+	0xb7,
+	0xa0,
+	0x25,
+	0xe3,
+	0x1b,
+	0x61,
+	0xe0,
+	0xad,
+	0x84,
+	0xcc,
+	0x69,
+	0x45,
+	0x37,
+	0x29,
+	0xf2,
+	0xd6,
+	0xc8,
+	0xe8,
+	0x13,
+	0x06,
+	0xd6,
+	0x1d,
+	0xa8,
+	0xd0,
+	0x40,
+	0xad,
+	0x68,
+	0x5d,
+	0xad,
+	0x0f,
+	0xb8,
+	0x7e,
+	0x7d,
+	0x48,
+	0xf6,
+	0x01,
+	0xab,
+	0x0d,
+	0x04,
+	0x93,
+	0x58,
+	0xad,
+	0xfb,
+	0x36,
+	0xba,
+	0x75,
+	0x05,
+	0x80,
+	0x07,
+	0x6f,
+	0x51,
+	0x64,
+	0x9d,
+	0x71,
+	0xb9,
+	0x34,
+	0x94,
+	0x0b,
+	0x3f,
+	0x11,
+	0xc0,
+	0x39,
+	0x6f,
+	0x13,
+	0x88,
+	0x10,
+	0xc5,
+	0xd8,
+	0x7d,
+	0xbd,
+	0xbb,
+	0xf7,
+	0xef,
+	0xe0,
+	0xc3,
+	0x8b,
+	0x1f,
+	0x4f,
+	0xde,
+	0x7b,
+	0x08,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0e,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0x7f,
+	0x1b,
+	0x06,
+	0x9f,
+	0x50,
+	0x65,
+	0x58,
+	0x10,
+	0x82,
+	0xc3,
+	0xe4,
+	0xa8,
+	0x68,
+	0x44,
+	0x06,
+	0x9e,
+	0x4a,
+	0x1f,
+	0xf3,
+	0xf8,
+	0x09,
+	0x1c,
+	0x26,
+	0x93,
+	0x40,
+	0x94,
+	0x57,
+	0x1c,
+	0x10,
+	0xb4,
+	0x57,
+	0x6c,
+	0x76,
+	0xab,
+	0xeb,
+	0x7e,
+	0xad,
+	0x58,
+	0xca,
+	0x98,
+	0x8c,
+	0x33,
+	0x0c,
+	0xbc,
+	0xdf,
+	0xca,
+	0x84,
+	0xa2,
+	0xd6,
+	0xa6,
+	0x9e,
+	0x01,
+	0x20,
+	0x9b,
+	0x08,
+	0x0f,
+	0x54,
+	0x2c,
+	0x16,
+	0x14,
+	0x16,
+	0x76,
+	0x25,
+	0x40,
+	0x06,
+	0x09,
+	0x88,
+	0x88,
+	0x48,
+	0x7b,
+	0x26,
+	0x06,
+	0x04,
+	0x04,
+	0x10,
+	0x7e,
+	0x13,
+	0x80,
+	0x6b,
+	0x4b,
+	0x08,
+	0x89,
+	0x89,
+	0x02,
+	0x02,
+	0x09,
+	0x8b,
+	0x8c,
+	0x4b,
+	0x8f,
+	0x91,
+	0x72,
+	0x73,
+	0x95,
+	0x55,
+	0x0a,
+	0x0a,
+	0x02,
+	0x03,
+	0x0b,
+	0xaa,
+	0x09,
+	0x0b,
+	0x9a,
+	0x9c,
+	0x9e,
+	0x24,
+	0x8e,
+	0x10,
+	0x91,
+	0x05,
+	0x72,
+	0x14,
+	0x15,
+	0x76,
+	0x4f,
+	0xa6,
+	0xa6,
+	0xaa,
+	0xbd,
+	0x9a,
+	0xae,
+	0x9d,
+	0x8c,
+	0x06,
+	0xb3,
+	0xb4,
+	0xb5,
+	0x13,
+	0xb8,
+	0xa5,
+	0xbb,
+	0xbc,
+	0xbd,
+	0x09,
+	0x9a,
+	0x03,
+	0x9b,
+	0xaf,
+	0x9e,
+	0x06,
+	0x0c,
+	0x0b,
+	0xb3,
+	0x56,
+	0x05,
+	0xb5,
+	0x05,
+	0x79,
+	0xca,
+	0xca,
+	0xcc,
+	0xad,
+	0xad,
+	0x9b,
+	0xc1,
+	0x64,
+	0xd3,
+	0xa6,
+	0xda,
+	0x08,
+	0x03,
+	0xd8,
+	0x9a,
+	0x0e,
+	0xdc,
+	0xdd,
+	0xab,
+	0x02,
+	0xe0,
+	0xd1,
+	0x7b,
+	0xd3,
+	0x0d,
+	0x0d,
+	0xa7,
+	0xce,
+	0x6f,
+	0xcf,
+	0xeb,
+	0xec,
+	0xcb,
+	0x0b,
+	0xac,
+	0xad,
+	0x04,
+	0x03,
+	0xe2,
+	0x8d,
+	0x63,
+	0x40,
+	0xaf,
+	0x01,
+	0x2a,
+	0x7c,
+	0xf8,
+	0xf4,
+	0xed,
+	0x53,
+	0xa0,
+	0x2a,
+	0xd5,
+	0xbf,
+	0x37,
+	0x41,
+	0x08,
+	0x29,
+	0x09,
+	0x40,
+	0x90,
+	0x9e,
+	0x33,
+	0x3c,
+	0x09,
+	0x17,
+	0xf2,
+	0x53,
+	0x25,
+	0x00,
+	0xe0,
+	0x00,
+	0x03,
+	0x01,
+	0x1e,
+	0x48,
+	0x1c,
+	0x42,
+	0xd1,
+	0x81,
+	0xc5,
+	0x01,
+	0x01,
+	0xdf,
+	0x14,
+	0x3c,
+	0xc9,
+	0xa8,
+	0xd1,
+	0xa1,
+	0x91,
+	0x8e,
+	0x10,
+	0x07,
+	0x88,
+	0xdc,
+	0x12,
+	0xc0,
+	0x81,
+	0x4d,
+	0x07,
+	0xa8,
+	0xf0,
+	0x04,
+	0x60,
+	0x19,
+	0x61,
+	0x9f,
+	0xc3,
+	0x03,
+	0x8f,
+	0x0e,
+	0x0c,
+	0x80,
+	0xe0,
+	0x26,
+	0x12,
+	0xcd,
+	0x9b,
+	0x38,
+	0x51,
+	0xae,
+	0x7c,
+	0x23,
+	0x40,
+	0x5f,
+	0x4f,
+	0x53,
+	0x4f,
+	0xdf,
+	0x10,
+	0x00,
+	0xfa,
+	0xe8,
+	0x0d,
+	0x51,
+	0xa3,
+	0x47,
+	0x6f,
+	0x22,
+	0x44,
+	0xd8,
+	0x14,
+	0xaa,
+	0x82,
+	0x08,
+	0x60,
+	0x4d,
+	0xa5,
+	0x7a,
+	0xe4,
+	0xd1,
+	0x2a,
+	0x48,
+	0x36,
+	0x35,
+	0x4d,
+	0xd2,
+	0xdb,
+	0x9a,
+	0xcf,
+	0xe9,
+	0xd7,
+	0xb0,
+	0x5e,
+	0x8c,
+	0x20,
+	0x3c,
+	0x70,
+	0x40,
+	0xdc,
+	0x44,
+	0x7a,
+	0x13,
+	0xa2,
+	0xe2,
+	0x6b,
+	0xea,
+	0xe0,
+	0x69,
+	0x84,
+	0x04,
+	0x60,
+	0x13,
+	0xec,
+	0xa4,
+	0xfb,
+	0x46,
+	0xe8,
+	0x00,
+	0xba,
+	0x76,
+	0x95,
+	0x18,
+	0xb8,
+	0xc0,
+	0xb8,
+	0xe7,
+	0x41,
+	0xbe,
+	0x60,
+	0x7b,
+	0x0a,
+	0xd6,
+	0xb9,
+	0x13,
+	0x02,
+	0xe1,
+	0xc2,
+	0x23,
+	0xc7,
+	0x45,
+	0xa8,
+	0x10,
+	0x16,
+	0xe9,
+	0xba,
+	0xc8,
+	0x2a,
+	0x4d,
+	0xe0,
+	0xa1,
+	0x4b,
+	0x3a,
+	0xf3,
+	0xb8,
+	0x3c,
+	0xd3,
+	0x0e,
+	0x44,
+	0x90,
+	0x10,
+	0xb9,
+	0x67,
+	0x04,
+	0xd3,
+	0x22,
+	0x46,
+	0x1f,
+	0xc0,
+	0x0a,
+	0x6b,
+	0x09,
+	0x5d,
+	0x09,
+	0xac,
+	0x9f,
+	0xc2,
+	0x8e,
+	0x4d,
+	0xd7,
+	0x0a,
+	0xed,
+	0xda,
+	0x1f,
+	0x0c,
+	0xd0,
+	0x3b,
+	0x50,
+	0xa1,
+	0x01,
+	0xd8,
+	0xdd,
+	0x23,
+	0xac,
+	0xf8,
+	0x46,
+	0xbe,
+	0x45,
+	0x78,
+	0x03,
+	0xba,
+	0x05,
+	0x99,
+	0x27,
+	0x0f,
+	0x40,
+	0x4f,
+	0x7a,
+	0x12,
+	0xe7,
+	0x05,
+	0x0a,
+	0x36,
+	0xb0,
+	0x9e,
+	0xbc,
+	0x3a,
+	0xf0,
+	0xe0,
+	0x40,
+	0xb4,
+	0x37,
+	0x48,
+	0x7c,
+	0x87,
+	0xbb,
+	0x62,
+	0x43,
+	0x7a,
+	0xbe,
+	0xab,
+	0x5f,
+	0xcf,
+	0xbe,
+	0x45,
+	0x08,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x2e,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x28,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0x40,
+	0x83,
+	0x01,
+	0x48,
+	0x34,
+	0x19,
+	0x16,
+	0x84,
+	0x61,
+	0xb1,
+	0x78,
+	0x44,
+	0x2a,
+	0x03,
+	0xd0,
+	0x65,
+	0xaf,
+	0x99,
+	0xfc,
+	0x04,
+	0x0e,
+	0x93,
+	0x49,
+	0x40,
+	0xba,
+	0x3b,
+	0x0e,
+	0x08,
+	0x5b,
+	0x6c,
+	0x56,
+	0xcb,
+	0xcd,
+	0x79,
+	0xc1,
+	0xd7,
+	0x2c,
+	0x85,
+	0x5c,
+	0xbe,
+	0x19,
+	0x06,
+	0x5f,
+	0x70,
+	0x65,
+	0x42,
+	0x59,
+	0x6f,
+	0xdb,
+	0xee,
+	0x78,
+	0xa0,
+	0x62,
+	0xb1,
+	0x50,
+	0x2c,
+	0x77,
+	0x78,
+	0x35,
+	0x06,
+	0x04,
+	0x04,
+	0x10,
+	0x7b,
+	0x13,
+	0x7d,
+	0x6c,
+	0x82,
+	0x34,
+	0x84,
+	0x86,
+	0x88,
+	0x74,
+	0x8b,
+	0x8c,
+	0x32,
+	0x84,
+	0x10,
+	0x87,
+	0x05,
+	0x73,
+	0x14,
+	0x15,
+	0x81,
+	0x1f,
+	0x42,
+	0x9e,
+	0x4a,
+	0x93,
+	0x28,
+	0x06,
+	0x96,
+	0x97,
+	0x98,
+	0x13,
+	0x9b,
+	0x9d,
+	0x42,
+	0x08,
+	0x09,
+	0xac,
+	0xac,
+	0x42,
+	0xa1,
+	0x46,
+	0x0c,
+	0x0b,
+	0x96,
+	0x57,
+	0x05,
+	0x98,
+	0x05,
+	0x01,
+	0x06,
+	0x0a,
+	0xbb,
+	0x0a,
+	0x02,
+	0x03,
+	0x0b,
+	0xc0,
+	0xae,
+	0xb0,
+	0x24,
+	0x06,
+	0x0c,
+	0xbb,
+	0xb8,
+	0x08,
+	0x03,
+	0xb6,
+	0x02,
+	0x02,
+	0x0e,
+	0xbc,
+	0xbb,
+	0xc0,
+	0xc0,
+	0xcc,
+	0x09,
+	0xa0,
+	0xa1,
+	0xc5,
+	0x0d,
+	0x0d,
+	0xbd,
+	0xcc,
+	0x70,
+	0x70,
+	0xcd,
+	0xcf,
+	0x0a,
+	0xd1,
+	0xd2,
+	0x02,
+	0xd4,
+	0xc3,
+	0xd7,
+	0xd8,
+	0xbe,
+	0xdc,
+	0xdc,
+	0xce,
+	0xdf,
+	0xd1,
+	0xcc,
+	0xd3,
+	0xd5,
+	0x78,
+	0x01,
+	0x0c,
+	0xd8,
+	0x0d,
+	0xdb,
+	0x50,
+	0x01,
+	0xea,
+	0xdf,
+	0xd0,
+	0x0b,
+	0xdb,
+	0xe3,
+	0xe4,
+	0x8c,
+	0xf2,
+	0x1c,
+	0x9c,
+	0x1b,
+	0x10,
+	0x40,
+	0x01,
+	0x94,
+	0x7c,
+	0xfa,
+	0xda,
+	0xf1,
+	0x1b,
+	0x07,
+	0xaf,
+	0x4c,
+	0x00,
+	0x07,
+	0x10,
+	0x1d,
+	0xf8,
+	0xba,
+	0x87,
+	0x0f,
+	0xce,
+	0xba,
+	0x84,
+	0xcc,
+	0x16,
+	0xfe,
+	0x13,
+	0xf4,
+	0x30,
+	0xe2,
+	0xc4,
+	0x83,
+	0xdd,
+	0x2e,
+	0xb2,
+	0xfb,
+	0xc5,
+	0x8f,
+	0xc0,
+	0x80,
+	0x8d,
+	0x6d,
+	0xb9,
+	0x3a,
+	0x42,
+	0x4c,
+	0x97,
+	0xce,
+	0x5b,
+	0x04,
+	0x7d,
+	0x70,
+	0xa4,
+	0x99,
+	0x1c,
+	0x60,
+	0x80,
+	0x13,
+	0x97,
+	0x8e,
+	0xf4,
+	0x58,
+	0x0e,
+	0x68,
+	0xe6,
+	0x20,
+	0xc2,
+	0xcb,
+	0x6f,
+	0x24,
+	0x4b,
+	0xc2,
+	0x31,
+	0xf0,
+	0xc0,
+	0xe6,
+	0x92,
+	0x00,
+	0xd8,
+	0x26,
+	0xfc,
+	0x6c,
+	0x09,
+	0xd1,
+	0xe7,
+	0xcf,
+	0xa5,
+	0x24,
+	0x09,
+	0x08,
+	0x98,
+	0x49,
+	0xd4,
+	0xe8,
+	0x12,
+	0x03,
+	0x17,
+	0xb2,
+	0xbe,
+	0x44,
+	0xc7,
+	0xd3,
+	0xa9,
+	0xd7,
+	0x5d,
+	0x24,
+	0x0f,
+	0x14,
+	0x3a,
+	0x30,
+	0x00,
+	0x42,
+	0x55,
+	0x41,
+	0x06,
+	0x22,
+	0x54,
+	0xf0,
+	0xa9,
+	0x20,
+	0x22,
+	0x44,
+	0x05,
+	0x5e,
+	0x9d,
+	0x2a,
+	0xf8,
+	0xb2,
+	0x40,
+	0x6c,
+	0x21,
+	0x38,
+	0x66,
+	0xad,
+	0x4a,
+	0xa9,
+	0x29,
+	0x84,
+	0xc1,
+	0x81,
+	0x08,
+	0x12,
+	0xbe,
+	0xbe,
+	0x94,
+	0x3b,
+	0xe0,
+	0x80,
+	0xdd,
+	0x74,
+	0x66,
+	0x87,
+	0x89,
+	0x30,
+	0x60,
+	0x58,
+	0x42,
+	0xe0,
+	0xa7,
+	0x5f,
+	0x75,
+	0x1a,
+	0x3e,
+	0xd0,
+	0x70,
+	0x92,
+	0x01,
+	0x6c,
+	0x07,
+	0x2a,
+	0x34,
+	0x88,
+	0xeb,
+	0xb3,
+	0x01,
+	0xcb,
+	0xc9,
+	0x86,
+	0x2b,
+	0xa3,
+	0xc5,
+	0x7c,
+	0x80,
+	0x5e,
+	0x83,
+	0x4f,
+	0x6f,
+	0xb8,
+	0x81,
+	0x0e,
+	0xad,
+	0xb8,
+	0x13,
+	0xb6,
+	0x02,
+	0xa6,
+	0x4f,
+	0xbb,
+	0x6e,
+	0xc0,
+	0xc0,
+	0xef,
+	0x6a,
+	0xc3,
+	0x7a,
+	0xd1,
+	0x0a,
+	0x89,
+	0x3d,
+	0xe4,
+	0x32,
+	0xbd,
+	0xda,
+	0xc0,
+	0x83,
+	0x8b,
+	0xb6,
+	0x8c,
+	0x7a,
+	0x31,
+	0x6a,
+	0x8a,
+	0xc8,
+	0x5b,
+	0x2b,
+	0x87,
+	0x11,
+	0x02,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x0d,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0x93,
+	0x86,
+	0x71,
+	0xef,
+	0xbb,
+	0xb1,
+	0x10,
+	0x3a,
+	0x9e,
+	0x30,
+	0xe6,
+	0xfb,
+	0x05,
+	0x03,
+	0xc8,
+	0xa1,
+	0x32,
+	0x55,
+	0x04,
+	0x7e,
+	0x02,
+	0x87,
+	0xc9,
+	0x24,
+	0xb0,
+	0xac,
+	0xe2,
+	0x16,
+	0x03,
+	0x02,
+	0x35,
+	0x2a,
+	0x9d,
+	0x5a,
+	0xad,
+	0xbe,
+	0x2c,
+	0x92,
+	0x4b,
+	0xf1,
+	0x7e,
+	0x97,
+	0x86,
+	0x41,
+	0x56,
+	0x5b,
+	0x99,
+	0x50,
+	0xca,
+	0xd4,
+	0x33,
+	0x7a,
+	0x1d,
+	0xa8,
+	0x58,
+	0x2c,
+	0x14,
+	0x4b,
+	0x5c,
+	0x3e,
+	0x34,
+	0x10,
+	0x08,
+	0x10,
+	0x75,
+	0x13,
+	0x77,
+	0x66,
+	0x7c,
+	0x42,
+	0x7e,
+	0x80,
+	0x82,
+	0x6e,
+	0x85,
+	0x86,
+	0x3d,
+	0x80,
+	0x81,
+	0x05,
+	0x6d,
+	0x14,
+	0x15,
+	0x7b,
+	0x8d,
+	0x37,
+	0x06,
+	0x10,
+	0x99,
+	0x01,
+	0x05,
+	0x91,
+	0x13,
+	0x94,
+	0x96,
+	0x3d,
+	0x0c,
+	0x0b,
+	0x9a,
+	0x07,
+	0x9c,
+	0x15,
+	0x05,
+	0x01,
+	0x41,
+	0x1f,
+	0x39,
+	0xac,
+	0xaa,
+	0xa0,
+	0x2a,
+	0x06,
+	0x0c,
+	0x0a,
+	0x0a,
+	0xa8,
+	0x08,
+	0x03,
+	0x9c,
+	0x02,
+	0x02,
+	0x0e,
+	0xac,
+	0x08,
+	0x09,
+	0xbe,
+	0xbe,
+	0x39,
+	0xaf,
+	0x4c,
+	0x0c,
+	0x0d,
+	0x0d,
+	0x0a,
+	0xb9,
+	0x02,
+	0x6a,
+	0x6a,
+	0xba,
+	0xb3,
+	0xb3,
+	0xc9,
+	0x0b,
+	0xd0,
+	0xc0,
+	0xc2,
+	0x27,
+	0xb1,
+	0xc5,
+	0x0d,
+	0xc9,
+	0xca,
+	0xca,
+	0x0e,
+	0xcd,
+	0xb3,
+	0xd0,
+	0xd0,
+	0xb9,
+	0x09,
+	0xae,
+	0xd3,
+	0x01,
+	0xc4,
+	0xc5,
+	0xb9,
+	0x03,
+	0x48,
+	0x01,
+	0xda,
+	0xdc,
+	0x0a,
+	0xde,
+	0xdf,
+	0x02,
+	0xe1,
+	0xd3,
+	0x23,
+	0xe4,
+	0x0e,
+	0xe6,
+	0xe8,
+	0x0a,
+	0x48,
+	0xeb,
+	0xec,
+	0xde,
+	0xc8,
+	0xf0,
+	0xe2,
+	0xa0,
+	0x01,
+	0x1c,
+	0x08,
+	0x74,
+	0x90,
+	0x2c,
+	0x9d,
+	0x3a,
+	0x35,
+	0xdb,
+	0xd8,
+	0xb5,
+	0x5b,
+	0x70,
+	0x0e,
+	0x5e,
+	0xbc,
+	0x71,
+	0x03,
+	0x09,
+	0xa2,
+	0xcb,
+	0xb7,
+	0x2c,
+	0xe1,
+	0xbe,
+	0x6f,
+	0x0c,
+	0xfd,
+	0xc9,
+	0x0b,
+	0x38,
+	0x30,
+	0x5b,
+	0x36,
+	0x66,
+	0x0a,
+	0xdb,
+	0xe5,
+	0xca,
+	0xf8,
+	0x50,
+	0x18,
+	0x47,
+	0x6b,
+	0x1e,
+	0xc9,
+	0x07,
+	0xe8,
+	0xb2,
+	0xb8,
+	0x6f,
+	0xc0,
+	0x37,
+	0x02,
+	0x03,
+	0x4a,
+	0x02,
+	0x2c,
+	0x36,
+	0x21,
+	0xc2,
+	0xac,
+	0x8f,
+	0x02,
+	0x6d,
+	0xda,
+	0x64,
+	0xa7,
+	0xe6,
+	0xa5,
+	0x1a,
+	0x03,
+	0x95,
+	0x2c,
+	0x19,
+	0xb8,
+	0x40,
+	0xd4,
+	0x26,
+	0xb6,
+	0x95,
+	0x11,
+	0x92,
+	0xee,
+	0xe4,
+	0xe6,
+	0xd2,
+	0xe7,
+	0x80,
+	0x34,
+	0x41,
+	0x0d,
+	0x19,
+	0x88,
+	0x50,
+	0x21,
+	0xa9,
+	0x82,
+	0x88,
+	0xdb,
+	0x94,
+	0xee,
+	0xdc,
+	0xd9,
+	0xf3,
+	0x87,
+	0x00,
+	0x98,
+	0x4f,
+	0xd1,
+	0x4d,
+	0x03,
+	0x9a,
+	0x83,
+	0xc1,
+	0x81,
+	0x08,
+	0x12,
+	0xb4,
+	0x2a,
+	0xd0,
+	0xca,
+	0x15,
+	0xda,
+	0x81,
+	0x3f,
+	0x07,
+	0x06,
+	0x40,
+	0x80,
+	0x2a,
+	0x6f,
+	0x84,
+	0x81,
+	0x03,
+	0x07,
+	0x24,
+	0xa4,
+	0xdd,
+	0xaa,
+	0x36,
+	0xcb,
+	0x82,
+	0xb7,
+	0x7f,
+	0xd4,
+	0xcc,
+	0x0d,
+	0x54,
+	0x57,
+	0x84,
+	0x81,
+	0x62,
+	0x07,
+	0x2a,
+	0x34,
+	0x50,
+	0xab,
+	0x54,
+	0xc1,
+	0x00,
+	0xbc,
+	0x81,
+	0x95,
+	0xcd,
+	0x8d,
+	0xfa,
+	0xea,
+	0x70,
+	0x03,
+	0xbc,
+	0xd6,
+	0x1a,
+	0x4c,
+	0x4d,
+	0x1a,
+	0xc0,
+	0x66,
+	0xca,
+	0xc7,
+	0x07,
+	0xfe,
+	0x8d,
+	0x6b,
+	0x50,
+	0x20,
+	0xb3,
+	0x66,
+	0x83,
+	0xe9,
+	0xb2,
+	0xc5,
+	0x05,
+	0x2d,
+	0x5a,
+	0xd8,
+	0xe1,
+	0x00,
+	0x99,
+	0x45,
+	0xe7,
+	0xc3,
+	0x9b,
+	0xad,
+	0xb5,
+	0xc9,
+	0x06,
+	0xb0,
+	0x35,
+	0xb7,
+	0x4e,
+	0x47,
+	0x1b,
+	0xef,
+	0x01,
+	0xca,
+	0x1b,
+	0x9f,
+	0x50,
+	0x06,
+	0x4a,
+	0xce,
+	0xac,
+	0x6f,
+	0xdf,
+	0xc0,
+	0x0b,
+	0x9f,
+	0xc8,
+	0x5d,
+	0x8c,
+	0x81,
+	0xf3,
+	0xe7,
+	0x49,
+	0x94,
+	0xbf,
+	0x68,
+	0x45,
+	0x3c,
+	0x9d,
+	0xf4,
+	0xeb,
+	0xd8,
+	0x69,
+	0x84,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0e,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x0b,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0xfc,
+	0x1a,
+	0x86,
+	0x6c,
+	0xdf,
+	0xae,
+	0xb1,
+	0x10,
+	0x35,
+	0xee,
+	0xff,
+	0x22,
+	0xdd,
+	0xae,
+	0x17,
+	0x28,
+	0x02,
+	0x8f,
+	0xb3,
+	0xc5,
+	0xf0,
+	0x13,
+	0x38,
+	0x4c,
+	0x26,
+	0x01,
+	0xa4,
+	0x54,
+	0xa5,
+	0x1b,
+	0x10,
+	0xa2,
+	0xce,
+	0x27,
+	0x74,
+	0xca,
+	0x2d,
+	0x55,
+	0xaf,
+	0xcd,
+	0x27,
+	0x65,
+	0xdb,
+	0x2d,
+	0x1b,
+	0x06,
+	0xd6,
+	0x6b,
+	0x65,
+	0x42,
+	0x19,
+	0x47,
+	0xcb,
+	0xe6,
+	0x74,
+	0xa0,
+	0x62,
+	0xb1,
+	0x50,
+	0x2c,
+	0x6f,
+	0x54,
+	0x91,
+	0x06,
+	0x8f,
+	0x19,
+	0x08,
+	0x04,
+	0x10,
+	0x73,
+	0x13,
+	0x75,
+	0x64,
+	0x24,
+	0x34,
+	0x34,
+	0x09,
+	0x8a,
+	0x09,
+	0x3d,
+	0x7d,
+	0x2d,
+	0x7f,
+	0x81,
+	0x83,
+	0x6c,
+	0x86,
+	0x1f,
+	0x06,
+	0x08,
+	0x8b,
+	0x8b,
+	0x02,
+	0x02,
+	0x8c,
+	0x8e,
+	0x8f,
+	0x81,
+	0x82,
+	0x05,
+	0x6b,
+	0x14,
+	0x15,
+	0x79,
+	0x01,
+	0x0a,
+	0x0a,
+	0x02,
+	0x03,
+	0x4a,
+	0x0b,
+	0x09,
+	0x0b,
+	0x9a,
+	0x9c,
+	0x9d,
+	0x54,
+	0x10,
+	0xb3,
+	0x01,
+	0x05,
+	0xa1,
+	0x13,
+	0xa4,
+	0x22,
+	0xa6,
+	0xa7,
+	0x0a,
+	0xab,
+	0x4a,
+	0x9a,
+	0xaf,
+	0x8d,
+	0xb1,
+	0x5e,
+	0x0c,
+	0x0b,
+	0xb4,
+	0x07,
+	0xb6,
+	0x15,
+	0x05,
+	0x01,
+	0x06,
+	0xbb,
+	0xbc,
+	0xbe,
+	0x09,
+	0x9a,
+	0x03,
+	0x9b,
+	0xb0,
+	0xc3,
+	0x87,
+	0x0c,
+	0xa7,
+	0xcb,
+	0x08,
+	0x03,
+	0xb6,
+	0x9a,
+	0x0e,
+	0xbc,
+	0xe0,
+	0xab,
+	0xad,
+	0x02,
+	0xae,
+	0x9b,
+	0xc2,
+	0xd6,
+	0x06,
+	0x0c,
+	0x0d,
+	0x0d,
+	0xa8,
+	0xd2,
+	0x68,
+	0xd3,
+	0xdf,
+	0xe0,
+	0xcf,
+	0x4a,
+	0xd1,
+	0xe5,
+	0xd5,
+	0xd6,
+	0x95,
+	0xea,
+	0xeb,
+	0xa9,
+	0xef,
+	0xef,
+	0xf1,
+	0xf2,
+	0xbd,
+	0xe8,
+	0xfd,
+	0x22,
+	0x30,
+	0xe0,
+	0x5e,
+	0xac,
+	0x00,
+	0xfa,
+	0x1a,
+	0xb8,
+	0xeb,
+	0x37,
+	0xe0,
+	0x1f,
+	0x40,
+	0x25,
+	0xaa,
+	0x5c,
+	0x11,
+	0x1c,
+	0xd0,
+	0x0c,
+	0x1f,
+	0x42,
+	0x07,
+	0xfb,
+	0xd0,
+	0x14,
+	0xe9,
+	0xe7,
+	0x50,
+	0x9e,
+	0x2f,
+	0x89,
+	0x68,
+	0xce,
+	0xe4,
+	0xe9,
+	0x14,
+	0xc0,
+	0x81,
+	0x49,
+	0x07,
+	0xa9,
+	0xd6,
+	0x36,
+	0x72,
+	0x3c,
+	0x15,
+	0x01,
+	0x60,
+	0xc4,
+	0x1d,
+	0x02,
+	0x26,
+	0x8a,
+	0xb4,
+	0x56,
+	0xf2,
+	0x64,
+	0x4a,
+	0x86,
+	0x02,
+	0xe2,
+	0xb5,
+	0x94,
+	0x17,
+	0xf1,
+	0x00,
+	0xa0,
+	0x03,
+	0x03,
+	0x20,
+	0xcc,
+	0x1c,
+	0x56,
+	0xd3,
+	0x24,
+	0xc3,
+	0x77,
+	0x39,
+	0x59,
+	0x2a,
+	0x55,
+	0x80,
+	0x86,
+	0x80,
+	0x4f,
+	0x40,
+	0x68,
+	0x84,
+	0x8e,
+	0x24,
+	0x69,
+	0x72,
+	0x5d,
+	0x83,
+	0xa3,
+	0x39,
+	0x75,
+	0x46,
+	0xd8,
+	0x7a,
+	0x4a,
+	0x15,
+	0xa0,
+	0x89,
+	0x51,
+	0x2b,
+	0xd2,
+	0x5c,
+	0x37,
+	0x61,
+	0x67,
+	0xbf,
+	0xac,
+	0x3b,
+	0xb7,
+	0x72,
+	0xb5,
+	0xb2,
+	0xa3,
+	0xdf,
+	0x81,
+	0x03,
+	0xe7,
+	0x86,
+	0x19,
+	0xb8,
+	0x40,
+	0xb7,
+	0x25,
+	0x3f,
+	0xb4,
+	0x5c,
+	0x15,
+	0xa8,
+	0x65,
+	0xfa,
+	0x16,
+	0x0d,
+	0xd0,
+	0x01,
+	0x6f,
+	0xe3,
+	0xc6,
+	0x32,
+	0x10,
+	0xa1,
+	0x02,
+	0xd7,
+	0x93,
+	0x26,
+	0xf5,
+	0x72,
+	0xdd,
+	0x1a,
+	0xa0,
+	0xa5,
+	0xc6,
+	0xbe,
+	0x7e,
+	0xa7,
+	0xe2,
+	0x6b,
+	0x46,
+	0x83,
+	0xc1,
+	0x81,
+	0x08,
+	0x12,
+	0xd4,
+	0xb6,
+	0x6c,
+	0x59,
+	0xa4,
+	0xb3,
+	0xe7,
+	0xb7,
+	0xa0,
+	0x25,
+	0xe3,
+	0x1b,
+	0x61,
+	0xe0,
+	0xad,
+	0x84,
+	0xcc,
+	0x69,
+	0x45,
+	0x37,
+	0x29,
+	0xf2,
+	0xd6,
+	0xc8,
+	0xe8,
+	0x13,
+	0x06,
+	0xd6,
+	0x1d,
+	0xa8,
+	0xd0,
+	0x40,
+	0xad,
+	0x68,
+	0x5d,
+	0xad,
+	0x0f,
+	0xb8,
+	0x7e,
+	0x7d,
+	0x48,
+	0xf6,
+	0x01,
+	0xab,
+	0x0d,
+	0x04,
+	0x93,
+	0x58,
+	0xad,
+	0xfb,
+	0x36,
+	0xba,
+	0x75,
+	0x05,
+	0x80,
+	0x07,
+	0x6f,
+	0x51,
+	0x64,
+	0x9d,
+	0x71,
+	0xb9,
+	0x34,
+	0x94,
+	0x0b,
+	0x3f,
+	0x11,
+	0xc0,
+	0x39,
+	0x6f,
+	0x13,
+	0x88,
+	0x10,
+	0xc5,
+	0xd8,
+	0x7d,
+	0xbd,
+	0xbb,
+	0xf7,
+	0xef,
+	0xe0,
+	0xc3,
+	0x8b,
+	0x1f,
+	0x4f,
+	0xde,
+	0x7b,
+	0x08,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0e,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x09,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0x7f,
+	0x1b,
+	0x06,
+	0x9f,
+	0x50,
+	0x65,
+	0x58,
+	0x10,
+	0x82,
+	0xc3,
+	0xe4,
+	0xa8,
+	0x68,
+	0x44,
+	0x06,
+	0x9e,
+	0x4a,
+	0x1f,
+	0xf3,
+	0xf8,
+	0x09,
+	0x1c,
+	0x26,
+	0x93,
+	0x40,
+	0x94,
+	0x57,
+	0x1c,
+	0x10,
+	0xb4,
+	0x57,
+	0x6c,
+	0x76,
+	0xab,
+	0xeb,
+	0x7e,
+	0xad,
+	0x58,
+	0xca,
+	0x98,
+	0x8c,
+	0x33,
+	0x0c,
+	0xbc,
+	0xdf,
+	0xca,
+	0x84,
+	0xa2,
+	0xd6,
+	0xa6,
+	0x9e,
+	0x01,
+	0x20,
+	0x9b,
+	0x08,
+	0x0f,
+	0x54,
+	0x2c,
+	0x16,
+	0x14,
+	0x16,
+	0x76,
+	0x25,
+	0x40,
+	0x06,
+	0x09,
+	0x88,
+	0x88,
+	0x48,
+	0x7b,
+	0x26,
+	0x06,
+	0x04,
+	0x04,
+	0x10,
+	0x7e,
+	0x13,
+	0x80,
+	0x6b,
+	0x4b,
+	0x08,
+	0x89,
+	0x89,
+	0x02,
+	0x02,
+	0x09,
+	0x8b,
+	0x8c,
+	0x4b,
+	0x8f,
+	0x91,
+	0x72,
+	0x73,
+	0x95,
+	0x55,
+	0x0a,
+	0x0a,
+	0x02,
+	0x03,
+	0x0b,
+	0xaa,
+	0x09,
+	0x0b,
+	0x9a,
+	0x9c,
+	0x9e,
+	0x24,
+	0x8e,
+	0x10,
+	0x91,
+	0x05,
+	0x72,
+	0x14,
+	0x15,
+	0x76,
+	0x4f,
+	0xa6,
+	0xa6,
+	0xaa,
+	0xbd,
+	0x9a,
+	0xae,
+	0x9d,
+	0x8c,
+	0x06,
+	0xb3,
+	0xb4,
+	0xb5,
+	0x13,
+	0xb8,
+	0xa5,
+	0xbb,
+	0xbc,
+	0xbd,
+	0x09,
+	0x9a,
+	0x03,
+	0x9b,
+	0xaf,
+	0x9e,
+	0x06,
+	0x0c,
+	0x0b,
+	0xb3,
+	0x56,
+	0x05,
+	0xb5,
+	0x05,
+	0x79,
+	0xca,
+	0xca,
+	0xcc,
+	0xad,
+	0xad,
+	0x9b,
+	0xc1,
+	0x64,
+	0xd3,
+	0xa6,
+	0xda,
+	0x08,
+	0x03,
+	0xd8,
+	0x9a,
+	0x0e,
+	0xdc,
+	0xdd,
+	0xab,
+	0x02,
+	0xe0,
+	0xd1,
+	0x7b,
+	0xd3,
+	0x0d,
+	0x0d,
+	0xa7,
+	0xce,
+	0x6f,
+	0xcf,
+	0xeb,
+	0xec,
+	0xcb,
+	0x0b,
+	0xac,
+	0xad,
+	0x04,
+	0x03,
+	0xe2,
+	0x8d,
+	0x63,
+	0x40,
+	0xaf,
+	0x01,
+	0x2a,
+	0x7c,
+	0xf8,
+	0xf4,
+	0xed,
+	0x53,
+	0xa0,
+	0x2a,
+	0xd5,
+	0xbf,
+	0x37,
+	0x41,
+	0x08,
+	0x29,
+	0x09,
+	0x40,
+	0x90,
+	0x9e,
+	0x33,
+	0x3c,
+	0x09,
+	0x17,
+	0xf2,
+	0x53,
+	0x25,
+	0x00,
+	0xe0,
+	0x00,
+	0x03,
+	0x01,
+	0x1e,
+	0x48,
+	0x1c,
+	0x42,
+	0xd1,
+	0x81,
+	0xc5,
+	0x01,
+	0x01,
+	0xdf,
+	0x14,
+	0x3c,
+	0xc9,
+	0xa8,
+	0xd1,
+	0xa1,
+	0x91,
+	0x8e,
+	0x10,
+	0x07,
+	0x88,
+	0xdc,
+	0x12,
+	0xc0,
+	0x81,
+	0x4d,
+	0x07,
+	0xa8,
+	0xf0,
+	0x04,
+	0x60,
+	0x19,
+	0x61,
+	0x9f,
+	0xc3,
+	0x03,
+	0x8f,
+	0x0e,
+	0x0c,
+	0x80,
+	0xe0,
+	0x26,
+	0x12,
+	0xcd,
+	0x9b,
+	0x38,
+	0x51,
+	0xae,
+	0x7c,
+	0x23,
+	0x40,
+	0x5f,
+	0x4f,
+	0x53,
+	0x4f,
+	0xdf,
+	0x10,
+	0x00,
+	0xfa,
+	0xe8,
+	0x0d,
+	0x51,
+	0xa3,
+	0x47,
+	0x6f,
+	0x22,
+	0x44,
+	0xd8,
+	0x14,
+	0xaa,
+	0x82,
+	0x08,
+	0x60,
+	0x4d,
+	0xa5,
+	0x7a,
+	0xe4,
+	0xd1,
+	0x2a,
+	0x48,
+	0x36,
+	0x35,
+	0x4d,
+	0xd2,
+	0xdb,
+	0x9a,
+	0xcf,
+	0xe9,
+	0xd7,
+	0xb0,
+	0x5e,
+	0x8c,
+	0x20,
+	0x3c,
+	0x70,
+	0x40,
+	0xdc,
+	0x44,
+	0x7a,
+	0x13,
+	0xa2,
+	0xe2,
+	0x6b,
+	0xea,
+	0xe0,
+	0x69,
+	0x84,
+	0x04,
+	0x60,
+	0x13,
+	0xec,
+	0xa4,
+	0xfb,
+	0x46,
+	0xe8,
+	0x00,
+	0xba,
+	0x76,
+	0x95,
+	0x18,
+	0xb8,
+	0xc0,
+	0xb8,
+	0xe7,
+	0x41,
+	0xbe,
+	0x60,
+	0x7b,
+	0x0a,
+	0xd6,
+	0xb9,
+	0x13,
+	0x02,
+	0xe1,
+	0xc2,
+	0x23,
+	0xc7,
+	0x45,
+	0xa8,
+	0x10,
+	0x16,
+	0xe9,
+	0xba,
+	0xc8,
+	0x2a,
+	0x4d,
+	0xe0,
+	0xa1,
+	0x4b,
+	0x3a,
+	0xf3,
+	0xb8,
+	0x3c,
+	0xd3,
+	0x0e,
+	0x44,
+	0x90,
+	0x10,
+	0xb9,
+	0x67,
+	0x04,
+	0xd3,
+	0x22,
+	0x46,
+	0x1f,
+	0xc0,
+	0x0a,
+	0x6b,
+	0x09,
+	0x5d,
+	0x09,
+	0xac,
+	0x9f,
+	0xc2,
+	0x8e,
+	0x4d,
+	0xd7,
+	0x0a,
+	0xed,
+	0xda,
+	0x1f,
+	0x0c,
+	0xd0,
+	0x3b,
+	0x50,
+	0xa1,
+	0x01,
+	0xd8,
+	0xdd,
+	0x23,
+	0xac,
+	0xf8,
+	0x46,
+	0xbe,
+	0x45,
+	0x78,
+	0x03,
+	0xba,
+	0x05,
+	0x99,
+	0x27,
+	0x0f,
+	0x40,
+	0x4f,
+	0x7a,
+	0x12,
+	0xe7,
+	0x05,
+	0x0a,
+	0x36,
+	0xb0,
+	0x9e,
+	0xbc,
+	0x3a,
+	0xf0,
+	0xe0,
+	0x40,
+	0xb4,
+	0x37,
+	0x48,
+	0x7c,
+	0x87,
+	0xbb,
+	0x62,
+	0x43,
+	0x7a,
+	0xbe,
+	0xab,
+	0x5f,
+	0xcf,
+	0xbe,
+	0x45,
+	0x08,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x2e,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x07,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0x7c,
+	0xef,
+	0xff,
+	0x40,
+	0x83,
+	0x01,
+	0x48,
+	0x34,
+	0x19,
+	0x16,
+	0x84,
+	0x61,
+	0xb1,
+	0x78,
+	0x44,
+	0x2a,
+	0x03,
+	0xd0,
+	0x65,
+	0xaf,
+	0x99,
+	0xfc,
+	0x04,
+	0x0e,
+	0x93,
+	0x49,
+	0x40,
+	0xba,
+	0x3b,
+	0x0e,
+	0x08,
+	0x5b,
+	0x6c,
+	0x56,
+	0xcb,
+	0xcd,
+	0x79,
+	0xc1,
+	0xd7,
+	0x2c,
+	0x85,
+	0x5c,
+	0xbe,
+	0x19,
+	0x06,
+	0x5f,
+	0x70,
+	0x65,
+	0x42,
+	0x59,
+	0x6f,
+	0xdb,
+	0xee,
+	0x78,
+	0xa0,
+	0x62,
+	0xb1,
+	0x50,
+	0x2c,
+	0x77,
+	0x78,
+	0x35,
+	0x06,
+	0x04,
+	0x04,
+	0x10,
+	0x7b,
+	0x13,
+	0x7d,
+	0x6c,
+	0x82,
+	0x34,
+	0x84,
+	0x86,
+	0x88,
+	0x74,
+	0x8b,
+	0x8c,
+	0x32,
+	0x84,
+	0x10,
+	0x87,
+	0x05,
+	0x73,
+	0x14,
+	0x15,
+	0x81,
+	0x1f,
+	0x42,
+	0x9e,
+	0x4a,
+	0x93,
+	0x28,
+	0x06,
+	0x96,
+	0x97,
+	0x98,
+	0x13,
+	0x9b,
+	0x9d,
+	0x42,
+	0x08,
+	0x09,
+	0xac,
+	0xac,
+	0x42,
+	0xa1,
+	0x46,
+	0x0c,
+	0x0b,
+	0x96,
+	0x57,
+	0x05,
+	0x98,
+	0x05,
+	0x01,
+	0x06,
+	0x0a,
+	0xbb,
+	0x0a,
+	0x02,
+	0x03,
+	0x0b,
+	0xc0,
+	0xae,
+	0xb0,
+	0x24,
+	0x06,
+	0x0c,
+	0xbb,
+	0xb8,
+	0x08,
+	0x03,
+	0xb6,
+	0x02,
+	0x02,
+	0x0e,
+	0xbc,
+	0xbb,
+	0xc0,
+	0xc0,
+	0xcc,
+	0x09,
+	0xa0,
+	0xa1,
+	0xc5,
+	0x0d,
+	0x0d,
+	0xbd,
+	0xcc,
+	0x70,
+	0x70,
+	0xcd,
+	0xcf,
+	0x0a,
+	0xd1,
+	0xd2,
+	0x02,
+	0xd4,
+	0xc3,
+	0xd7,
+	0xd8,
+	0xbe,
+	0xdc,
+	0xdc,
+	0xce,
+	0xdf,
+	0xd1,
+	0xcc,
+	0xd3,
+	0xd5,
+	0x78,
+	0x01,
+	0x0c,
+	0xd8,
+	0x0d,
+	0xdb,
+	0x50,
+	0x01,
+	0xea,
+	0xdf,
+	0xd0,
+	0x0b,
+	0xdb,
+	0xe3,
+	0xe4,
+	0x8c,
+	0xf2,
+	0x1c,
+	0x9c,
+	0x1b,
+	0x10,
+	0x40,
+	0x01,
+	0x94,
+	0x7c,
+	0xfa,
+	0xda,
+	0xf1,
+	0x1b,
+	0x07,
+	0xaf,
+	0x4c,
+	0x00,
+	0x07,
+	0x10,
+	0x1d,
+	0xf8,
+	0xba,
+	0x87,
+	0x0f,
+	0xce,
+	0xba,
+	0x84,
+	0xcc,
+	0x16,
+	0xfe,
+	0x13,
+	0xf4,
+	0x30,
+	0xe2,
+	0xc4,
+	0x83,
+	0xdd,
+	0x2e,
+	0xb2,
+	0xfb,
+	0xc5,
+	0x8f,
+	0xc0,
+	0x80,
+	0x8d,
+	0x6d,
+	0xb9,
+	0x3a,
+	0x42,
+	0x4c,
+	0x97,
+	0xce,
+	0x5b,
+	0x04,
+	0x7d,
+	0x70,
+	0xa4,
+	0x99,
+	0x1c,
+	0x60,
+	0x80,
+	0x13,
+	0x97,
+	0x8e,
+	0xf4,
+	0x58,
+	0x0e,
+	0x68,
+	0xe6,
+	0x20,
+	0xc2,
+	0xcb,
+	0x6f,
+	0x24,
+	0x4b,
+	0xc2,
+	0x31,
+	0xf0,
+	0xc0,
+	0xe6,
+	0x92,
+	0x00,
+	0xd8,
+	0x26,
+	0xfc,
+	0x6c,
+	0x09,
+	0xd1,
+	0xe7,
+	0xcf,
+	0xa5,
+	0x24,
+	0x09,
+	0x08,
+	0x98,
+	0x49,
+	0xd4,
+	0xe8,
+	0x12,
+	0x03,
+	0x17,
+	0xb2,
+	0xbe,
+	0x44,
+	0xc7,
+	0xd3,
+	0xa9,
+	0xd7,
+	0x5d,
+	0x24,
+	0x0f,
+	0x14,
+	0x3a,
+	0x30,
+	0x00,
+	0x42,
+	0x55,
+	0x41,
+	0x06,
+	0x22,
+	0x54,
+	0xf0,
+	0xa9,
+	0x20,
+	0x22,
+	0x44,
+	0x05,
+	0x5e,
+	0x9d,
+	0x2a,
+	0xf8,
+	0xb2,
+	0x40,
+	0x6c,
+	0x21,
+	0x38,
+	0x66,
+	0xad,
+	0x4a,
+	0xa9,
+	0x29,
+	0x84,
+	0xc1,
+	0x81,
+	0x08,
+	0x12,
+	0xbe,
+	0xbe,
+	0x94,
+	0x3b,
+	0xe0,
+	0x80,
+	0xdd,
+	0x74,
+	0x66,
+	0x87,
+	0x89,
+	0x30,
+	0x60,
+	0x58,
+	0x42,
+	0xe0,
+	0xa7,
+	0x5f,
+	0x75,
+	0x1a,
+	0x3e,
+	0xd0,
+	0x70,
+	0x92,
+	0x01,
+	0x6c,
+	0x07,
+	0x2a,
+	0x34,
+	0x88,
+	0xeb,
+	0xb3,
+	0x01,
+	0xcb,
+	0xc9,
+	0x86,
+	0x2b,
+	0xa3,
+	0xc5,
+	0x7c,
+	0x80,
+	0x5e,
+	0x83,
+	0x4f,
+	0x6f,
+	0xb8,
+	0x81,
+	0x0e,
+	0xad,
+	0xb8,
+	0x13,
+	0xb6,
+	0x02,
+	0xa6,
+	0x4f,
+	0xbb,
+	0x6e,
+	0xc0,
+	0xc0,
+	0xef,
+	0x6a,
+	0xc3,
+	0x7a,
+	0xd1,
+	0x0a,
+	0x89,
+	0x3d,
+	0xe4,
+	0x32,
+	0xbd,
+	0xda,
+	0xc0,
+	0x83,
+	0x8b,
+	0xb6,
+	0x8c,
+	0x7a,
+	0x31,
+	0x6a,
+	0x8a,
+	0xc8,
+	0x5b,
+	0x2b,
+	0x87,
+	0x11,
+	0x02,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x03,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0x6a,
+	0x18,
+	0x79,
+	0x4f,
+	0x1b,
+	0x0b,
+	0x02,
+	0xcf,
+	0x47,
+	0x6c,
+	0x01,
+	0x83,
+	0xc3,
+	0x80,
+	0xb2,
+	0xc8,
+	0x2c,
+	0x1d,
+	0x85,
+	0x9f,
+	0xc0,
+	0x61,
+	0x32,
+	0x09,
+	0x34,
+	0xaf,
+	0xc0,
+	0x01,
+	0xc1,
+	0x3a,
+	0xa5,
+	0x56,
+	0xaf,
+	0xcc,
+	0xec,
+	0x56,
+	0x4a,
+	0xa5,
+	0x7c,
+	0xc1,
+	0x44,
+	0xc3,
+	0x40,
+	0xbb,
+	0xad,
+	0x4c,
+	0x28,
+	0x66,
+	0x2b,
+	0x3a,
+	0xcd,
+	0x0e,
+	0x54,
+	0x2c,
+	0x16,
+	0x8a,
+	0x45,
+	0x3e,
+	0xef,
+	0x19,
+	0x08,
+	0x04,
+	0x10,
+	0x76,
+	0x13,
+	0x78,
+	0x67,
+	0x7d,
+	0x39,
+	0x7f,
+	0x81,
+	0x83,
+	0x6f,
+	0x86,
+	0x87,
+	0x37,
+	0x7f,
+	0x10,
+	0x82,
+	0x05,
+	0x6e,
+	0x14,
+	0x15,
+	0x7c,
+	0x8e,
+	0x36,
+	0x06,
+	0x91,
+	0x92,
+	0x93,
+	0x13,
+	0x96,
+	0x98,
+	0x8f,
+	0x0c,
+	0x0b,
+	0x91,
+	0x52,
+	0x05,
+	0x93,
+	0x05,
+	0x01,
+	0x06,
+	0x97,
+	0xa0,
+	0x30,
+	0x06,
+	0x0c,
+	0x0a,
+	0x0a,
+	0xa8,
+	0x08,
+	0x03,
+	0xa6,
+	0x02,
+	0x02,
+	0x0e,
+	0x0a,
+	0xa9,
+	0x3b,
+	0x43,
+	0xac,
+	0x2b,
+	0xae,
+	0x0d,
+	0x0d,
+	0x0a,
+	0xb6,
+	0x02,
+	0x6b,
+	0x6b,
+	0xb7,
+	0xb0,
+	0x09,
+	0xc9,
+	0x09,
+	0x3b,
+	0xbd,
+	0x2a,
+	0xbf,
+	0xc0,
+	0xc4,
+	0xc5,
+	0xc5,
+	0xb8,
+	0x0a,
+	0x03,
+	0x0b,
+	0xd7,
+	0xc9,
+	0xbc,
+	0xcd,
+	0x24,
+	0x01,
+	0x0c,
+	0xc0,
+	0x0d,
+	0xb6,
+	0x03,
+	0x4a,
+	0x01,
+	0xd3,
+	0xb0,
+	0xd7,
+	0xd7,
+	0xb6,
+	0xcb,
+	0xdb,
+	0x25,
+	0xdd,
+	0x0e,
+	0xd0,
+	0xe2,
+	0xb9,
+	0xe4,
+	0x6b,
+	0xd4,
+	0xe7,
+	0xe8,
+	0x02,
+	0xea,
+	0xeb,
+	0x22,
+	0x01,
+	0x0e,
+	0xfc,
+	0x0e,
+	0xc4,
+	0xe3,
+	0xf2,
+	0x06,
+	0x50,
+	0x53,
+	0x70,
+	0x6e,
+	0xd8,
+	0x3d,
+	0x6d,
+	0xcd,
+	0xf6,
+	0xf5,
+	0xfb,
+	0xa7,
+	0xa4,
+	0xd8,
+	0x31,
+	0x58,
+	0x04,
+	0x17,
+	0x84,
+	0xbb,
+	0x87,
+	0x6f,
+	0x9b,
+	0x42,
+	0x7e,
+	0xd2,
+	0xa4,
+	0x1d,
+	0x8b,
+	0x60,
+	0x0e,
+	0x9d,
+	0xc4,
+	0x83,
+	0xf9,
+	0x14,
+	0x7e,
+	0xcb,
+	0x38,
+	0xe0,
+	0x96,
+	0x83,
+	0x08,
+	0x1c,
+	0xbf,
+	0xcd,
+	0xd9,
+	0xfa,
+	0x98,
+	0xa0,
+	0xc1,
+	0x2a,
+	0x50,
+	0x01,
+	0x80,
+	0x4d,
+	0x48,
+	0xa9,
+	0x91,
+	0x1f,
+	0xca,
+	0x94,
+	0x04,
+	0xad,
+	0x49,
+	0x24,
+	0x30,
+	0xa0,
+	0x62,
+	0x33,
+	0x03,
+	0x17,
+	0x82,
+	0x72,
+	0x8c,
+	0x66,
+	0xf2,
+	0x26,
+	0xce,
+	0x35,
+	0xe8,
+	0x78,
+	0x0e,
+	0x50,
+	0xb5,
+	0xce,
+	0x40,
+	0x84,
+	0x0a,
+	0x28,
+	0x15,
+	0xf4,
+	0xe3,
+	0xa7,
+	0xc0,
+	0x28,
+	0x2c,
+	0xa4,
+	0x49,
+	0xd7,
+	0x18,
+	0x78,
+	0xf0,
+	0x12,
+	0x93,
+	0xaa,
+	0x1d,
+	0x0c,
+	0x0e,
+	0x44,
+	0x90,
+	0x60,
+	0x95,
+	0x26,
+	0x56,
+	0x02,
+	0x02,
+	0x94,
+	0x6e,
+	0xed,
+	0xda,
+	0xcb,
+	0xc0,
+	0x81,
+	0x03,
+	0x12,
+	0xc8,
+	0xa6,
+	0x8c,
+	0x8a,
+	0xf5,
+	0x00,
+	0xa0,
+	0x03,
+	0x03,
+	0x20,
+	0xac,
+	0xcd,
+	0x37,
+	0xc2,
+	0x00,
+	0xb0,
+	0x03,
+	0x15,
+	0x1a,
+	0x18,
+	0x8d,
+	0xb0,
+	0x86,
+	0xc0,
+	0x02,
+	0xbb,
+	0x80,
+	0xd6,
+	0xe8,
+	0x65,
+	0xdb,
+	0x2b,
+	0xe6,
+	0x81,
+	0x98,
+	0xc0,
+	0x74,
+	0x15,
+	0x7b,
+	0x9b,
+	0xb8,
+	0x98,
+	0x5e,
+	0xbe,
+	0x23,
+	0x62,
+	0xe6,
+	0xfa,
+	0x36,
+	0x4e,
+	0x0d,
+	0xc9,
+	0x01,
+	0x6f,
+	0x0f,
+	0x20,
+	0x0c,
+	0x19,
+	0x0c,
+	0xb2,
+	0x1c,
+	0x35,
+	0x01,
+	0xd7,
+	0x84,
+	0x7e,
+	0x3b,
+	0x7a,
+	0x5d,
+	0xcc,
+	0x54,
+	0xc0,
+	0x78,
+	0x8c,
+	0x23,
+	0xac,
+	0x7a,
+	0xb5,
+	0x68,
+	0xcc,
+	0xdc,
+	0xac,
+	0x8c,
+	0xd3,
+	0x87,
+	0xf2,
+	0x81,
+	0xed,
+	0xd0,
+	0x8c,
+	0x71,
+	0x67,
+	0x06,
+	0xc6,
+	0xa0,
+	0xb8,
+	0x71,
+	0xe3,
+	0xad,
+	0x85,
+	0x3b,
+	0xd9,
+	0x01,
+	0xb0,
+	0xb9,
+	0xf2,
+	0xe7,
+	0x2a,
+	0x42,
+	0x00,
+	0x00,
+	0x21,
+	0xf9,
+	0x04,
+	0x09,
+	0x0c,
+	0x00,
+	0x1f,
+	0x00,
+	0x2c,
+	0x02,
+	0x00,
+	0x00,
+	0x00,
+	0x4a,
+	0x00,
+	0x28,
+	0x00,
+	0x00,
+	0x05,
+	0xfe,
+	0xe0,
+	0x27,
+	0x8e,
+	0x64,
+	0x69,
+	0x9e,
+	0x68,
+	0xaa,
+	0xae,
+	0x6c,
+	0xeb,
+	0xbe,
+	0x70,
+	0x2c,
+	0xcf,
+	0x74,
+	0x6d,
+	0xdf,
+	0x78,
+	0xae,
+	0xef,
+	0xb2,
+	0x61,
+	0xf0,
+	0x40,
+	0x97,
+	0x81,
+	0xb0,
+	0xf8,
+	0x05,
+	0x8f,
+	0xa3,
+	0x80,
+	0x52,
+	0x34,
+	0x5c,
+	0x14,
+	0x91,
+	0xc7,
+	0xc0,
+	0x64,
+	0x72,
+	0x08,
+	0x7c,
+	0x9a,
+	0x4f,
+	0x28,
+	0x4f,
+	0x3a,
+	0xa5,
+	0x7e,
+	0x02,
+	0x84,
+	0x41,
+	0x56,
+	0xab,
+	0x93,
+	0x52,
+	0xa6,
+	0x55,
+	0xb0,
+	0xd8,
+	0x48,
+	0xce,
+	0x99,
+	0xcf,
+	0x15,
+	0x70,
+	0x78,
+	0xc0,
+	0x6e,
+	0xdf,
+	0x02,
+	0x16,
+	0x8a,
+	0xc5,
+	0x12,
+	0x27,
+	0x84,
+	0xeb,
+	0x76,
+	0x31,
+	0x4a,
+	0x83,
+	0x52,
+	0x7b,
+	0x13,
+	0x71,
+	0x10,
+	0x7e,
+	0x80,
+	0x81,
+	0x2d,
+	0x4a,
+	0x02,
+	0x8f,
+	0x8f,
+	0x66,
+	0x53,
+	0x88,
+	0x8a,
+	0x8c,
+	0x30,
+	0x8e,
+	0x90,
+	0x02,
+	0x0f,
+	0x01,
+	0x15,
+	0x70,
+	0x05,
+	0x01,
+	0x10,
+	0x89,
+	0x8b,
+	0x96,
+	0x28,
+	0x06,
+	0x09,
+	0x99,
+	0x8f,
+	0x0a,
+	0x9c,
+	0x87,
+	0x05,
+	0x9f,
+	0xa1,
+	0x10,
+	0xa3,
+	0xa4,
+	0x25,
+	0xa6,
+	0xa8,
+	0x02,
+	0x0a,
+	0x06,
+	0x01,
+	0x05,
+	0x15,
+	0xad,
+	0x55,
+	0xa1,
+	0x0b,
+	0x0c,
+	0xb1,
+	0xb2,
+	0x57,
+	0x09,
+	0xa7,
+	0x03,
+	0xc4,
+	0xb6,
+	0x0a,
+	0x0e,
+	0x8f,
+	0xad,
+	0x03,
+	0x08,
+	0xb9,
+	0x0a,
+	0x0a,
+	0xc0,
+	0xc2,
+	0xa5,
+	0xa7,
+	0x02,
+	0xc6,
+	0xa9,
+	0xc9,
+	0xd6,
+	0x03,
+	0xdb,
+	0x90,
+	0x0a,
+	0x0d,
+	0x0d,
+	0xd2,
+	0xd3,
+	0x24,
+	0x01,
+	0x0d,
+	0xd5,
+	0xd7,
+	0xc8,
+	0x0e,
+	0xdb,
+	0xea,
+	0xdc,
+	0xdf,
+	0xe0,
+	0xc1,
+	0x96,
+	0x6a,
+	0x04,
+	0xda,
+	0xf2,
+	0xd0,
+	0xe9,
+	0xdb,
+	0x83,
+	0x03,
+	0x8f,
+	0xed,
+	0x0c,
+	0x56,
+	0xe2,
+	0x22,
+	0x01,
+	0xdb,
+	0xe4,
+	0xa9,
+	0x43,
+	0xa7,
+	0x4e,
+	0x89,
+	0xaa,
+	0x7c,
+	0xdf,
+	0x1c,
+	0xf0,
+	0xf3,
+	0xf7,
+	0x2f,
+	0xa0,
+	0xb6,
+	0x6d,
+	0xf5,
+	0x0a,
+	0xe2,
+	0x13,
+	0xe0,
+	0xa0,
+	0xa2,
+	0x83,
+	0x7e,
+	0xfe,
+	0x00,
+	0x0e,
+	0x10,
+	0xa8,
+	0xae,
+	0xde,
+	0xc3,
+	0x89,
+	0x16,
+	0x2f,
+	0x32,
+	0xfc,
+	0x02,
+	0x61,
+	0xc0,
+	0x81,
+	0x75,
+	0x10,
+	0x9c,
+	0x95,
+	0xa1,
+	0x54,
+	0x17,
+	0x12,
+	0xa3,
+	0x38,
+	0x50,
+	0x2b,
+	0xb7,
+	0x45,
+	0xa8,
+	0xf8,
+	0x60,
+	0x65,
+	0xbb,
+	0x8a,
+	0x2e,
+	0xa7,
+	0xc1,
+	0xdc,
+	0x38,
+	0x07,
+	0xe2,
+	0xcc,
+	0x07,
+	0x0f,
+	0x07,
+	0x40,
+	0x8b,
+	0x30,
+	0xe1,
+	0x5b,
+	0xce,
+	0x69,
+	0x06,
+	0x0e,
+	0x1c,
+	0xf0,
+	0x33,
+	0x67,
+	0x68,
+	0x84,
+	0x07,
+	0x50,
+	0xb9,
+	0x29,
+	0x88,
+	0x70,
+	0xa1,
+	0xea,
+	0x3b,
+	0x4b,
+	0x49,
+	0x95,
+	0x32,
+	0x95,
+	0x19,
+	0x21,
+	0x42,
+	0xb2,
+	0x90,
+	0x53,
+	0x23,
+	0x54,
+	0x88,
+	0x70,
+	0x15,
+	0xab,
+	0xd2,
+	0xa5,
+	0x7e,
+	0x06,
+	0x78,
+	0xed,
+	0xda,
+	0x55,
+	0x42,
+	0x84,
+	0x03,
+	0xc0,
+	0x70,
+	0x95,
+	0x85,
+	0x17,
+	0xe0,
+	0x2c,
+	0xd3,
+	0x07,
+	0x4e,
+	0x25,
+	0x48,
+	0x50,
+	0x3a,
+	0x57,
+	0xe7,
+	0x59,
+	0xbb,
+	0x01,
+	0xf0,
+	0x42,
+	0x1d,
+	0xdc,
+	0x57,
+	0x98,
+	0x92,
+	0x34,
+	0x4a,
+	0x7c,
+	0x08,
+	0x56,
+	0xf2,
+	0xa0,
+	0xc1,
+	0xd1,
+	0x91,
+	0x49,
+	0x94,
+	0xf6,
+	0x0b,
+	0x80,
+	0x0b,
+	0xef,
+	0x64,
+	0x6f,
+	0x8f,
+	0x21,
+	0x07,
+	0x50,
+	0x95,
+	0x64,
+	0x40,
+	0x60,
+	0xce,
+	0x5f,
+	0x30,
+	0x43,
+	0x3e,
+	0xb1,
+	0x64,
+	0xdc,
+	0x67,
+	0x8c,
+	0xe4,
+	0x32,
+	0x8f,
+	0x26,
+	0x9d,
+	0xb3,
+	0xf4,
+	0xea,
+	0xd7,
+	0xb0,
+	0xed,
+	0x84,
+	0x00,
+	0x00,
+	0x3b };
 
 #endif
 // File_checked_for_headers

amule-3.1.0.tar.gz/src/kademlia/kademlia/AICHHashList.cpp Added

@@ -0,0 +1,220 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// 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 "AICHHashList.h"
+
+#include <protocol/kad2/Constants.h> // Needed for KADEMLIA_VERSION9_50a
+
+#include <algorithm>
+
+namespace Kademlia
+{
+
+uint16_t CKadAICHHashList::AddReference(const CKadAICHHash &hash)
+{
+	for (size_t i = 0; i < m_hashes.size(); ++i) {
+		if (m_hashesi == hash) {
+			if (m_popularityi < 0xFF) {
+				m_popularityi++;
+			}
+			return (uint16_t)i;
+		}
+	}
+
+	if (m_hashes.size() >= MAX_SLOTS) {
+		// Refusing is the only safe answer: handing back a truncated index would alias an
+		// existing slot and credit this publisher's hash to a different one.
+		return INVALID_INDEX;
+	}
+
+	m_hashes.push_back(hash);
+	m_popularity.push_back(1);
+	return (uint16_t)(m_hashes.size() - 1);
+}
+
+void CKadAICHHashList::DropReferenceAt(uint16_t index)
+{
+	if (index >= m_hashes.size()) {
+		return;
+	}
+	if (m_popularityindex > 0) {
+		m_popularityindex--;
+	}
+}
+
+uint16_t CKadAICHHashList::GetReferencedCount() const
+{
+	uint16_t count = 0;
+	for (const uint16_t popularity : m_popularity) {
+		if (popularity > 0) {
+			count++;
+		}
+	}
+	return count;
+}
+
+uint8_t CKadAICHHashList::GetPopularityAt(uint16_t index) const
+{
+	return (index < m_popularity.size()) ? m_popularityindex : 0;
+}
+
+const CKadAICHHash &CKadAICHHashList::GetHashAt(uint16_t index) const
+{
+	// A zeroed hash for an out-of-range index keeps this a total function: the callers are
+	// packet and file parsers, where an index that failed validation must not turn into
+	// undefined behaviour.
+	static const CKadAICHHash s_empty = CKadAICHHash();
+	return (index < m_hashes.size()) ? m_hashesindex : s_empty;
+}
+
+std::vector<uint16_t> CKadAICHHashList::Compact()
+{
+	std::vector<uint16_t> map = BuildCompactionMap();
+
+	std::vector<CKadAICHHash> hashes;
+	std::vector<uint8_t> popularity;
+	for (size_t i = 0; i < m_hashes.size(); ++i) {
+		if (mapi != INVALID_INDEX) {
+			hashes.push_back(m_hashesi);
+			popularity.push_back(m_popularityi);
+		}
+	}
+	m_hashes.swap(hashes);
+	m_popularity.swap(popularity);
+	return map;
+}
+
+std::vector<uint16_t> CKadAICHHashList::BuildCompactionMap() const
+{
+	std::vector<uint16_t> map(m_hashes.size(), INVALID_INDEX);
+	uint16_t next = 0;
+	for (size_t i = 0; i < m_hashes.size(); ++i) {
+		if (m_popularityi > 0) {
+			mapi = next++;
+		}
+	}
+	return map;
+}
+
+std::vector<uint8_t> CKadAICHHashList::EncodeResultTag() const
+{
+	std::vector<uint8_t> encoded;
+
+	uint8_t count = 0;
+	for (size_t i = 0; i < m_hashes.size() && count < MAX_RESULT_HASHES; ++i) {
+		if (m_popularityi > 0) {
+			count++;
+		}
+	}
+	if (count == 0) {
+		return encoded;
+	}
+
+	encoded.reserve(1 + (1 + KAD_AICH_HASH_SIZE) * count);
+	encoded.push_back(count);
+	uint8_t written = 0;
+	for (size_t i = 0; i < m_hashes.size() && written < count; ++i) {
+		if (m_popularityi == 0) {
+			continue;
+		}
+		encoded.push_back(m_popularityi);
+		encoded.insert(encoded.end(), m_hashesi.begin(), m_hashesi.end());
+		written++;
+	}
+	return encoded;
+}
+
+bool CKadAICHHashList::DecodeResultTag(const uint8_t *data, size_t length, std::vector<SResultHash> &out)
+{
+	out.clear();
+	if (data == nullptr || length < 1) {
+		return false;
+	}
+
+	const uint8_t count = data0;
+	if (count > MAX_RESULT_HASHES) {
+		return false;
+	}
+	if (length < 1 + (size_t)count * (1 + KAD_AICH_HASH_SIZE)) {
+		return false;
+	}
+
+	size_t pos = 1;
+	for (uint8_t i = 0; i < count; ++i) {
+		SResultHash entry;
+		entry.m_popularity = datapos++;
+		std::copy(data + pos, data + pos + KAD_AICH_HASH_SIZE, entry.m_hash.begin());
+		pos += KAD_AICH_HASH_SIZE;
+		// A hash nobody publishes carries no information, and is what a
+		// peer that has just evicted its publishers would emit.
+		if (entry.m_popularity > 0) {
+			out.push_back(entry);
+		}
+	}
+	return true;
+}
+
+bool CKadAICHHashList::PeerSupportsAICHKeywordStorage(uint8_t peerKadVersion)
+{
+	return peerKadVersion >= KADEMLIA_VERSION9_50a;
+}
+
+const CKadAICHHashList::SResultHash *CKadAICHHashList::SelectTrusted(
+	const std::vector<SResultHash> &hashes, uint32_t publishersKnown)
+{
+	// Two rules, both eMule 0.70b's at SearchList.cpp:795-805, and both refusals rather than
+	// choices.
+	//
+	// Competing hashes for one file id mean at least one publisher is lying. Taking the most
+	// popular looks like the obvious answer and is the wrong one: popularity here is a count a
+	// peer reports about itself, so whoever is lying also controls the number that would decide
+	// the vote. Upstream ignores AICH for such a result entirely, and the destination being
+	// SetMasterHash(hash, AICH_VERIFIED) is why -- there is no "probably right" state to put a
+	// contested hash into.
+	if (hashes.size() != 1) {
+		return nullptr;
+	}
+
+	// One hash still is not enough on its own. A single publisher out of many is not agreement,
+	// it is one peer we happen to have asked, so the hash must come from at least a third of
+	// the publishers known for this file. Written as a ratio to match upstream's own arithmetic
+	// rather than restating it as a multiplication.
+	//
+	// publishersKnown == 0 is refused, which upstream guards explicitly too: its condition is
+	// byPublishers > 0 && popularity > 0 && the ratio. Worth stating because the ratio alone
+	// would pass it, 0 / anything being 0. A zero count means TAG_PUBLISHINFO was absent or
+	// zero, so there is no publisher count to be a third of, and accepting there would make a
+	// result with no corroboration at all the easiest one to get accepted.
+	const uint8_t popularity = hashes0.m_popularity;
+	if (popularity == 0 || publishersKnown == 0) {
+		return nullptr;
+	}
+	if (publishersKnown / popularity > 3) {
+		return nullptr;
+	}
+	return &hashes0;
+}
+
+} // namespace Kademlia

amule-3.1.0.tar.gz/src/kademlia/kademlia/AICHHashList.h Added

@@ -0,0 +1,151 @@
+//								-*- C++ -*-
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// 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 AICHHASHLIST_H
+#define AICHHASHLIST_H
+
+#include <array>
+#include <cstddef>
+#include <vector>
+
+#include "../../Types.h"
+
+////////////////////////////////////////
+namespace Kademlia
+{
+////////////////////////////////////////
+
+// Size of an AICH root hash in bytes. Mirrors HASHSIZE in SHAHashSet.h and is restated here on
+// purpose: keeping this translation unit free of the AICH hash-set machinery is what makes the
+// codec unit-testable on its own.
+const size_t KAD_AICH_HASH_SIZE = 20;
+
+typedef std::array<uint8_t, KAD_AICH_HASH_SIZE> CKadAICHHash;
+
+// The AICH root hashes reported for one indexed keyword entry, each with the number of publishers
+// that reported it.
+//
+// Kad protocol version 0x09 added AICH hashes to keyword storage: a publisher at 0x09 or above
+// sends its file's AICH root hash in TAG_KADAICHHASHPUB (BSOB of KAD_AICH_HASH_SIZE bytes) inside
+// KADEMLIA2_PUBLISH_KEY_REQ, and the indexing node accumulates those per entry and reports them in
+// TAG_KADAICHHASHRESULT on KADEMLIA2_SEARCH_RES. The publisher count is the interesting part: an
+// honest file has exactly one AICH hash, so several competing hashes -- or one hash with a single
+// publisher against a popular file -- is the signal a searcher wants.
+//
+// Publishers hold their hash by index, so DropReferenceAt() only decrements the popularity
+// counter and leaves the slot in place. Compact() is what actually removes the unreferenced ones
+// and renumbers, and the caller must apply the returned map to every index it holds.
+// BuildCompactionMap() is the same renumbering without the mutation, used when writing to disk.
+class CKadAICHHashList
+{
+public:
+	// The index value meaning "this publisher reported no AICH hash".  It is
+	// the same 0xFFFF sentinel that travels in the on-disk keyword index.
+	static constexpr uint16_t INVALID_INDEX = 0xFFFF;
+
+	// Kad BSOB tags carry a uint8 length. eMule holds the encoded TAG_KADAICHHASHRESULT payload
+	// to 250 bytes rather than the full 255, which caps the carried hashes at
+	// MAX_RESULT_HASHES: 1 + (1 + 20) * 11 = 232 bytes, whereas 12 hashes would need 253. The
+	// cap costs nothing in practice -- a file with more than a handful of competing AICH hashes
+	// is unusable anyway.
+	static const size_t MAX_RESULT_TAG_SIZE = 250;
+	static const uint8_t MAX_RESULT_HASHES = 11;
+
+	struct SResultHash
+	{
+		uint8_t m_popularity;
+		CKadAICHHash m_hash;
+	};
+
+	// A slot ceiling well under the 0xFFFF the index can express. With Compact() run after each
+	// merge the live count tracks the publisher list, which is capped at 100, so this is a
+	// backstop rather than a working limit: it exists so the index can never reach the
+	// INVALID_INDEX sentinel or wrap past it and alias an earlier slot.
+	static constexpr size_t MAX_SLOTS = 1024;
+
+	// Adds one reference to `hash`, creating a slot for it if needed, and returns its index, or
+	// INVALID_INDEX when the ceiling is reached. Popularity saturates at 255 because it travels
+	// the wire as a uint8.
+	uint16_t AddReference(const CKadAICHHash &hash);
+
+	// Drops one reference from the slot at `index`.  Out-of-range indexes
+	// (including INVALID_INDEX) and already-unreferenced slots are ignored.
+	void DropReferenceAt(uint16_t index);
+
+	uint16_t GetSlotCount() const { return (uint16_t)m_hashes.size(); }
+	uint16_t GetReferencedCount() const;
+	bool IsEmpty() const { return GetReferencedCount() == 0; }
+
+	// Both are only valid for `index` < GetSlotCount(); an out-of-range
+	// index yields 0 / a zeroed hash rather than undefined behaviour.
+	uint8_t GetPopularityAt(uint16_t index) const;
+	const CKadAICHHash &GetHashAt(uint16_t index) const;
+
+	// Maps each current slot index onto the index it will occupy once unreferenced slots are
+	// dropped, or INVALID_INDEX if it is dropped. Used when writing the keyword index to disk,
+	// so the stored publisher indexes stay consistent with the stored hashes.
+	std::vector<uint16_t> BuildCompactionMap() const;
+
+	// Drops every unreferenced slot and renumbers the rest, returning the same old-index to
+	// new-index map BuildCompactionMap() would. Without this the list only grows: a publisher
+	// that rotates its AICH hash leaves its previous slot behind on every republish, and the
+	// entry carries them all for as long as the process lives.
+	std::vector<uint16_t> Compact();
+
+	// Encodes the referenced hashes as a TAG_KADAICHHASHRESULT payload:
+	//   <Count 1>{<Publishers 1><AICH Hash KAD_AICH_HASH_SIZE>} Count
+	// Returns an empty buffer when nothing is referenced, so callers can skip the tag entirely.
+	std::vector<uint8_t> EncodeResultTag() const;
+
+	// Decodes a TAG_KADAICHHASHRESULT payload. Returns false and leaves `out` empty on any
+	// malformed input: a short buffer, a hash count above MAX_RESULT_HASHES, or a truncated
+	// final hash. Entries claiming zero publishers are dropped, and trailing bytes past the
+	// announced count are ignored.
+	static bool DecodeResultTag(const uint8_t *data, size_t length, std::vector<SResultHash> &out);
+
+	// The hash to trust out of a result's set, or nullptr for "none of them". Both of eMule
+	// 0.70b's rules are refusals: more than one distinct hash means at least one publisher is
+	// lying and AICH is ignored for the result, and a lone hash still has to come from at least
+	// a third of the publishers known for the file. @p publishersKnown is the middle byte of
+	// TAG_PUBLISHINFO. The destination is SetMasterHash(..., AICH_VERIFIED), which has no room
+	// for a hash that is merely ahead on a count the publisher itself supplies.
+	static const SResultHash *SelectTrusted(
+		const std::vector<SResultHash> &hashes, uint32_t publishersKnown);
+
+	// Whether a peer advertising `peerKadVersion` handles AICH hashes on keyword storage. Both
+	// directions consult this: TAG_KADAICHHASHPUB is only sent to a peer that passes, and
+	// TAG_KADAICHHASHRESULT is only honoured from a sender that passes. A version of 0 means
+	// the peer is unknown to us, which fails -- an unidentified sender gets no more credit than
+	// a pre-0x09 one.
+	static bool PeerSupportsAICHKeywordStorage(uint8_t peerKadVersion);
+
+private:
+	std::vector<CKadAICHHash> m_hashes;
+	std::vector<uint8_t> m_popularity;
+};
+
+} // namespace Kademlia
+
+#endif // AICHHASHLIST_H

amule-3.0.1.tar.gz/src/kademlia/kademlia/Defines.h -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Defines.h Changed

@@ -36,58 +36,57 @@
 there client on the eMule forum..
 */
 
-#ifndef __KAD_DEFINES_H__
-#define __KAD_DEFINES_H__
+#ifndef DEFINES_H
+#define DEFINES_H
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
-#define SEARCHTOLERANCE			16777216
-const unsigned int K	=		10;
-#define KBASE				4
-#define KK				5
-// Maxmimum number of in-flight queries during a Kad search.  At each step the
-// initiator sends FIND_VALUE to up to ALPHA_QUERY closest unqueried nodes and
-// uses the responses to expand the search frontier.  The Kademlia paper (MIT
-// 2002) uses 3-10 as the typical range; eMule's historical value of 3 is at
-// the low end and slow-converges searches for unpopular keywords.  5 keeps
-// network load modest while letting CSearch::ProcessResponse's existing
-// "in top ALPHA_QUERY closer than current" cascade maintain more parallelism.
-#define ALPHA_QUERY			5
+#define SEARCHTOLERANCE 16777216
+const unsigned int K = 10;
+#define KBASE 4
+#define KK 5
+// Maximum number of in-flight queries during a Kad search. At each step the initiator sends
+// FIND_VALUE to up to ALPHA_QUERY closest unqueried nodes and uses the responses to expand the
+// search frontier. The Kademlia paper (MIT 2002) uses 3-10 as the typical range; eMule's historical
+// value of 3 is at the low end and slow-converges searches for unpopular keywords. 5 keeps network
+// load modest while letting CSearch::ProcessResponse's existing "in top ALPHA_QUERY closer than
+// current" cascade maintain more parallelism.
+#define ALPHA_QUERY 5
 
-// Cap on user-triggered widening reasks (CSearch::RequestMoreResults).
-// Each reask asks an already-responded peer for KADEMLIA_FIND_VALUE_MORE
-// (= 11) closer contacts instead of the default 2, exposing a wider slice
-// of the routing-table neighbourhood.  Past 4 reasks the local
-// neighbourhood for a given keyword is typically exhausted (responses
-// dedupe against m_results) and additional reasks are wasted UDP traffic.
-#define KADEMLIA_FIND_VALUE_MORE_REASKS	4
-#define LOG_BASE_EXPONENT		5
-#define HELLO_TIMEOUT			20
-#define SEARCH_JUMPSTART		1
-#define SEARCH_LIFETIME			45
-#define SEARCHFILE_LIFETIME		45
-#define SEARCHKEYWORD_LIFETIME		45
-#define SEARCHNOTES_LIFETIME		45
-#define SEARCHNODE_LIFETIME		45
-#define SEARCHNODECOMP_LIFETIME		10
-#define SEARCHSTOREFILE_LIFETIME	140
-#define SEARCHSTOREKEYWORD_LIFETIME	140
-#define SEARCHSTORENOTES_LIFETIME	100
-#define SEARCHFINDBUDDY_LIFETIME	100
-#define SEARCHFINDSOURCE_LIFETIME	45
-#define SEARCHFILE_TOTAL		300
-#define SEARCHKEYWORD_TOTAL		300
-#define SEARCHNOTES_TOTAL		50
-#define SEARCHSTOREFILE_TOTAL		10
-#define SEARCHSTOREKEYWORD_TOTAL	10
-#define SEARCHSTORENOTES_TOTAL		10
-#define SEARCHNODECOMP_TOTAL		10
-#define SEARCHFINDBUDDY_TOTAL		10
-#define SEARCHFINDSOURCE_TOTAL		20
+// Cap on user-triggered widening reasks (CSearch::RequestMoreResults). Each reask asks an already-
+// responded peer for KADEMLIA_FIND_VALUE_MORE (= 11) closer contacts instead of the default 2,
+// exposing a wider slice of the routing-table neighbourhood. Past 4 reasks the local neighbourhood
+// for a keyword is typically exhausted (responses dedupe against m_results) and further reasks are
+// wasted UDP traffic.
+#define KADEMLIA_FIND_VALUE_MORE_REASKS 4
+#define LOG_BASE_EXPONENT 5
+#define HELLO_TIMEOUT 20
+#define SEARCH_JUMPSTART 1
+#define SEARCH_LIFETIME 45
+#define SEARCHFILE_LIFETIME 45
+#define SEARCHKEYWORD_LIFETIME 45
+#define SEARCHNOTES_LIFETIME 45
+#define SEARCHNODE_LIFETIME 45
+#define SEARCHNODECOMP_LIFETIME 10
+#define SEARCHSTOREFILE_LIFETIME 140
+#define SEARCHSTOREKEYWORD_LIFETIME 140
+#define SEARCHSTORENOTES_LIFETIME 100
+#define SEARCHFINDBUDDY_LIFETIME 100
+#define SEARCHFINDSOURCE_LIFETIME 45
+#define SEARCHFILE_TOTAL 300
+#define SEARCHKEYWORD_TOTAL 300
+#define SEARCHNOTES_TOTAL 50
+#define SEARCHSTOREFILE_TOTAL 10
+#define SEARCHSTOREKEYWORD_TOTAL 10
+#define SEARCHSTORENOTES_TOTAL 10
+#define SEARCHNODECOMP_TOTAL 10
+#define SEARCHFINDBUDDY_TOTAL 10
+#define SEARCHFINDSOURCE_TOTAL 20
 
-} // End namespace
+} // namespace Kademlia
 
-#endif // __KAD_DEFINES_H__
+#endif // DEFINES_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/kademlia/kademlia/Entry.cpp -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Entry.cpp Changed

@@ -48,8 +48,7 @@
 
 using namespace Kademlia;
 
-CKeyEntry::GlobalPublishIPMap	CKeyEntry::s_globalPublishIPs;
-
+CKeyEntry::GlobalPublishIPMap CKeyEntry::s_globalPublishIPs;
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////// CEntry
@@ -58,9 +57,9 @@
 	deleteTagPtrListEntries(&m_taglist);
 }
 
-CEntry* CEntry::Copy() const
+CEntry *CEntry::Copy() const
 {
-	CEntry* entry = new CEntry();
+	CEntry *entry = new CEntry();
 	for (FileNameList::const_iterator it = m_filenames.begin(); it != m_filenames.end(); ++it) {
 		entry->m_filenames.push_back(*it);
 	}
@@ -78,7 +77,35 @@
 	return entry;
 }
 
-bool CEntry::GetIntTagValue(const wxString& tagname, uint64_t& value, bool includeVirtualTags) const
+void CEntry::AddTag(CTag *tag, uint32_t dbgSourceIP)
+{
+	// Filter tags that exist for sending query results only and should never be stored, let
+	// alone sent within the taglist. TAG_PUBLISHINFO is one we build when answering a keyword
+	// search, out of our own count of distinct publishers and how much we trust them; stored, a
+	// peer-supplied one travels back out of CKeyEntry::WriteTagListWithPublishInfo() alongside
+	// our genuine value.
+	//
+	// TAG_KADAICHHASHRESULT is the same shape of tag and belongs in the same branch.
+	// Deliberately ungated: the guard's value is that it is one unconditional branch covering
+	// every caller, and filtering a tag this build never emits costs nothing. It also covers
+	// the three storing paths a handler-side filter does not -- source and notes publishing,
+	// and CIndexed::ReadFile(), which rebuilds every entry from key_index.dat with its raw
+	// taglist, so a node poisoned before this fix would reload the tag on restart and keep
+	// serving it.
+	//
+	// TAG_KADAICHHASHPUB is not here: that one is consumed into a member rather than filtered,
+	// which is the split 0.70b, 0.72a, eMuleAI and emule-qt all use.
+	if (!tag->GetName().Cmp(TAG_PUBLISHINFO) || !tag->GetName().Cmp(TAG_KADAICHHASHRESULT)) {
+		AddDebugLogLineN(logKadEntryTracking,
+			CFormat("Filtered result-only tag on storing, source %s") %
+				(dbgSourceIP ? KadIPToString(dbgSourceIP) : wxString(wxT("local"))));
+		delete tag;
+		return;
+	}
+	m_taglist.push_back(tag);
+}
+
+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) {
 		if ((*it)->IsInt() && ((*it)->GetName() == tagname)) {
@@ -98,7 +125,7 @@
 	return false;
 }
 
-wxString CEntry::GetStrTagValue(const wxString& tagname) const
+wxString CEntry::GetStrTagValue(const wxString &tagname) const
 {
 	for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end(); ++it) {
 		if (((*it)->GetName() == tagname) && (*it)->IsStr()) {
@@ -108,13 +135,12 @@
 	return "";
 }
 
-void CEntry::SetFileName(const wxString& name)
+void CEntry::SetFileName(const wxString &name)
 {
-	// Empty filenames are protocol garbage -- a peer publishing a Kad note
-	// or keyword with an empty FT_FILENAME tag should never end up in
-	// m_filenames at all.  Without this guard the empty entry takes the
-	// popularity slot, GetCommonFileName returns "" and trips its own
-	// !empty-or-list-empty invariant on the next call (issue #674).
+	// Empty filenames are protocol garbage: a peer publishing a Kad note or keyword with an
+	// empty FT_FILENAME tag should never reach m_filenames. Without this guard the empty entry
+	// takes the popularity slot, GetCommonFileName returns "" and trips its own invariant on
+	// the next call (issue #674).
 	if (name.IsEmpty()) {
 		return;
 	}
@@ -128,36 +154,24 @@
 
 wxString CEntry::GetCommonFileName() const
 {
-	// Return the filename most publishers agreed on (by popularity
-	// index).  The index isn't the actual count of publishers — just
-	// a relative number for comparing entries — so the choice is
-	// approximate.
+	// Return the filename most publishers agreed on, by popularity index. The index is not the
+	// actual count of publishers, just a relative number for comparing entries, so the choice
+	// is approximate.
 	//
-	// Seed the running max from the first entry (rather than 0) so
-	// that an all-zero m_filenames still yields a non-empty result.
-	// Our own code never produces a popularity-0 entry -- SetFileName
-	// creates at 1 and the merge path only ever increments -- but two
-	// paths we don't control can land one in m_filenames anyway:
-	// (a) a remote publisher could send a popularity-0 entry over the
-	// wire (no validation on ReadUInt32), and (b) on-disk data from
-	// any node that ran an older build doing popularity decay can
-	// load back at 0 here.  The previous "highest > 0"-style loop
-	// would then leave the result iterator at end() and return an
-	// empty string -- silently dropping TAG_FILENAME from search
-	// responses (Entry.h GetTagCount), making SearchTermsMatch
-	// return false for every term, and tripping the
-	// GetCommonFileName().IsEmpty() reject path in
-	// CIndexed::AddKeyword.  Picking the first entry as a
-	// deterministic fallback preserves the protocol invariant
-	// "non-empty m_filenames yields a non-empty common name" without
-	// changing behaviour for any case where a real winner exists.
+	// The running max is seeded from the first entry rather than 0, so an all-zero m_filenames
+	// still yields a non-empty result. Our own code never produces a popularity-0 entry, but
+	// two paths we do not control can: a remote publisher sending one over the wire (ReadUInt32
+	// does not validate), and on-disk data from a node that ran an older build doing popularity
+	// decay. A "highest > 0" loop would then leave the result iterator at end() and return an
+	// empty string, silently dropping TAG_FILENAME from search responses, making
+	// SearchTermsMatch false for every term and tripping the reject path in
+	// CIndexed::AddKeyword.
 	if (m_filenames.empty()) {
 		return wxString("");
 	}
 	FileNameList::const_iterator result = m_filenames.begin();
 	uint32_t highestPopularityIndex = result->m_popularityIndex;
-	for (FileNameList::const_iterator it = std::next(result);
-		it != m_filenames.end(); ++it) {
+	for (FileNameList::const_iterator it = std::next(result); it != m_filenames.end(); ++it) {
 		if (it->m_popularityIndex > highestPopularityIndex) {
 			highestPopularityIndex = it->m_popularityIndex;
 			result = it;
@@ -167,30 +181,46 @@
 	return result->m_filename;
 }
 
-void CEntry::WriteTagListInc(CFileDataIO* data, uint32_t increaseTagNumber)
+void CEntry::WriteTagListInc(CFileDataIO *data, uint32_t increaseTagNumber)
 {
-	// write taglist and add name + size tag
 	wxCHECK_RET(data != NULL, "data must not be NULL");
 
-	uint32_t count = GetTagCount() + increaseTagNumber;	// will include name and size tag in the count if needed
-	wxASSERT(count <= 0xFF);
+	const uint32_t wanted =
+		GetTagCount() + increaseTagNumber; // will include name and size tag in the count if needed
+
+	// The count goes on the wire as one byte, so it cannot describe more than 255 tags. Writing
+	// the truncated value and then all of them anyway is the worst of the options: the reader
+	// takes the wrapped count, stops early, and parses the remaining tags as whatever field it
+	// expected next, losing the rest of the packet. Clamp instead, so an over-full entry sends a
+	// short answer that still parses. The caller writes increaseTagNumber tags of its own after
+	// this returns, so they come out of the same budget.
+	const uint32_t count = wanted > 0xFF ? 0xFF : wanted;
+	if (wanted != count) {
+		AddDebugLogLineN(logKadEntryTracking,
+			CFormat("Kad entry has %u tags, more than the %u a search answer can "
+				"describe; dropping the surplus") %
+				wanted % count);
+	}
 	data->WriteUInt8((uint8_t)count);
 
-	if (!GetCommonFileName().IsEmpty()){
-		wxASSERT(count > m_taglist.size());
+	// What this function may write, once the caller's own tags are reserved.
+	uint32_t budget = count > increaseTagNumber ? count - increaseTagNumber : 0;
+
+	if (!GetCommonFileName().IsEmpty() && budget > 0) {
 		data->WriteTag(CTagString(TAG_FILENAME, GetCommonFileName()));
+		budget--;
 	}
-	if (m_uSize != 0){
-		wxASSERT(count > m_taglist.size());
+	if (m_uSize != 0 && budget > 0) {
 		data->WriteTag(CTagVarInt(TAG_FILESIZE, m_uSize));
+		budget--;
 	}
 
-	for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end(); ++it) {
+	for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end() && budget > 0; ++it) {
 		data->WriteTag(**it);
+		budget--;
 	}
 }
 
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////// CKeyEntry
 CKeyEntry::CKeyEntry()
@@ -203,7 +233,9 @@
 CKeyEntry::~CKeyEntry()
 {
 	if (m_publishingIPs != NULL) {
-		for (PublishingIPList::const_iterator it = m_publishingIPs->begin(); it != m_publishingIPs->end(); ++it) {
+		for (PublishingIPList::const_iterator it = m_publishingIPs->begin();
+			it != m_publishingIPs->end();
+			++it) {
 			AdjustGlobalPublishTracking(it->m_ip, false, "instance delete");
 		}
 		delete m_publishingIPs;
@@ -211,9 +243,8 @@
 	}
 }
 
-bool CKeyEntry::SearchTermsMatch(const SSearchTerm* searchTerm) const
+bool CKeyEntry::SearchTermsMatch(const SSearchTerm *searchTerm) const
 {
-	// boolean operators
 	if (searchTerm->type == SSearchTerm::AND) {
 		return SearchTermsMatch(searchTerm->left) && SearchTermsMatch(searchTerm->right);
 	}
@@ -226,18 +257,20 @@
 		return SearchTermsMatch(searchTerm->left) && !SearchTermsMatch(searchTerm->right);
 	}
 
-	// word which is to be searched in the file name (and in additional meta data as done by some ed2k servers???)
+	// word which is to be searched in the file name (and in additional meta data as done by some ed2k
+	// servers???)
 	if (searchTerm->type == SSearchTerm::String) {
 		int strSearchTerms = searchTerm->astr->GetCount();
 		if (strSearchTerms == 0) {
 			return false;
 		}
-		// if there are more than one search strings specified (e.g. "aaa bbb ccc") the entire string is handled
-		// like "aaa AND bbb AND ccc". search all strings from the string search term in the tokenized list of
-		// the file name. all strings of string search term have to be found (AND)
+		// With more than one search string (e.g. "aaa bbb ccc") the whole thing is handled
+		// as "aaa AND bbb AND ccc": every string has to be found in the tokenized file
+		// name.
 		wxString commonFileNameLower(GetCommonFileNameLowerCase());
 		for (int i = 0; i < strSearchTerms; i++) {
-			// this will not give the same results as when tokenizing the filename string, but it is 20 times faster.
+			// this will not give the same results as when tokenizing the filename string, but it
+			// is 20 times faster.
 			if (commonFileNameLower.Find((*(searchTerm->astr))i) == -1) {
 				return false;
 			}
@@ -246,30 +279,35 @@
 	}
 
 	if (searchTerm->type == SSearchTerm::MetaTag) {
-		if (searchTerm->tag->GetType() == 2) {	// meta tags with string values
+		if (searchTerm->tag->GetType() == 2) { // meta tags with string values
 			if (searchTerm->tag->GetName() == TAG_FILEFORMAT) {
 				// 21-Sep-2006 : Special handling for TAG_FILEFORMAT which is already part
-				// of the filename and thus does not need to get published nor stored explicitly,
+				// of the filename and thus does not need to get published nor stored
+				// explicitly,
 				wxString commonFileName(GetCommonFileName());
 				int ext = commonFileName.Find('.', true);
 				if (ext != wxNOT_FOUND) {
-					return commonFileName.Mid(ext + 1).CmpNoCase(searchTerm->tag->GetStr()) == 0;
+					return commonFileName.Mid(ext + 1).CmpNoCase(
+						       searchTerm->tag->GetStr()) == 0;
 				}
 			} else {
-				for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end(); ++it) {
-					if ((*it)->IsStr() && searchTerm->tag->GetName() == (*it)->GetName()) {
-						return (*it)->GetStr().CmpNoCase(searchTerm->tag->GetStr()) == 0;
+				for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end();
+					++it) {
+					if ((*it)->IsStr() &&
+						searchTerm->tag->GetName() == (*it)->GetName()) {
+						return (*it)->GetStr().CmpNoCase(searchTerm->tag->GetStr()) ==
+						       0;
 					}
 				}
 			}
 		}
 	} else if (searchTerm->type == SSearchTerm::OpGreaterEqual) {
-		if (searchTerm->tag->IsInt()) {	// meta tags with integer values
+		if (searchTerm->tag->IsInt()) { // meta tags with integer values
 			uint64_t value;
 			if (GetIntTagValue(searchTerm->tag->GetName(), value, true)) {
 				return value >= searchTerm->tag->GetInt();
 			}
-		} else if (searchTerm->tag->IsFloat()) {	// meta tags with float values
+		} else if (searchTerm->tag->IsFloat()) { // meta tags with float values
 			for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end(); ++it) {
 				if ((*it)->IsFloat() && searchTerm->tag->GetName() == (*it)->GetName()) {
 					return (*it)->GetFloat() >= searchTerm->tag->GetFloat();
@@ -277,12 +315,12 @@
 			}
 		}
 	} else if (searchTerm->type == SSearchTerm::OpLessEqual) {
-		if (searchTerm->tag->IsInt()) {	// meta tags with integer values
+		if (searchTerm->tag->IsInt()) { // meta tags with integer values
 			uint64_t value;
 			if (GetIntTagValue(searchTerm->tag->GetName(), value, true)) {
 				return value <= searchTerm->tag->GetInt();
 			}
-		} else if (searchTerm->tag->IsFloat()) {	// meta tags with float values
+		} else if (searchTerm->tag->IsFloat()) { // meta tags with float values
 			for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end(); ++it) {
 				if ((*it)->IsFloat() && searchTerm->tag->GetName() == (*it)->GetName()) {
 					return (*it)->GetFloat() <= searchTerm->tag->GetFloat();
@@ -290,12 +328,12 @@
 			}
 		}
 	} else if (searchTerm->type == SSearchTerm::OpGreater) {
-		if (searchTerm->tag->IsInt()) {	// meta tags with integer values
+		if (searchTerm->tag->IsInt()) { // meta tags with integer values
 			uint64_t value;
 			if (GetIntTagValue(searchTerm->tag->GetName(), value, true)) {
 				return value > searchTerm->tag->GetInt();
 			}
-		} else if (searchTerm->tag->IsFloat()) {	// meta tags with float values
+		} else if (searchTerm->tag->IsFloat()) { // meta tags with float values
 			for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end(); ++it) {
 				if ((*it)->IsFloat() && searchTerm->tag->GetName() == (*it)->GetName()) {
 					return (*it)->GetFloat() > searchTerm->tag->GetFloat();
@@ -303,12 +341,12 @@
 			}
 		}
 	} else if (searchTerm->type == SSearchTerm::OpLess) {
-		if (searchTerm->tag->IsInt()) {	// meta tags with integer values
+		if (searchTerm->tag->IsInt()) { // meta tags with integer values
 			uint64_t value;
 			if (GetIntTagValue(searchTerm->tag->GetName(), value, true)) {
 				return value < searchTerm->tag->GetInt();
 			}
-		} else if (searchTerm->tag->IsFloat()) {	// meta tags with float values
+		} else if (searchTerm->tag->IsFloat()) { // meta tags with float values
 			for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end(); ++it) {
 				if ((*it)->IsFloat() && searchTerm->tag->GetName() == (*it)->GetName()) {
 					return (*it)->GetFloat() < searchTerm->tag->GetFloat();
@@ -316,12 +354,12 @@
 			}
 		}
 	} else if (searchTerm->type == SSearchTerm::OpEqual) {
-		if (searchTerm->tag->IsInt()) {	// meta tags with integer values
+		if (searchTerm->tag->IsInt()) { // meta tags with integer values
 			uint64_t value;
 			if (GetIntTagValue(searchTerm->tag->GetName(), value, true)) {
 				return value == searchTerm->tag->GetInt();
 			}
-		} else if (searchTerm->tag->IsFloat()) {	// meta tags with float values
+		} else if (searchTerm->tag->IsFloat()) { // meta tags with float values
 			for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end(); ++it) {
 				if ((*it)->IsFloat() && searchTerm->tag->GetName() == (*it)->GetName()) {
 					return (*it)->GetFloat() == searchTerm->tag->GetFloat();
@@ -329,12 +367,12 @@
 			}
 		}
 	} else if (searchTerm->type == SSearchTerm::OpNotEqual) {
-		if (searchTerm->tag->IsInt()) {	// meta tags with integer values
+		if (searchTerm->tag->IsInt()) { // meta tags with integer values
 			uint64_t value;
 			if (GetIntTagValue(searchTerm->tag->GetName(), value, true)) {
 				return value != searchTerm->tag->GetInt();
 			}
-		} else if (searchTerm->tag->IsFloat()) {	// meta tags with float values
+		} else if (searchTerm->tag->IsFloat()) { // meta tags with float values
 			for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end(); ++it) {
 				if ((*it)->IsFloat() && searchTerm->tag->GetName() == (*it)->GetName()) {
 					return (*it)->GetFloat() != searchTerm->tag->GetFloat();
@@ -346,11 +384,12 @@
 	return false;
 }
 
-void CKeyEntry::AdjustGlobalPublishTracking(uint32_t ip, bool increase, const wxString& DEBUG_ONLY(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;
@@ -371,91 +410,121 @@
 	}
 #ifdef __DEBUG__
 	if (!dbgReason.IsEmpty()) {
-		AddDebugLogLineN(logKadEntryTracking, CFormat("%s %s (%s) - (%s), new count %u")
-			% (increase ? "Adding" : "Removing") % KadIPToString(ip & 0xFFFFFF00) % KadIPToString(ip) % dbgReason % count);
+		AddDebugLogLineN(logKadEntryTracking,
+			CFormat("%s %s (%s) - (%s), new count %u") % (increase ? "Adding" : "Removing") %
+				KadIPToString(ip & 0xFFFFFF00) % KadIPToString(ip) % dbgReason % count);
 	}
 #endif
 }
 
-void CKeyEntry::MergeIPsAndFilenames(CKeyEntry* fromEntry)
+void CKeyEntry::MergeIPsAndFilenames(CKeyEntry *fromEntry)
 {
-	// this is called when replacing a stored entry with a refreshed one.
-	// we want to take over the tracked IPs and the different filenames from the old entry, the rest is still
-	// "overwritten" with the refreshed values. This might be not perfect for the taglist in some cases, but we can't afford
-	// to store hundreds of taglists to figure out the best one like we do for the filenames now
-	if (m_publishingIPs != NULL) { // This instance needs to be a new entry, otherwise we don't want/need to merge
+	// Called when replacing a stored entry with a refreshed one: the tracked IPs and the
+	// different filenames are taken over from the old entry, and the rest is overwritten with
+	// the refreshed values. Not perfect for the taglist in some cases, but storing hundreds of
+	// taglists to pick the best one -- as is done for the filenames -- is not affordable.
+	if (m_publishingIPs !=
+		NULL) { // This instance needs to be a new entry, otherwise we don't want/need to merge
 		wxASSERT(fromEntry == NULL);
 		wxASSERT(!m_publishingIPs->empty());
 		wxASSERT(!m_filenames.empty());
 		return;
 	}
 
+	// Fetch the AICH root hash this publisher reported, if any, and clear our own single-slot
+	// list: from here on m_aichHashes is the *merged* list taken over from the stored entry,
+	// and the reported hash is folded into it below so the popularity counts stay right.
+	wxASSERT(m_aichHashes.GetSlotCount() <= 1);
+	bool hasNewAICHHash = (m_aichHashes.GetSlotCount() > 0);
+	CKadAICHHash newAICHHash = m_aichHashes.GetHashAt(0);
+	m_aichHashes = CKadAICHHashList();
+
 	bool refresh = false;
 	if (fromEntry == NULL || fromEntry->m_publishingIPs == NULL) {
 		wxASSERT(fromEntry == NULL);
-		// if called with NULL, this is a complete new entry and we need to initialize our lists
 		if (m_publishingIPs == NULL) {
 			m_publishingIPs = new PublishingIPList();
 		}
-		// update the global track map below
 	} else {
-		// merge the tracked IPs, add this one if not already on the list
+		m_aichHashes = fromEntry->m_aichHashes;
+
 		m_publishingIPs = fromEntry->m_publishingIPs;
 		fromEntry->m_publishingIPs = NULL;
 		bool fastRefresh = false;
-		for (PublishingIPList::iterator it = m_publishingIPs->begin(); it != m_publishingIPs->end(); ++it) {
+		for (PublishingIPList::iterator it = m_publishingIPs->begin(); it != m_publishingIPs->end();
+			++it) {
 			if (it->m_ip == m_uIP) {
 				refresh = true;
 				if ((time(NULL) - it->m_lastPublish) < (KADEMLIAREPUBLISHTIMES - HR2S(1))) {
-					AddDebugLogLineN(logKadEntryTracking, "FastRefresh publish, ip: " + KadIPToString(m_uIP));
-					fastRefresh = true; // refreshed faster than expected, will not count into filenamepopularity index
+					AddDebugLogLineN(logKadEntryTracking,
+						"FastRefresh publish, ip: " + KadIPToString(m_uIP));
+					fastRefresh = true; // refreshed faster than expected, will not count
+							    // into filenamepopularity index
 				}
 				it->m_lastPublish = time(NULL);
+
+				// Has the AICH hash this publisher reports changed? A publisher
+				// that stops reporting one (downgrade, or a hash set it can no
+				// longer vouch for) must lose its vote, or the count would keep a
+				// hash alive that nobody publishes any more.
+				if (hasNewAICHHash) {
+					if (it->m_aichHashIdx == CKadAICHHashList::INVALID_INDEX) {
+						AddDebugLogLineN(logKadEntryTracking,
+							"New AICH hash during publishing (publisher "
+							"reported none before), publisher ip: " +
+								KadIPToString(m_uIP));
+						it->m_aichHashIdx = m_aichHashes.AddReference(newAICHHash);
+					} else if (!(m_aichHashes.GetHashAt(it->m_aichHashIdx) ==
+							   newAICHHash)) {
+						AddDebugLogLineN(logKadEntryTracking,
+							"AICH hash changed, publisher ip: " +
+								KadIPToString(m_uIP));
+						m_aichHashes.DropReferenceAt(it->m_aichHashIdx);
+						it->m_aichHashIdx = m_aichHashes.AddReference(newAICHHash);
+					}
+				} else if (it->m_aichHashIdx != CKadAICHHashList::INVALID_INDEX) {
+					AddDebugLogLineN(logKadEntryTracking,
+						"AICH hash removed, publisher ip: " + KadIPToString(m_uIP));
+					m_aichHashes.DropReferenceAt(it->m_aichHashIdx);
+					it->m_aichHashIdx = CKadAICHHashList::INVALID_INDEX;
+				}
+
 				m_publishingIPs->push_back(*it);
 				m_publishingIPs->erase(it);
 				break;
 			}
 		}
 
-		// copy over trust value, in case we don't want to recalculate
 		m_trustValue = fromEntry->m_trustValue;
 		m_lastTrustValueCalc = fromEntry->m_lastTrustValueCalc;
 
-		// copy over the different names, if they are different the one we have right now
-		wxASSERT(m_filenames.size() == 1); // we should have only one name here, since it's the entry from one single source
+		wxASSERT(m_filenames.size() ==
+			 1); // we should have only one name here, since it's the entry from one single source
 		sFileNameEntry currentName = { "", 0 };
 		if (m_filenames.size() != 0) {
 			currentName = m_filenames.front();
 			m_filenames.pop_front();
 		}
 
-		// Cap m_filenames so a single CKeyEntry can't accumulate
-		// unbounded filename variants. A popular file collects one
-		// sFileNameEntry per distinct publisher-chosen name (renames,
-		// language variants, mirror prefixes, trailing-paren copies,
-		// case differences); without a cap the list grows monotonically
-		// for the lifetime of the entry, which on a long-running
-		// shareset shows up as a steady ~MB/hour RSS climb in amuled.
-		// 100 matches the m_publishingIPs cap below and is comfortably
-		// above the count of variants any honest publisher set produces
-		// for a single hash — GetCommonFileName already picks the
-		// highest-popularity entry, so the cap is shaped to keep
-		// popularity-ordered survivors.
+		// Cap m_filenames so a single CKeyEntry cannot accumulate unbounded filename
+		// variants. A popular file collects one sFileNameEntry per distinct publisher-
+		// chosen name -- renames, language variants, mirror prefixes, case differences --
+		// and without a cap the list grows monotonically for the lifetime of the entry,
+		// showing up as a steady ~MB/hour RSS climb in amuled. 100 matches the
+		// m_publishingIPs cap below and is comfortably above any honest publisher set.
 		const size_t MAX_FILENAMES = 100;
 
-		// Compare-and-skip insertion (per irwir's review of #314): if
-		// we're already at the cap, only accept the new entry when its
-		// popularity beats the weakest survivor — otherwise drop it on
-		// the floor instead of pushing then immediately re-evicting.
-		// O(N) per insert via std::min_element; no global sort needed.
-		auto pushBounded = &(const sFileNameEntry & candidate) {
+		// Compare-and-skip insertion: at the cap, a new entry is accepted only when its
+		// popularity beats the weakest survivor, rather than pushing and then immediately
+		// re-evicting. O(N) per insert via std::min_element.
+		auto pushBounded = &(const sFileNameEntry &candidate) {
 			if (m_filenames.size() < MAX_FILENAMES) {
 				m_filenames.push_back(candidate);
 				return;
 			}
-			FileNameList::iterator weakest = std::min_element(
-				m_filenames.begin(), m_filenames.end(),
-				(const sFileNameEntry & a, const sFileNameEntry & b) {
+			FileNameList::iterator weakest = std::min_element(m_filenames.begin(),
+				m_filenames.end(),
+				(const sFileNameEntry &a, const sFileNameEntry &b) {
 					return a.m_popularityIndex < b.m_popularityIndex;
 				});
 			if (candidate.m_popularityIndex > weakest->m_popularityIndex) {
@@ -466,17 +535,18 @@
 		};
 
 		bool duplicate = false;
-		for (FileNameList::iterator it = fromEntry->m_filenames.begin(); it != fromEntry->m_filenames.end(); ++it) {
+		for (FileNameList::iterator it = fromEntry->m_filenames.begin();
+			it != fromEntry->m_filenames.end();
+			++it) {
 			sFileNameEntry nameToCopy = *it;
-			// Defence-in-depth: even though SetFileName now rejects empty
-			// names, an older on-disk Kad index could still hold one from
-			// before that guard landed.  Drop it here too rather than
-			// propagating into our m_filenames.
+			// Defence-in-depth: SetFileName now rejects empty names, but an older
+			// on-disk Kad index could still hold one from before that guard landed.
 			if (nameToCopy.m_filename.IsEmpty()) {
 				continue;
 			}
 			if (currentName.m_filename.CmpNoCase(nameToCopy.m_filename) == 0) {
-				// the filename of our new entry matches with our old, increase the popularity index for the old one
+				// the filename of our new entry matches with our old, increase the popularity
+				// index for the old one
 				duplicate = true;
 				if (!fastRefresh) {
 					nameToCopy.m_popularityIndex++;
@@ -485,53 +555,74 @@
 			pushBounded(nameToCopy);
 		}
 		if (!duplicate && !currentName.m_filename.IsEmpty()) {
-			// Skip the synthetic currentName = { "", 0 } default that
-			// happens when m_filenames was unexpectedly empty above
-			// (wxASSERT fires in Debug, but Release keeps going).
+			// Skip the synthetic currentName = { "", 0 } default that happens when
+			// m_filenames was unexpectedly empty above (wxASSERT fires in Debug,
+			// Release keeps going).
 			pushBounded(currentName);
 		}
 	}
 
-	// if this was a refresh done, otherwise update the global track map
 	if (!refresh) {
 		wxASSERT(m_uIP != 0);
-		sPublishingIP add = { m_uIP, time(NULL) };
+		uint16_t aichHashIdx = hasNewAICHHash ? m_aichHashes.AddReference(newAICHHash)
+						      : CKadAICHHashList::INVALID_INDEX;
+		sPublishingIP add = { m_uIP, time(nullptr), aichHashIdx };
 		m_publishingIPs->push_back(add);
 
-		// add the publisher to the tacking list
 		AdjustGlobalPublishTracking(m_uIP, true, "new publisher");
 
-		// we keep track of max 100 IPs, in order to avoid too much time for calculation/storing/loading.
+		// we keep track of max 100 IPs, in order to avoid too much time for
+		// calculation/storing/loading.
 		if (m_publishingIPs->size() > 100) {
 			sPublishingIP curEntry = m_publishingIPs->front();
 			m_publishingIPs->pop_front();
+			m_aichHashes.DropReferenceAt(curEntry.m_aichHashIdx);
 			AdjustGlobalPublishTracking(curEntry.m_ip, false, "more than 100 publishers purge");
 		}
 
-		// since we added a new publisher, we want to (re)calculate the trust value for this entry
 		ReCalculateTrustValue();
 	}
-	AddDebugLogLineN(logKadEntryTracking, CFormat("Indexed Keyword, Refresh: %s, Current Publisher: %s, Total Publishers: %u, Total different Names: %u, TrustValue: %.2f, file: %s")
-		% (refresh ? "Yes" : "No") % KadIPToString(m_uIP) % m_publishingIPs->size() % m_filenames.size() % m_trustValue % m_uSourceID.ToHexString());
+
+	// Drop the slots no publisher points at any more and renumber the rest. DropReferenceAt()
+	// above only zeroes a popularity count, so without this the list keeps every AICH hash the
+	// entry has ever been told about: a publisher that rotates its hash each republish leaves a
+	// slot behind every time, and they accumulate for the life of the process. The publisher
+	// indexes are the only thing holding a slot, so they are remapped here in the same pass.
+	const std::vector<uint16_t> compacted = m_aichHashes.Compact();
+	for (auto &publisher : *m_publishingIPs) {
+		if (publisher.m_aichHashIdx < compacted.size()) {
+			publisher.m_aichHashIdx = compactedpublisher.m_aichHashIdx;
+		} else {
+			// INVALID_INDEX, or a stale index from a file written before the slot
+			// ceiling existed. Either way it points at no hash.
+			publisher.m_aichHashIdx = CKadAICHHashList::INVALID_INDEX;
+		}
+	}
+
+	AddDebugLogLineN(logKadEntryTracking,
+		CFormat("Indexed Keyword, Refresh: %s, Current Publisher: %s, Total Publishers: %u, Total "
+			"different Names: %u, TrustValue: %.2f, file: %s") %
+			(refresh ? "Yes" : "No") % KadIPToString(m_uIP) % m_publishingIPs->size() %
+			m_filenames.size() % m_trustValue % m_uSourceID.ToHexString());
 }
 
 void CKeyEntry::ReCalculateTrustValue()
 {
-#define PUBLISHPOINTSSPERSUBNET	10.0
-	// The trustvalue is supposed to be an indicator how trustworthy/important (or spammy) this entry is and lies between 0 and ~10000,
-	// but mostly we say everything below 1 is bad, everything above 1 is good. It is calculated by looking at how many different
-	// IPs/24 have published this entry and how many entries each of those IPs have.
-	// Each IP/24 has x (say 3) points. This means if one IP publishes 3 different entries without any other IP publishing those entries,
-	// each of those entries will have 3 / 3 = 1 Trustvalue. That's fine. If it publishes 6 alone, each entry has 3 / 6 = 0.5 trustvalue - not so good
-	// However if there is another publisher for entry 5, which only publishes this entry then we have 3/6 + 3/1 = 3.5 trustvalue for this entry
+#define PUBLISHPOINTSSPERSUBNET 10.0
+	// The trust value indicates how trustworthy or spammy this entry is. It lies between 0 and
+	// ~10000, but the useful reading is that below 1 is bad and above 1 is good. It comes from
+	// how many different IPs/24 published this entry and how many entries each of those IPs
+	// has: each IP/24 has 3 points, so one IP publishing 3 entries alone gives each 3/3 = 1,
+	// publishing 6 gives each 0.5, and a second publisher of one of them raises that one to 3/6
+	// + 3/1 = 3.5.
 	//
-	// What's the point? With this rating we try to avoid getting spammed with entries for a given keyword by a small IP range, which blends out
-	// all other entries for this keyword do to its amount as well as giving an indicator for the searcher. So if we are the node to index "Knoppix", and someone
-	// from 1 IP publishes 500 times "knoppix casino 500% bonus.txt", all those entries will have a trustvalue of 0.006 and we make sure that
-	// on search requests for knoppix, those entries are only returned after all entries with a trustvalue > 1 were sent (if there is still space).
+	// The point is to avoid being spammed for a given keyword by a small IP range, which would
+	// otherwise blot out every other entry. If we index "Knoppix" and one IP publishes 500
+	// variants of "knoppix casino 500% bonus.txt", those score 0.006 and are only returned
+	// after everything above 1.
 	//
-	// Its important to note that entry with < 1 do NOT get ignored or singled out, this only comes into play if we have 300 more results for
-	// a search request rating > 1
+	// Entries below 1 are NOT ignored or singled out; the rating only comes into play once
+	// there are more results for a request than there is space for.
 	wxCHECK_RET(m_publishingIPs != NULL, "No publishing IPs?");
 
 	m_lastTrustValueCalc = ::GetTickCount64();
@@ -540,7 +631,8 @@
 	for (PublishingIPList::iterator it = m_publishingIPs->begin(); it != m_publishingIPs->end(); ++it) {
 		sPublishingIP curEntry = *it;
 		uint32_t count = 0;
-		GlobalPublishIPMap::const_iterator itMap = s_globalPublishIPs.find(curEntry.m_ip & 0xFFFFFF00 /* /24 netmask, take care of endian if needed*/);
+		GlobalPublishIPMap::const_iterator itMap = s_globalPublishIPs.find(
+			curEntry.m_ip & 0xFFFFFF00 /* /24 netmask, take care of endian if needed*/);
 		if (itMap != s_globalPublishIPs.end()) {
 			count = itMap->second;
 		}
@@ -555,7 +647,8 @@
 
 double CKeyEntry::GetTrustValue()
 {
-	// update if last calculation is too old, will assert if this entry is not supposed to have a trustvalue
+	// update if last calculation is too old, will assert if this entry is not supposed to have a
+	// trustvalue
 	if (::GetTickCount64() - m_lastTrustValueCalc > MIN2MS(10)) {
 		ReCalculateTrustValue();
 	}
@@ -570,10 +663,13 @@
 
 	time_t now = time(NULL);
 	while (!m_publishingIPs->empty()) {
-		// entries are ordered, older ones first
 		sPublishingIP curEntry = m_publishingIPs->front();
 		if (now - curEntry.m_lastPublish > KADEMLIAREPUBLISHTIMEK) {
 			AdjustGlobalPublishTracking(curEntry.m_ip, false, "cleanup");
+			// An expired publisher loses its AICH vote with everything else; without
+			// this the hash would outlive every publisher that ever reported it and
+			// keep being handed to searchers.
+			m_aichHashes.DropReferenceAt(curEntry.m_aichHashIdx);
 			m_publishingIPs->pop_front();
 		} else {
 			break;
@@ -581,9 +677,35 @@
 	}
 }
 
-void CKeyEntry::WritePublishTrackingDataToFile(CFileDataIO* data)
+void CKeyEntry::SetPublishedAICHHash(const CKadAICHHash &hash)
 {
-	// format: <Names_Count 4><{<Name string><PopularityIndex 4>} Names_Count><PublisherCount 4><{<IP 4><Time 4>} PublisherCount>
+	m_aichHashes.AddReference(hash);
+}
+
+void CKeyEntry::WritePublishTrackingDataToFile(CFileDataIO *data)
+{
+	// format: <AICH_HashCount 2><{<AICH Hash 20>} AICH_HashCount>
+	//         <Names_Count 4><{<Name string><PopularityIndex 4>} Names_Count>
+	//         <PublisherCount 4><{<IP 4><Time 4><AICH Idx 2>} PublisherCount>
+	//
+	// Only referenced hashes are written, so the stored indexes are the compacted ones --
+	// otherwise a hash whose last publisher expired would be reloaded with a popularity of zero
+	// for ever.
+	//
+	// Gated together with the keyword-index version in CIndexed: with the gate off we write a
+	// version-3 file with neither the AICH block nor the per-publisher index, which is
+	// byte-for-byte what upstream writes and what an upstream binary can read back.
+#ifdef ENABLE_KAD_PROTOCOL_10
+	const std::vector<uint16_t> newIndexes = m_aichHashes.BuildCompactionMap();
+	data->WriteUInt16(m_aichHashes.GetReferencedCount());
+	for (uint16_t i = 0; i < m_aichHashes.GetSlotCount(); i++) {
+		if (newIndexesi != CKadAICHHashList::INVALID_INDEX) {
+			const CKadAICHHash &hash = m_aichHashes.GetHashAt(i);
+			data->Write(hash.data(), hash.size());
+		}
+	}
+#endif
+
 	data->WriteUInt32((uint32_t)m_filenames.size());
 	for (FileNameList::const_iterator it = m_filenames.begin(); it != m_filenames.end(); ++it) {
 		data->WriteString(it->m_filename, utf8strRaw, 2);
@@ -592,10 +714,19 @@
 
 	if (m_publishingIPs != NULL) {
 		data->WriteUInt32((uint32_t)m_publishingIPs->size());
-		for (PublishingIPList::const_iterator it = m_publishingIPs->begin(); it != m_publishingIPs->end(); ++it) {
+		for (PublishingIPList::const_iterator it = m_publishingIPs->begin();
+			it != m_publishingIPs->end();
+			++it) {
 			wxASSERT(it->m_ip != 0);
 			data->WriteUInt32(it->m_ip);
 			data->WriteUInt32((uint32_t)it->m_lastPublish);
+#ifdef ENABLE_KAD_PROTOCOL_10
+			uint16_t idx = CKadAICHHashList::INVALID_INDEX;
+			if (it->m_aichHashIdx != CKadAICHHashList::INVALID_INDEX) {
+				idx = newIndexesit->m_aichHashIdx;
+			}
+			data->WriteUInt16(idx);
+#endif
 		}
 	} else {
 		wxFAIL;
@@ -603,9 +734,26 @@
 	}
 }
 
-void CKeyEntry::ReadPublishTrackingDataFromFile(CFileDataIO* data)
+void CKeyEntry::ReadPublishTrackingDataFromFile(CFileDataIO *data, bool includesAICH)
 {
-	// format: <Names_Count 4><{<Name string><PopularityIndex 4>} Names_Count><PublisherCount 4><{<IP 4><Time 4>} PublisherCount>
+	// format: <AICH_HashCount 2><{<AICH Hash 20>} AICH_HashCount>
+	//         <Names_Count 4><{<Name string><PopularityIndex 4>} Names_Count>
+	//         <PublisherCount 4><{<IP 4><Time 4><AICH Idx 2>} PublisherCount>
+	//
+	// The AICH block and the per-publisher index only exist from keyword-index
+	// version 4 onwards; an older file loads with no hashes at all, which is
+	// the same state as an entry only pre-0x09 peers ever published.
+	wxASSERT(m_aichHashes.GetSlotCount() == 0);
+	std::vector<CKadAICHHash> loadedHashes;
+	if (includesAICH) {
+		uint16_t hashCount = data->ReadUInt16();
+		for (uint16_t i = 0; i < hashCount; i++) {
+			CKadAICHHash hash;
+			data->Read(hash.data(), hash.size());
+			loadedHashes.push_back(hash);
+		}
+	}
+
 	wxASSERT(m_filenames.empty());
 	uint32_t nameCount = data->ReadUInt32();
 	for (uint32_t i = 0; i < nameCount; i++) {
@@ -627,33 +775,45 @@
 		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
+		wxASSERT(
+			dbgLastTime <= (uint32_t)toAdd.m_lastPublish); // should always be sorted oldest first
 		dbgLastTime = toAdd.m_lastPublish;
 #endif
 
+		// Re-attach this publisher to its AICH hash, rebuilding the popularity counts as we
+		// go. An index pointing past the hashes we just read means a corrupt or truncated
+		// file, so drop the hash rather than the whole entry.
+		toAdd.m_aichHashIdx = CKadAICHHashList::INVALID_INDEX;
+		if (includesAICH) {
+			uint16_t storedIdx = data->ReadUInt16();
+			if (storedIdx != CKadAICHHashList::INVALID_INDEX) {
+				if (storedIdx >= loadedHashes.size()) {
+					AddDebugLogLineC(logKadEntryTracking,
+						"CKeyEntry::ReadPublishTrackingDataFromFile - out of range "
+						"AICH hash index while loading keywords");
+				} else {
+					toAdd.m_aichHashIdx =
+						m_aichHashes.AddReference(loadedHashesstoredIdx);
+				}
+			}
+		}
+
 		AdjustGlobalPublishTracking(toAdd.m_ip, true, "");
 
 		m_publishingIPs->push_back(toAdd);
 	}
 	ReCalculateTrustValue();
-// #ifdef __DEBUG__
-//	if (GetTrustValue() < 1.0) {
-//		AddDebugLogLineN(logKadEntryTracking,CFormat("Loaded %u different names, %u different publishIPs (trustvalue = %.2f) for file %s")
-//			% nameCount % ipCount % GetTrustValue() % m_uSourceID.ToHexString());
-//	}
-// #endif
 }
 
 void CKeyEntry::DirtyDeletePublishData()
 {
-	// instead of deleting our publishers properly in the destructor with decreasing the count in the global map
-	// we just remove them, and trust that the caller in the end also resets the global map, so the
-	// kad shutdown is speed up a bit
+	// Publishers are removed rather than properly deleted with a global-map decrement; the
+	// caller resets the global map anyway, and this speeds Kad shutdown up a little.
 	delete m_publishingIPs;
 	m_publishingIPs = NULL;
 }
 
-void CKeyEntry::WriteTagListWithPublishInfo(CFileDataIO* data)
+void CKeyEntry::WriteTagListWithPublishInfo(CFileDataIO *data)
 {
 	if (m_publishingIPs == NULL || m_publishingIPs->empty()) {
 		wxFAIL;
@@ -661,11 +821,24 @@
 		return;
 	}
 
-	// here we add a tag including how many publishers this entry has, the trustvalue and how many different names are known
-	// this is supposed to get used in later versions as an indicator for the user how valid this result is (of course this tag
-	// alone cannot be trusted 100%, because we could be a bad node, but it's a part of the puzzle)
-
-	WriteTagListInc(data, 1); // write the standard taglist but increase the tagcount by one
+	// A tag carrying this entry's publisher count, trust value and number of known names, as an
+	// indicator of how valid the result is. Not trustworthy on its own -- we could be a bad
+	// node -- but part of the puzzle.
+
+	// One tag for TAG_PUBLISHINFO, plus TAG_KADAICHHASHRESULT if we have any AICH hash to
+	// report. The AICH tag is written unconditionally rather than per requester because a Kad
+	// search request carries no version byte: pre-0x09 peers skip the unknown tag, and it is
+	// the *receiver* that gates on the sender's advertised version (see
+	// CSearch::ProcessResultKeyword), so a fake tag from an old node cannot be laundered
+	// through us.
+#ifdef ENABLE_KAD_PROTOCOL_10
+	std::vector<uint8_t> aichTagValue = m_aichHashes.EncodeResultTag();
+#else
+	// Gate off: no AICH tag is ever put in a search answer, so the tag count
+	// and the packet are exactly upstream's.
+	const std::vector<uint8_t> aichTagValue;
+#endif
+	WriteTagListInc(data, aichTagValue.empty() ? 1 : 2);
 
 	uint32_t trust = (uint16_t)(GetTrustValue() * 100);
 	uint32_t publishers = m_publishingIPs->size() & 0xFF /*% 256*/;
@@ -673,4 +846,13 @@
 	// 32 bit tag: <namecount uint8><publishers uint8><trustvalue*100 uint16>
 	uint32_t tagValue = (names << 24) | (publishers << 16) | trust;
 	data->WriteTag(CTagVarInt(TAG_PUBLISHINFO, tagValue));
+
+	// Last, the AICH hashes reported for this file with the number of publishers behind each
+	// one -- normally exactly one hash. A BSOB tag in Kad carries a uint8 length, and
+	// CKadAICHHashList keeps the payload inside that budget.
+	if (!aichTagValue.empty()) {
+		wxASSERT(aichTagValue.size() <= 0xFF);
+		data->WriteTag(
+			CTagBsob(TAG_KADAICHHASHRESULT, &aichTagValue0, (uint8_t)aichTagValue.size()));
+	}
 }

amule-3.0.1.tar.gz/src/kademlia/kademlia/Entry.h -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Entry.h Changed

@@ -36,10 +36,10 @@
 there client on the eMule forum..
 */
 
-#ifndef __KAD_ENTRY_H__
-#define __KAD_ENTRY_H__
-
+#ifndef ENTRY_H
+#define ENTRY_H
 
+#include "AICHHashList.h"
 #include "../utils/UInt128.h"
 #include "../../Tag.h"
 #include <time.h>
@@ -50,13 +50,15 @@
 class CFileDataIO;
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
 class CEntry
 {
 protected:
-	struct sFileNameEntry {
+	struct sFileNameEntry
+	{
 		wxString m_filename;
 		uint32_t m_popularityIndex;
 	};
@@ -72,20 +74,24 @@
 		m_bSource = false;
 	}
 
-	virtual		~CEntry();
-	virtual CEntry*	Copy() const;
-	virtual bool	IsKeyEntry() const noexcept	{ return false; }
+	virtual ~CEntry();
+	virtual CEntry *Copy() const;
+	virtual bool IsKeyEntry() const noexcept { return false; }
 
-	bool	 GetIntTagValue(const wxString& tagname, uint64_t& value, bool includeVirtualTags = true) const;
-	wxString GetStrTagValue(const wxString& tagname) const;
+	bool GetIntTagValue(const wxString &tagname, uint64_t &value, bool includeVirtualTags = true) const;
+	wxString GetStrTagValue(const wxString &tagname) const;
 
-	void	 AddTag(CTag *tag)			{ m_taglist.push_back(tag); }
-	uint32_t GetTagCount() const			{ return m_taglist.size() + ((m_uSize != 0) ? 1 : 0) + (GetCommonFileName().IsEmpty() ? 0 : 1); }
-	void	 WriteTagList(CFileDataIO* data)	{ WriteTagListInc(data, 0); }
+	// dbgSourceIP is the peer the tag came from, or 0 when we generated it ourselves.
+	void AddTag(CTag *tag, uint32_t dbgSourceIP);
+	uint32_t GetTagCount() const
+	{
+		return m_taglist.size() + ((m_uSize != 0) ? 1 : 0) + (GetCommonFileName().IsEmpty() ? 0 : 1);
+	}
+	void WriteTagList(CFileDataIO *data) { WriteTagListInc(data, 0); }
 
-	wxString GetCommonFileNameLowerCase() const	{ return GetCommonFileName().MakeLower(); }
+	wxString GetCommonFileNameLowerCase() const { return GetCommonFileName().MakeLower(); }
 	wxString GetCommonFileName() const;
-	void	 SetFileName(const wxString& name);
+	void SetFileName(const wxString &name);
 
 	uint32_t m_uIP;
 	uint16_t m_uTCPport;
@@ -97,51 +103,69 @@
 	bool m_bSource;
 
 protected:
-	void	WriteTagListInc(CFileDataIO *data, uint32_t increaseTagNumber = 0);
-	typedef std::list<sFileNameEntry>	FileNameList;
-	FileNameList	m_filenames;
-	TagPtrList	m_taglist;
+	void WriteTagListInc(CFileDataIO *data, uint32_t increaseTagNumber = 0);
+	typedef std::list<sFileNameEntry> FileNameList;
+	FileNameList m_filenames;
+	TagPtrList m_taglist;
 };
 
 class CKeyEntry : public CEntry
 {
-      protected:
-	struct sPublishingIP {
+protected:
+	struct sPublishingIP
+	{
 		uint32_t m_ip;
-		time_t	 m_lastPublish;
+		time_t m_lastPublish;
+		// Index into m_aichHashes of the AICH root hash this publisher reported, or
+		// CKadAICHHashList::INVALID_INDEX when it reported none (a pre-0x09 publisher
+		// always reports none).
+		uint16_t m_aichHashIdx;
 	};
 
-      public:
+public:
 	CKeyEntry();
 	virtual ~CKeyEntry();
 
-	virtual CEntry*	Copy() const			{ return CEntry::Copy(); }
-	virtual bool	IsKeyEntry() const noexcept	{ return true; }
+	virtual CEntry *Copy() const { return CEntry::Copy(); }
+	virtual bool IsKeyEntry() const noexcept { return true; }
+
+	bool SearchTermsMatch(const SSearchTerm *searchTerm) const;
+	void MergeIPsAndFilenames(CKeyEntry *fromEntry);
+	void CleanUpTrackedPublishers();
+	double GetTrustValue();
+	void WritePublishTrackingDataToFile(CFileDataIO *data);
+	// `includesAICH` reflects the on-disk keyword-index version: files written before the AICH-
+	// carrying version 4 have no hash block and no per-publisher hash index.
+	void ReadPublishTrackingDataFromFile(CFileDataIO *data, bool includesAICH);
+
+	// Records the AICH root hash a publisher sent in TAG_KADAICHHASHPUB. Only meaningful on a
+	// freshly parsed entry, before MergeIPsAndFilenames() folds it into the stored entry: that
+	// is where the hash gets attached to this publisher and the popularity counts of the merged
+	// list are maintained.
+	void SetPublishedAICHHash(const CKadAICHHash &hash);
+	uint16_t GetAICHHashCount() const { return m_aichHashes.GetSlotCount(); }
+	void DirtyDeletePublishData();
+	void WriteTagListWithPublishInfo(CFileDataIO *data);
+	static void ResetGlobalTrackingMap() { s_globalPublishIPs.clear(); }
 
-	bool	SearchTermsMatch(const SSearchTerm *searchTerm) const;
-	void	MergeIPsAndFilenames(CKeyEntry* fromEntry);
-	void	CleanUpTrackedPublishers();
-	double	GetTrustValue();
-	void	WritePublishTrackingDataToFile(CFileDataIO *data);
-	void	ReadPublishTrackingDataFromFile(CFileDataIO *data);
-	void	DirtyDeletePublishData();
-	void	WriteTagListWithPublishInfo(CFileDataIO *data);
-	static void	ResetGlobalTrackingMap()	{ s_globalPublishIPs.clear(); }
-
-      protected:
-	void	ReCalculateTrustValue();
-	static void	AdjustGlobalPublishTracking(uint32_t ip, bool increase, const wxString& dbgReason);
+protected:
+	void ReCalculateTrustValue();
+	static void AdjustGlobalPublishTracking(uint32_t ip, bool increase, const wxString &dbgReason);
 
-	typedef std::list<sPublishingIP>	PublishingIPList;
-	typedef std::map<uint32_t, uint32_t>	GlobalPublishIPMap;
+	typedef std::list<sPublishingIP> PublishingIPList;
+	typedef std::map<uint32_t, uint32_t> GlobalPublishIPMap;
 
 	uint64_t m_lastTrustValueCalc;
-	double	 m_trustValue;
-	PublishingIPList *		m_publishingIPs;
-	static GlobalPublishIPMap	s_globalPublishIPs;	// tracks count of publishings for each 255.255.255.0/24 subnet
+	double m_trustValue;
+	// The AICH root hashes reported for this entry, with one popularity
+	// count per hash.  Empty for entries that only pre-0x09 peers published.
+	CKadAICHHashList m_aichHashes;
+	PublishingIPList *m_publishingIPs;
+	static GlobalPublishIPMap
+		s_globalPublishIPs; // tracks count of publishings for each 255.255.255.0/24 subnet
 };
 
-}
+} // namespace Kademlia
 
-#endif // __KAD_ENTRY_H__
+#endif // ENTRY_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/kademlia/kademlia/Error.h -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Error.h Changed

@@ -35,48 +35,49 @@
 Any mod that changes anything within the Kademlia side will not be allowed to advertise
 there client on the eMule forum..
 */
-#ifndef __KAD_ERROR_H__
-#define __KAD_ERROR_H__
-
+#ifndef ERROR_H
+#define ERROR_H
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
-#define ERR_SUCCESS			0x0000
-#define ERR_UNKNOWN			0xFFFF
+#define ERR_SUCCESS 0x0000
+#define ERR_UNKNOWN 0xFFFF
 
-#define ERR_WINSOCK			0x0001
-#define ERR_TCP_LISTENER_START_FAILURE	0x0002
-#define ERR_UDP_LISTENER_START_FAILURE	0x0003
+#define ERR_WINSOCK 0x0001
+#define ERR_TCP_LISTENER_START_FAILURE 0x0002
+#define ERR_UDP_LISTENER_START_FAILURE 0x0003
 
-#define ERR_READ_ONLY			0x0004
-#define ERR_WRITE_ONLY			0x0005
-#define ERR_END_OF_FILE			0x0006
-#define ERR_BUFFER_TOO_SMALL		0x0007
+#define ERR_READ_ONLY 0x0004
+#define ERR_WRITE_ONLY 0x0005
+#define ERR_END_OF_FILE 0x0006
+#define ERR_BUFFER_TOO_SMALL 0x0007
 
-#define ERR_CREATE_SOCKET_FAILED	0x0008
-#define ERR_CREATE_THREAD_FAILED	0x0009
-#define ERR_CREATE_HANDLE_FAILED	0x000A
-#define ERR_LISTEN_FAILED		0x000B
+#define ERR_CREATE_SOCKET_FAILED 0x0008
+#define ERR_CREATE_THREAD_FAILED 0x0009
+#define ERR_CREATE_HANDLE_FAILED 0x000A
+#define ERR_LISTEN_FAILED 0x000B
 
-#define ERR_QUEUE_FULL			0x000C
+#define ERR_QUEUE_FULL 0x000C
 
-#define ERR_NO_CONTACTS			0x000D
+#define ERR_NO_CONTACTS 0x000D
 
 class CKademliaError
 {
 public:
-
-	CKademliaError(int errorCode, const wxString& errorDescription)
-		: m_ErrorCode(errorCode), m_ErrorDescription(errorDescription)
-		{}
+	CKademliaError(int errorCode, const wxString &errorDescription)
+	: m_ErrorCode(errorCode)
+	, m_ErrorDescription(errorDescription)
+	{
+	}
 
 	int m_ErrorCode;
 	wxString m_ErrorDescription; // For internationalization use error code to lookup description
 };
 
-} // End namespace
+} // namespace Kademlia
 
-#endif // __KAD_ERROR_H__
+#endif // ERROR_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/kademlia/kademlia/Indexed.cpp -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Indexed.cpp Changed

@@ -38,7 +38,6 @@
 
 #include "Indexed.h"
 
-
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Constants.h>
 #include <protocol/kad/Constants.h>
@@ -68,7 +67,7 @@
 	m_sfilename = thePrefs::GetConfigDir() + "src_index.dat";
 	m_kfilename = thePrefs::GetConfigDir() + "key_index.dat";
 	m_loadfilename = thePrefs::GetConfigDir() + "load_index.dat";
-	m_lastClean = time(NULL) + (60*30);
+	m_lastClean = time(NULL) + (60 * 30);
 	m_totalIndexSource = 0;
 	m_totalIndexKeyword = 0;
 	m_totalIndexNotes = 0;
@@ -87,7 +86,7 @@
 		if (CPath::FileExists(m_loadfilename) && load_file.Open(m_loadfilename, CFile::read)) {
 			uint32_t version = load_file.ReadUInt32();
 			if (version < 2) {
-				/*time_t savetime =*/ load_file.ReadUInt32(); //  Savetime is unused now
+				/*time_t savetime =*/load_file.ReadUInt32(); //  Savetime is unused now
 
 				uint32_t numLoad = load_file.ReadUInt32();
 				while (numLoad) {
@@ -104,7 +103,10 @@
 		CFile k_file;
 		if (CPath::FileExists(m_kfilename) && k_file.Open(m_kfilename, CFile::read)) {
 			uint32_t version = k_file.ReadUInt32();
-			if (version < 4) {
+			// Version 4 added the AICH hash block and the per-publisher hash index that
+			// Kad protocol version 0x09 keyword storage needs; version 3 files still
+			// load, just without any AICH hash.
+			if (version < 5) {
 				time_t savetime = k_file.ReadUInt32();
 				if (savetime > time(NULL)) {
 					CUInt128 id = k_file.ReadUInt128();
@@ -117,49 +119,96 @@
 								CUInt128 sourceID = k_file.ReadUInt128();
 								uint32_t numName = k_file.ReadUInt32();
 								while (numName) {
-									Kademlia::CKeyEntry* toAdd = new Kademlia::CKeyEntry();
+									Kademlia::CKeyEntry *toAdd =
+										new Kademlia::CKeyEntry();
 									toAdd->m_uKeyID = keyID;
 									toAdd->m_uSourceID = sourceID;
 									toAdd->m_bSource = false;
-									toAdd->m_tLifeTime = k_file.ReadUInt32();
+									toAdd->m_tLifeTime =
+										k_file.ReadUInt32();
 									if (version >= 3) {
-										toAdd->ReadPublishTrackingDataFromFile(&k_file);
+										toAdd->ReadPublishTrackingDataFromFile(
+											&k_file,
+											version >= 4);
 									}
 									uint32_t tagList = k_file.ReadUInt8();
 									while (tagList) {
-										CTag* tag = k_file.ReadTag();
+										CTag *tag = k_file.ReadTag();
 										if (tag) {
-											if (!tag->GetName().Cmp(TAG_FILENAME)) {
-												if (toAdd->GetCommonFileName().IsEmpty()) {
-													toAdd->SetFileName(tag->GetStr());
+											if (!tag->GetName().Cmp(
+												    TAG_FILENAME)) {
+												if (toAdd->GetCommonFileName()
+														.IsEmpty()) {
+													toAdd->SetFileName(
+														tag->GetStr());
 												}
 												delete tag;
-											} else if (!tag->GetName().Cmp(TAG_FILESIZE)) {
-												if (tag->IsBsob() && (tag->GetBsobSize() == 8)) {
-													// We've previously wrongly saved BSOB uint64s to key_index.dat,
-													// so we'll have to handle those here as well. Too bad ...
-													toAdd->m_uSize = PeekUInt64(tag->GetBsob());
+											} else if (
+												!tag->GetName()
+													 .Cmp(TAG_FILESIZE)) {
+												if (tag->IsBsob() &&
+													(tag->GetBsobSize() ==
+														8)) {
+													// Older
+													// builds
+													// wrongly
+													// saved
+													// BSOB
+													// uint64s
+													// to
+													// key_index.dat,
+													// so
+													// those
+													// have
+													// to
+													// be
+													// handled
+													// here
+													// too.
+													toAdd->m_uSize = PeekUInt64(
+														tag->GetBsob());
 												} else {
-													toAdd->m_uSize = tag->GetInt();
+													toAdd->m_uSize =
+														tag->GetInt();
 												}
 												delete tag;
-											} else if (!tag->GetName().Cmp(TAG_SOURCEIP)) {
-												toAdd->m_uIP = tag->GetInt();
-												toAdd->AddTag(tag);
-											} else if (!tag->GetName().Cmp(TAG_SOURCEPORT)) {
-												toAdd->m_uTCPport = tag->GetInt();
-												toAdd->AddTag(tag);
-											} else if (!tag->GetName().Cmp(TAG_SOURCEUPORT)) {
-												toAdd->m_uUDPport = tag->GetInt();
-												toAdd->AddTag(tag);
+											} else if (
+												!tag->GetName()
+													 .Cmp(TAG_SOURCEIP)) {
+												toAdd->m_uIP =
+													tag->GetInt();
+												toAdd->AddTag(
+													tag,
+													0);
+											} else if (
+												!tag->GetName()
+													 .Cmp(TAG_SOURCEPORT)) {
+												toAdd->m_uTCPport =
+													tag->GetInt();
+												toAdd->AddTag(
+													tag,
+													0);
+											} else if (
+												!tag->GetName()
+													 .Cmp(TAG_SOURCEUPORT)) {
+												toAdd->m_uUDPport =
+													tag->GetInt();
+												toAdd->AddTag(
+													tag,
+													0);
 											} else {
-												toAdd->AddTag(tag);
+												toAdd->AddTag(
+													tag,
+													0);
 											}
 										}
 										tagList--;
 									}
 									uint8_t load;
-									if (AddKeyword(keyID, sourceID, toAdd, load)) {
+									if (AddKeyword(keyID,
+										    sourceID,
+										    toAdd,
+										    load)) {
 										totalKeyword++;
 									} else {
 										delete toAdd;
@@ -190,24 +239,33 @@
 							CUInt128 sourceID = s_file.ReadUInt128();
 							uint32_t numName = s_file.ReadUInt32();
 							while (numName) {
-								Kademlia::CEntry* toAdd = new Kademlia::CEntry();
+								Kademlia::CEntry *toAdd =
+									new Kademlia::CEntry();
 								toAdd->m_bSource = true;
 								toAdd->m_tLifeTime = s_file.ReadUInt32();
 								uint32_t tagList = s_file.ReadUInt8();
 								while (tagList) {
-									CTag* tag = s_file.ReadTag();
+									CTag *tag = s_file.ReadTag();
 									if (tag) {
-										if (!tag->GetName().Cmp(TAG_SOURCEIP)) {
-											toAdd->m_uIP = tag->GetInt();
-											toAdd->AddTag(tag);
-										} else if (!tag->GetName().Cmp(TAG_SOURCEPORT)) {
-											toAdd->m_uTCPport = tag->GetInt();
-											toAdd->AddTag(tag);
-										} else if (!tag->GetName().Cmp(TAG_SOURCEUPORT)) {
-											toAdd->m_uUDPport = tag->GetInt();
-											toAdd->AddTag(tag);
+										if (!tag->GetName().Cmp(
+											    TAG_SOURCEIP)) {
+											toAdd->m_uIP =
+												tag->GetInt();
+											toAdd->AddTag(tag, 0);
+										} else if (
+											!tag->GetName().Cmp(
+												TAG_SOURCEPORT)) {
+											toAdd->m_uTCPport =
+												tag->GetInt();
+											toAdd->AddTag(tag, 0);
+										} else if (
+											!tag->GetName().Cmp(
+												TAG_SOURCEUPORT)) {
+											toAdd->m_uUDPport =
+												tag->GetInt();
+											toAdd->AddTag(tag, 0);
 										} else {
-											toAdd->AddTag(tag);
+											toAdd->AddTag(tag, 0);
 										}
 									}
 									tagList--;
@@ -215,7 +273,8 @@
 								toAdd->m_uKeyID = keyID;
 								toAdd->m_uSourceID = sourceID;
 								uint8_t load;
-								if (AddSources(keyID, sourceID, toAdd, load)) {
+								if (AddSources(
+									    keyID, sourceID, toAdd, load)) {
 									totalSource++;
 								} else {
 									delete toAdd;
@@ -234,20 +293,22 @@
 		m_totalIndexSource = totalSource;
 		m_totalIndexKeyword = totalKeyword;
 		m_totalIndexLoad = totalLoad;
-		AddDebugLogLineN(logKadIndex, CFormat("Read %u source, %u keyword, and %u load entries") % totalSource % totalKeyword % totalLoad);
-	} catch (const CSafeIOException& err) {
+		AddDebugLogLineN(logKadIndex,
+			CFormat("Read %u source, %u keyword, and %u load entries") % totalSource %
+				totalKeyword % totalLoad);
+	} catch (const CSafeIOException &err) {
 		AddDebugLogLineC(logKadIndex, "CSafeIOException in CIndexed::readFile: " + err.what());
-	} catch (const CInvalidPacket& err) {
-		AddDebugLogLineC(logKadIndex, "CInvalidPacket Exception in CIndexed::readFile: " + err.what());
-	} catch (const wxString& e) {
+	} catch (const CInvalidPacket &err) {
+		AddDebugLogLineC(
+			logKadIndex, "CInvalidPacket Exception in CIndexed::readFile: " + err.what());
+	} catch (const wxString &e) {
 		AddDebugLogLineC(logKadIndex, "Exception in CIndexed::readFile: " + e);
 	}
 }
 
 CIndexed::~CIndexed()
 {
-	try
-	{
+	try {
 		time_t now = time(NULL);
 		uint32_t s_total = 0;
 		uint32_t k_total = 0;
@@ -259,8 +320,8 @@
 			load_file.WriteUInt32(now);
 			wxASSERT(m_Load_map.size() < 0xFFFFFFFF);
 			load_file.WriteUInt32((uint32_t)m_Load_map.size());
-			for (LoadMap::iterator it = m_Load_map.begin(); it != m_Load_map.end(); ++it ) {
-				Load* load = it->second;
+			for (LoadMap::iterator it = m_Load_map.begin(); it != m_Load_map.end(); ++it) {
+				Load *load = it->second;
 				wxASSERT(load);
 				if (load) {
 					load_file.WriteUInt128(load->keyID);
@@ -278,23 +339,29 @@
 			s_file.WriteUInt32(now + KADEMLIAREPUBLISHTIMES);
 			wxASSERT(m_Sources_map.size() < 0xFFFFFFFF);
 			s_file.WriteUInt32((uint32_t)m_Sources_map.size());
-			for (SrcHashMap::iterator itSrcHash = m_Sources_map.begin(); itSrcHash != m_Sources_map.end(); ++itSrcHash ) {
-				SrcHash* currSrcHash = itSrcHash->second;
+			for (SrcHashMap::iterator itSrcHash = m_Sources_map.begin();
+				itSrcHash != m_Sources_map.end();
+				++itSrcHash) {
+				SrcHash *currSrcHash = itSrcHash->second;
 				s_file.WriteUInt128(currSrcHash->keyID);
 
-				CKadSourcePtrList& KeyHashSrcMap = currSrcHash->m_Source_map;
+				CKadSourcePtrList &KeyHashSrcMap = currSrcHash->m_Source_map;
 				wxASSERT(KeyHashSrcMap.size() < 0xFFFFFFFF);
 				s_file.WriteUInt32((uint32_t)KeyHashSrcMap.size());
 
-				for (CKadSourcePtrList::iterator itSource = KeyHashSrcMap.begin(); itSource != KeyHashSrcMap.end(); ++itSource) {
-					Source* currSource = *itSource;
+				for (CKadSourcePtrList::iterator itSource = KeyHashSrcMap.begin();
+					itSource != KeyHashSrcMap.end();
+					++itSource) {
+					Source *currSource = *itSource;
 					s_file.WriteUInt128(currSource->sourceID);
 
-					CKadEntryPtrList& SrcEntryList = currSource->entryList;
+					CKadEntryPtrList &SrcEntryList = currSource->entryList;
 					wxASSERT(SrcEntryList.size() < 0xFFFFFFFF);
 					s_file.WriteUInt32((uint32_t)SrcEntryList.size());
-					for (CKadEntryPtrList::iterator itEntry = SrcEntryList.begin(); itEntry != SrcEntryList.end(); ++itEntry) {
-						Kademlia::CEntry* currName = *itEntry;
+					for (CKadEntryPtrList::iterator itEntry = SrcEntryList.begin();
+						itEntry != SrcEntryList.end();
+						++itEntry) {
+						Kademlia::CEntry *currName = *itEntry;
 						s_file.WriteUInt32(currName->m_tLifeTime);
 						currName->WriteTagList(&s_file);
 						delete currName;
@@ -309,31 +376,47 @@
 
 		CFile k_file;
 		if (k_file.Open(m_kfilename, CFile::write)) {
-			k_file.WriteUInt32(3); // version
+			// Version 4 carries the AICH block and the per-publisher hash index; gated
+			// with the writer in CKeyEntry::WritePublishTrackingDataToFile, so a gate-
+			// off build writes the version-3 file upstream writes. Reading both is
+			// unconditional, so switching the gate never invalidates an existing
+			// keyword index.
+#ifdef ENABLE_KAD_PROTOCOL_10
+			k_file.WriteUInt32(4); // version, see the note in ReadFile()
+#else
+			k_file.WriteUInt32(3); // version, see the note in ReadFile()
+#endif
 			k_file.WriteUInt32(now + KADEMLIAREPUBLISHTIMEK);
 			k_file.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
 
 			wxASSERT(m_Keyword_map.size() < 0xFFFFFFFF);
 			k_file.WriteUInt32((uint32_t)m_Keyword_map.size());
 
-			for (KeyHashMap::iterator itKeyHash = m_Keyword_map.begin(); itKeyHash != m_Keyword_map.end(); ++itKeyHash ) {
-				KeyHash* currKeyHash = itKeyHash->second;
+			for (KeyHashMap::iterator itKeyHash = m_Keyword_map.begin();
+				itKeyHash != m_Keyword_map.end();
+				++itKeyHash) {
+				KeyHash *currKeyHash = itKeyHash->second;
 				k_file.WriteUInt128(currKeyHash->keyID);
 
-				CSourceKeyMap& KeyHashSrcMap = currKeyHash->m_Source_map;
+				CSourceKeyMap &KeyHashSrcMap = currKeyHash->m_Source_map;
 				wxASSERT(KeyHashSrcMap.size() < 0xFFFFFFFF);
 				k_file.WriteUInt32((uint32_t)KeyHashSrcMap.size());
 
-				for (CSourceKeyMap::iterator itSource = KeyHashSrcMap.begin(); itSource != KeyHashSrcMap.end(); ++itSource ) {
-					Source* currSource = itSource->second;
+				for (CSourceKeyMap::iterator itSource = KeyHashSrcMap.begin();
+					itSource != KeyHashSrcMap.end();
+					++itSource) {
+					Source *currSource = itSource->second;
 					k_file.WriteUInt128(currSource->sourceID);
 
-					CKadEntryPtrList& SrcEntryList = currSource->entryList;
+					CKadEntryPtrList &SrcEntryList = currSource->entryList;
 					wxASSERT(SrcEntryList.size() < 0xFFFFFFFF);
 					k_file.WriteUInt32((uint32_t)SrcEntryList.size());
 
-					for (CKadEntryPtrList::iterator itEntry = SrcEntryList.begin(); itEntry != SrcEntryList.end(); ++itEntry) {
-						Kademlia::CKeyEntry* currName = static_cast<Kademlia::CKeyEntry*>(*itEntry);
+					for (CKadEntryPtrList::iterator itEntry = SrcEntryList.begin();
+						itEntry != SrcEntryList.end();
+						++itEntry) {
+						Kademlia::CKeyEntry *currName =
+							static_cast<Kademlia::CKeyEntry *>(*itEntry);
 						wxASSERT(currName->IsKeyEntry());
 						k_file.WriteUInt32(currName->m_tLifeTime);
 						currName->WritePublishTrackingDataToFile(&k_file);
@@ -349,16 +432,23 @@
 			}
 			k_file.Close();
 		}
-		AddDebugLogLineN(logKadIndex, CFormat("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;
-			CKadSourcePtrList& KeyHashNoteMap = currNoteHash->m_Source_map;
-
-			for (CKadSourcePtrList::iterator itNote = KeyHashNoteMap.begin(); itNote != KeyHashNoteMap.end(); ++itNote) {
-				Source* currNote = *itNote;
-				CKadEntryPtrList& NoteEntryList = currNote->entryList;
-				for (CKadEntryPtrList::iterator itNoteEntry = NoteEntryList.begin(); itNoteEntry != NoteEntryList.end(); ++itNoteEntry) {
+		AddDebugLogLineN(logKadIndex,
+			CFormat("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;
+			CKadSourcePtrList &KeyHashNoteMap = currNoteHash->m_Source_map;
+
+			for (CKadSourcePtrList::iterator itNote = KeyHashNoteMap.begin();
+				itNote != KeyHashNoteMap.end();
+				++itNote) {
+				Source *currNote = *itNote;
+				CKadEntryPtrList &NoteEntryList = currNote->entryList;
+				for (CKadEntryPtrList::iterator itNoteEntry = NoteEntryList.begin();
+					itNoteEntry != NoteEntryList.end();
+					++itNoteEntry) {
 					delete *itNoteEntry;
 				}
 				delete currNote;
@@ -367,11 +457,12 @@
 		}
 
 		m_Notes_map.clear();
-	} catch (const CSafeIOException& err) {
+	} catch (const CSafeIOException &err) {
 		AddDebugLogLineC(logKadIndex, "CSafeIOException in CIndexed::~CIndexed: " + err.what());
-	} catch (const CInvalidPacket& err) {
-		AddDebugLogLineC(logKadIndex, "CInvalidPacket Exception in CIndexed::~CIndexed: " + err.what());
-	} catch (const wxString& e) {
+	} catch (const CInvalidPacket &err) {
+		AddDebugLogLineC(
+			logKadIndex, "CInvalidPacket Exception in CIndexed::~CIndexed: " + err.what());
+	} catch (const wxString &e) {
 		AddDebugLogLineC(logKadIndex, "Exception in CIndexed::~CIndexed: " + e);
 	}
 }
@@ -391,17 +482,18 @@
 	KeyHashMap::iterator itKeyHash = m_Keyword_map.begin();
 	while (itKeyHash != m_Keyword_map.end()) {
 		KeyHashMap::iterator curr_itKeyHash = itKeyHash++; // Don't change this to a ++it!
-		KeyHash* currKeyHash = curr_itKeyHash->second;
+		KeyHash *currKeyHash = curr_itKeyHash->second;
 
-		for (CSourceKeyMap::iterator itSource = currKeyHash->m_Source_map.begin(); itSource != currKeyHash->m_Source_map.end(); ) {
+		for (CSourceKeyMap::iterator itSource = currKeyHash->m_Source_map.begin();
+			itSource != currKeyHash->m_Source_map.end();) {
 			CSourceKeyMap::iterator curr_itSource = itSource++; // Don't change this to a ++it!
-			Source* currSource = curr_itSource->second;
+			Source *currSource = curr_itSource->second;
 
 			CKadEntryPtrList::iterator itEntry = currSource->entryList.begin();
 			while (itEntry != currSource->entryList.end()) {
 				k_Total++;
 
-				Kademlia::CKeyEntry* currName = static_cast<Kademlia::CKeyEntry*>(*itEntry);
+				Kademlia::CKeyEntry *currName = static_cast<Kademlia::CKeyEntry *>(*itEntry);
 				wxASSERT(currName->IsKeyEntry());
 				if (!currName->m_bSource && currName->m_tLifeTime < tNow) {
 					k_Removed++;
@@ -411,7 +503,7 @@
 				} else if (currName->m_bSource) {
 					wxFAIL;
 				} else {
-					currName->CleanUpTrackedPublishers();	// intern cleanup
+					currName->CleanUpTrackedPublishers(); // intern cleanup
 				}
 				++itEntry;
 			}
@@ -431,17 +523,17 @@
 	SrcHashMap::iterator itSrcHash = m_Sources_map.begin();
 	while (itSrcHash != m_Sources_map.end()) {
 		SrcHashMap::iterator curr_itSrcHash = itSrcHash++; // Don't change this to a ++it!
-		SrcHash* currSrcHash = curr_itSrcHash->second;
+		SrcHash *currSrcHash = curr_itSrcHash->second;
 
 		CKadSourcePtrList::iterator itSource = currSrcHash->m_Source_map.begin();
 		while (itSource != currSrcHash->m_Source_map.end()) {
-			Source* currSource = *itSource;
+			Source *currSource = *itSource;
 
 			CKadEntryPtrList::iterator itEntry = currSource->entryList.begin();
 			while (itEntry != currSource->entryList.end()) {
 				s_Total++;
 
-				Kademlia::CEntry* currName = *itEntry;
+				Kademlia::CEntry *currName = *itEntry;
 				if (currName->m_tLifeTime < tNow) {
 					s_Removed++;
 					itEntry = currSource->entryList.erase(itEntry);
@@ -467,11 +559,14 @@
 
 	m_totalIndexSource = s_Total - s_Removed;
 	m_totalIndexKeyword = k_Total - k_Removed;
-	AddDebugLogLineN(logKadIndex, CFormat("Removed %u keyword out of %u and %u source out of %u") % k_Removed % k_Total % s_Removed % s_Total);
+	AddDebugLogLineN(logKadIndex,
+		CFormat("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);
 }
 
-bool CIndexed::AddKeyword(const CUInt128& keyID, const CUInt128& sourceID, Kademlia::CKeyEntry* entry, uint8_t& load)
+bool CIndexed::AddKeyword(
+	const CUInt128 &keyID, const CUInt128 &sourceID, Kademlia::CKeyEntry *entry, uint8_t &load)
 {
 	if (!entry) {
 		return false;
@@ -484,14 +579,15 @@
 		return false;
 	}
 
-	if (entry->m_uSize == 0 || entry->GetCommonFileName().IsEmpty() || entry->GetTagCount() == 0 || entry->m_tLifeTime < time(NULL)) {
+	if (entry->m_uSize == 0 || entry->GetCommonFileName().IsEmpty() || entry->GetTagCount() == 0 ||
+		entry->m_tLifeTime < time(NULL)) {
 		return false;
 	}
 
 	KeyHashMap::iterator itKeyHash = m_Keyword_map.find(keyID);
-	KeyHash* currKeyHash = NULL;
+	KeyHash *currKeyHash = NULL;
 	if (itKeyHash == m_Keyword_map.end()) {
-		Source* currSource = new Source;
+		Source *currSource = new Source;
 		currSource->sourceID = sourceID;
 		entry->MergeIPsAndFilenames(NULL); // IpTracking init
 		currSource->entryList.push_front(entry);
@@ -507,24 +603,26 @@
 		size_t indexTotal = currKeyHash->m_Source_map.size();
 		if (indexTotal > KADEMLIAMAXINDEX) {
 			load = 100;
-			//Too many entries for this Keyword..
+			// Too many entries for this Keyword..
 			return false;
 		}
-		Source* currSource = NULL;
+		Source *currSource = NULL;
 		CSourceKeyMap::iterator itSource = currKeyHash->m_Source_map.find(sourceID);
 		if (itSource != currKeyHash->m_Source_map.end()) {
 			currSource = itSource->second;
 			if (!currSource->entryList.empty()) {
 				if (indexTotal > KADEMLIAMAXINDEX - 5000) {
 					load = 100;
-					//We are in a hot node.. If we continued to update all the publishes
-					//while this index is full, popular files will be the only thing you index.
+					// We are in a hot node. Updating all the publishes while
+					// this index is full would index nothing but popular files.
 					return false;
 				}
 				// also check for size match
 				CKeyEntry *oldEntry = NULL;
-				for (CKadEntryPtrList::iterator itEntry = currSource->entryList.begin(); itEntry != currSource->entryList.end(); ++itEntry) {
-					CKeyEntry *currEntry = static_cast<Kademlia::CKeyEntry*>(*itEntry);
+				for (CKadEntryPtrList::iterator itEntry = currSource->entryList.begin();
+					itEntry != currSource->entryList.end();
+					++itEntry) {
+					CKeyEntry *currEntry = static_cast<Kademlia::CKeyEntry *>(*itEntry);
 					wxASSERT(currEntry->IsKeyEntry());
 					if (currEntry->m_uSize == entry->m_uSize) {
 						oldEntry = currEntry;
@@ -532,10 +630,14 @@
 						break;
 					}
 				}
-				entry->MergeIPsAndFilenames(oldEntry);	// oldEntry can be NULL, that's ok and we still need to do this call in this case
+				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++;
-					AddDebugLogLineN(logKadIndex, "Multiple sizes published for file " + entry->m_uSourceID.ToHexString());
+					AddDebugLogLineN(logKadIndex,
+						"Multiple sizes published for file " +
+							entry->m_uSourceID.ToHexString());
 				}
 				delete oldEntry;
 				oldEntry = NULL;
@@ -559,27 +661,28 @@
 	}
 }
 
-
-bool CIndexed::AddSources(const CUInt128& keyID, const CUInt128& sourceID, Kademlia::CEntry* entry, uint8_t& load)
+bool CIndexed::AddSources(
+	const CUInt128 &keyID, const CUInt128 &sourceID, Kademlia::CEntry *entry, uint8_t &load)
 {
 	if (!entry) {
 		return false;
 	}
 
-	if( entry->m_uIP == 0 || entry->m_uTCPport == 0 || entry->m_uUDPport == 0 || entry->GetTagCount() == 0 || entry->m_tLifeTime < time(NULL)) {
+	if (entry->m_uIP == 0 || entry->m_uTCPport == 0 || entry->m_uUDPport == 0 ||
+		entry->GetTagCount() == 0 || entry->m_tLifeTime < time(NULL)) {
 		return false;
 	}
 
-	SrcHash* currSrcHash = NULL;
+	SrcHash *currSrcHash = NULL;
 	SrcHashMap::iterator itSrcHash = m_Sources_map.find(keyID);
 	if (itSrcHash == m_Sources_map.end()) {
-		Source* currSource = new Source;
+		Source *currSource = new Source;
 		currSource->sourceID = sourceID;
 		currSource->entryList.push_front(entry);
 		currSrcHash = new SrcHash;
 		currSrcHash->keyID = keyID;
 		currSrcHash->m_Source_map.push_front(currSource);
-		m_Sources_mapcurrSrcHash->keyID =  currSrcHash;
+		m_Sources_mapcurrSrcHash->keyID = currSrcHash;
 		m_totalIndexSource++;
 		load = 1;
 		return true;
@@ -587,13 +690,17 @@
 		currSrcHash = itSrcHash->second;
 		size_t size = currSrcHash->m_Source_map.size();
 
-		for (CKadSourcePtrList::iterator itSource = currSrcHash->m_Source_map.begin(); itSource != currSrcHash->m_Source_map.end(); ++itSource) {
-			Source* currSource = *itSource;
+		for (CKadSourcePtrList::iterator itSource = currSrcHash->m_Source_map.begin();
+			itSource != currSrcHash->m_Source_map.end();
+			++itSource) {
+			Source *currSource = *itSource;
 			if (!currSource->entryList.empty()) {
-				CEntry* currEntry = currSource->entryList.front();
+				CEntry *currEntry = currSource->entryList.front();
 				wxASSERT(currEntry != NULL);
-				if (currEntry->m_uIP == entry->m_uIP && (currEntry->m_uTCPport == entry->m_uTCPport || currEntry->m_uUDPport == entry->m_uUDPport)) {
-					CEntry* currName = currSource->entryList.front();
+				if (currEntry->m_uIP == entry->m_uIP &&
+					(currEntry->m_uTCPport == entry->m_uTCPport ||
+						currEntry->m_uUDPport == entry->m_uUDPport)) {
+					CEntry *currName = currSource->entryList.front();
 					currSource->entryList.pop_front();
 					delete currName;
 					currSource->entryList.push_front(entry);
@@ -601,7 +708,7 @@
 					return true;
 				}
 			} else {
-				//This should never happen!
+				// This should never happen!
 				currSource->entryList.push_front(entry);
 				wxFAIL;
 				load = (size * 100) / KADEMLIAMAXSOURCEPERFILE;
@@ -609,10 +716,10 @@
 			}
 		}
 		if (size > KADEMLIAMAXSOURCEPERFILE) {
-			Source* currSource = currSrcHash->m_Source_map.back();
+			Source *currSource = currSrcHash->m_Source_map.back();
 			currSrcHash->m_Source_map.pop_back();
 			wxASSERT(currSource != NULL);
-			Kademlia::CEntry* currName = currSource->entryList.back();
+			Kademlia::CEntry *currName = currSource->entryList.back();
 			currSource->entryList.pop_back();
 			wxASSERT(currName != NULL);
 			delete currName;
@@ -622,7 +729,7 @@
 			load = 100;
 			return true;
 		} else {
-			Source* currSource = new Source;
+			Source *currSource = new Source;
 			currSource->sourceID = sourceID;
 			currSource->entryList.push_front(entry);
 			currSrcHash->m_Source_map.push_front(currSource);
@@ -635,7 +742,8 @@
 	return false;
 }
 
-bool CIndexed::AddNotes(const CUInt128& keyID, const CUInt128& sourceID, Kademlia::CEntry* entry, uint8_t& load)
+bool CIndexed::AddNotes(
+	const CUInt128 &keyID, const CUInt128 &sourceID, Kademlia::CEntry *entry, uint8_t &load)
 {
 	if (!entry) {
 		return false;
@@ -645,10 +753,10 @@
 		return false;
 	}
 
-	SrcHash* currNoteHash = NULL;
+	SrcHash *currNoteHash = NULL;
 	SrcHashMap::iterator itNoteHash = m_Notes_map.find(keyID);
 	if (itNoteHash == m_Notes_map.end()) {
-		Source* currNote = new Source;
+		Source *currNote = new Source;
 		currNote->sourceID = sourceID;
 		currNote->entryList.push_front(entry);
 		currNoteHash = new SrcHash;
@@ -662,13 +770,16 @@
 		currNoteHash = itNoteHash->second;
 		size_t size = currNoteHash->m_Source_map.size();
 
-		for (CKadSourcePtrList::iterator itSource = currNoteHash->m_Source_map.begin(); itSource != currNoteHash->m_Source_map.end(); ++itSource) {
-			Source* currNote = *itSource;
+		for (CKadSourcePtrList::iterator itSource = currNoteHash->m_Source_map.begin();
+			itSource != currNoteHash->m_Source_map.end();
+			++itSource) {
+			Source *currNote = *itSource;
 			if (!currNote->entryList.empty()) {
-				CEntry* currEntry = currNote->entryList.front();
-				wxASSERT(currEntry!=NULL);
-				if (currEntry->m_uIP == entry->m_uIP || currEntry->m_uSourceID == entry->m_uSourceID) {
-					CEntry* currName = currNote->entryList.front();
+				CEntry *currEntry = currNote->entryList.front();
+				wxASSERT(currEntry != NULL);
+				if (currEntry->m_uIP == entry->m_uIP ||
+					currEntry->m_uSourceID == entry->m_uSourceID) {
+					CEntry *currName = currNote->entryList.front();
 					currNote->entryList.pop_front();
 					delete currName;
 					currNote->entryList.push_front(entry);
@@ -676,7 +787,7 @@
 					return true;
 				}
 			} else {
-				//This should never happen!
+				// This should never happen!
 				currNote->entryList.push_front(entry);
 				wxFAIL;
 				load = (size * 100) / KADEMLIAMAXNOTESPERFILE;
@@ -685,10 +796,10 @@
 			}
 		}
 		if (size > KADEMLIAMAXNOTESPERFILE) {
-			Source* currNote = currNoteHash->m_Source_map.back();
+			Source *currNote = currNoteHash->m_Source_map.back();
 			currNoteHash->m_Source_map.pop_back();
 			wxASSERT(currNote != NULL);
-			CEntry* currName = currNote->entryList.back();
+			CEntry *currName = currNote->entryList.back();
 			currNote->entryList.pop_back();
 			wxASSERT(currName != NULL);
 			delete currName;
@@ -698,7 +809,7 @@
 			load = 100;
 			return true;
 		} else {
-			Source* currNote = new Source;
+			Source *currNote = new Source;
 			currNote->sourceID = sourceID;
 			currNote->entryList.push_front(entry);
 			currNoteHash->m_Source_map.push_front(currNote);
@@ -709,9 +820,9 @@
 	}
 }
 
-bool CIndexed::AddLoad(const CUInt128& keyID, uint32_t timet)
+bool CIndexed::AddLoad(const CUInt128 &keyID, uint32_t timet)
 {
-	Load* load = NULL;
+	Load *load = NULL;
 
 	if ((uint32_t)time(NULL) > timet) {
 		return false;
@@ -731,9 +842,15 @@
 	return true;
 }
 
-void CIndexed::SendValidKeywordResult(const CUInt128& keyID, const SSearchTerm* pSearchTerms, uint32_t ip, uint16_t port, bool oldClient, 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;
+	KeyHash *currKeyHash = NULL;
 	KeyHashMap::iterator itKeyHash = m_Keyword_map.find(keyID);
 	if (itKeyHash != m_Keyword_map.end()) {
 		currKeyHash = itKeyHash->second;
@@ -744,26 +861,32 @@
 		const uint16_t maxResults = 300;
 		int count = 0 - startPosition;
 
-		// we do 2 loops: In the first one we ignore all results which have a trustvalue below 1
-		// in the second one we then also consider those. That way we make sure our 300 max results are not full
-		// of spam entries. We could also sort by trustvalue, but we would risk to only send popular files this way
-		// on very hot keywords
+		// Two loops: the first ignores results with a trustvalue below 1, the second also
+		// considers those. That keeps the 300 max results from filling with spam. Sorting
+		// by trustvalue instead would risk sending only popular files on very hot keywords.
 		bool onlyTrusted = true;
-		DEBUG_ONLY( uint32_t dbgResultsTrusted = 0; )
-		DEBUG_ONLY( 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) {
-				Source* currSource =  itSource->second;
-
-				for (CKadEntryPtrList::iterator itEntry = currSource->entryList.begin(); itEntry != currSource->entryList.end(); ++itEntry) {
-					Kademlia::CKeyEntry* currName = static_cast<Kademlia::CKeyEntry*>(*itEntry);
+			for (CSourceKeyMap::iterator itSource = currKeyHash->m_Source_map.begin();
+				itSource != currKeyHash->m_Source_map.end();
+				++itSource) {
+				Source *currSource = itSource->second;
+
+				for (CKadEntryPtrList::iterator itEntry = currSource->entryList.begin();
+					itEntry != currSource->entryList.end();
+					++itEntry) {
+					Kademlia::CKeyEntry *currName =
+						static_cast<Kademlia::CKeyEntry *>(*itEntry);
 					wxASSERT(currName->IsKeyEntry());
-					if ((onlyTrusted ^ (currName->GetTrustValue() < 1.0)) && (!pSearchTerms || currName->SearchTermsMatch(pSearchTerms))) {
+					if ((onlyTrusted ^ (currName->GetTrustValue() < 1.0)) &&
+						(!pSearchTerms || currName->SearchTermsMatch(pSearchTerms))) {
 						if (count < 0) {
 							count++;
 						} else if ((uint16_t)count < maxResults) {
-							if (!oldClient || currName->m_uSize <= OLD_MAX_FILE_SIZE) {
+							if (!oldClient ||
+								currName->m_uSize <= OLD_MAX_FILE_SIZE) {
 								count++;
 #ifdef __DEBUG__
 								if (onlyTrusted) {
@@ -772,12 +895,22 @@
 									dbgResultsUntrusted++;
 								}
 #endif
-								packetdata.WriteUInt128(currName->m_uSourceID);
-								currName->WriteTagListWithPublishInfo(&packetdata);
+								packetdata.WriteUInt128(
+									currName->m_uSourceID);
+								currName->WriteTagListWithPublishInfo(
+									&packetdata);
 								if (count % 50 == 0) {
 									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)
+									CKademlia::GetUDPListener()
+										->SendPacket(packetdata,
+											KADEMLIA2_SEARCH_RES,
+											ip,
+											port,
+											senderKey,
+											NULL);
+									// Reset the packet, keeping
+									// the header (Kad id, key
+									// id, entry count).
 									packetdata.SetLength(16 + 16 + 2);
 								}
 							}
@@ -797,7 +930,10 @@
 			}
 		} while (!onlyTrusted);
 
-		AddDebugLogLineN(logKadIndex, CFormat("Kad keyword search result request: Sent %u trusted and %u untrusted results") % dbgResultsTrusted % dbgResultsUntrusted);
+		AddDebugLogLineN(logKadIndex,
+			CFormat("Kad keyword search result request: Sent %u trusted and %u untrusted "
+				"results") %
+				dbgResultsTrusted % dbgResultsUntrusted);
 
 		if (count > 0) {
 			uint16_t countLeft = (uint16_t)count % 50;
@@ -805,41 +941,56 @@
 				packetdata.Seek(16 + 16);
 				packetdata.WriteUInt16(countLeft);
 				DebugSend(Kad2SearchRes, ip, port);
-				CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
+				CKademlia::GetUDPListener()->SendPacket(
+					packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
 			}
 		}
 	}
 	Clean();
 }
 
-void CIndexed::SendValidSourceResult(const CUInt128& keyID, uint32_t ip, uint16_t port, 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;
+	SrcHash *currSrcHash = NULL;
 	SrcHashMap::iterator itSrcHash = m_Sources_map.find(keyID);
 	if (itSrcHash != m_Sources_map.end()) {
 		currSrcHash = itSrcHash->second;
-		CMemFile packetdata(1024*50);
+		CMemFile packetdata(1024 * 50);
 		packetdata.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
 		packetdata.WriteUInt128(keyID);
 		packetdata.WriteUInt16(50);
 		uint16_t maxResults = 300;
 		int count = 0 - startPosition;
 
-		for (CKadSourcePtrList::iterator itSource = currSrcHash->m_Source_map.begin(); itSource != currSrcHash->m_Source_map.end(); ++itSource) {
-			Source* currSource = *itSource;
+		for (CKadSourcePtrList::iterator itSource = currSrcHash->m_Source_map.begin();
+			itSource != currSrcHash->m_Source_map.end();
+			++itSource) {
+			Source *currSource = *itSource;
 			if (!currSource->entryList.empty()) {
-				Kademlia::CEntry* currName = currSource->entryList.front();
+				Kademlia::CEntry *currName = currSource->entryList.front();
 				if (count < 0) {
 					count++;
 				} else if (count < maxResults) {
-					if (!fileSize || !currName->m_uSize || currName->m_uSize == fileSize) {
+					if (!fileSize || !currName->m_uSize ||
+						currName->m_uSize == fileSize) {
 						packetdata.WriteUInt128(currName->m_uSourceID);
 						currName->WriteTagList(&packetdata);
 						count++;
 						if (count % 50 == 0) {
 							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)
+							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);
 						}
 					}
@@ -855,39 +1006,50 @@
 				packetdata.Seek(16 + 16);
 				packetdata.WriteUInt16(countLeft);
 				DebugSend(Kad2SearchRes, ip, port);
-				CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
+				CKademlia::GetUDPListener()->SendPacket(
+					packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
 			}
 		}
 	}
 	Clean();
 }
 
-void CIndexed::SendValidNoteResult(const CUInt128& keyID, uint32_t ip, uint16_t port, 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;
+	SrcHash *currNoteHash = NULL;
 	SrcHashMap::iterator itNote = m_Notes_map.find(keyID);
 	if (itNote != m_Notes_map.end()) {
 		currNoteHash = itNote->second;
-		CMemFile packetdata(1024*50);
+		CMemFile packetdata(1024 * 50);
 		packetdata.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
 		packetdata.WriteUInt128(keyID);
 		packetdata.WriteUInt16(50);
 		uint16_t maxResults = 150;
 		uint16_t count = 0;
 
-		for (CKadSourcePtrList::iterator itSource = currNoteHash->m_Source_map.begin(); itSource != currNoteHash->m_Source_map.end(); ++itSource ) {
-			Source* currNote = *itSource;
+		for (CKadSourcePtrList::iterator itSource = currNoteHash->m_Source_map.begin();
+			itSource != currNoteHash->m_Source_map.end();
+			++itSource) {
+			Source *currNote = *itSource;
 			if (!currNote->entryList.empty()) {
-				Kademlia::CEntry* currName = currNote->entryList.front();
+				Kademlia::CEntry *currName = currNote->entryList.front();
 				if (count < maxResults) {
-					if (!fileSize || !currName->m_uSize || fileSize == currName->m_uSize) {
+					if (!fileSize || !currName->m_uSize ||
+						fileSize == currName->m_uSize) {
 						packetdata.WriteUInt128(currName->m_uSourceID);
 						currName->WriteTagList(&packetdata);
 						count++;
 						if (count % 50 == 0) {
 							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)
+							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);
 						}
 					}
@@ -902,14 +1064,15 @@
 			packetdata.Seek(16 + 16);
 			packetdata.WriteUInt16(countLeft);
 			DebugSend(Kad2SearchRes, ip, port);
-			CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
+			CKademlia::GetUDPListener()->SendPacket(
+				packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
 		}
 	}
 }
 
-bool CIndexed::SendStoreRequest(const CUInt128& keyID)
+bool CIndexed::SendStoreRequest(const CUInt128 &keyID)
 {
-	Load* load = NULL;
+	Load *load = NULL;
 	LoadMap::iterator it = m_Load_map.find(keyID);
 	if (it != m_Load_map.end()) {
 		load = it->second;
@@ -925,12 +1088,13 @@
 }
 
 SSearchTerm::SSearchTerm()
-	: type(AND),
-	  tag(NULL),
-	  astr(NULL),
-	  left(NULL),
-	  right(NULL)
-{}
+: type(AND)
+, tag(NULL)
+, astr(NULL)
+, left(NULL)
+, right(NULL)
+{
+}
 
 SSearchTerm::~SSearchTerm()
 {

amule-3.0.1.tar.gz/src/kademlia/kademlia/Indexed.h -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Indexed.h Changed

@@ -36,17 +36,15 @@
 there client on the eMule forum..
 */
 
-#ifndef __INDEXED_H__
-#define __INDEXED_H__
-
+#ifndef INDEXED_H
+#define INDEXED_H
 
 #include "SearchManager.h"
 #include "Entry.h"
 
 class wxArrayString;
 
-
-typedef std::list<Kademlia::CEntry*> CKadEntryPtrList;
+typedef std::list<Kademlia::CEntry *> CKadEntryPtrList;
 
 struct Source
 {
@@ -54,8 +52,8 @@
 	CKadEntryPtrList entryList;
 };
 
-typedef std::list<Source*> CKadSourcePtrList;
-typedef std::map<Kademlia::CUInt128,Source*> CSourceKeyMap;
+typedef std::list<Source *> CKadSourcePtrList;
+typedef std::map<Kademlia::CUInt128, Source *> CSourceKeyMap;
 
 struct KeyHash
 {
@@ -63,7 +61,6 @@
 	CSourceKeyMap m_Source_map;
 };
 
-
 struct SrcHash
 {
 	Kademlia::CUInt128 keyID;
@@ -81,7 +78,8 @@
 	SSearchTerm();
 	~SSearchTerm();
 
-	enum ESearchTermType {
+	enum ESearchTermType
+	{
 		AND,
 		OR,
 		NOT,
@@ -95,19 +93,20 @@
 		OpNotEqual
 	} type;
 
-	CTag* tag;
-	wxArrayString* astr;
+	CTag *tag;
+	wxArrayString *astr;
 
-	SSearchTerm* left;
-	SSearchTerm* right;
+	SSearchTerm *left;
+	SSearchTerm *right;
 };
 
-typedef std::map<Kademlia::CUInt128,KeyHash*> KeyHashMap;
-typedef std::map<Kademlia::CUInt128,SrcHash*> SrcHashMap;
-typedef std::map<Kademlia::CUInt128,Load*> LoadMap;
+typedef std::map<Kademlia::CUInt128, KeyHash *> KeyHashMap;
+typedef std::map<Kademlia::CUInt128, SrcHash *> SrcHashMap;
+typedef std::map<Kademlia::CUInt128, Load *> LoadMap;
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
 class CKadUDPKey;
@@ -119,15 +118,35 @@
 	CIndexed();
 	~CIndexed();
 
-	bool AddKeyword(const CUInt128& keyWordID, const CUInt128& sourceID, Kademlia::CKeyEntry* entry, uint8_t& load);
-	bool AddSources(const CUInt128& keyWordID, const CUInt128& sourceID, Kademlia::CEntry* entry, uint8_t& load);
-	bool AddNotes(const CUInt128& keyID, const CUInt128& sourceID, Kademlia::CEntry* entry, uint8_t& load);
-	bool AddLoad(const CUInt128& keyID, uint32_t time);
+	bool AddKeyword(const CUInt128 &keyWordID,
+		const CUInt128 &sourceID,
+		Kademlia::CKeyEntry *entry,
+		uint8_t &load);
+	bool AddSources(
+		const CUInt128 &keyWordID, const CUInt128 &sourceID, Kademlia::CEntry *entry, uint8_t &load);
+	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 noexcept { return m_Keyword_map.size(); }
-	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);
+	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;
 	uint32_t m_totalIndexNotes;
@@ -146,7 +165,7 @@
 	void Clean();
 };
 
-} // End namespace
+} // namespace Kademlia
 
-#endif //__INDEXED_H__
+#endif // INDEXED_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/kademlia/kademlia/Kademlia.cpp -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Kademlia.cpp Changed

@@ -43,6 +43,11 @@
 #include "Defines.h"
 #include "Indexed.h"
 #include "UDPFirewallTester.h"
+#ifdef ENABLE_KAD_NODE_PROTECTION
+#include "../net/FastKad.h"
+#include "../net/SafeKad.h"
+#include "../../Statistics.h" // Needed for theStats::SetKadBannedAddresses
+#endif
 #include "../routing/RoutingZone.h"
 #include "../utils/KadUDPKey.h"
 #include "../utils/KadClientSearcher.h"
@@ -50,32 +55,32 @@
 #include "../../Logger.h"
 #include <protocol/kad2/Client2Client/UDP.h>
 
-#ifdef _MSC_VER  // silly warnings about deprecated functions
-#pragma warning(disable:4996)
+#ifdef _MSC_VER // silly warnings about deprecated functions
+#pragma warning(disable : 4996)
 #endif
 
-const CUInt128	Kademlia::s_nullUInt128(false);
+const CUInt128 Kademlia::s_nullUInt128(false);
 
 ////////////////////////////////////////
 using namespace Kademlia;
 ////////////////////////////////////////
 
-CKademlia *	CKademlia::instance = NULL;
-EventMap	CKademlia::m_events;
-time_t		CKademlia::m_nextSearchJumpStart;
-time_t		CKademlia::m_nextSelfLookup;
-time_t		CKademlia::m_statusUpdate;
-time_t		CKademlia::m_bigTimer;
-time_t		CKademlia::m_nextFirewallCheck;
-time_t		CKademlia::m_nextFindBuddy;
-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;
+CKademlia *CKademlia::instance = NULL;
+EventMap CKademlia::m_events;
+time_t CKademlia::m_nextSearchJumpStart;
+time_t CKademlia::m_nextSelfLookup;
+time_t CKademlia::m_statusUpdate;
+time_t CKademlia::m_bigTimer;
+time_t CKademlia::m_nextFirewallCheck;
+time_t CKademlia::m_nextFindBuddy;
+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)
 {
@@ -94,38 +99,27 @@
 
 	AddDebugLogLineN(logKadMain, "Starting Kademlia");
 
-	// Init jump start timer.
 	m_nextSearchJumpStart = time(NULL);
-	// Force a FindNodeComplete within the first 3 minutes.
 	m_nextSelfLookup = time(NULL) + MIN2S(3);
-	// Init status timer.
 	m_statusUpdate = time(NULL);
-	// Init big timer for Zones
 	m_bigTimer = time(NULL);
 	// First Firewall check is done on connect, init next check.
 	m_nextFirewallCheck = time(NULL) + (HR2S(1));
 	// Find a buddy after the first 5mins of starting the client.
 	// We wait just in case it takes a bit for the client to determine firewall status..
 	m_nextFindBuddy = time(NULL) + (MIN2S(5));
-	// Init contact consolidate timer;
 	m_consolidate = time(NULL) + (MIN2S(45));
-	// Look up our extern port
 	m_externPortLookup = time(NULL);
-	// Init bootstrap time.
 	m_bootstrap = 0;
-	// Init our random seed.
 	srand((uint32_t)time(NULL));
-	// Create our Kad objects.
 	instance = new CKademlia();
 	instance->m_prefs = prefs;
 	instance->m_indexed = new CIndexed();
 	instance->m_routingZone = new CRoutingZone();
 	instance->m_udpListener = new CKademliaUDPListener();
-	// Mark Kad as running state.
 	m_running = true;
 }
 
-
 void CKademlia::Stop()
 {
 	// Make sure we are running to begin with.
@@ -135,16 +129,12 @@
 
 	AddDebugLogLineN(logKadMain, "Stopping Kademlia");
 
-	// Mark Kad as being in the stop state to make sure nothing else is used.
 	m_running = false;
 
-	// Reset Firewallstate
 	CUDPFirewallTester::Reset();
 
-	// Remove all active searches.
 	CSearchManager::StopAllSearches();
 
-	// Delete all Kad Objects.
 	delete instance->m_udpListener;
 	instance->m_udpListener = NULL;
 
@@ -165,10 +155,15 @@
 	}
 	s_bootstrapList.clear();
 
-	// Make sure all zones are removed.
 	m_events.clear();
 
-//	theApp->ShowConnectionState();
+#ifdef ENABLE_KAD_NODE_PROTECTION
+	// The protection tables and the response-time window are keyed on addresses from a Kad
+	// session that has just ended; carrying them into the next one would judge fresh contacts
+	// on stale evidence, and Kad restarts on every reconnect.
+	safeKad.Clear();
+	fastKad.Clear();
+#endif
 }
 
 void CKademlia::Process()
@@ -207,15 +202,24 @@
 		m_nextFindBuddy = MIN2S(20) + now;
 	}
 
-	if (m_externPortLookup <= now && CUDPFirewallTester::IsFWCheckUDPRunning() && GetPrefs()->FindExternKadPort(false)) {
-		// If our UDP firewallcheck is running and we don't know our external port, we send a request every 15 seconds
+	if (m_externPortLookup <= now && CUDPFirewallTester::IsFWCheckUDPRunning() &&
+		GetPrefs()->FindExternKadPort(false)) {
+		// 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) {
-			AddDebugLogLineN(logKadPrefs, "Requesting our external port from " + KadIPToString(contact->GetIPAddress()));
+			AddDebugLogLineN(logKadPrefs,
+				"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());
+			GetUDPListener()->SendNullPacket(KADEMLIA2_PING,
+				contact->GetIPAddress(),
+				contact->GetUDPPort(),
+				contact->GetUDPKey(),
+				&contact->GetClientID());
 		} else {
-			AddDebugLogLineN(logKadPrefs, "No valid client for requesting external port available");
+			AddDebugLogLineN(
+				logKadPrefs, "No valid client for requesting external port available");
 		}
 		m_externPortLookup = 15 + now;
 	}
@@ -223,8 +227,9 @@
 	for (EventMap::const_iterator it = m_events.begin(); it != m_events.end(); ++it) {
 		CRoutingZone *zone = it->first;
 		if (updateUserFile) {
-			// 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
+			// EstimateCount is not made for really small networks. In LAN mode it is
+			// better to assume every user of the network is in our routing table and
+			// use the real count function.
 			if (IsRunningInLANMode()) {
 				tempUsers = zone->GetNumContacts();
 			} else {
@@ -237,13 +242,13 @@
 
 		if (m_bigTimer <= now) {
 			if (zone->m_nextBigTimer <= now) {
-				if(zone->OnBigTimer()) {
+				if (zone->OnBigTimer()) {
 					zone->m_nextBigTimer = HR2S(1) + now;
 					m_bigTimer = SEC(10) + now;
 				}
 			} else {
 				if (lastContact && (now - lastContact > KADEMLIADISCONNECTDELAY - MIN2S(5))) {
-					if(zone->OnBigTimer()) {
+					if (zone->OnBigTimer()) {
 						zone->m_nextBigTimer = HR2S(1) + now;
 						m_bigTimer = SEC(10) + now;
 					}
@@ -263,7 +268,13 @@
 		m_nextSearchJumpStart = SEARCH_JUMPSTART + now;
 	}
 
-	// Try to consolidate any zones that are close to empty.
+#ifdef ENABLE_KAD_NODE_PROTECTION
+	// Published as a gauge rather than counted at the ban: these bans lapse inside an aged map,
+	// and entries are also evicted when it is full, so there is no event to hang a decrement
+	// on.
+	theStats::SetKadBannedAddresses((uint32)safeKad.GetBannedAddressCount());
+#endif
+
 	if (m_consolidate <= now) {
 		uint32_t mergedCount = instance->m_routingZone->Consolidate();
 		if (mergedCount) {
@@ -272,7 +283,6 @@
 		m_consolidate = MIN2S(45) + now;
 	}
 
-	// Update user count only if changed.
 	if (updateUserFile) {
 		if (maxUsers != instance->m_prefs->GetKademliaUsers()) {
 			instance->m_prefs->SetKademliaUsers(maxUsers);
@@ -281,30 +291,48 @@
 		}
 	}
 
-	if (!IsConnected() && !s_bootstrapList.empty() && (now - m_bootstrap > 15 || (GetRoutingZone()->GetNumContacts() == 0 && now - m_bootstrap >= 2))) {
+	if (!IsConnected() && !s_bootstrapList.empty() &&
+		(now - m_bootstrap > 15 ||
+			(GetRoutingZone()->GetNumContacts() == 0 && now - m_bootstrap >= 2))) {
 		CContact *contact = s_bootstrapList.front();
 		s_bootstrapList.pop_front();
 		m_bootstrap = now;
-		AddDebugLogLineN(logKadMain, CFormat("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());
+		AddDebugLogLineN(logKadMain,
+			CFormat("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;
 	}
 
 	if (GetUDPListener() != NULL) {
-		GetUDPListener()->ExpireClientSearch();	// function does only one compare in most cases, so no real need for a timer
+		GetUDPListener()->ExpireClientSearch(); // function does only one compare in most cases, so no
+							// real need for a timer
 	}
 }
 
-void CKademlia::ProcessPacket(const uint8_t *data, uint32_t lenData, uint32_t ip, uint16_t port, bool validReceiverKey, const CKadUDPKey& senderKey)
+void CKademlia::ProcessPacket(const uint8_t *data,
+	uint32_t lenData,
+	uint32_t ip,
+	uint16_t port,
+	bool validReceiverKey,
+	const CKadUDPKey &senderKey)
 {
 	try {
-		if( instance && instance->m_udpListener ) {
-			instance->m_udpListener->ProcessPacket(data, lenData, ip, port, validReceiverKey, senderKey);
+		if (instance && instance->m_udpListener) {
+			instance->m_udpListener->ProcessPacket(
+				data, lenData, ip, port, validReceiverKey, senderKey);
 		}
-	} catch (const wxString& DEBUG_ONLY(error)) {
-		AddDebugLogLineN(logKadMain, CFormat("Exception on Kad ProcessPacket while processing packet (length = %u) from %s:")
-			% lenData % KadIPPortToString(ip, port));
+	} catch (const wxString &DEBUG_ONLY(error)) {
+		AddDebugLogLineN(logKadMain,
+			CFormat("Exception on Kad ProcessPacket while processing packet (length = %u) from "
+				"%s:") %
+				lenData % KadIPPortToString(ip, port));
 		AddDebugLogLineN(logKadMain, error);
 		throw;
 	} catch (...) {
@@ -316,26 +344,25 @@
 void CKademlia::RecheckFirewalled()
 {
 	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.
+		// Something is forcing a new firewall check. Stop new buddy requests and tell the
+		// client to recheck its IP, which in turn rechecks the firewall.
 		instance->m_prefs->SetFindBuddy(false);
 		instance->m_prefs->SetRecheckIP();
 		// also UDP check
 		CUDPFirewallTester::ReCheckFirewallUDP(false);
 		time_t now = time(NULL);
-		// Delay the next buddy search to at least 5 minutes after our firewallcheck so we are sure to be still firewalled
+		// Delay the next buddy search to at least 5 minutes after our firewallcheck so we are sure to
+		// be still firewalled
 		m_nextFindBuddy = (m_nextFindBuddy < MIN2S(5) + now) ? MIN2S(5) + now : m_nextFindBuddy;
 		m_nextFirewallCheck = HR2S(1) + now;
 	}
 }
 
-#if 0	// currently unused function
+#if 0 // currently unused function
 bool CKademlia::FindNodeIDByIP(CKadClientSearcher& requester, uint32_t ip, uint16_t tcpPort, uint16_t udpPort)
 {
 	wxCHECK(IsRunning() && instance && GetUDPListener() && GetRoutingZone(), false);
 
-	// first search our known contacts if we can deliver a result without asking, otherwise forward the request
 	CContact* contact;
 	if ((contact = GetRoutingZone()->GetContact(wxUINT32_SWAP_ALWAYS(ip), tcpPort, true)) != NULL) {
 		uint8_t nodeID16;
@@ -348,23 +375,26 @@
 }
 #endif
 
-bool CKademlia::FindIPByNodeID(CKadClientSearcher& requester, const uint8_t* nodeID)
+bool CKademlia::FindIPByNodeID(CKadClientSearcher &requester, const uint8_t *nodeID)
 {
 	wxCHECK(IsRunning() && instance && GetUDPListener(), false);
 
-	// first search our known contacts if we can deliver a result without asking, otherwise forward the request
-	CContact* contact;
+	// first search our known contacts if we can deliver a result without asking, otherwise forward the
+	// request
+	CContact *contact;
 	if ((contact = GetRoutingZone()->GetContact(CUInt128(nodeID))) != NULL) {
 		// make sure that this entry is not too old, otherwise just do a search to be sure
 		if (contact->GetLastSeen() != 0 && time(NULL) - contact->GetLastSeen() < 1800) {
-			requester.KadSearchIPByNodeIDResult(KCSR_SUCCEEDED, wxUINT32_SWAP_ALWAYS(contact->GetIPAddress()), contact->GetTCPPort());
+			requester.KadSearchIPByNodeIDResult(KCSR_SUCCEEDED,
+				wxUINT32_SWAP_ALWAYS(contact->GetIPAddress()),
+				contact->GetTCPPort());
 			return true;
 		}
 	}
 	return CSearchManager::FindNodeSpecial(CUInt128(nodeID), &requester);
 }
 
-void CKademlia::CancelClientSearch(CKadClientSearcher& fromRequester)
+void CKademlia::CancelClientSearch(CKadClientSearcher &fromRequester)
 {
 	wxCHECK_RET(instance && GetUDPListener(), "Something is really bad");
 
@@ -372,7 +402,7 @@
 	CSearchManager::CancelNodeSpecial(&fromRequester);
 }
 
-void CKademlia::StatsAddClosestDistance(const CUInt128& distance)
+void CKademlia::StatsAddClosestDistance(const CUInt128 &distance)
 {
 	if (distance.Get32BitChunk(0) > 0) {
 		uint32_t toAdd = (0xFFFFFFFF / distance.Get32BitChunk(0)) / 2;
@@ -393,16 +423,16 @@
 
 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
+	// Estimating the user count: on every search for a NodeID (except where the result is
+	// unusable) we remember the distance of the closest node found. NodeIDs are assumed to be
+	// distributed equally, so that distance says how "filled" the NodeID room is, and from that
+	// how many users there are. Each single sample is wrong, but their average is usable.
+	// Median-average rather than mean, so a few really close or really far hits cannot drift
+	// the result.
 
-	// 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
+	// Does not work well with no files to index and nothing to download, and the numbers look a
+	// bit low against our other method. Stay with the old one for now, but keep this as an
+	// alternative.
 
 	if (m_statsEstUsersProbes.size() < 10) {
 		return 0;
@@ -410,7 +440,9 @@
 	uint32_t median = 0;
 
 	std::list<uint32_t> medianList;
-	for (std::list<uint32_t>::iterator it1 = m_statsEstUsersProbes.begin(); it1 != m_statsEstUsersProbes.end(); ++it1) {
+	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) {
@@ -424,7 +456,8 @@
 			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
+	// 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();
@@ -436,22 +469,26 @@
 	}
 	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%)
+	// LowIDModififier. Assume 20% of users are firewalled and cannot be a contact, for < 0.49b
+	// nodes. For >= 0.49b use the actual firewalled ratio if we are not firewalled ourselves,
+	// or 40% if we are (the real Kad figure at this date 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
+		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
+		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) { // weigh the old and the new modifier based on how many new contacts we have
-		firewalledModifyTotal = (newRatio * firewalledModifyNew) + ((1 - newRatio) * firewalledModifyOld);
+	if (newRatio > 0 &&
+		firewalledModifyNew >
+			0) { // weigh the old and the new modifier based on how many new contacts we have
+		firewalledModifyTotal =
+			(newRatio * firewalledModifyNew) + ((1 - newRatio) * firewalledModifyOld);
 	} else {
 		firewalledModifyTotal = firewalledModifyOld;
 	}
@@ -470,8 +507,9 @@
 	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)
+		// Cap at 256 nodes: above that this is not the small home LAN that LAN mode
+		// assumes, and we would still need a firewall check, external port requests and so
+		// on.
 		if (count == 0 || count > 256) {
 			m_lanMode = false;
 		} else {
@@ -493,22 +531,21 @@
 	return m_lanMode;
 }
 
-
 // Global function.
 
 #include "../../CryptoPP_Inc.h"
-void KadGetKeywordHash(const wxString& rstrKeyword, Kademlia::CUInt128* pKadID)
+void KadGetKeywordHash(const wxString &rstrKeyword, Kademlia::CUInt128 *pKadID)
 {
 	uint8_t Output16;
 
 	CryptoPP::Weak::MD4 md4_hasher;
 
 	// This should be safe - we assume rstrKeyword is ANSI anyway.
-	char* ansi_buffer = strdup(unicode2UTF8(rstrKeyword));
+	char *ansi_buffer = strdup(unicode2UTF8(rstrKeyword));
 
-	//printf("Kad keyword hash: UTF8 %s\n",ansi_buffer);
-	md4_hasher.CalculateDigest(Output,(const unsigned char*)ansi_buffer,strlen(ansi_buffer));
-	//DumpMem(Output,16);
+	// printf("Kad keyword hash: UTF8 %s\n",ansi_buffer);
+	md4_hasher.CalculateDigest(Output, (const unsigned char *)ansi_buffer, strlen(ansi_buffer));
+	// DumpMem(Output,16);
 	free(ansi_buffer);
 
 	pKadID->SetValueBE(Output);

amule-3.0.1.tar.gz/src/kademlia/kademlia/Kademlia.h -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Kademlia.h Changed

@@ -38,8 +38,8 @@
 
 #include "Prefs.h"
 
-#ifndef __KAD_KADEMLIA_H__
-#define __KAD_KADEMLIA_H__
+#ifndef KADEMLIA_H
+#define KADEMLIA_H
 
 #include <map>
 #include "../utils/UInt128.h"
@@ -47,9 +47,9 @@
 #include "../net/KademliaUDPListener.h"
 #include <common/Macros.h>
 
-
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
 class CRoutingZone;
@@ -57,36 +57,89 @@
 class CKadUDPKey;
 class CKadClientSearcher;
 
-typedef std::map<CRoutingZone*, CRoutingZone*> EventMap;
+typedef std::map<CRoutingZone *, CRoutingZone *> EventMap;
 
 extern const CUInt128 s_nullUInt128;
 
 class CKademlia
 {
 public:
-	static void Start()		{ Start(new CPrefs); }
+	static void Start() { Start(new CPrefs); }
 	static void Start(CPrefs *prefs);
 	static void Stop();
 
-	static CPrefs *			GetPrefs() noexcept		{ if (instance == NULL || instance->m_prefs == NULL) return NULL; else return instance->m_prefs; }
-	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() noexcept		{ return m_running; }
-	static bool			IsConnected() noexcept		{ return instance && instance->m_prefs ? instance->m_prefs->HasHadContact() : false; }
-	static bool			IsFirewalled()
-		{ return instance && instance->m_prefs ? instance->m_prefs->GetFirewalled() && !IsRunningInLANMode() : true; }
-	static void			RecheckFirewalled();
-	static uint32_t			GetKademliaUsers(bool newMethod = false)
-		{ return instance && instance->m_prefs ? (newMethod ? CalculateKadUsersNew() : instance->m_prefs->GetKademliaUsers()) : 0; }
-	static uint32_t			GetKademliaFiles() noexcept	{ return instance && instance->m_prefs ? instance->m_prefs->GetKademliaFiles() : 0; }
-	static uint32_t			GetTotalStoreKey() noexcept	{ return instance && instance->m_prefs ? instance->m_prefs->GetTotalStoreKey() : 0; }
-	static uint32_t			GetTotalStoreSrc() noexcept	{ return instance && instance->m_prefs ? instance->m_prefs->GetTotalStoreSrc() : 0; }
-	static uint32_t			GetTotalStoreNotes() noexcept	{ return instance && instance->m_prefs ? instance->m_prefs->GetTotalStoreNotes() : 0; }
-	static uint32_t			GetTotalFile() noexcept		{ return instance && instance->m_prefs ? instance->m_prefs->GetTotalFile() : 0; }
-	static bool			GetPublish() noexcept		{ return instance && instance->m_prefs ? instance->m_prefs->GetPublish() : false; }
-	static uint32_t			GetIPAddress() noexcept		{ return instance && instance->m_prefs ? instance->m_prefs->GetIPAddress() : 0; }
-	static const CUInt128&		GetKadID() noexcept		{ return instance && instance->m_prefs ? instance->m_prefs->GetKadID() : s_nullUInt128; }
+	static CPrefs *GetPrefs() noexcept
+	{
+		if (instance == NULL || instance->m_prefs == NULL)
+			return NULL;
+		else
+			return instance->m_prefs;
+	}
+	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() noexcept { return m_running; }
+	static bool IsConnected() noexcept
+	{
+		return instance && instance->m_prefs ? instance->m_prefs->HasHadContact() : false;
+	}
+	static bool IsFirewalled()
+	{
+		return instance && instance->m_prefs
+			       ? instance->m_prefs->GetFirewalled() && !IsRunningInLANMode()
+			       : true;
+	}
+	static void RecheckFirewalled();
+	static uint32_t GetKademliaUsers(bool newMethod = false)
+	{
+		return instance && instance->m_prefs
+			       ? (newMethod ? CalculateKadUsersNew() : instance->m_prefs->GetKademliaUsers())
+			       : 0;
+	}
+	static uint32_t GetKademliaFiles() noexcept
+	{
+		return instance && instance->m_prefs ? instance->m_prefs->GetKademliaFiles() : 0;
+	}
+	static uint32_t GetTotalStoreKey() noexcept
+	{
+		return instance && instance->m_prefs ? instance->m_prefs->GetTotalStoreKey() : 0;
+	}
+	static uint32_t GetTotalStoreSrc() noexcept
+	{
+		return instance && instance->m_prefs ? instance->m_prefs->GetTotalStoreSrc() : 0;
+	}
+	static uint32_t GetTotalStoreNotes() noexcept
+	{
+		return instance && instance->m_prefs ? instance->m_prefs->GetTotalStoreNotes() : 0;
+	}
+	static uint32_t GetTotalFile() noexcept
+	{
+		return instance && instance->m_prefs ? instance->m_prefs->GetTotalFile() : 0;
+	}
+	static bool GetPublish() noexcept
+	{
+		return instance && instance->m_prefs ? instance->m_prefs->GetPublish() : false;
+	}
+	static uint32_t GetIPAddress() noexcept
+	{
+		return instance && instance->m_prefs ? instance->m_prefs->GetIPAddress() : 0;
+	}
+	static const CUInt128 &GetKadID() noexcept
+	{
+		return instance && instance->m_prefs ? instance->m_prefs->GetKadID() : s_nullUInt128;
+	}
 
 	static void Bootstrap(uint32_t ip, uint16_t port)
 	{
@@ -97,49 +150,55 @@
 		}
 	}
 
-	static void ProcessPacket(const uint8_t* data, uint32_t lenData, uint32_t ip, uint16_t port, bool validReceiverKey, const CKadUDPKey& senderKey);
+	static void ProcessPacket(const uint8_t *data,
+		uint32_t lenData,
+		uint32_t ip,
+		uint16_t port,
+		bool validReceiverKey,
+		const CKadUDPKey &senderKey);
 
-	static void AddEvent(CRoutingZone *zone) noexcept		{ m_eventszone = zone; }
-	static void RemoveEvent(CRoutingZone *zone)			{ m_events.erase(zone); }
+	static void AddEvent(CRoutingZone *zone) noexcept { m_eventszone = 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 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;
+	static ContactList s_bootstrapList;
 
 private:
 	CKademlia() {}
 
-	static uint32_t	CalculateKadUsersNew();
+	static uint32_t CalculateKadUsersNew();
 
 	static CKademlia *instance;
-	static EventMap	m_events;
-	static time_t	m_nextSearchJumpStart;
-	static time_t	m_nextSelfLookup;
-	static time_t	m_nextFirewallCheck;
-	static time_t	m_nextFindBuddy;
-	static time_t	m_statusUpdate;
-	static time_t	m_bigTimer;
-	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;
-	CKademliaUDPListener *	m_udpListener;
-	CIndexed *		m_indexed;
+	static EventMap m_events;
+	static time_t m_nextSearchJumpStart;
+	static time_t m_nextSelfLookup;
+	static time_t m_nextFirewallCheck;
+	static time_t m_nextFindBuddy;
+	static time_t m_statusUpdate;
+	static time_t m_bigTimer;
+	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;
+	CKademliaUDPListener *m_udpListener;
+	CIndexed *m_indexed;
 };
 
-} // End namespace
+} // namespace Kademlia
 
-void KadGetKeywordHash(const wxString& rstrKeyword, Kademlia::CUInt128* pKadID);
-wxString KadGetKeywordBytes(const wxString& rstrKeywordW);
+void KadGetKeywordHash(const wxString &rstrKeyword, Kademlia::CUInt128 *pKadID);
+wxString KadGetKeywordBytes(const wxString &rstrKeywordW);
 
-#endif // __KAD_KADEMLIA_H__
+#endif // KADEMLIA_H

amule-3.0.1.tar.gz/src/kademlia/kademlia/Prefs.cpp -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Prefs.cpp Changed

@@ -48,15 +48,13 @@
 #include "../../ServerList.h"
 #include "../../Logger.h"
 #include "../../ArchSpecific.h"
-#include "../../RandomFunctions.h"		// Needed for GetRandomUint128()
-
+#include "../../RandomFunctions.h" // Needed for GetRandomUint128()
 
 ////////////////////////////////////////
 using namespace Kademlia;
 ////////////////////////////////////////
 
-#define EXTERNAL_PORT_ASKIPS	3
-
+#define EXTERNAL_PORT_ASKIPS 3
 
 CPrefs::CPrefs()
 {
@@ -70,7 +68,7 @@
 	}
 }
 
-void CPrefs::Init(const wxString& filename)
+void CPrefs::Init(const wxString &filename)
 {
 	m_clientID = GetRandomUint128();
 	m_lastContact = 0;
@@ -87,8 +85,8 @@
 	m_ip = 0;
 	m_ipLast = 0;
 	m_findBuddy = false;
-	m_kademliaUsers	= 0;
-	m_kademliaFiles	= 0;
+	m_kademliaUsers = 0;
+	m_kademliaFiles = 0;
 	m_filename = filename;
 	m_lastFirewallState = true;
 	m_externKadPort = 0;
@@ -119,7 +117,7 @@
 				m_clientID = GetRandomUint128();
 			file.Close();
 		}
-	} catch (const CSafeIOException& e) {
+	} catch (const CSafeIOException &e) {
 		AddDebugLogLineC(logKadPrefs, "IO error while reading prefs: " + e.what());
 	}
 }
@@ -130,53 +128,52 @@
 		CFile file;
 		if (file.Open(m_filename, CFile::write)) {
 			file.WriteUInt32(m_ip);
-			file.WriteUInt16(0); //This is no longer used.
+			file.WriteUInt16(0); // This is no longer used.
 			file.WriteUInt128(m_clientID);
-			file.WriteUInt8(0); //This is to tell older clients there are no tags..
+			file.WriteUInt8(0); // This is to tell older clients there are no tags..
 			file.Close();
 		}
-	} catch (const CIOFailureException& e) {
+	} catch (const CIOFailureException &e) {
 		AddDebugLogLineC(logKadPrefs, "IO failure while saving kad-prefs: " + e.what());
 	}
 }
 
 void CPrefs::SetIPAddress(uint32_t val) noexcept
 {
-	//This is our first check on connect, init our IP..
-	if ( !val || !m_ipLast ) {
+	// This is our first check on connect, init our IP..
+	if (!val || !m_ipLast) {
 		m_ip = val;
 		m_ipLast = val;
 	}
-	//If the last check matches this one, reset our current IP.
-	//If the last check does not match, wait for our next incoming IP.
-	//This happens for two reasons.. We just changed our IP, or a client responded with a bad IP.
-	if ( val == m_ipLast ) {
+	// If the last check matches this one, reset our current IP; if not, wait for our next
+	// incoming IP. A mismatch means either that we just changed our IP or that a client
+	// responded with a bad one.
+	if (val == m_ipLast) {
 		m_ip = val;
 	} else {
 		m_ipLast = val;
 	}
 }
 
-
 bool CPrefs::GetFirewalled() const noexcept
 {
 	if (m_firewalled < 2) {
-		//Not enough people have told us we are open but we may be doing a recheck
-		//at the moment which will give a false lowID.. Therefore we check to see
-		//if we are still rechecking and will report our last known state..
+		// Not enough people have told us we are open, but we may be doing a recheck right
+		// now, which would give a false lowID. So check whether we are still rechecking and
+		// report our last known state.
 		if (GetRecheckIP()) {
 			return m_lastFirewallState;
 		}
 		return true;
 	}
-	//We had enough tell us we are not firewalled..
+	// We had enough tell us we are not firewalled..
 	return false;
 }
 
 void CPrefs::SetFirewalled()
 {
-	//Are are checking our firewall state.. Let keep a snapshot of our
-	//current state to prevent false reports during the recheck..
+	// Are are checking our firewall state.. Let keep a snapshot of our
+	// current state to prevent false reports during the recheck..
 	m_lastFirewallState = (m_firewalled < 2);
 	m_firewalled = 0;
 	theApp->ShowConnectionState();
@@ -190,23 +187,23 @@
 
 void CPrefs::SetKademliaFiles()
 {
-	//There is no real way to know how many files are in the Kad network..
-	//So we first try to see how many files per user are in the ED2K network..
-	//If that fails, we use a set value based on previous tests..
+	// There is no real way to know how many files are in the Kad network, so first try how many
+	// files per user the ED2K network has. If that fails, use a set value based on previous
+	// tests.
 	uint32_t nServerAverage = theApp->serverlist->GetAvgFile();
 	uint32_t nKadAverage = Kademlia::CKademlia::GetIndexed()->GetFileKeyCount();
 
-	DEBUG_ONLY( wxString method; )
+	DEBUG_ONLY(wxString method;)
 
 	if (nServerAverage > nKadAverage) {
-		DEBUG_ONLY( method = CFormat("Kad file estimate used Server avg(%u)") % nServerAverage; )
+		DEBUG_ONLY(method = CFormat("Kad file estimate used Server avg(%u)") % nServerAverage;)
 		nKadAverage = nServerAverage;
 	} else {
-		DEBUG_ONLY( method = CFormat("Kad file estimate used Kad avg(%u)") % nKadAverage; )
+		DEBUG_ONLY(method = CFormat("Kad file estimate used Kad avg(%u)") % nKadAverage;)
 	}
 
-	if( nKadAverage < 108 ) {
-		DEBUG_ONLY( method = wxString("Kad file estimate used default avg(108, min value)"); )
+	if (nKadAverage < 108) {
+		DEBUG_ONLY(method = wxString("Kad file estimate used default avg(108, min value)");)
 		nKadAverage = 108;
 	}
 
@@ -216,26 +213,29 @@
 
 uint8_t CPrefs::GetMyConnectOptions(bool encryption, bool callback)
 {
-       // Connect options Tag
-       // 4 Reserved (!)
-       // 1 Direct Callback
-       // 1 CryptLayer Required
-       // 1 CryptLayer Requested
-       // 1 CryptLayer Supported
-
-       // direct callback is only possible if connected to kad, tcp firewalled and verified UDP open (for example on a full cone NAT)
-
-       return    ((callback && theApp->IsFirewalled() && CKademlia::IsRunning() && !CUDPFirewallTester::IsFirewalledUDP(true) && CUDPFirewallTester::IsVerified()) ? 0x08 : 0)
-	       | ((thePrefs::IsClientCryptLayerRequired() && encryption) ? 0x04 : 0)
-	       | ((thePrefs::IsClientCryptLayerRequested() && encryption) ? 0x02 : 0)
-	       | ((thePrefs::IsClientCryptLayerSupported() && encryption) ? 0x01 : 0);
+	// Connect options tag: 4 reserved (!), 1 direct callback, 1 CryptLayer required,
+	// 1 CryptLayer requested, 1 CryptLayer supported.
+
+	// direct callback is only possible if connected to kad, tcp firewalled and verified UDP open (for
+	// example on a full cone NAT)
+
+	return ((callback && theApp->IsFirewalled() && CKademlia::IsRunning() &&
+			!CUDPFirewallTester::IsFirewalledUDP(true) && CUDPFirewallTester::IsVerified())
+			       ? 0x08
+			       : 0) |
+	       ((thePrefs::IsClientCryptLayerRequired() && encryption) ? 0x04 : 0) |
+	       ((thePrefs::IsClientCryptLayerRequested() && encryption) ? 0x02 : 0) |
+	       ((thePrefs::IsClientCryptLayerSupported() && encryption) ? 0x01 : 0);
 }
 
 uint32_t CPrefs::GetUDPVerifyKey(uint32_t targetIP)
 {
 	uint64_t buffer = (uint64_t)thePrefs::GetKadUDPKey() << 32 | targetIP;
 	MD5Sum md5((const uint8_t *)&buffer, 8);
-	return (uint32_t)(PeekUInt32(md5.GetRawHash()) ^ PeekUInt32(md5.GetRawHash() + 4) ^ PeekUInt32(md5.GetRawHash() + 8) ^ PeekUInt32(md5.GetRawHash() + 12)) % 0xFFFFFFFE + 1;
+	return (uint32_t)(PeekUInt32(md5.GetRawHash()) ^ PeekUInt32(md5.GetRawHash() + 4) ^
+			  PeekUInt32(md5.GetRawHash() + 8) ^ PeekUInt32(md5.GetRawHash() + 12)) %
+		       0xFFFFFFFE +
+	       1;
 }
 
 float CPrefs::StatsGetFirewalledRatio(bool udp) const noexcept
@@ -244,13 +244,15 @@
 	// will only work once enough > 0.49b nodes have spread and only if we are not UDP firewalled ourself
 	if (udp) {
 		if (m_statsUDPFirewalledNodes > 0 && m_statsUDPOpenNodes > 10) {
-			return ((float)m_statsUDPFirewalledNodes / (float)(m_statsUDPFirewalledNodes + m_statsUDPOpenNodes));
+			return ((float)m_statsUDPFirewalledNodes /
+				(float)(m_statsUDPFirewalledNodes + m_statsUDPOpenNodes));
 		} else {
 			return 0;
 		}
 	} else {
 		if (m_statsTCPFirewalledNodes > 0 && m_statsTCPOpenNodes > 10) {
-			return ((float)m_statsTCPFirewalledNodes / (float)(m_statsTCPFirewalledNodes + m_statsTCPOpenNodes));
+			return ((float)m_statsTCPFirewalledNodes /
+				(float)(m_statsTCPFirewalledNodes + m_statsTCPOpenNodes));
 		} else {
 			return 0;
 		}
@@ -259,15 +261,20 @@
 
 float CPrefs::StatsGetKadV8Ratio()
 {
-	// this function is basically just a buffer, so we don't recount all nodes everytime we need the result
+	// this function is basically just a buffer, so we don't recount all nodes everytime we need the
+	// result
 	time_t now = time(NULL);
 	if (m_statsKadV8LastChecked + 60 < now) {
 		m_statsKadV8LastChecked = now;
 		uint32_t nV8Contacts = 0;
 		uint32_t nNonV8Contacts = 0;
 		CKademlia::GetRoutingZone()->GetNumContacts(nV8Contacts, nNonV8Contacts, 8);
-		AddDebugLogLineN(logKadRouting, CFormat("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("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 {
@@ -286,14 +293,18 @@
 			}
 		}
 		m_externPortIPs.push_back(fromIP);
-		AddDebugLogLineN(logKadPrefs, CFormat("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
+		AddDebugLogLineN(logKadPrefs,
+			CFormat("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_externPortsi == port) {
 				m_externKadPort = port;
 				AddDebugLogLineN(logKadPrefs, CFormat("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
+					// add empty entries so we know the check has finished even if we
+					// asked less than max IPs
 					m_externPortIPs.push_back(0);
 				}
 				return;
@@ -301,7 +312,8 @@
 		}
 		m_externPorts.push_back(port);
 		if (!FindExternKadPort(false)) {
-			AddDebugLogLineN(logKadPrefs, "Our external port seems unreliable, not using it for firewallchecks");
+			AddDebugLogLineN(logKadPrefs,
+				"Our external port seems unreliable, not using it for firewallchecks");
 			m_externKadPort = 0;
 		}
 	}

amule-3.0.1.tar.gz/src/kademlia/kademlia/Prefs.h -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Prefs.h Changed

@@ -36,8 +36,8 @@
 there client on the eMule forum..
 */
 
-#ifndef __PREFS_H__
-#define __PREFS_H__
+#ifndef PREFS_H
+#define PREFS_H
 
 #include "../utils/UInt128.h"
 #include "../../Preferences.h"
@@ -46,7 +46,8 @@
 #include <vector>
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
 class CPrefs
@@ -55,117 +56,133 @@
 	CPrefs();
 	~CPrefs();
 
-	void	SetKadID(const CUInt128 &id) noexcept		{ m_clientID = id; }
-	const CUInt128&	GetKadID() const noexcept		{ return m_clientID; }
+	void SetKadID(const CUInt128 &id) noexcept { m_clientID = id; }
+	const CUInt128 &GetKadID() const noexcept { return m_clientID; }
 
-	void	SetClientHash(const CUInt128 &id) noexcept	{ m_clientHash = id; }
-	const CUInt128& GetClientHash() const noexcept		{ return m_clientHash; }
+	void SetClientHash(const CUInt128 &id) noexcept { m_clientHash = id; }
+	const CUInt128 &GetClientHash() const noexcept { return m_clientHash; }
 
-	uint32_t GetIPAddress() const noexcept			{ return m_ip; }
-	void	 SetIPAddress(uint32_t val) noexcept;
+	uint32_t GetIPAddress() const noexcept { return m_ip; }
+	void SetIPAddress(uint32_t val) noexcept;
 
-	bool	GetRecheckIP() const noexcept			{ return (m_recheckip < KADEMLIAFIREWALLCHECKS); }
-	void	SetRecheckIP()					{ m_recheckip = 0; SetFirewalled(); }
-	void	IncRecheckIP() noexcept				{ m_recheckip++; }
+	bool GetRecheckIP() const noexcept { return (m_recheckip < KADEMLIAFIREWALLCHECKS); }
+	void SetRecheckIP()
+	{
+		m_recheckip = 0;
+		SetFirewalled();
+	}
+	void IncRecheckIP() noexcept { m_recheckip++; }
 
-	bool	HasHadContact() const noexcept			{ return m_lastContact ? ((time(NULL) - m_lastContact) < KADEMLIADISCONNECTDELAY) : false; }
-	void	SetLastContact() noexcept			{ m_lastContact = time(NULL); }
-	bool	HasLostConnection() const noexcept		{ return m_lastContact ? !((time(NULL) - m_lastContact) < KADEMLIADISCONNECTDELAY) : false; }
-	uint32_t GetLastContact() const noexcept			{ return m_lastContact; }
+	bool HasHadContact() const noexcept
+	{
+		return m_lastContact ? ((time(NULL) - m_lastContact) < KADEMLIADISCONNECTDELAY) : false;
+	}
+	void SetLastContact() noexcept { m_lastContact = time(NULL); }
+	bool HasLostConnection() const noexcept
+	{
+		return m_lastContact ? !((time(NULL) - m_lastContact) < KADEMLIADISCONNECTDELAY) : false;
+	}
+	uint32_t GetLastContact() const noexcept { return m_lastContact; }
 
-	bool	GetFirewalled() const noexcept;
-	void	SetFirewalled();
-	void	IncFirewalled();
+	bool GetFirewalled() const noexcept;
+	void SetFirewalled();
+	void IncFirewalled();
 
-	uint8_t	GetTotalFile() const noexcept			{ return m_totalFile; }
-	void	SetTotalFile(uint8_t val) noexcept		{ m_totalFile = val; }
+	uint8_t GetTotalFile() const noexcept { return m_totalFile; }
+	void SetTotalFile(uint8_t val) noexcept { m_totalFile = val; }
 
-	uint8_t	GetTotalStoreSrc() const noexcept		{ return m_totalStoreSrc; }
-	void	SetTotalStoreSrc(uint8_t val) noexcept		{ m_totalStoreSrc = val; }
+	uint8_t GetTotalStoreSrc() const noexcept { return m_totalStoreSrc; }
+	void SetTotalStoreSrc(uint8_t val) noexcept { m_totalStoreSrc = val; }
 
-	uint8_t	GetTotalStoreKey() const noexcept		{ return m_totalStoreKey; }
-	void	SetTotalStoreKey(uint8_t val) noexcept		{ m_totalStoreKey = val; }
+	uint8_t GetTotalStoreKey() const noexcept { return m_totalStoreKey; }
+	void SetTotalStoreKey(uint8_t val) noexcept { m_totalStoreKey = val; }
 
-	uint8_t	GetTotalSource() const noexcept			{ return m_totalSource; }
-	void	SetTotalSource(uint8_t val) noexcept		{ m_totalSource = val; }
+	uint8_t GetTotalSource() const noexcept { return m_totalSource; }
+	void SetTotalSource(uint8_t val) noexcept { m_totalSource = val; }
 
-	uint8_t	GetTotalNotes() const noexcept			{ return m_totalNotes; }
-	void	SetTotalNotes(uint8_t val) noexcept		{ m_totalNotes = val; }
+	uint8_t GetTotalNotes() const noexcept { return m_totalNotes; }
+	void SetTotalNotes(uint8_t val) noexcept { m_totalNotes = val; }
 
-	uint8_t	GetTotalStoreNotes() const noexcept		{ return m_totalStoreNotes; }
-	void	SetTotalStoreNotes(uint8_t val) noexcept		{ m_totalStoreNotes = val; }
+	uint8_t GetTotalStoreNotes() const noexcept { return m_totalStoreNotes; }
+	void SetTotalStoreNotes(uint8_t val) noexcept { m_totalStoreNotes = val; }
 
-	uint32_t GetKademliaUsers() const noexcept		{ return m_kademliaUsers; }
-	void	 SetKademliaUsers(uint32_t val) noexcept		{ m_kademliaUsers = val; }
+	uint32_t GetKademliaUsers() const noexcept { return m_kademliaUsers; }
+	void SetKademliaUsers(uint32_t val) noexcept { m_kademliaUsers = val; }
 
-	uint32_t GetKademliaFiles() const noexcept		{ return m_kademliaFiles; }
-	void	 SetKademliaFiles();
+	uint32_t GetKademliaFiles() const noexcept { return m_kademliaFiles; }
+	void SetKademliaFiles();
 
-	bool	GetPublish() const noexcept			{ return m_Publish; }
-	void	SetPublish(bool val) noexcept			{ m_Publish = val; }
+	bool GetPublish() const noexcept { return m_Publish; }
+	void SetPublish(bool val) noexcept { m_Publish = val; }
 
-	bool	GetFindBuddy() noexcept				{ return m_findBuddy ? m_findBuddy = false, true : false; }
-	void	SetFindBuddy(bool val = true) noexcept		{ m_findBuddy = val; }
+	bool GetFindBuddy() noexcept { return m_findBuddy ? m_findBuddy = false, true : false; }
+	void SetFindBuddy(bool val = true) noexcept { m_findBuddy = val; }
 
-	bool	GetUseExternKadPort() const;
-	void	SetUseExternKadPort(bool val) noexcept		{ m_useExternKadPort = val; }
+	bool GetUseExternKadPort() const;
+	void SetUseExternKadPort(bool val) noexcept { m_useExternKadPort = val; }
 
-	uint16_t GetExternalKadPort() const noexcept		{ return m_externKadPort; }
-	uint16_t GetInternKadPort() const noexcept		{ return thePrefs::GetUDPPort(); }
-	void	 SetExternKadPort(uint16_t port, uint32_t fromIP);
-	bool	 FindExternKadPort(bool reset = false);
+	uint16_t GetExternalKadPort() const noexcept { return m_externKadPort; }
+	uint16_t GetInternKadPort() const noexcept { return thePrefs::GetUDPPort(); }
+	void SetExternKadPort(uint16_t port, uint32_t fromIP);
+	bool FindExternKadPort(bool reset = false);
 
-	static uint8_t	GetMyConnectOptions(bool encryption = true, bool callback = true);
+	static uint8_t GetMyConnectOptions(bool encryption = true, bool callback = true);
 	static uint32_t GetUDPVerifyKey(uint32_t targetIP);
 
 	// Statistics
-	void	StatsIncUDPFirewalledNodes(bool firewalled) noexcept	{ firewalled ? ++m_statsUDPFirewalledNodes : ++m_statsUDPOpenNodes; }
-	void	StatsIncTCPFirewalledNodes(bool firewalled) noexcept	{ firewalled ? ++m_statsTCPFirewalledNodes : ++m_statsTCPOpenNodes; }
-	float	StatsGetFirewalledRatio(bool udp) const noexcept;
-	float	StatsGetKadV8Ratio();
+	void StatsIncUDPFirewalledNodes(bool firewalled) noexcept
+	{
+		firewalled ? ++m_statsUDPFirewalledNodes : ++m_statsUDPOpenNodes;
+	}
+	void StatsIncTCPFirewalledNodes(bool firewalled) noexcept
+	{
+		firewalled ? ++m_statsTCPFirewalledNodes : ++m_statsTCPOpenNodes;
+	}
+	float StatsGetFirewalledRatio(bool udp) const noexcept;
+	float StatsGetKadV8Ratio();
 
 private:
-	wxString	m_filename;
-
-	time_t		m_lastContact;
-	CUInt128	m_clientID;
-	CUInt128	m_clientHash;
-	uint32_t	m_ip;
-	uint32_t	m_ipLast;
-	uint32_t	m_recheckip;
-	uint32_t	m_firewalled;
-	uint32_t	m_kademliaUsers;
-	uint32_t	m_kademliaFiles;
-	uint8_t		m_totalFile;
-	uint8_t		m_totalStoreSrc;
-	uint8_t		m_totalStoreKey;
-	uint8_t		m_totalSource;
-	uint8_t		m_totalNotes;
-	uint8_t		m_totalStoreNotes;
-	bool		m_Publish;
-	bool		m_findBuddy;
-	bool		m_lastFirewallState;
-	bool		m_useExternKadPort;
-	uint16_t	m_externKadPort;
-	std::vector<uint32_t>	m_externPortIPs;
-	std::vector<uint16_t>	m_externPorts;
+	wxString m_filename;
+
+	time_t m_lastContact;
+	CUInt128 m_clientID;
+	CUInt128 m_clientHash;
+	uint32_t m_ip;
+	uint32_t m_ipLast;
+	uint32_t m_recheckip;
+	uint32_t m_firewalled;
+	uint32_t m_kademliaUsers;
+	uint32_t m_kademliaFiles;
+	uint8_t m_totalFile;
+	uint8_t m_totalStoreSrc;
+	uint8_t m_totalStoreKey;
+	uint8_t m_totalSource;
+	uint8_t m_totalNotes;
+	uint8_t m_totalStoreNotes;
+	bool m_Publish;
+	bool m_findBuddy;
+	bool m_lastFirewallState;
+	bool m_useExternKadPort;
+	uint16_t m_externKadPort;
+	std::vector<uint32_t> m_externPortIPs;
+	std::vector<uint16_t> m_externPorts;
 
 	// Statistics
-	uint32_t	m_statsUDPOpenNodes;
-	uint32_t	m_statsUDPFirewalledNodes;
-	uint32_t	m_statsTCPOpenNodes;
-	uint32_t	m_statsTCPFirewalledNodes;
-	time_t		m_statsKadV8LastChecked;
-	float		m_statsKadV8Ratio;
-
-	void Init(const wxString& filename);
+	uint32_t m_statsUDPOpenNodes;
+	uint32_t m_statsUDPFirewalledNodes;
+	uint32_t m_statsTCPOpenNodes;
+	uint32_t m_statsTCPFirewalledNodes;
+	time_t m_statsKadV8LastChecked;
+	float m_statsKadV8Ratio;
+
+	void Init(const wxString &filename);
 	//	void Reset();
 	//	void SetDefaults();
 	void ReadFile();
 	void WriteFile();
 };
 
-} // End namespace
+} // namespace Kademlia
 
 #include "Kademlia.h"
 
@@ -174,5 +191,5 @@
 	return m_useExternKadPort && !Kademlia::CKademlia::IsRunningInLANMode();
 }
 
-#endif //__PREFS_H__
+#endif // PREFS_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/kademlia/kademlia/Search.cpp -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Search.cpp Changed

@@ -4,7 +4,8 @@
 // Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
 // Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
 // 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 )
+// 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
@@ -43,10 +44,16 @@
 #include <protocol/kad/Client2Client/UDP.h>
 #include <protocol/kad/Constants.h>
 #include <protocol/kad2/Client2Client/UDP.h>
+#include <protocol/kad2/Constants.h> // Needed for KADEMLIA_VERSION9_50a
 #include <tags/FileTags.h>
 
 #include "Defines.h"
+#include "AICHHashList.h"
 #include "UDPFirewallTester.h"
+#ifdef ENABLE_KAD_NODE_PROTECTION
+#include "../net/FastKad.h"
+#include "../net/SafeKad.h"
+#endif
 #include "../routing/RoutingZone.h"
 #include "../routing/Contact.h"
 #include "../net/KademliaUDPListener.h"
@@ -55,18 +62,31 @@
 #include "../../SharedFileList.h"
 #include "../../DownloadQueue.h"
 #include "../../PartFile.h"
+#include "../../SHAHashSet.h" // Needed for CAICHHash on Kad keyword storage
 #include "../../SearchList.h"
 #include "../../MemFile.h"
 #include "../../ClientList.h"
 #include "../../updownclient.h"
+#include "../../PeerCapabilities.h" // Needed for DecodeIPv6HexTag
 #include "../../Logger.h"
 #include "../../Preferences.h"
+#ifdef ENABLE_KAD_NODE_PROTECTION
+#include "../../GetTickCount.h"     // Needed for GetTickCount64
+#include "../../NetworkFunctions.h" // Needed for KadIPPortToString
+#endif
 #include "../../GuiEvents.h"
 
 ////////////////////////////////////////
 using namespace Kademlia;
 ////////////////////////////////////////
 
+// CKadAICHHashList is written against a plain 20-byte array so that the codec pinning
+// TAG_KADAICHHASHPUB / TAG_KADAICHHASHRESULT stays testable without SHAHashSet.cpp behind it. This
+// is where the two definitions of "AICH root hash size" meet, so this is where they are held
+// together.
+static_assert(
+	Kademlia::KAD_AICH_HASH_SIZE == HASHSIZE, "Kad AICH hash size must match the AICH root hash size");
+
 CSearch::CSearch()
 {
 	m_created = time(NULL);
@@ -74,15 +94,18 @@
 	m_answers = 0;
 	m_totalRequestAnswers = 0;
 	m_searchID = (uint32_t)-1;
+	m_searchIDAssigned = false;
 	m_stopping = false;
 	m_totalLoad = 0;
 	m_totalLoadResponses = 0;
 	m_lastResponse = m_created;
+#ifdef ENABLE_KAD_NODE_PROTECTION
+	m_lastResponseTick = ::GetTickCount64();
+#endif
 	m_searchTermsData = NULL;
 	m_searchTermsDataSize = 0;
 	m_nodeSpecialSearchRequester = NULL;
 	m_closestDistantFound = 0;
-	// m_requestedMoreNodes default-constructs empty
 }
 
 CSearch::~CSearch()
@@ -90,41 +113,69 @@
 	// 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;
+	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);
 	}
 
-	// Check if a source search is currently being done.
-	CPartFile* temp = theApp->downloadqueue->GetFileByKadFileSearchID(GetSearchID());
+	CPartFile *temp = theApp->downloadqueue->GetFileByKadFileSearchID(GetSearchID());
 
-	// Reset the searchID if a source search is currently being done.
 	if (temp) {
 		temp->SetKadFileSearchID(0);
 	}
 
-	// Decrease the use count for any contacts that are in our contact list.
+	// If this was an on-demand notes lookup, clear the running flag on the target
+	// file so a fresh lookup can be requested later.
+	if (m_type == NOTES) {
+		uint8_t fileid16;
+		m_target.ToByteArray(fileid);
+		const CMD4Hash fileHash(fileid);
+		// Clear the running flag on EVERY local object that shares this hash. The lookup
+		// may have been triggered from a search result while the same file is also
+		// downloading or shared (two objects, one hash), and the flag was set on whichever
+		// one the user used -- so two independent `if`s, not an `else if`.
+		CKnownFile *knownFile = theApp->sharedfiles->GetFileByID(fileHash);
+		if (!knownFile) {
+			knownFile = theApp->downloadqueue->GetFileByID(fileHash);
+		}
+		if (knownFile) {
+			knownFile->SetKadCommentSearchRunning(false);
+			// Bump the file's EC generation so the next incremental update re-
+			// serializes it: this is how amulegui and amuleapi learn the notes lookup
+			// finished (they poll GET_UPDATE, which otherwise skips an unchanged
+			// partfile).
+			knownFile->MarkECChanged();
+		}
+		// Clear the flag on EVERY search result sharing this hash: the same file can be
+		// shown in several open searches at once, and all were marked running. Search files
+		// carry no EC change-generation, so the cleared flag rides the next periodic
+		// search-results poll.
+		std::vector<CSearchFile *> searchFiles;
+		theApp->searchlist->GetAllSearchFilesByID(fileHash, searchFiles);
+		for (CSearchFile *searchFile : searchFiles) {
+			searchFile->SetKadCommentSearchRunning(false);
+		}
+	}
+
 	for (ContactMap::iterator it = m_inUse.begin(); it != m_inUse.end(); ++it) {
 		it->second->DecUse();
 	}
 
-	// Delete any temp contacts...
 	for (ContactList::const_iterator it = m_delete.begin(); it != m_delete.end(); ++it) {
 		if (!(*it)->InUse()) {
 			delete *it;
@@ -133,100 +184,93 @@
 
 	// Check if this search was containing an overload node and adjust time of next time we use that node.
 	if (CKademlia::IsRunning() && GetNodeLoad() > 20) {
-		switch(GetSearchTypes()) {
-			case CSearch::STOREKEYWORD:
-				Kademlia::CKademlia::GetIndexed()->AddLoad(GetTarget(), ((uint32_t)(DAY2S(7)*((double)GetNodeLoad()/100.0))+(uint32_t)time(NULL)));
-				break;
+		switch (GetSearchTypes()) {
+		case CSearch::STOREKEYWORD:
+			Kademlia::CKademlia::GetIndexed()->AddLoad(GetTarget(),
+				((uint32_t)(DAY2S(7) * ((double)GetNodeLoad() / 100.0)) +
+					(uint32_t)time(NULL)));
+			break;
 		}
 	}
 
-	if (m_searchTermsData) {
-		delete  m_searchTermsData;
-	}
+	delete m_searchTermsData;
 
 	switch (m_type) {
-		case KEYWORD:
-			Notify_KadSearchEnd(m_searchID);
-			break;
+	case KEYWORD:
+		Notify_KadSearchEnd(m_searchID);
+		break;
 	}
 }
 
 void CSearch::Go()
 {
-	// Start with a lot of possible contacts, this is a fallback in case search stalls due to dead contacts
+	// Start with a lot of possible contacts, this is a fallback in case search stalls due to dead
+	// contacts
 	if (m_possible.empty()) {
 		CUInt128 distance(CKademlia::GetPrefs()->GetKadID() ^ m_target);
 		CKademlia::GetRoutingZone()->GetClosestTo(3, m_target, distance, 50, &m_possible, true, true);
 	}
 
 	if (!m_possible.empty()) {
-		//Lets keep our contact list entries in mind to dec the inUse flag.
 		for (ContactMap::iterator it = m_possible.begin(); it != m_possible.end(); ++it) {
 			m_inUseit->first = it->second;
 		}
 
 		wxASSERT(m_possible.size() == m_inUse.size());
 
-		// Take top ALPHA_QUERY to start search with.
 		int count = m_type == NODE ? 1 : min(ALPHA_QUERY, (int)m_possible.size());
 
-		// Send initial packets to start the search.
 		ContactMap::iterator it = m_possible.begin();
 		for (int i = 0; i < count; i++) {
 			CContact *c = it->second;
-			// Move to tried
 			m_triedit->first = c;
-			// Send the KadID so other side can check if I think it has the right KadID.
-			// Send request
 			SendFindValue(c);
 			++it;
 		}
 	}
 }
 
-//If we allow about a 15 sec delay before deleting, we won't miss a lot of delayed returning packets.
+// If we allow about a 15 sec delay before deleting, we won't miss a lot of delayed returning packets.
 void CSearch::PrepareToStop() noexcept
 {
-	// Check if already stopping.
 	if (m_stopping) {
 		return;
 	}
 
-	// Set basetime by search type.
 	uint32_t baseTime = 0;
 	switch (m_type) {
-		case NODE:
-		case NODECOMPLETE:
-		case NODESPECIAL:
-		case NODEFWCHECKUDP:
-			baseTime = SEARCHNODE_LIFETIME;
-			break;
-		case FILE:
-			baseTime = SEARCHFILE_LIFETIME;
-			break;
-		case KEYWORD:
-			baseTime = SEARCHKEYWORD_LIFETIME;
-			break;
-		case NOTES:
-			baseTime = SEARCHNOTES_LIFETIME;
-			break;
-		case STOREFILE:
-			baseTime = SEARCHSTOREFILE_LIFETIME;
-			break;
-		case STOREKEYWORD:
-			baseTime = SEARCHSTOREKEYWORD_LIFETIME;
-			break;
-		case STORENOTES:
-			baseTime = SEARCHSTORENOTES_LIFETIME;
-			break;
-		case FINDBUDDY:
-			baseTime = SEARCHFINDBUDDY_LIFETIME;
-			break;
-		case FINDSOURCE:
-			baseTime = SEARCHFINDSOURCE_LIFETIME;
-			break;
-		default:
-			baseTime = SEARCH_LIFETIME;
+	case NODE:
+	case NODECOMPLETE:
+	case NODESPECIAL:
+	case NODEFWCHECKUDP:
+		baseTime = SEARCHNODE_LIFETIME;
+		break;
+	case FILE:
+		baseTime = SEARCHFILE_LIFETIME;
+		break;
+	case KEYWORD:
+		baseTime = SEARCHKEYWORD_LIFETIME;
+		break;
+	case NOTES:
+		baseTime = SEARCHNOTES_LIFETIME;
+		break;
+	case STOREFILE:
+		baseTime = SEARCHSTOREFILE_LIFETIME;
+		break;
+	case STOREKEYWORD:
+		baseTime = SEARCHSTOREKEYWORD_LIFETIME;
+		break;
+	case STORENOTES:
+		baseTime = SEARCHSTORENOTES_LIFETIME;
+		break;
+	case FINDBUDDY:
+		baseTime = SEARCHFINDBUDDY_LIFETIME;
+		break;
+	case FINDSOURCE:
+		baseTime = SEARCHFINDSOURCE_LIFETIME;
+		break;
+	default:
+		baseTime = SEARCH_LIFETIME;
 	}
 
 	// Adjust created time so that search will delete within 15 seconds.
@@ -237,27 +281,64 @@
 
 void CSearch::JumpStart()
 {
-	// If we had a response within the last 3 seconds, no need to jumpstart the search.
-	// Cast m_lastResponse to time_t before adding so the addition happens in
-	// time_t, not in uint32_t -- the latter would wrap near the 2106 32-bit
-	// time boundary and reorder the comparison silently.  Eighty years out,
-	// but cheap to write correctly.
+#ifdef ENABLE_KAD_NODE_PROTECTION
+	// How long to wait on an outstanding request before treating the search as stalled. Derived
+	// from the response times actually observed (CFastKad) rather than fixed at 3 seconds: on a
+	// fast link the old constant wasted seconds on nodes that were never going to answer, and
+	// on a congested one it abandoned nodes that answered just too late.
+	//
+	// Background store operations keep the fixed 3 seconds: nobody is waiting on a publish, and
+	// a tight deadline would only add republish traffic.
+	const uint32_t maxPending = (m_type == STOREFILE || m_type == STOREKEYWORD || m_type == STORENOTES)
+					    ? SEC2MS(3)
+					    : fastKad.GetEstMaxResponseTime();
+
+	const uint64_t nowTick = ::GetTickCount64();
+
+	// Stop waiting on requests that have passed the ceiling, but keep the record until
+	// PENDING_SAMPLE_GRACE_MS past it, because an answer arriving after the ceiling is exactly
+	// the sample the estimator needs: erasing on the ceiling meant no round-trip longer than
+	// the current estimate could ever be recorded, so on a link slower than the starting value
+	// the estimate could only ratchet down and every request stalled.
+	//
+	// A timeout deliberately does not reach safeKad. It is evidence of a slow or absent node,
+	// not of a misbehaving one, and TrackProblematicNode() is rung one of the ban ladder:
+	// nothing reads problematic state for scheduling, so its only effect was that the next
+	// rejected identity change went straight to a four-hour ban.
+	for (PendingRequestMap::iterator it = m_pendingRequests.begin(); it != m_pendingRequests.end();) {
+		const uint64_t waited = nowTick - it->second.m_sentTick;
+		if (waited >= maxPending + PENDING_SAMPLE_GRACE_MS) {
+			m_pendingRequests.erase(it++);
+			continue;
+		}
+		++it;
+	}
+
+	// If we had a response within the derived ceiling, no need to jumpstart.
+	if (m_lastResponseTick + maxPending > nowTick) {
+		return;
+	}
+#else
+	// Gate off: the fixed 3-second ceiling at its usual second granularity, so the moment a
+	// jumpstart goes out is unchanged. m_lastResponse is cast to time_t before the addition,
+	// which in uint32_t would wrap near the 2106 boundary and silently reorder the comparison.
 	if ((time_t)m_lastResponse + SEC(3) > time(NULL)) {
 		return;
 	}
+#endif
 
-	// If we ran out of contacts, stop search.
 	if (m_possible.empty()) {
 		PrepareToStop();
 		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
+	// Is this a find lookup, and are the best two (KADEMLIA_FIND_VALUE) nodes dead or
+	// unreachable? Then discover more close nodes before using the other results: limiting
+	// results to 2 contacts may have hidden the closest live node behind duplicates of the dead
+	// ones.
 	bool lookupCloserNodes = false;
-	if (m_requestedMoreNodes.empty() && GetRequestContactCount() == KADEMLIA_FIND_VALUE && m_tried.size() >= 3 * KADEMLIA_FIND_VALUE) {
+	if (m_requestedMoreNodes.empty() && 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++) {
@@ -270,7 +351,10 @@
 		if (lookupCloserNodes) {
 			while (it != m_tried.end()) {
 				if (m_responded.count(it->first) > 0) {
-					AddDebugLogLineN(logKadSearch, CFormat("Best %d nodes for lookup (id=%x) were unreachable or dead, reasking closest for more") % KADEMLIA_FIND_VALUE % GetSearchID());
+					AddDebugLogLineN(logKadSearch,
+						CFormat("Best %d nodes for lookup (id=%x) were unreachable "
+							"or dead, reasking closest for more") %
+							KADEMLIA_FIND_VALUE % GetSearchID());
 					SendFindValue(it->second, true);
 					return;
 				}
@@ -279,44 +363,37 @@
 		}
 	}
 
-	// Search for contacts that can be used to jumpstart a stalled search.
 	while (!m_possible.empty()) {
-		// Get a contact closest to our target.
 		CContact *c = m_possible.begin()->second;
 
-		// Have we already tried to contact this node.
 		if (m_tried.count(m_possible.begin()->first) > 0) {
-			// Did we get a response from this node, if so, try to store or get info.
 			if (m_responded.count(m_possible.begin()->first) > 0) {
 				StorePacket();
 			}
-			// Remove from possible list.
 			m_possible.erase(m_possible.begin());
 		} else {
-			// Add to tried list.
 			m_triedm_possible.begin()->first = c;
-			// Send the KadID so other side can check if I think it has the right KadID.
-			// Send request
 			SendFindValue(c);
 			break;
 		}
 	}
-
 }
 
 void CSearch::ProcessResponse(uint32_t fromIP, uint16_t fromPort, ContactList *results)
 {
-	AddDebugLogLineN(logKadSearch, "Processing search response from " + KadIPPortToString(fromIP, fromPort));
+	AddDebugLogLineN(
+		logKadSearch, "Processing search response from " + KadIPPortToString(fromIP, fromPort));
 
 	ContactList::iterator response;
-	// Remember the contacts to be deleted when finished
 	for (response = results->begin(); response != results->end(); ++response) {
 		m_delete.push_back(*response);
 	}
 
 	m_lastResponse = time(NULL);
+#ifdef ENABLE_KAD_NODE_PROTECTION
+	m_lastResponseTick = ::GetTickCount64();
+#endif
 
-	// Find contact that is responding.
 	CUInt128 fromDistance(0u);
 	CContact *fromContact = NULL;
 	for (ContactMap::const_iterator it = m_tried.begin(); it != m_tried.end(); ++it) {
@@ -328,14 +405,61 @@
 		}
 	}
 
-	// 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.  When fromContact is in
-	// m_requestedMoreNodes we asked it for KADEMLIA_FIND_VALUE_MORE
-	// contacts (the wider variant), so a larger response is legitimate.
-	const bool wasReaskedForMore = fromContact &&
-		m_requestedMoreNodes.count(fromContact->GetClientID()) > 0;
-	if (results->size() > GetRequestContactCount() && !(wasReaskedForMore && results->size() <= KADEMLIA_FIND_VALUE_MORE)) {
-		AddDebugLogLineN(logKadSearch, "Node " + KadIPToString(fromIP) + " sent more contacts than requested on a routing query, ignoring response");
+#ifdef ENABLE_KAD_NODE_PROTECTION
+	if (fromContact != nullptr) {
+		// The answer closes out its pending record: leaving satisfied entries in the map
+		// would only make the timeout sweep in JumpStart walk dead weight.
+		PendingRequestMap::iterator pending = m_pendingRequests.find(fromContact->GetClientID());
+		if (pending != m_pendingRequests.end()) {
+			// A useful answer: feed its round-trip time to the shared estimator so the
+			// next timeout reflects the network we are actually on.
+			const uint64_t nowTick = ::GetTickCount64();
+			fastKad.AddResponseTime(
+				fromIP, (uint32_t)(nowTick - pending->second.m_sentTick), nowTick);
+			m_pendingRequests.erase(pending);
+		}
+
+		// The contact may have gone bad since we sent the request. onlyOneNodePerIP is off
+		// here because the contact is already in our routing table, so a second port on the
+		// address is that table's problem.
+		//
+		// idVerified is false, and deliberately not the contact's own flag. An answer to a
+		// search proves the address is live; it proves nothing about the identity, which we
+		// took from wherever we learned the contact. CContact::IsIPVerified() is no better
+		// here: Process2BootstrapResponse() sets it by assumption for every contact in the
+		// answer when the routing table is empty, so trusting it would let one bootstrap
+		// peer hand us twenty addresses that can be escalated to a ban.
+		//
+		// Nothing is lost by passing false. Per TrackNode(), idVerified gates the
+		// escalation and not the refusal, so a bad node is still refused here; and the
+		// three-way handshake in CRoutingZone already records the address as verified,
+		// where the proof is real. That is the only caller that should ever pass true.
+		if (safeKad.IsBadNode(fromIP,
+			    fromPort,
+			    fromContact->GetClientID(),
+			    fromContact->GetVersion(),
+			    false,
+			    false,
+			    time(nullptr))) {
+			AddDebugLogLineN(logKadSearch,
+				"Ignoring search response from a node judged bad by the Kad identity "
+				"protections: " +
+					KadIPPortToString(fromIP, fromPort));
+			return;
+		}
+	}
+#endif
+
+	// 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.  When fromContact is in m_requestedMoreNodes we asked
+	// it for KADEMLIA_FIND_VALUE_MORE contacts (the wider variant), so a larger response is legitimate.
+	const bool wasReaskedForMore =
+		fromContact && m_requestedMoreNodes.count(fromContact->GetClientID()) > 0;
+	if (results->size() > GetRequestContactCount() &&
+		!(wasReaskedForMore && results->size() <= KADEMLIA_FIND_VALUE_MORE)) {
+		AddDebugLogLineN(logKadSearch,
+			"Node " + KadIPToString(fromIP) +
+				" sent more contacts than requested on a routing query, ignoring response");
 		return;
 	}
 
@@ -347,9 +471,7 @@
 	// Not interested in responses for FIND_NODE, will be added to contacts by udp listener
 	if (m_type == NODE) {
 		AddDebugLogLineN(logKadSearch, "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();
 		return;
 	}
@@ -361,41 +483,50 @@
 		// A node is not allowed to answer with contacts to itself
 		receivedIPsfromIP = 1;
 		receivedSubnetsfromIP & 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;
 			}
 
-			// Ignore this contact if already known or tried it.
 			if (m_possible.count(distance) > 0) {
-				AddDebugLogLineN(logKadSearch, "Search result from already known client: ignore");
+				AddDebugLogLineN(
+					logKadSearch, "Search result from already known client: ignore");
 				continue;
 			}
 			if (m_tried.count(distance) > 0) {
-				AddDebugLogLineN(logKadSearch, "Search result from already tried client: ignore");
+				AddDebugLogLineN(
+					logKadSearch, "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
+			// 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, "Multiple KadIDs pointing to same IP (" + KadIPToString(c->GetIPAddress()) + ") in Kad2Res answer - ignored, sent by " + KadIPToString(fromContact->GetIPAddress()));
+				AddDebugLogLineN(logKadSearch,
+					"Multiple KadIDs pointing to same IP (" +
+						KadIPToString(c->GetIPAddress()) +
+						") in Kad2Res answer - ignored, sent by " +
+						KadIPToString(fromContact->GetIPAddress()));
 				continue;
 			} else {
 				receivedIPsc->GetIPAddress() = 1;
 			}
-				// and no more than 2 IPs from the same /24 subnet
-			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;
+			// and no more than 2 IPs from the same /24 subnet
+			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, "More than 2 KadIDs pointing to same subnet (" + KadIPToString(c->GetIPAddress() & 0xFFFFFF00) + "/24) in Kad2Res answer - ignored, sent by " + KadIPToString(fromContact->GetIPAddress()));
+					AddDebugLogLineN(logKadSearch,
+						"More than 2 KadIDs pointing to same subnet (" +
+							KadIPToString(c->GetIPAddress() & 0xFFFFFF00) +
+							"/24) in Kad2Res answer - ignored, sent by " +
+							KadIPToString(fromContact->GetIPAddress()));
 					continue;
 				} else {
 					receivedSubnetsc->GetIPAddress() & 0xFFFFFF00 = subnetCount + 1;
@@ -404,12 +535,9 @@
 				receivedSubnetsc->GetIPAddress() & 0xFFFFFF00 = 1;
 			}
 
-			// Add to possible
 			m_possibledistance = 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 determine if we send a request.
 				bool top = false;
 				if (m_best.size() < ALPHA_QUERY) {
 					top = true;
@@ -418,7 +546,6 @@
 					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_bestdistance = c;
 						top = true;
@@ -426,22 +553,18 @@
 				}
 
 				if (top) {
-					// We determined this contact is a candidate for a request.
-					// Add to tried
 					m_trieddistance = c;
-					// Send the KadID so other side can check if I think it has the right KadID.
-					// Send request
 					SendFindValue(c);
 				}
 			}
 		}
 
-		// Add to list of people who responded.
 		m_respondedfromDistance = providedCloserContacts;
 
-		// Complete node search, just increment the counter.
 		if (m_type == NODECOMPLETE || m_type == NODESPECIAL) {
-			AddDebugLogLineN(logKadSearch, wxString("Search result type: Node") + (m_type == NODECOMPLETE ? "Complete" : "Special"));
+			AddDebugLogLineN(logKadSearch,
+				wxString("Search result type: Node") +
+					(m_type == NODECOMPLETE ? "Complete" : "Special"));
 			m_answers++;
 		}
 	}
@@ -451,7 +574,6 @@
 {
 	wxASSERT(!m_possible.empty());
 
-	// This method is currently only called by jumpstart so only use best possible.
 	ContactMap::const_iterator possible = m_possible.begin();
 	CUInt128 fromDistance(possible->first);
 	CContact *from = possible->second;
@@ -460,418 +582,506 @@
 		m_closestDistantFound = fromDistance;
 	}
 
-	// Make sure this is a valid node to store.
-	if (fromDistance.Get32BitChunk(0) > SEARCHTOLERANCE && !::IsLanIP(wxUINT32_SWAP_ALWAYS(from->GetIPAddress()))) {
+	if (fromDistance.Get32BitChunk(0) > SEARCHTOLERANCE &&
+		!::IsLanIP(wxUINT32_SWAP_ALWAYS(from->GetIPAddress()))) {
 		return;
 	}
 
-	// What kind of search are we doing?
 	switch (m_type) {
-		case FILE: {
-			AddDebugLogLineN(logKadSearch, "Search request type: File");
-			CMemFile searchTerms;
-			searchTerms.WriteUInt128(m_target);
-			if (from->GetVersion() >= 3) {
-				// Find file we are storing info about.
-				uint8_t fileid16;
-				m_target.ToByteArray(fileid);
-				CKnownFile *file = theApp->downloadqueue->GetFileByID(CMD4Hash(fileid));
-				if (file) {
-					// Start position range (0x0 to 0x7FFF)
-					searchTerms.WriteUInt16(0);
-					searchTerms.WriteUInt64(file->GetFileSize());
-					DebugSend(Kad2SearchSourceReq, from->GetIPAddress(), from->GetUDPPort());
-					if (from->GetVersion() >= 6) {
-						CUInt128 clientID = from->GetClientID();
-						CKademlia::GetUDPListener()->SendPacket(searchTerms, KADEMLIA2_SEARCH_SOURCE_REQ, from->GetIPAddress(), from->GetUDPPort(), from->GetUDPKey(), &clientID);
-					} else {
-						CKademlia::GetUDPListener()->SendPacket(searchTerms, KADEMLIA2_SEARCH_SOURCE_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
-						wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
-					}
+	case FILE: {
+		AddDebugLogLineN(logKadSearch, "Search request type: File");
+		CMemFile searchTerms;
+		searchTerms.WriteUInt128(m_target);
+		if (from->GetVersion() >= 3) {
+			uint8_t fileid16;
+			m_target.ToByteArray(fileid);
+			CKnownFile *file = theApp->downloadqueue->GetFileByID(CMD4Hash(fileid));
+			if (file) {
+				// Start position range (0x0 to 0x7FFF)
+				searchTerms.WriteUInt16(0);
+				searchTerms.WriteUInt64(file->GetFileSize());
+				DebugSend(Kad2SearchSourceReq, from->GetIPAddress(), from->GetUDPPort());
+				if (from->GetVersion() >= 6) {
+					CUInt128 clientID = from->GetClientID();
+					CKademlia::GetUDPListener()->SendPacket(searchTerms,
+						KADEMLIA2_SEARCH_SOURCE_REQ,
+						from->GetIPAddress(),
+						from->GetUDPPort(),
+						from->GetUDPKey(),
+						&clientID);
 				} else {
-					PrepareToStop();
-					break;
+					CKademlia::GetUDPListener()->SendPacket(searchTerms,
+						KADEMLIA2_SEARCH_SOURCE_REQ,
+						from->GetIPAddress(),
+						from->GetUDPPort(),
+						0,
+						NULL);
+					wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
 				}
 			} else {
-				searchTerms.WriteUInt8(1);
-				DebugSendF("KadSearchReq(File)", from->GetIPAddress(), from->GetUDPPort());
-				CKademlia::GetUDPListener()->SendPacket(searchTerms, KADEMLIA_SEARCH_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
+				PrepareToStop();
+				break;
 			}
-			m_totalRequestAnswers++;
-			break;
+		} else {
+			searchTerms.WriteUInt8(1);
+			DebugSendF("KadSearchReq(File)", from->GetIPAddress(), from->GetUDPPort());
+			CKademlia::GetUDPListener()->SendPacket(searchTerms,
+				KADEMLIA_SEARCH_REQ,
+				from->GetIPAddress(),
+				from->GetUDPPort(),
+				0,
+				NULL);
 		}
-		case KEYWORD: {
-			AddDebugLogLineN(logKadSearch, "Search request type: Keyword");
-			CMemFile searchTerms;
-			searchTerms.WriteUInt128(m_target);
-			if (from->GetVersion() >= 3) {
-				if (m_searchTermsDataSize == 0) {
-					// Start position range (0x0 to 0x7FFF)
-					searchTerms.WriteUInt16(0);
-				} else {
-					// Start position range (0x8000 to 0xFFFF)
-					searchTerms.WriteUInt16(0x8000);
-					searchTerms.Write(m_searchTermsData, m_searchTermsDataSize);
-				}
-				DebugSend(Kad2SearchKeyReq, from->GetIPAddress(), from->GetUDPPort());
+		m_totalRequestAnswers++;
+		break;
+	}
+	case KEYWORD: {
+		AddDebugLogLineN(logKadSearch, "Search request type: Keyword");
+		CMemFile searchTerms;
+		searchTerms.WriteUInt128(m_target);
+		if (from->GetVersion() >= 3) {
+			if (m_searchTermsDataSize == 0) {
+				// Start position range (0x0 to 0x7FFF)
+				searchTerms.WriteUInt16(0);
 			} else {
-				if (m_searchTermsDataSize == 0) {
-					searchTerms.WriteUInt8(0);
-					// We send this extra byte to flag we handle large files.
-					searchTerms.WriteUInt8(0);
-				} else {
-					// Set to 2 to flag we handle large files.
-					searchTerms.WriteUInt8(2);
-					searchTerms.Write(m_searchTermsData, m_searchTermsDataSize);
-				}
-				DebugSendF("KadSearchReq(Keyword)", from->GetIPAddress(), from->GetUDPPort());
+				// Start position range (0x8000 to 0xFFFF)
+				searchTerms.WriteUInt16(0x8000);
+				searchTerms.Write(m_searchTermsData, m_searchTermsDataSize);
 			}
-			if (from->GetVersion() >= 6) {
-				CUInt128 clientID = from->GetClientID();
-				CKademlia::GetUDPListener()->SendPacket(searchTerms, KADEMLIA2_SEARCH_KEY_REQ, from->GetIPAddress(), from->GetUDPPort(), from->GetUDPKey(), &clientID);
-			} else if (from->GetVersion() >= 3) {
-				CKademlia::GetUDPListener()->SendPacket(searchTerms, KADEMLIA2_SEARCH_KEY_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
-				wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
+			DebugSend(Kad2SearchKeyReq, from->GetIPAddress(), from->GetUDPPort());
+		} else {
+			if (m_searchTermsDataSize == 0) {
+				searchTerms.WriteUInt8(0);
+				// We send this extra byte to flag we handle large files.
+				searchTerms.WriteUInt8(0);
 			} else {
-				CKademlia::GetUDPListener()->SendPacket(searchTerms, KADEMLIA_SEARCH_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
+				// Set to 2 to flag we handle large files.
+				searchTerms.WriteUInt8(2);
+				searchTerms.Write(m_searchTermsData, m_searchTermsDataSize);
 			}
-			m_totalRequestAnswers++;
-			break;
+			DebugSendF("KadSearchReq(Keyword)", from->GetIPAddress(), from->GetUDPPort());
 		}
-		case NOTES: {
-			AddDebugLogLineN(logKadSearch, "Search request type: Notes");
-			// Write complete packet.
-			CMemFile searchTerms;
-			searchTerms.WriteUInt128(m_target);
-			if (from->GetVersion() >= 3) {
-				// Find file we are storing info about.
-				uint8_t fileid16;
-				m_target.ToByteArray(fileid);
-				CKnownFile *file = theApp->sharedfiles->GetFileByID(CMD4Hash(fileid));
-				if (file) {
-					// Start position range (0x0 to 0x7FFF)
-					searchTerms.WriteUInt64(file->GetFileSize());
-					DebugSend(Kad2SearchNotesReq, from->GetIPAddress(), from->GetUDPPort());
-					if (from->GetVersion() >= 6) {
-						CUInt128 clientID = from->GetClientID();
-						CKademlia::GetUDPListener()->SendPacket(searchTerms, KADEMLIA2_SEARCH_NOTES_REQ, from->GetIPAddress(), from->GetUDPPort(), from->GetUDPKey(), &clientID);
-					} else {
-						CKademlia::GetUDPListener()->SendPacket(searchTerms, KADEMLIA2_SEARCH_NOTES_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
-						wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
-					}
+		if (from->GetVersion() >= 6) {
+			CUInt128 clientID = from->GetClientID();
+			CKademlia::GetUDPListener()->SendPacket(searchTerms,
+				KADEMLIA2_SEARCH_KEY_REQ,
+				from->GetIPAddress(),
+				from->GetUDPPort(),
+				from->GetUDPKey(),
+				&clientID);
+		} else if (from->GetVersion() >= 3) {
+			CKademlia::GetUDPListener()->SendPacket(searchTerms,
+				KADEMLIA2_SEARCH_KEY_REQ,
+				from->GetIPAddress(),
+				from->GetUDPPort(),
+				0,
+				NULL);
+			wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
+		} else {
+			CKademlia::GetUDPListener()->SendPacket(searchTerms,
+				KADEMLIA_SEARCH_REQ,
+				from->GetIPAddress(),
+				from->GetUDPPort(),
+				0,
+				NULL);
+		}
+		m_totalRequestAnswers++;
+		break;
+	}
+	case NOTES: {
+		AddDebugLogLineN(logKadSearch, "Search request type: Notes");
+		CMemFile searchTerms;
+		searchTerms.WriteUInt128(m_target);
+		if (from->GetVersion() >= 3) {
+			// Find the file we are storing info about. The NOTES request carries the
+			// file size, which we read from whichever local list holds the hash: shared
+			// files, the download queue, or the search list for an on-demand lookup on
+			// a result the user has not downloaded.
+			uint8_t fileid16;
+			m_target.ToByteArray(fileid);
+			const CMD4Hash fileHash(fileid);
+			CAbstractFile *file = theApp->sharedfiles->GetFileByID(fileHash);
+			if (!file) {
+				file = theApp->downloadqueue->GetFileByID(fileHash);
+			}
+			if (!file) {
+				file = theApp->searchlist->GetSearchFileByID(fileHash);
+			}
+			if (file) {
+				// Start position range (0x0 to 0x7FFF)
+				searchTerms.WriteUInt64(file->GetFileSize());
+				DebugSend(Kad2SearchNotesReq, from->GetIPAddress(), from->GetUDPPort());
+				if (from->GetVersion() >= 6) {
+					CUInt128 clientID = from->GetClientID();
+					CKademlia::GetUDPListener()->SendPacket(searchTerms,
+						KADEMLIA2_SEARCH_NOTES_REQ,
+						from->GetIPAddress(),
+						from->GetUDPPort(),
+						from->GetUDPKey(),
+						&clientID);
 				} else {
-					PrepareToStop();
-					break;
+					CKademlia::GetUDPListener()->SendPacket(searchTerms,
+						KADEMLIA2_SEARCH_NOTES_REQ,
+						from->GetIPAddress(),
+						from->GetUDPPort(),
+						0,
+						NULL);
+					wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
 				}
 			} else {
-				searchTerms.WriteUInt128(CKademlia::GetPrefs()->GetKadID());
-				DebugSend(KadSearchNotesReq, from->GetIPAddress(), from->GetUDPPort());
-				CKademlia::GetUDPListener()->SendPacket(searchTerms, KADEMLIA_SEARCH_NOTES_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
-			}
-			m_totalRequestAnswers++;
-			break;
-		}
-		case STOREFILE: {
-			AddDebugLogLineN(logKadSearch, "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) {
 				PrepareToStop();
 				break;
 			}
+		} else {
+			searchTerms.WriteUInt128(CKademlia::GetPrefs()->GetKadID());
+			DebugSend(KadSearchNotesReq, from->GetIPAddress(), from->GetUDPPort());
+			CKademlia::GetUDPListener()->SendPacket(searchTerms,
+				KADEMLIA_SEARCH_NOTES_REQ,
+				from->GetIPAddress(),
+				from->GetUDPPort(),
+				0,
+				NULL);
+		}
+		m_totalRequestAnswers++;
+		break;
+	}
+	case STOREFILE: {
+		AddDebugLogLineN(logKadSearch, "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) {
+			PrepareToStop();
+			break;
+		}
 
-			// Find the file we are trying to store as a source to.
-			uint8_t fileid16;
-			m_target.ToByteArray(fileid);
-			CKnownFile* file = theApp->sharedfiles->GetFileByID(CMD4Hash(fileid));
-			if (file) {
-				// We store this mostly for GUI reasons.
-				m_fileName = file->GetFileName().GetPrintable();
-
-				// Get our clientID for the packet.
-				CUInt128 id(CKademlia::GetPrefs()->GetClientHash());
-				TagPtrList taglist;
-
-				//We can use type for different types of sources.
-				//1 HighID sources..
-				//2 cannot be used as older clients will not work.
-				//3 Firewalled Kad Source.
-				//4 >4GB file HighID Source.
-				//5 >4GB file Firewalled Kad source.
-				//6 Firewalled source with Direct Callback (supports >4GB)
-
-				bool directCallback = false;
-				if (theApp->IsFirewalled()) {
-					directCallback = (Kademlia::CKademlia::IsRunning() && !Kademlia::CUDPFirewallTester::IsFirewalledUDP(true) && Kademlia::CUDPFirewallTester::IsVerified());
-					if (directCallback) {
-						// firewalled, but direct udp callback is possible so no need for buddies
-						// We are not firewalled..
-						taglist.push_back(new CTagVarInt(TAG_SOURCETYPE, 6));
-						taglist.push_back(new CTagVarInt(TAG_SOURCEPORT, thePrefs::GetPort()));
-						if (!CKademlia::GetPrefs()->GetUseExternKadPort()) {
-							taglist.push_back(new CTagInt16(TAG_SOURCEUPORT, CKademlia::GetPrefs()->GetInternKadPort()));
-						}
-						if (from->GetVersion() >= 2) {
-							taglist.push_back(new CTagVarInt(TAG_FILESIZE, file->GetFileSize()));
-						}
-					} else if (theApp->clientlist->GetBuddy()) {	// We are firewalled, make sure we have a buddy.
-						// We send the ID to our buddy so they can do a callback.
-						CUInt128 buddyID(true);
-						buddyID ^= CKademlia::GetPrefs()->GetKadID();
-						taglist.push_back(new CTagInt8(TAG_SOURCETYPE, file->IsLargeFile() ? 5 : 3));
-						taglist.push_back(new CTagVarInt(TAG_SERVERIP, theApp->clientlist->GetBuddy()->GetIP()));
-						taglist.push_back(new CTagVarInt(TAG_SERVERPORT, theApp->clientlist->GetBuddy()->GetUDPPort()));
-						uint8_t hashBytes16;
-						buddyID.ToByteArray(hashBytes);
-						taglist.push_back(new CTagString(TAG_BUDDYHASH, CMD4Hash(hashBytes).Encode()));
-						taglist.push_back(new CTagVarInt(TAG_SOURCEPORT, thePrefs::GetPort()));
-						if (!CKademlia::GetPrefs()->GetUseExternKadPort()) {
-							taglist.push_back(new CTagInt16(TAG_SOURCEUPORT, CKademlia::GetPrefs()->GetInternKadPort()));
-						}
-						if (from->GetVersion() >= 2) {
-							taglist.push_back(new CTagVarInt(TAG_FILESIZE, file->GetFileSize()));
-						}
-					} else {
-						// We are firewalled, but lost our buddy.. Stop everything.
-						PrepareToStop();
-						break;
+		uint8_t fileid16;
+		m_target.ToByteArray(fileid);
+		CKnownFile *file = theApp->sharedfiles->GetFileByID(CMD4Hash(fileid));
+		if (file) {
+			// We store this mostly for GUI reasons.
+			m_fileName = file->GetFileName().GetPrintable();
+
+			CUInt128 id(CKademlia::GetPrefs()->GetClientHash());
+			TagPtrList taglist;
+
+			// Source types: 1 HighID, 3 firewalled Kad, 4 >4GB HighID, 5 >4GB
+			// firewalled Kad, 6 firewalled with direct callback (supports >4GB).
+			// 2 cannot be used, as older clients will not work with it.
+
+			bool directCallback = false;
+			if (theApp->IsFirewalled()) {
+				directCallback = (Kademlia::CKademlia::IsRunning() &&
+						  !Kademlia::CUDPFirewallTester::IsFirewalledUDP(true) &&
+						  Kademlia::CUDPFirewallTester::IsVerified());
+				if (directCallback) {
+					// firewalled, but direct udp callback is possible so no need for
+					// buddies We are not firewalled..
+					taglist.push_back(new CTagVarInt(TAG_SOURCETYPE, 6));
+					taglist.push_back(
+						new CTagVarInt(TAG_SOURCEPORT, thePrefs::GetPort()));
+					if (!CKademlia::GetPrefs()->GetUseExternKadPort()) {
+						taglist.push_back(new CTagInt16(TAG_SOURCEUPORT,
+							CKademlia::GetPrefs()->GetInternKadPort()));
 					}
-				} else {
-					// We're not firewalled..
-					taglist.push_back(new CTagInt8(TAG_SOURCETYPE, file->IsLargeFile() ? 4 : 1));
-					taglist.push_back(new CTagVarInt(TAG_SOURCEPORT, thePrefs::GetPort()));
+					if (from->GetVersion() >= 2) {
+						taglist.push_back(
+							new CTagVarInt(TAG_FILESIZE, file->GetFileSize()));
+					}
+				} else if (theApp->clientlist->GetBuddy()) { // We are firewalled, make sure
+									     // we have a buddy.
+					// We send the ID to our buddy so they can do a callback.
+					CUInt128 buddyID(true);
+					buddyID ^= CKademlia::GetPrefs()->GetKadID();
+					taglist.push_back(
+						new CTagInt8(TAG_SOURCETYPE, file->IsLargeFile() ? 5 : 3));
+					taglist.push_back(new CTagVarInt(
+						TAG_SERVERIP, theApp->clientlist->GetBuddy()->GetIP()));
+					taglist.push_back(new CTagVarInt(TAG_SERVERPORT,
+						theApp->clientlist->GetBuddy()->GetUDPPort()));
+					uint8_t hashBytes16;
+					buddyID.ToByteArray(hashBytes);
+					taglist.push_back(
+						new CTagString(TAG_BUDDYHASH, CMD4Hash(hashBytes).Encode()));
+					taglist.push_back(
+						new CTagVarInt(TAG_SOURCEPORT, thePrefs::GetPort()));
 					if (!CKademlia::GetPrefs()->GetUseExternKadPort()) {
-						taglist.push_back(new CTagInt16(TAG_SOURCEUPORT, CKademlia::GetPrefs()->GetInternKadPort()));
+						taglist.push_back(new CTagInt16(TAG_SOURCEUPORT,
+							CKademlia::GetPrefs()->GetInternKadPort()));
 					}
 					if (from->GetVersion() >= 2) {
-						taglist.push_back(new CTagVarInt(TAG_FILESIZE, file->GetFileSize()));
+						taglist.push_back(
+							new CTagVarInt(TAG_FILESIZE, file->GetFileSize()));
 					}
+				} else {
+					// We are firewalled, but lost our buddy.. Stop everything.
+					PrepareToStop();
+					break;
 				}
-
-				taglist.push_back(new CTagInt8(TAG_ENCRYPTION, CPrefs::GetMyConnectOptions(true, true)));
-
-				// Send packet
-				CKademlia::GetUDPListener()->SendPublishSourcePacket(*from, m_target, id, taglist);
-				m_totalRequestAnswers++;
-				// Delete all tags.
-				deleteTagPtrListEntries(&taglist);
 			} else {
-				PrepareToStop();
-			}
-			break;
-		}
-		case STOREKEYWORD: {
-			AddDebugLogLineN(logKadSearch, "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) {
-				PrepareToStop();
-				break;
-			}
-
-			uint16_t count = m_fileIDs.size();
-			if (count == 0) {
-				PrepareToStop();
-				break;
-			} else if (count > 150) {
-				count = 150;
-			}
-
-			UIntList::const_iterator itListFileID = m_fileIDs.begin();
-			uint8_t fileid16;
-
-			while (count && (itListFileID != m_fileIDs.end())) {
-				uint16_t packetCount = 0;
-				CMemFile packetdata(1024*50); // Allocate a good amount of space.
-				packetdata.WriteUInt128(m_target);
-				packetdata.WriteUInt16(0); // Will be updated before sending.
-				while ((packetCount < 50) && (itListFileID != m_fileIDs.end())) {
-					CUInt128 id(*itListFileID);
-					id.ToByteArray(fileid);
-					CKnownFile *pFile = theApp->sharedfiles->GetFileByID(CMD4Hash(fileid));
-					if (pFile) {
-						count--;
-						packetCount++;
-						packetdata.WriteUInt128(id);
-						PreparePacketForTags(&packetdata, pFile);
-					}
-					++itListFileID;
+				// We're not firewalled..
+				taglist.push_back(new CTagInt8(TAG_SOURCETYPE, file->IsLargeFile() ? 4 : 1));
+				taglist.push_back(new CTagVarInt(TAG_SOURCEPORT, thePrefs::GetPort()));
+				if (!CKademlia::GetPrefs()->GetUseExternKadPort()) {
+					taglist.push_back(new CTagInt16(
+						TAG_SOURCEUPORT, CKademlia::GetPrefs()->GetInternKadPort()));
 				}
-
-				// Correct file count.
-				uint64_t current_pos = packetdata.GetPosition();
-				packetdata.Seek(16);
-				packetdata.WriteUInt16(packetCount);
-				packetdata.Seek(current_pos);
-
-				// Send packet
-				if (from->GetVersion() >= 6) {
-					DebugSend(Kad2PublishKeyReq, from->GetIPAddress(), from->GetUDPPort());
-					CUInt128 clientID = from->GetClientID();
-					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_PUBLISH_KEY_REQ, from->GetIPAddress(), from->GetUDPPort(), from->GetUDPKey(), &clientID);
-				} else if (from->GetVersion() >= 2) {
-					DebugSend(Kad2PublishKeyReq, from->GetIPAddress(), from->GetUDPPort());
-					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_PUBLISH_KEY_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
-					wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
-				} else {
-					wxFAIL;
+				if (from->GetVersion() >= 2) {
+					taglist.push_back(new CTagVarInt(TAG_FILESIZE, file->GetFileSize()));
 				}
 			}
+
+			taglist.push_back(
+				new CTagInt8(TAG_ENCRYPTION, CPrefs::GetMyConnectOptions(true, true)));
+
+			CKademlia::GetUDPListener()->SendPublishSourcePacket(*from, m_target, id, taglist);
 			m_totalRequestAnswers++;
+			deleteTagPtrListEntries(&taglist);
+		} else {
+			PrepareToStop();
+		}
+		break;
+	}
+	case STOREKEYWORD: {
+		AddDebugLogLineN(logKadSearch, "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) {
+			PrepareToStop();
 			break;
 		}
-		case STORENOTES: {
-			AddDebugLogLineN(logKadSearch, "Search request type: StoreNotes");
-			// Find file we are storing info about.
-			uint8_t fileid16;
-			m_target.ToByteArray(fileid);
-			CKnownFile* file = theApp->sharedfiles->GetFileByID(CMD4Hash(fileid));
 
-			if (file) {
-				CMemFile packetdata(1024*2);
-				// Send the hash of the file we're storing info about.
-				packetdata.WriteUInt128(m_target);
-				// Send our ID with the info.
-				packetdata.WriteUInt128(CKademlia::GetPrefs()->GetKadID());
-
-				// Create our taglist.
-				TagPtrList taglist;
-				taglist.push_back(new CTagString(TAG_FILENAME, file->GetFileName().GetPrintable()));
-				if (file->GetFileRating() != 0) {
-					taglist.push_back(new CTagVarInt(TAG_FILERATING, file->GetFileRating()));
-				}
-				if (!file->GetFileComment().IsEmpty()) {
-					taglist.push_back(new CTagString(TAG_DESCRIPTION, file->GetFileComment()));
-				}
-				if (from->GetVersion() >= 2) {
-					taglist.push_back(new CTagVarInt(TAG_FILESIZE, file->GetFileSize()));
-				}
-				packetdata.WriteTagPtrList(taglist);
-
-				// Send packet
-				if (from->GetVersion() >= 6) {
-					DebugSend(Kad2PublishNotesReq, from->GetIPAddress(), from->GetUDPPort());
-					CUInt128 clientID = from->GetClientID();
-					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_PUBLISH_NOTES_REQ, from->GetIPAddress(), from->GetUDPPort(), from->GetUDPKey(), &clientID);
-				} else if (from->GetVersion() >= 2) {
-					DebugSend(Kad2PublishNotesReq, from->GetIPAddress(), from->GetUDPPort());
-					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_PUBLISH_NOTES_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
-					wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
-				} else {
-					wxFAIL;
-				}
-				m_totalRequestAnswers++;
-				// Delete all tags.
-				deleteTagPtrListEntries(&taglist);
-			} else {
-				PrepareToStop();
-			}
+		uint16_t count = m_fileIDs.size();
+		if (count == 0) {
+			PrepareToStop();
 			break;
+		} else if (count > 150) {
+			count = 150;
 		}
-		case FINDBUDDY:
-		{
-			AddDebugLogLineN(logKadSearch, "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) {
-				PrepareToStop();
-				break;
-			}
 
-			CMemFile packetdata;
-			// Send the ID we used to find our buddy. Used for checks later and allows users to callback someone if they change buddies.
+		UIntList::const_iterator itListFileID = m_fileIDs.begin();
+		uint8_t fileid16;
+
+		while (count && (itListFileID != m_fileIDs.end())) {
+			uint16_t packetCount = 0;
+			CMemFile packetdata(1024 * 50); // Allocate a good amount of space.
 			packetdata.WriteUInt128(m_target);
-			// Send client hash so they can do a callback.
-			packetdata.WriteUInt128(CKademlia::GetPrefs()->GetClientHash());
-			// Send client port so they can do a callback.
-			packetdata.WriteUInt16(thePrefs::GetPort());
+			packetdata.WriteUInt16(0); // Will be updated before sending.
+			while ((packetCount < 50) && (itListFileID != m_fileIDs.end())) {
+				CUInt128 id(*itListFileID);
+				id.ToByteArray(fileid);
+				CKnownFile *pFile = theApp->sharedfiles->GetFileByID(CMD4Hash(fileid));
+				if (pFile) {
+					count--;
+					packetCount++;
+					packetdata.WriteUInt128(id);
+					PreparePacketForTags(&packetdata, pFile, from->GetVersion());
+				}
+				++itListFileID;
+			}
+
+			uint64_t current_pos = packetdata.GetPosition();
+			packetdata.Seek(16);
+			packetdata.WriteUInt16(packetCount);
+			packetdata.Seek(current_pos);
 
-			DebugSend(KadFindBuddyReq, from->GetIPAddress(), from->GetUDPPort());
 			if (from->GetVersion() >= 6) {
+				DebugSend(Kad2PublishKeyReq, from->GetIPAddress(), from->GetUDPPort());
 				CUInt128 clientID = from->GetClientID();
-				CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_FINDBUDDY_REQ, from->GetIPAddress(), from->GetUDPPort(), from->GetUDPKey(), &clientID);
-			} else {
-				CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_FINDBUDDY_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
+				CKademlia::GetUDPListener()->SendPacket(packetdata,
+					KADEMLIA2_PUBLISH_KEY_REQ,
+					from->GetIPAddress(),
+					from->GetUDPPort(),
+					from->GetUDPKey(),
+					&clientID);
+			} else if (from->GetVersion() >= 2) {
+				DebugSend(Kad2PublishKeyReq, from->GetIPAddress(), from->GetUDPPort());
+				CKademlia::GetUDPListener()->SendPacket(packetdata,
+					KADEMLIA2_PUBLISH_KEY_REQ,
+					from->GetIPAddress(),
+					from->GetUDPPort(),
+					0,
+					NULL);
 				wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
+			} else {
+				wxFAIL;
 			}
-			m_answers++;
-			break;
 		}
-		case FINDSOURCE:
-		{
-			AddDebugLogLineN(logKadSearch, "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) {
-				PrepareToStop();
-				break;
-			}
-
-			CMemFile packetdata(34);
-			// This is the ID that the person we want to contact used to find a buddy.
+		m_totalRequestAnswers++;
+		break;
+	}
+	case STORENOTES: {
+		AddDebugLogLineN(logKadSearch, "Search request type: StoreNotes");
+		uint8_t fileid16;
+		m_target.ToByteArray(fileid);
+		CKnownFile *file = theApp->sharedfiles->GetFileByID(CMD4Hash(fileid));
+
+		if (file) {
+			CMemFile packetdata(1024 * 2);
 			packetdata.WriteUInt128(m_target);
-			if (m_fileIDs.size() != 1) {
-				throw wxString("Kademlia.CSearch.processResponse: m_fileIDs.size() != 1");
+			packetdata.WriteUInt128(CKademlia::GetPrefs()->GetKadID());
+
+			TagPtrList taglist;
+			taglist.push_back(new CTagString(TAG_FILENAME, file->GetFileName().GetPrintable()));
+			if (file->GetFileRating() != 0) {
+				taglist.push_back(new CTagVarInt(TAG_FILERATING, file->GetFileRating()));
+			}
+			if (!file->GetFileComment().IsEmpty()) {
+				taglist.push_back(new CTagString(TAG_DESCRIPTION, file->GetFileComment()));
 			}
-			// Currently, we limit the type of callbacks for sources. We must know a file this person has for it to work.
-			packetdata.WriteUInt128(m_fileIDs.front());
-			// Send our port so the callback works.
-			packetdata.WriteUInt16(thePrefs::GetPort());
-			// Send packet
-			DebugSend(KadCallbackReq, from->GetIPAddress(), from->GetUDPPort());
+			if (from->GetVersion() >= 2) {
+				taglist.push_back(new CTagVarInt(TAG_FILESIZE, file->GetFileSize()));
+			}
+			packetdata.WriteTagPtrList(taglist);
+
 			if (from->GetVersion() >= 6) {
+				DebugSend(Kad2PublishNotesReq, from->GetIPAddress(), from->GetUDPPort());
 				CUInt128 clientID = from->GetClientID();
-				CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_CALLBACK_REQ, from->GetIPAddress(), from->GetUDPPort(), from->GetUDPKey(), &clientID);
-			} else {
-				CKademlia::GetUDPListener()->SendPacket( packetdata, KADEMLIA_CALLBACK_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
+				CKademlia::GetUDPListener()->SendPacket(packetdata,
+					KADEMLIA2_PUBLISH_NOTES_REQ,
+					from->GetIPAddress(),
+					from->GetUDPPort(),
+					from->GetUDPKey(),
+					&clientID);
+			} else if (from->GetVersion() >= 2) {
+				DebugSend(Kad2PublishNotesReq, from->GetIPAddress(), from->GetUDPPort());
+				CKademlia::GetUDPListener()->SendPacket(packetdata,
+					KADEMLIA2_PUBLISH_NOTES_REQ,
+					from->GetIPAddress(),
+					from->GetUDPPort(),
+					0,
+					NULL);
 				wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
+			} else {
+				wxFAIL;
 			}
-			m_answers++;
-			break;
+			m_totalRequestAnswers++;
+			deleteTagPtrListEntries(&taglist);
+		} else {
+			PrepareToStop();
 		}
-		case NODESPECIAL: {
-			// 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 = NULL;
-				PrepareToStop();
-			}
-			break;
-		 }
-		case NODECOMPLETE:
-			AddDebugLogLineN(logKadSearch, "Search request type: NodeComplete");
-			break;
-		case NODE:
-			AddDebugLogLineN(logKadSearch, "Search request type: Node");
+		break;
+	}
+	case FINDBUDDY: {
+		AddDebugLogLineN(logKadSearch, "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) {
+			PrepareToStop();
 			break;
-		default:
-			AddDebugLogLineN(logKadSearch, CFormat("Search result type: Unknown (%i)") % m_type);
+		}
+
+		CMemFile packetdata;
+		// Send the ID we used to find our buddy. Used for checks later and allows users to callback
+		// someone if they change buddies.
+		packetdata.WriteUInt128(m_target);
+		packetdata.WriteUInt128(CKademlia::GetPrefs()->GetClientHash());
+		packetdata.WriteUInt16(thePrefs::GetPort());
+
+		DebugSend(KadFindBuddyReq, from->GetIPAddress(), from->GetUDPPort());
+		if (from->GetVersion() >= 6) {
+			CUInt128 clientID = from->GetClientID();
+			CKademlia::GetUDPListener()->SendPacket(packetdata,
+				KADEMLIA_FINDBUDDY_REQ,
+				from->GetIPAddress(),
+				from->GetUDPPort(),
+				from->GetUDPKey(),
+				&clientID);
+		} else {
+			CKademlia::GetUDPListener()->SendPacket(packetdata,
+				KADEMLIA_FINDBUDDY_REQ,
+				from->GetIPAddress(),
+				from->GetUDPPort(),
+				0,
+				NULL);
+			wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
+		}
+		m_answers++;
+		break;
+	}
+	case FINDSOURCE: {
+		AddDebugLogLineN(logKadSearch, "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) {
+			PrepareToStop();
 			break;
+		}
+
+		CMemFile packetdata(34);
+		packetdata.WriteUInt128(m_target);
+		if (m_fileIDs.size() != 1) {
+			throw wxString("Kademlia.CSearch.processResponse: m_fileIDs.size() != 1");
+		}
+		// Currently, we limit the type of callbacks for sources. We must know a file this person has
+		// for it to work.
+		packetdata.WriteUInt128(m_fileIDs.front());
+		packetdata.WriteUInt16(thePrefs::GetPort());
+		DebugSend(KadCallbackReq, from->GetIPAddress(), from->GetUDPPort());
+		if (from->GetVersion() >= 6) {
+			CUInt128 clientID = from->GetClientID();
+			CKademlia::GetUDPListener()->SendPacket(packetdata,
+				KADEMLIA_CALLBACK_REQ,
+				from->GetIPAddress(),
+				from->GetUDPPort(),
+				from->GetUDPKey(),
+				&clientID);
+		} else {
+			CKademlia::GetUDPListener()->SendPacket(packetdata,
+				KADEMLIA_CALLBACK_REQ,
+				from->GetIPAddress(),
+				from->GetUDPPort(),
+				0,
+				NULL);
+			wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
+		}
+		m_answers++;
+		break;
+	}
+	case NODESPECIAL: {
+		// 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 = NULL;
+			PrepareToStop();
+		}
+		break;
+	}
+	case NODECOMPLETE:
+		AddDebugLogLineN(logKadSearch, "Search request type: NodeComplete");
+		break;
+	case NODE:
+		AddDebugLogLineN(logKadSearch, "Search request type: Node");
+		break;
+	default:
+		AddDebugLogLineN(logKadSearch, CFormat("Search result type: Unknown (%i)") % m_type);
+		break;
 	}
 }
 
-void CSearch::ProcessResult(const CUInt128& answer, TagPtrList *info)
+void CSearch::ProcessResult(const CUInt128 &answer, TagPtrList *info, uint32_t fromIP, uint16_t fromPort)
 {
 	wxString type = "Unknown";
 	switch (m_type) {
-		case FILE:
-			type = "File";
-			ProcessResultFile(answer, info);
-			break;
-		case KEYWORD:
-			type = "Keyword";
-			ProcessResultKeyword(answer, info);
-			break;
-		case NOTES:
-			type = "Notes";
-			ProcessResultNotes(answer, info);
-			break;
+	case FILE:
+		type = "File";
+		ProcessResultFile(answer, info);
+		break;
+	case KEYWORD:
+		type = "Keyword";
+		ProcessResultKeyword(answer, info, fromIP, fromPort);
+		break;
+	case NOTES:
+		type = "Notes";
+		ProcessResultNotes(answer, info);
+		break;
 	}
 	AddDebugLogLineN(logKadSearch, "Got result (" + type + ")");
 }
 
-void CSearch::ProcessResultFile(const CUInt128& answer, TagPtrList *info)
+void CSearch::ProcessResultFile(const CUInt128 &answer, TagPtrList *info)
 {
 	// Process a possible source to a file.
 	// Set of data we could receive from the result.
@@ -903,38 +1113,62 @@
 			// TODO: Error handling
 			if (!hash.Decode(tag->GetStr())) {
 #ifdef __DEBUG__
-				printf("Invalid buddy-hash: '%s'\n", (const char*)tag->GetStr().fn_str());
+				printf("Invalid buddy-hash: '%s'\n", (const char *)tag->GetStr().fn_str());
 #endif
 			}
 			buddy.SetValueBE(hash.GetHash());
 		} else if (!tag->GetName().Cmp(TAG_ENCRYPTION)) {
 			byCryptOptions = (uint8)tag->GetInt();
+		} else if (!tag->GetName().Cmp(TAG_IPV6) || !tag->GetName().Cmp(TAG_SERVINGBUDDYIPV6)) {
+			// eMuleAI publishes IPv6 sources alongside the IPv4 ones as 32 hex
+			// characters. aMule has no IPv6 stack yet, so the address is validated and
+			// dropped: a malformed tag is worth a log line, and a well-formed one must
+			// not be mistaken for a reachable source. Routing to it is the dual-stack
+			// change.
+			uint8_t address16;
+			bool decoded = false;
+			if (tag->IsStr()) {
+				const wxScopedCharBuffer text = tag->GetStr().utf8_str();
+				decoded = DecodeIPv6HexTag(text.data(), text.length(), address);
+			}
+			if (decoded) {
+				AddDebugLogLineN(logKadSearch,
+					CFormat("Ignoring IPv6 source tag '%s' in search result: no "
+						"IPv6 transport in this build") %
+						tag->GetName());
+			} else {
+				AddDebugLogLineN(logKadSearch,
+					CFormat("Invalid IPv6 source tag '%s' in search result") %
+						tag->GetName());
+			}
 		}
 	}
 
 	// Process source based on its type. Currently only one method is needed to process all types.
-	switch( type ) {
-		case 1:
-		case 3:
-		case 4:
-		case 5:
-		case 6:
-			AddDebugLogLineN(logKadSearch, CFormat("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;
-		case 2:
-			//Don't use this type, some clients will process it wrong.
-		default:
-			break;
+	switch (type) {
+	case 1:
+	case 3:
+	case 4:
+	case 5:
+	case 6:
+		AddDebugLogLineN(logKadSearch,
+			CFormat("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;
+	case 2:
+		// Don't use this type, some clients will process it wrong.
+	default:
+		break;
 	}
 }
 
-void CSearch::ProcessResultNotes(const CUInt128& answer, TagPtrList *info)
+void CSearch::ProcessResultNotes(const CUInt128 &answer, TagPtrList *info)
 {
 	// Process a received Note to a file.
 	// Create a Note and set the IDs.
-	CEntry* entry = new CEntry();
+	CEntry *entry = new CEntry();
 	entry->m_uKeyID = m_target;
 	entry->m_uSourceID = answer;
 
@@ -952,11 +1186,11 @@
 		} 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
+			entry->AddTag(tag, entry->m_uIP);
+			*it = NULL; // Prevent actual data being freed
 		} else if (!tag->GetName().Cmp(TAG_FILERATING)) {
-			entry->AddTag(tag);
-			*it = NULL;	// Prevent actual data being freed
+			entry->AddTag(tag, entry->m_uIP);
+			*it = NULL; // Prevent actual data being freed
 		}
 	}
 
@@ -969,26 +1203,69 @@
 	m_target.ToByteArray(fileid);
 	const CMD4Hash fileHash(fileid);
 
-	//Check if this hash is in our shared files..
-	CKnownFile* file = theApp->sharedfiles->GetFileByID(fileHash);
+	// The same file can exist locally as more than one object sharing this hash: a
+	// downloading/shared CKnownFile and one CSearchFile per open search that returned it. The
+	// user may have triggered the lookup from any of them, and each keeps its own note list, so
+	// deliver the note to EVERY match. AddNote takes ownership and dedups per list, so each
+	// extra target gets an independent Copy() and the single original is consumed exactly once.
+	CKnownFile *knownFile = theApp->sharedfiles->GetFileByID(fileHash);
+	if (!knownFile) {
+		knownFile = theApp->downloadqueue->GetFileByID(fileHash);
+	}
+	std::vector<CSearchFile *> searchFiles;
+	theApp->searchlist->GetAllSearchFilesByID(fileHash, searchFiles);
 
-	if (!file) {
-		// If we didn't find anything check if it's in our download queue.
-		file = theApp->downloadqueue->GetFileByID(fileHash);
+	if (!knownFile && searchFiles.empty()) {
+		AddDebugLogLineN(logKadSearch, "Comment received for unknown file");
+		delete entry;
+		return;
 	}
 
-	// If we found a file try to add the note to the file.
-	if (file) {
-		file->AddNote(entry);
-		m_answers++;
+	m_answers++;
+	// Every search result sharing this hash (one per open search tab) gets its own copy; the
+	// note rides the next search-results poll, search files carrying no EC change-generation.
+	for (CSearchFile *searchFile : searchFiles) {
+		searchFile->AddNote(entry->Copy());
+	}
+	if (knownFile) {
+		knownFile->AddNote(entry);
+		// Re-emit the partfile so amulegui / amuleapi see notes stream in live
+		// (matching the monolithic dialog), instead of all at once when the
+		// search ends. AddNote dedups, so a repeat is cheap.
+		knownFile->MarkECChanged();
 	} else {
-		AddDebugLogLineN(logKadSearch, "Comment received for unknown file");
+		// No known file to take ownership of the original; the search results
+		// all received copies above.
 		delete entry;
 	}
 }
 
-void CSearch::ProcessResultKeyword(const CUInt128& answer, TagPtrList *info)
+void CSearch::ProcessResultKeyword(
+	const CUInt128 &answer, TagPtrList *info, uint32_t fromIP, uint16_t fromPort)
 {
+#ifdef ENABLE_KAD_PROTOCOL_10
+	// Find the contact that answered, so version-gated result tags can be checked against the
+	// version it advertised. A tag a peer cannot possibly have generated is a tag it is
+	// relaying on someone else's behalf, and the whole point of the publisher-side filtering is
+	// that we do not take those at face value.
+	uint8_t fromKadVersion = 0;
+	for (ContactMap::const_iterator it = m_tried.begin(); it != m_tried.end(); ++it) {
+		const CContact *tmpContact = it->second;
+		if ((tmpContact->GetIPAddress() == fromIP) && (tmpContact->GetUDPPort() == fromPort)) {
+			fromKadVersion = tmpContact->GetVersion();
+			break;
+		}
+	}
+	if (fromKadVersion == 0) {
+		AddDebugLogLineN(logKadSearch,
+			"Unable to find the answering contact in ProcessResultKeyword - " +
+				KadIPPortToString(fromIP, fromPort));
+	}
+#else
+	(void)fromIP;
+	(void)fromPort;
+#endif
+
 	// Process a keyword that we received.
 	// Set of data we can use for a keyword result.
 	wxString name;
@@ -1003,12 +1280,15 @@
 	uint32_t bitrate = 0;
 	uint32_t availability = 0;
 	uint32_t publishInfo = 0;
+#ifdef ENABLE_KAD_PROTOCOL_10
+	std::vector<CKadAICHHashList::SResultHash> aichHashes;
+#endif
 	// Flag that is set if we want this keyword
 	bool bFileName = false;
 	bool bFileSize = false;
 
 	for (TagPtrList::const_iterator it = info->begin(); it != info->end(); ++it) {
-		CTag* tag = *it;
+		CTag *tag = *it;
 		if (tag->GetName() == TAG_FILENAME) {
 			name = tag->GetStr();
 			bFileName = !name.IsEmpty();
@@ -1040,25 +1320,55 @@
 		} else if (tag->GetName() == TAG_SOURCES) {
 			availability = tag->GetInt();
 			// Some rogue client was setting a invalid availability, just set it to 0.
-			if( availability > 65500 ) {
+			if (availability > 65500) {
 				availability = 0;
 			}
 		} else if (tag->GetName() == TAG_PUBLISHINFO) {
-			// we don't keep this as tag, but as a member property of the searchfile, as we only need its information
-			// in the search list and don't want to carry the tag over when downloading the file (and maybe even wrongly publishing it)
+			// we don't keep this as tag, but as a member property of the searchfile, as we only
+			// need its information in the search list and don't want to carry the tag over when
+			// downloading the file (and maybe even wrongly publishing it)
 			publishInfo = (uint32_t)tag->GetInt();
 #ifdef __DEBUG__
 			uint32_t differentNames = (publishInfo & 0xFF000000) >> 24;
 			uint32_t publishersKnown = (publishInfo & 0x00FF0000) >> 16;
 			uint32_t trustValue = publishInfo & 0x0000FFFF;
-			AddDebugLogLineN(logKadSearch, CFormat("Received PublishInfo Tag: %u different names, %u publishers, %.2f trustvalue") % differentNames % publishersKnown % ((double)trustValue/ 100.0));
+			AddDebugLogLineN(logKadSearch,
+				CFormat("Received PublishInfo Tag: %u different names, %u publishers, %.2f "
+					"trustvalue") %
+					differentNames % publishersKnown % ((double)trustValue / 100.0));
+#endif
+#ifdef ENABLE_KAD_PROTOCOL_10
+		} else if (tag->GetName() == TAG_KADAICHHASHRESULT) {
+			// AICH hashes on keyword storage arrived with Kad protocol version 0x09, so
+			// a sender below that cannot have produced this tag itself and it is
+			// filtered rather than trusted. Gated with the rest: with the switch off we
+			// never publish an AICH hash, so acting on one a peer reports would be
+			// behaviour upstream does not have.
+			if (CKadAICHHashList::PeerSupportsAICHKeywordStorage(fromKadVersion) &&
+				tag->IsBsob()) {
+				if (!CKadAICHHashList::DecodeResultTag(
+					    tag->GetBsob(), tag->GetBsobSize(), aichHashes)) {
+					AddDebugLogLineN(logKadSearch,
+						"ProcessResultKeyword: corrupt or invalid "
+						"TAG_KADAICHHASHRESULT received from " +
+							KadIPPortToString(fromIP, fromPort));
+				}
+			} else {
+				AddDebugLogLineN(logKadSearch,
+					CFormat("ProcessResultKeyword: received special publish tag "
+						"(TAG_KADAICHHASHRESULT) from a node (version %u, %s) "
+						"which is not aware of it, filtering") %
+						fromKadVersion % KadIPPortToString(fromIP, fromPort));
+			}
 #endif
 		}
 	}
 
 	// If we don't have a valid filename and filesize, drop this keyword.
 	if (!bFileName || !bFileSize) {
-		AddDebugLogLineN(logKadSearch, wxString("No ") + (!bFileName ? "filename" : "filesize") + " on search result, ignoring");
+		AddDebugLogLineN(logKadSearch,
+			wxString("No ") + (!bFileName ? "filename" : "filesize") +
+				" on search result, ignoring");
 		return;
 	}
 
@@ -1076,6 +1386,12 @@
 	if (!title.IsEmpty()) {
 		taglist.push_back(new CTagString(TAG_MEDIA_TITLE, title));
 	}
+	// The codec was read off the wire and then never mentioned again, so every Kad result
+	// showed an empty Codec column and the value never reached a download started from it.
+	// Being a wxString, the dead store was not something -Wunused-but-set-variable could flag.
+	if (!codec.IsEmpty()) {
+		taglist.push_back(new CTagString(TAG_MEDIA_CODEC, codec));
+	}
 	if (length) {
 		taglist.push_back(new CTagVarInt(TAG_MEDIA_LENGTH, length));
 	}
@@ -1085,33 +1401,44 @@
 	if (availability) {
 		taglist.push_back(new CTagVarInt(TAG_SOURCES, availability));
 	}
+#ifdef ENABLE_KAD_PROTOCOL_10
+	// Carry a trusted AICH root hash into the search result, under the same tag name
+	// (FT_AICH_HASH) that an ed2k result and the part-file metadata use, so CPartFile takes it
+	// as its master hash when a download starts. SelectTrusted() answers nullptr far more often
+	// than not: see its declaration for why refusing is the right default here.
+	const uint32_t publishersKnown = (publishInfo & 0x00FF0000) >> 16;
+	const CKadAICHHashList::SResultHash *bestAICHHash =
+		CKadAICHHashList::SelectTrusted(aichHashes, publishersKnown);
+	if (bestAICHHash != nullptr) {
+		CAICHHash hash;
+		memcpy(hash.GetRawHash(), bestAICHHash->m_hash.data(), CAICHHash::GetHashSize());
+		taglist.push_back(new CTagString(TAG_AICHHASH, hash.GetString()));
+	}
+#endif
 
 	m_answers++;
-	theApp->searchlist->KademliaSearchKeyword(m_searchID, &answer, name, size, type, publishInfo, taglist);
+	theApp->searchlist->KademliaSearchKeyword(
+		m_searchID, &answer, name, size, type, publishInfo, taglist);
 
-	// Free tags memory
 	deleteTagPtrListEntries(&taglist);
 }
 
 void CSearch::SendFindValue(CContact *contact, bool reaskMore)
 {
-	// Found a node that we think has contacts closer to our target.
 	try {
 		if (m_stopping) {
 			return;
 		}
 
 		CMemFile packetdata(33);
-		// The number of returned contacts is based on the type of search.
 		uint8_t contactCount = GetRequestContactCount();
 
 		if (reaskMore) {
-			// Either the JumpStart dead-nodes-fallback or
-			// CSearch::RequestMoreResults() asked us to send the wider
-			// KADEMLIA_FIND_VALUE_MORE variant to this contact.  Track
-			// the contact's ClientID so ProcessResponse's "more results
-			// than requested" check accepts the larger response, and so
-			// RequestMoreResults() won't reask the same peer twice.
+			// Either the JumpStart dead-nodes fallback or RequestMoreResults() asked us
+			// to send the wider KADEMLIA_FIND_VALUE_MORE variant to this contact.
+			// Tracking its ClientID makes ProcessResponse's "more results than
+			// requested" check accept the larger response, and stops
+			// RequestMoreResults() reasking the same peer twice.
 			wxASSERT(contactCount == KADEMLIA_FIND_VALUE);
 			m_requestedMoreNodes.insert(contact->GetClientID());
 			contactCount = KADEMLIA_FIND_VALUE_MORE;
@@ -1123,81 +1450,115 @@
 			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.
 		packetdata.WriteUInt128(contact->GetClientID());
 		if (contact->GetVersion() >= 2) {
 			if (contact->GetVersion() >= 6) {
-				CUInt128 clientID = contact->GetClientID();
-				CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_REQ, contact->GetIPAddress(), contact->GetUDPPort(), contact->GetUDPKey(), &clientID);
+				const CUInt128 &clientID = contact->GetClientID();
+				CKademlia::GetUDPListener()->SendPacket(packetdata,
+					KADEMLIA2_REQ,
+					contact->GetIPAddress(),
+					contact->GetUDPPort(),
+					contact->GetUDPKey(),
+					&clientID);
 			} else {
-				CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_REQ, contact->GetIPAddress(), contact->GetUDPPort(), 0, NULL);
+				CKademlia::GetUDPListener()->SendPacket(packetdata,
+					KADEMLIA2_REQ,
+					contact->GetIPAddress(),
+					contact->GetUDPPort(),
+					0,
+					NULL);
 				wxASSERT(contact->GetUDPKey() == CKadUDPKey(0));
 			}
 #ifdef __DEBUG__
 			switch (m_type) {
-				case NODE:
-					DebugSendF("Kad2Req(Node)", contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case NODECOMPLETE:
-					DebugSendF("Kad2Req(NodeComplete)", contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case NODESPECIAL:
-					DebugSendF("Kad2Req(NodeSpecial)", contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case NODEFWCHECKUDP:
-					DebugSendF("Kad2Req(NodeFWCheckUDP)", contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case FILE:
-					DebugSendF("Kad2Req(File)", contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case KEYWORD:
-					DebugSendF("Kad2Req(Keyword)", contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case STOREFILE:
-					DebugSendF("Kad2Req(StoreFile)", contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case STOREKEYWORD:
-					DebugSendF("Kad2Req(StoreKeyword)", contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case STORENOTES:
-					DebugSendF("Kad2Req(StoreNotes)", contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case NOTES:
-					DebugSendF("Kad2Req(Notes)", contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				default:
-					DebugSend(Kad2Req, contact->GetIPAddress(), contact->GetUDPPort());
-					break;
+			case NODE:
+				DebugSendF("Kad2Req(Node)", contact->GetIPAddress(), contact->GetUDPPort());
+				break;
+			case NODECOMPLETE:
+				DebugSendF("Kad2Req(NodeComplete)",
+					contact->GetIPAddress(),
+					contact->GetUDPPort());
+				break;
+			case NODESPECIAL:
+				DebugSendF("Kad2Req(NodeSpecial)",
+					contact->GetIPAddress(),
+					contact->GetUDPPort());
+				break;
+			case NODEFWCHECKUDP:
+				DebugSendF("Kad2Req(NodeFWCheckUDP)",
+					contact->GetIPAddress(),
+					contact->GetUDPPort());
+				break;
+			case FILE:
+				DebugSendF("Kad2Req(File)", contact->GetIPAddress(), contact->GetUDPPort());
+				break;
+			case KEYWORD:
+				DebugSendF(
+					"Kad2Req(Keyword)", contact->GetIPAddress(), contact->GetUDPPort());
+				break;
+			case STOREFILE:
+				DebugSendF(
+					"Kad2Req(StoreFile)", contact->GetIPAddress(), contact->GetUDPPort());
+				break;
+			case STOREKEYWORD:
+				DebugSendF("Kad2Req(StoreKeyword)",
+					contact->GetIPAddress(),
+					contact->GetUDPPort());
+				break;
+			case STORENOTES:
+				DebugSendF("Kad2Req(StoreNotes)",
+					contact->GetIPAddress(),
+					contact->GetUDPPort());
+				break;
+			case NOTES:
+				DebugSendF("Kad2Req(Notes)", contact->GetIPAddress(), contact->GetUDPPort());
+				break;
+			default:
+				DebugSend(Kad2Req, contact->GetIPAddress(), contact->GetUDPPort());
+				break;
 			}
 #endif
+#ifdef ENABLE_KAD_NODE_PROTECTION
+			// Start the clock on this request. The answer's round-trip time feeds the
+			// shared response-time estimator, and JumpStart uses the same record to
+			// notice a request that has gone past the estimated ceiling.
+			sPendingRequest pending = {
+				::GetTickCount64(), contact->GetIPAddress(), contact->GetUDPPort()
+			};
+			m_pendingRequestscontact->GetClientID() = pending;
+#endif
 		} else {
 			wxFAIL;
 		}
-	} catch (const CEOFException& err) {
+	} catch (const CEOFException &err) {
 		AddDebugLogLineC(logKadSearch, "CEOFException in CSearch::SendFindValue: " + err.what());
-	} catch (const CInvalidPacket& err) {
-		AddDebugLogLineC(logKadSearch, "CInvalidPacket Exception in CSearch::SendFindValue: " + err.what());
-	} catch (const wxString& e) {
+	} catch (const CInvalidPacket &err) {
+		AddDebugLogLineC(
+			logKadSearch, "CInvalidPacket Exception in CSearch::SendFindValue: " + err.what());
+	} catch (const wxString &e) {
 		AddDebugLogLineC(logKadSearch, "Exception in CSearch::SendFindValue: " + e);
 	}
 }
 
+// The terminal half of RequestMoreResults()'s guards -- everything that will still be true on the
+// next press. Deliberately does NOT walk m_responded: "no un-reasked peer right now" is transient,
+// clears when another peer answers, and must not read as "never again".
+bool CSearch::CanReaskMore() const
+{
+	return !m_stopping && GetRequestContactCount() == KADEMLIA_FIND_VALUE &&
+	       m_requestedMoreNodes.size() < KADEMLIA_FIND_VALUE_MORE_REASKS;
+}
+
 bool CSearch::RequestMoreResults()
 {
-	// Walk m_responded (sorted by distance to target) for the closest
-	// peer we have not yet asked for KADEMLIA_FIND_VALUE_MORE, and
-	// dispatch the wider variant to it.  Each reask returns up to 11
-	// closer contacts (vs the default 2), which the existing
-	// ProcessResponse cascade then queries with FIND_VALUE — surfacing
-	// additional file matches from one extra ring of the routing-table
-	// neighbourhood.
+	// Walk m_responded (sorted by distance to target) for the closest peer not yet asked for
+	// KADEMLIA_FIND_VALUE_MORE, and dispatch the wider variant to it. Each reask returns up to
+	// 11 closer contacts instead of 2, which the ProcessResponse cascade then queries --
+	// surfacing more file matches from one extra ring of the routing-table neighbourhood.
 	//
-	// Bounded by KADEMLIA_FIND_VALUE_MORE_REASKS to limit per-search
-	// network impact: past 4 reasks the local neighbourhood for a
-	// given keyword is typically exhausted and additional reasks are
-	// wasted UDP traffic.
+	// Bounded by KADEMLIA_FIND_VALUE_MORE_REASKS: past 4 reasks the local neighbourhood for a
+	// keyword is typically exhausted.
 
 	if (m_stopping) {
 		return false;
@@ -1211,70 +1572,87 @@
 		return false;
 	}
 
-	// m_responded is keyed by distance; iteration is closest-first.
-	// m_tried is a parallel ContactMap on the same key, so we look up
-	// the CContact* via m_tried.
-	for (RespondedMap::const_iterator it = m_responded.begin();
-		 it != m_responded.end(); ++it) {
-		const CUInt128& distance = it->first;
+	// m_responded is keyed by distance, so iteration is closest-first. m_tried is a parallel
+	// ContactMap on the same key, so the CContact* is looked up there.
+	for (RespondedMap::const_iterator it = m_responded.begin(); it != m_responded.end(); ++it) {
+		const CUInt128 &distance = it->first;
 		ContactMap::const_iterator triedIt = m_tried.find(distance);
 		if (triedIt == m_tried.end()) {
 			continue; // shouldn't happen; defensive
 		}
-		CContact* contact = triedIt->second;
+		CContact *contact = triedIt->second;
 		if (m_requestedMoreNodes.count(contact->GetClientID()) > 0) {
 			continue; // already reasked this one
 		}
-		AddDebugLogLineN(logKadSearch, CFormat(
-			"User-triggered RequestMoreResults: reasking %s for more contacts (search id=%x, reask %u/%u)")
-			% KadIPToString(contact->GetIPAddress())
-			% GetSearchID()
-			% (unsigned)(m_requestedMoreNodes.size() + 1)
-			% (unsigned)KADEMLIA_FIND_VALUE_MORE_REASKS);
+		AddDebugLogLineN(logKadSearch,
+			CFormat("User-triggered RequestMoreResults: reasking %s for more contacts (search "
+				"id=%x, reask %u/%u)") %
+				KadIPToString(contact->GetIPAddress()) % GetSearchID() %
+				(unsigned)(m_requestedMoreNodes.size() + 1) %
+				(unsigned)KADEMLIA_FIND_VALUE_MORE_REASKS);
 		SendFindValue(contact, true);
 		return true;
 	}
 	return false;
 }
 
-
 // TODO: Redundant metadata checks
-void CSearch::PreparePacketForTags(CMemFile *bio, CKnownFile *file)
+void CSearch::PreparePacketForTags(CMemFile *bio, CKnownFile *file, uint8_t targetKadVersion)
 {
-	// We're going to publish a keyword, set up the tag list
 	TagPtrList taglist;
 
 	try {
 		if (file && bio) {
-			// Name, Size
 			taglist.push_back(new CTagString(TAG_FILENAME, file->GetFileName().GetPrintable()));
 			taglist.push_back(new CTagVarInt(TAG_FILESIZE, file->GetFileSize()));
 			taglist.push_back(new CTagVarInt(TAG_SOURCES, file->m_nCompleteSourcesCount));
 
+#ifdef ENABLE_KAD_PROTOCOL_10
+			// AICH root hash, added to keyword storage by Kad protocol version 0x09. A
+			// node at 0x08 has no handling for this tag, so it is omitted for it: the
+			// entry it stores simply carries no AICH hash and stays usable for search
+			// and routing.
+			if (CKadAICHHashList::PeerSupportsAICHKeywordStorage(targetKadVersion) &&
+				file->HasProperAICHHashSet()) {
+				const CAICHHash &aichHash = file->GetAICHHashset()->GetMasterHash();
+				taglist.push_back(new CTagBsob(TAG_KADAICHHASHPUB,
+					aichHash.GetRawHash(),
+					(uint8_t)CAICHHash::GetHashSize()));
+			}
+#else
+			(void)targetKadVersion;
+#endif
+
 			// eD2K file type (Audio, Video, ...)
-			// NOTE: Archives and CD-Images are published with file type "Pro"
-			wxString strED2KFileType(GetED2KFileTypeSearchTerm(GetED2KFileTypeID(file->GetFileName())));
+			// NOTE: Archives and disc images are published with file type "Pro"
+			wxString strED2KFileType(
+				GetED2KFileTypeSearchTerm(GetED2KFileTypeID(file->GetFileName())));
 			if (!strED2KFileType.IsEmpty()) {
 				taglist.push_back(new CTagString(TAG_FILETYPE, strED2KFileType));
 			}
 
-			// additional meta data (Artist, Album, Codec, Length, ...)
-			// only send verified meta data to nodes
+			// Additional meta data (Artist, Album, Codec, Length, ...).
+			//
+			// NOT only verified metadata, despite what this used to claim: a download
+			// inherits its source's tags as a during-download preview, and
+			// GetMetaDataVer() answers "has any FT_MEDIA_* tag", not "was locally
+			// probed". So a partfile republishes what its search result advertised
+			// until its own completion probe corrects it. Telling the two apart needs a
+			// locally-probed flag on the file.
 			if (file->GetMetaDataVer() > 0) {
-				static const struct{
-					uint8_t	nName;
-					uint8_t	nType;
-				} _aMetaTags =
-				{
-					{ FT_MEDIA_ARTIST,  2 },
-					{ FT_MEDIA_ALBUM,   2 },
-					{ FT_MEDIA_TITLE,   2 },
-					{ FT_MEDIA_LENGTH,  3 },
-					{ FT_MEDIA_BITRATE, 3 },
-					{ FT_MEDIA_CODEC,   2 }
-				};
+				// Looked up by id ALONE, not by (id, type). The old exact
+				// GetTag(id, TAGTYPE_UINT32) was safe only while everything
+				// reaching a CKnownFile locally happened to be a CTagInt32; now
+				// that a download can inherit a narrower integer from a Kad hit, it
+				// would silently stop publishing the moment such a tag was stored.
+				static const uint8_t _aMetaTags = { FT_MEDIA_ARTIST,
+					FT_MEDIA_ALBUM,
+					FT_MEDIA_TITLE,
+					FT_MEDIA_LENGTH,
+					FT_MEDIA_BITRATE,
+					FT_MEDIA_CODEC };
 				for (unsigned int i = 0; i < itemsof(_aMetaTags); i++) {
-					const ::CTag* pTag = file->GetTag(_aMetaTagsi.nName, _aMetaTagsi.nType);
+					const ::CTag *pTag = file->GetTag(_aMetaTagsi);
 					if (pTag) {
 						// skip string tags with empty string values
 						if (pTag->IsStr() && pTag->GetStr().IsEmpty()) {
@@ -1286,23 +1664,27 @@
 						}
 						wxString szKadTagName = CFormat("%c") % pTag->GetNameID();
 						if (pTag->IsStr()) {
-							taglist.push_back(new CTagString(szKadTagName, pTag->GetStr()));
+							taglist.push_back(
+								new CTagString(szKadTagName, pTag->GetStr()));
 						} else {
-							taglist.push_back(new CTagVarInt(szKadTagName, pTag->GetInt()));
+							taglist.push_back(
+								new CTagVarInt(szKadTagName, pTag->GetInt()));
 						}
 					}
 				}
 			}
 			bio->WriteTagPtrList(taglist);
 		} else {
-			//If we get here.. Bad things happen.. Will fix this later if it is a real issue.
+			// If we get here.. Bad things happen.. Will fix this later if it is a real issue.
 			wxFAIL;
 		}
-	} catch (const CEOFException& err) {
-		AddDebugLogLineC(logKadSearch, "CEOFException in CSearch::PreparePacketForTags: " + err.what());
-	} catch (const CInvalidPacket& err) {
-		AddDebugLogLineC(logKadSearch, "CInvalidPacket Exception in CSearch::PreparePacketForTags: " + err.what());
-	} catch (const wxString& e) {
+	} catch (const CEOFException &err) {
+		AddDebugLogLineC(
+			logKadSearch, "CEOFException in CSearch::PreparePacketForTags: " + err.what());
+	} catch (const CInvalidPacket &err) {
+		AddDebugLogLineC(logKadSearch,
+			"CInvalidPacket Exception in CSearch::PreparePacketForTags: " + err.what());
+	} catch (const wxString &e) {
 		AddDebugLogLineC(logKadSearch, "Exception in CSearch::PreparePacketForTags: " + e);
 	}
 
@@ -1312,7 +1694,7 @@
 void CSearch::SetSearchTermData(uint32_t searchTermsDataSize, const uint8_t *searchTermsData)
 {
 	m_searchTermsDataSize = searchTermsDataSize;
-	m_searchTermsData = new uint8_t searchTermsDataSize;
+	m_searchTermsData = new uint8_tsearchTermsDataSize;
 	memcpy(m_searchTermsData, searchTermsData, searchTermsDataSize);
 }
 
@@ -1320,24 +1702,24 @@
 {
 	// Returns the amount of contacts we request on routing queries based on the search type
 	switch (m_type) {
-		case NODE:
-		case NODECOMPLETE:
-		case NODESPECIAL:
-		case NODEFWCHECKUDP:
-			return KADEMLIA_FIND_NODE;
-		case FILE:
-		case KEYWORD:
-		case FINDSOURCE:
-		case NOTES:
-			return KADEMLIA_FIND_VALUE;
-		case FINDBUDDY:
-		case STOREFILE:
-		case STOREKEYWORD:
-		case STORENOTES:
-			return KADEMLIA_STORE;
-		default:
-			AddDebugLogLineN(logKadSearch, "Invalid search type. (CSearch::GetRequestContactCount())");
-			wxFAIL;
-			return 0;
+	case NODE:
+	case NODECOMPLETE:
+	case NODESPECIAL:
+	case NODEFWCHECKUDP:
+		return KADEMLIA_FIND_NODE;
+	case FILE:
+	case KEYWORD:
+	case FINDSOURCE:
+	case NOTES:
+		return KADEMLIA_FIND_VALUE;
+	case FINDBUDDY:
+	case STOREFILE:
+	case STOREKEYWORD:
+	case STORENOTES:
+		return KADEMLIA_STORE;
+	default:
+		AddDebugLogLineN(logKadSearch, "Invalid search type. (CSearch::GetRequestContactCount())");
+		wxFAIL;
+		return 0;
 	}
 }

amule-3.0.1.tar.gz/src/kademlia/kademlia/Search.h -> amule-3.1.0.tar.gz/src/kademlia/kademlia/Search.h Changed

@@ -36,8 +36,8 @@
 there client on the eMule forum..
 */
 
-#ifndef __SEARCH_H__
-#define __SEARCH_H__
+#ifndef SEARCH_H
+#define SEARCH_H
 
 #include <set>
 
@@ -47,7 +47,8 @@
 class CTag;
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
 class CKadClientSearcher;
@@ -57,46 +58,85 @@
 	friend class CSearchManager;
 
 public:
-	uint32_t GetSearchID() const noexcept		{ return m_searchID; }
-	void	 SetSearchID(uint32_t id) noexcept	{ m_searchID = id; }
-	uint32_t GetSearchTypes() const noexcept		{ return m_type; }
-	void	 SetSearchTypes(uint32_t val) noexcept	{ m_type = val; }
-	void	 SetTargetID(const CUInt128& val) noexcept { m_target = val; }
-	CUInt128 GetTarget() const noexcept		{ return m_target; }
-
-	uint32_t GetAnswers() const noexcept		{ return m_fileIDs.size() ? m_answers / ((m_fileIDs.size() + 49) / 50) : m_answers; }
-	uint32_t GetRequestAnswer() const noexcept	{ return m_totalRequestAnswers; }
-
-	const wxString&	GetFileName(void) const noexcept			{ return m_fileName; }
-	void		SetFileName(const wxString& fileName) noexcept	{ m_fileName = fileName; }
-
-	void	 AddFileID(const CUInt128& id)		{ m_fileIDs.push_back(id); }
-	void	 PreparePacketForTags(CMemFile* packet, CKnownFile* file);
-	bool	 Stopping() const noexcept		{ return m_stopping; }
-
-	uint32_t GetNodeLoad() const noexcept		{ return m_totalLoadResponses == 0 ? 0 : m_totalLoad / m_totalLoadResponses; }
-	uint32_t GetNodeLoadResponse() const noexcept	{ return m_totalLoadResponses; }
-	uint32_t GetNodeLoadTotal() const noexcept	{ return m_totalLoad; }
-	void	 UpdateNodeLoad(uint8_t load) noexcept	{ m_totalLoad += load; m_totalLoadResponses++; }
-
-	void	 SetSearchTermData(uint32_t searchTermsDataSize, const uint8_t *searchTermsData);
-
-	CKadClientSearcher *	GetNodeSpecialSearchRequester() const noexcept				{ return m_nodeSpecialSearchRequester; }
-	void			SetNodeSpecialSearchRequester(CKadClientSearcher *requester) noexcept	{ m_nodeSpecialSearchRequester = requester; }
-
-	// User-triggered widening of the Kad result set.  Walks m_responded for
-	// the closest contact we have not already reasked, and sends it
-	// SendFindValue with reaskMore=true (i.e. KADEMLIA_FIND_VALUE_MORE on
-	// the wire instead of KADEMLIA_FIND_VALUE — peers return up to 11
-	// closer contacts instead of 2).  Subsequent FIND_VALUE queries against
-	// those contacts surface additional file matches that the search's
-	// initial alpha=ALPHA_QUERY frontier missed.  Bounded internally by
-	// m_requestedMoreNodes.size() < KADEMLIA_FIND_VALUE_MORE_REASKS to
-	// limit per-search network impact.  Returns true if a reask was
-	// dispatched, false if no eligible candidate remains.
-	bool		RequestMoreResults();
-
-	enum {
+	uint32_t GetSearchID() const noexcept { return m_searchID; }
+	void SetSearchID(uint32_t id) noexcept
+	{
+		m_searchID = id;
+		m_searchIDAssigned = true;
+	}
+	// Whether this search was ever given an id. Only PrepareFindKeywords and PrepareLookup
+	// assign one; FindNode, FindNodeSpecial and FindNodeFWCheckUDP leave the constructor's
+	// default, which is the same value an EC client that predates multi-search uses for every
+	// search it runs (0xFFFFFFFF). An id lookup must not resolve to a search that never claimed
+	// one, or aMule's own node lookups answer for a legacy client's search. The value alone
+	// cannot say: a legacy Kad keyword search really does get 0xFFFFFFFF assigned,
+	// deliberately, in PrepareFindKeywords.
+	bool HasSearchID() const noexcept { return m_searchIDAssigned; }
+	uint32_t GetSearchTypes() const noexcept { return m_type; }
+	void SetSearchTypes(uint32_t val) noexcept { m_type = val; }
+	void SetTargetID(const CUInt128 &val) noexcept { m_target = val; }
+	CUInt128 GetTarget() const noexcept { return m_target; }
+
+	uint32_t GetAnswers() const noexcept
+	{
+		return m_fileIDs.size() ? m_answers / ((m_fileIDs.size() + 49) / 50) : m_answers;
+	}
+	uint32_t GetRequestAnswer() const noexcept { return m_totalRequestAnswers; }
+
+	const wxString &GetFileName(void) const noexcept { return m_fileName; }
+	void SetFileName(const wxString &fileName) noexcept { m_fileName = fileName; }
+
+	void AddFileID(const CUInt128 &id) { m_fileIDs.push_back(id); }
+	// `targetKadVersion` is the advertised Kad version of the node we are
+	// about to publish to; tags introduced after its version are omitted.
+	void PreparePacketForTags(CMemFile *packet, CKnownFile *file, uint8_t targetKadVersion);
+	bool Stopping() const noexcept { return m_stopping; }
+
+	uint32_t GetNodeLoad() const noexcept
+	{
+		return m_totalLoadResponses == 0 ? 0 : m_totalLoad / m_totalLoadResponses;
+	}
+	uint32_t GetNodeLoadResponse() const noexcept { return m_totalLoadResponses; }
+	uint32_t GetNodeLoadTotal() const noexcept { return m_totalLoad; }
+	void UpdateNodeLoad(uint8_t load) noexcept
+	{
+		m_totalLoad += load;
+		m_totalLoadResponses++;
+	}
+
+	void SetSearchTermData(uint32_t searchTermsDataSize, const uint8_t *searchTermsData);
+
+	CKadClientSearcher *GetNodeSpecialSearchRequester() const noexcept
+	{
+		return m_nodeSpecialSearchRequester;
+	}
+	void SetNodeSpecialSearchRequester(CKadClientSearcher *requester) noexcept
+	{
+		m_nodeSpecialSearchRequester = requester;
+	}
+
+	// User-triggered widening of the Kad result set. Walks m_responded for the closest contact
+	// not already reasked and sends it SendFindValue with reaskMore=true, so peers return up to
+	// 11 closer contacts instead of 2. Later FIND_VALUE queries against those contacts surface
+	// matches the search's initial alpha=ALPHA_QUERY frontier missed. Bounded internally by
+	// KADEMLIA_FIND_VALUE_MORE_REASKS.
+	bool RequestMoreResults();
+
+	// Whether this search could still be widened by a future reask, ignoring whether one is
+	// dispatchable right now.
+	//
+	// The distinction is the point: RequestMoreResults() returns false both when the search is
+	// finished with reasking for good and when it simply has no un-reasked peer to send to YET,
+	// and those want opposite answers from a UI. The first is terminal, so the "More" control
+	// should go away; the second clears as soon as another peer responds.
+	//
+	// Callers pair the two as `fired || CanReaskMore()`, and the `fired ||` is not optional:
+	// the reask that consumes the last of the budget really happens, and this predicate is
+	// already false by the time it returns.
+	bool CanReaskMore() const;
+
+	enum
+	{
 		NODE,
 		NODECOMPLETE,
 		FILE,
@@ -107,8 +147,11 @@
 		STORENOTES,
 		FINDBUDDY,
 		FINDSOURCE,
-		NODESPECIAL,	// nodesearch request from requester "outside" of kad to find the IP of a given NodeID
-		NODEFWCHECKUDP	// find new unknown IPs for a UDP firewallcheck
+		// nodesearch request from requester "outside" of kad to find
+		// the IP of a given NodeID
+		NODESPECIAL,
+		// find new unknown IPs for a UDP firewallcheck
+		NODEFWCHECKUDP
 	};
 
 	CSearch();
@@ -117,58 +160,85 @@
 private:
 	void Go();
 	void ProcessResponse(uint32 fromIP, uint16 fromPort, ContactList *results);
-	void ProcessResult(const CUInt128 &answer, TagPtrList *info);
+	void ProcessResult(const CUInt128 &answer, TagPtrList *info, uint32_t fromIP, uint16_t fromPort);
 	void ProcessResultFile(const CUInt128 &answer, TagPtrList *info);
-	void ProcessResultKeyword(const CUInt128 &answer, TagPtrList *info);
+	void ProcessResultKeyword(
+		const CUInt128 &answer, TagPtrList *info, uint32_t fromIP, uint16_t fromPort);
 	void ProcessResultNotes(const CUInt128 &answer, TagPtrList *info);
 	void JumpStart();
 	void SendFindValue(CContact *contact, bool reaskMore = false);
 	void PrepareToStop() noexcept;
 	void StorePacket();
 
-	uint8_t	GetRequestContactCount() const;
-
-	bool		m_stopping;
-	time_t		m_created;
-	uint32_t	m_type;
-	uint32_t	m_answers;
-	uint32_t	m_totalRequestAnswers;
-	uint32_t	m_totalLoad;
-	uint32_t	m_totalLoadResponses;
-	uint32_t	m_lastResponse;
-
-	uint32_t	m_searchID;
-	CUInt128	m_target;
-	uint32_t	m_searchTermsDataSize;
-	uint8_t *	m_searchTermsData;
-	WordList	m_words;  // list of words in the search string (populated in CSearchManager::PrepareFindKeywords)
-	wxString	m_fileName;
-	UIntList	m_fileIDs;
+	uint8_t GetRequestContactCount() const;
+
+	bool m_stopping;
+	time_t m_created;
+	uint32_t m_type;
+	uint32_t m_answers;
+	uint32_t m_totalRequestAnswers;
+	uint32_t m_totalLoad;
+	uint32_t m_totalLoadResponses;
+	uint32_t m_lastResponse;
+
+	uint32_t m_searchID;
+	bool m_searchIDAssigned;
+	CUInt128 m_target;
+	uint32_t m_searchTermsDataSize;
+	uint8_t *m_searchTermsData;
+	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;
-	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
-
-	// Set of contact ClientIDs we have asked KADEMLIA_FIND_VALUE_MORE
-	// from (the wider 11-contact response variant).  Tracked as a set
-	// rather than a single pointer so that:
-	//   - the existing dead-nodes-fallback at JumpStart can still fire
-	//     once on the closest responded node (semantically: empty set
-	//     before, one entry after, like the old NULL/non-NULL check);
-	//   - RequestMoreResults() can be called multiple times to widen
-	//     further on subsequent responded nodes, capped by
-	//     KADEMLIA_FIND_VALUE_MORE_REASKS.
-	std::set<CUInt128>	m_requestedMoreNodes;
+	typedef std::map<CUInt128, bool> RespondedMap;
+
+#ifdef ENABLE_KAD_NODE_PROTECTION
+	// A request we have sent and not yet had an answer to, keyed by the contact's ClientID. Two
+	// things need it: CFastKad wants the round-trip time of every answer, and JumpStart wants
+	// to know which contacts have gone past the estimated ceiling so it can stop waiting on
+	// them. The address is carried along because by the time a request times out the contact
+	// may already have been dropped from m_tried.
+	struct sPendingRequest
+	{
+		uint64_t m_sentTick;
+		uint32_t m_ip;
+		uint16_t m_port;
+	};
+
+	// How long a record outlives the ceiling, so a late answer still feeds its round-trip
+	// time to the estimator. Erasing on the ceiling made the estimate unable to rise: no
+	// sample above it could ever be recorded, so a link slower than the starting estimate
+	// never taught it anything. Long enough to cover that, short enough not to accumulate.
+	static const uint64_t PENDING_SAMPLE_GRACE_MS = 10000;
+	typedef std::map<CUInt128, sPendingRequest> PendingRequestMap;
+
+	PendingRequestMap m_pendingRequests;
+	// Millisecond-resolution twin of m_lastResponse. The stall check in JumpStart compares
+	// against a derived ceiling expressed in milliseconds, and second granularity would
+	// quantise it to uselessness.
+	uint64_t m_lastResponseTick;
+#endif
+
+	ContactMap m_possible;
+	ContactMap m_tried;
+	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
+
+	// Set of contact ClientIDs we have asked KADEMLIA_FIND_VALUE_MORE from (the wider 11-contact
+	// response variant). A set rather than a single pointer so that:
+	//   - the dead-nodes fallback at JumpStart can still fire once on the closest responded node
+	//     (empty set before, one entry after, like the old NULL/non-NULL check);
+	//   - RequestMoreResults() can be called several times to widen further on later responded
+	//     nodes, capped by KADEMLIA_FIND_VALUE_MORE_REASKS.
+	std::set<CUInt128> m_requestedMoreNodes;
 };
 
-} // End namespace
+} // namespace Kademlia
 
-#endif //__SEARCH_H__
+#endif // SEARCH_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/kademlia/kademlia/SearchManager.cpp -> amule-3.1.0.tar.gz/src/kademlia/kademlia/SearchManager.cpp Changed

@@ -46,9 +46,9 @@
 #include "../routing/Contact.h"
 #include "../../MemFile.h"
 #include "../../Logger.h"
-#include "../../RandomFunctions.h"		// Needed for GetRandomUInt128()
-#include "../../OtherFunctions.h"		// Needed for DeleteContents()
-#include "../../CompilerSpecific.h"		// Needed for __FUNCTION__
+#include "../../RandomFunctions.h"  // Needed for GetRandomUInt128()
+#include "../../OtherFunctions.h"   // Needed for DeleteContents()
+#include "../../CompilerSpecific.h" // Needed for __FUNCTION__
 
 #include <wx/tokenzr.h>
 
@@ -56,16 +56,14 @@
 using namespace Kademlia;
 ////////////////////////////////////////
 
-// Top bit reserved for Kad-allocated IDs; ed2k Local/Global IDs
-// (CSearchDlg::StartNewSearch) live in the bottom half. Keeps the
-// two ID spaces from ever colliding regardless of session length.
+// Top bit reserved for Kad-allocated IDs; ed2k Local/Global IDs (CSearchDlg::StartNewSearch) live
+// in the bottom half, so the two ID spaces cannot collide however long the session runs.
 #define SEARCH_ID_KAD_MASK 0x80000000
-uint32_t  CSearchManager::m_nextID = SEARCH_ID_KAD_MASK;
+uint32_t CSearchManager::m_nextID = SEARCH_ID_KAD_MASK;
 SearchMap CSearchManager::m_searches;
 
 bool CSearchManager::IsSearching(uint32_t searchID) noexcept
 {
-	// Check if this searchID is within the searches
 	for (SearchMap::const_iterator it = m_searches.begin(); it != m_searches.end(); ++it) {
 		if (it->second->GetSearchID() == searchID) {
 			return true;
@@ -74,23 +72,44 @@
 	return false;
 }
 
-bool CSearchManager::RequestMoreResults(uint32_t searchID)
+bool CSearchManager::RequestMoreResults(uint32_t searchID, bool *out_fired)
 {
-	// Linear scan because m_searches is keyed by target hash, not
-	// searchID.  CSearch counts at any one time are tiny (one per active
-	// user search plus internal lookups), so the scan cost is negligible.
+	if (out_fired) {
+		*out_fired = false;
+	}
+	// Linear scan because m_searches is keyed by target hash, not searchID. CSearch counts are
+	// tiny at any one time (one per active user search plus internal lookups), so the scan cost
+	// is negligible.
 	for (SearchMap::iterator it = m_searches.begin(); it != m_searches.end(); ++it) {
 		if (it->second->GetSearchID() == searchID) {
-			return it->second->RequestMoreResults();
+			const bool fired = it->second->RequestMoreResults();
+			if (out_fired) {
+				*out_fired = fired;
+			}
+			// Evaluated AFTER the attempt, and or-ed with it: the reask that consumes
+			// the last of the budget really happened, but leaves CanReaskMore() false.
+			// Reporting that as a refusal would have every client disable its control
+			// on a success.
+			return fired || it->second->CanReaskMore();
 		}
 	}
+	// No live search carries that id -- it finished and was deleted, taking
+	// m_responded / m_tried / m_requestedMoreNodes with it. Terminal.
 	return false;
 }
 
-
 bool CSearchManager::IsKadSearch(uint32_t searchID)
 {
 	for (SearchMap::const_iterator it = m_searches.begin(); it != m_searches.end(); ++it) {
+		// Skip searches that were never given an id. Their m_searchID is the constructor's
+		// 0xFFFFFFFF, which is also the single bucket every pre-multi-search EC client
+		// reuses for all of its searches -- so without this an ordinary node lookup, buddy
+		// lookup or UDP firewall check answers "yes, that is a running Kad search" for a
+		// legacy client's ed2k search, and the whole per-id lifecycle follows. Only
+		// PrepareFindKeywords and PrepareLookup assign an id.
+		if (!it->second->HasSearchID()) {
+			continue;
+		}
 		if (it->second->GetSearchID() == searchID) {
 			return true;
 		}
@@ -98,19 +117,17 @@
 	return false;
 }
 
-
 void CSearchManager::StopSearch(uint32_t searchID, bool delayDelete)
 {
-	// Stop a specific searchID
 	for (SearchMap::iterator it = m_searches.begin(); it != m_searches.end(); ++it) {
 		if (it->second->GetSearchID() == searchID) {
 			// Do not delete as we want to get a chance for late packets to be processed.
 			if (delayDelete) {
 				it->second->PrepareToStop();
 			} else {
-				// Delete this search now.
-				// If this method is changed to continue looping, take care of the iterator as we will already
-				// be pointing to the next entry and the for-loop could cause you to iterate past the end.
+				// Delete this search now. If this method is changed to keep
+				// looping, mind the iterator: it already points at the next entry,
+				// so the for-loop could run past the end.
 				delete it->second;
 				m_searches.erase(it++);
 			}
@@ -121,13 +138,11 @@
 
 void CSearchManager::StopAllSearches()
 {
-	// Stop and delete all searches.
 	DeleteContents(m_searches);
 }
 
-bool CSearchManager::StartSearch(CSearch* search)
+bool CSearchManager::StartSearch(CSearch *search)
 {
-	// A search object was created, now try to start the search.
 	if (AlreadySearchingFor(search->GetTarget())) {
 		// There was already a search in progress with this target.
 		delete search;
@@ -140,7 +155,10 @@
 	return true;
 }
 
-CSearch* CSearchManager::PrepareFindKeywords(const wxString& keyword, uint32_t searchTermsDataSize, const uint8_t *searchTermsData, uint32_t searchid)
+CSearch *CSearchManager::PrepareFindKeywords(const wxString &keyword,
+	uint32_t searchTermsDataSize,
+	const uint8_t *searchTermsData,
+	uint32_t searchid)
 {
 	// Create a keyword search object.
 	CSearch *s = new CSearch;
@@ -170,18 +188,21 @@
 		s->SetSearchTermData(searchTermsDataSize, searchTermsData);
 		// Inc our searchID
 		// If called from external client use predefined search id
-		s->SetSearchID((searchid & 0xffffff00) == 0xffffff00 ? searchid : (++m_nextID | SEARCH_ID_KAD_MASK));
+		s->SetSearchID(
+			(searchid & 0xffffff00) == 0xffffff00 ? searchid : (++m_nextID | SEARCH_ID_KAD_MASK));
 		// Insert search into map
 		m_searchess->GetTarget() = s;
 		// Start search
 		s->Go();
-	} catch (const CEOFException& err) {
+	} catch (const CEOFException &err) {
 		delete s;
-		wxString strError = "CEOFException in " + wxString::FromAscii(__FUNCTION__) + ": " + err.what();
+		wxString strError =
+			"CEOFException in " + wxString::FromAscii(__FUNCTION__) + ": " + err.what();
 		throw strError;
-	} catch (const CInvalidPacket& err) {
+	} catch (const CInvalidPacket &err) {
 		delete s;
-		wxString strError = "CInvalidPacket exception in " + wxString::FromAscii(__FUNCTION__) + ": " + err.what();
+		wxString strError = "CInvalidPacket exception in " + wxString::FromAscii(__FUNCTION__) +
+				    ": " + err.what();
 		throw strError;
 	} catch (...) {
 		delete s;
@@ -190,7 +211,7 @@
 	return s;
 }
 
-CSearch* CSearchManager::PrepareLookup(uint32_t type, bool start, const CUInt128& id)
+CSearch *CSearchManager::PrepareLookup(uint32_t type, bool start, const CUInt128 &id)
 {
 	// Prepare a kad lookup.
 	// Make sure this target is not already in progress.
@@ -206,13 +227,13 @@
 	s->SetTargetID(id);
 
 	try {
-		switch(type) {
-			case CSearch::STOREKEYWORD:
-				if (!Kademlia::CKademlia::GetIndexed()->SendStoreRequest(id)) {
-					delete s;
-					return NULL;
-				}
-				break;
+		switch (type) {
+		case CSearch::STOREKEYWORD:
+			if (!Kademlia::CKademlia::GetIndexed()->SendStoreRequest(id)) {
+				delete s;
+				return NULL;
+			}
+			break;
 		}
 
 		s->SetSearchID((++m_nextID | SEARCH_ID_KAD_MASK));
@@ -220,9 +241,10 @@
 			m_searchesid = s;
 			s->Go();
 		}
-	} catch (const CEOFException& DEBUG_ONLY(err)) {
+	} catch (const CEOFException &DEBUG_ONLY(err)) {
 		delete s;
-		AddDebugLogLineN(logKadSearch, "CEOFException in CSearchManager::PrepareLookup: " + err.what());
+		AddDebugLogLineN(
+			logKadSearch, "CEOFException in CSearchManager::PrepareLookup: " + err.what());
 		return NULL;
 	} catch (...) {
 		AddDebugLogLineN(logKadSearch, "Exception in CSearchManager::PrepareLookup");
@@ -233,7 +255,7 @@
 	return s;
 }
 
-void CSearchManager::FindNode(const CUInt128& id, bool complete)
+void CSearchManager::FindNode(const CUInt128 &id, bool complete)
 {
 	// Do a node lookup.
 	CSearch *s = new CSearch;
@@ -246,7 +268,7 @@
 	StartSearch(s);
 }
 
-bool CSearchManager::IsFWCheckUDPSearch(const CUInt128& target)
+bool CSearchManager::IsFWCheckUDPSearch(const CUInt128 &target)
 {
 	// Check if this target is in the search map.
 	SearchMap::const_iterator it = m_searches.find(target);
@@ -256,18 +278,17 @@
 	return false;
 }
 
-void CSearchManager::GetWords(const wxString& str, WordList *words, bool allowDuplicates)
+void CSearchManager::GetWords(const wxString &str, WordList *words, bool allowDuplicates)
 {
 	wxString current_word;
 	wxStringTokenizer tkz(str, GetInvalidKeywordChars());
 	while (tkz.HasMoreTokens()) {
 		current_word = tkz.GetNextToken();
-		// 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.
+		// TODO: we need a safe way to tell whether a 3-character sequence is a real word.
+		// For now we go by the UTF-8 byte count, which works for Western locales AS LONG AS
+		// the minimum byte count is 3(!). At 2 it breaks, many Western characters needing 2
+		// bytes in UTF-8. Evaluating the Unicode character values, and whether they sit in
+		// ranges where single characters are words, may be the answer.
 		if (strlen((const char *)(current_word.utf8_str())) >= 3) {
 			current_word.MakeLower();
 			if (!allowDuplicates) {
@@ -286,140 +307,143 @@
 	SearchMap::iterator next_it = m_searches.begin();
 	while (next_it != m_searches.end()) {
 		SearchMap::iterator current_it = next_it++; /* don't change this to a ++next_it! */
-		switch(current_it->second->GetSearchTypes()){
-			case CSearch::FILE: {
-				if (current_it->second->m_created + SEARCHFILE_LIFETIME < now) {
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else if (current_it->second->GetAnswers() > SEARCHFILE_TOTAL ||
-					   current_it->second->m_created + SEARCHFILE_LIFETIME - SEC(20) < now) {
-					current_it->second->PrepareToStop();
-				} else {
-					current_it->second->JumpStart();
-				}
-				break;
+		switch (current_it->second->GetSearchTypes()) {
+		case CSearch::FILE: {
+			if (current_it->second->m_created + SEARCHFILE_LIFETIME < now) {
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else if (current_it->second->GetAnswers() > SEARCHFILE_TOTAL ||
+				   current_it->second->m_created + SEARCHFILE_LIFETIME - SEC(20) < now) {
+				current_it->second->PrepareToStop();
+			} else {
+				current_it->second->JumpStart();
 			}
-			case CSearch::KEYWORD: {
-				if (current_it->second->m_created + SEARCHKEYWORD_LIFETIME < now) {
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else if (current_it->second->GetAnswers() > SEARCHKEYWORD_TOTAL ||
-					   current_it->second->m_created + SEARCHKEYWORD_LIFETIME - SEC(20) < now) {
-					current_it->second->PrepareToStop();
-				} else {
-					current_it->second->JumpStart();
-				}
-				break;
+			break;
+		}
+		case CSearch::KEYWORD: {
+			if (current_it->second->m_created + SEARCHKEYWORD_LIFETIME < now) {
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else if (current_it->second->GetAnswers() > SEARCHKEYWORD_TOTAL ||
+				   current_it->second->m_created + SEARCHKEYWORD_LIFETIME - SEC(20) < now) {
+				current_it->second->PrepareToStop();
+			} else {
+				current_it->second->JumpStart();
 			}
-			case CSearch::NOTES: {
-				if (current_it->second->m_created + SEARCHNOTES_LIFETIME < now) {
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else if (current_it->second->GetAnswers() > SEARCHNOTES_TOTAL ||
-					   current_it->second->m_created + SEARCHNOTES_LIFETIME - SEC(20) < now) {
-					current_it->second->PrepareToStop();
-				} else {
-					current_it->second->JumpStart();
-				}
-				break;
+			break;
+		}
+		case CSearch::NOTES: {
+			if (current_it->second->m_created + SEARCHNOTES_LIFETIME < now) {
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else if (current_it->second->GetAnswers() > SEARCHNOTES_TOTAL ||
+				   current_it->second->m_created + SEARCHNOTES_LIFETIME - SEC(20) < now) {
+				current_it->second->PrepareToStop();
+			} else {
+				current_it->second->JumpStart();
 			}
-			case CSearch::FINDBUDDY: {
-				if (current_it->second->m_created + SEARCHFINDBUDDY_LIFETIME < now) {
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else if (current_it->second->GetAnswers() > SEARCHFINDBUDDY_TOTAL ||
-					   current_it->second->m_created + SEARCHFINDBUDDY_LIFETIME - SEC(20) < now) {
-					current_it->second->PrepareToStop();
-				} else {
-					current_it->second->JumpStart();
-				}
-				break;
+			break;
+		}
+		case CSearch::FINDBUDDY: {
+			if (current_it->second->m_created + SEARCHFINDBUDDY_LIFETIME < now) {
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else if (current_it->second->GetAnswers() > SEARCHFINDBUDDY_TOTAL ||
+				   current_it->second->m_created + SEARCHFINDBUDDY_LIFETIME - SEC(20) < now) {
+				current_it->second->PrepareToStop();
+			} else {
+				current_it->second->JumpStart();
 			}
-			case CSearch::FINDSOURCE: {
-				if (current_it->second->m_created + SEARCHFINDSOURCE_LIFETIME < now) {
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else if (current_it->second->GetAnswers() > SEARCHFINDSOURCE_TOTAL ||
-					   current_it->second->m_created + SEARCHFINDSOURCE_LIFETIME - SEC(20) < now) {
-					current_it->second->PrepareToStop();
-				} else {
-					current_it->second->JumpStart();
-				}
-				break;
+			break;
+		}
+		case CSearch::FINDSOURCE: {
+			if (current_it->second->m_created + SEARCHFINDSOURCE_LIFETIME < now) {
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else if (current_it->second->GetAnswers() > SEARCHFINDSOURCE_TOTAL ||
+				   current_it->second->m_created + SEARCHFINDSOURCE_LIFETIME - SEC(20) <
+					   now) {
+				current_it->second->PrepareToStop();
+			} else {
+				current_it->second->JumpStart();
 			}
-			case CSearch::NODE:
-			case CSearch::NODESPECIAL:
-			case CSearch::NODEFWCHECKUDP: {
-				if (current_it->second->m_created + SEARCHNODE_LIFETIME < now) {
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else {
-					current_it->second->JumpStart();
-				}
-				break;
+			break;
+		}
+		case CSearch::NODE:
+		case CSearch::NODESPECIAL:
+		case CSearch::NODEFWCHECKUDP: {
+			if (current_it->second->m_created + SEARCHNODE_LIFETIME < now) {
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else {
+				current_it->second->JumpStart();
 			}
-			case CSearch::NODECOMPLETE: {
-				if (current_it->second->m_created + SEARCHNODE_LIFETIME < now) {
-					// Tell Kad it can start publishing.
-					CKademlia::GetPrefs()->SetPublish(true);
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else if ((current_it->second->m_created + SEARCHNODECOMP_LIFETIME < now) &&
-					   (current_it->second->GetAnswers() > SEARCHNODECOMP_TOTAL)) {
-					// Tell Kad it can start publishing.
-					CKademlia::GetPrefs()->SetPublish(true);
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else {
-					current_it->second->JumpStart();
-				}
-				break;
+			break;
+		}
+		case CSearch::NODECOMPLETE: {
+			if (current_it->second->m_created + SEARCHNODE_LIFETIME < now) {
+				// Tell Kad it can start publishing.
+				CKademlia::GetPrefs()->SetPublish(true);
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else if ((current_it->second->m_created + SEARCHNODECOMP_LIFETIME < now) &&
+				   (current_it->second->GetAnswers() > SEARCHNODECOMP_TOTAL)) {
+				// Tell Kad it can start publishing.
+				CKademlia::GetPrefs()->SetPublish(true);
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else {
+				current_it->second->JumpStart();
 			}
-			case CSearch::STOREFILE: {
-				if (current_it->second->m_created + SEARCHSTOREFILE_LIFETIME < now) {
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else if (current_it->second->GetAnswers() > SEARCHSTOREFILE_TOTAL ||
-					   current_it->second->m_created + SEARCHSTOREFILE_LIFETIME - SEC(20) < now) {
-					current_it->second->PrepareToStop();
-				} else {
-					current_it->second->JumpStart();
-				}
-				break;
+			break;
+		}
+		case CSearch::STOREFILE: {
+			if (current_it->second->m_created + SEARCHSTOREFILE_LIFETIME < now) {
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else if (current_it->second->GetAnswers() > SEARCHSTOREFILE_TOTAL ||
+				   current_it->second->m_created + SEARCHSTOREFILE_LIFETIME - SEC(20) < now) {
+				current_it->second->PrepareToStop();
+			} else {
+				current_it->second->JumpStart();
 			}
-			case CSearch::STOREKEYWORD: {
-				if (current_it->second->m_created + SEARCHSTOREKEYWORD_LIFETIME < now) {
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else if (current_it->second->GetAnswers() > SEARCHSTOREKEYWORD_TOTAL ||
-					   current_it->second->m_created + SEARCHSTOREKEYWORD_LIFETIME - SEC(20)< now) {
-					current_it->second->PrepareToStop();
-				} else {
-					current_it->second->JumpStart();
-				}
-				break;
+			break;
+		}
+		case CSearch::STOREKEYWORD: {
+			if (current_it->second->m_created + SEARCHSTOREKEYWORD_LIFETIME < now) {
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else if (current_it->second->GetAnswers() > SEARCHSTOREKEYWORD_TOTAL ||
+				   current_it->second->m_created + SEARCHSTOREKEYWORD_LIFETIME - SEC(20) <
+					   now) {
+				current_it->second->PrepareToStop();
+			} else {
+				current_it->second->JumpStart();
 			}
-			case CSearch::STORENOTES: {
-				if (current_it->second->m_created + SEARCHSTORENOTES_LIFETIME < now) {
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else if (current_it->second->GetAnswers() > SEARCHSTORENOTES_TOTAL ||
-					   current_it->second->m_created + SEARCHSTORENOTES_LIFETIME - SEC(20)< now) {
-					current_it->second->PrepareToStop();
-				} else {
-					current_it->second->JumpStart();
-				}
-				break;
+			break;
+		}
+		case CSearch::STORENOTES: {
+			if (current_it->second->m_created + SEARCHSTORENOTES_LIFETIME < now) {
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else if (current_it->second->GetAnswers() > SEARCHSTORENOTES_TOTAL ||
+				   current_it->second->m_created + SEARCHSTORENOTES_LIFETIME - SEC(20) <
+					   now) {
+				current_it->second->PrepareToStop();
+			} else {
+				current_it->second->JumpStart();
 			}
-			default: {
-				if (current_it->second->m_created + SEARCH_LIFETIME < now) {
-					delete current_it->second;
-					m_searches.erase(current_it);
-				} else {
-					current_it->second->JumpStart();
-				}
-				break;
+			break;
+		}
+		default: {
+			if (current_it->second->m_created + SEARCH_LIFETIME < now) {
+				delete current_it->second;
+				m_searches.erase(current_it);
+			} else {
+				current_it->second->JumpStart();
 			}
+			break;
+		}
 		}
 	}
 }
@@ -434,33 +458,33 @@
 	uint8_t m_totalStoreNotes = 0;
 
 	for (SearchMap::const_iterator it = m_searches.begin(); it != m_searches.end(); ++it) {
-		switch(it->second->GetSearchTypes()){
-			case CSearch::FILE: {
-				m_totalFile++;
-				break;
-			}
-			case CSearch::STOREFILE: {
-				m_totalStoreSrc++;
-				break;
-			}
-			case CSearch::STOREKEYWORD:	{
-				m_totalStoreKey++;
-				break;
-			}
-			case CSearch::FINDSOURCE: {
-				m_totalSource++;
-				break;
-			}
-			case CSearch::STORENOTES: {
-				m_totalStoreNotes++;
-				break;
-			}
-			case CSearch::NOTES: {
-				m_totalNotes++;
-				break;
-			}
-			default:
-				break;
+		switch (it->second->GetSearchTypes()) {
+		case CSearch::FILE: {
+			m_totalFile++;
+			break;
+		}
+		case CSearch::STOREFILE: {
+			m_totalStoreSrc++;
+			break;
+		}
+		case CSearch::STOREKEYWORD: {
+			m_totalStoreKey++;
+			break;
+		}
+		case CSearch::FINDSOURCE: {
+			m_totalSource++;
+			break;
+		}
+		case CSearch::STORENOTES: {
+			m_totalStoreNotes++;
+			break;
+		}
+		case CSearch::NOTES: {
+			m_totalNotes++;
+			break;
+		}
+		default:
+			break;
 		}
 	}
 
@@ -473,7 +497,7 @@
 	prefs->SetTotalStoreNotes(m_totalStoreNotes);
 }
 
-void CSearchManager::ProcessPublishResult(const CUInt128& target, const uint8_t load, const bool loadResponse)
+void CSearchManager::ProcessPublishResult(const CUInt128 &target, const uint8_t load, const bool loadResponse)
 {
 	// We tried to publish some info and got a result.
 	CSearch *s = NULL;
@@ -488,21 +512,22 @@
 	}
 
 	switch (s->GetSearchTypes()) {
-		case CSearch::STOREKEYWORD: {
-			if (loadResponse) {
-				s->UpdateNodeLoad(load);
-			}
-			break;
+	case CSearch::STOREKEYWORD: {
+		if (loadResponse) {
+			s->UpdateNodeLoad(load);
 		}
-		case CSearch::STOREFILE:
-		case CSearch::STORENOTES:
-			break;
+		break;
+	}
+	case CSearch::STOREFILE:
+	case CSearch::STORENOTES:
+		break;
 	}
 
 	s->m_answers++;
 }
 
-void CSearchManager::ProcessResponse(const CUInt128& target, uint32_t fromIP, uint16_t fromPort, ContactList *results)
+void CSearchManager::ProcessResponse(
+	const CUInt128 &target, uint32_t fromIP, uint16_t fromPort, ContactList *results)
 {
 	// We got a response to a kad lookup.
 	CSearch *s = NULL;
@@ -514,7 +539,8 @@
 	// If this search was deleted before this response, delete contacts and abort, otherwise process them.
 	if (s == NULL) {
 		AddDebugLogLineN(logKadSearch,
-			"Search either never existed or receiving late results (CSearchManager::ProcessResponse)");
+			"Search either never existed or receiving late results "
+			"(CSearchManager::ProcessResponse)");
 		DeleteContents(*results);
 	} else {
 		s->ProcessResponse(fromIP, fromPort, results);
@@ -522,7 +548,8 @@
 	delete results;
 }
 
-void CSearchManager::ProcessResult(const CUInt128& target, const CUInt128& answer, TagPtrList *info)
+void CSearchManager::ProcessResult(
+	const CUInt128 &target, const CUInt128 &answer, TagPtrList *info, uint32_t fromIP, uint16_t fromPort)
 {
 	// We have results for a request for info.
 	CSearch *s = NULL;
@@ -534,13 +561,14 @@
 	// If this search was deleted before these results, delete contacts and abort, otherwise process them.
 	if (s == NULL) {
 		AddDebugLogLineN(logKadSearch,
-			"Search either never existed or receiving late results (CSearchManager::ProcessResult)");
+			"Search either never existed or receiving late results "
+			"(CSearchManager::ProcessResult)");
 	} else {
-		s->ProcessResult(answer, info);
+		s->ProcessResult(answer, info, fromIP, fromPort);
 	}
 }
 
-bool CSearchManager::FindNodeSpecial(const CUInt128& id, CKadClientSearcher *requester)
+bool CSearchManager::FindNodeSpecial(const CUInt128 &id, CKadClientSearcher *requester)
 {
 	// Do a node lookup.
 	AddDebugLogLineN(logKadSearch, "Starting NODESPECIAL Kad Search for " + id.ToHexString());
@@ -562,7 +590,7 @@
 	return StartSearch(search);
 }
 
-void CSearchManager::CancelNodeSpecial(CKadClientSearcher* requester)
+void CSearchManager::CancelNodeSpecial(CKadClientSearcher *requester)
 {
 	// Stop a specific nodespecialsearch
 	for (SearchMap::iterator it = m_searches.begin(); it != m_searches.end(); ++it) {

amule-3.0.1.tar.gz/src/kademlia/kademlia/SearchManager.h -> amule-3.1.0.tar.gz/src/kademlia/kademlia/SearchManager.h Changed

@@ -36,8 +36,8 @@
 there client on the eMule forum..
 */
 
-#ifndef __SEARCHMANAGER_H__
-#define __SEARCHMANAGER_H__
+#ifndef SEARCHMANAGER_H
+#define SEARCHMANAGER_H
 
 #include "../utils/UInt128.h"
 #include "../routing/Maps.h"
@@ -46,7 +46,8 @@
 class CMemFile;
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
 class CSearch;
@@ -54,7 +55,7 @@
 class CKadClientSearcher;
 
 typedef std::list<wxString> WordList;
-typedef std::map<CUInt128, CSearch*> SearchMap;
+typedef std::map<CUInt128, CSearch *> SearchMap;
 
 class CSearchManager
 {
@@ -62,61 +63,86 @@
 	friend class CKademlia;
 
 public:
-
 	static bool IsSearching(uint32_t searchID) noexcept;
 	static void StopSearch(uint32_t searchID, bool delayDelete);
 	static void StopAllSearches();
 
 	// Search for a particular file
 	// Will return unique search id, returns zero if already searching for this file.
-	static CSearch* PrepareLookup(uint32_t type, bool start, const CUInt128& id);
+	static CSearch *PrepareLookup(uint32_t type, bool start, const CUInt128 &id);
 
 	// Will return unique search id, returns zero if already searching for this keyword.
-	static CSearch* PrepareFindKeywords(const wxString& keyword, uint32_t searchTermsDataSize, const uint8_t *searchTermsData, uint32_t searchid);
+	static CSearch *PrepareFindKeywords(const wxString &keyword,
+		uint32_t searchTermsDataSize,
+		const uint8_t *searchTermsData,
+		uint32_t searchid);
 
-	static bool StartSearch(CSearch* search);
+	static bool StartSearch(CSearch *search);
 
-	static void ProcessResponse(const CUInt128& target, uint32_t fromIP, uint16_t fromPort, ContactList *results);
-	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 ProcessResponse(
+		const CUInt128 &target, uint32_t fromIP, uint16_t fromPort, ContactList *results);
+	static void ProcessResult(const CUInt128 &target,
+		const CUInt128 &answer,
+		TagPtrList *info,
+		uint32_t fromIP,
+		uint16_t fromPort);
+	static void ProcessPublishResult(const CUInt128 &target, const uint8_t load, const bool loadResponse);
 
-	static void GetWords(const wxString& str, WordList *words, bool allowDuplicates = false);
+	static void GetWords(const wxString &str, WordList *words, bool allowDuplicates = false);
 
 	static void UpdateStats() noexcept;
 
-	static bool AlreadySearchingFor(const CUInt128& target) noexcept { return m_searches.count(target) > 0; }
-
-	// Find a CSearch by searchID (m_searches is keyed by target hash;
-	// this iterates) and invoke its RequestMoreResults().  Returns true
-	// if a reask was dispatched, false if no matching search was found
-	// or RequestMoreResults declined (cap reached / no eligible peer).
-	// Wired up on the search dialog "More" button.
-	static bool RequestMoreResults(uint32_t searchID);
-
-	// True if the given searchID corresponds to an active Kad search.
-	// Used by the search dialog to gate "More" button enable state on
-	// the currently-selected tab being a Kad search (vs ED2K).
+	static bool AlreadySearchingFor(const CUInt128 &target) noexcept
+	{
+		return m_searches.count(target) > 0;
+	}
+
+	// Find a CSearch by searchID (m_searches is keyed by target hash, so this iterates) and
+	// invoke its RequestMoreResults().
+	//
+	// Returns whether the search can still be widened by a later press -- `fired ||
+	// CanReaskMore()` -- so false only when reasking is over for good. NOT "did a reask go
+	// out": a press made while no responded peer is left to reask YET still returns true,
+	// because that clears as soon as another peer answers and a UI must keep its control.
+	//
+	// `out_fired`, when given, receives whether a reask actually went out. The two genuinely
+	// differ -- the reask spending the last of the budget fires and leaves the search un-
+	// widenable -- and a log line wants the second, a control's enabled state the first.
+	static bool RequestMoreResults(uint32_t searchID, bool *out_fired = nullptr);
+
+	// True if the given searchID is an active Kad search. The search dialog uses it to gate the
+	// "More" button on the selected tab being a Kad search rather than ED2K.
 	static bool IsKadSearch(uint32_t searchID);
 
-	static const wxChar* GetInvalidKeywordChars() { return L" (){}<>,._-!?:;\\/\""; }
+	// Advances m_nextID past a restored Kad search's persisted id, so the next Kad search this
+	// session cannot be handed the same one: m_nextID restarts at SEARCH_ID_KAD_MASK every
+	// launch, so without this a restored search and the first new Kad search after a restart
+	// collide deterministically.
+	static void ReserveSearchId(uint32_t id)
+	{
+		if (id > m_nextID) {
+			m_nextID = id;
+		}
+	}
+
+	static const wxChar *GetInvalidKeywordChars() { return L" (){}<>,._-!?:;\\/\""; }
 
 	static void CancelNodeFWCheckUDPSearch();
 	static bool FindNodeFWCheckUDP();
-	static bool IsFWCheckUDPSearch(const CUInt128& target);
+	static bool IsFWCheckUDPSearch(const CUInt128 &target);
 
 private:
-
-	static void FindNode(const CUInt128& id, bool complete);
-	static bool FindNodeSpecial(const CUInt128& id, CKadClientSearcher *requester);
+	static void FindNode(const CUInt128 &id, bool complete);
+	static bool FindNodeSpecial(const CUInt128 &id, CKadClientSearcher *requester);
 	static void CancelNodeSpecial(CKadClientSearcher *requester);
 
 	static void JumpStart();
 
-	static uint32_t  m_nextID;
+	static uint32_t m_nextID;
 	static SearchMap m_searches;
 };
 
-} // End namespace
+} // namespace Kademlia
 
-#endif // __SEARCHMANAGER_H__
+#endif // SEARCHMANAGER_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/kademlia/kademlia/UDPFirewallTester.cpp -> amule-3.1.0.tar.gz/src/kademlia/kademlia/UDPFirewallTester.cpp Changed

@@ -37,21 +37,19 @@
 #include "../../GetTickCount.h"
 #include "../../NetworkFunctions.h"
 
-
 using namespace Kademlia;
 
-bool	CUDPFirewallTester::m_firewalledUDP		= false;
-bool	CUDPFirewallTester::m_firewalledLastStateUDP	= false;
-bool	CUDPFirewallTester::m_isFWVerifiedUDP		= false;
-bool	CUDPFirewallTester::m_nodeSearchStarted		= false;
-bool	CUDPFirewallTester::m_timedOut			= false;
-uint8_t	CUDPFirewallTester::m_fwChecksRunningUDP	= 0;
-uint8_t	CUDPFirewallTester::m_fwChecksFinishedUDP	= 0;
-uint64_t CUDPFirewallTester::m_testStart		= 0;
-uint64_t CUDPFirewallTester::m_lastSucceededTime	= 0;
-CUDPFirewallTester::PossibleClientList	CUDPFirewallTester::m_possibleTestClients;
-CUDPFirewallTester::UsedClientList	CUDPFirewallTester::m_usedTestClients;
-
+bool CUDPFirewallTester::m_firewalledUDP = false;
+bool CUDPFirewallTester::m_firewalledLastStateUDP = false;
+bool CUDPFirewallTester::m_isFWVerifiedUDP = false;
+bool CUDPFirewallTester::m_nodeSearchStarted = false;
+bool CUDPFirewallTester::m_timedOut = false;
+uint8_t CUDPFirewallTester::m_fwChecksRunningUDP = 0;
+uint8_t CUDPFirewallTester::m_fwChecksFinishedUDP = 0;
+uint64_t CUDPFirewallTester::m_testStart = 0;
+uint64_t CUDPFirewallTester::m_lastSucceededTime = 0;
+CUDPFirewallTester::PossibleClientList CUDPFirewallTester::m_possibleTestClients;
+CUDPFirewallTester::UsedClientList CUDPFirewallTester::m_usedTestClients;
 
 bool CUDPFirewallTester::IsFirewalledUDP(bool lastStateIfTesting)
 {
@@ -59,18 +57,17 @@
 		return false;
 	}
 	if (!m_timedOut && IsFWCheckUDPRunning()) {
-		if (!m_firewalledUDP && CKademlia::IsFirewalled() && m_testStart != 0 && ::GetTickCount64() - m_testStart > MIN2MS(6)
-			&& !m_isFWVerifiedUDP /*For now we don't allow to get firewalled by timeouts if we have succeeded a test before, might be changed later*/)
-		{
-			AddDebugLogLineN(logKadUdpFwTester, "Timeout: Setting UDP status to firewalled after being unable to get results for 6 minutes");
+		if (!m_firewalledUDP && CKademlia::IsFirewalled() &&
+			m_testStart != 0 && ::GetTickCount64() - m_testStart > MIN2MS(6) && !m_isFWVerifiedUDP /*For now we don't allow to get firewalled by timeouts if we have succeeded a test before, might be changed later*/) {
+			AddDebugLogLineN(logKadUdpFwTester,
+				"Timeout: Setting UDP status to firewalled after being unable to get results "
+				"for 6 minutes");
 			m_timedOut = true;
 			theApp->ShowConnectionState();
 		}
-	}
-	else if (m_timedOut && IsFWCheckUDPRunning()) {
+	} else if (m_timedOut && IsFWCheckUDPRunning()) {
 		return true; // firewallstate by timeout
-	}
-	else if (m_timedOut) {
+	} else if (m_timedOut) {
 		wxFAIL;
 	}
 
@@ -81,7 +78,8 @@
 	}
 }
 
-void CUDPFirewallTester::SetUDPFWCheckResult(bool succeeded, bool testCancelled, uint32_t fromIP, uint16_t incomingPort)
+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()) {
@@ -92,20 +90,27 @@
 	bool requested = false;
 	for (UsedClientList::iterator it = m_usedTestClients.begin(); it != m_usedTestClients.end(); ++it) {
 		if (it->contact.GetIPAddress() == fromIP) {
-			if (!IsFWCheckUDPRunning() && !m_firewalledUDP && m_isFWVerifiedUDP && m_lastSucceededTime + SEC2MS(10) > ::GetTickCount64()
-			    && incomingPort == CKademlia::GetPrefs()->GetInternKadPort() && CKademlia::GetPrefs()->GetUseExternKadPort()) {
-				// our test finished already in the last 10 seconds with being open because we received a proper result packet before
-				// however we now receive another answer packet on our incoming port (which is not unusual as both resultpackets are sent
-				// nearly at the same time and UDP doesn't cares if the order stays), while the one before was received on our extern port
-				// 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.
+			if (!IsFWCheckUDPRunning() && !m_firewalledUDP && m_isFWVerifiedUDP &&
+				m_lastSucceededTime + SEC2MS(10) > ::GetTickCount64() &&
+				incomingPort == CKademlia::GetPrefs()->GetInternKadPort() &&
+				CKademlia::GetPrefs()->GetUseExternKadPort()) {
+				// Our test already finished in the last 10 seconds as open, but
+				// another answer packet has now arrived on our incoming port. Not
+				// unusual, since both result packets are sent at nearly the same
+				// time and UDP does not preserve order. A properly forwarded intern
+				// port is more reliable than an extern port set by the NAT, so
+				// prefer it.
 				CKademlia::GetPrefs()->SetUseExternKadPort(false);
-				AddDebugLogLineN(logKadUdpFwTester, CFormat("Corrected UDP firewall result: Using open internal (%u) instead of open external port") % incomingPort);
+				AddDebugLogLineN(logKadUdpFwTester,
+					CFormat("Corrected UDP firewall result: Using open internal (%u) "
+						"instead of open external port") %
+						incomingPort);
 				theApp->ShowConnectionState();
 				return;
 			} else if (it->answered) {
-				// we already received an answer. This may happen since all tests contain of two answer packets,
-				// but the answer could also be too late and we already counted it as failure.
+				// We already received an answer. This may happen since every test
+				// consists of two answer packets, but the answer could also be too
+				// late and already counted as a failure.
 				return;
 			} else {
 				it->answered = true;
@@ -115,8 +120,9 @@
 		}
 	}
 
-	if (!requested){
-		AddDebugLogLineN(logKadUdpFwTester, "Unrequested UDPFWCheckResult from " + KadIPToString(fromIP));
+	if (!requested) {
+		AddDebugLogLineN(
+			logKadUdpFwTester, "Unrequested UDPFWCheckResult from " + KadIPToString(fromIP));
 		return;
 	}
 
@@ -126,39 +132,41 @@
 	}
 
 	if (m_fwChecksRunningUDP == 0) {
-		// A response arrived for a check we no longer believe to be
-		// running. Most commonly this is a late UDP packet that
-		// straddles a Kad restart (system suspend/resume, see #384),
-		// where ReCheckFirewallUDP zeroed the counter while the
-		// previous test's responses were still in flight. Dropping
-		// the response avoids mutating m_firewalledUDP /
-		// m_fwChecksFinishedUDP based on stale state — the new test
-		// cycle will produce its own results.
+		// A response arrived for a check we no longer believe to be running, most commonly
+		// a late UDP packet straddling a Kad restart (#384), where ReCheckFirewallUDP
+		// zeroed the counter while the previous test's responses were still in flight.
+		// Dropping it avoids mutating m_firewalledUDP / m_fwChecksFinishedUDP from stale
+		// state.
 		AddDebugLogLineN(logKadUdpFwTester,
 			wxString::Format("Ignoring late UDP FW result from %s",
-				(const char*)KadIPToString(fromIP).mb_str()));
+				(const char *)KadIPToString(fromIP).mb_str()));
 		return;
 	}
 	m_fwChecksRunningUDP--;
 
-	if (!testCancelled){
+	if (!testCancelled) {
 		m_fwChecksFinishedUDP++;
-		if (succeeded) {	//one positive result is enough
+		if (succeeded) { // one positive result is enough
 			m_testStart = 0;
 			m_firewalledUDP = false;
 			m_isFWVerifiedUDP = true;
 			m_timedOut = false;
 			m_fwChecksFinishedUDP = UDP_FIREWALLTEST_CLIENTSTOASK; // don't do any more tests
-			m_fwChecksRunningUDP = 0; // all other tests are cancelled
+			m_fwChecksRunningUDP = 0;      // all other tests are cancelled
 			m_possibleTestClients.clear(); // clear list, keep used clients list though
-			CSearchManager::CancelNodeFWCheckUDPSearch(); // cancel firewallnode searches if any are still active
-			// if this packet came to our internal port, explicitly set the internal port as used port from now on
+			CSearchManager::CancelNodeFWCheckUDPSearch(); // cancel firewallnode searches if any
+								      // are still active
+			// if this packet came to our internal port, explicitly set the internal port as used
+			// port from now on
 			if (incomingPort == CKademlia::GetPrefs()->GetInternKadPort()) {
 				CKademlia::GetPrefs()->SetUseExternKadPort(false);
-				AddDebugLogLineN(logKadUdpFwTester, "New Kad Firewallstate (UDP): Open, using intern port");
-			} else if (incomingPort == CKademlia::GetPrefs()->GetExternalKadPort() && incomingPort != 0) {
+				AddDebugLogLineN(logKadUdpFwTester,
+					"New Kad Firewallstate (UDP): Open, using intern port");
+			} else if (incomingPort == CKademlia::GetPrefs()->GetExternalKadPort() &&
+				   incomingPort != 0) {
 				CKademlia::GetPrefs()->SetUseExternKadPort(true);
-				AddDebugLogLineN(logKadUdpFwTester, "New Kad Firewallstate (UDP): Open, using extern port");
+				AddDebugLogLineN(logKadUdpFwTester,
+					"New Kad Firewallstate (UDP): Open, using extern port");
 			}
 			theApp->ShowConnectionState();
 			return;
@@ -171,12 +179,16 @@
 			m_timedOut = false;
 			theApp->ShowConnectionState();
 			m_possibleTestClients.clear(); // clear list, keep used clients list though
-			CSearchManager::CancelNodeFWCheckUDPSearch(); // cancel firewallnode searches if any are still active
+			CSearchManager::CancelNodeFWCheckUDPSearch(); // cancel firewallnode searches if any
+								      // are still active
 			return;
 		} else
-			AddDebugLogLineN(logKadUdpFwTester, "Kad UDP firewalltest from " + KadIPToString(fromIP) + " result: Firewalled, continue testing");
+			AddDebugLogLineN(logKadUdpFwTester,
+				"Kad UDP firewalltest from " + KadIPToString(fromIP) +
+					" result: Firewalled, continue testing");
 	} else {
-		AddDebugLogLineN(logKadUdpFwTester, "Kad UDP firewalltest from " + KadIPToString(fromIP) + " cancelled");
+		AddDebugLogLineN(logKadUdpFwTester,
+			"Kad UDP firewalltest from " + KadIPToString(fromIP) + " cancelled");
 	}
 	QueryNextClient();
 }
@@ -184,12 +196,11 @@
 void CUDPFirewallTester::ReCheckFirewallUDP(bool setUnverified)
 {
 	if (m_fwChecksRunningUDP != 0) {
-		// Entering a fresh UDP firewall test while the previous one
-		// is still bookkeeping in-flight requests. Common on Kad
-		// restart after a system suspend/resume (#384): the previous
-		// check's responses may still be travelling. We forcibly
-		// reset; any late responses for the old run are dropped
-		// by SetUDPFWCheckResult's stale-response guard.
+		// Entering a fresh UDP firewall test while the previous one is still bookkeeping
+		// in-flight requests. Common on Kad restart after a system suspend/resume (#384):
+		// the previous check's responses may still be travelling. We forcibly reset; any
+		// late responses for the old run are dropped by SetUDPFWCheckResult's stale-
+		// response guard.
 		AddDebugLogLineN(logKadUdpFwTester,
 			wxString::Format("ReCheckFirewallUDP: resetting in-flight counter %u -> 0",
 				(unsigned)m_fwChecksRunningUDP));
@@ -234,8 +245,9 @@
 }
 
 void CUDPFirewallTester::QueryNextClient()
-{	// try the next available client for the firewallcheck
-	if (!IsFWCheckUDPRunning() || !GetUDPCheckClientsNeeded() || CKademlia::GetPrefs()->FindExternKadPort(false)) {
+{ // try the next available client for the firewallcheck
+	if (!IsFWCheckUDPRunning() || !GetUDPCheckClientsNeeded() ||
+		CKademlia::GetPrefs()->FindExternKadPort(false)) {
 		return; // check if more tests are needed and wait till we know our extern port
 	}
 
@@ -253,21 +265,26 @@
 		}
 
 		// sanity - do not test ourself
-		if (wxUINT32_SWAP_ALWAYS(curContact.GetIPAddress()) == theApp->GetPublicIP() || curContact.GetClientID() == CKademlia::GetPrefs()->GetKadID()) {
+		if (wxUINT32_SWAP_ALWAYS(curContact.GetIPAddress()) == theApp->GetPublicIP() ||
+			curContact.GetClientID() == CKademlia::GetPrefs()->GetKadID()) {
 			continue;
 		}
 
 		// check if we actually requested a firewallcheck from this client at some point
 		bool alreadyRequested = false;
-		for (UsedClientList::const_iterator it = m_usedTestClients.begin(); it != m_usedTestClients.end(); ++it) {
+		for (UsedClientList::const_iterator it = m_usedTestClients.begin();
+			it != m_usedTestClients.end();
+			++it) {
 			if (it->contact.GetIPAddress() == curContact.GetIPAddress()) {
 				alreadyRequested = true;
 				break;
 			}
 		}
 
-		// check if we know its IP already from kademlia - we need an IP which was never used for UDP yet
-		if (!alreadyRequested && CKademlia::GetRoutingZone()->GetContact(curContact.GetIPAddress(), 0, false) == NULL) {
+		// check if we know its IP already from kademlia - we need an IP which was never used for UDP
+		// yet
+		if (!alreadyRequested && CKademlia::GetRoutingZone()->GetContact(
+						 curContact.GetIPAddress(), 0, false) == NULL) {
 			// ok, tell the clientlist to do the same search and start the check if ok
 			if (theApp->clientlist->DoRequestFirewallCheckUDP(curContact)) {
 				UsedClient_Struct sAdd = { curContact, false };

amule-3.0.1.tar.gz/src/kademlia/kademlia/UDPFirewallTester.h -> amule-3.1.0.tar.gz/src/kademlia/kademlia/UDPFirewallTester.h Changed

@@ -37,52 +37,71 @@
 class CUInt128;
 class CKadUDPKey;
 
-struct UsedClient_Struct {
-	CContact	contact;
-	bool		answered;
+struct UsedClient_Struct
+{
+	CContact contact;
+	bool answered;
 };
 
-#define UDP_FIREWALLTEST_CLIENTSTOASK	2	// more clients increase the chance of a false positive, while less the chance of a false negative
+#define UDP_FIREWALLTEST_CLIENTSTOASK \
+	2 // more clients increase the chance of a false positive, while less the chance of a false negative
 
 class CUDPFirewallTester
 {
-      public:
-	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() noexcept		{ return m_fwChecksFinishedUDP < UDP_FIREWALLTEST_CLIENTSTOASK && !CKademlia::IsRunningInLANMode(); }
-	static bool	IsVerified() noexcept			{ return m_isFWVerifiedUDP || CKademlia::IsRunningInLANMode(); }
+public:
+	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() noexcept
+	{
+		return m_fwChecksFinishedUDP < UDP_FIREWALLTEST_CLIENTSTOASK &&
+		       !CKademlia::IsRunningInLANMode();
+	}
+	static bool IsVerified() noexcept { 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)
+	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)
 	{
 		if (!IsFWCheckUDPRunning()) {
 			return;
 		}
 		// add the possible contact to our list - no checks in advance
-		m_possibleTestClients.push_front(CContact(clientID, ip, port, tport, version, udpKey, ipVerified, target));
+		m_possibleTestClients.push_front(
+			CContact(clientID, ip, port, tport, version, udpKey, ipVerified, target));
 		QueryNextClient();
 	}
 
-	static void	Reset(); // when stopping Kad
-	static void	Connected();
-	static void	QueryNextClient(); // try the next available client for the firewallcheck
+	static void Reset(); // when stopping Kad
+	static void Connected();
+	static void QueryNextClient(); // try the next available client for the firewallcheck
 
-      private:
+private:
 	// are we in search for testclients
-	static bool	GetUDPCheckClientsNeeded() noexcept	{ return (m_fwChecksRunningUDP + m_fwChecksFinishedUDP) < UDP_FIREWALLTEST_CLIENTSTOASK; }
-	static bool	m_firewalledUDP;
-	static bool	m_firewalledLastStateUDP;
-	static bool	m_isFWVerifiedUDP;
-	static bool	m_nodeSearchStarted;
-	static bool	m_timedOut;
-	static uint8_t	m_fwChecksRunningUDP;
-	static uint8_t	m_fwChecksFinishedUDP;
-	static uint64_t	m_testStart;
-	static uint64_t	m_lastSucceededTime;
+	static bool GetUDPCheckClientsNeeded() noexcept
+	{
+		return (m_fwChecksRunningUDP + m_fwChecksFinishedUDP) < UDP_FIREWALLTEST_CLIENTSTOASK;
+	}
+	static bool m_firewalledUDP;
+	static bool m_firewalledLastStateUDP;
+	static bool m_isFWVerifiedUDP;
+	static bool m_nodeSearchStarted;
+	static bool m_timedOut;
+	static uint8_t m_fwChecksRunningUDP;
+	static uint8_t m_fwChecksFinishedUDP;
+	static uint64_t m_testStart;
+	static uint64_t m_lastSucceededTime;
 	typedef std::list<CContact> PossibleClientList;
 	typedef std::list<UsedClient_Struct> UsedClientList;
 	static PossibleClientList m_possibleTestClients;
-	static UsedClientList	m_usedTestClients;
+	static UsedClientList m_usedTestClients;
 };
 
 } // namespace Kademlia

amule-3.1.0.tar.gz/src/kademlia/net/FastKad.cpp Added

@@ -0,0 +1,120 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// Copyright (c) 2026 eMule AI
+//
+// 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 "FastKad.h"
+
+#include <algorithm>
+#include <cmath>
+
+namespace Kademlia
+{
+
+CFastKad fastKad;
+
+CFastKad::CFastKad()
+: m_estResponseTimeMs(DEFAULT_RESPONSE_TIME_MS)
+{
+}
+
+void CFastKad::Clear()
+{
+	m_samples.clear();
+	m_estResponseTimeMs = DEFAULT_RESPONSE_TIME_MS;
+}
+
+void CFastKad::AddResponseTime(uint32_t ip, uint32_t responseTimeMs, uint64_t nowMs)
+{
+	std::map<uint32_t, sResponseTime>::iterator it = m_samples.find(ip);
+	if (it == m_samples.end()) {
+		if (m_samples.size() >= MAX_SAMPLES) {
+			// Evict the least recently referenced sample, but only if it is old enough
+			// that dropping it will not make the estimate jump around.
+			uint64_t oldestAge = 0;
+			std::map<uint32_t, sResponseTime>::iterator oldest = m_samples.end();
+			for (std::map<uint32_t, sResponseTime>::iterator candidate = m_samples.begin();
+				candidate != m_samples.end();
+				++candidate) {
+				const uint64_t age = nowMs - candidate->second.m_lastReferencedMs;
+				if (age >= oldestAge && age > MIN_EVICTION_AGE_MS) {
+					oldestAge = age;
+					oldest = candidate;
+				}
+			}
+			if (oldest == m_samples.end()) {
+				// Every sample is recent. Discarding this observation is the right
+				// call: the window already holds a fresh picture of the network.
+				return;
+			}
+			m_samples.erase(oldest);
+		}
+		sResponseTime added = { responseTimeMs, nowMs };
+		m_samplesip = added;
+	} else {
+		it->second.m_responseTimeMs = responseTimeMs;
+		it->second.m_lastReferencedMs = nowMs;
+	}
+
+	RecalculateResponseTime();
+}
+
+void CFastKad::RecalculateResponseTime()
+{
+	// Unfilled slots count as DEFAULT_RESPONSE_TIME_MS, and both moments are divided by the
+	// full window size rather than by the sample count. That is what makes the cold start safe
+	// -- with zero or one sample the estimate stays at the default instead of collapsing, and
+	// nothing divides by a zero (or count - 1 == 0) sample count.
+	const double windowSize = (double)MAX_SAMPLES;
+	const double missing =
+		(m_samples.size() < MAX_SAMPLES) ? (windowSize - (double)m_samples.size()) : 0.0;
+
+	double sum = 0.0;
+	for (std::map<uint32_t, sResponseTime>::const_iterator it = m_samples.begin(); it != m_samples.end();
+		++it) {
+		sum += (double)it->second.m_responseTimeMs;
+	}
+	sum += missing * (double)DEFAULT_RESPONSE_TIME_MS;
+	const double mean = sum / windowSize;
+
+	double varianceSum = 0.0;
+	for (std::map<uint32_t, sResponseTime>::const_iterator it = m_samples.begin(); it != m_samples.end();
+		++it) {
+		const double deviation = (double)it->second.m_responseTimeMs - mean;
+		varianceSum += deviation * deviation;
+	}
+	varianceSum += missing * ((double)DEFAULT_RESPONSE_TIME_MS - mean) *
+		       ((double)DEFAULT_RESPONSE_TIME_MS - mean);
+	const double variance = varianceSum / (windowSize - 1.0);
+
+	// mean + 2 * standard deviation is roughly the 95th percentile of a
+	// normal distribution, plus a fixed margin, and never above the cap.
+	const double estimate = mean + 2.0 * std::sqrt(variance) + (double)RESPONSE_TIME_MARGIN_MS;
+	m_estResponseTimeMs =
+		(estimate >= (double)MAX_RESPONSE_TIME_MS) ? MAX_RESPONSE_TIME_MS : (uint32_t)estimate;
+	if (m_estResponseTimeMs < RESPONSE_TIME_MARGIN_MS) {
+		m_estResponseTimeMs = RESPONSE_TIME_MARGIN_MS;
+	}
+}
+
+} // namespace Kademlia

amule-3.1.0.tar.gz/src/kademlia/net/FastKad.h Added

@@ -0,0 +1,117 @@
+//								-*- C++ -*-
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// Copyright (c) 2026 eMule AI
+//
+// 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 FASTKAD_H
+#define FASTKAD_H
+
+#include <cstddef>
+#include <map>
+
+#include "../../Types.h"
+
+////////////////////////////////////////
+namespace Kademlia
+{
+////////////////////////////////////////
+
+// Derives the Kad request timeout from observed response times instead of a fixed constant.
+//
+// A fixed timeout is wrong in both directions: on a fast link it wastes seconds waiting for a node
+// that was never going to answer, and on a slow one it discards contacts that would have answered
+// just after the deadline. This keeps a bounded window of the most recent per-address response
+// times and estimates the ceiling as mean + 2 standard deviations, plus a small margin.
+//
+// Two deliberate biases keep a cold or lucky window from producing an aggressively short timeout:
+//
+//  - The mean and variance are always divided by the FULL window size, with every unfilled slot
+// counted as the default response time, so it takes a full window of fast samples to earn a short
+// timeout.
+//  - Entries younger than MIN_EVICTION_AGE_MS are never evicted to make room, so a burst of new
+// addresses cannot churn the whole window at once.
+//
+// All times are in milliseconds and "now" is always passed in, which is what lets the estimator be
+// tested without a real clock.
+//
+// Two deliberate divergences from eMuleAI:
+//
+//  - eMuleAI accumulates `missing * CLOCKS_PER_SEC` into its sum of squares, adding a raw time to a
+// sum of squared times: the units disagree, and the unfilled-slot term is then far too small to
+// hold the estimate up. Here the squared deviation is added. emule-qt reached the same correction.
+//  - eMuleAI reads the clock with clock(), which on POSIX is CPU time, not wall time, so a mostly-
+// idle client barely advances it and response times measured against it are far too short.
+class CFastKad
+{
+public:
+	// Number of addresses whose response time is remembered.
+	static const size_t MAX_SAMPLES = 100;
+	// Response time assumed for every unfilled slot in the window, and the
+	// answer while the window is empty.
+	static const uint32_t DEFAULT_RESPONSE_TIME_MS = 1000;
+	// Absolute ceiling on the derived timeout. A node that has not answered within this is
+	// treated as gone however bad the samples look; without a cap, one pathological sample
+	// would stall every search.
+	static const uint32_t MAX_RESPONSE_TIME_MS = 3000;
+	// Safety margin added to the estimate, for the jitter between the
+	// estimator's clock and the actual send/receive path.
+	static const uint32_t RESPONSE_TIME_MARGIN_MS = 100;
+	// Samples younger than this are kept even when the window is full, so a
+	// flood of new addresses cannot evict the recent history in one go.
+	static const uint32_t MIN_EVICTION_AGE_MS = 5 * 60 * 1000;
+
+	CFastKad();
+
+	// Records that the node at `ip` answered in `responseTimeMs`. Ignored if
+	// the window is full of samples too young to evict.
+	void AddResponseTime(uint32_t ip, uint32_t responseTimeMs, uint64_t nowMs);
+
+	// The current estimated ceiling, always within
+	// RESPONSE_TIME_MARGIN_MS, MAX_RESPONSE_TIME_MS.
+	uint32_t GetEstMaxResponseTime() const { return m_estResponseTimeMs; }
+
+	size_t GetSampleCount() const { return m_samples.size(); }
+
+	// Drops every sample and returns the estimate to its cold-start value.
+	void Clear();
+
+private:
+	void RecalculateResponseTime();
+
+	struct sResponseTime
+	{
+		uint32_t m_responseTimeMs;
+		uint64_t m_lastReferencedMs;
+	};
+
+	std::map<uint32_t, sResponseTime> m_samples;
+	uint32_t m_estResponseTimeMs;
+};
+
+// The single estimator shared by every Kad search. Kad is driven from CamuleApp::OnCoreTimer on the
+// main thread, like the rest of the Kad singletons reached through CKademlia.
+extern CFastKad fastKad;
+
+} // namespace Kademlia
+
+#endif // FASTKAD_H

amule-3.0.1.tar.gz/src/kademlia/net/KademliaUDPListener.cpp -> amule-3.1.0.tar.gz/src/kademlia/net/KademliaUDPListener.cpp Changed

@@ -4,7 +4,8 @@
 // Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
 // Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
 // 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 )
+// 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,23 +66,23 @@
 #include "../../Preferences.h"
 #include "../../ScopedPtr.h"
 #include "../../IPFilter.h"
-#include "../../RandomFunctions.h"		// Needed for GetRandomUint128()
-#include "../../CompilerSpecific.h"		// Needed for __FUNCTION__
+#include "../../RandomFunctions.h"  // Needed for GetRandomUint128()
+#include "../../CompilerSpecific.h" // Needed for __FUNCTION__
 
 #include <wx/tokenzr.h>
 
-
 #define CHECK_PACKET_SIZE(OP, SIZE) \
-	if (lenPacket OP (uint32_t)(SIZE)) \
-		throw wxString(CFormat("***NOTE: Received wrong size (%u) packet in %s") % lenPacket % wxString::FromAscii(__FUNCTION__))
+	if (lenPacket OP(uint32_t)(SIZE)) \
+	throw wxString(CFormat("***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_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(CFormat("***NOTE: Received unrequested response packet, size (%u) in %s") % lenPacket % wxString::FromAscii(__FUNCTION__))
-
+	throw wxString(CFormat("***NOTE: Received unrequested response packet, size (%u) in %s") % \
+		       lenPacket % wxString::FromAscii(__FUNCTION__))
 
 ////////////////////////////////////////
 using namespace Kademlia;
@@ -90,13 +91,15 @@
 CKademliaUDPListener::~CKademliaUDPListener()
 {
 	// report timeout to all pending FetchNodeIDRequests
-	for (FetchNodeIDList::iterator it = m_fetchNodeIDRequests.begin(); it != m_fetchNodeIDRequests.end(); ++it) {
+	for (FetchNodeIDList::iterator it = m_fetchNodeIDRequests.begin(); it != m_fetchNodeIDRequests.end();
+		++it) {
 		it->requester->KadSearchNodeIDByIPResult(KCSR_TIMEOUT, NULL);
 	}
 }
 
 // Used by Kad1.0 and Kad2.0
-void CKademliaUDPListener::Bootstrap(uint32_t ip, uint16_t port, uint8_t kadVersion, const CUInt128* cryptTargetID)
+void CKademliaUDPListener::Bootstrap(
+	uint32_t ip, uint16_t port, uint8_t kadVersion, const CUInt128 *cryptTargetID)
 {
 	wxASSERT(ip);
 
@@ -110,7 +113,13 @@
 }
 
 // Used by Kad1.0 and Kad2.0
-void CKademliaUDPListener::SendMyDetails(uint8_t opcode, uint32_t ip, uint16_t port, uint8_t kadVersion, const CKadUDPKey& targetKey, const CUInt128* cryptTargetID, bool requestAckPacket)
+void CKademliaUDPListener::SendMyDetails(uint8_t opcode,
+	uint32_t ip,
+	uint16_t port,
+	uint8_t kadVersion,
+	const CKadUDPKey &targetKey,
+	const CUInt128 *cryptTargetID,
+	bool requestAckPacket)
 {
 	CMemFile packetdata;
 	packetdata.WriteUInt128(CKademlia::GetPrefs()->GetKadID());
@@ -118,33 +127,36 @@
 	if (kadVersion > 1) {
 		packetdata.WriteUInt16(thePrefs::GetPort());
 		packetdata.WriteUInt8(KADEMLIA_VERSION);
-		// Tag Count.
 		uint8_t tagCount = 0;
 		if (!CKademlia::GetPrefs()->GetUseExternKadPort()) {
 			tagCount++;
 		}
-		if (kadVersion >= 8 && (requestAckPacket || CKademlia::GetPrefs()->GetFirewalled() || CUDPFirewallTester::IsFirewalledUDP(true))) {
+		if (kadVersion >= 8 && (requestAckPacket || CKademlia::GetPrefs()->GetFirewalled() ||
+					       CUDPFirewallTester::IsFirewalledUDP(true))) {
 			tagCount++;
 		}
 		packetdata.WriteUInt8(tagCount);
 		if (!CKademlia::GetPrefs()->GetUseExternKadPort()) {
-			packetdata.WriteTag(CTagVarInt(TAG_SOURCEUPORT, CKademlia::GetPrefs()->GetInternKadPort()));
+			packetdata.WriteTag(
+				CTagVarInt(TAG_SOURCEUPORT, CKademlia::GetPrefs()->GetInternKadPort()));
 		}
-		if (kadVersion >= 8 && (requestAckPacket || CKademlia::GetPrefs()->GetFirewalled() || CUDPFirewallTester::IsFirewalledUDP(true))) {
-			// if we're firewalled we send this tag, so the other client doesn't add us to his routing table (if UDP firewalled) and for statistics reasons (TCP firewalled)
-			// 5 - reserved (!)
-			// 1 - requesting HELLO_RES_ACK
-			// 1 - TCP firewalled
-			// 1 - UDP firewalled
-			packetdata.WriteTag(CTagVarInt(TAG_KADMISCOPTIONS, (uint8_t)(
-				(requestAckPacket ? 1 : 0) << 2 |
-				(CKademlia::GetPrefs()->GetFirewalled() ? 1 : 0) << 1 |
-				(CUDPFirewallTester::IsFirewalledUDP(true) ? 1 : 0)
-			)));
+		if (kadVersion >= 8 && (requestAckPacket || CKademlia::GetPrefs()->GetFirewalled() ||
+					       CUDPFirewallTester::IsFirewalledUDP(true))) {
+			// If we are firewalled we send this tag, so the other client does not add
+			// us to his routing table (if UDP firewalled) and for statistics (if TCP
+			// firewalled). Layout: 5 reserved, 1 requesting HELLO_RES_ACK, 1 TCP
+			// firewalled, 1 UDP firewalled.
+			packetdata.WriteTag(CTagVarInt(TAG_KADMISCOPTIONS,
+				(uint8_t)((requestAckPacket ? 1 : 0) << 2 |
+					  (CKademlia::GetPrefs()->GetFirewalled() ? 1 : 0) << 1 |
+					  (CUDPFirewallTester::IsFirewalledUDP(true) ? 1 : 0))));
 		}
 		if (kadVersion >= 6) {
 			if (cryptTargetID == NULL || *cryptTargetID == 0) {
-				AddDebugLogLineN(logClientKadUDP, CFormat("Sending hello response to crypt enabled Kad Node which provided an empty NodeID: %s (%u)") % KadIPToString(ip) % kadVersion);
+				AddDebugLogLineN(logClientKadUDP,
+					CFormat("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);
@@ -154,12 +166,13 @@
 			wxASSERT(targetKey.IsEmpty());
 		}
 	} else {
-		wxFAIL;	// can never happen
+		wxFAIL; // can never happen
 	}
 }
 
 // Kad1.0 and Kad2.0 currently.
-void CKademliaUDPListener::FirewalledCheck(uint32_t ip, uint16_t port, const CKadUDPKey& senderKey, uint8_t kadVersion)
+void CKademliaUDPListener::FirewalledCheck(
+	uint32_t ip, uint16_t port, const CKadUDPKey &senderKey, uint8_t kadVersion)
 {
 	if (kadVersion > 6) {
 		// new opcode since 0.49a with extended information to support obfuscated connections properly
@@ -178,51 +191,68 @@
 	theApp->clientlist->AddKadFirewallRequest(wxUINT32_SWAP_ALWAYS(ip));
 }
 
-void CKademliaUDPListener::SendNullPacket(uint8_t opcode, uint32_t ip, uint16_t port, const CKadUDPKey& targetKey, const CUInt128* cryptTargetID)
+void CKademliaUDPListener::SendNullPacket(uint8_t opcode,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &targetKey,
+	const CUInt128 *cryptTargetID)
 {
 	CMemFile packetdata(0);
 	SendPacket(packetdata, opcode, ip, port, targetKey, cryptTargetID);
 }
 
-void CKademliaUDPListener::SendPublishSourcePacket(const CContact& contact, const CUInt128 &targetID, const CUInt128 &contactID, const TagPtrList& tags)
+void CKademliaUDPListener::SendPublishSourcePacket(
+	const CContact &contact, const CUInt128 &targetID, const CUInt128 &contactID, const TagPtrList &tags)
 {
 	uint8_t opcode;
 	CMemFile packetdata;
 	packetdata.WriteUInt128(targetID);
-	if (contact.GetVersion() >= 4/*47c*/) {
+	if (contact.GetVersion() >= 4 /*47c*/) {
 		opcode = KADEMLIA2_PUBLISH_SOURCE_REQ;
 		packetdata.WriteUInt128(contactID);
 		packetdata.WriteTagPtrList(tags);
 		DebugSend(Kad2PublishSrcReq, contact.GetIPAddress(), contact.GetUDPPort());
 	} else {
 		opcode = KADEMLIA_PUBLISH_REQ;
-		//We only use this for publishing sources now.. So we always send one here..
+		// We only use this for publishing sources now.. So we always send one here..
 		packetdata.WriteUInt16(1);
 		packetdata.WriteUInt128(contactID);
 		packetdata.WriteTagPtrList(tags);
 		DebugSend(KadPublishReq, contact.GetIPAddress(), contact.GetUDPPort());
 	}
-	if (contact.GetVersion() >= 6) {	// obfuscated ?
-		CUInt128 clientID = contact.GetClientID();
-		SendPacket(packetdata, opcode, contact.GetIPAddress(), contact.GetUDPPort(), contact.GetUDPKey(), &clientID);
+	if (contact.GetVersion() >= 6) { // obfuscated ?
+		const CUInt128 &clientID = contact.GetClientID();
+		SendPacket(packetdata,
+			opcode,
+			contact.GetIPAddress(),
+			contact.GetUDPPort(),
+			contact.GetUDPKey(),
+			&clientID);
 	} else {
 		SendPacket(packetdata, opcode, contact.GetIPAddress(), contact.GetUDPPort(), 0, NULL);
 	}
 }
 
-void CKademliaUDPListener::ProcessPacket(const uint8_t* data, uint32_t lenData, uint32_t ip, uint16_t port, bool validReceiverKey, const CKadUDPKey& senderKey)
+void CKademliaUDPListener::ProcessPacket(const uint8_t *data,
+	uint32_t lenData,
+	uint32_t ip,
+	uint16_t port,
+	bool validReceiverKey,
+	const CKadUDPKey &senderKey)
 {
-	// we do not accept (<= 0.48a) unencrypted incoming packets from port 53 (DNS) to avoid attacks based on DNS protocol confusion
+	// 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()) {
-		AddDebugLogLineN(logKadPacketTracking, "Dropping incoming unencrypted packet on port 53 (DNS), IP: " + KadIPToString(ip));
+		AddDebugLogLineN(logKadPacketTracking,
+			"Dropping incoming unencrypted packet on port 53 (DNS), IP: " + KadIPToString(ip));
 		return;
 	}
 
-	//Update connection state only when it changes.
+	// Update connection state only when it changes.
 	bool curCon = CKademlia::GetPrefs()->HasHadContact();
 	CKademlia::GetPrefs()->SetLastContact();
 	CUDPFirewallTester::Connected();
-	if( curCon != CKademlia::GetPrefs()->HasHadContact()) {
+	if (curCon != CKademlia::GetPrefs()->HasHadContact()) {
 		theApp->ShowConnectionState();
 	}
 
@@ -235,141 +265,152 @@
 	}
 
 	switch (opcode) {
-		case KADEMLIA2_BOOTSTRAP_REQ:
-			DebugRecv(Kad2BootstrapReq, ip, port);
-			Process2BootstrapRequest(ip, port, senderKey);
-			break;
-		case KADEMLIA2_BOOTSTRAP_RES:
-			DebugRecv(Kad2BootstrapRes, ip, port);
-			Process2BootstrapResponse(packetData, lenPacket, ip, port, senderKey, validReceiverKey);
-			break;
-		case KADEMLIA2_HELLO_REQ:
-			DebugRecv(Kad2HelloReq, ip, port);
-			Process2HelloRequest(packetData, lenPacket, ip, port, senderKey, validReceiverKey);
-			break;
-		case KADEMLIA2_HELLO_RES:
-			DebugRecv(Kad2HelloRes, ip, port);
-			Process2HelloResponse(packetData, lenPacket, ip, port, senderKey, validReceiverKey);
-			break;
-		case KADEMLIA2_HELLO_RES_ACK:
-			DebugRecv(Kad2HelloResAck, ip, port);
-			Process2HelloResponseAck(packetData, lenPacket, ip, validReceiverKey);
-			break;
-		case KADEMLIA2_REQ:
-			DebugRecv(Kad2Req, ip, port);
-			ProcessKademlia2Request(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA2_RES:
-			DebugRecv(Kad2Res, ip, port);
-			ProcessKademlia2Response(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA2_SEARCH_NOTES_REQ:
-			DebugRecv(Kad2SearchNotesReq, ip, port);
-			Process2SearchNotesRequest(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA2_SEARCH_KEY_REQ:
-			DebugRecv(Kad2SearchKeyReq, ip, port);
-			Process2SearchKeyRequest(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA2_SEARCH_SOURCE_REQ:
-			DebugRecv(Kad2SearchSourceReq, ip, port);
-			Process2SearchSourceRequest(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA_SEARCH_RES:
-			DebugRecv(KadSearchRes, ip, port);
-			ProcessSearchResponse(packetData, lenPacket);
-			break;
-		case KADEMLIA_SEARCH_NOTES_RES:
-			DebugRecv(KadSearchNotesRes, ip, port);
-			ProcessSearchNotesResponse(packetData, lenPacket, ip);
-			break;
-		case KADEMLIA2_SEARCH_RES:
-			DebugRecv(Kad2SearchRes, ip, port);
-			Process2SearchResponse(packetData, lenPacket, senderKey);
-			break;
-		case KADEMLIA2_PUBLISH_NOTES_REQ:
-			DebugRecv(Kad2PublishNotesReq, ip, port);
-			Process2PublishNotesRequest(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA2_PUBLISH_KEY_REQ:
-			DebugRecv(Kad2PublishKeyReq, ip, port);
-			Process2PublishKeyRequest(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA2_PUBLISH_SOURCE_REQ:
-			DebugRecv(Kad2PublishSourceReq, ip, port);
-			Process2PublishSourceRequest(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA_PUBLISH_RES:
-			DebugRecv(KadPublishRes, ip, port);
-			ProcessPublishResponse(packetData, lenPacket, ip);
-			break;
-		case KADEMLIA2_PUBLISH_RES:
-			DebugRecv(Kad2PublishRes, ip, port);
-			Process2PublishResponse(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA_FIREWALLED_REQ:
-			DebugRecv(KadFirewalledReq, ip, port);
-			ProcessFirewalledRequest(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA_FIREWALLED2_REQ:
-			DebugRecv(KadFirewalled2Req, ip, port);
-			ProcessFirewalled2Request(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA_FIREWALLED_RES:
-			DebugRecv(KadFirewalledRes, ip, port);
-			ProcessFirewalledResponse(packetData, lenPacket, ip, senderKey);
-			break;
-		case KADEMLIA_FIREWALLED_ACK_RES:
-			DebugRecv(KadFirewalledAck, ip, port);
-			ProcessFirewalledAckResponse(lenPacket);
-			break;
-		case KADEMLIA_FINDBUDDY_REQ:
-			DebugRecv(KadFindBuddyReq, ip, port);
-			ProcessFindBuddyRequest(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA_FINDBUDDY_RES:
-			DebugRecv(KadFindBuddyRes, ip, port);
-			ProcessFindBuddyResponse(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA_CALLBACK_REQ:
-			DebugRecv(KadCallbackReq, ip, port);
-			ProcessCallbackRequest(packetData, lenPacket, ip, port, senderKey);
-			break;
-		case KADEMLIA2_PING:
-			DebugRecv(Kad2Ping, ip, port);
-			Process2Ping(ip, port, senderKey);
-			break;
-		case KADEMLIA2_PONG:
-			DebugRecv(Kad2Pong, ip, port);
-			Process2Pong(packetData, lenPacket, ip);
-			break;
-		case KADEMLIA2_FIREWALLUDP:
-			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(CFormat("Unknown opcode %02x on CKademliaUDPListener::ProcessPacket()") % opcode);
-		}
+	case KADEMLIA2_BOOTSTRAP_REQ:
+		DebugRecv(Kad2BootstrapReq, ip, port);
+		Process2BootstrapRequest(ip, port, senderKey);
+		break;
+	case KADEMLIA2_BOOTSTRAP_RES:
+		DebugRecv(Kad2BootstrapRes, ip, port);
+		Process2BootstrapResponse(packetData, lenPacket, ip, port, senderKey, validReceiverKey);
+		break;
+	case KADEMLIA2_HELLO_REQ:
+		DebugRecv(Kad2HelloReq, ip, port);
+		Process2HelloRequest(packetData, lenPacket, ip, port, senderKey, validReceiverKey);
+		break;
+	case KADEMLIA2_HELLO_RES:
+		DebugRecv(Kad2HelloRes, ip, port);
+		Process2HelloResponse(packetData, lenPacket, ip, port, senderKey, validReceiverKey);
+		break;
+	case KADEMLIA2_HELLO_RES_ACK:
+		DebugRecv(Kad2HelloResAck, ip, port);
+		Process2HelloResponseAck(packetData, lenPacket, ip, validReceiverKey);
+		break;
+	case KADEMLIA2_REQ:
+		DebugRecv(Kad2Req, ip, port);
+		ProcessKademlia2Request(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA2_RES:
+		DebugRecv(Kad2Res, ip, port);
+		ProcessKademlia2Response(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA2_SEARCH_NOTES_REQ:
+		DebugRecv(Kad2SearchNotesReq, ip, port);
+		Process2SearchNotesRequest(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA2_SEARCH_KEY_REQ:
+		DebugRecv(Kad2SearchKeyReq, ip, port);
+		Process2SearchKeyRequest(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA2_SEARCH_SOURCE_REQ:
+		DebugRecv(Kad2SearchSourceReq, ip, port);
+		Process2SearchSourceRequest(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA_SEARCH_RES:
+		DebugRecv(KadSearchRes, ip, port);
+		ProcessSearchResponse(packetData, lenPacket, ip, port);
+		break;
+	case KADEMLIA_SEARCH_NOTES_RES:
+		DebugRecv(KadSearchNotesRes, ip, port);
+		ProcessSearchNotesResponse(packetData, lenPacket, ip, port);
+		break;
+	case KADEMLIA2_SEARCH_RES:
+		DebugRecv(Kad2SearchRes, ip, port);
+		Process2SearchResponse(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA2_PUBLISH_NOTES_REQ:
+		DebugRecv(Kad2PublishNotesReq, ip, port);
+		Process2PublishNotesRequest(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA2_PUBLISH_KEY_REQ:
+		DebugRecv(Kad2PublishKeyReq, ip, port);
+		Process2PublishKeyRequest(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA2_PUBLISH_SOURCE_REQ:
+		DebugRecv(Kad2PublishSourceReq, ip, port);
+		Process2PublishSourceRequest(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA_PUBLISH_RES:
+		DebugRecv(KadPublishRes, ip, port);
+		ProcessPublishResponse(packetData, lenPacket, ip);
+		break;
+	case KADEMLIA2_PUBLISH_RES:
+		DebugRecv(Kad2PublishRes, ip, port);
+		Process2PublishResponse(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA_FIREWALLED_REQ:
+		DebugRecv(KadFirewalledReq, ip, port);
+		ProcessFirewalledRequest(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA_FIREWALLED2_REQ:
+		DebugRecv(KadFirewalled2Req, ip, port);
+		ProcessFirewalled2Request(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA_FIREWALLED_RES:
+		DebugRecv(KadFirewalledRes, ip, port);
+		ProcessFirewalledResponse(packetData, lenPacket, ip, senderKey);
+		break;
+	case KADEMLIA_FIREWALLED_ACK_RES:
+		DebugRecv(KadFirewalledAck, ip, port);
+		ProcessFirewalledAckResponse(lenPacket);
+		break;
+	case KADEMLIA_FINDBUDDY_REQ:
+		DebugRecv(KadFindBuddyReq, ip, port);
+		ProcessFindBuddyRequest(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA_FINDBUDDY_RES:
+		DebugRecv(KadFindBuddyRes, ip, port);
+		ProcessFindBuddyResponse(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA_CALLBACK_REQ:
+		DebugRecv(KadCallbackReq, ip, port);
+		ProcessCallbackRequest(packetData, lenPacket, ip, port, senderKey);
+		break;
+	case KADEMLIA2_PING:
+		DebugRecv(Kad2Ping, ip, port);
+		Process2Ping(ip, port, senderKey);
+		break;
+	case KADEMLIA2_PONG:
+		DebugRecv(Kad2Pong, ip, port);
+		Process2Pong(packetData, lenPacket, ip);
+		break;
+	case KADEMLIA2_FIREWALLUDP:
+		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(
+			CFormat("Unknown opcode %02x on CKademliaUDPListener::ProcessPacket()") % opcode);
+	}
 	}
 }
 
 // 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)
+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)
 {
 	if (outRequestsACK != 0) {
 		*outRequestsACK = false;
@@ -383,7 +424,8 @@
 	uint16_t tport = bio.ReadUInt16();
 	uint8_t version = bio.ReadUInt8();
 	if (version == 0) {
-		throw wxString(CFormat("***NOTE: Received invalid Kademlia2 version (%u) in %s") % version % wxString::FromAscii(__FUNCTION__));
+		throw wxString(CFormat("***NOTE: Received invalid Kademlia2 version (%u) in %s") % version %
+			       wxString::FromAscii(__FUNCTION__));
 	}
 	if (outVersion != NULL) {
 		*outVersion = version;
@@ -407,7 +449,14 @@
 							*outRequestsACK = true;
 						}
 					} else {
-						wxFAIL;
+						// The "requests ACK" bit is only meaningful in a
+						// KADEMLIA2_HELLO_RES; a HELLO_REQ carrying it is
+						// nonstandard. It is remote-controllable, though,
+						// so log and ignore rather than asserting (#267).
+						AddDebugLogLineN(logClientKadUDP,
+							"Ignoring unexpected 'requests ACK' bit in a Kad2 "
+							"HELLO_REQ (sender: " +
+								KadIPToString(ip) + ")");
 					}
 				}
 			}
@@ -417,9 +466,9 @@
 	}
 
 	// check if we are waiting for information (nodeid) about this client and if so inform the requester
-	for (FetchNodeIDList::iterator it = m_fetchNodeIDRequests.begin(); it != m_fetchNodeIDRequests.end(); ++it) {
+	for (FetchNodeIDList::iterator it = m_fetchNodeIDRequests.begin(); it != m_fetchNodeIDRequests.end();
+		++it) {
 		if (it->ip == ip && it->tcpPort == tport) {
-			//AddDebugLogLineN(logKadMain, "Result Addcontact: " + id.ToHexString());
 			uint8_t uchID16;
 			id.ToByteArray(uchID);
 			it->requester->KadSearchNodeIDByIPResult(KCSR_SUCCEEDED, uchID);
@@ -429,40 +478,38 @@
 	}
 
 	if (fromHelloReq && version >= 8) {
-		// this is just for statistic calculations. We try to determine the ratio of (UDP) firewalled users,
-		// by counting how many of all nodes which have us in their routing table (our own routing table is supposed
-		// to have no UDP firewalled nodes at all) and support the firewalled tag are firewalled themself.
-		// Obviously this only works if we are not firewalled ourself
+		// Statistics only: the ratio of UDP-firewalled users is estimated by counting how
+		// many of the nodes that have us in their routing table -- ours is supposed to hold
+		// no UDP-firewalled nodes -- report themselves firewalled. Only works while we are
+		// not firewalled ourselves.
 		CKademlia::GetPrefs()->StatsIncUDPFirewalledNodes(udpFirewalled);
 		CKademlia::GetPrefs()->StatsIncTCPFirewalledNodes(tcpFirewalled);
 	}
 
-	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, true);
+	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, true);
 	} else {
-		AddDebugLogLineN(logKadRouting, "Not adding firewalled client to routing table (" + KadIPToString(ip) + ")");
+		AddDebugLogLineN(logKadRouting,
+			"Not adding firewalled client to routing table (" + KadIPToString(ip) + ")");
 		return false;
 	}
 }
 
 // KADEMLIA2_BOOTSTRAP_REQ
 // Used only for Kad2.0
-void CKademliaUDPListener::Process2BootstrapRequest(uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
+void CKademliaUDPListener::Process2BootstrapRequest(uint32_t ip, uint16_t port, const CKadUDPKey &senderKey)
 {
-	// Get some contacts to return
 	ContactList contacts;
 	uint16_t numContacts = (uint16_t)CKademlia::GetRoutingZone()->GetBootstrapContacts(&contacts, 20);
 
-	// Create response packet
-	//We only collect a max of 20 contacts here.. Max size is 521.
-	//2 + 25(20) + 19
+	// Response packet: at most 20 contacts, max size 521 = 2 + 25(20) + 19.
 	CMemFile packetdata(521);
 
 	packetdata.WriteUInt128(CKademlia::GetPrefs()->GetKadID());
 	packetdata.WriteUInt16(thePrefs::GetPort());
 	packetdata.WriteUInt8(KADEMLIA_VERSION);
 
-	// Write packet info
 	packetdata.WriteUInt16(numContacts);
 	CContact *contact;
 	for (ContactList::const_iterator it = contacts.begin(); it != contacts.end(); ++it) {
@@ -474,33 +521,36 @@
 		packetdata.WriteUInt8(contact->GetVersion());
 	}
 
-	// Send response
 	DebugSend(Kad2BootstrapRes, ip, port);
 	SendPacket(packetdata, KADEMLIA2_BOOTSTRAP_RES, ip, port, senderKey, NULL);
 }
 
 // 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)
+void CKademliaUDPListener::Process2BootstrapResponse(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey,
+	bool validReceiverKey)
 {
 	CHECK_TRACKED_PACKET(KADEMLIA2_BOOTSTRAP_REQ);
 
 	CRoutingZone *routingZone = CKademlia::GetRoutingZone();
 
-	// How many contacts were given
 	CMemFile bio(packetData, lenPacket);
 	CUInt128 contactID = bio.ReadUInt128();
 	uint16_t tport = bio.ReadUInt16();
 	uint8_t version = bio.ReadUInt8();
-	// if we don't know any Contacts yet and try to Bootstrap, we assume that all contacts are verified,
-	// in order to speed up the connecting process. The attackvectors to exploit this are very small with no
-	// major effects, so that's a good trade
+	// If we know no contacts yet and try to bootstrap, assume every contact is verified to
+	// speed the connect up. The attack vectors for exploiting this are very small with no major
+	// effects, so it is a good trade.
 	bool assumeVerified = CKademlia::GetRoutingZone()->GetNumContacts() == 0;
 
 	if (CKademlia::s_bootstrapList.empty()) {
-		routingZone->Add(contactID, ip, port, tport, version, senderKey, validReceiverKey, true, false);
+		routingZone->Add(
+			contactID, ip, port, tport, version, senderKey, validReceiverKey, true, false);
 	}
-	//AddDebugLogLineN(logClientKadUDP, "Inc Kad2 Bootstrap packet from " + KadIPToString(ip));
 
 	uint16_t numContacts = bio.ReadUInt16();
 	while (numContacts) {
@@ -517,48 +567,79 @@
 
 // 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)
+void CKademliaUDPListener::Process2HelloRequest(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey,
+	bool validReceiverKey)
 {
-	DEBUG_ONLY( 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
+	bool addedOrUpdated = AddContact2(packetData,
+		lenPacket,
+		ip,
+		port,
+		&contactVersion,
+		senderKey,
+		validReceiverKey,
+		true,
+		true,
+		NULL,
+		&contactID); // might change (udp)port, validReceiverKey
 	if (contactVersion < 2) {
-		throw wxString(CFormat("***NOTE: Received invalid Kademlia2 version (%u) in %s") % contactVersion % wxString::FromAscii(__FUNCTION__));
+		throw wxString(CFormat("***NOTE: Received invalid Kademlia2 version (%u) in %s") %
+			       contactVersion % wxString::FromAscii(__FUNCTION__));
 	}
 #ifdef __DEBUG__
 	if (dbgOldUDPPort != port) {
-		AddDebugLogLineN(logClientKadUDP, CFormat("KadContact %s uses his internal (%u) instead external (%u) UDP Port") % KadIPToString(ip) % port % dbgOldUDPPort);
+		AddDebugLogLineN(logClientKadUDP,
+			CFormat("KadContact %s uses his internal (%u) instead external (%u) UDP Port") %
+				KadIPToString(ip) % port % dbgOldUDPPort);
 	}
 #endif
 
 	DebugSend(Kad2HelloRes, ip, port);
-	// if this contact was added or updated (so with other words not filtered or invalid) to our routing table and did not already send a valid
-	// receiver key or is already verified in the routing table, we request an additional ACK package to complete a three-way-handshake and
-	// verify the remote IP
-	SendMyDetails(KADEMLIA2_HELLO_RES, ip, port, contactVersion, senderKey, &contactID, addedOrUpdated && !validReceiverKey);
+	// If this contact was added or updated -- so not filtered or invalid -- to our routing
+	// table, and did not already send a valid receiver key or is not already verified there,
+	// request an additional ACK package to complete a three-way handshake and verify the remote
+	// IP.
+	SendMyDetails(KADEMLIA2_HELLO_RES,
+		ip,
+		port,
+		contactVersion,
+		senderKey,
+		&contactID,
+		addedOrUpdated && !validReceiverKey);
 
 	if (addedOrUpdated && !validReceiverKey && contactVersion == 7 && !HasActiveLegacyChallenge(ip)) {
-		// Kad Version 7 doesn't support HELLO_RES_ACK but sender/receiver keys, so send a ping to validate
+		// Kad Version 7 doesn't support HELLO_RES_ACK but sender/receiver keys, so send a ping to
+		// validate
 		DebugSend(Kad2Ping, ip, port);
 		SendNullPacket(KADEMLIA2_PING, ip, port, senderKey, NULL);
 #ifdef __DEBUG__
-		CContact* contact = CKademlia::GetRoutingZone()->GetContact(contactID);
+		CContact *contact = CKademlia::GetRoutingZone()->GetContact(contactID);
 		if (contact != NULL) {
 			if (contact->GetType() < 2) {
-				AddDebugLogLineN(logKadRouting, "Sending (ping) challenge to a long known contact (should be verified already) - " + KadIPToString(ip));
+				AddDebugLogLineN(logKadRouting,
+					"Sending (ping) challenge to a long known contact (should be "
+					"verified already) - " +
+						KadIPToString(ip));
 			}
 		} else {
 			wxFAIL;
 		}
 #endif
-	} else if (CKademlia::GetPrefs()->FindExternKadPort(false) && contactVersion > 5) {	// do we need to find out our extern port?
+	} else if (CKademlia::GetPrefs()->FindExternKadPort(false) &&
+		   contactVersion > 5) { // do we need to find out our extern port?
 		DebugSend(Kad2Ping, ip, port);
 		SendNullPacket(KADEMLIA2_PING, ip, port, senderKey, NULL);
 	}
 
 	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
+		// we need to verify this contact but it doesn't support HELLO_RES_ACK nor keys, do a little
+		// workaround
 		SendLegacyChallenge(ip, port, contactID);
 	}
 
@@ -570,30 +651,40 @@
 
 // KADEMLIA2_HELLO_RES_ACK
 // Used in Kad2.0 only
-void CKademliaUDPListener::Process2HelloResponseAck(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, bool validReceiverKey)
+void CKademliaUDPListener::Process2HelloResponseAck(
+	const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, bool validReceiverKey)
 {
 	CHECK_PACKET_MIN_SIZE(17);
 	CHECK_TRACKED_PACKET(KADEMLIA2_HELLO_RES);
 
 	if (!validReceiverKey) {
-		AddDebugLogLineN(logClientKadUDP, "Receiver key is invalid! (sender: " + KadIPToString(ip) + ")");
+		AddDebugLogLineN(
+			logClientKadUDP, "Receiver key is invalid! (sender: " + KadIPToString(ip) + ")");
 		return;
 	}
 
-	// Additional packet to complete a three-way-handshake, making sure the remote contact is not using a spoofed ip.
+	// Additional packet to complete a three-way-handshake, making sure the remote contact is not using a
+	// spoofed ip.
 	CMemFile bio(packetData, lenPacket);
 	CUInt128 remoteID = bio.ReadUInt128();
 	// cppcheck-suppress duplicateBranch
 	if (!CKademlia::GetRoutingZone()->VerifyContact(remoteID, ip)) {
-		AddDebugLogLineN(logKadRouting, "Unable to find valid sender in routing table (sender: " + KadIPToString(ip) + ")");
+		AddDebugLogLineN(logKadRouting,
+			"Unable to find valid sender in routing table (sender: " + KadIPToString(ip) + ")");
 	} else {
-		AddDebugLogLineN(logKadRouting, "Verified contact (" + KadIPToString(ip) + ") by HELLO_RES_ACK");
+		AddDebugLogLineN(
+			logKadRouting, "Verified contact (" + KadIPToString(ip) + ") by HELLO_RES_ACK");
 	}
 }
 
 // KADEMLIA2_HELLO_RES
 // Used in Kad2.0 only
-void CKademliaUDPListener::Process2HelloResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey, bool validReceiverKey)
+void CKademliaUDPListener::Process2HelloResponse(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey,
+	bool validReceiverKey)
 {
 	CHECK_TRACKED_PACKET(KADEMLIA2_HELLO_REQ);
 
@@ -601,26 +692,38 @@
 	uint8_t contactVersion;
 	CUInt128 contactID;
 	bool sendACK = false;
-	bool addedOrUpdated = AddContact2(packetData, lenPacket, ip, port, &contactVersion, senderKey, validReceiverKey, true, false, &sendACK, &contactID);
+	bool addedOrUpdated = AddContact2(packetData,
+		lenPacket,
+		ip,
+		port,
+		&contactVersion,
+		senderKey,
+		validReceiverKey,
+		true,
+		false,
+		&sendACK,
+		&contactID);
 
 	if (sendACK) {
-		// the client requested us to send an ACK packet, which proves that we're not a spoofed fake contact
-		// fulfill his wish
+		// the client requested us to send an ACK packet, which proves that we're not a spoofed fake
+		// contact fulfill his wish
 		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
-			AddDebugLogLineN(logClientKadUDP, "Remote client demands ACK, but didn't send any sender key! (sender: " + KadIPToString(ip) + ")");
+			AddDebugLogLineN(logClientKadUDP,
+				"Remote client demands ACK, but didn't send any sender key! (sender: " +
+					KadIPToString(ip) + ")");
 		} else {
 			CMemFile packet(17);
 			packet.WriteUInt128(CKademlia::GetPrefs()->GetKadID());
-			packet.WriteUInt8(0);	// no tags at this time
+			packet.WriteUInt8(0); // no tags at this time
 			DebugSend(Kad2HelloResAck, ip, port);
 			SendPacket(packet, KADEMLIA2_HELLO_RES_ACK, ip, port, senderKey, NULL);
 		}
 	} else if (addedOrUpdated && !validReceiverKey && contactVersion < 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
+		// Even though this is supposedly an answer to a request of ours, it can still be
+		// spoofed as long as the attacker knows we would send a HELLO_REQ, which in this
+		// case is quite often. So for old Kad versions with no key support we need this.
 		SendLegacyChallenge(ip, port, contactID);
 	}
 
@@ -638,33 +741,33 @@
 
 // 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)
+void CKademliaUDPListener::ProcessKademlia2Request(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey)
 {
-	// Get target and type
 	CMemFile bio(packetData, lenPacket);
 	uint8_t type = bio.ReadUInt8();
 	type &= 0x1F;
 	if (type == 0) {
-		throw wxString(CFormat("***NOTE: Received wrong type (0x%02x) in %s") % type % wxString::FromAscii(__FUNCTION__));
+		throw wxString(CFormat("***NOTE: Received wrong type (0x%02x) in %s") % type %
+			       wxString::FromAscii(__FUNCTION__));
 	}
 
-	// This is the target node trying to be found.
 	CUInt128 target = bio.ReadUInt128();
-	// Convert Target to Distance as this is how we store contacts.
 	CUInt128 distance(CKademlia::GetPrefs()->GetKadID());
 	distance ^= target;
 
-	// This makes sure we are not mistaken identify. Some client may have fresh installed and have a new KadID.
+	// This makes sure we are not mistaken identify. Some client may have fresh installed and have a new
+	// KadID.
 	CUInt128 check = bio.ReadUInt128();
 	if (CKademlia::GetPrefs()->GetKadID() == check) {
-		// Get required number closest to target
 		ContactMap results;
 		CKademlia::GetRoutingZone()->GetClosestTo(2, target, distance, type, &results);
 		uint8_t count = (uint8_t)results.size();
 
-		// Write response
-		// Max count is 32. size 817..
-		// 16 + 1 + 25(32)
+		// Response: max count 32, size 817 = 16 + 1 + 25(32).
 		CMemFile packetdata(817);
 		packetdata.WriteUInt128(target);
 		packetdata.WriteUInt8(count);
@@ -675,7 +778,8 @@
 			packetdata.WriteUInt32(c->GetIPAddress());
 			packetdata.WriteUInt16(c->GetUDPPort());
 			packetdata.WriteUInt16(c->GetTCPPort());
-			packetdata.WriteUInt8(c->GetVersion()); //<- Kad Version inserted to allow backward compatibility.
+			packetdata.WriteUInt8(
+				c->GetVersion()); //<- Kad Version inserted to allow backward compatibility.
 		}
 
 		DebugSendF(CFormat("Kad2Res (count=%u)") % count, ip, port);
@@ -685,14 +789,16 @@
 
 // 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))
+void CKademliaUDPListener::ProcessKademlia2Response(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &WXUNUSED(senderKey))
 {
 	CHECK_TRACKED_PACKET(KADEMLIA2_REQ);
 
-	// Used Pointers
 	CRoutingZone *routingZone = CKademlia::GetRoutingZone();
 
-	// What search does this relate to
 	CMemFile bio(packetData, lenPacket);
 	CUInt128 target = bio.ReadUInt128();
 	uint8_t numContacts = bio.ReadUInt8();
@@ -703,14 +809,16 @@
 		// yup it is, set the contact as verified
 		// cppcheck-suppress duplicateBranch
 		if (!routingZone->VerifyContact(contactID, ip)) {
-			AddDebugLogLineN(logKadRouting, "Unable to find valid sender in routing table (sender: " + KadIPToString(ip) + ")");
+			AddDebugLogLineN(logKadRouting,
+				"Unable to find valid sender in routing table (sender: " + KadIPToString(ip) +
+					")");
 		} else {
-			AddDebugLogLineN(logKadRouting, "Verified contact with legacy challenge (Kad2Req) - " + KadIPToString(ip));
+			AddDebugLogLineN(logKadRouting,
+				"Verified contact with legacy challenge (Kad2Req) - " + KadIPToString(ip));
 		}
-		return;	// we do not actually care for its other content
+		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);
+	CHECK_PACKET_EXACT_SIZE(16 + 1 + (16 + 4 + 2 + 2 + 1) * numContacts);
 
 	// is this a search for firewallcheck ips?
 	bool isFirewallUDPCheckSearch = false;
@@ -718,8 +826,8 @@
 		isFirewallUDPCheckSearch = true;
 	}
 
-	DEBUG_ONLY( uint32_t ignoredCount = 0; )
-	DEBUG_ONLY( uint32_t kad1Count = 0; )
+	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();
@@ -728,47 +836,77 @@
 		uint16_t tport = bio.ReadUInt16();
 		uint8_t version = bio.ReadUInt8();
 		uint32_t hostIP = wxUINT32_SWAP_ALWAYS(contactIP);
-		if (version > 1) {	// Kad1 nodes are no longer accepted and ignored
+		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 (!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 that's 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);
+						// UDP FirewallCheck searches are special: they need
+						// an IP we have not sent a UDP message to, so these
+						// contacts are neither added to the routing zone
+						// nor handed back to the search manager, which
+						// would UDP-ask them for further results. Reporting
+						// them only to FirewallChecker cripples the search,
+						// which does not matter: only the IPs do.
+						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);
-						CContact *temp = new CContact(id, contactIP, contactPort, tport, version, 0, false, target);
+						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++; )
+							DEBUG_ONLY(ignoredCount++;)
 							delete temp;
 						}
 					}
 				}
 			}
 		} else {
-			DEBUG_ONLY( kad1Count++; )
+			DEBUG_ONLY(kad1Count++;)
 		}
 	}
 
 #ifdef __DEBUG__
 	if (ignoredCount > 0) {
-		AddDebugLogLineN(logKadRouting, CFormat("Ignored %u bad %s in routing answer from %s") % ignoredCount % (ignoredCount > 1 ? "contacts" : "contact") % KadIPToString(ip));
+		AddDebugLogLineN(logKadRouting,
+			CFormat("Ignored %u bad %s in routing answer from %s") % ignoredCount %
+				(ignoredCount > 1 ? "contacts" : "contact") % KadIPToString(ip));
 	}
 	if (kad1Count > 0) {
-		AddDebugLogLineN(logKadRouting, CFormat("Ignored %u kad1 %s in routing answer from %s") % kad1Count % (kad1Count > 1 ? "contacts" : "contact") % KadIPToString(ip));
+		AddDebugLogLineN(logKadRouting,
+			CFormat("Ignored %u kad1 %s in routing answer from %s") % kad1Count %
+				(kad1Count > 1 ? "contacts" : "contact") % KadIPToString(ip));
 	}
 #endif
 
 	CSearchManager::ProcessResponse(target, ip, port, results.release());
 }
 
-void CKademliaUDPListener::Free(SSearchTerm* pSearchTerms)
+void CKademliaUDPListener::Free(SSearchTerm *pSearchTerms)
 {
 	if (pSearchTerms) {
 		Free(pSearchTerms->left);
@@ -777,11 +915,11 @@
 	}
 }
 
-SSearchTerm* CKademliaUDPListener::CreateSearchExpressionTree(CMemFile& bio, int iLevel)
+SSearchTerm *CKademliaUDPListener::CreateSearchExpressionTree(CMemFile &bio, int iLevel)
 {
 	// the max. depth has to match our own limit for creating the search expression
 	// (see also 'ParsedSearchExpression' and 'GetSearchPacket')
-	if (iLevel >= 24){
+	if (iLevel >= 24) {
 		AddDebugLogLineN(logKadSearch, "***NOTE: Search expression tree exceeds depth limit!");
 		return NULL;
 	}
@@ -790,16 +928,13 @@
 	uint8_t op = bio.ReadUInt8();
 	if (op == 0x00) {
 		uint8_t boolop = bio.ReadUInt8();
-		// The recursive children below read from `bio` and can throw
-		// CEOFException on a truncated packet. Without a guard the
-		// parent node and the already-built left subtree (if any)
-		// leak during stack unwinding -- `~SSearchTerm` doesn't
-		// recurse into left/right, only the explicit `Free()` walk
-		// does, and `Free()` is only reached on the success/NULL-
-		// return paths. Wrap each boolean-node body so any throw
-		// frees the partial subtree before re-raising (#884).
+		// The recursive children below read from `bio` and can throw CEOFException on a
+		// truncated packet. Without a guard the parent node and the already-built left
+		// subtree leak during unwinding: ~SSearchTerm does not recurse into left/right,
+		// only the explicit Free() walk does, and that is only reached on the success and
+		// NULL-return paths (#884).
 		if (boolop == 0x00) { // AND
-			SSearchTerm* pSearchTerm = new SSearchTerm;
+			SSearchTerm *pSearchTerm = new SSearchTerm;
 			pSearchTerm->type = SSearchTerm::AND;
 			try {
 				if ((pSearchTerm->left = CreateSearchExpressionTree(bio, iLevel)) == NULL) {
@@ -817,7 +952,7 @@
 			}
 			return pSearchTerm;
 		} else if (boolop == 0x01) { // OR
-			SSearchTerm* pSearchTerm = new SSearchTerm;
+			SSearchTerm *pSearchTerm = new SSearchTerm;
 			pSearchTerm->type = SSearchTerm::OR;
 			try {
 				if ((pSearchTerm->left = CreateSearchExpressionTree(bio, iLevel)) == NULL) {
@@ -835,7 +970,7 @@
 			}
 			return pSearchTerm;
 		} else if (boolop == 0x02) { // NOT
-			SSearchTerm* pSearchTerm = new SSearchTerm;
+			SSearchTerm *pSearchTerm = new SSearchTerm;
 			pSearchTerm->type = SSearchTerm::NOT;
 			try {
 				if ((pSearchTerm->left = CreateSearchExpressionTree(bio, iLevel)) == NULL) {
@@ -853,7 +988,10 @@
 			}
 			return pSearchTerm;
 		} else {
-			AddDebugLogLineN(logKadSearch, CFormat("*** Unknown boolean search operator 0x%02x (CreateSearchExpressionTree)") % boolop);
+			AddDebugLogLineN(logKadSearch,
+				CFormat("*** Unknown boolean search operator 0x%02x "
+					"(CreateSearchExpressionTree)") %
+					boolop);
 			return NULL;
 		}
 	} else if (op == 0x01) { // String
@@ -862,13 +1000,13 @@
 		// Make lowercase, the search code expects lower case strings!
 		str.MakeLower();
 
-		SSearchTerm* pSearchTerm = new SSearchTerm;
+		SSearchTerm *pSearchTerm = new SSearchTerm;
 		pSearchTerm->type = SSearchTerm::String;
 		pSearchTerm->astr = new wxArrayString;
 
 		// pre-tokenize the string term
-		//#warning TODO: TokenizeOptQuotedSearchTerm
-		wxStringTokenizer token(str, CSearchManager::GetInvalidKeywordChars(), wxTOKEN_DEFAULT );
+		// #warning TODO: TokenizeOptQuotedSearchTerm
+		wxStringTokenizer token(str, CSearchManager::GetInvalidKeywordChars(), wxTOKEN_DEFAULT);
 		while (token.HasMoreTokens()) {
 			wxString strTok(token.GetNextToken());
 			if (!strTok.IsEmpty()) {
@@ -878,74 +1016,76 @@
 
 		return pSearchTerm;
 	} else if (op == 0x02) { // Meta tag
-		// read tag value
 		wxString strValue(bio.ReadString(true));
 		// Make lowercase, the search code expects lower case strings!
 		strValue.MakeLower();
 
-		// read tag name
-		wxString strTagName =  bio.ReadString(false);
+		wxString strTagName = bio.ReadString(false);
 
-		SSearchTerm* pSearchTerm = new SSearchTerm;
+		SSearchTerm *pSearchTerm = new SSearchTerm;
 		pSearchTerm->type = SSearchTerm::MetaTag;
 		pSearchTerm->tag = new CTagString(strTagName, strValue);
 		return pSearchTerm;
-	}
-	else if (op == 0x03 || op == 0x08) { // Numeric relation (0x03=32-bit or 0x08=64-bit)
-		static const struct {
+	} else if (op == 0x03 || op == 0x08) { // Numeric relation (0x03=32-bit or 0x08=64-bit)
+		static const struct
+		{
 			SSearchTerm::ESearchTermType eSearchTermOp;
 			wxString pszOp;
-		} _aOps =
-		{
-			{ SSearchTerm::OpEqual,		"="	}, // mmop=0x00
-			{ SSearchTerm::OpGreater,	">"	}, // mmop=0x01
-			{ SSearchTerm::OpLess,		"<"	}, // mmop=0x02
-			{ SSearchTerm::OpGreaterEqual,	">="	}, // mmop=0x03
-			{ SSearchTerm::OpLessEqual,	"<="	}, // mmop=0x04
-			{ SSearchTerm::OpNotEqual,	"<>"	}  // mmop=0x05
+		} _aOps = {
+			{ SSearchTerm::OpEqual, "=" },         // mmop=0x00
+			{ SSearchTerm::OpGreater, ">" },       // mmop=0x01
+			{ SSearchTerm::OpLess, "<" },          // mmop=0x02
+			{ SSearchTerm::OpGreaterEqual, ">=" }, // mmop=0x03
+			{ SSearchTerm::OpLessEqual, "<=" },    // mmop=0x04
+			{ SSearchTerm::OpNotEqual, "<>" }      // mmop=0x05
 		};
 
-		// read tag value
 		uint64_t ullValue = (op == 0x03) ? bio.ReadUInt32() : bio.ReadUInt64();
 
-		// read integer operator
 		uint8_t mmop = bio.ReadUInt8();
-		if (mmop >= itemsof(_aOps)){
-			AddDebugLogLineN(logKadSearch, CFormat("*** Unknown integer search op=0x%02x (CreateSearchExpressionTree)") % mmop);
+		if (mmop >= itemsof(_aOps)) {
+			AddDebugLogLineN(logKadSearch,
+				CFormat("*** Unknown integer search op=0x%02x (CreateSearchExpressionTree)") %
+					mmop);
 			return NULL;
 		}
 
-		// read tag name
 		wxString strTagName = bio.ReadString(false);
 
-		SSearchTerm* pSearchTerm = new SSearchTerm;
+		SSearchTerm *pSearchTerm = new SSearchTerm;
 		pSearchTerm->type = _aOpsmmop.eSearchTermOp;
 		pSearchTerm->tag = new CTagVarInt(strTagName, ullValue);
 
 		return pSearchTerm;
 	} else {
-		AddDebugLogLineN(logKadSearch, CFormat("*** Unknown search op=0x%02x (CreateSearchExpressionTree)") % op);
+		AddDebugLogLineN(logKadSearch,
+			CFormat("*** Unknown search op=0x%02x (CreateSearchExpressionTree)") % op);
 		return NULL;
 	}
 }
 
 // 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)
+void CKademliaUDPListener::Process2SearchKeyRequest(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey)
 {
 	CMemFile bio(packetData, lenPacket);
 	CUInt128 target = bio.ReadUInt128();
 	uint16_t startPosition = bio.ReadUInt16();
 	bool restrictive = ((startPosition & 0x8000) == 0x8000);
 	startPosition &= 0x7FFF;
-	SSearchTerm* pSearchTerms = NULL;
+	SSearchTerm *pSearchTerms = NULL;
 	if (restrictive) {
 		pSearchTerms = CreateSearchExpressionTree(bio, 0);
 		if (pSearchTerms == NULL) {
 			throw wxString("Invalid search expression");
 		}
 	}
-	CKademlia::GetIndexed()->SendValidKeywordResult(target, pSearchTerms, ip, port, false, startPosition, senderKey);
+	CKademlia::GetIndexed()->SendValidKeywordResult(
+		target, pSearchTerms, ip, port, false, startPosition, senderKey);
 	if (pSearchTerms) {
 		Free(pSearchTerms);
 	}
@@ -953,7 +1093,11 @@
 
 // KADEMLIA2_SEARCH_SOURCE_REQ
 // Used in Kad2.0 only
-void CKademliaUDPListener::Process2SearchSourceRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
+void CKademliaUDPListener::Process2SearchSourceRequest(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey)
 {
 	CMemFile bio(packetData, lenPacket);
 	CUInt128 target = bio.ReadUInt128();
@@ -962,64 +1106,65 @@
 	CKademlia::GetIndexed()->SendValidSourceResult(target, ip, port, startPosition, fileSize, senderKey);
 }
 
-void CKademliaUDPListener::ProcessSearchResponse(CMemFile& bio)
+void CKademliaUDPListener::ProcessSearchResponse(CMemFile &bio, uint32_t fromIP, uint16_t fromPort)
 {
-	// What search does this relate to
 	CUInt128 target = bio.ReadUInt128();
 
-	// How many 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!
+		// Get info about the answer. NOTE: this is the one and only place in Kad where we
+		// allow string conversion to the local code page when we did not receive a UTF8
+		// string. It is for backward compatibility with search results, which are meant to
+		// be VIEWED by the user and not fed back into the Kad engine. If that tag list is
+		// ever used for anything but viewing, string conversion needs special care.
 		CScopedContainer<TagPtrList> tags;
-		bio.ReadTagPtrList(tags.get(), true/*bOptACP*/);
-		CSearchManager::ProcessResult(target, answer, tags.get());
+		bio.ReadTagPtrList(tags.get(), true /*bOptACP*/);
+		CSearchManager::ProcessResult(target, answer, tags.get(), fromIP, fromPort);
 		count--;
 	}
 }
 
-
 // KADEMLIA_SEARCH_RES
 // Used in Kad1.0 only
-void CKademliaUDPListener::ProcessSearchResponse(const uint8_t *packetData, uint32_t lenPacket)
+void CKademliaUDPListener::ProcessSearchResponse(
+	const uint8_t *packetData, uint32_t lenPacket, uint32_t fromIP, uint16_t fromPort)
 {
-	// Verify packet is expected size
 	CHECK_PACKET_MIN_SIZE(37);
 
 	CMemFile bio(packetData, lenPacket);
-	ProcessSearchResponse(bio);
+	ProcessSearchResponse(bio, fromIP, fromPort);
 }
 
 // KADEMLIA2_SEARCH_RES
 // Used in Kad2.0 only
-void CKademliaUDPListener::Process2SearchResponse(const uint8_t *packetData, uint32_t lenPacket, const CKadUDPKey& WXUNUSED(senderKey))
+void CKademliaUDPListener::Process2SearchResponse(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &WXUNUSED(senderKey))
 {
 	CMemFile bio(packetData, lenPacket);
 
-	// Who sent this packet.
 	bio.ReadUInt128();
 
-	ProcessSearchResponse(bio);
+	ProcessSearchResponse(bio, ip, port);
 }
 
 // KADEMLIA2_PUBLISH_KEY_REQ
 // Used in Kad2.0 only
-void CKademliaUDPListener::Process2PublishKeyRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
+void CKademliaUDPListener::Process2PublishKeyRequest(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey)
 {
-	//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.
+		// We are firewalled. We should not index this entry and give publisher a false report.
 		return;
 	}
 
@@ -1033,17 +1178,16 @@
 		return;
 	}
 
-	DEBUG_ONLY( wxString strInfo; )
+	DEBUG_ONLY(wxString strInfo;)
 	uint16_t count = bio.ReadUInt16();
 	uint8_t load = 0;
 	while (count > 0) {
-		DEBUG_ONLY( strInfo.Clear(); )
+		DEBUG_ONLY(strInfo.Clear();)
 
 		CUInt128 target = bio.ReadUInt128();
 
-		Kademlia::CKeyEntry* entry = new Kademlia::CKeyEntry();
-		try
-		{
+		Kademlia::CKeyEntry *entry = new Kademlia::CKeyEntry();
+		try {
 			entry->m_uIP = ip;
 			entry->m_uUDPport = port;
 			entry->m_uKeyID = file;
@@ -1052,12 +1196,13 @@
 			entry->m_bSource = false;
 			uint32_t tags = bio.ReadUInt8();
 			while (tags > 0) {
-				CTag* tag = bio.ReadTag();
+				CTag *tag = bio.ReadTag();
 				if (tag) {
 					if (!tag->GetName().Cmp(TAG_FILENAME)) {
 						if (entry->GetCommonFileName().IsEmpty()) {
 							entry->SetFileName(tag->GetStr());
-							DEBUG_ONLY( strInfo += CFormat("  Name=\"%s\"") % entry->GetCommonFileName(); )
+							DEBUG_ONLY(strInfo += CFormat("  Name=\"%s\"") %
+									      entry->GetCommonFileName();)
 						}
 						delete tag; // tag is no longer stored, but membervar is used
 					} else if (!tag->GetName().Cmp(TAG_FILESIZE)) {
@@ -1067,12 +1212,47 @@
 							} else {
 								entry->m_uSize = tag->GetInt();
 							}
-							DEBUG_ONLY( strInfo += CFormat("  Size=%u") % entry->m_uSize; )
+							DEBUG_ONLY(strInfo +=
+								   CFormat("  Size=%u") % entry->m_uSize;)
 						}
 						delete tag; // tag is no longer stored, but membervar is used
+#ifdef ENABLE_KAD_PROTOCOL_10
+					} else if (!tag->GetName().Cmp(TAG_KADAICHHASHPUB)) {
+						// AICH root hash of the published file (Kad
+						// protocol version 0x09). Kept as a member rather
+						// than a tag: MergeIPsAndFilenames() attaches it to
+						// this publisher and maintains the popularity
+						// counts of the stored entry.
+						//
+						// Gated: upstream has no branch for this tag, so it
+						// falls through to AddTag() and is relayed verbatim
+						// in later search answers. Consuming it here
+						// removes it from that answer.
+						if (tag->IsBsob() &&
+							tag->GetBsobSize() == KAD_AICH_HASH_SIZE) {
+							if (entry->GetAICHHashCount() == 0) {
+								CKadAICHHash hash;
+								memcpy(hash.data(),
+									tag->GetBsob(),
+									hash.size());
+								entry->SetPublishedAICHHash(hash);
+							} else {
+								AddDebugLogLineN(logClientKadUDP,
+									"Multiple TAG_KADAICHHASHPUB tags "
+									"received for a single file "
+									"from " +
+										KadIPToString(ip));
+							}
+						} else {
+							AddDebugLogLineN(logClientKadUDP,
+								"Bad TAG_KADAICHHASHPUB received from " +
+									KadIPToString(ip));
+						}
+						delete tag; // tag is no longer stored, but membervar is used
+#endif
 					} else {
-						//TODO: Filter tags
-						entry->AddTag(tag);
+						// TODO: Filter tags
+						entry->AddTag(tag, ip);
 					}
 				}
 				tags--;
@@ -1082,20 +1262,17 @@
 				AddDebugLogLineN(logClientKadUDP, strInfo);
 			}
 #endif
-		} catch(...) {
-			//DebugClientOutput("CKademliaUDPListener::Process2PublishKeyRequest",ip,port,packetData,lenPacket);
+		} catch (...) {
 			delete entry;
 			throw;
 		}
 
 		if (!indexed->AddKeyword(file, target, entry, load)) {
-			//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..
+			// We have already indexed the maximum number of keywords. We stop indexing
+			// but still report success: if a VERY busy node told the publisher it
+			// failed, that busy node would spread to all the surrounding nodes and
+			// cause popular keywords to be stored on MANY of them. Once full, we
+			// periodically clean our list until we can store again.
 			delete entry;
 			entry = NULL;
 		}
@@ -1110,14 +1287,17 @@
 
 // KADEMLIA2_PUBLISH_SOURCE_REQ
 // Used in Kad2.0 only
-void CKademliaUDPListener::Process2PublishSourceRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
+void CKademliaUDPListener::Process2PublishSourceRequest(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey)
 {
-	//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.
+		// We are firewalled. We should not index this entry and give publisher a false report.
 		return;
 	}
 
@@ -1131,11 +1311,11 @@
 		return;
 	}
 
-	DEBUG_ONLY( wxString strInfo; )
+	DEBUG_ONLY(wxString strInfo;)
 	uint8_t load = 0;
 	bool flag = false;
 	CUInt128 target = bio.ReadUInt128();
-	Kademlia::CEntry* entry = new Kademlia::CEntry();
+	Kademlia::CEntry *entry = new Kademlia::CEntry();
 	try {
 		entry->m_uIP = ip;
 		entry->m_uUDPport = port;
@@ -1146,15 +1326,15 @@
 		bool addUDPPortTag = true;
 		uint32_t tags = bio.ReadUInt8();
 		while (tags > 0) {
-			CTag* tag = bio.ReadTag();
+			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(tag);
+						entry->AddTag(new CTagVarInt(TAG_SOURCEIP, entry->m_uIP), 0);
+						entry->AddTag(tag, ip);
 						entry->m_bSource = true;
 					} else {
-						//More than one sourcetype tag found.
+						// More than one sourcetype tag found.
 						delete tag;
 					}
 				} else if (!tag->GetName().Cmp(TAG_FILESIZE)) {
@@ -1164,43 +1344,42 @@
 						} else {
 							entry->m_uSize = tag->GetInt();
 						}
-						DEBUG_ONLY( strInfo += CFormat("  Size=%u") % entry->m_uSize; )
+						DEBUG_ONLY(strInfo += CFormat("  Size=%u") % entry->m_uSize;)
 					}
 					delete tag;
 				} else if (!tag->GetName().Cmp(TAG_SOURCEPORT)) {
 					if (entry->m_uTCPport == 0) {
 						entry->m_uTCPport = (uint16_t)tag->GetInt();
-						entry->AddTag(tag);
+						entry->AddTag(tag, ip);
 					} else {
-						//More than one port tag found
+						// More than one port tag found
 						delete tag;
 					}
 				} else if (!tag->GetName().Cmp(TAG_SOURCEUPORT)) {
 					if (addUDPPortTag && tag->IsInt() && tag->GetInt() != 0) {
 						entry->m_uUDPport = (uint16_t)tag->GetInt();
-						entry->AddTag(tag);
+						entry->AddTag(tag, ip);
 						addUDPPortTag = false;
 					} else {
-						//More than one udp port tag found
+						// More than one udp port tag found
 						delete tag;
 					}
 				} else {
-					//TODO: Filter tags
-					entry->AddTag(tag);
+					// TODO: Filter tags
+					entry->AddTag(tag, ip);
 				}
 			}
 			tags--;
 		}
 		if (addUDPPortTag) {
-			entry->AddTag(new CTagVarInt(TAG_SOURCEUPORT, entry->m_uUDPport));
+			entry->AddTag(new CTagVarInt(TAG_SOURCEUPORT, entry->m_uUDPport), 0);
 		}
 #ifdef __DEBUG__
 		if (!strInfo.IsEmpty()) {
 			AddDebugLogLineN(logClientKadUDP, strInfo);
 		}
 #endif
-	} catch(...) {
-		//DebugClientOutput("CKademliaUDPListener::Process2PublishSourceRequest",ip,port,packetData,lenPacket);
+	} catch (...) {
 		delete entry;
 		throw;
 	}
@@ -1229,7 +1408,6 @@
 // Used only by Kad1.0
 void CKademliaUDPListener::ProcessPublishResponse(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_REQ);
 
@@ -1248,10 +1426,17 @@
 
 // KADEMLIA2_PUBLISH_RES
 // Used only by Kad2.0
-void CKademliaUDPListener::Process2PublishResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
+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(CFormat("***NOTE: Received unrequested response packet, size (%u) in %s") % lenPacket % wxString::FromAscii(__FUNCTION__));
+	if (!IsOnOutTrackList(ip, KADEMLIA2_PUBLISH_KEY_REQ) &&
+		!IsOnOutTrackList(ip, KADEMLIA2_PUBLISH_SOURCE_REQ) &&
+		!IsOnOutTrackList(ip, KADEMLIA2_PUBLISH_NOTES_REQ)) {
+		throw wxString(CFormat("***NOTE: Received unrequested response packet, size (%u) in %s") %
+			       lenPacket % wxString::FromAscii(__FUNCTION__));
 	}
 	CMemFile bio(packetData, lenPacket);
 	CUInt128 file = bio.ReadUInt128();
@@ -1270,7 +1455,11 @@
 
 // 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)
+void CKademliaUDPListener::Process2SearchNotesRequest(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey)
 {
 	CMemFile bio(packetData, lenPacket);
 	CUInt128 target = bio.ReadUInt128();
@@ -1280,24 +1469,27 @@
 
 // KADEMLIA_SEARCH_NOTES_RES
 // Used only by Kad1.0
-void CKademliaUDPListener::ProcessSearchNotesResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip)
+void CKademliaUDPListener::ProcessSearchNotesResponse(
+	const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port)
 {
-	// Verify packet is expected size
 	CHECK_PACKET_MIN_SIZE(37);
 	CHECK_TRACKED_PACKET(KADEMLIA_SEARCH_NOTES_REQ);
 
-	// What search does this relate to
 	CMemFile bio(packetData, lenPacket);
-	ProcessSearchResponse(bio);
+	ProcessSearchResponse(bio, ip, port);
 }
 
 // KADEMLIA2_PUBLISH_NOTES_REQ
 // Used only by Kad2.0
-void CKademliaUDPListener::Process2PublishNotesRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
+void CKademliaUDPListener::Process2PublishNotesRequest(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey)
 {
 	// 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.
+		// We are firewalled. We should not index this entry and give publisher a false report.
 		return;
 	}
 
@@ -1313,7 +1505,7 @@
 
 	CUInt128 source = bio.ReadUInt128();
 
-	Kademlia::CEntry* entry = new Kademlia::CEntry();
+	Kademlia::CEntry *entry = new Kademlia::CEntry();
 	try {
 		entry->m_uIP = ip;
 		entry->m_uUDPport = port;
@@ -1322,8 +1514,8 @@
 		entry->m_bSource = false;
 		uint32_t tags = bio.ReadUInt8();
 		while (tags > 0) {
-			CTag* tag = bio.ReadTag();
-			if(tag) {
+			CTag *tag = bio.ReadTag();
+			if (tag) {
 				if (!tag->GetName().Cmp(TAG_FILENAME)) {
 					if (entry->GetCommonFileName().IsEmpty()) {
 						entry->SetFileName(tag->GetStr());
@@ -1335,14 +1527,13 @@
 					}
 					delete tag;
 				} else {
-					//TODO: Filter tags
-					entry->AddTag(tag);
+					// TODO: Filter tags
+					entry->AddTag(tag, ip);
 				}
 			}
 			tags--;
 		}
-	} catch(...) {
-		//DebugClientOutput("CKademliaUDPListener::Process2PublishNotesRequest",ip,port,packetData,lenPacket);
+	} catch (...) {
 		delete entry;
 		entry = NULL;
 		throw;
@@ -1362,9 +1553,12 @@
 
 // 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)
+void CKademliaUDPListener::ProcessFirewalledRequest(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey)
 {
-	// Verify packet is expected size
 	CHECK_PACKET_EXACT_SIZE(2);
 
 	CMemFile bio(packetData, lenPacket);
@@ -1376,7 +1570,6 @@
 		return; // cancelled for some reason, don't send a response
 	}
 
-	// Send response
 	CMemFile packetdata(4);
 	packetdata.WriteUInt32(ip);
 	DebugSend(KadFirewalledRes, ip, port);
@@ -1385,9 +1578,12 @@
 
 // KADEMLIA_FIREWALLED2_REQ
 // Used by Kad2.0 Prot.Version 7+
-void CKademliaUDPListener::ProcessFirewalled2Request(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
+void CKademliaUDPListener::ProcessFirewalled2Request(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey)
 {
-	// Verify packet is expected size
 	CHECK_PACKET_MIN_SIZE(19);
 
 	CMemFile bio(packetData, lenPacket);
@@ -1401,7 +1597,6 @@
 		return; // cancelled for some reason, don't send a response
 	}
 
-	// Send response
 	CMemFile packetdata(4);
 	packetdata.WriteUInt32(ip);
 	DebugSend(KadFirewalledRes, ip, port);
@@ -1410,13 +1605,16 @@
 
 // KADEMLIA_FIREWALLED_RES
 // Used by Kad1.0 and Kad2.0
-void CKademliaUDPListener::ProcessFirewalledResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, const CKadUDPKey& WXUNUSED(senderKey))
+void CKademliaUDPListener::ProcessFirewalledResponse(
+	const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, const CKadUDPKey &WXUNUSED(senderKey))
 {
 	// Verify packet is expected size
 	CHECK_PACKET_EXACT_SIZE(4);
 
-	if (!theApp->clientlist->IsKadFirewallCheckIP(wxUINT32_SWAP_ALWAYS(ip))) { /* KADEMLIA_FIREWALLED2_REQ + KADEMLIA_FIREWALLED_REQ */
-		throw wxString("Received unrequested firewall response packet in ") + wxString::FromAscii(__FUNCTION__);
+	if (!theApp->clientlist->IsKadFirewallCheckIP(
+		    wxUINT32_SWAP_ALWAYS(ip))) { /* KADEMLIA_FIREWALLED2_REQ + KADEMLIA_FIREWALLED_REQ */
+		throw wxString("Received unrequested firewall response packet in ") +
+			wxString::FromAscii(__FUNCTION__);
 	}
 
 	CMemFile bio(packetData, lenPacket);
@@ -1434,8 +1632,9 @@
 // Used by Kad1.0 and Kad2.0
 void CKademliaUDPListener::ProcessFirewalledAckResponse(uint32_t lenPacket)
 {
-	// Deprecated since KadVersion 7+, the result is now sent per TCP instead of UDP, because this will fail if our intern UDP 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.
+	// Deprecated since KadVersion 7+: the result is now sent over TCP instead of UDP, because
+	// UDP fails if our internal UDP port is unreachable. We want the TCP test result regardless
+	// of UDP being firewalled; the new UDP state and test take care of the rest.
 
 	// Verify packet is expected size
 	CHECK_PACKET_EXACT_SIZE(0);
@@ -1445,12 +1644,17 @@
 
 // KADEMLIA_FINDBUDDY_REQ
 // Used by Kad1.0 and Kad2.0
-void CKademliaUDPListener::ProcessFindBuddyRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
+void CKademliaUDPListener::ProcessFindBuddyRequest(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &senderKey)
 {
 	// Verify packet is expected size
 	CHECK_PACKET_MIN_SIZE(34);
 
-	if (CKademlia::GetPrefs()->GetFirewalled() || CUDPFirewallTester::IsFirewalledUDP(true) || !CUDPFirewallTester::IsVerified()) {
+	if (CKademlia::GetPrefs()->GetFirewalled() || CUDPFirewallTester::IsFirewalledUDP(true) ||
+		!CUDPFirewallTester::IsVerified()) {
 		// We are firewalled but somehow we still got this packet.. Don't send a response..
 		return;
 	} else if (theApp->clientlist->GetBuddyStatus() == Connected) {
@@ -1474,7 +1678,8 @@
 	packetdata.WriteUInt128(CKademlia::GetPrefs()->GetClientHash());
 	packetdata.WriteUInt16(thePrefs::GetPort());
 	if (!senderKey.IsEmpty()) { // remove check for later versions
-		packetdata.WriteUInt8(CPrefs::GetMyConnectOptions(true, false)); // new since 0.49a, old mules will ignore it  (hopefully ;) )
+		packetdata.WriteUInt8(CPrefs::GetMyConnectOptions(
+			true, false)); // new since 0.49a, old mules will ignore it  (hopefully ;) )
 	}
 
 	DebugSend(KadFindBuddyRes, ip, port);
@@ -1483,7 +1688,11 @@
 
 // KADEMLIA_FINDBUDDY_RES
 // Used by Kad1.0 and Kad2.0
-void CKademliaUDPListener::ProcessFindBuddyResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& WXUNUSED(senderKey))
+void CKademliaUDPListener::ProcessFindBuddyResponse(const uint8_t *packetData,
+	uint32_t lenPacket,
+	uint32_t ip,
+	uint16_t port,
+	const CKadUDPKey &WXUNUSED(senderKey))
 {
 	// Verify packet is expected size
 	CHECK_PACKET_MIN_SIZE(34);
@@ -1497,7 +1706,8 @@
 		uint16_t tcpport = bio.ReadUInt16();
 		uint8_t connectOptions = 0;
 		if (lenPacket > 34) {
-			// 0.49+ (kad version 7) sends additionally its connect options so we know whether to use an obfuscated connection
+			// 0.49+ (kad version 7) sends additionally its connect options so we know whether to
+			// use an obfuscated connection
 			connectOptions = bio.ReadUInt8();
 		}
 
@@ -1509,12 +1719,16 @@
 
 // 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 WXUNUSED(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);
 
-	CUpDownClient* buddy = theApp->clientlist->GetBuddy();
+	CUpDownClient *buddy = theApp->clientlist->GetBuddy();
 	if (buddy != NULL) {
 		CMemFile bio(packetData, lenPacket);
 		CUInt128 check = bio.ReadUInt128();
@@ -1529,7 +1743,7 @@
 			packetdata.WriteUInt128(file);
 			packetdata.WriteUInt32(ip);
 			packetdata.WriteUInt16(tcp);
-			CPacket* packet = new CPacket(packetdata, OP_EMULEPROT, OP_CALLBACK);
+			CPacket *packet = new CPacket(packetdata, OP_EMULEPROT, OP_CALLBACK);
 			AddDebugLogLineN(logLocalClient, "Local Client: OP_CALLBACK to " + KadIPToString(ip));
 			buddy->GetSocket()->SendPacket(packet);
 			theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
@@ -1540,7 +1754,7 @@
 }
 
 // KADEMLIA2_PING
-void CKademliaUDPListener::Process2Ping(uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
+void CKademliaUDPListener::Process2Ping(uint32_t ip, uint16_t port, const CKadUDPKey &senderKey)
 {
 	// can be used just as PING, currently it is however only used to determine one's external port
 	CMemFile packetdata(2);
@@ -1561,18 +1775,22 @@
 		// yup it is, set the contact as verified
 		// cppcheck-suppress duplicateBranch
 		if (!CKademlia::GetRoutingZone()->VerifyContact(contactID, ip)) {
-			AddDebugLogLineN(logKadRouting, "Unable to find valid sender in routing table (sender: " + KadIPToString(ip) + ")");
+			AddDebugLogLineN(logKadRouting,
+				"Unable to find valid sender in routing table (sender: " + KadIPToString(ip) +
+					")");
 		} else {
-			AddDebugLogLineN(logKadRouting, "Verified contact with legacy challenge (Kad2Ping) - " + KadIPToString(ip));
+			AddDebugLogLineN(logKadRouting,
+				"Verified contact with legacy challenge (Kad2Ping) - " + KadIPToString(ip));
 		}
-		return;	// we do not actually care for its other content
+		return; // we do not actually care for its other content
 	}
 
 	if (CKademlia::GetPrefs()->FindExternKadPort(false)) {
-		// the reported port doesn't always have to be our true external port, esp. if we used our intern port
-		// and communicated recently with the client some routers might remember this and assign the intern port as source
-		// but this shouldn't be a problem because we prefer intern ports anyway.
-		// might have to be reviewed in later versions when more data is available
+		// The reported port does not always have to be our true external port, especially
+		// if we used our internal port and communicated with the client recently -- some
+		// routers remember that and assign the internal port as source. Not a problem,
+		// since we prefer internal ports anyway. May want reviewing in later versions when
+		// more data is available.
 		CKademlia::GetPrefs()->SetExternKadPort(PeekUInt16(packetData), ip);
 
 		if (CUDPFirewallTester::IsFWCheckUDPRunning()) {
@@ -1590,23 +1808,36 @@
 
 	uint8_t errorCode = PeekUInt8(packetData);
 	uint16_t incomingPort = PeekUInt16(packetData + 1);
-	if ((incomingPort != CKademlia::GetPrefs()->GetExternalKadPort() && incomingPort != CKademlia::GetPrefs()->GetInternKadPort()) || incomingPort == 0) {
-		AddDebugLogLineN(logClientKadUDP, CFormat("Received UDP FirewallCheck on unexpected incoming port %u from %s") % incomingPort % KadIPToString(ip));
+	if ((incomingPort != CKademlia::GetPrefs()->GetExternalKadPort() &&
+		    incomingPort != CKademlia::GetPrefs()->GetInternKadPort()) ||
+		incomingPort == 0) {
+		AddDebugLogLineN(logClientKadUDP,
+			CFormat("Received UDP FirewallCheck on unexpected incoming port %u from %s") %
+				incomingPort % KadIPToString(ip));
 		CUDPFirewallTester::SetUDPFWCheckResult(false, true, ip, 0);
 	} else if (errorCode == 0) {
-		AddDebugLogLineN(logClientKadUDP, CFormat("Received UDP FirewallCheck packet from %s with incoming port %u") % KadIPToString(ip) % incomingPort);
+		AddDebugLogLineN(logClientKadUDP,
+			CFormat("Received UDP FirewallCheck packet from %s with incoming port %u") %
+				KadIPToString(ip) % incomingPort);
 		CUDPFirewallTester::SetUDPFWCheckResult(true, false, ip, incomingPort);
 	} else {
-		AddDebugLogLineN(logClientKadUDP, CFormat("Received UDP FirewallCheck packet from %s with incoming port %u with remote errorcode %u - ignoring result")
-			% KadIPToString(ip) % incomingPort % errorCode);
+		AddDebugLogLineN(logClientKadUDP,
+			CFormat("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);
 	}
 }
 
-void CKademliaUDPListener::SendPacket(const CMemFile &data, uint8_t opcode, uint32_t destinationHost, uint16_t destinationPort, const CKadUDPKey& targetKey, const CUInt128* cryptTargetID)
+void CKademliaUDPListener::SendPacket(const CMemFile &data,
+	uint8_t opcode,
+	uint32_t destinationHost,
+	uint16_t destinationPort,
+	const CKadUDPKey &targetKey,
+	const CUInt128 *cryptTargetID)
 {
 	AddTrackedOutPacket(destinationHost, opcode);
-	CPacket* packet = new CPacket(data, OP_KADEMLIAHEADER, opcode);
+	CPacket *packet = new CPacket(data, OP_KADEMLIAHEADER, opcode);
 	if (packet->GetPacketSize() > 200) {
 		packet->PackPacket();
 	}
@@ -1619,7 +1850,13 @@
 		cryptKey = NULL;
 	}
 	theStats::AddUpOverheadKad(packet->GetPacketSize());
-	theApp->clientudp->SendPacket(packet, wxUINT32_SWAP_ALWAYS(destinationHost), destinationPort, true, cryptKey, true, targetKey.GetKeyValue(theApp->GetPublicIP(false)));
+	theApp->clientudp->SendPacket(packet,
+		wxUINT32_SWAP_ALWAYS(destinationHost),
+		destinationPort,
+		true,
+		cryptKey,
+		true,
+		targetKey.GetKeyValue(theApp->GetPublicIP(false)));
 }
 
 #if 0
@@ -1637,32 +1874,33 @@
 }
 #endif
 
-void CKademliaUDPListener::ExpireClientSearch(CKadClientSearcher* expireImmediately)
+void CKademliaUDPListener::ExpireClientSearch(CKadClientSearcher *expireImmediately)
 {
 	uint64_t now = ::GetTickCount64();
-	for (FetchNodeIDList::iterator it = m_fetchNodeIDRequests.begin(); it != m_fetchNodeIDRequests.end();) {
+	for (FetchNodeIDList::iterator it = m_fetchNodeIDRequests.begin();
+		it != m_fetchNodeIDRequests.end();) {
 		FetchNodeIDList::iterator it2 = it++;
 		if (it2->requester == expireImmediately) {
 			m_fetchNodeIDRequests.erase(it2);
-		}
-		else if (it2->expire < now) {
+		} else if (it2->expire < now) {
 			it2->requester->KadSearchNodeIDByIPResult(KCSR_TIMEOUT, NULL);
 			m_fetchNodeIDRequests.erase(it2);
 		}
 	}
 }
 
-void CKademliaUDPListener::SendLegacyChallenge(uint32_t ip, uint16_t port, const CUInt128& contactID)
+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,
-	// which is our challenge. If we receive an answer packet for this request, we can be sure the
-	// contact is not spoofed
+	// We want to verify that a pre-0.49a contact is valid and not sent from a spoofed IP. Those
+	// versions support no direct validation, so we send a KAD_REQ with a random ID as our
+	// challenge; an answer packet for that request proves the contact is not spoofed.
 #ifdef __DEBUG__
-	CContact* contact = CKademlia::GetRoutingZone()->GetContact(contactID);
+	CContact *contact = CKademlia::GetRoutingZone()->GetContact(contactID);
 	if (contact != NULL) {
 		if (contact->GetType() < 2) {
-			AddDebugLogLineN(logKadRouting, "Sending challenge to a long known contact (should be verified already) - " + KadIPToString(ip));
+			AddDebugLogLineN(logKadRouting,
+				"Sending challenge to a long known contact (should be verified already) - " +
+					KadIPToString(ip));
 		}
 	} else {
 		wxFAIL;

amule-3.0.1.tar.gz/src/kademlia/net/KademliaUDPListener.h -> amule-3.1.0.tar.gz/src/kademlia/net/KademliaUDPListener.h Changed

@@ -36,8 +36,8 @@
 there client on the eMule forum..
 */
 
-#ifndef __KAD_UDP_LISTENER_H__
-#define __KAD_UDP_LISTENER_H__
+#ifndef KADEMLIAUDPLISTENER_H
+#define KADEMLIAUDPLISTENER_H
 
 #include "../utils/UInt128.h"
 #include "../../Tag.h"
@@ -45,95 +45,215 @@
 
 #include <list>
 
-
 class CMemFile;
 struct SSearchTerm;
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
 class CContact;
 class CKadUDPKey;
 class CKadClientSearcher;
 
-struct FetchNodeID_Struct {
+struct FetchNodeID_Struct
+{
 	uint32_t ip;
 	uint32_t tcpPort;
 	uint64_t expire;
-	CKadClientSearcher* requester;
+	CKadClientSearcher *requester;
 };
 
-#define DebugSendF(what, ip, port)	AddDebugLogLineN(logClientKadUDP, what + wxString(" to ") + KadIPPortToString(ip, port))
-#define DebugRecvF(what, ip, port)	AddDebugLogLineN(logClientKadUDP, what + wxString(" 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)
+#define DebugSendF(what, ip, port) \
+	AddDebugLogLineN(logClientKadUDP, what + wxString(" to ") + KadIPPortToString(ip, port))
+#define DebugRecvF(what, ip, port) \
+	AddDebugLogLineN(logClientKadUDP, what + wxString(" 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)
 
 class CKademliaUDPListener : public CPacketTracking
 {
 public:
 	~CKademliaUDPListener();
-	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);
-	void SendPublishSourcePacket(const CContact& contact, const CUInt128& targetID, const CUInt128& contactID, const TagPtrList& tags);
-	virtual void ProcessPacket(const uint8_t* data, uint32_t lenData, uint32_t ip, uint16_t port, bool validReceiverKey, const CKadUDPKey& senderKey);
-	void SendPacket(const CMemFile& data, uint8_t opcode, uint32_t destinationHost, uint16_t destinationPort, const CKadUDPKey& targetKey, const CUInt128* cryptTargetID);
-
-//	bool FindNodeIDByIP(CKadClientSearcher *requester, uint32_t ip, uint16_t tcpPort, uint16_t udpPort);
+	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);
+	void SendPublishSourcePacket(const CContact &contact,
+		const CUInt128 &targetID,
+		const CUInt128 &contactID,
+		const TagPtrList &tags);
+	virtual void ProcessPacket(const uint8_t *data,
+		uint32_t lenData,
+		uint32_t ip,
+		uint16_t port,
+		bool validReceiverKey,
+		const CKadUDPKey &senderKey);
+	void SendPacket(const CMemFile &data,
+		uint8_t opcode,
+		uint32_t destinationHost,
+		uint16_t destinationPort,
+		const CKadUDPKey &targetKey,
+		const CUInt128 *cryptTargetID);
+
+	//	bool FindNodeIDByIP(CKadClientSearcher *requester, uint32_t ip, uint16_t tcpPort, uint16_t
+	// udpPort);
 	void ExpireClientSearch(CKadClientSearcher *expireImmediately = NULL);
+
 private:
-	static SSearchTerm* CreateSearchExpressionTree(CMemFile& bio, int iLevel);
-	static void Free(SSearchTerm* pSearchTerms);
+	static SSearchTerm *CreateSearchExpressionTree(CMemFile &bio, int iLevel);
+	static void Free(SSearchTerm *pSearchTerms);
 
 	// Kad1.0
-	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 ProcessPublishResponse		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip);
-	void ProcessSearchNotesResponse		(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);
-	void ProcessFindBuddyRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void ProcessFindBuddyResponse		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void ProcessCallbackRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
+	void SendLegacyChallenge(uint32_t ip, uint16_t port, const CUInt128 &contactID);
+
+	// The sender's address travels with every search response so CSearch can look the answering
+	// contact up and gate version-dependent result tags on its advertised Kad version.
+	void ProcessSearchResponse(CMemFile &bio, uint32_t fromIP, uint16_t fromPort);
+	void ProcessSearchResponse(
+		const uint8_t *packetData, uint32_t lenPacket, uint32_t fromIP, uint16_t fromPort);
+	void ProcessPublishResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip);
+	void ProcessSearchNotesResponse(
+		const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port);
+	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);
+	void ProcessFindBuddyRequest(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void ProcessFindBuddyResponse(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void ProcessCallbackRequest(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
 
 	// Kad2.0
-	bool AddContact2(const uint8_t* data, uint32_t lenData, uint32_t ip, uint16_t& port, uint8_t* outVersion, const CKadUDPKey& key, bool& ipVerified, bool update, bool fromHelloReq, bool* outRequestsACK, CUInt128* outContactID);
-
-	void Process2BootstrapRequest		(uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void Process2BootstrapResponse		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey, bool validReceiverKey);
-	void Process2HelloRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey, bool validReceiverKey);
-	void Process2HelloResponse		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey, bool validReceiverKey);
-	void Process2HelloResponseAck		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, bool validReceiverKey);
-	void ProcessKademlia2Request		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void ProcessKademlia2Response		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void Process2SearchNotesRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void Process2SearchKeyRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void Process2SearchSourceRequest	(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void Process2SearchResponse		(const uint8_t* packetData, uint32_t lenPacket, const CKadUDPKey& senderKey);
-	void Process2PublishNotesRequest	(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void Process2PublishKeyRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void Process2PublishSourceRequest	(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void Process2PublishResponse		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void Process2Ping			(uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
-	void Process2Pong			(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip);
-	void Process2FirewallUDP		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip);
-	void ProcessFirewalled2Request		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
+	bool AddContact2(const uint8_t *data,
+		uint32_t lenData,
+		uint32_t ip,
+		uint16_t &port,
+		uint8_t *outVersion,
+		const CKadUDPKey &key,
+		bool &ipVerified,
+		bool update,
+		bool fromHelloReq,
+		bool *outRequestsACK,
+		CUInt128 *outContactID);
+
+	void Process2BootstrapRequest(uint32_t ip, uint16_t port, const CKadUDPKey &senderKey);
+	void Process2BootstrapResponse(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey,
+		bool validReceiverKey);
+	void Process2HelloRequest(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey,
+		bool validReceiverKey);
+	void Process2HelloResponse(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey,
+		bool validReceiverKey);
+	void Process2HelloResponseAck(
+		const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, bool validReceiverKey);
+	void ProcessKademlia2Request(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void ProcessKademlia2Response(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void Process2SearchNotesRequest(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void Process2SearchKeyRequest(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void Process2SearchSourceRequest(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void Process2SearchResponse(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void Process2PublishNotesRequest(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void Process2PublishKeyRequest(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void Process2PublishSourceRequest(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void Process2PublishResponse(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
+	void Process2Ping(uint32_t ip, uint16_t port, const CKadUDPKey &senderKey);
+	void Process2Pong(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip);
+	void Process2FirewallUDP(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip);
+	void ProcessFirewalled2Request(const uint8_t *packetData,
+		uint32_t lenPacket,
+		uint32_t ip,
+		uint16_t port,
+		const CKadUDPKey &senderKey);
 
 	// Debug
-//	void DebugClientOutput(const wxString& place, uint32_t kad_ip, uint32_t port, const uint8_t* data = NULL, int len = 0);
+	//	void DebugClientOutput(const wxString& place, uint32_t kad_ip, uint32_t port,
+	//	    const uint8_t* data = NULL, int len = 0);
 
-	typedef std::list<FetchNodeID_Struct>	FetchNodeIDList;
+	typedef std::list<FetchNodeID_Struct> FetchNodeIDList;
 	FetchNodeIDList m_fetchNodeIDRequests;
 };
 
-} // End namespace
+} // namespace Kademlia
 
-#endif //__KAD_UDP_LISTENER_H__
+#endif // KADEMLIAUDPLISTENER_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/kademlia/net/PacketTracking.cpp -> amule-3.1.0.tar.gz/src/kademlia/net/PacketTracking.cpp Changed

@@ -36,10 +36,8 @@
 #include <protocol/kad/Client2Client/UDP.h>
 #include <protocol/kad2/Client2Client/UDP.h>
 
-
 using namespace Kademlia;
 
-
 CPacketTracking::~CPacketTracking()
 {
 	DeleteContents(m_mapTrackPacketsIn);
@@ -47,8 +45,8 @@
 
 void CPacketTracking::AddTrackedOutPacket(uint32_t ip, uint8_t opcode)
 {
-	// this tracklist tacks _outgoing_ request packets, to make sure incoming answer packets were requested
-	// only track packets which we actually check for later
+	// this tracklist tacks _outgoing_ request packets, to make sure incoming answer packets were
+	// requested only track packets which we actually check for later
 	if (!IsTrackedOutListRequestPacket(opcode)) {
 		return;
 	}
@@ -67,22 +65,22 @@
 bool CPacketTracking::IsTrackedOutListRequestPacket(uint8_t opcode) noexcept
 {
 	switch (opcode) {
-	 case KADEMLIA2_BOOTSTRAP_REQ:
-	 case KADEMLIA2_HELLO_REQ:
-	 case KADEMLIA2_HELLO_RES:
-	 case KADEMLIA2_REQ:
-	 case KADEMLIA_SEARCH_NOTES_REQ:
-	 case KADEMLIA2_SEARCH_NOTES_REQ:
-	 case KADEMLIA_PUBLISH_REQ:
-	 case KADEMLIA2_PUBLISH_KEY_REQ:
-	 case KADEMLIA2_PUBLISH_SOURCE_REQ:
-	 case KADEMLIA2_PUBLISH_NOTES_REQ:
-	 case KADEMLIA_FINDBUDDY_REQ:
-	 case KADEMLIA_CALLBACK_REQ:
-	 case KADEMLIA2_PING:
-		 return true;
-	 default:
-		 return false;
+	case KADEMLIA2_BOOTSTRAP_REQ:
+	case KADEMLIA2_HELLO_REQ:
+	case KADEMLIA2_HELLO_RES:
+	case KADEMLIA2_REQ:
+	case KADEMLIA_SEARCH_NOTES_REQ:
+	case KADEMLIA2_SEARCH_NOTES_REQ:
+	case KADEMLIA_PUBLISH_REQ:
+	case KADEMLIA2_PUBLISH_KEY_REQ:
+	case KADEMLIA2_PUBLISH_SOURCE_REQ:
+	case KADEMLIA2_PUBLISH_NOTES_REQ:
+	case KADEMLIA_FINDBUDDY_REQ:
+	case KADEMLIA_CALLBACK_REQ:
+	case KADEMLIA2_PING:
+		return true;
+	default:
+		return false;
 	}
 }
 
@@ -90,11 +88,12 @@
 {
 #ifdef __DEBUG__
 	if (!IsTrackedOutListRequestPacket(opcode)) {
-		wxFAIL;	// code error / bug
+		wxFAIL; // code error / bug
 	}
 #endif
 	uint64_t now = ::GetTickCount64();
-	for (TrackedPacketList::iterator it = listTrackedRequests.begin(); it != listTrackedRequests.end(); ++it) {
+	for (TrackedPacketList::iterator it = listTrackedRequests.begin(); it != listTrackedRequests.end();
+		++it) {
 		if (it->ip == ip && it->opcode == opcode && now - it->inserted < SEC2MS(180)) {
 			if (!dontRemove) {
 				listTrackedRequests.erase(it);
@@ -107,63 +106,64 @@
 
 bool CPacketTracking::InTrackListIsAllowedPacket(uint32_t ip, uint8_t opcode, bool /*bValidSenderkey*/)
 {
-	// this tracklist tacks _incoming_ request packets and acts as a general flood protection by dropping
-	// too frequent requests from a single IP, avoiding response floods, processing time DOS attacks and slowing down
-	// other possible attacks/behavior (scanning indexed files, fake publish floods, etc)
+	// This tracklist tracks _incoming_ request packets and acts as general flood protection,
+	// dropping too-frequent requests from a single IP. That avoids response floods and
+	// processing-time DOS attacks, and slows other possible attacks such as scanning indexed
+	// files or fake publish floods.
 
-	// first figure out if this is a request packet to be tracked and its timelimits
-	// timelimits are chosen by estimating the max. frequency of such packets on normal operation (+ buffer)
-	// (those limits are not meant to be fine to be used by normal usage, but only supposed to be a flood detection)
+	// First figure out whether this is a request packet to be tracked, and its time limits. The
+	// limits come from the estimated maximum frequency of such packets in normal operation,
+	// plus a buffer -- they are flood detection, not a guide to normal usage.
 
 	uint32_t allowedPacketsPerMinute;
-	DEBUG_ONLY( const uint8_t dbgOrgOpcode = opcode; )
+	DEBUG_ONLY(const uint8_t dbgOrgOpcode = opcode;)
 
 	switch (opcode) {
-		case KADEMLIA2_BOOTSTRAP_REQ:
-			allowedPacketsPerMinute = 2;
-			break;
-		case KADEMLIA2_HELLO_REQ:
-			allowedPacketsPerMinute = 3;
-			break;
-		case KADEMLIA2_REQ:
-			allowedPacketsPerMinute = 10;
-			break;
-		case KADEMLIA2_SEARCH_NOTES_REQ:
-			allowedPacketsPerMinute = 3;
-			break;
-		case KADEMLIA2_SEARCH_KEY_REQ:
-			allowedPacketsPerMinute = 3;
-			break;
-		case KADEMLIA2_SEARCH_SOURCE_REQ:
-			allowedPacketsPerMinute = 3;
-			break;
-		case KADEMLIA2_PUBLISH_KEY_REQ:
-			allowedPacketsPerMinute = 3;
-			break;
-		case KADEMLIA2_PUBLISH_SOURCE_REQ:
-			allowedPacketsPerMinute = 2;
-			break;
-		case KADEMLIA2_PUBLISH_NOTES_REQ:
-			allowedPacketsPerMinute = 2;
-			break;
-		case KADEMLIA_FIREWALLED2_REQ:
-			opcode = KADEMLIA_FIREWALLED_REQ;
-		/* fall through */
-		case KADEMLIA_FIREWALLED_REQ:
-			allowedPacketsPerMinute = 2;
-			break;
-		case KADEMLIA_FINDBUDDY_REQ:
-			allowedPacketsPerMinute = 2;
-			break;
-		case KADEMLIA_CALLBACK_REQ:
-			allowedPacketsPerMinute = 1;
-			break;
-		case KADEMLIA2_PING:
-			allowedPacketsPerMinute = 2;
-			break;
-		default:
-			// not any request packets, so it's a response packet - no further checks on this point
-			return true;
+	case KADEMLIA2_BOOTSTRAP_REQ:
+		allowedPacketsPerMinute = 2;
+		break;
+	case KADEMLIA2_HELLO_REQ:
+		allowedPacketsPerMinute = 3;
+		break;
+	case KADEMLIA2_REQ:
+		allowedPacketsPerMinute = 10;
+		break;
+	case KADEMLIA2_SEARCH_NOTES_REQ:
+		allowedPacketsPerMinute = 3;
+		break;
+	case KADEMLIA2_SEARCH_KEY_REQ:
+		allowedPacketsPerMinute = 3;
+		break;
+	case KADEMLIA2_SEARCH_SOURCE_REQ:
+		allowedPacketsPerMinute = 3;
+		break;
+	case KADEMLIA2_PUBLISH_KEY_REQ:
+		allowedPacketsPerMinute = 3;
+		break;
+	case KADEMLIA2_PUBLISH_SOURCE_REQ:
+		allowedPacketsPerMinute = 2;
+		break;
+	case KADEMLIA2_PUBLISH_NOTES_REQ:
+		allowedPacketsPerMinute = 2;
+		break;
+	case KADEMLIA_FIREWALLED2_REQ:
+		opcode = KADEMLIA_FIREWALLED_REQ;
+	/* fall through */
+	case KADEMLIA_FIREWALLED_REQ:
+		allowedPacketsPerMinute = 2;
+		break;
+	case KADEMLIA_FINDBUDDY_REQ:
+		allowedPacketsPerMinute = 2;
+		break;
+	case KADEMLIA_CALLBACK_REQ:
+		allowedPacketsPerMinute = 1;
+		break;
+	case KADEMLIA2_PING:
+		allowedPacketsPerMinute = 2;
+		break;
+	default:
+		// not any request packets, so it's a response packet - no further checks on this point
+		return true;
 	}
 
 	const uint32_t secondsPerPacket = 60 / allowedPacketsPerMinute;
@@ -186,40 +186,52 @@
 	}
 
 	// search specific request tracks
-	for (TrackPacketsIn_Struct::TrackedRequestList::iterator it = trackEntry->m_trackedRequests.begin(); it != trackEntry->m_trackedRequests.end(); ++it) {
+	for (TrackPacketsIn_Struct::TrackedRequestList::iterator it = trackEntry->m_trackedRequests.begin();
+		it != trackEntry->m_trackedRequests.end();
+		++it) {
 		if (it->m_opcode == opcode) {
 			// already tracked requests with this opcode, remove already expired request counts
 			if (it->m_count > 0 && currentTick - it->m_firstAdded > SEC2MS(secondsPerPacket)) {
-				uint32_t removeCount = (currentTick - it->m_firstAdded) / SEC2MS(secondsPerPacket);
+				uint32_t removeCount =
+					(currentTick - it->m_firstAdded) / SEC2MS(secondsPerPacket);
 				if (removeCount > it->m_count) {
 					it->m_count = 0;
 					it->m_firstAdded = currentTick; // for the packet we just process
 				} else {
 					it->m_count -= removeCount;
-					it->m_firstAdded += static_cast<uint64_t>(SEC2MS(secondsPerPacket)) * removeCount;
+					it->m_firstAdded +=
+						static_cast<uint64_t>(SEC2MS(secondsPerPacket)) * removeCount;
 				}
 			}
 			// we increase the counter in any case, even if we drop the packet later
 			it->m_count++;
 			// remember only for easier cleanup
-			trackEntry->m_lastExpire = std::max(trackEntry->m_lastExpire, it->m_firstAdded + static_cast<uint64_t>(SEC2MS(secondsPerPacket)) * it->m_count);
+			trackEntry->m_lastExpire = std::max(trackEntry->m_lastExpire,
+				it->m_firstAdded +
+					static_cast<uint64_t>(SEC2MS(secondsPerPacket)) * it->m_count);
 
 			if (CKademlia::IsRunningInLANMode() && ::IsLanIP(wxUINT32_SWAP_ALWAYS(ip))) {
-				return true;	// no flood detection in LAN mode
+				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
-				AddDebugLogLineN(logKadPacketTracking, CFormat("Massive request flood detected for opcode 0x%X (0x%X) from IP %s - Banning IP") % opcode % dbgOrgOpcode % KadIPToString(ip));
+				// 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
+				AddDebugLogLineN(logKadPacketTracking,
+					CFormat("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;
-					AddDebugLogLineN(logKadPacketTracking, CFormat("Request flood detected for opcode 0x%X (0x%X) from IP %s - Dropping packets with this opcode") % opcode % dbgOrgOpcode % KadIPToString(ip));
+					AddDebugLogLineN(logKadPacketTracking,
+						CFormat("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 {
@@ -244,26 +256,32 @@
 void CPacketTracking::InTrackListCleanup()
 {
 	const uint64_t currentTick = ::GetTickCount64();
-	DEBUG_ONLY( 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();) {
+	for (TrackedPacketInMap::iterator it = m_mapTrackPacketsIn.begin();
+		it != m_mapTrackPacketsIn.end();) {
 		TrackedPacketInMap::iterator it2 = it++;
 		if (it2->second->m_lastExpire < currentTick) {
 			delete it2->second;
 			m_mapTrackPacketsIn.erase(it2);
 		}
 	}
-	AddDebugLogLineN(logKadPacketTracking, CFormat("Cleaned up Kad Incoming Requests Tracklist, entries before: %u, after %u") % dbgOldSize % m_mapTrackPacketsIn.size());
+	AddDebugLogLineN(logKadPacketTracking,
+		CFormat("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)
+void CPacketTracking::AddLegacyChallenge(
+	const CUInt128 &contactID, const CUInt128 &challengeID, uint32_t ip, uint8_t opcode)
 {
 	uint64_t now = ::GetTickCount64();
 	TrackChallenge_Struct sTrack = { ip, now, opcode, contactID, challengeID };
 	listChallengeRequests.push_front(sTrack);
 	while (!listChallengeRequests.empty()) {
 		if (now - listChallengeRequests.back().inserted > SEC2MS(180)) {
-			AddDebugLogLineN(logKadPacketTracking, "Challenge timed out, client not verified - " + KadIPToString(listChallengeRequests.back().ip));
+			AddDebugLogLineN(logKadPacketTracking,
+				"Challenge timed out, client not verified - " +
+					KadIPToString(listChallengeRequests.back().ip));
 			listChallengeRequests.pop_back();
 		} else {
 			break;
@@ -271,11 +289,13 @@
 	}
 }
 
-bool CPacketTracking::IsLegacyChallenge(const CUInt128& challengeID, uint32_t ip, uint8_t opcode, CUInt128& contactID)
+bool CPacketTracking::IsLegacyChallenge(
+	const CUInt128 &challengeID, uint32_t ip, uint8_t opcode, CUInt128 &contactID)
 {
 	uint64_t now = ::GetTickCount64();
-	DEBUG_ONLY( bool warning = false; )
-	for (TrackChallengeList::iterator it = listChallengeRequests.begin(); it != listChallengeRequests.end();) {
+	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)) {
 			wxASSERT(it2->challenge != 0 || opcode == KADEMLIA2_PING);
@@ -284,13 +304,14 @@
 				listChallengeRequests.erase(it2);
 				return true;
 			} else {
-				DEBUG_ONLY( warning = true; )
+				DEBUG_ONLY(warning = true;)
 			}
 		}
 	}
 #ifdef __DEBUG__
 	if (warning) {
-		AddDebugLogLineN(logKadPacketTracking, "Wrong challenge answer received, client not verified (" + KadIPToString(ip) + ")");
+		AddDebugLogLineN(logKadPacketTracking,
+			"Wrong challenge answer received, client not verified (" + KadIPToString(ip) + ")");
 	}
 #endif
 	return false;
@@ -299,7 +320,9 @@
 bool CPacketTracking::HasActiveLegacyChallenge(uint32_t ip) const
 {
 	uint64_t now = ::GetTickCount64();
-	for (TrackChallengeList::const_iterator it = listChallengeRequests.begin(); it != listChallengeRequests.end(); ++it) {
+	for (TrackChallengeList::const_iterator it = listChallengeRequests.begin();
+		it != listChallengeRequests.end();
+		++it) {
 		if (it->ip == ip && now - it->inserted <= SEC2MS(180)) {
 			return true;
 		}

amule-3.0.1.tar.gz/src/kademlia/net/PacketTracking.h -> amule-3.1.0.tar.gz/src/kademlia/net/PacketTracking.h Changed

@@ -35,26 +35,30 @@
 namespace Kademlia
 {
 
-struct TrackPackets_Struct {
+struct TrackPackets_Struct
+{
 	uint32_t ip;
 	uint64_t inserted;
-	uint8_t  opcode;
+	uint8_t opcode;
 };
 
-struct TrackChallenge_Struct {
-	uint32_t	ip;
-	uint64_t	inserted;
-	uint8_t		opcode;
-	CUInt128	contactID;
-	CUInt128	challenge;
+struct TrackChallenge_Struct
+{
+	uint32_t ip;
+	uint64_t inserted;
+	uint8_t opcode;
+	CUInt128 contactID;
+	CUInt128 challenge;
 };
 
-struct TrackPacketsIn_Struct {
-	struct TrackedRequestIn_Struct {
+struct TrackPacketsIn_Struct
+{
+	struct TrackedRequestIn_Struct
+	{
 		uint32_t m_count;
 		uint64_t m_firstAdded;
-		uint8_t	 m_opcode;
-		bool	 m_dbgLogged;
+		uint8_t m_opcode;
+		bool m_dbgLogged;
 	};
 
 	TrackPacketsIn_Struct()
@@ -65,34 +69,35 @@
 
 	uint32_t m_ip;
 	uint64_t m_lastExpire;
-	typedef std::list<TrackedRequestIn_Struct>	TrackedRequestList;
-	TrackedRequestList	m_trackedRequests;
+	typedef std::list<TrackedRequestIn_Struct> TrackedRequestList;
+	TrackedRequestList m_trackedRequests;
 };
 
 class CPacketTracking
 {
-      public:
+public:
 	CPacketTracking() noexcept { lastTrackInCleanup = 0; }
 	virtual ~CPacketTracking();
 
-      protected:
+protected:
 	void AddTrackedOutPacket(uint32_t ip, uint8_t opcode);
 	bool IsOnOutTrackList(uint32_t ip, uint8_t opcode, bool dontRemove = false);
 	bool InTrackListIsAllowedPacket(uint32_t ip, uint8_t opcode, bool validReceiverkey);
 	void InTrackListCleanup();
-	void AddLegacyChallenge(const CUInt128& contactID, const CUInt128& challengeID, uint32_t ip, uint8_t opcode);
-	bool IsLegacyChallenge(const CUInt128& challengeID, uint32_t ip, uint8_t opcode, CUInt128& contactID);
+	void AddLegacyChallenge(
+		const CUInt128 &contactID, const CUInt128 &challengeID, uint32_t ip, uint8_t opcode);
+	bool IsLegacyChallenge(const CUInt128 &challengeID, uint32_t ip, uint8_t opcode, CUInt128 &contactID);
 	bool HasActiveLegacyChallenge(uint32_t ip) const;
 
-      private:
+private:
 	static bool IsTrackedOutListRequestPacket(uint8_t opcode) noexcept;
-	typedef std::list<TrackPackets_Struct>		TrackedPacketList;
-	typedef std::list<TrackChallenge_Struct>	TrackChallengeList;
-	typedef std::map<uint32_t, TrackPacketsIn_Struct*>	TrackedPacketInMap;
-	TrackedPacketList	listTrackedRequests;
-	TrackChallengeList	listChallengeRequests;
-	TrackedPacketInMap	m_mapTrackPacketsIn;
-	uint64_t		lastTrackInCleanup;
+	typedef std::list<TrackPackets_Struct> TrackedPacketList;
+	typedef std::list<TrackChallenge_Struct> TrackChallengeList;
+	typedef std::map<uint32_t, TrackPacketsIn_Struct *> TrackedPacketInMap;
+	TrackedPacketList listTrackedRequests;
+	TrackChallengeList listChallengeRequests;
+	TrackedPacketInMap m_mapTrackPacketsIn;
+	uint64_t lastTrackInCleanup;
 };
 
 } // namespace Kademlia

amule-3.1.0.tar.gz/src/kademlia/net/SafeKad.cpp Added

@@ -0,0 +1,351 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// Copyright (c) 2026 eMule AI
+//
+// 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 "SafeKad.h"
+
+namespace Kademlia
+{
+
+CSafeKad safeKad;
+
+CSafeKad::CSafeKad()
+: m_lastCleanup(0)
+{
+}
+
+void CSafeKad::Clear()
+{
+	m_trackedNodes.Clear();
+	m_problematicNodes.Clear();
+	m_bannedAddresses.Clear();
+	m_lastCleanup = 0;
+}
+
+bool CSafeKad::TrackNode(
+	uint32_t ip, uint16_t port, const CUInt128 &id, bool idVerified, time_t now, bool *newlyBanned)
+{
+	if (newlyBanned) {
+		*newlyBanned = false;
+	}
+
+	if (IsBanned(ip, now)) {
+		return false;
+	}
+
+	const SKadNodeAddress address(ip, port);
+	CKadAgedMap<SKadNodeAddress, sTracked>::iterator it = m_trackedNodes.Find(address);
+	if (it == m_trackedNodes.End()) {
+		Cleanup(now); // make room for a new node to track
+		if (m_trackedNodes.Size() >= MAX_TRACKED_NODES) {
+			// Still full of entries too recent to drop: evict the least recently
+			// referenced one anyway, because refusing to track is worse than forgetting
+			// the oldest node -- an untracked node gets no identity checks at all.
+			m_trackedNodes.Erase(m_trackedNodes.OldestKey());
+		}
+		sTracked tracked;
+		tracked.m_lastID = id;
+		tracked.m_lastIDChange = now;
+		tracked.m_lastReferenced = now;
+		tracked.m_idVerified = idVerified;
+		m_trackedNodes.Set(address, tracked);
+		return true;
+	}
+
+	sTracked tracked = it->second;
+	bool accepted = true;
+	if (id != tracked.m_lastID) {
+		// A verified identity is not replaced by an unverified claim: otherwise anyone able
+		// to spoof a source address could rewrite our view of a node that has actually
+		// proved who it is.
+		if (tracked.m_idVerified && !idVerified) {
+			accepted = false;
+		} else if (now - tracked.m_lastIDChange < MIN_ID_CHANGE_INTERVAL) {
+			// Rotating identity faster than once an hour. Mark the address problematic,
+			// and escalate to a ban if it was problematic already -- one rejected
+			// change is a plausible accident, two inside 300 s is not.
+			//
+			// idVerified gates the escalation, not the refusal. The rotation is refused
+			// either way, but only a peer that has proved which port it listens on can
+			// be banned for it: otherwise two fabricated mentions of an honest node ban
+			// it, which is the attack the verification exists to stop.
+			accepted = false;
+			if (idVerified) {
+				const bool banned = Escalate(ip, port, now);
+				if (newlyBanned) {
+					*newlyBanned = banned;
+				}
+			}
+		} else {
+			tracked.m_lastID = id;
+			tracked.m_lastIDChange = now;
+		}
+	}
+
+	// A verified entry is the protection itself, so refused traffic keeps it alive: letting it
+	// age out would mean an attacker only has to keep claiming a new ID until NODE_MAX_
+	// REFERENCE_AGE passes, and the identity it could not overwrite is reclaimed for it.
+	//
+	// An entry that is only ever refused and was never verified is the opposite case. It holds
+	// an ID nobody proved, so an attacker who merely spoke first from an address owns it, and
+	// every refused packet from the honest node at that address would renew the entry that is
+	// refusing it. Letting that one expire is what gives the honest node a way back.
+	if (accepted || tracked.m_idVerified) {
+		tracked.m_lastReferenced = now;
+	}
+	// Verification is sticky: a node that once proved its identity is not downgraded by a
+	// later unverified packet. Only on the accepted path, though: promoting here after a
+	// refusal would raise the flag for a claim we just rejected, while m_lastID still holds
+	// the previous one, marking an unproven ID verified and unlocking the escalation ladder
+	// against whoever actually holds the address.
+	if (accepted && !tracked.m_idVerified) {
+		tracked.m_idVerified = idVerified;
+	}
+	// The ban above may have dropped this entry, so only write it back if
+	// the address is still trackable.
+	if (!IsBanned(ip, now)) {
+		m_trackedNodes.Set(address, tracked);
+	} else {
+		m_trackedNodes.Erase(address);
+	}
+	return accepted;
+}
+
+bool CSafeKad::Escalate(uint32_t ip, uint16_t port, time_t now)
+{
+	if (IsProblematic(ip, port, now)) {
+		return BanAddress(ip, now);
+	}
+
+	TrackProblematicNode(ip, port, now);
+	return false;
+}
+
+void CSafeKad::TrackProblematicNode(uint32_t ip, uint16_t port, time_t now)
+{
+	if (IsBanned(ip, now)) {
+		return; // already covered by the stronger measure
+	}
+
+	const SKadNodeAddress address(ip, port);
+	CKadAgedMap<SKadNodeAddress, sProblematic>::iterator it = m_problematicNodes.Find(address);
+	sProblematic problematic;
+	if (it == m_problematicNodes.End()) {
+		Cleanup(now);
+		if (m_problematicNodes.Size() >= MAX_PROBLEMATIC_NODES) {
+			m_problematicNodes.Erase(m_problematicNodes.OldestKey());
+		}
+		problematic.m_failed = now;
+	} else {
+		problematic = it->second;
+	}
+	problematic.m_lastReferenced = now;
+	m_problematicNodes.Set(address, problematic);
+}
+
+bool CSafeKad::BanAddress(uint32_t ip, time_t now)
+{
+	Cleanup(now);
+
+	CKadAgedMap<uint32_t, sBanned>::iterator it = m_bannedAddresses.Find(ip);
+	// Read before the Set() below overwrites it: a repeat ban refreshes the
+	// entry rather than adding one, and the caller is counting addresses.
+	const bool isNew = (it == m_bannedAddresses.End());
+	sBanned banned;
+	if (it == m_bannedAddresses.End() && m_bannedAddresses.Size() >= MAX_BANNED_ADDRESSES) {
+		// A thousand simultaneously banned addresses means something much larger is going
+		// on than one bad node; drop the oldest ban rather than growing without bound.
+		m_bannedAddresses.Erase(m_bannedAddresses.OldestKey());
+	}
+	banned.m_banned = now;
+	banned.m_lastReferenced = now;
+	m_bannedAddresses.Set(ip, banned);
+
+	// A banned address is not worth tracking an identity for, and its problematic entries have
+	// been superseded by the stronger measure. The ban covers the address, so every port on it
+	// goes.
+	DropAllPortsOf(ip);
+
+	return isNew;
+}
+
+void CSafeKad::DropAllPortsOf(uint32_t ip)
+{
+	// Collect first, erase after: erasing invalidates the iterator, and the aged map has to see
+	// each removal individually to keep its age index in step.
+	std::vector<uint16_t> ports;
+	for (CKadAgedMap<SKadNodeAddress, sTracked>::iterator it =
+			m_trackedNodes.LowerBound(SKadNodeAddress(ip, 0));
+		it != m_trackedNodes.End() && it->first.m_ip == ip;
+		++it) {
+		ports.push_back(it->first.m_port);
+	}
+	for (const uint16_t port : ports) {
+		m_trackedNodes.Erase(SKadNodeAddress(ip, port));
+	}
+
+	ports.clear();
+	for (CKadAgedMap<SKadNodeAddress, sProblematic>::iterator it =
+			m_problematicNodes.LowerBound(SKadNodeAddress(ip, 0));
+		it != m_problematicNodes.End() && it->first.m_ip == ip;
+		++it) {
+		ports.push_back(it->first.m_port);
+	}
+	for (const uint16_t port : ports) {
+		m_problematicNodes.Erase(SKadNodeAddress(ip, port));
+	}
+}
+
+bool CSafeKad::IsBanned(uint32_t ip, time_t now)
+{
+	CKadAgedMap<uint32_t, sBanned>::iterator it = m_bannedAddresses.Find(ip);
+	if (it == m_bannedAddresses.End()) {
+		return false;
+	}
+	if (now - it->second.m_banned > MAX_BAN_TIME) {
+		// The ban has lapsed; from here the address is judged on its
+		// current behaviour alone.
+		m_bannedAddresses.Erase(ip);
+		return false;
+	}
+	sBanned banned = it->second;
+	banned.m_lastReferenced = now;
+	m_bannedAddresses.Set(ip, banned);
+	return true;
+}
+
+bool CSafeKad::IsProblematic(uint32_t ip, uint16_t port, time_t now)
+{
+	const SKadNodeAddress address(ip, port);
+	CKadAgedMap<SKadNodeAddress, sProblematic>::iterator it = m_problematicNodes.Find(address);
+	if (it != m_problematicNodes.End()) {
+		if (now - it->second.m_failed > MAX_PROBLEMATIC_TIME) {
+			m_problematicNodes.Erase(address);
+		} else {
+			sProblematic problematic = it->second;
+			problematic.m_lastReferenced = now;
+			m_problematicNodes.Set(address, problematic);
+			return true;
+		}
+	}
+	// A banned address is problematic by construction.
+	return IsBanned(ip, now);
+}
+
+bool CSafeKad::HasOtherTrackedPort(uint32_t ip, uint16_t port)
+{
+	CKadAgedMap<SKadNodeAddress, sTracked>::iterator it =
+		m_trackedNodes.LowerBound(SKadNodeAddress(ip, 0));
+	for (; it != m_trackedNodes.End() && it->first.m_ip == ip; ++it) {
+		if (it->first.m_port != port) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool CSafeKad::IsBadNode(uint32_t ip,
+	uint16_t port,
+	const CUInt128 &id,
+	uint8_t kadVersion,
+	bool idVerified,
+	bool onlyOneNodePerIP,
+	time_t now)
+{
+	if (now - m_lastCleanup > CLEANUP_INTERVAL) {
+		Cleanup(now);
+	}
+
+	if (IsBanned(ip, now)) {
+		m_trackedNodes.Erase(SKadNodeAddress(ip, port));
+		return true;
+	}
+
+	const SKadNodeAddress address(ip, port);
+	CKadAgedMap<SKadNodeAddress, sTracked>::iterator it = m_trackedNodes.Find(address);
+	if (it != m_trackedNodes.End()) {
+		if (it->second.m_lastID == id) {
+			// Same identity as before: just refresh the reference.
+			sTracked tracked = it->second;
+			tracked.m_lastReferenced = now;
+			if (!tracked.m_idVerified) {
+				tracked.m_idVerified = idVerified;
+			}
+			m_trackedNodes.Set(address, tracked);
+			return false;
+		}
+		// A different identity. A node below 0x08 could not prove which port it listens on,
+		// so an unverified identity change from one is refused outright rather than rate-
+		// limited.
+		if ((it->second.m_idVerified || kadVersion < MIN_PORT_VERIFIABLE_VERSION) && !idVerified) {
+			// Refused, and deliberately not escalated. This branch's own condition ends
+			// in !idVerified, so everything reaching it is an unverified claim -- and
+			// an unverified claim is exactly what a third party can fabricate about
+			// somebody else. ProcessKademlia2Response() calls AddUnfiltered() with
+			// verified hardcoded to false, and the peer answering our request picks the
+			// (IP, port, ID) triples it lists, so banning here would let one peer get
+			// an honest node banned by mentioning it twice. m_lastIDChange is stamped
+			// when an entry is created, so the sub-hour window covers every freshly-
+			// learned contact rather than only ones that really did just change ID.
+			//
+			// Both references decline for this reason; emule-qt states it outright: the
+			// ban requires verification by design, and unverified flips are recorded
+			// but never banned. Refusing still costs the sender its rotation, which is
+			// the part that has to hold.
+			return true;
+		}
+		// TrackNode applies the one-hour interval and the escalation.
+		return !TrackNode(ip, port, id, idVerified, now) || IsBanned(ip, now);
+	}
+
+	if (onlyOneNodePerIP && HasOtherTrackedPort(ip, port)) {
+		// A second Kad port on one address is either a NAT hiding several clients or one
+		// client pretending to be several. Both are bad for the routing table, and the
+		// honest case still has its first port tracked and usable.
+		return true;
+	}
+	TrackNode(ip, port, id, idVerified, now);
+	return false;
+}
+
+void CSafeKad::Cleanup(time_t now)
+{
+	m_lastCleanup = now;
+
+	// Each table is walked oldest-first and stops at the first entry inside
+	// its horizon, so a clean table costs one comparison.
+	while (!m_trackedNodes.Empty() && now - m_trackedNodes.OldestReference() > NODE_MAX_REFERENCE_AGE) {
+		m_trackedNodes.Erase(m_trackedNodes.OldestKey());
+	}
+	while (!m_bannedAddresses.Empty() &&
+		now - m_bannedAddresses.OldestReference() > BAN_MAX_REFERENCE_AGE) {
+		m_bannedAddresses.Erase(m_bannedAddresses.OldestKey());
+	}
+	while (!m_problematicNodes.Empty() &&
+		now - m_problematicNodes.OldestReference() > PROBLEMATIC_MAX_REFERENCE_AGE) {
+		m_problematicNodes.Erase(m_problematicNodes.OldestKey());
+	}
+}
+
+} // namespace Kademlia

amule-3.1.0.tar.gz/src/kademlia/net/SafeKad.h Added

@@ -0,0 +1,305 @@
+//								-*- C++ -*-
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// Copyright (c) 2026 eMule AI
+//
+// 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 SAFEKAD_H
+#define SAFEKAD_H
+
+#include <cstddef>
+#include <map>
+#include <set>
+#include <time.h>
+#include <utility>
+#include <vector>
+
+#include "../utils/UInt128.h"
+#include "../../Types.h"
+
+////////////////////////////////////////
+namespace Kademlia
+{
+////////////////////////////////////////
+
+// One Kad node address. Kad keys on IPv4 throughout -- routing, the UDP key and
+// the publish tracking all take a uint32 -- so this does too.
+struct SKadNodeAddress
+{
+	SKadNodeAddress()
+	: m_ip(0)
+	, m_port(0)
+	{
+	}
+	SKadNodeAddress(uint32_t ip, uint16_t port)
+	: m_ip(ip)
+	, m_port(port)
+	{
+	}
+	bool operator<(const SKadNodeAddress &value) const
+	{
+		return (m_ip < value.m_ip) || (m_ip == value.m_ip && m_port < value.m_port);
+	}
+	bool operator==(const SKadNodeAddress &value) const
+	{
+		return m_ip == value.m_ip && m_port == value.m_port;
+	}
+
+	uint32_t m_ip;
+	uint16_t m_port;
+};
+
+// A bounded map whose entries are evicted by last-reference age.
+//
+// The plain map alone would need an O(n) scan to find the least recently referenced entry, which is
+// the wrong complexity for a table that only evicts while under a flood. The parallel set, keyed on
+// (last reference, key), makes both the oldest-first walk in Cleanup() and the make-room eviction
+// O(log n).
+//
+// `Entry` must expose a `time_t m_lastReferenced`; every mutation goes through Set() so the two
+// containers cannot drift apart.
+template <class Key, class Entry> class CKadAgedMap
+{
+public:
+	typedef std::map<Key, Entry> Map;
+	typedef typename Map::iterator iterator;
+	typedef typename Map::const_iterator const_iterator;
+
+	iterator Find(const Key &key) { return m_map.find(key); }
+	iterator LowerBound(const Key &key) { return m_map.lower_bound(key); }
+	iterator Begin() { return m_map.begin(); }
+	iterator End() { return m_map.end(); }
+	size_t Size() const { return m_map.size(); }
+	bool Empty() const { return m_map.empty(); }
+
+	void Set(const Key &key, const Entry &entry)
+	{
+		iterator it = m_map.find(key);
+		if (it != m_map.end()) {
+			m_age.erase(AgeKey(it->second.m_lastReferenced, key));
+			it->second = entry;
+		} else {
+			m_map.insert(std::make_pair(key, entry));
+		}
+		m_age.insert(AgeKey(entry.m_lastReferenced, key));
+	}
+
+	void Erase(const Key &key)
+	{
+		iterator it = m_map.find(key);
+		if (it == m_map.end()) {
+			return;
+		}
+		m_age.erase(AgeKey(it->second.m_lastReferenced, key));
+		m_map.erase(it);
+	}
+
+	// Only valid while !Empty().
+	const Key &OldestKey() const { return m_age.begin()->second; }
+	time_t OldestReference() const { return m_age.begin()->first; }
+
+	void Clear()
+	{
+		m_map.clear();
+		m_age.clear();
+	}
+
+private:
+	typedef std::pair<time_t, Key> AgeKey;
+
+	Map m_map;
+	std::set<AgeKey> m_age;
+};
+
+// Identity and address protections layered on top of the standard 0.49b Kad defences, which stay
+// exactly as they are.
+//
+// What this adds: CPacketTracking rate-limits PACKETS per IP and opcode, and says nothing about a
+// node that behaves politely while presenting a new Kad ID every few minutes -- which is how a
+// routing table fills with sybils that each look individually reasonable. The UDP key challenge
+// proves an address controls its own traffic, but does not remember that the same address failed us
+// five minutes ago. The tracked-node table, the one-hour minimum identity-change interval and the
+// problematic list cover those two gaps.
+//
+// The escalation ladder mirrors CPacketTracking's drop-then-ban shape: a first identity rotation
+// marks the address problematic (300 s), a rotation while already problematic bans it (4 h). The
+// ban is Kad-routing-local, separate from CClientList's eD2k-wide ban.
+//
+// Every table is bounded and evicts by last-reference age, so sustained inbound traffic costs a
+// fixed amount of memory. All entry points take `now`, so the whole ladder is testable without
+// waiting on a real clock.
+//
+// Seven deliberate divergences from eMuleAI, listed so they read as decisions rather than
+// transcription slips (emule-qt agrees with eMuleAI on all seven):
+//
+//  - eMuleAI bans on the FIRST verified sub-hour identity change; this needs two inside 300 s. Bans
+//    are per address while tracking is per (address, port), so under CGNAT a carrier reusing one
+//    external port for different subscribers legitimately shows different Kad IDs, and eMuleAI's
+//    rule would take out every aMule user behind that address for four hours.
+//  - eMuleAI gates banning on a user preference. The compile switch stands in for it while this is
+//    experimental; a runtime equivalent is a precondition for ever defaulting the switch ON.
+//  - TrackNode() returns whether it accepted, and IsBadNode() refuses on a rejected rotation.
+//    Upstream's TrackNode() is void and IsBadNode() answers IsBanned() alone, so it ACCEPTS the
+//    first rejected rotation. Refusing at once is what makes a rotation cost the sender its
+//    rotation.
+//  - A full table evicts its oldest entry; eMuleAI returns without acting once the tracked table
+//    reaches 10000 or the ban table 1000, so a flood that fills the table lets every later abuser
+//    through.
+//  - BanAddress() drops the banned address's tracked ports, which eMuleAI leaves behind as
+//    unreachable state.
+//  - The verified flag is also upgraded on a matching-ID sighting in IsBadNode(), not only inside
+//    TrackNode(). It moves one way only, and the one caller hardcoding verified=false is
+//    AddUnfiltered(), so a peer cannot drive the upgrade for somebody else.
+//  - The last-reference time is not refreshed on the refused path. eMuleAI refreshes on every
+//    lookup, letting an attacker's own traffic decide which entries survive eviction; here such an
+//    entry ages out instead, which also means forgetting a rotator gives it a clean slate.
+class CSafeKad
+{
+public:
+	static const size_t MAX_TRACKED_NODES = 10000;
+	static const size_t MAX_PROBLEMATIC_NODES = 10000;
+	static const size_t MAX_BANNED_ADDRESSES = 1000;
+
+	// A node may change its Kad ID at most once an hour. Legitimate reasons exist (a fresh
+	// install, a wiped preferencesKad.dat), and an hour is far longer than any of them need.
+	static const time_t MIN_ID_CHANGE_INTERVAL = 3600;
+	// A ban lapses after four hours; past that the address is judged on its
+	// current behaviour alone.
+	static const time_t MAX_BAN_TIME = 4 * 3600;
+	// A problematic address is ignored for 300 s.
+	static const time_t MAX_PROBLEMATIC_TIME = 300;
+
+	// Lowest advertised Kad version whose three-way handshake can prove which UDP port a node
+	// listens on (eMule 0.49b). Below it an unverified identity change cannot be told from a
+	// spoof, so it is refused outright rather than merely rate-limited. Written out here rather
+	// than taken from the protocol version table: this class adds nothing to the wire.
+	static const uint8_t MIN_PORT_VERIFIABLE_VERSION = 0x08;
+
+	// Eviction horizons for Cleanup(): an entry nothing has referenced for
+	// this long carries no information worth its memory.
+	static const time_t NODE_MAX_REFERENCE_AGE = 3600;
+	// Must not be shorter than MAX_BAN_TIME. Cleanup() drops banned entries once they have
+	// gone this long without a reference, and a banned address stops being referenced as soon
+	// as it stops sending -- so a shorter horizon silently ends the ban early for exactly the
+	// attacker who backs off, which is the one the ban is for.
+	static const time_t BAN_MAX_REFERENCE_AGE = MAX_BAN_TIME;
+	static const time_t PROBLEMATIC_MAX_REFERENCE_AGE = 300;
+	// Cleanup() also runs from IsBadNode() at most this often.
+	static const time_t CLEANUP_INTERVAL = 600;
+
+	CSafeKad();
+
+	// Records the identity `id` at this address. A changed ID inside MIN_ID_CHANGE_INTERVAL
+	// marks the address problematic (and bans it if it was problematic already) and leaves the
+	// tracked ID untouched. Returns false if the identity change was rejected.
+	//
+	// `newlyBanned`, when given, reports whether the rejection escalated as far as a ban that
+	// was not already in force. This class deliberately links against nothing, so it cannot log
+	// or count the event itself -- it says what it did and the caller decides what that is
+	// worth.
+	bool TrackNode(uint32_t ip,
+		uint16_t port,
+		const CUInt128 &id,
+		bool idVerified,
+		time_t now,
+		bool *newlyBanned = nullptr);
+
+	// Marks an address as having misbehaved (a timeout, an inconsistent
+	// answer, a rejected identity change).
+	void TrackProblematicNode(uint32_t ip, uint16_t port, time_t now);
+
+	// Bans an address for MAX_BAN_TIME. Use only where the address is demonstrably at fault: a
+	// node can be *reported* bad by a third party, and acting on that would make this a remote-
+	// controlled blocklist.
+	//
+	// Returns true only when the address was not banned already. A repeat refreshes the
+	// existing ban and returns false, so a caller counting bans counts addresses rather than
+	// calls -- the drift CBanRecord was extracted to stop on the client-side list.
+	bool BanAddress(uint32_t ip, time_t now);
+
+	// The one call the Kad packet paths need: true when this contact must not be used or
+	// inserted into the routing table.
+	//
+	// `onlyOneNodePerIP` rejects a second port on an address that already has a tracked node --
+	// a real client uses one Kad port. It is gated on `kadVersion` by the caller's choice
+	// because the pre-0x08 handshake could not prove which port a node really listens on.
+	bool IsBadNode(uint32_t ip,
+		uint16_t port,
+		const CUInt128 &id,
+		uint8_t kadVersion,
+		bool idVerified,
+		bool onlyOneNodePerIP,
+		time_t now);
+
+	bool IsBanned(uint32_t ip, time_t now);
+	bool IsProblematic(uint32_t ip, uint16_t port, time_t now);
+
+	// Drops entries nothing has referenced within their horizon.
+	void Cleanup(time_t now);
+	void Clear();
+
+	size_t GetTrackedNodeCount() const { return m_trackedNodes.Size(); }
+	size_t GetProblematicNodeCount() const { return m_problematicNodes.Size(); }
+	size_t GetBannedAddressCount() const { return m_bannedAddresses.Size(); }
+
+private:
+	struct sTracked
+	{
+		CUInt128 m_lastID;
+		time_t m_lastIDChange;
+		time_t m_lastReferenced;
+		bool m_idVerified;
+	};
+	struct sProblematic
+	{
+		time_t m_failed;
+		time_t m_lastReferenced;
+	};
+	struct sBanned
+	{
+		time_t m_banned;
+		time_t m_lastReferenced;
+	};
+
+	// One step up the escalation ladder for a rejected identity change: problematic the first
+	// time, banned if the address was problematic already. Both refusal paths share this so
+	// that one rejection is always exactly one step. Returns true when the step ended in a ban
+	// that was not already in force, so TrackNode can pass that up to its caller.
+	bool Escalate(uint32_t ip, uint16_t port, time_t now);
+	// True when this address already has a tracked node on another port.
+	bool HasOtherTrackedPort(uint32_t ip, uint16_t port);
+	// Forgets every tracked and problematic entry for `ip`, on every port.
+	void DropAllPortsOf(uint32_t ip);
+
+	CKadAgedMap<SKadNodeAddress, sTracked> m_trackedNodes;
+	CKadAgedMap<SKadNodeAddress, sProblematic> m_problematicNodes;
+	CKadAgedMap<uint32_t, sBanned> m_bannedAddresses;
+	time_t m_lastCleanup;
+};
+
+// The single instance shared by the Kad packet, search and routing paths, like
+// the other Kad singletons reached through CKademlia.
+extern CSafeKad safeKad;
+
+} // namespace Kademlia
+
+#endif // SAFEKAD_H

amule-3.0.1.tar.gz/src/kademlia/routing/Contact.cpp -> amule-3.1.0.tar.gz/src/kademlia/routing/Contact.cpp Changed

@@ -51,27 +51,34 @@
 	theStats::RemoveKadNode();
 }
 
-CContact::CContact(const CUInt128 &clientID, uint32_t ip, uint16_t udpPort, uint16_t tcpPort, uint8_t version, const CKadUDPKey& key, bool ipVerified, const CUInt128 &target)
-	: m_clientID(clientID),
-	  m_distance(target ^ clientID),
-	  m_ip(ip),
-	  m_tcpPort(tcpPort),
-	  m_udpPort(udpPort),
-	  m_type(3),
-	  m_lastTypeSet(time(NULL)),
-	  m_expires(0),
-	  m_created(m_lastTypeSet),
-	  m_inUse(0),
-	  m_version(version),
-	  m_ipVerified(ipVerified),
-	  m_receivedHelloPacket(false),
-	  m_udpKey(key)
+CContact::CContact(const CUInt128 &clientID,
+	uint32_t ip,
+	uint16_t udpPort,
+	uint16_t tcpPort,
+	uint8_t version,
+	const CKadUDPKey &key,
+	bool ipVerified,
+	const CUInt128 &target)
+: m_clientID(clientID)
+, m_distance(target ^ clientID)
+, m_ip(ip)
+, m_tcpPort(tcpPort)
+, m_udpPort(udpPort)
+, m_type(3)
+, m_lastTypeSet(time(NULL))
+, m_expires(0)
+, m_created(m_lastTypeSet)
+, m_inUse(0)
+, m_version(version)
+, m_ipVerified(ipVerified)
+, m_receivedHelloPacket(false)
+, m_udpKey(key)
 {
 	wxASSERT(udpPort);
 	theStats::AddKadNode();
 }
 
-CContact::CContact(const CContact& k1)
+CContact::CContact(const CContact &k1)
 {
 	*this = k1;
 	theStats::AddKadNode();
@@ -81,7 +88,7 @@
 {
 	time_t now = time(NULL);
 
-	if(now - m_lastTypeSet < 10 || m_type == 4) {
+	if (now - m_lastTypeSet < 10 || m_type == 4) {
 		return;
 	}
 
@@ -96,29 +103,32 @@
 	time_t now = time(NULL);
 	uint32_t hours = (now - m_created) / HR2S(1);
 	switch (hours) {
-		case 0:
-			m_type = 2;
-			m_expires = now + HR2S(1);
-			break;
-		case 1:
-			m_type = 1;
-			m_expires = now + MIN2S(90); //HR2S(1.5)
-			break;
-		default:
-			m_type = 0;
-			m_expires = now + HR2S(2);
+	case 0:
+		m_type = 2;
+		m_expires = now + HR2S(1);
+		break;
+	case 1:
+		m_type = 1;
+		m_expires = now + MIN2S(90); // HR2S(1.5)
+		break;
+	default:
+		m_type = 0;
+		m_expires = now + HR2S(2);
 	}
 }
 
 time_t CContact::GetLastSeen() const noexcept
 {
-	// calculating back from expire time, so we don't need an additional field.
-	// might result in wrong values if doing CheckingType() for example, so don't use for important timing stuff
+	// Calculated back from the expire time, so no extra field is needed. May give wrong values
+	// when doing CheckingType(), for example, so do not use it for important timing.
 	if (m_expires != 0) {
 		switch (m_type) {
-			case 2: return m_expires - HR2S(1);
-			case 1: return m_expires - MIN2S(90) /*(unsigned)HR2S(1.5)*/;
-			case 0: return m_expires - HR2S(2);
+		case 2:
+			return m_expires - HR2S(1);
+		case 1:
+			return m_expires - MIN2S(90) /*(unsigned)HR2S(1.5)*/;
+		case 0:
+			return m_expires - HR2S(2);
 		}
 	}
 	return 0;

amule-3.0.1.tar.gz/src/kademlia/routing/Contact.h -> amule-3.1.0.tar.gz/src/kademlia/routing/Contact.h Changed

@@ -36,14 +36,15 @@
 there client on the eMule forum..
 */
 
-#ifndef __CONTACT_H__
-#define __CONTACT_H__
+#ifndef CONTACT_H
+#define CONTACT_H
 
 #include "../kademlia/Kademlia.h"
 #include "../utils/KadUDPKey.h"
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
 class CContact
@@ -51,78 +52,99 @@
 public:
 	~CContact();
 	CContact(const CUInt128 &clientID,
-		uint32_t ip, uint16_t udpPort, uint16_t tcpPort, uint8_t version,
-		const CKadUDPKey& kadKey, bool ipVerified,
+		uint32_t ip,
+		uint16_t udpPort,
+		uint16_t tcpPort,
+		uint8_t version,
+		const CKadUDPKey &kadKey,
+		bool ipVerified,
 		const CUInt128 &target = CKademlia::GetPrefs()->GetKadID());
 
-	CContact(const CContact& k1);
-	CContact& operator=(const CContact& k1) = default;
+	CContact(const CContact &k1);
+	CContact &operator=(const CContact &k1) = default;
 
-	const CUInt128& GetClientID() const noexcept		{ return m_clientID; }
-	void SetClientID(const CUInt128& clientID) noexcept	{ m_clientID = clientID; m_distance = CKademlia::GetPrefs()->GetKadID() ^ clientID; }
+	const CUInt128 &GetClientID() const noexcept { return m_clientID; }
+	void SetClientID(const CUInt128 &clientID) noexcept
+	{
+		m_clientID = clientID;
+		m_distance = CKademlia::GetPrefs()->GetKadID() ^ clientID;
+	}
 
-	const wxString GetClientIDString() const		{ return m_clientID.ToHexString(); }
+	const wxString GetClientIDString() const { return m_clientID.ToHexString(); }
 
-	const CUInt128& GetDistance() const noexcept		{ return m_distance; }
-	const wxString GetDistanceString() const		{ return m_distance.ToBinaryString(); }
+	const CUInt128 &GetDistance() const noexcept { return m_distance; }
+	const wxString GetDistanceString() const { return m_distance.ToBinaryString(); }
 
-	uint32_t GetIPAddress() const noexcept			{ return m_ip; }
-	void	 SetIPAddress(uint32_t ip) noexcept		{ if (m_ip != ip) { SetIPVerified(false); m_ip = ip; } }
+	uint32_t GetIPAddress() const noexcept { return m_ip; }
+	void SetIPAddress(uint32_t ip) noexcept
+	{
+		if (m_ip != ip) {
+			SetIPVerified(false);
+			m_ip = ip;
+		}
+	}
 
-	uint16_t GetTCPPort() const noexcept			{ return m_tcpPort; }
-	void	 SetTCPPort(uint16_t port) noexcept		{ m_tcpPort = port; }
+	uint16_t GetTCPPort() const noexcept { return m_tcpPort; }
+	void SetTCPPort(uint16_t port) noexcept { m_tcpPort = port; }
 
-	uint16_t GetUDPPort() const noexcept			{ return m_udpPort; }
-	void	 SetUDPPort(uint16_t port) noexcept		{ m_udpPort = port; }
+	uint16_t GetUDPPort() const noexcept { return m_udpPort; }
+	void SetUDPPort(uint16_t port) noexcept { m_udpPort = port; }
 
-	uint8_t	 GetType() const noexcept			{ return m_type; }
+	uint8_t GetType() const noexcept { return m_type; }
 
-	void	 UpdateType() noexcept;
-	void	 CheckingType() noexcept;
+	void UpdateType() noexcept;
+	void CheckingType() noexcept;
 
-	bool	 InUse() const noexcept				{ return m_inUse > 0; }
-	void	 IncUse() noexcept				{ m_inUse++; }
-	void	 DecUse()					{ if (m_inUse) m_inUse--; else { wxFAIL; } }
+	bool InUse() const noexcept { return m_inUse > 0; }
+	void IncUse() noexcept { m_inUse++; }
+	void DecUse()
+	{
+		if (m_inUse)
+			m_inUse--;
+		else {
+			wxFAIL;
+		}
+	}
 
-	time_t	 GetCreatedTime() const noexcept			{ return m_created; }
+	time_t GetCreatedTime() const noexcept { return m_created; }
 
-	void	 SetExpireTime(time_t value) noexcept		{ m_expires = value; };
-	time_t	 GetExpireTime() const noexcept			{ return m_expires; }
+	void SetExpireTime(time_t value) noexcept { m_expires = value; };
+	time_t GetExpireTime() const noexcept { return m_expires; }
 
-	time_t	 GetLastTypeSet() const noexcept			{ return m_lastTypeSet; }
+	time_t GetLastTypeSet() const noexcept { return m_lastTypeSet; }
 
-	time_t	 GetLastSeen() const noexcept;
+	time_t GetLastSeen() const noexcept;
 
-	uint8_t	 GetVersion() const noexcept			{ return m_version; }
-	void	 SetVersion(uint8_t value) noexcept		{ m_version = value; }
+	uint8_t GetVersion() const noexcept { return m_version; }
+	void SetVersion(uint8_t value) noexcept { m_version = value; }
 
-	const CKadUDPKey& GetUDPKey() const noexcept		{ return m_udpKey; }
-	void	 SetUDPKey(const CKadUDPKey& key) noexcept	{ m_udpKey = key; }
+	const CKadUDPKey &GetUDPKey() const noexcept { return m_udpKey; }
+	void SetUDPKey(const CKadUDPKey &key) noexcept { m_udpKey = key; }
 
-	bool	 IsIPVerified() const noexcept			{ return m_ipVerified; }
-	void	 SetIPVerified(bool ipVerified) noexcept		{ m_ipVerified = ipVerified; }
+	bool IsIPVerified() const noexcept { return m_ipVerified; }
+	void SetIPVerified(bool ipVerified) noexcept { m_ipVerified = ipVerified; }
 
-	bool	GetReceivedHelloPacket() const noexcept		{ return m_receivedHelloPacket; }
-	void	SetReceivedHelloPacket() noexcept		{ m_receivedHelloPacket = true; }
+	bool GetReceivedHelloPacket() const noexcept { return m_receivedHelloPacket; }
+	void SetReceivedHelloPacket() noexcept { m_receivedHelloPacket = true; }
 
 private:
-	CUInt128	m_clientID;
-	CUInt128	m_distance;
-	uint32_t	m_ip;
-	uint16_t	m_tcpPort;
-	uint16_t	m_udpPort;
-	uint8_t		m_type;
-	time_t		m_lastTypeSet;
-	time_t		m_expires;
-	time_t		m_created;
-	uint32_t	m_inUse;
-	uint8_t		m_version;
-	bool		m_ipVerified;
-	bool		m_receivedHelloPacket;
-	CKadUDPKey	m_udpKey;
+	CUInt128 m_clientID;
+	CUInt128 m_distance;
+	uint32_t m_ip;
+	uint16_t m_tcpPort;
+	uint16_t m_udpPort;
+	uint8_t m_type;
+	time_t m_lastTypeSet;
+	time_t m_expires;
+	time_t m_created;
+	uint32_t m_inUse;
+	uint8_t m_version;
+	bool m_ipVerified;
+	bool m_receivedHelloPacket;
+	CKadUDPKey m_udpKey;
 };
 
-} // End namespace
+} // namespace Kademlia
 
-#endif // __CONTACT_H__
+#endif // CONTACT_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/kademlia/routing/Maps.h -> amule-3.1.0.tar.gz/src/kademlia/routing/Maps.h Changed

amule-3.0.1.tar.gz/src/kademlia/routing/RoutingBin.cpp -> amule-3.1.0.tar.gz/src/kademlia/routing/RoutingBin.cpp Changed

@@ -45,11 +45,11 @@
 using namespace Kademlia;
 ////////////////////////////////////////
 
-CRoutingBin::GlobalTrackingMap	CRoutingBin::s_globalContactIPs;
-CRoutingBin::GlobalTrackingMap	CRoutingBin::s_globalContactSubnets;
+CRoutingBin::GlobalTrackingMap CRoutingBin::s_globalContactIPs;
+CRoutingBin::GlobalTrackingMap CRoutingBin::s_globalContactSubnets;
 
-#define MAX_CONTACTS_SUBNET	10
-#define MAX_CONTACTS_IP		1
+#define MAX_CONTACTS_SUBNET 10
+#define MAX_CONTACTS_IP 1
 
 CRoutingBin::~CRoutingBin()
 {
@@ -68,7 +68,6 @@
 	wxASSERT(contact != NULL);
 
 	uint32_t sameSubnets = 0;
-	// Check if we already have a contact with this ID in the list.
 	for (ContactList::const_iterator it = m_entries.begin(); it != m_entries.end(); ++it) {
 		if (contact->GetClientID() == (*it)->GetClientID()) {
 			return false;
@@ -77,21 +76,24 @@
 			sameSubnets++;
 		}
 	}
-	// Several checks to make sure that we don't store multiple contacts from the same IP or too many contacts from the same subnet
-	// This is supposed to add a bit of protection against several attacks and raise the resource needs (IPs) for a successful contact on the attacker side
-	// Such IPs are not banned from Kad, they still can index, search, etc so multiple KAD clients behind one IP still work
+	// Several checks so we do not store multiple contacts from the same IP, or too many from
+	// the same subnet. This raises the resource needs (IPs) for a successful attack; such IPs
+	// are not banned from Kad, so several clients behind one IP still index, search and so on.
 
 	if (!CheckGlobalIPLimits(contact->GetIPAddress(), contact->GetUDPPort())) {
 		return false;
 	}
 
-	// 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)
+	// 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()))) {
-		AddDebugLogLineN(logKadRouting, "Ignored kad contact (IP=" + KadIPPortToString(contact->GetIPAddress(), contact->GetUDPPort()) + ") - too many contact with the same subnet in RoutingBin");
+		AddDebugLogLineN(logKadRouting,
+			"Ignored kad contact (IP=" +
+				KadIPPortToString(contact->GetIPAddress(), contact->GetUDPPort()) +
+				") - too many contact with the same subnet in RoutingBin");
 		return false;
 	}
 
-	// If not full, add to the end of list
 	if (m_entries.size() < K) {
 		m_entries.push_back(contact);
 		AdjustGlobalTracking(contact->GetIPAddress(), true);
@@ -103,27 +105,21 @@
 void CRoutingBin::SetAlive(CContact *contact)
 {
 	wxASSERT(contact != NULL);
-	// Check if we already have a contact with this ID in the list.
 	CContact *test = GetContact(contact->GetClientID());
 	wxASSERT(contact == test);
 	if (test) {
-		// Mark contact as being alive.
 		test->UpdateType();
-		// Move to the end of the list
 		PushToBottom(test);
 	}
 }
 
 void CRoutingBin::SetTCPPort(uint32_t ip, uint16_t port, uint16_t tcpPort)
 {
-	// Find contact with IP/Port
 	for (ContactList::iterator it = m_entries.begin(); it != m_entries.end(); ++it) {
 		CContact *c = *it;
 		if ((ip == c->GetIPAddress()) && (port == c->GetUDPPort())) {
-			// Set TCPPort and mark as alive.
 			c->SetTCPPort(tcpPort);
 			c->UpdateType();
-			// Move to the end of the list
 			PushToBottom(c);
 			break;
 		}
@@ -144,15 +140,17 @@
 {
 	for (ContactList::const_iterator it = m_entries.begin(); it != m_entries.end(); ++it) {
 		CContact *contact = *it;
-		if ((contact->GetIPAddress() == ip)
-		    && ((!tcpPort && port == contact->GetUDPPort()) || (tcpPort && port == contact->GetTCPPort()) || port == 0)) {
+		if ((contact->GetIPAddress() == ip) &&
+			((!tcpPort && port == contact->GetUDPPort()) ||
+				(tcpPort && port == contact->GetTCPPort()) || port == 0)) {
 			return contact;
 		}
 	}
 	return NULL;
 }
 
-void CRoutingBin::GetNumContacts(uint32_t& nInOutContacts, uint32_t& nInOutFilteredContacts, uint8_t minVersion) const noexcept
+void CRoutingBin::GetNumContacts(
+	uint32_t &nInOutContacts, uint32_t &nInOutFilteredContacts, uint8_t minVersion) const noexcept
 {
 	// 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) {
@@ -166,25 +164,26 @@
 
 void CRoutingBin::GetEntries(ContactList *result, bool emptyFirst) const
 {
-	// Clear results if requested first.
 	if (emptyFirst) {
 		result->clear();
 	}
 
-	// Append all entries to the results.
 	if (!m_entries.empty()) {
 		result->insert(result->end(), m_entries.begin(), m_entries.end());
 	}
 }
 
-void CRoutingBin::GetClosestTo(uint32_t maxType, const CUInt128 &target, uint32_t maxRequired, ContactMap *result, bool emptyFirst, bool inUse) const
+void CRoutingBin::GetClosestTo(uint32_t maxType,
+	const CUInt128 &target,
+	uint32_t maxRequired,
+	ContactMap *result,
+	bool emptyFirst,
+	bool inUse) const
 {
-	// Empty list if requested.
 	if (emptyFirst) {
 		result->clear();
 	}
 
-	// No entries, no closest.
 	if (m_entries.empty()) {
 		return;
 	}
@@ -223,13 +222,15 @@
 	}
 	if (increase) {
 		if (sameIPCount >= MAX_CONTACTS_IP) {
-			AddDebugLogLineN(logKadRouting, "Global IP Tracking inconsistency on increase (" + KadIPToString(ip) + ")");
+			AddDebugLogLineN(logKadRouting,
+				"Global IP Tracking inconsistency on increase (" + KadIPToString(ip) + ")");
 			wxFAIL;
 		}
 		sameIPCount++;
 	} else /* if (!increase) */ {
 		if (sameIPCount == 0) {
-			AddDebugLogLineN(logKadRouting, "Global IP Tracking inconsistency on decrease (" + KadIPToString(ip) + ")");
+			AddDebugLogLineN(logKadRouting,
+				"Global IP Tracking inconsistency on decrease (" + KadIPToString(ip) + ")");
 			wxFAIL;
 		}
 		sameIPCount--;
@@ -248,13 +249,17 @@
 	}
 	if (increase) {
 		if (sameSubnetCount >= MAX_CONTACTS_SUBNET && !::IsLanIP(wxUINT32_SWAP_ALWAYS(ip))) {
-			AddDebugLogLineN(logKadRouting, "Global Subnet Tracking inconsistency on increase (" + KadIPToString(ip) + "/24)");
+			AddDebugLogLineN(logKadRouting,
+				"Global Subnet Tracking inconsistency on increase (" + KadIPToString(ip) +
+					"/24)");
 			wxFAIL;
 		}
 		sameSubnetCount++;
 	} else /* if (!increase) */ {
 		if (sameSubnetCount == 0) {
-			AddDebugLogLineN(logKadRouting, "Global Subnet Tracking inconsistency on decrease (" + KadIPToString(ip) + "/24)");
+			AddDebugLogLineN(logKadRouting,
+				"Global Subnet Tracking inconsistency on decrease (" + KadIPToString(ip) +
+					"/24)");
 			wxFAIL;
 		}
 		sameSubnetCount--;
@@ -268,10 +273,10 @@
 
 bool CRoutingBin::ChangeContactIPAddress(CContact *contact, uint32_t newIP)
 {
-	// Called if we want to update an indexed contact with a new IP. We have to check if we actually allow such a change
-	// and if adjust our tracking. Rejecting a change will in the worst case lead a node contact to become invalid and purged later,
-	// but it also protects against a flood of malicious update requests from one IP which would be able to "reroute" all
-	// contacts to itself and by that making them useless
+	// Called to update an indexed contact with a new IP. Check whether we allow such a change,
+	// and adjust our tracking. Rejecting one can at worst leave a node contact invalid and
+	// purged later, but it also blocks a flood of malicious update requests from one IP, which
+	// could otherwise "reroute" every contact to itself and make them useless.
 	if (contact->GetIPAddress() == newIP) {
 		return true;
 	}
@@ -285,38 +290,55 @@
 		sameIPCount = itIP->second;
 	}
 	if (sameIPCount >= MAX_CONTACTS_IP) {
-		AddDebugLogLineN(logKadRouting, "Rejected kad contact IP change on update (old IP=" + KadIPToString(contact->GetIPAddress()) + ", requested IP=" + KadIPToString(newIP) + ") - too many contacts with the same IP (global)");
+		AddDebugLogLineN(logKadRouting,
+			"Rejected kad contact IP change on update (old IP=" +
+				KadIPToString(contact->GetIPAddress()) + ", requested IP=" +
+				KadIPToString(newIP) + ") - too many contacts with the same IP (global)");
 		return false;
 	}
 
 	if ((contact->GetIPAddress() & 0xFFFFFF00) != (newIP & 0xFFFFFF00)) {
-		// no more than 10 IPs from the same /24 netmask global, except if it's a LAN IP (if we don't accept LAN IPs they already have been filtered before)
+		// no more than 10 IPs from the same /24 netmask global, except if it's a LAN IP (if we don't
+		// accept LAN IPs they already have been filtered before)
 		uint32_t sameSubnetGlobalCount = 0;
-		GlobalTrackingMap::const_iterator itGlobalSubnet = s_globalContactSubnets.find(newIP & 0xFFFFFF00);
+		GlobalTrackingMap::const_iterator itGlobalSubnet =
+			s_globalContactSubnets.find(newIP & 0xFFFFFF00);
 		if (itGlobalSubnet != s_globalContactSubnets.end()) {
 			sameSubnetGlobalCount = itGlobalSubnet->second;
 		}
 		if (sameSubnetGlobalCount >= MAX_CONTACTS_SUBNET && !::IsLanIP(wxUINT32_SWAP_ALWAYS(newIP))) {
-			AddDebugLogLineN(logKadRouting, "Rejected kad contact IP change on update (old IP=" + KadIPToString(contact->GetIPAddress()) + ", requested IP=" + KadIPToString(newIP) + ") - too many contacts with the same Subnet (global)");
+			AddDebugLogLineN(logKadRouting,
+				"Rejected kad contact IP change on update (old IP=" +
+					KadIPToString(contact->GetIPAddress()) +
+					", requested IP=" + KadIPToString(newIP) +
+					") - too many contacts with the same Subnet (global)");
 			return false;
 		}
 
-		// no more than 2 IPs from the same /24 netmask in one bin, except if it's a LAN IP (if we don't accept LAN IPs they already have been filtered before)
+		// no more than 2 IPs from the same /24 netmask in one bin, except if it's a LAN IP (if we
+		// don't accept LAN IPs they already have been filtered before)
 		uint32_t sameSubnets = 0;
 		// Check if we already have a contact with this ID in the list.
-		for (ContactList::const_iterator itContact = m_entries.begin(); itContact != m_entries.end(); ++itContact) {
+		for (ContactList::const_iterator itContact = m_entries.begin(); itContact != m_entries.end();
+			++itContact) {
 			if ((newIP & 0xFFFFFF00) == ((*itContact)->GetIPAddress() & 0xFFFFFF00)) {
 				sameSubnets++;
 			}
 		}
 		if (sameSubnets >= 2 && !::IsLanIP(wxUINT32_SWAP_ALWAYS(newIP))) {
-			AddDebugLogLineN(logKadRouting, "Rejected kad contact IP change on update (old IP=" + KadIPToString(contact->GetIPAddress()) + ", requested IP=" + KadIPToString(newIP) + ") - too many contacts with the same Subnet (local)");
+			AddDebugLogLineN(logKadRouting,
+				"Rejected kad contact IP change on update (old IP=" +
+					KadIPToString(contact->GetIPAddress()) +
+					", requested IP=" + KadIPToString(newIP) +
+					") - too many contacts with the same Subnet (local)");
 			return false;
 		}
 	}
 
 	// everything fine
-	AddDebugLogLineN(logKadRouting, "Index contact IP change allowed " + KadIPToString(contact->GetIPAddress()) + " -> " + KadIPToString(newIP));
+	AddDebugLogLineN(logKadRouting,
+		"Index contact IP change allowed " + KadIPToString(contact->GetIPAddress()) + " -> " +
+			KadIPToString(newIP));
 	AdjustGlobalTracking(contact->GetIPAddress(), false);
 	contact->SetIPAddress(newIP);
 	AdjustGlobalTracking(contact->GetIPAddress(), true);
@@ -372,17 +394,22 @@
 		sameIPCount = itIP->second;
 	}
 	if (sameIPCount >= MAX_CONTACTS_IP) {
-		AddDebugLogLineN(logKadRouting, "Ignored kad contact (IP=" + KadIPPortToString(ip, port) + ") - too many contacts with the same IP (global)");
+		AddDebugLogLineN(logKadRouting,
+			"Ignored kad contact (IP=" + KadIPPortToString(ip, port) +
+				") - 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)
+	//  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)
 	uint32_t sameSubnetGlobalCount = 0;
 	GlobalTrackingMap::const_iterator itSubnet = s_globalContactSubnets.find(ip & 0xFFFFFF00);
 	if (itSubnet != s_globalContactSubnets.end()) {
 		sameSubnetGlobalCount = itSubnet->second;
 	}
 	if (sameSubnetGlobalCount >= MAX_CONTACTS_SUBNET && !::IsLanIP(wxUINT32_SWAP_ALWAYS(ip))) {
-		AddDebugLogLineN(logKadRouting, "Ignored kad contact (IP=" + KadIPPortToString(ip, port) + ") - too many contacts with the same subnet (global)");
+		AddDebugLogLineN(logKadRouting,
+			"Ignored kad contact (IP=" + KadIPPortToString(ip, port) +
+				") - too many contacts with the same subnet (global)");
 		return false;
 	}
 	return true;

amule-3.0.1.tar.gz/src/kademlia/routing/RoutingBin.h -> amule-3.1.0.tar.gz/src/kademlia/routing/RoutingBin.h Changed

@@ -36,8 +36,8 @@
 there client on the eMule forum..
 */
 
-#ifndef __ROUTING_BIN__
-#define __ROUTING_BIN__
+#ifndef ROUTINGBIN_H
+#define ROUTINGBIN_H
 
 #include "Maps.h"
 #include "../../Types.h"
@@ -45,7 +45,8 @@
 #include "Contact.h"
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
 class CUInt128;
@@ -54,32 +55,45 @@
 {
 public:
 	CRoutingBin()
-		: m_dontDeleteContacts(false)
-	{}
+	: m_dontDeleteContacts(false)
+	{
+	}
 	~CRoutingBin();
 
-	bool	  AddContact(CContact *contact);
-	void	  SetAlive(CContact *contact);
-	void	  SetTCPPort(uint32_t ip, uint16_t port, uint16_t tcpPort);
-	void	  RemoveContact(CContact *contact, bool noTrackingAdjust = false)	{ if (!noTrackingAdjust) AdjustGlobalTracking(contact->GetIPAddress(), false); m_entries.remove(contact); }
+	bool AddContact(CContact *contact);
+	void SetAlive(CContact *contact);
+	void SetTCPPort(uint32_t ip, uint16_t port, uint16_t tcpPort);
+	void RemoveContact(CContact *contact, bool noTrackingAdjust = false)
+	{
+		if (!noTrackingAdjust)
+			AdjustGlobalTracking(contact->GetIPAddress(), false);
+		m_entries.remove(contact);
+	}
 	CContact *GetContact(const CUInt128 &id) const noexcept;
 	CContact *GetContact(uint32_t ip, uint16_t port, bool tcpPort) const noexcept;
-	CContact *GetOldest() const noexcept		{ return m_entries.size() ? m_entries.front() : NULL; }
-
-	uint32_t  GetSize() const noexcept		{ return m_entries.size(); }
-	void	  GetNumContacts(uint32_t& nInOutContacts, uint32_t& nInOutFilteredContacts, uint8_t minVersion) const noexcept;
-	uint32_t  GetRemaining() const noexcept		{ 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 *GetOldest() const noexcept { return m_entries.size() ? m_entries.front() : NULL; }
+
+	uint32_t GetSize() const noexcept { return m_entries.size(); }
+	void GetNumContacts(uint32_t &nInOutContacts,
+		uint32_t &nInOutFilteredContacts,
+		uint8_t minVersion) const noexcept;
+	uint32_t GetRemaining() const noexcept { 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;
-	void	  SetAllContactsVerified();
-	bool	  HasOnlyLANNodes() const noexcept;
+	void SetAllContactsVerified();
+	bool HasOnlyLANNodes() const noexcept;
 
-	static bool	CheckGlobalIPLimits(uint32_t ip, uint16_t port);
+	static bool CheckGlobalIPLimits(uint32_t ip, uint16_t port);
 
-	bool	m_dontDeleteContacts;
+	bool m_dontDeleteContacts;
 
 protected:
 	static void AdjustGlobalTracking(uint32_t ip, bool increase);
@@ -87,13 +101,13 @@
 private:
 	ContactList m_entries;
 
-	typedef std::map<uint32_t, uint32_t>	GlobalTrackingMap;
+	typedef std::map<uint32_t, uint32_t> GlobalTrackingMap;
 
-	static GlobalTrackingMap	s_globalContactIPs;
-	static GlobalTrackingMap	s_globalContactSubnets;
+	static GlobalTrackingMap s_globalContactIPs;
+	static GlobalTrackingMap s_globalContactSubnets;
 };
 
-} // End namespace
+} // namespace Kademlia
 
-#endif // __ROUTING_BIN__
+#endif // ROUTINGBIN_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/kademlia/routing/RoutingZone.cpp -> amule-3.1.0.tar.gz/src/kademlia/routing/RoutingZone.cpp Changed

amule-3.0.1.tar.gz/src/kademlia/routing/RoutingZone.h -> amule-3.1.0.tar.gz/src/kademlia/routing/RoutingZone.h Changed

@@ -36,8 +36,8 @@
 there client on the eMule forum..
 */
 
-#ifndef __ROUTING_ZONE__
-#define __ROUTING_ZONE__
+#ifndef ROUTINGZONE_H
+#define ROUTINGZONE_H
 
 #include "Maps.h"
 #include "../utils/UInt128.h"
@@ -45,7 +45,8 @@
 class CFileDataIO;
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
 class CRoutingBin;
@@ -53,62 +54,85 @@
 class CKadUDPKey;
 
 /**
- * The *Zone* is just a node in a binary tree of *Zone*s.
- * Each zone is either an internal node or a leaf node.
- * Internal nodes have "bin == null" and "subZonesi != null",
- * leaf nodes have "subZonesi == null" and "bin != null".
+ * The *Zone* is a node in a binary tree of *Zone*s, either internal or leaf. Internal nodes have
+ * "bin == null" and "subZonesi != null"; leaf nodes have "subZonesi == null" and "bin != null".
  *
- * All key pseudoaddresses are relative to the center (self), which
- * is considered to be 000..000
+ * All key pseudoaddresses are relative to the center (self), which counts as 000..000.
  */
 class CRoutingZone
 {
 public:
-
 	CRoutingZone();
 	~CRoutingZone();
 
-	bool	 OnBigTimer() const;
-	void	 OnSmallTimer();
+	bool OnBigTimer() const;
+	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 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 = "");
-
-	bool	 VerifyContact(const CUInt128& id, uint32_t ip);
-	CContact *GetContact(const CUInt128& id) const noexcept;
+	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 = "");
+
+	bool VerifyContact(const CUInt128 &id, uint32_t ip);
+	CContact *GetContact(const CUInt128 &id) const noexcept;
 	CContact *GetContact(uint32_t ip, uint16_t port, bool tcpPort) const noexcept;
 	CContact *GetRandomContact(uint32_t maxType, uint32_t minKadVersion) const;
 	uint32_t GetNumContacts() const noexcept;
-	void	 GetNumContacts(uint32_t& nInOutContacts, uint32_t& nInOutFilteredContacts, uint8_t minVersion) const noexcept;
+	void GetNumContacts(uint32_t &nInOutContacts,
+		uint32_t &nInOutFilteredContacts,
+		uint8_t minVersion) const noexcept;
 
-	// 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;
+	// 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;
 
 	// Returns a list of all contacts in all leafs of this zone.
-	void	 GetAllEntries(ContactList *result, bool emptyFirst = true) const;
+	void GetAllEntries(ContactList *result, bool emptyFirst = true) const;
 
 	// Returns the *maxRequired* tokens that are closest to the target within this zone's subtree.
-	void	 GetClosestTo(uint32_t maxType, const CUInt128& target, const CUInt128& distance, uint32_t maxRequired, ContactMap *result, bool emptyFirst = true, bool setInUse = false) const;
+	void GetClosestTo(uint32_t maxType,
+		const CUInt128 &target,
+		const CUInt128 &distance,
+		uint32_t maxRequired,
+		ContactMap *result,
+		bool emptyFirst = true,
+		bool setInUse = false) const;
 
 	// Ideally: Returns all contacts that are in buckets of common range between us and the asker.
 	// 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;
-	bool	 HasOnlyLANNodes() const noexcept;
+	bool HasOnlyLANNodes() const noexcept;
 
-	time_t	 m_nextBigTimer;
-	time_t	 m_nextSmallTimer;
+	time_t m_nextBigTimer;
+	time_t m_nextSmallTimer;
 
 private:
-
-	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);
+	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
@@ -136,16 +160,15 @@
 	void SetAllContactsVerified();
 
 	/**
-	 * Generates a new TokenBin for this zone. Used when the current zone is becoming a leaf zone.
-	 * Must be deleted by caller
+	 * Generates a new TokenBin for this zone, used when it is becoming a leaf zone. The caller
+	 * must delete it.
 	 */
 	CRoutingZone *GenSubZone(unsigned side);
 
 	/**
-	 * Zone pair is an array of two. Either both entries are null, which
-	 * means that *this* is a leaf zone, or both are non-null which means
-	 * that *this* has been split into equally sized finer zones.
-	 * The zone with index 0 is the one closer to our *self* token.
+	 * Zone pair, an array of two. Either both entries are null, meaning *this* is a leaf zone,
+	 * or both are non-null, meaning *this* has been split into equally sized finer zones. Index
+	 * 0 is the one closer to our *self* token.
 	 */
 	CRoutingZone *m_subZones2;
 	CRoutingZone *m_superZone;
@@ -154,15 +177,14 @@
 	static CUInt128 me;
 
 	/**
-	 * The level indicates what size chunk of the address space
-	 * this zone is representing. Level 0 is the whole space,
-	 * level 1 is 1/2 of the space, level 2 is 1/4, etc.
+	 * How large a chunk of the address space this zone represents. Level 0 is the whole space,
+	 * level 1 is 1/2, level 2 is 1/4, and so on.
 	 */
 	uint32_t m_level;
 
 	/**
-	 * This is the distance in number of zones from the zone at this level
-	 * that contains the center of the system; distance is wrt the XOR metric.
+	 * Distance, in number of zones, from the zone at this level holding the center of the
+	 * system. Distance is with respect to the XOR metric.
 	 */
 	CUInt128 m_zoneIndex;
 
@@ -170,7 +192,7 @@
 	CRoutingBin *m_bin;
 };
 
-} // End namespace
+} // namespace Kademlia
 
-#endif // __ROUTING_ZONE__
+#endif // ROUTINGZONE_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/kademlia/utils/KadClientSearcher.h -> amule-3.1.0.tar.gz/src/kademlia/utils/KadClientSearcher.h Changed

amule-3.0.1.tar.gz/src/kademlia/utils/KadUDPKey.h -> amule-3.1.0.tar.gz/src/kademlia/utils/KadUDPKey.h Changed

@@ -34,23 +34,52 @@
 
 class CKadUDPKey
 {
-      public:
-	CKadUDPKey(uint32_t WXUNUSED_UNLESS_DEBUG(zero) = 0)			{ wxASSERT(zero == 0); m_key = m_ip = 0; }
-	CKadUDPKey(uint32_t key, uint32_t ip) noexcept				{ m_key = key; m_ip = ip; }
-	CKadUDPKey(CFileDataIO& file)						{ ReadFromFile(file); }
-	CKadUDPKey(const CKadUDPKey&) = default;
-	CKadUDPKey& operator=(const CKadUDPKey& k1) noexcept			{ m_key = k1.m_key; m_ip = k1.m_ip; 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) noexcept { return k1.GetKeyValue(k1.m_ip) == k2.GetKeyValue(k2.m_ip);}
-
-	uint32_t	GetKeyValue(uint32_t myIP) const noexcept		{ return (myIP == m_ip) ? m_key : 0; }
-	bool		IsEmpty() const noexcept					{ return (m_key == 0) || (m_ip == 0); }
-	void		StoreToFile(CFileDataIO& file) const			{ file.WriteUInt32(m_key); file.WriteUInt32(m_ip); }
-	void		ReadFromFile(CFileDataIO& file)				{ m_key = file.ReadUInt32(); m_ip = file.ReadUInt32(); }
-
-      private:
-	uint32_t	m_key;
-	uint32_t	m_ip;
+public:
+	CKadUDPKey(uint32_t WXUNUSED_UNLESS_DEBUG(zero) = 0)
+	{
+		wxASSERT(zero == 0);
+		m_key = m_ip = 0;
+	}
+	CKadUDPKey(uint32_t key, uint32_t ip) noexcept
+	{
+		m_key = key;
+		m_ip = ip;
+	}
+	CKadUDPKey(CFileDataIO &file) { ReadFromFile(file); }
+	CKadUDPKey(const CKadUDPKey &) = default;
+	CKadUDPKey &operator=(const CKadUDPKey &k1) noexcept
+	{
+		m_key = k1.m_key;
+		m_ip = k1.m_ip;
+		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) noexcept
+	{
+		return k1.GetKeyValue(k1.m_ip) == k2.GetKeyValue(k2.m_ip);
+	}
+
+	uint32_t GetKeyValue(uint32_t myIP) const noexcept { return (myIP == m_ip) ? m_key : 0; }
+	bool IsEmpty() const noexcept { return (m_key == 0) || (m_ip == 0); }
+	void StoreToFile(CFileDataIO &file) const
+	{
+		file.WriteUInt32(m_key);
+		file.WriteUInt32(m_ip);
+	}
+	void ReadFromFile(CFileDataIO &file)
+	{
+		m_key = file.ReadUInt32();
+		m_ip = file.ReadUInt32();
+	}
+
+private:
+	uint32_t m_key;
+	uint32_t m_ip;
 };
 
 } // namespace Kademlia

amule-3.0.1.tar.gz/src/kademlia/utils/UInt128.cpp -> amule-3.1.0.tar.gz/src/kademlia/utils/UInt128.cpp Changed

@@ -25,7 +25,6 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 // Note To Mods //
 /*
 Please do not change anything here and release it..
@@ -41,8 +40,7 @@
 #include "UInt128.h"
 
 #include "../../ArchSpecific.h"
-#include <common/Format.h>	// Needed for CFormat
-
+#include <common/Format.h> // Needed for CFormat
 
 ////////////////////////////////////////
 using namespace Kademlia;
@@ -103,7 +101,7 @@
 	return str;
 }
 
-CUInt128& CUInt128::SetValueBE(const uint8_t *valueBE) noexcept
+CUInt128 &CUInt128::SetValueBE(const uint8_t *valueBE) noexcept
 {
 	m_data.u32_data3 = wxUINT32_SWAP_ON_LE(RawPeekUInt32(valueBE));
 	m_data.u32_data2 = wxUINT32_SWAP_ON_LE(RawPeekUInt32(valueBE + 4));
@@ -117,9 +115,9 @@
 {
 	wxCHECK_RET(b != NULL, "Destination buffer missing.");
 
-	RawPokeUInt32(b,      wxUINT32_SWAP_ON_LE(m_data.u32_data3));
-	RawPokeUInt32(b + 4,  wxUINT32_SWAP_ON_LE(m_data.u32_data2));
-	RawPokeUInt32(b + 8,  wxUINT32_SWAP_ON_LE(m_data.u32_data1));
+	RawPokeUInt32(b, wxUINT32_SWAP_ON_LE(m_data.u32_data3));
+	RawPokeUInt32(b + 4, wxUINT32_SWAP_ON_LE(m_data.u32_data2));
+	RawPokeUInt32(b + 8, wxUINT32_SWAP_ON_LE(m_data.u32_data1));
 	RawPokeUInt32(b + 12, wxUINT32_SWAP_ON_LE(m_data.u32_data0));
 }
 
@@ -127,18 +125,18 @@
 {
 	wxCHECK_RET(buf != NULL, "Destination buffer missing.");
 
-	RawPokeUInt32(buf,      wxUINT32_SWAP_ON_BE(m_data.u32_data3));
-	RawPokeUInt32(buf + 4,  wxUINT32_SWAP_ON_BE(m_data.u32_data2));
-	RawPokeUInt32(buf + 8,  wxUINT32_SWAP_ON_BE(m_data.u32_data1));
+	RawPokeUInt32(buf, wxUINT32_SWAP_ON_BE(m_data.u32_data3));
+	RawPokeUInt32(buf + 4, wxUINT32_SWAP_ON_BE(m_data.u32_data2));
+	RawPokeUInt32(buf + 8, wxUINT32_SWAP_ON_BE(m_data.u32_data1));
 	RawPokeUInt32(buf + 12, wxUINT32_SWAP_ON_BE(m_data.u32_data0));
 }
 
 int CUInt128::CompareTo(const CUInt128 &other) const noexcept
 {
 	for (int i = 3; i >= 0; i--) {
-	    if (m_data.u32_datai < other.m_data.u32_datai)
+		if (m_data.u32_datai < other.m_data.u32_datai)
 			return -1;
-	    if (m_data.u32_datai > other.m_data.u32_datai)
+		if (m_data.u32_datai > other.m_data.u32_datai)
 			return 1;
 	}
 	return 0;
@@ -153,9 +151,10 @@
 	return 0;
 }
 
-CUInt128& CUInt128::Add(const CUInt128 &value) noexcept
+CUInt128 &CUInt128::Add(const CUInt128 &value) noexcept
 {
-	if (value.IsZero()) return *this;
+	if (value.IsZero())
+		return *this;
 
 	int64_t sum = 0;
 	for (int i = 0; i < 4; i++) {
@@ -167,9 +166,10 @@
 	return *this;
 }
 
-CUInt128& CUInt128::Subtract(const CUInt128 &value) noexcept
+CUInt128 &CUInt128::Subtract(const CUInt128 &value) noexcept
 {
-	if (value.IsZero()) return *this;
+	if (value.IsZero())
+		return *this;
 
 	int64_t sum = 0;
 	for (int i = 0; i < 4; i++) {
@@ -181,7 +181,7 @@
 	return *this;
 }
 
-CUInt128& CUInt128::ShiftLeft(unsigned bits) noexcept
+CUInt128 &CUInt128::ShiftLeft(unsigned bits) noexcept
 {
 	if ((bits == 0) || IsZero())
 		return *this;
@@ -191,14 +191,14 @@
 		return *this;
 	}
 
-	union {
+	union
+	{
 		uint32_t u32_data4;
 		uint64_t u64_data2;
-	} result = {{ 0, 0, 0, 0 }};
+	} result = { { 0, 0, 0, 0 } };
 	int indexShift = (int)bits / 32;
 	int64_t shifted = 0;
-	for (int i = 3; i >= indexShift; i--)
-	{
+	for (int i = 3; i >= indexShift; i--) {
 		shifted += ((int64_t)m_data.u32_data3 - i) << (bits % 32);
 		result.u32_data3 - i + indexShift = (uint32_t)shifted;
 		shifted = shifted >> 32;

amule-3.0.1.tar.gz/src/kademlia/utils/UInt128.h -> amule-3.1.0.tar.gz/src/kademlia/utils/UInt128.h Changed

@@ -37,54 +37,44 @@
 there client on the eMule forum..
 */
 
-#ifndef __UINT128_H__
-#define __UINT128_H__
+#ifndef UINT128_H
+#define UINT128_H
 
 #include "../../Types.h"
 
 ////////////////////////////////////////
-namespace Kademlia {
+namespace Kademlia
+{
 ////////////////////////////////////////
 
 /**
- * Class representing an unsigned 128-bit integer.
+ * An unsigned 128-bit integer.
  *
- * Not all operations are valid, especially multiplicative operations
- * (multiply, divide) and shift right are not implemented.
+ * Not all operations are valid: multiply, divide and shift right are not implemented.
  *
  * @if maint
- * Internal representation: The number is stored as a whole little-endian
- * 128-bit number.
+ * Internal representation: one whole little-endian 128-bit number.
  * @endif
  */
 class CUInt128
 {
 public:
-	CUInt128(const CUInt128& value) noexcept
-	{
-		SetValue(value);
-	}
+	CUInt128(const CUInt128 &value) noexcept { SetValue(value); }
 
 	explicit CUInt128(bool fill = false) noexcept
 	{
 		m_data.u64_data0 = m_data.u64_data1 = (fill ? (uint64_t)-1 : 0);
 	}
 
-	explicit CUInt128(uint32_t value) noexcept
-	{
-		SetValue(value);
-	}
+	explicit CUInt128(uint32_t value) noexcept { SetValue(value); }
 
-	explicit CUInt128(const uint8_t *valueBE) noexcept
-	{
-		SetValueBE(valueBE);
-	}
+	explicit CUInt128(const uint8_t *valueBE) noexcept { SetValueBE(valueBE); }
 
 	/**
-	 * Generates a new number, copying the most significant 'numBits' bits from 'value'.
-	 * The remaining bits are randomly generated.
+	 * Generates a new number, copying the most significant 'numBits' bits from 'value'. The
+	 * remaining bits are random.
 	 */
-	CUInt128(const CUInt128& value, unsigned numBits);
+	CUInt128(const CUInt128 &value, unsigned numBits);
 
 	/* Bit at level 0 being most significant. */
 	unsigned GetBitNumber(unsigned bit) const noexcept
@@ -93,7 +83,7 @@
 	}
 
 	/* Bit at level 0 being most significant. */
-	CUInt128& SetBitNumber(unsigned bit, unsigned value)
+	CUInt128 &SetBitNumber(unsigned bit, unsigned value)
 	{
 		wxCHECK(bit <= 127, *this);
 
@@ -106,10 +96,7 @@
 	}
 
 	/* Chunk 0 being the most significant */
-	uint32_t Get32BitChunk(unsigned val) const noexcept
-	{
-		return val < 4 ? m_data.u32_data3 - val : 0;
-	}
+	uint32_t Get32BitChunk(unsigned val) const noexcept { return val < 4 ? m_data.u32_data3 - val : 0; }
 
 	/* Chunk 0 being the most significant */
 	void Set32BitChunk(unsigned chunk, uint32_t value)
@@ -119,33 +106,32 @@
 		m_data.u32_data3 - chunk = value;
 	}
 
-	CUInt128& SetValueBE(const uint8_t *valueBE) noexcept;
+	CUInt128 &SetValueBE(const uint8_t *valueBE) noexcept;
 
 	wxString ToHexString() const;
 	wxString ToBinaryString(bool trim = false) const;
 	void ToByteArray(uint8_t *b) const;
 
 	/**
-	 * Stores value used by the crypt functions.
+	 * Stores the value used by the crypt functions.
 	 *
-	 * Since eMule started to use the value as-is (four little-endian 32-bit integers in big-endian order),
-	 * we have to reproduce that same representation on every platform.
+	 * eMule uses the value as-is (four little-endian 32-bit integers in big-endian order), so
+	 * we reproduce that representation on every platform.
 	 *
-	 * @param buf Buffer to hold the value. Must be large enough to hold the data (16 bytes at least),
-	 *	and must not be NULL.
+	 * @param buf Buffer to hold the value. Must be non-NULL and at least 16 bytes.
 	 */
 	void StoreCryptValue(uint8_t *buf) const;
 
-      private:
-	int CompareTo(const CUInt128& other) const noexcept;
+private:
+	int CompareTo(const CUInt128 &other) const noexcept;
 	int CompareTo(uint32_t value) const noexcept;
-	CUInt128& Add(const CUInt128& value) noexcept;
-	CUInt128& Add(uint32_t value) noexcept { return value ? Add(CUInt128(value)) : *this; }
-	CUInt128& Subtract(const CUInt128& value) noexcept;
-	CUInt128& Subtract(uint32_t value) noexcept { return value ? Subtract(CUInt128(value)) : *this; }
-	CUInt128& ShiftLeft(unsigned bits) noexcept;
+	CUInt128 &Add(const CUInt128 &value) noexcept;
+	CUInt128 &Add(uint32_t value) noexcept { return value ? Add(CUInt128(value)) : *this; }
+	CUInt128 &Subtract(const CUInt128 &value) noexcept;
+	CUInt128 &Subtract(uint32_t value) noexcept { return value ? Subtract(CUInt128(value)) : *this; }
+	CUInt128 &ShiftLeft(unsigned bits) noexcept;
 
-	CUInt128& XOR(const CUInt128& value) noexcept
+	CUInt128 &XOR(const CUInt128 &value) noexcept
 	{
 		m_data.u64_data0 ^= value.m_data.u64_data0;
 		m_data.u64_data1 ^= value.m_data.u64_data1;
@@ -155,46 +141,53 @@
 
 	bool IsZero() const noexcept { return (m_data.u64_data0 | m_data.u64_data1) == 0; }
 
-      public:
-	bool operator< (const CUInt128& value) const noexcept { return (CompareTo(value) <  0); }
-	bool operator> (const CUInt128& value) const noexcept { return (CompareTo(value) >  0); }
-	bool operator<=(const CUInt128& value) const noexcept { return (CompareTo(value) <= 0); }
-	bool operator>=(const CUInt128& value) const noexcept { return (CompareTo(value) >= 0); }
-	bool operator==(const CUInt128& value) const noexcept { return (CompareTo(value) == 0); }
-	bool operator!=(const CUInt128& value) const noexcept { return (CompareTo(value) != 0); }
-
-	bool operator< (uint32_t value) const noexcept { return (CompareTo(value) <  0); }
-	bool operator> (uint32_t value) const noexcept { return (CompareTo(value) >  0); }
+public:
+	bool operator<(const CUInt128 &value) const noexcept { return (CompareTo(value) < 0); }
+	bool operator>(const CUInt128 &value) const noexcept { return (CompareTo(value) > 0); }
+	bool operator<=(const CUInt128 &value) const noexcept { return (CompareTo(value) <= 0); }
+	bool operator>=(const CUInt128 &value) const noexcept { return (CompareTo(value) >= 0); }
+	bool operator==(const CUInt128 &value) const noexcept { return (CompareTo(value) == 0); }
+	bool operator!=(const CUInt128 &value) const noexcept { return (CompareTo(value) != 0); }
+
+	bool operator<(uint32_t value) const noexcept { return (CompareTo(value) < 0); }
+	bool operator>(uint32_t value) const noexcept { return (CompareTo(value) > 0); }
 	bool operator<=(uint32_t value) const noexcept { return (CompareTo(value) <= 0); }
 	bool operator>=(uint32_t value) const noexcept { return (CompareTo(value) >= 0); }
 	bool operator==(uint32_t value) const noexcept { return (CompareTo(value) == 0); }
 	bool operator!=(uint32_t value) const noexcept { return (CompareTo(value) != 0); }
 
-	CUInt128& operator= (const CUInt128& value) noexcept { SetValue(value); return *this; }
-	CUInt128& operator+=(const CUInt128& value) noexcept { return Add(value); }
-	CUInt128& operator-=(const CUInt128& value) noexcept { return Subtract(value); }
-	CUInt128& operator^=(const CUInt128& value) noexcept { return XOR(value); }
-
-	CUInt128& operator= (uint32_t value) noexcept { SetValue(value); return *this; }
-	CUInt128& operator+=(uint32_t value) noexcept { return Add(value); }
-	CUInt128& operator-=(uint32_t value) noexcept { return Subtract(value); }
-	CUInt128& operator^=(uint32_t value) noexcept { return value ? XOR(CUInt128(value)) : *this; }
+	CUInt128 &operator=(const CUInt128 &value) noexcept
+	{
+		SetValue(value);
+		return *this;
+	}
+	CUInt128 &operator+=(const CUInt128 &value) noexcept { return Add(value); }
+	CUInt128 &operator-=(const CUInt128 &value) noexcept { return Subtract(value); }
+	CUInt128 &operator^=(const CUInt128 &value) noexcept { return XOR(value); }
 
-	CUInt128& operator<<=(unsigned bits) noexcept { return ShiftLeft(bits); }
+	CUInt128 &operator=(uint32_t value) noexcept
+	{
+		SetValue(value);
+		return *this;
+	}
+	CUInt128 &operator+=(uint32_t value) noexcept { return Add(value); }
+	CUInt128 &operator-=(uint32_t value) noexcept { return Subtract(value); }
+	CUInt128 &operator^=(uint32_t value) noexcept { return value ? XOR(CUInt128(value)) : *this; }
 
-	CUInt128  operator+(const CUInt128& value) const noexcept { return CUInt128(*this).operator+=(value); }
-	CUInt128  operator-(const CUInt128& value) const noexcept { return CUInt128(*this).operator-=(value); }
-	CUInt128  operator^(const CUInt128& value) const noexcept { return CUInt128(*this).operator^=(value); }
+	CUInt128 &operator<<=(unsigned bits) noexcept { return ShiftLeft(bits); }
 
-	CUInt128  operator+(uint32_t value) const noexcept { return CUInt128(*this).operator+=(value); }
-	CUInt128  operator-(uint32_t value) const noexcept { return CUInt128(*this).operator-=(value); }
-	CUInt128  operator^(uint32_t value) const noexcept { return CUInt128(*this).operator^=(value); }
+	CUInt128 operator+(const CUInt128 &value) const noexcept { return CUInt128(*this).operator+=(value); }
+	CUInt128 operator-(const CUInt128 &value) const noexcept { return CUInt128(*this).operator-=(value); }
+	CUInt128 operator^(const CUInt128 &value) const noexcept { return CUInt128(*this).operator^=(value); }
 
-	CUInt128  operator<<(unsigned bits) const noexcept { return CUInt128(*this).operator<<=(bits); }
+	CUInt128 operator+(uint32_t value) const noexcept { return CUInt128(*this).operator+=(value); }
+	CUInt128 operator-(uint32_t value) const noexcept { return CUInt128(*this).operator-=(value); }
+	CUInt128 operator^(uint32_t value) const noexcept { return CUInt128(*this).operator^=(value); }
 
+	CUInt128 operator<<(unsigned bits) const noexcept { return CUInt128(*this).operator<<=(bits); }
 
 private:
-	void SetValue(const CUInt128& other) noexcept
+	void SetValue(const CUInt128 &other) noexcept
 	{
 		m_data.u64_data0 = other.m_data.u64_data0;
 		m_data.u64_data1 = other.m_data.u64_data1;
@@ -207,23 +200,51 @@
 		m_data.u64_data1 = 0;
 	}
 
-	union {
+	union
+	{
 		uint32_t u32_data4;
 		uint64_t u64_data2;
 	} m_data;
 };
 
-inline bool operator==(uint32_t x, const CUInt128& y) noexcept { return y.operator==(x); }
-inline bool operator!=(uint32_t x, const CUInt128& y) noexcept { return y.operator!=(x); }
-inline bool operator<(uint32_t x, const CUInt128& y) noexcept { return y.operator>(x); }
-inline bool operator>(uint32_t x, const CUInt128& y) noexcept { return y.operator<(x); }
-inline bool operator<=(uint32_t x, const CUInt128& y) noexcept { return y.operator>=(x); }
-inline bool operator>=(uint32_t x, const CUInt128& y) noexcept { return y.operator<=(x); }
-inline CUInt128 operator+(uint32_t x, const CUInt128& y) noexcept { return y.operator+(x); }
-inline CUInt128 operator-(uint32_t x, const CUInt128& y) noexcept { return CUInt128(x).operator-(y); }
-inline CUInt128 operator^(uint32_t x, const CUInt128& y) noexcept { return y.operator^(x); }
-
-} // End namespace
+inline bool operator==(uint32_t x, const CUInt128 &y) noexcept
+{
+	return y.operator==(x);
+}
+inline bool operator!=(uint32_t x, const CUInt128 &y) noexcept
+{
+	return y.operator!=(x);
+}
+inline bool operator<(uint32_t x, const CUInt128 &y) noexcept
+{
+	return y.operator>(x);
+}
+inline bool operator>(uint32_t x, const CUInt128 &y) noexcept
+{
+	return y.operator<(x);
+}
+inline bool operator<=(uint32_t x, const CUInt128 &y) noexcept
+{
+	return y.operator>=(x);
+}
+inline bool operator>=(uint32_t x, const CUInt128 &y) noexcept
+{
+	return y.operator<=(x);
+}
+inline CUInt128 operator+(uint32_t x, const CUInt128 &y) noexcept
+{
+	return y.operator+(x);
+}
+inline CUInt128 operator-(uint32_t x, const CUInt128 &y) noexcept
+{
+	return CUInt128(x).operator-(y);
+}
+inline CUInt128 operator^(uint32_t x, const CUInt128 &y) noexcept
+{
+	return y.operator^(x);
+}
+
+} // namespace Kademlia
 
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/libs/common/CMakeLists.txt -> amule-3.1.0.tar.gz/src/libs/common/CMakeLists.txt Changed

amule-3.0.1.tar.gz/src/libs/common/FileFunctions.cpp -> amule-3.1.0.tar.gz/src/libs/common/FileFunctions.cpp Changed

@@ -23,42 +23,39 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include <wx/dir.h>		// Needed for wxDir
-#include <wx/fs_zip.h>		// Needed for wxZipFSHandler
-#include <wx/wfstream.h>	// wxFileInputStream
-#include <wx/zipstrm.h>		// Needed for wxZipInputStream
-#include <wx/zstream.h>		// Needed for wxZlibInputStream
-#include <wx/log.h>		// Needed for wxSysErrorMsg
+#include <wx/dir.h>      // Needed for wxDir
+#include <wx/fs_zip.h>   // Needed for wxZipFSHandler
+#include <wx/wfstream.h> // wxFileInputStream
+#include <wx/zipstrm.h>  // Needed for wxZipInputStream
+#include <wx/zstream.h>  // Needed for wxZlibInputStream
+#include <wx/log.h>      // Needed for wxSysErrorMsg
 
 #ifdef __WXMAC__
 #include <zlib.h> // Do_not_auto_remove
 #endif
-#include <algorithm>		// Needed for std::min
+#include <algorithm> // Needed for std::min
+
+#ifndef __WINDOWS__
+#include <sys/stat.h> // chmod / stat for RestrictToOwner
+#endif
 
 #include "FileFunctions.h"
 #include "StringFunctions.h"
-#include "SmartPtr.h"		// Needed for CSmartPtr
+#include "SmartPtr.h" // Needed for CSmartPtr
 
-//
 // This class assumes that the following line has been executed:
 //
 //	wxConvFileName = &aMuleConvBrokenFileNames;
 //
-// This line is necessary so that wxWidgets handles unix file names correctly.
-//
-CDirIterator::CDirIterator(const CPath& dir)
-	: wxDir(dir.GetRaw())
+// It is necessary for wxWidgets to handle unix file names correctly.
+CDirIterator::CDirIterator(const CPath &dir)
+: wxDir(dir.GetRaw())
 {
 }
 
+CDirIterator::~CDirIterator() {}
 
-CDirIterator::~CDirIterator()
-{
-}
-
-
-CPath CDirIterator::GetFirstFile(FileType type, const wxString& mask, int extraFlags)
+CPath CDirIterator::GetFirstFile(FileType type, const wxString &mask, int extraFlags)
 {
 	if (!IsOpened()) {
 		return CPath();
@@ -72,7 +69,6 @@
 	return CPath(fileName);
 }
 
-
 CPath CDirIterator::GetNextFile()
 {
 	wxString fileName;
@@ -83,22 +79,20 @@
 	return CPath(fileName);
 }
 
-
-bool CDirIterator::HasSubDirs(const wxString& spec)
+bool CDirIterator::HasSubDirs(const wxString &spec)
 {
 	// Checking IsOpened() in case we don't have permissions to read that dir.
 	return IsOpened() && wxDir::HasSubDirs(spec);
 }
 
-
-static EFileType GuessFiletype(const wxString& file)
+static EFileType GuessFiletype(const wxString &file)
 {
 	wxFile archive(file, wxFile::read);
 	if (!archive.IsOpened()) {
 		return EFT_Error;
 	}
-	static const uint8 UTF8bom3 = {0xEF, 0xBB, 0xBF};
-	uint8 head10 = {0, 0};
+	static const uint8 UTF8bom3 = { 0xEF, 0xBB, 0xBF };
+	uint8 head10 = { 0, 0 };
 	int read = archive.Read(head, std::min<off_t>(10, archive.Length()));
 
 	if (read == wxInvalidOffset || read == 0) {
@@ -117,9 +111,7 @@
 	// 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(headi)
-				||	isspace(headi)
-				||	(i < 3 && headi == UTF8bomi))) {
+		if (!(isprint(headi) || isspace(headi) || (i < 3 && headi == UTF8bomi))) {
 			return EFT_Unknown;
 		}
 	}
@@ -127,12 +119,10 @@
 	return EFT_Text;
 }
 
-
 /**
- * Replaces the zip-archive with "guarding.p2p" or "ipfilter.dat",
- * if either of those files are found in the archive.
+ * Replaces the zip archive with "guarding.p2p" or "ipfilter.dat", if either is found inside it.
  */
-static bool UnpackZipFile(const wxString& file, const char* files)
+static bool UnpackZipFile(const wxString &file, const char *files)
 {
 	wxTempFile target(file);
 	CSmartPtr<wxZipEntry> entry;
@@ -156,17 +146,16 @@
 				while (!zip.Eof()) {
 					zip.Read(buffer, sizeof(buffer));
 					if (zip.LastRead() == 0) {
-						// Stream stuck (e.g. unsupported compression
-						// method on this entry). wxZipInputStream
-						// doesn't advance its EOF flag in this case,
-						// so the original loop spun forever -- on a
-						// malformed eMule-security IPFilter feed it
-						// emitted gigabytes of "Error: unsupported
-						// Zip compression method" inside seconds
-						// (#376). Bail and let the caller treat this
-						// download as failed; the next fetch will
-						// pick up the clean copy.
-						run = false;
+						// Stream stuck, e.g. an unsupported compression
+						// method on this entry. wxZipInputStream does not
+						// advance its EOF flag then, so the original loop
+						// spun forever -- on a malformed eMule-security
+						// IPFilter feed it emitted gigabytes of "Error:
+						// unsupported Zip compression method" within
+						// seconds (#376). Bail and let the caller treat
+						// this download as failed; the next fetch picks up
+						// the clean copy. (run is set false after the loop,
+						// so no assignment is needed here.)
 						break;
 					}
 					target.Write(buffer, zip.LastRead());
@@ -184,11 +173,10 @@
 	return false;
 }
 
-
 /**
  * Unpacks a GZip file and replaces the archive.
  */
-static bool UnpackGZipFile(const wxString& file)
+static bool UnpackGZipFile(const wxString &file)
 {
 	wxTempFile target(file);
 
@@ -209,14 +197,15 @@
 			} else if (bytesRead < 0) {
 				wxString errString;
 				int gzerrnum;
-				const char* gzerrstr = gzerror(inputFile, &gzerrnum);
+				const char *gzerrstr = gzerror(inputFile, &gzerrnum);
 				if (gzerrnum == Z_ERRNO) {
 					errString = wxSysErrorMsg();
 				} else {
 					errString = wxString::FromAscii(gzerrstr);
 				}
 
-				// AddDebugLogLineN( logFileIO, "Error reading gzip stream (" + errString + ")" );
+				// AddDebugLogLineN( logFileIO, "Error reading gzip stream (" + errString +
+				// ")" );
 				write = false;
 				break;
 			}
@@ -225,7 +214,8 @@
 		// AddDebugLogLineN( logFileIO, "End reading gzip stream" );
 		gzclose(inputFile);
 	} else {
-		// AddDebugLogLineN( logFileIO, "Error opening gzip file (" + wxString(wxSysErrorMsg()) + ")" );
+		// AddDebugLogLineN( logFileIO, "Error opening gzip file (" + wxString(wxSysErrorMsg()) + ")"
+		// );
 	}
 #else
 	{
@@ -260,32 +250,57 @@
 	return write;
 }
 
-
-UnpackResult UnpackArchive(const CPath& path, const char* files)
+UnpackResult UnpackArchive(const CPath &path, const char *files)
 {
 	const wxString file = path.GetRaw();
 
 	// Attempt to discover the filetype and uncompress
 	EFileType type = GuessFiletype(file);
 	switch (type) {
-		case EFT_Zip:
-			if (UnpackZipFile(file, files)) {
-				// Unpack nested archives if needed.
-				return UnpackResult(true, UnpackArchive(path, files).second);
-			} else {
-				return UnpackResult(false, EFT_Error);
-			}
+	case EFT_Zip:
+		if (UnpackZipFile(file, files)) {
+			// Unpack nested archives if needed.
+			return UnpackResult(true, UnpackArchive(path, files).second);
+		} else {
+			return UnpackResult(false, EFT_Error);
+		}
 
-		case EFT_GZip:
-			if (UnpackGZipFile(file)) {
-				// Unpack nested archives if needed.
-				return UnpackResult(true, UnpackArchive(path, files).second);
-			} else {
-				return UnpackResult(false, EFT_Error);
-			}
+	case EFT_GZip:
+		if (UnpackGZipFile(file)) {
+			// Unpack nested archives if needed.
+			return UnpackResult(true, UnpackArchive(path, files).second);
+		} else {
+			return UnpackResult(false, EFT_Error);
+		}
 
-		default:
-			return UnpackResult(false, type);
+	default:
+		return UnpackResult(false, type);
 	}
 }
+bool RestrictToOwner(const CPath &file)
+{
+#ifdef __WINDOWS__
+	(void)file;
+	return false;
+#else
+	if (!file.FileExists()) {
+		return false;
+	}
+	const wxCharBuffer path = file.GetRaw().mb_str(wxConvFile);
+	struct stat st;
+	if (::stat(path.data(), &st) != 0) {
+		return false;
+	}
+	// Only act when something is actually loose, so the common case is a
+	// single stat and no write to the filesystem.
+	const mode_t loose = st.st_mode & (S_IRWXG | S_IRWXO);
+	if (loose == 0) {
+		return false;
+	}
+	// mulecommon sits below the logger, so report the outcome to the caller
+	// rather than logging here.
+	return ::chmod(path.data(), S_IRUSR | S_IWUSR) == 0;
+#endif
+}
+
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/libs/common/FileFunctions.h -> amule-3.1.0.tar.gz/src/libs/common/FileFunctions.h Changed

@@ -23,7 +23,6 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #ifndef FILEFUNCTIONS_H
 #define FILEFUNCTIONS_H
 
@@ -32,34 +31,35 @@
 
 #include <wx/dir.h>
 
-
 // Dir iterator: needed because wxWidget's wxFindNextFile and
 // wxFindFirstFile are bugged like hell.
 class CDirIterator : private wxDir
 {
 public:
-	enum FileType {
+	enum FileType
+	{
 		FileNoHidden = wxDIR_FILES,
-		DirNoHidden  = wxDIR_DIRS,
+		DirNoHidden = wxDIR_DIRS,
 		File = wxDIR_FILES | wxDIR_HIDDEN,
-		Dir  = wxDIR_DIRS  | wxDIR_HIDDEN,
-		Any  = wxDIR_FILES | wxDIR_DIRS   | wxDIR_HIDDEN
+		Dir = wxDIR_DIRS | wxDIR_HIDDEN,
+		Any = wxDIR_FILES | wxDIR_DIRS | wxDIR_HIDDEN
 	};
 
-	CDirIterator(const CPath& dir);
+	CDirIterator(const CPath &dir);
 	~CDirIterator();
 
-	// extraFlags is OR'd into the wxDir search flags on top of `type`,
-	// so callers that need wxDIR_NO_FOLLOW (or any other wx flag) can
-	// pass it through without this common library knowing about
-	// application-level preferences.
-	CPath GetFirstFile(FileType type, const wxString& mask = "", int extraFlags = 0);
+	// False when the directory could not be opened, e.g. without read permission.
+	using wxDir::IsOpened;
+
+	// extraFlags is OR'd into the wxDir search flags on top of `type`, so a caller needing
+	// wxDIR_NO_FOLLOW (or any other wx flag) can pass it through without this common library
+	// knowing about application-level preferences.
+	CPath GetFirstFile(FileType type, const wxString &mask = "", int extraFlags = 0);
 	CPath GetNextFile();
 
-	bool HasSubDirs(const wxString& spec = "");
+	bool HasSubDirs(const wxString &spec = "");
 };
 
-
 //! Filetypes understood by UnpackArchive
 enum EFileType
 {
@@ -77,23 +77,40 @@
 	EFT_Error
 };
 
-
 typedef std::pair<bool, EFileType> UnpackResult;
 
 /**
  * Unpacks a single file from an archive, replacing the archive.
  *
  * @param file The archive.
- * @param files An array of filenames (terminated by a NULL entry) which should be unpacked.
- * @return The first value is true if the archive was unpacked, the second is the resulting filetype.
+ * @param files Filenames to unpack, terminated by a NULL entry.
+ * @return True if the archive was unpacked, plus the resulting filetype.
+ *
+ * A file that is not an archive is left unchanged and its type returned. A GZip archive is unpacked
+ * and replaced by the new file. In a Zip archive the first file matching any in @a files (case-
+ * insensitively) is unpacked over the archive.
+ */
+UnpackResult UnpackArchive(const CPath &file, const char *files);
+
+/**
+ * Restrict @a file to owner read/write (0600) if it is currently looser.
+ *
+ * For config files holding credentials. aMule's own configs are created with whatever the umask
+ * allows -- 0644 on macOS, and 0664 under the 0002 umask Debian and Ubuntu ship, which leaves the
+ * file group-*writable*.
+ *
+ * Called at startup rather than at creation so existing installs are fixed on the first run of a
+ * version that does this, not just new ones. Safe to repeat: it stats first and only acts when
+ * something needs tightening. wxFileConfig replaces the file on save but carries the mode across,
+ * so one call holds.
+ *
+ * No-op on Windows, which has no POSIX mode bits; there the file is protected by the profile
+ * directory's ACL, the same compromise Credentials.cpp makes.
  *
- * If the file specified is not an archive, it will be left unchanged and
- * the file-type returned. If it is a GZip archive, the archive will be
- * unpacked and the new file will replace the archive. If the archive is a
- * Zip archive, the first file found matching any in the files array (case-
- * insensitive) will be unpacked and overwrite the archive.
+ * @return true only when permissions were actually tightened, so the caller can say so once; this
+ *         library sits below the logger.
  */
-UnpackResult UnpackArchive(const CPath& file, const char* files);
+bool RestrictToOwner(const CPath &file);
 
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/libs/common/Format.cpp -> amule-3.1.0.tar.gz/src/libs/common/Format.cpp Changed

@@ -27,43 +27,44 @@
 #include "config.h"
 
 #if defined HAVE_STDINT_H
-#	include <stdint.h>
+#include <stdint.h>
 #elif defined HAVE_INTTYPES_H
-#	include <inttypes.h>
+#include <inttypes.h>
 #endif
 
-#include <wx/intl.h>			// Needed for _()
+#include <wx/intl.h> // Needed for _()
 
-#include <errno.h>			// Needed for errno and EINVAL
-#include "strerror_r.h"			// Needed for mule_strerror_r()
+#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. */
 inline bool isTypeChar(wxChar c)
 {
 	switch (c) {
-		case 's':		// String of characters
-		case 'u':		// Unsigned decimal integer
-		case 'i':		// Signed decimal integer
-		case 'd':		// Signed decimal integer
-		case 'c':		// Character
-		case 'f':		// Decimal floating point
-		case 'F':		// Decimal floating point
-		case 'x':		// Unsigned hexadecimal integer
-		case 'X':		// Unsigned hexadecimal integer (capital letters)
-		case 'o':		// Unsigned octal
-		case 'e':		// Scientific notation (mantise/exponent) using e character
-		case 'E':		// Scientific notation (mantise/exponent) using E character
-		case 'g':		// Use shorter %e or %f
-		case 'G':		// Use shorter %E or %F
-		case 'p':		// Pointer
-		case 'n':		// Not supported, still needs to be caught though
-		case 'a':		// (C99; not in SUSv2) Double in hexadecimal notation.
-		case 'A':		// (C99; not in SUSv2) Double in hexadecimal notation (capital letters).
-		case 'C':		// (Not in C99, but in SUSv2.)  Synonym for lc.  Don't use. Not supported.
-		case 'S':		// (Not in C99, but in SUSv2.)  Synonym for ls.  Don't use. Not supported.
-		case 'm':		// (Glibc extension.)  Print output of strerror(errno).  No argument is required.
-//		case '%':		// A `%' is written.  No argument is converted.  The complete conversion specification is `%%'.
-			return true;
+	case 's': // String of characters
+	case 'u': // Unsigned decimal integer
+	case 'i': // Signed decimal integer
+	case 'd': // Signed decimal integer
+	case 'c': // Character
+	case 'f': // Decimal floating point
+	case 'F': // Decimal floating point
+	case 'x': // Unsigned hexadecimal integer
+	case 'X': // Unsigned hexadecimal integer (capital letters)
+	case 'o': // Unsigned octal
+	case 'e': // Scientific notation (mantise/exponent) using e character
+	case 'E': // Scientific notation (mantise/exponent) using E character
+	case 'g': // Use shorter %e or %f
+	case 'G': // Use shorter %E or %F
+	case 'p': // Pointer
+	case 'n': // Not supported, still needs to be caught though
+	case 'a': // (C99; not in SUSv2) Double in hexadecimal notation.
+	case 'A': // (C99; not in SUSv2) Double in hexadecimal notation (capital letters).
+	case 'C': // (Not in C99, but in SUSv2.)  Synonym for lc.  Don't use. Not supported.
+	case 'S': // (Not in C99, but in SUSv2.)  Synonym for ls.  Don't use. Not supported.
+	case 'm': // (Glibc extension.)  Print output of strerror(errno).  No argument is required.
+		  //		case '%':		// A `%' is written.  No argument is converted.  The
+		  // complete conversion specification is `%%'.
+		return true;
 	}
 
 	return false;
@@ -73,17 +74,19 @@
 inline bool isFlagChar(wxChar c)
 {
 	switch (c) {
-		// C standard flags
-		case '+':		// Include sign for integers
-		case '-':		// Left-align output
-		case '#':		// Alternate form, varies
-		case ' ':		// Pad with spaces
-		case '0':		// Pad with zeros
-		// SUSv2
-		case '\'':		// 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 'I':		// For decimal integer conversion (i, d, u) the output uses the locale's alternative output digits, if any.
-			return true;
+	// C standard flags
+	case '+': // Include sign for integers
+	case '-': // Left-align output
+	case '#': // Alternate form, varies
+	case ' ': // Pad with spaces
+	case '0': // Pad with zeros
+	// SUSv2
+	case '\'': // 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 'I': // For decimal integer conversion (i, d, u) the output uses the locale's alternative output
+		  // digits, if any.
+		return true;
 	}
 
 	return false;
@@ -93,91 +96,157 @@
 inline bool isLengthChar(wxChar c)
 {
 	switch (c) {
-		case 'h':		// Short ('hh') and char ('h')
-		case 'l':		// Long ('l') and long long ('ll')
-		case 'L':		// Double long
-		case 'z':		// size_t
-		case 'j':		// intmax_t
-		case 't':		// ptrdiff_t
-		case 'q':		// quad. Synonym for 'll'. Don't use.
-			return true;
+	case 'h': // Short ('hh') and char ('h')
+	case 'l': // Long ('l') and long long ('ll')
+	case 'L': // Double long
+	case 'z': // size_t
+	case 'j': // intmax_t
+	case 't': // ptrdiff_t
+	case 'q': // quad. Synonym for 'll'. Don't use.
+		return true;
 	}
 
 	return false;
 }
 
 /** Returns true if the argument is a valid length modifier */
-inline bool isValidLength(const wxString& str)
+inline bool isValidLength(const wxString &str)
 {
-	return ((str == "hh") || (str == "h") ||
-		(str == "l") || (str == "ll") ||
-		(str == "L") || (str == "z") ||
-		(str == "j") || (str == "t") ||
-		(str == "q"));
+	return ((str == "hh") || (str == "h") || (str == "l") || (str == "ll") || (str == "L") ||
+		(str == "z") || (str == "j") || (str == "t") || (str == "q"));
 }
 
-
-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
+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
+ * 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 '%').
+ * Every format string is extracted, valid or not. '%%' counts as a special format string that takes
+ * no arguments and is extracted too, since it has to be converted to '%'.
  */
 static eStringParserStates stringParser3 = {
-			/* %-sign,		type-char,	other */
-/* esNonFormat */	{ esFormatStart,	esNonFormat,	esNonFormat	},
-/* esFormatStart */	{ esFormatEnd,		esFormatEnd,	esFormat	},
-/* esFormat */		{ esInvalidFormat,	esFormatEnd,	esFormat	},
-/* esFormatEnd */	{ esFormatStart,	esNonFormat,	esNonFormat	},
-/* esInvalidFormat */	{ esFormatEnd,		esFormatEnd,	esFormat	}
+	/* %-sign,		type-char,	other */
+	/* esNonFormat */ { esFormatStart, esNonFormat, esNonFormat },
+	/* esFormatStart */ { esFormatEnd, esFormatEnd, esFormat },
+	/* esFormat */ { esInvalidFormat, esFormatEnd, esFormat },
+	/* esFormatEnd */ { esFormatStart, esNonFormat, esNonFormat },
+	/* esInvalidFormat */ { esFormatEnd, esFormatEnd, esFormat }
 };
 
-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
+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
+	efType, // Type character
+	efError // Invalid format specifier
 };
 
 /**
- * State machine to parse format specifiers
+ * State machine to parse format specifiers.
  *
- * Format specifiers are expected to follow the following structure:
- *	%argIndex$FlagsWidth.PrecisionLength<Type>
+ * Format specifiers follow this structure: %argIndex$FlagsWidth.PrecisionLength<Type>
  */
 static eFormatParserStates formatParser7 = {
-			/* 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, }
+	/* 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&);
+template <> void CFormat::ProcessArgument(FormatList::iterator, const wxString &);
 
-void CFormat::Init(const wxString& str)
+void CFormat::Init(const wxString &str)
 {
 	m_formatString = str;
 	m_argIndex = 0;
@@ -195,25 +264,26 @@
 				state = stringParserstate2;
 			}
 			switch (state) {
-				case esInvalidFormat:
-					wxFAIL_MSG("Invalid format specifier: " + str.Mid(formatStart, pos - formatStart + 1));
-				/* fall through */
-				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;
+			case esInvalidFormat:
+				wxFAIL_MSG("Invalid format specifier: " +
+					   str.Mid(formatStart, pos - formatStart + 1));
+			/* fall through */
+			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;
 			}
 		}
-		wxASSERT_MSG((state == esFormatEnd) || (state == esNonFormat), "Incomplete format specifier: " + str.Mid(formatStart));
+		wxASSERT_MSG((state == esFormatEnd) || (state == esNonFormat),
+			"Incomplete format specifier: " + str.Mid(formatStart));
 	}
 
 	// Parse the extracted format specifiers, removing invalid ones
@@ -257,75 +327,90 @@
 					num += (c - '0');
 				}
 				switch (state) {
-					case efArgIndexEnd:
-						it->argIndex = num;
-						num = 0;
-						break;
-					case efFlagChar:
-						it->flag = c;
-						break;
-					case efPrecStart:
+				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;
-						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 == 'm') {
-							it->argIndex = 0;
-							it->type = 's';
-							int errnum = errno;
+					}
+					if (c == 'm') {
+						it->argIndex = 0;
+						it->type = 's';
+						int errnum = errno;
 #if defined(HAVE_STRERROR) || defined(HAVE_STRERROR_R)
-							unsigned buflen = 256;
-							bool done = false;
-							do {
-								errno = 0;
-								char* buf = new charbuflen;
-								*buf = '\0';
-								int result = mule_strerror_r(errnum, buf, buflen);
-								if ((result == 0) || (buflen > 1024)) {
-									ProcessArgument<const wxString&>(it, wxString(buf, wxConvLibc));
-								} else if (errno == EINVAL) {
-									if (*buf == '\0') {
-										ProcessArgument<const wxString&>(it, wxString::Format(_("Unknown error %d"), errnum));
-									} else {
-										ProcessArgument<const wxString&>(it, wxString(buf, wxConvLibc));
-									}
-								} else if (errno != ERANGE) {
-									ProcessArgument<const wxString&>(it, wxString::Format(_("Unable to get error description for error %d"), errnum));
+						unsigned buflen = 256;
+						bool done = false;
+						do {
+							errno = 0;
+							char *buf = new charbuflen;
+							*buf = '\0';
+							int result = mule_strerror_r(errnum, buf, buflen);
+							if ((result == 0) || (buflen > 1024)) {
+								ProcessArgument<const wxString &>(
+									it, wxString(buf, wxConvLibc));
+							} else if (errno == EINVAL) {
+								if (*buf == '\0') {
+									ProcessArgument<const wxString &>(it,
+										wxString::Format(
+											_("Unknown error %d"),
+											errnum));
 								} else {
-									buflen <<= 1;
+									ProcessArgument<const wxString &>(it,
+										wxString(buf, wxConvLibc));
 								}
-								delete  buf;
-								done = ((result == 0) || (errno != ERANGE));
-							} while (!done);
+							} 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("Unable to get error description for error %d.", errnum));
-							ProcessArgument<const wxString&>(it, wxString::Format(_("Unable to get error description for error %d"), errnum));
+						wxFAIL_MSG(wxString::Format(
+							"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;
+					} else {
+						it->type = c;
+					}
+				default:
+					break;
 				}
-				wxCHECK2_MSG(state != efError, break, "Invalid format specifier: " + it->result);
+				wxCHECK2_MSG(
+					state != efError, break, "Invalid format specifier: " + it->result);
 				if (state == efType) {
 					// Needed by the '%m' conversion, which takes place immediately,
 					// overwriting it->result
@@ -376,142 +461,137 @@
 }
 
 // Forward-declare the specialization for unsigned long long
-template<> void CFormat::ProcessArgument(FormatList::iterator, unsigned long long);
+template <> void CFormat::ProcessArgument(FormatList::iterator, unsigned long long);
 
 // Processing a double-precision floating-point argument
-template<>
-void CFormat::ProcessArgument(FormatList::iterator it, double value)
+template <> void CFormat::ProcessArgument(FormatList::iterator it, double value)
 {
 	switch (it->type) {
-		case 'a':
-		case 'A':
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'F':
-		case 'g':
-		case 'G':
-			break;
-		case 's':
-			it->type = 'g';
-			break;
-		default:
-			wxFAIL_MSG("Floating-point value passed for non-floating-point format field: " + it->result);
-			return;
+	case 'a':
+	case 'A':
+	case 'e':
+	case 'E':
+	case 'f':
+	case 'F':
+	case 'g':
+	case 'G':
+		break;
+	case 's':
+		it->type = 'g';
+		break;
+	default:
+		wxFAIL_MSG("Floating-point value passed for non-floating-point format field: " + it->result);
+		return;
 	}
 	it->result = wxString::Format(GetModifiers(it) + it->type, value);
 }
 
 // Processing a wxChar argument
-template<>
-void CFormat::ProcessArgument(FormatList::iterator it, wxChar value)
+template <> void CFormat::ProcessArgument(FormatList::iterator it, wxChar value)
 {
 	switch (it->type) {
-		case 'c':
-			break;
-		case 's':
-			it->type = 'c';
-			break;
-		case 'u':
-		case 'd':
-		case 'i':
-		case 'o':
-		case 'x':
-		case 'X':
-			ProcessArgument(it, (unsigned long long)value);
-			return;
-		case 'a':
-		case 'A':
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'F':
-		case 'g':
-		case 'G':
-			ProcessArgument(it, (double)value);
-			return;
-		default:
-			wxFAIL_MSG("Character value passed to non-character format field: " + it->result);
-			return;
+	case 'c':
+		break;
+	case 's':
+		it->type = 'c';
+		break;
+	case 'u':
+	case 'd':
+	case 'i':
+	case 'o':
+	case 'x':
+	case 'X':
+		ProcessArgument(it, (unsigned long long)value);
+		return;
+	case 'a':
+	case 'A':
+	case 'e':
+	case 'E':
+	case 'f':
+	case 'F':
+	case 'g':
+	case 'G':
+		ProcessArgument(it, (double)value);
+		return;
+	default:
+		wxFAIL_MSG("Character value passed to non-character format field: " + it->result);
+		return;
 	}
 	it->result = wxString::Format(GetModifiers(it) + it->type, value);
 }
 
 // Processing a signed long long argument
-template<>
-void CFormat::ProcessArgument(FormatList::iterator it, signed long long value)
+template <> void CFormat::ProcessArgument(FormatList::iterator it, signed long long value)
 {
 	switch (it->type) {
-		case 'c':
-			ProcessArgument(it, (wxChar)value);
-			return;
-		case 'i':
-			break;
-		case 'o':
-		case 'x':
-		case 'X':
-			ProcessArgument(it, (unsigned long long)value);
-			return;
-		case 'u':
-		case 'd':
-		case 's':
-			it->type = 'i';
-			break;
-		case 'a':
-		case 'A':
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'F':
-		case 'g':
-		case 'G':
-			ProcessArgument(it, (double)value);
-			return;
-		default:
-			wxFAIL_MSG("Integer value passed for non-integer format field: " + it->result);
-			return;
+	case 'c':
+		ProcessArgument(it, (wxChar)value);
+		return;
+	case 'i':
+		break;
+	case 'o':
+	case 'x':
+	case 'X':
+		ProcessArgument(it, (unsigned long long)value);
+		return;
+	case 'u':
+	case 'd':
+	case 's':
+		it->type = 'i';
+		break;
+	case 'a':
+	case 'A':
+	case 'e':
+	case 'E':
+	case 'f':
+	case 'F':
+	case 'g':
+	case 'G':
+		ProcessArgument(it, (double)value);
+		return;
+	default:
+		wxFAIL_MSG("Integer value passed for non-integer format field: " + it->result);
+		return;
 	}
 	it->result = wxString::Format(GetModifiers(it) + WXLONGLONGFMTSPEC + it->type, value);
 }
 
 // Processing an unsigned long long argument
-template<>
-void CFormat::ProcessArgument(FormatList::iterator it, unsigned long long value)
+template <> void CFormat::ProcessArgument(FormatList::iterator it, unsigned long long value)
 {
 	switch (it->type) {
-		case 'c':
-			ProcessArgument(it, (wxChar)value);
-			return;
-		case 'u':
-		case 'o':
-		case 'x':
-		case 'X':
-			break;
-		case 'i':
-		case 'd':
-		case 's':
-			it->type = 'u';
-			break;
-		case 'a':
-		case 'A':
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'F':
-		case 'g':
-		case 'G':
-			ProcessArgument(it, (double)value);
-			return;
-		default:
-			wxFAIL_MSG("Integer value passed for non-integer format field: " + it->result);
-			return;
+	case 'c':
+		ProcessArgument(it, (wxChar)value);
+		return;
+	case 'u':
+	case 'o':
+	case 'x':
+	case 'X':
+		break;
+	case 'i':
+	case 'd':
+	case 's':
+		it->type = 'u';
+		break;
+	case 'a':
+	case 'A':
+	case 'e':
+	case 'E':
+	case 'f':
+	case 'F':
+	case 'g':
+	case 'G':
+		ProcessArgument(it, (double)value);
+		return;
+	default:
+		wxFAIL_MSG("Integer value passed for non-integer format field: " + it->result);
+		return;
 	}
 	it->result = wxString::Format(GetModifiers(it) + WXLONGLONGFMTSPEC + it->type, value);
 }
 
 // Processing a wxString argument
-template<>
-void CFormat::ProcessArgument(FormatList::iterator it, const wxString& value)
+template <> void CFormat::ProcessArgument(FormatList::iterator it, const wxString &value)
 {
 	if (it->type != 's') {
 		wxFAIL_MSG("String value passed for non-string format field: " + it->result);
@@ -525,25 +605,23 @@
 			if (it->flag == '-') {
 				it->result += wxString(it->width - it->result.length(), ' ');
 			} else {
-				it->result = wxString(it->width -it->result.length(), ' ') + it->result;
+				it->result = wxString(it->width - it->result.length(), ' ') + it->result;
 			}
 		}
 	}
 }
 
 // Processing pointer arguments
-template<>
-void CFormat::ProcessArgument(FormatList::iterator it, void * value)
+template <> void CFormat::ProcessArgument(FormatList::iterator it, void *value)
 {
 	if ((it->type == 'p') || (it->type == '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
-		// -> format it as hex
-		if (sizeof(void*) == 8) {
+		// Modifiers, if any, are ignored for pointer conversions. The built-in Format for
+		// pointers is not consistent -- Windows gives uppercase with no leading 0x, Linux
+		// drops leading zeros -- so format it as hex.
+		if (sizeof(void *) == 8) {
 			// 64 bit
-			it->result = wxString::Format(wxString("0x%016") + WXLONGLONGFMTSPEC + "x", (uintptr_t)value);
+			it->result = wxString::Format(
+				wxString("0x%016") + WXLONGLONGFMTSPEC + "x", (uintptr_t)value);
 		} else {
 			// 32 bit
 			it->result = wxString::Format("0x%08x", (uintptr_t)value);
@@ -553,10 +631,8 @@
 	}
 }
 
-
 // Generic argument processor template
-template<typename _Tp>
-CFormat& CFormat::operator%(_Tp value)
+template <typename _Tp> CFormat &CFormat::operator%(_Tp value)
 {
 	m_argIndex++;
 	for (FormatList::iterator it = m_formats.begin(); it != m_formats.end(); ++it) {
@@ -572,11 +648,11 @@
 }
 
 // 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 *);
+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-3.0.1.tar.gz/src/libs/common/Format.h -> amule-3.1.0.tar.gz/src/libs/common/Format.h Changed

@@ -29,173 +29,184 @@
 #include <string> // Needed to use std::string
 #include "MuleDebug.h"
 
-
 /**
- * This class offers a typesafe alternative to wxString::Format.
- *
- * %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 extremely slow and shouldn't be used.
+ * A typesafe alternative to wxString::Format, implemented against the printf description in
+ * "man 3 printf".
  *
- * 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 @c "*" width-modifier, because only one argument is fed at a time,
+ *  - the @c "n" type, which is unsafe and will not be implemented,
+ *  - the @c "C" and @c "S" types, considered obsolete,
+ *  - the Long Double type, which is extremely slow and should not 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.
+ * Support for the C99 @c a, @c A conversions and the non-standard @c ', @c I flags depends on the
+ * underlying C library. Do not use them. The glibc-specific @c m conversion is supported on every
+ * platform that offers an error description, and is thread-safe wherever that lookup is.
  *
- * 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
+ * Deviations from printf(3): %CFormat tries hard to format the passed POD type according to the
+ * conversion type, converting basic types where needed, so a format accepts a variety of types:
+ *  - @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 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.
+ *  - @c s accepts all of the above plus @c wxString and @c wxChar*.
  *
- * 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.
+ * The exception is integer (@c d, @c i, @c u) conversion, which always uses @c i or @c u according
+ * to the signedness of the argument passed.
  *
- * @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.
+ * @c 's' conversions follow the "we are converting to string anyway" mood, so each accepted type
+ * gets a default conversion: @c 'c' for @c wxChar, @c 'i' and @c 'u' for signed and unsigned
+ * integers, @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.
+ * Other relaxations:
+ *  - Length modifiers are read and validated, but always ignored, so an invalid combination of
+ *    length modifier and conversion type is silently ignored (@c '%%qs' is treated as @c '%%s').
+ *  - @c 'p' conversion ignores every modifier except the argument index reference.
+ *  - Positional and indexed argument references can be mixed. (They actually cannot, because
+ *    msgfmt treats that as an error.)
+ *  - Indexed argument references may leave gaps in the indices.
  */
 class CFormat
 {
-      private:
+private:
 	/**
-	 * Structure to hold a format specifier.
+	 * Holds 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.
+	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.
+		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.
+	 * @param str The format string to be used.
 	 */
-	CFormat(const wxChar* str)	{ Init(str); }
+	CFormat(const wxChar *str) { Init(str); }
 
 	/**
-	 * Constructor.
-	 *
-	 * This form is required to construct from a plain char *
-	 * with wx 2.9
-	 *
-	 * @param str The format-string to be used.
+	 * Required to construct from a plain char * with wx 2.9. @param str The format string to be
+	 * used.
 	 */
-	CFormat(const wxString& str)	{ Init(str); }
+	CFormat(const wxString &str) { Init(str); }
 
 	/**
-	 * 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 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.
+	 * Feeds a value into the format string. A type incompatible with the current format field
+	 * skips the field and raises an exception; any type fed to a CFormat with no free fields is
+	 * ignored. Specialize this member template to teach CFormat other types.
 	 */
-	template<typename _Tp> CFormat& operator%(_Tp 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); }
+	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); }
-	CFormat& operator%(const std::string& value)	{ return this->operator%<const wxString&>(wxString(value.c_str(), wxConvUTF8)); }
+	CFormat &operator%(const wxString &value) { return this->operator% <const wxString &>(value); }
+	CFormat &operator%(const CFormat &value) { return this->operator% <const wxString &>(value); }
+	CFormat &operator%(const std::string &value)
+	{
+		return this->operator% <const wxString &>(wxString(value.c_str(), wxConvUTF8));
+	}
 	// Narrow string literals are passed directly (after dropping the wxT()
 	// wrapping sweep); dispatch to the wxString overload.
-	CFormat& operator%(const char* value)			{ return this->operator%<const wxString&>(wxString(value, wxConvUTF8)); }
+	CFormat &operator%(const char *value)
+	{
+		return this->operator% <const wxString &>(wxString(value, wxConvUTF8));
+	}
 
 	/**
-	 * Returns the resulting string.
+	 * The resulting string.
 	 */
 	wxString GetString() const;
 
 	/**
 	 * Implicit conversion to wxString.
 	 */
-	operator wxString() const		{ return GetString(); };
+	operator wxString() const { return GetString(); };
 
 private:
 	/**
-	 * Initialize internal structures.
-	 *
 	 * Initializes member variables and parses the given format string.
 	 */
-	void	Init(const wxString& str);
+	void Init(const wxString &str);
 
 	//! Type holding format specifiers.
-	typedef std::list<FormatSpecifier>	FormatList;
+	typedef std::list<FormatSpecifier> FormatList;
 
 	//! Retrieve the modifiers for the given format specifier.
 	wxString GetModifiers(FormatList::const_iterator it) const;
 
 	//! Do one argument conversion.
-	template<typename _Tp>
-	void	ProcessArgument(FormatList::iterator it, _Tp value);
+	template <typename _Tp> void ProcessArgument(FormatList::iterator it, _Tp value);
 
 	//! List of the valid format-specifiers found in the format string.
-	FormatList	m_formats;
+	FormatList m_formats;
 
 	//! Number of the previous argument.
-	unsigned	m_argIndex;
+	unsigned m_argIndex;
 
 	//! The format-string fed to the parser.
-	wxString	m_formatString;
+	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)); }
-
+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));
+}
 
 #define WXLONGLONGFMTSPEC wxLongLongFmtSpec

amule-3.0.1.tar.gz/src/libs/common/LocaleInit.cpp -> amule-3.1.0.tar.gz/src/libs/common/LocaleInit.cpp Changed

@@ -25,8 +25,77 @@
 
 #include <clocale>
 
+#ifndef __WXMSW__
+#include <cstdlib>
+#include <cstring>
+#include <langinfo.h>
+
+namespace
+{
+// True when `s` names the C / POSIX locale (or is empty / unset), i.e. a
+// locale with no useful character encoding for filesystem paths.
+bool IsCLocaleName(const char *s)
+{
+	return s == nullptr || s0 == '\0' || std::strcmp(s, "C") == 0 || std::strcmp(s, "POSIX") == 0;
+}
+
+// True when the current LC_CTYPE codeset is a bare ASCII one, meaning the
+// process cannot represent accented / UTF-8 filesystem paths.
+bool CtypeCodesetIsAscii()
+{
+	const char *codeset = nl_langinfo(CODESET);
+	return codeset != nullptr && (std::strcmp(codeset, "ANSI_X3.4-1968") == 0 ||  // glibc C/POSIX
+					     std::strcmp(codeset, "US-ASCII") == 0 || // BSD/macOS C
+					     std::strcmp(codeset, "ASCII") == 0);
+}
+} // namespace
+#endif
+
 void aMuleInitLocale()
 {
 	std::setlocale(LC_ALL, "");
+
+#ifndef __WXMSW__
+	// A headless daemon in a bare container (systemd / Docker) frequently has no LANG / LC_*
+	// exported, so the call above leaves LC_CTYPE at POSIX/C. Its ASCII codeset cannot
+	// represent accented / UTF-8 filesystem paths, so wxConvFileName fails to open them -- an
+	// accented shared folder silently becomes invisible to the file scan (verified on glibc:
+	// `LC_ALL=C` finds 0 files in an accented dir where UTF-8 finds them).
+	//
+	// Promote just the character type to UTF-8. The guard is the codeset itself, so a real
+	// locale is never overridden (a deliberate UTF-8 or even latin1 locale never reports ASCII
+	// here) and musl -- whose C locale is already UTF-8 -- never triggers it. Windows is
+	// exempt: it uses wide-char filesystem APIs, so CPath never routes a path through a narrow-
+	// locale conversion.
+	if (CtypeCodesetIsAscii()) {
+		// Pick a UTF-8 ctype the C library actually has: C.UTF-8 is portable (glibc >=
+		// 2.35, musl, most runtimes), en_US.UTF-8 the common fallback. If neither exists we
+		// stay on C -- no worse than before.
+		const char *utf8 = nullptr;
+		if (std::setlocale(LC_CTYPE, "C.UTF-8") != nullptr) {
+			utf8 = "C.UTF-8";
+		} else if (std::setlocale(LC_CTYPE, "en_US.UTF-8") != nullptr) {
+			utf8 = "en_US.UTF-8";
+		}
+		if (utf8 != nullptr) {
+			// Export it, not just setlocale() it: later re-resolution of the locale (wx
+			// sets up wxConvFileName from the environment during app init) would
+			// otherwise fall back to C and undo the promotion. LC_ALL outranks
+			// LC_CTYPE, so drop a C-valued LC_ALL that would keep forcing the process
+			// back to ASCII.
+			if (IsCLocaleName(std::getenv("LC_ALL"))) {
+				unsetenv("LC_ALL");
+			}
+			setenv("LC_CTYPE", utf8, 1);
+			// Dropping LC_ALL above also stops forcing LC_NUMERIC to C for any child
+			// process (media probe, spawned amuleweb/amuleapi): its numeric category
+			// would then resolve from LANG and could inherit a comma decimal separator.
+			// Pin LC_NUMERIC=C in the environment too, so children keep parsing "1.5",
+			// matching the in-process setting below.
+			setenv("LC_NUMERIC", "C", 1);
+		}
+	}
+#endif
+
 	std::setlocale(LC_NUMERIC, "C");
 }

amule-3.0.1.tar.gz/src/libs/common/LocaleInit.h -> amule-3.1.0.tar.gz/src/libs/common/LocaleInit.h Changed

@@ -26,20 +26,17 @@
 
 // Initialise the libc locale for an aMule binary.
 //
-// Picks `LC_CTYPE` (and related) up from the environment via
-// `setlocale(LC_ALL, "")` so the multibyte conversions used by wxConvLibc
-// (e.g. `unicode2char()` in StringFunctions.cpp) emit real UTF-8 instead
-// of mangling non-ASCII bytes the way they do under the default `C`
-// locale. Then forces `LC_NUMERIC` back to `C` so libc printf/scanf
-// decimal handling stays portable across locales (e.g. de_DE.UTF-8 would
-// otherwise turn `"%.2f"` of 3.14 into `"3,14"` and break any text-based
-// numeric serialisation that relies on libc).
-//
-// Call this once, as early as possible, from each binary's earliest
-// initialisation hook. Safe to call multiple times. Has no effect on
-// binaries that already drive their locale through `wxLocale`
-// (`amule` / `amule-remote-gui`); the inner setlocale calls are no-ops
-// when the resulting state matches.
+// Picks `LC_CTYPE` (and related) up from the environment via `setlocale(LC_ALL, "")` so the
+// multibyte conversions used by wxConvLibc (e.g. `unicode2char()` in StringFunctions.cpp) emit real
+// UTF-8 instead of mangling non-ASCII bytes the way they do under the default `C` locale. Then
+// forces `LC_NUMERIC` back to `C` so libc printf/scanf decimal handling stays portable: de_DE.UTF-8
+// would otherwise turn `"%.2f"` of 3.14 into `"3,14"` and break any text-based numeric
+// serialisation relying on libc.
+//
+// Call this once, as early as possible, from each binary's earliest initialisation hook. Safe to
+// call more than once. No effect on binaries that already drive their locale through `wxLocale`
+// (`amule` / `amule-remote-gui`): the inner setlocale calls are no-ops when the resulting state
+// matches.
 //
 // See amule-org/amule#203 for the original reported bug.
 void aMuleInitLocale();

amule-3.0.1.tar.gz/src/libs/common/MD5Sum.cpp -> amule-3.1.0.tar.gz/src/libs/common/MD5Sum.cpp Changed

@@ -22,52 +22,38 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include "StringFunctions.h"
-#include "Format.h"		// Needed for CFormat
-
-#include "MD5Sum.h"		// Interface declarations.
+#include "Format.h" // Needed for CFormat
 
-typedef struct {
-  uint32_t state4;
-  uint32_t count2;
-  unsigned char buffer64;
-} MD5_CTX;
-
-void MD5Init (MD5_CTX *);
-void MD5Update (MD5_CTX *, const unsigned char *, size_t);
-void MD5Final (unsigned char 16, MD5_CTX *);
+#include "MD5Sum.h" // Interface declarations.
 
 MD5Sum::MD5Sum()
+: m_hash()
 {
 }
 
-MD5Sum::MD5Sum(const wxString& sSource)
+MD5Sum::MD5Sum(const wxString &sSource)
 {
 	Calculate(sSource);
 }
 
-MD5Sum::MD5Sum(const uint8* buffer, size_t len)
+MD5Sum::MD5Sum(const uint8 *buffer, size_t len)
 {
 	Calculate(buffer, len);
 }
 
-void MD5Sum::Calculate(const wxString& sSource)
+void MD5Sum::Calculate(const wxString &sSource)
 {
 	// Nothing we can do against this unicode2char
-	Calculate( (const uint8*)(const char*)unicode2char(sSource), sSource.Length());
+	Calculate((const uint8 *)(const char *)unicode2char(sSource), sSource.Length());
 }
 
-void MD5Sum::Calculate(const uint8* buffer, size_t len)
+void MD5Sum::Calculate(const uint8 *buffer, size_t len)
 {
-	MD5_CTX context;
-	unsigned char digest16;
-
-	MD5Init (&context);
-	MD5Update (&context, buffer, len);
-	MD5Final (digest, &context);
-
-	memcpy(m_rawhash, digest, 16);
+	CryptoPP::Weak::MD5 md5;
+	md5.Restart();
+	md5.Update(buffer, len);
+	md5.Final(m_hash.b);
 	m_sHash.Clear();
 }
 
@@ -75,263 +61,13 @@
 {
 	if (m_sHash.empty()) {
 		// That's still far from optimal, but called much less often.
-		for (int i = 0; i < 16; ++i) {
+		for (int i = 0; i < MD5_DIGEST_SIZE; ++i) {
 			wxString sT;
-			sT = CFormat("%02x") % m_rawhashi;
+			sT = CFormat("%02x") % m_hash.bi;
 			m_sHash += sT;
 		}
 	}
 	return m_sHash;
 }
 
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-static void MD5Transform (uint32_t 4, const unsigned char 64);
-static void Encode (unsigned char *, uint32_t *, size_t);
-static void Decode (uint32_t *, const unsigned char *, size_t);
-
-static const unsigned char PADDING64 = {
-  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
-};
-
-/* F, G, H and I are basic MD5 functions.
- */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define I(x, y, z) ((y) ^ ((x) | (~z)))
-
-/* ROTATE_LEFT rotates x left n bits.
-	15-April-2003 Sony: use _MSC_VER intrinsic to save some cycles
- */
-#ifdef _MSC_VER
-#pragma intrinsic(_rotl)
-#define ROTATE_LEFT(x, n) _rotl((x), (n))
-#else
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-#endif
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-Rotation is separate from addition to prevent recomputation.
-*/
-/* Defines must be on one line to work with GCC-2.95.3 */
-#define FF(a, b, c, d, x, s, ac) { (a) += F ((b), (c), (d)) + (x) + (uint32_t)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
-#define GG(a, b, c, d, x, s, ac) { (a) += G ((b), (c), (d)) + (x) + (uint32_t)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
-#define HH(a, b, c, d, x, s, ac) { (a) += H ((b), (c), (d)) + (x) + (uint32_t)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
-#define II(a, b, c, d, x, s, ac) { (a) += I ((b), (c), (d)) + (x) + (uint32_t)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
-
-/* MD5 initialization. Begins an MD5 operation, writing a new context.
- */
-void MD5Init (MD5_CTX *context)
-{
-  context->count0 = context->count1 = 0;
-  /* Load magic initialization constants.
-*/
-  context->state0 = 0x67452301;
-  context->state1 = 0xefcdab89;
-  context->state2 = 0x98badcfe;
-  context->state3 = 0x10325476;
-}
-
-/* MD5 block update operation. Continues an MD5 message-digest
-  operation, processing another message block, and updating the
-  context.
- */
-void MD5Update (MD5_CTX *context, const unsigned char *input, size_t inputLen)
-{
-	off_t index;
-	size_t i, partLen;
-
-	/* Compute number of bytes mod 64 */
-	index = (context->count0 >> 3) & 0x3F;
-
-	/* Update number of bits */
-	if ((context->count0 += ((uint32_t)inputLen << 3)) < ((uint32_t)inputLen << 3)) {
-		context->count1++;
-	}
-
-	context->count1 += ((uint32_t)inputLen >> 29);
-	partLen = 64 - index;
-
-	/* Transform as many times as possible. */
-	if (inputLen >= partLen) {
-		memcpy((unsigned char*)&context->bufferindex, (unsigned char*)input, partLen);
-		MD5Transform (context->state, context->buffer);
-
-		for (i = partLen; i + 63 < inputLen; i += 64) {
-			MD5Transform (context->state, &inputi);
-		}
-		index = 0;
-	} else {
-		i = 0;
-	}
-
-	/* Buffer remaining input */
-	memcpy((unsigned char*)&context->bufferindex, (unsigned char*)&inputi, inputLen-i);
-}
-
-/* MD5 finalization. Ends an MD5 message-digest operation, writing the
- * the message digest and zeroizing the context.
- */
-void MD5Final (unsigned char digest16, MD5_CTX *context)
-{
-	unsigned char bits8;
-	off_t index;
-	size_t padLen;
-
-	/* Save number of bits */
-	Encode (bits, context->count, 8);
-
-	/* Pad out to 56 mod 64. */
-	index = (context->count0 >> 3) & 0x3f;
-
-	padLen = (index < 56) ? (56 - index) : (120 - index);
-
-	MD5Update (context, PADDING, padLen);
-
-	/* Append length (before padding) */
-	MD5Update (context, bits, 8);
-
-	/* Store state in digest */
-	Encode (digest, context->state, 16);
-
-	/* Zeroize sensitive information.*/
-	memset((unsigned char*)context, 0, sizeof (*context));
-}
-
-/* MD5 basic transformation. Transforms state based on block.
- */
-static void MD5Transform (uint32_t state4, const unsigned char block64)
-{
-  uint32_t a = state0, b = state1, c = state2, d = state3, x16;
-
-  Decode (x, block, 64);
-
-  /* Round 1 */
-  FF (a, b, c, d, x 0, S11, 0xd76aa478); /* 1 */
-  FF (d, a, b, c, x 1, S12, 0xe8c7b756); /* 2 */
-  FF (c, d, a, b, x 2, S13, 0x242070db); /* 3 */
-  FF (b, c, d, a, x 3, S14, 0xc1bdceee); /* 4 */
-  FF (a, b, c, d, x 4, S11, 0xf57c0faf); /* 5 */
-  FF (d, a, b, c, x 5, S12, 0x4787c62a); /* 6 */
-  FF (c, d, a, b, x 6, S13, 0xa8304613); /* 7 */
-  FF (b, c, d, a, x 7, S14, 0xfd469501); /* 8 */
-  FF (a, b, c, d, x 8, S11, 0x698098d8); /* 9 */
-  FF (d, a, b, c, x 9, S12, 0x8b44f7af); /* 10 */
-  FF (c, d, a, b, x10, S13, 0xffff5bb1); /* 11 */
-  FF (b, c, d, a, x11, S14, 0x895cd7be); /* 12 */
-  FF (a, b, c, d, x12, S11, 0x6b901122); /* 13 */
-  FF (d, a, b, c, x13, S12, 0xfd987193); /* 14 */
-  FF (c, d, a, b, x14, S13, 0xa679438e); /* 15 */
-  FF (b, c, d, a, x15, S14, 0x49b40821); /* 16 */
-
- /* Round 2 */
-  GG (a, b, c, d, x 1, S21, 0xf61e2562); /* 17 */
-  GG (d, a, b, c, x 6, S22, 0xc040b340); /* 18 */
-  GG (c, d, a, b, x11, S23, 0x265e5a51); /* 19 */
-  GG (b, c, d, a, x 0, S24, 0xe9b6c7aa); /* 20 */
-  GG (a, b, c, d, x 5, S21, 0xd62f105d); /* 21 */
-  GG (d, a, b, c, x10, S22,  0x2441453); /* 22 */
-  GG (c, d, a, b, x15, S23, 0xd8a1e681); /* 23 */
-  GG (b, c, d, a, x 4, S24, 0xe7d3fbc8); /* 24 */
-  GG (a, b, c, d, x 9, S21, 0x21e1cde6); /* 25 */
-  GG (d, a, b, c, x14, S22, 0xc33707d6); /* 26 */
-  GG (c, d, a, b, x 3, S23, 0xf4d50d87); /* 27 */
-  GG (b, c, d, a, x 8, S24, 0x455a14ed); /* 28 */
-  GG (a, b, c, d, x13, S21, 0xa9e3e905); /* 29 */
-  GG (d, a, b, c, x 2, S22, 0xfcefa3f8); /* 30 */
-  GG (c, d, a, b, x 7, S23, 0x676f02d9); /* 31 */
-  GG (b, c, d, a, x12, S24, 0x8d2a4c8a); /* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x 5, S31, 0xfffa3942); /* 33 */
-  HH (d, a, b, c, x 8, S32, 0x8771f681); /* 34 */
-  HH (c, d, a, b, x11, S33, 0x6d9d6122); /* 35 */
-  HH (b, c, d, a, x14, S34, 0xfde5380c); /* 36 */
-  HH (a, b, c, d, x 1, S31, 0xa4beea44); /* 37 */
-  HH (d, a, b, c, x 4, S32, 0x4bdecfa9); /* 38 */
-  HH (c, d, a, b, x 7, S33, 0xf6bb4b60); /* 39 */
-  HH (b, c, d, a, x10, S34, 0xbebfbc70); /* 40 */
-  HH (a, b, c, d, x13, S31, 0x289b7ec6); /* 41 */
-  HH (d, a, b, c, x 0, S32, 0xeaa127fa); /* 42 */
-  HH (c, d, a, b, x 3, S33, 0xd4ef3085); /* 43 */
-  HH (b, c, d, a, x 6, S34,  0x4881d05); /* 44 */
-  HH (a, b, c, d, x 9, S31, 0xd9d4d039); /* 45 */
-  HH (d, a, b, c, x12, S32, 0xe6db99e5); /* 46 */
-  HH (c, d, a, b, x15, S33, 0x1fa27cf8); /* 47 */
-  HH (b, c, d, a, x 2, S34, 0xc4ac5665); /* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x 0, S41, 0xf4292244); /* 49 */
-  II (d, a, b, c, x 7, S42, 0x432aff97); /* 50 */
-  II (c, d, a, b, x14, S43, 0xab9423a7); /* 51 */
-  II (b, c, d, a, x 5, S44, 0xfc93a039); /* 52 */
-  II (a, b, c, d, x12, S41, 0x655b59c3); /* 53 */
-  II (d, a, b, c, x 3, S42, 0x8f0ccc92); /* 54 */
-  II (c, d, a, b, x10, S43, 0xffeff47d); /* 55 */
-  II (b, c, d, a, x 1, S44, 0x85845dd1); /* 56 */
-  II (a, b, c, d, x 8, S41, 0x6fa87e4f); /* 57 */
-  II (d, a, b, c, x15, S42, 0xfe2ce6e0); /* 58 */
-  II (c, d, a, b, x 6, S43, 0xa3014314); /* 59 */
-  II (b, c, d, a, x13, S44, 0x4e0811a1); /* 60 */
-  II (a, b, c, d, x 4, S41, 0xf7537e82); /* 61 */
-  II (d, a, b, c, x11, S42, 0xbd3af235); /* 62 */
-  II (c, d, a, b, x 2, S43, 0x2ad7d2bb); /* 63 */
-  II (b, c, d, a, x 9, S44, 0xeb86d391); /* 64 */
-
-  state0 += a;
-  state1 += b;
-  state2 += c;
-  state3 += d;
-
-  /* Zeroize sensitive information.
-   */
-  memset((unsigned char*)x, 0, sizeof (x));
-}
-
-/* Encodes input (uint32_t) into output (unsigned char). Assumes len is
-  a multiple of 4.
- */
-static void Encode (unsigned char *output, uint32_t *input, size_t len)
-{
-  size_t i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4) {
-	outputj = (unsigned char)(inputi & 0xff);
-	outputj+1 = (unsigned char)((inputi >> 8) & 0xff);
-	outputj+2 = (unsigned char)((inputi >> 16) & 0xff);
-	outputj+3 = (unsigned char)((inputi >> 24) & 0xff);
-  }
-}
-
-/* Decodes input (unsigned char) into output (uint32_t). Assumes len is
-  a multiple of 4.
- */
-static void Decode (uint32_t *output, const unsigned char *input, size_t len)
-{
-	wxASSERT( !(len & 3) );
-	size_t i, j;
-
-	for (i = 0, j = 0; j < len; i++, j += 4) {
-		outputi = ((uint32_t)inputj) | (((uint32_t)inputj+1) << 8) | (((uint32_t)inputj+2) << 16) | (((uint32_t)inputj+3) << 24);
-	}
-}
-
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/libs/common/MD5Sum.h -> amule-3.1.0.tar.gz/src/libs/common/MD5Sum.h Changed

@@ -1,47 +1,59 @@
 // This file is part of the aMule Project.
- /*
- Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
- Copyright (c) 1991-2011, RSA Data Security, Inc. Created 1991. All
- rights reserved.
-
- License to copy and use this software is granted provided that it
- is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- Algorithm" in all material mentioning or referencing this software
- or this function.
-
- License is also granted to make and use derivative works provided
- that such works are identified as "derived from the RSA Data
- Security, Inc. MD5 Message-Digest Algorithm" in all material
- mentioning or referencing the derived work.
-
- RSA Data Security, Inc. makes no representations concerning either
- the merchantability of this software or the suitability of this
- software for any particular purpose. It is provided "as is"
- without express or implied warranty of any kind.
-
- These notices must be retained in any copies of any part of this
- documentation and/or software.
- */
+/*
+Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+Copyright (c) 1991-2011, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+*/
 
 #ifndef MD5SUM_H
 #define MD5SUM_H
 
+#include "../../CryptoPP_Inc.h"
 
-class MD5Sum {
+#define MD5_DIGEST_SIZE 16
+
+// Crypto::Weak::MD5 needs CRYPTOPP_ENABLE_NAMESPACE_WEAK, already declared in CryptoPP_Inc.h where
+// the other weak algorithms (MD4) are included.
+
+typedef struct
+{
+	uint8 bMD5_DIGEST_SIZE;
+} MD5Digest;
+
+class MD5Sum
+{
 public:
 	MD5Sum();
-	MD5Sum(const wxString& sSource);
-	MD5Sum(const uint8* buffer, size_t len);
+	MD5Sum(const wxString &sSource);
+	MD5Sum(const uint8 *buffer, size_t len);
 
-	void Calculate(const wxString& sSource);
-	void Calculate(const uint8* buffer, size_t len);
+	void Calculate(const wxString &sSource);
+	void Calculate(const uint8 *buffer, size_t len);
 
 	wxString GetHash();
-	const uint8* GetRawHash() const { return m_rawhash; }
+	const uint8 *GetRawHash() const { return m_hash.b; }
 
 private:
-	wxString	m_sHash;
-	uint8 m_rawhash16;
+	wxString m_sHash;
+	MD5Digest m_hash;
 };
 
 #endif // MD5SUM_H

amule-3.1.0.tar.gz/src/libs/common/MediaCodecName.cpp Added

amule-3.1.0.tar.gz/src/libs/common/MediaCodecName.h Added

@@ -0,0 +1,44 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 MEDIA_CODEC_NAME_H
+#define MEDIA_CODEC_NAME_H
+
+#include <string>
+
+/**
+ * Codec FOURCC to the label the interface shows, e.g. "h264" to "H.264".
+ *
+ * One table for every surface: the desktop reaches it through FormatMediaCodec() (OtherFunctions.h)
+ * and amuleapi calls it directly when serialising `media.codec`, so a file reads the same in the
+ * GUI, the REST rows and the SSE payload. Lives in mulecommon because EventDiff.cpp is one of those
+ * callers and its test target is kept to a handful of sources.
+ *
+ * Matching is case-insensitive. An unmapped codec is returned unchanged, so something useful still
+ * shows rather than nothing. Untranslated: these are labels, not messages.
+ */
+std::string MediaCodecLabel(const std::string &raw);
+
+#endif // MEDIA_CODEC_NAME_H
+// File_checked_for_headers

amule-3.0.1.tar.gz/src/libs/common/MuleDebug.cpp -> amule-3.1.0.tar.gz/src/libs/common/MuleDebug.cpp Changed

@@ -23,63 +23,126 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include <cstdlib>			// Needed for std::abort()
-#include <cstdio>			// Needed for popen/pclose/fgets in the addr2line fallback
-#include <cstring>			// Needed for strlen in the addr2line fallback
-#include <cstdint>			// uintptr_t for pointer subtraction in the bfd
-					// section-bounds check -- `unsigned long` is
-					// 4 bytes on LLP64 and would silently truncate.
-
-#include "config.h"			// Needed for HAVE_CXXABI and HAVE_EXECINFO
-
-#include "MuleDebug.h"			// Interface declaration
-#include "StringFunctions.h"		// Needed for unicode2char
-#include "Format.h"			// Needed for CFormat
+#include <cstdlib> // Needed for std::abort()
+#include <cstdio>  // Needed for popen/pclose/fgets in the addr2line fallback
+#include <cstring> // Needed for strlen in the addr2line fallback
+#include <cerrno>  // Needed for EINTR in the SIGABRT handler's write loop
+#include <csignal> // Needed for sigaction/raise in the SIGABRT handler
+#include <cstdint> // uintptr_t for pointer subtraction in the bfd
+		   // section-bounds check -- `unsigned long` is
+		   // 4 bytes on LLP64 and would silently truncate.
+
+#include "config.h" // Needed for HAVE_CXXABI and HAVE_EXECINFO
+
+#include "MuleDebug.h" // Interface declaration
+#include <string>      // Needed for the terminate report buffer
+
+#include "StringFunctions.h" // Needed for unicode2char
+#include "Format.h"          // Needed for CFormat
+
+#ifndef __WINDOWS__
+#include <fcntl.h>    // Needed for FD_CLOEXEC on the reserved descriptor
+#include <pthread.h>  // Needed for the trap suppression's owning thread
+#include <poll.h>     // Needed for the writability waits in WriteAll and the handler
+#include <sys/stat.h> // Needed for fstat in SameFile
+#include <unistd.h>   // Needed for dup/dup2 in ReserveCrashFd and write in WriteAll
+#endif
 
 #ifdef HAVE_EXECINFO
-#	include <execinfo.h>
-#	include <wx/utils.h>		// Needed for wxArrayString
-#	ifndef HAVE_BFD
-#		include <wx/thread.h>	// Needed for wxThread
-#	endif
+#include <execinfo.h>
+#include <poll.h>     // Needed for the writability probe in the SIGABRT handler
+#include <pthread.h>  // Needed for pthread_sigmask in the handler's final raise
+#include <sys/stat.h> // Needed for fstat in the SIGABRT handler
+#include <unistd.h>   // Needed for write()/STDERR_FILENO in the SIGABRT handler
+#include <wx/utils.h> // Needed for wxArrayString
+#ifndef HAVE_BFD
+#include <wx/thread.h> // Needed for wxThread
+#endif
 #endif
 
 #ifdef HAVE_CXXABI
-#	ifdef HAVE_TYPEINFO
-#		include <typeinfo>	// Needed for some MacOSX versions with broken system headers
-#	endif
-#	include <cxxabi.h>
+#ifdef HAVE_TYPEINFO
+#include <typeinfo> // Needed for some MacOSX versions with broken system headers
+#endif
+#include <cxxabi.h>
 #endif
-
 
 #if wxUSE_STACKWALKER && defined(__WINDOWS__)
-	#include <wx/stackwalk.h> // Do_not_auto_remove
+#include <wx/stackwalk.h> // Do_not_auto_remove
 #elif defined(HAVE_BFD)
-	#include <ansidecl.h> // Do_not_auto_remove
-	#include <bfd.h> // Do_not_auto_remove
+#include <ansidecl.h> // Do_not_auto_remove
+#include <bfd.h>      // Do_not_auto_remove
 #endif
 
 #include <vector>
 #include <exception>
 
+// Defined below with the rest of the abort-redirect state.
+static int AbortConsoleFd(int fallback);
+#ifndef __WINDOWS__
+static int AbortRedirectFd();
+#endif
+#ifndef __WINDOWS__
+static void WriteAll(int fd, const char *data, size_t len);
+static bool SameFile(int a, int b);
+static bool FdCanTakeAWrite(int fd);
+#endif
 
-/**
- * This functions displays a verbose description of
- * any unhandled exceptions that occur and then
- * terminate the program by raising SIGABRT.
- */
+// One chunk of the terminate report, to every sink that wants it.
+static void EmitTerminateChunk(const std::string &chunk, FILE *output)
+{
+#ifdef __WINDOWS__
+	fputs(chunk.c_str(), output);
+	fflush(output);
+#else
+	const int redirect = AbortRedirectFd();
+	const int console = AbortConsoleFd(fileno(output));
+	// Compared against the descriptor this actually writes to, not fd 2: a registered console
+	// descriptor naming the same file as the log is a different number, and comparing the wrong
+	// pair would put the report in there twice. The signal handler compares the same way.
+	const bool haveDurable = redirect >= 0 && !SameFile(redirect, console);
+
+	// The probe picks the order. A console that polls ready will not block on a chunk this size,
+	// so taking it first costs nothing and guarantees something is emitted even if the durable
+	// sink then hangs -- a logfile on a hard-mounted NFS share blocks in write(2), and being a
+	// regular file it never returns EAGAIN, so neither the stall loop nor poll() can see it
+	// coming. poll() reports every regular file ready, so the durable sink cannot be probed at
+	// all; only the alarm bounds it.
+	const bool consoleFirst = FdCanTakeAWrite(console);
+	if (consoleFirst) {
+		WriteAll(console, chunk.data(), chunk.size());
+	}
+	if (haveDurable) {
+		WriteAll(redirect, chunk.data(), chunk.size());
+	}
+	// A console that failed the probe is skipped once a copy is out elsewhere. With no durable
+	// sink it is all there is, so it goes unprobed and the alarm bounds it.
+	if (!consoleFirst && !haveDurable) {
+		WriteAll(console, chunk.data(), chunk.size());
+	}
+#endif
+}
+
+// Prints a verbose description of any unhandled exception, then raises
+// SIGABRT.
 void OnUnhandledException()
 {
-	// Revert to the original exception handler, to avoid
-	// infinite recursion, in case something goes wrong in
-	// this function.
+	// Revert to the original handler so a fault in here cannot recurse.
 	std::set_terminate(std::abort);
 
+#ifndef __WINDOWS__
+	// Bounded like the SIGABRT handler. get_backtrace() popen()s addr2line on the non-BFD path,
+	// and the only sink may be a descriptor that never drains; a process that reports nothing
+	// and never exits is worse than one that dies.
+	signal(SIGALRM, SIG_DFL);
+	alarm(10);
+#endif
+
 #ifdef HAVE_CXXABI
 	std::type_info *t = __cxxabiv1::__cxa_current_exception_type();
-	FILE* output = stderr;
+	FILE *output = stderr;
 #else
-	FILE* output = stdout;
+	FILE *output = stdout;
 	bool t = true;
 #endif
 	if (t) {
@@ -91,35 +154,57 @@
 
 		dem = __cxxabiv1::__cxa_demangle(name, 0, 0, &status);
 #else
-		const char* name = "Unknown";
+		const char *name = "Unknown";
 #endif
-		fprintf(output, "\nTerminated after throwing an instance of '%s'\n", (status ? name : dem));
+		// The type and what() go out before the backtrace is built, not with it.
+		// get_backtrace() symbolicates: it allocates throughout and on the non-BFD path
+		// popen()s addr2line. If that subprocess hangs or the step faults, this much is
+		// already reported, which is what master did by writing straight to unbuffered
+		// stderr. Each chunk goes to both sinks; writing only to `output` while the
+		// reserved descriptor was dup2()ed over fd 2 took the report off the console
+		// entirely for a terminal-launched amule.
+		std::string head("\nTerminated after throwing an instance of '");
+		head += (status ? name : dem);
+		head += "'\n";
 		free(dem);
 
 		try {
 			throw;
-		} catch (const std::exception& e) {
-			fprintf(output, "\twhat(): %s\n", e.what());
-		} catch (const CMuleException& e) {
-			fprintf(output, "\twhat(): %s\n", (const char*)unicode2char(e.what()));
-		} catch (const wxString& e) {
-			fprintf(output, "\twhat(): %s\n", (const char*)unicode2char(e));
+		} catch (const std::exception &e) {
+			head += "\twhat(): ";
+			head += e.what();
+			head += "\n";
+		} catch (const CMuleException &e) {
+			head += "\twhat(): ";
+			head += (const char *)unicode2char(e.what());
+			head += "\n";
+		} catch (const wxString &e) {
+			head += "\twhat(): ";
+			head += (const char *)unicode2char(e);
+			head += "\n";
 		} catch (...) {
 			// Unable to retrieve cause of exception
 		}
+		EmitTerminateChunk(head, output);
 
-		fprintf(output, "\tbacktrace:\n%s\n", (const char*)unicode2char(get_backtrace(1)));
+		std::string trace("\tbacktrace:\n");
+		trace += (const char *)unicode2char(get_backtrace(1));
+		trace += "\n";
+		EmitTerminateChunk(trace, output);
+
+		// Inside the branch on purpose. std::terminate() with no active exception prints
+		// nothing at all, and suppressing there would trade the handler's raw backtrace for
+		// silence. A joinable std::thread destroyed without join() reaches exactly that.
+		SuppressNextAbortBacktrace();
 	}
 	std::abort();
 }
 
-
 void InstallMuleExceptionHandler()
 {
 	std::set_terminate(OnUnhandledException);
 }
 
-
 // Make it 1 for getting the file path also
 #define TOO_VERBOSE_BACKTRACE 0
 
@@ -133,7 +218,7 @@
 	MuleStackWalker() {};
 	~MuleStackWalker() {};
 
-	void OnStackFrame(const wxStackFrame& frame)
+	void OnStackFrame(const wxStackFrame &frame)
 	{
 		wxString btLine = CFormat("%u ") % frame.GetLevel();
 		wxString filename = frame.GetName();
@@ -141,11 +226,11 @@
 		if (!filename.IsEmpty()) {
 			btLine += filename + " (" +
 #if TOO_VERBOSE_BACKTRACE
-			        frame.GetModule()
+				  frame.GetModule()
 #else
-				frame.GetModule().AfterLast('/')
+				  frame.GetModule().AfterLast('/')
 #endif
-			        + ")";
+				  + ")";
 		} else {
 			btLine += CFormat("%p") % frame.GetAddress();
 		}
@@ -153,11 +238,11 @@
 		if (frame.HasSourceLocation()) {
 			btLine += " at " +
 #if TOO_VERBOSE_BACKTRACE
-			        frame.GetFileName()
+				  frame.GetFileName()
 #else
-				frame.GetFileName().AfterLast('/')
+				  frame.GetFileName().AfterLast('/')
 #endif
-			        + CFormat(":%u") % frame.GetLine();
+				  + CFormat(":%u") % frame.GetLine();
 		} else {
 			btLine += " (Unknown file/line)";
 		}
@@ -169,11 +254,10 @@
 	wxString m_trace;
 };
 
-
 wxString get_backtrace(unsigned n)
 {
 	MuleStackWalker walker; // Texas ranger?
-	walker.Walk(n); // Skip this one and Walk() also!
+	walker.Walk(n);         // Skip this one and Walk() also!
 
 	return walker.m_trace;
 }
@@ -183,24 +267,18 @@
 // Do_not_auto_remove -- needed for dl_iterate_phdr on PIE-base lookup
 #include <link.h> // IWYU pragma: keep
 
-// PIE relocation offset for the main executable -- subtracted from
-// runtime backtrace addresses before they're handed to either bfd or
-// addr2line, both of which expect link-time virtual addresses.  0 for
-// non-PIE binaries.  Populated lazily by init_pie_base() so both the
-// bfd path (via init_backtrace_info()) and the addr2line fallback
-// (via get_backtrace()) can rely on it.
+// PIE relocation offset for the main executable, subtracted from runtime
+// backtrace addresses before they reach bfd or addr2line, which both expect
+// link-time addresses. 0 for non-PIE. Populated lazily by init_pie_base().
 static intptr_t s_pie_base = 0;
 static bool s_pie_base_init = false;
 
 static int find_pie_base_cb(struct dl_phdr_info *info, size_t /*size*/, void *data)
 {
-	// The main executable is the first entry in dl_iterate_phdr's
-	// callback order and is identified by an empty dlpi_name (shared
-	// libraries have their path; the executable has "").  dlpi_addr
-	// is the relocation offset applied at load time: 0 for ET_EXEC
-	// (non-PIE), random for ET_DYN (PIE).  Capture it once.
+	// The main executable is dl_iterate_phdr's first callback and has an empty
+	// dlpi_name. dlpi_addr is the load-time relocation: 0 for ET_EXEC.
 	if (info->dlpi_name == NULL || info->dlpi_name0 == '\0') {
-		*reinterpret_cast<intptr_t*>(data) = static_cast<intptr_t>(info->dlpi_addr);
+		*reinterpret_cast<intptr_t *>(data) = static_cast<intptr_t>(info->dlpi_addr);
 		return 1; // stop iteration
 	}
 	return 0;
@@ -216,93 +294,84 @@
 
 #ifdef HAVE_BFD
 
-static bfd* s_a_bfd;
-static asymbol** s_symbol_list;
+static bfd *s_a_bfd;
+static asymbol **s_symbol_list;
 static bool s_have_backtrace_symbols = false;
-static const char* s_file_name;
-static const char* s_function_name;
+static const char *s_file_name;
+static const char *s_function_name;
 static unsigned int s_line_number;
 static int s_found;
 
-
 /*
-* read all symbols in the executable into an array
-* and return the pointer to the array in symbol_list.
-* Also return the number of actual symbols read
-* If there's any error, return -1
-*/
+ * Read all symbols in the executable into an array, returning the count, or
+ * -1 on error.
+ */
 static int get_backtrace_symbols(bfd *a_bfd, asymbol ***symbol_list_ptr)
 {
 	int vectorsize = bfd_get_symtab_upper_bound(a_bfd);
 
 	if (vectorsize < 0) {
-		fprintf (stderr, "Error while getting vector size for backtrace symbols : %s",
+		fprintf(stderr,
+			"Error while getting vector size for backtrace symbols : %s",
 			bfd_errmsg(bfd_get_error()));
 		return -1;
 	}
 
 	if (vectorsize == 0) {
-		fprintf (stderr, "Error while getting backtrace symbols : No symbols (%s)",
+		fprintf(stderr,
+			"Error while getting backtrace symbols : No symbols (%s)",
 			bfd_errmsg(bfd_get_error()));
 		return -1;
 	}
 
-	*symbol_list_ptr = (asymbol**)malloc(vectorsize);
+	*symbol_list_ptr = (asymbol **)malloc(vectorsize);
 
 	if (*symbol_list_ptr == NULL) {
-		fprintf (stderr, "Error while getting backtrace symbols : Cannot allocate memory");
+		fprintf(stderr, "Error while getting backtrace symbols : Cannot allocate memory");
 		return -1;
 	}
 
 	vectorsize = bfd_canonicalize_symtab(a_bfd, *symbol_list_ptr);
 
 	if (vectorsize < 0) {
-		fprintf(stderr, "Error while getting symbol table : %s",
-			bfd_errmsg(bfd_get_error()));
+		fprintf(stderr, "Error while getting symbol table : %s", bfd_errmsg(bfd_get_error()));
 		return -1;
 	}
 
 	return vectorsize;
 }
 
-
 /*
-* print file, line and function information for address
-* The info is actually set into global variables. This
-* function is called from the iterator bfd_map_over_sections
-*
-*/
+ * Set file, line and function information for an address into globals.
+ * Called from the bfd_map_over_sections iterator.
+ */
 void init_backtrace_info()
 {
 	bfd_init();
 	s_a_bfd = bfd_openr("/proc/self/exe", NULL);
 
 	if (s_a_bfd == NULL) {
-		fprintf(stderr, "Error while opening file for backtrace symbols : %s",
+		fprintf(stderr,
+			"Error while opening file for backtrace symbols : %s",
 			bfd_errmsg(bfd_get_error()));
 		return;
 	}
 
 	if (!(bfd_check_format_matches(s_a_bfd, bfd_object, NULL))) {
-		fprintf (stderr, "Error while init. backtrace symbols : %s",
-			bfd_errmsg (bfd_get_error ()));
+		fprintf(stderr, "Error while init. backtrace symbols : %s", bfd_errmsg(bfd_get_error()));
 		bfd_close(s_a_bfd);
 		return;
 	}
 
 	s_have_backtrace_symbols = (get_backtrace_symbols(s_a_bfd, &s_symbol_list) > 0);
 
-	// Same PIE-offset lookup the addr2line fallback uses; without
-	// translating backtrace() runtime PCs to link-time addresses,
-	// bfd's section-bounds check would reject every amule frame and
-	// every amule frame symbolicates to "??" on modern PIE-by-default
-	// distros.  init_pie_base() is idempotent; non-PIE binaries get
-	// s_pie_base = 0 so the eventual subtraction is a no-op.
+	// Same PIE-offset lookup the addr2line fallback uses: untranslated PCs fail
+	// bfd's section-bounds check and every amule frame symbolicates to "??" on
+	// PIE-by-default distros. init_pie_base() is idempotent.
 	init_pie_base();
 }
 
-
-void get_file_line_info(bfd *a_bfd, asection *section, void* _address)
+void get_file_line_info(bfd *a_bfd, asection *section, void *_address)
 {
 	wxASSERT(s_symbol_list);
 
@@ -316,14 +385,10 @@
 
 	bfd_vma vma = section->vma;
 
-	// Translate runtime PC back to a link-time address so it lines up
-	// with bfd's section vmas.  s_pie_base captured by init_backtrace_info
-	// is the executable's PIE relocation offset; 0 on non-PIE so this is
-	// a no-op there.  Library frames (libc, libwx, ...) come through with
-	// runtime addresses far outside amule's link-time vma range; after
-	// the subtraction they're either negative-wrapped to huge unsigned
-	// values or still way outside, and the section-bounds check below
-	// continues to skip them as it did before.
+	// Translate the runtime PC back to a link-time address so it lines up with
+	// bfd's section vmas. 0 on non-PIE, so a no-op there. Library frames land
+	// far outside amule's range either way, and the bounds check below still
+	// skips them.
 	uintptr_t address = (uintptr_t)_address - s_pie_base;
 	if (address < vma) {
 		return;
@@ -334,18 +399,18 @@
 		return;
 	}
 
-	s_found =  bfd_find_nearest_line(a_bfd, section, s_symbol_list,
-		address - vma, &s_file_name, &s_function_name, &s_line_number);
+	s_found = bfd_find_nearest_line(
+		a_bfd, section, s_symbol_list, address - vma, &s_file_name, &s_function_name, &s_line_number);
 }
 
 #endif // HAVE_BFD
 
-static wxString demangle(const wxString& function)
+static wxString demangle(const wxString &function)
 {
 #ifdef HAVE_CXXABI
 	wxString result;
 
-	if (function.Mid(0,2) == "_Z") {
+	if (function.Mid(0, 2) == "_Z") {
 		int status;
 		char *demangled = abi::__cxa_demangle(function.mb_str(), NULL, NULL, &status);
 
@@ -364,13 +429,12 @@
 #endif
 }
 
-
 // Print a stack backtrace if available
 wxString get_backtrace(unsigned n)
 {
 #ifdef HAVE_EXECINFO
 	// (stkn) create backtrace
-	void *bt_array100;	// 100 should be enough ?!?
+	void *bt_array100; // 100 should be enough ?!?
 	char **bt_strings;
 	int num_entries;
 
@@ -399,7 +463,7 @@
 		if (posLPar == -1 || posRPar == -1) {
 			if (posLBra == -1 || posRBra == -1) {
 				/* It is important to have exactly num_entries
-				* addresses in AllAddresses */
+				 * addresses in AllAddresses */
 				AllAddresses += "0x0000000 ";
 				continue;
 			}
@@ -422,7 +486,7 @@
 			}
 		}
 		/* Address */
-		if ( posLBra == -1 || posRBra == -1) {
+		if (posLBra == -1 || posRBra == -1) {
 			addressi = "0x0000000";
 		} else {
 			len = posRBra - posLBra - 1;
@@ -430,6 +494,9 @@
 			AllAddresses += addressi + " ";
 		}
 	}
+	// bt_strings is backtrace_symbols()'s char** block; passing it through
+	// free()'s void* is the documented idiom.
+	// NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion)
 	free(bt_strings);
 
 	/* Get line numbers from addresses */
@@ -446,12 +513,13 @@
 		s_file_name = NULL;
 		s_function_name = NULL;
 		s_line_number = 0;
-		s_found = false ;
+		s_found = false;
 
 		unsigned long addr;
-		addressi.ToULong(&addr,0); // As it's "0x" prepended, wx will read it as base 16. Hopefully.
+		addressi.ToULong(
+			&addr, 0); // As it's "0x" prepended, wx will read it as base 16. Hopefully.
 
-		bfd_map_over_sections(s_a_bfd, get_file_line_info, (void*)addr);
+		bfd_map_over_sections(s_a_bfd, get_file_line_info, (void *)addr);
 
 		if (s_found) {
 			wxString function = wxConvLibc.cMB2WX(s_function_name);
@@ -460,58 +528,47 @@
 				function = demangled;
 				funcnamei = demangled;
 			}
-			out.Insert(wxConvLibc.cMB2WX(s_function_name),i*2);
-			out.Insert(CFormat("%s:%u") % wxString(wxConvLibc.cMB2WX(s_file_name)) % s_line_number, i*2+1);
+			out.Insert(wxConvLibc.cMB2WX(s_function_name), i * 2);
+			out.Insert(
+				CFormat("%s:%u") % wxString(wxConvLibc.cMB2WX(s_file_name)) % s_line_number,
+				i * 2 + 1);
 		} else {
-			out.Insert("??",i*2);
-			out.Insert("??",i*2+1);
+			out.Insert("??", i * 2);
+			out.Insert("??", i * 2 + 1);
 		}
 	}
 
 	hasLineNumberInfo = true;
 
-#else	/* !HAVE_BFD */
+#else /* !HAVE_BFD */
 	if (wxThread::IsMain()) {
-		// Translate runtime PCs to link-time addresses before handing
-		// them to addr2line, otherwise PIE binaries (the default on
-		// modern distros) return "??" for every amule frame -- the
-		// same PIE bug the bfd path had before #677, exposed here in
-		// the no-libbfd fallback.  init_pie_base() leaves s_pie_base
-		// at 0 for non-PIE binaries, so this loop is a no-op there.
+		// Translate runtime PCs to link-time addresses first, or PIE binaries
+		// return "??" for every amule frame -- the bug #677 fixed on the bfd
+		// path, exposed again here. A no-op for non-PIE.
 		init_pie_base();
 		wxString translatedAddresses;
 		for (int i = 0; i < num_entries; ++i) {
 			unsigned long addr = 0;
 			addressi.ToULong(&addr, 0);
-			translatedAddresses += CFormat("0x%lx ")
-				% static_cast<unsigned long>(addr - s_pie_base);
+			translatedAddresses +=
+				CFormat("0x%lx ") % static_cast<unsigned long>(addr - s_pie_base);
 		}
 
 		wxString command;
-		command << "addr2line -C -f -s -e /proc/" <<
-		getpid() << "/exe " << translatedAddresses;
-		// The output of the command is this wxArrayString, in which
-		// the even elements are the function names, and the odd elements
-		// are the line numbers.
-
-		// Use popen() rather than wxExecute() here.  GUI wxExecute(cmd,
-		// out) on Linux waits for the child via wxGUIAppTraits::
-		// WaitForChild, which runs a nested wx event loop -- and that
-		// loop dispatches whatever is pending in the wx event queue.
-		// If the assert that brought us into get_backtrace() came from
-		// a periodic event handler (e.g. OnCoreTimer), the nested loop
-		// fires the same handler again, re-enters wxASSERT, and the
-		// second-level wx assert handler can't run amule's reentrantly
-		// so it falls through to wxTrap()'s int3 -> SIGTRAP.  popen()
-		// is a plain fork+waitpid pipeline with no wx involvement, so
-		// the reentrance path doesn't exist.
-		FILE* pipe = popen((const char*)command.mb_str(), "r");
+		command << "addr2line -C -f -s -e /proc/" << getpid() << "/exe " << translatedAddresses;
+		// Even elements of the output are function names, odd ones line numbers.
+
+		// popen() rather than wxExecute(): on Linux the GUI wxExecute waits via
+		// wxGUIAppTraits::WaitForChild, which runs a nested wx event loop. If the
+		// assert that brought us here came from a periodic handler, that loop
+		// fires the same handler again and the second-level assert handler falls
+		// through to wxTrap()'s int3. popen() is fork+waitpid with no wx in it.
+		FILE *pipe = popen((const char *)command.mb_str(), "r");
 		if (pipe) {
 			char line1024;
 			while (fgets(line, sizeof(line), pipe)) {
 				size_t len = std::strlen(line);
-				while (len > 0
-					&& (linelen-1 == '\n' || linelen-1 == '\r')) {
+				while (len > 0 && (linelen - 1 == '\n' || linelen - 1 == '\r')) {
 					line--len = '\0';
 				}
 				out.Add(wxConvLibc.cMB2WX(line));
@@ -522,15 +579,15 @@
 		}
 	}
 
-#endif	/* HAVE_BFD / !HAVE_BFD */
+#endif /* HAVE_BFD / !HAVE_BFD */
 
 	wxString trace;
 	// Remove 'n+1' first entries (+1 because of this function)
-	for (int i = n+1; i < num_entries; ++i) {
+	for (int i = n + 1; i < num_entries; ++i) {
 		/* If we have no function name, use the result from addr2line */
 		if (funcnamei.IsEmpty()) {
 			if (hasLineNumberInfo) {
-				funcnamei = out2*i;
+				funcnamei = out2 * i;
 			} else {
 				funcnamei = "??";
 			}
@@ -538,13 +595,13 @@
 		wxString btLine;
 		btLine << "" << i << " " << funcnamei << " in ";
 		/* If addr2line did not find a line number, use bt_string */
-		if (!hasLineNumberInfo || out2*i+1.Mid(0,2) == "??") {
+		if (!hasLineNumberInfo || out2 * i + 1.Mid(0, 2) == "??") {
 			btLine += libnamei + "" + addressi + "";
 		} else if (hasLineNumberInfo) {
 #if TOO_VERBOSE_BACKTRACE
-			btLine += out2*i+1;
+			btLine += out2 * i + 1;
 #else
-			btLine += out2*i+1.AfterLast('/');
+			btLine += out2 * i + 1.AfterLast('/');
 #endif
 		} else {
 			btLine += libnamei;
@@ -554,16 +611,17 @@
 	}
 
 	return trace;
-#else /* !HAVE_EXECINFO */
+#else  /* !HAVE_EXECINFO */
 	fprintf(stderr, "--== cannot generate backtrace ==--\n\n");
 	return "";
 #endif /* HAVE_EXECINFO */
 }
 
-#elif defined( __APPLE__ )
+#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.
+// 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:
 
@@ -580,13 +638,15 @@
 class stack_frame
 {
 public:
-	stack_frame(const void * f_instruction, const std::string& f_function) : frame_instruction(f_instruction), frame_function(f_function) {};
+	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; }
+	const std::string &function() const { return frame_function; }
 
 private:
-	const void * frame_instruction;
+	const void *frame_instruction;
 	const std::string frame_function;
 };
 
@@ -599,22 +659,22 @@
 		if ((d = abi::__cxa_demangle(name, 0, 0, &status))) {
 			ret = d;
 		}
-	} catch(...) {  }
+	} catch (...) {
+	}
 
 	std::free(d);
 	return ret;
 }
 
-
 void fill_frames(std::list<stack_frame> &frames)
 {
 	try {
-		void **fp = (void **) __builtin_frame_address (1);
+		void **fp = (void **)__builtin_frame_address(1);
 		void *saved_pc = NULL;
 
 		// First frame is skipped
 		while (fp != NULL) {
-			fp = (void**)(*fp);
+			fp = (void **)(*fp);
 			if (*fp == NULL) {
 				break;
 			}
@@ -631,7 +691,8 @@
 				Dl_info info;
 
 				if (dladdr(saved_pc, &info)) {
-					frames.push_back(stack_frame(saved_pc, demangle(info.dli_sname) + " in " + info.dli_fname));
+					frames.push_back(stack_frame(saved_pc,
+						demangle(info.dli_sname) + " in " + info.dli_fname));
 				}
 			}
 		}
@@ -674,7 +735,390 @@
 	wxString trace = get_backtrace(n);
 
 	// This is because the string is ansi anyway, and the conv classes are very slow
-	fprintf(stderr, "%s\n", (const char*)unicode2char(trace));
+	fprintf(stderr, "%s\n", (const char *)unicode2char(trace));
+}
+
+// Set by SuppressNextAbortBacktrace(). sig_atomic_t because the handler reads it; volatile because
+// the write and the read are in different control flows and nothing else orders them.
+static volatile sig_atomic_t s_suppressAbortBacktrace = 0;
+
+void SuppressNextAbortBacktrace()
+{
+	s_suppressAbortBacktrace = 1;
+}
+
+// One-shot, consumed by the first trap on the thread that armed it. Not thread_local: on macOS the
+// first touch of a TLS block calls into dyld and allocates, and on another thread the handler would
+// be that first touch.
+static volatile sig_atomic_t s_suppressTrapBacktrace = 0;
+#ifndef __WINDOWS__
+static volatile pthread_t s_trapSuppressOwner;
+#endif
+
+void SuppressNextTrapBacktrace()
+{
+#ifndef __WINDOWS__
+	s_trapSuppressOwner = pthread_self();
+#endif
+	s_suppressTrapBacktrace = 1;
+}
+
+void SuppressTrapBacktraceIfWxWillTrap()
+{
+#if wxDEBUG_LEVEL
+	if (wxTrapInAssert) {
+		SuppressNextTrapBacktrace();
+	}
+#endif
+}
+
+// -1 until a caller redirects; read by the handler, so sig_atomic_t rather than int.
+static volatile sig_atomic_t s_abortRedirectFd = -1;
+
+// Where the console copy goes when fd 2 is not it; see the header.
+static volatile sig_atomic_t s_abortConsoleFd = -1;
+
+// Written once before any crash, read from a handler, so a fixed buffer rather than a wxString.
+// The length is kept with it: strlen() is not on the async-signal-safe list.
+static char s_versionLine256 = { 0 };
+static volatile sig_atomic_t s_versionLineLen = 0;
+
+void SetFatalAbortRedirectFd(int fd)
+{
+	s_abortRedirectFd = fd;
+}
+
+void SetFatalAbortConsoleFd(int fd)
+{
+	s_abortConsoleFd = fd;
+}
+
+void SetFatalAbortVersionLine(const char *text)
+{
+	if (text == nullptr) {
+		s_versionLine0 = '\0';
+		s_versionLineLen = 0;
+		return;
+	}
+	const int written = std::snprintf(s_versionLine, sizeof(s_versionLine), "%s\n", text);
+	if (written < 0) {
+		// Encoding failure: nothing was written, so the buffer still holds whatever it held.
+		// Reporting a length here would paste uninitialised bytes into a public issue.
+		s_versionLine0 = '\0';
+		s_versionLineLen = 0;
+		return;
+	}
+	if (static_cast<size_t>(written) < sizeof(s_versionLine)) {
+		s_versionLineLen = written;
+		return;
+	}
+	// Truncated. The character lost is the trailing newline, which would glue the first
+	// backtrace frame onto the version line, so put it back over the last byte.
+	s_versionLinesizeof(s_versionLine) - 2 = '\n';
+	s_versionLineLen = static_cast<int>(sizeof(s_versionLine) - 1);
 }
 
+#ifndef __WINDOWS__
+static int AbortRedirectFd()
+{
+	return s_abortRedirectFd;
+}
+#endif
+
+// Whether the console is worth a copy. With no redirect it is the only sink there is. With one, the
+// caller decides: amuleapi passes stderrUsable = false because its fd 2 is the tee pipe, and that
+// pipe's pump writes into the very log the reserved descriptor names, so a console copy would land
+// there twice. SameFile() cannot catch that, since it compares a pipe against a file.
+// The console copy's destination: the descriptor a caller handed over, else fd 2 itself.
+static int AbortConsoleFd(int fallback)
+{
+	return s_abortConsoleFd >= 0 ? s_abortConsoleFd : fallback;
+}
+
+#ifndef __WINDOWS__
+// write(2) can return short, and returns EINTR if a signal lands mid-call. Looping is what makes
+// the banner arrive whole; a partial one splices into whatever glibc printed and reads as garbage.
+static void WriteAll(int fd, const char *data, size_t len)
+{
+	// Waiting out a sink that is merely busy, bounded so a handler cannot sit here forever. A
+	// second is far longer than a report needs and far shorter than the alarm.
+	const int kStallMs = 50;
+	const int kMaxStalls = 20;
+
+	int stalls = 0;
+	while (len > 0) {
+		const ssize_t written = write(fd, data, len);
+		if (written > 0) {
+			data += written;
+			len -= static_cast<size_t>(written);
+			continue;
+		}
+		if (written < 0 && errno == EINTR) {
+			continue;
+		}
+		if (written < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
+			// Not gone, just not ready. This is reachable: poll(POLLOUT) on a pipe
+			// promises only PIPE_BUF, and a 64-frame backtrace is bigger than that, so
+			// a non-blocking sink goes short partway through a report that had already
+			// passed the probe. Returning here would truncate it mid-line.
+			if (++stalls > kMaxStalls) {
+				return;
+			}
+			struct pollfd wait;
+			wait.fd = fd;
+			wait.events = POLLOUT;
+			wait.revents = 0;
+			(void)poll(&wait, 1, kStallMs);
+			continue;
+		}
+		return; // EBADF, EPIPE and friends: there really is nowhere left to report this
+	}
+}
+
+// Whether a descriptor can take a write right now. A wedged journald socket or a pipe whose reader
+// has stopped answers no, and a reporting path with a copy already out elsewhere skips it rather
+// than blocking. poll() is on the async-signal-safe list.
+static bool FdCanTakeAWrite(int fd)
+{
+	// A budget rather than a poll of zero. In a container without a tty fd 2 is a pipe, and a
+	// reader that is merely behind would otherwise cost the `docker logs` copy on the instant
+	// the buffer happens to be full. Long enough to ride out a busy reader, short enough that a
+	// genuinely wedged sink is still skipped well inside the alarm.
+	const int kProbeMs = 100;
+
+	struct pollfd probe;
+	probe.fd = fd;
+	probe.events = POLLOUT;
+	probe.revents = 0;
+	return poll(&probe, 1, kProbeMs) == 1 && (probe.revents & POLLOUT) != 0;
+}
+
+// Two descriptors naming one file, so a report written to both would arrive twice. fstat() is on
+// the async-signal-safe list, which matters for the caller that runs from a signal handler.
+static bool SameFile(int a, int b)
+{
+	struct stat sa;
+	struct stat sb;
+	return fstat(a, &sa) == 0 && fstat(b, &sb) == 0 && sa.st_dev == sb.st_dev && sa.st_ino == sb.st_ino;
+}
+#endif
+
+int ReserveCrashFd(int reserved, std::FILE *fp)
+{
+#ifdef __WINDOWS__
+	// An open handle blocks rename() on Windows, and the SIGABRT handler this feeds never runs
+	// there: wx goes through SEH and ExitProcess() instead. Reserve nothing.
+	(void)fp;
+	return reserved;
+#else
+	if (fp == nullptr) {
+		return reserved;
+	}
+	const int fd = fileno(fp);
+	if (fd < 0) {
+		return reserved;
+	}
+	// FD_CLOEXEC on every path: this descriptor is deliberately never closed, so without it the
+	// logfile would be held open by every child aMule spawns (wxExecute in FileLaunch and
+	// friends). dup() and dup2() both clear the flag, so it is set again after each.
+	if (reserved < 0) {
+		const int dupped = dup(fd);
+		if (dupped >= 0) {
+			(void)fcntl(dupped, F_SETFD, FD_CLOEXEC);
+		}
+		return dupped;
+	}
+	// dup2() onto the number already handed out, so the handler's copy follows the reopen. A
+	// failure leaves it on the previous file, which is still better than a closed descriptor.
+	(void)dup2(fd, reserved);
+	(void)fcntl(reserved, F_SETFD, FD_CLOEXEC);
+	return reserved;
+#endif
+}
+
+#ifdef HAVE_EXECINFO
+
+// sizeof - 1 rather than strlen(): strlen is not on the async-signal-safe list, and for a literal
+// the length is known at compile time anyway.
+#define WRITE_LITERAL(fd, lit) WriteAll((fd), (lit), sizeof(lit) - 1)
+
+static void WriteAbortReport(int fd, int sig, void *const *frames, int count)
+{
+	WRITE_LITERAL(
+		fd, "\n-------------------------=| FATAL BACKTRACE FOLLOWS |=-------------------------\n");
+	// Fixed literals rather than a formatted name: nothing here may allocate or call snprintf.
+	if (sig == SIGTRAP || sig == SIGILL) {
+		// Same construct, different encoding: __builtin_trap() is brk on arm64 and ud2 on
+		// x86_64, so the very same corruption check arrives as a different signal per target.
+		if (sig == SIGILL) {
+			WRITE_LITERAL(fd, "aMule was killed by an illegal instruction (SIGILL).\n");
+		} else {
+			WRITE_LITERAL(fd, "aMule was killed by a trap (SIGTRAP).\n");
+		}
+		WRITE_LITERAL(fd,
+			"An allocator or a hardened library check found state it would not continue\n"
+			"past. The frames below are where the damage was NOTICED, not where it was\n"
+			"caused. Please report them at\n"
+			"    https://github.com/amule-org/amule/issues\n\n");
+	} else {
+		WRITE_LITERAL(fd,
+			"aMule was aborted (SIGABRT). If this followed a glibc allocator message such as\n"
+			"'double free or corruption', the frames below are where the damage was NOTICED,\n"
+			"not where it was caused. Please report them at\n"
+			"    https://github.com/amule-org/amule/issues\n\n");
+	}
+	// Which build produced this. Pasted reports are useless without it, and a handler cannot
+	// format one, so it was written into a fixed buffer before the crash.
+	if (s_versionLineLen > 0) {
+		WriteAll(fd, s_versionLine, static_cast<size_t>(s_versionLineLen));
+	}
+	if (count > 0) {
+		backtrace_symbols_fd(frames, count, fd);
+	} else {
+		WRITE_LITERAL(fd, "* Could not generate backtrace\n");
+	}
+	WRITE_LITERAL(
+		fd, "-------------------------------------------------------------------------------\n");
+}
+
+// wx's own SIGILL disposition, saved at install time. See InstallFatalAbortHandler().
+static struct sigaction s_prevIll;
+static volatile sig_atomic_t s_havePrevIll = 0;
+
+extern "C" void MuleFatalAbortHandler(int sig)
+{
+	// Bound the handler before doing anything that can block. backtrace() unwinds through
+	// dl_iterate_phdr(), which takes the loader's load lock, so an abort that interrupted
+	// another thread inside dlopen()/dlclose() would wait here forever. A process that hangs is
+	// worse than one that dies without a trace: a supervisor watching for a non-zero exit never
+	// restarts it. The install-time warm-up removes the dlopen this handler would do itself, not
+	// a lock some other thread already holds. SIG_DFL first, in case something installed a
+	// SIGALRM handler; both calls are async-signal-safe.
+	//
+	// SA_RESETHAND resets only the delivered signal, so one of the three can re-enter through
+	// another. Re-entry gets no report, no fresh alarm and no chain, or the bound the first entry
+	// set would keep sliding. Never cleared: one report is all a dying process owes anyone.
+	static volatile sig_atomic_t s_inHandler = 0;
+	const bool reentered = s_inHandler != 0;
+	s_inHandler = 1;
+
+	if (!reentered) {
+		signal(SIGALRM, SIG_DFL);
+		alarm(10);
+	}
+
+	// Both flags cover one death only, so both are consumed here. The trap one also has to be the
+	// arming thread's, because a trap on any other thread is a real one.
+	const bool trapArmed = sig == SIGTRAP && s_suppressTrapBacktrace != 0;
+	const bool trapSuppressed = trapArmed && pthread_equal(s_trapSuppressOwner, pthread_self()) != 0;
+	const bool suppressed = s_suppressAbortBacktrace != 0 || trapSuppressed;
+	s_suppressAbortBacktrace = 0;
+	if (trapSuppressed) {
+		s_suppressTrapBacktrace = 0;
+	}
+
+	if (!suppressed && !reentered) {
+		// 64 frames: the deepest real trace on amule-org/amule#1338 was 31, and the array is
+		// on the handler's stack, which is the process stack here rather than a sigaltstack.
+		void *frames64;
+		const int count = backtrace(frames, 64);
+
+		// Both sinks, the way EmergencyLog() already reports the SIGSEGV path: the file is
+		// the copy that survives a daemon, the console is the one an operator reads out of
+		// `docker logs`. Written to the descriptors directly rather than dup2()ed over fd 2,
+		// so neither sink costs the other. Ordering as in EmitTerminateChunk: whichever sink
+		// can be probed goes first, because the other one cannot be.
+		const int redirect = s_abortRedirectFd;
+		const int console = AbortConsoleFd(STDERR_FILENO);
+		const bool haveDurable = redirect >= 0 && !SameFile(redirect, console);
+		const bool consoleFirst = FdCanTakeAWrite(console);
+
+		if (consoleFirst) {
+			WriteAbortReport(console, sig, frames, count);
+		}
+		if (haveDurable) {
+			WriteAbortReport(redirect, sig, frames, count);
+		}
+		if (!consoleFirst && !haveDurable) {
+			WriteAbortReport(console, sig, frames, count);
+		}
+	}
+
+	// wx claims SIGILL too, so installing ours on top took OnFatalException() away from every ud2
+	// death on x86_64. Chain to whoever held it, so the frames above add to wx's report instead of
+	// replacing it. Called, not re-raised: SA_RESETHAND has already restored SIG_DFL. Only the
+	// plain sa_handler form, because a SA_SIGINFO one needs a siginfo_t we do not have.
+	if (!reentered && sig == SIGILL && s_havePrevIll != 0 && (s_prevIll.sa_flags & SA_SIGINFO) == 0 &&
+		s_prevIll.sa_handler != SIG_DFL && s_prevIll.sa_handler != SIG_IGN) {
+		// A bound of its own, not our leftovers: wx symbolicates, and get_backtrace() popen()s
+		// addr2line on the non-BFD path.
+		alarm(10);
+		s_prevIll.sa_handler(sig);
+	}
+
+	// Die of the signal that arrived, rather than returning. Returning would swallow a plain
+	// `kill -ABRT`, and for SIGTRAP it is not survivable at all: the trap instruction is still
+	// the resume address, so it re-executes and traps again forever.
+	//
+	// SA_RESETHAND is not enough to make that raise terminate. Measured on macOS arm64: a
+	// SIGTRAP from a trap instruction arrives through the Mach exception path, the reset does
+	// not take, and the handler is re-entered on every re-execution. Restore the default
+	// explicitly, and unblock, because the signal is masked inside its own handler -- otherwise
+	// the raise only marks it pending for a return that never comes.
+	signal(sig, SIG_DFL);
+	sigset_t unblock;
+	sigemptyset(&unblock);
+	sigaddset(&unblock, sig);
+	pthread_sigmask(SIG_UNBLOCK, &unblock, nullptr);
+	raise(sig);
+}
+
+void InstallFatalAbortHandler()
+{
+	// glibc's backtrace() dlopen()s libgcc's unwinder on first use, which allocates. Doing that
+	// for the first time inside the handler is exactly what this design exists to avoid, so
+	// force the lazy init now, while the heap is still sound.
+	//
+	// Load-bearing, not belt and braces: measured on glibc 2.43 against a smashed top-chunk
+	// size, a handler without this warm-up printed nothing at all -- backtrace() reached the
+	// corruption through its own first-use allocation and the process died mid-report. The same
+	// handler with the warm-up printed the full trace.
+	void *warmup1;
+	(void)backtrace(warmup, 1);
+
+	struct sigaction sa;
+	memset(&sa, 0, sizeof(sa));
+	sa.sa_handler = MuleFatalAbortHandler;
+	sigemptyset(&sa.sa_mask);
+	// SA_RESETHAND so a fault inside the handler cannot loop back into it.
+	sa.sa_flags = SA_RESETHAND;
+	sigaction(SIGABRT, &sa, nullptr);
+	// macOS libmalloc reports some heap corruption with a trap instruction instead of abort(),
+	// and hardened libc++ and __builtin_trap() do the same. Without these the backtrace this
+	// file exists for is missing for exactly those deaths.
+	//
+	// Both signals, because the encoding is per-target: __builtin_trap() is brk on arm64, which
+	// raises SIGTRAP, and ud2 on x86_64, which raises SIGILL. Installing only one covers only
+	// half the machines we ship to.
+	//
+	// Debuggers are unaffected: lldb and gdb take these through Mach exception ports and
+	// ptrace, ahead of signal delivery.
+	sigaction(SIGTRAP, &sa, nullptr);
+	// SIGILL keeps wx's disposition, which the handler chains into. So this must run after
+	// wxHandleFatalExceptions(true), or there is nothing to chain to.
+	memset(&s_prevIll, 0, sizeof(s_prevIll));
+	if (sigaction(SIGILL, &sa, &s_prevIll) == 0) {
+		s_havePrevIll = 1;
+	}
+}
+
+#else /* !HAVE_EXECINFO */
+
+void InstallFatalAbortHandler()
+{
+	// Nothing to print without backtrace(); leave the default disposition alone.
+}
+
+#endif /* HAVE_EXECINFO */
+
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/libs/common/MuleDebug.h -> amule-3.1.0.tar.gz/src/libs/common/MuleDebug.h Changed

@@ -28,124 +28,234 @@
 
 #include <wx/string.h>
 
+#include <cstdio>
+
 /**
  * Installs an exception handler that can handle CMuleExceptions.
  */
 void InstallMuleExceptionHandler();
 
-/**
- *
- */
 void OnUnhandledException();
 
-
 //! Print a backtrace, skipping the first n frames.
 void print_backtrace(unsigned n);
 
 //! Returns a backtrace, skipping the first n frames.
 wxString get_backtrace(unsigned n);
 
+/**
+ * Arms handlers for SIGABRT, SIGTRAP and SIGILL that write a raw backtrace to stderr.
+ *
+ * wx's fatal-exception support covers SIGSEGV, SIGBUS, SIGILL and SIGFPE, so a glibc heap abort
+ * ("double free or corruption", "free(): invalid pointer") bypasses the whole reporting path and
+ * the process dies silently. That is what left amule-org/amule#1338 with no backtrace at all.
+ *
+ * SIGTRAP and SIGILL are here because __builtin_trap(), hardened libc++ and macOS libmalloc report
+ * through a trap instruction rather than abort(): brk on arm64 raises SIGTRAP, ud2 on x86_64 raises
+ * SIGILL. wx claims SIGILL, so that handler chains back into wx's once it has written its frames.
+ *
+ * Deliberately NOT get_backtrace(): we are entered from abort(), which glibc calls from
+ * malloc_printerr with the allocator's state already inconsistent and, above the tcache ceiling,
+ * its arena lock held. get_backtrace() allocates throughout -- backtrace_symbols(), std::vector,
+ * wxString -- and on the non-BFD path it popen()s addr2line. So this writes frames with
+ * backtrace_symbols_fd(), the variant documented not to allocate. They go to the descriptor set by
+ * SetFatalAbortRedirectFd(), or to STDERR_FILENO when none is set.
+ *
+ * Worth being exact about the risk, because it is a guarantee rather than an observed failure: an
+ * allocating handler does NOT reliably hang. Measured on glibc 2.43, a double free above the
+ * tcache ceiling reaches malloc_printerr with the arena lock held, yet a handler calling
+ * backtrace_symbols() still completed -- its own allocation was small enough to come from tcache,
+ * which needs no lock. The case against it is that this depends on a free chunk of the right size
+ * happening to be cached, on a heap already known to be damaged, with fork() in the fallback path.
+ * backtrace_symbols_fd() needs none of that to hold.
+ *
+ * The cost is raw output: module, offset and mangled symbol, no demangling and no line numbers.
+ * Run addr2line over the addresses offline.
+ *
+ * Call once per process, after the wx fatal handlers are armed.
+ */
+void InstallFatalAbortHandler();
+
+/**
+ * Tells the SIGABRT handler to stay quiet for the next abort.
+ *
+ * For callers that have already reported: ReportAssertFailure() prints a full symbolicated
+ * backtrace and then raise(SIGABRT)s to give gdb something to catch, and a second raw dump on top
+ * of it is noise.
+ */
+void SuppressNextAbortBacktrace();
+
+/**
+ * Tells the SIGTRAP handler to stay quiet for the next trap on this thread.
+ *
+ * Same reason as above, on the other assert path: an assert the user stops ends in wxTrap(), and
+ * ReportAssertFailure() has already printed the symbolicated backtrace. Consumed by the first trap
+ * on the arming thread, so a trap elsewhere is still reported.
+ */
+void SuppressNextTrapBacktrace();
+
+/** Arms the above when wxTrapInAssert says wx is about to trap. Prefer RunWxAssertHandler(). */
+void SuppressTrapBacktraceIfWxWillTrap();
 
 /**
- * This exception should be used to implement other
- * types of exceptions. It should never be caught,
- * instead catch the subtypes.
+ * Runs wx's assert handler and mutes the raw trace for the trap it may take on the way out.
+ *
+ * The ordering lives here rather than at each call site because it is easy to get wrong: wx traps
+ * after the handler returns, not inside it, so a suppression scoped around the call would be
+ * released before the trap it is meant to mute -- and would swallow a real one meanwhile.
+ */
+template <typename F> void RunWxAssertHandler(F &&handler)
+{
+	handler();
+	SuppressTrapBacktraceIfWxWillTrap();
+}
+
+/**
+ * Gives the crash reporters a durable descriptor to report to.
+ *
+ * For a process that has put something other than a terminal on fd 2. amuleapi tees stdout and
+ * stderr through pipes that a forwarding thread drains, so a report written only to fd 2 leaves the
+ * backtrace in a pipe whose reader dies with the process moments later.
+ *
+ * The reporters write here and to the console descriptor both, so a container keeps the report in
+ * `docker logs` and a terminal still shows it. Pass -1 to go back to fd 2 alone.
+ *
+ * This covers the SIGABRT, SIGTRAP, SIGILL and std::terminate paths. It does NOT replace
+ * CamuleapiApp::OnFatalException's call to CLogTee::RedirectStderrForCrash(): wx's own
+ * SIGSEGV/SIGBUS/SIGILL/SIGFPE handler reports through stderr -- SIGILL included, since it reaches
+ * wx by chaining -- so without that dup2() the SIGSEGV backtrace still dies in the tee pipe.
+ */
+void SetFatalAbortRedirectFd(int fd);
+
+/**
+ * Where the console copy of a crash report goes, when fd 2 is not it.
+ *
+ * amuleapi routes fd 2 through its tee pipe, so a report written there reaches the console only if
+ * the pump thread is still scheduled -- true at std::terminate, not true in a signal handler.
+ * CLogTee::ConsoleFd() hands over the dup of the original fd 2 it already keeps, and writing
+ * straight to that reaches `docker logs` in both cases.
+ *
+ * Pass -1 (the default) to use fd 2. Clear it before the descriptor is closed, exactly as for
+ * SetFatalAbortRedirectFd().
+ */
+void SetFatalAbortConsoleFd(int fd);
+
+/**
+ * A one-line build identifier for the raw fatal-signal banner, copied into a fixed buffer.
+ *
+ * The banner is written from a signal handler, so it cannot format anything: a report pasted from
+ * the field would otherwise not say which build produced it. Call once the version is known.
+ */
+void SetFatalAbortVersionLine(const char *text);
+
+/**
+ * Re-points a reserved crash descriptor at the file behind @a fp, returning the reserved number.
+ *
+ * A fatal handler cannot look a descriptor up when it runs, because every path that resolves one
+ * locks. It holds a single number instead, and this keeps that number pointing at the current
+ * file: pass -1 the first time to reserve one, then pass the same value back after every reopen.
+ * The number itself is never closed, so it cannot be freed mid-rotation and handed out to another
+ * thread's socket while the handler still holds it.
+ *
+ * Returns @a reserved unchanged when @a fp is null or the dup fails.
+ */
+int ReserveCrashFd(int reserved, std::FILE *fp);
+
+/**
+ * Base for the other exception types. Never catch this; catch the subtypes.
  */
 class CMuleException
 {
 public:
-	CMuleException(const wxString& type, const wxString& desc)
-		: m_what(type + ": " + desc) {}
-	CMuleException(const CMuleException&) = default;
-	CMuleException& operator=(const CMuleException&) = default;
+	CMuleException(const wxString &type, const wxString &desc)
+	: m_what(type + ": " + desc)
+	{
+	}
+	CMuleException(const CMuleException &) = default;
+	CMuleException &operator=(const CMuleException &) = default;
 	virtual ~CMuleException() noexcept {}
-	virtual const wxString& what() const noexcept { return m_what; }
+	virtual const wxString &what() const noexcept { return m_what; }
 
 private:
 	wxString m_what;
 };
 
-
 /**
- * This exception type is used to represent exceptions that are
- * caused by invalid operations. Exceptions of this type should
- * not be caught as they are the result of bugs.
+ * Exceptions caused by invalid operations. Do not catch these -- they are the result of bugs.
  */
 struct CRunTimeException : public CMuleException
 {
-	CRunTimeException(const wxString& type, const wxString& desc)
-		: CMuleException("CRunTimeException::" + type, desc) {}
+	CRunTimeException(const wxString &type, const wxString &desc)
+	: CMuleException("CRunTimeException::" + type, desc)
+	{
+	}
 };
 
-
-
 /**
- * This exception is to be thrown if invalid parameters are passed to a function.
+ * Thrown if invalid parameters are passed to a function.
  */
 struct CInvalidParamsEx : public CRunTimeException
 {
-	CInvalidParamsEx(const wxString& desc)
-		: CRunTimeException("CInvalidArgsException", desc) {}
+	CInvalidParamsEx(const wxString &desc)
+	: CRunTimeException("CInvalidArgsException", desc)
+	{
+	}
 };
 
-
 /**
- * This exception is to be thrown if an object is used in an invalid state.
+ * Thrown if an object is used in an invalid state.
  */
 struct CInvalidStateEx : public CRunTimeException
 {
-	CInvalidStateEx(const wxString& desc)
-		: CRunTimeException("CInvalidStateException", desc) {}
+	CInvalidStateEx(const wxString &desc)
+	: CRunTimeException("CInvalidStateException", desc)
+	{
+	}
 };
 
 /**
- * This exception is thrown on wrong packets or tags.
+ * Thrown on wrong packets or tags.
  */
 struct CInvalidPacket : public CMuleException
 {
-	CInvalidPacket(const wxString& desc)
-		: CMuleException("CInvalidPacket", desc) {}
+	CInvalidPacket(const wxString &desc)
+	: CMuleException("CInvalidPacket", desc)
+	{
+	}
 };
 
-
 // This ifdef ensures that we wont get assertions while
 // unittesting, which would otherwise impede the tests.
 #ifdef MULEUNIT
-	#define _MULE_THROW(cond, cls, msg) \
-		do { \
-			if (!(cond)) { \
-				throw cls(msg); \
-			} \
-		} while (false)
+#define _MULE_THROW(cond, cls, msg) \
+	do { \
+		if (!(cond)) { \
+			throw cls(msg); \
+		} \
+	} while (false)
 #else
-	#define _MULE_THROW(cond, cls, msg) \
-		do { \
-			if (!(cond)) { \
-				wxFAIL_MSG(#cond); \
-				throw cls(msg); \
-			} \
-		} while (false)
+#define _MULE_THROW(cond, cls, msg) \
+	do { \
+		if (!(cond)) { \
+			wxFAIL_MSG(#cond); \
+			throw cls(msg); \
+		} \
+	} while (false)
 #endif
 
+#define MULE_CHECK_THROW(cond, cls, msg) _MULE_THROW((cond), cls, (msg))
 
+#define MULE_VALIDATE_STATE(cond, msg) MULE_CHECK_THROW((cond), CInvalidStateEx, (msg))
 
-#define MULE_CHECK_THROW(cond, cls, msg) \
-	_MULE_THROW((cond), cls, (msg))
-
-#define MULE_VALIDATE_STATE(cond, msg) \
-	MULE_CHECK_THROW((cond), CInvalidStateEx, (msg))
-
-#define MULE_VALIDATE_PARAMS(cond, msg) \
-	MULE_CHECK_THROW((cond), CInvalidParamsEx, (msg))
-
+#define MULE_VALIDATE_PARAMS(cond, msg) MULE_CHECK_THROW((cond), CInvalidParamsEx, (msg))
 
-#define MULE_ASSERT(cond)               wxASSERT((cond))
-#define MULE_ASSERT_MSG(cond, msg)      wxASSERT_MSG((cond), msg)
-#define MULE_FAIL()                     wxFAIL()
-#define MULE_FAIL_MSG(msg)              wxFAIL_MSG(msg)
-#define MULE_CHECK(cond, retValue)      wxCHECK((cond), (retValue))
-#define MULE_CHECK_MSG(cond, ret, msg)  wxCHECK_MSG((cond), (ret), (msg))
-#define MULE_CHECK_RET(cond, msg)       wxCHECK_RET((cond), (msg))
+#define MULE_ASSERT(cond) wxASSERT((cond))
+#define MULE_ASSERT_MSG(cond, msg) wxASSERT_MSG((cond), msg)
+#define MULE_FAIL() wxFAIL()
+#define MULE_FAIL_MSG(msg) wxFAIL_MSG(msg)
+#define MULE_CHECK(cond, retValue) wxCHECK((cond), (retValue))
+#define MULE_CHECK_MSG(cond, ret, msg) wxCHECK_MSG((cond), (ret), (msg))
+#define MULE_CHECK_RET(cond, msg) wxCHECK_RET((cond), (msg))
 
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/libs/common/Path.cpp -> amule-3.1.0.tar.gz/src/libs/common/Path.cpp Changed

@@ -23,78 +23,74 @@
 //
 
 #include "Path.h"
-#include "StringFunctions.h"		// Needed for filename2char()
+#include "StringFunctions.h" // Needed for filename2char()
 
 #include <wx/file.h>
 #if defined __WINDOWS__ || defined __IRIX__
-#	include <wx/ffile.h>
+#include <wx/ffile.h>
 #endif
 #include <wx/utils.h>
 #include <wx/filename.h>
-#include <algorithm>	// Needed for std::min
+#include <algorithm> // Needed for std::min
 
+#ifndef __WINDOWS__
+#include <sys/stat.h> // Needed for ::stat in GetFileStat
+#endif
 
-// 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 constructor ...
+// Windows paths are case-insensitive, so compare that way there.
+// TODO: lowercasing m_filesystem in the constructor may be simpler.
 #ifdef __WINDOWS__
-	#define PATHCMP(a, b)		wxStricmp(a, b)
-	#define PATHNCMP(a, b, n)	wxStrnicmp(a, b, n)
+#define PATHCMP(a, b) wxStricmp(a, b)
+#define PATHNCMP(a, b, n) wxStrnicmp(a, b, n)
 #else
-	#define PATHCMP(a, b)		wxStrcmp(a, b)
-	#define PATHNCMP(a, b, n)	wxStrncmp(a, b, n)
+#define PATHCMP(a, b) wxStrcmp(a, b)
+#define PATHNCMP(a, b, n) wxStrncmp(a, b, n)
 #endif
 
-
 ////////////////////////////////////////////////////////////
 // Helper functions
 
-
 /** Creates a deep copy of the string, avoiding its ref. counting. */
-inline wxString DeepCopy(const wxString& str)
+inline wxString DeepCopy(const wxString &str)
 {
 	return wxString(str.c_str(), str.Length());
 }
 
-
-static wxString Demangle(const wxCharBuffer& fn, const wxString& filename)
+static wxString Demangle(const wxCharBuffer &fn, const wxString &filename)
 {
 	wxString result = wxConvUTF8.cMB2WC(fn);
 
 	// FIXME: Is this actually needed for osx/msw?
 	if (!result) {
-		// We only try to further demangle if the current locale is
-		// UTF-8, C or POSIX. This is because in any other case, the
-		// current locale is probably the best choice for printing.
+		// Demangle further only for UTF-8, C and POSIX locales. For anything
+		// else the current locale is probably the best choice for printing.
 		static wxFontEncoding enc = wxLocale::GetSystemEncoding();
 
 		switch (enc) {
-			// SYSTEM is needed for ANSI encodings such as
-			// "POSIX" and "C", which are only 7bit.
-			case wxFONTENCODING_SYSTEM:
-			case wxFONTENCODING_UTF8:
-				result = wxConvISO8859_1.cMB2WC(fn);
-				break;
-
-			default:
-				// Nothing to do, the filename is probably Ok.
-				result = DeepCopy(filename);
+		// SYSTEM is needed for ANSI encodings such as
+		// "POSIX" and "C", which are only 7bit.
+		case wxFONTENCODING_SYSTEM:
+		case wxFONTENCODING_UTF8:
+			result = wxConvISO8859_1.cMB2WC(fn);
+			break;
+
+		default:
+			// Nothing to do, the filename is probably Ok.
+			result = DeepCopy(filename);
 		}
 	}
 
 	return result;
 }
 
-
 /** Splits a full path into its path and filename component. */
-inline void DoSplitPath(const wxString& strPath, wxString* path, wxString* name)
+inline void DoSplitPath(const wxString &strPath, wxString *path, wxString *name)
 {
 	bool hasExt = false;
 	wxString ext, vol;
 
-	wxString* pVol = (path ? &vol : NULL);
-	wxString* pExt = (name ? &ext : NULL);
+	wxString *pVol = (path ? &vol : NULL);
+	wxString *pExt = (name ? &ext : NULL);
 
 	wxFileName::SplitPath(strPath, pVol, path, name, pExt, &hasExt);
 
@@ -107,48 +103,46 @@
 	}
 }
 
-
 /** Removes invalid chars from a filename. */
-static wxString DoCleanup(const wxString& filename, bool keepSpaces, bool isFAT32)
+static wxString DoCleanup(const wxString &filename, bool keepSpaces, bool isFAT32)
 {
 	wxString result;
 	for (size_t i = 0; i < filename.Length(); i++) {
 		const wxChar c = filenamei;
 
 		switch (c) {
-			case '/':
+		case '/':
+			continue;
+
+		case '\"':
+		case '*':
+		case '<':
+		case '>':
+		case '?':
+		case '|':
+		case '\\':
+		case ':':
+			if (isFAT32) {
 				continue;
+			}
 
-			case '\"':
-			case '*':
-			case '<':
-			case '>':
-			case '?':
-			case '|':
-			case '\\':
-			case ':':
-				if (isFAT32) {
-					continue;
-				}
-
-			/* fall through */
-			default:
-				if ((c == ' ') && !keepSpaces) {
-					result += "%20";
-				} else if (c >= 32) {
-					// Many illegal for filenames in windows
-					// below the 32th char (which is space).
-					result += filenamei;
-				}
+		/* fall through */
+		default:
+			if ((c == ' ') && !keepSpaces) {
+				result += "%20";
+			} else if (c >= 32) {
+				// Many illegal for filenames in windows
+				// below the 32th char (which is space).
+				result += filenamei;
+			}
 		}
 	}
 
 	return result;
 }
 
-
 /** Does the actual work of adding a postfix ... */
-static wxString DoAddPostfix(const wxString& src, const wxString& postfix)
+static wxString DoAddPostfix(const wxString &src, const wxString &postfix)
 {
 	wxFileName fn(src);
 
@@ -158,7 +152,7 @@
 }
 
 /** Removes the last extension of a filename. */
-static wxString DoRemoveExt(const wxString& path)
+static wxString DoRemoveExt(const wxString &path)
 {
 	// Using wxFilename which handles paths, etc.
 	wxFileName tmp(path);
@@ -167,9 +161,8 @@
 	return tmp.GetFullPath();
 }
 
-
 /** Readies a path for use with wxAccess.. */
-static wxString DoCleanPath(const wxString& path)
+static wxString DoCleanPath(const wxString &path)
 {
 #ifdef __WINDOWS__
 	// stat fails on windows if there are trailing path-separators.
@@ -187,67 +180,71 @@
 #endif
 }
 
+/**
+ * The canonical form IsSameAs() reduces a path to before comparing it.
+ *
+ * Computed once per path rather than twice per comparison. Grouping by this
+ * string is equivalent to comparing pairwise, which lets CSharedFileList answer
+ * a browse without re-deriving the grouping per directory (issue #898).
+ *
+ * Only for paths with a separator; bare filenames use PATHCMP.
+ */
+static wxString NormalizedKey(const wxString &path)
+{
+	// Only relative paths need the cwd: Normalize ignores it for absolute ones.
+	// Skipping wxGetCwd() there (nearly every call site) avoids the wxLogSysError
+	// it emits on macOS bundles whose recorded CWD is gone.
+	wxString cwd;
+	if (!wxIsAbsolutePath(path)) {
+		cwd = wxGetCwd();
+	}
+
+	// Normalize all but env variables, which break when the string is not
+	// encodable with wxConvLibc. Explicit flags: wxPATH_NORM_ALL is gone in wx3.
+	const int flags = wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_CASE | wxPATH_NORM_ABSOLUTE |
+			  wxPATH_NORM_LONG | wxPATH_NORM_SHORTCUT;
+
+	// wxFileName does the hard part. Note a trailing separator makes a path
+	// unequal to the same path without one.
+	wxFileName fn(path);
+	fn.Normalize(flags, cwd);
+	return fn.GetFullPath();
+}
 
 /** Returns true if the two paths are equal. */
-static bool IsSameAs(const wxString& a, const wxString& b)
-{
-	// Fast path for bare filenames (no directory separator on either
-	// path).  Search results stream in as bare filenames from FT_FILENAME
-	// tags, and CSearchFile::AddChild's filename-dedup path
-	// (other->GetFileName() == file->GetFileName()) lands here on every
-	// duplicate result; without this fast path the call falls through to
-	// wxFileName::Normalize, which insists on a cwd argument and triggers
-	// wxGetCwd() — and wxGetCwd() emits a wxLogSysError on macOS bundles
-	// whose recorded CWD has been removed (App translocation, deleted
-	// launching shell, etc.) for every comparison.
-	if (a.find_first_of(wxFileName::GetPathSeparators()) == wxString::npos
-		&& b.find_first_of(wxFileName::GetPathSeparators()) == wxString::npos) {
+static bool IsSameAs(const wxString &a, const wxString &b)
+{
+	// Fast path for bare filenames. Search results arrive as bare FT_FILENAME
+	// strings and CSearchFile::AddChild dedups on every duplicate, so without
+	// this each one falls through to Normalize and triggers wxGetCwd().
+	if (a.find_first_of(wxFileName::GetPathSeparators()) == wxString::npos &&
+		b.find_first_of(wxFileName::GetPathSeparators()) == wxString::npos) {
 		return PATHCMP(a.c_str(), b.c_str()) == 0;
 	}
 
-	// Cache the current directory only when at least one of the paths
-	// is relative — wxFileName::Normalize ignores the cwd argument
-	// for absolute paths.  Skipping wxGetCwd() in the absolute-only
-	// case (which is essentially every aMule call site: shared dirs,
-	// Temp, Incoming, partfile paths) avoids the wxLogSysError
-	// "Failed to get the working directory" that wxGetCwd() emits on
-	// macOS bundles whose recorded CWD has been removed (App
-	// translocation, deleted launching shell, etc.).
-	wxString cwd;
-	if (!wxIsAbsolutePath(a) || !wxIsAbsolutePath(b)) {
-		cwd = wxGetCwd();
+	// Identical strings normalise identically, so both calls below are known
+	// to agree before either runs.
+	if (a == b) {
+		return true;
 	}
 
-	// We normalize everything, except env. variables, which
-	// can cause problems when the string is not encodable
-	// using wxConvLibc which wxWidgets uses for the purpose.
-	// wxPATH_NORM_ALL is deprecated in wx3 — use explicit flags instead (excluding wxPATH_NORM_ENV_VARS)
-	const int flags = wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_CASE | wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG | wxPATH_NORM_SHORTCUT;
-
-	// Let wxFileName handle the tricky stuff involved in actually
-	// comparing two paths ... Currently, a path ending with a path-
-	// separator will be unequal to the same path without a path-
-	// separator, which is probably for the best, but can could
-	// lead to some unexpected behavior.
-	wxFileName fn1(a);
-	wxFileName fn2(b);
-
-	fn1.Normalize(flags, cwd);
-	fn2.Normalize(flags, cwd);
+	// An empty path equals only another empty path, already answered above.
+	// Falling through would normalise "" against the process cwd, making an
+	// unset path compare equal to whatever directory aMule sits in. A
+	// CKnownFile from known.met has no directory until the share scan stamps one.
+	if (a.empty() || b.empty()) {
+		return false;
+	}
 
-	return (fn1.GetFullPath() == fn2.GetFullPath());
+	return NormalizedKey(a) == NormalizedKey(b);
 }
 
-
 ////////////////////////////////////////////////////////////
 // CPath implementation
 
-CPath::CPath()
-{
-}
+CPath::CPath() {}
 
-
-CPath::CPath(const wxString& filename)
+CPath::CPath(const wxString &filename)
 {
 	// Equivalent to the default constructor ...
 	if (!filename) {
@@ -256,17 +253,13 @@
 
 	wxCharBuffer fn = filename2char(filename);
 	if (fn.data()) {
-		// Filename is valid in the current locale. This means that
-		// it either originated from a (wx)system-call, or from a
-		// user with a properly setup system.
+		// Valid in the current locale, so it came from a system call or a
+		// correctly configured system.
 		m_filesystem = DeepCopy(filename);
-		m_printable  = Demangle(fn, filename);
+		m_printable = Demangle(fn, filename);
 	} else {
-		// It's not a valid filename in the current locale, so we'll
-		// have to do some magic. This ensures that the filename is
-		// saved as UTF8, even if the system is not unicode enabled,
-		// preserving the original filename till the user has fixed
-		// his system ...
+		// Invalid in the current locale: save as UTF-8 even on a non-unicode
+		// system, preserving the original until the user fixes their setup.
 #ifdef __WINDOWS__
 		// Magic fails on Windows where we always work with wide char file names.
 		m_filesystem = DeepCopy(filename);
@@ -284,32 +277,27 @@
 	wxASSERT(m_printable.Length());
 }
 
+CPath::CPath(const CPath &other)
+: m_printable(DeepCopy(other.m_printable))
+, m_filesystem(DeepCopy(other.m_filesystem))
+{
+}
 
-CPath::CPath(const CPath& other)
-	: m_printable(DeepCopy(other.m_printable))
-	, m_filesystem(DeepCopy(other.m_filesystem))
-{}
-
-
-
-CPath CPath::FromUniv(const wxString& path)
+CPath CPath::FromUniv(const wxString &path)
 {
 	wxCharBuffer fn = path.mb_str(wxConvISO8859_1);
 	return CPath(wxConvFileName->cMB2WC(fn));
 }
 
-
-wxString CPath::ToUniv(const CPath& path)
+wxString CPath::ToUniv(const CPath &path)
 {
-	// The logic behind this is that by saving the filename
-	// as a raw bytestream, we can always recreate the on-disk filename,
-	// as if we had read it using wx functions.
+	// Saved as a raw bytestream so the on-disk filename can always be
+	// recreated, as if read through wx.
 	wxCharBuffer fn = path.m_filesystem.mb_str(*wxConvFileName);
 	return wxConvISO8859_1.cMB2WC(fn);
 }
 
-
-CPath& CPath::operator=(const CPath& other)
+CPath &CPath::operator=(const CPath &other)
 {
 	if (this != &other) {
 		m_printable = DeepCopy(other.m_printable);
@@ -319,44 +307,37 @@
 	return *this;
 }
 
-
-bool CPath::operator==(const CPath& other) const
+bool CPath::operator==(const CPath &other) const
 {
 	return ::IsSameAs(m_filesystem, other.m_filesystem);
 }
 
-
-bool CPath::operator!=(const CPath& other) const
+bool CPath::operator!=(const CPath &other) const
 {
 	return !(*this == other);
 }
 
-
-bool CPath::operator<(const CPath& other) const
+bool CPath::operator<(const CPath &other) const
 {
 	return PATHCMP(m_filesystem.c_str(), other.m_filesystem.c_str()) < 0;
 }
 
-
 bool CPath::IsOk() const
 {
 	// Something is very wrong if one of the two is empty.
 	return m_printable.Length() && m_filesystem.Length();
 }
 
-
 bool CPath::FileExists() const
 {
 	return wxFileName::FileExists(m_filesystem);
 }
 
-
 bool CPath::DirExists() const
 {
 	return wxFileName::DirExists(DoCleanPath(m_filesystem));
 }
 
-
 bool CPath::IsDir(EAccess mode) const
 {
 	wxString path = DoCleanPath(m_filesystem);
@@ -371,7 +352,6 @@
 	return true;
 }
 
-
 bool CPath::IsFile(EAccess mode) const
 {
 	if (!wxFileName::FileExists(m_filesystem)) {
@@ -385,7 +365,6 @@
 	return true;
 }
 
-
 wxString CPath::GetRaw() const
 {
 	// Copy as c-strings to ensure that the CPath objects can safely
@@ -393,7 +372,6 @@
 	return DeepCopy(m_filesystem);
 }
 
-
 wxString CPath::GetPrintable() const
 {
 	// Copy as c-strings to ensure that the CPath objects can safely
@@ -401,13 +379,11 @@
 	return DeepCopy(m_printable);
 }
 
-
 wxString CPath::GetExt() const
 {
 	return wxFileName(m_filesystem).GetExt();
 }
 
-
 CPath CPath::GetPath() const
 {
 	CPath path;
@@ -417,7 +393,6 @@
 	return path;
 }
 
-
 CPath CPath::GetFullName() const
 {
 	CPath path;
@@ -425,10 +400,8 @@
 	::DoSplitPath(m_filesystem, NULL, &path.m_filesystem);
 
 	return path;
-
 }
 
-
 sint64 CPath::GetFileSize() const
 {
 	if (FileExists()) {
@@ -441,15 +414,75 @@
 	return wxInvalidOffset;
 }
 
+bool CPath::GetFileStat(time_t &mtime, sint64 &size) const
+{
+#ifdef __WINDOWS__
+	// Windows keeps the three separate wx calls in their original order, and
+	// that order is load-bearing: wxFileName::GetTimes() reports failure through
+	// wxLogSysError(), so asking about a missing path logs a system error.
+	// FileExists() is what kept it quiet.
+	//
+	// So no saving here. One GetFileAttributesEx() would work, but its FILETIME
+	// must convert to exactly the time_t wxFileModificationTime() returns:
+	// known.met matches on mtime, and a second's drift re-hashes every share.
+	if (!FileExists()) {
+		return false;
+	}
+
+	const time_t fileDate = CPath::GetModificationTime(*this);
+	const sint64 fileSize = GetFileSize();
+	if ((fileDate == (time_t)-1) || (fileSize == wxInvalidOffset)) {
+		return false;
+	}
+	mtime = fileDate;
+	size = fileSize;
+	return true;
+#else
+	const wxCharBuffer path = m_filesystem.mb_str(wxConvFile);
+	if (!path.data()) {
+		return false;
+	}
+
+	struct stat st;
+	if (::stat(path.data(), &st) != 0) {
+		return false;
+	}
+
+	// Same predicate wxFileExists() applies, explicit because it is what makes
+	// the single stat a drop-in: a directory or broken link must still fail.
+	if (!S_ISREG(st.st_mode)) {
+		return false;
+	}
+
+	mtime = st.st_mtime;
+	size = (sint64)st.st_size;
+	return true;
+#endif
+}
+
+wxString CPath::GetDirKey() const
+{
+	// The reduction IsSameDir() performs before comparing: strip the trailing
+	// separator, then canonicalise. Equal keys exactly when IsSameDir() calls
+	// them the same directory, so a caller can group instead of comparing
+	// every pair (issue #898).
+	wxString stripped = m_filesystem;
+	if (stripped.Length()) {
+		stripped = StripSeparators(stripped, wxString::trailing);
+	}
+
+	// NormalizedKey() and not IsSameAs()'s bare-filename fast path: a bare name
+	// is made absolute against the cwd here, as IsSameAs() does once the other
+	// side has a separator. Keying every path alike keeps the grouping consistent.
+	return NormalizedKey(stripped);
+}
 
-bool CPath::IsSameDir(const CPath& other) const
+bool CPath::IsSameDir(const CPath &other) const
 {
 	wxString a = m_filesystem;
 	wxString b = other.m_filesystem;
 
-	// This check is needed to avoid trouble in the
-	// case where one path is empty, and the other
-	// points to the root dir.
+	// Guards the case where one path is empty and the other is the root dir.
 	if (a.Length() && b.Length()) {
 		a = StripSeparators(a, wxString::trailing);
 		b = StripSeparators(b, wxString::trailing);
@@ -458,8 +491,7 @@
 	return ::IsSameAs(a, b);
 }
 
-
-CPath CPath::JoinPaths(const CPath& other) const
+CPath CPath::JoinPaths(const CPath &other) const
 {
 	if (!IsOk()) {
 		return CPath(other);
@@ -475,7 +507,6 @@
 	return joinedPath;
 }
 
-
 CPath CPath::Cleanup(bool keepSpaces, bool isFAT32) const
 {
 	CPath result;
@@ -485,8 +516,7 @@
 	return result;
 }
 
-
-CPath CPath::AddPostfix(const wxString& postfix) const
+CPath CPath::AddPostfix(const wxString &postfix) const
 {
 	wxASSERT(postfix.IsAscii());
 
@@ -497,8 +527,7 @@
 	return result;
 }
 
-
-CPath CPath::AppendExt(const wxString& ext) const
+CPath CPath::AppendExt(const wxString &ext) const
 {
 	wxASSERT(ext.IsAscii());
 
@@ -520,7 +549,6 @@
 	return result;
 }
 
-
 CPath CPath::RemoveExt() const
 {
 	CPath result;
@@ -530,23 +558,16 @@
 	return result;
 }
 
-
 CPath CPath::RemoveAllExt() const
 {
 	// Loop until all extensions are removed.
 	//
-	// The termination test compares the underlying filesystem strings
-	// directly rather than going through CPath::operator!=. The latter
-	// routes through IsSameAs() / wxFileName::Normalize(), which
-	// resolves relative paths via wxGetCwd().  When the process's
-	// recorded working directory has been deleted (routine on macOS
-	// bundles whose launching shell's CWD has been removed) wxGetCwd()
-	// emits a wxLogSysError("Failed to get the working directory...")
-	// for every call, and CDownloadListCtrl::DrawFileItem reaches this
-	// loop on every paint of every download row.  Plain string
-	// equality is the right comparison here anyway: we only need to
-	// know whether RemoveExt() changed the buffer, not whether two
-	// filesystem locations refer to the same node.
+	// Compares the filesystem strings directly rather than CPath::operator!=,
+	// which routes through wxFileName::Normalize() and so wxGetCwd(). When the
+	// recorded working directory has been deleted (routine on macOS bundles)
+	// that logs an error on every call, and CDownloadListCtrl::DrawFileItem
+	// reaches this loop on every paint of every row. Plain equality is also the
+	// right test: we only need to know whether RemoveExt() changed the buffer.
 	CPath last, current = RemoveExt();
 	do {
 		last = current;
@@ -556,21 +577,19 @@
 	return current;
 }
 
-
-bool CPath::StartsWith(const CPath& other) const
+bool CPath::StartsWith(const CPath &other) const
 {
-	// It doesn't make sense comparing invalid paths,
-	// especially since if 'other' was empty, it would
-	// be considered a prefix of any path.
+	// Comparing invalid paths makes no sense: an empty 'other' would count as a
+	// prefix of any path.
 	if ((IsOk() && other.IsOk()) == false) {
 		return false;
 	}
 
-	// Adding an separator to avoid partial matches, such as
-	// "/usr/bi" matching "/usr/bin". TODO: Paths should be
-	// normalized first (in the constructor).
+	// Separator added to avoid partial matches, e.g. "/usr/bi" against
+	// "/usr/bin". TODO: normalize paths in the constructor instead.
 	const wxString a = StripSeparators(m_filesystem, wxString::trailing) + wxFileName::GetPathSeparator();
-	const wxString b = StripSeparators(other.m_filesystem, wxString::trailing) + wxFileName::GetPathSeparator();
+	const wxString b =
+		StripSeparators(other.m_filesystem, wxString::trailing) + wxFileName::GetPathSeparator();
 
 	if (a.Length() < b.Length()) {
 		// Cannot possibly be a prefix.
@@ -581,32 +600,26 @@
 	return PATHNCMP(a.c_str(), b.c_str(), checkLen) == 0;
 }
 
-
-bool CPath::CloneFile(const CPath& src, const CPath& dst, bool overwrite)
-{
-	return ::wxCopyFile(src.m_filesystem, dst.m_filesystem, overwrite);
-}
-
-
-bool CPath::RemoveFile(const CPath& file)
+bool CPath::RemoveFile(const CPath &file)
 {
 	return ::wxRemoveFile(file.m_filesystem);
 }
 
-
-bool CPath::RenameFile(const CPath& src, const CPath& dst, bool overwrite)
+bool CPath::RenameFile(const CPath &src, const CPath &dst, bool overwrite)
 {
 	return ::wxRenameFile(src.m_filesystem, dst.m_filesystem, overwrite);
 }
 
-
-bool CPath::BackupFile(const CPath& src, const wxString& appendix)
+bool CPath::BackupFile(const CPath &src, const wxString &appendix)
 {
 	wxASSERT(appendix.IsAscii());
 
 	CPath dst = CPath(src.m_filesystem + appendix);
 
-	if (CPath::CloneFile(src, dst, true)) {
+	// Small same-directory .met/config backup, so wxCopyFile's 4 KiB buffer is
+	// fine. Large copies use CFile::CloneFile; mulecommon deliberately has no
+	// dependency on the CFile layer (amule-org/amule#11).
+	if (::wxCopyFile(src.m_filesystem, dst.m_filesystem, true)) {
 		// Try to ensure that the backup gets physically written
 #if defined __WINDOWS__ || defined __IRIX__
 		wxFFile backupFile;
@@ -623,44 +636,37 @@
 	return false;
 }
 
-
-bool CPath::RemoveDir(const CPath& file)
+bool CPath::RemoveDir(const CPath &file)
 {
 	return ::wxRmdir(file.m_filesystem);
 }
 
-
-bool CPath::MakeDir(const CPath& file)
+bool CPath::MakeDir(const CPath &file)
 {
 	return ::wxMkdir(file.m_filesystem);
 }
 
-
-bool CPath::FileExists(const wxString& file)
+bool CPath::FileExists(const wxString &file)
 {
 	return CPath(file).FileExists();
 }
 
-
-bool CPath::DirExists(const wxString& path)
+bool CPath::DirExists(const wxString &path)
 {
 	return CPath(path).DirExists();
 }
 
-
-sint64 CPath::GetFileSize(const wxString& file)
+sint64 CPath::GetFileSize(const wxString &file)
 {
 	return CPath(file).GetFileSize();
 }
 
-
-time_t CPath::GetModificationTime(const CPath& file)
+time_t CPath::GetModificationTime(const CPath &file)
 {
 	return ::wxFileModificationTime(file.m_filesystem);
 }
 
-
-sint64 CPath::GetFreeSpaceAt(const CPath& path)
+sint64 CPath::GetFreeSpaceAt(const CPath &path)
 {
 	wxLongLong free;
 	if (::wxGetDiskSpace(path.m_filesystem, NULL, &free)) {
@@ -670,7 +676,6 @@
 	return wxInvalidOffset;
 }
 
-
 wxString CPath::TruncatePath(size_t length, bool isFilePath) const
 {
 	wxString file = GetPrintable();
@@ -683,7 +688,7 @@
 	// 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();
+		file = wxFileName(file).GetFullName();
 
 		if (path.Length() >= length) {
 			path.Clear();
@@ -694,7 +699,7 @@
 			int pathlen = (int)(length - file.Length() - 6);
 
 			if (pathlen > 0) {
-				path = "..." + path.Right( pathlen );
+				path = "..." + path.Right(pathlen);
 			} else {
 				path.Clear();
 			}
@@ -714,7 +719,6 @@
 	return file;
 }
 
-
 wxString StripSeparators(wxString path, wxString::stripType type)
 {
 	wxASSERT((type == wxString::leading) || (type == wxString::trailing));
@@ -733,8 +737,7 @@
 	return path;
 }
 
-
-wxString JoinPaths(const wxString& path, const wxString& file)
+wxString JoinPaths(const wxString &path, const wxString &file)
 {
 	if (path.IsEmpty()) {
 		return file;
@@ -742,7 +745,6 @@
 		return path;
 	}
 
-	return StripSeparators(path, wxString::trailing)
-	   + wxFileName::GetPathSeparator()
-	   + StripSeparators(file, wxString::leading);
+	return StripSeparators(path, wxString::trailing) + wxFileName::GetPathSeparator() +
+	       StripSeparators(file, wxString::leading);
 }

amule-3.0.1.tar.gz/src/libs/common/Path.h -> amule-3.1.0.tar.gz/src/libs/common/Path.h Changed

@@ -28,24 +28,15 @@
 #include "../../Types.h"
 #include "Format.h"
 
-
 /**
- * This class wraps a path/filename, serving a purpose much
- * like wxFileName. But in addition CPath serves to enable
- * the handling of "broken" filenames, allowing these to be
- * printed in a meaningful manner, while still allowing
- * access to the actual files in the filesystem.
+ * Wraps a path/filename much as wxFileName does, but also handles "broken"
+ * filenames: they print meaningfully while the real file stays reachable.
  *
- * This class is thread-safe, in that the class is read-only,
- * and any function that returns wxStrings or CPath objects,
- * ensure that an entirely new wxString object is created to
- * circumvent the thread-unsafe reference counting of that
- * class.
+ * Read-only, and every function returning a wxString or CPath builds a fresh
+ * object, so it sidesteps wxString's thread-unsafe reference counting.
  *
- * This class, and its static functions should be used in
- * preference of wxFileName, for the above reason, and so
- * that cross-platform issues can be worked around in a
- * single place.
+ * Prefer this over wxFileName for both reasons, and so cross-platform quirks
+ * are worked around in one place.
  */
 class CPath
 {
@@ -54,35 +45,30 @@
 	CPath();
 
 	/** Constructor. */
-	explicit CPath(const wxString& path);
+	explicit CPath(const wxString &path);
 
 	/** Copy constructor. Creates a deep-copy of the passed object. */
-	CPath(const CPath& other);
-
+	CPath(const CPath &other);
 
 	/**
 	 * 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
-	 * affect our ability to find previously known files. This
-	 * should not be used when sending filenames to other clients
-	 * or (currently) the core/gui.
-	 **/
-	static CPath FromUniv(const wxString& path);
+	 * Use for paths written to the local machine, so a locale change cannot
+	 * lose previously known files. Not for paths sent to other clients or
+	 * (currently) the core/gui.
+	 */
+	static CPath FromUniv(const wxString &path);
 	/** Creates an 'universal' path from the specified CPath. */
-	static wxString ToUniv(const CPath& path);
-
+	static wxString ToUniv(const CPath &path);
 
 	/** Assignment operator. */
-	CPath& operator=(const CPath& other);
+	CPath &operator=(const CPath &other);
 	/** Less-than operator. */
-	bool operator<(const CPath& other) const;
+	bool operator<(const CPath &other) const;
 	/** Note that only exact matches are considered equal, see IsSameDir. */
-	bool operator==(const CPath& other) const;
+	bool operator==(const CPath &other) const;
 	/** Note that only exact matches are considered equal, see IsSameDir. */
-	bool operator!=(const CPath& other) const;
-
+	bool operator!=(const CPath &other) const;
 
 	/** Returns true if the filename is valid, false otherwise. */
 	bool IsOk() const;
@@ -91,8 +77,8 @@
 	/** Returns true if the path exists and is a directory, false otherwise. */
 	bool DirExists() const;
 
-
-	enum EAccess {
+	enum EAccess
+	{
 		//! Only check of the file or dir exists.
 		exists,
 		//! If set, checks if a file is readable, or if a dir can be accessed.
@@ -108,7 +94,6 @@
 	/** Returns if if the path is a dir, and the checks were positive. */
 	bool IsFile(EAccess mode) const;
 
-
 	/** Returns the contents of the object in a form suitable for use with wx system-calls. */
 	wxString GetRaw() const;
 	/** Returns the contents of the object in a form suitable for use in the UI. */
@@ -125,120 +110,123 @@
 	sint64 GetFileSize() const;
 
 	/**
-	 * Compares under the assumption that both objects are dirs, even if
-	 * one or the other lacks a terminal directory-separator. However, an
-	 * empty CPath object will not be considered equal to a path to the root.
+	 * Existence, modification time and size from a single stat().
+	 *
+	 * False when the path is not an existing regular file: a broken symlink, a
+	 * directory, or permissions too strict to stat.
+	 *
+	 * Asking separately costs four round-trips, one of which opens the file.
+	 * The share scan asks once per file, where that is most of a cold walk.
+	 */
+	bool GetFileStat(time_t &mtime, sint64 &size) const;
+
+	/**
+	 * Compares as directories, with or without a trailing separator. An empty
+	 * CPath is still not equal to the root path.
 	 */
-	bool IsSameDir(const CPath& other) const;
+	bool IsSameDir(const CPath &other) const;
+
+	/**
+	 * The canonical string IsSameDir() reduces this path to.
+	 *
+	 * For paths with a separator, equal keys mean IsSameDir() would say true, so
+	 * a caller can group many in one pass instead of comparing every pair. Bare
+	 * filenames are not covered: IsSameDir() uses PATHCMP while this normalises,
+	 * and on Windows wxPATH_NORM_LONG gives PROGRA~1 and "Program Files" the same
+	 * key where PATHCMP calls them different.
+	 *
+	 * For CSharedFileList, where a browse was O(directories x files) calls to
+	 * IsSameDir(), each normalising both sides (issue #898).
+	 */
+	wxString GetDirKey() const;
 
 	/** Returns a CPath created from joining the two objects. */
-	CPath JoinPaths(const CPath& other) const;
+	CPath JoinPaths(const CPath &other) const;
 	/** Returns a CPath with invalid chars removed, and spaces escaped if specified. */
 	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;
+	CPath AddPostfix(const wxString &postfix) const;
 
 	/** Returns a CPath object with the extension appended. Empty strings are ignored. */
-	CPath AppendExt(const wxString& ext) const;
+	CPath AppendExt(const wxString &ext) const;
 	/** Returns a CPath with the (last, if multiple) extension removed. */
 	CPath RemoveExt() const;
 	/** Returns a CPath object with all extensions removed. */
 	CPath RemoveAllExt() const;
 
-
 	/** Returns true if the the passed path makes up an prefix of this object. */
-	bool StartsWith(const CPath& other) const;
+	bool StartsWith(const CPath &other) const;
 
 	/**
-	 * Get truncated path.
-	 *
-	 * @note This function truncates the @em name of the file, not the file
-	 * itself.
+	 * Get truncated path. Truncates the file's @em name, not the file.
 	 *
-	 * @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.
+	 * @param isFilePath  keep the last part (the file name) if possible.
 	 */
 	wxString TruncatePath(size_t length, bool isFilePath = false) const;
 
 	/**
-	 * Renames the file 'src' to the file 'dst', overwriting if specified. Note that
-	 * renaming cannot be done across volumes. For that CopyFile is required.
+	 * Renames src to dst. Cannot cross volumes; use CFile::CloneFile for that.
 	 */
-	static bool RenameFile(const CPath& src, const CPath& dst, bool overwrite = false);
-	/**
-	 * Copies the file 'src' to the file 'dst', overwriting if specified.
-	 * The silly name is used to avoid conflicts with the #define CopyFile,
-	 * which is set on MSW.
-	 */
-	static bool CloneFile(const CPath& src, const CPath& dst, bool overwrite = false);
+	static bool RenameFile(const CPath &src, const CPath &dst, bool overwrite = false);
 
 	/** Makes a backup of a file, by copying the original file to 'src' + 'appendix' */
-	static bool BackupFile(const CPath& src, const wxString& appendix);
+	static bool BackupFile(const CPath &src, const wxString &appendix);
 
 	/** Deletes the specified file, returning true on success. */
-	static bool RemoveFile(const CPath& file);
+	static bool RemoveFile(const CPath &file);
 	/** Deletes the specified directory, returning true on success. */
-	static bool RemoveDir(const CPath& file);
+	static bool RemoveDir(const CPath &file);
 	/** Creates the specified directory, returning true on success. */
-	static bool MakeDir(const CPath& file);
+	static bool MakeDir(const CPath &file);
 
 	/** Returns true if the path exists, and is a file. */
-	static bool FileExists(const wxString& file);
+	static bool FileExists(const wxString &file);
 	/** Returns true if the path exists, and is a directory. */
-	static bool DirExists(const wxString& path);
+	static bool DirExists(const wxString &path);
 
 	/** Returns the size of the specified file, or wxInvalidOffset on failure. */
-	static sint64 GetFileSize(const wxString& file);
+	static sint64 GetFileSize(const wxString &file);
 	/** Returns the modification time the specified file, or (time_t)-1 on failure. */
-	static time_t GetModificationTime(const CPath& file);
+	static time_t GetModificationTime(const CPath &file);
 	/** Returns the free diskspace at the specified path, or wxInvalidOffset on failure. */
-	static sint64 GetFreeSpaceAt(const CPath& path);
+	static sint64 GetFreeSpaceAt(const CPath &path);
 
 private:
 	//! Contains the printable filename, for use in the UI.
-	wxString	m_printable;
+	wxString m_printable;
 	//! Contains the "raw" filename, for use in system-calls,
 	//! as well as in wxWidgets file functions.
-	wxString	m_filesystem;
+	wxString m_filesystem;
 
 	// Is made a friend to avoid needless copying of strings.
-	friend int CmpAny(const CPath& ArgA, const CPath& ArgB);
+	friend int CmpAny(const CPath &ArgA, const CPath &ArgB);
 };
 
 // Make CPath printable in CFormat
-template<>
-inline CFormat& CFormat::operator%(CPath value)
+template <> inline CFormat &CFormat::operator%(CPath value)
 {
-	return this->operator%<const wxString&>(value.GetPrintable());
+	return this->operator% <const wxString &>(value.GetPrintable());
 }
 
 /**
- * Overloaded version of CmpAny for use with CPaths. As this is
- * typically used in the UI, it uses the printable filename in
- * order to get visually correct results.
+ * CmpAny for CPaths. Compares the printable filename, since this is mostly
+ * used in the UI and should sort the way the user sees it.
  */
-inline int CmpAny(const CPath& ArgA, const CPath& ArgB)
+inline int CmpAny(const CPath &ArgA, const CPath &ArgB)
 {
 	return ArgA.m_printable.CmpNoCase(ArgB.m_printable);
 }
 
-
 /**
- * Strips all path separators from the specified end of a path.
- *
- * Note: type must be either leading or trailing.
+ * Strips all path separators from one end of a path. Type must be 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.
+ * Joins two paths with the platform separator. An empty parameter returns
+ * the other unchanged.
  */
-wxString JoinPaths(const wxString& path, const wxString& file);
+wxString JoinPaths(const wxString &path, const wxString &file);
 
 #endif

amule-3.1.0.tar.gz/src/libs/common/RateLimiter.cpp Added

@@ -0,0 +1,79 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "RateLimiter.h"
+
+CRateLimiter::Decision CRateLimiter::Check(const std::string &ip)
+{
+	std::lock_guard<std::mutex> lock(m_mu);
+	const std::time_t now = m_clock();
+	auto it = m_buckets.find(ip);
+	if (it == m_buckets.end())
+		return Decision{};
+
+	Bucket &b = it->second;
+	if (b.lockout_until > now) {
+		Decision d;
+		d.locked_out = true;
+		d.retry_after_seconds = b.lockout_until - now;
+		return d;
+	}
+	// Lockout window expired -- wipe the bucket so a stale lockout can't
+	// accidentally fire on the next Check after a long quiet period.
+	if (b.lockout_until != 0 && b.lockout_until <= now) {
+		b.lockout_until = 0;
+		b.failures.clear();
+	}
+	// Mirror NoteFailure's per-stamp expiry so Check is self-consistent. Otherwise stale stamps
+	// from a long-idle bucket stay in failures until the next NoteFailure fires.
+	while (!b.failures.empty() && (now - b.failures.front()) > m_cfg.window_seconds) {
+		b.failures.pop_front();
+	}
+	return Decision{};
+}
+
+void CRateLimiter::NoteFailure(const std::string &ip)
+{
+	std::lock_guard<std::mutex> lock(m_mu);
+	const std::time_t now = m_clock();
+	Bucket &b = m_bucketsip;
+
+	// Sliding window: drop any failure stamp older than `window_seconds`, then append now.
+	// Lockout fires when the live stamp count crosses `threshold`. See the Bucket comment for
+	// why per-stamp expiry rather than a wholesale reset.
+	while (!b.failures.empty() && (now - b.failures.front()) > m_cfg.window_seconds) {
+		b.failures.pop_front();
+	}
+	b.failures.push_back(now);
+
+	if (b.failures.size() >= m_cfg.threshold) {
+		b.lockout_until = now + m_cfg.lockout_seconds;
+	}
+}
+
+void CRateLimiter::NoteSuccess(const std::string &ip)
+{
+	std::lock_guard<std::mutex> lock(m_mu);
+	m_buckets.erase(ip);
+}

amule-3.1.0.tar.gz/src/libs/common/RateLimiter.h Added

@@ -0,0 +1,106 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 RATELIMITER_H
+#define RATELIMITER_H
+
+#include <ctime>
+#include <deque>
+#include <functional>
+#include <map>
+#include <mutex>
+#include <string>
+
+/**
+ * Per-IP sliding-window failure rate limiter.
+ *
+ * Tracks failed authentication attempts and locks the offending address out for `lockout_seconds`
+ * once `threshold` failures land inside `window_seconds`. A success resets that address's bucket.
+ *
+ * Lives in mulecommon because both authenticated front doors need it: the amuleapi HTTP login and
+ * the External Connection password exchange. Nothing here touches wx or any protocol, so it stays
+ * linkable from the daemon, which does not link the webapi library.
+ *
+ * Storage: one bucket per address. Real deployments serve a small population (a LAN operator, a
+ * handful of clients), so the map stays small even under bot-scan load. No active GC; cold buckets
+ * are overwritten when the offender returns, and process lifetime bounds the worst case.
+ */
+class CRateLimiter
+{
+public:
+	struct Config
+	{
+		unsigned window_seconds = 60;
+		unsigned threshold = 5;
+		unsigned lockout_seconds = 300;
+	};
+
+	/// Clock injection. Default is std::time(nullptr); tests pass a controllable lambda to
+	/// exercise the sliding window in microseconds instead of sleeping through real seconds.
+	using Clock = std::function<std::time_t()>;
+
+	explicit CRateLimiter(Config cfg, Clock clock = nullptr)
+	: m_cfg(cfg)
+	, m_clock(clock ? std::move(clock) :  { return std::time(nullptr); })
+	{
+	}
+
+	struct Decision
+	{
+		bool locked_out = false;
+		std::time_t retry_after_seconds = 0;
+	};
+
+	/// Called BEFORE the credential compare. When `locked_out` is set the caller must refuse
+	/// without touching the credential path, reporting `retry_after_seconds`.
+	Decision Check(const std::string &ip);
+
+	/// Called AFTER a failed credential compare. Records the failure and
+	/// arms the lockout once the threshold is crossed.
+	void NoteFailure(const std::string &ip);
+
+	/// Called AFTER a successful credential compare. Drops the bucket so a legitimate user's
+	/// next attempt is not accounted against an earlier streak of typos.
+	void NoteSuccess(const std::string &ip);
+
+	const Config &Cfg() const { return m_cfg; }
+
+private:
+	struct Bucket
+	{
+		// Sliding window of failure timestamps. A plain counter plus a window start would
+		// be a TUMBLING window, where an attacker can spend threshold-1 failures at the end
+		// of one window and threshold-1 more at the start of the next and never trip the
+		// lockout. One timestamp per failure, expired individually, closes that gap.
+		std::deque<std::time_t> failures;
+		std::time_t lockout_until = 0;
+	};
+
+	Config m_cfg;
+	Clock m_clock;
+	mutable std::mutex m_mu;
+	std::map<std::string, Bucket> m_buckets;
+};
+
+#endif // RATELIMITER_H

amule-3.0.1.tar.gz/src/libs/common/SmartPtr.h -> amule-3.1.0.tar.gz/src/libs/common/SmartPtr.h Changed

@@ -25,40 +25,36 @@
 #ifndef SMARTPTR_H
 #define SMARTPTR_H
 
-// std::auto_ptr is deprecated in C++11 and removed in C++17. We should use
-// std::unique_ptr instead, which was introduced in C++11.
-//
-// Considering the above, we shall use std::unique_ptr if we're using C++11 or
-// a later standard, and std::auto_ptr otherwise.
+// std::auto_ptr is deprecated in C++11 and removed in C++17, so use std::unique_ptr where the
+// standard is C++11 or later, and std::auto_ptr otherwise.
 
 #include <memory>
 
 #if __cplusplus >= 201103L
 
-// It seems like Apple has (or had, hopefully) a configuration where a new
-// clang compiler supporting C++11 is accompanied by an old c++ library not
-// supporting std::unique_ptr.
-// See https://stackoverflow.com/questions/31655462/no-type-named-unique-ptr-in-namespace-std-when-compiling-under-llvm-clang
-#	ifdef __clang__
-#		if __has_include(<forward_list>)
-			// either using libc++ or a libstdc++ that's
-			// new enough to have unique_ptr
-#			define HAVE_UNIQUE_PTR 1
-#		endif
-#	else
-		// not clang, assume unique_ptr available
-#		define HAVE_UNIQUE_PTR 1
-#	endif
+// Apple has (or had, hopefully) a configuration where a new clang compiler supporting C++11 is
+// accompanied by an old c++ library that does not support std::unique_ptr. See
+// https://stackoverflow.com/questions/31655462/no-type-named-unique-ptr-in-namespace-std-when-compiling-under-llvm-clang
+#ifdef __clang__
+#if __has_include(<forward_list>)
+// either using libc++ or a libstdc++ that's
+// new enough to have unique_ptr
+#define HAVE_UNIQUE_PTR 1
+#endif
+#else
+// not clang, assume unique_ptr available
+#define HAVE_UNIQUE_PTR 1
+#endif
 
 #endif
 
 #ifdef HAVE_UNIQUE_PTR
-template<typename T> using CSmartPtr = std::unique_ptr<T>;
+template <typename T> using CSmartPtr = std::unique_ptr<T>;
 #else
-#	define CSmartPtr std::auto_ptr
-#	ifndef nullptr
-#		define nullptr	 NULL
-#	endif
+#define CSmartPtr std::auto_ptr
+#ifndef nullptr
+#define nullptr NULL
+#endif
 #endif
 
 #undef HAVE_UNIQUE_PTR

amule-3.0.1.tar.gz/src/libs/common/StringFunctions.cpp -> amule-3.1.0.tar.gz/src/libs/common/StringFunctions.cpp Changed

@@ -25,82 +25,92 @@
 
 #include "StringFunctions.h"
 
-#include <wx/filename.h>	// Needed for wxFileName
-#include <wx/uri.h>		// Needed for wxURI
+#include <wx/filename.h> // Needed for wxFileName
+#include <wx/uri.h>      // Needed for wxURI
 
-#include <cstring>		// Needed for std::strlen()
+#include <cstring> // Needed for std::strlen()
 
 // Implementation of the non-inlines
 
+// Conversion of a wxString so it can be used by printf() on a console.
 //
-// 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) wxConvLibc silently converts to UTF8
-// so the console can show even Chinese chars.
+// On non-Windows we emit UTF-8 directly. *nix terminals and log files are effectively always UTF-8
+// nowadays, whereas routing through the C-library locale charset (wxConvLibc) mangles non-ASCII
+// text under a C/POSIX locale -- common in minimal Docker images -- and does so inconsistently
+// across libc implementations (glibc fails the conversion outright, macOS libc succeeds with lossy
+// bytes). ASCII is unaffected, being identical in both encodings.
 //
-Unicode2CharBuf unicode2char(const wxChar* s)
+// On Windows the console is limited to the active code page, so we try the locale charset first and
+// then fall back to a best-effort per-character conversion, replacing each non-representable
+// character with '?'.
+Unicode2CharBuf unicode2char(const wxChar *s)
 {
-	// First try the straight way.
+#ifndef __WXMSW__
+	return wxConvUTF8.cWX2MB(s);
+#else
+	// First try the locale charset (the active code page).
 	Unicode2CharBuf buf1(wxConvLibc.cWX2MB(s));
-	if ((const char *) buf1) {
+	if ((const char *)buf1) {
 		return buf1;
 	}
-	// Failed. Try to convert as much as possible.
+	// Failed. Convert character by character, replacing what we can't.
 	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 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();
+	size_t pos = 0;
+	for (size_t i = 0; i < len; i++) {
+		// FromWChar() writes the raw bytes for one character and returns how many it wrote
+		// (no NUL, since we pass an explicit length), so advance by exactly that -- the
+		// previous `- 1` left pos on the last byte and made every ASCII char overwrite its
+		// predecessor.
 		size_t len_char = wxConvLibc.FromWChar(data + pos, maxlen - pos, s + i, 1);
-		if (len_char != wxCONV_FAILED) {
-			pos += len_char - 1;
+		if (len_char != wxCONV_FAILED && len_char > 0) {
+			pos += len_char;
 		} else if (pos < maxlen) {
 			datapos++ = '?';
-			datapos = 0;
 		}
 	}
+	datapos = 0;
 	return buf;
+#endif
 }
 
-
 static uint8_t base16Chars17 = "0123456789ABCDEF";
 
-wxString URLEncode(const wxString& sIn)
+wxString URLEncode(const wxString &sIn)
 {
 	wxString sOut;
 
-	for ( unsigned int i = 0; i < sIn.Length(); ++i ) {
-		unsigned char curChar = sIn.GetChar( i );
+	for (unsigned int i = 0; i < sIn.Length(); ++i) {
+		unsigned char curChar = sIn.GetChar(i);
 
-		if ( isalnum( curChar ) ) {
-	        sOut += curChar;
-	    } else if( isspace ( curChar ) ) {
-		    sOut += "+";
+		if (isalnum(curChar)) {
+			sOut += curChar;
+		} else if (isspace(curChar)) {
+			sOut += "+";
 		} else {
 			sOut += "%";
-			sOut += base16Chars curChar >> 4;
-			sOut += base16Chars curChar & 0xf;
+			sOut += base16CharscurChar >> 4;
+			sOut += base16CharscurChar & 0xf;
 		}
-
 	}
 
 	return sOut;
 }
 
-
-wxChar HexToDec( const wxString& hex )
+wxChar HexToDec(const wxString &hex)
 {
 	wxChar result = 0;
 	wxString str = hex.Upper();
 
-	for ( size_t i = 0; i < str.Len(); ++i ) {
+	for (size_t i = 0; i < str.Len(); ++i) {
 		result *= 16;
 		wxChar cur = str.GetChar(i);
 
-		if ( isdigit( cur ) ) {
+		if (isdigit(cur)) {
 			result += cur - '0';
-		} else if ( cur >= 'A' && cur <= 'F' ) {
+		} else if (cur >= 'A' && cur <= 'F') {
 			result += cur - 'A' + 10;
 		} else {
 			return '\0';
@@ -110,8 +120,7 @@
 	return result;
 }
 
-
-wxString UnescapeHTML(const wxString& str)
+wxString UnescapeHTML(const wxString &str)
 {
 	wxWritableCharBuffer buf = str.char_str(wxConvUTF8);
 
@@ -122,7 +131,14 @@
 	size_t j = 0;
 	for (size_t i = 0; i < len; ++i, ++j) {
 		if (bufferi == '%' && (len > i + 2)) {
-			wxChar unesc = HexToDec(str.Mid(i + 1, 2));
+			// Read the two hex digits out of the same buffer we are walking. They used
+			// to be taken from str, whose index is in characters while i counts bytes:
+			// one multi-byte character anywhere earlier desynchronised the two, and
+			// every escape after it decoded from the wrong offset, silently corrupting
+			// the rest of the string, newlines and all. From8BitData, not FromAscii:
+			// the two bytes behind a '%' need not be hex digits at all, and FromAscii
+			// asserts on anything past 0x7F. HexToDec rejects them either way.
+			wxChar unesc = HexToDec(wxString::From8BitData(buffer + i + 1, 2));
 			if (unesc) {
 				i += 2;
 				bufferj = (char)unesc;
@@ -147,25 +163,32 @@
 	return result;
 }
 
+wxString RestoreEncodedPipes(const wxString &link)
+{
+	wxString restored(link);
+	restored.Replace("%7C", "|");
+	restored.Replace("%7c", "|");
+	return restored;
+}
 
-wxString validateURI(const wxString& url)
+wxString validateURI(const wxString &url)
 {
 	wxURI uri(url);
 
 	return uri.BuildURI();
 }
 
-
-enum ECharType {
+enum ECharType
+{
 	ECTInteger,
 	ECTText,
 	ECTNone
 };
 
-inline wxString GetNextField(const wxString& str, size_t& cookie)
+inline wxString GetNextField(const wxString &str, size_t &cookie)
 {
 	// These are taken to separate "fields"
-	static const wxChar* s_delims = L"\t\n\x0b\x0c\r !\"#$%&\'()*+,-./:;<=>?@\\^_`{|}~";
+	static const wxChar *s_delims = L"\t\n\x0b\x0c\r !\"#$%&\'()*+,-./:;<=>?@\\^_`{|}~";
 
 	wxString field;
 	ECharType curType = ECTNone;
@@ -198,8 +221,7 @@
 	return field;
 }
 
-
-int FuzzyStrCmp(const wxString& a, const wxString& b)
+int FuzzyStrCmp(const wxString &a, const wxString &b)
 {
 	size_t aCookie = 0, bCookie = 0;
 	wxString aField, bField;
@@ -215,39 +237,35 @@
 			if (aInteger < bInteger) {
 				return -1;
 			} else if (aInteger > bInteger) {
-				return  1;
+				return 1;
 			}
 		} else if (aField < bField) {
 			return -1;
 		} else if (aField > bField) {
-			return  1;
+			return 1;
 		}
 	} while (!aField.IsEmpty() && !bField.IsEmpty());
 
 	return 0;
 }
 
-
-int FuzzyStrCaseCmp(const wxString& a, const wxString& b)
+int FuzzyStrCaseCmp(const wxString &a, const wxString &b)
 {
 	return FuzzyStrCmp(a.Lower(), b.Lower());
 }
 
-
-
-CSimpleTokenizer::CSimpleTokenizer(const wxString& str, wxChar token)
-	: m_string(str),
-	  m_delim(token),
-	  m_ptr(m_string.c_str()),
-	  m_count(0)
+CSimpleTokenizer::CSimpleTokenizer(const wxString &str, wxChar token)
+: m_string(str)
+, m_delim(token)
+, m_ptr(m_string.c_str())
+, m_count(0)
 {
 }
 
-
 wxString CSimpleTokenizer::next()
 {
-	const wxChar* start = m_ptr;
-	const wxChar* end   = m_string.c_str() + m_string.Len() + 1;
+	const wxChar *start = m_ptr;
+	const wxChar *end = m_string.c_str() + m_string.Len() + 1;
 
 	for (; m_ptr < end; ++m_ptr) {
 		if (*m_ptr == m_delim) {
@@ -260,13 +278,11 @@
 	return m_string.Mid(start - m_string.c_str(), m_ptr++ - start);
 }
 
-
 wxString CSimpleTokenizer::remaining() const
 {
 	return m_string.Mid(m_ptr - m_string.c_str());
 }
 
-
 size_t CSimpleTokenizer::tokenCount() const
 {
 	return m_count;

amule-3.0.1.tar.gz/src/libs/common/StringFunctions.h -> amule-3.1.0.tar.gz/src/libs/common/StringFunctions.h Changed

@@ -23,12 +23,10 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #ifndef STRING_FUNCTIONS_H
 #define STRING_FUNCTIONS_H
 
-#include "../../Types.h"		// Needed for uint16 and uint32
-
+#include "../../Types.h" // Needed for uint16 and uint32
 
 // UTF8 types: No UTF8, BOM prefix, or Raw UTF8
 enum EUtf8Str
@@ -38,78 +36,88 @@
 	utf8strRaw
 };
 
-/****************************************************/
-/******************* Inlines ************************/
-/****************************************************/
-
 /**
- * Functions to perform Unicode <-> (char *) and UTF-8 conversion
- *
- * Please, DO NOT store pointers returned by unicode2char(), because they
- * get free'ed as soon as the return value of cWX2MB gets out of scope.
- * If you need to store a pointer, use a buffer of type wxCharBuffer:
- * and then cast it to a char pointer, e.g.:
+ * Unicode <-> (char *) and UTF-8 conversion.
  *
- * const wxCharBuffer buf(unicode2char(aWxString));
+ * Do NOT store pointers returned by unicode2char(): they are freed as soon as
+ * cWX2MB's return value goes out of scope. Hold a wxCharBuffer instead, which
+ * frees on scope exit:
  *
- * --- Now you can freely use buf as if it were a (const char *) ---
+ *   const wxCharBuffer buf(unicode2char(aWxString));
+ *   printf("%s", (const char *)buf);
  *
- * puts(buf);
- * printf("%s", (const char *)buf);
+ * The cast is needed because varargs do not apply the implicit conversion.
  *
- * The cast in printf is necessary because variable number of parameter
- * functions have no type for these parameters, so the automatic casting
- * of wxCharBuffer to (const char *) is not performed.
- *
- * --- don't worry about memory allocation, memory will be       ---
- * --- free'ed when buf gets out of scope, i.e., upon return     ---
- *
- * wxWCharBuffer, wxCharBuffer are always the appropriate return type,
- * either (wxChar *) or (wxWCharBuffer)
- *
- * Use the simplified names Unicode2CharBuf and Char2UnicodeBuf, and
- * do not declare these names const or the compiler will complain about
- * a double const.
+ * Use Unicode2CharBuf / Char2UnicodeBuf, and do not declare them const or the
+ * compiler complains about a double const.
  */
 typedef const wxCharBuffer Unicode2CharBuf;
 typedef const wxWCharBuffer Char2UnicodeBuf;
 
-Unicode2CharBuf unicode2char(const wxChar* x);
-Unicode2CharBuf unicode2char(const Char2UnicodeBuf& x);
-inline Unicode2CharBuf unicode2char(const wxString& x)		{ return unicode2char(x.wc_str()); }
-inline Char2UnicodeBuf char2unicode(const char* x)	{ return wxConvLibc.cMB2WX(x); }
-
-inline Unicode2CharBuf unicode2UTF8(const wxChar* x)	{ return wxConvUTF8.cWX2MB(x); }
-inline Unicode2CharBuf unicode2UTF8(const Char2UnicodeBuf& x)	{ return wxConvUTF8.cWX2MB(x); }
-inline Unicode2CharBuf unicode2UTF8(const wxString& x)	{ return x.utf8_str(); }
-inline Char2UnicodeBuf UTF82unicode(const char* x)	{ return wxConvUTF8.cMB2WX(x); }
+Unicode2CharBuf unicode2char(const wxChar *x);
+Unicode2CharBuf unicode2char(const Char2UnicodeBuf &x);
+inline Unicode2CharBuf unicode2char(const wxString &x)
+{
+	return unicode2char(x.wc_str());
+}
+inline Char2UnicodeBuf char2unicode(const char *x)
+{
+	return wxConvLibc.cMB2WX(x);
+}
 
-inline const wxCharBuffer char2UTF8(const char *x)	{ return unicode2UTF8(char2unicode(x)); }
-inline const wxCharBuffer UTF82char(const char *x)	{ return unicode2char(UTF82unicode(x)); }
+inline Unicode2CharBuf unicode2UTF8(const wxChar *x)
+{
+	return wxConvUTF8.cWX2MB(x);
+}
+inline Unicode2CharBuf unicode2UTF8(const Char2UnicodeBuf &x)
+{
+	return wxConvUTF8.cWX2MB(x);
+}
+inline Unicode2CharBuf unicode2UTF8(const wxString &x)
+{
+	return x.utf8_str();
+}
+inline Char2UnicodeBuf UTF82unicode(const char *x)
+{
+	return wxConvUTF8.cMB2WX(x);
+}
 
-inline Unicode2CharBuf filename2char(const wxChar* x)	{ return wxConvFileName->cWC2MB(x); }
-inline Unicode2CharBuf filename2char(const wxString& x)	{ return x.mb_str(*wxConvFileName); }
-inline Char2UnicodeBuf char2filename(const char* x)	{ return wxConvFileName->cMB2WC(x); }
+inline const wxCharBuffer char2UTF8(const char *x)
+{
+	return unicode2UTF8(char2unicode(x));
+}
+inline const wxCharBuffer UTF82char(const char *x)
+{
+	return unicode2char(UTF82unicode(x));
+}
 
+inline Unicode2CharBuf filename2char(const wxChar *x)
+{
+	return wxConvFileName->cWC2MB(x);
+}
+inline Unicode2CharBuf filename2char(const wxString &x)
+{
+	return x.mb_str(*wxConvFileName);
+}
+inline Char2UnicodeBuf char2filename(const char *x)
+{
+	return wxConvFileName->cMB2WC(x);
+}
 
-//
 // Replaces "&" with "&&" in 'in' for use with text-labels
-//
-inline wxString MakeStringEscaped(wxString in) {
-	in.Replace("&","&&");
+inline wxString MakeStringEscaped(wxString in)
+{
+	in.Replace("&", "&&");
 	return in;
 }
 
+// Render a string suitable for one log line.
 //
-// Render a string suitable for inclusion in a single log line.
-//
-// Control characters (< 0x20) and DEL (0x7f) become \xHH escapes so a
-// hostile or malformed input can't break log line framing or inject
-// fake log entries into a downstream collector. Printable ASCII and
-// any character >= 0x80 (UTF-8 continuation bytes / wide Unicode)
-// pass through untouched.
-//
-inline wxString EscapeForLog(const wxString& in) {
+// Control characters (< 0x20) and DEL become \xHH escapes, so hostile input
+// cannot break log framing or inject entries into a downstream collector.
+// Printable ASCII and anything >= 0x80 passes through untouched.
+inline wxString EscapeForLog(const wxString &in)
+{
 	wxString out;
 	out.reserve(in.length());
 	for (size_t i = 0; i < in.length(); ++i) {
@@ -124,9 +132,10 @@
 }
 
 // Make a string be a folder
-inline wxString MakeFoldername(wxString path) {
+inline wxString MakeFoldername(wxString path)
+{
 
-	if ( !path.IsEmpty() && ( path.Right(1) == '/') ) {
+	if (!path.IsEmpty() && (path.Right(1) == '/')) {
 		path.RemoveLast();
 	}
 
@@ -134,29 +143,28 @@
 }
 
 // Duplicates a string
-inline char* nstrdup(const char* src)
+inline char *nstrdup(const char *src)
 {
 	size_t len = (src ? strlen(src) : 0) + 1;
 	char *res = new charlen;
-	if ( src ) strcpy(res, src);
-	reslen-1 = 0;
+	if (src)
+		strcpy(res, src);
+	reslen - 1 = 0;
 	return res;
 }
 
-
-// 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)
+// atoi/atol without converting through unicode2char. Returns the value in
+// the string, or 0 if conversion failed.
+inline long StrToLong(const wxString &str)
 {
 	long value = 0;
-	if (!str.ToLong(&value)) {	// value may be changed even if it fails according to wx docu
+	if (!str.ToLong(&value)) { // value may be changed even if it fails 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;
 	if (!str.ToULong(&value)) {
@@ -165,7 +173,7 @@
 	return value;
 }
 
-inline unsigned long long StrToULongLong(const wxString& str)
+inline unsigned long long StrToULongLong(const wxString &str)
 {
 	unsigned long long value = 0;
 	if (!str.ToULongLong(&value)) {
@@ -174,125 +182,97 @@
 	return value;
 }
 
-inline size_t GetRawSize(const wxString& rstr, EUtf8Str eEncode)
+inline size_t GetRawSize(const wxString &rstr, EUtf8Str eEncode)
 {
 	size_t RealLen = 0;
 	switch (eEncode) {
-		case utf8strOptBOM:
-			RealLen = 3;
-		/* fall through */
-		case utf8strRaw: {
-			Unicode2CharBuf s(unicode2UTF8(rstr));
-			if (s) {
-				RealLen += strlen(s);
-				break;
-			} else {
-				RealLen = 0;
-			}
+	case utf8strOptBOM:
+		RealLen = 3;
+	/* fall through */
+	case utf8strRaw: {
+		Unicode2CharBuf s(unicode2UTF8(rstr));
+		if (s) {
+			RealLen += strlen(s);
+			break;
+		} else {
+			RealLen = 0;
 		}
-		/* fall through */
-		default: {
-			Unicode2CharBuf s(unicode2char(rstr));
-			if (s) {
-				RealLen = strlen(s);
-			}
+	}
+	/* fall through */
+	default: {
+		Unicode2CharBuf s(unicode2char(rstr));
+		if (s) {
+			RealLen = strlen(s);
 		}
 	}
+	}
 
 	return RealLen;
 }
 
-
-/****************************************************/
-/***************** Non-inlines **********************/
-/****************************************************/
-
-
 // Makes sIn suitable for inclusion in an URL, by escaping all chars that could cause trouble.
-wxString URLEncode(const wxString& sIn);
-
+wxString URLEncode(const wxString &sIn);
 
 /**
- * Converts a hexadecimal number to a char.
+ * Converts a hexadecimal number of at most 2 digits to a char.
  *
- * @param hex The hex-number, must be at most 2 digits long.
- * @return The resulting char or \0 if conversion failed.
+ * @return The char, or \0 if conversion failed.
  */
-wxChar HexToDec( const wxString& hex );
+wxChar HexToDec(const wxString &hex);
 
+/**
+ * Converts all valid HTML escape-codes to their corresponding chars.
+ */
+wxString UnescapeHTML(const wxString &str);
 
 /**
- * This function converts all valid HTML escape-codes to their corresponding chars.
+ * Restores the '|' delimiters of an eD2k link that were percent-encoded.
  *
- * @param str The string to unescape.
- * @return The unescaped version of the input string.
+ * Chromium refuses to hand over an ed2k:// URL containing a literal '|' at all,
+ * so sites publish the encoded spelling and that is what reaches the clipboard.
+ * Only the delimiters are touched: a filename keeps whatever escapes it arrived
+ * with, and CED2KFileLink unescapes it once the link tokenizes.
  */
-wxString UnescapeHTML( const wxString& str );
-
+wxString RestoreEncodedPipes(const wxString &link);
 
 /**
- * Ensures that the url pass is valid by escaping various chars.
+ * Escapes the chars needed to make the url valid.
  */
-wxString validateURI(const wxString& url);
-
+wxString validateURI(const wxString &url);
 
 /**
- * Compares two strings, while taking numerals into consideration.
- *
- * @return Returns -1 if a < b, 1 if a > b and 0 if a = b
+ * Compares two strings, taking numerals into consideration.
  *
- * This function basically splits the two strings into a number of
- * fields, deliniated by whitespace, non-alphanumerical chars. The
- * numerals are then converted to integers, and the fields are
- * compared. This allows strings such as "a (2)" and "a (10)" to
- * be properly sorted for displaying.
+ * Splits both into fields on whitespace and non-alphanumerics, converts
+ * numerals to integers, then compares field by field, so "a (2)" sorts before
+ * "a (10)". Floats become two fields; negative numbers are not handled.
  *
- * Currently does not handle floats (they are treated as to separate
- * fields, nor negative numbers.
+ * @return -1 if a < b, 1 if a > b, 0 if equal.
  */
-int FuzzyStrCmp(const wxString& a, const wxString& b);
+int FuzzyStrCmp(const wxString &a, const wxString &b);
 
 /**
- * As with FuzzyStrCmp, but case insensitive.
+ * As FuzzyStrCmp, but case insensitive.
  */
-int FuzzyStrCaseCmp(const wxString& a, const wxString& b);
-
+int FuzzyStrCaseCmp(const wxString &a, const wxString &b);
 
-/**
- * This class provides a simple and fast tokenizer.
- */
 class CSimpleTokenizer
 {
 public:
-	/**
-	 * @param str The string to tokenize.
-	 * @param delim The delimiter used to split the string.
-	 */
-	CSimpleTokenizer(const wxString& str, wxChar delim);
+	CSimpleTokenizer(const wxString &str, wxChar delim);
 
 	/**
-	 * Returns the next part of the string separated by the
-	 * given delimiter. When the entire string has been
-	 * tokenized, an empty string is returned. Note that
-	 * empty tokens are also returned.
+	 * The next part of the string, empty once fully tokenized. Empty tokens
+	 * are returned too.
 	 */
 	wxString next();
 
 	/**
-	 * Returns the remaining part of the string.
-	 *
-	 * The remaining part is defined as being the part after
-	 * the last encountered token, or an empty string if the
-	 * entire string has been tokenized.
-	 *
-	 * If next() has yet to be called, the entire string will
-	 * be returned.
+	 * The part after the last token, or empty once fully tokenized. Before the
+	 * first next() call, the whole string.
 	 */
 	wxString remaining() const;
 
-	/**
-	 * Returns the number of tokens encountered so far.
-	 */
 	size_t tokenCount() const;
 
 private:
@@ -303,12 +283,11 @@
 	wxChar m_delim;
 
 	//! A pointer to the current position in the string.
-	const wxChar* m_ptr;
+	const wxChar *m_ptr;
 
 	//! The number of tokens encountered.
 	size_t m_count;
 };
 
-
 #endif // STRING_FUNCTIONS_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/libs/common/TextFile.cpp -> amule-3.1.0.tar.gz/src/libs/common/TextFile.cpp Changed

@@ -27,23 +27,17 @@
 
 #include <wx/textbuf.h>
 
-
 //! The maximum number of chars read at once in GetNextLine
 const size_t TXTBUF_SIZE = 1024;
 
+CTextFile::CTextFile() {}
 
-CTextFile::CTextFile()
-{
-}
-
-
-bool CTextFile::Open(const wxString& path, EOpenMode mode)
+bool CTextFile::Open(const wxString &path, EOpenMode mode)
 {
 	return Open(CPath(path), mode);
 }
 
-
-bool CTextFile::Open(const CPath& path, EOpenMode mode)
+bool CTextFile::Open(const CPath &path, EOpenMode mode)
 {
 	// wxFFile doesn't call close itself, but asserts instead.
 	Close();
@@ -63,34 +57,25 @@
 	return IsOpened();
 }
 
-
-CTextFile::~CTextFile()
-{
-}
-
+CTextFile::~CTextFile() {}
 
 bool CTextFile::IsOpened() const
 {
 	return m_file.IsOpened();
 }
 
-
 bool CTextFile::Eof() const
 {
-	// This is needed because feof will crash if the
-	// underlying FILE pointer is NULL, as is the
-	// case when the file is closed.
+	// feof crashes when the underlying FILE pointer is NULL, as it is when the file is closed.
 	return m_file.IsOpened() ? m_file.Eof() : true;
 }
 
-
 bool CTextFile::Close()
 {
 	return m_file.Close();
 }
 
-
-wxString CTextFile::GetNextLine(EReadTextFile flags, const wxMBConv& conv, bool* result)
+wxString CTextFile::GetNextLine(EReadTextFile flags, const wxMBConv &conv, bool *result)
 {
 	wxCHECK_MSG(m_file.IsOpened(), "", "Trying to read from closed file.");
 	wxCHECK_MSG(!m_file.Eof(), "", "Trying to read past EOF");
@@ -170,8 +155,7 @@
 	return line;
 }
 
-
-bool CTextFile::WriteLine(const wxString& line, const wxMBConv& conv)
+bool CTextFile::WriteLine(const wxString &line, const wxMBConv &conv)
 {
 	wxCHECK_MSG(m_file.IsOpened(), false, "Trying to read from closed file.");
 	wxCHECK_MSG((m_mode == write), false, "Trying to read from non-readable file.");
@@ -179,9 +163,8 @@
 	// Ensures that use of newlines/carriage-returns matches the OS
 	wxString result = wxTextBuffer::Translate(line);
 
-	// Only add line-breaks between lines, as otherwise the number of
-	// lines would grow as the result of the addition of an empty line,
-	// at the end of the file.
+	// Only add line breaks between lines: otherwise adding an empty line at the end of the file
+	// would grow the line count.
 	if (m_file.Tell() > 0) {
 		result = wxTextBuffer::GetEOL() + result;
 	}
@@ -196,8 +179,7 @@
 	return false;
 }
 
-
-wxArrayString CTextFile::ReadLines(EReadTextFile flags, const wxMBConv& conv)
+wxArrayString CTextFile::ReadLines(EReadTextFile flags, const wxMBConv &conv)
 {
 	wxArrayString lines;
 
@@ -214,8 +196,7 @@
 	return lines;
 }
 
-
-bool CTextFile::WriteLines(const wxArrayString& lines, const wxMBConv& conv)
+bool CTextFile::WriteLines(const wxArrayString &lines, const wxMBConv &conv)
 {
 	bool result = true;
 
@@ -225,4 +206,3 @@
 
 	return result;
 }
-

amule-3.0.1.tar.gz/src/libs/common/TextFile.h -> amule-3.1.0.tar.gz/src/libs/common/TextFile.h Changed

@@ -29,7 +29,6 @@
 #include <wx/string.h>
 #include <wx/strconv.h>
 
-
 class CPath;
 
 /** Criteria used when reading an entire file to an array of strings. */
@@ -48,24 +47,21 @@
 	txtReadDefault = txtIgnoreEmptyLines | txtIgnoreComments | txtStripWhitespace
 };
 
-
 /**
  * Text file class.
  *
- * This class is a wrapper around wxFFile, letting an text file be read
- * or written line-by-line. The class provides transparent and automatic
- * EOL-style handling.
+ * A wrapper around wxFFile, letting a text file be read or written line by line, with transparent
+ * and automatic EOL-style handling.
  *
- * Note that it is not possible to seek in a CTextFile, only sequential
- * reading or writing is possible. Also note that the maximum length of a
- * line is fixed (see CTextFile::GetNextLine), however this shouldn't be
- * a problem, given the uses of this class.
+ * Seeking is not possible, only sequential reading or writing. The maximum length of a line is also
+ * fixed (see CTextFile::GetNextLine), which the uses of this class make harmless.
  */
 class CTextFile
 {
 public:
 	// Open modes. Note that these are mutually exclusive!
-	enum EOpenMode {
+	enum EOpenMode
+	{
 		//! Opens the file for reading, if it exists.
 		read,
 		//! Opens the file for writing, overwriting old contents.
@@ -79,49 +75,46 @@
 
 	/** Opens the specified file, returning true on success. */
 	//\{
-	bool Open(const wxString& path, EOpenMode mode);
-	bool Open(const CPath& path, EOpenMode mode);
+	bool Open(const wxString &path, EOpenMode mode);
+	bool Open(const CPath &path, EOpenMode mode);
 	//\}
 
 	/** Returns true if the file is opened. */
-	bool		IsOpened() const;
+	bool IsOpened() const;
 	/** Returns true if GetNextLine has reached the end of the file. */
-	bool		Eof() const;
+	bool Eof() const;
 	/** Closes the file, returning true on success. */
-	bool		Close();
-
+	bool Close();
 
 	/**
 	 * Returns the next line of a readable file.
 	 *
 	 * @param conv The converter used to convert from multibyte to widechar.
 	 *
-	 * 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 unless otherwise specified, so this cannot be used to test for EOF.
-	 * Instead, use the function Eof().
-	 **/
-	wxString	GetNextLine(EReadTextFile flags = txtReadAll, const wxMBConv& conv = wxConvLibc, bool* result = NULL);
+	 * Returns an empty string at EOF, and for a closed or unreadable file -- but empty lines in
+	 * the file also come back empty, so use Eof() rather than this to test for EOF.
+	 */
+	wxString GetNextLine(
+		EReadTextFile flags = txtReadAll, const wxMBConv &conv = wxConvLibc, bool *result = NULL);
 
 	/**
 	 * Writes the line to a writable file, returning true on success.
 	 *
 	 * @param conv The converter used to convert from widechar to multibyte.
 	 */
-	bool		WriteLine(const wxString& line, const wxMBConv& conv = wxConvLibc);
-
+	bool WriteLine(const wxString &line, const wxMBConv &conv = wxConvLibc);
 
 	/** Reads and returns the contents of a text-file, using the specified criteria and converter. */
-	wxArrayString ReadLines(EReadTextFile flags = txtReadDefault, const wxMBConv& conv = wxConvLibc);
+	wxArrayString ReadLines(EReadTextFile flags = txtReadDefault, const wxMBConv &conv = wxConvLibc);
 
 	/** Writes the lines to the file, using the given converter, returning true if no errors occurred. */
-	bool WriteLines(const wxArrayString& lines, const wxMBConv& conv = wxConvLibc);
+	bool WriteLines(const wxArrayString &lines, const wxMBConv &conv = wxConvLibc);
 
 private:
 	//! The actual file object.
-	wxFFile		m_file;
+	wxFFile m_file;
 	//! The mode in with which the file was opened.
-	EOpenMode	m_mode;
+	EOpenMode m_mode;
 };
 
 #endif /* TEXTFILE_H */

amule-3.0.1.tar.gz/src/libs/common/strerror_r.c -> amule-3.1.0.tar.gz/src/libs/common/strerror_r.c Changed

@@ -25,17 +25,17 @@
 #include "config.h"
 
 #ifndef _XOPEN_SOURCE
-#	define _XOPEN_SOURCE	600
+#define _XOPEN_SOURCE 600
 #endif
 
-#include <string.h>			/* Needed for strerror_r() and size_t */
+#include <string.h> /* Needed for strerror_r() and size_t */
 
 #ifdef HAVE_ERRNO_H
-#	include <errno.h>		/* Needed for errno */
+#include <errno.h> /* Needed for errno */
 #endif
 
 #ifndef HAVE_STRERROR_R
-#	ifdef HAVE_STRERROR
+#ifdef HAVE_STRERROR
 
 /* Replacement strerror_r() function for systems that don't have any.
    Note that this replacement function is NOT thread-safe! */
@@ -61,20 +61,20 @@
 	return 0;
 }
 
-#	else
+#else
 
 /* No way to get error description */
 int mule_strerror_r()
 {
 #ifdef HAVE_ERRNO_H
-	errno = ENOSYS;	/* not implemented */
+	errno = ENOSYS; /* not implemented */
 #endif
 	return -1;
 }
 
-#	endif
+#endif
 #else
-#	ifdef STRERROR_R_CHAR_P
+#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)
@@ -99,12 +99,12 @@
 	return 0;
 }
 
-#	else
+#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
 #endif

amule-3.0.1.tar.gz/src/libs/common/strerror_r.h -> amule-3.1.0.tar.gz/src/libs/common/strerror_r.h Changed

amule-3.0.1.tar.gz/src/libs/ec/abstracts/CMakeLists.txt -> amule-3.1.0.tar.gz/src/libs/ec/abstracts/CMakeLists.txt Changed

@@ -1,16 +1,26 @@
 cmake_minimum_required (VERSION 3.10...3.31)
 MESSAGE (STATUS "Generating ${HEADER_FILE}")
 FILE (READ License.abstract LICENSE_TEXT)
-STRING (REGEX REPLACE "\n\n+" "" LICENSE_TEXT ${LICENSE_TEXT})
-STRING (REGEX REPLACE "\n" "\n// " LICENSE_TEXT ${LICENSE_TEXT})
+# Quote the variable in both replacements: unquoted, CMake expands it as a
+# list and every literal `;` in the licence prose is swallowed as a list
+# separator ("free software; you can" came out as "free software you can").
+STRING (REGEX REPLACE "\n\n+" "" LICENSE_TEXT "${LICENSE_TEXT}")
+STRING (REGEX REPLACE "\n" "\n// " LICENSE_TEXT "${LICENSE_TEXT}")
 
 GET_FILENAME_COMPONENT (ABSTRACT ${HEADER_FILE} NAME_WE)
 STRING (TOUPPER "${ABSTRACT}" DEFINE_NAME)
 SET (ABSTRACT "${ABSTRACT}.abstract")
 FILE (WRITE ${HEADER_FILE} "${LICENSE_TEXT}\n")
 
-FILE (STRINGS ${ABSTRACT} CONTENTS NEWLINE_CONSUME)
-STRING (REGEX REPLACE "\n" ";" CONTENTS ${CONTENTS})
+# The file is turned into a CMake list by swapping newlines for `;`, so a
+# literal semicolon in the source would split one line into several and the
+# fragments would then be parsed as entries. Escape them first; they render
+# back as plain `;` wherever a list element is used as a string. Prose in a
+# `##` documentation comment is the usual place a semicolon shows up.
+# ENCODING UTF-8 keeps non-ASCII punctuation in those comments intact.
+FILE (STRINGS ${ABSTRACT} CONTENTS NEWLINE_CONSUME ENCODING UTF-8)
+STRING (REPLACE ";" "\\;" CONTENTS "${CONTENTS}")
+STRING (REGEX REPLACE "\n" ";" CONTENTS "${CONTENTS}")
 
 FOREACH (LINE ${CONTENTS})
 	IF ("${LINE}" MATCHES "^DataType")
@@ -25,8 +35,41 @@
 		STRING (TOUPPER "${FILE_NAME}" DEFINE_NAME)
 		FILE (APPEND ${HEADER_FILE} "#ifndef __${DEFINE_NAME}_H__\n")
 		FILE (APPEND ${HEADER_FILE} "#define __${DEFINE_NAME}_H__\n\n")
+		# A TypeDef section emits `typedef uint8_t ec_opcode_t;` and
+		# friends, so such a header needs <cstdint> of its own rather
+		# than relying on a consumer having included it first. Headers
+		# without one (ECTagTypes) use aMule's own uint8 from types.h
+		# and must not pull in cstdint gratuitously.
+		IF ("${CONTENTS}" MATCHES "TypeDef")
+			FILE (APPEND ${HEADER_FILE} "#include <cstdint>\n\n")
+		ENDIF ("${CONTENTS}" MATCHES "TypeDef")
 	ENDIF ("${LINE}" MATCHES "^FileContent")
 
+	# `##` is a documentation comment: emitted into the header, attached
+	# above the entry that follows it. Plain `#` stays what it always
+	# was -- an abstract-only note (section headings, commented-out
+	# *_UNUSED placeholders) that never reaches the header.
+	#
+	# Inside an enum the pending entry has to be flushed first: the main
+	# loop writes each entry one iteration late (it buffers PREVIOUS_LINE
+	# so the last one can omit its trailing comma), so emitting the
+	# comment straight away would place it above the wrong entry.
+	IF ("${LINE}" MATCHES "^##")
+		STRING (REGEX REPLACE "^## ?" "" DOC_LINE "${LINE}")
+		# Undo the list-safety escaping applied when the file was read.
+		STRING (REPLACE "\\;" ";" DOC_LINE "${DOC_LINE}")
+		IF (${IN_CODE_BLOCK})
+			IF (NOT "${PREVIOUS_LINE}" STREQUAL "")
+				FILE (APPEND ${HEADER_FILE} "\t${PREVIOUS_LINE},\n")
+				UNSET (PREVIOUS_LINE)
+			ENDIF (NOT "${PREVIOUS_LINE}" STREQUAL "")
+			FILE (APPEND ${HEADER_FILE} "\t// ${DOC_LINE}\n")
+		ELSE (${IN_CODE_BLOCK})
+			FILE (APPEND ${HEADER_FILE} "// ${DOC_LINE}\n")
+		ENDIF (${IN_CODE_BLOCK})
+		UNSET (LINE)
+	ENDIF ("${LINE}" MATCHES "^##")
+
 	IF (NOT "${LINE}" STREQUAL "" AND NOT "${LINE}" MATCHES "^#")
 		IF (${IN_BLOCK})
 			IF ("${LINE}" STREQUAL "/Section")
@@ -73,7 +116,9 @@
 
 				IF (NOT ${TYP} STREQUAL "")
 					STRING (TOLOWER "${TYP}" TYP)
-					FILE (APPEND ${HEADER_FILE} "${TYP} ${NAME} {\n")
+					# Brace on its own line, matching the project's
+					# clang-format style for enum definitions.
+					FILE (APPEND ${HEADER_FILE} "${TYP} ${NAME}\n{\n")
 					UNSET (TYPE)
 					UNSET (NAME)
 					SET (IN_CODE_BLOCK TRUE)

amule-3.0.1.tar.gz/src/libs/ec/abstracts/ECCodes.abstract -> amule-3.1.0.tar.gz/src/libs/ec/abstracts/ECCodes.abstract Changed

@@ -27,8 +27,13 @@
 DataType uint32
 EC_FLAG_ZLIB		0x00000001
 EC_FLAG_UTF8_NUMBERS	0x00000002
+## Body is AEAD-sealed; see CECSocket::WritePacket. 0x08 was previously
+## inside EC_FLAG_UNKNOWN_MASK, so a peer predating this feature rejects
+## such a packet outright instead of misparsing ciphertext as tags -- the
+## failure is closed, which no other free bit would have given us.
+EC_FLAG_ENCRYPTED	0x00000008
 EC_FLAG_LARGE_TAG_COUNT	0x00000010
-EC_FLAG_UNKNOWN_MASK	0xff7f7f08
+EC_FLAG_UNKNOWN_MASK	0xff7f7f00
 /Section
 
 # OpCodes
@@ -149,6 +154,59 @@
 
 EC_OP_FRIEND                        0x57
 
+EC_OP_VERSION_CHECK                 0x58
+
+EC_OP_SHARED_FILE_SEARCH_KAD_NOTES  0x59
+
+EC_OP_VERIFY_LOCAL_DATA             0x5A
+
+EC_OP_GET_CHAT_MESSAGES             0x5B
+
+EC_OP_CHAT_MESSAGES                 0x5C
+
+EC_OP_GET_SHARED_DIRS               0x5D
+
+EC_OP_SET_SHARED_DIRS               0x5E
+
+EC_OP_SEARCH_REQUEST_MORE           0x5F
+
+EC_OP_SEARCH_LIST                   0x60
+
+EC_OP_GET_CLIENT_HISTORY            0x61
+EC_OP_CLIENT_HISTORY                0x62
+
+## Chat session store (issue #971). The client asks for the session list and
+## everything newer than its cursor in one roundtrip, so an idle connection
+## costs one small packet and a busy one needs no follow-up query.
+EC_OP_GET_CHAT_SESSIONS             0x63
+EC_OP_CHAT_SESSIONS                 0x64
+EC_OP_CHAT_SEND                     0x65
+EC_OP_CHAT_CLOSE_SESSION            0x66
+
+## Re-extract media metadata for the whole share, or for one file by hash
+## (EC_TAG_KNOWNFILE with the hash). Reply carries
+## EC_TAG_KNOWNFILE_MEDIA_QUEUED = how many probes were queued.
+##
+## Deliberately NOT behind a capability tag. A server that does not know it
+## answers EC_OP_FAILED, which the client reports as "not supported" -- the
+## op is user-triggered once, not polled, so an old core sees a single
+## rejected request rather than a repeating one.
+EC_OP_REFRESH_MEDIA_METADATA        0x67
+
+## Set a partfile's A4AF-auto flag to a given value, rather than flipping it.
+## Addressed like every other PARTFILE command (EC_TAG_PARTFILE with the hash)
+## and carries EC_TAG_PARTFILE_A4AFAUTO with the value to store.
+##
+## EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO maps to SetA4AFAuto(!IsA4AFAuto()), so a
+## caller that cannot see the current value cannot ask for a particular one,
+## and any retried request flips it back. That is fine for a GUI menu item
+## driven by a checkbox the user is looking at, which is why the flip op stays
+## for amulegui, and wrong for an HTTP API, where a library or a browser may
+## repeat a request without the caller knowing.
+##
+## Additive: the flip op is unchanged, so an older client is unaffected, and a
+## core that does not know this one answers EC_OP_FAILED.
+EC_OP_PARTFILE_SET_A4AF_AUTO        0x68
 /Section
 
 Section Content
@@ -177,6 +235,31 @@
 EC_TAG_CAN_PARTIAL_UPDATE                 0x0012
 EC_TAG_FILE_REMOVED                       0x0013
 EC_TAG_PREFER_NO_ZLIB                     0x0014
+EC_TAG_CAN_MULTI_SEARCH                   0x0015
+EC_TAG_CAN_CHAT                           0x0016
+
+EC_TAG_CAN_SHAREDDIRS_CONFIG              0x0017
+EC_TAG_ED2K_CONNECTED_SINCE               0x0018
+EC_TAG_KAD_CONNECTED_SINCE                0x0019
+EC_TAG_CAN_SEARCH_LIST                    0x001A
+EC_TAG_CAN_AEAD                           0x001B
+EC_TAG_AEAD_CIPHER                        0x001C
+EC_TAG_AEAD_CLIENT_NONCE                  0x001D
+EC_TAG_AEAD_SERVER_NONCE                  0x001E
+EC_TAG_CAN_PARTIAL_SEARCH                 0x001F
+EC_TAG_CAN_SEARCH_PROGRESS_UNION          0x0020
+EC_TAG_AEAD_CLIENT_PUBKEY                 0x0021
+EC_TAG_AEAD_SERVER_PUBKEY                 0x0022
+EC_TAG_AEAD_CLIENT_CONFIRM                0x0023
+EC_TAG_AEAD_SERVER_CONFIRM                0x0024
+EC_TAG_SESSION_ID                         0x0025
+EC_TAG_CAN_CLIENT_HISTORY                 0x0026
+
+## Client speaks the chat session ops (EC_OP_GET_CHAT_SESSIONS and friends).
+## Deliberately distinct from EC_TAG_CAN_CHAT: that tag shipped earlier, on
+## builds that echo it but know none of these opcodes, so reusing it would
+## make such a daemon look capable and earn it an unknown opcode.
+EC_TAG_CAN_CHAT_SESSIONS                  0x0027
 
 
 EC_TAG_CLIENT_NAME                        0x0100
@@ -211,6 +294,8 @@
 	EC_TAG_STATS_TOTAL_RECEIVED_BYTES         0x0219
 	EC_TAG_STATS_SHARED_FILE_COUNT            0x021A
 	EC_TAG_STATS_KAD_NODES                    0x021B
+	EC_TAG_STATS_TEMP_FREE_SPACE              0x021C
+	EC_TAG_STATS_INCOMING_FREE_SPACE          0x021D
 
 EC_TAG_PARTFILE                           0x0300
 	EC_TAG_PARTFILE_NAME                      0x0301
@@ -247,6 +332,7 @@
 	EC_TAG_PARTFILE_HASHED_PART_COUNT         0x0320
 	EC_TAG_PARTFILE_A4AFAUTO                  0x0321
 	EC_TAG_PARTFILE_A4AF_SOURCES              0x0322
+	EC_TAG_PARTFILE_KAD_COMMENT_SEARCHING     0x0323
 
 EC_TAG_KNOWNFILE                          0x0400
 	EC_TAG_KNOWNFILE_XFERRED                  0x0401
@@ -264,6 +350,19 @@
 	EC_TAG_KNOWNFILE_COMPLETE_SOURCES         0x040D
 	EC_TAG_KNOWNFILE_COMMENT                  0x040E
 	EC_TAG_KNOWNFILE_RATING                   0x040F
+	EC_TAG_KNOWNFILE_MEDIA_LENGTH             0x0410
+	EC_TAG_KNOWNFILE_MEDIA_BITRATE            0x0411
+	EC_TAG_KNOWNFILE_MEDIA_CODEC              0x0412
+	EC_TAG_KNOWNFILE_MEDIA_ARTIST             0x0413
+	EC_TAG_KNOWNFILE_MEDIA_ALBUM              0x0414
+	EC_TAG_KNOWNFILE_MEDIA_TITLE              0x0415
+	EC_TAG_KNOWNFILE_PATH                     0x0416
+	EC_TAG_KNOWNFILE_UPLOAD_SPEED             0x0417
+	EC_TAG_KNOWNFILE_UPLOADING_COUNT          0x0418
+	EC_TAG_KNOWNFILE_LAST_UPLOAD              0x0419
+	EC_TAG_KNOWNFILE_SHARED_SINCE             0x041A
+	EC_TAG_KNOWNFILE_HASHED_PART_COUNT        0x041B
+	EC_TAG_KNOWNFILE_MEDIA_QUEUED             0x041C
 
 EC_TAG_SERVER                             0x0500
 	EC_TAG_SERVER_NAME                        0x0501
@@ -279,6 +378,11 @@
 	EC_TAG_SERVER_VERSION                     0x050B
 	EC_TAG_SERVER_IP                          0x050C
 	EC_TAG_SERVER_PORT                        0x050D
+	EC_TAG_SERVER_COUNTRY                     0x050E
+	EC_TAG_SERVER_FILES_SOFT                  0x050F
+	EC_TAG_SERVER_FILES_HARD                  0x0510
+	EC_TAG_SERVER_TCP_FLAGS                   0x0511
+	EC_TAG_SERVER_UDP_FLAGS                   0x0512
 
 EC_TAG_CLIENT                             0x0600
 	EC_TAG_CLIENT_SOFTWARE                    0x0601
@@ -324,7 +428,28 @@
 	EC_TAG_CLIENT_OS_INFO                     0x0629
 	EC_TAG_CLIENT_AVAILABLE_PARTS             0x062A
 	EC_TAG_CLIENT_UPLOAD_PART_STATUS          0x062B
-
+	EC_TAG_CLIENT_IS_FRIEND                   0x062C
+	EC_TAG_CLIENT_SCORE_RATIO                 0x062D
+	EC_TAG_CLIENT_COUNTRY                     0x062E
+# Whether we hold a live socket to this peer right now
+# (CUpDownClient::IsConnected). Every consumer used to infer "online" from a
+# client ECID merely existing, which is true from the moment the daemon starts
+# ATTEMPTING contact -- so an unroutable peer read as online. Carried on the
+# client, and echoed on the friend and chat-session containers, which reference
+# a client by ECID and would otherwise have to guess the same way.
+	EC_TAG_CLIENT_CONNECTED                   0x0632
+
+# Credit-store fields, for the clients history. The rest of a history row
+# reuses the live-client tags above -- a peer's name, address, software and
+# origin mean the same thing whether it is connected now or was seen months ago.
+	EC_TAG_CLIENT_LAST_SEEN                   0x062F
+	EC_TAG_CLIENT_FIRST_SEEN                  0x0630
+	EC_TAG_CLIENT_SESSIONS                    0x0631
+
+# eMuleAI vendor capability word (CT_MOD_MISCOPTIONS) as the peer sent it,
+# already masked to the five defined bits. Additive: a missing tag means an
+# older daemon, which is a distinct third state from "peer advertised nothing".
+	EC_TAG_CLIENT_MOD_CAPABILITIES            0x0633
 EC_TAG_SEARCHFILE                         0x0700
 	EC_TAG_SEARCH_TYPE                        0x0701
 	EC_TAG_SEARCH_NAME                        0x0702
@@ -335,6 +460,24 @@
 	EC_TAG_SEARCH_AVAILABILITY                0x0707
 	EC_TAG_SEARCH_STATUS                      0x0708
 	EC_TAG_SEARCH_PARENT                      0x0709
+	EC_TAG_SEARCH_LIFECYCLE_STATE             0x070A
+	EC_TAG_SEARCH_LIFECYCLE_KIND              0x070B
+	EC_TAG_SEARCH_RESULT_COUNT                0x070C
+	EC_TAG_SEARCH_LIFECYCLE_PERCENT           0x070D
+	EC_TAG_SEARCH_ID                          0x070E
+	EC_TAG_SEARCH_REF                         0x070F
+	EC_TAG_SEARCH_EXPIRED                     0x0710
+	EC_TAG_SEARCH_CLOSE                       0x0711
+	EC_TAG_SEARCHFILE_CLIENT_ID               0x0712
+	EC_TAG_SEARCHFILE_CLIENT_PORT             0x0713
+	EC_TAG_SEARCHFILE_DIRECTORY               0x0714
+	EC_TAG_SEARCH_BROWSE_STATUS               0x0715
+## Whether a Kad search can still be widened by a later "More" press --
+## `fired || CanReaskMore()`, not "did a reask go out". Emitted on every
+## EC_OP_SEARCH_REQUEST_MORE reply, including the unknown-id path. A peer
+## predating it sends nothing, and absent must read as "this daemon does not
+## report it", never as "exhausted".
+	EC_TAG_SEARCH_MORE_REASKABLE              0x0716
 
 EC_TAG_FRIEND                             0x0800
 	EC_TAG_FRIEND_NAME                        0x0801
@@ -347,6 +490,18 @@
 	EC_TAG_FRIEND_FRIENDSLOT                  0x0808
 	EC_TAG_FRIEND_SHARED                      0x0809
 
+## EC_TAG_CHAT carries the message text as its value; EC_TAG_CHAT_CLIENT_ID is
+## the peer's GUI_ID, a uint64 packed as (ip << 16) | port, with the IP in the
+## same byte order as EC_TAG_CLIENT_USER_IP.
+EC_TAG_CHAT                               0x0900
+	EC_TAG_CHAT_CLIENT_ID                     0x0901
+	EC_TAG_CHAT_SESSION                       0x0902
+	EC_TAG_CHAT_MESSAGE                       0x0903
+	EC_TAG_CHAT_MSG_ID                        0x0904
+	EC_TAG_CHAT_DIRECTION                     0x0905
+	EC_TAG_CHAT_TIMESTAMP                     0x0906
+	EC_TAG_CHAT_PEER_NAME                     0x0907
+
 EC_TAG_SELECT_PREFS                       0x1000
 
 	EC_TAG_PREFS_CATEGORIES                   0x1100
@@ -362,6 +517,11 @@
 		EC_TAG_USER_HASH                          0x1202
 		EC_TAG_USER_HOST                          0x1203
 		EC_TAG_GENERAL_CHECK_NEW_VERSION          0x1204
+		EC_TAG_GENERAL_VERSION_CHECK_AVAILABLE    0x1205
+		EC_TAG_GENERAL_VERSION_CHECK_LATEST       0x1206
+		EC_TAG_GENERAL_VERSION_CHECK_OUTDATED     0x1207
+		EC_TAG_GENERAL_VERSION_CHECK_TIMESTAMP    0x1208
+		EC_TAG_GENERAL_UPNP_AVAILABLE             0x1209
 
 	EC_TAG_PREFS_CONNECTIONS                  0x1300
 		EC_TAG_CONN_DL_CAP                        0x1301
@@ -378,6 +538,17 @@
 		EC_TAG_CONN_RECONNECT                     0x130C
 		EC_TAG_NETWORK_ED2K                       0x130D
 		EC_TAG_NETWORK_KADEMLIA                   0x130E
+		EC_TAG_CONN_BIND_ADDRESS                  0x130F
+		EC_TAG_CONN_BIND_INTERFACE                0x1310
+		EC_TAG_PROXY_ENABLE                       0x1311
+		EC_TAG_PROXY_TYPE                         0x1312
+		EC_TAG_PROXY_HOST                         0x1313
+		EC_TAG_PROXY_PORT                         0x1314
+		EC_TAG_PROXY_AUTH                         0x1315
+		EC_TAG_PROXY_USER                         0x1316
+		EC_TAG_PROXY_PASSWORD                     0x1317
+		EC_TAG_CONN_UPNP_ENABLED                  0x1318
+		EC_TAG_CONN_UPNP_TCP_PORT                 0x1319
 
 	EC_TAG_PREFS_MESSAGEFILTER                0x1400
 		EC_TAG_MSGFILTER_ENABLED                  0x1401
@@ -386,6 +557,9 @@
 		EC_TAG_MSGFILTER_SECURE                   0x1404
 		EC_TAG_MSGFILTER_BY_KEYWORD               0x1405
 		EC_TAG_MSGFILTER_KEYWORDS                 0x1406
+		EC_TAG_MSGFILTER_SHOW_IN_LOG              0x1407
+		EC_TAG_MSGFILTER_FILTER_COMMENTS          0x1408
+		EC_TAG_MSGFILTER_COMMENT_KEYWORDS         0x1409
 
 	EC_TAG_PREFS_REMOTECTRL                   0x1500
 		EC_TAG_WEBSERVER_AUTORUN                  0x1501
@@ -394,9 +568,16 @@
 		EC_TAG_WEBSERVER_USEGZIP                  0x1504
 		EC_TAG_WEBSERVER_REFRESH                  0x1505
 		EC_TAG_WEBSERVER_TEMPLATE                 0x1506
+		EC_TAG_AMULEAPI_AUTORUN                   0x1507
+		EC_TAG_AMULEAPI_PORT                      0x1508
+		EC_TAG_AMULEAPI_PASSWD                    0x1509
+		EC_TAG_AMULEAPI_BIND                      0x150A
+		EC_TAG_AMULEAPI_GUEST_PASSWD              0x150B
 
 	EC_TAG_PREFS_ONLINESIG                    0x1600
 		EC_TAG_ONLINESIG_ENABLED                  0x1601
+		EC_TAG_ONLINESIG_DIRECTORY                0x1602
+		EC_TAG_ONLINESIG_UPDATE                   0x1603
 
 	EC_TAG_PREFS_SERVERS                      0x1700
 		EC_TAG_SERVERS_REMOVE_DEAD                0x1701
@@ -423,11 +604,16 @@
 		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_FILES_CREATE_NORMAL                0x180F
+		EC_TAG_FILES_ENDGAME                      0x1810
+		EC_TAG_FILES_MEDIA_METADATA_ENABLED       0x1811
+		EC_TAG_FILES_MEDIA_FFPROBE_PATH           0x1812
+		EC_TAG_FILES_START_NEXT_ALPHA             0x1813
+		EC_TAG_FILES_MMAP_SUPPORTED               0x1814
+		EC_TAG_FILES_MMAP_ENABLED                 0x1815
 
 #	EC_TAG_UNUSED                             0x1900
 #		EC_TAG_UNUSED                             0x1901
@@ -443,6 +629,8 @@
 		EC_TAG_DIRECTORIES_SHARE_HIDDEN           0x1A04
 		EC_TAG_DIRECTORIES_AUTO_RESCAN            0x1A05
 		EC_TAG_DIRECTORIES_FOLLOW_SYMLINKS        0x1A06
+		EC_TAG_DIRECTORIES_EXCLUDE_PATTERNS       0x1A07
+		EC_TAG_DIRECTORIES_EXCLUDE_REGEX          0x1A08
 
 	EC_TAG_PREFS_STATISTICS                   0x1B00
 		EC_TAG_STATSGRAPH_WIDTH                   0x1B01
@@ -454,11 +642,47 @@
 		EC_TAG_STAT_NODE_VALUE                    0x1B07
 		EC_TAG_STAT_VALUE_TYPE                    0x1B08
 		EC_TAG_STATTREE_NODEID                    0x1B09
+## Active uploads / active downloads per point — parallel
+## to STATSGRAPH_DATA's connection total, lets amulegui
+## draw monolithic amule's 3-line connection scope.
 		EC_TAG_STATSGRAPH_DATA_CONN               0x1B0A
+## Session totals as of the latest point in the reply.
+## Lets amulegui compute the daemon's
+## kBytesReceived/sTimestamp session average instead of
+## integrating locally from GUI startup.
 		EC_TAG_STATSGRAPH_SESSION_DL              0x1B0B
 		EC_TAG_STATSGRAPH_SESSION_UL              0x1B0C
 		EC_TAG_STATSGRAPH_SESSION_KAD             0x1B0D
 		EC_TAG_STATSGRAPH_SESSION_TIMESPAN        0x1B0E
+## Stable, untranslated machine key for a stat-tree node. Optional
+## subtag of EC_TAG_STATTREE_NODE; legacy consumers skip it (see the
+## STATTREE_NODEID precedent). Lets API clients look a field up by a
+## fixed identifier instead of matching the English label.
+		EC_TAG_STAT_NODE_KEY                      0x1B0F
+## Raw numeric UL:DL ratio (download-per-upload, i.e. received/sent) as
+## a double, so API clients don't parse the composite ratio string.
+## Optional subtags of the ratio's EC_TAG_STATTREE_NODE; legacy
+## consumers skip them. _RATIO is the session ratio, _RATIO_TOTAL the
+## all-time ratio. Present only when computable (both sides > 0).
+		EC_TAG_STAT_NODE_RATIO                    0x1B10
+		EC_TAG_STAT_NODE_RATIO_TOTAL              0x1B11
+## Raw, untranslated machine value for a node whose label is data
+## (client version / OS string). Optional sibling of the display label;
+## legacy consumers skip it. Lets API clients read the value without
+## parsing it out of the composite label.
+		EC_TAG_STAT_NODE_RAW                      0x1B12
+## Stable, locale-independent token for a well-known sentinel *value*
+## (e.g. "never", "not_available"). Optional sub-tag of an
+## EC_TAG_STAT_NODE_VALUE; the English display string stays alongside it
+## (EC_VALUE_STRING) so GUI/legacy consumers are unaffected.
+		EC_TAG_STAT_VALUE_ENUM                    0x1B13
+## Records the daemon holds per resolution range, i.e. how many points
+## it can answer with before it starts repeating a record because the
+## requested spacing is finer than the one it stored. Timestamps are not
+## on the wire, so a client that over-asks cannot tell the repeats apart
+## and would draw them as distinct samples on a wrong time axis. Absent
+## from daemons predating this tag; assume the 560 they were built with.
+		EC_TAG_STATSGRAPH_DEPTH                   0x1B14
 
 	EC_TAG_PREFS_SECURITY                     0x1C00
 		EC_TAG_SECURITY_CAN_SEE_SHARES            0x1C01
@@ -472,6 +696,8 @@
 		EC_TAG_SECURITY_OBFUSCATION_SUPPORTED     0x1C09
 		EC_TAG_SECURITY_OBFUSCATION_REQUESTED     0x1C0A
 		EC_TAG_SECURITY_OBFUSCATION_REQUIRED      0x1C0B
+		EC_TAG_IPFILTER_PARANOID                  0x1C0C
+		EC_TAG_IPFILTER_SYSTEM                    0x1C0D
 
 	EC_TAG_PREFS_CORETWEAKS                   0x1D00
 		EC_TAG_CORETW_MAX_CONN_PER_FIVE           0x1D01
@@ -479,9 +705,31 @@
 		EC_TAG_CORETW_FILEBUFFER                  0x1D03
 		EC_TAG_CORETW_UL_QUEUE                    0x1D04
 		EC_TAG_CORETW_SRV_KEEPALIVE_TIMEOUT       0x1D05
+		EC_TAG_CORETW_KAD_MAX_SEARCHES            0x1D06
+		EC_TAG_CORETW_KAD_REASK_MS                0x1D07
+		EC_TAG_CORETW_SOURCE_REASK_MS             0x1D08
 
 	EC_TAG_PREFS_KADEMLIA                     0x1E00
 		EC_TAG_KADEMLIA_UPDATE_URL                0x1E01
+
+	EC_TAG_PREFS_IP2COUNTRY                   0x1F00
+		EC_TAG_IP2COUNTRY_SUPPORTED               0x1F01
+		EC_TAG_IP2COUNTRY_ENABLED                 0x1F02
+		EC_TAG_IP2COUNTRY_SOURCE                  0x1F03
+		EC_TAG_IP2COUNTRY_CUSTOM_URL              0x1F04
+		EC_TAG_IP2COUNTRY_MAXMIND_LICENSE         0x1F05
+		EC_TAG_IP2COUNTRY_AUTO_UPDATE             0x1F06
+		EC_TAG_IP2COUNTRY_LOADED_SOURCE           0x1F07
+		EC_TAG_IP2COUNTRY_DB_PATH                 0x1F08
+		EC_TAG_IP2COUNTRY_DB_LOADED               0x1F09
+		EC_TAG_IP2COUNTRY_DOWNLOADING             0x1F0A
+		EC_TAG_IP2COUNTRY_LAST_RESULT             0x1F0B
+		EC_TAG_IP2COUNTRY_UPDATE_NOW              0x1F0C
+
+	EC_TAG_SHAREDDIR                          0x2000
+		EC_TAG_SHAREDDIR_RECURSIVE                0x2001
+	EC_TAG_SHAREDDIR_REJECTED                 0x2002
+		EC_TAG_SHAREDDIR_ERROR                    0x2003
 /Section
 
 Section Content
@@ -499,10 +747,20 @@
 Type Enum
 Name EC_SEARCH_TYPE
 DataType uint8
+## These share their numeric values with CSearchList's own SearchType, which
+## is cast straight to uint8 for EC_TAG_SEARCH_LIFECYCLE_KIND. Keep the two in
+## step: a value that means one thing here and another there is not detectable
+## on the wire.
 EC_SEARCH_LOCAL         0x00
 EC_SEARCH_GLOBAL        0x01
 EC_SEARCH_KAD           0x02
 EC_SEARCH_WEB           0x03
+## A "View Files" browse. Reported by the daemon so a remote GUI can rebuild a
+## browse tab for one it did not start itself; never accepted as the type of a
+## search to start. Daemons predating it simply never send it, and the clients
+## that read the kind compare it for equality rather than switching on it, so
+## an unknown value stays inert on either side of a version mismatch.
+EC_SEARCH_BROWSE        0x04
 /Section
 
 Section Content
@@ -537,4 +795,5 @@
 EC_PREFS_SECURITY       0x00000800
 EC_PREFS_CORETWEAKS     0x00001000
 EC_PREFS_KADEMLIA       0x00002000
+EC_PREFS_IP2COUNTRY     0x00004000
 /Section

amule-3.0.1.tar.gz/src/libs/ec/cpp/CMakeLists.txt -> amule-3.1.0.tar.gz/src/libs/ec/cpp/CMakeLists.txt Changed

amule-3.1.0.tar.gz/src/libs/ec/cpp/ECCrypt.cpp Added

@@ -0,0 +1,554 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "ECCrypt.h"
+
+// Go through the tree's cryptopp wrapper rather than the headers directly: it
+// carries the deprecation pragmas they need under -Werror and knows the include
+// prefix. CRYPTOPP_INC_NEED_AEAD adds aes/gcm/hmac/chachapoly.
+#define CRYPTOPP_INC_NEED_AEAD
+#include "../../../CryptoPP_Inc.h"
+
+#include <algorithm>
+#include <cstring>
+
+namespace ECCrypt
+{
+
+namespace
+{
+const size_t AEAD_NONCE_LEN = 12; // 4-byte derived prefix + 8-byte counter
+const size_t KEY_LEN_AES128 = 16;
+const size_t KEY_LEN_CHACHA = 32;
+const size_t SHA256_LEN = 32;
+
+/// Key length the negotiated cipher wants, 0 if we cannot do it.
+size_t KeyLenFor(uint8_t cipher)
+{
+	switch (cipher) {
+	case Cipher_AES128_GCM:
+		return KEY_LEN_AES128;
+	case Cipher_ChaCha20_Poly1305:
+		return KEY_LEN_CHACHA;
+	default:
+		return 0;
+	}
+}
+
+/**
+ * A fresh cipher object for @a cipher, or null if this build cannot do it.
+ *
+ * Both AEADs derive from AuthenticatedSymmetricCipher, so the socket layer
+ * drives either through the same incremental calls.
+ */
+std::unique_ptr<CryptoPP::AuthenticatedSymmetricCipher> MakeCipher(uint8_t cipher, bool encrypt)
+{
+	switch (cipher) {
+	case Cipher_AES128_GCM:
+		if (encrypt) {
+			return std::unique_ptr<CryptoPP::AuthenticatedSymmetricCipher>(
+				new CryptoPP::GCM<CryptoPP::AES>::Encryption);
+		}
+		return std::unique_ptr<CryptoPP::AuthenticatedSymmetricCipher>(
+			new CryptoPP::GCM<CryptoPP::AES>::Decryption);
+	case Cipher_ChaCha20_Poly1305:
+		if (encrypt) {
+			return std::unique_ptr<CryptoPP::AuthenticatedSymmetricCipher>(
+				new CryptoPP::ChaCha20Poly1305::Encryption);
+		}
+		return std::unique_ptr<CryptoPP::AuthenticatedSymmetricCipher>(
+			new CryptoPP::ChaCha20Poly1305::Decryption);
+	default:
+		return nullptr;
+	}
+}
+
+} // namespace
+
+bool HasHardwareAES()
+{
+	// The availability macros say whether the build has the code path; the Has*
+	// calls whether the CPU has the instructions. Both must hold, and cryptopp
+	// dispatches on the same answer.
+#if defined(CRYPTOPP_AESNI_AVAILABLE)
+	return CryptoPP::HasAESNI();
+#elif defined(CRYPTOPP_ARM_AES_AVAILABLE) || defined(CRYPTOPP_POWER8_AES_AVAILABLE)
+	return CryptoPP::HasAES();
+#else
+	return false;
+#endif
+}
+
+std::vector<uint8_t> SupportedCiphers()
+{
+	return SupportedCiphers(HasHardwareAES());
+}
+
+std::vector<uint8_t> SupportedCiphers(bool preferAES)
+{
+	std::vector<uint8_t> out;
+	// Preferred cipher first, but the final choice is made by the server
+	if (preferAES) {
+		out.push_back(Cipher_AES128_GCM);
+		out.push_back(Cipher_ChaCha20_Poly1305);
+	} else {
+		out.push_back(Cipher_ChaCha20_Poly1305);
+		out.push_back(Cipher_AES128_GCM);
+	}
+	return out;
+}
+
+bool IsCipherSupported(uint8_t cipher)
+{
+	return KeyLenFor(cipher) != 0;
+}
+
+const char *CipherName(uint8_t cipher)
+{
+	switch (cipher) {
+	case Cipher_AES128_GCM:
+		return "AES-128-GCM";
+	case Cipher_ChaCha20_Poly1305:
+		return "ChaCha20-Poly1305";
+	case Cipher_None:
+		return "none";
+	default:
+		return "unknown";
+	}
+}
+
+std::vector<uint8_t> RandomBytes(size_t count)
+{
+	std::vector<uint8_t> out(count, 0);
+	try {
+		CryptoPP::AutoSeededRandomPool rng;
+		rng.GenerateBlock(out.data(), out.size());
+	} catch (const CryptoPP::Exception &) {
+		out.clear();
+	}
+	return out;
+}
+
+void SecureWipe(uint8_t *p, size_t n)
+{
+	if (p != nullptr && n != 0) {
+		// Volatile-based, so the optimiser cannot drop it as a dead store the
+		// way it can a plain std::fill / memset on a buffer about to be freed.
+		CryptoPP::SecureWipeBuffer(p, n);
+	}
+}
+
+void SecureWipe(std::vector<uint8_t> &v)
+{
+	SecureWipe(v.data(), v.size());
+	v.clear();
+}
+
+std::vector<uint8_t> HkdfSha256(const std::vector<uint8_t> &ikm,
+	const std::vector<uint8_t> &salt,
+	const std::vector<uint8_t> &info,
+	size_t outLen)
+{
+	std::vector<uint8_t> out;
+	// RFC 5869 caps the output at 255 hash lengths; nothing here comes close,
+	// but honour it rather than silently truncating the counter byte.
+	if (outLen == 0 || outLen > 255 * SHA256_LEN) {
+		return out;
+	}
+	try {
+		// The length guard above stays: DeriveKey throws on an over-long request
+		// and callers here expect an empty vector.
+		out.resize(outLen);
+		CryptoPP::HKDF<CryptoPP::SHA256> hkdf;
+		hkdf.DeriveKey(out.data(),
+			out.size(),
+			ikm.data(),
+			ikm.size(),
+			salt.data(),
+			salt.size(),
+			info.data(),
+			info.size());
+	} catch (const CryptoPP::Exception &) {
+		out.clear();
+	}
+	return out;
+}
+
+bool GenerateX25519KeyPair(std::vector<uint8_t> &privOut, std::vector<uint8_t> &pubOut)
+{
+	privOut.clear();
+	pubOut.clear();
+	try {
+		CryptoPP::AutoSeededRandomPool rng;
+		CryptoPP::x25519 dh;
+		std::vector<uint8_t> priv(dh.PrivateKeyLength(), 0);
+		std::vector<uint8_t> pub(dh.PublicKeyLength(), 0);
+		dh.GeneratePrivateKey(rng, priv.data());
+		dh.GeneratePublicKey(rng, priv.data(), pub.data());
+		privOut.swap(priv);
+		pubOut.swap(pub);
+	} catch (const CryptoPP::Exception &) {
+		privOut.clear();
+		pubOut.clear();
+		return false;
+	}
+	return true;
+}
+
+bool X25519Agree(const std::vector<uint8_t> &priv,
+	const std::vector<uint8_t> &peerPub,
+	std::vector<uint8_t> &sharedOut)
+{
+	sharedOut.clear();
+	if (priv.size() != X25519_KEY_LEN || peerPub.size() != X25519_KEY_LEN) {
+		return false;
+	}
+	try {
+		CryptoPP::x25519 dh;
+		std::vector<uint8_t> shared(dh.AgreedValueLength(), 0);
+		// validateOtherPublicKey: reject the low-order points that force a
+		// known shared secret regardless of our private key.
+		if (!dh.Agree(shared.data(), priv.data(), peerPub.data(), true)) {
+			return false;
+		}
+		// Belt and braces on top of that validation: an all-zero secret would
+		// key every such session identically, so refuse it outright rather
+		// than trust one library's definition of a degenerate point.
+		uint8_t acc = 0;
+		for (const uint8_t b : shared) {
+			acc = (uint8_t)(acc | b);
+		}
+		if (acc == 0) {
+			return false;
+		}
+		sharedOut.swap(shared);
+	} catch (const CryptoPP::Exception &) {
+		sharedOut.clear();
+		return false;
+	}
+	return true;
+}
+
+std::vector<uint8_t> BuildTranscript(const std::vector<uint8_t> &offeredCiphers,
+	uint8_t chosenCipher,
+	const std::vector<uint8_t> &clientNonce,
+	const std::vector<uint8_t> &serverNonce,
+	const std::vector<uint8_t> &clientPub,
+	const std::vector<uint8_t> &serverPub)
+{
+	// Truncation here would be a silent mismatch rather than a failure, so cap
+	// the list instead: no build offers anything close to 255 ciphers. The
+	// count and the bytes must come from one value, or a list longer than the
+	// cap would announce one length and carry another.
+	const size_t cipherCount = std::min<size_t>(offeredCiphers.size(), 255);
+	// Sized in one shot and filled by copy rather than reserve()+push_back()/insert():
+	// the latter pattern trips a GCC -O3 -Wfree-nonheap-object false positive
+	// (GCC inlines the vector's growth-guard cleanup and loses track of the
+	// pointer's provenance) even though capacity is never exceeded.
+	std::vector<uint8_t> out(2 + cipherCount + clientNonce.size() + serverNonce.size() +
+				 clientPub.size() + serverPub.size());
+	auto it = out.begin();
+	*it++ = (uint8_t)cipherCount;
+	it = std::copy_n(offeredCiphers.begin(), cipherCount, it);
+	*it++ = chosenCipher;
+	it = std::copy(clientNonce.begin(), clientNonce.end(), it);
+	it = std::copy(serverNonce.begin(), serverNonce.end(), it);
+	it = std::copy(clientPub.begin(), clientPub.end(), it);
+	std::copy(serverPub.begin(), serverPub.end(), it);
+	return out;
+}
+
+std::vector<uint8_t> ConfirmTag(
+	const std::vector<uint8_t> &secret, const std::vector<uint8_t> &transcript, const char *label)
+{
+	const size_t labelLen = label ? strlen(label) : 0;
+	const std::vector<uint8_t> info((const uint8_t *)label, (const uint8_t *)label + labelLen);
+	// Credential as keying material, transcript as salt: extract-then-expand
+	// over the transcript is a MAC of it under the credential, which is all a
+	// confirmation needs and avoids introducing a second primitive.
+	return HkdfSha256(secret, transcript, info, CONFIRM_TAG_LEN);
+}
+
+bool ConstantTimeEquals(const std::vector<uint8_t> &a, const std::vector<uint8_t> &b)
+{
+	if (a.size() != b.size() || a.empty()) {
+		return false;
+	}
+	uint8_t diff = 0;
+	for (size_t i = 0; i < a.size(); ++i) {
+		diff = (uint8_t)(diff | (ai ^ bi));
+	}
+	return diff == 0;
+}
+
+/// The in-flight cipher objects, one per direction and per packet.
+struct Session::StreamState
+{
+	std::unique_ptr<CryptoPP::AuthenticatedSymmetricCipher> sealer;
+	std::unique_ptr<CryptoPP::AuthenticatedSymmetricCipher> opener;
+};
+
+Session::Session()
+: m_stream(new StreamState)
+{
+}
+
+Session::~Session()
+{
+	// A defaulted destructor would free the key vectors without overwriting
+	// them; wipe the live key material first.
+	SecureWipe(m_txKey);
+	SecureWipe(m_rxKey);
+	SecureWipe(m_txPrefix, sizeof(m_txPrefix));
+	SecureWipe(m_rxPrefix, sizeof(m_rxPrefix));
+}
+
+bool Session::Init(uint8_t cipher,
+	const std::vector<uint8_t> &ikm,
+	const std::vector<uint8_t> &serverNonce,
+	const std::vector<uint8_t> &clientNonce,
+	const std::vector<uint8_t> &transcript,
+	bool isServer)
+{
+	m_active = false;
+	const size_t keyLen = KeyLenFor(cipher);
+	if (keyLen == 0 || serverNonce.size() != NONCE_TAG_LEN || clientNonce.size() != NONCE_TAG_LEN) {
+		return false;
+	}
+
+	// salt = server nonce || client nonce; both sides contribute, so neither
+	// can pin the derivation on its own.
+	std::vector<uint8_t> salt;
+	salt.reserve(serverNonce.size() + clientNonce.size());
+	salt.insert(salt.end(), serverNonce.begin(), serverNonce.end());
+	salt.insert(salt.end(), clientNonce.begin(), clientNonce.end());
+
+	// info = label || cipher || transcript. Binding the transcript is what
+	// makes a stripped capability tag fail closed rather than downgrade.
+	static const char LABEL = "aMule EC AEAD v1";
+	std::vector<uint8_t> info(LABEL, LABEL + sizeof(LABEL) - 1);
+	info.push_back(cipher);
+	info.insert(info.end(), transcript.begin(), transcript.end());
+
+	const size_t need = keyLen * 2 + 8; // two keys + two 4-byte nonce prefixes
+	std::vector<uint8_t> okm = HkdfSha256(ikm, salt, info, need);
+	if (okm.size() != need) {
+		return false;
+	}
+
+	// Client-to-server material first, then server-to-client; each side picks
+	// its transmit half from the same layout.
+	const uint8_t *c2sKey = okm.data();
+	const uint8_t *s2cKey = okm.data() + keyLen;
+	const uint8_t *c2sPrefix = okm.data() + keyLen * 2;
+	const uint8_t *s2cPrefix = okm.data() + keyLen * 2 + 4;
+
+	if (isServer) {
+		m_txKey.assign(s2cKey, s2cKey + keyLen);
+		m_rxKey.assign(c2sKey, c2sKey + keyLen);
+		std::memcpy(m_txPrefix, s2cPrefix, sizeof(m_txPrefix));
+		std::memcpy(m_rxPrefix, c2sPrefix, sizeof(m_rxPrefix));
+	} else {
+		m_txKey.assign(c2sKey, c2sKey + keyLen);
+		m_rxKey.assign(s2cKey, s2cKey + keyLen);
+		std::memcpy(m_txPrefix, c2sPrefix, sizeof(m_txPrefix));
+		std::memcpy(m_rxPrefix, s2cPrefix, sizeof(m_rxPrefix));
+	}
+
+	// The directional keys and prefixes are copied out above; the buffer that
+	// briefly held both, plus the caller's ikm copy, is no longer needed.
+	SecureWipe(okm);
+
+	m_cipher = cipher;
+	m_txCounter = 0;
+	m_rxCounter = 0;
+	m_active = true;
+	return true;
+}
+
+void Session::Reset()
+{
+	m_active = false;
+	m_cipher = Cipher_None;
+	SecureWipe(m_txKey);
+	SecureWipe(m_rxKey);
+	SecureWipe(m_txPrefix, sizeof(m_txPrefix));
+	SecureWipe(m_rxPrefix, sizeof(m_rxPrefix));
+	m_txCounter = 0;
+	m_rxCounter = 0;
+	m_stream->sealer.reset();
+	m_stream->opener.reset();
+}
+
+std::vector<uint8_t> Session::BuildNonce(const uint8_t *prefix, uint64_t counter) const
+{
+	std::vector<uint8_t> nonce(AEAD_NONCE_LEN, 0);
+	std::memcpy(nonce.data(), prefix, 4);
+	for (int i = 0; i < 8; ++i) {
+		// big-endian counter in the low 8 bytes
+		nonce4 + i = static_cast<uint8_t>((counter >> (8 * (7 - i))) & 0xFF);
+	}
+	return nonce;
+}
+
+bool Session::SealBegin()
+{
+	if (!m_active) {
+		return false;
+	}
+	try {
+		m_stream->sealer = MakeCipher(m_cipher, true);
+		if (!m_stream->sealer) {
+			return false;
+		}
+		const std::vector<uint8_t> nonce = BuildNonce(m_txPrefix, m_txCounter);
+		m_stream->sealer->SetKeyWithIV(m_txKey.data(), m_txKey.size(), nonce.data(), nonce.size());
+		return true;
+	} catch (const CryptoPP::Exception &) {
+		m_stream->sealer.reset();
+		return false;
+	}
+}
+
+bool Session::SealUpdate(uint8_t *data, size_t len)
+{
+	if (!m_stream->sealer) {
+		return false;
+	}
+	if (len == 0) {
+		return true;
+	}
+	try {
+		m_stream->sealer->ProcessString(data, len);
+		return true;
+	} catch (const CryptoPP::Exception &) {
+		m_stream->sealer.reset();
+		return false;
+	}
+}
+
+bool Session::SealFinal(uint8_t *tagOut)
+{
+	if (!m_stream->sealer) {
+		return false;
+	}
+	try {
+		m_stream->sealer->Final(tagOut);
+		m_stream->sealer.reset();
+		++m_txCounter;
+		return true;
+	} catch (const CryptoPP::Exception &) {
+		m_stream->sealer.reset();
+		return false;
+	}
+}
+
+bool Session::OpenBegin()
+{
+	if (!m_active) {
+		return false;
+	}
+	try {
+		m_stream->opener = MakeCipher(m_cipher, false);
+		if (!m_stream->opener) {
+			return false;
+		}
+		const std::vector<uint8_t> nonce = BuildNonce(m_rxPrefix, m_rxCounter);
+		m_stream->opener->SetKeyWithIV(m_rxKey.data(), m_rxKey.size(), nonce.data(), nonce.size());
+		return true;
+	} catch (const CryptoPP::Exception &) {
+		m_stream->opener.reset();
+		return false;
+	}
+}
+
+bool Session::OpenUpdate(uint8_t *data, size_t len)
+{
+	if (!m_stream->opener) {
+		return false;
+	}
+	if (len == 0) {
+		return true;
+	}
+	try {
+		m_stream->opener->ProcessString(data, len);
+		return true;
+	} catch (const CryptoPP::Exception &) {
+		m_stream->opener.reset();
+		return false;
+	}
+}
+
+bool Session::OpenFinal(const uint8_t *tag)
+{
+	if (!m_stream->opener) {
+		return false;
+	}
+	bool ok = false;
+	try {
+		ok = m_stream->opener->Verify(tag);
+	} catch (const CryptoPP::Exception &) {
+		ok = false;
+	}
+	m_stream->opener.reset();
+	if (ok) {
+		++m_rxCounter;
+	}
+	// On failure the counter deliberately does not advance: the stream is no
+	// longer trustworthy and the caller drops the connection.
+	return ok;
+}
+
+bool Session::Seal(const uint8_t *plain, size_t len, std::vector<uint8_t> &out)
+{
+	if (!SealBegin()) {
+		return false;
+	}
+	out.assign(plain, plain + len);
+	out.resize(len + AEAD_TAG_LEN, 0);
+	if (!SealUpdate(out.data(), len) || !SealFinal(out.data() + len)) {
+		out.clear();
+		return false;
+	}
+	return true;
+}
+
+bool Session::Open(const uint8_t *sealed, size_t len, std::vector<uint8_t> &out)
+{
+	if (len < AEAD_TAG_LEN) {
+		return false;
+	}
+	const size_t bodyLen = len - AEAD_TAG_LEN;
+	if (!OpenBegin()) {
+		return false;
+	}
+	out.assign(sealed, sealed + bodyLen);
+	if (!OpenUpdate(out.data(), bodyLen) || !OpenFinal(sealed + bodyLen)) {
+		out.clear();
+		return false;
+	}
+	return true;
+}
+
+} // namespace ECCrypt

amule-3.1.0.tar.gz/src/libs/ec/cpp/ECCrypt.h Added

@@ -0,0 +1,275 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 ECCRYPT_H
+#define ECCRYPT_H
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
+/**
+ * Authenticated encryption for the External Connect packet layer.
+ *
+ * The session key comes from an ephemeral X25519 exchange, so a recorded
+ * session cannot be decrypted later even by someone who by then holds the EC
+ * password: the keys that opened it existed only for its duration.
+ *
+ * A raw exchange authenticates nobody, so an active man in the middle could run
+ * one exchange with each side and relay. The shared password closes that through
+ * the confirmation tags below: each side proves it knows the password over the
+ * exact handshake it saw, and a relay's two handshakes differ, so at least one
+ * check fails. No certificates needed.
+ *
+ * No new dependency: the `ec` library already links Crypto++, which also backs
+ * aMule's eD2k obfuscation, secure identification and the webserver's HMAC.
+ */
+namespace ECCrypt
+{
+
+/// Wire ids for the AEAD, carried in EC_TAG_AEAD_CIPHER.
+enum Cipher : uint8_t
+{
+	Cipher_None = 0,
+	/// Mandatory baseline: present in every Crypto++ we accept.
+	Cipher_AES128_GCM = 1,
+	/// Preferred where available: roughly 2.6x faster than AES-GCM without
+	/// hardware AES, which is every Raspberry Pi up to the 4. Needs Crypto++
+	/// 8.1, aMule's minimum, so it is always compiled in and just negotiated.
+	Cipher_ChaCha20_Poly1305 = 2
+};
+
+/// Handshake nonce length, per side (EC_TAG_AEAD_{CLIENT,SERVER}_NONCE).
+const size_t NONCE_TAG_LEN = 32;
+/// AEAD tag appended to every sealed body.
+const size_t AEAD_TAG_LEN = 16;
+
+/// Whether this CPU runs AES in hardware *and* cryptopp will dispatch to it.
+/// Both matter: where cryptopp's detection comes up empty it falls back to
+/// table-based AES, so asking the CPU alone would prefer a software cipher.
+bool HasHardwareAES();
+
+/// Ciphers this build can actually do, strongest/fastest first. The server
+/// picks the first entry the client also offered. AES leads when it is
+/// hardware-backed, ChaCha20 otherwise -- see HasHardwareAES().
+std::vector<uint8_t> SupportedCiphers();
+
+/// SupportedCiphers() with the hardware question answered explicitly, so both
+/// orderings are testable anywhere. An overload rather than a default argument:
+/// a default would pull HasHardwareAES()'s definition into every caller.
+std::vector<uint8_t> SupportedCiphers(bool preferAES);
+
+/// Whether this build can do @a cipher at all.
+bool IsCipherSupported(uint8_t cipher);
+
+/// Human name for logging; "unknown" for anything unrecognised.
+const char *CipherName(uint8_t cipher);
+
+/// @a count cryptographically random bytes. Empty on failure.
+std::vector<uint8_t> RandomBytes(size_t count);
+
+/// Overwrite with a wipe the optimiser may not elide (unlike std::fill on a
+/// buffer about to be freed), then clear. For private keys and the shared
+/// secret, so a later memory disclosure cannot recover them.
+void SecureWipe(std::vector<uint8_t> &v);
+void SecureWipe(uint8_t *p, size_t n);
+
+/**
+ * HKDF-SHA256 (RFC 5869), extract-then-expand.
+ *
+ * Wraps Crypto++'s hkdf.h for the vector-in/vector-out shape used here, and
+ * enforces the RFC length cap rather than letting it surface as an exception.
+ */
+std::vector<uint8_t> HkdfSha256(const std::vector<uint8_t> &ikm,
+	const std::vector<uint8_t> &salt,
+	const std::vector<uint8_t> &info,
+	size_t outLen);
+
+/// Length of an X25519 public key, private key and shared secret alike.
+constexpr size_t X25519_KEY_LEN = 32;
+
+/**
+ * Generate an ephemeral X25519 key pair.
+ *
+ * The private key never leaves the process, is never written anywhere, and is
+ * discarded once the session key is derived. That is what gives forward secrecy.
+ *
+ * @return false if randomness is unavailable; both outputs are cleared and the
+ *         caller must stay in clear rather than use a predictable key.
+ */
+bool GenerateX25519KeyPair(std::vector<uint8_t> &privOut, std::vector<uint8_t> &pubOut);
+
+/**
+ * X25519 shared secret from our private key and the peer's public key.
+ *
+ * An all-zero secret, which a peer can force with a low-order point, is
+ * rejected: it would key every such session identically.
+ *
+ * @return false on a malformed or degenerate peer key; @a sharedOut is cleared.
+ */
+bool X25519Agree(const std::vector<uint8_t> &priv,
+	const std::vector<uint8_t> &peerPub,
+	std::vector<uint8_t> &sharedOut);
+
+/**
+ * The handshake transcript both sides bind into their derivations.
+ *
+ * One definition rather than one per side: the ends must agree byte for byte,
+ * and two copies of the same concatenation drift when a field is added later.
+ *
+ * The cipher list is length-prefixed so no two handshakes can flatten to the
+ * same bytes; with a bare concatenation the boundary is only implied.
+ */
+std::vector<uint8_t> BuildTranscript(const std::vector<uint8_t> &offeredCiphers,
+	uint8_t chosenCipher,
+	const std::vector<uint8_t> &clientNonce,
+	const std::vector<uint8_t> &serverNonce,
+	const std::vector<uint8_t> &clientPub,
+	const std::vector<uint8_t> &serverPub);
+
+/**
+ * Key-confirmation tag proving knowledge of the EC credential.
+ *
+ * The channel key comes from the ephemeral exchange alone, so the password no
+ * longer stops an active man in the middle, who can complete two exchanges and
+ * relay. The tag catches that: it binds the credential to the transcript, which
+ * differs on the two legs of a relay, so at least one check fails.
+ *
+ * Built from the existing HKDF rather than a separate HMAC: extract-then-expand
+ * with the credential as keying material is a MAC over the transcript, and
+ * reusing it keeps the crypto surface to what is already reviewed.
+ *
+ * @param label direction tag, so the two sides' confirmations differ and one
+ *              cannot be replayed as the other.
+ */
+std::vector<uint8_t> ConfirmTag(
+	const std::vector<uint8_t> &secret, const std::vector<uint8_t> &transcript, const char *label);
+
+/// Length of a confirmation tag.
+constexpr size_t CONFIRM_TAG_LEN = 32;
+
+/**
+ * Constant-time equality for secrets.
+ *
+ * A compare that returns early leaks, through timing, how much of a guessed tag
+ * was right, turning forgery into a per-byte search instead of a 2^256 one.
+ */
+bool ConstantTimeEquals(const std::vector<uint8_t> &a, const std::vector<uint8_t> &b);
+
+/**
+ * One direction-aware AEAD session for a single EC connection.
+ *
+ * Keys are split per direction so the two packet counters cannot collide on a
+ * nonce. The counter is implicit: TCP guarantees ordering and EC treats any
+ * desync as fatal, so carrying it would cost 8 bytes per packet and buy nothing.
+ */
+class Session
+{
+public:
+	Session();
+	~Session();
+	Session(const Session &) = delete;
+	Session &operator=(const Session &) = delete;
+
+	/**
+	 * Derive the session keys.
+	 *
+	 * @param ikm         the X25519 shared secret, deliberately not the
+	 *                    credential: keying from something that outlives the
+	 *                    session is what costs forward secrecy.
+	 * @param transcript  handshake bytes bound into the derivation, so a tampered
+	 *                    capability exchange yields a different key on each side
+	 *                    and the first tag check fails. This is the downgrade
+	 *                    defence; policy checks sit on top.
+	 * @return false if the cipher is unsupported or a nonce is the wrong size.
+	 */
+	bool Init(uint8_t cipher,
+		const std::vector<uint8_t> &ikm,
+		const std::vector<uint8_t> &serverNonce,
+		const std::vector<uint8_t> &clientNonce,
+		const std::vector<uint8_t> &transcript,
+		bool isServer);
+
+	bool IsActive() const { return m_active; }
+
+	/// Forget all key material. Used when a socket object is reused for a
+	/// fresh connection (amulegui reconnect).
+	void Reset();
+
+	uint8_t GetCipher() const { return m_cipher; }
+
+	/// Seal @a len bytes into @a out (ciphertext followed by the tag).
+	/// Convenience wrapper over the streaming calls below.
+	bool Seal(const uint8_t *plain, size_t len, std::vector<uint8_t> &out);
+
+	/// Open a sealed body. Fails on a bad tag, which is the tamper signal.
+	bool Open(const uint8_t *sealed, size_t len, std::vector<uint8_t> &out);
+
+	// --- streaming, in place -------------------------------------------
+	//
+	// The EC write path builds a packet as CQueuedData chunks and back-patches the
+	// length, so the packet is already in memory before it reaches the socket.
+	// These seal chunks in place and append the tag rather than flattening into a
+	// second buffer, which would double peak memory on exactly the huge responses
+	// the 256 MB gate exists for. The length need not be known in advance: with
+	// ZLIB the compressed size is only known once deflate finishes. Begin/Final
+	// bracket one packet and advance that direction's counter.
+
+	bool SealBegin();
+	bool SealUpdate(uint8_t *data, size_t len);
+	/// Writes AEAD_TAG_LEN bytes to @a tagOut.
+	bool SealFinal(uint8_t *tagOut);
+
+	bool OpenBegin();
+	bool OpenUpdate(uint8_t *data, size_t len);
+	/// @a tag is AEAD_TAG_LEN bytes. False means the body was tampered with.
+	bool OpenFinal(const uint8_t *tag);
+
+	/// Bytes a sealed body adds over its plaintext.
+	static size_t Overhead() { return AEAD_TAG_LEN; }
+
+private:
+	/// Holds the in-flight cryptopp cipher objects. Opaque so that including
+	/// this header does not drag cryptopp into every consumer -- ECSocket.h
+	/// includes it, and that reaches most of the EC library.
+	struct StreamState;
+
+	std::vector<uint8_t> BuildNonce(const uint8_t *prefix, uint64_t counter) const;
+
+	bool m_active = false;
+	uint8_t m_cipher = Cipher_None;
+	std::vector<uint8_t> m_txKey;
+	std::vector<uint8_t> m_rxKey;
+	uint8_t m_txPrefix4 = { 0, 0, 0, 0 };
+	uint8_t m_rxPrefix4 = { 0, 0, 0, 0 };
+	uint64_t m_txCounter = 0;
+	uint64_t m_rxCounter = 0;
+	std::unique_ptr<StreamState> m_stream;
+};
+
+} // namespace ECCrypt
+
+#endif // ECCRYPT_H

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECFileConfig.h -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECFileConfig.h Changed

@@ -22,19 +22,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#ifndef	ECFILECONFIG_H
-#define	ECFILECONFIG_H
+#ifndef ECFILECONFIG_H
+#define ECFILECONFIG_H
 
 #include <wx/fileconf.h>
 #include <wx/filename.h>
 #include <wx/utils.h>
 
-#include "MD4Hash.h"		// Needed for CMD4Hash
-#include "OtherFunctions.h"	// Needed for GetConfigDir()
-
+#include "MD4Hash.h"        // Needed for CMD4Hash
+#include "OtherFunctions.h" // Needed for GetConfigDir()
 
 /**
- * Prepends ConfigDir to filename, if it has no PathSeparator chars in it
+ * Prepends ConfigDir to filename, if it has no PathSeparator chars in it.
  */
 inline wxString FinalizeFilename(const wxString filename)
 {
@@ -47,53 +46,52 @@
 	return filename;
 }
 
-
 /**
- * Extension to wxFileConfig for reading/writing CMD4Hash values.
- *
- * This class converts between the text and binary representation of an MD4 hash,
- * and also maps empty strings to the empty hash and vica versa.
+ * Extension to wxFileConfig for reading and writing CMD4Hash values. Converts between the text and
+ * binary representation of an MD4 hash, and maps the empty string to the empty hash and back.
  */
-class CECFileConfig : public wxFileConfig {
-	public:
-
-		CECFileConfig(const wxString& localFilename = "")
-			: wxFileConfig("", "", FinalizeFilename(localFilename),
-				"", wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_RELATIVE_PATH)
-			{}
+class CECFileConfig : public wxFileConfig
+{
+public:
+	CECFileConfig(const wxString &localFilename = "")
+	: wxFileConfig("",
+		  "",
+		  FinalizeFilename(localFilename),
+		  "",
+		  wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_RELATIVE_PATH)
+	{
+	}
 
-		/**
-		 * Reads a hash from the config file
-		 *
-		 * @param key	the key to be read
-		 * @param hash	the CMD4Hash object to write the hash to
-		 *
-		 * @return true on success, false otherwise.
-		 */
-		bool	ReadHash(const wxString& key, CMD4Hash *hash)
-		{
-			wxString sHash;
-			bool retval = wxFileConfig::Read(key, &sHash, "");
-			if (sHash.IsEmpty()) {
-				hash->Clear();
-			} else {
-				hash->Decode(sHash);
-			}
-			return retval;
+	/**
+	 * Reads a hash from the config file.
+	 *
+	 * @param key      the key to be read
+	 * @param hash     the CMD4Hash object to write the hash to
+	 * @return true on success, false otherwise.
+	 */
+	bool ReadHash(const wxString &key, CMD4Hash *hash)
+	{
+		wxString sHash;
+		bool retval = wxFileConfig::Read(key, &sHash, "");
+		if (sHash.IsEmpty()) {
+			hash->Clear();
+		} else {
+			hash->Decode(sHash);
 		}
+		return retval;
+	}
 
-		/**
-		 * Writes a CMD4Hash object to the config file
-		 *
-		 * @param key	the key to write to
-		 * @param hash	the hash to be written
-		 *
-		 * @return true on success, false otherwise.
-		 */
-		bool	WriteHash(const wxString& key, const CMD4Hash& hash)
-		{
-			return wxFileConfig::Write(key, hash.IsEmpty() ? wxString("") : hash.Encode());
-		}
+	/**
+	 * Writes a CMD4Hash object to the config file.
+	 *
+	 * @param key      the key to write to
+	 * @param hash     the hash to be written
+	 * @return true on success, false otherwise.
+	 */
+	bool WriteHash(const wxString &key, const CMD4Hash &hash)
+	{
+		return wxFileConfig::Write(key, hash.IsEmpty() ? wxString("") : hash.Encode());
+	}
 };
 
 #endif /* ECFILECONFIG_H */

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECID.h -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECID.h Changed

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECLog.h -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECLog.h Changed

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECMemSocket.cpp -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECMemSocket.cpp Changed

@@ -20,24 +20,20 @@
 
 #include "ECMemSocket.h"
 
-#include "ECCodes.h"		// Needed for EC_FLAG_*
-
+#include "ECCodes.h" // Needed for EC_FLAG_*
 
 CECMemSocket::CECMemSocket()
-:
-	CECSocket(false)
+: CECSocket(false)
 {
-	// Lock the canonical wire format the cache assumes its consumers can
-	// decode: UTF-8 numbers + sentinel-extended children count, no zlib.
-	// Both capability flags are advertised by every modern client; the
-	// cached bytes are reusable regardless of which connection ends up
-	// writing them out (per-connection compression is layered on by the
-	// real socket's WriteBuffer at send time, separately from this).
+	// Lock the canonical wire format the cache assumes its consumers can decode: UTF-8 numbers
+	// + sentinel-extended children count, no zlib. Every modern client advertises both
+	// capability flags, so the cached bytes are reusable whichever connection writes them out.
+	// Per-connection compression is layered on separately by the real socket's WriteBuffer at
+	// send time.
 	m_my_flags |= EC_FLAG_UTF8_NUMBERS | EC_FLAG_LARGE_TAG_COUNT;
 	SetTxFlags(m_my_flags);
 }
 
-
 uint32 CECMemSocket::InternalWrite(const void *ptr, uint32 len)
 {
 	const unsigned char *p = static_cast<const unsigned char *>(ptr);
@@ -45,20 +41,17 @@
 	return len;
 }
 
-
 std::vector<unsigned char> CECMemSocket::SerializeTag(const CECTag &tag)
 {
 	CECMemSocket mem;
-	// Walk the tag into the per-instance buffer chain. Serialize emits
-	// name + type + length + body + nested children — a self-contained
-	// blob that can be re-inserted as a child of any later response by
-	// just writing the bytes through a real connection's WriteBuffer.
+	// Walk the tag into the per-instance buffer chain. Serialize emits name + type + length +
+	// body + nested children -- a self-contained blob that can be re-inserted as a child of any
+	// later response by writing the bytes through a real connection's WriteBuffer.
 	tag.Serialize(mem);
-	// Tag serialization does not zlib-encode (we asked for raw bytes by
-	// keeping EC_FLAG_ZLIB out of m_tx_flags), so FlushBuffers has no
-	// trailing deflate state to flush — but it does cycle the in-flight
+	// Tag serialization does not zlib-encode, EC_FLAG_ZLIB being kept out of m_tx_flags, so
+	// FlushBuffers has no trailing deflate state to flush -- but it does cycle the in-flight
 	// CQueuedData into m_output_queue, which is what we drain next.
 	mem.FlushBuffers();
-	mem.OnOutput();		// drains m_output_queue → InternalWrite → m_bytes
+	mem.OnOutput(); // drains m_output_queue → InternalWrite → m_bytes
 	return mem.TakeBytes();
 }

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECMemSocket.h -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECMemSocket.h Changed

@@ -26,33 +26,28 @@
 
 #include <vector>
 
-
 /**
- * In-memory CECSocket sink. All Internal* I/O is stubbed; bytes that
- * the upper layers would have written to a real socket are captured
- * into an in-memory vector instead.
+ * In-memory CECSocket sink. All Internal* I/O is stubbed; bytes the upper layers would have written
+ * to a real socket are captured into an in-memory vector instead.
  *
- * Intended use is daemon-internal pre-serialization: build a CECTag
- * tree, call `tag.Serialize(mem)` against an instance of this class,
- * then take the captured bytes for caching. The cached bytes are
- * later written back through a real connection's CECSocket via
- * `WriteBuffer` (which applies per-connection deflate when required),
- * so the cached format must match what a remote receiver expects.
+ * Intended use is daemon-internal pre-serialization: build a CECTag tree, call `tag.Serialize(mem)`
+ * against an instance of this class, then take the captured bytes for caching. The cached bytes are
+ * later written back through a real connection's CECSocket via `WriteBuffer`, which applies per-
+ * connection deflate when required, so the cached format must match what a remote receiver expects.
  *
- * Wire format used by the captured bytes: UTF-8 numbers +
- * LARGE_TAG_COUNT, no zlib. Every modern EC client advertises both
- * capability flags, so cached blobs are reusable across any client
- * the daemon talks to today.
+ * Wire format of the captured bytes: UTF-8 numbers + LARGE_TAG_COUNT, no zlib. Every modern EC
+ * client advertises both capability flags, so cached blobs are reusable across any client the
+ * daemon talks to today.
  */
-class CECMemSocket : public CECSocket {
+class CECMemSocket : public CECSocket
+{
 public:
 	CECMemSocket();
 
 	/**
-	 * Serialize a single tag (name + type + length + body + nested
-	 * children) into a stand-alone byte vector. The bytes can later
-	 * be re-emitted on a real CECSocket via `WriteBuffer` as a single
-	 * child slot inside a larger response.
+	 * Serialize a single tag (name + type + length + body + nested children) into a stand-alone
+	 * byte vector. The bytes can later be re-emitted on a real CECSocket via `WriteBuffer` as a
+	 * single child slot inside a larger response.
 	 */
 	static std::vector<unsigned char> SerializeTag(const CECTag &tag);
 
@@ -63,14 +58,14 @@
 private:
 	std::vector<unsigned char> m_bytes;
 
-	// CECSocket virtuals — every actual I/O hook is a no-op except
+	// CECSocket virtuals -- every actual I/O hook is a no-op except
 	// InternalWrite, which appends to m_bytes.
 	void WriteDoneAndQueueEmpty() override {}
 	bool InternalConnect(uint32_t, uint16_t, bool) override { return true; }
 	bool InternalWaitOnConnect(long, long) override { return true; }
 	bool InternalWaitForWrite(long, long) override { return true; }
 	bool InternalWaitForRead(long, long) override { return true; }
-	int  InternalGetLastError() override { return 0; }
+	int InternalGetLastError() override { return 0; }
 	void InternalClose() override {}
 	bool InternalError() override { return false; }
 	uint32 InternalRead(void *, uint32) override { return 0; }
@@ -79,5 +74,4 @@
 	void InternalDestroy() override {}
 };
 
-
 #endif // EC_MEM_SOCKET_H

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECMuleSocket.cpp -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECMuleSocket.cpp Changed

@@ -30,42 +30,36 @@
 
 #include <boost/system/error_code.hpp>
 
-//
 // CECMuleSocket API - User interface functions
-//
 
 CECMuleSocket::CECMuleSocket(bool use_events)
-:
-CECSocket(use_events)
+: CECSocket(use_events)
 {
 	Notify(use_events);
 }
 
-CECMuleSocket::~CECMuleSocket()
-{
-}
+CECMuleSocket::~CECMuleSocket() {}
 
-bool CECMuleSocket::ConnectSocket(amuleIPV4Address& address)
+bool CECMuleSocket::ConnectSocket(amuleIPV4Address &address)
 {
-	return CECSocket::ConnectSocket(StringIPtoUint32(address.IPAddress()),address.Service());
+	return CECSocket::ConnectSocket(StringIPtoUint32(address.IPAddress()), address.Service());
 }
 
+// EC-connection keepalive timings. With these values a half-open connection (peer crashed, network
+// blip, FIN lost) is torn down at the TCP layer in ~60s instead of sitting idle until the default
+// ~2h TCP retransmit timeout, so CECSocket::OnLost fires and the GUI can flip to "Connection lost"
+// instead of looking wedged. CECServerSocket uses the same constants on the amuled side, so
+// detection is symmetric. The numbers balance responsiveness against keepalive packet overhead: one
+// probe per 10s after 30s idle.
+namespace
+{
+const int EC_KEEPALIVE_IDLE_SEC = 30;
+const int EC_KEEPALIVE_INTERVAL_SEC = 10;
+const int EC_KEEPALIVE_PROBE_COUNT = 3;
+} // namespace
 
-// EC-connection keepalive timings. With these values, a half-open
-// connection (peer crashed / network blip / FIN lost) is torn down at
-// the TCP layer in ~60s instead of sitting idle until the default
-// ~2h TCP retransmit timeout, so CECSocket::OnLost fires and the GUI
-// can flip to "Connection lost" instead of looking wedged. Same
-// constants used by CECServerSocket on the amuled side so detection
-// is symmetric. Numbers picked to balance responsiveness against the
-// keepalive packet overhead (one probe per 10s after 30s idle).
-namespace {
-	const int EC_KEEPALIVE_IDLE_SEC      = 30;
-	const int EC_KEEPALIVE_INTERVAL_SEC  = 10;
-	const int EC_KEEPALIVE_PROBE_COUNT   = 3;
-}
-
-bool CECMuleSocket::InternalConnect(uint32_t ip, uint16_t port, bool wait) {
+bool CECMuleSocket::InternalConnect(uint32_t ip, uint16_t port, bool wait)
+{
 	amuleIPV4Address addr;
 	addr.Hostname(Uint32toStringIP(ip));
 	addr.Service(port);
@@ -73,52 +67,59 @@
 	if (ok) {
 		// Asio opens the socket fd during connect / async_connect, so
 		// setsockopt is valid here regardless of sync vs async mode.
-		ApplyEcKeepalive();
+		ApplyEcSocketOptions();
 	}
 	return ok;
 }
 
-void CECMuleSocket::ApplyEcKeepalive() {
+void CECMuleSocket::ApplyEcSocketOptions()
+{
 	CLibSocket::EnableTcpKeepalive(
-		EC_KEEPALIVE_IDLE_SEC,
-		EC_KEEPALIVE_INTERVAL_SEC,
-		EC_KEEPALIVE_PROBE_COUNT);
+		EC_KEEPALIVE_IDLE_SEC, EC_KEEPALIVE_INTERVAL_SEC, EC_KEEPALIVE_PROBE_COUNT);
+	// EC is request/response over a connection that stays open for the life of the client, and
+	// CECSocket::WritePacket emits each packet as several small writes (one
+	// EC_SOCKET_BUFFER_SIZE block per fragment plus the 16-byte AEAD tag as its own chunk).
+	// With Nagle on, every trailing write waits for the peer to ACK the previous one, and the
+	// peer has nothing to send back yet, so its delayed-ACK timer fires first: ~40 ms added per
+	// direction per roundtrip, whatever the payload size. There is nothing to coalesce here
+	// anyway -- the next write is the answer to a reply we have not received yet.
+	CLibSocket::EnableTcpNoDelay();
 }
 
 int CECMuleSocket::InternalGetLastError()
 {
 	switch (LastError()) {
-		case boost::system::errc::success:
-			return EC_ERROR_NOERROR;
-		case boost::system::errc::address_family_not_supported:
-		case boost::system::errc::address_in_use:
-		case boost::system::errc::address_not_available:
-		case boost::system::errc::bad_address:
-		case boost::system::errc::invalid_argument:
-			return EC_ERROR_INVADDR;
-		case boost::system::errc::already_connected:
-		case boost::system::errc::connection_already_in_progress:
-		case boost::system::errc::not_connected:
-			return EC_ERROR_INVOP;
-		case boost::system::errc::connection_aborted:
-		case boost::system::errc::connection_reset:
-		case boost::system::errc::io_error:
-		case boost::system::errc::network_down:
-		case boost::system::errc::network_reset:
-		case boost::system::errc::network_unreachable:
-			return EC_ERROR_IOERR;
-		case boost::system::errc::connection_refused:
-		case boost::system::errc::host_unreachable:
-			return EC_ERROR_NOHOST;
-		case boost::system::errc::not_a_socket:
-			return EC_ERROR_INVSOCK;
-		case boost::system::errc::not_enough_memory:
-			return EC_ERROR_MEMERR;
-		case boost::system::errc::operation_would_block:
-			return EC_ERROR_WOULDBLOCK;
-		case boost::system::errc::timed_out:
-			return EC_ERROR_TIMEDOUT;
-		default:
-			return EC_ERROR_UNKNOWN;
+	case boost::system::errc::success:
+		return EC_ERROR_NOERROR;
+	case boost::system::errc::address_family_not_supported:
+	case boost::system::errc::address_in_use:
+	case boost::system::errc::address_not_available:
+	case boost::system::errc::bad_address:
+	case boost::system::errc::invalid_argument:
+		return EC_ERROR_INVADDR;
+	case boost::system::errc::already_connected:
+	case boost::system::errc::connection_already_in_progress:
+	case boost::system::errc::not_connected:
+		return EC_ERROR_INVOP;
+	case boost::system::errc::connection_aborted:
+	case boost::system::errc::connection_reset:
+	case boost::system::errc::io_error:
+	case boost::system::errc::network_down:
+	case boost::system::errc::network_reset:
+	case boost::system::errc::network_unreachable:
+		return EC_ERROR_IOERR;
+	case boost::system::errc::connection_refused:
+	case boost::system::errc::host_unreachable:
+		return EC_ERROR_NOHOST;
+	case boost::system::errc::not_a_socket:
+		return EC_ERROR_INVSOCK;
+	case boost::system::errc::not_enough_memory:
+		return EC_ERROR_MEMERR;
+	case boost::system::errc::operation_would_block:
+		return EC_ERROR_WOULDBLOCK;
+	case boost::system::errc::timed_out:
+		return EC_ERROR_TIMEDOUT;
+	default:
+		return EC_ERROR_UNKNOWN;
 	}
 }

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECMuleSocket.h -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECMuleSocket.h Changed

@@ -30,58 +30,63 @@
 #include "ECSocket.h"
 
 /*! \class CECMuleSocket
- *
- * \brief Socket handler for External Communications (EC)
+ *  \brief Socket handler for External Communications (EC)
  */
 
-class CECMuleSocket : public CECSocket,  public CLibSocket {
+class CECMuleSocket : public CECSocket, public CLibSocket
+{
 public:
 	CECMuleSocket(bool use_events);
 	virtual ~CECMuleSocket();
 
-	bool ConnectSocket(class amuleIPV4Address& address);
+	bool ConnectSocket(class amuleIPV4Address &address);
 
-	virtual void OnConnect()	{}					// This is overwritten in RemoteConnect
-	virtual void OnConnect(int)	{ OnConnect(); }	// This is called from LibSocketAsio
-	virtual void OnSend(int)	{ OnOutput(); }
-	virtual void OnReceive(int)	{ OnInput(); }
-	// CLibSocket::OnLost(int) fires from the Asio reactor when the
-	// peer FIN reaches our kernel (HandleRead returning bytes=0 or
-	// an EOF error_code). Forward to the EC-layer CECSocket::OnLost()
-	// virtual so CRemoteConnect / CECServerSocket overrides actually
-	// run — without this the empty CLibSocket::OnLost(int){} default
-	// would swallow the notification and the UI would stay "connected"
-	// even after the connection died at the TCP layer.
+	virtual void OnConnect() {}                  // This is overwritten in RemoteConnect
+	virtual void OnConnect(int) { OnConnect(); } // This is called from LibSocketAsio
+	virtual void OnSend(int) { OnOutput(); }
+	virtual void OnReceive(int) { OnInput(); }
+	// CLibSocket::OnLost(int) fires from the Asio reactor when the peer FIN reaches our kernel
+	// (HandleRead returning bytes=0 or an EOF error_code). Forward to the EC-layer
+	// CECSocket::OnLost() virtual so CRemoteConnect / CECServerSocket overrides actually run --
+	// without this the empty CLibSocket::OnLost(int){} default would swallow the notification
+	// and the UI would stay "connected" after the connection died at the TCP layer.
 	//
-	// The cast to CECSocket* forces virtual dispatch through the EC
-	// vtable, so an instance of CRemoteConnect / CECServerSocket
-	// reaches its override.  A qualified `CECSocket::OnLost()` call
-	// would bypass virtual dispatch and only run the empty base.
-	virtual void OnLost(int)	{ static_cast<CECSocket *>(this)->OnLost(); }
+	// The cast to CECSocket* forces virtual dispatch through the EC vtable, so an instance of
+	// CRemoteConnect / CECServerSocket reaches its override. A qualified `CECSocket::OnLost()`
+	// call would bypass virtual dispatch and only run the empty base.
+	virtual void OnLost(int) { static_cast<CECSocket *>(this)->OnLost(); }
 
-	// Apply EC-tuned TCP keepalive (idle=30s / probe=10s / count=3 →
-	// ~60s half-open detection). Called automatically from
-	// InternalConnect after a successful client-side connect; subclasses
-	// that take over OnConnect (CRemoteConnect) and the server-side
-	// accept path (ExternalConn.cpp::OnAccept on amuled) call this
-	// explicitly so detection is symmetric on both ends of every EC
-	// connection.
-	void ApplyEcKeepalive();
+	// Apply the EC-tuned socket options: TCP keepalive (idle=30s / probe=10s / count=3, so ~60s
+	// half-open detection) and TCP_NODELAY. Called automatically from InternalConnect after a
+	// successful client-side connect; subclasses that take over OnConnect (CRemoteConnect) and
+	// the server-side accept path (ExternalConn.cpp::OnAccept on amuled) call it explicitly, so
+	// both ends of every EC connection get the same treatment -- Nagle only stalls if it is
+	// still on at the sending end.
+	void ApplyEcSocketOptions();
 
 private:
 	bool InternalConnect(uint32_t ip, uint16_t port, bool wait);
 
 	int InternalGetLastError();
 
-	bool InternalWaitOnConnect(long secs = -1, long msecs = 0) { return CLibSocket::WaitOnConnect(secs,msecs); };
-	bool InternalWaitForWrite(long secs = -1, long msecs = 0) { return CLibSocket::WaitForWrite(secs,msecs); };
-	bool InternalWaitForRead(long secs = -1, long msecs = 0) { return CLibSocket::WaitForRead(secs,msecs); };
+	bool InternalWaitOnConnect(long secs = -1, long msecs = 0)
+	{
+		return CLibSocket::WaitOnConnect(secs, msecs);
+	};
+	bool InternalWaitForWrite(long secs = -1, long msecs = 0)
+	{
+		return CLibSocket::WaitForWrite(secs, msecs);
+	};
+	bool InternalWaitForRead(long secs = -1, long msecs = 0)
+	{
+		return CLibSocket::WaitForRead(secs, msecs);
+	};
 
 	bool InternalError() { return CLibSocket::LastError() != 0; }
 	void InternalClose() { CLibSocket::Close(); }
 
-	uint32 InternalRead(void* ptr, uint32 len)			{ return CLibSocket::Read(ptr, len); };
-	uint32 InternalWrite(const void* ptr, uint32 len)	{ return CLibSocket::Write(ptr, len); };
+	uint32 InternalRead(void *ptr, uint32 len) { return CLibSocket::Read(ptr, len); };
+	uint32 InternalWrite(const void *ptr, uint32 len) { return CLibSocket::Write(ptr, len); };
 
 	bool InternalIsConnected() { return CLibSocket::IsConnected(); }
 	void InternalDestroy() { CLibSocket::Destroy(); }

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECPacket.cpp -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECPacket.cpp Changed

@@ -22,31 +22,27 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "ECPacket.h"	// Needed for ECPacket
-#include "ECSocket.h"	// Needed for CECSocket
+#include "ECPacket.h" // Needed for ECPacket
+#include "ECSocket.h" // Needed for CECSocket
 
-/**********************************************************
- *							  *
- *	CECPacket class					  *
- *							  *
- **********************************************************/
+// CECPacket class
 
-bool CECPacket::ReadFromSocket(CECSocket& socket)
+bool CECPacket::ReadFromSocket(CECSocket &socket)
 {
-	return socket.ReadNumber(&m_opCode, sizeof(ec_opcode_t))
-		&& ReadChildren(socket);
+	return socket.ReadNumber(&m_opCode, sizeof(ec_opcode_t)) && ReadChildren(socket);
 }
 
-
-bool CECPacket::WritePacket(CECSocket& socket) const
+bool CECPacket::WritePacket(CECSocket &socket) const
 {
-	if (!socket.WriteNumber(&m_opCode, sizeof(ec_opcode_t))) return false;
-	if (!WriteChildren(socket)) return false;
+	if (!socket.WriteNumber(&m_opCode, sizeof(ec_opcode_t)))
+		return false;
+	if (!WriteChildren(socket))
+		return false;
 	return true;
 }
 
 #ifdef __DEBUG__
-#include <common/Format.h>  // Needed for CFormat
+#include <common/Format.h> // Needed for CFormat
 #include "ECLog.h"
 
 void CECPacket::DebugPrint(bool incoming, uint32 trueSize) const
@@ -54,18 +50,18 @@
 	wxString GetDebugNameECOpCodes(uint8 arg);
 
 	if (ECLogIsEnabled()) {
-		// full length incl. header: opcode + own children-count field
-		// (uint16, plus a uint32 follow-up if the count was extended
-		// past the 0xFFFF ceiling — see CECTag::WriteChildren).
-		uint32 size = GetPacketLength() + sizeof(ec_opcode_t) + sizeof(uint16)
-			+ (GetTagCount() >= 0xFFFF ? sizeof(uint32) : 0);
+		// full length incl. header: opcode + own children-count field (uint16, plus a
+		// uint32 follow-up if the count was extended past the 0xFFFF ceiling -- see
+		// CECTag::WriteChildren).
+		uint32 size = GetPacketLength() + sizeof(ec_opcode_t) + sizeof(uint16) +
+			      (GetTagCount() >= 0xFFFF ? sizeof(uint32) : 0);
 
 		if (trueSize == 0 || size == trueSize) {
-			DoECLogLine(CFormat("%s %s %d") % (incoming ? "<" : ">")
-				% GetDebugNameECOpCodes(m_opCode) % size);
+			DoECLogLine(CFormat("%s %s %d") % (incoming ? "<" : ">") %
+				    GetDebugNameECOpCodes(m_opCode) % size);
 		} else {
-			DoECLogLine(CFormat("%s %s %d (compressed: %d)") % (incoming ? "<" : ">")
-				% GetDebugNameECOpCodes(m_opCode) % size % trueSize);
+			DoECLogLine(CFormat("%s %s %d (compressed: %d)") % (incoming ? "<" : ">") %
+				    GetDebugNameECOpCodes(m_opCode) % size % trueSize);
 		}
 		CECTag::DebugPrint(1, false);
 	}
@@ -76,23 +72,16 @@
 
 /*!
  * \fn CECPacket::CECPacket(ec_opcode_t opCode, EC_DETAIL_LEVEL detail_level)
- *
- * \brief Creates a new packet with given OPCODE.
+ * \brief Creates a new packet with the given OPCODE.
  */
 
 /*!
  * \fn ec_opcode_t CECPacket::GetOpCode(void) const
- *
- * \brief Returns OPCODE.
- *
- * \return The OpCode of the packet.
+ * \brief Returns the packet's OpCode.
  */
 
 /*!
  * \fn uint32 CECPacket::GetPacketLength(void) const
- *
  * \brief Returns the length of the packet.
- *
- * \return The length of the packet.
  */
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECPacket.h -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECPacket.h Changed

@@ -33,36 +33,40 @@
 
 class CECSocket;
 
-/**
- * High level EC packet handler class
- */
-class CECPacket : public CECEmptyTag {
+/// High level EC packet handler class.
+class CECPacket : public CECEmptyTag
+{
 	friend class CECSocket;
-	public:
-		CECPacket(ec_opcode_t opCode, EC_DETAIL_LEVEL detail_level = EC_DETAIL_FULL)
-		: CECEmptyTag(0), m_opCode(opCode)
-		{
-			// since EC_DETAIL_FULL is default - no point transmit it
-			if ( detail_level != EC_DETAIL_FULL ) {
-				AddTag(CECTag(EC_TAG_DETAIL_LEVEL, (uint64)detail_level));
-			}
-		}
 
-		ec_opcode_t	GetOpCode(void) const { return m_opCode; }
-		uint32_t		GetPacketLength(void) const { return CECTag::GetTagLen(); }
-		EC_DETAIL_LEVEL GetDetailLevel() const
-		{
-			const CECTag *tag = GetTagByName(EC_TAG_DETAIL_LEVEL);
-			return (tag) ? (EC_DETAIL_LEVEL)tag->GetInt() : EC_DETAIL_FULL;
+public:
+	CECPacket(ec_opcode_t opCode, EC_DETAIL_LEVEL detail_level = EC_DETAIL_FULL)
+	: CECEmptyTag(0)
+	, m_opCode(opCode)
+	{
+		// since EC_DETAIL_FULL is default - no point transmit it
+		if (detail_level != EC_DETAIL_FULL) {
+			AddTag(CECTag(EC_TAG_DETAIL_LEVEL, (uint64)detail_level));
 		}
-		void DebugPrint(bool incoming, uint32 trueSize = 0) const;
+	}
+
+	ec_opcode_t GetOpCode(void) const { return m_opCode; }
+	uint32_t GetPacketLength(void) const { return CECTag::GetTagLen(); }
+	EC_DETAIL_LEVEL GetDetailLevel() const
+	{
+		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()	: CECEmptyTag() {}
+private:
+	CECPacket()
+	: CECEmptyTag()
+	{
+	}
 
-		bool ReadFromSocket(CECSocket& socket);
-		bool WritePacket(CECSocket& socket) const;
-		ec_opcode_t	m_opCode;
+	bool ReadFromSocket(CECSocket &socket);
+	bool WritePacket(CECSocket &socket) const;
+	ec_opcode_t m_opCode;
 };
 
 #endif /* ECPACKET_H */

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECSocket.cpp -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECSocket.cpp Changed

@@ -31,18 +31,17 @@
 
 using namespace std;
 
-#include "ECPacket.h"		// Needed for CECPacket
+#include "ECPacket.h" // Needed for CECPacket
 #include "../../../Logger.h"
-#include <common/Format.h>	// Needed for CFormat
+#include <common/Format.h> // Needed for CFormat
 #include "ECLog.h"
 
-#define EC_COMPRESSION_LEVEL	Z_DEFAULT_COMPRESSION
-#define EC_MAX_UNCOMPRESSED	1024
-// Largest packet we'll send uncompressed to a local peer (loopback /
-// RFC1918 LAN / RFC3927 link-local) regardless of ZLIB negotiation.
-// Above this threshold we fall back to ZLIB so the wire size stays
-// inside ReadHeader's 256 MB post-auth packet gate even for very
-// large responses (e.g. show shared on a 90 k+ shared-file library).
+#define EC_COMPRESSION_LEVEL Z_DEFAULT_COMPRESSION
+#define EC_MAX_UNCOMPRESSED 1024
+// Largest packet we send uncompressed to a local peer (loopback / RFC1918 LAN /
+// RFC3927 link-local) regardless of ZLIB negotiation. Above it we fall back to
+// ZLIB so the wire size stays inside ReadHeader's 256 MB post-auth gate even for
+// very large responses (show shared on a 90 k+ file library).
 static const uint32 kLocalPeerZlibBypassMax = 256 * 1024 * 1024;
 
 #ifndef __GNUC__
@@ -54,23 +53,19 @@
 int utf8_wctomb(unsigned char *s, wchar_t wc, int maxlen) __attribute__((__visibility__("internal")));
 int utf8_mb_remain(char c) __attribute__((__pure__));
 
-/*----------=> Import from the Linux kernel <=----------*/
-/*
- * linux/fs/nls_base.c
- */
-
-/*
- * Sample implementation from Unicode home page.
- * http://www.stonehand.com/unicode/standard/fss-utf.html
- */
-struct utf8_table {
-	int     cmask;
-	int     cval;
-	int     shift;
-	uint32_t  lmask;
-	uint32_t  lval;
+/*----------=> Import from the Linux kernel: linux/fs/nls_base.c <=----------*/
+
+/* Sample implementation from http://www.stonehand.com/unicode/standard/fss-utf.html */
+struct utf8_table
+{
+	int cmask;
+	int cval;
+	int shift;
+	uint32_t lmask;
+	uint32_t lval;
 };
 
+// clang-format off
 static const struct utf8_table utf8_table =
 {
     {0x80,  0x00,   0*6,    0x7F,           0,         /* 1 byte sequence */},
@@ -81,6 +76,7 @@
     {0xFE,  0xFC,   5*6,    0x7FFFFFFF,     0x4000000, /* 6 byte sequence */},
     {0,     0,      0,      0,              0,         /* end of table    */}
 };
+// clang-format on
 
 static int utf8_mbtowc(uint32_t *p, const unsigned char *s, int n)
 {
@@ -141,12 +137,12 @@
 {
 	int i;
 	for (i = 0; i < 5; ++i) {
-		if ((c & utf8_tablei.cmask) == utf8_tablei.cval) break;
+		if ((c & utf8_tablei.cmask) == utf8_tablei.cval)
+			break;
 	}
 	return i;
 }
 
-
 void CQueuedData::Write(const void *data, size_t len)
 {
 	const size_t canWrite = std::min(GetRemLength(), len);
@@ -156,7 +152,6 @@
 	m_wr_ptr += canWrite;
 }
 
-
 void CQueuedData::WriteAt(const void *data, size_t len, size_t offset)
 {
 	wxASSERT(len + offset <= m_data.size());
@@ -169,7 +164,6 @@
 	memcpy(&m_data0 + offset, data, len);
 }
 
-
 void CQueuedData::Read(void *data, size_t len)
 {
 	const size_t canRead = std::min(GetUnreadDataLength(), len);
@@ -179,18 +173,15 @@
 	m_rd_ptr += canRead;
 }
 
-
 uint32 CQueuedData::WriteToSocket(CECSocket *sock)
 {
-	wxCHECK_MSG(m_rd_ptr < m_wr_ptr, 0,
-		"Reading past written data in WriteToSocket");
+	wxCHECK_MSG(m_rd_ptr < m_wr_ptr, 0, "Reading past written data in WriteToSocket");
 
 	uint32 write = sock->SocketWrite(m_rd_ptr, GetUnreadDataLength());
 	m_rd_ptr += write;
 	return write;
 }
 
-
 uint32 CQueuedData::ReadFromSocket(CECSocket *sock, size_t len)
 {
 	const size_t canWrite = std::min(GetRemLength(), len);
@@ -201,7 +192,6 @@
 	return read;
 }
 
-
 size_t CQueuedData::ReadFromSocketAll(CECSocket *sock, size_t len)
 {
 	size_t read_rem = std::min(GetRemLength(), len);
@@ -210,7 +200,7 @@
 	//  We get here when socket is truly blocking
 	do {
 		// Give socket a 10 sec chance to recv more data.
-		if ( !sock->WaitSocketRead(10, 0) ) {
+		if (!sock->WaitSocketRead(10, 0)) {
 			AddDebugLogLineN(logEC, "ReadFromSocketAll: socket is blocking");
 			break;
 		}
@@ -229,59 +219,61 @@
 	return len - read_rem;
 }
 
+void CQueuedData::TruncateBy(size_t len)
+{
+	const size_t have = GetDataLength();
+	m_wr_ptr = &m_data0 + (len >= have ? 0 : have - len);
+}
 
 size_t CQueuedData::GetLength() const
 {
 	return m_data.size();
 }
 
-
 size_t CQueuedData::GetDataLength() const
 {
 	const size_t len = m_wr_ptr - &m_data0;
-	wxCHECK_MSG(len <= m_data.size(), m_data.size(),
-		"Write-pointer past end of buffer");
+	wxCHECK_MSG(len <= m_data.size(), m_data.size(), "Write-pointer past end of buffer");
 
 	return len;
 }
 
-
 size_t CQueuedData::GetRemLength() const
 {
 	return m_data.size() - GetDataLength();
 }
 
-
 size_t CQueuedData::GetUnreadDataLength() const
 {
-	wxCHECK_MSG(m_wr_ptr >= m_rd_ptr, 0,
-		"Read position past write position.");
+	wxCHECK_MSG(m_wr_ptr >= m_rd_ptr, 0, "Read position past write position.");
 
 	return m_wr_ptr - m_rd_ptr;
 }
 
-
-
-//
 // CECSocket API - User interface functions
-//
 
 CECSocket::CECSocket(bool use_events)
-	: m_use_events(use_events),
-	  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),
-	  // setup initial state: 4 flags + 4 length
-	  m_bytes_needed(EC_HEADER_SIZE),
-	  m_in_header(true),
-	  m_curr_packet_len(0),
-	  m_my_flags(0x20),
-	  m_haveNotificationSupport(false),
-	  m_isLocalPeer(false)
-{}
+: m_use_events(use_events)
+, 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_crypt_ready(false)
+, m_crypt_enabled(false)
+, m_crypt_enable_after_write(false)
+, m_last_rx_encrypted(false)
+,
+// setup initial state: 4 flags + 4 length
+m_bytes_needed(EC_HEADER_SIZE)
+, m_in_header(true)
+, m_curr_packet_len(0)
+, m_my_flags(0x20)
+, m_haveNotificationSupport(false)
+, m_isLocalPeer(false)
+{
+}
 
 CECSocket::~CECSocket()
 {
@@ -292,16 +284,118 @@
 	}
 }
 
+// Deliberately not part of ResetProtocolState. m_my_flags mixes capabilities this
+// end simply has with capabilities agreed with the peer, and only a caller that
+// knows it faces a DIFFERENT peer may drop the second kind -- CECMemSocket sets
+// EC_FLAG_LARGE_TAG_COUNT in its constructor as a local property of the wire
+// format it caches, and clearing it there would corrupt the cache.
+void CECSocket::ClearPeerNegotiatedFlags()
+{
+	// EC_FLAG_LARGE_TAG_COUNT is the only bit here whose value comes from the peer:
+	// it is set when the daemon echoes EC_TAG_CAN_LARGE_TAG_COUNT in AUTH_OK. Left
+	// set across a reconnect, a client that negotiated it with one daemon keeps
+	// sending the extended tag-count format to one that never advertised it, and the
+	// receiver misparses everything after the count field. EC_FLAG_ZLIB and
+	// EC_FLAG_UTF8_NUMBERS are chosen locally, through SetCapabilities, which the
+	// reconnect path does not call again.
+	m_my_flags &= ~(uint32_t)EC_FLAG_LARGE_TAG_COUNT;
+}
+
+void CECSocket::ResetProtocolState()
+{
+	// Drop any output queued for the dead connection so it isn't flushed as
+	// garbage onto the reconnected socket.
+	while (!m_output_queue.empty()) {
+		CQueuedData *data = m_output_queue.front();
+		m_output_queue.pop_front();
+		delete data;
+	}
+	// Rewind the RX/TX packet-reassembly state machine to the ctor's "expecting a
+	// fresh EC_HEADER_SIZE header" state. CSmartPtr is aMule's own smart pointer, not
+	// std::unique_ptr, so make_unique does not apply.
+	// NOLINTNEXTLINE(modernize-make-unique)
+	m_curr_rx_data.reset(new CQueuedData(EC_SOCKET_BUFFER_SIZE));
+	// NOLINTNEXTLINE(modernize-make-unique)
+	m_curr_tx_data.reset(new CQueuedData(EC_SOCKET_BUFFER_SIZE));
+	m_rx_flags = 0;
+	m_tx_flags = 0;
+	// A reused socket object must not carry key material from the dead
+	// connection: the next handshake derives fresh keys and fresh counters.
+	m_crypt.Reset();
+	m_crypt_ready = false;
+	m_crypt_enabled = false;
+	m_crypt_enable_after_write = false;
+	m_last_rx_encrypted = false;
+	m_bytes_needed = EC_HEADER_SIZE;
+	m_in_header = true;
+	m_curr_packet_len = 0;
+	// Re-negotiated by the reconnected session's auth handshake.
+	m_haveNotificationSupport = false;
+}
+
 bool CECSocket::ConnectSocket(uint32_t ip, uint16_t port)
 {
 	bool res = InternalConnect(ip, port, !m_use_events);
 	return !SocketError() && res;
 }
 
+bool CECSocket::SealOutputQueue(std::list<CQueuedData *>::iterator outputStart)
+{
+	if (!m_crypt.SealBegin()) {
+		return false;
+	}
+	bool first = true;
+	for (std::list<CQueuedData *>::iterator it = outputStart; it != m_output_queue.end(); ++it) {
+		unsigned char *data = (*it)->GetDataPtr();
+		size_t len = (*it)->GetDataLength();
+		if (first) {
+			// The first chunk starts with the 8-byte header, which stays in clear:
+			// the receiver needs the flags and length to size the sealed body.
+			if (len < EC_HEADER_SIZE) {
+				return false;
+			}
+			data += EC_HEADER_SIZE;
+			len -= EC_HEADER_SIZE;
+			first = false;
+		}
+		if (!m_crypt.SealUpdate(data, len)) {
+			return false;
+		}
+	}
+	unsigned char tagECCrypt::AEAD_TAG_LEN;
+	if (!m_crypt.SealFinal(tag)) {
+		return false;
+	}
+	CQueuedData *tagChunk = new CQueuedData(ECCrypt::AEAD_TAG_LEN);
+	tagChunk->Write(tag, sizeof(tag));
+	m_output_queue.push_back(tagChunk);
+	return true;
+}
+
+bool CECSocket::SetupAEAD(uint8_t cipher,
+	const std::vector<uint8_t> &ikm,
+	const std::vector<uint8_t> &serverNonce,
+	const std::vector<uint8_t> &clientNonce,
+	const std::vector<uint8_t> &transcript,
+	bool isServer)
+{
+	m_crypt_ready = m_crypt.Init(cipher, ikm, serverNonce, clientNonce, transcript, isServer);
+	if (!m_crypt_ready) {
+		AddDebugLogLineN(logEC, "SetupAEAD: key derivation failed");
+	}
+	return m_crypt_ready;
+}
+
 void CECSocket::SendPacket(const CECPacket *packet)
 {
 	uint32 len = WritePacket(packet);
 	packet->DebugPrint(false, len);
+	// Arm after the write, never before: the packet that completes the
+	// handshake is the last one that must go out in clear.
+	if (m_crypt_enable_after_write) {
+		m_crypt_enable_after_write = false;
+		m_crypt_enabled = m_crypt_ready;
+	}
 	OnOutput();
 }
 
@@ -309,15 +403,15 @@
 {
 	SendPacket(packet);
 
-	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.
+	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, "SendRecvPacket: error");
 		return 0;
 	}
-	if (m_curr_rx_data->ReadFromSocketAll(this, m_curr_packet_len) != m_curr_packet_len
-		|| SocketError()) {
+	if (m_curr_rx_data->ReadFromSocketAll(this, m_curr_packet_len) != m_curr_packet_len ||
+		SocketError()) {
 		OnError();
 		AddDebugLogLineN(logEC, "SendRecvPacket: error");
 		return 0;
@@ -330,30 +424,30 @@
 std::string CECSocket::GetLastErrorMsg()
 {
 	int code = InternalGetLastError();
-	switch(code) {
-		case EC_ERROR_NOERROR:
-			return "No error happened";
-		case EC_ERROR_INVOP:
-			return "Invalid operation";
-		case EC_ERROR_IOERR:
-			return "Input/Output error";
-		case EC_ERROR_INVADDR:
-			return "Invalid address passed to wxSocket";
-		case EC_ERROR_INVSOCK:
-			return "Invalid socket (uninitialized)";
-		case EC_ERROR_NOHOST:
-			return "No corresponding host";
-		case EC_ERROR_INVPORT:
-			return "Invalid port";
-		case EC_ERROR_WOULDBLOCK:
-			return "The socket is non-blocking and the operation would block";
-		case EC_ERROR_TIMEDOUT:
-			return "The timeout for this operation expired";
-		case EC_ERROR_MEMERR:
-			return "Memory exhausted";
+	switch (code) {
+	case EC_ERROR_NOERROR:
+		return "No error happened";
+	case EC_ERROR_INVOP:
+		return "Invalid operation";
+	case EC_ERROR_IOERR:
+		return "Input/Output error";
+	case EC_ERROR_INVADDR:
+		return "Invalid address passed to wxSocket";
+	case EC_ERROR_INVSOCK:
+		return "Invalid socket (uninitialized)";
+	case EC_ERROR_NOHOST:
+		return "No corresponding host";
+	case EC_ERROR_INVPORT:
+		return "Invalid port";
+	case EC_ERROR_WOULDBLOCK:
+		return "The socket is non-blocking and the operation would block";
+	case EC_ERROR_TIMEDOUT:
+		return "The timeout for this operation expired";
+	case EC_ERROR_MEMERR:
+		return "Memory exhausted";
 	}
 	ostringstream error_string;
-	error_string << "Error code " << code <<  " unknown.";
+	error_string << "Error code " << code << " unknown.";
 	return error_string.str();
 }
 
@@ -370,20 +464,14 @@
 void CECSocket::OnError()
 {
 #ifdef __DEBUG__
-	cout << GetLastErrorMsg() << endl;
+	cout << GetLastErrorMsg() << '\n';
 #endif
 }
 
-void CECSocket::OnLost()
-{
-}
+void CECSocket::OnLost() {}
 
-//
 // Event handlers
-//
-void CECSocket::OnConnect()
-{
-}
+void CECSocket::OnConnect() {}
 
 void CECSocket::OnInput()
 {
@@ -409,7 +497,8 @@
 				CSmartPtr<const CECPacket> packet(ReadPacket());
 				m_curr_rx_data->Rewind();
 				if (packet.get()) {
-					CSmartPtr<const CECPacket> reply(OnPacketReceived(packet.get(), m_curr_packet_len));
+					CSmartPtr<const CECPacket> reply(
+						OnPacketReceived(packet.get(), m_curr_packet_len));
 					if (reply.get()) {
 						SendPacket(reply.get());
 					}
@@ -426,7 +515,7 @@
 void CECSocket::OnOutput()
 {
 	while (!m_output_queue.empty()) {
-		CQueuedData* data = m_output_queue.front();
+		CQueuedData *data = m_output_queue.front();
 		uint32 written = data->WriteToSocket(this);
 		if (!data->GetUnreadDataLength()) {
 			m_output_queue.pop_front();
@@ -439,18 +528,13 @@
 				OnError();
 				return;
 			}
-			// Now it's just a blocked socket.
-			if ( m_use_events ) {
-				// Event driven logic: return, OnOutput() will be called again later
+			if (m_use_events) {
 				return;
 			}
-			// Synchronous call: wait (for max 10 secs)
-			if ( !WaitSocketWrite(10, 0) ) {
-				// Still not through ?
+			if (!WaitSocketWrite(10, 0)) {
 				if (WouldBlock()) {
-					// WouldBlock() is only EAGAIN or EWOULD_BLOCK,
-					// and those shouldn't create an infinite wait.
-					// So give it another chance.
+					// WouldBlock() is only EAGAIN or EWOULDBLOCK, neither of
+					// which should create an infinite wait.
 					continue;
 				} else {
 					AddDebugLogLineN(logEC, "OnOutput: socket error in sync wait");
@@ -459,36 +543,26 @@
 				}
 			}
 		} else if (written == 0) {
-			// CAsioSocketImpl::Write returns 0 with no SocketError
-			// set when a previous async send is still in flight
-			// (m_sendBuffer != null) -- pure backpressure, not a
-			// real error.  Treat as "would block": yield to the
-			// event loop so the asio HandleSend callback can clear
-			// m_sendBuffer and re-fire OnOutput via
-			// CoreNotify_LibSocketSend.  Without this, the loop
-			// re-reads the same queue head and re-calls Write(),
-			// pegging the main thread at 100% CPU until asio
-			// catches up.  Large EC replies (e.g. status response
-			// after a batch ed2k-link add) hit this hard because
-			// they're chopped into many asio-sized chunks and the
-			// main thread can't service other wx events during
-			// the spin.
+			// CAsioSocketImpl::Write returns 0 with no SocketError set when a previous
+			// async send is still in flight -- backpressure, not an error. Treat it as
+			// "would block": yield to the event loop so the asio HandleSend callback can
+			// clear m_sendBuffer and re-fire OnOutput. Without this the loop re-reads the
+			// same queue head and re-calls Write(), pegging the main thread at 100% CPU
+			// until asio catches up.
 			if (m_use_events) {
 				return;
 			}
 			// Synchronous path: same fallback as the SocketError
 			// case below.
 			if (!WaitSocketWrite(10, 0)) {
-				AddDebugLogLineN(logEC, "OnOutput: 10s wait elapsed in zero-write backpressure");
+				AddDebugLogLineN(
+					logEC, "OnOutput: 10s wait elapsed in zero-write backpressure");
 				OnError();
 				break;
 			}
 		}
 	}
-	//
-	// All outstanding data sent to socket
-	// (used for push clients)
-	//
+	// All outstanding data sent to socket (used for push clients)
 	WriteDoneAndQueueEmpty();
 }
 
@@ -497,9 +571,7 @@
 	return !m_output_queue.empty();
 }
 
-//
 // Socket I/O
-//
 
 size_t CECSocket::ReadBufferFromSocket(void *buffer, size_t required_len)
 {
@@ -507,8 +579,9 @@
 
 	if (m_curr_rx_data->GetUnreadDataLength() < required_len) {
 		// need more data that we have. Looks like nothing will help here
-		AddDebugLogLineN(logEC, CFormat("ReadBufferFromSocket: not enough data (%d < %d)")
-			% m_curr_rx_data->GetUnreadDataLength() % required_len);
+		AddDebugLogLineN(logEC,
+			CFormat("ReadBufferFromSocket: not enough data (%d < %d)") %
+				m_curr_rx_data->GetUnreadDataLength() % required_len);
 		return 0;
 	}
 	m_curr_rx_data->Read(buffer, required_len);
@@ -518,15 +591,18 @@
 void CECSocket::WriteBufferToSocket(const void *buffer, size_t len)
 {
 	unsigned char *wr_ptr = (unsigned char *)buffer;
-	while ( len ) {
+	while (len) {
 		size_t curr_free = m_curr_tx_data->GetRemLength();
-		if ( len > curr_free ) {
+		if (len > curr_free) {
 
 			m_curr_tx_data->Write(wr_ptr, curr_free);
 			len -= curr_free;
 			wr_ptr += curr_free;
+			const size_t chunk = m_curr_tx_data->GetLength();
 			m_output_queue.push_back(m_curr_tx_data.release());
-			m_curr_tx_data.reset(new CQueuedData(EC_SOCKET_BUFFER_SIZE));
+			// CSmartPtr is std::auto_ptr without HAVE_UNIQUE_PTR.
+			// NOLINTNEXTLINE(modernize-make-unique)
+			m_curr_tx_data.reset(new CQueuedData(chunk));
 		} else {
 			m_curr_tx_data->Write(wr_ptr, len);
 			break;
@@ -534,33 +610,52 @@
 	}
 }
 
-
-//
 // ZLib "error handler"
-//
 
 static void ShowZError(int zerror, z_streamp strm)
 {
 	const char *p = NULL;
 
 	switch (zerror) {
-		case Z_STREAM_END: p = "Z_STREAM_END"; break;
-		case Z_NEED_DICT: p = "Z_NEED_DICT"; break;
-		case Z_ERRNO: p = "Z_ERRNO"; break;
-		case Z_STREAM_ERROR: p = "Z_STREAM_ERROR"; break;
-		case Z_DATA_ERROR: p = "Z_DATA_ERROR"; break;
-		case Z_MEM_ERROR: p = "Z_MEM_ERROR"; break;
-		case Z_BUF_ERROR: p = "Z_BUF_ERROR"; break;
-		case Z_VERSION_ERROR: p = "Z_VERSION_ERROR"; break;
+	case Z_STREAM_END:
+		p = "Z_STREAM_END";
+		break;
+	case Z_NEED_DICT:
+		p = "Z_NEED_DICT";
+		break;
+	case Z_ERRNO:
+		p = "Z_ERRNO";
+		break;
+	case Z_STREAM_ERROR:
+		p = "Z_STREAM_ERROR";
+		break;
+	case Z_DATA_ERROR:
+		p = "Z_DATA_ERROR";
+		break;
+	case Z_MEM_ERROR:
+		p = "Z_MEM_ERROR";
+		break;
+	case Z_BUF_ERROR:
+		p = "Z_BUF_ERROR";
+		break;
+	case Z_VERSION_ERROR:
+		p = "Z_VERSION_ERROR";
+		break;
 	}
 	printf("ZLib operation returned %s\n", p);
 	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);
+	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, "ZLib error");
 }
 
-
 bool CECSocket::ReadHeader()
 {
 	m_curr_rx_data->Read(&m_rx_flags, 4);
@@ -568,15 +663,10 @@
 	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;
-	// Sanity bound on the announced packet size. Pre-auth stays at the
-	// historical 16 MB cap — limits the damage a malicious peer can do
-	// with a single bogus header before we know who they are. Post-auth
-	// raises to 256 MB so big uncompressed responses (e.g. show shared
-	// on a 90 k-file library against a local-peer client that skipped
-	// ZLIB negotiation, see #713 / #728) don't trip the gate.
-	const size_t max_packet_bytes = IsAuthorized()
-		? (size_t)256 * 1024 * 1024
-		: (size_t) 16 * 1024 * 1024;
+	// Sanity bound on the announced packet size. Pre-auth keeps the historical 16 MB
+	// cap, limiting what one bogus header from an unknown peer can do; post-auth
+	// raises it to 256 MB for big uncompressed responses (#713 / #728).
+	const size_t max_packet_bytes = IsAuthorized() ? (size_t)256 * 1024 * 1024 : (size_t)16 * 1024 * 1024;
 	if (m_bytes_needed > max_packet_bytes) {
 		AddDebugLogLineN(logEC, CFormat("ReadHeader: packet too big: %d") % m_bytes_needed);
 		CloseAndDispatchLost();
@@ -587,14 +677,15 @@
 	// resize input buffer if
 	// a) too small or
 	if (currLength < m_bytes_needed
-	// b) way too large (free data again after receiving huge packets)
+		// 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 successful login.
-		// Otherwise sending a simple header with bogus length of 16MB-1 will crash an embedded
-		// client with memory exhaustion.
+		// Client sockets are always authorized. On a server socket, do not grow internal
+		// buffers before a successful login: a bogus 16MB-1 length would otherwise
+		// exhaust an embedded client's memory.
 		if (!IsAuthorized()) {
-			AddDebugLogLineN(logEC, CFormat("ReadHeader: resize (%d -> %d) on non autorized socket") % currLength % m_bytes_needed);
+			AddDebugLogLineN(logEC,
+				CFormat("ReadHeader: resize (%d -> %d) on non autorized socket") %
+					currLength % m_bytes_needed);
 			CloseAndDispatchLost();
 			return false;
 		}
@@ -611,32 +702,41 @@
 	return true;
 }
 
-
 bool CECSocket::ReadNumber(void *buffer, size_t len)
 {
 	if (m_rx_flags & EC_FLAG_UTF8_NUMBERS) {
 		unsigned char mb16;
 		uint32_t wc;
-		if (!ReadBuffer(mb, 1)) return false;
+		if (!ReadBuffer(mb, 1))
+			return false;
 		int remains = utf8_mb_remain(mb0);
-		if (remains) if (!ReadBuffer(&(mb1), remains)) return false;
-		if (utf8_mbtowc(&wc, mb, 6) == -1) return false;	// Invalid UTF-8 code sequence
+		if (remains)
+			if (!ReadBuffer(&(mb1), remains))
+				return false;
+		if (utf8_mbtowc(&wc, mb, 6) == -1)
+			return false; // Invalid UTF-8 code sequence
 		switch (len) {
-			case 1: PokeUInt8( buffer,  wc ); break;
-			case 2: RawPokeUInt16( buffer, wc ); break;
-			case 4: RawPokeUInt32( buffer, wc ); break;
+		case 1:
+			PokeUInt8(buffer, wc);
+			break;
+		case 2:
+			RawPokeUInt16(buffer, wc);
+			break;
+		case 4:
+			RawPokeUInt32(buffer, wc);
+			break;
 		}
 	} else {
-		if ( !ReadBuffer(buffer, len) ) {
+		if (!ReadBuffer(buffer, len)) {
 			return false;
 		}
 		switch (len) {
-			case 2:
-				RawPokeUInt16( buffer, ENDIAN_NTOHS( RawPeekUInt16( buffer ) ) );
-				break;
-			case 4:
-				RawPokeUInt32( buffer, ENDIAN_NTOHL( RawPeekUInt32( buffer ) ) );
-				break;
+		case 2:
+			RawPokeUInt16(buffer, ENDIAN_NTOHS(RawPeekUInt16(buffer)));
+			break;
+		case 4:
+			RawPokeUInt32(buffer, ENDIAN_NTOHL(RawPeekUInt32(buffer)));
+			break;
 		}
 	}
 	return true;
@@ -649,20 +749,34 @@
 		uint32_t wc = 0;
 		int mb_len;
 		switch (len) {
-			case 1: wc = PeekUInt8( buffer ); break;
-			case 2: wc = RawPeekUInt16( buffer ); break;
-			case 4: wc = RawPeekUInt32( buffer ); break;
-			default: return false;
+		case 1:
+			wc = PeekUInt8(buffer);
+			break;
+		case 2:
+			wc = RawPeekUInt16(buffer);
+			break;
+		case 4:
+			wc = RawPeekUInt32(buffer);
+			break;
+		default:
+			return false;
 		}
-		if ((mb_len = utf8_wctomb(mb, wc, 6)) == -1) return false;	// Something is terribly wrong...
+		if ((mb_len = utf8_wctomb(mb, wc, 6)) == -1)
+			return false; // Something is terribly wrong...
 		return WriteBuffer(mb, mb_len);
 	} else {
 		char tmp8;
 
 		switch (len) {
-			case 1: PokeUInt8( tmp, PeekUInt8( buffer ) ); break;
-			case 2: RawPokeUInt16( tmp, ENDIAN_NTOHS( RawPeekUInt16( buffer ) ) ); break;
-			case 4: RawPokeUInt32( tmp, ENDIAN_NTOHL( RawPeekUInt32( buffer ) ) ); break;
+		case 1:
+			PokeUInt8(tmp, PeekUInt8(buffer));
+			break;
+		case 2:
+			RawPokeUInt16(tmp, ENDIAN_NTOHS(RawPeekUInt16(buffer)));
+			break;
+		case 4:
+			RawPokeUInt32(tmp, ENDIAN_NTOHL(RawPeekUInt32(buffer)));
+			break;
 		}
 		return WriteBuffer(tmp, len);
 	}
@@ -671,14 +785,14 @@
 bool CECSocket::ReadBuffer(void *buffer, size_t len)
 {
 	if (m_rx_flags & EC_FLAG_ZLIB) {
-		if ( !m_z.avail_in ) {
+		if (!m_z.avail_in) {
 			// no reason for this situation: all packet should be
 			// buffered by now
 			AddDebugLogLineN(logEC, "ReadBuffer: ZLib error");
 			return false;
 		}
 		m_z.avail_out = (uInt)len;
-		m_z.next_out = (Bytef*)buffer;
+		m_z.next_out = (Bytef *)buffer;
 		int zerror = inflate(&m_z, Z_SYNC_FLUSH);
 		if ((zerror != Z_OK) && (zerror != Z_STREAM_END)) {
 			ShowZError(zerror, &m_z);
@@ -687,7 +801,6 @@
 		}
 		return true;
 	} else {
-		// using uncompressed buffered i/o
 		size_t read = ReadBufferFromSocket(buffer, len);
 		if (read == len) {
 			return true;
@@ -705,67 +818,93 @@
 		unsigned char *rd_ptr = (unsigned char *)buffer;
 		do {
 			unsigned int remain_in = EC_SOCKET_BUFFER_SIZE - m_z.avail_in;
-			if ( remain_in >= len ) {
-				memcpy(m_z.next_in+m_z.avail_in, rd_ptr, len);
+			if (remain_in >= len) {
+				memcpy(m_z.next_in + m_z.avail_in, rd_ptr, len);
 				m_z.avail_in += (uInt)len;
 				len = 0;
 			} else {
-				memcpy(m_z.next_in+m_z.avail_in, rd_ptr, remain_in);
+				memcpy(m_z.next_in + m_z.avail_in, rd_ptr, remain_in);
 				m_z.avail_in += remain_in;
 				len -= remain_in;
 				rd_ptr += remain_in;
-				// buffer is full, calling zlib
 				do {
-				    m_z.next_out = &m_out_ptr0;
-				    m_z.avail_out = EC_SOCKET_BUFFER_SIZE;
+					m_z.next_out = &m_out_ptr0;
+					m_z.avail_out = EC_SOCKET_BUFFER_SIZE;
 					int zerror = deflate(&m_z, Z_NO_FLUSH);
-					if ( zerror != Z_OK ) {
+					if (zerror != Z_OK) {
 						AddDebugLogLineN(logEC, "WriteBuffer: ZLib error");
 						ShowZError(zerror, &m_z);
 						return false;
 					}
-					WriteBufferToSocket(&m_out_ptr0,
-						EC_SOCKET_BUFFER_SIZE - m_z.avail_out);
-				} while ( m_z.avail_out == 0 );
-				// all input should be used by now
+					WriteBufferToSocket(
+						&m_out_ptr0, EC_SOCKET_BUFFER_SIZE - m_z.avail_out);
+				} while (m_z.avail_out == 0);
 				wxASSERT(m_z.avail_in == 0);
 				m_z.next_in = &m_in_ptr0;
 			}
-		} while ( len );
+		} while (len);
 		return true;
 	} else {
-		// using uncompressed buffered i/o
 		WriteBufferToSocket(buffer, len);
 		return true;
 	}
 }
 
+// Block size for a packet whose serialised body is this long: the whole thing when
+// it fits, EC_SOCKET_TX_CHUNK_MAX when it does not. Capped because a packet may be
+// hundreds of MB, and one contiguous block that big would be copied again by the
+// send path. Floored at EC_SOCKET_BUFFER_SIZE, which also keeps room in the first
+// block for the 8-byte header SealOutputQueue leaves in clear. Guessing low is
+// harmless: WriteBufferToSocket spills into a fresh block of the same size.
+size_t CECSocket::TxChunkSize(uint32 bodyLen)
+{
+	const size_t want = (size_t)bodyLen + EC_HEADER_SIZE;
+	if (want <= EC_SOCKET_BUFFER_SIZE)
+		return EC_SOCKET_BUFFER_SIZE;
+	return want < EC_SOCKET_TX_CHUNK_MAX ? want : EC_SOCKET_TX_CHUNK_MAX;
+}
+
+// Adopt that size for the packet about to be written. Both call sites are reached
+// with an empty block, so swapping drops nothing: the previous packet ended in
+// FlushBuffers and every early return is ahead of the first write. Asserted so a
+// future `return` between the writes and FlushBuffers cannot discard a partial one.
+void CECSocket::SizeTxChunks(uint32 bodyLen)
+{
+	wxASSERT(m_curr_tx_data->GetDataLength() == 0);
+	const size_t chunk = TxChunkSize(bodyLen);
+	if (m_curr_tx_data->GetLength() != chunk) {
+		// CSmartPtr is std::auto_ptr without HAVE_UNIQUE_PTR.
+		// NOLINTNEXTLINE(modernize-make-unique)
+		m_curr_tx_data.reset(new CQueuedData(chunk));
+	}
+}
+
 bool CECSocket::FlushBuffers()
 {
 	if (m_tx_flags & EC_FLAG_ZLIB) {
 		do {
-		    m_z.next_out = &m_out_ptr0;
-		    m_z.avail_out = EC_SOCKET_BUFFER_SIZE;
+			m_z.next_out = &m_out_ptr0;
+			m_z.avail_out = EC_SOCKET_BUFFER_SIZE;
 			int zerror = deflate(&m_z, Z_FINISH);
-			if ( zerror == Z_STREAM_ERROR ) {
+			if (zerror == Z_STREAM_ERROR) {
 				AddDebugLogLineN(logEC, "FlushBuffers: ZLib error");
 				ShowZError(zerror, &m_z);
 				return false;
 			}
-			WriteBufferToSocket(&m_out_ptr0,
-				EC_SOCKET_BUFFER_SIZE - m_z.avail_out);
-		} while ( m_z.avail_out == 0 );
+			WriteBufferToSocket(&m_out_ptr0, EC_SOCKET_BUFFER_SIZE - m_z.avail_out);
+		} while (m_z.avail_out == 0);
 	}
-	if ( m_curr_tx_data->GetDataLength() ) {
+	if (m_curr_tx_data->GetDataLength()) {
+		const size_t chunk = m_curr_tx_data->GetLength();
 		m_output_queue.push_back(m_curr_tx_data.release());
-		m_curr_tx_data.reset(new CQueuedData(EC_SOCKET_BUFFER_SIZE));
+		// CSmartPtr is std::auto_ptr without HAVE_UNIQUE_PTR.
+		// NOLINTNEXTLINE(modernize-make-unique)
+		m_curr_tx_data.reset(new CQueuedData(chunk));
 	}
 	return true;
 }
 
-//
 // Packet I/O
-//
 
 uint32 CECSocket::WritePacket(const CECPacket *packet)
 {
@@ -774,7 +913,7 @@
 		return 0;
 	}
 	// Check if output queue is empty. If not, memorize the current end.
-	std::list<CQueuedData*>::iterator outputStart = m_output_queue.begin();
+	std::list<CQueuedData *>::iterator outputStart = m_output_queue.begin();
 	uint32 outputQueueSize = m_output_queue.size();
 	for (uint32 i = 1; i < outputQueueSize; i++) {
 		++outputStart;
@@ -782,34 +921,33 @@
 
 	uint32_t flags = 0x20;
 
-	// ZLIB decision is per-packet. On a local peer (loopback / RFC1918
-	// LAN / RFC3927 link-local) the bandwidth saved by deflate is
-	// irrelevant — we'd just be paying compress/decompress CPU on both
-	// ends. Skip ZLIB for those connections up to the
-	// kLocalPeerZlibBypassMax cap; above the cap, fall back to ZLIB
-	// so the wire size stays under ReadHeader's 256 MB post-auth
-	// receiver gate. ZLIB still requires both the per-connection
-	// negotiation (`m_my_flags & EC_FLAG_ZLIB`) and a packet larger
-	// than EC_MAX_UNCOMPRESSED.
+	// ZLIB decision is per-packet. On a local peer (loopback / RFC1918 LAN / RFC3927
+	// link-local) the bandwidth deflate saves is irrelevant and we would pay
+	// compress/decompress CPU on both ends, so skip ZLIB up to the
+	// kLocalPeerZlibBypassMax cap; above it, fall back to ZLIB so the wire size stays
+	// under ReadHeader's 256 MB post-auth gate. ZLIB still needs the per-connection
+	// negotiation and a packet larger than EC_MAX_UNCOMPRESSED.
 	const uint32 packet_logical_len = packet->GetPacketLength();
-	const bool local_bypass_zlib = m_isLocalPeer
-		&& packet_logical_len <= kLocalPeerZlibBypassMax;
-	if (packet_logical_len > EC_MAX_UNCOMPRESSED
-		&& ((m_my_flags & EC_FLAG_ZLIB) > 0)
-		&& !local_bypass_zlib) {
+	const bool local_bypass_zlib = m_isLocalPeer && packet_logical_len <= kLocalPeerZlibBypassMax;
+	if (packet_logical_len > EC_MAX_UNCOMPRESSED && ((m_my_flags & EC_FLAG_ZLIB) > 0) &&
+		!local_bypass_zlib) {
 		flags |= EC_FLAG_ZLIB;
 	} else {
 		flags |= EC_FLAG_UTF8_NUMBERS;
 	}
 
-	// Always advertise large-tag-count support per packet; the
-	// `flags &= m_my_flags` strips it back out if the peer didn't
-	// advertise EC_TAG_CAN_LARGE_TAG_COUNT in the auth handshake.
-	// Both sides must have the bit in m_my_flags (i.e. negotiated)
-	// before WriteChildren / ReadChildren take the sentinel branch.
+	// Always advertise large-tag-count support per packet; `flags &= m_my_flags`
+	// strips it back out if the peer did not advertise EC_TAG_CAN_LARGE_TAG_COUNT in
+	// the auth handshake. Both sides must have the bit before WriteChildren /
+	// ReadChildren take the sentinel branch.
 	flags |= EC_FLAG_LARGE_TAG_COUNT;
 
 	flags &= m_my_flags;
+	// After the mask, not before: EC_FLAG_ENCRYPTED is connection state rather than a
+	// capability the peer advertised, and m_my_flags would strip it.
+	if (m_crypt_enabled) {
+		flags |= EC_FLAG_ENCRYPTED;
+	}
 	m_tx_flags = flags;
 
 	if (flags & EC_FLAG_ZLIB) {
@@ -826,6 +964,10 @@
 		}
 	}
 
+	// Size this packet's blocks before the first byte goes in, from the length
+	// computed above -- GetPacketLength() walks the whole tag tree.
+	SizeTxChunks(packet_logical_len);
+
 	uint32_t tmp_flags = ENDIAN_HTONL(flags);
 	WriteBufferToSocket(&tmp_flags, sizeof(uint32));
 
@@ -844,8 +986,20 @@
 	} else {
 		outputStart = m_output_queue.begin();
 	}
+
+	// Seal the body where it lies, then append the tag as its own chunk. After
+	// FlushBuffers (serialise -> deflate -> seal) and before the length is summed, so
+	// the patched length covers ciphertext plus tag.
+	if (flags & EC_FLAG_ENCRYPTED) {
+		if (!SealOutputQueue(outputStart)) {
+			AddDebugLogLineN(logEC, "WritePacket: sealing failed");
+			CloseAndDispatchLost();
+			return 0;
+		}
+	}
+
 	// now calculate actual size of data
-	for(std::list<CQueuedData*>::iterator it = outputStart; it != m_output_queue.end(); ++it) {
+	for (std::list<CQueuedData *>::iterator it = outputStart; it != m_output_queue.end(); ++it) {
 		packet_len += (uint32_t)(*it)->GetDataLength();
 	}
 	// header size is not counted
@@ -856,7 +1010,7 @@
 
 	if (flags & EC_FLAG_ZLIB) {
 		int zerror = deflateEnd(&m_z);
-		if ( zerror != Z_OK ) {
+		if (zerror != Z_OK) {
 			AddDebugLogLineN(logEC, "WritePacket: ZLib error");
 			ShowZError(zerror, &m_z);
 		}
@@ -864,9 +1018,8 @@
 	return packet_len;
 }
 
-
-void CECSocket::SendCachedBodyResponse(uint8_t opcode,
-	const std::vector<std::shared_ptr<const std::vector<unsigned char> > > &blobs)
+void CECSocket::SendCachedBodyResponse(
+	uint8_t opcode, const std::vector<std::shared_ptr<const std::vector<unsigned char>>> &blobs)
 {
 	if (SocketRealError()) {
 		OnError();
@@ -875,15 +1028,14 @@
 
 	// Remember where in the output queue our bytes start, so the
 	// length-patch at the end touches the right CQueuedData.
-	std::list<CQueuedData*>::iterator outputStart = m_output_queue.begin();
+	std::list<CQueuedData *>::iterator outputStart = m_output_queue.begin();
 	uint32 outputQueueSize = m_output_queue.size();
 	for (uint32 i = 1; i < outputQueueSize; i++) {
 		++outputStart;
 	}
 
-	// Sum the pre-serialized body length. Used both for the local-ZLIB-
-	// bypass decision and as a budget hint — the actual on-wire length
-	// is computed from the queue after FlushBuffers below.
+	// Sum the pre-serialized body length: the ZLIB-bypass decision and a budget hint.
+	// The on-wire length comes from the queue after FlushBuffers below.
 	uint32 body_bytes = 0;
 	for (size_t i = 0; i < blobs.size(); ++i) {
 		if (blobsi) {
@@ -891,22 +1043,23 @@
 		}
 	}
 
-	// Same flag-byte logic as WritePacket. Cached blobs were
-	// serialized assuming UTF-8 numbers + LARGE_TAG_COUNT, so both
-	// bits must end up in the wire flag; we OR them in unconditionally
-	// and then mask against m_my_flags — callers should only invoke
-	// this method on connections that negotiated both capabilities.
+	// Same flag-byte logic as WritePacket. Cached blobs were serialized assuming UTF-8
+	// numbers + LARGE_TAG_COUNT, so both bits must end up in the wire flag; they are
+	// OR'd in unconditionally and then masked against m_my_flags, so callers must only
+	// use this on connections that negotiated both.
 	uint32_t flags = 0x20;
-	const bool local_bypass_zlib = m_isLocalPeer
-		&& body_bytes <= kLocalPeerZlibBypassMax;
-	if (body_bytes > EC_MAX_UNCOMPRESSED
-		&& ((m_my_flags & EC_FLAG_ZLIB) > 0)
-		&& !local_bypass_zlib) {
+	const bool local_bypass_zlib = m_isLocalPeer && body_bytes <= kLocalPeerZlibBypassMax;
+	if (body_bytes > EC_MAX_UNCOMPRESSED && ((m_my_flags & EC_FLAG_ZLIB) > 0) && !local_bypass_zlib) {
 		flags |= EC_FLAG_ZLIB;
 	}
 	flags |= EC_FLAG_UTF8_NUMBERS;
 	flags |= EC_FLAG_LARGE_TAG_COUNT;
 	flags &= m_my_flags;
+	// After the mask, not before: EC_FLAG_ENCRYPTED is connection state rather than a
+	// capability the peer advertised, and m_my_flags would strip it.
+	if (m_crypt_enabled) {
+		flags |= EC_FLAG_ENCRYPTED;
+	}
 	m_tx_flags = flags;
 
 	if (flags & EC_FLAG_ZLIB) {
@@ -922,6 +1075,10 @@
 		}
 	}
 
+	// Size this packet's blocks before the first byte goes in, from the blob total
+	// above. The bodies are already serialised, so this is the exact pre-ZLIB length.
+	SizeTxChunks(body_bytes);
+
 	uint32_t tmp_flags = ENDIAN_HTONL(flags);
 	WriteBufferToSocket(&tmp_flags, sizeof(uint32));
 
@@ -933,15 +1090,12 @@
 	// applied consistent with the rest of the body.
 	WriteNumber(&opcode, sizeof(uint8_t));
 
-	// Children count framing mirrors CECTag::WriteChildren: under
-	// LARGE_TAG_COUNT use the sentinel-extended format for counts at
-	// or above 0xFFFF; otherwise emit uint16 directly (with the
-	// 0xFFFE cap that the spec uses for backward-compat).
+	// Children count framing mirrors CECTag::WriteChildren: under LARGE_TAG_COUNT the
+	// sentinel-extended format for counts at or above 0xFFFF, otherwise a uint16 with
+	// the spec's 0xFFFE backward-compat cap.
 	const size_t count = blobs.size();
 	const bool useLargeCount = (flags & EC_FLAG_LARGE_TAG_COUNT) != 0;
-	const size_t writeCount = useLargeCount
-		? count
-		: std::min(count, (size_t)0xFFFE);
+	const size_t writeCount = useLargeCount ? count : std::min(count, (size_t)0xFFFE);
 	if (useLargeCount && count >= 0xFFFF) {
 		uint16 marker = 0xFFFF;
 		WriteNumber(&marker, sizeof(marker));
@@ -952,8 +1106,7 @@
 		WriteNumber(&tmp16, sizeof(tmp16));
 	}
 
-	// Per-file blobs are already wire-format byte streams (one full
-	// child tag each). Feed them through WriteBuffer in one call —
+	// Per-file blobs are already wire-format byte streams (one full child tag each).
 	// WriteBuffer handles deflate when EC_FLAG_ZLIB is set in m_tx_flags.
 	size_t emitted = 0;
 	for (size_t i = 0; i < count && emitted < writeCount; ++i) {
@@ -970,9 +1123,27 @@
 	} else {
 		outputStart = m_output_queue.begin();
 	}
+
+	// Seal the body, exactly as WritePacket does and for the same reasons: after
+	// FlushBuffers so ZLIB has produced its bytes (serialise -> deflate -> seal), and
+	// before the length is summed so the patched length covers ciphertext plus tag.
+	//
+	// Without this the flag byte above still advertises EC_FLAG_ENCRYPTED -- OR'd in
+	// from m_crypt_enabled after the m_my_flags mask, being connection state rather
+	// than a negotiated capability -- while the body goes out as plaintext. The peer
+	// then fails to verify a tag that was never written and drops the connection
+	// through the one path in ReadPacket that logs only at debug level, so the
+	// disconnect is silent at both ends.
+	if (flags & EC_FLAG_ENCRYPTED) {
+		if (!SealOutputQueue(outputStart)) {
+			AddDebugLogLineN(logEC, "SendCachedBodyResponse: sealing failed");
+			CloseAndDispatchLost();
+			return;
+		}
+	}
+
 	uint32 actual_len = 0;
-	for (std::list<CQueuedData*>::iterator it = outputStart;
-		it != m_output_queue.end(); ++it) {
+	for (std::list<CQueuedData *>::iterator it = outputStart; it != m_output_queue.end(); ++it) {
 		actual_len += (uint32_t)(*it)->GetDataLength();
 	}
 	actual_len -= EC_HEADER_SIZE;
@@ -990,6 +1161,28 @@
 	OnOutput();
 }
 
+bool CECSocket::OpenReceivedBody()
+{
+	const size_t total = m_curr_rx_data->GetDataLength();
+	if (total < ECCrypt::AEAD_TAG_LEN) {
+		return false;
+	}
+	const size_t bodyLen = total - ECCrypt::AEAD_TAG_LEN;
+	unsigned char *data = m_curr_rx_data->GetDataPtr();
+	if (!m_crypt.OpenBegin() || !m_crypt.OpenUpdate(data, bodyLen) ||
+		!m_crypt.OpenFinal(data + bodyLen)) {
+		return false;
+	}
+	// Hide the tag from the parser: everything downstream expects the body to end
+	// where the plaintext ends.
+	//
+	// Deliberately no Rewind() here. Rewind() moves the *write* pointer back to the
+	// start as well, which would leave the buffer logically empty and hand the parser
+	// a zero-length body. The read pointer is already at the start -- ReadHeader
+	// rewound, and filling the body only advanced the write pointer.
+	m_curr_rx_data->TruncateBy(ECCrypt::AEAD_TAG_LEN);
+	return true;
+}
 
 const CECPacket *CECSocket::ReadPacket()
 {
@@ -997,38 +1190,70 @@
 
 	uint32_t flags = m_rx_flags;
 
-	if ( ((flags & 0x60) != 0x20) || (flags & EC_FLAG_UNKNOWN_MASK) ) {
+	if (((flags & 0x60) != 0x20) || (flags & EC_FLAG_UNKNOWN_MASK)) {
 		// Protocol error - other end might use an older protocol
 		AddDebugLogLineN(logEC, "ReadPacket: protocol error");
-		cout << "ReadPacket: packet have invalid flags " << flags << endl;
+		cout << "ReadPacket: packet have invalid flags " << flags << '\n';
 		CloseAndDispatchLost();
 		return 0;
 	}
 
+	if (flags & EC_FLAG_ENCRYPTED) {
+		if (!m_crypt_ready) {
+			// A sealed packet before the keys exist is either a protocol
+			// error or someone trying their luck.
+			AddDebugLogLineN(logEC, "ReadPacket: encrypted packet before key setup");
+			CloseAndDispatchLost();
+			return nullptr;
+		}
+		if (!OpenReceivedBody()) {
+			// A failed tag is the tamper signal, and it is not recoverable: the
+			// stream is no longer trustworthy.
+			//
+			// Reported unconditionally, on stderr. This is one of four ways
+			// ReadPacket can drop a connection and was the only silent one, which
+			// is backwards: the other three are protocol or zlib errors, while this
+			// one fires on tampering or on a peer that flags a packet as sealed
+			// without sealing it. One line per dropped connection, not per packet:
+			// the drop happens immediately below.
+			AddDebugLogLineN(logEC, "ReadPacket: authentication failed, dropping connection");
+			fprintf(stderr,
+				"amule: EC packet failed authentication (flagged encrypted but the tag "
+				"did not verify) - dropping the connection.\n");
+			fflush(stderr);
+			CloseAndDispatchLost();
+			return nullptr;
+		}
+	}
+
 	if (flags & EC_FLAG_ZLIB) {
 
-	    m_z.zalloc = Z_NULL;
-	    m_z.zfree = Z_NULL;
-	    m_z.opaque = Z_NULL;
-	    m_z.avail_in = 0;
-	    m_z.next_in = 0;
+		m_z.zalloc = Z_NULL;
+		m_z.zfree = Z_NULL;
+		m_z.opaque = Z_NULL;
+		m_z.avail_in = 0;
+		m_z.next_in = 0;
 
 		int zerror = inflateInit(&m_z);
 		if (zerror != Z_OK) {
 			AddDebugLogLineN(logEC, "ReadPacket: zlib error");
 			ShowZError(zerror, &m_z);
-			cout << "ReadPacket: failed zlib init" << endl;
+			cout << "ReadPacket: failed zlib init" << '\n';
 			CloseAndDispatchLost();
 			return 0;
 		}
 	}
 
+	// Record how this packet arrived so the app dispatch can reject a
+	// cleartext packet injected into a session that negotiated encryption.
+	m_last_rx_encrypted = (flags & EC_FLAG_ENCRYPTED) != 0;
+
 	m_curr_rx_data->ToZlib(m_z);
 	packet = new CECPacket();
 
 	if (!packet->ReadFromSocket(*this)) {
 		AddDebugLogLineN(logEC, "ReadPacket: error in packet read");
-		cout << "ReadPacket: error in packet read" << endl;
+		cout << "ReadPacket: error in packet read" << '\n';
 		delete packet;
 		packet = NULL;
 		CloseAndDispatchLost();
@@ -1036,10 +1261,10 @@
 
 	if (flags & EC_FLAG_ZLIB) {
 		int zerror = inflateEnd(&m_z);
-		if ( zerror != Z_OK ) {
+		if (zerror != Z_OK) {
 			AddDebugLogLineN(logEC, "ReadPacket: zlib error");
 			ShowZError(zerror, &m_z);
-			cout << "ReadPacket: failed zlib free" << endl;
+			cout << "ReadPacket: failed zlib free" << '\n';
 			CloseAndDispatchLost();
 		}
 	}

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECSocket.h -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECSocket.h Changed

@@ -26,21 +26,23 @@
 #ifndef ECSOCKET_H
 #define ECSOCKET_H
 
-
-#include <deque>	// Needed for std::deque
-#include <memory>	// Needed for std::shared_ptr
+#include <deque>  // Needed for std::deque
+#include <memory> // Needed for std::shared_ptr
 #include <string>
 #include <vector>
 
-#include <zlib.h>	// Needed for packet (de)compression
-#include "../../../Types.h"	// Needed for uint32_t
+#include <zlib.h>           // Needed for packet (de)compression
+#include "../../../Types.h" // Needed for uint32_t
+
+#include "ECCrypt.h"
 
-#include <wx/defs.h>	// Needed for wx/debug.h
-#include <wx/debug.h>	// Needed for wxASSERT
+#include <wx/defs.h>  // Needed for wx/debug.h
+#include <wx/debug.h> // Needed for wxASSERT
 
-#include <common/SmartPtr.h>	// Needed for CSmartPtr
+#include <common/SmartPtr.h> // Needed for CSmartPtr
 
-enum ECSocketErrors {
+enum ECSocketErrors
+{
 	EC_ERROR_NOERROR,
 	EC_ERROR_INVOP,
 	EC_ERROR_IOERR,
@@ -58,25 +60,26 @@
 class CQueuedData;
 
 /*! \class CECSocket
- *
- * \brief Socket handler for External Communications (EC).
- *
- * CECSocket takes care of the transmission of EC packets
+ * \brief Socket handler for External Communications (EC), i.e. the transmission
+ * of EC packets.
  */
 
-class CECSocket{
+class CECSocket
+{
 	friend class CECPacket;
 	friend class CECTag;
-	// CECMemSocket is a CECSocket subclass that captures all I/O into
-	// an in-memory vector. To finish a serialization round it needs to
-	// reach the FlushBuffers / m_output_queue drain machinery that the
-	// real-socket path normally accesses via the friend declarations
-	// above. Granting it friendship avoids weakening the visibility of
-	// those primitives for everyone else.
+	// CECMemSocket captures all I/O into an in-memory vector. To finish a
+	// serialization round it needs the FlushBuffers / m_output_queue drain machinery
+	// the real-socket path reaches via the friend declarations above.
 	friend class CECMemSocket;
 
 private:
 	static const unsigned int EC_SOCKET_BUFFER_SIZE = 2048;
+	// Cap on one queued output block. The tx path used to reuse
+	// EC_SOCKET_BUFFER_SIZE, so every packet left in 2 KB writes and each one's
+	// sub-MSS remainder became a segment of its own. A cap and not a size:
+	// TxChunkSize() asks for what the packet needs and no more.
+	static const unsigned int EC_SOCKET_TX_CHUNK_MAX = 64 * 1024;
 	static const unsigned int EC_HEADER_SIZE = 8;
 	const bool m_use_events;
 
@@ -95,49 +98,120 @@
 	size_t m_bytes_needed;
 	bool m_in_header;
 
-
 	uint32_t m_curr_packet_len;
 	z_stream m_z;
 
+	// --- transport encryption -------------------------------------------
+	//
+	// Keys are derived once the handshake has both nonces and the chosen cipher.
+	// m_crypt_ready says the keys exist; m_crypt_enabled says to seal outgoing
+	// packets. Separate because the packet that completes the handshake must still go
+	// out in clear -- the client sends EC_OP_AUTH_PASSWD unencrypted and only then
+	// switches on, which m_crypt_enable_after_write expresses. Incoming packets are
+	// decided per packet by EC_FLAG_ENCRYPTED.
+	ECCrypt::Session m_crypt;
+	bool m_crypt_ready;
+	bool m_crypt_enabled;
+	bool m_crypt_enable_after_write;
+
+	// Whether the packet ReadPacket last returned arrived sealed, so the app dispatch
+	// can reject cleartext injected into a session that negotiated encryption.
+	bool m_last_rx_encrypted;
+
 protected:
+	// Pure arithmetic, protected rather than private so a test can pin the floor and
+	// the cap without standing up a socket (see CECMemSocket).
+	static size_t TxChunkSize(uint32 bodyLen);
+
+	// IsCryptReady() is true once keys exist, i.e. the session negotiated AEAD;
+	// WasLastPacketEncrypted() reports how the last packet arrived.
+	bool IsCryptReady() const { return m_crypt_ready; }
+	bool WasLastPacketEncrypted() const { return m_last_rx_encrypted; }
+
 	uint32_t m_my_flags;
 	bool m_haveNotificationSupport;
 
-	// Daemon-internal subclasses (e.g. CECMemSocket) need to set the
-	// per-packet wire flags before invoking serialization primitives
-	// like CECTag::Serialize that read m_tx_flags directly (without
-	// going through WritePacket). Promoting just the setter keeps the
-	// rest of m_tx_flags' lifecycle private to WritePacket / WriteBuffer.
+	// Daemon-internal subclasses (e.g. CECMemSocket) must set the per-packet wire
+	// flags before calling serialization primitives like CECTag::Serialize, which read
+	// m_tx_flags directly. Promoting just the setter keeps the rest of m_tx_flags'
+	// lifecycle private to WritePacket / WriteBuffer.
 	void SetTxFlags(uint32_t flags) { m_tx_flags = flags; }
 
-	// When true, the peer is on loopback / RFC1918 LAN / RFC3927
-	// link-local — i.e. the wire cost of an uncompressed response
-	// is irrelevant. WritePacket consults this to skip ZLIB on
-	// every packet up to a size threshold; large packets still
-	// compress so we never blow the receiver's 256 MB packet
-	// budget (ReadHeader gate). Default false (treat as remote).
+	// True when the peer is on loopback / RFC1918 LAN / RFC3927 link-local, i.e. the
+	// wire cost of an uncompressed response is irrelevant. WritePacket then skips ZLIB
+	// up to a size threshold; large packets still compress so we never blow the
+	// receiver's 256 MB packet budget (ReadHeader gate).
 	bool m_isLocalPeer;
+
 public:
 	CECSocket(bool use_events);
 	virtual ~CECSocket();
 
 	bool ConnectSocket(uint32_t ip, uint16_t port);
 
+	// Reset the EC packet layer to its just-constructed state so the SAME socket
+	// object can be reused for a fresh connection (amulegui reconnect, issue #444).
+	// Drops queued output and rewinds the RX/TX reassembly to "expecting a header";
+	// without this a mid-packet read left over from the drop misparses the reconnected
+	// session's first bytes and the login handshake fails.
+	void ResetProtocolState();
+
+	/**
+	 * Drop the capability bits agreed with the previous peer, keeping the ones this
+	 * end chose locally. Only for a caller reusing this object against a different
+	 * peer; the definition says why it is separate from ResetProtocolState.
+	 */
+	void ClearPeerNegotiatedFlags();
+
 	void CloseSocket() { InternalClose(); }
 
-	// Locally-initiated abort: CloseSocket + OnLost. Use from the
-	// protocol-error paths in ReadHeader / ReadPacket where we close
-	// the socket ourselves. CAsioSocketImpl::Close sets m_closed = true
-	// before the asio close, which then suppresses the operation_aborted
-	// path through HandleRead → PostLostEvent (the m_closed gate at
-	// LibSocketAsio.cpp:695), so the wrapper's OnLost never fires from
-	// the asio side. Without an explicit dispatch the EC client (e.g.
-	// amulegui) never finds out the connection is gone — same #757
-	// "wedge" class of bug as the kernel-FIN miss, just on the
-	// self-close leg. Sites that already have their own UI-facing
-	// notification (CRemoteConnect::ProcessAuthPacket fires
-	// wxEVT_EC_CONNECTION directly) keep using plain CloseSocket.
-	void CloseAndDispatchLost() { InternalClose(); OnLost(); }
+	/// Seal the queued body chunks in place and append the tag chunk.
+	bool SealOutputQueue(std::list<CQueuedData *>::iterator outputStart);
+
+	/// Open the received body in place and drop the verified tag.
+	bool OpenReceivedBody();
+
+	/**
+	 * Derive the session keys for this connection. Does not start sealing on its
+	 * own -- see EnableAEADAfterNextWrite() and EnableAEADNow(). Incoming packets
+	 * can be opened as soon as this succeeds, which lets the two ends switch over
+	 * one packet apart.
+	 *
+	 * @return false if the cipher is unsupported or the nonces are malformed.
+	 */
+	bool SetupAEAD(uint8_t cipher,
+		const std::vector<uint8_t> &ikm,
+		const std::vector<uint8_t> &serverNonce,
+		const std::vector<uint8_t> &clientNonce,
+		const std::vector<uint8_t> &transcript,
+		bool isServer);
+
+	/// Seal everything after the packet currently being sent. The client uses
+	/// this so its EC_OP_AUTH_PASSWD leaves in clear but the reply is sealed.
+	void EnableAEADAfterNextWrite() { m_crypt_enable_after_write = m_crypt_ready; }
+
+	/// Seal from the next packet on. The daemon uses this once the password checks
+	/// out, so EC_OP_AUTH_OK is itself sealed -- proof that it holds the password.
+	void EnableAEADNow() { m_crypt_enabled = m_crypt_ready; }
+
+	bool IsAEADReady() const { return m_crypt_ready; }
+	bool IsAEADEnabled() const { return m_crypt_enabled; }
+	uint8_t GetAEADCipher() const { return m_crypt.GetCipher(); }
+
+	// Locally-initiated abort: CloseSocket + OnLost. Use from the protocol-error paths
+	// in ReadHeader / ReadPacket where we close the socket ourselves.
+	// CAsioSocketImpl::Close sets m_closed = true before the asio close, which
+	// suppresses the operation_aborted path through HandleRead -> PostLostEvent
+	// (LibSocketAsio.cpp:695), so the wrapper's OnLost never fires from the asio side.
+	// Without an explicit dispatch the EC client never finds out the connection is
+	// gone -- the same #757 "wedge" as the kernel-FIN miss, on the self-close leg.
+	// Sites with their own UI-facing notification (CRemoteConnect::ProcessAuthPacket
+	// fires wxEVT_EC_CONNECTION) keep using plain CloseSocket.
+	void CloseAndDispatchLost()
+	{
+		InternalClose();
+		OnLost();
+	}
 
 	bool HaveNotificationSupport() const { return m_haveNotificationSupport; }
 
@@ -146,115 +220,76 @@
 	void SetLocalPeer(bool isLocal) { m_isLocalPeer = isLocal; }
 
 	/**
-	 * Sends an EC packet and returns immediately.
-	 *
-	 * @param packet The CECPacket packet to be sent.
-	 *
-	 * This is an asynchronous call, the function returns
-	 * immediately and the packet is sent on idle time.
+	 * Sends an EC packet and returns immediately; it goes out on idle time.
 	 *
-	 * @note It's the caller's responsibility to \c delete
-	 * the \e packet.
+	 * @param packet The CECPacket packet to be sent. The caller must \c delete it.
 	 */
 	void SendPacket(const CECPacket *packet);
 
 	/**
-	 * Send a response whose body has already been pre-serialized
-	 * outside the normal CECPacket → WritePacket pipeline. Each blob
-	 * is the byte-form of one top-level child tag (as produced by
-	 * CECMemSocket::SerializeTag).
+	 * Send a response whose body was pre-serialized outside the normal CECPacket ->
+	 * WritePacket pipeline. Each blob is the byte-form of one top-level child tag, as
+	 * produced by CECMemSocket::SerializeTag.
 	 *
-	 * The flag-byte / length-header / per-connection compression /
-	 * length-patch dance is identical to what SendPacket → WritePacket
-	 * does — concentrated here so callers don't reach into CECSocket's
-	 * private buffer machinery.
+	 * The flag-byte / length-header / per-connection compression / length-patch dance
+	 * is the same one SendPacket -> WritePacket does, concentrated here so callers
+	 * need not reach into CECSocket's private buffer machinery.
 	 *
-	 * Wire format constraints on the cached blobs: UTF-8 numbers +
-	 * LARGE_TAG_COUNT, no zlib (compression is layered on per-
-	 * connection at this layer if required). Both capability bits are
-	 * forced on in the wire flag byte regardless of negotiation; clients
-	 * that didn't advertise them aren't served from the cache (the
-	 * caller decides the eligibility).
+	 * The cached blobs must be UTF-8 numbers + LARGE_TAG_COUNT and uncompressed;
+	 * compression is layered on per connection at this layer. Both capability bits are
+	 * forced on in the wire flag byte regardless of negotiation, so the caller must
+	 * not serve the cache to a client that did not advertise them.
 	 *
 	 * @param opcode The packet opcode the receiver should see.
 	 * @param blobs One pre-serialized child tag per element.
 	 */
-	void SendCachedBodyResponse(uint8_t opcode,
-		const std::vector<std::shared_ptr<const std::vector<unsigned char> > > &blobs);
+	void SendCachedBodyResponse(
+		uint8_t opcode, const std::vector<std::shared_ptr<const std::vector<unsigned char>>> &blobs);
 
 	/**
-	 * Sends an EC packet and waits for a reply.
+	 * Sends an EC packet and blocks until the reply arrives or the request times out.
+	 * OnPacketReceived() is not called for packets received this way.
 	 *
 	 * @param request The CECPacket packet to be sent.
-	 * @return The reply packet for the request.
+	 * @return The reply, heap-allocated with \c new, or \c NULL on timeout.
 	 *
-	 * Unlike SendPacket(), this call is synchronous and blocking.
-	 * The packet is sent immediately (or at least as soon as possible),
-	 * and the function does not return until a reply is received,
-	 * or a timeout encountered.
-	 *
-	 * The returned packet will be allocated on the heap with \c new,
-	 * or \c NULL is returned in case of an error (timeout).
-	 *
-	 * @note It's the caller's responsibility to \c delete both
-	 * request and reply.
-	 *
-	 * @note OnPacketReceived() won't be called for packets
-	 * received via this function.
+	 * @note It's the caller's responsibility to \c delete both request and reply.
 	 */
 	const CECPacket *SendRecvPacket(const CECPacket *request);
 
 	/**
-	 * Event handler function called when a new packet is received.
+	 * Event handler called when a new packet is received. Not called for packets
+	 * received via SendRecvPacket().
+	 *
+	 * The application processes the packet here and returns a reply allocated on the
+	 * heap with \c new, or \c NULL if none is needed. The library \c deletes both
+	 * packets.
 	 *
 	 * @param packet The packet that has been received.
 	 * @return The reply packet or \c NULL if no reply needed.
-	 *
-	 * In this function the application should process the received
-	 * packet, and create a reply if necessary. The reply must be allocated
-	 * on the heap with \c new. If no reply is necessary, the return
-	 * value of the function should be \c NULL. The library will \c delete
-	 * both packets.
-	 *
-	 * @note This function won't be called for packets received via the
-	 * SendRecvPacket() function.
 	 */
 	virtual const CECPacket *OnPacketReceived(const CECPacket *packet, uint32 trueSize);
 
 	/**
-	 * Get a message describing the error.
-	 *
-	 * @param error The code of the error for which a message should be returned.
-	 * @return The text describing the error.
+	 * @return Text describing the last error.
 	 */
-	virtual std::string	GetLastErrorMsg();
+	virtual std::string GetLastErrorMsg();
 
 	/**
-	 * Error handler.
-	 *
-	 * This function is called when an error occurs. Use GetLastError() and
-	 * GetErrorMsg() to find out the nature of the error.
-	 *
-	 * The default error handler prints out an error message in debug builds,
-	 * and destroys the socket.
+	 * Error handler, called when an error occurs. Use GetLastError() and
+	 * GetErrorMsg() to find out its nature. The default prints a message in debug
+	 * builds and destroys the socket.
 	 */
 	virtual void OnError();
 
-
 	/**
-	 * Socket lost event handler.
-	 *
-	 * This function is called when the socket is lost (either because of a network
-	 * failure or because the remote end closed the socket gracefully).
-	 *
-	 * The default handler destroys the socket.
+	 * Socket lost event handler: the network failed or the remote end closed the
+	 * socket gracefully. The default handler destroys the socket.
 	 */
 	virtual void OnLost();
 
 	/**
-	 * Event handler for connection events.
-	 *
-	 * This function is called when a connection attempt succeeds.
+	 * Event handler called when a connection attempt succeeds.
 	 */
 	virtual void OnConnect();
 
@@ -264,37 +299,39 @@
 	bool WouldBlock() { return InternalGetLastError() == EC_ERROR_WOULDBLOCK; }
 	bool GotError() { return InternalGetLastError() != EC_ERROR_NOERROR; }
 
-	uint32 SocketRead(void* ptr, size_t len) { return InternalRead(ptr,len); }
-	uint32 SocketWrite(const void* ptr, size_t len) { return InternalWrite(ptr,len); }
+	uint32 SocketRead(void *ptr, size_t len) { return InternalRead(ptr, len); }
+	uint32 SocketWrite(const void *ptr, size_t len) { return InternalWrite(ptr, len); }
 	bool SocketError() { return InternalError() && GotError(); }
 	bool SocketRealError();
 
-	bool WaitSocketConnect(long secs = -1, long msecs = 0) { return InternalWaitOnConnect(secs,msecs); }
-	bool WaitSocketWrite(long secs = -1, long msecs = 0) { return InternalWaitForWrite(secs,msecs); }
-	bool WaitSocketRead(long secs = -1, long msecs = 0) { return InternalWaitForRead(secs,msecs); }
+	bool WaitSocketConnect(long secs = -1, long msecs = 0) { return InternalWaitOnConnect(secs, msecs); }
+	bool WaitSocketWrite(long secs = -1, long msecs = 0) { return InternalWaitForWrite(secs, msecs); }
+	bool WaitSocketRead(long secs = -1, long msecs = 0) { return InternalWaitForRead(secs, msecs); }
 
 	bool IsSocketConnected() { return InternalIsConnected(); }
 
 	void DestroySocket() { return InternalDestroy(); }
 
 	bool DataPending();
- private:
+
+private:
 	const CECPacket *ReadPacket();
 	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 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);
+	bool WriteNumber(const void *buffer, size_t len);
+	bool WriteBuffer(const void *buffer, size_t len);
 
 	// Internal stuff
-	bool	FlushBuffers();
+	bool FlushBuffers();
+	void SizeTxChunks(uint32 bodyLen);
 
-	size_t	ReadBufferFromSocket(void *buffer, size_t len);
-	void	WriteBufferToSocket(const void *buffer, size_t len);
+	size_t ReadBufferFromSocket(void *buffer, size_t len);
+	void WriteBufferToSocket(const void *buffer, size_t len);
 
 	/* virtuals */
 	virtual void WriteDoneAndQueueEmpty() = 0;
@@ -309,8 +346,8 @@
 
 	virtual void InternalClose() = 0;
 	virtual bool InternalError() = 0;
-	virtual uint32 InternalRead(void* ptr, uint32 len) = 0;
-	virtual uint32 InternalWrite(const void* ptr, uint32 len) = 0;
+	virtual uint32 InternalRead(void *ptr, uint32 len) = 0;
+	virtual uint32 InternalWrite(const void *ptr, uint32 len) = 0;
 
 	virtual bool InternalIsConnected() = 0;
 	virtual void InternalDestroy() = 0;
@@ -319,33 +356,37 @@
 	virtual bool IsAuthorized() { return true; }
 };
 
-
 class CQueuedData
 {
 	std::vector<unsigned char> m_data;
 	unsigned char *m_rd_ptr, *m_wr_ptr;
+
 public:
 	CQueuedData(size_t len)
-	:
-	m_data(len)
+	: m_data(len)
 	{
 		m_rd_ptr = m_wr_ptr = &m_data0;
 	}
 
 	~CQueuedData() {}
 
-	void Rewind()
-	{
-		m_rd_ptr = m_wr_ptr = &m_data0;
-	}
+	void Rewind() { m_rd_ptr = m_wr_ptr = &m_data0; }
 
 	void Write(const void *data, size_t len);
 	void WriteAt(const void *data, size_t len, size_t off);
 	void Read(void *data, size_t len);
 
 	/*
-	 * Pass pointers to zlib. From now on, no Read() calls are allowed
+	 * Start of the buffered bytes, for transforms that rewrite the payload in place.
+	 * Used by the AEAD path in WritePacket / ReadPacket; flattening the queue into a
+	 * scratch buffer would double peak memory on the largest packets.
 	 */
+	unsigned char *GetDataPtr() { return &m_data0; }
+
+	/* Drop @a len bytes from the end (the AEAD tag, once verified). */
+	void TruncateBy(size_t len);
+
+	// Pass pointers to zlib. From now on, no Read() calls are allowed
 	void ToZlib(z_stream &m_z)
 	{
 		m_z.avail_in = (uInt)GetUnreadDataLength();

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECSpecialTags.cpp -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECSpecialTags.cpp Changed

@@ -23,65 +23,68 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include "ECTag.h"         // Needed for CECTag
+#include "ECSpecialTags.h" // Needed for special EC tag creator classes
 
-#include "ECTag.h"		// Needed for CECTag
-#include "ECSpecialTags.h"	// Needed for special EC tag creator classes
+#include <common/Format.h> // Needed for CFormat
 
-#include <common/Format.h>		// Needed for CFormat
-
-#include "../../../OtherFunctions.h"	// Needed for CastXtoY
-#include "../../../Constants.h"			// Needed for PS_*
+#include "../../../OtherFunctions.h" // Needed for CastXtoY
+#include "../../../Constants.h"      // Needed for PS_*
 
 wxString CEC_PartFile_Tag::GetFileStatusString() const
 {
 	uint8 nFileStatus = FileStatus();
 
-        if ((nFileStatus == PS_HASHING) || (nFileStatus == PS_WAITING_FOR_HASH)) {
-                return _("Hashing");
-        } else {
-                switch (nFileStatus) {
-                        case PS_COMPLETING:
-                                return _("Completing");
-                        case PS_COMPLETE:
-                                return _("Complete");
-                        case PS_PAUSED:
-                                return _("Paused");
-                        case PS_ERROR:
-                                return _("Erroneous");
-                        default:
-                                if (SourceXferCount() > 0) {
-                                        return _("Downloading");
-                                } else {
-                                        return _("Waiting");
-                                }
-                }
-                // if stopped
-        }
+	if ((nFileStatus == PS_HASHING) || (nFileStatus == PS_WAITING_FOR_HASH)) {
+		return _("Hashing");
+	} else {
+		switch (nFileStatus) {
+		case PS_COMPLETING:
+			return _("Completing");
+		case PS_COMPLETE:
+			return _("Complete");
+		case PS_PAUSED:
+			return _("Paused");
+		case PS_ERROR:
+			return _("Erroneous");
+		default:
+			if (SourceXferCount() > 0) {
+				return _("Downloading");
+			} else {
+				return _("Waiting");
+			}
+		}
+		// if stopped
+	}
 }
 
-//
 // Search request
-//
-CEC_Search_Tag::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) : CECTag(EC_TAG_SEARCH_TYPE, (uint32)search_type)
+CEC_Search_Tag::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)
+: CECTag(EC_TAG_SEARCH_TYPE, (uint32)search_type)
 {
 	AddTag(CECTag(EC_TAG_SEARCH_NAME, name));
 	AddTag(CECTag(EC_TAG_SEARCH_FILE_TYPE, file_type));
-	if ( !extension.IsEmpty() ) {
+	if (!extension.IsEmpty()) {
 		AddTag(CECTag(EC_TAG_SEARCH_EXTENSION, extension));
 	}
-	if ( avail ) {
+	if (avail) {
 		AddTag(CECTag(EC_TAG_SEARCH_AVAILABILITY, avail));
 	}
-	if ( min_size != 0 ) {
+	if (min_size != 0) {
 		AddTag(CECTag(EC_TAG_SEARCH_MIN_SIZE, min_size));
 	}
-	if ( max_size != 0 ) {
+	if (max_size != 0) {
 		AddTag(CECTag(EC_TAG_SEARCH_MAX_SIZE, max_size));
 	}
 }
 
-static void FormatValue(CFormat& format, const CECTag* tag)
+static void FormatValue(CFormat &format, const CECTag *tag)
 {
 	wxASSERT(tag->GetTagName() == EC_TAG_STAT_NODE_VALUE);
 
@@ -89,52 +92,54 @@
 	const CECTag *tmp_tag = tag->GetTagByName(EC_TAG_STAT_NODE_VALUE);
 	if (tmp_tag) {
 		wxString tmp_fmt;
-		const CECTag* tmp_vt = tmp_tag->GetTagByName(EC_TAG_STAT_VALUE_TYPE);
-		EC_STATTREE_NODE_VALUE_TYPE tmp_valueType = tmp_vt != NULL ? (EC_STATTREE_NODE_VALUE_TYPE)tmp_vt->GetInt() : EC_VALUE_INTEGER;
+		const CECTag *tmp_vt = tmp_tag->GetTagByName(EC_TAG_STAT_VALUE_TYPE);
+		EC_STATTREE_NODE_VALUE_TYPE tmp_valueType =
+			tmp_vt != NULL ? (EC_STATTREE_NODE_VALUE_TYPE)tmp_vt->GetInt() : EC_VALUE_INTEGER;
 		switch (tmp_valueType) {
-			case EC_VALUE_INTEGER:
-				tmp_fmt = "%llu";
-				break;
-			case EC_VALUE_DOUBLE:
-				tmp_fmt = "%.2f%%";	// it's used for percentages
-				break;
-			default:
-				tmp_fmt = "%s";
+		case EC_VALUE_INTEGER:
+			tmp_fmt = "%llu";
+			break;
+		case EC_VALUE_DOUBLE:
+			tmp_fmt = "%.2f%%"; // it's used for percentages
+			break;
+		default:
+			tmp_fmt = "%s";
 		}
 		CFormat tmp_format(wxString(" (") + tmp_fmt + ")");
 		FormatValue(tmp_format, tmp_tag);
 		extra = tmp_format.GetString();
 	}
 
-	const CECTag* vt = tag->GetTagByName(EC_TAG_STAT_VALUE_TYPE);
-	EC_STATTREE_NODE_VALUE_TYPE valueType = vt != NULL ? (EC_STATTREE_NODE_VALUE_TYPE)vt->GetInt() : EC_VALUE_INTEGER;
+	const CECTag *vt = tag->GetTagByName(EC_TAG_STAT_VALUE_TYPE);
+	EC_STATTREE_NODE_VALUE_TYPE valueType =
+		vt != NULL ? (EC_STATTREE_NODE_VALUE_TYPE)vt->GetInt() : EC_VALUE_INTEGER;
 	switch (valueType) {
-		case EC_VALUE_INTEGER:
-			format = format % tag->GetInt();
-			break;
-		case EC_VALUE_ISTRING:
-			format = format % (CFormat("%u") % tag->GetInt() + extra);
-			break;
-		case EC_VALUE_BYTES:
-			format = format % (CastItoXBytes(tag->GetInt()) + extra);
-			break;
-		case EC_VALUE_ISHORT:
-			format = format % (CastItoIShort(tag->GetInt()) + extra);
-			break;
-		case EC_VALUE_TIME:
-			format = format % (CastSecondsToHM(tag->GetInt()) + extra);
-			break;
-		case EC_VALUE_SPEED:
-			format = format % (CastItoSpeed(tag->GetInt()) + extra);
-			break;
-		case EC_VALUE_STRING:
-			format = format % (wxGetTranslation(tag->GetStringData()) + extra);
-			break;
-		case EC_VALUE_DOUBLE:
-			format = format % tag->GetDoubleData();
-			break;
-		default:
-			wxFAIL;
+	case EC_VALUE_INTEGER:
+		format = format % tag->GetInt();
+		break;
+	case EC_VALUE_ISTRING:
+		format = format % (CFormat("%u") % tag->GetInt() + extra);
+		break;
+	case EC_VALUE_BYTES:
+		format = format % (CastItoXBytes(tag->GetInt()) + extra);
+		break;
+	case EC_VALUE_ISHORT:
+		format = format % (CastItoIShort(tag->GetInt()) + extra);
+		break;
+	case EC_VALUE_TIME:
+		format = format % (CastSecondsToHM(tag->GetInt()) + extra);
+		break;
+	case EC_VALUE_SPEED:
+		format = format % (CastItoSpeed(tag->GetInt()) + extra);
+		break;
+	case EC_VALUE_STRING:
+		format = format % (wxGetTranslation(tag->GetStringData()) + extra);
+		break;
+	case EC_VALUE_DOUBLE:
+		format = format % tag->GetDoubleData();
+		break;
+	default:
+		wxFAIL;
 	}
 }
 
@@ -145,7 +150,8 @@
 	// This is needed for client names, for example
 	if (my_label == en_label) {
 		if (en_label.Right(4) == ": %s") {
-			my_label = wxGetTranslation(en_label.Mid(0, en_label.Length() - 4)) + wxString(": %s");
+			my_label =
+				wxGetTranslation(en_label.Mid(0, en_label.Length() - 4)) + wxString(": %s");
 		}
 	}
 	CFormat label(my_label);

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECSpecialTags.h -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECSpecialTags.h Changed

@@ -25,23 +25,21 @@
 #ifndef ECSPECIALTAGS_H
 #define ECSPECIALTAGS_H
 
-//#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
+// #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
 #include "../../../kademlia/utils/UInt128.h"
 
 #include <map>
 
 /*
- * Specific tags for specific requests
+ * Specific tags for specific requests.
  *
- * \note EC remote end does not need to create these packets,
- * only using the getter functions.
- *
- * Regarding this, those classes are removed from remote build,
- * that have only a constructor.
+ * The remote end only uses the getters, so classes that are nothing but a
+ * constructor are left out of the remote build.
  */
 
 class CServer;
@@ -52,360 +50,690 @@
 class CFriend;
 
 /*
- * EC tags encoder. Idea: if for an object <X>, client <Z> tag <Y> have value equal to previous
- * request, skip this tag.
+ * EC tag encoder: skip a tag whose value is unchanged since the last request
+ * for the same object and client.
  */
 
-class CValueMap {
-		/*
-		 * Tag -> LastValue map. Hold last value that transmitted to remote side
-		 */
-		std::map<ec_tagname_t, uint8> m_map_uint8;
-		std::map<ec_tagname_t, uint16> m_map_uint16;
-		std::map<ec_tagname_t, uint32> m_map_uint32;
-		std::map<ec_tagname_t, uint64> m_map_uint64;
-		std::map<ec_tagname_t, CMD4Hash> m_map_md4;
-		std::map<ec_tagname_t, CUInt128> m_map_uint128;
-		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)
-		{
-			if ( (map.count(tagname) == 0) || (maptagname != value) ) {
+class CValueMap
+{
+	// Tag -> last value transmitted to the remote side.
+	std::map<ec_tagname_t, uint8> m_map_uint8;
+	std::map<ec_tagname_t, uint16> m_map_uint16;
+	std::map<ec_tagname_t, uint32> m_map_uint32;
+	std::map<ec_tagname_t, uint64> m_map_uint64;
+	std::map<ec_tagname_t, CMD4Hash> m_map_md4;
+	std::map<ec_tagname_t, CUInt128> m_map_uint128;
+	std::map<ec_tagname_t, wxString> m_map_string;
+	std::map<ec_tagname_t, double> m_map_double;
+	std::map<ec_tagname_t, bool> m_map_bool;
+	std::map<ec_tagname_t, CECTag> m_map_tag;
+
+	template <class T>
+	void CreateTagT(ec_tagname_t tagname, const T &value, std::map<ec_tagname_t, T> &map, CECTag *parent)
+	{
+		// One probe, not two. The unchanged path is the common one, and
+		// count()+operator walked the tree twice for it, plus a third to assign
+		// on a change. lower_bound doubles as the insertion hint on a miss.
+		const typename std::map<ec_tagname_t, T>::iterator it = map.lower_bound(tagname);
+		if (it != map.end() && it->first == tagname) {
+			if (it->second != value) {
 				parent->AddTag(CECTag(tagname, value));
-				maptagname = value;
+				it->second = value;
 			}
+			return;
 		}
-	public:
-		CValueMap()
-		{
-		}
-
-		CValueMap(const CValueMap &valuemap)
-		{
-			m_map_uint8 = valuemap.m_map_uint8;
-			m_map_uint16 = valuemap.m_map_uint16;
-			m_map_uint32 = valuemap.m_map_uint32;
-			m_map_uint64 = valuemap.m_map_uint64;
-			m_map_md4 = valuemap.m_map_md4;
-			m_map_uint128 = valuemap.m_map_uint128;
-			m_map_string = valuemap.m_map_string;
-			m_map_tag = valuemap.m_map_tag;
-		}
-
-		void CreateTag(ec_tagname_t tagname, uint8 value, CECTag *parent)
-		{
-			CreateTagT<uint8>(tagname, value, m_map_uint8, parent);
-		}
-
-		void CreateTag(ec_tagname_t tagname, uint16 value, CECTag *parent)
-		{
-			CreateTagT<uint16>(tagname, value, m_map_uint16, parent);
-		}
-
-		void CreateTag(ec_tagname_t tagname, uint32 value, CECTag *parent)
-		{
-			CreateTagT<uint32>(tagname, value, m_map_uint32, parent);
-		}
-
-		void CreateTag(ec_tagname_t tagname, uint64 value, CECTag *parent)
-		{
-			CreateTagT<uint64>(tagname, value, m_map_uint64, parent);
-		}
-
-		void CreateTag(ec_tagname_t tagname, CMD4Hash value, CECTag *parent)
-		{
-			CreateTagT<CMD4Hash>(tagname, value, m_map_md4, parent);
-		}
-
-		void CreateTag(ec_tagname_t tagname, CUInt128 value, CECTag *parent)
-		{
-			CreateTagT<CUInt128>(tagname, value, m_map_uint128, parent);
+		parent->AddTag(CECTag(tagname, value));
+		map.insert(it, std::pair<const ec_tagname_t, T>(tagname, value));
+	}
+
+public:
+	CValueMap() {}
+
+	CValueMap(const CValueMap &valuemap)
+	{
+		m_map_uint8 = valuemap.m_map_uint8;
+		m_map_uint16 = valuemap.m_map_uint16;
+		m_map_uint32 = valuemap.m_map_uint32;
+		m_map_uint64 = valuemap.m_map_uint64;
+		m_map_md4 = valuemap.m_map_md4;
+		m_map_uint128 = valuemap.m_map_uint128;
+		m_map_string = valuemap.m_map_string;
+		m_map_double = valuemap.m_map_double;
+		m_map_bool = valuemap.m_map_bool;
+		m_map_tag = valuemap.m_map_tag;
+	}
+
+	void CreateTag(ec_tagname_t tagname, uint8 value, CECTag *parent)
+	{
+		CreateTagT<uint8>(tagname, value, m_map_uint8, parent);
+	}
+
+	void CreateTag(ec_tagname_t tagname, uint16 value, CECTag *parent)
+	{
+		CreateTagT<uint16>(tagname, value, m_map_uint16, parent);
+	}
+
+	void CreateTag(ec_tagname_t tagname, uint32 value, CECTag *parent)
+	{
+		CreateTagT<uint32>(tagname, value, m_map_uint32, parent);
+	}
+
+	void CreateTag(ec_tagname_t tagname, uint64 value, CECTag *parent)
+	{
+		CreateTagT<uint64>(tagname, value, m_map_uint64, parent);
+	}
+
+	void CreateTag(ec_tagname_t tagname, const CMD4Hash &value, CECTag *parent)
+	{
+		CreateTagT<CMD4Hash>(tagname, value, m_map_md4, parent);
+	}
+
+	void CreateTag(ec_tagname_t tagname, const CUInt128 &value, CECTag *parent)
+	{
+		CreateTagT<CUInt128>(tagname, value, m_map_uint128, parent);
+	}
+
+	// String literals must not reach the bool overload. `const char*` -> bool is a
+	// standard conversion and beats the user-defined one to wxString, so without
+	// these the same call site would emit a BOOL tag on an incremental update and
+	// a STRING tag on a full request.
+	void CreateTag(ec_tagname_t tagname, const char *value, CECTag *parent)
+	{
+		CreateTag(tagname, wxString(value), parent);
+	}
+
+#ifdef USE_WX_EXTENSIONS
+	void CreateTag(ec_tagname_t tagname, const wxChar *value, CECTag *parent)
+	{
+		CreateTag(tagname, wxString(value), parent);
+	}
+#endif
+
+	// bool has its own CECTag constructor, so it needs its own overload: without
+	// it a bool is ambiguous across the integer overloads, and casting to one
+	// would change the wire type and break every client that reads it.
+	void CreateTag(ec_tagname_t tagname, bool value, CECTag *parent)
+	{
+		CreateTagT<bool>(tagname, value, m_map_bool, parent);
+	}
+
+	void CreateTag(ec_tagname_t tagname, double value, CECTag *parent)
+	{
+		CreateTagT<double>(tagname, value, m_map_double, parent);
+	}
+
+	// By const reference: wxString copies allocate, and the callers hand us
+	// values straight from getters that already return a reference.
+	void CreateTag(ec_tagname_t tagname, const wxString &value, CECTag *parent)
+	{
+		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_tagtagname != tag) {
+			m_map_tagtagname = tag;
+			parent->AddTag(tag);
+			ret = true;
 		}
+		return ret;
+	}
 
-		void CreateTag(ec_tagname_t tagname, wxString value, CECTag *parent)
-		{
-			CreateTagT<wxString>(tagname, value, m_map_string, parent);
-		}
+	void ForgetTag(ec_tagname_t tagname) { m_map_tag.erase(tagname); }
 
-		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_tagtagname != tag) {
-				m_map_tagtagname = tag;
-				parent->AddTag(tag);
-				ret = true;
-			}
-			return ret;
-		}
-
-		void ForgetTag(ec_tagname_t tagname)
-		{
-			m_map_tag.erase(tagname);
-		}
+	// True when a value for this tag has already gone out on this connection.
+	// Decides whether a now-absent field needs an explicit "it is gone" frame: an
+	// unoffered tag reads as UNCHANGED, since AddTag transmits only on a
+	// difference and every receiver is add-only.
+	bool HasTag(ec_tagname_t tagname) const { return m_map_tag.count(tagname) != 0; }
 };
 
-class CEC_Category_Tag : public CECTag {
-	public:
-		CEC_Category_Tag(uint32 cat_index, EC_DETAIL_LEVEL detail_level = EC_DETAIL_FULL);
-		// for create-upate commands
-		CEC_Category_Tag(uint32 cat_index, wxString name, wxString path,
-			wxString comment, uint32 color, uint8 prio);
-
-		bool Apply();
-		bool Create();
-
-		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(); }
-
+// Add `value` under `tagname` to `parent`, letting the value map decide whether
+// it changed, and constructing the CECTag only if it did.
+//
+// Unlike `parent->AddTag(CECTag(tagname, value), valuemap)`, which builds the
+// tag first -- getter, string copy, allocation -- and only then asks whether it
+// was needed. This compares the raw value against a typed cache and builds
+// nothing when unchanged. On the client list, rebuilt on every poll with most
+// fields static, that is the difference between paying for every field of every
+// peer and paying only for what moved.
+template <typename T>
+inline void AddDiffTag(CECTag *parent, ec_tagname_t tagname, const T &value, CValueMap *valuemap)
+{
+	if (valuemap) {
+		valuemap->CreateTag(tagname, value, parent);
+	} else {
+		parent->AddTag(CECTag(tagname, value));
+	}
+}
+
+class CEC_Category_Tag : public CECTag
+{
+public:
+	CEC_Category_Tag(uint32 cat_index, EC_DETAIL_LEVEL detail_level = EC_DETAIL_FULL);
+	// for create-upate commands
+	CEC_Category_Tag(
+		uint32 cat_index, wxString name, wxString path, wxString comment, uint32 color, uint8 prio);
+
+	bool Apply();
+	bool Create();
+
+	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(); }
 };
 
-class CEC_Prefs_Packet : public CECPacket {
-	public:
-		CEC_Prefs_Packet(uint32 selection, EC_DETAIL_LEVEL prefs_detail = EC_DETAIL_FULL, EC_DETAIL_LEVEL cat_details = EC_DETAIL_FULL);
+class CEC_Prefs_Packet : public CECPacket
+{
+public:
+	CEC_Prefs_Packet(uint32 selection,
+		EC_DETAIL_LEVEL prefs_detail = EC_DETAIL_FULL,
+		EC_DETAIL_LEVEL cat_details = EC_DETAIL_FULL);
 
-		void Apply() const;
+	void Apply() const;
 };
 
-class CEC_Server_Tag : public CECTag {
-	public:
-		CEC_Server_Tag(const CServer *, EC_DETAIL_LEVEL);
-		CEC_Server_Tag(const CServer *, CValueMap *valuemap);
-
-		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); }
-
-		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(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(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); }
-
-		uint32 ID() const { return GetInt(); }
+class CEC_Server_Tag : public CECTag
+{
+public:
+	CEC_Server_Tag(const CServer *, EC_DETAIL_LEVEL);
+	CEC_Server_Tag(const CServer *, CValueMap *valuemap);
+
+	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);
+	}
+	// Server host country, ISO 3166-1 alpha-2 lowercase, resolved core-side
+	// (#440). Empty for an unresolved IP; absent when the daemon has no GeoIP.
+	// Check tag presence to tell them apart, since AssignIfExist returns empty
+	// for both.
+	wxString Country(wxString *target = nullptr) const
+	{
+		return AssignIfExist(EC_TAG_SERVER_COUNTRY, target);
+	}
+
+	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(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(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);
+	}
+	uint32 GetSoftFiles(uint32 *target = nullptr) const
+	{
+		return AssignIfExist(EC_TAG_SERVER_FILES_SOFT, target);
+	}
+	uint32 GetHardFiles(uint32 *target = nullptr) const
+	{
+		return AssignIfExist(EC_TAG_SERVER_FILES_HARD, target);
+	}
+	uint32 GetTCPFlags(uint32 *target = nullptr) const
+	{
+		return AssignIfExist(EC_TAG_SERVER_TCP_FLAGS, target);
+	}
+	uint32 GetUDPFlags(uint32 *target = nullptr) const
+	{
+		return AssignIfExist(EC_TAG_SERVER_UDP_FLAGS, target);
+	}
+
+	uint32 ID() const { return GetInt(); }
 };
 
-
-class CEC_ConnState_Tag : public CECTag {
-	public:
-		CEC_ConnState_Tag(EC_DETAIL_LEVEL);
-
-		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; }
-		bool	IsConnectedKademlia()	const { return (GetInt() & 0x04) != 0; }
-		bool	IsKadFirewalled()	const { return (GetInt() & 0x08) != 0; }
-		bool	IsKadRunning()	const { return (GetInt() & 0x10) != 0; }
-		bool	GetKadID(CUInt128& target)	const { return AssignIfExist(EC_TAG_KAD_ID, target); }
+class CEC_ConnState_Tag : public CECTag
+{
+public:
+	CEC_ConnState_Tag(EC_DETAIL_LEVEL);
+
+	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; }
+	bool IsConnectedKademlia() const { return (GetInt() & 0x04) != 0; }
+	bool IsKadFirewalled() const { return (GetInt() & 0x08) != 0; }
+	bool IsKadRunning() const { return (GetInt() & 0x10) != 0; }
+	bool GetKadID(CUInt128 &target) const { return AssignIfExist(EC_TAG_KAD_ID, target); }
+
+	// Unix timestamp of the most recent connect (amule-org/amule#174). Present
+	// only while connected, so gate on IsConnectedED2K()/IsConnectedKademlia()
+	// rather than trusting a 0 timestamp.
+	bool GetED2KConnectedSince(uint32 &target) const
+	{
+		return AssignIfExist(EC_TAG_ED2K_CONNECTED_SINCE, target);
+	}
+	bool GetKadConnectedSince(uint32 &target) const
+	{
+		return AssignIfExist(EC_TAG_KAD_CONNECTED_SINCE, target);
+	}
 };
 
-class CEC_SharedFile_Tag : public CECTag {
-	public:
-		CEC_SharedFile_Tag(const CKnownFile *file, EC_DETAIL_LEVEL detail_level,
-							CValueMap *valuemap = NULL, ec_tagname_t name = EC_TAG_KNOWNFILE);
-
-		// template needs it
-		uint32		ID()		const { return 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(); }
-		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		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(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(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); }
-
-		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_SharedFile_Tag : public CECTag
+{
+public:
+	CEC_SharedFile_Tag(const CKnownFile *file,
+		EC_DETAIL_LEVEL detail_level,
+		CValueMap *valuemap = NULL,
+		ec_tagname_t name = EC_TAG_KNOWNFILE);
+
+	// template needs it
+	uint32 ID() const { return 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(); }
+	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); }
+	// The on-disk directory, status-agnostic: Temp for a partfile, the
+	// destination once complete. Unlike FilePath(), this always means the folder.
+	bool DirectoryPath(wxString &target) const { return AssignIfExist(EC_TAG_KNOWNFILE_PATH, target); }
+	uint64 SizeFull() const { return GetTagByNameSafe(EC_TAG_PARTFILE_SIZE_FULL)->GetInt(); }
+	wxString FileEd2kLink() const { return GetTagByNameSafe(EC_TAG_PARTFILE_ED2K_LINK)->GetStringData(); }
+
+	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(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(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);
+	}
+
+	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 HashingProgress(uint16 &target) const
+	{
+		return AssignIfExist(EC_TAG_KNOWNFILE_HASHED_PART_COUNT, target);
+	}
+
+	// Live upload activity and share timestamps (issue #466). amulegui has no
+	// m_ClientUploadList to compute them from, so the daemon sends them.
+	uint32 GetUploadSpeed(uint32 *target = nullptr) const
+	{
+		return AssignIfExist(EC_TAG_KNOWNFILE_UPLOAD_SPEED, target);
+	}
+
+	uint16 GetUploadingCount(uint16 *target = nullptr) const
+	{
+		return AssignIfExist(EC_TAG_KNOWNFILE_UPLOADING_COUNT, target);
+	}
+
+	time_t GetSharedSince(time_t *target = nullptr) const
+	{
+		return AssignIfExist(EC_TAG_KNOWNFILE_SHARED_SINCE, target);
+	}
+
+	time_t GetLastUpload(time_t *target = nullptr) const
+	{
+		return AssignIfExist(EC_TAG_KNOWNFILE_LAST_UPLOAD, 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);
-
-		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); }
-		bool		HashingProgress(uint16 &target)	const { return AssignIfExist(EC_TAG_PARTFILE_HASHED_PART_COUNT, 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 ? wxString(CFormat("%03u.part.met") % id) : wxString();
-		}
-
-		wxString	GetFileStatusString() const;
+class CEC_PartFile_Tag : public CEC_SharedFile_Tag
+{
+public:
+	CEC_PartFile_Tag(const CPartFile *file, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap = NULL);
+
+	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); }
+	bool HashingProgress(uint16 &target) const
+	{
+		return AssignIfExist(EC_TAG_PARTFILE_HASHED_PART_COUNT, 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 ? wxString(CFormat("%03u.part.met") % id) : wxString();
+	}
+
+	wxString GetFileStatusString() const;
 };
 
-class CEC_UpDownClient_Tag : public CECTag {
-	public:
-		CEC_UpDownClient_Tag(const CUpDownClient* client, EC_DETAIL_LEVEL detail_level, CValueMap* valuemap);
-
-		uint32 ID() const { return GetInt(); }
-
-		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); }
-
-		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(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 FriendSlot(bool &target) const { return AssignIfExist(EC_TAG_CLIENT_FRIEND_SLOT, target); }
-
-		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); }
-
-		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(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_UpDownClient_Tag : public CECTag
+{
+public:
+	CEC_UpDownClient_Tag(const CUpDownClient *client, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap);
+
+	uint32 ID() const { return GetInt(); }
+
+	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); }
+
+	wxString ClientName(wxString *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_NAME, target); }
+	// Peer country ISO 3166-1 alpha-2 code (lowercase), resolved core-side (#439).
+	// Empty for an unresolved IP; the tag is absent when the daemon has no GeoIP.
+	// Callers wanting to distinguish "absent" from "empty" must check the tag's
+	// presence (GetTagByName), since AssignIfExist returns empty for both.
+	wxString Country(wxString *target = nullptr) const
+	{
+		return AssignIfExist(EC_TAG_CLIENT_COUNTRY, 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(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 FriendSlot(bool &target) const { return AssignIfExist(EC_TAG_CLIENT_FRIEND_SLOT, target); }
+
+	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); }
+
+	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(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 ModCapabilities(uint32 &target) const
+	{
+		return AssignIfExist(EC_TAG_CLIENT_MOD_CAPABILITIES, 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(const CSearchFile *file, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap = NULL);
-
-		// template needs it
-		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); }
-		bool		GetRating(uint8 &target) const { return AssignIfExist(EC_TAG_KNOWNFILE_RATING, target); }
-	private:
-		CMD4Hash	GetMD4Data();	// Block it, because it doesn't work anymore!
+class CEC_SearchFile_Tag : public CECTag
+{
+public:
+	CEC_SearchFile_Tag(const CSearchFile *file,
+		EC_DETAIL_LEVEL detail_level,
+		CValueMap *valuemap = nullptr,
+		uint32 searchID = 0);
+
+	// template needs it
+	uint32 ID() const { return GetInt(); }
+	uint32 ParentID() const { return GetTagByNameSafe(EC_TAG_SEARCH_PARENT)->GetInt(); }
+	// Multi-search: the owning search's ID, present only in the daemon's
+	// union-poll reply (amulegui). 0 when absent (legacy single-search) --
+	// callers fall back to the single current-search ID.
+	uint32 SearchID() const { return GetTagByNameSafe(EC_TAG_SEARCH_ID)->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
+	{
+		// "Already have" means the file is downloaded/shared or actively
+		// downloading -- NOT a result the user canceled/removed, which is
+		// re-downloadable and must not read as held. Values mirror
+		// CSearchFile::DownloadStatus: NEW=0, DOWNLOADED=1, QUEUED=2,
+		// CANCELED=3, QUEUEDCANCELED=4.
+		const int st = GetTagByNameSafe(EC_TAG_PARTFILE_STATUS)->GetInt();
+		return st != 0 /* NEW */ && st != 3 /* CANCELED */;
+	}
+	uint32 DownloadStatus(uint32 *target = 0) const
+	{
+		return AssignIfExist(EC_TAG_PARTFILE_STATUS, target);
+	}
+	bool GetRating(uint8 &target) const { return AssignIfExist(EC_TAG_KNOWNFILE_RATING, target); }
+
+	// Browse ("View Files") source info: the peer's id/port and the shared
+	// folder this result lives in. The daemon emits these only for browse
+	// results; for ordinary server/Kad results the tags are absent and the
+	// out-params are left untouched (callers keep their defaults).
+	void GetBrowseSource(uint32_t &clientID, uint16_t &clientPort, wxString &directory) const
+	{
+		AssignIfExist(EC_TAG_SEARCHFILE_CLIENT_ID, &clientID);
+		AssignIfExist(EC_TAG_SEARCHFILE_CLIENT_PORT, &clientPort);
+		AssignIfExist(EC_TAG_SEARCHFILE_DIRECTORY, &directory);
+	}
+
+private:
+	CMD4Hash GetMD4Data(); // Block it, because it doesn't work anymore!
 };
 
-class CEC_Search_Tag : public CECTag {
-	public:
-		// search request
-		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() 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_Search_Tag : public CECTag
+{
+public:
+	// search request
+	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() 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 {
-	public:
-		CEC_StatTree_Node_Tag();	// just to keep compiler happy
-		wxString GetDisplayString() const;
+class CEC_StatTree_Node_Tag : public CECTag
+{
+public:
+	CEC_StatTree_Node_Tag(); // just to keep compiler happy
+	wxString GetDisplayString() const;
 };
 
-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); }
+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); }
+	bool FriendSlot(bool &target) const { return AssignIfExist(EC_TAG_FRIEND_FRIENDSLOT, target); }
 };
 
 #endif /* ECSPECIALTAGS_H */

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECTag.cpp -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECTag.cpp Changed

@@ -25,46 +25,30 @@
 #ifdef __DEBUG__
 #define DEBUG_EC_IMPLEMENTATION
 
-#include <common/Format.h>  // Needed for CFormat
+#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
+#include "ECTag.h"         // Needed for ECTag
+#include "ECSocket.h"      // Needed for CECSocket
+#include "ECSpecialTags.h" // Needed for CValueMap
+#include "ECID.h"          // Needed for CECID
 
-/**********************************************************
- *							  *
- *	CECTag class					  *
- *							  *
- **********************************************************/
+#include <iomanip> // Needed for std::setprecision
+#include <limits>  // Needed for std::numeric_limits
 
 //! Defines the Null tag which may be returned by GetTagByNameSafe.
 const CECTag CECTag::s_theNullTag;
 
-/**
- * Creates a new null-valued CECTag instance
- *
- * @see s_theNullTag
- * @see GetTagByNameSafe
- */
-CECTag::CECTag() :
-	m_tagName(0),
-	m_dataType(EC_TAGTYPE_UNKNOWN),
-	m_dataLen(0),
-	m_tagData(NULL)	// All access functions check m_dataType, so no need to allocate a dummy buffer.
+CECTag::CECTag()
+: m_tagName(0)
+, m_dataType(EC_TAGTYPE_UNKNOWN)
+, m_dataLen(0)
+, m_tagData(NULL) // All access functions check m_dataType, so no need to allocate a dummy buffer.
 {
 }
 
-/**
- * Creates a new CECTag instance from the given data
- *
- * @param name	 TAG name
- * @param length length of data buffer
- * @param data	 TAG data
- *
- */
-CECTag::CECTag(ec_tagname_t name, unsigned int length, const void *data) : m_tagName(name)
+CECTag::CECTag(ec_tagname_t name, unsigned int length, const void *data)
+: m_tagName(name)
 {
 	if (data) {
 		m_dataLen = length;
@@ -78,16 +62,9 @@
 	m_dataType = EC_TAGTYPE_CUSTOM;
 }
 
-/**
- * Creates a new CECTag instance for custom data
- *
- * @param name		TAG name
- * @param length	length of data buffer that will be alloc'ed
- * @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)
+// The data buffer must be filled in after construction.
+CECTag::CECTag(ec_tagname_t name, unsigned int length, void **dataptr)
+: m_tagName(name)
 {
 	m_dataLen = length;
 	NewData();
@@ -95,194 +72,154 @@
 	m_dataType = EC_TAGTYPE_CUSTOM;
 }
 
-/**
- * Creates a new CECTag instance, which contains an IPv4 address.
- *
- * This function takes care of the endianness of the port number.
- *
- * @param name TAG name
- * @param data The EC_IPv4_t class containing the IPv4 address.
- *
- * @see GetIPv4Data()
- */
-CECTag::CECTag(ec_tagname_t name, const EC_IPv4_t& data) : m_tagName(name)
+// Takes care of the port number's endianness.
+CECTag::CECTag(ec_tagname_t name, const EC_IPv4_t &data)
+: m_tagName(name)
 {
 
 	m_dataLen = sizeof(EC_IPv4_t);
 	NewData();
-	RawPokeUInt32( reinterpret_cast<EC_IPv4_t *>(m_tagData)->m_ip, RawPeekUInt32( data.m_ip ) );
+	RawPokeUInt32(reinterpret_cast<EC_IPv4_t *>(m_tagData)->m_ip, RawPeekUInt32(data.m_ip));
 	reinterpret_cast<EC_IPv4_t *>(m_tagData)->m_port = ENDIAN_HTONS(data.m_port);
 	m_dataType = EC_TAGTYPE_IPV4;
 }
 
-/**
- * Creates a new CECTag instance, which contains a MD4 hash.
- *
- * This function takes care to store hash in network byte order.
- *
- * @param name TAG name
- * @param data The CMD4Hash class containing the MD4 hash.
- *
- * @see GetMD4Data()
- */
-CECTag::CECTag(ec_tagname_t name, const CMD4Hash& data) : m_tagName(name)
+// Stores the hash in network byte order.
+CECTag::CECTag(ec_tagname_t name, const CMD4Hash &data)
+: m_tagName(name)
 {
 	m_dataLen = 16;
 	NewData();
-	RawPokeUInt64( m_tagData,		RawPeekUInt64( data.GetHash() ) );
-	RawPokeUInt64( m_tagData + 8,	RawPeekUInt64( data.GetHash() + 8 ) );
+	RawPokeUInt64(m_tagData, RawPeekUInt64(data.GetHash()));
+	RawPokeUInt64(m_tagData + 8, RawPeekUInt64(data.GetHash() + 8));
 	m_dataType = EC_TAGTYPE_HASH16;
 }
 
-/**
- * Creates a new CECTag instance, which contains a string
- *
- * @param name TAG name
- * @param data wxString object, it's contents are converted to UTF-8.
- *
- * @see GetStringDataSTL()
- */
-CECTag::CECTag(ec_tagname_t name, const std::string& data) : m_tagName(name)
+// Contents are converted to UTF-8.
+CECTag::CECTag(ec_tagname_t name, const std::string &data)
+: m_tagName(name)
 {
 	ConstructStringTag(name, data);
 }
 
-/**
- * Creates a new CECTag instance, which contains a string
- *
- * @param name TAG name
- * @param data wxString object, it's contents are converted to UTF-8.
- *
- * @see GetStringData()
- */
-CECTag::CECTag(ec_tagname_t name, const wxString& data)
+// Contents are converted to UTF-8.
+CECTag::CECTag(ec_tagname_t name, const wxString &data)
 {
-	ConstructStringTag(name, (const char*)unicode2UTF8(data));
+	ConstructStringTag(name, (const char *)unicode2UTF8(data));
 }
-CECTag::CECTag(ec_tagname_t name, const wxChar* data)
+CECTag::CECTag(ec_tagname_t name, const wxChar *data)
 {
-	ConstructStringTag(name, (const char*)unicode2UTF8(data));
+	ConstructStringTag(name, (const char *)unicode2UTF8(data));
 }
 
-/**
- * Copy constructor
- */
-CECTag::CECTag(const CECTag& tag)
+CECTag::CECTag(const CECTag &tag)
 {
 	m_tagData = NULL;
 	*this = tag;
 }
 
-/**
- * Creates a new CECTag instance, which contains an int value.
- *
- * This takes care of endianness problems with numbers.
- *
- * @param name TAG name.
- * @param data number.
- *
- * @see GetInt()
- */
-CECTag::CECTag(ec_tagname_t name, bool data) : m_tagName(name)
+// Takes care of endianness.
+CECTag::CECTag(ec_tagname_t name, bool data)
+: m_tagName(name)
 {
 	InitInt(data);
 }
-CECTag::CECTag(ec_tagname_t name, uint8 data) : m_tagName(name)
+CECTag::CECTag(ec_tagname_t name, uint8 data)
+: m_tagName(name)
 {
 	InitInt(data);
 }
-CECTag::CECTag(ec_tagname_t name, uint16 data) : m_tagName(name)
+CECTag::CECTag(ec_tagname_t name, uint16 data)
+: m_tagName(name)
 {
 	InitInt(data);
 }
-CECTag::CECTag(ec_tagname_t name, uint32 data) : m_tagName(name)
+CECTag::CECTag(ec_tagname_t name, uint32 data)
+: m_tagName(name)
 {
 	InitInt(data);
 }
-CECTag::CECTag(ec_tagname_t name, uint64 data) : m_tagName(name)
+CECTag::CECTag(ec_tagname_t name, uint64 data)
+: m_tagName(name)
 {
 	InitInt(data);
 }
 
 void CECTag::InitInt(uint64 data)
 {
+	// Chosen in locals and switched on below, not read back from the members. GCC 13 treats
+	// operator new as able to change m_dataType, so it pairs a 1-byte buffer with the uint32
+	// write and reports an overflow under _FORTIFY_SOURCE that cannot happen (issue #1435).
+	ec_tagtype_t type;
+	ec_taglen_t length;
 	if (data <= 0xFF) {
-		m_dataType = EC_TAGTYPE_UINT8;
-		m_dataLen = 1;
+		type = EC_TAGTYPE_UINT8;
+		length = 1;
 	} else if (data <= 0xFFFF) {
-		m_dataType = EC_TAGTYPE_UINT16;
-		m_dataLen = 2;
+		type = EC_TAGTYPE_UINT16;
+		length = 2;
 	} else if (data <= 0xFFFFFFFF) {
-		m_dataType = EC_TAGTYPE_UINT32;
-		m_dataLen = 4;
+		type = EC_TAGTYPE_UINT32;
+		length = 4;
 	} else {
-		m_dataType = EC_TAGTYPE_UINT64;
-		m_dataLen = 8;
+		type = EC_TAGTYPE_UINT64;
+		length = 8;
 	}
+	m_dataType = type;
+	m_dataLen = length;
 
 	NewData();
 
-	switch (m_dataType) {
-		case EC_TAGTYPE_UINT8:
-			PokeUInt8( m_tagData, (uint8) data );
-			break;
-		case EC_TAGTYPE_UINT16:
-			RawPokeUInt16( m_tagData, ENDIAN_HTONS((uint16) data ));
-			break;
-		case EC_TAGTYPE_UINT32:
-			RawPokeUInt32( m_tagData, ENDIAN_HTONL((uint32) data ));
-			break;
-		case EC_TAGTYPE_UINT64:
-			RawPokeUInt64( m_tagData, ENDIAN_HTONLL(data) );
-			break;
+	switch (type) {
+	case EC_TAGTYPE_UINT8:
+		PokeUInt8(m_tagData, (uint8)data);
+		break;
+	case EC_TAGTYPE_UINT16:
+		RawPokeUInt16(m_tagData, ENDIAN_HTONS((uint16)data));
+		break;
+	case EC_TAGTYPE_UINT32:
+		RawPokeUInt32(m_tagData, ENDIAN_HTONL((uint32)data));
+		break;
+	case EC_TAGTYPE_UINT64:
+		RawPokeUInt64(m_tagData, ENDIAN_HTONLL(data));
+		break;
 	}
 }
 
-/**
- * Creates a new CECTag instance, which contains a double precision floating point number
- *
- * @param name TAG name
- * @param data double number
- *
- * @note The actual data is converted to string representation, because we have not found
- * yet an effective and safe way to transmit floating point numbers.
- *
- * @see GetDoubleData()
- */
-CECTag::CECTag(ec_tagname_t name, double data) : m_tagName(name)
+// Sent as a string: no safe, effective way to put a float on the wire has
+// been found.
+CECTag::CECTag(ec_tagname_t name, double data)
+: m_tagName(name)
 {
 	std::ostringstream double_str;
-	double_str << data;
+	// Default precision is 6 significant digits, which switches to scientific
+	// notation past 1e6 and quantises: a statsgraph timestamp lands on a
+	// 10-second grid after ~11.6 days of uptime. max_digits10 round-trips.
+	double_str << std::setprecision(std::numeric_limits<double>::max_digits10) << data;
 	std::string double_string = double_str.str();
-	const char * double_chr = double_string.c_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;
 }
 
-/**
- * Destructor - frees allocated data and deletes child TAGs.
- */
 CECTag::~CECTag(void)
 {
-	delete  m_tagData;
+	delete m_tagData;
 }
 
 /**
- * Copy assignment operator.
- *
- * std::vector uses this, but the compiler-supplied version wouldn't properly
- * handle m_dynamic and m_tagData.  This wouldn't be necessary if m_tagData
- * was a smart pointer (Hi, Kry!).
+ * std::vector needs this: the compiler-supplied version mishandles m_dynamic
+ * and m_tagData. Unnecessary if m_tagData were a smart pointer.
  */
-CECTag& CECTag::operator=(const CECTag& tag)
+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;
+		delete m_tagData;
 		if (m_dataLen != 0) {
 			NewData();
 			memcpy(m_tagData, tag.m_tagData, m_dataLen);
@@ -297,88 +234,38 @@
 	return *this;
 }
 
-/**
- * Compare operator.
- *
- */
-bool CECTag::operator==(const CECTag& tag) const
+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;
+	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 !!!
- * }
- * \endcode
- *
- * To get the desired results, the above should be replaced with something like:
- *
- * \code
- * {
- *	CECPacket *p = new CECPacket(whatever);
- *	CECTag *t1 = new CECTag(whatever);
- *	CECTag *t2 = new CECTag(whatever);
- *	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
+ * Adds a child tag, swallowing its content: `tag` is left empty afterwards.
  *
- * Then why copying? The answer is to enable simplifying the code like this:
+ * So `p->AddTag(*t1); t1->AddTag(*t2);` does NOT put t2 inside p. Build the
+ * tree bottom-up instead: add t2 to t1, then t1 to p.
  *
- * \code
- * {
- *	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
- * }
- * \endcode
- *
- * @param tag a CECTag class instance to add.
- * @return \b true if tag was really added,
- * \b false when it was omitted through valuemap or the limit for children
- * is exceeded.
+ * False when the tag was omitted through valuemap or the child limit.
  */
-bool CECTag::AddTag(const CECTag& tag, CValueMap* valuemap)
+bool CECTag::AddTag(const CECTag &tag, CValueMap *valuemap)
 {
 	if (valuemap) {
 		return valuemap->AddTag(tag, this);
 	}
-	// The historical 65535 children-per-tag wire-format ceiling was
-	// lifted by the sentinel-extended count format in WriteChildren /
-	// ReadChildren; this writer-side guard is no longer needed and
-	// was silently dropping every tag past the 65535th — preventing
-	// EC_OP_SHARED_FILES responses from carrying libraries with more
-	// than 65535 shared files (#199).
-
-	// First add an empty tag.
+	// The 65535 children-per-tag ceiling was lifted by the sentinel-extended
+	// count in WriteChildren/ReadChildren. The old guard silently dropped every
+	// tag past the 65535th, capping an EC_OP_SHARED_FILES response (#199).
+
 	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);
+	// Exchange the data; the original is destroyed right after this call. The
+	// const_cast is because GCC passes an in-place constructed object as 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)
+void CECTag::AddTag(ec_tagname_t name, uint64_t data, CValueMap *valuemap)
 {
 	if (valuemap) {
 		valuemap->CreateTag(name, data, this);
@@ -387,7 +274,7 @@
 	}
 }
 
-void CECTag::AddTag(ec_tagname_t name, const wxString& data, CValueMap* valuemap)
+void CECTag::AddTag(ec_tagname_t name, const wxString &data, CValueMap *valuemap)
 {
 	if (valuemap) {
 		valuemap->CreateTag(name, data, this);
@@ -396,7 +283,7 @@
 	}
 }
 
-void CECTag::AddTag(ec_tagname_t name, const CMD4Hash& data, CValueMap* valuemap)
+void CECTag::AddTag(ec_tagname_t name, const CMD4Hash &data, CValueMap *valuemap)
 {
 	if (valuemap) {
 		valuemap->CreateTag(name, data, this);
@@ -405,7 +292,7 @@
 	}
 }
 
-void CECTag::swap(CECTag& t2)
+void CECTag::swap(CECTag &t2)
 {
 	std::swap(m_tagName, t2.m_tagName);
 	std::swap(m_dataType, t2.m_dataType);
@@ -414,7 +301,7 @@
 	std::swap(m_tagList, t2.m_tagList);
 }
 
-bool CECTag::ReadFromSocket(CECSocket& socket)
+bool CECTag::ReadFromSocket(CECSocket &socket)
 {
 	ec_tagname_t tmp_tagName;
 	if (!socket.ReadNumber(&tmp_tagName, sizeof(ec_tagname_t))) {
@@ -439,9 +326,8 @@
 	m_dataLen = 0;
 	const bool useLargeCount = (socket.m_rx_flags & EC_FLAG_LARGE_TAG_COUNT) != 0;
 	const uint32_t childrenLen = GetTagLen(useLargeCount);
-	// Reject malformed tags whose declared length is smaller than the
-	// serialized size of the children we just parsed. Without this guard
-	// the unsigned subtraction below wraps to ~4 GB and drives an
+	// Reject a declared length smaller than the children just parsed: the
+	// unsigned subtraction below would wrap to ~4 GB and drive an
 	// attacker-controlled oversized allocation in NewData().
 	if (tmp_len < childrenLen) {
 		return false;
@@ -459,8 +345,7 @@
 	return true;
 }
 
-
-bool CECTag::WriteTag(CECSocket& socket) const
+bool CECTag::WriteTag(CECSocket &socket) const
 {
 	ec_tagname_t tmp_tagName = (m_tagName << 1) | (m_tagList.empty() ? 0 : 1);
 	ec_tagtype_t type = m_dataType;
@@ -468,24 +353,30 @@
 	ec_taglen_t tagLen = GetTagLen(useLargeCount);
 	EC_ASSERT(type != EC_TAGTYPE_UNKNOWN);
 
-	if (!socket.WriteNumber(&tmp_tagName, sizeof(ec_tagname_t))) return false;
-	if (!socket.WriteNumber(&type, sizeof(ec_tagtype_t))) return false;
-	if (!socket.WriteNumber(&tagLen, sizeof(ec_taglen_t))) return false;
+	if (!socket.WriteNumber(&tmp_tagName, sizeof(ec_tagname_t)))
+		return false;
+	if (!socket.WriteNumber(&type, sizeof(ec_tagtype_t)))
+		return false;
+	if (!socket.WriteNumber(&tagLen, sizeof(ec_taglen_t)))
+		return false;
 
 	if (!m_tagList.empty()) {
-		if (!WriteChildren(socket)) return false;
+		if (!WriteChildren(socket))
+			return false;
 	}
 
 	if (m_dataLen > 0) {
-		if (m_tagData != NULL) {	// This is here only to make sure everything, it should not be NULL at this point
-			if (!socket.WriteBuffer(m_tagData, m_dataLen)) return false;
+		if (m_tagData != NULL) { // This is here only to make sure everything, it should not be NULL
+					 // at this point
+			if (!socket.WriteBuffer(m_tagData, m_dataLen))
+				return false;
 		}
 	}
 
 	return true;
 }
 
-bool CECTag::ReadChildren(CECSocket& socket)
+bool CECTag::ReadChildren(CECSocket &socket)
 {
 	const bool useLargeCount = (socket.m_rx_flags & EC_FLAG_LARGE_TAG_COUNT) != 0;
 	uint16 tmp_tagCount16;
@@ -494,14 +385,10 @@
 	}
 	uint32 tmp_tagCount;
 	if (useLargeCount && tmp_tagCount16 == 0xFFFF) {
-		// Sentinel-extended children count — see WriteChildren. Only
-		// honoured when the peer advertised EC_TAG_CAN_LARGE_TAG_COUNT
-		// in the auth handshake (mirrored into m_rx_flags via the
-		// per-packet flag). Old peers that don't know about this
-		// extension can still legitimately emit count == 0xFFFF as
-		// the literal uint16 count for 65535 children, so without
-		// the negotiated flag we MUST treat 0xFFFF as the count and
-		// not consume any follow-up bytes.
+		// Sentinel-extended children count, see WriteChildren. Only honoured when
+		// the peer advertised EC_TAG_CAN_LARGE_TAG_COUNT: an old peer can emit
+		// 0xFFFF as a literal count of 65535, so without the flag it must be read
+		// as the count with no follow-up bytes.
 		uint32 tmp_tagCount32;
 		if (!socket.ReadNumber(&tmp_tagCount32, sizeof(uint32))) {
 			return false;
@@ -513,7 +400,7 @@
 	m_tagList.clear();
 	for (uint32 i = 0; i < tmp_tagCount; i++) {
 		m_tagList.push_back(CECTag());
-		CECTag& tag = m_tagList.back();
+		CECTag &tag = m_tagList.back();
 		if (!tag.ReadFromSocket(socket)) {
 			return false;
 		}
@@ -521,96 +408,73 @@
 	return true;
 }
 
-bool CECTag::WriteChildren(CECSocket& socket) const
+bool CECTag::WriteChildren(CECSocket &socket) const
 {
 	const bool useLargeCount = (socket.m_tx_flags & EC_FLAG_LARGE_TAG_COUNT) != 0;
 	const size_t count = m_tagList.size();
-	// In non-sentinel (mixed-version-safe) mode the wire count field is
-	// uint16; cap at 0xFFFE both to fit and to avoid emitting 0xFFFF,
-	// which a fix-side peer would treat as the sentinel marker even when
-	// the capability wasn't negotiated this connection.
+	// The non-sentinel wire count is uint16; cap at 0xFFFE to fit and to avoid
+	// emitting 0xFFFF, which a fix-side peer reads as the sentinel marker.
 	const size_t writeCount = useLargeCount ? count : std::min(count, (size_t)0xFFFE);
 
 	if (useLargeCount && count >= 0xFFFF) {
-		// Sentinel-extended count — see ReadChildren for the format.
+		// Sentinel-extended count -- see ReadChildren for the format.
 		uint16 marker = 0xFFFF;
-		if (!socket.WriteNumber(&marker, sizeof(marker))) return false;
+		if (!socket.WriteNumber(&marker, sizeof(marker)))
+			return false;
 		uint32 tmp = (uint32)count;
-		if (!socket.WriteNumber(&tmp, sizeof(tmp))) return false;
+		if (!socket.WriteNumber(&tmp, sizeof(tmp)))
+			return false;
 	} else {
-		// Plain uint16 count — wire-byte-identical to the historical
-		// format. When useLargeCount is false and the in-memory list
-		// has more than 0xFFFE children, only the first 0xFFFE are
-		// serialised (silent truncation, matching the historical
-		// AddTag cap behaviour for old peers). #199.
+		// Plain uint16 count, byte-identical to the historical format. Beyond
+		// 0xFFFE children only the first 0xFFFE are serialised, matching the old
+		// AddTag cap for old peers (#199).
 		uint16 tmp = (uint16)writeCount;
-		if (!socket.WriteNumber(&tmp, sizeof(tmp))) return false;
+		if (!socket.WriteNumber(&tmp, sizeof(tmp)))
+			return false;
 	}
 
 	size_t i = 0;
 	for (const_iterator it = begin(); it != end() && i < writeCount; ++it, ++i) {
-		if (!it->WriteTag(socket)) return false;
+		if (!it->WriteTag(socket))
+			return false;
 	}
 	return true;
 }
 
-/**
- * Finds the (first) child tag with given name.
- *
- * @param name TAG name to look for.
- * @return the tag found, or NULL.
- */
-const CECTag* CECTag::GetTagByName(ec_tagname_t name) const
+const CECTag *CECTag::GetTagByName(ec_tagname_t name) const
 {
 	for (const_iterator it = begin(); it != end(); ++it) {
-		if (it->m_tagName == name) return & *it;
+		if (it->m_tagName == name)
+			return &*it;
 	}
 	return NULL;
 }
 
-/**
- * Finds the (first) child tag with given name.
- *
- * @param name TAG name to look for.
- * @return the tag found, or NULL.
- */
-CECTag* CECTag::GetTagByName(ec_tagname_t name)
+CECTag *CECTag::GetTagByName(ec_tagname_t name)
 {
 	for (TagList::iterator it = m_tagList.begin(); it != m_tagList.end(); ++it) {
-		if (it->m_tagName == name) return & *it;
+		if (it->m_tagName == name)
+			return &*it;
 	}
 	return NULL;
 }
 
-/**
- * Finds the (first) child tag with given name.
- *
- * @param name TAG name to look for.
- * @return the tag found, or a special null-valued tag otherwise.
- *
- * @see s_theNullTag
- */
-const CECTag* CECTag::GetTagByNameSafe(ec_tagname_t name) const
+// Unlike GetTagByName, returns the null tag rather than NULL when absent.
+const CECTag *CECTag::GetTagByNameSafe(ec_tagname_t name) const
 {
-	const CECTag* result = GetTagByName(name);
+	const CECTag *result = GetTagByName(name);
 	if (result == NULL)
 		result = &s_theNullTag;
 	return result;
 }
 
-/**
- * Query TAG length that is suitable for the TAGLEN field (i.e.\
- * without it's own header size).
- *
- * @return Tag length, containing its childs' length.
- */
+// Length for the TAGLEN field, excluding its own header.
 uint32 CECTag::GetTagLen(bool useLargeCount) const
 {
 	uint32 length = m_dataLen;
-	// Mirror WriteChildren's iteration cap: in non-sentinel mode only
-	// the first 0xFFFE children get serialised, so the wire-size
-	// estimate must stop counting at the same boundary or tagLen will
-	// over-state and m_dataLen reader-side calc will overrun. #199.
+	// Mirror WriteChildren's cap: in non-sentinel mode only the first 0xFFFE
+	// children are serialised, so the size estimate must stop there or tagLen
+	// over-states and the reader's m_dataLen calc overruns (#199).
 	const size_t total = m_tagList.size();
 	const size_t maxIter = useLargeCount ? total : std::min(total, (size_t)0xFFFE);
 	size_t i = 0;
@@ -618,10 +482,8 @@
 		length += it->GetTagLen(useLargeCount);
 		length += sizeof(ec_tagname_t) + sizeof(ec_tagtype_t) + sizeof(ec_taglen_t);
 		if (it->HasChildTags()) {
-			// Children-count field — uint16 normally, with an extra
-			// uint32 follow-up only when sentinel format is in effect
-			// AND that nested tag has >= 0xFFFF children. See
-			// WriteChildren / ReadChildren for the sentinel scheme.
+			// uint16 normally, with a uint32 follow-up only in sentinel format
+			// when that nested tag has >= 0xFFFF children.
 			length += sizeof(uint16);
 			if (useLargeCount && it->GetTagCount() >= 0xFFFF) {
 				length += sizeof(uint32);
@@ -631,7 +493,6 @@
 	return length;
 }
 
-
 uint64_t CECTag::GetInt() const
 {
 	if (m_tagData == NULL) {
@@ -641,24 +502,23 @@
 	}
 
 	switch (m_dataType) {
-		case EC_TAGTYPE_UINT8:
-			return PeekUInt8(m_tagData);
-		case EC_TAGTYPE_UINT16:
-			return ENDIAN_NTOHS( RawPeekUInt16( m_tagData ) );
-		case EC_TAGTYPE_UINT32:
-			return ENDIAN_NTOHL( RawPeekUInt32( m_tagData ) );
-		case EC_TAGTYPE_UINT64:
-			return ENDIAN_NTOHLL( RawPeekUInt64( m_tagData ) );
-		case EC_TAGTYPE_UNKNOWN:
-			// Empty tag - This is NOT an error.
-			return 0;
-		default:
-			EC_ASSERT(0);
-			return 0;
+	case EC_TAGTYPE_UINT8:
+		return PeekUInt8(m_tagData);
+	case EC_TAGTYPE_UINT16:
+		return ENDIAN_NTOHS(RawPeekUInt16(m_tagData));
+	case EC_TAGTYPE_UINT32:
+		return ENDIAN_NTOHL(RawPeekUInt32(m_tagData));
+	case EC_TAGTYPE_UINT64:
+		return ENDIAN_NTOHLL(RawPeekUInt64(m_tagData));
+	case EC_TAGTYPE_UNKNOWN:
+		// Empty tag - This is NOT an error.
+		return 0;
+	default:
+		EC_ASSERT(0);
+		return 0;
 	}
 }
 
-
 std::string CECTag::GetStringDataSTL() const
 {
 	if (m_dataType != EC_TAGTYPE_STRING) {
@@ -672,7 +532,6 @@
 	return std::string(m_tagData);
 }
 
-
 #ifdef USE_WX_EXTENSIONS
 wxString CECTag::GetStringData() const
 {
@@ -680,7 +539,6 @@
 }
 #endif
 
-
 CMD4Hash CECTag::GetMD4Data() const
 {
 	if (m_dataType != EC_TAGTYPE_HASH16) {
@@ -695,16 +553,7 @@
 	return CMD4Hash((const unsigned char *)m_tagData);
 }
 
-
-/**
- * Returns an EC_IPv4_t class.
- *
- * This function takes care of the endianness of the port number.
- *
- * @return EC_IPv4_t class.
- *
- * @see CECTag(ec_tagname_t, const EC_IPv4_t&)
- */
+// Takes care of the port number's endianness.
 EC_IPv4_t CECTag::GetIPv4Data() const
 {
 	EC_IPv4_t p(0, 0);
@@ -714,23 +563,14 @@
 	} else if (m_tagData == NULL) {
 		EC_ASSERT(false);
 	} else {
-		RawPokeUInt32( p.m_ip, RawPeekUInt32( reinterpret_cast<EC_IPv4_t *>(m_tagData)->m_ip ) );
+		RawPokeUInt32(p.m_ip, RawPeekUInt32(reinterpret_cast<EC_IPv4_t *>(m_tagData)->m_ip));
 		p.m_port = ENDIAN_NTOHS(reinterpret_cast<EC_IPv4_t *>(m_tagData)->m_port);
 	}
 
 	return p;
 }
 
-/**
- * Returns a double value.
- *
- * @note The returned value is what we get by converting the string form
- * of the number to a double.
- *
- * @return The double value of the tag.
- *
- * @see CECTag(ec_tagname_t, double)
- */
+// The value is the string form of the number converted back to double.
 double CECTag::GetDoubleData(void) const
 {
 	if (m_dataType != EC_TAGTYPE_DOUBLE) {
@@ -748,8 +588,7 @@
 	return data;
 }
 
-
-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;
@@ -758,15 +597,14 @@
 	m_dataType = EC_TAGTYPE_STRING;
 }
 
-void CECTag::SetStringData(const wxString& s)
+void CECTag::SetStringData(const wxString &s)
 {
 	if (IsString()) {
-		delete  m_tagData;
-		ConstructStringTag(m_tagName, (const char*)unicode2UTF8(s));
+		delete m_tagData;
+		ConstructStringTag(m_tagName, (const char *)unicode2UTF8(s));
 	}
 }
 
-
 bool CECTag::AssignIfExist(ec_tagname_t tagname, bool *target) const
 {
 	bool ret = false;
@@ -820,11 +658,8 @@
 	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)
-		);
+		EC_ASSERT((tag->GetType() == EC_TAGTYPE_UINT16) || (tag->GetType() == EC_TAGTYPE_UINT8) ||
+			  (m_dataType == EC_TAGTYPE_UNKNOWN));
 		ret = tag->GetInt();
 		if (target) {
 			*target = ret;
@@ -837,11 +672,8 @@
 {
 	const CECTag *tag = GetTagByName(tagname);
 	if (tag) {
-		EC_ASSERT(
-			(tag->GetType() == EC_TAGTYPE_UINT16)
-			|| (tag->GetType() == EC_TAGTYPE_UINT8)
-			|| (m_dataType == EC_TAGTYPE_UNKNOWN)
-		);
+		EC_ASSERT((tag->GetType() == EC_TAGTYPE_UINT16) || (tag->GetType() == EC_TAGTYPE_UINT8) ||
+			  (m_dataType == EC_TAGTYPE_UNKNOWN));
 		target = tag->GetInt();
 		return true;
 	}
@@ -853,12 +685,8 @@
 	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)
-		);
+		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;
@@ -871,12 +699,8 @@
 {
 	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)
-		);
+		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;
 	}
@@ -1046,62 +870,67 @@
 }
 #endif
 
-
-#ifdef	__DEBUG__
+#ifdef __DEBUG__
 #include "ECLog.h"
 
 void CECTag::DebugPrint(int level, bool print_empty) const
 {
 	if (m_dataLen || print_empty) {
 		wxString space;
-		for (int i = level; i--;) space += "  ";
+		for (int i = level; i--;)
+			space += "  ";
 		wxString s1 = CFormat("%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("%d") % GetInt(); break;
-					case EC_TAGTYPE_STRING:
-						s2 = GetStringData(); break;
-					case EC_TAGTYPE_DOUBLE:
-						s2 = CFormat("%.1f") % GetDoubleData(); break;
-					case EC_TAGTYPE_HASH16:
-						s2 = GetMD4Data().Encode(); break;
-					case EC_TAGTYPE_UINT128:
-						// Using any non-inline function from UInt128.h would break linkage
-						// of remote apps otherwise not using CUInt128. So just fall through
-						// and display the value as a byte-stream. Since the value is sent
-						// big-endian on the network, the visual result is correct, except
-						// for the intervening spaces...
-						//s2 = GetInt128Data().ToHexString(); break;
-					case EC_TAGTYPE_CUSTOM:
-						if (m_dataLen == 0) {
-							s2 = "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 += "...";
-									break;
-								}
-								s2 += CFormat("%02X ") % (unsigned char) m_tagDatai;
-							}
+		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("%d") % GetInt();
+				break;
+			case EC_TAGTYPE_STRING:
+				s2 = GetStringData();
+				break;
+			case EC_TAGTYPE_DOUBLE:
+				s2 = CFormat("%.1f") % GetDoubleData();
+				break;
+			case EC_TAGTYPE_HASH16:
+				s2 = GetMD4Data().Encode();
+				break;
+			case EC_TAGTYPE_UINT128:
+				// Any non-inline function from UInt128.h would break linkage for remote
+				// apps not otherwise using CUInt128, so fall through and show the value as
+				// a byte stream. It is sent big-endian, so it reads correctly apart from
+				// the spaces.
+			case EC_TAGTYPE_CUSTOM:
+				if (m_dataLen == 0) {
+					s2 = "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 += "...";
+							break;
 						}
-						break;
-					default:
-						s2 = GetDebugNameECTagTypes(m_dataType);
+						s2 += CFormat("%02X ") % (unsigned char)m_tagDatai;
+					}
 				}
+				break;
+			default:
+				s2 = GetDebugNameECTagTypes(m_dataType);
+			}
 		}
 		DoECLogLine(s1 + s2);
 	}
@@ -1157,7 +986,7 @@
  * \brief Returns a pointer to the TAG DATA.
  *
  * \return A pointer to the TAG DATA. (As specified with the data field of the constructor.)
-*/
+ */
 
 /*!
  * \fn uint16 CECTag::GetTagDataLen(void) const

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECTag.h -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECTag.h Changed

@@ -33,255 +33,256 @@
 #include <wx/string.h> // Do_not_auto_remove
 #include <common/StringFunctions.h>
 
-#define EC_ASSERT(x)	wxASSERT(x)
+#define EC_ASSERT(x) wxASSERT(x)
 #else
-#define EC_ASSERT(x)	assert(x)
+#define EC_ASSERT(x) assert(x)
 #endif
 
 /* aMule/libcommon generic includes */
-#include "../../../MD4Hash.h"		// Needed for CMD4Hash
+#include "../../../MD4Hash.h" // Needed for CMD4Hash
 
-namespace Kademlia {
-	class CUInt128;
+namespace Kademlia
+{
+class CUInt128;
 }
 using Kademlia::CUInt128;
 
 /* EC specific includes */
-#include "ECCodes.h"		// Needed for EC types
-#include "ECTagTypes.h"	// Needed for TagTypes
-
+#include "ECCodes.h"    // Needed for EC types
+#include "ECTagTypes.h" // Needed for TagTypes
 
 class CECSocket;
 class CValueMap;
 
 /**
- * Class to hold IPv4 address.
+ * Holds an IPv4 address.
  */
-class EC_IPv4_t {
-	public:
-		EC_IPv4_t() { }
-		EC_IPv4_t(uint32 ip, uint16 port)
-		{
-			m_ip0 = ip & 0xff;
-			m_ip1 = (ip >> 8) & 0xff;
-			m_ip2 = (ip >> 16) & 0xff;
-			m_ip3 = (ip >> 24) & 0xff;
-			m_port = port;
-		}
-
-		uint32 IP()
-		{
-			return m_ip0 | (m_ip1 << 8) | (m_ip2 << 16) | (m_ip3 << 24);
-		}
-
-		std::string StringIPSTL(bool brackets = true)
-		{
-			std::ostringstream string_ip;
-			if (brackets) string_ip << "";
-			string_ip << (int)m_ip0 << "." << (int)m_ip1 << "." << (int)m_ip2 << "." << (int)m_ip3 << ":" << m_port;
-			if (brackets) string_ip << "";
-			return string_ip.str();
-		}
-
-		#ifdef USE_WX_EXTENSIONS
-		wxString StringIP(bool brackets = true) {
-			return char2unicode(StringIPSTL(brackets).c_str());
-		}
-		#endif
-
-		// Default member initialisers so a stack-allocated EC_IPv4_t
-		// constructed via the trivial ctor above starts with defined
-		// fields. Caught on lint as
-		// clang-analyzer-optin.cplusplus.UninitializedObject.
-		uint8 m_ip4 = {0, 0, 0, 0};
-		uint16 m_port = 0;
-};
+class EC_IPv4_t
+{
+public:
+	EC_IPv4_t() {}
+	EC_IPv4_t(uint32 ip, uint16 port)
+	{
+		m_ip0 = ip & 0xff;
+		m_ip1 = (ip >> 8) & 0xff;
+		m_ip2 = (ip >> 16) & 0xff;
+		m_ip3 = (ip >> 24) & 0xff;
+		m_port = port;
+	}
+
+	uint32 IP() { return m_ip0 | (m_ip1 << 8) | (m_ip2 << 16) | (m_ip3 << 24); }
+
+	std::string StringIPSTL(bool brackets = true)
+	{
+		std::ostringstream string_ip;
+		if (brackets)
+			string_ip << "";
+		string_ip << (int)m_ip0 << "." << (int)m_ip1 << "." << (int)m_ip2 << "." << (int)m_ip3
+			  << ":" << m_port;
+		if (brackets)
+			string_ip << "";
+		return string_ip.str();
+	}
+
+#ifdef USE_WX_EXTENSIONS
+	wxString StringIP(bool brackets = true) { return char2unicode(StringIPSTL(brackets).c_str()); }
+#endif
 
+	// Default member initialisers so a stack-allocated EC_IPv4_t built by the trivial ctor
+	// above starts with defined fields. Caught on lint as clang-analyzer-
+	// optin.cplusplus.UninitializedObject.
+	uint8 m_ip4 = { 0, 0, 0, 0 };
+	uint16 m_port = 0;
+};
 
 /**
- * High level EC packet TAGs handler class
+ * High level EC packet TAGs handler class.
  */
 
-class CECTag {
-	public:
-		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);
-		CECTag(ec_tagname_t name, uint64_t data);
-		CECTag(ec_tagname_t name, double data);
-		CECTag(ec_tagname_t name, const std::string& data);
-		CECTag(ec_tagname_t name, const EC_IPv4_t& data);
-		CECTag(ec_tagname_t name, const CMD4Hash& data);
-		CECTag(ec_tagname_t name, const CUInt128& data);
-		#ifdef USE_WX_EXTENSIONS
-		CECTag(ec_tagname_t name, const wxString& 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		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);
-		void		AddTag(ec_tagname_t name, const CUInt128& 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() const { return m_tagList.size(); }
-		bool			HasChildTags() const { return !m_tagList.empty(); }
-
-		// Serialize this tag (name + type + length + body + children) to a
-		// CECSocket using the wire format the receiver's matching ReadTag
-		// expects. Public so daemon-side code can pre-serialize per-file
-		// tag trees into a cache (used by the amulecmd FULL-fetch cache);
-		// inside the EC library itself this is the primitive invoked by
-		// `CECTag::WriteChildren` for each child of a packet.
-		bool			Serialize(CECSocket& socket) const { return WriteTag(socket); }
-		const void *	GetTagData() const {
-			EC_ASSERT(m_dataType == EC_TAGTYPE_CUSTOM);
-			return m_tagData;
-		}
-		uint16_t		GetTagDataLen() const { return m_dataLen; }
-		// useLargeCount: when true, account for the +4 bytes that
-		// CECTag::WriteChildren emits as the sentinel-extended count
-		// follow-up for any nested tag with >= 0xFFFF children. Writer
-		// (WriteTag) and reader (ReadFromSocket) must pass the SAME
-		// value (derived from CECSocket::m_tx_flags / m_rx_flags &
-		// EC_FLAG_LARGE_TAG_COUNT) so their independently-computed
-		// tagLen values agree and m_dataLen subtraction stays
-		// consistent. Default false preserves the historical wire size
-		// for callers that don't have a socket context (e.g. tests).
-		uint32_t		GetTagLen(bool useLargeCount = false) const;
-		ec_tagname_t		GetTagName() const { return m_tagName; }
-
-		// 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;
-		CUInt128	GetInt128Data() const;
-
-		void		DebugPrint(int level, bool print_empty) const;
-		void		swap(CECTag & t);
-
-		// 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;
-		CUInt128	AssignIfExist(ec_tagname_t tagname, CUInt128 *target) const;
-		std::string	AssignIfExist(ec_tagname_t tagname, std::string *target) const;
-		#ifdef USE_WX_EXTENSIONS
-		wxString	AssignIfExist(ec_tagname_t tagname, wxString *target) const;
-		#endif
-
-		// 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, CUInt128 &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
-
-	protected:
-
-		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;
-
-	private:
-		// To init. the automatic int data
-		void InitInt(uint64_t data);
-
-		ec_tagname_t	m_tagName;
-		ec_tagtype_t	m_dataType;
-		ec_taglen_t		m_dataLen;
-		char *			m_tagData;
-		void NewData()	{ m_tagData = new charm_dataLen; }
-
-		typedef std::list<CECTag> TagList;
-		TagList m_tagList;
-
-		static const CECTag s_theNullTag;
-
-		// 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(); }
-};
+class CECTag
+{
+public:
+	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);
+	CECTag(ec_tagname_t name, uint64_t data);
+	CECTag(ec_tagname_t name, double data);
+	CECTag(ec_tagname_t name, const std::string &data);
+	CECTag(ec_tagname_t name, const EC_IPv4_t &data);
+	CECTag(ec_tagname_t name, const CMD4Hash &data);
+	CECTag(ec_tagname_t name, const CUInt128 &data);
+#ifdef USE_WX_EXTENSIONS
+	CECTag(ec_tagname_t name, const wxString &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 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);
+	void AddTag(ec_tagname_t name, const CUInt128 &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() const { return m_tagList.size(); }
+	bool HasChildTags() const { return !m_tagList.empty(); }
+
+	// Serialize this tag (name + type + length + body + children) in the wire format the
+	// receiver's matching ReadTag expects. Public so daemon-side code can pre-serialize per-
+	// file tag trees into a cache (the amulecmd FULL-fetch cache); inside the EC library this
+	// is what `CECTag::WriteChildren` invokes per child.
+	bool Serialize(CECSocket &socket) const { return WriteTag(socket); }
+	const void *GetTagData() const
+	{
+		EC_ASSERT(m_dataType == EC_TAGTYPE_CUSTOM);
+		return m_tagData;
+	}
+	uint16_t GetTagDataLen() const { return m_dataLen; }
+	// useLargeCount: account for the +4 bytes CECTag::WriteChildren emits as the sentinel-
+	// extended count follow-up for a nested tag with >= 0xFFFF children. Writer (WriteTag) and
+	// reader (ReadFromSocket) must pass the SAME value, derived from CECSocket::m_tx_flags /
+	// m_rx_flags & EC_FLAG_LARGE_TAG_COUNT, so their independently computed tagLen values agree
+	// and the m_dataLen subtraction stays consistent. Default false keeps the historical wire
+	// size for callers with no socket context, e.g. tests.
+	uint32_t GetTagLen(bool useLargeCount = false) const;
+	ec_tagname_t GetTagName() const { return m_tagName; }
+
+	// 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; }
+	/// A raw-bytes tag, i.e. one GetTagData() may be called on. Lets a caller
+	/// reject a mistyped tag before GetTagData()'s assert would fire.
+	bool IsCustom() const { return m_dataType == EC_TAGTYPE_CUSTOM; }
+
+#ifdef USE_WX_EXTENSIONS
+	wxString GetStringData() const;
+	void SetStringData(const wxString &s);
+#endif
 
+	EC_IPv4_t GetIPv4Data() const;
+	CMD4Hash GetMD4Data() const;
+	CUInt128 GetInt128Data() const;
+
+	void DebugPrint(int level, bool print_empty) const;
+	void swap(CECTag &t);
+
+	// If the tag exists, return its value and store it in target (when target != NULL).
+	// Otherwise return a safe value and leave target alone. One function serves both 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;
+	CUInt128 AssignIfExist(ec_tagname_t tagname, CUInt128 *target) const;
+	std::string AssignIfExist(ec_tagname_t tagname, std::string *target) const;
+#ifdef USE_WX_EXTENSIONS
+	wxString AssignIfExist(ec_tagname_t tagname, wxString *target) const;
+#endif
+
+	// 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, CUInt128 &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
+
+protected:
+	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;
+
+private:
+	// To init. the automatic int data
+	void InitInt(uint64_t data);
+
+	ec_tagname_t m_tagName;
+	ec_tagtype_t m_dataType;
+	ec_taglen_t m_dataLen;
+	char *m_tagData;
+	void NewData() { m_tagData = new charm_dataLen; }
+
+	typedef std::list<CECTag> TagList;
+	TagList m_tagList;
+
+	static const CECTag s_theNullTag;
+
+	// 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(); }
+};
 
 /**
- * An empty TAG
- *
- * Note, that an "empty" tag is empty because it contains no data, but it still
- * may contain children.
+ * An empty TAG. "Empty" means it holds no data of its own; it may still have children.
  */
-class CECEmptyTag : public CECTag {
-	public:
-		CECEmptyTag(ec_tagname_t name = 0) : CECTag(name, 0, (const void *) NULL) {}
+class CECEmptyTag : public CECTag
+{
+public:
+	CECEmptyTag(ec_tagname_t name = 0)
+	: CECTag(name, 0, (const void *)NULL)
+	{
+	}
 };
 
 /**
- * An integer TAG
+ * 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)
+ * Only to avoid ctor ambiguity: CECIntTag(name, some_value) reads better than CECTag(name,
+ * (uint64)value).
  */
-class CECIntTag : public CECTag {
-	public:
-		CECIntTag(ec_tagname_t name, uint64 data) : CECTag(name, data) {}
+class CECIntTag : public CECTag
+{
+public:
+	CECIntTag(ec_tagname_t name, uint64 data)
+	: CECTag(name, data)
+	{
+	}
 };
 
 #endif /* ECTAG_H */

amule-3.0.1.tar.gz/src/libs/ec/cpp/ECUInt128.cpp -> amule-3.1.0.tar.gz/src/libs/ec/cpp/ECUInt128.cpp Changed

@@ -22,31 +22,25 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-// Implementation of these functions cannot be in ECTag.cpp, because here we
-// use non-inline member functions of CUInt128.  This way these functions are
-// only needed if we actually use the CUInt128 class, and will not cause
-// linker errors for apps like aMuleCmd, which don't use CUInt128.
-//
-// The other working possibility would be to make all these functions inline
-// members of CECTag, but that would clutter the header too much.
-
+// These functions cannot live in ECTag.cpp, because they use non-inline member functions of
+// CUInt128. This way they are only needed if the CUInt128 class is actually used, and cause no
+// linker errors for apps like aMuleCmd that do not use it. The other option would be to make them
+// all inline members of CECTag, which would clutter the header too much.
 
 #include "ECTag.h"
 #include "ECSpecialTags.h"
 #include "../../../kademlia/utils/UInt128.h"
 
-
-CECTag::CECTag(ec_tagname_t tagname, const CUInt128& data)
-	: m_tagName(tagname),
-	  m_dataType(EC_TAGTYPE_UINT128),
-	  m_dataLen(16)
+CECTag::CECTag(ec_tagname_t tagname, const CUInt128 &data)
+: m_tagName(tagname)
+, m_dataType(EC_TAGTYPE_UINT128)
+, m_dataLen(16)
 {
 	NewData();
 	data.ToByteArray(reinterpret_cast<uint8_t *>(m_tagData));
 }
 
-void CECTag::AddTag(ec_tagname_t name, const CUInt128& data, CValueMap *valuemap)
+void CECTag::AddTag(ec_tagname_t name, const CUInt128 &data, CValueMap *valuemap)
 {
 	if (valuemap) {
 		valuemap->CreateTag(name, data, this);

amule-3.0.1.tar.gz/src/libs/ec/cpp/RemoteConnect.cpp -> amule-3.1.0.tar.gz/src/libs/ec/cpp/RemoteConnect.cpp Changed

@@ -25,99 +25,179 @@
 
 #include "RemoteConnect.h"
 
-#include <common/SmartPtr.h>	// Needed for CSmartPtr
+#include "ECCrypt.h"
+#include "ECLog.h"
+#include "../../../Logger.h"
+
+#include <common/SmartPtr.h> // Needed for CSmartPtr
 #include <common/MD5Sum.h>
 #include <common/Format.h>
 #include "../../../amuleIPV4Address.h"
-#include "../../../NetworkFunctions.h"	// IsLoopbackIP / IsLanIP / IsLinkLocalIP / StringIPtoUint32
+#include "../../../NetworkFunctions.h" // IsLoopbackIP / IsLanIP / IsLinkLocalIP / StringIPtoUint32
 
 #include <wx/intl.h>
-#include <common/StringFunctions.h>	// unicode2char for stderr message
+#include <common/StringFunctions.h> // unicode2char for stderr message
+#include <algorithm>                // std::fill, wiping the ephemeral private key
 #ifdef __WINDOWS__
-	#include <process.h>		// _exit
+#include <process.h> // _exit
 #else
-	#include <unistd.h>		// _exit
+#include <unistd.h> // _exit
 #endif
 
 wxDEFINE_EVENT(wxEVT_EC_CONNECTION, wxEvent);
-CECLoginPacket::CECLoginPacket(const wxString& client, const wxString& version,
-							   bool canZLIB, bool canUTF8numbers, bool canNotify,
-							   bool preferNoZlib)
-:
-CECPacket(EC_OP_AUTH_REQ)
+
+namespace
+{
+// Optional graceful-shutdown handler for OnLost(); see SetEcConnectionLostHandler.
+void (*s_connectionLostHandler)() = nullptr;
+} // namespace
+
+void SetEcConnectionLostHandler(void (*handler)())
+{
+	s_connectionLostHandler = handler;
+}
+
+CECLoginPacket::CECLoginPacket(const wxString &client,
+	const wxString &version,
+	bool canZLIB,
+	bool canUTF8numbers,
+	bool canNotify,
+	bool preferNoZlib,
+	bool canMultiSearch,
+	bool canChat,
+	bool canChatSessions,
+	bool canAEAD,
+	const std::vector<uint8_t> &clientNonce,
+	const std::vector<uint8_t> &clientPubKey)
+: 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));
 
-	#ifdef EC_VERSION_ID
+#ifdef EC_VERSION_ID
 	CMD4Hash versionhash;
 	wxCHECK2(versionhash.Decode(EC_VERSION_ID), /* Do nothing. */);
 	AddTag(CECTag(EC_TAG_VERSION_ID, versionhash));
-	#endif
+#endif
 
 	// Send capabilities:
 	// support ZLIB compression
-	if (canZLIB)		AddTag(CECEmptyTag(EC_TAG_CAN_ZLIB));
+	if (canZLIB)
+		AddTag(CECEmptyTag(EC_TAG_CAN_ZLIB));
 	// support encoding of integers as UTF-8
-	if (canUTF8numbers) AddTag(CECEmptyTag(EC_TAG_CAN_UTF8_NUMBERS));
+	if (canUTF8numbers)
+		AddTag(CECEmptyTag(EC_TAG_CAN_UTF8_NUMBERS));
 	// client accepts push messages
-	if (canNotify)		AddTag(CECEmptyTag(EC_TAG_CAN_NOTIFY));
-	// client can decode the sentinel-extended children-count wire format
-	// from CECTag::WriteChildren (#199). Always advertised by new
-	// clients; old servers ignore the unknown tag.
+	if (canNotify)
+		AddTag(CECEmptyTag(EC_TAG_CAN_NOTIFY));
+	// Client can decode the sentinel-extended children-count wire format from
+	// CECTag::WriteChildren (#199).
 	AddTag(CECEmptyTag(EC_TAG_CAN_LARGE_TAG_COUNT));
-	// Client implements the partial-update INC_UPDATE protocol — server
-	// may skip unchanged files and signal deletions explicitly via
-	// `EC_TAG_FILE_REMOVED` instead of relying on absence-implies-
-	// deletion. Always advertised by new clients; old servers ignore
-	// the unknown tag and the server falls back to emitting alive-
-	// marker tags for unchanged files (still backward-compatible).
+	// Client implements the partial-update INC_UPDATE protocol: the server may skip
+	// unchanged files and mark deletions with EC_TAG_FILE_REMOVED instead of
+	// absence.
 	AddTag(CECEmptyTag(EC_TAG_CAN_PARTIAL_UPDATE));
-	// Client tells the server "we believe transit between us is fast
-	// (loopback / LAN), so skip per-packet ZLIB up to the receiver
-	// gate". The server honours this hint at WritePacket time; see
-	// ECSocket.cpp `m_isLocalPeer`. The decision lives on the client
-	// because only the client knows the IP it dialed — server-side
-	// peer-IP inspection would misclassify e.g. WireGuard tunnel
-	// endpoints as "local" when the underlying transit is anything but.
-	// Old servers ignore the unknown tag and fall back to always-zlib.
-	if (preferNoZlib)	AddTag(CECEmptyTag(EC_TAG_PREFER_NO_ZLIB));
+	// Same skip-unchanged / explicit-removal rule on the multi-search results union.
+	// Separate from EC_TAG_CAN_PARTIAL_UPDATE because only a client that implements
+	// it on the *search* container may be sent skipped results.
+	AddTag(CECEmptyTag(EC_TAG_CAN_PARTIAL_SEARCH));
+	// Client can read and write the daemon's shared directories over EC
+	// (EC_OP_GET/SET_SHARED_DIRS).
+	AddTag(CECEmptyTag(EC_TAG_CAN_SHAREDDIRS_CONFIG));
+	// Client can enumerate the daemon's searches with EC_OP_SEARCH_LIST, so it sees
+	// searches it did not start. A pre-#680 daemon never echoes it and asserts on the
+	// opcode, so the echo is what keeps the client from sending it.
+	AddTag(CECEmptyTag(EC_TAG_CAN_SEARCH_LIST));
+	// Client believes transit between us is fast (loopback / LAN), so the server may
+	// skip per-packet ZLIB up to the receiver gate. The decision lives here because
+	// only the client knows the IP it dialed: server-side peer-IP inspection would
+	// misclassify a WireGuard tunnel endpoint as local.
+	if (preferNoZlib)
+		AddTag(CECEmptyTag(EC_TAG_PREFER_NO_ZLIB));
+	// Client implements multi-search: EC searches are addressed by a daemon-allocated
+	// `EC_TAG_SEARCH_ID`, so several run at once.
+	if (canMultiSearch)
+		AddTag(CECEmptyTag(EC_TAG_CAN_MULTI_SEARCH));
+	// Client polls every open search with ONE id-less EC_OP_SEARCH_PROGRESS. Only
+	// advertised alongside multi-search: for a single-search client an id-less
+	// request keeps its legacy "the current search" meaning, which amulecmd's
+	// argument-less `search progress` relies on.
+	if (canMultiSearch)
+		AddTag(CECEmptyTag(EC_TAG_CAN_SEARCH_PROGRESS_UNION));
+	// Client wants incoming peer chat messages relayed over EC (amulegui shows them
+	// read-only). Only advertised by clients with a chat window.
+	if (canChat)
+		AddTag(CECEmptyTag(EC_TAG_CAN_CHAT));
+	// Separate from EC_TAG_CAN_CHAT: a daemon that echoes that one may still know
+	// none of the session opcodes.
+	if (canChatSessions)
+		AddTag(CECEmptyTag(EC_TAG_CAN_CHAT_SESSIONS));
+	// Transport encryption: our ciphers in preference order, our half of the
+	// derivation salt, and our ephemeral public key. A daemon that does not know
+	// these tags ignores them and the session stays in clear. The public key needs no
+	// capability tag of its own: encryption has never shipped, so anything offering
+	// EC_TAG_CAN_AEAD can do X25519, and a cipher list without a key is malformed
+	// rather than old.
+	if (canAEAD && !clientNonce.empty() && !clientPubKey.empty()) {
+		const std::vector<uint8_t> ciphers = ECCrypt::SupportedCiphers();
+		AddTag(CECTag(EC_TAG_CAN_AEAD, ciphers.size(), ciphers.data()));
+		AddTag(CECTag(EC_TAG_AEAD_CLIENT_NONCE, clientNonce.size(), clientNonce.data()));
+		AddTag(CECTag(EC_TAG_AEAD_CLIENT_PUBKEY, clientPubKey.size(), clientPubKey.data()));
+	}
 }
 
-CECAuthPacket::CECAuthPacket(const wxString& pass)
-:
-CECPacket(EC_OP_AUTH_PASSWD)
+CECAuthPacket::CECAuthPacket(const wxString &pass, const std::vector<uint8_t> &clientConfirm)
+: CECPacket(EC_OP_AUTH_PASSWD)
 {
 	CMD4Hash passhash;
 	wxCHECK2(passhash.Decode(pass), /* Do nothing. */);
 	AddTag(CECTag(EC_TAG_PASSWD_HASH, passhash));
+	// Binds the credential to this exact handshake. The salted challenge alone says
+	// nothing about the key exchange it travelled beside.
+	if (!clientConfirm.empty()) {
+		AddTag(CECTag(EC_TAG_AEAD_CLIENT_CONFIRM, clientConfirm.size(), clientConfirm.data()));
+	}
 }
 
 /*!
  * Connection to remote core
- *
  */
 
-CRemoteConnect::CRemoteConnect(wxEvtHandler* evt_handler)
-:
-CECMuleSocket(evt_handler != 0),
-m_ec_state(EC_INIT),
-m_req_fifo(),
-// Give application some indication about how fast requests are served
-// When request fifo contain more that certain number of entries, it may
-// indicate that either core or network is slowing us down
-m_req_count(0),
+CRemoteConnect::CRemoteConnect(wxEvtHandler *evt_handler)
+: CECMuleSocket(evt_handler != 0)
+, m_ec_state(EC_INIT)
+, m_req_fifo()
+,
+// Depth of the request fifo indicates how fast requests are served: a long queue
+// means the core or the network is slowing us down.
+m_req_count(0)
+,
 // 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_canZLIB(false),
-m_canUTF8numbers(false),
-m_canNotify(false),
-m_preferNoZlib(false),
-m_forceZlib(false),
-m_serverPartialUpdate(false)
+m_req_fifo_thr(20)
+, m_notifier(evt_handler)
+, m_canZLIB(false)
+, m_canUTF8numbers(false)
+, m_canNotify(false)
+, m_canAEAD(true)
+, m_aeadNegotiated(false)
+, m_preferNoZlib(false)
+, m_forceZlib(false)
+, m_serverSessionId(0)
+, m_serverPartialUpdate(false)
+, m_serverClientHistory(false)
+, m_serverPartialSearch(false)
+, m_canMultiSearch(false)
+, m_serverMultiSearch(false)
+, m_canChat(false)
+, m_serverChat(false)
+, m_canChatSessions(false)
+, m_serverChatSessions(false)
+, m_serverSharedDirsConfig(false)
+, m_serverSearchList(false)
+, m_serverSearchProgressUnion(false)
+, m_lastReplyAt(std::chrono::steady_clock::now())
 {
 }
 
@@ -134,11 +214,13 @@
 	m_canNotify = canNotify;
 }
 
-bool CRemoteConnect::ConnectToCore(const wxString &host, int port,
-	const wxString &WXUNUSED(login), const wxString &pass,
-	const wxString& client, const wxString& version)
+bool CRemoteConnect::ConnectToCore(
+	const wxString &host, int port, const wxString &pass, const wxString &client, const wxString &version)
 {
 	m_connectionPassword = pass;
+	// The salted challenge below overwrites m_connectionPassword with a value that
+	// goes on the wire, so capture the usable key material first.
+	m_aeadSecret = pass.Lower();
 
 	m_client = client;
 	m_version = version;
@@ -160,38 +242,85 @@
 
 	amuleIPV4Address addr;
 
-	addr.Hostname(host);
+	// Report a resolution failure as itself. Discarding this return left the address
+	// at 0.0.0.0 and surfaced as the generic "unable to connect", which says nothing
+	// about a typo in the host or a name with only AAAA records (aMule speaks IPv4
+	// only).
+	if (!addr.Hostname(host)) {
+		m_server_reply = CFormat(_("Could not resolve %s to an IPv4 address.")) % host;
+		return false;
+	}
 	addr.Service(port);
 
-	// Compute the prefer-no-ZLIB hint after host resolution: if we
-	// dialed a loopback / RFC1918 LAN / RFC3927 link-local IP, the
-	// transit is fast and per-packet ZLIB is pure overhead. Skip the
-	// check entirely if the user opted out of ZLIB via /EC/ZLIB=0
-	// (capability isn't advertised so the hint is moot) or set
-	// `/EC/ForceZLIB=1` / `--force-zlib` to handle e.g. a WireGuard
-	// tunnel endpoint that resolves to an RFC1918 IP but whose
-	// underlying transit is slow Internet.
+	// Compute the prefer-no-ZLIB hint after host resolution: a loopback, RFC1918 or
+	// RFC3927 IP means fast transit, where per-packet ZLIB is pure overhead. Skipped
+	// if the user disabled ZLIB (the capability is not advertised) or set ForceZLIB,
+	// for a WireGuard endpoint that resolves to an RFC1918 IP over slow transit.
+	//
+	// One fresh nonce per attempt: reusing it reuses a key, and a retry after a
+	// dropped socket is a new session.
+	m_aeadClientNonce.clear();
+	m_aeadOffered.clear();
+	m_aeadEphPriv.clear();
+	m_aeadEphPub.clear();
+	m_aeadClientConfirm.clear();
+	m_aeadExpectedServerConfirm.clear();
+	if (m_canAEAD) {
+		m_aeadClientNonce = ECCrypt::RandomBytes(ECCrypt::NONCE_TAG_LEN);
+		m_aeadOffered = ECCrypt::SupportedCiphers();
+		// One fresh key pair per attempt, for the same reason as the nonce and more
+		// sharply: a key that outlives the session is one that can be stolen after it.
+		if (!ECCrypt::GenerateX25519KeyPair(m_aeadEphPriv, m_aeadEphPub)) {
+			m_aeadEphPriv.clear();
+			m_aeadEphPub.clear();
+		}
+		if (m_aeadClientNonce.empty() || m_aeadEphPub.empty()) {
+			// No usable randomness: offer nothing rather than derive a key
+			// from a predictable salt or a predictable private key.
+			m_aeadOffered.clear();
+			m_aeadClientNonce.clear();
+			m_aeadEphPriv.clear();
+			m_aeadEphPub.clear();
+		}
+	}
+
 	m_preferNoZlib = false;
 	if (m_canZLIB && !m_forceZlib) {
 		uint32 resolved_ip = 0;
 		if (StringIPtoUint32(addr.IPAddress(), resolved_ip)) {
-			m_preferNoZlib = IsLoopbackIP(resolved_ip)
-				|| IsLanIP(resolved_ip)
-				|| IsLinkLocalIP(resolved_ip);
+			m_preferNoZlib = IsLoopbackIP(resolved_ip) || IsLanIP(resolved_ip) ||
+					 IsLinkLocalIP(resolved_ip);
 		}
 	}
 
 	if (ConnectSocket(addr)) {
 		// We get here only in case of synchronous connect.
 		// Otherwise we continue in OnConnect.
-		CECLoginPacket login_req(m_client, m_version, m_canZLIB, m_canUTF8numbers, m_canNotify, m_preferNoZlib);
+		CECLoginPacket login_req(m_client,
+			m_version,
+			m_canZLIB,
+			m_canUTF8numbers,
+			m_canNotify,
+			m_preferNoZlib,
+			m_canMultiSearch,
+			m_canChat,
+			m_canChatSessions,
+			m_canAEAD,
+			m_aeadClientNonce,
+			m_aeadEphPub);
 
 		CSmartPtr<const CECPacket> getSalt(SendRecvPacket(&login_req));
 		m_ec_state = EC_REQ_SENT;
 
-		ProcessAuthPacket(getSalt.get());
+		// Honour the AUTH_SALT verdict before sending the credential: a
+		// require-encryption refusal must stop here rather than send AUTH_PASSWD in
+		// clear. ProcessAuthPacket has already set m_server_reply and closed the socket.
+		// OnPacketReceived does the same check on the async path.
+		if (!ProcessAuthPacket(getSalt.get())) {
+			return false;
+		}
 
-		CECAuthPacket passwdPacket(m_connectionPassword);
+		CECAuthPacket passwdPacket(m_connectionPassword, m_aeadClientConfirm);
 
 		CSmartPtr<const CECPacket> reply(SendRecvPacket(&passwdPacket));
 		m_ec_state = EC_PASSWD_SENT;
@@ -212,21 +341,33 @@
 	return addr.Hostname(GetPeer()) ? addr.IsLocalHost() : false;
 }
 
-void CRemoteConnect::WriteDoneAndQueueEmpty()
-{
-}
+void CRemoteConnect::WriteDoneAndQueueEmpty() {}
 
-void CRemoteConnect::OnConnect() {
-	// Apply the EC-tuned TCP keepalive timings now that the underlying
-	// asio socket is fully connected on the async path (sync clients
-	// got it inside CECMuleSocket::InternalConnect already; this is
-	// the amulegui / amuleweb side where InternalConnect returns before
-	// the connect actually completes).
-	ApplyEcKeepalive();
+void CRemoteConnect::OnConnect()
+{
+	// Start the watchdog clock here, not at construction: a wrapper reused across a
+	// reconnect would carry the previous connection's staleness into the new one.
+	m_lastReplyAt = std::chrono::steady_clock::now();
+	// Apply the EC-tuned socket options now that the asio socket is fully connected.
+	// Sync clients got them in CECMuleSocket::InternalConnect; this is the amulegui /
+	// amuleweb / amuleapi side, where InternalConnect returns before the connect
+	// completes.
+	ApplyEcSocketOptions();
 
 	if (m_notifier) {
 		wxASSERT(m_ec_state == EC_CONNECT_SENT);
-		CECLoginPacket login_req(m_client, m_version, m_canZLIB, m_canUTF8numbers, m_canNotify, m_preferNoZlib);
+		CECLoginPacket login_req(m_client,
+			m_version,
+			m_canZLIB,
+			m_canUTF8numbers,
+			m_canNotify,
+			m_preferNoZlib,
+			m_canMultiSearch,
+			m_canChat,
+			m_canChatSessions,
+			m_canAEAD,
+			m_aeadClientNonce,
+			m_aeadEphPub);
 		CECSocket::SendPacket(&login_req);
 
 		m_ec_state = EC_REQ_SENT;
@@ -235,70 +376,202 @@
 	}
 }
 
-void CRemoteConnect::OnLost() {
+uint64 CRemoteConnect::MillisecondsSinceLastReply() const
+{
+	return static_cast<uint64>(std::chrono::duration_cast<std::chrono::milliseconds>(
+		std::chrono::steady_clock::now() - m_lastReplyAt)
+					   .count());
+}
+
+void CRemoteConnect::OnLost()
+{
 	if (m_notifier) {
-		// Notify app of failure — amulegui's wxEvent handler flips the
+		// A dial is still pending: the async connect has not completed, so
+		// EC_CONNECT_SENT has not advanced to EC_REQ_SENT. A LibSocketLost here is a
+		// stale event from the PREVIOUS connection that still targets this reused
+		// wrapper, and IsDestroying() sees the fresh impl, so it slips through.
+		// Swallowing it stops a stale lost aborting an in-flight reconnect; a truly
+		// failed dial is caught by amulegui's connect-timeout watchdog.
+		if (m_ec_state == EC_CONNECT_SENT) {
+			return;
+		}
+		// Notify app of failure -- amulegui's wxEvent handler flips the
 		// UI to "disconnected" and stops trying to update.
-		wxECSocketEvent event(wxEVT_EC_CONNECTION,false,_("Connection failure"));
+		wxECSocketEvent event(wxEVT_EC_CONNECTION, false, _("Connection failure"));
 		m_notifier->AddPendingEvent(event);
 		return;
 	}
-	// Headless EC clients (amulecmd, amuleweb) construct CRemoteConnect
-	// with NULL m_notifier. Continuing to run would mean serving stale
-	// data in amuleweb (HTTP requests still return the template shell
-	// without live amuled data, no error visible to the user) or
-	// sitting at the amulecmd prompt with a dead socket. Failing fast
-	// is the right semantic — supervisor (systemd unit / docker /
-	// shell loop) is the recovery layer and decides whether to restart.
-	fprintf(stderr, "%s\n",
-		(const char *)unicode2char(_("External Connection lost — exiting.")));
+	// Headless EC clients (amulecmd, amuleweb) pass a NULL m_notifier. Continuing
+	// would mean amuleweb serving an empty shell with no error, or amulecmd at a
+	// prompt with a dead socket. Failing fast is right; the supervisor recovers.
+	fprintf(stderr, "%s\n", (const char *)unicode2char(_("External Connection lost - exiting.")));
 	fflush(stderr);
-	// _exit instead of exit() because the asio worker thread that
-	// just fired this is mid-callback; racing static destructors
-	// against it risks the kind of use-after-free #748 was about.
-	// The OS reaps file descriptors / sockets on exit anyway.
+	if (s_connectionLostHandler) {
+		// amuleapi opted into a graceful shutdown: hand off so teardown runs on its own
+		// thread instead of racing static destructors from this asio callback.
+		s_connectionLostHandler();
+		return;
+	}
+	// _exit, not exit(): the asio worker thread that fired this is mid-callback, and
+	// racing static destructors against it risks the use-after-free of #748. The OS
+	// reaps descriptors anyway.
 	_exit(1);
 }
 
+void CRemoteConnect::SetupAEADFromSalt(const CECPacket *reply)
+{
+	m_aeadNegotiated = false;
+	m_aeadClientConfirm.clear();
+	m_aeadExpectedServerConfirm.clear();
+	if (!m_canAEAD || m_aeadClientNonce.empty() || m_aeadEphPriv.empty()) {
+		return;
+	}
+	const CECTag *cipherTag = reply->GetTagByName(EC_TAG_AEAD_CIPHER);
+	const CECTag *serverNonceTag = reply->GetTagByName(EC_TAG_AEAD_SERVER_NONCE);
+	const CECTag *serverPubTag = reply->GetTagByName(EC_TAG_AEAD_SERVER_PUBKEY);
+	if (cipherTag == nullptr || serverNonceTag == nullptr) {
+		// An old daemon, or one with encryption switched off. Nothing to do:
+		// the session stays in clear.
+		return;
+	}
+	if (serverPubTag == nullptr) {
+		// A daemon that named a cipher but sent no key. Nothing can be derived without
+		// forward secrecy, and falling back to the password-keyed derivation is precisely
+		// the downgrade this exists to prevent.
+		AddDebugLogLineN(logEC, "AEAD: daemon sent no public key, staying in clear");
+		return;
+	}
+
+	const uint8_t cipher = (uint8_t)cipherTag->GetInt();
+	if (!ECCrypt::IsCipherSupported(cipher)) {
+		AddDebugLogLineN(logEC, "AEAD: daemon chose a cipher we cannot do");
+		return;
+	}
+
+	// Validate the received lengths here, as the daemon does for the client's.
+	// Downstream would reject them too, but checking locally keeps the "every field
+	// the transcript concatenates is fixed-length" invariant obvious.
+	if (serverNonceTag->GetTagDataLen() != ECCrypt::NONCE_TAG_LEN ||
+		serverPubTag->GetTagDataLen() != ECCrypt::X25519_KEY_LEN) {
+		AddDebugLogLineN(logEC, "AEAD: daemon nonce or public key has a bad length");
+		return;
+	}
+
+	const uint8_t *serverNonceData = (const uint8_t *)serverNonceTag->GetTagData();
+	const std::vector<uint8_t> serverNonce(
+		serverNonceData, serverNonceData + serverNonceTag->GetTagDataLen());
+	const uint8_t *serverPubData = (const uint8_t *)serverPubTag->GetTagData();
+	const std::vector<uint8_t> serverPub(serverPubData, serverPubData + serverPubTag->GetTagDataLen());
+
+	// The channel key comes from here and from nothing else. Deriving it from the
+	// password is what cost forward secrecy: the password outlives the session.
+	std::vector<uint8_t> shared;
+	const bool agreed = ECCrypt::X25519Agree(m_aeadEphPriv, serverPub, shared);
+	// Wipe the private half as soon as it has done its one job, success or not.
+	// Holding it longer is the only thing that could reopen a recorded session.
+	ECCrypt::SecureWipe(m_aeadEphPriv);
+	if (!agreed) {
+		AddDebugLogLineN(logEC, "AEAD: bad daemon public key, staying in clear");
+		return;
+	}
+
+	// Transcript: everything both sides exchanged, so an edited handshake byte yields
+	// a different key on each end and the first sealed packet fails.
+	const std::vector<uint8_t> transcript = ECCrypt::BuildTranscript(
+		m_aeadOffered, cipher, m_aeadClientNonce, serverNonce, m_aeadEphPub, serverPub);
+
+	if (!SetupAEAD(cipher, shared, serverNonce, m_aeadClientNonce, transcript, false)) {
+		AddDebugLogLineN(logEC, "AEAD: key derivation failed, staying in clear");
+		return;
+	}
+
+	// The password no longer keys the channel, so it can no longer stop a man in the
+	// middle who runs an exchange with each of us and relays. These do instead: the
+	// transcripts on the two legs differ, so the tags do too.
+	const wxCharBuffer secret = m_aeadSecret.utf8_str();
+	std::vector<uint8_t> credential(
+		(const uint8_t *)secret.data(), (const uint8_t *)secret.data() + strlen(secret.data()));
+	m_aeadClientConfirm = ECCrypt::ConfirmTag(credential, transcript, "ec-confirm-client");
+	m_aeadExpectedServerConfirm = ECCrypt::ConfirmTag(credential, transcript, "ec-confirm-server");
+	ECCrypt::SecureWipe(credential);
+
+	m_aeadNegotiated = true; // EC_OP_AUTH_PASSWD is the last packet that must go out in clear.
+	EnableAEADAfterNextWrite();
+	AddDebugLogLineN(logEC, CFormat("AEAD: negotiated %s with X25519") % ECCrypt::CipherName(cipher));
+}
+
+bool CRemoteConnect::VerifyServerConfirm(const CECPacket *reply) const
+{
+	if (m_aeadExpectedServerConfirm.empty()) {
+		return false;
+	}
+	const CECTag *tag = reply->GetTagByName(EC_TAG_AEAD_SERVER_CONFIRM);
+	if (tag == nullptr) {
+		AddDebugLogLineN(logEC, "AEAD: daemon sent no key confirmation");
+		return false;
+	}
+	if (!tag->IsCustom()) {
+		// GetTagData() asserts on a non-custom tag; a peer must not be able to
+		// trip that in a debug build by mistyping the confirm tag.
+		AddDebugLogLineN(logEC, "AEAD: daemon key confirmation has the wrong tag type");
+		return false;
+	}
+	const uint8_t *data = (const uint8_t *)tag->GetTagData();
+	const std::vector<uint8_t> got(data, data + tag->GetTagDataLen());
+	if (!ECCrypt::ConstantTimeEquals(got, m_aeadExpectedServerConfirm)) {
+		AddDebugLogLineN(logEC, "AEAD: daemon key confirmation does not match");
+		return false;
+	}
+	return true;
+}
+
 const CECPacket *CRemoteConnect::OnPacketReceived(const CECPacket *packet, uint32 trueSize)
 {
 	CECPacket *next_packet = 0;
+	// Liveness stamp for the reply watchdog. Taken for EVERY inbound packet,
+	// handshake included, so a fresh connection is never mistaken for a quiet one.
+	m_lastReplyAt = std::chrono::steady_clock::now();
 	m_req_count--;
 	packet->DebugPrint(true, trueSize);
-	switch(m_ec_state) {
-		case EC_REQ_SENT:
-			if (ProcessAuthPacket(packet)) {
-				CECAuthPacket passwdPacket(m_connectionPassword);
-				CECSocket::SendPacket(&passwdPacket);
-				m_ec_state = EC_PASSWD_SENT;
-			}
-			break;
-		case EC_PASSWD_SENT:
-			ProcessAuthPacket(packet);
+	switch (m_ec_state) {
+	case EC_REQ_SENT:
+		if (ProcessAuthPacket(packet)) {
+			CECAuthPacket passwdPacket(m_connectionPassword, m_aeadClientConfirm);
+			CECSocket::SendPacket(&passwdPacket);
+			m_ec_state = EC_PASSWD_SENT;
+		}
+		break;
+	case EC_PASSWD_SENT:
+		ProcessAuthPacket(packet);
+		break;
+	case EC_OK:
+		if (IsCryptReady() && !WasLastPacketEncrypted()) {
+			// Established encrypted session: every response must arrive sealed. A
+			// cleartext packet here is an injection attempt.
+			AddDebugLogLineN(logEC, "EC: cleartext packet on an encrypted session, dropping");
+			CloseSocket();
 			break;
-		case EC_OK:
-			if ( !m_req_fifo.empty() ) {
-				CECPacketHandlerBase *handler = m_req_fifo.front();
-				m_req_fifo.pop_front();
-				if ( handler ) {
-					handler->HandlePacket(packet);
-				}
-			} else {
-				printf("EC error - packet received, but request fifo is empty\n");
+		}
+		if (!m_req_fifo.empty()) {
+			CECPacketHandlerBase *handler = m_req_fifo.front();
+			m_req_fifo.pop_front();
+			if (handler) {
+				handler->HandlePacket(packet);
 			}
-			break;
-		default:
-			break;
+		} else {
+			printf("EC error - packet received, but request fifo is empty\n");
+		}
+		break;
+	default:
+		break;
 	}
 
 	// no reply by default
 	return next_packet;
 }
 
-/*
- * 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.
- */
+// Core serves requests FCFS and always replies, so we keep a place in the fifo
+// even for replies we do not want.
 void CRemoteConnect::SendRequest(CECPacketHandlerBase *handler, const CECPacket *request)
 {
 	m_req_count++;
@@ -311,7 +584,30 @@
 	SendRequest(0, request);
 }
 
-bool CRemoteConnect::ProcessAuthPacket(const CECPacket *reply) {
+void CRemoteConnect::DiscardRequestQueue()
+{
+	// The core never replies to requests that were on the air when the socket died,
+	// so their handlers would linger and every reply on the reconnected session would
+	// pop the wrong one. Rewind each orphaned handler so it re-requests.
+	for (CECPacketHandlerBase *handler : m_req_fifo) {
+		if (handler) {
+			handler->AbortPendingRequest();
+		}
+	}
+	m_req_fifo.clear();
+	m_req_count = 0;
+}
+
+void CRemoteConnect::NotifyConnectionResult(bool connected)
+{
+	if (m_notifier) {
+		wxECSocketEvent event(wxEVT_EC_CONNECTION, connected, m_server_reply);
+		m_notifier->AddPendingEvent(event);
+	}
+}
+
+bool CRemoteConnect::ProcessAuthPacket(const CECPacket *reply)
+{
 	bool result = false;
 
 	if (!reply) {
@@ -319,80 +615,157 @@
 		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("%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.");
+			const CECTag *passwordSalt = reply->GetTagByName(EC_TAG_PASSWD_SALT);
+			if (NULL != passwordSalt) {
+				// Set up transport encryption before the challenge below
+				// overwrites m_connectionPassword.
+				SetupAEADFromSalt(reply);
+				if (m_canAEAD && !m_aeadNegotiated) {
+					// Encryption is required unless the user opted out, and
+					// m_canAEAD is that opt-out -- with it off we never offer,
+					// so a clear session is only ever an explicit choice. The
+					// core did not negotiate encryption, and an older aMule
+					// cannot be told from an attacker who stripped the offer.
+					m_server_reply =
+						m_aeadOffered.empty()
+							? _("Could not set up connection encryption. "
+							    "Connection closed.")
+							: _("The core did not negotiate an encrypted "
+							    "connection. It may be an older aMule without "
+							    "encryption support, or the connection may have "
+							    "been tampered with. To connect without "
+							    "encryption, turn it off in the connection "
+							    "settings.");
 					m_ec_state = EC_FAIL;
 					CloseSocket();
+					NotifyConnectionResult(false);
+					return false;
 				}
+				wxString saltHash = MD5Sum(CFormat("%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)) {
+			// The daemon must prove it holds the credential over this exact handshake:
+			// until this passes we know only that we are talking to something that
+			// completed a key exchange, which a relay can also do, twice. Fatal rather
+			// than a downgrade.
+			if (m_aeadNegotiated && !VerifyServerConfirm(reply)) {
+				m_server_reply = _("External Connection: the daemon failed to prove it "
+						   "knows the password. Connection closed.");
+				m_ec_state = EC_FAIL;
+				CloseSocket();
+				NotifyConnectionResult(false);
+				return false;
+			}
 			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();
+				m_serverVersion = reply->GetTagByName(EC_TAG_SERVER_VERSION)->GetStringData();
+				m_server_reply =
+					_("Succeeded! Connection established to aMule ") + m_serverVersion;
 			} else {
 				m_server_reply = _("Succeeded! Connection established.");
 			}
-			// Mirror server's negotiated capabilities into m_my_flags so
-			// outgoing per-packet flags include them (auto-stripped by
-			// `flags &= m_my_flags` in CECSocket::WritePacket otherwise).
-			// EC_TAG_CAN_LARGE_TAG_COUNT only appears in AUTH_OK from
-			// new daemons (#199); old daemons just don't echo the tag,
-			// and the sentinel wire format stays disabled in both
-			// directions for the duration of this connection.
+			// Mirror the server's negotiated capabilities into m_my_flags, or
+			// `flags &= m_my_flags` in CECSocket::WritePacket drops them from outgoing
+			// packets. Old daemons do not echo EC_TAG_CAN_LARGE_TAG_COUNT (#199) and the
+			// sentinel wire format stays disabled both ways.
 			if (reply->GetTagByName(EC_TAG_CAN_LARGE_TAG_COUNT)) {
 				m_my_flags |= EC_FLAG_LARGE_TAG_COUNT;
 			}
-			// Server confirms it speaks the partial-update protocol:
-			// `Get_EC_Response_GetUpdate` may now omit unchanged files
-			// and emit explicit `EC_TAG_FILE_REMOVED` markers, and our
-			// INC_UPDATE handler must skip the bulk
-			// "missing-from-response == deleted" loop. Old daemons
-			// (#727 pre-fix or earlier) don't echo this tag and the
-			// client stays on the legacy bulk-deletion path, which
-			// the new server keeps compatible by emitting alive-marker
-			// tags for unchanged files (#713).
+			// Server speaks the partial-update protocol: Get_EC_Response_GetUpdate may
+			// omit unchanged files and emit explicit EC_TAG_FILE_REMOVED markers, and our
+			// INC_UPDATE handler must skip the bulk "missing == deleted" loop. Old
+			// daemons do not echo this and stay on the legacy alive-marker path (#713).
 			if (reply->GetTagByName(EC_TAG_CAN_PARTIAL_UPDATE)) {
 				m_serverPartialUpdate = true;
 			}
-		}else {
+			// Which daemon process we're talking to. Stays 0 against a daemon that does
+			// not send it, which the reconnect path reads as "can't tell".
+			if (const CECTag *sessionTag = reply->GetTagByName(EC_TAG_SESSION_ID)) {
+				m_serverSessionId = sessionTag->GetInt();
+			}
+			// Server knows EC_OP_GET_CLIENT_HISTORY. No echo leaves the Known-clients tab
+			// empty rather than sending it: a debug daemon asserts on the opcode.
+			if (reply->GetTagByName(EC_TAG_CAN_CLIENT_HISTORY)) {
+				m_serverClientHistory = true;
+			}
+			if (reply->GetTagByName(EC_TAG_CAN_PARTIAL_SEARCH)) {
+				m_serverPartialSearch = true;
+			}
+			// Server confirmed multi-search: it allocates a distinct EC_TAG_SEARCH_ID per
+			// search. Old daemons omit the echo and we stay on the sentinel path.
+			if (reply->GetTagByName(EC_TAG_CAN_MULTI_SEARCH)) {
+				m_serverMultiSearch = true;
+			}
+			// Server answers an id-less EC_OP_SEARCH_PROGRESS with every open search's
+			// progress as children, so one request covers every tab. Old daemons omit the
+			// echo and we keep polling one request per search id.
+			if (reply->GetTagByName(EC_TAG_CAN_SEARCH_PROGRESS_UNION)) {
+				m_serverSearchProgressUnion = true;
+			}
+			// Server buffers incoming peer messages for EC_OP_GET_CHAT_MESSAGES. Old
+			// daemons omit the echo and the client never polls for chat.
+			if (reply->GetTagByName(EC_TAG_CAN_CHAT)) {
+				m_serverChat = true;
+			}
+			// Its own tag, because EC_TAG_CAN_CHAT above is echoed by daemons that predate
+			// the session ops: gating on that one would send EC_OP_GET_CHAT_SESSIONS to a
+			// core whose dispatcher asserts on it.
+			if (reply->GetTagByName(EC_TAG_CAN_CHAT_SESSIONS)) {
+				m_serverChatSessions = true;
+			}
+			// Server serves EC_OP_SEARCH_LIST. Old daemons omit the echo and the client
+			// must not send the opcode: it lands in ProcessRequest2's unknown-opcode
+			// branch, which logs and asserts.
+			if (reply->GetTagByName(EC_TAG_CAN_SEARCH_LIST)) {
+				m_serverSearchList = true;
+			}
+			// Server serves the shared-directory config ops. Without the echo the GUI keeps
+			// the folders panel read-only rather than discarding edits silently.
+			if (reply->GetTagByName(EC_TAG_CAN_SHAREDDIRS_CONFIG)) {
+				m_serverSharedDirsConfig = 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());
+						 wxGetTranslation(reason->GetStringData());
 			} else {
 				m_server_reply = _("External Connection: Handshake failed.");
 			}
 			CloseSocket();
 		}
 	}
-	if ( m_notifier ) {
-		wxECSocketEvent event(wxEVT_EC_CONNECTION, result, m_server_reply);
-		m_notifier->AddPendingEvent(event);
-	}
+	NotifyConnectionResult(result);
 	return result;
 }
 
 /******************** EC API ***********************/
 
-void CRemoteConnect::StartKad() {
+void CRemoteConnect::StartKad()
+{
 	CECPacket req(EC_OP_KAD_START);
 	SendPacket(&req);
 }
 
-void CRemoteConnect::StopKad() {
+void CRemoteConnect::StopKad()
+{
 	CECPacket req(EC_OP_KAD_STOP);
 	SendPacket(&req);
 }
 
-void CRemoteConnect::ConnectED2K(uint32 ip, uint16 port) {
+void CRemoteConnect::ConnectED2K(uint32 ip, uint16 port)
+{
 	CECPacket req(EC_OP_SERVER_CONNECT);
 	if (ip && port) {
 		req.AddTag(CECTag(EC_TAG_SERVER, EC_IPv4_t(ip, port)));
@@ -400,12 +773,14 @@
 	SendPacket(&req);
 }
 
-void CRemoteConnect::DisconnectED2K() {
+void CRemoteConnect::DisconnectED2K()
+{
 	CECPacket req(EC_OP_SERVER_DISCONNECT);
 	SendPacket(&req);
 }
 
-void CRemoteConnect::RemoveServer(uint32 ip, uint16 port) {
+void CRemoteConnect::RemoveServer(uint32 ip, uint16 port)
+{
 	CECPacket req(EC_OP_SERVER_REMOVE);
 	if (ip && port) {
 		req.AddTag(CECTag(EC_TAG_SERVER, EC_IPv4_t(ip, port)));

amule-3.0.1.tar.gz/src/libs/ec/cpp/RemoteConnect.h -> amule-3.1.0.tar.gz/src/libs/ec/cpp/RemoteConnect.h Changed

@@ -26,42 +26,73 @@
 #ifndef REMOTECONNECT_H
 #define REMOTECONNECT_H
 
-
 #include "ECMuleSocket.h"
-#include "ECPacket.h"		// Needed for CECPacket
+
+#include <chrono>     // steady_clock for the reply watchdog
+#include "ECPacket.h" // Needed for CECPacket
 
 #include <wx/event.h>
 
-class CECPacketHandlerBase {
-	public:
-		virtual ~CECPacketHandlerBase() { }
-		virtual void HandlePacket(const CECPacket *) = 0;
+// Installed by a headless EC client (amuleapi) to replace the hard _exit() that
+// CRemoteConnect::OnLost() performs when the connection drops with a NULL
+// notifier. OnLost then invokes the handler and returns, letting the client tear
+// down on its own main thread rather than racing static destructors from the asio
+// callback.
+void SetEcConnectionLostHandler(void (*handler)());
+
+class CECPacketHandlerBase
+{
+public:
+	virtual ~CECPacketHandlerBase() {}
+	virtual void HandlePacket(const CECPacket *) = 0;
+
+	// Called when a reconnect discards the pending-request FIFO: the reply this
+	// handler waited for died with the socket, so any "request in flight" state must
+	// be rewound or the handler would refuse to re-request. Default no-op;
+	// CRemoteContainer rewinds its request SM.
+	virtual void AbortPendingRequest() {}
 };
 
-class CECLoginPacket : public CECPacket {
-	public:
-		CECLoginPacket(const wxString& client, const wxString& version,
-						bool canZLIB = true, bool canUTF8numbers = true, bool canNotify = false,
-						bool preferNoZlib = false);
+class CECLoginPacket : public CECPacket
+{
+public:
+	CECLoginPacket(const wxString &client,
+		const wxString &version,
+		bool canZLIB = true,
+		bool canUTF8numbers = true,
+		bool canNotify = false,
+		bool preferNoZlib = false,
+		bool canMultiSearch = false,
+		bool canChat = false,
+		bool canChatSessions = false,
+		bool canAEAD = false,
+		const std::vector<uint8_t> &clientNonce = std::vector<uint8_t>(),
+		const std::vector<uint8_t> &clientPubKey = std::vector<uint8_t>());
 };
 
-class CECAuthPacket : public CECPacket {
-	public:
-		CECAuthPacket(const wxString& pass);
+class CECAuthPacket : public CECPacket
+{
+public:
+	/// @a clientConfirm proves knowledge of the credential over the handshake
+	/// transcript; empty when no encryption was negotiated.
+	CECAuthPacket(
+		const wxString &pass, const std::vector<uint8_t> &clientConfirm = std::vector<uint8_t>());
 };
 
-//#warning Kry TODO - move to abstract layer.
-class CRemoteConnect : public CECMuleSocket {
+// #warning Kry TODO - move to abstract layer.
+class CRemoteConnect : public CECMuleSocket
+{
 private:
 	// State enums for connection SM ( client side ) in case of async processing
-	enum {
-		EC_INIT,         // initial state
-		EC_CONNECT_SENT, // socket connect request sent
-		EC_REQ_SENT,     // sent auth request to core, waiting for reply
-		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"
+	enum
+	{
+		EC_INIT,          // initial state
+		EC_CONNECT_SENT,  // socket connect request sent
+		EC_REQ_SENT,      // sent auth request to core, waiting for reply
+		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
@@ -70,10 +101,11 @@
 	int m_req_count;
 	int m_req_fifo_thr;
 
-	wxEvtHandler* m_notifier;
+	wxEvtHandler *m_notifier;
 
 	wxString m_connectionPassword;
 	wxString m_server_reply;
+	wxString m_serverVersion;
 	wxString m_client;
 	wxString m_version;
 
@@ -81,65 +113,250 @@
 	bool m_canUTF8numbers;
 	bool m_canNotify;
 
-	// Set in ConnectToCore when the dialed server address resolves to
-	// a loopback / RFC1918 LAN / RFC3927 link-local IP. Drives the
-	// `EC_TAG_PREFER_NO_ZLIB` hint in the auth packet; see
-	// `CECLoginPacket` ctor and ECSocket.cpp's `m_isLocalPeer` per-
-	// packet bypass. Only meaningful when `m_canZLIB` is also true
-	// (no point sending the hint when the capability isn't advertised).
+	// Offer transport encryption. On by default in every shipped client; the
+	// user-facing switches only exist to turn it off.
+	bool m_canAEAD;
+
+	// Our half of the key-derivation salt, generated per connection attempt and kept
+	// so the derivation can run once the daemon's half arrives in EC_OP_AUTH_SALT.
+	std::vector<uint8_t> m_aeadClientNonce;
+
+	// The ciphers we offered, verbatim, plus the one the daemon chose. Bound into the
+	// key derivation so a modified capability exchange yields a different key on each
+	// side and the first sealed packet fails, rather than quietly dropping to
+	// something weaker.
+	std::vector<uint8_t> m_aeadOffered;
+
+	// Our ephemeral X25519 pair for this connection attempt. The private half is
+	// wiped as soon as the shared secret is derived: it is what an attacker with a
+	// recording would need, and it exists for one handshake precisely so there is
+	// nothing left to compel or steal.
+	std::vector<uint8_t> m_aeadEphPriv;
+	std::vector<uint8_t> m_aeadEphPub;
+
+	// md5 of the password, lower-cased -- the value both ends hold and neither
+	// transmits. Captured before the salted-challenge step overwrites
+	// m_connectionPassword with the value that does go on the wire.
+	//
+	// No longer key material: the channel key comes from the ephemeral exchange
+	// alone, or a password learned later would decrypt an earlier recording. The
+	// confirmation tags are keyed on this instead.
+	wxString m_aeadSecret;
+
+	// Our confirmation, sent with EC_OP_AUTH_PASSWD, and the daemon's, which must
+	// come back in EC_OP_AUTH_OK. With the key no longer derived from the password,
+	// these are what a relay cannot produce: it runs a different exchange on each
+	// leg, so the transcripts differ and at least one check fails.
+	std::vector<uint8_t> m_aeadClientConfirm;
+	std::vector<uint8_t> m_aeadExpectedServerConfirm;
+
+	/// Set when the daemon named a cipher and the keys derived cleanly.
+	bool m_aeadNegotiated;
+
+	/**
+	 * Derive session keys from EC_OP_AUTH_SALT, and arm after the next write.
+	 *
+	 * Arming is deferred by one packet because EC_OP_AUTH_PASSWD still has to
+	 * leave in clear: the daemon cannot open it until it has run the same
+	 * derivation, which it only does once the password checks out.
+	 */
+	void SetupAEADFromSalt(const CECPacket *reply);
+
+	/**
+	 * Check the daemon's key-confirmation tag in EC_OP_AUTH_OK.
+	 *
+	 * Only meaningful once encryption was negotiated; a false return means the
+	 * peer completed a key exchange but cannot prove it knows the credential,
+	 * which is what a relay looks like. The caller drops the connection.
+	 */
+	bool VerifyServerConfirm(const CECPacket *reply) const;
+
+	// Set in ConnectToCore when the dialed address resolves to a loopback, RFC1918 or
+	// RFC3927 IP. Drives the EC_TAG_PREFER_NO_ZLIB hint, and means nothing unless
+	// m_canZLIB is also true.
 	bool m_preferNoZlib;
 
-	// User override to always negotiate ZLIB regardless of dialed
-	// server locality. Use case: a WireGuard / Tailscale tunnel
-	// endpoint that resolves to an RFC1918 IP but whose underlying
-	// transit is slow Internet — the locality check would otherwise
-	// strip ZLIB and the user loses the perf they actually want.
-	// Set via SetForceZlib() from the caller's config/CLI plumbing.
+	// User override to always negotiate ZLIB regardless of locality, for a WireGuard
+	// or Tailscale endpoint that resolves to an RFC1918 IP over slow transit.
 	bool m_forceZlib;
 
-	// Set when the server echoed `EC_TAG_CAN_PARTIAL_UPDATE` in AUTH_OK,
-	// confirming it speaks the partial-update INC_UPDATE protocol: skip
-	// the bulk "anything missing == deleted" loop and instead delete only
-	// what arrives in explicit `EC_TAG_FILE_REMOVED` markers. Old daemons
-	// don't echo the tag; we then fall back to the legacy bulk-deletion
-	// path (server emits alive-marker tags so it still works).
+	// The daemon process this connection is talking to (EC_TAG_SESSION_ID from
+	// AUTH_OK), or 0 against a daemon too old to send it. ECIDs mean something only
+	// within one session -- CECID counts from a process-local counter -- so a
+	// reconnect that comes back with a different value, or with 0, has to discard
+	// everything keyed by ECID rather than reconcile against it.
+	uint64 m_serverSessionId;
+
+	// Server echoed EC_TAG_CAN_PARTIAL_UPDATE: skip the bulk "anything missing ==
+	// deleted" loop and delete only what arrives in explicit EC_TAG_FILE_REMOVED
+	// markers. Old daemons do not echo it, and the legacy bulk path still works
+	// because the server emits alive-marker tags.
 	bool m_serverPartialUpdate;
 
+	// Server echoed EC_TAG_CAN_CLIENT_HISTORY: it answers EC_OP_GET_CLIENT_HISTORY.
+	// Not an optimisation -- a daemon that predates the request reaches the
+	// unknown-opcode branch of ProcessRequest2(), which asserts before returning the
+	// EC_OP_FAILED it otherwise would.
+	bool m_serverClientHistory;
+
+	// Server echoed EC_TAG_CAN_PARTIAL_SEARCH: it may skip unchanged SEARCH RESULTS
+	// on the multi-search union poll and signal their removal with
+	// EC_TAG_FILE_REMOVED.
+	//
+	// Separate from m_serverPartialUpdate, which is about the shared-file / download
+	// stream and is advertised by every client built since it landed. Reusing it here
+	// would make an older amuleGUI -- which advertises it, speaks multi-search, and
+	// still deletes any result missing from the reply -- silently drop its results.
+	bool m_serverPartialSearch;
+
+	// Client opts into the multi-search protocol. Off by default; set via
+	// SetCanMultiSearch() only once the client addresses searches by
+	// `EC_TAG_SEARCH_ID`.
+	bool m_canMultiSearch;
+	// Server echoed `EC_TAG_CAN_MULTI_SEARCH`: it runs several EC searches at once,
+	// addressed by ID. Old daemons don't echo it and the client stays single-search.
+	bool m_serverMultiSearch;
+
+	// Server echoed `EC_TAG_CAN_SHAREDDIRS_CONFIG`: it serves
+	// EC_OP_GET/SET_SHARED_DIRS. Without the echo the GUI leaves the shared-folders
+	// panel read-only, since a selection there could not reach the daemon.
+	bool m_serverSharedDirsConfig;
+
+	// Server echoed EC_TAG_CAN_SEARCH_LIST: it serves EC_OP_SEARCH_LIST. Old daemons
+	// predate #680, so the client must not send the opcode at all -- the request
+	// falls into ProcessRequest2's unknown-opcode branch and trips a wxFAIL. Without
+	// the list the GUI sees only the searches it started itself.
+	bool m_serverSearchList;
+
+	// Steady-clock stamp of the last packet received from the daemon. Steady, not
+	// wall-clock: a system clock step (NTP, sleep/wake) must not read as a stall.
+	std::chrono::steady_clock::time_point m_lastReplyAt;
+
+	// Server echoed EC_TAG_CAN_SEARCH_PROGRESS_UNION: an EC_OP_SEARCH_PROGRESS with
+	// no EC_TAG_SEARCH_ID reports every open search as children rather than one.
+	// Advertised only alongside multi-search, so an id-less request from a
+	// single-search client keeps its legacy meaning.
+	bool m_serverSearchProgressUnion;
+
+	// Client opts into chat relay. Off by default; a client with a chat window sets
+	// it via SetCanChat().
+	bool m_canChat;
+	// Server echoed `EC_TAG_CAN_CHAT`: it buffers incoming peer messages for polling
+	// via EC_OP_GET_CHAT_MESSAGES. Old daemons don't echo it and we never poll.
+	bool m_serverChat;
+	// Client speaks the chat session ops (advertise `EC_TAG_CAN_CHAT_SESSIONS`).
+	bool m_canChatSessions;
+	// Server echoed EC_TAG_CAN_CHAT_SESSIONS.
+	//
+	// Distinct from m_serverChat on purpose: EC_TAG_CAN_CHAT is echoed by daemons
+	// that predate the session ops entirely, so gating on it would send
+	// EC_OP_GET_CHAT_SESSIONS straight into the unknown-opcode branch, which asserts.
+	bool m_serverChatSessions;
+
 	void WriteDoneAndQueueEmpty();
+
 public:
 	// The event handler is used for notifying connect/close
-	CRemoteConnect(wxEvtHandler* evt_handler);
+	CRemoteConnect(wxEvtHandler *evt_handler);
 
 	void SetCapabilities(bool canZLIB, bool canUTF8numbers, bool canNotify);
 
-	// Force-ZLIB override: when true, ConnectToCore skips the
-	// loopback/LAN-IP locality detection and never asks the server
-	// to bypass ZLIB. Call BEFORE ConnectToCore() — the flag is read
-	// during connect.
+	/**
+	 * Offer (or refuse to offer) transport encryption.
+	 *
+	 * Defaults to on; the switches that reach this are all opt-OUT. Refusing does
+	 * not fail a connection -- it leaves the session in clear, which is what the
+	 * daemon's own policy may then reject.
+	 */
+	void SetCanAEAD(bool canAEAD) { m_canAEAD = canAEAD; }
+	bool GetCanAEAD() const { return m_canAEAD; }
+
+	/// True once keys were derived for this connection, i.e. the daemon accepted the
+	/// offer. Used to insist that EC_OP_AUTH_OK really did arrive sealed.
+	bool IsAEADNegotiated() const { return m_aeadNegotiated; }
+
+	// Force-ZLIB override: ConnectToCore then skips the loopback/LAN-IP locality
+	// detection and never asks the server to bypass ZLIB. Call BEFORE
+	// ConnectToCore(), which is where the flag is read.
 	void SetForceZlib(bool force) noexcept { m_forceZlib = force; }
 
+	// Opt into the multi-search protocol. Call BEFORE ConnectToCore(), and only from
+	// a client that reads `EC_TAG_SEARCH_ID` and addresses searches by it.
+	void SetCanMultiSearch(bool can) noexcept { m_canMultiSearch = can; }
+
+	// Opt into chat relay. Call BEFORE ConnectToCore(). Only a client with a
+	// chat window (amulegui) should set this; others never poll for messages.
+	void SetCanChat(bool can) noexcept { m_canChat = can; }
+
+	// Opt into the chat session ops. Call BEFORE ConnectToCore().
+	void SetCanChatSessions(bool can) noexcept { m_canChatSessions = can; }
+
 	bool ServerSupportsPartialUpdate() const { return m_serverPartialUpdate; }
+	//! See m_serverClientHistory. False means: do not send the request at all.
+	bool ServerSupportsClientHistory() const { return m_serverClientHistory; }
+	//! See m_serverSessionId. 0 means the daemon didn't tell us.
+	uint64 GetServerSessionId() const { return m_serverSessionId; }
+	bool ServerSupportsPartialSearch() const { return m_serverPartialSearch; }
 
-	bool ConnectToCore(
-		const wxString &host, int port,
-		const wxString& login, const wxString &pass,
-		const wxString& client, const wxString& version);
+	bool ServerSupportsMultiSearch() const { return m_serverMultiSearch; }
 
-	const wxString& GetServerReply() const { return m_server_reply; }
+	bool ServerSupportsChat() const { return m_serverChat; }
 
-	bool RequestFifoFull()
-	{
-		return m_req_count > m_req_fifo_thr;
-	}
+	//! See m_serverChatSessions. False means: do not send the chat session
+	//! opcodes at all.
+	bool ServerSupportsChatSessions() const { return m_serverChatSessions; }
+
+	bool ServerSupportsSharedDirsConfig() const { return m_serverSharedDirsConfig; }
+
+	bool ServerSupportsSearchList() const { return m_serverSearchList; }
+
+	bool ServerSupportsSearchProgressUnion() const { return m_serverSearchProgressUnion; }
+
+	// No `login`: EC authenticates on the password alone. The parameter existed since
+	// 2005, was declared WXUNUSED in the definition, and the three callers passed an
+	// empty string, a dialog field that was never filled in, and the literal
+	// "foobar" (issue #1266).
+	bool ConnectToCore(const wxString &host,
+		int port,
+		const wxString &pass,
+		const wxString &client,
+		const wxString &version);
+
+	const wxString &GetServerReply() const { return m_server_reply; }
+
+	// Version of the connected core, from EC_TAG_SERVER_VERSION in AUTH_OK. Empty
+	// until the handshake completes, or if an old daemon omits the tag.
+	const wxString &GetServerVersion() const { return m_serverVersion; }
+
+	bool RequestFifoFull() { return m_req_count > m_req_fifo_thr; }
+
+	// Outstanding requests: pushed by SendRequest, popped when the matching reply is
+	// handled. Unlike m_req_count this never sees the handshake packets.
+	size_t GetReqFifoSize() const { return m_req_fifo.size(); }
+
+	// Milliseconds since the last packet arrived from the daemon, or since the
+	// connection was established if none has. Drives the reply watchdog: EC has no
+	// application-level keepalive, so a transport that silently stops delivering (an
+	// SSH tunnel with no ServerAliveInterval, a NAT dropping an idle mapping, a
+	// proxy) leaves the socket ESTABLISHED with every queue empty, and the only
+	// symptom is a frozen UI.
+	uint64 MillisecondsSinceLastReply() const;
 
 	virtual void OnConnect(); // To override connection events
-	virtual void OnLost(); // To override close events
+	virtual void OnLost();    // To override close events
 
 	void SendRequest(CECPacketHandlerBase *handler, const CECPacket *request);
 	void SendPacket(const CECPacket *request);
 
-	/********************* EC API ********************/
+	// Drop every handler still queued for an in-flight reply. The EC FIFO assumes the
+	// core answers every request in order (see SendRequest), but a dropped socket
+	// leaves the requests that were on the air unanswered; their handlers would stay
+	// in m_req_fifo and mis-pair with the reconnected session's replies (a stats
+	// reply routed to the file-list handler wipes the download / shared lists, aMule
+	// #444). Rewinds each orphaned handler and zeroes the in-flight counter.
+	void DiscardRequestQueue();
 
+	/********************* EC API ********************/
 
 	/* Misc */
 
@@ -147,8 +364,7 @@
 	void ShutDown();
 
 	// Handles a ED2K link
-	void Ed2kLink(wxString* link);
-
+	void Ed2kLink(wxString *link);
 
 	/* Kad */
 
@@ -158,7 +374,6 @@
 	// Disconnects Kad network
 	void StopKad();
 
-
 	/* ED2K */
 
 	// Connects to ED2K. If ip and port are not 0, connect
@@ -168,17 +383,14 @@
 	// Disconnects from ED2K
 	void DisconnectED2K();
 
-
 	/* Servers */
 
 	// Adds a server
-	void AddServer(uint32 ip,
-		       uint16 port);
+	void AddServer(uint32 ip, uint16 port);
 
 	// Remove specific server
 	// Returns: Error message or empty string for no error
-	void RemoveServer(uint32 ip,
-			  uint16 port);
+	void RemoveServer(uint32 ip, uint16 port);
 
 	// Returns ED2K server list
 	void GetServerList();
@@ -186,7 +398,6 @@
 	// Updates ED2K server from a URL
 	void UpdateServerList(wxString url);
 
-
 	/* Search */
 
 	// Starts new search
@@ -199,8 +410,7 @@
 	void GetSearchProgress();
 
 	// Add 1 or more of found files to download queue
-	void DownloadSearchResult(uint32* file);
-
+	void DownloadSearchResult(uint32 *file);
 
 	/* Statistics */
 
@@ -210,47 +420,43 @@
 	// Returns aMule connection status
 	void GetConnectionState();
 
-
 	/* Queue/File handling */
 
 	// Returns downloads queue
-	void GetDlQueue(CMD4Hash* file);
+	void GetDlQueue(CMD4Hash *file);
 
 	// Returns uploads queue
-	void GetUpQueue(CMD4Hash* file);
+	void GetUpQueue(CMD4Hash *file);
 
 	// Returns waiting queue
-	void GetWtQueue(CMD4Hash* file);
+	void GetWtQueue(CMD4Hash *file);
 
 	// Swaps A4AF to a file
-	void SwapA4AFThis(CMD4Hash* file);
+	void SwapA4AFThis(CMD4Hash *file);
 
 	// Swaps A4AF to a file (auto)
-	void SwapA4AFThisAuto(CMD4Hash* file);
+	void SwapA4AFThisAuto(CMD4Hash *file);
 
 	// Swaps A4AF to any other files
-	void SwapA4AFOthers(CMD4Hash* file);
+	void SwapA4AFOthers(CMD4Hash *file);
 
 	// Pauses download(s)
-	void Pause(CMD4Hash* file);
+	void Pause(CMD4Hash *file);
 
 	// Resumes download(s)
-	void Resume(CMD4Hash* file);
+	void Resume(CMD4Hash *file);
 
 	// Stops download(s)
-	void Stop(CMD4Hash* file);
+	void Stop(CMD4Hash *file);
 
 	// Sets priority for a download
-	void SetPriority(CMD4Hash* file,
-			 uint8 priority);
+	void SetPriority(CMD4Hash *file, uint8 priority);
 
 	// Deletes a download
-	void Delete(CMD4Hash* file);
+	void Delete(CMD4Hash *file);
 
 	// Sets category for a download
-	void SetCategory(CMD4Hash* file,
-			 wxString category);
-
+	void SetCategory(CMD4Hash *file, wxString category);
 
 	/* Shared files */
 
@@ -258,8 +464,7 @@
 	void GetSharedFiles();
 
 	// Sets priority for 1 or more shared files
-	void SetSharedPriority(CMD4Hash* file,
-			       uint8 priority);
+	void SetSharedPriority(CMD4Hash *file, uint8 priority);
 
 	// Reloads shared file list
 	void ReloadSharedFiles();
@@ -268,9 +473,7 @@
 	void AddDirectoryToSharedFiles(wxString dir);
 
 	// Renames a file
-	void RenameFile(CMD4Hash file,
-			wxString name);
-
+	void RenameFile(CMD4Hash file, wxString name);
 
 	/* Logging */
 
@@ -301,7 +504,6 @@
 	// Clears server info log
 	void ClearServerInfo();
 
-
 	/* Preferences */
 
 	// Request for Preferences
@@ -309,94 +511,93 @@
 
 	// Setting the preferences
 	void SetPreferencesCategories();
-	void SetPreferencesGeneral(wxString userNick,
-				   CMD4Hash userHash);
+	void SetPreferencesGeneral(wxString userNick, CMD4Hash userHash);
 	void SetPreferencesConnections(uint32 LineDownloadCapacity,
-				       uint32 LineUploadCapacity,
-				       uint32 MaxDownloadSpeed,
-				       uint32 MaxUploadSpeed,
-				       uint32 UploadSlotAllocation,
-				       uint16 TCPPort,
-				       uint16 UDPPort,
-				       bool DisableUDP,
-				       uint16 MaxSourcesPerFile,
-				       uint16 MaxConnections,
-				       bool EnableAutoConnect,
-				       bool EnableReconnect,
-				       bool EnableNetworkED2K,
-				       bool EnableNetworkKademlia);
+		uint32 LineUploadCapacity,
+		uint32 MaxDownloadSpeed,
+		uint32 MaxUploadSpeed,
+		uint32 UploadSlotAllocation,
+		uint16 TCPPort,
+		uint16 UDPPort,
+		bool DisableUDP,
+		uint16 MaxSourcesPerFile,
+		uint16 MaxConnections,
+		bool EnableAutoConnect,
+		bool EnableReconnect,
+		bool EnableNetworkED2K,
+		bool EnableNetworkKademlia);
 	void SetPreferencesMessageFilter(bool Enabled,
-					 bool FilterAll,
-					 bool AllowFromFriends,
-					 bool FilterFromUnknownClients,
-					 bool FilterByKeyword,
-					 wxString Keywords);
+		bool FilterAll,
+		bool AllowFromFriends,
+		bool FilterFromUnknownClients,
+		bool FilterByKeyword,
+		wxString Keywords);
 	void SetPreferencesRemoteCrtl(bool RunOnStartup,
-				      uint16 Port,
-				      bool Guest,
-				      CMD4Hash GuestPasswdHash,
-				      bool UseGzip,
-				      uint32 RefreshInterval,
-				      wxString Template);
+		uint16 Port,
+		bool Guest,
+		CMD4Hash GuestPasswdHash,
+		bool UseGzip,
+		uint32 RefreshInterval,
+		wxString Template);
 	void SetPreferencesOnlineSig(bool Enabled);
 	void SetPreferencesServers(bool RemoveDeadServers,
-				   uint16 RetriesDeadServers,
-				   bool AutoUpdate,
-				   // bool URLList, TODO: Implement this!
-				   bool AddFromServer,
-				   bool AddFromClient,
-				   bool UsePrioritySystem,
-				   bool SmartLowIDCheck,
-				   bool SafeServerConnection,
-				   bool AutoConnectStaticOnly,
-				   bool ManualHighPriority);
+		uint16 RetriesDeadServers,
+		bool AutoUpdate,
+		// bool URLList, TODO: Implement this!
+		bool AddFromServer,
+		bool AddFromClient,
+		bool UsePrioritySystem,
+		bool SmartLowIDCheck,
+		bool SafeServerConnection,
+		bool AutoConnectStaticOnly,
+		bool ManualHighPriority);
 	void SetPreferencesFiles(bool ICHEnabled,
-				 bool AIHCTrust,
-				 bool NewPaused,
-				 bool NewDownloadAutoPriority,
-				 bool PreviewPriority,
-				 bool NewAutoULPriotiry,
-				 bool UploadFullChunks,
-				 bool StartNextPaused,
-				 bool ResumeSameCategory,
-				 bool SaveSources,
-				 bool ExtractMetadata,
-				 bool AllocateFullChunks,
-				 bool AllocateFullSize,
-				 bool CheckFreeSpace,
-				 uint32 MinFreeSpace);
+		bool AIHCTrust,
+		bool NewPaused,
+		bool NewDownloadAutoPriority,
+		bool PreviewPriority,
+		bool NewAutoULPriotiry,
+		bool UploadFullChunks,
+		bool StartNextPaused,
+		bool ResumeSameCategory,
+		bool SaveSources,
+		bool ExtractMetadata,
+		bool AllocateFullChunks,
+		bool AllocateFullSize,
+		bool CheckFreeSpace,
+		uint32 MinFreeSpace);
 	void SetPreferencesDirectories();
 	void SetPreferencesStatistics();
 	void SetPreferencesSecurity(uint8 CanSeeShares,
-				    uint32 FilePermissions,
-				    uint32 DirPermissions,
-				    bool IPFilterEnabled,
-				    bool IPFilterAutoUpdate,
-				    wxString IPFilterUpdateURL,
-				    uint8 IPFilterLevel,
-				    bool IPFilterFilterLAN,
-				    bool UseSecIdent);
+		uint32 FilePermissions,
+		uint32 DirPermissions,
+		bool IPFilterEnabled,
+		bool IPFilterAutoUpdate,
+		wxString IPFilterUpdateURL,
+		uint8 IPFilterLevel,
+		bool IPFilterFilterLAN,
+		bool UseSecIdent);
 	void SetPreferencesCoreTweaks(uint16 MaxConnectionsPerFive,
-				      bool Verbose,
-				      uint32 FileBuffer,
-				      uint32 ULQueue,
-				      uint32 SRVKeepAliveTimeout);
+		bool Verbose,
+		uint32 FileBuffer,
+		uint32 ULQueue,
+		uint32 SRVKeepAliveTimeout);
 
 	// Creates new category
 	void CreateCategory(uint32 category,
-			    wxString title,
-			    wxString folder,
-			    wxString comment,
-			    uint32 color,
-			    uint8 priority);
+		wxString title,
+		wxString folder,
+		wxString comment,
+		uint32 color,
+		uint8 priority);
 
 	// Updates existing category
 	void UpdateCategory(uint32 category,
-			    wxString title,
-			    wxString folder,
-			    wxString comment,
-			    uint32 color,
-			    uint8 priority);
+		wxString title,
+		wxString folder,
+		wxString comment,
+		uint32 color,
+		uint8 priority);
 
 	// Deletes existing category
 	void DeleteCategory(uint32 category);
@@ -413,19 +614,34 @@
 private:
 	virtual const CECPacket *OnPacketReceived(const CECPacket *packet, uint32 trueSize);
 	bool ProcessAuthPacket(const CECPacket *reply);
+
+	/**
+	 * Hand the outcome of a login attempt to the GUI, carrying whatever
+	 * m_server_reply currently explains.
+	 *
+	 * Every path that ends a login attempt must call this. Plain CloseSocket()
+	 * does not dispatch OnLost (see CloseAndDispatchLost in ECSocket.h) precisely
+	 * because ProcessAuthPacket is expected to notify for itself, so a path that
+	 * closes and returns without calling this leaves amulegui waiting on its
+	 * connect-timeout watchdog instead of showing the reason.
+	 */
+	void NotifyConnectionResult(bool connected);
 };
 
 wxDECLARE_EVENT(wxEVT_EC_CONNECTION, wxEvent);
-class wxECSocketEvent : public wxEvent {
+class wxECSocketEvent : public wxEvent
+{
 public:
-	wxECSocketEvent(int id, bool result, const wxString& reply) : wxEvent(-1, id)
+	wxECSocketEvent(int id, bool result, const wxString &reply)
+	: wxEvent(-1, id)
 	{
 		m_value = result;
 		m_server_reply = reply;
 	}
-	wxEvent *Clone(void) const		{ return new wxECSocketEvent(*this); }
-	bool GetResult() const			{ return m_value; }
-	const wxString& GetServerReply() const	{ return m_server_reply; }
+	wxEvent *Clone(void) const { return new wxECSocketEvent(*this); }
+	bool GetResult() const { return m_value; }
+	const wxString &GetServerReply() const { return m_server_reply; }
+
 private:
 	bool m_value;
 	wxString m_server_reply;

amule-3.1.0.tar.gz/src/libwebcommon Added

amule-3.1.0.tar.gz/src/libwebcommon/AtomicFile.cpp Added

@@ -0,0 +1,98 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "AtomicFile.h"
+
+#include <cstdio>
+
+#ifndef _WIN32
+#include <cerrno>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#else
+#include <fstream>
+#endif
+
+namespace webcommon
+{
+
+bool WriteFileAtomic0600(const std::string &path, const std::string &body)
+{
+#ifndef _WIN32
+	const std::string tmp = path + ".tmp";
+
+	const int fd = ::open(tmp.c_str(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+	if (fd < 0) {
+		return false;
+	}
+	::fchmod(fd, S_IRUSR | S_IWUSR); // belt+braces against odd umasks
+
+	std::size_t written = 0;
+	while (written < body.size()) {
+		const ssize_t n = ::write(fd, body.data() + written, body.size() - written);
+		if (n < 0) {
+			if (errno == EINTR) {
+				continue;
+			}
+			::close(fd);
+			::unlink(tmp.c_str());
+			return false;
+		}
+		written += static_cast<std::size_t>(n);
+	}
+	if (::fsync(fd) != 0) {
+		::close(fd);
+		::unlink(tmp.c_str());
+		return false;
+	}
+	if (::close(fd) != 0) {
+		::unlink(tmp.c_str());
+		return false;
+	}
+	if (::rename(tmp.c_str(), path.c_str()) != 0) {
+		::unlink(tmp.c_str());
+		return false;
+	}
+	return true;
+#else
+	// Windows: no permission story to enforce, so this is a plain truncating write. Atomic-ish
+	// only in the sense that a failed write is reported; the header warns callers holding a
+	// secret that confidentiality is not provided here.
+	std::ofstream f(path.c_str(), std::ios::binary | std::ios::trunc);
+	if (!f.is_open()) {
+		return false;
+	}
+	if (!body.empty()) {
+		f.write(body.data(), static_cast<std::streamsize>(body.size()));
+	}
+	f.flush();
+	const bool ok = f.good();
+	f.close();
+	return ok;
+#endif
+}
+
+} // namespace webcommon

amule-3.1.0.tar.gz/src/libwebcommon/AtomicFile.h Added

@@ -0,0 +1,53 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef LIBWEBCOMMON_ATOMICFILE_H
+#define LIBWEBCOMMON_ATOMICFILE_H
+
+#include <string>
+
+namespace webcommon
+{
+
+// Writes `body` to `path` owner-only, without ever exposing a partial or world-readable version of
+// it.
+//
+// POSIX: create a sibling temp with mode 0600, write it in full, fsync, then rename(2) onto the
+// target. The file is never observable half-written, and never exists with looser permissions than
+// the ones it is created with -- creating at 0600 rather than chmod-ing afterwards closes the
+// window where another user could open it. fchmod is applied anyway, as belt and braces against an
+// odd umask.
+//
+// Windows: best effort. There is no equivalent permission story -- see RestrictToOwner() in
+// FileFunctions.cpp, a no-op on Windows for the same reason -- so callers holding a secret must not
+// rely on this for confidentiality there.
+//
+// Returns false on any failure, leaving the previous contents of `path` intact. Reports nothing:
+// this lives below the logger, as the mulecommon file helpers do, so the caller decides what to
+// say.
+bool WriteFileAtomic0600(const std::string &path, const std::string &body);
+
+} // namespace webcommon
+
+#endif // LIBWEBCOMMON_ATOMICFILE_H

amule-3.1.0.tar.gz/src/libwebcommon/CMakeLists.txt Added

@@ -0,0 +1,67 @@
+# libwebcommon — pure-logic primitives for the amuleapi REST surface.
+#
+# Linked into the amuleapi binary and the libwebcommon unit-test
+# target. NOT linked into amuleweb: amuleweb's behaviour on 3.0.x is
+# bit-identical to 3.0.0 and is built from the same translation units
+# it always was. If a downstream consumer (e.g. a hypothetical
+# integration test or a third-party amule front-end) wants the same
+# JWT / ETag / route-pattern primitives, link against this lib too.
+
+add_library (webcommon STATIC
+	# Owner-only atomic file write, shared by the credential store, the
+	# amuleapi config writer and the EC token amuled hands its child.
+	AtomicFile.cpp
+	ConstantTime.cpp
+	# Credentials.cpp is also linked into the aMule core: amuled applies a
+	# password pushed from amulegui over EC, and monolithic amule applies
+	# one set in its own preferences dialog. Keeping the hashing and the
+	# amuleapi-passwords format here means the three processes cannot
+	# drift apart on it.
+	Credentials.cpp
+	Etag.cpp
+	HeaderParse.cpp
+	JsonWriter.cpp
+	Jwt.cpp
+	PathPatterns.cpp
+)
+
+add_library (picojson_header INTERFACE)
+
+if (USE_SYSTEM_PICOJSON)
+	find_path (PICOJSON_INCLUDE_DIR picojson.h)
+	if (NOT EXISTS "${PICOJSON_INCLUDE_DIR}/picojson.h")
+		message (FATAL_ERROR
+			"USE_SYSTEM_PICOJSON is ON, but picojson.h was not found")
+	endif()
+
+	message (STATUS "Using system picojson: ${PICOJSON_INCLUDE_DIR}/picojson.h")
+	target_include_directories (picojson_header INTERFACE
+		${PICOJSON_INCLUDE_DIR}
+	)
+	# webcommon's public headers expose this source directory to consumers,
+	# which also makes the bundled picojson.h visible. Select the discovered
+	# header by its full path so an implicit system directory such as
+	# /usr/include cannot lose to that transitive include path.
+	target_compile_definitions (picojson_header INTERFACE
+		AMULE_PICOJSON_HEADER="${PICOJSON_INCLUDE_DIR}/picojson.h"
+	)
+else()
+	target_compile_definitions (picojson_header INTERFACE
+		AMULE_PICOJSON_HEADER="${CMAKE_CURRENT_SOURCE_DIR}/picojson.h"
+	)
+endif()
+
+target_include_directories (webcommon
+	PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+# wxWidgets::BASE for wxString (used by JsonWriter + ConstantTime).
+# No GUI dependency — these are wxBase-only types. CRYPTOPP::CRYPTOPP
+# carries its own INTERFACE_INCLUDE_DIRECTORIES so consumers get
+# <cryptopp/sha.h> / <cryptopp/hmac.h> visible without further
+# include-path wiring.
+target_link_libraries (webcommon
+	PUBLIC wxWidgets::BASE
+	PUBLIC CRYPTOPP::CRYPTOPP
+	PRIVATE picojson_header
+)

amule-3.1.0.tar.gz/src/libwebcommon/ConstantTime.cpp Added

@@ -0,0 +1,48 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "ConstantTime.h"
+
+namespace webcommon
+{
+
+bool ConstantTimeEquals(const std::string &a, const std::string &b)
+{
+	if (a.size() != b.size())
+		return false;
+	unsigned char acc = 0;
+	for (size_t i = 0; i < a.size(); ++i) {
+		acc |= static_cast<unsigned char>(ai ^ bi);
+	}
+	return acc == 0;
+}
+
+bool ConstantTimeEquals(const wxString &a, const wxString &b)
+{
+	const wxScopedCharBuffer au = a.utf8_str();
+	const wxScopedCharBuffer bu = b.utf8_str();
+	return ConstantTimeEquals(std::string(au.data(), au.length()), std::string(bu.data(), bu.length()));
+}
+
+} // namespace webcommon

amule-3.1.0.tar.gz/src/libwebcommon/ConstantTime.h Added

@@ -0,0 +1,50 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef LIBWEBCOMMON_CONSTANTTIME_H
+#define LIBWEBCOMMON_CONSTANTTIME_H
+
+#include <string>
+
+#include <wx/string.h>
+
+// XOR-accumulator constant-time equality. Returns false immediately on length mismatch (length is
+// not the secret); for equal-length inputs the timing is data-independent.
+//
+// **PRECONDITION on the `wxString` overload.** wxString is a UTF-16 or UTF-32 sequence depending on
+// the build, and the comparator checks sequence length first, not byte length. Inputs that round-
+// trip through different UTF-8 encodings and share an underlying string but differ in codepoint
+// count short-circuit as unequal. Callers today compare fixed-shape inputs (32-char hex MD5,
+// 43-char base64url HMAC) so the precondition holds. Length-variable callers MUST pad to a common
+// bound first, or accept a length side-channel leak.
+
+namespace webcommon
+{
+
+bool ConstantTimeEquals(const std::string &a, const std::string &b);
+bool ConstantTimeEquals(const wxString &a, const wxString &b);
+
+} // namespace webcommon
+
+#endif // LIBWEBCOMMON_CONSTANTTIME_H

amule-3.1.0.tar.gz/src/libwebcommon/Credentials.cpp Added

@@ -0,0 +1,469 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "Credentials.h"
+
+#include "AtomicFile.h"
+#include "ConstantTime.h"
+
+#include "../WarningsPush_CryptoPP.h"
+#include <cryptopp/osrng.h>
+#include <cryptopp/pwdbased.h>
+#include <cryptopp/sha.h>
+#include "../WarningsPop.h"
+
+#include <cctype>
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <sstream>
+#include <vector>
+
+#ifndef _WIN32
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
+namespace webcommon
+{
+
+namespace
+{
+
+const char *const kPrefix = "pbkdf2-sha256$";
+const std::size_t kSaltBytes = 16;
+const std::size_t kHashBytes = 32;
+
+// Iteration count for new records. Sized for a credential check that
+// happens at login rather than per request.
+const unsigned kPbkdf2Iterations = 210000;
+
+std::string ToHex(const unsigned char *data, std::size_t len)
+{
+	static const char *digits = "0123456789abcdef";
+	std::string out;
+	out.reserve(len * 2);
+	for (std::size_t i = 0; i < len; ++i) {
+		out.push_back(digits(datai >> 4) & 0x0F);
+		out.push_back(digitsdatai & 0x0F);
+	}
+	return out;
+}
+
+bool FromHex(const std::string &hex, std::vector<unsigned char> &out)
+{
+	if (hex.size() % 2 != 0) {
+		return false;
+	}
+	out.clear();
+	out.reserve(hex.size() / 2);
+	for (std::size_t i = 0; i < hex.size(); i += 2) {
+		int hi = -1, lo = -1;
+		for (int k = 0; k < 2; ++k) {
+			const char c = hexi + k;
+			int v;
+			if (c >= '0' && c <= '9') {
+				v = c - '0';
+			} else if (c >= 'a' && c <= 'f') {
+				v = c - 'a' + 10;
+			} else if (c >= 'A' && c <= 'F') {
+				v = c - 'A' + 10;
+			} else {
+				return false;
+			}
+			(k == 0 ? hi : lo) = v;
+		}
+		out.push_back(static_cast<unsigned char>((hi << 4) | lo));
+	}
+	return true;
+}
+
+bool IsMd5Hex(const std::string &s)
+{
+	if (s.size() != 32) {
+		return false;
+	}
+	for (const char c : s) {
+		if (!std::isxdigit(static_cast<unsigned char>(c))) {
+			return false;
+		}
+	}
+	return true;
+}
+
+// Lowercase a copy; stored digests are compared case-insensitively because aMule's preferences
+// dialog and the EC path have historically disagreed about case.
+std::string ToLower(const std::string &s)
+{
+	std::string out(s);
+	for (char &c : out) {
+		c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
+	}
+	return out;
+}
+
+std::string Derive(const std::string &md5_hex, const std::vector<unsigned char> &salt, unsigned iterations)
+{
+	unsigned char derivedkHashBytes;
+	CryptoPP::PKCS5_PBKDF2_HMAC<CryptoPP::SHA256> kdf;
+	const std::string lowered = ToLower(md5_hex);
+	kdf.DeriveKey(derived,
+		sizeof(derived),
+		0x00,
+		reinterpret_cast<const CryptoPP::byte *>(lowered.data()),
+		lowered.size(),
+		salt.empty() ? nullptr : &salt0,
+		salt.size(),
+		iterations);
+	return ToHex(derived, sizeof(derived));
+}
+
+// Splits "pbkdf2-sha256$<iters>$<salt>$<hash>". Returns false on any
+// malformed record; a malformed record must never verify.
+bool ParsePhc(const std::string &stored,
+	unsigned &iterations,
+	std::vector<unsigned char> &salt,
+	std::string &hash_hex)
+{
+	if (stored.compare(0, std::strlen(kPrefix), kPrefix) != 0) {
+		return false;
+	}
+	const std::string rest = stored.substr(std::strlen(kPrefix));
+	const std::size_t d1 = rest.find('$');
+	if (d1 == std::string::npos) {
+		return false;
+	}
+	const std::size_t d2 = rest.find('$', d1 + 1);
+	if (d2 == std::string::npos) {
+		return false;
+	}
+
+	const std::string iter_s = rest.substr(0, d1);
+	if (iter_s.empty() || iter_s.find_first_not_of("0123456789") != std::string::npos) {
+		return false;
+	}
+	unsigned long parsed = 0;
+	std::istringstream(iter_s) >> parsed;
+	if (parsed == 0) {
+		return false;
+	}
+	iterations = static_cast<unsigned>(parsed);
+
+	if (!FromHex(rest.substr(d1 + 1, d2 - d1 - 1), salt) || salt.empty()) {
+		return false;
+	}
+	hash_hex = rest.substr(d2 + 1);
+	return hash_hex.size() == kHashBytes * 2;
+}
+
+std::string TrimAscii(const std::string &s)
+{
+	std::size_t b = 0;
+	std::size_t e = s.size();
+	while (b < e && (sb == ' ' || sb == '\t' || sb == '\r' || sb == '\n')) {
+		++b;
+	}
+	while (e > b && (se - 1 == ' ' || se - 1 == '\t' || se - 1 == '\r' || se - 1 == '\n')) {
+		--e;
+	}
+	return s.substr(b, e - b);
+}
+
+// True when `record` is something Verify could ever accept: a PHC record in a form this build
+// understands, or a legacy bare MD5. An empty string is NOT valid -- that is the separate "role
+// unset" state.
+bool IsValidRecord(const std::string &record)
+{
+	if (record.empty()) {
+		return false;
+	}
+	if (IsMd5Hex(record)) {
+		return true; // legacy: the record is the unsalted digest itself
+	}
+	unsigned iterations = 0;
+	std::vector<unsigned char> salt;
+	std::string hash_hex;
+	return ParsePhc(record, iterations, salt, hash_hex);
+}
+
+} // namespace
+
+bool IsLegacyMd5Record(const std::string &stored)
+{
+	return IsMd5Hex(stored);
+}
+
+std::string HashMd5Hex(const std::string &md5_hex)
+{
+	if (!IsMd5Hex(md5_hex)) {
+		return std::string();
+	}
+
+	std::vector<unsigned char> salt(kSaltBytes);
+	CryptoPP::AutoSeededRandomPool rng;
+	rng.GenerateBlock(&salt0, salt.size());
+
+	std::ostringstream out;
+	out << kPrefix << kPbkdf2Iterations << '$' << ToHex(&salt0, salt.size()) << '$'
+	    << Derive(md5_hex, salt, kPbkdf2Iterations);
+	return out.str();
+}
+
+bool VerifyMd5Hex(const std::string &md5_hex, const std::string &stored, bool *needs_rehash)
+{
+	if (needs_rehash != nullptr) {
+		*needs_rehash = false;
+	}
+	if (stored.empty() || !IsMd5Hex(md5_hex)) {
+		return false;
+	}
+
+	// Legacy: the record is the unsalted MD5 itself. Still accepted so a developer config from
+	// before the KDF keeps working, and flagged so the caller rewrites it after a successful
+	// login.
+	if (IsLegacyMd5Record(stored)) {
+		if (!ConstantTimeEquals(ToLower(md5_hex), ToLower(stored))) {
+			return false;
+		}
+		if (needs_rehash != nullptr) {
+			*needs_rehash = true;
+		}
+		return true;
+	}
+
+	unsigned iterations = 0;
+	std::vector<unsigned char> salt;
+	std::string hash_hex;
+	if (!ParsePhc(stored, iterations, salt, hash_hex)) {
+		return false;
+	}
+	if (!ConstantTimeEquals(Derive(md5_hex, salt, iterations), ToLower(hash_hex))) {
+		return false;
+	}
+	// A record written with fewer rounds than we now use still verifies,
+	// but wants rewriting at the current cost.
+	if (needs_rehash != nullptr && iterations != kPbkdf2Iterations) {
+		*needs_rehash = true;
+	}
+	return true;
+}
+
+bool MakeRecord(const std::string &md5_hex, std::string &record)
+{
+	if (md5_hex.empty()) {
+		record.clear();
+		return true;
+	}
+	const std::string hashed = HashMd5Hex(md5_hex);
+	if (hashed.empty()) {
+		return false;
+	}
+	record = hashed;
+	return true;
+}
+
+namespace
+{
+
+// Join a config dir and a well-known leaf name. Shared by every file this
+// module names so the separator handling cannot drift between them.
+std::string JoinConfigDir(const std::string &config_dir, const char *leaf)
+{
+	if (config_dir.empty()) {
+		return std::string(leaf);
+	}
+	const char sep = config_dirconfig_dir.size() - 1;
+#ifdef _WIN32
+	const bool has_sep = (sep == '/' || sep == '\\');
+#else
+	const bool has_sep = (sep == '/');
+#endif
+	return config_dir + (has_sep ? "" : "/") + leaf;
+}
+
+} // namespace
+
+std::string CredentialsFilePath(const std::string &config_dir)
+{
+	return JoinConfigDir(config_dir, "amuleapi-passwords");
+}
+
+std::string EcTokenFilePath(const std::string &config_dir)
+{
+	return JoinConfigDir(config_dir, "amuleapi-ec-token");
+}
+
+bool ReadAndConsumeEcToken(const std::string &path, std::string &out)
+{
+	std::ifstream f(path.c_str(), std::ios::binary);
+	if (!f.is_open()) {
+		return false;
+	}
+	std::ostringstream buf;
+	buf << f.rdbuf();
+	f.close();
+
+	// Unlink regardless of what we just read: a file that failed to parse is still not
+	// something to leave lying around, and the caller has no later moment at which removing it
+	// would be safer.
+	::remove(path.c_str());
+
+	const std::string token = TrimAscii(buf.str());
+	if (!IsMd5Hex(token)) {
+		// Same 32-hex-char shape as an MD5 digest -- see GenerateEcToken for why that
+		// width. Reject anything else rather than attempt a connection with a truncated or
+		// tampered value.
+		return false;
+	}
+	out = ToLower(token);
+	return true;
+}
+
+std::string GenerateEcToken()
+{
+	// 16 bytes -> 32 hex chars, the exact width EC's challenge-response
+	// already consumes as an MD5 hex digest.
+	unsigned char raw16;
+	CryptoPP::AutoSeededRandomPool rng;
+	rng.GenerateBlock(raw, sizeof(raw));
+	return ToHex(raw, sizeof(raw));
+}
+
+bool LoadCredentialsFile(const std::string &config_dir, Credentials &out, std::string &error)
+{
+	out = Credentials();
+	error.clear();
+
+	const std::string path = CredentialsFilePath(config_dir);
+	std::ifstream in(path.c_str(), std::ios::in | std::ios::binary);
+	if (!in.is_open()) {
+		// Absent is the first-run state, not a failure: amuleapi binds to
+		// loopback with no credentials until one is claimed.
+		return true;
+	}
+
+	std::string line;
+	while (std::getline(in, line)) {
+		const std::string trimmed = TrimAscii(line);
+		if (trimmed.empty() || trimmed0 == '#') {
+			continue;
+		}
+		const std::size_t eq = trimmed.find('=');
+		if (eq == std::string::npos) {
+			continue;
+		}
+		const std::string key = TrimAscii(trimmed.substr(0, eq));
+		const std::string value = TrimAscii(trimmed.substr(eq + 1));
+		if (key != "admin" && key != "guest") {
+			error = "unknown key '" + key + "'";
+			out = Credentials();
+			return false;
+		}
+		if (value.empty()) {
+			continue; // role explicitly disabled
+		}
+		if (!IsValidRecord(value)) {
+			error = "value for '" + key + "' is not a valid credential record";
+			out = Credentials();
+			return false;
+		}
+		if (key == "admin") {
+			out.admin = value;
+		} else {
+			out.guest = value;
+		}
+	}
+	return true;
+}
+
+bool SaveCredentialsFile(const std::string &config_dir, const Credentials &in, std::string &error)
+{
+	error.clear();
+	const std::string path = CredentialsFilePath(config_dir);
+
+	std::ostringstream body;
+	body << "# amuleapi credentials. Managed by amuleapi, amuled and aMule;\n"
+	     << "# hand edits are honoured but will be rewritten on the next change.\n"
+	     << "admin=" << in.admin << "\n"
+	     << "guest=" << in.guest << "\n";
+	const std::string text = body.str();
+
+	// Crash-safe and owner-only; see WriteFileAtomic0600. This file holds the only credentials
+	// the daemon has, so a partial write or a crash mid-write must leave the previous contents
+	// intact.
+	if (!WriteFileAtomic0600(path, text)) {
+		error = "could not write " + path;
+		return false;
+	}
+	return true;
+}
+
+bool UpdateCredentialFile(
+	const std::string &config_dir, CredentialRole role, const std::string &record, std::string &error)
+{
+	Credentials creds;
+	if (!LoadCredentialsFile(config_dir, creds, error)) {
+		return false;
+	}
+	if (role == kAdminCredential) {
+		creds.admin = record;
+	} else {
+		creds.guest = record;
+	}
+	return SaveCredentialsFile(config_dir, creds, error);
+}
+
+bool ApplyCredentialChange(const std::string &config_dir, const CredentialChange &change, std::string &error)
+{
+	Credentials current;
+	if (!LoadCredentialsFile(config_dir, current, error)) {
+		return false;
+	}
+	Credentials next = current;
+
+	if (!change.admin_md5.empty() && !MakeRecord(change.admin_md5, next.admin)) {
+		error = "admin password is not a valid MD5 digest";
+		return false;
+	}
+
+	if (!change.guest_enabled) {
+		next.guest.clear();
+	} else if (!change.guest_md5.empty() && !MakeRecord(change.guest_md5, next.guest)) {
+		error = "guest password is not a valid MD5 digest";
+		return false;
+	}
+
+	// Write only when something actually changed. Not just an optimisation: the file's
+	// modification time is what tells amuleapi a password was rotated, and rotation ends every
+	// session opened before it. A no-op rewrite would therefore sign everyone out -- and aMule
+	// calls this after *every* preferences change, most of which have nothing to do with
+	// credentials.
+	if (next.admin == current.admin && next.guest == current.guest) {
+		return true;
+	}
+	return SaveCredentialsFile(config_dir, next, error);
+}
+
+} // namespace webcommon

amule-3.1.0.tar.gz/src/libwebcommon/Credentials.h Added

@@ -0,0 +1,179 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 WEBCOMMON_CREDENTIALS_H
+#define WEBCOMMON_CREDENTIALS_H
+
+#include <string>
+
+namespace webcommon
+{
+
+// amuleapi's admin/guest credentials: how they are hashed and how the amuleapi-passwords file is
+// read and written.
+//
+// This lives in webcommon rather than in amuleapi because three processes need to agree on the
+// format: amuleapi itself, amuled (applying a change pushed from amulegui over EC), and monolithic
+// amule (applying a change made in its own preferences dialog). Exactly one implementation of the
+// format, so the three can never drift apart.
+//
+// What is stored: a PHC-style string, self-describing so the parameters can change later without
+// another format break:
+//
+//     pbkdf2-sha256$<iterations>$<salt-hex>$<hash-hex>
+//
+// The input to the KDF is the *MD5 hex* of the password, not the password itself. That is
+// deliberate: aMule's preferences dialog hashes with MD5 before the value goes over EC, and EC
+// sessions are not encrypted, so asking for the plaintext would put a new secret on the wire to
+// gain nothing. Pre-hashing client-side leaves the wire exactly as it is today while the stored
+// form stops being an unsalted digest that a rainbow table resolves instantly.
+//
+// Legacy: early builds stored a bare 32-character MD5 hex digest. amuleapi has not shipped, so
+// there is no installed base, but developer configs exist -- those lines still verify, and
+// Verify() reports that the record wants rewriting so the caller can transparently upgrade it.
+
+// Hashes an MD5 hex digest into a new PHC-style record with a fresh
+// random salt. Returns an empty string if `md5_hex` is not 32 hex chars.
+std::string HashMd5Hex(const std::string &md5_hex);
+
+// Constant-time verification of `md5_hex` against a stored record, in either the PHC or the legacy
+// bare-MD5 form. `needs_rehash` (optional) is set when the record verified but is not in the
+// current format, so the caller can rewrite it after a successful login.
+bool VerifyMd5Hex(const std::string &md5_hex, const std::string &stored, bool *needs_rehash = nullptr);
+
+// True when `stored` is a bare 32-char MD5 hex digest rather than a PHC
+// record. Exposed for tests and for the upgrade path.
+bool IsLegacyMd5Record(const std::string &stored);
+
+// The two credentials as they live in amuleapi-passwords. An empty string means "not set": for
+// `guest` that disables the guest role, and for `admin` it is the unclaimed first-run state.
+struct Credentials
+{
+	std::string admin;
+	std::string guest;
+};
+
+// Reads and writes `<config_dir>/amuleapi-passwords`. Write is crash-safe (temp file, fsync,
+// rename) and leaves the file mode at 0600, so a partial write can never destroy the only
+// credentials the daemon has. Both return false and set `error` on failure. Load() treats a missing
+// file as an empty set rather than an error, which is the first-run state, but fails on an unknown
+// key or on a record that could never verify. That is deliberately loud: a record which silently
+// never verifies is indistinguishable from a wrong password, and leaves the operator with nothing
+// to debug.
+bool LoadCredentialsFile(const std::string &config_dir, Credentials &out, std::string &error);
+bool SaveCredentialsFile(const std::string &config_dir, const Credentials &in, std::string &error);
+
+// Which of the two credentials a call operates on.
+enum CredentialRole
+{
+	kAdminCredential,
+	kGuestCredential
+};
+
+// Sets one role and leaves the other alone. The file is re-read immediately before the write, so a
+// change another process made to the *other* role since this one loaded is preserved rather than
+// reverted -- the amuleapi CLI, the REST endpoint and the EC apply path all change exactly one role
+// at a time, and all three go through here. An empty `record` clears the role, which is how the
+// guest role is disabled.
+bool UpdateCredentialFile(
+	const std::string &config_dir, CredentialRole role, const std::string &record, std::string &error);
+
+// A requested change, in the form every entry point expresses one: aMule's preferences dialog,
+// amulegui's the same dialog over EC, the amuleapi CLI and the amuleapi REST endpoint. They differ
+// only in how the request arrives, so the rules for interpreting it live here once.
+struct CredentialChange
+{
+	// MD5 hex of the new admin password, or empty to leave the stored one alone. There is
+	// deliberately no way to clear it: a client that simply forgot to include the field would
+	// otherwise lock a non-loopback deployment out of its own API.
+	std::string admin_md5;
+
+	// False clears the guest credential -- that IS how guest access is
+	// turned off, since guest is enabled exactly when a record exists.
+	bool guest_enabled = false;
+
+	// MD5 hex of the new guest password. Empty with `guest_enabled` set leaves the stored guest
+	// password alone, so a client changing an unrelated setting need not resend a password it
+	// can never read.
+	std::string guest_md5;
+};
+
+// Applies `change` to `<config_dir>/amuleapi-passwords`, reading the current records first so a
+// role the change does not mention keeps whatever is stored.
+//
+// Writes nothing when the result matches what is already there. Callers invoke this on every
+// preferences save, credential-related or not, and the file's modification time is load-bearing: it
+// is what marks a rotation, and a rotation ends every session older than it.
+bool ApplyCredentialChange(const std::string &config_dir, const CredentialChange &change, std::string &error);
+
+// Turns a requested password into the record to store: hashes `md5_hex`, or yields an empty record
+// for an empty input, which clears the role. Returns false, leaving `record` untouched, if the
+// input is neither empty nor a 32-char MD5 hex digest, so a half-pasted line can never be stored as
+// a password.
+bool MakeRecord(const std::string &md5_hex, std::string &record);
+
+// The full path Load/Save operate on. Exposed so the tests can assert the
+// path-joining rules without duplicating them.
+std::string CredentialsFilePath(const std::string &config_dir);
+
+// The short-lived EC token amuled hands to the amuleapi it spawns.
+//
+// Defined here, and only here, because both ends have to agree on it with nothing carrying the
+// location between them: amuled writes it, and the amuleapi it spawns looks for it in the same
+// config dir it was handed. A second literal in the other binary would be a silent failure waiting
+// to happen -- the child would simply find nothing and fall back to its configured password, with
+// the daemon none the wiser.
+//
+// Deliberately not passed on the command line: argv is world-readable via ps, so a path there would
+// tell every local user exactly where to look during the window the file exists.
+std::string EcTokenFilePath(const std::string &config_dir);
+
+// A fresh EC token: 16 random bytes as 32 lowercase hex characters.
+//
+// The width is not arbitrary. EC's challenge-response hashes the stored credential as a 32-char MD5
+// hex digest, so a token of exactly that shape drops into the existing exchange with no protocol
+// change -- the daemon simply knows a second secret. 128 bits is also well beyond guessing for
+// something that lives for one daemon run.
+//
+// Drawn from a CSPRNG (the same one that salts credential records), not from the general-purpose
+// RNG the rest of the app uses for jitter and IDs.
+std::string GenerateEcToken();
+
+// Reads the token at `path` into `out` and removes the file.
+//
+// The file is unlinked whether or not it parsed, because a file that is not a valid token is still
+// something we do not want left behind, and because the caller has no better moment to do it: a
+// retry re-uses the value already in memory.
+//
+// Returns true only for exactly 32 lowercase-able hex characters, ignoring surrounding whitespace.
+// Anything else -- truncated, empty, padded with junk -- is rejected rather than passed on, so a
+// half-written or tampered file cannot become the credential a connection is attempted with.
+//
+// Returns false, leaving `out` untouched, when the file does not exist, which is the ordinary case
+// for a manually started amuleapi.
+bool ReadAndConsumeEcToken(const std::string &path, std::string &out);
+
+} // namespace webcommon
+
+#endif // WEBCOMMON_CREDENTIALS_H

amule-3.1.0.tar.gz/src/libwebcommon/Etag.cpp Added

@@ -0,0 +1,118 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "Etag.h"
+
+#include <cstring>
+
+#include "../WarningsPush_CryptoPP.h"
+#include <cryptopp/sha.h>
+#include "../WarningsPop.h"
+
+namespace webcommon
+{
+
+std::string Etag(const std::string &body_utf8)
+{
+	CryptoPP::SHA256 sha;
+	unsigned char digestCryptoPP::SHA256::DIGESTSIZE;
+	sha.CalculateDigest(
+		digest, reinterpret_cast<const unsigned char *>(body_utf8.data()), body_utf8.size());
+	static const char hex = "0123456789abcdef";
+	std::string out;
+	out.reserve(16);
+	for (int i = 0; i < 8; ++i) {
+		out.push_back(hex(digesti >> 4) & 0x0F);
+		out.push_back(hexdigesti & 0x0F);
+	}
+	return out;
+}
+
+// Strip leading/trailing whitespace, an optional `W/` weak-validator prefix and optional outer
+// double quotes from one If-None-Match entry (RFC 7232 3.2 + 2.3). Weak and strong validators with
+// the same opaque payload compare equal for 304 purposes; we carry no separate weak/strong
+// dimension on the response side.
+static std::string NormalizeOneValidator(const std::string &raw)
+{
+	std::size_t start = 0;
+	std::size_t end = raw.size();
+	while (start < end && (rawstart == ' ' || rawstart == '\t'))
+		++start;
+	while (end > start && (rawend - 1 == ' ' || rawend - 1 == '\t'))
+		--end;
+	// Strip weak-validator prefix `W/` (case-sensitive per RFC).
+	if (end - start >= 2 && rawstart == 'W' && rawstart + 1 == '/') {
+		start += 2;
+	}
+	// Strip outer double quotes if both present.
+	if (end - start >= 2 && rawstart == '"' && rawend - 1 == '"') {
+		++start;
+		--end;
+	}
+	return raw.substr(start, end - start);
+}
+
+const char kGzipEtagSuffix = "-gzip";
+
+std::string WithCodingSuffix(const std::string &etag, bool coded)
+{
+	const std::size_t suffix_len = std::strlen(kGzipEtagSuffix);
+	// The opaque payload ends before the closing quote in RFC-quoted form and at the end
+	// otherwise; the suffix belongs on the payload, not outside the quotes.
+	const bool quoted = etag.size() >= 2 && etag.front() == '"' && etag.back() == '"';
+	const std::size_t end = quoted ? etag.size() - 1 : etag.size();
+	const bool present =
+		end >= suffix_len && etag.compare(end - suffix_len, suffix_len, kGzipEtagSuffix) == 0;
+	if (coded == present)
+		return etag;
+	std::string out = etag;
+	if (coded)
+		out.insert(end, kGzipEtagSuffix);
+	else
+		out.erase(end - suffix_len, suffix_len);
+	return out;
+}
+
+bool IfNoneMatchHits(const std::string &if_none_match, const std::string &etag)
+{
+	if (if_none_match.empty())
+		return false;
+	// The header value may be a single validator or a comma-separated list -- walk it,
+	// normalise each entry, return true on any hit. `*` matches any existing representation;
+	// the caller only invokes this on a 200-with-body, so `*` is always a hit.
+	std::size_t pos = 0;
+	while (pos <= if_none_match.size()) {
+		const std::size_t comma = if_none_match.find(',', pos);
+		const std::size_t end = (comma == std::string::npos) ? if_none_match.size() : comma;
+		const std::string entry = NormalizeOneValidator(if_none_match.substr(pos, end - pos));
+		if (entry == "*" || entry == etag)
+			return true;
+		if (comma == std::string::npos)
+			break;
+		pos = comma + 1;
+	}
+	return false;
+}
+
+} // namespace webcommon

amule-3.1.0.tar.gz/src/libwebcommon/Etag.h Added

@@ -0,0 +1,72 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef LIBWEBCOMMON_ETAG_H
+#define LIBWEBCOMMON_ETAG_H
+
+#include <string>
+
+// ETag computation + If-None-Match comparison for the REST API. Single source of truth for the
+// digest-truncation rule, so client caches stay valid across daemons.
+
+namespace webcommon
+{
+
+// SHA-256 over `body_utf8`, truncated to the leading 8 bytes and rendered as 16 lowercase hex
+// chars. 64 bits gives a 1-in-2^64 collision probability across one connection's lifetime, and the
+// 16-char ETag stays under the IETF-recommended header budget. RFC 7232 2.3 requires quotes around
+// the header value; the caller wraps when assembling `ETag: "<hex>"`. Bare hex feeds straight into
+// IfNoneMatchHits.
+std::string Etag(const std::string &body_utf8);
+
+// RFC 7232 3.2 conditional-GET match. `if_none_match` is the raw header value; `etag` is the
+// bare-hex value returned by Etag(). True when the caller should swap a 200 + body response for
+// a 304 Not Modified. Accepted client shapes (RFC 7232 2.3 + 3.2):
+//  * `"<hex>"`        -- strong validator, RFC-canonical form
+//  * `W/"<hex>"`      -- weak validator (same opaque payload)
+//  * `<hex>`          -- bare hex, tolerated for non-canonical clients
+//  * `*`              -- wildcard, matches any existing representation
+//  * `"<a>", W/"<b>"` -- comma-separated list, any-match wins
+// Whitespace around list entries is stripped; the hex payload compares case-sensitively (RFC
+// 2.3.2, opaque-string equality).
+bool IfNoneMatchHits(const std::string &if_none_match, const std::string &etag);
+
+// Suffix distinguishing the gzipped representation of a body from the identity one. A strong
+// validator identifies ONE representation, so the same ETag must not describe both codings -- a
+// cache holding the gzip form and revalidating for a client that cannot accept it would be told its
+// copy is current. The hash is taken before compression, so whoever selects the representation
+// appends the coding, and the conditional-GET comparison runs against that same value.
+extern const char kGzipEtagSuffix;
+
+// Returns `etag` naming the gzipped representation when `coded`, and the identity one when not.
+// Accepts either the bare-hex or the RFC-quoted form and preserves which it was given.
+//
+// Idempotent, and defined by the representation rather than by the edit: the caller says which
+// coding the value must name, not whether to add or remove anything. That is what lets the
+// transport reconcile the dispatcher's prediction against what compression actually did.
+std::string WithCodingSuffix(const std::string &etag, bool coded);
+
+} // namespace webcommon
+
+#endif // LIBWEBCOMMON_ETAG_H

amule-3.1.0.tar.gz/src/libwebcommon/HeaderParse.cpp Added

amule-3.1.0.tar.gz/src/libwebcommon/HeaderParse.h Added

@@ -0,0 +1,54 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef LIBWEBCOMMON_HEADERPARSE_H
+#define LIBWEBCOMMON_HEADERPARSE_H
+
+#include <cstddef>
+#include <utility>
+
+// Line-anchored HTTP header + Cookie helpers. Pure pointer arithmetic over a CRLF-terminated header
+// block -- no copies, no allocations, no dependency on the HTTP server. Line-boundary anchoring
+// (which defeats `X-Foo:`-in-value header injection) and the OWS trimming rules sit in one place.
+
+namespace webcommon
+{
+
+// Walk an HTTP header block looking for `name:` at the start of a line, case-insensitively. Returns
+// a non-owning view of the value, past the colon and any leading OWS, up to but not including the
+// line's CRLF; {nullptr, 0} on miss. `block` is expected to start at the HTTP-version line (e.g.
+// "GET / HTTP/1.1\r\n"), which is skipped on the first iteration. Line-boundary anchoring defeats
+// header injection via a value that happens to contain a literal "X-Header:" -- a strstr-based scan
+// would have matched anywhere.
+std::pair<const char *, std::size_t> FindHttpHeaderValue(const char *block, const char *name);
+
+// Extract `cookie_name=value` from a Cookie-header value, already found via FindHttpHeaderValue --
+// pass the view it returned. {nullptr, 0} on miss. The returned view spans from past the `=` to the
+// next `;` or `cookies_len`, whichever comes first.
+std::pair<const char *, std::size_t> FindCookieValue(
+	const char *cookies, std::size_t cookies_len, const char *cookie_name);
+
+} // namespace webcommon
+
+#endif // LIBWEBCOMMON_HEADERPARSE_H

amule-3.1.0.tar.gz/src/libwebcommon/JsonWriter.cpp Added

@@ -0,0 +1,265 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "JsonWriter.h"
+
+#include <clocale>
+#include <cmath>
+#include <cstdio>
+
+CJsonWriter::CJsonWriter()
+: m_buf(&m_internal)
+, m_needs_comma(false)
+{
+}
+
+CJsonWriter::CJsonWriter(std::string *external_buf)
+: m_buf(external_buf)
+, m_needs_comma(false)
+{
+}
+
+void CJsonWriter::MaybeComma()
+{
+	if (m_needs_comma) {
+		*m_buf += ",";
+	}
+}
+
+void CJsonWriter::BeginObject()
+{
+	MaybeComma();
+	*m_buf += "{";
+	m_needs_comma = false;
+}
+
+void CJsonWriter::EndObject()
+{
+	*m_buf += "}";
+	m_needs_comma = true;
+}
+
+void CJsonWriter::BeginArray()
+{
+	MaybeComma();
+	*m_buf += "";
+	m_needs_comma = false;
+}
+
+void CJsonWriter::EndArray()
+{
+	*m_buf += "";
+	m_needs_comma = true;
+}
+
+void CJsonWriter::Key(const char *name)
+{
+	Key(wxString::FromUTF8(name));
+}
+
+void CJsonWriter::Key(const wxString &name)
+{
+	MaybeComma();
+	WriteEscapedString(name);
+	*m_buf += ":";
+	m_needs_comma = false;
+}
+
+void CJsonWriter::ValueNull()
+{
+	MaybeComma();
+	*m_buf += "null";
+	m_needs_comma = true;
+}
+
+void CJsonWriter::ValueBool(bool v)
+{
+	MaybeComma();
+	*m_buf += v ? "true" : "false";
+	m_needs_comma = true;
+}
+
+void CJsonWriter::ValueInt(int64_t v)
+{
+	MaybeComma();
+	char buf32;
+	std::snprintf(buf, sizeof(buf), "%lld", static_cast<long long>(v));
+	*m_buf += buf;
+	m_needs_comma = true;
+}
+
+void CJsonWriter::ValueUInt(uint64_t v)
+{
+	MaybeComma();
+	char buf32;
+	std::snprintf(buf, sizeof(buf), "%llu", static_cast<unsigned long long>(v));
+	*m_buf += buf;
+	m_needs_comma = true;
+}
+
+std::string JsonDoubleToString(double v)
+{
+	if (std::isnan(v) || std::isinf(v)) {
+		// JSON has no spelling for these.
+		return "null";
+	}
+	// %.17g is the shortest round-trippable form for IEEE 754 doubles.
+	char buf64;
+	std::snprintf(buf, sizeof(buf), "%.17g", v);
+	// JSON numbers are always C-locale, with a '.' decimal point, but snprintf honours
+	// LC_NUMERIC, which amuleapi/amuleweb inherit from --locale. %g never emits digit grouping,
+	// so the only possible locale artifact is the decimal separator; normalise it to '.' so the
+	// output is valid JSON whatever the process locale.
+	const char decimal_point = *std::localeconv()->decimal_point;
+	if (decimal_point != '.') {
+		for (char *p = buf; *p; ++p) {
+			if (*p == decimal_point) {
+				*p = '.';
+			}
+		}
+	}
+	return buf;
+}
+
+void CJsonWriter::ValueDouble(double v)
+{
+	MaybeComma();
+	*m_buf += JsonDoubleToString(v);
+	m_needs_comma = true;
+}
+
+void CJsonWriter::ValueString(const wxString &s)
+{
+	MaybeComma();
+	WriteEscapedString(s);
+	m_needs_comma = true;
+}
+
+void CJsonWriter::ValueString(const char *s)
+{
+	ValueString(s ? wxString::FromUTF8(s) : wxString());
+}
+
+void CJsonWriter::ValueRaw(const std::string &json_fragment)
+{
+	MaybeComma();
+	*m_buf += json_fragment;
+	m_needs_comma = true;
+}
+
+void CJsonWriter::AppendUtf8(std::uint32_t cp)
+{
+	if (cp < 0x80) {
+		*m_buf += static_cast<char>(cp);
+	} else if (cp < 0x800) {
+		*m_buf += static_cast<char>(0xC0 | (cp >> 6));
+		*m_buf += static_cast<char>(0x80 | (cp & 0x3F));
+	} else {
+		*m_buf += static_cast<char>(0xE0 | (cp >> 12));
+		*m_buf += static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+		*m_buf += static_cast<char>(0x80 | (cp & 0x3F));
+	}
+}
+
+void CJsonWriter::WriteEscapedString(const wxString &s)
+{
+	*m_buf += "\"";
+	for (wxString::const_iterator i = s.begin(); i != s.end(); ++i) {
+		wxUniChar uc = *i;
+		uint32_t cp = uc.GetValue();
+		// wxString on Windows is UTF-16 internally, so supplementary-plane code points
+		// (U+10000+) come through as two surrogate halves; Linux and macOS use UTF-32 and
+		// yield the combined code point in one step. Combine the halves here so both
+		// backends emit identical `\uXXXX\uXXXX` escapes.
+		if (cp >= 0xD800 && cp <= 0xDBFF) {
+			wxString::const_iterator j = i;
+			++j;
+			bool paired = false;
+			if (j != s.end()) {
+				const uint32_t lo = wxUniChar(*j).GetValue();
+				if (lo >= 0xDC00 && lo <= 0xDFFF) {
+					cp = 0x10000u + ((cp - 0xD800u) << 10) + (lo - 0xDC00u);
+					i = j;
+					paired = true;
+				}
+			}
+			if (!paired) {
+				// Unpaired high surrogate. Falling through would emit invalid UTF-8
+				// (CESU-8). Replace with U+FFFD so the JSON output stays valid
+				// Unicode. Same treatment for an unpaired low surrogate below.
+				cp = 0xFFFD;
+			}
+		} else if (cp >= 0xDC00 && cp <= 0xDFFF) {
+			cp = 0xFFFD;
+		}
+		switch (cp) {
+		case '"':
+			*m_buf += "\\\"";
+			continue;
+		case '\\':
+			*m_buf += "\\\\";
+			continue;
+		case '\b':
+			*m_buf += "\\b";
+			continue;
+		case '\f':
+			*m_buf += "\\f";
+			continue;
+		case '\n':
+			*m_buf += "\\n";
+			continue;
+		case '\r':
+			*m_buf += "\\r";
+			continue;
+		case '\t':
+			*m_buf += "\\t";
+			continue;
+		default:
+			break;
+		}
+		if (cp < 0x20 || cp == 0x7F) {
+			// Control characters: \uXXXX form.
+			char buf8;
+			std::snprintf(buf, sizeof(buf), "\\u%04x", static_cast<unsigned>(cp));
+			*m_buf += buf;
+		} else if (cp <= 0xFFFF) {
+			// BMP non-control: no escape needed, emit as UTF-8.
+			AppendUtf8(cp);
+		} else {
+			// Supplementary plane: emit as UTF-16 surrogate pair.
+			// This is the only escape form JSON allows above U+FFFF.
+			uint32_t v = cp - 0x10000;
+			uint32_t hi = 0xD800 | ((v >> 10) & 0x3FF);
+			uint32_t lo = 0xDC00 | (v & 0x3FF);
+			char buf16;
+			std::snprintf(buf,
+				sizeof(buf),
+				"\\u%04x\\u%04x",
+				static_cast<unsigned>(hi),
+				static_cast<unsigned>(lo));
+			*m_buf += buf;
+		}
+	}
+	*m_buf += "\"";
+}

amule-3.1.0.tar.gz/src/libwebcommon/JsonWriter.h Added

@@ -0,0 +1,121 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef LIBWEBCOMMON_JSONWRITER_H
+#define LIBWEBCOMMON_JSONWRITER_H
+
+#include <wx/string.h>
+#include <cstdint>
+#include <string>
+
+// One JSON number formatting for doubles, shared by CJsonWriter::ValueDouble and by the
+// hand-rolled ostringstream payload builders in the SSE layer.
+//
+// Two things it gets right that `ostream << double` does not: %.17g, the shortest
+// round-trippable form for an IEEE 754 double (the stream default is 6 significant digits, so
+// the same value reads differently on SSE and REST), and a C-locale decimal point. JSON numbers
+// are always '.'-separated, but ostream and snprintf both honour LC_NUMERIC -- which amuleapi
+// inherits from --locale -- so on an it/de/fr locale an unnormalised double emits "33,3333" and
+// the whole frame stops being valid JSON.
+//
+// NaN and the infinities become `null`; JSON has no spelling for them.
+std::string JsonDoubleToString(double v);
+
+// Streaming JSON output. Appends UTF-8 bytes to an internal or caller-owned std::string, ready
+// to be a response body with no conversion. Inputs stay wxString -- that is what callers hold --
+// and are encoded on append. Do not put the buffer back to wxString: it is UTF-32 here
+// (wxUSE_UNICODE_WCHAR), which held an ASCII body at four bytes a character.
+//
+// Usage:
+//  CJsonWriter w;
+//  w.BeginObject();
+//    w.Key("name"); w.ValueString("aMule");
+//    w.Key("version"); w.ValueString("2.3.3");
+//  w.EndObject();
+//  const std::string &out = w.GetBuffer();
+//
+// Commas between siblings are inserted automatically. Calling Key() outside an object, or
+// omitting it inside one, is a programmer error (no runtime check; tests cover the legal
+// patterns).
+class CJsonWriter
+{
+public:
+	CJsonWriter();
+	explicit CJsonWriter(std::string *external_buf);
+
+	void BeginObject();
+	void EndObject();
+	void BeginArray();
+	void EndArray();
+
+	void Key(const char *name);
+	void Key(const wxString &name);
+
+	void ValueNull();
+	void ValueBool(bool v);
+	void ValueInt(int64_t v);
+	void ValueUInt(uint64_t v);
+	// NaN / +Inf / -Inf are emitted as `null` per JSON.
+	void ValueDouble(double v);
+	void ValueString(const wxString &s);
+	void ValueString(const char *s);
+	// Pre-formatted JSON fragment, written verbatim. The caller is responsible for valid UTF-8
+	// syntax. Useful when composing a response from a sub-component that already produced JSON text.
+	void ValueRaw(const std::string &json_fragment);
+
+	const std::string &GetBuffer() const { return *m_buf; }
+
+	// Move the accumulated text out, leaving this writer empty and ready to build another
+	// document. Saves copying a multi-megabyte body at the end of a response.
+	//
+	// A caller-owned buffer is copied instead, and left exactly as it was: emptying someone
+	// else's is not ours to do, and clearing the comma state while its text is still there would
+	// drop the separator before whatever is written next.
+	std::string TakeBuffer()
+	{
+		if (m_buf != &m_internal) {
+			return *m_buf;
+		}
+		std::string taken = std::move(m_internal);
+		// A moved-from string is valid but unspecified; make it definitely empty.
+		m_internal.clear();
+		m_needs_comma = false;
+		return taken;
+	}
+
+private:
+	std::string m_internal;
+	std::string *m_buf;
+	// True when the next value/key/closer must be preceded by a comma.
+	// Reset by BeginObject/BeginArray/Key.
+	bool m_needs_comma;
+
+	void MaybeComma();
+	void WriteEscapedString(const wxString &s);
+	// Append one code point as UTF-8. BMP scalars only -- control characters
+	// and supplementary planes take escape forms, surrogates become U+FFFD.
+	void AppendUtf8(std::uint32_t cp);
+};
+
+#endif // LIBWEBCOMMON_JSONWRITER_H

amule-3.1.0.tar.gz/src/libwebcommon/Jwt.cpp Added

@@ -0,0 +1,372 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "Jwt.h"
+
+#include "ConstantTime.h"
+
+#include "PicoJson_Inc.h"
+
+#include "../WarningsPush_CryptoPP.h"
+#include <cryptopp/hmac.h>
+#include <cryptopp/osrng.h>
+#include <cryptopp/sha.h>
+#include "../WarningsPop.h"
+
+#include <cstdio>
+#include <cstdint>
+#include <stdexcept>
+#include <utility>
+
+namespace
+{
+
+const char kB64UrlChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+			    "abcdefghijklmnopqrstuvwxyz"
+			    "0123456789-_";
+
+std::string Base64UrlEncode(const unsigned char *data, size_t len)
+{
+	std::string out;
+	out.reserve(((len + 2) / 3) * 4);
+	for (size_t i = 0; i < len; i += 3) {
+		uint32_t triple = static_cast<uint32_t>(datai) << 16;
+		size_t avail = 1;
+		if (i + 1 < len) {
+			triple |= static_cast<uint32_t>(datai + 1) << 8;
+			avail = 2;
+		}
+		if (i + 2 < len) {
+			triple |= static_cast<uint32_t>(datai + 2);
+			avail = 3;
+		}
+		out.push_back(kB64UrlChars(triple >> 18) & 0x3F);
+		out.push_back(kB64UrlChars(triple >> 12) & 0x3F);
+		if (avail >= 2)
+			out.push_back(kB64UrlChars(triple >> 6) & 0x3F);
+		if (avail >= 3)
+			out.push_back(kB64UrlCharstriple & 0x3F);
+	}
+	return out;
+}
+
+bool Base64UrlDecodeChar(char c, unsigned int &out)
+{
+	if (c >= 'A' && c <= 'Z') {
+		out = static_cast<unsigned>(c - 'A');
+		return true;
+	}
+	if (c >= 'a' && c <= 'z') {
+		out = static_cast<unsigned>(c - 'a' + 26);
+		return true;
+	}
+	if (c >= '0' && c <= '9') {
+		out = static_cast<unsigned>(c - '0' + 52);
+		return true;
+	}
+	if (c == '-') {
+		out = 62;
+		return true;
+	}
+	if (c == '_') {
+		out = 63;
+		return true;
+	}
+	return false;
+}
+
+bool Base64UrlDecode(const std::string &in, std::vector<unsigned char> &out)
+{
+	out.clear();
+	out.reserve(in.size() * 3 / 4 + 3);
+	uint32_t acc = 0;
+	int bits = 0;
+	for (size_t i = 0; i < in.size(); ++i) {
+		unsigned int v;
+		if (!Base64UrlDecodeChar(ini, v))
+			return false;
+		acc = (acc << 6) | v;
+		bits += 6;
+		if (bits >= 8) {
+			bits -= 8;
+			out.push_back(static_cast<unsigned char>((acc >> bits) & 0xFF));
+		}
+	}
+	// A well-formed base64url string of length len(input)%4 == 0/2/3 has 0/4/2 trailing bits
+	// respectively, all expected to be zero. Reject inputs that left non-zero residue -- they
+	// are malformed even if every char is in the b64url alphabet.
+	if (bits > 0 && (acc & ((1u << bits) - 1)) != 0)
+		return false;
+	// Length-mod-4 of 1 is impossible for a valid base64url encoding.
+	if ((in.size() & 3) == 1)
+		return false;
+	return true;
+}
+
+// HMAC-SHA-256(secret, signing_input) → 32-byte MAC. CryptoPP's HMAC
+// handles keys of any length per RFC 2104.
+void HmacSha256(const CryptoPP::SecByteBlock &secret,
+	const std::string &signing_input,
+	unsigned char out_macCryptoPP::SHA256::DIGESTSIZE)
+{
+	CryptoPP::HMAC<CryptoPP::SHA256> hmac(secret.empty() ? nullptr : secret.data(), secret.size());
+	hmac.Update(reinterpret_cast<const unsigned char *>(signing_input.data()), signing_input.size());
+	hmac.Final(out_mac);
+}
+
+// 24 h JWT expiry. Documented in the v0 API spec.
+const std::time_t TOKEN_LIFETIME_SECONDS = 24 * 60 * 60;
+
+// 128-bit `jti`. Wide enough that collisions are infeasible across the revocation-list lifetime,
+// narrow enough that 22 b64url chars fit comfortably in cookie and header payloads.
+const size_t JTI_BYTES = 16;
+
+// Hard cap on JSON nesting in a JWT header or payload.
+//
+// picojson's _parse_array / _parse_object is unbounded recursive descent and both parse sites in
+// Verify() run BEFORE the MAC compare returns its verdict -- an unauthenticated peer can blow the
+// worker stack with `{"a":{"a":...}}` nested deep enough. musl's 128 KiB pthread stack limits the
+// attack to ~300-600 frames; glibc is higher but still finite.
+//
+// Real JWT payloads here are flat (scalar claims: role / exp / iat / jti / typ / alg) so 8 would
+// suffice. 32 leaves headroom for a third-party producer accepted later.
+//
+// The check sums `{` plus `` in the decoded JSON. Openers inside string literals are counted too
+// -- false positives -- but our payloads do not legitimately contain unbalanced braces in strings,
+// so the conservative direction is fine.
+const std::size_t MAX_JSON_OPENERS = 32;
+
+bool DepthWithinLimit(const std::string &json)
+{
+	std::size_t count = 0;
+	for (char c : json) {
+		if (c == '{' || c == '') {
+			if (++count > MAX_JSON_OPENERS)
+				return false;
+		}
+	}
+	return true;
+}
+
+} // namespace
+
+CJwt::CJwt(std::vector<unsigned char> secret)
+: m_secret(secret.empty() ? nullptr : secret.data(), secret.size())
+{
+	// An empty signing key is always a config bug: a truncated amuleapi-jwt-secret read, a
+	// missing file write. Refusing it at construction is the cheapest way to avoid the failure
+	// mode where the daemon happily issues and verifies tokens signed with a zero-length key.
+	// CryptoPP's HMAC accepts a null key plus len=0 without complaint, which is why this
+	// slipped through MAC checking.
+	if (m_secret.empty()) {
+		throw std::invalid_argument("CJwt: signing secret must not be empty");
+	}
+	// Wipe the caller's copy now that we have taken our own. The SecByteBlock owns the live
+	// copy and scrubs itself on destruction; the std::vector the caller passed in is moved-
+	// from, leaving any residual bytes outside our control. Best-effort: explicitly overwrite
+	// if any bytes remain.
+	if (!secret.empty()) {
+		std::fill(secret.begin(), secret.end(), 0);
+	}
+}
+
+CJwt::IssuedToken CJwt::Issue(Role role)
+{
+	IssuedToken out;
+	const std::time_t now = std::time(nullptr);
+	out.expires_at = now + TOKEN_LIFETIME_SECONDS;
+
+	unsigned char jti_bytesJTI_BYTES;
+	CryptoPP::AutoSeededRandomPool rng;
+	rng.GenerateBlock(jti_bytes, sizeof(jti_bytes));
+	out.jti = Base64UrlEncode(jti_bytes, sizeof(jti_bytes));
+
+	const char *role_str = (role == Role::ADMIN) ? "admin" : "guest";
+
+	const std::string header_json = "{\"alg\":\"HS256\",\"typ\":\"JWT\"}";
+
+	char payload_buf256;
+	std::snprintf(payload_buf,
+		sizeof(payload_buf),
+		"{\"role\":\"%s\",\"iat\":%lld,\"exp\":%lld,\"jti\":\"%s\"}",
+		role_str,
+		static_cast<long long>(now),
+		static_cast<long long>(out.expires_at),
+		out.jti.c_str());
+	const std::string payload_json = payload_buf;
+
+	const std::string header_b64 = Base64UrlEncode(
+		reinterpret_cast<const unsigned char *>(header_json.data()), header_json.size());
+	const std::string payload_b64 = Base64UrlEncode(
+		reinterpret_cast<const unsigned char *>(payload_json.data()), payload_json.size());
+	const std::string signing_input = header_b64 + "." + payload_b64;
+
+	unsigned char macCryptoPP::SHA256::DIGESTSIZE;
+	HmacSha256(m_secret, signing_input, mac);
+	const std::string sig_b64 = Base64UrlEncode(mac, sizeof(mac));
+
+	out.token = signing_input + "." + sig_b64;
+	return out;
+}
+
+bool CJwt::Verify(const std::string &token, VerifyResult &out) const
+{
+	// Reject before any Base64UrlDecode walk on absurd-length tokens. A legitimate amuleapi
+	// token is ~280 bytes (header 36 + payload ~120 + signature 43, each base64url-encoded); 4
+	// KiB leaves ~10x headroom. Without this cap an unauthenticated peer can burn three full-
+	// token walks per request before the MAC compare rejects, which is a cheap CPU-
+	// amplification surface against the listener (1 MiB body cap x N concurrent peers).
+	if (token.size() > 4096)
+		return false;
+	// Two dots split the token into three sections.
+	const size_t first_dot = token.find('.');
+	if (first_dot == std::string::npos)
+		return false;
+	const size_t second_dot = token.find('.', first_dot + 1);
+	if (second_dot == std::string::npos)
+		return false;
+	if (token.find('.', second_dot + 1) != std::string::npos)
+		return false;
+
+	const std::string header_b64 = token.substr(0, first_dot);
+	const std::string payload_b64 = token.substr(first_dot + 1, second_dot - first_dot - 1);
+	const std::string sig_b64 = token.substr(second_dot + 1);
+	const std::string signing_input = header_b64 + "." + payload_b64;
+
+	// Recompute the MAC and compare in constant time before validating the header, so the
+	// timing of a malformed header is indistinguishable from a wrong MAC. Not exploitable today
+	// -- a 32-byte secret makes collision infeasible -- but it keeps the channel closed against
+	// future shifts.
+	unsigned char macCryptoPP::SHA256::DIGESTSIZE;
+	HmacSha256(m_secret, signing_input, mac);
+	const std::string expected_sig = Base64UrlEncode(mac, sizeof(mac));
+	if (!webcommon::ConstantTimeEquals(expected_sig, sig_b64)) {
+		return false;
+	}
+
+	// Defence in depth: validate that the header announces HS256. The MAC already matches our
+	// secret so only we could have signed the token; this closes the door against future key-
+	// confusion if asymmetric algorithms are ever added.
+	{
+		std::vector<unsigned char> header_bytes;
+		if (!Base64UrlDecode(header_b64, header_bytes))
+			return false;
+		const std::string header_json(header_bytes.begin(), header_bytes.end());
+		if (!DepthWithinLimit(header_json))
+			return false;
+		picojson::value hv;
+		std::string herr;
+		picojson::parse(hv, header_json.begin(), header_json.end(), &herr);
+		if (!herr.empty() || !hv.is<picojson::object>())
+			return false;
+		const picojson::object &hobj = hv.get<picojson::object>();
+		const auto alg_it = hobj.find("alg");
+		if (alg_it == hobj.end() || !alg_it->second.is<std::string>() ||
+			alg_it->second.get<std::string>() != "HS256") {
+			return false;
+		}
+		// `typ` is optional in RFC 7519, but if present it must say JWT.
+		const auto typ_it = hobj.find("typ");
+		if (typ_it != hobj.end() &&
+			(!typ_it->second.is<std::string>() || typ_it->second.get<std::string>() != "JWT")) {
+			return false;
+		}
+	}
+
+	// Decode and parse the payload.
+	std::vector<unsigned char> payload_bytes;
+	if (!Base64UrlDecode(payload_b64, payload_bytes))
+		return false;
+	const std::string payload_json(payload_bytes.begin(), payload_bytes.end());
+	if (!DepthWithinLimit(payload_json))
+		return false;
+
+	picojson::value v;
+	std::string err;
+	picojson::parse(v, payload_json.begin(), payload_json.end(), &err);
+	if (!err.empty() || !v.is<picojson::object>())
+		return false;
+
+	const picojson::object &obj = v.get<picojson::object>();
+	const auto role_it = obj.find("role");
+	const auto exp_it = obj.find("exp");
+	const auto jti_it = obj.find("jti");
+	if (role_it == obj.end() || !role_it->second.is<std::string>())
+		return false;
+	if (exp_it == obj.end() || !exp_it->second.is<int64_t>())
+		return false;
+	if (jti_it == obj.end() || !jti_it->second.is<std::string>())
+		return false;
+
+	const std::string role_str = role_it->second.get<std::string>();
+	if (role_str == "admin")
+		out.role = Role::ADMIN;
+	else if (role_str == "guest")
+		out.role = Role::GUEST;
+	else
+		return false;
+
+	out.exp = static_cast<std::time_t>(exp_it->second.get<int64_t>());
+	{
+		// Five-second clock-skew tolerance on the exp check. Issuer and verifier today run
+		// in the same process so the skew is always zero; tomorrow they may not (federated
+		// tokens, reverse-proxy auth handoff) and a token landing on the verifier
+		// microseconds after exp should not 401 the caller's last request. A few seconds of
+		// leeway is the standard RFC 7519 4.1.4 implementation note.
+		constexpr std::time_t skew = 5;
+		const std::time_t now = std::time(nullptr);
+		if (out.exp + skew <= now)
+			return false; // expired
+
+		// `iat` (issued-at, 4.1.6) is mandatory. Without an iat claim a token has unbounded
+		// lifetime -- an attacker who somehow gained mint capability (compromised secret,
+		// stolen --jwt-secret file) could otherwise issue a token with exp = year-2100 and
+		// bypass the lifetime cap entirely. With iat mandatory we additionally cap (exp -
+		// iat) <= TOKEN_LIFETIME_SECONDS + skew, so the cap survives a future Issue()
+		// change too.
+		const auto iat_it = obj.find("iat");
+		if (iat_it == obj.end() || !iat_it->second.is<int64_t>()) {
+			return false;
+		}
+		const std::time_t iat = static_cast<std::time_t>(iat_it->second.get<int64_t>());
+		if (iat > now + 60)
+			return false; // iat in the future
+		if (out.exp <= iat)
+			return false; // exp must follow iat
+		if (out.exp - iat > TOKEN_LIFETIME_SECONDS + skew) {
+			return false; // lifetime cap
+		}
+		out.iat = iat;
+	}
+
+	out.jti = jti_it->second.get<std::string>();
+	if (out.jti.empty())
+		return false;
+
+	// nbf (RFC 7519 4.1.5, "not before") is intentionally not enforced: Issue() never emits the
+	// claim and we do not accept externally-issued tokens. If federated tokens are ever added,
+	// the check belongs immediately above the `exp` check.
+
+	return true;
+}

amule-3.1.0.tar.gz/src/libwebcommon/Jwt.h Added

@@ -0,0 +1,96 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef LIBWEBCOMMON_JWT_H
+#define LIBWEBCOMMON_JWT_H
+
+#include <ctime>
+#include <string>
+#include <vector>
+
+#include "../WarningsPush_CryptoPP.h"
+#include <cryptopp/secblock.h>
+#include "../WarningsPop.h"
+
+#include "Role.h"
+
+// HS256 JWT machinery for the /api/v1 surface. Token shape per RFC 7519:
+// <base64url(header)>.<base64url(payload)>.<base64url(sig)>
+//
+//   header  = {"alg":"HS256","typ":"JWT"}
+//   payload = {"role":"admin"|"guest","iat":<unix>,"exp":<unix>,"jti":"<random base64url>"}
+//   sig     = HMAC-SHA-256(secret, header_b64 + "." + payload_b64)
+//
+// The owning binary supplies the HMAC secret at construction (amuleapi loads it from
+// `${config_dir}/amuleapi-jwt-secret`); this class never touches the filesystem.
+//
+// `jti` (RFC 7519 4.1.7) is a 128-bit random identifier emitted per Issue() and surfaced through
+// Verify() so the owning binary can run a server-side revocation list -- `/auth/logout` adds the
+// jti, Verify rejects on the next request. The revocation set lives in the owner, not here.
+class CJwt
+{
+public:
+	// `secret` is the HMAC-SHA-256 key. amuleapi loads 32 random bytes (256 bits, matching the
+	// digest size) from amuleapi-jwt-secret; the test-only constructor passes a deterministic
+	// fill so test vectors are reproducible.
+	explicit CJwt(std::vector<unsigned char> secret);
+
+	struct IssuedToken
+	{
+		std::string token;
+		std::string jti;        // emitted in the `jti` claim
+		std::time_t expires_at; // matches the `exp` claim
+	};
+
+	// Generates a fresh JWT for the given role with a 24 h expiry.
+	// Each call returns a fresh `jti`.
+	IssuedToken Issue(Role role);
+
+	struct VerifyResult
+	{
+		Role role;
+		std::time_t exp;
+		std::string jti; // for revocation-list lookup
+		// Issued-at, already mandatory in the payload. Surfaced so a caller can reject
+		// every token minted before some event -- which is how changing a password ends the
+		// sessions the old password opened.
+		std::time_t iat;
+	};
+
+	// Verifies a token's signature, header `alg`/`typ`, and payload shape. True and fills `out`
+	// on success; false on bad signature, expired `exp`, malformed base64, malformed JSON, or
+	// wrong algorithm. The constant-time MAC compare runs before the header `alg` parse, so the
+	// timing channel does not distinguish "wrong MAC" from "malformed header".
+	bool Verify(const std::string &token, VerifyResult &out) const;
+
+private:
+	// CryptoPP::SecBlock zeros its backing buffer at destruction (and on reallocation via
+	// AlignedAllocator), so a coredump or swap from a long-lived amuleapi process will not leak
+	// the HMAC signing key the way a plain std::vector<unsigned char> would. The constructor
+	// accepts a vector for caller convenience -- config-load does not want SecBlock in its
+	// surface -- and copies into the SecBlock once.
+	CryptoPP::SecByteBlock m_secret;
+};
+
+#endif // LIBWEBCOMMON_JWT_H

amule-3.1.0.tar.gz/src/libwebcommon/PathPatterns.cpp Added

@@ -0,0 +1,269 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "PathPatterns.h"
+
+#include <cstdint>
+
+namespace web_api_path
+{
+
+std::vector<std::string> SplitPath(const std::string &path)
+{
+	std::vector<std::string> out;
+	if (path.empty()) {
+		return out;
+	}
+	// A leading '/' is the conventional "absolute" form, so skip the empty segment it would
+	// produce. A trailing '/' still emits its empty segment, so it stays distinguishable from
+	// "no trailing slash".
+	size_t i = (path0 == '/') ? 1 : 0;
+	std::string cur;
+	for (; i < path.size(); ++i) {
+		if (pathi == '/') {
+			out.push_back(cur);
+			cur.clear();
+		} else {
+			cur += pathi;
+		}
+	}
+	out.push_back(cur);
+	return out;
+}
+
+bool LooksMalicious(const std::string &path)
+{
+	// NUL byte anywhere. Some downstream tooling (sscanf, fopen) is
+	// NUL-terminated; embedded NULs are a classic injection vector.
+	if (path.find('\0') != std::string::npos)
+		return true;
+
+	// Encoded NUL -- an explicit reject even though today's routes do not percent-decode path
+	// segments. A future hash-by-name endpoint that does decode would otherwise admit this.
+	for (size_t i = 0; i + 2 < path.size(); ++i) {
+		if (pathi != '%')
+			continue;
+		const char h = pathi + 1;
+		const char l = pathi + 2;
+		if (h == '0' && l == '0')
+			return true;
+	}
+
+	// Encoded ".." (percent-encoded dot). Match `%2e` and `%2E` in both hex cases. The more
+	// exotic `%2e%2E` / `%2E%2e` orderings are not worth bothering with: the simple loop
+	// catches any pair of adjacent `%2e`-looking triplets.
+	for (size_t i = 0; i + 5 < path.size(); ++i) {
+		const bool dot1 =
+			pathi == '%' && pathi + 1 == '2' && (pathi + 2 == 'e' || pathi + 2 == 'E');
+		if (!dot1)
+			continue;
+		const bool dot2 = pathi + 3 == '%' && pathi + 4 == '2' &&
+				  (pathi + 5 == 'e' || pathi + 5 == 'E');
+		if (dot2)
+			return true;
+	}
+
+	// Literal ".." segment. SplitPath would happily emit a "..", so walk every "/"-delimited
+	// chunk and reject any that equals "..".
+	size_t seg_start = (path0 == '/') ? 1 : 0;
+	for (size_t i = seg_start; i <= path.size(); ++i) {
+		const bool boundary = (i == path.size()) || (pathi == '/');
+		if (!boundary)
+			continue;
+		if (i - seg_start == 2 && pathseg_start == '.' && pathseg_start + 1 == '.') {
+			return true;
+		}
+		seg_start = i + 1;
+	}
+
+	return false;
+}
+
+// See PathPatterns.h.
+std::string StripTrailingSlash(const std::string &path)
+{
+	if (path.size() > 1 && path.back() == '/') {
+		return path.substr(0, path.size() - 1);
+	}
+	return path;
+}
+
+// See PathPatterns.h.
+bool ParseBoundedUint(const std::string &s, std::uint64_t min, std::uint64_t max, std::uint64_t &out)
+{
+	if (s.empty()) {
+		return false;
+	}
+	std::uint64_t v = 0;
+	for (char c : s) {
+		if (c < '0' || c > '9') {
+			return false;
+		}
+		v = v * 10 + static_cast<std::uint64_t>(c - '0');
+		if (v > max) {
+			return false;
+		}
+	}
+	if (v < min) {
+		return false;
+	}
+	out = v;
+	return true;
+}
+
+// See PathPatterns.h.
+bool ParseBoolValue(const std::string &s, bool &out)
+{
+	if (s == "1" || s == "true" || s == "yes") {
+		out = true;
+		return true;
+	}
+	if (s == "0" || s == "false" || s == "no") {
+		out = false;
+		return true;
+	}
+	return false;
+}
+
+namespace
+{
+int HexNibble(char c)
+{
+	if (c >= '0' && c <= '9')
+		return c - '0';
+	if (c >= 'a' && c <= 'f')
+		return c - 'a' + 10;
+	if (c >= 'A' && c <= 'F')
+		return c - 'A' + 10;
+	return -1;
+}
+
+// Percent-decode an application/x-www-form-urlencoded fragment. `+` becomes space (form
+// convention), `%hh` becomes a byte; a malformed `%hh` passes through verbatim so a stray `%` does
+// not drop characters.
+std::string PercentDecode(const std::string &in)
+{
+	std::string out;
+	out.reserve(in.size());
+	for (size_t i = 0; i < in.size(); ++i) {
+		if (ini == '+') {
+			out += ' ';
+		} else if (ini == '%' && i + 2 < in.size()) {
+			const int hi = HexNibble(ini + 1);
+			const int lo = HexNibble(ini + 2);
+			if (hi >= 0 && lo >= 0) {
+				out += static_cast<char>((hi << 4) | lo);
+				i += 2;
+			} else {
+				out += ini;
+			}
+		} else {
+			out += ini;
+		}
+	}
+	return out;
+}
+} // namespace
+
+std::map<std::string, std::string> ParseQuery(const std::string &q)
+{
+	std::map<std::string, std::string> out;
+	std::string key, val;
+	bool in_val = false;
+	for (size_t i = 0; i < q.size(); ++i) {
+		const char c = qi;
+		if (c == '=' && !in_val) {
+			in_val = true;
+		} else if (c == '&') {
+			if (!key.empty()) {
+				outPercentDecode(key) = PercentDecode(val);
+			}
+			key.clear();
+			val.clear();
+			in_val = false;
+		} else {
+			(in_val ? val : key) += c;
+		}
+	}
+	if (!key.empty()) {
+		outPercentDecode(key) = PercentDecode(val);
+	}
+	return out;
+}
+
+RoutePattern ParsePattern(const std::string &pattern)
+{
+	RoutePattern out;
+	out.segments = SplitPath(pattern);
+	out.capture_names.reserve(out.segments.size());
+	for (size_t i = 0; i < out.segments.size(); ++i) {
+		const std::string &seg = out.segmentsi;
+		if (seg.size() >= 2 && seg.front() == '{' && seg.back() == '}') {
+			out.capture_names.push_back(seg.substr(1, seg.size() - 2));
+		} else {
+			out.capture_names.push_back(std::string());
+		}
+	}
+	return out;
+}
+
+bool Match(const RoutePattern &pattern,
+	const std::vector<std::string> &path_segments,
+	std::map<std::string, std::string> &out_captures)
+{
+	if (pattern.segments.size() != path_segments.size()) {
+		return false;
+	}
+	std::map<std::string, std::string> caps;
+	for (size_t i = 0; i < pattern.segments.size(); ++i) {
+		if (!pattern.capture_namesi.empty()) {
+			// See the header: an empty capture names no resource.
+			if (path_segmentsi.empty()) {
+				return false;
+			}
+			capspattern.capture_namesi = path_segmentsi;
+		} else if (pattern.segmentsi != path_segmentsi) {
+			return false;
+		}
+	}
+	out_captures.swap(caps);
+	return true;
+}
+
+bool ShapeEqual(const RoutePattern &a, const RoutePattern &b)
+{
+	if (a.segments.size() != b.segments.size())
+		return false;
+	for (size_t i = 0; i < a.segments.size(); ++i) {
+		const bool a_cap = !a.capture_namesi.empty();
+		const bool b_cap = !b.capture_namesi.empty();
+		if (a_cap != b_cap)
+			return false;
+		if (!a_cap && a.segmentsi != b.segmentsi)
+			return false;
+	}
+	return true;
+}
+
+} // namespace web_api_path

amule-3.1.0.tar.gz/src/libwebcommon/PathPatterns.h Added

@@ -0,0 +1,106 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef LIBWEBCOMMON_PATHPATTERNS_H
+#define LIBWEBCOMMON_PATHPATTERNS_H
+
+#include <cstdint>
+#include <map>
+#include <string>
+#include <vector>
+
+// URL-path primitives used by the REST router. Dependency-free (no wx, no amule-internal headers)
+// so the unit tests can link this translation unit on its own.
+
+namespace web_api_path
+{
+
+// Splits `path` on '/'. A leading '/' produces no leading empty segment; a trailing one produces a
+// trailing empty segment, so "/a/" -> "a", "" differs from "/a" -> "a".
+std::vector<std::string> SplitPath(const std::string &path);
+
+// True if the raw path looks like a traversal/injection attempt: a NUL byte, an encoded NUL (%00),
+// a literal ".." segment, or percent-encoded ".." (`%2e%2e`, any case). Defence in depth -- call
+// before routing, reject with 400. Any future endpoint admitting path captures inherits it.
+bool LooksMalicious(const std::string &path);
+
+// Strips one trailing '/' so `/x/` routes exactly as `/x` does.
+//
+// Without it the two spellings disagree depending on which kind of route they land on: a literal
+// route is compared with `==` and simply misses, while a capture route matches with the capture
+// bound to the empty string, leaving the handler to reject a URL that names no resource -- picking
+// its own status code as it does so.
+//
+// Never strips the root, and never strips more than one: `//` is malformed rather than a synonym,
+// and collapsing it would let `/a//b` reach the route for `/a/b`.
+std::string StripTrailingSlash(const std::string &path);
+
+// Parses ?k=v&k2=v2 into a map. Percent-decodes `%hh` pairs and converts `+` to space per
+// application/x-www-form-urlencoded. Malformed `%hh` triplets pass through verbatim, so a stray `%`
+// does not silently drop characters.
+std::map<std::string, std::string> ParseQuery(const std::string &q);
+
+// Parses a decimal query-parameter value into `out`, requiring min, max inclusive. False on an
+// empty value, any non-digit, or a value out of range -- the caller turns that into its own
+// rejection.
+//
+// The running value is bounded inside the loop, so a long digit string cannot wrap before the range
+// check sees it.
+bool ParseBoundedUint(const std::string &s, std::uint64_t min, std::uint64_t max, std::uint64_t &out);
+
+// Parses a boolean query-parameter value: 1/0, true/false, yes/no. Returns
+// false on anything else rather than defaulting, so a typo is answerable.
+bool ParseBoolValue(const std::string &s, bool &out);
+
+// A pattern is a path string with optional `{name}` capture segments.
+// Example: "/downloads/{hash}/pause" parses to
+//  segments      = "downloads", "{hash}", "pause"
+//  capture_names = "", "hash", ""
+struct RoutePattern
+{
+	std::vector<std::string> segments;
+	// Per-segment capture name. Empty when the segment is a literal.
+	std::vector<std::string> capture_names;
+};
+
+RoutePattern ParsePattern(const std::string &pattern);
+
+// Matches `path_segments` against `pattern`. On match, fills `out_captures` with the captured
+// values and returns true.
+//
+// An empty capture is not a match. Every capture on the surface names a resource -- a hash, an
+// ecid, an index, an address -- and none can be the empty string, so a path binding one is
+// malformed rather than merely absent. Rejecting here keeps that judgement in one place instead of
+// leaving each handler to invent a status code.
+bool Match(const RoutePattern &pattern,
+	const std::vector<std::string> &path_segments,
+	std::map<std::string, std::string> &out_captures);
+
+// Two patterns are "shape-equivalent" if they match the same set of paths regardless of capture
+// names. Used at route-registration time to flag duplicates.
+bool ShapeEqual(const RoutePattern &a, const RoutePattern &b);
+
+} // namespace web_api_path
+
+#endif // LIBWEBCOMMON_PATHPATTERNS_H

amule-3.1.0.tar.gz/src/libwebcommon/PicoJson_Inc.h Added

@@ -0,0 +1,50 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 PICOJSON_INC_H
+#define PICOJSON_INC_H
+
+// Single include site for picojson. Include this wrapper rather than picojson.h directly.
+//
+// PICOJSON_USE_INT64 switches picojson::value's number storage from the default double to int64_t,
+// so large integers (file sizes, ECIDs, ...) survive exactly. It changes the layout of
+// picojson::value, so it is ABI-affecting: every translation unit that includes picojson.h must
+// define it identically, or the TUs disagree on the type -- an ODR violation the compiler cannot
+// catch. Defining it here, once, keeps the toggle from drifting between use sites. It is set at the
+// use site rather than patched into picojson.h so the vendored header stays byte-identical to
+// upstream (see docs/THIRDPARTY.md).
+#define PICOJSON_USE_INT64
+
+// USE_SYSTEM_PICOJSON (src/libwebcommon/CMakeLists.txt) sets AMULE_PICOJSON_HEADER to the absolute
+// path of the selected header -- the bundled copy by default, or a system-installed one for distro
+// packaging. The path is absolute so include-directory ordering cannot substitute the other copy.
+// The <picojson.h> fallback is defensive only; the macro is always defined for the targets that
+// link picojson_header.
+#ifdef AMULE_PICOJSON_HEADER
+#include AMULE_PICOJSON_HEADER
+#else
+#include <picojson.h>
+#endif
+
+#endif // PICOJSON_INC_H

amule-3.1.0.tar.gz/src/libwebcommon/Role.h Added

@@ -0,0 +1,38 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef LIBWEBCOMMON_ROLE_H
+#define LIBWEBCOMMON_ROLE_H
+
+// Role enumeration shared between the REST API dispatcher and the JWT machinery. Kept in its own
+// tiny header so the rest of libwebcommon, and the API handlers consuming it, can refer to roles
+// without pulling in the full Jwt header.
+enum class Role
+{
+	PUBLIC, // No credentials required (login, version)
+	GUEST,  // Authenticated as any role (read-only endpoints)
+	ADMIN   // Authenticated as admin (mutating endpoints)
+};
+
+#endif // LIBWEBCOMMON_ROLE_H

amule-3.1.0.tar.gz/src/libwebcommon/picojson.LICENSE Added

@@ -0,0 +1,33 @@
+Copyright 2009-2010 Cybozu Labs, Inc.
+Copyright 2011-2014 Kazuho Oku
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+---
+
+Upstream: https://github.com/kazuho/picojson (1.3.0)
+Vendored at src/libwebcommon/picojson.h. The file is unmodified upstream
+1.3.0; PICOJSON_USE_INT64 is defined locally in src/libwebcommon/Jwt.cpp
+before #include "picojson.h" rather than as a modification to the
+upstream header.

amule-3.1.0.tar.gz/src/libwebcommon/picojson.h Added

@@ -0,0 +1,1012 @@
+// clang-format off
+// Vendored third-party header (picojson): kept verbatim, not subject to aMule's clang-format style.
+/*
+ * Copyright 2009-2010 Cybozu Labs, Inc.
+ * Copyright 2011-2014 Kazuho Oku
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef picojson_h
+#define picojson_h
+
+#include <algorithm>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <iterator>
+#include <limits>
+#include <map>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+// for isnan/isinf
+#if __cplusplus>=201103L
+# include <cmath>
+#else
+extern "C" {
+# ifdef _MSC_VER
+#  include <float.h>
+# elif defined(__INTEL_COMPILER)
+#  include <mathimf.h>
+# else
+#  include <math.h>
+# endif
+}
+#endif
+
+// experimental support for int64_t (see README.mkdn for detail)
+#ifdef PICOJSON_USE_INT64
+# define __STDC_FORMAT_MACROS
+# include <errno.h>
+# include <inttypes.h>
+#endif
+
+// to disable the use of localeconv(3), set PICOJSON_USE_LOCALE to 0
+#ifndef PICOJSON_USE_LOCALE
+# define PICOJSON_USE_LOCALE 1
+#endif
+#if PICOJSON_USE_LOCALE
+extern "C" {
+# include <locale.h>
+}
+#endif
+
+#ifndef PICOJSON_ASSERT
+# define PICOJSON_ASSERT(e) do { if (! (e)) throw std::runtime_error(#e); } while (0)
+#endif
+
+#ifdef _MSC_VER
+    #define SNPRINTF _snprintf_s
+    #pragma warning(push)
+    #pragma warning(disable : 4244) // conversion from int to char
+    #pragma warning(disable : 4127) // conditional expression is constant
+    #pragma warning(disable : 4702) // unreachable code
+#else
+    #define SNPRINTF snprintf
+#endif
+
+namespace picojson {
+  
+  enum {
+    null_type,
+    boolean_type,
+    number_type,
+    string_type,
+    array_type,
+    object_type
+#ifdef PICOJSON_USE_INT64
+    , int64_type
+#endif
+  };
+  
+  enum {
+    INDENT_WIDTH = 2
+  };
+
+  struct null {};
+  
+  class value {
+  public:
+    typedef std::vector<value> array;
+    typedef std::map<std::string, value> object;
+    union _storage {
+      bool boolean_;
+      double number_;
+#ifdef PICOJSON_USE_INT64
+      int64_t int64_;
+#endif
+      std::string* string_;
+      array* array_;
+      object* object_;
+    };
+  protected:
+    int type_;
+    _storage u_;
+  public:
+    value();
+    value(int type, bool);
+    explicit value(bool b);
+#ifdef PICOJSON_USE_INT64
+    explicit value(int64_t i);
+#endif
+    explicit value(double n);
+    explicit value(const std::string& s);
+    explicit value(const array& a);
+    explicit value(const object& o);
+    explicit value(const char* s);
+    value(const char* s, size_t len);
+    ~value();
+    value(const value& x);
+    value& operator=(const value& x);
+    void swap(value& x);
+    template <typename T> bool is() const;
+    template <typename T> const T& get() const;
+    template <typename T> T& get();
+    bool evaluate_as_boolean() const;
+    const value& get(size_t idx) const;
+    const value& get(const std::string& key) const;
+    value& get(size_t idx);
+    value& get(const std::string& key);
+
+    bool contains(size_t idx) const;
+    bool contains(const std::string& key) const;
+    std::string to_str() const;
+    template <typename Iter> void serialize(Iter os, bool prettify = false) const;
+    std::string serialize(bool prettify = false) const;
+  private:
+    template <typename T> value(const T*); // intentionally defined to block implicit conversion of pointer to bool
+    template <typename Iter> static void _indent(Iter os, int indent);
+    template <typename Iter> void _serialize(Iter os, int indent) const;
+    std::string _serialize(int indent) const;
+  };
+  
+  typedef value::array array;
+  typedef value::object object;
+  
+  inline value::value() : type_(null_type) {}
+  
+  inline value::value(int type, bool) : type_(type) {
+    switch (type) {
+#define INIT(p, v) case p##type: u_.p = v; break
+      INIT(boolean_, false);
+      INIT(number_, 0.0);
+#ifdef PICOJSON_USE_INT64
+      INIT(int64_, 0);
+#endif
+      INIT(string_, new std::string());
+      INIT(array_, new array());
+      INIT(object_, new object());
+#undef INIT
+    default: break;
+    }
+  }
+  
+  inline value::value(bool b) : type_(boolean_type) {
+    u_.boolean_ = b;
+  }
+
+#ifdef PICOJSON_USE_INT64
+  inline value::value(int64_t i) : type_(int64_type) {
+    u_.int64_ = i;
+  }
+#endif
+
+  inline value::value(double n) : type_(number_type) {
+    if (
+#ifdef _MSC_VER
+        ! _finite(n)
+#elif __cplusplus>=201103L || !(defined(isnan) && defined(isinf))
+		std::isnan(n) || std::isinf(n)
+#else
+        isnan(n) || isinf(n)
+#endif
+        ) {
+      throw std::overflow_error("");
+    }
+    u_.number_ = n;
+  }
+  
+  inline value::value(const std::string& s) : type_(string_type) {
+    u_.string_ = new std::string(s);
+  }
+  
+  inline value::value(const array& a) : type_(array_type) {
+    u_.array_ = new array(a);
+  }
+  
+  inline value::value(const object& o) : type_(object_type) {
+    u_.object_ = new object(o);
+  }
+  
+  inline value::value(const char* s) : type_(string_type) {
+    u_.string_ = new std::string(s);
+  }
+  
+  inline value::value(const char* s, size_t len) : type_(string_type) {
+    u_.string_ = new std::string(s, len);
+  }
+  
+  inline value::~value() {
+    switch (type_) {
+#define DEINIT(p) case p##type: delete u_.p; break
+      DEINIT(string_);
+      DEINIT(array_);
+      DEINIT(object_);
+#undef DEINIT
+    default: break;
+    }
+  }
+  
+  inline value::value(const value& x) : type_(x.type_) {
+    switch (type_) {
+#define INIT(p, v) case p##type: u_.p = v; break
+      INIT(string_, new std::string(*x.u_.string_));
+      INIT(array_, new array(*x.u_.array_));
+      INIT(object_, new object(*x.u_.object_));
+#undef INIT
+    default:
+      u_ = x.u_;
+      break;
+    }
+  }
+  
+  inline value& value::operator=(const value& x) {
+    if (this != &x) {
+      value t(x);
+      swap(t);
+    }
+    return *this;
+  }
+  
+  inline void value::swap(value& x) {
+    std::swap(type_, x.type_);
+    std::swap(u_, x.u_);
+  }
+  
+#define IS(ctype, jtype)			     \
+  template <> inline bool value::is<ctype>() const { \
+    return type_ == jtype##_type;		     \
+  }
+  IS(null, null)
+  IS(bool, boolean)
+#ifdef PICOJSON_USE_INT64
+  IS(int64_t, int64)
+#endif
+  IS(std::string, string)
+  IS(array, array)
+  IS(object, object)
+#undef IS
+  template <> inline bool value::is<double>() const {
+    return type_ == number_type
+#ifdef PICOJSON_USE_INT64
+      || type_ == int64_type
+#endif
+      ;
+  }
+  
+#define GET(ctype, var)						\
+  template <> inline const ctype& value::get<ctype>() const {	\
+    PICOJSON_ASSERT("type mismatch! call is<type>() before get<type>()" \
+	   && is<ctype>());				        \
+    return var;							\
+  }								\
+  template <> inline ctype& value::get<ctype>() {		\
+    PICOJSON_ASSERT("type mismatch! call is<type>() before get<type>()"	\
+	   && is<ctype>());					\
+    return var;							\
+  }
+  GET(bool, u_.boolean_)
+  GET(std::string, *u_.string_)
+  GET(array, *u_.array_)
+  GET(object, *u_.object_)
+#ifdef PICOJSON_USE_INT64
+  GET(double, (type_ == int64_type && (const_cast<value*>(this)->type_ = number_type, const_cast<value*>(this)->u_.number_ = u_.int64_), u_.number_))
+  GET(int64_t, u_.int64_)
+#else
+  GET(double, u_.number_)
+#endif
+#undef GET
+  
+  inline bool value::evaluate_as_boolean() const {
+    switch (type_) {
+    case null_type:
+      return false;
+    case boolean_type:
+      return u_.boolean_;
+    case number_type:
+      return u_.number_ != 0;
+    case string_type:
+      return ! u_.string_->empty();
+    default:
+      return true;
+    }
+  }
+  
+  inline const value& value::get(size_t idx) const {
+    static value s_null;
+    PICOJSON_ASSERT(is<array>());
+    return idx < u_.array_->size() ? (*u_.array_)idx : s_null;
+  }
+
+  inline value& value::get(size_t idx) {
+    static value s_null;
+    PICOJSON_ASSERT(is<array>());
+    return idx < u_.array_->size() ? (*u_.array_)idx : s_null;
+  }
+
+  inline const value& value::get(const std::string& key) const {
+    static value s_null;
+    PICOJSON_ASSERT(is<object>());
+    object::const_iterator i = u_.object_->find(key);
+    return i != u_.object_->end() ? i->second : s_null;
+  }
+
+  inline value& value::get(const std::string& key) {
+    static value s_null;
+    PICOJSON_ASSERT(is<object>());
+    object::iterator i = u_.object_->find(key);
+    return i != u_.object_->end() ? i->second : s_null;
+  }
+
+  inline bool value::contains(size_t idx) const {
+    PICOJSON_ASSERT(is<array>());
+    return idx < u_.array_->size();
+  }
+
+  inline bool value::contains(const std::string& key) const {
+    PICOJSON_ASSERT(is<object>());
+    object::const_iterator i = u_.object_->find(key);
+    return i != u_.object_->end();
+  }
+  
+  inline std::string value::to_str() const {
+    switch (type_) {
+    case null_type:      return "null";
+    case boolean_type:   return u_.boolean_ ? "true" : "false";
+#ifdef PICOJSON_USE_INT64
+    case int64_type: {
+      char bufsizeof("-9223372036854775808");
+      SNPRINTF(buf, sizeof(buf), "%" PRId64, u_.int64_);
+      return buf;
+    }
+#endif
+    case number_type:    {
+      char buf256;
+      double tmp;
+      SNPRINTF(buf, sizeof(buf), fabs(u_.number_) < (1ULL << 53) && modf(u_.number_, &tmp) == 0 ? "%.f" : "%.17g", u_.number_);
+#if PICOJSON_USE_LOCALE
+      char *decimal_point = localeconv()->decimal_point;
+      if (strcmp(decimal_point, ".") != 0) {
+        size_t decimal_point_len = strlen(decimal_point);
+        for (char *p = buf; *p != '\0'; ++p) {
+          if (strncmp(p, decimal_point, decimal_point_len) == 0) {
+            return std::string(buf, p) + "." + (p + decimal_point_len);
+          }
+        }
+      }
+#endif
+      return buf;
+    }
+    case string_type:    return *u_.string_;
+    case array_type:     return "array";
+    case object_type:    return "object";
+    default:             PICOJSON_ASSERT(0);
+#ifdef _MSC_VER
+      __assume(0);
+#endif
+    }
+    return std::string();
+  }
+  
+  template <typename Iter> void copy(const std::string& s, Iter oi) {
+    std::copy(s.begin(), s.end(), oi);
+  }
+  
+  template <typename Iter> void serialize_str(const std::string& s, Iter oi) {
+    *oi++ = '"';
+    for (std::string::const_iterator i = s.begin(); i != s.end(); ++i) {
+      switch (*i) {
+#define MAP(val, sym) case val: copy(sym, oi); break
+	MAP('"', "\\\"");
+	MAP('\\', "\\\\");
+	MAP('/', "\\/");
+	MAP('\b', "\\b");
+	MAP('\f', "\\f");
+	MAP('\n', "\\n");
+	MAP('\r', "\\r");
+	MAP('\t', "\\t");
+#undef MAP
+      default:
+	if (static_cast<unsigned char>(*i) < 0x20 || *i == 0x7f) {
+	  char buf7;
+	  SNPRINTF(buf, sizeof(buf), "\\u%04x", *i & 0xff);
+	  copy(buf, buf + 6, oi);
+	  } else {
+	  *oi++ = *i;
+	}
+	break;
+      }
+    }
+    *oi++ = '"';
+  }
+
+  template <typename Iter> void value::serialize(Iter oi, bool prettify) const {
+    return _serialize(oi, prettify ? 0 : -1);
+  }
+  
+  inline std::string value::serialize(bool prettify) const {
+    return _serialize(prettify ? 0 : -1);
+  }
+
+  template <typename Iter> void value::_indent(Iter oi, int indent) {
+    *oi++ = '\n';
+    for (int i = 0; i < indent * INDENT_WIDTH; ++i) {
+      *oi++ = ' ';
+    }
+  }
+
+  template <typename Iter> void value::_serialize(Iter oi, int indent) const {
+    switch (type_) {
+    case string_type:
+      serialize_str(*u_.string_, oi);
+      break;
+    case array_type: {
+      *oi++ = '';
+      if (indent != -1) {
+        ++indent;
+      }
+      for (array::const_iterator i = u_.array_->begin();
+           i != u_.array_->end();
+           ++i) {
+	if (i != u_.array_->begin()) {
+	  *oi++ = ',';
+	}
+        if (indent != -1) {
+          _indent(oi, indent);
+        }
+	i->_serialize(oi, indent);
+      }
+      if (indent != -1) {
+        --indent;
+        if (! u_.array_->empty()) {
+          _indent(oi, indent);
+        }
+      }
+      *oi++ = '';
+      break;
+    }
+    case object_type: {
+      *oi++ = '{';
+      if (indent != -1) {
+        ++indent;
+      }
+      for (object::const_iterator i = u_.object_->begin();
+	   i != u_.object_->end();
+	   ++i) {
+	if (i != u_.object_->begin()) {
+	  *oi++ = ',';
+	}
+        if (indent != -1) {
+          _indent(oi, indent);
+        }
+	serialize_str(i->first, oi);
+	*oi++ = ':';
+        if (indent != -1) {
+          *oi++ = ' ';
+        }
+        i->second._serialize(oi, indent);
+      }
+      if (indent != -1) {
+        --indent;
+        if (! u_.object_->empty()) {
+          _indent(oi, indent);
+        }
+      }
+      *oi++ = '}';
+      break;
+    }
+    default:
+      copy(to_str(), oi);
+      break;
+    }
+    if (indent == 0) {
+      *oi++ = '\n';
+    }
+  }
+  
+  inline std::string value::_serialize(int indent) const {
+    std::string s;
+    _serialize(std::back_inserter(s), indent);
+    return s;
+  }
+  
+  template <typename Iter> class input {
+  protected:
+    Iter cur_, end_;
+    int last_ch_;
+    bool ungot_;
+    int line_;
+  public:
+    input(const Iter& first, const Iter& last) : cur_(first), end_(last), last_ch_(-1), ungot_(false), line_(1) {}
+    int getc() {
+      if (ungot_) {
+	ungot_ = false;
+	return last_ch_;
+      }
+      if (cur_ == end_) {
+	last_ch_ = -1;
+	return -1;
+      }
+      if (last_ch_ == '\n') {
+	line_++;
+      }
+      last_ch_ = *cur_ & 0xff;
+      ++cur_;
+      return last_ch_;
+    }
+    void ungetc() {
+      if (last_ch_ != -1) {
+	PICOJSON_ASSERT(! ungot_);
+	ungot_ = true;
+      }
+    }
+    Iter cur() const { return cur_; }
+    int line() const { return line_; }
+    void skip_ws() {
+      while (1) {
+	int ch = getc();
+	if (! (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r')) {
+	  ungetc();
+	  break;
+	}
+      }
+    }
+    bool expect(int expect) {
+      skip_ws();
+      if (getc() != expect) {
+	ungetc();
+	return false;
+      }
+      return true;
+    }
+    bool match(const std::string& pattern) {
+      for (std::string::const_iterator pi(pattern.begin());
+	   pi != pattern.end();
+	   ++pi) {
+	if (getc() != *pi) {
+	  ungetc();
+	  return false;
+	}
+      }
+      return true;
+    }
+  };
+  
+  template<typename Iter> inline int _parse_quadhex(input<Iter> &in) {
+    int uni_ch = 0, hex;
+    for (int i = 0; i < 4; i++) {
+      if ((hex = in.getc()) == -1) {
+	return -1;
+      }
+      if ('0' <= hex && hex <= '9') {
+	hex -= '0';
+      } else if ('A' <= hex && hex <= 'F') {
+	hex -= 'A' - 0xa;
+      } else if ('a' <= hex && hex <= 'f') {
+	hex -= 'a' - 0xa;
+      } else {
+	in.ungetc();
+	return -1;
+      }
+      uni_ch = uni_ch * 16 + hex;
+    }
+    return uni_ch;
+  }
+  
+  template<typename String, typename Iter> inline bool _parse_codepoint(String& out, input<Iter>& in) {
+    int uni_ch;
+    if ((uni_ch = _parse_quadhex(in)) == -1) {
+      return false;
+    }
+    if (0xd800 <= uni_ch && uni_ch <= 0xdfff) {
+      if (0xdc00 <= uni_ch) {
+	// a second 16-bit of a surrogate pair appeared
+	return false;
+      }
+      // first 16-bit of surrogate pair, get the next one
+      if (in.getc() != '\\' || in.getc() != 'u') {
+	in.ungetc();
+	return false;
+      }
+      int second = _parse_quadhex(in);
+      if (! (0xdc00 <= second && second <= 0xdfff)) {
+	return false;
+      }
+      uni_ch = ((uni_ch - 0xd800) << 10) | ((second - 0xdc00) & 0x3ff);
+      uni_ch += 0x10000;
+    }
+    if (uni_ch < 0x80) {
+      out.push_back(uni_ch);
+    } else {
+      if (uni_ch < 0x800) {
+	out.push_back(0xc0 | (uni_ch >> 6));
+      } else {
+	if (uni_ch < 0x10000) {
+	  out.push_back(0xe0 | (uni_ch >> 12));
+	} else {
+	  out.push_back(0xf0 | (uni_ch >> 18));
+	  out.push_back(0x80 | ((uni_ch >> 12) & 0x3f));
+	}
+	out.push_back(0x80 | ((uni_ch >> 6) & 0x3f));
+      }
+      out.push_back(0x80 | (uni_ch & 0x3f));
+    }
+    return true;
+  }
+  
+  template<typename String, typename Iter> inline bool _parse_string(String& out, input<Iter>& in) {
+    while (1) {
+      int ch = in.getc();
+      if (ch < ' ') {
+	in.ungetc();
+	return false;
+      } else if (ch == '"') {
+	return true;
+      } else if (ch == '\\') {
+	if ((ch = in.getc()) == -1) {
+	  return false;
+	}
+	switch (ch) {
+#define MAP(sym, val) case sym: out.push_back(val); break
+	  MAP('"', '\"');
+	  MAP('\\', '\\');
+	  MAP('/', '/');
+	  MAP('b', '\b');
+	  MAP('f', '\f');
+	  MAP('n', '\n');
+	  MAP('r', '\r');
+	  MAP('t', '\t');
+#undef MAP
+	case 'u':
+	  if (! _parse_codepoint(out, in)) {
+	    return false;
+	  }
+	  break;
+	default:
+	  return false;
+	}
+      } else {
+	out.push_back(ch);
+      }
+    }
+    return false;
+  }
+  
+  template <typename Context, typename Iter> inline bool _parse_array(Context& ctx, input<Iter>& in) {
+    if (! ctx.parse_array_start()) {
+      return false;
+    }
+    size_t idx = 0;
+    if (in.expect('')) {
+      return ctx.parse_array_stop(idx);
+    }
+    do {
+      if (! ctx.parse_array_item(in, idx)) {
+	return false;
+      }
+      idx++;
+    } while (in.expect(','));
+    return in.expect('') && ctx.parse_array_stop(idx);
+  }
+  
+  template <typename Context, typename Iter> inline bool _parse_object(Context& ctx, input<Iter>& in) {
+    if (! ctx.parse_object_start()) {
+      return false;
+    }
+    if (in.expect('}')) {
+      return true;
+    }
+    do {
+      std::string key;
+      if (! in.expect('"')
+	  || ! _parse_string(key, in)
+	  || ! in.expect(':')) {
+	return false;
+      }
+      if (! ctx.parse_object_item(in, key)) {
+	return false;
+      }
+    } while (in.expect(','));
+    return in.expect('}');
+  }
+  
+  template <typename Iter> inline std::string _parse_number(input<Iter>& in) {
+    std::string num_str;
+    while (1) {
+      int ch = in.getc();
+      if (('0' <= ch && ch <= '9') || ch == '+' || ch == '-'
+          || ch == 'e' || ch == 'E') {
+        num_str.push_back(ch);
+      } else if (ch == '.') {
+#if PICOJSON_USE_LOCALE
+        num_str += localeconv()->decimal_point;
+#else
+        num_str.push_back('.');
+#endif
+      } else {
+	in.ungetc();
+	break;
+      }
+    }
+    return num_str;
+  }
+  
+  template <typename Context, typename Iter> inline bool _parse(Context& ctx, input<Iter>& in) {
+    in.skip_ws();
+    int ch = in.getc();
+    switch (ch) {
+#define IS(ch, text, op) case ch: \
+      if (in.match(text) && op) { \
+	return true; \
+      } else { \
+	return false; \
+      }
+      IS('n', "ull", ctx.set_null());
+      IS('f', "alse", ctx.set_bool(false));
+      IS('t', "rue", ctx.set_bool(true));
+#undef IS
+    case '"':
+      return ctx.parse_string(in);
+    case '':
+      return _parse_array(ctx, in);
+    case '{':
+      return _parse_object(ctx, in);
+    default:
+      if (('0' <= ch && ch <= '9') || ch == '-') {
+        double f;
+        char *endp;
+	in.ungetc();
+        std::string num_str = _parse_number(in);
+        if (num_str.empty()) {
+          return false;
+        }
+#ifdef PICOJSON_USE_INT64
+        {
+          errno = 0;
+          intmax_t ival = strtoimax(num_str.c_str(), &endp, 10);
+          if (errno == 0
+              && std::numeric_limits<int64_t>::min() <= ival
+              && ival <= std::numeric_limits<int64_t>::max()
+              && endp == num_str.c_str() + num_str.size()) {
+            ctx.set_int64(ival);
+            return true;
+          }
+        }
+#endif
+        f = strtod(num_str.c_str(), &endp);
+        if (endp == num_str.c_str() + num_str.size()) {
+          ctx.set_number(f);
+          return true;
+        }
+        return false;
+      }
+      break;
+    }
+    in.ungetc();
+    return false;
+  }
+  
+  class deny_parse_context {
+  public:
+    bool set_null() { return false; }
+    bool set_bool(bool) { return false; }
+#ifdef PICOJSON_USE_INT64
+    bool set_int64(int64_t) { return false; }
+#endif
+    bool set_number(double) { return false; }
+    template <typename Iter> bool parse_string(input<Iter>&) { return false; }
+    bool parse_array_start() { return false; }
+    template <typename Iter> bool parse_array_item(input<Iter>&, size_t) {
+      return false;
+    }
+    bool parse_array_stop(size_t) { return false; }
+    bool parse_object_start() { return false; }
+    template <typename Iter> bool parse_object_item(input<Iter>&, const std::string&) {
+      return false;
+    }
+  };
+  
+  class default_parse_context {
+  protected:
+    value* out_;
+  public:
+    default_parse_context(value* out) : out_(out) {}
+    bool set_null() {
+      *out_ = value();
+      return true;
+    }
+    bool set_bool(bool b) {
+      *out_ = value(b);
+      return true;
+    }
+#ifdef PICOJSON_USE_INT64
+    bool set_int64(int64_t i) {
+      *out_ = value(i);
+      return true;
+    }
+#endif
+    bool set_number(double f) {
+      *out_ = value(f);
+      return true;
+    }
+    template<typename Iter> bool parse_string(input<Iter>& in) {
+      *out_ = value(string_type, false);
+      return _parse_string(out_->get<std::string>(), in);
+    }
+    bool parse_array_start() {
+      *out_ = value(array_type, false);
+      return true;
+    }
+    template <typename Iter> bool parse_array_item(input<Iter>& in, size_t) {
+      array& a = out_->get<array>();
+      a.push_back(value());
+      default_parse_context ctx(&a.back());
+      return _parse(ctx, in);
+    }
+    bool parse_array_stop(size_t) { return true; }
+    bool parse_object_start() {
+      *out_ = value(object_type, false);
+      return true;
+    }
+    template <typename Iter> bool parse_object_item(input<Iter>& in, const std::string& key) {
+      object& o = out_->get<object>();
+      default_parse_context ctx(&okey);
+      return _parse(ctx, in);
+    }
+  private:
+    default_parse_context(const default_parse_context&);
+    default_parse_context& operator=(const default_parse_context&);
+  };
+
+  class null_parse_context {
+  public:
+    struct dummy_str {
+      void push_back(int) {}
+    };
+  public:
+    null_parse_context() {}
+    bool set_null() { return true; }
+    bool set_bool(bool) { return true; }
+#ifdef PICOJSON_USE_INT64
+    bool set_int64(int64_t) { return true; }
+#endif
+    bool set_number(double) { return true; }
+    template <typename Iter> bool parse_string(input<Iter>& in) {
+      dummy_str s;
+      return _parse_string(s, in);
+    }
+    bool parse_array_start() { return true; }
+    template <typename Iter> bool parse_array_item(input<Iter>& in, size_t) {
+      return _parse(*this, in);
+    }
+    bool parse_array_stop(size_t) { return true; }
+    bool parse_object_start() { return true; }
+    template <typename Iter> bool parse_object_item(input<Iter>& in, const std::string&) {
+      return _parse(*this, in);
+    }
+  private:
+    null_parse_context(const null_parse_context&);
+    null_parse_context& operator=(const null_parse_context&);
+  };
+  
+  // obsolete, use the version below
+  template <typename Iter> inline std::string parse(value& out, Iter& pos, const Iter& last) {
+    std::string err;
+    pos = parse(out, pos, last, &err);
+    return err;
+  }
+  
+  template <typename Context, typename Iter> inline Iter _parse(Context& ctx, const Iter& first, const Iter& last, std::string* err) {
+    input<Iter> in(first, last);
+    if (! _parse(ctx, in) && err != NULL) {
+      char buf64;
+      SNPRINTF(buf, sizeof(buf), "syntax error at line %d near: ", in.line());
+      *err = buf;
+      while (1) {
+	int ch = in.getc();
+	if (ch == -1 || ch == '\n') {
+	  break;
+	} else if (ch >= ' ') {
+	  err->push_back(ch);
+	}
+      }
+    }
+    return in.cur();
+  }
+  
+  template <typename Iter> inline Iter parse(value& out, const Iter& first, const Iter& last, std::string* err) {
+    default_parse_context ctx(&out);
+    return _parse(ctx, first, last, err);
+  }
+  
+  inline std::string parse(value& out, const std::string& s) {
+    std::string err;
+    parse(out, s.begin(), s.end(), &err);
+    return err;
+  }
+
+  inline std::string parse(value& out, std::istream& is) {
+    std::string err;
+    parse(out, std::istreambuf_iterator<char>(is.rdbuf()),
+	  std::istreambuf_iterator<char>(), &err);
+    return err;
+  }
+  
+  template <typename T> struct last_error_t {
+    static std::string s;
+  };
+  template <typename T> std::string last_error_t<T>::s;
+  
+  inline void set_last_error(const std::string& s) {
+    last_error_t<bool>::s = s;
+  }
+  
+  inline const std::string& get_last_error() {
+    return last_error_t<bool>::s;
+  }
+
+  inline bool operator==(const value& x, const value& y) {
+    if (x.is<null>())
+      return y.is<null>();
+#define PICOJSON_CMP(type)					\
+    if (x.is<type>())						\
+      return y.is<type>() && x.get<type>() == y.get<type>()
+    PICOJSON_CMP(bool);
+    PICOJSON_CMP(double);
+    PICOJSON_CMP(std::string);
+    PICOJSON_CMP(array);
+    PICOJSON_CMP(object);
+#undef PICOJSON_CMP
+    PICOJSON_ASSERT(0);
+#ifdef _MSC_VER
+    __assume(0);
+#endif
+    return false;
+  }
+  
+  inline bool operator!=(const value& x, const value& y) {
+    return ! (x == y);
+  }
+}
+
+namespace std {
+  template<> inline void swap(picojson::value& x, picojson::value& y)
+    {
+      x.swap(y);
+    }
+}
+
+inline std::istream& operator>>(std::istream& is, picojson::value& x)
+{
+  picojson::set_last_error(std::string());
+  std::string err = picojson::parse(x, is);
+  if (! err.empty()) {
+    picojson::set_last_error(err);
+    is.setstate(std::ios::failbit);
+  }
+  return is;
+}
+
+inline std::ostream& operator<<(std::ostream& os, const picojson::value& x)
+{
+  x.serialize(std::ostream_iterator<char>(os));
+  return os;
+}
+#ifdef _MSC_VER
+    #pragma warning(pop)
+#endif
+
+#endif

amule-3.0.1.tar.gz/src/muuli_wdr.cpp -> amule-3.1.0.tar.gz/src/muuli_wdr.cpp Changed

@@ -1,3 +1,4 @@
+// clang-format off
 //
 // This file is part of the aMule Project.
 //
@@ -36,16 +37,21 @@
 // Include private header
 #include "muuli_wdr.h"
 
+#include "amuleDlg.h" // Needed for CLIENT_SKIN_SIZE (clientImages' artIds static_assert)
+#include "OtherFunctions.h" // Needed for LabelWithColon
+
+#include <wx/artprov.h> // Needed for the "amule:" art ids (status bar + transfer window icons)
 #include <wx/intl.h>
+#include <wx/wrapsizer.h> // Needed for the responsive statistics legends
 
 // Euro sign hack of the year
 #if wxUSE_UNICODE
     #define __WDR_EURO__ "\u20ac"
 #else
-    // Legacy ANSI branch: bytes >=0x80 fail wxConvLibc in POSIX UTF-8 locales.
-    // Keep wxT() so the literal becomes a wide-char at compile time and matches
-    // the pre-sweep behaviour — the branch is effectively dead today
-    // (wxUSE_UNICODE has been on by default since wx 3.0) but toggle-able.
+    // Legacy ANSI branch: bytes >=0x80 fail wxConvLibc in POSIX UTF-8 locales. Keep wxT() so the
+    // literal becomes a wide char at compile time and matches the pre-sweep behaviour -- the branch
+    // is effectively dead today (wxUSE_UNICODE has been on by default since wx 3.0) but toggle-
+    // able.
     #if defined(__WXMAC__)
         #define __WDR_EURO__ wxT("\xdb")
     #elif defined(__WXMSW__)
@@ -56,6 +62,7 @@
 #endif
 
 // Custom source
+#include <common/Format.h> // Needed for CFormat (SetConnectButtonState)
 #include "ServerListCtrl.h"
 #include "DownloadListCtrl.h"
 #include "SourceListCtrl.h"
@@ -65,6 +72,7 @@
 #include "FriendListCtrl.h"
 #include "FileDetailListCtrl.h"
 #include "MuleGifCtrl.h"
+#include "MuleLogCtrl.h"
 #include "ChatSelector.h"
 #include "DirectoryTreeCtrl.h"	// Needed for CDirectoryTreeCtrl
 #include "KadDlg.h"
@@ -75,7 +83,6 @@
 #define wxGA_PROGRESSBAR 0
 #endif
 
-
 // Implement window functions
 
 wxSizer *s_dlgcnt;
@@ -90,34 +97,59 @@
     contentSizer = item1;
 
     item0->Add( item1, wxSizerFlags(1).Expand().CenterVertical() );
-    wxFlexGridSizer *item2 = new wxFlexGridSizer( 3, 0, 0 );
-    item2->AddGrowableCol( 1 );
+    wxFlexGridSizer *item2 = new wxFlexGridSizer( 2, 0, 0 );
+    item2->AddGrowableCol( 0 );
     s_fed2klh = item2;
 
-    wxStaticText *item3 = new wxStaticText( parent, -1, _("eD2k Link: "), wxDefaultPosition, wxDefaultSize, 0 );
-    item2->Add( item3, wxSizerFlags().Center().Border(wxLEFT, 5) );
+    // The old "eD2k Link:" label is gone -- the text control's placeholder
+    // ("Paste eD2k or magnet links here") now conveys the same thing.
     CMuleTextCtrl *item4 = new CMuleTextCtrl( parent, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
     item4->SetName( "FastEd2kLinks" );
+    item4->SetPlaceholder( _("Paste eD2k or magnet links here") );
     item2->Add( item4, wxSizerFlags(1).Expand().Border(wxALL, 5) );
-    wxButton *item5 = new wxButton( parent, ID_BUTTON_FAST, _("Commit"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item5 = new wxButton( parent, ID_BUTTON_FAST, _("Add links"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->SetToolTip( _("Click here to add the eD2k link in the text control to your download queue.") );
     item2->Add( item5, wxSizerFlags().Center().Border(wxRIGHT, 5) );
     item0->Add( item2, wxSizerFlags().Expand().CenterVertical() );
     wxBoxSizer *item6 = new wxBoxSizer( wxHORIZONTAL );
 
-    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, 5 );
+    wxStaticBitmap *item7 = new wxStaticBitmap( parent, -1, wxArtProvider::GetBitmapBundle( "amule:status_log_info" ), wxDefaultPosition, wxDefaultSize );
+    item7->SetToolTip( _("Events are displayed here. For a complete list of events, refer to the log in the Networks tab.") );
+    item6->Add( item7, wxSizerFlags().Center() );
 
     wxStaticText *item8 = new wxStaticText( parent, -1, _("Loading ..."), wxDefaultPosition, wxSize(140,-1), wxST_NO_AUTORESIZE );
     item8->SetName( "infoLabel" );
     item6->Add( item8, wxSizerFlags(1).FixedMinSize().Center().Border(wxLEFT, 5) );
     wxStaticLine *item9 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
-    item6->Add( item9, 0, wxALIGN_CENTER, 5 );
+    item6->Add( item9, wxSizerFlags().Center().Border(wxLEFT, 5) );
 
-    wxStaticBitmap *item10 = new wxStaticBitmap( parent, -1, amuleDlgImages( 4 ), wxDefaultPosition, wxDefaultSize );
+#ifdef CLIENT_GUI
+    // Connected core's version, left of the counters it heads. amulegui only: this file is compiled
+    // per-executable, so CLIENT_GUI is the consuming target's and monolithic aMule never builds it.
+    // Hidden until the EC handshake reports a version. Clickable, so it gets the hand cursor. 16x16
+    // explicitly: with no size the bundle defaults to the icon's PNG twin, 256x256 for the logo.
+    // The size is logical, so it still renders from SVG.
+    wxStaticBitmap *coreVerIcon = new wxStaticBitmap( parent, -1, wxArtProvider::GetBitmapBundle( "amule:amule", wxART_OTHER, wxSize(16, 16) ), wxDefaultPosition, wxDefaultSize );
+    coreVerIcon->SetName( "coreVersionImage" );
+    coreVerIcon->SetCursor( wxCursor( wxCURSOR_HAND ) );
+    coreVerIcon->Show( false );
+    item6->Add( coreVerIcon, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
+
+    wxStaticText *coreVerLabel = new wxStaticText( parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    coreVerLabel->SetName( "coreVersionLabel" );
+    coreVerLabel->SetCursor( wxCursor( wxCURSOR_HAND ) );
+    coreVerLabel->Show( false );
+    item6->Add( coreVerLabel, wxSizerFlags().Center().Border(wxRIGHT, 5) );
+
+    wxStaticLine *coreVerSep = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    coreVerSep->SetName( "coreVersionSep" );
+    coreVerSep->Show( false );
+    item6->Add( coreVerSep, wxSizerFlags().Center().Border(wxLEFT, 5) );
+#endif // CLIENT_GUI
+
+    wxStaticBitmap *item10 = new wxStaticBitmap( parent, -1, wxArtProvider::GetBitmapBundle( "amule:status_users" ), wxDefaultPosition, wxDefaultSize );
     item10->SetToolTip( _("Number of users on the server you are connected to ...") );
-    item6->Add( item10, 0, wxALIGN_CENTER, 5 );
+    item6->Add( item10, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
 
     wxStaticText *item11 = new wxStaticText( parent, -1, _("Users: 0"), wxDefaultPosition, wxDefaultSize, 0 );
     item11->SetToolTip( _("Users connected to the current server and an estimate of the total number of users.") );
@@ -125,17 +157,17 @@
     item6->Add( item11, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     wxStaticLine *item12 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
     item6->Add( item12, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    wxStaticBitmap *item13 = new wxStaticBitmap( parent, -1, amuleDlgImages( 5 ), wxDefaultPosition, wxDefaultSize );
+    wxStaticBitmap *item13 = new wxStaticBitmap( parent, -1, wxArtProvider::GetBitmapBundle( "amule:status_speed_idle" ), wxDefaultPosition, wxDefaultSize );
     item13->SetName( "transferImg" );
     item6->Add( item13, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     wxStaticText *item14 = new wxStaticText( parent, -1, _("Up: 0.0 | Down: 0.0"), wxDefaultPosition, wxDefaultSize, 0 );
     item14->SetToolTip( _("Current average upload and download rates. If enabled the numbers in the braces signify the overhead from client communication.") );
     item14->SetName( "speedLabel" );
-    item6->Add( item14, 0, wxALIGN_CENTER, 5 );
+    item6->Add( item14, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
 
     wxStaticLine *item15 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
     item6->Add( item15, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    wxStaticBitmap *item16 = new wxStaticBitmap( parent, -1, amuleDlgImages( 13 ), wxDefaultPosition, wxDefaultSize );
+    wxStaticBitmap *item16 = new wxStaticBitmap( parent, -1, wxArtProvider::GetBitmapBundle( "amule:status_conn_base" ), wxDefaultPosition, wxDefaultSize );
     item16->SetToolTip( _("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).") );
     item16->SetName( "connImage" );
     item6->Add( item16, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
@@ -143,7 +175,15 @@
     item17->SetToolTip( _("Currently connected server.") );
     item17->SetName( "connLabel" );
     item6->Add( item17, wxSizerFlags().Center().Border(wxRIGHT, 5) );
+#if defined(__WXMAC__)
+    // macOS rounds the frame's bottom corners, clipping content flush against the edge. Inset the
+    // status row -- a wider left margin for the leading icon, a slimmer bottom margin -- so nothing
+    // is cut off.
+    item6->PrependSpacer(16);
+    item0->Add( item6, wxSizerFlags().Expand().CenterVertical().Border(wxRIGHT|wxBOTTOM, 6) );
+#else
     item0->Add( item6, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
+#endif
     if (set_sizer)
     {
         parent->SetSizer( item0 );
@@ -189,13 +229,13 @@
 
     wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item4 = new wxStaticText( parent, -1, _("Name:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item4 = new wxStaticText( item2, -1, LabelWithColon( _("Name") ), wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item4, wxSizerFlags().Center().Border(wxALL, 5) );
-    CMuleTextCtrl *item5 = new CMuleTextCtrl( parent, IDC_SEARCHNAME, "", wxDefaultPosition, wxSize(80,-1), wxTE_PROCESS_ENTER );
+    wxComboBox *item5 = new wxComboBox( item2, IDC_SEARCHNAME, "", wxDefaultPosition, wxSize(80,-1), 0, nullptr, wxTE_PROCESS_ENTER );
     item3->Add( item5, wxSizerFlags(1).Center().Border(wxALL, 5) );
     wxFlexGridSizer *item6 = new wxFlexGridSizer( 1, 0, 0, 0 );
 
-    wxStaticText *item7 = new wxStaticText( parent, -1, _("Type"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item7 = new wxStaticText( item2, -1, _("Type"), wxDefaultPosition, wxDefaultSize, 0 );
     item6->Add( item7, wxSizerFlags().Center().Border(wxALL, 5) );
     wxString strs8 = 
     {
@@ -203,157 +243,188 @@
         _("Global"), 
         _("Kad")
     };
-    wxChoice *item8 = new wxChoice( parent, ID_SEARCHTYPE, wxDefaultPosition, wxDefaultSize, 3, strs8, 0 );
+    wxChoice *item8 = new wxChoice( item2, ID_SEARCHTYPE, wxDefaultPosition, wxDefaultSize, 3, strs8, 0 );
     item6->Add( item8, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticLine *item9 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    wxStaticLine *item9 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
     item6->Add( item9, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    wxCheckBox *item10 = new wxCheckBox( parent, IDC_EXTENDEDSEARCHCHECK, _("Extended Parameters"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item10 = new wxCheckBox( item2, IDC_EXTENDEDSEARCHCHECK, _("Extended Parameters"), wxDefaultPosition, wxDefaultSize, 0 );
     item6->Add( item10, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticLine *item11 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    wxStaticLine *item11 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
     item6->Add( item11, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    wxCheckBox *item12 = new wxCheckBox( parent, IDC_FILTERCHECK, _("Filtering"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item12 = new wxCheckBox( item2, IDC_FILTERCHECK, _("Filtering"), wxDefaultPosition, wxDefaultSize, 0 );
     item6->Add( item12, wxSizerFlags().Center().Border(wxALL, 5) );
     item3->Add( item6, 0, wxALIGN_CENTER, 0 );
 
     item1->Add( item3, wxSizerFlags().Expand().CenterVertical() );
-    wxFlexGridSizer *item13 = new wxFlexGridSizer( 8, 0, 0 );
-    item13->AddGrowableRow( 1 );
+    // One row: the five filters sit side by side, each preceded by a separator from the second
+    // onwards -- 14 cells. They were split across two rows of eight while Category lived here,
+    // which left Min Size stranded at the end of the first row, away from Max Size.
+    wxFlexGridSizer *item13 = new wxFlexGridSizer( 14, 0, 0 );
     s_extended_sizer = item13;
 
-    wxStaticText *item14 = new wxStaticText( parent, -1, _("File Type"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item14 = new wxStaticText( item2, -1, _("File Type"), wxDefaultPosition, wxDefaultSize, 0 );
     item13->Add( item14, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
     wxString strs15 = 
     {
         _("Any"), 
         _("Archives"), 
         _("Audio"), 
-        _("CD-Images"), 
+        _("Disc images"), 
         _("Pictures"), 
         _("Programs"), 
         _("Texts"), 
         _("Videos")
     };
-    wxChoice *item15 = new wxChoice( parent, IDC_TypeSearch, wxDefaultPosition, wxDefaultSize, 8, strs15, 0 );
+    wxChoice *item15 = new wxChoice( item2, IDC_TypeSearch, wxDefaultPosition, wxDefaultSize, 8, strs15, 0 );
     item13->Add( item15, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    wxStaticLine *item16 = new wxStaticLine( parent, -1, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    item13->Add( item16, wxSizerFlags(1).CenterHorizontal().Border(wxALL, 5) );
-    wxStaticText *item17 = new wxStaticText( parent, -1, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
-    item13->Add( item17, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
-    wxString *strs18 = (wxString*) NULL;
-    wxChoice *item18 = new wxChoice( parent, ID_AUTOCATASSIGN, wxDefaultPosition, wxDefaultSize, 0, strs18, 0 );
-    item13->Add( item18, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    wxStaticLine *item19 = new wxStaticLine( parent, -1, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    item13->Add( item19, wxSizerFlags().CenterHorizontal().Border(wxALL, 5) );
-    wxStaticText *item20 = new wxStaticText( parent, -1, _("Extension"), wxDefaultPosition, wxDefaultSize, 0 );
+    // The category selector used to sit here, between File Type and Extension. It is not a search
+    // filter -- nothing about it travels with the query -- so it moved to the button row next to
+    // Download, whose destination it is. Five filters remain: three on this row, two on the next.
+    wxStaticLine *item16 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    item13->Add( item16, wxSizerFlags().Center().Border(wxALL, 5) );
+    wxStaticText *item20 = new wxStaticText( item2, -1, _("Extension"), wxDefaultPosition, wxDefaultSize, 0 );
     item13->Add( item20, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
-    CMuleTextCtrl *item21 = new CMuleTextCtrl( parent, IDC_EDITSEARCHEXTENSION, "", wxDefaultPosition, wxSize(60,-1), wxTE_PROCESS_ENTER );
+    CMuleTextCtrl *item21 = new CMuleTextCtrl( item2, IDC_EDITSEARCHEXTENSION, "", wxDefaultPosition, wxSize(60,-1), wxTE_PROCESS_ENTER );
     item13->Add( item21, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    wxStaticText *item22 = new wxStaticText( parent, -1, _("Min Size"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticLine *item19 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    item13->Add( item19, wxSizerFlags().Center().Border(wxALL, 5) );
+    wxStaticText *item22 = new wxStaticText( item2, -1, _("Min Size"), wxDefaultPosition, wxDefaultSize, 0 );
     item13->Add( item22, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
     wxBoxSizer *item23 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxSpinCtrl *item24 = new wxSpinCtrl( parent, IDC_SPINSEARCHMIN, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 4096, 0 );
+    wxSpinCtrl *item24 = new wxSpinCtrl( item2, IDC_SPINSEARCHMIN, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 4096, 0 );
     item23->Add( item24, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     wxString strs25 = 
     {
         _("Bytes"), 
-        _("KB"), 
-        _("MB"), 
-        _("GB")
+        _("KiB"), 
+        _("MiB"), 
+        _("GiB")
     };
-    wxChoice *item25 = new wxChoice( parent, IDC_SEARCHMINSIZE, wxDefaultPosition, wxDefaultSize, 4, strs25, 0 );
+    wxChoice *item25 = new wxChoice( item2, IDC_SEARCHMINSIZE, wxDefaultPosition, wxDefaultSize, 4, strs25, 0 );
     item23->Add( item25, wxSizerFlags().Center().Border(wxALL, 5) );
-    item13->Add( item23, 0, wxALIGN_CENTER, 5 );
+    item13->Add( item23, wxSizerFlags().Center().Border(wxALL, 5) );
 
-    wxStaticLine *item26 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
-    item13->Add( item26, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    wxStaticText *item27 = new wxStaticText( parent, -1, _("Max Size"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticLine *item26 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    item13->Add( item26, wxSizerFlags().Center().Border(wxALL, 5) );
+    wxStaticText *item27 = new wxStaticText( item2, -1, _("Max Size"), wxDefaultPosition, wxDefaultSize, 0 );
     item13->Add( item27, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
     wxBoxSizer *item28 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxSpinCtrl *item29 = new wxSpinCtrl( parent, IDC_SPINSEARCHMAX, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 4096, 0 );
+    wxSpinCtrl *item29 = new wxSpinCtrl( item2, IDC_SPINSEARCHMAX, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 4096, 0 );
     item28->Add( item29, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     wxString strs30 = 
     {
         _("Bytes"), 
-        _("KB"), 
-        _("MB"), 
-        _("GB")
+        _("KiB"), 
+        _("MiB"), 
+        _("GiB")
     };
-    wxChoice *item30 = new wxChoice( parent, IDC_SEARCHMAXSIZE, wxDefaultPosition, wxDefaultSize, 4, strs30, 0 );
+    wxChoice *item30 = new wxChoice( item2, IDC_SEARCHMAXSIZE, wxDefaultPosition, wxDefaultSize, 4, strs30, 0 );
     item28->Add( item30, wxSizerFlags().Center().Border(wxALL, 5) );
-    item13->Add( item28, 0, wxALIGN_CENTER, 5 );
+    item13->Add( item28, wxSizerFlags().Center().Border(wxALL, 5) );
 
-    wxStaticLine *item31 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    wxStaticLine *item31 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
     item13->Add( item31, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticText *item32 = new wxStaticText( parent, -1, _("Availability"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item32 = new wxStaticText( item2, -1, _("Availability"), wxDefaultPosition, wxDefaultSize, 0 );
     item13->Add( item32, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
-    wxSpinCtrl *item33 = new wxSpinCtrl( parent, IDC_SPINSEARCHAVAILABILITY, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 1000, 0 );
+    wxSpinCtrl *item33 = new wxSpinCtrl( item2, IDC_SPINSEARCHAVAILABILITY, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 1000, 0 );
     item13->Add( item33, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    item1->Add( item13, 0, wxALIGN_CENTER, 5 );
+    item1->Add( item13, wxSizerFlags().Center() );
 
     wxFlexGridSizer *item34 = new wxFlexGridSizer( 1, 0, 0, 0 );
     s_filter_sizer = item34;
 
     item34->Add( 10, 10, wxSizerFlags(1).Center().Border(wxALL, 5) );
-    wxStaticText *item35 = new wxStaticText( parent, -1, _("Filter:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item35 = new wxStaticText( item2, -1, LabelWithColon( _("Filter") ), wxDefaultPosition, wxDefaultSize, 0 );
     item34->Add( item35, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxTextCtrl *item36 = new wxTextCtrl( parent, ID_FILTER_TEXT, "", wxDefaultPosition, wxSize(80,-1), wxTE_PROCESS_ENTER );
+    wxTextCtrl *item36 = new wxTextCtrl( item2, ID_FILTER_TEXT, "", wxDefaultPosition, wxSize(220,-1), wxTE_PROCESS_ENTER );
     item34->Add( item36, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticLine *item37 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
-    item34->Add( item37, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxButton *item38 = new wxButton( parent, ID_FILTER, _("Filter Results"), wxDefaultPosition, wxDefaultSize, 0 );
-    item34->Add( item38, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticLine *item39 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    wxStaticLine *item39 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
     item34->Add( item39, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxCheckBox *item40 = new wxCheckBox( parent, ID_FILTER_INVERT, _("Invert Result"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item40 = new wxCheckBox( item2, ID_FILTER_INVERT, _("Invert Result"), wxDefaultPosition, wxDefaultSize, 0 );
     item34->Add( item40, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticLine *item41 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    wxStaticLine *item41 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
     item34->Add( item41, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxCheckBox *item42 = new wxCheckBox( parent, ID_FILTER_KNOWN, _("Hide Known Files"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item42 = new wxCheckBox( item2, ID_FILTER_KNOWN, _("Hide Known Files"), wxDefaultPosition, wxDefaultSize, 0 );
     item34->Add( item42, wxSizerFlags().Center().Border(wxALL, 5) );
+    // Clears the filter text and returns both checkboxes to their defaults. Named in full rather
+    // than a bare "Reset" so it cannot be read as a second "Reset Fields": that button covers the
+    // search parameters, this one covers only the filter row it sits in.
+    wxStaticLine *item59 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    item34->Add( item59, wxSizerFlags().Center().Border(wxALL, 5) );
+    wxButton *item60 = new wxButton( item2, ID_FILTER_RESET, _("Reset Filters"), wxDefaultPosition, wxDefaultSize, 0 );
+    item34->Add( item60, wxSizerFlags().Center().Border(wxALL, 5) );
     item34->Add( 10, 10, wxSizerFlags(1).Center().Border(wxALL, 5) );
-    item1->Add( item34, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     wxBoxSizer *item43 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxButton *item44 = new wxButton( parent, IDC_STARTS, _("Start"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item44 = new wxButton( item2, IDC_STARTS, _("Start"), wxDefaultPosition, wxDefaultSize, 0 );
     item44->Enable( false );
     item43->Add( item44, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticLine *item45 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    wxStaticLine *item45 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
     item43->Add( item45, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxButton *item46 = new wxButton( parent, IDC_SEARCHMORE, _("More"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item46 = new wxButton( item2, IDC_SEARCHMORE, _("Extend"), wxDefaultPosition, wxDefaultSize, 0 );
     item46->SetToolTip( _("Ask already-responded Kad peers to widen the search. Each click queries the next-closest peer for more contacts (KADEMLIA_FIND_VALUE_MORE), surfacing additional file matches that the search's initial alpha frontier missed.") );
     item46->Enable( false );
     item43->Add( item46, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticLine *item47 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    wxStaticLine *item47 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
     item43->Add( item47, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxButton *item48 = new wxButton( parent, IDC_CANCELS, _("Stop"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item48 = new wxButton( item2, IDC_CANCELS, _("Stop"), wxDefaultPosition, wxDefaultSize, 0 );
     item48->Enable( false );
     item43->Add( item48, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticLine *item49 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    wxStaticLine *item49 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
     item43->Add( item49, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxButton *item50 = new wxButton( parent, IDC_SDOWNLOAD, _("Download"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item50 = new wxButton( item2, IDC_SDOWNLOAD, _("Download"), wxDefaultPosition, wxDefaultSize, 0 );
     item50->Enable( false );
     item43->Add( item50, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticLine *item51 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    // Where the button beside it sends the file. It sat in the extended-parameters row until that
+    // made it read as a search filter -- something neither ed2k nor Kad can do -- and let a chosen
+    // category be hidden and then silently ignored. Here it is always visible and its meaning is
+    // positional. Same wording as the right-click action that does the same thing.
+    wxStaticText *item17 = new wxStaticText( item2, ID_AUTOCATASSIGN_LABEL, _("Download in category"), wxDefaultPosition, wxDefaultSize, 0 );
+    item43->Add( item17, wxSizerFlags().Center().Border(wxALL, 5) );
+    // Empty item list: UpdateCatChoice() fills it and keeps it in step with the configured
+    // categories. nullptr, not the file's usual (wxString*) NULL -- this line is new, so the Tier-2
+    // modernize-use-nullptr check applies to it.
+    wxString *strs18 = nullptr;
+    wxChoice *item18 = new wxChoice( item2, ID_AUTOCATASSIGN, wxDefaultPosition, wxDefaultSize, 0, strs18, 0 );
+    item43->Add( item18, wxSizerFlags().Center().Border(wxALL, 5) );
+    wxStaticLine *item51 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
     item43->Add( item51, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxButton *item52 = new wxButton( parent, IDC_SEARCH_RESET, _("Reset Fields"), wxDefaultPosition, wxDefaultSize, 0 );
-    item52->Enable( false );
-    item43->Add( item52, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticLine *item53 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
-    item43->Add( item53, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxButton *item54 = new wxButton( parent, IDC_CLEAR_RESULTS, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
+    // Ordered most to least destructive rightwards, so the mildest sits at the edge where it is
+    // easiest to hit and the one that discards saved terms is furthest from it. CSearchDlg inserts
+    // "Clear Search History" ahead of Clear Search Results at runtime. Reset Fields last also puts
+    // it directly above "Reset Filters" in the row below, which is the control it parallels.
+    wxButton *item54 = new wxButton( item2, IDC_CLEAR_RESULTS, _("Clear Search Results"), wxDefaultPosition, wxDefaultSize, 0 );
     item54->Enable( false );
     item43->Add( item54, wxSizerFlags().Center().Border(wxALL, 5) );
+    wxStaticLine *item53 = new wxStaticLine( item2, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
+    item43->Add( item53, wxSizerFlags().Center().Border(wxALL, 5) );
+    wxButton *item52 = new wxButton( item2, IDC_SEARCH_RESET, _("Reset Fields"), wxDefaultPosition, wxDefaultSize, 0 );
+    item52->Enable( false );
+    item43->Add( item52, wxSizerFlags().Center().Border(wxALL, 5) );
     item1->Add( item43, wxSizerFlags().Center().Border(wxALL, 5) );
+    // Rule between the buttons and the filter row: with extended parameters and filtering both on,
+    // five rows of fields run together, and this marks where the search parameters stop and what
+    // filters the results already on screen begins. Full width rather than the button row's extent
+    // -- that row is centred and sized to its contents. Shown and hidden with the row it
+    // introduces; see CSearchDlg::ApplyFilterSeparator().
+    wxStaticLine *item61 = new wxStaticLine( item2, ID_FILTER_SEPARATOR, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    item1->Add( item61, wxSizerFlags().Expand().Border(wxLEFT|wxRIGHT, 5) );
+    // Filter row goes BELOW the action buttons: filtering is not a search parameter -- it applies
+    // to results already on screen and is not touched by "Reset Fields" -- so grouping it with the
+    // search parameters above the buttons misrepresented it, and it sits closer to the results list
+    // here. Added after item43 purely for sizer order; the row is still built above so
+    // s_filter_sizer keeps its show/hide wiring.
+    item1->Add( item34, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     wxStaticBox *item56 = new wxStaticBox( parent, -1, _("Results") );
     wxStaticBoxSizer *item55 = new wxStaticBoxSizer( item56, wxVERTICAL );
 
-    wxWindow *item57 = new CMuleNotebook(parent, ID_NOTEBOOK, wxDefaultPosition,wxDefaultSize,0);
+    wxWindow *item57 = new CMuleNotebook(item56, ID_NOTEBOOK, wxDefaultPosition,wxDefaultSize,0);
     wxASSERT( item57 );
     item55->Add( item57, wxSizerFlags(1).Expand().CenterVertical().Border(wxALL, 5) );
-    wxGauge *item58 = new wxGauge( parent, ID_SEARCHPROGRESS, 100, wxDefaultPosition, wxSize(-1,10), 0 );
+    wxGauge *item58 = new wxGauge( item56, ID_SEARCHPROGRESS, 100, wxDefaultPosition, wxSize(-1,10), 0 );
     item55->Add( item58, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     item0->Add( item55, wxSizerFlags(1).Expand().CenterVertical().Border(wxALL, 5) );
     if (set_sizer)
@@ -372,18 +443,22 @@
 
     wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBitmapButton *item2 = new wxBitmapButton( parent, ID_BTNCLRCOMPL, amuleDlgImages( 17 ), wxDefaultPosition, wxSize(30,30) );
+    wxBitmapButton *item2 = new wxBitmapButton( parent, ID_BTNCLRCOMPL, wxArtProvider::GetBitmapBundle( "amule:transfer_clear_completed" ), wxDefaultPosition, wxSize(34,34) );
     item2->SetToolTip( _("Clears completed downloads") );
     item2->Enable( false );
-    item1->Add( item2, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
+    item1->Add( item2, wxSizerFlags().Center().FixedMinSize().Border(wxLEFT|wxRIGHT, 5) );
     wxStaticText *item3 = new wxStaticText( parent, -1, _("Downloads"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->SetName( "downloadsLabel" );
     item1->Add( item3, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     CMuleNotebook *item4 = new CMuleNotebook( parent, ID_CATEGORIES, wxDefaultPosition, wxSize(15,MULE_NOTEBOOK_TAB_HEIGHT), 0 );
     wxASSERT( item4 );
     item1->Add( item4, wxSizerFlags(1).FixedMinSize().Center() );
+    wxStaticText *itemDlFilterLabel = new wxStaticText( parent, -1, _("Filter:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( itemDlFilterLabel, wxSizerFlags().Center().Border(wxLEFT, 5) );
+    wxTextCtrl *itemDlFilter = new wxTextCtrl( parent, IDC_TRANSFER_FILTER, "", wxDefaultPosition, wxSize(150,-1), 0 );
+    item1->Add( itemDlFilter, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical() );
-    CDownloadListCtrl *item5 = new CDownloadListCtrl( parent, ID_DLOADLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
+    CDownloadListCtrl *item5 = new CDownloadListCtrl( parent, ID_DLOADLIST, wxDefaultPosition, wxDefaultSize, 0 );
     item5->SetName( "downloadList" );
     item0->Add( item5, wxSizerFlags(1).Expand().CenterVertical() );
     if (set_sizer)
@@ -407,22 +482,54 @@
     item1->AddGrowableCol( 1 );
     s_clientlistHeader = item1;
 
-    wxBitmapButton *item2 = new wxBitmapButton( parent, ID_CLIENTTOGGLE, amuleDlgImages( 10 ), wxDefaultPosition, wxDefaultSize );
-    item1->Add( item2, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxBitmapButton *item2 = new wxBitmapButton( parent, ID_CLIENTTOGGLE, wxArtProvider::GetBitmapBundle( "amule:arrows_down" ), wxDefaultPosition, wxDefaultSize );
+    item1->Add( item2, wxSizerFlags().CenterVertical() );
 
     wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
 
     wxStaticText *item4 = new wxStaticText( parent, -1, _("File sources:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->Add( item4, 0, wxALIGN_CENTER, 5 );
+    item3->Add( item4, wxSizerFlags().Center() );
 
     wxStaticText *item5 = new wxStaticText( parent, ID_CLIENTCOUNT, "0", wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
     item5->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item3->Add( item5, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 5) );
-    item1->Add( item3, 0, wxALIGN_CENTER, 5 );
+    item1->Add( item3, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
+
+    // Combined size of the downloads currently visible (category + text filter), followed by the
+    // free space on the filesystem holding the part files. Both right-aligned in the growable
+    // header's third column, and both in one box sizer so the header keeps its three columns. No
+    // wxST_NO_AUTORESIZE: the labels must grow to fit their text, and they start empty.
+    wxBoxSizer *item5a = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticText *item5b = new wxStaticText( parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
+    item5b->SetName( "downloadsTotalSize" );
+    item5a->Add( item5b, wxSizerFlags().CenterVertical() );
+
+    // The "|" joining the two figures, in a label of its own for the same reason the figure has
+    // one: a wxStaticText colours all or nothing, so a separator sharing the label below would turn
+    // red along with the figure whenever the warning fires.
+    //
+    // The gaps around it are sizer border, not spaces in the text: a static text is sized to its
+    // text extent, which ignores trailing whitespace, so a " | " label loses the space on one side
+    // and doubles it on the other.
+    wxStaticText *item5c = new wxStaticText( parent, -1, wxEmptyString );
+    item5c->SetName( "downloadsFreeSpaceSep" );
+    // Starts hidden: the labels either side start empty, and a shown separator
+    // would reserve its border before there is anything to separate.
+    item5c->Show( false );
+    item5a->Add( item5c, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 4) );
+
+    // Separate label rather than more text in the one above: it turns red on its own when the free
+    // space no longer covers what is left to download, and a wxStaticText colours all or nothing.
+    wxStaticText *item5d = new wxStaticText( parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
+    item5d->SetName( "downloadsFreeSpace" );
+    item5a->Add( item5d, wxSizerFlags().CenterVertical() );
+
+    item1->Add( item5a, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 5) );
 
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical() );
-    CSourceListCtrl *item6 = new CSourceListCtrl( parent, ID_CLIENTLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
-    item0->Add( item6, 1, wxGROW, 5 );
+    CSourceListCtrl *item6 = new CSourceListCtrl( parent, ID_CLIENTLIST, wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( item6, wxSizerFlags(1).Expand() );
 
     if (set_sizer)
     {
@@ -439,7 +546,7 @@
     wxStaticBox *item1 = new wxStaticBox( parent, -1, "" );
     wxStaticBoxSizer *item0 = new wxStaticBoxSizer( item1, wxVERTICAL );
 
-    wxSplitterWindow *item2 = new wxSplitterWindow( parent, ID_MESSAGESPLATTER, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE );
+    wxSplitterWindow *item2 = new wxSplitterWindow( item1, ID_MESSAGESPLATTER, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE );
     item2->SetMinimumPaneSize( 20 );
     wxPanel *item3 = new wxPanel( item2, -1 );
     messagePageFriends( item3, FALSE, TRUE );
@@ -457,6 +564,35 @@
     return item0;
 }
 
+namespace
+{
+// File-details helper: append a "label" + HOTLIGHT-coloured value pair (the value control carrying
+// `valueId`, initialised to "N/A") to `grid` as one horizontal row. Mirrors the label/value styling
+// used throughout fileDetails(), so the relocated download rows and the Sharing box stay visually
+// consistent with the hand-written rows.
+//
+// `appendColon` renders the label as "label:" at display time. The Sharing rows use it so they can
+// reuse existing bare translations instead of minting a second, colon-suffixed catalog string for
+// each.
+//
+// The punctuation goes through the catalog rather than being concatenated in C++, because where the
+// colon sits is a property of the language, not of the layout: Russian typography forbids the space
+// this used to hard-code, while French requires it.
+void AddFileDetailRow(
+    wxWindow *rowParent, wxSizer *grid, const wxString &label, int valueId, bool appendColon = false )
+{
+    wxBoxSizer *row = new wxBoxSizer( wxHORIZONTAL );
+    const wxString labelText = appendColon ? LabelWithColon( label ) : label;
+    row->Add( new wxStaticText( rowParent, -1, labelText,
+                  wxDefaultPosition, wxDefaultSize, 0 ),
+        wxSizerFlags().Expand().CenterVertical() );
+    wxStaticText *val = new wxStaticText( rowParent, valueId, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    val->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
+    row->Add( val, wxSizerFlags().Center().Border(wxLEFT, 5) );
+    grid->Add( row, wxSizerFlags().Expand().CenterVertical() );
+}
+} // namespace
+
 wxSizer *fileDetails( wxWindow *parent, bool call_fit, bool set_sizer )
 {
     wxFlexGridSizer *item0 = new wxFlexGridSizer( 1, 0, 0 );
@@ -468,26 +604,26 @@
 
     wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item4 = new wxStaticText( parent, -1, _("Full Name :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->Add( item4, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticText *item4 = new wxStaticText( item2, -1, LabelWithColon( _("Full Name") ), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->Add( item4, wxSizerFlags().Expand().CenterVertical() );
 
-    wxStaticText *item5 = new wxStaticText( parent, IDC_FNAME, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item5 = new wxStaticText( item2, IDC_FNAME, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item3->Add( item5, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     item1->Add( item3, wxSizerFlags().Expand().CenterVertical() );
     wxBoxSizer *item6 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item7 = new wxStaticText( parent, -1, _("met-File :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item7 = new wxStaticText( item2, -1, LabelWithColon( _("met-File") ), wxDefaultPosition, wxDefaultSize, 0 );
     item6->Add( item7, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item8 = new wxStaticText( parent, IDC_METFILE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item8 = new wxStaticText( item2, IDC_METFILE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item8->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item6->Add( item8, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item1->Add( item6, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     wxBoxSizer *item9 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item10 = new wxStaticText( parent, -1, _("Hash :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item10 = new wxStaticText( item2, -1, LabelWithColon( _("Hash") ), wxDefaultPosition, wxDefaultSize, 0 );
     item9->Add( item10, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item11 = new wxStaticText( parent, IDC_FHASH, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item11 = new wxStaticText( item2, IDC_FHASH, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item11->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item9->Add( item11, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item1->Add( item9, wxSizerFlags().Expand().CenterVertical() );
@@ -497,185 +633,192 @@
 
     wxBoxSizer *item13 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item14 = new wxStaticText( parent, -1, _("Filesize :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item14 = new wxStaticText( item2, -1, LabelWithColon( _("Filesize") ), wxDefaultPosition, wxDefaultSize, 0 );
     item13->Add( item14, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item15 = new wxStaticText( parent, IDC_FSIZE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item15 = new wxStaticText( item2, IDC_FSIZE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item15->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item13->Add( item15, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item12->Add( item13, wxSizerFlags().Expand().CenterVertical() );
-    wxBoxSizer *item16 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item17 = new wxStaticText( parent, -1, _("Partfilestatus :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item16->Add( item17, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item18 = new wxStaticText( parent, IDC_PFSTATUS, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item18->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item16->Add( item18, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item12->Add( item16, wxSizerFlags().Expand().CenterVertical() );
-    wxBoxSizer *item19 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item20 = new wxStaticText( parent, -1, _("Last seen complete :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item19->Add( item20, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item21 = new wxStaticText( parent, IDC_LASTSEENCOMPL, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item21->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item19->Add( item21, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item12->Add( item19, wxSizerFlags().Expand().CenterVertical() );
+    // Partfilestatus + Last seen complete are download-only; they now live in the Download panel
+    // below so the whole panel can be hidden for a shared, non-downloading file.
     item1->Add( item12, wxSizerFlags().Expand().CenterVertical() );
     item0->Add( item1, wxSizerFlags(1).Expand().Border(wxALL, 5) );
-    wxStaticBox *item23 = new wxStaticBox( parent, -1, _("Transfer") );
+    // Download-only sections, wrapped in a panel the dialog hides for a shared file that is not, or
+    // no longer, downloading. Controls are parented to the panel so Show(false) collapses the whole
+    // group.
+    wxPanel *dlPanel = new wxPanel( parent, IDC_FD_DOWNLOAD_PANEL );
+    wxBoxSizer *dlPanelSizer = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBox *item23 = new wxStaticBox( dlPanel, -1, _("Transfer") );
     wxStaticBoxSizer *item22 = new wxStaticBoxSizer( item23, wxVERTICAL );
 
     wxFlexGridSizer *item24 = new wxFlexGridSizer( 2, 0, 0 );
     item24->AddGrowableCol( 0 );
     item24->AddGrowableCol( 1 );
 
-    wxBoxSizer *item25 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item26 = new wxStaticText( parent, -1, _("Found Sources :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item25->Add( item26, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item27 = new wxStaticText( parent, IDC_SOURCECOUNT, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item27->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item25->Add( item27, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item24->Add( item25, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
-    wxBoxSizer *item28 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item29 = new wxStaticText( parent, -1, _("Transferring Sources :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item28->Add( item29, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
-    wxStaticText *item30 = new wxStaticText( parent, IDC_SOURCECOUNT2, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item30->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item28->Add( item30, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item24->Add( item28, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
-    wxBoxSizer *item31 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item32 = new wxStaticText( parent, -1, _("Filepart-Count :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item31->Add( item32, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item33 = new wxStaticText( parent, IDC_PARTCOUNT, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item33->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item31->Add( item33, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item24->Add( item31, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
-    wxBoxSizer *item34 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item35 = new wxStaticText( parent, -1, _("Available :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item34->Add( item35, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
-    wxStaticText *item36 = new wxStaticText( parent, IDC_PARTAVAILABLE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item36->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item34->Add( item36, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item24->Add( item34, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
-    wxBoxSizer *item37 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item38 = new wxStaticText( parent, -1, _("Datarate :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item37->Add( item38, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item39 = new wxStaticText( parent, IDC_DATARATE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item39->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item37->Add( item39, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item24->Add( item37, wxSizerFlags().Expand().CenterVertical() );
-    wxBoxSizer *item40 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item41 = new wxStaticText( parent, -1, _("Download Active Time: "), wxDefaultPosition, wxDefaultSize, 0 );
-    item40->Add( item41, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
-    wxStaticText *item42 = new wxStaticText( parent, IDC_DLACTIVETIME, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item42->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item40->Add( item42, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item24->Add( item40, wxSizerFlags().Expand().CenterVertical() );
-    wxBoxSizer *item43 = new wxBoxSizer( wxHORIZONTAL );
+    // Partfile status + last seen complete (download-only; relocated here from
+    // the General box).
+    AddFileDetailRow( dlPanel, item24, _("Partfilestatus"), IDC_PFSTATUS, true );
+    AddFileDetailRow( dlPanel, item24, _("Last seen complete"), IDC_LASTSEENCOMPL, true );
+    AddFileDetailRow( dlPanel, item24, _("Found Sources"), IDC_SOURCECOUNT, true );
+    AddFileDetailRow( dlPanel, item24, _("Transferring Sources"), IDC_SOURCECOUNT2, true );
+    AddFileDetailRow( dlPanel, item24, _("Filepart-Count"), IDC_PARTCOUNT, true );
+    AddFileDetailRow( dlPanel, item24, _("Available"), IDC_PARTAVAILABLE, true );
+    AddFileDetailRow( dlPanel, item24, _("Datarate"), IDC_DATARATE, true );
+    AddFileDetailRow( dlPanel, item24, _("Download Active Time"), IDC_DLACTIVETIME, true );
+    AddFileDetailRow( dlPanel, item24, _("Transferred"), IDC_TRANSFERRED, true );
 
-    wxStaticText *item44 = new wxStaticText( parent, -1, _("Transferred :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item43->Add( item44, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item45 = new wxStaticText( parent, IDC_TRANSFERRED, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item45->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item43->Add( item45, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item24->Add( item43, wxSizerFlags().Expand().CenterVertical() );
+    // Completed Size keeps its composite "value / (percent)" display.
     wxBoxSizer *item46 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item47 = new wxStaticText( parent, -1, _("Completed Size :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item46->Add( item47, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
+    item46->Add( new wxStaticText( item23, -1, LabelWithColon( _("Completed Size") ), wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().Expand().CenterVertical() );
     wxBoxSizer *item48 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item49 = new wxStaticText( parent, IDC_COMPLSIZE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item49 = new wxStaticText( item23, IDC_COMPLSIZE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item49->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item48->Add( item49, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxStaticText *item50 = new wxStaticText( parent, -1, " / (", wxDefaultPosition, wxDefaultSize, 0 );
-    item48->Add( item50, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxStaticText *item51 = new wxStaticText( parent, IDC_PROCCOMPL, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    item48->Add( item49, wxSizerFlags().CenterVertical() );
+    item48->Add( new wxStaticText( item23, -1, " / (", wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().CenterVertical() );
+    wxStaticText *item51 = new wxStaticText( item23, IDC_PROCCOMPL, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item51->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item48->Add( item51, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxStaticText *item52 = new wxStaticText( parent, -1, ")", wxDefaultPosition, wxDefaultSize, 0 );
-    item48->Add( item52, 0, wxALIGN_CENTER_VERTICAL, 0 );
-
+    item48->Add( item51, wxSizerFlags().CenterVertical() );
+    item48->Add( new wxStaticText( item23, -1, ")", wxDefaultPosition, wxDefaultSize, 0 ), 0, wxALIGN_CENTER_VERTICAL, 0 );
     item46->Add( item48, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item24->Add( item46, wxSizerFlags().Expand().CenterVertical() );
+
     item22->Add( item24, wxSizerFlags().Expand().CenterVertical() );
-    item0->Add( item22, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticBox *item54 = new wxStaticBox( parent, -1, _("Intelligent Corruption Handling") );
-    wxStaticBoxSizer *item53 = new wxStaticBoxSizer( item54, wxVERTICAL );
+    dlPanelSizer->Add( item22, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
 
+    wxStaticBox *item54 = new wxStaticBox( dlPanel, -1, _("Intelligent Corruption Handling") );
+    wxStaticBoxSizer *item53 = new wxStaticBoxSizer( item54, wxVERTICAL );
     wxFlexGridSizer *item55 = new wxFlexGridSizer( 2, 0, 0 );
     item55->AddGrowableCol( 0 );
     item55->AddGrowableCol( 1 );
+    AddFileDetailRow( dlPanel, item55, _("Lost to corruption"), IDC_FD_STATS1, true );
+    AddFileDetailRow( dlPanel, item55, _("Gained by compression"), IDC_FD_STATS2, true );
+    AddFileDetailRow( dlPanel, item55, _("Packages saved by I.C.H."), IDC_FD_STATS3, true );
+    item53->Add( item55, wxSizerFlags().Expand().CenterVertical() );
+    dlPanelSizer->Add( item53, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
 
-    wxBoxSizer *item56 = new wxBoxSizer( wxHORIZONTAL );
+    dlPanel->SetSizer( dlPanelSizer );
+    item0->Add( dlPanel, wxSizerFlags().Expand().CenterVertical() );
+
+    // Sharing box, wrapped in a panel the dialog hides for a file with no sharing role. Upload
+    // counters, live upload activity and the share timestamps; populated in both the monolithic and
+    // remote builds.
+    wxPanel *shPanel = new wxPanel( parent, IDC_FD_SHARING_PANEL );
+    wxBoxSizer *shPanelSizer = new wxBoxSizer( wxVERTICAL );
+    wxStaticBox *shBox = new wxStaticBox( shPanel, -1, _("Sharing") );
+    wxStaticBoxSizer *shBoxSizer = new wxStaticBoxSizer( shBox, wxVERTICAL );
+    wxFlexGridSizer *shGrid = new wxFlexGridSizer( 2, 0, 0 );
+    shGrid->AddGrowableCol( 0 );
+    shGrid->AddGrowableCol( 1 );
+    // Labels reuse existing bare translations; the colon is applied at display time through the
+    // localizable "%s :" format (appendColon), so no new catalog string is needed per row and the
+    // punctuation stays translatable.
+    AddFileDetailRow( shPanel, shGrid, _("Requests"), IDC_FD_SHARE_REQ, true );
+    AddFileDetailRow( shPanel, shGrid, _("Accepted Requests"), IDC_FD_SHARE_ACC, true );
+    AddFileDetailRow( shPanel, shGrid, _("Transferred Data"), IDC_FD_SHARE_XFER, true );
+    AddFileDetailRow( shPanel, shGrid, _("Share Ratio"), IDC_FD_SHARE_RATIO, true );
+    AddFileDetailRow( shPanel, shGrid, _("Complete Sources"), IDC_FD_SHARE_COMPLSRC, true );
+    AddFileDetailRow( shPanel, shGrid, _("On Queue"), IDC_FD_SHARE_ONQUEUE, true );
+    AddFileDetailRow( shPanel, shGrid, _("Priority"), IDC_FD_SHARE_UPPRIO, true );
+    AddFileDetailRow( shPanel, shGrid, _("Speed"), IDC_FD_SHARE_UPSPEED, true );
+    AddFileDetailRow( shPanel, shGrid, _("Uploading"), IDC_FD_SHARE_UPCOUNT, true );
+    AddFileDetailRow( shPanel, shGrid, _("Shared since"), IDC_FD_SHARE_SINCE, true );
+    AddFileDetailRow( shPanel, shGrid, _("Last upload"), IDC_FD_SHARE_LASTUP, true );
+    shBoxSizer->Add( shGrid, wxSizerFlags().Expand().CenterVertical() );
+    shPanelSizer->Add( shBoxSizer, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
+    shPanel->SetSizer( shPanelSizer );
+    item0->Add( shPanel, wxSizerFlags().Expand().CenterVertical() );
+
+    // Media Info (issue #418) -- populated from FT_MEDIA_* when the file has probed metadata; the
+    // six labels show "N/A" otherwise. Layout and styling mirror the "Intelligent Corruption
+    // Handling" box above: "label :" static text plus a HOTLIGHT-coloured value, two fields per row
+    // in a 2-column growable grid.
+    wxStaticBox *mediaBox = new wxStaticBox( parent, -1, _("Media Info") );
+    wxStaticBoxSizer *mediaBoxSizer = new wxStaticBoxSizer( mediaBox, wxVERTICAL );
+    wxFlexGridSizer *mediaGrid = new wxFlexGridSizer( 2, 0, 0 );
+    mediaGrid->AddGrowableCol( 0 );
+    mediaGrid->AddGrowableCol( 1 );
+
+    wxBoxSizer *mLenRow = new wxBoxSizer( wxHORIZONTAL );
+    mLenRow->Add( new wxStaticText( mediaBox, -1, LabelWithColon( _("Length") ), wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().Expand().CenterVertical() );
+    wxStaticText *mLenVal = new wxStaticText( mediaBox, IDC_FD_MEDIA_LENGTH, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    mLenVal->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
+    mLenRow->Add( mLenVal, wxSizerFlags().Center().Border(wxLEFT, 5) );
+    mediaGrid->Add( mLenRow, wxSizerFlags().Expand().CenterVertical() );
+
+    wxBoxSizer *mBrRow = new wxBoxSizer( wxHORIZONTAL );
+    mBrRow->Add( new wxStaticText( mediaBox, -1, LabelWithColon( _("Bitrate") ), wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
+    wxStaticText *mBrVal = new wxStaticText( mediaBox, IDC_FD_MEDIA_BITRATE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    mBrVal->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
+    mBrRow->Add( mBrVal, wxSizerFlags().Center().Border(wxLEFT, 5) );
+    mediaGrid->Add( mBrRow, wxSizerFlags().Expand().CenterVertical() );
+
+    wxBoxSizer *mCodecRow = new wxBoxSizer( wxHORIZONTAL );
+    mCodecRow->Add( new wxStaticText( mediaBox, -1, LabelWithColon( _("Codec") ), wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().Expand().CenterVertical() );
+    wxStaticText *mCodecVal = new wxStaticText( mediaBox, IDC_FD_MEDIA_CODEC, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    mCodecVal->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
+    mCodecRow->Add( mCodecVal, wxSizerFlags().Center().Border(wxLEFT, 5) );
+    mediaGrid->Add( mCodecRow, wxSizerFlags().Expand().CenterVertical() );
+
+    wxBoxSizer *mArtistRow = new wxBoxSizer( wxHORIZONTAL );
+    mArtistRow->Add( new wxStaticText( mediaBox, -1, LabelWithColon( _("Artist") ), wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
+    wxStaticText *mArtistVal = new wxStaticText( mediaBox, IDC_FD_MEDIA_ARTIST, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    mArtistVal->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
+    mArtistRow->Add( mArtistVal, wxSizerFlags().Center().Border(wxLEFT, 5) );
+    mediaGrid->Add( mArtistRow, wxSizerFlags().Expand().CenterVertical() );
+
+    wxBoxSizer *mAlbumRow = new wxBoxSizer( wxHORIZONTAL );
+    mAlbumRow->Add( new wxStaticText( mediaBox, -1, LabelWithColon( _("Album") ), wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().Expand().CenterVertical() );
+    wxStaticText *mAlbumVal = new wxStaticText( mediaBox, IDC_FD_MEDIA_ALBUM, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    mAlbumVal->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
+    mAlbumRow->Add( mAlbumVal, wxSizerFlags().Center().Border(wxLEFT, 5) );
+    mediaGrid->Add( mAlbumRow, wxSizerFlags().Expand().CenterVertical() );
+
+    wxBoxSizer *mTitleRow = new wxBoxSizer( wxHORIZONTAL );
+    mTitleRow->Add( new wxStaticText( mediaBox, -1, LabelWithColon( _("Title") ), wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
+    wxStaticText *mTitleVal = new wxStaticText( mediaBox, IDC_FD_MEDIA_TITLE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    mTitleVal->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
+    mTitleRow->Add( mTitleVal, wxSizerFlags().Center().Border(wxLEFT, 5) );
+    mediaGrid->Add( mTitleRow, wxSizerFlags().Expand().CenterVertical() );
+
+    mediaBoxSizer->Add( mediaGrid, wxSizerFlags().Expand().CenterVertical() );
+    item0->Add( mediaBoxSizer, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
 
-    wxStaticText *item57 = new wxStaticText( parent, -1, _("Lost to corruption :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item56->Add( item57, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item58 = new wxStaticText( parent, IDC_FD_STATS1, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item58->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item56->Add( item58, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item55->Add( item56, wxSizerFlags().Expand().CenterVertical() );
-    wxBoxSizer *item59 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item60 = new wxStaticText( parent, -1, _("Gained by compression :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item59->Add( item60, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
-    wxStaticText *item61 = new wxStaticText( parent, IDC_FD_STATS2, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item61->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item59->Add( item61, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item55->Add( item59, wxSizerFlags().Expand().CenterVertical() );
-    wxBoxSizer *item62 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item63 = new wxStaticText( parent, -1, _("Packages saved by I.C.H. :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item62->Add( item63, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item64 = new wxStaticText( parent, IDC_FD_STATS3, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item64->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item62->Add( item64, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    item55->Add( item62, wxSizerFlags().Expand().CenterVertical() );
-    item53->Add( item55, wxSizerFlags().Expand().CenterVertical() );
-    item0->Add( item53, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     wxStaticBox *item66 = new wxStaticBox( parent, -1, _("File Names") );
     wxStaticBoxSizer *item65 = new wxStaticBoxSizer( item66, wxVERTICAL );
 
-    CFileDetailListCtrl *item67 = new CFileDetailListCtrl( parent, IDC_LISTCTRLFILENAMES, wxDefaultPosition, wxSize(-1,130), wxLC_REPORT|wxSUNKEN_BORDER );
+    CFileDetailListCtrl *item67 = new CFileDetailListCtrl( item66, IDC_LISTCTRLFILENAMES, wxDefaultPosition, wxSize(-1,130), 0 );
     wxASSERT( item67 );
     item65->Add( item67, wxSizerFlags(1).Expand().FixedMinSize() );
     wxBoxSizer *item68 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxButton *item69 = new wxButton( parent, IDC_TAKEOVER, _("Takeover"), wxDefaultPosition, wxDefaultSize, 0 );
-    item68->Add( item69, 0, wxALIGN_CENTER, 5 );
+    wxButton *item69 = new wxButton( item66, IDC_TAKEOVER, _("Takeover"), wxDefaultPosition, wxDefaultSize, 0 );
+    item68->Add( item69, wxSizerFlags().Center().Border(wxALL, 5) );
 
     item68->Add( 20, 20, wxSizerFlags(1).Center().Border(wxALL, 5) );
-    wxButton *item70 = new wxButton( parent, IDC_CMTBT, _("Show all comments"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item70 = new wxButton( item66, IDC_CMTBT, _("Show all comments"), wxDefaultPosition, wxDefaultSize, 0 );
     item68->Add( item70, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
     item68->Add( 20, 20, wxSizerFlags(1).Center().Border(wxALL, 5) );
-    wxButton *item71 = new wxButton( parent, IDC_BUTTONSTRIP, _("Cleanup"), wxDefaultPosition, wxDefaultSize, 0 );
-    item68->Add( item71, 0, wxALIGN_CENTER, 5 );
+    wxButton *item71 = new wxButton( item66, IDC_BUTTONSTRIP, _("Cleanup"), wxDefaultPosition, wxDefaultSize, 0 );
+    item68->Add( item71, wxSizerFlags().Center().Border(wxALL, 5) );
 
     item65->Add( item68, wxSizerFlags().Expand().CenterVertical() );
-    CMuleTextCtrl *item72 = new CMuleTextCtrl( parent, IDC_FILENAME, "", wxDefaultPosition, wxDefaultSize, 0 );
+    CMuleTextCtrl *item72 = new CMuleTextCtrl( item66, IDC_FILENAME, "", wxDefaultPosition, wxDefaultSize, 0 );
     item65->Add( item72, wxSizerFlags().Expand().CenterVertical() );
     item0->Add( item65, wxSizerFlags().Expand().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     wxBoxSizer *item73 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBitmapButton *item74 = new wxBitmapButton( parent, IDC_NEXTFILE, amuleDlgImages( 10 ), wxDefaultPosition, wxDefaultSize );
+    wxBitmapButton *item74 = new wxBitmapButton( parent, IDC_NEXTFILE, wxArtProvider::GetBitmapBundle( "amule:arrows_down" ), wxDefaultPosition, wxDefaultSize );
     item73->Add( item74, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxBitmapButton *item75 = new wxBitmapButton( parent, IDC_PREVFILE, amuleDlgImages( 11 ), wxDefaultPosition, wxDefaultSize );
+    wxBitmapButton *item75 = new wxBitmapButton( parent, IDC_PREVFILE, wxArtProvider::GetBitmapBundle( "amule:arrows_up" ), wxDefaultPosition, wxDefaultSize );
     item73->Add( item75, wxSizerFlags().Center().Border(wxALL, 5) );
     item73->Add( 20, 20, wxSizerFlags(1).Center().Border(wxALL, 5) );
     wxButton *item76 = new wxButton( parent, IDC_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 );
-    item73->Add( item76, 0, wxALIGN_CENTER, 5 );
+    item73->Add( item76, wxSizerFlags().Center().Border(wxALL, 5) );
 
     item73->Add( 20, 20, wxSizerFlags(1).Center().Border(wxALL, 5) );
     wxButton *item77 = new wxButton( parent, IDC_APPLY_AND_CLOSE, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
-    item73->Add( item77, 0, wxALIGN_CENTER, 5 );
+    item73->Add( item77, wxSizerFlags().Center().Border(wxALL, 5) );
 
     item73->Add( 20, 20, wxSizerFlags(1).Center().Border(wxALL, 5) );
     wxButton *item78 = new wxButton( parent, ID_CLOSEWNDFD, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -701,10 +844,10 @@
 
     wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
 
-    CMuleTextCtrl *item4 = new CMuleTextCtrl( parent, IDC_CMT_TEXT, "", wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+    CMuleTextCtrl *item4 = new CMuleTextCtrl( item2, IDC_CMT_TEXT, "", wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
     item4->SetToolTip( _("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.") );
     item3->Add( item4, wxSizerFlags(1).CenterVertical().Border(wxALL, 5) );
-    wxButton *item5 = new wxButton( parent, IDC_FC_CLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item5 = new wxButton( item2, IDC_FC_CLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item5, wxSizerFlags().Center().Border(wxALL, 5) );
     item1->Add( item3, wxSizerFlags().Expand().CenterVertical() );
     item0->Add( item1, wxSizerFlags(1).Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxTOP, 5) );
@@ -722,7 +865,7 @@
         _("Good"), 
         _("Excellent")
     };
-    wxChoice *item9 = new wxChoice( parent, IDC_RATELIST, wxDefaultPosition, wxDefaultSize, 6, strs9, 0 );
+    wxChoice *item9 = new wxChoice( item8, IDC_RATELIST, wxDefaultPosition, wxDefaultSize, 6, strs9, 0 );
     item9->SetToolTip( _("Choose the file rating or advice users if the file is invalid ...") );
     item7->Add( item9, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
     item6->Add( item7, wxSizerFlags(1).Expand().CenterHorizontal().Border(wxALL, 0) );
@@ -746,7 +889,7 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    CMuleListCtrl *item1 = new CMuleListCtrl( parent, IDC_LST, wxDefaultPosition, wxSize(600,270), wxLC_REPORT|wxSUNKEN_BORDER );
+    wxListCtrl *item1 = new wxListCtrl( parent, IDC_LST, wxDefaultPosition, wxSize(600,270), wxLC_REPORT|wxSUNKEN_BORDER );
     item0->Add( item1, wxSizerFlags(1).Expand().CenterVertical().Border(wxALL, 5) );
     wxFlexGridSizer *item2 = new wxFlexGridSizer( 1, 0, 0, 0 );
     item2->AddGrowableCol( 3 );
@@ -755,11 +898,13 @@
     item2->Add( item3, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     wxStaticText *item4 = new wxStaticText( parent, IDC_CMSTATUS, _("No comments"), wxDefaultPosition, wxDefaultSize, 0 );
     item4->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
-    item2->Add( item4, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item2->Add( item4, wxSizerFlags().CenterVertical() );
 
     wxStaticText *item5 = new wxStaticText( parent, -1, ")", wxDefaultPosition, wxDefaultSize, 0 );
-    item2->Add( item5, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item2->Add( item5, wxSizerFlags().CenterVertical() );
 
+    wxButton *itemKad = new wxButton( parent, IDC_CMSEARCHKAD, _("Get from Kad"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( itemKad, wxSizerFlags().CenterVertical().Right().Border(wxALL, 5) );
     wxButton *item6 = new wxButton( parent, IDCREF, _("Refresh"), wxDefaultPosition, wxDefaultSize, 0 );
     item2->Add( item6, wxSizerFlags().CenterVertical().Right().Border(wxALL, 5) );
     wxButton *item7 = new wxButton( parent, IDCOK, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -813,13 +958,13 @@
 
     wxFlexGridSizer *item3 = new wxFlexGridSizer( 2, 0, 0 );
 
-    wxStaticText *item4 = new wxStaticText( parent, -1, _("IP Address :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item4 = new wxStaticText( item2, -1, LabelWithColon( _("IP Address") ), wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item4, wxSizerFlags().CenterVertical().Border(wxRIGHT|wxBOTTOM, 5) );
-    CMuleTextCtrl *item5 = new CMuleTextCtrl( parent, ID_IPADDRESS, "", wxDefaultPosition, wxSize(150,-1), 0 );
+    CMuleTextCtrl *item5 = new CMuleTextCtrl( item2, ID_IPADDRESS, "", wxDefaultPosition, wxSize(150,-1), 0 );
     item3->Add( item5, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item6 = new wxStaticText( parent, -1, _("Port :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item6 = new wxStaticText( item2, -1, LabelWithColon( _("Port") ), wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item6, wxSizerFlags().CenterVertical().Border(wxRIGHT|wxTOP, 5) );
-    CMuleTextCtrl *item7 = new CMuleTextCtrl( parent, ID_IPORT, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    CMuleTextCtrl *item7 = new CMuleTextCtrl( item2, ID_IPORT, "", wxDefaultPosition, wxSize(80,-1), 0 );
     item3->Add( item7, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxTOP, 5) );
     item1->Add( item3, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
@@ -828,13 +973,13 @@
 
     wxFlexGridSizer *item10 = new wxFlexGridSizer( 2, 0, 0 );
 
-    wxStaticText *item11 = new wxStaticText( parent, -1, _("Username :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item11 = new wxStaticText( item9, -1, LabelWithColon( _("Username") ), wxDefaultPosition, wxDefaultSize, 0 );
     item10->Add( item11, wxSizerFlags().CenterVertical().Border(wxRIGHT|wxBOTTOM, 5) );
-    CMuleTextCtrl *item12 = new CMuleTextCtrl( parent, ID_USERNAME, "", wxDefaultPosition, wxSize(250,-1), 0 );
+    CMuleTextCtrl *item12 = new CMuleTextCtrl( item9, ID_USERNAME, "", wxDefaultPosition, wxSize(250,-1), 0 );
     item10->Add( item12, wxSizerFlags().CenterVertical().Border(wxLEFT|wxBOTTOM, 5) );
-    wxStaticText *item13 = new wxStaticText( parent, -1, _("Userhash :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item13 = new wxStaticText( item9, -1, LabelWithColon( _("Userhash") ), wxDefaultPosition, wxDefaultSize, 0 );
     item10->Add( item13, wxSizerFlags().CenterVertical().Border(wxRIGHT|wxBOTTOM, 5) );
-    CMuleTextCtrl *item14 = new CMuleTextCtrl( parent, ID_USERHASH, "", wxDefaultPosition, wxSize(250,-1), 0 );
+    CMuleTextCtrl *item14 = new CMuleTextCtrl( item9, ID_USERHASH, "", wxDefaultPosition, wxSize(250,-1), 0 );
     item10->Add( item14, wxSizerFlags().CenterVertical().Border(wxLEFT|wxBOTTOM, 5) );
     item8->Add( item10, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     item0->Add( item8, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
@@ -886,118 +1031,114 @@
     wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Download-Speed") );
     wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
 
-    wxWindow *item3 = new COScopeCtrl(3,1,GRAPH_DOWN,parent);
+    wxWindow *item3 = new COScopeCtrl(3,1,GRAPH_DOWN,item2);
 item3->SetName("dloadScope");
     wxASSERT( item3 );
     item1->Add( item3, wxSizerFlags(1).Expand().Border(wxALL, 5) );
-    wxFlexGridSizer *item4 = new wxFlexGridSizer( 2, 0, 0 );
-    item4->AddGrowableCol( 0 );
-    item4->AddGrowableCol( 1 );
+    // Responsive legend: a wrap sizer keeps all three entries on one row
+    // when the graph is wide, and wraps them to 2/1 columns as it narrows.
+    wxWrapSizer *item4 = new wxWrapSizer( wxHORIZONTAL );
 
     wxBoxSizer *item5 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item6 = new CColorFrameCtrl(parent,IDC_C0,20,14);
+    wxWindow *item6 = new CColorFrameCtrl(item2,IDC_C0,20,14);
     wxASSERT( item6 );
     item5->Add( item6, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item7 = new wxStaticText( parent, -1, _("Current"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item7 = new wxStaticText( item2, -1, _("Current"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->Add( item7, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item4->Add( item5, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     wxBoxSizer *item8 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item9 = new CColorFrameCtrl(parent,IDC_C0_3,20,14);
+    wxWindow *item9 = new CColorFrameCtrl(item2,IDC_C0_3,20,14);
     wxASSERT( item9 );
     item8->Add( item9, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item10 = new wxStaticText( parent, -1, _("Running average"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item10 = new wxStaticText( item2, -1, _("Running average"), wxDefaultPosition, wxDefaultSize, 0 );
     item8->Add( item10, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item4->Add( item8, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     wxBoxSizer *item11 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item12 = new CColorFrameCtrl(parent,IDC_C0_2,20,14);
+    wxWindow *item12 = new CColorFrameCtrl(item2,IDC_C0_2,20,14);
     wxASSERT( item12 );
     item11->Add( item12, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item13 = new wxStaticText( parent, -1, _("Session average"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item13 = new wxStaticText( item2, -1, _("Session average"), wxDefaultPosition, wxDefaultSize, 0 );
     item11->Add( item13, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item4->Add( item11, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
-    item1->Add( item4, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxTOP, 5) );
+    item1->Add( item4, wxSizerFlags().Expand().Border(wxLEFT|wxRIGHT|wxTOP, 5) );
     item0->Add( item1, wxSizerFlags(1).Expand().Border(wxBOTTOM, 5) );
     wxStaticBox *item15 = new wxStaticBox( parent, -1, _("Upload-Speed") );
     wxStaticBoxSizer *item14 = new wxStaticBoxSizer( item15, wxVERTICAL );
 
-    wxWindow *item16 = new COScopeCtrl(3,1,GRAPH_UP,parent);
+    wxWindow *item16 = new COScopeCtrl(3,1,GRAPH_UP,item15);
 item16->SetName("uloadScope");
     wxASSERT( item16 );
     item14->Add( item16, wxSizerFlags(1).Expand().Border(wxALL, 5) );
-    wxFlexGridSizer *item17 = new wxFlexGridSizer( 2, 0, 0 );
-    item17->AddGrowableCol( 0 );
-    item17->AddGrowableCol( 1 );
+    wxWrapSizer *item17 = new wxWrapSizer( wxHORIZONTAL );
 
     wxBoxSizer *item18 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item19 = new CColorFrameCtrl(parent,IDC_C1,20,14);
+    wxWindow *item19 = new CColorFrameCtrl(item15,IDC_C1,20,14);
     wxASSERT( item19 );
     item18->Add( item19, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item20 = new wxStaticText( parent, -1, _("Current"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item20 = new wxStaticText( item15, -1, _("Current"), wxDefaultPosition, wxDefaultSize, 0 );
     item18->Add( item20, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item17->Add( item18, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     wxBoxSizer *item21 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item22 = new CColorFrameCtrl(parent,IDC_C1_3,20,14);
+    wxWindow *item22 = new CColorFrameCtrl(item15,IDC_C1_3,20,14);
     wxASSERT( item22 );
     item21->Add( item22, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item23 = new wxStaticText( parent, -1, _("Running average"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item23 = new wxStaticText( item15, -1, _("Running average"), wxDefaultPosition, wxDefaultSize, 0 );
     item21->Add( item23, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item17->Add( item21, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     wxBoxSizer *item24 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item25 = new CColorFrameCtrl(parent,IDC_C1_2,20,14);
+    wxWindow *item25 = new CColorFrameCtrl(item15,IDC_C1_2,20,14);
     wxASSERT( item25 );
     item24->Add( item25, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item26 = new wxStaticText( parent, -1, _("Session average"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item26 = new wxStaticText( item15, -1, _("Session average"), wxDefaultPosition, wxDefaultSize, 0 );
     item24->Add( item26, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item17->Add( item24, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
-    item14->Add( item17, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxTOP, 5) );
+    item14->Add( item17, wxSizerFlags().Expand().Border(wxLEFT|wxRIGHT|wxTOP, 5) );
     item0->Add( item14, wxSizerFlags(1).Expand().Border(wxBOTTOM, 5) );
     wxStaticBox *item28 = new wxStaticBox( parent, -1, _("Connections") );
     wxStaticBoxSizer *item27 = new wxStaticBoxSizer( item28, wxVERTICAL );
 
-    wxWindow *item29 = new COScopeCtrl(3,0,GRAPH_CONN,parent);
+    wxWindow *item29 = new COScopeCtrl(3,0,GRAPH_CONN,item28);
 item29->SetName("otherScope");
     wxASSERT( item29 );
     item27->Add( item29, wxSizerFlags(1).Expand().Border(wxALL, 5) );
-    wxFlexGridSizer *item30 = new wxFlexGridSizer( 2, 0, 0 );
-    item30->AddGrowableCol( 0 );
-    item30->AddGrowableCol( 1 );
+    wxWrapSizer *item30 = new wxWrapSizer( wxHORIZONTAL );
 
     wxBoxSizer *item31 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item32 = new CColorFrameCtrl(parent,IDC_S3,20,14);
+    wxWindow *item32 = new CColorFrameCtrl(item28,IDC_S3,20,14);
     wxASSERT( item32 );
     item31->Add( item32, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item33 = new wxStaticText( parent, -1, _("Active downloads"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item33 = new wxStaticText( item28, -1, _("Active downloads"), wxDefaultPosition, wxDefaultSize, 0 );
     item31->Add( item33, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item30->Add( item31, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     wxBoxSizer *item34 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item35 = new CColorFrameCtrl(parent,IDC_S0,20,14);
+    wxWindow *item35 = new CColorFrameCtrl(item28,IDC_S0,20,14);
     wxASSERT( item35 );
     item34->Add( item35, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item36 = new wxStaticText( parent, ID_ACTIVEC, _("Active connections (1:1)"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item36 = new wxStaticText( item28, ID_ACTIVEC, _("Active connections (1:1)"), wxDefaultPosition, wxDefaultSize, 0 );
     item34->Add( item36, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item30->Add( item34, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     wxBoxSizer *item37 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item38 = new CColorFrameCtrl(parent,IDC_S1,20,14);
+    wxWindow *item38 = new CColorFrameCtrl(item28,IDC_S1,20,14);
     wxASSERT( item38 );
     item37->Add( item38, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item39 = new wxStaticText( parent, -1, _("Active uploads"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item39 = new wxStaticText( item28, -1, _("Active uploads"), wxDefaultPosition, wxDefaultSize, 0 );
     item37->Add( item39, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item30->Add( item37, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
-    item27->Add( item30, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxTOP, 5) );
+    item27->Add( item30, wxSizerFlags().Expand().Border(wxLEFT|wxRIGHT|wxTOP, 5) );
     item0->Add( item27, wxSizerFlags(1).Expand().Border(wxALL, 5) );
     wxStaticBox *item41 = new wxStaticBox( parent, -1, _("Statistics Tree") );
     wxStaticBoxSizer *item40 = new wxStaticBoxSizer( item41, wxVERTICAL );
 
-    wxTreeCtrl *item42 = new wxTreeCtrl( parent, -1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxSUNKEN_BORDER );
+    wxTreeCtrl *item42 = new wxTreeCtrl( item41, -1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxSUNKEN_BORDER );
     item42->SetName( "statTree" );
     item40->Add( item42, wxSizerFlags(1).Expand().Border(wxALL, 5) );    item0->Add( item40, wxSizerFlags(1).Expand().Border(wxALL, 5) );
     if (set_sizer)
@@ -1021,75 +1162,80 @@
 
     wxBoxSizer *item4 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticText *item5 = new wxStaticText( parent, -1, _("Username:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item5 = new wxStaticText( item2, -1, LabelWithColon( _("Username") ), wxDefaultPosition, wxDefaultSize, 0 );
     item4->Add( item5, wxSizerFlags().Expand().Border(wxALL, 5) );
-    wxStaticText *item6 = new wxStaticText( parent, -1, _("Userhash:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item6 = new wxStaticText( item2, -1, LabelWithColon( _("Userhash") ), wxDefaultPosition, wxDefaultSize, 0 );
     item4->Add( item6, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    item3->Add( item4, 0, wxALIGN_CENTER, 5 );
+    item3->Add( item4, wxSizerFlags().Center() );
 
     wxBoxSizer *item7 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticText *item8 = new wxStaticText( parent, ID_DNAME, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item8 = new wxStaticText( item2, ID_DNAME, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item8->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item7->Add( item8, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    wxStaticText *item9 = new wxStaticText( parent, ID_DHASH, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item9 = new wxStaticText( item2, ID_DHASH, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item9->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item7->Add( item9, wxSizerFlags().Expand().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    item3->Add( item7, 0, wxALIGN_CENTER, 5 );
+    item3->Add( item7, wxSizerFlags().Center() );
 
     item1->Add( item3, wxSizerFlags().Expand().CenterVertical() );
     wxFlexGridSizer *item10 = new wxFlexGridSizer( 5, 0, 0 );
     item10->AddGrowableCol( 1 );
     item10->AddGrowableCol( 4 );
 
-    wxStaticText *item11 = new wxStaticText( parent, -1, _("Client software:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item11 = new wxStaticText( item2, -1, LabelWithColon( _("Client software") ), wxDefaultPosition, wxDefaultSize, 0 );
     item10->Add( item11, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item12 = new wxStaticText( parent, ID_DSOFT, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item12 = new wxStaticText( item2, ID_DSOFT, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item12->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item10->Add( item12, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item10->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
 
-    wxStaticText *item13 = new wxStaticText( parent, -1, _("Client version:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item13 = new wxStaticText( item2, -1, LabelWithColon( _("Client version") ), wxDefaultPosition, wxDefaultSize, 0 );
     item10->Add( item13, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item14 = new wxStaticText( parent, ID_DVERSION, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item14 = new wxStaticText( item2, ID_DVERSION, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item14->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item10->Add( item14, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item15 = new wxStaticText( parent, -1, _("IP address:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item15 = new wxStaticText( item2, -1, LabelWithColon( _("IP Address") ), wxDefaultPosition, wxDefaultSize, 0 );
     item10->Add( item15, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item16 = new wxStaticText( parent, ID_DIP, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item16 = new wxStaticText( item2, ID_DIP, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item16->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item10->Add( item16, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item10->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
 
-    wxStaticText *item17 = new wxStaticText( parent, -1, _("User ID:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item17 = new wxStaticText( item2, -1, LabelWithColon( _("User ID") ), wxDefaultPosition, wxDefaultSize, 0 );
     item10->Add( item17, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item18 = new wxStaticText( parent, ID_DID, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item18 = new wxStaticText( item2, ID_DID, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item18->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item10->Add( item18, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item19 = new wxStaticText( parent, -1, _("Server IP:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item19 = new wxStaticText( item2, -1, LabelWithColon( _("Server IP") ), wxDefaultPosition, wxDefaultSize, 0 );
     item10->Add( item19, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item20 = new wxStaticText( parent, ID_DSIP, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item20 = new wxStaticText( item2, ID_DSIP, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item20->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item10->Add( item20, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item10->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
 
-    wxStaticText *item21 = new wxStaticText( parent, -1, _("Server name:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item21 = new wxStaticText( item2, -1, LabelWithColon( _("Server name") ), wxDefaultPosition, wxDefaultSize, 0 );
     item10->Add( item21, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item22 = new wxStaticText( parent, ID_DSNAME, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item22 = new wxStaticText( item2, ID_DSNAME, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item22->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item10->Add( item22, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item23 = new wxStaticText( parent, -1, _("Obfuscation:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item23 = new wxStaticText( item2, -1, LabelWithColon( _("Obfuscation") ), wxDefaultPosition, wxDefaultSize, 0 );
     item10->Add( item23, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item24 = new wxStaticText( parent, IDT_OBFUSCATION, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item24 = new wxStaticText( item2, IDT_OBFUSCATION, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item24->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item10->Add( item24, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item10->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
 
-    wxStaticText *item25 = new wxStaticText( parent, -1, _("Kad:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item25 = new wxStaticText( item2, -1, LabelWithColon( _("Kad") ), wxDefaultPosition, wxDefaultSize, 0 );
     item10->Add( item25, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item26 = new wxStaticText( parent, IDT_KAD, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item26 = new wxStaticText( item2, IDT_KAD, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item26->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item10->Add( item26, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
+    wxStaticText *item26a = new wxStaticText( item2, IDT_MOD_CAPABILITIES_LABEL, LabelWithColon( _("Protocol extensions") ), wxDefaultPosition, wxDefaultSize, 0 );
+    item10->Add( item26a, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
+    wxStaticText *item26b = new wxStaticText( item2, IDT_MOD_CAPABILITIES, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    item26b->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
+    item10->Add( item26b, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item1->Add( item10, wxSizerFlags().Expand().CenterVertical() );
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     wxStaticBox *item28 = new wxStaticBox( parent, -1, _("Transfers to client") );
@@ -1097,9 +1243,9 @@
 
     wxBoxSizer *item29 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item30 = new wxStaticText( parent, -1, _("Current request:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item30 = new wxStaticText( item28, -1, LabelWithColon( _("Current request") ), wxDefaultPosition, wxDefaultSize, 0 );
     item29->Add( item30, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
-    wxStaticText *item31 = new wxStaticText( parent, ID_DDOWNLOADING, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item31 = new wxStaticText( item28, ID_DDOWNLOADING, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item31->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item29->Add( item31, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     item27->Add( item29, wxSizerFlags().Expand().CenterVertical() );
@@ -1107,40 +1253,40 @@
     item32->AddGrowableCol( 1 );
     item32->AddGrowableCol( 4 );
 
-    wxStaticText *item33 = new wxStaticText( parent, -1, _("Average upload rate:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item33 = new wxStaticText( item28, -1, LabelWithColon( _("Average upload rate") ), wxDefaultPosition, wxDefaultSize, 0 );
     item32->Add( item33, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item34 = new wxStaticText( parent, ID_DAVDR, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item34 = new wxStaticText( item28, ID_DAVDR, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item34->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item32->Add( item34, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item32->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
 
-    wxStaticText *item35 = new wxStaticText( parent, -1, _("Average download rate:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item35 = new wxStaticText( item28, -1, LabelWithColon( _("Average download rate") ), wxDefaultPosition, wxDefaultSize, 0 );
     item32->Add( item35, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item36 = new wxStaticText( parent, ID_DAVUR, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item36 = new wxStaticText( item28, ID_DAVUR, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item36->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item32->Add( item36, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item37 = new wxStaticText( parent, -1, _("Uploaded (session):"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item37 = new wxStaticText( item28, -1, LabelWithColon( _("Uploaded (session)") ), wxDefaultPosition, wxDefaultSize, 0 );
     item32->Add( item37, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item38 = new wxStaticText( parent, ID_DDOWN, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item38 = new wxStaticText( item28, ID_DDOWN, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item38->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item32->Add( item38, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item32->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
 
-    wxStaticText *item39 = new wxStaticText( parent, -1, _("Downloaded (session):"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item39 = new wxStaticText( item28, -1, LabelWithColon( _("Downloaded (session)") ), wxDefaultPosition, wxDefaultSize, 0 );
     item32->Add( item39, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item40 = new wxStaticText( parent, ID_DDUP, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item40 = new wxStaticText( item28, ID_DDUP, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item40->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item32->Add( item40, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item41 = new wxStaticText( parent, -1, _("Uploaded (total):"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item41 = new wxStaticText( item28, -1, LabelWithColon( _("Uploaded (total)") ), wxDefaultPosition, wxDefaultSize, 0 );
     item32->Add( item41, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item42 = new wxStaticText( parent, ID_DDOWNTOTAL, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item42 = new wxStaticText( item28, ID_DDOWNTOTAL, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item42->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item32->Add( item42, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item32->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
 
-    wxStaticText *item43 = new wxStaticText( parent, -1, _("Downloaded (total):"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item43 = new wxStaticText( item28, -1, LabelWithColon( _("Downloaded (total)") ), wxDefaultPosition, wxDefaultSize, 0 );
     item32->Add( item43, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item44 = new wxStaticText( parent, ID_DUPTOTAL, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item44 = new wxStaticText( item28, ID_DUPTOTAL, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item44->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item32->Add( item44, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item27->Add( item32, wxSizerFlags().Expand().CenterVertical() );
@@ -1152,28 +1298,28 @@
     item47->AddGrowableCol( 1 );
     item47->AddGrowableCol( 4 );
 
-    wxStaticText *item48 = new wxStaticText( parent, -1, _("DL/UP modifier:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item48 = new wxStaticText( item46, -1, LabelWithColon( _("DL/UP modifier") ), wxDefaultPosition, wxDefaultSize, 0 );
     item47->Add( item48, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
-    wxStaticText *item49 = new wxStaticText( parent, ID_DRATIO, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item49 = new wxStaticText( item46, ID_DRATIO, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item49->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item47->Add( item49, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     item47->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
 
-    wxStaticText *item50 = new wxStaticText( parent, -1, _("Secure ident:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item50 = new wxStaticText( item46, -1, LabelWithColon( _("Secure ident") ), wxDefaultPosition, wxDefaultSize, 0 );
     item47->Add( item50, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
-    wxStaticText *item51 = new wxStaticText( parent, IDC_CDIDENT, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item51 = new wxStaticText( item46, IDC_CDIDENT, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item51->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item47->Add( item51, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    wxStaticText *item52 = new wxStaticText( parent, -1, _("Queue rank:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item52 = new wxStaticText( item46, -1, LabelWithColon( _("Queue rank") ), wxDefaultPosition, wxDefaultSize, 0 );
     item47->Add( item52, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item53 = new wxStaticText( parent, ID_QUEUERANK, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item53 = new wxStaticText( item46, ID_QUEUERANK, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item53->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item47->Add( item53, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item47->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
 
-    wxStaticText *item54 = new wxStaticText( parent, -1, _("Queue score:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item54 = new wxStaticText( item46, -1, LabelWithColon( _("Queue score") ), wxDefaultPosition, wxDefaultSize, 0 );
     item47->Add( item54, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxStaticText *item55 = new wxStaticText( parent, ID_DSCORE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item55 = new wxStaticText( item46, ID_DSCORE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item55->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item47->Add( item55, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item45->Add( item47, wxSizerFlags().Expand().CenterVertical() );
@@ -1198,7 +1344,7 @@
     wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Nick") );
     wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
 
-    CMuleTextCtrl *item3 = new CMuleTextCtrl( parent, IDC_NICK, _("https://amule-org.github.io - the multi-platform Mule"), wxDefaultPosition, wxSize(90,-1), 0 );
+    CMuleTextCtrl *item3 = new CMuleTextCtrl( item2, IDC_NICK, _("https://amule-org.github.io - 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, wxSizerFlags().Expand().CenterVertical() );
     item0->Add( item1, wxSizerFlags().Expand().CenterHorizontal() );
@@ -1214,18 +1360,34 @@
     item6->SetToolTip( _("This specifies the language used on controls.") );
     item4->Add( item6, wxSizerFlags().Expand().CenterVertical() );
     item0->Add( item4, wxSizerFlags().Expand().CenterHorizontal() );
-    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") );
+    wxCheckBox *item7 = new wxCheckBox( parent, IDC_NEWVERSION, _("Periodically check for a new version"), wxDefaultPosition, wxDefaultSize, 0 );
+    item7->SetToolTip( _("Enabling this will make aMule check for a new version at startup and once a day while running") );
     item0->Add( item7, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    // Autostart-on-login toggle (per-OS backend: Windows registry,
-    // macOS LaunchAgent, Linux XDG .desktop). State is read live from
-    // the OS each time this page opens, never persisted in aMule.conf
-    // — the OS is the source of truth.
+    // Autostart-on-login toggle (per-OS backend: Windows registry, macOS LaunchAgent, Linux XDG
+    // .desktop). State is read live from the OS each time this page opens, never persisted in
+    // aMule.conf -- the OS is the source of truth.
     wxCheckBox *itemAutostart = new wxCheckBox( parent, IDC_AUTOSTART_LOGIN, _("Start aMule automatically when I log in"), wxDefaultPosition, wxDefaultSize, 0 );
     itemAutostart->SetToolTip( _("Registers a per-user autostart entry with the OS so aMule launches at login. If you move the aMule binary, launch aMule once manually afterwards to refresh the entry.") );
     item0->Add( itemAutostart, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
+    // URL-scheme handler toggles. Same OS-is-source-of-truth model as autostart above: state lives
+    // in HKCU\Software\Classes\<scheme> (Windows), $XDG_CONFIG_HOME/mimeapps.list (Linux), or
+    // LaunchServices (macOS), never in aMule.conf.
+    wxCheckBox *itemProtoEd2k = new wxCheckBox( parent, IDC_PROTOCOL_ED2K, _("Register aMule for ed2k:// links"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemProtoEd2k->SetToolTip( _("Makes aMule the default handler for ed2k:// links so clicking one in your browser or file manager opens it here.") );
+    item0->Add( itemProtoEd2k, 0, wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxCheckBox *itemProtoMagnet = new wxCheckBox( parent, IDC_PROTOCOL_MAGNET, _("Register aMule for magnet: links"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemProtoMagnet->SetToolTip( _("aMule only handles eD2k-compatible magnets (containing xt=urn:ed2k:). BitTorrent magnets are NOT supported and clicking them will silently fail. If you use a BitTorrent client (Transmission, qBittorrent, etc.), leave this off.") );
+    item0->Add( itemProtoMagnet, 0, wxALIGN_CENTER_VERTICAL, 0 );
+
+    // Same OS-is-source-of-truth model as the scheme toggles above; the store is the ProgID under
+    // HKCU\Software\Classes (Windows), mimeapps.list (Linux) or LaunchServices (macOS).
+    wxCheckBox *itemAssocCollection = new wxCheckBox( parent, IDC_ASSOC_COLLECTION, _("Open .emulecollection files with aMule"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemAssocCollection->SetToolTip( _("Opening a collection queues every eD2k link it contains. On Windows this adds aMule to the \"Open with\" list and takes the default only when no other program has claimed the file type.") );
+    item0->Add( itemAssocCollection, 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 );
@@ -1240,7 +1402,7 @@
     item0->Add( item11, wxSizerFlags().Expand().CenterVertical() );
 
     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 );
+    item0->Add( item10, wxSizerFlags().CenterVertical() );
 
     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.") );
@@ -1250,6 +1412,13 @@
     item13->SetToolTip( _("Enabling this will make aMule to show notifications when finished downloading.") );
     item0->Add( item13, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
+    // Query history for the Search tab's Name field (amule-org/amule#641). A client-side-only
+    // setting (no EC or core involvement), so this one checkbox works unchanged in both amule and
+    // amuleGUI.
+    wxCheckBox *itemSearchHistory = new wxCheckBox( parent, IDC_SEARCHHISTORYENABLED, _("Remember search history"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemSearchHistory->SetToolTip( _("Keeps a dropdown list of your past search terms in the Search tab's Name field. This remembers the queries you typed, not the results they returned.") );
+    item0->Add( itemSearchHistory, 0, wxALIGN_CENTER_VERTICAL, 0 );
+
     wxBoxSizer *item14 = new wxBoxSizer( wxHORIZONTAL );
 
     wxStaticText *item15 = new wxStaticText( parent, -1, _("Tooltip delay time: "), wxDefaultPosition, wxDefaultSize, 0 );
@@ -1268,15 +1437,15 @@
 
     wxBoxSizer *item20 = new wxBoxSizer( wxHORIZONTAL );
 
-    CMuleTextCtrl *item21 = new CMuleTextCtrl( parent, IDC_BROWSERSELF, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    CMuleTextCtrl *item21 = new CMuleTextCtrl( item19, IDC_BROWSERSELF, "", wxDefaultPosition, wxSize(80,-1), 0 );
     item21->SetToolTip( _("Enter your browser name here. Leave this field empty to use the system default browser.") );
-    item20->Add( item21, 1, wxGROW, 0 );
+    item20->Add( item21, wxSizerFlags(1).Expand() );
 
-    wxButton *item22 = new wxButton( parent, IDC_SELBROWSER, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    item20->Add( item22, 0, wxGROW, 0 );
+    wxButton *item22 = new wxButton( item19, IDC_SELBROWSER, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    item20->Add( item22, wxSizerFlags().Expand() );
 
     item18->Add( item20, wxSizerFlags().Expand().CenterVertical() );
-    wxCheckBox *item23 = new wxCheckBox( parent, IDC_BROWSERTABS, _("Open in new tab if possible"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item23 = new wxCheckBox( item19, IDC_BROWSERTABS, _("Open in new tab if possible"), wxDefaultPosition, wxDefaultSize, 0 );
     item23->SetValue( TRUE );
     item23->SetToolTip( _("Open the web page in a new tab instead of in a new window when possible") );
     item18->Add( item23, 0, wxALIGN_CENTER_VERTICAL, 0 );
@@ -1287,12 +1456,12 @@
 
     wxBoxSizer *item26 = new wxBoxSizer( wxHORIZONTAL );
 
-    CMuleTextCtrl *item27 = new CMuleTextCtrl( parent, IDC_VIDEOPLAYER, "mplayer -idx", wxDefaultPosition, wxSize(80,-1), 0 );
+    CMuleTextCtrl *item27 = new CMuleTextCtrl( item25, IDC_VIDEOPLAYER, "mplayer -idx", wxDefaultPosition, wxSize(80,-1), 0 );
     item26->Add( item27, wxSizerFlags(1).Expand().CenterHorizontal() );
-    wxButton *item28 = new wxButton( parent, IDC_BROWSEV, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item28 = new wxButton( item25, IDC_BROWSEV, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
     item26->Add( item28, wxSizerFlags().Expand().CenterHorizontal() );
     item24->Add( item26, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item29 = new wxStaticText( parent, IDC_PREVIEW_NOTE, "", wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item29 = new wxStaticText( item25, IDC_PREVIEW_NOTE, "", wxDefaultPosition, wxDefaultSize, 0 );
     item24->Add( item29, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
     item0->Add( item24, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     if (set_sizer)
@@ -1315,28 +1484,28 @@
     wxFlexGridSizer *item3 = new wxFlexGridSizer( 3, 0, 0 );
     item3->AddGrowableCol( 0 );
 
-    wxStaticText *item4 = new wxStaticText( parent, -1, _("Download"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item4 = new wxStaticText( item2, -1, _("Download"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item4, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxSpinCtrl *item5 = new wxSpinCtrl( parent, IDC_MAXDOWN, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 1000000, 0 );
+    wxSpinCtrl *item5 = new wxSpinCtrl( item2, IDC_MAXDOWN, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 1000000, 0 );
     item3->Add( item5, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxStaticText *item6 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item6 = new wxStaticText( item2, -1, _("KiB/s"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item6, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
-    wxStaticText *item7 = new wxStaticText( parent, -1, _("Upload"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item7 = new wxStaticText( item2, -1, _("Upload"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item7, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxSpinCtrl *item8 = new wxSpinCtrl( parent, IDC_MAXUP, "10", wxDefaultPosition, wxDefaultSize, 0, 0, 1000000, 10 );
-    item3->Add( item8, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxSpinCtrl *item8 = new wxSpinCtrl( item2, IDC_MAXUP, "10", wxDefaultPosition, wxDefaultSize, 0, 0, 1000000, 10 );
+    item3->Add( item8, wxSizerFlags().CenterVertical() );
 
-    wxStaticText *item9 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item9 = new wxStaticText( item2, -1, _("KiB/s"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item9, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
-    wxStaticText *item10 = new wxStaticText( parent, -1, _("Slot Allocation"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item10 = new wxStaticText( item2, -1, _("Slot Allocation"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item10, wxSizerFlags().CenterVertical().Border(wxLEFT, 20) );
-    wxSpinCtrl *item11 = new wxSpinCtrl( parent, IDC_SLOTALLOC, "10", wxDefaultPosition, wxDefaultSize, 0, 1, 100000, 10 );
-    item3->Add( item11, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxSpinCtrl *item11 = new wxSpinCtrl( item2, IDC_SLOTALLOC, "10", wxDefaultPosition, wxDefaultSize, 0, 1, 100000, 10 );
+    item3->Add( item11, wxSizerFlags().CenterVertical() );
 
-    wxStaticText *item12 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item12 = new wxStaticText( item2, -1, _("KiB/s"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item12, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     item1->Add( item3, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     item0->Add( item1, wxSizerFlags().Expand().CenterHorizontal() );
@@ -1346,33 +1515,33 @@
     wxFlexGridSizer *item15 = new wxFlexGridSizer( 2, 0, 0 );
     item15->AddGrowableCol( 0 );
 
-    wxStaticText *item16 = new wxStaticText( parent, -1, _("Standard TCP Port "), wxDefaultPosition, wxDefaultSize, 0 );
-    item15->Add( item16, 0, wxALIGN_CENTER_VERTICAL, 10 );
+    wxStaticText *item16 = new wxStaticText( item14, -1, _("Standard TCP Port "), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item16, wxSizerFlags().CenterVertical() );
 
-    wxSpinCtrl *item17 = new wxSpinCtrl( parent, IDC_PORT, "4662", wxDefaultPosition, wxDefaultSize, 0, 0, 65531, 4662 );
+    wxSpinCtrl *item17 = new wxSpinCtrl( item14, IDC_PORT, "4662", wxDefaultPosition, wxDefaultSize, 0, 0, 65531, 4662 );
     item17->SetToolTip( _("This is the standard eD2k port and cannot be disabled.") );
-    item15->Add( item17, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item15->Add( item17, wxSizerFlags().CenterVertical() );
 
-    wxStaticText *item18 = new wxStaticText( parent, -1, _("UDP port for server requests (TCP+3):"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item18 = new wxStaticText( item14, -1, _("UDP port for server requests (TCP+3):"), wxDefaultPosition, wxDefaultSize, 0 );
     item15->Add( item18, wxSizerFlags().CenterVertical().Border(wxALL, 0) );
-    wxStaticText *item19 = new wxStaticText( parent, ID_TEXT_CLIENT_UDP_PORT, _("4665"), wxDefaultPosition, wxDefaultSize, 0 );
-    item15->Add( item19, 0, wxALIGN_CENTER_VERTICAL, 10 );
+    wxStaticText *item19 = new wxStaticText( item14, ID_TEXT_CLIENT_UDP_PORT, _("4665"), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item19, wxSizerFlags().CenterVertical() );
 
-    wxCheckBox *item20 = new wxCheckBox( parent, IDC_UDPENABLE, _("Extended UDP port (Kad / global search) "), wxDefaultPosition, wxDefaultSize, 0 );
-    item15->Add( item20, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item20 = new wxCheckBox( item14, IDC_UDPENABLE, _("Extended UDP port (Kad / global search) "), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item20, wxSizerFlags().CenterVertical() );
 
-    wxSpinCtrl *item21 = new wxSpinCtrl( parent, IDC_UDPPORT, "4672", wxDefaultPosition, wxDefaultSize, 0, 0, 65535, 4672 );
+    wxSpinCtrl *item21 = new wxSpinCtrl( item14, IDC_UDPPORT, "4672", wxDefaultPosition, wxDefaultSize, 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 );
+    item15->Add( item21, wxSizerFlags().Center() );
 
-    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 );
+    wxCheckBox *item22 = new wxCheckBox( item14, IDC_UPNP_ENABLED, _("Enable UPnP for router port forwarding"), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item22, wxSizerFlags().CenterVertical() );
 
     item15->Add( 20, 20, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticText *item23 = new wxStaticText( parent, IDC_UPNPTCPPORTTEXT, _("UPnP TCP Port (Optional):"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item23 = new wxStaticText( item14, IDC_UPNPTCPPORTTEXT, _("UPnP TCP Port (Optional):"), wxDefaultPosition, wxDefaultSize, 0 );
     item15->Add( item23, wxSizerFlags().CenterVertical().Border(wxLEFT, 20) );
-    wxSpinCtrl *item24 = new wxSpinCtrl( parent, IDC_UPNPTCPPORT, "50000", wxDefaultPosition, wxDefaultSize, 0, 0, 65535, 50000 );
-    item15->Add( item24, 0, wxALIGN_CENTER, 5 );
+    wxSpinCtrl *item24 = new wxSpinCtrl( item14, IDC_UPNPTCPPORT, "50000", wxDefaultPosition, wxDefaultSize, 0, 0, 65535, 50000 );
+    item15->Add( item24, wxSizerFlags().Center() );
 
     item13->Add( item15, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     item0->Add( item13, wxSizerFlags().Expand().CenterVertical() );
@@ -1383,7 +1552,23 @@
     item25->Add( item26, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
     wxTextCtrl *item27 = new wxTextCtrl( parent, IDC_ADDRESS, "", 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, wxSizerFlags().Expand().CenterHorizontal() );
+    item25->Add( item27, wxSizerFlags().Expand() );
+
+    wxStaticText *item26b = new wxStaticText( parent, IDC_INTERFACETEXT, _("Bind to network interface (empty for any):"), wxDefaultPosition, wxDefaultSize, 0 );
+    item25->Add( item26b, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
+#ifdef CLIENT_GUI
+    // Remote GUI: a plain text field. amulegui runs on a different host than the daemon, so a drop-
+    // down of *this* machine's interfaces would be misleading; the operator types the daemon-side
+    // interface name, synced over EC.
+    wxTextCtrl *item27b = new wxTextCtrl( parent, IDC_INTERFACE, "", wxDefaultPosition, wxSize(120,-1), 0 );
+#else
+    // Editable combo: the drop-down is filled at runtime with the machine's interfaces
+    // (PrefsUnifiedDlg), but it stays editable so an interface that is down when the dialog opens,
+    // such as a VPN tunnel, can still be typed in.
+    wxComboBox *item27b = new wxComboBox( parent, IDC_INTERFACE, "", wxDefaultPosition, wxSize(120,-1), 0, NULL, wxCB_DROPDOWN );
+#endif
+    item27b->SetToolTip( _("Advanced users only: pin all of aMule's traffic to one network interface, chosen from the list or typed in by name (e.g. tun0, eth0, en0) or index. Unlike binding to an IP, this stops traffic leaking out via the default route - useful with a VPN. Requires no elevated privileges.") );
+    item25->Add( item27b, wxSizerFlags().Expand() );
     item0->Add( item25, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 0) );
     wxFlexGridSizer *item28 = new wxFlexGridSizer( 2, 0, 0 );
     item28->AddGrowableCol( 0 );
@@ -1402,22 +1587,22 @@
     wxStaticBox *item35 = new wxStaticBox( parent, -1, _("Networks") );
     wxStaticBoxSizer *item34 = new wxStaticBoxSizer( item35, wxHORIZONTAL );
 
-    wxCheckBox *item36 = new wxCheckBox( parent, IDC_NETWORKKAD, _("Kademlia"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item36 = new wxCheckBox( item35, IDC_NETWORKKAD, _("Kademlia"), wxDefaultPosition, wxDefaultSize, 0 );
     item36->SetValue( TRUE );
     item34->Add( item36, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
-    wxCheckBox *item37 = new wxCheckBox( parent, IDC_NETWORKED2K, _("ED2K"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item37 = new wxCheckBox( item35, IDC_NETWORKED2K, _("ED2K"), wxDefaultPosition, wxDefaultSize, 0 );
     item37->SetValue( TRUE );
     item34->Add( item37, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
     item33->Add( item34, wxSizerFlags(1).Expand().Border(wxLEFT|wxRIGHT, 0) );
     wxStaticBox *item39 = new wxStaticBox( parent, -1, "" );
     wxStaticBoxSizer *item38 = new wxStaticBoxSizer( item39, wxVERTICAL );
 
-    wxCheckBox *item40 = new wxCheckBox( parent, IDC_AUTOCONNECT, _("Autoconnect on startup"), wxDefaultPosition, wxDefaultSize, 0 );
-    item38->Add( item40, 0, wxALIGN_CENTER_VERTICAL, 10 );
+    wxCheckBox *item40 = new wxCheckBox( item39, IDC_AUTOCONNECT, _("Autoconnect on startup"), wxDefaultPosition, wxDefaultSize, 0 );
+    item38->Add( item40, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
 
-    wxCheckBox *item41 = new wxCheckBox( parent, IDC_RECONN, _("Reconnect on loss"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item41 = new wxCheckBox( item39, IDC_RECONN, _("Reconnect on loss"), wxDefaultPosition, wxDefaultSize, 0 );
     item41->SetValue( TRUE );
-    item38->Add( item41, 0, wxALIGN_CENTER_VERTICAL, 10 );
+    item38->Add( item41, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 5) );
 
     item33->Add( item38, wxSizerFlags().Expand().Border(wxLEFT|wxRIGHT, 5) );
     item0->Add( item33, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
@@ -1438,6 +1623,7 @@
     wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
 
     wxCheckBox *item2 = new wxCheckBox( parent, IDC_REMOVEDEAD, _("Remove dead server after"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->SetToolTip( _("Static servers are never removed, even when unreachable.") );
     item1->Add( item2, wxSizerFlags().Center().Border(wxRIGHT, 5) );
     wxSpinCtrl *item3 = new wxSpinCtrl( parent, IDC_SERVERRETRIES, "2", wxDefaultPosition, wxDefaultSize, 0, 1, 10, 2 );
     item1->Add( item3, wxSizerFlags().CenterVertical().Right() );
@@ -1447,35 +1633,35 @@
     wxBoxSizer *item5 = 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 );
+    item5->Add( item6, wxSizerFlags().CenterVertical() );
 
     wxButton *item7 = new wxButton( parent, IDC_EDITADR, _("List"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->Add( item7, wxSizerFlags().CenterVertical().Right().Border(wxLEFT, 5) );
     item0->Add( item5, wxSizerFlags().Expand().CenterVertical() );
     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 );
+    item0->Add( item8, wxSizerFlags().CenterVertical() );
 
     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 );
+    item0->Add( item9, wxSizerFlags().CenterVertical() );
 
     wxCheckBox *item10 = new wxCheckBox( parent, IDC_SCORE, _("Use priority system"), wxDefaultPosition, wxDefaultSize, 0 );
     item10->SetValue( TRUE );
-    item0->Add( item10, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item10, wxSizerFlags().CenterVertical() );
 
     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 );
+    item0->Add( item11, wxSizerFlags().CenterVertical() );
 
     wxCheckBox *item12 = new wxCheckBox( parent, IDC_SAFESERVERCONNECT, _("Safe connect"), wxDefaultPosition, wxDefaultSize, 0 );
     item12->SetValue( TRUE );
-    item0->Add( item12, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item12, wxSizerFlags().CenterVertical() );
 
     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 );
+    item0->Add( item13, wxSizerFlags().CenterVertical() );
 
     wxCheckBox *item14 = new wxCheckBox( parent, IDC_MANUALSERVERHIGHPRIO, _("Set manually added servers to High Priority"), wxDefaultPosition, wxDefaultSize, 0 );
     item14->SetValue( TRUE );
-    item0->Add( item14, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item14, wxSizerFlags().CenterVertical() );
 
     if (set_sizer)
     {
@@ -1491,68 +1677,123 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    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, _("Enable"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->SetValue( TRUE );
-    item1->Add( item3, wxSizerFlags().CenterVertical().Border(wxRIGHT, 0) );
-    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, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     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 );
+    wxCheckBox *item7 = new wxCheckBox( item6, IDC_ADDNEWFILESPAUSED, _("Add files to download in pause mode"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->Add( item7, wxSizerFlags().CenterVertical().Border(wxRIGHT, 0) );
-    wxCheckBox *item8 = new wxCheckBox( parent, IDC_DAP, _("Add files to download with auto priority"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item8 = new wxCheckBox( item6, IDC_DAP, _("Add files to download with auto priority"), wxDefaultPosition, wxDefaultSize, 0 );
     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 );
+    wxCheckBox *item9 = new wxCheckBox( item6, IDC_PREVIEWPRIO, _("Try to download first and last chunks first"), wxDefaultPosition, wxDefaultSize, 0 );
     item9->SetValue( TRUE );
     item5->Add( item9, wxSizerFlags().CenterVertical().Border(wxRIGHT, 0) );
-    wxCheckBox *item10 = new wxCheckBox( parent, IDC_STARTNEXTFILE, _("Start next paused file when a file completes"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    wxCheckBox *itemEndgame = new wxCheckBox( item6, IDC_ENDGAME, _("Endgame mode: rotate to faster sources for the final blocks"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemEndgame->SetValue( FALSE );
+    item5->Add( itemEndgame, wxSizerFlags().CenterVertical().Border(wxRIGHT, 0) );
+    wxCheckBox *item10 = new wxCheckBox( item6, IDC_STARTNEXTFILE, _("Start next paused file when a file completes"), wxDefaultPosition, wxDefaultSize, 0 );
     item10->SetValue( TRUE );
     item5->Add( item10, wxSizerFlags().CenterVertical().Border(wxRIGHT, 0) );
-    wxCheckBox *item11 = new wxCheckBox( parent, IDC_STARTNEXTFILE_SAME, _("From the same category"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item11 = new wxCheckBox( item6, IDC_STARTNEXTFILE_SAME, _("From the same category"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->Add( item11, wxSizerFlags().CenterVertical().Border(wxLEFT, 20) );
-    wxCheckBox *item12 = new wxCheckBox( parent, IDC_STARTNEXTFILE_ALPHA, _("In alphabetic order"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item12 = new wxCheckBox( item6, IDC_STARTNEXTFILE_ALPHA, _("In alphabetic order"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->Add( item12, wxSizerFlags().CenterVertical().Border(wxLEFT, 20) );
-    wxCheckBox *item13 = new wxCheckBox( parent, IDC_ALLOCFULLFILE, _("Preallocate disk space for new files"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item13 = new wxCheckBox( item6, 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, wxSizerFlags().CenterVertical().Border(wxTOP, 0) );
+    // /eMule/CreateSparseFiles was EC-wired and settable via the Web UI but had no control here or
+    // in amuleGUI -- hand-editing amule.conf was the only way. Only does real work when the *core*
+    // runs on Windows. Always created and bound here: amuleGUI has no EC capability tag to know the
+    // core's platform, so it always shows the control, and the monolithic non-Windows build hides
+    // it post-creation in PrefsUnifiedDlg's ctor rather than skipping creation, so the Cfg_Tmpl
+    // binding still has a widget.
+    wxCheckBox *itemCreateSparse = new wxCheckBox( item6, IDC_CREATEFILESSPARSE, _("Create new files as sparse files"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemCreateSparse->SetToolTip( _("Sparse part files only occupy disk space for the parts already downloaded, so free space is used up gradually as the file fills in. Turn this off to use an ordinary file instead - useful where sparse files are unsupported or slow, or where backup/de-duplication tools handle them badly. Applies only when the core runs on Windows; on Linux and macOS part files are sparse anyway and this setting has no effect.") );
+    item5->Add( itemCreateSparse, wxSizerFlags().CenterVertical().Border(wxTOP, 0) );
     wxFlexGridSizer *item14 = new wxFlexGridSizer( 3, 0, 0 );
     item14->AddGrowableCol( 0 );
 
-    wxCheckBox *item15 = new wxCheckBox( parent, IDC_CHECKDISKSPACE, _("Stop downloads when free disk space reaches "), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item15 = new wxCheckBox( item6, 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 );
 
-    wxSpinCtrl *item16 = new wxSpinCtrl( parent, IDC_MINDISKSPACE, "1", wxDefaultPosition, wxDefaultSize, 0, 1, 1000000, 1 );
+    wxSpinCtrl *item16 = new wxSpinCtrl( item6, IDC_MINDISKSPACE, "1", wxDefaultPosition, wxDefaultSize, 0, 1, 1000000, 1 );
     item16->SetToolTip( _("Enter here the min disk space desired.") );
     item14->Add( item16, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxStaticText *item17 = new wxStaticText( parent, -1, _("MB"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item17 = new wxStaticText( item6, -1, _("MiB"), wxDefaultPosition, wxDefaultSize, 0 );
     item14->Add( item17, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item5->Add( item14, wxSizerFlags().Expand().CenterVertical() );
-    wxCheckBox *item18 = new wxCheckBox( parent, IDC_SRCSEEDS, _("Save 10 sources on rare files (< 20 sources)"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item18 = new wxCheckBox( item6, IDC_SRCSEEDS, _("Save 10 sources on rare files (< 20 sources)"), wxDefaultPosition, wxDefaultSize, 0 );
     item18->SetValue( TRUE );
     item5->Add( item18, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     item0->Add( item5, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     wxStaticBox *item20 = new wxStaticBox( parent, -1, _("Uploads") );
     wxStaticBoxSizer *item19 = new wxStaticBoxSizer( item20, wxVERTICAL );
 
-    wxCheckBox *item21 = new wxCheckBox( parent, IDC_UAP, _("Add new shared files with auto priority"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item21 = new wxCheckBox( item20, IDC_UAP, _("Add new shared files with auto priority"), wxDefaultPosition, wxDefaultSize, 0 );
     item19->Add( item21, wxSizerFlags().CenterVertical().Border(wxRIGHT, 0) );
     item0->Add( item19, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 0) );
+
+    // Intelligent Corruption Handling -- an advanced option, placed after the
+    // Downloads / Uploads groups (issue #594).
+    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Intelligent Corruption Handling (I.C.H.)") );
+    wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
+
+    wxCheckBox *item3 = new wxCheckBox( item2, IDC_ICH, _("Enable"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->SetValue( TRUE );
+    item1->Add( item3, wxSizerFlags().CenterVertical().Border(wxRIGHT, 0) );
+    wxCheckBox *item4 = new wxCheckBox( item2, 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, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
+
+    // Media metadata extraction: an optional feature that runs ffprobe against each shared file at
+    // share-add / known.met load time to populate FT_MEDIA_LENGTH / _BITRATE / _CODEC on the
+    // CKnownFile; the ed2k and Kad publishers then advertise those tags automatically. The enable
+    // toggle and the path field are EC-wired and stay visible in amulegui; only "Browse" and
+    // "Detect" hide there, since both would search the GUI's filesystem.
+    wxStaticBox *item22 = new wxStaticBox( parent, -1, _("Media metadata extraction") );
+    wxStaticBoxSizer *item22sz = new wxStaticBoxSizer( item22, wxVERTICAL );
+
+    wxCheckBox *item23 = new wxCheckBox( item22, IDC_MEDIAMETA_ENABLED,
+        _("Extract length / bitrate / codec from shared audio and video files"),
+        wxDefaultPosition, wxDefaultSize, 0 );
+    item23->SetToolTip( _("When enabled, aMule runs ffprobe on each shared media file to fill in the Length / Bitrate / Codec columns other clients see when they find the file in a search. Requires ffmpeg (the ffprobe binary) to be installed.") );
+    item22sz->Add( item23, wxSizerFlags().CenterVertical().Border(wxRIGHT, 0) );
+
+    wxFlexGridSizer *item24 = new wxFlexGridSizer( 4, 0, 0 );
+    item24->AddGrowableCol( 1 );
+
+    wxStaticText *item25 = new wxStaticText( item22, IDC_MEDIAMETA_FFPROBEPATHTEXT,
+        _("Path to ffprobe:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item24->Add( item25, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
+
+    CMuleTextCtrl *item26 = new CMuleTextCtrl( item22, IDC_MEDIAMETA_FFPROBEPATH,
+        "", wxDefaultPosition, wxSize(80,-1), 0 );
+    item26->SetToolTip( _("Full path to the ffprobe binary. Leave empty to have aMule auto-detect it on startup.") );
+    item24->Add( item26, wxSizerFlags(1).Expand().CenterVertical() );
+
+    wxButton *item27 = new wxButton( item22, IDC_MEDIAMETA_FFPROBEBROWSE,
+        _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    item24->Add( item27, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
+
+    wxButton *item28 = new wxButton( item22, IDC_MEDIAMETA_FFPROBEDETECT,
+        _("Detect"), wxDefaultPosition, wxDefaultSize, 0 );
+    item28->SetToolTip( _("Search the standard install locations for an ffprobe binary and fill the path field.") );
+    item24->Add( item28, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
+
+    item22sz->Add( item24, wxSizerFlags().Expand().CenterVertical() );
+    item0->Add( item22sz, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 0) );
+
     if (set_sizer)
     {
         parent->SetSizer( item0 );
         if (call_fit)
             item0->SetSizeHints( parent );
     }
-    
+
     return item0;
 }
 
@@ -1563,10 +1804,10 @@
     wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Destination folder for downloads") );
     wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxHORIZONTAL );
 
-    CMuleTextCtrl *item3 = new CMuleTextCtrl( parent, IDC_INCFILES, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    CMuleTextCtrl *item3 = new CMuleTextCtrl( item2, IDC_INCFILES, "", wxDefaultPosition, wxSize(80,-1), 0 );
     item3->SetToolTip(_("Completed downloads are stored here. All files in this folder are automatically shared with other peers.\nIf this folder also holds files you don't want to share, point it at an aMule-only sub-folder."));
     item1->Add( item3, wxSizerFlags(1).Expand().CenterHorizontal() );
-    wxButton *item4 = new wxButton( parent, IDC_SELINCDIR, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item4 = new wxButton( item2, IDC_SELINCDIR, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
     item4->SetToolTip(_("Pick the folder where completed downloads will be stored. All files in that folder will be shared with other peers."));
     item1->Add( item4, wxSizerFlags().Expand().CenterHorizontal() );
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
@@ -1576,36 +1817,83 @@
     wxStaticBox *item6 = new wxStaticBox( parent, -1, _("Folder for temporary download files") );
     wxStaticBoxSizer *item5 = new wxStaticBoxSizer( item6, wxHORIZONTAL );
 
-    CMuleTextCtrl *item7 = new CMuleTextCtrl( parent, IDC_TEMPFILES, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    CMuleTextCtrl *item7 = new CMuleTextCtrl( item6, IDC_TEMPFILES, "", wxDefaultPosition, wxSize(80,-1), 0 );
     item5->Add( item7, wxSizerFlags(1).Expand().CenterHorizontal() );
-    wxButton *item8 = new wxButton( parent, IDC_SELTEMPDIR, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item8 = new wxButton( item6, IDC_SELTEMPDIR, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->Add( item8, wxSizerFlags().Expand().CenterHorizontal() );
     item0->Add( item5, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     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 );
+#ifdef CLIENT_GUI
+    // Remote GUI: the daemon's filesystem isn't ours to browse, so the roots
+    // are edited as an explicit path list synced over EC instead of a tree.
+    wxStaticText *itemSDHint = new wxStaticText( item10, -1, _("(Folders shared by the core. Enter a path to add one.)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    item9->Add( itemSDHint, 0, wxALIGN_CENTER, 0 );
+
+    wxListCtrl *itemSDList = new wxListCtrl( item10, IDC_SHAREDDIRS_LIST, wxDefaultPosition, wxSize(100,100), wxLC_REPORT|wxLC_SINGLE_SEL|wxSUNKEN_BORDER );
+    item9->Add( itemSDList, wxSizerFlags(1).Expand().CenterVertical() );
+
+    wxBoxSizer *itemSDAddRow = new wxBoxSizer( wxHORIZONTAL );
+    CMuleTextCtrl *itemSDPath = new CMuleTextCtrl( item10, IDC_SHAREDDIR_PATH, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    itemSDPath->SetToolTip(_("Absolute path of a folder on the core's machine, e.g. /home/user/shared"));
+    itemSDAddRow->Add( itemSDPath, wxSizerFlags(1).Expand().CenterVertical() );
+    wxCheckBox *itemSDRecursive = new wxCheckBox( item10, IDC_SHAREDDIR_RECURSIVE, _("Recursive"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemSDRecursive->SetToolTip(_("Share every sub-folder underneath this one, including ones created later."));
+    itemSDAddRow->Add( itemSDRecursive, wxSizerFlags().CenterVertical().Border(wxLEFT, 4) );
+    wxButton *itemSDAdd = new wxButton( item10, IDC_SHAREDDIR_ADD, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemSDAddRow->Add( itemSDAdd, wxSizerFlags().CenterVertical().Border(wxLEFT, 4) );
+    wxButton *itemSDRemove = new wxButton( item10, IDC_SHAREDDIR_REMOVE, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemSDAddRow->Add( itemSDRemove, wxSizerFlags().CenterVertical().Border(wxLEFT, 4) );
+    item9->Add( itemSDAddRow, wxSizerFlags().Expand().Border(wxTOP, 4) );
+#else
+    wxStaticText *item11 = new wxStaticText( item10, -1, _("(Right click on folder icon for recursive share)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
     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(item10, IDC_SHARESELECTOR, wxPoint(0,0), wxSize(100,100), wxSUNKEN_BORDER|wxTR_DEFAULT_STYLE|wxTR_HIDE_ROOT );
     wxASSERT( item12 );
     item9->Add( item12, wxSizerFlags(1).Expand().CenterVertical() );
-    wxCheckBox *item13 = new wxCheckBox( parent, IDC_SHAREHIDDENFILES, _("Share hidden files"), wxDefaultPosition, wxDefaultSize, 0 );
+#endif
+    wxCheckBox *item13 = new wxCheckBox( item10, IDC_SHAREHIDDENFILES, _("Share hidden files"), wxDefaultPosition, wxDefaultSize, 0 );
     item13->SetValue( TRUE );
     item9->Add( item13, 0, wxALIGN_CENTER_VERTICAL, 0 );
-    // Auto-rescan toggle. When on, the fs-watcher reflects changes in
-    // the shared dirs without a manual reload; new subdirs created under
-    // any path in the tree above are auto-shared.
-    wxCheckBox *itemAutoRescan = new wxCheckBox( parent, IDC_AUTO_RESCAN_SHARED, _("Automatically rescan shared folders for changes"), wxDefaultPosition, wxDefaultSize, 0 );
+    // Auto-rescan toggle. When on, the fs-watcher reflects changes in the shared dirs without a
+    // manual reload; new subdirs created under any path in the tree above are auto-shared.
+    wxCheckBox *itemAutoRescan = new wxCheckBox( item10, IDC_AUTO_RESCAN_SHARED, _("Automatically rescan shared folders for changes"), wxDefaultPosition, wxDefaultSize, 0 );
     itemAutoRescan->SetValue( TRUE );
     item9->Add( itemAutoRescan, 0, wxALIGN_CENTER_VERTICAL, 0 );
-    // Follow-symlinks toggle. Default on to preserve historical
-    // behaviour; off makes the iterator pass wxDIR_NO_FOLLOW so symlinks
-    // (file or directory) are not traversed by the shared-folder walk.
-    wxCheckBox *itemFollowSymlinks = new wxCheckBox( parent, IDC_FOLLOW_SYMLINKS_SHARED, _("Follow symbolic links in shared folders"), wxDefaultPosition, wxDefaultSize, 0 );
+    // Follow-symlinks toggle. Default on to preserve historical behaviour; off makes the iterator
+    // pass wxDIR_NO_FOLLOW so symlinks, file or directory, are not traversed by the shared-folder
+    // walk.
+    wxCheckBox *itemFollowSymlinks = new wxCheckBox( item10, IDC_FOLLOW_SYMLINKS_SHARED, _("Follow symbolic links in shared folders"), wxDefaultPosition, wxDefaultSize, 0 );
     itemFollowSymlinks->SetValue( TRUE );
     item9->Add( itemFollowSymlinks, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
+    // Shared-file exclusion filter: files whose name matches are not shared.
+    wxBoxSizer *itemExcludeRow = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *itemExcludeLabel = new wxStaticText( item10, -1, _("Exclude files matching:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemExcludeRow->Add( itemExcludeLabel, wxSizerFlags().CenterVertical().Border(wxRIGHT, 4) );
+    CMuleTextCtrl *itemExcludePatterns = new CMuleTextCtrl( item10, IDC_EXCLUDE_SHARE_PATTERNS, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    itemExcludePatterns->SetToolTip(_("Wildcard patterns separated by '|', e.g. .DS_Store|Thumbs.db|*.tmp. Files whose name matches are not shared. Matching is case-insensitive."));
+    itemExcludeRow->Add( itemExcludePatterns, wxSizerFlags(1).Expand().CenterVertical() );
+    item9->Add( itemExcludeRow, wxSizerFlags().Expand().Border(wxTOP, 4) );
+
+    wxCheckBox *itemExcludeRegex = new wxCheckBox( item10, IDC_EXCLUDE_SHARE_REGEX, _("Patterns are regular expressions"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemExcludeRegex->SetToolTip(_("When set, the whole field is one regular expression ('|' is alternation). When unset, it is a list of '|'-separated wildcards."));
+    item9->Add( itemExcludeRegex, 0, wxALIGN_CENTER_VERTICAL, 0 );
+
+    // Live preview: how many currently-shared files the typed pattern would exclude. Needs the
+    // core's in-memory shared list, which the remote GUI does not have; this file is built once
+    // into muleappgui with CLIENT_GUI undefined, so PrefsUnifiedDlg removes the button and info at
+    // runtime there. The pattern/regex fields still work and sync over EC.
+    wxBoxSizer *itemPreviewRow = new wxBoxSizer( wxHORIZONTAL );
+    wxButton *itemPreviewBtn = new wxButton( item10, IDC_EXCLUDE_SHARE_PREVIEW, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemPreviewBtn->SetToolTip(_("Show how many shared files the current pattern would exclude."));
+    itemPreviewRow->Add( itemPreviewBtn, wxSizerFlags().CenterVertical().Border(wxRIGHT, 6) );
+    wxStaticText *itemPreviewInfo = new wxStaticText( item10, IDC_EXCLUDE_SHARE_PREVIEW_INFO, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    itemPreviewRow->Add( itemPreviewInfo, wxSizerFlags(1).CenterVertical() );
+    item9->Add( itemPreviewRow, wxSizerFlags().Expand().Border(wxTOP, 4) );
+
     item0->Add( item9, wxSizerFlags(1).Expand().CenterVertical().Border(wxALL, 0) );
     if (set_sizer)
     {
@@ -1617,6 +1905,65 @@
     return item0;
 }
 
+#ifdef CLIENT_GUI
+wxSizer *PreferencesPathMappingTab( wxWindow *parent, bool call_fit, bool set_sizer )
+{
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticText *itemHint = new wxStaticText( parent, IDC_PATHMAP_HINT, _("When the connected core's files live on a different machine, map a path prefix it reports to where that filesystem is reachable from here (a network share, say) so \"Open\" and \"Show in folder\" work."), wxDefaultPosition, wxDefaultSize, 0 );
+    // An unwrapped wxStaticText reports its whole single line as its best width, and the sizer
+    // turns that into the page's minimum width -- the dialog comes up as wide as this sentence. So
+    // it is wrapped here to bound that minimum, DPI-scaled rather than a raw pixel count.
+    // PrefsUnifiedDlg then re-flows it to the control's real width and keeps it current across
+    // resizes; it restores this text before each wrap, since Wrap() can only add breaks.
+    itemHint->Wrap( parent->FromDIP(380) );
+    item0->Add( itemHint, wxSizerFlags().Expand().Border(wxBOTTOM, 6) );
+
+    wxStaticBox *itemBox = new wxStaticBox( parent, -1, _("Path Mappings") );
+    wxStaticBoxSizer *itemBoxSizer = new wxStaticBoxSizer( itemBox, wxVERTICAL );
+
+    wxListCtrl *itemList = new wxListCtrl( itemBox, IDC_PATHMAP_LIST, wxDefaultPosition, wxSize(100,100), wxLC_REPORT|wxLC_SINGLE_SEL|wxSUNKEN_BORDER );
+    itemBoxSizer->Add( itemList, wxSizerFlags(1).Expand().CenterVertical() );
+
+    wxBoxSizer *itemRemoteRow = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *itemRemoteLabel = new wxStaticText( itemBox, -1, LabelWithColon( _("Remote prefix") ), wxDefaultPosition, wxDefaultSize, 0 );
+    itemRemoteRow->Add( itemRemoteLabel, wxSizerFlags().CenterVertical().Border(wxRIGHT, 4) );
+    CMuleTextCtrl *itemRemote = new CMuleTextCtrl( itemBox, IDC_PATHMAP_REMOTE, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    itemRemote->SetToolTip(_("A path prefix as the core reports it, e.g. /home/user/downloads/incoming"));
+    itemRemoteRow->Add( itemRemote, wxSizerFlags(1).Expand().CenterVertical() );
+    itemBoxSizer->Add( itemRemoteRow, wxSizerFlags().Expand().Border(wxTOP, 4) );
+
+    wxBoxSizer *itemLocalRow = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *itemLocalLabel = new wxStaticText( itemBox, -1, LabelWithColon( _("Local prefix") ), wxDefaultPosition, wxDefaultSize, 0 );
+    itemLocalRow->Add( itemLocalLabel, wxSizerFlags().CenterVertical().Border(wxRIGHT, 4) );
+    CMuleTextCtrl *itemLocal = new CMuleTextCtrl( itemBox, IDC_PATHMAP_LOCAL, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    itemLocal->SetToolTip(_("Where that same folder is reachable from this computer, e.g. a mounted network share"));
+    itemLocalRow->Add( itemLocal, wxSizerFlags(1).Expand().CenterVertical() );
+    wxButton *itemBrowse = new wxButton( itemBox, IDC_PATHMAP_BROWSE, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemLocalRow->Add( itemBrowse, wxSizerFlags().CenterVertical().Border(wxLEFT, 4) );
+    itemBoxSizer->Add( itemLocalRow, wxSizerFlags().Expand().Border(wxTOP, 4) );
+
+    wxBoxSizer *itemButtonRow = new wxBoxSizer( wxHORIZONTAL );
+    itemButtonRow->AddStretchSpacer( 1 );
+    wxButton *itemAdd = new wxButton( itemBox, IDC_PATHMAP_ADD, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButtonRow->Add( itemAdd, wxSizerFlags().CenterVertical().Border(wxLEFT, 4) );
+    wxButton *itemRemove = new wxButton( itemBox, IDC_PATHMAP_REMOVE, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButtonRow->Add( itemRemove, wxSizerFlags().CenterVertical().Border(wxLEFT, 4) );
+    itemBoxSizer->Add( itemButtonRow, wxSizerFlags().Expand().Border(wxTOP, 4) );
+
+    item0->Add( itemBoxSizer, wxSizerFlags(1).Expand().CenterVertical() );
+
+    if (set_sizer)
+    {
+        parent->SetSizer( item0 );
+        if (call_fit)
+            item0->SetSizeHints( parent );
+    }
+
+    return item0;
+}
+#endif
+
 wxSizer *PreferencesStatisticsTab( wxWindow *parent, bool call_fit, bool set_sizer )
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
@@ -1624,40 +1971,40 @@
     wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Graphs") );
     wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
 
-    wxStaticText *item3 = new wxStaticText( parent, IDC_SLIDERINFO, _("Update delay : 5 secs"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item3 = new wxStaticText( item2, IDC_SLIDERINFO, _("Update delay : 5 secs"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item3, wxSizerFlags().Expand().CenterVertical().Border(wxTOP, 5) );
-    wxSlider *item4 = new wxSlider( parent, IDC_SLIDER, 5, 0, 120, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
+    wxSlider *item4 = new wxSlider( item2, IDC_SLIDER, 5, 0, 120, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
     item1->Add( item4, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item5 = new wxStaticText( parent, IDC_SLIDERINFO3, _("Time for average graph: 100 mins"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item5 = new wxStaticText( item2, IDC_SLIDERINFO3, _("Time for average graph: 100 mins"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item5, wxSizerFlags().Expand().CenterVertical().Border(wxTOP, 5) );
-    wxSlider *item6 = new wxSlider( parent, IDC_SLIDER3, 100, 5, 100, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
+    wxSlider *item6 = new wxSlider( item2, IDC_SLIDER3, 100, 5, 100, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
     item1->Add( item6, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item7 = new wxStaticText( parent, IDC_SLIDERINFO4, _("Connections Graph Scale: 100 "), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item7 = new wxStaticText( item2, IDC_SLIDERINFO4, _("Connections Graph Scale: 100 "), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item7, wxSizerFlags().Expand().CenterVertical().Border(wxTOP, 5) );
-    wxSlider *item8 = new wxSlider( parent, IDC_SLIDER4, 100, 2, 200, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
+    wxSlider *item8 = new wxSlider( item2, IDC_SLIDER4, 100, 2, 200, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
     item1->Add( item8, wxSizerFlags().Expand().CenterVertical() );
     wxFlexGridSizer *item9 = new wxFlexGridSizer( 3, 0, 0 );
     item9->AddGrowableCol( 0 );
 
-    wxStaticText *item10 = new wxStaticText( parent, -1, _("Download graph scale:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item10 = new wxStaticText( item2, -1, _("Download graph scale:"), wxDefaultPosition, wxDefaultSize, 0 );
     item9->Add( item10, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxSpinCtrl *item11 = new wxSpinCtrl( parent, IDC_DOWNLOAD_CAP, "3", wxDefaultPosition, wxDefaultSize, 0, 3, 1000000, 3 );
-    item9->Add( item11, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxSpinCtrl *item11 = new wxSpinCtrl( item2, IDC_DOWNLOAD_CAP, "3", wxDefaultPosition, wxDefaultSize, 0, 3, 1000000, 3 );
+    item9->Add( item11, wxSizerFlags().CenterVertical() );
 
-    wxStaticText *item12 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item12 = new wxStaticText( item2, -1, _("KiB/s"), wxDefaultPosition, wxDefaultSize, 0 );
     item9->Add( item12, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
-    wxStaticText *item13 = new wxStaticText( parent, -1, _("Upload graph scale:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item13 = new wxStaticText( item2, -1, _("Upload graph scale:"), wxDefaultPosition, wxDefaultSize, 0 );
     item9->Add( item13, wxSizerFlags().CenterVertical().Border(wxTOP, 5) );
-    wxSpinCtrl *item14 = new wxSpinCtrl( parent, IDC_UPLOAD_CAP, "3", wxDefaultPosition, wxDefaultSize, 0, 3, 1000000, 3 );
+    wxSpinCtrl *item14 = new wxSpinCtrl( item2, IDC_UPLOAD_CAP, "3", wxDefaultPosition, wxDefaultSize, 0, 3, 1000000, 3 );
     item9->Add( item14, wxSizerFlags().CenterVertical().Border(wxTOP, 5) );
-    wxStaticText *item15 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item15 = new wxStaticText( item2, -1, _("KiB/s"), wxDefaultPosition, wxDefaultSize, 0 );
     item9->Add( item15, wxSizerFlags().CenterVertical().Border(wxLEFT|wxTOP, 5) );
     item1->Add( item9, wxSizerFlags().Expand().CenterVertical().Border(wxTOP, 5) );
     wxFlexGridSizer *item16 = new wxFlexGridSizer( 3, 0, 0 );
     item16->AddGrowableCol( 0 );
 
-    wxStaticText *item17 = new wxStaticText( parent, -1, _("Colors: "), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item17 = new wxStaticText( item2, -1, _("Colors: "), wxDefaultPosition, wxDefaultSize, 0 );
     item16->Add( item17, wxSizerFlags().CenterVertical().Border(wxTOP, 5) );
     wxString strs18 = 
     {
@@ -1677,27 +2024,27 @@
         _("Kad-nodes running"), 
         _("Kad-nodes session")
     };
-    wxChoice *item18 = new wxChoice( parent, IDC_COLORSELECTOR, wxDefaultPosition, wxDefaultSize, 15, strs18, 0 );
+    wxChoice *item18 = new wxChoice( item2, IDC_COLORSELECTOR, wxDefaultPosition, wxDefaultSize, 15, strs18, 0 );
     item16->Add( item18, wxSizerFlags().Expand().CenterHorizontal().Border(wxRIGHT, 5) );
-    wxButton *item19 = new wxButton( parent, IDC_COLOR_BUTTON, _("Select"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item19 = new wxButton( item2, IDC_COLOR_BUTTON, _("Select"), wxDefaultPosition, wxDefaultSize, 0 );
     item16->Add( item19, wxSizerFlags().Expand().Border(wxLEFT, 5) );
     item1->Add( item16, wxSizerFlags().Expand().CenterVertical() );
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     wxStaticBox *item21 = new wxStaticBox( parent, -1, _("Tree") );
     wxStaticBoxSizer *item20 = new wxStaticBoxSizer( item21, wxVERTICAL );
 
-    wxStaticText *item22 = new wxStaticText( parent, IDC_SLIDERINFO2, _("Update delay : 5 secs"), wxDefaultPosition, wxDefaultSize, 0 );
-    item20->Add( item22, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticText *item22 = new wxStaticText( item21, IDC_SLIDERINFO2, _("Update delay : 5 secs"), wxDefaultPosition, wxDefaultSize, 0 );
+    item20->Add( item22, wxSizerFlags().CenterVertical().Border(wxTOP, 5) );
 
-    wxSlider *item23 = new wxSlider( parent, IDC_SLIDER2, 5, 5, 100, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
+    wxSlider *item23 = new wxSlider( item21, IDC_SLIDER2, 5, 5, 100, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
     item20->Add( item23, wxSizerFlags().Expand().CenterVertical() );
     wxBoxSizer *item24 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item25 = new wxStaticText( parent, -1, _("Number of Client Versions shown (0=unlimited)"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item25 = new wxStaticText( item21, -1, _("Number of Client Versions shown (0=unlimited)"), wxDefaultPosition, wxDefaultSize, 0 );
     item24->Add( item25, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxSpinCtrl *item26 = new wxSpinCtrl( parent, IDC_CLIENTVERSIONS, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 255, 0 );
+    wxSpinCtrl *item26 = new wxSpinCtrl( item21, IDC_CLIENTVERSIONS, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 255, 0 );
     item24->Add( item26, wxSizerFlags().Center().Border(wxALL, 5) );
-    item20->Add( item24, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item20->Add( item24, wxSizerFlags().CenterVertical() );
 
     item0->Add( item20, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     if (set_sizer)
@@ -1721,7 +2068,7 @@
     wxStaticText *item2 = new wxStaticText( parent, -1, _("!!! WARNING !!!"), wxDefaultPosition, wxDefaultSize, 0 );
     item2->SetForegroundColour( *wxRED );
     item2->SetFont( wxFont( 24, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL ) );
-    item1->Add( item2, 0, wxALIGN_CENTER, 5 );
+    item1->Add( item2, wxSizerFlags().Center() );
 
     wxStaticText *item3 = new wxStaticText( parent, IDC_AMULE_TWEAKS_WARNING, "", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
     item3->SetForegroundColour( *wxRED );
@@ -1730,24 +2077,35 @@
     wxStaticBox *item5 = new wxStaticBox( parent, -1, "" );
     wxStaticBoxSizer *item4 = new wxStaticBoxSizer( item5, wxVERTICAL );
 
-    wxStaticText *item6 = new wxStaticText( parent, -1, _("Max new connections / 5 secs"), wxDefaultPosition, wxDefaultSize, 0 );
-    item4->Add( item6, wxSizerFlags().CenterVertical().Border(wxTOP, 5) );
-    wxSpinCtrl *item7 = new wxSpinCtrl( parent, IDC_MAXCON5SEC, "20", wxDefaultPosition, wxDefaultSize, 0, 5, 500, 20 );
-    item4->Add( item7, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    // Numeric tuning knobs in a compact two-column grid (label | spin) so the
+    // panel stays short enough that the controls below it are not clipped.
+    wxFlexGridSizer *item6 = new wxFlexGridSizer( 0, 2, 4, 8 );
+    item6->Add( new wxStaticText( item5, -1, _("Max new connections / 5 secs"), wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().CenterVertical() );
+    item6->Add( new wxSpinCtrl( item5, IDC_MAXCON5SEC, "50", wxDefaultPosition, wxDefaultSize, 0, 20, 500, 50 ), wxSizerFlags().CenterVertical() );
+    item6->Add( new wxStaticText( item5, -1, _("Concurrent Kad source lookups"), wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().CenterVertical() );
+    item6->Add( new wxSpinCtrl( item5, IDC_KADMAXSEARCHES, "30", wxDefaultPosition, wxDefaultSize, 0, 5, 50, 30 ), wxSizerFlags().CenterVertical() );
+    item6->Add( new wxStaticText( item5, -1, _("Kad source re-search interval (minutes)"), wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().CenterVertical() );
+    item6->Add( new wxSpinCtrl( item5, IDC_KADREASKTIME, "30", wxDefaultPosition, wxDefaultSize, 0, 30, 60, 30 ), wxSizerFlags().CenterVertical() );
+    item6->Add( new wxStaticText( item5, -1, _("Source re-ask interval (minutes)"), wxDefaultPosition, wxDefaultSize, 0 ), wxSizerFlags().CenterVertical() );
+    item6->Add( new wxSpinCtrl( item5, IDC_SOURCEREASKTIME, "15", wxDefaultPosition, wxDefaultSize, 0, 15, 60, 15 ), wxSizerFlags().CenterVertical() );
+    item4->Add( item6, wxSizerFlags().Border(wxTOP, 5) );
 
-    wxStaticText *item8 = new wxStaticText( parent, IDC_FILEBUFFERSIZE_STATIC, _("File Buffer Size: 240000 bytes"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item8 = new wxStaticText( item5, IDC_FILEBUFFERSIZE_STATIC, _("File Buffer Size: 240000 bytes"), wxDefaultPosition, wxDefaultSize, 0 );
     item4->Add( item8, wxSizerFlags().CenterVertical().Border(wxTOP, 5) );
-    wxSlider *item9 = new wxSlider( parent, IDC_FILEBUFFERSIZE, 16, 1, 100, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
+    wxSlider *item9 = new wxSlider( item5, IDC_FILEBUFFERSIZE, 16, 1, 100, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
     item4->Add( item9, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item10 = new wxStaticText( parent, IDC_QUEUESIZE_STATIC, _("Upload Queue Size: 5000 clients"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *itemMMap = new wxCheckBox( item5, IDC_MMAP_ENABLE, _("Use MMAP: memory-mapped file access (lower memory use)"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemMMap->SetToolTip( _("Maps part files into memory instead of buffering them on the heap, lowering the process memory footprint. May reduce download speed on some disks; best for memory-constrained or upload-heavy hosts.") );
+    item4->Add( itemMMap, wxSizerFlags().CenterVertical().Border(wxTOP, 5) );
+    wxStaticText *item10 = new wxStaticText( item5, IDC_QUEUESIZE_STATIC, _("Upload Queue Size: 5000 clients"), wxDefaultPosition, wxDefaultSize, 0 );
     item4->Add( item10, wxSizerFlags().CenterVertical().Border(wxTOP, 5) );
-    wxSlider *item11 = new wxSlider( parent, IDC_QUEUESIZE, 15, 5, 100, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
+    wxSlider *item11 = new wxSlider( item5, IDC_QUEUESIZE, 15, 5, 100, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
     item4->Add( item11, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item12 = new wxStaticText( parent, IDC_SERVERKEEPALIVE_LABEL, _("Server connection refresh interval: Disable"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item12 = new wxStaticText( item5, IDC_SERVERKEEPALIVE_LABEL, _("Server connection refresh interval: Disable"), wxDefaultPosition, wxDefaultSize, 0 );
     item4->Add( item12, wxSizerFlags().CenterVertical().Border(wxTOP, 5) );
-    wxSlider *item13 = new wxSlider( parent, IDC_SERVERKEEPALIVE, 0, 0, 30, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
+    wxSlider *item13 = new wxSlider( item5, IDC_SERVERKEEPALIVE, 0, 0, 30, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
     item4->Add( item13, wxSizerFlags().Expand().CenterVertical() );
-    wxCheckBox *item14 = new wxCheckBox( parent, IDC_PREVENT_SLEEP, _("Disable computer's timed standby mode"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item14 = new wxCheckBox( item5, IDC_PREVENT_SLEEP, _("Disable computer's timed standby mode"), wxDefaultPosition, wxDefaultSize, 0 );
     item4->Add( item14, wxSizerFlags().CenterVertical().Border(wxTOP|wxBOTTOM, 5) );
     item0->Add( item4, wxSizerFlags().Expand().Border(wxALL, 5) );
     if (set_sizer)
@@ -1756,7 +2114,7 @@
         if (call_fit)
             item0->SetSizeHints( parent );
     }
-    
+
     return item0;
 }
 
@@ -1792,37 +2150,35 @@
     item0->Add( item9, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 20) );
     wxCheckBox *item10 = new wxCheckBox( parent, IDC_SHOWOVERHEAD, _("Show overhead bandwidth"), wxDefaultPosition, wxDefaultSize, 0 );
     item10->SetValue( TRUE );
-    item0->Add( item10, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item10, wxSizerFlags().Expand().CenterVertical() );
 
     wxCheckBox *item11 = new wxCheckBox( parent, IDC_VERTTOOLBAR, _("Vertical toolbar orientation"), wxDefaultPosition, wxDefaultSize, 0 );
     item0->Add( item11, wxSizerFlags().Expand().CenterVertical() );
-    // The "Show country flags for clients" checkbox lives in the dedicated
-    // IP2Country preferences tab (PreferencesIP2CountryTab). The Cfg_Bool
-    // binding stays at IDC_SHOW_COUNTRY_FLAGS so amule.conf
-    // /eMule/GeoIPEnabled stays compatible across versions.
+    wxCheckBox *itemLiveSort = new wxCheckBox( parent, IDC_LIVELISTSORT, _("Live column sorting (auto-reorder rows as their values change)"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemLiveSort->SetValue( TRUE );
+    item0->Add( itemLiveSort, wxSizerFlags().Expand().CenterVertical() );
+    // The "Show country flags for clients" checkbox lives in the dedicated IP2Country preferences
+    // tab. The Cfg_Bool binding stays at IDC_SHOW_COUNTRY_FLAGS so amule.conf /eMule/GeoIPEnabled
+    // stays compatible.
     wxStaticBox *item14 = new wxStaticBox( parent, -1, _("Download Queue Files") );
     wxStaticBoxSizer *item13 = new wxStaticBoxSizer( item14, wxVERTICAL );
 
-    wxCheckBox *item15 = new wxCheckBox( parent, IDC_PERCENT, _("Show progress percentage"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item15 = new wxCheckBox( item14, IDC_PERCENT, _("Show progress percentage"), wxDefaultPosition, wxDefaultSize, 0 );
     item15->SetValue( TRUE );
     item13->Add( item15, wxSizerFlags().Expand().CenterVertical() );
     wxFlexGridSizer *item16 = new wxFlexGridSizer( 4, 0, 0 );
     item16->AddGrowableCol( 0 );
 
-    wxCheckBox *item17 = new wxCheckBox( parent, IDC_PROGBAR, _("Show progress bar"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item17 = new wxCheckBox( item14, IDC_PROGBAR, _("Show progress bar"), wxDefaultPosition, wxDefaultSize, 0 );
     item17->SetValue( TRUE );
     item16->Add( item17, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item18 = new wxStaticText( parent, -1, _("Flat"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item18 = new wxStaticText( item14, -1, _("Flat"), wxDefaultPosition, wxDefaultSize, 0 );
     item16->Add( item18, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
-    wxSlider *item19 = new wxSlider( parent, IDC_3DDEPTH, 5, 0, 5, wxDefaultPosition, wxSize(200,-1), wxSL_HORIZONTAL );
+    wxSlider *item19 = new wxSlider( item14, IDC_3DDEPTH, 5, 0, 5, wxDefaultPosition, wxSize(200,-1), wxSL_HORIZONTAL );
     item16->Add( item19, wxSizerFlags().Expand().CenterVertical() );
-    wxStaticText *item20 = new wxStaticText( parent, -1, _("Round"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item20 = new wxStaticText( item14, -1, _("Round"), wxDefaultPosition, wxDefaultSize, 0 );
     item16->Add( item20, wxSizerFlags().CenterVertical().Right().Border(wxRIGHT, 5) );
     item13->Add( item16, wxSizerFlags(1).Expand().CenterVertical() );
-    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, wxSizerFlags().Expand().CenterVertical() );
     item0->Add( item13, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     if (set_sizer)
     {
@@ -1841,98 +2197,188 @@
     wxStaticBox *item2 = new wxStaticBox( parent, IDC_EXT_CONN_PARAMS_BOX, _("External Connection Parameters") );
     wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
 
-    wxCheckBox *item3 = new wxCheckBox( parent, IDC_EXT_CONN_ACCEPT, _("Accept external connections"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item3, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item3 = new wxCheckBox( item2, IDC_EXT_CONN_ACCEPT, _("Accept external connections"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item3, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
 
     wxFlexGridSizer *item4 = new wxFlexGridSizer( 2, 0, 0 );
     item4->AddGrowableCol( 0 );
     item4->AddGrowableCol( 1 );
 
-    wxStaticText *item5 = new wxStaticText( parent, IDC_EXT_CONN_IPTEXT, _("IP of the listening interface:"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
+    wxStaticText *item5 = new wxStaticText( item2, IDC_EXT_CONN_IPTEXT, _("IP of the listening interface:"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
     item4->Add( item5, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
+#ifdef CLIENT_GUI
+    // Hidden in the remote GUI, as the whole EC-listener config group is, so a plain text field is
+    // enough -- no point offering a drop-down of the wrong host's addresses. See PrefsUnifiedDlg
+    // amuledOnlyPrefs.
     CMuleTextCtrl *item6 = new CMuleTextCtrl( parent, IDC_EXT_CONN_IP, "", wxDefaultPosition, wxDefaultSize, 0 );
+#else
+    // Editable combo filled at runtime with 127.0.0.1, 0.0.0.0 and this machine's own addresses
+    // (PrefsUnifiedDlg); stays editable so an address belonging to an interface that is down right
+    // now can still be typed in.
+    wxComboBox *item6 = new wxComboBox( item2, IDC_EXT_CONN_IP, "", wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_DROPDOWN );
+#endif
     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, wxSizerFlags(1).Expand().CenterVertical().Border(wxLEFT, 5) );
+
+    wxStaticText *item6b = new wxStaticText( item2, IDC_EC_INTERFACETEXT, _("Bind to network interface (empty for any):"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
+    item4->Add( item6b, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
+#ifdef CLIENT_GUI
+    // Hidden in the remote GUI, as the whole EC-listener config group is, so a plain text field is
+    // enough -- no point populating a drop-down of the wrong host's interfaces. See PrefsUnifiedDlg
+    // amuledOnlyPrefs.
+    wxTextCtrl *item6c = new wxTextCtrl( parent, IDC_EC_INTERFACE, "", wxDefaultPosition, wxDefaultSize, 0 );
+#else
+    // Editable combo filled at runtime with the machine's interfaces (PrefsUnifiedDlg); stays
+    // editable so a currently-down interface can be typed in. Binds only aMule's external-
+    // connection (EC) socket.
+    wxComboBox *item6c = new wxComboBox( item2, IDC_EC_INTERFACE, "", wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_DROPDOWN );
+#endif
+    item4->Add( item6c, wxSizerFlags(1).Expand().CenterVertical().Border(wxLEFT, 5) );
     item1->Add( item4, wxSizerFlags().Expand().CenterVertical() );
     wxFlexGridSizer *item7 = new wxFlexGridSizer( 2, 0, 0 );
     item7->AddGrowableCol( 0 );
 
-    wxStaticText *item8 = new wxStaticText( parent, IDC_EXT_CONN_TCPPORTTEXT, _("TCP port:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item8 = new wxStaticText( item2, IDC_EXT_CONN_TCPPORTTEXT, _("TCP port:"), wxDefaultPosition, wxDefaultSize, 0 );
     item7->Add( item8, wxSizerFlags(1).CenterVertical().Border(wxRIGHT, 0) );
-    wxSpinCtrl *item9 = new wxSpinCtrl( parent, IDC_EXT_CONN_TCP_PORT, "10000", wxDefaultPosition, wxDefaultSize, 0, 1025, 65535, 10000 );
-    item7->Add( item9, 0, wxALIGN_CENTER, 5 );
+    wxSpinCtrl *item9 = new wxSpinCtrl( item2, IDC_EXT_CONN_TCP_PORT, "10000", wxDefaultPosition, wxDefaultSize, 0, 1025, 65535, 10000 );
+    item7->Add( item9, wxSizerFlags().Center() );
 
     item1->Add( item7, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
-    wxCheckBox *item10 = new wxCheckBox( parent, IDC_UPNP_EC_ENABLED, _("Enable UPnP port forwarding on the EC port"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item10 = new wxCheckBox( item2, IDC_UPNP_EC_ENABLED, _("Enable UPnP port forwarding on the EC port"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item10, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     wxBoxSizer *item11 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item12 = new wxStaticText( parent, IDC_EXT_CONN_PASSWDTEXT, _("Password"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item12 = new wxStaticText( item2, IDC_EXT_CONN_PASSWDTEXT, _("Password"), wxDefaultPosition, wxDefaultSize, 0 );
     item11->Add( item12, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
-    CMuleTextCtrl *item13 = new CMuleTextCtrl( parent, IDC_EXT_CONN_PASSWD, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
+    CMuleTextCtrl *item13 = new CMuleTextCtrl( item2, IDC_EXT_CONN_PASSWD, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
     item11->Add( item13, wxSizerFlags(1).Center().Border(wxLEFT, 5) );
     item1->Add( item11, wxSizerFlags().Expand().CenterVertical() );
+    wxCheckBox *item13b = new wxCheckBox( item2, IDC_EXT_CONN_REQUIRE_ENCRYPTION, _("Require encrypted connections (rejects clients that cannot encrypt)"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item13b, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
     item0->Add( item1, wxSizerFlags().Expand().Border(wxALL, 0) );
+    wxStaticBox *item37 = new wxStaticBox( parent, -1, _("aMule API server parameters") );
+    wxStaticBoxSizer *item36 = new wxStaticBoxSizer( item37, wxVERTICAL );
+
+    wxCheckBox *item38 = new wxCheckBox( item37, IDC_ENABLE_AMULEAPI, _("Run amuleapi (REST API) on startup"), wxDefaultPosition, wxDefaultSize, 0 );
+    item36->Add( item38, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
+
+    wxBoxSizer *item39 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticText *item40 = new wxStaticText( item37, -1, _("HTTP port:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item39->Add( item40, wxSizerFlags(1).CenterVertical() );
+
+    wxSpinCtrl *item41 = new wxSpinCtrl( item37, IDC_AMULEAPI_PORT, "4713", wxDefaultPosition, wxDefaultSize, 0, 1025, 65535, 4713 );
+    item39->Add( item41, wxSizerFlags().Center() );
+
+    item36->Add( item39, wxSizerFlags().Expand().CenterVertical() );
+
+    wxFlexGridSizer *item42 = new wxFlexGridSizer( 2, 0, 0 );
+    item42->AddGrowableCol( 1 );
+
+    wxStaticText *item43 = new wxStaticText( item37, -1, _("IP of the listening interface:"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
+    item42->Add( item43, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
+    CMuleTextCtrl *item44 = new CMuleTextCtrl( item37, IDC_AMULEAPI_BIND, "", wxDefaultPosition, wxDefaultSize, 0 );
+    item44->SetToolTip( _("The interface amuleapi's HTTP server listens on. 127.0.0.1 (default) accepts only local connections; use 0.0.0.0 or a specific IP to expose it to other hosts (set an admin password below).") );
+    item42->Add( item44, wxSizerFlags(1).Expand().CenterVertical() );
+
+    // Both amuleapi password fields say the same thing: they are requests,
+    // not a view of what is stored.
+    const wxString amuleapiPasswordHint = _("Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one.");
+
+    wxStaticText *item45 = new wxStaticText( item37, -1, _("Admin password"), wxDefaultPosition, wxDefaultSize, 0 );
+    item42->Add( item45, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
+    wxBoxSizer *item46s = new wxBoxSizer( wxHORIZONTAL );
+    CMuleTextCtrl *item46 = new CMuleTextCtrl( item37, IDC_AMULEAPI_PASSWD, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
+    item46->SetToolTip( amuleapiPasswordHint );
+    item46s->Add( item46, wxSizerFlags(1).Expand().CenterVertical() );
+    // Filled in at runtime by PrefsUnifiedDlg: the stored password is hashed and can never be
+    // shown, so this says whether one exists. Constructed with the wider of the two strings it can
+    // hold, not with "": the sizer takes its minimum width from the label present at construction,
+    // so an empty one reserves nothing and GTK then clips whatever SetLabel writes.
+    wxStaticText *item46t = new wxStaticText( item37, IDC_AMULEAPI_PASSWD_STATE, _("A password is set."), wxDefaultPosition, wxDefaultSize, 0 );
+    item46s->Add( item46t, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
+    item42->Add( item46s, wxSizerFlags(1).Expand().CenterVertical() );
+
+    wxCheckBox *item49 = new wxCheckBox( item37, IDC_AMULEAPI_GUEST_ENABLED, _("Enable guest access"), wxDefaultPosition, wxDefaultSize, 0 );
+    item49->SetToolTip( _("Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password.") );
+    item42->Add( item49, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
+    item42->Add( 20, 20, wxSizerFlags().Center().Border(wxALL, 5) );
+
+    wxStaticText *item47 = new wxStaticText( item37, -1, _("Guest password"), wxDefaultPosition, wxDefaultSize, 0 );
+    item42->Add( item47, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
+    wxBoxSizer *item48s = new wxBoxSizer( wxHORIZONTAL );
+    CMuleTextCtrl *item48 = new CMuleTextCtrl( item37, IDC_AMULEAPI_GUEST_PASSWD, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
+    item48->SetToolTip( amuleapiPasswordHint );
+    item48s->Add( item48, wxSizerFlags(1).Expand().CenterVertical() );
+    // Same as the admin one: constructed with the wider of the two strings
+    // so the sizer reserves real width instead of clipping SetLabel.
+    wxStaticText *item48t = new wxStaticText( item37, IDC_AMULEAPI_GUEST_PASSWD_STATE, _("A password is set."), wxDefaultPosition, wxDefaultSize, 0 );
+    item48s->Add( item48t, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
+    item42->Add( item48s, wxSizerFlags(1).Expand().CenterVertical() );
+
+    item36->Add( item42, wxSizerFlags().Expand().CenterVertical() );
+
+    item0->Add( item36, wxSizerFlags().Expand().Border(wxALL, 0) );
     wxStaticBox *item15 = new wxStaticBox( parent, -1, _("Web server parameters") );
     wxStaticBoxSizer *item14 = new wxStaticBoxSizer( item15, wxVERTICAL );
 
-    wxCheckBox *item16 = new wxCheckBox( parent, IDC_ENABLE_WEB, _("Run webserver on startup"), wxDefaultPosition, wxDefaultSize, 0 );
-    item14->Add( item16, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item16 = new wxCheckBox( item15, IDC_ENABLE_WEB, _("Run webserver on startup (deprecated)"), wxDefaultPosition, wxDefaultSize, 0 );
+    item14->Add( item16, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
 
     wxFlexGridSizer *item17 = new wxFlexGridSizer( 2, 0, 0 );
     item17->AddGrowableCol( 1 );
 
-    wxStaticText *item18 = new wxStaticText( parent, -1, _("Web template"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item18 = new wxStaticText( item15, -1, _("Web template"), wxDefaultPosition, wxDefaultSize, 0 );
     item17->Add( item18, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
     wxString *strs19 = (wxString*) NULL;
-    wxChoice *item19 = new wxChoice( parent, IDC_WEBTEMPLATE, wxDefaultPosition, wxSize(200,-1), 0, strs19, 0 );
+    wxChoice *item19 = new wxChoice( item15, IDC_WEBTEMPLATE, wxDefaultPosition, wxSize(200,-1), 0, strs19, 0 );
     item17->Add( item19, wxSizerFlags().CenterVertical().Right() );
-    wxStaticText *item20 = new wxStaticText( parent, -1, _("Full rights password"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item20 = new wxStaticText( item15, -1, _("Full rights password"), wxDefaultPosition, wxDefaultSize, 0 );
     item17->Add( item20, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
-    CMuleTextCtrl *item21 = new CMuleTextCtrl( parent, IDC_WEB_PASSWD, "", wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
-    item17->Add( item21, wxSizerFlags(1).Expand().Right() );
-    wxCheckBox *item22 = new wxCheckBox( parent, IDC_ENABLE_WEB_LOW, _("Enable Low rights User"), wxDefaultPosition, wxDefaultSize, 0 );
+    CMuleTextCtrl *item21 = new CMuleTextCtrl( item15, IDC_WEB_PASSWD, "", wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
+    item17->Add( item21, wxSizerFlags(1).Expand() );
+    wxCheckBox *item22 = new wxCheckBox( item15, IDC_ENABLE_WEB_LOW, _("Enable Low rights User"), wxDefaultPosition, wxDefaultSize, 0 );
     item22->SetValue( TRUE );
-    item17->Add( item22, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item17->Add( item22, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
 
     item17->Add( 20, 20, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticText *item23 = new wxStaticText( parent, -1, _("Low rights password"), wxDefaultPosition, wxDefaultSize, 0 );
-    item17->Add( item23, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 20) );
-    CMuleTextCtrl *item24 = new CMuleTextCtrl( parent, IDC_WEB_PASSWD_LOW, "", wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
+    wxStaticText *item23 = new wxStaticText( item15, -1, _("Low rights password"), wxDefaultPosition, wxDefaultSize, 0 );
+    item17->Add( item23, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
+    CMuleTextCtrl *item24 = new CMuleTextCtrl( item15, IDC_WEB_PASSWD_LOW, "", wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
     item17->Add( item24, wxSizerFlags(1).Expand().CenterVertical() );
     item14->Add( item17, wxSizerFlags().Expand().CenterVertical() );
     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 *item26 = new wxStaticText( item15, -1, _("TCP port:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item25->Add( item26, wxSizerFlags(1).CenterVertical() );
 
-    wxSpinCtrl *item27 = new wxSpinCtrl( parent, IDC_WEB_PORT, "10000", wxDefaultPosition, wxDefaultSize, 0, 1025, 65535, 10000 );
-    item25->Add( item27, 0, wxALIGN_CENTER, 5 );
+    wxSpinCtrl *item27 = new wxSpinCtrl( item15, IDC_WEB_PORT, "10000", wxDefaultPosition, wxDefaultSize, 0, 1025, 65535, 10000 );
+    item25->Add( item27, wxSizerFlags().Center() );
 
     item14->Add( item25, wxSizerFlags().Expand().CenterVertical() );
-    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 );
+    wxCheckBox *item28 = new wxCheckBox( item15, IDC_UPNP_WEBSERVER_ENABLED, _("Enable UPnP port forwarding of the web server port"), wxDefaultPosition, wxDefaultSize, 0 );
+    item14->Add( item28, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
 
     wxBoxSizer *item29 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item30 = new wxStaticText( parent, IDC_WEBUPNPTCPPORTTEXT, _("Web server UPnP TCP port (Optional)"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item30 = new wxStaticText( item15, IDC_WEBUPNPTCPPORTTEXT, _("Web server UPnP TCP port (Optional)"), wxDefaultPosition, wxDefaultSize, 0 );
     item29->Add( item30, wxSizerFlags(1).Center().Border(wxRIGHT, 5) );
-    wxSpinCtrl *item31 = new wxSpinCtrl( parent, IDC_WEBUPNPTCPPORT, "10000", wxDefaultPosition, wxDefaultSize, 0, 1025, 65535, 10000 );
-    item29->Add( item31, 0, wxALIGN_CENTER, 5 );
+    wxSpinCtrl *item31 = new wxSpinCtrl( item15, IDC_WEBUPNPTCPPORT, "10000", wxDefaultPosition, wxDefaultSize, 0, 1025, 65535, 10000 );
+    item29->Add( item31, wxSizerFlags().Center() );
 
     item14->Add( item29, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 20) );
     wxBoxSizer *item32 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item33 = new wxStaticText( parent, -1, _("Page Refresh Time (in secs)"), wxDefaultPosition, wxDefaultSize, 0 );
-    item32->Add( item33, 1, wxALIGN_CENTER, 5 );
+    wxStaticText *item33 = new wxStaticText( item15, -1, _("Page Refresh Time (in secs)"), wxDefaultPosition, wxDefaultSize, 0 );
+    item32->Add( item33, wxSizerFlags(1).Center() );
 
-    wxSpinCtrl *item34 = new wxSpinCtrl( parent, IDC_WEB_REFRESH_TIMEOUT, "120", wxDefaultPosition, wxDefaultSize, 0, 120, 600, 120 );
-    item32->Add( item34, 0, wxALIGN_CENTER, 5 );
+    wxSpinCtrl *item34 = new wxSpinCtrl( item15, IDC_WEB_REFRESH_TIMEOUT, "120", wxDefaultPosition, wxDefaultSize, 0, 120, 600, 120 );
+    item32->Add( item34, wxSizerFlags().Center() );
 
     item14->Add( item32, wxSizerFlags().Expand().CenterVertical() );
-    wxCheckBox *item35 = new wxCheckBox( parent, IDC_WEB_GZIP, _("Enable Gzip compression"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item35 = new wxCheckBox( item15, IDC_WEB_GZIP, _("Enable Gzip compression"), wxDefaultPosition, wxDefaultSize, 0 );
     item35->SetValue( TRUE );
-    item14->Add( item35, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item14->Add( item35, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
 
     item0->Add( item14, wxSizerFlags().Expand().Border(wxALL, 0) );
     if (set_sizer)
@@ -1955,12 +2401,20 @@
     item1->AddGrowableRow( 0 );
     prefs_sizer = item1;
 
-    wxListCtrl *item2 = new wxListCtrl( parent, ID_PREFSLISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_NO_HEADER|wxLC_SINGLE_SEL|wxSUNKEN_BORDER );
-    item1->Add( item2, wxSizerFlags().Expand().Border(wxALL, 5) );
+    wxDataViewListCtrl *item2 = new wxDataViewListCtrl( parent, ID_PREFSLISTCTRL, wxDefaultPosition, wxDefaultSize, wxDV_SINGLE|wxDV_NO_HEADER|wxSUNKEN_BORDER );
+    // Tighter than the usual 5: the list is sized to its longest label, so
+    // its border reads as slack on every row rather than as breathing room.
+    item1->Add( item2, wxSizerFlags().Expand().Border(wxALL, 2) );
     item0->Add( item1, wxSizerFlags(1).Expand().Border(wxALL, 0) );
-    wxStaticBox *item4 = new wxStaticBox( parent, -1, "" );
-    wxStaticBoxSizer *item3 = new wxStaticBoxSizer( item4, wxHORIZONTAL );
+    // Plain button row (no static-box container). A leading stretch spacer right-aligns the whole
+    // group; the page-scoped "Reset" button, hidden except on the Advanced page (see
+    // PrefsUnifiedDlg), sits left of OK/Cancel.
+    wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
 
+    item3->AddStretchSpacer( 1 );
+    wxButton *item7 = new wxButton( parent, IDC_TWEAKS_RESET, _("Reset page to defaults"), wxDefaultPosition, wxDefaultSize, 0 );
+    item7->SetToolTip( _("Reset the settings on the current page to their default values.") );
+    item3->Add( item7, wxSizerFlags().Center().Border(wxALL, 5) );
     wxButton *item5 = new wxButton( parent, ID_PREFS_OK_TOP, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->SetDefault();
     item5->SetToolTip( _("Click here to apply any changes made to the preferences.") );
@@ -1968,7 +2422,7 @@
     wxButton *item6 = new wxButton( parent, ID_PREFS_CANCEL_TOP, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
     item6->SetToolTip( _("Reset any changes made to the preferences.") );
     item3->Add( item6, wxSizerFlags().Center().Border(wxALL, 5) );
-    item0->Add( item3, wxSizerFlags().CenterHorizontal().Border(wxALL, 5) );
+    item0->Add( item3, wxSizerFlags().Expand().Border(wxALL, 5) );
     if (set_sizer)
     {
         parent->SetSizer( item0 );
@@ -1988,30 +2442,30 @@
 
     wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item4 = new wxStaticText( parent, -1, _("Title :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item4 = new wxStaticText( item2, -1, LabelWithColon( _("Title") ), wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item4, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
-    CMuleTextCtrl *item5 = new CMuleTextCtrl( parent, IDC_TITLE, "", wxDefaultPosition, wxDefaultSize, 0 );
+    CMuleTextCtrl *item5 = new CMuleTextCtrl( item2, IDC_TITLE, "", wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item5, wxSizerFlags(1).Expand().CenterHorizontal().Border(wxRIGHT, 5) );
     item1->Add( item3, wxSizerFlags().Expand().CenterVertical().Border(wxTOP|wxBOTTOM, 5) );
     wxBoxSizer *item6 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item7 = new wxStaticText( parent, -1, _("Comment :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item7 = new wxStaticText( item2, -1, LabelWithColon( _("Comment") ), wxDefaultPosition, wxDefaultSize, 0 );
     item6->Add( item7, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
-    CMuleTextCtrl *item8 = new CMuleTextCtrl( parent, IDC_COMMENT, "", wxDefaultPosition, wxDefaultSize, 0 );
+    CMuleTextCtrl *item8 = new CMuleTextCtrl( item2, IDC_COMMENT, "", wxDefaultPosition, wxDefaultSize, 0 );
     item6->Add( item8, wxSizerFlags(1).Expand().CenterHorizontal().Border(wxRIGHT, 5) );
     item1->Add( item6, wxSizerFlags().Expand().CenterVertical().Border(wxBOTTOM, 5) );
     wxBoxSizer *item9 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item10 = new wxStaticText( parent, -1, _("Incoming Dir :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item10 = new wxStaticText( item2, -1, LabelWithColon( _("Incoming Dir") ), wxDefaultPosition, wxDefaultSize, 0 );
     item9->Add( item10, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
-    CMuleTextCtrl *item11 = new CMuleTextCtrl( parent, IDC_INCOMING, "", wxDefaultPosition, wxDefaultSize, 0 );
+    CMuleTextCtrl *item11 = new CMuleTextCtrl( item2, IDC_INCOMING, "", wxDefaultPosition, wxDefaultSize, 0 );
     item9->Add( item11, wxSizerFlags(1).Expand().CenterHorizontal() );
-    wxButton *item12 = new wxButton( parent, IDC_BROWSE, "...", wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item12 = new wxButton( item2, IDC_BROWSE, "...", wxDefaultPosition, wxDefaultSize, 0 );
     item9->Add( item12, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     item1->Add( item9, wxSizerFlags().Expand().CenterVertical().Border(wxBOTTOM, 5) );
     wxFlexGridSizer *item13 = new wxFlexGridSizer( 2, 0, 0 );
 
-    wxStaticText *item14 = new wxStaticText( parent, -1, _("Change priority for new assigned files :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item14 = new wxStaticText( item2, -1, LabelWithColon( _("Change priority for new assigned files") ), wxDefaultPosition, wxDefaultSize, 0 );
     item13->Add( item14, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 5) );
     wxString strs15 = 
     {
@@ -2021,35 +2475,38 @@
         _("High"), 
         _("Auto")
     };
-    wxChoice *item15 = new wxChoice( parent, IDC_PRIOCOMBO, wxDefaultPosition, wxDefaultSize, 5, strs15, 0 );
+    wxChoice *item15 = new wxChoice( item2, IDC_PRIOCOMBO, wxDefaultPosition, wxDefaultSize, 5, strs15, 0 );
     item13->Add( item15, wxSizerFlags().Expand().Border(wxRIGHT, 5) );
     item1->Add( item13, wxSizerFlags().Expand().CenterVertical().Border(wxBOTTOM, 5) );
     wxFlexGridSizer *item16 = new wxFlexGridSizer( 3, 0, 0 );
     item16->AddGrowableCol( 2 );
 
-    wxStaticText *item17 = new wxStaticText( parent, -1, _("Select color for this Category (currently selected) :"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item17 = new wxStaticText( item2, -1, LabelWithColon( _("Select color for this Category (currently selected)") ), wxDefaultPosition, wxDefaultSize, 0 );
     item16->Add( item17, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 5) );
-    wxStaticBox *item19 = new wxStaticBox( parent, -1, "" );
+    wxStaticBox *item19 = new wxStaticBox( item2, -1, "" );
     wxStaticBoxSizer *item18 = new wxStaticBoxSizer( item19, wxVERTICAL );
 
-    wxStaticBitmap *item20 = new wxStaticBitmap( parent, ID_BOX_CATCOLOR, amuleSpecial( 0 ), wxDefaultPosition, wxDefaultSize );
-    item18->Add( item20, 0, wxALIGN_CENTER, 5 );
+    wxStaticBitmap *item20 = new wxStaticBitmap( item19, ID_BOX_CATCOLOR, amuleSpecial( 0 ), wxDefaultPosition, wxDefaultSize );
+    item18->Add( item20, wxSizerFlags().Center() );
 
-    item16->Add( item18, 0, wxALIGN_CENTER, 5 );
+    item16->Add( item18, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
 
-    wxButton *item21 = new wxButton( parent, IDC_CATCOLOR, _("Select"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item21 = new wxButton( item2, IDC_CATCOLOR, _("Select"), wxDefaultPosition, wxDefaultSize, 0 );
     item16->Add( item21, wxSizerFlags().CenterVertical().Right().Border(wxLEFT|wxRIGHT, 5) );
     item1->Add( item16, wxSizerFlags().Expand().CenterVertical() );
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    wxStaticBox *item23 = new wxStaticBox( parent, -1, "" );
-    wxStaticBoxSizer *item22 = new wxStaticBoxSizer( item23, wxHORIZONTAL );
+    // Plain button row (no static-box container) so no border is drawn around OK/Cancel, matching
+    // the Settings dialog. A leading stretch spacer right-aligns the buttons, like the Preferences
+    // and About dialogs.
+    wxBoxSizer *item22 = new wxBoxSizer( wxHORIZONTAL );
 
+    item22->AddStretchSpacer( 1 );
     wxButton *item24 = new wxButton( parent, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
     item24->SetDefault();
     item22->Add( item24, wxSizerFlags().Center().Border(wxALL, 5) );
     wxButton *item25 = new wxButton( parent, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
     item22->Add( item25, wxSizerFlags().Center().Border(wxALL, 5) );
-    item0->Add( item22, wxSizerFlags().Center().Border(wxALL, 5) );
+    item0->Add( item22, wxSizerFlags().Expand().Border(wxALL, 5) );
     if (set_sizer)
     {
         parent->SetSizer( item0 );
@@ -2065,7 +2522,7 @@
     wxStaticBox *item1 = new wxStaticBox( parent, -1, "" );
     wxStaticBoxSizer *item0 = new wxStaticBoxSizer( item1, wxVERTICAL );
 
-    wxSplitterWindow *item2 = new wxSplitterWindow( parent, ID_DOWNLOADSSPLATTER, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE );
+    wxSplitterWindow *item2 = new wxSplitterWindow( item1, ID_DOWNLOADSSPLATTER, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE );
     item2->SetMinimumPaneSize( 20 );
     wxPanel *item3 = new wxPanel( item2, -1 );
     transferTopPane( item3, FALSE, TRUE );
@@ -2088,14 +2545,11 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
-
-    CMuleTextCtrl *item2 = new CMuleTextCtrl( parent, ID_SERVERINFO, "", wxDefaultPosition, wxSize(200, 100), wxTE_MULTILINE|wxTE_READONLY|wxVSCROLL );
-    item1->Add( item2, wxSizerFlags(1).Expand().CenterHorizontal() );
-    wxButton *item3 = new wxButton( parent, ID_BTN_RESET_SERVER, _("Reset"), wxDefaultPosition, wxDefaultSize, 0 );
+    CMuleLogCtrl *item2 = new CMuleLogCtrl( parent, ID_SERVERINFO, wxDefaultPosition, wxSize(200, 100) );
+    item0->Add( item2, wxSizerFlags(1).Expand().Border(wxALL, 5) );
+    wxButton *item3 = new wxButton( parent, ID_BTN_RESET_SERVER, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->SetToolTip( _("Click this button to reset the log.") );
-    item1->Add( item3, wxSizerFlags().Expand().CenterHorizontal().Border(wxALL, 5) );
-    item0->Add( item1, wxSizerFlags(1).Expand().CenterVertical() );
+    item0->Add( item3, wxSizerFlags().Right().Border(wxRIGHT|wxBOTTOM, 5) );
     if (set_sizer)
     {
         parent->SetSizer( item0 );
@@ -2110,21 +2564,39 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
+    CMuleLogCtrl *item2 = new CMuleLogCtrl( parent, ID_LOGVIEW, wxDefaultPosition, wxSize(200, 100) );
+    item0->Add( item2, wxSizerFlags(1).Expand().Border(wxALL, 5) );
+    wxButton *item3 = new wxButton( parent, ID_BTN_RESET, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->SetToolTip( _("Click this button to reset the log.") );
+    item0->Add( item3, wxSizerFlags().Right().Border(wxRIGHT|wxBOTTOM, 5) );
+    if (set_sizer)
+    {
+        parent->SetSizer( item0 );
+        if (call_fit)
+            item0->SetSizeHints( parent );
+    }
+
+    return item0;
+}
+
+// amulegui only: the GUI client's own log (mirrors aMuleLog but with its own text control and Clear
+// button). A separate tab, so "aMule Log" carries only the daemon/core log received over EC.
+wxSizer *aMuleGuiLog( wxWindow *parent, bool call_fit, bool set_sizer )
+{
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    CMuleTextCtrl *item2 = new CMuleTextCtrl( parent, ID_LOGVIEW, "", wxDefaultPosition, wxSize(200, 100), wxTE_MULTILINE|wxTE_READONLY|wxVSCROLL|wxTE_RICH2 );
-    item1->Add( item2, wxSizerFlags(1).Expand().CenterHorizontal() );
-    wxButton *item3 = new wxButton( parent, ID_BTN_RESET, _("Reset"), wxDefaultPosition, wxDefaultSize, 0 );
+    CMuleLogCtrl *item2 = new CMuleLogCtrl( parent, ID_GUILOGVIEW, wxDefaultPosition, wxSize(200, 100) );
+    item0->Add( item2, wxSizerFlags(1).Expand().Border(wxALL, 5) );
+    wxButton *item3 = new wxButton( parent, ID_BTN_RESET_GUILOG, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->SetToolTip( _("Click this button to reset the log.") );
-    item1->Add( item3, wxSizerFlags().Expand().CenterHorizontal().Border(wxALL, 5) );
-    item0->Add( item1, wxSizerFlags(1).Expand().CenterVertical() );
+    item0->Add( item3, wxSizerFlags().Right().Border(wxRIGHT|wxBOTTOM, 5) );
     if (set_sizer)
     {
         parent->SetSizer( item0 );
         if (call_fit)
             item0->SetSizeHints( parent );
     }
-    
+
     return item0;
 }
 
@@ -2134,18 +2606,33 @@
 
     wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBitmapButton *item2 = new wxBitmapButton( parent, ID_UPDATELIST, amuleDlgImages( 30 ), wxDefaultPosition, wxDefaultSize );
+    wxBitmapButton *item2 = new wxBitmapButton( parent, ID_UPDATELIST, wxArtProvider::GetBitmapBundle( "amule:reload" ), wxDefaultPosition, wxDefaultSize );
     item2->SetToolTip( _("Click on this button to update the servers list from URL ...") );
     item2->SetName( "updateList" );
-    item1->Add( item2, 0, wxALIGN_CENTER, 5 );
+    item1->Add( item2, wxSizerFlags().Center() );
 
     wxStaticText *item3 = new wxStaticText( parent, -1, _("Server list"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->SetName( "serverListLabel" );
     item1->Add( item3, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     CMuleTextCtrl *item4 = new CMuleTextCtrl( parent, IDC_SERVERLISTURL, "", wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
     item4->SetToolTip( _("Enter the url to a server.met file here and press the button to the left to update the list of known servers.") );
-    item1->Add( item4, wxSizerFlags(1).Expand().CenterHorizontal().Border(wxLEFT, 5) );
-    item0->Add( item1, wxSizerFlags().Expand().CenterVertical() );
+    // CenterVertical, not Expand: the row's height now follows the icon-bearing connect button,
+    // taller than a one-line field on macOS, and Expand would stretch this single-line entry to
+    // that height, rendering it two lines tall there. Proportion 1 still fills the row
+    // horizontally.
+    item1->Add( item4, wxSizerFlags(1).CenterVertical().Border(wxLEFT, 5) );
+    item1->AddStretchSpacer(1);
+    // Placeholder label -- CServerWnd's ctor calls UpdateED2KConnectButton() right after
+    // construction, which sets the real label and bitmap for the current state. Kept on this top
+    // row, right-aligned via the stretch spacer above, so the primary control sits directly above
+    // the table -- mirrors the Kad tab's "primary control on top, manual form below" shape.
+    wxButton *item14 = new wxButton( parent, IDC_ED2KDISCONNECT, _("Connect"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item14, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
+    // Top border: without it this row sits flush against the tab strip
+    // (issue #402 review: "too close to the borders of the tab container").
+    item0->Add( item1, wxSizerFlags().Expand().CenterVertical().Border(wxTOP, 5) );
+    CServerListCtrl *item15 = new CServerListCtrl( parent, ID_SERVERLIST, wxDefaultPosition, wxSize(200, 100), 0 );
+    item0->Add( item15, wxSizerFlags(1).Expand().CenterVertical() );
     wxBoxSizer *item5 = new wxBoxSizer( wxHORIZONTAL );
 
     wxStaticText *item6 = new wxStaticText( parent, -1, _("Add server manually: Name"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -2159,7 +2646,7 @@
     item9->SetToolTip( _("Enter the IP of the server here, using the x.x.x.x format.") );
     item5->Add( item9, wxSizerFlags(1).Center().Border(wxLEFT|wxRIGHT, 5) );
     wxStaticText *item10 = new wxStaticText( parent, -1, ":", wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add( item10, 0, wxALIGN_CENTER, 5 );
+    item5->Add( item10, wxSizerFlags().Center() );
 
     CMuleTextCtrl *item11 = new CMuleTextCtrl( parent, IDC_SPORT, "", wxDefaultPosition, wxDefaultSize, 0 );
     item11->SetToolTip( _("Enter the port of the server here.") );
@@ -2167,13 +2654,7 @@
     wxButton *item12 = new wxButton( parent, ID_ADDTOLIST, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
     item12->SetToolTip( _("Add manually a server (fill fields to the left before) ...") );
     item5->Add( item12, wxSizerFlags().Center().Border(wxLEFT, 5) );
-    wxStaticLine *item13 = new wxStaticLine( parent, -1, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    item5->Add( item13, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
-    wxButton *item14 = new wxButton( parent, IDC_ED2KDISCONNECT, _("Disconnect"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add( item14, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     item0->Add( item5, wxSizerFlags().Expand().CenterVertical() );
-    CServerListCtrl *item15 = new CServerListCtrl( parent, ID_SERVERLIST, wxDefaultPosition, wxSize(200, 100), wxLC_REPORT|wxSUNKEN_BORDER );
-    item0->Add( item15, wxSizerFlags(1).Expand().CenterVertical() );
     if (set_sizer)
     {
         parent->SetSizer( item0 );
@@ -2189,13 +2670,16 @@
     wxStaticBox *item1 = new wxStaticBox( parent, -1, "" );
     wxStaticBoxSizer *item0 = new wxStaticBoxSizer( item1, wxVERTICAL );
 
-    wxNotebook *item3 = new wxNotebook( parent, ID_SRVLOG_NOTEBOOK, wxDefaultPosition, wxDefaultSize, 0 );
+    wxNotebook *item3 = new wxNotebook( item1, ID_SRVLOG_NOTEBOOK, wxDefaultPosition, wxDefaultSize, 0 );
     wxWindow *item2 = item3;
 
     wxPanel *item4 = new wxPanel( item3, -1 );
     aMuleLog( item4, FALSE );
     item3->AddPage( item4, _("aMule Log") );
 
+    // NB: the amulegui-only "aMuleGUI Log" page is inserted here at runtime by
+    // CServerWnd, under its own CLIENT_GUI guard.
+
     wxPanel *item5 = new wxPanel( item3, -1 );
     ServerInfoLog( item5, FALSE );
     item3->AddPage( item5, _("Server Info") );
@@ -2221,116 +2705,100 @@
 
 wxSizer *KadDlg( wxWindow *parent, bool call_fit, bool set_sizer )
 {
-    wxFlexGridSizer *item0 = new wxFlexGridSizer( 1, 0, 0 );
-    item0->AddGrowableCol( 0 );
-    item0->AddGrowableRow( 0 );
-
-    wxFlexGridSizer *item1 = new wxFlexGridSizer( 2, 0, 0 );
-    item1->AddGrowableCol( 0 );
-    item1->AddGrowableRow( 0 );
-
-    wxBoxSizer *item2 = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
+    // First row, full width: nodes-list URL refresher plus the connect/disconnect toggle right-
+    // aligned -- identical shape to the ED2K pane's server-list row (see serverListDlgUp), so both
+    // network tabs lead the same way.
     wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBitmapButton *item4 = new wxBitmapButton( parent, ID_UPDATEKADLIST, amuleDlgImages( 30 ), wxDefaultPosition, wxDefaultSize );
+    wxBitmapButton *item4 = new wxBitmapButton( parent, ID_UPDATEKADLIST, wxArtProvider::GetBitmapBundle( "amule:reload" ), wxDefaultPosition, wxDefaultSize );
     item4->SetToolTip( _("Click on this button to update the nodes list from URL ...") );
     item4->SetName( "nodesupdateList" );
-    item3->Add( item4, 0, wxALIGN_CENTER, 5 );
+    item3->Add( item4, wxSizerFlags().Center() );
 
     wxStaticText *item5 = new wxStaticText( parent, -1, _("Nodes (0)"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->SetName( "nodesListLabel" );
     item3->Add( item5, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     CMuleTextCtrl *item6 = new CMuleTextCtrl( parent, IDC_NODESLISTURL, "", wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
     item6->SetToolTip( _("Enter the url to a nodes.dat file here and press the button to the left to update the list of known nodes.") );
-    item3->Add( item6, wxSizerFlags(1).Expand().CenterHorizontal().Border(wxLEFT, 5) );
-    item2->Add( item3, wxSizerFlags().Expand().CenterVertical() );
+    // CenterVertical, not Expand: keeps this single-line entry one line tall
+    // even though the icon-bearing buttons make the row taller on macOS.
+    item3->Add( item6, wxSizerFlags(1).CenterVertical().Border(wxLEFT, 5) );
+    item3->AddStretchSpacer(1);
+    // Placeholder label -- CKadDlg::Init() calls UpdateConnectButton() right
+    // after construction, which sets the real label/bitmap for the current state.
+    wxButton *item38 = new wxButton( parent, ID_KADDISCONNECT, _("Connect"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->Add( item38, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
+    // Top border: matches serverListDlgUp's top row (issue #402 review:
+    // "too close to the borders of the tab container").
+    item0->Add( item3, wxSizerFlags().Expand().CenterVertical().Border(wxTOP, 5) );
+
+    // Graph, full width -- mirrors serverListDlgUp's shape (top row, then a full-width primary
+    // area, then a manual-entry row below) rather than splitting the tab into two side-by-side
+    // columns. item2 keeps the same wrapping depth around the graph box as the original two-column
+    // layout had.
+    wxBoxSizer *item2 = new wxBoxSizer( wxVERTICAL );
+
     wxStaticBox *item8 = new wxStaticBox( parent, -1, _("Nodes stats") );
     wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxVERTICAL );
 
-    wxWindow *item9 = new COScopeCtrl(3,0,GRAPH_KAD,parent);
+    wxWindow *item9 = new COScopeCtrl(3,0,GRAPH_KAD,item8);
 item9->SetName("kadScope");
     wxASSERT( item9 );
-    item7->Add( item9, 1, wxGROW, 5 );
+    item7->Add( item9, wxSizerFlags(1).Expand() );
 
+    // Three legend entries packed tight at the left. No growable columns: the row is Expand()ed so
+    // Linux has room to draw every label, but without growable cols the entries stay next to each
+    // other instead of spread across.
     wxFlexGridSizer *item10 = new wxFlexGridSizer( 3, 0, 0 );
-    item10->AddGrowableCol( 0 );
-    item10->AddGrowableCol( 1 );
 
     wxBoxSizer *item11 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item12 = new CColorFrameCtrl(parent,IDC_C0,20,14);
+    wxWindow *item12 = new CColorFrameCtrl(item8,IDC_C0,20,14);
     wxASSERT( item12 );
     item11->Add( item12, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item13 = new wxStaticText( parent, -1, _("Current"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item13 = new wxStaticText( item8, -1, _("Current"), wxDefaultPosition, wxDefaultSize, 0 );
     item11->Add( item13, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item10->Add( item11, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     wxBoxSizer *item14 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item15 = new CColorFrameCtrl(parent,IDC_C0_3,20,14);
+    wxWindow *item15 = new CColorFrameCtrl(item8,IDC_C0_3,20,14);
     wxASSERT( item15 );
     item14->Add( item15, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item16 = new wxStaticText( parent, -1, _("Running average"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item16 = new wxStaticText( item8, -1, _("Running average"), wxDefaultPosition, wxDefaultSize, 0 );
     item14->Add( item16, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item10->Add( item14, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     wxBoxSizer *item17 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxWindow *item18 = new CColorFrameCtrl(parent,IDC_C0_2,20,14);
+    wxWindow *item18 = new CColorFrameCtrl(item8,IDC_C0_2,20,14);
     wxASSERT( item18 );
     item17->Add( item18, wxSizerFlags().FixedMinSize().Center() );
-    wxStaticText *item19 = new wxStaticText( parent, -1, _("Session average"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item19 = new wxStaticText( item8, -1, _("Session average"), wxDefaultPosition, wxDefaultSize, 0 );
     item17->Add( item19, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item10->Add( item17, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
-    item7->Add( item10, wxSizerFlags().Bottom().Border(wxLEFT|wxRIGHT|wxTOP, 5) );
-    item2->Add( item7, wxSizerFlags(1).Expand().CenterVertical() );
-    item1->Add( item2, 0, wxGROW, 0 );
-
-    wxStaticBox *item21 = new wxStaticBox( parent, -1, _("Bootstrap") );
-    wxStaticBoxSizer *item20 = new wxStaticBoxSizer( item21, wxVERTICAL );
-
-    wxStaticBox *item23 = new wxStaticBox( parent, -1, _("New node") );
-    wxStaticBoxSizer *item22 = new wxStaticBoxSizer( item23, wxVERTICAL );
-
+    item7->Add( item10, wxSizerFlags().Expand().Border(wxLEFT|wxRIGHT|wxTOP, 5) );
+    item2->Add( item7, wxSizerFlags(1).Expand() );
+    item0->Add( item2, wxSizerFlags(1).Expand() );
+
+    // Bootstrap-from-node row, full width below the graph -- mirrors serverListDlgUp's "Add server
+    // manually" row: a single IP field, not eD2k's four-octet split, plus a port field and the
+    // Connect button.
     wxBoxSizer *item24 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item25 = new wxStaticText( parent, -1, _("IP:"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
-    item24->Add( item25, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 10) );
-    CMuleTextCtrl *item26 = new CMuleTextCtrl( parent, ID_NODE_IP1, "", wxDefaultPosition, wxSize(30,-1), 0 );
-    item24->Add( item26, wxSizerFlags().Center().Border(wxTOP|wxBOTTOM, 5) );
-    wxStaticText *item27 = new wxStaticText( parent, -1, ".", wxDefaultPosition, wxDefaultSize, 0 );
-    item24->Add( item27, wxSizerFlags().Center().Border(wxTOP, 5) );
-    CMuleTextCtrl *item28 = new CMuleTextCtrl( parent, ID_NODE_IP2, "", wxDefaultPosition, wxSize(30,-1), 0 );
-    item24->Add( item28, wxSizerFlags().Center().Border(wxTOP|wxBOTTOM, 5) );
-    wxStaticText *item29 = new wxStaticText( parent, -1, ".", wxDefaultPosition, wxDefaultSize, 0 );
-    item24->Add( item29, wxSizerFlags().Center().Border(wxTOP, 5) );
-    CMuleTextCtrl *item30 = new CMuleTextCtrl( parent, ID_NODE_IP3, "", wxDefaultPosition, wxSize(30,-1), 0 );
-    item24->Add( item30, wxSizerFlags().Center().Border(wxTOP|wxBOTTOM, 5) );
-    wxStaticText *item31 = new wxStaticText( parent, -1, ".", wxDefaultPosition, wxDefaultSize, 0 );
-    item24->Add( item31, wxSizerFlags().Center().Border(wxTOP, 5) );
-    CMuleTextCtrl *item32 = new CMuleTextCtrl( parent, ID_NODE_IP4, "", wxDefaultPosition, wxSize(30,-1), 0 );
-    item24->Add( item32, wxSizerFlags().Center().Border(wxTOP|wxBOTTOM, 5) );
-    item22->Add( item24, wxSizerFlags().Expand().CenterVertical() );
-    wxFlexGridSizer *item33 = new wxFlexGridSizer( 2, 0, 0 );
-    item33->AddGrowableCol( 1 );
-
-    wxStaticText *item34 = new wxStaticText( parent, -1, _("Port:"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
-    item33->Add( item34, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 5) );
+    wxStaticText *item25 = new wxStaticText( parent, -1, _("Bootstrap from node: IP"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
+    item24->Add( item25, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
+    CMuleTextCtrl *item26 = new CMuleTextCtrl( parent, ID_NODE_IP, "", wxDefaultPosition, wxDefaultSize, 0 );
+    item26->SetToolTip( _("Enter the IP of the node here, using the x.x.x.x format.") );
+    item24->Add( item26, wxSizerFlags(1).Center().Border(wxLEFT|wxRIGHT, 5) );
+    wxStaticText *item34 = new wxStaticText( parent, -1, LabelWithColon( _("Port") ), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
+    item24->Add( item34, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     CMuleTextCtrl *item35 = new CMuleTextCtrl( parent, ID_NODE_PORT, "", wxDefaultPosition, wxSize(80,-1), 0 );
-    item33->Add( item35, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    item22->Add( item33, wxSizerFlags().Expand().CenterVertical() );
+    item24->Add( item35, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
     wxButton *item36 = new wxButton( parent, ID_NODECONNECT, _("Connect"), wxDefaultPosition, wxDefaultSize, 0 );
     item36->Enable( false );
-    item22->Add( item36, wxSizerFlags().Center().Border(wxTOP|wxBOTTOM, 5) );
-    item20->Add( item22, 0, wxALIGN_RIGHT, 0 );
-
-    item20->Add( 20, 20, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxButton *item37 = new wxButton( parent, ID_KNOWNNODECONNECT, _("Bootstrap from known clients"), wxDefaultPosition, wxDefaultSize, 0 );
-    item20->Add( item37, wxSizerFlags().Expand().CenterVertical() );
-    item20->Add( 20, 20, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxButton *item38 = new wxButton( parent, ID_KADDISCONNECT, _("Disconnect Kad"), wxDefaultPosition, wxDefaultSize, 0 );
-    item20->Add( item38, wxSizerFlags().Expand().CenterVertical() );
-    item1->Add( item20, wxSizerFlags().Expand().Right() );
-    item0->Add( item1, wxSizerFlags().Expand().CenterVertical() );
+    item24->Add( item36, wxSizerFlags().Center().Border(wxLEFT, 5) );
+    item0->Add( item24, wxSizerFlags().Expand().CenterVertical().Border(wxTOP|wxBOTTOM, 5) );
     if (set_sizer)
     {
         parent->SetSizer( item0 );
@@ -2368,15 +2836,15 @@
     wxStaticBox *item3 = new wxStaticBox( parent, -1, _("Protocol Obfuscation") );
     wxStaticBoxSizer *item2 = new wxStaticBoxSizer( item3, wxVERTICAL );
 
-    wxCheckBox *item4 = new wxCheckBox( parent, IDC_SUPPORT_PO, _("Support Protocol Obfuscation"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item4 = new wxCheckBox( item3, IDC_SUPPORT_PO, _("Support Protocol Obfuscation"), wxDefaultPosition, wxDefaultSize, 0 );
     item4->SetValue( TRUE );
     item4->SetToolTip( _("This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients.") );
     item2->Add( item4, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
-    wxCheckBox *item5 = new wxCheckBox( parent, IDC_ENABLE_PO_OUTGOING, _("Use obfuscation for outgoing connections"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item5 = new wxCheckBox( item3, 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, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 25) );
-    wxCheckBox *item6 = new wxCheckBox( parent, IDC_ENFORCE_PO_INCOMING, _("Accept only obfuscated connections"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item6 = new wxCheckBox( item3, 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, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 25) );
     item0->Add( item2, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxTOP, 0) );
@@ -2396,48 +2864,48 @@
 
     wxBoxSizer *item11 = new wxBoxSizer( wxVERTICAL );
 
-    wxCheckBox *item12 = new wxCheckBox( parent, IDC_IPFCLIENTS, _("Filter clients"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item12 = new wxCheckBox( item9, 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, wxSizerFlags().Expand().Border(wxALL, 0) );
-    wxCheckBox *item13 = new wxCheckBox( parent, IDC_IPFSERVERS, _("Filter servers"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item13 = new wxCheckBox( item9, IDC_IPFSERVERS, _("Filter servers"), wxDefaultPosition, wxDefaultSize, 0 );
     item13->SetValue( TRUE );
     item13->SetToolTip( _("Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat.") );
     item11->Add( item13, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     item10->Add( item11, wxSizerFlags().Center().Border(wxALL, 0) );
     item10->Add( 10, 10, wxSizerFlags(1).Expand().CenterHorizontal() );
-    wxButton *item14 = new wxButton( parent, IDC_IPFRELOAD, _("Reload List"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item14 = new wxButton( item9, 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, wxSizerFlags().Center().Border(wxRIGHT|wxTOP|wxBOTTOM, 5) );
     item8->Add( item10, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 5) );
     wxFlexGridSizer *item15 = new wxFlexGridSizer( 3, 0, 0 );
     item15->AddGrowableCol( 1 );
 
-    wxStaticText *item16 = new wxStaticText( parent, -1, _("URL:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item16 = new wxStaticText( item9, -1, _("URL:"), wxDefaultPosition, wxDefaultSize, 0 );
     item15->Add( item16, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
-    wxTextCtrl *item17 = new wxTextCtrl( parent, IDC_IPFILTERURL, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    wxTextCtrl *item17 = new wxTextCtrl( item9, IDC_IPFILTERURL, "", wxDefaultPosition, wxSize(80,-1), 0 );
     item15->Add( item17, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT, 5) );
-    wxButton *item18 = new wxButton( parent, IDC_IPFILTERUPDATE, _("Update now"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item18 = new wxButton( item9, IDC_IPFILTERUPDATE, _("Update now"), wxDefaultPosition, wxDefaultSize, 0 );
     item15->Add( item18, wxSizerFlags().Center().Border(wxLEFT, 5) );
     item8->Add( item15, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
-    wxCheckBox *item19 = new wxCheckBox( parent, IDC_AUTOIPFILTER, _("Auto-update ipfilter at startup"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item19 = new wxCheckBox( item9, IDC_AUTOIPFILTER, _("Auto-update ipfilter at startup"), wxDefaultPosition, wxDefaultSize, 0 );
     item8->Add( item19, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     wxBoxSizer *item20 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item21 = new wxStaticText( parent, -1, _("Filtering Level:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item21 = new wxStaticText( item9, -1, _("Filtering Level:"), wxDefaultPosition, wxDefaultSize, 0 );
     item20->Add( item21, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     item20->Add( 10, 10, wxSizerFlags(1).Expand().CenterHorizontal().Border(wxALL, 5) );
-    wxSpinCtrl *item22 = new wxSpinCtrl( parent, ID_IPFILTERLEVEL, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 255, 0 );
+    wxSpinCtrl *item22 = new wxSpinCtrl( item9, ID_IPFILTERLEVEL, "0", wxDefaultPosition, wxDefaultSize, 0, 0, 255, 0 );
     item20->Add( item22, wxSizerFlags().Center().Border(wxALL, 5) );
     item8->Add( item20, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxRIGHT|wxBOTTOM, 0) );
-    wxCheckBox *item23 = new wxCheckBox( parent, IDC_FILTERLAN, _("Always filter LAN IPs"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item23 = new wxCheckBox( item9, IDC_FILTERLAN, _("Always filter LAN IPs"), wxDefaultPosition, wxDefaultSize, 0 );
     item23->SetValue( TRUE );
     item8->Add( item23, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
-    wxCheckBox *item24 = new wxCheckBox( parent, IDC_PARANOID, _("Paranoid handling of non-matching IPs"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item24 = new wxCheckBox( item9, IDC_PARANOID, _("Paranoid handling of non-matching IPs"), wxDefaultPosition, wxDefaultSize, 0 );
     item24->SetValue( TRUE );
-    item24->SetToolTip( _("Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution.") );
+    item24->SetToolTip( _("Rejects a packet when its source IP differs from the IP the client claims (an anti-spoofing check). Disable only if it causes connection problems.") );
     item8->Add( item24, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
-    wxCheckBox *item25 = new wxCheckBox( parent, IDC_IPFILTERSYS, _("Use system-wide ipfilter.dat if available"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item25 = new wxCheckBox( item9, 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 system-wide ipfilter file.") );
     item8->Add( item25, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
     item0->Add( item8, wxSizerFlags().Expand().CenterVertical() );
@@ -2475,7 +2943,7 @@
     wxStaticText *item6 = new wxStaticText( parent, IDC_OSDIRTEXT, _("Save online signature file in: "), wxDefaultPosition, wxDefaultSize, 0 );
     item5->Add( item6, wxSizerFlags().CenterVertical().Border(wxALL, 0) );
     CMuleTextCtrl *item7 = new CMuleTextCtrl( parent, IDC_OSDIR, "", wxDefaultPosition, wxSize(80,-1), 0 );
-    item5->Add( item7, 0, wxALIGN_CENTER, 5 );
+    item5->Add( item7, wxSizerFlags(1).Expand().CenterVertical() );
 
     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.") );
@@ -2493,24 +2961,21 @@
 
 wxSizer *PreferencesIP2CountryTab( wxWindow *parent, bool call_fit, bool set_sizer )
 {
-    // IP2Country preferences panel — exposed only when amule is built with
-    // ENABLE_IP2COUNTRY. The panel covers the full lifecycle: master enable
-    // checkbox, source selection (DB-IP / MaxMind / Custom URL), per-source
-    // attribution + license text (the license terms require attribution to
-    // be displayed; rendering it inline here satisfies that obligation
-    // without a separate About-dialog entry), an Update Now button, and an
-    // auto-update toggle.
+    // IP2Country preferences panel -- exposed only when amule is built with ENABLE_IP2COUNTRY. The
+    // panel covers the full lifecycle: master enable checkbox, source selection (DB-IP / MaxMind /
+    // Custom URL), per-source attribution and license text (the license terms require attribution
+    // to be displayed; rendering it inline here satisfies that obligation without a separate About-
+    // dialog entry), an Update Now button, and an auto-update toggle.
     //
-    // Most of the source-specific controls live on three sibling sub-panels
-    // (DB-IP / MaxMind / Custom). The PrefsUnifiedDlg shows exactly one at
-    // a time based on the source dropdown's selection. We build all three
-    // up-front so the IDs exist for Cfg_* binding regardless of which is
-    // currently visible.
+    // Most of the source-specific controls live on three sibling sub-panels (DB-IP / MaxMind /
+    // Custom). PrefsUnifiedDlg shows exactly one at a time based on the source dropdown's
+    // selection. All three are built up front so the IDs exist for Cfg_* binding regardless of
+    // which is currently visible.
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    // Master enable checkbox — moved out of the Interface tab so the
-    // whole feature configures from one place. CfgChanged(IDC_SHOW_COUNTRY_FLAGS)
-    // in PrefsUnifiedDlg::TryClose still re-calls EnableIP2Country().
+    // Master enable checkbox -- moved out of the Interface tab so the whole feature configures from
+    // one place. CfgChanged(IDC_SHOW_COUNTRY_FLAGS) in PrefsUnifiedDlg::TryClose still re-calls
+    // EnableIP2Country().
     wxCheckBox *item1 = new wxCheckBox( parent, IDC_SHOW_COUNTRY_FLAGS, _("Show country flags for clients"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->SetToolTip( _("Render the country flag column in the transfers, queue and search views. Requires a valid MMDB GeoIP database (see below).") );
     item0->Add( item1, wxSizerFlags().CenterVertical().Border(wxALL, 4) );
@@ -2520,42 +2985,39 @@
     wxStaticBox *item3 = new wxStaticBox( parent, -1, _("Database") );
     wxStaticBoxSizer *item2 = new wxStaticBoxSizer( item3, wxVERTICAL );
 
-    // Status block — multi-line static text. PrefsUnifiedDlg updates the
-    // label content in TransferToWindow() based on the live mmdb state
-    // and the selected source's attribution string.
-    // Placeholder is overwritten by PrefsUnifiedDlg::UpdateGeoIPStatus()
-    // during TransferToWindow before this label ever paints; no
-    // user-visible string here, so nothing to translate.
-    wxStaticText *item4 = new wxStaticText( parent, IDC_GEOIP_STATUS,
+    // Status block -- multi-line static text. PrefsUnifiedDlg updates the label content in
+    // TransferToWindow() from the live mmdb state and the selected source's attribution string. The
+    // placeholder is overwritten by UpdateGeoIPStatus() before this label ever paints, so there is
+    // no user-visible string here to translate.
+    wxStaticText *item4 = new wxStaticText( item3, IDC_GEOIP_STATUS,
         wxEmptyString,
         wxDefaultPosition, wxDefaultSize, 0 );
     item2->Add( item4, wxSizerFlags().Expand().Border(wxALL, 4) );
 
     // Source selector row.
     wxBoxSizer *item5 = new wxBoxSizer( wxHORIZONTAL );
-    wxStaticText *item6 = new wxStaticText( parent, -1, _("Source:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item6 = new wxStaticText( item3, -1, _("Source:"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->Add( item6, wxSizerFlags().Center().Border(wxRIGHT, 6) );
     wxString geoIPChoices = {
         _("DB-IP (free, no account)"),
         _("MaxMind GeoLite2 (free, account required)"),
         _("Custom URL")
     };
-    wxChoice *item7 = new wxChoice( parent, IDC_GEOIP_SOURCE, wxDefaultPosition, wxDefaultSize, 3, geoIPChoices, 0 );
+    wxChoice *item7 = new wxChoice( item3, IDC_GEOIP_SOURCE, wxDefaultPosition, wxDefaultSize, 3, geoIPChoices, 0 );
     item7->SetToolTip( _("Choose which provider supplies the GeoIP MMDB database. DB-IP is the default - no account required. MaxMind requires a free account + license key. Use Custom URL to point at any other MMDB host (e.g. a local mirror).") );
     item5->Add( item7, wxSizerFlags().Center().Expand() );
     item2->Add( item5, wxSizerFlags().Expand().Border(wxALL, 4) );
 
-    // Source-specific options panel. Hosts three child wxPanel siblings
-    // (DB-IP / MaxMind / Custom) — one shown at a time, the other two
-    // hidden. Real wxPanel children are required (instead of just
-    // hiding sibling widgets) because Show(false) on individual widgets
-    // doesn't propagate to their sizer slot or to nearby ID-less labels,
-    // which left those labels visible across source changes.
-    wxStaticBox *item9 = new wxStaticBox( parent, IDC_GEOIP_SOURCE_PANEL, wxEmptyString );
+    // Source-specific options panel, hosting three child wxPanel siblings (DB-IP / MaxMind /
+    // Custom) -- one shown at a time, the other two hidden. Real wxPanel children are required
+    // rather than just hiding sibling widgets, because Show(false) on individual widgets does not
+    // propagate to their sizer slot or to nearby ID-less labels, which left those labels visible
+    // across source changes.
+    wxStaticBox *item9 = new wxStaticBox( item3, IDC_GEOIP_SOURCE_PANEL, wxEmptyString );
     wxStaticBoxSizer *item8 = new wxStaticBoxSizer( item9, wxVERTICAL );
 
     // --- DB-IP sub-panel ---
-    wxPanel *dbipPanel = new wxPanel( parent, IDC_GEOIP_INFO_DBIP );
+    wxPanel *dbipPanel = new wxPanel( item9, IDC_GEOIP_INFO_DBIP );
     wxBoxSizer *dbipSizer = new wxBoxSizer( wxVERTICAL );
     wxStaticText *dbipText = new wxStaticText( dbipPanel, wxID_ANY,
         _("No configuration required.\n"
@@ -2568,7 +3030,7 @@
     item8->Add( dbipPanel, wxSizerFlags().Expand() );
 
     // --- MaxMind sub-panel ---
-    wxPanel *maxmindPanel = new wxPanel( parent, IDC_GEOIP_INFO_MAXMIND );
+    wxPanel *maxmindPanel = new wxPanel( item9, IDC_GEOIP_INFO_MAXMIND );
     wxBoxSizer *maxmindSizer = new wxBoxSizer( wxVERTICAL );
     wxBoxSizer *maxmindRow = new wxBoxSizer( wxHORIZONTAL );
     wxStaticText *licLabel = new wxStaticText( maxmindPanel, wxID_ANY, _("License key:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -2589,7 +3051,7 @@
     item8->Add( maxmindPanel, wxSizerFlags().Expand() );
 
     // --- Custom URL sub-panel ---
-    wxPanel *customPanel = new wxPanel( parent, IDC_GEOIP_INFO_CUSTOM );
+    wxPanel *customPanel = new wxPanel( item9, IDC_GEOIP_INFO_CUSTOM );
     wxBoxSizer *customSizer = new wxBoxSizer( wxVERTICAL );
     wxBoxSizer *customRow = new wxBoxSizer( wxHORIZONTAL );
     wxStaticText *urlLabel = new wxStaticText( customPanel, wxID_ANY, _("Download URL:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -2610,10 +3072,10 @@
 
     // Update Now row + auto-update toggle.
     wxBoxSizer *item23 = new wxBoxSizer( wxHORIZONTAL );
-    wxButton *item24 = new wxButton( parent, IDC_GEOIP_UPDATE_NOW, _("Update now"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item24 = new wxButton( item3, IDC_GEOIP_UPDATE_NOW, _("Update now"), wxDefaultPosition, wxDefaultSize, 0 );
     item24->SetToolTip( _("Download the GeoIP database from the selected source.") );
     item23->Add( item24, wxSizerFlags().Border(wxRIGHT, 12) );
-    wxCheckBox *item25 = new wxCheckBox( parent, IDC_GEOIP_AUTOUPDATE, _("Auto-update on startup"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item25 = new wxCheckBox( item3, IDC_GEOIP_AUTOUPDATE, _("Auto-update on startup"), wxDefaultPosition, wxDefaultSize, 0 );
     item25->SetToolTip( _("Re-download the GeoIP database from the selected source every time aMule starts.") );
     item23->Add( item25, wxSizerFlags().CenterVertical() );
     item2->Add( item23, wxSizerFlags().Border(wxALL, 4) );
@@ -2637,28 +3099,28 @@
     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 );
+    wxCheckBox *item3 = new wxCheckBox( item2, IDC_MSGFILTER, _("Filter incoming messages (except current chat):"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item3, wxSizerFlags().CenterVertical().Border(wxALL, 0) );
-    wxCheckBox *item4 = new wxCheckBox( parent, IDC_MSGFILTER_ALL, _("Filter all messages"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item4 = new wxCheckBox( item2, IDC_MSGFILTER_ALL, _("Filter all messages"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item4, wxSizerFlags().CenterVertical().Border(wxLEFT, 25) );
-    wxCheckBox *item5 = new wxCheckBox( parent, IDC_MSGFILTER_NONFRIENDS, _("Filter messages from people not on your friend list"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item5 = new wxCheckBox( item2, IDC_MSGFILTER_NONFRIENDS, _("Filter messages from people not on your friend list"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item5, wxSizerFlags().CenterVertical().Border(wxLEFT, 25) );
-    wxCheckBox *item6 = new wxCheckBox( parent, IDC_MSGFILTER_NONSECURE, _("Filter messages from unknown clients"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item6 = new wxCheckBox( item2, IDC_MSGFILTER_NONSECURE, _("Filter messages from unknown clients"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item6, wxSizerFlags().CenterVertical().Border(wxLEFT, 25) );
-    wxCheckBox *item7 = new wxCheckBox( parent, IDC_MSGFILTER_WORD, _("Filter messages containing (use ',' as separator):"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item7 = new wxCheckBox( item2, IDC_MSGFILTER_WORD, _("Filter messages containing (use ',' as separator):"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item7, wxSizerFlags().CenterVertical().Border(wxLEFT, 25) );
-    wxTextCtrl *item8 = new wxTextCtrl( parent, IDC_MSGWORD, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    wxTextCtrl *item8 = new wxTextCtrl( item2, IDC_MSGWORD, "", wxDefaultPosition, wxSize(80,-1), 0 );
     item8->SetToolTip( _("add here the words amule should filter and block messages including it") );
     item1->Add( item8, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 50) );
-    wxCheckBox *item9 = new wxCheckBox( parent, IDC_MSGLOG, _("Show received messages in the log"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item9 = new wxCheckBox( item2, IDC_MSGLOG, _("Show received messages in the log"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item9, wxSizerFlags().CenterVertical().Border(wxALL, 0) );
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     wxStaticBox *item11 = new wxStaticBox( parent, -1, _("Comments") );
     wxStaticBoxSizer *item10 = new wxStaticBoxSizer( item11, wxVERTICAL );
 
-    wxCheckBox *item12 = new wxCheckBox( parent, IDC_FILTERCOMMENTS, _("Filter comments containing (use ',' as separator):"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item12 = new wxCheckBox( item11, IDC_FILTERCOMMENTS, _("Filter comments containing (use ',' as separator):"), wxDefaultPosition, wxDefaultSize, 0 );
     item10->Add( item12, wxSizerFlags().CenterVertical().Border(wxALL, 0) );
-    wxTextCtrl *item13 = new wxTextCtrl( parent, IDC_COMMENTWORD, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    wxTextCtrl *item13 = new wxTextCtrl( item11, IDC_COMMENTWORD, "", wxDefaultPosition, wxSize(80,-1), 0 );
     item13->SetToolTip( _("add here the words amule should filter and block messages including it") );
     item10->Add( item13, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT, 50) );
     item0->Add( item10, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
@@ -2679,45 +3141,47 @@
     wxFlexGridSizer *item2 = new wxFlexGridSizer( 2, 0, 0 );
     item2->AddGrowableCol( 1 );
 
-    wxCheckBox *item3 = new wxCheckBox( parent, ID_PROXY_ENABLE_PASSWORD, _("Enable authentication"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->SetToolTip( _("Enable/disable username/password authentication") );
-    item2->Add( item3, wxSizerFlags().CenterVertical().Border(wxALL, 0) );
-    item2->Add( 20, 20, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
-    wxStaticText *item4 = new wxStaticText( parent, -1, _("Username: "), wxDefaultPosition, wxDefaultSize, 0 );
-    item2->Add( item4, wxSizerFlags().CenterVertical().Border(wxLEFT, 20) );
-    wxTextCtrl *item5 = new wxTextCtrl( parent, ID_PROXY_USER, "", wxDefaultPosition, wxSize(80,-1), 0 );
-    item5->SetToolTip( _("The username to use to connect to the proxy") );
-    item2->Add( item5, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
-    wxStaticText *item6 = new wxStaticText( parent, -1, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item2->Add( item6, wxSizerFlags().CenterVertical().Border(wxLEFT, 20) );
-    wxTextCtrl *item7 = new wxTextCtrl( parent, ID_PROXY_PASSWORD, "", wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
-    item7->SetToolTip( _("The password to use to connect to the proxy") );
-    item2->Add( item7, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
+    // Enable Proxy group first (issue #594): the proxy on/off toggle and its
+    // settings, then the authentication sub-section at the end.
     wxCheckBox *item8 = new wxCheckBox( parent, ID_PROXY_ENABLE_PROXY, _("Enable Proxy"), wxDefaultPosition, wxDefaultSize, 0 );
     item8->SetToolTip( _("Enable/disable proxy support") );
     item2->Add( item8, wxSizerFlags().CenterVertical().Border(wxALL, 0) );
     item2->Add( 20, 20, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
-    wxStaticText *item9 = new wxStaticText( parent, -1, _("Proxy type:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item9 = new wxStaticText( parent, -1, LabelWithColon( _("Proxy type") ), wxDefaultPosition, wxDefaultSize, 0 );
     item2->Add( item9, wxSizerFlags().CenterVertical().Border(wxLEFT, 20) );
-    wxString strs10 = 
+    wxString strs10 =
     {
-        "SOCKS5", 
-        "SOCKS4", 
-        "HTTP", 
+        "SOCKS5",
+        "SOCKS4",
+        "HTTP",
         "SOCKS4a"
     };
     wxChoice *item10 = new wxChoice( parent, ID_PROXY_TYPE, wxDefaultPosition, wxSize(100,-1), 4, strs10, 0 );
     item2->Add( item10, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxTOP, 5) );
-    wxStaticText *item11 = new wxStaticText( parent, -1, _("Proxy host:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item11 = new wxStaticText( parent, -1, LabelWithColon( _("Proxy host") ), wxDefaultPosition, wxDefaultSize, 0 );
     item2->Add( item11, wxSizerFlags().CenterVertical().Border(wxLEFT, 20) );
     wxTextCtrl *item12 = new wxTextCtrl( parent, ID_PROXY_NAME, "", wxDefaultPosition, wxDefaultSize, 0 );
     item12->SetToolTip( _("The proxy host name") );
     item2->Add( item12, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxTOP, 5) );
-    wxStaticText *item13 = new wxStaticText( parent, -1, _("Proxy port:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item13 = new wxStaticText( parent, -1, LabelWithColon( _("Proxy port") ), wxDefaultPosition, wxDefaultSize, 0 );
     item2->Add( item13, wxSizerFlags().CenterVertical().Border(wxLEFT, 20) );
     wxTextCtrl *item14 = new wxTextCtrl( parent, ID_PROXY_PORT, "", wxDefaultPosition, wxSize(80,-1), 0 );
     item14->SetToolTip( _("The proxy port") );
     item2->Add( item14, wxSizerFlags().Expand().CenterVertical().Border(wxLEFT|wxTOP, 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, wxSizerFlags().CenterVertical().Border(wxALL, 0) );
+    item2->Add( 20, 20, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
+    wxStaticText *item4 = new wxStaticText( parent, -1, LabelWithColon( _("Username") ), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item4, wxSizerFlags().CenterVertical().Border(wxLEFT, 20) );
+    wxTextCtrl *item5 = new wxTextCtrl( parent, ID_PROXY_USER, "", wxDefaultPosition, wxSize(80,-1), 0 );
+    item5->SetToolTip( _("The username to use to connect to the proxy") );
+    item2->Add( item5, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
+    wxStaticText *item6 = new wxStaticText( parent, -1, LabelWithColon( _("Password") ), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item6, wxSizerFlags().CenterVertical().Border(wxLEFT, 20) );
+    wxTextCtrl *item7 = new wxTextCtrl( parent, ID_PROXY_PASSWORD, "", wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
+    item7->SetToolTip( _("The password to use to connect to the proxy") );
+    item2->Add( item7, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     item0->Add( item2, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 0) );
     if (set_sizer)
     {
@@ -2749,20 +3213,18 @@
 
     wxFlexGridSizer *item8 = new wxFlexGridSizer( 2, 0, 0 );
 
-    wxStaticText *item9 = new wxStaticText( parent, -1, _("User name"), wxDefaultPosition, wxDefaultSize, 0 );
-    item8->Add( item9, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
-    CMuleTextCtrl *item10 = new CMuleTextCtrl( parent, ID_EC_LOGIN, "amule", wxDefaultPosition, wxSize(200,-1), 0 );
-    item10->Enable( false );
-    item8->Add( item10, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticText *item11 = new wxStaticText( parent, -1, _("Password"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item11 = new wxStaticText( item7, -1, _("Password"), wxDefaultPosition, wxDefaultSize, 0 );
     item8->Add( item11, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
-    CMuleTextCtrl *item12 = new CMuleTextCtrl( parent, ID_EC_PASSWD, "", wxDefaultPosition, wxSize(200,-1), wxTE_PASSWORD );
+    CMuleTextCtrl *item12 = new CMuleTextCtrl( item7, ID_EC_PASSWD, "", wxDefaultPosition, wxSize(200,-1), wxTE_PASSWORD );
     item8->Add( item12, wxSizerFlags().Center().Border(wxALL, 5) );
     item6->Add( item8, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     item0->Add( item6, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     wxCheckBox *item13 = new wxCheckBox( parent, ID_EC_SAVE, _("Remember those settings"), wxDefaultPosition, wxDefaultSize, 0 );
     item13->SetValue( TRUE );
     item0->Add( item13, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
+    wxCheckBox *item13a = new wxCheckBox( parent, ID_EC_ENCRYPTION, _("Encrypt the connection (recommended)"), wxDefaultPosition, wxDefaultSize, 0 );
+    item13a->SetValue( TRUE );
+    item0->Add( item13a, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
     wxCheckBox *item13b = new wxCheckBox( parent, ID_EC_FORCE_ZLIB, _("Force ZLIB compression"), wxDefaultPosition, wxDefaultSize, 0 );
     item0->Add( item13b, wxSizerFlags().CenterVertical().Border(wxALL, 5) );
     wxBoxSizer *item14 = new wxBoxSizer( wxHORIZONTAL );
@@ -2794,7 +3256,7 @@
     wxStaticBox *item4 = new wxStaticBox( parent, -1, _("Message Categories:") );
     wxStaticBoxSizer *item3 = new wxStaticBoxSizer( item4, wxVERTICAL );
 
-    wxWindow *item5 = new wxCheckListBox( parent, ID_DEBUGCATS );
+    wxWindow *item5 = new wxCheckListBox( item4, ID_DEBUGCATS );
     wxASSERT( item5 );
     item3->Add( item5, wxSizerFlags(1).Expand().CenterVertical().Border(wxALL, 5) );
     item0->Add( item3, wxSizerFlags(1).Expand().CenterVertical().Border(wxALL, 0) );
@@ -2821,13 +3283,13 @@
 
     wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item4 = new wxStaticText( parent, IDC_CONV_PB_LABEL, "", wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item4 = new wxStaticText( item2, IDC_CONV_PB_LABEL, "", wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item4, wxSizerFlags().Expand().Border(wxALL, 5) );
     item3->Add( 20, 20, wxSizerFlags(1).Expand().CenterHorizontal().Border(wxALL, 5) );
-    wxStaticText *item5 = new wxStaticText( parent, IDC_CONV_PROZENT, "", wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item5 = new wxStaticText( item2, IDC_CONV_PROZENT, "", wxDefaultPosition, wxDefaultSize, 0 );
     item3->Add( item5, wxSizerFlags().CenterVertical().Right().Border(wxLEFT|wxTOP|wxBOTTOM, 5) );
     item1->Add( item3, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    wxGauge *item6 = new wxGauge( parent, IDC_CONV_PB_CURRENT, 100, wxDefaultPosition, wxDefaultSize, 0 );
+    wxGauge *item6 = new wxGauge( item2, IDC_CONV_PB_CURRENT, 100, wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item6, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
     wxListCtrl *item7 = new wxListCtrl( parent, IDC_JOBLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
@@ -2907,7 +3369,7 @@
     wxStaticBoxSizer *item0 = new wxStaticBoxSizer( item1, wxVERTICAL );
     IDC_PREFS_EVENTS_PAGE = item0;
 
-    wxListCtrl *item2 = new wxListCtrl( parent, IDC_EVENTLIST, wxDefaultPosition, wxSize(160,120), wxLC_REPORT|wxLC_NO_HEADER|wxLC_SINGLE_SEL|wxSUNKEN_BORDER );
+    wxListCtrl *item2 = new wxListCtrl( item1, IDC_EVENTLIST, wxDefaultPosition, wxSize(160,120), wxLC_REPORT|wxLC_NO_HEADER|wxLC_SINGLE_SEL|wxSUNKEN_BORDER );
     item0->Add( item2, wxSizerFlags(1).Expand().CenterVertical().Border(wxALL, 5) );
     if (set_sizer)
     {
@@ -2922,17 +3384,33 @@
 wxSizer *s_sharedfilespeerHeader;
 wxSizer *sharedfilesBottomDlg( wxWindow *parent, bool call_fit, bool set_sizer )
 {
+    // Contents stay on the panel: this sizer is the panel's own, so box-parented children get
+    // the box origin re-applied on every layout and walk off the top (#1356).
     wxStaticBox *item1 = new wxStaticBox( parent, -1, _("Statistics and queued clients for selected file(s) : Session / All time") );
     wxStaticBoxSizer *item0 = new wxStaticBoxSizer( item1, wxVERTICAL );
 
-    wxFlexGridSizer *item2 = new wxFlexGridSizer( 4, 0, 0 );
-    item2->AddGrowableCol( 1 );
+    // Five columns and two rows: the collapse/expand button, the size figures, and the three
+    // statistics groups. Row one carries the counters, row two the gauges, and the size column
+    // takes one figure per row so each lines up with the statistics beside it. Only the statistics
+    // columns grow, so the button keeps a narrow column of its own and the size column is exactly
+    // as wide as its text.
+    wxFlexGridSizer *item2 = new wxFlexGridSizer( 5, 0, 0 );
     item2->AddGrowableCol( 2 );
     item2->AddGrowableCol( 3 );
+    item2->AddGrowableCol( 4 );
     s_sharedfilespeerHeader = item2;
 
-    wxBitmapButton *item3 = new wxBitmapButton( parent, ID_SHAREDCLIENTTOGGLE, amuleDlgImages( 10 ), wxDefaultPosition, wxDefaultSize );
-    item2->Add( item3, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxBitmapButton *item3 = new wxBitmapButton( parent, ID_SHAREDCLIENTTOGGLE, wxArtProvider::GetBitmapBundle( "amule:arrows_down" ), wxDefaultPosition, wxDefaultSize );
+    item2->Add( item3, wxSizerFlags().CenterVertical() );
+
+    // Combined size of the shared files currently visible (text filter). Set by
+    // CSharedFilesCtrl::ShowFilesCount(). No wxST_NO_AUTORESIZE: the label must grow to fit its
+    // text. Its column's second row holds the free-space figure, so each size gets a full line of
+    // its own and both line up with the statistics beside them -- the counters share this row, the
+    // gauges the next.
+    wxStaticText *item13 = new wxStaticText( parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    item13->SetName( "sharedFilesTotalSize" );
+    item2->Add( item13, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 5) );
 
     wxFlexGridSizer *item4 = new wxFlexGridSizer( 3, 0, 0 );
     item4->AddGrowableCol( 1 );
@@ -2960,8 +3438,18 @@
     item12->SetForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HOTLIGHT) );
     item10->Add( item12, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 5) );
     item2->Add( item10, wxSizerFlags().Center().Border(wxALL, 5) );
-    wxStaticText *item13 = new wxStaticText( parent, -1, _("Percent of total files"), wxDefaultPosition, wxDefaultSize, 0 );
-    item2->Add( item13, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
+    // Second row: nothing under the button, the free-space figure under the total size, then the
+    // gauges under the statistics they belong to. A wxFlexGridSizer fills row by row, so the empty
+    // button cell has to be added explicitly rather than left out.
+    item2->AddSpacer( 0 );
+
+    // Free space where finished downloads land (the default category's incoming directory).
+    // Informational only -- no threshold here, unlike the Downloads panel, which is where running
+    // out actually stops work. Set by CSharedFilesCtrl::UpdateFreeSpace().
+    wxStaticText *item13b = new wxStaticText( parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    item13b->SetName( "sharedFilesFreeSpace" );
+    item2->Add( item13b, wxSizerFlags().CenterVertical().Border(wxLEFT|wxRIGHT, 5) );
+
     wxGauge *item14 = new wxGauge( parent, -1, 100, wxDefaultPosition, wxSize(200,18), 0 );
     item14->SetName( "popbar" );
     item2->Add( item14, wxSizerFlags().Center().Border(wxLEFT|wxRIGHT, 5) );
@@ -2974,7 +3462,7 @@
     item0->Add( item2, wxSizerFlags().Expand().CenterVertical() );
     wxStaticLine *item17 = new wxStaticLine( parent, ID_LINE, wxDefaultPosition, wxSize(20,-1), wxLI_HORIZONTAL );
     item0->Add( item17, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-    CSharedFilePeersListCtrl *item18 = new CSharedFilePeersListCtrl( parent, ID_SHAREDCLIENTLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
+    CSharedFilePeersListCtrl *item18 = new CSharedFilePeersListCtrl( parent, ID_SHAREDCLIENTLIST, wxDefaultPosition, wxDefaultSize, 0 );
     item18->SetName( "sharedFilesSrcCt" );
     item0->Add( item18, wxSizerFlags(1).Expand().CenterVertical() );
     if (set_sizer)
@@ -2991,29 +3479,51 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxFlexGridSizer *item1 = new wxFlexGridSizer( 4, 0, 0 );
-    item1->AddGrowableCol( 1 );
+    // Header row: Shared files Filter: ___ ... Show Clients ... ... Reload. The left and
+    // right regions each take proportion 1, so they are equal width and the radio group in the
+    // middle (proportion 0) stays centered in the window regardless of how wide the left/right
+    // content is. The filter box widened the left region, which knocked the radios off-centre under
+    // the old growable-column layout.
+    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
 
+    wxBoxSizer *itemShLeft = new wxBoxSizer( wxHORIZONTAL );
     wxStaticText *item2 = new wxStaticText( parent, -1, _("Shared files"), wxDefaultPosition, wxDefaultSize, 0 );
     item2->SetName( "sharedFilesLabel" );
-    item1->Add( item2, wxSizerFlags().CenterVertical().Border(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, int(wxNO_BORDER)|wxRA_SPECIFY_ROWS );
+    itemShLeft->Add( item2, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
+    wxStaticText *itemShFilterLabel = new wxStaticText( parent, -1, _("Filter:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemShLeft->Add( itemShFilterLabel, wxSizerFlags().CenterVertical().Border(wxLEFT, 10) );
+    wxTextCtrl *itemShFilter = new wxTextCtrl( parent, IDC_SHARED_FILTER, "", wxDefaultPosition, wxSize(150,-1), 0 );
+    itemShLeft->Add( itemShFilter, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
+    item1->Add( itemShLeft, wxSizerFlags(1).CenterVertical() );
+
+    // "Show Clients for" as a label + inline radio buttons. This replaces a
+    // wxRadioBox whose title row wasted vertical space in the header.
+    wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *itemShowLabel = new wxStaticText( parent, -1, _("Show Clients for"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->Add( itemShowLabel, wxSizerFlags().CenterVertical().Border(wxRIGHT, 8) );
+    wxRadioButton *itemShowAll = new wxRadioButton( parent, ID_SHOW_CLIENTS_MODE, _("All files"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    itemShowAll->SetName( "showClientsAll" );
+    item3->Add( itemShowAll, wxSizerFlags().CenterVertical().Border(wxRIGHT, 8) );
+    wxRadioButton *itemShowSelected = new wxRadioButton( parent, -1, _("Selected files"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemShowSelected->SetName( "showClientsSelected" );
+    item3->Add( itemShowSelected, wxSizerFlags().CenterVertical().Border(wxRIGHT, 8) );
+    wxRadioButton *itemShowUploading = new wxRadioButton( parent, -1, _("Active uploads only"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemShowUploading->SetName( "showClientsUploading" );
+    item3->Add( itemShowUploading, wxSizerFlags().CenterVertical() );
     item1->Add( item3, wxSizerFlags().Center().Border(wxALL, 5) );
+
+    wxBoxSizer *itemShRight = new wxBoxSizer( wxHORIZONTAL );
+    itemShRight->AddStretchSpacer( 1 );
     wxStaticText *item4 = new wxStaticText( parent, -1, _("Reload:"), wxDefaultPosition, wxDefaultSize, 0 );
     item4->SetName( "sharedFilesLabel" );
-    item1->Add( item4, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
-    wxBitmapButton *item5 = new wxBitmapButton( parent, ID_BTNRELSHARED, amuleDlgImages( 18 ), wxDefaultPosition, wxSize(32,32) );
+    itemShRight->Add( item4, wxSizerFlags().CenterVertical().Border(wxLEFT, 5) );
+    wxBitmapButton *item5 = new wxBitmapButton( parent, ID_BTNRELSHARED, wxArtProvider::GetBitmapBundle( "amule:reload" ), wxDefaultPosition, wxSize(32,32) );
     item5->SetToolTip( _("Reload your shared files") );
-    item1->Add( item5, 0, wxALIGN_CENTER_VERTICAL, 0 );
+    itemShRight->Add( item5, wxSizerFlags().CenterVertical().Border(wxRIGHT, 5) );
+    item1->Add( itemShRight, wxSizerFlags(1).CenterVertical() );
 
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical() );
-    CSharedFilesCtrl *item6 = new CSharedFilesCtrl( parent, ID_SHFILELIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
+    CSharedFilesCtrl *item6 = new CSharedFilesCtrl( parent, ID_SHFILELIST, wxDefaultPosition, wxDefaultSize, 0 );
     item6->SetName( "sharedFilesCt" );
     item0->Add( item6, wxSizerFlags(1).Expand().CenterVertical() );
     if (set_sizer)
@@ -3032,13 +3542,13 @@
 
     wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticBitmap *item2 = new wxStaticBitmap( parent, -1, amuleDlgImages( 14 ), wxDefaultPosition, wxDefaultSize );
-    item1->Add( item2, 0, wxALIGN_CENTER, 5 );
+    wxStaticBitmap *item2 = new wxStaticBitmap( parent, -1, wxArtProvider::GetBitmapBundle( "amule:friends" ), wxDefaultPosition, wxDefaultSize );
+    item1->Add( item2, wxSizerFlags().Center() );
 
     wxStaticText *item3 = new wxStaticText( parent, -1, _("Friends"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item3, wxSizerFlags().Center().Border(wxLEFT|wxTOP|wxBOTTOM, 5) );
     item0->Add( item1, wxSizerFlags().Expand().CenterVertical() );
-    CFriendListCtrl *item4 = new CFriendListCtrl( parent, ID_FRIENDLIST, wxDefaultPosition, wxSize(160,150), wxLC_REPORT|wxSUNKEN_BORDER );
+    CFriendListCtrl *item4 = new CFriendListCtrl( parent, ID_FRIENDLIST, wxDefaultPosition, wxSize(160,150), 0 );
     item0->Add( item4, wxSizerFlags(1).Expand().FixedMinSize().CenterVertical().Border(wxRIGHT|wxBOTTOM, 5) );
     if (set_sizer)
     {
@@ -3056,8 +3566,14 @@
 
     wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticBitmap *item2 = new wxStaticBitmap( parent, -1, amuleDlgImages( 15 ), wxDefaultPosition, wxDefaultSize );
-    item1->Add( item2, 0, wxALIGN_CENTER, 5 );
+    // "amule:message" is a dedicated small chat-bubble glyph, not the main toolbar's
+    // "amule:toolbar_messages" mascot illustration (#735 review: that one is a detailed gradient
+    // bust that stops reading as "messages" once shrunk from its native 32x32 down to this header's
+    // 16x16).
+    wxStaticBitmap *item2 = new wxStaticBitmap( parent, -1,
+        wxArtProvider::GetBitmapBundle( "amule:message" ),
+        wxDefaultPosition, wxDefaultSize );
+    item1->Add( item2, wxSizerFlags().Center() );
 
     wxStaticText *item3 = new wxStaticText( parent, -1, _("Messages"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item3, wxSizerFlags().Center().Border(wxALL, 5) );
@@ -3069,7 +3585,7 @@
 
     CMuleTextCtrl *item6 = new CMuleTextCtrl( parent, IDC_CMESSAGE, "", wxDefaultPosition, wxSize(80,-1), wxTE_PROCESS_ENTER );
     item6->Enable( false );
-    item5->Add( item6, 1, wxALIGN_CENTER, 5 );
+    item5->Add( item6, wxSizerFlags(1).Center() );
 
     wxButton *item7 = new wxButton( parent, IDC_CSEND, _("Send"), wxDefaultPosition, wxDefaultSize, 0 );
     item7->SetToolTip( _("Sends the specified message.") );
@@ -3078,7 +3594,7 @@
     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 );
+    item5->Add( item8, wxSizerFlags().Center() );
 
     item0->Add( item5, wxSizerFlags().Expand().CenterVertical().Border(wxTOP|wxBOTTOM, 5) );
     if (set_sizer)
@@ -3093,493 +3609,49 @@
 
 // Implement menubar functions
 
-// Implement toolbar functions
-
-void muleToolbar( wxToolBar *parent )
-{
-    parent->SetMargins( 0, 0 );
-    
-    parent->AddTool( ID_BUTTONCONNECT, _("Connect"), connButImg( 0 ), wxNullBitmap, wxITEM_NORMAL, _("Connect to any server and/or Kad") );
-    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_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") );
-    parent->AddSeparator();
-    parent->AddTool( ID_BUTTONNEWPREFERENCES, _("Preferences"), amuleDlgImages( 26 ), wxNullBitmap, wxITEM_NORMAL, _("Preferences Settings Window") );
-    parent->AddTool( ID_BUTTONIMPORT, _("Import"), amuleDlgImages( 32 ), wxNullBitmap, wxITEM_NORMAL, _("The partfile importer tool") );
-    parent->AddTool( ID_ABOUT, _("About"), amuleDlgImages( 29 ), wxNullBitmap, wxITEM_NORMAL, _("About/Help") );
-    
-    parent->Realize();
-}
-
 // Implement bitmap functions
 
 wxBitmap clientImages( size_t index )
 {
-    if (index == 0)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 1)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 2)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 3)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 4)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 23 1",
-        "  c None",
-        "a c Black",
-        "b c #DDA670",
-        "c c #C3C3C3",
-        "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",
-        "s c #F5F5F5",
-        "t c #CC9554",
-        "u c #D2A06B",
-        "v c #FEFEFE",
-        "w c #C88642",
-        /* pixels */
-        "                ",
-        "      aaaa      ",
-        "    aavvvvaa    ",
-        "   asssrrqssa   ",
-        "  ahlrppppmega  ",
-        "  ajoipmrpteja  ",
-        " acjeflqupuejca ",
-        " aholssupnsloja ",
-        " ajessvppvsqeja ",
-        " aolsvvvvvvvloa ",
-        "  alvvvwbvvsla  ",
-        "  alsvvpwvkqea  ",
-        "   asvvvvvsla   ",
-        "    aavvvvaa    ",
-        "      aaaa      ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 5)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 4 1",
-        "  c None",
-        "a c Black",
-        "c c #222222",
-        "d c #FF0000",
-        /* pixels */
-        "                ",
-        "                ",
-        "        aaaaaaaa",
-        "        adddddda",
-        "        adddddda",
-        "        acaaaaaa",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 6)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 3 1",
-        "  c None",
-        "b c #FF0000",
-        "c c #A52A2A",
-        /* pixels */
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "      b         ",
-        "     bb         ",
-        "b   bbc         ",
-        "bb bbc          ",
-        "cbbbc           ",
-        " cbc            "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 7)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 3 1",
-        "  c None",
-        "b c #CC3232",
-        "c c #FF0000",
-        /* pixels */
-        "                ",
-        "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;
-    }
-    if (index == 8)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 13 1",
-        "  c None",
-        "a c Black",
-        "b c #CACACA",
-        "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    ",
-        "          aha   ",
-        "       aaaeeeaaa",
-        "       abbejjbma",
-        "        aldjiga ",
-        "         aggga  ",
-        "        afgaiia ",
-        "        aia aka ",
-        "        aa   aa ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 9)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 10)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 3 1",
-        "  c None",
-        "b c #FFFF00",
-        "c c #323834",
-        /* pixels */
-        "           c    ",
-        "          cbc   ",
-        "         cbbbc  ",
-        "        cbbbbbc ",
-        "       cbbbbbbbc",
-        "       cccbbbccc",
-        "         cbbbc  ",
-        "         ccccc  ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 11)
-    {
-        static const unsigned char data = 
-        {
-            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,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
+    // 22 of these 27 client-status icons are simple pictograms, migrated to CamuleArtProvider. The
+    // remaining 5 -- eMule/aMule/lphant/Shareaza/xMule, indices 12/15/16/17/18 below -- are
+    // specific client-software mascots kept as the original raw artwork for now: redrawing someone
+    // else's brand mascot risks not matching the real logo, unlike a generic pictogram (see #675).
+    // The array index must stay in sync with ClientSkinEnum (amuleDlg.h) -- the same enum-order-is-
+    // load-bearing constraint the callers doing index arithmetic (Client_InvalidRating_Smiley +
+    // rating - 1) depend on.
+    static const char *const artIds = {
+        "amule:client_green", "amule:client_red", "amule:client_yellow",
+        "amule:client_grey", "amule:client_white",
+        "amule:client_extendedprotocol", "amule:client_secident",
+        "amule:client_badguy", "amule:client_creditsgrey",
+        "amule:client_creditsyellow", "amule:client_upload",
+        "amule:client_friend",
+        nullptr, // 12: eMule (mascot)
+        "amule:client_mldonkey", "amule:client_edonkeyhybrid",
+        nullptr, nullptr, nullptr, nullptr, // 15-18: aMule/lphant/Shareaza/xMule (mascots)
+        "amule:client_unknown", "amule:client_invalidrating",
+        "amule:client_poorrating", "amule:client_fairrating",
+        "amule:client_goodrating", "amule:client_excellentrating",
+        "amule:client_commentonly", "amule:client_encryption",
+    };
+    // wxFAIL_MSG below compiles out in release builds, so it cannot catch a future ClientSkinEnum
+    // member that is not reflected here -- this can, and does so at compile time in every build.
+    static_assert(WXSIZEOF(artIds) == CLIENT_SKIN_SIZE,
+        "artIds must stay in sync with ClientSkinEnum");
+    if (index < WXSIZEOF(artIds) && artIdsindex != nullptr) {
+        const wxBitmap bitmap = wxArtProvider::GetBitmap(artIdsindex, wxART_OTHER, wxSize(16, 16));
+        // The fallthrough wxFAIL_MSG below only guards an out-of-range index; it does not see this
+        // path returning early, so a resolution failure here needs its own guard, same reasoning as
+        // #739's assert.
+        wxASSERT_MSG(bitmap.IsOk(),
+            wxString::Format("clientImages: art id %s did not resolve", artIdsindex));
         return bitmap;
     }
+
     if (index == 12)
     {
-        static const unsigned char data = 
+        static const unsigned char data =
         {
             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,
@@ -3618,88 +3690,6 @@
         wxBitmap bitmap( image );
         return bitmap;
     }
-    if (index == 13)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,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,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,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,
-            119,119,119,14,14,14,63,63,63,85,85,85,20,20,20,151,151,151,218,218,218,153,153,153,99,
-            170,91,114,171,107,196,196,196,206,206,207,114,171,107,90,208,80,139,139,139,215,215,215,174,174,
-            174,22,22,22,84,84,84,116,116,116,57,57,57,135,135,135,219,219,219,193,193,193,104,131,99,
-            97,191,83,148,153,148,168,173,168,115,195,103,98,157,88,165,165,165,219,219,219,157,157,157,56,
-            56,56,118,118,118,146,146,146,100,100,100,111,111,111,211,211,211,214,214,214,118,122,119,102,179,
-            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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 14)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,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,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,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,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,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,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,
-            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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
     if (index == 15)
     {
         static const unsigned char data = 
@@ -3857,896 +3847,10 @@
         wxBitmap bitmap( xpm_data );
         return bitmap;
     }
-    if (index == 19)
-    {
-        static const unsigned char data = 
-        {
-            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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 20)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 16 1",
-        "  c None",
-        "a c Black",
-        "b c #0D1219",
-        "c c #263247",
-        "d c #080B0F",
-        "f c #B20000",
-        "g c #090C11",
-        "h c #272728",
-        "i c #161E2A",
-        "j c #07090E",
-        "k c #E50000",
-        "l c #1A2332",
-        "m c #18202D",
-        "n c #323233",
-        "o c #1F293B",
-        "p c #2C2C2D",
-        /* pixels */
-        "                ",
-        "                ",
-        "  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 );
-        return bitmap;
-    }
-    if (index == 21)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 16 1",
-        "  c None",
-        "a c Black",
-        "b c #0D1219",
-        "c c #263247",
-        "d c #080B0F",
-        "f c #B20000",
-        "g c #090C11",
-        "h c #272728",
-        "i c #161E2A",
-        "j c #07090E",
-        "k c #E50000",
-        "l c #1A2332",
-        "m c #18202D",
-        "n c #323233",
-        "o c #1F293B",
-        "p c #2C2C2D",
-        /* pixels */
-        "                ",
-        "                ",
-        "   jaai         ",
-        "  jfkkfi        ",
-        "  dfkkfi        ",
-        "  gfkkfm        ",
-        "  gfkkfm        ",
-        "  gfkkfm        ",
-        "  gfkkfi        ",
-        "  bffffl        ",
-        "   npnh         ",
-        "  offffc        ",
-        "  bkkkko        ",
-        "   bggo         ",
-        "                ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 22)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 16 1",
-        "  c None",
-        "a c #0D1219",
-        "b c #263247",
-        "c c #080B0F",
-        "e c #090C11",
-        "f c #272728",
-        "g c #161E2A",
-        "h c #07090E",
-        "i c #1A2332",
-        "j c #10151F",
-        "k c #18202D",
-        "l c #D1761A",
-        "m c #F0981B",
-        "n c #323233",
-        "o c #1F293B",
-        "p c #2C2C2D",
-        /* pixels */
-        "                ",
-        "                ",
-        "   jeco         ",
-        "  jmmmmo        ",
-        "  illllb        ",
-        "   npnf         ",
-        "  alllli        ",
-        "  elmmlg        ",
-        "  elmmlk        ",
-        "  elmmlk        ",
-        "  elmmlg        ",
-        "  clmmlg        ",
-        "  hlmmlg        ",
-        "   hhhg         ",
-        "                ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 23)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 16 1",
-        "  c None",
-        "a c #0D1219",
-        "b c #263247",
-        "c c #080B0F",
-        "e c #090C11",
-        "f c #272728",
-        "g c #59B200",
-        "h c #161E2A",
-        "i c #07090E",
-        "j c #1A2332",
-        "k c #10151F",
-        "l c #18202D",
-        "m c #72E500",
-        "n c #323233",
-        "o c #1F293B",
-        "p c #2C2C2D",
-        /* pixels */
-        "                ",
-        "                ",
-        "   keco         ",
-        "  kmmmmo        ",
-        "  jggggb        ",
-        "   npnf         ",
-        "  aggggj        ",
-        "  egmmgh        ",
-        "  egmmgl        ",
-        "  egmmgl        ",
-        "  egmmgh        ",
-        "  cgmmgh        ",
-        "  igmmgh        ",
-        "   iiih         ",
-        "                ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 24)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 16 1",
-        "  c None",
-        "a c #0D1219",
-        "b c #263247",
-        "c c #080B0F",
-        "e c #090C11",
-        "f c #272728",
-        "g c #59B200",
-        "h c #161E2A",
-        "i c #07090E",
-        "j c #1A2332",
-        "k c #10151F",
-        "l c #18202D",
-        "m c #72E500",
-        "n c #323233",
-        "o c #1F293B",
-        "p c #2C2C2D",
-        /* pixels */
-        "                ",
-        "                ",
-        "  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 );
-        return bitmap;
-    }
-    if (index == 25)
-    {
-        static const unsigned char data = 
-        {
-            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,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,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,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,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 26)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 3 1",
-        "  c None",
-        "b c #00FFFF",
-        "c c #0000FF",
-        /* pixels */
-        "  cccb          ",
-        "  ccb           ",
-        "  cb            ",
-        "  cb            ",
-        " cccb           ",
-        "ccbccb          ",
-        " cccb           ",
-        "  cb            ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    return wxNullBitmap;
-}
-
-wxBitmap dlStatusImages( size_t index )
-{
-    if (index == 0)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 16 1",
-        "  c None",
-        "a c Black",
-        "b c #110000",
-        "c c #6F4848",
-        "d c #7F0000",
-        "e c #220000",
-        "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 */
-        "          i     ",
-        "         dna    ",
-        "        dnkna   ",
-        "       dnkikna  ",
-        "      ankimikna ",
-        "      aapaopaaa ",
-        "         aha    ",
-        "     lpl aoa    ",
-        "     pop ppa    ",
-        "     ghj        ",
-        "  bebaoabeb     ",
-        "  cnkipiknj     ",
-        "   cnkiknj      ",
-        "    cnknj       ",
-        "     cnj        ",
-        "      i         "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 1)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* 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",
-        "o c #00FF00",
-        "p c #333333",
-        "q c #001500",
-        /* pixels */
-        "          d     ",
-        "         dkd    ",
-        "        dkikd   ",
-        "       dkidikd  ",
-        "      dkidjdikd ",
-        "          l     ",
-        "          c     ",
-        "     gpg  l     ",
-        "     plp pp     ",
-        "     aca        ",
-        "  qmqlllqmq     ",
-        "  eohbpbhoe     ",
-        "   eohfhoe      ",
-        "    eohoe       ",
-        "     eoe        ",
-        "      e         "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 2)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 16 1",
-        "  c None",
-        "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",
-        "o c #00FF00",
-        "p c #333333",
-        /* pixels */
-        "          f     ",
-        "         fof    ",
-        "        fojof   ",
-        "       fojfjof  ",
-        "      fojfkfjof ",
-        "          mp    ",
-        "          e     ",
-        "     hph  m     ",
-        "     pmp pp     ",
-        "     ded        ",
-        "  acammmaca     ",
-        "  bligpgilg     ",
-        "   bligilg      ",
-        "    glilg       ",
-        "     glg        ",
-        "      g         "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 3)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "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",
-        "i c #00FF00",
-        "j c #333333",
-        "k c #001500",
-        "l c #00CA00",
-        /* pixels */
-        "          a     ",
-        "         aia    ",
-        "        ailia   ",
-        "       ailalia  ",
-        "      aila alia ",
-        "          fj    ",
-        "          b     ",
-        "     cjc  f     ",
-        "     jfj jj     ",
-        "     dbd        ",
-        "  kgk f kgk     ",
-        "  aila aeia     ",
-        "   ailalia      ",
-        "    ailia       ",
-        "     aia        ",
-        "      a         "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    return wxNullBitmap;
-}
-
-wxBitmap connImages( size_t index )
-{
-    if (index == 0)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 23 1",
-        "  c None",
-        "a c #6C0C0C",
-        "b c #A81313",
-        "c c #F05151",
-        "d c #6A0C0C",
-        "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",
-        /* pixels */
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        " cgfmc          ",
-        "  vuro          ",
-        "  proq          ",
-        " lthwb          ",
-        " dij j          ",
-        " ak             ",
-        "  sn            ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 1)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 13 1",
-        "  c None",
-        "a c #4C4907",
-        "b c #E4DB13",
-        "c c #F0E943",
-        "d c #F0E945",
-        "e c #ECE31A",
-        "f c #FFFFFF",
-        "g c #EFE73B",
-        "i c #6D6909",
-        "j c #DAD112",
-        "k c #5E5A08",
-        "l c #FAF8C1",
-        "m c #605C08",
-        /* pixels */
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        " clfdc          ",
-        "  gdgb          ",
-        "  egbd          ",
-        " dddij          ",
-        " kdi j          ",
-        " md             ",
-        "  ak            ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 2)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 12 1",
-        "  c None",
-        "a c #41280D",
-        "b c #BD7625",
-        "c c #5D3A12",
-        "d c #513210",
-        "e c #CD8029",
-        "f c #D5852A",
-        "g c #523310",
-        "h c #F19730",
-        "j c #C77C27",
-        "k c #FE9F32",
-        "l c #D7862B",
-        /* pixels */
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        " lhkll          ",
-        "  flfj          ",
-        "  efjl          ",
-        " lllcb          ",
-        " dlc b          ",
-        " gl             ",
-        "  ad            ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 3)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 13 1",
-        "  c None",
-        "a c #126547",
-        "b c #134943",
-        "c c #CBFFBC",
-        "d c #38F639",
-        "e c #2ACB2A",
-        "f c #105835",
-        "h c #16632F",
-        "i c #43FC3F",
-        "j c #259230",
-        "k c #1B8136",
-        "l c #115342",
-        "m c #12542F",
-        /* pixels */
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        " eciii          ",
-        "  diii          ",
-        "  iiei          ",
-        " jiihi          ",
-        " mia e          ",
-        " fk             ",
-        "  bl            ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 4)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 23 1",
-        "  c None",
-        "a c #A81313",
-        "b c #F05151",
-        "c c #650B0B",
-        "d c #F6A3A3",
-        "e c #DD1919",
-        "f c #FFFFFF",
-        "g c #630B0B",
-        "h c #F15858",
-        "i c #7A0D0D",
-        "j c #9C1010",
-        "k c #F16060",
-        "l c #EC1B1B",
-        "m c #E51A1A",
-        "n c #F8B3B3",
-        "o c #ED2222",
-        "p c #A01212",
-        "q c #C91616",
-        "s c #7B0D0D",
-        "t c #F37F7F",
-        "u c #BA1515",
-        "v c #FCDEDE",
-        "w c #971010",
-        /* pixels */
-        "                ",
-        "            gg  ",
-        "             ji ",
-        "          t cqw ",
-        "          vkloa ",
-        "          fdhe  ",
-        "          nkmp  ",
-        "          bmqus ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 5)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 15 1",
-        "  c None",
-        "a c #E4DB13",
-        "b c #F0E943",
-        "c c #F0E945",
-        "d c #FDFCE2",
-        "e c #FBF9CC",
-        "f c #555207",
-        "g c #F3ED6F",
-        "h c #F1EA52",
-        "i c #5B5708",
-        "j c #948E0C",
-        "k c #9D970D",
-        "m c #6D6909",
-        "n c #B2AB0F",
-        "o c #EBE213",
-        /* pixels */
-        "                ",
-        "            if  ",
-        "             cc ",
-        "          g icc ",
-        "          dhocc ",
-        "          cccc  ",
-        "          eckj  ",
-        "          bacnm ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 6)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 9 1",
-        "  c None",
-        "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 */
-        "                ",
-        "            ic  ",
-        "             hd ",
-        "          h hhh ",
-        "          hehhb ",
-        "          hhhh  ",
-        "          hheg  ",
-        "          hhhhf ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    return wxNullBitmap;
-}
-
-wxBitmap moreImages( size_t index )
-{
-    if (index == 0)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,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,
-            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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 1)
-    {
-        static const unsigned char data = 
-        {
-            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,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,
-            111,162,243,111,162,243,121,171,252,121,171,252,21,56,107,21,56,107,84,137,215,101,153,233,101,
-            153,233,80,127,197,92,74,0,178,167,63,212,193,51,92,74,0,77,125,195,111,162,243,111,162,
-            243,121,171,252,121,171,252,110,157,234,18,48,91,18,47,90,62,105,170,101,153,233,82,132,206,
-            92,74,0,178,167,63,239,214,41,239,214,41,179,172,74,79,92,86,110,157,234,121,171,252,121,
-            171,252,121,171,252,69,110,170,15,39,74,18,47,90,21,56,107,62,103,165,92,74,0,178,167,
-            63,255,230,60,255,230,60,255,230,60,237,222,74,92,74,0,92,128,174,121,171,252,98,146,220,
-            62,100,157,15,39,74,15,39,74,18,47,90,50,96,164,56,61,45,179,164,46,245,228,63,255,
-            244,75,255,240,71,255,237,68,246,235,77,160,163,84,86,85,48,45,79,131,15,39,74,15,39,
-            74,24,65,124,15,39,74,18,47,90,63,95,132,82,65,0,108,88,0,173,149,10,204,185,33,
-            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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
+    // Unexpected index: loud in debug builds (got3nks, PR #725 review -- this bank previously
+    // failed silently into a blank icon, which is how an incorrectly-deleted amuleSpecial(25)
+    // almost shipped undetected).
+    wxFAIL_MSG(wxString::Format("clientImages: no icon for index %zu", index));
     return wxNullBitmap;
 }
 
@@ -4780,151 +3884,6 @@
         wxBitmap bitmap( xpm_data );
         return bitmap;
     }
-    if (index == 1)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 2)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 3)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 4 1",
-        "  c None",
-        "b c #FFFFFF",
-        "c c #000080",
-        "d c #BFBFDF",
-        /* pixels */
-        "                ",
-        "  cccccccccccc  ",
-        " cbbbbbbbbbbbbc ",
-        " cbbbbbbbbbbbbc ",
-        " cbbccdbbdccbbc ",
-        " cbbcccddcccbbc ",
-        " cbbdccccccdbbc ",
-        " cbbbdccccdbbbc ",
-        " cbbbdccccdbbbc ",
-        " cbbdccccccdbbc ",
-        " cbbcccddcccbbc ",
-        " cbbccdbbdccbbc ",
-        " cbbbbbbbbbbbbc ",
-        " cbbbbbbbbbbbbc ",
-        "  cccccccccccc  ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 4)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 5 1",
-        "  c None",
-        "b c #FFFFFF",
-        "c c #000080",
-        "d c #E2D704",
-        "e c #BFBFDF",
-        /* pixels */
-        "                ",
-        "  cccccccccccc  ",
-        " cddddddddddddc ",
-        " cdbbbbbbbbbbdc ",
-        " cdbccebbeccbdc ",
-        " cdbccceecccbdc ",
-        " cdbeccccccebdc ",
-        " cdbbeccccebbdc ",
-        " cdbbeccccebbdc ",
-        " cdbeccccccebdc ",
-        " cdbccceecccbdc ",
-        " cdbccebbeccbdc ",
-        " cdbbbbbbbbbbdc ",
-        " cddddddddddddc ",
-        "  cccccccccccc  ",
-        "                "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
     if (index == 5)
     {
         static const unsigned char data = 
@@ -4966,130 +3925,6 @@
         wxBitmap bitmap( image );
         return bitmap;
     }
-    if (index == 6)
-    {
-        static const unsigned char data = 
-        {
-            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,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,
-            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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 7)
-    {
-        static const unsigned char data = 
-        {
-            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,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,
-            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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 8)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "13 7 3 1",
-        "  c None",
-        "b c #FFFFFF",
-        "c c #808080",
-        /* pixels */
-        "ccccccccccccb",
-        " c         b ",
-        "  c       b  ",
-        "   c     b   ",
-        "    c   b    ",
-        "     c b     ",
-        "      b      "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 9)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "13 7 3 1",
-        "  c None",
-        "b c #FFFFFF",
-        "c c #808080",
-        /* pixels */
-        "      c      ",
-        "     c b     ",
-        "    c   b    ",
-        "   c     b   ",
-        "  c       b  ",
-        " c         b ",
-        "cbbbbbbbbbbbb"
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
     if (index == 10)
     {
         static const unsigned char data = 
@@ -5418,47 +4253,6 @@
         wxBitmap bitmap( image );
         return bitmap;
     }
-    if (index == 18)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
     if (index == 19)
     {
         static const unsigned char data = 
@@ -5500,47 +4294,6 @@
         wxBitmap bitmap( image );
         return bitmap;
     }
-    if (index == 20)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,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,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,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,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,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,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,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,
-            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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
     if (index == 21)
     {
         static const unsigned char data = 
@@ -5705,6 +4458,12 @@
         wxBitmap bitmap( image );
         return bitmap;
     }
+    // Only reachable in __DEBUG__ builds: PrefsUnifiedDlg.cpp's pages table has one entry guarded
+    // by #ifdef __DEBUG__ ("Debugging", PreferencesDebug) whose m_imageidx is 25 -- easy to miss
+    // with a release build or a naming-convention-based grep, since every other entry there is
+    // Preferences<Something>Tab. A deleted-by-mistake index here would fail no build; it falls
+    // through to wxNullBitmap, so the only symptom is a blank icon on the Preferences > Debugging
+    // page in a debug build (see PR #725 review).
     if (index == 25)
     {
         static const unsigned char data = 
@@ -5746,2898 +4505,77 @@
         wxBitmap bitmap( image );
         return bitmap;
     }
+    // Unexpected index: loud in debug builds (got3nks, PR #725 review -- this bank previously
+    // failed silently into a blank icon, which is how an incorrectly-deleted amuleSpecial(25)
+    // almost shipped undetected).
+    wxFAIL_MSG(wxString::Format("amuleSpecial: no icon for index %zu", index));
     return wxNullBitmap;
 }
 
-wxBitmap connButImg( size_t index )
+void SetConnectButtonState(
+	wxButton *button, EConnButtonState state, bool enabled, const wxString &networkName)
 {
-    if (index == 0)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,
-            240,240,240,240,240,240,240,240,240,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,240,240,240,240,
-            240,240,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,240,240,240,240,240,240,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,240,240,240,240,240,240,
-            240,240,240,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,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,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,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 1)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,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,240,240,240,240,240,240,240,240,240,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,240,240,240,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,240,240,240,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,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 2)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "32 32 4 1",
-        "  c None",
-        "b c #FFFFFF",
-        "c c #808080",
-        "d c #C0C0C0",
-        /* pixels */
-        "                                ",
-        "                                ",
-        "          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;
-    }
-    return wxNullBitmap;
+	// networkName ("ED2K" / "Kad") is folded into the label itself, not concatenated after
+	// translation: the button sits in the same spot on both tabs, so without it there is
+	// nothing on the button telling you which network "Disconnect" affects (issue #402 review).
+	wxString label;
+	wxString artId;
+	switch (state) {
+	case ConnButtonConnecting:
+		label = wxString(CFormat(_("Cancel %s")) % networkName);
+		artId = "amule:toolbar_connecting";
+		break;
+	case ConnButtonConnected:
+		label = wxString(CFormat(_("Disconnect %s")) % networkName);
+		artId = "amule:toolbar_disconnect";
+		break;
+	default:
+		label = wxString(CFormat(_("Connect %s")) % networkName);
+		artId = "amule:toolbar_connect";
+	}
+	// The button sits inline next to a one-line URL field, where the art's native 32x32 toolbar
+	// size is too big (issue #402 review: "the button and the icon are too big") -- request the
+	// SVG rasterized straight at a more modest logical size instead of the toolbar's native
+	// one.
+	button->SetBitmap(wxArtProvider::GetBitmapBundle(artId, wxART_BUTTON, wxSize(16, 16)));
+
+	// wxButton::SetBitmapMargins() means different things per port that implement it
+	// (msw/anybutton.h, osx/anybutton.h -- wxGTK inherits the base class's no-op): wxOSX stores
+	// it as the margin AROUND the bitmap, both sides including the button edge, so overriding
+	// it there is a real gap fix. wxMSW applies it BETWEEN bitmap and label only, layered on
+	// top of a font-derived default (src/msw/anybutton.cpp: m_margin.x = GetCharWidth();
+	// m_margin.y = GetCharHeight() / 2) that already matches native Windows button metrics --
+	// overriding it with a fixed (4, 0) narrows the gap AND drops the vertical margin to zero,
+	// moving away from the platform convention instead of toward it. So this is wxOSX-only;
+	// wxMSW keeps its native default, and wxGTK falls back to the old trick of a leading space
+	// outside the translatable string (so no new msgid), which depends on no translator
+	// trimming leading whitespace but is otherwise harmless.
+#ifdef __WXOSX__
+	button->SetBitmapMargins(button->FromDIP(4), 0);
+	button->SetLabel(label);
+#elif defined(__WXGTK__)
+	button->SetLabel(wxT(" ") + label);
+#else
+	button->SetLabel(label);
+#endif
+
+	button->Enable(enabled);
+
+	// SetBitmap() grows the button's best size; without a re-layout here, a pane laid out
+	// before its first UpdateXConnectButton() call -- the Servers pane is visible at startup,
+	// unlike Kad's notebook page, which is first laid out only once shown, after its bitmap
+	// already landed -- paints with the stale text-only measurement, so the icon overlaps the
+	// label until the next window resize (#663 review).
+	button->GetParent()->Layout();
 }
 
 wxBitmap amuleDlgImages( size_t index )
 {
-    if (index == 0)
-    {
-        static const unsigned char data = 
-        {
-            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,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,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,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,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,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,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,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,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,
-            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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 1)
-    {
-        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,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,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,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,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,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,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,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,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,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,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,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,
-            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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 2)
-    {
-        static const unsigned char data = 
-        {
-            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,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,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,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 3)
-    {
-        static const unsigned char data = 
-        {
-            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,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,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,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,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 4)
-    {
-        static const unsigned char data = 
-        {
-            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,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,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,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,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,
-            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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 5)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 16 1",
-        "  c None",
-        "a c Black",
-        "b c #110000",
-        "c c #6F4848",
-        "d c #7F0000",
-        "e c #220000",
-        "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 */
-        "          i     ",
-        "         dna    ",
-        "        dnkna   ",
-        "       dnkikna  ",
-        "      ankimikna ",
-        "      aapaopaaa ",
-        "         aha    ",
-        "     lpl aoa    ",
-        "     pop ppa    ",
-        "     ghj        ",
-        "  bebaoabeb     ",
-        "  cnkipiknj     ",
-        "   cnkiknj      ",
-        "    cnknj       ",
-        "     cnj        ",
-        "      i         "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 6)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 17 1",
-        "  c None",
-        "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     ",
-        "     hph  m     ",
-        "     pmp pp     ",
-        "     bdb        ",
-        "  qnqmmmqnq     ",
-        "  foicpciof     ",
-        "   foigiof      ",
-        "    foiof       ",
-        "     fof        ",
-        "      f         "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 7)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 16 1",
-        "  c None",
-        "a c #110000",
-        "b c #6F4848",
-        "c c #220000",
-        "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     ",
-        "     ipi  n     ",
-        "     pnp pp     ",
-        "     efe        ",
-        "  acannnaca     ",
-        "  bmjhphjmh     ",
-        "   bmjhjmh      ",
-        "    hmjmh       ",
-        "     hmh        ",
-        "      h         "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 8)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 12 1",
-        "  c None",
-        "a c #006F00",
-        "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",
-        "l c #00CA00",
-        /* pixels */
-        "          a     ",
-        "         aia    ",
-        "        ailia   ",
-        "       ailalia  ",
-        "      aila alia ",
-        "          gj    ",
-        "          c     ",
-        "     djd  g     ",
-        "     jgj jj     ",
-        "     ece        ",
-        "  khk g khk     ",
-        "  aila afia     ",
-        "   ailalia      ",
-        "    ailia       ",
-        "     aia        ",
-        "      a         "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 9)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "16 16 8 1",
-        "  c None",
-        "b c #FFF0D4",
-        "c c #008000",
-        "d c #800000",
-        "e c #FFAA25",
-        "f c #C0C0C0",
-        "g c #808000",
-        "h c #232375",
-        /* pixels */
-        "                ",
-        "  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;
-    }
-    if (index == 10)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 11)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 12)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,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,240,240,240,240,240,240,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,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,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,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,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,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,
-            251,121,174,233,24,82,156,0,50,108,0,64,139,65,130,199,142,195,253,189,222,251,243,250,255,
-            212,235,254,183,207,230,0,63,138,255,98,98,181,0,1,181,0,1,181,0,1,0,63,138,255,
-            128,128,255,5,4,255,5,4,181,0,1,181,0,1,188,0,3,0,63,138,255,255,0,178,178,
-            0,178,178,0,178,178,0,178,178,0,0,63,138,202,218,234,243,250,255,181,220,251,138,191,251,
-            39,107,184,0,50,108,0,63,138,91,164,225,149,204,251,189,222,251,243,250,255,206,233,255,173,
-            202,230,0,63,138,0,63,138,0,63,138,0,63,138,0,63,138,0,63,138,255,128,128,255,5,
-            4,255,5,4,181,0,1,0,63,138,0,63,138,0,63,138,255,255,0,0,63,138,0,63,138,
-            0,63,138,0,63,138,104,141,186,193,221,244,238,248,255,172,214,254,131,187,249,65,130,199,0,
-            50,108,0,63,138,117,184,238,158,203,252,189,222,251,238,248,255,195,229,255,173,202,230,0,63,
-            138,255,128,128,255,128,128,255,128,128,194,0,0,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,0,63,138,138,162,193,149,175,206,149,
-            179,215,172,203,233,189,222,251,231,244,255,172,214,254,118,177,247,58,133,232,0,50,108,0,63,
-            138,91,164,225,166,210,254,172,214,254,206,233,255,190,225,253,165,198,230,0,63,138,255,128,128,
-            253,255,255,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,0,63,138,0,63,138,0,63,138,0,63,138,77,121,
-            175,179,212,243,203,231,255,149,198,252,99,164,246,55,127,230,0,45,98,0,60,131,83,132,189,
-            158,203,252,166,210,254,190,225,253,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,224,255,255,224,255,255,224,217,217,0,0,63,138,172,203,233,
-            190,225,253,123,180,249,78,148,242,37,108,208,0,45,98,0,63,138,36,95,159,113,166,218,166,
-            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,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,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,
-            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,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,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,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,
-            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,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,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,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,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,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,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,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,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 13)
-    {
-        static const unsigned char data = 
-        {
-            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,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,
-            163,241,88,88,221,25,25,0,24,45,0,25,49,0,51,101,0,122,137,0,138,171,0,150,192,
-            8,202,231,78,206,223,8,202,231,247,247,218,131,223,126,0,64,130,248,179,179,241,96,96,229,
-            26,26,160,18,18,0,24,45,0,32,58,0,64,130,0,64,130,0,64,130,0,64,130,2,70,
-            127,0,64,130,0,24,45,111,231,84,34,208,30,0,64,130,240,81,81,229,26,26,201,22,22,
-            186,21,21,123,13,13,0,24,45,0,64,130,240,81,81,247,173,173,255,255,255,251,216,216,240,
-            81,81,0,24,45,10,170,157,8,129,82,0,64,130,0,24,45,0,24,45,0,24,45,0,24,
-            45,0,24,45,0,24,45,0,47,89,0,64,130,240,76,76,245,145,145,239,72,72,229,26,26,
-            0,24,45,0,141,223,20,133,207,14,123,183,0,87,159,0,82,159,0,75,148,0,64,130,0,
-            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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 14)
-    {
-        static const unsigned char data = 
-        {
-            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,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 15)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,
-            238,121,253,238,121,253,238,121,253,238,121,245,227,114,138,90,37,165,121,54,255,255,255,254,251,
-            221,254,246,188,254,246,188,254,243,155,254,243,155,254,243,155,253,238,121,253,238,121,253,238,121,
-            253,238,121,253,238,121,253,238,121,245,227,114,138,90,37,165,121,54,254,251,221,237,222,159,221,
-            198,131,221,197,123,205,172,90,205,172,90,205,172,90,221,194,97,199,130,68,192,153,75,192,153,
-            75,204,151,76,224,189,95,245,227,114,138,90,37,165,121,54,254,246,188,254,246,188,254,244,172,
-            254,243,155,254,243,155,254,243,155,253,238,121,253,238,121,253,238,121,253,238,121,253,238,121,253,
-            238,121,245,227,114,239,218,109,138,90,37,165,121,54,254,244,172,231,210,126,209,178,98,198,162,
-            85,192,153,75,198,162,85,220,192,94,253,238,121,192,153,75,192,153,75,192,153,75,192,153,75,
-            224,189,95,239,218,109,138,90,37,165,121,54,254,243,155,254,243,155,254,243,155,254,243,155,254,
-            241,138,253,238,121,253,238,121,253,238,121,253,238,121,253,238,121,253,238,121,253,238,121,253,238,
-            121,239,218,109,138,90,37,165,121,54,254,243,155,231,210,126,208,175,81,189,149,66,189,149,66,
-            208,175,81,208,175,81,192,153,68,192,153,75,192,153,75,192,153,75,192,153,75,216,177,87,239,
-            218,109,138,90,37,165,121,54,253,238,121,253,238,121,253,238,121,253,238,121,253,238,121,253,238,
-            121,253,238,121,253,238,121,253,238,121,253,238,121,253,238,121,253,238,121,253,238,121,239,218,109,
-            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,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 16)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,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,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,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,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 17)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "18 19 8 1",
-        "  c None",
-        "b c #00D200",
-        "c c #1DD71D",
-        "d c #55E155",
-        "e c #72E672",
-        "f c #AAF0AA",
-        "g c #C7F5C7",
-        "h c #39DC39",
-        /* pixels */
-        "                  ",
-        "              hbb ",
-        "             bbbe ",
-        "            cbbd  ",
-        "           hbbc   ",
-        "           bbb    ",
-        "          bbbf    ",
-        "         cbbe     ",
-        "        dbbh      ",
-        "        bbc       ",
-        "       cbbf       ",
-        " dbb  dbbd        ",
-        " bbb  bbc         ",
-        " bbbc bbg         ",
-        " hbbbbbe          ",
-        "  bbbbc           ",
-        "  bbbbg           ",
-        "   bbd            ",
-        "                  "
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 18)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,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,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,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,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,
-            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,240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 19)
-    {
-        static const unsigned char data = 
-        {
-            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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 20)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,
-            240,240,240,240,240,240,240,240,240,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,240,240,240,240,
-            240,240,240,240,240,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,240,240,240,240,240,240,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,240,240,240,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,240,240,240,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,240,240,240,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,240,240,240,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,
-            240,240,240,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,240,240,240,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,240,240,240,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,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 21)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,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,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,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,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 22)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 23)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,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,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,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,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,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,
-            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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,240,240,240,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,240,
-            240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 24)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,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,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,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,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,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,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,
-            240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,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,240,240,240,240,240,240,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,240,240,
-            240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 25)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,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,240,240,240,240,240,240,240,240,240,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,240,240,240,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,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,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,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,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,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,
-            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,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,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,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,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,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,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,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,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,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,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,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,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,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,240,240,240,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,240,240,240,240,240,240,240,240,240,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,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 26)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,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,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,240,240,240,240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 27)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,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,240,240,240,240,240,240,240,240,240,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,240,240,240,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,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,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,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,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,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,
-            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,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,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,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,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,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,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,
-            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,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,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,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,
-            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,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,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,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,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,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,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 28)
-    {
-        static const unsigned char data = 
-        {
-            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,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,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,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,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,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,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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 29)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,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,240,240,240,240,240,240,240,240,240,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,240,240,240,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,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,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,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,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,
-            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,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,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,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,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,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,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,
-            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,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,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,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,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,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,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,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,240,240,240,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,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 30)
-    {
-        static const unsigned char data = 
-        {
-            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,
-            254,254,254,254,254,254,254,254,251,251,251,220,220,220,0,0,0,0,0,0,0,0,0,223,223,
-            223,253,253,253,205,239,253,180,232,253,248,251,252,252,252,252,252,252,252,252,252,252,252,252,252,
-            252,252,252,252,252,252,252,252,252,218,218,218,0,0,0,0,0,0,0,0,0,220,220,220,251,
-            251,251,193,234,251,91,207,255,113,213,254,203,237,251,249,249,249,249,249,249,249,249,249,249,249,
-            249,249,249,249,249,249,249,216,216,216,0,0,0,0,0,0,0,0,0,219,219,219,250,250,250,
-            189,230,250,83,200,255,83,200,255,83,200,255,129,213,253,220,239,248,247,247,247,247,247,247,247,
-            247,247,247,247,247,214,214,214,0,0,0,0,0,0,0,0,0,216,216,216,248,248,248,184,225,
-            248,73,191,255,73,191,255,73,191,255,73,191,255,75,192,255,143,213,250,232,240,245,244,244,244,
-            244,244,244,211,211,211,0,0,0,0,0,0,0,0,0,213,213,213,246,246,246,177,219,246,60,
-            179,255,60,179,255,60,179,255,60,179,255,60,179,255,60,179,255,71,183,254,194,225,245,241,241,
-            241,209,209,209,0,0,0,0,0,0,0,0,0,211,211,211,244,244,244,170,213,244,46,167,255,
-            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,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,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 31)
-    {
-        /* XPM */
-        static const char *xpm_data = {
-        /* columns rows colors chars-per-pixel */
-        "15 15 4 1",
-        "a c #1C89FF",
-        "b c #AAD1FF",
-        "c c #0000FF",
-        "d c #5B5AFF",
-        /* pixels */
-        "ddddddddddddddc",
-        "dbbbbbbbbbbbbbc",
-        "dbbbbbbccbbbbbc",
-        "dbbbbbacabbbbbc",
-        "dbbbbbaabbbbbbc",
-        "dbbbbbbccbbbbbc",
-        "dbbbbbaccbbbbbc",
-        "dbbbbbaccbbbbbc",
-        "dbbbbbaccbbbbbc",
-        "dbbbbbaccbbbbbc",
-        "dbbbbbaccbbbbbc",
-        "dbbbbbacabbbbbc",
-        "dbbbbbaabbbbbbc",
-        "dbbbbbbbbbbbbbc",
-        "ccccccccccccccc"
-        };
-        wxBitmap bitmap( xpm_data );
-        return bitmap;
-    }
-    if (index == 32)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,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,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,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,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,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,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,
-            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,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,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,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,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,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,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,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,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,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,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,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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( 240, 240, 240);
-        wxBitmap bitmap( image );
-        return bitmap;
-    }
-    if (index == 33)
-    {
-        static const unsigned char data = 
-        {
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,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,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,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,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,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,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,
-            240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,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,240,240,240,240,240,240,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,240,240,
-            240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,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,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
-            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,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( 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;
-    }
+    // Unexpected index: loud in debug builds (got3nks, PR #725 review -- this bank previously
+    // failed silently into a blank icon, which is how an incorrectly-deleted amuleSpecial(25)
+    // almost shipped undetected).
+    wxFAIL_MSG(wxString::Format("amuleDlgImages: no icon for index %zu", index));
     return wxNullBitmap;
 }
 
-
 // End of generated file

amule-3.0.1.tar.gz/src/muuli_wdr.h -> amule-3.1.0.tar.gz/src/muuli_wdr.h Changed

@@ -26,17 +26,17 @@
 // longer round-trippable; the file is now maintained by hand.
 //
 
-#ifndef __WDR_muuli_H__
-#define __WDR_muuli_H__
+#ifndef MUULI_WDR_H
+#define MUULI_WDR_H
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "muuli_wdr.h"
+#pragma interface "muuli_wdr.h"
 #endif
 
 // Include wxWidgets' headers
 
 #ifndef WX_PRECOMP
-    #include <wx/wx.h>
+#include <wx/wx.h>
 #endif
 
 #include <wx/image.h>
@@ -46,6 +46,7 @@
 #include <wx/splitter.h>
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
+#include <wx/dataview.h>
 #include <wx/notebook.h>
 #include <wx/grid.h>
 #include <wx/toolbar.h>
@@ -57,10 +58,10 @@
 extern wxSizer *contentSizer;
 extern wxSizer *s_fed2klh;
 #define ID_BUTTON_FAST 10000
-wxSizer *muleDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *muleDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_SRV_SPLITTER 10001
-wxSizer *serverListDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *serverListDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 extern wxSizer *s_search_sizer;
 #define IDC_SEARCHNAME 10002
@@ -70,6 +71,9 @@
 extern wxSizer *s_extended_sizer;
 #define IDC_TypeSearch 10006
 #define ID_AUTOCATASSIGN 10007
+// Label of the category selector: has an id so UpdateCatChoice() can grey it
+// out with the choice. Numbered out of block like ID_FILTER_RESET.
+#define ID_AUTOCATASSIGN_LABEL 10509
 #define IDC_EDITSEARCHEXTENSION 10008
 #define IDC_SPINSEARCHMIN 10009
 #define IDC_SEARCHMINSIZE 10010
@@ -78,9 +82,15 @@
 #define IDC_SPINSEARCHAVAILABILITY 10013
 extern wxSizer *s_filter_sizer;
 #define ID_FILTER_TEXT 10014
-#define ID_FILTER 10015
 #define ID_FILTER_INVERT 10016
 #define ID_FILTER_KNOWN 10017
+// Numbered outside the search block: 10014-10025 is contiguous and full. 10493 is the next free
+// value file-wide.
+#define ID_FILTER_RESET 10493
+// Divides the action buttons from the filter row. Carries an id so the dialog can hide it with the
+// row it introduces -- a rule left on its own would sit under the buttons with nothing beneath it.
+// Out of block for the same reason as ID_FILTER_RESET.
+#define ID_FILTER_SEPARATOR 10508
 #define IDC_STARTS 10018
 #define IDC_SEARCHMORE 10019
 #define IDC_CANCELS 10020
@@ -89,21 +99,24 @@
 #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 );
+wxSizer *searchDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_BTNCLRCOMPL 10026
 #define ID_CATEGORIES 10027
 #define ID_DLOADLIST 10028
-wxSizer *transferTopPane( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+// Live text-filter box in the downloads header. Picked above the existing
+// wxDesigner-generated range so a future regeneration doesn't reuse the ID.
+#define IDC_TRANSFER_FILTER 10485
+wxSizer *transferTopPane(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 extern wxSizer *s_clientlistHeader;
 #define ID_CLIENTTOGGLE 10029
 #define ID_CLIENTCOUNT 10030
 #define ID_CLIENTLIST 10031
-wxSizer *transferBottomPane( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *transferBottomPane(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_MESSAGESPLATTER 10032
-wxSizer *messagePage( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *messagePage(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_FNAME 10033
 #define IDC_METFILE 10034
@@ -123,6 +136,28 @@
 #define IDC_FD_STATS1 10048
 #define IDC_FD_STATS2 10049
 #define IDC_FD_STATS3 10050
+#define IDC_FD_MEDIA_LENGTH 10454
+#define IDC_FD_MEDIA_BITRATE 10455
+#define IDC_FD_MEDIA_CODEC 10456
+#define IDC_FD_MEDIA_ARTIST 10457
+#define IDC_FD_MEDIA_ALBUM 10458
+#define IDC_FD_MEDIA_TITLE 10459
+#define IDC_CMSEARCHKAD 10460
+// File-details dialog: the download-only sections live in one panel that is
+// hidden for non-downloading shared files; the sharing stats live in another.
+#define IDC_FD_DOWNLOAD_PANEL 10461
+#define IDC_FD_SHARING_PANEL 10462
+#define IDC_FD_SHARE_REQ 10463
+#define IDC_FD_SHARE_ACC 10464
+#define IDC_FD_SHARE_XFER 10465
+#define IDC_FD_SHARE_RATIO 10466
+#define IDC_FD_SHARE_COMPLSRC 10467
+#define IDC_FD_SHARE_ONQUEUE 10468
+#define IDC_FD_SHARE_UPPRIO 10469
+#define IDC_FD_SHARE_UPSPEED 10470
+#define IDC_FD_SHARE_UPCOUNT 10471
+#define IDC_FD_SHARE_SINCE 10472
+#define IDC_FD_SHARE_LASTUP 10473
 #define IDC_LISTCTRLFILENAMES 10051
 #define IDC_TAKEOVER 10052
 #define IDC_CMTBT 10053
@@ -133,25 +168,25 @@
 #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 );
+wxSizer *fileDetails(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #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 );
+wxSizer *commentDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_LST 10065
 #define IDC_CMSTATUS 10066
 #define IDCREF 10067
-wxSizer *commentLstDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *commentLstDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #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 );
+wxSizer *downloadDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_IPADDRESS 10071
 #define ID_IPORT 10072
@@ -159,10 +194,10 @@
 #define ID_USERHASH 10074
 #define ID_ADDFRIEND 10075
 #define ID_CLOSEDLG 10076
-wxSizer *addFriendDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *addFriendDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_SHARESSPLATTER 10077
-wxSizer *sharedfilesDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *sharedfilesDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_DLOADSCOPE 10078
 #define IDC_C0 10079
@@ -177,7 +212,7 @@
 #define IDC_S0 10088
 #define ID_ACTIVEC 10089
 #define IDC_S1 10090
-wxSizer *statsDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *statsDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_DNAME 10091
 #define ID_DHASH 10092
@@ -189,6 +224,12 @@
 #define ID_DSNAME 10098
 #define IDT_OBFUSCATION 10099
 #define IDT_KAD 10100
+// Peer's protocol-extension word, Client Details. Appended at the end of the id space rather than
+// next to IDT_KAD: the ids are bound implicitly and by value, so inserting one here would renumber
+// every id below. The label carries its own id -- unlike every other label here -- because the
+// whole row is hidden when the peer claims no extension, and a label with id -1 cannot be found.
+#define IDT_MOD_CAPABILITIES 10510
+#define IDT_MOD_CAPABILITIES_LABEL 10511
 #define ID_DDOWNLOADING 10101
 #define ID_DAVDR 10102
 #define ID_DAVUR 10103
@@ -201,7 +242,7 @@
 #define ID_QUEUERANK 10110
 #define ID_DSCORE 10111
 #define ID_CLOSEWND 10112
-wxSizer *clientDetails( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *clientDetails(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_NICK 10113
 #define IDC_LANGUAGE 10114
@@ -222,7 +263,10 @@
 // Picked above the existing wxDesigner-generated range so a future
 // regeneration of muuli_wdr.* doesn't reuse this ID for something else.
 #define IDC_AUTOSTART_LOGIN 10334
-wxSizer *PreferencesGeneralTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+#define IDC_PROTOCOL_ED2K 10335
+#define IDC_PROTOCOL_MAGNET 10336
+#define IDC_ASSOC_COLLECTION 10337
+wxSizer *PreferencesGeneralTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_MAXDOWN 10129
 #define IDC_MAXUP 10130
@@ -235,6 +279,13 @@
 #define IDC_UPNPTCPPORTTEXT 10137
 #define IDC_UPNPTCPPORT 10138
 #define IDC_ADDRESS 10139
+// 10410: bind-to-interface text control, next free above the top of the current range. Its label
+// IDC_INTERFACETEXT lives in the 10355+ orphan-label band below.
+#define IDC_INTERFACE 10410
+// EC-listener bind-to-interface control + its label (Remote Controls tab). Separate from the P2P
+// IDC_INTERFACE above so external-connection traffic can bind to its own interface (issue #330).
+#define IDC_EC_INTERFACE 10474
+#define IDC_EC_INTERFACETEXT 10475
 #define ID_TEXT 10140
 #define IDC_MAXSOURCEPERFILE 10141
 #define IDC_MAXCON 10142
@@ -242,7 +293,7 @@
 #define IDC_NETWORKED2K 10144
 #define IDC_AUTOCONNECT 10145
 #define IDC_RECONN 10146
-wxSizer *PreferencesConnectionTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesConnectionTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_REMOVEDEAD 10147
 #define IDC_SERVERRETRIES 10148
@@ -255,7 +306,7 @@
 #define IDC_SAFESERVERCONNECT 10155
 #define IDC_AUTOCONNECTSTATICONLY 10156
 #define IDC_MANUALSERVERHIGHPRIO 10157
-wxSizer *PreferencesServerTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesServerTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_ICH 10158
 #define IDC_AICHTRUST 10159
@@ -266,11 +317,20 @@
 #define IDC_STARTNEXTFILE_SAME 10164
 #define IDC_STARTNEXTFILE_ALPHA 10165
 #define IDC_ALLOCFULLFILE 10166
+#define IDC_MMAP_ENABLE 10484
 #define IDC_CHECKDISKSPACE 10167
 #define IDC_MINDISKSPACE 10168
 #define IDC_SRCSEEDS 10169
 #define IDC_UAP 10170
-wxSizer *PreferencesFilesTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+// Media metadata extraction (issue #140). In the high band (>= 10420) to clear an eventual
+// wxDesigner regeneration and other in-flight branches: bind-to-interface reserves 10410, so this
+// starts at 10420 with a 10-ID cushion. The label lives in the 10355+ orphan-label band with the
+// other daemon-only ones.
+#define IDC_MEDIAMETA_ENABLED 10420
+#define IDC_MEDIAMETA_FFPROBEPATH 10421
+#define IDC_MEDIAMETA_FFPROBEBROWSE 10422
+#define IDC_MEDIAMETA_FFPROBEDETECT 10423
+wxSizer *PreferencesFilesTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_INCFILES 10171
 #define IDC_SELINCDIR 10172
@@ -282,33 +342,54 @@
 // regeneration of muuli_wdr.* doesn't reuse this ID for something else.
 #define IDC_AUTO_RESCAN_SHARED 10333
 #define IDC_FOLLOW_SYMLINKS_SHARED 10343
-// 10344..10354 are ID_BUTTON* toolbar IDs; 10355..10399 free. The
-// IDs below name orphan labels / static boxes so amulegui can hide
-// them via PrefsUnifiedDlg's amuledOnlyPrefs.
+#define IDC_EXCLUDE_SHARE_PATTERNS 10440
+#define IDC_EXCLUDE_SHARE_REGEX 10441
+#define IDC_EXCLUDE_SHARE_PREVIEW 10442
+#define IDC_EXCLUDE_SHARE_PREVIEW_INFO 10443
+#define IDC_ENABLE_AMULEAPI 10450
+#define IDC_AMULEAPI_PORT 10451
+#define IDC_AMULEAPI_BIND 10452
+#define IDC_AMULEAPI_PASSWD 10453
+#define IDC_AMULEAPI_GUEST_PASSWD 10487
+#define IDC_SEARCHHISTORYENABLED 10488
+#define IDC_AMULEAPI_GUEST_ENABLED 10489
+#define IDC_AMULEAPI_PASSWD_STATE 10490
+#define IDC_AMULEAPI_GUEST_PASSWD_STATE 10491
+#define IDC_CREATEFILESSPARSE 10492
+// 10344..10354 are ID_BUTTON* toolbar IDs; 10355..10399 free. The IDs below name orphan labels /
+// static boxes so amulegui can hide them via PrefsUnifiedDlg's amuledOnlyPrefs.
 #define IDC_ADDRESSTEXT 10355
+#define IDC_INTERFACETEXT 10362
+// Orphan label for the ffprobe path text control. Grouped with the rest so amulegui hides it via
+// amuledOnlyPrefs: probing runs on the daemon, so the remote GUI has no business setting the
+// path.
+#define IDC_MEDIAMETA_FFPROBEPATHTEXT 10370
+#define IDC_ENDGAME 10424
 #define IDC_EXT_CONN_PARAMS_BOX 10356
 #define IDC_EXT_CONN_IPTEXT 10357
 #define IDC_EXT_CONN_TCPPORTTEXT 10358
 #define IDC_EXT_CONN_PASSWDTEXT 10359
+#define IDC_EXT_CONN_REQUIRE_ENCRYPTION 10494
 #define IDC_OSDIRTEXT 10360
 #define IDC_OSUPDATETEXT 10361
-wxSizer *PreferencesDirectoriesTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-
-// IP2Country (GeoIP) preferences tab. 10400+ leaves a clear gap above
-// the existing toolbar / button IDs that crowd the 10350-10354 range
-// (ID_BUTTONMESSAGES, ID_BUTTONSTATISTICS, etc. — sharing an ID with a
-// toolbar button gets the wrong event delivered into the prefs panel).
-#define IDC_GEOIP_SOURCE         10400
-#define IDC_GEOIP_MAXMIND_LIC    10401
-#define IDC_GEOIP_CUSTOM_URL     10402
-#define IDC_GEOIP_AUTOUPDATE     10403
-#define IDC_GEOIP_UPDATE_NOW     10404
-#define IDC_GEOIP_STATUS         10405
-#define IDC_GEOIP_SOURCE_PANEL   10406
-#define IDC_GEOIP_INFO_DBIP      10407
-#define IDC_GEOIP_INFO_MAXMIND   10408
-#define IDC_GEOIP_INFO_CUSTOM    10409
-wxSizer *PreferencesIP2CountryTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesDirectoriesTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
+#ifdef CLIENT_GUI
+wxSizer *PreferencesPathMappingTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
+#endif
+
+// IP2Country (GeoIP) preferences tab. 10400+ leaves a clear gap above the toolbar / button IDs
+// crowding 10350-10354, where sharing an ID gets the wrong event delivered into the prefs panel.
+#define IDC_GEOIP_SOURCE 10400
+#define IDC_GEOIP_MAXMIND_LIC 10401
+#define IDC_GEOIP_CUSTOM_URL 10402
+#define IDC_GEOIP_AUTOUPDATE 10403
+#define IDC_GEOIP_UPDATE_NOW 10404
+#define IDC_GEOIP_STATUS 10405
+#define IDC_GEOIP_SOURCE_PANEL 10406
+#define IDC_GEOIP_INFO_DBIP 10407
+#define IDC_GEOIP_INFO_MAXMIND 10408
+#define IDC_GEOIP_INFO_CUSTOM 10409
+wxSizer *PreferencesIP2CountryTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_SLIDERINFO 10177
 #define IDC_SLIDER 10178
@@ -323,7 +404,7 @@
 #define IDC_SLIDERINFO2 10187
 #define IDC_SLIDER2 10188
 #define IDC_CLIENTVERSIONS 10189
-wxSizer *PreferencesStatisticsTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesStatisticsTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_AMULE_TWEAKS_WARNING 10190
 #define IDC_MAXCON5SEC 10191
@@ -334,7 +415,13 @@
 #define IDC_SERVERKEEPALIVE_LABEL 10196
 #define IDC_SERVERKEEPALIVE 10197
 #define IDC_PREVENT_SLEEP 10198
-wxSizer *PreferencesaMuleTweaksTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+// At 10430+ to clear both the 10420-10429 media-metadata cushion (IDC_MEDIAMETA_*, plus IDC_ENDGAME
+// at 10424) and any future wxDesigner regeneration.
+#define IDC_KADMAXSEARCHES 10430
+#define IDC_KADREASKTIME 10431
+#define IDC_SOURCEREASKTIME 10432
+#define IDC_TWEAKS_RESET 10433
+wxSizer *PreferencesaMuleTweaksTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_SKIN 10199
 #define IDC_FED2KLH 10200
@@ -349,8 +436,7 @@
 #define IDC_PERCENT 10209
 #define IDC_PROGBAR 10210
 #define IDC_3DDEPTH 10211
-#define IDC_AUTOSORT 10212
-wxSizer *PreferencesGuiTweaksTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesGuiTweaksTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_EXT_CONN_ACCEPT 10213
 #define IDC_EXT_CONN_IP 10214
@@ -368,13 +454,13 @@
 #define IDC_WEBUPNPTCPPORT 10226
 #define IDC_WEB_REFRESH_TIMEOUT 10227
 #define IDC_WEB_GZIP 10228
-wxSizer *PreferencesRemoteControlsTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesRemoteControlsTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 extern wxSizer *prefs_sizer;
 #define ID_PREFSLISTCTRL 10229
 #define ID_PREFS_OK_TOP 10230
 #define ID_PREFS_CANCEL_TOP 10231
-wxSizer *preferencesDlgTop( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *preferencesDlgTop(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_TITLE 10232
 #define IDC_COMMENT 10233
@@ -383,18 +469,44 @@
 #define IDC_PRIOCOMBO 10236
 #define ID_BOX_CATCOLOR 10237
 #define IDC_CATCOLOR 10238
-wxSizer *CategoriesEditWindow( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *CategoriesEditWindow(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_DOWNLOADSSPLATTER 10239
-wxSizer *transferDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *transferDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_SERVERINFO 10240
 #define ID_BTN_RESET_SERVER 10241
-wxSizer *ServerInfoLog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *ServerInfoLog(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_LOGVIEW 10242
 #define ID_BTN_RESET 10243
-wxSizer *aMuleLog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *aMuleLog(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
+
+// amulegui only: a second log tab for the GUI client's own messages, so the
+// "aMule Log" tab shows just the daemon/core log forwarded over EC.
+#define ID_GUILOGVIEW 10476
+#define ID_BTN_RESET_GUILOG 10477
+
+// Remote-GUI shared-folders editor (CLIENT_GUI only). The directory tree browses *this* machine,
+// the wrong filesystem when the daemon is remote, so amulegui edits the daemon's roots as an
+// explicit path list.
+#define IDC_SHAREDDIRS_LIST 10478
+#define IDC_SHAREDDIR_PATH 10479
+#define IDC_SHAREDDIR_RECURSIVE 10480
+#define IDC_SHAREDDIR_ADD 10481
+#define IDC_SHAREDDIR_REMOVE 10482
+// Interface (GUI Tweaks) tab: toggle live column auto-sorting of the lists.
+#define IDC_LIVELISTSORT 10483
+// Remote-GUI path-mapping editor (CLIENT_GUI only, issue #843): a user-configured remote->local
+// path-prefix table, so Open and Show-in-folder work against a daemon on another machine.
+#define IDC_PATHMAP_LIST 10496
+#define IDC_PATHMAP_REMOTE 10497
+#define IDC_PATHMAP_LOCAL 10498
+#define IDC_PATHMAP_BROWSE 10499
+#define IDC_PATHMAP_ADD 10500
+#define IDC_PATHMAP_REMOVE 10501
+#define IDC_PATHMAP_HINT 10502
+wxSizer *aMuleGuiLog(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_UPDATELIST 10244
 #define IDC_SERVERLISTURL 10245
@@ -404,26 +516,22 @@
 #define ID_ADDTOLIST 10249
 #define IDC_ED2KDISCONNECT 10250
 #define ID_SERVERLIST 10251
-wxSizer *serverListDlgUp( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *serverListDlgUp(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_SRVLOG_NOTEBOOK 10252
-wxSizer *serverListDlgDown( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *serverListDlgDown(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_UPDATEKADLIST 10253
 #define IDC_NODESLISTURL 10254
 #define ID_KADSCOPE 10255
-#define ID_NODE_IP1 10256
-#define ID_NODE_IP2 10257
-#define ID_NODE_IP3 10258
-#define ID_NODE_IP4 10259
+#define ID_NODE_IP 10256
 #define ID_NODE_PORT 10260
 #define ID_NODECONNECT 10261
-#define ID_KNOWNNODECONNECT 10262
 #define ID_KADDISCONNECT 10263
-wxSizer *KadDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *KadDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_ED2KINFO 10264
-wxSizer *ED2K_Info( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *ED2K_Info(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_SECIDENT 10265
 #define IDC_SUPPORT_PO 10266
@@ -440,13 +548,13 @@
 #define IDC_FILTERLAN 10277
 #define IDC_PARANOID 10278
 #define IDC_IPFILTERSYS 10279
-wxSizer *PreferencesSecurityTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesSecurityTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_ONLINESIG 10280
 #define IDC_OSUPDATE 10281
 #define IDC_OSDIR 10282
 #define IDC_SELOSDIR 10283
-wxSizer *PreferencesOnlineSigTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesOnlineSigTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_MSGFILTER 10284
 #define IDC_MSGFILTER_ALL 10285
@@ -457,7 +565,7 @@
 #define IDC_MSGLOG 10290
 #define IDC_FILTERCOMMENTS 10291
 #define IDC_COMMENTWORD 10292
-wxSizer *PreferencesFilteringTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesFilteringTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_PROXY_ENABLE_PASSWORD 10294
 #define ID_PROXY_USER 10295
@@ -466,20 +574,20 @@
 #define ID_PROXY_TYPE 10298
 #define ID_PROXY_NAME 10299
 #define ID_PROXY_PORT 10300
-wxSizer *PreferencesProxyTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesProxyTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_REMOTE_HOST 10301
 #define ID_REMOTE_PORT 10302
-#define ID_EC_LOGIN 10303
 #define ID_EC_PASSWD 10304
 #define ID_EC_SAVE 10305
 #define ID_EC_FORCE_ZLIB 10344
-wxSizer *CoreConnect( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+#define ID_EC_ENCRYPTION 10495
+wxSizer *CoreConnect(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_VERBOSEDEBUG 10306
 #define ID_VERBOSEDEBUGLOGFILE 10307
 #define ID_DEBUGCATS 10308
-wxSizer *PreferencesDebug( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesDebug(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 extern wxSizer *IDC_CURJOB;
 #define IDC_CONV_PB_LABEL 10309
@@ -489,18 +597,18 @@
 #define IDC_ADDITEM 10313
 #define IDC_RETRY 10314
 #define IDC_CONVREMOVE 10315
-wxSizer *convertDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *convertDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_KADINFO 10316
-wxSizer *Kad_Info( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *Kad_Info(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 extern wxSizer *m_networknotebooksizer;
 #define ID_NETNOTEBOOK 10317
-wxSizer *NetDialog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *NetDialog(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 extern wxSizer *IDC_PREFS_EVENTS_PAGE;
 #define IDC_EVENTLIST 10318
-wxSizer *PreferencesEventsTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *PreferencesEventsTab(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 extern wxSizer *s_sharedfilespeerHeader;
 #define ID_SHAREDCLIENTTOGGLE 10319
@@ -509,27 +617,29 @@
 #define IDC_STRANSFERRED 10322
 #define ID_LINE 10323
 #define ID_SHAREDCLIENTLIST 10324
-wxSizer *sharedfilesBottomDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *sharedfilesBottomDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_SHOW_CLIENTS_MODE 10325
 #define ID_BTNRELSHARED 10326
 #define ID_SHFILELIST 10327
-wxSizer *sharedfilesTopDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+// Live text-filter box in the shared-files header. Picked above the existing
+// wxDesigner-generated range so a future regeneration doesn't reuse the ID.
+#define IDC_SHARED_FILTER 10486
+wxSizer *sharedfilesTopDlg(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define ID_FRIENDLIST 10328
-wxSizer *messagePageFriends( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *messagePageFriends(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 #define IDC_CHATSELECTOR 10329
 #define IDC_CMESSAGE 10330
 #define IDC_CSEND 10331
 #define IDC_CCLOSE 10332
-wxSizer *messagePageMessages( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+wxSizer *messagePageMessages(wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE);
 
 // Declare menubar functions
 
 // Declare toolbar functions
 
-#define ID_BUTTONCONNECT 10345
 #define ID_BUTTONNETWORKS 10346
 #define ID_BUTTONSEARCH 10347
 #define ID_BUTTONDOWNLOADS 10348
@@ -539,23 +649,33 @@
 #define ID_BUTTONNEWPREFERENCES 10352
 #define ID_BUTTONIMPORT 10353
 #define ID_ABOUT 10354
-void muleToolbar( wxToolBar *parent );
+// Appended rather than slotted between the panel buttons above: saved toolbar state references
+// those values, so renumbering would silently move a user's buttons. 10503 upwards is the first
+// free pair.
+#define ID_BUTTONCLIENTS 10503
+#define ID_CLIENTSLIST 10504
+#define ID_CLIENTHISTORYLIST 10505
+#define ID_CLIENTSUPLIST 10506
+#define ID_CLIENTSSPLITTER 10507
 
 // Declare bitmap functions
 
-wxBitmap clientImages( size_t index );
-
-wxBitmap dlStatusImages( size_t index );
-
-wxBitmap connImages( size_t index );
-
-wxBitmap moreImages( size_t index );
+wxBitmap clientImages(size_t index);
 
-wxBitmap amuleSpecial( size_t index );
+wxBitmap amuleSpecial(size_t index);
 
-wxBitmap connButImg( size_t index );
+wxBitmap amuleDlgImages(size_t index);
 
-wxBitmap amuleDlgImages( size_t index );
+// Shared by CServerWnd::UpdateED2KConnectButton() and CKadDlg::UpdateConnectButton(): both panes'
+// Connect/Cancel/Disconnect buttons need the same label/bitmap/enabled-state logic.
+enum EConnButtonState
+{
+	ConnButtonOff,
+	ConnButtonConnecting,
+	ConnButtonConnected
+};
+void SetConnectButtonState(
+	wxButton *button, EConnButtonState state, bool enabled, const wxString &networkName);
 
 #endif

amule-3.0.1.tar.gz/src/skins/Mac_Gray.zip -> amule-3.1.0.tar.gz/src/skins/Mac_Gray.zip Changed

amule-3.0.1.tar.gz/src/updownclient.h -> amule-3.1.0.tar.gz/src/updownclient.h Changed

@@ -26,21 +26,22 @@
 #ifndef UPDOWNCLIENT_H
 #define UPDOWNCLIENT_H
 
-#include "Constants.h"		// Needed for ESourceFrom
-#include "GetTickCount.h"	// Needed for GetTickCount64
+#include "Constants.h"    // Needed for ESourceFrom
+#include "GetTickCount.h" // Needed for GetTickCount64
 #include "MD4Hash.h"
 #include <common/StringFunctions.h>
 #include <common/Macros.h>
 #include "NetworkFunctions.h"
+#include "NetworkAddress.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 "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 "PeerCapabilities.h" // Needed for CPeerCapabilities
 
 #include <map>
-#include <wx/thread.h>		// Needed for wxMutex
-
+#include <wx/thread.h> // Needed for wxMutex
 
 class CPartFile;
 class CClientTCPSocket;
@@ -50,9 +51,9 @@
 class CMemFile;
 class CAICHHash;
 
-
-enum EChatCaptchaState {
-	CA_NONE				= 0,
+enum EChatCaptchaState
+{
+	CA_NONE = 0,
 	CA_CHALLENGESENT,
 	CA_CAPTCHASOLVED,
 	CA_ACCEPTING,
@@ -60,21 +61,24 @@
 	CA_SOLUTIONSENT
 };
 
-enum ESecureIdentState {
-	IS_UNAVAILABLE		= 0,
-	IS_ALLREQUESTSSEND	= 0,
-	IS_SIGNATURENEEDED	= 1,
-	IS_KEYANDSIGNEEDED	= 2
+enum ESecureIdentState
+{
+	IS_UNAVAILABLE = 0,
+	IS_ALLREQUESTSSEND = 0,
+	IS_SIGNATURENEEDED = 1,
+	IS_KEYANDSIGNEEDED = 2
 };
 
-enum EInfoPacketState {
-	IP_NONE			= 0,
-	IP_EDONKEYPROTPACK	= 1,
-	IP_EMULEPROTPACK	= 2,
-	IP_BOTH			= 3
+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,
@@ -88,6 +92,16 @@
 	KS_CONNECTING_FWCHECK_UDP
 };
 
+// Lifecycle of a "View Files" (browse peer shared files) request. The values are a wire contract,
+// sent verbatim in EC_TAG_SEARCH_BROWSE_STATUS so a remote GUI can render the browse tab's marker.
+enum EBrowseStatus
+{
+	BROWSE_NONE = 0,    // no browse in flight for this client
+	BROWSE_IN_PROGRESS, // request sent / results still arriving
+	BROWSE_FINISHED,    // peer finished sending its shared-file list
+	BROWSE_FAILED       // denied, connect failed, or disconnected mid-list
+};
+
 //! Used to keep track of the state of the client
 enum ClientState
 {
@@ -102,515 +116,627 @@
 // This is fixed on ed2k v1, but can be any number on ED2Kv2
 #define STANDARD_BLOCKS_REQUEST 3
 
+/**
+ * What TryToConnect did about the peer it was asked to reach.
+ *
+ * It used to answer with a bool that meant three different things -- and the one the browse code
+ * needed, "did you actually try?", was not among them, so that code inferred it from side effects
+ * instead. The inference was wrong twice, both times because an exit was added or moved without
+ * anything forcing a decision about what it meant (amule-org/amule#1071). Naming the outcomes turns
+ * that from a silent default into a choice somebody has to make.
+ */
+enum class EContactResult
+{
+	//! A connection attempt or a callback request is under way.
+	Contacting,
+	//! Nothing was sent: this peer cannot be reached the way things stand.
+	//! The client is still valid.
+	Declined,
+	//! Connect() declined to start, because the socket was already live. Kept distinct only to
+	//! preserve the historical bool, which callers have always been told is "false" here.
+	ConnectNotStarted,
+	//! The client was destroyed on the way out. Touching it is undefined.
+	ClientDeleted
+};
+
 class CUpDownClient : public CECID
 {
 	friend class CClientList;
 	friend class CClientRef;
+
 private:
-	/**
-	 * Please note that only the ClientList is allowed to delete the clients.
-	 * To schedule a client for deletion, call the CClientList::AddToDeleteQueue
-	 * function, which will safely remove dead clients once every second.
-	 */
+	/// Only the ClientList may delete clients. To schedule one, call
+	/// CClientList::AddToDeleteQueue, which safely removes dead clients once a second.
 	~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.
-	 */
+	/// Reference count, increased whenever the client is linked to a CClientRef. Clients are
+	/// stored only by ClientRefs; a CUpDownClient * is for temporary use. Linking is done only
+	/// by CClientRef, which is a friend, so the methods are private.
 	uint16 m_linked;
 #ifdef DEBUG_ZOMBIE_CLIENTS
-	bool	m_linkedDebug;
+	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() {
+	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) {
+		for (std::multiset<wxString>::iterator it = m_linkedFrom.begin(); it != m_linkedFrom.end();
+			++it) {
 			ret += *it + ", ";
 		}
 		return ret;
 	}
 #else
-	void	Link()		{ m_linked++; }
-	void	Unlink();
+	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);
-
+	CUpDownClient(CClientTCPSocket *sender = 0);
+	CUpDownClient(uint16 in_port,
+		uint32 in_userid,
+		uint32 in_serverup,
+		uint16 in_serverport,
+		CPartFile *in_reqfile,
+		bool ed2kID,
+		bool checkfriend);
+
+	/// Call when the client object is to be deleted: closes its socket and removes it from the
+	/// lists that can own it. The object is really deleted only once the last reference is
+	/// unlinked.
+	void Safe_Delete();
+
+	/// True once Safe_Delete has queued the client for deletion.
+	bool HasBeenDeleted() { return m_clientState == CS_DYING; }
+
+	ClientState GetClientState() { return m_clientState; }
+
+	bool Disconnected(const wxString &strReason, bool bFromSocket = false);
+	/// Try to reach this peer, and say which of the three things happened. Prefer this over the
+	/// bool overload when the answer matters: "I decided not to" and "I am on my way" are
+	/// different facts, and only this spelling carries them.
+	EContactResult TryToContact(bool bIgnoreMaxCon = false);
+	/// As TryToContact, reduced to the historical answer: false means the client was deleted
+	/// (or Connect() declined to start) and must not be touched again.
+	bool TryToConnect(bool bIgnoreMaxCon = false);
+	bool Connect();
+	void ConnectionEstablished();
+	const wxString &GetUserName() const { return m_Username; }
+	// Only use this when you know the real IP or when your clearing it.
+	void SetIP(uint32 val);
+	void SetUserAddress(const CNetworkAddress &address);
+	const CNetworkAddress &GetUserAddress() const { return m_userAddress; }
+	uint32 GetIP() const { return m_userAddress.ToIPv4NetworkOrderOrZero(); }
+	bool HasLowID() const { return IsLowID(m_nUserIDHybrid); }
 	/**
-	 * 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 peer's address as text.
 	 *
-	 * The client will really be deleted only after thelast reference to it
-	 * is unlinked;
+	 * m_FullUserIP is the IPv4 form and is zero for a peer that has none, so rendering it
+	 * unconditionally printed "0.0.0.0" for every such peer -- in the client list, in the logs
+	 * and over EC, where they were then indistinguishable from each other. The address itself
+	 * is what the reader wants; the numeric form stays IPv4-only, and GetFullIPNumeric() is
+	 * still the accessor for callers that need it.
 	 */
-	void		Safe_Delete();
+	wxString GetFullIP() const
+	{
+		return m_FullUserIP != 0 || m_userAddress.IsAbsent() ? Uint32toStringIP(m_FullUserIP)
+								     : m_userAddress.ToWxString();
+	}
+	// The numeric form of GetFullIP(), for callers that do not need the string. Named to be
+	// hard to confuse with it: the GeoIP resolver overloads on the argument type, so passing
+	// the string variant compiles and silently takes the uncached path.
+	uint32 GetFullIPNumeric() const { return m_FullUserIP; }
+	// Country ISO code accessors (#439). Unconditional, so the shared drawing code compiles
+	// regardless of the resolver gate. Monolithic amule resolves locally; the remote GUI gets
+	// these over EC.
+	const wxString &GetCountryCode() const { return m_countryCode; }
+	bool IsCountryFromCore() const { return m_countryFromCore; }
+	void SetCountryCode(const wxString &code)
+	{
+		m_countryCode = code;
+		m_countryFromCore = true;
+	}
+	uint32 GetConnectIP() const { return m_connectAddress.ToIPv4NetworkOrderOrZero(); }
+	const CNetworkAddress &GetConnectAddress() const { return m_connectAddress; }
+	//! Whether the peer has an IPv4 form, from the best address known so far.
+	bool HasPeerIPv4() const;
+	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; }
+	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; }
+	void SetServerPort(uint16 nPort) { m_nServerPort = nPort; }
+	const CMD4Hash &GetUserHash() const { return m_UserHash; }
+	void SetUserHash(const CMD4Hash &userhash);
+	void ValidateHash() { m_HasValidHash = !m_UserHash.IsEmpty(); }
+	bool HasValidHash() const { return m_HasValidHash; }
+	uint32 GetVersion() const { return m_nClientVersion; }
+	uint8 GetMuleVersion() const { return m_byEmuleVersion; }
+	bool ExtProtocolAvailable() const { return m_bEmuleProtocol; }
+	bool IsEmuleClient() const { return (m_byEmuleVersion > 0); }
+	bool IsBanned() const;
+	const wxString &GetClientFilename() const { return m_clientFilename; }
+	uint16 GetUDPPort() const { return m_nUDPPort; }
+	void SetUDPPort(uint16 nPort) { m_nUDPPort = nPort; }
+	uint8 GetUDPVersion() const { return m_byUDPVer; }
+	uint8 GetExtendedRequestsVersion() const { return m_byExtendedRequestsVer; }
+	bool IsFriend() const { return m_Friend != NULL; }
+	bool IsML() const { return m_bIsML; }
+	bool IsHybrid() const { return m_bIsHybrid; }
+	uint32 GetCompatibleClient() const { return m_byCompatibleClient; }
+
+	void ClearDownloadBlockRequests();
+	void RequestSharedFileList();
+	/// Put this browse's ask on the wire, if it is still waiting for one. Shared by the two
+	/// ways a browse reaches the peer: after a connect (ConnectionEstablished) and over an
+	/// already open socket (RequestSharedFileList). Carries the single-shot guard and re-bases
+	/// the browse's silence deadline onto the moment the ask went out, so neither caller can
+	/// get one without the other.
+	void SendSharedFilesRequest();
+	/// Re-check the standing reasons to refuse this peer -- obfuscation settings, IP filter,
+	/// ban list -- disconnecting it on a hit. Contacting means clean; ClientDeleted means
+	/// `this` is gone. Shared by TryToContact and the already-connected browse path: all three
+	/// checks are settings-derived, and every one of those settings can change while a
+	/// connection is open.
+	EContactResult CheckContactPreconditions();
+	//! The address the security checks below are made against.
+	CNetworkAddress ContactAddress() const;
+	//! Whether a socket whose stream died may be dialled again over TCP: every refusal
+	//! CheckContactPreconditions() makes, asked without acting on the answer.
+	bool IsRedialAllowed() const;
+	void ProcessSharedFileList(const uint8_t *pachPacket, uint32 nSize, wxString &pszDirectory);
+	void SendSharedDirectories();
+	void SendSharedFilesOfDirectory(const wxString &strReqDir);
+
+	wxString GetUploadFileInfo();
+
+	void SetUserName(const wxString &NewName) { m_Username = NewName; }
+
+	uint8 GetClientSoft() const { return m_clientSoft; }
+	void ReGetClientSoft();
+	bool ProcessHelloAnswer(const uint8_t *pachPacket, uint32 nSize);
+	bool ProcessHelloPacket(const uint8_t *pachPacket, uint32 nSize);
+	void SendHelloAnswer();
+	bool SendHelloPacket();
+	void SendMuleInfoPacket(bool bAnswer, bool OSInfo = false);
+	bool ProcessMuleInfoPacket(const uint8_t *pachPacket, uint32 nSize);
+	void ProcessMuleCommentPacket(const uint8_t *pachPacket, uint32 nSize);
+	bool Compare(const CUpDownClient *tocomp, bool bIgnoreUserhash = false) const;
+	void SetLastSrcReqTime() { m_dwLastSourceRequest = ::GetTickCount64(); }
+	void SetLastSrcAnswerTime() { m_dwLastSourceAnswer = ::GetTickCount64(); }
+	void SetLastAskedForSources() { m_dwLastAskedForSources = ::GetTickCount64(); }
+	uint64 GetLastSrcReqTime() const { return m_dwLastSourceRequest; }
+	uint64 GetLastSrcAnswerTime() const { return m_dwLastSourceAnswer; }
+	uint64 GetLastAskedForSources() const { return m_dwLastAskedForSources; }
+	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; }
+
+	bool SafeSendPacket(CPacket *packet);
+
+	void ProcessRequestPartsPacket(const uint8_t *pachPacket, uint32 nSize, bool largeblocks);
+
+	void SendPublicKeyPacket();
+	void SendSignaturePacket();
+	void ProcessPublicKeyPacket(const uint8_t *pachPacket, uint32 nSize);
+	void ProcessSignaturePacket(const uint8_t *pachPacket, uint32 nSize);
+	uint8 GetSecureIdentState();
+
+	void SendSecIdentStatePacket();
+	void ProcessSecIdentStatePacket(const uint8_t *pachPacket, uint32 nSize);
+
+	uint8 GetInfoPacketsReceived() const { return m_byInfopacketsReceived; }
+	void InfoPacketsReceived();
+
+	// upload
+	uint8 GetUploadState() const { return m_nUploadState; }
+	void SetUploadState(uint8 news);
+	uint64 GetTransferredUp() const { return m_nTransferredUp; }
+	uint64 GetSessionUp() const { return m_nTransferredUp - m_nCurSessionUp; }
+	void ResetSessionUp();
+	uint32 GetUploadDatarate() const { return m_nUpDatarate; }
+
+	uint64 GetUpStartTimeDelay() const { return ::GetTickCount64() - m_dwUploadTime; }
+	uint64 GetWaitStartTime() const;
+
+	bool IsDownloading() const { return (m_nUploadState == US_UPLOADING); }
+
+	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, bool bSignalIOThread = true);
+	void SetUpStartTime() { m_dwUploadTime = ::GetTickCount64(); }
+	void SetWaitStartTime();
+	void ClearWaitStartTime();
+	void SendHashsetPacket(const CMD4Hash &forfileid);
+	bool SupportMultiPacket() const { return m_bMultiPacket; }
+	bool SupportExtMultiPacket() const { return m_fExtMultiPacket; }
+
+	void SetUploadFileID(CKnownFile *newreqfile);
+
+	/// The file currently being uploaded.
+	const CKnownFile *GetUploadFile() const { return m_uploadingfile; }
+
+	void SendOutOfPartReqsAndAddToWaitingQueue();
+	void ProcessExtendedInfo(const CMemFile *data, CKnownFile *tempreqfile);
+	void ProcessFileInfo(const CMemFile *data, const CPartFile *file);
+	void ProcessFileStatus(bool bUdpPacket, const CMemFile *data, const CPartFile *file);
+
+	const CMD4Hash &GetUploadFileID() const { return m_requpfileid; }
+	void SetUploadFileID(const CMD4Hash &new_id);
+	void ClearUploadFileID()
+	{
+		m_requpfileid.Clear();
+		m_uploadingfile = NULL;
+	}
+	uint32 SendBlockData();
+	void ClearUploadBlockRequests();
+	void SendRankingInfo();
+	void SendCommentInfo(CKnownFile *file);
+	bool IsDifferentPartBlock() const;
+	void UnBan();
+	void Ban();
+	bool m_bAddNextConnect; // VQB Fix for LowID slots only on connection
+	uint32 GetAskedCount() const { return m_cAsked; }
+	void AddAskedCount() { m_cAsked++; }
+	void ClearAskedCount() { m_cAsked = 1; } // 1, because it's cleared *after* the first request...
+	void FlushSendBlocks();                  // call this when you stop upload,
+						 // or the socket might be not able to send
+	void SetLastUpRequest() { m_dwLastUpRequest = ::GetTickCount64(); }
+	uint64 GetLastUpRequest() const { return m_dwLastUpRequest; }
+	size_t GetUpPartCount() const { return m_upPartStatus.size(); }
+
+	// download
+	void SetRequestFile(CPartFile *reqfile);
+	CPartFile *GetRequestFile() const { return m_reqfile; }
+
+	uint8 GetDownloadState() const { return m_nDownloadState; }
+	void SetDownloadState(uint8 byNewState);
+	uint64 GetLastAskedTime() const { return m_dwLastAskedTime; }
+	void ResetLastAskedTime() { m_dwLastAskedTime = 0; }
+
+	bool IsPartAvailable(uint16 iPart) const
+	{
+		return (iPart < m_downPartStatus.size()) ? m_downPartStatus.get(iPart) : 0;
+	}
+	bool IsUpPartAvailable(uint16 iPart) const
+	{
+		return (iPart < m_upPartStatus.size()) ? m_upPartStatus.get(iPart) : 0;
+	}
 
-	/**
-	 * Specifies if the client has been queued for deletion.
-	 *
-	 * @return True if Safe_Delete has been called, false otherwise.
-	 */
-	bool		HasBeenDeleted()		{ return m_clientState == CS_DYING; }
-
-	ClientState	GetClientState()		{ return m_clientState; }
-
-	bool		Disconnected(const wxString& strReason, bool bFromSocket = false);
-	bool		TryToConnect(bool bIgnoreMaxCon = false);
-	bool		Connect();
-	void		ConnectionEstablished();
-	const wxString&	GetUserName() const		{ return m_Username; }
-	//Only use this when you know the real IP or when your clearing it.
-	void		SetIP( uint32 val );
-	uint32		GetIP() const			{ return m_dwUserIP; }
-	bool		HasLowID() const		{ return IsLowID(m_nUserIDHybrid); }
-	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; }
-	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; }
-	void		SetServerPort(uint16 nPort)	{ m_nServerPort = nPort; }
-	const CMD4Hash&	GetUserHash() const		{ return m_UserHash; }
-	void		SetUserHash(const CMD4Hash& userhash);
-	void		ValidateHash()			{ m_HasValidHash = !m_UserHash.IsEmpty(); }
-	bool		HasValidHash() const		{ return m_HasValidHash; }
-	uint32		GetVersion() const		{ return m_nClientVersion;}
-	uint8		GetMuleVersion() const		{ return m_byEmuleVersion;}
-	bool		ExtProtocolAvailable() const	{ return m_bEmuleProtocol;}
-	bool		IsEmuleClient()	const		{ return (m_byEmuleVersion > 0);}
-	bool		IsBanned() const;
-	const wxString&	GetClientFilename() const	{ return m_clientFilename; }
-	uint16		GetUDPPort() const		{ return m_nUDPPort; }
-	void		SetUDPPort(uint16 nPort)	{ m_nUDPPort = nPort; }
-	uint8		GetUDPVersion() const		{ return m_byUDPVer; }
-	uint8		GetExtendedRequestsVersion() const { return m_byExtendedRequestsVer; }
-	bool		IsFriend() const		{ return m_Friend != NULL; }
-	bool		IsML() const			{ return m_bIsML; }
-	bool		IsHybrid() const		{ return m_bIsHybrid; }
-	uint32		GetCompatibleClient() const	{ return m_byCompatibleClient; }
-
-	void		ClearDownloadBlockRequests();
-	void		RequestSharedFileList();
-	void		ProcessSharedFileList(const uint8_t* pachPacket, uint32 nSize, wxString& pszDirectory);
-	void		SendSharedDirectories();
-	void		SendSharedFilesOfDirectory(const wxString& strReqDir);
-
-	wxString	GetUploadFileInfo();
-
-	void		SetUserName(const wxString& NewName) { m_Username = NewName; }
-
-	uint8		GetClientSoft() const		{ return m_clientSoft; }
-	void		ReGetClientSoft();
-	bool		ProcessHelloAnswer(const uint8_t* pachPacket, uint32 nSize);
-	bool		ProcessHelloPacket(const uint8_t* pachPacket, uint32 nSize);
-	void		SendHelloAnswer();
-	bool		SendHelloPacket();
-	void		SendMuleInfoPacket(bool bAnswer, bool OSInfo = false);
-	bool		ProcessMuleInfoPacket(const uint8_t* pachPacket, uint32 nSize);
-	void		ProcessMuleCommentPacket(const uint8_t* pachPacket, uint32 nSize);
-	bool		Compare(const CUpDownClient* tocomp, bool bIgnoreUserhash = false) const;
-	void		SetLastSrcReqTime()		{ m_dwLastSourceRequest = ::GetTickCount64(); }
-	void		SetLastSrcAnswerTime()		{ m_dwLastSourceAnswer = ::GetTickCount64(); }
-	void		SetLastAskedForSources()	{ m_dwLastAskedForSources = ::GetTickCount64(); }
-	uint64		GetLastSrcReqTime() const	{ return m_dwLastSourceRequest; }
-	uint64		GetLastSrcAnswerTime() const	{ return m_dwLastSourceAnswer; }
-	uint64		GetLastAskedForSources() const	{ return m_dwLastAskedForSources; }
-	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; }
-
-	bool		SafeSendPacket(CPacket* packet);
-
-	void		ProcessRequestPartsPacket(const uint8_t* pachPacket, uint32 nSize, bool largeblocks);
-	void		ProcessRequestPartsPacketv2(const CMemFile& data);
-
-	void		SendPublicKeyPacket();
-	void		SendSignaturePacket();
-	void		ProcessPublicKeyPacket(const uint8_t* pachPacket, uint32 nSize);
-	void		ProcessSignaturePacket(const uint8_t* pachPacket, uint32 nSize);
-	uint8		GetSecureIdentState();
-
-	void		SendSecIdentStatePacket();
-	void		ProcessSecIdentStatePacket(const uint8_t* pachPacket, uint32 nSize);
-
-	uint8		GetInfoPacketsReceived() const	{ return m_byInfopacketsReceived; }
-	void		InfoPacketsReceived();
-
-	//upload
-	uint8		GetUploadState() const		{ return m_nUploadState; }
-	void		SetUploadState(uint8 news);
-	uint64		GetTransferredUp() const	{ return m_nTransferredUp; }
-	uint64		GetSessionUp() const		{ return m_nTransferredUp - m_nCurSessionUp; }
-	void		ResetSessionUp();
-	uint32		GetUploadDatarate() const	{ return m_nUpDatarate; }
-
-	//uint32		GetWaitTime() const		{ return m_dwUploadTime - GetWaitStartTime(); }
-	uint64		GetUpStartTimeDelay() const	{ return ::GetTickCount64() - m_dwUploadTime; }
-	uint64		GetWaitStartTime() const;
-
-	bool		IsDownloading()	const		{ return (m_nUploadState == US_UPLOADING); }
-
-	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, bool bSignalIOThread = true);
-	void		SetUpStartTime()		{ m_dwUploadTime = ::GetTickCount64(); }
-	void		SetWaitStartTime();
-	void		ClearWaitStartTime();
-	void		SendHashsetPacket(const CMD4Hash& forfileid);
-	bool		SupportMultiPacket() const	{ return m_bMultiPacket; }
-	bool		SupportExtMultiPacket() const	{ return m_fExtMultiPacket; }
-
-	void		SetUploadFileID(CKnownFile *newreqfile);
+	const BitVector &GetPartStatus() const { return m_downPartStatus; }
+	const BitVector &GetUpPartStatus() const { return m_upPartStatus; }
+	float GetKBpsDown() const { return kBpsDown; }
+	float CalculateKBpsDown();
+	uint16 GetRemoteQueueRank() const { return m_nRemoteQueueRank; }
+	uint16 GetOldRemoteQueueRank() const { return m_nOldRemoteQueueRank; }
+	void SetRemoteQueueFull(bool flag) { m_bRemoteQueueFull = flag; }
+	bool IsRemoteQueueFull() const { return m_bRemoteQueueFull; }
+	void SetRemoteQueueRank(uint16 nr);
+	bool AskForDownload();
+	void SendStartupLoadReq();
+	void SendFileRequest();
+	void ProcessHashSet(const uint8_t *packet, uint32 size);
+	bool AddRequestForAnotherFile(CPartFile *file);
+	bool DeleteFileRequest(CPartFile *file);
+	void DeleteAllFileRequests();
+	void SendBlockRequests();
+	void ProcessBlockPacket(const uint8_t *packet, uint32 size, bool packed, bool largeblocks);
+	uint16 GetAvailablePartCount() const;
+	bool HasUsefulBlocksFor(CUpDownClient *other) const;
+
+	bool SwapToAnotherFile(bool bIgnoreNoNeeded,
+		bool ignoreSuspensions,
+		bool bRemoveCompletely,
+		CPartFile *toFile = NULL);
+	void UDPReaskACK(uint16 nNewQR);
+	void UDPReaskFNF();
+	void UDPReaskForDownload();
+	bool IsSourceRequestAllowed();
+	uint16 GetUpCompleteSourcesCount() const { return m_nUpCompleteSourcesCount; }
+	void SetUpCompleteSourcesCount(uint16 n) { m_nUpCompleteSourcesCount = n; }
 
-	/**
-	 *Gets the file actually on upload
-	 *
-	 */
-	const CKnownFile* GetUploadFile() const		{ return m_uploadingfile; }
-
-	void		SendOutOfPartReqsAndAddToWaitingQueue();
-	void		ProcessExtendedInfo(const CMemFile *data, CKnownFile *tempreqfile);
-	void		ProcessFileInfo(const CMemFile* data, const CPartFile* file);
-	void		ProcessFileStatus(bool bUdpPacket, const CMemFile* data, const CPartFile* file);
-
-	const CMD4Hash&	GetUploadFileID() const		{ return m_requpfileid; }
-	void		SetUploadFileID(const CMD4Hash& new_id);
-	void		ClearUploadFileID()		{ m_requpfileid.Clear(); m_uploadingfile = NULL;}
-	uint32		SendBlockData();
-	void		ClearUploadBlockRequests();
-	void		SendRankingInfo();
-	void		SendCommentInfo(CKnownFile *file);
-	bool		IsDifferentPartBlock() const;
-	void		UnBan();
-	void		Ban();
-	bool		m_bAddNextConnect;      // VQB Fix for LowID slots only on connection
-	uint32		GetAskedCount() const		{ return m_cAsked; }
-	void		AddAskedCount()			{ m_cAsked++; }
-	void		ClearAskedCount()		{ m_cAsked = 1; }	// 1, because it's cleared *after* the first request...
-	void		FlushSendBlocks();	// call this when you stop upload,
-						// or the socket might be not able to send
-	void		SetLastUpRequest()		{ m_dwLastUpRequest = ::GetTickCount64(); }
-	uint64		GetLastUpRequest() const	{ return m_dwLastUpRequest; }
-	size_t		GetUpPartCount() const		{ return m_upPartStatus.size(); }
-
-
-	//download
-	void		SetRequestFile(CPartFile* reqfile);
-	CPartFile*	GetRequestFile() const		{ return m_reqfile; }
-
-	uint8		GetDownloadState() const	{ return m_nDownloadState; }
-	void		SetDownloadState(uint8 byNewState);
-	uint64		GetLastAskedTime() const	{ return m_dwLastAskedTime; }
-	void		ResetLastAskedTime()		{ m_dwLastAskedTime = 0; }
-
-	bool		IsPartAvailable(uint16 iPart) const
-					{ return ( iPart < m_downPartStatus.size() ) ? m_downPartStatus.get(iPart) : 0; }
-	bool		IsUpPartAvailable(uint16 iPart) const
-					{ 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		CalculateKBpsDown();
-	uint16		GetRemoteQueueRank() const	{ return m_nRemoteQueueRank; }
-	uint16		GetOldRemoteQueueRank() const	{ return m_nOldRemoteQueueRank; }
-	void		SetRemoteQueueFull(bool flag)	{ m_bRemoteQueueFull = flag; }
-	bool		IsRemoteQueueFull() const	{ return m_bRemoteQueueFull; }
-	void		SetRemoteQueueRank(uint16 nr);
-	bool		AskForDownload();
-	void		SendStartupLoadReq();
-	void		SendFileRequest();
-	void		ProcessHashSet(const uint8_t* packet, uint32 size);
-	bool		AddRequestForAnotherFile(CPartFile* file);
-	bool		DeleteFileRequest(CPartFile* file);
-	void		DeleteAllFileRequests();
-	void		SendBlockRequests();
-	void		ProcessBlockPacket(const uint8_t* packet, uint32 size, bool packed, bool largeblocks);
-	uint16		GetAvailablePartCount() const;
-
-	bool		SwapToAnotherFile(bool bIgnoreNoNeeded, bool ignoreSuspensions, bool bRemoveCompletely, CPartFile* toFile = NULL);
-	void		UDPReaskACK(uint16 nNewQR);
-	void		UDPReaskFNF();
-	void		UDPReaskForDownload();
-	bool		IsSourceRequestAllowed();
-	uint16		GetUpCompleteSourcesCount() const	{ return m_nUpCompleteSourcesCount; }
-	void		SetUpCompleteSourcesCount(uint16 n)	{ m_nUpCompleteSourcesCount = n; }
-
-	//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);
+	// 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; }
-	uint8		GetFileRating() const		{ return m_iRating; }
-
-	const wxString&	GetSoftStr() const		{ return m_clientSoftString; }
-	const wxString&	GetSoftVerStr() const		{ return m_clientVerString; }
+	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; }
+	uint8 GetFileRating() const { return m_iRating; }
+
+	const wxString &GetSoftStr() const { return m_clientSoftString; }
+	const wxString &GetSoftVerStr() const { return m_clientVerString; }
 	const wxString GetServerName() const;
 
-	uint16		GetKadPort() const		{ return m_nKadPort; }
-	void		SetKadPort(uint16 nPort)	{ m_nKadPort = nPort; }
+	uint16 GetKadPort() const { return m_nKadPort; }
+	void SetKadPort(uint16 nPort) { m_nKadPort = nPort; }
 
 	// Kry - AICH import
-	void		SetReqFileAICHHash(CAICHHash* val);
-	CAICHHash*	GetReqFileAICHHash() const	{return m_pReqFileAICHHash;}
-	bool		IsSupportingAICH() const	{return m_fSupportsAICH & 0x01;}
-	void		SendAICHRequest(CPartFile* pForFile, uint16 nPart);
-	bool		IsAICHReqPending() const	{return m_fAICHRequested; }
-	void		ProcessAICHAnswer(const uint8_t* packet, uint32 size);
-	void		ProcessAICHRequest(const uint8_t* packet, uint32 size);
-	void		ProcessAICHFileHash(CMemFile* data, const CPartFile* file);
+	void SetReqFileAICHHash(CAICHHash *val);
+	CAICHHash *GetReqFileAICHHash() const { return m_pReqFileAICHHash; }
+	bool IsSupportingAICH() const { return m_fSupportsAICH & 0x01; }
+	void SendAICHRequest(CPartFile *pForFile, uint16 nPart);
+	bool IsAICHReqPending() const { return m_fAICHRequested; }
+	void ProcessAICHAnswer(const uint8_t *packet, uint32 size);
+	void ProcessAICHRequest(const uint8_t *packet, uint32 size);
+	void ProcessAICHFileHash(CMemFile *data, const CPartFile *file);
 
-	EUtf8Str	GetUnicodeSupport() const;
+	EUtf8Str GetUnicodeSupport() const;
 
 	// Barry - Process zip file as it arrives, don't need to wait until end of block
-	int		unzip(Pending_Block_Struct *block, uint8_t *zipped, uint32 lenZipped, uint8_t **unzipped, uint32 *lenUnzipped, int iRecursion = 0);
-	void		UpdateDisplayedInfo(bool force = false);
-	int		GetFileListRequested() const	{ return m_iFileListRequested; }
-	void		SetFileListRequested(int iFileListRequested) { m_iFileListRequested = iFileListRequested; }
+	int unzip(Pending_Block_Struct *block,
+		uint8_t *zipped,
+		uint32 lenZipped,
+		uint8_t **unzipped,
+		uint32 *lenUnzipped,
+		int iRecursion = 0);
+	void UpdateDisplayedInfo(bool force = false);
+
+	// "View Files" (browse): the search ID this peer's listing is filed under, allocated before
+	// the request goes out -- by the EC handler for a remote browse, by RequestSharedFileList
+	// for a local one -- so it is the single key for the browse everywhere. 0 means never
+	// browsed.
+	uint32 GetBrowseSearchId() const { return m_browseSearchId; }
+	/// Whether this browse was asked for by a remote client rather than here. Recorded when the
+	/// ID is pinned, NOT inferred from the ID being set: a local browse allocates one of its
+	/// own before the request goes out, so "has an ID" stopped telling the two apart.
+	/// Simplifying this back to `m_browseSearchId != 0` compiles, passes, and silently stops
+	/// every local browse revealing its tab. Both the result path and the browse-started
+	/// notification need the answer: a browse someone else asked for must not pull this user's
+	/// panel or selection.
+	bool IsBrowseEcInitiated() const { return m_browseEcInitiated; }
+	/**
+	 * Hand the next browse of this peer an ID somebody else allocated.
+	 *
+	 * Only the EC and friend handlers call this; a local browse chooses its own inside
+	 * RequestSharedFileList, so pinning is also what marks the browse as somebody else's.
+	 *
+	 * 0 means "nothing to pin", not "forget the ID you have": both callers pass the EC-
+	 * allocated ID or 0, and 0 is what a monolithic browse and a legacy EC client both supply.
+	 * Wiping the remembered ID on those left RequestSharedFileList unable to find the peer's
+	 * previous record, so it allocated afresh and orphaned the registration, results and browse
+	 * record behind it.
+	 *
+	 * The pin is consumed by the next RequestSharedFileList, which otherwise chooses for
+	 * itself. Whether one was pinned cannot be inferred later: an ID whose record has been
+	 * disposed of looks exactly like one just handed over.
+	 */
+	void PinBrowseSearchId(uint32 id)
+	{
+		if (id == 0) {
+			return;
+		}
+		m_browseSearchId = id;
+		m_browseEcInitiated = true;
+		m_browsePinned = true;
+	}
 
-	void		ResetFileStatusInfo();
+	void ResetFileStatusInfo();
 
-	bool		CheckHandshakeFinished() const;
+	bool CheckHandshakeFinished() const;
 
-	bool		GetSentCancelTransfer() const	{ return m_fSentCancelTransfer; }
-	void		SetSentCancelTransfer(bool bVal)	{ m_fSentCancelTransfer = bVal; }
+	bool GetSentCancelTransfer() const { return m_fSentCancelTransfer; }
+	void SetSentCancelTransfer(bool bVal) { m_fSentCancelTransfer = bVal; }
 
-	DEBUG_ONLY( wxString	GetClientFullInfo(); )
-	wxString	GetClientShortInfo();
+	DEBUG_ONLY(wxString GetClientFullInfo();)
+	wxString GetClientShortInfo();
 
-	const wxString& GetClientOSInfo() const		{ return m_sClientOSInfo; }
+	const wxString &GetClientOSInfo() const { return m_sClientOSInfo; }
 
-	void		ProcessPublicIPAnswer(const uint8_t* pbyData, uint32 uSize);
-	void		SendPublicIPRequest();
+	void ProcessPublicIPAnswer(const uint8_t *pbyData, uint32 uSize);
+	void SendPublicIPRequest();
 
-	/**
-	 * Sets the current socket of the client.
-	 *
-	 * @param socket The pointer to the new socket, can be NULL.
-	 *
-	 * Please note that this function DOES NOT delete the old socket.
-	 */
-	void		SetSocket(CClientTCPSocket* socket);
+	/// Sets the client's current socket, which may be NULL. Does NOT delete the old one.
+	void SetSocket(CClientTCPSocket *socket);
 
-	/**
-	 * Function for accessing the socket owned by a client.
-	 *
-	 * @return The pointer (can be NULL) to the socket used by this client.
-	 *
-	 * Please note that the socket object is quite volatile and can be removed
-	 * from one function call to the next, therefore, you should normally use
-	 * the safer functions below, which all check if the socket is valid before
-	 * deferring it.
-	 */
-	CClientTCPSocket* GetSocket() const		{ return m_socket; }
+	/// The socket this client uses, possibly NULL. The socket object is volatile and can vanish
+	/// between two calls, so prefer the safer wrappers below, which check it first.
+	CClientTCPSocket *GetSocket() const { return m_socket; }
 
-	/**
-	 * Safe function for checking if the socket is connected.
-	 *
-	 * @return True if the socket exists and is connected, false otherwise.
-	 */
-	bool		IsConnected() const;
+	/// True if the socket exists and is connected.
+	bool IsConnected() const;
 
-	/**
-	 * Safe function for sending packets.
-	 *
-	 * @return True if the socket exists and the packet was sent, false otherwise.
-	 */
-	bool		SendPacket(CPacket* packet, bool delpacket = true, bool controlpacket = true);
+	/// Sends a packet. False if there is no socket or the send failed.
+	bool SendPacket(CPacket *packet, bool delpacket = true, bool controlpacket = true);
 
-	/**
-	 * Per-tick poke from CPartFile::Process. Re-arms this client's
-	 * socket if it suspended last tick because the global
-	 * CDownloadBandwidthThrottler bucket was empty, and returns the
-	 * client's current observed download speed for the per-file
-	 * kBpsDown display sum.
-	 *
-	 * The download cap (thePrefs::GetMaxDownload()) is enforced
-	 * globally inside the throttler, not per-client.
-	 */
-	float		TickDownloadAndMeasure();
+	/// Per-tick poke from CPartFile::Process. Re-arms this client's socket if it suspended last
+	/// tick because the global CDownloadBandwidthThrottler bucket was empty, and returns the
+	/// client's current observed download speed for the per-file kBpsDown display sum. The
+	/// download cap (thePrefs::GetMaxDownload()) is enforced globally inside the throttler, not
+	/// per client.
+	float TickDownloadAndMeasure();
 
-	/**
-	 * Sends a message to a client
-	 *
-	 * @return True if sent, false if connecting
-	 */
-	bool		SendChatMessage(const wxString& message);
+	/// Sends a message to the client. False if still connecting.
+	bool SendChatMessage(const wxString &message);
 
-	bool		HasBlocks() const		{ return !m_BlockRequests_queue.empty(); }
+	bool HasBlocks() const { return !m_BlockRequests_queue.empty(); }
 
 	/* Source comes from? */
-	ESourceFrom		GetSourceFrom() const	{ return m_nSourceFrom; }
-	void			SetSourceFrom(ESourceFrom val)	{ m_nSourceFrom = val; }
+	ESourceFrom GetSourceFrom() const { return m_nSourceFrom; }
+	void SetSourceFrom(ESourceFrom val) { m_nSourceFrom = val; }
 
 	/* Kad buddy support */
 	// ID
-	const uint8_t*	GetBuddyID() const	{ return m_achBuddyID; }
-	void		SetBuddyID(const uint8_t* m_achTempBuddyID);
-	bool		HasValidBuddyID() const		{ return m_bBuddyIDValid; }
+	const uint8_t *GetBuddyID() const { return m_achBuddyID; }
+	void SetBuddyID(const uint8_t *m_achTempBuddyID);
+	bool HasValidBuddyID() const { return m_bBuddyIDValid; }
 	/* IP */
-	void		SetBuddyIP( uint32 val )	{ m_nBuddyIP = val; }
-	uint32		GetBuddyIP() const		{ return m_nBuddyIP; }
+	void SetBuddyIP(uint32 val) { m_nBuddyIP = val; }
+	uint32 GetBuddyIP() const { return m_nBuddyIP; }
 	/* Port */
-	void		SetBuddyPort( uint16 val )	{ m_nBuddyPort = val; }
-	uint16		GetBuddyPort() const		{ return m_nBuddyPort; }
-
-	//KadIPCheck
-	bool		SendBuddyPingPong()		{ return m_dwLastBuddyPingPongTime < ::GetTickCount64(); }
-	bool		AllowIncomeingBuddyPingPong()	{ return m_dwLastBuddyPingPongTime < (::GetTickCount64()-(3*60*1000)); }
-	void		SetLastBuddyPingPongTime()	{ m_dwLastBuddyPingPongTime = (::GetTickCount64()+(10*60*1000)); }
-	EKadState	GetKadState() const		{ return m_nKadState; }
-	void		SetKadState(EKadState nNewS)	{ m_nKadState = nNewS; }
-	uint8		GetKadVersion()			{ return m_byKadVersion; }
-	void		ProcessFirewallCheckUDPRequest(CMemFile *data);
+	void SetBuddyPort(uint16 val) { m_nBuddyPort = val; }
+	uint16 GetBuddyPort() const { return m_nBuddyPort; }
+
+	// KadIPCheck
+	bool SendBuddyPingPong() { return m_dwLastBuddyPingPongTime < ::GetTickCount64(); }
+	bool AllowIncomeingBuddyPingPong()
+	{
+		return m_dwLastBuddyPingPongTime < (::GetTickCount64() - (3 * 60 * 1000));
+	}
+	void SetLastBuddyPingPongTime()
+	{
+		m_dwLastBuddyPingPongTime = (::GetTickCount64() + (10 * 60 * 1000));
+	}
+	EKadState GetKadState() const { return m_nKadState; }
+	void SetKadState(EKadState nNewS) { m_nKadState = nNewS; }
+	uint8 GetKadVersion() { return m_byKadVersion; }
+	void ProcessFirewallCheckUDPRequest(CMemFile *data);
+
+	//! What the peer claimed in CT_MOD_MISCOPTIONS (eMuleAI vendor capabilities). Recorded
+	//! only: aMule implements none of them and advertises none back. See
+	//! src/PeerCapabilities.h.
+	const CPeerCapabilities &GetModCapabilities() const { return m_modCapabilities; }
+	//! The peer's own IPv6 address from CT_MOD_IP_V6, big-endian, 16 bytes.
+	//! Only meaningful while HasModIPv6() is true.
+	const uint8_t *GetModIPv6() const { return m_modIPv6; }
+	bool HasModIPv6() const { return m_hasModIPv6; }
+	//! The peer's serving buddy's IPv6 address from CT_EMULE_SERVINGBUDDYIPV6, big-endian, 16
+	//! bytes. Only meaningful while HasServingBuddyIPv6() is true.
+	const uint8_t *GetServingBuddyIPv6() const { return m_servingBuddyIPv6; }
+	bool HasServingBuddyIPv6() const { return m_hasServingBuddyIPv6; }
 	// Kad added by me
-	bool		SendBuddyPing();
+	bool SendBuddyPing();
 
 	/* Returns the client hash type (SO_EMULE, mldonkey, etc) */
-	int		GetHashType() const;
+	int GetHashType() const;
 
-	/**
-	 * Checks that a client isn't aggressively re-asking for files.
-	 *
-	 * Call this when a file is requested. If the time since the last request is
-	 * less than MIN_REQUESTTIME, 3 is added to the m_Aggressiveness variable.
-	 * If the time since the last request is >= MIN_REQUESTTIME, the variable is
-	 * decremented by 1. The client is banned if the variable reaches 10 or above.
-	 *
-	 * To check if a client is aggressive use the IsClientAggressive() function.
-	 *
-	 * Currently this function is called when the following packets are received:
-	 *  - OP_STARTUPLOADREQ
-	 *  - OP_REASKFILEPING
-	 */
-	void		CheckForAggressive();
+	/// Checks that a client isn't aggressively re-asking for files. Call on every file request:
+	/// a gap below MIN_REQUESTTIME adds 3 to m_Aggressiveness, a longer one subtracts 1, and
+	/// the client is banned at 10. Read the verdict with IsClientAggressive(). Currently called
+	/// for OP_STARTUPLOADREQ and OP_REASKFILEPING.
+	void CheckForAggressive();
 
-	const wxString&	GetClientModString() const	{ return m_strModVersion; }
+	const wxString &GetClientModString() const { return m_strModVersion; }
 
-	const wxString&	GetClientVerString() const	{ return m_fullClientVerString; }
+	const wxString &GetClientVerString() const { return m_fullClientVerString; }
 
-	const wxString&	GetVersionString() const	{ return m_clientVersionString; }
+	const wxString &GetVersionString() const { return m_clientVersionString; }
 
-	void		UpdateStats();
+	void UpdateStats();
 
 	/* Returns a pointer to the credits, only for hash purposes */
-	void*		GetCreditsHash() const { return (void*)credits; }
+	void *GetCreditsHash() const { return (void *)credits; }
 
-	uint16		GetLastDownloadingPart() const { return m_lastDownloadingPart; }
+	uint16 GetLastDownloadingPart() const { return m_lastDownloadingPart; }
 
-	bool		GetOSInfoSupport() const { return m_fOsInfoSupport; }
+	bool GetOSInfoSupport() const { return m_fOsInfoSupport; }
 
-	bool		GetVBTTags() const { return m_fValueBasedTypeTags; }
+	uint16 GetLastPartAsked() const { return m_lastPartAsked; }
 
-	uint16		GetLastPartAsked() const { return m_lastPartAsked; }
+	void SetLastPartAsked(uint16 nPart) { m_lastPartAsked = nPart; }
 
-	void		SetLastPartAsked(uint16 nPart) { m_lastPartAsked = nPart; }
+	CFriend *GetFriend() const { return m_Friend; }
 
-	CFriend*	GetFriend() const { return m_Friend; }
+	void SetFriend(CFriend *newfriend) { m_Friend = newfriend; }
 
-	void		SetFriend(CFriend* newfriend) { m_Friend = newfriend; }
+	bool IsIdentified() const;
 
-	bool		IsIdentified() const;
+	bool IsBadGuy() const;
 
-	bool		IsBadGuy() const;
+	bool SUIFailed() const;
 
-	bool		SUIFailed() const;
+	bool SUINeeded() const;
 
-	bool		SUINeeded() const;
+	bool SUINotSupported() const;
 
-	bool		SUINotSupported() const;
+	uint64 GetDownloadedTotal() const;
 
-	uint64		GetDownloadedTotal() const;
+	uint64 GetUploadedTotal() const;
 
-	uint64		GetUploadedTotal() const;
+	double GetScoreRatio() const;
 
-	double		GetScoreRatio() const;
+	//! The credit modifier to show the user: no identity gate, unlike GetScoreRatio.
+	double GetCreditRatio() const;
 
-	bool		SupportsLargeFiles() const { return m_fSupportsLargeFiles; }
+	bool SupportsLargeFiles() const { return m_fSupportsLargeFiles; }
 
-	EIdentState	GetCurrentIdentState() const { return credits ? credits->GetCurrentIdentState(GetIP()) : IS_NOTAVAILABLE; }
+	EIdentState GetCurrentIdentState() const
+	{
+		return credits ? credits->GetCurrentIdentState(GetUserAddress()) : IS_NOTAVAILABLE;
+	}
 
 #ifdef __DEBUG__
 	/* Kry - Debug. See connection_reason definition comment below */
-	void		SetConnectionReason(const wxString& reason) { connection_reason = reason; }
+	void SetConnectionReason(const wxString &reason) { connection_reason = reason; }
 #endif
 
 	// Encryption / Obfuscation / ConnectOptions
-	bool		SupportsCryptLayer() const			{ return m_fSupportsCryptLayer; }
-	bool		RequestsCryptLayer() const			{ return SupportsCryptLayer() && m_fRequestsCryptLayer; }
-	bool		RequiresCryptLayer() const			{ return RequestsCryptLayer() && m_fRequiresCryptLayer; }
-	bool		SupportsDirectUDPCallback() const		{ return m_fDirectUDPCallback != 0 && HasValidHash() && GetKadPort() != 0; }
-	uint64_t	GetDirectCallbackTimeout() const		{ return m_dwDirectCallbackTimeout; }
-	bool		HasObfuscatedConnectionBeenEstablished() const	{ return m_hasbeenobfuscatinglately; }
-
-	void		SetCryptLayerSupport(bool bVal)			{ m_fSupportsCryptLayer = bVal ? 1 : 0; }
-	void		SetCryptLayerRequest(bool bVal)			{ m_fRequestsCryptLayer = bVal ? 1 : 0; }
-	void		SetCryptLayerRequires(bool bVal)		{ m_fRequiresCryptLayer = bVal ? 1 : 0; }
-	void		SetDirectUDPCallbackSupport(bool bVal)		{ m_fDirectUDPCallback = bVal ? 1 : 0; }
-	void		SetConnectOptions(uint8_t options, bool encryption = true, bool callback = true); // shortcut, sets crypt, callback, etc from the tagvalue we receive
-	bool		ShouldReceiveCryptUDPPackets() const;
-
-	bool		HasDisabledSharedFiles() const { return m_fNoViewSharedFiles; }
+	bool SupportsCryptLayer() const { return m_fSupportsCryptLayer; }
+	bool RequestsCryptLayer() const { return SupportsCryptLayer() && m_fRequestsCryptLayer; }
+	bool RequiresCryptLayer() const { return RequestsCryptLayer() && m_fRequiresCryptLayer; }
+	bool SupportsDirectUDPCallback() const
+	{
+		return m_fDirectUDPCallback != 0 && HasValidHash() && GetKadPort() != 0;
+	}
+	uint64_t GetDirectCallbackTimeout() const { return m_dwDirectCallbackTimeout; }
+	bool HasObfuscatedConnectionBeenEstablished() const { return m_hasbeenobfuscatinglately; }
+
+	void SetCryptLayerSupport(bool bVal) { m_fSupportsCryptLayer = bVal ? 1 : 0; }
+	void SetCryptLayerRequest(bool bVal) { m_fRequestsCryptLayer = bVal ? 1 : 0; }
+	void SetCryptLayerRequires(bool bVal) { m_fRequiresCryptLayer = bVal ? 1 : 0; }
+	void SetDirectUDPCallbackSupport(bool bVal) { m_fDirectUDPCallback = bVal ? 1 : 0; }
+	void SetConnectOptions(uint8_t options,
+		bool encryption = true,
+		bool callback = true); // shortcut, sets crypt, callback, etc from the tagvalue we receive
+	bool ShouldReceiveCryptUDPPackets() const;
+	//! Whether an ed2k stream to this peer should carry obfuscation.
+	bool WantsStreamObfuscation() const;
+
+	bool HasDisabledSharedFiles() const { return m_fNoViewSharedFiles; }
 
 private:
+	CClientCredits *credits;
+	CFriend *m_Friend;
 
-	CClientCredits	*credits;
-	CFriend		*m_Friend;
-
-	uint64		m_nTransferredUp;
-	sint64		m_nCurQueueSessionPayloadUp;
-	sint64		m_addedPayloadQueueSession;
+	uint64 m_nTransferredUp;
+	sint64 m_nCurQueueSessionPayloadUp;
+	sint64 m_addedPayloadQueueSession;
 
-	struct TransferredData {
-		uint32	datalen;
-		uint64	timestamp;
+	struct TransferredData
+	{
+		uint32 datalen;
+		uint64 timestamp;
 	};
 
-	//////////////////////////////////////////////////////////
 	// Upload data rate computation
-	//
-	uint32		m_nUpDatarate;
-	uint32		m_nSumForAvgUpDataRate;
+	uint32 m_nUpDatarate;
+	uint32 m_nSumForAvgUpDataRate;
 	std::list<TransferredData> m_AvarageUDR_list;
 
-
-	/**
-	 * This struct is used to keep track of CPartFiles which this source shares.
-	 */
-	struct A4AFStamp {
+	/// Tracks the CPartFiles this source shares.
+	struct A4AFStamp
+	{
 		//! Signifies if this sources has needed parts for this file.
 		bool NeededParts;
 		//! This is set when we wish to avoid swapping to this file for a while.
@@ -618,240 +744,236 @@
 	};
 
 	//! I typedef in the name of readability!
-	typedef std::map<CPartFile*, A4AFStamp> A4AFList;
+	typedef std::map<CPartFile *, A4AFStamp> A4AFList;
 	//! This list contains all PartFiles which this client can be used as a source for.
 	A4AFList m_A4AF_list;
 
-	/**
-	 * Helper function used by SwapToAnotherFile().
-	 *
-	 * @param it The iterator of the PartFile to be examined.
-	 * @param ignorenoneeded Do not check for the status NoNeededParts when checking the file.
-	 * @param ignoresuspended Do not check the timestamp when checking the file.
-	 * @return True if the file is a viable target, false otherwise.
-	 *
-	 * This function is used to perform checks to see if we should consider
-	 * this file a viable target for A4AF swapping. Unless ignoresuspended is
-	 * true, it will examine the timestamp of the file and reset it if needed.
-	 */
-	bool		IsValidSwapTarget( A4AFList::iterator it, bool ignorenoneeded = false, bool ignoresuspended = false );
-
-	CPartFile*	m_reqfile;
-
-	// base
-	void		Init();
-	bool		ProcessHelloTypePacket(const CMemFile& data);
-	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;
-	uint32		m_nUserIDHybrid;
-	uint16_t	m_nUserPort;
-	int16		m_nServerPort;
-	uint32		m_nClientVersion;
-	uint32		m_cSendblock;
-	uint8		m_byEmuleVersion;
-	uint8		m_byDataCompVer;
-	bool		m_bEmuleProtocol;
-	wxString	m_Username;
-	uint32		m_FullUserIP;
-	CMD4Hash	m_UserHash;
-	bool		m_HasValidHash;
-	uint16		m_nUDPPort;
-	uint8		m_byUDPVer;
-	uint8		m_bySourceExchange1Ver;
-	uint8		m_byAcceptCommentVer;
-	uint8		m_byExtendedRequestsVer;
-	uint8		m_clientSoft;
-	uint64		m_dwLastSourceRequest;
-	uint64		m_dwLastSourceAnswer;
-	uint64		m_dwLastAskedForSources;
-	int		m_iFileListRequested;
-	bool		m_bFriendSlot;
-	bool		m_bCommentDirty;
-	bool		m_bIsHybrid;
-	bool		m_bIsML;
-	bool		m_bSupportsPreview;
-	bool		m_bUnicodeSupport;
-	uint16		m_nKadPort;
-	bool		m_bMultiPacket;
-	ClientState	m_clientState;
-	CClientTCPSocket*	m_socket;
-	bool		m_fNeedOurPublicIP; // we requested our IP from this client
+	/// Helper for SwapToAnotherFile(): true if the file at @a it is a viable A4AF swap target.
+	/// @a ignorenoneeded skips the NoNeededParts status check; @a ignoresuspended skips the
+	/// timestamp check, which otherwise also resets the timestamp when needed.
+	bool IsValidSwapTarget(
+		A4AFList::iterator it, bool ignorenoneeded = false, bool ignoresuspended = false);
+
+	CPartFile *m_reqfile;
+
+	void Init();
+	bool ProcessHelloTypePacket(const CMemFile &data);
+	void SendHelloTypePacket(CMemFile *data);
+	void SendFirewallCheckUDPRequest();
+	void ClearHelloProperties(); // eMule 0.42
+
+	CNetworkAddress m_userAddress;
+	CNetworkAddress m_connectAddress;
+	uint32 m_dwServerIP;
+	uint32 m_nUserIDHybrid;
+	uint16_t m_nUserPort;
+	int16 m_nServerPort;
+	uint32 m_nClientVersion;
+	//! Whether this connection has already been counted towards the peer's
+	//! session tally in its credit metadata. See ProcessHelloTypePacket.
+	bool m_metaSessionCounted = false;
+	uint32 m_cSendblock;
+	uint8 m_byEmuleVersion;
+	uint8 m_byDataCompVer;
+	bool m_bEmuleProtocol;
+	wxString m_Username;
+	uint32 m_FullUserIP;
+	// EC-delivered peer country (remote GUI only; #439). See the accessors.
+	wxString m_countryCode;
+	bool m_countryFromCore = false;
+	CMD4Hash m_UserHash;
+	bool m_HasValidHash;
+	uint16 m_nUDPPort;
+	uint8 m_byUDPVer;
+	uint8 m_bySourceExchange1Ver;
+	uint8 m_byAcceptCommentVer;
+	uint8 m_byExtendedRequestsVer;
+	uint8 m_clientSoft;
+	uint64 m_dwLastSourceRequest;
+	uint64 m_dwLastSourceAnswer;
+	uint64 m_dwLastAskedForSources;
+	uint32 m_browseSearchId;
+	//! See IsBrowseEcInitiated.
+	bool m_browseEcInitiated;
+	//! See PinBrowseSearchId: an ID pinned for the next browse, not yet used.
+	bool m_browsePinned;
+	bool m_bFriendSlot;
+	bool m_bCommentDirty;
+	bool m_bIsHybrid;
+	bool m_bIsML;
+	bool m_bSupportsPreview;
+	bool m_bUnicodeSupport;
+	uint16 m_nKadPort;
+	bool m_bMultiPacket;
+	ClientState m_clientState;
+	CClientTCPSocket *m_socket;
+	bool m_fNeedOurPublicIP; // we requested our IP from this client
 
 	// Kry - Secure User Ident import
-	ESecureIdentState	m_SecureIdentState;
-	uint8		m_byInfopacketsReceived;		// have we received the edonkeyprot and emuleprot packet already (see InfoPacketsReceived() )
-	uint32		m_dwLastSignatureIP;
-	uint8		m_bySupportSecIdent;
-
-	uint32		m_byCompatibleClient;
-	std::list<CPacket*>	m_WaitingPackets_list;
-	uint64		m_lastRefreshedDLDisplay;
-
-	//upload
+	ESecureIdentState m_SecureIdentState;
+	uint8 m_byInfopacketsReceived; // have we received the edonkeyprot and emuleprot packet already (see
+				       // InfoPacketsReceived() )
+	CNetworkAddress m_lastSignatureAddress;
+	bool m_hasReceivedSignature;
+	uint8 m_bySupportSecIdent;
+
+	uint32 m_byCompatibleClient;
+	std::list<CPacket *> m_WaitingPackets_list;
+	uint64 m_lastRefreshedDLDisplay;
+
+	// upload
 	uint32 CalculateScoreInternal();
 
-	uint8		m_nUploadState;
-	uint64		m_dwUploadTime;
-	uint32		m_cAsked;
-	uint64		m_dwLastUpRequest;
-	uint32		m_nCurSessionUp;
-	uint16		m_nUpPartCount;
-	CMD4Hash	m_requpfileid;
-	uint16		m_nUpCompleteSourcesCount;
-	uint32		m_score;
-	uint16		m_waitingPosition;
-
-	//! This vector contains the availability of parts for the file that the user
-	//! is requesting. When changing it, be sure to call CKnownFile::UpdatePartsFrequency
-	//! so that the files know the actual availability of parts.
-	BitVector	m_upPartStatus;
-	uint16		m_lastPartAsked;
-	wxString	m_strModVersion;
-
-	std::list<Requested_Block_Struct*>	m_BlockRequests_queue;
-	std::list<Requested_Block_Struct*>	m_DoneBlocks_list;
-	wxMutex								m_blockListLock;	// protects m_BlockRequests_queue, m_DoneBlocks_list, m_addedPayloadQueueSession
-	bool		m_bDisableCompression = false;
-	bool		m_bIOError = false;
-
-	friend class CUploadDiskIOThread;	// disk I/O thread needs direct access to block queues and session counters
-	friend class CUploadQueue;			// upload queue needs access to m_bIOError
-
-	//download
-	bool		m_bRemoteQueueFull;
-	uint8		m_nDownloadState;
-	uint16		m_nPartCount;
-	uint64		m_dwLastAskedTime;
-	wxString	m_clientFilename;
-	uint64		m_nTransferredDown;
-	uint16		m_lastDownloadingPart;   // last Part that was downloading
-	uint16		m_cShowDR;
-	uint64		m_dwLastBlockReceived;
-	uint16		m_nRemoteQueueRank;
-	uint16		m_nOldRemoteQueueRank;
-	bool		m_bCompleteSource;
-	bool		m_bReaskPending;
-	bool		m_bUDPPending;
-	bool		m_bHashsetRequested;
-
-	std::list<Pending_Block_Struct*>	m_PendingBlocks_list;
-	std::list<Requested_Block_Struct*>	m_DownloadBlocks_list;
+	uint8 m_nUploadState;
+	uint64 m_dwUploadTime;
+	uint32 m_cAsked;
+	uint64 m_dwLastUpRequest;
+	uint32 m_nCurSessionUp;
+	uint16 m_nUpPartCount;
+	CMD4Hash m_requpfileid;
+	uint16 m_nUpCompleteSourcesCount;
+	uint32 m_score;
+	uint16 m_waitingPosition;
+
+	//! Availability of parts for the file the user is requesting. After changing it, call
+	//! CKnownFile::UpdatePartsFrequency so the files know the real availability.
+	BitVector m_upPartStatus;
+	uint16 m_lastPartAsked;
+	wxString m_strModVersion;
+
+	std::list<Requested_Block_Struct *> m_BlockRequests_queue;
+	std::list<Requested_Block_Struct *> m_DoneBlocks_list;
+	wxMutex m_blockListLock; // protects m_BlockRequests_queue, m_DoneBlocks_list,
+				 // m_addedPayloadQueueSession
+	bool m_bDisableCompression = false;
+	bool m_bIOError = false;
+
+	friend class CUploadDiskIOThread; // disk I/O thread needs direct access to block queues and session
+					  // counters
+	friend class CUploadQueue;        // upload queue needs access to m_bIOError
+
+	// download
+	bool m_bRemoteQueueFull;
+	uint8 m_nDownloadState;
+	uint16 m_nPartCount;
+	uint64 m_dwLastAskedTime;
+	wxString m_clientFilename;
+	uint64 m_nTransferredDown;
+	uint16 m_lastDownloadingPart; // last Part that was downloading
+	uint16 m_cShowDR;
+	uint64 m_dwLastBlockReceived;
+	uint16 m_nRemoteQueueRank;
+	uint16 m_nOldRemoteQueueRank;
+	bool m_bCompleteSource;
+	bool m_bReaskPending;
+	bool m_bUDPPending;
+	bool m_bHashsetRequested;
+
+	std::list<Pending_Block_Struct *> m_PendingBlocks_list;
+	std::list<Requested_Block_Struct *> m_DownloadBlocks_list;
 
 	// download speed calculation
-	float		kBpsDown;
-	uint64		msReceivedPrev;
-	uint32		bytesReceivedCycle;
+	float kBpsDown;
+	uint64 msReceivedPrev;
+	uint32 bytesReceivedCycle;
 	// chat
-	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
-		m_fNoViewSharedFiles : 1, // client has disabled the 'View Shared Files' feature,
-					  // 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,
-		m_fAICHRequested     : 1,
-		m_fSupportsLargeFiles: 1,
-		m_fSentOutOfPartReqs : 1,
-		m_fExtMultiPacket    : 1,
-		m_fRequestsCryptLayer: 1,
-		m_fSupportsCryptLayer: 1,
-		m_fRequiresCryptLayer: 1,
-		m_fSupportsSourceEx2 : 1,
-		m_fSupportsCaptcha   : 1,
-		m_fDirectUDPCallback : 1;
-
-	unsigned int
-		m_fOsInfoSupport : 1,
-		m_fValueBasedTypeTags : 1;
+	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
+		m_fNoViewSharedFiles : 1,      // client has disabled the 'View Shared Files' feature,
+					       // 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, m_fAICHRequested : 1, m_fSupportsLargeFiles : 1,
+		m_fSentOutOfPartReqs : 1, m_fExtMultiPacket : 1, m_fRequestsCryptLayer : 1,
+		m_fSupportsCryptLayer : 1, m_fRequiresCryptLayer : 1, m_fSupportsSourceEx2 : 1,
+		m_fSupportsCaptcha : 1, m_fDirectUDPCallback : 1;
+
+	unsigned int m_fOsInfoSupport : 1;
 
 	/* Razor 1a - Modif by MikaelB */
 
-	bool		m_bHelloAnswerPending;
+	bool m_bHelloAnswerPending;
 
-	//! This vector contains the availability of parts for the file we requested
-	//! from this user. When changing it, be sure to call CPartFile::UpdatePartsFrequency
-	//! so that the files know the actual availability of parts.
-	BitVector	m_downPartStatus;
+	//! Availability of parts for the file we requested from this user. After changing it, call
+	//! CPartFile::UpdatePartsFrequency so the files know the real availability.
+	BitVector m_downPartStatus;
 
-	CAICHHash*	m_pReqFileAICHHash;
+	CAICHHash *m_pReqFileAICHHash;
 
-	ESourceFrom	m_nSourceFrom;
+	ESourceFrom m_nSourceFrom;
 
 	/* Kad Stuff */
-	uint8_t		m_achBuddyID16;
-	bool		m_bBuddyIDValid;
-	uint32		m_nBuddyIP;
-	uint16		m_nBuddyPort;
+	uint8_t m_achBuddyID16;
+	bool m_bBuddyIDValid;
+	uint32 m_nBuddyIP;
+	uint16 m_nBuddyPort;
 
-	EKadState	m_nKadState;
+	EKadState m_nKadState;
 
-	uint8		m_byKadVersion;
-	uint64		m_dwLastBuddyPingPongTime;
-	uint64_t	m_dwDirectCallbackTimeout;
+	uint8 m_byKadVersion;
+
+	/* eMuleAI vendor capabilities, parsed from the CT_MOD_* hello tags */
+	CPeerCapabilities m_modCapabilities;
+	uint8_t m_modIPv616;
+	uint8_t m_servingBuddyIPv616;
+	bool m_hasModIPv6;
+	bool m_hasServingBuddyIPv6;
+
+	uint64 m_dwLastBuddyPingPongTime;
+	uint64_t m_dwDirectCallbackTimeout;
 
 	//! This keeps track of aggressive requests for files.
-	uint16		m_Aggressiveness;
+	uint16 m_Aggressiveness;
 	//! This tracks the time of the last time since a file was requested
-	uint64		m_LastFileRequest;
-
-	bool		m_OSInfo_sent;
+	uint64 m_LastFileRequest;
 
-	wxString	m_clientSoftString;	/* software name */
-	wxString	m_clientVerString;	/* version + optional mod name */
-	wxString	m_clientVersionString;	/* version string */
-	wxString	m_fullClientVerString;	/* full info string */
-	wxString	m_sClientOSInfo;
-	wxString	m_pendingMessage;
+	bool m_OSInfo_sent;
 
-	int		SecIdentSupRec;
+	wxString m_clientSoftString;    /* software name */
+	wxString m_clientVerString;     /* version + optional mod name */
+	wxString m_clientVersionString; /* version string */
+	wxString m_fullClientVerString; /* full info string */
+	wxString m_sClientOSInfo;
+	wxString m_pendingMessage;
 
-	CKnownFile*	m_uploadingfile;
+	int SecIdentSupRec;
 
-	uint8		m_MaxBlockRequests;
+	CKnownFile *m_uploadingfile;
 
 	// needed for stats
-	uint32		m_lastClientSoft;
-	uint32		m_lastClientVersion;
-	wxString	m_lastOSInfo;
+	uint32 m_lastClientSoft;
+	uint32 m_lastClientVersion;
+	wxString m_lastOSInfo;
 
 	/* Calculation of last average speed */
-	uint32		m_lastaverage;
-	uint64		m_last_block_start;
+	uint32 m_lastaverage;
+	uint64 m_last_block_start;
+	uint64 m_minRTT; // smoothed floor (ms) of measured request->first-byte round-trips from this
+			 // source; 0 = not yet measured. Drives the BDP-adaptive request depth.
 
 	/* 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 disconnect them. Take that, sucker.
-	   This debug code is just for me I'm afraid. */
+	/* Kry - debug aid: clients created only to check their data carry the reason here, and are
+	   disconnected once checked. */
 #ifdef __DEBUG__
-	wxString	connection_reason;
+	wxString connection_reason;
 #endif
 };
 
-
-#define	MAKE_CLIENT_VERSION(mjr, min, upd) \
-	((uint32)(mjr)*100U*10U*100U + (uint32)(min)*100U*10U + (uint32)(upd)*100U)
-
+#define MAKE_CLIENT_VERSION(mjr, min, upd) \
+	((uint32)(mjr) * 100U * 10U * 100U + (uint32)(min) * 100U * 10U + (uint32)(upd) * 100U)
 
 #endif // UPDOWNCLIENT_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/aLinkCreator/alc.desktop -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/alc.desktop Changed

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/alc.cpp -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/alc.cpp Changed

@@ -25,35 +25,32 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
-#include "config.h"		// Needed for PACKAGE
+#include "config.h" // Needed for PACKAGE
 #include "alc.h"
 
 // Application implementation
-IMPLEMENT_APP (alc)
+IMPLEMENT_APP(alc)
 
-bool alc::OnInit ()
+bool alc::OnInit()
 {
-  // Match amule (CamuleGuiBase, amule-gui.cpp): wxWidgets 3.2 added
-  // strict assertions for redundant sizer-flag combinations
-  // (e.g. Expand() + Center()), which the alc UI uses pervasively
-  // and which become fatal on distros that ship a build asserting on
-  // them (#693, Fedora 43 / wx 3.2.8). Disable the checks here until
-  // the flag uses are cleaned up.
-  wxSizerFlags::DisableConsistencyChecks();
+	// Match amule (CamuleGuiBase, amule-gui.cpp): wxWidgets 3.2 added strict assertions for
+	// redundant sizer-flag combinations such as Expand() + Center(), which the alc UI uses
+	// pervasively and which become fatal on distros shipping a build that asserts on them
+	// (#693, Fedora 43 / wx 3.2.8). Disable the checks until the flag uses are cleaned up.
+	wxSizerFlags::DisableConsistencyChecks();
 
-  // Used to tell alc to use aMule catalog
-  m_locale.Init();
-  m_locale.AddCatalog(PACKAGE);
+	// Used to tell alc to use aMule catalog
+	m_locale.Init();
+	m_locale.AddCatalog(PACKAGE);
 
-  m_alcFrame = new AlcFrame (_("aLinkCreator, the aMule eD2k link creator"));
-  m_alcFrame->Show (true);
-  SetTopWindow (m_alcFrame);
-  return true;
+	m_alcFrame = new AlcFrame(_("aLinkCreator, the aMule eD2k link creator"));
+	m_alcFrame->Show(true);
+	SetTopWindow(m_alcFrame);
+	return true;
 }
 
 AlcFrame *alc::GetMainFrame()
 {
-  return (m_alcFrame);
+	return (m_alcFrame);
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/alc.h -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/alc.h Changed

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/alcc.cpp -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/alcc.cpp Changed

@@ -23,9 +23,7 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
-
-#include "config.h"		// Needed for PACKAGE
+#include "config.h" // Needed for PACKAGE
 
 #include <wx/log.h>
 
@@ -33,68 +31,61 @@
 #include "ed2khash.h"
 
 // Application implementation
-IMPLEMENT_APP (alcc)
+IMPLEMENT_APP(alcc)
 
 /// Running Alcc
-int alcc::OnRun ()
+int alcc::OnRun()
 {
-  // Used to tell alcc to use aMule catalog
-  m_locale.Init();
-  m_locale.AddCatalog(PACKAGE);
-
-  wxLog::DontCreateOnDemand();
-  wxLogStderr * stderrLog = new wxLogStderr;
-  wxLogStderr * stdoutLog = new wxLogStderr(stdout);
-  delete wxLog::SetActiveTarget(stderrLog); // Log on Stderr
-  wxLog::SetTimestamp("");   // Disable timestamp on messages
-
-  Ed2kHash hash;
-  size_t i;
-  for (i=0;i<(m_filesToHash.GetCount());++i)
-    {
-      if (wxFileExists(m_filesToHashi))
-        {
-          if (m_flagVerbose)
-            {
-              wxLogMessage(_("Processing file number %u: %s"),i+1,m_filesToHashi.c_str());
-
-              if (m_flagPartHashes)
-                {
-                  wxLogMessage(_("You have asked for part hashes (Only used for files > 9.5 MB)"));
-                }
-            }
-
-          if (hash.SetED2KHashFromFile(m_filesToHashi, NULL))
-            {
+	// Used to tell alcc to use aMule catalog
+	m_locale.Init();
+	m_locale.AddCatalog(PACKAGE);
+
+	wxLog::DontCreateOnDemand();
+	wxLogStderr *stderrLog = new wxLogStderr;
+	wxLogStderr *stdoutLog = new wxLogStderr(stdout);
+	delete wxLog::SetActiveTarget(stderrLog); // Log on Stderr
+	wxLog::SetTimestamp("");                  // Disable timestamp on messages
+
+	Ed2kHash hash;
+	size_t i;
+	for (i = 0; i < (m_filesToHash.GetCount()); ++i) {
+		if (wxFileExists(m_filesToHashi)) {
+			if (m_flagVerbose) {
+				wxLogMessage(
+					_("Processing file number %u: %s"), i + 1, m_filesToHashi.c_str());
+
+				if (m_flagPartHashes) {
+					wxLogMessage(_("You have asked for part hashes (Only used for files "
+						       "> 9.5 MB)"));
+				}
+			}
+
+			if (hash.SetED2KHashFromFile(m_filesToHashi, NULL)) {
 				// Print the link to stdout
 				wxLog::SetActiveTarget(stdoutLog);
-                wxLogMessage("%s", hash.GetED2KLink(m_flagPartHashes).c_str());
+				wxLogMessage("%s", hash.GetED2KLink(m_flagPartHashes).c_str());
 				// Everything else goes to stderr
 				wxLog::SetActiveTarget(stderrLog);
-            }
-        }
-      else
-        {
-            if (m_flagVerbose)
-                {
-                    wxLogMessage(_("%s ---> Non existent file !\n"),m_filesToHashi.c_str());
-                }
-        }
-    }
-  delete stdoutLog;
-  return 0;
+			}
+		} else {
+			if (m_flagVerbose) {
+				wxLogMessage(_("%s ---> Non existent file !\n"), m_filesToHashi.c_str());
+			}
+		}
+	}
+	delete stdoutLog;
+	return 0;
 }
 
 // On exit
-int
-alcc::OnExit()
+int alcc::OnExit()
 {
-  delete wxLog::SetActiveTarget(NULL);
-  return 0;
+	delete wxLog::SetActiveTarget(NULL);
+	return 0;
 }
 
 /// Parse command line
-void alcc::OnInitCmdLine(wxCmdLineParser& cmdline)
+void alcc::OnInitCmdLine(wxCmdLineParser &cmdline)
 {
 	cmdline.AddSwitch("h", "help", "show this help message", wxCMD_LINE_OPTION_HELP);
 	cmdline.AddSwitch("v", "verbose", "be verbose");
@@ -103,23 +94,22 @@
 }
 
 /// Command line preprocessing
-bool alcc::OnCmdLineParsed(wxCmdLineParser& cmdline)
+bool alcc::OnCmdLineParsed(wxCmdLineParser &cmdline)
 {
 
-  wxFileName filename;
-  size_t i;
+	wxFileName filename;
+	size_t i;
 
-  m_flagVerbose = cmdline.Found("v");
-  m_flagPartHashes = cmdline.Found("p");
+	m_flagVerbose = cmdline.Found("v");
+	m_flagPartHashes = cmdline.Found("p");
 
-  m_filesToHash.Clear();
-  for (i = 0; i < cmdline.GetParamCount(); ++i)
-    {
-      filename.Assign(cmdline.GetParam(i));
-      m_filesToHash.Add(filename.GetFullPath());
-    }
-  m_filesToHash.Shrink();
+	m_filesToHash.Clear();
+	for (i = 0; i < cmdline.GetParamCount(); ++i) {
+		filename.Assign(cmdline.GetParam(i));
+		m_filesToHash.Add(filename.GetFullPath());
+	}
+	m_filesToHash.Shrink();
 
-  return true;
+	return true;
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/alcc.h -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/alcc.h Changed

@@ -26,7 +26,6 @@
 #ifndef _ALCC_H
 #define _ALCC_H
 
-
 #include <wx/app.h>
 #include <wx/cmdline.h>
 
@@ -35,37 +34,37 @@
 #include <wx/strconv.h>
 static wxCSConv aMuleConv("iso8859-1");
 #ifdef wxUSE_UNICODE
-        #define unicode2char(x) (const char*) aMuleConv.cWX2MB(x)
-        #define char2unicode(x) aMuleConv.cMB2WX(x)
+#define unicode2char(x) (const char *)aMuleConv.cWX2MB(x)
+#define char2unicode(x) aMuleConv.cMB2WX(x)
 #else
-        #define unicode2char(x) x.c_str()
-        #define char2unicode(x) x
+#define unicode2char(x) x.c_str()
+#define char2unicode(x) x
 #endif
 //-----------------------------------------------------------------------------
 
 // Application
 class alcc : public wxAppConsole
 {
-  private:
-    bool m_flagVerbose ;
-    bool m_flagPartHashes;
-    wxArrayString m_filesToHash;
+private:
+	bool m_flagVerbose;
+	bool m_flagPartHashes;
+	wxArrayString m_filesToHash;
 
-    /// Parse command line
-    virtual void OnInitCmdLine(wxCmdLineParser& cmdline);
+	/// Parse command line
+	virtual void OnInitCmdLine(wxCmdLineParser &cmdline);
 
-    /// Command line preocessing
-    virtual bool OnCmdLineParsed(wxCmdLineParser& cmdline);
+	/// Command line preocessing
+	virtual bool OnCmdLineParsed(wxCmdLineParser &cmdline);
 
-  protected:
-    wxLocale m_locale; // Used to tell wxCas to use aMule catalog
+protected:
+	wxLocale m_locale; // Used to tell wxCas to use aMule catalog
 
-  public:
-    /// Application
-    virtual int OnRun ();
+public:
+	/// Application
+	virtual int OnRun();
 
-    /// Cleaning on exit
-    virtual int OnExit();
+	/// Cleaning on exit
+	virtual int OnExit();
 };
 
 DECLARE_APP(alcc)

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/alcframe.cpp -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/alcframe.cpp Changed

@@ -30,7 +30,6 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <wx/clipbrd.h>
 #include <wx/dataobj.h>
 #include <wx/file.h>
@@ -49,10 +48,10 @@
 #include <wx/url.h>
 
 #ifdef __WINDOWS__
-	#include <winerror.h>
-	#include <shlobj.h>
+#include <winerror.h>
+#include <shlobj.h>
 #elif defined(__WXMAC__)
-	#include <wx/intl.h>
+#include <wx/intl.h>
 #endif
 
 #include "md4.h"
@@ -61,263 +60,222 @@
 #include "alcpix.h"
 #include "alc.h"
 
-/// Constructor
-AlcFrame::AlcFrame (const wxString & title):
-    wxFrame ((wxFrame *) NULL, -1, title)
+AlcFrame::AlcFrame(const wxString &title)
+: wxFrame((wxFrame *)NULL, -1, title)
 {
-  // Give it an icon
 #ifdef __WINDOWS__
-  wxIcon icon("alc");
+	wxIcon icon("alc");
 #else
-  wxIcon icon;
-  icon.CopyFromBitmap(AlcPix::getPixmap("alc"));
+	wxIcon icon;
+	icon.CopyFromBitmap(AlcPix::getPixmap("alc"));
 #endif
-  SetIcon (icon);
+	SetIcon(icon);
 
-  // Status Bar
-  CreateStatusBar ();
-  SetStatusText (_("Welcome!"));
+	CreateStatusBar();
+	SetStatusText(_("Welcome!"));
 
-  // Unused dialog for now
-  m_progressBar = NULL;
+	m_progressBar = NULL;
 
-  // Frame Vertical sizer
-  m_frameVBox = new wxBoxSizer (wxVERTICAL);
+	m_frameVBox = new wxBoxSizer(wxVERTICAL);
 
-  // Add Main panel to frame (needed by win32 for padding sub panels)
-  m_mainPanel = new wxPanel (this, -1);
+	m_mainPanel = new wxPanel(this, -1);
 
-  // Main Panel Vertical Sizer
-  m_mainPanelVBox = new wxBoxSizer (wxVERTICAL);
+	m_mainPanelVBox = new wxBoxSizer(wxVERTICAL);
 
-  // Main Panel static line
-  m_staticLine = new wxStaticLine (m_mainPanel, -1);
-  m_mainPanelVBox->Add (m_staticLine, wxSizerFlags().Expand().Border(wxALL, 0));
+	m_staticLine = new wxStaticLine(m_mainPanel, -1);
+	m_mainPanelVBox->Add(m_staticLine, wxSizerFlags().Expand().Border(wxALL, 0));
 
-  // Input Parameters
-  m_inputSBox =
-    new wxStaticBox (m_mainPanel, -1, _("Input parameters"));
-  m_inputSBoxSizer = new wxStaticBoxSizer (m_inputSBox, wxHORIZONTAL);
+	m_inputSBox = new wxStaticBox(m_mainPanel, -1, _("Input parameters"));
+	m_inputSBoxSizer = new wxStaticBoxSizer(m_inputSBox, wxHORIZONTAL);
 
-  // Input Grid
-  m_inputFlexSizer = new wxFlexGridSizer (6, 2, 5, 10);
+	m_inputFlexSizer = new wxFlexGridSizer(6, 2, 5, 10);
 
-  // Left col is growable
-  m_inputFlexSizer->AddGrowableCol (0);
+	m_inputFlexSizer->AddGrowableCol(0);
 
-  // Static texts
-  m_inputFileStaticText=new wxStaticText(m_mainPanel, -1,
-                                         _("File to Hash"),
-                                         wxDefaultPosition,wxDefaultSize,wxALIGN_CENTRE);
+	m_inputFileStaticText = new wxStaticText(
+		m_mainPanel, -1, _("File to Hash"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE);
 
-  m_inputAddStaticText=new wxStaticText(m_mainPanel, -1,
-                                        _("Add Optional URLs for this file"),
-                                        wxDefaultPosition,wxDefaultSize,wxALIGN_CENTRE);
+	m_inputAddStaticText = new wxStaticText(m_mainPanel,
+		-1,
+		_("Add Optional URLs for this file"),
+		wxDefaultPosition,
+		wxDefaultSize,
+		wxALIGN_CENTRE);
 
-  // Text ctrls
-  m_inputFileTextCtrl = new wxTextCtrl (m_mainPanel,-1,"",
-                                        wxDefaultPosition, wxSize(300,-1));
-  m_inputFileTextCtrl->
-  SetToolTip (_
-              ("Enter here the file you want to compute the eD2k link"));
+	m_inputFileTextCtrl = new wxTextCtrl(m_mainPanel, -1, "", wxDefaultPosition, wxSize(300, -1));
+	m_inputFileTextCtrl->SetToolTip(_("Enter here the file you want to compute the eD2k link"));
 
-  m_inputAddTextCtrl = new wxTextCtrl (m_mainPanel,-1,"",
-                                       wxDefaultPosition, wxSize(300,-1));
-  m_inputAddTextCtrl->
-  SetToolTip (_
-              ("Enter here the URL you want to add to the eD2k link: Add / at the end to let aLinkCreator append the current file name"));
+	m_inputAddTextCtrl = new wxTextCtrl(m_mainPanel, -1, "", wxDefaultPosition, wxSize(300, -1));
+	m_inputAddTextCtrl->SetToolTip(_("Enter here the URL you want to add to the eD2k link: Add / at the "
+					 "end to let aLinkCreator append the current file name"));
 
-  // List box
-  m_inputUrlListBox = new wxListBox(m_mainPanel, -1, wxDefaultPosition,
-                                    wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_NEEDED_SB | wxLB_HSCROLL);
+	m_inputUrlListBox = new wxListBox(m_mainPanel,
+		-1,
+		wxDefaultPosition,
+		wxDefaultSize,
+		0,
+		NULL,
+		wxLB_SINGLE | wxLB_NEEDED_SB | wxLB_HSCROLL);
 
-  // Buttons
-  m_inputFileBrowseButton =
-    new wxButton (m_mainPanel, ID_BROWSE_BUTTON, wxString (_("Browse")));
+	m_inputFileBrowseButton = new wxButton(m_mainPanel, ID_BROWSE_BUTTON, wxString(_("Browse")));
 
-  m_inputAddButton =
-    new wxButton (m_mainPanel, ID_ADD_BUTTON, wxString (_("Add")));
+	m_inputAddButton = new wxButton(m_mainPanel, ID_ADD_BUTTON, wxString(_("Add")));
 
-  // Button bar
-  m_buttonUrlVBox = new wxBoxSizer (wxVERTICAL);
-  m_removeButton =
-    new wxButton (m_mainPanel, ID_REMOVE_BUTTON, wxString (_("Remove")));
-  m_clearButton =
-    new wxButton (m_mainPanel, ID_CLEAR_BUTTON, wxString (_("Clear")));
+	m_buttonUrlVBox = new wxBoxSizer(wxVERTICAL);
+	m_removeButton = new wxButton(m_mainPanel, ID_REMOVE_BUTTON, wxString(_("Remove")));
+	m_clearButton = new wxButton(m_mainPanel, ID_CLEAR_BUTTON, wxString(_("Clear")));
 
-  m_buttonUrlVBox->Add (m_removeButton, wxSizerFlags().Center().Border(wxTOP|wxBOTTOM, 5));
-  m_buttonUrlVBox->Add (m_clearButton, wxSizerFlags().Center().Border(wxTOP|wxBOTTOM, 5));
+	m_buttonUrlVBox->Add(m_removeButton, wxSizerFlags().Center().Border(wxTOP | wxBOTTOM, 5));
+	m_buttonUrlVBox->Add(m_clearButton, wxSizerFlags().Center().Border(wxTOP | wxBOTTOM, 5));
 
-  // Check button
-  m_parthashesCheck =
-    new wxCheckBox (m_mainPanel, ID_PARTHASHES_CHECK,
-                    _
-                    ("Create link with part-hashes"));
+	m_parthashesCheck =
+		new wxCheckBox(m_mainPanel, ID_PARTHASHES_CHECK, _("Create link with part-hashes"));
 
-  m_parthashesCheck->SetValue(false);
+	m_parthashesCheck->SetValue(false);
 
-  m_parthashesCheck->
-  SetToolTip (_
-              ("Help to spread new and rare files faster, at the cost of an increased link size"));
+	m_parthashesCheck->SetToolTip(
+		_("Help to spread new and rare files faster, at the cost of an increased link size"));
 
-  // Add to sizers
-  m_inputFlexSizer->Add (m_inputFileStaticText, wxSizerFlags(1).Expand().Bottom().Border(wxTOP, 10));
-  m_inputFlexSizer->Add (1,1);
+	m_inputFlexSizer->Add(m_inputFileStaticText, wxSizerFlags(1).Expand().Bottom().Border(wxTOP, 10));
+	m_inputFlexSizer->Add(1, 1);
 
-  m_inputFlexSizer->Add (m_inputFileTextCtrl, wxSizerFlags(1).Expand());
-  m_inputFlexSizer->Add (m_inputFileBrowseButton, wxSizerFlags().Expand());
+	m_inputFlexSizer->Add(m_inputFileTextCtrl, wxSizerFlags(1).Expand());
+	m_inputFlexSizer->Add(m_inputFileBrowseButton, wxSizerFlags().Expand());
 
-  m_inputFlexSizer->Add (m_inputAddStaticText, wxSizerFlags(1).Expand().Bottom().Border(wxTOP, 10));
-  m_inputFlexSizer->Add (1,1);
+	m_inputFlexSizer->Add(m_inputAddStaticText, wxSizerFlags(1).Expand().Bottom().Border(wxTOP, 10));
+	m_inputFlexSizer->Add(1, 1);
 
-  m_inputFlexSizer->Add (m_inputAddTextCtrl, wxSizerFlags(1).Expand());
-  m_inputFlexSizer->Add (m_inputAddButton, wxSizerFlags().Expand());
+	m_inputFlexSizer->Add(m_inputAddTextCtrl, wxSizerFlags(1).Expand());
+	m_inputFlexSizer->Add(m_inputAddButton, wxSizerFlags().Expand());
 
-  m_inputFlexSizer->Add (m_inputUrlListBox, wxSizerFlags().Expand().Center());
-  m_inputFlexSizer->Add (m_buttonUrlVBox, wxSizerFlags().Expand().Center());
+	m_inputFlexSizer->Add(m_inputUrlListBox, wxSizerFlags().Expand().Center());
+	m_inputFlexSizer->Add(m_buttonUrlVBox, wxSizerFlags().Expand().Center());
 
-  m_inputFlexSizer->Add (m_parthashesCheck, wxSizerFlags().Expand().Center().Border(wxTOP, 10));
-  m_inputFlexSizer->Add (1,1);
+	m_inputFlexSizer->Add(m_parthashesCheck, wxSizerFlags().Expand().Center().Border(wxTOP, 10));
+	m_inputFlexSizer->Add(1, 1);
 
-  m_inputSBoxSizer->Add (m_inputFlexSizer, wxSizerFlags(1).Expand().Center().Border(wxALL, 10));
-  m_mainPanelVBox->Add (m_inputSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10));
+	m_inputSBoxSizer->Add(m_inputFlexSizer, wxSizerFlags(1).Expand().Center().Border(wxALL, 10));
+	m_mainPanelVBox->Add(m_inputSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10));
 
 #ifdef WANT_MD4SUM
-  // MD4 Hash Vertical Box Sizer
-  m_md4HashSBox = new wxStaticBox (m_mainPanel, -1, _("MD4 File Hash"));
-  m_md4HashSBoxSizer = new wxStaticBoxSizer (m_md4HashSBox, wxHORIZONTAL);
+	m_md4HashSBox = new wxStaticBox(m_mainPanel, -1, _("MD4 File Hash"));
+	m_md4HashSBoxSizer = new wxStaticBoxSizer(m_md4HashSBox, wxHORIZONTAL);
 
-  // MD4 Hash results
-  m_md4HashTextCtrl = new wxTextCtrl( m_mainPanel, -1, "", wxDefaultPosition,
-                                      wxDefaultSize, wxTE_READONLY );
+	m_md4HashTextCtrl =
+		new wxTextCtrl(m_mainPanel, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
 
-  m_md4HashSBoxSizer->Add (m_md4HashTextCtrl, wxSizerFlags(1).Center().Border(wxALL, 5));
-  m_mainPanelVBox->Add( m_md4HashSBoxSizer, wxSizerFlags().Expand().Border(wxALL, 10) );
+	m_md4HashSBoxSizer->Add(m_md4HashTextCtrl, wxSizerFlags(1).Center().Border(wxALL, 5));
+	m_mainPanelVBox->Add(m_md4HashSBoxSizer, wxSizerFlags().Expand().Border(wxALL, 10));
 #endif
 
-  // Hash Vertical Box Sizer
-  m_e2kHashSBox = new wxStaticBox (m_mainPanel, -1, _("eD2k File Hash"));
-  m_e2kHashSBoxSizer = new wxStaticBoxSizer (m_e2kHashSBox, wxHORIZONTAL);
-
-  // Hash results
-  m_e2kHashTextCtrl = new wxTextCtrl( m_mainPanel, -1, "", wxDefaultPosition,
-                                      wxDefaultSize, wxTE_READONLY );
+	m_e2kHashSBox = new wxStaticBox(m_mainPanel, -1, _("eD2k File Hash"));
+	m_e2kHashSBoxSizer = new wxStaticBoxSizer(m_e2kHashSBox, wxHORIZONTAL);
 
-  m_e2kHashSBoxSizer->Add (m_e2kHashTextCtrl, wxSizerFlags(1).Center().Border(wxALL, 5));
-  m_mainPanelVBox->Add( m_e2kHashSBoxSizer, wxSizerFlags().Expand().Border(wxALL, 10) );
+	m_e2kHashTextCtrl =
+		new wxTextCtrl(m_mainPanel, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
 
-  // Ed2k Vertical Box Sizer
-  m_ed2kSBox = new wxStaticBox (m_mainPanel, -1, _("eD2k link"));
-  m_ed2kSBoxSizer = new wxStaticBoxSizer (m_ed2kSBox, wxVERTICAL);
+	m_e2kHashSBoxSizer->Add(m_e2kHashTextCtrl, wxSizerFlags(1).Center().Border(wxALL, 5));
+	m_mainPanelVBox->Add(m_e2kHashSBoxSizer, wxSizerFlags().Expand().Border(wxALL, 10));
 
-  // Ed2k results
-  m_ed2kTextCtrl = new wxTextCtrl( m_mainPanel, -1, "", wxDefaultPosition,
-                                   wxSize(-1,60), wxTE_MULTILINE|wxTE_READONLY|wxVSCROLL );
+	m_ed2kSBox = new wxStaticBox(m_mainPanel, -1, _("eD2k link"));
+	m_ed2kSBoxSizer = new wxStaticBoxSizer(m_ed2kSBox, wxVERTICAL);
 
-  m_ed2kSBoxSizer->Add (m_ed2kTextCtrl, wxSizerFlags(1).Expand().Border(wxALL, 5));
-  m_mainPanelVBox->Add( m_ed2kSBoxSizer, wxSizerFlags(1).Expand().Border(wxALL, 10) );
+	m_ed2kTextCtrl = new wxTextCtrl(m_mainPanel,
+		-1,
+		"",
+		wxDefaultPosition,
+		wxSize(-1, 60),
+		wxTE_MULTILINE | wxTE_READONLY | wxVSCROLL);
 
-  // Button bar
-  m_buttonHBox = new wxBoxSizer (wxHORIZONTAL);
-  m_startButton =
-    new wxButton (m_mainPanel, ID_START_BUTTON, wxString (_("Start")));
-  m_saveButton =
-    new wxButton (m_mainPanel, ID_SAVEAS_BUTTON, wxString (_("Save")));
-  m_copyButton =
-    new wxButton (m_mainPanel, ID_COPY_BUTTON, wxString (_("Copy to clipboard")));
-  m_closeButton =
-    new wxButton (m_mainPanel, ID_EXIT_BUTTON, wxString (_("Exit")));
+	m_ed2kSBoxSizer->Add(m_ed2kTextCtrl, wxSizerFlags(1).Expand().Border(wxALL, 5));
+	m_mainPanelVBox->Add(m_ed2kSBoxSizer, wxSizerFlags(1).Expand().Border(wxALL, 10));
 
-  m_buttonHBox->Add (m_copyButton, wxSizerFlags().Border(wxALL, 5));
-  m_buttonHBox->Add(1,1,1);
-  m_buttonHBox->Add (m_startButton, wxSizerFlags().Right().Border(wxALL, 5));
-  m_buttonHBox->Add (m_saveButton, wxSizerFlags().Right().Border(wxALL, 5));
-  m_buttonHBox->Add (m_closeButton, wxSizerFlags().Right().Border(wxALL, 5));
+	m_buttonHBox = new wxBoxSizer(wxHORIZONTAL);
+	m_startButton = new wxButton(m_mainPanel, ID_START_BUTTON, wxString(_("Start")));
+	m_saveButton = new wxButton(m_mainPanel, ID_SAVEAS_BUTTON, wxString(_("Save")));
+	m_copyButton = new wxButton(m_mainPanel, ID_COPY_BUTTON, wxString(_("Copy to clipboard")));
+	m_closeButton = new wxButton(m_mainPanel, ID_EXIT_BUTTON, wxString(_("Exit")));
 
+	m_buttonHBox->Add(m_copyButton, wxSizerFlags().Border(wxALL, 5));
+	m_buttonHBox->Add(1, 1, 1);
+	m_buttonHBox->Add(m_startButton, wxSizerFlags().Right().Border(wxALL, 5));
+	m_buttonHBox->Add(m_saveButton, wxSizerFlags().Right().Border(wxALL, 5));
+	m_buttonHBox->Add(m_closeButton, wxSizerFlags().Right().Border(wxALL, 5));
 
-  m_mainPanelVBox->Add (m_buttonHBox, wxSizerFlags().Expand().Border(wxALL, 5));
+	m_mainPanelVBox->Add(m_buttonHBox, wxSizerFlags().Expand().Border(wxALL, 5));
 
-  // Toolbar Pixmaps
-  m_toolBarBitmaps0 = AlcPix::getPixmap("open");
-  m_toolBarBitmaps1 = AlcPix::getPixmap("copy");
-  m_toolBarBitmaps2 = AlcPix::getPixmap("saveas");
-  m_toolBarBitmaps3 = AlcPix::getPixmap("about");
+	m_toolBarBitmaps0 = AlcPix::getPixmap("open");
+	m_toolBarBitmaps1 = AlcPix::getPixmap("copy");
+	m_toolBarBitmaps2 = AlcPix::getPixmap("saveas");
+	m_toolBarBitmaps3 = AlcPix::getPixmap("about");
 
-  // Constructing toolbar
-  m_toolbar =
-    new wxToolBar (this, -1, wxDefaultPosition, wxDefaultSize,
-                   wxTB_HORIZONTAL | wxTB_FLAT);
+	m_toolbar = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL | wxTB_FLAT);
 
-  m_toolbar->SetToolBitmapSize (wxSize (32, 32));
-  m_toolbar->SetMargins (2, 2);
+	m_toolbar->SetToolBitmapSize(wxSize(32, 32));
+	m_toolbar->SetMargins(2, 2);
 
-  m_toolbar->AddTool (ID_BAR_OPEN, _("Open"), wxBitmapBundle(m_toolBarBitmaps0),
-                      _("Open a file to compute its eD2k link"));
+	m_toolbar->AddTool(ID_BAR_OPEN,
+		_("Open"),
+		wxBitmapBundle(m_toolBarBitmaps0),
+		_("Open a file to compute its eD2k link"));
 
-  m_toolbar->AddTool (ID_BAR_COPY, _("Copy"), wxBitmapBundle(m_toolBarBitmaps1),
-                      _("Copy computed eD2k link to clipboard"));
+	m_toolbar->AddTool(ID_BAR_COPY,
+		_("Copy"),
+		wxBitmapBundle(m_toolBarBitmaps1),
+		_("Copy computed eD2k link to clipboard"));
 
-  m_toolbar->AddTool (ID_BAR_SAVEAS, _("Save as"), wxBitmapBundle(m_toolBarBitmaps2),
-                      _("Save computed eD2k link to file"));
+	m_toolbar->AddTool(ID_BAR_SAVEAS,
+		_("Save as"),
+		wxBitmapBundle(m_toolBarBitmaps2),
+		_("Save computed eD2k link to file"));
 
-  m_toolbar->AddSeparator ();
+	m_toolbar->AddSeparator();
 
-  m_toolbar->AddTool (ID_BAR_ABOUT, _("About"), wxBitmapBundle(m_toolBarBitmaps3),
-                      _("About aLinkCreator"));
+	m_toolbar->AddTool(
+		ID_BAR_ABOUT, _("About"), wxBitmapBundle(m_toolBarBitmaps3), _("About aLinkCreator"));
 
-  m_toolbar->Realize ();
+	m_toolbar->Realize();
 
-  SetToolBar (m_toolbar);
+	SetToolBar(m_toolbar);
 
-  // Main panel Layout
-  m_mainPanel->SetAutoLayout(true);
-  m_mainPanel->SetSizerAndFit (m_mainPanelVBox);
+	m_mainPanel->SetAutoLayout(true);
+	m_mainPanel->SetSizerAndFit(m_mainPanelVBox);
 
-  // Frame Layout
-  m_frameVBox->Add (m_mainPanel, wxSizerFlags(1).Expand().Border(wxALL, 0));
-  SetAutoLayout (true);
-  SetSizerAndFit (m_frameVBox);
+	m_frameVBox->Add(m_mainPanel, wxSizerFlags(1).Expand().Border(wxALL, 0));
+	SetAutoLayout(true);
+	SetSizerAndFit(m_frameVBox);
 
-  m_startButton->SetFocus();
+	m_startButton->SetFocus();
 }
 
-/// Destructor
-AlcFrame::~AlcFrame ()
-{}
-
-/// Events table
-wxBEGIN_EVENT_TABLE (AlcFrame, wxFrame)
-EVT_TOOL (ID_BAR_OPEN, AlcFrame::OnBarOpen)
-EVT_TOOL (ID_BAR_SAVEAS, AlcFrame::OnBarSaveAs)
-EVT_TOOL (ID_BAR_COPY, AlcFrame::OnBarCopy)
-EVT_TOOL (ID_BAR_ABOUT, AlcFrame::OnBarAbout)
-EVT_BUTTON (ID_START_BUTTON, AlcFrame::OnStartButton)
-EVT_BUTTON (ID_EXIT_BUTTON, AlcFrame::OnCloseButton)
-EVT_BUTTON (ID_SAVEAS_BUTTON, AlcFrame::OnSaveAsButton)
-EVT_BUTTON (ID_COPY_BUTTON, AlcFrame::OnCopyButton)
-EVT_BUTTON (ID_BROWSE_BUTTON, AlcFrame::OnBrowseButton)
-EVT_BUTTON (ID_ADD_BUTTON, AlcFrame::OnAddUrlButton)
-EVT_BUTTON (ID_REMOVE_BUTTON, AlcFrame::OnRemoveUrlButton)
-EVT_BUTTON (ID_CLEAR_BUTTON, AlcFrame::OnClearUrlButton)
-wxEND_EVENT_TABLE ()
-
-/// Toolbar Open button
-void
-AlcFrame::OnBarOpen (wxCommandEvent & WXUNUSED(event))
+AlcFrame::~AlcFrame() {}
+
+wxBEGIN_EVENT_TABLE(AlcFrame, wxFrame)
+	EVT_TOOL(ID_BAR_OPEN, AlcFrame::OnBarOpen)
+	EVT_TOOL(ID_BAR_SAVEAS, AlcFrame::OnBarSaveAs)
+	EVT_TOOL(ID_BAR_COPY, AlcFrame::OnBarCopy)
+	EVT_TOOL(ID_BAR_ABOUT, AlcFrame::OnBarAbout)
+	EVT_BUTTON(ID_START_BUTTON, AlcFrame::OnStartButton)
+	EVT_BUTTON(ID_EXIT_BUTTON, AlcFrame::OnCloseButton)
+	EVT_BUTTON(ID_SAVEAS_BUTTON, AlcFrame::OnSaveAsButton)
+	EVT_BUTTON(ID_COPY_BUTTON, AlcFrame::OnCopyButton)
+	EVT_BUTTON(ID_BROWSE_BUTTON, AlcFrame::OnBrowseButton)
+	EVT_BUTTON(ID_ADD_BUTTON, AlcFrame::OnAddUrlButton)
+	EVT_BUTTON(ID_REMOVE_BUTTON, AlcFrame::OnRemoveUrlButton)
+	EVT_BUTTON(ID_CLEAR_BUTTON, AlcFrame::OnClearUrlButton)
+wxEND_EVENT_TABLE()
+
+void AlcFrame::OnBarOpen(wxCommandEvent &WXUNUSED(event))
 {
-  SetFileToHash();
+	SetFileToHash();
 }
 
-/// Browse button to select file to hash
-void
-AlcFrame::OnBrowseButton (wxCommandEvent & WXUNUSED(event))
+void AlcFrame::OnBrowseButton(wxCommandEvent &WXUNUSED(event))
 {
-  SetFileToHash();
+	SetFileToHash();
 }
 
-/// Set File to hash in wxTextCtrl
-void
-AlcFrame::SetFileToHash()
+void AlcFrame::SetFileToHash()
 {
 #ifdef __WINDOWS__
 	wxString browseroot;
@@ -340,11 +298,10 @@
 	}
 #elif defined(__WXMAC__)
 
-	// ~/Documents always exists on macOS and matches what
-	// FSFindFolder(kUserDomain, kDocumentsFolderType, ...) used to
-	// return via the Carbon FSRef API (removed in 64-bit macOS).
+	// ~/Documents always exists on macOS and matches what FSFindFolder(kUserDomain,
+	// kDocumentsFolderType, ...) returned via the Carbon FSRef API, removed in 64-bit macOS.
 	wxString browseroot;
-	const char* home = getenv("HOME");
+	const char *home = getenv("HOME");
 	if (home) {
 		browseroot = wxString::FromUTF8(home) + "/Documents";
 	} else {
@@ -354,272 +311,239 @@
 #else
 	wxString browseroot = wxFileName::GetHomeDir();
 #endif
-  const wxString & filename =
-    wxFileSelector (_("Select the file you want to compute the eD2k link"),
-                    browseroot, "", "", "*.*",
-                    wxFD_OPEN | wxFD_FILE_MUST_EXIST, this);
-
-  if (!filename.empty ())
-    {
-      m_inputFileTextCtrl->SetValue(filename);
-    }
+	const wxString &filename = wxFileSelector(_("Select the file you want to compute the eD2k link"),
+		browseroot,
+		"",
+		"",
+		"*.*",
+		wxFD_OPEN | wxFD_FILE_MUST_EXIST,
+		this);
+
+	if (!filename.empty()) {
+		m_inputFileTextCtrl->SetValue(filename);
+	}
 }
 
-/// Toolbar Save As button
-void
-AlcFrame::OnBarSaveAs (wxCommandEvent & WXUNUSED(event))
+void AlcFrame::OnBarSaveAs(wxCommandEvent &WXUNUSED(event))
 {
-  SaveEd2kLinkToFile();
+	SaveEd2kLinkToFile();
 }
 
-/// Save As button
-void
-AlcFrame::OnSaveAsButton(wxCommandEvent & WXUNUSED(event))
+void AlcFrame::OnSaveAsButton(wxCommandEvent &WXUNUSED(event))
 {
-  SaveEd2kLinkToFile();
+	SaveEd2kLinkToFile();
 }
 
-/// Copy Ed2k link to clip board
-void
-AlcFrame::CopyEd2kLinkToClipBoard()
+void AlcFrame::CopyEd2kLinkToClipBoard()
 {
-  wxString link = m_ed2kTextCtrl->GetValue();
-  if (!link.IsEmpty())
-    {
-      wxClipboardLocker clipLocker;
-      if ( !clipLocker )
-        {
-          wxLogError(_("Can't open the clipboard"));
-
-          return;
-        }
-
-      wxTheClipboard->AddData(new wxTextDataObject(link));
-    }
-  else
-    {
-      SetStatusText (_("Nothing to copy for now !"));
-    }
+	wxString link = m_ed2kTextCtrl->GetValue();
+	if (!link.IsEmpty()) {
+		wxClipboardLocker clipLocker;
+		if (!clipLocker) {
+			wxLogError(_("Can't open the clipboard"));
+
+			return;
+		}
+
+		wxTheClipboard->AddData(new wxTextDataObject(link));
+	} else {
+		SetStatusText(_("Nothing to copy for now !"));
+	}
 }
 
-/// Copy button
-void
-AlcFrame::OnCopyButton(wxCommandEvent & WXUNUSED(event))
+void AlcFrame::OnCopyButton(wxCommandEvent &WXUNUSED(event))
 {
-  CopyEd2kLinkToClipBoard();
+	CopyEd2kLinkToClipBoard();
 }
 
-/// Toolbar Copy button
-void
-AlcFrame::OnBarCopy(wxCommandEvent & WXUNUSED(event))
+void AlcFrame::OnBarCopy(wxCommandEvent &WXUNUSED(event))
 {
-  CopyEd2kLinkToClipBoard();
+	CopyEd2kLinkToClipBoard();
 }
 
-/// Save computed Ed2k link to file
-void
-AlcFrame::SaveEd2kLinkToFile()
+void AlcFrame::SaveEd2kLinkToFile()
 {
-  wxString link(m_ed2kTextCtrl->GetValue());
-
-  if (!link.IsEmpty())
-    {
-      const wxString & filename =
-        wxFileSelector (_("Select the file to your computed eD2k link"),
-                        wxFileName::GetHomeDir(),"my_ed2k_link",
-                        "txt", "*.txt", wxFD_SAVE, this);
-
-      if (!filename.empty ())
-        {
-          // Open file and let wxFile destructor close the file
-          // Closing it explicitly may crash on Win32 ...
-          wxFile file(filename,wxFile::write_append);
-          if (! file.IsOpened())
-            {
-              SetStatusText (_("Unable to open ") + filename);
-              return;
-            }
-          file.Write(link + wxTextFile::GetEOL());
-        }
-      else
-        {
-          SetStatusText (_("Please, enter a non empty file name"));
-        }
-    }
-  else
-    {
-      SetStatusText (_("Nothing to save for now !"));
-    }
+	wxString link(m_ed2kTextCtrl->GetValue());
+
+	if (!link.IsEmpty()) {
+		const wxString &filename = wxFileSelector(_("Select the file to your computed eD2k link"),
+			wxFileName::GetHomeDir(),
+			"my_ed2k_link",
+			"txt",
+			"*.txt",
+			wxFD_SAVE,
+			this);
+
+		if (!filename.empty()) {
+			// Open file and let wxFile destructor close the file
+			// Closing it explicitly may crash on Win32 ...
+			wxFile file(filename, wxFile::write_append);
+			if (!file.IsOpened()) {
+				SetStatusText(_("Unable to open ") + filename);
+				return;
+			}
+			file.Write(link + wxTextFile::GetEOL());
+		} else {
+			SetStatusText(_("Please, enter a non empty file name"));
+		}
+	} else {
+		SetStatusText(_("Nothing to save for now !"));
+	}
 }
 
-/// Toolbar About button
-void
-AlcFrame::OnBarAbout (wxCommandEvent & WXUNUSED(event))
+void AlcFrame::OnBarAbout(wxCommandEvent &WXUNUSED(event))
 {
-  wxMessageBox (_
-                ("aLinkCreator, the aMule eD2k link creator\n\n(c) 2004 ThePolish <thepolish@vipmail.ru>\n\nPixmaps from http://www.everaldo.com and http://www.icomania.com\nand http://jimmac.musichall.cz/ikony.php3\n\nDistributed under GPL"),
-                _("About aLinkCreator"), wxOK | wxCENTRE | wxICON_INFORMATION);
+	wxMessageBox(_("aLinkCreator, the aMule eD2k link creator\n\n(c) 2004 ThePolish "
+		       "<thepolish@vipmail.ru>\n\nPixmaps from http://www.everaldo.com and "
+		       "http://www.icomania.com\nand http://jimmac.musichall.cz/ikony.php3\n\nDistributed "
+		       "under GPL"),
+		_("About aLinkCreator"),
+		wxOK | wxCENTRE | wxICON_INFORMATION);
 }
 
-/// Close Button
-void AlcFrame::OnCloseButton (wxCommandEvent & WXUNUSED(event))
+void AlcFrame::OnCloseButton(wxCommandEvent &WXUNUSED(event))
 {
-  Close (false);
+	Close(false);
 }
 
 /// Hook into MD4/ED2K routine
 bool AlcFrame::Hook(int percent)
 {
-  // Update progress bar
-  bool goAhead = ::wxGetApp().GetMainFrame()->m_progressBar->Update(percent);
-  if (!goAhead)
-    {
-      // Destroying progressbar: no merci for croissants !
-      ::wxGetApp().GetMainFrame()->m_progressBar->Destroy();
-      // Now, be paranoid
-      delete ::wxGetApp().GetMainFrame()->m_progressBar;
-      ::wxGetApp().GetMainFrame()->m_progressBar = NULL;
-    }
-
-  return (goAhead);
+	// Update progress bar
+	bool goAhead = ::wxGetApp().GetMainFrame()->m_progressBar->Update(percent);
+	if (!goAhead) {
+		// Destroying progressbar: no merci for croissants !
+		::wxGetApp().GetMainFrame()->m_progressBar->Destroy();
+		// Now, be paranoid
+		delete ::wxGetApp().GetMainFrame()->m_progressBar;
+		::wxGetApp().GetMainFrame()->m_progressBar = NULL;
+	}
+
+	return (goAhead);
 }
 
 /// Compute Hashes on Start Button
-void AlcFrame::OnStartButton (wxCommandEvent & WXUNUSED(event))
+void AlcFrame::OnStartButton(wxCommandEvent &WXUNUSED(event))
 {
-  wxString filename = m_inputFileTextCtrl->GetValue();
+	wxString filename = m_inputFileTextCtrl->GetValue();
 
-  if (!filename.empty ())
-    {
-      // Chrono
-      wxStopWatch chrono;
+	if (!filename.empty()) {
+		// Chrono
+		wxStopWatch chrono;
 
-      // wxFileName needed for base name
-      wxFileName fileToHash(filename);
+		// wxFileName needed for base name
+		wxFileName fileToHash(filename);
 
-      // Set waiting msg
-      m_e2kHashTextCtrl->SetValue(_("Hashing..."));
-      m_ed2kTextCtrl->SetValue(_("Hashing..."));
+		// Set waiting msg
+		m_e2kHashTextCtrl->SetValue(_("Hashing..."));
+		m_ed2kTextCtrl->SetValue(_("Hashing..."));
 
 #ifdef WANT_MD4SUM
-      // Create MD4 progress bar dialog
-      m_progressBar=new wxProgressDialog  (_("aLinkCreator is working for you"), _("Computing MD4 Hash..."),
-                                           100, this, wxPD_AUTO_HIDE | wxPD_CAN_ABORT | wxPD_REMAINING_TIME);
-      m_md4HashTextCtrl->SetValue(_("Hashing..."));
+		// Create MD4 progress bar dialog
+		m_progressBar = new wxProgressDialog(_("aLinkCreator is working for you"),
+			_("Computing MD4 Hash..."),
+			100,
+			this,
+			wxPD_AUTO_HIDE | wxPD_CAN_ABORT | wxPD_REMAINING_TIME);
+		m_md4HashTextCtrl->SetValue(_("Hashing..."));
+
+		// Md4 hash
+		MD4 md4;
+		m_md4HashTextCtrl->SetValue(md4.calcMd4FromFile(filename, Hook));
+
+		// Deleting MD4 progress bar dialog
+		delete m_progressBar;
+		m_progressBar = NULL;
 
-      // Md4 hash
-      MD4 md4;
-      m_md4HashTextCtrl->SetValue(md4.calcMd4FromFile(filename,Hook));
+#endif
 
-      // Deleting MD4 progress bar dialog
-      delete m_progressBar;
-      m_progressBar=NULL;
+		// Create ED2K progress bar dialog
+		m_progressBar = new wxProgressDialog(_("aLinkCreator is working for you"),
+			_("Computing eD2k Hashes..."),
+			100,
+			this,
+			wxPD_AUTO_HIDE | wxPD_CAN_ABORT | wxPD_REMAINING_TIME);
+
+		// Compute ed2k Hash
+		Ed2kHash hash;
+
+		// Test the return value to see if was aborted.
+		if (hash.SetED2KHashFromFile(filename, Hook)) {
+
+			wxArrayString ed2kHash(hash.GetED2KHash());
+
+			// Get URLs
+			wxArrayString arrayOfUrls;
+			wxString url;
+			for (size_t i = 0; i < m_inputUrlListBox->GetCount(); ++i) {
+				url = m_inputUrlListBox->GetString(i);
+				if (url.Right(1) == "/") {
+					url += fileToHash.GetFullName();
+				}
+				arrayOfUrls.Add(wxURI(url).BuildURI());
+			}
+			arrayOfUrls.Shrink(); // Reduce memory usage
+
+			// Ed2k hash
+			m_e2kHashTextCtrl->SetValue(ed2kHash.Last());
+
+			// Ed2k link
+			m_ed2kTextCtrl->SetValue(
+				hash.GetED2KLink(m_parthashesCheck->IsChecked(), &arrayOfUrls));
+		} else {
+			// Set cancelled msg
+			m_e2kHashTextCtrl->SetValue(_("Cancelled !"));
+			m_ed2kTextCtrl->SetValue(_("Cancelled !"));
+		}
 
-#endif
+		// Deleting progress bar dialog
+		delete m_progressBar;
+		m_progressBar = NULL;
 
-      // Create ED2K progress bar dialog
-      m_progressBar=new wxProgressDialog  (_("aLinkCreator is working for you"), _("Computing eD2k Hashes..."),
-                                           100, this, wxPD_AUTO_HIDE | wxPD_CAN_ABORT | wxPD_REMAINING_TIME);
-
-      // Compute ed2k Hash
-      Ed2kHash hash;
-
-      // Test the return value to see if was aborted.
-      if (hash.SetED2KHashFromFile(filename, Hook))
-        {
-
-          wxArrayString ed2kHash (hash.GetED2KHash());
-
-          // Get URLs
-          wxArrayString arrayOfUrls;
-          wxString url;
-          for (size_t i = 0; i < m_inputUrlListBox->GetCount(); ++i)
-            {
-              url=m_inputUrlListBox->GetString(i);
-              if (url.Right(1) == "/")
-                {
-                  url += fileToHash.GetFullName();
-                }
-		arrayOfUrls.Add(wxURI(url).BuildURI());
-            }
-          arrayOfUrls.Shrink(); // Reduce memory usage
-
-          // Ed2k hash
-          m_e2kHashTextCtrl->SetValue(ed2kHash.Last());
-
-          // Ed2k link
-          m_ed2kTextCtrl->SetValue(hash.GetED2KLink(m_parthashesCheck->IsChecked(), &arrayOfUrls));
-        }
-      else
-        {
-          // Set cancelled msg
-          m_e2kHashTextCtrl->SetValue(_("Cancelled !"));
-          m_ed2kTextCtrl->SetValue(_("Cancelled !"));
-        }
-
-      // Deleting progress bar dialog
-      delete m_progressBar;
-      m_progressBar=NULL;
-
-      // Set status text
-      SetStatusText (wxString::Format(_("Done in %.2f s"),
-                                      chrono.Time()*.001));
-    }
-  else
-    {
-      // Set status text
-      SetStatusText (_("Please, enter a non empty file name"));
-    }
+		// Set status text
+		SetStatusText(wxString::Format(_("Done in %.2f s"), chrono.Time() * .001));
+	} else {
+		// Set status text
+		SetStatusText(_("Please, enter a non empty file name"));
+	}
 }
 
-
 /// Add an URL to the URL list box
-void
-AlcFrame::OnAddUrlButton (wxCommandEvent & WXUNUSED(event))
+void AlcFrame::OnAddUrlButton(wxCommandEvent &WXUNUSED(event))
 {
-  wxString url(m_inputAddTextCtrl->GetValue());
-
-  if (!url.IsEmpty())
-    {
-      // Check if the URL already exist in list
-      bool UrlNotExists = true;
-      for (size_t i = 0; i < m_inputUrlListBox->GetCount(); ++i)
-        {
-          if (url == m_inputUrlListBox->GetString(i))
-            {
-              UrlNotExists =false;
-              break;
-            }
-        }
-
-      // Add only a not already existent URL
-      if (UrlNotExists)
-        {
-	  m_inputUrlListBox->Append(wxURI(url).BuildURI());
-          m_inputAddTextCtrl->SetValue("");
-        }
-      else
-        {
-          wxLogError(_("You have already added this URL !"));
-        }
-    }
-  else
-    {
-      SetStatusText (_("Please, enter a non empty URL"));
-    }
+	wxString url(m_inputAddTextCtrl->GetValue());
+
+	if (!url.IsEmpty()) {
+		// Check if the URL already exist in list
+		bool UrlNotExists = true;
+		for (size_t i = 0; i < m_inputUrlListBox->GetCount(); ++i) {
+			if (url == m_inputUrlListBox->GetString(i)) {
+				UrlNotExists = false;
+				break;
+			}
+		}
+
+		// Add only a not already existent URL
+		if (UrlNotExists) {
+			m_inputUrlListBox->Append(wxURI(url).BuildURI());
+			m_inputAddTextCtrl->SetValue("");
+		} else {
+			wxLogError(_("You have already added this URL !"));
+		}
+	} else {
+		SetStatusText(_("Please, enter a non empty URL"));
+	}
 }
 
 /// Remove the selected URL from the URL list box
-void
-AlcFrame::OnRemoveUrlButton (wxCommandEvent & WXUNUSED(event))
+void AlcFrame::OnRemoveUrlButton(wxCommandEvent &WXUNUSED(event))
 {
-  m_inputUrlListBox->Delete(m_inputUrlListBox->GetSelection());
+	m_inputUrlListBox->Delete(m_inputUrlListBox->GetSelection());
 }
 
 /// Clear the URL list box
-void
-AlcFrame::OnClearUrlButton (wxCommandEvent & WXUNUSED(event))
+void AlcFrame::OnClearUrlButton(wxCommandEvent &WXUNUSED(event))
 {
-  m_inputUrlListBox->Clear();
+	m_inputUrlListBox->Clear();
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/alcframe.h -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/alcframe.h Changed

@@ -30,7 +30,6 @@
 #ifndef _ALCFRAME_H
 #define _ALCFRAME_H
 
-
 #include <wx/bitmap.h>
 #include <wx/checkbox.h>
 #include <wx/frame.h>
@@ -41,139 +40,136 @@
 #include <wx/statline.h>
 #include <wx/textctrl.h>
 
-
 // Compute and display md4sum or not
-//#define WANT_MD4SUM 1
-
+// #define WANT_MD4SUM 1
 
 /// Main Alc Frame
-class AlcFrame:public wxFrame
-  {
-  private:
-    wxToolBar *m_toolbar;
-    wxBitmap m_toolBarBitmaps4;
-
-    wxBoxSizer *m_frameVBox;
-
-    wxPanel *m_mainPanel;
-    wxBoxSizer *m_mainPanelVBox;
-
-    wxStaticLine *m_staticLine;
-
-    wxStaticBox *m_inputSBox;
-    wxStaticBoxSizer* m_inputSBoxSizer;
-    wxFlexGridSizer *m_inputFlexSizer;
-    wxStaticText *m_inputFileStaticText;
-    wxTextCtrl *m_inputFileTextCtrl;
-    wxButton *m_inputFileBrowseButton ;
-    wxStaticText *m_inputAddStaticText;
-    wxTextCtrl *m_inputAddTextCtrl;
-    wxButton *m_inputAddButton ;
-    wxListBox *m_inputUrlListBox;
-    wxBoxSizer *m_buttonUrlVBox;
-    wxButton *m_removeButton;
-    wxButton *m_clearButton;
-    wxCheckBox *m_parthashesCheck;
-
-    wxProgressDialog *m_progressBar;
-
+class AlcFrame : public wxFrame
+{
+private:
+	wxToolBar *m_toolbar;
+	wxBitmap m_toolBarBitmaps4;
+
+	wxBoxSizer *m_frameVBox;
+
+	wxPanel *m_mainPanel;
+	wxBoxSizer *m_mainPanelVBox;
+
+	wxStaticLine *m_staticLine;
+
+	wxStaticBox *m_inputSBox;
+	wxStaticBoxSizer *m_inputSBoxSizer;
+	wxFlexGridSizer *m_inputFlexSizer;
+	wxStaticText *m_inputFileStaticText;
+	wxTextCtrl *m_inputFileTextCtrl;
+	wxButton *m_inputFileBrowseButton;
+	wxStaticText *m_inputAddStaticText;
+	wxTextCtrl *m_inputAddTextCtrl;
+	wxButton *m_inputAddButton;
+	wxListBox *m_inputUrlListBox;
+	wxBoxSizer *m_buttonUrlVBox;
+	wxButton *m_removeButton;
+	wxButton *m_clearButton;
+	wxCheckBox *m_parthashesCheck;
+
+	wxProgressDialog *m_progressBar;
 
 #ifdef WANT_MD4SUM
 
-    wxStaticBox *m_md4HashSBox;
-    wxStaticBoxSizer* m_md4HashSBoxSizer;
-    wxTextCtrl *m_md4HashTextCtrl;
+	wxStaticBox *m_md4HashSBox;
+	wxStaticBoxSizer *m_md4HashSBoxSizer;
+	wxTextCtrl *m_md4HashTextCtrl;
 #endif
 
-    wxStaticBox *m_e2kHashSBox;
-    wxStaticBoxSizer* m_e2kHashSBoxSizer;
-    wxTextCtrl *m_e2kHashTextCtrl;
+	wxStaticBox *m_e2kHashSBox;
+	wxStaticBoxSizer *m_e2kHashSBoxSizer;
+	wxTextCtrl *m_e2kHashTextCtrl;
 
-    wxStaticBox *m_ed2kSBox;
-    wxStaticBoxSizer* m_ed2kSBoxSizer;
-    wxTextCtrl *m_ed2kTextCtrl;
+	wxStaticBox *m_ed2kSBox;
+	wxStaticBoxSizer *m_ed2kSBoxSizer;
+	wxTextCtrl *m_ed2kTextCtrl;
 
-    wxBoxSizer* m_buttonHBox;
-    wxButton *m_copyButton;
-    wxButton *m_startButton;
-    wxButton *m_saveButton;
-    wxButton *m_closeButton;
+	wxBoxSizer *m_buttonHBox;
+	wxButton *m_copyButton;
+	wxButton *m_startButton;
+	wxButton *m_saveButton;
+	wxButton *m_closeButton;
 
-    enum
-    {
-      ID_BAR_OPEN = 1000,
-      ID_BAR_SAVEAS,
-      ID_BAR_COPY,
-      ID_BAR_ABOUT,
-      ID_START_BUTTON,
-      ID_SAVEAS_BUTTON,
-      ID_COPY_BUTTON,
-      ID_EXIT_BUTTON,
-      ID_BROWSE_BUTTON,
-      ID_ADD_BUTTON,
-      ID_REMOVE_BUTTON,
-      ID_CLEAR_BUTTON,
-      ID_PARTHASHES_CHECK
-    };
+	enum
+	{
+		ID_BAR_OPEN = 1000,
+		ID_BAR_SAVEAS,
+		ID_BAR_COPY,
+		ID_BAR_ABOUT,
+		ID_START_BUTTON,
+		ID_SAVEAS_BUTTON,
+		ID_COPY_BUTTON,
+		ID_EXIT_BUTTON,
+		ID_BROWSE_BUTTON,
+		ID_ADD_BUTTON,
+		ID_REMOVE_BUTTON,
+		ID_CLEAR_BUTTON,
+		ID_PARTHASHES_CHECK
+	};
 
-    /// Set File to hash in wxTextCtrl
-    void SetFileToHash();
+	/// Set File to hash in wxTextCtrl
+	void SetFileToHash();
 
-    /// Save computed Ed2k link to file
-    void SaveEd2kLinkToFile();
+	/// Save computed Ed2k link to file
+	void SaveEd2kLinkToFile();
 
-    /// Copy Ed2k link to clip board
-    void CopyEd2kLinkToClipBoard();
+	/// Copy Ed2k link to clip board
+	void CopyEd2kLinkToClipBoard();
 
-  protected:
+protected:
+	/// Toolbar Open button
+	void OnBarOpen(wxCommandEvent &event);
 
-    /// Toolbar Open button
-    void OnBarOpen (wxCommandEvent & event);
+	/// Toolbar Save As button
+	void OnBarSaveAs(wxCommandEvent &event);
 
-    /// Toolbar Save As button
-    void OnBarSaveAs (wxCommandEvent & event);
+	/// Toolbar Copy button
+	void OnBarCopy(wxCommandEvent &event);
 
-    /// Toolbar Copy button
-    void OnBarCopy(wxCommandEvent & event);
+	/// Toolbar About button
+	void OnBarAbout(wxCommandEvent &event);
 
-    /// Toolbar About button
-    void OnBarAbout (wxCommandEvent & event);
+	/// Close Button
+	void OnCloseButton(wxCommandEvent &event);
 
-    /// Close Button
-    void OnCloseButton (wxCommandEvent & event);
+	/// Save As button
+	void OnSaveAsButton(wxCommandEvent &event);
 
-    /// Save As button
-    void OnSaveAsButton(wxCommandEvent & event);
+	/// Copy button
+	void OnCopyButton(wxCommandEvent &event);
 
-    /// Copy button
-    void OnCopyButton(wxCommandEvent & event);
+	/// Compute Hashes on Start Button
+	void OnStartButton(wxCommandEvent &event);
 
-    /// Compute Hashes on Start Button
-    void OnStartButton (wxCommandEvent & event);
+	/// Browse button to select file to hash
+	void OnBrowseButton(wxCommandEvent &event);
 
-    /// Browse button to select file to hash
-    void OnBrowseButton (wxCommandEvent & event);
+	/// Add an URL to the URL list box
+	void OnAddUrlButton(wxCommandEvent &event);
 
-    /// Add an URL to the URL list box
-    void OnAddUrlButton (wxCommandEvent & event);
+	/// Remove the selected URL from the URL list box
+	void OnRemoveUrlButton(wxCommandEvent &event);
 
-    /// Remove the selected URL from the URL list box
-    void OnRemoveUrlButton (wxCommandEvent & event);
+	/// Clear the URL list box
+	void OnClearUrlButton(wxCommandEvent &event);
 
-    /// Clear the URL list box
-    void OnClearUrlButton (wxCommandEvent & event);
+	wxDECLARE_EVENT_TABLE();
 
-    wxDECLARE_EVENT_TABLE();
-  public:
-    /// Constructor
-    AlcFrame (const wxString& title);
+public:
+	/// Constructor
+	AlcFrame(const wxString &title);
 
-    /// Destructor
-    ~AlcFrame ();
+	/// Destructor
+	~AlcFrame();
 
-    // Hook function for external update of the progress bar
-    static bool Hook(int percent);
-  };
+	// Hook function for external update of the progress bar
+	static bool Hook(int percent);
+};
 
 #endif /* _ALCFRAME_H */
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/alcpix.cpp -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/alcpix.cpp Changed

@@ -25,2613 +25,2579 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
 #include "alcpix.h"
 
-wxBitmap AlcPix::getPixmap(const wxString& name)
+wxBitmap AlcPix::getPixmap(const wxString &name)
 {
-  if (name == "about")
-    {
-      wxBitmap bitmap(m_about_xpm);
-      return bitmap;
-    }
+	if (name == "about") {
+		wxBitmap bitmap(m_about_xpm);
+		return bitmap;
+	}
 #ifndef __WINDOWS__
-  else if (name == "alc")
-    {
-      wxBitmap bitmap(m_alc_xpm);
-      return bitmap;
-    }
+	else if (name == "alc") {
+		wxBitmap bitmap(m_alc_xpm);
+		return bitmap;
+	}
 #endif
-  else if (name == "copy")
-    {
-      wxBitmap bitmap(m_copy_xpm);
-      return bitmap;
-    }
-  else if (name == "open")
-    {
-      wxBitmap bitmap(m_open_xpm);
-      return bitmap;
-    }
-  else if (name == "saveas")
-    {
-      wxBitmap bitmap(m_saveas_xpm);
-      return bitmap;
-    }
-  else
-    {
-      return wxNullBitmap;
-    }
+	else if (name == "copy") {
+		wxBitmap bitmap(m_copy_xpm);
+		return bitmap;
+	} else if (name == "open") {
+		wxBitmap bitmap(m_open_xpm);
+		return bitmap;
+	} else if (name == "saveas") {
+		wxBitmap bitmap(m_saveas_xpm);
+		return bitmap;
+	} else {
+		return wxNullBitmap;
+	}
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///
 /// Several themes follow. Switch them by CPP macro in alcpix.h
-///
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef WANT_KDE_THEME
-const char *
-AlcPix::m_about_xpm=
-  { /* XPM */
-    /* columns rows colors chars-per-pixel */
-    "32 32 251 2",
-    "   c black",
-    ".  c #890000",
-    "X  c #8A0000",
-    "o  c #8B0000",
-    "O  c #8C0000",
-    "+  c #8D0000",
-    "@  c #8E0000",
-    "#  c #8F0000",
-    "$  c #900000",
-    "%  c #910000",
-    "&  c #920000",
-    "*  c #930000",
-    "=  c #940000",
-    "-  c #950000",
-    ";  c #960000",
-    ":  c #970000",
-    ">  c #980000",
-    ",  c #990000",
-    "<  c #9A0000",
-    "1  c #9B0000",
-    "2  c #9B0202",
-    "3  c #9C0000",
-    "4  c #9D0000",
-    "5  c #9E0000",
-    "6  c #9F0000",
-    "7  c #9B0909",
-    "8  c #9C0B0B",
-    "9  c #A00000",
-    "0  c #A20000",
-    "q  c #A30000",
-    "w  c #A40000",
-    "e  c #A50000",
-    "r  c #A60000",
-    "t  c #A70000",
-    "y  c #A80000",
-    "u  c #A90000",
-    "i  c #AA0000",
-    "p  c #AB0000",
-    "a  c #AC0000",
-    "s  c #AD0000",
-    "d  c #AE0000",
-    "f  c #AF0000",
-    "g  c #A90B0B",
-    "h  c #AD0909",
-    "j  c #B00000",
-    "k  c #B10000",
-    "l  c #B20000",
-    "z  c #B30000",
-    "x  c #B40000",
-    "c  c #B50000",
-    "v  c #B60000",
-    "b  c #B70000",
-    "n  c #B80000",
-    "m  c #B90000",
-    "M  c #BA0000",
-    "N  c #BB0000",
-    "B  c #BB0202",
-    "V  c #BC0000",
-    "C  c #BD0000",
-    "Z  c #BE0000",
-    "A  c #BF0000",
-    "S  c #C00000",
-    "D  c #C10000",
-    "F  c #C20000",
-    "G  c #C30000",
-    "H  c #C40000",
-    "J  c #C50000",
-    "K  c #C60000",
-    "L  c #C70000",
-    "P  c #C60F0F",
-    "I  c #C80000",
-    "U  c #C90000",
-    "Y  c #CA0000",
-    "T  c #CB0000",
-    "R  c #CC0000",
-    "E  c #CD0000",
-    "W  c #CC0B0B",
-    "Q  c #D20000",
-    "!  c #D50000",
-    "~  c #D60000",
-    "^  c #D70000",
-    "/  c #D50505",
-    "(  c #D20E0E",
-    ")  c #D70F0F",
-    "_  c #D80000",
-    "`  c #D90000",
-    "'  c #DD0000",
-    "  c #D51111",
-    "  c #D21818",
-    "{  c #D41A1A",
-    "}  c #DC1D1D",
-    "|  c #C02626",
-    " . c #C62020",
-    ".. c #C72626",
-    "X. c #CF3E3E",
-    "o. c #D22020",
-    "O. c #D42121",
-    "+. c #D92222",
-    "@. c #D92323",
-    "#. c #DA2626",
-    "$. c #DE2121",
-    "%. c #D53030",
-    "&. c #DB3030",
-    "*. c #DD3C3C",
-    "=. c #DF3C3C",
-    "-. c #E10000",
-    ";. c #E20000",
-    ":. c #E30000",
-    ">. c #E30505",
-    ",. c #E40000",
-    "<. c #E30D0D",
-    "1. c #EA0101",
-    "2. c #EA0404",
-    "3. c #E01A1A",
-    "4. c #EC1919",
-    "5. c #F20000",
-    "6. c #F30707",
-    "7. c #F40000",
-    "8. c #F70000",
-    "9. c #F50808",
-    "0. c #F50D0D",
-    "q. c #F80000",
-    "w. c #FA0101",
-    "e. c #FB0000",
-    "r. c #FC0000",
-    "t. c #FD0000",
-    "y. c #FD0101",
-    "u. c #FE0000",
-    "i. c #FE0101",
-    "p. c #FF0202",
-    "a. c #FF0808",
-    "s. c #FE0E0E",
-    "d. c #FF0F0F",
-    "f. c #F41010",
-    "g. c #FF1414",
-    "h. c #FF1818",
-    "j. c #E52020",
-    "k. c #EB2F2F",
-    "l. c #EB3E3E",
-    "z. c #F42020",
-    "x. c #F72E2E",
-    "c. c #FF2020",
-    "v. c #FF2222",
-    "b. c #F82F2F",
-    "n. c #FF2B2B",
-    "m. c #FF2D2D",
-    "M. c #F23030",
-    "N. c #F43030",
-    "B. c #F63030",
-    "V. c #F73232",
-    "C. c #F53E3E",
-    "Z. c #F93030",
-    "A. c #FF3434",
-    "S. c #FF3737",
-    "D. c #F83838",
-    "F. c #DA4B4B",
-    "G. c #D45252",
-    "H. c #DA5252",
-    "J. c #EB4848",
-    "K. c #EC4848",
-    "L. c #F64545",
-    "P. c #FF4343",
-    "I. c #FF4646",
-    "U. c #FB4848",
-    "Y. c #FF4E4E",
-    "T. c #F75858",
-    "R. c #FB5656",
-    "E. c #FF5050",
-    "W. c #FE5252",
-    "Q. c #FF5858",
-    "!. c #FF5A5A",
-    "~. c #EB6F6F",
-    "^. c #F56C6C",
-    "/. c #FA6262",
-    "(. c #FF6060",
-    "). c #FF6666",
-    "_. c #FF6767",
-    "`. c #F96F6F",
-    "'. c #FA6C6C",
-    ". c #FF6969",
-    ". c #FF6C6C",
-    "{. c #F97676",
-    "}. c #FF7272",
-    "|. c #FF7676",
-    " X c #FD7A7A",
-    ".X c #FF7B7B",
-    "XX c #FF7E7E",
-    "oX c #D98181",
-    "OX c #E48383",
-    "+X c #E58383",
-    "@X c #E88B8B",
-    "#X c #E88C8C",
-    "$X c #E99292",
-    "%X c #EB9090",
-    "&X c #EE9393",
-    "*X c #ED9C9C",
-    "=X c #F58282",
-    "-X c #FA8181",
-    ";X c #FF8080",
-    ":X c #FF8B8B",
-    ">X c #FD8D8D",
-    ",X c #FF8C8C",
-    "<X c #F19E9E",
-    "1X c #F59D9D",
-    "2X c #FB9090",
-    "3X c #FF9494",
-    "4X c #FD9B9B",
-    "5X c #FF9C9C",
-    "6X c #FF9E9E",
-    "7X c #EDA0A0",
-    "8X c #EEAFAF",
-    "9X c #EFAEAE",
-    "0X c #E8BFBF",
-    "qX c #E9BFBF",
-    "wX c #EABFBF",
-    "eX c #EDBABA",
-    "rX c #FBA3A3",
-    "tX c #FFA3A3",
-    "yX c #FCA4A4",
-    "uX c #FDA9A9",
-    "iX c #FFA9A9",
-    "pX c #FFACAC",
-    "aX c #FFAFAF",
-    "sX c #F0B2B2",
-    "dX c #F3B7B7",
-    "fX c #F9B7B7",
-    "gX c #FEB3B3",
-    "hX c #FCBFBF",
-    "jX c #ECCFCF",
-    "kX c #EFCFCF",
-    "lX c #F6C1C1",
-    "zX c #FDC2C2",
-    "xX c #FFC0C0",
-    "cX c #FDC4C4",
-    "vX c #FFC5C5",
-    "bX c #FFC9C9",
-    "nX c #FECFCF",
-    "mX c #FCD3D3",
-    "MX c #FFD1D1",
-    "NX c #FFD9D9",
-    "BX c #FEDFDF",
-    "VX c #FFE1E1",
-    "CX c #FAEFEF",
-    "ZX c #FFECEC",
-    "AX c #FEEFEF",
-    "SX c #FFF0F0",
-    "DX c #FFF1F1",
-    "FX c #FFF3F3",
-    "GX c #FFF5F5",
-    "HX c gray100",
-    "JX c None",
-    /* pixels */
-    "JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX",
-    "JXJXJXJXJXJXJXJXJXJXJXJXL L L A A A A A JXJXJXJXJXJXJXJXJXJXJXJX",
-    "JXJXJXJXJXJXJXJXJXT T L L L A A A A M M M v M JXJXJXJXJXJXJXJXJX",
-    "JXJXJXJXJXJXJXJXT T L E ` -.k.C.C.l.-.Q A M f f JXJXJXJXJXJXJXJX",
-    "JXJXJXJXJXJXT T T E -.T.rXSXSXSXSXSXSXzX{.} A f f p JXJXJXJXJXJX",
-    "JXJXJXJXJXT T T ' L.cXVXVXmX*X$XsX9XdXVXVXVX'.( f p i JXJXJXJXJX",
-    "JXJXJXJXT T L <.;XmXmXfX$X9XHXHXHXHXHXeXlXmXmXiX#.p i i JXJXJXJX",
-    "JXJXJXJXT T -.4XhXhX1X#XHXHXHXHXHXHXHXHXHXNXhXhXaX@.e e JXJXJXJX",
-    "JXJXJXT T ` '.aXaXyX#XHXHXHXHXHXHXHXHXHXHXHXbXpXaX,XW e q JXJXJX",
-    "JXJXT T T x.6X6X6X~.HXHXHXHXNXtX6XiXAXHXHXHXGX6X6XtX/.i q 4 JXJX",
-    "JXJXL L -..X,X,X,X&XHXHXHXSX,X,X:X:X=XCXHXHXHX3X,X,X,X 4 4 JXJX",
-    "JXJXL T x..X.X.X.X<XHXHXHXpX.X.X.X.X^.wXHXHXHX6X.XR.D.f.i 4 JXJX",
-    "JXL L ~ U.....2XHXHXGX}.....G.HXHXHXHXM.6.5.5.5.A < < JX",
-    "JXL L -.W.Q.Q.Q.Q.Q.:XiX.Q.Q.Q.Q.H.kXHXHXHXhX5.5.5.5.5.~ < < JX",
-    "JXA L 2.I.I.I.I.I.I.I.I.I.I.I.I.F.CXHXHXHXAXz.5.5.5.5.5.-.< * JX",
-    "JXA A 0.A.A.A.A.A.A.A.A.A.A.A.X.CXHXHXHXAXM.5.5.5.5.5.5.5.* * JX",
-    "JXA A 9.c.c.c.c.c.c.v.c.c.c.@.CXHXHXHXAXM.5.5.5.5.5.5.5.5.* % JX",
-    "JXA A 2.s.g.s.g.g.s.g.s.g.s.oXHXHXHXVXx.5.8.8.5.5.8.5.8.-.% % JX",
-    "JXA M :.i.i.i.i.i.i.i.i.e.8.wXHXHXHXx.8.8.8.8.8.8.8.8.8.~ # # JX",
-    "JXM M ~ i.i.i.i.i.i.e.e.e.e.0XHXHXmXe.e.e.e.e.e.e.e.e.e.A # # JX",
-    "JXJXM A i.i.i.i.i.i.i.i.i.i.7XHXHXXXi.i.i.i.i.i.i.i.i.i.4 # JXJX",
-    "JXJXv v >.a.a.a.a.a.a.a.a.a.h..X).a.a.a.a.a.a.a.a.a.a./ # X JXJX",
-    "JXJXf v B g.g.g.g.g.g.g.g.g. OXOXx.g.g.g.g.g.g.g.g.g.< # X JXJX",
-    "JXJXJXf f  c.c.c.c.c.h.h.4.kXHXHXSXm.c.h.c.c.c.c.h.P X X JXJXJX",
-    "JXJXJXJXp f 3.n.m.n.n.m.m.j.HXHXHXHX(.m.m.m.n.m.m.{ X X JXJXJXJX",
-    "JXJXJXJXp p i $.S.A.A.S.A.M.GXHXHXHXW.A.A.S.A.A.O.X X X JXJXJXJX",
-    "JXJXJXJXJXi i e o.P.P.P.I.P.).cXmXXXP.P.I.P.P. .X X X JXJXJXJXJX",
-    "JXJXJXJXJXJXe e q h &.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.%.7 X X X JXJXJXJXJXJX",
-    "JXJXJXJXJXJXJXJXq q 4 g | l.K.Q.Q.K.*.| 8 # X X JXJXJXJXJXJXJXJX",
-    "JXJXJXJXJXJXJXJXJX4 4 < < < * * % % % # # X X JXJXJXJXJXJXJXJXJX",
-    "JXJXJXJXJXJXJXJXJXJXJXJX* < * * % # # # JXJXJXJXJXJXJXJXJXJXJXJX",
-    "JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX"
-  };
+const char *AlcPix::m_about_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 251 2",
+	"   c black",
+	".  c #890000",
+	"X  c #8A0000",
+	"o  c #8B0000",
+	"O  c #8C0000",
+	"+  c #8D0000",
+	"@  c #8E0000",
+	"#  c #8F0000",
+	"$  c #900000",
+	"%  c #910000",
+	"&  c #920000",
+	"*  c #930000",
+	"=  c #940000",
+	"-  c #950000",
+	";  c #960000",
+	":  c #970000",
+	">  c #980000",
+	",  c #990000",
+	"<  c #9A0000",
+	"1  c #9B0000",
+	"2  c #9B0202",
+	"3  c #9C0000",
+	"4  c #9D0000",
+	"5  c #9E0000",
+	"6  c #9F0000",
+	"7  c #9B0909",
+	"8  c #9C0B0B",
+	"9  c #A00000",
+	"0  c #A20000",
+	"q  c #A30000",
+	"w  c #A40000",
+	"e  c #A50000",
+	"r  c #A60000",
+	"t  c #A70000",
+	"y  c #A80000",
+	"u  c #A90000",
+	"i  c #AA0000",
+	"p  c #AB0000",
+	"a  c #AC0000",
+	"s  c #AD0000",
+	"d  c #AE0000",
+	"f  c #AF0000",
+	"g  c #A90B0B",
+	"h  c #AD0909",
+	"j  c #B00000",
+	"k  c #B10000",
+	"l  c #B20000",
+	"z  c #B30000",
+	"x  c #B40000",
+	"c  c #B50000",
+	"v  c #B60000",
+	"b  c #B70000",
+	"n  c #B80000",
+	"m  c #B90000",
+	"M  c #BA0000",
+	"N  c #BB0000",
+	"B  c #BB0202",
+	"V  c #BC0000",
+	"C  c #BD0000",
+	"Z  c #BE0000",
+	"A  c #BF0000",
+	"S  c #C00000",
+	"D  c #C10000",
+	"F  c #C20000",
+	"G  c #C30000",
+	"H  c #C40000",
+	"J  c #C50000",
+	"K  c #C60000",
+	"L  c #C70000",
+	"P  c #C60F0F",
+	"I  c #C80000",
+	"U  c #C90000",
+	"Y  c #CA0000",
+	"T  c #CB0000",
+	"R  c #CC0000",
+	"E  c #CD0000",
+	"W  c #CC0B0B",
+	"Q  c #D20000",
+	"!  c #D50000",
+	"~  c #D60000",
+	"^  c #D70000",
+	"/  c #D50505",
+	"(  c #D20E0E",
+	")  c #D70F0F",
+	"_  c #D80000",
+	"`  c #D90000",
+	"'  c #DD0000",
+	"  c #D51111",
+	"  c #D21818",
+	"{  c #D41A1A",
+	"}  c #DC1D1D",
+	"|  c #C02626",
+	" . c #C62020",
+	".. c #C72626",
+	"X. c #CF3E3E",
+	"o. c #D22020",
+	"O. c #D42121",
+	"+. c #D92222",
+	"@. c #D92323",
+	"#. c #DA2626",
+	"$. c #DE2121",
+	"%. c #D53030",
+	"&. c #DB3030",
+	"*. c #DD3C3C",
+	"=. c #DF3C3C",
+	"-. c #E10000",
+	";. c #E20000",
+	":. c #E30000",
+	">. c #E30505",
+	",. c #E40000",
+	"<. c #E30D0D",
+	"1. c #EA0101",
+	"2. c #EA0404",
+	"3. c #E01A1A",
+	"4. c #EC1919",
+	"5. c #F20000",
+	"6. c #F30707",
+	"7. c #F40000",
+	"8. c #F70000",
+	"9. c #F50808",
+	"0. c #F50D0D",
+	"q. c #F80000",
+	"w. c #FA0101",
+	"e. c #FB0000",
+	"r. c #FC0000",
+	"t. c #FD0000",
+	"y. c #FD0101",
+	"u. c #FE0000",
+	"i. c #FE0101",
+	"p. c #FF0202",
+	"a. c #FF0808",
+	"s. c #FE0E0E",
+	"d. c #FF0F0F",
+	"f. c #F41010",
+	"g. c #FF1414",
+	"h. c #FF1818",
+	"j. c #E52020",
+	"k. c #EB2F2F",
+	"l. c #EB3E3E",
+	"z. c #F42020",
+	"x. c #F72E2E",
+	"c. c #FF2020",
+	"v. c #FF2222",
+	"b. c #F82F2F",
+	"n. c #FF2B2B",
+	"m. c #FF2D2D",
+	"M. c #F23030",
+	"N. c #F43030",
+	"B. c #F63030",
+	"V. c #F73232",
+	"C. c #F53E3E",
+	"Z. c #F93030",
+	"A. c #FF3434",
+	"S. c #FF3737",
+	"D. c #F83838",
+	"F. c #DA4B4B",
+	"G. c #D45252",
+	"H. c #DA5252",
+	"J. c #EB4848",
+	"K. c #EC4848",
+	"L. c #F64545",
+	"P. c #FF4343",
+	"I. c #FF4646",
+	"U. c #FB4848",
+	"Y. c #FF4E4E",
+	"T. c #F75858",
+	"R. c #FB5656",
+	"E. c #FF5050",
+	"W. c #FE5252",
+	"Q. c #FF5858",
+	"!. c #FF5A5A",
+	"~. c #EB6F6F",
+	"^. c #F56C6C",
+	"/. c #FA6262",
+	"(. c #FF6060",
+	"). c #FF6666",
+	"_. c #FF6767",
+	"`. c #F96F6F",
+	"'. c #FA6C6C",
+	". c #FF6969",
+	". c #FF6C6C",
+	"{. c #F97676",
+	"}. c #FF7272",
+	"|. c #FF7676",
+	" X c #FD7A7A",
+	".X c #FF7B7B",
+	"XX c #FF7E7E",
+	"oX c #D98181",
+	"OX c #E48383",
+	"+X c #E58383",
+	"@X c #E88B8B",
+	"#X c #E88C8C",
+	"$X c #E99292",
+	"%X c #EB9090",
+	"&X c #EE9393",
+	"*X c #ED9C9C",
+	"=X c #F58282",
+	"-X c #FA8181",
+	";X c #FF8080",
+	":X c #FF8B8B",
+	">X c #FD8D8D",
+	",X c #FF8C8C",
+	"<X c #F19E9E",
+	"1X c #F59D9D",
+	"2X c #FB9090",
+	"3X c #FF9494",
+	"4X c #FD9B9B",
+	"5X c #FF9C9C",
+	"6X c #FF9E9E",
+	"7X c #EDA0A0",
+	"8X c #EEAFAF",
+	"9X c #EFAEAE",
+	"0X c #E8BFBF",
+	"qX c #E9BFBF",
+	"wX c #EABFBF",
+	"eX c #EDBABA",
+	"rX c #FBA3A3",
+	"tX c #FFA3A3",
+	"yX c #FCA4A4",
+	"uX c #FDA9A9",
+	"iX c #FFA9A9",
+	"pX c #FFACAC",
+	"aX c #FFAFAF",
+	"sX c #F0B2B2",
+	"dX c #F3B7B7",
+	"fX c #F9B7B7",
+	"gX c #FEB3B3",
+	"hX c #FCBFBF",
+	"jX c #ECCFCF",
+	"kX c #EFCFCF",
+	"lX c #F6C1C1",
+	"zX c #FDC2C2",
+	"xX c #FFC0C0",
+	"cX c #FDC4C4",
+	"vX c #FFC5C5",
+	"bX c #FFC9C9",
+	"nX c #FECFCF",
+	"mX c #FCD3D3",
+	"MX c #FFD1D1",
+	"NX c #FFD9D9",
+	"BX c #FEDFDF",
+	"VX c #FFE1E1",
+	"CX c #FAEFEF",
+	"ZX c #FFECEC",
+	"AX c #FEEFEF",
+	"SX c #FFF0F0",
+	"DX c #FFF1F1",
+	"FX c #FFF3F3",
+	"GX c #FFF5F5",
+	"HX c gray100",
+	"JX c None",
+	/* pixels */
+	"JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX",
+	"JXJXJXJXJXJXJXJXJXJXJXJXL L L A A A A A JXJXJXJXJXJXJXJXJXJXJXJX",
+	"JXJXJXJXJXJXJXJXJXT T L L L A A A A M M M v M JXJXJXJXJXJXJXJXJX",
+	"JXJXJXJXJXJXJXJXT T L E ` -.k.C.C.l.-.Q A M f f JXJXJXJXJXJXJXJX",
+	"JXJXJXJXJXJXT T T E -.T.rXSXSXSXSXSXSXzX{.} A f f p JXJXJXJXJXJX",
+	"JXJXJXJXJXT T T ' L.cXVXVXmX*X$XsX9XdXVXVXVX'.( f p i JXJXJXJXJX",
+	"JXJXJXJXT T L <.;XmXmXfX$X9XHXHXHXHXHXeXlXmXmXiX#.p i i JXJXJXJX",
+	"JXJXJXJXT T -.4XhXhX1X#XHXHXHXHXHXHXHXHXHXNXhXhXaX@.e e JXJXJXJX",
+	"JXJXJXT T ` '.aXaXyX#XHXHXHXHXHXHXHXHXHXHXHXbXpXaX,XW e q JXJXJX",
+	"JXJXT T T x.6X6X6X~.HXHXHXHXNXtX6XiXAXHXHXHXGX6X6XtX/.i q 4 JXJX",
+	"JXJXL L -..X,X,X,X&XHXHXHXSX,X,X:X:X=XCXHXHXHX3X,X,X,X 4 4 JXJX",
+	"JXJXL T x..X.X.X.X<XHXHXHXpX.X.X.X.X^.wXHXHXHX6X.XR.D.f.i 4 JXJX",
+	"JXL L ~ U.....2XHXHXGX}.....G.HXHXHXHXM.6.5.5.5.A < < JX",
+	"JXL L -.W.Q.Q.Q.Q.Q.:XiX.Q.Q.Q.Q.H.kXHXHXHXhX5.5.5.5.5.~ < < JX",
+	"JXA L 2.I.I.I.I.I.I.I.I.I.I.I.I.F.CXHXHXHXAXz.5.5.5.5.5.-.< * JX",
+	"JXA A 0.A.A.A.A.A.A.A.A.A.A.A.X.CXHXHXHXAXM.5.5.5.5.5.5.5.* * JX",
+	"JXA A 9.c.c.c.c.c.c.v.c.c.c.@.CXHXHXHXAXM.5.5.5.5.5.5.5.5.* % JX",
+	"JXA A 2.s.g.s.g.g.s.g.s.g.s.oXHXHXHXVXx.5.8.8.5.5.8.5.8.-.% % JX",
+	"JXA M :.i.i.i.i.i.i.i.i.e.8.wXHXHXHXx.8.8.8.8.8.8.8.8.8.~ # # JX",
+	"JXM M ~ i.i.i.i.i.i.e.e.e.e.0XHXHXmXe.e.e.e.e.e.e.e.e.e.A # # JX",
+	"JXJXM A i.i.i.i.i.i.i.i.i.i.7XHXHXXXi.i.i.i.i.i.i.i.i.i.4 # JXJX",
+	"JXJXv v >.a.a.a.a.a.a.a.a.a.h..X).a.a.a.a.a.a.a.a.a.a./ # X JXJX",
+	"JXJXf v B g.g.g.g.g.g.g.g.g. OXOXx.g.g.g.g.g.g.g.g.g.< # X JXJX",
+	"JXJXJXf f  c.c.c.c.c.h.h.4.kXHXHXSXm.c.h.c.c.c.c.h.P X X JXJXJX",
+	"JXJXJXJXp f 3.n.m.n.n.m.m.j.HXHXHXHX(.m.m.m.n.m.m.{ X X JXJXJXJX",
+	"JXJXJXJXp p i $.S.A.A.S.A.M.GXHXHXHXW.A.A.S.A.A.O.X X X JXJXJXJX",
+	"JXJXJXJXJXi i e o.P.P.P.I.P.).cXmXXXP.P.I.P.P. .X X X JXJXJXJXJX",
+	"JXJXJXJXJXJXe e q h &.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.%.7 X X X JXJXJXJXJXJX",
+	"JXJXJXJXJXJXJXJXq q 4 g | l.K.Q.Q.K.*.| 8 # X X JXJXJXJXJXJXJXJX",
+	"JXJXJXJXJXJXJXJXJX4 4 < < < * * % % % # # X X JXJXJXJXJXJXJXJXJX",
+	"JXJXJXJXJXJXJXJXJXJXJXJX* < * * % # # # JXJXJXJXJXJXJXJXJXJXJXJX",
+	"JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX"
+};
 
 #ifndef __WINDOWS__
-const char *
-AlcPix::m_alc_xpm=
-  { /* XPM */
-    /* columns rows colors chars-per-pixel */
-    "32 32 142 2",
-    "   c #000000",
-    ".  c #0C0B00",
-    "X  c #0B0B0B",
-    "o  c #131313",
-    "O  c #121318",
-    "+  c #1A1A1A",
-    "@  c #2D1A00",
-    "#  c #292100",
-    "$  c #29251E",
-    "%  c #222222",
-    "&  c #292929",
-    "*  c #323232",
-    "=  c #36383B",
-    "-  c #393836",
-    ";  c #3E3E3E",
-    ":  c #5F3F06",
-    ">  c #534400",
-    ",  c #594400",
-    "<  c #584A00",
-    "1  c #6F4700",
-    "2  c #604418",
-    "3  c #7F6F00",
-    "4  c gray26",
-    "5  c #4A4A4A",
-    "6  c #4D4D58",
-    "7  c #505052",
-    "8  c #5A5A5A",
-    "9  c #5B5C63",
-    "0  c #786448",
-    "q  c #646464",
-    "w  c #696B6F",
-    "e  c #747474",
-    "r  c #77797D",
-    "t  c #7C7C7C",
-    "y  c #7C7D82",
-    "u  c #995B0A",
-    "i  c #9A7700",
-    "p  c #8D682E",
-    "a  c #AA7900",
-    "s  c #9B7F4C",
-    "d  c #867C6A",
-    "f  c #817D7A",
-    "g  c #9A8B00",
-    "h  c #A38002",
-    "j  c #AC8800",
-    "k  c #A59200",
-    "l  c #BE8D2D",
-    "z  c #B5A200",
-    "x  c #97876C",
-    "c  c #958873",
-    "v  c #9F9079",
-    "b  c #B3B272",
-    "n  c #BFB97D",
-    "m  c #D59700",
-    "M  c #C5B500",
-    "N  c #E4AA14",
-    "B  c #FBB904",
-    "V  c #E9AB38",
-    "C  c #FCBC20",
-    "Z  c #D1AB66",
-    "A  c #F0B355",
-    "S  c #E0B96A",
-    "D  c #D6C500",
-    "F  c #D9C300",
-    "G  c #DED100",
-    "H  c #E4D700",
-    "J  c #EDDE00",
-    "K  c #F1C500",
-    "L  c #FFC604",
-    "P  c #FCC90B",
-    "I  c #FFD600",
-    "U  c #FFDB00",
-    "Y  c #FFD81D",
-    "T  c #FFCF2A",
-    "R  c #FFD32C",
-    "E  c #FFD433",
-    "W  c #FFD23A",
-    "Q  c #F0E500",
-    "!  c #FEE300",
-    "~  c #FFE800",
-    "^  c #FDE114",
-    "/  c #FFF000",
-    "(  c #FEFB01",
-    ")  c #FDFC28",
-    "_  c #FFD541",
-    "`  c #FFD64A",
-    "'  c #E0E046",
-    "  c #858585",
-    "  c #83868D",
-    "{  c #86888C",
-    "}  c #8B8B8B",
-    "|  c #8A8C91",
-    " . c #8E9197",
-    ".. c #939393",
-    "X. c #9B9B9B",
-    "o. c #9D9EA0",
-    "O. c #9FA1A6",
-    "+. c #AB9B82",
-    "@. c #AAA297",
-    "#. c #B6A588",
-    "$. c #BBAC94",
-    "%. c #A3A3A3",
-    "&. c #ABABAB",
-    "*. c #B2B2B2",
-    "=. c #BABABA",
-    "-. c #BCBEC0",
-    ";. c #BFC1C4",
-    ":. c #CBBCA4",
-    ">. c #C6C6A3",
-    ",. c #D9C8AE",
-    "<. c #D8D9BA",
-    "1. c #EBDB9F",
-    "2. c #F9D78E",
-    "3. c #F3D598",
-    "4. c #FDD790",
-    "5. c #FBDE9E",
-    "6. c #EDDEBE",
-    "7. c #FFEAAB",
-    "8. c #F7EAB4",
-    "9. c #FEE6B1",
-    "0. c #FFEBB2",
-    "q. c #FFF1B2",
-    "w. c #C3C3C3",
-    "e. c #C5C5C9",
-    "r. c #CCCCCC",
-    "t. c #CDCFD3",
-    "y. c #D0D0C0",
-    "u. c #D4D4D3",
-    "i. c #D2D2D8",
-    "p. c #DBDBDB",
-    "a. c #EEDFD0",
-    "s. c #EDE7DD",
-    "d. c #FCFBD4",
-    "f. c #FEF8D9",
-    "g. c #E3E3E3",
-    "h. c #E7E9ED",
-    "j. c #EAEAEA",
-    "k. c #E8EBF3",
-    "l. c #F2F2F2",
-    "z. c #F0F1F8",
-    "x. c #FDFDFD",
-    "c. c None",
-    /* pixels */
-    "c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.",
-    "c.c.c.c.c.c.c.c.c.c.c.c.    X o + o     c.c.c.c.c.c.c.c.c.c.c.c.",
-    "c.c.c.c.c.c.c.c.c.c.  $ q X.=.r.w.w.&.t *   c.c.c.c.c.c.c.c.c.c.",
-    "c.c.c.c.c.c.c.c.c.X q w.p.r.=.=.=.w.=.w.=.t +   c.c.c.c.c.c.c.c.",
-    "c.c.c.c.c.c.c.  X t j.x.x.x.u.%.%.X.%.&.&.&...%   c.c.c.c.c.c.c.",
-    "c.c.c.c.c.c.c.  7 p.x.x.x.x.x.w.} =.g.x.l.u.%.e X   c.c.c.c.c.c.",
-    "c.c.c.c.c.c.  o } x.x.x.x.l.=.%.*.x.x.x.x.l.r. *   c.c.c.c.c.c.",
-    "c.c.c.c.c.    & X.x.x.x.l.r.e & } ..x.x.j.p.u.} ;     c.c.c.c.c.",
-    "c.c.c.c.c.    % t x.x.l.g.r.9 6 y } x.j.p.r.w.t *     c.c.c.c.c.",
-    "c.c.c.c.      o 4 p.x.g.p.y.>.b n f.s.p.t.e.%.5 +       c.c.c.c.",
-    "c.c.c.c.        + q p.p.e.' ( ( U L A r.*. 4 %         c.c.c.c.",
-    "c.c.c.c.            ; r.i.<.) / I C s.h.%.&   X         c.c.c.c.",
-    "c.c.c.c.          X %.x.x.x.d.^ P a.h.g.s.*.&             c.c.c.",
-    "c.c.            X *.x.x.x.x.x.8.1.k.s.p.u.p.*.%   X       c.c.c.",
-    "c.    X X X X    x.x.x.x.x.x.k.h.g.i.u.r.w.e...o X   X X     c.",
-    "    o o o o X 4 l.x.x.x.x.x.j.j.g.p.u.r.w.=.=.=.8     X o X     ",
-    "  X X o o + X X.x.x.x.x.x.l.j.g.p.u.r.e.w.=.*.*...o X X         ",
-    "          + * h.x.x.x.l.l.j.g.p.t.r.e.w.=.*.&.%.%.5 +           ",
-    "c.c.c.c.  o e x.x.x.x.l.j.s.p.u.r.w.-.=.*.&.%.%.@.e %   c.c.c.c.",
-    "c.c.c.c.  o &.x.x.x.l.h.g.p.u.r.y.=.=.*.&.%.%.X... %   c.c.c.c.",
-    "c.c.c.c.  X r.x.x.l.j.s.a.i.t.e.;.=.*.&.&.O.....} } +   c.c.c.c.",
-    "c.c.c.c.c.X s.x.l.j.g.p.u.r.e.;.*.*.&.%.O.X.....} } +   c.c.c.c.",
-    "c.c.c.c.c.X p.x.h.g.p.i.r.e.-.=.*.&.&.@.......} } 8   c.c.c.c.c.",
-    "c.c.c.c.c.c.6 h.s.p.u.r.e.-.=.*.&.%.o.X.....  t o   c.c.c.c.c.",
-    "c.c.c.c.c.c.c.9 t.r.;.;.-.=.*.&.%.o.X...{  r w O   c.c.c.c.c.c.",
-    "c.c.c.c.c.c.u 2 #.,.:.$.@.o.O.X.X.|  f c v $.v 0 p : c.c.c.c.c.",
-    "c.c.c.c.1 V 4.0.0.0.9.9.3.Z x | } t s S 5.7.7.q.q.7.2.l @ c.c.c.",
-    "c.c.c.  m E ` _ _ _ W _ ` T N }  .d B R E E E E E E W Y a   c.c.",
-    "c.c.c.  i U U U ~ U ~ U U U a - = $ j U ~ ~ ~ ~ ~ ~ U K ,   c.c.",
-    "c.c.c.c.  > k D J Q J F k <       c.  > g M G H D z 3 #   c.c.c.",
-    "c.c.c.c.c.c.    . . . .     c.c.c.c.c.c.    . .         c.c.c.c.",
-    "c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c."
-  };
+const char *AlcPix::m_alc_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 142 2",
+	"   c #000000",
+	".  c #0C0B00",
+	"X  c #0B0B0B",
+	"o  c #131313",
+	"O  c #121318",
+	"+  c #1A1A1A",
+	"@  c #2D1A00",
+	"#  c #292100",
+	"$  c #29251E",
+	"%  c #222222",
+	"&  c #292929",
+	"*  c #323232",
+	"=  c #36383B",
+	"-  c #393836",
+	";  c #3E3E3E",
+	":  c #5F3F06",
+	">  c #534400",
+	",  c #594400",
+	"<  c #584A00",
+	"1  c #6F4700",
+	"2  c #604418",
+	"3  c #7F6F00",
+	"4  c gray26",
+	"5  c #4A4A4A",
+	"6  c #4D4D58",
+	"7  c #505052",
+	"8  c #5A5A5A",
+	"9  c #5B5C63",
+	"0  c #786448",
+	"q  c #646464",
+	"w  c #696B6F",
+	"e  c #747474",
+	"r  c #77797D",
+	"t  c #7C7C7C",
+	"y  c #7C7D82",
+	"u  c #995B0A",
+	"i  c #9A7700",
+	"p  c #8D682E",
+	"a  c #AA7900",
+	"s  c #9B7F4C",
+	"d  c #867C6A",
+	"f  c #817D7A",
+	"g  c #9A8B00",
+	"h  c #A38002",
+	"j  c #AC8800",
+	"k  c #A59200",
+	"l  c #BE8D2D",
+	"z  c #B5A200",
+	"x  c #97876C",
+	"c  c #958873",
+	"v  c #9F9079",
+	"b  c #B3B272",
+	"n  c #BFB97D",
+	"m  c #D59700",
+	"M  c #C5B500",
+	"N  c #E4AA14",
+	"B  c #FBB904",
+	"V  c #E9AB38",
+	"C  c #FCBC20",
+	"Z  c #D1AB66",
+	"A  c #F0B355",
+	"S  c #E0B96A",
+	"D  c #D6C500",
+	"F  c #D9C300",
+	"G  c #DED100",
+	"H  c #E4D700",
+	"J  c #EDDE00",
+	"K  c #F1C500",
+	"L  c #FFC604",
+	"P  c #FCC90B",
+	"I  c #FFD600",
+	"U  c #FFDB00",
+	"Y  c #FFD81D",
+	"T  c #FFCF2A",
+	"R  c #FFD32C",
+	"E  c #FFD433",
+	"W  c #FFD23A",
+	"Q  c #F0E500",
+	"!  c #FEE300",
+	"~  c #FFE800",
+	"^  c #FDE114",
+	"/  c #FFF000",
+	"(  c #FEFB01",
+	")  c #FDFC28",
+	"_  c #FFD541",
+	"`  c #FFD64A",
+	"'  c #E0E046",
+	"  c #858585",
+	"  c #83868D",
+	"{  c #86888C",
+	"}  c #8B8B8B",
+	"|  c #8A8C91",
+	" . c #8E9197",
+	".. c #939393",
+	"X. c #9B9B9B",
+	"o. c #9D9EA0",
+	"O. c #9FA1A6",
+	"+. c #AB9B82",
+	"@. c #AAA297",
+	"#. c #B6A588",
+	"$. c #BBAC94",
+	"%. c #A3A3A3",
+	"&. c #ABABAB",
+	"*. c #B2B2B2",
+	"=. c #BABABA",
+	"-. c #BCBEC0",
+	";. c #BFC1C4",
+	":. c #CBBCA4",
+	">. c #C6C6A3",
+	",. c #D9C8AE",
+	"<. c #D8D9BA",
+	"1. c #EBDB9F",
+	"2. c #F9D78E",
+	"3. c #F3D598",
+	"4. c #FDD790",
+	"5. c #FBDE9E",
+	"6. c #EDDEBE",
+	"7. c #FFEAAB",
+	"8. c #F7EAB4",
+	"9. c #FEE6B1",
+	"0. c #FFEBB2",
+	"q. c #FFF1B2",
+	"w. c #C3C3C3",
+	"e. c #C5C5C9",
+	"r. c #CCCCCC",
+	"t. c #CDCFD3",
+	"y. c #D0D0C0",
+	"u. c #D4D4D3",
+	"i. c #D2D2D8",
+	"p. c #DBDBDB",
+	"a. c #EEDFD0",
+	"s. c #EDE7DD",
+	"d. c #FCFBD4",
+	"f. c #FEF8D9",
+	"g. c #E3E3E3",
+	"h. c #E7E9ED",
+	"j. c #EAEAEA",
+	"k. c #E8EBF3",
+	"l. c #F2F2F2",
+	"z. c #F0F1F8",
+	"x. c #FDFDFD",
+	"c. c None",
+	/* pixels */
+	"c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.",
+	"c.c.c.c.c.c.c.c.c.c.c.c.    X o + o     c.c.c.c.c.c.c.c.c.c.c.c.",
+	"c.c.c.c.c.c.c.c.c.c.  $ q X.=.r.w.w.&.t *   c.c.c.c.c.c.c.c.c.c.",
+	"c.c.c.c.c.c.c.c.c.X q w.p.r.=.=.=.w.=.w.=.t +   c.c.c.c.c.c.c.c.",
+	"c.c.c.c.c.c.c.  X t j.x.x.x.u.%.%.X.%.&.&.&...%   c.c.c.c.c.c.c.",
+	"c.c.c.c.c.c.c.  7 p.x.x.x.x.x.w.} =.g.x.l.u.%.e X   c.c.c.c.c.c.",
+	"c.c.c.c.c.c.  o } x.x.x.x.l.=.%.*.x.x.x.x.l.r. *   c.c.c.c.c.c.",
+	"c.c.c.c.c.    & X.x.x.x.l.r.e & } ..x.x.j.p.u.} ;     c.c.c.c.c.",
+	"c.c.c.c.c.    % t x.x.l.g.r.9 6 y } x.j.p.r.w.t *     c.c.c.c.c.",
+	"c.c.c.c.      o 4 p.x.g.p.y.>.b n f.s.p.t.e.%.5 +       c.c.c.c.",
+	"c.c.c.c.        + q p.p.e.' ( ( U L A r.*. 4 %         c.c.c.c.",
+	"c.c.c.c.            ; r.i.<.) / I C s.h.%.&   X         c.c.c.c.",
+	"c.c.c.c.          X %.x.x.x.d.^ P a.h.g.s.*.&             c.c.c.",
+	"c.c.            X *.x.x.x.x.x.8.1.k.s.p.u.p.*.%   X       c.c.c.",
+	"c.    X X X X    x.x.x.x.x.x.k.h.g.i.u.r.w.e...o X   X X     c.",
+	"    o o o o X 4 l.x.x.x.x.x.j.j.g.p.u.r.w.=.=.=.8     X o X     ",
+	"  X X o o + X X.x.x.x.x.x.l.j.g.p.u.r.e.w.=.*.*...o X X         ",
+	"          + * h.x.x.x.l.l.j.g.p.t.r.e.w.=.*.&.%.%.5 +           ",
+	"c.c.c.c.  o e x.x.x.x.l.j.s.p.u.r.w.-.=.*.&.%.%.@.e %   c.c.c.c.",
+	"c.c.c.c.  o &.x.x.x.l.h.g.p.u.r.y.=.=.*.&.%.%.X... %   c.c.c.c.",
+	"c.c.c.c.  X r.x.x.l.j.s.a.i.t.e.;.=.*.&.&.O.....} } +   c.c.c.c.",
+	"c.c.c.c.c.X s.x.l.j.g.p.u.r.e.;.*.*.&.%.O.X.....} } +   c.c.c.c.",
+	"c.c.c.c.c.X p.x.h.g.p.i.r.e.-.=.*.&.&.@.......} } 8   c.c.c.c.c.",
+	"c.c.c.c.c.c.6 h.s.p.u.r.e.-.=.*.&.%.o.X.....  t o   c.c.c.c.c.",
+	"c.c.c.c.c.c.c.9 t.r.;.;.-.=.*.&.%.o.X...{  r w O   c.c.c.c.c.c.",
+	"c.c.c.c.c.c.u 2 #.,.:.$.@.o.O.X.X.|  f c v $.v 0 p : c.c.c.c.c.",
+	"c.c.c.c.1 V 4.0.0.0.9.9.3.Z x | } t s S 5.7.7.q.q.7.2.l @ c.c.c.",
+	"c.c.c.  m E ` _ _ _ W _ ` T N }  .d B R E E E E E E W Y a   c.c.",
+	"c.c.c.  i U U U ~ U ~ U U U a - = $ j U ~ ~ ~ ~ ~ ~ U K ,   c.c.",
+	"c.c.c.c.  > k D J Q J F k <       c.  > g M G H D z 3 #   c.c.c.",
+	"c.c.c.c.c.c.    . . . .     c.c.c.c.c.c.    . .         c.c.c.c.",
+	"c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c."
+};
 #endif /* !__WINDOWS__ */
 
-const char *
-AlcPix::m_copy_xpm=
-  { /* XPM */
-    /* columns rows colors chars-per-pixel */
-    "32 32 71 1",
-    "  c black",
-    ". c #9A99A3",
-    "X c #A1A2B5",
-    "o c #ACACB0",
-    "O c #AEAEB1",
-    "+ c #AFAFB2",
-    "@ c #ACADBE",
-    "# c #ADAFBE",
-    "$ c #B1B0B3",
-    "% c #B2B1B3",
-    "& c #B3B2B4",
-    "* c #B3B3B6",
-    "= c #B4B4B6",
-    "- c #B6B6B7",
-    "; c #B7B7B7",
-    ": c #B2B3C3",
-    "> c #C0BEC3",
-    ", c #C4C3D1",
-    "< c #DBDADF",
-    "1 c #D3D3E3",
-    "2 c #D4D3E3",
-    "3 c #D6D6E4",
-    "4 c #D8D7E6",
-    "5 c #D9D8E7",
-    "6 c #DCDBE0",
-    "7 c #DCDCE1",
-    "8 c #DEDEE2",
-    "9 c #DCDAE8",
-    "0 c #DDDCE9",
-    "q c #DEDDE9",
-    "w c #DFDEEA",
-    "e c #E0DFE4",
-    "r c #E1DFEC",
-    "t c #E1E0E5",
-    "y c #E2E1E5",
-    "u c #E2E1E7",
-    "i c #E4E2E5",
-    "p c #E5E4E6",
-    "a c #E2E1ED",
-    "s c #E3E2ED",
-    "d c #E4E2E8",
-    "f c #E4E3EE",
-    "g c #E5E5E8",
-    "h c #E6E4EF",
-    "j c #E7E6EF",
-    "k c #E8E6E9",
-    "l c #EAEAEA",
-    "z c #E8E7F1",
-    "x c #E9E8F2",
-    "c c #EAE9F3",
-    "v c #ECEAF3",
-    "b c #EEEDF3",
-    "n c #EDECF4",
-    "m c #EEEDF6",
-    "M c #EFEEF6",
-    "N c #F1EFF7",
-    "B c #F2F1F7",
-    "V c #F3F2F8",
-    "C c #F4F3F9",
-    "Z c #F6F4FA",
-    "A c #F6F6FA",
-    "S c #F7F6FA",
-    "D c #F8F7FC",
-    "F c #F9F8FD",
-    "G c #FAF9FD",
-    "H c #FCFAFE",
-    "J c #FDFCFF",
-    "K c #FEFDFF",
-    "L c #FEFEFF",
-    "P c gray100",
-    "I c None",
-    /* pixels */
-    "IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII",
-    "I555555555555XIIIIIIIIIIIIIIIIII",
-    "I5PPPPPPPPPP5bXIIIIIIIIIIIIIIIII",
-    "I5PPPPPGZBmM5b@XIIIIIIIIIIIIIIII",
-    "I4PPPPPDZZBM4c0#XIIIIIIIIIIIIIII",
-    "I4PPPPPHHZBM5Pms:XIIIIIIIIIIIIII",
-    "I4PPPPPHHZZMXXXXXX IIIIIIIIIIIII",
-    "I4PPPPPPHDVMMc021X IIIIIIIIIIIII",
-    "I4PPPPPHGDZVba423X.,55555XIIIIII",
-    "I4PPPPPPPDZmh0044X-lPPPP5mXIIIII",
-    "I5PPPPPHGZmzsrr0aX*iZBmm5v#XIIII",
-    "I5PPPPHDGVvjssarhX*iSZBM5b4#XIII",
-    "I5PPPPPDBmzzjjjshX*iGZBM5PMs:XII",
-    "I5PPPPDVmmmcczjjjX-iHSZMXXXXXX I",
-    "I5PPPGVVBmmbczzjcX*pHZVmmz011X I",
-    "I5PPHZVZBmMbMczjcX=pHGZBma423X I",
-    "I4PPGAZVNNMMbczzmX*iPGZmh0055X I",
-    "I4PPGZZZVVMMmcmzmX-pGZmzaa00aX I",
-    "I4PPDAZVVNMMbczzbX%yGBbjhssasX I",
-    "I4PPAZZVNNMMbczzcX*eBmzzhhhshX I",
-    "I4PPZZZVCMMcmzzhbX%<MMmzvzjjzX I",
-    "I4PPPPPHPHHSDVZBAXO<BMmbvzjjcX I",
-    "IXXXXXXXXXXXXXXXXXoeBmmbmzzjcX I",
-    "II           .--%O:pBBmmmvcjcX I",
-    "IIIIIIIIIIIII,lgi8pbVBBMmccjbX I",
-    "IIIIIIIIIIIII5PPDZZVVBMMbccccX I",
-    "IIIIIIIIIIIII5PPZZVZBMmmMccjmX I",
-    "IIIIIIIIIIIII5PPAZZZNNmmcccjcX I",
-    "IIIIIIIIIIIII5PPPPJJHGGDZZVBZX I",
-    "IIIIIIIIIIIIIXXXXXXXXXXXXXXXXX I",
-    "IIIIIIIIIIIIII                 I",
-    "IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII"
-  };
+const char *AlcPix::m_copy_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 71 1",
+	"  c black",
+	". c #9A99A3",
+	"X c #A1A2B5",
+	"o c #ACACB0",
+	"O c #AEAEB1",
+	"+ c #AFAFB2",
+	"@ c #ACADBE",
+	"# c #ADAFBE",
+	"$ c #B1B0B3",
+	"% c #B2B1B3",
+	"& c #B3B2B4",
+	"* c #B3B3B6",
+	"= c #B4B4B6",
+	"- c #B6B6B7",
+	"; c #B7B7B7",
+	": c #B2B3C3",
+	"> c #C0BEC3",
+	", c #C4C3D1",
+	"< c #DBDADF",
+	"1 c #D3D3E3",
+	"2 c #D4D3E3",
+	"3 c #D6D6E4",
+	"4 c #D8D7E6",
+	"5 c #D9D8E7",
+	"6 c #DCDBE0",
+	"7 c #DCDCE1",
+	"8 c #DEDEE2",
+	"9 c #DCDAE8",
+	"0 c #DDDCE9",
+	"q c #DEDDE9",
+	"w c #DFDEEA",
+	"e c #E0DFE4",
+	"r c #E1DFEC",
+	"t c #E1E0E5",
+	"y c #E2E1E5",
+	"u c #E2E1E7",
+	"i c #E4E2E5",
+	"p c #E5E4E6",
+	"a c #E2E1ED",
+	"s c #E3E2ED",
+	"d c #E4E2E8",
+	"f c #E4E3EE",
+	"g c #E5E5E8",
+	"h c #E6E4EF",
+	"j c #E7E6EF",
+	"k c #E8E6E9",
+	"l c #EAEAEA",
+	"z c #E8E7F1",
+	"x c #E9E8F2",
+	"c c #EAE9F3",
+	"v c #ECEAF3",
+	"b c #EEEDF3",
+	"n c #EDECF4",
+	"m c #EEEDF6",
+	"M c #EFEEF6",
+	"N c #F1EFF7",
+	"B c #F2F1F7",
+	"V c #F3F2F8",
+	"C c #F4F3F9",
+	"Z c #F6F4FA",
+	"A c #F6F6FA",
+	"S c #F7F6FA",
+	"D c #F8F7FC",
+	"F c #F9F8FD",
+	"G c #FAF9FD",
+	"H c #FCFAFE",
+	"J c #FDFCFF",
+	"K c #FEFDFF",
+	"L c #FEFEFF",
+	"P c gray100",
+	"I c None",
+	/* pixels */
+	"IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII",
+	"I555555555555XIIIIIIIIIIIIIIIIII",
+	"I5PPPPPPPPPP5bXIIIIIIIIIIIIIIIII",
+	"I5PPPPPGZBmM5b@XIIIIIIIIIIIIIIII",
+	"I4PPPPPDZZBM4c0#XIIIIIIIIIIIIIII",
+	"I4PPPPPHHZBM5Pms:XIIIIIIIIIIIIII",
+	"I4PPPPPHHZZMXXXXXX IIIIIIIIIIIII",
+	"I4PPPPPPHDVMMc021X IIIIIIIIIIIII",
+	"I4PPPPPHGDZVba423X.,55555XIIIIII",
+	"I4PPPPPPPDZmh0044X-lPPPP5mXIIIII",
+	"I5PPPPPHGZmzsrr0aX*iZBmm5v#XIIII",
+	"I5PPPPHDGVvjssarhX*iSZBM5b4#XIII",
+	"I5PPPPPDBmzzjjjshX*iGZBM5PMs:XII",
+	"I5PPPPDVmmmcczjjjX-iHSZMXXXXXX I",
+	"I5PPPGVVBmmbczzjcX*pHZVmmz011X I",
+	"I5PPHZVZBmMbMczjcX=pHGZBma423X I",
+	"I4PPGAZVNNMMbczzmX*iPGZmh0055X I",
+	"I4PPGZZZVVMMmcmzmX-pGZmzaa00aX I",
+	"I4PPDAZVVNMMbczzbX%yGBbjhssasX I",
+	"I4PPAZZVNNMMbczzcX*eBmzzhhhshX I",
+	"I4PPZZZVCMMcmzzhbX%<MMmzvzjjzX I",
+	"I4PPPPPHPHHSDVZBAXO<BMmbvzjjcX I",
+	"IXXXXXXXXXXXXXXXXXoeBmmbmzzjcX I",
+	"II           .--%O:pBBmmmvcjcX I",
+	"IIIIIIIIIIIII,lgi8pbVBBMmccjbX I",
+	"IIIIIIIIIIIII5PPDZZVVBMMbccccX I",
+	"IIIIIIIIIIIII5PPZZVZBMmmMccjmX I",
+	"IIIIIIIIIIIII5PPAZZZNNmmcccjcX I",
+	"IIIIIIIIIIIII5PPPPJJHGGDZZVBZX I",
+	"IIIIIIIIIIIIIXXXXXXXXXXXXXXXXX I",
+	"IIIIIIIIIIIIII                 I",
+	"IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII"
+};
 
-const char *
-AlcPix::m_open_xpm=
-  { /* XPM */
-    /* columns rows colors chars-per-pixel */
-    "32 32 240 2",
-    "   c black",
-    ".  c #000823",
-    "X  c #001240",
-    "o  c #00114D",
-    "O  c #001552",
-    "+  c #001C74",
-    "@  c #001B78",
-    "#  c #002375",
-    "$  c #373C5B",
-    "%  c #4D5376",
-    "&  c #001BAE",
-    "*  c #001EB2",
-    "=  c #00248E",
-    "-  c #00239B",
-    ";  c #002D9A",
-    ":  c #053596",
-    ">  c #05389B",
-    ",  c #0026A4",
-    "<  c #0023AD",
-    "1  c #0029A3",
-    "2  c #002BAA",
-    "3  c #0025B2",
-    "4  c #012AB6",
-    "5  c #032CB8",
-    "6  c #082AB1",
-    "7  c #0033A4",
-    "8  c #0034AA",
-    "9  c #083AAA",
-    "0  c #0632BE",
-    "q  c #003DB1",
-    "w  c #1038BC",
-    "e  c #002EC0",
-    "r  c #053AC7",
-    "t  c #073CC9",
-    "y  c #0936C0",
-    "u  c #083FCC",
-    "i  c #133EC2",
-    "p  c #0344A6",
-    "a  c #0D43AE",
-    "s  c #0043B7",
-    "d  c #0044B8",
-    "f  c #064DBB",
-    "g  c #0B47B6",
-    "h  c #0D4DBA",
-    "j  c #0851BE",
-    "k  c #1442AC",
-    "l  c #1349A4",
-    "z  c #1253BF",
-    "x  c #1D58BF",
-    "c  c #2C4C98",
-    "v  c #2F56B0",
-    "b  c #2A58B5",
-    "n  c #2C5BB8",
-    "m  c #305EBA",
-    "M  c #3362BE",
-    "N  c #0840CD",
-    "B  c #0745D3",
-    "V  c #0946D4",
-    "C  c #094DDB",
-    "Z  c #0752C1",
-    "A  c #0B54C1",
-    "S  c #0950DF",
-    "D  c #1A44C3",
-    "F  c #1D4CCB",
-    "G  c #134CD4",
-    "H  c #1D4FD3",
-    "J  c #1358C2",
-    "K  c #1E53D4",
-    "L  c #1F5ADC",
-    "P  c #1F65C9",
-    "I  c #1C66DF",
-    "U  c #1F62E2",
-    "Y  c #2758D4",
-    "T  c #215ADD",
-    "R  c #2361C4",
-    "E  c #2366CA",
-    "W  c #2A63C2",
-    "Q  c #2B6ACB",
-    "!  c #2B65DF",
-    "~  c #316FCD",
-    "^  c #3867C2",
-    "/  c #3B6CC5",
-    "(  c #3C6FC8",
-    ")  c #3472CE",
-    "_  c #3C73CC",
-    "`  c #3E79D1",
-    "'  c #2262E3",
-    "  c #2865E0",
-    "  c #2B6CE9",
-    "{  c #316DE3",
-    "}  c #306FEA",
-    "|  c #386FE0",
-    " . c #3877EC",
-    ".. c #3C7AEA",
-    "X. c #4D5B98",
-    "o. c #596190",
-    "O. c #5C6BAE",
-    "+. c #536FB8",
-    "@. c #606AA4",
-    "#. c #6D77AC",
-    "$. c #757EB3",
-    "%. c #4074CB",
-    "&. c #4379CE",
-    "*. c #447CD1",
-    "=. c #4A7FD4",
-    "-. c #427DED",
-    ";. c #3D80D8",
-    ":. c #7C85B3",
-    ">. c #7F85B8",
-    ",. c #7A8ABE",
-    "<. c #4780D3",
-    "1. c #4A80D3",
-    "2. c #5282D5",
-    "3. c #5389D6",
-    "4. c #518DDB",
-    "5. c #5D8EDC",
-    "6. c #5892DD",
-    "7. c #4582F0",
-    "8. c #4C87F1",
-    "9. c #4D96FA",
-    "0. c #568FE7",
-    "q. c #588DED",
-    "w. c #518DF2",
-    "e. c #5D98E0",
-    "r. c #5F9CEF",
-    "t. c #5590F3",
-    "y. c #509EFF",
-    "u. c #5C96F3",
-    "i. c #55A1FF",
-    "p. c #5BA5FF",
-    "a. c #6391DB",
-    "s. c #7193D4",
-    "d. c #769EDD",
-    "f. c #7899D8",
-    "g. c #639CF5",
-    "h. c #689CF2",
-    "j. c #64AAFF",
-    "k. c #6CA3F6",
-    "l. c #6BAEFF",
-    "z. c #73ACE9",
-    "x. c #70A6F7",
-    "c. c #76A8F5",
-    "v. c #74ABF9",
-    "b. c #7AAAF0",
-    "n. c #7AAFFA",
-    "m. c #7CB4F3",
-    "M. c #79B9FF",
-    "N. c #868BB7",
-    "B. c #848CBA",
-    "V. c #9198AA",
-    "C. c #9FA2AC",
-    "Z. c #A2A4AE",
-    "A. c #A4A8B0",
-    "S. c #ABADB6",
-    "D. c #B3B5BE",
-    "F. c #838CC0",
-    "G. c #8C94C0",
-    "H. c #919BC3",
-    "J. c #979FC9",
-    "K. c #989FC7",
-    "L. c #99A0C4",
-    "P. c #9CA2C8",
-    "I. c #9CAFD4",
-    "U. c #9FB2D6",
-    "Y. c #84AEE2",
-    "T. c #85B7F3",
-    "R. c #81B5FA",
-    "E. c #82B8F3",
-    "W. c #86BCFE",
-    "Q. c #89BDFC",
-    "!. c #A2A9CD",
-    "~. c #A8ADCD",
-    "^. c #ACB3D4",
-    "/. c #B5B5CA",
-    "(. c #BABDC4",
-    "). c #BBBBCD",
-    "_. c #BEBED1",
-    "`. c #B9BEDD",
-    "'. c #86C2FF",
-    ". c #8DC2FF",
-    ". c #92C3FD",
-    "{. c #96CBFF",
-    "}. c #99C7F2",
-    "|. c #9CCCFE",
-    " X c #A0C0EC",
-    ".X c #A3C5F2",
-    "XX c #ABCAF3",
-    "oX c #A4D3FD",
-    "OX c #A4DBFF",
-    "+X c #AAD6FB",
-    "@X c #AEDBFF",
-    "#X c #BCCBEB",
-    "$X c #B4CEF2",
-    "%X c #B3D2F3",
-    "&X c #B5D9FF",
-    "*X c #BAD6F5",
-    "=X c #BFDAF3",
-    "-X c #BADDFF",
-    ";X c #ADE1FF",
-    ":X c #B5E4FF",
-    ">X c #BAE4FE",
-    ",X c #BCE9FF",
-    "<X c #C2C4CB",
-    "1X c #C3C3D4",
-    "2X c #C1C6DE",
-    "3X c #CBCCD3",
-    "4X c #CBCBDA",
-    "5X c #D1D2DD",
-    "6X c #CACEE4",
-    "7X c #C6D5EA",
-    "8X c #C5D9F6",
-    "9X c #D5D5E1",
-    "0X c #D2D5E9",
-    "qX c #DADAE5",
-    "wX c #DEDEEA",
-    "eX c #D8DFF1",
-    "rX c #C6E3F9",
-    "tX c #C2EBFF",
-    "yX c #C8EDFF",
-    "uX c #C7F1FF",
-    "iX c #CDF3FF",
-    "pX c #D7E5FA",
-    "aX c #DEE1F2",
-    "sX c #D3F3FF",
-    "dX c #D8F5FF",
-    "fX c #DCFAFF",
-    "gX c #E2E3EC",
-    "hX c #EAEBEF",
-    "jX c #E5E5F3",
-    "kX c #EAEAF4",
-    "lX c #EDEDF9",
-    "zX c #E1F4FF",
-    "xX c #E4FCFF",
-    "cX c #E8F1FB",
-    "vX c #EBFDFF",
-    "bX c #F1F1F5",
-    "nX c #F3F3FB",
-    "mX c #F3FFFF",
-    "MX c #FEFEFE",
-    "NX c None",
-    /* pixels */
-    "NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNX",
-    "NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNX",
-    "NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNX:.N.$.    NXNXNXNXNXNXNXNX",
-    "NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXB.B.0XB.%     NXNXNXNXNXNXNX",
-    "NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXB.B.!.lXnX0X#.    NXNXNXNXNXNXNX",
-    "NXNXNXNXNXNXNXNXNXNXNXNXNXNXB.B.G.wXMXlXlXMXJ.o.    NXNXNXNXNXNX",
-    "NXA j j f f f f f f p     B.B.^.MXnXcXlXkXlXcX$.$     NXNXNXNXNX",
-    "NX1.MXvXvXfXdXsXyXT.J l N.P.eXMXcXnXnXlXkXkXnX`.@.    NXNXNXNXNX",
-    "NX<.vXsXuXuXuX,X,X:Xz.>.2XMXMXMXnXnXcXlXkXjXjXMXF.c #     NXNXNX",
-    "NX<.vXiXiXuX,X,X:XU.P.kXMXMXMXnXnXnXnXlXkXkXjXlXaXO.:     NXNXNX",
-    "NX*.vXiXiXuX,X%XH.6XMXMXMXMXMXMXnXnXlXlXkXkXjXjXMX^.X.    NXNXNX",
-    "NX*.vXiXiXtXU.!.nXMXMXMXMXMXnXnXnXnXlXlXkX#Xs.s.s.f.v > 7 8 7 7 ",
-    "NX*.xXiXiX>XL.MXMXMXMXMXMXMXnXMXnXnXnXnX#Xh _ a.5.5.6.1.1.2.g ; ",
-    "NX*.xXiXiXuXU.6XMXMXMXMXMXMXMXMXnXnXnXaXW =.&XQ.W.Q..n.r.0.q # ",
-    "NX` fXiXiXuX6.m <.<.*.*.&.&.&._ _ _ ( F <.-Xj.y.i.y.y.i.U 3 8   ",
-    "NX_ dXiXiX@XZ XX#X8X8X=X*X%X$XXXXXXX XXX-Xl.i.y.y.y.p.{ 5 2 ;   ",
-    "NX` dXiXiXz.) mXaXcXmXxXdXiX>X&XoX{.W.M.l.p.y.y.9...i 3 * 2 #   ",
-    "NX_ sXiXiXE  XmXdX7XvXfXsXtX@X.M.h.t.7. .{ ! Y i 5 3 & & 2 X   ",
-    "NX) sXiXoXZ vXvXxXrX=XsX@XQ.R.x.g.w...} ' T H y 0 e * & < ;     ",
-    "NX~ iXiX6.3.MXxXdX,X}.|.{.Q.n.k.u.8... ' G r u t e * & 2 =     ",
-    "NX) uXiXE  XmXdX,XOX{.T.Q.W.c.g.t.7. .U V B V u t e * & 2 O     ",
-    "NXQ tX+XJ cXsX>X;XOX{.E.E.R.v.g.w.7.U C S C V u t e * < 1       ",
-    "NXQ tX4.a.sXyXtX>X@XoX{.b.R.c.h.q.|  U L K F D D w 6 < =       ",
-    "NXQ ,XJ $XMXMXMXMXMXnXnXlXhXhXgXwXqX9X9X4X4X1X_.)././.9 +     NX",
-    "NXQ m.z MXMXMXMXMXMXMXnXbXkXhXgXwXqX9X9X4X4X4X1X_.).H., .     NX",
-    "NXE ;.d.MXMXMXMXMXMXMXnXbXkXhXhXgXwXqX9X4X4X4X1X_.).+.-       NX",
-    "NXE j pXMXMXMXMXMXMXMXnXnXbXbXhXgXwXqX9X9X4X4X1X1X).k @     NXNX",
-    "NXs R MXMXMXMXMXMXMXMXMXbXhXgX5X5X3X<X(.(.S.A.Z.Z.V., o     NXNX",
-    "NXd z &.&._ _ _ _ ( ( / ^ M M m n b a 2 2 1 1 , , , -       NXNX",
-    "NX                                                          NXNX",
-    "NX                                                        NXNXNX",
-    "NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNX"
-  };
+const char *AlcPix::m_open_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 240 2",
+	"   c black",
+	".  c #000823",
+	"X  c #001240",
+	"o  c #00114D",
+	"O  c #001552",
+	"+  c #001C74",
+	"@  c #001B78",
+	"#  c #002375",
+	"$  c #373C5B",
+	"%  c #4D5376",
+	"&  c #001BAE",
+	"*  c #001EB2",
+	"=  c #00248E",
+	"-  c #00239B",
+	";  c #002D9A",
+	":  c #053596",
+	">  c #05389B",
+	",  c #0026A4",
+	"<  c #0023AD",
+	"1  c #0029A3",
+	"2  c #002BAA",
+	"3  c #0025B2",
+	"4  c #012AB6",
+	"5  c #032CB8",
+	"6  c #082AB1",
+	"7  c #0033A4",
+	"8  c #0034AA",
+	"9  c #083AAA",
+	"0  c #0632BE",
+	"q  c #003DB1",
+	"w  c #1038BC",
+	"e  c #002EC0",
+	"r  c #053AC7",
+	"t  c #073CC9",
+	"y  c #0936C0",
+	"u  c #083FCC",
+	"i  c #133EC2",
+	"p  c #0344A6",
+	"a  c #0D43AE",
+	"s  c #0043B7",
+	"d  c #0044B8",
+	"f  c #064DBB",
+	"g  c #0B47B6",
+	"h  c #0D4DBA",
+	"j  c #0851BE",
+	"k  c #1442AC",
+	"l  c #1349A4",
+	"z  c #1253BF",
+	"x  c #1D58BF",
+	"c  c #2C4C98",
+	"v  c #2F56B0",
+	"b  c #2A58B5",
+	"n  c #2C5BB8",
+	"m  c #305EBA",
+	"M  c #3362BE",
+	"N  c #0840CD",
+	"B  c #0745D3",
+	"V  c #0946D4",
+	"C  c #094DDB",
+	"Z  c #0752C1",
+	"A  c #0B54C1",
+	"S  c #0950DF",
+	"D  c #1A44C3",
+	"F  c #1D4CCB",
+	"G  c #134CD4",
+	"H  c #1D4FD3",
+	"J  c #1358C2",
+	"K  c #1E53D4",
+	"L  c #1F5ADC",
+	"P  c #1F65C9",
+	"I  c #1C66DF",
+	"U  c #1F62E2",
+	"Y  c #2758D4",
+	"T  c #215ADD",
+	"R  c #2361C4",
+	"E  c #2366CA",
+	"W  c #2A63C2",
+	"Q  c #2B6ACB",
+	"!  c #2B65DF",
+	"~  c #316FCD",
+	"^  c #3867C2",
+	"/  c #3B6CC5",
+	"(  c #3C6FC8",
+	")  c #3472CE",
+	"_  c #3C73CC",
+	"`  c #3E79D1",
+	"'  c #2262E3",
+	"  c #2865E0",
+	"  c #2B6CE9",
+	"{  c #316DE3",
+	"}  c #306FEA",
+	"|  c #386FE0",
+	" . c #3877EC",
+	".. c #3C7AEA",
+	"X. c #4D5B98",
+	"o. c #596190",
+	"O. c #5C6BAE",
+	"+. c #536FB8",
+	"@. c #606AA4",
+	"#. c #6D77AC",
+	"$. c #757EB3",
+	"%. c #4074CB",
+	"&. c #4379CE",
+	"*. c #447CD1",
+	"=. c #4A7FD4",
+	"-. c #427DED",
+	";. c #3D80D8",
+	":. c #7C85B3",
+	">. c #7F85B8",
+	",. c #7A8ABE",
+	"<. c #4780D3",
+	"1. c #4A80D3",
+	"2. c #5282D5",
+	"3. c #5389D6",
+	"4. c #518DDB",
+	"5. c #5D8EDC",
+	"6. c #5892DD",
+	"7. c #4582F0",
+	"8. c #4C87F1",
+	"9. c #4D96FA",
+	"0. c #568FE7",
+	"q. c #588DED",
+	"w. c #518DF2",
+	"e. c #5D98E0",
+	"r. c #5F9CEF",
+	"t. c #5590F3",
+	"y. c #509EFF",
+	"u. c #5C96F3",
+	"i. c #55A1FF",
+	"p. c #5BA5FF",
+	"a. c #6391DB",
+	"s. c #7193D4",
+	"d. c #769EDD",
+	"f. c #7899D8",
+	"g. c #639CF5",
+	"h. c #689CF2",
+	"j. c #64AAFF",
+	"k. c #6CA3F6",
+	"l. c #6BAEFF",
+	"z. c #73ACE9",
+	"x. c #70A6F7",
+	"c. c #76A8F5",
+	"v. c #74ABF9",
+	"b. c #7AAAF0",
+	"n. c #7AAFFA",
+	"m. c #7CB4F3",
+	"M. c #79B9FF",
+	"N. c #868BB7",
+	"B. c #848CBA",
+	"V. c #9198AA",
+	"C. c #9FA2AC",
+	"Z. c #A2A4AE",
+	"A. c #A4A8B0",
+	"S. c #ABADB6",
+	"D. c #B3B5BE",
+	"F. c #838CC0",
+	"G. c #8C94C0",
+	"H. c #919BC3",
+	"J. c #979FC9",
+	"K. c #989FC7",
+	"L. c #99A0C4",
+	"P. c #9CA2C8",
+	"I. c #9CAFD4",
+	"U. c #9FB2D6",
+	"Y. c #84AEE2",
+	"T. c #85B7F3",
+	"R. c #81B5FA",
+	"E. c #82B8F3",
+	"W. c #86BCFE",
+	"Q. c #89BDFC",
+	"!. c #A2A9CD",
+	"~. c #A8ADCD",
+	"^. c #ACB3D4",
+	"/. c #B5B5CA",
+	"(. c #BABDC4",
+	"). c #BBBBCD",
+	"_. c #BEBED1",
+	"`. c #B9BEDD",
+	"'. c #86C2FF",
+	". c #8DC2FF",
+	". c #92C3FD",
+	"{. c #96CBFF",
+	"}. c #99C7F2",
+	"|. c #9CCCFE",
+	" X c #A0C0EC",
+	".X c #A3C5F2",
+	"XX c #ABCAF3",
+	"oX c #A4D3FD",
+	"OX c #A4DBFF",
+	"+X c #AAD6FB",
+	"@X c #AEDBFF",
+	"#X c #BCCBEB",
+	"$X c #B4CEF2",
+	"%X c #B3D2F3",
+	"&X c #B5D9FF",
+	"*X c #BAD6F5",
+	"=X c #BFDAF3",
+	"-X c #BADDFF",
+	";X c #ADE1FF",
+	":X c #B5E4FF",
+	">X c #BAE4FE",
+	",X c #BCE9FF",
+	"<X c #C2C4CB",
+	"1X c #C3C3D4",
+	"2X c #C1C6DE",
+	"3X c #CBCCD3",
+	"4X c #CBCBDA",
+	"5X c #D1D2DD",
+	"6X c #CACEE4",
+	"7X c #C6D5EA",
+	"8X c #C5D9F6",
+	"9X c #D5D5E1",
+	"0X c #D2D5E9",
+	"qX c #DADAE5",
+	"wX c #DEDEEA",
+	"eX c #D8DFF1",
+	"rX c #C6E3F9",
+	"tX c #C2EBFF",
+	"yX c #C8EDFF",
+	"uX c #C7F1FF",
+	"iX c #CDF3FF",
+	"pX c #D7E5FA",
+	"aX c #DEE1F2",
+	"sX c #D3F3FF",
+	"dX c #D8F5FF",
+	"fX c #DCFAFF",
+	"gX c #E2E3EC",
+	"hX c #EAEBEF",
+	"jX c #E5E5F3",
+	"kX c #EAEAF4",
+	"lX c #EDEDF9",
+	"zX c #E1F4FF",
+	"xX c #E4FCFF",
+	"cX c #E8F1FB",
+	"vX c #EBFDFF",
+	"bX c #F1F1F5",
+	"nX c #F3F3FB",
+	"mX c #F3FFFF",
+	"MX c #FEFEFE",
+	"NX c None",
+	/* pixels */
+	"NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNX",
+	"NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNX",
+	"NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNX:.N.$.    NXNXNXNXNXNXNXNX",
+	"NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXB.B.0XB.%     NXNXNXNXNXNXNX",
+	"NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXB.B.!.lXnX0X#.    NXNXNXNXNXNXNX",
+	"NXNXNXNXNXNXNXNXNXNXNXNXNXNXB.B.G.wXMXlXlXMXJ.o.    NXNXNXNXNXNX",
+	"NXA j j f f f f f f p     B.B.^.MXnXcXlXkXlXcX$.$     NXNXNXNXNX",
+	"NX1.MXvXvXfXdXsXyXT.J l N.P.eXMXcXnXnXlXkXkXnX`.@.    NXNXNXNXNX",
+	"NX<.vXsXuXuXuX,X,X:Xz.>.2XMXMXMXnXnXcXlXkXjXjXMXF.c #     NXNXNX",
+	"NX<.vXiXiXuX,X,X:XU.P.kXMXMXMXnXnXnXnXlXkXkXjXlXaXO.:     NXNXNX",
+	"NX*.vXiXiXuX,X%XH.6XMXMXMXMXMXMXnXnXlXlXkXkXjXjXMX^.X.    NXNXNX",
+	"NX*.vXiXiXtXU.!.nXMXMXMXMXMXnXnXnXnXlXlXkX#Xs.s.s.f.v > 7 8 7 7 ",
+	"NX*.xXiXiX>XL.MXMXMXMXMXMXMXnXMXnXnXnXnX#Xh _ a.5.5.6.1.1.2.g ; ",
+	"NX*.xXiXiXuXU.6XMXMXMXMXMXMXMXMXnXnXnXaXW =.&XQ.W.Q..n.r.0.q # ",
+	"NX` fXiXiXuX6.m <.<.*.*.&.&.&._ _ _ ( F <.-Xj.y.i.y.y.i.U 3 8   ",
+	"NX_ dXiXiX@XZ XX#X8X8X=X*X%X$XXXXXXX XXX-Xl.i.y.y.y.p.{ 5 2 ;   ",
+	"NX` dXiXiXz.) mXaXcXmXxXdXiX>X&XoX{.W.M.l.p.y.y.9...i 3 * 2 #   ",
+	"NX_ sXiXiXE  XmXdX7XvXfXsXtX@X.M.h.t.7. .{ ! Y i 5 3 & & 2 X   ",
+	"NX) sXiXoXZ vXvXxXrX=XsX@XQ.R.x.g.w...} ' T H y 0 e * & < ;     ",
+	"NX~ iXiX6.3.MXxXdX,X}.|.{.Q.n.k.u.8... ' G r u t e * & 2 =     ",
+	"NX) uXiXE  XmXdX,XOX{.T.Q.W.c.g.t.7. .U V B V u t e * & 2 O     ",
+	"NXQ tX+XJ cXsX>X;XOX{.E.E.R.v.g.w.7.U C S C V u t e * < 1       ",
+	"NXQ tX4.a.sXyXtX>X@XoX{.b.R.c.h.q.|  U L K F D D w 6 < =       ",
+	"NXQ ,XJ $XMXMXMXMXMXnXnXlXhXhXgXwXqX9X9X4X4X1X_.)././.9 +     NX",
+	"NXQ m.z MXMXMXMXMXMXMXnXbXkXhXgXwXqX9X9X4X4X4X1X_.).H., .     NX",
+	"NXE ;.d.MXMXMXMXMXMXMXnXbXkXhXhXgXwXqX9X4X4X4X1X_.).+.-       NX",
+	"NXE j pXMXMXMXMXMXMXMXnXnXbXbXhXgXwXqX9X9X4X4X1X1X).k @     NXNX",
+	"NXs R MXMXMXMXMXMXMXMXMXbXhXgX5X5X3X<X(.(.S.A.Z.Z.V., o     NXNX",
+	"NXd z &.&._ _ _ _ ( ( / ^ M M m n b a 2 2 1 1 , , , -       NXNX",
+	"NX                                                          NXNX",
+	"NX                                                        NXNXNX",
+	"NXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNXNX"
+};
 
-const char *
-AlcPix::m_saveas_xpm=
-  { /* XPM */
-    /* columns rows colors chars-per-pixel */
-    "32 32 257 2",
-    "   c #000030",
-    ".  c #03033F",
-    "X  c #0C0D35",
-    "o  c #11143C",
-    "O  c #050541",
-    "+  c #0A0A45",
-    "@  c #0F0F4B",
-    "#  c #11114D",
-    "$  c #191C45",
-    "%  c #171B45",
-    "&  c #161651",
-    "*  c #1B1B54",
-    "=  c #1F224D",
-    "-  c #1C2A54",
-    ";  c #18366F",
-    ":  c #12316B",
-    ">  c #072764",
-    ",  c #202254",
-    "<  c #232359",
-    "1  c #212F58",
-    "2  c #2A2B5B",
-    "3  c #262954",
-    "4  c #23315A",
-    "5  c #2B325D",
-    "6  c #2F2F64",
-    "7  c #2B3862",
-    "8  c #203C74",
-    "9  c #323B65",
-    "0  c #3E3E70",
-    "q  c #3A426B",
-    "w  c #33416A",
-    "e  c #304B7E",
-    "r  c #3A4771",
-    "t  c #284479",
-    "y  c #42456E",
-    "u  c #444C74",
-    "i  c #444776",
-    "p  c #48567D",
-    "a  c #485178",
-    "s  c #51537D",
-    "d  c #54587E",
-    "f  c #4D5C82",
-    "g  c #595C83",
-    "h  c #555884",
-    "j  c #536186",
-    "k  c #5A648B",
-    "l  c #5B698E",
-    "z  c #5A6388",
-    "x  c #5E6C90",
-    "c  c #526893",
-    "v  c #666788",
-    "b  c #6B6D94",
-    "n  c #616E93",
-    "m  c #6C728E",
-    "M  c #637194",
-    "N  c #65759A",
-    "B  c #697699",
-    "V  c #6C799B",
-    "C  c #6D7193",
-    "Z  c #73738D",
-    "A  c #74749A",
-    "S  c #7C7C93",
-    "D  c #7A7B9E",
-    "F  c #737799",
-    "G  c #6B7EA3",
-    "H  c #7D7DA2",
-    "J  c #76809F",
-    "K  c #7484A4",
-    "L  c #7B87A7",
-    "P  c #BB4400",
-    "I  c #AE6139",
-    "U  c #9A6047",
-    "Y  c #8F786E",
-    "T  c #996C6A",
-    "R  c #9C7971",
-    "E  c #AB6749",
-    "W  c #A6745E",
-    "Q  c #B46946",
-    "!  c #A77D72",
-    "~  c #B47A61",
-    "^  c #C15414",
-    "/  c #C16C39",
-    "(  c #C1703A",
-    ")  c #D5742B",
-    "_  c #E67A1C",
-    "`  c #E67F27",
-    "'  c #C47E52",
-    "  c #C67545",
-    "  c #AB8876",
-    "{  c #B9A176",
-    "}  c #DD8032",
-    "|  c #DFA93D",
-    " . c #EC9A00",
-    ".. c #EC9100",
-    "X. c #EE8521",
-    "o. c #FF9A2C",
-    "O. c #FF9F34",
-    "+. c #F79834",
-    "@. c #FFA81F",
-    "#. c #FFBD02",
-    "$. c #FFB908",
-    "%. c #F5BD01",
-    "&. c #FFB719",
-    "*. c #FFBE18",
-    "=. c #F6BD1F",
-    "-. c #FFA321",
-    ";. c #FFA73D",
-    ":. c #FFB12C",
-    ">. c #F8BA36",
-    ",. c #D78853",
-    "<. c #DD9A6E",
-    "1. c #DDB145",
-    "2. c #E6984E",
-    "3. c #FBA444",
-    "4. c #FFB14E",
-    "5. c #FDB058",
-    "6. c #FFB75A",
-    "7. c #EAAE6E",
-    "8. c #EEB472",
-    "9. c #FFBD68",
-    "0. c #F0B86E",
-    "q. c #F7C701",
-    "w. c #FFCA04",
-    "e. c #FFC10D",
-    "r. c #FBC414",
-    "t. c #FFC51B",
-    "y. c #FFDD0F",
-    "u. c #F9D30E",
-    "i. c #FFD314",
-    "p. c #FFC723",
-    "a. c #FFC629",
-    "s. c #FFC92A",
-    "d. c #FFCC33",
-    "f. c #FFCD3A",
-    "g. c #FFD927",
-    "h. c #FDDC3A",
-    "j. c #FEE302",
-    "k. c #FFEB01",
-    "l. c #FFEC0B",
-    "z. c #FFE818",
-    "x. c #FCE117",
-    "c. c #FFED2F",
-    "v. c #FEE828",
-    "b. c #FFF03D",
-    "n. c #FCC545",
-    "m. c #FFCC5C",
-    "M. c #FDD345",
-    "N. c #FDD24D",
-    "B. c #FFD95C",
-    "V. c #FFD556",
-    "C. c #F5C262",
-    "Z. c #FFC16F",
-    "A. c #F7C56B",
-    "S. c #F7CA7F",
-    "D. c #FFC779",
-    "F. c #FFDB68",
-    "G. c #FFD766",
-    "H. c #FFDD71",
-    "J. c #FFD87B",
-    "K. c #FFE651",
-    "L. c #FFF147",
-    "P. c #FFF25F",
-    "I. c #FFF255",
-    "U. c #FFEB68",
-    "Y. c #FFE26D",
-    "T. c #FFE07B",
-    "R. c #FFF46E",
-    "E. c #FFF27B",
-    "W. c #86869B",
-    "Q. c #9A878B",
-    "!. c #8383A4",
-    "~. c #808EAC",
-    "^. c #8A8AA4",
-    "/. c #8C8CAA",
-    "(. c #8494B2",
-    "). c #8B99B6",
-    "_. c #8D97B2",
-    "`. c #9293AD",
-    "'. c #9898A9",
-    ". c #9595B2",
-    ". c #949AB4",
-    "{. c #9A9AB4",
-    "}. c #95A2BC",
-    "|. c #9BA5BD",
-    " X c #A68A8E",
-    ".X c #AA9F8B",
-    "XX c #B69897",
-    "oX c #B89E97",
-    "OX c #B29493",
-    "+X c #A0A0AF",
-    "@X c #A3A3B3",
-    "#X c #A2A2BA",
-    "$X c #A8A8BE",
-    "%X c #AAAAB6",
-    "&X c #B9AAB2",
-    "*X c #9F9FC0",
-    "=X c #99A7C0",
-    "-X c #9DAAC2",
-    ";X c #A2AEC5",
-    ":X c #ACACC2",
-    ">X c #A8A8C8",
-    ",X c #A4A4C4",
-    "<X c #A4B0C6",
-    "1X c #A6B2C8",
-    "2X c #AAB5CA",
-    "3X c #AEB9CD",
-    "4X c #B3B3CC",
-    "5X c #B0BACE",
-    "6X c #BBBBCD",
-    "7X c #B3BDD0",
-    "8X c #BABAD2",
-    "9X c #B7B7D3",
-    "0X c #B6C0D2",
-    "qX c #BBC4D4",
-    "wX c #C3A79D",
-    "eX c #CAAEA1",
-    "rX c #C6B7BB",
-    "tX c #E4B699",
-    "yX c #FFCB80",
-    "uX c #F1C28A",
-    "iX c #FFDC8B",
-    "pX c #FFD18A",
-    "aX c #FCD99D",
-    "sX c #FFD591",
-    "dX c #EDC8A1",
-    "fX c #F2D0B3",
-    "gX c #FFE483",
-    "hX c #FFE491",
-    "jX c #FFF686",
-    "kX c #FFF690",
-    "lX c #FFF49B",
-    "zX c #FFECB3",
-    "xX c #C2C2D3",
-    "cX c #C3CBDA",
-    "vX c #CBCBDB",
-    "bX c #C6C6D7",
-    "nX c #CAD1DE",
-    "mX c #D9CCC2",
-    "MX c #D1D1DD",
-    "NX c #CED4E1",
-    "BX c #D3D6E2",
-    "VX c #D3D9E4",
-    "CX c #D9DBE5",
-    "ZX c #DADFE8",
-    "AX c #DDE1EA",
-    "SX c #E9DECF",
-    "DX c #FBE5CE",
-    "FX c #FFEFD7",
-    "GX c #FEF0DC",
-    "HX c #E3E4EB",
-    "JX c #E9E9EF",
-    "KX c #EBECF1",
-    "LX c #E6E9F0",
-    "PX c #FEF9EF",
-    "IX c #FEFEFE",
-    "UX c #F2F2F5",
-    "YX c None",
-    /* pixels */
-    "YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX .7.,.^ P YXYXYXYXYXYXYXYXYX",
-    "YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX..u.zXGXDX<.P YXYXYXYXYXYXYXYX",
-    "YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX .k.y.iXGXGX<.P YXYXYXYXYXYXYX",
-    "YX:X$X#X#X#X{..`./.!.L !.D A C Y q.k.w.#.&.5.` P YXYXYXYXYXYXYX",
-    "2XKXLXHXIXIXVXVXVXVXIXIXIXIXIXIXm.k.j.#.#.-.o./ i YXYXYXYXYXYXYX",
-    "$XHXVXVXIXIX> 8 t e IXIXIXIXIXGX%.k.w.e.$.o._ Q.L & YXYXYXYXYXYX",
-    "#XAXVXNXIXIX: c N K IXIXIXIXIXC.j.j.r.$.@.o.I ).H * YXYXYXYXYXYX",
-    "#XAXNXvXIXIX; G L (.IXIXIXIXPXr.l.i.r.*.o.X. (.C * YXYXYXYXYXYX",
-    "{.AXvXcXIXIXe (.}.<XIXIXIXIXS.x.z.p.p.:.;.) (.K v & YXYXYXYXYXYX",
-    ".VXcXcXIXIX(.5XqXnXIXIXIXPX=.v.g.a.a.;.+.tXK V z & YXYXYXYXYXYX",
-    ".NXcXqXIXIXIXIXIXIXIXIXIXaXc.c.d.d.>.3.) HXB M g & YXYXYXYXYXYX",
-    "/.NXqXqXZXZXVXVXVXVXNXNXcX>.b.h.f.f.4.;.~ |.M x d # YXYXYXYXYXYX",
-    "/.nXqX5X5X5X2X1X;X;X-X|.{ h.L.M.M.n.6.) m M l l a # YXYXYXYXYXYX",
-    "!.cX5X5X3X2X1X<X-X-X|.}.1.I.K.N.N.6.5.U n l k j u # YXYXYXYXYXYX",
-    "L cX5X2X2X<X;X;X-X|.}..XM.U.B.V.m.9.} v l z j d y @ YXYXYX    YX",
-    "D cX2X2XqXqX5X5X3X2X;X| R.U.B.B.A.Z.E J J V p p 0 @             ",
-    "D qX1X<XIXIXIXIXUXLXSXN.E.H.F.F.D.2.rXxXxX6Xp a 9 +             ",
-    "A qX;X-XIXIXUXKXLXAXC.jXE.H.H.J.D. xXxX6X4Xu r 5 +             ",
-    "b 5X-X-XIXUXKXJXLXAXn.kXgXT.J.pX2.oXqX6X:X@Xr w 2 +             ",
-    "b 7X=X}.UX8X9X9X4X3X9.lXgXgXiXsX' `./.W.L .w 9 3 +             ",
-    "v 3X=X(.JXCXCXBXMXvX8.FXzXiXaX8.! *X{....9 7 = +             ",
-    "k 3X).~.HXvXbXbXxXeXtXGXGXGXfXQ .././.^.`.7 7 = .         YXYX",
-    "g 1X~.L HX6X6X4X4XoXdXFXGXfXE /.!.!.!.H H /.5 5 = .     YXYXYXYX",
-    "h =XL K CXCXMXMXvXeX mXtX~ #X@X{.{..`./.^.5 1 $ O YXYXYXYXYXYX",
-    "h {.G V CX>X,X,X{. X W T H H H H D A A b ^.4 1 $ O YXYXYXYXYXYX",
-    "a ).V B MXbXxX6X6XXXI ! ..././.!.!.^./.`.1 - % . YXYXYXYXYXYX",
-    "i _.B M vXbXxXxXxX&XOX$X#X@X@X{./.`.`.`././.- - o . YXYXYXYXYXYX",
-    "0 !.g d %X%X+X+X'.'.'.^./.^.W.W.W.S S S Z Z o o X . YXYXYXYXYXYX",
-    "YX6 < & 2 < 2 < < < < < < < * , , * * * * * . . . YXYXYXYXYXYXYX",
-    "YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-    "YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-    "YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
-  };
+const char *AlcPix::m_saveas_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 257 2",
+	"   c #000030",
+	".  c #03033F",
+	"X  c #0C0D35",
+	"o  c #11143C",
+	"O  c #050541",
+	"+  c #0A0A45",
+	"@  c #0F0F4B",
+	"#  c #11114D",
+	"$  c #191C45",
+	"%  c #171B45",
+	"&  c #161651",
+	"*  c #1B1B54",
+	"=  c #1F224D",
+	"-  c #1C2A54",
+	";  c #18366F",
+	":  c #12316B",
+	">  c #072764",
+	",  c #202254",
+	"<  c #232359",
+	"1  c #212F58",
+	"2  c #2A2B5B",
+	"3  c #262954",
+	"4  c #23315A",
+	"5  c #2B325D",
+	"6  c #2F2F64",
+	"7  c #2B3862",
+	"8  c #203C74",
+	"9  c #323B65",
+	"0  c #3E3E70",
+	"q  c #3A426B",
+	"w  c #33416A",
+	"e  c #304B7E",
+	"r  c #3A4771",
+	"t  c #284479",
+	"y  c #42456E",
+	"u  c #444C74",
+	"i  c #444776",
+	"p  c #48567D",
+	"a  c #485178",
+	"s  c #51537D",
+	"d  c #54587E",
+	"f  c #4D5C82",
+	"g  c #595C83",
+	"h  c #555884",
+	"j  c #536186",
+	"k  c #5A648B",
+	"l  c #5B698E",
+	"z  c #5A6388",
+	"x  c #5E6C90",
+	"c  c #526893",
+	"v  c #666788",
+	"b  c #6B6D94",
+	"n  c #616E93",
+	"m  c #6C728E",
+	"M  c #637194",
+	"N  c #65759A",
+	"B  c #697699",
+	"V  c #6C799B",
+	"C  c #6D7193",
+	"Z  c #73738D",
+	"A  c #74749A",
+	"S  c #7C7C93",
+	"D  c #7A7B9E",
+	"F  c #737799",
+	"G  c #6B7EA3",
+	"H  c #7D7DA2",
+	"J  c #76809F",
+	"K  c #7484A4",
+	"L  c #7B87A7",
+	"P  c #BB4400",
+	"I  c #AE6139",
+	"U  c #9A6047",
+	"Y  c #8F786E",
+	"T  c #996C6A",
+	"R  c #9C7971",
+	"E  c #AB6749",
+	"W  c #A6745E",
+	"Q  c #B46946",
+	"!  c #A77D72",
+	"~  c #B47A61",
+	"^  c #C15414",
+	"/  c #C16C39",
+	"(  c #C1703A",
+	")  c #D5742B",
+	"_  c #E67A1C",
+	"`  c #E67F27",
+	"'  c #C47E52",
+	"  c #C67545",
+	"  c #AB8876",
+	"{  c #B9A176",
+	"}  c #DD8032",
+	"|  c #DFA93D",
+	" . c #EC9A00",
+	".. c #EC9100",
+	"X. c #EE8521",
+	"o. c #FF9A2C",
+	"O. c #FF9F34",
+	"+. c #F79834",
+	"@. c #FFA81F",
+	"#. c #FFBD02",
+	"$. c #FFB908",
+	"%. c #F5BD01",
+	"&. c #FFB719",
+	"*. c #FFBE18",
+	"=. c #F6BD1F",
+	"-. c #FFA321",
+	";. c #FFA73D",
+	":. c #FFB12C",
+	">. c #F8BA36",
+	",. c #D78853",
+	"<. c #DD9A6E",
+	"1. c #DDB145",
+	"2. c #E6984E",
+	"3. c #FBA444",
+	"4. c #FFB14E",
+	"5. c #FDB058",
+	"6. c #FFB75A",
+	"7. c #EAAE6E",
+	"8. c #EEB472",
+	"9. c #FFBD68",
+	"0. c #F0B86E",
+	"q. c #F7C701",
+	"w. c #FFCA04",
+	"e. c #FFC10D",
+	"r. c #FBC414",
+	"t. c #FFC51B",
+	"y. c #FFDD0F",
+	"u. c #F9D30E",
+	"i. c #FFD314",
+	"p. c #FFC723",
+	"a. c #FFC629",
+	"s. c #FFC92A",
+	"d. c #FFCC33",
+	"f. c #FFCD3A",
+	"g. c #FFD927",
+	"h. c #FDDC3A",
+	"j. c #FEE302",
+	"k. c #FFEB01",
+	"l. c #FFEC0B",
+	"z. c #FFE818",
+	"x. c #FCE117",
+	"c. c #FFED2F",
+	"v. c #FEE828",
+	"b. c #FFF03D",
+	"n. c #FCC545",
+	"m. c #FFCC5C",
+	"M. c #FDD345",
+	"N. c #FDD24D",
+	"B. c #FFD95C",
+	"V. c #FFD556",
+	"C. c #F5C262",
+	"Z. c #FFC16F",
+	"A. c #F7C56B",
+	"S. c #F7CA7F",
+	"D. c #FFC779",
+	"F. c #FFDB68",
+	"G. c #FFD766",
+	"H. c #FFDD71",
+	"J. c #FFD87B",
+	"K. c #FFE651",
+	"L. c #FFF147",
+	"P. c #FFF25F",
+	"I. c #FFF255",
+	"U. c #FFEB68",
+	"Y. c #FFE26D",
+	"T. c #FFE07B",
+	"R. c #FFF46E",
+	"E. c #FFF27B",
+	"W. c #86869B",
+	"Q. c #9A878B",
+	"!. c #8383A4",
+	"~. c #808EAC",
+	"^. c #8A8AA4",
+	"/. c #8C8CAA",
+	"(. c #8494B2",
+	"). c #8B99B6",
+	"_. c #8D97B2",
+	"`. c #9293AD",
+	"'. c #9898A9",
+	". c #9595B2",
+	". c #949AB4",
+	"{. c #9A9AB4",
+	"}. c #95A2BC",
+	"|. c #9BA5BD",
+	" X c #A68A8E",
+	".X c #AA9F8B",
+	"XX c #B69897",
+	"oX c #B89E97",
+	"OX c #B29493",
+	"+X c #A0A0AF",
+	"@X c #A3A3B3",
+	"#X c #A2A2BA",
+	"$X c #A8A8BE",
+	"%X c #AAAAB6",
+	"&X c #B9AAB2",
+	"*X c #9F9FC0",
+	"=X c #99A7C0",
+	"-X c #9DAAC2",
+	";X c #A2AEC5",
+	":X c #ACACC2",
+	">X c #A8A8C8",
+	",X c #A4A4C4",
+	"<X c #A4B0C6",
+	"1X c #A6B2C8",
+	"2X c #AAB5CA",
+	"3X c #AEB9CD",
+	"4X c #B3B3CC",
+	"5X c #B0BACE",
+	"6X c #BBBBCD",
+	"7X c #B3BDD0",
+	"8X c #BABAD2",
+	"9X c #B7B7D3",
+	"0X c #B6C0D2",
+	"qX c #BBC4D4",
+	"wX c #C3A79D",
+	"eX c #CAAEA1",
+	"rX c #C6B7BB",
+	"tX c #E4B699",
+	"yX c #FFCB80",
+	"uX c #F1C28A",
+	"iX c #FFDC8B",
+	"pX c #FFD18A",
+	"aX c #FCD99D",
+	"sX c #FFD591",
+	"dX c #EDC8A1",
+	"fX c #F2D0B3",
+	"gX c #FFE483",
+	"hX c #FFE491",
+	"jX c #FFF686",
+	"kX c #FFF690",
+	"lX c #FFF49B",
+	"zX c #FFECB3",
+	"xX c #C2C2D3",
+	"cX c #C3CBDA",
+	"vX c #CBCBDB",
+	"bX c #C6C6D7",
+	"nX c #CAD1DE",
+	"mX c #D9CCC2",
+	"MX c #D1D1DD",
+	"NX c #CED4E1",
+	"BX c #D3D6E2",
+	"VX c #D3D9E4",
+	"CX c #D9DBE5",
+	"ZX c #DADFE8",
+	"AX c #DDE1EA",
+	"SX c #E9DECF",
+	"DX c #FBE5CE",
+	"FX c #FFEFD7",
+	"GX c #FEF0DC",
+	"HX c #E3E4EB",
+	"JX c #E9E9EF",
+	"KX c #EBECF1",
+	"LX c #E6E9F0",
+	"PX c #FEF9EF",
+	"IX c #FEFEFE",
+	"UX c #F2F2F5",
+	"YX c None",
+	/* pixels */
+	"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX .7.,.^ P YXYXYXYXYXYXYXYXYX",
+	"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX..u.zXGXDX<.P YXYXYXYXYXYXYXYX",
+	"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX .k.y.iXGXGX<.P YXYXYXYXYXYXYX",
+	"YX:X$X#X#X#X{..`./.!.L !.D A C Y q.k.w.#.&.5.` P YXYXYXYXYXYXYX",
+	"2XKXLXHXIXIXVXVXVXVXIXIXIXIXIXIXm.k.j.#.#.-.o./ i YXYXYXYXYXYXYX",
+	"$XHXVXVXIXIX> 8 t e IXIXIXIXIXGX%.k.w.e.$.o._ Q.L & YXYXYXYXYXYX",
+	"#XAXVXNXIXIX: c N K IXIXIXIXIXC.j.j.r.$.@.o.I ).H * YXYXYXYXYXYX",
+	"#XAXNXvXIXIX; G L (.IXIXIXIXPXr.l.i.r.*.o.X. (.C * YXYXYXYXYXYX",
+	"{.AXvXcXIXIXe (.}.<XIXIXIXIXS.x.z.p.p.:.;.) (.K v & YXYXYXYXYXYX",
+	".VXcXcXIXIX(.5XqXnXIXIXIXPX=.v.g.a.a.;.+.tXK V z & YXYXYXYXYXYX",
+	".NXcXqXIXIXIXIXIXIXIXIXIXaXc.c.d.d.>.3.) HXB M g & YXYXYXYXYXYX",
+	"/.NXqXqXZXZXVXVXVXVXNXNXcX>.b.h.f.f.4.;.~ |.M x d # YXYXYXYXYXYX",
+	"/.nXqX5X5X5X2X1X;X;X-X|.{ h.L.M.M.n.6.) m M l l a # YXYXYXYXYXYX",
+	"!.cX5X5X3X2X1X<X-X-X|.}.1.I.K.N.N.6.5.U n l k j u # YXYXYXYXYXYX",
+	"L cX5X2X2X<X;X;X-X|.}..XM.U.B.V.m.9.} v l z j d y @ YXYXYX    YX",
+	"D cX2X2XqXqX5X5X3X2X;X| R.U.B.B.A.Z.E J J V p p 0 @             ",
+	"D qX1X<XIXIXIXIXUXLXSXN.E.H.F.F.D.2.rXxXxX6Xp a 9 +             ",
+	"A qX;X-XIXIXUXKXLXAXC.jXE.H.H.J.D. xXxX6X4Xu r 5 +             ",
+	"b 5X-X-XIXUXKXJXLXAXn.kXgXT.J.pX2.oXqX6X:X@Xr w 2 +             ",
+	"b 7X=X}.UX8X9X9X4X3X9.lXgXgXiXsX' `./.W.L .w 9 3 +             ",
+	"v 3X=X(.JXCXCXBXMXvX8.FXzXiXaX8.! *X{....9 7 = +             ",
+	"k 3X).~.HXvXbXbXxXeXtXGXGXGXfXQ .././.^.`.7 7 = .         YXYX",
+	"g 1X~.L HX6X6X4X4XoXdXFXGXfXE /.!.!.!.H H /.5 5 = .     YXYXYXYX",
+	"h =XL K CXCXMXMXvXeX mXtX~ #X@X{.{..`./.^.5 1 $ O YXYXYXYXYXYX",
+	"h {.G V CX>X,X,X{. X W T H H H H D A A b ^.4 1 $ O YXYXYXYXYXYX",
+	"a ).V B MXbXxX6X6XXXI ! ..././.!.!.^./.`.1 - % . YXYXYXYXYXYX",
+	"i _.B M vXbXxXxXxX&XOX$X#X@X@X{./.`.`.`././.- - o . YXYXYXYXYXYX",
+	"0 !.g d %X%X+X+X'.'.'.^./.^.W.W.W.S S S Z Z o o X . YXYXYXYXYXYX",
+	"YX6 < & 2 < 2 < < < < < < < * , , * * * * * . . . YXYXYXYXYXYXYX",
+	"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+	"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+	"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};
 
 #else // Default DeltaHF theme
 
-const char *
-AlcPix::m_about_xpm=
-  { /* XPM */
-    /* columns rows colors chars-per-pixel */
-    "32 32 291 2",
-    "  	c None",
-    ". 	c #0C0C0C",
-    "+ 	c #0A0A0A",
-    "@ 	c #090909",
-    "# 	c #222222",
-    "$ 	c #9A9A9A",
-    "% 	c #A2A2A2",
-    "& 	c #9B9B9B",
-    "* 	c #959595",
-    "= 	c #858585",
-    "- 	c #5C5C5C",
-    "; 	c #2B2B2B",
-    "> 	c #7D7D7D",
-    ", 	c #969696",
-    "' 	c #878787",
-    ") 	c #989898",
-    "! 	c #8B8B8B",
-    "~ 	c #777777",
-    "{ 	c #292929",
-    " 	c #4F4F4F",
-    "^ 	c #A8A8A8",
-    "/ 	c #8F8F8F",
-    "( 	c #6A6A6A",
-    "_ 	c #212121",
-    ": 	c #161616",
-    "< 	c #6E6E6E",
-    " 	c #898989",
-    "} 	c #888888",
-    "| 	c #414141",
-    "1 	c #353535",
-    "2 	c #2F2F2F",
-    "3 	c #5A5A5A",
-    "4 	c #8C8C8C",
-    "5 	c #555555",
-    "6 	c #AFAFAF",
-    "7 	c #838383",
-    "8 	c #3E3E3E",
-    "9 	c #505050",
-    "0 	c #A1A1A1",
-    "a 	c #7E7E7E",
-    "b 	c #454545",
-    "c 	c #585958",
-    "d 	c #A9A9A9",
-    "e 	c #3C3C3C",
-    "f 	c #CAD7CA",
-    "g 	c #DFE8DF",
-    "h 	c #808780",
-    "i 	c #979797",
-    "j 	c #404440",
-    "k 	c #242D24",
-    "l 	c #C8D5C8",
-    "m 	c #D5DED5",
-    "n 	c #B0B9B0",
-    "o 	c #788378",
-    "p 	c #2B362B",
-    "q 	c #A4A4A4",
-    "r 	c #A0A0A0",
-    "s 	c #3D433D",
-    "t 	c #768576",
-    "u 	c #576657",
-    "v 	c #374237",
-    "w 	c #C9D6C9",
-    "x 	c #E0E9E0",
-    "y 	c #B4BDB4",
-    "z 	c #465546",
-    "A 	c #344334",
-    "B 	c #2E3A2E",
-    "C 	c #2B322B",
-    "D 	c #3D413D",
-    "E 	c #5B635B",
-    "F 	c #819081",
-    "G 	c #96A996",
-    "H 	c #7F907F",
-    "I 	c #6C796C",
-    "J 	c #516051",
-    "K 	c #2C372C",
-    "L 	c #C6D5C6",
-    "M 	c #D7E0D7",
-    "N 	c #B3BCB3",
-    "O 	c #798479",
-    "P 	c #374637",
-    "Q 	c #364536",
-    "R 	c #354435",
-    "S 	c #334233",
-    "T 	c #384738",
-    "U 	c #485948",
-    "V 	c #9BAE9B",
-    "W 	c #9EB19E",
-    "X 	c #94A794",
-    "Y 	c #889D88",
-    "Z 	c #7F947F",
-    "` 	c #7A897A",
-    " .	c #6B7A6B",
-    "..	c #596859",
-    "+.	c #374437",
-    "@.	c #B0BBB0",
-    "#.	c #ABB6AB",
-    "$.	c #C7D0C7",
-    "%.	c #939E93",
-    "&.	c #576457",
-    "*.	c #3D4C3D",
-    "=.	c #3C4B3C",
-    "-.	c #3B4A3B",
-    ";.	c #2F3A2F",
-    ">.	c #A7A7A7",
-    ",.	c #556255",
-    "'.	c #8CA18C",
-    ").	c #829582",
-    "!.	c #758A75",
-    "~.	c #687D68",
-    "{.	c #6F826F",
-    ".	c #728372",
-    "^.	c #606F60",
-    "/.	c #212A21",
-    "(.	c #A6B9A6",
-    "_.	c #B1BEB1",
-    ":.	c #808B80",
-    "<.	c #5B685B",
-    ".	c #4E5D4E",
-    "}.	c #4B5C4B",
-    "|.	c #4D5E4D",
-    "1.	c #4C5C4C",
-    "2.	c #313D31",
-    "3.	c #9F9F9F",
-    "4.	c #B8B8B8",
-    "5.	c #7C917C",
-    "6.	c #6F846F",
-    "7.	c #637863",
-    "8.	c #5E735E",
-    "9.	c #708370",
-    "0.	c #8C9D8C",
-    "a.	c #323D32",
-    "b.	c #ACBDAC",
-    "c.	c #D8E1D8",
-    "d.	c #D9E2D9",
-    "e.	c #CBD6CB",
-    "f.	c #AAB7AA",
-    "g.	c #717E71",
-    "h.	c #5D6C5D",
-    "i.	c #576857",
-    "j.	c #566756",
-    "k.	c #404D40",
-    "l.	c #1F251F",
-    "m.	c #2D332D",
-    "n.	c #2E342E",
-    "o.	c #3D483D",
-    "p.	c #6C816C",
-    "q.	c #778A77",
-    "r.	c #889988",
-    "s.	c #657665",
-    "t.	c #A9BEA9",
-    "u.	c #D5E0D5",
-    "v.	c #E1E8E1",
-    "w.	c #E3EAE3",
-    "x.	c #DBE4DB",
-    "y.	c #D2DDD2",
-    "z.	c #C1D0C1",
-    "A.	c #9DAC9D",
-    "B.	c #738473",
-    "C.	c #5F705F",
-    "D.	c #5B6C5B",
-    "E.	c #697E69",
-    "F.	c #667B66",
-    "G.	c #758875",
-    "H.	c #90A190",
-    "I.	c #7A8B7A",
-    "J.	c #697A69",
-    "K.	c #586758",
-    "L.	c #232C23",
-    "M.	c #A0B5A0",
-    "N.	c #E2E9E2",
-    "O.	c #DCE5DC",
-    "P.	c #D4DFD4",
-    "Q.	c #BFD0BF",
-    "R.	c #B2C3B2",
-    "S.	c #9BAC9B",
-    "T.	c #6A796A",
-    "U.	c #5C6D5C",
-    "V.	c #607560",
-    "W.	c #7D907D",
-    "X.	c #92A592",
-    "Y.	c #889B88",
-    "Z.	c #6A7D6A",
-    "`.	c #677867",
-    " +	c #637463",
-    ".+	c #5E6E5E",
-    "++	c #5B6A5B",
-    "@+	c #283328",
-    "#+	c #AFBCAF",
-    "$+	c #D0DBD0",
-    "%+	c #BBCCBB",
-    "&+	c #B7C8B7",
-    "*+	c #495649",
-    "=+	c #ABBAAB",
-    "-+	c #8B9E8B",
-    ";+	c #7A8F7A",
-    ">+	c #718471",
-    ",+	c #667766",
-    "'+	c #647564",
-    ")+	c #617261",
-    "!+	c #3B483B",
-    "~+	c #1E251E",
-    "{+	c #B2BFB2",
-    "+	c #C3CEC3",
-    "^+	c #C3D0C3",
-    "/+	c #BDCEBD",
-    "(+	c #B5C6B5",
-    "_+	c #AABBAA",
-    ":+	c #3D4A3D",
-    "<+	c #627162",
-    "+	c #525D52",
-    "}+	c #8B9A8B",
-    "|+	c #788B78",
-    "1+	c #768976",
-    "2+	c #6B7E6B",
-    "3+	c #384538",
-    "4+	c #141B15",
-    "5+	c #485548",
-    "6+	c #95A295",
-    "7+	c #ACBBAC",
-    "8+	c #AFC0AF",
-    "9+	c #9CAB9C",
-    "0+	c #354035",
-    "a+	c #505D50",
-    "b+	c #728572",
-    "c+	c #4F5E4F",
-    "d+	c #444D44",
-    "e+	c #869386",
-    "f+	c #394639",
-    "g+	c #192019",
-    "h+	c #333E33",
-    "i+	c #5F6E5F",
-    "j+	c #334033",
-    "k+	c #4B584B",
-    "l+	c #8C9B8C",
-    "m+	c #343F34",
-    "n+	c #4A554A",
-    "o+	c #4D5C4D",
-    "p+	c #505F50",
-    "q+	c #495249",
-    "r+	c #818E81",
-    "s+	c #3F4D3E",
-    "t+	c #394439",
-    "u+	c #3F4C3F",
-    "v+	c #6C7F6C",
-    "w+	c #798C79",
-    "x+	c #516251",
-    "y+	c #3F463F",
-    "z+	c #3C493C",
-    "A+	c #414E41",
-    "B+	c #768574",
-    "C+	c #889D86",
-    "D+	c #819681",
-    "E+	c #6D806D",
-    "F+	c #657865",
-    "G+	c #809580",
-    "H+	c #556655",
-    "I+	c #546354",
-    "J+	c #4B5A4B",
-    "K+	c #465346",
-    "L+	c #3E4B3E",
-    "M+	c #4D5A4D",
-    "N+	c #566354",
-    "O+	c #7C8C79",
-    "P+	c #819580",
-    "Q+	c #859C85",
-    "R+	c #5A6B5A",
-    "S+	c #526152",
-    "T+	c #4C5B4C",
-    "U+	c #485748",
-    "V+	c #434E43",
-    "W+	c #333C33",
-    "X+	c #5D6D5C",
-    "Y+	c #7B8B78",
-    "Z+	c #7E937E",
-    "`+	c #8AA18A",
-    " @	c #5D6E5D",
-    ".@	c #536453",
-    "+@	c #536253",
-    "@@	c #3A473A",
-    "#@	c #556354",
-    "$@	c #778877",
-    "%@	c #869C85",
-    "&@	c #91A891",
-    "*@	c #607160",
-    "=@	c #566556",
-    "-@	c #3B463B",
-    ";@	c #5A6A59",
-    ">@	c #859782",
-    ",@	c #5C6B5C",
-    "'@	c #415041",
-    "                                                                ",
-    "                                                                ",
-    "                                                                ",
-    "                              . + @ @                           ",
-    "                          # $ % & * = - ;                       ",
-    "                        + > , ' $ ) ! = ~ {                     ",
-    "                         ^ / ( _ : <  } |                     ",
-    "                        : 1 2 :     3 4  |                     ",
-    "                                  5 6 7 7 8                     ",
-    "                                9 0 a 4 b                       ",
-    "                              c d a > e                         ",
-    "                        f g h $ $ i j k                         ",
-    "                    l m n o p q r 6 s t u v                     ",
-    "                w x y o z A B C D E F G H I J K                 ",
-    "            L M N O P Q R S T U V W V X Y Z `  ...+.            ",
-    "        @.#.$.%.&.*.=.*.*.-.;.r >.6 ,.'.).!.~.{..^.v /.        ",
-    "            (._.:.<..}.|.1.2.3.r 4.C 5.6.7.8.9.0.a.            ",
-    "          b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.8.q.r.H s.h./.          ",
-    "        t.u.v.w.x.y.z.A.B.C.D.D.E.7.F.G.H.I.J.s.h.K...L.        ",
-    "      M.f u.v.N.O.P.L Q.R.S.T.U.V.W.X.Y.{.Z.`. +.+++C.s.@+      ",
-    "        h.#+P.M u.$+L Q.%+&+b.*+=+-+;+q.>+Z.`.,+'+)+!+~+        ",
-    "            h.{++^+z./+(+_+:+<++}+|+1+>+2+,+,+3+4+            ",
-    "              v 5+6+7+8+9+0+a+b+c+d+e+>+2+ +f+g+h+              ",
-    "              I i+j+k+l+m+n+C.b+o+p+q+r+s+g+t+u+:+              ",
-    "              H 1+v+C.j+5+..s.w+x+J *+y+a.z+!+A+A+              ",
-    "              B+C+D+E+F+s. +J.G+H+I+J+K+u+L+u+5+M+              ",
-    "                N+O+P+;+1+b+{.Q+R+j.S+T+U+T+V+W+                ",
-    "                    X+Y+D+Z Z+`+ @D.j..@+@@@                    ",
-    "                        #@$@%@&@ @*@=@-@                        ",
-    "                            ;@>@,@'@                            ",
-    "                                                                ",
-    "                                                                "
-  };
+const char *AlcPix::m_about_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 291 2",
+	"  	c None",
+	". 	c #0C0C0C",
+	"+ 	c #0A0A0A",
+	"@ 	c #090909",
+	"# 	c #222222",
+	"$ 	c #9A9A9A",
+	"% 	c #A2A2A2",
+	"& 	c #9B9B9B",
+	"* 	c #959595",
+	"= 	c #858585",
+	"- 	c #5C5C5C",
+	"; 	c #2B2B2B",
+	"> 	c #7D7D7D",
+	", 	c #969696",
+	"' 	c #878787",
+	") 	c #989898",
+	"! 	c #8B8B8B",
+	"~ 	c #777777",
+	"{ 	c #292929",
+	" 	c #4F4F4F",
+	"^ 	c #A8A8A8",
+	"/ 	c #8F8F8F",
+	"( 	c #6A6A6A",
+	"_ 	c #212121",
+	": 	c #161616",
+	"< 	c #6E6E6E",
+	" 	c #898989",
+	"} 	c #888888",
+	"| 	c #414141",
+	"1 	c #353535",
+	"2 	c #2F2F2F",
+	"3 	c #5A5A5A",
+	"4 	c #8C8C8C",
+	"5 	c #555555",
+	"6 	c #AFAFAF",
+	"7 	c #838383",
+	"8 	c #3E3E3E",
+	"9 	c #505050",
+	"0 	c #A1A1A1",
+	"a 	c #7E7E7E",
+	"b 	c #454545",
+	"c 	c #585958",
+	"d 	c #A9A9A9",
+	"e 	c #3C3C3C",
+	"f 	c #CAD7CA",
+	"g 	c #DFE8DF",
+	"h 	c #808780",
+	"i 	c #979797",
+	"j 	c #404440",
+	"k 	c #242D24",
+	"l 	c #C8D5C8",
+	"m 	c #D5DED5",
+	"n 	c #B0B9B0",
+	"o 	c #788378",
+	"p 	c #2B362B",
+	"q 	c #A4A4A4",
+	"r 	c #A0A0A0",
+	"s 	c #3D433D",
+	"t 	c #768576",
+	"u 	c #576657",
+	"v 	c #374237",
+	"w 	c #C9D6C9",
+	"x 	c #E0E9E0",
+	"y 	c #B4BDB4",
+	"z 	c #465546",
+	"A 	c #344334",
+	"B 	c #2E3A2E",
+	"C 	c #2B322B",
+	"D 	c #3D413D",
+	"E 	c #5B635B",
+	"F 	c #819081",
+	"G 	c #96A996",
+	"H 	c #7F907F",
+	"I 	c #6C796C",
+	"J 	c #516051",
+	"K 	c #2C372C",
+	"L 	c #C6D5C6",
+	"M 	c #D7E0D7",
+	"N 	c #B3BCB3",
+	"O 	c #798479",
+	"P 	c #374637",
+	"Q 	c #364536",
+	"R 	c #354435",
+	"S 	c #334233",
+	"T 	c #384738",
+	"U 	c #485948",
+	"V 	c #9BAE9B",
+	"W 	c #9EB19E",
+	"X 	c #94A794",
+	"Y 	c #889D88",
+	"Z 	c #7F947F",
+	"` 	c #7A897A",
+	" .	c #6B7A6B",
+	"..	c #596859",
+	"+.	c #374437",
+	"@.	c #B0BBB0",
+	"#.	c #ABB6AB",
+	"$.	c #C7D0C7",
+	"%.	c #939E93",
+	"&.	c #576457",
+	"*.	c #3D4C3D",
+	"=.	c #3C4B3C",
+	"-.	c #3B4A3B",
+	";.	c #2F3A2F",
+	">.	c #A7A7A7",
+	",.	c #556255",
+	"'.	c #8CA18C",
+	").	c #829582",
+	"!.	c #758A75",
+	"~.	c #687D68",
+	"{.	c #6F826F",
+	".	c #728372",
+	"^.	c #606F60",
+	"/.	c #212A21",
+	"(.	c #A6B9A6",
+	"_.	c #B1BEB1",
+	":.	c #808B80",
+	"<.	c #5B685B",
+	".	c #4E5D4E",
+	"}.	c #4B5C4B",
+	"|.	c #4D5E4D",
+	"1.	c #4C5C4C",
+	"2.	c #313D31",
+	"3.	c #9F9F9F",
+	"4.	c #B8B8B8",
+	"5.	c #7C917C",
+	"6.	c #6F846F",
+	"7.	c #637863",
+	"8.	c #5E735E",
+	"9.	c #708370",
+	"0.	c #8C9D8C",
+	"a.	c #323D32",
+	"b.	c #ACBDAC",
+	"c.	c #D8E1D8",
+	"d.	c #D9E2D9",
+	"e.	c #CBD6CB",
+	"f.	c #AAB7AA",
+	"g.	c #717E71",
+	"h.	c #5D6C5D",
+	"i.	c #576857",
+	"j.	c #566756",
+	"k.	c #404D40",
+	"l.	c #1F251F",
+	"m.	c #2D332D",
+	"n.	c #2E342E",
+	"o.	c #3D483D",
+	"p.	c #6C816C",
+	"q.	c #778A77",
+	"r.	c #889988",
+	"s.	c #657665",
+	"t.	c #A9BEA9",
+	"u.	c #D5E0D5",
+	"v.	c #E1E8E1",
+	"w.	c #E3EAE3",
+	"x.	c #DBE4DB",
+	"y.	c #D2DDD2",
+	"z.	c #C1D0C1",
+	"A.	c #9DAC9D",
+	"B.	c #738473",
+	"C.	c #5F705F",
+	"D.	c #5B6C5B",
+	"E.	c #697E69",
+	"F.	c #667B66",
+	"G.	c #758875",
+	"H.	c #90A190",
+	"I.	c #7A8B7A",
+	"J.	c #697A69",
+	"K.	c #586758",
+	"L.	c #232C23",
+	"M.	c #A0B5A0",
+	"N.	c #E2E9E2",
+	"O.	c #DCE5DC",
+	"P.	c #D4DFD4",
+	"Q.	c #BFD0BF",
+	"R.	c #B2C3B2",
+	"S.	c #9BAC9B",
+	"T.	c #6A796A",
+	"U.	c #5C6D5C",
+	"V.	c #607560",
+	"W.	c #7D907D",
+	"X.	c #92A592",
+	"Y.	c #889B88",
+	"Z.	c #6A7D6A",
+	"`.	c #677867",
+	" +	c #637463",
+	".+	c #5E6E5E",
+	"++	c #5B6A5B",
+	"@+	c #283328",
+	"#+	c #AFBCAF",
+	"$+	c #D0DBD0",
+	"%+	c #BBCCBB",
+	"&+	c #B7C8B7",
+	"*+	c #495649",
+	"=+	c #ABBAAB",
+	"-+	c #8B9E8B",
+	";+	c #7A8F7A",
+	">+	c #718471",
+	",+	c #667766",
+	"'+	c #647564",
+	")+	c #617261",
+	"!+	c #3B483B",
+	"~+	c #1E251E",
+	"{+	c #B2BFB2",
+	"+	c #C3CEC3",
+	"^+	c #C3D0C3",
+	"/+	c #BDCEBD",
+	"(+	c #B5C6B5",
+	"_+	c #AABBAA",
+	":+	c #3D4A3D",
+	"<+	c #627162",
+	"+	c #525D52",
+	"}+	c #8B9A8B",
+	"|+	c #788B78",
+	"1+	c #768976",
+	"2+	c #6B7E6B",
+	"3+	c #384538",
+	"4+	c #141B15",
+	"5+	c #485548",
+	"6+	c #95A295",
+	"7+	c #ACBBAC",
+	"8+	c #AFC0AF",
+	"9+	c #9CAB9C",
+	"0+	c #354035",
+	"a+	c #505D50",
+	"b+	c #728572",
+	"c+	c #4F5E4F",
+	"d+	c #444D44",
+	"e+	c #869386",
+	"f+	c #394639",
+	"g+	c #192019",
+	"h+	c #333E33",
+	"i+	c #5F6E5F",
+	"j+	c #334033",
+	"k+	c #4B584B",
+	"l+	c #8C9B8C",
+	"m+	c #343F34",
+	"n+	c #4A554A",
+	"o+	c #4D5C4D",
+	"p+	c #505F50",
+	"q+	c #495249",
+	"r+	c #818E81",
+	"s+	c #3F4D3E",
+	"t+	c #394439",
+	"u+	c #3F4C3F",
+	"v+	c #6C7F6C",
+	"w+	c #798C79",
+	"x+	c #516251",
+	"y+	c #3F463F",
+	"z+	c #3C493C",
+	"A+	c #414E41",
+	"B+	c #768574",
+	"C+	c #889D86",
+	"D+	c #819681",
+	"E+	c #6D806D",
+	"F+	c #657865",
+	"G+	c #809580",
+	"H+	c #556655",
+	"I+	c #546354",
+	"J+	c #4B5A4B",
+	"K+	c #465346",
+	"L+	c #3E4B3E",
+	"M+	c #4D5A4D",
+	"N+	c #566354",
+	"O+	c #7C8C79",
+	"P+	c #819580",
+	"Q+	c #859C85",
+	"R+	c #5A6B5A",
+	"S+	c #526152",
+	"T+	c #4C5B4C",
+	"U+	c #485748",
+	"V+	c #434E43",
+	"W+	c #333C33",
+	"X+	c #5D6D5C",
+	"Y+	c #7B8B78",
+	"Z+	c #7E937E",
+	"`+	c #8AA18A",
+	" @	c #5D6E5D",
+	".@	c #536453",
+	"+@	c #536253",
+	"@@	c #3A473A",
+	"#@	c #556354",
+	"$@	c #778877",
+	"%@	c #869C85",
+	"&@	c #91A891",
+	"*@	c #607160",
+	"=@	c #566556",
+	"-@	c #3B463B",
+	";@	c #5A6A59",
+	">@	c #859782",
+	",@	c #5C6B5C",
+	"'@	c #415041",
+	"                                                                ",
+	"                                                                ",
+	"                                                                ",
+	"                              . + @ @                           ",
+	"                          # $ % & * = - ;                       ",
+	"                        + > , ' $ ) ! = ~ {                     ",
+	"                         ^ / ( _ : <  } |                     ",
+	"                        : 1 2 :     3 4  |                     ",
+	"                                  5 6 7 7 8                     ",
+	"                                9 0 a 4 b                       ",
+	"                              c d a > e                         ",
+	"                        f g h $ $ i j k                         ",
+	"                    l m n o p q r 6 s t u v                     ",
+	"                w x y o z A B C D E F G H I J K                 ",
+	"            L M N O P Q R S T U V W V X Y Z `  ...+.            ",
+	"        @.#.$.%.&.*.=.*.*.-.;.r >.6 ,.'.).!.~.{..^.v /.        ",
+	"            (._.:.<..}.|.1.2.3.r 4.C 5.6.7.8.9.0.a.            ",
+	"          b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.8.q.r.H s.h./.          ",
+	"        t.u.v.w.x.y.z.A.B.C.D.D.E.7.F.G.H.I.J.s.h.K...L.        ",
+	"      M.f u.v.N.O.P.L Q.R.S.T.U.V.W.X.Y.{.Z.`. +.+++C.s.@+      ",
+	"        h.#+P.M u.$+L Q.%+&+b.*+=+-+;+q.>+Z.`.,+'+)+!+~+        ",
+	"            h.{++^+z./+(+_+:+<++}+|+1+>+2+,+,+3+4+            ",
+	"              v 5+6+7+8+9+0+a+b+c+d+e+>+2+ +f+g+h+              ",
+	"              I i+j+k+l+m+n+C.b+o+p+q+r+s+g+t+u+:+              ",
+	"              H 1+v+C.j+5+..s.w+x+J *+y+a.z+!+A+A+              ",
+	"              B+C+D+E+F+s. +J.G+H+I+J+K+u+L+u+5+M+              ",
+	"                N+O+P+;+1+b+{.Q+R+j.S+T+U+T+V+W+                ",
+	"                    X+Y+D+Z Z+`+ @D.j..@+@@@                    ",
+	"                        #@$@%@&@ @*@=@-@                        ",
+	"                            ;@>@,@'@                            ",
+	"                                                                ",
+	"                                                                "
+};
 
 #ifndef __WINDOWS__
-const char *
-AlcPix::m_alc_xpm=
-  { /* XPM */
-    /* columns rows colors chars-per-pixel */
-    "32 32 142 2",
-    "   c #000000",
-    ".  c #0C0B00",
-    "X  c #0B0B0B",
-    "o  c #131313",
-    "O  c #121318",
-    "+  c #1A1A1A",
-    "@  c #2D1A00",
-    "#  c #292100",
-    "$  c #29251E",
-    "%  c #222222",
-    "&  c #292929",
-    "*  c #323232",
-    "=  c #36383B",
-    "-  c #393836",
-    ";  c #3E3E3E",
-    ":  c #5F3F06",
-    ">  c #534400",
-    ",  c #594400",
-    "<  c #584A00",
-    "1  c #6F4700",
-    "2  c #604418",
-    "3  c #7F6F00",
-    "4  c gray26",
-    "5  c #4A4A4A",
-    "6  c #4D4D58",
-    "7  c #505052",
-    "8  c #5A5A5A",
-    "9  c #5B5C63",
-    "0  c #786448",
-    "q  c #646464",
-    "w  c #696B6F",
-    "e  c #747474",
-    "r  c #77797D",
-    "t  c #7C7C7C",
-    "y  c #7C7D82",
-    "u  c #995B0A",
-    "i  c #9A7700",
-    "p  c #8D682E",
-    "a  c #AA7900",
-    "s  c #9B7F4C",
-    "d  c #867C6A",
-    "f  c #817D7A",
-    "g  c #9A8B00",
-    "h  c #A38002",
-    "j  c #AC8800",
-    "k  c #A59200",
-    "l  c #BE8D2D",
-    "z  c #B5A200",
-    "x  c #97876C",
-    "c  c #958873",
-    "v  c #9F9079",
-    "b  c #B3B272",
-    "n  c #BFB97D",
-    "m  c #D59700",
-    "M  c #C5B500",
-    "N  c #E4AA14",
-    "B  c #FBB904",
-    "V  c #E9AB38",
-    "C  c #FCBC20",
-    "Z  c #D1AB66",
-    "A  c #F0B355",
-    "S  c #E0B96A",
-    "D  c #D6C500",
-    "F  c #D9C300",
-    "G  c #DED100",
-    "H  c #E4D700",
-    "J  c #EDDE00",
-    "K  c #F1C500",
-    "L  c #FFC604",
-    "P  c #FCC90B",
-    "I  c #FFD600",
-    "U  c #FFDB00",
-    "Y  c #FFD81D",
-    "T  c #FFCF2A",
-    "R  c #FFD32C",
-    "E  c #FFD433",
-    "W  c #FFD23A",
-    "Q  c #F0E500",
-    "!  c #FEE300",
-    "~  c #FFE800",
-    "^  c #FDE114",
-    "/  c #FFF000",
-    "(  c #FEFB01",
-    ")  c #FDFC28",
-    "_  c #FFD541",
-    "`  c #FFD64A",
-    "'  c #E0E046",
-    "  c #858585",
-    "  c #83868D",
-    "{  c #86888C",
-    "}  c #8B8B8B",
-    "|  c #8A8C91",
-    " . c #8E9197",
-    ".. c #939393",
-    "X. c #9B9B9B",
-    "o. c #9D9EA0",
-    "O. c #9FA1A6",
-    "+. c #AB9B82",
-    "@. c #AAA297",
-    "#. c #B6A588",
-    "$. c #BBAC94",
-    "%. c #A3A3A3",
-    "&. c #ABABAB",
-    "*. c #B2B2B2",
-    "=. c #BABABA",
-    "-. c #BCBEC0",
-    ";. c #BFC1C4",
-    ":. c #CBBCA4",
-    ">. c #C6C6A3",
-    ",. c #D9C8AE",
-    "<. c #D8D9BA",
-    "1. c #EBDB9F",
-    "2. c #F9D78E",
-    "3. c #F3D598",
-    "4. c #FDD790",
-    "5. c #FBDE9E",
-    "6. c #EDDEBE",
-    "7. c #FFEAAB",
-    "8. c #F7EAB4",
-    "9. c #FEE6B1",
-    "0. c #FFEBB2",
-    "q. c #FFF1B2",
-    "w. c #C3C3C3",
-    "e. c #C5C5C9",
-    "r. c #CCCCCC",
-    "t. c #CDCFD3",
-    "y. c #D0D0C0",
-    "u. c #D4D4D3",
-    "i. c #D2D2D8",
-    "p. c #DBDBDB",
-    "a. c #EEDFD0",
-    "s. c #EDE7DD",
-    "d. c #FCFBD4",
-    "f. c #FEF8D9",
-    "g. c #E3E3E3",
-    "h. c #E7E9ED",
-    "j. c #EAEAEA",
-    "k. c #E8EBF3",
-    "l. c #F2F2F2",
-    "z. c #F0F1F8",
-    "x. c #FDFDFD",
-    "c. c None",
-    /* pixels */
-    "c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.",
-    "c.c.c.c.c.c.c.c.c.c.c.c.    X o + o     c.c.c.c.c.c.c.c.c.c.c.c.",
-    "c.c.c.c.c.c.c.c.c.c.  $ q X.=.r.w.w.&.t *   c.c.c.c.c.c.c.c.c.c.",
-    "c.c.c.c.c.c.c.c.c.X q w.p.r.=.=.=.w.=.w.=.t +   c.c.c.c.c.c.c.c.",
-    "c.c.c.c.c.c.c.  X t j.x.x.x.u.%.%.X.%.&.&.&...%   c.c.c.c.c.c.c.",
-    "c.c.c.c.c.c.c.  7 p.x.x.x.x.x.w.} =.g.x.l.u.%.e X   c.c.c.c.c.c.",
-    "c.c.c.c.c.c.  o } x.x.x.x.l.=.%.*.x.x.x.x.l.r. *   c.c.c.c.c.c.",
-    "c.c.c.c.c.    & X.x.x.x.l.r.e & } ..x.x.j.p.u.} ;     c.c.c.c.c.",
-    "c.c.c.c.c.    % t x.x.l.g.r.9 6 y } x.j.p.r.w.t *     c.c.c.c.c.",
-    "c.c.c.c.      o 4 p.x.g.p.y.>.b n f.s.p.t.e.%.5 +       c.c.c.c.",
-    "c.c.c.c.        + q p.p.e.' ( ( U L A r.*. 4 %         c.c.c.c.",
-    "c.c.c.c.            ; r.i.<.) / I C s.h.%.&   X         c.c.c.c.",
-    "c.c.c.c.          X %.x.x.x.d.^ P a.h.g.s.*.&             c.c.c.",
-    "c.c.            X *.x.x.x.x.x.8.1.k.s.p.u.p.*.%   X       c.c.c.",
-    "c.    X X X X    x.x.x.x.x.x.k.h.g.i.u.r.w.e...o X   X X     c.",
-    "    o o o o X 4 l.x.x.x.x.x.j.j.g.p.u.r.w.=.=.=.8     X o X     ",
-    "  X X o o + X X.x.x.x.x.x.l.j.g.p.u.r.e.w.=.*.*...o X X         ",
-    "          + * h.x.x.x.l.l.j.g.p.t.r.e.w.=.*.&.%.%.5 +           ",
-    "c.c.c.c.  o e x.x.x.x.l.j.s.p.u.r.w.-.=.*.&.%.%.@.e %   c.c.c.c.",
-    "c.c.c.c.  o &.x.x.x.l.h.g.p.u.r.y.=.=.*.&.%.%.X... %   c.c.c.c.",
-    "c.c.c.c.  X r.x.x.l.j.s.a.i.t.e.;.=.*.&.&.O.....} } +   c.c.c.c.",
-    "c.c.c.c.c.X s.x.l.j.g.p.u.r.e.;.*.*.&.%.O.X.....} } +   c.c.c.c.",
-    "c.c.c.c.c.X p.x.h.g.p.i.r.e.-.=.*.&.&.@.......} } 8   c.c.c.c.c.",
-    "c.c.c.c.c.c.6 h.s.p.u.r.e.-.=.*.&.%.o.X.....  t o   c.c.c.c.c.",
-    "c.c.c.c.c.c.c.9 t.r.;.;.-.=.*.&.%.o.X...{  r w O   c.c.c.c.c.c.",
-    "c.c.c.c.c.c.u 2 #.,.:.$.@.o.O.X.X.|  f c v $.v 0 p : c.c.c.c.c.",
-    "c.c.c.c.1 V 4.0.0.0.9.9.3.Z x | } t s S 5.7.7.q.q.7.2.l @ c.c.c.",
-    "c.c.c.  m E ` _ _ _ W _ ` T N }  .d B R E E E E E E W Y a   c.c.",
-    "c.c.c.  i U U U ~ U ~ U U U a - = $ j U ~ ~ ~ ~ ~ ~ U K ,   c.c.",
-    "c.c.c.c.  > k D J Q J F k <       c.  > g M G H D z 3 #   c.c.c.",
-    "c.c.c.c.c.c.    . . . .     c.c.c.c.c.c.    . .         c.c.c.c.",
-    "c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c."
-  };
+const char *AlcPix::m_alc_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 142 2",
+	"   c #000000",
+	".  c #0C0B00",
+	"X  c #0B0B0B",
+	"o  c #131313",
+	"O  c #121318",
+	"+  c #1A1A1A",
+	"@  c #2D1A00",
+	"#  c #292100",
+	"$  c #29251E",
+	"%  c #222222",
+	"&  c #292929",
+	"*  c #323232",
+	"=  c #36383B",
+	"-  c #393836",
+	";  c #3E3E3E",
+	":  c #5F3F06",
+	">  c #534400",
+	",  c #594400",
+	"<  c #584A00",
+	"1  c #6F4700",
+	"2  c #604418",
+	"3  c #7F6F00",
+	"4  c gray26",
+	"5  c #4A4A4A",
+	"6  c #4D4D58",
+	"7  c #505052",
+	"8  c #5A5A5A",
+	"9  c #5B5C63",
+	"0  c #786448",
+	"q  c #646464",
+	"w  c #696B6F",
+	"e  c #747474",
+	"r  c #77797D",
+	"t  c #7C7C7C",
+	"y  c #7C7D82",
+	"u  c #995B0A",
+	"i  c #9A7700",
+	"p  c #8D682E",
+	"a  c #AA7900",
+	"s  c #9B7F4C",
+	"d  c #867C6A",
+	"f  c #817D7A",
+	"g  c #9A8B00",
+	"h  c #A38002",
+	"j  c #AC8800",
+	"k  c #A59200",
+	"l  c #BE8D2D",
+	"z  c #B5A200",
+	"x  c #97876C",
+	"c  c #958873",
+	"v  c #9F9079",
+	"b  c #B3B272",
+	"n  c #BFB97D",
+	"m  c #D59700",
+	"M  c #C5B500",
+	"N  c #E4AA14",
+	"B  c #FBB904",
+	"V  c #E9AB38",
+	"C  c #FCBC20",
+	"Z  c #D1AB66",
+	"A  c #F0B355",
+	"S  c #E0B96A",
+	"D  c #D6C500",
+	"F  c #D9C300",
+	"G  c #DED100",
+	"H  c #E4D700",
+	"J  c #EDDE00",
+	"K  c #F1C500",
+	"L  c #FFC604",
+	"P  c #FCC90B",
+	"I  c #FFD600",
+	"U  c #FFDB00",
+	"Y  c #FFD81D",
+	"T  c #FFCF2A",
+	"R  c #FFD32C",
+	"E  c #FFD433",
+	"W  c #FFD23A",
+	"Q  c #F0E500",
+	"!  c #FEE300",
+	"~  c #FFE800",
+	"^  c #FDE114",
+	"/  c #FFF000",
+	"(  c #FEFB01",
+	")  c #FDFC28",
+	"_  c #FFD541",
+	"`  c #FFD64A",
+	"'  c #E0E046",
+	"  c #858585",
+	"  c #83868D",
+	"{  c #86888C",
+	"}  c #8B8B8B",
+	"|  c #8A8C91",
+	" . c #8E9197",
+	".. c #939393",
+	"X. c #9B9B9B",
+	"o. c #9D9EA0",
+	"O. c #9FA1A6",
+	"+. c #AB9B82",
+	"@. c #AAA297",
+	"#. c #B6A588",
+	"$. c #BBAC94",
+	"%. c #A3A3A3",
+	"&. c #ABABAB",
+	"*. c #B2B2B2",
+	"=. c #BABABA",
+	"-. c #BCBEC0",
+	";. c #BFC1C4",
+	":. c #CBBCA4",
+	">. c #C6C6A3",
+	",. c #D9C8AE",
+	"<. c #D8D9BA",
+	"1. c #EBDB9F",
+	"2. c #F9D78E",
+	"3. c #F3D598",
+	"4. c #FDD790",
+	"5. c #FBDE9E",
+	"6. c #EDDEBE",
+	"7. c #FFEAAB",
+	"8. c #F7EAB4",
+	"9. c #FEE6B1",
+	"0. c #FFEBB2",
+	"q. c #FFF1B2",
+	"w. c #C3C3C3",
+	"e. c #C5C5C9",
+	"r. c #CCCCCC",
+	"t. c #CDCFD3",
+	"y. c #D0D0C0",
+	"u. c #D4D4D3",
+	"i. c #D2D2D8",
+	"p. c #DBDBDB",
+	"a. c #EEDFD0",
+	"s. c #EDE7DD",
+	"d. c #FCFBD4",
+	"f. c #FEF8D9",
+	"g. c #E3E3E3",
+	"h. c #E7E9ED",
+	"j. c #EAEAEA",
+	"k. c #E8EBF3",
+	"l. c #F2F2F2",
+	"z. c #F0F1F8",
+	"x. c #FDFDFD",
+	"c. c None",
+	/* pixels */
+	"c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.",
+	"c.c.c.c.c.c.c.c.c.c.c.c.    X o + o     c.c.c.c.c.c.c.c.c.c.c.c.",
+	"c.c.c.c.c.c.c.c.c.c.  $ q X.=.r.w.w.&.t *   c.c.c.c.c.c.c.c.c.c.",
+	"c.c.c.c.c.c.c.c.c.X q w.p.r.=.=.=.w.=.w.=.t +   c.c.c.c.c.c.c.c.",
+	"c.c.c.c.c.c.c.  X t j.x.x.x.u.%.%.X.%.&.&.&...%   c.c.c.c.c.c.c.",
+	"c.c.c.c.c.c.c.  7 p.x.x.x.x.x.w.} =.g.x.l.u.%.e X   c.c.c.c.c.c.",
+	"c.c.c.c.c.c.  o } x.x.x.x.l.=.%.*.x.x.x.x.l.r. *   c.c.c.c.c.c.",
+	"c.c.c.c.c.    & X.x.x.x.l.r.e & } ..x.x.j.p.u.} ;     c.c.c.c.c.",
+	"c.c.c.c.c.    % t x.x.l.g.r.9 6 y } x.j.p.r.w.t *     c.c.c.c.c.",
+	"c.c.c.c.      o 4 p.x.g.p.y.>.b n f.s.p.t.e.%.5 +       c.c.c.c.",
+	"c.c.c.c.        + q p.p.e.' ( ( U L A r.*. 4 %         c.c.c.c.",
+	"c.c.c.c.            ; r.i.<.) / I C s.h.%.&   X         c.c.c.c.",
+	"c.c.c.c.          X %.x.x.x.d.^ P a.h.g.s.*.&             c.c.c.",
+	"c.c.            X *.x.x.x.x.x.8.1.k.s.p.u.p.*.%   X       c.c.c.",
+	"c.    X X X X    x.x.x.x.x.x.k.h.g.i.u.r.w.e...o X   X X     c.",
+	"    o o o o X 4 l.x.x.x.x.x.j.j.g.p.u.r.w.=.=.=.8     X o X     ",
+	"  X X o o + X X.x.x.x.x.x.l.j.g.p.u.r.e.w.=.*.*...o X X         ",
+	"          + * h.x.x.x.l.l.j.g.p.t.r.e.w.=.*.&.%.%.5 +           ",
+	"c.c.c.c.  o e x.x.x.x.l.j.s.p.u.r.w.-.=.*.&.%.%.@.e %   c.c.c.c.",
+	"c.c.c.c.  o &.x.x.x.l.h.g.p.u.r.y.=.=.*.&.%.%.X... %   c.c.c.c.",
+	"c.c.c.c.  X r.x.x.l.j.s.a.i.t.e.;.=.*.&.&.O.....} } +   c.c.c.c.",
+	"c.c.c.c.c.X s.x.l.j.g.p.u.r.e.;.*.*.&.%.O.X.....} } +   c.c.c.c.",
+	"c.c.c.c.c.X p.x.h.g.p.i.r.e.-.=.*.&.&.@.......} } 8   c.c.c.c.c.",
+	"c.c.c.c.c.c.6 h.s.p.u.r.e.-.=.*.&.%.o.X.....  t o   c.c.c.c.c.",
+	"c.c.c.c.c.c.c.9 t.r.;.;.-.=.*.&.%.o.X...{  r w O   c.c.c.c.c.c.",
+	"c.c.c.c.c.c.u 2 #.,.:.$.@.o.O.X.X.|  f c v $.v 0 p : c.c.c.c.c.",
+	"c.c.c.c.1 V 4.0.0.0.9.9.3.Z x | } t s S 5.7.7.q.q.7.2.l @ c.c.c.",
+	"c.c.c.  m E ` _ _ _ W _ ` T N }  .d B R E E E E E E W Y a   c.c.",
+	"c.c.c.  i U U U ~ U ~ U U U a - = $ j U ~ ~ ~ ~ ~ ~ U K ,   c.c.",
+	"c.c.c.c.  > k D J Q J F k <       c.  > g M G H D z 3 #   c.c.c.",
+	"c.c.c.c.c.c.    . . . .     c.c.c.c.c.c.    . .         c.c.c.c.",
+	"c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c."
+};
 #endif /* !__WINDOWS__ */
 
-const char *
-AlcPix::m_copy_xpm=
-  { /* XPM */
-    /* columns rows colors chars-per-pixel */
-    "32 32 258 2",
-    "  	c None",
-    ". 	c #F8F1E4",
-    "+ 	c #EAD097",
-    "@ 	c #9F8753",
-    "# 	c #CE920B",
-    "$ 	c #865F07",
-    "% 	c #F1E2C0",
-    "& 	c #F9F5EF",
-    "* 	c #583E04",
-    "= 	c #634504",
-    "- 	c #E0BD6D",
-    "; 	c #785505",
-    "> 	c #CAD7CA",
-    ", 	c #C8D5C8",
-    "' 	c #D5DED5",
-    ") 	c #B0B9B0",
-    "! 	c #788378",
-    "~ 	c #768576",
-    "{ 	c #576657",
-    " 	c #374237",
-    "^ 	c #C9D6C9",
-    "/ 	c #E0E9E0",
-    "( 	c #B4BDB4",
-    "_ 	c #465546",
-    ": 	c #344334",
-    "< 	c #394839",
-    " 	c #9FB29F",
-    "} 	c #96A996",
-    "| 	c #7F907F",
-    "1 	c #6C796C",
-    "2 	c #516051",
-    "3 	c #2C372C",
-    "4 	c #C6D5C6",
-    "5 	c #D7E0D7",
-    "6 	c #B3BCB3",
-    "7 	c #798479",
-    "8 	c #374637",
-    "9 	c #364536",
-    "0 	c #324132",
-    "a 	c #475847",
-    "b 	c #80682F",
-    "c 	c #A2AD97",
-    "d 	c #A89478",
-    "e 	c #9A896F",
-    "f 	c #89967F",
-    "g 	c #7F947F",
-    "h 	c #7A897A",
-    "i 	c #6B7A6B",
-    "j 	c #596859",
-    "k 	c #374437",
-    "l 	c #B0BBB0",
-    "m 	c #ABB6AB",
-    "n 	c #C7D0C7",
-    "o 	c #939E93",
-    "p 	c #576457",
-    "q 	c #3D4C3D",
-    "r 	c #3C4B3C",
-    "s 	c #3A493A",
-    "t 	c #344040",
-    "u 	c #3C3D74",
-    "v 	c #3E4A4B",
-    "w 	c #8F917B",
-    "x 	c #BC7A57",
-    "y 	c #D7683F",
-    "z 	c #BB4E21",
-    "A 	c #935834",
-    "B 	c #7A7F67",
-    "C 	c #687D68",
-    "D 	c #6F826F",
-    "E 	c #728372",
-    "F 	c #606F60",
-    "G 	c #212A21",
-    "H 	c #A6B9A6",
-    "I 	c #B1BEB1",
-    "J 	c #808B80",
-    "K 	c #5B685B",
-    "L 	c #4D5C4D",
-    "M 	c #3E4B4F",
-    "N 	c #28295F",
-    "O 	c #272372",
-    "P 	c #363070",
-    "Q 	c #272551",
-    "R 	c #7F4B35",
-    "S 	c #D06E47",
-    "T 	c #EE8C6A",
-    "U 	c #CF592E",
-    "V 	c #9D3508",
-    "W 	c #864F2B",
-    "X 	c #5E735E",
-    "Y 	c #708370",
-    "Z 	c #8C9D8C",
-    "` 	c #323D32",
-    " .	c #ACBDAC",
-    "..	c #D8E1D8",
-    "+.	c #D9E2D9",
-    "@.	c #CBD6CB",
-    "#.	c #AAB7AA",
-    "$.	c #5D6771",
-    "%.	c #2A2D63",
-    "&.	c #171264",
-    "*.	c #1F1A5E",
-    "=.	c #1D1A45",
-    "-.	c #181631",
-    ";.	c #62260D",
-    ">.	c #A0512F",
-    ",.	c #D06D3F",
-    "'.	c #B64D1C",
-    ").	c #8B451F",
-    "!.	c #836E53",
-    "~.	c #889988",
-    "{.	c #657665",
-    ".	c #5D6C5D",
-    "^.	c #A9BEA9",
-    "/.	c #D5E0D5",
-    "(.	c #E1E8E1",
-    "_.	c #E3EAE3",
-    ":.	c #DBE4DB",
-    "<.	c #D2DDD2",
-    ".	c #C1D0C1",
-    "}.	c #9DAC9D",
-    "|.	c #58636F",
-    "1.	c #323463",
-    "2.	c #1D1A46",
-    "3.	c #110E24",
-    "4.	c #32190C",
-    "5.	c #4F220B",
-    "6.	c #7F4D2A",
-    "7.	c #7F7157",
-    "8.	c #90A190",
-    "9.	c #7A8B7A",
-    "0.	c #697A69",
-    "a.	c #586758",
-    "b.	c #232C23",
-    "c.	c #A0B5A0",
-    "d.	c #E2E9E2",
-    "e.	c #DCE5DC",
-    "f.	c #D4DFD4",
-    "g.	c #BFD0BF",
-    "h.	c #B2C3B2",
-    "i.	c #94A499",
-    "j.	c #515A67",
-    "k.	c #2D2F48",
-    "l.	c #3A392E",
-    "m.	c #6E6A56",
-    "n.	c #919E8A",
-    "o.	c #889B88",
-    "p.	c #6A7D6A",
-    "q.	c #677867",
-    "r.	c #637463",
-    "s.	c #5E6E5E",
-    "t.	c #5B6A5B",
-    "u.	c #5F705F",
-    "v.	c #283328",
-    "w.	c #AFBCAF",
-    "x.	c #D0DBD0",
-    "y.	c #BBCCBB",
-    "z.	c #B7C8B7",
-    "A.	c #495649",
-    "B.	c #ABBAAB",
-    "C.	c #8B9E8B",
-    "D.	c #7A8F7A",
-    "E.	c #778A77",
-    "F.	c #718471",
-    "G.	c #667766",
-    "H.	c #647564",
-    "I.	c #617261",
-    "J.	c #3B483B",
-    "K.	c #1E251E",
-    "L.	c #B2BFB2",
-    "M.	c #C3CEC3",
-    "N.	c #C3D0C3",
-    "O.	c #BDCEBD",
-    "P.	c #B5C6B5",
-    "Q.	c #AABBAA",
-    "R.	c #3D4A3D",
-    "S.	c #627162",
-    "T.	c #525D52",
-    "U.	c #8B9A8B",
-    "V.	c #788B78",
-    "W.	c #768976",
-    "X.	c #6B7E6B",
-    "Y.	c #384538",
-    "Z.	c #141B15",
-    "`.	c #485548",
-    " +	c #95A295",
-    ".+	c #ACBBAC",
-    "++	c #AFC0AF",
-    "@+	c #9CAB9C",
-    "#+	c #354035",
-    "$+	c #505D50",
-    "%+	c #728572",
-    "&+	c #4F5E4F",
-    "*+	c #444D44",
-    "=+	c #869386",
-    "-+	c #394639",
-    ";+	c #192019",
-    ">+	c #333E33",
-    ",+	c #5F6E5F",
-    "'+	c #334033",
-    ")+	c #4B584B",
-    "!+	c #8C9B8C",
-    "~+	c #343F34",
-    "{+	c #4A554A",
-    "+	c #505F50",
-    "^+	c #495249",
-    "/+	c #818E81",
-    "(+	c #3F4D3E",
-    "_+	c #394439",
-    ":+	c #3F4C3F",
-    "<+	c #6C7F6C",
-    "+	c #798C79",
-    "}+	c #516251",
-    "|+	c #3F463F",
-    "1+	c #3C493C",
-    "2+	c #414E41",
-    "3+	c #768574",
-    "4+	c #889D86",
-    "5+	c #819681",
-    "6+	c #6D806D",
-    "7+	c #657865",
-    "8+	c #809580",
-    "9+	c #556655",
-    "0+	c #546354",
-    "a+	c #4B5A4B",
-    "b+	c #465346",
-    "c+	c #3E4B3E",
-    "d+	c #4D5A4D",
-    "e+	c #566354",
-    "f+	c #7C8C79",
-    "g+	c #819580",
-    "h+	c #859C85",
-    "i+	c #5A6B5A",
-    "j+	c #566756",
-    "k+	c #526152",
-    "l+	c #4C5B4C",
-    "m+	c #485748",
-    "n+	c #434E43",
-    "o+	c #333C33",
-    "p+	c #5D6D5C",
-    "q+	c #7B8B78",
-    "r+	c #7E937E",
-    "s+	c #8AA18A",
-    "t+	c #5D6E5D",
-    "u+	c #5B6C5B",
-    "v+	c #536453",
-    "w+	c #536253",
-    "x+	c #3A473A",
-    "y+	c #556354",
-    "z+	c #778877",
-    "A+	c #869C85",
-    "B+	c #91A891",
-    "C+	c #607160",
-    "D+	c #566556",
-    "E+	c #3B463B",
-    "F+	c #5A6A59",
-    "G+	c #859782",
-    "H+	c #5C6B5C",
-    "I+	c #415041",
-    "                                                                ",
-    "                                                                ",
-    "                                                                ",
-    "                            . + + + @                           ",
-    "                            + # # # $                           ",
-    "                            + # # # $                           ",
-    "                            + # # # $                           ",
-    "                            + # # # $                           ",
-    "                            + # # # $                           ",
-    "                      % + + & # # # * $ $ =                     ",
-    "                        - # # # # # # # ;                       ",
-    "                        > - # # # # # ;                         ",
-    "                    , ' ) ! - # # # ; ~ {                      ",
-    "                ^ / ( ! _ : < - # ;  } | 1 2 3                 ",
-    "            4 5 6 7 8 9 : 0 8 a b c d e f g h i j k             ",
-    "        l m n o p q r 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 `             ",
-    "           ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.| {..G           ",
-    "        ^./.(._.:.<..}.|.1.2.3.4.5.6.7.8.9.0.{..a.j b.        ",
-    "      c.> /.(.d.e.f.4 g.h.i.j.k.l.m.n.o.D p.q.r.s.t.u.{.v.      ",
-    "        .w.f.5 /.x.4 g.y.z. .A.B.C.D.E.F.p.q.G.H.I.J.K.        ",
-    "            .L.M.N..O.P.Q.R.S.T.U.V.W.F.X.G.G.Y.Z.            ",
-    "               `. +.+++@+#+$+%+&+*+=+F.X.r.-+;+>+              ",
-    "              1 ,+'+)+!+~+{+u.%+L +^+/+(+;+_+:+R.              ",
-    "              | W.<+u.'+`.j {.+}+2 A.|+` 1+J.2+2+              ",
-    "              3+4+5+6+7+{.r.0.8+9+0+a+b+:+c+:+`.d+              ",
-    "                e+f+g+D.W.%+D h+i+j+k+l+m+l+n+o+                ",
-    "                    p+q+5+g r+s+t+u+j+v+w+x+                    ",
-    "                        y+z+A+B+t+C+D+E+                        ",
-    "                            F+G+H+I+                            ",
-    "                                                                ",
-    "                                                                "
-  };
+const char *AlcPix::m_copy_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 258 2",
+	"  	c None",
+	". 	c #F8F1E4",
+	"+ 	c #EAD097",
+	"@ 	c #9F8753",
+	"# 	c #CE920B",
+	"$ 	c #865F07",
+	"% 	c #F1E2C0",
+	"& 	c #F9F5EF",
+	"* 	c #583E04",
+	"= 	c #634504",
+	"- 	c #E0BD6D",
+	"; 	c #785505",
+	"> 	c #CAD7CA",
+	", 	c #C8D5C8",
+	"' 	c #D5DED5",
+	") 	c #B0B9B0",
+	"! 	c #788378",
+	"~ 	c #768576",
+	"{ 	c #576657",
+	" 	c #374237",
+	"^ 	c #C9D6C9",
+	"/ 	c #E0E9E0",
+	"( 	c #B4BDB4",
+	"_ 	c #465546",
+	": 	c #344334",
+	"< 	c #394839",
+	" 	c #9FB29F",
+	"} 	c #96A996",
+	"| 	c #7F907F",
+	"1 	c #6C796C",
+	"2 	c #516051",
+	"3 	c #2C372C",
+	"4 	c #C6D5C6",
+	"5 	c #D7E0D7",
+	"6 	c #B3BCB3",
+	"7 	c #798479",
+	"8 	c #374637",
+	"9 	c #364536",
+	"0 	c #324132",
+	"a 	c #475847",
+	"b 	c #80682F",
+	"c 	c #A2AD97",
+	"d 	c #A89478",
+	"e 	c #9A896F",
+	"f 	c #89967F",
+	"g 	c #7F947F",
+	"h 	c #7A897A",
+	"i 	c #6B7A6B",
+	"j 	c #596859",
+	"k 	c #374437",
+	"l 	c #B0BBB0",
+	"m 	c #ABB6AB",
+	"n 	c #C7D0C7",
+	"o 	c #939E93",
+	"p 	c #576457",
+	"q 	c #3D4C3D",
+	"r 	c #3C4B3C",
+	"s 	c #3A493A",
+	"t 	c #344040",
+	"u 	c #3C3D74",
+	"v 	c #3E4A4B",
+	"w 	c #8F917B",
+	"x 	c #BC7A57",
+	"y 	c #D7683F",
+	"z 	c #BB4E21",
+	"A 	c #935834",
+	"B 	c #7A7F67",
+	"C 	c #687D68",
+	"D 	c #6F826F",
+	"E 	c #728372",
+	"F 	c #606F60",
+	"G 	c #212A21",
+	"H 	c #A6B9A6",
+	"I 	c #B1BEB1",
+	"J 	c #808B80",
+	"K 	c #5B685B",
+	"L 	c #4D5C4D",
+	"M 	c #3E4B4F",
+	"N 	c #28295F",
+	"O 	c #272372",
+	"P 	c #363070",
+	"Q 	c #272551",
+	"R 	c #7F4B35",
+	"S 	c #D06E47",
+	"T 	c #EE8C6A",
+	"U 	c #CF592E",
+	"V 	c #9D3508",
+	"W 	c #864F2B",
+	"X 	c #5E735E",
+	"Y 	c #708370",
+	"Z 	c #8C9D8C",
+	"` 	c #323D32",
+	" .	c #ACBDAC",
+	"..	c #D8E1D8",
+	"+.	c #D9E2D9",
+	"@.	c #CBD6CB",
+	"#.	c #AAB7AA",
+	"$.	c #5D6771",
+	"%.	c #2A2D63",
+	"&.	c #171264",
+	"*.	c #1F1A5E",
+	"=.	c #1D1A45",
+	"-.	c #181631",
+	";.	c #62260D",
+	">.	c #A0512F",
+	",.	c #D06D3F",
+	"'.	c #B64D1C",
+	").	c #8B451F",
+	"!.	c #836E53",
+	"~.	c #889988",
+	"{.	c #657665",
+	".	c #5D6C5D",
+	"^.	c #A9BEA9",
+	"/.	c #D5E0D5",
+	"(.	c #E1E8E1",
+	"_.	c #E3EAE3",
+	":.	c #DBE4DB",
+	"<.	c #D2DDD2",
+	".	c #C1D0C1",
+	"}.	c #9DAC9D",
+	"|.	c #58636F",
+	"1.	c #323463",
+	"2.	c #1D1A46",
+	"3.	c #110E24",
+	"4.	c #32190C",
+	"5.	c #4F220B",
+	"6.	c #7F4D2A",
+	"7.	c #7F7157",
+	"8.	c #90A190",
+	"9.	c #7A8B7A",
+	"0.	c #697A69",
+	"a.	c #586758",
+	"b.	c #232C23",
+	"c.	c #A0B5A0",
+	"d.	c #E2E9E2",
+	"e.	c #DCE5DC",
+	"f.	c #D4DFD4",
+	"g.	c #BFD0BF",
+	"h.	c #B2C3B2",
+	"i.	c #94A499",
+	"j.	c #515A67",
+	"k.	c #2D2F48",
+	"l.	c #3A392E",
+	"m.	c #6E6A56",
+	"n.	c #919E8A",
+	"o.	c #889B88",
+	"p.	c #6A7D6A",
+	"q.	c #677867",
+	"r.	c #637463",
+	"s.	c #5E6E5E",
+	"t.	c #5B6A5B",
+	"u.	c #5F705F",
+	"v.	c #283328",
+	"w.	c #AFBCAF",
+	"x.	c #D0DBD0",
+	"y.	c #BBCCBB",
+	"z.	c #B7C8B7",
+	"A.	c #495649",
+	"B.	c #ABBAAB",
+	"C.	c #8B9E8B",
+	"D.	c #7A8F7A",
+	"E.	c #778A77",
+	"F.	c #718471",
+	"G.	c #667766",
+	"H.	c #647564",
+	"I.	c #617261",
+	"J.	c #3B483B",
+	"K.	c #1E251E",
+	"L.	c #B2BFB2",
+	"M.	c #C3CEC3",
+	"N.	c #C3D0C3",
+	"O.	c #BDCEBD",
+	"P.	c #B5C6B5",
+	"Q.	c #AABBAA",
+	"R.	c #3D4A3D",
+	"S.	c #627162",
+	"T.	c #525D52",
+	"U.	c #8B9A8B",
+	"V.	c #788B78",
+	"W.	c #768976",
+	"X.	c #6B7E6B",
+	"Y.	c #384538",
+	"Z.	c #141B15",
+	"`.	c #485548",
+	" +	c #95A295",
+	".+	c #ACBBAC",
+	"++	c #AFC0AF",
+	"@+	c #9CAB9C",
+	"#+	c #354035",
+	"$+	c #505D50",
+	"%+	c #728572",
+	"&+	c #4F5E4F",
+	"*+	c #444D44",
+	"=+	c #869386",
+	"-+	c #394639",
+	";+	c #192019",
+	">+	c #333E33",
+	",+	c #5F6E5F",
+	"'+	c #334033",
+	")+	c #4B584B",
+	"!+	c #8C9B8C",
+	"~+	c #343F34",
+	"{+	c #4A554A",
+	"+	c #505F50",
+	"^+	c #495249",
+	"/+	c #818E81",
+	"(+	c #3F4D3E",
+	"_+	c #394439",
+	":+	c #3F4C3F",
+	"<+	c #6C7F6C",
+	"+	c #798C79",
+	"}+	c #516251",
+	"|+	c #3F463F",
+	"1+	c #3C493C",
+	"2+	c #414E41",
+	"3+	c #768574",
+	"4+	c #889D86",
+	"5+	c #819681",
+	"6+	c #6D806D",
+	"7+	c #657865",
+	"8+	c #809580",
+	"9+	c #556655",
+	"0+	c #546354",
+	"a+	c #4B5A4B",
+	"b+	c #465346",
+	"c+	c #3E4B3E",
+	"d+	c #4D5A4D",
+	"e+	c #566354",
+	"f+	c #7C8C79",
+	"g+	c #819580",
+	"h+	c #859C85",
+	"i+	c #5A6B5A",
+	"j+	c #566756",
+	"k+	c #526152",
+	"l+	c #4C5B4C",
+	"m+	c #485748",
+	"n+	c #434E43",
+	"o+	c #333C33",
+	"p+	c #5D6D5C",
+	"q+	c #7B8B78",
+	"r+	c #7E937E",
+	"s+	c #8AA18A",
+	"t+	c #5D6E5D",
+	"u+	c #5B6C5B",
+	"v+	c #536453",
+	"w+	c #536253",
+	"x+	c #3A473A",
+	"y+	c #556354",
+	"z+	c #778877",
+	"A+	c #869C85",
+	"B+	c #91A891",
+	"C+	c #607160",
+	"D+	c #566556",
+	"E+	c #3B463B",
+	"F+	c #5A6A59",
+	"G+	c #859782",
+	"H+	c #5C6B5C",
+	"I+	c #415041",
+	"                                                                ",
+	"                                                                ",
+	"                                                                ",
+	"                            . + + + @                           ",
+	"                            + # # # $                           ",
+	"                            + # # # $                           ",
+	"                            + # # # $                           ",
+	"                            + # # # $                           ",
+	"                            + # # # $                           ",
+	"                      % + + & # # # * $ $ =                     ",
+	"                        - # # # # # # # ;                       ",
+	"                        > - # # # # # ;                         ",
+	"                    , ' ) ! - # # # ; ~ {                      ",
+	"                ^ / ( ! _ : < - # ;  } | 1 2 3                 ",
+	"            4 5 6 7 8 9 : 0 8 a b c d e f g h i j k             ",
+	"        l m n o p q r 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 `             ",
+	"           ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.| {..G           ",
+	"        ^./.(._.:.<..}.|.1.2.3.4.5.6.7.8.9.0.{..a.j b.        ",
+	"      c.> /.(.d.e.f.4 g.h.i.j.k.l.m.n.o.D p.q.r.s.t.u.{.v.      ",
+	"        .w.f.5 /.x.4 g.y.z. .A.B.C.D.E.F.p.q.G.H.I.J.K.        ",
+	"            .L.M.N..O.P.Q.R.S.T.U.V.W.F.X.G.G.Y.Z.            ",
+	"               `. +.+++@+#+$+%+&+*+=+F.X.r.-+;+>+              ",
+	"              1 ,+'+)+!+~+{+u.%+L +^+/+(+;+_+:+R.              ",
+	"              | W.<+u.'+`.j {.+}+2 A.|+` 1+J.2+2+              ",
+	"              3+4+5+6+7+{.r.0.8+9+0+a+b+:+c+:+`.d+              ",
+	"                e+f+g+D.W.%+D h+i+j+k+l+m+l+n+o+                ",
+	"                    p+q+5+g r+s+t+u+j+v+w+x+                    ",
+	"                        y+z+A+B+t+C+D+E+                        ",
+	"                            F+G+H+I+                            ",
+	"                                                                ",
+	"                                                                "
+};
 
-const char *
-AlcPix::m_open_xpm=
-  { /* XPM */
-    /* columns rows colors chars-per-pixel */
-    "32 32 258 2",
-    "  	c None",
-    ". 	c #CAADA4",
-    "+ 	c #B08476",
-    "@ 	c #884631",
-    "# 	c #6E3827",
-    "$ 	c #3D1F15",
-    "% 	c #522A1D",
-    "& 	c #5F3122",
-    "* 	c #B2887A",
-    "= 	c #B68E81",
-    "- 	c #CAD7CA",
-    "; 	c #DFE8DF",
-    "> 	c #2A352A",
-    ", 	c #C8D5C8",
-    "' 	c #D5DED5",
-    ") 	c #B0B9B0",
-    "! 	c #788378",
-    "~ 	c #768576",
-    "{ 	c #576657",
-    " 	c #374237",
-    "^ 	c #C9D6C9",
-    "/ 	c #E0E9E0",
-    "( 	c #B4BDB4",
-    "_ 	c #465546",
-    ": 	c #344334",
-    "< 	c #8A6559",
-    " 	c #3E1F15",
-    "} 	c #96A996",
-    "| 	c #7F907F",
-    "1 	c #6C796C",
-    "2 	c #516051",
-    "3 	c #2C372C",
-    "4 	c #C6D5C6",
-    "5 	c #D7E0D7",
-    "6 	c #B3BCB3",
-    "7 	c #798479",
-    "8 	c #374637",
-    "9 	c #364536",
-    "0 	c #324132",
-    "a 	c #475847",
-    "b 	c #9AAD9A",
-    "c 	c #A2AD97",
-    "d 	c #A89478",
-    "e 	c #9A896F",
-    "f 	c #89967F",
-    "g 	c #7F947F",
-    "h 	c #7A897A",
-    "i 	c #6B7A6B",
-    "j 	c #596859",
-    "k 	c #374437",
-    "l 	c #B0BBB0",
-    "m 	c #ABB6AB",
-    "n 	c #C7D0C7",
-    "o 	c #939E93",
-    "p 	c #576457",
-    "q 	c #3D4C3D",
-    "r 	c #3C4B3C",
-    "s 	c #3A493A",
-    "t 	c #344040",
-    "u 	c #3C3D74",
-    "v 	c #3E4A4B",
-    "w 	c #8F917B",
-    "x 	c #BC7A57",
-    "y 	c #D7683F",
-    "z 	c #BB4E21",
-    "A 	c #935834",
-    "B 	c #7A7F67",
-    "C 	c #687D68",
-    "D 	c #6F826F",
-    "E 	c #728372",
-    "F 	c #606F60",
-    "G 	c #212A21",
-    "H 	c #A6B9A6",
-    "I 	c #B1BEB1",
-    "J 	c #808B80",
-    "K 	c #5B685B",
-    "L 	c #4D5C4D",
-    "M 	c #3E4B4F",
-    "N 	c #28295F",
-    "O 	c #272372",
-    "P 	c #363070",
-    "Q 	c #272551",
-    "R 	c #7F4B35",
-    "S 	c #D06E47",
-    "T 	c #EE8C6A",
-    "U 	c #CF592E",
-    "V 	c #9D3508",
-    "W 	c #864F2B",
-    "X 	c #5E735E",
-    "Y 	c #708370",
-    "Z 	c #8C9D8C",
-    "` 	c #323D32",
-    " .	c #ACBDAC",
-    "..	c #D8E1D8",
-    "+.	c #D9E2D9",
-    "@.	c #CBD6CB",
-    "#.	c #AAB7AA",
-    "$.	c #5D6771",
-    "%.	c #2A2D63",
-    "&.	c #171264",
-    "*.	c #1F1A5E",
-    "=.	c #1D1A45",
-    "-.	c #181631",
-    ";.	c #62260D",
-    ">.	c #A0512F",
-    ",.	c #D06D3F",
-    "'.	c #B64D1C",
-    ").	c #8B451F",
-    "!.	c #836E53",
-    "~.	c #889988",
-    "{.	c #657665",
-    ".	c #5D6C5D",
-    "^.	c #A9BEA9",
-    "/.	c #D5E0D5",
-    "(.	c #E1E8E1",
-    "_.	c #E3EAE3",
-    ":.	c #DBE4DB",
-    "<.	c #D2DDD2",
-    ".	c #C1D0C1",
-    "}.	c #9DAC9D",
-    "|.	c #58636F",
-    "1.	c #323463",
-    "2.	c #1D1A46",
-    "3.	c #110E24",
-    "4.	c #32190C",
-    "5.	c #4F220B",
-    "6.	c #7F4D2A",
-    "7.	c #7F7157",
-    "8.	c #90A190",
-    "9.	c #7A8B7A",
-    "0.	c #697A69",
-    "a.	c #586758",
-    "b.	c #232C23",
-    "c.	c #A0B5A0",
-    "d.	c #E2E9E2",
-    "e.	c #DCE5DC",
-    "f.	c #D4DFD4",
-    "g.	c #BFD0BF",
-    "h.	c #B2C3B2",
-    "i.	c #94A499",
-    "j.	c #515A67",
-    "k.	c #2D2F48",
-    "l.	c #3A392E",
-    "m.	c #6E6A56",
-    "n.	c #919E8A",
-    "o.	c #889B88",
-    "p.	c #6A7D6A",
-    "q.	c #677867",
-    "r.	c #637463",
-    "s.	c #5E6E5E",
-    "t.	c #5B6A5B",
-    "u.	c #5F705F",
-    "v.	c #283328",
-    "w.	c #AFBCAF",
-    "x.	c #D0DBD0",
-    "y.	c #BBCCBB",
-    "z.	c #B7C8B7",
-    "A.	c #495649",
-    "B.	c #ABBAAB",
-    "C.	c #8B9E8B",
-    "D.	c #7A8F7A",
-    "E.	c #778A77",
-    "F.	c #718471",
-    "G.	c #667766",
-    "H.	c #647564",
-    "I.	c #617261",
-    "J.	c #3B483B",
-    "K.	c #1E251E",
-    "L.	c #B2BFB2",
-    "M.	c #C3CEC3",
-    "N.	c #C3D0C3",
-    "O.	c #BDCEBD",
-    "P.	c #B5C6B5",
-    "Q.	c #AABBAA",
-    "R.	c #3D4A3D",
-    "S.	c #627162",
-    "T.	c #525D52",
-    "U.	c #8B9A8B",
-    "V.	c #788B78",
-    "W.	c #768976",
-    "X.	c #6B7E6B",
-    "Y.	c #384538",
-    "Z.	c #141B15",
-    "`.	c #485548",
-    " +	c #95A295",
-    ".+	c #ACBBAC",
-    "++	c #AFC0AF",
-    "@+	c #9CAB9C",
-    "#+	c #354035",
-    "$+	c #505D50",
-    "%+	c #728572",
-    "&+	c #4F5E4F",
-    "*+	c #444D44",
-    "=+	c #869386",
-    "-+	c #394639",
-    ";+	c #192019",
-    ">+	c #333E33",
-    ",+	c #5F6E5F",
-    "'+	c #334033",
-    ")+	c #4B584B",
-    "!+	c #8C9B8C",
-    "~+	c #343F34",
-    "{+	c #4A554A",
-    "+	c #505F50",
-    "^+	c #495249",
-    "/+	c #818E81",
-    "(+	c #3F4D3E",
-    "_+	c #394439",
-    ":+	c #3F4C3F",
-    "<+	c #6C7F6C",
-    "+	c #798C79",
-    "}+	c #516251",
-    "|+	c #3F463F",
-    "1+	c #3C493C",
-    "2+	c #414E41",
-    "3+	c #768574",
-    "4+	c #889D86",
-    "5+	c #819681",
-    "6+	c #6D806D",
-    "7+	c #657865",
-    "8+	c #809580",
-    "9+	c #556655",
-    "0+	c #546354",
-    "a+	c #4B5A4B",
-    "b+	c #465346",
-    "c+	c #3E4B3E",
-    "d+	c #4D5A4D",
-    "e+	c #566354",
-    "f+	c #7C8C79",
-    "g+	c #819580",
-    "h+	c #859C85",
-    "i+	c #5A6B5A",
-    "j+	c #566756",
-    "k+	c #526152",
-    "l+	c #4C5B4C",
-    "m+	c #485748",
-    "n+	c #434E43",
-    "o+	c #333C33",
-    "p+	c #5D6D5C",
-    "q+	c #7B8B78",
-    "r+	c #7E937E",
-    "s+	c #8AA18A",
-    "t+	c #5D6E5D",
-    "u+	c #5B6C5B",
-    "v+	c #536453",
-    "w+	c #536253",
-    "x+	c #3A473A",
-    "y+	c #556354",
-    "z+	c #778877",
-    "A+	c #869C85",
-    "B+	c #91A891",
-    "C+	c #607160",
-    "D+	c #566556",
-    "E+	c #3B463B",
-    "F+	c #5A6A59",
-    "G+	c #859782",
-    "H+	c #5C6B5C",
-    "I+	c #415041",
-    "                                                                ",
-    "                                                                ",
-    "                                .                               ",
-    "                              + @ #                             ",
-    "                            + @ @ @ #                           ",
-    "                          + @ @ @ @ @ #                         ",
-    "                        + @ @ @ @ @ @ @ #                       ",
-    "                      + @ @ @ @ @ @ $ % % &                     ",
-    "                            * @ @ @ %                           ",
-    "                            = @ @ @ %                           ",
-    "                            = @ @ @ %                           ",
-    "                        - ; = @ @ @ % >                         ",
-    "                    , ' ) ! = @ @ @ % ~ {                      ",
-    "                ^ / ( ! _ : < % % %  } | 1 2 3                 ",
-    "            4 5 6 7 8 9 : 0 8 a b c d e f g h i j k             ",
-    "        l m n o p q r 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 `             ",
-    "           ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.| {..G           ",
-    "        ^./.(._.:.<..}.|.1.2.3.4.5.6.7.8.9.0.{..a.j b.        ",
-    "      c.- /.(.d.e.f.4 g.h.i.j.k.l.m.n.o.D p.q.r.s.t.u.{.v.      ",
-    "        .w.f.5 /.x.4 g.y.z. .A.B.C.D.E.F.p.q.G.H.I.J.K.        ",
-    "            .L.M.N..O.P.Q.R.S.T.U.V.W.F.X.G.G.Y.Z.            ",
-    "               `. +.+++@+#+$+%+&+*+=+F.X.r.-+;+>+              ",
-    "              1 ,+'+)+!+~+{+u.%+L +^+/+(+;+_+:+R.              ",
-    "              | W.<+u.'+`.j {.+}+2 A.|+` 1+J.2+2+              ",
-    "              3+4+5+6+7+{.r.0.8+9+0+a+b+:+c+:+`.d+              ",
-    "                e+f+g+D.W.%+D h+i+j+k+l+m+l+n+o+                ",
-    "                    p+q+5+g r+s+t+u+j+v+w+x+                    ",
-    "                        y+z+A+B+t+C+D+E+                        ",
-    "                            F+G+H+I+                            ",
-    "                                                                ",
-    "                                                                "
-  };
+const char *AlcPix::m_open_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 258 2",
+	"  	c None",
+	". 	c #CAADA4",
+	"+ 	c #B08476",
+	"@ 	c #884631",
+	"# 	c #6E3827",
+	"$ 	c #3D1F15",
+	"% 	c #522A1D",
+	"& 	c #5F3122",
+	"* 	c #B2887A",
+	"= 	c #B68E81",
+	"- 	c #CAD7CA",
+	"; 	c #DFE8DF",
+	"> 	c #2A352A",
+	", 	c #C8D5C8",
+	"' 	c #D5DED5",
+	") 	c #B0B9B0",
+	"! 	c #788378",
+	"~ 	c #768576",
+	"{ 	c #576657",
+	" 	c #374237",
+	"^ 	c #C9D6C9",
+	"/ 	c #E0E9E0",
+	"( 	c #B4BDB4",
+	"_ 	c #465546",
+	": 	c #344334",
+	"< 	c #8A6559",
+	" 	c #3E1F15",
+	"} 	c #96A996",
+	"| 	c #7F907F",
+	"1 	c #6C796C",
+	"2 	c #516051",
+	"3 	c #2C372C",
+	"4 	c #C6D5C6",
+	"5 	c #D7E0D7",
+	"6 	c #B3BCB3",
+	"7 	c #798479",
+	"8 	c #374637",
+	"9 	c #364536",
+	"0 	c #324132",
+	"a 	c #475847",
+	"b 	c #9AAD9A",
+	"c 	c #A2AD97",
+	"d 	c #A89478",
+	"e 	c #9A896F",
+	"f 	c #89967F",
+	"g 	c #7F947F",
+	"h 	c #7A897A",
+	"i 	c #6B7A6B",
+	"j 	c #596859",
+	"k 	c #374437",
+	"l 	c #B0BBB0",
+	"m 	c #ABB6AB",
+	"n 	c #C7D0C7",
+	"o 	c #939E93",
+	"p 	c #576457",
+	"q 	c #3D4C3D",
+	"r 	c #3C4B3C",
+	"s 	c #3A493A",
+	"t 	c #344040",
+	"u 	c #3C3D74",
+	"v 	c #3E4A4B",
+	"w 	c #8F917B",
+	"x 	c #BC7A57",
+	"y 	c #D7683F",
+	"z 	c #BB4E21",
+	"A 	c #935834",
+	"B 	c #7A7F67",
+	"C 	c #687D68",
+	"D 	c #6F826F",
+	"E 	c #728372",
+	"F 	c #606F60",
+	"G 	c #212A21",
+	"H 	c #A6B9A6",
+	"I 	c #B1BEB1",
+	"J 	c #808B80",
+	"K 	c #5B685B",
+	"L 	c #4D5C4D",
+	"M 	c #3E4B4F",
+	"N 	c #28295F",
+	"O 	c #272372",
+	"P 	c #363070",
+	"Q 	c #272551",
+	"R 	c #7F4B35",
+	"S 	c #D06E47",
+	"T 	c #EE8C6A",
+	"U 	c #CF592E",
+	"V 	c #9D3508",
+	"W 	c #864F2B",
+	"X 	c #5E735E",
+	"Y 	c #708370",
+	"Z 	c #8C9D8C",
+	"` 	c #323D32",
+	" .	c #ACBDAC",
+	"..	c #D8E1D8",
+	"+.	c #D9E2D9",
+	"@.	c #CBD6CB",
+	"#.	c #AAB7AA",
+	"$.	c #5D6771",
+	"%.	c #2A2D63",
+	"&.	c #171264",
+	"*.	c #1F1A5E",
+	"=.	c #1D1A45",
+	"-.	c #181631",
+	";.	c #62260D",
+	">.	c #A0512F",
+	",.	c #D06D3F",
+	"'.	c #B64D1C",
+	").	c #8B451F",
+	"!.	c #836E53",
+	"~.	c #889988",
+	"{.	c #657665",
+	".	c #5D6C5D",
+	"^.	c #A9BEA9",
+	"/.	c #D5E0D5",
+	"(.	c #E1E8E1",
+	"_.	c #E3EAE3",
+	":.	c #DBE4DB",
+	"<.	c #D2DDD2",
+	".	c #C1D0C1",
+	"}.	c #9DAC9D",
+	"|.	c #58636F",
+	"1.	c #323463",
+	"2.	c #1D1A46",
+	"3.	c #110E24",
+	"4.	c #32190C",
+	"5.	c #4F220B",
+	"6.	c #7F4D2A",
+	"7.	c #7F7157",
+	"8.	c #90A190",
+	"9.	c #7A8B7A",
+	"0.	c #697A69",
+	"a.	c #586758",
+	"b.	c #232C23",
+	"c.	c #A0B5A0",
+	"d.	c #E2E9E2",
+	"e.	c #DCE5DC",
+	"f.	c #D4DFD4",
+	"g.	c #BFD0BF",
+	"h.	c #B2C3B2",
+	"i.	c #94A499",
+	"j.	c #515A67",
+	"k.	c #2D2F48",
+	"l.	c #3A392E",
+	"m.	c #6E6A56",
+	"n.	c #919E8A",
+	"o.	c #889B88",
+	"p.	c #6A7D6A",
+	"q.	c #677867",
+	"r.	c #637463",
+	"s.	c #5E6E5E",
+	"t.	c #5B6A5B",
+	"u.	c #5F705F",
+	"v.	c #283328",
+	"w.	c #AFBCAF",
+	"x.	c #D0DBD0",
+	"y.	c #BBCCBB",
+	"z.	c #B7C8B7",
+	"A.	c #495649",
+	"B.	c #ABBAAB",
+	"C.	c #8B9E8B",
+	"D.	c #7A8F7A",
+	"E.	c #778A77",
+	"F.	c #718471",
+	"G.	c #667766",
+	"H.	c #647564",
+	"I.	c #617261",
+	"J.	c #3B483B",
+	"K.	c #1E251E",
+	"L.	c #B2BFB2",
+	"M.	c #C3CEC3",
+	"N.	c #C3D0C3",
+	"O.	c #BDCEBD",
+	"P.	c #B5C6B5",
+	"Q.	c #AABBAA",
+	"R.	c #3D4A3D",
+	"S.	c #627162",
+	"T.	c #525D52",
+	"U.	c #8B9A8B",
+	"V.	c #788B78",
+	"W.	c #768976",
+	"X.	c #6B7E6B",
+	"Y.	c #384538",
+	"Z.	c #141B15",
+	"`.	c #485548",
+	" +	c #95A295",
+	".+	c #ACBBAC",
+	"++	c #AFC0AF",
+	"@+	c #9CAB9C",
+	"#+	c #354035",
+	"$+	c #505D50",
+	"%+	c #728572",
+	"&+	c #4F5E4F",
+	"*+	c #444D44",
+	"=+	c #869386",
+	"-+	c #394639",
+	";+	c #192019",
+	">+	c #333E33",
+	",+	c #5F6E5F",
+	"'+	c #334033",
+	")+	c #4B584B",
+	"!+	c #8C9B8C",
+	"~+	c #343F34",
+	"{+	c #4A554A",
+	"+	c #505F50",
+	"^+	c #495249",
+	"/+	c #818E81",
+	"(+	c #3F4D3E",
+	"_+	c #394439",
+	":+	c #3F4C3F",
+	"<+	c #6C7F6C",
+	"+	c #798C79",
+	"}+	c #516251",
+	"|+	c #3F463F",
+	"1+	c #3C493C",
+	"2+	c #414E41",
+	"3+	c #768574",
+	"4+	c #889D86",
+	"5+	c #819681",
+	"6+	c #6D806D",
+	"7+	c #657865",
+	"8+	c #809580",
+	"9+	c #556655",
+	"0+	c #546354",
+	"a+	c #4B5A4B",
+	"b+	c #465346",
+	"c+	c #3E4B3E",
+	"d+	c #4D5A4D",
+	"e+	c #566354",
+	"f+	c #7C8C79",
+	"g+	c #819580",
+	"h+	c #859C85",
+	"i+	c #5A6B5A",
+	"j+	c #566756",
+	"k+	c #526152",
+	"l+	c #4C5B4C",
+	"m+	c #485748",
+	"n+	c #434E43",
+	"o+	c #333C33",
+	"p+	c #5D6D5C",
+	"q+	c #7B8B78",
+	"r+	c #7E937E",
+	"s+	c #8AA18A",
+	"t+	c #5D6E5D",
+	"u+	c #5B6C5B",
+	"v+	c #536453",
+	"w+	c #536253",
+	"x+	c #3A473A",
+	"y+	c #556354",
+	"z+	c #778877",
+	"A+	c #869C85",
+	"B+	c #91A891",
+	"C+	c #607160",
+	"D+	c #566556",
+	"E+	c #3B463B",
+	"F+	c #5A6A59",
+	"G+	c #859782",
+	"H+	c #5C6B5C",
+	"I+	c #415041",
+	"                                                                ",
+	"                                                                ",
+	"                                .                               ",
+	"                              + @ #                             ",
+	"                            + @ @ @ #                           ",
+	"                          + @ @ @ @ @ #                         ",
+	"                        + @ @ @ @ @ @ @ #                       ",
+	"                      + @ @ @ @ @ @ $ % % &                     ",
+	"                            * @ @ @ %                           ",
+	"                            = @ @ @ %                           ",
+	"                            = @ @ @ %                           ",
+	"                        - ; = @ @ @ % >                         ",
+	"                    , ' ) ! = @ @ @ % ~ {                      ",
+	"                ^ / ( ! _ : < % % %  } | 1 2 3                 ",
+	"            4 5 6 7 8 9 : 0 8 a b c d e f g h i j k             ",
+	"        l m n o p q r 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 `             ",
+	"           ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.| {..G           ",
+	"        ^./.(._.:.<..}.|.1.2.3.4.5.6.7.8.9.0.{..a.j b.        ",
+	"      c.- /.(.d.e.f.4 g.h.i.j.k.l.m.n.o.D p.q.r.s.t.u.{.v.      ",
+	"        .w.f.5 /.x.4 g.y.z. .A.B.C.D.E.F.p.q.G.H.I.J.K.        ",
+	"            .L.M.N..O.P.Q.R.S.T.U.V.W.F.X.G.G.Y.Z.            ",
+	"               `. +.+++@+#+$+%+&+*+=+F.X.r.-+;+>+              ",
+	"              1 ,+'+)+!+~+{+u.%+L +^+/+(+;+_+:+R.              ",
+	"              | W.<+u.'+`.j {.+}+2 A.|+` 1+J.2+2+              ",
+	"              3+4+5+6+7+{.r.0.8+9+0+a+b+:+c+:+`.d+              ",
+	"                e+f+g+D.W.%+D h+i+j+k+l+m+l+n+o+                ",
+	"                    p+q+5+g r+s+t+u+j+v+w+x+                    ",
+	"                        y+z+A+B+t+C+D+E+                        ",
+	"                            F+G+H+I+                            ",
+	"                                                                ",
+	"                                                                "
+};
 
-const char *
-AlcPix::m_saveas_xpm=
-  { /* XPM */
-    /* columns rows colors chars-per-pixel */
-    "32 32 251 2",
-    "  	c None",
-    ". 	c #DFE3DE",
-    "+ 	c #92A28D",
-    "@ 	c #97A692",
-    "# 	c #5D6A59",
-    "$ 	c #5D7555",
-    "% 	c #3B4A36",
-    "& 	c #9BAA96",
-    "* 	c #B0BCAC",
-    "= 	c #9CAB97",
-    "- 	c #A8B5A4",
-    "; 	c #C9D1C8",
-    "> 	c #303E2D",
-    ", 	c #374633",
-    "' 	c #788C71",
-    ") 	c #40503A",
-    "! 	c #CAD7CA",
-    "~ 	c #C8D5C8",
-    "{ 	c #D5DED5",
-    " 	c #B0B9B0",
-    "^ 	c #788378",
-    "/ 	c #768576",
-    "( 	c #576657",
-    "_ 	c #374237",
-    ": 	c #C9D6C9",
-    "< 	c #E0E9E0",
-    " 	c #B4BDB4",
-    "} 	c #465546",
-    "| 	c #344334",
-    "1 	c #394839",
-    "2 	c #9FB29F",
-    "3 	c #96A996",
-    "4 	c #7F907F",
-    "5 	c #6C796C",
-    "6 	c #516051",
-    "7 	c #2C372C",
-    "8 	c #C6D5C6",
-    "9 	c #D7E0D7",
-    "0 	c #B3BCB3",
-    "a 	c #798479",
-    "b 	c #374637",
-    "c 	c #364536",
-    "d 	c #354435",
-    "e 	c #334233",
-    "f 	c #384738",
-    "g 	c #485948",
-    "h 	c #444F40",
-    "i 	c #9EB19E",
-    "j 	c #9BAE9B",
-    "k 	c #94A794",
-    "l 	c #889D88",
-    "m 	c #7F947F",
-    "n 	c #7A897A",
-    "o 	c #6B7A6B",
-    "p 	c #596859",
-    "q 	c #374437",
-    "r 	c #B0BBB0",
-    "s 	c #ABB6AB",
-    "t 	c #C7D0C7",
-    "u 	c #939E93",
-    "v 	c #576457",
-    "w 	c #3D4C3D",
-    "x 	c #3C4B3C",
-    "y 	c #3B4A3B",
-    "z 	c #3E4D3E",
-    "A 	c #91A691",
-    "B 	c #8CA18C",
-    "C 	c #829582",
-    "D 	c #758A75",
-    "E 	c #687D68",
-    "F 	c #6F826F",
-    "G 	c #728372",
-    "H 	c #606F60",
-    "I 	c #212A21",
-    "J 	c #A6B9A6",
-    "K 	c #B1BEB1",
-    "L 	c #808B80",
-    "M 	c #5B685B",
-    "N 	c #4E5D4E",
-    "O 	c #4B5C4B",
-    "P 	c #4D5E4D",
-    "Q 	c #4C5C4C",
-    "R 	c #4A5B4A",
-    "S 	c #4E5F4E",
-    "T 	c #839883",
-    "U 	c #849984",
-    "V 	c #819681",
-    "W 	c #7C917C",
-    "X 	c #6F846F",
-    "Y 	c #637863",
-    "Z 	c #5E735E",
-    "` 	c #708370",
-    " .	c #8C9D8C",
-    "..	c #323D32",
-    "+.	c #ACBDAC",
-    "@.	c #D8E1D8",
-    "#.	c #D9E2D9",
-    "$.	c #CBD6CB",
-    "%.	c #AAB7AA",
-    "&.	c #717E71",
-    "*.	c #5D6C5D",
-    "=.	c #576857",
-    "-.	c #566756",
-    ";.	c #546554",
-    ">.	c #788D78",
-    ",.	c #778C77",
-    "'.	c #728772",
-    ").	c #6C816C",
-    "!.	c #778A77",
-    "~.	c #889988",
-    "{.	c #657665",
-    ".	c #A9BEA9",
-    "^.	c #D5E0D5",
-    "/.	c #E1E8E1",
-    "(.	c #E3EAE3",
-    "_.	c #DBE4DB",
-    ":.	c #D2DDD2",
-    "<.	c #C1D0C1",
-    ".	c #9DAC9D",
-    "}.	c #738473",
-    "|.	c #5F705F",
-    "1.	c #5B6C5B",
-    "2.	c #697E69",
-    "3.	c #667B66",
-    "4.	c #758875",
-    "5.	c #90A190",
-    "6.	c #7A8B7A",
-    "7.	c #697A69",
-    "8.	c #586758",
-    "9.	c #232C23",
-    "0.	c #A0B5A0",
-    "a.	c #E2E9E2",
-    "b.	c #DCE5DC",
-    "c.	c #D4DFD4",
-    "d.	c #BFD0BF",
-    "e.	c #B2C3B2",
-    "f.	c #9BAC9B",
-    "g.	c #6A796A",
-    "h.	c #5C6D5C",
-    "i.	c #607560",
-    "j.	c #7D907D",
-    "k.	c #92A592",
-    "l.	c #889B88",
-    "m.	c #6A7D6A",
-    "n.	c #677867",
-    "o.	c #637463",
-    "p.	c #5E6E5E",
-    "q.	c #5B6A5B",
-    "r.	c #283328",
-    "s.	c #AFBCAF",
-    "t.	c #D0DBD0",
-    "u.	c #BBCCBB",
-    "v.	c #B7C8B7",
-    "w.	c #495649",
-    "x.	c #ABBAAB",
-    "y.	c #8B9E8B",
-    "z.	c #7A8F7A",
-    "A.	c #718471",
-    "B.	c #667766",
-    "C.	c #647564",
-    "D.	c #617261",
-    "E.	c #3B483B",
-    "F.	c #1E251E",
-    "G.	c #B2BFB2",
-    "H.	c #C3CEC3",
-    "I.	c #C3D0C3",
-    "J.	c #BDCEBD",
-    "K.	c #B5C6B5",
-    "L.	c #AABBAA",
-    "M.	c #3D4A3D",
-    "N.	c #627162",
-    "O.	c #525D52",
-    "P.	c #8B9A8B",
-    "Q.	c #788B78",
-    "R.	c #768976",
-    "S.	c #6B7E6B",
-    "T.	c #384538",
-    "U.	c #141B15",
-    "V.	c #485548",
-    "W.	c #95A295",
-    "X.	c #ACBBAC",
-    "Y.	c #AFC0AF",
-    "Z.	c #9CAB9C",
-    "`.	c #354035",
-    " +	c #505D50",
-    ".+	c #728572",
-    "++	c #4F5E4F",
-    "@+	c #444D44",
-    "#+	c #869386",
-    "$+	c #394639",
-    "%+	c #192019",
-    "&+	c #333E33",
-    "*+	c #5F6E5F",
-    "=+	c #334033",
-    "-+	c #4B584B",
-    ";+	c #8C9B8C",
-    ">+	c #343F34",
-    ",+	c #4A554A",
-    "'+	c #4D5C4D",
-    ")+	c #505F50",
-    "!+	c #495249",
-    "~+	c #818E81",
-    "{+	c #3F4D3E",
-    "+	c #394439",
-    "^+	c #3F4C3F",
-    "/+	c #6C7F6C",
-    "(+	c #798C79",
-    "_+	c #516251",
-    ":+	c #3F463F",
-    "<+	c #3C493C",
-    "+	c #414E41",
-    "}+	c #768574",
-    "|+	c #889D86",
-    "1+	c #6D806D",
-    "2+	c #657865",
-    "3+	c #809580",
-    "4+	c #556655",
-    "5+	c #546354",
-    "6+	c #4B5A4B",
-    "7+	c #465346",
-    "8+	c #3E4B3E",
-    "9+	c #4D5A4D",
-    "0+	c #566354",
-    "a+	c #7C8C79",
-    "b+	c #819580",
-    "c+	c #859C85",
-    "d+	c #5A6B5A",
-    "e+	c #526152",
-    "f+	c #4C5B4C",
-    "g+	c #485748",
-    "h+	c #434E43",
-    "i+	c #333C33",
-    "j+	c #5D6D5C",
-    "k+	c #7B8B78",
-    "l+	c #7E937E",
-    "m+	c #8AA18A",
-    "n+	c #5D6E5D",
-    "o+	c #536453",
-    "p+	c #536253",
-    "q+	c #3A473A",
-    "r+	c #556354",
-    "s+	c #778877",
-    "t+	c #869C85",
-    "u+	c #91A891",
-    "v+	c #607160",
-    "w+	c #566556",
-    "x+	c #3B463B",
-    "y+	c #5A6A59",
-    "z+	c #859782",
-    "A+	c #5C6B5C",
-    "B+	c #415041",
-    "                                                                ",
-    "                                                                ",
-    "                                                                ",
-    "                            . + @ @ #                           ",
-    "                            @ $ $ $ %                           ",
-    "                            @ $ $ $ %                           ",
-    "                            @ $ $ $ %                           ",
-    "                            @ $ $ $ %                           ",
-    "                            & $ $ $ %                           ",
-    "                      * = - ; $ $ $ > % % ,                     ",
-    "                        ' $ $ $ $ $ $ $ )                       ",
-    "                        ! ' $ $ $ $ $ )                         ",
-    "                    ~ {  ^ ' $ $ $ ) / ( _                     ",
-    "                : <  ^ } | 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 w w y z g A k 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 `  ...            ",
-    "          +.@.#.$.%.&.*.=.-.;.;.>.,.'.).Z !.~.4 {.*.I           ",
-    "        .^./.(._.:.<..}.|.1.1.2.Y 3.4.5.6.7.{.*.8.p 9.        ",
-    "      0.! ^./.a.b.c.8 d.e.f.g.h.i.j.k.l.F m.n.o.p.q.|.{.r.      ",
-    "        *.s.c.9 ^.t.8 d.u.v.+.w.x.y.z.!.A.m.n.B.C.D.E.F.        ",
-    "            *.G.H.I.<.J.K.L.M.N.O.P.Q.R.A.S.B.B.T.U.            ",
-    "              _ V.W.X.Y.Z.`. +.+++@+#+A.S.o.$+%+&+              ",
-    "              5 *+=+-+;+>+,+|..+'+)+!+~+{+%++^+M.              ",
-    "              4 R./+|.=+V.p {.(+_+6 w.:+..<+E.++              ",
-    "              }+|+V 1+2+{.o.7.3+4+5+6+7+^+8+^+V.9+              ",
-    "                0+a+b+z.R..+F c+d+-.e+f+g+f+h+i+                ",
-    "                    j+k+V m l+m+n+1.-.o+p+q+                    ",
-    "                        r+s+t+u+n+v+w+x+                        ",
-    "                            y+z+A+B+                            ",
-    "                                                                ",
-    "                                                                "
-  };
+const char *AlcPix::m_saveas_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 251 2",
+	"  	c None",
+	". 	c #DFE3DE",
+	"+ 	c #92A28D",
+	"@ 	c #97A692",
+	"# 	c #5D6A59",
+	"$ 	c #5D7555",
+	"% 	c #3B4A36",
+	"& 	c #9BAA96",
+	"* 	c #B0BCAC",
+	"= 	c #9CAB97",
+	"- 	c #A8B5A4",
+	"; 	c #C9D1C8",
+	"> 	c #303E2D",
+	", 	c #374633",
+	"' 	c #788C71",
+	") 	c #40503A",
+	"! 	c #CAD7CA",
+	"~ 	c #C8D5C8",
+	"{ 	c #D5DED5",
+	" 	c #B0B9B0",
+	"^ 	c #788378",
+	"/ 	c #768576",
+	"( 	c #576657",
+	"_ 	c #374237",
+	": 	c #C9D6C9",
+	"< 	c #E0E9E0",
+	" 	c #B4BDB4",
+	"} 	c #465546",
+	"| 	c #344334",
+	"1 	c #394839",
+	"2 	c #9FB29F",
+	"3 	c #96A996",
+	"4 	c #7F907F",
+	"5 	c #6C796C",
+	"6 	c #516051",
+	"7 	c #2C372C",
+	"8 	c #C6D5C6",
+	"9 	c #D7E0D7",
+	"0 	c #B3BCB3",
+	"a 	c #798479",
+	"b 	c #374637",
+	"c 	c #364536",
+	"d 	c #354435",
+	"e 	c #334233",
+	"f 	c #384738",
+	"g 	c #485948",
+	"h 	c #444F40",
+	"i 	c #9EB19E",
+	"j 	c #9BAE9B",
+	"k 	c #94A794",
+	"l 	c #889D88",
+	"m 	c #7F947F",
+	"n 	c #7A897A",
+	"o 	c #6B7A6B",
+	"p 	c #596859",
+	"q 	c #374437",
+	"r 	c #B0BBB0",
+	"s 	c #ABB6AB",
+	"t 	c #C7D0C7",
+	"u 	c #939E93",
+	"v 	c #576457",
+	"w 	c #3D4C3D",
+	"x 	c #3C4B3C",
+	"y 	c #3B4A3B",
+	"z 	c #3E4D3E",
+	"A 	c #91A691",
+	"B 	c #8CA18C",
+	"C 	c #829582",
+	"D 	c #758A75",
+	"E 	c #687D68",
+	"F 	c #6F826F",
+	"G 	c #728372",
+	"H 	c #606F60",
+	"I 	c #212A21",
+	"J 	c #A6B9A6",
+	"K 	c #B1BEB1",
+	"L 	c #808B80",
+	"M 	c #5B685B",
+	"N 	c #4E5D4E",
+	"O 	c #4B5C4B",
+	"P 	c #4D5E4D",
+	"Q 	c #4C5C4C",
+	"R 	c #4A5B4A",
+	"S 	c #4E5F4E",
+	"T 	c #839883",
+	"U 	c #849984",
+	"V 	c #819681",
+	"W 	c #7C917C",
+	"X 	c #6F846F",
+	"Y 	c #637863",
+	"Z 	c #5E735E",
+	"` 	c #708370",
+	" .	c #8C9D8C",
+	"..	c #323D32",
+	"+.	c #ACBDAC",
+	"@.	c #D8E1D8",
+	"#.	c #D9E2D9",
+	"$.	c #CBD6CB",
+	"%.	c #AAB7AA",
+	"&.	c #717E71",
+	"*.	c #5D6C5D",
+	"=.	c #576857",
+	"-.	c #566756",
+	";.	c #546554",
+	">.	c #788D78",
+	",.	c #778C77",
+	"'.	c #728772",
+	").	c #6C816C",
+	"!.	c #778A77",
+	"~.	c #889988",
+	"{.	c #657665",
+	".	c #A9BEA9",
+	"^.	c #D5E0D5",
+	"/.	c #E1E8E1",
+	"(.	c #E3EAE3",
+	"_.	c #DBE4DB",
+	":.	c #D2DDD2",
+	"<.	c #C1D0C1",
+	".	c #9DAC9D",
+	"}.	c #738473",
+	"|.	c #5F705F",
+	"1.	c #5B6C5B",
+	"2.	c #697E69",
+	"3.	c #667B66",
+	"4.	c #758875",
+	"5.	c #90A190",
+	"6.	c #7A8B7A",
+	"7.	c #697A69",
+	"8.	c #586758",
+	"9.	c #232C23",
+	"0.	c #A0B5A0",
+	"a.	c #E2E9E2",
+	"b.	c #DCE5DC",
+	"c.	c #D4DFD4",
+	"d.	c #BFD0BF",
+	"e.	c #B2C3B2",
+	"f.	c #9BAC9B",
+	"g.	c #6A796A",
+	"h.	c #5C6D5C",
+	"i.	c #607560",
+	"j.	c #7D907D",
+	"k.	c #92A592",
+	"l.	c #889B88",
+	"m.	c #6A7D6A",
+	"n.	c #677867",
+	"o.	c #637463",
+	"p.	c #5E6E5E",
+	"q.	c #5B6A5B",
+	"r.	c #283328",
+	"s.	c #AFBCAF",
+	"t.	c #D0DBD0",
+	"u.	c #BBCCBB",
+	"v.	c #B7C8B7",
+	"w.	c #495649",
+	"x.	c #ABBAAB",
+	"y.	c #8B9E8B",
+	"z.	c #7A8F7A",
+	"A.	c #718471",
+	"B.	c #667766",
+	"C.	c #647564",
+	"D.	c #617261",
+	"E.	c #3B483B",
+	"F.	c #1E251E",
+	"G.	c #B2BFB2",
+	"H.	c #C3CEC3",
+	"I.	c #C3D0C3",
+	"J.	c #BDCEBD",
+	"K.	c #B5C6B5",
+	"L.	c #AABBAA",
+	"M.	c #3D4A3D",
+	"N.	c #627162",
+	"O.	c #525D52",
+	"P.	c #8B9A8B",
+	"Q.	c #788B78",
+	"R.	c #768976",
+	"S.	c #6B7E6B",
+	"T.	c #384538",
+	"U.	c #141B15",
+	"V.	c #485548",
+	"W.	c #95A295",
+	"X.	c #ACBBAC",
+	"Y.	c #AFC0AF",
+	"Z.	c #9CAB9C",
+	"`.	c #354035",
+	" +	c #505D50",
+	".+	c #728572",
+	"++	c #4F5E4F",
+	"@+	c #444D44",
+	"#+	c #869386",
+	"$+	c #394639",
+	"%+	c #192019",
+	"&+	c #333E33",
+	"*+	c #5F6E5F",
+	"=+	c #334033",
+	"-+	c #4B584B",
+	";+	c #8C9B8C",
+	">+	c #343F34",
+	",+	c #4A554A",
+	"'+	c #4D5C4D",
+	")+	c #505F50",
+	"!+	c #495249",
+	"~+	c #818E81",
+	"{+	c #3F4D3E",
+	"+	c #394439",
+	"^+	c #3F4C3F",
+	"/+	c #6C7F6C",
+	"(+	c #798C79",
+	"_+	c #516251",
+	":+	c #3F463F",
+	"<+	c #3C493C",
+	"+	c #414E41",
+	"}+	c #768574",
+	"|+	c #889D86",
+	"1+	c #6D806D",
+	"2+	c #657865",
+	"3+	c #809580",
+	"4+	c #556655",
+	"5+	c #546354",
+	"6+	c #4B5A4B",
+	"7+	c #465346",
+	"8+	c #3E4B3E",
+	"9+	c #4D5A4D",
+	"0+	c #566354",
+	"a+	c #7C8C79",
+	"b+	c #819580",
+	"c+	c #859C85",
+	"d+	c #5A6B5A",
+	"e+	c #526152",
+	"f+	c #4C5B4C",
+	"g+	c #485748",
+	"h+	c #434E43",
+	"i+	c #333C33",
+	"j+	c #5D6D5C",
+	"k+	c #7B8B78",
+	"l+	c #7E937E",
+	"m+	c #8AA18A",
+	"n+	c #5D6E5D",
+	"o+	c #536453",
+	"p+	c #536253",
+	"q+	c #3A473A",
+	"r+	c #556354",
+	"s+	c #778877",
+	"t+	c #869C85",
+	"u+	c #91A891",
+	"v+	c #607160",
+	"w+	c #566556",
+	"x+	c #3B463B",
+	"y+	c #5A6A59",
+	"z+	c #859782",
+	"A+	c #5C6B5C",
+	"B+	c #415041",
+	"                                                                ",
+	"                                                                ",
+	"                                                                ",
+	"                            . + @ @ #                           ",
+	"                            @ $ $ $ %                           ",
+	"                            @ $ $ $ %                           ",
+	"                            @ $ $ $ %                           ",
+	"                            @ $ $ $ %                           ",
+	"                            & $ $ $ %                           ",
+	"                      * = - ; $ $ $ > % % ,                     ",
+	"                        ' $ $ $ $ $ $ $ )                       ",
+	"                        ! ' $ $ $ $ $ )                         ",
+	"                    ~ {  ^ ' $ $ $ ) / ( _                     ",
+	"                : <  ^ } | 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 w w y z g A k 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 `  ...            ",
+	"          +.@.#.$.%.&.*.=.-.;.;.>.,.'.).Z !.~.4 {.*.I           ",
+	"        .^./.(._.:.<..}.|.1.1.2.Y 3.4.5.6.7.{.*.8.p 9.        ",
+	"      0.! ^./.a.b.c.8 d.e.f.g.h.i.j.k.l.F m.n.o.p.q.|.{.r.      ",
+	"        *.s.c.9 ^.t.8 d.u.v.+.w.x.y.z.!.A.m.n.B.C.D.E.F.        ",
+	"            *.G.H.I.<.J.K.L.M.N.O.P.Q.R.A.S.B.B.T.U.            ",
+	"              _ V.W.X.Y.Z.`. +.+++@+#+A.S.o.$+%+&+              ",
+	"              5 *+=+-+;+>+,+|..+'+)+!+~+{+%++^+M.              ",
+	"              4 R./+|.=+V.p {.(+_+6 w.:+..<+E.++              ",
+	"              }+|+V 1+2+{.o.7.3+4+5+6+7+^+8+^+V.9+              ",
+	"                0+a+b+z.R..+F c+d+-.e+f+g+f+h+i+                ",
+	"                    j+k+V m l+m+n+1.-.o+p+q+                    ",
+	"                        r+s+t+u+n+v+w+x+                        ",
+	"                            y+z+A+B+                            ",
+	"                                                                ",
+	"                                                                "
+};
 
 #endif
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/alcpix.h -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/alcpix.h Changed

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/bithelp.h -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/bithelp.h Changed

@@ -21,36 +21,26 @@
 #ifndef G10_BITHELP_H
 #define G10_BITHELP_H
 
-
-/****************
- * Rotate the 32 bit unsigned integer X by N bits left/right
- */
+/* Rotate the 32 bit unsigned integer X by N bits left/right */
 #if defined(__GNUC__) && defined(__i386__)
-static inline uint32_t
-rol(uint32_t x, int n)
+static inline uint32_t rol(uint32_t x, int n)
 {
-  __asm__("roll %%cl,%0"
-        :"=r" (x)
-              :"0" (x),"c" (n));
-  return x;
+	__asm__("roll %%cl,%0" : "=r"(x) : "0"(x), "c"(n));
+	return x;
 }
 #else
-#define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
+#define rol(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
 #endif
 
 #if defined(__GNUC__) && defined(__i386__)
-static inline uint32_t
-ror(uint32_t x, int n)
+static inline uint32_t ror(uint32_t x, int n)
 {
-  __asm__("rorl %%cl,%0"
-        :"=r" (x)
-              :"0" (x),"c" (n));
-  return x;
+	__asm__("rorl %%cl,%0" : "=r"(x) : "0"(x), "c"(n));
+	return x;
 }
 #else
-#define ror(x,n) ( ((x) >> (n)) | ((x) << (32-(n))) )
+#define ror(x, n) (((x) >> (n)) | ((x) << (32 - (n))))
 #endif
 
-
 #endif /*G10_BITHELP_H*/
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/ed2khash.cpp -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/ed2khash.cpp Changed

@@ -25,237 +25,217 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <wx/ffile.h>
 #include <wx/log.h>
 #include <wx/regex.h>
 
 #include "ed2khash.h"
 
-
-/// Constructor
-Ed2kHash::Ed2kHash():MD4()
+Ed2kHash::Ed2kHash()
+: MD4()
 {
-  m_ed2kArrayOfHashes.Clear();
-  m_filename.Clear();
-  m_fileSize=0;
+	m_ed2kArrayOfHashes.Clear();
+	m_filename.Clear();
+	m_fileSize = 0;
 }
 
-/// Destructor
-Ed2kHash::~Ed2kHash()
-{}
+Ed2kHash::~Ed2kHash() {}
 
 /// Set Ed2k hash from a file
 // returns false if aborted
-bool Ed2kHash::SetED2KHashFromFile(const wxFileName& filename, MD4Hook hook)
+bool Ed2kHash::SetED2KHashFromFile(const wxFileName &filename, MD4Hook hook)
 {
-  // Open file and let wxFFile destructor close the file
-  // Closing it explicitly may crash on Win32 ...
-  wxFFile file(filename.GetFullPath(), "rbS");
-  if (! file.IsOpened())
-    {
-	  // This doesn't make much sense to me, but it is what it was before and actually works.
-	  wxLogError(_("Unable to open %s"), ((const char*)filename.GetFullPath().mb_str(wxConvISO8859_1)));
-      return (false);
-    }
-  else
-    {
-      unsigned char retMD4_HASHLEN_BYTE;
-      MD4Context hdc;
-
-      size_t read;
-      size_t partcount;
-      wxFileOffset totalread;
-
-      char *buf = new charBUFSIZE;
-
-      bool goAhead = true;
+	// Open file and let wxFFile destructor close the file
+	// Closing it explicitly may crash on Win32 ...
+	wxFFile file(filename.GetFullPath(), "rbS");
+	if (!file.IsOpened()) {
+		// This doesn't make much sense to me, but it is what it was before and actually works.
+		wxLogError(_("Unable to open %s"),
+			((const char *)filename.GetFullPath().mb_str(wxConvISO8859_1)));
+		return (false);
+	} else {
+		unsigned char retMD4_HASHLEN_BYTE;
+		MD4Context hdc;
+
+		size_t read;
+		size_t partcount;
+		wxFileOffset totalread;
+
+		char *buf = new charBUFSIZE;
+
+		bool goAhead = true;
 
 #ifdef WANT_STRING_IMPLEMENTATION
 
-      wxString tmpHash("");
+		wxString tmpHash("");
 #else
 
-      unsigned char* tmpCharHash = NULL;
+		unsigned char *tmpCharHash = NULL;
 #endif
-      // Clear Ed2k Hash
-      m_ed2kArrayOfHashes.Clear();
-
-      // Processing each block
-      totalread=0;
-      partcount = 0;
-      while (!file.Eof())
-        {
-          size_t dataread = 0;
-          MD4Init(&hdc);
-          while (dataread < PARTSIZE && !file.Eof())
-            {
-              if (hook)
-                {
-                  goAhead = hook((int)((double)(100.0 * totalread) / file.Length()));
-                }
-              if (goAhead)
-                {
-                  if ((dataread + BUFSIZE) > PARTSIZE)
-                    {
-                      read = file.Read(buf, PARTSIZE - dataread);
-                    }
-                  else
-                    {
-                      read = file.Read(buf, BUFSIZE);
-                    }
-                  dataread += read;
-                  totalread += read;
-                  MD4Update(&hdc, reinterpret_cast<unsigned char const *>(buf),
-                            read);
-                }
-              else
-                {
-		  // User cancelled via the progress hook -- release both the
-		  // per-buffer read scratch *and* the cumulative parthash buffer
-		  // grown by realloc() below.  Pre-fix this path freed only buf,
-		  // leaking tmpCharHash across every cancelled hash.
-		  delete  buf;
+		// Clear Ed2k Hash
+		m_ed2kArrayOfHashes.Clear();
+
+		// Processing each block
+		totalread = 0;
+		partcount = 0;
+		while (!file.Eof()) {
+			size_t dataread = 0;
+			MD4Init(&hdc);
+			while (dataread < PARTSIZE && !file.Eof()) {
+				if (hook) {
+					goAhead = hook((int)((double)(100.0 * totalread) / file.Length()));
+				}
+				if (goAhead) {
+					if ((dataread + BUFSIZE) > PARTSIZE) {
+						read = file.Read(buf, PARTSIZE - dataread);
+					} else {
+						read = file.Read(buf, BUFSIZE);
+					}
+					dataread += read;
+					totalread += read;
+					MD4Update(&hdc, reinterpret_cast<unsigned char const *>(buf), read);
+				} else {
+					// User cancelled via the progress hook -- release both the
+					// per-buffer read scratch and the cumulative parthash
+					// buffer grown by realloc() below. Before the fix this path
+					// freed only buf, leaking tmpCharHash across every
+					// cancelled hash.
+					delete buf;
 #ifndef WANT_STRING_IMPLEMENTATION
-		  free(tmpCharHash);
+					free(tmpCharHash);
 #endif
-                  return (false);
-                }
-
-            }
-          MD4Final(&hdc, ret);
+					return (false);
+				}
+			}
+			MD4Final(&hdc, ret);
 
-          // Add part-hash
-          m_ed2kArrayOfHashes.Add(charToHex(reinterpret_cast<const char *>(ret),
-                                            MD4_HASHLEN_BYTE));
+			// Add part-hash
+			m_ed2kArrayOfHashes.Add(
+				charToHex(reinterpret_cast<const char *>(ret), MD4_HASHLEN_BYTE));
 
-          partcount++;
+			partcount++;
 
 #ifdef WANT_STRING_IMPLEMENTATION
-          // MD4_HASHLEN_BYTE is ABSOLUTELY needed as we dont want NULL
-          // character to be interpreted as the end of the parthash string
+			// MD4_HASHLEN_BYTE is ABSOLUTELY needed as we dont want NULL
+			// character to be interpreted as the end of the parthash string
 #if wxUSE_UNICODE
 
-          tmpHash += wxString(reinterpret_cast<const wchar_t *>(ret),MD4_HASHLEN_BYTE);
+			tmpHash += wxString(reinterpret_cast<const wchar_t *>(ret), MD4_HASHLEN_BYTE);
 #else
 
-          tmpHash += wxString(reinterpret_cast<const char *>(ret),MD4_HASHLEN_BYTE);
+			tmpHash += wxString(reinterpret_cast<const char *>(ret), MD4_HASHLEN_BYTE);
 #endif
 #else
 
-          unsigned char *tmpPtr = (unsigned char*)realloc(tmpCharHash,
-                                                sizeof(unsigned char) * (MD4_HASHLEN_BYTE * partcount));
-	  if (tmpPtr) {
-		  tmpCharHash = tmpPtr;
-	  } else {
-		  delete  buf;
-		  free(tmpCharHash);
-		  wxLogError(_("Out of memory while calculating ed2k hash!"));
-		  return (false);
-	  }
-          memcpy ( tmpCharHash + MD4_HASHLEN_BYTE * (partcount - 1), ret, MD4_HASHLEN_BYTE );
+			unsigned char *tmpPtr = (unsigned char *)realloc(
+				tmpCharHash, sizeof(unsigned char) * (MD4_HASHLEN_BYTE * partcount));
+			if (tmpPtr) {
+				tmpCharHash = tmpPtr;
+			} else {
+				delete buf;
+				free(tmpCharHash);
+				wxLogError(_("Out of memory while calculating ed2k hash!"));
+				return (false);
+			}
+			memcpy(tmpCharHash + MD4_HASHLEN_BYTE * (partcount - 1), ret, MD4_HASHLEN_BYTE);
 #endif
+		}
 
-        }
+		delete buf;
 
-      delete  buf;
-
-      // hash == hash of concatenned parthashes
-      if (partcount > 1)
-        {
-          wxString finalHash;
+		// hash == hash of concatenned parthashes
+		if (partcount > 1) {
+			wxString finalHash;
 
 #ifdef WANT_STRING_IMPLEMENTATION
 
-          finalHash=calcMd4FromString(tmpHash);
+			finalHash = calcMd4FromString(tmpHash);
 #else
 
-          MD4Init(&hdc);
-          MD4Update(&hdc, tmpCharHash, MD4_HASHLEN_BYTE * partcount);
-          MD4Final(&hdc, ret);
+			MD4Init(&hdc);
+			MD4Update(&hdc, tmpCharHash, MD4_HASHLEN_BYTE * partcount);
+			MD4Final(&hdc, ret);
 
-          finalHash = charToHex(reinterpret_cast<const char *>(ret),
-                                MD4_HASHLEN_BYTE);
+			finalHash = charToHex(reinterpret_cast<const char *>(ret), MD4_HASHLEN_BYTE);
 #endif
 
-          m_ed2kArrayOfHashes.Add(finalHash);
-        }
+			m_ed2kArrayOfHashes.Add(finalHash);
+		}
 
 #ifndef WANT_STRING_IMPLEMENTATION
-      free(tmpCharHash);
-      tmpCharHash=NULL;
+		free(tmpCharHash);
+		tmpCharHash = NULL;
 #endif
 
-      m_ed2kArrayOfHashes.Shrink();
+		m_ed2kArrayOfHashes.Shrink();
 
-      // Set members
-      m_fileSize = file.Length();
-      m_filename = filename.GetFullName();
+		// Set members
+		m_fileSize = file.Length();
+		m_filename = filename.GetFullName();
 
-      return true;
-    }
+		return true;
+	}
 }
 
 /// Set Ed2k hash from a file
-bool Ed2kHash::SetED2KHashFromFile(const wxString& filename, MD4Hook hook)
+bool Ed2kHash::SetED2KHashFromFile(const wxString &filename, MD4Hook hook)
 {
-  return SetED2KHashFromFile(wxFileName(filename), hook);
+	return SetED2KHashFromFile(wxFileName(filename), hook);
 }
 
 #define WXLONGLONGFMTSPEC wxLongLongFmtSpec
 
 /// Get Ed2k link
-wxString Ed2kHash::GetED2KLink(const bool addPartHashes, const wxArrayString* arrayOfUrls)
+wxString Ed2kHash::GetED2KLink(const bool addPartHashes, const wxArrayString *arrayOfUrls)
 {
-  // Constructing ed2k basic link
-  wxString ed2kLink = "ed2k://|file|" + CleanFilename(m_filename)
-                      + wxString::Format("|%" WXLONGLONGFMTSPEC "u|", m_fileSize)
-                      + m_ed2kArrayOfHashes.Last() + "|";
-
-
-  // Add optional URLs
-  if ( arrayOfUrls && !arrayOfUrls->IsEmpty())
-    {
-      size_t i;
-      for ( i = 0; i < arrayOfUrls->GetCount(); i++ )
-        {
-          ed2kLink += "s=" + (*arrayOfUrls)i + "|";
-        }
-    }
-
-  // Add Optional part-hashes
-  if (addPartHashes && m_ed2kArrayOfHashes.GetCount()>1)
-    {
-      ed2kLink += "p=";
-      size_t i;
-      for (i=0;i<(m_ed2kArrayOfHashes.GetCount()-1);++i)
-        {
-          ed2kLink += m_ed2kArrayOfHashesi + ":";
-        }
-      ed2kLink.RemoveLast(); // Remove last :
-      ed2kLink += "|";
-    }
-
-  // Add last slash
-  ed2kLink += "/";
-
-  return ed2kLink;
+	// Constructing ed2k basic link
+	wxString ed2kLink = "ed2k://|file|" + CleanFilename(m_filename) +
+			    wxString::Format("|%" WXLONGLONGFMTSPEC "u|", m_fileSize) +
+			    m_ed2kArrayOfHashes.Last() + "|";
+
+	// Add optional URLs
+	if (arrayOfUrls && !arrayOfUrls->IsEmpty()) {
+		size_t i;
+		for (i = 0; i < arrayOfUrls->GetCount(); i++) {
+			ed2kLink += "s=" + (*arrayOfUrls)i + "|";
+		}
+	}
+
+	// Add Optional part-hashes
+	if (addPartHashes && m_ed2kArrayOfHashes.GetCount() > 1) {
+		ed2kLink += "p=";
+		size_t i;
+		for (i = 0; i < (m_ed2kArrayOfHashes.GetCount() - 1); ++i) {
+			ed2kLink += m_ed2kArrayOfHashesi + ":";
+		}
+		ed2kLink.RemoveLast(); // Remove last :
+		ed2kLink += "|";
+	}
+
+	// Add last slash
+	ed2kLink += "/";
+
+	return ed2kLink;
 }
 
-/// Strip all non-alphanumeric characters of a filename string
-wxString Ed2kHash::CleanFilename(const wxString& filename)
+wxString Ed2kHash::CleanFilename(const wxString &filename)
 {
-  wxString name(filename);
-
-  wxRegEx toStrip("^:alnum:_.-");
-  toStrip.Replace(&name, "_");
-
-  return (name);
+	wxString name(filename);
+	// Replace only what breaks ed2k link parsing: the field separator, the end-of-link marker,
+	// path separators and control characters. Printable Unicode is preserved, files being keyed
+	// by hash + size.
+	for (size_t i = 0; i < name.length(); ++i) {
+		const wxUniChar ch = namei;
+		if (ch == '|' || ch == '/' || ch == '\\' || ch < 0x20 || ch == 0x7f) {
+			namei = '_';
+		}
+	}
+	return name;
 }
 
 /// Get Ed2k Array of hashes
 wxArrayString Ed2kHash::GetED2KHash()
 {
-  return (m_ed2kArrayOfHashes);
+	return (m_ed2kArrayOfHashes);
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/ed2khash.h -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/ed2khash.h Changed

@@ -28,43 +28,40 @@
 #ifndef _ED2KHASH_H
 #define _ED2KHASH_H
 
-
 #include <wx/filename.h>
 
 #include "md4.h"
 
-class Ed2kHash:public MD4
-  {
-  private:
-
-    wxArrayString m_ed2kArrayOfHashes;
-    wxString m_filename;
-    uint64_t m_fileSize;
-
-  protected:
+class Ed2kHash : public MD4
+{
+private:
+	wxArrayString m_ed2kArrayOfHashes;
+	wxString m_filename;
+	uint64_t m_fileSize;
 
-    /// Strip all non-alphanumeric characters of a filename string
-    wxString CleanFilename(const wxString& filename);
+protected:
+	/// Strip all non-alphanumeric characters of a filename string
+	wxString CleanFilename(const wxString &filename);
 
-  public:
-    /// Constructor
-    Ed2kHash ();
+public:
+	/// Constructor
+	Ed2kHash();
 
-    /// Destructor
-    ~Ed2kHash ();
+	/// Destructor
+	~Ed2kHash();
 
-    /// Set Ed2k hash from a file
-    bool SetED2KHashFromFile(const wxFileName& filename, MD4Hook hook);
+	/// Set Ed2k hash from a file
+	bool SetED2KHashFromFile(const wxFileName &filename, MD4Hook hook);
 
-    /// Set Ed2k hash from a file
-    bool SetED2KHashFromFile(const wxString& filename, MD4Hook hook);
+	/// Set Ed2k hash from a file
+	bool SetED2KHashFromFile(const wxString &filename, MD4Hook hook);
 
-    /// Get Ed2k Array of hashes
-    wxArrayString GetED2KHash();
+	/// Get Ed2k Array of hashes
+	wxArrayString GetED2KHash();
 
-    /// Get Ed2k link
-    wxString GetED2KLink(const bool addPartHashes=false, const wxArrayString* arrayOfUrls = NULL);
-  };
+	/// Get Ed2k link
+	wxString GetED2KLink(const bool addPartHashes = false, const wxArrayString *arrayOfUrls = NULL);
+};
 
 #endif /* _ED2KHASH_H */

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/md4.cpp -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/md4.cpp Changed

@@ -35,141 +35,123 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <wx/ffile.h>
 #include <wx/intl.h>
 
 #include "md4.h"
 #include "bithelp.h"
 
-
 /// BIG ENDIAN byte reversing
 #if wxBYTE_ORDER == wxBIG_ENDIAN
 // Note: this code is harmless on little-endian machines.
 void MD4::byteReverse(unsigned char *buf, unsigned longs)
 {
-  do
-    {
-      uint32_t t;
-      t = (uint32_t) ((unsigned) buf3 << 8 | buf2) << 16 |
-          ((unsigned) buf1 << 8 | buf0);
-      *(uint32_t *) buf = t;
-      buf += 4;
-    }
-  while (--longs);
+	do {
+		uint32_t t;
+		t = (uint32_t)((unsigned)buf3 << 8 | buf2) << 16 | ((unsigned)buf1 << 8 | buf0);
+		*(uint32_t *)buf = t;
+		buf += 4;
+	} while (--longs);
 }
 #else
-#define byteReverse(buf, len)	do { } while (0)
+#define byteReverse(buf, len) \
+	do { \
+	} while (0)
 #endif
 
 /// Start MD4 accumulation.
 /// Set bit count to 0 and buffer to mysteriousinitialization constants.
 void MD4::MD4Init(struct MD4Context *ctx)
 {
-  ctx->buf0 = 0x67452301;
-  ctx->buf1 = 0xefcdab89;
-  ctx->buf2 = 0x98badcfe;
-  ctx->buf3 = 0x10325476;
-  ctx->bits0 = 0;
-  ctx->bits1 = 0;
+	ctx->buf0 = 0x67452301;
+	ctx->buf1 = 0xefcdab89;
+	ctx->buf2 = 0x98badcfe;
+	ctx->buf3 = 0x10325476;
+	ctx->bits0 = 0;
+	ctx->bits1 = 0;
 }
 
 /// Update context to reflect the concatenation of another buffer full of bytes.
-void MD4::MD4Update(struct MD4Context *ctx, unsigned char const *buf,
-                    size_t len)
+void MD4::MD4Update(struct MD4Context *ctx, unsigned char const *buf, size_t len)
 {
-  uint32_t t;
-
-  // Update bitcount
-  t = ctx->bits0;
-  if ((ctx->bits0 = t + ((uint32_t) len << 3)) < t)
-    ctx->bits1++;	// Carry from low to high
-  ctx->bits1 += len >> 29;
-
-  t = (t >> 3) & 0x3f;	// Bytes already in shsInfo->data
-
-  // Handle any leading odd-sized chunks
-  if (t)
-    {
-      unsigned char *p = (unsigned char *) ctx->in + t;
-
-      t = 64 - t;
-      if (len < t)
-        {
-          memcpy(p, buf, len);
-          return;
-        }
-      memcpy(p, buf, t);
-      byteReverse(ctx->in, 16);
-      MD4Transform(ctx->buf, (uint32_t *) ctx->in);
-      buf += t;
-      len -= t;
-    }
-
-  // Process data in 64-byte chunks
-  while (len >= 64)
-    {
-      memcpy(ctx->in, buf, 64);
-      byteReverse(ctx->in, 16);
-      MD4Transform(ctx->buf, (uint32_t *) ctx->in);
-      buf += 64;
-      len -= 64;
-    }
-
-  //Handle any remaining bytes of data.
-  memcpy(ctx->in, buf, len);
+	uint32_t t;
+
+	t = ctx->bits0;
+	if ((ctx->bits0 = t + ((uint32_t)len << 3)) < t)
+		ctx->bits1++; // Carry from low to high
+	ctx->bits1 += len >> 29;
+
+	t = (t >> 3) & 0x3f; // Bytes already in shsInfo->data
+
+	if (t) {
+		unsigned char *p = (unsigned char *)ctx->in + t;
+
+		t = 64 - t;
+		if (len < t) {
+			memcpy(p, buf, len);
+			return;
+		}
+		memcpy(p, buf, t);
+		byteReverse(ctx->in, 16);
+		MD4Transform(ctx->buf, (uint32_t *)ctx->in);
+		buf += t;
+		len -= t;
+	}
+
+	while (len >= 64) {
+		memcpy(ctx->in, buf, 64);
+		byteReverse(ctx->in, 16);
+		MD4Transform(ctx->buf, (uint32_t *)ctx->in);
+		buf += 64;
+		len -= 64;
+	}
+
+	memcpy(ctx->in, buf, len);
 }
 
-
 ///  Final wrapup - pad to 64-byte boundary with the bit pattern
 ///  1 0* (64-bit count of bits processed, MSB-first)
-void MD4::MD4Final(struct MD4Context *ctx, unsigned char* digest)
+void MD4::MD4Final(struct MD4Context *ctx, unsigned char *digest)
 {
-  unsigned int count;
-  unsigned char *p;
-
-  // Compute number of bytes mod 64
-  count = (ctx->bits0 >> 3) & 0x3F;
-
-  // Set the first char of padding to 0x80.
-  //This is safe since there is always at least one byte free
-  p = ctx->in + count;
-  *p++ = 0x80;
-
-  // Bytes of padding needed to make 64 bytes
-  count = 64 - 1 - count;
-
-  // Pad out to 56 mod 64
-  if (count < 8)
-    {
-      // Two lots of padding:  Pad the first block to 64 bytes
-      memset(p, 0, count);
-      byteReverse(ctx->in, 16);
-      MD4Transform(ctx->buf, (uint32_t *) ctx->in);
-
-      // Now fill the next block with 56 bytes
-      memset(ctx->in, 0, 56);
-    }
-  else
-    {
-      // Pad block to 56 bytes
-      memset(p, 0, count - 8);
-    }
-  byteReverse(ctx->in, 14);
-
-  // Append length in bits and transform
-  uint32_t * in32 = (uint32_t *) ctx->in;
-  in3214 = ctx->bits0;
-  in3215 = ctx->bits1;
-
-  MD4Transform(ctx->buf, (uint32_t *) ctx->in);
-  byteReverse((unsigned char *) ctx->buf, 4);
-
-  if (digest!=NULL)
-    {
-      memcpy(digest, ctx->buf, 16);
-    }
-  memset(ctx, 0, sizeof(*ctx));	// In case it's sensitive
+	unsigned int count;
+	unsigned char *p;
+
+	count = (ctx->bits0 >> 3) & 0x3F;
+
+	// Set the first char of padding to 0x80.
+	// This is safe since there is always at least one byte free
+	p = ctx->in + count;
+	*p++ = 0x80;
+
+	count = 64 - 1 - count;
+
+	// Pad out to 56 mod 64
+	if (count < 8) {
+		// Two lots of padding:  Pad the first block to 64 bytes
+		memset(p, 0, count);
+		byteReverse(ctx->in, 16);
+		MD4Transform(ctx->buf, (uint32_t *)ctx->in);
+
+		// Now fill the next block with 56 bytes
+		memset(ctx->in, 0, 56);
+	} else {
+		// Pad block to 56 bytes
+		memset(p, 0, count - 8);
+	}
+	byteReverse(ctx->in, 14);
+
+	// Append length in bits and transform
+	uint32_t *in32 = (uint32_t *)ctx->in;
+	in3214 = ctx->bits0;
+	in3215 = ctx->bits1;
+
+	MD4Transform(ctx->buf, (uint32_t *)ctx->in);
+	byteReverse((unsigned char *)ctx->buf, 4);
+
+	if (digest != NULL) {
+		memcpy(digest, ctx->buf, 16);
+	}
+	memset(ctx, 0, sizeof(*ctx)); // In case it's sensitive
 }
 
 /// The three core functions
@@ -177,218 +159,207 @@
 #define MD4_G(x, y, z) (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
 #define MD4__H(x, y, z) ((x) ^ (y) ^ (z))
 
-#define MD4_FF(a, b, c, d, x, s) { \
-    (a) += MD4_F ((b), (c), (d)) + (x); \
-    (a) = rol ((a), (s)); \
-  }
-#define MD4_GG(a, b, c, d, x, s) { \
-    (a) += MD4_G ((b), (c), (d)) + (x) + (uint32_t)0x5a827999; \
-    (a) = rol ((a), (s)); \
-  }
-#define MD4_HH(a, b, c, d, x, s) { \
-    (a) += MD4__H ((b), (c), (d)) + (x) + (uint32_t)0x6ed9eba1; \
-    (a) = rol ((a), (s)); \
-  }
+#define MD4_FF(a, b, c, d, x, s) \
+	{ \
+		(a) += MD4_F((b), (c), (d)) + (x); \
+		(a) = rol((a), (s)); \
+	}
+#define MD4_GG(a, b, c, d, x, s) \
+	{ \
+		(a) += MD4_G((b), (c), (d)) + (x) + (uint32_t)0x5a827999; \
+		(a) = rol((a), (s)); \
+	}
+#define MD4_HH(a, b, c, d, x, s) \
+	{ \
+		(a) += MD4__H((b), (c), (d)) + (x) + (uint32_t)0x6ed9eba1; \
+		(a) = rol((a), (s)); \
+	}
 
 /// The core of the MD4 algorithm
 void MD4::MD4Transform(uint32_t buf4, uint32_t const in16)
 {
-  uint32_t a, b, c, d;
-
-  a = buf0;
-  b = buf1;
-  c = buf2;
-  d = buf3;
-
-  MD4_FF(a, b, c, d, in0, 3);	    /* 1 */
-  MD4_FF(d, a, b, c, in1, 7);	    /* 2 */
-  MD4_FF(c, d, a, b, in2, 11);	/* 3 */
-  MD4_FF(b, c, d, a, in3, 19);	/* 4 */
-  MD4_FF(a, b, c, d, in4, 3);		/* 5 */
-  MD4_FF(d, a, b, c, in5, 7);		/* 6 */
-  MD4_FF(c, d, a, b, in6, 11);	/* 7 */
-  MD4_FF(b, c, d, a, in7, 19);	/* 8 */
-  MD4_FF(a, b, c, d, in8, 3);		/* 9 */
-  MD4_FF(d, a, b, c, in9, 7);		/* 10 */
-  MD4_FF(c, d, a, b, in10, 11);	/* 11 */
-  MD4_FF(b, c, d, a, in11, 19);	/* 12 */
-  MD4_FF(a, b, c, d, in12, 3);	/* 13 */
-  MD4_FF(d, a, b, c, in13, 7);	/* 14 */
-  MD4_FF(c, d, a, b, in14, 11);	/* 15 */
-  MD4_FF(b, c, d, a, in15, 19);	/* 16 */
-
-  MD4_GG(a, b, c, d, in0, 3);		/* 17 */
-  MD4_GG(d, a, b, c, in4, 5);		/* 18 */
-  MD4_GG(c, d, a, b, in8, 9);		/* 19 */
-  MD4_GG(b, c, d, a, in12, 13);	/* 20 */
-  MD4_GG(a, b, c, d, in1, 3);		/* 21 */
-  MD4_GG(d, a, b, c, in5, 5);		/* 22 */
-  MD4_GG(c, d, a, b, in9, 9);		/* 23 */
-  MD4_GG(b, c, d, a, in13, 13);	/* 24 */
-  MD4_GG(a, b, c, d, in2, 3);		/* 25 */
-  MD4_GG(d, a, b, c, in6, 5);		/* 26 */
-  MD4_GG(c, d, a, b, in10, 9);	/* 27 */
-  MD4_GG(b, c, d, a, in14, 13);	/* 28 */
-  MD4_GG(a, b, c, d, in3, 3);		/* 29 */
-  MD4_GG(d, a, b, c, in7, 5);		/* 30 */
-  MD4_GG(c, d, a, b, in11, 9);	/* 31 */
-  MD4_GG(b, c, d, a, in15, 13);	/* 32 */
-
-  MD4_HH(a, b, c, d, in0, 3);		/* 33 */
-  MD4_HH(d, a, b, c, in8, 9);		/* 34 */
-  MD4_HH(c, d, a, b, in4, 11);	/* 35 */
-  MD4_HH(b, c, d, a, in12, 15);	/* 36 */
-  MD4_HH(a, b, c, d, in2, 3);		/* 37 */
-  MD4_HH(d, a, b, c, in10, 9);	/* 38 */
-  MD4_HH(c, d, a, b, in6, 11);	/* 39 */
-  MD4_HH(b, c, d, a, in14, 15);	/* 40 */
-  MD4_HH(a, b, c, d, in1, 3);		/* 41 */
-  MD4_HH(d, a, b, c, in9, 9);		/* 42 */
-  MD4_HH(c, d, a, b, in5, 11);	/* 43 */
-  MD4_HH(b, c, d, a, in13, 15);	/* 44 */
-  MD4_HH(a, b, c, d, in3, 3);		/* 45 */
-  MD4_HH(d, a, b, c, in11, 9);	/* 46 */
-  MD4_HH(c, d, a, b, in7, 11);	/* 47 */
-  MD4_HH(b, c, d, a, in15, 15);	/* 48 */
-
-  buf0 += a;
-  buf1 += b;
-  buf2 += c;
-  buf3 += d;
+	uint32_t a, b, c, d;
+
+	a = buf0;
+	b = buf1;
+	c = buf2;
+	d = buf3;
+
+	MD4_FF(a, b, c, d, in0, 3);   /* 1 */
+	MD4_FF(d, a, b, c, in1, 7);   /* 2 */
+	MD4_FF(c, d, a, b, in2, 11);  /* 3 */
+	MD4_FF(b, c, d, a, in3, 19);  /* 4 */
+	MD4_FF(a, b, c, d, in4, 3);   /* 5 */
+	MD4_FF(d, a, b, c, in5, 7);   /* 6 */
+	MD4_FF(c, d, a, b, in6, 11);  /* 7 */
+	MD4_FF(b, c, d, a, in7, 19);  /* 8 */
+	MD4_FF(a, b, c, d, in8, 3);   /* 9 */
+	MD4_FF(d, a, b, c, in9, 7);   /* 10 */
+	MD4_FF(c, d, a, b, in10, 11); /* 11 */
+	MD4_FF(b, c, d, a, in11, 19); /* 12 */
+	MD4_FF(a, b, c, d, in12, 3);  /* 13 */
+	MD4_FF(d, a, b, c, in13, 7);  /* 14 */
+	MD4_FF(c, d, a, b, in14, 11); /* 15 */
+	MD4_FF(b, c, d, a, in15, 19); /* 16 */
+
+	MD4_GG(a, b, c, d, in0, 3);   /* 17 */
+	MD4_GG(d, a, b, c, in4, 5);   /* 18 */
+	MD4_GG(c, d, a, b, in8, 9);   /* 19 */
+	MD4_GG(b, c, d, a, in12, 13); /* 20 */
+	MD4_GG(a, b, c, d, in1, 3);   /* 21 */
+	MD4_GG(d, a, b, c, in5, 5);   /* 22 */
+	MD4_GG(c, d, a, b, in9, 9);   /* 23 */
+	MD4_GG(b, c, d, a, in13, 13); /* 24 */
+	MD4_GG(a, b, c, d, in2, 3);   /* 25 */
+	MD4_GG(d, a, b, c, in6, 5);   /* 26 */
+	MD4_GG(c, d, a, b, in10, 9);  /* 27 */
+	MD4_GG(b, c, d, a, in14, 13); /* 28 */
+	MD4_GG(a, b, c, d, in3, 3);   /* 29 */
+	MD4_GG(d, a, b, c, in7, 5);   /* 30 */
+	MD4_GG(c, d, a, b, in11, 9);  /* 31 */
+	MD4_GG(b, c, d, a, in15, 13); /* 32 */
+
+	MD4_HH(a, b, c, d, in0, 3);   /* 33 */
+	MD4_HH(d, a, b, c, in8, 9);   /* 34 */
+	MD4_HH(c, d, a, b, in4, 11);  /* 35 */
+	MD4_HH(b, c, d, a, in12, 15); /* 36 */
+	MD4_HH(a, b, c, d, in2, 3);   /* 37 */
+	MD4_HH(d, a, b, c, in10, 9);  /* 38 */
+	MD4_HH(c, d, a, b, in6, 11);  /* 39 */
+	MD4_HH(b, c, d, a, in14, 15); /* 40 */
+	MD4_HH(a, b, c, d, in1, 3);   /* 41 */
+	MD4_HH(d, a, b, c, in9, 9);   /* 42 */
+	MD4_HH(c, d, a, b, in5, 11);  /* 43 */
+	MD4_HH(b, c, d, a, in13, 15); /* 44 */
+	MD4_HH(a, b, c, d, in3, 3);   /* 45 */
+	MD4_HH(d, a, b, c, in11, 9);  /* 46 */
+	MD4_HH(c, d, a, b, in7, 11);  /* 47 */
+	MD4_HH(b, c, d, a, in15, 15); /* 48 */
+
+	buf0 += a;
+	buf1 += b;
+	buf2 += c;
+	buf3 += d;
 }
 
 /// Algorithm verification
 bool MD4::selfTest()
 {
-  wxString test1("");
-  wxString test1_md("31D6CFE0D16AE931B73C59D7E0C089C0");
-  wxString test2("a");
-  wxString test2_md("BDE52CB31DE33E46245E05FBDBD6FB24");
-  wxString test3("abc");
-  wxString test3_md("A448017AAF21D8525FC10AE87AA6729D");
-  wxString test4("message digest");
-  wxString test4_md("D9130A8164549FE818874806E1C7014B");
-  wxString test5("abcdefghijklmnopqrstuvwxyz");
-  wxString test5_md("D79E1C308AA5BBCDEEA8ED63DF412DA9");
-  wxString test6("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
-  wxString test6_md("043F8582F241DB351CE627E153E7F0E4");
-  wxString test7("12345678901234567890123456789012345678901234567890123456789012345678901234567890");
-  wxString test7_md("E33B4DDC9C38F2199C3E7B164FCC0536");
-
-  MD4 md4;
-
-  if (md4.calcMd4FromString(test1) != test1_md)
-    return false;
-  if (md4.calcMd4FromString(test2) != test2_md)
-    return false;
-  if (md4.calcMd4FromString(test3) != test3_md)
-    return false;
-  if (md4.calcMd4FromString(test4) != test4_md)
-    return false;
-  if (md4.calcMd4FromString(test5) != test5_md)
-    return false;
-  if (md4.calcMd4FromString(test6) != test6_md)
-    return false;
-  if (md4.calcMd4FromString(test7) != test7_md)
-    return false;
-
-  return true;
+	wxString test1("");
+	wxString test1_md("31D6CFE0D16AE931B73C59D7E0C089C0");
+	wxString test2("a");
+	wxString test2_md("BDE52CB31DE33E46245E05FBDBD6FB24");
+	wxString test3("abc");
+	wxString test3_md("A448017AAF21D8525FC10AE87AA6729D");
+	wxString test4("message digest");
+	wxString test4_md("D9130A8164549FE818874806E1C7014B");
+	wxString test5("abcdefghijklmnopqrstuvwxyz");
+	wxString test5_md("D79E1C308AA5BBCDEEA8ED63DF412DA9");
+	wxString test6("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
+	wxString test6_md("043F8582F241DB351CE627E153E7F0E4");
+	wxString test7("12345678901234567890123456789012345678901234567890123456789012345678901234567890");
+	wxString test7_md("E33B4DDC9C38F2199C3E7B164FCC0536");
+
+	MD4 md4;
+
+	if (md4.calcMd4FromString(test1) != test1_md)
+		return false;
+	if (md4.calcMd4FromString(test2) != test2_md)
+		return false;
+	if (md4.calcMd4FromString(test3) != test3_md)
+		return false;
+	if (md4.calcMd4FromString(test4) != test4_md)
+		return false;
+	if (md4.calcMd4FromString(test5) != test5_md)
+		return false;
+	if (md4.calcMd4FromString(test6) != test6_md)
+		return false;
+	if (md4.calcMd4FromString(test7) != test7_md)
+		return false;
+
+	return true;
 }
 
 /// Get Md4 hash from a string
 wxString MD4::calcMd4FromString(const wxString &buf)
 {
-  MD4Context hdc;
-  unsigned char retMD4_HASHLEN_BYTE;
+	MD4Context hdc;
+	unsigned char retMD4_HASHLEN_BYTE;
 
-  MD4Init(&hdc);
-  MD4Update(&hdc, (const unsigned char*)buf.c_str(), buf.length());
-  MD4Final(&hdc, ret);
+	MD4Init(&hdc);
+	MD4Update(&hdc, (const unsigned char *)buf.c_str(), buf.length());
+	MD4Final(&hdc, ret);
 
-  return charToHex((const char*)ret, MD4_HASHLEN_BYTE);
+	return charToHex((const char *)ret, MD4_HASHLEN_BYTE);
 }
 
 /// Get Md4 hash from a file
 wxString MD4::calcMd4FromFile(const wxString &filename, MD4Hook hook)
 {
-  MD4Context hdc;
-
-  // Open file and let wxFFile destructor close the file
-  // Closing it explicitly may crash on Win32 ...
-  wxFFile file(filename, wxS("rbS"));
-  if (! file.IsOpened())
-    {
-      return "";
-    }
-  else
-    {
-      unsigned char retMD4_HASHLEN_BYTE;
-      unsigned int bufSize = calcBufSize(file.Length());
-      char *buf = new charbufSize;
-
-      bool keep_going = true;
-      size_t totalread = 0;
-
-      bool goAhead = true;
-
-      MD4Init(&hdc);
-      while (!file.Eof() && keep_going)
-        {
-          if (hook)
-            {
-              goAhead = hook( (int)((double)(100.0 * totalread) / file.Length()));
-            }
-          if (goAhead)
-            {
-              size_t read = file.Read(buf, bufSize);
-              MD4Update(&hdc, reinterpret_cast<unsigned char const *>(buf),
-                        read );
-              totalread += read;
-            }
-          else
-            {
-              delete  buf;
-              return (_("Cancelled !"));
-            }
-        }
-      MD4Final(&hdc, ret);
-
-      delete  buf;
-
-      return charToHex(reinterpret_cast<const char *>(ret),
-                       MD4_HASHLEN_BYTE);
-    }
+	MD4Context hdc;
+
+	// Open file and let wxFFile destructor close the file
+	// Closing it explicitly may crash on Win32 ...
+	wxFFile file(filename, wxS("rbS"));
+	if (!file.IsOpened()) {
+		return "";
+	} else {
+		unsigned char retMD4_HASHLEN_BYTE;
+		unsigned int bufSize = calcBufSize(file.Length());
+		char *buf = new charbufSize;
+
+		bool keep_going = true;
+		size_t totalread = 0;
+
+		bool goAhead = true;
+
+		MD4Init(&hdc);
+		while (!file.Eof() && keep_going) {
+			if (hook) {
+				goAhead = hook((int)((double)(100.0 * totalread) / file.Length()));
+			}
+			if (goAhead) {
+				size_t read = file.Read(buf, bufSize);
+				MD4Update(&hdc, reinterpret_cast<unsigned char const *>(buf), read);
+				totalread += read;
+			} else {
+				delete buf;
+				return (_("Cancelled !"));
+			}
+		}
+		MD4Final(&hdc, ret);
+
+		delete buf;
+
+		return charToHex(reinterpret_cast<const char *>(ret), MD4_HASHLEN_BYTE);
+	}
 }
 
 /// Convert hash to hexa string
 wxString MD4::charToHex(const char *buf, size_t len)
 {
-  size_t i;
-  wxString hexString;
+	size_t i;
+	wxString hexString;
 
-  for (i = 0; i < len; ++i)
-    {
-      hexString += wxString::Format(wxS("%02x"), 0xFF & *(buf + i));
-    }
+	for (i = 0; i < len; ++i) {
+		hexString += wxString::Format(wxS("%02x"), 0xFF & *(buf + i));
+	}
 
-  // Reduce memory usage
-  hexString.Shrink();
+	// Reduce memory usage
+	hexString.Shrink();
 
-  return (hexString);
+	return (hexString);
 }
 
 /// Compute Md4 buffsize
 size_t MD4::calcBufSize(size_t filesize)
 {
-  if (filesize < 100000)
-    {
-      filesize = 100000;
-    }
-  else if (filesize > 200000)
-    {
-      filesize = 200000;
-    }
-
-  return (filesize);
+	if (filesize < 100000) {
+		filesize = 100000;
+	} else if (filesize > 200000) {
+		filesize = 200000;
+	}
+
+	return (filesize);
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/aLinkCreator/src/md4.h -> amule-3.1.0.tar.gz/src/utils/aLinkCreator/src/md4.h Changed

@@ -38,70 +38,61 @@
 #ifndef _MD4_H
 #define _MD4_H
 
-
 #include "../../../Types.h" // needed for uint32_t
 
 // Use wxString implementation or not
-//#define WANT_STRING_IMPLEMENTATION 1
+// #define WANT_STRING_IMPLEMENTATION 1
 
 // Hook for external progress bar
 typedef bool (*MD4Hook)(int percent);
 
-
 const unsigned int MD4_HASHLEN_BYTE = 128 / 8;
-const unsigned int BUFSIZE = 64*1024;
-const unsigned int PARTSIZE = 9500*1024;
-
+const unsigned int BUFSIZE = 64 * 1024;
+const unsigned int PARTSIZE = 9500 * 1024;
 
 class MD4
-  {
-  private:
+{
+private:
 
-  protected:
+protected:
+	struct MD4Context
+	{
+		uint32_t buf4;
+		uint32_t bits2;
+		unsigned char in64;
+	};
 
-    struct MD4Context
-      {
-        uint32_t buf4;
-        uint32_t bits2;
-        unsigned char in64;
-      };
+	void MD4Init(struct MD4Context *context);
+	void MD4Update(struct MD4Context *context, unsigned char const *buf, size_t len);
+	void MD4Final(struct MD4Context *context, unsigned char *digest);
+	void MD4Transform(uint32_t buf4, uint32_t const in16);
 
-    void MD4Init(struct MD4Context *context);
-    void MD4Update(struct MD4Context *context,
-                   unsigned char const *buf, size_t len);
-    void MD4Final(struct MD4Context *context,
-                  unsigned char *digest);
-    void MD4Transform(uint32_t buf4, uint32_t const in16);
+	wxString charToHex(const char *buf, size_t len);
 
-    wxString charToHex(const char *buf, size_t len);
+	size_t calcBufSize(size_t filesize);
 
-    size_t calcBufSize(size_t filesize);
-
-    // Needed to reverse byte order on BIG ENDIAN machines
+	// Needed to reverse byte order on BIG ENDIAN machines
 #if wxBYTE_ORDER == wxBIG_ENDIAN
 
-    void byteReverse(unsigned char *buf, unsigned longs);
+	void byteReverse(unsigned char *buf, unsigned longs);
 #endif
 
-  public:
-
-    /// Constructor
-    MD4()
-    {}
+public:
+	/// Constructor
+	MD4() {}
 
-    /// Destructor
-    virtual ~MD4()
-    {}
+	/// Destructor
+	virtual ~MD4() {}
 
-    /// Algorithm verification
-    static bool selfTest();
+	/// Algorithm verification
+	static bool selfTest();
 
-    /// Get Md4 hash from a string
-    wxString calcMd4FromString(const wxString &buf);
+	/// Get Md4 hash from a string
+	wxString calcMd4FromString(const wxString &buf);
 
-    /// Get Md4 hash from a file
-    wxString calcMd4FromFile(const wxString &filename, MD4Hook hook);
-  };
+	/// Get Md4 hash from a file
+	wxString calcMd4FromFile(const wxString &filename, MD4Hook hook);
+};
 
 #endif /* _MD4_H */

amule-3.0.1.tar.gz/src/utils/cas/cas.c -> amule-3.1.0.tar.gz/src/utils/cas/cas.c Changed

@@ -40,27 +40,25 @@
 #include "graphics.h"
 #include "html.h"
 #include "lines.h"
-#include "config.h"		// For HAVE_GETOPT_LONG
+#include "config.h" // For HAVE_GETOPT_LONG
 
 #ifndef HAVE_GETOPT_LONG
 /* Code from getopt_long.h - getopt_long() for systems that lack it
   Copyright (c) 2001-2011 Arthur de Jong, GPL 2 and later */
-# define no_argument 0
-# define required_argument 1
-# define optional_argument 2
+#define no_argument 0
+#define required_argument 1
+#define optional_argument 2
 
-struct option {
+struct option
+{
 	const char *name;
 	int has_arg;
 	int *flag;
 	int val;
 };
 
-int getopt_long(int argc,
-		char * const argv,
-		const char *optstring,
-		const struct option *longopts,
-		int *longindex);
+int getopt_long(
+	int argc, char *const argv, const char *optstring, const struct option *longopts, int *longindex);
 #endif
 
 /*
@@ -75,30 +73,30 @@
  * 2005,12,16 - stefanero: fixed Kad related stuff and some other things
  */
 
-static struct option long_options = {
-	{ "help", no_argument, NULL, 'h' },
+static struct option long_options = { { "help", no_argument, NULL, 'h' },
 	{ "html", optional_argument, NULL, 'p' },
 	{ "picture", optional_argument, NULL, 'o' },
 	{ "config-dir", required_argument, NULL, 'c' },
-	{ NULL, 0, NULL, 0 }
-};
+	{ NULL, 0, NULL, 0 } };
 
 void usage(char *myname)
 {
-	printf	("   ___    _ _   ___    c aMule statistics\n"
-			" /'___) /'_` )/',__)   by Pedro de Oliveira\n"
-			"( (___ ( (_| |\\__, \\   <falso@rdk.homeip.net>\n"
-			"`\\____)`\\__,_)(____/   Version %s\n\n"
-
-			"Usage: %s OPTION\n"
-			"If run without any option prints stats to stdout\n\n"
-			"OPTIONS:\n"
+	printf("   ___    _ _   ___    c aMule statistics\n"
+	       " /'___) /'_` )/',__)   by Pedro de Oliveira\n"
+	       "( (___ ( (_| |\\__, \\   <falso@rdk.homeip.net>\n"
+	       "`\\____)`\\__,_)(____/   Version %s\n\n"
+
+	       "Usage: %s OPTION\n"
+	       "If run without any option prints stats to stdout\n\n"
+	       "OPTIONS:\n"
 #ifdef __GD__
-			"-o, --picture, -P\tWrites the online signature picture\n"
+	       "-o, --picture, -P\tWrites the online signature picture\n"
 #endif
-			"-p, --html, -H\t\tHTML Page with stats and picture\n"
-			"-c, --config-dir\tSpecifies a config-dir different from home\n"
-			"-h, --help\t\tThis help you're reading\n", CAS_VERSION, myname);
+	       "-p, --html, -H\t\tHTML Page with stats and picture\n"
+	       "-c, --config-dir\tSpecifies a config-dir different from home\n"
+	       "-h, --help\t\tThis help you're reading\n",
+		CAS_VERSION,
+		myname);
 }
 
 #ifndef HAVE_GETOPT_LONG
@@ -107,46 +105,43 @@
   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,
-                char * const argv,
-                const char *optstring,
-                const struct option *longopts,
-                int *longindex)
+int getopt_long(
+	int argc, char *const argv, const char *optstring, const struct option *longopts, int *longindex)
 {
-if ( (optind > 0) && (optind < argc) &&
-     (strncmp(argvoptind,"--",2) == 0) &&
-     (argvoptind2 != '\0') ) {
-        int i;
-        for (i = 0; longoptsi.name != NULL; i++) {
-                int length = strlen(longoptsi.name);
-                if (strncmp(argvoptind+2,longoptsi.name,length) == 0) {
-                        if ( (longoptsi.has_arg == no_argument) && (argvoptind2+length == '\0') ) {
-                                optind++;
-                                return longoptsi.val;
-                        }
-                else if ( (longoptsi.has_arg == required_argument) && (argvoptind2+length == '=') ) {
-                        optarg=argvoptind+3+length;
-                        optind++;
-                        return longoptsi.val;
-                        }
-                else if ( (longoptsi.has_arg == required_argument) && (argvoptind2+length == '\0') ) {
-                        optarg=argvoptind+1;
-                        optind+=2;
-                        return longoptsi.val;
-                        }
-                else if ( (longoptsi.has_arg == optional_argument) && (argvoptind2+length == '=') ) {
-                        optarg=argvoptind+3+length;
-                        optind++;
-                        return longoptsi.val;
-                        }
-                else if ( (longoptsi.has_arg==optional_argument) && (argvoptind2+length == '\0') ) {
-                        optind++;
-                        return longoptsi.val;
-                        }
-                }
-        }
-}
-return getopt(argc,argv,optstring);
+	if ((optind > 0) && (optind < argc) && (strncmp(argvoptind, "--", 2) == 0) &&
+		(argvoptind2 != '\0')) {
+		int i;
+		for (i = 0; longoptsi.name != NULL; i++) {
+			int length = strlen(longoptsi.name);
+			if (strncmp(argvoptind + 2, longoptsi.name, length) == 0) {
+				if ((longoptsi.has_arg == no_argument) &&
+					(argvoptind2 + length == '\0')) {
+					optind++;
+					return longoptsi.val;
+				} else if ((longoptsi.has_arg == required_argument) &&
+					   (argvoptind2 + length == '=')) {
+					optarg = argvoptind + 3 + length;
+					optind++;
+					return longoptsi.val;
+				} else if ((longoptsi.has_arg == required_argument) &&
+					   (argvoptind2 + length == '\0')) {
+					optarg = argvoptind + 1;
+					optind += 2;
+					return longoptsi.val;
+				} else if ((longoptsi.has_arg == optional_argument) &&
+					   (argvoptind2 + length == '=')) {
+					optarg = argvoptind + 3 + length;
+					optind++;
+					return longoptsi.val;
+				} else if ((longoptsi.has_arg == optional_argument) &&
+					   (argvoptind2 + length == '\0')) {
+					optind++;
+					return longoptsi.val;
+				}
+			}
+		}
+	}
+	return getopt(argc, argv, optstring);
 }
 
 #endif // HAVE_GETOPT_LONG
@@ -165,38 +160,37 @@
 	/* Declaration of variables */
 	FILE *amulesig;
 	int use_page = 0;
-	char *config_path=NULL;
+	char *config_path = NULL;
 	char *path;
 	char *stats20;
 	char *linesIMG_TEXTLINES;
 	long lSize;
-	char * buffer;
+	char *buffer;
 	int i;
 	int c;
 	int errflag = 0;
 #ifdef __GD__
 	int use_out_pic = 0;
-	char *path_for_picture=NULL;
+	char *path_for_picture = NULL;
 #endif /* __GD__ */
-	char *path_for_html=NULL;
+	char *path_for_html = NULL;
 	CONF config;
 	time_t lt;
 	struct tm *ltp;
 	char arr20;
 
-	while ((c = getopt_long (argc, argv, "c:P:H:hpo", long_options, NULL)) != -1)
+	while ((c = getopt_long(argc, argv, "c:P:H:hpo", long_options, NULL)) != -1)
 
-		switch (c)
-		{
+		switch (c) {
 		case 'c':
-			config_path=optarg;
+			config_path = optarg;
 			break;
 		case 'h':
 			usage(argv0);
 			exit(0);
 		case 'H':
 		case 'p':
-			use_page=1;
+			use_page = 1;
 			if (optarg != NULL) {
 				path_for_html = optarg;
 			}
@@ -204,7 +198,7 @@
 #ifdef __GD__
 		case 'P':
 		case 'o':
-			use_out_pic=1;
+			use_out_pic = 1;
 			if (optarg != NULL) {
 				path_for_picture = optarg;
 			}
@@ -213,10 +207,10 @@
 		case '?':
 			errflag++;
 		}
-		if (errflag) {
-			usage(argv0);
-			exit (2);
-		}
+	if (errflag) {
+		usage(argv0);
+		exit(2);
+	}
 
 	/* get amulesig path */
 
@@ -229,7 +223,9 @@
 
 	/* open the file and if not exists exit with an error */
 	if ((amulesig = fopen(path, "r")) == NULL) {
-		fprintf(stderr, "Unable to open file %s\nCheck if you have amule online signature enabled.\n", path);
+		fprintf(stderr,
+			"Unable to open file %s\nCheck if you have amule online signature enabled.\n",
+			path);
 		exit(2);
 	}
 	/* i believe this shouldn't be here.
@@ -255,24 +251,25 @@
 
 	/* start reading the stuff from amulesign to the stats array */
 	// obtain file size.
-	fseek (amulesig , 0 , SEEK_END);
-	lSize = ftell (amulesig);
+	fseek(amulesig, 0, SEEK_END);
+	lSize = ftell(amulesig);
 	if (0 == lSize) {
 		perror("aMule signature file is 0 Byte, exiting.\n");
 		exit(2);
 	}
-	rewind (amulesig);
-	buffer = (char*) malloc (lSize);
+	rewind(amulesig);
+	buffer = (char *)malloc(lSize);
 	if (buffer == NULL) {
 		perror("Could not create buffer\n");
-		exit (2);
+		exit(2);
 	}
-	if (fread(buffer,1,lSize,amulesig)){}	// // prevent GCC warning
+	if (fread(buffer, 1, lSize, amulesig)) {
+	} // // prevent GCC warning
 	fclose(amulesig);
 
-	stats0 = strtok (buffer,"\n");
-	for (i=1;i<17;i++) {
-		statsi = strtok (NULL,"\n");
+	stats0 = strtok(buffer, "\n");
+	for (i = 1; i < 17; i++) {
+		statsi = strtok(NULL, "\n");
 		if (NULL == statsi) {
 			perror("Too few fields in aMule signature file, exiting.\n");
 			exit(2);
@@ -287,48 +284,48 @@
 	// if amule isn't running say that and exit else print out the stuff
 
 	// if amule uptime is 0, then its not running...
-	if (strncmp(stats16,"0",1) == 0 ) {
+	if (strncmp(stats16, "0", 1) == 0) {
 		perror("aMule is not running\n");
 		exit(3);
 	}
 
-
-	if (strncmp(stats0,"2",1) == 0)
-		CreateLine(lines, 0 ,"aMule %s is connecting\n", stats13);
+	if (strncmp(stats0, "2", 1) == 0)
+		CreateLine(lines, 0, "aMule %s is connecting\n", stats13);
 	else
-		CreateLine(lines, 0, "aMule %s has been running for %s\n",
-				stats13, timeconv(stats16));
-
-
+		CreateLine(lines, 0, "aMule %s has been running for %s\n", stats13, timeconv(stats16));
 
-	if (strncmp(stats0,"0",1) == 0 && strncmp(stats5,"0",1) == 0)
+	if (strncmp(stats0, "0", 1) == 0 && strncmp(stats5, "0", 1) == 0)
 		CreateLine(lines, 1, "%s is not connected ", stats10);
-	else if (strncmp(stats0,"0",1) == 0 && strncmp(stats5,"0",1) != 0)
+	else if (strncmp(stats0, "0", 1) == 0 && strncmp(stats5, "0", 1) != 0)
 		CreateLine(lines, 1, "%s is connected to ", stats10);
 	else
-		CreateLine(lines, 1, "%s is connected to %s %s:%s with ", stats10,
-			stats1, stats2, stats3);
-
-
-	if (strncmp(stats5,"2",1) == 0) {
-		if (strncmp(stats4,"H",1) == 0)
+		CreateLine(lines,
+			1,
+			"%s is connected to %s %s:%s with ",
+			stats10,
+			stats1,
+			stats2,
+			stats3);
+
+	if (strncmp(stats5, "2", 1) == 0) {
+		if (strncmp(stats4, "H", 1) == 0)
 			AppendToLine(lines, 1, "HighID | Kad: ok \n");
-		else if (strncmp(stats4,"L",1) == 0)
-                        AppendToLine(lines, 1, "LowID | Kad: ok \n");
+		else if (strncmp(stats4, "L", 1) == 0)
+			AppendToLine(lines, 1, "LowID | Kad: ok \n");
 		else
 			AppendToLine(lines, 1, "Kad: ok \n");
-	} else if (strncmp(stats5,"1",1) == 0) {
-		if (strncmp(stats4,"H",1) == 0)
+	} else if (strncmp(stats5, "1", 1) == 0) {
+		if (strncmp(stats4, "H", 1) == 0)
 			AppendToLine(lines, 1, "HighID | Kad: firewalled \n");
-		else if (strncmp(stats4,"L",1) == 0)
-                        AppendToLine(lines, 1, "LowID | Kad: firewalled \n");
+		else if (strncmp(stats4, "L", 1) == 0)
+			AppendToLine(lines, 1, "LowID | Kad: firewalled \n");
 		else
 			AppendToLine(lines, 1, "Kad: firewalled \n");
 	} else {
-		if (strncmp(stats4,"H",1) == 0)
+		if (strncmp(stats4, "H", 1) == 0)
 			AppendToLine(lines, 1, "HighID | Kad: off \n");
-		else if (strncmp(stats4,"L",1) == 0)
-                        AppendToLine(lines, 1, "LowID | Kad: off \n");
+		else if (strncmp(stats4, "L", 1) == 0)
+			AppendToLine(lines, 1, "LowID | Kad: off \n");
 		else
 			AppendToLine(lines, 1, "but running\n");
 	}
@@ -336,16 +333,16 @@
 	stats11 = strdup(convbytes(stats11));
 	stats12 = strdup(convbytes(stats12));
 
-	CreateLine(lines, 2, "Total Download: %s, Upload: %s\n",stats11 , stats12);
+	CreateLine(lines, 2, "Total Download: %s, Upload: %s\n", stats11, stats12);
 
 	stats15 = strdup(convbytes(stats15));
 	stats14 = strdup(convbytes(stats14));
 
-	CreateLine(lines, 3, "Session Download: %s, Upload: %s\n",stats14, stats15);
+	CreateLine(lines, 3, "Session Download: %s, Upload: %s\n", stats14, stats15);
 
 	CreateLine(lines, 4, "Download: %s kB/s, Upload: %s kB/s\n", stats6, stats7);
 
-	CreateLine(lines, 5, "Sharing: %s file(s), Clients on queue: %s\n", stats9 , stats8);
+	CreateLine(lines, 5, "Sharing: %s file(s), Clients on queue: %s\n", stats9, stats8);
 
 	CreateLine(lines, 6, "Time: %s\n", arr);
 
@@ -371,7 +368,7 @@
 			exit(4);
 		}
 
-		if (!create_html(stats,lines,config.template, path_for_html)) {
+		if (!create_html(stats, lines, config.template, path_for_html)) {
 			perror("Could not create the HTML Page.\n");
 		}
 
@@ -382,7 +379,6 @@
 		}
 #endif
 
-
 		exit(0);
 	}
 	for (i = 0; i <= 6; i++) {
@@ -392,4 +388,3 @@
 	free(buffer);
 	exit(0);
 }
-

amule-3.0.1.tar.gz/src/utils/cas/configfile.c -> amule-3.1.0.tar.gz/src/utils/cas/configfile.c Changed

@@ -23,7 +23,7 @@
  *  along with this program; if not, write to the
  *  Free Software Foundation, Inc.,
  *  51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
-*/
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,21 +32,20 @@
 #include "configfile.h"
 #include "functions.h"
 
-#define STRINGIFY(x)	#x
-#define STRINGIFY_EXPAND(x)	STRINGIFY(x)
+#define STRINGIFY(x) #x
+#define STRINGIFY_EXPAND(x) STRINGIFY(x)
 
-#define MAX_CONF_ARG_LEN_STR	STRINGIFY_EXPAND(MAX_CONF_ARG_LEN)
+#define MAX_CONF_ARG_LEN_STR STRINGIFY_EXPAND(MAX_CONF_ARG_LEN)
 
-#define MAX_CONF_KEY_LEN	12
-#define MAX_CONF_KEY_LEN_STR	STRINGIFY_EXPAND(MAX_CONF_KEY_LEN)
+#define MAX_CONF_KEY_LEN 12
+#define MAX_CONF_KEY_LEN_STR STRINGIFY_EXPAND(MAX_CONF_KEY_LEN)
 
 int writeconfig(void)
 {
 	FILE *config;
 	char *path;
 	unsigned int i;
-	char *def = {
-		"# cas config file\n",
+	char *def = { "# cas config file\n",
 		"#\n",
 		"# font - full path to a ttf font\n",
 		"# font_size - size the font\n",
@@ -62,15 +61,14 @@
 		"fifth_line 23,85,1\n",
 		"sixth_line 23,102,1\n",
 		"seventh_line 23,119,1\n",
-		"template /usr/share/cas/tmp.html\n"
-		"img_type 0\n"
-	};
+		"template /usr/share/cas/tmp.html\n",
+		"img_type 0\n" };
 
 	path = get_path("casrc");
 	if (path == NULL)
 		return 0;
 
-	if ( (config = fopen(path, "w")) == NULL)
+	if ((config = fopen(path, "w")) == NULL)
 		return 0;
 
 	for (i = 0; i < sizeof(def) / sizeof(char *); i++)
@@ -90,15 +88,13 @@
 	char buffer120, option15, *path;
 	FILE *conf;
 	int i;
-	char linesIMG_TEXTLINES13 = {
-		"first_line",
+	char linesIMG_TEXTLINES13 = { "first_line",
 		"second_line",
 		"third_line",
 		"fourth_line",
 		"fifth_line",
 		"sixth_line",
-		"seventh_line"
-	};
+		"seventh_line" };
 
 	path = get_path("casrc");
 	if (path == NULL) {
@@ -118,23 +114,34 @@
 	buffer0 = 0;
 	while (!feof(conf)) {
 		// Jacobo221 - ToDo Only first char per line is comment...
-		if (fgets (buffer,120,conf)) {
+		// fgets() is null-checked, so a failed read is handled; the legacy
+		// feof() loop is harmless here.
+		// NOLINTNEXTLINE(clang-analyzer-unix.Stream)
+		if (fgets(buffer, 120, conf)) {
 			if (buffer0 != '#') {
 				/* Only two fields per line */
-				sscanf(buffer, "%" MAX_CONF_KEY_LEN_STR "s %*" MAX_CONF_ARG_LEN_STR "s", option);
-				fflush (stdout);
-		// Jacobo221 - ToDo So lines can't be swapped...
+				sscanf(buffer,
+					"%" MAX_CONF_KEY_LEN_STR "s %*" MAX_CONF_ARG_LEN_STR "s",
+					option);
+				fflush(stdout);
+				// Jacobo221 - ToDo So lines can't be swapped...
 				if (strcmp(option, "font") == 0) {
-					sscanf(buffer, "%*" MAX_CONF_KEY_LEN_STR "s %" MAX_CONF_ARG_LEN_STR "s", config->font);
+					sscanf(buffer,
+						"%*" MAX_CONF_KEY_LEN_STR "s %" MAX_CONF_ARG_LEN_STR "s",
+						config->font);
 				}
 				if (strcmp(option, "font_size") == 0) {
 					sscanf(buffer, "%*" MAX_CONF_KEY_LEN_STR "s %10f", &config->size);
 				}
 				if (strcmp(option, "source_image") == 0) {
-					sscanf(buffer, "%*" MAX_CONF_KEY_LEN_STR "s %" MAX_CONF_ARG_LEN_STR "s", config->source);
+					sscanf(buffer,
+						"%*" MAX_CONF_KEY_LEN_STR "s %" MAX_CONF_ARG_LEN_STR "s",
+						config->source);
 				}
 				if (strcmp(option, "template") == 0) {
-					sscanf(buffer, "%*" MAX_CONF_KEY_LEN_STR "s %" MAX_CONF_ARG_LEN_STR "s", config->template);
+					sscanf(buffer,
+						"%*" MAX_CONF_KEY_LEN_STR "s %" MAX_CONF_ARG_LEN_STR "s",
+						config->template);
 				}
 				if (strcmp(option, "img_type") == 0) {
 					sscanf(buffer, "%*" MAX_CONF_KEY_LEN_STR "s %1d", &config->img_type);
@@ -144,7 +151,8 @@
 					if (strcmp(option, linesi) == 0) {
 						sscanf(buffer,
 							"%*" MAX_CONF_KEY_LEN_STR "s %4d,%4d,%4d",
-							&config->xi, &config->yi,
+							&config->xi,
+							&config->yi,
 							&config->enabledi);
 					}
 				}
@@ -156,4 +164,3 @@
 
 	return 1;
 }
-

amule-3.0.1.tar.gz/src/utils/cas/configfile.h -> amule-3.1.0.tar.gz/src/utils/cas/configfile.h Changed

amule-3.0.1.tar.gz/src/utils/cas/functions.c -> amule-3.1.0.tar.gz/src/utils/cas/functions.c Changed

@@ -29,8 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>		/* PATH_MAX */
-
+#include <limits.h> /* PATH_MAX */
 
 /* XXX This needs to be replaced so that we use
  * autoconf to detect the target OS -- As of now
@@ -44,21 +43,21 @@
  */
 
 #ifdef __APPLE__
-	#define CAS_DIR_SEPARATOR	"/"
+#define CAS_DIR_SEPARATOR "/"
 #elif defined(__WIN32__)
-	#define COBJMACROS
-	#include <winerror.h>
-	#include <shlobj.h>
-	#include <objidl.h>
-	#define CAS_DIR_SEPARATOR	"\\"
+#define COBJMACROS
+#include <winerror.h>
+#include <shlobj.h>
+#include <objidl.h>
+#define CAS_DIR_SEPARATOR "\\"
 #else
-	#define CAS_DIR_SEPARATOR	"/"
-	#if defined(unix) || defined(__unix__) || defined(__unix)
-		#include <unistd.h>
-		#include <pwd.h>
-		#include <fcntl.h>
-		#define CAS_UNIX
-	#endif
+#define CAS_DIR_SEPARATOR "/"
+#if defined(unix) || defined(__unix__) || defined(__unix)
+#include <unistd.h>
+#include <pwd.h>
+#include <fcntl.h>
+#define CAS_UNIX
+#endif
 #endif
 
 /* try (hard) to get correct path for aMule signature
@@ -67,7 +66,7 @@
 
 char *get_path(const char *file)
 {
-	char *ret;	/* caller should free return value */
+	char *ret; /* caller should free return value */
 	static char *saved_home = NULL;
 	static size_t home_len = 0;
 
@@ -82,9 +81,10 @@
 		char homePATH_MAX;
 		home0 = '\0';
 
-		const char* home_env = getenv("HOME");
+		const char *home_env = getenv("HOME");
 		if (home_env) {
-			snprintf(home, sizeof(home),
+			snprintf(home,
+				sizeof(home),
 				"%s/Library/Application Support" CAS_DIR_SEPARATOR "aMule",
 				home_env);
 		}
@@ -112,12 +112,11 @@
 			}
 		}
 
-
 #else
 		char *home;
 
 		/* get home directory */
-		if ( (home = getenv("HOME")) == NULL) {
+		if ((home = getenv("HOME")) == NULL) {
 #ifndef CAS_UNIX
 			return NULL;
 #else
@@ -155,7 +154,7 @@
 
 		/* save the result for future calls */
 		home_len = strlen(home);
-		if ( (saved_home = strdup(home)) == NULL)
+		if ((saved_home = strdup(home)) == NULL)
 			return NULL;
 	}
 
@@ -170,7 +169,7 @@
 
 	strcpy(ret, saved_home);
 	rethome_len = CAS_DIR_SEPARATOR0;
-	rethome_len+1 = '\0';
+	rethome_len + 1 = '\0';
 	strcat(ret, file);
 	/* the string is guaranteed to be null-terminated
 	 * so no need to do this...
@@ -223,7 +222,7 @@
 
 	/* do proper conversion and check for errors */
 	errno = 0;
-	bytes = (float) strtod(input, &endptr);
+	bytes = (float)strtod(input, &endptr);
 
 	/* check bad string conversion or value out of range */
 	if (*endptr != '\0' || errno == ERANGE)
@@ -247,45 +246,46 @@
 
 void replace(char *tmpl, const char *search, const char *to_replace)
 {
-	char *dest   = NULL;
+	char *dest = NULL;
 	char *retStr = NULL;
 
 	/* returning the 'tmpl' if 'search' is NULL */
-  if (NULL == tmpl || NULL == search) /* || NULL == to_replace) */
-  {
+	if (NULL == tmpl || NULL == search) /* || NULL == to_replace) */
+	{
 		return;
 	}
 
-	while (1)
-	{
-		int befLen,srchLen,repLen,totLen;
+	while (1) {
+		int befLen, srchLen, repLen, totLen;
 		/* if 'search' is found in 'tmpl' */
 		retStr = strstr(tmpl, search);
-		if (NULL == retStr)
-		{
+		if (NULL == retStr) {
 			return;
 		}
 
-		totLen	= strlen(tmpl);
-		befLen	= (int)(retStr - tmpl);
+		totLen = strlen(tmpl);
+		befLen = (int)(retStr - tmpl);
 		srchLen = strlen(search);
-		repLen	= strlen(to_replace);
+		repLen = strlen(to_replace);
 
 		/* dynamic buffer creation... */
-		dest = (char*)malloc(totLen + 1 + repLen - srchLen);
+		dest = (char *)malloc(totLen + 1 + repLen - srchLen);
 		if (NULL == dest)
 			return;
 
 		/* copy the before buffer */
 		strncpy(dest, tmpl, befLen);
 		/* copy the replace string */
-		memcpy((dest+befLen), to_replace, repLen); /* strcat(dest, to_replace); */
+		memcpy((dest + befLen), to_replace, repLen); /* strcat(dest, to_replace); */
 		/* copy the after buffer */
-		memcpy((dest+befLen+repLen), &tmplbefLen + srchLen, strlen(&tmplbefLen + srchLen)); /*strcat(dest, &tmplbefLen + repLen); */
+		memcpy((dest + befLen + repLen),
+			&tmplbefLen + srchLen,
+			strlen(&tmplbefLen + srchLen)); /*strcat(dest, &tmplbefLen + repLen); */
 
 		/* now replace the template string with the resulting and search it again */
 		strcpy(tmpl, dest);
-		/* we need this, because we're modifying the 'tmpl' instead of creating a new one (so we need to update the position of the null char) */
+		/* we need this, because we're modifying the 'tmpl' instead of creating a new one (so we need
+		 * to update the position of the null char) */
 		tmpltotLen - srchLen + repLen = '\0';
 		/* clean up... */
 		free(dest);
@@ -298,15 +298,15 @@
 	static char ret50;
 
 	if (count < 0)
-		snprintf (ret,50,"?");
+		snprintf(ret, 50, "?");
 	else if (count < 60)
-		snprintf (ret,50,"%02i %s", count, "secs" );
+		snprintf(ret, 50, "%02i %s", count, "secs");
 	else if (count < 3600)
-		snprintf (ret,50,"%i:%02i %s", count/60, (count % 60), "mins" );
+		snprintf(ret, 50, "%i:%02i %s", count / 60, (count % 60), "mins");
 	else if (count < 86400)
-		snprintf (ret,50,"%i:%02i %s", count/3600, (count % 3600)/60, "h" );
+		snprintf(ret, 50, "%i:%02i %s", count / 3600, (count % 3600) / 60, "h");
 	else
-		snprintf (ret,50,"%i %s %02i %s", count/86400, "D" , (count % 86400) / 3600, "h" );
+		snprintf(ret, 50, "%i %s %02i %s", count / 86400, "D", (count % 86400) / 3600, "h");
 
 	return (ret);
 }

amule-3.0.1.tar.gz/src/utils/cas/functions.h -> amule-3.1.0.tar.gz/src/utils/cas/functions.h Changed

amule-3.0.1.tar.gz/src/utils/cas/graphics.c -> amule-3.1.0.tar.gz/src/utils/cas/graphics.c Changed

@@ -23,8 +23,7 @@
  *  along with this program; if not, write to the
  *  Free Software Foundation, Inc.,
  *  51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-
+ */
 
 #ifdef __GD__
 
@@ -48,13 +47,13 @@
 	int white, i;
 	int brect8;
 
-	if ( (in = fopen(config->font, "r")) == NULL) {
+	if ((in = fopen(config->font, "r")) == NULL) {
 		perror("font not found\ncheck casrc\n");
 		return 0;
 	}
 	fclose(in);
 
-	if ( (in = fopen(config->source, "rb")) == NULL) {
+	if ((in = fopen(config->source, "rb")) == NULL) {
 		perror("source_image not found\ncheck casrc\n");
 		return 0;
 	}
@@ -62,7 +61,7 @@
 	im = gdImageCreateFromPng(in);
 	fclose(in);
 
-	if( NULL == im) {
+	if (NULL == im) {
 		perror("Error loading source image (not a valid png image file?).\n");
 		return 0;
 	}
@@ -70,18 +69,25 @@
 
 	for (i = 0; i < IMG_TEXTLINES; i++) {
 		if (config->enabledi == 1) {
-			gdImageStringFT(im, &brect0, white, config->font, config->size,
-					0.0, config->xi, config->yi, linesi);
+			gdImageStringFT(im,
+				&brect0,
+				white,
+				config->font,
+				config->size,
+				0.0,
+				config->xi,
+				config->yi,
+				linesi);
 		}
 	}
 
-	if (config->img_type==0) {
+	if (config->img_type == 0) {
 		path = get_amule_path("aMule-online-sign.png", 0, path_for_picture);
 	} else {
 		path = get_amule_path("aMule-online-sign.jpg", 0, path_for_picture);
 	}
 
-	if (path == NULL && config->img_type==0) {
+	if (path == NULL && config->img_type == 0) {
 		perror("could not get PNG path\n");
 		return 0;
 	} else if (path == NULL) {
@@ -91,7 +97,7 @@
 	out = fopen(path, "w");
 	free(path);
 
-	if (config->img_type==0) {
+	if (config->img_type == 0) {
 		gdImagePng(im, out);
 	} else {
 		gdImageJpeg(im, out, -1);
@@ -105,4 +111,3 @@
 }
 
 #endif
-

amule-3.0.1.tar.gz/src/utils/cas/graphics.h -> amule-3.1.0.tar.gz/src/utils/cas/graphics.h Changed

amule-3.0.1.tar.gz/src/utils/cas/html.c -> amule-3.1.0.tar.gz/src/utils/cas/html.c Changed

@@ -25,7 +25,6 @@
  *  51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -43,31 +42,50 @@
 	/* Strings */
 	char *path = NULL;
 	char version25, upload25, download25;
-	char *search = {"#VERSION#", "#CLIENT#", "#NICK#", "#UPLOADRATE#" ,
-		"#DOWNLOADRATE#" , "#QUEUE#" , "#NUMSHARE#" , "#SESSIONUP#" ,
-		"#SESSIONDOWN#" , "#TOTALUP#", "#TOTALDOWN#" , "#SERVER#" , "#IP#",
+	char *search = { "#VERSION#",
+		"#CLIENT#",
+		"#NICK#",
+		"#UPLOADRATE#",
+		"#DOWNLOADRATE#",
+		"#QUEUE#",
+		"#NUMSHARE#",
+		"#SESSIONUP#",
+		"#SESSIONDOWN#",
+		"#TOTALUP#",
+		"#TOTALDOWN#",
+		"#SERVER#",
+		"#IP#",
 		"#PORT#" };
 
 	snprintf(version, 25, "cas %s", CAS_VERSION);
 	snprintf(upload, 25, "%s kB/s", stats7);
 	snprintf(download, 25, "%s kB/s", stats6);
 
-	char *repl = { version , lines0 , stats10 , upload , download ,
-		stats8 , stats9 , stats15 , stats14 , stats12 , stats11 ,
-		stats1 , stats2 , stats3 };
+	char *repl = { version,
+		lines0,
+		stats10,
+		upload,
+		download,
+		stats8,
+		stats9,
+		stats15,
+		stats14,
+		stats12,
+		stats11,
+		stats1,
+		stats2,
+		stats3 };
 
 	/* get some memory to read the template into */
 	int fdTmpl;
-	if ((fdTmpl = open(template, O_RDONLY)) < 0)
-	{
-		printf("\n\n%s\n",template);
+	if ((fdTmpl = open(template, O_RDONLY)) < 0) {
+		printf("\n\n%s\n", template);
 		perror("Could not open file");
-		exit (43);
+		exit(43);
 	}
 
 	struct stat sb;
-	if (fstat(fdTmpl, &sb) < 0)
-	{
+	if (fstat(fdTmpl, &sb) < 0) {
 		perror("Could not stat file");
 		exit(43);
 	}
@@ -75,10 +93,9 @@
 
 	/* 2 times the size of the template should be enough */
 	/* st_size is defined as off_t, but size_t seems more reasonable */
-	size_t size = sb.st_size*2;
+	size_t size = sb.st_size * 2;
 	char *mem = calloc(size, 1);
-	if (NULL == mem)
-	{
+	if (NULL == mem) {
 		perror("Could not calloc\n");
 		exit(44);
 	}
@@ -86,15 +103,13 @@
 	/* read the template into the memory */
 	size_t len = 0;
 	int ler;
-	FILE *fTmpl = fopen(template,"r");
-	if (NULL == fTmpl)
-	{
+	FILE *fTmpl = fopen(template, "r");
+	if (NULL == fTmpl) {
 		perror("Could not open template");
 		free(mem);
 		exit(44);
 	}
-	while ((ler=fgetc(fTmpl)) != EOF && len+1 < size)
-	{
+	while ((ler = fgetc(fTmpl)) != EOF && len + 1 < size) {
 		memlen++ = ler;
 	}
 	fclose(fTmpl);
@@ -102,8 +117,7 @@
 	/* printf ("HTML: %s\n", mem); */
 
 	int t;
-	for (t=0; t<=13; t++)
-	{
+	for (t = 0; t <= 13; t++) {
 		/* replace the special tags */
 		replace(mem, searcht, replt);
 	}
@@ -112,16 +126,14 @@
 
 	path = get_amule_path("aMule-online-sign.html", 0, path_for_html);
 
-	if (NULL == path)
-	{
+	if (NULL == path) {
 		perror("could not get the HTML path\n");
 		free(mem);
 		return 0;
 	}
 
 	FILE *fHTML = NULL;
-	if ((fHTML = fopen(path, "w")) == NULL)
-	{
+	if ((fHTML = fopen(path, "w")) == NULL) {
 		perror("Unable to create file\n");
 		free(path);
 		free(mem);

amule-3.0.1.tar.gz/src/utils/cas/lines.c -> amule-3.1.0.tar.gz/src/utils/cas/lines.c Changed

amule-3.0.1.tar.gz/src/utils/cas/version.h -> amule-3.1.0.tar.gz/src/utils/cas/version.h Changed

amule-3.0.1.tar.gz/src/utils/fileview/CMakeLists.txt -> amule-3.1.0.tar.gz/src/utils/fileview/CMakeLists.txt Changed

amule-3.0.1.tar.gz/src/utils/fileview/FileView.cpp -> amule-3.1.0.tar.gz/src/utils/fileview/FileView.cpp Changed

@@ -32,17 +32,17 @@
 #include "../../CFile.h"
 #include <common/LocaleInit.h>
 
-#define VERSION_MAJOR	0
-#define VERSION_MINOR	10
-#define VERSION_MICRO	1
+#define VERSION_MAJOR 0
+#define VERSION_MINOR 10
+#define VERSION_MICRO 1
 
 class CFileView : public wxApp
 {
-      private:
+private:
 	virtual int OnRun();
 
-	virtual void OnInitCmdLine(wxCmdLineParser& parser);
-	virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
+	virtual void OnInitCmdLine(wxCmdLineParser &parser);
+	virtual bool OnCmdLineParsed(wxCmdLineParser &parser);
 
 	std::list<wxString> m_files;
 };
@@ -50,51 +50,71 @@
 DECLARE_APP(CFileView);
 
 // Logging facility from aMule
-enum DebugType {};
+enum DebugType
+{
+};
 
 class CLogger
 {
-      public:
+public:
 	bool IsEnabled(DebugType /*type*/) const;
-	void AddLogLine(const wxString& /*file*/, int /*line*/, bool /*critical*/, DebugType /*type*/, const wxString& str, bool /*toStdout*/, bool /*toGUI*/);
+	void AddLogLine(const wxString & /*file*/,
+		int /*line*/,
+		bool /*critical*/,
+		DebugType /*type*/,
+		const wxString &str,
+		bool /*toStdout*/,
+		bool /*toGUI*/);
 };
 
-// Out-of-line definitions: SafeFile.cpp's Debug-build AddDebugLogLine*
-// macros expand to references against these symbols, and an inline body
-// in the class wouldn't emit one.
+// Out-of-line definitions: SafeFile.cpp's Debug-build AddDebugLogLine* macros expand to references
+// against these symbols, and an inline body in the class would not emit one.
 bool CLogger::IsEnabled(DebugType /*type*/) const
 {
 	return false;
 }
 
-void CLogger::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);
 
-void CFileView::OnInitCmdLine(wxCmdLineParser& parser)
+void CFileView::OnInitCmdLine(wxCmdLineParser &parser)
 {
-	// Pull LC_CTYPE etc. from the environment so unicode2char() emits
-	// real UTF-8 instead of mangling non-ASCII filenames under the
-	// default "C" locale (see #203). CFileView has no OnInit override,
-	// so this is the earliest hook wxApp calls after construction.
+	// Pull LC_CTYPE etc. from the environment so unicode2char() emits real UTF-8 instead of
+	// mangling non-ASCII filenames under the default "C" locale (see #203). CFileView has no
+	// OnInit override, so this is the earliest hook wxApp calls after construction.
 	aMuleInitLocale();
 
 	parser.AddSwitch("h", "help", "Show help", wxCMD_LINE_OPTION_HELP);
 	parser.AddSwitch("v", "version", "Show program version", wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddOption("s", "strings", "String decoding mode: display (default), safe, utf8, none", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
-	parser.AddParam("input file", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE);
+	parser.AddOption("s",
+		"strings",
+		"String decoding mode: display (default), safe, utf8, none",
+		wxCMD_LINE_VAL_STRING,
+		wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddParam(
+		"input file", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE);
 }
 
-bool CFileView::OnCmdLineParsed(wxCmdLineParser& parser)
+bool CFileView::OnCmdLineParsed(wxCmdLineParser &parser)
 {
 	if (parser.Found("version")) {
-		cout << wxString::Format("MuleFileView version %u.%u.%u\nCopyright (c) 2008-2011 aMule Team\n", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
+		cout << wxString::Format(
+			"MuleFileView version %u.%u.%u\nCopyright (c) 2008-2011 aMule Team\n",
+			VERSION_MAJOR,
+			VERSION_MINOR,
+			VERSION_MICRO);
 		return false;
 	} else {
 		wxString strDecode;
@@ -108,7 +128,8 @@
 			} else if (strDecode == "none") {
 				SetStringsMode(SD_NONE);
 			} else {
-				parser.SetLogo("Error: Invalid argument to --strings option: \"" + strDecode + "\"");
+				parser.SetLogo(
+					"Error: Invalid argument to --strings option: \"" + strDecode + "\"");
 				parser.Usage();
 				return false;
 			}
@@ -168,20 +189,25 @@
 					cerr << "ERROR: Don't know how to decode " << *it << endl;
 				}
 			}
-		} catch (const CEOFException& e) {
-			cerr << "ERROR: A CEOFException has been raised while decoding " << *it << ": " << e.what() << endl;
+		} catch (const CEOFException &e) {
+			cerr << "ERROR: A CEOFException has been raised while decoding " << *it << ": "
+			     << e.what() << endl;
 			return 1;
-		} catch (const CIOFailureException& e) {
-			cerr << "ERROR: A CIOFailureException has been raised while decoding " << *it << ": " << e.what() << endl;
+		} catch (const CIOFailureException &e) {
+			cerr << "ERROR: A CIOFailureException has been raised while decoding " << *it << ": "
+			     << e.what() << endl;
 			return 1;
-		} catch (const CSafeIOException& e) {
-			cerr << "ERROR: A CSafeIOException has been raised while decoding " << *it << ": " << e.what() << endl;
+		} catch (const CSafeIOException &e) {
+			cerr << "ERROR: A CSafeIOException has been raised while decoding " << *it << ": "
+			     << e.what() << endl;
 			return 1;
-		} catch (const CMuleException& e) {
-			cerr << "ERROR: A CMuleException has been raised while decoding " << *it << ": " << e.what() << endl;
+		} catch (const CMuleException &e) {
+			cerr << "ERROR: A CMuleException has been raised while decoding " << *it << ": "
+			     << e.what() << endl;
 			return 1;
-		} catch (const wxString& e) {
-			cerr << "ERROR: An exception of type wxString has been raised while decoding " << *it << ": " << e << endl;
+		} catch (const wxString &e) {
+			cerr << "ERROR: An exception of type wxString has been raised while decoding " << *it
+			     << ": " << e << endl;
 			return 1;
 		}
 	}

amule-3.0.1.tar.gz/src/utils/fileview/KadFiles.cpp -> amule-3.1.0.tar.gz/src/utils/fileview/KadFiles.cpp Changed

@@ -26,17 +26,17 @@
 #include "KadFiles.h"
 #include "Print.h"
 #include "../../SafeFile.h"
-#include "../../kademlia/kademlia/SearchManager.h"	// for CSearchManager::GetInvalidKeywordChars()
+#include "../../kademlia/kademlia/SearchManager.h" // for CSearchManager::GetInvalidKeywordChars()
 #include <wx/tokenzr.h>
 
-void DecodePreferencesKadDat(const CFileDataIO& file)
+void DecodePreferencesKadDat(const CFileDataIO &file)
 {
 	cout << "IP      : " << CKadIP(file.ReadUInt32()) << '\n';
 	cout << "(unused): " << file.ReadUInt16() << '\n';
 	cout << "ClientID: " << file.ReadUInt128() << '\n';
 }
 
-void DecodeLoadIndexDat(const CFileDataIO& file)
+void DecodeLoadIndexDat(const CFileDataIO &file)
 {
 	cout << "Version   : " << file.ReadUInt32();
 	cout << "\n(savetime): " << CTimeT(file.ReadUInt32());
@@ -50,7 +50,7 @@
 
 // from Kademlia.cpp
 #include "../../CryptoPP_Inc.h"
-void KadGetKeywordHash(const wxString& rstrKeyword, Kademlia::CUInt128* pKadID)
+void KadGetKeywordHash(const wxString &rstrKeyword, Kademlia::CUInt128 *pKadID)
 {
 	uint8_t Output16;
 
@@ -59,13 +59,13 @@
 	// This should be safe - we assume rstrKeyword is ANSI anyway.
 	Unicode2CharBuf ansi_buffer(unicode2UTF8(rstrKeyword));
 
-	md4_hasher.CalculateDigest(Output, (const uint8_t *) (const char *) ansi_buffer, strlen(ansi_buffer));
+	md4_hasher.CalculateDigest(Output, (const uint8_t *)(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)
+bool IdentifyKeyword(const Kademlia::CUInt128 &keyID, const wxString &str, wxString &keyword)
 {
 	wxStringTokenizer tkz(str, Kademlia::CSearchManager::GetInvalidKeywordChars());
 	while (tkz.HasMoreTokens()) {
@@ -84,7 +84,7 @@
 	return false;
 }
 
-void DecodeKeyIndexDat(const CFileDataIO& file)
+void DecodeKeyIndexDat(const CFileDataIO &file)
 {
 	uint32_t version;
 	uint32_t numKeys;
@@ -105,7 +105,7 @@
 			cout << "\t\tSourceID: " << file.ReadUInt128();
 			cout << "\n\t\tnumName : " << (numName = file.ReadUInt32()) << '\n';
 			for (uint32_t iN = 0; iN < numName; iN++) {
-				cout << "\t\t\tLifeTime : " <<  CTimeT(file.ReadUInt32()) << '\n';
+				cout << "\t\t\tLifeTime : " << CTimeT(file.ReadUInt32()) << '\n';
 				if (version >= 3) {
 					uint32_t count;
 					cout << "\t\t\tnameCount: " << (count = file.ReadUInt32()) << '\n';
@@ -115,7 +115,8 @@
 						cout << ", " << file.ReadUInt32() << " }\n";
 						wxString keyword;
 						if (!identified && IdentifyKeyword(keyID, name, keyword)) {
-							cout << "\tKeyword: " << MakePrintableString(keyword) << '\n';
+							cout << "\tKeyword: " << MakePrintableString(keyword)
+							     << '\n';
 							identified = true;
 						}
 					}
@@ -136,7 +137,7 @@
 	}
 }
 
-void DecodeSourceIndexDat(const CFileDataIO& file)
+void DecodeSourceIndexDat(const CFileDataIO &file)
 {
 	uint32_t numKeys;
 	uint32_t numSource;
@@ -154,7 +155,8 @@
 			cout << "\n\t\tnumName : " << (numName = file.ReadUInt32()) << '\n';
 			for (uint32_t iN = 0; iN < numName; iN++) {
 				cout << "\t\t\tLifeTime: " << CTimeT(file.ReadUInt32());
-				cout << "\n\t\t\ttagCount: " << static_cast<unsigned int>(tagCount = file.ReadUInt8()) << '\n';
+				cout << "\n\t\t\ttagCount: "
+				     << static_cast<unsigned int>(tagCount = file.ReadUInt8()) << '\n';
 				for (uint32_t it = 0; it < tagCount; it++) {
 					CTag *tag = file.ReadTag();
 					cout << "\t\t\t\t" << *tag << '\n';
@@ -165,7 +167,7 @@
 	}
 }
 
-void DecodeNodesDat(const CFileDataIO& file)
+void DecodeNodesDat(const CFileDataIO &file)
 {
 	uint32_t numContacts = file.ReadUInt32();
 	uint32_t fileVersion = 0;

amule-3.0.1.tar.gz/src/utils/fileview/KadFiles.h -> amule-3.1.0.tar.gz/src/utils/fileview/KadFiles.h Changed

amule-3.0.1.tar.gz/src/utils/fileview/Print.cpp -> amule-3.1.0.tar.gz/src/utils/fileview/Print.cpp Changed

@@ -30,9 +30,9 @@
 #include <tags/TagTypes.h>
 #include <protocol/ed2k/Client2Server/UDP.h>
 #include "../../OtherFunctions.h"
-#include "../../Friend.h"			// Needed for FF_NAME
-#include "../../Constants.h"		// Needed for PR_*
-#include "../../NetworkFunctions.h"	// Needed for Uint32toStringIP
+#include "../../Friend.h"           // Needed for FF_NAME
+#include "../../Constants.h"        // Needed for PR_*
+#include "../../NetworkFunctions.h" // Needed for Uint32toStringIP
 
 #include <cctype>
 #include <map>
@@ -40,12 +40,12 @@
 
 SDMODE g_stringDecodeMode;
 
-wxString MakePrintableString(const wxString& s)
+wxString MakePrintableString(const wxString &s)
 {
 	wxString str = s;
 	unsigned c = 0;
 	for (unsigned i = 0; i < str.length(); i++) {
-		c |= (wxChar) stri;
+		c |= (wxChar)stri;
 	}
 
 	if (c <= 0xff && GetStringsMode() != SD_NONE) {
@@ -55,7 +55,7 @@
 			str = test;
 			c = 0;
 			for (unsigned i = 0; i < str.length(); i++) {
-				c |= (wxChar) stri;
+				c |= (wxChar)stri;
 			}
 		}
 	}
@@ -71,7 +71,9 @@
 
 	if (GetStringsMode() != SD_DISPLAY) {
 		for (unsigned i = 0; i < str.length(); i++) {
-			if (GetStringsMode() == SD_NONE ? ((unsigned)stri >= ' ' && (unsigned)stri <= 0x7f) : std::isprint(stri)) {
+			if (GetStringsMode() == SD_NONE
+					? ((unsigned)stri >= ' ' && (unsigned)stri <= 0x7f)
+					: std::isprint(stri)) {
 				retval += stri;
 			} else if (c <= 0xff) {
 				retval += wxString::Format("\\x%02x", stri);
@@ -85,27 +87,28 @@
 	return retval;
 }
 
-std::ostream& operator<<(std::ostream& x, const CTimeT& y)
+std::ostream &operator<<(std::ostream &x, const CTimeT &y)
 {
 	if ((time_t)y != 0) {
 		wxDateTime dt((time_t)y);
-		return x << (time_t)y << " (" << dt.Format(wxDefaultDateTimeFormat, wxDateTime::UTC) << " UTC)";
+		return x << (time_t)y << " (" << dt.Format(wxDefaultDateTimeFormat, wxDateTime::UTC)
+			 << " UTC)";
 	} else {
 		return x << "0 (Never)";
 	}
 }
 
-std::ostream& operator<<(std::ostream& x, const CKadIP& ip)
+std::ostream &operator<<(std::ostream &x, const CKadIP &ip)
 {
 	return x << hex(ip) << " (" << Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) << ')';
 }
 
-std::ostream& operator<<(std::ostream& x, const CeD2kIP& ip)
+std::ostream &operator<<(std::ostream &x, const CeD2kIP &ip)
 {
 	return x << hex(ip) << " (" << Uint32toStringIP(ip) << ')';
 }
 
-static inline wxString TagNameString(const wxString& name)
+static inline wxString TagNameString(const wxString &name)
 {
 	if (name.length() == 1) {
 		return wxString::Format("\"\\x%02x\"", name0);
@@ -117,9 +120,12 @@
 	return "\"" + name + "\"";
 }
 
-#define TEST_VALUE(VALUE)	if (value == VALUE) return #VALUE; else
+#define TEST_VALUE(VALUE) \
+	if (value == VALUE) \
+		return #VALUE; \
+	else
 
-const char* DecodeTagNameID(uint8_t value)
+const char *DecodeTagNameID(uint8_t value)
 {
 	TEST_VALUE(FT_FILENAME)
 	TEST_VALUE(FT_FILESIZE)
@@ -163,7 +169,7 @@
 	return "??";
 }
 
-const char* DecodeTagName(const wxString& value)
+const char *DecodeTagName(const wxString &value)
 {
 	TEST_VALUE(TAG_FILENAME)
 	TEST_VALUE(TAG_FILESIZE)
@@ -211,7 +217,7 @@
 	return "??";
 }
 
-const char* DecodeTagType(uint8_t value)
+const char *DecodeTagType(uint8_t value)
 {
 	TEST_VALUE(TAGTYPE_HASH16)
 	TEST_VALUE(TAGTYPE_STRING)
@@ -249,7 +255,7 @@
 	return "??";
 }
 
-const char* DecodeServerTagNameID(uint8_t value)
+const char *DecodeServerTagNameID(uint8_t value)
 {
 	TEST_VALUE(ST_SERVERNAME)
 	TEST_VALUE(ST_DESCRIPTION)
@@ -273,21 +279,18 @@
 	return "??";
 }
 
-const char* DecodeFriendTagNameID(uint8_t value)
+const char *DecodeFriendTagNameID(uint8_t value)
 {
 	TEST_VALUE(FF_NAME)
 	return "??";
 }
 
-typedef std::map<uint32_t, const char*> FlagMap;
+typedef std::map<uint32_t, const char *> FlagMap;
 
 class CFlagDecoder
 {
-      public:
-	void AddFlag(uint32_t bit, const char* name)
-	{
-		m_flagsbit = name;
-	}
+public:
+	void AddFlag(uint32_t bit, const char *name) { m_flagsbit = name; }
 
 	wxString DecodeFlags(uint32_t flags)
 	{
@@ -311,13 +314,13 @@
 		return result;
 	}
 
-      private:
-	FlagMap	m_flags;
+private:
+	FlagMap m_flags;
 };
 
-#define ADD_DECODER_FLAG(decoder, FLAG)	decoder.AddFlag(FLAG, #FLAG)
+#define ADD_DECODER_FLAG(decoder, FLAG) decoder.AddFlag(FLAG, #FLAG)
 
-std::ostream& operator<<(std::ostream& out, const CTag& tag)
+std::ostream &operator<<(std::ostream &out, const CTag &tag)
 {
 	out << "{ ";
 	if (tag.GetName().empty()) {
@@ -357,32 +360,39 @@
 				decoder.AddFlag(0x08, "SupportsDirectCallback");
 				out << " (" << decoder.DecodeFlags(enc) << ')';
 			}
-		} else if (tag.GetNameID() == FT_LASTSEENCOMPLETE
-			   || tag.GetNameID() == FT_KADLASTPUBLISHSRC
-			   || tag.GetNameID() == FT_KADLASTPUBLISHNOTES
-			   || tag.GetNameID() == FT_KADLASTPUBLISHKEY
-			   ) {
+		} 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
-			   ) {
+		} 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
-			   ) {
+		} 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_VERY_LOW:	out << "PR_VERY_LOW"; 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;
+			case PR_VERY_LOW:
+				out << "PR_VERY_LOW";
+				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;
 			}
 		} else {
 			out << tag.GetInt();
@@ -404,7 +414,7 @@
 	return out;
 }
 
-std::ostream& operator<<(std::ostream& out, const CServerTag& tag)
+std::ostream &operator<<(std::ostream &out, const CServerTag &tag)
 {
 	out << "{ ";
 	if (tag.GetName().empty()) {
@@ -436,10 +446,17 @@
 		} 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 << "??";
+			case 0:
+				out << "SRV_PR_NORMAL";
+				break;
+			case 1:
+				out << "SRV_PR_HIGH";
+				break;
+			case 2:
+				out << "SRV_PR_LOW";
+				break;
+			default:
+				out << "??";
 			}
 		} else {
 			out << tag.GetInt();
@@ -461,7 +478,7 @@
 	return out;
 }
 
-std::ostream& operator<<(std::ostream& out, const CFriendTag& tag)
+std::ostream &operator<<(std::ostream &out, const CFriendTag &tag)
 {
 	out << "{ ";
 	if (tag.GetName().empty()) {

amule-3.0.1.tar.gz/src/utils/fileview/Print.h -> amule-3.1.0.tar.gz/src/utils/fileview/Print.h Changed

@@ -36,21 +36,12 @@
 #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::cout;
 using std::endl;
 
-enum SDMODE {
+enum SDMODE
+{
 	SD_DISPLAY,
 	SD_SAFE,
 	SD_UTF8,
@@ -59,17 +50,38 @@
 
 extern SDMODE g_stringDecodeMode;
 
-inline void SetStringsMode(SDMODE mode)	{ g_stringDecodeMode = mode; }
-inline SDMODE GetStringsMode()	{ return g_stringDecodeMode; }
+inline void SetStringsMode(SDMODE mode)
+{
+	g_stringDecodeMode = mode;
+}
+inline SDMODE GetStringsMode()
+{
+	return g_stringDecodeMode;
+}
 
-wxString MakePrintableString(const wxString& str);
+wxString MakePrintableString(const wxString &str);
 
-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(); }
+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();
+}
 
-inline wxString hex(uint8_t value)	{ return wxString::Format("0x%02x", value); }
-inline wxString hex(uint16_t value)	{ return wxString::Format("0x%04x", value); }
-inline wxString hex(uint32_t value)	{ return wxString::Format("0x%08x", value); }
+inline wxString hex(uint8_t value)
+{
+	return wxString::Format("0x%02x", value);
+}
+inline wxString hex(uint16_t value)
+{
+	return wxString::Format("0x%04x", value);
+}
+inline wxString hex(uint32_t value)
+{
+	return wxString::Format("0x%08x", value);
+}
 
 inline void PrintByteArray(const void *buf, unsigned int size)
 {
@@ -78,55 +90,59 @@
 	}
 }
 
-
 class CTimeT
 {
-      public:
+public:
 	explicit CTimeT(time_t t) { m_time = t; }
 	operator time_t() const { return m_time; }
-      private:
+
+private:
 	time_t m_time;
 };
 
 class CKadIP
 {
-      public:
+public:
 	explicit CKadIP(uint32_t ip) { m_ip = ip; }
 	operator uint32_t() const { return m_ip; }
-      private:
+
+private:
 	uint32_t m_ip;
 };
 
 class CeD2kIP
 {
-      public:
+public:
 	explicit CeD2kIP(uint32_t ip) { m_ip = ip; }
 	operator uint32_t() const { return m_ip; }
-      private:
+
+private:
 	uint32_t m_ip;
 };
 
 class CServerTag : public CTag
 {
-      public:
-	CServerTag(const CTag& tag)
-		: CTag(tag)
-	{}
+public:
+	CServerTag(const CTag &tag)
+	: CTag(tag)
+	{
+	}
 };
 
 class CFriendTag : public CTag
 {
-      public:
-	CFriendTag(const CTag& tag)
-		: CTag(tag)
-	{}
+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);
+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-3.0.1.tar.gz/src/utils/fileview/eD2kFiles.cpp -> amule-3.1.0.tar.gz/src/utils/fileview/eD2kFiles.cpp Changed

@@ -26,12 +26,13 @@
 #include "eD2kFiles.h"
 #include "Print.h"
 #include "../../SafeFile.h"
-#include "../../ClientCredits.h"	// Needed for MAXPUBKEYSIZE
-#include "../../OtherFunctions.h"	// Needed for CastItoXBytes
+#include "../../ClientCredits.h"  // Needed for MAXPUBKEYSIZE
+#include "../../OtherFunctions.h" // Needed for CastItoXBytes
 #include <protocol/ed2k/Constants.h>
 #include <tags/FileTags.h>
 
-enum VersionType {
+enum VersionType
+{
 	PrefFile,
 	PartMetFile,
 	CreditFile,
@@ -72,13 +73,13 @@
 	return hex(version) + ' ' + verStr;
 };
 
-void DecodePreferencesDat(const CFileDataIO& file)
+void DecodePreferencesDat(const CFileDataIO &file)
 {
 	cout << "(Version): " << VersionInfo(file.ReadUInt8(), PrefFile);
 	cout << "\nUserHash : " << file.ReadHash() << '\n';
 }
 
-void DecodeFriendList(const CFileDataIO& file)
+void DecodeFriendList(const CFileDataIO &file)
 {
 	uint8_t version = file.ReadUInt8();
 	cout << "Version : " << VersionInfo(version, KnownFileList) << endl;
@@ -103,10 +104,10 @@
 	}
 }
 
-void DecodeServerMet(const CFileDataIO& file)
+void DecodeServerMet(const CFileDataIO &file)
 {
 	uint8_t version = file.ReadUInt8();
-	cout << "Version : " << VersionInfo(version, KnownFileList)  << endl;
+	cout << "Version : " << VersionInfo(version, KnownFileList) << endl;
 	if (version != 0xE0 && version != MET_HEADER) {
 		cerr << "File seems to be corrupt, invalid version!" << endl;
 		return;
@@ -125,7 +126,7 @@
 	}
 }
 
-void DecodeClientsMet(const CFileDataIO& file)
+void DecodeClientsMet(const CFileDataIO &file)
 {
 	uint8_t version = file.ReadUInt8();
 	cout << "Version : " << VersionInfo(version, CreditFile) << endl;
@@ -146,8 +147,10 @@
 		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\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;
@@ -163,12 +166,12 @@
 	}
 }
 
-static inline void PrintDateFromFile(const CFileDataIO& file, const wxString& prefix = "")
+static inline void PrintDateFromFile(const CFileDataIO &file, const wxString &prefix = "")
 {
 	cout << prefix << "LastChanged : " << CTimeT(file.ReadUInt32()) << '\n';
 }
 
-static void PrintHashsetFromFile(const CFileDataIO& file, const wxString& prefix = "")
+static void PrintHashsetFromFile(const CFileDataIO &file, const wxString &prefix = "")
 {
 	cout << prefix << "FileHash    : " << file.ReadHash() << '\n';
 
@@ -176,8 +179,7 @@
 	cout << prefix << "Parts       : " << parts << '\n';
 
 	cout << prefix << "HashSet     : ";
-	for (uint16_t i = 0; i < parts; i++)
-	{
+	for (uint16_t i = 0; i < parts; i++) {
 		if (i) {
 			cout << ", ";
 		}
@@ -186,7 +188,7 @@
 	cout << '\n';
 }
 
-void DecodeKnownMet(const CFileDataIO& file)
+void DecodeKnownMet(const CFileDataIO &file)
 {
 	uint8_t version = file.ReadUInt8();
 	cout << "Version : " << VersionInfo(version, KnownFileList) << endl;
@@ -208,12 +210,13 @@
 	}
 }
 
-void DecodePartMetFile(const CFileDataIO& file)
+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) {
+	if (version != PARTFILE_VERSION && version != PARTFILE_SPLITTEDVERSION &&
+		version != PARTFILE_VERSION_LARGEFILE) {
 		cerr << "File seems to be corrupt, invalid version!" << endl;
 		return;
 	}
@@ -262,7 +265,7 @@
 	cout << '\n';
 }
 
-void DecodeStatisticsDat(const CFileDataIO& file)
+void DecodeStatisticsDat(const CFileDataIO &file)
 {
 	uint8_t version = file.ReadUInt8();
 	cout << "Version : " << (unsigned)version << '\n';
@@ -274,7 +277,7 @@
 	}
 }
 
-void DecodeCanceledMet(const CFileDataIO& file)
+void DecodeCanceledMet(const CFileDataIO &file)
 {
 	uint8_t version = file.ReadUInt8();
 	cout << "Version : " << VersionInfo(version, CanceledFileList) << endl;

amule-3.0.1.tar.gz/src/utils/fileview/eD2kFiles.h -> amule-3.1.0.tar.gz/src/utils/fileview/eD2kFiles.h Changed

amule-3.0.1.tar.gz/src/utils/mkFileSum.c -> amule-3.1.0.tar.gz/src/utils/mkFileSum.c Changed

@@ -38,19 +38,18 @@
 typedef uint16_t UINT2;
 typedef uint32_t UINT4;
 
-typedef struct {
-  UINT4 state4;
-  UINT4 count2;
-  unsigned char buffer64;
+typedef struct
+{
+	UINT4 state4;
+	UINT4 count2;
+	unsigned char buffer64;
 } MD5_CTX;
 
 void MD5Init(MD5_CTX *);
 void MD5Update(MD5_CTX *, const unsigned char *, unsigned int);
-void MD5Final(unsigned char 16, MD5_CTX *);
-
+void MD5Final(unsigned char16, MD5_CTX *);
 
-const int table9 = {
-	{ 0x0206, 0x0206, 0x0008, 0x0100, 0x0101, 0x0102, 0x000e, 0x0100, 0x00ff },
+const int table9 = { { 0x0206, 0x0206, 0x0008, 0x0100, 0x0101, 0x0102, 0x000e, 0x0100, 0x00ff },
 	{ 0x0101, 0x0101, 0x0101, 0x0101, 0x0100, 0x0101, 0x010b, 0x0101, 0x00ff },
 	{ 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0100, 0x010c, 0x0102, 0x00ff },
 	{ 0x0003, 0x0003, 0x0003, 0x0009, 0x0003, 0x0003, 0x0003, 0x0003, 0x00ff },
@@ -66,19 +65,26 @@
 	{ 0x0006, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x00ff },
 	{ 0x0206, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x00ff },
 	{ 0x000f, 0x000f, 0x000f, 0x0010, 0x000f, 0x000f, 0x000f, 0x000f, 0x00ff },
-	{ 0x000f, 0x000f, 0x0006, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x00ff }
-};
+	{ 0x000f, 0x000f, 0x0006, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x00ff } };
 
 int GetCharCode(int c)
 {
-	if (c == '\r' || c == '\n') return 0;
-	if (c == ' ' || c == '\t') return 1;
-	if (c == '/') return 2;
-	if (c == '*') return 3;
-	if (c == '\"') return 4;
-	if (c == '\'') return 5;
-	if (c == '\\') return 6;
-	if (c == EOF) return 8;
+	if (c == '\r' || c == '\n')
+		return 0;
+	if (c == ' ' || c == '\t')
+		return 1;
+	if (c == '/')
+		return 2;
+	if (c == '*')
+		return 3;
+	if (c == '\"')
+		return 4;
+	if (c == '\'')
+		return 5;
+	if (c == '\\')
+		return 6;
+	if (c == EOF)
+		return 8;
 	return 7;
 }
 
@@ -115,12 +121,12 @@
 	}
 	MD5Update(&context, buffer, count);
 	MD5Final(digest, &context);
-	for (count = 0; count < 16; count++) printf("%02x", digestcount);
+	for (count = 0; count < 16; count++)
+		printf("%02x", digestcount);
 	putchar('\n');
 	return 0;
 }
 
-
 #define S11 7
 #define S12 12
 #define S13 17
@@ -138,17 +144,76 @@
 #define S43 15
 #define S44 21
 
-static void MD5Transform (UINT4 4, const unsigned char 64);
-static void Encode (unsigned char *, UINT4 *, unsigned int);
-static void Decode (UINT4 *, const unsigned char *, unsigned int);
-static void MD5_memcpy (POINTER, POINTER, unsigned int);
-static void MD5_memset (POINTER, int, unsigned int);
-
-static unsigned char PADDING64 = {
-  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
-};
+static void MD5Transform(UINT44, const unsigned char64);
+static void Encode(unsigned char *, UINT4 *, unsigned int);
+static void Decode(UINT4 *, const unsigned char *, unsigned int);
+static void MD5_memcpy(POINTER, POINTER, unsigned int);
+static void MD5_memset(POINTER, int, unsigned int);
+
+static unsigned char PADDING64 = { 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 };
 
 /* F, G, H and I are basic MD5 functions.
  */
@@ -164,36 +229,56 @@
 #pragma intrinsic(_rotl)
 #define ROTATE_LEFT(x, n) _rotl((x), (n))
 #else
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
 #endif
 
 /* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
 Rotation is separate from addition to prevent recomputation.
 */
 /* Defines must be on one line to work with GCC-2.95.3 */
-#define FF(a, b, c, d, x, s, ac) { (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
-#define GG(a, b, c, d, x, s, ac) { (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
-#define HH(a, b, c, d, x, s, ac) { (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
-#define II(a, b, c, d, x, s, ac) { (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
+#define FF(a, b, c, d, x, s, ac) \
+	{ \
+		(a) += F((b), (c), (d)) + (x) + (UINT4)(ac); \
+		(a) = ROTATE_LEFT((a), (s)); \
+		(a) += (b); \
+	}
+#define GG(a, b, c, d, x, s, ac) \
+	{ \
+		(a) += G((b), (c), (d)) + (x) + (UINT4)(ac); \
+		(a) = ROTATE_LEFT((a), (s)); \
+		(a) += (b); \
+	}
+#define HH(a, b, c, d, x, s, ac) \
+	{ \
+		(a) += H((b), (c), (d)) + (x) + (UINT4)(ac); \
+		(a) = ROTATE_LEFT((a), (s)); \
+		(a) += (b); \
+	}
+#define II(a, b, c, d, x, s, ac) \
+	{ \
+		(a) += I((b), (c), (d)) + (x) + (UINT4)(ac); \
+		(a) = ROTATE_LEFT((a), (s)); \
+		(a) += (b); \
+	}
 
 /* MD5 initialization. Begins an MD5 operation, writing a new context.
  */
-void MD5Init (MD5_CTX *context)
+void MD5Init(MD5_CTX *context)
 {
-  context->count0 = context->count1 = 0;
-  /* Load magic initialization constants.
-*/
-  context->state0 = 0x67452301;
-  context->state1 = 0xefcdab89;
-  context->state2 = 0x98badcfe;
-  context->state3 = 0x10325476;
+	context->count0 = context->count1 = 0;
+	/* Load magic initialization constants.
+	 */
+	context->state0 = 0x67452301;
+	context->state1 = 0xefcdab89;
+	context->state2 = 0x98badcfe;
+	context->state3 = 0x10325476;
 }
 
 /* MD5 block update operation. Continues an MD5 message-digest
   operation, processing another message block, and updating the
   context.
  */
-void MD5Update (MD5_CTX *context, const unsigned char *input, unsigned int inputLen)
+void MD5Update(MD5_CTX *context, const unsigned char *input, unsigned int inputLen)
 {
 	unsigned int i, index, partLen;
 
@@ -210,178 +295,178 @@
 	/* Transform as many times as possible. */
 	if (inputLen >= partLen) {
 		MD5_memcpy((POINTER)&context->bufferindex, (POINTER)input, partLen);
-		MD5Transform (context->state, context->buffer);
+		MD5Transform(context->state, context->buffer);
 
 		for (i = partLen; i + 63 < inputLen; i += 64) {
-			MD5Transform (context->state, &inputi);
+			MD5Transform(context->state, &inputi);
 		}
 		index = 0;
 	} else {
 		i = 0;
 	}
 	/* Buffer remaining input */
-	MD5_memcpy((POINTER)&context->bufferindex, (POINTER)&inputi, inputLen-i);
+	MD5_memcpy((POINTER)&context->bufferindex, (POINTER)&inputi, inputLen - i);
 }
 
 /* MD5 finalization. Ends an MD5 message-digest operation, writing the
  * the message digest and zeroizing the context.
  */
-void MD5Final (unsigned char digest16, MD5_CTX *context)
+void MD5Final(unsigned char digest16, MD5_CTX *context)
 {
 	unsigned char bits8;
 	unsigned int index, padLen;
 
 	/* Save number of bits */
-	Encode (bits, context->count, 8);
+	Encode(bits, context->count, 8);
 
 	/* Pad out to 56 mod 64. */
 	index = (unsigned int)((context->count0 >> 3) & 0x3f);
 	padLen = (index < 56) ? (56 - index) : (120 - index);
-	MD5Update (context, PADDING, padLen);
+	MD5Update(context, PADDING, padLen);
 
 	/* Append length (before padding) */
-	MD5Update (context, bits, 8);
+	MD5Update(context, bits, 8);
 	/* Store state in digest */
-	Encode (digest, context->state, 16);
+	Encode(digest, context->state, 16);
 
 	/* Zeroize sensitive information.*/
-	MD5_memset ((POINTER)context, 0, sizeof (*context));
+	MD5_memset((POINTER)context, 0, sizeof(*context));
 }
 
 /* MD5 basic transformation. Transforms state based on block.
  */
-static void MD5Transform (UINT4 state4, const unsigned char block64)
+static void MD5Transform(UINT4 state4, const unsigned char block64)
 {
-  UINT4 a = state0, b = state1, c = state2, d = state3, x16;
-
-  Decode (x, block, 64);
-
-  /* Round 1 */
-  FF (a, b, c, d, x 0, S11, 0xd76aa478); /* 1 */
-  FF (d, a, b, c, x 1, S12, 0xe8c7b756); /* 2 */
-  FF (c, d, a, b, x 2, S13, 0x242070db); /* 3 */
-  FF (b, c, d, a, x 3, S14, 0xc1bdceee); /* 4 */
-  FF (a, b, c, d, x 4, S11, 0xf57c0faf); /* 5 */
-  FF (d, a, b, c, x 5, S12, 0x4787c62a); /* 6 */
-  FF (c, d, a, b, x 6, S13, 0xa8304613); /* 7 */
-  FF (b, c, d, a, x 7, S14, 0xfd469501); /* 8 */
-  FF (a, b, c, d, x 8, S11, 0x698098d8); /* 9 */
-  FF (d, a, b, c, x 9, S12, 0x8b44f7af); /* 10 */
-  FF (c, d, a, b, x10, S13, 0xffff5bb1); /* 11 */
-  FF (b, c, d, a, x11, S14, 0x895cd7be); /* 12 */
-  FF (a, b, c, d, x12, S11, 0x6b901122); /* 13 */
-  FF (d, a, b, c, x13, S12, 0xfd987193); /* 14 */
-  FF (c, d, a, b, x14, S13, 0xa679438e); /* 15 */
-  FF (b, c, d, a, x15, S14, 0x49b40821); /* 16 */
-
- /* Round 2 */
-  GG (a, b, c, d, x 1, S21, 0xf61e2562); /* 17 */
-  GG (d, a, b, c, x 6, S22, 0xc040b340); /* 18 */
-  GG (c, d, a, b, x11, S23, 0x265e5a51); /* 19 */
-  GG (b, c, d, a, x 0, S24, 0xe9b6c7aa); /* 20 */
-  GG (a, b, c, d, x 5, S21, 0xd62f105d); /* 21 */
-  GG (d, a, b, c, x10, S22,  0x2441453); /* 22 */
-  GG (c, d, a, b, x15, S23, 0xd8a1e681); /* 23 */
-  GG (b, c, d, a, x 4, S24, 0xe7d3fbc8); /* 24 */
-  GG (a, b, c, d, x 9, S21, 0x21e1cde6); /* 25 */
-  GG (d, a, b, c, x14, S22, 0xc33707d6); /* 26 */
-  GG (c, d, a, b, x 3, S23, 0xf4d50d87); /* 27 */
-  GG (b, c, d, a, x 8, S24, 0x455a14ed); /* 28 */
-  GG (a, b, c, d, x13, S21, 0xa9e3e905); /* 29 */
-  GG (d, a, b, c, x 2, S22, 0xfcefa3f8); /* 30 */
-  GG (c, d, a, b, x 7, S23, 0x676f02d9); /* 31 */
-  GG (b, c, d, a, x12, S24, 0x8d2a4c8a); /* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x 5, S31, 0xfffa3942); /* 33 */
-  HH (d, a, b, c, x 8, S32, 0x8771f681); /* 34 */
-  HH (c, d, a, b, x11, S33, 0x6d9d6122); /* 35 */
-  HH (b, c, d, a, x14, S34, 0xfde5380c); /* 36 */
-  HH (a, b, c, d, x 1, S31, 0xa4beea44); /* 37 */
-  HH (d, a, b, c, x 4, S32, 0x4bdecfa9); /* 38 */
-  HH (c, d, a, b, x 7, S33, 0xf6bb4b60); /* 39 */
-  HH (b, c, d, a, x10, S34, 0xbebfbc70); /* 40 */
-  HH (a, b, c, d, x13, S31, 0x289b7ec6); /* 41 */
-  HH (d, a, b, c, x 0, S32, 0xeaa127fa); /* 42 */
-  HH (c, d, a, b, x 3, S33, 0xd4ef3085); /* 43 */
-  HH (b, c, d, a, x 6, S34,  0x4881d05); /* 44 */
-  HH (a, b, c, d, x 9, S31, 0xd9d4d039); /* 45 */
-  HH (d, a, b, c, x12, S32, 0xe6db99e5); /* 46 */
-  HH (c, d, a, b, x15, S33, 0x1fa27cf8); /* 47 */
-  HH (b, c, d, a, x 2, S34, 0xc4ac5665); /* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x 0, S41, 0xf4292244); /* 49 */
-  II (d, a, b, c, x 7, S42, 0x432aff97); /* 50 */
-  II (c, d, a, b, x14, S43, 0xab9423a7); /* 51 */
-  II (b, c, d, a, x 5, S44, 0xfc93a039); /* 52 */
-  II (a, b, c, d, x12, S41, 0x655b59c3); /* 53 */
-  II (d, a, b, c, x 3, S42, 0x8f0ccc92); /* 54 */
-  II (c, d, a, b, x10, S43, 0xffeff47d); /* 55 */
-  II (b, c, d, a, x 1, S44, 0x85845dd1); /* 56 */
-  II (a, b, c, d, x 8, S41, 0x6fa87e4f); /* 57 */
-  II (d, a, b, c, x15, S42, 0xfe2ce6e0); /* 58 */
-  II (c, d, a, b, x 6, S43, 0xa3014314); /* 59 */
-  II (b, c, d, a, x13, S44, 0x4e0811a1); /* 60 */
-  II (a, b, c, d, x 4, S41, 0xf7537e82); /* 61 */
-  II (d, a, b, c, x11, S42, 0xbd3af235); /* 62 */
-  II (c, d, a, b, x 2, S43, 0x2ad7d2bb); /* 63 */
-  II (b, c, d, a, x 9, S44, 0xeb86d391); /* 64 */
-
-  state0 += a;
-  state1 += b;
-  state2 += c;
-  state3 += d;
-
-  /* Zeroize sensitive information.
-   */
-  MD5_memset ((POINTER)x, 0, sizeof (x));
+	UINT4 a = state0, b = state1, c = state2, d = state3, x16;
+
+	Decode(x, block, 64);
+
+	/* Round 1 */
+	FF(a, b, c, d, x0, S11, 0xd76aa478);  /* 1 */
+	FF(d, a, b, c, x1, S12, 0xe8c7b756);  /* 2 */
+	FF(c, d, a, b, x2, S13, 0x242070db);  /* 3 */
+	FF(b, c, d, a, x3, S14, 0xc1bdceee);  /* 4 */
+	FF(a, b, c, d, x4, S11, 0xf57c0faf);  /* 5 */
+	FF(d, a, b, c, x5, S12, 0x4787c62a);  /* 6 */
+	FF(c, d, a, b, x6, S13, 0xa8304613);  /* 7 */
+	FF(b, c, d, a, x7, S14, 0xfd469501);  /* 8 */
+	FF(a, b, c, d, x8, S11, 0x698098d8);  /* 9 */
+	FF(d, a, b, c, x9, S12, 0x8b44f7af);  /* 10 */
+	FF(c, d, a, b, x10, S13, 0xffff5bb1); /* 11 */
+	FF(b, c, d, a, x11, S14, 0x895cd7be); /* 12 */
+	FF(a, b, c, d, x12, S11, 0x6b901122); /* 13 */
+	FF(d, a, b, c, x13, S12, 0xfd987193); /* 14 */
+	FF(c, d, a, b, x14, S13, 0xa679438e); /* 15 */
+	FF(b, c, d, a, x15, S14, 0x49b40821); /* 16 */
+
+	/* Round 2 */
+	GG(a, b, c, d, x1, S21, 0xf61e2562);  /* 17 */
+	GG(d, a, b, c, x6, S22, 0xc040b340);  /* 18 */
+	GG(c, d, a, b, x11, S23, 0x265e5a51); /* 19 */
+	GG(b, c, d, a, x0, S24, 0xe9b6c7aa);  /* 20 */
+	GG(a, b, c, d, x5, S21, 0xd62f105d);  /* 21 */
+	GG(d, a, b, c, x10, S22, 0x2441453);  /* 22 */
+	GG(c, d, a, b, x15, S23, 0xd8a1e681); /* 23 */
+	GG(b, c, d, a, x4, S24, 0xe7d3fbc8);  /* 24 */
+	GG(a, b, c, d, x9, S21, 0x21e1cde6);  /* 25 */
+	GG(d, a, b, c, x14, S22, 0xc33707d6); /* 26 */
+	GG(c, d, a, b, x3, S23, 0xf4d50d87);  /* 27 */
+	GG(b, c, d, a, x8, S24, 0x455a14ed);  /* 28 */
+	GG(a, b, c, d, x13, S21, 0xa9e3e905); /* 29 */
+	GG(d, a, b, c, x2, S22, 0xfcefa3f8);  /* 30 */
+	GG(c, d, a, b, x7, S23, 0x676f02d9);  /* 31 */
+	GG(b, c, d, a, x12, S24, 0x8d2a4c8a); /* 32 */
+
+	/* Round 3 */
+	HH(a, b, c, d, x5, S31, 0xfffa3942);  /* 33 */
+	HH(d, a, b, c, x8, S32, 0x8771f681);  /* 34 */
+	HH(c, d, a, b, x11, S33, 0x6d9d6122); /* 35 */
+	HH(b, c, d, a, x14, S34, 0xfde5380c); /* 36 */
+	HH(a, b, c, d, x1, S31, 0xa4beea44);  /* 37 */
+	HH(d, a, b, c, x4, S32, 0x4bdecfa9);  /* 38 */
+	HH(c, d, a, b, x7, S33, 0xf6bb4b60);  /* 39 */
+	HH(b, c, d, a, x10, S34, 0xbebfbc70); /* 40 */
+	HH(a, b, c, d, x13, S31, 0x289b7ec6); /* 41 */
+	HH(d, a, b, c, x0, S32, 0xeaa127fa);  /* 42 */
+	HH(c, d, a, b, x3, S33, 0xd4ef3085);  /* 43 */
+	HH(b, c, d, a, x6, S34, 0x4881d05);   /* 44 */
+	HH(a, b, c, d, x9, S31, 0xd9d4d039);  /* 45 */
+	HH(d, a, b, c, x12, S32, 0xe6db99e5); /* 46 */
+	HH(c, d, a, b, x15, S33, 0x1fa27cf8); /* 47 */
+	HH(b, c, d, a, x2, S34, 0xc4ac5665);  /* 48 */
+
+	/* Round 4 */
+	II(a, b, c, d, x0, S41, 0xf4292244);  /* 49 */
+	II(d, a, b, c, x7, S42, 0x432aff97);  /* 50 */
+	II(c, d, a, b, x14, S43, 0xab9423a7); /* 51 */
+	II(b, c, d, a, x5, S44, 0xfc93a039);  /* 52 */
+	II(a, b, c, d, x12, S41, 0x655b59c3); /* 53 */
+	II(d, a, b, c, x3, S42, 0x8f0ccc92);  /* 54 */
+	II(c, d, a, b, x10, S43, 0xffeff47d); /* 55 */
+	II(b, c, d, a, x1, S44, 0x85845dd1);  /* 56 */
+	II(a, b, c, d, x8, S41, 0x6fa87e4f);  /* 57 */
+	II(d, a, b, c, x15, S42, 0xfe2ce6e0); /* 58 */
+	II(c, d, a, b, x6, S43, 0xa3014314);  /* 59 */
+	II(b, c, d, a, x13, S44, 0x4e0811a1); /* 60 */
+	II(a, b, c, d, x4, S41, 0xf7537e82);  /* 61 */
+	II(d, a, b, c, x11, S42, 0xbd3af235); /* 62 */
+	II(c, d, a, b, x2, S43, 0x2ad7d2bb);  /* 63 */
+	II(b, c, d, a, x9, S44, 0xeb86d391);  /* 64 */
+
+	state0 += a;
+	state1 += b;
+	state2 += c;
+	state3 += d;
+
+	/* Zeroize sensitive information.
+	 */
+	MD5_memset((POINTER)x, 0, sizeof(x));
 }
 
 /* Encodes input (UINT4) into output (unsigned char). Assumes len is
   a multiple of 4.
  */
-static void Encode (unsigned char *output, UINT4 *input, unsigned int len)
+static void Encode(unsigned char *output, UINT4 *input, unsigned int len)
 {
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4) {
- outputj = (unsigned char)(inputi & 0xff);
- outputj+1 = (unsigned char)((inputi >> 8) & 0xff);
- outputj+2 = (unsigned char)((inputi >> 16) & 0xff);
- outputj+3 = (unsigned char)((inputi >> 24) & 0xff);
-  }
+	unsigned int i, j;
+
+	for (i = 0, j = 0; j < len; i++, j += 4) {
+		outputj = (unsigned char)(inputi & 0xff);
+		outputj + 1 = (unsigned char)((inputi >> 8) & 0xff);
+		outputj + 2 = (unsigned char)((inputi >> 16) & 0xff);
+		outputj + 3 = (unsigned char)((inputi >> 24) & 0xff);
+	}
 }
 
 /* Decodes input (unsigned char) into output (UINT4). Assumes len is
   a multiple of 4.
  */
-static void Decode (UINT4 *output, const unsigned char *input, unsigned int len)
+static void Decode(UINT4 *output, const unsigned char *input, unsigned int len)
 {
-  unsigned int i, j;
+	unsigned int i, j;
 
-  for (i = 0, j = 0; j < len; i++, j += 4)
- outputi = ((UINT4)inputj) | (((UINT4)inputj+1) << 8) |
-   (((UINT4)inputj+2) << 16) | (((UINT4)inputj+3) << 24);
+	for (i = 0, j = 0; j < len; i++, j += 4)
+		outputi = ((UINT4)inputj) | (((UINT4)inputj + 1) << 8) | (((UINT4)inputj + 2) << 16) |
+			    (((UINT4)inputj + 3) << 24);
 }
 
 /* Note: Replace "for loop" with standard memcpy if possible.
  */
 
-static void MD5_memcpy (POINTER output, POINTER input, unsigned int len)
+static void MD5_memcpy(POINTER output, POINTER input, unsigned int len)
 {
-  unsigned int i;
+	unsigned int i;
 
-  for (i = 0; i < len; i++)
- outputi = inputi;
+	for (i = 0; i < len; i++)
+		outputi = inputi;
 }
 
 /* Note: Replace "for loop" with standard memset if possible.
  */
-static void MD5_memset (POINTER output, int value, unsigned int len)
+static void MD5_memset(POINTER output, int value, unsigned int len)
 {
-  unsigned int i;
+	unsigned int i;
 
-  for (i = 0; i < len; i++)
- ((char *)output)i = (char)value;
+	for (i = 0; i < len; i++)
+		((char *)output)i = (char)value;
 }

amule-3.0.1.tar.gz/src/utils/scripts/whitespace_fixer -> amule-3.1.0.tar.gz/src/utils/scripts/whitespace_fixer Changed

amule-3.0.1.tar.gz/src/utils/wxCas/src/linuxmon.cpp -> amule-3.1.0.tar.gz/src/utils/wxCas/src/linuxmon.cpp Changed

@@ -27,38 +27,33 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
 #include "linuxmon.h"
 
 #include <wx/txtstrm.h>
 #include <wx/wfstream.h>
 
 // Constants
-const wxFileName
-LinuxMon::UPTIME_FILE ( "/proc/uptime" );
+const wxFileName LinuxMon::UPTIME_FILE("/proc/uptime");
 
-const wxFileName
-LinuxMon::LOADAVG_FILE ( "/proc/loadavg" );
+const wxFileName LinuxMon::LOADAVG_FILE("/proc/loadavg");
 
 // Constructors
-LinuxMon::LinuxMon ()
+LinuxMon::LinuxMon()
 {
-	Refresh ();
+	Refresh();
 }
 
 // Destructor
-LinuxMon::~LinuxMon ()
-{}
+LinuxMon::~LinuxMon() {}
 
 // Refresh
-void
-LinuxMon::Refresh ()
+void LinuxMon::Refresh()
 {
-	wxFileInputStream upInput ( UPTIME_FILE.GetFullPath () );
-	wxFileInputStream loadInput ( LOADAVG_FILE.GetFullPath () );
+	wxFileInputStream upInput(UPTIME_FILE.GetFullPath());
+	wxFileInputStream loadInput(LOADAVG_FILE.GetFullPath());
 
-	wxTextInputStream upText ( upInput );
-	wxTextInputStream loadText ( loadInput );
+	wxTextInputStream upText(upInput);
+	wxTextInputStream loadText(loadInput);
 
 	loadText >> m_sysLoad_1;
 	loadText >> m_sysLoad_5;
@@ -68,37 +63,31 @@
 	upText >> uptime;
 
 	wxInt32 day, hour, min, sec;
-	day = ( wxInt32 ) ( uptime / 86400 );
-	hour = ( wxInt32 ) ( ( uptime - day * 86400 ) / 3600 );
-	min = ( wxInt32 ) ( ( uptime - day * 86400 - hour * 3600 ) / 60 );
-	sec = ( wxInt32 ) ( uptime - day * 86400 - hour * 3600 - min * 60 );
-
-	m_uptime =
-	    m_uptime.Format ( _( "%i day(s) %i hour(s) %i min %i s" ), day, hour, min,
-	                      sec );
+	day = (wxInt32)(uptime / 86400);
+	hour = (wxInt32)((uptime - day * 86400) / 3600);
+	min = (wxInt32)((uptime - day * 86400 - hour * 3600) / 60);
+	sec = (wxInt32)(uptime - day * 86400 - hour * 3600 - min * 60);
+
+	m_uptime = m_uptime.Format(_("%i day(s) %i hour(s) %i min %i s"), day, hour, min, sec);
 }
 
 // Accessors
-wxString
-LinuxMon::GetUptime () const
+wxString LinuxMon::GetUptime() const
 {
 	return m_uptime;
 }
 
-wxString
-LinuxMon::GetSysLoad_1 () const
+wxString LinuxMon::GetSysLoad_1() const
 {
 	return m_sysLoad_1;
 }
 
-wxString
-LinuxMon::GetSysLoad_5 () const
+wxString LinuxMon::GetSysLoad_5() const
 {
 	return m_sysLoad_5;
 }
 
-wxString
-LinuxMon::GetSysLoad_15 () const
+wxString LinuxMon::GetSysLoad_15() const
 {
 	return m_sysLoad_15;
 }

amule-3.0.1.tar.gz/src/utils/wxCas/src/linuxmon.h -> amule-3.1.0.tar.gz/src/utils/wxCas/src/linuxmon.h Changed

amule-3.0.1.tar.gz/src/utils/wxCas/src/onlinesig.cpp -> amule-3.1.0.tar.gz/src/utils/wxCas/src/onlinesig.cpp Changed

@@ -27,48 +27,42 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
 #include "onlinesig.h"
 
 #include <wx/txtstrm.h>
 #include <wx/wfstream.h>
 
 // Constructor
-OnLineSig::OnLineSig ( const wxFileName& file,
-                       const double absoluteMaxDL,
-                       const wxDateTime absoluteMaxDlDate )
-	: m_sessionMaxDL(0.0)
-	, m_sessionMaxDLDate(wxDateTime::Now())
-	, m_isSessionMaxDlReseted(false)
-	, m_absoluteMaxDL(absoluteMaxDL)
-	, m_absoluteMaxDlDate(absoluteMaxDlDate)
-	, m_isAbsoluteMaxDlReseted(false)
-	, m_amulesig(file)
+OnLineSig::OnLineSig(const wxFileName &file, const double absoluteMaxDL, const wxDateTime absoluteMaxDlDate)
+: m_sessionMaxDL(0.0)
+, m_sessionMaxDLDate(wxDateTime::Now())
+, m_isSessionMaxDlReseted(false)
+, m_absoluteMaxDL(absoluteMaxDL)
+, m_absoluteMaxDlDate(absoluteMaxDlDate)
+, m_isAbsoluteMaxDlReseted(false)
+, m_amulesig(file)
 {
-	Refresh ();
+	Refresh();
 }
 
 // Destructor
-OnLineSig::~OnLineSig ()
-{}
+OnLineSig::~OnLineSig() {}
 
 // Accessors
-void
-OnLineSig::SetAmuleSig ( const wxFileName& file )
+void OnLineSig::SetAmuleSig(const wxFileName &file)
 {
 	m_amulesig = file;
-	Refresh ();
+	Refresh();
 }
 
-void
-OnLineSig::Refresh ()
+void OnLineSig::Refresh()
 {
 	wxFile file;
-	if ( file.Open(m_amulesig.GetFullPath ()) ) {
-		wxFileInputStream input ( file );
+	if (file.Open(m_amulesig.GetFullPath())) {
+		wxFileInputStream input(file);
 
-		wxTextInputStream text ( input );
-		text.SetStringSeparators ( "\n" );
+		wxTextInputStream text(input);
+		text.SetStringSeparators("\n");
 
 		text >> m_amuleState;
 		text >> m_serverName;
@@ -89,188 +83,183 @@
 		text >> m_runTimeS;
 
 		double dl;
-		m_DLRate.ToDouble ( &dl );
+		m_DLRate.ToDouble(&dl);
 
-		if ( dl > m_sessionMaxDL || m_isSessionMaxDlReseted ) {
+		if (dl > m_sessionMaxDL || m_isSessionMaxDlReseted) {
 			m_sessionMaxDL = dl;
 			m_sessionMaxDLDate = wxDateTime::Now();
 			m_isSessionMaxDlChanged = true;
 			m_isSessionMaxDlReseted = false;
-		}
-		else {
+		} else {
 			m_isSessionMaxDlChanged = false;
 		}
 
-		if ( dl > m_absoluteMaxDL || m_isAbsoluteMaxDlReseted ) {
+		if (dl > m_absoluteMaxDL || m_isAbsoluteMaxDlReseted) {
 			m_absoluteMaxDL = dl;
 			m_absoluteMaxDlDate = wxDateTime::Now();
 			m_isAbsoluteMaxDlChanged = true;
 			m_isAbsoluteMaxDlReseted = false;
-		}
-		else {
+		} else {
 			m_isAbsoluteMaxDlChanged = false;
 		}
 	}
 	file.Close();
-
 }
 
 int OnLineSig::GetAmuleState() const
 {
-	if ( m_amuleState >= 0 && m_amuleState <= 2 ) {
-		return ( m_amuleState );
+	if (m_amuleState >= 0 && m_amuleState <= 2) {
+		return (m_amuleState);
 	} else {
-		return ( -1 );
+		return (-1);
 	}
 }
 
 int OnLineSig::GetKadState() const
 {
-	if ( m_kadInfo >= 0 && m_kadInfo <= 2 ) {
-		return ( m_kadInfo );
+	if (m_kadInfo >= 0 && m_kadInfo <= 2) {
+		return (m_kadInfo);
 	} else {
-		return ( -1 );
+		return (-1);
 	}
 }
 
-wxString OnLineSig::GetServerName () const
+wxString OnLineSig::GetServerName() const
 {
 	return m_serverName;
 }
 
-wxString OnLineSig::GetServerIP () const
+wxString OnLineSig::GetServerIP() const
 {
 	return m_serverIP;
 }
 
-wxString OnLineSig::GetServerPort () const
+wxString OnLineSig::GetServerPort() const
 {
 	return m_serverPort;
 }
 
-wxString OnLineSig::GetConnexionID () const
+wxString OnLineSig::GetConnexionID() const
 {
 	return m_connexionID;
 }
 
-wxString OnLineSig::GetULRate () const
+wxString OnLineSig::GetULRate() const
 {
 	return m_ULRate;
 }
 
-wxString OnLineSig::GetDLRate () const
+wxString OnLineSig::GetDLRate() const
 {
 	return m_DLRate;
 }
 
-wxString OnLineSig::GetQueue () const
+wxString OnLineSig::GetQueue() const
 {
 	return m_queue;
 }
 
-wxString OnLineSig::GetSharedFiles () const
+wxString OnLineSig::GetSharedFiles() const
 {
 	return m_sharedFiles;
 }
 
-wxString OnLineSig::GetUser () const
+wxString OnLineSig::GetUser() const
 {
 	return m_user;
 }
 
-wxString OnLineSig::GetTotalUL () const
+wxString OnLineSig::GetTotalUL() const
 {
 	return m_totalUL;
 }
 
-
-wxString OnLineSig::GetTotalDL () const
+wxString OnLineSig::GetTotalDL() const
 {
 	return m_totalDL;
 }
 
-wxString OnLineSig::GetVersion () const
+wxString OnLineSig::GetVersion() const
 {
 	return m_version;
 }
 
-wxString OnLineSig::GetSessionUL () const
+wxString OnLineSig::GetSessionUL() const
 {
 	return m_sessionUL;
 }
 
-wxString OnLineSig::GetSessionDL () const
+wxString OnLineSig::GetSessionDL() const
 {
 	return m_sessionDL;
 }
 
-//only used to check if aMule is running or not
-int OnLineSig::GetUpStatus () const
+// only used to check if aMule is running or not
+int OnLineSig::GetUpStatus() const
 {
 	return m_runTimeS;
 }
 
-wxString OnLineSig::GetRunTime ()
+wxString OnLineSig::GetRunTime()
 {
 	unsigned int seconds = m_runTimeS;
-	unsigned int days = PullCount( &seconds, 86400 );
-	unsigned int hours = PullCount( &seconds, 3600 );
-	unsigned int minutes = PullCount( &seconds, 60 );
-
-	if ( days > 0 ) {
-		return ( wxString::Format ( _( "%02uD %02uh %02umin %02us" ), days, hours, minutes, seconds ) );
-	} else if ( hours > 0 ) {
-		return ( wxString::Format ( _( "%02uh %02umin %02us" ), hours, minutes, seconds ) );
-	} else if ( minutes > 0 ) {
-		return ( wxString::Format ( _( "%02umin %02us" ), minutes, seconds ) );
+	unsigned int days = PullCount(&seconds, 86400);
+	unsigned int hours = PullCount(&seconds, 3600);
+	unsigned int minutes = PullCount(&seconds, 60);
+
+	if (days > 0) {
+		return (wxString::Format(_("%02uD %02uh %02umin %02us"), days, hours, minutes, seconds));
+	} else if (hours > 0) {
+		return (wxString::Format(_("%02uh %02umin %02us"), hours, minutes, seconds));
+	} else if (minutes > 0) {
+		return (wxString::Format(_("%02umin %02us"), minutes, seconds));
 	} else {
-		return ( wxString::Format ( _( "%02us" ), seconds ) );
+		return (wxString::Format(_("%02us"), seconds));
 	}
 }
 
-wxString OnLineSig::GetConvertedTotalUL ()
+wxString OnLineSig::GetConvertedTotalUL()
 {
-	return ( BytesConvertion ( m_totalUL ) );
+	return (BytesConvertion(m_totalUL));
 }
 
-wxString OnLineSig::GetConvertedTotalDL ()
+wxString OnLineSig::GetConvertedTotalDL()
 {
-	return ( BytesConvertion ( m_totalDL ) );
+	return (BytesConvertion(m_totalDL));
 }
 
-wxString OnLineSig::GetConvertedSessionUL ()
+wxString OnLineSig::GetConvertedSessionUL()
 {
-	return ( BytesConvertion ( m_sessionUL ) );
+	return (BytesConvertion(m_sessionUL));
 }
 
-wxString OnLineSig::GetConvertedSessionDL ()
+wxString OnLineSig::GetConvertedSessionDL()
 {
-	return ( BytesConvertion ( m_sessionDL ) );
+	return (BytesConvertion(m_sessionDL));
 }
 
-wxString OnLineSig::GetConnexionIDType () const
+wxString OnLineSig::GetConnexionIDType() const
 {
-	if ( m_connexionID == "H" ) {
-		return ( wxString ( _( "HighID" ) ) );
-	} else if ( m_connexionID == "L" ) {
-                return ( wxString ( _( "LowID" ) ) );
-	}
-	else {
-		return ( wxString ( _( "Not Connected" ) ) );
+	if (m_connexionID == "H") {
+		return (wxString(_("HighID")));
+	} else if (m_connexionID == "L") {
+		return (wxString(_("LowID")));
+	} else {
+		return (wxString(_("Not Connected")));
 	}
 }
 
-double OnLineSig::GetSessionMaxDL () const
+double OnLineSig::GetSessionMaxDL() const
 {
-	return ( m_sessionMaxDL );
+	return (m_sessionMaxDL);
 }
 
-wxDateTime OnLineSig::GetSessionMaxDlDate () const
+wxDateTime OnLineSig::GetSessionMaxDlDate() const
 {
-	return ( m_sessionMaxDLDate );
+	return (m_sessionMaxDLDate);
 }
 
-void OnLineSig::ResetSessionMaxDL ()
+void OnLineSig::ResetSessionMaxDL()
 {
 	m_sessionMaxDL = 0.0;
 	m_sessionMaxDLDate = wxDateTime::Now();
@@ -279,20 +268,20 @@
 
 bool OnLineSig::IsSessionMaxDlChanged() const
 {
-	return ( m_isSessionMaxDlChanged );
+	return (m_isSessionMaxDlChanged);
 }
 
-double OnLineSig::GetAbsoluteMaxDL () const
+double OnLineSig::GetAbsoluteMaxDL() const
 {
-	return ( m_absoluteMaxDL );
+	return (m_absoluteMaxDL);
 }
 
-wxDateTime OnLineSig::GetAbsoluteMaxDlDate () const
+wxDateTime OnLineSig::GetAbsoluteMaxDlDate() const
 {
-	return ( m_absoluteMaxDlDate );
+	return (m_absoluteMaxDlDate);
 }
 
-void OnLineSig::ResetAbsoluteMaxDL ()
+void OnLineSig::ResetAbsoluteMaxDL()
 {
 	m_absoluteMaxDL = 0.0;
 	m_absoluteMaxDlDate = wxDateTime::Now();
@@ -301,47 +290,44 @@
 
 bool OnLineSig::IsAbsoluteMaxDlChanged() const
 {
-	return ( m_isAbsoluteMaxDlChanged );
+	return (m_isAbsoluteMaxDlChanged);
 }
 
 // Private use
-wxString OnLineSig::BytesConvertion ( const wxString & bytes )
+wxString OnLineSig::BytesConvertion(const wxString &bytes)
 {
-	double
-	d_bytes;
-	wxString
-	c_bytes;
+	double d_bytes;
+	wxString c_bytes;
 
-	bytes.ToDouble ( &d_bytes );
+	bytes.ToDouble(&d_bytes);
 
-	int
-	i = 0;
-	while ( d_bytes > 1024 ) {
+	int i = 0;
+	while (d_bytes > 1024) {
 		d_bytes /= 1024;
 		i++;
 	}
 
-	switch ( i ) {
+	switch (i) {
 	case 0:
-		c_bytes = wxString::Format ( _( "%.0f B" ), d_bytes );
+		c_bytes = wxString::Format(_("%.0f B"), d_bytes);
 		break;
 	case 1:
-		c_bytes = wxString::Format ( _( "%.2f KB" ), d_bytes );
+		c_bytes = wxString::Format(_("%.2f KiB"), d_bytes);
 		break;
 	case 2:
-		c_bytes = wxString::Format ( _( "%.2f MB" ), d_bytes );
+		c_bytes = wxString::Format(_("%.2f MiB"), d_bytes);
 		break;
 	case 3:
-		c_bytes = wxString::Format ( _( "%.2f GB" ), d_bytes );
+		c_bytes = wxString::Format(_("%.2f GiB"), d_bytes);
 		break;
 	default:
-		c_bytes = wxString::Format ( _( "%.2f TB" ), d_bytes );
+		c_bytes = wxString::Format(_("%.2f TiB"), d_bytes);
 		break;
 	}
 	return c_bytes;
 }
 
-unsigned int OnLineSig::PullCount ( unsigned int *runtime, const unsigned int count )
+unsigned int OnLineSig::PullCount(unsigned int *runtime, const unsigned int count)
 {
 	unsigned int answer = *runtime / count;
 	*runtime -= answer * count;

amule-3.0.1.tar.gz/src/utils/wxCas/src/onlinesig.h -> amule-3.1.0.tar.gz/src/utils/wxCas/src/onlinesig.h Changed

@@ -30,7 +30,6 @@
 #ifndef _ONLINESIG_H
 #define _ONLINESIG_H
 
-
 #include <wx/filename.h>
 #include <wx/datetime.h>
 
@@ -68,116 +67,105 @@
 
 	wxFileName m_amulesig;
 
-	wxString BytesConvertion ( const wxString& bytes );
-	unsigned int PullCount ( unsigned int *runtime, const unsigned int count );
-
+	wxString BytesConvertion(const wxString &bytes);
+	unsigned int PullCount(unsigned int *runtime, const unsigned int count);
 
 public:
-	/// Constructor
-	OnLineSig ( const wxFileName& file, const double absoluteMaxDL = 0.0,
-	            const wxDateTime absoluteMaxDlDate = wxDateTime::Now() );
+	OnLineSig(const wxFileName &file,
+		const double absoluteMaxDL = 0.0,
+		const wxDateTime absoluteMaxDlDate = wxDateTime::Now());
 
-	/// Destructor
-	~OnLineSig ();
+	~OnLineSig();
 
-	/// Set amulesig.dat file name and path
-	void SetAmuleSig ( const wxFileName& file );
+	void SetAmuleSig(const wxFileName &file);
 
-	/// Refresh stored information
-	void Refresh ();
+	void Refresh();
 
-	/// Return TRUE if aMule is running
-	int GetAmuleState () const;
+	int GetAmuleState() const;
 
-	/// Return kad stat
-	int GetKadState () const;
+	int GetKadState() const;
 
-	/// Get server name
-	wxString GetServerName () const;
+	wxString GetServerName() const;
 
-	/// Get server IP
-	wxString GetServerIP () const;
+	wxString GetServerIP() const;
 
-	/// Get server Port
-	wxString GetServerPort () const;
+	wxString GetServerPort() const;
 
 	/// Get server connexion ID: H or L
-	wxString GetConnexionID () const;
+	wxString GetConnexionID() const;
 
-	/// Get Upload rate
-	wxString GetULRate () const;
+	wxString GetULRate() const;
 
-	/// Get Download rate
-	wxString GetDLRate () const;
+	wxString GetDLRate() const;
 
 	/// Get number of clients in queue
-	wxString GetQueue () const;
+	wxString GetQueue() const;
 
 	/// Get number of shared files
-	wxString GetSharedFiles () const;
+	wxString GetSharedFiles() const;
 
 	/// Get user name
-	wxString GetUser () const;
+	wxString GetUser() const;
 
 	/// Get total Upload
-	wxString GetTotalUL () const;
+	wxString GetTotalUL() const;
 
 	/// Get total Download
-	wxString GetTotalDL () const;
+	wxString GetTotalDL() const;
 
 	/// Get aMule version
-	wxString GetVersion () const;
+	wxString GetVersion() const;
 
 	/// Get session Upload
-	wxString GetSessionUL () const;
+	wxString GetSessionUL() const;
 
 	/// Get session Download
-	wxString GetSessionDL () const;
+	wxString GetSessionDL() const;
 
 	/// Getrunnin Status
-	int GetUpStatus () const;
+	int GetUpStatus() const;
 
 	/// Get aMule runtime
-	wxString GetRunTime ();
+	wxString GetRunTime();
 
 	/// Get total Upload in the best representative unit
-	wxString GetConvertedTotalUL ();
+	wxString GetConvertedTotalUL();
 
 	/// Get total Download in the best representative unit
-	wxString GetConvertedTotalDL ();
+	wxString GetConvertedTotalDL();
 
 	/// Get session Upload in the best representative unit
-	wxString GetConvertedSessionUL ();
+	wxString GetConvertedSessionUL();
 
 	/// Get session Download in the best representative unit
-	wxString GetConvertedSessionDL ();
+	wxString GetConvertedSessionDL();
 
 	/// Get server connexion ID: LowID or HighID
-	wxString GetConnexionIDType () const;
+	wxString GetConnexionIDType() const;
 
 	/// Get max Download rate since wxCas is running
-	double GetSessionMaxDL () const;
+	double GetSessionMaxDL() const;
 
 	/// Get max Download date since wxCas is running
-	wxDateTime GetSessionMaxDlDate () const;
+	wxDateTime GetSessionMaxDlDate() const;
 
 	/// Has the Max session DL rate been beated since last refresh
 	bool IsSessionMaxDlChanged() const;
 
 	/// Reset absolute max Download rate and date
-	void ResetSessionMaxDL ();
+	void ResetSessionMaxDL();
 
 	/// Get absolute max Download rate
-	double GetAbsoluteMaxDL () const;
+	double GetAbsoluteMaxDL() const;
 
 	/// Get absolute max Download date
-	wxDateTime GetAbsoluteMaxDlDate () const;
+	wxDateTime GetAbsoluteMaxDlDate() const;
 
 	/// Has the absolute Max session DL rate been beated since last refresh
 	bool IsAbsoluteMaxDlChanged() const;
 
 	/// Reset absolute max Download rate
-	void ResetAbsoluteMaxDL ();
+	void ResetAbsoluteMaxDL();
 };
 
 #endif /* _ONLINESIG_H */

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcas.cpp -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcas.cpp Changed

@@ -27,8 +27,7 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
-#include "config.h"			// Needed for PACKAGE
+#include "config.h" // Needed for PACKAGE
 
 #include <wx/config.h>
 #include <wx/image.h>
@@ -40,58 +39,53 @@
 #endif
 
 // Application implementation
-IMPLEMENT_APP ( WxCas )
+IMPLEMENT_APP(WxCas)
 
-bool
-WxCas::OnInit ()
+bool WxCas::OnInit()
 {
-	// Match amule (CamuleGuiBase, amule-gui.cpp): wxWidgets 3.2 added
-	// strict assertions for redundant sizer-flag combinations
-	// (e.g. Expand() + Center()), which the wxCas UI uses pervasively
-	// and which become fatal on distros that ship a build asserting on
-	// them (#693, Fedora 43 / wx 3.2.8). Disable the checks here until
-	// the flag uses are cleaned up.
+	// Match amule (CamuleGuiBase, amule-gui.cpp): wxWidgets 3.2 added strict assertions for
+	// redundant sizer-flag combinations such as Expand() + Center(), which the wxCas UI uses
+	// pervasively and which become fatal on distros shipping a build that asserts on them
+	// (#693, Fedora 43 / wx 3.2.8). Disable the checks until the flag uses are cleaned up.
 	wxSizerFlags::DisableConsistencyChecks();
 
 	// Used to tell wxCas to use aMule catalog
 	m_locale.Init();
-	m_locale.AddCatalog( PACKAGE );
+	m_locale.AddCatalog(PACKAGE);
 
 #if wxUSE_LIBPNG
-	wxImage::AddHandler ( new wxPNGHandler );
+	wxImage::AddHandler(new wxPNGHandler);
 #endif
 
 #if wxUSE_LIBJPEG
-	wxImage::AddHandler ( new wxJPEGHandler );
+	wxImage::AddHandler(new wxJPEGHandler);
 #endif
 
 #ifdef __WINDOWS__
-	SetPrintMode ( wxPRINT_WINDOWS );
+	SetPrintMode(wxPRINT_WINDOWS);
 #else
-	SetPrintMode ( wxPRINT_POSTSCRIPT );
+	SetPrintMode(wxPRINT_POSTSCRIPT);
 #endif
 
 	// Prefs
 	wxConfigBase::Get();
 
 	// Main Frame
-	m_frame = new WxCasFrame ( _( "wxCas, aMule Online Statistics" ) );
+	m_frame = new WxCasFrame(_("wxCas, aMule Online Statistics"));
 
 	// Show all
-	m_frame->Show ( TRUE );
-	SetTopWindow ( m_frame );
+	m_frame->Show(TRUE);
+	SetTopWindow(m_frame);
 	return true;
 }
 
-int
-WxCas::OnExit()
+int WxCas::OnExit()
 {
-	delete wxConfigBase::Set( ( wxConfigBase * ) NULL );
+	delete wxConfigBase::Set((wxConfigBase *)NULL);
 	return 0;
 }
 
-WxCasFrame *
-WxCas::GetMainFrame () const
+WxCasFrame *WxCas::GetMainFrame() const
 {
 	return m_frame;
 }

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcas.h -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcas.h Changed

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcascte.cpp -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcascte.cpp Changed

@@ -27,93 +27,61 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
 #include <wx/filename.h>
 
 #ifdef __WXMAC__
-	#include <wx/intl.h> // Do_not_auto_remove
+#include <wx/intl.h> // Do_not_auto_remove
 #elif defined(__WINDOWS__)
-	#include <winerror.h> // Do_not_auto_remove
-	#include <shlobj.h> // Do_not_auto_remove
-	#include <wx/msw/winundef.h>
+#include <winerror.h> // Do_not_auto_remove
+#include <shlobj.h>   // Do_not_auto_remove
+#include <wx/msw/winundef.h>
 #endif
 
 #include "wxcascte.h"
 
-const wxString
-WxCasCte::AMULESIG_FILENAME ( "amulesig.dat" );
-const wxString
-WxCasCte::AMULESIG_IMG_NAME ( "aMule-online-sign" );
+const wxString WxCasCte::AMULESIG_FILENAME("amulesig.dat");
+const wxString WxCasCte::AMULESIG_IMG_NAME("aMule-online-sign");
 
 // Refresh rate limits
-const wxUint32
-WxCasCte::MIN_REFRESH_RATE = 1;
-const wxUint32
-WxCasCte::MAX_REFRESH_RATE = 3600;
+const wxUint32 WxCasCte::MIN_REFRESH_RATE = 1;
+const wxUint32 WxCasCte::MAX_REFRESH_RATE = 3600;
 
 // FTP update limits
-const wxUint32
-WxCasCte::MIN_FTP_RATE = 1;
-const wxUint32
-WxCasCte::MAX_FTP_RATE = 1440;
-
+const wxUint32 WxCasCte::MIN_FTP_RATE = 1;
+const wxUint32 WxCasCte::MAX_FTP_RATE = 1440;
 
 // Key config names
-const wxString
-WxCasCte::AMULESIG_PATH_KEY ( "OSDirectory" );
-const wxString
-WxCasCte::REFRESH_RATE_KEY ( "RefreshRate" );
-
-const wxString
-WxCasCte::ENABLE_AUTOSTATIMG_KEY ( "EnableAutoStatImg" );
-const wxString
-WxCasCte::AUTOSTATIMG_DIR_KEY ( "StatImgDirectory" );
-const wxString
-WxCasCte::AUTOSTATIMG_TYPE_KEY ( "StatImgType" );
-
-const wxString
-WxCasCte::ENABLE_FTP_UPDATE_KEY( "EnableFtpUpdate" );
-const wxString
-WxCasCte::FTP_UPDATE_RATE_KEY ( "FtpUpdateRate" );
-const wxString
-WxCasCte::FTP_URL_KEY ( "FtpUrl" );
-const wxString
-WxCasCte::FTP_PATH_KEY ( "FtpPath" );
-const wxString
-WxCasCte::FTP_USER_KEY ( "FtpUser" );
-const wxString
-WxCasCte::FTP_PASSWD_KEY ( "FtpPasswd" );
-
-const wxString
-WxCasCte::ABSOLUTE_MAX_DL_KEY ( "AbsoluteMaxDL" );
-const wxString
-WxCasCte::ABSOLUTE_MAX_DL_DATE_KEY ( "AbsoluteMaxDlDate" );
+const wxString WxCasCte::AMULESIG_PATH_KEY("OSDirectory");
+const wxString WxCasCte::REFRESH_RATE_KEY("RefreshRate");
+
+const wxString WxCasCte::ENABLE_AUTOSTATIMG_KEY("EnableAutoStatImg");
+const wxString WxCasCte::AUTOSTATIMG_DIR_KEY("StatImgDirectory");
+const wxString WxCasCte::AUTOSTATIMG_TYPE_KEY("StatImgType");
+
+const wxString WxCasCte::ENABLE_FTP_UPDATE_KEY("EnableFtpUpdate");
+const wxString WxCasCte::FTP_UPDATE_RATE_KEY("FtpUpdateRate");
+const wxString WxCasCte::FTP_URL_KEY("FtpUrl");
+const wxString WxCasCte::FTP_PATH_KEY("FtpPath");
+const wxString WxCasCte::FTP_USER_KEY("FtpUser");
+const wxString WxCasCte::FTP_PASSWD_KEY("FtpPasswd");
+
+const wxString WxCasCte::ABSOLUTE_MAX_DL_KEY("AbsoluteMaxDL");
+const wxString WxCasCte::ABSOLUTE_MAX_DL_DATE_KEY("AbsoluteMaxDlDate");
 
 // Default config parameters
-const wxString
-WxCasCte::DEFAULT_AMULESIG_PATH ( GetDefaultAmulesigPath() );
-const wxUint32
-WxCasCte::DEFAULT_REFRESH_RATE = 5;
-
-const bool
-WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED = FALSE;
-const wxString
-WxCasCte::DEFAULT_AUTOSTATIMG_PATH ( wxFileName::GetHomeDir () );
-const wxString
-WxCasCte::DEFAULT_AUTOSTATIMG_TYPE ( "PNG" );
-
-const bool
-WxCasCte::DEFAULT_FTP_UPDATE_ISENABLED = FALSE;
-const wxUint32
-WxCasCte::DEFAULT_FTP_UPDATE_RATE = 10;
-const wxString
-WxCasCte::DEFAULT_FTP_URL( "ftp.myftp.cx" );
-const wxString
-WxCasCte::DEFAULT_FTP_PATH( "/pub/myamuledir" );
-const wxString
-WxCasCte::DEFAULT_FTP_USER( "anonymous" );
-const wxString
-WxCasCte::DEFAULT_FTP_PASSWD( "whiterabit@here" );
+const wxString WxCasCte::DEFAULT_AMULESIG_PATH(GetDefaultAmulesigPath());
+const wxUint32 WxCasCte::DEFAULT_REFRESH_RATE = 5;
+
+const bool WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED = FALSE;
+const wxString WxCasCte::DEFAULT_AUTOSTATIMG_PATH(wxFileName::GetHomeDir());
+const wxString WxCasCte::DEFAULT_AUTOSTATIMG_TYPE("PNG");
+
+const bool WxCasCte::DEFAULT_FTP_UPDATE_ISENABLED = FALSE;
+const wxUint32 WxCasCte::DEFAULT_FTP_UPDATE_RATE = 10;
+const wxString WxCasCte::DEFAULT_FTP_URL("ftp.myftp.cx");
+const wxString WxCasCte::DEFAULT_FTP_PATH("/pub/myamuledir");
+const wxString WxCasCte::DEFAULT_FTP_USER("anonymous");
+const wxString WxCasCte::DEFAULT_FTP_PASSWD("whiterabit@here");
 
 wxString GetDefaultAmulesigPath()
 {
@@ -121,16 +89,13 @@
 
 #ifdef __WXMAC__
 
-	// ~/Library/Application Support is always present on macOS >= 10.5
-	// and matches what FSFindFolder(kUserDomain,
-	// kApplicationSupportFolderType, ...) used to return. Carbon's
-	// FSRef API is gone in 64-bit macOS, so just derive the path from
-	// $HOME.
-	const char* home = getenv("HOME");
+	// ~/Library/Application Support is always present on macOS >= 10.5 and matches what
+	// FSFindFolder(kUserDomain, kApplicationSupportFolderType, ...) used to return. Carbon's
+	// FSRef API is gone in 64-bit macOS, so derive the path from $HOME.
+	const char *home = getenv("HOME");
 	if (home) {
-		strDir = wxString::FromUTF8(home)
-			+ "/Library/Application Support"
-			+ wxFileName::GetPathSeparator() + "aMule";
+		strDir = wxString::FromUTF8(home) + "/Library/Application Support" +
+			 wxFileName::GetPathSeparator() + "aMule";
 	}
 
 #elif defined(__WINDOWS__)

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcascte.h -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcascte.h Changed

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcasframe.cpp -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcasframe.cpp Changed

@@ -27,7 +27,6 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <wx/config.h>
 #include <wx/dcmemory.h>
 #include <wx/datetime.h>
@@ -46,307 +45,266 @@
 #include "wxcascte.h"
 #include "wxcaspix.h"
 
-// Constructor
-WxCasFrame::WxCasFrame ( const wxString & title ) :
-		wxFrame ( ( wxFrame * ) NULL, -1, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE )
+WxCasFrame::WxCasFrame(const wxString &title)
+: wxFrame((wxFrame *)NULL, -1, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE)
 {
-	// Give it an icon
 #ifdef __WINDOWS__
 	wxIcon icon("wxcas");
 #else
 	wxIcon icon;
-	icon.CopyFromBitmap( WxCasPix::getPixmap( "wxcas" ) );
+	icon.CopyFromBitmap(WxCasPix::getPixmap("wxcas"));
 #endif
-	SetIcon ( icon );
+	SetIcon(icon);
 
-	// Prefs
-	wxConfigBase * prefs = wxConfigBase::Get();
+	wxConfigBase *prefs = wxConfigBase::Get();
 
 	m_maxLineCount = 0;
 
 	// Check if we have a previous DL max hit
-	double absoluteMaxDL = ( double ) ( prefs->Read ( WxCasCte::ABSOLUTE_MAX_DL_KEY, 0L ) ) / 1024.0; // Stored in bytes
-	wxDateTime absoluteMaxDlDate( ( time_t ) ( prefs->Read ( WxCasCte::ABSOLUTE_MAX_DL_DATE_KEY,
-	                              ( long ) ( time(NULL) ) ) ) );
-
-	// Add Online Sig file
-	m_aMuleSig = new OnLineSig ( wxFileName( prefs->
-	                             Read ( WxCasCte::AMULESIG_PATH_KEY,
-	                                    WxCasCte::DEFAULT_AMULESIG_PATH ),
-	                             WxCasCte::AMULESIG_FILENAME ),
-	                             absoluteMaxDL, absoluteMaxDlDate );
-
-	//Save absolute hit if we reach it during constructing
-	if ( m_aMuleSig->IsSessionMaxDlChanged() ) {
+	double absoluteMaxDL =
+		(double)(prefs->Read(WxCasCte::ABSOLUTE_MAX_DL_KEY, 0L)) / 1024.0; // Stored in bytes
+	wxDateTime absoluteMaxDlDate(
+		(time_t)(prefs->Read(WxCasCte::ABSOLUTE_MAX_DL_DATE_KEY, (long)(time(NULL)))));
+
+	m_aMuleSig = new OnLineSig(
+		wxFileName(prefs->Read(WxCasCte::AMULESIG_PATH_KEY, WxCasCte::DEFAULT_AMULESIG_PATH),
+			WxCasCte::AMULESIG_FILENAME),
+		absoluteMaxDL,
+		absoluteMaxDlDate);
+
+	// Save absolute hit if we reach it during constructing
+	if (m_aMuleSig->IsSessionMaxDlChanged()) {
 		SaveAbsoluteHits();
 	}
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 
-	m_sysMonitor = new LinuxMon ();
+	m_sysMonitor = new LinuxMon();
 #endif
 
-	// Status Bar
-	CreateStatusBar ();
-	SetStatusText ( _( "Welcome!" ) );
+	CreateStatusBar();
+	SetStatusText(_("Welcome!"));
 
-	// Frame Vertical sizer
-	m_frameVBox = new wxBoxSizer ( wxVERTICAL );
+	m_frameVBox = new wxBoxSizer(wxVERTICAL);
 
-	// Add Main panel to frame (needed by win32 for padding sub panels)
-	m_mainPanel = new wxPanel ( this, -1 );
+	m_mainPanel = new wxPanel(this, -1);
 
-	// Main Panel Vertical Sizer
-	m_mainPanelVBox = new wxBoxSizer ( wxVERTICAL );
+	m_mainPanelVBox = new wxBoxSizer(wxVERTICAL);
 
-	// Main Panel static line
-	m_staticLine = new wxStaticLine ( m_mainPanel, -1 );
+	m_staticLine = new wxStaticLine(m_mainPanel, -1);
 
 #ifdef __WINDOWS__
 
-	m_BottomStaticLine = new wxStaticLine ( m_mainPanel, -1 );
+	m_BottomStaticLine = new wxStaticLine(m_mainPanel, -1);
 #endif
 
-	// Statistics Static Vertical Box Sizer
-	m_sigPanelSBox = new wxStaticBox ( m_mainPanel, -1, _( "aMule" ) );
-	m_sigPanelSBoxSizer = new wxStaticBoxSizer ( m_sigPanelSBox, wxVERTICAL );
+	m_sigPanelSBox = new wxStaticBox(m_mainPanel, -1, _("aMule"));
+	m_sigPanelSBoxSizer = new wxStaticBoxSizer(m_sigPanelSBox, wxVERTICAL);
 
-	// Hit Static Horizontal Box Sizer
-	m_hitPanelSBox = new wxStaticBox ( m_mainPanel, -1, _( "Maximum DL rate since wxCas is running" ) );
-	m_hitPanelSBoxSizer = new wxStaticBoxSizer ( m_hitPanelSBox, wxHORIZONTAL );
+	m_hitPanelSBox = new wxStaticBox(m_mainPanel, -1, _("Maximum DL rate since wxCas is running"));
+	m_hitPanelSBoxSizer = new wxStaticBoxSizer(m_hitPanelSBox, wxHORIZONTAL);
 
-	// Hit Static Horizontal Box Sizer
-	m_absHitPanelSBox = new wxStaticBox ( m_mainPanel, -1, _( "Absolute Maximum DL rate during wxCas previous runs" ) );
-	m_absHitPanelSBoxSizer = new wxStaticBoxSizer ( m_absHitPanelSBox, wxHORIZONTAL );
+	m_absHitPanelSBox =
+		new wxStaticBox(m_mainPanel, -1, _("Absolute Maximum DL rate during wxCas previous runs"));
+	m_absHitPanelSBoxSizer = new wxStaticBoxSizer(m_absHitPanelSBox, wxHORIZONTAL);
 
-	// Statistic labels
-	m_statLine_1 = new wxStaticText ( m_mainPanel, -1, MakeStatLine_1() );
-	m_statLine_2 = new wxStaticText ( m_mainPanel, -1, MakeStatLine_2() );
-	m_statLine_3 = new wxStaticText ( m_mainPanel, -1, MakeStatLine_3() );
-	m_statLine_4 = new wxStaticText ( m_mainPanel, -1, MakeStatLine_4() );
-	m_statLine_5 = new wxStaticText ( m_mainPanel, -1, MakeStatLine_5() );
-	m_statLine_6 = new wxStaticText ( m_mainPanel, -1, MakeStatLine_6() );
-	m_statLine_7 = new wxStaticText ( m_mainPanel, -1, MakeStatLine_7() );
+	m_statLine_1 = new wxStaticText(m_mainPanel, -1, MakeStatLine_1());
+	m_statLine_2 = new wxStaticText(m_mainPanel, -1, MakeStatLine_2());
+	m_statLine_3 = new wxStaticText(m_mainPanel, -1, MakeStatLine_3());
+	m_statLine_4 = new wxStaticText(m_mainPanel, -1, MakeStatLine_4());
+	m_statLine_5 = new wxStaticText(m_mainPanel, -1, MakeStatLine_5());
+	m_statLine_6 = new wxStaticText(m_mainPanel, -1, MakeStatLine_6());
+	m_statLine_7 = new wxStaticText(m_mainPanel, -1, MakeStatLine_7());
 
-	m_hitLine = new wxStaticText ( m_mainPanel, -1, MakeHitsLine_1() );
-	m_hitButton =
-	    new wxButton ( m_mainPanel, ID_HIT_BUTTON, wxString ( _( "Reset" ) ) );
+	m_hitLine = new wxStaticText(m_mainPanel, -1, MakeHitsLine_1());
+	m_hitButton = new wxButton(m_mainPanel, ID_HIT_BUTTON, wxString(_("Reset")));
 
-	m_absHitLine = new wxStaticText ( m_mainPanel, -1, MakeHitsLine_2() );
-	m_absHitButton =
-	    new wxButton ( m_mainPanel, ID_ABS_HIT_BUTTON, wxString ( _( "Reset" ) ) );
+	m_absHitLine = new wxStaticText(m_mainPanel, -1, MakeHitsLine_2());
+	m_absHitButton = new wxButton(m_mainPanel, ID_ABS_HIT_BUTTON, wxString(_("Reset")));
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 
-	// Monitoring Static Vertical Box Sizer
-	m_monPanelSBox = new wxStaticBox ( m_mainPanel, -1, _( "System" ) );
-	m_monPanelSBoxSizer = new wxStaticBoxSizer ( m_monPanelSBox, wxVERTICAL );
+	m_monPanelSBox = new wxStaticBox(m_mainPanel, -1, _("System"));
+	m_monPanelSBoxSizer = new wxStaticBoxSizer(m_monPanelSBox, wxVERTICAL);
 
-	m_sysLine_1 = new wxStaticText ( m_mainPanel, -1, MakeSysLine_1() );
-	m_sysLine_2 = new wxStaticText ( m_mainPanel, -1, MakeSysLine_2() );
+	m_sysLine_1 = new wxStaticText(m_mainPanel, -1, MakeSysLine_1());
+	m_sysLine_2 = new wxStaticText(m_mainPanel, -1, MakeSysLine_2());
 #endif
 
-	// Statistic Panel Layout
-	m_sigPanelSBoxSizer->Add ( m_statLine_1, wxSizerFlags().Expand().Center().Border(wxALL, 5) );
-	m_sigPanelSBoxSizer->Add ( m_statLine_2, wxSizerFlags().Expand().Center().Border(wxALL, 5) );
-	m_sigPanelSBoxSizer->Add ( m_statLine_3, wxSizerFlags().Expand().Center().Border(wxALL, 5) );
-	m_sigPanelSBoxSizer->Add ( m_statLine_4, wxSizerFlags().Expand().Center().Border(wxALL, 5) );
-	m_sigPanelSBoxSizer->Add ( m_statLine_5, wxSizerFlags().Expand().Center().Border(wxALL, 5) );
-	m_sigPanelSBoxSizer->Add ( m_statLine_6, wxSizerFlags().Expand().Center().Border(wxALL, 5) );
-	m_sigPanelSBoxSizer->Add ( m_statLine_7, wxSizerFlags().Expand().Center().Border(wxALL, 5) );
+	m_sigPanelSBoxSizer->Add(m_statLine_1, wxSizerFlags().Expand().Center().Border(wxALL, 5));
+	m_sigPanelSBoxSizer->Add(m_statLine_2, wxSizerFlags().Expand().Center().Border(wxALL, 5));
+	m_sigPanelSBoxSizer->Add(m_statLine_3, wxSizerFlags().Expand().Center().Border(wxALL, 5));
+	m_sigPanelSBoxSizer->Add(m_statLine_4, wxSizerFlags().Expand().Center().Border(wxALL, 5));
+	m_sigPanelSBoxSizer->Add(m_statLine_5, wxSizerFlags().Expand().Center().Border(wxALL, 5));
+	m_sigPanelSBoxSizer->Add(m_statLine_6, wxSizerFlags().Expand().Center().Border(wxALL, 5));
+	m_sigPanelSBoxSizer->Add(m_statLine_7, wxSizerFlags().Expand().Center().Border(wxALL, 5));
 
-	m_hitPanelSBoxSizer->Add ( m_hitLine, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-	m_hitPanelSBoxSizer->Add ( m_hitButton, wxSizerFlags().Right().Border(wxALL, 5) );
+	m_hitPanelSBoxSizer->Add(m_hitLine, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5));
+	m_hitPanelSBoxSizer->Add(m_hitButton, wxSizerFlags().Right().Border(wxALL, 5));
 
-	m_absHitPanelSBoxSizer->Add ( m_absHitLine, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-	m_absHitPanelSBoxSizer->Add ( m_absHitButton, wxSizerFlags().Right().Border(wxALL, 5) );
+	m_absHitPanelSBoxSizer->Add(m_absHitLine, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5));
+	m_absHitPanelSBoxSizer->Add(m_absHitButton, wxSizerFlags().Right().Border(wxALL, 5));
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 
-	m_monPanelSBoxSizer->Add ( m_sysLine_1, wxSizerFlags().Expand().Center().Border(wxALL, 5) );
-	m_monPanelSBoxSizer->Add ( m_sysLine_2, wxSizerFlags().Expand().Center().Border(wxALL, 5) );
+	m_monPanelSBoxSizer->Add(m_sysLine_1, wxSizerFlags().Expand().Center().Border(wxALL, 5));
+	m_monPanelSBoxSizer->Add(m_sysLine_2, wxSizerFlags().Expand().Center().Border(wxALL, 5));
 #endif
 
-	// Main panel Layout
-	m_mainPanelVBox->Add ( m_staticLine, wxSizerFlags().Expand().Center().Border(wxALL, 0));
+	m_mainPanelVBox->Add(m_staticLine, wxSizerFlags().Expand().Center().Border(wxALL, 0));
 
-	m_mainPanelVBox->Add ( m_sigPanelSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10) );
+	m_mainPanelVBox->Add(m_sigPanelSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10));
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 
-	m_mainPanelVBox->Add ( m_monPanelSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10) );
+	m_mainPanelVBox->Add(m_monPanelSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10));
 #endif
 
-	m_mainPanelVBox->Add ( m_hitPanelSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10) );
+	m_mainPanelVBox->Add(m_hitPanelSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10));
 
-	m_mainPanelVBox->Add ( m_absHitPanelSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10) );
+	m_mainPanelVBox->Add(m_absHitPanelSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10));
 
 #ifdef __WINDOWS__
 
-	m_mainPanelVBox->Add ( m_BottomStaticLine, wxSizerFlags().Expand().Center().Border(wxALL, 0));
+	m_mainPanelVBox->Add(m_BottomStaticLine, wxSizerFlags().Expand().Center().Border(wxALL, 0));
 #endif
 
-	// Toolbar Pixmaps
-	m_toolBarBitmaps 0  = WxCasPix::getPixmap( "refresh" );
-	m_toolBarBitmaps 1  = WxCasPix::getPixmap( "save" );
-	m_toolBarBitmaps 2  = WxCasPix::getPixmap( "print" );
-	m_toolBarBitmaps 3  = WxCasPix::getPixmap( "about" );
-	m_toolBarBitmaps 4  = WxCasPix::getPixmap( "stop" );
-	m_toolBarBitmaps 5  = WxCasPix::getPixmap( "prefs" );
+	m_toolBarBitmaps0 = WxCasPix::getPixmap("refresh");
+	m_toolBarBitmaps1 = WxCasPix::getPixmap("save");
+	m_toolBarBitmaps2 = WxCasPix::getPixmap("print");
+	m_toolBarBitmaps3 = WxCasPix::getPixmap("about");
+	m_toolBarBitmaps4 = WxCasPix::getPixmap("stop");
+	m_toolBarBitmaps5 = WxCasPix::getPixmap("prefs");
 
-	// Constructing toolbar
-	m_toolbar =
-	    new wxToolBar ( this, -1, wxDefaultPosition, wxDefaultSize,
-	                    wxTB_HORIZONTAL | wxTB_FLAT );
+	m_toolbar = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL | wxTB_FLAT);
 
-	m_toolbar->SetToolBitmapSize ( wxSize ( 32, 32 ) );
-	m_toolbar->SetMargins ( 2, 2 );
+	m_toolbar->SetToolBitmapSize(wxSize(32, 32));
+	m_toolbar->SetMargins(2, 2);
 
-	m_toolbar->AddTool ( ID_BAR_REFRESH, "Refresh", m_toolBarBitmaps 0 ,
-	                     _( "Stop Auto Refresh" ) );
+	m_toolbar->AddTool(ID_BAR_REFRESH, "Refresh", m_toolBarBitmaps0, _("Stop Auto Refresh"));
 
-	m_toolbar->AddSeparator ();
+	m_toolbar->AddSeparator();
 
-	m_toolbar->AddTool ( ID_BAR_SAVE, "Save", m_toolBarBitmaps 1 ,
-	                     _( "Save Online Statistics image" ) );
+	m_toolbar->AddTool(ID_BAR_SAVE, "Save", m_toolBarBitmaps1, _("Save Online Statistics image"));
 
-	m_toolbar->AddTool ( ID_BAR_PRINT, "Print", m_toolBarBitmaps 2 ,
-	                     _( "Print Online Statistics image" ) );
+	m_toolbar->AddTool(ID_BAR_PRINT, "Print", m_toolBarBitmaps2, _("Print Online Statistics image"));
 
-	m_toolbar->AddTool ( ID_BAR_PREFS, "Prefs", m_toolBarBitmaps 5 ,
-	                     _( "Preferences setting" ) );
+	m_toolbar->AddTool(ID_BAR_PREFS, "Prefs", m_toolBarBitmaps5, _("Preferences setting"));
 
-	m_toolbar->AddSeparator ();
+	m_toolbar->AddSeparator();
 
-	m_toolbar->AddTool ( ID_BAR_ABOUT, "About", m_toolBarBitmaps 3 ,
-	                     _( "About wxCas" ) );
+	m_toolbar->AddTool(ID_BAR_ABOUT, "About", m_toolBarBitmaps3, _("About wxCas"));
 
-	m_toolbar->Realize ();
+	m_toolbar->Realize();
 
-	SetToolBar ( m_toolbar );
+	SetToolBar(m_toolbar);
 
-	// Panel Layout
-	m_mainPanel->SetAutoLayout( true );
-	m_mainPanel->SetSizer ( m_mainPanelVBox );
+	m_mainPanel->SetAutoLayout(true);
+	m_mainPanel->SetSizer(m_mainPanelVBox);
 
-	// Frame Layout
-	m_frameVBox->Add ( m_mainPanel, wxSizerFlags(1).Expand().Border(wxALL, 0));
-	SetAutoLayout ( TRUE );
-	SetSizerAndFit ( m_frameVBox );
+	m_frameVBox->Add(m_mainPanel, wxSizerFlags(1).Expand().Border(wxALL, 0));
+	SetAutoLayout(TRUE);
+	SetSizerAndFit(m_frameVBox);
 
-	// Add refresh timer
-	m_refresh_timer = new wxTimer ( this, ID_REFRESH_TIMER );
-	m_refresh_timer->Start ( 1000 * prefs->Read ( WxCasCte::REFRESH_RATE_KEY, WxCasCte::DEFAULT_REFRESH_RATE ) );	// s to ms
+	m_refresh_timer = new wxTimer(this, ID_REFRESH_TIMER);
+	m_refresh_timer->Start(
+		1000 * prefs->Read(WxCasCte::REFRESH_RATE_KEY, WxCasCte::DEFAULT_REFRESH_RATE)); // s to ms
 
-	// Add FTP update timer
-	m_ftp_update_timer = new wxTimer ( this, ID_FTP_UPDATE_TIMER );
-	m_ftp_update_timer->Start ( 60000 * prefs->Read ( WxCasCte::FTP_UPDATE_RATE_KEY, WxCasCte::DEFAULT_FTP_UPDATE_RATE ) );	// min to ms
+	m_ftp_update_timer = new wxTimer(this, ID_FTP_UPDATE_TIMER);
+	m_ftp_update_timer->Start(60000 * prefs->Read(WxCasCte::FTP_UPDATE_RATE_KEY,
+						  WxCasCte::DEFAULT_FTP_UPDATE_RATE)); // min to ms
 }
 
-// Destructor
-WxCasFrame::~WxCasFrame ()
+WxCasFrame::~WxCasFrame()
 {
 	delete m_aMuleSig;
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 
 	delete m_sysMonitor;
 #endif
 }
 
-// Events table
-wxBEGIN_EVENT_TABLE ( WxCasFrame, wxFrame )
-EVT_TOOL ( ID_BAR_REFRESH, WxCasFrame::OnBarRefresh )
-EVT_TOOL ( ID_BAR_SAVE, WxCasFrame::OnBarSave )
-EVT_TOOL ( ID_BAR_PRINT, WxCasFrame::OnBarPrint )
-EVT_TOOL ( ID_BAR_PREFS, WxCasFrame::OnBarPrefs )
-EVT_TOOL ( ID_BAR_ABOUT, WxCasFrame::OnBarAbout )
-EVT_TIMER ( ID_REFRESH_TIMER, WxCasFrame::OnRefreshTimer )
-EVT_TIMER ( ID_FTP_UPDATE_TIMER, WxCasFrame::OnFtpUpdateTimer )
-EVT_BUTTON ( ID_HIT_BUTTON, WxCasFrame::OnHitButton )
-EVT_BUTTON ( ID_ABS_HIT_BUTTON, WxCasFrame::OnAbsHitButton )
-wxEND_EVENT_TABLE ()
-
-// Get Stat Bitmap
-wxImage *
-WxCasFrame::GetStatImage () const
+wxBEGIN_EVENT_TABLE(WxCasFrame, wxFrame)
+	EVT_TOOL(ID_BAR_REFRESH, WxCasFrame::OnBarRefresh)
+	EVT_TOOL(ID_BAR_SAVE, WxCasFrame::OnBarSave)
+	EVT_TOOL(ID_BAR_PRINT, WxCasFrame::OnBarPrint)
+	EVT_TOOL(ID_BAR_PREFS, WxCasFrame::OnBarPrefs)
+	EVT_TOOL(ID_BAR_ABOUT, WxCasFrame::OnBarAbout)
+	EVT_TIMER(ID_REFRESH_TIMER, WxCasFrame::OnRefreshTimer)
+	EVT_TIMER(ID_FTP_UPDATE_TIMER, WxCasFrame::OnFtpUpdateTimer)
+	EVT_BUTTON(ID_HIT_BUTTON, WxCasFrame::OnHitButton)
+	EVT_BUTTON(ID_ABS_HIT_BUTTON, WxCasFrame::OnAbsHitButton)
+wxEND_EVENT_TABLE()
+
+wxImage *WxCasFrame::GetStatImage() const
 {
-	wxBitmap
-	statBitmap = WxCasPix::getPixmap( "stat" );
+	wxBitmap statBitmap = WxCasPix::getPixmap("stat");
 
 	wxMemoryDC memdc;
-	memdc.SelectObject ( statBitmap );
+	memdc.SelectObject(statBitmap);
 
 #ifdef __WINDOWS__
 
-	memdc.
-	SetFont ( wxFont ( 6, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) );
+	memdc.SetFont(wxFont(6, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
 #else
 
-	memdc.
-	SetFont ( wxFont ( 8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) );
+	memdc.SetFont(wxFont(8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
 #endif
 
-	memdc.
-	SetTextForeground ( *wxWHITE );
-	memdc.
-	DrawText ( m_statLine_1->GetLabel (), 25, 0 );
-	memdc.
-	DrawText ( m_statLine_2->GetLabel (), 25, 17 );
-	memdc.
-	DrawText ( m_statLine_3->GetLabel (), 25, 34 );
-	memdc.
-	DrawText ( m_statLine_4->GetLabel (), 25, 51 );
-	memdc.
-	DrawText ( m_statLine_5->GetLabel (), 25, 68 );
-	memdc.
-	DrawText ( m_statLine_6->GetLabel (), 25, 85 );
-	memdc.
-	DrawText ( m_statLine_7->GetLabel (), 25, 102 );
-	memdc.
-	SelectObject ( wxNullBitmap );
-
-	wxImage *
-	statImage = new wxImage ( statBitmap.ConvertToImage() );
-
-	return
-	    ( statImage );
+	memdc.SetTextForeground(*wxWHITE);
+	memdc.DrawText(m_statLine_1->GetLabel(), 25, 0);
+	memdc.DrawText(m_statLine_2->GetLabel(), 25, 17);
+	memdc.DrawText(m_statLine_3->GetLabel(), 25, 34);
+	memdc.DrawText(m_statLine_4->GetLabel(), 25, 51);
+	memdc.DrawText(m_statLine_5->GetLabel(), 25, 68);
+	memdc.DrawText(m_statLine_6->GetLabel(), 25, 85);
+	memdc.DrawText(m_statLine_7->GetLabel(), 25, 102);
+	memdc.SelectObject(wxNullBitmap);
+
+	wxImage *statImage = new wxImage(statBitmap.ConvertToImage());
+
+	return (statImage);
 }
 
-// Refresh button
-void
-WxCasFrame::OnBarRefresh ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasFrame::OnBarRefresh(wxCommandEvent &WXUNUSED(event))
 {
-	if ( m_refresh_timer->IsRunning () ) {
-		m_refresh_timer->Stop ();
-		m_ftp_update_timer->Stop ();
-		m_toolbar->DeleteTool ( ID_BAR_REFRESH );
-		m_toolbar->InsertTool ( 0, ID_BAR_REFRESH, "Refresh",
-		                        m_toolBarBitmaps 4 , wxNullBitmap,
-		                        wxITEM_NORMAL, _( "Start Auto Refresh" ) );
-		m_toolbar->Realize ();
-		SetStatusText ( _( "Auto Refresh stopped" ) );
+	if (m_refresh_timer->IsRunning()) {
+		m_refresh_timer->Stop();
+		m_ftp_update_timer->Stop();
+		m_toolbar->DeleteTool(ID_BAR_REFRESH);
+		m_toolbar->InsertTool(0,
+			ID_BAR_REFRESH,
+			"Refresh",
+			m_toolBarBitmaps4,
+			wxNullBitmap,
+			wxITEM_NORMAL,
+			_("Start Auto Refresh"));
+		m_toolbar->Realize();
+		SetStatusText(_("Auto Refresh stopped"));
 	} else {
-		m_refresh_timer->Start ();
-		m_ftp_update_timer->Start ();
-		m_toolbar->DeleteTool ( ID_BAR_REFRESH );
-		m_toolbar->InsertTool ( 0, ID_BAR_REFRESH, "Refresh",
-		                        m_toolBarBitmaps 0 , wxNullBitmap,
-		                        wxITEM_NORMAL, _( "Stop Auto Refresh" ) );
-		m_toolbar->Realize ();
-		SetStatusText ( _( "Auto Refresh started" ) );
+		m_refresh_timer->Start();
+		m_ftp_update_timer->Start();
+		m_toolbar->DeleteTool(ID_BAR_REFRESH);
+		m_toolbar->InsertTool(0,
+			ID_BAR_REFRESH,
+			"Refresh",
+			m_toolBarBitmaps0,
+			wxNullBitmap,
+			wxITEM_NORMAL,
+			_("Stop Auto Refresh"));
+		m_toolbar->Realize();
+		SetStatusText(_("Auto Refresh started"));
 	}
 }
 
-// Save button
-void
-WxCasFrame::OnBarSave ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasFrame::OnBarSave(wxCommandEvent &WXUNUSED(event))
 {
-	wxImage * statImage = GetStatImage ();
+	wxImage *statImage = GetStatImage();
 
 	wxFileDialog selectSaveFile(this,
-		_( "Save Statistics Image" ),
-		wxFileName::GetHomeDir (),
+		_("Save Statistics Image"),
+		wxFileName::GetHomeDir(),
 		WxCasCte::AMULESIG_IMG_NAME,
 		"PNG (*.png)|*.png|JPEG (*.jpg)|*.jpg|BMP (*.bmp)|*.bmp",
 		wxFD_SAVE);
@@ -355,14 +313,14 @@
 
 	wxString saveFileName(selectSaveFile.GetPath());
 
-	if ( !saveFileName.empty () ) {
+	if (!saveFileName.empty()) {
 		// static list of allowed types, update if you change extensions above
 		const wxString ext3 = { ".png", ".jpg", ".bmp" };
 		const wxString fileType = extselectSaveFile.GetFilterIndex();
 		bool isValidFileType = false;
 
-		for(int i=0;i<3;++i) {
-			if(exti == saveFileName.Right(4)) {
+		for (int i = 0; i < 3; ++i) {
+			if (exti == saveFileName.Right(4)) {
 				isValidFileType = true;
 				break;
 			}
@@ -373,813 +331,730 @@
 		}
 
 		// wx will display a message if saving fails, file type is taken from extension
-		statImage->SaveFile( saveFileName );
+		statImage->SaveFile(saveFileName);
 	}
 	delete statImage;
 }
 
-// Print button
-void
-WxCasFrame::OnBarPrint ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasFrame::OnBarPrint(wxCommandEvent &WXUNUSED(event))
 {
 	wxPrinter printer;
-	WxCasPrint printout ( _( "aMule Online Statistics" ) );
-	if ( !printer.Print ( this, &printout, TRUE ) ) {
-		if ( wxPrinter::GetLastError () == wxPRINTER_ERROR ) {
-			wxMessageBox ( _
-			               ( "There was a problem printing.\nPerhaps your current printer is not set correctly?" ),
-			               _( "Printing" ), wxOK );
+	WxCasPrint printout(_("aMule Online Statistics"));
+	if (!printer.Print(this, &printout, TRUE)) {
+		if (wxPrinter::GetLastError() == wxPRINTER_ERROR) {
+			wxMessageBox(_("There was a problem printing.\nPerhaps your current printer is not "
+				       "set correctly?"),
+				_("Printing"),
+				wxOK);
 		}
 	}
 }
 
-// Prefs button
-void
-WxCasFrame::OnBarPrefs ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasFrame::OnBarPrefs(wxCommandEvent &WXUNUSED(event))
 {
-	WxCasPrefs dlg ( this );
-	dlg.ShowModal ();
+	WxCasPrefs dlg(this);
+	dlg.ShowModal();
 }
 
-// About button
-void
-WxCasFrame::OnBarAbout ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasFrame::OnBarAbout(wxCommandEvent &WXUNUSED(event))
 {
-	wxMessageBox ( _
-	               ( "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 );
+	wxMessageBox(_("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);
 }
 
-// Refresh timer
-void
-WxCasFrame::OnRefreshTimer ( wxTimerEvent& WXUNUSED( event ) )
+void WxCasFrame::OnRefreshTimer(wxTimerEvent &WXUNUSED(event))
 {
-	// Prefs
-	wxConfigBase * prefs = wxConfigBase::Get();
-
-	UpdateAll ();
-
-	// Generate stat image if asked in config
-	if (prefs->Read( WxCasCte::ENABLE_AUTOSTATIMG_KEY,
-	                 WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED ) ) {
-		wxImage * statImage = GetStatImage ();
-
-		wxFileName fileName ( prefs->
-		                      Read ( WxCasCte::AUTOSTATIMG_DIR_KEY,
-		                             WxCasCte::DEFAULT_AUTOSTATIMG_PATH ),
-		                      WxCasCte::AMULESIG_IMG_NAME,
-		                      prefs->
-		                      Read ( WxCasCte::AUTOSTATIMG_TYPE_KEY,
-		                             WxCasCte::DEFAULT_AUTOSTATIMG_TYPE ).
-		                      Lower () );
-
-		if ( !statImage->SaveFile ( fileName.GetFullPath () ) ) {
-			wxLogError ( "No handler for this file type. File was not saved" );
+	wxConfigBase *prefs = wxConfigBase::Get();
+
+	UpdateAll();
+
+	if (prefs->Read(WxCasCte::ENABLE_AUTOSTATIMG_KEY, WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED)) {
+		wxImage *statImage = GetStatImage();
+
+		wxFileName fileName(
+			prefs->Read(WxCasCte::AUTOSTATIMG_DIR_KEY, WxCasCte::DEFAULT_AUTOSTATIMG_PATH),
+			WxCasCte::AMULESIG_IMG_NAME,
+			prefs->Read(WxCasCte::AUTOSTATIMG_TYPE_KEY, WxCasCte::DEFAULT_AUTOSTATIMG_TYPE)
+				.Lower());
+
+		if (!statImage->SaveFile(fileName.GetFullPath())) {
+			wxLogError("No handler for this file type. File was not saved");
 		}
 		delete statImage;
 	}
 }
 
-// Ftp update timer
-void
-WxCasFrame::OnFtpUpdateTimer ( wxTimerEvent& WXUNUSED( event ) )
+void WxCasFrame::OnFtpUpdateTimer(wxTimerEvent &WXUNUSED(event))
 {
-	// Prefs
-	wxConfigBase * prefs = wxConfigBase::Get();
+	wxConfigBase *prefs = wxConfigBase::Get();
 
 	// Image must be autogenerated to be uploaded
-	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,
-		                             WxCasCte::DEFAULT_AUTOSTATIMG_PATH ),
-		                      WxCasCte::AMULESIG_IMG_NAME,
-		                      prefs->
-		                      Read ( WxCasCte::AUTOSTATIMG_TYPE_KEY,
-		                             WxCasCte::DEFAULT_AUTOSTATIMG_TYPE ).
-		                      Lower () );
-
-		// If img doenst exist, return
-		if ( ! fileName.FileExists( fileName.GetFullPath () ) ) {
-			wxLogError( "Image file " + fileName.GetFullPath () + " doesn't exist" );
-			return ;
+	if (prefs->Read(WxCasCte::ENABLE_AUTOSTATIMG_KEY, WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED) &&
+		prefs->Read(WxCasCte::ENABLE_FTP_UPDATE_KEY, WxCasCte::DEFAULT_FTP_UPDATE_ISENABLED)) {
+		wxFileName fileName(
+			prefs->Read(WxCasCte::AUTOSTATIMG_DIR_KEY, WxCasCte::DEFAULT_AUTOSTATIMG_PATH),
+			WxCasCte::AMULESIG_IMG_NAME,
+			prefs->Read(WxCasCte::AUTOSTATIMG_TYPE_KEY, WxCasCte::DEFAULT_AUTOSTATIMG_TYPE)
+				.Lower());
+
+		if (!fileName.FileExists(fileName.GetFullPath())) {
+			wxLogError("Image file " + fileName.GetFullPath() + " doesn't exist");
+			return;
 		}
 
-		// Connect to ftp
 		wxFTP ftp;
 
-		ftp.SetUser( prefs->Read ( WxCasCte::FTP_USER_KEY,
-		                           WxCasCte::DEFAULT_FTP_USER ) );
-		ftp.SetPassword( prefs->Read ( WxCasCte::FTP_PASSWD_KEY,
-		                               WxCasCte::DEFAULT_FTP_PASSWD ) );
+		ftp.SetUser(prefs->Read(WxCasCte::FTP_USER_KEY, WxCasCte::DEFAULT_FTP_USER));
+		ftp.SetPassword(prefs->Read(WxCasCte::FTP_PASSWD_KEY, WxCasCte::DEFAULT_FTP_PASSWD));
 
-		if ( ! ftp.Connect( prefs->Read ( WxCasCte::FTP_URL_KEY,
-		                                  WxCasCte::DEFAULT_FTP_URL ) ) ) {
-			wxLogError( "Cannot connect to FTP server " + prefs->Read ( WxCasCte::FTP_URL_KEY,
-			            WxCasCte::DEFAULT_FTP_URL ) );
-			return ;
+		if (!ftp.Connect(prefs->Read(WxCasCte::FTP_URL_KEY, WxCasCte::DEFAULT_FTP_URL))) {
+			wxLogError("Cannot connect to FTP server " +
+				   prefs->Read(WxCasCte::FTP_URL_KEY, WxCasCte::DEFAULT_FTP_URL));
+			return;
 		}
 
-		// Chdir
-		if ( ! ftp.ChDir( prefs->Read ( WxCasCte::FTP_PATH_KEY,
-		                                WxCasCte::DEFAULT_FTP_PATH ) ) ) {
-			wxLogError( "Cannot chdir to " + prefs->Read ( WxCasCte::FTP_PATH_KEY,
-			            WxCasCte::DEFAULT_FTP_PATH ) );
+		if (!ftp.ChDir(prefs->Read(WxCasCte::FTP_PATH_KEY, WxCasCte::DEFAULT_FTP_PATH))) {
+			wxLogError("Cannot chdir to " +
+				   prefs->Read(WxCasCte::FTP_PATH_KEY, WxCasCte::DEFAULT_FTP_PATH));
 			ftp.Close();
-			return ;
+			return;
 		}
 
-		// Upload image
 		ftp.SetBinary();
-		wxFileInputStream in( fileName.GetFullPath () );
-		if ( in.Ok() ) {
-			wxOutputStream * out = ftp.GetOutputStream( fileName.GetFullName () );
-			if ( out ) {
-				out->Write( in );
+		wxFileInputStream in(fileName.GetFullPath());
+		if (in.Ok()) {
+			wxOutputStream *out = ftp.GetOutputStream(fileName.GetFullName());
+			if (out) {
+				out->Write(in);
 				delete out;
 			} else {
-				wxLogError( "Cannot open FTP upload stream" );
+				wxLogError("Cannot open FTP upload stream");
 			}
 		} else {
-			wxLogError( "Cannot open file stream to read image file" );
+			wxLogError("Cannot open file stream to read image file");
 		}
 
-		// Close connexion
 		ftp.Close();
 	}
 }
 
-// Reset wxcas session hit
-void
-WxCasFrame::OnHitButton ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasFrame::OnHitButton(wxCommandEvent &WXUNUSED(event))
 {
 	m_aMuleSig->ResetSessionMaxDL();
-	UpdateStatsPanel ();
+	UpdateStatsPanel();
 }
 
-// Reset wxcas absolute hit
-void
-WxCasFrame::OnAbsHitButton ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasFrame::OnAbsHitButton(wxCommandEvent &WXUNUSED(event))
 {
 	m_aMuleSig->ResetAbsoluteMaxDL();
 	SaveAbsoluteHits();
-	UpdateStatsPanel ();
+	UpdateStatsPanel();
 }
 
 // Update all panels and frame, call Fit if needed
-void
-WxCasFrame::UpdateAll ( bool forceFitting )
+void WxCasFrame::UpdateAll(bool forceFitting)
 {
-	bool needFit = UpdateStatsPanel ();
+	bool needFit = UpdateStatsPanel();
 
-	if ( needFit || forceFitting ) {
+	if (needFit || forceFitting) {
 		// Fit stats panel
 		m_mainPanel->Fit();
 
 		// Fit main frame
-		SetClientSize( m_mainPanel->GetSize() );
+		SetClientSize(m_mainPanel->GetSize());
 	}
 }
 
 // Update stat panel
-bool
-WxCasFrame::UpdateStatsPanel ()
+bool WxCasFrame::UpdateStatsPanel()
 {
 	// Set labels
-	m_aMuleSig->Refresh ();
+	m_aMuleSig->Refresh();
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 
-	m_sysMonitor->Refresh ();
+	m_sysMonitor->Refresh();
 #endif
 
 	wxString newline;
 	wxString status;
 	unsigned int newMaxLineCount = 0;
 
-	Freeze ();
+	Freeze();
 
 	// Stat line 1
 	newline = MakeStatLine_1();
-	m_statLine_1->SetLabel ( newline );
+	m_statLine_1->SetLabel(newline);
 
-	newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+	newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 	// aMule is stopped
-	//if ( m_aMuleSig->GetRunTime () == 0
+	// if ( m_aMuleSig->GetRunTime () == 0
 
 	// aMule is not running
-	if ( m_aMuleSig->GetUpStatus () == 0) {
-		status = _( "Oh Oh, aMule is not running..." );
+	if (m_aMuleSig->GetUpStatus() == 0) {
+		status = _("Oh Oh, aMule is not running...");
 		newline = MakeStatLine_2();
-		m_statLine_2->SetLabel ( newline );
+		m_statLine_2->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 	}
 	// aMule is running, ed2k and kad are connected
-	else if ( (m_aMuleSig->GetAmuleState () == 1 ) && (m_aMuleSig->GetKadState () == 1 || m_aMuleSig->GetKadState () == 2)) {
+	else if ((m_aMuleSig->GetAmuleState() == 1) &&
+		 (m_aMuleSig->GetKadState() == 1 || m_aMuleSig->GetKadState() == 2)) {
 		// Stat line 2
 		newline = MakeStatLine_2();
-		m_statLine_2->SetLabel ( newline );
+		m_statLine_2->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 3
 		newline = MakeStatLine_3();
-		m_statLine_3->SetLabel ( newline );
+		m_statLine_3->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 4
 		newline = MakeStatLine_4();
-		m_statLine_4->SetLabel ( newline );
+		m_statLine_4->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 5
 		newline = MakeStatLine_5();
-		m_statLine_5->SetLabel ( newline );
+		m_statLine_5->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 6
 		newline = MakeStatLine_6();
-		m_statLine_6->SetLabel ( newline );
+		m_statLine_6->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 7
 		newline = MakeStatLine_7();
-		m_statLine_7->SetLabel ( newline );
+		m_statLine_7->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Hits line 1
-		if ( m_aMuleSig->IsSessionMaxDlChanged() ) {
+		if (m_aMuleSig->IsSessionMaxDlChanged()) {
 			newline = MakeHitsLine_1();
-			m_hitLine->SetLabel ( newline );
+			m_hitLine->SetLabel(newline);
 
-			newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+			newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 		}
 
 		// Hits line 2
-		if ( m_aMuleSig->IsAbsoluteMaxDlChanged() ) {
+		if (m_aMuleSig->IsAbsoluteMaxDlChanged()) {
 			newline = MakeHitsLine_2();
-			m_absHitLine->SetLabel ( newline );
+			m_absHitLine->SetLabel(newline);
 
-			newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+			newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 			// Save new records
 			SaveAbsoluteHits();
 		}
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 		newline = MakeSysLine_1();
-		m_sysLine_1->SetLabel ( newline );
+		m_sysLine_1->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		newline = MakeSysLine_2();
-		m_sysLine_2->SetLabel ( newline );
+		m_sysLine_2->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 #endif
 
-		status = _( "aMule is running" );
+		status = _("aMule is running");
 	}
 	// aMule is running, ed2k is off, but kad connected
-	else if ( (m_aMuleSig->GetAmuleState () == 0) && (m_aMuleSig->GetKadState () == 1 || m_aMuleSig->GetKadState () == 2 )) {
+	else if ((m_aMuleSig->GetAmuleState() == 0) &&
+		 (m_aMuleSig->GetKadState() == 1 || m_aMuleSig->GetKadState() == 2)) {
 		// Stat line 2
 		newline = MakeStatLine_2();
-		m_statLine_2->SetLabel ( newline );
+		m_statLine_2->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 3
 		newline = MakeStatLine_3();
-		m_statLine_3->SetLabel ( newline );
+		m_statLine_3->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 4
 		newline = MakeStatLine_4();
-		m_statLine_4->SetLabel ( newline );
+		m_statLine_4->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 5
 		newline = MakeStatLine_5();
-		m_statLine_5->SetLabel ( newline );
+		m_statLine_5->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 6
 		newline = MakeStatLine_6();
-		m_statLine_6->SetLabel ( newline );
+		m_statLine_6->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 7
 		newline = MakeStatLine_7();
-		m_statLine_7->SetLabel ( newline );
+		m_statLine_7->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Hits line 1
-		if ( m_aMuleSig->IsSessionMaxDlChanged() ) {
+		if (m_aMuleSig->IsSessionMaxDlChanged()) {
 			newline = MakeHitsLine_1();
-			m_hitLine->SetLabel ( newline );
+			m_hitLine->SetLabel(newline);
 
-			newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+			newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 		}
 
 		// Hits line 2
-		if ( m_aMuleSig->IsAbsoluteMaxDlChanged() ) {
+		if (m_aMuleSig->IsAbsoluteMaxDlChanged()) {
 			newline = MakeHitsLine_2();
-			m_absHitLine->SetLabel ( newline );
+			m_absHitLine->SetLabel(newline);
 
-			newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+			newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 			// Save new records
 			SaveAbsoluteHits();
 		}
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 		newline = MakeSysLine_1();
-		m_sysLine_1->SetLabel ( newline );
+		m_sysLine_1->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		newline = MakeSysLine_2();
-		m_sysLine_2->SetLabel ( newline );
+		m_sysLine_2->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 #endif
-		status = _( "aMule is running" );
-	}
-	else if ( (m_aMuleSig->GetAmuleState () == 1) && (m_aMuleSig->GetKadState () == 0)) {
+		status = _("aMule is running");
+	} else if ((m_aMuleSig->GetAmuleState() == 1) && (m_aMuleSig->GetKadState() == 0)) {
 		// Stat line 2
 		newline = MakeStatLine_2();
-		m_statLine_2->SetLabel ( newline );
+		m_statLine_2->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 3
 		newline = MakeStatLine_3();
-		m_statLine_3->SetLabel ( newline );
+		m_statLine_3->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 4
 		newline = MakeStatLine_4();
-		m_statLine_4->SetLabel ( newline );
+		m_statLine_4->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 5
 		newline = MakeStatLine_5();
-		m_statLine_5->SetLabel ( newline );
+		m_statLine_5->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 6
 		newline = MakeStatLine_6();
-		m_statLine_6->SetLabel ( newline );
+		m_statLine_6->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 7
 		newline = MakeStatLine_7();
-		m_statLine_7->SetLabel ( newline );
+		m_statLine_7->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Hits line 1
-		if ( m_aMuleSig->IsSessionMaxDlChanged() ) {
+		if (m_aMuleSig->IsSessionMaxDlChanged()) {
 			newline = MakeHitsLine_1();
-			m_hitLine->SetLabel ( newline );
+			m_hitLine->SetLabel(newline);
 
-			newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+			newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 		}
 
 		// Hits line 2
-		if ( m_aMuleSig->IsAbsoluteMaxDlChanged() ) {
+		if (m_aMuleSig->IsAbsoluteMaxDlChanged()) {
 			newline = MakeHitsLine_2();
-			m_absHitLine->SetLabel ( newline );
+			m_absHitLine->SetLabel(newline);
 
-			newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+			newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 			// Save new records
 			SaveAbsoluteHits();
 		}
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 		newline = MakeSysLine_1();
-		m_sysLine_1->SetLabel ( newline );
+		m_sysLine_1->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		newline = MakeSysLine_2();
-		m_sysLine_2->SetLabel ( newline );
+		m_sysLine_2->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 #endif
-		status = _( "aMule is running" );
+		status = _("aMule is running");
 	}
-	//both disconnected
-	else if ( (m_aMuleSig->GetAmuleState () == 0) && (m_aMuleSig->GetKadState () == 0)) {
+	// both disconnected
+	else if ((m_aMuleSig->GetAmuleState() == 0) && (m_aMuleSig->GetKadState() == 0)) {
 		// Stat line 2
 		newline = MakeStatLine_2();
-		m_statLine_2->SetLabel ( newline );
+		m_statLine_2->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 3
 		newline = MakeStatLine_3();
-		m_statLine_3->SetLabel ( newline );
+		m_statLine_3->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 4
 		newline = MakeStatLine_4();
-		m_statLine_4->SetLabel ( newline );
+		m_statLine_4->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 5
 		newline = MakeStatLine_5();
-		m_statLine_5->SetLabel ( newline );
+		m_statLine_5->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 6
 		newline = MakeStatLine_6();
-		m_statLine_6->SetLabel ( newline );
+		m_statLine_6->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 7
 		newline = MakeStatLine_7();
-		m_statLine_7->SetLabel ( newline );
+		m_statLine_7->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Hits line 1
-		if ( m_aMuleSig->IsSessionMaxDlChanged() ) {
+		if (m_aMuleSig->IsSessionMaxDlChanged()) {
 			newline = MakeHitsLine_1();
-			m_hitLine->SetLabel ( newline );
+			m_hitLine->SetLabel(newline);
 
-			newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+			newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 		}
 
 		// Hits line 2
-		if ( m_aMuleSig->IsAbsoluteMaxDlChanged() ) {
+		if (m_aMuleSig->IsAbsoluteMaxDlChanged()) {
 			newline = MakeHitsLine_2();
-			m_absHitLine->SetLabel ( newline );
+			m_absHitLine->SetLabel(newline);
 
-			newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+			newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 			// Save new records
 			SaveAbsoluteHits();
 		}
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 		newline = MakeSysLine_1();
-		m_sysLine_1->SetLabel ( newline );
+		m_sysLine_1->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		newline = MakeSysLine_2();
-		m_sysLine_2->SetLabel ( newline );
+		m_sysLine_2->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 #endif
-		status = _( "aMule is running, but disconnected" );
+		status = _("aMule is running, but disconnected");
 	}
 	// aMule is connecting
-	else if ( m_aMuleSig->GetAmuleState () == 2 ) {
+	else if (m_aMuleSig->GetAmuleState() == 2) {
 		// Stat line 2
 		newline = MakeStatLine_2();
-		m_statLine_2->SetLabel ( newline );
+		m_statLine_2->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 3
 		newline = MakeStatLine_3();
-		m_statLine_3->SetLabel ( newline );
+		m_statLine_3->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 4
 		newline = MakeStatLine_4();
-		m_statLine_4->SetLabel ( newline );
+		m_statLine_4->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 5
 		newline = MakeStatLine_5();
-		m_statLine_5->SetLabel ( newline );
+		m_statLine_5->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 6
 		newline = MakeStatLine_6();
-		m_statLine_6->SetLabel ( newline );
+		m_statLine_6->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Stat line 7
 		newline = MakeStatLine_7();
-		m_statLine_7->SetLabel ( newline );
+		m_statLine_7->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		// Hits line 1
-		if ( m_aMuleSig->IsSessionMaxDlChanged() ) {
+		if (m_aMuleSig->IsSessionMaxDlChanged()) {
 			newline = MakeHitsLine_1();
-			m_hitLine->SetLabel ( newline );
+			m_hitLine->SetLabel(newline);
 
-			newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+			newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 		}
 
 		// Hits line 2
-		if ( m_aMuleSig->IsAbsoluteMaxDlChanged() ) {
+		if (m_aMuleSig->IsAbsoluteMaxDlChanged()) {
 			newline = MakeHitsLine_2();
-			m_absHitLine->SetLabel ( newline );
+			m_absHitLine->SetLabel(newline);
 
-			newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+			newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 			// Save new records
 			SaveAbsoluteHits();
 		}
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 		newline = MakeSysLine_1();
-		m_sysLine_1->SetLabel ( newline );
+		m_sysLine_1->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 
 		newline = MakeSysLine_2();
-		m_sysLine_2->SetLabel ( newline );
+		m_sysLine_2->SetLabel(newline);
 
-		newMaxLineCount = GetMaxUInt( newline.Length (), newMaxLineCount );
+		newMaxLineCount = GetMaxUInt(newline.Length(), newMaxLineCount);
 #endif
 
-		status = _( "aMule is connecting..." );
+		status = _("aMule is connecting...");
 	}
 	// aMule status is unknown
 	else {
-		status = _( "Oh Oh, aMule status is unknown..." );
+		status = _("Oh Oh, aMule status is unknown...");
 	}
 
-	Thaw ();
+	Thaw();
 
 	// Set status bar
-	SetStatusText ( status );
+	SetStatusText(status);
 
 	// Resize only if needed
-	if ( m_maxLineCount != newMaxLineCount ) {
+	if (m_maxLineCount != newMaxLineCount) {
 		m_maxLineCount = newMaxLineCount;
-		return ( TRUE );
+		return (TRUE);
 	} else {
-		return ( FALSE );
+		return (FALSE);
 	}
 }
 
 // Refresh period changing
-bool
-WxCasFrame::ChangeRefreshPeriod( const int newPeriod )
+bool WxCasFrame::ChangeRefreshPeriod(const int newPeriod)
 {
 	// As the user can stop it, we must let it in the same state
 	// it was before changing period
 	bool wasRunning = FALSE;
 
-	if ( m_refresh_timer->IsRunning() ) {
+	if (m_refresh_timer->IsRunning()) {
 		wasRunning = TRUE;
 	}
 
-	bool ok = m_refresh_timer->Start( newPeriod );
+	bool ok = m_refresh_timer->Start(newPeriod);
 
-	if ( ! wasRunning ) {
+	if (!wasRunning) {
 		m_refresh_timer->Stop();
 	}
 
-	return ( ok );
+	return (ok);
 }
 
 // Ftp update period changing
-bool
-WxCasFrame::ChangeFtpUpdatePeriod( const int newPeriod )
+bool WxCasFrame::ChangeFtpUpdatePeriod(const int newPeriod)
 {
 	// As the user can stop it, we must let it in the same state
 	// it was before changing period
 	bool wasRunning = FALSE;
 
-	if ( m_ftp_update_timer->IsRunning() ) {
+	if (m_ftp_update_timer->IsRunning()) {
 		wasRunning = TRUE;
 	}
 
-	bool ok = m_ftp_update_timer->Start( newPeriod );
+	bool ok = m_ftp_update_timer->Start(newPeriod);
 
-	if ( ! wasRunning ) {
+	if (!wasRunning) {
 		m_ftp_update_timer->Stop();
 	}
 
-	return ( ok );
+	return (ok);
 }
 
 // Set amulesig.dat file
-void
-WxCasFrame::SetAmuleSigFile( const wxFileName& file )
+void WxCasFrame::SetAmuleSigFile(const wxFileName &file)
 {
-	m_aMuleSig->SetAmuleSig ( file );
+	m_aMuleSig->SetAmuleSig(file);
 }
 
-wxString
-WxCasFrame::MakeStatLine_1() const
+wxString WxCasFrame::MakeStatLine_1() const
 {
 	wxString newline;
-	if ( m_aMuleSig->GetAmuleState () == 1 || m_aMuleSig->GetKadState () == 1 || m_aMuleSig->GetKadState () == 2 ) {
-		newline = _( "aMule " )
-		          + m_aMuleSig->GetVersion ()
-		          + _( " has been running for " )
-		          + m_aMuleSig->GetRunTime ();
-	} else if ( m_aMuleSig->GetUpStatus () == 0 ) {
-		newline  = _( "aMule " )
-		          + m_aMuleSig->GetVersion ()
-		          + _( " is stopped !" );
-	} else if ( m_aMuleSig->GetAmuleState () == 0 && m_aMuleSig->GetKadState () == 0 ) {
-		newline = _( "aMule " )
-		          + m_aMuleSig->GetVersion ()
-		          + _( " is not connected !" );
-	} else if ( m_aMuleSig->GetAmuleState () == 2 ) {
-		newline = _( "aMule " )
-		          + m_aMuleSig->GetVersion ()
-		          + _( " is connecting..." );
+	if (m_aMuleSig->GetAmuleState() == 1 || m_aMuleSig->GetKadState() == 1 ||
+		m_aMuleSig->GetKadState() == 2) {
+		newline = _("aMule ") + m_aMuleSig->GetVersion() + _(" has been running for ") +
+			  m_aMuleSig->GetRunTime();
+	} else if (m_aMuleSig->GetUpStatus() == 0) {
+		newline = _("aMule ") + m_aMuleSig->GetVersion() + _(" is stopped !");
+	} else if (m_aMuleSig->GetAmuleState() == 0 && m_aMuleSig->GetKadState() == 0) {
+		newline = _("aMule ") + m_aMuleSig->GetVersion() + _(" is not connected !");
+	} else if (m_aMuleSig->GetAmuleState() == 2) {
+		newline = _("aMule ") + m_aMuleSig->GetVersion() + _(" is connecting...");
 	} else {
-		newline = _( "aMule " )
-		          + m_aMuleSig->GetVersion ()
-		          + _( " is doing something strange, check it !" );
+		newline =
+			_("aMule ") + m_aMuleSig->GetVersion() + _(" is doing something strange, check it !");
 	}
 
-	return ( newline );
+	return (newline);
 }
 
-wxString
-WxCasFrame::MakeStatLine_2() const
+wxString WxCasFrame::MakeStatLine_2() const
 {
-	wxString notTooLongName ( m_aMuleSig->GetServerName () );
-	if ( notTooLongName.Length() > 32 ) {
-		notTooLongName = notTooLongName.Left( 32 ) + "...";
+	wxString notTooLongName(m_aMuleSig->GetServerName());
+	if (notTooLongName.Length() > 32) {
+		notTooLongName = notTooLongName.Left(32) + "...";
 	}
 
-	if ((m_aMuleSig->GetAmuleState () == 0) && (m_aMuleSig->GetKadState() == 0)){
-	wxString newline = m_aMuleSig->GetUser ()
-	                   + _( " is not connected !" );
-	return ( newline );
+	if ((m_aMuleSig->GetAmuleState() == 0) && (m_aMuleSig->GetKadState() == 0)) {
+		wxString newline = m_aMuleSig->GetUser() + _(" is not connected !");
+		return (newline);
 	}
-	if (m_aMuleSig->GetAmuleState () == 0) {
-	wxString newline = m_aMuleSig->GetUser ()
-	                   + _( " is connected to " )
-			   + _( " Kad: " );
-	if(m_aMuleSig->GetKadState() == 2) {
-		newline += _( "ok" );
-	} else if (m_aMuleSig->GetKadState() == 1) {
-			newline += _( "firewalled" );
+	if (m_aMuleSig->GetAmuleState() == 0) {
+		wxString newline = m_aMuleSig->GetUser() + _(" is connected to ") + _(" Kad: ");
+		if (m_aMuleSig->GetKadState() == 2) {
+			newline += _("ok");
+		} else if (m_aMuleSig->GetKadState() == 1) {
+			newline += _("firewalled");
 		} else {
-		newline += _( "off" );
+			newline += _("off");
 		}
-	return ( newline );
-	}
-	else {
-	wxString newline = m_aMuleSig->GetUser ()
-	                   + _( " is on " )
-	                   + notTooLongName
-			   + " "
-			   + m_aMuleSig->GetServerIP ()
-			   + ":"
-			   + m_aMuleSig->GetServerPort ()
-			   + ""
-			   + _( " with " )
-			   + m_aMuleSig->GetConnexionIDType ()
-			   + " |"
-			   + _( " Kad: " );
-	if(m_aMuleSig->GetKadState() == 2) {
-		newline += _( "ok" );
-	} else if (m_aMuleSig->GetKadState() == 1) {
-		newline += _( "firewalled" );
+		return (newline);
 	} else {
-		newline += _( "off" );
-	}
-	return ( newline );
+		wxString newline = m_aMuleSig->GetUser() + _(" is on ") + notTooLongName + " " +
+				   m_aMuleSig->GetServerIP() + ":" + m_aMuleSig->GetServerPort() + "" +
+				   _(" with ") + m_aMuleSig->GetConnexionIDType() + " |" + _(" Kad: ");
+		if (m_aMuleSig->GetKadState() == 2) {
+			newline += _("ok");
+		} else if (m_aMuleSig->GetKadState() == 1) {
+			newline += _("firewalled");
+		} else {
+			newline += _("off");
+		}
+		return (newline);
 	}
 }
 
-wxString
-WxCasFrame::MakeStatLine_3() const
+wxString WxCasFrame::MakeStatLine_3() const
 {
-	wxString newline = _( "Total Download: " )
-	                   + m_aMuleSig->GetConvertedTotalDL ()
-	                   + _( ", Upload: " )
-	                   + m_aMuleSig->GetConvertedTotalUL ();
+	wxString newline = _("Total Download: ") + m_aMuleSig->GetConvertedTotalDL() + _(", Upload: ") +
+			   m_aMuleSig->GetConvertedTotalUL();
 
-	return ( newline );
+	return (newline);
 }
 
-wxString
-WxCasFrame::MakeStatLine_4() const
+wxString WxCasFrame::MakeStatLine_4() const
 {
-	wxString newline = _( "Session Download: " )
-	                   + m_aMuleSig->GetConvertedSessionDL ()
-	                   + _( ", Upload: " )
-	                   + m_aMuleSig->GetConvertedSessionUL ();
+	wxString newline = _("Session Download: ") + m_aMuleSig->GetConvertedSessionDL() + _(", Upload: ") +
+			   m_aMuleSig->GetConvertedSessionUL();
 
-	return ( newline );
+	return (newline);
 }
 
-wxString
-WxCasFrame::MakeStatLine_5() const
+wxString WxCasFrame::MakeStatLine_5() const
 {
-	wxString newline = _( "Download: " )
-	                   + m_aMuleSig->GetDLRate ()
-	                   + _( " kB/s, Upload: " )
-	                   + m_aMuleSig->GetULRate ()
-	                   + _( " kB/s" );
+	wxString newline = _("Download: ") + m_aMuleSig->GetDLRate() + _(" KiB/s, Upload: ") +
+			   m_aMuleSig->GetULRate() + _(" KiB/s");
 
-	return ( newline );
+	return (newline);
 }
 
-wxString
-WxCasFrame::MakeStatLine_6() const
+wxString WxCasFrame::MakeStatLine_6() const
 {
-	wxString newline = _( "Sharing: " )
-	                   + m_aMuleSig->GetSharedFiles ()
-	                   + _( " file(s), Clients on queue: " )
-	                   + m_aMuleSig->GetQueue ();
+	wxString newline = _("Sharing: ") + m_aMuleSig->GetSharedFiles() + _(" file(s), Clients on queue: ") +
+			   m_aMuleSig->GetQueue();
 
-	return ( newline );
+	return (newline);
 }
 
-wxString
-WxCasFrame::MakeStatLine_7() const
+wxString WxCasFrame::MakeStatLine_7() const
 {
 	wxDateTime now = wxDateTime::Now();
-	wxString newline = _( "Time: " )
-	                   + now.Format( wxDefaultDateTimeFormat , wxDateTime::Local );
+	wxString newline = _("Time: ") + now.Format(wxDefaultDateTimeFormat, wxDateTime::Local);
 
-	return ( newline );
+	return (newline);
 }
 
-wxString
-WxCasFrame::MakeHitsLine_1() const
+wxString WxCasFrame::MakeHitsLine_1() const
 {
-	wxString newline = wxString::Format ( _( "%.2f kB/s" ), m_aMuleSig->GetSessionMaxDL () )
-	                   + _( " on " )
-	                   + m_aMuleSig->GetSessionMaxDlDate().Format( "%c" );
+	wxString newline = wxString::Format(_("%.2f KiB/s"), m_aMuleSig->GetSessionMaxDL()) + _(" on ") +
+			   m_aMuleSig->GetSessionMaxDlDate().Format("%c");
 
-	return ( newline );
+	return (newline);
 }
 
-wxString
-WxCasFrame::MakeHitsLine_2() const
+wxString WxCasFrame::MakeHitsLine_2() const
 {
-	wxString newline = wxString::Format ( _( "%.2f kB/s" ), m_aMuleSig->GetAbsoluteMaxDL() )
-	                   + _( " on " )
-	                   + m_aMuleSig->GetAbsoluteMaxDlDate().Format( "%c" );
+	wxString newline = wxString::Format(_("%.2f KiB/s"), m_aMuleSig->GetAbsoluteMaxDL()) + _(" on ") +
+			   m_aMuleSig->GetAbsoluteMaxDlDate().Format("%c");
 
-	return ( newline );
+	return (newline);
 }
 
-#ifdef __LINUX__		// System monitoring on Linux
-wxString
-WxCasFrame::MakeSysLine_1() const
+#ifdef __LINUX__ // System monitoring on Linux
+wxString WxCasFrame::MakeSysLine_1() const
 {
-	wxString newline = _( "System Load Average (1-5-15 min): " )
-	                   + m_sysMonitor->GetSysLoad_1 () + " "
-	                   + m_sysMonitor->GetSysLoad_5 () + " "
-	                   + m_sysMonitor->GetSysLoad_15 ();
+	wxString newline = _("System Load Average (1-5-15 min): ") + m_sysMonitor->GetSysLoad_1() + " " +
+			   m_sysMonitor->GetSysLoad_5() + " " + m_sysMonitor->GetSysLoad_15();
 
-	return ( newline );
+	return (newline);
 }
 
-wxString
-WxCasFrame::MakeSysLine_2() const
+wxString WxCasFrame::MakeSysLine_2() const
 {
-	wxString newline = _( "System uptime: " )
-	                   + m_sysMonitor->GetUptime ();
+	wxString newline = _("System uptime: ") + m_sysMonitor->GetUptime();
 
-	return ( newline );
+	return (newline);
 }
 #endif
 
 void WxCasFrame::SaveAbsoluteHits()
 {
-	wxConfigBase * prefs = wxConfigBase::Get();
-	prefs->Write( WxCasCte::ABSOLUTE_MAX_DL_KEY, ( long ) ( 1024.0 * m_aMuleSig->GetAbsoluteMaxDL() ) );
-	prefs->Write( WxCasCte::ABSOLUTE_MAX_DL_DATE_KEY, ( long ) ( m_aMuleSig->GetAbsoluteMaxDlDate().GetTicks() ) );
+	wxConfigBase *prefs = wxConfigBase::Get();
+	prefs->Write(WxCasCte::ABSOLUTE_MAX_DL_KEY, (long)(1024.0 * m_aMuleSig->GetAbsoluteMaxDL()));
+	prefs->Write(
+		WxCasCte::ABSOLUTE_MAX_DL_DATE_KEY, (long)(m_aMuleSig->GetAbsoluteMaxDlDate().GetTicks()));
 	prefs->Flush();
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcasframe.h -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcasframe.h Changed

@@ -30,7 +30,6 @@
 #ifndef _WXCASFRAME_H
 #define _WXCASFRAME_H
 
-
 #include <wx/bitmap.h>
 #include <wx/button.h>
 #include <wx/filename.h>
@@ -43,19 +42,18 @@
 #include <wx/timer.h>
 #include <wx/toolbar.h>
 
-
 #include "onlinesig.h"
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 #include "linuxmon.h"
 #endif
 
 /// Main wxCas Frame
-class WxCasFrame: public wxFrame
+class WxCasFrame : public wxFrame
 {
 private:
 	wxToolBar *m_toolbar;
-	wxBitmap m_toolBarBitmaps 6 ;
+	wxBitmap m_toolBarBitmaps6;
 
 	wxBoxSizer *m_frameVBox;
 	wxBoxSizer *m_mainPanelVBox;
@@ -94,14 +92,13 @@
 	wxStaticText *m_hitLine;
 	wxButton *m_hitButton;
 
-
-	wxTimer * m_refresh_timer;
-	wxTimer * m_ftp_update_timer;
+	wxTimer *m_refresh_timer;
+	wxTimer *m_ftp_update_timer;
 
 	OnLineSig *m_aMuleSig;
 	unsigned int m_maxLineCount;
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 
 	wxStaticText *m_sysLine_1;
 	wxStaticText *m_sysLine_2;
@@ -110,21 +107,21 @@
 
 	enum
 	{
-	    ID_BAR_REFRESH = 1000,
-	    ID_BAR_SAVE,
-	    ID_BAR_PRINT,
-	    ID_BAR_PREFS,
-	    ID_BAR_ABOUT,
-	    ID_REFRESH_TIMER,
-	    ID_FTP_UPDATE_TIMER,
-	    ID_HIT_BUTTON,
-	    ID_ABS_HIT_BUTTON
+		ID_BAR_REFRESH = 1000,
+		ID_BAR_SAVE,
+		ID_BAR_PRINT,
+		ID_BAR_PREFS,
+		ID_BAR_ABOUT,
+		ID_REFRESH_TIMER,
+		ID_FTP_UPDATE_TIMER,
+		ID_HIT_BUTTON,
+		ID_ABS_HIT_BUTTON
 	};
 
 	// Get maximum of 2 uint
-	unsigned int GetMaxUInt( const unsigned int a, const unsigned int b )
+	unsigned int GetMaxUInt(const unsigned int a, const unsigned int b)
 	{
-		return ( ( a ) > ( b ) ? ( a ) : ( b ) );
+		return ((a) > (b) ? (a) : (b));
 	}
 
 	// Constructing Stat_lines
@@ -140,46 +137,47 @@
 	wxString MakeHitsLine_1() const;
 	wxString MakeHitsLine_2() const;
 
-#ifdef __LINUX__		// System monitoring on Linux
+#ifdef __LINUX__ // System monitoring on Linux
 	// Constructing Sys_lines
 	wxString MakeSysLine_1() const;
 	wxString MakeSysLine_2() const;
 #endif
 
 protected:
-	bool UpdateStatsPanel ();
-	void UpdateAll ( bool forceFitting = FALSE );
+	bool UpdateStatsPanel();
+	void UpdateAll(bool forceFitting = FALSE);
 	void SaveAbsoluteHits();
 
-	void OnBarRefresh ( wxCommandEvent & event );
-	void OnBarAbout ( wxCommandEvent & event );
-	void OnBarSave ( wxCommandEvent & event );
-	void OnBarPrint ( wxCommandEvent & event );
-	void OnBarPrefs ( wxCommandEvent & event );
-	void OnRefreshTimer ( wxTimerEvent & event );
-	void OnFtpUpdateTimer ( wxTimerEvent & event );
-	void OnHitButton ( wxCommandEvent & event );
-	void OnAbsHitButton ( wxCommandEvent & event );
+	void OnBarRefresh(wxCommandEvent &event);
+	void OnBarAbout(wxCommandEvent &event);
+	void OnBarSave(wxCommandEvent &event);
+	void OnBarPrint(wxCommandEvent &event);
+	void OnBarPrefs(wxCommandEvent &event);
+	void OnRefreshTimer(wxTimerEvent &event);
+	void OnFtpUpdateTimer(wxTimerEvent &event);
+	void OnHitButton(wxCommandEvent &event);
+	void OnAbsHitButton(wxCommandEvent &event);
 
 	wxDECLARE_EVENT_TABLE();
+
 public:
 	/// Constructor
-	WxCasFrame ( const wxString& title );
+	WxCasFrame(const wxString &title);
 
 	/// Destructor
-	~WxCasFrame ();
+	~WxCasFrame();
 
 	/// Get Online statistics image
-	wxImage *GetStatImage () const;
+	wxImage *GetStatImage() const;
 
 	/// Refresh timer period changing
-	bool ChangeRefreshPeriod( const int newPeriod );
+	bool ChangeRefreshPeriod(const int newPeriod);
 
 	/// Refresh timer period changing
-	bool ChangeFtpUpdatePeriod( const int newPeriod );
+	bool ChangeFtpUpdatePeriod(const int newPeriod);
 
 	/// Set amulesig.dat file
-	void SetAmuleSigFile( const wxFileName& file );
+	void SetAmuleSigFile(const wxFileName &file);
 };
 
 #endif /* _WXCASFRAME_H */

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcaspix.cpp -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcaspix.cpp Changed

@@ -27,1656 +27,3277 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
 #include "wxcaspix.h"
 
-wxBitmap WxCasPix::getPixmap( const wxString& name )
+wxBitmap WxCasPix::getPixmap(const wxString &name)
 {
-	if ( name == "about" ) {
-		wxBitmap bitmap( m_about_xpm );
+	if (name == "about") {
+		wxBitmap bitmap(m_about_xpm);
 		return bitmap;
-	} else if ( name == "prefs" ) {
-		wxBitmap bitmap( m_prefs_xpm );
+	} else if (name == "prefs") {
+		wxBitmap bitmap(m_prefs_xpm);
 		return bitmap;
-	} else if ( name == "print" ) {
-		wxBitmap bitmap( m_print_xpm );
+	} else if (name == "print") {
+		wxBitmap bitmap(m_print_xpm);
 		return bitmap;
-	} else if ( name == "refresh" ) {
-		wxBitmap bitmap( m_refresh_xpm );
+	} else if (name == "refresh") {
+		wxBitmap bitmap(m_refresh_xpm);
 		return bitmap;
-	} else if ( name == "save" ) {
-		wxBitmap bitmap( m_save_xpm );
+	} else if (name == "save") {
+		wxBitmap bitmap(m_save_xpm);
 		return bitmap;
-	} else if ( name == "stat" ) {
-		wxBitmap bitmap( m_stat_xpm );
+	} else if (name == "stat") {
+		wxBitmap bitmap(m_stat_xpm);
 		return bitmap;
-	} else if ( name == "stop" ) {
-		wxBitmap bitmap( m_stop_xpm );
+	} else if (name == "stop") {
+		wxBitmap bitmap(m_stop_xpm);
 		return bitmap;
 #ifndef __WINDOWS__
-	} else if ( name == "wxcas" ) {
-		wxBitmap bitmap( m_wxcas_xpm );
+	} else if (name == "wxcas") {
+		wxBitmap bitmap(m_wxcas_xpm);
 		return bitmap;
 #endif
 	} else {
 		return wxNullBitmap;
 	}
-
 }
 
-const char *
-WxCasPix::m_about_xpm =
-    { /* XPM */
-        /* columns rows colors chars-per-pixel */
-        "32 32 179 2",
-        "   c None",
-        ".  c #0c0b0a",
-        "X  c #32373e",
-        "o  c #3f3330",
-        "O  c #002e66",
-        "+  c #00306a",
-        "@  c #003573",
-        "#  c #003778",
-        "$  c #00397c",
-        "%  c #5a2d12",
-        "&  c #45312a",
-        "*  c #642909",
-        "=  c #682b09",
-        "-  c #6f310d",
-        ";  c #74360f",
-        ":  c #7a3b12",
-        ">  c #7c4d2d",
-        ",  c #48494c",
-        "<  c #7e5e50",
-        "1  c #675b63",
-        "2  c #696c6f",
-        "3  c #003c84",
-        "4  c #003f89",
-        "5  c #00408b",
-        "6  c #0a4083",
-        "7  c #014499",
-        "8  c #114d9c",
-        "9  c #18529c",
-        "0  c #054eb0",
-        "q  c #0d51a5",
-        "w  c #1558a7",
-        "e  c #1857b1",
-        "r  c #1b65ae",
-        "t  c #23558d",
-        "y  c #245f9f",
-        "u  c #34659b",
-        "i  c #276bb8",
-        "p  c #3f6ea2",
-        "a  c #0657c6",
-        "s  c #1462d2",
-        "d  c #256cd0",
-        "f  c #2774c4",
-        "g  c #2d70cd",
-        "h  c #2f76d7",
-        "j  c #2171e8",
-        "k  c #357fe6",
-        "l  c #3b95db",
-        "z  c #2f82f0",
-        "x  c #3a80e6",
-        "c  c #3a85e8",
-        "v  c #3e89ed",
-        "b  c #3684f1",
-        "n  c #5185bf",
-        "m  c #4182c7",
-        "M  c #4997d8",
-        "N  c #4289ec",
-        "B  c #4389f2",
-        "V  c #4490f2",
-        "C  c #4e94f2",
-        "Z  c #5a9df3",
-        "A  c #54afed",
-        "S  c #5ba4e1",
-        "D  c #71a6da",
-        "F  c #63a3f6",
-        "G  c #67a9f8",
-        "H  c #6ca9f7",
-        "J  c #6daaf8",
-        "K  c #79aee9",
-        "L  c #75b8ee",
-        "P  c #76b1f7",
-        "I  c #77b2f9",
-        "U  c #75bcf3",
-        "Y  c #7bb4f9",
-        "T  c #7fbdf9",
-        "R  c #74c2fa",
-        "E  c #7dc6fa",
-        "W  c #833f14",
-        "Q  c #bf2b4a",
-        "!  c #8f4b1b",
-        "~  c #954f1d",
-        "^  c #97511e",
-        "/  c #9c5622",
-        "(  c #a45b24",
-        ")  c #a25d29",
-        "_  c #a7602a",
-        "`  c #ad6227",
-        "'  c #ad6228",
-        "  c #b6692b",
-        "  c #b86b2c",
-        "{  c #b67038",
-        "}  c #bd7031",
-        "|  c #867069",
-        " . c #ac4c6f",
-        ".. c #b14062",
-        "X. c #b14a6c",
-        "o. c #c73351",
-        "O. c #ca3f5c",
-        "+. c #c0712f",
-        "@. c #c67530",
-        "#. c #c37a31",
-        "$. c #c07a3c",
-        "%. c #ca7b38",
-        "&. c #cc5773",
-        "*. c #c7627f",
-        "=. c #a35d82",
-        "-. c #b67698",
-        ";. c #ce6d87",
-        ":. c #b68b67",
-        ">. c #cd8838",
-        ",. c #e49c3f",
-        "<. c #ce8240",
-        "1. c #cf874a",
-        "2. c #d38c4d",
-        "3. c #d89c47",
-        "4. c #d69658",
-        "5. c #d99b62",
-        "6. c #dca25c",
-        "7. c #daa16c",
-        "8. c #e0ae7d",
-        "9. c #838186",
-        "0. c #9a9794",
-        "q. c #8192af",
-        "w. c #ac98bb",
-        "e. c #b58fb1",
-        "r. c #a0a09f",
-        "t. c #b4b4b0",
-        "y. c #92b2d8",
-        "u. c #83baf9",
-        "i. c #8abffb",
-        "p. c #abb3db",
-        "a. c #b5afd1",
-        "s. c #b4b7da",
-        "d. c #83c9fb",
-        "f. c #8bc3fc",
-        "g. c #9bc4e8",
-        "h. c #93c4fb",
-        "j. c #95ccfb",
-        "k. c #9dccfc",
-        "l. c #9cd1fb",
-        "z. c #a0cefd",
-        "x. c #a4d1fe",
-        "c. c #afd5f3",
-        "v. c #abd5fd",
-        "b. c #b7cdee",
-        "n. c #b7d4f5",
-        "m. c #b4d9f7",
-        "M. c #b4dbfe",
-        "N. c #b9defe",
-        "B. c #bde1fe",
-        "V. c #d487a0",
-        "C. c #d49db4",
-        "Z. c #d1b28b",
-        "A. c #d1a7be",
-        "S. c #e4b785",
-        "D. c #d0b4cb",
-        "F. c #d1bad0",
-        "G. c #e2bdcd",
-        "H. c #edcfa7",
-        "J. c #cac8c2",
-        "K. c #d4cdc2",
-        "L. c #dfdbd6",
-        "P. c #cad3ea",
-        "I. c #c4e4ff",
-        "U. c #c9e7ff",
-        "Y. c #cae8ff",
-        "T. c #d3ecfe",
-        "R. c #dbf0ff",
-        "E. c #e2c9d9",
-        "W. c #e2d4e2",
-        "Q. c #f6e7da",
-        "!. c #e7e7e5",
-        "~. c #e2e1ef",
-        "^. c #e3f3ff",
-        "/. c #eaf6ff",
-        "(. c #eef8ff",
-        "). c #f1f1ef",
-        "_. c #f2f9ff",
-        "`. c #fdfdfe",
-        "'. c None",
-        /* pixels */
-        "'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.",
-        "'.'.'.'.'.'.'.'.'.'.'.4 3 3 $ $ $ $ $ $ $ '.'.'.'.'.'.'.'.'.'.'.",
-        "'.'.'.'.'.'.'.'.3 3 3 w l A R d.d.d.U D y # @ @ '.'.'.'.'.'.'.'.",
-        "'.'.'.'.'.'.4 4 r M U j.l.B.N.B.B.N.B.m.c.g.D u @ @ '.'.'.'.'.'.",
-        "'.'.'.'.4 4 f M d.N.T./.`.`.`.`.`.`.`.`.`.(.T.B.y.p @ + '.'.'.'.",
-        "'.'.'.4 w l R M.T.`.`.`.`.`.`.`.`.`.`.`.`.`.`._.R.I.y.t + '.'.'.",
-        "'.'.4 i l R M.`.`.`._.^.^.W.W.W.W.W.^.^.^._._.`.`.T.B.g.p + '.'.",
-        "'.4 r l E B.`.(.^.^.^.^.^.E.G.G.G.E.^.^.^.^.^.^._.`.R.M.D t + '.",
-        "'.5 m R N.`.^.T.T.T.T.T.T.A.C.C.C.F.R.R.R.R.R.^.^.^.`.T.z.n + '.",
-        "5 i S M./._.T.T.T.T.T.T.T.A.V.V.V.D.T.R.T.T.T.T.R.^././.M.K 9 + ",
-        "4 m d.N._.T.T.T.Y.Y.Y.Y.Y.A.;.;.;.D.Y.Y.Y.Y.Y.Y.T.Y.^._.M.i.i O ",
-        "4 S j.N._.U.I.U.Y.Y.Y.Y.Y.F.&.&.&.P.Y.Y.Y.Y.Y.Y.Y.T.Y._.v.u.m + ",
-        "4 L k.M.(.I.I.I.Y.Y.Y.Y.U.P.O.O.O.Y.U.U.U.U.U.I.I.I.I./.v.P c O ",
-        "4 S x.v.Y.B.B.I.I.I.I.I.I.I.*.o.*.Y.I.U.I.I.I.I.I.I.N.Y.i.F k O ",
-        "4 n k.x.B.M.M.N.B.B.B.B.B.B.-.Q -.B.B.B.B.B.I.I.N.I.I.B.Y C d O ",
-        "4 y D x.M.N.N.N.M.< * * * B.a.e.a.B.B.B.B.N.N.B.N.N.N.x.H N 8 + ",
-        "'.3 l * * * B.< ; { 6.: | N.n.e.b.N.M.B.N.N.N.B.B.N.N.i.Z h O '.",
-        "'.# * 2.* k.*  S.5.) ; y.a..... .s.M.M.N.N.N.N.B.v.h.Z v 8 O '.",
-        "'.* @. * ; H.S.7.>.; | v.e. . . .a.M.B.N.N.N.M.v.h.Z B g O '.'.",
-        "'.*  ; <.8.4.2.) % =.z.z.a.=.=.-.s.x.v.N.N.N.v.j.C k g 9 + '.'.",
-        "* * ! <.2.>.' * 1 D K h.f.f.p.w.p.f.h.x.M.v.M.T F N i 8 O '.'.'.",
-        "'.* ~  ` ` : / * i c F G H H H H H I f.x.v.u.C N e 3 + '.'.'.'.",
-        "* * (  @.% 8.H.{ * @ 8 s j b b b B F I f.i.C k w O + '.'.'.'.'.",
-        "'.*  } @.7._.L.. ! = & X X @ + @ 7 a F u.F j w + '.'.'.'.'.'.'.",
-        "* - @.<.@.2.Q.0.X ) Z.L.).t.X '.'.+ 7 s Z b w + '.'.'.'.'.'.'.'.",
-        "* ~ 2.6.4.%.1.4.%.%.Z.2 . `.t.X '.'.+ a b a O '.'.'.'.'.'.'.'.'.",
-        "* ` 2.H.8.2.%. ) $.t.t.r.).!.X '.'.+ a s + '.'.'.'.'.'.'.'.'.'.",
-        "* ~ <.5.7.2.%. ` { K.!.`.).).X '.'.+ 0 + '.'.'.'.'.'.'.'.'.'.'.",
-        "* -  <.>.3.@. ( :.J.L.!.).!.X '.'.O + '.'.'.'.'.'.'.'.'.'.'.'.",
-        "* : * ) ( ( ( / > r.J.2 J.L.9.X '.'.+ '.'.'.'.'.'.'.'.'.'.'.'.'.",
-        "- ! / W = * % & X 2 0.t., X X '.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.",
-        "- ! #.,.<.' * '.'.X X X X '.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'."
-    };
+const char *WxCasPix::m_about_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 179 2",
+	"   c None",
+	".  c #0c0b0a",
+	"X  c #32373e",
+	"o  c #3f3330",
+	"O  c #002e66",
+	"+  c #00306a",
+	"@  c #003573",
+	"#  c #003778",
+	"$  c #00397c",
+	"%  c #5a2d12",
+	"&  c #45312a",
+	"*  c #642909",
+	"=  c #682b09",
+	"-  c #6f310d",
+	";  c #74360f",
+	":  c #7a3b12",
+	">  c #7c4d2d",
+	",  c #48494c",
+	"<  c #7e5e50",
+	"1  c #675b63",
+	"2  c #696c6f",
+	"3  c #003c84",
+	"4  c #003f89",
+	"5  c #00408b",
+	"6  c #0a4083",
+	"7  c #014499",
+	"8  c #114d9c",
+	"9  c #18529c",
+	"0  c #054eb0",
+	"q  c #0d51a5",
+	"w  c #1558a7",
+	"e  c #1857b1",
+	"r  c #1b65ae",
+	"t  c #23558d",
+	"y  c #245f9f",
+	"u  c #34659b",
+	"i  c #276bb8",
+	"p  c #3f6ea2",
+	"a  c #0657c6",
+	"s  c #1462d2",
+	"d  c #256cd0",
+	"f  c #2774c4",
+	"g  c #2d70cd",
+	"h  c #2f76d7",
+	"j  c #2171e8",
+	"k  c #357fe6",
+	"l  c #3b95db",
+	"z  c #2f82f0",
+	"x  c #3a80e6",
+	"c  c #3a85e8",
+	"v  c #3e89ed",
+	"b  c #3684f1",
+	"n  c #5185bf",
+	"m  c #4182c7",
+	"M  c #4997d8",
+	"N  c #4289ec",
+	"B  c #4389f2",
+	"V  c #4490f2",
+	"C  c #4e94f2",
+	"Z  c #5a9df3",
+	"A  c #54afed",
+	"S  c #5ba4e1",
+	"D  c #71a6da",
+	"F  c #63a3f6",
+	"G  c #67a9f8",
+	"H  c #6ca9f7",
+	"J  c #6daaf8",
+	"K  c #79aee9",
+	"L  c #75b8ee",
+	"P  c #76b1f7",
+	"I  c #77b2f9",
+	"U  c #75bcf3",
+	"Y  c #7bb4f9",
+	"T  c #7fbdf9",
+	"R  c #74c2fa",
+	"E  c #7dc6fa",
+	"W  c #833f14",
+	"Q  c #bf2b4a",
+	"!  c #8f4b1b",
+	"~  c #954f1d",
+	"^  c #97511e",
+	"/  c #9c5622",
+	"(  c #a45b24",
+	")  c #a25d29",
+	"_  c #a7602a",
+	"`  c #ad6227",
+	"'  c #ad6228",
+	"  c #b6692b",
+	"  c #b86b2c",
+	"{  c #b67038",
+	"}  c #bd7031",
+	"|  c #867069",
+	" . c #ac4c6f",
+	".. c #b14062",
+	"X. c #b14a6c",
+	"o. c #c73351",
+	"O. c #ca3f5c",
+	"+. c #c0712f",
+	"@. c #c67530",
+	"#. c #c37a31",
+	"$. c #c07a3c",
+	"%. c #ca7b38",
+	"&. c #cc5773",
+	"*. c #c7627f",
+	"=. c #a35d82",
+	"-. c #b67698",
+	";. c #ce6d87",
+	":. c #b68b67",
+	">. c #cd8838",
+	",. c #e49c3f",
+	"<. c #ce8240",
+	"1. c #cf874a",
+	"2. c #d38c4d",
+	"3. c #d89c47",
+	"4. c #d69658",
+	"5. c #d99b62",
+	"6. c #dca25c",
+	"7. c #daa16c",
+	"8. c #e0ae7d",
+	"9. c #838186",
+	"0. c #9a9794",
+	"q. c #8192af",
+	"w. c #ac98bb",
+	"e. c #b58fb1",
+	"r. c #a0a09f",
+	"t. c #b4b4b0",
+	"y. c #92b2d8",
+	"u. c #83baf9",
+	"i. c #8abffb",
+	"p. c #abb3db",
+	"a. c #b5afd1",
+	"s. c #b4b7da",
+	"d. c #83c9fb",
+	"f. c #8bc3fc",
+	"g. c #9bc4e8",
+	"h. c #93c4fb",
+	"j. c #95ccfb",
+	"k. c #9dccfc",
+	"l. c #9cd1fb",
+	"z. c #a0cefd",
+	"x. c #a4d1fe",
+	"c. c #afd5f3",
+	"v. c #abd5fd",
+	"b. c #b7cdee",
+	"n. c #b7d4f5",
+	"m. c #b4d9f7",
+	"M. c #b4dbfe",
+	"N. c #b9defe",
+	"B. c #bde1fe",
+	"V. c #d487a0",
+	"C. c #d49db4",
+	"Z. c #d1b28b",
+	"A. c #d1a7be",
+	"S. c #e4b785",
+	"D. c #d0b4cb",
+	"F. c #d1bad0",
+	"G. c #e2bdcd",
+	"H. c #edcfa7",
+	"J. c #cac8c2",
+	"K. c #d4cdc2",
+	"L. c #dfdbd6",
+	"P. c #cad3ea",
+	"I. c #c4e4ff",
+	"U. c #c9e7ff",
+	"Y. c #cae8ff",
+	"T. c #d3ecfe",
+	"R. c #dbf0ff",
+	"E. c #e2c9d9",
+	"W. c #e2d4e2",
+	"Q. c #f6e7da",
+	"!. c #e7e7e5",
+	"~. c #e2e1ef",
+	"^. c #e3f3ff",
+	"/. c #eaf6ff",
+	"(. c #eef8ff",
+	"). c #f1f1ef",
+	"_. c #f2f9ff",
+	"`. c #fdfdfe",
+	"'. c None",
+	/* pixels */
+	"'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.",
+	"'.'.'.'.'.'.'.'.'.'.'.4 3 3 $ $ $ $ $ $ $ '.'.'.'.'.'.'.'.'.'.'.",
+	"'.'.'.'.'.'.'.'.3 3 3 w l A R d.d.d.U D y # @ @ '.'.'.'.'.'.'.'.",
+	"'.'.'.'.'.'.4 4 r M U j.l.B.N.B.B.N.B.m.c.g.D u @ @ '.'.'.'.'.'.",
+	"'.'.'.'.4 4 f M d.N.T./.`.`.`.`.`.`.`.`.`.(.T.B.y.p @ + '.'.'.'.",
+	"'.'.'.4 w l R M.T.`.`.`.`.`.`.`.`.`.`.`.`.`.`._.R.I.y.t + '.'.'.",
+	"'.'.4 i l R M.`.`.`._.^.^.W.W.W.W.W.^.^.^._._.`.`.T.B.g.p + '.'.",
+	"'.4 r l E B.`.(.^.^.^.^.^.E.G.G.G.E.^.^.^.^.^.^._.`.R.M.D t + '.",
+	"'.5 m R N.`.^.T.T.T.T.T.T.A.C.C.C.F.R.R.R.R.R.^.^.^.`.T.z.n + '.",
+	"5 i S M./._.T.T.T.T.T.T.T.A.V.V.V.D.T.R.T.T.T.T.R.^././.M.K 9 + ",
+	"4 m d.N._.T.T.T.Y.Y.Y.Y.Y.A.;.;.;.D.Y.Y.Y.Y.Y.Y.T.Y.^._.M.i.i O ",
+	"4 S j.N._.U.I.U.Y.Y.Y.Y.Y.F.&.&.&.P.Y.Y.Y.Y.Y.Y.Y.T.Y._.v.u.m + ",
+	"4 L k.M.(.I.I.I.Y.Y.Y.Y.U.P.O.O.O.Y.U.U.U.U.U.I.I.I.I./.v.P c O ",
+	"4 S x.v.Y.B.B.I.I.I.I.I.I.I.*.o.*.Y.I.U.I.I.I.I.I.I.N.Y.i.F k O ",
+	"4 n k.x.B.M.M.N.B.B.B.B.B.B.-.Q -.B.B.B.B.B.I.I.N.I.I.B.Y C d O ",
+	"4 y D x.M.N.N.N.M.< * * * B.a.e.a.B.B.B.B.N.N.B.N.N.N.x.H N 8 + ",
+	"'.3 l * * * B.< ; { 6.: | N.n.e.b.N.M.B.N.N.N.B.B.N.N.i.Z h O '.",
+	"'.# * 2.* k.*  S.5.) ; y.a..... .s.M.M.N.N.N.N.B.v.h.Z v 8 O '.",
+	"'.* @. * ; H.S.7.>.; | v.e. . . .a.M.B.N.N.N.M.v.h.Z B g O '.'.",
+	"'.*  ; <.8.4.2.) % =.z.z.a.=.=.-.s.x.v.N.N.N.v.j.C k g 9 + '.'.",
+	"* * ! <.2.>.' * 1 D K h.f.f.p.w.p.f.h.x.M.v.M.T F N i 8 O '.'.'.",
+	"'.* ~  ` ` : / * i c F G H H H H H I f.x.v.u.C N e 3 + '.'.'.'.",
+	"* * (  @.% 8.H.{ * @ 8 s j b b b B F I f.i.C k w O + '.'.'.'.'.",
+	"'.*  } @.7._.L.. ! = & X X @ + @ 7 a F u.F j w + '.'.'.'.'.'.'.",
+	"* - @.<.@.2.Q.0.X ) Z.L.).t.X '.'.+ 7 s Z b w + '.'.'.'.'.'.'.'.",
+	"* ~ 2.6.4.%.1.4.%.%.Z.2 . `.t.X '.'.+ a b a O '.'.'.'.'.'.'.'.'.",
+	"* ` 2.H.8.2.%. ) $.t.t.r.).!.X '.'.+ a s + '.'.'.'.'.'.'.'.'.'.",
+	"* ~ <.5.7.2.%. ` { K.!.`.).).X '.'.+ 0 + '.'.'.'.'.'.'.'.'.'.'.",
+	"* -  <.>.3.@. ( :.J.L.!.).!.X '.'.O + '.'.'.'.'.'.'.'.'.'.'.'.",
+	"* : * ) ( ( ( / > r.J.2 J.L.9.X '.'.+ '.'.'.'.'.'.'.'.'.'.'.'.'.",
+	"- ! / W = * % & X 2 0.t., X X '.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.",
+	"- ! #.,.<.' * '.'.X X X X '.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'."
+};
 
-const char *
-WxCasPix::m_prefs_xpm =
-    { /* XPM */
-        /* columns rows colors chars-per-pixel */
-        "32 32 100 2",
-        "  	c None",
-        ". 	c #9A5600",
-        "+ 	c #945300",
-        "@ 	c #904F00",
-        "# 	c #8B4C00",
-        "$ 	c #DC9124",
-        "% 	c #FFC463",
-        "& 	c #FBB648",
-        "* 	c #B66A01",
-        "= 	c #E3900B",
-        "- 	c #C17101",
-        "; 	c #8F5000",
-        "> 	c #C47A14",
-        ", 	c #F4B54F",
-        "' 	c #FFCA72",
-        ") 	c #FEBB4B",
-        "! 	c #FFB63C",
-        "~ 	c #EFAE45",
-        "{ 	c #EC950C",
-        " 	c #F59D0B",
-        "^ 	c #FBA10D",
-        "/ 	c #BF7204",
-        "( 	c #824800",
-        "_ 	c #9D5800",
-        ": 	c #F1AF49",
-        "< 	c #FFC15C",
-        " 	c #FFC055",
-        "} 	c #F1AB3A",
-        "| 	c #FFB233",
-        "1 	c #FCA512",
-        "2 	c #F39C1C",
-        "3 	c #E39321",
-        "4 	c #FFB02B",
-        "5 	c #FFAF28",
-        "6 	c #FFAC22",
-        "7 	c #FEAA1B",
-        "8 	c #DF8C0B",
-        "9 	c #7A4400",
-        "0 	c #FFB027",
-        "a 	c #FEA816",
-        "b 	c #CE8009",
-        "c 	c #6E3D00",
-        "d 	c #E49929",
-        "e 	c #FFB843",
-        "f 	c #D48006",
-        "g 	c #FFC86E",
-        "h 	c #D9871D",
-        "i 	c #B96400",
-        "j 	c #F4AD43",
-        "k 	c #DE9B30",
-        "l 	c #E79107",
-        "m 	c #FFE5BC",
-        "n 	c #FFD897",
-        "o 	c #FFD082",
-        "p 	c #FFBE53",
-        "q 	c #C98B31",
-        "r 	c #B1751B",
-        "s 	c #E38D09",
-        "t 	c #D19036",
-        "u 	c #FFD899",
-        "v 	c #FABD5B",
-        "w 	c #AB7326",
-        "x 	c #D97E00",
-        "y 	c #D47900",
-        "z 	c #CB7300",
-        "A 	c #AC6300",
-        "B 	c #BA7C1F",
-        "C 	c #FFE0AC",
-        "D 	c #FEC669",
-        "E 	c #B36400",
-        "F 	c #DD8000",
-        "G 	c #EC8F0A",
-        "H 	c #754100",
-        "I 	c #FEC770",
-        "J 	c #FFCD7A",
-        "K 	c #C36B00",
-        "L 	c #A45B00",
-        "M 	c #B67B29",
-        "N 	c #A85D00",
-        "O 	c #FFD38B",
-        "P 	c #DAA14A",
-        "Q 	c #B26D0C",
-        "R 	c #B98131",
-        "S 	c #703F00",
-        "T 	c #C38322",
-        "U 	c #FFF3DF",
-        "V 	c #FFFFFF",
-        "W 	c #DEA751",
-        "X 	c #A7650D",
-        "Y 	c #FFDBA1",
-        "Z 	c #E18E1D",
-        "` 	c #EA9A24",
-        " .	c #F2A52D",
-        "..	c #E1901D",
-        "+.	c #D07B0B",
-        "@.	c #E3952B",
-        "#.	c #D98414",
-        "$.	c #FFE3B3",
-        "%.	c #E88903",
-        "&.	c #9B600D",
-        "                                                                ",
-        "                    . + + +       @ @ #                         ",
-        "              . . . $ % & +     + * = - # ;                     ",
-        "            . > , ' % ) ! ~ +   ; {  ^ { / # (                 ",
-        "            _ : < %  ! } | ~ ; = 1 1   2 = #                 ",
-        "            . 3   ) ! ! 4 5 / 6 7 1  ^  8 9                 ",
-        "            . .   ! ! | | 4 0 6 6 a 1 ^ ^ b c   ( 9           ",
-        "      . _ . ; 9 d  e ! ! | | 4 5 6 6 a a 1 / c ( * f 9         ",
-        "    _ } g } h i j ) ) e ! } k k k } 6 7 a 1 { * l ^ ^ 8 9       ",
-        "    _ m n o o % p p ) ) q ; ; ; # # r k 7 7 a ^ ^ ^   s 9     ",
-        "  . t m u o % v <  p w ; * x y z A ; ; B 7 a 1 1 ^ ^ ^  f 9   ",
-        "  . u C o o D % v < q # E z x F x y z E + B 7 a 1 ^ ^ ^  G H   ",
-        "  . I u o o D D % < _ * z x x F F x z z i ( B 7 a 1 ^ ^  z 9   ",
-        ". F F 2 & J g D % % _ ; # # # ( 9 _ E K i _ ( } a a ^ { E # H   ",
-        ". F F y K 2 J J D % _             9 9 _ E L 9 k 7 7 = E # ( H   ",
-        ". + K y K L G J g D M _               H _ L 9 k 6 7 1 ^ { f E H ",
-        "    + + K N 2 O J D P .                 c _ c k 6 6 7 1    H ",
-        "        + Q m u o J ' R _               c # c } 0 6 6 a a   S ",
-        "      + T o U u n J J g R ( 9           c c B | | | 5 7 a a ^ H ",
-        "    + x 2 O V m u O J J ' W w 9 9 H 9 c c X ! | | | | | | 6 a S ",
-        "  + x F F 2 Y U u u o J g D D } k k k k }    ! Z 3 `  . .^ S ",
-        "  + F F F F 2 Y C ) ..J o g D % % v    )   p Z _ E K y c   ",
-        "  + * x F F F 2 ..i +  .u o J D % < <      % j K + _ i S   ",
-        "    @ F F F F z i 9 + 3 C u o J ' % D D % % % % % O 3 K c c     ",
-        "      # F F z # #   ( +.m u u O J ' I   .I o O O o e @.c       ",
-        "        # E #       9 +.O m m u u O ' +.x {  m Y v #.E c       ",
-        "          #         ( y l ) o m m $.O i F F %. .Z z i i H       ",
-        "                  ( . x F F x G 2 B 9 9 z F F i i i i L c       ",
-        "                  ( A F F F F F F &.9   H x F K i i + c         ",
-        "                  ( - F F F F F F 9       H F z N c c           ",
-        "                    9 9 9 A / z y H         c H c               ",
-        "                          9 9 9 H                               "
-    };
+const char *WxCasPix::m_prefs_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 100 2",
+	"  	c None",
+	". 	c #9A5600",
+	"+ 	c #945300",
+	"@ 	c #904F00",
+	"# 	c #8B4C00",
+	"$ 	c #DC9124",
+	"% 	c #FFC463",
+	"& 	c #FBB648",
+	"* 	c #B66A01",
+	"= 	c #E3900B",
+	"- 	c #C17101",
+	"; 	c #8F5000",
+	"> 	c #C47A14",
+	", 	c #F4B54F",
+	"' 	c #FFCA72",
+	") 	c #FEBB4B",
+	"! 	c #FFB63C",
+	"~ 	c #EFAE45",
+	"{ 	c #EC950C",
+	" 	c #F59D0B",
+	"^ 	c #FBA10D",
+	"/ 	c #BF7204",
+	"( 	c #824800",
+	"_ 	c #9D5800",
+	": 	c #F1AF49",
+	"< 	c #FFC15C",
+	" 	c #FFC055",
+	"} 	c #F1AB3A",
+	"| 	c #FFB233",
+	"1 	c #FCA512",
+	"2 	c #F39C1C",
+	"3 	c #E39321",
+	"4 	c #FFB02B",
+	"5 	c #FFAF28",
+	"6 	c #FFAC22",
+	"7 	c #FEAA1B",
+	"8 	c #DF8C0B",
+	"9 	c #7A4400",
+	"0 	c #FFB027",
+	"a 	c #FEA816",
+	"b 	c #CE8009",
+	"c 	c #6E3D00",
+	"d 	c #E49929",
+	"e 	c #FFB843",
+	"f 	c #D48006",
+	"g 	c #FFC86E",
+	"h 	c #D9871D",
+	"i 	c #B96400",
+	"j 	c #F4AD43",
+	"k 	c #DE9B30",
+	"l 	c #E79107",
+	"m 	c #FFE5BC",
+	"n 	c #FFD897",
+	"o 	c #FFD082",
+	"p 	c #FFBE53",
+	"q 	c #C98B31",
+	"r 	c #B1751B",
+	"s 	c #E38D09",
+	"t 	c #D19036",
+	"u 	c #FFD899",
+	"v 	c #FABD5B",
+	"w 	c #AB7326",
+	"x 	c #D97E00",
+	"y 	c #D47900",
+	"z 	c #CB7300",
+	"A 	c #AC6300",
+	"B 	c #BA7C1F",
+	"C 	c #FFE0AC",
+	"D 	c #FEC669",
+	"E 	c #B36400",
+	"F 	c #DD8000",
+	"G 	c #EC8F0A",
+	"H 	c #754100",
+	"I 	c #FEC770",
+	"J 	c #FFCD7A",
+	"K 	c #C36B00",
+	"L 	c #A45B00",
+	"M 	c #B67B29",
+	"N 	c #A85D00",
+	"O 	c #FFD38B",
+	"P 	c #DAA14A",
+	"Q 	c #B26D0C",
+	"R 	c #B98131",
+	"S 	c #703F00",
+	"T 	c #C38322",
+	"U 	c #FFF3DF",
+	"V 	c #FFFFFF",
+	"W 	c #DEA751",
+	"X 	c #A7650D",
+	"Y 	c #FFDBA1",
+	"Z 	c #E18E1D",
+	"` 	c #EA9A24",
+	" .	c #F2A52D",
+	"..	c #E1901D",
+	"+.	c #D07B0B",
+	"@.	c #E3952B",
+	"#.	c #D98414",
+	"$.	c #FFE3B3",
+	"%.	c #E88903",
+	"&.	c #9B600D",
+	"                                                                ",
+	"                    . + + +       @ @ #                         ",
+	"              . . . $ % & +     + * = - # ;                     ",
+	"            . > , ' % ) ! ~ +   ; {  ^ { / # (                 ",
+	"            _ : < %  ! } | ~ ; = 1 1   2 = #                 ",
+	"            . 3   ) ! ! 4 5 / 6 7 1  ^  8 9                 ",
+	"            . .   ! ! | | 4 0 6 6 a 1 ^ ^ b c   ( 9           ",
+	"      . _ . ; 9 d  e ! ! | | 4 5 6 6 a a 1 / c ( * f 9         ",
+	"    _ } g } h i j ) ) e ! } k k k } 6 7 a 1 { * l ^ ^ 8 9       ",
+	"    _ m n o o % p p ) ) q ; ; ; # # r k 7 7 a ^ ^ ^   s 9     ",
+	"  . t m u o % v <  p w ; * x y z A ; ; B 7 a 1 1 ^ ^ ^  f 9   ",
+	"  . u C o o D % v < q # E z x F x y z E + B 7 a 1 ^ ^ ^  G H   ",
+	"  . I u o o D D % < _ * z x x F F x z z i ( B 7 a 1 ^ ^  z 9   ",
+	". F F 2 & J g D % % _ ; # # # ( 9 _ E K i _ ( } a a ^ { E # H   ",
+	". F F y K 2 J J D % _             9 9 _ E L 9 k 7 7 = E # ( H   ",
+	". + K y K L G J g D M _               H _ L 9 k 6 7 1 ^ { f E H ",
+	"    + + K N 2 O J D P .                 c _ c k 6 6 7 1    H ",
+	"        + Q m u o J ' R _               c # c } 0 6 6 a a   S ",
+	"      + T o U u n J J g R ( 9           c c B | | | 5 7 a a ^ H ",
+	"    + x 2 O V m u O J J ' W w 9 9 H 9 c c X ! | | | | | | 6 a S ",
+	"  + x F F 2 Y U u u o J g D D } k k k k }    ! Z 3 `  . .^ S ",
+	"  + F F F F 2 Y C ) ..J o g D % % v    )   p Z _ E K y c   ",
+	"  + * x F F F 2 ..i +  .u o J D % < <      % j K + _ i S   ",
+	"    @ F F F F z i 9 + 3 C u o J ' % D D % % % % % O 3 K c c     ",
+	"      # F F z # #   ( +.m u u O J ' I   .I o O O o e @.c       ",
+	"        # E #       9 +.O m m u u O ' +.x {  m Y v #.E c       ",
+	"          #         ( y l ) o m m $.O i F F %. .Z z i i H       ",
+	"                  ( . x F F x G 2 B 9 9 z F F i i i i L c       ",
+	"                  ( A F F F F F F &.9   H x F K i i + c         ",
+	"                  ( - F F F F F F 9       H F z N c c           ",
+	"                    9 9 9 A / z y H         c H c               ",
+	"                          9 9 9 H                               "
+};
 
-const char *
-WxCasPix::m_print_xpm =
-    { /* XPM */
-        /* columns rows colors chars-per-pixel */
-        "32 32 152 2",
-        "   c None",
-        ".  c #0c0b0a",
-        "X  c #32373e",
-        "o  c #303941",
-        "O  c #1f4d2a",
-        "+  c #2c6c3b",
-        "@  c #36414a",
-        "#  c #39434d",
-        "$  c #3c4752",
-        "%  c #346246",
-        "&  c #5d2d0e",
-        "*  c #642909",
-        "=  c #6e310c",
-        "-  c #7f3e13",
-        ";  c #723c44",
-        ":  c #414041",
-        ">  c #414d58",
-        ",  c #43505b",
-        "<  c #475460",
-        "1  c #485663",
-        "2  c #4b5865",
-        "3  c #4e5c6a",
-        "4  c #505a65",
-        "5  c #555f6a",
-        "6  c #52606e",
-        "7  c #5b646d",
-        "8  c #566675",
-        "9  c #576877",
-        "0  c #586876",
-        "q  c #5b6b7b",
-        "w  c #6b6c6f",
-        "e  c #606f7d",
-        "r  c #62717d",
-        "t  c #727476",
-        "y  c #5e6f80",
-        "u  c #5e7080",
-        "i  c #637382",
-        "p  c #647788",
-        "a  c #657889",
-        "s  c #687784",
-        "d  c #6a7986",
-        "f  c #6d7c8b",
-        "g  c #6b7e91",
-        "h  c #747b82",
-        "j  c #727f8a",
-        "k  c #21a72c",
-        "l  c #378346",
-        "z  c #15c61d",
-        "x  c green",
-        "c  c #33e23a",
-        "v  c #429c55",
-        "b  c #47a55d",
-        "n  c #41ff41",
-        "m  c #6d8295",
-        "M  c #74828f",
-        "N  c #758491",
-        "B  c #708498",
-        "V  c #7b8792",
-        "C  c #7e8c99",
-        "Z  c #7fb79a",
-        "A  c #76c493",
-        "S  c #79c697",
-        "D  c #813f12",
-        "F  c #a1282d",
-        "G  c #804017",
-        "H  c #86451b",
-        "J  c #8e4a1a",
-        "K  c #954f1d",
-        "L  c #9a531e",
-        "P  c #a65d24",
-        "I  c #ab6228",
-        "U  c #b4682c",
-        "Y  c #bc6e2d",
-        "T  c #bf7732",
-        "R  c #a4734c",
-        "E  c red",
-        "W  c #c1742d",
-        "Q  c #c77835",
-        "!  c #ca4f55",
-        "~  c #ce8240",
-        "^  c #c18c57",
-        "/  c #cc914e",
-        "(  c #d28a4a",
-        ")  c #d69556",
-        "_  c #d99a5c",
-        "`  c #dfaa6e",
-        "'  c #deaa7d",
-        "  c #878f98",
-        "  c #86929e",
-        "{  c #8b939c",
-        "}  c #90979f",
-        "|  c #8694a1",
-        " . c #8a96a1",
-        ".. c #8d98a4",
-        "X. c #939ba2",
-        "o. c #939ea9",
-        "O. c #86ae9e",
-        "+. c #88bda3",
-        "@. c #96a2ae",
-        "#. c #9aa3ad",
-        "$. c #97a4b0",
-        "%. c #9aa6b2",
-        "&. c #9ca9b4",
-        "*. c #97b3af",
-        "=. c #a0a09f",
-        "-. c #a0a7ae",
-        ";. c #a7a8a4",
-        ":. c #a2abb4",
-        ">. c #a3aeb8",
-        ",. c #a8aeb4",
-        "<. c #a6b1bc",
-        "1. c #aab1b7",
-        "2. c #abb3bb",
-        "3. c #b2b8bd",
-        "4. c #aab5c1",
-        "5. c #acb8c4",
-        "6. c #b3bbc3",
-        "7. c #b1bdc8",
-        "8. c #8dcea7",
-        "9. c #8ecfa9",
-        "0. c #a2c3b9",
-        "q. c #b7c0ca",
-        "w. c #bac3cc",
-        "e. c #bdc7d1",
-        "r. c #bec8d2",
-        "t. c #c3aa90",
-        "y. c #dfae85",
-        "u. c #e9c38f",
-        "i. c #e6d2ba",
-        "p. c #f2dcaf",
-        "a. c #c5c5c1",
-        "s. c #c1c7cd",
-        "d. c #c2cad3",
-        "f. c #c9ced3",
-        "g. c #ccd1d6",
-        "h. c #cdd4da",
-        "j. c #d2d7dc",
-        "k. c #d2d9df",
-        "l. c #d8dbdf",
-        "z. c #d4dbe1",
-        "x. c #dadee3",
-        "c. c #d8e0e7",
-        "v. c #dfe4e8",
-        "b. c #e5e5e2",
-        "n. c #e3e6ea",
-        "m. c #e7eaee",
-        "M. c #ececea",
-        "N. c #eceff2",
-        "B. c #edf0f3",
-        "V. c #f0f2f5",
-        "C. c white",
-        "Z. c None",
-        /* pixels */
-        "Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.",
-        "Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.3 3 3 2 2 2 Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.",
-        "Z.Z.Z.Z.Z.Z.Z.Z.8 8 0 0 e r r 0 8 , , , > > Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.",
-        "Z.Z.Z.Z.Z.8 8 8 r s s s s r r r r r r r 0 3 , $ , # # Z.Z.Z.Z.Z.",
-        "Z.Z.8 8 8 r s s s s s s s s s s s s r r r r e e r r # Z.Z.Z.Z.Z.",
-        "8 8 i d f f f f f f f d s s s s s s s s s s s s q i # Z.Z.Z.Z.Z.",
-        "8 5.%.| C j f f f f j f f f f f d s s s s s e 9 a m # Z.Z.Z.Z.Z.",
-        "8 r.c.c.z.w.>. .M f f f f f f f f f f s e 9 9 u m m # Z.Z.Z.Z.Z.",
-        "8 r.N.C.V.m.x.k.d.q.%.| N i f d d d q 8 8 8 y m m m o Z.Z.Z.Z.Z.",
-        "8 r.C.C.C.m.l.k.h.r.w.7.5.q f r C | 8 8 8 9 g B m m o Z.Z.Z.Z.Z.",
-        "8 w.N.C.N.m.l.k.k.d.w.7.5.6 f 6 7.&.6 8 8 a m m m m o Z.Z.Z.Z.Z.",
-        "8 7.n.C.m.m.z.k.k.r.w.7.5.3 M 3 z.&.3 8 y g g g B p o Z.Z.Z.Z.Z.",
-        "8 4.x.N.v.v.k.z.h.r.w.5.5.2 M 2 k.%.2 9 a g g g f 8 o Z.Z.Z.Z.Z.",
-        "8 4.x.j <.v.z.z.h.r.w.5.4.1 j 1 h.%.< y a a a g q 9 o Z.Z.Z.Z.Z.",
-        "8 4.x.N.s.r X.k.<.d.q.5.<.1 N 1 r.%.< y p u a y 8 u o Z.Z.Z.Z.Z.",
-        "8 <.x.5 X.n.2.4  r.7.4.<., N > 7.$.> y u u u * q m o Z.Z.Z.Z.Z.",
-        "8 >.x.V.3.5 X.j.<.w.7.4.<., j , 4.@.> q q r * * a m X Z.Z.Z.Z.Z.",
-        "8 >.x.$ o.x.2.4 { s.5.<.&., j , 4.@., 0 0 * * G g * * * * * * * ",
-        "8 :.v.M.3.> X.j.,.w.5.,.*.% b + 0.o., 0 0 * Y - * p.u.` ~ I * Z.",
-        "8 &.l.> } x.2.$ { q.5.<.+.+ v + 9.o.> 8 * G P * p.` ) Y * * Z.Z.",
-        "8 &.x.N.3.$ X.g.:.w.2.,.S + c k 9.o., 8 * J ~ ` ) K * * Z.Z.Z.Z.",
-        "8 $.x.$ X.x.2.$  6.<.:.A + n z 9...> 8 * Q Y P H * o Z.Z.Z.Z.Z.",
-        "0 @.x.m.3.$ } g.:.6.2.:.A + x z 9..., * * Y Y & ' R G * Z.Z.Z.Z.",
-        "5 o.x.$ X.l.3.#  7.2.&.Z + l O 8. ., 8 * Q Y y.C.. R I X X X Z.",
-        "6 o.l.n.2.> } f.-.6.,.&.O.% b + 0. ., * * ( _ _ M.: T / i.C.a.X ",
-        "3 ..l.$ X.l.1.#  6.<.#.@.> ! ; 2. ., 8 * ` p.` _ U T ^ w . C.X ",
-        "3  7.l.l.> } f.-.6.<.#.o.> E F 2. ., * = _ ` ` ( U P t.a.=.M.X ",
-        "3 s o.7.f.f.j.>  6.,.#.o.> E F <. .> * = P ( ( Q I P t.b.b.b.X ",
-        "Z.3 8 r h 1.s.f.s.6.>.#.o., 7 o <.{ , * D * * * * * t =.;.;.X Z.",
-        "Z.Z.Z.1 1 < i C :.,.-.#.#., r , 2..., * J I P - * Z.X X X X Z.Z.",
-        "Z.Z.Z.Z.Z.Z.> > $ $ , 7 h , r > V M # * J W W L * Z.Z.Z.Z.Z.Z.Z.",
-        "Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.# @ @ X o o X o o Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z."
-    };
+const char *WxCasPix::m_print_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 152 2",
+	"   c None",
+	".  c #0c0b0a",
+	"X  c #32373e",
+	"o  c #303941",
+	"O  c #1f4d2a",
+	"+  c #2c6c3b",
+	"@  c #36414a",
+	"#  c #39434d",
+	"$  c #3c4752",
+	"%  c #346246",
+	"&  c #5d2d0e",
+	"*  c #642909",
+	"=  c #6e310c",
+	"-  c #7f3e13",
+	";  c #723c44",
+	":  c #414041",
+	">  c #414d58",
+	",  c #43505b",
+	"<  c #475460",
+	"1  c #485663",
+	"2  c #4b5865",
+	"3  c #4e5c6a",
+	"4  c #505a65",
+	"5  c #555f6a",
+	"6  c #52606e",
+	"7  c #5b646d",
+	"8  c #566675",
+	"9  c #576877",
+	"0  c #586876",
+	"q  c #5b6b7b",
+	"w  c #6b6c6f",
+	"e  c #606f7d",
+	"r  c #62717d",
+	"t  c #727476",
+	"y  c #5e6f80",
+	"u  c #5e7080",
+	"i  c #637382",
+	"p  c #647788",
+	"a  c #657889",
+	"s  c #687784",
+	"d  c #6a7986",
+	"f  c #6d7c8b",
+	"g  c #6b7e91",
+	"h  c #747b82",
+	"j  c #727f8a",
+	"k  c #21a72c",
+	"l  c #378346",
+	"z  c #15c61d",
+	"x  c green",
+	"c  c #33e23a",
+	"v  c #429c55",
+	"b  c #47a55d",
+	"n  c #41ff41",
+	"m  c #6d8295",
+	"M  c #74828f",
+	"N  c #758491",
+	"B  c #708498",
+	"V  c #7b8792",
+	"C  c #7e8c99",
+	"Z  c #7fb79a",
+	"A  c #76c493",
+	"S  c #79c697",
+	"D  c #813f12",
+	"F  c #a1282d",
+	"G  c #804017",
+	"H  c #86451b",
+	"J  c #8e4a1a",
+	"K  c #954f1d",
+	"L  c #9a531e",
+	"P  c #a65d24",
+	"I  c #ab6228",
+	"U  c #b4682c",
+	"Y  c #bc6e2d",
+	"T  c #bf7732",
+	"R  c #a4734c",
+	"E  c red",
+	"W  c #c1742d",
+	"Q  c #c77835",
+	"!  c #ca4f55",
+	"~  c #ce8240",
+	"^  c #c18c57",
+	"/  c #cc914e",
+	"(  c #d28a4a",
+	")  c #d69556",
+	"_  c #d99a5c",
+	"`  c #dfaa6e",
+	"'  c #deaa7d",
+	"  c #878f98",
+	"  c #86929e",
+	"{  c #8b939c",
+	"}  c #90979f",
+	"|  c #8694a1",
+	" . c #8a96a1",
+	".. c #8d98a4",
+	"X. c #939ba2",
+	"o. c #939ea9",
+	"O. c #86ae9e",
+	"+. c #88bda3",
+	"@. c #96a2ae",
+	"#. c #9aa3ad",
+	"$. c #97a4b0",
+	"%. c #9aa6b2",
+	"&. c #9ca9b4",
+	"*. c #97b3af",
+	"=. c #a0a09f",
+	"-. c #a0a7ae",
+	";. c #a7a8a4",
+	":. c #a2abb4",
+	">. c #a3aeb8",
+	",. c #a8aeb4",
+	"<. c #a6b1bc",
+	"1. c #aab1b7",
+	"2. c #abb3bb",
+	"3. c #b2b8bd",
+	"4. c #aab5c1",
+	"5. c #acb8c4",
+	"6. c #b3bbc3",
+	"7. c #b1bdc8",
+	"8. c #8dcea7",
+	"9. c #8ecfa9",
+	"0. c #a2c3b9",
+	"q. c #b7c0ca",
+	"w. c #bac3cc",
+	"e. c #bdc7d1",
+	"r. c #bec8d2",
+	"t. c #c3aa90",
+	"y. c #dfae85",
+	"u. c #e9c38f",
+	"i. c #e6d2ba",
+	"p. c #f2dcaf",
+	"a. c #c5c5c1",
+	"s. c #c1c7cd",
+	"d. c #c2cad3",
+	"f. c #c9ced3",
+	"g. c #ccd1d6",
+	"h. c #cdd4da",
+	"j. c #d2d7dc",
+	"k. c #d2d9df",
+	"l. c #d8dbdf",
+	"z. c #d4dbe1",
+	"x. c #dadee3",
+	"c. c #d8e0e7",
+	"v. c #dfe4e8",
+	"b. c #e5e5e2",
+	"n. c #e3e6ea",
+	"m. c #e7eaee",
+	"M. c #ececea",
+	"N. c #eceff2",
+	"B. c #edf0f3",
+	"V. c #f0f2f5",
+	"C. c white",
+	"Z. c None",
+	/* pixels */
+	"Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.",
+	"Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.3 3 3 2 2 2 Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.",
+	"Z.Z.Z.Z.Z.Z.Z.Z.8 8 0 0 e r r 0 8 , , , > > Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.",
+	"Z.Z.Z.Z.Z.8 8 8 r s s s s r r r r r r r 0 3 , $ , # # Z.Z.Z.Z.Z.",
+	"Z.Z.8 8 8 r s s s s s s s s s s s s r r r r e e r r # Z.Z.Z.Z.Z.",
+	"8 8 i d f f f f f f f d s s s s s s s s s s s s q i # Z.Z.Z.Z.Z.",
+	"8 5.%.| C j f f f f j f f f f f d s s s s s e 9 a m # Z.Z.Z.Z.Z.",
+	"8 r.c.c.z.w.>. .M f f f f f f f f f f s e 9 9 u m m # Z.Z.Z.Z.Z.",
+	"8 r.N.C.V.m.x.k.d.q.%.| N i f d d d q 8 8 8 y m m m o Z.Z.Z.Z.Z.",
+	"8 r.C.C.C.m.l.k.h.r.w.7.5.q f r C | 8 8 8 9 g B m m o Z.Z.Z.Z.Z.",
+	"8 w.N.C.N.m.l.k.k.d.w.7.5.6 f 6 7.&.6 8 8 a m m m m o Z.Z.Z.Z.Z.",
+	"8 7.n.C.m.m.z.k.k.r.w.7.5.3 M 3 z.&.3 8 y g g g B p o Z.Z.Z.Z.Z.",
+	"8 4.x.N.v.v.k.z.h.r.w.5.5.2 M 2 k.%.2 9 a g g g f 8 o Z.Z.Z.Z.Z.",
+	"8 4.x.j <.v.z.z.h.r.w.5.4.1 j 1 h.%.< y a a a g q 9 o Z.Z.Z.Z.Z.",
+	"8 4.x.N.s.r X.k.<.d.q.5.<.1 N 1 r.%.< y p u a y 8 u o Z.Z.Z.Z.Z.",
+	"8 <.x.5 X.n.2.4  r.7.4.<., N > 7.$.> y u u u * q m o Z.Z.Z.Z.Z.",
+	"8 >.x.V.3.5 X.j.<.w.7.4.<., j , 4.@.> q q r * * a m X Z.Z.Z.Z.Z.",
+	"8 >.x.$ o.x.2.4 { s.5.<.&., j , 4.@., 0 0 * * G g * * * * * * * ",
+	"8 :.v.M.3.> X.j.,.w.5.,.*.% b + 0.o., 0 0 * Y - * p.u.` ~ I * Z.",
+	"8 &.l.> } x.2.$ { q.5.<.+.+ v + 9.o.> 8 * G P * p.` ) Y * * Z.Z.",
+	"8 &.x.N.3.$ X.g.:.w.2.,.S + c k 9.o., 8 * J ~ ` ) K * * Z.Z.Z.Z.",
+	"8 $.x.$ X.x.2.$  6.<.:.A + n z 9...> 8 * Q Y P H * o Z.Z.Z.Z.Z.",
+	"0 @.x.m.3.$ } g.:.6.2.:.A + x z 9..., * * Y Y & ' R G * Z.Z.Z.Z.",
+	"5 o.x.$ X.l.3.#  7.2.&.Z + l O 8. ., 8 * Q Y y.C.. R I X X X Z.",
+	"6 o.l.n.2.> } f.-.6.,.&.O.% b + 0. ., * * ( _ _ M.: T / i.C.a.X ",
+	"3 ..l.$ X.l.1.#  6.<.#.@.> ! ; 2. ., 8 * ` p.` _ U T ^ w . C.X ",
+	"3  7.l.l.> } f.-.6.<.#.o.> E F 2. ., * = _ ` ` ( U P t.a.=.M.X ",
+	"3 s o.7.f.f.j.>  6.,.#.o.> E F <. .> * = P ( ( Q I P t.b.b.b.X ",
+	"Z.3 8 r h 1.s.f.s.6.>.#.o., 7 o <.{ , * D * * * * * t =.;.;.X Z.",
+	"Z.Z.Z.1 1 < i C :.,.-.#.#., r , 2..., * J I P - * Z.X X X X Z.Z.",
+	"Z.Z.Z.Z.Z.Z.> > $ $ , 7 h , r > V M # * J W W L * Z.Z.Z.Z.Z.Z.Z.",
+	"Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.# @ @ X o o X o o Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z."
+};
 
-const char *
-WxCasPix::m_refresh_xpm =
-    { /* XPM */
-        /* columns rows colors chars-per-pixel */
-        "32 32 117 2",
-        "   c None",
-        ".  c #1c203a",
-        "X  c #1e2252",
-        "o  c #1e3249",
-        "O  c #143959",
-        "+  c #0c3c62",
-        "@  c #242840",
-        "#  c #213d5c",
-        "$  c #353541",
-        "%  c #34394c",
-        "&  c #383e4f",
-        "*  c #3d3e78",
-        "=  c #0d4758",
-        "-  c #04406c",
-        ";  c #044777",
-        ":  c #01556d",
-        ">  c #09566b",
-        ",  c #056078",
-        "<  c #444451",
-        "1  c #4a4a5d",
-        "2  c #4c4c61",
-        "3  c #515161",
-        "4  c #5c5c6d",
-        "5  c #53537e",
-        "6  c #5f5f70",
-        "7  c #636365",
-        "8  c gray42",
-        "9  c #636377",
-        "0  c #727272",
-        "q  c #3e3e8f",
-        "w  c #014f85",
-        "e  c #01528a",
-        "r  c #025691",
-        "t  c #0a5fae",
-        "y  c #016495",
-        "u  c #01649b",
-        "i  c #01708d",
-        "p  c #0168af",
-        "a  c #016bb4",
-        "s  c #0175a2",
-        "d  c #017ca4",
-        "f  c #0173ba",
-        "g  c #127bb3",
-        "h  c #017bc0",
-        "j  c #6c7698",
-        "k  c #018bb9",
-        "l  c #0192bc",
-        "z  c #0589ca",
-        "x  c #019ac5",
-        "c  c #0192d2",
-        "v  c #0299d7",
-        "b  c #019bd9",
-        "n  c #0e94d2",
-        "m  c #089bd8",
-        "M  c #1b91cd",
-        "N  c #1898d2",
-        "B  c #01a3cf",
-        "V  c #00a5d5",
-        "C  c #02a1dd",
-        "Z  c #1aa4db",
-        "A  c #01a5e0",
-        "S  c #01aae4",
-        "D  c #01aee8",
-        "F  c #0daee5",
-        "G  c #01b1e2",
-        "H  c #01b3eb",
-        "J  c #02b8ef",
-        "K  c #0cb0e7",
-        "L  c #09b4eb",
-        "P  c #01bcf2",
-        "I  c #10aae1",
-        "U  c #1eabe0",
-        "Y  c #12b3e9",
-        "T  c #19b3e7",
-        "R  c #2597c5",
-        "E  c #2398d1",
-        "W  c #27abdf",
-        "Q  c #36a8db",
-        "!  c #21b3e7",
-        "~  c #23b7e9",
-        "^  c #2fb2e3",
-        "/  c #2dbaea",
-        "(  c #38afe0",
-        ")  c #39bbe8",
-        "_  c #01c1f5",
-        "`  c #01c3f8",
-        "'  c #45aedb",
-        "  c #48bae5",
-        "  c #77bed4",
-        "{  c #4bc5ed",
-        "}  c #4bd0f5",
-        "|  c #59c6ec",
-        " . c #5fd6f7",
-        ".. c #78c0d4",
-        "X. c #65c9ec",
-        "o. c #6dcef0",
-        "O. c #6bd4f4",
-        "+. c #75cfef",
-        "@. c #77d5f4",
-        "#. c #8dcdec",
-        "$. c #85daf6",
-        "%. c #96d8e9",
-        "&. c #93d3f3",
-        "*. c #97ddf1",
-        "=. c #84e2fb",
-        "-. c #8be3fb",
-        ";. c #8de8fe",
-        ":. c #92e4fb",
-        ">. c #92e8fd",
-        ",. c #9ceafe",
-        "<. c #a0e7fc",
-        "1. c #a6ecfe",
-        "2. c #a8e3f8",
-        "3. c #abebfd",
-        "4. c #b7edfc",
-        "5. c #b9f0fe",
-        "6. c None",
-        /* pixels */
-        "6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.5.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.",
-        "6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.5.6.6.6.6.6.6.6.6.6.6.6.6.0   1 6.",
-        "6.6.6.6.6.6.6.6.6.6.6.6.6.6.X.5.} % # @ X X + O o =       .   6.",
-        "6.6.6.6.6.6.6.6.6.: : . . o ' 5.O.t i s a d d a d a p a a . O 6.",
-        "6.6.6.6.. O + = : : i i s h o.5.O.d a a d d d a a p p a a . O 6.",
-        "6.6.6.3 * d a a d a a a d f $.5.@.a d E 5.h d p p p p p a . $ 6.",
-        "6.6.6.3 * d a a d a a d a z <.5.&.d d O.5.z a p p p p a a . $ 6.",
-        "6.6.6.3 * a a a d d d a d n 3.5.&.a a &.5.m a p p p p a a . % 6.",
-        "6.6.6.3 - d d a a a a a d Q 1.5.-.h a *.5.W a p p p a a a . < 6.",
-        "6.6.6.3 - d d a a n z a a ^ 5.| 5.h f :.5.' f a a a f f f . < 6.",
-        "6.6.6.3 - d d a f 5.| a a | 5.| 5.f l 5.2.X.f h h f f h f . 1 6.",
-        "6.6.6.3 - d a a l 5.1.f a O.5.{ 5.l n 5.*.$.l h f f h h f . 2 6.",
-        "6.6.6.3 * d d a m 5.5.m f =.5.' 5.l Z 5. .5.m h h f h z l . 3 6.",
-        "6.6.6.4 * d d f  4.5.( l 5.5.) 5.z ( 5./ 5.! z M m Z ! ^ ` O.@.",
-        "6.6.6.3 - d a f +.5.;. .m 5.^ ^ 5.m ) 5.T 5./ | *.<.5.5.5.1.6.6.",
-        "6.6.6.4 ; f h N 5. | %.~ 5.W ( 5.L ..5.L 5.| 5.X./ ) R S > 5 6.",
-        "6.6.6.` R ' | @.5.W ) 1. 5.Z ( 5.R X.@.v 5.5.5.W c b b c o 3 6.",
-        "6.6.1.1.5.5.$.O.{ z Z 2.=.5.N ! 5.~ 5.| b  .5.3.L x c b c o 3 6.",
-        "o.o.J _ g N M c l l v ,.1.%.b ! 5.) 5.} x } 5.,.S c c C B o 3 6.",
-        "6.6.6.3 w z z z z z b =.5. .c U 5.} 5./ c / 5.O.S B D A A o 3 6.",
-        "6.6.6.4 q z b b c c c  5. c E 5. 5.~ C E 5.} S S S S S o 3 6.",
-        "6.6.6.3 : c b c x x c / 5.) C R 5. .5.Y A H 5.Y S A A K H O 3 6.",
-        "6.6.6.3 e v b c c c c R 5.L A R 5.&.5.L F F H H H H H K H O 3 6.",
-        "6.6.6.3 t c C B B B D D 5.S F I 5.>.5.H H H H K G P P U P O 3 6.",
-        "6.6.6.7 i B A D A S S S S S A I 5.:.5.J H P U P P P P _ J O 3 6.",
-        "6.6.6.5 r S S F F D K H H K H P 5.3.&.P U P P _ _ ` ` ` O.O 3 6.",
-        "6.6.6.3 u A A H H H H H K P P _ 5.5. ._ _ _ ` J O.J O.J J . 3 6.",
-        "6.6.6.6 u H H H G P P P G G Z V @.5.{ r , ; o X . .   % & 1 9 6.",
-        "6.6.6.6 y P H x k a r : ; o . ; ..5.O.8 6.6.6.6.6.6.6.6.6.6.6.6.",
-        "6.6.6.6.. . X < 7 0 6.6.6.6.6.6.#.5.6.j 6.6.6.6.6.6.6.6.6.6.6.6.",
-        "6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.5.6.6.6.6.6.6.6.6.6.6.6.6.6.6.",
-        "6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.5.6.6.6.6.6.6.6.6.6.6.6.6.6.6."
-    };
+const char *WxCasPix::m_refresh_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 117 2",
+	"   c None",
+	".  c #1c203a",
+	"X  c #1e2252",
+	"o  c #1e3249",
+	"O  c #143959",
+	"+  c #0c3c62",
+	"@  c #242840",
+	"#  c #213d5c",
+	"$  c #353541",
+	"%  c #34394c",
+	"&  c #383e4f",
+	"*  c #3d3e78",
+	"=  c #0d4758",
+	"-  c #04406c",
+	";  c #044777",
+	":  c #01556d",
+	">  c #09566b",
+	",  c #056078",
+	"<  c #444451",
+	"1  c #4a4a5d",
+	"2  c #4c4c61",
+	"3  c #515161",
+	"4  c #5c5c6d",
+	"5  c #53537e",
+	"6  c #5f5f70",
+	"7  c #636365",
+	"8  c gray42",
+	"9  c #636377",
+	"0  c #727272",
+	"q  c #3e3e8f",
+	"w  c #014f85",
+	"e  c #01528a",
+	"r  c #025691",
+	"t  c #0a5fae",
+	"y  c #016495",
+	"u  c #01649b",
+	"i  c #01708d",
+	"p  c #0168af",
+	"a  c #016bb4",
+	"s  c #0175a2",
+	"d  c #017ca4",
+	"f  c #0173ba",
+	"g  c #127bb3",
+	"h  c #017bc0",
+	"j  c #6c7698",
+	"k  c #018bb9",
+	"l  c #0192bc",
+	"z  c #0589ca",
+	"x  c #019ac5",
+	"c  c #0192d2",
+	"v  c #0299d7",
+	"b  c #019bd9",
+	"n  c #0e94d2",
+	"m  c #089bd8",
+	"M  c #1b91cd",
+	"N  c #1898d2",
+	"B  c #01a3cf",
+	"V  c #00a5d5",
+	"C  c #02a1dd",
+	"Z  c #1aa4db",
+	"A  c #01a5e0",
+	"S  c #01aae4",
+	"D  c #01aee8",
+	"F  c #0daee5",
+	"G  c #01b1e2",
+	"H  c #01b3eb",
+	"J  c #02b8ef",
+	"K  c #0cb0e7",
+	"L  c #09b4eb",
+	"P  c #01bcf2",
+	"I  c #10aae1",
+	"U  c #1eabe0",
+	"Y  c #12b3e9",
+	"T  c #19b3e7",
+	"R  c #2597c5",
+	"E  c #2398d1",
+	"W  c #27abdf",
+	"Q  c #36a8db",
+	"!  c #21b3e7",
+	"~  c #23b7e9",
+	"^  c #2fb2e3",
+	"/  c #2dbaea",
+	"(  c #38afe0",
+	")  c #39bbe8",
+	"_  c #01c1f5",
+	"`  c #01c3f8",
+	"'  c #45aedb",
+	"  c #48bae5",
+	"  c #77bed4",
+	"{  c #4bc5ed",
+	"}  c #4bd0f5",
+	"|  c #59c6ec",
+	" . c #5fd6f7",
+	".. c #78c0d4",
+	"X. c #65c9ec",
+	"o. c #6dcef0",
+	"O. c #6bd4f4",
+	"+. c #75cfef",
+	"@. c #77d5f4",
+	"#. c #8dcdec",
+	"$. c #85daf6",
+	"%. c #96d8e9",
+	"&. c #93d3f3",
+	"*. c #97ddf1",
+	"=. c #84e2fb",
+	"-. c #8be3fb",
+	";. c #8de8fe",
+	":. c #92e4fb",
+	">. c #92e8fd",
+	",. c #9ceafe",
+	"<. c #a0e7fc",
+	"1. c #a6ecfe",
+	"2. c #a8e3f8",
+	"3. c #abebfd",
+	"4. c #b7edfc",
+	"5. c #b9f0fe",
+	"6. c None",
+	/* pixels */
+	"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.5.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.",
+	"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.5.6.6.6.6.6.6.6.6.6.6.6.6.0   1 6.",
+	"6.6.6.6.6.6.6.6.6.6.6.6.6.6.X.5.} % # @ X X + O o =       .   6.",
+	"6.6.6.6.6.6.6.6.6.: : . . o ' 5.O.t i s a d d a d a p a a . O 6.",
+	"6.6.6.6.. O + = : : i i s h o.5.O.d a a d d d a a p p a a . O 6.",
+	"6.6.6.3 * d a a d a a a d f $.5.@.a d E 5.h d p p p p p a . $ 6.",
+	"6.6.6.3 * d a a d a a d a z <.5.&.d d O.5.z a p p p p a a . $ 6.",
+	"6.6.6.3 * a a a d d d a d n 3.5.&.a a &.5.m a p p p p a a . % 6.",
+	"6.6.6.3 - d d a a a a a d Q 1.5.-.h a *.5.W a p p p a a a . < 6.",
+	"6.6.6.3 - d d a a n z a a ^ 5.| 5.h f :.5.' f a a a f f f . < 6.",
+	"6.6.6.3 - d d a f 5.| a a | 5.| 5.f l 5.2.X.f h h f f h f . 1 6.",
+	"6.6.6.3 - d a a l 5.1.f a O.5.{ 5.l n 5.*.$.l h f f h h f . 2 6.",
+	"6.6.6.3 * d d a m 5.5.m f =.5.' 5.l Z 5. .5.m h h f h z l . 3 6.",
+	"6.6.6.4 * d d f  4.5.( l 5.5.) 5.z ( 5./ 5.! z M m Z ! ^ ` O.@.",
+	"6.6.6.3 - d a f +.5.;. .m 5.^ ^ 5.m ) 5.T 5./ | *.<.5.5.5.1.6.6.",
+	"6.6.6.4 ; f h N 5. | %.~ 5.W ( 5.L ..5.L 5.| 5.X./ ) R S > 5 6.",
+	"6.6.6.` R ' | @.5.W ) 1. 5.Z ( 5.R X.@.v 5.5.5.W c b b c o 3 6.",
+	"6.6.1.1.5.5.$.O.{ z Z 2.=.5.N ! 5.~ 5.| b  .5.3.L x c b c o 3 6.",
+	"o.o.J _ g N M c l l v ,.1.%.b ! 5.) 5.} x } 5.,.S c c C B o 3 6.",
+	"6.6.6.3 w z z z z z b =.5. .c U 5.} 5./ c / 5.O.S B D A A o 3 6.",
+	"6.6.6.4 q z b b c c c  5. c E 5. 5.~ C E 5.} S S S S S o 3 6.",
+	"6.6.6.3 : c b c x x c / 5.) C R 5. .5.Y A H 5.Y S A A K H O 3 6.",
+	"6.6.6.3 e v b c c c c R 5.L A R 5.&.5.L F F H H H H H K H O 3 6.",
+	"6.6.6.3 t c C B B B D D 5.S F I 5.>.5.H H H H K G P P U P O 3 6.",
+	"6.6.6.7 i B A D A S S S S S A I 5.:.5.J H P U P P P P _ J O 3 6.",
+	"6.6.6.5 r S S F F D K H H K H P 5.3.&.P U P P _ _ ` ` ` O.O 3 6.",
+	"6.6.6.3 u A A H H H H H K P P _ 5.5. ._ _ _ ` J O.J O.J J . 3 6.",
+	"6.6.6.6 u H H H G P P P G G Z V @.5.{ r , ; o X . .   % & 1 9 6.",
+	"6.6.6.6 y P H x k a r : ; o . ; ..5.O.8 6.6.6.6.6.6.6.6.6.6.6.6.",
+	"6.6.6.6.. . X < 7 0 6.6.6.6.6.6.#.5.6.j 6.6.6.6.6.6.6.6.6.6.6.6.",
+	"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.5.6.6.6.6.6.6.6.6.6.6.6.6.6.6.",
+	"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.5.6.6.6.6.6.6.6.6.6.6.6.6.6.6."
+};
 
-const char *
-WxCasPix::m_save_xpm =
-    { /* XPM */
-        /* columns rows colors chars-per-pixel */
-        "32 32 134 2",
-        "   c None",
-        ".  c #093d5c",
-        "X  c #2d440a",
-        "o  c #344f0c",
-        "O  c #36520c",
-        "+  c #3c5b0d",
-        "@  c #0b446b",
-        "#  c #0b4771",
-        "$  c #0c4c79",
-        "%  c #6d0000",
-        "&  c #770303",
-        "*  c #7c0405",
-        "=  c #41630e",
-        "-  c #45690f",
-        ";  c #476b10",
-        ":  c #486d10",
-        ">  c #4b7310",
-        ",  c #527c12",
-        "<  c #094e84",
-        "1  c #0e568d",
-        "2  c #075090",
-        "3  c #0b5fa0",
-        "4  c #135fa1",
-        "5  c #12619e",
-        "6  c #126aae",
-        "7  c #1370b8",
-        "8  c #317abd",
-        "9  c #1479c6",
-        "0  c #568313",
-        "q  c #598714",
-        "w  c #5c8c14",
-        "e  c #5f9115",
-        "r  c #629516",
-        "t  c #679c17",
-        "y  c #689e17",
-        "u  c #6ba217",
-        "i  c #6ba318",
-        "p  c #71ab19",
-        "a  c #76b41a",
-        "s  c #78b61a",
-        "d  c #7cbd1b",
-        "f  c #7fc11c",
-        "g  c #248ad6",
-        "h  c #3191d9",
-        "j  c #3b95d4",
-        "k  c #2b9bea",
-        "l  c #369ce6",
-        "z  c #44a9f3",
-        "x  c #57b4f9",
-        "c  c #5bb6f8",
-        "v  c #6baaec",
-        "b  c #65b9f8",
-        "n  c #6fbef9",
-        "m  c #79afe9",
-        "M  c #75b8f3",
-        "N  c #77c0f6",
-        "B  c #73c1fd",
-        "V  c #880506",
-        "C  c #8a0609",
-        "Z  c #920609",
-        "A  c #92080a",
-        "S  c #990405",
-        "D  c #9b0a0d",
-        "F  c #a20a0d",
-        "G  c #a40d10",
-        "H  c #b50f13",
-        "J  c #bc1318",
-        "K  c #cb161c",
-        "L  c #d31820",
-        "P  c #c62d31",
-        "I  c #cd3035",
-        "U  c #d53f3a",
-        "Y  c #e21d26",
-        "T  c #ea212a",
-        "R  c #f2232d",
-        "E  c #f44b53",
-        "W  c #f5585f",
-        "Q  c #f5656c",
-        "!  c #f56d61",
-        "~  c #f66b71",
-        "^  c #f57076",
-        "/  c #81c41c",
-        "(  c #85cb1d",
-        ")  c #88cf1e",
-        "_  c #8cd41f",
-        "`  c #8fd91f",
-        "'  c #95e025",
-        "  c #98e12b",
-        "  c #9be231",
-        "{  c #9fe33a",
-        "}  c #a2e43f",
-        "|  c #a3e441",
-        " . c #a7e54b",
-        ".. c #ace754",
-        "X. c #aee759",
-        "o. c #b0e85b",
-        "O. c #b5e967",
-        "+. c #b6ea69",
-        "@. c #b8ea6c",
-        "#. c #bbeb73",
-        "$. c #beec7a",
-        "%. c #8dc7fa",
-        "&. c #99cef9",
-        "*. c #afd9fd",
-        "=. c #b5daf9",
-        "-. c #f7878c",
-        ";. c #f88d91",
-        ":. c #f89296",
-        ">. c #f8a3a6",
-        ",. c #c5ee87",
-        "<. c #c6ee8a",
-        "1. c #c8ef8e",
-        "2. c #ccf095",
-        "3. c #cff19d",
-        "4. c #d3f2a4",
-        "5. c #d6f3ab",
-        "6. c #d8f4af",
-        "7. c #daf4b4",
-        "8. c #dff6bd",
-        "9. c #c5e3fb",
-        "0. c #d4eafd",
-        "q. c #fbced0",
-        "w. c #fbd4d5",
-        "e. c #e3f7c6",
-        "r. c #e6f8cb",
-        "t. c #e9f9d2",
-        "y. c #edfad9",
-        "u. c #fde9ea",
-        "i. c #f1fbe3",
-        "p. c #f5fcea",
-        "a. c #f3faff",
-        "s. c #f8fdf1",
-        "d. c white",
-        "f. c None",
-        /* pixels */
-        "f.f.f.f.f.f.f.2 . f.f.f.f.f.f.f.* V Z Z F F H H f.f.f.f.f.f.f.f.",
-        "f.f.f.f.f.f.2 M 4 . f.f.f.f.f.& A D G J L L Y K H H f.f.f.f.f.f.",
-        "f.f.f.f.f.2 m *.B 4 . f.f.f.% % % % * C G Y Y Y T K H f.f.f.f.f.",
-        "f.f.f.f.2 m 0.9.N x 4 . f.f.f.f.f.f.f.* Z H Y R R R H f.f.f.f.f.",
-        "f.f.f.2 m a.a.0.n l h 4 . f.f.f.f.f.f.% V D R E ^ -.U H f.f.f.f.",
-        "f.f.2 2 2 2 %.0.b g . . . . = + + + + % V S R W -.>.! H f.f.f.f.",
-        "f.f.f.f.f.2 v =.c 9 . > p p p p p p p % V F R W -.w.! H - X X f.",
-        "f.f.f.f.f.2 8 &.z 9 . e i p p p p p p % & F R W -.w.! H 0 e > X ",
-        "f.f.f.f.f.= 2 j k 7 . w t y u u i % % % & F R Q -.d.! H 0 u w X ",
-        "f.f.f.f.f.+ 2 3 6 5 1 . . . . w y % V P I I R ~ ;.d.! H H H H O ",
-        "f.f.f.f.f.+ e 2 < $ # @ . . q r r r % V R W Q ~ :.u.d.d.! H > X ",
-        "f.f.f.f.f.+ > > > > > > 0 r e e e e e % V R Q -.:.q.u.! H > e X ",
-        "f.X X X X X X X X X X + = = > > > > > > % V R :.:.w.! H : w w X ",
-        "+ r  X.o.o.{  _ r = X X X X X X X X + > % V R >.! H - 0 0 0 X ",
-        "+  4.r.p.s.s.s.i.r.5.2.#.X.{ { ' s = X - > % V ! H = 0 0 0 0 X ",
-        "+ f 5.r.r.r.r.t.t.y.p.s.s.s.i.r.7.1.) X O = > % V = > , , , , X ",
-        "f.+ o.4.4.4.4.5.6.8.e.e.e.e.e.e.e.7.,.t X O = - = - - : > > > X ",
-        "f.+ s 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3.$.a X X X X X = - : > > X ",
-        "f.f.+ } #.#.#.#.#.#.#.#.#.#.#.#.#.#.1.3.,.#.#...' w X = - > > X ",
-        "f.f.+ u o.o.o.o.o.o.o.o.o.o.o.o.o.o.@.1.3.r.y.y.6.<.r X = : > X ",
-        "f.f.f.+ ` } } } } | | | | | | | | |  ...+.O.+.O.+.+.' X = - : X ",
-        "f.f.f.+ r                       X + = - X ",
-        "f.f.f.f.O d ' ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ' e X = - X ",
-        "f.f.f.f.O w _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ f X = = X ",
-        "f.f.f.f.f.O a _ ) ) ) ) ) ) ( ) ( ( ( ( ( ( ( ( ( ( ( _ X O = X ",
-        "f.f.f.f.f.O 0 ( _ ) ) ) ) ) ( ( ( ( ( ( ( ( ( ( ( ( ( ) > X = X ",
-        "f.f.f.f.f.f.O p ) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ d X = X ",
-        "f.f.f.f.f.f.O > a _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ X O X ",
-        "f.f.f.f.f.f.f.O , i d ( _ _ _ ` _ _ _ _ _ _ _ _ _ _ _ _ _ 0 X X ",
-        "f.f.f.f.f.f.f.f.o o o o o o o > t p d ( ( ) _ _ _ _ _ _ _ i X X ",
-        "f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.: : o O o X X X : e p d / ( w X f.",
-        "f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.= X X X X X X f.f."
-    };
+const char *WxCasPix::m_save_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 134 2",
+	"   c None",
+	".  c #093d5c",
+	"X  c #2d440a",
+	"o  c #344f0c",
+	"O  c #36520c",
+	"+  c #3c5b0d",
+	"@  c #0b446b",
+	"#  c #0b4771",
+	"$  c #0c4c79",
+	"%  c #6d0000",
+	"&  c #770303",
+	"*  c #7c0405",
+	"=  c #41630e",
+	"-  c #45690f",
+	";  c #476b10",
+	":  c #486d10",
+	">  c #4b7310",
+	",  c #527c12",
+	"<  c #094e84",
+	"1  c #0e568d",
+	"2  c #075090",
+	"3  c #0b5fa0",
+	"4  c #135fa1",
+	"5  c #12619e",
+	"6  c #126aae",
+	"7  c #1370b8",
+	"8  c #317abd",
+	"9  c #1479c6",
+	"0  c #568313",
+	"q  c #598714",
+	"w  c #5c8c14",
+	"e  c #5f9115",
+	"r  c #629516",
+	"t  c #679c17",
+	"y  c #689e17",
+	"u  c #6ba217",
+	"i  c #6ba318",
+	"p  c #71ab19",
+	"a  c #76b41a",
+	"s  c #78b61a",
+	"d  c #7cbd1b",
+	"f  c #7fc11c",
+	"g  c #248ad6",
+	"h  c #3191d9",
+	"j  c #3b95d4",
+	"k  c #2b9bea",
+	"l  c #369ce6",
+	"z  c #44a9f3",
+	"x  c #57b4f9",
+	"c  c #5bb6f8",
+	"v  c #6baaec",
+	"b  c #65b9f8",
+	"n  c #6fbef9",
+	"m  c #79afe9",
+	"M  c #75b8f3",
+	"N  c #77c0f6",
+	"B  c #73c1fd",
+	"V  c #880506",
+	"C  c #8a0609",
+	"Z  c #920609",
+	"A  c #92080a",
+	"S  c #990405",
+	"D  c #9b0a0d",
+	"F  c #a20a0d",
+	"G  c #a40d10",
+	"H  c #b50f13",
+	"J  c #bc1318",
+	"K  c #cb161c",
+	"L  c #d31820",
+	"P  c #c62d31",
+	"I  c #cd3035",
+	"U  c #d53f3a",
+	"Y  c #e21d26",
+	"T  c #ea212a",
+	"R  c #f2232d",
+	"E  c #f44b53",
+	"W  c #f5585f",
+	"Q  c #f5656c",
+	"!  c #f56d61",
+	"~  c #f66b71",
+	"^  c #f57076",
+	"/  c #81c41c",
+	"(  c #85cb1d",
+	")  c #88cf1e",
+	"_  c #8cd41f",
+	"`  c #8fd91f",
+	"'  c #95e025",
+	"  c #98e12b",
+	"  c #9be231",
+	"{  c #9fe33a",
+	"}  c #a2e43f",
+	"|  c #a3e441",
+	" . c #a7e54b",
+	".. c #ace754",
+	"X. c #aee759",
+	"o. c #b0e85b",
+	"O. c #b5e967",
+	"+. c #b6ea69",
+	"@. c #b8ea6c",
+	"#. c #bbeb73",
+	"$. c #beec7a",
+	"%. c #8dc7fa",
+	"&. c #99cef9",
+	"*. c #afd9fd",
+	"=. c #b5daf9",
+	"-. c #f7878c",
+	";. c #f88d91",
+	":. c #f89296",
+	">. c #f8a3a6",
+	",. c #c5ee87",
+	"<. c #c6ee8a",
+	"1. c #c8ef8e",
+	"2. c #ccf095",
+	"3. c #cff19d",
+	"4. c #d3f2a4",
+	"5. c #d6f3ab",
+	"6. c #d8f4af",
+	"7. c #daf4b4",
+	"8. c #dff6bd",
+	"9. c #c5e3fb",
+	"0. c #d4eafd",
+	"q. c #fbced0",
+	"w. c #fbd4d5",
+	"e. c #e3f7c6",
+	"r. c #e6f8cb",
+	"t. c #e9f9d2",
+	"y. c #edfad9",
+	"u. c #fde9ea",
+	"i. c #f1fbe3",
+	"p. c #f5fcea",
+	"a. c #f3faff",
+	"s. c #f8fdf1",
+	"d. c white",
+	"f. c None",
+	/* pixels */
+	"f.f.f.f.f.f.f.2 . f.f.f.f.f.f.f.* V Z Z F F H H f.f.f.f.f.f.f.f.",
+	"f.f.f.f.f.f.2 M 4 . f.f.f.f.f.& A D G J L L Y K H H f.f.f.f.f.f.",
+	"f.f.f.f.f.2 m *.B 4 . f.f.f.% % % % * C G Y Y Y T K H f.f.f.f.f.",
+	"f.f.f.f.2 m 0.9.N x 4 . f.f.f.f.f.f.f.* Z H Y R R R H f.f.f.f.f.",
+	"f.f.f.2 m a.a.0.n l h 4 . f.f.f.f.f.f.% V D R E ^ -.U H f.f.f.f.",
+	"f.f.2 2 2 2 %.0.b g . . . . = + + + + % V S R W -.>.! H f.f.f.f.",
+	"f.f.f.f.f.2 v =.c 9 . > p p p p p p p % V F R W -.w.! H - X X f.",
+	"f.f.f.f.f.2 8 &.z 9 . e i p p p p p p % & F R W -.w.! H 0 e > X ",
+	"f.f.f.f.f.= 2 j k 7 . w t y u u i % % % & F R Q -.d.! H 0 u w X ",
+	"f.f.f.f.f.+ 2 3 6 5 1 . . . . w y % V P I I R ~ ;.d.! H H H H O ",
+	"f.f.f.f.f.+ e 2 < $ # @ . . q r r r % V R W Q ~ :.u.d.d.! H > X ",
+	"f.f.f.f.f.+ > > > > > > 0 r e e e e e % V R Q -.:.q.u.! H > e X ",
+	"f.X X X X X X X X X X + = = > > > > > > % V R :.:.w.! H : w w X ",
+	"+ r  X.o.o.{  _ r = X X X X X X X X + > % V R >.! H - 0 0 0 X ",
+	"+  4.r.p.s.s.s.i.r.5.2.#.X.{ { ' s = X - > % V ! H = 0 0 0 0 X ",
+	"+ f 5.r.r.r.r.t.t.y.p.s.s.s.i.r.7.1.) X O = > % V = > , , , , X ",
+	"f.+ o.4.4.4.4.5.6.8.e.e.e.e.e.e.e.7.,.t X O = - = - - : > > > X ",
+	"f.+ s 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3.$.a X X X X X = - : > > X ",
+	"f.f.+ } #.#.#.#.#.#.#.#.#.#.#.#.#.#.1.3.,.#.#...' w X = - > > X ",
+	"f.f.+ u o.o.o.o.o.o.o.o.o.o.o.o.o.o.@.1.3.r.y.y.6.<.r X = : > X ",
+	"f.f.f.+ ` } } } } | | | | | | | | |  ...+.O.+.O.+.+.' X = - : X ",
+	"f.f.f.+ r                       X + = - X ",
+	"f.f.f.f.O d ' ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ' e X = - X ",
+	"f.f.f.f.O w _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ f X = = X ",
+	"f.f.f.f.f.O a _ ) ) ) ) ) ) ( ) ( ( ( ( ( ( ( ( ( ( ( _ X O = X ",
+	"f.f.f.f.f.O 0 ( _ ) ) ) ) ) ( ( ( ( ( ( ( ( ( ( ( ( ( ) > X = X ",
+	"f.f.f.f.f.f.O p ) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ d X = X ",
+	"f.f.f.f.f.f.O > a _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ X O X ",
+	"f.f.f.f.f.f.f.O , i d ( _ _ _ ` _ _ _ _ _ _ _ _ _ _ _ _ _ 0 X X ",
+	"f.f.f.f.f.f.f.f.o o o o o o o > t p d ( ( ) _ _ _ _ _ _ _ i X X ",
+	"f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.: : o O o X X X : e p d / ( w X f.",
+	"f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.= X X X X X X f.f."
+};
 
-const char *
-WxCasPix::m_stat_xpm =
-    { /* XPM */
-        /* columns rows colors chars-per-pixel */
-        "630 120 256 2",
-        "   c #000000",
-        ".  c #090A0A",
-        "X  c #151618",
-        "o  c #0A1513",
-        "O  c #151729",
-        "+  c #0D2E1A",
-        "@  c #183836",
-        "#  c #142F2A",
-        "$  c #271434",
-        "%  c #3A3B3B",
-        "&  c #262C2F",
-        "*  c #2E2013",
-        "=  c #16354A",
-        "-  c #32184D",
-        ";  c #263946",
-        ":  c #303152",
-        ">  c #33356A",
-        ",  c #232566",
-        "<  c #184638",
-        "1  c #164C2D",
-        "2  c #1A6935",
-        "3  c #325C2C",
-        "4  c #36513A",
-        "5  c #2E4E37",
-        "6  c #3D641D",
-        "7  c #346629",
-        "8  c #2A6F33",
-        "9  c #1E4B19",
-        "0  c #194846",
-        "q  c #155649",
-        "w  c #135953",
-        "e  c #0F4E56",
-        "r  c #104770",
-        "t  c #176746",
-        "y  c #186754",
-        "u  c #1A7657",
-        "i  c #0E7549",
-        "p  c #1B6667",
-        "a  c #264647",
-        "s  c #265857",
-        "d  c #374648",
-        "f  c #384655",
-        "g  c #2C5150",
-        "h  c #394877",
-        "j  c #385976",
-        "k  c #30536B",
-        "l  c #266859",
-        "z  c #24775A",
-        "x  c #296E4A",
-        "c  c #296765",
-        "v  c #287765",
-        "b  c #396768",
-        "n  c #3A6575",
-        "m  c #397369",
-        "M  c #306F75",
-        "N  c #533533",
-        "B  c #733112",
-        "V  c #72352A",
-        "C  c #59221A",
-        "Z  c #4D1972",
-        "A  c #5A3958",
-        "S  c #4D344F",
-        "D  c #4E3470",
-        "F  c #66355A",
-        "G  c #762A49",
-        "H  c #772954",
-        "J  c #6E324F",
-        "K  c #6D366D",
-        "L  c #52195A",
-        "P  c #4E4337",
-        "I  c #75493A",
-        "U  c #6E4934",
-        "Y  c #615719",
-        "T  c #454444",
-        "R  c #575559",
-        "E  c #514853",
-        "W  c #484678",
-        "Q  c #44577A",
-        "!  c #574766",
-        "~  c #584775",
-        "^  c #54546B",
-        "/  c #565473",
-        "(  c #484C68",
-        ")  c #4B6B71",
-        "_  c #6A4A4B",
-        "`  c #634878",
-        "'  c #6C4870",
-        "  c #717274",
-        "  c #586D50",
-        "{  c #3A3787",
-        "}  c #3D1797",
-        "|  c #394A84",
-        " . c #385384",
-        ".. c #334B93",
-        "X. c #3650A2",
-        "o. c #34708B",
-        "O. c #22699F",
-        "+. c #1B76C4",
-        "@. c #4D178A",
-        "#. c #4D328D",
-        "$. c #5A37A3",
-        "%. c #721990",
-        "&. c #7C14A7",
-        "*. c #71318E",
-        "=. c #6C31AC",
-        "-. c #773ACB",
-        ";. c #484688",
-        ":. c #474995",
-        ">. c #495497",
-        ",. c #574987",
-        "<. c #594895",
-        "1. c #545687",
-        "2. c #4C558A",
-        "3. c #564CA8",
-        "4. c #486D88",
-        "5. c #4A6FB0",
-        "6. c #654887",
-        "7. c #674B97",
-        "8. c #675289",
-        "9. c #695795",
-        "0. c #794687",
-        "q. c #775194",
-        "w. c #6C4CAB",
-        "e. c #736D8F",
-        "r. c #6C67B1",
-        "t. c #536FCE",
-        "y. c #6D4AC8",
-        "u. c #6C6CCE",
-        "i. c #707AE2",
-        "p. c #5769D1",
-        "a. c #248339",
-        "s. c #239C32",
-        "d. c #078146",
-        "f. c #278451",
-        "g. c #2D826D",
-        "h. c #2EA45F",
-        "j. c #63A433",
-        "k. c #708676",
-        "l. c #5DA25A",
-        "z. c #43FC3F",
-        "x. c #77C236",
-        "c. c #50C41F",
-        "v. c #55D455",
-        "b. c #368789",
-        "n. c #388FB2",
-        "m. c #14A0A6",
-        "M. c #39A6D2",
-        "N. c #2B97CC",
-        "B. c #0ACFEF",
-        "V. c #788788",
-        "C. c #558CA8",
-        "Z. c #4B93CC",
-        "A. c #44A1D1",
-        "S. c #47A4E5",
-        "D. c #7091E6",
-        "F. c #73ABE4",
-        "G. c #6B99D4",
-        "H. c #4CD8B2",
-        "J. c #96173B",
-        "K. c #8A3B17",
-        "L. c #923330",
-        "P. c #A61C3A",
-        "I. c #B9273C",
-        "U. c #AC3038",
-        "Y. c #A6251A",
-        "T. c #971949",
-        "R. c #86244B",
-        "E. c #89385A",
-        "W. c #983A5A",
-        "Q. c #8F2D50",
-        "!. c #973A65",
-        "~. c #893872",
-        "^. c #A11547",
-        "/. c #AE2E49",
-        "(. c #A93A67",
-        "). c #B03970",
-        "_. c #954715",
-        "`. c #914510",
-        "'. c #904930",
-        ". c #976431",
-        ". c #AB4E12",
-        "{. c #A94A2A",
-        "}. c #B74B2A",
-        "|. c #B5512C",
-        " X c #AD6E36",
-        ".X c #A37209",
-        "XX c #91474B",
-        "oX c #86467C",
-        "OX c #924470",
-        "+X c #AC4C54",
-        "@X c #B84875",
-        "#X c #B0456C",
-        "$X c #B37846",
-        "%X c #916F59",
-        "&X c #CA3230",
-        "*X c #E03027",
-        "=X c #C8334D",
-        "-X c #C93C77",
-        ";X c #C85332",
-        ":X c #DA6F2C",
-        ">X c #C94F47",
-        ",X c #C44477",
-        "<X c #CC4371",
-        "1X c #C47C46",
-        "2X c #891B9B",
-        "3X c #8F19AB",
-        "4X c #8F3191",
-        "5X c #8F2AAD",
-        "6X c #A41AB6",
-        "7X c #A13188",
-        "8X c #A223AA",
-        "9X c #980FCD",
-        "0X c #9429CB",
-        "qX c #A916D1",
-        "wX c #A822D9",
-        "eX c #854686",
-        "rX c #885187",
-        "tX c #894D92",
-        "yX c #8445A2",
-        "uX c #A84684",
-        "iX c #8D7398",
-        "pX c #8954D9",
-        "aX c #8E6DDC",
-        "sX c #906BE2",
-        "dX c #B24DE9",
-        "fX c #A55CDC",
-        "gX c #CC3884",
-        "hX c #C54581",
-        "jX c #AE9325",
-        "kX c #A6905F",
-        "lX c #86C63B",
-        "zX c #8CCA4A",
-        "xX c #F1B90B",
-        "cX c #DEA023",
-        "vX c #D08C4D",
-        "bX c #D8A265",
-        "nX c #F1D107",
-        "mX c #F1D52D",
-        "MX c #EFD648",
-        "NX c #8B8E8F",
-        "BX c #9496A6",
-        "VX c #ACACAC",
-        "CX c #9FA19E",
-        "ZX c #8AB7E8",
-        "AX c #93ACD8",
-        "SX c #9BE898",
-        "DX c #99C4ED",
-        "FX c #AFD2F4",
-        "GX c #B4D3EC",
-        "HX c #CAB39B",
-        "JX c #E7D9AC",
-        "KX c #CECECD",
-        "LX c #CDE9FC",
-        "PX c #FCFCFA",
-        "IX c #E8F1F5",
-        "UX c #DEE1DD",
-        /* pixels */
-        "H G H H T.~.T.2X).7XOX#X).).~.).).).).).).^.2X~.!.Q.!.Q.R.T.R.~.~.!.(.(.(.!.^.(.!.(.T.~.!.!.!.(.!.!.~.(.!.~.~.K K OX~.4XoXoXeXeXeXoXoXeXtX4XoXeX~.uX4X' ~.4XoX~.K eX~.' ~.K ' ~.eXoXeXeXeXeXeX0.K K K ' K 0.' K ' ' 0.0.K K K eXoX' ' oX' rXoXoXoXrXrXoXiXOXrXrXrXrXOXrXrXoXoX%XrXoXoXoXoXoX%Xq.rXrXoXrXrXrXrXrXrXrXoXOXOXOX4XOXoX~.~.K ~.H K K K H K H K K F H K ~.~.oX' K eXK eX' ~.0.eX~.' ' eXoXoXK *.D K D D D D D *.*.7.*.*.0.*.*.6.D *.~ #.` *.~ ~ 6.K *.#.K 0.K 0.*.*.K D D K K K D K K D ~ K ,.D D ,.D D ~ #.,.D W D #.~ #.~ W ,.W D ;.W D D ;.W D ;.W W ( h W k Q h h j h j  .j | r > | ..................r r { ....{ r p O.p p p p ..r p ............r ......r | > r > r > r .. .| 2.| | ;.| | | Q h Q 2.h | #.{ #.{ { { { { > #.{ > #.} #.#.<.<.:.$.:.#.$.$.#.#.#.#.$.} $.} } } } } } } } @.} } @.} @.} #.#.} @.} @.@.} } { > @.Z Z Z } Z } Z } @.@.} } &.@.} @.@.@.} &.} &.@.@.%.@.@.@.Z Z Z @.Z Z Z Z @.@.Z Z Z @.Z Z Z Z Z Z Z Z Z Z Z Z Z Z L - L Z L - Z Z L Z - L Z Z #.Z *.#.D *.#.K @.Z #.K @.K #.*.@.Z @.Z @.Z @.Z Z @.%.Z Z %.@.=.$.@.=.$.$.$.=.} -.&.=.} -.-.&.} =.$.=.=.=.=.$.$.$.$.=.=.=.=.y.3.-.p.w.y.r.w.y.y.y.w.y.y.w.y.y.-.y.-.y.-.-.-.-.-.-.=.-.-.$.=.-.-.-.-.y.y.-.y.pX-.y.y.y.y.y.y.sXpXpXpXpXpXpXpXpXwXpXpXpXpXpXr.sXsXfXsXpXfXfXsXsXsXdXpXwXpXdXdXdXwXwXdXdXdXdXwXdXdXdXwX",
-        "H H ~.^.~.T.T.(.).#X).7X).).).).~.).).~.).~.(.Q.Q.!.Q.~.~.Q.!.4XeX~.(.(.).^.(.!.(.!.!.~.(.~.!.~.(.!.(.!.(.K ~.~.~.~.oXK 4X' ~.0.~.*.eXK K eXeXoXoX4X~.eXeXK 4X' ~.oX' 4X~.eX4X' eXeXK oXoXrX' ' K ' K ' eX0.' 0.' eXtXq.0.' K ' ' oX' ~.0.%XoXrXrXoXoXrXOXrXrXuXrXOXrXOXoXoXoXoXrXrXoXoXoXoXq.tXrXrXrXrXoXrXrXrXrXrXrXoX~.' ~.oX~.K ~.~.K ~.H K K K H ~.K H K Z K ' 4XoX0.eXK K ' 4XeXK K oX4XoXeX~.oX*.*.K K *.*.K K *.6.*.*.0.6.*.*.6.D *.~ *.` *.~ *.*.~ 6.D K *.*.K ` *.*.K K K 6.<.6.6.,.1.,.6.D ~ *.~ ~ *.~ *.~ D ~ #.W W W W D W D ;.;.D W ;.W ;.W W W W W W Q k k h j h h h h h h h | h | ........{ ..{ ........r ..r ....p r p O.p p o.M ..O.......O...O...r  . .| h r > ..> h > h | | | |  .M Q W h 2. .W Q 2.#.{ { #.#.{ { #.} { { #.#.{ #.<.<.$.<.#.$.:.#.<.:.#.$.{ { $.$.{ } } } } } } } @.@.} } @.} @.} @.} #.#.} } #.@.@.} @.} } Z } @.@.} Z } &.&.} } &.} &.@.@.@.} @.@.@.@.@.@.%.@.@.Z @.Z Z @.@.Z Z Z Z @.Z @.Z @.Z @.Z @.Z @.Z Z Z Z Z L L Z , Z Z Z Z - > Z Z Z Z D D D D Z D Z Z *.D *.*.@.*.D @.Z Z *.K @.Z %.Z %.%.Z Z %.@.@.$.$.$.$.=.$.$.$.$.=.} =.&.-.=.} &.-.=.$.=.$.=.=.=.$.=.=.3.p.y.=.=.y.r.y.p.y.y.p.3.y.y.3.y.w.w.-.-.y.-.=.-.y.y.-.=.-.-.-.-.-.-.-.-.=.-.-.-.y.0Xy.y.y.-.u.y.pX-.pXpXpXpXpXpXpXpXpXpX-.pXpXyXpXpXsXsXsXsXsXfXsXsXfXdXsXpXdXpXpXdXdXfXdXdXdXdXwXdXdXgXdXdXdX",
-        ").7X~.2X7X^.!.7X).7X).7X~.~.).).).~.).T.).).).!.~.Q.Q.Q.W.~.~.eXeXuX~.).).(.!.(.(.!.(.!.(.!.(.!.~.!.).!.(.K K ~.~.eX' ~.' ~.0.~.oX4X~.eXoX~.oXeXeX7X' ~.~.oXK oX~.*.*.' 0.oX~.0.oXeXeXeXeX0.' 0.' K ' ' 4X' eX' ' q.tXq.0.q.' ' oX' oXoXoXoXoXoXoXoXrXrXoXrXoX%XrXoXrX%X%XrXoXoXoXoXoX%XoXrXq.rXrXtXrXrXrXrXrXrXrXrXtXrXoXeX~.oXoX4XeXK K K ~.K K H K K K K H K ~.4X~.eXtX0.*.oX' oX' 4XK eXK eXeX0.oXK *.*.*.6.K D K *.*.*.0.*.*.0.0.*.*.~ D *.*.K ,.,.~ *.6.*.*.K K *.K ' *.K D K ` 6.8.~ ` ,.,.,.~ *.D ,.D ,.,.D ,.D W W D #.#.W ,.;.W W ;.D D ;.W D W W D ;.W k k h ( k Q k j h h h h  .| h | .............. .k r ....{ ..{ .. .p p p o.c n c o............... . ...O. .r r > h r h h k h ;.;.j m m m h Q h | Q Q ;.X.$...X.#.{ { { > #.{ { > <.<.,.<.<.<.#.{ $.#.:.$.$.{ $.$.{ } #.$.} } } $.} @.@.@.} } $.@.@.@.} } @.@.#.@.{ } { , @.{ Z } @.> } @.@.@.} } &.&.} } &.@.@.@.@.@.&.&.@.@.@.@.@.Z Z @.Z @.@.Z @.@.Z @.Z @.Z @.Z Z Z Z Z @.Z Z Z Z Z Z Z Z Z Z L Z - L > Z Z Z Z Z Z #.#.D @.@.Z #.Z Z #.#.Z D %.*.@.@.@.@.Z Z @.%.Z Z %.Z %.@.$.%.#.#.$.$.$.$.$.$.$.-.-.&.} =.-.$.=.$.=.$.=.$.=.$.$.$.} p.p.p.$.3.y.p.r.p.y.p.y.y.u.r.y.w.y.y.w.-.-.y.=.y.-.-.y.-.-.-.y.y.-.-.-.-.=.y.-.-.-.y.y.pX-.y.y.y.u.-.sXpXpXpX-.pXpXpXpXpXsXpXpXpXpXpXsXsXfXsXpXsXfXdXsXfXsXfXpXdXdXpXdXdXdXwXdXdXdXwXfXdXdXdXdX",
-        "(.T.).^.!.~.).).#X7X).).).).).~.).).).7X7XT.).~.R.~.!.!.~.eX~.eXeXOXrXOX(.(.^.).T.(.!.!.~.(.~.~.(.!.~.!.!.~.~.~.~.' 4XK ~.eXoXeX0.0.0.eXoXoX4XeXeX' *.oXK oX*.~.oX~.oX~.*.oXoX~.K eXeXeX0.*.' K 0.` *.eX' 0.0.eXq.tXtXq.q.rXrX0.' oX' oXoXoXoXoXrXoXrXOXoXrXrXtXrXrXrXoXrXrXoXrXoXrXrXrXoXtXrXq.q.rXq.rXoXrXq.rXq.tXtXeXeXtXtX4XoXeXK ~.~.K K K ~.K K K K K H K ' eXeXoX0.0.' eX~.*.' oXoXeXeX~.oX~.oXeXK 6.*.*.0.#.*.7.7.*.*.7.7.*.*.6.0.*.6.~ ~ 6.*.~ 6.` ,.~ ` *.*.K *.*.K K K K ~ ` ` 6.` 6.6.,.1.~ 6.D ,.D D ,.D 6.D ,.;.~ W ,.D W ~ #.W ;.;.D W W D W W W W h ( h h j j j j h | j h h h | h ............r r | k ..| ..r ....r p O.p M c c c ................r O. .r  .o. .r r > h k j n  .M m M ) m b 2.;.Q Q  .j #.{ { #...#.> { { { D #.<.<.:.$.#.#.<.$.$.#.$.$.#.#.#.} { } $.#.} @.$.} } } @.} } } } @.@.@.$.} $.@.@.} @.} @.@.@.@.@.} #.@.@.@.} @.@.@.} &.} } &.} @.@.@.@.@.@.@.@.%.@.@.Z %.@.Z @.@.Z @.@.Z Z Z { @.Z Z Z @.@.@.Z Z Z Z @.Z Z Z Z - Z Z Z Z Z Z Z > L L - Z Z K Z #.D *.D K #.*.*.D *.#.*.Z K @.K %.Z %.Z %.@.%.Z @.Z @.#.#.$.$.$.$.$.$.$.$.$.&.} =.=.} } -.$.=.$.y.=.y.$.=.=.y.y.p.p.p.p.p.p.y.y.y.r.w.y.r.y.y.y.y.w.w.-.y.-.-.-.-.y.$.-.y.y.=.y.y.$.y.=.-.-.-.-.-.-.-.-.-.-.y.u.u.pX-.pXi.pXpXpXpXpXpXpXpXpXpXpXpXy.aXfXsXsXsXsXfXsXsXpXsXsXfXdXdXdXdXdXdXdXdXdXdXdXdXdXdXwXdXdX",
-        ").2X~.).).).7X7X).).7X~.).).).!.~.).).^.7X).~.T.!.W.!.oXeXeXuXoXoX4XOXeX~.(.(.(.).~.!.~.(.!.(.(.).!.!.~.(.~.eXeXeX~.' eX*.0.tX*.eX' eXeXK eX*.oXeX' 0.' eX4XoX~.~.' 4XoXeX~.eX~.eXeXeX0.' ' ' 0.' 0.0.oXeX0.0.tXq.tXtXtXiXtXtXrXeXeXeXoXoXoXrXrXoXoXrXoXrXrXrXrXoXrXrXrXiXoXoXoXrXoXoXoXrXrXrXtXtXq.q.tXrXrXrXe.q.tXq.rX4XtXq.tXeXeXK ~.K ~.K *.K K K K H K K 4XeXeXeXeXeX0.eX' eX0.' 4X0.oXeXeXoXeXoX4X0.*.6.*.*.*.7.*.0.*.0.*.*.*.0.*.q.*.*.6.~ ~ ~ *.6.6.6.~ Q #.*.*.*.6.D K *.K K ,.6.~ ` 6.1.~ ,.,.D 6.D ,.,.D ,.D D W ;.W W ~ D ;.W W W D D ;.W W ;.W Q W h h h k j n c j j | h | h h ..h r ..........r r r j  .k r | ....p p p o.k M c j e O.............r ..k r O. .p O. .h k  .j M n m m n m m m ) b Q Q j Q Q ..{ #...#.#.> #.{ { > <.<.:.<.#.<.<.$.#.{ $.#.#.$.{ #.#.} #.#.} $.} @.} } } @.} @.@.@.} @.} @.#.} #.@.@.@.@.@.@.@.} @.@.@.@.@.@.Z { @.@.} @.&.&.} &.&.@.@.@.{ Z @.@.@.%.@.@.Z @.@.@.Z @.Z @.Z Z @.{ @.> @.Z @.Z @.Z @.Z Z Z } Z Z , Z Z Z Z Z Z D Z Z > > - L Z D Z *.D @.K Z *.D D *.#.#.K @.@.@.Z @.Z Z @.@.%.Z Z Z %.#.#.#.$.$.$.X.$.:.$.$.$.} =.=.=.-.=.=.$.=.$.$.=.$.$.-.$.$.p.p.p.p.y.p.r.p.w.p.y.p.y.p.y.w.y.y.y.w.-.w.y.y.-.-.-.y.-.y.-.y.X.y.y.$.y.-.$.-.-.-.-.-.-.-.-.i.i.i.p.-.pXpXpXi.pXpXpXpX-.pXsXi.pXpXdXsXsXsXpXsXfXpXsXsXfXsXdXfXsXdXfXdXwXdXdXdXdXdXdXdXdXdXdXdXdX",
-        ").^.).).T.7X).).(.L.V ).).~.(.(.^.).(.(.(.).).).~.eXeXuXeXrXoX4XuXeXoXoX7X(.(.!.~.).(.!.(.!.~.(.~.(.OX).!.eXeX~.4X' K eXeXeX0.eX0.4X0.0.4XtXeXeX*.6.*.6.0.K K 0.~.oX' 4X' 4X' 0.0.eX0.' ' 0.0.' 0.0.' 0.0.rXtXq.yXq.tXiXtXrXrXtXrXrX' oXoXoXOXrXoXiXoXrXrXOX@XrXrXOX@XrXoXoXrXoXoXoXrX' rXtXq.tXq.tXtXtXtXq.rXtXiXtXtXrXtXtXyXtXtXyXtX*.*.K K 4XK K 4XK K K 4X' ~.eX*.eXq.0.0.rX' eXoX0.' eXeXK ' oXoX' 0.*.7.6.6.0.0.6.8.7.q.8.q.0.*.0.q.*.` *.*.*.6.` D 6.*.|  .W ~ 6.K K *.K K D ` 6.` 6.` 6.6.,.,.,.,.D ,.D D ~ D ,.,.,.D ,.W #.,.;.W ,.;.D | D W W W h Q h j j k n M j j n j j | | k j p  .p ......r r h j ..k r  .| p r j p r p j k b n c p ..........O...O.....O.r  . . .j  . .j  .n n m M m M m ) g.m Q j Q Q W :.$.{ #.#...{ #.> ;.<.<.<.,.<.<.$.#.:.$.$.$.$.{ } $.} #.#.} #.X.} #.$.} $.@.} @.} $.@.@.@.@.@.@.@.@.@.} #.@.{ } { Z { @.@.@.{ > } Z Z } &.} } } } @.} @.@.@.{ > @.@.} %.@.@.@.@.@.@.@.@.} Z } } Z Z } } @.#.Z @.Z @.Z @.Z } Z Z Z Z Z Z Z Z > L - - - - D ~ D Z Z D Z #.#.D #.D @.*.*.Z %.D D @.Z %.Z %.Z %.Z %.Z %.@.;.#.{ $.:.:.$.#.{ #.$.#.$.=.=.$.=.=.=.$.y.y.=.=.$.=.-.$.$.p.p.p.p.p.r.u.u.u.p.u.w.y.r.y.w.r.y.w.y.y.w.y.-.-.y.-.3.-.-.$.-.y.y.y.y.y.y.y.-.=.-.-.-.-.-.y.i.i.D.i.i.pXi.pXpXpXpXpXpXpXsXpXi.sXi.i.sXsXdXsXsXfXsXsXdXfXfXfXsXsXsXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXfX",
-        ").).).~.).7X7X).V B V (.7X!.!.(.7X).).(.).7X^.).uXeXoXeXoXeXrXoXeXOX~.eXeXOX).).(.(.~.~.~.(.~.!.(.OX(.!.!.uXeXeX0.eX0.4X0.eXeX0.eX0.0.4X0.' eXeX0.' 0.*.0.0.eX~.*.oXeXK 4X' eXeX0.eX' 4X*.eX0.0.0.0.0.q.q.tXtXe.tXiXtXtXtXtXtXtXrXtXrXrXrXrXoXrXrXrXoXoXrXoXiXoXOXiXrXoXoXoXq.rXrXoXiXrXtXtXtXrXrXtXtXq.tXyXtXtXtXtXrXeXyXq.yXtX0.yXtXyXtXyXtXq.4X0.K 0.K oX' 4X4X' ' 0.0.' eX0.eXeX0.oXeXeXeXeX4XoXoXoXeX0.0.0.0.7.6.q.7.0.0.8.8.' / ' 6.` ` ` ~ ~ ~ 6.*.,.W j  .;.Q ;.,.*.K *.*.K ,.6.6.` 6.~ ` 6.,.1.,.~ D 6.#.~ #.W W W W / / ;.W D ;.#.W W W W | W j h | W j k n j k j M k p M k p  .k M k k ......M  .k  .r  .k k c c c p  .M j n n n c n c ......O...r .... ... . . .O.k M M  .j M M m M m m M m m m m ) Q Q Q  .2.{ :.:.:.:.;.;.>.<.<.<.<.,.:.$.$.$.#.$.$.{ :.$.#.#.} { { { #.} } #.#.#.@.@.@.} } @.@.$.@.@.@.@.#.@.@.#.} > @.D @.D @.@.@.#.#.} > } { @.@.} } @.&.} } @.@.> { { > { @.@.@.%.@.@.@.@.Z @.} @.@.} } Z @.@.Z @.Z @.#.@.Z Z } Z Z Z Z Z Z Z Z > Z - - Z K 9.AXAX9.L D Z D D D Z Z #.#.K D *.Z *.*.Z Z %.@.Z Z @.Z Z %.%.@.#.:.:.3.:.>.#.#.{ ' %X#.$.=.=.=.$.$.=.-.$.$.=.$.$.$.-.y.3.p.X.p.p.p.u.u.p.u.r.r.p.p.y.y.u.y.r.y.w.y.y.y.y.y.-.y.-.-.-.-.y.p.y.y.$.y.-.-.-.-.-.-.-.-.i.i.S.i.i.i.i.i.-.-.pXpXpXpXpXpXpXi.sXD.i.AXsXsXsXsXsXfXsXsXsXpXsXsXdXdXsXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXfX",
-        "^.2X).OX).).(.C C B L.W.B C B B C C C C ~.).7X4XuXeXeXuXeXuXeXoXoXoXuXeXOXoX~.#X~.).(.(.).!.(.!.!.(.!.(.!.~.eXeXeXeX0.' eX0.0.0.0.0.0.0.0.eX4X' *.0.0.K 6.` 0.*.~.' 4X~.eXeXK eXeX' 0.' 0.' ' 0.' 0.rXe.q.tXtXtXtXyXiXtXtXiXtXtXrXrXrXrXrXrXrXoXiXOXiX@XrXrXoXrXrXoXrXrXoXiXrXrXrXoXe.rXq.e.tXq.q.tXq.iXq.iXw.e.e.q.tXyXyXtXyXq.yXyXq.yXyXyXyXtXeX*.4X0.eX*.eX' ' 0.4X0.0.0. 0.0.eXrX0.eX0.0.eXoXeXeXoXoX0.*.7.7.8.0.7.0.8.6.q.8./ / / ^ ^ ^ ^ / / ^ ^ ^ / / / W / W / Q ~ ,.K ` K K ,.` 6.` 6.6.` ~ ,.,.~ #.~ W W ~ ~ W ;.W Q W W ~ ;.W ~ W W h W W j W W Q h j n c M p v c M M c M k p  .k  . .p  . .r r j r | k p c c l l c M k b c c b n c p ..............r O. ...p O. .M  . .M M M M n m M n m m ) m m m n Q Q Q j :.:...X.:...:.<.<.<.<.;.<.<.:.#.:.#.#.#.$.} #.} :.$.{ #.} } #.{ } } { $.@.} @.$.@.@.@.{ D D #.> #.D #.#.#.#.@.D } { @.@.} } #.@.@.{ @.@.%.} &.} @.@.@.> > > > { > > @.@.@.@.@.@.@.@.@.Z @.@.@.> } > } } Z @.Z @.Z @.@.Z @.Z Z , Z Z , Z Z - - D e.AXFXGXZ.Q , > #.#.Z D *.*.D Z @.D Z #.K Z #.Z Z Z Z %.Z %.Z Z Z #.:.<.:.:.#.:.{ D ,.%X%X:.$.} $.$.=.$.$.$.$.$.$.$.-.3.$.$.p.p.p.p.y.p.r.u.p.y.p.p.p.p.r.p.w.p.y.y.p.p.y.y.-.y.y.y.-.$.-.y.p.y.y.y.p.y.$.y.$.-.+.-.-.-.i.t.i.i.t.i.D.i.i.sXpXpXpXpXsXpXpXi.i.i.sXi.i.sXi.sXsXsXpXsXsXsXsXsXsXsXdXfXdXdXdXfXdXdXdXdXdXdXdXdXdXfXfX",
-        "gX).7X).).OX(.B ._.B I JXJXbXbX1X|.B Q.).).7X~.eXeXOXrXeXeXeXOX~.eXOXoXOXOX~.!.!.(.!.(.!.).(.!.!.!.(.OX#X' eXeX0.0.yX0.0.eX*.eX0.0.0.0.0.0.0.*.0.' 0.0.K *.6.` ' ~.0.' 4X0.' eX' eX0.0.eX' eX' 0.q.q.e.tXtXtXtXq.yXtXtXtXiXuXtXrXrXrXrXrXrXoXiXOXrXrXrX@XrXoXiXrXrXrXrXrXrXtXrXrXq.iXq.tXtXq.q.iXtXq.iXyXr.iXe.yXq.yXyXyXyXtXtXyXtXq.yXyXyXeXyXyXeX4X0.0.4X0.0.eX0.0.0.0.' 0.0.rX0.0.eX0.eX0.0.0.eXoXoXeXeX0.0.8.7.0.8.8.0.8.8.0./  ^ ^ / ' ^ / ^ ^ ^ ' / ^ ^ ^ ' ^ ^ ^  / ~ #.K ` 6.6.6.` 6.` ` ` ,.,.W W W #.W W W W W Q W W Q ,.W W W W W h j Q W j h Q h j p v M v p M c p c p M k  . .p r k  . . .p  .r n c p c l s b ( b j n b j c b k j .................. . . . . . .M  .M n n n M m m M ) m m ) m m ) Q j Q j 2. .2.| :.;.<.<.<.:.<.<.<.:.<.#.<.#.$.$.} #.#.} $.} #.#.} } #.@.{ } { } { #.#.> W D > W #.D > D #.D { @.#.@.{ { Z #.Z #.#.} #.{ #.Z { @.@.@.@.@.@.@.Z > > > > > > > { Z @.@.@.@.@.@.@.@.@.@.@.} Z @.Z @.@.@.@.@.Z Z @.@.@.Z Z Z Z Z Z , L - D BXFXZXZ.+.5.h L Z D D D Z #.Z D #.D K K #.#.Z Z Z @.Z %.Z %.Z %.Z #.:.:.#.:.#.:.{ > W %X$XXXW ;.$.$.=.$.$.$.$.3.$.$.$.3.3.$.p.p.p.p.y.p.y.p.p.p.u.p.r.y.y.p.r.p.3.p.u.y.y.u.u.y.y.-.y.-.y.y.y.y.y.p.y.y.y.y.$.y.y.t.t.p.i.i.i.p.i.t.D.i.S.i.i.i.pXpXi.y.y.sXi.i.D.sXi.i.D.sXaXaXi.pXsXsXsXsXpXsXaXfXfXfXsXdXdXdXdXdXdXdXdXdXdXdXfXiX",
-        "7X).7X).#XE.B B _.K. XJXbXvXvX_.B C (.~.4XoXuXeXeXuXoX4XuXoXeXuXoXeXuX4XrXoXuXOX!.~.!.!.!.!.!.(.!.(.!.(.!.4XeX0.eXeX0.eX0.0.tX0.0.4X0.q.0.0.0.0.*.0.0.` 0.6.0.0.6.0.eX0.oX0.eX0.eX' 0.eX0.0.0.q.8.tXrXq.r.tXiXtXtXiXyXiXyXiXyXiXrXiXuXrXrXoXrXuXrXrXoXoXrXrXOXoXtXtXrXq.rXrXrXrXrXtXq.tXq.q.tXiXq.q.q.q.e.yXq.tXr.iXq.yXyXyXyXyXyXyXyXyXyXq.4XyX4XeX0.eX*.' ' *.*.0.*.0.0.0.0.' 0.0.0.q.0.eX0.4XeXoXoX0.0.0.7.*.7.0.7.0.0.9.q.8.8.^ ^ ^ / ^ ^ ^ ^ ^ ^ ^ ^ ^ / / ^ ^ ^ ^ ^ ^ ` ~ ` ,.` ~ ` ' 6.` ` 8.6.~ ,.;.,.W / W 2./ W / ,.W / W W W ,.;.W j j j k Q W j j Q j v v v v M v M M M n j M p j  .c c M r r  .p k c c c c c l b b ( b b b b n b b M c n j p j p O.M  .p O.p O.n k  .n n b M b b M n m n m b m m m m n ;.Q Q h  . . .n  .o.2.<.,.<.<.;.,.<.<.#.#.#.{ $.$...{ } #.} { #.X.{ { { { > #.> D > D D #.D D D D #.{ D #.Z > D #.Z @.#.@.#.#.} D } @.} } @., Z } @.Z @., , Z , > > > > { > , @.@.@.@.@.@.@.@.@.} @.@.@.@.} } Z @.Z @.@.} @.} Z Z , , Z Z , Z - D BXDXZ.+.+.N.5.: - > > Z D D D *.Z Z K @.Z Z K @.Z Z Z Z Z Z Z Z Z Z ;.:.;.:.:.;.{ > D ' .kX.W D $.#.$.$.=.$.$.<.3.w.3.3.3.y.p.X.X.p.X.p.p.3.p.w.3.p.r.p.5.3.p.y.p.y.r.p.r.y.y.y.p.r.y.y.y.y.3.y.y.y.y.$.y.y.-.-.y.t.t.p.p.i.i.i.i.i.i.i.i.p.i.p.u.pX-.sXi.D.aXsXsXi.sXsXsXi.D.aXaXAXsXsXsXsXsXsXaXaXaXsXsXdXsXdXdXdXdXdXdXdXdXdXaXfX",
-        ").).).).7XE.B `.:XvXbXvX`.B B V !.(.).uXeXrXuXeXeXeXuXuXOXrXeXuXOXuXeXOXOX~.eXeXuX~.!.!.~.#XOX!.!.!.!.!.!.eX0.0.q.0.0.tX0.0.tX*.7.0.*.0.0.0.6.0.0.0.K *.K 6.6.6.6.0.0.' ' ' 4XeX0.' 0.' 0.0.0.' q.q.tXe.yXe.yXiXyXtXiXyXuXyXyXiXtXrXOXrXuXiXoXrX@XrXoXrXrXrXiXrXrXe.rXe.q.rXe.rXtXq.tXq.tXiXq.tXq.tXyXe.iXq.e.yXq.iXtXyXyXq.yXyXyXq.yXyXyXq.4Xw.w.yX*.*.*.0.0.4X0.0.0.0.0.' 0.0.0.0.0.0.0.0.' eXeX*.7.*.*.7.0.7.0.0.0.7.0.8.8.e.8./ ' ^ ' ^ / ^ ' / ^ ^  / ^ / ^ / / / ^ ^ / ~ ~ 6.*.~ ` 6.` 6.6.` ` ` ,./ ;.W Q W W W W 2./ W ;.Q Q W W j j j j j b k j Q Q h j c v v v p M p M c M p p  .j k k p r  .p j c c k p k p c b b ( b b f b b b b b j b c c b m c b b M c m c b b m m c m b M m m b m m m m ) m m ) b ) j Q j 2. . .4.n M m m 2.<.1.,.,.:.;.<.:.:.$.$.#.$.{ $.#.{ ..} X.{ { { ..| #.{ #.> W ( h > D D ;.W D #.D Z D #.@.Z #.#.@.#.@.{ @.#.#.{ @.> Z } , , Z , - , , , , , > , { > > r { > @.Z > } @.Z } Z @.@.@.@.} Z @.@.@.@.Z } Z Z Z , Z Z Z - Z - L r.ZX+.+.t.Z.D.G.L > D Z D Z D D D Z D @.Z D D Z D Z Z Z Z Z Z Z Z Z #.#.:.:.;.h | | > / %X$XvX%Xh ;.@.$.*.$.$.$.3.$.3.3.3.3.$.3.p.3.p.3.3.p.3.5.3.r.r.5.3.3.3.3.3.5.3.r.p.3.p.p.p.p.p.5.p.y.y.y.y.3.3.y.y.y.$.y.-.y.-.p.t.S.t.t.t.i.p.i.t.i.i.p.i.p.u.y.u.y.pXi.i.i.i.sXAXi.D.i.sXi.aXaXi.aXpXsXaXaXsXsXsXaXAXdXsXdXdXdXdXdXdXdXdXdXfXfX",
-        "7X7X).7X).XXB :X X X.B B OX7X#X).uXeXuXuXOXeXuXuX~.oXoXuXOXoX4XeXuX~.oXOXuXOXOXOXOX~.!.!.~.!.!.!.(.!.(.(.eX0.0.0.*.q.0.tX0.0.q.7.0.q.q.*.q.0.0.6.0.6.0.0.0.8.0.6.0.tXq.eXeX0.' 0.4XrX' 0.0.0.8.q.iXq.q.e.yXe.tXiXyXiXtXiXyXiXuXuXiXiXrXoXoXoXiXiXrXuXrXrXtXrXrXtXrXtXrXrXrXtXrXtXtXtXq.q.q.tXq.tXw.iXtX9.9.yXe.r.r.yXyXyXtXyXyXyXyXyXyXyXyXq.4XyXyXeXeXeX*.0.0.*.0.0.0.6.0.0.q.0.q.0.0.q.0.7.w.7.7.0.7.q.*.7.0.7.7.8.0.0.9.6.' 8.' / / / ^ ^ / ^ ^ ^ ' ^ ^ / ^ / ^ / ^ / ^ ~ 6.~ ` ` 6.~ ` 6.` ` ` 8.` ` W Q 2./ ;./ W W / ;.Q W Q W Q Q j Q j j j j b b j b h M M v v v v v M M c n p M k k p c c p  . .p k k c c c s b ( b b ( b b b k b b b c b n b b M c b m c m c b m m ) m m m m m ) m  m m m ) m m m m m n n Q 4.Q  . .n M m m M n 2.2.2.<.1.2.#.#.#.#.{ $.{ $.{ } } $.{ #.{ #.{ { | { D > W h h W h D D > D D D > #.#.#.D #.#.Z #.@.{ } #.{ } @.{ } > Z , - O o O . . . O = , > , > > > > > Z } Z > Z , @.@.@.@.@.@.@.@.@.} Z @.@.Z } @.Z Z Z - , Z - - ~ G.+.Z.Z.S.F.ZXe.- - > D D D D Z D D Z D D Z Z K Z Z Z Z Z Z Z Z Z Z W ;.;.h ;.#.D > ( _ .vX X' > > #.$.#.$.$.<.<.3.3.3.3.3.3.p.X.p.p.X.3.3.3.3.3.>.3.>.>.<.>.>.>.3.X.3.3.5.3.t.5.p.p.t.t.t.p.p.p.p.p.y.p.y.y.y.y.y.y.t.i.t.S.i.p.S.D.i.i.i.i.i.p.p.p.u.pXu.i.i.i.D.sXD.aXi.i.sXi.aXi.u.aXi.i.AXaXaXaXaXaXaXsXsXdXAXdXKXdXdXdXdXdXdXaXfX",
-        ").).).7XC B B .X:XY {.bX$XL.B G tXuXuXeXeXuXeXoXuXrXoX4XeXuXeXeXuXeXeXeXeXOXoXeXeXoX!.~.OX~.OXOXOX).(.!.(.eXtX0.0.tX0.0.q.0.0.q.0.7.0.q.*.q.7.*.0.0.*.6.6.0.8.0.q.rXrXrX0.' 4X' 0.eX0.0.0.0.e.0.q.e.yXe.q.iXe.tXtXtXiXyXfXuXiXtXtXiXuXtXrXrXuXuXrXrXrXe.e.tXe.tXtXrXrXq.tXrXrXtXq.iXq.q.yXtXq.iXr.tXtX9.8.1.9.q.yXtXyXyXyXyXyXyXyXyXyXtXyX4Xq.yXq.5Xq.0.tX*.tX*.*.tX0.0.0.6.0.q.0.q.7.q.7.q.w.7.7.*.q.7.7.*.*.q.8.7.6.9.8.0.8.q.8./ / ` ^ / ' ! / ! ^ / ^ ^ / / / ^ / ^ ^ / ~ ,.6.,.~ 6.` ` ,.6.~ ` ` / 8./ Q / ;.Q Q / W ;.W W ( Q ) b j j Q k b k b n j b k j c M v v v v v v c c M p n k p k k p c k k p c c c l s c l b ) b b b R b b b k b b b b n b c m M b m c m b m  b m ) m m m m b b m ) m m m ) m b n ) n Q Q j 2.n M M m M M m M 2.2.2.2.2.>.#.$.#.$.{ #.#.#.#.} { } X.{ { { ..{ { { D h W h ( ( h j h D D D #.D { D D #.@.@.#.Z #.#.} #.@.{ } > Z , $ . .   .     . . . O , : , > > > > | > { { > > { { Z } @.@.@.@.Z } Z } Z @.Z Z Z Z Z Z - Z - L 5.N.N.S.G.ZXDXGX! - S Z D Z Z Z D D Z D Z Z D D Z Z Z - Z Z Z Z Z Z Z #.h ;.#.h W h > ! .$XvX XR f > #.$.$.#.$.>.3.>.3.3.>.3.p.X.p.X.p.$.3.X.X.3.;.,.;.2.q. e.iX` 8.2.:.>.3.3.5.p.5.p.5.p.p.t.t.t.t.t.t.+.p.+.p.p.p.t.i.t.p.i.p.p.i.t.S.p.p.t.t.5.t.r.2.y.u.i.i.aXi.aXD.aXi.aXu.u.pXu.aXaXu.aXaXaXaXD.sXsXsXsXAXsXsXsXdXsXfXdXdXfXfXfXfX",
-        ").7X).7XOXXXB  X:XvXJXIXuX%X.U % & ; K uXuXuXeXeXOXoXeXrXeXuXeXeXeXrXuXtXtXrXtXtXtXtXeX~.oXtX4XeXq.0.tXeXeXeX0.0.0.q.tX*.q.q.7.7.0.q.0.q.7.7.q.6.6.6.0.8.7.0.8.0.rXrX' 9.q.' 0.' eX0.0.0.9.0.e.e.tXe.q.q.w.tXr.yXiXyXiXtXiXtXtXiXtXtXuXOXrXrXrXrXtXtXtXtXtXtXtXe.tXtXrXrXrXq.tXtXq.q.tXq.iXtXq.q.iXq.<.8.8.<.9.r.yXyXyXq.yXyXyXyXyXq.yXyXyX4Xq.yXq.4X4X*.tX*.tXeX0.q.*.0.0.q.7.9.9.7.7.7.w.7.9.7.7.*.0.0.q.8.7.6.0.0.8.6.8.8.8.8.' / / ` / ^ ~ ! ! ! ( ^ / / ^ / ^ ^ / ^ ^ ~ ~ 6.K 6.` ` 6.` / / 8.` / / ` ,./ ;./ W ;.W / ( k Q n ) n ) j j b n n b n b b b b v M v p p v v M M v c M c c M c c c c l s p w c c s l l c l k b b b b b b b b s b b b m b n b b m b ) m m m m m m m ) x m m m m b m ) m m m ) b b b b n Q Q j M M m m m m m g.) Q 2.Q 2.2.#.:.#.#.{ $.{ ..#.{ { { #.#.{ { { { { { h h D ( > h k h k k W D D D #.{ @.D #.#.@.#.{ { #.{ { @.> Z , - . .           . & &   . , : , > > > { { , , > > , , , > , , { Z } Z @.Z @.Z @.Z , Z - , Z - - ( +.Z.G.F.ZXDXGXNX- - , : D > D D Z > L D D D L D L A A L L - Z Z L Z D W #.W | D > > : _ .vXvX.R > h j o. .>.>.>.3.>.>.5.>.5.X.p.3.3.3.X.3.X.:...8.rX%XkXbXbXcX:X:X:X>X%X1.2.X.3.3.p.3.p.5.p.t.t.t.t.5.t.5.t.p.p.p.p.t.t.t.S.S.t.S.t.i.p.t.p.t.t.r.^ P ^ u.u.u.u.i.i.u.D.i.aXi.aXu.u.u.r.aXu.u.aXi.aXsXsXsXsXsXsXsXsXAXsXsXfXKXdXaXfXaXG.",
-        "7X7X).).B C B vXvXbXHXKXS  XvXbXUXPXKX uX~.uXOXuXoXoXuXuXeXeXuXuXeXrXeXuXtXtXeXeXeXeXeX4XoXeX4X4XtX*.0.eXeXq.0.0.tX0.*.q.q.7.q.7.7.7.q.7.q.7.7.6.6.6.~ 6.q.8.q.0.0.q.' 0.8.q.0.' 0.0.0.q.q.q.q.yXe.r.q.iXq.r.q.iXtXtXuXiXiXyXfXrXe.rXuXrXrXrXrXtXiXq.yXtXtXe.tXtXtXrXtXe.q.0.q.q.tXtXtXtXq.tXq.yX9.8.8.8.8.9.8.q.yXyXyXyXyXyXyXyXyXyXyXtX*.*.yXyX4XyXyXq.4XyXyX*.yXq.0.8.9.7.q.q.w.w.7.q.7.7.w.7.7.*.7.7.6.8.6.8.0.6.6.8.8.8.8.0./ ' / / ~ ^ ` ^ ~ ^ / / / ^ ^ ~ ^ ^ / / / ~ W ~ *.` ~ 6.` ` 8.` 8.` 8.8.` 1.W W W / W Q Q ( ) ) b j b b n j n c b b b b b b c v p M v v v v p M p c M c c l c c l p s c l s s y l c l l l c ) b ( b b R b b b b k b b b b b b m b m m m m m m m l m m m )  m m m m b b b b b j ) j ) n Q n m m m M M M g.m m m 4.4.2.2.$.#.$.#.$.| u c k k | { { { { { { ..{ D h D h h h ( D W k f j k D #.D D Z @.#.@.#.#.{ #.} #.} @.{ , , . . .   .       . E ^ *   O = , > > > > > > { > , > > { , , > > , , , Z } Z Z } , Z , Z Z - , - >.Z.F.F.ZXDXGXAXE - L : L Z Z D D L > D Z Z D D Z L E U _ A - - - L D > W h ;.> > > > E '. XbX$X%Xf r j .. .>.5.>.X.5.>.X.>.X.5.y.y.X.p.X.X.3.#.#.%XkXvXMXcXbXcXcX:X:X:X*X:X;XOX1.>.>.5.3.5.5.p.t.5.t.5.5.5.p.t.+.p.p.p.p.t.t.t.p.t.S.i.t.t.t.p.X.e._ N ^ 5.5.p.u.u.u.u.u.u.u.u.u.aXr.iX' 9.r.r.u.aXaXi.aXaXsXsXi.sXsXAXsXsXsXfXdXdXfXD.S.S.",
-        ").).).uXOXXXB bXJXHXbXcX X XvX%XR * UX uXeXuXuXeXuXeXuXeXuXeXrXeXtXuXrXeXeX0.eXq.0.tXq.eXeXeX0.q.eXtX4X0.eXeXeX0.0.0.q.w.q.7.w.7.7.0.w.7.q.7.q.6.6.6.6.6.9.8.8.8.9.0.9.9.8.9.9.rX0.0.e.q.9.e.e.e.yXtXiXq.e.tXe.w.iXiXyXtXtXuXiXe.rXrXiXuXrXiXq.tXtXiXyXe.e.tXtXq.iXtXrX0.0.q.q.q.q.iXq.yXe.tXq.9.9.8.<.<.8.,.9.q.yXyXyXyXyXyXyXyXyXyXyXyXyXyXyXyXw.w.4XyX0.tXyXtXyXq.7.9.7.7.w.7.9.7.q.w.9.7.7.w.7.7.8.6.7.7.0.7.6.6.8.8.8.` 8.9./ ^ / ` ! / ^ ~ ^ / Q / ( / / / ^ / ^ / ^ / ~ ~ ~ ` 6.` 8./ / / / / / / Q Q Q 1.Q 2./ Q j b n b b ) b ) m n n c b c b b b c v u g.v v v v v v v v v c v v p v c c s c s c c l s c l v c l l l b b b ( b k b ) s b b M c b b M b b m ) x b m m m  b m b m m b ) m ) m ) m m b b b b n n Q j m M M M ) m M g.m g.M Q ;.;.:.#.{ #.#.h u p y u y p p p  .r { r ..h D h W D h h h ( h k ( j k h D #.#.#.Z Z #.#.{ #.#.{ @.{ @., - .       .       . & & .     $ , , > > > > > r > > , , > > r > , r , , Z - Z - Z - - Z - , - Z - C.F.ZXZXZXGXGX/ - - - , > : : Z > Z D Z D D L > D L > U U U _ L - L > > > > D h > h > _ .1XbX.I f r r r o.>.4.>.>.>.>.>.>.3.3.X.X.3.X.3.3.X.{ / 1XvXcXcXMXcXcXcX:X:X:X:X;X;X;X+X:.>.X.3.3.5.3.5.5.5.5.5.+.X.+.p.p.p.p.t.t.i.t.i.t.p.p.t.t.+.5.' XXL.S 2.>.5.r.5.y.r.u.u.r.u.u.r.r.u.e._ S e.r.r.aXu.aXaXD.i.D.D.D.sXsXsXAXfXsXfXAXAXF.F.G.",
-        ").uXOX#XB B B vXbXbXbXcX X|.kXHXHXCXUX OXuXuXeXuXeXeXuXuXeXuXeXrXeXeXeXeXeXeXq.eX0.rXq.q.eX4XtXtX0.0.tX4XeXeXtXeX0.0.q.w.q.q.w.7.w.q.7.7.7.6.7.7.,.6.,.6.6.8.7.,.9.q.9.9.q.9.9.9.q.q.rX9.9.9.9.9.9.q.e.q.e.iXq.q.r.tXtXtXiXq.r.q.rXe.rXtXq.e.tXiXq.yXiXq.iXtXq.tXtXtXq.q.0.q.rXq.rXq.tXtXq.e.7.7.1.8.,.9.8.8.<.q.5XyXyXyXyXyXyXyXyX4Xw.yX4XyXq.4Xw.yX4XyXyXyXyXyXyXq.7.q.q.9.w.q.w.9.9.9.w.9.7.7.1.1.9.8.6.6.8.8.7.6.8.8.8.` 8.8./ ^ / ^ / / ~ / ^ ^ Q / ^ / ^ ( / ^ / ^ ~ ~ ~ ~ / ~ ~ ` / 8./ 8./ / W W ;.W 2./ W Q 2.Q n n b b b ) b m m n b b m c b b c m z z g.v v v v v p v v M c v p l c c l l l l c c l l l z l l c l c b b ( b ( b b ( b b b b b b b b b b m b m m l m ) b b x ) m m m m m ) b ) m b b b b ) b n ) Q M m M m m m M g.v g.g.m ;.Q ;.$.} { $.k u u i p y p y i y p y p w k k f h h D W ( h W k h h k k k h D @.#.@.{ #.#.{ #.} { #.> , $   .       .     . .       . O - = > > > > > r > > > > , > > , > , > , : - - - - - - , - - - - - 4.G.AXAXGXGX/ $ $ - , - : - L : L Z S D D Z Z L Z : - U V '.U U L : : > > s > r h , ( . XvXvX._ s r r  .X.>.>.>.>.>.X.>.3.3.X.5.3.3.X.3.:.:.;.#XcXcXcXcXbXcXcX:X:X:X:X*X:X*X*X{.W W ;.;...>.>.5.5.5.O.5.o.5.5.X.5.5.t.p.p.t.t.t.i.Z.t.p.5.5.oX/.L.N ( h 2. .3.>.>.5.w.5.r.r.u.r.3.>.r.OXC S e.r.u.aXi.i.D.D.i.D.AXi.sXZXi.dXdXD.F.F.F.D.F.",
-        "7X@XuXrXC B B .1XvX1X X.X|.kXKXUXIXUX uXuXuXuX@X7XuXrXoXuXuXeXtXeXeXeXeXeXeXq.0.rX0.eXeXtXeXeX*.0.4X*.q.eX0.eXyX0.q.w.7.7.7.7.7.7.7.7.7.7.7.6.6.6.,.6.6.7.8.8.6.9.7.9.9.9.9.9.9.9.e.q.9.9.>.9.9.9.r.9.r.q.q.r.e.q.iXiXyXq.w.q.q.e.e.tXiXq.tXr.q.tXtXe.tXq.tXtXe.tXq.q.q.0.q.' 0.q.q.iXtXq.q.9.8.,.9.8.,.,.9.8.7.q.yXyXyXyXyXyXyXyXyXyXyXyXyX5XtXyXyXyXq.yXyXyXyX0.w.7.7.7.9.q.9.w.w.q.q.7.9.8.1.9.1.1.7.8.7.e.7.8.8.8. 8.8.8.8./ ^ ^ ^ ^ ~ ( / ^ ^ ^ ( / ( Q / ^ / ^ ^ ^ ~ ~ ,.` 6./ / / / ` / ~ Q ;.Q Q Q / 2.Q Q n n Q m m n m b b m ) m b c m m c b v v v z f.f.v v v v v p v c v v v v v z v v v c l l c l c l c l l z l l b b ) b b b b b b k b b b b c b b b m ) x m ) m m m  l m b m b b m ) c b n b ) n j b j b Q m m M M v g.g.g.g.g.g.M M  .Q #.#.#.{ p u i p i p y p p y i p p w s s c k k s k k f k ( ( k j ( k k f > #.#.#.#.#.{ #.#.#.} Z , O   . .             . .     . . = : > , > > > > > > r > > > r , , , , = - - - : ( f S : - - - - - > VXGXGXKX' - & ; E : E D : : - : - > Z S : D Z D L : : U Y U U _ _ : : > > > > , s _ . XbX1X.R = r 2. .4. .>.>.>.>.>.X.>.X.3.3.X.3.3.:.:.| > %XvXvXbXMXMXcXvXcX:X:X*X:X*X.*XE.f  l.) Q | | :...X.o.o.X.o.X.o.5.5.5.5.t.t.t.S.t.t.t.5.5. }.&XL.C S W 1./ A S S ( / 2.9.>.3.>.>.3.9. V * ! 9.t.u.G.D.i.D.D.i.aXAXi.sXD.D.ZXD.D.D.D.F.S.",
-        "#XuXOX@XC B B B B B B C B _ NXCXCXCXS ' uXuXuXuXuXuXuXuXuXeX*.' 0.eX0.eXeXeXq.eX0.eXeXq.0.q.rX*.0.4X*.tX*.tXeXq.eX0.9.7.7.q.7.q.q.7.7.7.7.6.7.6.6.,.6.,.6.7.8.7.8.8.9.9.9.8.9.9.9.9.9.e.9.9.9.9.9.9.9.9.9.e.9.e.q.e.r.q.r.q.r.q.q.r.q.iXr.iXr.q.r.iXq.tXiXtXq.iXrXtXrXq.' rX0.0.0.0.q.tXtX9.8.<.8.,.,.9.9.8.8.9.9.8.7.9.q.yXyXyXyXyXyXyXyX4Xq.yXyXyXyX5X5Xq.yXw.yXq.w.q.w.q.7.w.w.9.9.9.9.1.1.1.<.8.8.8.1.8.8.1.1.8.8.8.8.8.8.8.8./ ) ^ ^ ^ / ^ Q / ( ~ / / / / / / ^ / / / ~ / / / / ` / 8./ / W Q W Q Q W Q W W Q n  .n 4.n b m b m m b m ) M b c v b v v v v g.g.z g.g.p v v v c c v v v v v p v l c l l p l l c l l c l l l l l s ) b b b b b b b b b b b l b x b b b b x x m b b m b  m m m b ) l l ) ) n j n b Q b Q n n m m g.g.m g.g.g.g.M v M n Q #.#.$.} u i u i p i u i i p p p p p p s b s s s g k k b k k ( h h k k h > { } > { { #.@.#.} { @., O   . X O .     X & & & .     . $ : , : r > r > > , f > , , = : , , , = : S ( ( D ~ D W ( D - - $ $ NXGXe.( T ( / ;.#.{ > h W ! : - - D - Z : L > L - : : U V U U .I R d : = : , > = _ .vXbX$X.( r j ;. . .o.>.:.>.>.>.:.3.X.3.X.:.:.>.:.:.;.W 1XvXcXcXmXcXcXcX:X:X:X:X:X;X*X.F >  j.j. / W k h k j j Q j  .4.k.l.e.X.p.t.t.p.p.t.t.5.>.+X*XU.V C - E V L.L.B N * * & : Q <.2.2.>.;.' Q.* & 1.r.u.G.i.D.i.D.sXD.i.i.D.D.F.D.D.D.F.D.G.S.",
-        "uXOX#XOXB B _..X.`.B V uXS ; % % : oXuXuXOXuX@XuXoXeX~.K ' *.eXeXeXeXeXeX0.eXeXrX0.eXtXeXq.eX0.0.0.tX0.4X0.eXeXeXw.7.w.7.7.7.7.7.7.q.7.7.7.7.7.7.7.6.6.6.6.,.8.7.8.9.q.9.q.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.q.r.9.e.tXr.q.q.r.q.9.q.yXe.tXiXiXq.q.tXq.q.tXq.q.q.q.q.q.' q.0.8.rXq.q.q.9.,.8.,.9.8.7.1.7.7.9.9.7.9.9.7.9.9.w.q.yX5Xq.yXyXyXyXyXyXyXyXyXyXyX4X4Xw.4Xw.9.9.9.q.q.9.<.1.2.1.1.1.) 1.1.1./ 1.1.8.e./ 7.8.8.1.8.8.q.1.^ ^ Q ^ ^ ( Q ( / Q / / ( / ( / / / ^ ^ / ,.8.8.` / ` / / j Q j j Q j Q Q Q Q n n 2.n j n ) ) n ) b ) ) m ) m c b m v z m z z f.z f.g.g.v u z c v y y l y p l u u v l u z l l l l c l l l l c l l b R b b ( b ( b b b b l b b l l b b m ) m m b m m m m b m b  b b l b b n ) n n j ) n n n M g.g.v g.g.g.m g.g.p p M j | #.{ { u u u p y i y i y i y y w p y s g l s k b k k s k ( k h j ( k f > > { #.{ Z > { #.#.} , Z . . NXCX5   . X NXVXKXS . .   . = = : > > , > r > r > > r > > , , = = : W | >.G.AXAXAXG.5.{ > ( : : S ! ^ 1.2.5.t.G.AXAXF.t.5.{ | ~ : - - > L > L > D ; - % P V Y U .$X_ f : = : = =   XvXbX XXXf k h  .X.2.:. .:.>...>.X.3.:.>.3.:.3.:.:.{ > ~ :XcXvXcXmXbXcX:X:X:X*X:X*X*X*X;XA S j.6 j.j.j.l.l.) ) )  k.l.l.x.c.j.1.5.p.p.t.t.p.t.t.3.6.}.*XY.C V V B U.B B C * N C * * O - W W W ~ _ L.C X f 3.r.i.i.D.D.aXD.D.sXD.D.F.D.D.D.F.D.F.D.D.",
-        "OX@XuXuXC B _. X X.K.B ).7X7XuXuXuXuXtX7XuXuXuXOX4X4X~.*.' K 0.0.eXeX~.OX0.eX0.q.eXeXq.tX0.q.tX0.eXeX*.4Xq.*.eXq.7.w.7.7.7.7.w.7.7.7.7.7.6.7.7.8.,.6.6.6.8.6.7.8.8.9.9.q.9.9.9.9.9.9.9.9.9.9.9.e.9.9.9.9.9.9.e.9.9.9.e.9.9.r.r.q.q.r.q.q.iXiXw.e.yXr.iXq.q.q.0.e.rX0.0.q.' 0.rXrXq.rX0.8.1.9.1.8.8.<.8.9.,.9.1.9.8.9.7.w.9.9.q.*.6.*.0.q.4XyXyXyXyXyXyXyXyX4XyXyXyXq.w.8.1. 1./ 2.Q ) / 1.) 1.1./ 1.1. 1.1.8.1.Q 1.9.8.8.8.8.8./ ^ ^ Q ^ ^ Q Q ( Q / ( ( / / / ^ / ( / / / ` ` ` ` ` / Q j Q j Q ) j j Q Q Q n o.j Q n n n m b ) m m m ) m m m m b l v v v v f.g.g.u d.v g.u z p z c l u z l z l u l l l z l l l l c c l c m l l z c ) b ( b b b b b b b s b g b b b ) x b b l m ) g.m  b ) m m l b s ) b b j j ) b n n j c g.g.g.g.g.g.g.g.g.p p v c M h #.{ ..i u y u i i i y y p i y i y y l s s g b k f g f k h h k h k k f > > > { { { { > } > > > Z o N KXVXVX. .  IXNXVXKX.       O , , : , > > r > , : r : , , = = ; / h G.GXLXIXIXIXIXLXIXGXG.{ > W W  .5.G.GXLXLXLXFXFXFXDXDXF.n.X.:.: - - D Z D L D : : ; N N C Y '..kX & = ; = = P  XbXbX+XI a r h | .. . . . .2.>.:.:.>.:.:.:.:.3.X.;.#.h %X:XvXcXMXMXcXcXcX:X:X:X:X;X*X*X{.:  j.j.j.j.j.x.x.x.x.lXlXzXx.x.x.v.l.;.X.5.t.t.t.t.t.t.>.' ;X&XK.L.U.U.I.&XY.&XU.C C C C C X X % ! R V {.L.* . ; 1.u.u.D.i.D.D.sXD.D.S.D.F.S.F.AXD.D.F.F.D.",
-        "uXuXuXOXuXOX@XuX@XuX~.~.~.7XuX4X7XuXuXtXuXuXuX4XuXeXK eX~.4X*.0.0.0.OXW.W.OXeXeX0.eX0.eX0.eXeX0.eX*.eXyXeXtXeXq.9.w.w.9.7.w.7.9.7.w.q.7.7.7.8.7.7.<.,.,.,.6.,.6.1.9.8.8.9.8.9.8.9.9.1.9.1.9.e.r.9.9.9.r.9.9.r.4.9.e.r.9.9.<.9.q.q.r.q.r.q.r.q.iXiXe.tXq.q.q.q.0.0.q.q.rXq.0.0.q.q.0.8.8.,.8.8.,.,.9.,.9.8.7.9.7.7.9.9.9.9.9.9.7.,.*.7.6.*.7.0.w.4XyXyXyXyXyXyXyXyX) ) ) )  ) 4.1.Q 2.1.1.1.1.1.1.1.1. 1.8.8.) n n n 8.8.7.8.8.8.1.Q ^ ) ( ( Q j h Q ^ / / W / / / ~ ^ / / / 8.` ` / Q j n n Q j Q Q ( Q Q ) n n ) ) n ) n n n m m m m m m m ) ) b l y g.f.v v u u f.f.v g.g.u v u z u p z p u p z u v u l p z v z l l l l l l l b l b l ( b b ( b ( b b b l b b l x b b b m m v x x m m m b m ) b b s c b b Q b n j Q M v v g.f.v f.m f.m m g.g.g.g.p p u p { }  .i u i i i i i i i i i y i i u s l s s b g b b k k ( W j k f k h k > h #.{ { { { > r e e , o  % R VX* X NXCXX  KX&       O = : > , , > : > > > : , = - = : h <.DXLXIXIXIXIXIXIXIXIXIXIXLXZXG.G.AXLXIXLXLXLXLXLXLXFXFXFXDXDXZ.O.9.: : L : L L - : - - : N N C U '.$XHX_ = T E a U  XbXvX X = r r 2.2. . .2. .;...:.:.3.:.:.:.:.:.#.;.> D $XvXcXvXMXcXvXvX:X:X:X*X*X*X.;XI ;  Y j.j.j.j.c.x.x.lXlXlXlXx.x.x.c. h X.X.5.t.t.t.t.+.5.' =X&XY./.$X$XI.&X{.U.I.L.C C C C C C V {.I.&X&XV * X % 1.5.D.i.D.sXi.D.D.D.D.S.D.D.S.D.D.D.ZXD.G.",
-        "OXuXuXuXuXuXuX7X7XK Q.~.~.~.uX7XuX4XtXuXuXuXeXuXuX4XK 4X~.4XeX~.eX4XW.W.W.W.OXeXeX0.eXeXeX0.eX0.4X' eX*.tX*.q.9.9.w.9.w.7.9.7.7.q.7.7.7.7.7.7.7.7.8.<.6.7.8.8.,.8.7.9.9.e.9.8.9.9.9.9.1.9.9.9.9.9.9.e.9.9.e.e.r.e.9.9.<.<.<.,.<.w.9.r.q.w.q.e.r.w.q.e.' 8.q.q.0.0.q.q.q.rXq.' rXrXq.` 8.8.8.,.8.8.,.8.9.,.9.9.9.9.7.9.7.w.9.9.,.6.6.6.*.7.*.*.q.*.w.yX4XyXyXyXw.q./ /   )  Q 2.4.1.1.1.1.1./  1.1.1./ 1.) o. .n n 2.8.8.8.` 8./ / ^ ( ) ( h Q k j ^ Q / / ^ / ( ^ ~ ^ / ~ ` ` / j j j n k j Q Q n Q Q b n ) n ) M n n M n m m m m  m m m m m m t l y f.z f.g.f.u g.g.d.p u z p z p z u u p p l l p p z p z z z l l l l l l l m l l l b ) b b b b b b b b b b b b l l b b v z z m m m m b  b b g b s b n b b n l l f.g.g.f.v g.g.g.g.v g.g.g.p p u f.u u | { p i i i d.d.d.i i i i i y y i t l l g b g s b g k k ( ( h k k h f h k g { { { > h w y w e 0 o ) % X  Y C l.%X. . KXP       O = = = > k , k = r , = , , = : Q :.GXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXLXLXLXIXLXLXFXFXFXFXFXDXDXF.+.5.( L : > L Z > : : - ; ; N N Y V .bXHX% E _ 4 U  XbXvX.R = r r k  . . . . . .:.#.:...#.:.:.:.:.| #.h ' vX:XcXcXMXMXcXcXcX:X:X*X:X*X*X&XN a j.j.Y j.j.x.x.x.x.lXlXzXx.x.x.j.j.) r X.5.5.t.t.5.t.X.X.) {.Y.}.HXUXkX'.vXJXbXL.&XK.B J.B C B &X*X&X&XL.C X X ; 5.t.Z.D.i.D.D.D.D.D.F.D.D.S.D.F.D.D.D.F.S.",
-        "uXuX@XuXuXuXuX(.~., r , r r r 4X= O uX7X7XuXuXuXuX~.~.4XK eX~.4XK W.+XW.W.W.!.OXeX0.0.q.q.eXeX~.oXeXeXeX*.eXw.w.3.7.w.7.7.9.w.7.w.7.q.7.7.8.7.<.7.7.6.,.6.,.6.,.6.8.1.9.8.8.9.9.e.9.9.9.9.9.9.9.9.e.9.9.9.9.9.9.9.<.,.<.9.<.7.<.<.9.7.7.q.e.q.q.q.e.q.8.8.` 8.e.q.0.rX0.rX0.q.0.' 8.8.1.8.,.8.,.,.8.8.,.9.9.<.7.9.9.9.9.9.9.7.*.*.6.6.! *.0.7.*.q.*.w.w.q.5X4XyXq.8. ) 1. ) / Q 2.Q 1.) 1.1.1.1.1.1./ 1.Q 2.Q n  .n n ) 8.8.8.8.` Q Q Q ( j j k Q h Q ( / ( / / / ( ^ ^ / / ~ Q c k j k n n b b n b Q j b n n M M n n ) M n n m m m m m m m ) m x s y y y u f.g.u f.v u g.p u z z u u v l v u z u l z l u z l y p l l l l m l l l l l l l l ) b ( b R b b g b b l b c b x z v m z z z b m b b l q x x l x t q t y f.g.g.p f.g.g.f.v f.g.g.m g.p g.d.g.d.u u k { y i d.d.d.d.d.i i i i i i i i t l g b g g b f l s k g g k ( j f h f f s > { > f w p y w e e + R kX* jXxXxXjXjX* U KXO .   . O = = > = = > , > : s , = = ; Q { GXLXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXLXIXIXLXLXLXLXLXFXFXFXFXDXDXDXG.Z.e.- - : - : L - : : ; - ; S % C Y U %XbX_ N N V U U %XvX._ a = r r  . . .;.|  .| :.:.:.:.:.:.;.:.#.| h OX:XcXvXMXcXcXcX:X:X:X:X:X;X;X;XU.: P Y j.j.j.j.x.c.x.x.x.lXzXzXx.x.x.j.b  .X.5.5.5.5.5.5.5...2.L.J.bXJXJX}.vXJXJXJX%XU.&XK.B J.Y.C Y.&XY.B C O X * ( 5.u.t.D.D.D.D.D.D.S.D.S.F.F.S.S.D.D.S.S.S.",
-        "OX@XuXuXrX7X!.r = O.N.H.h.N.O.= q e O tX7XuX7XuXuX4X~.~.4X*.~.4XW.W.W.(.W.W.W.E.OX0.eXeXoXoX~.eXoXK ' 4XeXeX7.w.9.w.w.9.w.7.7.w.7.7.w.9.7.7.7.7.8.7.6.<.<.6.6.8.<.,.8.9.9.8.9.8.9.9.8.9.>.e.9.e.r.e.9.r.e.9.9.1.1.7.<.9.<.<.<.9.8.<.<.<.7.q.9.q.q.9.' q.8.q.8.8.q.0.0.q.' rX0.0.` 8.7.1.8.,.8.,.8.1.8.8.8.8.7.9.9.q.w.9.9.w.6.,.,.` ! ' ! *.0.q.*.*.7.q.q.=.yXtXq.8.)   ) 1. / 2.2./ 1.Q 1.1.1.1.1.) 2.Q o.Q Q n n n j 1.8.8.9./ Q ( ^ j Q k Q h Q j ( ^ ^ Q Q ^ ^ Q ^ / Q j k k k k k b n n b n n b b b k n n ) M M n M n m b m m m m ) m ) z l y s y x y z d.z z u u u u g.u p g.u u u p p z u l u p u y l y c l l l c l c c l l l l l l b b b ) b b ) b s b k l b l i y v m z z v x b m ) g g x l s t y l i d.g.g.d.g.d.g.v u g.f.g.v g.v u g.d.g.u u p c c d.d.d.d.d.d.d.d.d.2 d.i i i y u l b g g b g b b g f g b g g ( ( k k f k g s s p p p y w w e o . kXcXxXxXnXmXmXmXcXjX.   . . o O = a > > : > e : = = = = W #.G.LXIXIXIXIXIXIXIXIXIXIXLXLXLXIXLXLXLXLXLXLXFXLXFXFXFXDXFXDXDXDXF.G.AX $ : : = : a : > : : : : & P & C Y `.U N V U ..$XkX.$X_ ; r r k r h | j h  .| | :.;.:.:.;.:.{ h r k %XcXvXcXMXmXcXcX:X:X*X*X:X*X;X*XV &  6 j.j.j.jXc.x.x.lXlXlXlXx.x.l.c.l.h  . .5.5.5.+.5.5.O.X.Q V +XJXJXJX{.HXJXJXJXCXP.*XY.B C J.C C B C * * O X % Q 5.Z.i.D.D.D.D.D.D.S.F.D.F.S.G.F.S.F.S.S.S.",
-        "OXOX@XuX#X~.r v H.m.B.M.m...r f.= z.s.O uXuXuX7XuXeXK 4X~.~.~.W.W.W.W.W.W.!.W.W.W.!.oXK K *.eX~.4XeXeXeX0.eX4X0.w.3.9.3.3.9.9.7.7.7.7.7.9.7.7.7.7.6.,.8.8.6.<.6.8.6.8.9.8.e.9.e.9.9.e.1.e.9.9.9.9.9.9.e.9.9.9.<.<.<.7.<.9.,.<.7.<.<.8.<.8.e.q.q.q.e.q.8. 6.' 8.8.8.0.0.0.q.0.` 8.,.8.8.,.8.,.8.8.6.,.8.,.8.8.9.9.9.9.9.9.9.0.` ~ ! ! ! ' ' 7.*.7.0.*.*.*.q.yX=.=.q.e./ 1. / ) ) 2.2.2.1.1.1.) 1.Q 2.Q n Q Q Q Q o.4.j  .n ,.8.8./ ( j j ( k Q k j j ( j ( ^ ^ ^ ^ ^ ^ ^ j c k c c k p c k k j b Q j n b b b b m n n ) M ) M ) m ) ) b m m m l x t l t l t l y u z f.g.g.u v u u u u u u u v u z p u z u l p z y c l l l l l z l x m l l l z l R b b ( b g b b b b b l y y i u x z m l z m m c t x l x t t i u g.u g.i d.g.g.g.g.g.g.v g.g.g.f.f.d.g.d.u i y c p d.d.d.d.d.d.d.d.a.d.d.f.i t i i y s s b g g g l g f b g s x g g g x s g s s y p y y p w w 0 + C jXxXxXxXmXmXnXnXnXxX*       o = : , = = r > = 0 = r = : ,.X.FXLXIXIXIXIXIXIXLXIXLXIXLXLXLXLXLXLXLXLXLXLXFXFXFXFXFXDXZXDXDXZXF.GXVX^ = ; : ; > : : a a g 0 < @ 5 % & N N U Y ... X$XbX%X.R = = = r r r | | |  .h | ;.| #.{ | { ..| > h 1X:XcXMXcXbXcX:X:X:X:X:X*X:X*X&XP % j. j.j.j.c.x.x.x.lXlXlXzXx.x.x.j. j  .o.X.X.X.X.5.5.X. .j XXkXHXJXbX$XJXJXJXJXHXL.&XY.Y.Y.C C C * * X X X & 2.5.5.C.G.Z.A.S.D.A.S.G.G.S.S.G.F.D.D.S.S.F.S.",
-        "OXOX#X7X~.r n IXm.B.B.v.+.r z.e z.z.z.O 8XuX7X4X~.~.*.~.~.~.~.W.W.!.W.W.W.OXW.OX!.!.!.oX4XoXoXoXoXeXeX0.4X' 0.eX4Xq.9.w.9.7.w.7.7.7.7.7.7.7.7.7.7.6.7.8.<.8.,.8.6.,.6.8.8.q.9.8.9.9.9.9.9.9.e.9.9.9.e.9.<.<.<.<.<.9.7.<.<.9.,.<.,.7.7.8.9.q.e.9.q.9.8.8.8.8.8.8.q.8.8.' ' 0.` ,.,.8.,.8.8.~ 6.6.1.,.8.8.8.8.8.8.8.9.q.r.9.8.` ` ! ! ! ' ' ! *.7.*.7.q.*.6.*.*.w.w.q.) 8.) / ) / ) / Q 1.2./ 1.1./ Q Q Q Q j ) o.Q n n j n n Q 8.8.8.Q ( ( b b k ( k Q k k j Q ^ ^ ( ^ ( k k c k j k k k k s k j n b b b b b b b b n n n ) M ) n m m m m m ) b l l y y t x y y x l t u u g.u v u g.p v u g.u u u u y v p u l u y c y l s s s l l l z l l l l l y u b ) b b ( b b b c p i t y i y z z z z z z b t s l z l i u u f.g.i u g.v u g.g.f.v g.g.g.M g.d.g.d.d.p u t t t 2 d.d.d.d.d.d.d.d.d.d.i d.u i u u l s g s b b g g s g f b g l b l g s x l l y p y y c y i < < + C jXxXnXxXmXnXnXcXcXcX* . .   . O = = , r = e 0 0 = = = Q > G.FXLXIXIXIXIXIXLXLXLXLXLXLXLXLXLXLXFXLXFXLXFXFXFXFXFXDXDXDXDXZXZXDXGX ; & ; : a a a a a a a a < < @ % * N U Y ... X X X X X X_ = r = r r r k j h h j h #.h | | | ..| h h  :XvXcXcXMXcXbXcX:X:X:X*X:X*X;XU.4 P Y j.6 j.j.x.c.x.lXlXlXzXlXx.x.x.j.) k ..o.5.5.o.5.5.O.o. .k XXCXR kX+X%XkXJXJXJXHXY.*X&XB C C * * X X X X & Q 5.5.t.Z.G.Z.D.Z.A.A.A.Z.A.A.Z.Z.A.S.A.G.G.S.S.",
-        "+XOXOX!.~.r SXh.B.B.B.m.+.r z.s.z.z.a.O 4X' ~.K K ~.~.K ~.!.W.W.W.W.W.!.!.E.!.!.OXE.!.E.~.eX*.oXoXK 4XeXeXeXeXeX0.0.q.w.w.7.9.3.w.7.7.7.7.7.7.7.<.<.7.,.8.6.7.6.6.6.8.' 9.8.e.9.9.9.e.9.9.9.9.9.e.9.>.7.9.9.<.9.7.7.,.7.7.<.,.8.,.9.8.9.8.9.q.9.9.9.q.8.q.8.0.8.' 6.8.8.' 8.` 8.7.1.8.,.8.8.8./ 6.6./ 8.<.,.8.8.8.8.9.9.8.` ' / ' ' ! ! ! ! 6.0.7.0.*.7.6.*.0.K *.*. ) ^  / ) / ) 2.Q 1.1./ 4.Q 4.Q 4.2.4.Q Q  .n 2.j n  .n 4.8.` b ( n ( ( b ) k k j ( j j ( ^ ^ k b b k k c k p c k c k c j b n b b m b b j n m ) m M ) m m ) ) m ) ) ) t t t l t l y y u y y u y u u u f.v d.u u g.p u u g.z u y u u u p u y y y l l l y s l l l l l l y y y u k b ( b b b c u i w y y y y y z z x z z l l q x u y u u f.u d.g.u d.u g.i u v f.g.v g.g.u g.d.g.d.i t 5 x t 2 d.d.d.d.2 a.d.f.d.i d.i d.u i i u s b b f s k b s f b f g g g g x s s s y y l t y w y w e e + . `.jXxXxXjXxXjXcXjXkXX . E &   O = = = a = 0 0 0 = @ = 1.{ ZXLXIXIXIXIXLXIXLXLXLXLXLXLXLXLXFXLXLXFXFXFXFXFXDXFXDXDXDXDXZXF.DXKXV.< @ ; ; ; a ; a a a a 0 a a < @ d 4 V '.. X$X XvXvX X XvX X%Xa = = r e r r : h h h h h ;.h h h h r h k @X:XcXvXvX1X%X+X%X$X$X:X:X:X*X&XL.&  j. j.j.j.j.lXx.lXlXlXlXlXx.c.v.l.k k o.X.o.X.X.X.O.X.X.j ^ '.P * %XC %X4 kXJXJXCXV *XY.Y.J.C X . X X * : Q 4.5.Z.t.Z.Z.S.Z.A.Z.A.Z.A.Z.A.A.A.A.A.A.S.S.A.G.",
-        "!.~.~.~.r O.h.B.B.H.B.B.N.{ z.z.z.z.O # H H K H H K H ~.~.W.W.W.W.!.W.W.W.OXE.!.!.~.E.OX~.OXK eX4X0.oXoXeX~.eXeXeX0.eXeX7.w.7.7.9.7.7.7.7.7.7.9.7.,.<.8.8.,.6.6.6.6.6.' 8.9.e.9.9.e.e.9.1.9.e.9.9.6.6.6.<.7.9.7.8.7.<.,.,.6.6.,.7.<.,.9.0.9.8.q.q.8.8.8.' 8.8.' ' 8.6.` ` ` 8.,.8.,.8.8.6.,.8.,.8.~ ~ 6.6.8.8.8.e.8.` / / ` ! K ! ! ! ! ' ! ! *.0.*.7.*.6.*.6.6.` ` / ) / ) ) / ) / 1.2.Q 1.2.Q Q Q n ) Q 4.n Q 4.j j 4.Q j  .M 1./ j Q ( b ( ( ( b b ( b j k ( ( b j k k c k M c p k c c k p c c b b b b b b b n ) b n m ) ) m m ) m ) m x l y l t l y x y y x u x x y u z v f.g.u u g.u u u p p u u u u u y l y p l l l l l q l x l z l u y u y y c b b b R l i i p i i w y i y y z z u l u q y u y p i u d.v d.p g.u u d.u u v g.g.g.f.v d.d.g.d.t t g t t t d.d.d.d.d.d.d.d.i d.i f.i i f.i i u x s g ( l g s g ( f g g g g s g t s x 2 x 2 2 y w i w q 1 + o CX.XjXcXcXjXcXjXHXKXP   T  . . = = = = 0 0 0 = = @ a ;.X.DXLXLXIXLXLXLXLXLXLXLXLXLXLXFXLXFXFXFXFXFXFXDXDXFXZXZXDXDXF.F.F.DXNX; @ @ ; f a ; a a a g a a g a < < @ T U .. X X:XvXvXvXvX1X1X XE = = e , e r 0 k h h h h h k h k > k k > %X1X%X_ % @ & # @ & & 3 I  X;X&X_ ;  j.6 j.j.j.x.x.x.lXlXlXlXlXx.j.j. f p ..o.X.o.X. .O.O.| h _ C X . N * & * U JXJXbXL.&X&XY.C C X X o X ( 4.4.5.Z.Z.G.t.G.A.G.A.A.Z.Z.A.Z.A.A.A.A.A.Z.A.G.F.S.",
-        "!.7XT.Q., O.m.m.B.M.B.IXH.O.z.z.s.s.O O H L H Z K H K ~.Q.!.W.W.W.W.!.W.W.E.!.OX!.!.!.!.!.!.OX4XoX~.oXoXeXeXeXeXeXeX0.4X4Xq.7.w.9.w.9.7.7.7.7.<.7.7.7.6.7.6.6.` 6.6.6.0.' q.q.9.9.9.9.9.9.e.9.6.0.6.0.6.6.` 6.7.<.7.,.~ ~ 6.1.6.7.9.9.q.q.9.0.e.8.8.q.8.9.8.8.q.8.8.' 8.` ,.6.8.,.8.8.,.6.8.~ 8.,.8.8.8.8.8.6.8.8.` ` ` ' ` ~ ' ! ' ! ' ! _ ! ` 6.6.0.*.*.6.*.` ~ ! ! ^ ^ / ^ ^ / ) ) 1.1.Q Q Q 4. .2.Q Q Q Q Q Q Q Q n n o.n  .) 1.b ( b ( j b b ( k b ( b j b k b b k k k p k j k j c k c j c c b ) m n ) m b m b m ) n m m m ) m ) ) l y t s y l t y l u y u y u u i u u u u g.u u u d.u u u u u u p u p y y y y y l y l s l s g l l l y y y y y u c b b c y p y w w w y y w y i y z x u u y y p i i y i u d.i g.d.g.g.g.u g.u u z g.g.g.u f.u y t t x t t x d.d.d.d.d.d.d.d.d.i d.d.d.u u i u u z l l g g b b g g g f s g g x x x x t x t 4 2 w i q q 1 < o X VXVX X.X.X.XkXVXUXIXVX. . X     O # = 0 0 0 = 0 @ @ k | 5.FXLXLXLXLXLXLXLXFXLXFXLXFXFXFXFXFXFXFXDXFXDXFXDXDXDXDXZXF.G.F.ZXGXR & & @ @ = ; ; a ; ; 0 a 0 0 5 < < @ P ..$XvX$XvXvXvXvXJXPXUXkXT = = r e r r , = k h > | k h k k k > > ; f : ; ; ( e.4.5.e.4.b d & % _ .S ;   j.j.j.c.x.x.x.lXlXlXlXx.x.x.j. r k ..o.o.X.o.....k h ' |.Y.C * V C . .  JXJX#XU.*X*XY.B C X X o % Q >.5.C.t.Z.G.Z.Z.A.A.A.n.A.A.A.A.n.Z.Z.n.A.Z.S.S.S.A.",
-        "T.7X~.!.r O.{ ....r # v.c.r z.z.z.z.t O L T.R.Z ~.H ~.Q.W.W.W.W.W.!.W.!.!.W.!.!.!.!.~.!.~.OXOX~.~.oXeX4X~.eXeX4X4XoXoX4XeXeX0.q.3.7.7.3.w.7.7.7.7.8.6.7.6.6.6.6.6.6.6.` ' 0.9.9.9.9.e.e.9./ K 6.0.6.0.0.0.' K ' 7.~ D D 8.6.,.8.8.6.9.q.q.8.9.8.8.0.8.0.' 8.8.' 8.` ` ` ` 6.8.1.8.8.1.6.,./ 8.~ ` 8.6.` 8.8.8./ 8.8.` 6.` / ! ! ' ' ! ! ' ' ! _ *.*.6.6.6.` ! ( ^ ! ^ ( ^ ^ ^ ) / / / Q Q Q 4.Q Q Q 2.Q Q Q n j Q n j j n j j n n j b k ( k b R f b b ( b ( b ( k ( b k b c c k j p c k k c j c j c m b b n ) n n ) m m ) m m ) m ) m l l t l y x l y u y y u x u y u y u u z z g.g.d.g.p g.u u u u u u u z y y y p y y s l y l s l q g l u y y u y y u c y y y y w y w w i i w t y y u y z u x u y i y i u i d.d.u d.p u u u u z v g.u v u d.y w t t t q t t t d.d.d.s.d.d.d.d.d.d.i i i i i i u x l l m g g b s ( k g x g x x x t t t x t 2 t t 2 w q q < #   T UXKXVXCXbXHXKXUXPXPXPXE     .   o @ @ < = 0 < 0 @ @ Q { t.FXLXLXLXLXLXLXLXFXLXFXFXFXFXFXFXFXFXDXFXDXDXZXDXDXZXZXF.F.F.S.F.BX@ # @ @ @ ; ; ; a ; 0 a 0 < 5 q 1 1 @ T .bXPXUXbXvXvXvXbXPXPXPXJXR = = ; = r s = = a k h > h > k > r k = : b / C.AXGXDXZXAXG.G.u.5.) f d ; @ R j.j.6 j.j.x.c.lXx.lXlXlXlXx.x.j.j.Q s k p o.o. ... .j h k |.*X&XY.Y.Y.C . o kXJXJX'.&X*XU.Y.C C X X . & ;.5.t.t.G.G.Z.A.A.Z.A.A.A.C.A.A.n.A.A.Z.A.A.S.S.S.A.S.",
-        "~.~.~.~.r s.SXz.z.z.O m.d.r O O O O O O H H ~.T.~.K W.W.W.W.W.W.W.W.!.W.!.!.E.~.!.~.OXE.!.!.W.E.OX~.~.eXeXoXoXoXoXoXeXeXeX4XtX0.q.7.w.9.<.9.7.7.8.7.7.6.6.0.` 0.6.6.6.` oX' 8.e.e.9.9.9.~ K K ` 0.0.0.0.*.' E.E.F ~ ~ ~ / 8.8.8.6.6. '  ' 0.' ' e.8.8.9.8.8.8.` 8.` ` ~ ` ~ 8.,.,.6.,.6.,.~ 6.~ ~ ~ ` ~ ` ` ~ / ` `  ` ' ! ! ! ! ' ! ! ! ! ! ` 0.*.6.` ! ! ~ ! ! ^ ! ! ! E ^ ^ ) ) / 1.Q 2.Q Q Q Q j n Q j j n  .n n j n n j n n b ( b k k k ( b g ( b k b b b s b k b k c k c k c c c c c c c c c b ) m ) b b ) m ) m ) ) ) ) z z y l t t l y t y x x u y u x u u u y u u u i u g.u g.d.g.u v u u v u y p y y y y t s t x s y y x t w y y u y y y y y y y y y w w y w e w y w y y y u y u y u u y i y y u u i g.d.d.u d.g.u g.u u g.z i x t t t t t 2 t t t d.d.d.d.d.d.2 d.i d.f.i u f.u u i u x s x l l g g g x t t 8 t t 2 8 t t 2 q x 2 t 5 i q < # o o VXIXUXKXVXKXKXUXPXPXPXPXKXX       . o # @ @ 0 < 1 # 1 Q { Z.FXLXLXLXLXFXFXFXFXFXFXFXFXFXDXDXDXDXDXDXDXDXDXZXZXZXD.F.D.G.F.F.) # & @ = @ @ ; ; f d ; 0 5 0 < < < < # R kXPXPXPXUXbXbXvXJXPXPXPXPX%X= = r = e r r 0 ; = h k h h h f h f > 4.r.AXDXGXKXDXAXAXG.G.Z.5.r.4.1.f = d j.j.j.j.j.x.x.lXlXlXlXlXlXx.x.v. k k j  . . . .) Q r f ' ;X*XY.&X*X&XY.* * JXJX%XV ;X&XY.Y.B * * X o % 4.5.t.Z.Z.Z.Z.A.A.C.A.A.A.A.A.A.A.A.A.S.S.A.A.A.S.A.A.",
-        "T.).T.2X, ..z.z.z.z.O N.N.m.O.O.} ..r O L H H ~.H !.!.Q.W.W.W.W.W.!.W.!.!.!.~.~.!.!.!.!.!.E.!.!.OX~.OXoX~.eX~.oX*.oX4XeX0.eXeX4XtX0.7.7.9.7.7.7.7.8.8.7.' 0.` 0.6.6.6.6.oXK ` 9.e.9.0.' K D K ! K 0.oX' ~.XXK E._ F ~ ` 8.8.8.8.8.'  ' ' ' ' ` ' 8.8.` 8.8.6.` ` 8.` ` ` ~ ` ~ 6.,.6.~ ,./ 6.6.~ ~ ~ ~ ` K ~ ~ ~ ` ` ` ! ! ! ` ! ' K ! ! ! ! ! E 6.6.! ( ! ! ( ! ! ^ ! ! ! ( A ! ( ^ Q Q Q 2.n Q Q j Q j Q j b j Q Q n j n j n j j o.k k k ( b g g b k b b k b s b s b b k s c k c c c c c c c c c b b ) m b m ) b m ) ) m ) m z l l s l t t l l y x y u x u y u u u u u u u u f.p u g.g.u g.u u u u u u y y w y w y w y y l s t l t s w q w y y y y y y y y w w y w w w i y y w p w i i y p u i y w i i w i i t q i i u i u u u v u v i t t 2 q t t t t t i 2 d.d.d.d.d.d.d.2 i f.d.i i u i u u y x l t y t i t t t t t 2 t t g 2 2 t x t t 5 2 < 2 0 @ o   ^ PXPXPXUXKXUXPXPXPXPXPXPXPXP .       . O # < < < < 1 < j ..t.DXFXFXLXFXFXFXFXFXFXFXFXDXDXDXDXDXDXDXZXZXZXZXF.F.ZXF.F.F.S.G.G.f # @ ; @ & ; @ ; a a < < g 1 a < < 1 # R kXPXPXPXPXJXvXbXUXKXUXPXPXCXN = = = r r e ; ; = g > h k > > f : a 5.G.AXAXGXAXGXAXG.G.G.C.5.5.>...( @ 0 R  j.j.j.x.x.lXlXlXzXlXlXx.j.j.) k c j M j k b k.kX g _ *X*XY.*X*X&XP.C V |.U.Y.Y.Y.Y.Y.C C $ X . X S 5.5.Z.Z.Z.Z.A.Z.A.n.A.A.n.A.A.M.S.S.S.M.S.Z.M.Z.N.S.Z.",
-        "~.~.Q.!.= r z.z.s.z.# DXUXh.O.+.+.X., = ~.R.R.R.Q.!.Q.(.W.W.W.!.!.Q.!.!.!.!.E.!.E.W.+X!.!.!.OX!.!.~.~.oX~.~.eX~.oXeXeXeX4XtXyXeXeXeX~.' w.7.7.7.7.7.7.` 0.*.' 6.0.6.` 6.' ' ' 0.q.' 0.0.' K A K K 0.' ' H K XXJ OXH F 6.8.` ' 8.8.' ' '  ' ' ' ' / ` ' ` ' ' 8.` ` ` ` ` ` ~ ~ ! 6.,.6.6.~ ~ ~ ` 6.~ ~ ! ` ! ` K ! ~ ! K ! A ! ! ! ! ' ' ' F ! _ ! ! ^ ! R ( ! ~ ! ( ^ ! ( ( ! ! ( ^ ^ Q 2.j 2.4.j Q j j Q j Q j n n  .n j j n M j j M b k k k k b s b s b b s l b l s l c b c k c k c j c j c l m l c b ) ) m m ) ) m ) m l l l l t t l y l t y y u u y y u u y x u u u u v u u u u d.d.v d.v u u u u y y y y y t y y y w q y q t q y w w e q y y y w w t w w y w w w w w w y y w y w w p y i i i i i w i t e q q t i i i i u i i u u w t t q 2 t t t t t t d.d.d.d.d.d.d.d.d.d.d.i d.d.d.i u u u u 2 t 2 t 2 t 2 2 t 2 t 2 t 2 t t 2 g 2 2 q 5 2 1 < +   o KXPXPXPXPXPXPXPXPXPXPXPXPXPXe..     . . . # # < < @ # @ Q X.Z.DXFXFXFXFXFXFXDXDXFXDXDXDXDXDXDXDXDXZXZXZXD.F.ZXF.F.F.F.G.G.Z.C.f # @ @ ; @ ; @ @ ; 0 < 5 < < 5 < < < # R kXPXPXJXCXPXbXbXHX$  PXPXVX( # = = = e r = ; a = k h > k e > : k Z.G.AXAXGXGXAXAXG.G.G.t.5.3.:.#.: ;  E T _ l.j.j.j.lXlXlXlXlXj.k. f f r r k k k s s m zXbXR _ ;X*X&XY.Y.U.B C P.Y.U.*X*X*X&XY.B C * X . * Q 5.5.5.Z.Z.A.A.n.A.A.A.A.A.A.S.S.S.S.S.S.M.S.S.M.A.N.S.",
-        "~.~.~.~.r a.z.z.2 z.+ zXz.s.c.h.+.X.= R.H H R.~.W.W.W.W.W.!.!.W.Q.!.Q.!.~.E.E.!.!.!.W.!.!.OXE.E.~.OXOX~.~.~.eXeX*.eXuXeXeXeXeXeXtX~.OXOX~.8.7.7.7.7.0.0.' 0.0.6.` 6.6.6.~.0.' oX0.' ' *.K F K F K ' K OXE.K K H XXF XX' ` ' 8.9. oX'  ' ' ' ` ' ' ~ ` K F J K ` ` ` ` ~ ` K K ~ ! ` ~ ~ 6.~ 6.~ ~ ` ~ ! ! ` ` ' ` ` ! ! ! F ! ! ! ' ! ! _ ! _ ! ! ( ! E ( ( ! ( ! ( ! E ( ( ( ( A ( ( ) 2.2.Q Q Q j Q j j j Q Q n n n  .M j n  .n j M j b k b k s b s b k l b c c b l b s l c c c c c b c c c c l l s l ) b ) ) b b ) b g l s l t t l t l y z x u y x u x x u u u u u u u u u u g.u u u u u d.g.u u u w y w y w y t w q q w s s t t w w e w w w w w w w w w w w y w w w y w w w y y w w i y i w i i t q < q q q 5 q i u u i u i i t t t t q i t t t t t t x d.d.d.d.d.d.d.d.d.d.i d.i i f.i i i y 2 t q i i 2 t t 2 t 2 i t t t 8 t 2 2 t 2 2 2 1 1 + .   N UXPXPXPXPXPXPXPXPXPXPXPXPXIXVX.           o # 1 1 1 # # Q { Z.ZXFXFXFXFXFXFXZXDXDXDXDXDXZXZXF.F.ZXZXZXF.ZXZXZXZXF.F.F.S.G.Z.Z.E # & ; @ @ @ ; @ < 5 < 5 < 2 5 1 < 1 # R kXPXPXR * KXvX$XbXCXJXPXPXHXkX; = = = e = 0 0 0 0 0 k k , > f = n C.G.AXGXGXAXAXF.AXG.G.C.5.3.:.W ;  jX$X T 5 4 U   l.R R R g f  g s k k k r r   s l.kXkX +XU.Y.J.Y.Y.L.U.*X*X*X*X*XY.I.Y.C C X X X 5 Q o.n.Z.n.A.A.A.A.A.A.A.A.S.S.S.S.S.S.S.S.S.S.N.Z.S.Z.A.",
-        "T.).~.T.O.1 z.w o s.O s.s.s.s.u +...O ~.R.~.~.T.(.W.W.W.W.W.Q.W.!.!.E.Q.E.E.E.E.!.!.!.!.!.E.!.!.E.!.~.~.oX~.~.eXOXuXrX4XtX4XtXyX4X~.E.OX~.OX' 7.7.6.' *.' 0.' *.' 6.6.6.' oXoXeXeXK ' 0.' K F K F K E.H K E.E._ J E.K J ' 8.8.' ` ' ' oX' ' ' ' ! ' ' ! F F F F K A ` ` ' ! ! ~ ! K ! ~ 6.~ 6.~ ~ ` ~ K K ~ ! K ! ` ! K ~ ! ! ' F ' ! ! ' ! R F ! E E E ( ! ! ! ! ( ! ( A ( A ! ! ( ! ^ Q Q 4.Q 2.Q Q j Q n 2.n j Q Q j j n j j M n j j n k s s g b s b b s c s s l b s l s b c v c c c c c c c l b l b s ) ) m ) ) b x t s g l t l l q l t t s y y u y u u u z u u u u u u u u u u g.u u u u g.u d.u p w w w w y w y q e 0 0 q q q g w w e w e w w w w w w e i w y w w y w w y y w y y w w i i i w e q q q q q 0 q q y i i i i t t t t t t 2 i t t t t t 2 i d.d.d.d.d.d.d.d.d.i d.d.d.2 i d.i i i t 2 2 t 2 q 2 q t 2 t t 2 t 2 t 2 t 2 < 5 2 < 1 #       R KXUXPXPXIXUXPXPXPXPXUXKXKXKXKX&       . .   o # # < # # b ..Z.ZXZXDXFXDXFXDXZXZXF.ZXF.F.ZXF.ZXZXF.ZXF.ZXZXF.ZXF.ZXZXF.F.G.Z.Z.) # @ @ @ @ @ @ @ 5 < < < < 0 < < 1 1 < T %XUXPXKXVXJXHXVXKXUXUXPXPXUXKX @ = = r = a 0 0 s 0 0 > k = : : 5.G.G.AXGXGXDXAXAXG.C.C.5.5.>.:.~ ; jXjXvXvXjX%XT 5 # @ @ d P x jXjXcX%Xg r s k p c kXbXl.T g kXk.( XXV K.U.*X*X&X*X*X*XY.Y.B Y.V C * o . & Q O.5.n.n.H.A.A.A.A.A.A.n.A.A.S.S.S.S.S.S.S.M.Z.S.N.N.Z.N.",
-        "7X~.~.T...0 2 # ..O O M s.s.p O.r O K ~.W.W.W.W.W.W.W.W.W.(.W.W.!.Q.Q.E.E.E.E.!.W.OX!.!.!.!.!.E.E.E.E.~.OXoXOXOXrXOXuX4XtXeX0.eXoX~.OXOXOXK OX' 6.' 4X' 0.0.' ' *.6.6.6.` oXOX' oX' K K F K F F H ' H K XXH _ E.H _ E.E.E.' ' ' '  '  ' ' ' ! ` ` K K F F F F F A ~ ~ ! D D ! K A A ! ` ~ ~ ~ ~ ` ! ~ ~ ! ` ! ~ ` ! ! ! ` ! ! ! ! F ! _ ! R ! _ E ! ! ! ( E ( ! ( ! ! ! A ( ( A ( ( ( Q ^ Q Q j 2.Q n Q 2.n Q Q n Q j n n j n n j n j j n k s b s s b s l l c b l s b l c b l b v c c c c c c l c l g l l m ) m x 5 g x s s t l y t l x y t t t l u z x u u u u u u u u u u u d.u u g.u u u d.i y i w i q q q q w i e e q q 0 q q w e e w w w e w w w w w w w w w w p w p y w w y i w y y w q q q q 2 q t q q q < q t i i i t t t t t t t t t t 2 t t t x u d.d.d.d.d.d.d.a.d.d.d.d.f.i d.i 2 2 t 2 t 2 q 2 i 2 q 2 q t t t 2 q 2 t 2 t 5 2 2 1 1 o     .  UXPXPXPXPXIXPXPXPXPXPXUXKXKXKXVX. * X .       + # # # # k ..n.ZXZXDXZXZXF.F.F.ZXZXF.F.ZXF.ZXF.ZXZXZXZXZXZXZXZXZXZXZXF.F.F.S.N.V.& & @ @ @ a @ 5 5 5 < q 5 5 1 1 @ @ # T CXJXPXPXUXUXKXKXKXKXKXKXKXKXUXVX( @ = = e e a 0 0 s 0 a f > ; a C.G.AXAXGXGXAXAXG.G.G.Z.5.3.>.#.f 5 jXjXjXcXcXnXjXmXlXcXMXvXMXnXnXnXnX s g k k a a ( kXcXjX kXkX< g E J B P.&X&X&X*XY.C * C B C * X o O f O.n.n.n.N.A.A.n.A.A.A.n.A.A.A.S.S.S.S.S.M.S.S.N.S.Z.M.Z.S.",
-        "~.T.(.~.K O = e O , +.+.O.O.r = , R.!.T.W.W.W.W.W.W.W.W.W.Q.W.W.Q.E.E.E.E.!.E.(.(.W.(.!.OXW.!.E.!.E.W.XXOXuXOXOXrXuXtXeXeXtXtX~.!.~.~.E.OX!.' OXoX' ' oXeXK 0.6.6.' 6.6.6.!.XX!.OXE.F F F ' F K XXK XXE.K E.E.K K XXE.K J H K ' H K _ OXoX' ` ' ' ` A F F F F F F K K A ' A ! K D ! A ! D K ` ~ ` D ~ K ! D ! K K ! A ` F A ! F ! ! ! _ A ! ! E E ! ! E ( ( ! ! ( E E ! ! ( ( A ( A ^ ( ^ ( Q Q Q Q 2.n Q n 2.j j Q j j j j M j n j j M n j n c s b b c c c b s b s l b b s l c l c z b c c c v l l g x d 4 g b d 4 g 5 s s l t q l s t q l s y t t y t y z u u u u z u f.u u f.u u u i i p y y w i w q e q e i w w w e e 0 e e q 0 e e e e e w w w e w w w w w w w w w w w w y w w w w w w i 1 q q q q q < < q q q q < w i t t t t q i q i t t t t t t t z d.d.s.2 d.d.d.d.2 d.d.2 d.i i i i i i 2 i 2 2 2 t 2 t 2 t 2 2 2 2 t 2 2 2 5 2 2 1 1 1 # . o o & KXPXPXPXPXPXPXPXPXPXPXPXPXPXIXKXUX   X X     . o # @ + # s X.+.F.F.F.D.F.F.ZXF.ZXF.ZXZXF.DXZXZXZXZXZXZXZXZXZXZXZXZXZXF.F.F.G.A.Z.E # < & @ < < 1 < < 1 1 1 1 @ 1 1 1 + R VXUXIXUXKXVXKXUXUXUXIXIXKXVX VXNX= = = = = 0 0 0 0 0 0 ; = @ j r.G.AXGXGXGXDXAXG.G.Z.r.r.>.>.#.@ R jXcXcXxXxXnXnXnXnXmXMXMXmXnXnXnXcXP s s r b ( g 0 1  zXMXmX @ @ ; ( E V B L.K.C C C Y.J.J.N * X & k  .o.5.n.n.Z.M.A.A.H.A.A.A.A.A.n.S.S.S.S.S.S.S.S.M.S.S.S.S.S.",
-        ").T.7X~.!.T.O O L = O = = = = L T.~.Q.W.W.W.W.W.W.W./.W./.W.W.W.!.Q.E.E.E.E.!.!.W.!.!.!.!.!.OXW.W.+XXX+X+XOXOXuXrXtXuXtXtXtX~.).!.OXOX!.OX' ' OX' oXoXK ' ' oX' ' OXOXXXE.XXOXE.OXXXJ F J K E.' K H ' E.K E.J _ K J J E.XXH K F ' ' J ' _ ' ' ' ! K F F F F K A F A A A A K F ! A K ! D ! A ~ ` ! D ` ! K ' K ! ~ ! A ! ! ! ! ! ! ! E E E R F R ! R F E ! E ( A ! A ( ( ( A ( A E ( ( ( ( ^ ( 2.2.j Q Q 2.Q n Q Q n 4.j j j j j c j M k M  .n n b s b b b b l l l b s s l s c b v v g x g 4 4 4 4 4 g 8 4 4 4 5 5 5 g a x s y s l t s t l t l s t t q t t y u u u f.u f.u u u u u i u i y i i y y y e q e i q q q i e 0 0 e q q e 0 e e e e e e e w w w w w w w w w w p w w w w p w w w w q q q 1 q q q < q q q < q q 0 q i t t t t t t t 2 q 2 t t t t i f.d.d.s.d.d.d.d.d.d.2 a.d.2 d.f.a.2 f.2 2 i t t 2 t t t 2 t 2 2 2 2 2 2 t t < 2 1 1 1 1 +   * . CXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXUXKXX . X o   .   + 1 1 9 2 O.O.D.S.G.F.F.ZXF.ZXZXF.ZXZXDXDXZXZXDXZXZXZXZXZXZXZXZXZXZXZXZXF.F.A.A.V.& # @ < 5 5 < 5 1 5 1 5 5 < < @ # +  KXKXKXVXVXVXKXKXKXKXKXKXHXBXT kXKX) @ @ 0 0 0 0 a 0 0 a @ @ @ 1.Z.AXAXDXGXAXAXAXG.G.C.5.5.>.{ > # Y cXjXcXjXxXnXnXnXnXmXMXMXmXnXnXnXjXd = s s kXMXkXq a g kXmXmXkX_ +X+X_ f S S C B J.J.J.J.C G N $ X ( M O.o.n.n.n.A.n.A.A.A.A.n.A.H.A.A.N.S.S.S.S.S.S.S.S.S.S.S.S.S.",
-        "~.!.~.T.!.~.~.R.R.H R.H L R.H R.!.Q.(.(.Q.(.W.W.W.W.!.W.(.W.(.W.W.(.(.E.~.E.(.W.!.+X!.+X!.+XW.XX+XW.+X+X+X+XOXeXuXeXtX4X4X!.!.~.).~.~.OX!.OXE.~.!.OXOX!.!.!.!.!.W.OXE.E.XXE.OXE.XXOXH E.J H J J H ' H K XXE.K E.E.E._ K E._ XXH E.J ' H ' J F ! F F F F F F K F A K F K A ! ! D ! A D A A A A D ! ' D ! ! ! D ! K A ! ! K ! A ` ! E F ! F ! E E F E ! E A ( E ( ( ( ( A ! ( A ( ! R ( ^ ( R ( ( Q 2.2.Q j Q 2.n j 2.j j j n c k n k j j j M j n k c s s s s s b c s c c s b s s 4 5 3 5 3 5 3 g 4 g 5 4 4 g g 5 g g 4 x g t l t q l l t t s t t w s q q q t q y u u u u u u u u u u y p y u y y i w i q q q q q q q q e q 0 e < 0 w e e e e e e e e e e e w w w w w w w w w w w e w w w q i q t i q q q t q q < q q < q < i t i i t t t t t i t t t 2 i x x d.d.2 d.d.d.d.d.d.d.d.f.d.2 d.2 d.8 i 2 2 8 2 2 2 2 2 t 2 2 q 2 5 t 2 5 2 2 2 5 1 1 1 o . X % IXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXE & & O .     + + 1 + 1 4.+.N.t.S.G.F.F.ZXF.DXZXDXZXZXZXZXDXZXZXZXZXZXZXDXZXZXZXZXZXZXZXF.F.F.A. # # < 1 < < 1 g 1 < < < 1 1 1 @ # k.KXCXVXCXVXVXVXCXVXCXVXVXVXk.E e.KXVXd @ < 0 0 a < 0 < a @ 5 @ 5.C.G.AXGXGXDXAXG.G.G.t.5.5.>.;.f & jXjXcXjXnXnXnXnXnXmXmXMXMXnXnXnXnX a a e w y kXcXzXkXcXmXjXjXMX|.;X}.V E = : A C B C C C V V C * * h p o.O.n.n.A.n.A.n.n.A.A.A.A.n.n.A.N.S.S.S.S.S.S.M.S.S.S.S.S.S.",
-        "T.~.~.T.~.!.!.!.~.H E.H G H H H !.!.(.W.W.W.W.W.W.W.W.(.W.W.W.W.W.(.W.!.W.W.+X!.W.!.W.W.XX!.W.+X+X+XW.W.+X+X+XOXrX4XtXtXOX!.!.OX~.OX!.!.OXW.#XW.+X!.!.!.OXW.W.E.W.W.!.~.XXXXE.~.E.~.E.E.E.K E.K XXE.K H K K XX_ E.OX_ H H XXK E.E._ K _ ' F F K F F F F F K F F A K A K D ! D A S A A A ! D A A F K ! D K ! D D ! ! ! A ! A ! ! F F F E E E ! _ A E ! ! E ! ! E E ( A ( ! A ( ( ( ( R ( ( R ( ( 2.j 2.Q Q Q Q Q Q j j j k b j b j b j j j j n n n j c s s s s s s c c 4 5 4 5 5 5 5 P 3 5 3 5 4 4 x 5 5 4 x 4 x g d 5 g s t l q l t t l t l t q q t g t q s q t t q w i u u u u u i y u y y y y w w q w i e q q q q e q e q 0 e e e e e e e e e e e e e e w w e w w w w w e w w w e e < q i 2 q q q 2 e 1 q q 2 q q < q < i i q 2 q q i t q i t t t 2 u z x d.d.d.d.d.d.a.d.d.d.2 d.d.2 f.d.2 d.d.2 8 8 8 8 2 8 8 2 2 < 2 < 2 t 2 < 2 2 1 < 1 1 # . * . CXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXNX. . X . .   . + 9 1 1 X.O.+.N.G.F.F.ZXZXZXZXZXDXDXZXDXDXZXDXDXDXDXDXDXZXDXDXDXDXDXDXZXZXF.F.S.C.T # 9 1 1 < 1 < 1 @ 1 1 < 1 # # 4 VXCX_ NXVXVXCXVXCXVXVXVXVXCX E CXKXKX @ @ 0 @ < 0 0 < < @ & g 5.G.AXZXGXDXAXAXG.G.t.C.5.3.3.{ & 4 jXvXcXcXxXxXnXnXnXmXmXMXmXnXnXnXnX a a e g e k  kXbXlXj.g  kX{.&XL.C R = @ S L.U.Y.I.&XY.&XY.C * f k o.n.+.n.n.Z.n.A.H.A.n.A.A.A.n.A.A.M.S.S.S.S.S.S.S.S.S.S.S.M.",
-        "~.(.~.!.(.~.T.!.R.R.P 5 N H H R.T.!.T.!.(.W./.W.(.W.W.W./.W.(.W./.Q.(.W.W.(.W.W.+XW.#XW.!.XX+XW.W.XX+X+XXX+X+X+XOXtXuXOX#X(.(.(.(.).(.(.!.OXW.OXW.OXW.!.OXE.OX!.OXE.XXE.E.~.E.OXXXE.E.E.E.E.J E.K E.OXXXXXH F H K H E._ K XX_ E.E.H E.K J F ' F F F K F F F F D K A F A F F A A A D A A A A A L A A A ` ! ! ' A F A A A D ! A A ! E ! ! ! F A E ! ! _ E ! A ( E ( A ( ! A ( ( A R ( ( E ( ( ( ( Q 2.Q Q 2.Q Q Q Q Q ( Q ( k j k j b b k b n j n j f T f f f f f b b c 5 4 5 4 5 4 3 5 5 5 5 5 4 4 g g g 5 a d t 5 t g g g s t l t s s t s t l q q s q q q q q y t < < < i u u u u u u u u i i y w w w q w q q q i e e 0 0 q e q 0 e e r e e r e e e e p e e e w w e e e e w e e e e e e q q q t q q w 1 q q q q q 0 < q q q i 2 t i i 2 t 2 2 t t t x z z z i f.2 a.d.d.2 d.d.d.d.i a.i d.8 a.i 8 a.2 8 2 2 8 8 8 3 2 2 2 2 2 2 2 < < 2 1 2 1 1 + o X O UXPXPXPXPXPXPXIXPXPXPXPXPXPXPXPXPXPXPXPXKX    . X     . 9 + + + b +.+.Z.Z.F.ZXZXZXZXZXDXDXDXDXDXDXDXDXDXDXDXDXZXDXDXDXDXDXDXDXDXDXDXZXF.Z.5.R @ # 1 1 @ 5 5 @ 1 1 1 # 1 #  KXCXE  CXVXVXCXVXVXVXCXCXVXE  KXKXKXNX5 # @ < < 0 < < = @ @ Q Z.G.AXFXGXDXAXAXG.G.G.Z.r.>.:.h #  jXcXjXcXnXnXnXnXnXmXMXMXmXnXnXnXjXx 0 g s s f e s g b g ; @ < XXU.Y.G C T T E _ I.*X*X*X*X&X*X}.V * f k O.o.5.5.n.n.n.N.n.n.A.A.n.A.H.A.A.Z.S.S.S.S.S.S.S.S.S.M.S.S.",
-        ").~.7X~.T.~.!.Q.~.E k.  P R.R.Q.!.!.(.W.W.W.W.W./.W./.(.W./.+X(.W.(.W.#XW.W.(.!.W.!.!.W.W.W.XXW.+XW.+X+X+X+X+X+XuX#X+X#X!.!.!.(.(.(.OX!.W.XX!.OXW.W.OXW.W.W.W.XXOXOXE.OXE.E.XXOXE.E.OXE.E.K E.XXH H ' J OX' H H K K E.E.J E.' E.H E._ ' J F F F F F F F A F F K A K A ! F K A A A A D A A A F F A A F D K F A S A D A A A A F F F E A E A ! A E E E ! E ! E ! ! ( A ( ( ! A ( ( E ( E R ( E ( ( Q 2.Q Q Q Q ( ( ( ( f ( ( ( b j k j b j j j k d S d f d f d d f g f 4 5 5 4 4 5 4 5 3 3 5 5 d 5 g g x g 5 g 4 g g g 5 g q x t l x q g g s s q q q 2 g q q s q w 0 < e < e w u u u u u u u y y q e w e w q i q q q 0 e q e e < q e e e e e e e e e e e e p e w e e e e p e e e e e e e q 2 t q 2 q q t q q q q < < q q q < t t t q i t t t i q t 2 x z z z z z d.x f.f.x 8 8 i d.a.2 f.2 d.8 8 8 8 8 8 8 2 2 7 8 2 1 2 2 1 1 2 2 2 < 2 1 1 1 # o X . R PXPXPXPXPXPXIXPXPXPXPXPXPXPXPXPXPXPXPXPXUX.   . X       + + 1 + g 5.+.Z.G.F.ZXZXZXDXFXDXDXDXDXDXDXDXDXDXDXZXDXDXDXDXFXDXDXFXDXFXDXDXDXDXZXN.O.4.a @ 1 < 5 1 1 1 1 # 1 + + NXKXVX E NXCXVXVXCXVXVXCXVXBXR VXVXKXKXCX& # @ < @ < @ < 0 # % 4.G.AXDXKXFXAXAXAXAXC.C.r.5.>.#.f & .jXcXcXxXjXnXnXnXmXmXMXMXmXnXnXnXkXa 0 0 g r s e s e g a g = d {.*X;XL.$ % & N V Y.&X*X*X*X*X&XP.V * & b k O.n.n.n.Z.Z.n.n.A.A.A.A.A.n.A.N.n.A.S.S.S.S.S.S.S.S.S.N.N.",
-        "T.!.T.(.~.!.!.W.T l.SXSXl.x 5 ).(.W.(.!.(.Q.W.(.W.W.W.(.W.W.(.W.Q.(.W.W.+XW.+X(.W.W.XXW.+XW.W.+X+XW.+X+X+X+X+X+X+X+X#X+X+X(.(.(.OX).(.#X+X+X!.!.W.!.+X!.!.OXOXW.E.E.E.XXE.!.E.E.E.E.E.H E.E.E.E.K E.E.E.E.OXH E.XXE._ H K XXJ H E._ E.K _ F F F K F F F F K F F A A A A A A ! A A D F D A A A J L F A A A A K D A A A A A A A A ! A E A F ! E ! ! E ! E ! E ! ( ( E ( A A E ! ( R ( R F E S ( S E Q Q Q Q ( D ( E ! ( E ( ! ( k b ( j j j j E d d S S d d : d d : ; % 4 5 4 5 5 4 5 4 5 4 4 5 4 x g 4 4 g x g g g g g g 4 g g g t g s x t x s t q 0 q q q t q t q < 0 < @ < 0 q t u u u u y i q e q e q q q e q q q 0 q e q q e e e e e r e e e e e e e e e e e e e e e e e e e e e e q 0 e q q q q t q 2 q q q t q q < q < q i 2 i t t t t i 2 2 t z z x f.x z i x x x f.f.x x x a.x x 8 8 8 8 7 8 8 8 2 8 8 2 3 1 1 2 2 2 2 q 5 2 2 1 5 1 9 o   X . CXPXPXPXPXPXPXIXPXPXPXPXPXPXPXPXPXPXPXPXPXIXX . . X .   . + + + + 9 C.+.+.S.F.F.ZXDXDXZXFXFXDXFXFXFXDXFXDXFXFXFXFXFXFXFXFXFXFXFXFXFXDXDXDXZXZX+.O.) 1 # 1 1 1 # 1 1 1 # # & CXKXKXCXR  CXCXCXCXCXCXCXCXiXNXVXKXHXKXCX@ # # # 1 @ @ @ < # E 5.G.G.AXAXAXAXBXG.G.G.t.5.>.:.| : % jXjXjXjXcXxXnXnXnXmXmXMXmXnXnXnXnX = a 0 e k s c s s s w s s g XX&X&XB N S $ C U.&X*XY.Y.U.U.L.V N X X E k o.O.5.n.5.n.n.n.Z.n.A.n.A.A.A.A.Z.A.S.S.S.S.S.S.S.S.S.S.S.",
-        "7X!.T.~.E.!.E.x l.SXSXv.l.j.a.3 !.(.(.(.(.(.W./.W.W./.(.W.(.W.W.(./.W.W.W.(.+XW.W.W.XXW.W.W.XX+X+XW.+XXXXX+X+X+X#X+X+X#X+X#X#XOXOX+XXXXXXXOXXXOXW.OXW.W.OXW.W.OXE.E.XXE.OXXXE.E.E.E.E.OXE.E.K ~.E.E.E.E.OXH J _ ' J _ E.K E.H XXE.H XXJ K F F F K F F F F K F F A D F F A A A A A A D A D A F L J L J S F F A F K A A A A A S A ! A E A E ! E ! ! E ! ! E ! E ! ( A ( E ( ( R ( E ! E V V J A : S ( k S S : ! E A ( S ( E ( ( h b j j ( k E T ; S T S : ; ; ; S d ; d 4 5 4 5 5 5 4 4 5 5 4 5 g g 4 x g g g g g g g 4 4 4 P 4 4 4 g g x g x w s q g q q t q q q 0 @ < < 0 < e < < 0 t u i u t q q e e q q w q q q q e q 0 e e q e e r e e e e e e e r e e e e e e e e e e e e e e e e < 0 0 q q q q q q q 2 q 1 q q q < q q q 2 2 i i q t t 2 t 2 z z x z f.u x x f.f.x x x f.x x x 8 8 7 8 8 7 8 7 8 8 2 2 8 2 2 2 1 1 < 2 5 2 2 1 5 1 9 1 + .   &   KXPXPXPXPXPXPXUXPXPXPXPXPXPXPXPXPXPXPXPXPXIXX . . o       o + + + + g.Z.N.S.F.ZXZXDXDXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXDXFXFXFXDXZ.O.j # 1 + # 9 # 9 # + + + & VXKXKXKXNXR NXCXCXCXBXCXCXCXkXCXVXVXVXVXCX5 @ # + & + # 1 # # b C.G.e.4.^ : f f : NXNXe.  NXk.e.V.%Xk.%XV.k.JXnXnXnXmXmXMXmXnXnXnXcX = 0 s r g s s s s p s w w a ( I V B N & & C }.*X*X*X}.J.B C V N X X f j  .O.n.5.n.n.5.n.n.A.n.A.n.A.A.A.A.A.A.S.S.S.S.S.S.M.S.S.S.",
-        "~.!.~.).!.OX l.SXSXzXh.h.v.l. 5 E.).#X#X#X(.W.(.W.W.W.W.(./.(.W.W.W.W.W.+XW.W.W.XX/.W.W.W.+XW.XX#X#X+X+X+X+X+X+X+X+X+X+X#XXX+XXXXX+X%XXX+X!.XXOXW.XX!.W.W.OXE.OXE.!.XXE.E.E.!.E.E.E.E.E.E.E.E.E.E.E.K E.' J E.J E.E.F E.J ' XX' E.XXK H F H F F F H F F F F F A K A A A ! K D A A A A A A L J S J S F F F F A A K K A A A A A A A F A A A A E E ! ! E ( ! ( ( E ( ! D A ( ! E ! E G G J J J S ( D f S d S S E S S ( E ( f ( ( ( ( ( k E S S S : N : N S : % ; % ; % % 4 5 4 4 4 g 5 5 g 4 4 4 g g g g g x 4 g 3 4 4 4 4 4 4 4 4 4 t g 8 g g t q q q q q q q q < 0 0 q < q q < q 5 a < q u g 0 q e q e q q q e w q q q 0 q q q e e r = r e e r r e e e e r e e e r = e e = e e < 2 5 < < q 0 5 q q q 2 q q q t q q 0 q q < < 2 t 2 2 t 2 t q 2 t x z z z x z z u x x x x 8 8 8 7 8 7 7 7 7 7 7 7 7 7 7 8 8 3 3 3 1 1 5 t 2 2 2 2 2 2 1 1 1 +   . 4 . UXPXPXPXPXPXPXUXPXPXPXPXPXPXPXPXPXPXPXPXPXPX*   X .   .   + + + 9 + g AXZ.S.F.F.DXDXFXDXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXn.5.< # + 1 # < a < 1 < 5 # P CXKXVXVXVXCX NXNXNXBXiXNXNXNXCXVXVXVXVX%X%XI    R R d < # ) 2.( ; & # @ O @ @ ) &                         kXnXxXnXmXMXMXmXnXnXnXjX% @ 0 0 s s k w s p s s s s w a ^ _ Q.J.* * B *X*X;X*X*XP.V C V * * o d M O.o.O.+.n.n.n.n.A.A.n.Z.n.A.n.n.A.n.A.S.S.S.S.S.S.S.B.S.S.",
-        "~.).(.!._  l.CXSXl.3 5 x  l.V. 5 E.#X).#X(.#X/.W.(.W./.W.(.W.W.W.W.Q.W.W.W.XXW.W.W.W.+XW.W.+XW.+X+X+X+X+X+X+X+X+X+X+XXX.XXXX+XXXXX+XXXXX!.OX!.!.W.OXW.W.!.E.E.E.E.E.OXE.E.E.E.OXE.E.E.E.E.E.E.E.E.E.E.E.J K _ XXH XX_ E.J H K XXH F H F F H H F F F F L F F A A A A K ! A F A A K A A F J L L L J F F H F H F K F F F F A A A A A ! E S A A E ( ( E ! E E ( ! ( ! E ! ( R R E J G G G J G G S ( S ( S S S S ( S S ( f E ( f ( k f S S d d S S : T S S & % ; % ; ; % 5 4 g 5 5 4 4 4 5 4 5 5 x g 4 g 3 4 4 P P 4 4 P P 4 4  4 4 4 x g g s x g q g q g a a 0 a 0 0 < 0 0 0 < < 0 0 5 < a < q q e e q q w q i q w q e e q q e e e e e r e e e e e e e e e e e e e e = e e e e 0 3 7 3 7 5 < 0 q q q q q t 1 q < q < 2 2 t 5 q 2 2 2 2 q 2 2 2 t 2 2 i x u f.x x x x x 7 8 7 7 7 7 7 7 7 8 8 7 7 7 7 8 7 2 2 3 3 2 8 8 8 2 1 q 1 1 1 9 # 1 +     * . IXPXPXPXPXPXPXIXPXPXPXPXPXPXPXPXPXPXPXPXPXIXX . X         o 9 9 1 + 1 BXS.S.F.ZXDXDXFXFXFXFXFXFXFXFXFXFXFXFXFXFXLXLXFXFXFXFXFXFXFXFXFXFXFXFXZX+.C.< 1 + 1 1 d k.%X%X%X%X X.HXVXVXVXVXVXNXNXNXNXNXNXNXiXNXNXVXVXVXCX X XvXvXvXNXNXNX a @ ; @ # # # # @ # @ @ g.*                         bXjXjXxXmXMXMXnXnXnXxX a = 0 s s e c s s s k w s s s 0 0 f g E N V I.*X*X;X&XY.L.N C N * X X a p o.n.o.n.n.n.n.A.n.n.A.A.H.A.n.A.A.Z.N.S.S.B.S.S.S.S.S.M.S.",
-        ").!.).S   8 7 5 % NXVX 5 4 g 5 P 5 (.#X(.#X#X#X(.(.W.W.(.W./.(.#X!.XXXXW.G L.W.W.W.W.W.XXW.W.W.+X+X+X+X+X+X+X+X+XXX+X+XXX+X+XXX+X+XXX+X+XXX+X+X!.XXW.W.OXW.XXW.E.E.E.E.W.E.E.E.E.E.OXE.E.E.E.E.K E.E.E.~._ E.E.K ' H E.K XXK J E.H F F H F F H H H F H F F F F F A A A A A A K A K A A G L J J J F H L J F F F F F L F A F A F A E A F A A A A E ! ! ! ( ! ! ( A ! ( E E R ! J V J G J V J G J S S S S : S S E D E D E ( ( ( k ( E E S S S S N S N N N S & ; % % ; @ 5 4 5 4 4 g g 5 d 5 d 4 4 4 4 P 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 g s g q 5 a 0 a a a < a q 5 0 q < < 0 0 < q < q 0 q q e q < q q q q q q q e < e e < e e e r e e r e r e e r e e r e e e e e r e e e 3 8 3 3 3 3 7 3 1 q 5 0 < q q q t q q q 0 < 5 2 2 i i 2 2 2 2 2 2 2 2 2 2 2 u x 8 8 8 7 7 7 7 8 7 8 7 8 7 7 7 7 8 8 7 7 7 2 3 2 7 8 x 2 5 5 2 2 2 1 1 1 1 # o * Y * * UXPXPXPXPXPXPXUXPXPXPXPXPXPXPXPXPXPXPXPXPXKX. X . X X + . + + 1 9 9 1 ) DXS.F.F.DXDXFXFXFXFXFXFXFXLXFXFXLXFXFXFXFXFXFXFXLXFXLXFXLXFXFXFXFXFXF.t.BX# 1 1 # #  CXCXBXkXbXvXvXvXHXVXVXVXCXCXiXkX%XNX NXV.%XNXVXVXkX X X:X1XvXvX1XCXCXNXT # @ @ # # @ @ @ @ 0 < V.#                         zXjXjXlXcXMXmXnXnXnXxX @ 0 0 k s w s s e p s e s w s s s 0 = = S V U.Y.*X&XL.V C N $ * O X o f k o.o.n.O.b.n.n.n.n.n.n.n.n.A.A.A.n.Z.N.S.S.S.S.S.S.S.M.S.S.",
-        ").).!.(.(.).~.(.P CXIXUXVX N (.#X).).#X(.#X(.(.(.(.(.+X(.(.W.(.OX+X#X+X!.XXQ.V V G E.XXXX+XW.+XXX+X+X+X+X+X+X%X%X+XXXXX+X.XX%X%XXX+XXXXX+XOXOXXXOXW.W.OXXX!.W.OXE.E.E.E.W.E.E.OXE.E.E.E.E.K E.E.E.E.E.~.E.E._ _ K ' J F XXK XXE.H J F F H J H F H H F H F H F H L F F S F F F A K A A L H L H H F H F F H F J F L F F F A F A E A F A A S J S F S ! ( E ( E ! A ( A ! R R R J J G J G G J J N J S S S S N S S S A A ( S E E E S E E S S T S N - N S - N N N & & ; % % 5 5 % 5 4 4 4 4 4 4 4 4 4 4 P 4 4 4 P 4 4 4 4 T 7 T 4 4 P 4 4 4 4 4 s g g 5 g a 0 g a < < a 5 0 < a a < 0 0 < q 0 0 0 < ; 0 0 0 0 0 0 a q 0 0 0 0 q 0 0 e q 0 q 0 e e e r e e e r r e e r e = e e e e e 3 3 3 3 3 3 3 7 3 3 7 5 < 0 < q q 2 t q q 5 5 2 < 2 2 2 2 2 2 2 2 2 2 2 2 8 7 7 7 8 7 7 7 7 3 8 7 7 8 7 8 7 7 8 7 8 7 7 8 8 8 4 8 8 8 8 5 2 < 2 1 1 1 1 9 + 9 cXxXxXC  IXPXPXPXPXPXUXPXPXPXPXPXPXPXPXPXPXPXJXbXbX*   .     % X o + 9 9 1 1 < BXF.F.F.DXDXFXFXFXFXFXFXFXLXFXFXFXFXFXFXFXLXFXFXFXFXFXFXFXFXFXLXFXFXN.DX) + 1 + 1 @  CXVXkX XvXvXvX:XkXVXVXCXVXCXiXk.%XV.NXkXe.V.V.CXkX.. X:XvXvXvX$XVXCX%Xg # @ # @ @ @ # @ < < q V.*                         kX.XjXjXjXmXmXnXnXnXjXd < 0 0 w s s s e s e s s s s s e s : e = ; N C L.L.V R.C N $ * * X X X R p o.o.n.b.n.n.n.n.n.H.n.n.n.A.n.n.A.A.n.A.S.S.S.S.S.S.S.S.S.",
-        "(.#X#X(.(.(.(.).P k.CXVXV.^ 4 #X#X#X#X#X#X(.(.#X(.).(./.(./.W.(.#X(.OXOXOXW.W.E.'.J E.Q.W.W.W.+XXXW.XX#X+X#X#X+X+X+XXX+XXX+XXX+X+XXXXX+XXX+XXX+XXXW.OX!.W.W.E.#X#X!.XXE.E.E.W.E.E.E.E.W.~.E.E.E.E.K ~.E.E.~.E.H E.XXH XXE.J E.H E.F F H F H H F H K J F H J H H H H F F L F D F F A F D T.H G L F J L H L F F L F J F F F F A F F F J G A L A A A A A E ( ! ! ! ! ( ( ! ( R _ G V G V J V L G J J G J S S S S S S S S A S ( A S A S S T S S S S N N N % N S - N N ; % : % 5 5 5 g d 4 4 4 P 4 P 4 P 4 4 d 4 4 4 4 T 4 4 P x 4 4 g 4 4 d d 4 4 l s a a q a < a a 0 a 0 0 q < < a 5 0 0 0 0 < a 0 0 0 0 0 0 0 0 @ 0 0 0 ; 0 = 0 0 = < 0 = 0 0 = 0 e e e e e e r e e e r e e e e 0 5 2 3 3 3 3 5 3 3 3 7 7 7 3 3 5 < q q < 2 t < q < i i 2 2 2 2 2 2 2 8 7 3 7 7 7 7 7 7 8 3 8 7 8 8 7 8 7 7 7 8 7 7 7 8 7 3 8 8 8 8 2 3 2 3 2 2 2 2 1 1 9 + 9 Y xXxXxXxX* R UXPXPXPXPXIXIXPXPXPXPXPXPXPXPXPXPXMXnXnX*       . o .Xj.+ 9 1 1 + 1 k.AXF.F.F.DXFXFXFXFXLXFXLXFXLXFXLXLXFXLXFXLXFXLXFXLXFXFXLXFXFXFXLXF.F.AX1 1 # 1 # # ^ %XVXCXvXvXvXvX X X XkXCXVXCXNX%Xk.iXiXk.%XkX%X$X X. X1XcXvXvX1XHXVXVX d @ 0 @ @ @ @ < = < e < k.#                         kXY Y jXjXjXnXjXjXjX < 0 g a e s s s s s w s s s w s w p e r ; f V C N N C C C N & + * + o & b r o.o.b.b.O.b.n.n.n.n.n.n.Z.A.A.A.Z.n.A.A.A.S.S.S.S.S.S.S.S.",
-        "#X@X). 8 3 x 7 3 g  l. 7 9 1 5 d % ).(.#X)./.>X(.#X/.(.W./.(.#X#X#X#XOXXXXXE.J Q.XXQ.W.W.XXXX+XXX+X+X+X#X+X+X+X@X+X+XXX+XXXXX+XXXXX+X+XXXXX+X!.OXW.W.!.XXOX@X@X%XOXXXE.E.E.E.XXE.E.E.E.E.E.E.E.E.E.E.K E._ E.E.J E.K K Q.E.G F H H F H F H H H H J H F H H H G L T.L J F F F K A A K H G L H F J H L H F F F F F F A A A F A G L G L G G J S A A A A ! ( E ( A ! ! ^ R E G G J V J G G N N G N S N L S S S S S S S S S S A A S A S S N S N N N N L N - S N N : % % % 5 & % 5 4 g 4 P 4 P 4 4 4 P 4 4 4 d x P 4 4 g 4 g d 7 4 4 d x P d 4 P ; 5 a a a a 0 a < a < < a a 0 < < < 0 < a 0 0 a 0 0 0 0 ; 0 ; 0 0 0 ; 0 0 = 0 0 0 0 0 0 0 ; 0 a < q q 0 e e e e e r e r e r r e q 3 5 3 3 3 3 3 3 3 3 3 3 3 3 8 3 3 3 q q q < 1 5 < 2 2 2 2 2 2 2 7 7 7 7 3 8 8 7 7 8 7 7 8 8 7 7 8 3 7 7 7 8  8 8 7 8 7 3 8 3 8 8 8 2 8 2 8 2 2 1 1 Y Y Y .XcXxXxXxXxXcX. & KXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXbXxXcXX         C nXxX+ + 1 1 + 1 1 V.DXF.ZXDXDXFXFXFXFXFXFXFXLXLXFXFXLXFXFXFXFXLXFXFXLXFXFXFXFXLXDXA.GXV.# # 1 # 1 #  VXVXHX$XvXvXvXjX X X.. X%X%X%XkXkXkX$X$X$X X X X X. XvXvXvXbXCXVXVXNX@ @ # @ < 0 0 0 q < q 1 k.#                         V.6 Y Y .j.  g < @ 0 0 e g s a g 0 s s 0 s w k 0 p c c p s = E /.Y.V C * * $ X * C * * & X ( k o.b.O.n.n.b.n.n.n.n.n.n.H.n.A.n.H.A.A.n.M.A.S.S.S.S.S.S.M.",
-        ").).).).OX k.SXl.l.7 2 8 8 j.l. d _ ).(.).#X#X).(.(.).(.(.+X#XOX#X#X#X@X#XXXQ.XXXXQ.W.XX+X+X+X+X+X+X%X+X%X+X+X%X#X+X@X+X%X+X+X#XXX+XXXXX+XXXXX#XW.XX!.OXOX@X@X@X@X#XOXXXE.W.E.E.W.E.E.E.E.E.XXE.E.E.K XXJ H E.E.' _ G E.E.E.K K F H F K H F F F H H H H H H J G G G G R.R.H F A A A H T.T.G G J L F H L H H F F F F F L J L H H G H V G L G G F A A D A A ( A ( E R R E G G G G G G J G J J J J J G N S N S S S S S J A A S S S S J N S S $ N L N N N N N L N N N & ; % 5 % % & d 4 4 4 4 4 4 4 4 4 4 d 4 4 4 d 8 P d 4 4 d d 4 4 4 4 % 4 4 ; % = 0 a a a a a a < a a 5 0 a 0 a a < 0 0 0 0 < 0 = 0 0 0 0 0 0 0 0 0 0 0 a ; 0 0 ; 0 0 0 0 0 0 q 0 0 < 0 0 e e e e e e e e = q 5 2 3 5 2 3 3 3 3 3 3 3 3 3 3 3 3 7 3 7 3 3 5 2 < 1 2 2 2 7 9 2 3 8 7 8 7 7 7 7 7 7 8 3 7 7 8 7 7 8 7 8 8 7 8 7 7 8 3 8 7 7 8 8 2 8 a.8 2 2 5 1 1 Y cXxXxXxXxXxXxXxXxXnX.X  X VXPXPXPXPXPXPXPXPXPXPXPXPXPXUXbXnXxXY . . . C jXxXjX+ + 9 9 1 9 x VXLXFXFXGXLXFXGXFXLXLXLXLXFXLXLXLXFXLXLXLXFXFXLXLXFXLXLXLXLXLXFXGXUX) + + 1 1 + + T VXCXCXBXkXvXvXvX X XU .. X X X. X X$X$XvXvX X$X X X:XvXvXvXNXNXCXCXNX& # # < # # @ < 0 1 < q m BXV.V.V.V.V.CX&           k.o X * # # # + # < = < a 0 0 s w e s 0 s s a s w s s p w w k ; E >X*X;XJ.C * * C N .lXY * X d p p p o.O.b.n.O.b.n.n.n.n.n.n.n.A.n.A.n.A.A.S.S.S.S.B.S.S.S.",
-        "-X@X).).#XXX l.SXSXzXh.l.v.l. 4 XX).>X<X+X(.).(.(.(.#X(./.#XOX#XOX#X#X#XOXW.Q.E.Q.XXW.+XXX+X+X%X+X#X%X+X+X+X#X$X#X#X$X#X#X@X@X@X#XXXXX+XXXXX+XXX!.!.XXW.#X#X@X@X@X@XhX!.XXE.E.E.E.E.E.W.E.Q.H E.E.E.H J J XXE.G H E.E.E.E.H H H J F H K H H H H H H H H H H H G G H G H T.H H H H D R.T.R.G L F J F H H F F F L F F A H L H H H G H G L G L G G F A A A ! ! E E ( R E G G V G J G G N G J G G V L S G N S S S S S N N N J J S J N S S N C N L L C S L J N N E N S % % 5 & 3 % 9 N 5 4 5 P 4 4 4 4 4 4 7 T x P 4 4 P 4 4 P % 4 % 4 ; P 4 ; 4 % ; a ; a a a a < a < 0 @ < 0 0 a 0 0 0 0 0 0 = 0 0 0 0 a = 0 0 0 0 0 0 0 0 0 ; 0 ; 0 0 0 0 0 0 0 0 q q q 0 0 < q q a 0 e e e e 5 2 5 3 3 5 3 3 5 3 5 7 3 3 3 3 3 3 3 3 3 3 3 7 3 2 5 9 3 3 3 3 3 4 7 7 8 7 7 7 8 8 7 7 8 7 7 8 7 8 7 7 8 7 8 8 7 8 8 8 8 8 7 2 8 a.8 2 2 8 2 2 2 9 Y xXxXxXxXxXxXnXxXxXxXxX*   . NXPXPXPXPXPXPXPXPXPXPXPXIXKXvXxXxX.X.X.XjXjXxXxXxX9 + 9 1 + 2 V.o .   .     KXDXGXGXGXUXLXFXLXLXGXLXLXFXLXFXLXLXLXFXLXLX.     .   . V.+ 1 + 1 1 + T NX %Xe.kXvXvX:X X.'.. X X:XvXvXvXvXvXvXvX1X X1X X X%X$XvX%X  %XV. & < # < @ @ @ q < e < < < 0 @ @ + # o  &           e.o o O + # # = 0 0 0 e a e 0 s s 0 e 0 g 0 e a s w s p p s e = f L.*X*X*X&XU.V C N C Y jXcX3 & f c M o.O.b.n.o.b.n.n.n.n.n.n.A.A.n.A.A.A.M.M.S.S.S.S.M.S.M.",
-        ").).<X).).-X#X8 v.SXSXSXv.l.a.9 W.(.).).(.(.#X/.#X=X(./.(.(.#X@X@X#X#XOX#XE.XXXXXXW.XXXXXX+XXX%X+X+X+X+X+XOX+X%X@X+X+X@X@X@X@X@X).(.+XXXXX+XXX+X+X+X!.OX#X#XOX@X@X@X%XuX@XXXQ.XXQ.E.E.Q.Q.E.E.E.E.E.E.E.Q._ J _ E.Q.Q.G H E.R.R.E.H H H H H H E.H K H H H H H H H G T.H H G T.T.R.R.T.R.R.R.G G G L F L L F L F F F J L L L H H G H H G G G G H J J L A D E A D ( R ! G G J G J V J J G G J N S J G N N J N J S S L N L N S S S S L N C N - N N N N N N N N S P T T N S % % & % % 5 4 4 4 4 % 4 P 4 d d d 4 4 4 4 g d 4 % ; 5 % 4 % 5 P 4 P % % % ; ; @ < a ; a < 0 @ 0 ; 0 0 = a < a < 5 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 q < < q < 1 < 0 q q 5 3 5 2 3 3 3 3 4 7 5 3 3 3 3 3 3 3 3 3 3 3 3 3 3 7 5 3 9 3 3 3 8 7 7 7 8 7 7 7 7 7 7 7 7 7 7 7 7 x 8 7 7 8 7 8 7 7 7 7 3 8 8 8 2 8 a.8 2 2 1 1 9 Y cXxXxXxXxXxXxXxXxXxXnX.X    . VXPXPXPXPXPXPXPXPXPXPXPXKXjXcXxXcXcXcXxXxXxXxXxXxX* + + 1 9 V.            GXAXAXGXGXGXLXLXLXFXLXGXFXLXLXLXLXLXLXLXLXLX            V.+ # + + + + 5 R    ^ %X.XX U .. X XvX:XvXvXvXvXbXvXvXvXvX X X_ T P R R  R ^ E # # @ # < < 0 < @ 1 q < 0 < @ 1 # + o ) &            o o + # # @ 0 0 0 = < 0 0 a 0 a s s 0 g s a c k e p s w s k e 0 _ I.*X*X*XY.L.C C N & 6 Y * X : c M o.b.o.o.m.n.n.m.n.n.n.A.n.n.M.A.n.n.M.M.S.S.S.M.M.M.M.",
-        ").-X).-X-X).).).P l.SXSXl.8 % W.(.#X(.(.(.(.).(.(.(.#X/.(.(.#X@X@XOX#X#XOXW.XXW.+XW.XXXXXX+XXX+X+X+X+X+X%X+X@X+X$X,X@X@X@X@X,X@X#X).OXXX+XXX+XXXXX+XXXOX@XuX@X@XuX@X@X@X@X@X%XOXE.Q.XXE.XXE.E.E.E.E.E.E.E.J J Q.Q.E.E.G E.R.R.R.R.R.H K F H H K H K H H H H H R.H H H T.T.H T.G R.R.R.R.T.R.H L G H H L L F L F L F F F H T.G H H H H R.H G L G J L L G J A ! E ! F J G V J G G J J J G N G J G L J N G G N S N G N N L N L S J J N N L - N N L L N L G S N T T T T P T N 4 3 % % & % 5 4 P P 4 4 4 P 4 4 % 5 d g P P T d 5 % 5 ; 5 ; ; % P 5 4 ; ; ; ; ; @ a < 0 a a a a a a s g 0 0 0 0 0 0 0 0 0 = < 0 0 0 0 0 0 0 0 0 0 0 a < 0 0 0 0 0 0 0 q q < q q < < 0 < < < < < < 5 3 5 3 5 5 5 5 3 3 3 3 7 5 4 3 3 3 3 5 3 3 3 3 3 3 7 3 3 9 3 3 3 3 3 7 7 7 8 3 8 7 7 7 7 8 8 7 8 7 7 7 7 8 7 8 8 7 8 7 7 8 7 8 8 8 8 a.8 8 8 2 2 1 1 6 cXxXxXnXnXxXxXxXnXxXxXxXY      PXPXPXPXPXPXPXPXPXPXPXKXjXcXxXxXxXxXxXxXxXxXxXxXjX9 9 1 1 k.            AXG.SXAXGXGXDXZXDXDXGXAXDXDXDXZXDXGXFXGXFXGX            V.+ + + + # + @ E E R T T 5 5 # T U .. X XvXvXvXvXvXbXbXvXvXvXvXvXvX.5 X X & 5 N T & + # # # # # @ < @ < < < < < @ @ 1 # # ) &           k.o o + # # @ 0 = 0 0 q 0 a 0 s = s a 0 0 a e s w w p w w s w 0 = d _ Y.Y.L.L.V C & * * X X X X O g p M o.o.b.b.b.n.n.n.n.M.n.M.n.M.M.M.A.M.M.M.S.M.M.M.M.B.",
-        ").-X-XgX).-X-X-X-X3 a.l.7 4 (.W.(.).#X).#X).#X/.(.(.(.(.#X/.#X@XuX@X#X#X+X(.OXXXW.XXOXOXXX+X+XOX+X+X+X+X@X+X+X,X<X@X@X+X@X<X,X1X@X@X).+X+XXXXX#XOXXXOX@X#X%X@X@X%X@X@XOX@X@X@X@XW.E.E.E.H E.E.E.E.E.E.Q.Q.Q.E.E.G G Q.E.E.R.R.R.R.E.!.R.H K H H H E.H H E.R.H G T.G G H G T.H T.R.T.R.T.T.T.T.H G H H H H H F F F F L H G H T.H H H G L H G G H J J G G H H H A F F V G G G J V G G J N G S G S J N L N G N L G G N L N N N N L L N G N N G N N N N N N N S P S N _ S T T P P N 5 N & % 4 5 % 4 4 5 ; 5 % % 4 d P d g d T ; % 5 N 4 P 5 5 ; ; d @ d a d f f g f f f g f f g s f g a 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 q q t q t q q q q q q < 0 < < 5 5 2 5 2 3 3 2 3 5 5 5 3 7 2 3 3 3 3 8 3 3 7 3 3 7 3 3 3 3 9 Y 3 7 3 3 7 8 7 8 8 7 8 7 7 7 7 7 7 7 7 8 8  8  8 8 8 8 8 7 2 7 7 2 a.2 a.8 2 2 2 1 + 9 cXxXxXxXxXxXxXxXxXxXxXxXjX* T KXPXPXPXPXPXPXPXPXPXPXUXE Y cXxXxXxXxXxXxXxXxXxXnXnXxXY + 2 k.            VXj o.o.C.C.DXGXGXFXGXAXAXDXGXDXDXG.M.Z.C.GX            V.+ + + 5 P T E  U  _ P P P P P '... XvX1XvXvXbXbXbXbXbXvXvXvXvX X.P 9 & & & 4 4 % @ 5 < 0 1 @ < < < @ < < < < @ < # # # ) *           e.o o O # # # e 0 0 0 = 0 e s 0 w a s = s 0 s e e s a s w w w = = ; T & C C * * & O X X X X * X O & f p p p o.o.b.b.b.n.m.n.m.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
-        "-XgXgX8XgX-X-X-X).-X_ T _ (.(.(.#X).#X(.(.(.(.(.(.#X(.(.(./.@X@X@X@X%XuX(.#X+XW.XXXX+XW.+XXX+X+XOX+X+X#X@X@X@X@X@X@X,X@X,X,X@X@X,X@X).+XXX#XXX#X+X(.@XOX@X@X@XrX@X@X%X@X@X@X@X@X@XE.E.OXE.E.E.E.E.E.E.Q.W.Q.W.R.R.E.R.R.Q.Q.R.~.T.~.T.~.T.K H H H E.K R.~.R.~.H H H T.H H T.T.G H T.R.R.T.^.^.2XT.H H T.H H T.H 2XH H T.H H T.H T.H G G H G L G G G G H G L T.G G G G V G G J J G J N J J J J L J L N G L N N G S L G N L N N N N N L V N N L G N N N L S N T T T N E P N P T T N 4 N ; 4 4 4 5 N % ; 4 % d 4 T d T d d d 4 T 4 4 4 4 d 4 4 d d d f f g f f d f f g f g a g s a g a 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 e 0 0 0 0 q 0 q q t w q q q q q 1 q q q < < 5 2 5 5 5 2 8 3 5 5 3 3 3 3 3 3 3 5 9 3 3 3 3 3 3 3 3 7 9 3 6 9 3 6 3 7 7 8 8 8 8 7 7 7 7 7 7 7 7 8 7 7 8 7 7  7 a.7 7 8 7 8 2 7 2 s.a.2 8 8 2 2 1 9 6 cXxXxXxXxXxXxXxXxXxXxXxXxXjXUXPXPXPXPXPXPXPXPXPXPXKXP . `.cXxXxXxXxXxXxXxXxXxXxXnXxXjX+ 9 V.            VX) e.V.VXAXAXGXAXVXBXBXBXVXDXGXDXGXGXGXLXUX            V.o + X R  NXNXkX X X....Y U U . X X X1XvXvXbXbXbXbXbXbXvXvXvX:X XU U I .. X$X%X%X%X  E @ < # < < < @ < < # 0 @ @ <  &           k.o o # # # = 0 < 0 @ @ e 0 0 = 0 0 a 0 g 0 0 w 0 0 w g 0 e 0 0 = = g 8 a.1 + 9 2 9 + 9 9 & & & X $ & T b n M o.o.b.m.O.b.n.m.n.N.M.M.M.M.M.M.S.M.M.M.M.M.M.",
-        "gXgXgXgXgX-X).-X-X).@X@X).(.(.(.(.#X).#X<X(./.#X#X/.)./.(./.@X@X@X@X@X@X+X#X(.+X#X#X+X+XXX+X+X+X+X+X@X@X@X@X,X,X,X,X,X,XhXhX,X@X@X@X#X#X+XXX#XXXOX#X@XOX@X@X@X@X<XiX,X@X@X@X@X@X@X@X+XE.!.E.!.E.E.E.W.Q.Q.(.Q.!.E.R.E.Q.Q.Q.R.R.~.T.!.R.!.T.~.H H H R.H R.H R.R.T.H H T.T.H H T.T.H T.T.^.^.^.^.^.^.T.T.T.~.~.T.T.T.^.T.T.T.H H G G T.L H H G H G G T.G G T.H G G G G J G J J V J G G J L J V J V G G G V L G G G N G G V L G G G N V L S G N N L N N N N T T _ T E S E _ T T P T T T P d N N 4 4 5 % % 4 d d d 4 d d d d d R g d d d 4 d g d d d f d f f g f g f g f f f g f g a 0 a 0 0 0 0 0 @ 0 0 0 0 0 0 q q 0 w 0 e 0 0 0 0 0 0 e q 0 0 e w w w w w w w w w w w 1 q 1 2 < 2 2 5 5 5 5 3 2 3 3 3 5 5 3 3 2 3 3 3 7 7 3 3 6 6 7 7 7 7 3 7 3 7 3 7 8 7 8 7 a.a.7 8 8 7 8 7 7 8 8 7 7 8 a.7 7 8 8 8 8 6 2 8 a.7 2 s.2 2 9 1 9 @ Y cXxXnXxXxXxXnXxXxXxXxXnXxXxXHXPXPXPXPXPXPXPXPXIXCX* . . .XxXxXxXxXxXxXxXxXxXxXxXxXcX6 + 1 k.          . CX^ ) 4.C.BXVXBX) R 5 1 g d R k.VXGXKXGXDXLX            k.o o # ^ kXNX%X$X1X:X X|..'.'.`.U . X XvXvXvXvXvXbXbXbXbXvXvXvXvX X XU . X X:XvXvXvXNXCXBXCXR 5 # 1 # 0 0 < < < # @ 1 @ < ) &           k.o o O # = @ < @ e @ e @ < 0 0 0 0 0 0 w = 0 0 = 0 0 = < < < @ @ @ 4 f.h.a.9 f.a.f.2 a.3 P % T 4 & & & 4 R Q M o.o.o.o.n.b.n.O.n.m.N.M.M.M.M.M.M.M.M.M.M.M.",
-        "gXdXgX8XgX7X-X-X-X)._ 4 _ ).(.(.#X(.#X).#X(.).#X(.(.(.(.(.(.@X@X@X#X@X#X+X#X(.+X+X#X).#X+X+X+X<X@X@X@X@X,X,X,X,XhX@X,X,X,X@X,X,X@X@X#X).OX+X+X#X+X#X#X@X@XuX@X@X@X@X@X@X@X%XuX@X@X@X@X#X!.E.E.E.E.E.E.W.W.(.(.W.Q.Q.Q.Q.~.Q.Q.T.T.!.T.!.T.!.T.~.E.H ~.E.R.H R.~.T.H T.H H H T.H H T.T.R.^.^.^.^.^.^.^.^.^.T.T.T.T.~.T.T.T.T.H T.T.G G T.G H G T.T.T.G G T.G T.G J V G G G E.G G G G G G G V J V G G G J J G L G V L L G N G G V V L G L G N L N N L G L J P T T N _ P T S P T T P P N d P 4 d P P % 4 % 4 d d d d T d T T f T g d d d d d d d d d d d g f d g f a f d f a g g g g a 0 a 0 = 0 0 a 0 0 0 q 0 0 0 0 0 0 q a 0 w e 0 w q 0 0 0 0 q w w w w w w w w w w w q < q 1 5 5 2 2 5 5 2 5 3 5 5 3 3 3 5 5 3 3 3 3 7 3 3 3 3 3 3 7 3 7 3 3 6 7 9 8 7 7 a.7 8 7 8 8 7 8 7 8 7 8 7  a.7 a.7 8 8 7 7 8 8 7 8 8 a.8 7 2 2 2 2 1 9 .XxXxXxXxXxXxXxXxXnXxXxXxXxXcX.X KXIXPXPXIXKXBXd .     . .XcXxXxXxXxXxXxXxXxXxXcX.XY + 1 2 V.            VXNXBXCXVXVXCX + + + + + + 4 V.CXVXKXUXUXUX            k.. o & R V.NX%X X1X X X X..U `.U .. X$X XvXvXvXvXbXbXvXvXvXvXvXvX... X XvXvXvXvX XCXCXVX @ @ 1 < < < < < < 1 @ < @ < ) &            o o + # # @ 0 0 < 0 0 e e 0 e a s 0 0 a 0 0 0 < a a a a b g  R l.l.l.f.a.9 s.f.s.2 8  R & b g f T 5 & & % T R ) M g.o.o.o.o.n.O.b.n.N.A.M.M.S.M.M.M.A.M.",
-        "hXgXgXgXgXgX-X-X-X k.k. N )./.(.<X(.#X(.#X(././.(.#X=X(.).@X@X@X@X@X#X<X).#X<X<X#X<X#X#X@X@X7X@X,X,X@X,X,XuX,X,X,X,XgX,X,X,X@X@X+X(.(.#XW.!.+X#X#X#X#X@XOX@X@X@X@X@X@X@X@XuX@X@X@X@X@X@X!.!.E.~.E.!.(.T.W./.(.).Q.Q.Q.T.Q.Q.~.~.R.~.T.~.T.T.~.Q.H H R.~.~.R.R.~.R.R.T.T.T.H T.H T.T.T.^.^.^.^.^.^.^.^.^.^.T.T.^.^.~.T.H H T.H G T.T.G J.T.J.G G G G T.H G G G G G G V G V G G G G R.G H H G G G G N G G G V V G G G N J G L L J G G N L G V N N N G N T P E P T T P A P A P P T S P T d P % 4 4 4 P d d d P d d d d d d T g T d T d 4 d d 4 d d g f d d d g d d f g f f a a a g a 0 0 0 0 0 0 0 0 a 0 0 0 0 0 0 0 e 0 w 0 0 0 0 0 0 0 e q e q w w w w w e i w w w w < < 2 5 2 1 g 5 2 5 5 8 3 2 3 5 3 3 3 3 3 3 3 3 7 7 7 3 7 6 7 7 3 3 6 6 3 6 3 8 7 7 7 8 7 8 7 8 8 7 a.8 a.7 a.7 7 a.7 a.8 a.8 8 8 8 8 8 8 2 a.8 2 2 2 2 9 Y .XcXxXxXxXxXxXxXxXxXxXxXxXxXcX.X* . * & & X .       .   . .XcXxXxXxXxXxXxXxXxX.X6 + + 9 1 9 V.            o . . X X . o k.+ + + + 9 + k.o o . . . o .             k.o o X P  NXkX.1XvX X X...U U .. X$XvX1XvXvXvXvXbXvXvXvX XvX X.'.. XjXvXvXvXvX XiXVXNX 5 + # @ @ @ < @ < # < < < q k.&           V.o o + # # 0 < @ 0 @ e @ @ 0 0 0 0 = < 0 = 0 ^ NXVXJXHXkXP   6 7 7 2 a.a.a.9 9 2 a.8 3 % * f s s k ) b f d @ & & & d g ( ) 4.o.b.O.5.n.n.Z.n.M.M.M.S.M.M.",
-        "gXgXgXdXgXgX-XgX3 l.SXSXl. 3 -X/.@X#X#X).).).).#X).).=X).).@X@X@X@X<X#X#X<X#X#X<X#X,X@X,X@X,X@XhX@X@X,X@X,X,X,X,X,X,XhX,XhX@X,X@X#X+X#X(.+X!.#X#XOX#X@X@X@X@XuX@X@X@X@X@X@X@X,X@X@X@X@XuX@X%XE.!.E.!.^.(./.(.(.).^.W.Q.!.T.!.T.T.T.~.T.Q.~.T.T.T.~.~.R.H ~.R.R.~.T.H ~.R.R.T.H T.T.H ^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.T.T.T.T.G G J.T.J.T.G T.G G T.G G G G G G G G R.V G G G G G G G R.G G G G G G G G L J L L V G J L V V J L V G N G J L G L V J J P T _ S E S S T E N P T T N P N d 4 P % % % d P d d d 4 T d d d d T f d f f d d d d d d d a d d a d f d d a f g d g g a a a 0 0 0 0 = a 0 0 0 0 0 0 0 0 0 0 e e 0 w w 0 w 0 q 0 q e 0 q w w e i w w w w w q w < < 1 1 5 5 2 5 5 2 4 3 5 5 3 3 3 3 3 5 3 3 9 7 3 3 3 3 7 3 3 6 7 3 6 7 7 7 7 7 a. a.7 7 8 7 8 8 7 8 8 8 8 8 8 8 a.7 a. 7 8 8 8 a.7 8 8 8 a.2 6 s.9 9 s.7 Y jXjXjXcXxXcXxXxXxXxXxXxXxXcX.X*                   .   * .XjXxXxXxXxXxXcXjXY + + + + 9 1 9 k.                          k.+ + + 9 9 1 V.      .                   k.o . X  NXCXCX.$X:X X X.XU Y '.U '... X XvX1XvXvXvXvXcXvX1X1X X.... X1XvXvXvX1XkXKXHXBXR @ # # 0 q @ @ < 1 + @ < < < k.#           e.o o + # # = < 0 0 @ @ = 0 0 = 0 0 = = 0 R CXJXJXJXUXJXHXOXkXHXJXJXJX%XP 8 d.d.d.a.8 6 4 % % 5 s s p j p o.M ) ) R f @ S N N N S ( o.5.5.Z.Z.Z.M.M.M.M.M.M.",
-        "gXgXgXgXgXgX-Xx l.SXSXv.v.l.a.7 (.@X,X7X@X).).).=X).).).).@X@X@X@X@X#X@X<X#X<X@X#X-X).@X,X).@X,X@X,X,XhX,X,X-XuXuX,XhX).hX-X,X#X#X#X#X(.#XW.#XOX#X#X#XOX%XuX#X@X@X@X@X@X@X@X@XuXrX@X@X@X@X@X@XOXE.E.!.(.(.(.(././.(.(.T.T.!.R.!.Q.~.T.~.T.~.T.~.~.T.T.~.R.R.R.R.R.R.T.R.T.R.T.R.T.T.T.^.^.^.^.T.T.^.^.^.^.^.^.^.^.^.^.^.^.^.T.^.J.G G J.J.J.J.J.T.T.G G G G G G G V G _ G G G R.G G G R.G R.R.G V L G V G V G G L G N G V L L V V L L V G N N G J J J E S T P T T P _ N E T T P T T T T ; N % 4 4 T N 4 T 4 T T T d T g T g T g d T g E 5 d d d d d d f f a g a f d d a d d a g f a ; e e 0 0 0 a 0 0 e 0 0 0 0 0 e 0 0 e 0 0 0 0 e 0 w 0 q q e w w w w w w w q w w w 1 < < 5 2 1 5 < 2 < 3 8 4 3 3 5 5 5 3 3 3 3 3 7 3 7 6 3 3 7 7 3 7 7 7 3 7 7 6 a. 8 7 7 8 7 8 7 7 7 8 8 2 8 8 8 a.8 8 7 a.8 a.7 a.8 8 8 8 8 8 8 a.s.2 2 s.2 7 9 6 Y `..X.X.XcXjXxXxXxXcX.X`.* . . o . . . . . . .   X `..XcXxXxXxXcX`.9 + + + 1 + + 1 2 V.                          NX+ + + + + 1 NX      .                   k.. o + ^ %XNXBXNX$XvX X X X.._.U Y _.. X$X X1XvXvXvXvX:X1X1X X X.U .. X:XvXvXvXkXHXVXVXVX @ @ @ @ < < < < e 0 q 0 0 e ) &           V.o o O # # < e < < 0 0 < @ 0 0 s 0 a 0 a  JXJXJXJXHXVX%XHXPXJXJXUXUXVX 3 f.a.8 6 7 & & ; : f k p p p o.M M p p p c c n c k E P C N 4.n.5.Z.Z.n.n.Z.n.A.M.",
-        "gXgXgXgXgXuX l.SXSXv.v.s.l.l.f.5 OX@X@X@XuX@X@X).#X).).).#X@X@X@X@X#X#X#X<X#X#X).-X@X,X,X@X).@X,X,X@X@X@X,X,X,X-X,X,XhX,XhXgX#X(.#X(.(.(.#X#X#X%X#X#X#X@XuX@X@X@X@X@X@X@X@X@X%X@X@X%XuXuX@X@X@X!.~.!././.(.)./.=X(.(.^.!.T.T.Q.R.R.Q.Q.!.T.~.T.T.~.~.T.~.H H ~.~.T.T.~.~.T.T.T.T.G T.T.^.T.^.T.T.T.^.^.^.^.).^.^.^.^.^.^.^.^.^.^.^.J.J.J.J.J.G T.T.J.G G V G G G G G G G G G G G G G R.R.H H G G G L L L L G G V L V L J G J L J J L L L G G G L J S P P _ P T N T E T S N T S P P P N N % N N N % P : d T d d d T d T f d d E d g d T f d d 4 d d d a a f d d f a a d d a d a a g a @ 0 0 @ 0 0 0 e ; 0 = e 0 0 a q 0 0 0 q e w 0 w 0 e q e w w q w q w w w q w w w < 1 1 5 < 2 5 5 1 1 5 5 3 3 3 3 3 3 4 5 9 3 3 7 3 6 3 3 6 6 7 6 7 7 7 7 7 7 7 7 7 7 8 7 a.7 8 8 7 8 8 8 8 8 8 8 a.8 a.8 8 a.8 8 8 8 8 8 8 2 s.2 2 2 2 a.9 8 2 9 2 9 9 9 9 B Y .X.X.XjX.X.XB + + + + + + + + + + + + o Y .X.XjX.X.XY + + + 9 1 + 1 9 1 + V.                        . k.o + + + + 9 NX.                         k.. o X E   %Xk.%XvX:X X..'.Y U N P Y U . X XjX$X$X1X$X X..Y Y '...1X:XvXcXvXNXBXBXCXVX # @ # # @ @ < @ @ < < < < < k.&           k.o o + # # # @ < = < < @ @ < 0 0 0 0 0 < b NXHXJXUXKX%XCXHXJXJXJXJXJXBXR % 3 3 9 & @ 5 T f R ) p p o.o.o.o.p O.M p c n ) s p k ) _ C E 5.n.Z.N.N.n.Z.N.Z.n.",
-        "gXwXhXgX7X l.SXCXl.8 3 x  k.NX) P ' @X).,X@X7X@X7X,X@X-X@X).,X@X@X@X@X-X#X<X-X<X,X-X,X@X,X,X,X@X,X,X,XhX@X@X,X,XhXhX,XhX-X,X).(.(.(.!.W.#XOXOX#XOXOX#X#XOX@X@X@X@X@X@X@X@X@X@X@X@X@XuXOX@X@X@X@X#X(./.).).=X).)./.(.).Q.!.~.R.Q.T.~.Q.R.Q.T.!.T.^.^.T.T.T.H T.R.R.R.T.R.R.^.G T.T.T.T.^.^.^.^.T.T.T.T.^.^.T.^.^.^.^.T.^.^.^.^.^.^.^.^.T.J.J.J.J.J.J.G G G G G G G G G G G G G G G R.H G R.R.R.G G V G V G G G H G J G G L N G L V V J V L S N G J N S T T S T _ S N E P _ S T T S N d S 4 4 d d d d 4 P d T d T g T d T f T g f E f f E T ; : 5 a ; d d d d a a d d f a d a a d a a ; @ < = ; a a a a s a 0 0 0 a 0 w 0 w 0 e 0 e q q q q q q w w w w q w q w y q w < 1 < < < < < 5 < 5 2 < 5 8 4 3 5 3 3 3 4 5 3 7 6 7 3 6 3 7 3 6 7 6 7 6 7 6 8 a.6 a.7 7 7 8 7 7 7 7 2 8 8 x m 8 8 a. a.a.8 a.a.7 a.7 a.8 s.9 2 2 2 a.2 a.2 2 2 9 9 9 1 9 9 + + Y B B B * + + + + 9 + + 9 9 + + + 9 + * Y `.`.`.Y * + 9 + + + 9 + 1 + 9 V.                          k.o o + + 1 9 V..                         k.o . o 5 R      X.U P Y 9 & & # + & & % P P P P P _ N 5 % & P P P U '..1X1XvXkX%Xk.%XV.NXR @ + # + # < < < 0 < 0 < < 0 ) &            o o o + @ @ < < < = = @ @ = = 0 0 0 0 0 a g R  kX  iXJXJXJXJXHXkX E f : f d ( ( ( ^ ) b c M M o.M o.p b.p p j Q _ _ k k k ^ T * T C.5.t.5.n.Z.n.Z.N.Z.",
-        "gXgXgXb g  4 8 3 d NXVX ; 4 4 5  8 hX,XhX,X,X@X,XuX,X@X@X,X@X@X#X@X-X@X,X,X,XhX,X,X,X@X@X,X@X,X@X,X,X,X,X@XhX,X,X,X-X,X-X,X).(.!.(.!.(.OX#X#XOX#X#X#X#X#X@XuX@X,X,X@X@X@X@X<X@X@X@X+X@X@X@X@X@X@XhX@X#X=X)./.).^.).)./.(.Q.R.R.R.Q.Q.Q.Q.T.W.^./././.T.R.R.R.R.Q.Q.T.T.T.T.H T.H ^.^.^.T.^.^.T.T.^.T.T.^.^.^.^.^.^.T.^.^.^.^.^.^.^.^.J.J.J.G J.J.J.G G G G G G G G G Q.G G G R.H R.G H R.H H G J V L L G G L G V J G C G G G G G N J V L N J S J _ T P S _ T P S S E T P E N T d 4 N N % d N 4 S % S d T T d f d d f T f f T T f f f E d T d ; d d d 4 ; d a d a d d d a a 5 : d ; @ @ @ ; a : s a a e a a e a a e 0 e w 0 0 w 0 e q q q q w w i e q w q w y w w e 1 1 1 < < 5 < 2 1 4 2 1 5 2 8 x 5 3 4 3 4 4 7 3 7 Y 3 7 6 6 7 6 6 3 6 6 7 7 7 7 8 a.6 7 8 7 a.8 7 8 8 2 8 ) m m z a.8 7 a.8 a.a.8 a.2 a.2 9 a.2 9 2 7 s.2 s.9 2 9 9 2 2 9 1 1 9 1 + 9 9 + + 9 + 1 1 + 1 9 9 + + 9 + + + + + + + + + + + + + + + + 1 9 9 CX                          k.o o + + + + V..                          o o + + % E P d 5 % * # + # # + 1 # + # # # & & 1 + + < # + + @ + # # @ % 5 P Y ._     R P @ + # # # < 0 < < 0 0 < < < g.& .          o o + + # @ @ = = @ < @ + @ a e 0 g 0 = = a = @ = @ @ <  k.HXHXVXHXe.( ( ( ^ ( ) ^ ) b l c o.M g.M b.M o.M c ) R L.L.L.R R E % * & 4.n.t.t.5.Z.Z.Z.n.Z.N.",
-        "gXgXgXgXhXgXgXgXS CXUXUXVX N ).@XuXhX,X,X@X,X,X).7X,X,X@X,X@X,X@X-X@X@X).-X,XhXhX,X,XhX@X,X,X,X@X,X@X@X@X@X,X@X,X@XhXhXuX@XgX-X#X#XW.(.#X(.(.XXOX(.#XOXOX#X#X,X,X,X@X,X@X<X@X@X@X@X@X@X+X@X@X@X%X@X%X@X#X(.(.(./.(.(./.).^.!.R.Q.Q.Q.Q.!.T.^./././.I.^.T.R.R.R.R.R.R.~.T.R.T.R.T.T.T.^.^.T.^.^.T.T.T.^.^.T.^.^.^.^.).^.^.^.^.^.^.^.^.^.J.J.J.J.J.J.J.J.J.G G G G G V R.G G G G V R.R.R.R.R.R.R.G G G G V G G G G L G G G L G L G L G G G J G J J J P T T P S P S _ P P E J T T S N S P ; S 4 4 % % 4 4 d T d T T T T T d T d f f d T d g f f f 5 d 4 : d d d ; d d d d d d ; d d d ; % ; ; ; a e g a s = s a e f e 0 e 0 q 0 w 0 w q q e q e q w w q w w w w p y p w 1 < < < 1 < 0 5 g 5 g 5 5 5 5 g x g 4 g 3 4 7 6 3 7 7 7 6 7 7 7 7 6 7 3 6 7 7 a.7 7 8 7 7  7 7 7 7 8 8 c M m M g.m f.a.a.a.a.8 8 9 7 2 9 2 2 2 2 s.s.2 2 2 2 a.s.a.2 9 9 9 9 1 1 k.k.k.k.l.k.k.k.k.k.k.k.l.k.k.k.l.k. k.k.k.k. l.k.k.k.x 1 1 1 + + 1 V.            CXe.%Xk.k.k. NX   k.k.k.CXk.k.k.V.k.k.VX            k.. . o + + 1 T k.k. k.k.k. < # 1 < 1 1 @ # 9 @ @ < # 1 + 1 # 1 # < x  k.   k. 5 N T T 4 # # # # @ # @ 5 < < 0 @ 0 < < ) &           k.o o O # = @ < g ; = 0 e # 0 0 a 0 s = a = s = 0 0 = 0 g e.V.BXNXBXNXNXV.V.BXCXNXBXV.V.V.BXC.V.C.C.o.o.o.M o. Q.L.U.U.K.C & & % R ) 5.5.5.C.n.5.5.N.Z.Z.Z.",
-        "gX8XgXgXgXgXgXgXP k.CXVXNXR P #XuX,XhX<X,X,XhX,XhX,X,XuXgXuX<XgX-X).-X,X<X-X,X-X<XhX,X,X,X,X,X@X,X@X@X,X,X@X,X,X@XhXhX@X-X-XuX,X<X#X#X(.(.OXOX#X+X#X(.).OX#X@XuX,X@X,X@X@X@X@X@X@X@X@X@X@X@X@X@XhX@X@X@X).)./.=X(./.^.).(.).Q.Q.Q.Q.~.T.T./.I.I.I.^./.I./.T.T.R.R.T.R.Q.T.R.T.T.T.T.T.^.T.^.T.^.^.T.T.T.T.T.T.^.^.T.^.^.^.^.^.^.^.^.^.^.G J.J.J.J.T.J.G J.J.V G G R.G G R.R.G G G G G R.E.R.H R.R.G N G H H H G L G G L G L G G L V G G H G L J J S S P T _ P A P E _ S S P N E P S P S T N 4 S N d S % S d T f d T T f d f d d d f d f E f E f f d d : d d d d d d d ; T d ; 5 d ; ; @ ; = a g = g a a k s a f e a w s 0 0 0 e q q q e q e q q w w w w w i w w w w w 1 < < < 2 5 2 5 t t 5 x x x g x x x g 4 g 3 7 6 6 6 3 6 3 6 6 7 7 3 7 6 7 j.7 6 6 7 7 8 7 6 8 7 6 8 2 x b M g.m m m g.f.a.a.8 a.a.8 2 7 2 2 2 2 s.8 a.2 s.s.9 2 9 2 2 9 2 2 2 1 3 k.X X X O X X X o + X X o O X O X X X X X * X # O X * O V.1 1 + 9 1 1 NX            k.. o . . . o NXX X * O X X k.1 9 1 + o X NX             o o o + + # k.& X X X X X NX1 1 # 1 5 < < 5 5 < < d @ @ @ a @ < @ < k.& X # X O X V.@ @ @ @ & # @ @ 1 < @ @ 0 a < q < 0 0 0 k.&           e.o o + # @ @ = a a ; a 0 a s s s 0 g e s e s 0 0 s a k ) R O X X * X X # * X X + X X # X X X X # CXM M M ) ' '.V L.V V C * ( n  .o.O.n.5.5.5.t.t.Z.Z.N.N.Z.",
-        "gXhXgX  4  7 3 8 x k. 3 9 3 5 4 7 hX,X,X<XhX,XgXhXgXhX-XhXhXgX-X-XhX-XhX-XhXhX<X,X,X,X@X@X,X,X,X,X@X,X,X@X,X,X,X,X-X,XhXgX,X#X#X#X!.!.+X(.(.!.!.OX#X#X#X@X,X,X,X,X<X<X#X<X#X@X@X@X@X@X@X@X@XhX@X@X@X/./.=X/.=X^.-X=X(.^.Q.T.Q.Q.Q.T.I.I./.^./.I.I././.W.T.T.T.Q.T.T.R.T.R.T.T.T.^.T.^.T.^.^.^.T.T.^.T.^.T.^.^.^.^.^.^.^.^.^.P.P.^.J.J.J.J.J.J.J.J.J.J.J.J.G G V R.R.G G G R.R.G R.R.R.R.R.R.R.H G L G G G G G G J G G G G G G H H H G L J J J P P E T P E P E N T J T A T S S E S E A A F F P ; 4 % S 4 d T T d d T d d T d T f E g g f f f E f d 5 5 : d 5 a d d d ; d d a 5 ; d ; @ ; g g s g k h h a e a a g 0 0 e e 0 0 0 e w q q q q w w w y w w w w w y p p w < < < 0 1 q 5 5 g x l l l x s x x x 4 5 3 7 6 3 6 7 6 6 7 6 6 6 6 6 7 7 7 6 6 a.7 7 7 7 7 7 7 a.2 2 m M ) g.M g.m v z m 8 a.2 8 s.2 2 2 2 2 2 2 a.a.a.2 2 d.2 s.9 2 s.9 2 9 2 8                                                        V.9 9 1 + 1 1 NX            kX. o . . o . k.            V.9 + + + + o              k.o o + X + # k..       .   V.1 @ 1 @ # 5 < @ < 5 < 5 @ ; @ & @ ; @ @ V.X           V.# # # # @ # < # @ # # # 0 < < 0 @ < < <  &           k.X X X O # = @ = = ; = = e 0 0 a = k ; ; 0 k e = k = g 4.N       .                               V.M p 4. ) ) ) M n ) ) 4. .o.o.O.5.5.5.Z.Z.5.t.n.5.t.Z.Z.",
-        "gXgXgXgX#Xl.k.SXl.l. 2 3 8 l.l. T XXhXhX<XhX<X,X,XhXhXgXgXhXgXhXhXhXgX<X-XhX-X,XhX<XhX,X,X1X,X,X,X@X,X,X,X,X@X,XhX,X-X,XgX@X,X(.<X#X(.W.(.#X(.(.!.OX).).).uX,X,X,X,X#X<X#X,X#X@X@X<X#X@X@X,X@X,X@X7X=X/.).I.I.I.I.I.^.(././.^.R.T./.I.I.I.^.=X/.P.I.^.^.^.^././.Q.T.Q.T.R.R.J.J.T.^.T.^.T.^.T.^.T.^.T.T.T.^.T.T.^.^.^.P.^.^.^.^.^.P.J.J.J.J.J.J.J.T.J.J.J.^.G G G G H G G G G R.G R.R.Q.R.R.R.R.G G G G L G H H G G L G G G L G L G H H J J J J P T T N E S S _ J T E S N _ E _ E J E A F _ A T P d T T d T T f f : d T d d f f f f f f f f f f f f d : 5 d d d d d ; d 5 d d d a f ; a f k h > h k h h s s a f e 0 e s 0 e 0 e w w q q q e q e w w w w i w w y w y p t q < < q < x s x l b x b x l m x x 5 x 3 3 6 6 6 3 6 6 6 6 7 6 6 6 6 6 7 7 a.6 6 7 3 7 7 7 7 8 8 c m M g.4.m M M m v z f.z 8 8 2 2 2 2 9 2 8 s.8 a.a.a.s.2 2 2 9 a.2 2 2 2 9 2 R                                                       NX+ # 9 9 < # NX            k.. . o . o o k.            V.+ # + + X X V.            k.. o o + + 9 V..           k.1 + 1 5 # 5 a < d 5 < a < 5 @ @ @ ; @ < V.X           V.& # # & @ @ < < @ @ 5 # < < a < < 0 < < k.&           e.o o + O @ & @ = = g f = g ; e k e = e : e e f s s : k  5                                       V.c c k p M M M M o.o.o.o.o.o.o.5.t.5.t.Z.t.Z.Z.5.Z.Z.Z.Z.",
-        "gXgXgXgXgX@Xf.l.SXSXv.l.v.l.l.a.4 OX,XhXhX<X<XhX,XhXhXhX-XgXhXhXhXgXgXhXhXgXgX,XhX<X<XhX@X,XhXhX@X@X,X,X@X,X,X,X@X).).,X-XhXgX,X#X<X<X#X(.#X(.#X#X#X).OXOX@X#X,X,X,X@X<X@X<X@X<X@X>X@X#X@X@X#X@X#X).-X-X=X/.I.I.I.I.I.I.^.).Q.^././.=XI.I./././././././././.^.T.T.^.T.^.J.J.T.Q.J.T.T.P.T.^.T.^.T.^.^.^.^.^.^.^.^.T.^.^.^.J.P.J.^.P.J.P.J.J.J.J.J.J.G J.J.J.G T.W.L.L.G Q.R.Q.R.R.R.R.Q.R.R.R.R.R.H G G H H G H H J G G L G H G H G H G H H J H T S P _ E P P _ S T E J _ S A A S J A J F F F F S d T T f T S : S E S E : d f d d d f E f E f f f f ( f T d d d d d d d d : : f f f h > h k k h k h r h h > s a g a s e s w s e q q q w e q q q i w w i w w w w w y p u l < < q 0 y l c b l l l x b x l x b x g 6 6 6 6 6 6 6 6 6 6 6 6 7 6 7 7 6 6 6 7 a.6 j.7 6 7 7 8 x M 4.M M M M M m v m m z z f.i a.2 2 8 s.2 a.a.s.2 2 a.9 a.2 2 2 2 9 2 2 9 2 2                                                        k.9 + + # & 9 NX            k.o o o o X + k.            k.+ + + + + O V.            k.o o + # + 1 V..           k.& # # @ @ @ @ < < @ < < 5 < a ; @ a % a V.X           V.# # # @ # @ < < < @ @ @ a @ a a a 0 < 0 ) &           k.. O O # & @ ; g = = = ; : = g s ; s s a k k : f r g s ) %                                       V.0 s p k p o.o.b.b.b.b.o.O.n.5.5.t.Z.Z.t.Z.t.t.Z.Z.t.n.Z.",
-        "gXgXgXgXgXgX).3 v.SXSXv.v.l.8 5 @XhX,XhX<XhXhX<X<XhXhXgX-XgXgXgXgX-XhXgXgXhXhX<XgX-XhXgX@X,XhXhXhXhX@X,X,X@X,X,X,X,X,X,X,X-X-XhX<X#X<X+X#X(.#X).#X).).@X@XOX@X,X,X,X#X-X-X#X#X@X@X@X#X#X+X@X@X@X@X).=X^.=XI.I.I.I.I.I.I.I.I.^.=X=XI.I./.I.I./.I.P./.P./.P././.T.^.Q.T.J.P.T.T.J.T.T.T.T.^.^.T.T.^.^.^.T.^.^.^.^.^.^.^.P.P.P.P.^.P.P.J.J.J.J.J.J.J.J.J.J.J.T.T.G Q.XXQ.Q.Q.V V Q.R.R.R.R.Q.R.R.R.R.R.G H H G G H H G H H G H G H H G H G H G H J P E T E T E N E S _ N E J E _ N _ A _ A _ F _ F T T S : f S > S S D S f D d f d f T f d T f f f f E f f f d d ; ; d d f f f f f f h h f k k > k k h > k h r a k k s = s s s s s e q q q q q w i w w w w w y p p p y y p p w q l c l c c c c c c l c x l l m x c g 7 7 7 6 6 6 6 6 6 6 6 6 6 6 6 6 7 6 7 6 6 7 6 7 7 7 f.m 4.M g.M m M m v v m v v x z x x 8 a.2 2 2 a.a.a.a.a.a.2 2 s.9 s.2 9 2 9 2 9 2 R                                                       V.+ + + + 9 1 NX            k.. o + + + + NX            NX+ + + X # O V.            k.o o o + 1 # k..           NX+ O # & & 1 @ 5 5 5 < 5 < g 5 a a ; ; ; V.X .         kX+ O + # @ @ < @ 0 @ 5 @ < a @ a < ; a 0  #           %XO X # & @ ; ; ; a : = a s a e = = k : k k g e > s r f e.5                                       NX= 0 s p M o.b.o.b.m.b.n.o.5.5.n.Z.t.t.Z.Z.t.t.Z.5.Z.Z.t.",
-        "gXgXgXgXgXgXgXgX l.SXSXl.f.P <X<X<X,X<XgX<XgXhXhXgX-X-XgXgX-XgXhXhXgXhXhXgXgXgXhXhXgX<X@X,X,X1X,X1X,X@X,X,X,X,X).,X<X7X-X,XhX<X,X<X#X<X).#X).#X).OXOX#X).).@X-X<X,X<X<X@X<X<X#X,X@X@X#X#X#X,X@X).=X-X=X^.I.I.I.I.*XI.I.I.I.I.I././.I.I.I.I.^./.^.I./.P././.^./.Q.T.T./.P./.T.T.T.J.T.^.T.T.^.T.^.(.^.T.^.T.^.T.^.^.^.P.J.P.P.^.P.^.P.J.J.Y.J.J.J.J.J.J.J.T.G T.Q.XXQ.Q.G Q.Q.R.R.Q.Q.R.Q.R.R.Q.R.G G H H H H H G H H G H G H G H H H H H J H J T T T N P J E P T T J A E A A A S A A F F F K F S S T S S S S S f f S D ( > S f f f f f f f T f f f T ( f d d g f f f f f f h f > h k h > h r h h k h h h h k s k g s e s e e s w q q w w q e w w w y w y w e p p p y p v v c l c l c v c c v c v v m v z l x m b l g x t 4 8 7 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 7 7 6 7 f.o.g.M 4.M m M v M m v v m m f.f.f.i f.a.a.s.a.a.a.a.2 8 s.2 s.9 9 2 s.2 2 9 2 a.                                                       k.o X + # 1 1 NX            iX. o o + + + NX            k.o X + # O # NX            k.. + + + + 1 V..            X + O # @ 5 5 a < g a a 5 a < 5 ; @ @ ; k.X           e.+ o # # # < a < < @ @ 5 @ a < ; 0 a < 0 V.&           e.o o O O & & ; ; = s s = : f e k : f e > 0 s > e k s s 4.%                                       e.@ = a s M M b.b.b.n.n.5.5.5.5.t.Z.Z.Z.Z.t.Z.Z.Z.t.Z.Z.5.",
-        "gXgXgXgXgXgXhXgXgXP l.l.8 4 <X-X<X,X<XhXgX-XgXgXgX-XgXgXgXgXgX-XgXgX-XgXhXgXhXgXgXgX-X-X).,X<X@X,X@X,X,X@X@X,X@X,X).,XhX-X,X<XhXhX>X<X#X#X(.).#X#X).#X(.OX#XuX-X,X,X<X@X<X#X#X<X#X<X#X<X).).).-X=X=X)./.I.I.I.I.I.I.I.I.=XI.I.I.I.I.I./.I./.^././.I.P.U.^.U.^.U.T.^./.P.T.U.^.P.T.T.T.T.T.T.T.J.T.T.^.^.!.^.^.^.T.^.^.^.J.P.^.P.P.P.Y.P.J.J.J.J.J.J.J.J.G J.G J.Q.Q.L.Q.Q.Q.Q.R.Q.R.R.T.R.R.R.R.R.G G H R.H H H H H H H H H H H G H H H H H H S P T T P T _ P A _ S _ S _ E J A A J E _ A F K J S S S S S S S S D E S ( D D D f S f f f f f f f f f f f f : f f f k f f f f h f f k f h h h j h h | h h | h k g k c k w s s w e w q q w w w w w w w i e w p w y w p p p p v c v p c c c v b l l c v v M z m v z c b l x s l y l z x 3 6 6 6 6 6 6 6 6 6 6 6 6 7 6 7 a.k.b.M M M g.M g.m m v v M v m g.z f.z f.u a.a.a.a.a.a.s.2 9 s.2 2 2 l.l.k.l.k.l.k.CXV.k.V.k.V.k. k.k.iXk.k.k.k. %XV.k.  CX            k.o o + + # < NX            k.o o + # # + NX.           k.o + o # & = NX            k.o o + + 1 1 V..           V.o o O # @ & < 5 @ < 5 a 5 a 5 5 = & @ ; V.X           V.o o + # @ < 5 0 g < @ 0 < @ d a < g a @ V.&           k.o o O # ; & ; a a = = : ; = : f = e > s b V.e.e.V.V.V.C.BXNXV.e.NXV.e.k.kXV.e.V. e.V.k.V.V.e.V.NX  V.C.V.C.G.C.n.b.n.5.5.5.Z.t.Z.Z.Z.t.t.Z.t.Z.t.Z.Z.t.",
-        "gXgXgXgXgXgXgXgXgXgX_ d J -X-X<X<X,X<XgX-XgXgX<XgX-XgX-XgX-XgX-XhXgXgXgXgXgX-XgX-XgXgXgXhX,X@X<X@X,X,X@X,X,X@X,X).-X,X-X-X,X7X,X-X#X<X<X<X#X#X(.(.#X(.#X#X).@X,X<X-X-X-X<X-X<X<X<X#X-X#X<X).).=X-X/.-X=XI.=X=XI.*XI.I.I.^.I.=XI.I.I.I.=XI.=XI.I./.P.P././.T.^././.^.P./.^././.P.J.U.P.P.U.P.^./.^.^.T.^.^.^.^.^.T.).^.^.P.P.P.P.P.P.J.J.Y.J.J.J.J.J.J.J.G G G G XXQ.W.Q./.Q.R.R.R.R.R.~.R.T.~.T.R.R.H E.H H H R.H H H H H H G G H H H H H H L G A E T J T S S _ J T S A S A S _ E J J A F F F F S f f S S > S D S S > S ( : D f f D > ( f f E : ( d T f f f f f f f f f f f f f > h h > h h h h | j | |  .;.c k c k s c p s c p y w w i w w i w w q w w w p p p p p p p c p c p c v c v c v v v v v v v v v v z c b s l s x l l l t q g t t 8 8 6 6 6 6 6 6 6 6 6 6 z o.4.g.m M 4.m o.b.4.g.M v v g.v f.f.f.f.f.f.s.a.a.s.2 2 a.2 2 s.9 8 k.* # & & & NX1 1 1 + + X o o o o o o o o o o o o o . o k.            e.o + o + # 1 NX            k.o X X # # @ NX            k.o o O O O @ NX             o o + + + # V..           k.o X # & & a @ @ g a 5 < < g @ ; @ ; ; a e.X            o O + # @ < < 0 5 5 < < a a a g ; a ; d  &            o o + & @ ; ; : 0 k ; = s : : = : f s a 4.R & & & & & BXa k 0 = # O # O O + O # O O + # O # + # E ^ & & X & & E V.o.X.4.5.5.o.t.Z.Z.t.Z.Z.Z.Z.t.Z.Z.t.t.5.",
-        "gXgXgXgX7XgXgXgXgX-X-X-X-XgX<X<X,X,X,XhXgXgXgXgXgXgXgXgXgX-XgXgXgXgX-XgXgXgXgXgXgXgX-XgXhX,X,X@X,X,X1XhX,X<X,X,X,X,X).,X,X-X,X,X,X,X).<X#X).#X#X#X(.(.(.#X).).-X<X,X<X<X#X<X#X(.#X=X#X<X<X#X=X^.^.=X/.I.I.I.I.I.I.I.I.=XI.=XI.I.I.=XI.I.I.I.I.^.^.T.U.T.P.^.U.^.^.U./.I.U./.I./.U.P.U.^.P.T.J.T.^.^.T.^.^.T.^.T.^.^.^.J.P.P.P.P.P.P.P.J.J.J.J.J.G J.J.C J.C G J.Q.W.Q./.Q.Q.Q./.Q.Q.Q.T.Q.R.R.R.R.R.H H R.H H R.R.H H H H T.G L G H H H H H G H J H J A _ T S T T E J A E A A J A A F A F F F F A S S D S D D S E > S > D > S D S > E > ( S f f ( f > h f f f f f f f f f f > k f h k k h h h h | h | Q  .;.k c k b c s k p y p w w w w i e w y y w i e p p p e p p p p p v c v p c v v v c c v v v v v v v v g.v c c s p l l l l s g q g x f.h.f.f.f.8 7 6 6 6 7 7 M M m M M m o.g.4.b.b.o.M M M M v M g.f.f.z x a.a.a.a.a.a.a.2 2 a.s.8            iX1 1 + 1 + + + + o o o o o o o X o o o o o k.            kXo o + + @ & NX            V.o o X # & # CX            NXo o O # & @ NX            k.o o o X # # NX.           %XO o X # & @ a 5 a 5 g a a g @ ; = ; ; a e.X           V.o o O # @ a < < q a a a a @ d a a a ; ;  &           V.O o O # & ; ; s : = f : : a k k : k a k 1.%           NXr = ; = # # O # # O O # O # O # # # # @ k T           & V. .o.o.5.5.5.Z.i.S.t.t.Z.Z.t.Z.Z.Z.G.Z.5.",
-        "gXgXgXgXgXgXgXgX-XgX_ 5 _ <XhXgX,X<X,XhX-XgX<XgXgX-XgX-XgXgXgXgXgXgXgXgX-XgXgXgXgXgXgXgXhX,X,X@X@X,XhXhX#X#X@X@X).-X,X-X-XhXgX,XgX,X>X<X#X<X-X).#X#X#X<X#X#X,X-X-X<X-X<X-X<X-X<X,X,X<X#X,X=X-X=X/./.=X=XI.=XI.=X=XI.I.I.I.I.I.=XI.I.I.I.I.I.I.P.P.U.P.U./.U././.I.I.P.I.I.I.I.P.U.T.T.U.^.P./.P./.T.T./.^.T.T.^.T.T.P.P.P.P.P.P.P.J.J.Y.J.J.P.J.J.J.G G G J.G G L.Q.XXQ.Q.Q.Q.Q.T.R.R.Q.T.Q.R.T.Q.Q.H R.H E.H H H R.H H G L H H H G H H H H H H H H H H H J _ S _ S T _ J A A _ F ! F F F F _ K S S D S D S D f D S D S S D D f f E > E : ( > S f > S > > , k h > k f f > f f f h k > h k h h j h h | | h | j k c k s k w O.O.p w q w i w w y w w y w w e p p p p p p M M v p p v c v M c v v v M v v v v v v z z v c p c c l u z g q q s f.f.d.f.f.f.f.f.f.z 8 7 ) g.4.o.4.b.o.b.4.b.o.g.4.b.b.g.M v m m g.f.f.f.f.i a.a.2 a.2 s.2 2 9 x R           k.1 1 # + + + + o + + + + X + + X + O + + o NX            k.. o X * @ 9 NX            e.o o + & @ 1 NX            %XO o O O # # NX            k.o o + O # # V..           V.o o X # # & @ @ a < a 5 5 @ ; ; ; @ ; @ V.X            o o X # # < a < g < < 5 < @ 0 a @ d a ; V.&           %XO o O O # ; ; ; ; > ; f r : g f = > a f 4.%           iX0 a = = = # @ = # = @ @ @ = = = = = = 0 ( T           & C. . . .o.O.5.t.Z.t.Z.Z.i.t.S.Z.t.t.Z.5.Z.",
-        "hXgX).-XgX-XgX).-XR k.  _ -XhXgX-X-XgXgX-XgXgX-XgXgXgX<XgXgXgXgXgXgX-XgXgXgXgXgXgX-XgX,X<X@X<X,X@X,X<X#X(.<X-X-X#X,X,XhX<XgXhX,X<X<X<X<X#X#X>X+X-X).@X#X#X-X<X-X<X<X-X<X<X<X<X#X<X(.<X-X=X=X=X=X/.=XI.I.I.I.I.I.I.=XI.^.=XI.I.I.I.I.I.I.I.I.I.I.I.U.P.U./.P./.U.I.P.P.P.I.I.P./.^.^.U.P.T.T.^.T.T.T.^.T.^.^.(.T.^.I.P.P.P.P.T.P.P.L.P.L.J.P.P.J.G R.G J.G J.T.L.W.Q.Q.Q.Q.W.T.!.Q.Q.T.T.Q.R.~.Q.Q.R.E.R.R.H ~.H H H H H H H H H H H H H H H H H H H H H H F J F E A _ E _ A F E F F _ F F F F D S : D S D S D S ( S S S > > D D > S f D f > f > > > > > > k h h h j h k k k f r  .h  .| | |  . ...| | | h  .j k j p k p O.O.p i w i e w i w y y y w p p p p p p p p v p M p v c v v v v c v v v v v v u v v v v v c p p c k c p s k k k c j j f.f.f.d.f.z f.u v b.o.b.4.b.o.b.4.b.b.o.m 4.b.M M v g.4.b.b.g.f.f.a.f.f.a.a.a.a.a.a.a.2 a.            # 1 1 + # + 1 # + + # + # # + # # # O & + NX            k.o o + # @ < NX            e.o X X & @ @ NX            iXo X X # @ & NX            e.o X X X & & V..           e.o X X O @ @ @ ; < < 5 0 ; a ; ; ; ; ; ; V.X           k.X X + # @ a a < g g < a a a a a ; f d a V.&           e.o o O & ; = : : g : = , g = : , e > : k 4.%           k.@ = ; = ; = = = = = 0 = e 0 0 0 e e : = / T           & e.> k  .o.X.Z.Z.t.Z.Z.i.Z.S.t.i.Z.Z.t.Z.t.",
-        "hXgXgX-X).gXgXgX l.SXSXl.8 P -X<X-X-X-XgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgX-X<X#X<X@X<X@X).#X<X).#X<X#X-X<X-X<X<X<X,X7X<X<X<X<X=X#X-X+X<X>X).#X-X-X<X-X-X<X-X<X).#X<X-X-X>X-X=X=X=X=X=XI.I.I.=XI.I.=XI.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.U./.P.U.P.I.I.U./.I.I.I./././.P./.^./.T.P.T.T.^./.T.^.Q.T.T.^./.P.^.U.P.P.P.P.P.P.J.P.P.J.P.J.J.J.L.G J.J.G Q.Q.Q.Q.Q.W.T.Q.T.Q.T.Q.Q.R.Q.T.Q.Q.Q.G H H H H R.H R.H H H H H H H E.H E.H H H H H H K K H F ' K K F F F A A A F F F F _ K F K A E S ( D f S > D S > D D D S S E : > f h f ( f > : > S > h > j h k j h h h h h  .| | | | | |  . .| | | | |  .j n c c c p O.p O.y w w w w w y w p w e p p p p p p y p v M p v v p v M v v v v v v v v v g.v g.z z v v  . . .| j j h |  . .j j  .f.f.f.g.f.u v g.b.4.o.b.o.o.b.5.4.o.4.b.b.b.b.4.m M v g.g.g.m g.f.f.f.8 a.2 a.a.2 2 a.8 x             + + + # 1 # 1 1 1 # < 1 < # & 1 & @ @ @ & NX            e.o o + + # @ NX            kXo X + & & @ BX            k.X O & & & ; NX            e.o X X O & 5 NX.           k.o o # & @ % @ % ; < g a @ a ; ; a ; a ; V.X           e.o o O & & < a g q x 0 g a a a d a a d ; e.&           k.X X O & = ; ; f a > : : : > f f : f k f 4.%           V.@ = @ = 0 0 g k s k k s k k k k k > s k / T           & 4.= k h  .o.5.5.Z.Z.i.Z.Z.t.Z.Z.Z.t.Z.Z.t.",
-        "-X-X<XgX).,X).8 v.SXSXv.v.h.a.3 -X-X-X-XgX-X-XgXgXgXgXgXgXgXgXgX-XgXgXgXgXgXgX-XgXgXgXgX-X<X).).+X<X<X).>X(.=X@X<X-X<X,X<X<X<XhX,X<X>X#X-X=X).)./.#X#X#X).>X<X-X<X<X-X-X<X).-X<X>X<X=X=X=X=X-X=X=XI.=XI.I.I.=XI.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.U.P.P./.P.U.P.I.I.P.I./.I./.I.^.P./.^././.J./.T./.^.^.^.^./.(.^.I.U.P.P.U.P.P.P.J.P.P.J.P.P.L.T.J.G R.R.R.J.Q./.Q.W./.Q.Q.Q.!.T.!.T.!.T.!.T.L.XXL.J R.R.G G H G H H R.H H R.H H H H H H H H E.H H H E.H F K F K ' J K F F _ F E F F K F F F S S f D S D ( D > S S > > S ( > D > ( S > ( > : : > : > f h > h h j h h  .h  .|  .| ..j  .| ..|  ... .| |  .| p j p k p p O.p O.w w w w y w i p w p p p r p p p y z p p v M v p v v c v v v v v v v v v v v f.v f.v p  . .h |  . . .h  . .j h  .v g.f.f.f.g.v b.o.b.o.o.b.o.4.b.b.o.b.M M b.) g.b.M g.b.b.g.g.g.g.f.a.f.d.a.a.2 a.2 8 2 8            k.+ + + # 1 1 1 < < < < < < < @ < < & @ % @ NX            kXo X + & & 5 NX            e.o + O # @ @ NX          . kXo X O & - ; NX            %Xo o X O # & V..           e.o X X # & @ ; a < < a a d @ ; ; ; ; a ; V.X           k.o o O # @ ; 0 5 g g 0 g 5 a 5 g ; d ; ; e.&           kXo o O & ; ; : f : f > k : > : k : > : f e.%           e.# # @ @ a g s p k M c c j n M p k r k h 4.T           % ) - = k  .X.5.5.n.5.Z.t.S.Z.i.Z.t.t.D.Z.Z.",
-        "<XgXgXhXhX#X l.UXSXv.s.j.l.l. 5 <X<X-XgXgXgXgXgX-XgXgXgXgXgXgXgXgXgXgXgXgXgXgX-XgXgXgX-X-X>X#X#X@X).-X).<X).<X).,X-X-X<X<X<X<X-X<X<X;X>X>X;X>X=X>X<X/.<X<X=X<X<X<X=X-X-X>X<X=X-X<X=X=X=X=X=X=X=X=XI.I.I.=XI.=XI.I.=XI.=XI.I.I.I.I.I.^.I.I.P.I.I.P.P.P.U.U.P.P.I.P.I.I.I./.I./.I.I./.T.U.T.T./.T.T.T.T.Q././.^.^./.P.P.P.P.P.P.U.P.J.Y.J.P.J.Q.P.L.R.L.J.L.J.R.Q.W.Q.T.Q.Q.T.!.T.T.!.T.T.R.T.T.Q.G Q.E.G H G R.G G G H L H H H R.H R.H ~.H R.K K H H H H K F K ' F K K F K F K J F ' F F K F K A ( S D ( ( ( : D f D S D > S > > f > f ( : : D : : : : > > > k j h h j h  .h  .|  . . .|  ... .|  ...h | | ..j M  .p k O.p O.p w i w i w p p w y p w p p p p p p p p v p v p v z v v v v v v m v v v f.v v v v  . . . . . . .h h  . .| j j j  .v f.d.g.u f.g.4.b.4.5.b.4.b.b.o.b.4.4.b.4.b.o.M g.M b.b.b.b.g.b.g.f.d.f.a.8 a.8 2 s.a.8 x R            o + + + @ 1 < q < 5 q 5 g < 5 d a a 0 a a NX            k.o X + & 1 < NX          . kXo X + & & @ V.V.NXiXNXk.e./ o X O # & ; NX            V.o X o O # & V..           k.o X + & & @ 5 g a a a ; ; a @ a ; ; ; a V.X           e.o o # # O = ; < w q 5 a a g a : ; f : ;  &           e.O O O O & ; ; ; a > a > > : f > : > , : 8.%           NX^ ) / ) C.e.C.V.C.C.V.C.C.C.C.e.e.C.e.C.BXT           &  = = e j X.4.5.5.5.t.5.5.Z.t.t.S.Z.Z.i.Z.",
-        "hX-X-XgX+X l.zXV.l.3 5 x  l.V. d XX,XgXgXgXgXgXgXgXgXgXgXgXgXgX-XgXgXhXhXgXhXhXhX,X<X,X#X-X(.#X-X<X#X=X@X#X-X<X<X<X<X<X<X<X<X,X-X<X>X>X>X>X*X=X;X=X=X=X=X<X-X<X<X<X=X<X<X>X<X<X=X=X<X=X=X=X=X/.=X=X=X}.I.=X/.I.=XI.I.&X/.I.I.I.I.^.I.I.P.I.I.I.P.P.P.U.P.U.P.I.P.I.I.I./.I./.I.I./.^./.T.^.T./.T.T.^.^././././.^.P.U.P.P.U.P.P.P.L.P.J.J.P.L.L.L.T.R.L.J.Q.J.Q.W.Q.Q.Q.Q.Q.Q.W.Q.^.T.Q.T.Q.Q.Q.Q.Q.V G Q.V G G G G J N G L G J G H H E.H H E.H H E.H H ' F ' F F ' H _ K K K K F H ' F F F ' F ( D D E > f ( D D E > > > D D S > h S f : : > : - , - > r > h h j h h  .| h  .| |  . .|  .| .. .| ..h | | | j k k p o.p O.p O.w w w w w w y w p p p w p p O.p p p p p v v v v z v v z v v v v v v v v p v M p .. .k  . . . .j  .h  .| | j j h n f.f.g.f.g.o.b.o.b.4.b.o.b.o.b.4.o.o.b.b.4.o.M ) g.b.b.h.b.b.g.g.b.f.f.f.a.a.a.2 a.8 x )             o + + 1 1 < g 5 5 q x 1 g g g f g a g d 5 NX            kXo o + 9 & & NX            V.o X # # @ ; d ; & & $ O O X X & O & : : NX            NX. X O O & & V..           NXo X O & @ & 0 d a a ; a ; a @ a ; a ; ; V.X            X X O O # ; @ ; f s q a d % : f ; f ; : V.&           %XO O + @ = ; f f f , s > > : f f > > : >  %           & & % % & % & % & % & % % & % % & % & % & % .           & ^ & ; > h o.o.5.5.5.n.5.5.5.5.5.5.t.Z.Z.D.",
-        "gXhX<XR   x  3 g NXVX % d 4 5 R d ,XgXgXgXgXgXgXgXgXhXhXgXhXgXgXgXgX,X<XhXhXhXhX<X<X#X/.#X=X/.-X).<X<X<X<X(.(.<X<X<X<X<X<X<X,X,X<X>X*X>X>X:X;X;X;X;X=X<X-X<X<X<X<X<X=X<X<X=X<X=X=X=X=X=X=X=X=X&XI.}.}.}.&X&XI.I.I.I./.&XI.I.I.I.I.I.I.I.P.I.Y.J.L.U.P.U.P.U.P.I.I.I.I.I././.^././.P.T././.T.T.T./././.I.^.I././.U.P.P./.P.P.P.U.P.P.P.P.L.L.J.L.U.L.Q.L.L.Q.Q.'.W.'.Q././.Q.L.Q.W.Q.W.Q.T.R.XXQ.Q.E.E.G G E.Q.G J J L N N S F S F J H H H R.H H E.H H ' K F K K ' K K K K E.K K K F K H K J A D S ( S ( D ( f ( ( ( S D f > > ( > > > > > : : : : = , > > k h h h | r | ..|  ..... ... . . ... .2.| | | | j p  .p p O.p O.p i i w i i w p w w w p p p p p p p p u v p p v p z v v m v z v v m v v b j o. . . .M O. .k .. . . .h  .j j |  .;.j v f.f.g.M b.o.5.o.b.o.b.b.4.4.b.b.4.4.4.o.) 4.o.b.b.b.b.b.b.g.b.g.m f.a.a.a.a.a.a.i z ) R         .  o + # # 1 < w 2 g t a g g g g f d a f a g NX            e.o o # # @ 5 NX             X X O & & ; ; ; ; ; & O O O X O & & % % CX             o X + O & # NX.            o X + # & @ @ a @ : ; a a g ; = a : g s V.X           e.o o O @ $ = ; = ; : = d : : : f : : d f e.&           e.o O O & $ ; f ; > f : : > > > > f D > > e.%                                                                   & ^ O = e h ..5.5.5.5.5.5.Z.n.5.5.5.5.O.5.5.",
-        "<XgXgX<X<XgXgX<XT CXIXUXVX P @X,X<X<X<XgXgXgX<XhX,X-X-XhX@XhXuXhXhXgXgXhXCXhXhXhX@X<X<X(.#X(.<X-X).(.<X).#X-X<X,X<X<X>X<X<X<X<X<X>X>X>X>X>X;X;X;X=X;X;X&X=X<X<X<X<X<X<X<X<X=X<X=X=X=X=X=X<X=X=XI.&X}.}.;X}.&XI.I.I.I.=XI.I.&XP.I.I.P.P.I.Y.P.P.J.L.P.P.L.U.U.I.I.I.=XI./.I.&XI.I.I.&X/.U.^.P.^.T./././././././.^.U./.P.P.U.P.U.P.P.P.J.P.L.P.L.L./.L.U.L.Q.XXL.W.W.Q.Q.Q.W.XXQ.Q.Q.Q.E.Q.Q.Q.E.E.G Q.XXQ.G G R.G G J V G L G S S J F F K K F H R.R.H H J K H ' K F F K K F K K K F H K ' H H K F D ( : D D f D ( D D ( ( ( ( > ( > > : > : : > : , : : : k > > > r h r  .h | | | .. .|  .r  ... .| | |  .| |  .| M  .O.p o.p O.O.p u p p p p p p p p p p p p p o.p p v v v v v v v g.z v v v v v c 2.>.>. . . .p p  . . . . . . . .j  .| h  .| ..p p M v b.b.5.b.o.b.o.o.o.b.o.4.g.b.4.4.M M M b.g.g.b.b.b.b.b.g.4.g.g.f.a.a.a.8 z l c m  .          + O + 9 < < g 2 g g g g f f g g g f g a a BX* & & & * & V.o X # & & a NX& * & & & * NXo X + & @ % % ; % & & O & & O & & & : @ NX& * & & & * e.o X O # & & NX& & & * & * NXo X O O @ @ ; a ; f a a ; a ; a f ; a = V.: $ * & & * V.o o O O = = - = : = - : - : - : ; : : ; e.P * & & & * NX. . O # # = ; : f > > > k k > > : > : > 4.R O & & & * & X O & & O & * & * & * & O O & & O & * X & & * & * * & E ^ = = e h  .5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
-        "gXgX<XgXgX<X<XgXT k.VXCXNX T ,X,X<X<X,X<X<X<X<X,X,X).-X@XhXhXhXhXhXhX<XhXhXhXiXhX<X+X(.=X/.#X=X>X).<X).<X<X<X<X<X<X<X=X<X>X>X*X;X>X>X*X;X*X;X>X;X>X&X=X;X=X>X=X=X=X=X=X>X*X<X*X=X=X=X=X*X=X=X*XI.;X}.;X|.}.}.;XI.&X&XI.I.I.I.U.I.Y.P.I.P.P.U.Y.L.J.L.P.P.P.U.P.I.I.I.I.I.I./.&X&XI.&XI.P.U.U.U.U.U.I./.U.U./././.U.U.U.U.P.P.U.U.J.U.P.U.U.T.L.T.L.U.L./.Q.Q.XXL.XXXX/.XX'.Q.XXXXQ.XX'.Q.Q.Q.'.Q.'.Q.R.G Q.I G G J _ _ N N G J J S A K K F K ' K K K H ' K ' F ' _ ' K K ~._ K H ' K K H K K K A ( D D f ( W ( f ( ( f k D ( ( ( ( D > D : , : : : : : , > h > h > h | | r | | r h r |  ...|  ... .| | | | | ;.2. .M p O.o.O.o.o.O.O.o.o.O.O.p O.O.O.o.O.O.o.o.o.o.v u g.p v u z v v v v f.v v  .>.2.:.>...p j .. . . . . ...k  . .| j ;. .j | | j M  .o.o.o.b.o.b.o.b.4.b.o.4.b.4.4.b.4.o.) o.b.b.b.b.g.b.b.b.b.g.g.b.M d.a.a.f.m v v )             o o # # < 5 s q x l g f g g g f g g g f d BX; % % % % ; k.X X O # @ < CX% % % % % % V.X O # & & ; : ; ; : % & & & & % & ; d : CX% % % % N ; NXo X X O & = NXS 5 N ; % % e.o o # # & @ = @ @ @ ; = a a ; a a ; g f V.E 4 % d N ; e.O o O O $ ; = : : : ; : : > : f : f f f e. d % 5 N ; iX. o o O - - : k f : k > : : > > > ( > f e. % % 5 N ; % 4 N % % N % 4 4 : % % % 5 N % N % % 4 P % P : d N ; % R / # - > h o.o.5.n.5.n.5.5.Z.5.5.5.o.5.5.5.",
-        "gX<XgXkX 3 8 7 3 3  k. 3 9 9 5 % % ,X,X,XhX1X@X,X@X@X1X1X>X>X@XhXuXhXhXhXhXhX,X=X-X/.(.).(.=X=X-X#X-X).>X<X<X>X>X>X>X>X>X>X>X>X=X>X;X;X>X*X>X&X;X;X*X*X;X}.;X;X=X>X=X=X<X=X*X&X=X&XI.&X&X&X}.}.}.}.}.;X}.|.}.&XI.&XI.&XI.U.U.P.Y.U.Y.P.P.Y.J.J.K.J.L.J.P.L.I.I.I.I.I./.I.I.I./.&XI.&X/.I.U.U.U.U.&X/.U.I.}.U.U.U.U.U.U.U.U.U.P.U.U.U./.U.L.U.U.Q.L.Q./.XXU.W.Q.XXQ.'.Q.Q.'.W.Q.XXQ.Q.XXQ.Q.Q.Q.'.E.Q.Q.U I _ I _ I I _ _ U J S A J _ ' K _ K K K K ' F K K K R R R ' K _ K K K H F K K K K H A D W ( D ( ( D ( D D f ( ( D k ( h ( > > : : : : : : : , k > > > h > | | r h | h r h | | | .. ...| | ..|  .|  .,.2.2.o.o.O.O.p o.M o.v p o.o.O.o.o.O.o.O.o.o.O.O.o.o.v v v v v v z z v v v n >.>.>.2.>.>.:. .o. . .p  . . . . . . .h  . .h | j  .j n o.o.o.o.o.o.b.o.o.b.o.4.b.4.4.o.4.4.M n g.b.g.b.b.h.b.b.b.b.b.b.g.M g.f.f.M g.v v g.            X X # @ < q x g g k l g g f f b f k f g g BXP d P S T T iXo O O @ @ a NXT T T T T T e.X X O & ; % d : d T ; & ; : % : % d d ; BXT T T T T S NX. X # & ; ; BXT T T T T T NXo + O # # # & ; = ; g g a a ; 0 ; ; : ; V.R T d T d S V.o o O & $ = = = : , - : : : : : f f : d V.R S S P d N NX. o O $ ; : : > : > g > > f h > f W > > e. N S P T T T T S 4 T T P S S P T d S P d T T T d T T d P T d N P d  ) O = > j X.5.5.5.5.C.n.Z.5.5.5.5.4.5.5.5.",
-        "gX<X<XgXXXl.l.SXl.l.2 2 2 8 l.l.l.d E.<X,X,X@X@X$X@XhX@X>X>X;X;X:XvX>X>X@X@XhXuX<X<X=X(.(.>X(.-X).-X<X>X<X<X<X>X>X+X;X;X=X>X:X<X*X>X;X;X;X;X;X;X;X;X;X;X}.;X;X;X;X;X;X=X>X*X>X=X&X=X&X/.I.&XU.;X;X}.&X}.}.}.}.|.&X=X&XI.U.U.U.I.P.U.L.P.P.U.J.L.J.J.L.Y.L.Y.P.I./.I.I.=X&XI.I.&XI.I.&XI.I.I.I.+X/.I./.}./.&X/.U.U.U.U.U.U.U./.L.P.P.P.U./.U.U.Q.L./.L.U.L.L.W.'.XXQ.XXQ.'.W.'.Q.W.'.'.Q.Q.Q.'.Q.Q._ V Q._ I I I I '.  U _ U _ _ _ S F F K K K K K F ' K ' ' R R R R R _ K E.K K K F F _ K K ' K ( ( D ( k D ( ( ( ( ( ( ( ( h h ( D : : > > : : , : , f > > r h > h h | | | |  ...| h  .| .. . . . . .| | ;.;.;.1.1.Q o.M o.o.p O.b.O.O.p o.o.o.o.o.o.o.o.o.o.o.o.o.v v v g.g.v g.f.v M 4.>.>.>.2.>.:.>.2. . .o.p .. . . . . . . . . . .2.| | |  .n o.o.4.b.4.b.4.b.5.o.b.b.4.o.b.b.4.o.4.M b.b.b.b.b.b.b.l.b.b.b.g.4.b.m g.M g.v v m ) R         .  X + O # < 5 g g b g ( g b g g g g g f g g CX% % % % 4 d e.X O $ - & : NX% % % % % % NXX X & & ; ; f d ; : ; : d ; ; S ; : d : CX% % % d 4 ; NXo X X O & & NXT d % % % % kXo o X # & ; & ; = f ; a f g a f ; a a : V.E 4 % % % % NXo . O O = $ : = : : : > : : S : : f : : e.R 4 % % 4 ; iXo X O & ; : > D ( > D D > h D > h h > k e.^ % % % % % % % % % % % % ; % % % % % ; % % % % % S % % % : N ; % :  ^ O : r h  .o.5.5.t.5.5.5.5.5.n.5.5.5.5.O.",
-        "<X<XgX<X-X@X l.SXSXzXl.l.v.l.a.4 #X<X<X<X+X,X+X@X1XhX@X>X;X:X1X;X;X>X1X1X>X>X>X>X=X=X-X=X)./.>X#X>X+X>X+X>X;X X;X X;X X>X*X<X*X>X:X>X;X*X;X;X;X;X;X;X*X;X;X;X;X;X;X;X;X>X;X*X=X/.&X&X&X}.;X}.&X;XU.|.}.}.}.;X}.}.&X&XI.;XI.I.U.U.L.U.P.Y.P.L.L.K.L.L.J.L.U.I.I.I.=X&X/./.&X&X/.&X&XI.I.&XI.I.&XU././.&XU./.+XU.U./.U.I.U.U.U././.L.U././.L.L.L.'.L.'.L.'.Q.W.Q.U.W./.XX'.XXW.Q.Q.Q.L.Q.Q.V Q._ '.L._ Q.'.I _ I I I I  U   U U  _ ' ' ' K ' K ' K K ' K ' R R R R ' R _ ' ' K F F F ' K H ' F k D ( ( D ( h h h ( h > ( h ( Q h > > > : > > h : : : > > > h > h h > h h | | | .. .....j  .|  ... .| | ;.| | ;.2.2.2.;.o.o.o.O.v o.p o.o.o.o.O.o.O.M o.O.O.o.o.o.o.o.f.v v f.g.M n o.>.>.>.9.>.>.2.2. . .>.2.r  . . . . . .r  . . .;.| j ;. .j  .n o.b.o.o.o.b.4.o.4.o.4.o.4.b.o.4.4.o.4.b.b.b.h.b.b.b.b.b.b.k.o.g.b.b.) 4.4.n ) Q ) 4.            X O # & a g g f f f b g k f s s g k g g f BXT S d T T T kXo O & & : : BXT T T T d N k.X O O & ; ; : f : : T : E T : d f f f d BXT T d T d N NX. O O # ; ; NXT T T T T P V.o O O O & = ; ; @ a f a a k ) )  ) ) ) BXR T T 4 T P iXo O O # $ = : : : : : > : : : > f f : f e.R E T d S P NXX o O $ : S D > ( h D h D D D > #.W D > e. 4 d T T d NXNXNXNXNXNXiXNXNXNXNXNXNXBXNXNXNXNXNXNXNXNXNXNXNXBXNXBXBX( = = > k O.5.O.n.5.5.5.t.n.5.5.5.5.X.4.5.",
-        "gXgX<XgXgX<X@X3 SXSXSXv.v.l.8 3 1X<X<X<X<X+X+X@X@X@XhX@X1X;X;X;X;X1X;X>X1X>X>X>X|.>X>X>X>X+X>X+X+X>X>X>X+X;X+X>X|.;X;X|.>X>X:X>X;X>X;X;X>X;X;X=X;X;X;X;X;X;X*X;X;X;X;X;X&X;X;X*X&X&X&XI.;XI.U.;X}.;X}.;X;X}.}.|.|.}.U.U.U.I.}.I.Y.U.Y.U.P.L.Y.J.J.L.L.J.L.U.U./.I././.&X/.I.I.I./.I.&X/.I.I./.U.>X&X/./.I.U.&XI.U.U./.{./.{./.{.{./.U.XXU.U.L./.XXL.XXXX'.'.L.XXXXL.XXQ.W.Q.W.'.XXQ._ E.XXXX'.XXXX_ XXI I I '.I I I I I U _ U R _  U _ H ' ' K ' K ' K H ' _ R  _ R R ' R R R ' K J ' F H ' H K ( k h W ( D ( ( D ( W ( ( ( ( ( f > > > h ( h h > : > h > r > r > > r r | | | |  . ...| .. ...| .. . .;. .;.| 2.2.2.2.2.2.o.o.o.o.o.o.O.p o.o.M o.o.o.o.o.M o.O.o.o.o.v g.v v o.O. .>.>.>.>.>.2.:.>.>.2.>.>. . .M j  . . . . . . . .j  .;.j | | ;.n o.4.o.5.b.o.o.b.4.4.b.4.4.4.4.4.M ) 4.4.b.b.b.b.b.b.b.b.b.b.b.4.b.4.4.b.) 4.) ) Q )  X X X X X NXO + # @ a g g b g b f k b g BXBXCXCXCXCXBXVX4 4 T T T d e.O O O = - : BXP ; T d T 4 iXX O O & ; : E f : E f T f ( f f E S f f BXT T N T P 4 iXX X O & & ; NXT T d T d d V.o O O & @ = ; ; ; = f a k V.%X      T T T S S 4 kXo o O $ & = : : : : : D : S : : : f : a e.R 4 S P T d NXo O O $ : : > > D D h D D D W D D ;.D ;.e. S N d d P NXo O O O O O O $ O $ $ $ O O O $ O O O $ O $ = # O O O O & - = > k  .5.5.5.n.5.5.n.5.5.5.5.5.5.5.5.",
-        "<XgXgXhXgX<X<XgX4 l.SXSXh.8 4 -X<X<X<X<X1X>X1X+X$X@X@X@X;X;X;X;X;X>X>X;X>X1X+X;X>X;X>X>X>X>X+X;X+X>X>X>X$X>X>X X;X|.$X;X>X=X>X>X;X;X;X&X*X>X;X;X;X>X*X;X;X*X;X}.;X;X;X&X*X;X;X&X&X&XU.;XU.;X}.}.U.;X}.}.}.;X}.}.|.}.}.U.&X}./.&XU.U.L.P.Y.J.V J.K.L.L.L.U./.U.U./.U.I.I.&XI.&XI.I.I./.&X&XI.I.U.I./.U.=XU./.U./.U.}./././.{./.U./.U.{./.U.L././.'.XX'.L.XX'.Q./.W.XXQ.'.Q.XX'.Q.XXQ.XXG XXI XX_ I XXI XX'.I I I I I I I I  I  P  _ _ ' ' K ' ' K K K ' ' R R R R R ! R ! _ ! _ _ F K ' K ' H ! ( h h k ( h W W h h W k W ( W h h > h h h h W ;.W : = h > > r r > > r h h |  .| :.:. . ... . ... .| ;. .| ;. .;.2.2.2.2.2.2. .M o.o.M o.O.M o.o.o.o.o.o.o.o.o.o.o.o.o.o.v o.O.O.4.>.3.>.>.>.>.>.>. .2.2.>.>. ... .j  .| | ;. .2.h  . .h ;. .j |  . .o.2.4.2.4.5.o.4.b.4.o.4.4.4.4.4.2.2.2.2.2.4.b.b.b.b.b.b.b.b.b.b.4.4.) 4.b.) 4.) 4.4.NXT T T S T CX+ O # ; g g g b g b b g ) f CXE T T T E T E T T E T T T e.o O $ $ : : BXE T T T T T V.o O O & : S f ( E f : ( E E f f E f d f CXT E T T T T iXo X O & & ; NXE T T E T E NXo X O O & @ ; : a ; a g g V.^ T T E T E T T T E T T T iXo o O = $ : : , > : S S > f > : : : f ( V. E T T T T NXo O O = - > D ( ( > D D > ;.;.D D ;.D W e. T T T T T iXX X O O O O $ $ O $ $ O $ $ $ O = O = = O O - @ $ $ = = = : = k  .o.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
-        "hXhX<X<XgXgX<X<X<XP j.l.3 P <X<X<X<X<X<X@X>X@X+X>X#X1X>X;X:X;X1X1X;X1X>X>X>X;X>X;X+X;X+X>X>X>X/.>X;X>X|.;X+X|.;X;X|.;X;X;X;X;X;X;X>X>X;X;X>X;X>X&X;X;X;X;X;X;X;X&X}.;X;X;X;X;X&X}.}.}.U.}.;X&X}.}.;XU.}.&X}.}.}.{.|.{.U.U.&X}.&XU.L.Y.U.L.K.J.Y.B J.L.U.U././.U.U./.U.+XU.I.U./.I.I.&XI./.&XI./.&XU.I./.I.}.U.U.U.U./.}././.{./.XXU.'./.U.U.L.'.XX'.'.XX'.'.'.Q.L.W.Q.W.XXQ.Q.XXQ.'._ '.I XXV XX_ I I I _ _ I I I I I I I U U I _ _ _ _ ' ' ' K E.' ' ' ' _ R R R R _ R _ R R R ! R R ' F F F K K ( ( W ( W ( W ( ( ( ( ( ( h ( ( > h h D k > h > h > > > r > k > > h h h h  .| |  .| .... .:... .| :.;.;.2.;.;.2.2.2.>.2.2.4.4.o.M M o.o.M M o.M o.o.M o.o.o.o.M o.o.X.o.O.O.o.>.>.>.>.>.>.1.>.2.>.>.:. . .>.2.>.1.2.;.;.2.2.;.2. . .2.2. .;.| j ;.n ) 4.) 4.) 4.4.o.4.o.4.4.4.4.>.>.4.4.1.2.2.1.1.4.b.b.b.b.g.b.k.b.V.b.b.b.) 4.4.4.) ) NX% P 4 % 4 NXX X # & d g f f b ( g k b g CX; ; N % 4 5 N ; N % 4 N d V.O O O = : S BX% % % T N 4 iXX O $ ; : : : f f ( f ( f f f ( f f ( d BXN ; d 5 : 5 NXX o # & ; ; NXd 4 % % N ; e.o X X O & ; : g : h a a f V.E % % 4 % % % N : 5 N % % V.o O O O = : = a f : > ( : : : > S f > : e.R % P : 4 N NXO O O $ : : ( > D W ( W D ;.D D ;.W ;.~ r. % T % d N NXO O O $ $ $ - , $ - , - - , - - - - : , : , , , , : , : , > > |  .X.5.5.5.5.5.5.5.5.n.5.5.5.5.5.5.",
-        "<X<X<XgX<XgX<XgX<X<X%XR XX<X<X<X<X<X,X>X$X+X1X>X+X>X1X>X1X;X>X;X;X>X1X>X>X>X;X>X;X;X>X;X=X>X>X>X>X+X;X>X>X;X|.|.|.>X|.|.;X;X|.;X;X>X;X;X&X;X;X&X;X;X*X;X*X;X;X;X;X*X;X.;X}.}.}.}.}..U.U.}.;X}.U.}.;X;X}.{.|.{.{.|.|.|.}.U.;XU.U.U.Y.L.L.L.L.L.L.L.U.U.U./.U.U./.{.{./.U.{./.U.U.I.U.&X&XI.&X/.+XU.I.U.+XI.=XU.+XI./.}.}.+XU./.U.+X/.U.U.XX/.L.'.Q.XXL.'.Q.'.Q.XXL.'.W.Q.XXXXQ.'.XXXX'.Q.I E.'.'.I I I I I XXI I I  I I I I _  _ _ _ K ! _ F _ F A F _ R R R R R R R R ! R E _ R ' _ _ ' ' H K k ( h h ( h h h ( ( h W h ( W > h D h h h h h h h k : h > k > h k h > > ..| ;.| |  . . ... . ...2.,.1.1.1.1.1.2.2.2.2.2.Q 2.n o.4.o.o.o.M o.M o.o.o.M v o.o.M o.o.X.o.o.O.X.>.3.>.>.>.>.>.>.>.>. .2.2.>.2.,.<.,.<.2.2.;.;.Q ;.|  .Q  .h  .| j ;. .W Q ) 2.1.4.4.4.4.4.4.4.4.4.1.4.4.>.1.>.9.2.1.1.>.1.9.8.9.b.b.g.b.b.o.V.4.b.) 4.4.4.q.NXT T S P T CXO # # @ a g b g b b s b b b CXT T T T T T T T T T T T T NXX O & - : > BXT T T T T T NXX O O - ; : > : : f f T f f R ( f f E f BXT T T T T S V.o X O & ; ; BXE T P T d d NXo O O @ = = ; : : f a s f V.^ T T T T T T T T T T T T NX. O O $ $ : ; f ( ( : D : D : f : ( S f V. T T T T d iX. O O & : f D W D D h D h W ;.D W #.W ;.e. d T T ; T NX$ O $ $ - - - - , , , , Z > D Z Z Z Z , > > > > > > > > > h |  .X. .>.5.5.5.5.Z.5.5.5.n.5.5.5.5.5.",
-        "<X<X<XgXgX<XgX<XhX<XgX<XgXgX<X<X<XhX>X+X>X@X+X>X1X@X+X;X:X;X:X;X1X;X>X>X>X1X;X>X>X>X>X=X;X>X>X|.;X>X+X;X+X;X X;X;X X|.|.;X;X;X;X;X;X>X*X;X;X>X;X;X*X;X;X;X&X;X;X}.;X.}.;X.}.}.}.}.{.}.}.}.}.}.}.;X}.}.|.}.{.|.}.|.{.|.}.&X&XU.}.U.L.L.Y.L.L.L.L.P.P.U./.L./.U.U.U././.{./.{./.{.{.U.+X&XU.&X/.U.=X+X&X&X/./.}.U.U./././.U.U.{.{./.{.XXU.XXU.U.{.'.'.XXXX'.I '.W.XXQ.XX'.Q.XX'.J I XX_ _ '.I _ _ I _ '.I I I I I U .U I I I I U _ P  _ _ E _ F E _ E R R R R _ R R _ E R E R ! R _ ! ! ' _ K F h h h ( h h ( h h h W h ( k h h h h h h h h h h h h > > r > h h > h r h | |  . .| | >.X. ...X.2.,.2.1.1.;.,.2.1.;.>.2.>.2.2.4. .Q n o.o.o.M o.M b.M o.o.b.o.O.O.O.o.O.O.4.>.>.>.>.9.>.>.1.>.>.>.>.:.2.<.<.<.1.<.2.:.,.;.;.;.| ;.| 2.h j ;.;. .| h W k Q 1.1.) / 1.Q 1.4.4.4.>.>.4.1.1.>.1.4.9.1.>.2.9.1.9.7.b.b.b.b.b.g.g.C.4.b.4.4.) OXNXN ; % % d NXX O & ; g g b g b ( R k ( s CX4 4 N ; % ; N ; 5 % % ; N e.o O $ ; ; : BX% ; N 4 % % e.X O $ $ : : f D h ( ( ( ^ ( ( R ( ( ( ( CXP % % % N 4 NXo O # & ; a NXP d ; N 4 N NXo X O # - ; ; g > f k f f V.E % % P ; % ; N 4 N ; % : NXo O O = = , f f ( ( ( W : ( : : > : : : e.R S % % % % NXX O O $ : > > > ;.> D W W #.D | #.W W ,.e.^ N % % % N NX$ O $ - - , > Z > @.Z D #.@.#.@.@.*.@.#.#.> | #.| | { ;...:.:.3.>.>.X.4.5.5.5.5.5.5.5.5.5.5.5.5.5.",
-        "<X<X@X>X-XgX<XgXhX<XhX,X;X<X<X<X<X<X+X>X>X+X$X>X+X+X>X;X;X:X X;X;X>X>X1X>X;X;X;X>X;X>X>X>X=X;X>X;X+X;X+X>X|.|.:X|.|.|. X|.;X;X;X;X;X;X=X;X;X;X>X;X;X;X;X}.}.. X.}.|.}..|.}.}.}.}.}.}.}.}.}.;X}.|.|.{.{.{.|.{.|.|.{.{.}.}.;XU.&XI.Y.{.U.L.L.L.L.L.U.U.U./.'.U./.U.XX{.XXU.U.+X/.{./.'.{.XXU././././.=XU.}././.I.}././.{././././.XX{.XX/.'.+XU.W.'.L.XX'._ I XX'.Q.L.XXXXI XX_ XXI V XX_ XX_ '.'.'.I I I I I I I U I I U .U I I  U _ _ T _ ! _ A _ R R R R R ^ R E E R E E R R R R R R R E k h h h ( ( k W h ( h ( h h h ( > h h h h h h | h h h h > > > r > h | h > h | | | |  . .:.o.X.X.2.,.<.2.,.<.2.2.1.2.2.:.2.>.>.4.2. .2.Q 4.M o.M o.o.M b.o.o. .X.O.o.X.o.O.>.>.>.3.>.>.>.>.>.2.>.2.<.<.<.<.7.1.<.<.<.<.<.:.2.;.;.2.2.h 2.2.;.Q | h W | W W ( Q Q 1./ 1.1.1.>.1.4.2.4.2.2.4.1.2.9.4.<.1.>.9.<.9.<.1.1.b.b.b.b.g.C.) 4.4.) 0.7XNXd N d % % NXO O & @ a s b b b b b s b c BX5 : N % 4 % 5 % N % d % P iXX O & : : S BXN d 4 P ; N iXo O $ & : > > : D f ( E ( f ( f f ( d > CXS 4 T % N 4 NXo X O & ; ; NXT T % % % % iX. O O O @ ; : : : D f f f V.E % % 4 N % % % % d 4 N ; NX. o O $ = : f f k ( : D > ( ( > S : > > e.R % % 4 4 N NXO X O $ : > D D h ;.W ;.D D ;.W ;.#.~ ;.e. ; 4 S % % NX$ O - - > > { { #.#.#.#.$.#.=.*.*.=.=.*.=.=.<.3.3.X.3.:.3.3.3.=.3.>.>.5.>.5.>.>.5.5.5.5.5.5.5.5.t.",
-        ">X<X@X,X<X-XgX<XgX .+.N.n.N.p @X<X+X>X+X@X>X+X+X>X$X>X:X;X;X;X;X;X;X;X>X>X;X1X;X;X;X;X;X;X>X>X;X>X|.;X>X X|.|.|.|.|.|.;X|.|.;X;X;X>X;X;X&X;X;X;X;X;X{....|.|..|.|..}.}.}.}.}.}.}.}.}.}.}.}.|.{.{.{.{.|.{.|.{.|.|.}.|.}.&X}.U.;XU.L.L.L._.L.L.L.L./.U.U.U./.{.U.U.U.U.U.{.'.{.XX/.{./.{.{.{.'.'.{././.I.U.=XI.+X/.}././.{.{.{././.XX/.+X'././.'.'.XX'.'.'.XXXX'.XX_ L._ '._ '._ XX_ V I '._ I _ I I I I _ I I I _ I I  I I I I _ _ _ _ E _ E E E R R R _  R R R E E E R R R R ( R E R R ( ( ( ( k h h h h h h h h ( h h h > > h h W h h h h | ;.h r h h h | r | | h  . .| |  . . ... .2.1.1.,.2.1.2.,.2.;.2.2.>.2.>. .2.n 4.4.n o.o.M o.M M M M o.O.O.O.O.5.O.>.>.3.1.>.>.>.>.>.>.>.>.>.7.7.7.<.<.<.,.,.<.<.<.1.<.<.2.;.;. .;.;.| h | W  .| h h h Q h W 1.1.Q 1.) 2.1.1.1.2.2.1.>.>.1.>.1.1.1.2.9.8.<.1.1.8.8.4.b.b.C.b.b.b.4.e.~.uXCX     VXX X & ; : f b b n b b b b c CXk.      T E T E T E k.X O & ; : > BXE T T T T E e.O O & - : : > D h ( ( b ( f E R ( T ( f CXE T T T T P iXo + & & ; a V.CXBXCXCXCXBXNX4 T T ( ^ ^ ^ / ) 8./ 2.1.BXCXCXBXBXNXCXVXR E T E E E iXX O O $ = f f f ^ S D ( : ! 8.8.e.e./ / BX E E T E T CX: : T ! / 8.1.> D > W W ;.;.h D ;.;.~ #.r.VXCXBXCXBXCXCXS ( ! ` ,.7.3.r.w.w.r.r.r.yXyXyXfXyXyXpXyX-.=.3.3.3.3.3.3.=.-.-.-.>.5.5.5.3.5.5.3.3.5.5.5.5.5.5.t.",
-        "<X+X+X<X+X>X<X<X' H.B.N.m.SXh.M +X+X+X>X>X+X+X>X+X>X$X;X;X:X;X;X;X;X;X>X;X X;X;X;X1X:X X;X;X;X=X;X}.;X|.}.|.|.|.|.|.|.|.|.;X}.;X;X;X;X;X;X;X&X..{..|.|..|..|.|.|.|...}.}.}.}.}.U.}.}.}.|.{.+X{.|.{.{.|.{.}.|.{.|.{.|.}.I.;XU.}.L.L.L.L.'.'.L.L.L.U./.L././.U.'.U.{./.{./.U.XX'.XX{.XXXX{.+X'..{./.;X>XU./.U.U.U./.+X+XU././.'.'.'.XXU.L.'.'.'.'._ Q.I '.I XXI XXXX_ '.'._ Q.'.'.XXI '.I I I _ I I I I I I  .U I I I I I I I U _ E R _ E _ R R  E _ R E R R E E R R R R R g R R E ( k k ( k W ( h h ( h W h ( W h h h h ( h W h W h h h h h h h h h h r h | h  .|  .| h |  .......2.1.1.1.,.1.1.2.2.:.,.>.2.>.>.2.>.o.n 4.n 4.o.) M M M o.o.X.O.X.X.O.O.>.9.>.>.>.9.>.>.>.>.>.>.:.>.<.7.$.7.<.<.<.<.7.1.<.,.2.:.<.;.2.;.W ;.W ;.h | W h h j D ( W W / 1.1.1.1.2./ Q 1.8.1.2.4.1.1.>.9.2.1.<.1.1.<.1.8.1.1.1.1.1.b.b.4.4.b.eX7X~.iXuXiX%XoX'  CXBXNXCXCXBXCXCXCXCXVXCXCXCXBXV.V. /  ^ VX: N T T P d V.O O & ; : W BXd % T S d P V.O O = - : : f > > ( ( ( ( ( f ) E f ( ( BXP d d d d T iXo X # & a a f g a & $ $ O  NXe.  k.e.%Xk.iX k.k. BX, : - $ O O  E 4 d d 4 N NXX O $ @ = f f f D W > W D BXNX      E d S 5 S T        VXD D h W ;.W ;.;.;.;.#.#.~ ,.D D D - - $ ! CXk. %XV. kXkX %XV. e.  NXe.e.k.e.KX=.=.-.3.y.3.y.-.-.-.-.-.3.>.>.5.5.3.5.3.3.5.p.3.5.5.5.t.",
-        "#X@X@X>X<X#X>X/.C.H.B.B.B.v.h.g.k B .+X>X+X$X+X>X$X>X;X;X1X;X:X;X;X1X;X:X;X|.;X;X|.|.;X|.|.|.|.;X|.|.}.|.|.|. X|.|.|.;X|.;X|.;X&X}.;X&X>X;X>X;X{..... X.|.._..{.|.|.}.}.}.}.}.}.}.;X}.Y.{.{.{.|.{.|.{.|.{.{.|.{.|.|..;XU.&X;XU.L.L.K.L.L.L.V L.L.L./.{.'.U.U.U.+X'./.'.{.{./.{.XX{.{.XX{.'.XX'.I./.I./.I.>XU.+XU.U./.{.+X'.+X/.XXXX'.XXQ.I XXI '.'.I U U I _ '._ '._ Q.'._ I _ _ I _ I V I I I _ U I I I . I U _ U I _ U I U U _ _ _ _ _ R R R R R R R E R E E  R b R R R R R R ( ( ( h ( k ( h k h h h h h h h f > h h h h | h | W h h | | h h h | | | h  .h |  .| | :.>... .,.1.1.,.2.2.:.2.,.2.2.>.2.2.>.2.>.>.>.Q n Q o.4.o.M o.o.O...O.X.O.O.O.X.>.>.>.3.>.>.>.>.>.:.2.>. .>.<.7.7.<.<.<.<.<.,.<.7.<.1.<.2.,.;.;.;.h ;.h ;.W | ;.| h W D ~ W 2./ 1./ 4.1.1.~ ,.,.<.1.1.9.>.1.>.1.9.>.9.9.<.9.1.1.4.1.e.1.1.e.4.b.e.7X7X).7XK K F L $ N NXS T ; T T % S T T ; d T T BXg f : - $ $ NXP 4 S 4 d T  X O - : : > BXP d % T T d NXX O $ : : D D D ( R ( R ^ ^ ^ ( ( ( ( E BXd N N d S d NXX O $ & ; a d f d - : & O  T d P P d T ; 4 P S T T T BX: = - = O O  R d N N d d iX. $ - - - E h D ( D ( ~ > iXR P T T T P T 4 N 4 N d % N % T T T T T BXh > > #.D | #.W ;.;.,.,.,.#.#.~ > > : & !  T S d d : T ; : T d P T T % d P N ; N VX=.=.=.-.w.y.-.-.-.y.pX-.-.9.5.3.3.5.>.5.3.3.3.3.3.3.5.5.",
-        "<X+X#X<X+X<X}.E b.B.B.B.H.H.h.h.O.N .'.+X+X>X+X;X}.;X:X;X|.|.:X;X;X;X;X X;X;X;X|.;X|.;X;X|.|.|.|.|.|.}.|.|.|.|. X|.;X|.|.;X;X|.|.}.U.;X&X;X;X}..{..{.. X.|._.L.K.'.{.}.}.}.}.}.}.}.U.>X}.{.{.{.+X|.{.{.|.{.{.|.{.{.|.|.|.}.I.;X&XU.L.K.L.L.{.L.L.L.K.L.L.XX{./.'.U.{./.'.+XU.'./.'.{.XX{.XX{.XX'.XXXXU.I./././.=X/./.+X/./././.XX/.U.XXXX'._ '._ I _ '. U  U _ XX'._ XXI '._ XXV '._ V _ _ I _ I I I I _  I I I I I U I _ I U I I  %X_ _ R _ R R R R R R E R R R R R b R R R R R f ( ( ( h ( k ( ( h h h h k h h h h h h > h h W h h h W  .h | h h  .| h | | | |  . .:...:. ...:.,.1.1.,.1.2.,.2.2.;.2.2.>.>.>.>.>. .X.4.o.Q o.n o.o.X.o.O. .O.X.+.X.X.X.X.>.>.>.>.>.>.3.>.5.1.;.:.>.>.<.7.<.,.<.7.<.<.7.<.,.<.,.2.:.:.2.1.;.W | W | h ;.j | W D D ( W ,.1.2.1.1.W / ;.,.,.,.1.8.1.1.1.>.7.1.<.<.9.1.1.1.1.4.1.4.8.1.,.1.rX7X).~.~.~.K H L - S NX% N d N % % % % % % N ; P BXg : : S & $ NX; N % % d %  O O & : : D BXN : 5 N % % NXO O $ : > > D D ( R ( ^ ^ ( ^ ( ^ ( ^ ( BXN : 5 N % % kXo O O & : f d f : : - & & e.T % % : N 5 % % % % % % % BX- = $ = = O e.E 4 % % N % iXX $ $ - L Z K D ! D W ~ D NXR T N % % % d N ; % 4 N ; % % % % N ; % CX: > > D W ;.;.:.;.;.,.#.#.;.#.~ D > : : '  % % % % N 4 % % N 5 % ; N % N 5 : N 5 BX$.*.=.=.-.-.-.-.-.-.-.-.-.-.p.5.3.5.3.3.5.3.3.3.3.3.3.3.",
-        "#X<X,X=X>X}.{.k B.B.B.H.SXm.N.v = I jX`.|.;X}.}.}.}.;X;X;X:X;X;X X:X;X;X;X;X.:X;X|.;X|.;X.|.;X.;X}.|.}.|. X|.|.;X}.;X;X|.}.|.}.}.;X;X}.}.;X}.....{..{.{.K.K.K.K.K.K..;X}.}.}.}.}.}.}.|.{.{.{.{.{.|.{.{.|.{.|.|.{.|.{.|.|.}.U.'.L.K.'.L.'.L.L.L.L.L.'.L.U.XX/.'.XX'./.'.'.{.XX{.{.XXXX'.'.{.XX'.'.W./.}.}./.U.}.U.U.}.U.{.{.XX'.XXXX'.XX'._ '.'.'._ '.U I U I '.XXI I I _ '._ I _ '._ '.V I V U I I I I I I I I  I . I I U I I I I _ R R R  R R R R E R T R R  R R R R R b R E j k ( k h h h h h h h h h h h h h h W h h W h | | W W h  .h | h | | | |  .h h ..:.>.:. ...2.1.,.1.,.2.<.2.2.,.;.:.,.,.;.2.:.:.2.>.>. .Q 4.n  .....O.X.X.O.X.X.X.X.X.X.X.>.>.3.>.>.>.>.>.>.>.;.;.:.| $.7.$.7.<.<.<.<.$.,.<.2.<.2.,.,.;.;.;.;.h 2.;.W h ;.;.h ( D D W W / Q / 1./ / W ,.,.,.8.1.<.<.1.2.9.9.<.1.7.9.1.e.1.1.1.1.,.~ ,.' 7X7X7X7XeX4X~.K F L F NXN T d T T d T T T T T T E NX: S - $ : - BXT T T T T T NXO & & : > W BXd T T T T P e.X O $ ; : : > W ( ^ ( ) ( ( ) ( ( ( / ( VXT T T T d P iXX O O $ : : a > S S : - $ NXE T T T T T T T T T T T T BX& - & $ $ $ e.R T T T P d iXO $ $ - Z Z Z %.@.*.D D ( r. T d T d T T T T T T d N T T T T d N 4 BX- : > > > D ;.,.,.,.,.$.,.,.,.#.D D > > 8. T P T T d T T S T T T T T T T T T T S BX#.#.#.=.=.-.-.-.-.y.-.y.-.-.p.3.3.5.5.5.3.p.p.3.p.3.3.p.",
-        "<X#X>X+X}...@ z N.B.N.h.N.O.r %XvXkX_.U.}.&X.}.;X;X:X:X;X;X X;X;X;X|.;X:X|.|.:X..;X|.;X|.}.;X|.|.;X|.|.|.|.|.|.;X|.|.|.;X|.}.;X}.}.}.;X}.{.......{._.K.L.`.K.K.K.'.K.U.}.}.}.;XU.&X}.{.{.{.{.+X{.|.}.{.+X|.|.|.|.{.|.{.{.'.L.L.{.L.'.L.L.'.L.L.'.L.'.U.L.W.{.U./.'.U.{.U.{.W.{.'.{.'.XX+X'.XXXXXX/.+XI.U.U./.}.+X&X+XW.XX/.XX{.XX'._ _ '.'._ I _ ._ U I I _ _ I I XXI XX'._ V _ V _ _ I I I U '.I _ '.I I '.I I I I I I  I I I I I _  R ' R R R E E E R  ( R R R R R R R R ( ( k h h h Q k h k h h h h h h h h h W h ( h h W h W | | | W h  .|  .| r > r > >.>.| :...:.1.,.2.,.2.<.2.;.;.,.2.;.,.:.;.,.;.;.;.2...X.o.o.X.X.o.X.X.X.X.X.X.X.X.X.X.o.X.5.>.>.>.>.>.>.>.>.>.:.;.;.| | 7.7.<.<.<.<.<.<.<.,.<.<.:.:.,./ ;.;.Q ;.W ;.h ;.| Q ;.~ W ~ W W D W W W ~ ~ ~ ,.,.,.<.<.,.<.8.<.1.7.1.1.9.<.1.1.1.1.Q / W ,.1.7X#X7X~.eX4X4X~.K K F K NXT T T T T T T T T T T T E iXS - S S : S BXN T T T T T e.X $ $ : > f BXT T T T T T iXo $ & : S ( ( ( / Q ^ ^ ^ ^ ) ^ ( ! ( / BXT T T T T T NXX O $ & S S L S D D : L : NXE T T T T T T T S 4 T T T NX$ $ - - - - e.R T T T d T NXX $ - - Z Z Z %.Z @.*.Z *.iXR T T T N T T N d T T S 4 T T T T T T P BX: - : > D ;.;.;.:.#.,.7.<.<.<.;.;.#.W D q. T T T T T T T T T T 4 S T T T T T T T BXZ Z #.#.$.=.-.y.-.y.y.-.-.-.-.5.5.3.3.3.3.p.3.3.p.3.3.r.",
-        "+X<X}.}.. X.T  g.) o.g.g.k  bXbX{.}.}.&X.}..;X;X;X;X;X;X:X|.:X;X:X;X|.|.;X|.;X|.;X|.;X|.;X|.|.}.}.|.;X.|.|.|.|.|.;X|.|.|.}.}.}.;X}.}.}.{........K.K.U L._.L._.K.{.L...U.;X;X;X}.}.{.{.{.{.|.{.{.|.{.|.|.{.|.{.|.{.{.L.{.L.L.'.L.L.K.L.'.'.L.L.'.'.'.L.L.'.{.XX{.XX'.'.'.XX'.XXXX'.'.XXXXXXXX'.U.>XU.=XU./././.U.{.U.'.W.'.XX_ .XXI _ '._ '.I I I U I I _ I _ '.I I _ I I XX_ '.XXU V _ U  I I  I I  I I I I I I I I I I I I _ _  R R R R _ R R R R  R b R b R ( R R ^ R b ( ( ( k h h h h h h h h k h h h h W h h h | Q | h Q W | | | | h { ..{ { ....:.;.:.2.,.,.1.,.1.2.2.,.2.,.;.,.:.2.,.;.:.,.;.;.;.>.;.:.....X.X.X.O.X.O.X...X.+.X.X.X.X.X.X.>.>.5.>.>.>.3.>.>.:.;.#.;.$.7.6.7.<.<.3.<.<.:.<.,.<.1.;.;.;.2.;.;.W ;.;.;.W W ~ ~ D ! W ~ ~ D ( W W W ,.~ ,.1.6.,.1.8.1.,.7.1.7.<.<.9.1.4.1.~ D ~ ( ~ K 7X7X7X7XuX7XeXeX4X~.K ~. X . o X . X . X o X . o X NX$ % - : : S BXo o . X o X NXO $ % : S ( BXX o . X o o NXO $ & : : > D Q ^ R ) ) ^ / ^ ( ^ ^ ~ ( CXo o . X o o iXX O $ % - : S D A S : D : NXX X o . X X . X X . X X . iX$ $ $ $ - : iX& . . X o X rXO $ $ L L Z @.@.*.@.*.%.*.aX% X o o X X o X X . X X o . o X o o X . e.O & : > > ;.;.;.,.7.#.7.<.<.<.<.<.<.;.#.iXT o o o X o X o o X . . X X o . X . X X NX- - Z @.$.-.-.-.y.-.y.y.y.-.0X3.3.5.p.X.y.X.r.3.3.r.p.w.",
-        ">X}....vXbXbXvXbXkXbXvXvX..bX.`.}.}.U.}.}.;X;X;X:X;X;X:X;X;X;X;X;X;X;X:X|.;X|.;X;X|.|.|.|.}.|.|.}.|.|.|.|.;X|.|.;X|.}.|.}.}.}.|.}.}.;X{.{.{..._..{._.K.K.K.K.K.K.'.K._..{._.L.}.}.;X}.}.{.{.{.{.{.}.|.|.{.{.{.|.{.{.|.|.{.{.'.L.L.L.K.'.L.'.L.L.'.Q.'.'.L.'.'.{.L.'.U.'.XX'.'.XX'.'.'.'.'.XXXXI XXXXI /.+XU.>X/.}.+X/.W.{.XXXXXX'._ I _ I _ '.'._ '.I  I U _ _ '._ _ I _ I I I I I _ _ I I I I I I   .U U  I I I I I I  '.I I I I _ R R R R R _ R R  R R  ) R R E R R ( R R ( ( R ( R E ( ( h k h h h h W h W W h h h W h | h | Q ;.| h | { { ..r { | | :.>.| | 1.1.1.,.2.1.,.1.;.2.;.,.;.,.;.,.<.;.;.;.;.;.:.:...:.:.X.{ } X.X.X.+...X.X.X.X.>.X.X.X.>.>.>.>.>.>.3.>.>.3.:.| h ,.7.7.<.7.<.<.<.<.<.:.<.<.;.,.;.;.;.,.,.,.~ ,.,.~ ,.~ W ~ ,.W ~ ~ D D D ~ W ,.6.,.6.6.,.,.<.<.<.8.9.<.<.9.<.1.1.8.0.D D D ( 7X7X7X7XuXeX4XeX4X4X7X~.eX%X$ & & & * & & & X * * O & e.& $ : S D D BX& # & & X & NXO $ $ : > W BX* & O & O O NXO O $ : : ( D ( ^ ^ ) ^ ^ ) ^ ^ ^ ( ! ~ BXO * # O O * iXX $ & N - L Z D D D D D : iX% O & * # & * * & $ * O * iXO $ - - $ , iX% O & * & * V.O $ $ - Z K @.K *.%.#.@.*.iXS & O * $ * O * & & * O * & & * & & X & NXO $ , : > #.2.;.<.6.7.#.<.$.<.<.<.<.<.<.r.R * & & & * * * # * # * & & & X & O # O NX- , > } $.=.-.y.-.y.-.y.p.-.-.-.3.y.$.y.$.y.$.p.3.3.3.y.",
-        "..*X}. XHXHXbXbXbXbXvXvX X.Y $XY `.U.;X}.}.}.}. X;X;X X;X;X;X;X:X X;X|.;X.;X;X|.|.|.|.|.|.|.|.|.{.|.}.;X|.|.|.|.;X|.}.|.{.}.|.}.}.}.}.;X{.{._...._.._.U K.K.'.K.K.K.K.L.L..{.{.Y.{.Y.{.U.|.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.|.{.{.L._.L.'.L.'.L.'.'.L.L.'.L.XX'./.XX'.XX'.'.'.XX'.'.'.+X'.XX'.XX'.XXI I XX'./.I.U./.I.U./.XXQ.XX'.I I I XXI .'._ _ I I XX.I I I I I I I _ I V _ I I _ V V V _ I _ I I I I I U I .I I  I  I I _ I _ I _  R R _ R _  _ R ^ R R R R R R R R ( R ( ( R R ^ R ( ( ( ( E ^ ^ ( ( W ( ( h ( h W h h h W Q h h h > | h | h { | { ....2.:.:.,.1.<.,.2.,.:.2.,.2.1.;.,.2.:.,.;.;.;.;.#.;.;.:.| :...| ..X.X.X.X...} X.X.O.X.X.X.5.X.X.X.X.3.>.3.>.>.>.>.>.>.;.#.<.3.$.<.<.<.<.<.<.<.<.<.:.<.,.,.7.<.6.,.,.,.6.,.,.D W D ~ ~ ~ ,.D W W W ~ D 6.,.,.#.,.6.6.*.,.8.<.1.1.9.1.7.4.8.0.*.0.: A K 7X7XOX7X~.7XeX7XeXoXeX4XtXBXiXiXiXrX%X'  '   ' '  S $ $ S L D ` q.iXiXiX   T $ $ : : f W e.BXe.e.   S O - ; : > D W / ^ Q ^ ) ^ / / / ~ / ~ ! e.NXiXiX   S X $ $ - L L Z K Z D D S D 6.iXiXe.  R ' ^ ' ^ _ '  S $ $ - L L : ~ e.iXq.e.e./ S $ $ - L Z Z Z *.@.*.%.%.$.=.iXiXiXiXe.8. / ' ' ' ^  ' R  ^ ' !  E $ = : , > W ;.;.<.$.7.7.7.<.w.<.7.<.<.<.9.fXfXiXtXtXq.8.` 8. 8. ` / 8.'   8.' W - - Z D $.$.y.-.y.-.p.-.-.-.=.-.-.3.$.y.y.y.y.-.y.y.-.y.",
-        ".&X}...`......'... X_.B .`.}.U..}..}.:X|.;X;X;X;X X X;X:X;X:X.;X|.|.;X:X|.|.;X|.|.|.|.|.|.|.|.|. X|.|.|.;X}.|.|.{.}.}.}.;X}.|.{._.{._.._._._._.K.K.'.K.K.'.K.K.K.L.{.{.{.{.{.Y.{.}.}.}.{.{.{.{.{.XX{.{.{.{.{.{.{.{.{.|.{.'.'.{.L.'.L.'.L.L.'.'.'.L.'.'.'.'.Q.'.XXXXXX'.'.XXXX'.'.'.XXXX_ XX'.XXXX'.XX}.I.&X/./.{.'.XX_ I ._ _ I I I _ XXI I '._ I I  I I _ I _ I I XXI I J I I _ V _ U U .U I  I  I U _ U I I I I I I U I _  R R _  R R R ' R R R R b R R R R R E R R R R ^ R ^ R ( R ^ ( ! ( ! ^ ^ ~ ( ~ ! ( D W W h h | W > h | | h | { ..{ | ..:.2.:.:.:.,.1.1.,.2.,.,.2.2.;.;.;.;.,.;.;.:.;.;.;.#.| ..;.......{ X.X.X...X.....} X.X.X.X.X.>.X.4.X.>.>.X.>.3.>.3.>.>.:.:.3.<.7.<.<.<.$.3.<.<.<.<.<.$.<.6.<.6.6.6.,.,.,.,.D ,.~ ~ W #.~ ~ ~ ~ D ~ #.` ~ ~ ,.,.,.,.6.*.6.<.8.9.<.7.<.<.6.eX*.0.0.K D ).7X7X7XuX7XtX7XtX7XeX7XeX~.4XK ~.H L $ $ * $ * $ $ * & $ $ - - D D K ,.K D S : - $ $ $ - : S ( W W W D D ; & $ $ $ & - S > W ~ / / / / / / Q ~ / / / ~ ~ ! ! D S - $ $ $ $ $ - L L H %.Z K K Z K D D S - - - $ $ $ X O $ $ X $ $ $ $ - L Z Z D D Z D - - $ $ $ - - L Z @.*.#.%.#.%.%.*.%.*.@.Z - - $ $ $ $ $ $ O X $ X X X O $ O O O $ - : h ;.;.>.7.$.7.$.7.7.7.7.w.$.w.7.=.&.&.%.@.Z - - - $ - $ - $ $ $ - $ $ $ - - - - Z #.$.$.p.-.-.p.-.-.y.-.0X0Xy.-.y.$.-.$.-.y.y.-.-.y.",
-        "..}..}._.$X$XjX.'..$XjX X.._.K...}.}.Y.}.;X:X|.:X;X:X;X;X;X|.;X;X;X|.;X;X.|..|..X|.|.|.|.{.|.|.|... X|.|.|...{.|.{.}.}.}.}.{._.{._._...{._.K.K.K.K.K.K.K.K.K.K.'._.Y..{.{.{.}.L.L.B {.+X'.{.{.{.{.{.{.{.{.{.|.{.|.{.{.{.L.L.'.L.'.L.I L.L.'.L.'.'.I '.'.'.'.'.'.'.'.XX'.{.XX.'.XXXX'._ _ XXI _ XXQ./.&X+XI.XX_ _ _ I  I I I I _ I I XXI _ XX.I I I I _ '.I I J I _ XX_ V J I _ U U U  I  I I I _ U I _ I I I  XXI _   R R R ^ _ _ ' R R _ R _ R R R R R g R R E ( R ( R ( ( R ! ( ^ ^ ( ( E ~ ( ! ~ ! ! W W W h D h > h { { | > { | > { > { { ;.;.;.,.;.;.1.,.2.,.,.2.,.;.,.;.;.;.,.:.;.;.#.:.| ;.;.:...:.....$.X.X.X.X.} ......X.X.X.X.X.X.5.X.>.X.>.3.>.>.>.>.>.:.:.<.3.3.w.<.$.3.7.<.$.3.$.$.3.<.<.<.6.7.6.6.6.6.~ ,.6.~ ,.~ ~ *.6.,.,.~ ,.6.~ #.,.6.,.6.6.6.6.<.,.6.<.,.7.1.8.7.*.*.*.*.*.eX4X7X7X~.7X~.7X7XtX7XtXuXeX4XeX4X~.*.H G L L L - $ $ $ $ $ - N S S A D ~ *.,.D D S : - - $ ; : f W ~ ;.W ! D : : - & & - : : D W D K ,.` / ) / 8.K ~ K ~ ~ ~ ~ ! D D S S $ N $ $ - : L Z Z ~.Z %.K %.Z D D > L - $ $ $ $ $ $ $ $ $ $ $ $ L L Z K Z Z Z L - - - - $ - - Z D D *.%.*.$.*.#.*.*.%.%.Z Z L - - $ $ $ $ $ $ $ $ $ $ O $ - & = = : > > 2.:.<.*.q.=.5Xw.5Xw.5Xw.5X5X=.0X0X5X%.%.Z Z L L - - - - - , - - - , - - - Z , > #.$.w.} -.-.-.y.y.y.y.=.-.-.-.y.-.y.-.-.-.y.-.y.-.",
-        "}..}..._.vXkXvXB . X$X$X X..`.K.}..U.U..;X;X:X|.;X;X;X:X:X|.;X;X;X;X:X}.:X|.|.|.|.|.|.|.|.|..|.|.{.....X|.{._....{.}.|.}.}.._._.B B {.._.`.`.K.K.'.K.K.'.K.K.U K.'.U.{.Y._.K.V B B V _.{.{..{.{.{.{.XX{.+X{.{.{.{.{.}.{.L.'.'._.L.L.'.L.L.'.I '.'.I '.'.I '.V I L.V I U U U U U U U N V P N I U _ L.XX/./.{._ XX_ _ I _ I I  _ ._ _ I _ _ V _ I I I U I I _ U U J I U _ _ U N N U U  .U U I I I I I I I '.I  _ I _ _ R R R R _ R R R ' R R _ R R ' _  R R E R E R ( R R R ! E ( ^ ( ^ ( ^ E ( ! ! ! ~ ^ ~ ! ~ W ;.> W > > | ;.{ | { h { ..{ { { | 2.:.,.#.;.;.,.2.,.2.,.~ #.~ ;.W ;.;.;.,.#.#.;.;.;...| | :...X.X.X.X.} ..X.} ..{ ..X.X.3.X.X.X.>.X.>.>.:.>.3.:.<.$.<.<.7.3.3.7.7.$.7.$.w.<.7.$.3.3.3.$.3.6.6.6.,.6.*.6.6.~ ~ ,.~ ~ *.~ ,.6.~ #.` ,.6.~ ,.6.6.,.6.,.6.6.#.7.<.7.7.*.7.*.*.*.4X*.4X).4X7X7X~.~.4XtX4XtXuX4XtXuX4XeX~.K K H L L L L N L L - L - S L D K D *.6.6.#.D D S : L S - D D W W / / W ( > : - : & : : D D ! D ` K K 6.6./ ` K *.~ K D D D ~ D S : - - : S S L L Z Z K Z %.K %.K K D D D L L - - - $ $ - - - - - L L L L Z Z K %.Z Z > Z - - - - L Z Z *.#.*.*.$.$.*.*.%.%.%.Z Z Z L - - L - - - - - - $ - - - - - , : D D D $.=.2X5XyX5X5Xw.yX5Xw.5X=.yX0X0X3X5X&.=.%.Z Z Z Z L L Z , Z , Z > , { > > > @.#.$.$.$.y.-.y.y.y.y.y.y.-.-.-.-.-.-.-.-.-.y.-.-.-.-.",
-        ".*X.}.|.{.bXbXkX.`..$X1X X._.`.K.}....{.;X:X;X:X:X|.;X|.|.:X;X X;X|..;X|.|.|.|.|.|.|.|..|.{.|.|.{..{.{.|.._..._._._._.{..}._._._.B B _.._.`.K.`.`.K._.V K.K.K.K.K._._.{._.'.B B B C U '.{.{.{.{.{.{.{.{.{.'.{.{.{.{.{.'.{.'.L.L.L.'.L.'.V U I U I V U V U U U I U I I U V U V V N N U N N N N U P U J '.'./.XX_ XX_ I _ I XX'.I '._ _ '._ '.'._ _ I XX_ _ I I I _ U U U U U U I U N P U I  U  U  I   U I  I I I I I _ R R _ R  ' _ R R _ R _ ' _ ' R R _ ( R ( R E E R ^ R R ( E ( ^ ^ ^ ! ~ ( ~ ~ ^ ! ~ ! ~ ! D ;.W > > ;.> > | > | > | > { | { ,.;.#.,.;.;.:.;.;.,.;./ 1.;.;.;.#.W W #.;.;.:.;.{ :...;.{ ....:.X.} X.X.........X.X.3.X.X.X.>.>.X.>.X.X.:.3.<.<.<.3.<.$.$.3.<.3.3.7.3.<.$.$.7.3.$.$.<.3.$.3.6.6.6.6.,.6.6.6.,.,.6.*.,.6.*.6.6.,.6.~ ` #.,.,.,.6.6.6.6.7.0.*.*.*.7.*.7.*.*.*.4X' 4X).7X~.7X7X7XuX7XuX4X4XtX7XeX4XeX4X~.4XK K K L F L H Z A L K D K D 6.*.6.6.6.6.6.D D S L L L L K D ~ ,.1.~ ~ D S > : S D D D ~ ~ ` ` *.6.*.K *.6.*.*.D ,.*.K *.D K K Z S L S L L Z L K K %.%.K *.Z %.Z K Z D Z L L - L - L L L L L L L L Z Z %.%.%.K %.Z Z D L Z L D Z D *.*.*.$.*.*.%.*.=.%.=.=.*.%.Z Z Z Z L L Z Z L L L L - : L Z Z Z Z Z Z %.%.=.5X5X5X5X5Xw.5Xw.5X5XyXw.0X9X0X0X&.&.&.%.%.Z #.#.#.@.#.#.#.#.#.} } #.@.#.$.$.$.$.y.y.y.y.y.y.y.y.y.-.-.-.-.-.-.-.-.-.-.y.-.-.-.",
-        ".}.}.}.}..bXbXbX$X X.vXkX X._.`.{..K.K.Y.|.|.;X|.|..;X:X X|.|.;X.|.;X;X|.|.|.|._..|..|.|...|..|.{._.......`.`._.`._._._._._._.`.V _._._.`.K.K.K.K.`.`.K.K.K.K.K.V K.'._.B '.'.'._._._._.{.{.{.{..{.{.{.{.{.{.{.{.{._.L.'.'.L.L.L.V V V I V '.U '.V '.V '.V V U V V U U V U P N Y N U Y N N U U P I _ '._ _ _ _ _ _ XXI _ _ I I _ '._ _ _ I I I _ '.V U _ U _ U _ U U _ _ U P U U P _ U I . ._ I U _ _ _ _ I I XX_  _ _ R R R ' R R R R ' R ' R _ _ _ R ' R R R ( ^ R R E E R E ^ ( ~ ( ^ ~ ~ ~ ~ ( ~ ~ ! ~ ^ ~ ( W > ;.| | { | { { { | { > ..{ { ,.;.,.;.<.;.;.#.:.;.,.;.;.,.;.W W W D ;.#.W { | #.;.;.....X.X.X.X.} X.{ } X...{ } ..X.$.>.3.:.X.:.<.$.*.$.,.<.<.<.<.<.<.<.<.3.3.=.w.$.$.<.w.$.3.7.$.3.$.3.$.3.$.6.,.6.,.6.,.6.6.6.6.*.,.*.~ *.6.*.~ ,.,.6.,.6.,.*.,.*.*.4X=.=.0.*.7.7.*.K *.*.4X7X7X7X7XuX7X~.7XtX7X7XeX4X4XuXtXeXeX4X~.K 4XK K K ~.K K *.K *.K *.` 7.7.7.0.*.0.*.~ D K Z K K #.K %.*.*.*.6.~ W ! D D D D D D ~ 6.K 6.` K *.*.K *.*.*.K ~ K #.K K D K K Z K L L Z K Z %.Z %.%.K %.%.K @.Z K Z D D Z Z L L L Z L Z L L Z Z Z Z K Z %.Z %.%.K Z D D Z D Z K #.*.$.=.*.q.*.*.%.=.%.%.%.%.%.%.%.Z @.*.Z Z Z Z D D Z Z @.K #.%.Z *.Z %.*.2X5XyX5X5X5X5X5XyX5X5XpX5X0X9X0X0X5X5X5X5X&.&.=.$.$.$.$.$.$.$.$.} $.$.$.$.$.$.$.y.y.y.y.y.y.y.y.y.y.0X-.-.-.-.-.-.-.-.-.-.-.-.-.",
-        ";X..*X.{.JXbXbX X.$XkXvXjX'.B `..Y..}...:X.|.|.|.{.;X;X:X|.;X:X:X.|.;X|.;X X.{.|.{.|..{.{..{.{..._.._._._.._..X_.._._._._._._._._._..X`._.`.U `._.K._.`.K.'.K.K._.K.K.'.K._._._._.'._._.'.{.{.{.{.{.{.{.{.{.{.{.L.L.'.{.L.L.K.V '.I V U V I U U '.U U I U U U I U U U V U V U V N N N N P N N N N _ '.XX'._ _ _ I _ I _ U _ _ U S _ I XXI I _ _ I _ _ _ U _ U _ U _ U U U U _ U I  I U  U I R R _  _ _ _ _ _  _ R ^ ' ! R R R  R R R _ R _  _ '  ' ' _ _ R R E ! ( R ! ^ ! ! ^ / ~ ! ~ ~ W ! ~ ~ ~ ! ~ ~ ~ ! ~ W W > h > ;.> | h h { | { | { | ,.,.;.:.;.;.;.;.;.#.| ;.W ;.;.;.W D h #.h #.;.#.| { ;.{ } X.X.X.X.X.X.X.......{ ....{ X.X.:.<.*.$.$.6.$.$.$.<.<.<.$.<.3.<.$.<.<.7.<.<.w.3.$.7.$.3.3.w.$.$.3.$.3.<.7.<.6.,.6.6.*.*.~ *.6.6.6.,.6.6.,.,.6.~ ,.,.6.*.=.=.*.*.*.*.=.=.q.*.*.*.4X*.7X7X7X).7X7X~.4X7X7XtXtX7XuXeXtX4X4XeX4X4X~.4X4X4X2X4X2X4X4X2X*.*.0.*.*.q.*.*.7.6.7.*.*.*.K %.K *.*.*.*.*.*.*.*.*.#.W D D ~ #.6.,.6.6.6.*.*.0.` *.K K *.*.*.K *.K *.K *.D K Z K D Z K K K *.K *.%.K *.*.K Z *.%.K Z D L Z Z Z Z 2X2XZ 2XZ K %.%.%.2X%.2X%.%.%.%.%.D *.*.#.%.*.=.*.*.*.=.=.=.=.&.=.=.%.=.*.%.%.*.%.%.%.%.*.Z #.*.%.%.&.&.%.%.%.%.%.=.5X=.5X5X5X5XfX5XpX5XpX5X5X0X0X0X0X0X0X0X5X5X5X5X5X=.=.=.3.$.y.$.$.y.$.$.w.y.$.y.y.y.y.-.p.y.-.p.-.y.y.-.-.-.-.-.-.-.-.-.-.-.-.-.wX",
-        ".*X.}.}..kX X......`._._.`.......|.:X|.;X:X{.|.;X:X.;X X;X}.;X;X|.|.|...}.}.|.{......._.._..X`..`.`.`.`..X`.._._._._._._.`._._.K.`.`._._.`.`.`._.'.K.`.K.'.'._._._.'._.'._._.'._.{.{.{.{.{.'.{.{.'.{.'.{.'.U.L.L.L.L.L.K.'.V V U V '.I U '.I I V U V V V U I U V U N N P U N N Y P U _ P P N _ V _ U _ _ J U _ U R U _ N _ _ _ I '._ V _ I XX_ _ I _ U U _ I U _ _ P _ U I I  I  I _ R ' _ _ R R _ _ _ R ' ! ' R ^ ' R R R ' ' R _ ' R R R ' _ _ ' ' E ( ! ! R ! R R ! ( ~ ! ^ ! ~ ~ ~ ( ~ ~ ~ ~ ! ! ~ ! ( ~ > h h > | > | | | { | r { ..W ,.;.,.;.;.;.;.;.;.#.W #.,.W ;.W D W { h #.| | #.{ | { ..X.X.X.} X.X...X...........{ X.X.{ $.*.$.<.$.6.7.*.7.<.<.$.3.$.7.3.$.3.3.7.$.$.7.<.3.$.3.w.3.$.3.3.$.3.3.7.,.6.,.,.6.~ *.,.*.6.6.*.~ 6.*.6.*.6.,.6.6.*.=.=.2X*.4X=.4X4X*.7.=.*.*.*.4X4X7X7X).7X7X7XuX4X~.7XeX7XtXyX4XtX4XuX7X4XeX7X4X4X5X4X4XyX5X4X4X4Xq.tX*.q.tXyX0.*.0.4Xw.*.*.4X*.*.K %.*.*.*.*.*.*.*.*.K D #.~ *.6.6.0.*.q.*.0.4X*.*.4X*.4X*.*.*.*.*.%.*.*.K *.%.%.K 2X*.2XK %.K *.%.*.*.*.*.*.*.K %.%.Z %.%.%.Z %.%.2XZ 2XZ *.%.%.%.%.%.%.&.&.%.%.%.*.*.#.*.$.*.*.=.q.=.=.*.5X&.&.=.5X=.&.=.=.4X=.&.*.=.%.=.*.=.%.=.&.=.&.=.&.=.&.=.3X3X5X5X5XyX0X5XyX5XyX5XyXpX0XwX0X0X0X0X0X5X0X8XpX8Xw.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.p.-.-.-.pXwX-.-.-.-.-.wX-.-.-.-.-.-.-.",
-        ";X.*X..}.&X}.|.|.Y.;XU..}.U.}...K....}.|.;X:X|.{.|.{.:X X|.;X|.|..;X;X;X.|._.`.K._.._..K.K.K.._..`.`.B `.`.`.`.B `.`.`.`.K.K.B _._.`._.B V `.`._.B B B V K.B `.K._.V K._.V V _._.'.`..B B '..{.{.{.{.{.{.{.U.{.{.L.L.L.'.L.'.U I U V U U '.U U I V U V I I U I U U U V V U N U N N N N N N N N _ N _ N J _ _ _ _ _ _ _ _ _ P _ P _ _ I _ _ J I _ I _ _ U J J U J _ U _ _ I I U U _  U  U I I _ ' _ R ' _ _ _ _ ' R ^ R ' ! ' ! ! ' R  R ' R _ R ' _ R R ' _ ! A ! ! ! E R ^ R ! ~ ^ ! ~ W / ~ ( ~ ~ ~ ! ~ W ! ~ ~ ~ ~ W h #.| { | { > { { { { { { | ,.,.;.;.<.3.>.<.<.;.;.;.#.;.;.D W #.;.#.;.#.{ ;.#.> #...} X.X.X.X.} X.X.} ....} { X.X.#.X.X.<.#.*.7.$.#.<.#.$.$.<.<.$.<.<.<.$.7.3.3.w.$.$.w.<.$.$.3.3.$.$.3.w.$.0.7.6.6.6.6.6.6.6.` ~ *.6.6.*.6.*.0.*.*.*.3X5X2X2X*.5X=.*.=.=.*.=.0.7.2X*.*.4X7X7X7X7X~.7X4X7X7X4XtXtX7X7XuX7XuX4XtX4X7XyX7X8XuX5X7X8XuX5X5X4X5XyXyX4X=.q.4XyXyXq.4X4X4X4X2X2X*.*.4X4X%.4X4X=.4X4X4XK Z Z *.*.*.0.0.*.*.*.*.*.4X4X*.%.4X*.*.*.*.4X4X2X*.4X*.K *.K %.*.*.%.2X4X%.2XK *.*.%.*.%.%.%.K %.K *.%.*.*.%.2X2X2X%.*.*.%.%.*.&.*.%.&.&.2X%.=.=.*.*.=.*.=.0.=.=.=.5X=.=.5X&.5X=.5X&.=.5X=.&.5X5X&.&.&.=.3X=.0X&.&.=.&.&.&.&.=.5X5X0XyX8X0X0XpX8XfX0X5X0X0X9X0X8XwX0X0X0X8X0X6Xy.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.-.0XwXwXwXwXwXwXwX-.wX-.-.wX-.-.-.-.wX-.-.-.",
-        ".}..;X;X.;X}.|.L.}.}.}.Y......Y....`..|.:X;X X{.|.:X:X|.;X;X|..}...K._.`..Y..K..K..`._.`..`.B `.`.`.`.`.`.`.`.B `.B `.`.`.K._.B B `.`.B `.B _.Y `.B `.B B `.`.B K._._.B B _.`.B B '.'.U _.{.+X{.{.{.{.{.{.{.'.L.L.L.L.V V _.V '.U V '.V U K.U '.'.V U U V U V U V U V U V N U N Y N N Y N U U N U U U _ _ _ J U _ _ _ _ _ _ _ _ I I '._ I _ XX_ _ _ I J _ _ V _ _ N U _ U _ _ N _ _ I  I  R _ ' _ _ _ _ _ _ ! ' R ! ! R ! ! R ' ! ' R R _ _ ' _ ! _ ' _ ! ! D ! ! ! ! R ! ! ! ~ ~ ~ ~ ~ ~ ~ / ~ ~ ~ ~ ~ ! ~ ! ~ ! ~ W > W | > { h h { r | { | { ,.,.,.;.,.3.>.>.3.>.3.<.>.>.<.:.:.;.;.;.:.;.| #.{ :.{ ..:.X.X...X.#.X.X.} X.{ X...X.#.X.} X.X...#.$.#.*.$.$.#.$.6.7.$.<.w.3.$.$.<.<.$.w.3.$.w.w.$.3.$.w.3.$.3.$.0.q.*.q.0.*.*.0.6.6.6.,.6.6.6.6.*.6.*.2X5X3X2X2X5X*.5X5X*.4X=.*.=.*.*.w.4X2X7X7X7X4X7X7X7X7X7X7X~.4XuX7XtXuXyX7XyXyX7XuX5X7X8XuX5XuX8XyX8XuX8XyX5XyX*.yXyX5Xq.4XyX5X4X4X2X4X4X~.K 4X*.4X*.*.2X2X*.=.4X*.K K %.*.2X4X7.7.*.4X*.4X%.*.2X4X*.*.*.*.*.%.2X4X&.%.%.*.2X2X2X*.%.4X*.2X%.%.*.4X*.4X*.%.2X4X%.%.%.%.%.%.2X2X%.2X%.*.%.%.*.5X%.2X&.*.&.%.2X%.4X=.w.7.7.*.q.w.7.=.&.=.=.5X=.=.=.0X=.5X5X3X&.-.&.5X=.&.-.3X-.5X0X3X0X0X3X&.&.0X5X5XyX5X8X5X0X8XfXyX0X5X0X0X0X0XwX0X0XwX0X0XwX0X8XpXy.y.y.y.y.y.y.-.-.y.p.y.-.0X-.9X9XwXwXwXwXwXwXwXwXwX-.-.-.-.-.pX-.-.-.-.-.-.-.",
-        "}.}.;X..;X.;X{.}..}......K............_..|.|.|.:X.._....K..`.`...K._.K.K.K.K.K._..`.`.`.`.`.`.`.`.`.B `.B `.B `.B `.B `.`.`.B K.K.`._._.B `.B V `._.B K.K.'.K.K.K.`.U '.`._.Y '.'.{.{.{.{.{.'.'.L.L.L.K.V V '.V V U V V U V U I I I I U I I K.U I U U V U U U N Y N P N N N N N P N _ J P P _ _ J _ _ _ J _ _ P _ _ N _ J _ _ J _ I _ V _ _ _ _ N _ _ J U J J _ U U _ U _ I _ I _ _ ! _ R R _ R ' ^ R ! ' ! R ' ' R ' R ' ^ ^ _ ' R R ' _ R ' ' ~ D ! D ! ' ! ! ! ! ! ! ~ ~ ~ ~ / ~ ! ~ ~ ~ / ~ ^ ! ~ ~ ~ ~ W ;.{ | ;.h | { | { { h #.h ,.,.;.,.<.1.>.<.>.>.<.>.:.:.:.,.:.:.;.:.;.;.#.| #.:.>.>.:.X.X.} X.X.} X.:.#.X.X.} } X...X...{ X.<.6.$.,.,.$.7.$.<.$.<.3.$.$.w.<.$.3.3.$.3.<.$.3.3.$.3.$.$.3.3.*.0.*.q.*.4X0.4X*.4X4X*.0.*.*.6.*.6.*.3X3X2X5X5X2X=.5X5X*.2X=.4Xw.4X*.w.*.2X2X7X7X7X7X7X7X7X7X7X7X7X7X7XtX7XtX7X4XuX7X7XyX7XyX7X5XuX8X5X8X8X5X8XyX8X5X4X4X4XyX5Xw.5Xw.4X2X4X4X%.2X%.%.2X2X4X4X*.*.4X4X4X2X@.Z *.*.5X2X4X4X2X4X4X*.4X2X4X%.4X*.*.2X4X%.4X%.4X2X4X2X*.2X*.2X4X%.2X2X4X2X2X2X%.%.%.%.%.%.%.*.*.%.%.*.2X=.%.2X%.=.2X*.2X=.2X*.&.2X2X&.5X&.&.&.&.=.=.w.=.=.4X5X5X5X3X&.5X5X5X&.5X5X&.-.3X3X0X5X3X3X-.5X&.0X&.-.9X9X&.&.9X3X5X0X5X5X8XfX8XyX5X0XyX0X0X0XwX0X0X6X0X6X0X6X0X0X0X0Xy.y.y.y.y.y.-.-.-.9X-.wX9XwXwXwXwXwXwXwXwXwXwXwXwXwXwXpX-.-.wX-.-.-.-.-.-.-.-.",
-        ".;X.;X.:X.............K....X..`....`..{.|.|.|...`...`.`..K....K.`.K.`.`..`..`.`.`.`..`.B B .X`.B `.B `.`.K.`.`.B `.`.`.Y `.`.`.`.`.B _.B `.`.B B `.'.`.B K.U '.B U _._.U Y '.'.{.{.{.{.'.V L.L.K.V V V '.V V '.V U V Y U U U U V U U V U U U V I U V V U N P N P N N V P P N I N _ N N _ _ _ _ _ _ J _ _ S E _ N S _ I _ _ _ _ _ _ _ _ J _ J _ J _ N _ J J J J _ _ U U _ _ _ ' _ R _ R _ _ ' ' ' ! _ R ! ! ! ! R R ' ! ! _ ' ' R ' R ! _ ! D ` K ~ ~ ~ D ' ! ! ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ! ~ ~ ~ ~ ~ ~ ~ ~ ~ W h ;.h | | { h W D ;.W #.~ ;.~ ;.;.>.3.>.<.>.>.>.<.:.<.:.;.{ :.:.;.:.#.| ;.:.>.>.:.{ X.X...{ X.X.#.X.:.{ X.$...X...} X.:.#.7.#.7.$.<.$.#.#.7.7.<.3.<.$.3.$.<.3.w.$.$.3.w.$.3.$.$.3.$.q.q.*.q.0.4X*.K 4XeX4X0.4X4X*.eX4X*.0.*.4X3X3X3X2X5X5X2X=.4X=.*.=.=.*.*.4X2X2X2X7X2X7X4X7X7X7X7X7X7X7X7XtXuX7XuX4XyX7X8X7X8XtX8X8XuXtX8X8X7X5X8X8X5X8X8X4X5X5X5XyX5Xw.4X2X2X2X2X2X2X2X2X7X2X7X2X4X4X2X4X4X=.*.Z *.5X5X3X8X2X2X2X7X2X4X2X2X*.2X4X4X*.5X2X4X2X2X2X=.4X2X4X2X4X2X2X4X2X2X2X2X2X2XK %.2XZ %.%.Z 2X2X%.%.&.*.&.4X*.4X%.&.&.*.&.=.2X2X&.5X&.&.&.&.&.&.=.w.w.=.=.5X3X5X-.=.0X5X-.5X0X0X5X0X5X&.0X-.9X&.-.-.9X0X-.9X9X9X9X&.9X9X9X5X5X5XyX0X8XfX5X5X8X0X0X0X9X0X0X0X0X0X0XdX8X0X6X5Xy.-.-.&.0X0X0XwX0XwX0XwX9XwXwXqXwXqXwXqXqXwXwXwXwXwXwXwX0X-.-.-.0X-.-.-.-.-.-.",
-        "..*X...*X.Y..Y.Y...Y.`.Y..........`..._.`._..X|. X..`.K.K..Y..K.K.K.K..K..Y.K.K.`..`.B `.`.`.`.`.B B `.`.`.`.`.B B `.`.B `.`.`.B `.`.B B B B `._.V B K.B K.B B V V `.Y U `...B '._.U {.{.{.L.L.K.L.V L.L.V B U V I U V B N V U U V U U U '.'.U I V U V U U U U N N V N N Y P N N U U _ N _ _ _ _ _ _ _ _ _ _ _ _ U _ _ U A A U U J N _ J _ _ P N _ J U J _ N _ U J U N J _ _ _ _ _ R R _ ' ' _ ^ R R R ' ! ! ' ' _ R ' ' R R ' ' _ _ F _ ' ! ' ~ ! D ! D ! ! ~ ` ! ` ~ ! ~ ~ / ~ ~ ~ / ~ ~ ~ ~ ~ ~ ~ ~ ~ ^ ~ ( D | > h D ;.;.~ ,.W #.~ D W W #.#.;.>.<.<.>.>.<.:.<.:.;.:.:.:.#.{ :.:.#.:.{ :.>.:.X.{ { X.} X.} X.X.#.X.X.{ } X.{ X.X.#.*.$.*.<.6.#.$.7.7.$.#.$.$.<.3.<.3.$.3.$.$.3.3.$.$.3.$.3.3.3.w.*.0.0.*.4X4X0.4X*.4X*.4X*.*.4X4X4X4X4X4X4X3X5X8X3X3X2X3X4X2X=.4X4X4X2X2X2X2X2X7X7X7X7X7X7X7X7X7X7X7X8X4X7X4XtX7XyX4XuXuXyX8X7XuXyX5X8X5XuX5X8X8XuX7X8X8X7X4X*.yX4XyX4X*.2X~.2X4X2X~.~.2X2X2X2X5X2X4X5X5X4X5X4XK 2X3X5X8X3X2X8X2X2X2X2X2X4X4X2X4X=.4X2X2X5X4X=.2X4X5X4X5X%.2X8X2X2X2X2X8X2X2X5X3X2X2X2X2X%.2X2X2X2X5X%.5X&.2X=.%.&.*.5X&.5X&.2X2X3X2X2X3X&.3X3X3X3X3X=.5X3X-.=.&.3X3X&.3X3X&.&.&.=.&.&.&.&.&.9X3X3X&.&.&.9X9X9X9X-.9X&.9X0X0X6X8X0X8XfX5X0X5XfX0X0XwX0X0XqX0X0X8X0X6X0X0X0XwX0X-.9X0XwXwX0X0XwX0XwX0XwX0XwXwXqXwXqXqXqXqXwXwXwXqXdXpX-.0X-.-.-.wX-.pX-.pX-.",
-        "...:X...........Y.............._._._.....K..Y.K.K.Y.K..K...`....K.K.`.`.`.`.`.`.`.`.`.B `.Y `.`.`.`.`.`.`.`.`.`.`.`._.`.`._.K.Y B B K.K.B B K.B _.K.K.`.V _._.Y _.`.U '.U Y {._.'.'.U K.L.V L.V V V B V V V U U V V Y U V U V N Y B U V I V U V U U V N V P N P N N N U N N _ U N _ _ _ _ _ _ _ _ _ _ _ _ A _ _ _ _ _ _ _ _ _ _ A _ J U _ U _ U J J J J N J J J U _ _ _ _ _ ! ! _ _ ! _ ! _ ! R ! _ ! _ ! ! _ ! ' R ' ' _ F ' ! ' ' ! ~ D ! K ~ ` ~ K ~ K ` D ~ ! ~ ~ ~ ~ ~ ( ^ ~ ~ ~ ~ ( ~ ~ ~ ~ ~ ~ W W W W ~ W ~ ~ W W W ~ ;.W W #.W #.<.>.<.:.<.:.<.;.:.;.:.;...#.:.{ ;.| :.#.:.X.>.:.X.{ X.X.X.{ { X.X.#.} X.X...} X.X.*.<.,.6.#.$.6.,.#.,.*.$.$.#.$.$.3.$.3.3.3.<.w.w.3.3.$.3.y.$.*.0.*.tX*.*.yX*.4X*.4X*.4XK *.4X4X*.4X4X4X4X4X2X5X3X2X3X5X2X2X4X4X2X2X2X2X2X2X2X7X7X7X7X7X2X7X7X7X7X8X7X7X4XtX7XtXuX4X7X4X7X7XtX8X7X8XuXyX8XuX8X7X4X8X8X8X8X8X8X2XK %.2X4X2X~.2X~.2X4X2X2X~.2X2X8X2X8X5X4X4X8X8X8X&.5X8X6X8X3X8X3X2X8X2X2X2X2X4X4X4X5X=.4X2X4X2X2X4X5X2X2X2X2X2X2X3X2X2X3X2X3X3X2X3X2X2X2X2X2X3X2X2X&.2X&.&.3X&.*.2X2X2X2X2X2X3X&.3X3X3X3X&.3X3X&.3X&.&.5X5X3X3X9X5X0X-.3X&.&.=.&.&.%.%.&.%.&.&.&.&.&.%.&.&.&.9X9X9X9X-.9X9X9X3X0X5X5X5X8X8X5X8X0X0X9X0X0X0X9X9X0XwX0X0X0X0X8X0X0X0X3X3X0XwXwXwX0XwXwXwX0X9XwXqXqXqXqXqXqXqXqXqXqXwX-.-.0X-.-.-.-.-.-.-.-.-.0X",
-        ".:X.*X.:X.:X*X.*X......:X....X...X..X..._._._._._...`.`....`...`.Y.`..`..`....`.`.`.`.`..XB `.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`._._._.B Y `.K.`._.K.'._._.K._._.`.U '._.U `.Y U Y '.U '.U `.I K.L.K.V '.V V V V V B B U U V U P P V U V P U N Y U I V U U N P P N Y N N N Y N N P J U N T _ E _ _ _ _ _ _ _ J _ _ N J _ A N _ _ _ J U _ J _ _ J J J N _ _ V _ A N _ J J N J _ _ _ _ R _ ' R ' R ~ R ' ! ! ! ! ' ! ' ! ! ! R ' ' ' ' K ! K D K ~ D ` ! D ~ K ~ ! ~ ' ~ ~ ! ! ~ ~ ~ ~ ~ ~ ~ ~ / ~ ~ ^ ~ ~ ~ ~ ~ W W ( W W W #.W ,.W W ~ #.;.D ;.W 2.:.>.2.>.:.:.:.;.#.;.#.#.;...#.#...#...:.:.:.X.{ X.{ X.X.X.X.} { X.X.{ ..X.X.{ $.#.<.$.$.<.*.#.*.#.#.#.#.<.7.$.$.<.<.$.$.$.3.$.$.3.$.3.$.3.$.7.*.tX*.tXyX4X*.0.K K 4XK 4X4X4X0.4X4X*.4X4X4X4X3X5X2X3X2X5X3X3X2X&.2X2X2X4X2X2X7X8X7X7X8X7X7X8X7X7X7X7X7X7XuX4X7X4XtXuX4XyXtX8XuXtX8X8X8XyX8X8X5X5X7X8X5X8X7X8X8X2XK K 2X%.2X2X~.~.2X7X2X2X2X8X2X8X8X2X8X5X7X8X8X6X6X6X8X6X6X8X2X8X2X8X2X8X4X2X4X4X4X2X5X5X5X5X5X5X2X2X2X5X5X3X5X8X5X8X2X3X8X8X3X8X3X3X2X2X3X3X2X3X&.2X3X2X2X3X2X2X2X2X3X2X3X3X3X3X3X3X3X3X3X3X3X&.3X&.9X5X&.&.&.0X&.3X0X&.0X&.&.&.&.&.&.&.&.&.&.%.@.%.&.9X9X9X9X9X9X9X9X0X0X0X9XwX8XfX5XyX8XfX5X0X0X0XqX0X0X0X0X0X8X8XwX0X0X0X0X0X0X5X9XwXwX0XwXwX0X9XwXqXqXwXwXqXqXqXqXqXqXqXqX0X9X0X9X0X9X0X5X-.0X0X-.wX-.",
-        ".*X.:X..:X..X.........:X.....X..X...._._._.._._.`.`..`.`..`..`.Y.`..`.K...`..K....`.`.`.`.`.`.`.`.`.`.`.`.`.`._._.`.`.`.`._.`.B B B `.`.B K.K.`.K.K.`.K.'.'.K.`.`.'.Y U .Y `.'._.U .U _.U U U U V V V V V Y U V V Y U Y N U V P U N N Y N Y N P N V U N P N N U N N V P N N U N _ V _ _ _ _ _ E _ J _ _ _ P _ _ U A N S _ _ _ _ _ _ _ J J U _ N J V _ J J U J J V J S _ U _ ! ' R R ' _ R ! ' ! ' ! _ ! ! ! ! R ! ! F ! F F F ' ' K ,.K #.K ~ D D ~ K ~ ' ` ' ! ~ ~ D ` ! ! ~ ~ ~ / ~ ^ ~ ~ ~ ~ / ~ ! ~ ~ W W W W W W W ;.W ,.~ W #.#.W D ;.:.:.,.<.:.<.:.<.:.;.;.#.;.#.| { #...#.#.:.:.:.X.} X.{ X.{ X.$...X.{ X.X.X.{ ;.#.#.,.,.#.#.*.#.,.#.#.*.#.#.$.$.$.$.:.$.3.$.3.3.$.$.3.$.3.3.=.q.=.q.*.*.0.4X4X0.*.~.%.K 4X4X*.K 4X4X4X4X4X4X2X4X2X5X3X3X3X3X2X3X3X4X2X2X5X2X2X2X2X2X2X7X7X7X7X7X7X7X7X7X7X7X4X7XtX7XtX7XyX7X4X8X5XuX8XyX8X4X8X4X8X8X7X8X8X8X4X8X8X8X~.2X2X2X4X2X2X2X2X7X2X2X7X8X8X8X8X8X2X8X8X8X6X6X6X6X6X6X8X3X8X2X8X2X8X3X2X2X8X5X5X4X5X3X8X5X8X3X5X8X2X3X8X3X3X2X3X3X8X8X3X8X3X3X3X6X2X6X3X3X3X3X&.2X3X5X2X3X2X2X2X3X2X3X3X3X3X3X3X3X3X6X3X3X3X3X3X9X&.9X&.&.&.&.&.9X&.&.9X&.&.&.&.&.&.&.&.&.@.&.&.-.9X9X9X9X9X9X9X9X9X9X9X9XwX0X6X5X5X0XyX5X0XwX9X0X0X9X0X5X5X0X0X5X0X0X5X0X5X3X3X5X3XwXqX0X9XqX0XwX9X9XqXwXqXqXqXqXqXqXqXqXqXqX9X9X6X9X6X3X0X9X9X0X0X0X-.",
-        "....*X....:X........X..X..X......X.X._..._.._.Y..K.Y..`..`....`....`..`..K.`.`.`...`.`.`.`...`..X`..X`.`.`.`..X`.`._._.`.B `.`.`.`.`.`.K._.`.K._.K.K._.'.Y `.'._.'.'.U U U '.Y '.Y '.Y V Y Y V U V V V B V N V U V U V Y V N Y N P V N C Y N Y P N V N N N Y N P N N Y N _ _ _ _ _ E _ _ _ E _ U E _ _ J A _ _ _ _ P J _ P J U _ _ _ A _ J _ P U J J U J _ _ J _ _ _ _ _ _ _ ' ! R ' ! ! ! ! ! ' ! ! _ ' ' ! ' E ! S A ! K ! K D D ~ ~ D ` ~ ~ K ! D ' D ' ~ K ! ~ ~ ` ~ ~ / ~ ~ ~ ~ ~ / ~ ~ ! ~ / ~ ~ W / ( W / W ~ ,.W W W ;.W #.#.;.,.:.:.:.;.:.;.:.:.;.{ ;.{ ;.#.{ ..{ { X.:.X.:.{ X.{ X.{ X.{ } X.X.} X.{ ..:.#.#.*.*.#.,.,.#.#.#.,.*.,.#.#.#.:.<.$.$.$.$.3.$.3.$.3.$.3.$.7.7.*.7.=.0.yX4X*.eXq.4XK *.4X*.4X4X4X4X4X*.4X%.4X*.4X4X3X3X3X5X8X5X2X2X2X2X2X2X2X8X2X8X2X8X3X7X8X7X2X7X7X7X8X7X7X7XtX4X4X4XuX7X4XuXyXuX8XyX8X7X8X4X8X7X8X5X4X8X8X8X8X8X8X2X2X2X2X4X2X4X2X2X2X8X2X2X3X8X8X8X8X8X2X8X6X6X6X6X6X6X6X3X6X3X6X2X8X2X3X3X~.2X2X5X5X8X8X3X8X5X8X2X8X3X3X8X8X8X8X8X6X3X3X6X3X8X8X6X2X6X6X3X6X3X3X3X5X3X3X3X3X3X3X2X3X3X3X3X3X3X3X3X3X3X3X9X9X3X3X3X3X9X3X&.&.&.&.&.&.0X9X&.&.&.&.&.&.&.&.&.&.&.&.9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XwX0X8X0X8XfX0X0X0X0X0X0X0X6X5X5X5X3X3X5X3X&.&.3X3X2XqXwXwX9X0XwX9X9XwX9XqXqXqXqXqXqXqXqXqXqXqXqX9X6X6X9X&.0X0X-.0X-.0X0X",
-        ":X..:X.:X.....*X.....:X........_...{..{.._....`.`..Y.`..Y.K.`..Y..Y..`....`.Y `.`..`.`.`.`.`.`.`.`.`.`.`.`.`._.`.`.`._.`.`.`.`.`._.`.`.`.K.`.K._.`.K.K._._.`.'.U `.`.Y '.Y '.Y U U U '.Y U Y B Y V U V V C V Y V U U V U N U P N N V Y C P N Y N N V N Y N N P N N N P N P N _ N _ _ _ _ _ _ _ E _ _ _ _ J P _ _ N P J _ J _ J _ J N _ J U V _ J J A J J J V J J J J U _ _ R _ ! _ _ ' _ ! _ ' ! R ! _ ! ! _ ! ! _ ! A S A K ! D K *.~ ~ D *.~ K *.,.` ~ ~ ~ ~ ! ~ K ! ~ ! ' ~ W ~ ~ ~ ~ ' ~ ~ ~ ~ ~ ~ ! / ~ W W ( W W / W W ;.#.W W #.;.W ,.:.<.:.:.;.:.;.#.:.#.> #.| ;.{ ..#.{ #.X.:.:.X.{ X.{ X.X.X.X.........X.{ #.#.K ;.#.*.#.,.#.6.#.#.#.,.#.*.,.<.$.<.$.$.3.3.$.$.3.$.3.$.w.*.w.7.*.0.*.tX*.0.4X4X*.K *.K *.*.4X4X*.K 4X4X4X4X4X*.4X2X3X3X2X2X3X2X3X2X2X2X2X2X2X8X2X2X8X3X8X2X7X7X7X8X7X7X7X7X4XuXuXuX4XyX7XtX4X7X8X7X8X8X7X7X8X8X2X4X8X4X8X7X4X8X8X8X8X2X2X2X2X2X2X2X8X8X2X7X6X8X6X8X8X8X8X8X8X6X6X6X6X6X6X6X6X8X2X2X6X2X8X2X2X2XZ Z 2X3X8X8X6X5X8X8X3X8X3X3X8X3X8X8X6X8X6X3X8X6X6X6X8X3X6X6X3X6X3X5X3X3X3X3X3X3X3X3X3X3X3X3X6X6X3X3X3X6X6X9X6X3X6X3X9X3X9X&.&.&.&.&.&.&.&.&.&.9X-.&.&.9X&.9X&.&.&.&.9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X8X5X0X8X8XfX0X9X0X0X0X5X0X5X5X&.&.5X5X5X3X5X&.&.3XqX9X3XqX6X9X3XqX3XqXqXqXqXqXqXqXqXqXqX6X6X6X9X6X9X3X6X=.0X-.9X0XpX",
-        "......:X:X.:X..X...X.X.X..X..X..X._..X...X..X_._.._..K...`.`..`....`..`..`..`...`.`.`.B B `..`..X.X`.`.`.`.`..`.`._.`._._.`.`.`.`.`.`.B `.`._.Y `.`.'.K._._._.K._._.Y '.'._.Y '.U '.U `.`.U U U U U N Y B Y N Y B N V Y U U V Y N Y V Y P N N Y P N C P P N N N P V P N N U N N U N N _ E _ _ _ _ _ _ _ _ E _ E _ _ _ A _ _ T _ _ J E _ _ J _ _ _ J U J J U P J J _ J N _ E _ _ _ ' R ! ! ! K ! ' ! ' F ! ' ! ' ' ! ! ! A E J ! ! K ~ D ~ D *.D ~ D #.~ D ` K ~ ! K ! ` ` ! ` ' D ! ! ~ ~ ~ ~ _ ~ ~ ~ / ~ ~ ~ ~ W W / ~ W W W W W #.W ;.;.W #.;.:.;.;.;.;.<.,.:.;.;.:.:.> #.| #.#.{ X...:.X.:...X.:.X.X.{ } ..X.X.{ X.:.#.#.#.#.6.$.6.#.#.#.,.*.,.*.#.*.#.#.*.#.$.3.$.3.$.$.3.$.3.$.3.0.=.7.7.*.*.w.*.yX*.yX*.4X*.K 4XK ~.*.4X4X4X4X~.2X4X*.4X4X4X8X3X3X3X5X3X2X5X2X2X3X2X2X2X2X2X2X8X2X8X3X8X8X7X8X7X8X8XeXtX4X7XtX7X4X7X4X4XuX5XuX5X5X8X4X8X7X4X8X8X4X8X8X8X8X8X8X6X7X4X8X2X7X2X2X2X7X8X8X8X6X8X8X6X6X8X6XqX6X6X6X6X6X6X6X2X6X8X2X8X2X8X2X2XZ %.K Z 2X6X8X6X6X6X6X8X8X8X6X6X6X6X8X6X6X6X6X6X0X6X3X3X6X6X6X6X3X3X5X6X3X3X3X3X3X3X6X3X3X6X3X3X3X9XqX6X9X9X9X9X9X9X3X9X&.3X&.&.&.&.&.&.&.&.&.&.&.9X&.&.9X&.9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XqX9XqX9XqXwXwXwX0X5X5X5X8X0X0X&.0X5X&.0X5X5X5X&.&.&.&.%.&.2XqXqX6X9X6X6X3X9X3X9XqXqXqX6X6XqX6XqXqX6X6X6X6X6XqX6X6X3X9X0X0X0X0X"
-    };
+const char *WxCasPix::m_stat_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"630 120 256 2",
+	"   c #000000",
+	".  c #090A0A",
+	"X  c #151618",
+	"o  c #0A1513",
+	"O  c #151729",
+	"+  c #0D2E1A",
+	"@  c #183836",
+	"#  c #142F2A",
+	"$  c #271434",
+	"%  c #3A3B3B",
+	"&  c #262C2F",
+	"*  c #2E2013",
+	"=  c #16354A",
+	"-  c #32184D",
+	";  c #263946",
+	":  c #303152",
+	">  c #33356A",
+	",  c #232566",
+	"<  c #184638",
+	"1  c #164C2D",
+	"2  c #1A6935",
+	"3  c #325C2C",
+	"4  c #36513A",
+	"5  c #2E4E37",
+	"6  c #3D641D",
+	"7  c #346629",
+	"8  c #2A6F33",
+	"9  c #1E4B19",
+	"0  c #194846",
+	"q  c #155649",
+	"w  c #135953",
+	"e  c #0F4E56",
+	"r  c #104770",
+	"t  c #176746",
+	"y  c #186754",
+	"u  c #1A7657",
+	"i  c #0E7549",
+	"p  c #1B6667",
+	"a  c #264647",
+	"s  c #265857",
+	"d  c #374648",
+	"f  c #384655",
+	"g  c #2C5150",
+	"h  c #394877",
+	"j  c #385976",
+	"k  c #30536B",
+	"l  c #266859",
+	"z  c #24775A",
+	"x  c #296E4A",
+	"c  c #296765",
+	"v  c #287765",
+	"b  c #396768",
+	"n  c #3A6575",
+	"m  c #397369",
+	"M  c #306F75",
+	"N  c #533533",
+	"B  c #733112",
+	"V  c #72352A",
+	"C  c #59221A",
+	"Z  c #4D1972",
+	"A  c #5A3958",
+	"S  c #4D344F",
+	"D  c #4E3470",
+	"F  c #66355A",
+	"G  c #762A49",
+	"H  c #772954",
+	"J  c #6E324F",
+	"K  c #6D366D",
+	"L  c #52195A",
+	"P  c #4E4337",
+	"I  c #75493A",
+	"U  c #6E4934",
+	"Y  c #615719",
+	"T  c #454444",
+	"R  c #575559",
+	"E  c #514853",
+	"W  c #484678",
+	"Q  c #44577A",
+	"!  c #574766",
+	"~  c #584775",
+	"^  c #54546B",
+	"/  c #565473",
+	"(  c #484C68",
+	")  c #4B6B71",
+	"_  c #6A4A4B",
+	"`  c #634878",
+	"'  c #6C4870",
+	"  c #717274",
+	"  c #586D50",
+	"{  c #3A3787",
+	"}  c #3D1797",
+	"|  c #394A84",
+	" . c #385384",
+	".. c #334B93",
+	"X. c #3650A2",
+	"o. c #34708B",
+	"O. c #22699F",
+	"+. c #1B76C4",
+	"@. c #4D178A",
+	"#. c #4D328D",
+	"$. c #5A37A3",
+	"%. c #721990",
+	"&. c #7C14A7",
+	"*. c #71318E",
+	"=. c #6C31AC",
+	"-. c #773ACB",
+	";. c #484688",
+	":. c #474995",
+	">. c #495497",
+	",. c #574987",
+	"<. c #594895",
+	"1. c #545687",
+	"2. c #4C558A",
+	"3. c #564CA8",
+	"4. c #486D88",
+	"5. c #4A6FB0",
+	"6. c #654887",
+	"7. c #674B97",
+	"8. c #675289",
+	"9. c #695795",
+	"0. c #794687",
+	"q. c #775194",
+	"w. c #6C4CAB",
+	"e. c #736D8F",
+	"r. c #6C67B1",
+	"t. c #536FCE",
+	"y. c #6D4AC8",
+	"u. c #6C6CCE",
+	"i. c #707AE2",
+	"p. c #5769D1",
+	"a. c #248339",
+	"s. c #239C32",
+	"d. c #078146",
+	"f. c #278451",
+	"g. c #2D826D",
+	"h. c #2EA45F",
+	"j. c #63A433",
+	"k. c #708676",
+	"l. c #5DA25A",
+	"z. c #43FC3F",
+	"x. c #77C236",
+	"c. c #50C41F",
+	"v. c #55D455",
+	"b. c #368789",
+	"n. c #388FB2",
+	"m. c #14A0A6",
+	"M. c #39A6D2",
+	"N. c #2B97CC",
+	"B. c #0ACFEF",
+	"V. c #788788",
+	"C. c #558CA8",
+	"Z. c #4B93CC",
+	"A. c #44A1D1",
+	"S. c #47A4E5",
+	"D. c #7091E6",
+	"F. c #73ABE4",
+	"G. c #6B99D4",
+	"H. c #4CD8B2",
+	"J. c #96173B",
+	"K. c #8A3B17",
+	"L. c #923330",
+	"P. c #A61C3A",
+	"I. c #B9273C",
+	"U. c #AC3038",
+	"Y. c #A6251A",
+	"T. c #971949",
+	"R. c #86244B",
+	"E. c #89385A",
+	"W. c #983A5A",
+	"Q. c #8F2D50",
+	"!. c #973A65",
+	"~. c #893872",
+	"^. c #A11547",
+	"/. c #AE2E49",
+	"(. c #A93A67",
+	"). c #B03970",
+	"_. c #954715",
+	"`. c #914510",
+	"'. c #904930",
+	". c #976431",
+	". c #AB4E12",
+	"{. c #A94A2A",
+	"}. c #B74B2A",
+	"|. c #B5512C",
+	" X c #AD6E36",
+	".X c #A37209",
+	"XX c #91474B",
+	"oX c #86467C",
+	"OX c #924470",
+	"+X c #AC4C54",
+	"@X c #B84875",
+	"#X c #B0456C",
+	"$X c #B37846",
+	"%X c #916F59",
+	"&X c #CA3230",
+	"*X c #E03027",
+	"=X c #C8334D",
+	"-X c #C93C77",
+	";X c #C85332",
+	":X c #DA6F2C",
+	">X c #C94F47",
+	",X c #C44477",
+	"<X c #CC4371",
+	"1X c #C47C46",
+	"2X c #891B9B",
+	"3X c #8F19AB",
+	"4X c #8F3191",
+	"5X c #8F2AAD",
+	"6X c #A41AB6",
+	"7X c #A13188",
+	"8X c #A223AA",
+	"9X c #980FCD",
+	"0X c #9429CB",
+	"qX c #A916D1",
+	"wX c #A822D9",
+	"eX c #854686",
+	"rX c #885187",
+	"tX c #894D92",
+	"yX c #8445A2",
+	"uX c #A84684",
+	"iX c #8D7398",
+	"pX c #8954D9",
+	"aX c #8E6DDC",
+	"sX c #906BE2",
+	"dX c #B24DE9",
+	"fX c #A55CDC",
+	"gX c #CC3884",
+	"hX c #C54581",
+	"jX c #AE9325",
+	"kX c #A6905F",
+	"lX c #86C63B",
+	"zX c #8CCA4A",
+	"xX c #F1B90B",
+	"cX c #DEA023",
+	"vX c #D08C4D",
+	"bX c #D8A265",
+	"nX c #F1D107",
+	"mX c #F1D52D",
+	"MX c #EFD648",
+	"NX c #8B8E8F",
+	"BX c #9496A6",
+	"VX c #ACACAC",
+	"CX c #9FA19E",
+	"ZX c #8AB7E8",
+	"AX c #93ACD8",
+	"SX c #9BE898",
+	"DX c #99C4ED",
+	"FX c #AFD2F4",
+	"GX c #B4D3EC",
+	"HX c #CAB39B",
+	"JX c #E7D9AC",
+	"KX c #CECECD",
+	"LX c #CDE9FC",
+	"PX c #FCFCFA",
+	"IX c #E8F1F5",
+	"UX c #DEE1DD",
+	/* pixels */
+	"H G H H "
+	"T.~.T.2X).7XOX#X).).~.).).).).).).^.2X~.!.Q.!.Q.R.T.R.~.~.!.(.(.(.!.^.(.!.(.T.~.!.!.!.(.!.!.~.(.!.~."
+	"~.K K OX~.4XoXoXeXeXeXoXoXeXtX4XoXeX~.uX4X' ~.4XoX~.K eX~.' ~.K ' ~.eXoXeXeXeXeXeX0.K K K ' K 0.' K "
+	"' ' 0.0.K K K eXoX' ' oX' "
+	"rXoXoXoXrXrXoXiXOXrXrXrXrXOXrXrXoXoX%XrXoXoXoXoXoX%Xq.rXrXoXrXrXrXrXrXrXrXoXOXOXOX4XOXoX~.~.K ~.H K "
+	"K K H K H K K F H K ~.~.oX' K eXK eX' ~.0.eX~.' ' eXoXoXK *.D K D D D D D *.*.7.*.*.0.*.*.6.D *.~ "
+	"#.` *.~ ~ 6.K *.#.K 0.K 0.*.*.K D D K K K D K K D ~ K ,.D D ,.D D ~ #.,.D W D #.~ #.~ W ,.W D ;.W D "
+	"D ;.W D ;.W W ( h W k Q h h j h j  .j | r > | ..................r r { ....{ r p O.p p p p ..r p "
+	"............r ......r | > r > r > r .. .| 2.| | ;.| | | Q h Q 2.h | #.{ #.{ { { { { > #.{ > #.} "
+	"#.#.<.<.:.$.:.#.$.$.#.#.#.#.$.} $.} } } } } } } } @.} } @.} @.} #.#.} @.} @.@.} } { > @.Z Z Z } Z } "
+	"Z } @.@.} } &.@.} @.@.@.} &.} &.@.@.%.@.@.@.Z Z Z @.Z Z Z Z @.@.Z Z Z @.Z Z Z Z Z Z Z Z Z Z Z Z Z Z "
+	"L - L Z L - Z Z L Z - L Z Z #.Z *.#.D *.#.K @.Z #.K @.K #.*.@.Z @.Z @.Z @.Z Z @.%.Z Z "
+	"%.@.=.$.@.=.$.$.$.=.} -.&.=.} -.-.&.} "
+	"=.$.=.=.=.=.$.$.$.$.=.=.=.=.y.3.-.p.w.y.r.w.y.y.y.w.y.y.w.y.y.-.y.-.y.-.-.-.-.-.-.=.-.-.$.=.-.-.-.-."
+	"y.y.-.y.pX-.y.y.y.y.y.y.sXpXpXpXpXpXpXpXpXwXpXpXpXpXpXr."
+	"sXsXfXsXpXfXfXsXsXsXdXpXwXpXdXdXdXwXwXdXdXdXdXwXdXdXdXwX",
+	"H H "
+	"~.^.~.T.T.(.).#X).7X).).).).~.).).~.).~.(.Q.Q.!.Q.~.~.Q.!.4XeX~.(.(.).^.(.!.(.!.!.~.(.~.!.~.(.!.(.!."
+	"(.K ~.~.~.~.oXK 4X' ~.0.~.*.eXK K eXeXoXoX4X~.eXeXK 4X' ~.oX' 4X~.eX4X' eXeXK oXoXrX' ' K ' K ' "
+	"eX0.' 0.' eXtXq.0.' K ' ' oX' "
+	"~.0.%XoXrXrXoXoXrXOXrXrXuXrXOXrXOXoXoXoXoXrXrXoXoXoXoXq.tXrXrXrXrXoXrXrXrXrXrXrXoX~.' ~.oX~.K ~.~.K "
+	"~.H K K K H ~.K H K Z K ' 4XoX0.eXK K ' 4XeXK K oX4XoXeX~.oX*.*.K K *.*.K K *.6.*.*.0.6.*.*.6.D *.~ "
+	"*.` *.~ *.*.~ 6.D K *.*.K ` *.*.K K K 6.<.6.6.,.1.,.6.D ~ *.~ ~ *.~ *.~ D ~ #.W W W W D W D ;.;.D W "
+	";.W ;.W W W W W W Q k k h j h h h h h h h | h | ........{ ..{ ........r ..r ....p r p O.p p o.M "
+	"..O.......O...O...r  . .| h r > ..> h > h | | | |  .M Q W h 2. .W Q 2.#.{ { #.#.{ { #.} { { #.#.{ "
+	"#.<.<.$.<.#.$.:.#.<.:.#.$.{ { $.$.{ } } } } } } } @.@.} } @.} @.} @.} #.#.} } #.@.@.} @.} } Z } "
+	"@.@.} Z } &.&.} } &.} &.@.@.@.} @.@.@.@.@.@.%.@.@.Z @.Z Z @.@.Z Z Z Z @.Z @.Z @.Z @.Z @.Z @.Z Z Z Z "
+	"Z L L Z , Z Z Z Z - > Z Z Z Z D D D D Z D Z Z *.D *.*.@.*.D @.Z Z *.K @.Z %.Z %.%.Z Z "
+	"%.@.@.$.$.$.$.=.$.$.$.$.=.} =.&.-.=.} "
+	"&.-.=.$.=.$.=.=.=.$.=.=.3.p.y.=.=.y.r.y.p.y.y.p.3.y.y.3.y.w.w.-.-.y.-.=.-.y.y.-.=.-.-.-.-.-.-.-.-.=."
+	"-.-.-.y.0Xy.y.y.-.u.y.pX-.pXpXpXpXpXpXpXpXpXpX-."
+	"pXpXyXpXpXsXsXsXsXsXfXsXsXfXdXsXpXdXpXpXdXdXfXdXdXdXdXwXdXdXgXdXdXdX",
+	").7X~.2X7X^.!.7X).7X).7X~.~.).).).~.).T.).).).!.~.Q.Q.Q.W.~.~.eXeXuX~.).).(.!.(.(.!.(.!.(.!.(.!.~.!."
+	").!.(.K K ~.~.eX' ~.' ~.0.~.oX4X~.eXoX~.oXeXeX7X' ~.~.oXK oX~.*.*.' 0.oX~.0.oXeXeXeXeX0.' 0.' K ' ' "
+	"4X' eX' ' q.tXq.0.q.' ' oX' "
+	"oXoXoXoXoXoXoXoXrXrXoXrXoX%XrXoXrX%X%XrXoXoXoXoXoX%XoXrXq.rXrXtXrXrXrXrXrXrXrXrXtXrXoXeX~.oXoX4XeXK "
+	"K K ~.K K H K K K K H K ~.4X~.eXtX0.*.oX' oX' 4XK eXK eXeX0.oXK *.*.*.6.K D K *.*.*.0.*.*.0.0.*.*.~ "
+	"D *.*.K ,.,.~ *.6.*.*.K K *.K ' *.K D K ` 6.8.~ ` ,.,.,.~ *.D ,.D ,.,.D ,.D W W D #.#.W ,.;.W W ;.D "
+	"D ;.W D W W D ;.W k k h ( k Q k j h h h h  .| h | .............. .k r ....{ ..{ .. .p p p o.c n c "
+	"o............... . ...O. .r r > h r h h k h ;.;.j m m m h Q h | Q Q ;.X.$...X.#.{ { { > #.{ { > "
+	"<.<.,.<.<.<.#.{ $.#.:.$.$.{ $.$.{ } #.$.} } } $.} @.@.@.} } $.@.@.@.} } @.@.#.@.{ } { , @.{ Z } @.> "
+	"} @.@.@.} } &.&.} } &.@.@.@.@.@.&.&.@.@.@.@.@.Z Z @.Z @.@.Z @.@.Z @.Z @.Z @.Z Z Z Z Z @.Z Z Z Z Z Z "
+	"Z Z Z Z L Z - L > Z Z Z Z Z Z #.#.D @.@.Z #.Z Z #.#.Z D %.*.@.@.@.@.Z Z @.%.Z Z %.Z "
+	"%.@.$.%.#.#.$.$.$.$.$.$.$.-.-.&.} =.-.$.=.$.=.$.=.$.=.$.$.$.} "
+	"p.p.p.$.3.y.p.r.p.y.p.y.y.u.r.y.w.y.y.w.-.-.y.=.y.-.-.y.-.-.-.y.y.-.-.-.-.=.y.-.-.-.y.y.pX-.y.y.y.u."
+	"-.sXpXpXpX-.pXpXpXpXpXsXpXpXpXpXpXsXsXfXsXpXsXfXdXsXfXsXfXpXdXdXpXdXdXdXwXdXdXdXwXfXdXdXdXdX",
+	"(.T.).^.!.~.).).#X7X).).).).).~.).).).7X7XT.).~.R.~.!.!.~.eX~.eXeXOXrXOX(.(.^.).T.(.!.!.~.(.~.~.(.!."
+	"~.!.!.~.~.~.~.' 4XK ~.eXoXeX0.0.0.eXoXoX4XeXeX' *.oXK oX*.~.oX~.oX~.*.oXoX~.K eXeXeX0.*.' K 0.` "
+	"*.eX' 0.0.eXq.tXtXq.q.rXrX0.' oX' "
+	"oXoXoXoXoXrXoXrXOXoXrXrXtXrXrXrXoXrXrXoXrXoXrXrXrXoXtXrXq.q.rXq.rXoXrXq.rXq.tXtXeXeXtXtX4XoXeXK "
+	"~.~.K K K ~.K K K K K H K ' eXeXoX0.0.' eX~.*.' oXoXeXeX~.oX~.oXeXK "
+	"6.*.*.0.#.*.7.7.*.*.7.7.*.*.6.0.*.6.~ ~ 6.*.~ 6.` ,.~ ` *.*.K *.*.K K K K ~ ` ` 6.` 6.6.,.1.~ 6.D "
+	",.D D ,.D 6.D ,.;.~ W ,.D W ~ #.W ;.;.D W W D W W W W h ( h h j j j j h | j h h h | h ............r "
+	"r | k ..| ..r ....r p O.p M c c c ................r O. .r  .o. .r r > h k j n  .M m M ) m b 2.;.Q Q "
+	" .j #.{ { #...#.> { { { D #.<.<.:.$.#.#.<.$.$.#.$.$.#.#.#.} { } $.#.} @.$.} } } @.} } } } @.@.@.$.} "
+	"$.@.@.} @.} @.@.@.@.@.} #.@.@.@.} @.@.@.} &.} } &.} @.@.@.@.@.@.@.@.%.@.@.Z %.@.Z @.@.Z @.@.Z Z Z { "
+	"@.Z Z Z @.@.@.Z Z Z Z @.Z Z Z Z - Z Z Z Z Z Z Z > L L - Z Z K Z #.D *.D K #.*.*.D *.#.*.Z K @.K %.Z "
+	"%.Z %.@.%.Z @.Z @.#.#.$.$.$.$.$.$.$.$.$.&.} =.=.} } "
+	"-.$.=.$.y.=.y.$.=.=.y.y.p.p.p.p.p.p.y.y.y.r.w.y.r.y.y.y.y.w.w.-.y.-.-.-.-.y.$.-.y.y.=.y.y.$.y.=.-.-."
+	"-.-.-.-.-.-.-.-.y.u.u.pX-.pXi.pXpXpXpXpXpXpXpXpXpXpXpXy."
+	"aXfXsXsXsXsXfXsXsXpXsXsXfXdXdXdXdXdXdXdXdXdXdXdXdXdXdXwXdXdX",
+	").2X~.).).).7X7X).).7X~.).).).!.~.).).^.7X).~.T.!.W.!.oXeXeXuXoXoX4XOXeX~.(.(.(.).~.!.~.(.!.(.(.).!."
+	"!.~.(.~.eXeXeX~.' eX*.0.tX*.eX' eXeXK eX*.oXeX' 0.' eX4XoX~.~.' 4XoXeX~.eX~.eXeXeX0.' ' ' 0.' "
+	"0.0.oXeX0.0.tXq.tXtXtXiXtXtXrXeXeXeXoXoXoXrXrXoXoXrXoXrXrXrXrXoXrXrXrXiXoXoXoXrXoXoXoXrXrXrXtXtXq.q."
+	"tXrXrXrXe.q.tXq.rX4XtXq.tXeXeXK ~.K ~.K *.K K K K H K K 4XeXeXeXeXeX0.eX' eX0.' "
+	"4X0.oXeXeXoXeXoX4X0.*.6.*.*.*.7.*.0.*.0.*.*.*.0.*.q.*.*.6.~ ~ ~ *.6.6.6.~ Q #.*.*.*.6.D K *.K K "
+	",.6.~ ` 6.1.~ ,.,.D 6.D ,.,.D ,.D D W ;.W W ~ D ;.W W W D D ;.W W ;.W Q W h h h k j n c j j | h | h "
+	"h ..h r ..........r r r j  .k r | ....p p p o.k M c j e O.............r ..k r O. .p O. .h k  .j M n "
+	"m m n m m m ) b Q Q j Q Q ..{ #...#.#.> #.{ { > <.<.:.<.#.<.<.$.#.{ $.#.#.$.{ #.#.} #.#.} $.} @.} } "
+	"} @.} @.@.@.} @.} @.#.} #.@.@.@.@.@.@.@.} @.@.@.@.@.@.Z { @.@.} @.&.&.} &.&.@.@.@.{ Z @.@.@.%.@.@.Z "
+	"@.@.@.Z @.Z @.Z Z @.{ @.> @.Z @.Z @.Z @.Z Z Z } Z Z , Z Z Z Z Z Z D Z Z > > - L Z D Z *.D @.K Z *.D "
+	"D *.#.#.K @.@.@.Z @.Z Z @.@.%.Z Z Z %.#.#.#.$.$.$.X.$.:.$.$.$.} "
+	"=.=.=.-.=.=.$.=.$.$.=.$.$.-.$.$.p.p.p.p.y.p.r.p.w.p.y.p.y.p.y.w.y.y.y.w.-.w.y.y.-.-.-.y.-.y.-.y.X.y."
+	"y.$.y.-.$.-.-.-.-.-.-.-.-.i.i.i.p.-.pXpXpXi.pXpXpXpX-.pXsXi."
+	"pXpXdXsXsXsXpXsXfXpXsXsXfXsXdXfXsXdXfXdXwXdXdXdXdXdXdXdXdXdXdXdXdX",
+	").^.).).T.7X).).(.L.V "
+	").).~.(.(.^.).(.(.(.).).).~.eXeXuXeXrXoX4XuXeXoXoX7X(.(.!.~.).(.!.(.!.~.(.~.(.OX).!.eXeX~.4X' K "
+	"eXeXeX0.eX0.4X0.0.4XtXeXeX*.6.*.6.0.K K 0.~.oX' 4X' 4X' 0.0.eX0.' ' 0.0.' 0.0.' "
+	"0.0.rXtXq.yXq.tXiXtXrXrXtXrXrX' oXoXoXOXrXoXiXoXrXrXOX@XrXrXOX@XrXoXoXrXoXoXoXrX' "
+	"rXtXq.tXq.tXtXtXtXq.rXtXiXtXtXrXtXtXyXtXtXyXtX*.*.K K 4XK K 4XK K K 4X' ~.eX*.eXq.0.0.rX' eXoX0.' "
+	"eXeXK ' oXoX' 0.*.7.6.6.0.0.6.8.7.q.8.q.0.*.0.q.*.` *.*.*.6.` D 6.*.|  .W ~ 6.K K *.K K D ` 6.` 6.` "
+	"6.6.,.,.,.,.D ,.D D ~ D ,.,.,.D ,.W #.,.;.W ,.;.D | D W W W h Q h j j k n M j j n j j | | k j p  .p "
+	"......r r h j ..k r  .| p r j p r p j k b n c p ..........O...O.....O.r  . . .j  . .j  .n n m M m M "
+	"m ) g.m Q j Q Q W :.$.{ #.#...{ #.> ;.<.<.<.,.<.<.$.#.:.$.$.$.$.{ } $.} #.#.} #.X.} #.$.} $.@.} @.} "
+	"$.@.@.@.@.@.@.@.@.@.} #.@.{ } { Z { @.@.@.{ > } Z Z } &.} } } } @.} @.@.@.{ > @.@.} "
+	"%.@.@.@.@.@.@.@.@.} Z } } Z Z } } @.#.Z @.Z @.Z @.Z } Z Z Z Z Z Z Z Z > L - - - - D ~ D Z Z D Z "
+	"#.#.D #.D @.*.*.Z %.D D @.Z %.Z %.Z %.Z %.Z %.@.;.#.{ $.:.:.$.#.{ "
+	"#.$.#.$.=.=.$.=.=.=.$.y.y.=.=.$.=.-.$.$.p.p.p.p.p.r.u.u.u.p.u.w.y.r.y.w.r.y.w.y.y.w.y.-.-.y.-.3.-.-."
+	"$.-.y.y.y.y.y.y.y.-.=.-.-.-.-.-.y.i.i.D.i.i.pXi.pXpXpXpXpXpXpXsXpXi.sXi.i."
+	"sXsXdXsXsXfXsXsXdXfXfXfXsXsXsXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXfX",
+	").).).~.).7X7X).V B V "
+	"(.7X!.!.(.7X).).(.).7X^.).uXeXoXeXoXeXrXoXeXOX~.eXeXOX).).(.(.~.~.~.(.~.!.(.OX(.!.!.uXeXeX0.eX0.4X0."
+	"eXeX0.eX0.0.4X0.' eXeX0.' 0.*.0.0.eX~.*.oXeXK 4X' eXeX0.eX' "
+	"4X*.eX0.0.0.0.0.q.q.tXtXe.tXiXtXtXtXtXtXtXrXtXrXrXrXrXoXrXrXrXoXoXrXoXiXoXOXiXrXoXoXoXq."
+	"rXrXoXiXrXtXtXtXrXrXtXtXq.tXyXtXtXtXtXrXeXyXq.yXtX0.yXtXyXtXyXtXq.4X0.K 0.K oX' 4X4X' ' 0.0.' "
+	"eX0.eXeX0.oXeXeXeXeX4XoXoXoXeX0.0.0.0.7.6.q.7.0.0.8.8.' / ' 6.` ` ` ~ ~ ~ 6.*.,.W j  .;.Q ;.,.*.K "
+	"*.*.K ,.6.6.` 6.~ ` 6.,.1.,.~ D 6.#.~ #.W W W W / / ;.W D ;.#.W W W W | W j h | W j k n j k j M k p "
+	"M k p  .k M k k ......M  .k  .r  .k k c c c p  .M j n n n c n c ......O...r .... ... . . .O.k M M  "
+	".j M M m M m m M m m m m ) Q Q Q  .2.{ :.:.:.:.;.;.>.<.<.<.<.,.:.$.$.$.#.$.$.{ :.$.#.#.} { { { #.} "
+	"} #.#.#.@.@.@.} } @.@.$.@.@.@.@.#.@.@.#.} > @.D @.D @.@.@.#.#.} > } { @.@.} } @.&.} } @.@.> { { > { "
+	"@.@.@.%.@.@.@.@.Z @.} @.@.} } Z @.@.Z @.Z @.#.@.Z Z } Z Z Z Z Z Z Z Z > Z - - Z K 9.AXAX9.L D Z D D "
+	"D Z Z #.#.K D *.Z *.*.Z Z %.@.Z Z @.Z Z %.%.@.#.:.:.3.:.>.#.#.{ ' "
+	"%X#.$.=.=.=.$.$.=.-.$.$.=.$.$.$.-.y.3.p.X.p.p.p.u.u.p.u.r.r.p.p.y.y.u.y.r.y.w.y.y.y.y.y.-.y.-.-.-.-."
+	"y.p.y.y.$.y.-.-.-.-.-.-.-.-.i.i.S.i.i.i.i.i.-.-.pXpXpXpXpXpXpXi.sXD.i."
+	"AXsXsXsXsXsXfXsXsXsXpXsXsXdXdXsXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXfX",
+	"^.2X).OX).).(.C C B L.W.B C B B C C C C "
+	"~.).7X4XuXeXeXuXeXuXeXoXoXoXuXeXOXoX~.#X~.).(.(.).!.(.!.!.(.!.(.!.~.eXeXeXeX0.' "
+	"eX0.0.0.0.0.0.0.0.eX4X' *.0.0.K 6.` 0.*.~.' 4X~.eXeXK eXeX' 0.' 0.' ' 0.' "
+	"0.rXe.q.tXtXtXtXyXiXtXtXiXtXtXrXrXrXrXrXrXrXoXiXOXiX@XrXrXoXrXrXoXrXrXoXiXrXrXrXoXe.rXq.e.tXq.q.tXq."
+	"iXq.iXw.e.e.q.tXyXyXtXyXq.yXyXq.yXyXyXyXtXeX*.4X0.eX*.eX' ' 0.4X0.0.0. "
+	"0.0.eXrX0.eX0.0.eXoXeXeXoXoX0.*.7.7.8.0.7.0.8.6.q.8./ / / ^ ^ ^ ^ / / ^ ^ ^ / / / W / W / Q ~ ,.K ` "
+	"K K ,.` 6.` 6.6.` ~ ,.,.~ #.~ W W ~ ~ W ;.W Q W W ~ ;.W ~ W W h W W j W W Q h j n c M p v c M M c M "
+	"k p  .k  . .p  . .r r j r | k p c c l l c M k b c c b n c p ..............r O. ...p O. .M  . .M M M "
+	"M n m M n m m ) m m m n Q Q Q j :.:...X.:...:.<.<.<.<.;.<.<.:.#.:.#.#.#.$.} #.} :.$.{ #.} } #.{ } } "
+	"{ $.@.} @.$.@.@.@.{ D D #.> #.D #.#.#.#.@.D } { @.@.} } #.@.@.{ @.@.%.} &.} @.@.@.> > > > { > > "
+	"@.@.@.@.@.@.@.@.@.Z @.@.@.> } > } } Z @.Z @.Z @.@.Z @.Z Z , Z Z , Z Z - - D e.AXFXGXZ.Q , > #.#.Z D "
+	"*.*.D Z @.D Z #.K Z #.Z Z Z Z %.Z %.Z Z Z #.:.<.:.:.#.:.{ D ,.%X%X:.$.} "
+	"$.$.=.$.$.$.$.$.$.$.-.3.$.$.p.p.p.p.y.p.r.u.p.y.p.p.p.p.r.p.w.p.y.y.p.p.y.y.-.y.y.y.-.$.-.y.p.y.y.y."
+	"p.y.$.y.$.-.+.-.-.-.i.t.i.i.t.i.D.i.i.sXpXpXpXpXsXpXpXi.i.i.sXi.i.sXi."
+	"sXsXsXpXsXsXsXsXsXsXsXdXfXdXdXdXfXdXdXdXdXdXdXdXdXdXfXfX",
+	"gX).7X).).OX(.B ._.B I JXJXbXbX1X|.B "
+	"Q.).).7X~.eXeXOXrXeXeXeXOX~.eXOXoXOXOX~.!.!.(.!.(.!.).(.!.!.!.(.OX#X' "
+	"eXeX0.0.yX0.0.eX*.eX0.0.0.0.0.0.0.*.0.' 0.0.K *.6.` ' ~.0.' 4X0.' eX' eX0.0.eX' eX' "
+	"0.q.q.e.tXtXtXtXq.yXtXtXtXiXuXtXrXrXrXrXrXrXoXiXOXrXrXrX@XrXoXiXrXrXrXrXrXrXtXrXrXq.iXq.tXtXq.q."
+	"iXtXq.iXyXr.iXe.yXq.yXyXyXyXtXtXyXtXq.yXyXyXeXyXyXeX4X0.0.4X0.0.eX0.0.0.0.' "
+	"0.0.rX0.0.eX0.eX0.0.0.eXoXoXeXeX0.0.8.7.0.8.8.0.8.8.0./  ^ ^ / ' ^ / ^ ^ ^ ' / ^ ^ ^ ' ^ ^ ^  / ~ "
+	"#.K ` 6.6.6.` 6.` ` ` ,.,.W W W #.W W W W W Q W W Q ,.W W W W W h j Q W j h Q h j p v M v p M c p c "
+	"p M k  . .p r k  . . .p  .r n c p c l s b ( b j n b j c b k j .................. . . . . . .M  .M n "
+	"n n M m m M ) m m ) m m ) Q j Q j 2. .2.| :.;.<.<.<.:.<.<.<.:.<.#.<.#.$.$.} #.#.} $.} #.#.} } #.@.{ "
+	"} { } { #.#.> W D > W #.D > D #.D { @.#.@.{ { Z #.Z #.#.} #.{ #.Z { @.@.@.@.@.@.@.Z > > > > > > > { "
+	"Z @.@.@.@.@.@.@.@.@.@.@.} Z @.Z @.@.@.@.@.Z Z @.@.@.Z Z Z Z Z Z , L - D BXFXZXZ.+.5.h L Z D D D Z "
+	"#.Z D #.D K K #.#.Z Z Z @.Z %.Z %.Z %.Z #.:.:.#.:.#.:.{ > W %X$XXXW "
+	";.$.$.=.$.$.$.$.3.$.$.$.3.3.$.p.p.p.p.y.p.y.p.p.p.u.p.r.y.y.p.r.p.3.p.u.y.y.u.u.y.y.-.y.-.y.y.y.y.y."
+	"p.y.y.y.y.$.y.y.t.t.p.i.i.i.p.i.t.D.i.S.i.i.i.pXpXi.y.y.sXi.i.D.sXi.i.D.sXaXaXi."
+	"pXsXsXsXsXpXsXaXfXfXfXsXdXdXdXdXdXdXdXdXdXdXdXfXiX",
+	"7X).7X).#XE.B B _.K. XJXbXvXvX_.B C "
+	"(.~.4XoXuXeXeXuXoX4XuXoXeXuXoXeXuX4XrXoXuXOX!.~.!.!.!.!.!.(.!.(.!.(.!.4XeX0.eXeX0.eX0.0.tX0.0.4X0.q."
+	"0.0.0.0.*.0.0.` 0.6.0.0.6.0.eX0.oX0.eX0.eX' "
+	"0.eX0.0.0.q.8.tXrXq.r.tXiXtXtXiXyXiXyXiXyXiXrXiXuXrXrXoXrXuXrXrXoXoXrXrXOXoXtXtXrXq.rXrXrXrXrXtXq."
+	"tXq.q.tXiXq.q.q.q.e.yXq.tXr.iXq.yXyXyXyXyXyXyXyXyXyXq.4XyX4XeX0.eX*.' ' *.*.0.*.0.0.0.0.' "
+	"0.0.0.q.0.eX0.4XeXoXoX0.0.0.7.*.7.0.7.0.0.9.q.8.8.^ ^ ^ / ^ ^ ^ ^ ^ ^ ^ ^ ^ / / ^ ^ ^ ^ ^ ^ ` ~ ` "
+	",.` ~ ` ' 6.` ` 8.6.~ ,.;.,.W / W 2./ W / ,.W / W W W ,.;.W j j j k Q W j j Q j v v v v M v M M M n "
+	"j M p j  .c c M r r  .p k c c c c c l b b ( b b b b n b b M c n j p j p O.M  .p O.p O.n k  .n n b M "
+	"b b M n m n m b m m m m n ;.Q Q h  . . .n  .o.2.<.,.<.<.;.,.<.<.#.#.#.{ $.$...{ } #.} { #.X.{ { { { "
+	"> #.> D > D D #.D D D D #.{ D #.Z > D #.Z @.#.@.#.#.} D } @.} } @., Z } @.Z @., , Z , > > > > { > , "
+	"@.@.@.@.@.@.@.@.@.} @.@.@.@.} } Z @.Z @.@.} @.} Z Z , , Z Z , Z - D BXDXZ.+.+.N.5.: - > > Z D D D "
+	"*.Z Z K @.Z Z K @.Z Z Z Z Z Z Z Z Z Z ;.:.;.:.:.;.{ > D ' .kX.W D "
+	"$.#.$.$.=.$.$.<.3.w.3.3.3.y.p.X.X.p.X.p.p.3.p.w.3.p.r.p.5.3.p.y.p.y.r.p.r.y.y.y.p.r.y.y.y.y.3.y.y.y."
+	"y.$.y.y.-.-.y.t.t.p.p.i.i.i.i.i.i.i.i.p.i.p.u.pX-.sXi.D.aXsXsXi.sXsXsXi.D."
+	"aXaXAXsXsXsXsXsXsXaXaXaXsXsXdXsXdXdXdXdXdXdXdXdXdXaXfX",
+	").).).).7XE.B `.:XvXbXvX`.B B V "
+	"!.(.).uXeXrXuXeXeXeXuXuXOXrXeXuXOXuXeXOXOX~.eXeXuX~.!.!.~.#XOX!.!.!.!.!.!.eX0.0.q.0.0.tX0.0.tX*.7.0."
+	"*.0.0.0.6.0.0.0.K *.K 6.6.6.6.0.0.' ' ' 4XeX0.' 0.' 0.0.0.' "
+	"q.q.tXe.yXe.yXiXyXtXiXyXuXyXyXiXtXrXOXrXuXiXoXrX@XrXoXrXrXrXiXrXrXe.rXe.q.rXe.rXtXq.tXq.tXiXq.tXq."
+	"tXyXe.iXq.e.yXq.iXtXyXyXq.yXyXyXq.yXyXyXq.4Xw.w.yX*.*.*.0.0.4X0.0.0.0.0.' 0.0.0.0.0.0.0.0.' "
+	"eXeX*.7.*.*.7.0.7.0.0.0.7.0.8.8.e.8./ ' ^ ' ^ / ^ ' / ^ ^  / ^ / ^ / / / ^ ^ / ~ ~ 6.*.~ ` 6.` "
+	"6.6.` ` ` ,./ ;.W Q W W W W 2./ W ;.Q Q W W j j j j j b k j Q Q h j c v v v p M p M c M p p  .j k k "
+	"p r  .p j c c k p k p c b b ( b b f b b b b b j b c c b m c b b M c m c b b m m c m b M m m b m m m "
+	"m ) m m ) b ) j Q j 2. . .4.n M m m 2.<.1.,.,.:.;.<.:.:.$.$.#.$.{ $.#.{ ..} X.{ { { ..| #.{ #.> W ( "
+	"h > D D ;.W D #.D Z D #.@.Z #.#.@.#.@.{ @.#.#.{ @.> Z } , , Z , - , , , , , > , { > > r { > @.Z > } "
+	"@.Z } Z @.@.@.@.} Z @.@.@.@.Z } Z Z Z , Z Z Z - Z - L r.ZX+.+.t.Z.D.G.L > D Z D Z D D D Z D @.Z D D "
+	"Z D Z Z Z Z Z Z Z Z Z #.#.:.:.;.h | | > / %X$XvX%Xh "
+	";.@.$.*.$.$.$.3.$.3.3.3.3.$.3.p.3.p.3.3.p.3.5.3.r.r.5.3.3.3.3.3.5.3.r.p.3.p.p.p.p.p.5.p.y.y.y.y.3.3."
+	"y.y.y.$.y.-.y.-.p.t.S.t.t.t.i.p.i.t.i.i.p.i.p.u.y.u.y.pXi.i.i.i.sXAXi.D.i.sXi.aXaXi."
+	"aXpXsXaXaXsXsXsXaXAXdXsXdXdXdXdXdXdXdXdXdXfXfX",
+	"7X7X).7X).XXB :X X X.B B "
+	"OX7X#X).uXeXuXuXOXeXuXuX~.oXoXuXOXoX4XeXuX~.oXOXuXOXOXOXOX~.!.!.~.!.!.!.(.!.(.(.eX0.0.0.*.q.0.tX0.0."
+	"q.7.0.q.q.*.q.0.0.6.0.6.0.0.0.8.0.6.0.tXq.eXeX0.' 0.4XrX' "
+	"0.0.0.8.q.iXq.q.e.yXe.tXiXyXiXtXiXyXiXuXuXiXiXrXoXoXoXiXiXrXuXrXrXtXrXrXtXrXtXrXrXrXtXrXtXtXtXq.q.q."
+	"tXq.tXw.iXtX9.9.yXe.r.r.yXyXyXtXyXyXyXyXyXyXyXyXq.4XyXyXeXeXeX*.0.0.*.0.0.0.6.0.0.q.0.q.0.0.q.0.7.w."
+	"7.7.0.7.q.*.7.0.7.7.8.0.0.9.6.' 8.' / / / ^ ^ / ^ ^ ^ ' ^ ^ / ^ / ^ / ^ / ^ ~ 6.~ ` ` 6.~ ` 6.` ` ` "
+	"8.` ` W Q 2./ ;./ W W / ;.Q W Q W Q Q j Q j j j j b b j b h M M v v v v v M M c n p M k k p c c p  "
+	". .p k k c c c s b ( b b ( b b b k b b b c b n b b M c b m c m c b m m ) m m m m m ) m  m m m ) m "
+	"m m m m n n Q 4.Q  . .n M m m M n 2.2.2.<.1.2.#.#.#.#.{ $.{ $.{ } } $.{ #.{ #.{ { | { D > W h h W h "
+	"D D > D D D > #.#.#.D #.#.Z #.@.{ } #.{ } @.{ } > Z , - O o O . . . O = , > , > > > > > Z } Z > Z , "
+	"@.@.@.@.@.@.@.@.@.} Z @.@.Z } @.Z Z Z - , Z - - ~ G.+.Z.Z.S.F.ZXe.- - > D D D D Z D D Z D D Z Z K Z "
+	"Z Z Z Z Z Z Z Z Z W ;.;.h ;.#.D > ( _ .vX X' > > "
+	"#.$.#.$.$.<.<.3.3.3.3.3.3.p.X.p.p.X.3.3.3.3.3.>.3.>.>.<.>.>.>.3.X.3.3.5.3.t.5.p.p.t.t.t.p.p.p.p.p.y."
+	"p.y.y.y.y.y.y.t.i.t.S.i.p.S.D.i.i.i.i.i.p.p.p.u.pXu.i.i.i.D.sXD.aXi.i.sXi.aXi.u.aXi.i."
+	"AXaXaXaXaXaXaXsXsXdXAXdXKXdXdXdXdXdXdXaXfX",
+	").).).7XC B B .X:XY {.bX$XL.B G "
+	"tXuXuXeXeXuXeXoXuXrXoX4XeXuXeXeXuXeXeXeXeXOXoXeXeXoX!.~.OX~.OXOXOX).(.!.(.eXtX0.0.tX0.0.q.0.0.q.0.7."
+	"0.q.*.q.7.*.0.0.*.6.6.0.8.0.q.rXrXrX0.' 4X' "
+	"0.eX0.0.0.0.e.0.q.e.yXe.q.iXe.tXtXtXiXyXfXuXiXtXtXiXuXtXrXrXuXuXrXrXrXe.e.tXe.tXtXrXrXq.tXrXrXtXq."
+	"iXq.q.yXtXq.iXr.tXtX9.8.1.9.q.yXtXyXyXyXyXyXyXyXyXyXtXyX4Xq.yXq.5Xq.0.tX*.tX*.*.tX0.0.0.6.0.q.0.q.7."
+	"q.7.q.w.7.7.*.q.7.7.*.*.q.8.7.6.9.8.0.8.q.8./ / ` ^ / ' ! / ! ^ / ^ ^ / / / ^ / ^ ^ / ~ ,.6.,.~ 6.` "
+	"` ,.6.~ ` ` / 8./ Q / ;.Q Q / W ;.W W ( Q ) b j j Q k b k b n j b k j c M v v v v v v c c M p n k p "
+	"k k p c k k p c c c l s c l b ) b b b R b b b k b b b b n b c m M b m c m b m  b m ) m m m m b b m "
+	") m m m ) m b n ) n Q Q j 2.n M M m M M m M 2.2.2.2.2.>.#.$.#.$.{ #.#.#.#.} { } X.{ { { ..{ { { D h "
+	"W h ( ( h j h D D D #.D { D D #.@.@.#.Z #.#.} #.@.{ } > Z , $ . .   .     . . . O , : , > > > > | > "
+	"{ { > > { { Z } @.@.@.@.Z } Z } Z @.Z Z Z Z Z Z - Z - L 5.N.N.S.G.ZXDXGX! - S Z D Z Z Z D D Z D Z Z "
+	"D D Z Z Z - Z Z Z Z Z Z Z #.h ;.#.h W h > ! .$XvX XR f > "
+	"#.$.$.#.$.>.3.>.3.3.>.3.p.X.p.X.p.$.3.X.X.3.;.,.;.2.q. e.iX` "
+	"8.2.:.>.3.3.5.p.5.p.5.p.p.t.t.t.t.t.t.+.p.+.p.p.p.t.i.t.p.i.p.p.i.t.S.p.p.t.t.5.t.r.2.y.u.i.i.aXi."
+	"aXD.aXi.aXu.u.pXu.aXaXu.aXaXaXaXD.sXsXsXsXAXsXsXsXdXsXfXdXdXfXfXfXfX",
+	").7X).7XOXXXB  X:XvXJXIXuX%X.U % & ; K "
+	"uXuXuXeXeXOXoXeXrXeXuXeXeXeXrXuXtXtXrXtXtXtXtXeX~.oXtX4XeXq.0.tXeXeXeX0.0.0.q.tX*.q.q.7.7.0.q.0.q.7."
+	"7.q.6.6.6.0.8.7.0.8.0.rXrX' 9.q.' 0.' "
+	"eX0.0.0.9.0.e.e.tXe.q.q.w.tXr.yXiXyXiXtXiXtXtXiXtXtXuXOXrXrXrXrXtXtXtXtXtXtXtXe.tXtXrXrXrXq.tXtXq.q."
+	"tXq.iXtXq.q.iXq.<.8.8.<.9.r.yXyXyXq.yXyXyXyXyXq.yXyXyX4Xq.yXq.4X4X*.tX*.tXeX0.q.*.0.0.q.7.9.9.7.7.7."
+	"w.7.9.7.7.*.0.0.q.8.7.6.0.0.8.6.8.8.8.8.' / / ` / ^ ~ ! ! ! ( ^ / / ^ / ^ ^ / ^ ^ ~ ~ 6.K 6.` ` 6.` "
+	"/ / 8.` / / ` ,./ ;./ W ;.W / ( k Q n ) n ) j j b n n b n b b b b v M v p p v v M M v c M c c M c c "
+	"c c l s p w c c s l l c l k b b b b b b b b s b b b m b n b b m b ) m m m m m m m ) x m m m m b m ) "
+	"m m m ) b b b b n Q Q j M M m m m m m g.) Q 2.Q 2.2.#.:.#.#.{ $.{ ..#.{ { { #.#.{ { { { { { h h D ( "
+	"> h k h k k W D D D #.{ @.D #.#.@.#.{ { #.{ { @.> Z , - . .           . & &   . , : , > > > { { , , "
+	"> > , , , > , , { Z } Z @.Z @.Z @.Z , Z - , Z - - ( +.Z.G.F.ZXDXGXNX- - , : D > D D Z > L D D D L D "
+	"L A A L L - Z Z L Z D W #.W | D > > : _ .vXvX.R > h j o. "
+	".>.>.>.3.>.>.5.>.5.X.p.3.3.3.X.3.X.:...8.rX%XkXbXbXcX:X:X:X>X%X1.2.X.3.3.p.3.p.5.p.t.t.t.t.5.t.5.t."
+	"p.p.p.p.t.t.t.S.S.t.S.t.i.p.t.p.t.t.r.^ P ^ "
+	"u.u.u.u.i.i.u.D.i.aXi.aXu.u.u.r.aXu.u.aXi.aXsXsXsXsXsXsXsXsXAXsXsXfXKXdXaXfXaXG.",
+	"7X7X).).B C B vXvXbXHXKXS  XvXbXUXPXKX "
+	"uX~.uXOXuXoXoXuXuXeXeXuXuXeXrXeXuXtXtXeXeXeXeXeX4XoXeX4X4XtX*.0.eXeXq.0.0.tX0.*.q.q.7.q.7.7.7.q.7.q."
+	"7.7.6.6.6.~ 6.q.8.q.0.0.q.' 0.8.q.0.' "
+	"0.0.0.q.q.q.q.yXe.r.q.iXq.r.q.iXtXtXuXiXiXyXfXrXe.rXuXrXrXrXrXtXiXq.yXtXtXe.tXtXtXrXtXe.q.0.q.q."
+	"tXtXtXtXq.tXq.yX9.8.8.8.8.9.8.q.yXyXyXyXyXyXyXyXyXyXyXtX*.*.yXyX4XyXyXq.4XyXyX*.yXq.0.8.9.7.q.q.w.w."
+	"7.q.7.7.w.7.7.*.7.7.6.8.6.8.0.6.6.8.8.8.8.0./ ' / / ~ ^ ` ^ ~ ^ / / / ^ ^ ~ ^ ^ / / / ~ W ~ *.` ~ "
+	"6.` ` 8.` 8.` 8.8.` 1.W W W / W Q Q ( ) ) b j b b n j n c b b b b b b c v p M v v v v p M p c M c c "
+	"l c c l p s c l s s y l c l l l c ) b ( b b R b b b b k b b b b b b m b m m m m m m m l m m m )  m "
+	"m m m b b b b b j ) j ) n Q n m m m M M M g.m m m 4.4.2.2.$.#.$.#.$.| u c k k | { { { { { { ..{ D h "
+	"D h h h ( D W k f j k D #.D D Z @.#.@.#.#.{ #.} #.} @.{ , , . . .   .       . E ^ *   O = , > > > > "
+	"> > { > , > > { , , > > , , , Z } Z Z } , Z , Z Z - , - >.Z.F.F.ZXDXGXAXE - L : L Z Z D D L > D Z Z "
+	"D D Z L E U _ A - - - L D > W h ;.> > > > E '. XbX$X%Xf r j .. "
+	".>.5.>.X.5.>.X.>.X.5.y.y.X.p.X.X.3.#.#.%XkXvXMXcXbXcXcX:X:X:X*X:X;XOX1.>.>.5.3.5.5.p.t.5.t.5.5.5.p."
+	"t.+.p.p.p.p.t.t.t.p.t.S.i.t.t.t.p.X.e._ N ^ 5.5.p.u.u.u.u.u.u.u.u.u.aXr.iX' "
+	"9.r.r.u.aXaXi.aXaXsXsXi.sXsXAXsXsXsXfXdXdXfXD.S.S.",
+	").).).uXOXXXB bXJXHXbXcX X XvX%XR * UX "
+	"uXeXuXuXeXuXeXuXeXuXeXrXeXtXuXrXeXeX0.eXq.0.tXq.eXeXeX0.q.eXtX4X0.eXeXeX0.0.0.q.w.q.7.w.7.7.0.w.7.q."
+	"7.q.6.6.6.6.6.9.8.8.8.9.0.9.9.8.9.9.rX0.0.e.q.9.e.e.e.yXtXiXq.e.tXe.w.iXiXyXtXtXuXiXe.rXrXiXuXrXiXq."
+	"tXtXiXyXe.e.tXtXq.iXtXrX0.0.q.q.q.q.iXq.yXe.tXq.9.9.8.<.<.8.,.9.q.yXyXyXyXyXyXyXyXyXyXyXyXyXyXyXyXw."
+	"w.4XyX0.tXyXtXyXq.7.9.7.7.w.7.9.7.q.w.9.7.7.w.7.7.8.6.7.7.0.7.6.6.8.8.8.` 8.9./ ^ / ` ! / ^ ~ ^ / Q "
+	"/ ( / / / ^ / ^ / ^ / ~ ~ ~ ` 6.` 8./ / / / / / / Q Q Q 1.Q 2./ Q j b n b b ) b ) m n n c b c b b b "
+	"c v u g.v v v v v v v v v c v v p v c c s c s c c l s c l v c l l l b b b ( b k b ) s b b M c b b M "
+	"b b m ) x b m m m  b m b m m b ) m ) m ) m m b b b b n n Q j m M M M ) m M g.m g.M Q ;.;.:.#.{ "
+	"#.#.h u p y u y p p p  .r { r ..h D h W D h h h ( h k ( j k h D #.#.#.Z Z #.#.{ #.#.{ @.{ @., - .   "
+	"    .       . & & .     $ , , > > > > > r > > , , > > r > , r , , Z - Z - Z - - Z - , - Z - "
+	"C.F.ZXZXZXGXGX/ - - - , > : : Z > Z D Z D D L > D L > U U U _ L - L > > > > D h > h > _ .1XbX.I f "
+	"r r r o.>.4.>.>.>.>.>.>.3.3.X.X.3.X.3.3.X.{ / "
+	"1XvXcXcXMXcXcXcX:X:X:X:X;X;X;X+X:.>.X.3.3.5.3.5.5.5.5.5.+.X.+.p.p.p.p.t.t.i.t.i.t.p.p.t.t.+.5.' "
+	"XXL.S 2.>.5.r.5.y.r.u.u.r.u.u.r.r.u.e._ S e.r.r.aXu.aXaXD.i.D.D.D.sXsXsXAXfXsXfXAXAXF.F.G.",
+	").uXOX#XB B B vXbXbXbXcX X|.kXHXHXCXUX "
+	"OXuXuXeXuXeXeXuXuXeXuXeXrXeXeXeXeXeXeXq.eX0.rXq.q.eX4XtXtX0.0.tX4XeXeXtXeX0.0.q.w.q.q.w.7.w.q.7.7.7."
+	"6.7.7.,.6.,.6.6.8.7.,.9.q.9.9.q.9.9.9.q.q.rX9.9.9.9.9.9.q.e.q.e.iXq.q.r.tXtXtXiXq.r.q.rXe.rXtXq.e."
+	"tXiXq.yXiXq.iXtXq.tXtXtXq.q.0.q.rXq.rXq.tXtXq.e.7.7.1.8.,.9.8.8.<.q.5XyXyXyXyXyXyXyXyX4Xw.yX4XyXq."
+	"4Xw.yX4XyXyXyXyXyXyXq.7.q.q.9.w.q.w.9.9.9.w.9.7.7.1.1.9.8.6.6.8.8.7.6.8.8.8.` 8.8./ ^ / ^ / / ~ / ^ "
+	"^ Q / ^ / ^ ( / ^ / ^ ~ ~ ~ ~ / ~ ~ ` / 8./ 8./ / W W ;.W 2./ W Q 2.Q n n b b b ) b m m n b b m c b "
+	"b c m z z g.v v v v v p v v M c v p l c c l l l l c c l l l z l l c l c b b ( b ( b b ( b b b b b b "
+	"b b b b m b m m l m ) b b x ) m m m m m ) b ) m b b b b ) b n ) Q M m M m m m M g.v g.g.m ;.Q ;.$.} "
+	"{ $.k u u i p y p y i y p y p w k k f h h D W ( h W k h h k k k h D @.#.@.{ #.#.{ #.} { #.> , $   . "
+	"      .     . .       . O - = > > > > > r > > > > , > > , > , > , : - - - - - - , - - - - - "
+	"4.G.AXAXGXGX/ $ $ - , - : - L : L Z S D D Z Z L Z : - U V '.U U L : : > > s > r h , ( . XvXvX._ s "
+	"r r  .X.>.>.>.>.>.X.>.3.3.X.5.3.3.X.3.:.:.;.#XcXcXcXcXbXcXcX:X:X:X:X*X:X*X*X{.W W "
+	";.;...>.>.5.5.5.O.5.o.5.5.X.5.5.t.p.p.t.t.t.i.Z.t.p.5.5.oX/.L.N ( h 2. "
+	".3.>.>.5.w.5.r.r.u.r.3.>.r.OXC S e.r.u.aXi.i.D.D.i.D.AXi.sXZXi.dXdXD.F.F.F.D.F.",
+	"7X@XuXrXC B B .1XvX1X X.X|.kXKXUXIXUX "
+	"uXuXuXuX@X7XuXrXoXuXuXeXtXeXeXeXeXeXeXq.0.rX0.eXeXtXeXeX*.0.4X*.q.eX0.eXyX0.q.w.7.7.7.7.7.7.7.7.7.7."
+	"7.6.6.6.,.6.6.7.8.8.6.9.7.9.9.9.9.9.9.9.e.q.9.9.>.9.9.9.r.9.r.q.q.r.e.q.iXiXyXq.w.q.q.e.e.tXiXq.tXr."
+	"q.tXtXe.tXq.tXtXe.tXq.q.q.0.q.' "
+	"0.q.q.iXtXq.q.9.8.,.9.8.,.,.9.8.7.q.yXyXyXyXyXyXyXyXyXyXyXyXyX5XtXyXyXyXq.yXyXyXyX0.w.7.7.7.9.q.9.w."
+	"w.q.q.7.9.8.1.9.1.1.7.8.7.e.7.8.8.8. 8.8.8.8./ ^ ^ ^ ^ ~ ( / ^ ^ ^ ( / ( Q / ^ / ^ ^ ^ ~ ~ ,.` 6./ "
+	"/ / / ` / ~ Q ;.Q Q Q / 2.Q Q n n Q m m n m b b m ) m b c m m c b v v v z f.f.v v v v v p v c v v v "
+	"v v z v v v c l l c l c l c l l z l l b b ) b b b b b b k b b b b c b b b m ) x m ) m m m  l m b m "
+	"b b m ) c b n b ) n j b j b Q m m M M v g.g.g.g.g.g.M M  .Q #.#.#.{ p u i p i p y p p y i p p w s s "
+	"c k k s k k f k ( ( k j ( k k f > #.#.#.#.#.{ #.#.#.} Z , O   . .             . .     . . = : > , > "
+	"> > > > > r > > > r , , , , = - - - : ( f S : - - - - - > VXGXGXKX' - & ; E : E D : : - : - > Z S : "
+	"D Z D L : : U Y U U _ _ : : > > > > , s _ . XbX1X.R = r 2. .4. .>.>.>.>.>.X.>.X.3.3.X.3.3.:.:.| > "
+	"%XvXvXbXMXMXcXvXcX:X:X*X:X*X.*XE.f  l.) Q | | :...X.o.o.X.o.X.o.5.5.5.5.t.t.t.S.t.t.t.5.5. "
+	"}.&XL.C S W 1./ A S S ( / 2.9.>.3.>.>.3.9. V * ! 9.t.u.G.D.i.D.D.i.aXAXi.sXD.D.ZXD.D.D.D.F.S.",
+	"#XuXOX@XC B B B B B B C B _ NXCXCXCXS ' uXuXuXuXuXuXuXuXuXeX*.' "
+	"0.eX0.eXeXeXq.eX0.eXeXq.0.q.rX*.0.4X*.tX*.tXeXq.eX0.9.7.7.q.7.q.q.7.7.7.7.6.7.6.6.,.6.,.6.7.8.7.8.8."
+	"9.9.9.8.9.9.9.9.9.e.9.9.9.9.9.9.9.9.9.e.9.e.q.e.r.q.r.q.r.q.q.r.q.iXr.iXr.q.r.iXq.tXiXtXq.iXrXtXrXq."
+	"' "
+	"rX0.0.0.0.q.tXtX9.8.<.8.,.,.9.9.8.8.9.9.8.7.9.q.yXyXyXyXyXyXyXyX4Xq.yXyXyXyX5X5Xq.yXw.yXq.w.q.w.q.7."
+	"w.w.9.9.9.9.1.1.1.<.8.8.8.1.8.8.1.1.8.8.8.8.8.8.8.8./ ) ^ ^ ^ / ^ Q / ( ~ / / / / / / ^ / / / ~ / / "
+	"/ / ` / 8./ / W Q W Q Q W Q W W Q n  .n 4.n b m b m m b m ) M b c v b v v v v g.g.z g.g.p v v v c c "
+	"v v v v v p v l c l l p l l c l l c l l l l l s ) b b b b b b b b b b b l b x b b b b x x m b b m b "
+	" m m m b ) l l ) ) n j n b Q b Q n n m m g.g.m g.g.g.g.M v M n Q #.#.$.} u i u i p i u i i p p p p "
+	"p p s b s s s g k k b k k ( h h k k h > { } > { { #.@.#.} { @., O   . X O .     X & & & .     . $ : "
+	", : r > r > > , f > , , = : , , , = : S ( ( D ~ D W ( D - - $ $ NXGXe.( T ( / ;.#.{ > h W ! : - - D "
+	"- Z : L > L - : : U V U U .I R d : = : , > = _ .vXbX$X.( r j ;. . "
+	".o.>.:.>.>.>.:.3.X.3.X.:.:.>.:.:.;.W 1XvXcXcXmXcXcXcX:X:X:X:X:X;X*X.F >  j.j. / W k h k j j Q j  "
+	".4.k.l.e.X.p.t.t.p.p.t.t.5.>.+X*XU.V C - E V L.L.B N * * & : Q <.2.2.>.;.' Q.* & "
+	"1.r.u.G.i.D.i.D.sXD.i.i.D.D.F.D.D.D.F.D.G.S.",
+	"uXOX#XOXB B _..X.`.B V uXS ; % % : oXuXuXOXuX@XuXoXeX~.K ' "
+	"*.eXeXeXeXeXeX0.eXeXrX0.eXtXeXq.eX0.0.0.tX0.4X0.eXeXeXw.7.w.7.7.7.7.7.7.q.7.7.7.7.7.7.7.6.6.6.6.,.8."
+	"7.8.9.q.9.q.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.q.r.9.e.tXr.q.q.r.q.9.q.yXe.tXiXiXq.q.tXq.q.tXq.q.q."
+	"q.q.q.' "
+	"q.0.8.rXq.q.q.9.,.8.,.9.8.7.1.7.7.9.9.7.9.9.7.9.9.w.q.yX5Xq.yXyXyXyXyXyXyXyXyXyXyX4X4Xw.4Xw.9.9.9.q."
+	"q.9.<.1.2.1.1.1.) 1.1.1./ 1.1.8.e./ 7.8.8.1.8.8.q.1.^ ^ Q ^ ^ ( Q ( / Q / / ( / ( / / / ^ ^ / "
+	",.8.8.` / ` / / j Q j j Q j Q Q Q Q n n 2.n j n ) ) n ) b ) ) m ) m c b m v z m z z f.z f.g.g.v u z "
+	"c v y y l y p l u u v l u z l l l l c l l l l c l l b R b b ( b ( b b b b l b b l l b b m ) m m b m "
+	"m m m b m b  b b l b b n ) n n j ) n n n M g.g.v g.g.g.m g.g.p p M j | #.{ { u u u p y i y i y i y "
+	"y w p y s g l s k b k k s k ( k h j ( k f > > { #.{ Z > { #.#.} , Z . . NXCX5   . X NXVXKXS . .   . "
+	"= = : > > , > r > r > > r > > , , = = : W | >.G.AXAXAXG.5.{ > ( : : S ! ^ 1.2.5.t.G.AXAXF.t.5.{ | ~ "
+	": - - > L > L > D ; - % P V Y U .$X_ f : = : = =   XvXbX XXXf k h  .X.2.:. "
+	".:.>...>.X.3.:.>.3.:.3.:.:.{ > ~ :XcXvXcXmXbXcX:X:X:X*X:X*X*X*X;XA S j.6 j.j.j.l.l.) ) )  "
+	"k.l.l.x.c.j.1.5.p.p.t.t.p.t.t.3.6.}.*XY.C V V B U.B B C * N C * * O - W W W ~ _ L.C X f "
+	"3.r.i.i.D.D.aXD.D.sXD.D.F.D.D.D.F.D.F.D.D.",
+	"OX@XuXuXC B _. X X.K.B ).7X7XuXuXuXuXtX7XuXuXuXOX4X4X~.*.' K "
+	"0.0.eXeX~.OX0.eX0.q.eXeXq.tX0.q.tX0.eXeX*.4Xq.*.eXq.7.w.7.7.7.7.w.7.7.7.7.7.6.7.7.8.,.6.6.6.8.6.7.8."
+	"8.9.9.q.9.9.9.9.9.9.9.9.9.9.9.e.9.9.9.9.9.9.e.9.9.9.e.9.9.r.r.q.q.r.q.q.iXiXw.e.yXr.iXq.q.q.0.e.rX0."
+	"0.q.' "
+	"0.rXrXq.rX0.8.1.9.1.8.8.<.8.9.,.9.1.9.8.9.7.w.9.9.q.*.6.*.0.q.4XyXyXyXyXyXyXyXyX4XyXyXyXq.w.8.1. "
+	"1./ 2.Q ) / 1.) 1.1./ 1.1. 1.1.8.1.Q 1.9.8.8.8.8.8./ ^ ^ Q ^ ^ Q Q ( Q / ( ( / / / ^ / ( / / / ` ` "
+	"` ` ` / Q j Q j Q ) j j Q Q Q n o.j Q n n n m b ) m m m ) m m m m b l v v v v f.g.g.u d.v g.u z p z "
+	"c l u z l z l u l l l z l l l l c c l c m l l z c ) b ( b b b b b b b s b g b b b ) x b b l m ) g.m "
+	" b ) m m l b s ) b b j j ) b n n j c g.g.g.g.g.g.g.g.g.p p v c M h #.{ ..i u y u i i i y y p i y i "
+	"y y l s s g b k f g f k h h k h k k f > > > { { { { > } > > > Z o N KXVXVX. .  IXNXVXKX.       O , "
+	", : , > > r > , : r : , , = = ; / h G.GXLXIXIXIXIXLXIXGXG.{ > W W  .5.G.GXLXLXLXFXFXFXDXDXF.n.X.:.: "
+	"- - D Z D L D : : ; N N C Y '..kX & = ; = = P  XbXbX+XI a r h | .. . . . "
+	".2.>.:.:.>.:.:.:.:.3.X.;.#.h %X:XvXcXMXMXcXcXcX:X:X:X:X;X*X*X{.:  "
+	"j.j.j.j.j.x.x.x.x.lXlXzXx.x.x.v.l.;.X.5.t.t.t.t.t.t.>.' ;X&XK.L.U.U.I.&XY.&XU.C C C C C X X % ! R V "
+	"{.L.* . ; 1.u.u.D.i.D.D.sXD.D.S.D.F.S.F.AXD.D.F.F.D.",
+	"uXuXuXOXuXOX@XuX@XuX~.~.~.7XuX4X7XuXuXtXuXuXuX4XuXeXK "
+	"eX~.4X*.0.0.0.OXW.W.OXeXeX0.eX0.eX0.eXeX0.eX*.eXyXeXtXeXq.9.w.w.9.7.w.7.9.7.w.q.7.7.7.8.7.7.<.,.,.,."
+	"6.,.6.1.9.8.8.9.8.9.8.9.9.1.9.1.9.e.r.9.9.9.r.9.9.r.4.9.e.r.9.9.<.9.q.q.r.q.r.q.r.q.iXiXe.tXq.q.q.q."
+	"0.0.q.q.rXq.0.0.q.q.0.8.8.,.8.8.,.,.9.,.9.8.7.9.7.7.9.9.9.9.9.9.7.,.*.7.6.*.7.0.w."
+	"4XyXyXyXyXyXyXyXyX) ) ) )  ) 4.1.Q 2.1.1.1.1.1.1.1.1. 1.8.8.) n n n 8.8.7.8.8.8.1.Q ^ ) ( ( Q j h "
+	"Q ^ / / W / / / ~ ^ / / / 8.` ` / Q j n n Q j Q Q ( Q Q ) n n ) ) n ) n n n m m m m m m m ) ) b l y "
+	"g.f.v v u u f.f.v g.g.u v u z u p z p u p z u v u l p z v z l l l l l l l b l b l ( b b ( b ( b b b "
+	"l b b l x b b b m m v x x m m m b m ) b b s c b b Q b n j Q M v v g.f.v f.m f.m m g.g.g.g.p p u p { "
+	"}  .i u i i i i i i i i i y i i u s l s s b g b b k k ( W j k f k h k > h #.{ { { { > r e e , o  % "
+	"R VX* X NXCXX  KX&       O = : > , , > : > > > : , = - = : h "
+	"<.DXLXIXIXIXIXIXIXIXIXIXIXLXZXG.G.AXLXIXLXLXLXLXLXLXFXFXFXDXDXZ.O.9.: : L : L L - : - - : N N C U "
+	"'.$XHX_ = T E a U  XbXvX X = r r 2.2. . .2. .;...:.:.3.:.:.:.:.:.#.;.> D "
+	"$XvXcXvXMXcXvXvX:X:X:X*X*X*X.;XI ;  Y j.j.j.j.c.x.x.lXlXlXlXx.x.x.c. h X.X.5.t.t.t.t.+.5.' "
+	"=X&XY./.$X$XI.&X{.U.I.L.C C C C C C V {.I.&X&XV * X % 1.5.D.i.D.sXi.D.D.D.D.S.D.D.S.D.D.D.ZXD.G.",
+	"OXuXuXuXuXuXuX7X7XK Q.~.~.~.uX7XuX4XtXuXuXuXeXuXuX4XK 4X~.4XeX~.eX4XW.W.W.W.OXeXeX0.eXeXeX0.eX0.4X' "
+	"eX*.tX*.q.9.9.w.9.w.7.9.7.7.q.7.7.7.7.7.7.7.7.8.<.6.7.8.8.,.8.7.9.9.e.9.8.9.9.9.9.1.9.9.9.9.9.9.e.9."
+	"9.e.e.r.e.9.9.<.<.<.,.<.w.9.r.q.w.q.e.r.w.q.e.' 8.q.q.0.0.q.q.q.rXq.' rXrXq.` "
+	"8.8.8.,.8.8.,.8.9.,.9.9.9.9.7.9.7.w.9.9.,.6.6.6.*.7.*.*.q.*.w.yX4XyXyXyXw.q./ /   )  Q "
+	"2.4.1.1.1.1.1./  1.1.1./ 1.) o. .n n 2.8.8.8.` 8./ / ^ ( ) ( h Q k j ^ Q / / ^ / ( ^ ~ ^ / ~ ` ` / "
+	"j j j n k j Q Q n Q Q b n ) n ) M n n M n m m m m  m m m m m m t l y f.z f.g.f.u g.g.d.p u z p z p "
+	"z u u p p l l p p z p z z z l l l l l l l m l l l b ) b b b b b b b b b b b b l l b b v z z m m m m "
+	"b  b b g b s b n b b n l l f.g.g.f.v g.g.g.g.v g.g.g.p p u f.u u | { p i i i d.d.d.i i i i i y y i "
+	"t l l g b g s b g k k ( ( h k k h f h k g { { { > h w y w e 0 o ) % X  Y C l.%X. . KXP       O = = "
+	"= > k , k = r , = , , = : Q :.GXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXLXLXLXIXLXLXFXFXFXFXFXDXDXF.+.5.( "
+	"L : > L Z > : : - ; ; N N Y V .bXHX% E _ 4 U  XbXvX.R = r r k  . . . . . .:.#.:...#.:.:.:.:.| #.h "
+	"' vX:XcXcXMXMXcXcXcX:X:X*X:X*X*X&XN a j.j.Y j.j.x.x.x.x.lXlXzXx.x.x.j.j.) r X.5.5.t.t.5.t.X.X.) "
+	"{.Y.}.HXUXkX'.vXJXbXL.&XK.B J.B C B &X*X&X&XL.C X X ; 5.t.Z.D.i.D.D.D.D.D.F.D.D.S.D.F.D.D.D.F.S.",
+	"uXuX@XuXuXuXuX(.~., r , r r r 4X= O uX7X7XuXuXuXuX~.~.4XK eX~.4XK "
+	"W.+XW.W.W.!.OXeX0.0.q.q.eXeX~.oXeXeXeX*.eXw.w.3.7.w.7.7.9.w.7.w.7.q.7.7.8.7.<.7.7.6.,.6.,.6.,.6.8.1."
+	"9.8.8.9.9.e.9.9.9.9.9.9.9.9.e.9.9.9.9.9.9.9.<.,.<.9.<.7.<.<.9.7.7.q.e.q.q.q.e.q.8.8.` "
+	"8.e.q.0.rX0.rX0.q.0.' 8.8.1.8.,.8.,.,.8.8.,.9.9.<.7.9.9.9.9.9.9.7.*.*.6.6.! "
+	"*.0.7.*.q.*.w.w.q.5X4XyXq.8. ) 1. ) / Q 2.Q 1.) 1.1.1.1.1.1./ 1.Q 2.Q n  .n n ) 8.8.8.8.` Q Q Q ( "
+	"j j k Q h Q ( / ( / / / ( ^ ^ / / ~ Q c k j k n n b b n b Q j b n n M M n n ) M n n m m m m m m m ) "
+	"m x s y y y u f.g.u f.v u g.p u z z u u v l v u z u l z l u z l y p l l l l m l l l l l l l l ) b ( "
+	"b R b b g b b l b c b x z v m z z z b m b b l q x x l x t q t y f.g.g.p f.g.g.f.v f.g.g.m g.p "
+	"g.d.g.d.u u k { y i d.d.d.d.d.i i i i i i i i t l g b g g b f l s k g g k ( j f h f f s > { > f w p "
+	"y w e e + R kX* jXxXxXjXjX* U KXO .   . O = = > = = > , > : s , = = ; Q { "
+	"GXLXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXLXIXIXLXLXLXLXLXFXFXFXFXDXDXDXG.Z.e.- - : - : L - : : ; - ; S % C "
+	"Y U %XbX_ N N V U U %XvX._ a = r r  . . .;.|  .| :.:.:.:.:.:.;.:.#.| h "
+	"OX:XcXvXMXcXcXcX:X:X:X:X:X;X;X;XU.: P Y j.j.j.j.x.c.x.x.x.lXzXzXx.x.x.j.b  "
+	".X.5.5.5.5.5.5.5...2.L.J.bXJXJX}.vXJXJXJX%XU.&XK.B J.Y.C Y.&XY.B C O X * ( "
+	"5.u.t.D.D.D.D.D.D.S.D.S.F.F.S.S.D.D.S.S.S.",
+	"OX@XuXuXrX7X!.r = O.N.H.h.N.O.= q e O tX7XuX7XuXuX4X~.~.4X*.~.4XW.W.W.(.W.W.W.E.OX0.eXeXoXoX~.eXoXK "
+	"' "
+	"4XeXeX7.w.9.w.w.9.w.7.7.w.7.7.w.9.7.7.7.7.8.7.6.<.<.6.6.8.<.,.8.9.9.8.9.8.9.9.8.9.>.e.9.e.r.e.9.r.e."
+	"9.9.1.1.7.<.9.<.<.<.9.8.<.<.<.7.q.9.q.q.9.' q.8.q.8.8.q.0.0.q.' rX0.0.` "
+	"8.7.1.8.,.8.,.8.1.8.8.8.8.7.9.9.q.w.9.9.w.6.,.,.` ! ' ! *.0.q.*.*.7.q.q.=.yXtXq.8.)   ) 1. / "
+	"2.2./ 1.Q 1.1.1.1.1.) 2.Q o.Q Q n n n j 1.8.8.9./ Q ( ^ j Q k Q h Q j ( ^ ^ Q Q ^ ^ Q ^ / Q j k k k "
+	"k k b n n b n n b b b k n n ) M M n M n m b m m m m ) m ) z l y s y x y z d.z z u u u u g.u p g.u u "
+	"u p p z u l u p u y l y c l l l c l c c l l l l l l b b b ) b b ) b s b k l b l i y v m z z v x b m "
+	") g g x l s t y l i d.g.g.d.g.d.g.v u g.f.g.v g.v u g.d.g.u u p c c d.d.d.d.d.d.d.d.d.2 d.i i i y u "
+	"l b g g b g b b g f g b g g ( ( k k f k g s s p p p y w w e o . kXcXxXxXnXmXmXmXcXjX.   . . o O = a "
+	"> > : > e : = = = = W #.G.LXIXIXIXIXIXIXIXIXIXIXLXLXLXIXLXLXLXLXLXLXFXLXFXFXFXDXFXDXDXDXF.G.AX $ : "
+	": = : a : > : : : : & P & C Y `.U N V U ..$XkX.$X_ ; r r k r h | j h  .| | :.;.:.:.;.:.{ h r k "
+	"%XcXvXcXMXmXcXcX:X:X*X*X:X*X;X*XV &  6 j.j.j.jXc.x.x.lXlXlXlXx.x.l.c.l.h  . .5.5.5.+.5.5.O.X.Q V "
+	"+XJXJXJX{.HXJXJXJXCXP.*XY.B C J.C C B C * * O X % Q 5.Z.i.D.D.D.D.D.D.S.F.D.F.S.G.F.S.F.S.S.S.",
+	"OXOX@XuX#X~.r v H.m.B.M.m...r f.= z.s.O uXuXuX7XuXeXK 4X~.~.~.W.W.W.W.W.W.!.W.W.W.!.oXK K "
+	"*.eX~.4XeXeXeX0.eX4X0.w.3.9.3.3.9.9.7.7.7.7.7.9.7.7.7.7.6.,.8.8.6.<.6.8.6.8.9.8.e.9.e.9.9.e.1.e.9.9."
+	"9.9.9.9.e.9.9.9.<.<.<.7.<.9.,.<.7.<.<.8.<.8.e.q.q.q.e.q.8. 6.' 8.8.8.0.0.0.q.0.` "
+	"8.,.8.8.,.8.,.8.8.6.,.8.,.8.8.9.9.9.9.9.9.9.0.` ~ ! ! ! ' ' 7.*.7.0.*.*.*.q.yX=.=.q.e./ 1. / ) ) "
+	"2.2.2.1.1.1.) 1.Q 2.Q n Q Q Q Q o.4.j  .n ,.8.8./ ( j j ( k Q k j j ( j ( ^ ^ ^ ^ ^ ^ ^ j c k c c k "
+	"p c k k j b Q j n b b b b m n n ) M ) M ) m ) ) b m m m l x t l t l t l y u z f.g.g.u v u u u u u u "
+	"u v u z p u z u l p z y c l l l l l z l x m l l l z l R b b ( b g b b b b b l y y i u x z m l z m m "
+	"c t x l x t t i u g.u g.i d.g.g.g.g.g.g.v g.g.g.f.f.d.g.d.u i y c p d.d.d.d.d.d.d.d.a.d.d.f.i t i i "
+	"y s s b g g g l g f b g s x g g g x s g s s y p y y p w w 0 + C jXxXxXxXmXmXnXnXnXxX*       o = : , "
+	"= = r > = 0 = r = : ,.X.FXLXIXIXIXIXIXIXLXIXLXIXLXLXLXLXLXLXLXLXLXLXFXFXFXFXFXDXZXDXDXZXF.GXVX^ = ; "
+	": ; > : : a a g 0 < @ 5 % & N N U Y ... X$XbX%X.R = = = r r r | | |  .h | ;.| #.{ | { ..| > h "
+	"1X:XcXMXcXbXcX:X:X:X:X:X*X:X*X&XP % j. j.j.j.c.x.x.x.lXlXlXzXx.x.x.j. j  .o.X.X.X.X.5.5.X. .j "
+	"XXkXHXJXbX$XJXJXJXJXHXL.&XY.Y.Y.C C C * * X X X & 2.5.5.C.G.Z.A.S.D.A.S.G.G.S.S.G.F.D.D.S.S.F.S.",
+	"OXOX#X7X~.r n IXm.B.B.v.+.r z.e z.z.z.O "
+	"8XuX7X4X~.~.*.~.~.~.~.W.W.!.W.W.W.OXW.OX!.!.!.oX4XoXoXoXoXeXeX0.4X' "
+	"0.eX4Xq.9.w.9.7.w.7.7.7.7.7.7.7.7.7.7.6.7.8.<.8.,.8.6.,.6.8.8.q.9.8.9.9.9.9.9.9.e.9.9.9.e.9.<.<.<.<."
+	"<.9.7.<.<.9.,.<.,.7.7.8.9.q.e.9.q.9.8.8.8.8.8.8.q.8.8.' ' 0.` ,.,.8.,.8.8.~ "
+	"6.6.1.,.8.8.8.8.8.8.8.9.q.r.9.8.` ` ! ! ! ' ' ! *.7.*.7.q.*.6.*.*.w.w.q.) 8.) / ) / ) / Q 1.2./ "
+	"1.1./ Q Q Q Q j ) o.Q n n j n n Q 8.8.8.Q ( ( b b k ( k Q k k j Q ^ ^ ( ^ ( k k c k j k k k k s k j "
+	"n b b b b b b b b n n n ) M ) n m m m m m ) b l l y y t x y y x l t u u g.u v u g.p v u g.u u u u y "
+	"v p u l u y c y l s s s l l l z l l l l l y u b ) b b ( b b b c p i t y i y z z z z z z b t s l z l "
+	"i u u f.g.i u g.v u g.g.f.v g.g.g.M g.d.g.d.d.p u t t t 2 d.d.d.d.d.d.d.d.d.d.i d.u i u u l s g s b "
+	"b g g s g f b g l b l g s x l l y p y y c y i < < + C jXxXnXxXmXnXnXcXcXcX* . .   . O = = , r = e 0 "
+	"0 = = = Q > G.FXLXIXIXIXIXIXLXLXLXLXLXLXLXLXLXLXFXLXFXLXFXFXFXFXFXDXDXDXDXZXZXDXGX ; & ; : a a a a "
+	"a a a a < < @ % * N U Y ... X X X X X X_ = r = r r r k j h h j h #.h | | | ..| h h  "
+	":XvXcXcXMXcXbXcX:X:X:X*X:X*X;XU.4 P Y j.6 j.j.x.c.x.lXlXlXzXlXx.x.x.j.) k ..o.5.5.o.5.5.O.o. .k "
+	"XXCXR kX+X%XkXJXJXJXHXY.*X&XB C C * * X X X X & Q 5.5.t.Z.G.Z.D.Z.A.A.A.Z.A.A.Z.Z.A.S.A.G.G.S.S.",
+	"+XOXOX!.~.r SXh.B.B.B.m.+.r z.s.z.z.a.O 4X' ~.K K ~.~.K ~.!.W.W.W.W.W.!.!.E.!.!.OXE.!.E.~.eX*.oXoXK "
+	"4XeXeXeXeXeX0.0.q.w.w.7.9.3.w.7.7.7.7.7.7.7.<.<.7.,.8.6.7.6.6.6.8.' "
+	"9.8.e.9.9.9.e.9.9.9.9.9.e.9.>.7.9.9.<.9.7.7.,.7.7.<.,.8.,.9.8.9.8.9.q.9.9.9.q.8.q.8.0.8.' 6.8.8.' "
+	"8.` 8.7.1.8.,.8.8.8./ 6.6./ 8.<.,.8.8.8.8.9.9.8.` ' / ' ' ! ! ! ! 6.0.7.0.*.7.6.*.0.K *.*. ) ^  / "
+	") / ) 2.Q 1.1./ 4.Q 4.Q 4.2.4.Q Q  .n 2.j n  .n 4.8.` b ( n ( ( b ) k k j ( j j ( ^ ^ k b b k k c k "
+	"p c k c k c j b n b b m b b j n m ) m M ) m m ) ) m ) ) ) t t t l t l y y u y y u y u u u f.v d.u u "
+	"g.p u u g.z u y u u u p u y y y l l l y s l l l l l l y y y u k b ( b b b c u i w y y y y y z z x z "
+	"z l l q x u y u u f.u d.g.u d.u g.i u v f.g.v g.g.u g.d.g.d.i t 5 x t 2 d.d.d.d.2 a.d.f.d.i d.i d.u "
+	"i i u s b b f s k b s f b f g g g g x s s s y y l t y w y w e e + . `.jXxXxXjXxXjXcXjXkXX . E &   O "
+	"= = = a = 0 0 0 = @ = 1.{ ZXLXIXIXIXIXLXIXLXLXLXLXLXLXLXLXFXLXLXFXFXFXFXFXDXFXDXDXDXDXZXF.DXKXV.< @ "
+	"; ; ; a ; a a a a 0 a a < @ d 4 V '.. X$X XvXvX X XvX X%Xa = = r e r r : h h h h h ;.h h h h r h k "
+	"@X:XcXvXvX1X%X+X%X$X$X:X:X:X*X&XL.&  j. j.j.j.j.lXx.lXlXlXlXlXx.c.v.l.k k o.X.o.X.X.X.O.X.X.j ^ "
+	"'.P * %XC %X4 kXJXJXCXV *XY.Y.J.C X . X X * : Q 4.5.Z.t.Z.Z.S.Z.A.Z.A.Z.A.Z.A.A.A.A.A.A.S.S.A.G.",
+	"!.~.~.~.r O.h.B.B.H.B.B.N.{ z.z.z.z.O # H H K H H K H ~.~.W.W.W.W.!.W.W.W.OXE.!.!.~.E.OX~.OXK "
+	"eX4X0.oXoXeX~.eXeXeX0.eXeX7.w.7.7.9.7.7.7.7.7.7.9.7.,.<.8.8.,.6.6.6.6.6.' "
+	"8.9.e.9.9.e.e.9.1.9.e.9.9.6.6.6.<.7.9.7.8.7.<.,.,.6.6.,.7.<.,.9.0.9.8.q.q.8.8.8.' 8.8.' ' 8.6.` ` ` "
+	"8.,.8.,.8.8.6.,.8.,.8.~ ~ 6.6.8.8.8.e.8.` / / ` ! K ! ! ! ! ' ! ! *.0.*.7.*.6.*.6.6.` ` / ) / ) ) / "
+	") / 1.2.Q 1.2.Q Q Q n ) Q 4.n Q 4.j j 4.Q j  .M 1./ j Q ( b ( ( ( b b ( b j k ( ( b j k k c k M c p "
+	"k c c k p c c b b b b b b b n ) b n m ) ) m m ) m ) m x l y l t l y x y y x u x x y u z v f.g.u u "
+	"g.u u u p p u u u u u y l y p l l l l l q l x l z l u y u y y c b b b R l i i p i i w y i y y z z u "
+	"l u q y u y p i u d.v d.p g.u u d.u u v g.g.g.f.v d.d.g.d.t t g t t t d.d.d.d.d.d.d.d.i d.i f.i i "
+	"f.i i u x s g ( l g s g ( f g g g g s g t s x 2 x 2 2 y w i w q 1 + o CX.XjXcXcXjXcXjXHXKXP   T  . "
+	". = = = = 0 0 0 = = @ a ;.X.DXLXLXIXLXLXLXLXLXLXLXLXLXLXFXLXFXFXFXFXFXFXDXDXFXZXZXDXDXF.F.F.DXNX; @ "
+	"@ ; f a ; a a a g a a g a < < @ T U .. X X:XvXvXvXvX1X1X XE = = e , e r 0 k h h h h h k h k > k k "
+	"> %X1X%X_ % @ & # @ & & 3 I  X;X&X_ ;  j.6 j.j.j.x.x.x.lXlXlXlXlXx.j.j. f p ..o.X.o.X. .O.O.| h _ "
+	"C X . N * & * U JXJXbXL.&X&XY.C C X X o X ( 4.4.5.Z.Z.G.t.G.A.G.A.A.Z.Z.A.Z.A.A.A.A.A.Z.A.G.F.S.",
+	"!.7XT.Q., O.m.m.B.M.B.IXH.O.z.z.s.s.O O H L H Z K H K "
+	"~.Q.!.W.W.W.W.!.W.W.E.!.OX!.!.!.!.!.!.OX4XoX~.oXoXeXeXeXeXeXeX0.4X4Xq.7.w.9.w.9.7.7.7.7.<.7.7.7.6.7."
+	"6.6.` 6.6.6.0.' q.q.9.9.9.9.9.9.e.9.6.0.6.0.6.6.` 6.7.<.7.,.~ ~ "
+	"6.1.6.7.9.9.q.q.9.0.e.8.8.q.8.9.8.8.q.8.8.' 8.` ,.6.8.,.8.8.,.6.8.~ 8.,.8.8.8.8.8.6.8.8.` ` ` ' ` ~ "
+	"' ! ' ! ' ! _ ! ` 6.6.0.*.*.6.*.` ~ ! ! ^ ^ / ^ ^ / ) ) 1.1.Q Q Q 4. .2.Q Q Q Q Q Q Q Q n n o.n  .) "
+	"1.b ( b ( j b b ( k b ( b j b k b b k k k p k j k j c k c j c c b ) m n ) m b m b m ) n m m m ) m ) "
+	") l y t s y l t y l u y u y u u i u u u u g.u u u d.u u u u u u p u p y y y y y l y l s l s g l l l "
+	"y y y y y u c b b c y p y w w w y y w y i y z x u u y y p i i y i u d.i g.d.g.g.g.u g.u u z g.g.g.u "
+	"f.u y t t x t t x d.d.d.d.d.d.d.d.d.i d.d.d.u u i u u z l l g g b b g g g f s g g x x x x t x t 4 2 "
+	"w i q q 1 < o X VXVX X.X.X.XkXVXUXIXVX. . X     O # = 0 0 0 = 0 @ @ k | "
+	"5.FXLXLXLXLXLXLXLXFXLXFXLXFXFXFXFXFXFXFXDXFXDXFXDXDXDXDXZXF.G.F.ZXGXR & & @ @ = ; ; a ; ; 0 a 0 0 5 "
+	"< < @ P ..$XvX$XvXvXvXvXJXPXUXkXT = = r e r r , = k h > | k h k k k > > ; f : ; ; ( e.4.5.e.4.b d "
+	"& % _ .S ;   j.j.j.c.x.x.x.lXlXlXlXx.x.x.j. r k ..o.o.X.o.....k h ' |.Y.C * V C . .  "
+	"JXJX#XU.*X*XY.B C X X o % Q >.5.C.t.Z.G.Z.Z.A.A.A.n.A.A.A.A.n.Z.Z.n.A.Z.S.S.S.A.",
+	"T.7X~.!.r O.{ ....r # v.c.r z.z.z.z.t O L T.R.Z ~.H "
+	"~.Q.W.W.W.W.W.!.W.!.!.W.!.!.!.!.~.!.~.OXOX~.~.oXeX4X~.eXeX4X4XoXoX4XeXeX0.q.3.7.7.3.w.7.7.7.7.8.6.7."
+	"6.6.6.6.6.6.6.` ' 0.9.9.9.9.e.e.9./ K 6.0.6.0.0.0.' K ' 7.~ D D 8.6.,.8.8.6.9.q.q.8.9.8.8.0.8.0.' "
+	"8.8.' 8.` ` ` ` 6.8.1.8.8.1.6.,./ 8.~ ` 8.6.` 8.8.8./ 8.8.` 6.` / ! ! ' ' ! ! ' ' ! _ *.*.6.6.6.` ! "
+	"( ^ ! ^ ( ^ ^ ^ ) / / / Q Q Q 4.Q Q Q 2.Q Q Q n j Q n j j n j j n n j b k ( k b R f b b ( b ( b ( k "
+	"( b k b c c k j p c k k c j c j c m b b n ) n n ) m m ) m m ) m ) m l l t l y x l y u y y u x u y u "
+	"y u u z z g.g.d.g.p g.u u u u u u u z y y y p y y s l y l s l q g l u y y u y y u c y y y y w y w w "
+	"i i w t y y u y z u x u y i y i u i d.d.u d.p u u u u z v g.u v u d.y w t t t q t t t "
+	"d.d.d.s.d.d.d.d.d.d.i i i i i i u x l l m g g b s ( k g x g x x x t t t x t 2 t t 2 w q q < #   T "
+	"UXKXVXCXbXHXKXUXPXPXPXE     .   o @ @ < = 0 < 0 @ @ Q { "
+	"t.FXLXLXLXLXLXLXLXFXLXFXFXFXFXFXFXFXFXDXFXDXDXZXDXDXZXZXF.F.F.S.F.BX@ # @ @ @ ; ; ; a ; 0 a 0 < 5 q "
+	"1 1 @ T .bXPXUXbXvXvXvXbXPXPXPXJXR = = ; = r s = = a k h > h > k > r k = : b / "
+	"C.AXGXDXZXAXG.G.u.5.) f d ; @ R j.j.6 j.j.x.c.lXx.lXlXlXlXx.x.j.j.Q s k p o.o. ... .j h k "
+	"|.*X&XY.Y.Y.C . o kXJXJX'.&X*XU.Y.C C X X . & "
+	";.5.t.t.G.G.Z.A.A.Z.A.A.A.C.A.A.n.A.A.Z.A.A.S.S.S.A.S.",
+	"~.~.~.~.r s.SXz.z.z.O m.d.r O O O O O O H H ~.T.~.K "
+	"W.W.W.W.W.W.W.W.!.W.!.!.E.~.!.~.OXE.!.!.W.E.OX~.~.eXeXoXoXoXoXoXeXeXeX4XtX0.q.7.w.9.<.9.7.7.8.7.7.6."
+	"6.0.` 0.6.6.6.` oX' 8.e.e.9.9.9.~ K K ` 0.0.0.0.*.' E.E.F ~ ~ ~ / 8.8.8.6.6. '  ' 0.' ' "
+	"e.8.8.9.8.8.8.` 8.` ` ~ ` ~ 8.,.,.6.,.6.,.~ 6.~ ~ ~ ` ~ ` ` ~ / ` `  ` ' ! ! ! ! ' ! ! ! ! ! ` "
+	"0.*.6.` ! ! ~ ! ! ^ ! ! ! E ^ ^ ) ) / 1.Q 2.Q Q Q Q j n Q j j n  .n n j n n j n n b ( b k k k ( b g "
+	"( b k b b b s b k b k c k c k c c c c c c c c c b ) m ) b b ) m ) m ) ) ) ) z z y l t t l y t y x x "
+	"u y u x u u u y u u u i u g.u g.d.g.u v u u v u y p y y y y t s t x s y y x t w y y u y y y y y y y "
+	"y y w w y w e w y w y y y u y u y u u y i y y u u i g.d.d.u d.g.u g.u u g.z i x t t t t t 2 t t t "
+	"d.d.d.d.d.d.2 d.i d.f.i u f.u u i u x s x l l g g g x t t 8 t t 2 8 t t 2 q x 2 t 5 i q < # o o "
+	"VXIXUXKXVXKXKXUXPXPXPXPXKXX       . o # @ @ 0 < 1 # 1 Q { "
+	"Z.FXLXLXLXLXFXFXFXFXFXFXFXFXFXDXDXDXDXDXDXDXDXDXZXZXZXD.F.D.G.F.F.) # & @ = @ @ ; ; f d ; 0 5 0 < < "
+	"< < # R kXPXPXPXUXbXbXvXJXPXPXPXPX%X= = r = e r r 0 ; = h k h h h f h f > "
+	"4.r.AXDXGXKXDXAXAXG.G.Z.5.r.4.1.f = d j.j.j.j.j.x.x.lXlXlXlXlXlXx.x.v. k k j  . . . .) Q r f ' "
+	";X*XY.&X*X&XY.* * JXJX%XV ;X&XY.Y.B * * X o % "
+	"4.5.t.Z.Z.Z.Z.A.A.C.A.A.A.A.A.A.A.A.A.S.S.A.A.A.S.A.A.",
+	"T.).T.2X, ..z.z.z.z.O N.N.m.O.O.} ..r O L H H ~.H "
+	"!.!.Q.W.W.W.W.W.!.W.!.!.!.~.~.!.!.!.!.!.E.!.!.OX~.OXoX~.eX~.oX*.oX4XeX0.eXeX4XtX0.7.7.9.7.7.7.7.8.8."
+	"7.' 0.` 0.6.6.6.6.oXK ` 9.e.9.0.' K D K ! K 0.oX' ~.XXK E._ F ~ ` 8.8.8.8.8.'  ' ' ' ' ` ' 8.8.` "
+	"8.8.6.` ` 8.` ` ` ~ ` ~ 6.,.6.~ ,./ 6.6.~ ~ ~ ~ ` K ~ ~ ~ ` ` ` ! ! ! ` ! ' K ! ! ! ! ! E 6.6.! ( ! "
+	"! ( ! ! ^ ! ! ! ( A ! ( ^ Q Q Q 2.n Q Q j Q j Q j b j Q Q n j n j n j j o.k k k ( b g g b k b b k b "
+	"s b s b b k s c k c c c c c c c c c b b ) m b m ) b m ) ) m ) m z l l s l t t l l y x y u x u y u u "
+	"u u u u u u f.p u g.g.u g.u u u u u u y y w y w y w y y l s t l t s w q w y y y y y y y y w w y w w "
+	"w i y y w p w i i y p u i y w i i w i i t q i i u i u u u v u v i t t 2 q t t t t t i 2 "
+	"d.d.d.d.d.d.d.2 i f.d.i i u i u u y x l t y t i t t t t t 2 t t g 2 2 t x t t 5 2 < 2 0 @ o   ^ "
+	"PXPXPXUXKXUXPXPXPXPXPXPXPXP .       . O # < < < < 1 < j "
+	"..t.DXFXFXLXFXFXFXFXFXFXFXFXDXDXDXDXDXDXDXZXZXZXZXF.F.ZXF.F.F.S.G.G.f # @ ; @ & ; @ ; a a < < g 1 a "
+	"< < 1 # R kXPXPXPXPXJXvXbXUXKXUXPXPXCXN = = = r r e ; ; = g > h k > > f : a "
+	"5.G.AXAXGXAXGXAXG.G.G.C.5.5.>...( @ 0 R  j.j.j.x.x.lXlXlXzXlXlXx.j.j.) k c j M j k b k.kX g _ "
+	"*X*XY.*X*X&XP.C V |.U.Y.Y.Y.Y.Y.C C $ X . X S "
+	"5.5.Z.Z.Z.Z.A.Z.A.n.A.A.n.A.A.M.S.S.S.M.S.Z.M.Z.N.S.Z.",
+	"~.~.Q.!.= r z.z.s.z.# DXUXh.O.+.+.X., = "
+	"~.R.R.R.Q.!.Q.(.W.W.W.!.!.Q.!.!.!.!.E.!.E.W.+X!.!.!.OX!.!.~.~.oX~.~.eX~.oXeXeXeX4XtXyXeXeXeX~.' "
+	"w.7.7.7.7.7.7.` 0.*.' 6.0.6.` 6.' ' ' 0.q.' 0.0.' K A K K 0.' ' H K XXJ OXH F 6.8.` ' 8.8.' ' '  ' "
+	"' ' ' / ` ' ` ' ' 8.` ` ` ` ` ` ~ ~ ! 6.,.6.6.~ ~ ~ ` 6.~ ~ ! ` ! ` K ! ~ ! K ! A ! ! ! ! ' ' ' F ! "
+	"_ ! ! ^ ! R ( ! ~ ! ( ^ ! ( ( ! ! ( ^ ^ Q 2.j 2.4.j Q j j Q j Q j n n  .n j j n M j j M b k k k k b "
+	"s b s b b s l b l s l c b c k c k c j c j c l m l c b ) ) m m ) ) m ) m l l l l t t l y l t y y u u "
+	"y y u u y x u u u u v u u u u d.d.v d.v u u u u y y y y y t y y y w q y q t q y w w e q y y y w w t "
+	"w w y w w w w w w y y w y w w p y i i i i i w i t e q q t i i i i u i i u u w t t q 2 t t t t t t "
+	"d.d.d.d.d.d.d.d.d.d.d.i d.d.d.i u u u u 2 t 2 t 2 t 2 2 t 2 t 2 t 2 t t 2 g 2 2 q 5 2 1 < +   o "
+	"KXPXPXPXPXPXPXPXPXPXPXPXPXPXe..     . . . # # < < @ # @ Q "
+	"X.Z.DXFXFXFXFXFXFXDXDXFXDXDXDXDXDXDXDXDXZXZXZXD.F.ZXF.F.F.F.G.G.Z.C.f # @ @ ; @ ; @ @ ; 0 < 5 < < 5 "
+	"< < < # R kXPXPXJXCXPXbXbXHX$  PXPXVX( # = = = e r = ; a = k h > k e > : k "
+	"Z.G.AXAXGXGXAXAXG.G.G.t.5.3.:.#.: ;  E T _ l.j.j.j.lXlXlXlXlXj.k. f f r r k k k s s m zXbXR _ "
+	";X*X&XY.Y.U.B C P.Y.U.*X*X*X&XY.B C * X . * Q "
+	"5.5.5.Z.Z.A.A.n.A.A.A.A.A.A.S.S.S.S.S.S.M.S.S.M.A.N.S.",
+	"~.~.~.~.r a.z.z.2 z.+ zXz.s.c.h.+.X.= R.H H "
+	"R.~.W.W.W.W.W.!.!.W.Q.!.Q.!.~.E.E.!.!.!.W.!.!.OXE.E.~.OXOX~.~.~.eXeX*.eXuXeXeXeXeXeXtX~.OXOX~.8.7.7."
+	"7.7.0.0.' 0.0.6.` 6.6.6.~.0.' oX0.' ' *.K F K F K ' K OXE.K K H XXF XX' ` ' 8.9. oX'  ' ' ' ` ' ' "
+	"~ ` K F J K ` ` ` ` ~ ` K K ~ ! ` ~ ~ 6.~ 6.~ ~ ` ~ ! ! ` ` ' ` ` ! ! ! F ! ! ! ' ! ! _ ! _ ! ! ( ! "
+	"E ( ( ! ( ! ( ! E ( ( ( ( A ( ( ) 2.2.Q Q Q j Q j j j Q Q n n n  .M j n  .n j M j b k b k s b s b k "
+	"l b c c b l b s l c c c c c b c c c c l l s l ) b ) ) b b ) b g l s l t t l t l y z x u y x u x x u "
+	"u u u u u u u u u g.u u u u u d.g.u u u w y w y w y t w q q w s s t t w w e w w w w w w w w w w w y "
+	"w w w y w w w y y w w i y i w i i t q < q q q 5 q i u u i u i i t t t t q i t t t t t t x "
+	"d.d.d.d.d.d.d.d.d.d.i d.i i f.i i i y 2 t q i i 2 t t 2 t 2 i t t t 8 t 2 2 t 2 2 2 1 1 + .   N "
+	"UXPXPXPXPXPXPXPXPXPXPXPXPXIXVX.           o # 1 1 1 # # Q { "
+	"Z.ZXFXFXFXFXFXFXZXDXDXDXDXDXZXZXF.F.ZXZXZXF.ZXZXZXZXF.F.F.S.G.Z.Z.E # & ; @ @ @ ; @ < 5 < 5 < 2 5 1 "
+	"< 1 # R kXPXPXR * KXvX$XbXCXJXPXPXHXkX; = = = e = 0 0 0 0 0 k k , > f = n "
+	"C.G.AXGXGXAXAXF.AXG.G.C.5.3.:.W ;  jX$X T 5 4 U   l.R R R g f  g s k k k r r   s l.kXkX "
+	"+XU.Y.J.Y.Y.L.U.*X*X*X*X*XY.I.Y.C C X X X 5 Q "
+	"o.n.Z.n.A.A.A.A.A.A.A.A.S.S.S.S.S.S.S.S.S.S.N.Z.S.Z.A.",
+	"T.).~.T.O.1 z.w o s.O s.s.s.s.u +...O "
+	"~.R.~.~.T.(.W.W.W.W.W.Q.W.!.!.E.Q.E.E.E.E.!.!.!.!.!.E.!.!.E.!.~.~.oX~.~.eXOXuXrX4XtX4XtXyX4X~.E.OX~."
+	"OX' 7.7.6.' *.' 0.' *.' 6.6.6.' oXoXeXeXK ' 0.' K F K F K E.H K E.E._ J E.K J ' 8.8.' ` ' ' oX' ' ' "
+	"' ! ' ' ! F F F F K A ` ` ' ! ! ~ ! K ! ~ 6.~ 6.~ ~ ` ~ K K ~ ! K ! ` ! K ~ ! ! ' F ' ! ! ' ! R F ! "
+	"E E E ( ! ! ! ! ( ! ( A ( A ! ! ( ! ^ Q Q 4.Q 2.Q Q j Q n 2.n j Q Q j j n j j M n j j n k s s g b s "
+	"b b s c s s l b s l s b c v c c c c c c c l b l b s ) ) m ) ) b x t s g l t l l q l t t s y y u y u "
+	"u u z u u u u u u u u u u g.u u u u g.u d.u p w w w w y w y q e 0 0 q q q g w w e w e w w w w w w e "
+	"i w y w w y w w y y w y y w w i i i w e q q q q q 0 q q y i i i i t t t t t t 2 i t t t t t 2 i "
+	"d.d.d.d.d.d.d.d.d.i d.d.d.2 i d.i i i t 2 2 t 2 q 2 q t 2 t t 2 t 2 t 2 t 2 < 5 2 < 1 #       R "
+	"KXUXPXPXIXUXPXPXPXPXUXKXKXKXKX&       . .   o # # < # # b "
+	"..Z.ZXZXDXFXDXFXDXZXZXF.ZXF.F.ZXF.ZXZXF.ZXF.ZXZXF.ZXF.ZXZXF.F.G.Z.Z.) # @ @ @ @ @ @ @ 5 < < < < 0 < "
+	"< 1 1 < T %XUXPXKXVXJXHXVXKXUXUXPXPXUXKX @ = = r = a 0 0 s 0 0 > k = : : "
+	"5.G.G.AXGXGXDXAXAXG.C.C.5.5.>.:.~ ; jXjXvXvXjX%XT 5 # @ @ d P x jXjXcX%Xg r s k p c kXbXl.T g kXk.( "
+	"XXV K.U.*X*X&X*X*X*XY.Y.B Y.V C * o . & Q O.5.n.n.H.A.A.A.A.A.A.n.A.A.S.S.S.S.S.S.S.M.Z.S.N.N.Z.N.",
+	"7X~.~.T...0 2 # ..O O M s.s.p O.r O K "
+	"~.W.W.W.W.W.W.W.W.W.(.W.W.!.Q.Q.E.E.E.E.!.W.OX!.!.!.!.!.E.E.E.E.~.OXoXOXOXrXOXuX4XtXeX0.eXoX~."
+	"OXOXOXK OX' 6.' 4X' 0.0.' ' *.6.6.6.` oXOX' oX' K K F K F F H ' H K XXH _ E.H _ E.E.E.' ' ' '  '  "
+	"' ' ' ! ` ` K K F F F F F A ~ ~ ! D D ! K A A ! ` ~ ~ ~ ~ ` ! ~ ~ ! ` ! ~ ` ! ! ! ` ! ! ! ! F ! _ ! "
+	"R ! _ E ! ! ! ( E ( ! ( ! ! ! A ( ( A ( ( ( Q ^ Q Q j 2.Q n Q 2.n Q Q n Q j n n j n n j n j j n k s "
+	"b s s b s l l c b l s b l c b l b v c c c c c c l c l g l l m ) m x 5 g x s s t l y t l x y t t t l "
+	"u z x u u u u u u u u u u u d.u u g.u u u d.i y i w i q q q q w i e e q q 0 q q w e e w w w e w w w "
+	"w w w w w w w p w p y w w y i w y y w q q q q 2 q t q q q < q t i i i t t t t t t t t t t 2 t t t x "
+	"u d.d.d.d.d.d.d.a.d.d.d.d.f.i d.i 2 2 t 2 t 2 q 2 i 2 q 2 q t t t 2 q 2 t 2 t 5 2 2 1 1 o     .  "
+	"UXPXPXPXPXIXPXPXPXPXPXUXKXKXKXVX. * X .       + # # # # k "
+	"..n.ZXZXDXZXZXF.F.F.ZXZXF.F.ZXF.ZXF.ZXZXZXZXZXZXZXZXZXZXZXF.F.F.S.N.V.& & @ @ @ a @ 5 5 5 < q 5 5 1 "
+	"1 @ @ # T CXJXPXPXUXUXKXKXKXKXKXKXKXKXUXVX( @ = = e e a 0 0 s 0 a f > ; a "
+	"C.G.AXAXGXGXAXAXG.G.G.Z.5.3.>.#.f 5 jXjXjXcXcXnXjXmXlXcXMXvXMXnXnXnXnX s g k k a a ( kXcXjX kXkX< "
+	"g E J B P.&X&X&X*XY.C * C B C * X o O f O.n.n.n.N.A.A.n.A.A.A.n.A.A.A.S.S.S.S.S.M.S.S.N.S.Z.M.Z.S.",
+	"~.T.(.~.K O = e O , +.+.O.O.r = , "
+	"R.!.T.W.W.W.W.W.W.W.W.W.Q.W.W.Q.E.E.E.E.!.E.(.(.W.(.!.OXW.!.E.!.E.W.XXOXuXOXOXrXuXtXeXeXtXtX~.!.~.~."
+	"E.OX!.' OXoX' ' oXeXK 0.6.6.' 6.6.6.!.XX!.OXE.F F F ' F K XXK XXE.K E.E.K K XXE.K J H K ' H K _ "
+	"OXoX' ` ' ' ` A F F F F F F K K A ' A ! K D ! A ! D K ` ~ ` D ~ K ! D ! K K ! A ` F A ! F ! ! ! _ A "
+	"! ! E E ! ! E ( ( ! ! ( E E ! ! ( ( A ( A ^ ( ^ ( Q Q Q Q 2.n Q n 2.j j Q j j j j M j n j j M n j n "
+	"c s b b c c c b s b s l b b s l c l c z b c c c v l l g x d 4 g b d 4 g 5 s s l t q l s t q l s y t "
+	"t y t y z u u u u z u f.u u f.u u u i i p y y w i w q e q e i w w w e e 0 e e q 0 e e e e e w w w e "
+	"w w w w w w w w w w w w y w w w w w w i 1 q q q q q < < q q q q < w i t t t t q i q i t t t t t t t "
+	"z d.d.s.2 d.d.d.d.2 d.d.2 d.i i i i i i 2 i 2 2 2 t 2 t 2 t 2 2 2 2 t 2 2 2 5 2 2 1 1 1 # . o o & "
+	"KXPXPXPXPXPXPXPXPXPXPXPXPXPXIXKXUX   X X     . o # @ + # s "
+	"X.+.F.F.F.D.F.F.ZXF.ZXF.ZXZXF.DXZXZXZXZXZXZXZXZXZXZXZXZXZXF.F.F.G.A.Z.E # < & @ < < 1 < < 1 1 1 1 @ "
+	"1 1 1 + R VXUXIXUXKXVXKXUXUXUXIXIXKXVX VXNX= = = = = 0 0 0 0 0 0 ; = @ j "
+	"r.G.AXGXGXGXDXAXG.G.Z.r.r.>.>.#.@ R jXcXcXxXxXnXnXnXnXmXMXMXmXnXnXnXcXP s s r b ( g 0 1  zXMXmX @ "
+	"@ ; ( E V B L.K.C C C Y.J.J.N * X & k  .o.5.n.n.Z.M.A.A.H.A.A.A.A.A.n.S.S.S.S.S.S.S.S.M.S.S.S.S.S.",
+	").T.7X~.!.T.O O L = O = = = = L "
+	"T.~.Q.W.W.W.W.W.W.W./.W./"
+	".W.W.W.!.Q.E.E.E.E.!.!.W.!.!.!.!.!.OXW.W.+XXX+X+XOXOXuXrXtXuXtXtXtX~.).!.OXOX!.OX' ' OX' oXoXK ' ' "
+	"oX' ' OXOXXXE.XXOXE.OXXXJ F J K E.' K H ' E.K E.J _ K J J E.XXH K F ' ' J ' _ ' ' ' ! K F F F F K A "
+	"F A A A A K F ! A K ! D ! A ~ ` ! D ` ! K ' K ! ~ ! A ! ! ! ! ! ! ! E E E R F R ! R F E ! E ( A ! A "
+	"( ( ( A ( A E ( ( ( ( ^ ( 2.2.j Q Q 2.Q n Q Q n 4.j j j j j c j M k M  .n n b s b b b b l l l b s s "
+	"l s c b v v g x g 4 4 4 4 4 g 8 4 4 4 5 5 5 g a x s y s l t s t l t l s t t q t t y u u u f.u f.u u "
+	"u u u i u i y i i y y y e q e i q q q i e 0 0 e q q e 0 e e e e e e e w w w w w w w w w w p w w w w "
+	"p w w w w q q q 1 q q q < q q q < q q 0 q i t t t t t t t 2 q 2 t t t t i f.d.d.s.d.d.d.d.d.d.2 "
+	"a.d.2 d.f.a.2 f.2 2 i t t 2 t t t 2 t 2 2 2 2 2 2 t t < 2 1 1 1 1 +   * . "
+	"CXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXUXKXX . X o   .   + 1 1 9 2 "
+	"O.O.D.S.G.F.F.ZXF.ZXZXF.ZXZXDXDXZXZXDXZXZXZXZXZXZXZXZXZXZXZXZXF.F.A.A.V.& # @ < 5 5 < 5 1 5 1 5 5 < "
+	"< @ # +  KXKXKXVXVXVXKXKXKXKXKXKXHXBXT kXKX) @ @ 0 0 0 0 a 0 0 a @ @ @ "
+	"1.Z.AXAXDXGXAXAXAXG.G.C.5.5.>.{ > # Y cXjXcXjXxXnXnXnXnXmXMXMXmXnXnXnXjXd = s s kXMXkXq a g "
+	"kXmXmXkX_ +X+X_ f S S C B J.J.J.J.C G N $ X ( M "
+	"O.o.n.n.n.A.n.A.A.A.A.n.A.H.A.A.N.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+	"~.!.~.T.!.~.~.R.R.H R.H L R.H "
+	"R.!.Q.(.(.Q.(.W.W.W.W.!.W.(.W.(.W.W.(.(.E.~.E.(.W.!.+X!.+X!.+XW.XX+XW.+X+X+X+XOXeXuXeXtX4X4X!.!.~.)."
+	"~.~.OX!.OXE.~.!.OXOX!.!.!.!.!.W.OXE.E.XXE.OXE.XXOXH E.J H J J H ' H K XXE.K E.E.E._ K E._ XXH E.J ' "
+	"H ' J F ! F F F F F F K F A K F K A ! ! D ! A D A A A A D ! ' D ! ! ! D ! K A ! ! K ! A ` ! E F ! F "
+	"! E E F E ! E A ( E ( ( ( ( A ! ( A ( ! R ( ^ ( R ( ( Q 2.2.Q j Q 2.n j 2.j j j n c k n k j j j M j "
+	"n k c s s s s s b c s c c s b s s 4 5 3 5 3 5 3 g 4 g 5 4 4 g g 5 g g 4 x g t l t q l l t t s t t w "
+	"s q q q t q y u u u u u u u u u u y p y u y y i w i q q q q q q q q e q 0 e < 0 w e e e e e e e e e "
+	"e e w w w w w w w w w w w e w w w q i q t i q q q t q q < q q < q < i t i i t t t t t i t t t 2 i x "
+	"x d.d.2 d.d.d.d.d.d.d.d.f.d.2 d.2 d.8 i 2 2 8 2 2 2 2 2 t 2 2 q 2 5 t 2 5 2 2 2 5 1 1 1 o . X % "
+	"IXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXE & & O .     + + 1 + 1 "
+	"4.+.N.t.S.G.F.F.ZXF.DXZXDXZXZXZXZXDXZXZXZXZXZXZXDXZXZXZXZXZXZXZXF.F.F.A. # # < 1 < < 1 g 1 < < < 1 "
+	"1 1 @ # k.KXCXVXCXVXVXVXCXVXCXVXVXVXk.E e.KXVXd @ < 0 0 a < 0 < a @ 5 @ "
+	"5.C.G.AXGXGXDXAXG.G.G.t.5.5.>.;.f & jXjXcXjXnXnXnXnXnXmXmXMXMXnXnXnXnX a a e w y "
+	"kXcXzXkXcXmXjXjXMX|.;X}.V E = : A C B C C C V V C * * h p "
+	"o.O.n.n.A.n.A.n.n.A.A.A.A.n.n.A.N.S.S.S.S.S.S.M.S.S.S.S.S.S.",
+	"T.~.~.T.~.!.!.!.~.H E.H G H H H "
+	"!.!.(.W.W.W.W.W.W.W.W.(.W.W.W.W.W.(.W.!.W.W.+X!.W.!.W.W.XX!.W.+X+X+XW.W.+X+X+XOXrX4XtXtXOX!.!.OX~."
+	"OX!.!.OXW.#XW.+X!.!.!.OXW.W.E.W.W.!.~.XXXXE.~.E.~.E.E.E.K E.K XXE.K H K K XX_ E.OX_ H H XXK E.E._ K "
+	"_ ' F F K F F F F F K F F A K A K D ! D A S A A A ! D A A F K ! D K ! D D ! ! ! A ! A ! ! F F F E E "
+	"E ! _ A E ! ! E ! ! E E ( A ( ! A ( ( ( ( R ( ( R ( ( 2.j 2.Q Q Q Q Q Q j j j k b j b j b j j j j n "
+	"n n j c s s s s s s c c 4 5 4 5 5 5 5 P 3 5 3 5 4 4 x 5 5 4 x 4 x g d 5 g s t l q l t t l t l t q q "
+	"t g t q s q t t q w i u u u u u i y u y y y y w w q w i e q q q q e q e q 0 e e e e e e e e e e e e "
+	"e e w w e w w w w w e w w w e e < q i 2 q q q 2 e 1 q q 2 q q < q < i i q 2 q q i t q i t t t 2 u z "
+	"x d.d.d.d.d.d.a.d.d.d.2 d.d.2 f.d.2 d.d.2 8 8 8 8 2 8 8 2 2 < 2 < 2 t 2 < 2 2 1 < 1 1 # . * . "
+	"CXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXNX. . X . .   . + 9 1 1 "
+	"X.O.+.N.G.F.F.ZXZXZXZXZXDXDXZXDXDXZXDXDXDXDXDXDXZXDXDXDXDXDXDXZXZXF.F.S.C.T # 9 1 1 < 1 < 1 @ 1 1 < "
+	"1 # # 4 VXCX_ NXVXVXCXVXCXVXVXVXVXCX E CXKXKX @ @ 0 @ < 0 0 < < @ & g "
+	"5.G.AXZXGXDXAXAXG.G.t.C.5.3.3.{ & 4 jXvXcXcXxXxXnXnXnXmXmXMXmXnXnXnXnX a a e g e k  kXbXlXj.g  "
+	"kX{.&XL.C R = @ S L.U.Y.I.&XY.&XY.C * f k "
+	"o.n.+.n.n.Z.n.A.H.A.n.A.A.A.n.A.A.M.S.S.S.S.S.S.S.S.S.S.S.M.",
+	"~.(.~.!.(.~.T.!.R.R.P 5 N H H "
+	"R.T.!.T.!.(.W./.W.(.W.W.W./.W.(.W./"
+	".Q.(.W.W.(.W.W.+XW.#XW.!.XX+XW.W.XX+X+XXX+X+X+XOXtXuXOX#X(.(.(.(.).(.(.!.OXW.OXW.OXW.!.OXE.OX!.OXE."
+	"XXE.E.~.E.OXXXE.E.E.E.E.J E.K E.OXXXXXH F H K H E._ K XX_ E.E.H E.K J F ' F F F K F F F F D K A F A "
+	"F F A A A D A A A A A L A A A ` ! ! ' A F A A A D ! A A ! E ! ! ! F A E ! ! _ E ! A ( E ( A ( ! A ( "
+	"( A R ( ( E ( ( ( ( Q 2.Q Q 2.Q Q Q Q Q ( Q ( k j k j b b k b n j n j f T f f f f f b b c 5 4 5 4 5 "
+	"4 3 5 5 5 5 5 4 4 g g g 5 a d t 5 t g g g s t l t s s t s t l q q s q q q q q y t < < < i u u u u u "
+	"u u u i i y w w w q w q q q i e e 0 0 q e q 0 e e r e e r e e e e p e e e w w e e e e w e e e e e e "
+	"q q q t q q w 1 q q q q q 0 < q q q i 2 t i i 2 t 2 2 t t t x z z z i f.2 a.d.d.2 d.d.d.d.i a.i d.8 "
+	"a.i 8 a.2 8 2 2 8 8 8 3 2 2 2 2 2 2 2 < < 2 1 2 1 1 + o X O "
+	"UXPXPXPXPXPXPXIXPXPXPXPXPXPXPXPXPXPXPXPXKX    . X     . 9 + + + b "
+	"+.+.Z.Z.F.ZXZXZXZXZXDXDXDXDXDXDXDXDXDXDXDXDXZXDXDXDXDXDXDXDXDXDXDXZXF.Z.5.R @ # 1 1 @ 5 5 @ 1 1 1 # "
+	"1 #  KXCXE  CXVXVXCXVXVXVXCXCXVXE  KXKXKXNX5 # @ < < 0 < < = @ @ Q "
+	"Z.G.AXFXGXDXAXAXG.G.G.Z.r.>.:.h #  jXcXjXcXnXnXnXnXnXmXMXMXmXnXnXnXjXx 0 g s s f e s g b g ; @ < "
+	"XXU.Y.G C T T E _ I.*X*X*X*X&X*X}.V * f k "
+	"O.o.5.5.n.n.n.N.n.n.A.A.n.A.H.A.A.Z.S.S.S.S.S.S.S.S.S.M.S.S.",
+	").~.7X~.T.~.!.Q.~.E k.  P "
+	"R.R.Q.!.!.(.W.W.W.W.W./.W./.(.W./"
+	".+X(.W.(.W.#XW.W.(.!.W.!.!.W.W.W.XXW.+XW.+X+X+X+X+X+XuX#X+X#X!.!.!.(.(.(.OX!.W.XX!.OXW.W.OXW.W.W.W."
+	"XXOXOXE.OXE.E.XXOXE.E.OXE.E.K E.XXH H ' J OX' H H K K E.E.J E.' E.H E._ ' J F F F F F F F A F F K A "
+	"K A ! F K A A A A D A A A F F A A F D K F A S A D A A A A F F F E A E A ! A E E E ! E ! E ! ! ( A ( "
+	"( ! A ( ( E ( E R ( E ( ( Q 2.Q Q Q Q ( ( ( ( f ( ( ( b j k j b j j j k d S d f d f d d f g f 4 5 5 "
+	"4 4 5 4 5 3 3 5 5 d 5 g g x g 5 g 4 g g g 5 g q x t l x q g g s s q q q 2 g q q s q w 0 < e < e w u "
+	"u u u u u u y y q e w e w q i q q q 0 e q e e < q e e e e e e e e e e e e p e w e e e e p e e e e e "
+	"e e q 2 t q 2 q q t q q q q < < q q q < t t t q i t t t i q t 2 x z z z z z d.x f.f.x 8 8 i d.a.2 "
+	"f.2 d.8 8 8 8 8 8 8 2 2 7 8 2 1 2 2 1 1 2 2 2 < 2 1 1 1 # o X . R "
+	"PXPXPXPXPXPXIXPXPXPXPXPXPXPXPXPXPXPXPXPXUX.   . X       + + 1 + g "
+	"5.+.Z.G.F.ZXZXZXDXFXDXDXDXDXDXDXDXDXDXDXZXDXDXDXDXFXDXDXFXDXFXDXDXDXDXZXN.O.4.a @ 1 < 5 1 1 1 1 # 1 "
+	"+ + NXKXVX E NXCXVXVXCXVXVXCXVXBXR VXVXKXKXCX& # @ < @ < @ < 0 # % "
+	"4.G.AXDXKXFXAXAXAXAXC.C.r.5.>.#.f & .jXcXcXxXjXnXnXnXmXmXMXMXmXnXnXnXkXa 0 0 g r s e s e g a g = d "
+	"{.*X;XL.$ % & N V Y.&X*X*X*X*X&XP.V * & b k "
+	"O.n.n.n.Z.Z.n.n.A.A.A.A.A.n.A.N.n.A.S.S.S.S.S.S.S.S.S.N.N.",
+	"T.!.T.(.~.!.!.W.T l.SXSXl.x 5 "
+	").(.W.(.!.(.Q.W.(.W.W.W.(.W.W.(.W.Q.(.W.W.+XW.+X(.W.W.XXW.+XW.W.+X+XW.+X+X+X+X+X+X+X+X#X+X+X(.(.(."
+	"OX).(.#X+X+X!.!.W.!.+X!.!.OXOXW.E.E.E.XXE.!.E.E.E.E.E.H E.E.E.E.K E.E.E.E.OXH E.XXE._ H K XXJ H E._ "
+	"E.K _ F F F K F F F F K F F A A A A A A ! A A D F D A A A J L F A A A A K D A A A A A A A A ! A E A "
+	"F ! E ! ! E ! E ! E ! ( ( E ( A A E ! ( R ( R F E S ( S E Q Q Q Q ( D ( E ! ( E ( ! ( k b ( j j j j "
+	"E d d S S d d : d d : ; % 4 5 4 5 5 4 5 4 5 4 4 5 4 x g 4 4 g x g g g g g g 4 g g g t g s x t x s t "
+	"q 0 q q q t q t q < 0 < @ < 0 q t u u u u y i q e q e q q q e q q q 0 q e q q e e e e e r e e e e e "
+	"e e e e e e e e e e e e e e e e e q 0 e q q q q t q 2 q q q t q q < q < q i 2 i t t t t i 2 2 t z z "
+	"x f.x z i x x x f.f.x x x a.x x 8 8 8 8 7 8 8 8 2 8 8 2 3 1 1 2 2 2 2 q 5 2 2 1 5 1 9 o   X . "
+	"CXPXPXPXPXPXPXIXPXPXPXPXPXPXPXPXPXPXPXPXPXIXX . . X .   . + + + + 9 "
+	"C.+.+.S.F.F.ZXDXDXZXFXFXDXFXFXFXDXFXDXFXFXFXFXFXFXFXFXFXFXFXFXFXDXDXDXZXZX+.O.) 1 # 1 1 1 # 1 1 1 # "
+	"# & CXKXKXCXR  CXCXCXCXCXCXCXCXiXNXVXKXHXKXCX@ # # # 1 @ @ @ < # E 5.G.G.AXAXAXAXBXG.G.G.t.5.>.:.| "
+	": % jXjXjXjXcXxXnXnXnXmXmXMXmXnXnXnXnX = a 0 e k s c s s s w s s g XX&X&XB N S $ C "
+	"U.&X*XY.Y.U.U.L.V N X X E k o.O.5.n.5.n.n.n.Z.n.A.n.A.A.A.A.Z.A.S.S.S.S.S.S.S.S.S.S.S.",
+	"7X!.T.~.E.!.E.x l.SXSXv.l.j.a.3 "
+	"!.(.(.(.(.(.W./.W.W./.(.W.(.W.W.(./"
+	".W.W.W.(.+XW.W.W.XXW.W.W.XX+X+XW.+XXXXX+X+X+X#X+X+X#X+X#X#XOXOX+XXXXXXXOXXXOXW.OXW.W.OXW.W.OXE.E."
+	"XXE.OXXXE.E.E.E.E.OXE.E.K ~.E.E.E.E.OXH J _ ' J _ E.K E.H XXE.H XXJ K F F F K F F F F K F F A D F F "
+	"A A A A A A D A D A F L J L J S F F A F K A A A A A S A ! A E A E ! E ! ! E ! ! E ! E ! ( A ( E ( ( "
+	"R ( E ! E V V J A : S ( k S S : ! E A ( S ( E ( ( h b j j ( k E T ; S T S : ; ; ; S d ; d 4 5 4 5 5 "
+	"5 4 4 5 5 4 5 g g 4 x g g g g g g g 4 4 4 P 4 4 4 g g x g x w s q g q q t q q q 0 @ < < 0 < e < < 0 "
+	"t u i u t q q e e q q w q q q q e q 0 e e q e e r e e e e e e e r e e e e e e e e e e e e e e e e < "
+	"0 0 q q q q q q q 2 q 1 q q q < q q q 2 2 i i q t t 2 t 2 z z x z f.u x x f.f.x x x f.x x x 8 8 7 8 "
+	"8 7 8 7 8 8 2 2 8 2 2 2 1 1 < 2 5 2 2 1 5 1 9 1 + .   &   "
+	"KXPXPXPXPXPXPXUXPXPXPXPXPXPXPXPXPXPXPXPXPXIXX . . o       o + + + + "
+	"g.Z.N.S.F.ZXZXDXDXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXDXFXFXFXDXZ.O.j # 1 + # 9 # 9 # + + "
+	"+ & VXKXKXKXNXR NXCXCXCXBXCXCXCXkXCXVXVXVXVXCX5 @ # + & + # 1 # # b C.G.e.4.^ : f f : NXNXe.  "
+	"NXk.e.V.%Xk.%XV.k.JXnXnXnXmXmXMXmXnXnXnXcX = 0 s r g s s s s p s w w a ( I V B N & & C "
+	"}.*X*X*X}.J.B C V N X X f j  .O.n.5.n.n.5.n.n.A.n.A.n.A.A.A.A.A.A.S.S.S.S.S.S.M.S.S.S.",
+	"~.!.~.).!.OX l.SXSXzXh.h.v.l. 5 "
+	"E.).#X#X#X(.W.(.W.W.W.W.(./.(.W.W.W.W.W.+XW.W.W.XX/"
+	".W.W.W.+XW.XX#X#X+X+X+X+X+X+X+X+X+X+X#XXX+XXXXX+X%XXX+X!.XXOXW.XX!.W.W.OXE.OXE.!.XXE.E.E.!.E.E.E.E."
+	"E.E.E.E.E.E.E.K E.' J E.J E.E.F E.J ' XX' E.XXK H F H F F F H F F F F F A K A A A ! K D A A A A A A "
+	"L J S J S F F F F A A K K A A A A A A A F A A A A E E ! ! E ( ! ( ( E ( ! D A ( ! E ! E G G J J J S "
+	"( D f S d S S E S S ( E ( f ( ( ( ( ( k E S S S : N : N S : % ; % ; % % 4 5 4 4 4 g 5 5 g 4 4 4 g g "
+	"g g g x 4 g 3 4 4 4 4 4 4 4 4 4 t g 8 g g t q q q q q q q q < 0 0 q < q q < q 5 a < q u g 0 q e q e "
+	"q q q e w q q q 0 q q q e e r = r e e r r e e e e r e e e r = e e = e e < 2 5 < < q 0 5 q q q 2 q q "
+	"q t q q 0 q q < < 2 t 2 2 t 2 t q 2 t x z z z x z z u x x x x 8 8 8 7 8 7 7 7 7 7 7 7 7 7 7 8 8 3 3 "
+	"3 1 1 5 t 2 2 2 2 2 2 1 1 1 +   . 4 . UXPXPXPXPXPXPXUXPXPXPXPXPXPXPXPXPXPXPXPXPXPX*   X .   .   + + "
+	"+ 9 + g AXZ.S.F.F.DXDXFXDXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXn.5.< # + 1 # < a < "
+	"1 < 5 # P CXKXVXVXVXCX NXNXNXBXiXNXNXNXCXVXVXVXVX%X%XI    R R d < # ) 2.( ; & # @ O @ @ ) &     "
+	"                    kXnXxXnXmXMXMXmXnXnXnXjX% @ 0 0 s s k w s p s s s s w a ^ _ Q.J.* * B "
+	"*X*X;X*X*XP.V C V * * o d M O.o.O.+.n.n.n.n.A.A.n.Z.n.A.n.n.A.n.A.S.S.S.S.S.S.S.B.S.S.",
+	"~.).(.!._  l.CXSXl.3 5 x  l.V. 5 "
+	"E.#X).#X(.#X/.W.(.W./"
+	".W.(.W.W.W.W.Q.W.W.W.XXW.W.W.W.+XW.W.+XW.+X+X+X+X+X+X+X+X+X+X+XXX.XXXX+XXXXX+XXXXX!.OX!.!.W.OXW.W.!"
+	".E.E.E.E.E.OXE.E.E.E.OXE.E.E.E.E.E.E.E.E.E.E.E.J K _ XXH XX_ E.J H K XXH F H F F H H F F F F L F F "
+	"A A A A K ! A F A A K A A F J L L L J F F H F H F K F F F F A A A A A ! E S A A E ( ( E ! E E ( ! ( "
+	"! E ! ( R R E J G G G J G G S ( S ( S S S S ( S S ( f E ( f ( k f S S d d S S : T S S & % ; % ; ; % "
+	"5 4 g 5 5 4 4 4 5 4 5 5 x g 4 g 3 4 4 P P 4 4 P P 4 4  4 4 4 x g g s x g q g q g a a 0 a 0 0 < 0 0 "
+	"0 < < 0 0 5 < a < q q e e q q w q i q w q e e q q e e e e e r e e e e e e e e e e e e e e = e e e e "
+	"0 3 7 3 7 5 < 0 q q q q q t 1 q < q < 2 2 t 5 q 2 2 2 2 q 2 2 2 t 2 2 i x u f.x x x x x 7 8 7 7 7 7 "
+	"7 7 7 8 8 7 7 7 7 8 7 2 2 3 3 2 8 8 8 2 1 q 1 1 1 9 # 1 +     * . "
+	"IXPXPXPXPXPXPXIXPXPXPXPXPXPXPXPXPXPXPXPXPXIXX . X         o 9 9 1 + 1 "
+	"BXS.S.F.ZXDXDXFXFXFXFXFXFXFXFXFXFXFXFXFXFXLXLXFXFXFXFXFXFXFXFXFXFXFXFXZX+.C.< 1 + 1 1 d k.%X%X%X%X "
+	"X.HXVXVXVXVXVXNXNXNXNXNXNXNXiXNXNXVXVXVXCX X XvXvXvXNXNXNX a @ ; @ # # # # @ # @ @ g.*            "
+	"             bXjXjXxXmXMXMXnXnXnXxX a = 0 s s e c s s s k w s s s 0 0 f g E N V I.*X*X;X&XY.L.N C "
+	"N * X X a p o.n.o.n.n.n.n.A.n.n.A.A.H.A.n.A.A.Z.N.S.S.B.S.S.S.S.S.M.S.",
+	").!.).S   8 7 5 % NXVX 5 4 g 5 P 5 (.#X(.#X#X#X(.(.W.W.(.W./.(.#X!.XXXXW.G "
+	"L.W.W.W.W.W.XXW.W.W.+X+X+X+X+X+X+X+X+XXX+X+XXX+X+XXX+X+XXX+X+XXX+X+X!.XXW.W.OXW.XXW.E.E.E.E.W.E.E.E."
+	"E.E.OXE.E.E.E.E.K E.E.E.~._ E.E.K ' H E.K XXK J E.H F F H F F H H H F H F F F F F A A A A A A K A K "
+	"A A G L J J J F H L J F F F F F L F A F A F A E A F A A A A E ! ! ! ( ! ! ( A ! ( E E R ! J V J G J "
+	"V J G J S S S S : S S E D E D E ( ( ( k ( E E S S S S N S N N N S & ; % % ; @ 5 4 5 4 4 g g 5 d 5 d "
+	"4 4 4 4 P 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 2 g s g q 5 a 0 a a a < a q 5 0 q < < 0 0 < q < q 0 q q "
+	"e q < q q q q q q q e < e e < e e e r e e r e r e e r e e r e e e e e r e e e 3 8 3 3 3 3 7 3 1 q 5 "
+	"0 < q q q t q q q 0 < 5 2 2 i i 2 2 2 2 2 2 2 2 2 2 2 u x 8 8 8 7 7 7 7 8 7 8 7 8 7 7 7 7 8 8 7 7 7 "
+	"2 3 2 7 8 x 2 5 5 2 2 2 1 1 1 1 # o * Y * * UXPXPXPXPXPXPXUXPXPXPXPXPXPXPXPXPXPXPXPXPXKX. X . X X + "
+	". + + 1 9 9 1 ) DXS.F.F.DXDXFXFXFXFXFXFXFXLXFXFXLXFXFXFXFXFXFXFXLXFXLXFXLXFXFXFXFXFXF.t.BX# 1 1 # # "
+	" CXCXBXkXbXvXvXvXHXVXVXVXCXCXiXkX%XNX NXV.%XNXVXVXkX X X:X1XvXvX1XCXCXNXT # @ @ # # @ @ @ @ 0 < "
+	"V.#                         zXjXjXlXcXMXmXnXnXnXxX @ 0 0 k s w s s e p s e s w s s s 0 = = S V "
+	"U.Y.*X&XL.V C N $ * O X o f k o.o.n.O.b.n.n.n.n.n.n.n.n.A.A.A.n.Z.N.S.S.S.S.S.S.S.M.S.S.",
+	").).!.(.(.).~.(.P CXIXUXVX N (.#X).).#X(.#X(.(.(.(.(.+X(.(.W.(.OX+X#X+X!.XXQ.V V G "
+	"E.XXXX+XW.+XXX+X+X+X+X+X+X%X%X+XXXXX+X.XX%X%XXX+XXXXX+XOXOXXXOXW.W.OXXX!.W.OXE.E.E.E.W.E.E.OXE.E.E."
+	"E.E.K E.E.E.E.E.~.E.E._ _ K ' J F XXK XXE.H J F F H J H F H H F H F H F H L F F S F F F A K A A L H "
+	"L H H F H F F H F J F L F F F A F A E A F A A S J S F S ! ( E ( E ! A ( A ! R R R J J G J G G J J N "
+	"J S S S S N S S S A A ( S E E E S E E S S T S N - N S - N N N & & ; % % 5 5 % 5 4 4 4 4 4 4 4 4 4 4 "
+	"P 4 4 4 P 4 4 4 4 T 7 T 4 4 P 4 4 4 4 4 s g g 5 g a 0 g a < < a 5 0 < a a < 0 0 < q 0 0 0 < ; 0 0 0 "
+	"0 0 0 a q 0 0 0 0 q 0 0 e q 0 q 0 e e e r e e e r r e e r e = e e e e e 3 3 3 3 3 3 3 7 3 3 7 5 < 0 "
+	"< q q 2 t q q 5 5 2 < 2 2 2 2 2 2 2 2 2 2 2 2 8 7 7 7 8 7 7 7 7 3 8 7 7 8 7 8 7 7 8 7 8 7 7 8 8 8 4 "
+	"8 8 8 8 5 2 < 2 1 1 1 1 9 + 9 cXxXxXC  IXPXPXPXPXPXUXPXPXPXPXPXPXPXPXPXPXPXJXbXbX*   .     % X o + "
+	"9 9 1 1 < BXF.F.F.DXDXFXFXFXFXFXFXFXLXFXFXFXFXFXFXFXLXFXFXFXFXFXFXFXFXFXLXFXFXN.DX) + 1 + 1 @  "
+	"CXVXkX XvXvXvX:XkXVXVXCXVXCXiXk.%XV.NXkXe.V.V.CXkX.. X:XvXvXvX$XVXCX%Xg # @ # @ @ @ # @ < < q V.* "
+	"                        kX.XjXjXjXmXmXnXnXnXjXd < 0 0 w s s s e s e s s s s s e s : e = ; N C L.L.V "
+	"R.C N $ * * X X X R p o.o.n.b.n.n.n.n.n.H.n.n.n.A.n.n.A.A.n.A.S.S.S.S.S.S.S.S.S.",
+	"(.#X#X(.(.(.(.).P k.CXVXV.^ 4 #X#X#X#X#X#X(.(.#X(.).(./.(./.W.(.#X(.OXOXOXW.W.E.'.J "
+	"E.Q.W.W.W.+XXXW.XX#X+X#X#X+X+X+XXX+XXX+XXX+X+XXXXX+XXX+XXX+XXXW.OX!.W.W.E.#X#X!.XXE.E.E.W.E.E.E.E.W."
+	"~.E.E.E.E.K ~.E.E.~.E.H E.XXH XXE.J E.H E.F F H F H H F H K J F H J H H H H F F L F D F F A F D T.H "
+	"G L F J L H L F F L F J F F F F A F F F J G A L A A A A A E ( ! ! ! ! ( ( ! ( R _ G V G V J V L G J "
+	"J G J S S S S S S S S A S ( A S A S S T S S S S N N N % N S - N N ; % : % 5 5 5 g d 4 4 4 P 4 P 4 P "
+	"4 4 d 4 4 4 4 T 4 4 P x 4 4 g 4 4 d d 4 4 l s a a q a < a a 0 a 0 0 q < < a 5 0 0 0 0 < a 0 0 0 0 0 "
+	"0 0 0 @ 0 0 0 ; 0 = 0 0 = < 0 = 0 0 = 0 e e e e e e r e e e r e e e e 0 5 2 3 3 3 3 5 3 3 3 7 7 7 3 "
+	"3 5 < q q < 2 t < q < i i 2 2 2 2 2 2 2 8 7 3 7 7 7 7 7 7 8 3 8 7 8 8 7 8 7 7 7 8 7 7 7 8 7 3 8 8 8 "
+	"8 2 3 2 3 2 2 2 2 1 1 9 + 9 Y xXxXxXxX* R UXPXPXPXPXIXIXPXPXPXPXPXPXPXPXPXPXMXnXnX*       . o .Xj.+ "
+	"9 1 1 + 1 k.AXF.F.F.DXFXFXFXFXLXFXLXFXLXFXLXLXFXLXFXLXFXLXFXLXFXFXLXFXFXFXLXF.F.AX1 1 # 1 # # ^ "
+	"%XVXCXvXvXvXvX X X XkXCXVXCXNX%Xk.iXiXk.%XkX%X$X X. X1XcXvXvX1XHXVXVX d @ 0 @ @ @ @ < = < e < k.# "
+	"                        kXY Y jXjXjXnXjXjXjX < 0 g a e s s s s s w s s s w s w p e r ; f V C N N C "
+	"C C N & + * + o & b r o.o.b.b.O.b.n.n.n.n.n.n.Z.A.A.A.Z.n.A.A.A.S.S.S.S.S.S.S.S.",
+	"#X@X). 8 3 x 7 3 g  l. 7 9 1 5 d % ).(.#X)./.>X(.#X/.(.W./.(.#X#X#X#XOXXXXXE.J "
+	"Q.XXQ.W.W.XXXX+XXX+X+X+X#X+X+X+X@X+X+XXX+XXXXX+XXXXX+X+XXXXX+X!.OXW.W.!.XXOX@X@X%XOXXXE.E.E.E.XXE.E."
+	"E.E.E.E.E.E.E.E.E.K E._ E.E.J E.K K Q.E.G F H H F H F H H H H J H F H H H G L T.L J F F F K A A K H "
+	"G L H F J H L H F F F F F F A A A F A G L G L G G J S A A A A ! ( E ( A ! ! ^ R E G G J V J G G N N "
+	"G N S N L S S S S S S S S S S A A S A S S N S N N N N L N - S N N : % % % 5 & % 5 4 g 4 P 4 P 4 4 4 "
+	"P 4 4 4 d x P 4 4 g 4 g d 7 4 4 d x P d 4 P ; 5 a a a a 0 a < a < < a a 0 < < < 0 < a 0 0 a 0 0 0 0 "
+	"; 0 ; 0 0 0 ; 0 0 = 0 0 0 0 0 0 0 ; 0 a < q q 0 e e e e e r e r e r r e q 3 5 3 3 3 3 3 3 3 3 3 3 3 "
+	"3 8 3 3 3 q q q < 1 5 < 2 2 2 2 2 2 2 7 7 7 7 3 8 8 7 7 8 7 7 8 8 7 7 8 3 7 7 7 8  8 8 7 8 7 3 8 3 "
+	"8 8 8 2 8 2 8 2 2 1 1 Y Y Y .XcXxXxXxXxXcX. & KXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXbXxXcXX         C "
+	"nXxX+ + 1 1 + 1 1 V.DXF.ZXDXDXFXFXFXFXFXFXFXLXLXFXFXLXFXFXFXFXLXFXFXLXFXFXFXFXLXDXA.GXV.# # 1 # 1 # "
+	" VXVXHX$XvXvXvXjX X X.. X%X%X%XkXkXkX$X$X$X X X X X. XvXvXvXbXCXVXVXNX@ @ # @ < 0 0 0 q < q 1 "
+	"k.#                         V.6 Y Y .j.  g < @ 0 0 e g s a g 0 s s 0 s w k 0 p c c p s = E /.Y.V "
+	"C * * $ X * C * * & X ( k o.b.O.n.n.b.n.n.n.n.n.n.H.n.A.n.H.A.A.n.M.A.S.S.S.S.S.S.M.",
+	").).).).OX k.SXl.l.7 2 8 8 j.l. d _ "
+	").(.).#X#X).(.(.).(.(.+X#XOX#X#X#X@X#XXXQ.XXXXQ.W.XX+X+X+X+X+X+X%X+X%X+X+X%X#X+X@X+X%X+X+X#XXX+"
+	"XXXXX+XXXXX#XW.XX!.OXOX@X@X@X@X#XOXXXE.W.E.E.W.E.E.E.E.E.XXE.E.E.K XXJ H E.E.' _ G E.E.E.K K F H F "
+	"K H F F F H H H H H H J G G G G R.R.H F A A A H T.T.G G J L F H L H H F F F F F L J L H H G H V G L "
+	"G G F A A D A A ( A ( E R R E G G G G G G J G J J J J J G N S N S S S S S J A A S S S S J N S S $ N "
+	"L N N N N N L N N N & ; % 5 % % & d 4 4 4 4 4 4 4 4 4 4 d 4 4 4 d 8 P d 4 4 d d 4 4 4 4 % 4 4 ; % = "
+	"0 a a a a a a < a a 5 0 a 0 a a < 0 0 0 0 < 0 = 0 0 0 0 0 0 0 0 0 0 0 a ; 0 0 ; 0 0 0 0 0 0 q 0 0 < "
+	"0 0 e e e e e e e e = q 5 2 3 5 2 3 3 3 3 3 3 3 3 3 3 3 3 7 3 7 3 3 5 2 < 1 2 2 2 7 9 2 3 8 7 8 7 7 "
+	"7 7 7 7 8 3 7 7 8 7 7 8 7 8 8 7 8 7 7 8 3 8 7 7 8 8 2 8 a.8 2 2 5 1 1 Y cXxXxXxXxXxXxXxXxXnX.X  X "
+	"VXPXPXPXPXPXPXPXPXPXPXPXPXPXUXbXnXxXY . . . C jXxXjX+ + 9 9 1 9 x "
+	"VXLXFXFXGXLXFXGXFXLXLXLXLXFXLXLXLXFXLXLXLXFXFXLXLXFXLXLXLXLXLXFXGXUX) + + 1 1 + + T "
+	"VXCXCXBXkXvXvXvX X XU .. X X X. X X$X$XvXvX X$X X X:XvXvXvXNXNXCXCXNX& # # < # # @ < 0 1 < q m "
+	"BXV.V.V.V.V.CX&           k.o X * # # # + # < = < a 0 0 s w e s 0 s s a s w s s p w w k ; E "
+	">X*X;XJ.C * * C N .lXY * X d p p p o.O.b.n.O.b.n.n.n.n.n.n.n.A.n.A.n.A.A.S.S.S.S.B.S.S.S.",
+	"-X@X).).#XXX l.SXSXzXh.l.v.l. 4 "
+	"XX).>X<X+X(.).(.(.(.#X(./"
+	".#XOX#XOX#X#X#XOXW.Q.E.Q.XXW.+XXX+X+X%X+X#X%X+X+X+X#X$X#X#X$X#X#X@X@X@X#XXXXX+XXXXX+XXX!.!.XXW.#X#X@"
+	"X@X@X@XhX!.XXE.E.E.E.E.E.W.E.Q.H E.E.E.H J J XXE.G H E.E.E.E.H H H J F H K H H H H H H H H H H H G "
+	"G H G H T.H H H H D R.T.R.G L F J F H H F F F L F F A H L H H H G H G L G L G G F A A A ! ! E E ( R "
+	"E G G V G J G G N G J G G V L S G N S S S S S N N N J J S J N S S N C N L L C S L J N N E N S % % 5 "
+	"& 3 % 9 N 5 4 5 P 4 4 4 4 4 4 7 T x P 4 4 P 4 4 P % 4 % 4 ; P 4 ; 4 % ; a ; a a a a < a < 0 @ < 0 0 "
+	"a 0 0 0 0 0 0 = 0 0 0 0 a = 0 0 0 0 0 0 0 0 0 ; 0 ; 0 0 0 0 0 0 0 0 q q q 0 0 < q q a 0 e e e e 5 2 "
+	"5 3 3 5 3 3 5 3 5 7 3 3 3 3 3 3 3 3 3 3 3 7 3 2 5 9 3 3 3 3 3 4 7 7 8 7 7 7 8 8 7 7 8 7 7 8 7 8 7 7 "
+	"8 7 8 8 7 8 8 8 8 8 7 2 8 a.8 2 2 8 2 2 2 9 Y xXxXxXxXxXxXnXxXxXxXxX*   . "
+	"NXPXPXPXPXPXPXPXPXPXPXPXIXKXvXxXxX.X.X.XjXjXxXxXxX9 + 9 1 + 2 V.o .   .     "
+	"KXDXGXGXGXUXLXFXLXLXGXLXLXFXLXFXLXLXLXFXLXLX.     .   . V.+ 1 + 1 1 + T NX %Xe.kXvXvX:X X.'.. X "
+	"X:XvXvXvXvXvXvXvX1X X1X X X%X$XvX%X  %XV. & < # < @ @ @ q < e < < < 0 @ @ + # o  &           "
+	"e.o o O + # # = 0 0 0 e a e 0 s s 0 e 0 g 0 e a s w s p p s e = f L.*X*X*X&XU.V C N C Y jXcX3 & f c "
+	"M o.O.b.n.o.b.n.n.n.n.n.n.A.A.n.A.A.A.M.M.S.S.S.S.M.S.M.",
+	").).<X).).-X#X8 v.SXSXSXv.l.a.9 "
+	"W.(.).).(.(.#X/.#X=X(./"
+	".(.(.#X@X@X#X#XOX#XE.XXXXXXW.XXXXXX+XXX%X+X+X+X+X+XOX+X%X@X+X+X@X@X@X@X@X).(.+XXXXX+XXX+X+X+X!.OX#X#"
+	"XOX@X@X@X%XuX@XXXQ.XXQ.E.E.Q.Q.E.E.E.E.E.E.E.Q._ J _ E.Q.Q.G H E.R.R.E.H H H H H H E.H K H H H H H "
+	"H H G T.H H G T.T.R.R.T.R.R.R.G G G L F L L F L F F F J L L L H H G H H G G G G H J J L A D E A D ( "
+	"R ! G G J G J V J J G G J N S J G N N J N J S S L N L N S S S S L N C N - N N N N N N N N S P T T N "
+	"S % % & % % 5 4 4 4 4 % 4 P 4 d d d 4 4 4 4 g d 4 % ; 5 % 4 % 5 P 4 P % % % ; ; @ < a ; a < 0 @ 0 ; "
+	"0 0 = a < a < 5 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 q < < q < 1 < 0 q "
+	"q 5 3 5 2 3 3 3 3 4 7 5 3 3 3 3 3 3 3 3 3 3 3 3 3 3 7 5 3 9 3 3 3 8 7 7 7 8 7 7 7 7 7 7 7 7 7 7 7 7 "
+	"x 8 7 7 8 7 8 7 7 7 7 3 8 8 8 2 8 a.8 2 2 1 1 9 Y cXxXxXxXxXxXxXxXxXxXnX.X    . "
+	"VXPXPXPXPXPXPXPXPXPXPXPXKXjXcXxXcXcXcXxXxXxXxXxXxX* + + 1 9 V.            "
+	"GXAXAXGXGXGXLXLXLXFXLXGXFXLXLXLXLXLXLXLXLXLX            V.+ # + + + + 5 R    ^ %X.XX U .. X "
+	"XvX:XvXvXvXvXbXvXvXvXvX X X_ T P R R  R ^ E # # @ # < < 0 < @ 1 q < 0 < @ 1 # + o ) &            "
+	"o o + # # @ 0 0 0 = < 0 0 a 0 a s s 0 g s a c k e p s w s k e 0 _ I.*X*X*XY.L.C C N & 6 Y * X : c M "
+	"o.b.o.o.m.n.n.m.n.n.n.A.n.n.M.A.n.n.M.M.S.S.S.M.M.M.M.",
+	").-X).-X-X).).).P l.SXSXl.8 % "
+	"W.(.#X(.(.(.(.).(.(.(.#X/"
+	".(.(.#X@X@XOX#X#XOXW.XXW.+XW.XXXXXX+XXX+X+X+X+X+X%X+X@X+X$X,X@X@X@X@X,X@X#X).OXXX+XXX+XXXXX+XXXOX@"
+	"XuX@X@XuX@X@X@X@X@X%XOXE.Q.XXE.XXE.E.E.E.E.E.E.E.J J Q.Q.E.E.G E.R.R.R.R.R.H K F H H K H K H H H H "
+	"H R.H H H T.T.H T.G R.R.R.R.T.R.H L G H H L L F L F L F F F H T.G H H H H R.H G L G J L L G J A ! E "
+	"! F J G V J G G J J J G N G J G L J N G G N S N G N N L N L S J J N N L - N N L L N L G S N T T T T "
+	"P T N 4 3 % % & % 5 4 P P 4 4 4 P 4 4 % 5 d g P P T d 5 % 5 ; 5 ; ; % P 5 4 ; ; ; ; ; @ a < 0 a a a "
+	"a a a s g 0 0 0 0 0 0 0 0 0 = < 0 0 0 0 0 0 0 0 0 0 0 a < 0 0 0 0 0 0 0 q q < q q < < 0 < < < < < < "
+	"5 3 5 3 5 5 5 5 3 3 3 3 7 5 4 3 3 3 3 5 3 3 3 3 3 3 7 3 3 9 3 3 3 3 3 7 7 7 8 3 8 7 7 7 7 8 8 7 8 7 "
+	"7 7 7 8 7 8 8 7 8 7 7 8 7 8 8 8 8 a.8 8 8 2 2 1 1 6 cXxXxXnXnXxXxXxXnXxXxXxXY      "
+	"PXPXPXPXPXPXPXPXPXPXPXKXjXcXxXxXxXxXxXxXxXxXxXxXjX9 9 1 1 k.            "
+	"AXG.SXAXGXGXDXZXDXDXGXAXDXDXDXZXDXGXFXGXFXGX            V.+ + + + # + @ E E R T T 5 5 # T U .. X "
+	"XvXvXvXvXvXbXbXvXvXvXvXvXvX.5 X X & 5 N T & + # # # # # @ < @ < < < < < @ @ 1 # # ) &           "
+	"k.o o + # # @ 0 = 0 0 q 0 a 0 s = s a 0 0 a e s w w p w w s w 0 = d _ Y.Y.L.L.V C & * * X X X X O g "
+	"p M o.o.b.b.b.n.n.n.n.M.n.M.n.M.M.M.A.M.M.M.S.M.M.M.M.B.",
+	").-X-XgX).-X-X-X-X3 a.l.7 4 "
+	"(.W.(.).#X).#X).#X/.(.(.(.(.#X/"
+	".#X@XuX@X#X#X+X(.OXXXW.XXOXOXXX+X+XOX+X+X+X+X@X+X+X,X<X@X@X+X@X<X,X1X@X@X).+X+XXXXX#XOXXXOX@X#X%X@X@"
+	"X%X@X@XOX@X@X@X@XW.E.E.E.H E.E.E.E.E.E.Q.Q.Q.E.E.G G Q.E.E.R.R.R.R.E.!.R.H K H H H E.H H E.R.H G "
+	"T.G G H G T.H T.R.T.R.T.T.T.T.H G H H H H H F F F F L H G H T.H H H G L H G G H J J G G H H H A F F "
+	"V G G G J V G G J N G S G S J N L N G N L G G N L N N N N L L N G N N G N N N N N N N S P S N _ S T "
+	"T P P N 5 N & % 4 5 % 4 4 5 ; 5 % % 4 d P d g d T ; % 5 N 4 P 5 5 ; ; d @ d a d f f g f f f g f f g "
+	"s f g a 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 q q t q t q q q q q q < 0 < < 5 5 "
+	"2 5 2 3 3 2 3 5 5 5 3 7 2 3 3 3 3 8 3 3 7 3 3 7 3 3 3 3 9 Y 3 7 3 3 7 8 7 8 8 7 8 7 7 7 7 7 7 7 7 8 "
+	"8  8  8 8 8 8 8 7 2 7 7 2 a.2 a.8 2 2 2 1 + 9 cXxXxXxXxXxXxXxXxXxXxXxXjX* T "
+	"KXPXPXPXPXPXPXPXPXPXPXUXE Y cXxXxXxXxXxXxXxXxXxXnXnXxXY + 2 k.            VXj "
+	"o.o.C.C.DXGXGXFXGXAXAXDXGXDXDXG.M.Z.C.GX            V.+ + + 5 P T E  U  _ P P P P P '... "
+	"XvX1XvXvXbXbXbXbXbXvXvXvXvX X.P 9 & & & 4 4 % @ 5 < 0 1 @ < < < @ < < < < @ < # # # ) *           "
+	"e.o o O # # # e 0 0 0 = 0 e s 0 w a s = s 0 s e e s a s w w w = = ; T & C C * * & O X X X X * X O & "
+	"f p p p o.o.b.b.b.n.m.n.m.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+	"-XgXgX8XgX-X-X-X).-X_ T _ "
+	"(.(.(.#X).#X(.(.(.(.(.(.#X(.(.(./"
+	".@X@X@X@X%XuX(.#X+XW.XXXX+XW.+XXX+X+XOX+X+X#X@X@X@X@X@X@X,X@X,X,X@X@X,X@X).+XXX#XXX#X+X(.@XOX@X@X@"
+	"XrX@X@X%X@X@X@X@X@X@XE.E.OXE.E.E.E.E.E.E.Q.W.Q.W.R.R.E.R.R.Q.Q.R.~.T.~.T.~.T.K H H H E.K R.~.R.~.H "
+	"H H T.H H T.T.G H T.R.R.T.^.^.2XT.H H T.H H T.H 2XH H T.H H T.H T.H G G H G L G G G G H G L T.G G G "
+	"G V G G J J G J N J J J J L J L N G L N N G S L G N L N N N N N L V N N L G N N N L S N T T T N E P "
+	"N P T T N 4 N ; 4 4 4 5 N % ; 4 % d 4 T d T d d d 4 T 4 4 4 4 d 4 4 d d d f f g f f d f f g f g a g "
+	"s a g a 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 e 0 0 0 0 q 0 q q t w q q q q q 1 q q q < < 5 2 "
+	"5 5 5 2 8 3 5 5 3 3 3 3 3 3 3 5 9 3 3 3 3 3 3 3 3 7 9 3 6 9 3 6 3 7 7 8 8 8 8 7 7 7 7 7 7 7 7 8 7 7 "
+	"8 7 7  7 a.7 7 8 7 8 2 7 2 s.a.2 8 8 2 2 1 9 6 "
+	"cXxXxXxXxXxXxXxXxXxXxXxXxXjXUXPXPXPXPXPXPXPXPXPXPXKXP . `.cXxXxXxXxXxXxXxXxXxXxXnXxXjX+ 9 V.        "
+	"    VX) e.V.VXAXAXGXAXVXBXBXBXVXDXGXDXGXGXGXLXUX            V.o + X R  NXNXkX X X....Y U U . "
+	"X X X1XvXvXbXbXbXbXbXbXvXvXvX:X XU U I .. X$X%X%X%X  E @ < # < < < @ < < # 0 @ @ <  &          "
+	" k.o o # # # = 0 < 0 @ @ e 0 0 = 0 0 a 0 g 0 0 w 0 0 w g 0 e 0 0 = = g 8 a.1 + 9 2 9 + 9 9 & & & X "
+	"$ & T b n M o.o.b.m.O.b.n.m.n.N.M.M.M.M.M.M.S.M.M.M.M.M.M.",
+	"gXgXgXgXgX-X).-X-X).@X@X).(.(.(.(.#X).#X<X(./.#X#X/.)./.(./"
+	".@X@X@X@X@X@X+X#X(.+X#X#X+X+XXX+X+X+X+X+X@X@X@X@X,X,X,X,X,X,XhXhX,X@X@X@X#X#X+XXX#XXXOX#X@XOX@X@X@X@"
+	"X<XiX,X@X@X@X@X@X@X@X+XE.!.E.!.E.E.E.W.Q.Q.(.Q.!.E.R.E.Q.Q.Q.R.R.~.T.!.R.!.T.~.H H H R.H R.H "
+	"R.R.T.H H T.T.H H T.T.H T.T.^.^.^.^.^.^.T.T.T.~.~.T.T.T.^.T.T.T.H H G G T.L H H G H G G T.G G T.H G "
+	"G G G J G J J V J G G J L J V J V G G G V L G G G N G G V L G G G N V L S G N N L N N N N T T _ T E "
+	"S E _ T T P T T T P d N N 4 4 5 % % 4 d d d 4 d d d d d R g d d d 4 d g d d d f d f f g f g f g f f "
+	"f g f g a 0 a 0 0 0 0 0 @ 0 0 0 0 0 0 q q 0 w 0 e 0 0 0 0 0 0 e q 0 0 e w w w w w w w w w w w 1 q 1 "
+	"2 < 2 2 5 5 5 5 3 2 3 3 3 5 5 3 3 2 3 3 3 7 7 3 3 6 6 7 7 7 7 3 7 3 7 3 7 8 7 8 7 a.a.7 8 8 7 8 7 7 "
+	"8 8 7 7 8 a.7 7 8 8 8 8 6 2 8 a.7 2 s.2 2 9 1 9 @ Y "
+	"cXxXnXxXxXxXnXxXxXxXxXnXxXxXHXPXPXPXPXPXPXPXPXIXCX* . . .XxXxXxXxXxXxXxXxXxXxXxXxXcX6 + 1 k.        "
+	"  . CX^ ) 4.C.BXVXBX) R 5 1 g d R k.VXGXKXGXDXLX            k.o o # ^ kXNX%X$X1X:X X|..'.'.`.U . "
+	"X XvXvXvXvXvXbXbXbXbXvXvXvXvX X XU . X X:XvXvXvXNXCXBXCXR 5 # 1 # 0 0 < < < # @ 1 @ < ) &          "
+	" k.o o O # = @ < @ e @ e @ < 0 0 0 0 0 0 w = 0 0 = 0 0 = < < < @ @ @ 4 f.h.a.9 f.a.f.2 a.3 P % T 4 "
+	"& & & 4 R Q M o.o.o.o.n.b.n.O.n.m.N.M.M.M.M.M.M.M.M.M.M.M.",
+	"gXdXgX8XgX7X-X-X-X)._ 4 _ "
+	").(.(.#X(.#X).#X(.).#X(.(.(.(.(.(.@X@X@X#X@X#X+X#X(.+X+X#X).#X+X+X+X<X@X@X@X@X,X,X,X,XhX@X,X,X,X@X,"
+	"X,X@X@X#X).OX+X+X#X+X#X#X@X@XuX@X@X@X@X@X@X@X%XuX@X@X@X@X#X!.E.E.E.E.E.E.W.W.(.(.W.Q.Q.Q.Q.~.Q.Q.T."
+	"T.!.T.!.T.!.T.~.E.H ~.E.R.H R.~.T.H T.H H H T.H H T.T.R.^.^.^.^.^.^.^.^.^.T.T.T.T.~.T.T.T.T.H T.T.G "
+	"G T.G H G T.T.T.G G T.G T.G J V G G G E.G G G G G G G V J V G G G J J G L G V L L G N G G V V L G L "
+	"G N L N N L G L J P T T N _ P T S P T T P P N d P 4 d P P % 4 % 4 d d d d T d T T f T g d d d d d d "
+	"d d d d d g f d g f a f d f a g g g g a 0 a 0 = 0 0 a 0 0 0 q 0 0 0 0 0 0 q a 0 w e 0 w q 0 0 0 0 q "
+	"w w w w w w w w w w w q < q 1 5 5 2 2 5 5 2 5 3 5 5 3 3 3 5 5 3 3 3 3 7 3 3 3 3 3 3 7 3 7 3 3 6 7 9 "
+	"8 7 7 a.7 8 7 8 8 7 8 7 8 7 8 7  a.7 a.7 8 8 7 7 8 8 7 8 8 a.8 7 2 2 2 2 1 9 "
+	".XxXxXxXxXxXxXxXxXnXxXxXxXxXcX.X KXIXPXPXIXKXBXd .     . .XcXxXxXxXxXxXxXxXxXxXcX.XY + 1 2 V.      "
+	"      VXNXBXCXVXVXCX + + + + + + 4 V.CXVXKXUXUXUX            k.. o & R V.NX%X X1X X X X..U `.U "
+	".. X$X XvXvXvXvXbXbXvXvXvXvXvXvX... X XvXvXvXvX XCXCXVX @ @ 1 < < < < < < 1 @ < @ < ) &       "
+	"     o o + # # @ 0 0 < 0 0 e e 0 e a s 0 0 a 0 0 0 < a a a a b g  R l.l.l.f.a.9 s.f.s.2 8  R & b "
+	"g f T 5 & & % T R ) M g.o.o.o.o.n.O.b.n.N.A.M.M.S.M.M.M.A.M.",
+	"hXgXgXgXgXgX-X-X-X k.k. N "
+	")./.(.<X(.#X(.#X(././"
+	".(.#X=X(.).@X@X@X@X@X#X<X).#X<X<X#X<X#X#X@X@X7X@X,X,X@X,X,XuX,X,X,X,XgX,X,X,X@X@X+X(.(.#XW.!.+X#X#X#"
+	"X#X@XOX@X@X@X@X@X@X@X@XuX@X@X@X@X@X@X!.!.E.~.E.!.(.T.W./.(.).Q.Q.Q.T.Q.Q.~.~.R.~.T.~.T.T.~.Q.H H "
+	"R.~.~.R.R.~.R.R.T.T.T.H T.H T.T.T.^.^.^.^.^.^.^.^.^.^.T.T.^.^.~.T.H H T.H G T.T.G J.T.J.G G G G T.H "
+	"G G G G G G V G V G G G G R.G H H G G G G N G G G V V G G G N J G L L J G G N L G V N N N G N T P E "
+	"P T T P A P A P P T S P T d P % 4 4 4 P d d d P d d d d d d T g T d T d 4 d d 4 d d g f d d d g d d "
+	"f g f f a a a g a 0 0 0 0 0 0 0 0 a 0 0 0 0 0 0 0 e 0 w 0 0 0 0 0 0 0 e q e q w w w w w e i w w w w "
+	"< < 2 5 2 1 g 5 2 5 5 8 3 2 3 5 3 3 3 3 3 3 3 3 7 7 7 3 7 6 7 7 3 3 6 6 3 6 3 8 7 7 7 8 7 8 7 8 8 7 "
+	"a.8 a.7 a.7 7 a.7 a.8 a.8 8 8 8 8 8 8 2 a.8 2 2 2 2 9 Y .XcXxXxXxXxXxXxXxXxXxXxXxXxXcX.X* . * & & X "
+	".       .   . .XcXxXxXxXxXxXxXxXxX.X6 + + 9 1 9 V.            o . . X X . o k.+ + + + 9 + k.o o . . "
+	". o .             k.o o X P  NXkX.1XvX X X...U U .. X$XvX1XvXvXvXvXbXvXvXvX XvX X.'.. "
+	"XjXvXvXvXvX XiXVXNX 5 + # @ @ @ < @ < # < < < q k.&           V.o o + # # 0 < @ 0 @ e @ @ 0 0 0 0 "
+	"= < 0 = 0 ^ NXVXJXHXkXP   6 7 7 2 a.a.a.9 9 2 a.8 3 % * f s s k ) b f d @ & & & d g ( ) "
+	"4.o.b.O.5.n.n.Z.n.M.M.M.S.M.M.",
+	"gXgXgXdXgXgX-XgX3 l.SXSXl. 3 "
+	"-X/"
+	".@X#X#X).).).).#X).).=X).).@X@X@X@X<X#X#X<X#X#X<X#X,X@X,X@X,X@XhX@X@X,X@X,X,X,X,X,X,XhX,XhX@X,X@X#X+"
+	"X#X(.+X!.#X#XOX#X@X@X@X@XuX@X@X@X@X@X@X@X,X@X@X@X@XuX@X%XE.!.E.!.^.(./"
+	".(.(.).^.W.Q.!.T.!.T.T.T.~.T.Q.~.T.T.T.~.~.R.H ~.R.R.~.T.H ~.R.R.T.H T.T.H "
+	"^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.T.T.T.T.G G J.T.J.T.G T.G G T.G G G G G G G G R.V G G G G G G G "
+	"R.G G G G G G G G L J L L V G J L V V J L V G N G J L G L V J J P T _ S E S S T E N P T T N P N d 4 "
+	"P % % % d P d d d 4 T d d d d T f d f f d d d d d d d a d d a d f d d a f g d g g a a a 0 0 0 0 = a "
+	"0 0 0 0 0 0 0 0 0 0 e e 0 w w 0 w 0 q 0 q e 0 q w w e i w w w w w q w < < 1 1 5 5 2 5 5 2 4 3 5 5 3 "
+	"3 3 3 3 5 3 3 9 7 3 3 3 3 7 3 3 6 7 3 6 7 7 7 7 7 a. a.7 7 8 7 8 8 7 8 8 8 8 8 8 8 a.7 a. 7 8 8 8 "
+	"a.7 8 8 8 a.2 6 s.9 9 s.7 Y jXjXjXcXxXcXxXxXxXxXxXxXxXcX.X*                   .   * "
+	".XjXxXxXxXxXxXcXjXY + + + + 9 1 9 k.                          k.+ + + 9 9 1 V.      .               "
+	"    k.o . X  NXCXCX.$X:X X X.XU Y '.U '... X XvX1XvXvXvXvXcXvX1X1X X.... "
+	"X1XvXvXvX1XkXKXHXBXR @ # # 0 q @ @ < 1 + @ < < < k.#           e.o o + # # = < 0 0 @ @ = 0 0 = 0 0 "
+	"= = 0 R CXJXJXJXUXJXHXOXkXHXJXJXJX%XP 8 d.d.d.a.8 6 4 % % 5 s s p j p o.M ) ) R f @ S N N N S ( "
+	"o.5.5.Z.Z.Z.M.M.M.M.M.M.",
+	"gXgXgXgXgXgX-Xx l.SXSXv.v.l.a.7 "
+	"(.@X,X7X@X).).).=X).).).).@X@X@X@X@X#X@X<X#X<X@X#X-X).@X,X).@X,X@X,X,XhX,X,X-XuXuX,XhX).hX-X,X#X#X#"
+	"X#X(.#XW.#XOX#X#X#XOX%XuX#X@X@X@X@X@X@X@X@XuXrX@X@X@X@X@X@XOXE.E.!.(.(.(.(././"
+	".(.(.T.T.!.R.!.Q.~.T.~.T.~.T.~.~.T.T.~.R.R.R.R.R.R.T.R.T.R.T.R.T.T.T.^.^.^.^.T.T.^.^.^.^.^.^.^.^.^.^"
+	".^.^.^.T.^.J.G G J.J.J.J.J.T.T.G G G G G G G V G _ G G G R.G G G R.G R.R.G V L G V G V G G L G N G "
+	"V L L V V L L V G N N G J J J E S T P T T P _ N E T T P T T T T ; N % 4 4 T N 4 T 4 T T T d T g T g "
+	"T g d T g E 5 d d d d d d f f a g a f d d a d d a g f a ; e e 0 0 0 a 0 0 e 0 0 0 0 0 e 0 0 e 0 0 0 "
+	"0 e 0 w 0 q q e w w w w w w w q w w w 1 < < 5 2 1 5 < 2 < 3 8 4 3 3 5 5 5 3 3 3 3 3 7 3 7 6 3 3 7 7 "
+	"3 7 7 7 3 7 7 6 a. 8 7 7 8 7 8 7 7 7 8 8 2 8 8 8 a.8 8 7 a.8 a.7 a.8 8 8 8 8 8 8 a.s.2 2 s.2 7 9 6 "
+	"Y `..X.X.XcXjXxXxXxXcX.X`.* . . o . . . . . . .   X `..XcXxXxXxXcX`.9 + + + 1 + + 1 2 V.            "
+	"              NX+ + + + + 1 NX      .                   k.. o + ^ %XNXBXNX$XvX X X X.._.U Y _.. "
+	"X$X X1XvXvXvXvX:X1X1X X X.U .. X:XvXvXvXkXHXVXVXVX @ @ @ @ < < < < e 0 q 0 0 e ) &           "
+	"V.o o O # # < e < < 0 0 < @ 0 0 s 0 a 0 a  JXJXJXJXHXVX%XHXPXJXJXUXUXVX 3 f.a.8 6 7 & & ; : f k p "
+	"p p o.M M p p p c c n c k E P C N 4.n.5.Z.Z.n.n.Z.n.A.M.",
+	"gXgXgXgXgXuX l.SXSXv.v.s.l.l.f.5 "
+	"OX@X@X@XuX@X@X).#X).).).#X@X@X@X@X#X#X#X<X#X#X).-X@X,X,X@X).@X,X,X@X@X@X,X,X,X-X,X,XhX,XhXgX#X(.#X(."
+	"(.(.#X#X#X%X#X#X#X@XuX@X@X@X@X@X@X@X@X@X%X@X@X%XuXuX@X@X@X!.~.!././.(.)./"
+	".=X(.(.^.!.T.T.Q.R.R.Q.Q.!.T.~.T.T.~.~.T.~.H H ~.~.T.T.~.~.T.T.T.T.G "
+	"T.T.^.T.^.T.T.T.^.^.^.^.).^.^.^.^.^.^.^.^.^.^.^.J.J.J.J.J.G T.T.J.G G V G G G G G G G G G G G G G "
+	"R.R.H H G G G L L L L G G V L V L J G J L J J L L L G G G L J S P P _ P T N T E T S N T S P P P N N "
+	"% N N N % P : d T d d d T d T f d d E d g d T f d d 4 d d d a a f d d f a a d d a d a a g a @ 0 0 @ "
+	"0 0 0 e ; 0 = e 0 0 a q 0 0 0 q e w 0 w 0 e q e w w q w q w w w q w w w < 1 1 5 < 2 5 5 1 1 5 5 3 3 "
+	"3 3 3 3 4 5 9 3 3 7 3 6 3 3 6 6 7 6 7 7 7 7 7 7 7 7 7 7 8 7 a.7 8 8 7 8 8 8 8 8 8 8 a.8 a.8 8 a.8 8 "
+	"8 8 8 8 8 2 s.2 2 2 2 a.9 8 2 9 2 9 9 9 9 B Y .X.X.XjX.X.XB + + + + + + + + + + + + o Y .X.XjX.X.XY "
+	"+ + + 9 1 + 1 9 1 + V.                        . k.o + + + + 9 NX.                         k.. o X E "
+	"  %Xk.%XvX:X X..'.Y U N P Y U . X XjX$X$X1X$X X..Y Y '...1X:XvXcXvXNXBXBXCXVX # @ # # @ @ "
+	"< @ @ < < < < < k.&           k.o o + # # # @ < = < < @ @ < 0 0 0 0 0 < b "
+	"NXHXJXUXKX%XCXHXJXJXJXJXJXBXR % 3 3 9 & @ 5 T f R ) p p o.o.o.o.p O.M p c n ) s p k ) _ C E "
+	"5.n.Z.N.N.n.Z.N.Z.n.",
+	"gXwXhXgX7X l.SXCXl.8 3 x  k.NX) P ' "
+	"@X).,X@X7X@X7X,X@X-X@X).,X@X@X@X@X-X#X<X-X<X,X-X,X@X,X,X,X@X,X,X,XhX@X@X,X,XhXhX,XhX-X,X).(.(.(.!.W."
+	"#XOXOX#XOXOX#X#XOX@X@X@X@X@X@X@X@X@X@X@X@X@XuXOX@X@X@X@X#X(./.).).=X).)./"
+	".(.).Q.!.~.R.Q.T.~.Q.R.Q.T.!.T.^.^.T.T.T.H T.R.R.R.T.R.R.^.G "
+	"T.T.T.T.^.^.^.^.T.T.T.T.^.^.T.^.^.^.^.T.^.^.^.^.^.^.^.^.T.J.J.J.J.J.J.G G G G G G G G G G G G G G G "
+	"R.H G R.R.R.G G V G V G G G H G J G G L N G L V V J V L S N G J N S T T S T _ S N E P _ S T T S N d "
+	"S 4 4 d d d d 4 P d T d T g T d T f T g f E f f E T ; : 5 a ; d d d d a a d d f a d a a d a a ; @ < "
+	"= ; a a a a s a 0 0 0 a 0 w 0 w 0 e 0 e q q q q q q w w w w q w q w y q w < 1 < < < < < 5 < 5 2 < 5 "
+	"8 4 3 5 3 3 3 4 5 3 7 6 7 3 6 3 7 3 6 7 6 7 6 7 6 8 a.6 a.7 7 7 8 7 7 7 7 2 8 8 x m 8 8 a. a.a.8 "
+	"a.a.7 a.7 a.8 s.9 2 2 2 a.2 a.2 2 2 9 9 9 1 9 9 + + Y B B B * + + + + 9 + + 9 9 + + + 9 + * Y "
+	"`.`.`.Y * + 9 + + + 9 + 1 + 9 V.                          k.o o + + 1 9 V..                         "
+	"k.o . o 5 R      X.U P Y 9 & & # + & & % P P P P P _ N 5 % & P P P U '..1X1XvXkX%Xk.%XV.NXR @ "
+	"+ # + # < < < 0 < 0 < < 0 ) &            o o o + @ @ < < < = = @ @ = = 0 0 0 0 0 a g R  kX  "
+	"iXJXJXJXJXHXkX E f : f d ( ( ( ^ ) b c M M o.M o.p b.p p j Q _ _ k k k ^ T * T "
+	"C.5.t.5.n.Z.n.Z.N.Z.",
+	"gXgXgXb g  4 8 3 d NXVX ; 4 4 5  8 "
+	"hX,XhX,X,X@X,XuX,X@X@X,X@X@X#X@X-X@X,X,X,XhX,X,X,X@X@X,X@X,X@X,X,X,X,X@XhX,X,X,X-X,X-X,X).(.!.(.!.(."
+	"OX#X#XOX#X#X#X#X#X@XuX@X,X,X@X@X@X@X<X@X@X@X+X@X@X@X@X@X@XhX@X#X=X)./.).^.).)./"
+	".(.Q.R.R.R.Q.Q.Q.Q.T.W.^./././.T.R.R.R.R.Q.Q.T.T.T.T.H T.H "
+	"^.^.^.T.^.^.T.T.^.T.T.^.^.^.^.^.^.T.^.^.^.^.^.^.^.^.J.J.J.G J.J.J.G G G G G G G G G Q.G G G R.H R.G "
+	"H R.H H G J V L L G G L G V J G C G G G G G N J V L N J S J _ T P S _ T P S S E T P E N T d 4 N N % "
+	"d N 4 S % S d T T d f d d f T f f T T f f f E d T d ; d d d 4 ; d a d a d d d a a 5 : d ; @ @ @ ; a "
+	": s a a e a a e a a e 0 e w 0 0 w 0 e q q q q w w i e q w q w y w w e 1 1 1 < < 5 < 2 1 4 2 1 5 2 8 "
+	"x 5 3 4 3 4 4 7 3 7 Y 3 7 6 6 7 6 6 3 6 6 7 7 7 7 8 a.6 7 8 7 a.8 7 8 8 2 8 ) m m z a.8 7 a.8 a.a.8 "
+	"a.2 a.2 9 a.2 9 2 7 s.2 s.9 2 9 9 2 2 9 1 1 9 1 + 9 9 + + 9 + 1 1 + 1 9 9 + + 9 + + + + + + + + + + "
+	"+ + + + + + 1 9 9 CX                          k.o o + + + + V..                          o o + + % "
+	"E P d 5 % * # + # # + 1 # + # # # & & 1 + + < # + + @ + # # @ % 5 P Y ._     R P @ + # # # < 0 "
+	"< < 0 0 < < < g.& .          o o + + # @ @ = = @ < @ + @ a e 0 g 0 = = a = @ = @ @ <  "
+	"k.HXHXVXHXe.( ( ( ^ ( ) ^ ) b l c o.M g.M b.M o.M c ) R L.L.L.R R E % * & 4.n.t.t.5.Z.Z.Z.n.Z.N.",
+	"gXgXgXgXhXgXgXgXS CXUXUXVX N "
+	").@XuXhX,X,X@X,X,X).7X,X,X@X,X@X,X@X-X@X@X).-X,XhXhX,X,XhX@X,X,X,X@X,X@X@X@X@X,X@X,X@XhXhXuX@XgX-X#"
+	"X#XW.(.#X(.(.XXOX(.#XOXOX#X#X,X,X,X@X,X@X<X@X@X@X@X@X@X+X@X@X@X%X@X%X@X#X(.(.(./.(.(./"
+	".).^.!.R.Q.Q.Q.Q.!.T.^./././"
+	".I.^.T.R.R.R.R.R.R.~.T.R.T.R.T.T.T.^.^.T.^.^.T.T.T.^.^.T.^.^.^.^.).^.^.^.^.^.^.^.^.^.J.J.J.J.J.J.J."
+	"J.J.G G G G G V R.G G G G V R.R.R.R.R.R.R.G G G G V G G G G L G G G L G L G L G G G J G J J J P T T "
+	"P S P S _ P P E J T T S N S P ; S 4 4 % % 4 4 d T d T T T T T d T d f f d T d g f f f 5 d 4 : d d d "
+	"; d d d d d d ; d d d ; % ; ; ; a e g a s = s a e f e 0 e 0 q 0 w 0 w q q e q e q w w q w w w w p y "
+	"p w 1 < < < 1 < 0 5 g 5 g 5 5 5 5 g x g 4 g 3 4 7 6 3 7 7 7 6 7 7 7 7 6 7 3 6 7 7 a.7 7 8 7 7  7 7 "
+	"7 7 8 8 c M m M g.m f.a.a.a.a.8 8 9 7 2 9 2 2 2 2 s.s.2 2 2 2 a.s.a.2 9 9 9 9 1 1 "
+	"k.k.k.k.l.k.k.k.k.k.k.k.l.k.k.k.l.k. k.k.k.k. l.k.k.k.x 1 1 1 + + 1 V.            CXe.%Xk.k.k. "
+	"NX   k.k.k.CXk.k.k.V.k.k.VX            k.. . o + + 1 T k.k. k.k.k. < # 1 < 1 1 @ # 9 @ @ < # 1 "
+	"+ 1 # 1 # < x  k.   k. 5 N T T 4 # # # # @ # @ 5 < < 0 @ 0 < < ) &           k.o o O # = @ < g "
+	"; = 0 e # 0 0 a 0 s = a = s = 0 0 = 0 g e.V.BXNXBXNXNXV.V.BXCXNXBXV.V.V.BXC.V.C.C.o.o.o.M o. "
+	"Q.L.U.U.K.C & & % R ) 5.5.5.C.n.5.5.N.Z.Z.Z.",
+	"gX8XgXgXgXgXgXgXP k.CXVXNXR P "
+	"#XuX,XhX<X,X,XhX,XhX,X,XuXgXuX<XgX-X).-X,X<X-X,X-X<XhX,X,X,X,X,X@X,X@X@X,X,X@X,X,X@XhXhX@X-X-XuX,X<"
+	"X#X#X(.(.OXOX#X+X#X(.).OX#X@XuX,X@X,X@X@X@X@X@X@X@X@X@X@X@X@X@XhX@X@X@X).)./.=X(./"
+	".^.).(.).Q.Q.Q.Q.~.T.T./.I.I.I.^./.I./"
+	".T.T.R.R.T.R.Q.T.R.T.T.T.T.T.^.T.^.T.^.^.T.T.T.T.T.T.^.^.T.^.^.^.^.^.^.^.^.^.^.G J.J.J.J.T.J.G "
+	"J.J.V G G R.G G R.R.G G G G G R.E.R.H R.R.G N G H H H G L G G L G L G G L V G G H G L J J S S P T _ "
+	"P A P E _ S S P N E P S P S T N 4 S N d S % S d T f d T T f d f d d d f d f E f E f f d d : d d d d "
+	"d d d ; T d ; 5 d ; ; @ ; = a g = g a a k s a f e a w s 0 0 0 e q q q e q e q q w w w w w i w w w w "
+	"w 1 < < < 2 5 2 5 t t 5 x x x g x x x g 4 g 3 7 6 6 6 3 6 3 6 6 7 7 3 7 6 7 j.7 6 6 7 7 8 7 6 8 7 6 "
+	"8 2 x b M g.m m m g.f.a.a.8 a.a.8 2 7 2 2 2 2 s.8 a.2 s.s.9 2 9 2 2 9 2 2 2 1 3 k.X X X O X X X o + "
+	"X X o O X O X X X X X * X # O X * O V.1 1 + 9 1 1 NX            k.. o . . . o NXX X * O X X k.1 9 1 "
+	"+ o X NX             o o o + + # k.& X X X X X NX1 1 # 1 5 < < 5 5 < < d @ @ @ a @ < @ < k.& X # X "
+	"O X V.@ @ @ @ & # @ @ 1 < @ @ 0 a < q < 0 0 0 k.&           e.o o + # @ @ = a a ; a 0 a s s s 0 g e "
+	"s e s 0 0 s a k ) R O X X * X X # * X X + X X # X X X X # CXM M M ) ' '.V L.V V C * ( n  "
+	".o.O.n.5.5.5.t.t.Z.Z.N.N.Z.",
+	"gXhXgX  4  7 3 8 x k. 3 9 3 5 4 7 "
+	"hX,X,X<XhX,XgXhXgXhX-XhXhXgX-X-XhX-XhX-XhXhX<X,X,X,X@X@X,X,X,X,X@X,X,X@X,X,X,X,X-X,XhXgX,X#X#X#X!.!."
+	"+X(.(.!.!.OX#X#X#X@X,X,X,X,X<X<X#X<X#X@X@X@X@X@X@X@X@XhX@X@X@X/./.=X/.=X^.-X=X(.^.Q.T.Q.Q.Q.T.I.I./"
+	".^./.I.I././"
+	".W.T.T.T.Q.T.T.R.T.R.T.T.T.^.T.^.T.^.^.^.T.T.^.T.^.T.^.^.^.^.^.^.^.^.^.P.P.^.J.J.J.J.J.J.J.J.J.J.J."
+	"J.G G V R.R.G G G R.R.G R.R.R.R.R.R.R.H G L G G G G G G J G G G G G G H H H G L J J J P P E T P E P "
+	"E N T J T A T S S E S E A A F F P ; 4 % S 4 d T T d d T d d T d T f E g g f f f E f d 5 5 : d 5 a d "
+	"d d ; d d a 5 ; d ; @ ; g g s g k h h a e a a g 0 0 e e 0 0 0 e w q q q q w w w y w w w w w y p p w "
+	"< < < 0 1 q 5 5 g x l l l x s x x x 4 5 3 7 6 3 6 7 6 6 7 6 6 6 6 6 7 7 7 6 6 a.7 7 7 7 7 7 7 a.2 2 "
+	"m M ) g.M g.m v z m 8 a.2 8 s.2 2 2 2 2 2 2 a.a.a.2 2 d.2 s.9 2 s.9 2 9 2 8                        "
+	"                                V.9 9 1 + 1 1 NX            kX. o . . o . k.            V.9 + + + + "
+	"o              k.o o + X + # k..       .   V.1 @ 1 @ # 5 < @ < 5 < 5 @ ; @ & @ ; @ @ V.X           "
+	"V.# # # # @ # < # @ # # # 0 < < 0 @ < < <  &           k.X X X O # = @ = = ; = = e 0 0 a = k ; ; 0 "
+	"k e = k = g 4.N       .                               V.M p 4. ) ) ) M n ) ) 4. "
+	".o.o.O.5.5.5.Z.Z.5.t.n.5.t.Z.Z.",
+	"gXgXgXgX#Xl.k.SXl.l. 2 3 8 l.l. T "
+	"XXhXhX<XhX<X,X,XhXhXgXgXhXgXhXhXhXgX<X-XhX-X,XhX<XhX,X,X1X,X,X,X@X,X,X,X,X@X,XhX,X-X,XgX@X,X(.<X#X(."
+	"W.(.#X(.(.!.OX).).).uX,X,X,X,X#X<X#X,X#X@X@X<X#X@X@X,X@X,X@X7X=X/.).I.I.I.I.I.^.(././.^.R.T./"
+	".I.I.I.^.=X/.P.I.^.^.^.^././"
+	".Q.T.Q.T.R.R.J.J.T.^.T.^.T.^.T.^.T.^.T.T.T.^.T.T.^.^.^.P.^.^.^.^.^.P.J.J.J.J.J.J.J.T.J.J.J.^.G G G "
+	"G H G G G G R.G R.R.Q.R.R.R.R.G G G G L G H H G G L G G G L G L G H H J J J J P T T N E S S _ J T E "
+	"S N _ E _ E J E A F _ A T P d T T d T T f f : d T d d f f f f f f f f f f f f d : 5 d d d d d ; d 5 "
+	"d d d a f ; a f k h > h k h h s s a f e 0 e s 0 e 0 e w w q q q e q e w w w w i w w y w y p t q < < "
+	"q < x s x l b x b x l m x x 5 x 3 3 6 6 6 3 6 6 6 6 7 6 6 6 6 6 7 7 a.6 6 7 3 7 7 7 7 8 8 c m M "
+	"g.4.m M M m v z f.z 8 8 2 2 2 2 9 2 8 s.8 a.a.a.s.2 2 2 9 a.2 2 2 2 9 2 R                           "
+	"                            NX+ # 9 9 < # NX            k.. . o . o o k.            V.+ # + + X X "
+	"V.            k.. o o + + 9 V..           k.1 + 1 5 # 5 a < d 5 < a < 5 @ @ @ ; @ < V.X           "
+	"V.& # # & @ @ < < @ @ 5 # < < a < < 0 < < k.&           e.o o + O @ & @ = = g f = g ; e k e = e : e "
+	"e f s s : k  5                                       V.c c k p M M M M "
+	"o.o.o.o.o.o.o.5.t.5.t.Z.t.Z.Z.5.Z.Z.Z.Z.",
+	"gXgXgXgXgX@Xf.l.SXSXv.l.v.l.l.a.4 "
+	"OX,XhXhX<X<XhX,XhXhXhX-XgXhXhXhXgXgXhXhXgXgX,XhX<X<XhX@X,XhXhX@X@X,X,X@X,X,X,X@X).).,X-XhXgX,X#X<X<"
+	"X#X(.#X(.#X#X#X).OXOX@X#X,X,X,X@X<X@X<X@X<X@X>X@X#X@X@X#X@X#X).-X-X=X/.I.I.I.I.I.I.^.).Q.^././"
+	".=XI.I./././././././././"
+	".^.T.T.^.T.^.J.J.T.Q.J.T.T.P.T.^.T.^.T.^.^.^.^.^.^.^.^.T.^.^.^.J.P.J.^.P.J.P.J.J.J.J.J.J.G J.J.J.G "
+	"T.W.L.L.G Q.R.Q.R.R.R.R.Q.R.R.R.R.R.H G G H H G H H J G G L G H G H G H G H H J H T S P _ E P P _ S "
+	"T E J _ S A A S J A J F F F F S d T T f T S : S E S E : d f d d d f E f E f f f f ( f T d d d d d d "
+	"d d : : f f f h > h k k h k h r h h > s a g a s e s w s e q q q w e q q q i w w i w w w w w y p u l "
+	"< < q 0 y l c b l l l x b x l x b x g 6 6 6 6 6 6 6 6 6 6 6 6 7 6 7 7 6 6 6 7 a.6 j.7 6 7 7 8 x M "
+	"4.M M M M M m v m m z z f.i a.2 2 8 s.2 a.a.s.2 2 a.9 a.2 2 2 2 9 2 2 9 2 2                        "
+	"                                k.9 + + # & 9 NX            k.o o o o X + k.            k.+ + + + + "
+	"O V.            k.o o + # + 1 V..           k.& # # @ @ @ @ < < @ < < 5 < a ; @ a % a V.X           "
+	"V.# # # @ # @ < < < @ @ @ a @ a a a 0 < 0 ) &           k.. O O # & @ ; g = = = ; : = g s ; s s a k "
+	"k : f r g s ) %                                       V.0 s p k p "
+	"o.o.b.b.b.b.o.O.n.5.5.t.Z.Z.t.Z.t.t.Z.Z.t.n.Z.",
+	"gXgXgXgXgXgX).3 v.SXSXv.v.l.8 5 "
+	"@XhX,XhX<XhXhX<X<XhXhXgX-XgXgXgXgX-XhXgXgXhXhX<XgX-XhXgX@X,XhXhXhXhX@X,X,X@X,X,X,X,X,X,X,X-X-XhX<X#"
+	"X<X+X#X(.#X).#X).).@X@XOX@X,X,X,X#X-X-X#X#X@X@X@X#X#X+X@X@X@X@X).=X^.=XI.I.I.I.I.I.I.I.I.^.=X=XI.I./"
+	".I.I./.I.P./.P./.P././"
+	".T.^.Q.T.J.P.T.T.J.T.T.T.T.^.^.T.T.^.^.^.T.^.^.^.^.^.^.^.P.P.P.P.^.P.P.J.J.J.J.J.J.J.J.J.J.J.T.T.G "
+	"Q.XXQ.Q.Q.V V Q.R.R.R.R.Q.R.R.R.R.R.G H H G G H H G H H G H G H H G H G H G H J P E T E T E N E S _ "
+	"N E J E _ N _ A _ A _ F _ F T T S : f S > S S D S f D d f d f T f d T f f f f E f f f d d ; ; d d f "
+	"f f f f f h h f k k > k k h > k h r a k k s = s s s s s e q q q q q w i w w w w w y p p p y y p p w "
+	"q l c l c c c c c c l c x l l m x c g 7 7 7 6 6 6 6 6 6 6 6 6 6 6 6 6 7 6 7 6 6 7 6 7 7 7 f.m 4.M "
+	"g.M m M m v v m v v x z x x 8 a.2 2 2 a.a.a.a.a.a.2 2 s.9 s.2 9 2 9 2 9 2 R                         "
+	"                              V.+ + + + 9 1 NX            k.. o + + + + NX            NX+ + + X # O "
+	"V.            k.o o o + 1 # k..           NX+ O # & & 1 @ 5 5 5 < 5 < g 5 a a ; ; ; V.X .         "
+	"kX+ O + # @ @ < @ 0 @ 5 @ < a @ a < ; a 0  #           %XO X # & @ ; ; ; a : = a s a e = = k : k k "
+	"g e > s r f e.5                                       NX= 0 s p M "
+	"o.b.o.b.m.b.n.o.5.5.n.Z.t.t.Z.Z.t.t.Z.5.Z.Z.t.",
+	"gXgXgXgXgXgXgXgX l.SXSXl.f.P "
+	"<X<X<X,X<XgX<XgXhXhXgX-X-XgXgX-XgXhXhXgXhXhXgXgXgXhXhXgX<X@X,X,X1X,X1X,X@X,X,X,X,X).,X<X7X-X,XhX<X,"
+	"X<X#X<X).#X).#X).OXOX#X).).@X-X<X,X<X<X@X<X<X#X,X@X@X#X#X#X,X@X).=X-X=X^.I.I.I.I.*XI.I.I.I.I.I././"
+	".I.I.I.I.^./.^.I./.P././.^./.Q.T.T./.P./"
+	".T.T.T.J.T.^.T.T.^.T.^.(.^.T.^.T.^.T.^.^.^.P.J.P.P.^.P.^.P.J.J.Y.J.J.J.J.J.J.J.T.G T.Q.XXQ.Q.G "
+	"Q.Q.R.R.Q.Q.R.Q.R.R.Q.R.G G H H H H H G H H G H G H G H H H H H J H J T T T N P J E P T T J A E A A "
+	"A S A A F F F K F S S T S S S S S f f S D ( > S f f f f f f f T f f f T ( f d d g f f f f f f h f > "
+	"h k h > h r h h k h h h h k s k g s e s e e s w q q w w q e w w w y w y w e p p p y p v v c l c l c "
+	"v c c v c v v m v z l x m b l g x t 4 8 7 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 7 7 6 7 f.o.g.M 4.M m M v M "
+	"m v v m m f.f.f.i f.a.a.s.a.a.a.a.2 8 s.2 s.9 9 2 s.2 2 9 2 a.                                     "
+	"                  k.o X + # 1 1 NX            iX. o o + + + NX            k.o X + # O # NX          "
+	"  k.. + + + + 1 V..            X + O # @ 5 5 a < g a a 5 a < 5 ; @ @ ; k.X           e.+ o # # # < "
+	"a < < @ @ 5 @ a < ; 0 a < 0 V.&           e.o o O O & & ; ; = s s = : f e k : f e > 0 s > e k s s "
+	"4.%                                       e.@ = a s M M "
+	"b.b.b.n.n.5.5.5.5.t.Z.Z.Z.Z.t.Z.Z.Z.t.Z.Z.5.",
+	"gXgXgXgXgXgXhXgXgXP l.l.8 4 "
+	"<X-X<X,X<XhXgX-XgXgXgX-XgXgXgXgXgX-XgXgX-XgXhXgXhXgXgXgX-X-X).,X<X@X,X@X,X,X@X@X,X@X,X).,XhX-X,X<"
+	"XhXhX>X<X#X#X(.).#X#X).#X(.OX#XuX-X,X,X<X@X<X#X#X<X#X<X#X<X).).).-X=X=X)./"
+	".I.I.I.I.I.I.I.I.=XI.I.I.I.I.I./.I./.^././.I.P.U.^.U.^.U.T.^./"
+	".P.T.U.^.P.T.T.T.T.T.T.T.J.T.T.^.^.!.^.^.^.T.^.^.^.J.P.^.P.P.P.Y.P.J.J.J.J.J.J.J.J.G J.G "
+	"J.Q.Q.L.Q.Q.Q.Q.R.Q.R.R.T.R.R.R.R.R.G G H R.H H H H H H H H H H H G H H H H H H S P T T P T _ P A _ "
+	"S _ S _ E J A A J E _ A F K J S S S S S S S S D E S ( D D D f S f f f f f f f f f f f f : f f f k f "
+	"f f f h f f k f h h h j h h | h h | h k g k c k w s s w e w q q w w w w w w w i e w p w y w p p p p "
+	"v c v p c c c v b l l c v v M z m v z c b l x s l y l z x 3 6 6 6 6 6 6 6 6 6 6 6 6 7 6 7 a.k.b.M M "
+	"M g.M g.m m v v M v m g.z f.z f.u a.a.a.a.a.a.s.2 9 s.2 2 2 l.l.k.l.k.l.k.CXV.k.V.k.V.k. "
+	"k.k.iXk.k.k.k. %XV.k.  CX            k.o o + + # < NX            k.o o + # # + NX.           k.o "
+	"+ o # & = NX            k.o o + + 1 1 V..           V.o o O # @ & < 5 @ < 5 a 5 a 5 5 = & @ ; V.X   "
+	"        V.o o + # @ < 5 0 g < @ 0 < @ d a < g a @ V.&           k.o o O # ; & ; a a = = : ; = : f = "
+	"e > s b V.e.e.V.V.V.C.BXNXV.e.NXV.e.k.kXV.e.V. e.V.k.V.V.e.V.NX  "
+	"V.C.V.C.G.C.n.b.n.5.5.5.Z.t.Z.Z.Z.t.t.Z.t.Z.t.Z.Z.t.",
+	"gXgXgXgXgXgXgXgXgXgX_ d J "
+	"-X-X<X<X,X<XgX-XgXgX<XgX-XgX-XgX-XgX-XhXgXgXgXgXgX-XgX-XgXgXgXhX,X@X<X@X,X,X@X,X,X@X,X).-X,X-X-X,"
+	"X7X,X-X#X<X<X<X#X#X(.(.#X(.#X#X).@X,X<X-X-X-X<X-X<X<X<X#X-X#X<X).).=X-X/"
+	".-X=XI.=X=XI.*XI.I.I.^.I.=XI.I.I.I.=XI.=XI.I./.P.P././.T.^././.^.P./.^././.P.J.U.P.P.U.P.^./"
+	".^.^.T.^.^.^.^.^.T.).^.^.P.P.P.P.P.P.J.J.Y.J.J.J.J.J.J.J.G G G G "
+	"XXQ.W.Q./.Q.R.R.R.R.R.~.R.T.~.T.R.R.H E.H H H R.H H H H H H G G H H H H H H L G A E T J T S S _ J T "
+	"S A S A S _ E J J A F F F F S f f S S > S D S S > S ( : D f f D > ( f f E : ( d T f f f f f f f f f "
+	"f f f f > h h > h h h h | j | |  .;.c k c k s c p s c p y w w i w w i w w q w w w p p p p p p p c p "
+	"c p c v c v c v v v v v v v v v v z c b s l s x l l l t q g t t 8 8 6 6 6 6 6 6 6 6 6 6 z o.4.g.m M "
+	"4.m o.b.4.g.M v v g.v f.f.f.f.f.f.s.a.a.s.2 2 a.2 2 s.9 8 k.* # & & & NX1 1 1 + + X o o o o o o o o "
+	"o o o o o . o k.            e.o + o + # 1 NX            k.o X X # # @ NX            k.o o O O O @ "
+	"NX             o o + + + # V..           k.o X # & & a @ @ g a 5 < < g @ ; @ ; ; a e.X            "
+	"o O + # @ < < 0 5 5 < < a a a g ; a ; d  &            o o + & @ ; ; : 0 k ; = s : : = : f s a 4.R "
+	"& & & & & BXa k 0 = # O # O O + O # O O + # O # + # E ^ & & X & & E "
+	"V.o.X.4.5.5.o.t.Z.Z.t.Z.Z.Z.Z.t.Z.Z.t.t.5.",
+	"gXgXgXgX7XgXgXgXgX-X-X-X-XgX<X<X,X,X,XhXgXgXgXgXgXgXgXgXgX-XgXgXgXgX-XgXgXgXgXgXgXgX-XgXhX,X,X@X,X,"
+	"X1XhX,X<X,X,X,X,X).,X,X-X,X,X,X,X).<X#X).#X#X#X(.(.(.#X).).-X<X,X<X<X#X<X#X(.#X=X#X<X<X#X=X^.^.=X/"
+	".I.I.I.I.I.I.I.I.=XI.=XI.I.I.=XI.I.I.I.I.^.^.T.U.T.P.^.U.^.^.U./.I.U./.I./"
+	".U.P.U.^.P.T.J.T.^.^.T.^.^.T.^.T.^.^.^.J.P.P.P.P.P.P.P.J.J.J.J.J.G J.J.C J.C G "
+	"J.Q.W.Q./.Q.Q.Q./.Q.Q.Q.T.Q.R.R.R.R.R.H H R.H H R.R.H H H H T.G L G H H H H H G H J H J A _ T S T T "
+	"E J A E A A J A A F A F F F F A S S D S D D S E > S > D > S D S > E > ( S f f ( f > h f f f f f f f "
+	"f f f > k f h k k h h h h | h | Q  .;.k c k b c s k p y p w w w w i e w y y w i e p p p e p p p p p "
+	"v c v p c v v v c c v v v v v v v v g.v c c s p l l l l s g q g x f.h.f.f.f.8 7 6 6 6 7 7 M M m M M "
+	"m o.g.4.b.b.o.M M M M v M g.f.f.z x a.a.a.a.a.a.a.2 2 a.s.8            iX1 1 + 1 + + + + o o o o o "
+	"o o X o o o o o k.            kXo o + + @ & NX            V.o o X # & # CX            NXo o O # & @ "
+	"NX            k.o o o X # # NX.           %XO o X # & @ a 5 a 5 g a a g @ ; = ; ; a e.X           "
+	"V.o o O # @ a < < q a a a a @ d a a a ; ;  &           V.O o O # & ; ; s : = f : : a k k : k a k "
+	"1.%           NXr = ; = # # O # # O O # O # O # # # # @ k T           & V. "
+	".o.o.5.5.5.Z.i.S.t.t.Z.Z.t.Z.Z.Z.G.Z.5.",
+	"gXgXgXgXgXgXgXgX-XgX_ 5 _ "
+	"<XhXgX,X<X,XhX-XgX<XgXgX-XgX-XgXgXgXgXgXgXgXgX-XgXgXgXgXgXgXgXhX,X,X@X@X,XhXhX#X#X@X@X).-X,X-X-"
+	"XhXgX,XgX,X>X<X#X<X-X).#X#X#X<X#X#X,X-X-X<X-X<X-X<X-X<X,X,X<X#X,X=X-X=X/./"
+	".=X=XI.=XI.=X=XI.I.I.I.I.I.=XI.I.I.I.I.I.I.P.P.U.P.U./.U././.I.I.P.I.I.I.I.P.U.T.T.U.^.P./.P./.T.T./"
+	".^.T.T.^.T.T.P.P.P.P.P.P.P.J.J.Y.J.J.P.J.J.J.G G G J.G G L.Q.XXQ.Q.Q.Q.Q.T.R.R.Q.T.Q.R.T.Q.Q.H R.H "
+	"E.H H H R.H H G L H H H G H H H H H H H H H H H J _ S _ S T _ J A A _ F ! F F F F _ K S S D S D S D "
+	"f D S D S S D D f f E > E : ( > S f > S > > , k h > k f f > f f f h k > h k h h j h h | | h | j k c "
+	"k s k w O.O.p w q w i w w y w w y w w e p p p p p p M M v p p v c v M c v v v M v v v v v v z z v c "
+	"p c c l u z g q q s f.f.d.f.f.f.f.f.f.z 8 7 ) g.4.o.4.b.o.b.4.b.o.g.4.b.b.g.M v m m g.f.f.f.f.i "
+	"a.a.2 a.2 s.2 2 9 x R           k.1 1 # + + + + o + + + + X + + X + O + + o NX            k.. o X * "
+	"@ 9 NX            e.o o + & @ 1 NX            %XO o O O # # NX            k.o o + O # # V..         "
+	"  V.o o X # # & @ @ a < a 5 5 @ ; ; ; @ ; @ V.X            o o X # # < a < g < < 5 < @ 0 a @ d a ; "
+	"V.&           %XO o O O # ; ; ; ; > ; f r : g f = > a f 4.%           iX0 a = = = # @ = # = @ @ @ = "
+	"= = = = = 0 ( T           & C. . . .o.O.5.t.Z.t.Z.Z.i.t.S.Z.t.t.Z.5.Z.",
+	"hXgX).-XgX-XgX).-XR k.  _ "
+	"-XhXgX-X-XgXgX-XgXgX-XgXgXgX<XgXgXgXgXgXgX-XgXgXgXgXgXgX-XgX,X<X@X<X,X@X,X<X#X(.<X-X-X#X,X,XhX<"
+	"XgXhX,X<X<X<X<X#X#X>X+X-X).@X#X#X-X<X-X<X<X-X<X<X<X<X#X<X(.<X-X=X=X=X=X/"
+	".=XI.I.I.I.I.I.I.=XI.^.=XI.I.I.I.I.I.I.I.I.I.I.I.U.P.U./.P./.U.I.P.P.P.I.I.P./"
+	".^.^.U.P.T.T.^.T.T.T.^.T.^.^.(.T.^.I.P.P.P.P.T.P.P.L.P.L.J.P.P.J.G R.G J.G "
+	"J.T.L.W.Q.Q.Q.Q.W.T.!.Q.Q.T.T.Q.R.~.Q.Q.R.E.R.R.H ~.H H H H H H H H H H H H H H H H H H H H H H F J "
+	"F E A _ E _ A F E F F _ F F F F D S : D S D S D S ( S S S > > D D > S f D f > f > > > > > > k h h h "
+	"j h k k k f r  .h  .| | |  . ...| | | h  .j k j p k p O.O.p i w i e w i w y y y w p p p p p p p p v "
+	"p M p v c v v v v c v v v v v v u v v v v v c p p c k c p s k k k c j j f.f.f.d.f.z f.u v "
+	"b.o.b.4.b.o.b.4.b.b.o.m 4.b.M M v g.4.b.b.g.f.f.a.f.f.a.a.a.a.a.a.a.2 a.            # 1 1 + # + 1 "
+	"# + + # + # # + # # # O & + NX            k.o o + # @ < NX            e.o X X & @ @ NX            "
+	"iXo X X # @ & NX            e.o X X X & & V..           e.o X X O @ @ @ ; < < 5 0 ; a ; ; ; ; ; ; "
+	"V.X           k.X X + # @ a a < g g < a a a a a ; f d a V.&           e.o o O & ; = : : g : = , g = "
+	": , e > : k 4.%           k.@ = ; = ; = = = = = 0 = e 0 0 0 e e : = / T           & e.> k  "
+	".o.X.Z.Z.t.Z.Z.i.Z.S.t.i.Z.Z.t.Z.t.",
+	"hXgXgX-X).gXgXgX l.SXSXl.8 P "
+	"-X<X-X-X-XgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgX-X<X#X<X@X<X@X).#X<X).#X<X#X-X<X-X<X<X<X,"
+	"X7X<X<X<X<X=X#X-X+X<X>X).#X-X-X<X-X-X<X-X<X).#X<X-X-X>X-X=X=X=X=X=XI.I.I.=XI.I.=XI.I.I.I.I.I.I.I.I."
+	"I.I.I.I.I.I.I.I.U./.P.U.P.I.I.U./.I.I.I./././.P./.^./.T.P.T.T.^./.T.^.Q.T.T.^./"
+	".P.^.U.P.P.P.P.P.P.J.P.P.J.P.J.J.J.L.G J.J.G Q.Q.Q.Q.Q.W.T.Q.T.Q.T.Q.Q.R.Q.T.Q.Q.Q.G H H H H R.H "
+	"R.H H H H H H H E.H E.H H H H H H K K H F ' K K F F F A A A F F F F _ K F K A E S ( D f S > D S > D "
+	"D D S S E : > f h f ( f > : > S > h > j h k j h h h h h  .| | | | | |  . .| | | | |  .j n c c c p "
+	"O.p O.y w w w w w y w p w e p p p p p p y p v M p v v p v M v v v v v v v v v g.v g.z z v v  . . .| "
+	"j j h |  . .j j  .f.f.f.g.f.u v g.b.4.o.b.o.o.b.5.4.o.4.b.b.b.b.4.m M v g.g.g.m g.f.f.f.8 a.2 a.a.2 "
+	"2 a.8 x             + + + # 1 # 1 1 1 # < 1 < # & 1 & @ @ @ & NX            e.o o + + # @ NX      "
+	"      kXo X + & & @ BX            k.X O & & & ; NX            e.o X X O & 5 NX.           k.o o # & "
+	"@ % @ % ; < g a @ a ; ; a ; a ; V.X           e.o o O & & < a g q x 0 g a a a d a a d ; e.&         "
+	"  k.X X O & = ; ; f a > : : : > f f : f k f 4.%           V.@ = @ = 0 0 g k s k k s k k k k k > s k "
+	"/ T           & 4.= k h  .o.5.5.Z.Z.i.Z.Z.t.Z.Z.Z.t.Z.Z.t.",
+	"-X-X<XgX).,X).8 v.SXSXv.v.h.a.3 "
+	"-X-X-X-XgX-X-XgXgXgXgXgXgXgXgXgX-XgXgXgXgXgXgX-XgXgXgXgX-X<X).).+X<X<X).>X(.=X@X<X-X<X,X<X<X<XhX,X<"
+	"X>X#X-X=X).)./"
+	".#X#X#X).>X<X-X<X<X-X-X<X).-X<X>X<X=X=X=X=X-X=X=XI.=XI.I.I.=XI.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I."
+	"U.P.P./.P.U.P.I.I.P.I./.I./.I.^.P./.^././.J./.T./.^.^.^.^./.(.^.I.U.P.P.U.P.P.P.J.P.P.J.P.P.L.T.J.G "
+	"R.R.R.J.Q./.Q.W./.Q.Q.Q.!.T.!.T.!.T.!.T.L.XXL.J R.R.G G H G H H R.H H R.H H H H H H H H E.H H H E.H "
+	"F K F K ' J K F F _ F E F F K F F F S S f D S D ( D > S S > > S ( > D > ( S > ( > : : > : > f h > h "
+	"h j h h  .h  .|  .| ..j  .| ..|  ... .| |  .| p j p k p p O.p O.w w w w y w i p w p p p r p p p y z "
+	"p p v M v p v v c v v v v v v v v v v v f.v f.v p  . .h |  . . .h  . .j h  .v g.f.f.f.g.v "
+	"b.o.b.o.o.b.o.4.b.b.o.b.M M b.) g.b.M g.b.b.g.g.g.g.f.a.f.d.a.a.2 a.2 8 2 8            k.+ + + # 1 "
+	"1 1 < < < < < < < @ < < & @ % @ NX            kXo X + & & 5 NX            e.o + O # @ @ NX          "
+	". kXo X O & - ; NX            %Xo o X O # & V..           e.o X X # & @ ; a < < a a d @ ; ; ; ; a ; "
+	"V.X           k.o o O # @ ; 0 5 g g 0 g 5 a 5 g ; d ; ; e.&           kXo o O & ; ; : f : f > k : > "
+	": k : > : f e.%           e.# # @ @ a g s p k M c c j n M p k r k h 4.T           % ) - = k  "
+	".X.5.5.n.5.Z.t.S.Z.i.Z.t.t.D.Z.Z.",
+	"<XgXgXhXhX#X l.UXSXv.s.j.l.l. 5 "
+	"<X<X-XgXgXgXgXgX-XgXgXgXgXgXgXgXgXgXgXgXgXgXgX-XgXgXgX-X-X>X#X#X@X).-X).<X).<X).,X-X-X<X<X<X<X-X<X<"
+	"X;X>X>X;X>X=X>X<X/"
+	".<X<X=X<X<X<X=X-X-X>X<X=X-X<X=X=X=X=X=X=X=X=XI.I.I.=XI.=XI.I.=XI.=XI.I.I.I.I.I.^.I.I.P.I.I.P.P.P.U."
+	"U.P.P.I.P.I.I.I./.I./.I.I./.T.U.T.T./.T.T.T.T.Q././.^.^./"
+	".P.P.P.P.P.P.U.P.J.Y.J.P.J.Q.P.L.R.L.J.L.J.R.Q.W.Q.T.Q.Q.T.!.T.T.!.T.T.R.T.T.Q.G Q.E.G H G R.G G G "
+	"H L H H H R.H R.H ~.H R.K K H H H H K F K ' F K K F K F K J F ' F F K F K A ( S D ( ( ( : D f D S D "
+	"> S > > f > f ( : : D : : : : > > > k j h h j h  .h  .|  . . .|  ... .|  ...h | | ..j M  .p k O.p "
+	"O.p w i w i w p p w y p w p p p p p p p p v p v p v z v v v v v v m v v v f.v v v v  . . . . . . .h "
+	"h  . .| j j j  .v f.d.g.u f.g.4.b.4.5.b.4.b.b.o.b.4.4.b.4.b.o.M g.M b.b.b.b.g.b.g.f.d.f.a.8 a.8 2 "
+	"s.a.8 x R            o + + + @ 1 < q < 5 q 5 g < 5 d a a 0 a a NX            k.o X + & 1 < NX      "
+	"    . kXo X + & & @ V.V.NXiXNXk.e./ o X O # & ; NX            V.o X o O # & V..           k.o X + & "
+	"& @ 5 g a a a ; ; a @ a ; ; ; a V.X           e.o o # # O = ; < w q 5 a a g a : ; f : ;  &         "
+	"  e.O O O O & ; ; ; a > a > > : f > : > , : 8.%           NX^ ) / ) "
+	"C.e.C.V.C.C.V.C.C.C.C.e.e.C.e.C.BXT           &  = = e j X.4.5.5.5.t.5.5.Z.t.t.S.Z.Z.i.Z.",
+	"hX-X-XgX+X l.zXV.l.3 5 x  l.V. d "
+	"XX,XgXgXgXgXgXgXgXgXgXgXgXgXgX-XgXgXhXhXgXhXhXhX,X<X,X#X-X(.#X-X<X#X=X@X#X-X<X<X<X<X<X<X<X<X,X-X<X>"
+	"X>X>X>X*X=X;X=X=X=X=X<X-X<X<X<X=X<X<X>X<X<X=X=X<X=X=X=X=X/.=X=X=X}.I.=X/.I.=XI.I.&X/"
+	".I.I.I.I.^.I.I.P.I.I.I.P.P.P.U.P.U.P.I.P.I.I.I./.I./.I.I./.^./.T.^.T./.T.T.^.^././././"
+	".^.P.U.P.P.U.P.P.P.L.P.J.J.P.L.L.L.T.R.L.J.Q.J.Q.W.Q.Q.Q.Q.Q.Q.W.Q.^.T.Q.T.Q.Q.Q.Q.Q.V G Q.V G G G "
+	"G J N G L G J G H H E.H H E.H H E.H H ' F ' F F ' H _ K K K K F H ' F F F ' F ( D D E > f ( D D E > "
+	"> > D D S > h S f : : > : - , - > r > h h j h h  .| h  .| |  . .|  .| .. .| ..h | | | j k k p o.p "
+	"O.p O.w w w w w w y w p p p w p p O.p p p p p v v v v z v v z v v v v v v v v p v M p .. .k  . . . "
+	".j  .h  .| | j j h n f.f.g.f.g.o.b.o.b.4.b.o.b.o.b.4.o.o.b.b.4.o.M ) "
+	"g.b.b.h.b.b.g.g.b.f.f.f.a.a.a.2 a.8 x )             o + + 1 1 < g 5 5 q x 1 g g g f g a g d 5 NX  "
+	"          kXo o + 9 & & NX            V.o X # # @ ; d ; & & $ O O X X & O & : : NX            NX. X "
+	"O O & & V..           NXo X O & @ & 0 d a a ; a ; a @ a ; a ; ; V.X            X X O O # ; @ ; f s "
+	"q a d % : f ; f ; : V.&           %XO O + @ = ; f f f , s > > : f f > > : >  %           & & % % & "
+	"% & % & % & % % & % % & % & % & % .           & ^ & ; > h o.o.5.5.5.n.5.5.5.5.5.5.t.Z.Z.D.",
+	"gXhX<XR   x  3 g NXVX % d 4 5 R d "
+	",XgXgXgXgXgXgXgXgXhXhXgXhXgXgXgXgX,X<XhXhXhXhX<X<X#X/.#X=X/"
+	".-X).<X<X<X<X(.(.<X<X<X<X<X<X<X,X,X<X>X*X>X>X:X;X;X;X;X=X<X-X<X<X<X<X<X=X<X<X=X<X=X=X=X=X=X=X=X=X&"
+	"XI.}.}.}.&X&XI.I.I.I./.&XI.I.I.I.I.I.I.I.P.I.Y.J.L.U.P.U.P.U.P.I.I.I.I.I././.^././.P.T././.T.T.T././"
+	"./.I.^.I././.U.P.P./.P.P.P.U.P.P.P.P.L.L.J.L.U.L.Q.L.L.Q.Q.'.W.'.Q././"
+	".Q.L.Q.W.Q.W.Q.T.R.XXQ.Q.E.E.G G E.Q.G J J L N N S F S F J H H H R.H H E.H H ' K F K K ' K K K K "
+	"E.K K K F K H K J A D S ( S ( D ( f ( ( ( S D f > > ( > > > > > : : : : = , > > k h h h | r | ..|  "
+	"..... ... . . ... .2.| | | | j p  .p p O.p O.p i i w i i w p w w w p p p p p p p p u v p p v p z v "
+	"v m v z v v m v v b j o. . . .M O. .k .. . . .h  .j j |  .;.j v f.f.g.M "
+	"b.o.5.o.b.o.b.b.4.4.b.b.4.4.4.o.) 4.o.b.b.b.b.b.b.g.b.g.m f.a.a.a.a.a.a.i z ) R         .  o + # # "
+	"1 < w 2 g t a g g g g f d a f a g NX            e.o o # # @ 5 NX             X X O & & ; ; ; ; ; & "
+	"O O O X O & & % % CX             o X + O & # NX.            o X + # & @ @ a @ : ; a a g ; = a : g "
+	"s V.X           e.o o O @ $ = ; = ; : = d : : : f : : d f e.&           e.o O O & $ ; f ; > f : : > "
+	"> > > f D > > e.%                                                                   & ^ O = e h "
+	"..5.5.5.5.5.5.Z.n.5.5.5.5.O.5.5.",
+	"<XgXgX<X<XgXgX<XT CXIXUXVX P "
+	"@X,X<X<X<XgXgXgX<XhX,X-X-XhX@XhXuXhXhXgXgXhXCXhXhXhX@X<X<X(.#X(.<X-X).(.<X).#X-X<X,X<X<X>X<X<X<X<X<"
+	"X>X>X>X>X>X;X;X;X=X;X;X&X=X<X<X<X<X<X<X<X<X=X<X=X=X=X=X=X<X=X=XI.&X}.}.;X}.&XI.I.I.I.=XI.I.&XP.I.I."
+	"P.P.I.Y.P.P.J.L.P.P.L.U.U.I.I.I.=XI./.I.&XI.I.I.&X/.U.^.P.^.T./././././././.^.U./"
+	".P.P.U.P.U.P.P.P.J.P.L.P.L.L./.L.U.L.Q.XXL.W.W.Q.Q.Q.W.XXQ.Q.Q.Q.E.Q.Q.Q.E.E.G Q.XXQ.G G R.G G J V "
+	"G L G S S J F F K K F H R.R.H H J K H ' K F F K K F K K K F H K ' H H K F D ( : D D f D ( D D ( ( ( "
+	"( > ( > > : > : : > : , : : : k > > > r h r  .h | | | .. .|  .r  ... .| | |  .| |  .| M  .O.p o.p "
+	"O.O.p u p p p p p p p p p p p p p o.p p v v v v v v v g.z v v v v v c 2.>.>. . . .p p  . . . . . . "
+	". .j  .| h  .| ..p p M v b.b.5.b.o.b.o.o.o.b.o.4.g.b.4.4.M M M b.g.g.b.b.b.b.b.g.4.g.g.f.a.a.a.8 z "
+	"l c m  .          + O + 9 < < g 2 g g g g f f g g g f g a a BX* & & & * & V.o X # & & a NX& * & & "
+	"& * NXo X + & @ % % ; % & & O & & O & & & : @ NX& * & & & * e.o X O # & & NX& & & * & * NXo X O O @ "
+	"@ ; a ; f a a ; a ; a f ; a = V.: $ * & & * V.o o O O = = - = : = - : - : - : ; : : ; e.P * & & & * "
+	"NX. . O # # = ; : f > > > k k > > : > : > 4.R O & & & * & X O & & O & * & * & * & O O & & O & * X & "
+	"& * & * * & E ^ = = e h  .5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
+	"gXgX<XgXgX<X<XgXT k.VXCXNX T "
+	",X,X<X<X,X<X<X<X<X,X,X).-X@XhXhXhXhXhXhX<XhXhXhXiXhX<X+X(.=X/"
+	".#X=X>X).<X).<X<X<X<X<X<X<X=X<X>X>X*X;X>X>X*X;X*X;X>X;X>X&X=X;X=X>X=X=X=X=X=X>X*X<X*X=X=X=X=X*X=X=X*"
+	"XI.;X}.;X|.}.}.;XI.&X&XI.I.I.I.U.I.Y.P.I.P.P.U.Y.L.J.L.P.P.P.U.P.I.I.I.I.I.I./"
+	".&X&XI.&XI.P.U.U.U.U.U.I./.U.U./././.U.U.U.U.P.P.U.U.J.U.P.U.U.T.L.T.L.U.L./.Q.Q.XXL.XXXX/"
+	".XX'.Q.XXXXQ.XX'.Q.Q.Q.'.Q.'.Q.R.G Q.I G G J _ _ N N G J J S A K K F K ' K K K H ' K ' F ' _ ' K K "
+	"~._ K H ' K K H K K K A ( D D f ( W ( f ( ( f k D ( ( ( ( D > D : , : : : : : , > h > h > h | | r | "
+	"| r h r |  ...|  ... .| | | | | ;.2. .M p O.o.O.o.o.O.O.o.o.O.O.p O.O.O.o.O.O.o.o.o.o.v u g.p v u z "
+	"v v v v f.v v  .>.2.:.>...p j .. . . . . ...k  . .| j ;. .j | | j M  "
+	".o.o.o.b.o.b.o.b.4.b.o.4.b.4.4.b.4.o.) o.b.b.b.b.g.b.b.b.b.g.g.b.M d.a.a.f.m v v )             o "
+	"o # # < 5 s q x l g f g g g f g g g f d BX; % % % % ; k.X X O # @ < CX% % % % % % V.X O # & & ; : ; "
+	"; : % & & & & % & ; d : CX% % % % N ; NXo X X O & = NXS 5 N ; % % e.o o # # & @ = @ @ @ ; = a a ; a "
+	"a ; g f V.E 4 % d N ; e.O o O O $ ; = : : : ; : : > : f : f f f e. d % 5 N ; iX. o o O - - : k f : "
+	"k > : : > > > ( > f e. % % 5 N ; % 4 N % % N % 4 4 : % % % 5 N % N % % 4 P % P : d N ; % R / # - > "
+	"h o.o.5.n.5.n.5.5.Z.5.5.5.o.5.5.5.",
+	"gX<XgXkX 3 8 7 3 3  k. 3 9 9 5 % % "
+	",X,X,XhX1X@X,X@X@X1X1X>X>X@XhXuXhXhXhXhXhX,X=X-X/"
+	".(.).(.=X=X-X#X-X).>X<X<X>X>X>X>X>X>X>X>X>X=X>X;X;X>X*X>X&X;X;X*X*X;X}.;X;X=X>X=X=X<X=X*X&X=X&XI.&X&"
+	"X&X}.}.}.}.}.;X}.|.}.&XI.&XI.&XI.U.U.P.Y.U.Y.P.P.Y.J.J.K.J.L.J.P.L.I.I.I.I.I./.I.I.I./.&XI.&X/"
+	".I.U.U.U.U.&X/.U.I.}.U.U.U.U.U.U.U.U.U.P.U.U.U./.U.L.U.U.Q.L.Q./"
+	".XXU.W.Q.XXQ.'.Q.Q.'.W.Q.XXQ.Q.XXQ.Q.Q.Q.'.E.Q.Q.U I _ I _ I I _ _ U J S A J _ ' K _ K K K K ' F K "
+	"K K R R R ' K _ K K K H F K K K K H A D W ( D ( ( D ( D D f ( ( D k ( h ( > > : : : : : : : , k > > "
+	"> h > | | r h | h r h | | | .. ...| | ..|  .|  .,.2.2.o.o.O.O.p o.M o.v p "
+	"o.o.O.o.o.O.o.O.o.o.O.O.o.o.v v v v v v z z v v v n >.>.>.2.>.>.:. .o. . .p  . . . . . . .h  . .h | "
+	"j  .j n o.o.o.o.o.o.b.o.o.b.o.4.b.4.4.o.4.4.M n g.b.g.b.b.h.b.b.b.b.b.b.g.M g.f.f.M g.v v g.       "
+	"     X X # @ < q x g g k l g g f f b f k f g g BXP d P S T T iXo O O @ @ a NXT T T T T T e.X X O & "
+	"; % d : d T ; & ; : % : % d d ; BXT T T T T S NX. X # & ; ; BXT T T T T T NXo + O # # # & ; = ; g g "
+	"a a ; 0 ; ; : ; V.R T d T d S V.o o O & $ = = = : , - : : : : : f f : d V.R S S P d N NX. o O $ ; : "
+	": > : > g > > f h > f W > > e. N S P T T T T S 4 T T P S S P T d S P d T T T d T T d P T d N P d  "
+	") O = > j X.5.5.5.5.C.n.Z.5.5.5.5.4.5.5.5.",
+	"gX<X<XgXXXl.l.SXl.l.2 2 2 8 l.l.l.d "
+	"E.<X,X,X@X@X$X@XhX@X>X>X;X;X:XvX>X>X@X@XhXuX<X<X=X(.(.>X(.-X).-X<X>X<X<X<X>X>X+X;X;X=X>X:X<X*X>X;X;"
+	"X;X;X;X;X;X;X;X;X}.;X;X;X;X;X;X=X>X*X>X=X&X=X&X/"
+	".I.&XU.;X;X}.&X}.}.}.}.|.&X=X&XI.U.U.U.I.P.U.L.P.P.U.J.L.J.J.L.Y.L.Y.P.I./"
+	".I.I.=X&XI.I.&XI.I.&XI.I.I.I.+X/.I./.}./.&X/.U.U.U.U.U.U.U./.L.P.P.P.U./.U.U.Q.L./"
+	".L.U.L.L.W.'.XXQ.XXQ.'.W.'.Q.W.'.'.Q.Q.Q.'.Q.Q._ V Q._ I I I I '.  U _ U _ _ _ S F F K K K K K F "
+	"' K ' ' R R R R R _ K E.K K K F F _ K K ' K ( ( D ( k D ( ( ( ( ( ( ( ( h h ( D : : > > : : , : , f "
+	"> > r h > h h | | | |  ...| h  .| .. . . . . .| | ;.;.;.1.1.Q o.M o.o.p O.b.O.O.p "
+	"o.o.o.o.o.o.o.o.o.o.o.o.o.v v v g.g.v g.f.v M 4.>.>.>.2.>.:.>.2. . .o.p .. . . . . . . . . . .2.| | "
+	"|  .n o.o.4.b.4.b.4.b.5.o.b.b.4.o.b.b.4.o.4.M b.b.b.b.b.b.b.l.b.b.b.g.4.b.m g.M g.v v m ) R         "
+	".  X + O # < 5 g g b g ( g b g g g g g f g g CX% % % % 4 d e.X O $ - & : NX% % % % % % NXX X & & ; "
+	"; f d ; : ; : d ; ; S ; : d : CX% % % d 4 ; NXo X X O & & NXT d % % % % kXo o X # & ; & ; = f ; a f "
+	"g a f ; a a : V.E 4 % % % % NXo . O O = $ : = : : : > : : S : : f : : e.R 4 % % 4 ; iXo X O & ; : > "
+	"D ( > D D > h D > h h > k e.^ % % % % % % % % % % % % ; % % % % % ; % % % % % S % % % : N ; % :  ^ "
+	"O : r h  .o.5.5.t.5.5.5.5.5.n.5.5.5.5.O.",
+	"<X<XgX<X-X@X l.SXSXzXl.l.v.l.a.4 "
+	"#X<X<X<X+X,X+X@X1XhX@X>X;X:X1X;X;X>X1X1X>X>X>X>X=X=X-X=X)./.>X#X>X+X>X+X>X;X X;X X;X "
+	"X>X*X<X*X>X:X>X;X*X;X;X;X;X;X;X*X;X;X;X;X;X;X;X;X>X;X*X=X/"
+	".&X&X&X}.;X}.&X;XU.|.}.}.}.;X}.}.&X&XI.;XI.I.U.U.L.U.P.Y.P.L.L.K.L.L.J.L.U.I.I.I.=X&X/./.&X&X/"
+	".&X&XI.I.&XI.I.&XU././.&XU./.+XU.U./.U.I.U.U.U././.L.U././.L.L.L.'.L.'.L.'.Q.W.Q.U.W./"
+	".XX'.XXW.Q.Q.Q.L.Q.Q.V Q._ '.L._ Q.'.I _ I I I I  U   U U  _ ' ' ' K ' K ' K K ' K ' R R R R ' "
+	"R _ ' ' K F F F ' K H ' F k D ( ( D ( h h h ( h > ( h ( Q h > > > : > > h : : : > > > h > h h > h h "
+	"| | | .. .....j  .|  ... .| | ;.| | ;.2.2.2.;.o.o.o.O.v o.p o.o.o.o.O.o.O.M o.O.O.o.o.o.o.o.f.v v "
+	"f.g.M n o.>.>.>.9.>.>.2.2. . .>.2.r  . . . . . .r  . . .;.| j ;. .j  .n "
+	"o.b.o.o.o.b.4.o.4.o.4.o.4.b.o.4.4.o.4.b.b.b.h.b.b.b.b.b.b.k.o.g.b.b.) 4.4.n ) Q ) 4.            X "
+	"O # & a g g f f f b g k f s s g k g g f BXT S d T T T kXo O & & : : BXT T T T d N k.X O O & ; ; : f "
+	": : T : E T : d f f f d BXT T d T d N NX. O O # ; ; NXT T T T T P V.o O O O & = ; ; @ a f a a k ) ) "
+	" ) ) ) BXR T T 4 T P iXo O O # $ = : : : : : > : : : > f f : f e.R E T d S P NXX o O $ : S D > ( h "
+	"D h D D D > #.W D > e. 4 d T T d NXNXNXNXNXNXiXNXNXNXNXNXNXBXNXNXNXNXNXNXNXNXNXNXNXBXNXBXBX( = = > "
+	"k O.5.O.n.5.5.5.t.n.5.5.5.5.X.4.5.",
+	"gXgX<XgXgX<X@X3 SXSXSXv.v.l.8 3 "
+	"1X<X<X<X<X+X+X@X@X@XhX@X1X;X;X;X;X1X;X>X1X>X>X>X|.>X>X>X>X+X>X+X+X>X>X>X+X;X+X>X|.;X;X|.>X>X:X>X;X>"
+	"X;X;X>X;X;X=X;X;X;X;X;X;X*X;X;X;X;X;X&X;X;X*X&X&X&XI.;XI.U.;X}.;X}.;X;X}.}.|.|.}.U.U.U.I.}.I.Y.U.Y."
+	"U.P.L.Y.J.J.L.L.J.L.U.U./.I././.&X/.I.I.I./.I.&X/.I.I./.U.>X&X/./.I.U.&XI.U.U./.{./.{./.{.{./"
+	".U.XXU.U.L./.XXL.XXXX'.'.L.XXXXL.XXQ.W.Q.W.'.XXQ._ E.XXXX'.XXXX_ XXI I I '.I I I I I U _ U R _  U "
+	"_ H ' ' K ' K ' K H ' _ R  _ R R ' R R R ' K J ' F H ' H K ( k h W ( D ( ( D ( W ( ( ( ( ( f > > > "
+	"h ( h h > : > h > r > r > > r r | | | |  . ...| .. ...| .. . .;. .;.| 2.2.2.2.2.2.o.o.o.o.o.o.O.p "
+	"o.o.M o.o.o.o.o.M o.O.o.o.o.v g.v v o.O. .>.>.>.>.>.2.:.>.>.2.>.>. . .M j  . . . . . . . .j  .;.j | "
+	"| ;.n o.4.o.5.b.o.o.b.4.4.b.4.4.4.4.4.M ) 4.4.b.b.b.b.b.b.b.b.b.b.b.4.b.4.4.b.) 4.) ) Q )  X X X X "
+	"X NXO + # @ a g g b g b f k b g BXBXCXCXCXCXBXVX4 4 T T T d e.O O O = - : BXP ; T d T 4 iXX O O & ; "
+	": E f : E f T f ( f f E S f f BXT T N T P 4 iXX X O & & ; NXT T d T d d V.o O O & @ = ; ; ; = f a k "
+	"V.%X      T T T S S 4 kXo o O $ & = : : : : : D : S : : : f : a e.R 4 S P T d NXo O O $ : : > "
+	"> D D h D D D W D D ;.D ;.e. S N d d P NXo O O O O O O $ O $ $ $ O O O $ O O O $ O $ = # O O O O & "
+	"- = > k  .5.5.5.n.5.5.n.5.5.5.5.5.5.5.5.",
+	"<XgXgXhXgX<X<XgX4 l.SXSXh.8 4 "
+	"-X<X<X<X<X1X>X1X+X$X@X@X@X;X;X;X;X;X>X>X;X>X1X+X;X>X;X>X>X>X>X+X;X+X>X>X>X$X>X>X "
+	"X;X|.$X;X>X=X>X>X;X;X;X&X*X>X;X;X;X>X*X;X;X*X;X}.;X;X;X&X*X;X;X&X&X&XU.;XU.;X}.}.U.;X}.}.}.;X}.}.|.}"
+	".}.U.&X}./.&XU.U.L.P.Y.J.V "
+	"J.K.L.L.L.U./.U.U./.U.I.I.&XI.&XI.I.I./.&X&XI.I.U.I./.U.=XU./.U./.U.}./././.{./.U./.U.{./.U.L././"
+	".'.XX'.L.XX'.Q./.W.XXQ.'.Q.XX'.Q.XXQ.XXG XXI XX_ I XXI XX'.I I I I I I I I  I  P  _ _ ' ' K ' ' "
+	"K K K ' ' R R R R R ! R ! _ ! _ _ F K ' K ' H ! ( h h k ( h W W h h W k W ( W h h > h h h h W ;.W : "
+	"= h > > r r > > r h h |  .| :.:. . ... . ... .| ;. .| ;. .;.2.2.2.2.2.2. .M o.o.M o.O.M "
+	"o.o.o.o.o.o.o.o.o.o.o.o.o.o.v o.O.O.4.>.3.>.>.>.>.>.>. .2.2.>.>. ... .j  .| | ;. .2.h  . .h ;. .j | "
+	" . .o.2.4.2.4.5.o.4.b.4.o.4.4.4.4.4.2.2.2.2.2.4.b.b.b.b.b.b.b.b.b.b.4.4.) 4.b.) 4.) 4.4.NXT T T S T "
+	"CX+ O # ; g g g b g b b g ) f CXE T T T E T E T T E T T T e.o O $ $ : : BXE T T T T T V.o O O & : S "
+	"f ( E f : ( E E f f E f d f CXT E T T T T iXo X O & & ; NXE T T E T E NXo X O O & @ ; : a ; a g g "
+	"V.^ T T E T E T T T E T T T iXo o O = $ : : , > : S S > f > : : : f ( V. E T T T T NXo O O = - > D "
+	"( ( > D D > ;.;.D D ;.D W e. T T T T T iXX X O O O O $ $ O $ $ O $ $ $ O = O = = O O - @ $ $ = = = "
+	": = k  .o.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
+	"hXhX<X<XgXgX<X<X<XP j.l.3 P "
+	"<X<X<X<X<X<X@X>X@X+X>X#X1X>X;X:X;X1X1X;X1X>X>X>X;X>X;X+X;X+X>X>X>X/"
+	".>X;X>X|.;X+X|.;X;X|.;X;X;X;X;X;X;X>X>X;X;X>X;X>X&X;X;X;X;X;X;X;X&X}.;X;X;X;X;X&X}.}.}.U.}.;X&X}.}.;"
+	"XU.}.&X}.}.}.{.|.{.U.U.&X}.&XU.L.Y.U.L.K.J.Y.B "
+	"J.L.U.U././.U.U./.U.+XU.I.U./.I.I.&XI./.&XI./.&XU.I./.I.}.U.U.U.U./.}././.{./.XXU.'./"
+	".U.U.L.'.XX'.'.XX'.'.'.Q.L.W.Q.W.XXQ.Q.XXQ.'._ '.I XXV XX_ I I I _ _ I I I I I I I U U I _ _ _ _ ' "
+	"' ' K E.' ' ' ' _ R R R R _ R _ R R R ! R R ' F F F K K ( ( W ( W ( W ( ( ( ( ( ( h ( ( > h h D k > "
+	"h > h > > > r > k > > h h h h  .| |  .| .... .:... .| :.;.;.2.;.;.2.2.2.>.2.2.4.4.o.M M o.o.M M o.M "
+	"o.o.M o.o.o.o.M o.o.X.o.O.O.o.>.>.>.>.>.>.1.>.2.>.>.:. . .>.2.>.1.2.;.;.2.2.;.2. . .2.2. .;.| j ;.n "
+	") 4.) 4.) 4.4.o.4.o.4.4.4.4.>.>.4.4.1.2.2.1.1.4.b.b.b.b.g.b.k.b.V.b.b.b.) 4.4.4.) ) NX% P 4 % 4 NXX "
+	"X # & d g f f b ( g k b g CX; ; N % 4 5 N ; N % 4 N d V.O O O = : S BX% % % T N 4 iXX O $ ; : : : f "
+	"f ( f ( f f f ( f f ( d BXN ; d 5 : 5 NXX o # & ; ; NXd 4 % % N ; e.o X X O & ; : g : h a a f V.E % "
+	"% 4 % % % N : 5 N % % V.o O O O = : = a f : > ( : : : > S f > : e.R % P : 4 N NXO O O $ : : ( > D W "
+	"( W D ;.D D ;.W ;.~ r. % T % d N NXO O O $ $ $ - , $ - , - - , - - - - : , : , , , , : , : , > > | "
+	" .X.5.5.5.5.5.5.5.5.n.5.5.5.5.5.5.",
+	"<X<X<XgX<XgX<XgX<X<X%XR "
+	"XX<X<X<X<X<X,X>X$X+X1X>X+X>X1X>X1X;X>X;X;X>X1X>X>X>X;X>X;X;X>X;X=X>X>X>X>X+X;X>X>X;X|.|.|.>X|.|.;X;"
+	"X|.;X;X>X;X;X&X;X;X&X;X;X*X;X*X;X;X;X;X*X;X.;X}.}.}.}.}..U.U.}.;X}.U.}.;X;X}.{.|.{.{.|.|.|.}.U.;"
+	"XU.U.U.Y.L.L.L.L.L.L.L.U.U.U./.U.U./.{.{./.U.{./.U.U.I.U.&X&XI.&X/.+XU.I.U.+XI.=XU.+XI./.}.}.+XU./"
+	".U.+X/.U.U.XX/.L.'.Q.XXL.'.Q.'.Q.XXL.'.W.Q.XXXXQ.'.XXXX'.Q.I E.'.'.I I I I I XXI I I  I I I I _  "
+	"_ _ _ K ! _ F _ F A F _ R R R R R R R R ! R E _ R ' _ _ ' ' H K k ( h h ( h h h ( ( h W h ( W > h D "
+	"h h h h h h h k : h > k > h k h > > ..| ;.| |  . . ... . ...2.,.1.1.1.1.1.2.2.2.2.2.Q 2.n "
+	"o.4.o.o.o.M o.M o.o.o.M v o.o.M o.o.X.o.o.O.X.>.3.>.>.>.>.>.>.>.>. .2.2.>.2.,.<.,.<.2.2.;.;.Q ;.|  "
+	".Q  .h  .| j ;. .W Q ) 2.1.4.4.4.4.4.4.4.4.4.1.4.4.>.1.>.9.2.1.1.>.1.9.8.9.b.b.g.b.b.o.V.4.b.) "
+	"4.4.4.q.NXT T S P T CXO # # @ a g b g b b s b b b CXT T T T T T T T T T T T T NXX O & - : > BXT T T "
+	"T T T NXX O O - ; : > : : f f T f f R ( f f E f BXT T T T T S V.o X O & ; ; BXE T P T d d NXo O O @ "
+	"= = ; : : f a s f V.^ T T T T T T T T T T T T NX. O O $ $ : ; f ( ( : D : D : f : ( S f V. T T T T "
+	"d iX. O O & : f D W D D h D h W ;.D W #.W ;.e. d T T ; T NX$ O $ $ - - - - , , , , Z > D Z Z Z Z , "
+	"> > > > > > > > > h |  .X. .>.5.5.5.5.Z.5.5.5.n.5.5.5.5.5.",
+	"<X<X<XgXgX<XgX<XhX<XgX<XgXgX<X<X<XhX>X+X>X@X+X>X1X@X+X;X:X;X:X;X1X;X>X>X>X1X;X>X>X>X>X=X;X>X>X|.;X>"
+	"X+X;X+X;X X;X;X "
+	"X|.|.;X;X;X;X;X;X>X*X;X;X>X;X;X*X;X;X;X&X;X;X}.;X.}.;X.}.}.}.}.{.}.}.}.}.}.}.;X}.}.|.}.{.|.}.|.{.|"
+	".}.&X&XU.}.U.L.L.Y.L.L.L.L.P.P.U./.L./.U.U.U././.{./.{./.{.{.U.+X&XU.&X/.U.=X+X&X&X/./.}.U.U./././"
+	".U.U.{.{./.{.XXU.XXU.U.{.'.'.XXXX'.I '.W.XXQ.XX'.Q.XX'.J I XX_ _ '.I _ _ I _ '.I I I I I U .U I I "
+	"I I U _ P  _ _ E _ F E _ E R R R R _ R R _ E R E R ! R _ ! ! ' _ K F h h h ( h h ( h h h W h ( k h "
+	"h h h h h h h h h h h > > r > h h > h r h | |  . .| | >.X. ...X.2.,.2.1.1.;.,.2.1.;.>.2.>.2.2.4. .Q "
+	"n o.o.o.M o.M b.M o.o.b.o.O.O.O.o.O.O.4.>.>.>.>.9.>.>.1.>.>.>.>.:.2.<.<.<.1.<.2.:.,.;.;.;.| ;.| 2.h "
+	"j ;.;. .| h W k Q 1.1.) / 1.Q 1.4.4.4.>.>.4.1.1.>.1.4.9.1.>.2.9.1.9.7.b.b.b.b.b.g.g.C.4.b.4.4.) "
+	"OXNXN ; % % d NXX O & ; g g b g b ( R k ( s CX4 4 N ; % ; N ; 5 % % ; N e.o O $ ; ; : BX% ; N 4 % % "
+	"e.X O $ $ : : f D h ( ( ( ^ ( ( R ( ( ( ( CXP % % % N 4 NXo O # & ; a NXP d ; N 4 N NXo X O # - ; ; "
+	"g > f k f f V.E % % P ; % ; N 4 N ; % : NXo O O = = , f f ( ( ( W : ( : : > : : : e.R S % % % % NXX "
+	"O O $ : > > > ;.> D W W #.D | #.W W ,.e.^ N % % % N NX$ O $ - - , > Z > @.Z D #.@.#.@.@.*.@.#.#.> | "
+	"#.| | { ;...:.:.3.>.>.X.4.5.5.5.5.5.5.5.5.5.5.5.5.5.",
+	"<X<X@X>X-XgX<XgXhX<XhX,X;X<X<X<X<X<X+X>X>X+X$X>X+X+X>X;X;X:X "
+	"X;X;X>X>X1X>X;X;X;X>X;X>X>X>X=X;X>X;X+X;X+X>X|.|.:X|.|.|. X|.;X;X;X;X;X;X=X;X;X;X>X;X;X;X;X}.}.. "
+	"X.}.|.}..|.}.}.}.}.}.}.}.}.}.;X}.|.|.{.{.{.|.{.|.|.{.{.}.}.;XU.&XI.Y.{.U.L.L.L.L.L.U.U.U./.'.U./"
+	".U.XX{.XXU.U.+X/.{./.'.{.XXU././././.=XU.}././.I.}././.{././././.XX{.XX/.'.+XU.W.'.L.XX'._ I "
+	"XX'.Q.L.XXXXI XX_ XXI V XX_ XX_ '.'.'.I I I I I I I U I I U .U I I  U _ _ T _ ! _ A _ R R R R R ^ "
+	"R E E R E E R R R R R R R E k h h h ( ( k W h ( h ( h h h ( > h h h h h h | h h h h > > > r > h | h "
+	"> h | | | |  . .:.o.X.X.2.,.<.2.,.<.2.2.1.2.2.:.2.>.>.4.2. .2.Q 4.M o.M o.o.M b.o.o. "
+	".X.O.o.X.o.O.>.>.>.3.>.>.>.>.>.2.>.2.<.<.<.<.7.1.<.<.<.<.<.:.2.;.;.2.2.h 2.2.;.Q | h W | W W ( Q Q "
+	"1./ 1.1.1.>.1.4.2.4.2.2.4.1.2.9.4.<.1.>.9.<.9.<.1.1.b.b.b.b.g.C.) 4.4.) 0.7XNXd N d % % NXO O & @ a "
+	"s b b b b b s b c BX5 : N % 4 % 5 % N % d % P iXX O & : : S BXN d 4 P ; N iXo O $ & : > > : D f ( E "
+	"( f ( f f ( d > CXS 4 T % N 4 NXo X O & ; ; NXT T % % % % iX. O O O @ ; : : : D f f f V.E % % 4 N % "
+	"% % % d 4 N ; NX. o O $ = : f f k ( : D > ( ( > S : > > e.R % % 4 4 N NXO X O $ : > D D h ;.W ;.D D "
+	";.W ;.#.~ ;.e. ; 4 S % % NX$ O - - > > { { "
+	"#.#.#.#.$.#.=.*.*.=.=.*.=.=.<.3.3.X.3.:.3.3.3.=.3.>.>.5.>.5.>.>.5.5.5.5.5.5.5.5.t.",
+	">X<X@X,X<X-XgX<XgX .+.N.n.N.p "
+	"@X<X+X>X+X@X>X+X+X>X$X>X:X;X;X;X;X;X;X;X>X>X;X1X;X;X;X;X;X;X>X>X;X>X|.;X>X "
+	"X|.|.|.|.|.|.;X|.|.;X;X;X>X;X;X&X;X;X;X;X;X{....|.|..|.|..}.}.}.}.}.}.}.}.}.}.}.}.|.{.{.{.{.|.{"
+	".|.{.|.|.}.|.}.&X}.U.;XU.L.L.L._.L.L.L.L./.U.U.U./.{.U.U.U.U.U.{.'.{.XX/.{./.{.{.{.'.'.{././"
+	".I.U.=XI.+X/.}././.{.{.{././.XX/.+X'././.'.'.XX'.'.'.XXXX'.XX_ L._ '._ '._ XX_ V I '._ I _ I I I I "
+	"_ I I I _ I I  I I I I _ _ _ _ E _ E E E R R R _  R R R E E E R R R R ( R E R R ( ( ( ( k h h h h "
+	"h h h h ( h h h > > h h W h h h h | ;.h r h h h | r | | h  . .| |  . . ... "
+	".2.1.1.,.2.1.2.,.2.;.2.2.>.2.>. .2.n 4.4.n o.o.M o.M M M M "
+	"o.O.O.O.O.5.O.>.>.3.1.>.>.>.>.>.>.>.>.>.7.7.7.<.<.<.,.,.<.<.<.1.<.<.2.;.;. .;.;.| h | W  .| h h h Q "
+	"h W 1.1.Q 1.) 2.1.1.1.2.2.1.>.>.1.>.1.1.1.2.9.8.<.1.1.8.8.4.b.b.C.b.b.b.4.e.~.uXCX     VXX X & "
+	"; : f b b n b b b b c CXk.      T E T E T E k.X O & ; : > BXE T T T T E e.O O & - : : > D h ( "
+	"( b ( f E R ( T ( f CXE T T T T P iXo + & & ; a V.CXBXCXCXCXBXNX4 T T ( ^ ^ ^ / ) 8./ "
+	"2.1.BXCXCXBXBXNXCXVXR E T E E E iXX O O $ = f f f ^ S D ( : ! 8.8.e.e./ / BX E E T E T CX: : T ! / "
+	"8.1.> D > W W ;.;.h D ;.;.~ #.r.VXCXBXCXBXCXCXS ( ! ` "
+	",.7.3.r.w.w.r.r.r.yXyXyXfXyXyXpXyX-.=.3.3.3.3.3.3.=.-.-.-.>.5.5.5.3.5.5.3.3.5.5.5.5.5.5.t.",
+	"<X+X+X<X+X>X<X<X' H.B.N.m.SXh.M +X+X+X>X>X+X+X>X+X>X$X;X;X:X;X;X;X;X;X>X;X X;X;X;X1X:X "
+	"X;X;X;X=X;X}.;X|.}.|.|.|.|.|.|.|.|.;X}.;X;X;X;X;X;X;X&X..{..|.|..|..|.|.|.|...}.}.}.}.}.U.}.}"
+	".}.|.{.+X{.|.{.{.|.{.}.|.{.|.{.|.}.I.;XU.}.L.L.L.L.'.'.L.L.L.U./.L././.U.'.U.{./.{./"
+	".U.XX'.XX{.XXXX{.+X'..{./.;X>XU./.U.U.U./.+X+XU././.'.'.'.XXU.L.'.'.'.'._ Q.I '.I XXI XXXX_ '.'._ "
+	"Q.'.'.XXI '.I I I _ I I I I I I  .U I I I I I I I U _ E R _ E _ R R  E _ R E R R E E R R R R R g "
+	"R R E ( k k ( k W ( h h ( h W h ( W h h h h ( h W h W h h h h h h h h h h r h | h  .|  .| h |  "
+	".......2.1.1.1.,.1.1.2.2.:.,.>.2.>.>.2.>.o.n 4.n 4.o.) M M M "
+	"o.o.X.O.X.X.O.O.>.9.>.>.>.9.>.>.>.>.>.>.:.>.<.7.$.7.<.<.<.<.7.1.<.,.2.:.<.;.2.;.W ;.W ;.h | W h h j "
+	"D ( W W / 1.1.1.1.2./ Q 1.8.1.2.4.1.1.>.9.2.1.<.1.1.<.1.8.1.1.1.1.1.b.b.4.4.b.eX7X~.iXuXiX%XoX'  "
+	"CXBXNXCXCXBXCXCXCXCXVXCXCXCXBXV.V. /  ^ VX: N T T P d V.O O & ; : W BXd % T S d P V.O O = - : : f "
+	"> > ( ( ( ( ( f ) E f ( ( BXP d d d d T iXo X # & a a f g a & $ $ O  NXe.  k.e.%Xk.iX k.k. BX, "
+	": - $ O O  E 4 d d 4 N NXX O $ @ = f f f D W > W D BXNX      E d S 5 S T        VXD D "
+	"h W ;.W ;.;.;.;.#.#.~ ,.D D D - - $ ! CXk. %XV. kXkX %XV. e.  "
+	"NXe.e.k.e.KX=.=.-.3.y.3.y.-.-.-.-.-.3.>.>.5.5.3.5.3.3.5.p.3.5.5.5.t.",
+	"#X@X@X>X<X#X>X/.C.H.B.B.B.v.h.g.k B "
+	".+X>X+X$X+X>X$X>X;X;X1X;X:X;X;X1X;X:X;X|.;X;X|.|.;X|.|.|.|.;X|.|.}.|.|.|. "
+	"X|.|.|.;X|.;X|.;X&X}.;X&X>X;X>X;X{..... "
+	"X.|.._..{.|.|.}.}.}.}.}.}.}.;X}.Y.{.{.{.|.{.|.{.|.{.{.|.{.|.|..;XU.&X;XU.L.L.K.L.L.L.V "
+	"L.L.L./.{.'.U.U.U.+X'./.'.{.{./.{.XX{.{.XX{.'.XX'.I./.I./.I.>XU.+XU.U./.{.+X'.+X/.XXXX'.XXQ.I XXI "
+	"'.'.I U U I _ '._ '._ Q.'._ I _ _ I _ I V I I I _ U I I I . I U _ U I _ U I U U _ _ _ _ _ R R R R "
+	"R R R E R E E  R b R R R R R R ( ( ( h ( k ( h k h h h h h h h f > h h h h | h | W h h | | h h h | "
+	"| | h  .h |  .| | :.>... .,.1.1.,.2.2.:.2.,.2.2.>.2.2.>.2.>.>.>.Q n Q o.4.o.M "
+	"o.o.O...O.X.O.O.O.X.>.>.>.3.>.>.>.>.>.:.2.>. .>.<.7.7.<.<.<.<.<.,.<.7.<.1.<.2.,.;.;.;.h ;.h ;.W | "
+	";.| h W D ~ W 2./ 1./ 4.1.1.~ ,.,.<.1.1.9.>.1.>.1.9.>.9.9.<.9.1.1.4.1.e.1.1.e.4.b.e.7X7X).7XK K F L "
+	"$ N NXS T ; T T % S T T ; d T T BXg f : - $ $ NXP 4 S 4 d T  X O - : : > BXP d % T T d NXX O $ : : "
+	"D D D ( R ( R ^ ^ ^ ( ( ( ( E BXd N N d S d NXX O $ & ; a d f d - : & O  T d P P d T ; 4 P S T T T "
+	"BX: = - = O O  R d N N d d iX. $ - - - E h D ( D ( ~ > iXR P T T T P T 4 N 4 N d % N % T T T T T "
+	"BXh > > #.D | #.W ;.;.,.,.,.#.#.~ > > : & !  T S d d : T ; : T d P T T % d P N ; N "
+	"VX=.=.=.-.w.y.-.-.-.y.pX-.-.9.5.3.3.5.>.5.3.3.3.3.3.3.5.5.",
+	"<X+X#X<X+X<X}.E b.B.B.B.H.H.h.h.O.N .'.+X+X>X+X;X}.;X:X;X|.|.:X;X;X;X;X "
+	"X;X;X;X|.;X|.;X;X|.|.|.|.|.|.}.|.|.|.|. X|.;X|.|.;X;X|.|.}.U.;X&X;X;X}..{..{.. "
+	"X.|._.L.K.'.{.}.}.}.}.}.}.}.U.>X}.{.{.{.+X|.{.{.|.{.{.|.{.{.|.|.|.}.I.;X&XU.L.K.L.L.{.L.L.L.K.L.L."
+	"XX{./.'.U.{./.'.+XU.'./.'.{.XX{.XX{.XX'.XXXXU.I./././.=X/./.+X/./././.XX/.U.XXXX'._ '._ I _ '. U  "
+	"U _ XX'._ XXI '._ XXV '._ V _ _ I _ I I I I _  I I I I I U I _ I U I I  %X_ _ R _ R R R R R R E R "
+	"R R R R b R R R R R f ( ( ( h ( k ( ( h h h h k h h h h h h > h h W h h h W  .h | h h  .| h | | | | "
+	" . .:...:. ...:.,.1.1.,.1.2.,.2.2.;.2.2.>.>.>.>.>. .X.4.o.Q o.n o.o.X.o.O. "
+	".O.X.+.X.X.X.X.>.>.>.>.>.>.3.>.5.1.;.:.>.>.<.7.<.,.<.7.<.<.7.<.,.<.,.2.:.:.2.1.;.W | W | h ;.j | W "
+	"D D ( W ,.1.2.1.1.W / ;.,.,.,.1.8.1.1.1.>.7.1.<.<.9.1.1.1.1.4.1.4.8.1.,.1.rX7X).~.~.~.K H L - S NX% "
+	"N d N % % % % % % N ; P BXg : : S & $ NX; N % % d %  O O & : : D BXN : 5 N % % NXO O $ : > > D D ( "
+	"R ( ^ ^ ( ^ ( ^ ( ^ ( BXN : 5 N % % kXo O O & : f d f : : - & & e.T % % : N 5 % % % % % % % BX- = $ "
+	"= = O e.E 4 % % N % iXX $ $ - L Z K D ! D W ~ D NXR T N % % % d N ; % 4 N ; % % % % N ; % CX: > > D "
+	"W ;.;.:.;.;.,.#.#.;.#.~ D > : : '  % % % % N 4 % % N 5 % ; N % N 5 : N 5 "
+	"BX$.*.=.=.-.-.-.-.-.-.-.-.-.-.p.5.3.5.3.3.5.3.3.3.3.3.3.3.",
+	"#X<X,X=X>X}.{.k B.B.B.H.SXm.N.v = I jX`.|.;X}.}.}.}.;X;X;X:X;X;X "
+	"X:X;X;X;X;X.:X;X|.;X|.;X.|.;X.;X}.|.}.|. "
+	"X|.|.;X}.;X;X|.}.|.}.}.;X;X}.}.;X}.....{..{.{.K.K.K.K.K.K..;X}.}.}.}.}.}.}.|.{.{.{.{.{.|.{.{.|"
+	".{.|.|.{.|.{.|.|.}.U.'.L.K.'.L.'.L.L.L.L.L.'.L.U.XX/.'.XX'./.'.'.{.XX{.{.XXXX'.'.{.XX'.'.W./.}.}./"
+	".U.}.U.U.}.U.{.{.XX'.XXXX'.XX'._ '.'.'._ '.U I U I '.XXI I I _ '._ I _ '._ '.V I V U I I I I I I I "
+	"I  I . I I U I I I I _ R R R  R R R R E R T R R  R R R R R b R E j k ( k h h h h h h h h h h h "
+	"h h h W h h W h | | W W h  .h | h | | | |  .h h ..:.>.:. "
+	"...2.1.,.1.,.2.<.2.2.,.;.:.,.,.;.2.:.:.2.>.>. .Q 4.n  "
+	".....O.X.X.O.X.X.X.X.X.X.X.>.>.3.>.>.>.>.>.>.>.;.;.:.| $.7.$.7.<.<.<.<.$.,.<.2.<.2.,.,.;.;.;.;.h "
+	"2.;.W h ;.;.h ( D D W W / Q / 1./ / W ,.,.,.8.1.<.<.1.2.9.9.<.1.7.9.1.e.1.1.1.1.,.~ ,.' "
+	"7X7X7X7XeX4X~.K F L F NXN T d T T d T T T T T T E NX: S - $ : - BXT T T T T T NXO & & : > W BXd T T "
+	"T T P e.X O $ ; : : > W ( ^ ( ) ( ( ) ( ( ( / ( VXT T T T d P iXX O O $ : : a > S S : - $ NXE T T T "
+	"T T T T T T T T T BX& - & $ $ $ e.R T T T P d iXO $ $ - Z Z Z %.@.*.D D ( r. T d T d T T T T T T d "
+	"N T T T T d N 4 BX- : > > > D ;.,.,.,.,.$.,.,.,.#.D D > > 8. T P T T d T T S T T T T T T T T T T S "
+	"BX#.#.#.=.=.-.-.-.-.y.-.y.-.-.p.3.3.5.5.5.3.p.p.3.p.3.3.p.",
+	"<X#X>X+X}...@ z N.B.N.h.N.O.r %XvXkX_.U.}.&X.}.;X;X:X:X;X;X "
+	"X;X;X;X|.;X:X|.|.:X..;X|.;X|.}.;X|.|.;X|.|.|.|.|.|.;X|.|.|.;X|.}.;X}.}.}.;X}.{.......{._.K."
+	"L.`.K.K.K.'.K.U.}.}.}.;XU.&X}.{.{.{.{.+X{.|.}.{.+X|.|.|.|.{.|.{.{.'.L.L.{.L.'.L.L.'.L.L.'.L.'.U.L.W."
+	"{.U./.'.U.{.U.{.W.{.'.{.'.XX+X'.XXXXXX/.+XI.U.U./.}.+X&X+XW.XX/.XX{.XX'._ _ '.'._ I _ ._ U I I _ _ "
+	"I I XXI XX'._ V _ V _ _ I I I U '.I _ '.I I '.I I I I I I  I I I I I _  R ' R R R E E E R  ( R R "
+	"R R R R R R ( ( k h h h Q k h k h h h h h h h h h W h ( h h W h W | | | W h  .|  .| r > r > >.>.| "
+	":...:.1.,.2.,.2.<.2.;.;.,.2.;.,.:.;.,.;.;.;.2...X.o.o.X.X.o.X.X.X.X.X.X.X.X.X.X.o.X.5.>.>.>.>.>.>.>."
+	">.>.:.;.;.| | 7.7.<.<.<.<.<.<.<.,.<.<.:.:.,./ ;.;.Q ;.W ;.h ;.| Q ;.~ W ~ W W D W W W ~ ~ ~ "
+	",.,.,.<.<.,.<.8.<.1.7.1.1.9.<.1.1.1.1.Q / W ,.1.7X#X7X~.eX4X4X~.K K F K NXT T T T T T T T T T T T E "
+	"iXS - S S : S BXN T T T T T e.X $ $ : > f BXT T T T T T iXo $ & : S ( ( ( / Q ^ ^ ^ ^ ) ^ ( ! ( / "
+	"BXT T T T T T NXX O $ & S S L S D D : L : NXE T T T T T T T S 4 T T T NX$ $ - - - - e.R T T T d T "
+	"NXX $ - - Z Z Z %.Z @.*.Z *.iXR T T T N T T N d T T S 4 T T T T T T P BX: - : > D "
+	";.;.;.:.#.,.7.<.<.<.;.;.#.W D q. T T T T T T T T T T 4 S T T T T T T T BXZ Z "
+	"#.#.$.=.-.y.-.y.y.-.-.-.-.5.5.3.3.3.3.p.3.3.p.3.3.r.",
+	"+X<X}.}.. X.T  g.) o.g.g.k  "
+	"bXbX{.}.}.&X.}..;X;X;X;X;X;X:X|.:X;X:X;X|.|.;X|.;X|.;X|.;X|.;X|.|.}.}.|.;X.|.|.|.|.|.;X|.|.|.}.}."
+	"}.;X}.}.}.{........K.K.U "
+	"L._.L._.K.{.L...U.;X;X;X}.}.{.{.{.{.|.{.{.|.{.|.|.{.|.{.|.{.{.L.{.L.L.'.L.L.K.L.'.'.L.L.'.'.'.L.L."
+	"'.{.XX{.XX'.'.'.XX'.XXXX'.'.XXXXXXXX'.U.>XU.=XU./././.U.{.U.'.W.'.XX_ .XXI _ '._ '.I I I U I I _ I "
+	"_ '.I I _ I I XX_ '.XXU V _ U  I I  I I  I I I I I I I I I I I I _ _  R R R R _ R R R R  R b R "
+	"b R ( R R ^ R b ( ( ( k h h h h h h h h k h h h h W h h h | Q | h Q W | | | | h { ..{ { "
+	"....:.;.:.2.,.,.1.,.1.2.2.,.2.,.;.,.:.2.,.;.:.,.;.;.;.>.;.:.....X.X.X.O.X.O.X...X.+.X.X.X.X.X.X.>.>."
+	"5.>.>.>.3.>.>.:.;.#.;.$.7.6.7.<.<.3.<.<.:.<.,.<.1.;.;.;.2.;.;.W ;.;.;.W W ~ ~ D ! W ~ ~ D ( W W W "
+	",.~ ,.1.6.,.1.8.1.,.7.1.7.<.<.9.1.4.1.~ D ~ ( ~ K 7X7X7X7XuX7XeXeX4X~.K ~. X . o X . X . X o X . o "
+	"X NX$ % - : : S BXo o . X o X NXO $ % : S ( BXX o . X o o NXO $ & : : > D Q ^ R ) ) ^ / ^ ( ^ ^ ~ ( "
+	"CXo o . X o o iXX O $ % - : S D A S : D : NXX X o . X X . X X . X X . iX$ $ $ $ - : iX& . . X o X "
+	"rXO $ $ L L Z @.@.*.@.*.%.*.aX% X o o X X o X X . X X o . o X o o X . e.O & : > > "
+	";.;.;.,.7.#.7.<.<.<.<.<.<.;.#.iXT o o o X o X o o X . . X X o . X . X X NX- - Z "
+	"@.$.-.-.-.y.-.y.y.y.-.0X3.3.5.p.X.y.X.r.3.3.r.p.w.",
+	">X}....vXbXbXvXbXkXbXvXvX..bX.`.}.}.U.}.}.;X;X;X:X;X;X:X;X;X;X;X;X;X;X:X|.;X|.;X;X|.|.|.|.}.|."
+	"|.}.|.|.|.|.;X|.|.;X|.}.|.}.}.}.|.}.}.;X{.{.{..._..{._.K.K.K.K.K.K.'.K._..{._.L.}.}.;X}.}.{.{.{."
+	"{.{.}.|.|.{.{.{.|.{.{.|.|.{.{.'.L.L.L.K.'.L.'.L.L.'.Q.'.'.L.'.'.{.L.'.U.'.XX'.'.XX'.'.'.'.'.XXXXI "
+	"XXXXI /.+XU.>X/.}.+X/.W.{.XXXXXX'._ I _ I _ '.'._ '.I  I U _ _ '._ _ I _ I I I I I _ _ I I I I I I "
+	"  .U U  I I I I I I  '.I I I I _ R R R R R _ R R  R R  ) R R E R R ( R R ( ( R ( R E ( ( h k "
+	"h h h h W h W W h h h W h | h | Q ;.| h | { { ..r { | | :.>.| | "
+	"1.1.1.,.2.1.,.1.;.2.;.,.;.,.;.,.<.;.;.;.;.;.:.:...:.:.X.{ } "
+	"X.X.X.+...X.X.X.X.>.X.X.X.>.>.>.>.>.>.3.>.>.3.:.| h ,.7.7.<.7.<.<.<.<.<.:.<.<.;.,.;.;.;.,.,.,.~ "
+	",.,.~ ,.~ W ~ ,.W ~ ~ D D D ~ W ,.6.,.6.6.,.,.<.<.<.8.9.<.<.9.<.1.1.8.0.D D D ( "
+	"7X7X7X7XuXeX4XeX4X4X7X~.eX%X$ & & & * & & & X * * O & e.& $ : S D D BX& # & & X & NXO $ $ : > W BX* "
+	"& O & O O NXO O $ : : ( D ( ^ ^ ) ^ ^ ) ^ ^ ^ ( ! ~ BXO * # O O * iXX $ & N - L Z D D D D D : iX% O "
+	"& * # & * * & $ * O * iXO $ - - $ , iX% O & * & * V.O $ $ - Z K @.K *.%.#.@.*.iXS & O * $ * O * & & "
+	"* O * & & * & & X & NXO $ , : > #.2.;.<.6.7.#.<.$.<.<.<.<.<.<.r.R * & & & * * * # * # * & & & X & O "
+	"# O NX- , > } $.=.-.y.-.y.-.y.p.-.-.-.3.y.$.y.$.y.$.p.3.3.3.y.",
+	"..*X}. XHXHXbXbXbXbXvXvX X.Y $XY `.U.;X}.}.}.}. X;X;X X;X;X;X;X:X "
+	"X;X|.;X.;X;X|.|.|.|.|.|.|.|.|.{.|.}.;X|.|.|.|.;X|.}.|.{.}.|.}.}.}.}.;X{.{._...._.._.U "
+	"K.K.'.K.K.K.K.L.L..{.{.Y.{.Y.{.U.|.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.|.{.{.L._.L.'.L.'.L.'.'.L.L.'.L."
+	"XX'./.XX'.XX'.'.'.XX'.'.'.+X'.XX'.XX'.XXI I XX'./.I.U./.I.U./.XXQ.XX'.I I I XXI .'._ _ I I XX.I I "
+	"I I I I I _ I V _ I I _ V V V _ I _ I I I I I U I .I I  I  I I _ I _ I _  R R _ R _  _ R ^ R R "
+	"R R R R R R ( R ( ( R R ^ R ( ( ( ( E ^ ^ ( ( W ( ( h ( h W h h h W Q h h h > | h | h { | { "
+	"....2.:.:.,.1.<.,.2.,.:.2.,.2.1.;.,.2.:.,.;.;.;.;.#.;.;.:.| :...| ..X.X.X.X...} "
+	"X.X.O.X.X.X.5.X.X.X.X.3.>.3.>.>.>.>.>.>.;.#.<.3.$.<.<.<.<.<.<.<.<.<.:.<.,.,.7.<.6.,.,.,.6.,.,.D W D "
+	"~ ~ ~ ,.D W W W ~ D 6.,.,.#.,.6.6.*.,.8.<.1.1.9.1.7.4.8.0.*.0.: A K "
+	"7X7XOX7X~.7XeX7XeXoXeX4XtXBXiXiXiXrX%X'  '   ' '  S $ $ S L D ` q.iXiXiX   T $ $ : : f W "
+	"e.BXe.e.   S O - ; : > D W / ^ Q ^ ) ^ / / / ~ / ~ ! e.NXiXiX   S X $ $ - L L Z K Z D D S D "
+	"6.iXiXe.  R ' ^ ' ^ _ '  S $ $ - L L : ~ e.iXq.e.e./ S $ $ - L Z Z Z *.@.*.%.%.$.=.iXiXiXiXe.8. "
+	"/ ' ' ' ^  ' R  ^ ' !  E $ = : , > W ;.;.<.$.7.7.7.<.w.<.7.<.<.<.9.fXfXiXtXtXq.8.` 8. 8. ` / "
+	"8.'   8.' W - - Z D $.$.y.-.y.-.p.-.-.-.=.-.-.3.$.y.y.y.y.-.y.y.-.y.",
+	".&X}...`......'... X_.B .`.}.U..}..}.:X|.;X;X;X;X X "
+	"X;X:X;X:X.;X|.|.;X:X|.|.;X|.|.|.|.|.|.|.|.|. "
+	"X|.|.|.;X}.|.|.{.}.}.}.;X}.|.{._.{._.._._._._.K.K.'.K.K.'.K.K.K.L.{.{.{.{.{.Y.{.}.}.}.{.{.{.{.{.XX{"
+	".{.{.{.{.{.{.{.{.|.{.'.'.{.L.'.L.'.L.L.'.'.'.L.'.'.'.'.Q.'.XXXXXX'.'.XXXX'.'.'.XXXX_ "
+	"XX'.XXXX'.XX}.I.&X/./.{.'.XX_ I ._ _ I I I _ XXI I '._ I I  I I _ I _ I I XXI I J I I _ V _ U U "
+	".U I  I  I U _ U I I I I I I U I _  R R _  R R R ' R R R R b R R R R R E R R R R ^ R ^ R ( R ^ "
+	"( ! ( ! ^ ^ ~ ( ~ ! ( D W W h h | W > h | | h | { ..{ | "
+	"..:.2.:.:.:.,.1.1.,.2.,.,.2.2.;.;.;.;.,.;.;.:.;.;.;.#.| ..;.......{ X.X.X...X.....} "
+	"X.X.X.X.X.>.X.4.X.>.>.X.>.3.>.3.>.>.:.:.3.<.7.<.<.<.$.3.<.<.<.<.<.$.<.6.<.6.6.6.,.,.,.,.D ,.~ ~ W "
+	"#.~ ~ ~ ~ D ~ #.` ~ ~ ,.,.,.,.6.*.6.<.8.9.<.7.<.<.6.eX*.0.0.K D ).7X7X7XuX7XtX7XtX7XeX7XeX~.4XK ~.H "
+	"L $ $ * $ * $ $ * & $ $ - - D D K ,.K D S : - $ $ $ - : S ( W W W D D ; & $ $ $ & - S > W ~ / / / / "
+	"/ / Q ~ / / / ~ ~ ! ! D S - $ $ $ $ $ - L L H %.Z K K Z K D D S - - - $ $ $ X O $ $ X $ $ $ $ - L Z "
+	"Z D D Z D - - $ $ $ - - L Z @.*.#.%.#.%.%.*.%.*.@.Z - - $ $ $ $ $ $ O X $ X X X O $ O O O $ - : h "
+	";.;.>.7.$.7.$.7.7.7.7.w.$.w.7.=.&.&.%.@.Z - - - $ - $ - $ $ $ - $ $ $ - - - - Z "
+	"#.$.$.p.-.-.p.-.-.y.-.0X0Xy.-.y.$.-.$.-.y.y.-.-.y.",
+	"..}..}._.$X$XjX.'..$XjX "
+	"X.._.K...}.}.Y.}.;X:X|.:X;X:X;X;X;X|.;X;X;X|.;X;X.|..|..X|.|.|.|.{.|.|.|... "
+	"X|.|.|...{.|.{.}.}.}.}.{._.{._._...{._.K.K.K.K.K.K.K.K.K.K.'._.Y..{.{.{.}.L.L.B "
+	"{.+X'.{.{.{.{.{.{.{.{.{.|.{.|.{.{.{.L.L.'.L.'.L.I L.L.'.L.'.'.I '.'.'.'.'.'.'.'.XX'.{.XX.'.XXXX'._ "
+	"_ XXI _ XXQ./.&X+XI.XX_ _ _ I  I I I I _ I I XXI _ XX.I I I I _ '.I I J I _ XX_ V J I _ U U U  I "
+	" I I I _ U I _ I I I  XXI _   R R R ^ _ _ ' R R _ R _ R R R R R g R R E ( R ( R ( ( R ! ( ^ ^ ( "
+	"( E ~ ( ! ~ ! ! W W W h D h > h { { | > { | > { > { { "
+	";.;.;.,.;.;.1.,.2.,.,.2.,.;.,.;.;.;.,.:.;.;.#.:.| ;.;.:...:.....$.X.X.X.X.} "
+	"......X.X.X.X.X.X.5.X.>.X.>.3.>.>.>.>.>.:.:.<.3.3.w.<.$.3.7.<.$.3.$.$.3.<.<.<.6.7.6.6.6.6.~ ,.6.~ "
+	",.~ ~ *.6.,.,.~ ,.6.~ "
+	"#.,.6.,.6.6.6.6.<.,.6.<.,.7.1.8.7.*.*.*.*.*.eX4X7X7X~.7X~.7X7XtX7XtXuXeX4XeX4X~.*.H G L L L - $ $ $ "
+	"$ $ - N S S A D ~ *.,.D D S : - - $ ; : f W ~ ;.W ! D : : - & & - : : D W D K ,.` / ) / 8.K ~ K ~ ~ "
+	"~ ~ ! D D S S $ N $ $ - : L Z Z ~.Z %.K %.Z D D > L - $ $ $ $ $ $ $ $ $ $ $ $ L L Z K Z Z Z L - - - "
+	"- $ - - Z D D *.%.*.$.*.#.*.*.%.%.Z Z L - - $ $ $ $ $ $ $ $ $ $ O $ - & = = : > > "
+	"2.:.<.*.q.=.5Xw.5Xw.5Xw.5X5X=.0X0X5X%.%.Z Z L L - - - - - , - - - , - - - Z , > #.$.w.} "
+	"-.-.-.y.y.y.y.=.-.-.-.y.-.y.-.-.-.y.-.y.-.",
+	"}..}..._.vXkXvXB . X$X$X "
+	"X..`.K.}..U.U..;X;X:X|.;X;X;X:X:X|.;X;X;X;X:X}.:X|.|.|.|.|.|.|.|.|..|.|.{.....X|.{._....{"
+	".}.|.}.}.._._.B B {.._.`.`.K.K.'.K.K.'.K.K.U K.'.U.{.Y._.K.V B B V "
+	"_.{.{..{.{.{.{.XX{.+X{.{.{.{.{.}.{.L.'.'._.L.L.'.L.L.'.I '.'.I '.'.I '.V I L.V I U U U U U U U N V "
+	"P N I U _ L.XX/./.{._ XX_ _ I _ I I  _ ._ _ I _ _ V _ I I I U I I _ U U J I U _ _ U N N U U  .U "
+	"U I I I I I I I '.I  _ I _ _ R R R R _ R R R ' R R _ R R ' _  R R E R E R ( R R R ! E ( ^ ( ^ ( ^ "
+	"E ( ! ! ! ~ ^ ~ ! ~ W ;.> W > > | ;.{ | { h { ..{ { { | 2.:.,.#.;.;.,.2.,.2.,.~ #.~ ;.W "
+	";.;.;.,.#.#.;.;.;...| | :...X.X.X.X.} ..X.} ..{ "
+	"..X.X.3.X.X.X.>.X.>.>.:.>.3.:.<.$.<.<.7.3.3.7.7.$.7.$.w.<.7.$.3.3.3.$.3.6.6.6.,.6.*.6.6.~ ~ ,.~ ~ "
+	"*.~ ,.6.~ #.` ,.6.~ ,.6.6.,.6.,.6.6.#.7.<.7.7.*.7.*.*.*.4X*.4X).4X7X7X~.~.4XtX4XtXuX4XtXuX4XeX~.K K "
+	"H L L L L N L L - L - S L D K D *.6.6.#.D D S : L S - D D W W / / W ( > : - : & : : D D ! D ` K K "
+	"6.6./ ` K *.~ K D D D ~ D S : - - : S S L L Z Z K Z %.K %.K K D D D L L - - - $ $ - - - - - L L L L "
+	"Z Z K %.Z Z > Z - - - - L Z Z *.#.*.*.$.$.*.*.%.%.%.Z Z Z L - - L - - - - - - $ - - - - - , : D D D "
+	"$.=.2X5XyX5X5Xw.yX5Xw.5X=.yX0X0X3X5X&.=.%.Z Z Z Z L L Z , Z , Z > , { > > > "
+	"@.#.$.$.$.y.-.y.y.y.y.y.y.-.-.-.-.-.-.-.-.-.y.-.-.-.-.",
+	".*X.}.|.{.bXbXkX.`..$X1X X._.`.K.}....{.;X:X;X:X:X|.;X|.|.:X;X "
+	"X;X|..;X|.|.|.|.|.|.|.|..|.{.|.|.{..{.{.|.._..._._._._.{..}._._._.B B _.._.`.K.`.`.K._.V "
+	"K.K.K.K.K._._.{._.'.B B B C U '.{.{.{.{.{.{.{.{.{.'.{.{.{.{.{.'.{.'.L.L.L.'.L.'.V U I U I V U V U U "
+	"U I U I I U V U V V N N U N N N N U P U J '.'./.XX_ XX_ I _ I XX'.I '._ _ '._ '.'._ _ I XX_ _ I I I "
+	"_ U U U U U U I U N P U I  U  U  I   U I  I I I I I _ R R _ R  ' _ R R _ R _ ' _ ' R R _ ( R "
+	"( R E E R ^ R R ( E ( ^ ^ ^ ! ~ ( ~ ~ ^ ! ~ ! ~ ! D ;.W > > ;.> > | > | > | > { | { "
+	",.;.#.,.;.;.:.;.;.,.;./ 1.;.;.;.#.W W #.;.;.:.;.{ :...;.{ ....:.X.} "
+	"X.X.........X.X.3.X.X.X.>.>.X.>.X.X.:.3.<.<.<.3.<.$.$.3.<.3.3.7.3.<.$.$.7.3.$.$.<.3.$.3.6.6.6.6.,.6."
+	"6.6.,.,.6.*.,.6.*.6.6.,.6.~ ` #.,.,.,.6.6.6.6.7.0.*.*.*.7.*.7.*.*.*.4X' "
+	"4X).7X~.7X7X7XuX7XuX4X4XtX7XeX4XeX4X~.4XK K K L F L H Z A L K D K D 6.*.6.6.6.6.6.D D S L L L L K D "
+	"~ ,.1.~ ~ D S > : S D D D ~ ~ ` ` *.6.*.K *.6.*.*.D ,.*.K *.D K K Z S L S L L Z L K K %.%.K *.Z %.Z "
+	"K Z D Z L L - L - L L L L L L L L Z Z %.%.%.K %.Z Z D L Z L D Z D *.*.*.$.*.*.%.*.=.%.=.=.*.%.Z Z Z "
+	"Z L L Z Z L L L L - : L Z Z Z Z Z Z %.%.=.5X5X5X5X5Xw.5Xw.5X5XyXw.0X9X0X0X&.&.&.%.%.Z "
+	"#.#.#.@.#.#.#.#.#.} } #.@.#.$.$.$.$.y.y.y.y.y.y.y.y.y.-.-.-.-.-.-.-.-.-.-.y.-.-.-.",
+	".}.}.}.}..bXbXbX$X X.vXkX X._.`.{..K.K.Y.|.|.;X|.|..;X:X "
+	"X|.|.;X.|.;X;X|.|.|.|._..|..|.|...|..|.{._.......`.`._.`._._._._._._.`.V "
+	"_._._.`.K.K.K.K.`.`.K.K.K.K.K.V K.'._.B '.'.'._._._._.{.{.{.{..{.{.{.{.{.{.{.{.{._.L.'.'.L.L.L.V V "
+	"V I V '.U '.V '.V '.V V U V V U U V U P N Y N U Y N N U U P I _ '._ _ _ _ _ _ XXI _ _ I I _ '._ _ _ "
+	"I I I _ '.V U _ U _ U _ U U _ _ U P U U P _ U I . ._ I U _ _ _ _ I I XX_  _ _ R R R ' R R R R ' "
+	"R ' R _ _ _ R ' R R R ( ^ R R E E R E ^ ( ~ ( ^ ~ ~ ~ ~ ( ~ ~ ! ~ ^ ~ ( W > ;.| | { | { { { | { > "
+	"..{ { ,.;.,.;.<.;.;.#.:.;.,.;.;.,.;.W W W D ;.#.W { | #.;.;.....X.X.X.X.} X.{ } X...{ } "
+	"..X.$.>.3.:.X.:.<.$.*.$.,.<.<.<.<.<.<.<.<.3.3.=.w.$.$.<.w.$.3.7.$.3.$.3.$.3.$.6.,.6.,.6.,.6.6.6.6.*."
+	",.*.~ *.6.*.~ ,.,.6.,.6.,.*.,.*.*.4X=.=.0.*.7.7.*.K *.*.4X7X7X7X7XuX7X~.7XtX7X7XeX4X4XuXtXeXeX4X~.K "
+	"4XK K K ~.K K *.K *.K *.` 7.7.7.0.*.0.*.~ D K Z K K #.K %.*.*.*.6.~ W ! D D D D D D ~ 6.K 6.` K "
+	"*.*.K *.*.*.K ~ K #.K K D K K Z K L L Z K Z %.Z %.%.K %.%.K @.Z K Z D D Z Z L L L Z L Z L L Z Z Z Z "
+	"K Z %.Z %.%.K Z D D Z D Z K #.*.$.=.*.q.*.*.%.=.%.%.%.%.%.%.%.Z @.*.Z Z Z Z D D Z Z @.K #.%.Z *.Z "
+	"%.*.2X5XyX5X5X5X5X5XyX5X5XpX5X0X9X0X0X5X5X5X5X&.&.=.$.$.$.$.$.$.$.$.} "
+	"$.$.$.$.$.$.$.y.y.y.y.y.y.y.y.y.y.0X-.-.-.-.-.-.-.-.-.-.-.-.-.",
+	";X..*X.{.JXbXbX X.$XkXvXjX'.B `..Y..}...:X.|.|.|.{.;X;X:X|.;X:X:X.|.;X|.;X "
+	"X.{.|.{.|..{.{..{.{..._.._._._.._..X_.._._._._._._._._._..X`._.`.U "
+	"`._.K._.`.K.'.K.K._.K.K.'.K._._._._.'._._.'.{.{.{.{.{.{.{.{.{.{.{.L.L.'.{.L.L.K.V '.I V U V I U U "
+	"'.U U I U U U I U U U V U V U V N N N N P N N N N _ '.XX'._ _ _ I _ I _ U _ _ U S _ I XXI I _ _ I _ "
+	"_ _ U _ U _ U _ U U U U _ U I  I U  U I R R _  _ _ _ _ _  _ R ^ ' ! R R R  R R R _ R _  _ '  "
+	"' ' _ _ R R E ! ( R ! ^ ! ! ^ / ~ ! ~ ~ W ! ~ ~ ~ ! ~ ~ ~ ! ~ W W > h > ;.> | h h { | { | { | "
+	",.,.;.:.;.;.;.;.;.#.| ;.W ;.;.;.W D h #.h #.;.#.| { ;.{ } X.X.X.X.X.X.X.......{ ....{ "
+	"X.X.:.<.*.$.$.6.$.$.$.<.<.<.$.<.3.<.$.<.<.7.<.<.w.3.$.7.$.3.3.w.$.$.3.$.3.<.7.<.6.,.6.6.*.*.~ "
+	"*.6.6.6.,.6.6.,.,.6.~ "
+	",.,.6.*.=.=.*.*.*.*.=.=.q.*.*.*.4X*.7X7X7X).7X7X~.4X7X7XtXtX7XuXeXtX4X4XeX4X4X~.4X4X4X2X4X2X4X4X2X*."
+	"*.0.*.*.q.*.*.7.6.7.*.*.*.K %.K *.*.*.*.*.*.*.*.*.#.W D D ~ #.6.,.6.6.6.*.*.0.` *.K K *.*.*.K *.K "
+	"*.K *.D K Z K D Z K K K *.K *.%.K *.*.K Z *.%.K Z D L Z Z Z Z 2X2XZ 2XZ K %.%.%.2X%.2X%.%.%.%.%.D "
+	"*.*.#.%.*.=.*.*.*.=.=.=.=.&.=.=.%.=.*.%.%.*.%.%.%.%.*.Z "
+	"#.*.%.%.&.&.%.%.%.%.%.=.5X=.5X5X5X5XfX5XpX5XpX5X5X0X0X0X0X0X0X0X5X5X5X5X5X=.=.=.3.$.y.$.$.y.$.$.w.y."
+	"$.y.y.y.y.-.p.y.-.p.-.y.y.-.-.-.-.-.-.-.-.-.-.-.-.-.wX",
+	".*X.}.}..kX X......`._._.`.......|.:X|.;X:X{.|.;X:X.;X "
+	"X;X}.;X;X|.|.|...}.}.|.{......._.._..X`..`.`.`.`..X`.._._._._._._.`._._.K.`.`._._.`.`.`._"
+	".'.K.`.K.'.'._._._.'._.'._._.'._.{.{.{.{.{.'.{.{.'.{.'.{.'.U.L.L.L.L.L.K.'.V V U V '.I U '.I I V U "
+	"V V V U I U V U N N P U N N Y P U _ P P N _ V _ U _ _ J U _ U R U _ N _ _ _ I '._ V _ I XX_ _ I _ U "
+	"U _ I U _ _ P _ U I I  I  I _ R ' _ _ R R _ _ _ R ' ! ' R ^ ' R R R ' ' R _ ' R R R ' _ _ ' ' E ( "
+	"! ! R ! R R ! ( ~ ! ^ ! ~ ~ ~ ( ~ ~ ~ ~ ! ! ~ ! ( ~ > h h > | > | | | { | r { ..W "
+	",.;.,.;.;.;.;.;.;.#.W #.,.W ;.W D W { h #.| | #.{ | { ..X.X.X.} X.X...X...........{ X.X.{ "
+	"$.*.$.<.$.6.7.*.7.<.<.$.3.$.7.3.$.3.3.7.$.$.7.<.3.$.3.w.3.$.3.3.$.3.3.7.,.6.,.,.6.~ *.,.*.6.6.*.~ "
+	"6.*.6.*.6.,.6.6.*.=.=.2X*.4X=.4X4X*.7.=.*.*.*.4X4X7X7X).7X7X7XuX4X~."
+	"7XeX7XtXyX4XtX4XuX7X4XeX7X4X4X5X4X4XyX5X4X4X4Xq.tX*.q.tXyX0.*.0.4Xw.*.*.4X*.*.K %.*.*.*.*.*.*.*.*.K "
+	"D #.~ *.6.6.0.*.q.*.0.4X*.*.4X*.4X*.*.*.*.*.%.*.*.K *.%.%.K 2X*.2XK %.K *.%.*.*.*.*.*.*.K %.%.Z "
+	"%.%.%.Z %.%.2XZ 2XZ "
+	"*.%.%.%.%.%.%.&.&.%.%.%.*.*.#.*.$.*.*.=.q.=.=.*.5X&.&.=.5X=.&.=.=.4X=.&.*.=.%.=.*.=.%.=.&.=.&.=.&.=."
+	"&.=.3X3X5X5X5XyX0X5XyX5XyX5XyXpX0XwX0X0X0X0X0X5X0X8XpX8Xw.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.p."
+	"-.-.-.pXwX-.-.-.-.-.wX-.-.-.-.-.-.-.",
+	";X.*X..}.&X}.|.|.Y.;XU..}.U.}...K....}.|.;X:X|.{.|.{.:X "
+	"X|.;X|.|..;X;X;X.|._.`.K._.._..K.K.K.._..`.`.B `.`.`.`.B `.`.`.`.K.K.B _._.`._.B V `.`._.B B "
+	"B V K.B `.K._.V K._.V V _._.'.`..B B '..{.{.{.{.{.{.{.U.{.{.L.L.L.'.L.'.U I U V U U '.U U I V U V "
+	"I I U I U U U V V U N U N N N N N N N N _ N _ N J _ _ _ _ _ _ _ _ _ P _ P _ _ I _ _ J I _ I _ _ U J "
+	"J U J _ U _ _ I I U U _  U  U I I _ ' _ R ' _ _ _ _ ' R ^ R ' ! ' ! ! ' R  R ' R _ R ' _ R R ' _ "
+	"! A ! ! ! E R ^ R ! ~ ^ ! ~ W / ~ ( ~ ~ ~ ! ~ W ! ~ ~ ~ ~ W h #.| { | { > { { { { { { | "
+	",.,.;.;.<.3.>.<.<.;.;.;.#.;.;.D W #.;.#.;.#.{ ;.#.> #...} X.X.X.X.} X.X.} ....} { "
+	"X.X.#.X.X.<.#.*.7.$.#.<.#.$.$.<.<.$.<.<.<.$.7.3.3.w.$.$.w.<.$.$.3.3.$.$.3.w.$.0.7.6.6.6.6.6.6.6.` ~ "
+	"*.6.6.*.6.*.0.*.*.*.3X5X2X2X*.5X=.*.=.=.*.=.0.7.2X*.*.4X7X7X7X7X~."
+	"7X4X7X7X4XtXtX7X7XuX7XuX4XtX4X7XyX7X8XuX5X7X8XuX5X5X4X5XyXyX4X=.q.4XyXyXq.4X4X4X4X2X2X*.*.4X4X%."
+	"4X4X=.4X4X4XK Z Z *.*.*.0.0.*.*.*.*.*.4X4X*.%.4X*.*.*.*.4X4X2X*.4X*.K *.K %.*.*.%.2X4X%.2XK "
+	"*.*.%.*.%.%.%.K %.K "
+	"*.%.*.*.%.2X2X2X%.*.*.%.%.*.&.*.%.&.&.2X%.=.=.*.*.=.*.=.0.=.=.=.5X=.=.5X&.5X=.5X&.=.5X=.&.5X5X&.&.&."
+	"=.3X=.0X&.&.=.&.&.&.&.=.5X5X0XyX8X0X0XpX8XfX0X5X0X0X9X0X8XwX0X0X0X8X0X6Xy.y.y.y.y.y.y.y.y.y.y.y.y.y."
+	"y.y.y.y.-.0XwXwXwXwXwXwXwX-.wX-.-.wX-.-.-.-.wX-.-.-.",
+	".}..;X;X.;X}.|.L.}.}.}.Y......Y....`..|.:X;X "
+	"X{.|.:X:X|.;X;X|..}...K._.`..Y..K..K..`._.`..`.B `.`.`.`.`.`.`.`.B `.B `.`.`.K._.B B `.`.B "
+	"`.B _.Y `.B `.B B `.`.B K._._.B B _.`.B B '.'.U _.{.+X{.{.{.{.{.{.{.'.L.L.L.L.V V _.V '.U V '.V U "
+	"K.U '.'.V U U V U V U V U V U V N U N Y N N Y N U U N U U U _ _ _ J U _ _ _ _ _ _ _ _ I I '._ I _ "
+	"XX_ _ _ I J _ _ V _ _ N U _ U _ _ N _ _ I  I  R _ ' _ _ _ _ _ _ ! ' R ! ! R ! ! R ' ! ' R R _ _ ' "
+	"_ ! _ ' _ ! ! D ! ! ! ! R ! ! ! ~ ~ ~ ~ ~ ~ ~ / ~ ~ ~ ~ ~ ! ~ ! ~ ! ~ W > W | > { h h { r | { | { "
+	",.,.,.;.,.3.>.>.3.>.3.<.>.>.<.:.:.;.;.;.:.;.| #.{ :.{ ..:.X.X...X.#.X.X.} X.{ X...X.#.X.} "
+	"X.X...#.$.#.*.$.$.#.$.6.7.$.<.w.3.$.$.<.<.$.w.3.$.w.w.$.3.$.w.3.$.3.$.0.q.*.q.0.*.*.0.6.6.6.,.6.6.6."
+	"6.*.6.*.2X5X3X2X2X5X*.5X5X*.4X=.*.=.*.*.w.4X2X7X7X7X4X7X7X7X7X7X7X~."
+	"4XuX7XtXuXyX7XyXyX7XuX5X7X8XuX5XuX8XyX8XuX8XyX5XyX*.yXyX5Xq.4XyX5X4X4X2X4X4X~.K "
+	"4X*.4X*.*.2X2X*.=.4X*.K K "
+	"%.*.2X4X7.7.*.4X*.4X%.*.2X4X*.*.*.*.*.%.2X4X&.%.%.*.2X2X2X*.%.4X*.2X%.%.*.4X*.4X*.%.2X4X%.%.%.%.%.%."
+	"2X2X%.2X%.*.%.%.*.5X%.2X&.*.&.%.2X%.4X=.w.7.7.*.q.w.7.=.&.=.=.5X=.=.=.0X=.5X5X3X&.-.&.5X=.&.-.3X-."
+	"5X0X3X0X0X3X&.&.0X5X5XyX5X8X5X0X8XfXyX0X5X0X0X0X0XwX0X0XwX0X0XwX0X8XpXy.y.y.y.y.y.y.-.-.y.p.y.-.0X-."
+	"9X9XwXwXwXwXwXwXwXwXwX-.-.-.-.-.pX-.-.-.-.-.-.-.",
+	"}.}.;X..;X.;X{.}..}......K............_..|.|.|.:X.._....K..`.`...K._.K."
+	"K.K.K.K._..`.`.`.`.`.`.`.`.`.B `.B `.B `.B `.B `.`.`.B K.K.`._._.B `.B V `._.B K.K.'.K.K.K.`.U "
+	"'.`._.Y '.'.{.{.{.{.{.'.'.L.L.L.K.V V '.V V U V V U V U I I I I U I I K.U I U U V U U U N Y N P N N "
+	"N N N P N _ J P P _ _ J _ _ _ J _ _ P _ _ N _ J _ _ J _ I _ V _ _ _ _ N _ _ J U J J _ U U _ U _ I _ "
+	"I _ _ ! _ R R _ R ' ^ R ! ' ! R ' ' R ' R ' ^ ^ _ ' R R ' _ R ' ' ~ D ! D ! ' ! ! ! ! ! ! ~ ~ ~ ~ / "
+	"~ ! ~ ~ ~ / ~ ^ ! ~ ~ ~ ~ W ;.{ | ;.h | { | { { h #.h "
+	",.,.;.,.<.1.>.<.>.>.<.>.:.:.:.,.:.:.;.:.;.;.#.| #.:.>.>.:.X.X.} X.X.} X.:.#.X.X.} } X...X...{ "
+	"X.<.6.$.,.,.$.7.$.<.$.<.3.$.$.w.<.$.3.3.$.3.<.$.3.3.$.3.$.$.3.3.*.0.*.q.*.4X0.4X*.4X4X*.0.*.*.6.*.6."
+	"*.3X3X2X5X5X2X=.5X5X*.2X=.4Xw.4X*.w.*."
+	"2X2X7X7X7X7X7X7X7X7X7X7X7X7X7XtX7XtX7X4XuX7X7XyX7XyX7X5XuX8X5X8X8X5X8XyX8X5X4X4X4XyX5Xw.5Xw."
+	"4X2X4X4X%.2X%.%.2X2X4X4X*.*.4X4X4X2X@.Z "
+	"*.*.5X2X4X4X2X4X4X*.4X2X4X%.4X*.*.2X4X%.4X%.4X2X4X2X*.2X*.2X4X%.2X2X4X2X2X2X%.%.%.%.%.%.%.*.*.%.%.*."
+	"2X=.%.2X%.=.2X*.2X=.2X*.&.2X2X&.5X&.&.&.&.=.=.w.=.=.4X5X5X5X3X&.5X5X5X&.5X5X&.-.3X3X0X5X3X3X-.5X&."
+	"0X&.-.9X9X&.&.9X3X5X0X5X5X8XfX8XyX5X0XyX0X0X0XwX0X0X6X0X6X0X6X0X0X0X0Xy.y.y.y.y.y.-.-.-.9X-."
+	"wX9XwXwXwXwXwXwXwXwXwXwXwXwXwXwXpX-.-.wX-.-.-.-.-.-.-.-.",
+	".;X.;X.:X.............K....X..`....`..{.|.|.|...`...`.`..K....K.`.K."
+	"`.`..`..`.`.`.`..`.B B .X`.B `.B `.`.K.`.`.B `.`.`.Y `.`.`.`.`.B _.B `.`.B B `.'.`.B K.U '.B U "
+	"_._.U Y '.'.{.{.{.{.'.V L.L.K.V V V '.V V '.V U V Y U U U U V U U V U U U V I U V V U N P N P N N V "
+	"P P N I N _ N N _ _ _ _ _ _ J _ _ S E _ N S _ I _ _ _ _ _ _ _ _ J _ J _ J _ N _ J J J J _ _ U U _ _ "
+	"_ ' _ R _ R _ _ ' ' ' ! _ R ! ! ! ! R R ' ! ! _ ' ' R ' R ! _ ! D ` K ~ ~ ~ D ' ! ! ~ ~ ~ ~ ~ ~ ~ ~ "
+	"~ ~ ~ ! ~ ~ ~ ~ ~ ~ ~ ~ ~ W h ;.h | | { h W D ;.W #.~ ;.~ ;.;.>.3.>.<.>.>.>.<.:.<.:.;.{ :.:.;.:.#.| "
+	";.:.>.>.:.{ X.X...{ X.X.#.X.:.{ X.$...X...} "
+	"X.:.#.7.#.7.$.<.$.#.#.7.7.<.3.<.$.3.$.<.3.w.$.$.3.w.$.3.$.$.3.$.q.q.*.q.0.4X*.K "
+	"4XeX4X0.4X4X*.eX4X*.0.*.4X3X3X3X2X5X5X2X=.4X=.*.=.=.*.*."
+	"4X2X2X2X7X2X7X4X7X7X7X7X7X7X7X7XtXuX7XuX4XyX7X8X7X8XtX8X8XuXtX8X8X7X5X8X8X5X8X8X4X5X5X5XyX5Xw."
+	"4X2X2X2X2X2X2X2X2X7X2X7X2X4X4X2X4X4X=.*.Z "
+	"*.5X5X3X8X2X2X2X7X2X4X2X2X*.2X4X4X*.5X2X4X2X2X2X=.4X2X4X2X4X2X2X4X2X2X2X2X2X2XK %.2XZ %.%.Z "
+	"2X2X%.%.&.*.&.4X*.4X%.&.&.*.&.=.2X2X&.5X&.&.&.&.&.&.=.w.w.=.=.5X3X5X-.=.0X5X-.5X0X0X5X0X5X&.0X-.9X&."
+	"-.-.9X0X-.9X9X9X9X&.9X9X9X5X5X5XyX0X8XfX5X5X8X0X0X0X9X0X0X0X0X0X0XdX8X0X6X5Xy.-.-.&."
+	"0X0X0XwX0XwX0XwX9XwXwXqXwXqXwXqXqXwXwXwXwXwXwXwX0X-.-.-.0X-.-.-.-.-.-.",
+	"..*X...*X.Y..Y.Y...Y.`.Y..........`..._.`._..X|. "
+	"X..`.K.K..Y..K.K.K.K..K..Y.K.K.`..`.B `.`.`.`.`.B B `.`.`.`.`.B B `.`.B `.`.`.B `.`.B B B B "
+	"`._.V B K.B K.B B V V `.Y U `...B '._.U {.{.{.L.L.K.L.V L.L.V B U V I U V B N V U U V U U U '.'.U "
+	"I V U V U U U U N N V N N Y P N N U U _ N _ _ _ _ _ _ _ _ _ _ _ _ U _ _ U A A U U J N _ J _ _ P N _ "
+	"J U J _ N _ U J U N J _ _ _ _ _ R R _ ' ' _ ^ R R R ' ! ! ' ' _ R ' ' R R ' ' _ _ F _ ' ! ' ~ ! D ! "
+	"D ! ! ~ ` ! ` ~ ! ~ ~ / ~ ~ ~ / ~ ~ ~ ~ ~ ~ ~ ~ ~ ^ ~ ( D | > h D ;.;.~ ,.W #.~ D W W "
+	"#.#.;.>.<.<.>.>.<.:.<.:.;.:.:.:.#.{ :.:.#.:.{ :.>.:.X.{ { X.} X.} X.X.#.X.X.{ } X.{ "
+	"X.X.#.*.$.*.<.6.#.$.7.7.$.#.$.$.<.3.<.3.$.3.$.$.3.3.$.$.3.$.3.3.3.w.*.0.0.*.4X4X0.4X*.4X*.4X*.*."
+	"4X4X4X4X4X4X4X3X5X8X3X3X2X3X4X2X=."
+	"4X4X4X2X2X2X2X2X7X7X7X7X7X7X7X7X7X7X7X8X4X7X4XtX7XyX4XuXuXyX8X7XuXyX5X8X5XuX5X8X8XuX7X8X8X7X4X*."
+	"yX4XyX4X*.2X~.2X4X2X~.~.2X2X2X2X5X2X4X5X5X4X5X4XK "
+	"2X3X5X8X3X2X8X2X2X2X2X2X4X4X2X4X=.4X2X2X5X4X=.2X4X5X4X5X%.2X8X2X2X2X2X8X2X2X5X3X2X2X2X2X%."
+	"2X2X2X2X5X%.5X&.2X=.%.&.*.5X&.5X&.2X2X3X2X2X3X&.3X3X3X3X3X=.5X3X-.=.&.3X3X&.3X3X&.&.&.=.&.&.&.&.&."
+	"9X3X3X&.&.&.9X9X9X9X-.9X&.9X0X0X6X8X0X8XfX5X0X5XfX0X0XwX0X0XqX0X0X8X0X6X0X0X0XwX0X-."
+	"9X0XwXwX0X0XwX0XwX0XwX0XwXwXqXwXqXqXqXqXwXwXwXqXdXpX-.0X-.-.-.wX-.pX-.pX-.",
+	"...:X...........Y.............._._._.....K..Y.K.K.Y.K..K...`..."
+	".K.K.`.`.`.`.`.`.`.`.`.B `.Y `.`.`.`.`.`.`.`.`.`.`.`._.`.`._.K.Y B B K.K.B B K.B _.K.K.`.V _._.Y "
+	"_.`.U '.U Y {._.'.'.U K.L.V L.V V V B V V V U U V V Y U V U V N Y B U V I V U V U U V N V P N P N N "
+	"N U N N _ U N _ _ _ _ _ _ _ _ _ _ _ _ A _ _ _ _ _ _ _ _ _ _ A _ J U _ U _ U J J J J N J J J U _ _ _ "
+	"_ _ ! ! _ _ ! _ ! _ ! R ! _ ! _ ! ! _ ! ' R ' ' _ F ' ! ' ' ! ~ D ! K ~ ` ~ K ~ K ` D ~ ! ~ ~ ~ ~ ~ "
+	"( ^ ~ ~ ~ ~ ( ~ ~ ~ ~ ~ ~ W W W W ~ W ~ ~ W W W ~ ;.W W #.W #.<.>.<.:.<.:.<.;.:.;.:.;...#.:.{ ;.| "
+	":.#.:.X.>.:.X.{ X.X.X.{ { X.X.#.} X.X...} "
+	"X.X.*.<.,.6.#.$.6.,.#.,.*.$.$.#.$.$.3.$.3.3.3.<.w.w.3.3.$.3.y.$.*.0.*.tX*.*.yX*.4X*.4X*.4XK "
+	"*.4X4X*."
+	"4X4X4X4X4X2X5X3X2X3X5X2X2X4X4X2X2X2X2X2X2X2X7X7X7X7X7X2X7X7X7X7X8X7X7X4XtX7XtXuX4X7X4X7X7XtX8X7X8XuX"
+	"yX8XuX8X7X4X8X8X8X8X8X8X2XK "
+	"%.2X4X2X~.2X~.2X4X2X2X~.2X2X8X2X8X5X4X4X8X8X8X&.5X8X6X8X3X8X3X2X8X2X2X2X2X4X4X4X5X=."
+	"4X2X4X2X2X4X5X2X2X2X2X2X2X3X2X2X3X2X3X3X2X3X2X2X2X2X2X3X2X2X&.2X&.&.3X&.*.2X2X2X2X2X2X3X&.3X3X3X3X&."
+	"3X3X&.3X&.&.5X5X3X3X9X5X0X-.3X&.&.=.&.&.%.%.&.%.&.&.&.&.&.%.&.&.&.9X9X9X9X-."
+	"9X9X9X3X0X5X5X5X8X8X5X8X0X0X9X0X0X0X9X9X0XwX0X0X0X0X8X0X0X0X3X3X0XwXwXwX0XwXwXwX0X9XwXqXqXqXqXqXqXqX"
+	"qXqXqXwX-.-.0X-.-.-.-.-.-.-.-.-.0X",
+	".:X.*X.:X.:X*X.*X......:X....X...X..X..._._._._._...`.`....`...`.Y.`..`."
+	".`....`.`.`.`.`..XB `.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`._._._.B Y `.K.`._.K.'._._.K._._.`.U "
+	"'._.U `.Y U Y '.U '.U `.I K.L.K.V '.V V V V V B B U U V U P P V U V P U N Y U I V U U N P P N Y N N "
+	"N Y N N P J U N T _ E _ _ _ _ _ _ _ J _ _ N J _ A N _ _ _ J U _ J _ _ J J J N _ _ V _ A N _ J J N J "
+	"_ _ _ _ R _ ' R ' R ~ R ' ! ! ! ! ' ! ' ! ! ! R ' ' ' ' K ! K D K ~ D ` ! D ~ K ~ ! ~ ' ~ ~ ! ! ~ ~ "
+	"~ ~ ~ ~ ~ ~ / ~ ~ ^ ~ ~ ~ ~ ~ W W ( W W W #.W ,.W W ~ #.;.D ;.W "
+	"2.:.>.2.>.:.:.:.;.#.;.#.#.;...#.#...#...:.:.:.X.{ X.{ X.X.X.X.} { X.X.{ ..X.X.{ "
+	"$.#.<.$.$.<.*.#.*.#.#.#.#.<.7.$.$.<.<.$.$.$.3.$.$.3.$.3.$.3.$.7.*.tX*.tXyX4X*.0.K K 4XK "
+	"4X4X4X0.4X4X*.4X4X4X4X3X5X2X3X2X5X3X3X2X&."
+	"2X2X2X4X2X2X7X8X7X7X8X7X7X8X7X7X7X7X7X7XuX4X7X4XtXuX4XyXtX8XuXtX8X8X8XyX8X8X5X5X7X8X5X8X7X8X8X2XK K "
+	"2X%.2X2X~.~."
+	"2X7X2X2X2X8X2X8X8X2X8X5X7X8X8X6X6X6X8X6X6X8X2X8X2X8X2X8X4X2X4X4X4X2X5X5X5X5X5X5X2X2X2X5X5X3X5X8X5X8X"
+	"2X3X8X8X3X8X3X3X2X2X3X3X2X3X&.2X3X2X2X3X2X2X2X2X3X2X3X3X3X3X3X3X3X3X3X3X3X&.3X&.9X5X&.&.&.0X&.3X0X&."
+	"0X&.&.&.&.&.&.&.&.&.&.%.@.%.&."
+	"9X9X9X9X9X9X9X9X0X0X0X9XwX8XfX5XyX8XfX5X0X0X0XqX0X0X0X0X0X8X8XwX0X0X0X0X0X0X5X9XwXwX0XwXwX0X9XwXqXqX"
+	"wXwXqXqXqXqXqXqXqXqX0X9X0X9X0X9X0X5X-.0X0X-.wX-.",
+	".*X.:X..:X..X.........:X.....X..X...._._._.._._.`.`..`.`..`..`.Y.`..`.K."
+	"..`..K....`.`.`.`.`.`.`.`.`.`.`.`.`.`._._.`.`.`.`._.`.B B B `.`.B K.K.`.K.K.`.K.'.'.K.`.`.'.Y "
+	"U .Y `.'._.U .U _.U U U U V V V V V Y U V V Y U Y N U V P U N N Y N Y N P N V U N P N N U N N V P "
+	"N N U N _ V _ _ _ _ _ E _ J _ _ _ P _ _ U A N S _ _ _ _ _ _ _ J J U _ N J V _ J J U J J V J S _ U _ "
+	"! ' R R ' _ R ! ' ! ' ! _ ! ! ! ! R ! ! F ! F F F ' ' K ,.K #.K ~ D D ~ K ~ ' ` ' ! ~ ~ D ` ! ! ~ ~ "
+	"~ / ~ ^ ~ ~ ~ ~ / ~ ! ~ ~ W W W W W W W ;.W ,.~ W #.#.W D ;.:.:.,.<.:.<.:.<.:.;.;.#.;.#.| { "
+	"#...#.#.:.:.:.X.} X.{ X.{ X.$...X.{ X.X.X.{ "
+	";.#.#.,.,.#.#.*.#.,.#.#.*.#.#.$.$.$.$.:.$.3.$.3.3.$.$.3.$.3.3.=.q.=.q.*.*.0.4X4X0.*.~.%.K 4X4X*.K "
+	"4X4X4X4X4X4X2X4X2X5X3X3X3X3X2X3X3X4X2X2X5X2X2X2X2X2X2X7X7X7X7X7X7X7X7X7X7X7X4X7XtX7XtX7XyX7X4X8X5XuX"
+	"8XyX8X4X8X4X8X8X7X8X8X8X4X8X8X8X~."
+	"2X2X2X4X2X2X2X2X7X2X2X7X8X8X8X8X8X2X8X8X8X6X6X6X6X6X6X8X3X8X2X8X2X8X3X2X2X8X5X5X4X5X3X8X5X8X3X5X8X2X"
+	"3X8X3X3X2X3X3X8X8X3X8X3X3X3X6X2X6X3X3X3X3X&.2X3X5X2X3X2X2X2X3X2X3X3X3X3X3X3X3X3X6X3X3X3X3X3X9X&.9X&."
+	"&.&.&.&.9X&.&.9X&.&.&.&.&.&.&.&.&.@.&.&.-."
+	"9X9X9X9X9X9X9X9X9X9X9X9XwX0X6X5X5X0XyX5X0XwX9X0X0X9X0X5X5X0X0X5X0X0X5X0X5X3X3X5X3XwXqX0X9XqX0XwX9X9X"
+	"qXwXqXqXqXqXqXqXqXqXqXqX9X9X6X9X6X3X0X9X9X0X0X0X-.",
+	"....*X....:X........X..X..X......X.X._..._.._.Y..K.Y..`..`....`..."
+	".`..`..K.`.`.`...`.`.`.`...`..X`..X`.`.`.`..X`.`._._.`.B `.`.`.`.`.`.K._.`.K._.K.K._.'.Y "
+	"`.'._.'.'.U U U '.Y '.Y '.Y V Y Y V U V V V B V N V U V U V Y V N Y N P V N C Y N Y P N V N N N Y N "
+	"P N N Y N _ _ _ _ _ E _ _ _ E _ U E _ _ J A _ _ _ _ P J _ P J U _ _ _ A _ J _ P U J J U J _ _ J _ _ "
+	"_ _ _ _ _ ' ! R ' ! ! ! ! ! ' ! ! _ ' ' ! ' E ! S A ! K ! K D D ~ ~ D ` ~ ~ K ! D ' D ' ~ K ! ~ ~ ` "
+	"~ ~ / ~ ~ ~ ~ ~ / ~ ~ ! ~ / ~ ~ W / ( W / W ~ ,.W W W ;.W #.#.;.,.:.:.:.;.:.;.:.:.;.{ ;.{ ;.#.{ ..{ "
+	"{ X.:.X.:.{ X.{ X.{ X.{ } X.X.} X.{ "
+	"..:.#.#.*.*.#.,.,.#.#.#.,.*.,.#.#.#.:.<.$.$.$.$.3.$.3.$.3.$.3.$.7.7.*.7.=.0.yX4X*.eXq.4XK "
+	"*.4X*.4X4X4X4X4X*.4X%.4X*."
+	"4X4X3X3X3X5X8X5X2X2X2X2X2X2X2X8X2X8X2X8X3X7X8X7X2X7X7X7X8X7X7X7XtX4X4X4XuX7X4XuXyXuX8XyX8X7X8X4X8X7X"
+	"8X5X4X8X8X8X8X8X8X2X2X2X2X4X2X4X2X2X2X8X2X2X3X8X8X8X8X8X2X8X6X6X6X6X6X6X6X3X6X3X6X2X8X2X3X3X~."
+	"2X2X5X5X8X8X3X8X5X8X2X8X3X3X8X8X8X8X8X6X3X3X6X3X8X8X6X2X6X6X3X6X3X3X3X5X3X3X3X3X3X3X2X3X3X3X3X3X3X3X"
+	"3X3X3X3X9X9X3X3X3X3X9X3X&.&.&.&.&.&.0X9X&.&.&.&.&.&.&.&.&.&.&.&."
+	"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XwX0X8X0X8XfX0X0X0X0X0X0X0X6X5X5X5X3X3X5X3X&.&."
+	"3X3X2XqXwXwX9X0XwX9X9XwX9XqXqXqXqXqXqXqXqXqXqXqXqX9X6X6X9X&.0X0X-.0X-.0X0X",
+	":X..:X.:X.....*X.....:X........_...{..{.._....`.`..Y.`..Y.K.`..Y..Y."
+	".`....`.Y `.`..`.`.`.`.`.`.`.`.`.`.`.`.`._.`.`.`._.`.`.`.`.`._.`.`.`.K.`.K._.`.K.K._._.`.'.U "
+	"`.`.Y '.Y '.Y U U U '.Y U Y B Y V U V V C V Y V U U V U N U P N N V Y C P N Y N N V N Y N N P N N N "
+	"P N P N _ N _ _ _ _ _ _ _ E _ _ _ _ J P _ _ N P J _ J _ J _ J N _ J U V _ J J A J J J V J J J J U _ "
+	"_ R _ ! _ _ ' _ ! _ ' ! R ! _ ! ! _ ! ! _ ! A S A K ! D K *.~ ~ D *.~ K *.,.` ~ ~ ~ ~ ! ~ K ! ~ ! ' "
+	"~ W ~ ~ ~ ~ ' ~ ~ ~ ~ ~ ~ ! / ~ W W ( W W / W W ;.#.W W #.;.W ,.:.<.:.:.;.:.;.#.:.#.> #.| ;.{ ..#.{ "
+	"#.X.:.:.X.{ X.{ X.X.X.X.........X.{ #.#.K "
+	";.#.*.#.,.#.6.#.#.#.,.#.*.,.<.$.<.$.$.3.3.$.$.3.$.3.$.w.*.w.7.*.0.*.tX*.0.4X4X*.K *.K *.*.4X4X*.K "
+	"4X4X4X4X4X*."
+	"4X2X3X3X2X2X3X2X3X2X2X2X2X2X2X8X2X2X8X3X8X2X7X7X7X8X7X7X7X7X4XuXuXuX4XyX7XtX4X7X8X7X8X8X7X7X8X8X2X4X"
+	"8X4X8X7X4X8X8X8X8X2X2X2X2X2X2X2X8X8X2X7X6X8X6X8X8X8X8X8X8X6X6X6X6X6X6X6X6X8X2X2X6X2X8X2X2X2XZ Z "
+	"2X3X8X8X6X5X8X8X3X8X3X3X8X3X8X8X6X8X6X3X8X6X6X6X8X3X6X6X3X6X3X5X3X3X3X3X3X3X3X3X3X3X3X3X6X6X3X3X3X6X"
+	"6X9X6X3X6X3X9X3X9X&.&.&.&.&.&.&.&.&.&.9X-.&.&.9X&.9X&.&.&.&."
+	"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X8X5X0X8X8XfX0X9X0X0X0X5X0X5X5X&.&.5X5X5X3X5X&.&."
+	"3XqX9X3XqX6X9X3XqX3XqXqXqXqXqXqXqXqXqXqX6X6X6X9X6X9X3X6X=.0X-.9X0XpX",
+	"......:X:X.:X..X...X.X.X..X..X..X._..X...X..X_._.._..K...`.`..`....`..`.."
+	"`..`...`.`.`.B B `..`..X.X`.`.`.`.`..`.`._.`._._.`.`.`.`.`.`.B `.`._.Y `.`.'.K._._._.K._._.Y "
+	"'.'._.Y '.U '.U `.`.U U U U U N Y B Y N Y B N V Y U U V Y N Y V Y P N N Y P N C P P N N N P V P N N "
+	"U N N U N N _ E _ _ _ _ _ _ _ _ E _ E _ _ _ A _ _ T _ _ J E _ _ J _ _ _ J U J J U P J J _ J N _ E _ "
+	"_ _ ' R ! ! ! K ! ' ! ' F ! ' ! ' ' ! ! ! A E J ! ! K ~ D ~ D *.D ~ D #.~ D ` K ~ ! K ! ` ` ! ` ' D "
+	"! ! ~ ~ ~ ~ _ ~ ~ ~ / ~ ~ ~ ~ W W / ~ W W W W W #.W ;.;.W #.;.:.;.;.;.;.<.,.:.;.;.:.:.> #.| #.#.{ "
+	"X...:.X.:...X.:.X.X.{ } ..X.X.{ "
+	"X.:.#.#.#.#.6.$.6.#.#.#.,.*.,.*.#.*.#.#.*.#.$.3.$.3.$.$.3.$.3.$.3.0.=.7.7.*.*.w.*.yX*.yX*.4X*.K 4XK "
+	"~.*.4X4X4X4X~.2X4X*."
+	"4X4X4X8X3X3X3X5X3X2X5X2X2X3X2X2X2X2X2X2X8X2X8X3X8X8X7X8X7X8X8XeXtX4X7XtX7X4X7X4X4XuX5XuX5X5X8X4X8X7X"
+	"4X8X8X4X8X8X8X8X8X8X6X7X4X8X2X7X2X2X2X7X8X8X8X6X8X8X6X6X8X6XqX6X6X6X6X6X6X6X2X6X8X2X8X2X8X2X2XZ %.K "
+	"Z "
+	"2X6X8X6X6X6X6X8X8X8X6X6X6X6X8X6X6X6X6X6X0X6X3X3X6X6X6X6X3X3X5X6X3X3X3X3X3X3X6X3X3X6X3X3X3X9XqX6X9X9X"
+	"9X9X9X9X3X9X&.3X&.&.&.&.&.&.&.&.&.&.&.9X&.&.9X&."
+	"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XqX9XqX9XqXwXwXwX0X5X5X5X8X0X0X&.0X5X&.0X5X5X5X&.&.&.&.%.&."
+	"2XqXqX6X9X6X6X3X9X3X9XqXqXqX6X6XqX6XqXqX6X6X6X6X6XqX6X6X3X9X0X0X0X0X"
+};
 
-const char *
-WxCasPix::m_stop_xpm =
-    { /* XPM */
-        /* columns rows colors chars-per-pixel */
-        "32 32 79 1",
-        "  c None",
-        ". c #6c0000",
-        "X c #770000",
-        "o c #6e5900",
-        "O c #755f00",
-        "+ c #7c6400",
-        "@ c #83130b",
-        "# c #981513",
-        "$ c #a71c19",
-        "% c #b52521",
-        "& c #846b00",
-        "* c #897000",
-        "= c #907400",
-        "- c #977a00",
-        "; c #9c7e00",
-        ": c #927c12",
-        "> c #cd312c",
-        ", c #d03e39",
-        "< c #d44b47",
-        "1 c #d75854",
-        "2 c #da6561",
-        "3 c #dc6f6b",
-        "4 c #a48400",
-        "5 c #b18e00",
-        "6 c #b59200",
-        "7 c #b49b00",
-        "8 c #bd9700",
-        "9 c #bb9a00",
-        "0 c #bb9e12",
-        "q c #cc9c00",
-        "w c #c3a000",
-        "e c #c6ac00",
-        "r c #c6ae0c",
-        "t c #c9a000",
-        "y c #c9a800",
-        "u c #d1a400",
-        "i c #d3ab00",
-        "p c #d8ad00",
-        "a c #ddaf1a",
-        "s c #d3b100",
-        "d c #d3b800",
-        "f c #d9b400",
-        "g c #ddb800",
-        "h c #e1bb00",
-        "j c #e5bb18",
-        "k c #e5bc20",
-        "l c #dbc31a",
-        "z c #e8c600",
-        "x c #ecc800",
-        "c c #e8ce18",
-        "v c #efd30d",
-        "b c #f5d400",
-        "n c #f7d804",
-        "m c #fadc00",
-        "M c #f4db38",
-        "N c #fce220",
-        "B c #fce430",
-        "V c #fde748",
-        "C c #fde852",
-        "Z c #f7e465",
-        "A c #fce960",
-        "S c #fdeb6a",
-        "D c #fded71",
-        "F c #fdee78",
-        "G c #e59492",
-        "H c #fdee81",
-        "J c #fdef8b",
-        "K c #fdf08f",
-        "L c #fdf193",
-        "P c #fdf198",
-        "I c #fef3a3",
-        "U c #fdf3ae",
-        "Y c #fef5b3",
-        "T c #fef6be",
-        "R c #fdf6c3",
-        "E c #fffbe2",
-        "W c #fffef4",
-        "Q c white",
-        "! c None",
-        /* pixels */
-        "!!!!!!!!!!!!!!!!!!!*&&&&!!!!!!!!",
-        "!!!!!!!!!!!!!!;4;-=qqqq;+!!!!!!!",
-        "!!!!!!!!!444448tuuyuuuqq;O!!!!!!",
-        "!!!!!!!!4qiiiiuuuuuuuuuqu;o!!!!!",
-        "!!!!!!!!4giippiuuiuuuuuuqq;o!!!!",
-        "!!!!!!!!4gfiuiiiuuuuphxnmm9o!!!!",
-        "!!!!!!!4qghfpuifhMHUUPPCm7O!!!!!",
-        "!!!!!!!4ihhhxZTEERYUJHZm7O!!!!!!",
-        "!!!!!!!4ggzgnWWRYPHHHSm7o!!!!!!!",
-        "!!!!!!4wggzgSWYIHHHHCm7o!!!!!!!!",
-        "!!!!!!4igggxTYPHHHFSBro!!!!!!!!!",
-        "!!!!!!4fgggnTPHHHDCVdo!!!!!!!!!!",
-        "!!!!!4wdfggAYHHHDACco=o!!!!!!!!!",
-        "!!!!!4ifggxPLHFSAAMo*46o!!!!!!!!",
-        "!!!!49idfgbYLFCAAA:oOooo!!!!!!!!",
-        "!!!!4wiiidNKDCSAVVVBl7o!!!!!!!!!",
-        "!!!!!4wiizAFSCVVVVVv7o=o!!!!!!!!",
-        "!!!!!!4wibACVVVVVVmro=46o!!!!!!!",
-        "!!!!!!!4wnVVVVVVVBl*oooooo!!!!!!",
-        "!!!!!!!!4444440HBBBBBBmb7o!!!!!!",
-        "!!!!!!!!!!4g94CEFBBBmmb7o!!!!!!!",
-        "!!!!!!!!!!494SQFBBmk@@@@!!!!!!!!",
-        "!!!!!!!!!!!-mTFBmma@$>>$@!!!!!!!",
-        "!!!!!!!!!!*mFCmmmj@1GG31>X!!!!!!",
-        "!!!!!!!!!!*****9m@$GQG3Q<$X!!!!!",
-        "!!!!!!!!!!!!*8*bb@>GGQQ2<>.!!!!!",
-        "!!!!!!!!!!!!*5*bb@>33QQ1<>.!!!!!",
-        "!!!!!!!!!!!!!*ybx@$1Q21Q,#.!!!!!",
-        "!!!!!!!!!!!!!*ix&!@><<<,%.!!!!!!",
-        "!!!!!!!!!!!!!*d*!!!X$>>#.!!!!!!!",
-        "!!!!!!!!!!!!!**!!!!!X...!!!!!!!!",
-        "!!!!!!!!!!!!!*!!!!!!!!!!!!!!!!!!"
-    };
+const char *WxCasPix::m_stop_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 79 1",
+	"  c None",
+	". c #6c0000",
+	"X c #770000",
+	"o c #6e5900",
+	"O c #755f00",
+	"+ c #7c6400",
+	"@ c #83130b",
+	"# c #981513",
+	"$ c #a71c19",
+	"% c #b52521",
+	"& c #846b00",
+	"* c #897000",
+	"= c #907400",
+	"- c #977a00",
+	"; c #9c7e00",
+	": c #927c12",
+	"> c #cd312c",
+	", c #d03e39",
+	"< c #d44b47",
+	"1 c #d75854",
+	"2 c #da6561",
+	"3 c #dc6f6b",
+	"4 c #a48400",
+	"5 c #b18e00",
+	"6 c #b59200",
+	"7 c #b49b00",
+	"8 c #bd9700",
+	"9 c #bb9a00",
+	"0 c #bb9e12",
+	"q c #cc9c00",
+	"w c #c3a000",
+	"e c #c6ac00",
+	"r c #c6ae0c",
+	"t c #c9a000",
+	"y c #c9a800",
+	"u c #d1a400",
+	"i c #d3ab00",
+	"p c #d8ad00",
+	"a c #ddaf1a",
+	"s c #d3b100",
+	"d c #d3b800",
+	"f c #d9b400",
+	"g c #ddb800",
+	"h c #e1bb00",
+	"j c #e5bb18",
+	"k c #e5bc20",
+	"l c #dbc31a",
+	"z c #e8c600",
+	"x c #ecc800",
+	"c c #e8ce18",
+	"v c #efd30d",
+	"b c #f5d400",
+	"n c #f7d804",
+	"m c #fadc00",
+	"M c #f4db38",
+	"N c #fce220",
+	"B c #fce430",
+	"V c #fde748",
+	"C c #fde852",
+	"Z c #f7e465",
+	"A c #fce960",
+	"S c #fdeb6a",
+	"D c #fded71",
+	"F c #fdee78",
+	"G c #e59492",
+	"H c #fdee81",
+	"J c #fdef8b",
+	"K c #fdf08f",
+	"L c #fdf193",
+	"P c #fdf198",
+	"I c #fef3a3",
+	"U c #fdf3ae",
+	"Y c #fef5b3",
+	"T c #fef6be",
+	"R c #fdf6c3",
+	"E c #fffbe2",
+	"W c #fffef4",
+	"Q c white",
+	"! c None",
+	/* pixels */
+	"!!!!!!!!!!!!!!!!!!!*&&&&!!!!!!!!",
+	"!!!!!!!!!!!!!!;4;-=qqqq;+!!!!!!!",
+	"!!!!!!!!!444448tuuyuuuqq;O!!!!!!",
+	"!!!!!!!!4qiiiiuuuuuuuuuqu;o!!!!!",
+	"!!!!!!!!4giippiuuiuuuuuuqq;o!!!!",
+	"!!!!!!!!4gfiuiiiuuuuphxnmm9o!!!!",
+	"!!!!!!!4qghfpuifhMHUUPPCm7O!!!!!",
+	"!!!!!!!4ihhhxZTEERYUJHZm7O!!!!!!",
+	"!!!!!!!4ggzgnWWRYPHHHSm7o!!!!!!!",
+	"!!!!!!4wggzgSWYIHHHHCm7o!!!!!!!!",
+	"!!!!!!4igggxTYPHHHFSBro!!!!!!!!!",
+	"!!!!!!4fgggnTPHHHDCVdo!!!!!!!!!!",
+	"!!!!!4wdfggAYHHHDACco=o!!!!!!!!!",
+	"!!!!!4ifggxPLHFSAAMo*46o!!!!!!!!",
+	"!!!!49idfgbYLFCAAA:oOooo!!!!!!!!",
+	"!!!!4wiiidNKDCSAVVVBl7o!!!!!!!!!",
+	"!!!!!4wiizAFSCVVVVVv7o=o!!!!!!!!",
+	"!!!!!!4wibACVVVVVVmro=46o!!!!!!!",
+	"!!!!!!!4wnVVVVVVVBl*oooooo!!!!!!",
+	"!!!!!!!!4444440HBBBBBBmb7o!!!!!!",
+	"!!!!!!!!!!4g94CEFBBBmmb7o!!!!!!!",
+	"!!!!!!!!!!494SQFBBmk@@@@!!!!!!!!",
+	"!!!!!!!!!!!-mTFBmma@$>>$@!!!!!!!",
+	"!!!!!!!!!!*mFCmmmj@1GG31>X!!!!!!",
+	"!!!!!!!!!!*****9m@$GQG3Q<$X!!!!!",
+	"!!!!!!!!!!!!*8*bb@>GGQQ2<>.!!!!!",
+	"!!!!!!!!!!!!*5*bb@>33QQ1<>.!!!!!",
+	"!!!!!!!!!!!!!*ybx@$1Q21Q,#.!!!!!",
+	"!!!!!!!!!!!!!*ix&!@><<<,%.!!!!!!",
+	"!!!!!!!!!!!!!*d*!!!X$>>#.!!!!!!!",
+	"!!!!!!!!!!!!!**!!!!!X...!!!!!!!!",
+	"!!!!!!!!!!!!!*!!!!!!!!!!!!!!!!!!"
+};
 
 #ifndef __WINDOWS__
-const char *
-WxCasPix::m_wxcas_xpm =
-    { /* XPM */
-        /* columns rows colors chars-per-pixel */
-        "32 32 190 2",
-        "   c None",
-        ".  c #182139",
-        "X  c #182152",
-        "o  c #18314a",
-        "O  c #10395a",
-        "+  c #083963",
-        "@  c #212942",
-        "#  c #21395a",
-        "$  c #313142",
-        "%  c #31394a",
-        "&  c #39394a",
-        "*  c #39397b",
-        "=  c #08425a",
-        "-  c #00426b",
-        ";  c #004273",
-        ":  c #00526b",
-        ">  c #08526b",
-        ",  c #00637b",
-        "<  c #7b4200",
-        "1  c #424252",
-        "2  c #4a4a5a",
-        "3  c #4a4a63",
-        "4  c #525263",
-        "5  c #5a5a6b",
-        "6  c #52527b",
-        "7  c gray42",
-        "8  c #636373",
-        "9  c gray45",
-        "0  c #005294",
-        "q  c #085aad",
-        "w  c #00738c",
-        "e  c #006bad",
-        "r  c #006bb5",
-        "t  c #0073a5",
-        "y  c #007ba5",
-        "u  c #0073bd",
-        "i  c #007bc6",
-        "p  c #6b739c",
-        "a  c #0094bd",
-        "s  c #008cce",
-        "d  c #009cc6",
-        "f  c #0094d6",
-        "g  c #009cd6",
-        "h  c #0894d6",
-        "j  c #089cde",
-        "k  c #1894ce",
-        "l  c #00a5ce",
-        "z  c #00a5d6",
-        "x  c #00a5de",
-        "c  c #18a5de",
-        "v  c #00ade7",
-        "b  c #00b5e7",
-        "n  c #00b5ef",
-        "m  c #00bdef",
-        "M  c #08b5e7",
-        "N  c #00bdf7",
-        "B  c #10ade7",
-        "V  c #18b5e7",
-        "C  c #2194c6",
-        "Z  c #219cd6",
-        "A  c #21adde",
-        "S  c #31adde",
-        "D  c #21b5e7",
-        "F  c #29b5e7",
-        "G  c #39ade7",
-        "H  c #39bdef",
-        "J  c #00c6f7",
-        "K  c #42adde",
-        "L  c #4abde7",
-        "P  c #73bdd6",
-        "I  c #4ac6ef",
-        "U  c #4ad6f7",
-        "Y  c #5ac6ef",
-        "T  c #5ad6f7",
-        "R  c #63ceef",
-        "E  c #6bd6f7",
-        "W  c #73ceef",
-        "Q  c #73d6f7",
-        "!  c #8c4a00",
-        "~  c #9c5200",
-        "^  c #9c7339",
-        "/  c #a55a00",
-        "(  c #ad5a00",
-        ")  c #a56300",
-        "_  c #ad6300",
-        "`  c #ad6308",
-        "'  c #ad6b08",
-        "  c #a56b18",
-        "  c #ad6b18",
-        "{  c #ad7318",
-        "}  c #b56300",
-        "|  c #b56b00",
-        " . c #bd6b00",
-        ".. c #b56b10",
-        "X. c #b57300",
-        "o. c #bd7300",
-        "O. c #bd7310",
-        "+. c #ad7b39",
-        "@. c #b57b29",
-        "#. c #bd7b31",
-        "$. c #c66b00",
-        "%. c #c67300",
-        "&. c #ce7300",
-        "*. c #c67b18",
-        "=. c #ce7b10",
-        "-. c #d67b00",
-        ";. c #bd8429",
-        ":. c #b58442",
-        ">. c #bd8c42",
-        ",. c #ad946b",
-        "<. c #b58c63",
-        "1. c #b59c7b",
-        "2. c #bd9c73",
-        "3. c #bd9c7b",
-        "4. c #bda57b",
-        "5. c #c68418",
-        "6. c #d68400",
-        "7. c #de8400",
-        "8. c #de8c08",
-        "9. c #d68c18",
-        "0. c #de8c18",
-        "q. c #de9418",
-        "w. c #c68421",
-        "e. c #de8c21",
-        "r. c #de9429",
-        "t. c #d69431",
-        "y. c #d69439",
-        "u. c #de9c39",
-        "i. c #e78c08",
-        "p. c #e78c18",
-        "a. c #e79418",
-        "s. c #f79c08",
-        "d. c #e79c21",
-        "f. c #e79c29",
-        "g. c #f7a518",
-        "h. c #ffa510",
-        "j. c #ffad18",
-        "k. c #e7a539",
-        "l. c #f7a521",
-        "z. c #ffad21",
-        "x. c #f7a531",
-        "c. c #f7ad31",
-        "v. c #ffb531",
-        "b. c #ffb539",
-        "n. c #c6944a",
-        "m. c #ce944a",
-        "M. c #de9c42",
-        "N. c #c6a57b",
-        "B. c #cead73",
-        "V. c #cead7b",
-        "C. c #e7ad4a",
-        "Z. c #f7b542",
-        "A. c #ffb542",
-        "S. c #ffbd4a",
-        "D. c #f7bd52",
-        "F. c #ffbd52",
-        "G. c #ffbd5a",
-        "H. c #e7b573",
-        "J. c #efbd73",
-        "K. c #f7bd63",
-        "L. c #ffc65a",
-        "P. c #f7c66b",
-        "I. c #ffc663",
-        "U. c #ffc66b",
-        "Y. c #ffc673",
-        "T. c #ffce7b",
-        "R. c #8cceef",
-        "E. c #84def7",
-        "W. c #94deef",
-        "Q. c #94d6f7",
-        "!. c #8ce7ff",
-        "~. c #94e7ff",
-        "^. c #9cefff",
-        "/. c #a5e7ff",
-        "(. c #a5efff",
-        "). c #ade7ff",
-        "_. c #b5efff",
-        "`. c #d6bda5",
-        "'. c #d6c6ad",
-        ". c #d6c6b5",
-        ". c #deceb5",
-        "{. c #ffce84",
-        "}. c #ffd68c",
-        "|. c #ffd694",
-        " X c #e7d6bd",
-        ".X c #ffdea5",
-        "XX c #e7dece",
-        "oX c #efe7de",
-        "OX c #ffe7c6",
-        "+X c None",
-        /* pixels */
-        "+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X_.+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X",
-        "+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X_.+X+X+X+X+X+X+X+X+X+X+X+X9   2 +X",
-        "+X+X+X+X+X+X+X+X+X+X+X+X+X+XR _.U % # @ X X + O o =       .   +X",
-        "+X+X+X+X+X+X+X+X+X: : . . o K _.E q w t r y y r y r e r r . O +X",
-        "+X+X+X+X. O + = : : w w t i W _.E y r r y y y r r e e r r . O +X",
-        "+X+X+X4 * y r r y r r r y u E._.Q r y Z _.i y e e e e e r . $ +X",
-        "+X+X+X4 * y r r y r r y r s /._.Q.y y E _.s r e e e e r r . $ +X",
-        "+X+X+X4 * r r r y y y r y h )._.Q.r r Q._.j r e e e e r r . % +X",
-        "+X+X+X4 - y y r r r r r y S (._.!.i r W._.A r e e e r r r . 1 +X",
-        "+X+X+X4 - y y r r h s r r S _.Y _.i u ~._.K u r r r u u u . 1 +X",
-        "+X+X+X4 - y y r u _.Y r r Y _.Y _.u a _./.R u i i u u i u . 2 +X",
-        "+X+X+X4 - y r r a _.(.u r E _.I _.a h _.W.E.a i u u i i u . 3 +X",
-        "+X+X+X4 * y y r j _._.j u E._.K _.a c _.T _.j i i u i s a . 4 +X",
-        "+X+X+X5 * y y u L _._.G a _._.H _.s G _.F _.D s k j c D S J E Q ",
-        "+X+X+X4 - y r u W _.!.T j _.S S _.j H _.V _.F Y W./._._._.(.+X+X",
-        "+X+X+X5 ; u i k _.P Y W.D _.A G _.M P _.M _.Y _.R F H C v > 6 +X",
-        "+X+X+XJ C K Y Q _.A H (.P _.c G _.C R Q g _._._.A f g g f o 4 +X",
-        "+X+X XV.w. E.:.| N.c /.E._.k D _.D _.Y g T _.).M d f g f o 4 +X",
-        "W W O.I.F.b.n.8.s.i./ ^.(.W.g D _.H _.U d U _.^.v f f x l o 4 +X",
-        "+X+X) F.A.v.l.z.h.h.) `.'.T f A _.U _.F f F _.E v l v x x o 4 +X",
-        "m.y...Z.A.c.r.f.l.h.o.6.6.`.f Z _.P _.D x Z _.U v v v v v o 4 +X",
-        "H.}.I.G.u.`  ._ ' q.h.h.s.6.'.C _.T _.B x b _.B v x x B b O 4 +X",
-        "Y.T.U.I.)  .&.&.$./ q.h.s.6.3.C _.Q._.M B B b b b b b B b O 4 +X",
-        "-.e.U.I.:...2. ( { j.i./ <.B _.~._.b b b b B v m m A m O 4 +X",
-        ">._ K.Y.;.oX+X+XoX!  z.g.s._ B _.~._.n b m A m m m m N n O 4 +X",
-        "B.M.OX{.P.>.4...< r.v.z.g.X.m _.).Q.m A m m N N J J J E O 4 +X",
-        "-.a..X}.P.P.C.t.t.k.S.x.9.a.@.N _._.T N N N J n E n E n n . 4 +X",
-        "%.7.p.*.5.|.Y.I.L.G.L.G.| ~ '.z Q _.I 0 , ; o X . .   % & 2 8 +X",
-        "`.%.#.`.` .X|.T.D.x.{.{.e.,.. ; P _.E 7 +X+X+X+X+X+X+X+X+X+X+X+X",
-        "+X'.+XXX_ d.K.J.@.-.0.=.} 1.+X+XR._.+Xp +X+X+X+X+X+X+X+X+X+X+X+X",
-        "+X+X+X4.%.7.7.| '.+.&./ ^ +X+X+X+X_.+X+X+X+X+X+X+X+X+X+X+X+X+X+X",
-        "+X+X+X+X3.+./ +.+X+X1..+X+X+X+X+X_.+X+X+X+X+X+X+X+X+X+X+X+X+X+X"
-    };
+const char *WxCasPix::m_wxcas_xpm = { /* XPM */
+	/* columns rows colors chars-per-pixel */
+	"32 32 190 2",
+	"   c None",
+	".  c #182139",
+	"X  c #182152",
+	"o  c #18314a",
+	"O  c #10395a",
+	"+  c #083963",
+	"@  c #212942",
+	"#  c #21395a",
+	"$  c #313142",
+	"%  c #31394a",
+	"&  c #39394a",
+	"*  c #39397b",
+	"=  c #08425a",
+	"-  c #00426b",
+	";  c #004273",
+	":  c #00526b",
+	">  c #08526b",
+	",  c #00637b",
+	"<  c #7b4200",
+	"1  c #424252",
+	"2  c #4a4a5a",
+	"3  c #4a4a63",
+	"4  c #525263",
+	"5  c #5a5a6b",
+	"6  c #52527b",
+	"7  c gray42",
+	"8  c #636373",
+	"9  c gray45",
+	"0  c #005294",
+	"q  c #085aad",
+	"w  c #00738c",
+	"e  c #006bad",
+	"r  c #006bb5",
+	"t  c #0073a5",
+	"y  c #007ba5",
+	"u  c #0073bd",
+	"i  c #007bc6",
+	"p  c #6b739c",
+	"a  c #0094bd",
+	"s  c #008cce",
+	"d  c #009cc6",
+	"f  c #0094d6",
+	"g  c #009cd6",
+	"h  c #0894d6",
+	"j  c #089cde",
+	"k  c #1894ce",
+	"l  c #00a5ce",
+	"z  c #00a5d6",
+	"x  c #00a5de",
+	"c  c #18a5de",
+	"v  c #00ade7",
+	"b  c #00b5e7",
+	"n  c #00b5ef",
+	"m  c #00bdef",
+	"M  c #08b5e7",
+	"N  c #00bdf7",
+	"B  c #10ade7",
+	"V  c #18b5e7",
+	"C  c #2194c6",
+	"Z  c #219cd6",
+	"A  c #21adde",
+	"S  c #31adde",
+	"D  c #21b5e7",
+	"F  c #29b5e7",
+	"G  c #39ade7",
+	"H  c #39bdef",
+	"J  c #00c6f7",
+	"K  c #42adde",
+	"L  c #4abde7",
+	"P  c #73bdd6",
+	"I  c #4ac6ef",
+	"U  c #4ad6f7",
+	"Y  c #5ac6ef",
+	"T  c #5ad6f7",
+	"R  c #63ceef",
+	"E  c #6bd6f7",
+	"W  c #73ceef",
+	"Q  c #73d6f7",
+	"!  c #8c4a00",
+	"~  c #9c5200",
+	"^  c #9c7339",
+	"/  c #a55a00",
+	"(  c #ad5a00",
+	")  c #a56300",
+	"_  c #ad6300",
+	"`  c #ad6308",
+	"'  c #ad6b08",
+	"  c #a56b18",
+	"  c #ad6b18",
+	"{  c #ad7318",
+	"}  c #b56300",
+	"|  c #b56b00",
+	" . c #bd6b00",
+	".. c #b56b10",
+	"X. c #b57300",
+	"o. c #bd7300",
+	"O. c #bd7310",
+	"+. c #ad7b39",
+	"@. c #b57b29",
+	"#. c #bd7b31",
+	"$. c #c66b00",
+	"%. c #c67300",
+	"&. c #ce7300",
+	"*. c #c67b18",
+	"=. c #ce7b10",
+	"-. c #d67b00",
+	";. c #bd8429",
+	":. c #b58442",
+	">. c #bd8c42",
+	",. c #ad946b",
+	"<. c #b58c63",
+	"1. c #b59c7b",
+	"2. c #bd9c73",
+	"3. c #bd9c7b",
+	"4. c #bda57b",
+	"5. c #c68418",
+	"6. c #d68400",
+	"7. c #de8400",
+	"8. c #de8c08",
+	"9. c #d68c18",
+	"0. c #de8c18",
+	"q. c #de9418",
+	"w. c #c68421",
+	"e. c #de8c21",
+	"r. c #de9429",
+	"t. c #d69431",
+	"y. c #d69439",
+	"u. c #de9c39",
+	"i. c #e78c08",
+	"p. c #e78c18",
+	"a. c #e79418",
+	"s. c #f79c08",
+	"d. c #e79c21",
+	"f. c #e79c29",
+	"g. c #f7a518",
+	"h. c #ffa510",
+	"j. c #ffad18",
+	"k. c #e7a539",
+	"l. c #f7a521",
+	"z. c #ffad21",
+	"x. c #f7a531",
+	"c. c #f7ad31",
+	"v. c #ffb531",
+	"b. c #ffb539",
+	"n. c #c6944a",
+	"m. c #ce944a",
+	"M. c #de9c42",
+	"N. c #c6a57b",
+	"B. c #cead73",
+	"V. c #cead7b",
+	"C. c #e7ad4a",
+	"Z. c #f7b542",
+	"A. c #ffb542",
+	"S. c #ffbd4a",
+	"D. c #f7bd52",
+	"F. c #ffbd52",
+	"G. c #ffbd5a",
+	"H. c #e7b573",
+	"J. c #efbd73",
+	"K. c #f7bd63",
+	"L. c #ffc65a",
+	"P. c #f7c66b",
+	"I. c #ffc663",
+	"U. c #ffc66b",
+	"Y. c #ffc673",
+	"T. c #ffce7b",
+	"R. c #8cceef",
+	"E. c #84def7",
+	"W. c #94deef",
+	"Q. c #94d6f7",
+	"!. c #8ce7ff",
+	"~. c #94e7ff",
+	"^. c #9cefff",
+	"/. c #a5e7ff",
+	"(. c #a5efff",
+	"). c #ade7ff",
+	"_. c #b5efff",
+	"`. c #d6bda5",
+	"'. c #d6c6ad",
+	". c #d6c6b5",
+	". c #deceb5",
+	"{. c #ffce84",
+	"}. c #ffd68c",
+	"|. c #ffd694",
+	" X c #e7d6bd",
+	".X c #ffdea5",
+	"XX c #e7dece",
+	"oX c #efe7de",
+	"OX c #ffe7c6",
+	"+X c None",
+	/* pixels */
+	"+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X_.+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X",
+	"+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X_.+X+X+X+X+X+X+X+X+X+X+X+X9   2 +X",
+	"+X+X+X+X+X+X+X+X+X+X+X+X+X+XR _.U % # @ X X + O o =       .   +X",
+	"+X+X+X+X+X+X+X+X+X: : . . o K _.E q w t r y y r y r e r r . O +X",
+	"+X+X+X+X. O + = : : w w t i W _.E y r r y y y r r e e r r . O +X",
+	"+X+X+X4 * y r r y r r r y u E._.Q r y Z _.i y e e e e e r . $ +X",
+	"+X+X+X4 * y r r y r r y r s /._.Q.y y E _.s r e e e e r r . $ +X",
+	"+X+X+X4 * r r r y y y r y h )._.Q.r r Q._.j r e e e e r r . % +X",
+	"+X+X+X4 - y y r r r r r y S (._.!.i r W._.A r e e e r r r . 1 +X",
+	"+X+X+X4 - y y r r h s r r S _.Y _.i u ~._.K u r r r u u u . 1 +X",
+	"+X+X+X4 - y y r u _.Y r r Y _.Y _.u a _./.R u i i u u i u . 2 +X",
+	"+X+X+X4 - y r r a _.(.u r E _.I _.a h _.W.E.a i u u i i u . 3 +X",
+	"+X+X+X4 * y y r j _._.j u E._.K _.a c _.T _.j i i u i s a . 4 +X",
+	"+X+X+X5 * y y u L _._.G a _._.H _.s G _.F _.D s k j c D S J E Q ",
+	"+X+X+X4 - y r u W _.!.T j _.S S _.j H _.V _.F Y W./._._._.(.+X+X",
+	"+X+X+X5 ; u i k _.P Y W.D _.A G _.M P _.M _.Y _.R F H C v > 6 +X",
+	"+X+X+XJ C K Y Q _.A H (.P _.c G _.C R Q g _._._.A f g g f o 4 +X",
+	"+X+X XV.w. E.:.| N.c /.E._.k D _.D _.Y g T _.).M d f g f o 4 +X",
+	"W W O.I.F.b.n.8.s.i./ ^.(.W.g D _.H _.U d U _.^.v f f x l o 4 +X",
+	"+X+X) F.A.v.l.z.h.h.) `.'.T f A _.U _.F f F _.E v l v x x o 4 +X",
+	"m.y...Z.A.c.r.f.l.h.o.6.6.`.f Z _.P _.D x Z _.U v v v v v o 4 +X",
+	"H.}.I.G.u.`  ._ ' q.h.h.s.6.'.C _.T _.B x b _.B v x x B b O 4 +X",
+	"Y.T.U.I.)  .&.&.$./ q.h.s.6.3.C _.Q._.M B B b b b b b B b O 4 +X",
+	"-.e.U.I.:...2. ( { j.i./ <.B _.~._.b b b b B v m m A m O 4 +X",
+	">._ K.Y.;.oX+X+XoX!  z.g.s._ B _.~._.n b m A m m m m N n O 4 +X",
+	"B.M.OX{.P.>.4...< r.v.z.g.X.m _.).Q.m A m m N N J J J E O 4 +X",
+	"-.a..X}.P.P.C.t.t.k.S.x.9.a.@.N _._.T N N N J n E n E n n . 4 +X",
+	"%.7.p.*.5.|.Y.I.L.G.L.G.| ~ '.z Q _.I 0 , ; o X . .   % & 2 8 +X",
+	"`.%.#.`.` .X|.T.D.x.{.{.e.,.. ; P _.E 7 +X+X+X+X+X+X+X+X+X+X+X+X",
+	"+X'.+XXX_ d.K.J.@.-.0.=.} 1.+X+XR._.+Xp +X+X+X+X+X+X+X+X+X+X+X+X",
+	"+X+X+X4.%.7.7.| '.+.&./ ^ +X+X+X+X_.+X+X+X+X+X+X+X+X+X+X+X+X+X+X",
+	"+X+X+X+X3.+./ +.+X+X1..+X+X+X+X+X_.+X+X+X+X+X+X+X+X+X+X+X+X+X+X"
+};
 #endif /* !__WINDOWS__ */
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcaspix.h -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcaspix.h Changed

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcasprefs.cpp -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcasprefs.cpp Changed

@@ -27,7 +27,6 @@
 /// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
 #include <wx/config.h>
 #include <wx/dirdlg.h>
 
@@ -35,386 +34,316 @@
 #include "wxcascte.h"
 #include "wxcasframe.h"
 
-// Constructor
-WxCasPrefs::WxCasPrefs ( wxWindow * parent ) : wxDialog ( parent, -1,
-		        wxString ( _
-		                   ( "Preferences" ) ) )
+WxCasPrefs::WxCasPrefs(wxWindow *parent)
+: wxDialog(parent, -1, wxString(_("Preferences")))
 {
-	// Prefs
-	wxConfigBase * prefs = wxConfigBase::Get();
+	wxConfigBase *prefs = wxConfigBase::Get();
 
-	// Main vertical Sizer
-	m_mainVBox = new wxBoxSizer ( wxVERTICAL );
+	m_mainVBox = new wxBoxSizer(wxVERTICAL);
 
-	// OS Path
-	m_osPathSBox =
-	    new wxStaticBox ( this, -1, _( "Directory containing amulesig.dat file" ) );
-	m_osPathSBoxSizer = new wxStaticBoxSizer ( m_osPathSBox, wxHORIZONTAL );
+	m_osPathSBox = new wxStaticBox(this, -1, _("Directory containing amulesig.dat file"));
+	m_osPathSBoxSizer = new wxStaticBoxSizer(m_osPathSBox, wxHORIZONTAL);
 
-	m_osPathTextCtrl = new wxTextCtrl ( this, -1, "" );
-	m_osPathBrowseButton =
-	    new wxButton ( this, ID_OSPATH_BROWSE_BUTTON, wxString ( _( "Browse" ) ) );
+	m_osPathTextCtrl = new wxTextCtrl(this, -1, "");
+	m_osPathBrowseButton = new wxButton(this, ID_OSPATH_BROWSE_BUTTON, wxString(_("Browse")));
 
 	wxString str;
 
-	prefs->Read ( WxCasCte::AMULESIG_PATH_KEY, &str,
-	              WxCasCte::DEFAULT_AMULESIG_PATH );
+	prefs->Read(WxCasCte::AMULESIG_PATH_KEY, &str, WxCasCte::DEFAULT_AMULESIG_PATH);
 
-	// Text extent
 	wxInt32 charExtent, y;
-	m_osPathTextCtrl->GetTextExtent ( "8", &charExtent, &y );
-	m_osPathTextCtrl->SetSize ( wxSize ( charExtent * ( str.Length () + 1 ), -1 ) );
+	m_osPathTextCtrl->GetTextExtent("8", &charExtent, &y);
+	m_osPathTextCtrl->SetSize(wxSize(charExtent * (str.Length() + 1), -1));
 
-	m_osPathTextCtrl->SetValue ( str );
-	m_osPathTextCtrl->
-	SetToolTip ( _
-	             ( "Enter here the directory where your amulesig.dat file is" ) );
+	m_osPathTextCtrl->SetValue(str);
+	m_osPathTextCtrl->SetToolTip(_("Enter here the directory where your amulesig.dat file is"));
 
-	m_osPathSBoxSizer->Add ( m_osPathTextCtrl, wxSizerFlags(1).Center().Border(wxALL, 5) );
-	m_osPathSBoxSizer->Add ( m_osPathBrowseButton, wxSizerFlags().Center().Border(wxALL, 5) );
+	m_osPathSBoxSizer->Add(m_osPathTextCtrl, wxSizerFlags(1).Center().Border(wxALL, 5));
+	m_osPathSBoxSizer->Add(m_osPathBrowseButton, wxSizerFlags().Center().Border(wxALL, 5));
 
-	m_mainVBox->Add ( m_osPathSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10) );
+	m_mainVBox->Add(m_osPathSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10));
 
-	// Refresh rate
-	m_refreshSBox = new wxStaticBox ( this, -1, "" );
-	m_refreshSBoxSizer = new wxStaticBoxSizer ( m_refreshSBox, wxHORIZONTAL );
+	m_refreshSBox = new wxStaticBox(this, -1, "");
+	m_refreshSBoxSizer = new wxStaticBoxSizer(m_refreshSBox, wxHORIZONTAL);
 
+	m_refreshSpinButton = new wxSpinCtrl(this, -1);
+	m_refreshSpinButton->SetRange(WxCasCte::MIN_REFRESH_RATE, WxCasCte::MAX_REFRESH_RATE);
+	m_refreshSpinButton->SetValue(
+		prefs->Read(WxCasCte::REFRESH_RATE_KEY, WxCasCte::DEFAULT_REFRESH_RATE));
+	m_refreshStaticText = new wxStaticText(this,
+		-1,
+		_("Refresh rate interval in seconds"),
+		wxDefaultPosition,
+		wxDefaultSize,
+		wxALIGN_CENTRE);
+	m_refreshSBoxSizer->Add(m_refreshSpinButton, wxSizerFlags().Center().Border(wxALL, 5));
+	m_refreshSBoxSizer->Add(m_refreshStaticText, wxSizerFlags(1).Center().Border(wxALL, 5));
 
-	m_refreshSpinButton = new wxSpinCtrl ( this, -1 );
-	m_refreshSpinButton->SetRange ( WxCasCte::MIN_REFRESH_RATE,
-	                                WxCasCte::MAX_REFRESH_RATE );
-	m_refreshSpinButton->SetValue ( prefs->
-	                                Read ( WxCasCte::REFRESH_RATE_KEY,
-	                                       WxCasCte::DEFAULT_REFRESH_RATE ) );
-	m_refreshStaticText =
-	    new wxStaticText ( this, -1, _( "Refresh rate interval in seconds" ), wxDefaultPosition,
-	                       wxDefaultSize, wxALIGN_CENTRE );
-	m_refreshSBoxSizer->Add ( m_refreshSpinButton, wxSizerFlags().Center().Border(wxALL, 5) );
-	m_refreshSBoxSizer->Add ( m_refreshStaticText, wxSizerFlags(1).Center().Border(wxALL, 5) );
+	m_mainVBox->Add(m_refreshSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10));
 
-	m_mainVBox->Add ( m_refreshSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 10) );
-
-	// Auto generate stat image
-	m_autoStatImgSBox = new wxStaticBox ( this, -1, "" );
-	m_autoStatImgSBoxSizer =
-	    new wxStaticBoxSizer ( m_autoStatImgSBox, wxVERTICAL );
+	m_autoStatImgSBox = new wxStaticBox(this, -1, "");
+	m_autoStatImgSBoxSizer = new wxStaticBoxSizer(m_autoStatImgSBox, wxVERTICAL);
 
 	m_autoStatImgCheck =
-	    new wxCheckBox ( this, ID_AUTOSTATIMG_CHECK,
-	                     _
-	                     ( "Generate a stat image at every refresh event" ) );
-	m_autoStatImgSBoxSizer->Add ( m_autoStatImgCheck, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-
-	m_autoStatImgHBoxSizer = new wxBoxSizer ( wxHORIZONTAL );
-
-	wxString strs =
-	    {
-	        "PNG", "JPG", "BMP" };
-
-	m_autoStatImgCombo =
-	    new wxComboBox ( this, ID_AUTOSTATIMG_COMBO,
-	                     prefs->
-	                     Read ( WxCasCte::AUTOSTATIMG_TYPE_KEY,
-	                            WxCasCte::DEFAULT_AUTOSTATIMG_TYPE ),
-	                     wxDefaultPosition, wxDefaultSize, 3, strs,
-	                     wxCB_DROPDOWN | wxCB_READONLY );
-
-	m_autoStatImgTextCtrl = new wxTextCtrl ( this, -1, "" );
-	m_autoStatImgTextCtrl->SetValue ( prefs->
-	                                  Read ( WxCasCte::AUTOSTATIMG_DIR_KEY,
-	                                         WxCasCte::DEFAULT_AUTOSTATIMG_PATH ) );
-	m_autoStatImgTextCtrl->
-	SetToolTip ( _
-	             ( "Enter here the directory where you want to generate the statistic image" ) );
-
-	m_autoStatImgButton =
-	    new wxButton ( this, ID_AUTOSTATIMG_BROWSE_BUTTON, wxString ( _( "Browse" ) ) );
-
-	m_autoStatImgHBoxSizer->Add ( m_autoStatImgCombo, wxSizerFlags().Center().Border(wxALL, 5) );
-	m_autoStatImgHBoxSizer->Add ( m_autoStatImgTextCtrl, wxSizerFlags(1).Center().Border(wxALL, 5) );
-	m_autoStatImgHBoxSizer->Add ( m_autoStatImgButton, wxSizerFlags().Center().Border(wxALL, 5) );
-
-	m_autoStatImgSBoxSizer->Add ( m_autoStatImgHBoxSizer, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-
-	m_mainVBox->Add ( m_autoStatImgSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 5) );
-
-	// Auto FTP update stat image
-	m_ftpUpdateSBox = new wxStaticBox ( this, -1, "" );
-	m_ftpUpdateSBoxSizer =
-	    new wxStaticBoxSizer ( m_ftpUpdateSBox, wxVERTICAL );
-
-	// Check
-	m_ftpUpdateCheck =
-	    new wxCheckBox ( this, ID_FTP_UPDATE_CHECK,
-	                     _
-	                     ( "Upload periodically your stat image to FTP server" ) );
-	m_ftpUpdateSBoxSizer->Add ( m_ftpUpdateCheck, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-
-	// Grid size
-	m_ftpUpdateGridSizer = new wxGridSizer( 2 );
-
-	// FTP Static text
-	m_ftpUrlStaticText = new wxStaticText ( this, -1, _( "FTP Url" ) );
-	m_ftpUpdateGridSizer->Add ( m_ftpUrlStaticText, wxSizerFlags(1).Bottom().Border(wxALL, 5) );
-
-	m_ftpPathStaticText = new wxStaticText ( this, -1, _( "FTP Path" ) );
-	m_ftpUpdateGridSizer->Add ( m_ftpPathStaticText, wxSizerFlags(1).Bottom().Border(wxALL, 5) );
-	// Url
-	m_ftpUrlTextCtrl = new wxTextCtrl ( this, -1, "" );
-	m_ftpUrlTextCtrl->SetValue ( prefs->
-	                             Read ( WxCasCte::FTP_URL_KEY,
-	                                    WxCasCte::DEFAULT_FTP_URL ) );
-	m_ftpUrlTextCtrl->
-	SetToolTip ( _
-	             ( "Enter here the URL of your FTP server" ) );
-
-	m_ftpUpdateGridSizer->Add ( m_ftpUrlTextCtrl, wxSizerFlags(1).Expand().Border(wxALL, 5) );
-
-	// Path
-	m_ftpPathTextCtrl = new wxTextCtrl ( this, -1, "" );
-	m_ftpPathTextCtrl->SetValue ( prefs->
-	                              Read ( WxCasCte::FTP_PATH_KEY,
-	                                     WxCasCte::DEFAULT_FTP_PATH ) );
-	m_ftpPathTextCtrl->
-	SetToolTip ( _
-	             ( "Enter here the directory where putting your stat image on FTP server" ) );
-
-	m_ftpUpdateGridSizer->Add ( m_ftpPathTextCtrl, wxSizerFlags(1).Expand().Border(wxALL, 5) );
-
-	// Login Static text
-	m_ftpUserStaticText = new wxStaticText ( this, -1, _( "User" ) );
-	m_ftpUpdateGridSizer->Add ( m_ftpUserStaticText, wxSizerFlags(1).Bottom().Border(wxALL, 5) );
-
-	m_ftpPasswdStaticText = new wxStaticText ( this, -1, _( "Password" ) );
-	m_ftpUpdateGridSizer->Add ( m_ftpPasswdStaticText, wxSizerFlags(1).Bottom().Border(wxALL, 5) );
-
-	// User
-	m_ftpUserTextCtrl = new wxTextCtrl ( this, -1, "" );
-	m_ftpUserTextCtrl->SetValue ( prefs->
-	                              Read ( WxCasCte::FTP_USER_KEY,
-	                                     WxCasCte::DEFAULT_FTP_USER ) );
-	m_ftpUserTextCtrl->
-	SetToolTip ( _
-	             ( "Enter here the User name to log into your FTP server" ) );
-
-	m_ftpUpdateGridSizer->Add ( m_ftpUserTextCtrl, wxSizerFlags(1).Expand().Border(wxALL, 5) );
-
-	// Passwd
-	m_ftpPasswdTextCtrl = new wxTextCtrl ( this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
-	m_ftpPasswdTextCtrl->SetValue ( prefs->
-	                                Read ( WxCasCte::FTP_PASSWD_KEY,
-	                                       WxCasCte::DEFAULT_FTP_PASSWD ) );
-	m_ftpPasswdTextCtrl->
-	SetToolTip ( _
-	             ( "Enter here the User password to log into your FTP server" ) );
-
-	m_ftpUpdateGridSizer->Add ( m_ftpPasswdTextCtrl, wxSizerFlags(1).Expand().Border(wxALL, 5) );
-
-
-	// Add to static sizer
-	m_ftpUpdateSBoxSizer->Add ( m_ftpUpdateGridSizer, wxSizerFlags(1).Expand().CenterVertical().Border(wxALL, 5) );
-
-	// Upload rate
-	m_ftpRateHBoxSizer = new wxBoxSizer( wxHORIZONTAL );
-	m_ftpUpdateSpinButton = new wxSpinCtrl ( this, -1 );
-	m_ftpUpdateSpinButton->SetRange ( WxCasCte::MIN_FTP_RATE,
-	                                  WxCasCte::MAX_FTP_RATE );
-	m_ftpUpdateSpinButton->SetValue ( prefs->
-	                                  Read ( WxCasCte::FTP_UPDATE_RATE_KEY,
-	                                         WxCasCte::DEFAULT_FTP_UPDATE_RATE ) );
-	m_ftpUpdateStaticText =
-	    new wxStaticText ( this, -1, _( "FTP update rate interval in minutes" ), wxDefaultPosition,
-	                       wxDefaultSize, wxALIGN_CENTRE );
-	m_ftpRateHBoxSizer->Add ( m_ftpUpdateSpinButton, wxSizerFlags().Center().Border(wxALL, 5) );
-	m_ftpRateHBoxSizer->Add ( m_ftpUpdateStaticText, wxSizerFlags(1).Center().Border(wxALL, 5) );
-
-	m_ftpUpdateSBoxSizer->Add ( m_ftpRateHBoxSizer, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5) );
-
-	// Add to main sizer
-	m_mainVBox->Add ( m_ftpUpdateSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 5) );
-
-	// Mask auto stat img disabled controls
-	if (prefs->Read( WxCasCte::ENABLE_AUTOSTATIMG_KEY,
-	                 WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED ) ) {
-		m_autoStatImgCheck->SetValue( TRUE );
+		new wxCheckBox(this, ID_AUTOSTATIMG_CHECK, _("Generate a stat image at every refresh event"));
+	m_autoStatImgSBoxSizer->Add(
+		m_autoStatImgCheck, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5));
+
+	m_autoStatImgHBoxSizer = new wxBoxSizer(wxHORIZONTAL);
+
+	wxString strs = { "PNG", "JPG", "BMP" };
+
+	m_autoStatImgCombo = new wxComboBox(this,
+		ID_AUTOSTATIMG_COMBO,
+		prefs->Read(WxCasCte::AUTOSTATIMG_TYPE_KEY, WxCasCte::DEFAULT_AUTOSTATIMG_TYPE),
+		wxDefaultPosition,
+		wxDefaultSize,
+		3,
+		strs,
+		wxCB_DROPDOWN | wxCB_READONLY);
+
+	m_autoStatImgTextCtrl = new wxTextCtrl(this, -1, "");
+	m_autoStatImgTextCtrl->SetValue(
+		prefs->Read(WxCasCte::AUTOSTATIMG_DIR_KEY, WxCasCte::DEFAULT_AUTOSTATIMG_PATH));
+	m_autoStatImgTextCtrl->SetToolTip(
+		_("Enter here the directory where you want to generate the statistic image"));
+
+	m_autoStatImgButton = new wxButton(this, ID_AUTOSTATIMG_BROWSE_BUTTON, wxString(_("Browse")));
+
+	m_autoStatImgHBoxSizer->Add(m_autoStatImgCombo, wxSizerFlags().Center().Border(wxALL, 5));
+	m_autoStatImgHBoxSizer->Add(m_autoStatImgTextCtrl, wxSizerFlags(1).Center().Border(wxALL, 5));
+	m_autoStatImgHBoxSizer->Add(m_autoStatImgButton, wxSizerFlags().Center().Border(wxALL, 5));
+
+	m_autoStatImgSBoxSizer->Add(
+		m_autoStatImgHBoxSizer, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5));
+
+	m_mainVBox->Add(m_autoStatImgSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 5));
+
+	m_ftpUpdateSBox = new wxStaticBox(this, -1, "");
+	m_ftpUpdateSBoxSizer = new wxStaticBoxSizer(m_ftpUpdateSBox, wxVERTICAL);
+
+	m_ftpUpdateCheck = new wxCheckBox(
+		this, ID_FTP_UPDATE_CHECK, _("Upload periodically your stat image to FTP server"));
+	m_ftpUpdateSBoxSizer->Add(
+		m_ftpUpdateCheck, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5));
+
+	m_ftpUpdateGridSizer = new wxGridSizer(2);
+
+	m_ftpUrlStaticText = new wxStaticText(this, -1, _("FTP Url"));
+	m_ftpUpdateGridSizer->Add(m_ftpUrlStaticText, wxSizerFlags(1).Bottom().Border(wxALL, 5));
+
+	m_ftpPathStaticText = new wxStaticText(this, -1, _("FTP Path"));
+	m_ftpUpdateGridSizer->Add(m_ftpPathStaticText, wxSizerFlags(1).Bottom().Border(wxALL, 5));
+	m_ftpUrlTextCtrl = new wxTextCtrl(this, -1, "");
+	m_ftpUrlTextCtrl->SetValue(prefs->Read(WxCasCte::FTP_URL_KEY, WxCasCte::DEFAULT_FTP_URL));
+	m_ftpUrlTextCtrl->SetToolTip(_("Enter here the URL of your FTP server"));
+
+	m_ftpUpdateGridSizer->Add(m_ftpUrlTextCtrl, wxSizerFlags(1).Expand().Border(wxALL, 5));
+
+	m_ftpPathTextCtrl = new wxTextCtrl(this, -1, "");
+	m_ftpPathTextCtrl->SetValue(prefs->Read(WxCasCte::FTP_PATH_KEY, WxCasCte::DEFAULT_FTP_PATH));
+	m_ftpPathTextCtrl->SetToolTip(
+		_("Enter here the directory where putting your stat image on FTP server"));
+
+	m_ftpUpdateGridSizer->Add(m_ftpPathTextCtrl, wxSizerFlags(1).Expand().Border(wxALL, 5));
+
+	m_ftpUserStaticText = new wxStaticText(this, -1, _("User"));
+	m_ftpUpdateGridSizer->Add(m_ftpUserStaticText, wxSizerFlags(1).Bottom().Border(wxALL, 5));
+
+	m_ftpPasswdStaticText = new wxStaticText(this, -1, _("Password"));
+	m_ftpUpdateGridSizer->Add(m_ftpPasswdStaticText, wxSizerFlags(1).Bottom().Border(wxALL, 5));
+
+	m_ftpUserTextCtrl = new wxTextCtrl(this, -1, "");
+	m_ftpUserTextCtrl->SetValue(prefs->Read(WxCasCte::FTP_USER_KEY, WxCasCte::DEFAULT_FTP_USER));
+	m_ftpUserTextCtrl->SetToolTip(_("Enter here the User name to log into your FTP server"));
+
+	m_ftpUpdateGridSizer->Add(m_ftpUserTextCtrl, wxSizerFlags(1).Expand().Border(wxALL, 5));
+
+	m_ftpPasswdTextCtrl = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD);
+	m_ftpPasswdTextCtrl->SetValue(prefs->Read(WxCasCte::FTP_PASSWD_KEY, WxCasCte::DEFAULT_FTP_PASSWD));
+	m_ftpPasswdTextCtrl->SetToolTip(_("Enter here the User password to log into your FTP server"));
+
+	m_ftpUpdateGridSizer->Add(m_ftpPasswdTextCtrl, wxSizerFlags(1).Expand().Border(wxALL, 5));
+
+	m_ftpUpdateSBoxSizer->Add(
+		m_ftpUpdateGridSizer, wxSizerFlags(1).Expand().CenterVertical().Border(wxALL, 5));
+
+	m_ftpRateHBoxSizer = new wxBoxSizer(wxHORIZONTAL);
+	m_ftpUpdateSpinButton = new wxSpinCtrl(this, -1);
+	m_ftpUpdateSpinButton->SetRange(WxCasCte::MIN_FTP_RATE, WxCasCte::MAX_FTP_RATE);
+	m_ftpUpdateSpinButton->SetValue(
+		prefs->Read(WxCasCte::FTP_UPDATE_RATE_KEY, WxCasCte::DEFAULT_FTP_UPDATE_RATE));
+	m_ftpUpdateStaticText = new wxStaticText(this,
+		-1,
+		_("FTP update rate interval in minutes"),
+		wxDefaultPosition,
+		wxDefaultSize,
+		wxALIGN_CENTRE);
+	m_ftpRateHBoxSizer->Add(m_ftpUpdateSpinButton, wxSizerFlags().Center().Border(wxALL, 5));
+	m_ftpRateHBoxSizer->Add(m_ftpUpdateStaticText, wxSizerFlags(1).Center().Border(wxALL, 5));
+
+	m_ftpUpdateSBoxSizer->Add(
+		m_ftpRateHBoxSizer, wxSizerFlags().Expand().CenterVertical().Border(wxALL, 5));
+
+	m_mainVBox->Add(m_ftpUpdateSBoxSizer, wxSizerFlags().Expand().Center().Border(wxALL, 5));
+
+	if (prefs->Read(WxCasCte::ENABLE_AUTOSTATIMG_KEY, WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED)) {
+		m_autoStatImgCheck->SetValue(TRUE);
 	} else {
-		m_autoStatImgCheck->SetValue ( FALSE );
-		EnableAutoStatImgCtrls( FALSE );
+		m_autoStatImgCheck->SetValue(FALSE);
+		EnableAutoStatImgCtrls(FALSE);
 
-		m_ftpUpdateCheck->Enable ( FALSE );
-		EnableFtpUpdateCtrls( FALSE );
+		m_ftpUpdateCheck->Enable(FALSE);
+		EnableFtpUpdateCtrls(FALSE);
 	}
 
-	// Mask Ftp update disabled controls
-	if (prefs->Read( WxCasCte::ENABLE_FTP_UPDATE_KEY,
-	                 WxCasCte::DEFAULT_FTP_UPDATE_ISENABLED ) ) {
-		m_ftpUpdateCheck->SetValue( TRUE );
+	if (prefs->Read(WxCasCte::ENABLE_FTP_UPDATE_KEY, WxCasCte::DEFAULT_FTP_UPDATE_ISENABLED)) {
+		m_ftpUpdateCheck->SetValue(TRUE);
 	} else {
-		m_ftpUpdateCheck->SetValue ( FALSE );
-		EnableFtpUpdateCtrls( FALSE );
+		m_ftpUpdateCheck->SetValue(FALSE);
+		EnableFtpUpdateCtrls(FALSE);
 	}
 
-	// Separator line
-	m_staticLine = new wxStaticLine ( this, -1 );
-	m_mainVBox->Add ( m_staticLine, wxSizerFlags().Expand().Center().Border(wxALL, 0));
+	m_staticLine = new wxStaticLine(this, -1);
+	m_mainVBox->Add(m_staticLine, wxSizerFlags().Expand().Center().Border(wxALL, 0));
 
-	// Button bar
-	m_buttonHBox = new wxBoxSizer ( wxHORIZONTAL );
-	m_validateButton =
-	    new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) );
-	m_cancelButton =
-	    new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) );
+	m_buttonHBox = new wxBoxSizer(wxHORIZONTAL);
+	m_validateButton = new wxButton(this, ID_VALIDATE_BUTTON, wxString(_("Validate")));
+	m_cancelButton = new wxButton(this, wxID_CANCEL, wxString(_("Cancel")));
 
-	m_buttonHBox->Add ( m_validateButton, wxSizerFlags().Center().Border(wxALL, 5) );
-	m_buttonHBox->Add ( m_cancelButton, wxSizerFlags().Center().Border(wxALL, 5) );
+	m_buttonHBox->Add(m_validateButton, wxSizerFlags().Center().Border(wxALL, 5));
+	m_buttonHBox->Add(m_cancelButton, wxSizerFlags().Center().Border(wxALL, 5));
 
-	m_mainVBox->Add ( m_buttonHBox, wxSizerFlags().Center().Border(wxALL, 10) );
+	m_mainVBox->Add(m_buttonHBox, wxSizerFlags().Center().Border(wxALL, 10));
 
-	// Layout
-	SetAutoLayout ( TRUE );
-	SetSizerAndFit ( m_mainVBox );
+	SetAutoLayout(TRUE);
+	SetSizerAndFit(m_mainVBox);
 
-	m_validateButton->SetFocus ();
-	m_validateButton->SetDefault ();
+	m_validateButton->SetFocus();
+	m_validateButton->SetDefault();
 }
 
-// Destructor
-WxCasPrefs::~WxCasPrefs ()
-{}
+WxCasPrefs::~WxCasPrefs() {}
 
 // Events table
-wxBEGIN_EVENT_TABLE ( WxCasPrefs, wxDialog )
-EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton )
-EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton )
-EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
-EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
-EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
-wxEND_EVENT_TABLE ()
+wxBEGIN_EVENT_TABLE(WxCasPrefs, wxDialog)
+	EVT_BUTTON(ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton)
+	EVT_BUTTON(ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton)
+	EVT_BUTTON(ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton)
+	EVT_CHECKBOX(ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck)
+	EVT_CHECKBOX(ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck)
+wxEND_EVENT_TABLE()
 
 // Browse for OS Path
-void WxCasPrefs::OnOSPathBrowseButton ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasPrefs::OnOSPathBrowseButton(wxCommandEvent &WXUNUSED(event))
 {
-	const wxString &dir = wxDirSelector(_
-		("Folder containing your signature file"),
-	        WxCasCte::DEFAULT_AMULESIG_PATH,
+	const wxString &dir = wxDirSelector(_("Folder containing your signature file"),
+		WxCasCte::DEFAULT_AMULESIG_PATH,
 		wxDD_DEFAULT_STYLE,
-		wxDefaultPosition, this);
-	if ( !dir.empty () ) {
-		m_osPathTextCtrl->SetValue ( dir );
+		wxDefaultPosition,
+		this);
+	if (!dir.empty()) {
+		m_osPathTextCtrl->SetValue(dir);
 	}
 }
 
 // Browse for stat image Path
-void
-WxCasPrefs::OnAutoStatImgBrowseButton ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasPrefs::OnAutoStatImgBrowseButton(wxCommandEvent &WXUNUSED(event))
 {
-	const wxString & dir = wxDirSelector(
-		_("Folder where generating the statistic image"),
-	        WxCasCte::DEFAULT_AUTOSTATIMG_PATH,
+	const wxString &dir = wxDirSelector(_("Folder where generating the statistic image"),
+		WxCasCte::DEFAULT_AUTOSTATIMG_PATH,
 		wxDD_DEFAULT_STYLE,
-		wxDefaultPosition, this);
+		wxDefaultPosition,
+		this);
 
-	if ( !dir.empty () ) {
-		m_autoStatImgTextCtrl->SetValue ( dir );
+	if (!dir.empty()) {
+		m_autoStatImgTextCtrl->SetValue(dir);
 	}
 }
 
 // Auto Generate Stat Image Check Button
-void
-WxCasPrefs::OnAutoStatImgCheck ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasPrefs::OnAutoStatImgCheck(wxCommandEvent &WXUNUSED(event))
 {
-	if ( m_autoStatImgCheck->GetValue () ) {
-		EnableAutoStatImgCtrls( TRUE );
+	if (m_autoStatImgCheck->GetValue()) {
+		EnableAutoStatImgCtrls(TRUE);
 
-		m_ftpUpdateCheck->Enable ( TRUE );
-		if ( m_ftpUpdateCheck->GetValue () ) {
-			EnableFtpUpdateCtrls( TRUE );
+		m_ftpUpdateCheck->Enable(TRUE);
+		if (m_ftpUpdateCheck->GetValue()) {
+			EnableFtpUpdateCtrls(TRUE);
 		}
 	} else {
-		EnableAutoStatImgCtrls( FALSE );
+		EnableAutoStatImgCtrls(FALSE);
 
-		m_ftpUpdateCheck->Enable ( FALSE );
-		EnableFtpUpdateCtrls( FALSE );
+		m_ftpUpdateCheck->Enable(FALSE);
+		EnableFtpUpdateCtrls(FALSE);
 	}
 }
 
 // Ftp update Check Button
-void
-WxCasPrefs::OnFtpUpdateCheck ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasPrefs::OnFtpUpdateCheck(wxCommandEvent &WXUNUSED(event))
 {
-	if ( m_ftpUpdateCheck->GetValue () ) {
-		EnableFtpUpdateCtrls( TRUE );
+	if (m_ftpUpdateCheck->GetValue()) {
+		EnableFtpUpdateCtrls(TRUE);
 	} else {
-		EnableFtpUpdateCtrls( FALSE );
+		EnableFtpUpdateCtrls(FALSE);
 	}
 }
 // Validate Prefs
-void
-WxCasPrefs::OnValidateButton ( wxCommandEvent& WXUNUSED( event ) )
+void WxCasPrefs::OnValidateButton(wxCommandEvent &WXUNUSED(event))
 {
 	// Prefs
-	wxConfigBase * prefs = wxConfigBase::Get();
+	wxConfigBase *prefs = wxConfigBase::Get();
 
 	// Write amulesig dir
-	if ( prefs->Read ( WxCasCte::AMULESIG_PATH_KEY,
-	                   WxCasCte::DEFAULT_AMULESIG_PATH ) !=
-	        m_osPathTextCtrl->GetValue () ) {
+	if (prefs->Read(WxCasCte::AMULESIG_PATH_KEY, WxCasCte::DEFAULT_AMULESIG_PATH) !=
+		m_osPathTextCtrl->GetValue()) {
 		// Reload amulesig.dat
-		wxFileName amulesig( m_osPathTextCtrl->GetValue (),
-		                     WxCasCte::AMULESIG_FILENAME );
-		dynamic_cast<WxCasFrame*>( GetParent() )->SetAmuleSigFile( amulesig );
+		wxFileName amulesig(m_osPathTextCtrl->GetValue(), WxCasCte::AMULESIG_FILENAME);
+		dynamic_cast<WxCasFrame *>(GetParent())->SetAmuleSigFile(amulesig);
 
-		prefs->Write ( WxCasCte::AMULESIG_PATH_KEY,
-		               m_osPathTextCtrl->GetValue () );
+		prefs->Write(WxCasCte::AMULESIG_PATH_KEY, m_osPathTextCtrl->GetValue());
 	}
 
 	// Restart timer if refresh interval has changed
-	if ( prefs->Read ( WxCasCte::REFRESH_RATE_KEY, WxCasCte::DEFAULT_REFRESH_RATE ) !=
-	        m_refreshSpinButton->GetValue () ) {
-		dynamic_cast<WxCasFrame*>( GetParent() )->ChangeRefreshPeriod( 1000 * m_refreshSpinButton->GetValue () );
+	if (prefs->Read(WxCasCte::REFRESH_RATE_KEY, WxCasCte::DEFAULT_REFRESH_RATE) !=
+		m_refreshSpinButton->GetValue()) {
+		dynamic_cast<WxCasFrame *>(GetParent())
+			->ChangeRefreshPeriod(1000 * m_refreshSpinButton->GetValue());
 
 		// Write refresh interval
-		prefs->Write ( WxCasCte::REFRESH_RATE_KEY,
-		               m_refreshSpinButton->GetValue () );
+		prefs->Write(WxCasCte::REFRESH_RATE_KEY, m_refreshSpinButton->GetValue());
 	}
 
 	// Write auto stat img state
-	prefs->Write ( WxCasCte::ENABLE_AUTOSTATIMG_KEY,
-	               m_autoStatImgCheck->GetValue () );
+	prefs->Write(WxCasCte::ENABLE_AUTOSTATIMG_KEY, m_autoStatImgCheck->GetValue());
 
 	// If auto stat img is enabled
-	if ( m_autoStatImgCheck->GetValue () ) {
-		prefs->Write ( WxCasCte::AUTOSTATIMG_DIR_KEY,
-		               m_autoStatImgTextCtrl->GetValue () );
+	if (m_autoStatImgCheck->GetValue()) {
+		prefs->Write(WxCasCte::AUTOSTATIMG_DIR_KEY, m_autoStatImgTextCtrl->GetValue());
 
-		prefs->Write ( WxCasCte::AUTOSTATIMG_TYPE_KEY,
-		               m_autoStatImgCombo->GetValue () );
+		prefs->Write(WxCasCte::AUTOSTATIMG_TYPE_KEY, m_autoStatImgCombo->GetValue());
 
 		// Write Ftp update state
-		prefs->Write ( WxCasCte::ENABLE_FTP_UPDATE_KEY,
-		               m_ftpUpdateCheck->GetValue () );
+		prefs->Write(WxCasCte::ENABLE_FTP_UPDATE_KEY, m_ftpUpdateCheck->GetValue());
 
 		// If Ftp update is enabled
-		if ( m_ftpUpdateCheck->GetValue () ) {
+		if (m_ftpUpdateCheck->GetValue()) {
 			// Restart timer if update interval has changed
-			if ( prefs->Read ( WxCasCte::FTP_UPDATE_RATE_KEY, WxCasCte::DEFAULT_FTP_UPDATE_RATE ) !=
-			        m_ftpUpdateSpinButton->GetValue () ) {
-				dynamic_cast<WxCasFrame*>( GetParent() )->ChangeFtpUpdatePeriod( 60000 * m_refreshSpinButton->GetValue () );
-				prefs->Write ( WxCasCte::FTP_UPDATE_RATE_KEY,
-				               m_ftpUpdateSpinButton->GetValue () );
+			if (prefs->Read(WxCasCte::FTP_UPDATE_RATE_KEY, WxCasCte::DEFAULT_FTP_UPDATE_RATE) !=
+				m_ftpUpdateSpinButton->GetValue()) {
+				dynamic_cast<WxCasFrame *>(GetParent())
+					->ChangeFtpUpdatePeriod(60000 * m_refreshSpinButton->GetValue());
+				prefs->Write(
+					WxCasCte::FTP_UPDATE_RATE_KEY, m_ftpUpdateSpinButton->GetValue());
 			}
 			// Write Ftp parameters
-			prefs->Write ( WxCasCte::FTP_URL_KEY,
-			               m_ftpUrlTextCtrl->GetValue () );
+			prefs->Write(WxCasCte::FTP_URL_KEY, m_ftpUrlTextCtrl->GetValue());
 
-			prefs->Write ( WxCasCte::FTP_PATH_KEY,
-			               m_ftpPathTextCtrl->GetValue () );
+			prefs->Write(WxCasCte::FTP_PATH_KEY, m_ftpPathTextCtrl->GetValue());
 
-			prefs->Write ( WxCasCte::FTP_USER_KEY,
-			               m_ftpUserTextCtrl->GetValue () );
+			prefs->Write(WxCasCte::FTP_USER_KEY, m_ftpUserTextCtrl->GetValue());
 
-			prefs->Write ( WxCasCte::FTP_PASSWD_KEY,
-			               m_ftpPasswdTextCtrl->GetValue () );
+			prefs->Write(WxCasCte::FTP_PASSWD_KEY, m_ftpPasswdTextCtrl->GetValue());
 		}
 	}
 
@@ -422,31 +351,29 @@
 	prefs->Flush();
 
 	// Close window
-	this->EndModal ( this->GetReturnCode () );
+	this->EndModal(this->GetReturnCode());
 }
 
 // Enable/Disable auto img ctrls
-void
-WxCasPrefs::EnableAutoStatImgCtrls( bool state )
+void WxCasPrefs::EnableAutoStatImgCtrls(bool state)
 {
-	m_autoStatImgTextCtrl->Enable ( state );
-	m_autoStatImgButton->Enable ( state );
-	m_autoStatImgCombo->Enable ( state );
+	m_autoStatImgTextCtrl->Enable(state);
+	m_autoStatImgButton->Enable(state);
+	m_autoStatImgCombo->Enable(state);
 }
 
 // Enable/Disable Ftp update ctrls
-void
-WxCasPrefs::EnableFtpUpdateCtrls( bool state )
+void WxCasPrefs::EnableFtpUpdateCtrls(bool state)
 {
-	m_ftpUpdateSpinButton->Enable ( state );
-	m_ftpUpdateStaticText->Enable ( state );
-	m_ftpUrlTextCtrl->Enable ( state );
-	m_ftpUrlStaticText->Enable ( state );
-	m_ftpPathTextCtrl->Enable ( state );
-	m_ftpPathStaticText->Enable ( state );
-	m_ftpUserTextCtrl->Enable ( state );
-	m_ftpUserStaticText->Enable ( state );
-	m_ftpPasswdTextCtrl->Enable ( state );
-	m_ftpPasswdStaticText->Enable ( state );
+	m_ftpUpdateSpinButton->Enable(state);
+	m_ftpUpdateStaticText->Enable(state);
+	m_ftpUrlTextCtrl->Enable(state);
+	m_ftpUrlStaticText->Enable(state);
+	m_ftpPathTextCtrl->Enable(state);
+	m_ftpPathStaticText->Enable(state);
+	m_ftpUserTextCtrl->Enable(state);
+	m_ftpUserStaticText->Enable(state);
+	m_ftpPasswdTextCtrl->Enable(state);
+	m_ftpPasswdStaticText->Enable(state);
 }
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcasprefs.h -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcasprefs.h Changed

@@ -30,7 +30,6 @@
 #ifndef _WXCASPREFS_H
 #define _WXCASPREFS_H
 
-
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
 #include <wx/dialog.h>
@@ -42,10 +41,10 @@
 #include <wx/textctrl.h>
 
 /// Preference Dialog
-class WxCasPrefs: public wxDialog
+class WxCasPrefs : public wxDialog
 {
 private:
-	wxBoxSizer * m_mainVBox;
+	wxBoxSizer *m_mainVBox;
 	wxStaticBox *m_osPathSBox;
 	wxStaticBoxSizer *m_osPathSBoxSizer;
 	wxTextCtrl *m_osPathTextCtrl;
@@ -86,34 +85,34 @@
 	wxButton *m_validateButton;
 	wxButton *m_cancelButton;
 
-	void EnableAutoStatImgCtrls( bool state );
-	void EnableFtpUpdateCtrls( bool state );
+	void EnableAutoStatImgCtrls(bool state);
+	void EnableFtpUpdateCtrls(bool state);
 
 	enum
 	{
-	    ID_OSPATH_BROWSE_BUTTON = 100,
-	    ID_AUTOSTATIMG_CHECK,
-	    ID_AUTOSTATIMG_COMBO,
-	    ID_AUTOSTATIMG_BROWSE_BUTTON,
-	    ID_FTP_UPDATE_CHECK,
-	    ID_VALIDATE_BUTTON
+		ID_OSPATH_BROWSE_BUTTON = 100,
+		ID_AUTOSTATIMG_CHECK,
+		ID_AUTOSTATIMG_COMBO,
+		ID_AUTOSTATIMG_BROWSE_BUTTON,
+		ID_FTP_UPDATE_CHECK,
+		ID_VALIDATE_BUTTON
 	};
 
 protected:
-	void OnOSPathBrowseButton ( wxCommandEvent & event );
-	void OnValidateButton ( wxCommandEvent & event );
-	void OnAutoStatImgBrowseButton ( wxCommandEvent & event );
-	void OnAutoStatImgCheck ( wxCommandEvent & event );
-	void OnFtpUpdateCheck ( wxCommandEvent & event );
+	void OnOSPathBrowseButton(wxCommandEvent &event);
+	void OnValidateButton(wxCommandEvent &event);
+	void OnAutoStatImgBrowseButton(wxCommandEvent &event);
+	void OnAutoStatImgCheck(wxCommandEvent &event);
+	void OnFtpUpdateCheck(wxCommandEvent &event);
 
 	wxDECLARE_EVENT_TABLE();
-public:
 
+public:
 	/// Constructor
-	WxCasPrefs ( wxWindow * parent );
+	WxCasPrefs(wxWindow *parent);
 
 	/// Destructor
-	~WxCasPrefs ();
+	~WxCasPrefs();
 };
 
 #endif /* _WXCASPREFS_H */

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcasprint.cpp -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcasprint.cpp Changed

amule-3.0.1.tar.gz/src/utils/wxCas/src/wxcasprint.h -> amule-3.1.0.tar.gz/src/utils/wxCas/src/wxcasprint.h Changed

amule-3.0.1.tar.gz/src/utils/wxCas/wxcas.desktop -> amule-3.1.0.tar.gz/src/utils/wxCas/wxcas.desktop Changed

amule-3.1.0.tar.gz/src/webapi Added

amule-3.1.0.tar.gz/src/webapi/AmuleApiConfig.cpp Added

@@ -0,0 +1,496 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "AmuleApiConfig.h"
+
+#include <AtomicFile.h>
+
+#include <wx/file.h>
+#include <wx/fileconf.h>
+#include <wx/filefn.h>
+#include <wx/filename.h>
+#include <wx/tokenzr.h>
+#include <wx/utils.h>
+#include <wx/wfstream.h>
+
+#include "../WarningsPush_CryptoPP.h"
+#include <cryptopp/osrng.h>
+#include "../WarningsPop.h"
+
+#include <cctype>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+
+#ifndef _WIN32
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
+namespace
+{
+
+bool HexDecode(const std::string &in, std::vector<unsigned char> &out)
+{
+	if (in.size() % 2 != 0)
+		return false;
+	out.clear();
+	out.reserve(in.size() / 2);
+	auto nibble = (char c, unsigned &v) -> bool {
+		if (c >= '0' && c <= '9') {
+			v = c - '0';
+			return true;
+		}
+		if (c >= 'a' && c <= 'f') {
+			v = c - 'a' + 10;
+			return true;
+		}
+		if (c >= 'A' && c <= 'F') {
+			v = c - 'A' + 10;
+			return true;
+		}
+		return false;
+	};
+	for (size_t i = 0; i < in.size(); i += 2) {
+		unsigned hi, lo;
+		if (!nibble(ini, hi) || !nibble(ini + 1, lo))
+			return false;
+		out.push_back(static_cast<unsigned char>((hi << 4) | lo));
+	}
+	return true;
+}
+
+std::string HexEncode(const std::vector<unsigned char> &data)
+{
+	static const char hex = "0123456789abcdef";
+	std::string out;
+	out.resize(data.size() * 2);
+	for (size_t i = 0; i < data.size(); ++i) {
+		outi * 2 = hex(datai >> 4) & 0x0F;
+		outi * 2 + 1 = hexdatai & 0x0F;
+	}
+	return out;
+}
+
+// Trim ASCII whitespace from both ends. Used on the jwt-secret file's single line; tolerates a
+// trailing CR (a Windows-edited file checked out on POSIX) and stray indentation.
+std::string Trim(const std::string &s)
+{
+	size_t a = 0;
+	while (a < s.size() && std::isspace(static_cast<unsigned char>(sa)))
+		++a;
+	size_t b = s.size();
+	while (b > a && std::isspace(static_cast<unsigned char>(sb - 1)))
+		--b;
+	return s.substr(a, b - a);
+}
+
+wxString JoinPath(const wxString &dir, const wxString &leaf)
+{
+	wxFileName fn(dir, leaf);
+	return fn.GetFullPath();
+}
+
+// Thin wx wrapper over webcommon::WriteFileAtomic0600 so the call sites here can keep passing
+// wxString paths. The writer itself is shared with the credential store and with amuled, so the
+// permission and atomicity guarantees cannot drift.
+bool WriteFileAtomic0600(const wxString &target_path, const std::string &body)
+{
+	return webcommon::WriteFileAtomic0600(std::string(target_path.utf8_str()), body);
+}
+
+} // namespace
+
+bool CAmuleApiConfig::Load(const wxString &config_dir)
+{
+	m_configDir = config_dir;
+	m_lastError.clear();
+
+	if (!wxDirExists(m_configDir)) {
+		if (!wxMkdir(m_configDir, 0700)) {
+			m_lastError = "config dir does not exist and could not be created: " +
+				      std::string(m_configDir.utf8_str());
+			return false;
+		}
+	}
+
+	const wxString cfg_path = JoinPath(m_configDir, "amuleapi.conf");
+	const wxString secret_path = JoinPath(m_configDir, "amuleapi-jwt-secret");
+	const wxString pwfile_path = JoinPath(m_configDir, "amuleapi-passwords");
+
+	if (!LoadAmuleapiConf(cfg_path))
+		return false;
+	if (!LoadJwtSecret(secret_path))
+		return false;
+	if (!LoadPasswords(pwfile_path))
+		return false;
+
+	return true;
+}
+
+bool CAmuleApiConfig::LoadAmuleapiConf(const wxString &path)
+{
+	const char *defaults = "Server\n"
+			       "BindAddress=127.0.0.1\n"
+			       "Port=4713\n"
+			       "AllowCORS=0\n"
+			       // Written empty so the key is discoverable: with AllowCORS=1
+			       // and no entries the echo is anonymous-only, and a cross-origin
+			       // client that logs in needs its origin listed here.
+			       "CorsOriginAllowlist=\n"
+			       "StaticRoot=\n"
+			       "\n"
+			       "EC\n"
+			       "Host=127.0.0.1\n"
+			       "Port=4712\n"
+			       "Password=\n"
+			       "Encryption=1\n"
+			       "\n"
+			       "Auth\n"
+			       "LoginFailureWindowSeconds=60\n"
+			       "LoginFailureThreshold=5\n"
+			       "LoginLockoutSeconds=300\n"
+			       "TokenFailureWindowSeconds=60\n"
+			       "TokenFailureThreshold=30\n"
+			       "TokenLockoutSeconds=300\n"
+			       "\n"
+			       "Streaming\n"
+			       "EventBusRingCapacity=16384\n"
+			       "MaxConcurrentFileResponses=6\n";
+
+	if (!wxFileExists(path)) {
+		// First run: write a mode-0600 defaults file. The EC password stays empty and
+		// amuleapi refuses to connect until it is filled in; amuleapi.conf carries
+		// `EC/Password=` in cleartext, so owner-only mode matches the jwt-secret and
+		// passwords files. WriteFileAtomic0600 (write-temp, fsync, rename) so a crash mid-
+		// write cannot leave a truncated config the next start would load as partial.
+		if (!WriteFileAtomic0600(path, std::string(defaults))) {
+			m_lastError = "cannot create amuleapi.conf: " + std::string(path.utf8_str());
+			return false;
+		}
+	}
+
+	// Enforce 0600 on every load so a hand-edit, or a `cp` from a
+	// loose-permission source, does not silently widen the password's exposure.
+	if (!EnforceOwnerOnly(path))
+		return false;
+
+	wxFileConfig cfg("", "", path, "", wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_RELATIVE_PATH);
+
+	wxString s;
+	long n = 0;
+
+	if (cfg.Read("/Server/BindAddress", &s) && !s.IsEmpty()) {
+		m_server.bind_address = std::string(s.utf8_str());
+	}
+	if (cfg.Read("/Server/Port", &n) && n > 0 && n < 65536) {
+		m_server.port = static_cast<unsigned>(n);
+	}
+	{
+		long allow = 0;
+		if (cfg.Read("/Server/AllowCORS", &allow)) {
+			m_server.allow_cors = (allow != 0);
+		}
+	}
+	if (cfg.Read("/Server/CorsOriginAllowlist", &s) && !s.IsEmpty()) {
+		// Comma-separated. Trimmed; empty entries dropped.
+		wxStringTokenizer tk(s, ",");
+		while (tk.HasMoreTokens()) {
+			const wxString item = tk.GetNextToken().Trim(true).Trim(false);
+			if (!item.IsEmpty()) {
+				m_server.cors_origin_allowlist.emplace_back(item.utf8_str());
+			}
+		}
+	}
+	if (cfg.Read("/Server/StaticRoot", &s)) {
+		const wxString trimmed = s.Trim(true).Trim(false);
+		if (!trimmed.IsEmpty()) {
+			m_server.static_root = std::string(trimmed.utf8_str());
+		}
+	}
+
+	if (cfg.Read("/EC/Host", &s) && !s.IsEmpty()) {
+		m_ec.host = std::string(s.utf8_str());
+	}
+	if (cfg.Read("/EC/Port", &n) && n > 0 && n < 65536) {
+		m_ec.port = static_cast<unsigned>(n);
+	}
+	if (cfg.Read("/EC/Password", &s)) {
+		m_ec.password = std::string(s.utf8_str());
+	}
+	if (cfg.Read("/EC/Encryption", &n)) {
+		m_ec.encryption = (n != 0);
+	}
+
+	if (cfg.Read("/Auth/LoginFailureWindowSeconds", &n) && n > 0) {
+		m_auth.login_failure_window_seconds = static_cast<unsigned>(n);
+	}
+	if (cfg.Read("/Auth/LoginFailureThreshold", &n) && n > 0) {
+		m_auth.login_failure_threshold = static_cast<unsigned>(n);
+	}
+	if (cfg.Read("/Auth/LoginLockoutSeconds", &n) && n > 0) {
+		m_auth.login_lockout_seconds = static_cast<unsigned>(n);
+	}
+	if (cfg.Read("/Auth/TokenFailureWindowSeconds", &n) && n > 0) {
+		m_auth.token_failure_window_seconds = static_cast<unsigned>(n);
+	}
+	if (cfg.Read("/Auth/TokenFailureThreshold", &n) && n > 0) {
+		m_auth.token_failure_threshold = static_cast<unsigned>(n);
+	}
+	if (cfg.Read("/Auth/TokenLockoutSeconds", &n) && n > 0) {
+		m_auth.token_lockout_seconds = static_cast<unsigned>(n);
+	}
+
+	// `Streaming/EventBusRingCapacity`. Anything below the CEventBus floor is
+	// clamped up by the bus itself, so any positive value is accepted here.
+	if (cfg.Read("/Streaming/EventBusRingCapacity", &n) && n > 0) {
+		m_streaming.event_bus_ring_capacity = static_cast<unsigned>(n);
+	}
+
+	// `Streaming/MaxConcurrentFileResponses`. Bounded on both sides rather than merely
+	// positive: unlike the ring above, nothing downstream second-guesses this one, and every
+	// slot it grants pins a file descriptor and a 64 KiB buffer until the peer drains. 256
+	// keeps the worst case in the tens of megabytes; anything outside the band is a typo, and a
+	// typo gets the default.
+	if (cfg.Read("/Streaming/MaxConcurrentFileResponses", &n) && n > 0 && n <= 256) {
+		m_streaming.max_concurrent_file_responses = static_cast<unsigned>(n);
+	}
+
+	return true;
+}
+
+bool CAmuleApiConfig::LoadJwtSecret(const wxString &path)
+{
+	// Rotation is operator-manual: delete amuleapi-jwt-secret and restart amuleapi, which
+	// generates a fresh secret and invalidates every previously issued token. Documented in the
+	// amuleapi(1) FILES section.
+	if (!wxFileExists(path)) {
+		// Auto-generate 32 random bytes. The new file is 0600 from
+		// the moment it lands on disk (open + chmod before any data).
+		std::vector<unsigned char> secret(32, 0);
+		CryptoPP::AutoSeededRandomPool rng;
+		rng.GenerateBlock(secret.data(), secret.size());
+		if (!WriteJwtSecretFile(m_configDir, secret)) {
+			return false;
+		}
+		m_jwtSecret = std::move(secret);
+		return true;
+	}
+
+	if (!EnforceOwnerOnly(path))
+		return false;
+
+	wxFile f(path, wxFile::read);
+	if (!f.IsOpened()) {
+		m_lastError = "cannot open amuleapi-jwt-secret";
+		return false;
+	}
+	const wxFileOffset sz = f.Length();
+	// 64 hex chars + optional trailing newline. Capped generously to catch
+	// "someone pasted a 2 KB blob" without truncating valid edits.
+	if (sz < 64 || sz > 4096) {
+		m_lastError = "amuleapi-jwt-secret has unexpected size; "
+			      "expected 64 hex chars (256-bit secret)";
+		return false;
+	}
+	std::string buf(static_cast<size_t>(sz), '\0');
+	if (f.Read(&buf0, buf.size()) != static_cast<ssize_t>(buf.size())) {
+		m_lastError = "amuleapi-jwt-secret read failed";
+		return false;
+	}
+	const std::string trimmed = Trim(buf);
+	if (trimmed.size() != 64) {
+		m_lastError = "amuleapi-jwt-secret is not 64 hex chars after trim";
+		return false;
+	}
+	std::vector<unsigned char> decoded;
+	if (!HexDecode(trimmed, decoded) || decoded.size() != 32) {
+		m_lastError = "amuleapi-jwt-secret is not valid hex";
+		return false;
+	}
+	m_jwtSecret = std::move(decoded);
+	return true;
+}
+
+bool CAmuleApiConfig::LoadPasswords(const wxString &path)
+{
+	const std::string dir(m_configDir.utf8_str());
+
+	if (!wxFileExists(path)) {
+		// Auto-create empty so the operator sees the file exists, with the right mode bits.
+		// `amuleapi --set-admin-pass=<plain>` then hashes and writes the admin record;
+		// amulegui and the preferences dialog write the same file.
+		std::string err;
+		if (!webcommon::SaveCredentialsFile(dir, m_credentials, err)) {
+			m_lastError = "cannot create amuleapi-passwords: " + err;
+			return false;
+		}
+		return true;
+	}
+
+	if (!EnforceOwnerOnly(path))
+		return false;
+
+	std::string err;
+	if (!webcommon::LoadCredentialsFile(dir, m_credentials, err)) {
+		m_lastError = "amuleapi-passwords: " + err;
+		return false;
+	}
+	return true;
+}
+
+bool CAmuleApiConfig::HasAnyCredential() const
+{
+	return !m_credentials.admin.empty() || !m_credentials.guest.empty();
+}
+
+std::time_t CAmuleApiConfig::CredentialsChangedAt() const
+{
+	// Second granularity, which leaves a token minted in the same second as a password change
+	// alive. Bounded and self-correcting: the next change moves the cutoff again, and one
+	// second is far inside the time to notice a leak.
+	wxFileName fn(JoinPath(m_configDir, "amuleapi-passwords"));
+	if (!fn.FileExists()) {
+		return 0;
+	}
+	return fn.GetModificationTime().GetTicks();
+}
+
+void CAmuleApiConfig::ReloadCredentials()
+{
+	webcommon::Credentials fresh;
+	std::string err;
+	if (!webcommon::LoadCredentialsFile(std::string(m_configDir.utf8_str()), fresh, err)) {
+		// Keep what we have. A transient read failure, or a file another
+		// process is midway through replacing, must not lock anyone out.
+		return;
+	}
+	// A missing file loads as an empty set, deliberately: an operator who deletes amuleapi-
+	// passwords to lock everyone out should not have to restart the daemon for it to take
+	// effect.
+	m_credentials = fresh;
+}
+
+CAmuleApiConfig::MatchedRole CAmuleApiConfig::VerifyPassword(const std::string &md5_hex)
+{
+	ReloadCredentials();
+
+	bool needs_rehash = false;
+	if (!m_credentials.admin.empty() &&
+		webcommon::VerifyMd5Hex(md5_hex, m_credentials.admin, &needs_rehash)) {
+		if (needs_rehash)
+			RehashInPlace(webcommon::kAdminCredential, md5_hex);
+		return MatchedRole::Admin;
+	}
+	if (!m_credentials.guest.empty() &&
+		webcommon::VerifyMd5Hex(md5_hex, m_credentials.guest, &needs_rehash)) {
+		if (needs_rehash)
+			RehashInPlace(webcommon::kGuestCredential, md5_hex);
+		return MatchedRole::Guest;
+	}
+	return MatchedRole::None;
+}
+
+void CAmuleApiConfig::RehashInPlace(webcommon::CredentialRole role, const std::string &md5_hex)
+{
+	// Re-storing the same password at the current cost is housekeeping, not a rotation, so the
+	// file's modification time must not move: that timestamp is what invalidates sessions.
+	wxFileName fn(JoinPath(m_configDir, "amuleapi-passwords"));
+	const bool had_file = fn.FileExists();
+	wxDateTime access, modified, created;
+	if (had_file) {
+		fn.GetTimes(&access, &modified, &created);
+	}
+
+	if (!SetPassword(role, md5_hex)) {
+		// The old record still verifies, so a failed upgrade costs
+		// nothing but the next login trying again.
+		return;
+	}
+
+	if (had_file) {
+		fn.SetTimes(&access, &modified, nullptr);
+	}
+}
+
+bool CAmuleApiConfig::SetPassword(webcommon::CredentialRole role, const std::string &md5_hex)
+{
+	std::string record;
+	if (!webcommon::MakeRecord(md5_hex, record)) {
+		m_lastError = "password digest is not 32 hex chars";
+		return false;
+	}
+
+	std::string err;
+	if (!webcommon::UpdateCredentialFile(std::string(m_configDir.utf8_str()), role, record, err)) {
+		m_lastError = "cannot write amuleapi-passwords: " + err;
+		return false;
+	}
+
+	if (role == webcommon::kAdminCredential)
+		m_credentials.admin = record;
+	else
+		m_credentials.guest = record;
+	return true;
+}
+
+bool CAmuleApiConfig::EnforceOwnerOnly(const wxString &path)
+{
+#ifdef _WIN32
+	(void)path;
+	return true;
+#else
+	struct stat st;
+	const std::string p(path.utf8_str());
+	if (stat(p.c_str(), &st) != 0) {
+		m_lastError = "stat failed for " + p;
+		return false;
+	}
+	if ((st.st_mode & 0077) != 0) {
+		char buf256;
+		std::snprintf(buf,
+			sizeof(buf),
+			"%s has mode 0%o; expected 0600 (owner read/write only). "
+			"Fix with: chmod 600 \"%s\"",
+			p.c_str(),
+			st.st_mode & 0777,
+			p.c_str());
+		m_lastError = buf;
+		return false;
+	}
+	return true;
+#endif
+}
+
+bool CAmuleApiConfig::WriteJwtSecretFile(
+	const wxString &config_dir, const std::vector<unsigned char> &secret_32)
+{
+	if (secret_32.size() != 32) {
+		m_lastError = "WriteJwtSecretFile: expected 32 bytes";
+		return false;
+	}
+	const wxString path = JoinPath(config_dir, "amuleapi-jwt-secret");
+	return WriteFileAtomic0600(path, HexEncode(secret_32) + "\n");
+}

amule-3.1.0.tar.gz/src/webapi/AmuleApiConfig.h Added

@@ -0,0 +1,205 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_CONFIG_H
+#define WEBAPI_CONFIG_H
+
+#include <ctime>
+#include <string>
+#include <vector>
+
+#include <wx/string.h>
+
+#include "Credentials.h"
+
+// amuleapi's three on-disk config files, in the user's amule config dir, independent of
+// remote.conf:
+//
+//   amuleapi.conf         INI -- HTTP bind + port + EC connection params + auth tunables
+//   amuleapi-jwt-secret   raw hex (64 chars + \n) -- HMAC-SHA-256 key
+//   amuleapi-passwords    two-line text -- admin=<record> / guest=<record>
+//
+// The credential records are owned by webcommon/Credentials.h, not by this class: amuled and
+// monolithic aMule write the same file when a password is changed from amulegui or the preferences
+// dialog, so the format has exactly one implementation and the three cannot drift.
+//
+// `amuleapi-jwt-secret` is auto-generated with 32 random bytes on first run. `amuleapi-passwords`
+// may be empty, in which case the daemon refuses /auth/login until at least one role is set via
+// `amuleapi --set-admin-pass=...`, from amulegui, or over REST. `amuleapi.conf` is created from
+// defaults if missing.
+//
+// POSIX: both secret files must be 0600; looser bits make the daemon refuse to start with an
+// actionable error. Windows has no equivalent enforcement (QUICKSTART covers ACL mitigation).
+
+class CAmuleApiConfig
+{
+public:
+	struct Server
+	{
+		std::string bind_address = "127.0.0.1";
+		unsigned port = 4713;
+		bool allow_cors = false;
+		std::vector<std::string> cors_origin_allowlist;
+		// Filesystem root of a bundled web frontend. Empty (the default) means an API-only
+		// deployment, so non-/api/ paths return 404. Non-empty means the daemon serves
+		// GET/HEAD for paths outside /api/ from here, with an index.html SPA fallback for
+		// extension-less misses.
+		std::string static_root;
+	};
+
+	struct Ec
+	{
+		std::string host = "127.0.0.1";
+		unsigned port = 4712;
+		std::string password; // matches amuled's ExternalConnect/Password
+		// Offer EC transport encryption. On by default for every destination; only
+		// the client knows what it dialed, so the choice lives here, not in amuled.
+		bool encryption = true;
+	};
+
+	struct Auth
+	{
+		unsigned login_failure_window_seconds = 60;
+		unsigned login_failure_threshold = 5;
+		unsigned login_lockout_seconds = 300;
+		// The generic 401 limiter, counting every rejected token on any authenticated route
+		// rather than password failures on /auth/login. A documented knob like the three
+		// above, so an operator can loosen the one a browser tab left open overnight
+		// actually trips.
+		unsigned token_failure_window_seconds = 60;
+		unsigned token_failure_threshold = 30;
+		unsigned token_lockout_seconds = 300;
+	};
+
+	struct Streaming
+	{
+		// SSE ring capacity. Sized for a cold-start tick on a busy node (5K downloads plus
+		// 5K shared can publish ~10K `*_added` in one tick before any subscriber drains).
+		// Values below CEventBus::kMinCapacity are clamped up at the bus level. Memory is
+		// roughly capacity x ~1 KB of JSON payload.
+		unsigned event_bus_ring_capacity = 16384;
+
+		// Concurrent file-backed responses allowed on `GET /shared/{hash}/content`; over it
+		// the transport answers 503 plus Retry-After. Six suits one mechanical disk shared
+		// with the hasher and the ed2k uploader, but it is a GLOBAL budget: behind a
+		// reverse proxy every client arrives from one address, so there is no per-user
+		// fairness in it. Each slot pins a file descriptor and a 64 KiB buffer for as long
+		// as the peer takes to drain, so a four-digit value would trade away the RSS
+		// ceiling the streaming path exists to hold.
+		unsigned max_concurrent_file_responses = 6;
+	};
+
+	// Bring everything into memory from `config_dir`. Returns false on a missing required
+	// field, a mode-bit failure, or malformed INI, leaving the human-readable reason in
+	// LastError().
+	bool Load(const wxString &config_dir);
+
+	const wxString &ConfigDir() const { return m_configDir; }
+	const Server &ServerCfg() const { return m_server; }
+	const Ec &EcCfg() const { return m_ec; }
+	const Auth &AuthCfg() const { return m_auth; }
+	const Streaming &StreamingCfg() const { return m_streaming; }
+
+	// Raw HMAC secret (32 bytes when loaded from a valid 64-char
+	// hex file). May be reloaded from disk via Load(...).
+	const std::vector<unsigned char> &JwtSecret() const { return m_jwtSecret; }
+
+	// Stored credential records for the two roles, in whatever form amuleapi-passwords holds
+	// them: a PHC string normally, a bare MD5 for a config predating the KDF. Empty when the
+	// role is unset. These are NOT digests to compare an input against -- use VerifyPassword
+	// for that, which also brings the file-freshness check with it.
+	const std::string &AdminCredential() const { return m_credentials.admin; }
+	const std::string &GuestCredential() const { return m_credentials.guest; }
+
+	// True when at least one role can log in. Gates both the non-loopback
+	// bind refusal and the `login_disabled` login response.
+	bool HasAnyCredential() const;
+
+	// Which role a presented password belongs to, if any.
+	enum class MatchedRole
+	{
+		None,
+		Admin,
+		Guest
+	};
+
+	// Verifies an MD5 hex digest against both roles, admin first.
+	//
+	// Not const, for two reasons. It re-reads amuleapi-passwords first, so a password set by
+	// amuled or by aMule's preferences dialog takes effect without restarting amuleapi -- which
+	// also means HasAnyCredential() is up to date immediately after this call and stale before
+	// it. And a record that verified but predates the current KDF parameters is rewritten at
+	// the current cost, so the upgrade needs no operator step.
+	MatchedRole VerifyPassword(const std::string &md5_hex);
+
+	// Sets or clears one role and persists it, leaving the other as it stands on disk.
+	// `md5_hex` empty clears the role -- that is how the guest role is disabled. False with
+	// LastError() set on a malformed digest or write failure.
+	bool SetPassword(webcommon::CredentialRole role, const std::string &md5_hex);
+
+	// Modification time of amuleapi-passwords, or 0 when there is no file. Used
+	// to reject sessions older than the last password change, whoever made it.
+	std::time_t CredentialsChangedAt() const;
+
+	const std::string &LastError() const { return m_lastError; }
+
+	// Re-reads amuleapi-passwords, keeping the current values if the read fails so a transient
+	// error cannot lock everyone out.
+	//
+	// Unconditional rather than gated on a stat: mtime is second-granularity on every platform
+	// here, and two writes inside one second produce records of identical length, so a
+	// timestamp-plus-size check would miss a rotation *permanently*. The file is under 4 KB and
+	// this runs once per login attempt, behind the rate limiter and in front of a PBKDF2.
+	void ReloadCredentials();
+
+private:
+	// Writes amuleapi-jwt-secret with owner-only permissions. Internal to
+	// Load()'s first-run path -- callers get the secret via JwtSecret().
+	bool WriteJwtSecretFile(const wxString &config_dir, const std::vector<unsigned char> &secret_32);
+
+	// Rewrites one role's record at the current KDF cost without moving the file's modification
+	// time -- an upgrade is not a password change, and only a password change should end
+	// sessions.
+	void RehashInPlace(webcommon::CredentialRole role, const std::string &md5_hex);
+
+	bool LoadAmuleapiConf(const wxString &path);
+	bool LoadJwtSecret(const wxString &path);
+	bool LoadPasswords(const wxString &path);
+
+	// POSIX-only mode check. Returns true on Windows (no enforcement possible) or
+	// when the file matches 0600. Sets m_lastError on failure.
+	bool EnforceOwnerOnly(const wxString &path);
+
+	wxString m_configDir;
+	Server m_server;
+	Ec m_ec;
+	Auth m_auth;
+	Streaming m_streaming;
+	std::vector<unsigned char> m_jwtSecret;
+	webcommon::Credentials m_credentials;
+
+	std::string m_lastError;
+};
+
+#endif // WEBAPI_CONFIG_H

amule-3.1.0.tar.gz/src/webapi/Api.cpp Added

@@ -0,0 +1,11076 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "Api.h"
+#include "JsonDepthScan.h" // webapi::JsonNestingWithinLimit
+
+#include "ClientTagNames.h" // Needed for the shared client-tag token decoders
+#include "ServerFlagNames.h"
+
+#include "config.h" // AMULEAPI_STATIC_DIR (compile-time install path)
+#include "AmuleApiConfig.h"
+#include "App.h"
+#include "Auth.h"
+#include "ConstantTime.h"
+#include "Etag.h"
+#include "JsonWriter.h"
+#include "../PeerCapabilities.h" // Needed for CPeerCapabilities::GetApiTokens
+
+#include <mutex> // serialises the shared-directory read-modify-write
+#include "Jwt.h"
+#include "PathPatterns.h"
+#include "Refresher.h"     // ParseStatsTreeFromPacket / ParseGraphsFromPacket / ApplySearchFull
+#include "StaticFs.h"      // IsDir, ResolveWithinRoot
+#include "SharedContent.h" // /shared/{hash}/content: path resolution, Range, disposition
+#include "PartIndex.h"     // UsablePartIndex / UsableLastDownloadingPart, unit-tested standalone
+#include <cmath>
+#include <cstring>
+#include <map>
+
+#include "PrefsSchema.h"
+#include "SearchJson.h" // WriteSearchResultFields, shared with the SSE payload
+#include "State.h"
+
+#include "Constants.h"
+#include "OtherFunctions.h"        // GetFiletypeByName for the shared file_type token
+#include <common/MediaCodecName.h> // Needed for MediaCodecLabel
+#include <common/Path.h>           // CPath
+#include <icon_data.h>             // amule_find_icon -- country flags for GET /flags/{code}.png
+
+#include <ec/cpp/ECPacket.h>
+#include <ec/cpp/ECCodes.h>
+#include <ec/cpp/ECSpecialTags.h>
+
+#include <wx/stdpaths.h>
+#include <wx/filename.h>
+#ifdef __WXMAC__
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreServices/CoreServices.h>
+#include <wx/osx/core/cfstring.h>
+#endif
+
+#include <algorithm>
+#include <cerrno>
+#include <fstream>
+#include <set>
+#include <sstream>
+#include <cctype>
+#include <climits>
+#include <cstdlib>
+#include <sys/stat.h>
+
+// strncasecmp is in <strings.h> on POSIX; glibc also exposes it via
+// <string.h>, but musl and the BSDs do not.
+#ifdef _WIN32
+#define strncasecmp _strnicmp
+#else
+#include <strings.h>
+#endif
+
+#include "PicoJson_Inc.h"
+
+#include "config.h"      // VERSION
+#include "MuleVersion.h" // Needed for GetShortMuleVersion()
+
+#include "Types.h" // uint8 (required by libs/common/MD5Sum.h)
+#include <common/MD5Sum.h>
+
+#include <wx/string.h>
+
+#include <cstdio>
+#include <ctime>
+
+namespace
+{
+
+void SplitPathAndQuery(const std::string &target, std::string &path, std::string &query)
+{
+	const size_t q = target.find('?');
+	if (q == std::string::npos) {
+		path = target;
+		query = std::string();
+	} else {
+		path = target.substr(0, q);
+		query = target.substr(q + 1);
+	}
+}
+
+// Emit `key` as a number, or null when the value is not known. The rule lives in
+// REFERENCE.md under `Unknown values`; this is the one implementation, so a new
+// nullable field cannot quietly pick -1 or 0 instead.
+void WriteIntOrNull(CJsonWriter &w, const char *key, bool known, std::int64_t value)
+{
+	w.Key(key);
+	if (known)
+		w.ValueInt(value);
+	else
+		w.ValueNull();
+}
+
+void WriteUIntOrNull(CJsonWriter &w, const char *key, bool known, std::uint64_t value)
+{
+	w.Key(key);
+	if (known)
+		w.ValueUInt(value);
+	else
+		w.ValueNull();
+}
+
+void WriteDoubleOrNull(CJsonWriter &w, const char *key, bool known, double value)
+{
+	w.Key(key);
+	if (known)
+		w.ValueDouble(value);
+	else
+		w.ValueNull();
+}
+
+// Callers pass the predicate rather than letting this guess: `false` and "not
+// measured" are different answers for a firewall verdict.
+void WriteBoolOrNull(CJsonWriter &w, const char *key, bool known, bool value)
+{
+	w.Key(key);
+	if (known)
+		w.ValueBool(value);
+	else
+		w.ValueNull();
+}
+
+void WriteStringOrNull(CJsonWriter &w, const char *key, bool known, const std::string &value)
+{
+	w.Key(key);
+	if (known)
+		w.ValueString(wxString::FromUTF8(value.c_str()));
+	else
+		w.ValueNull();
+}
+
+void FinalizeJsonBody(CJsonWriter &w, CHttpServer::Response &r)
+{
+	// The writer already holds UTF-8, so this is a move. Never route it through
+	// wxString: amuleapi calls neither setlocale nor wxLocale, so it runs in the "C"
+	// locale and wxString's std::string ctor decodes with the locale, emptying any
+	// body with a non-ASCII byte.
+	r.body = w.TakeBuffer();
+}
+
+CHttpServer::Response ErrorResponse(unsigned status, const char *code, const char *message)
+{
+	CHttpServer::Response r;
+	r.status = status;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("error");
+	w.BeginObject();
+	w.Key("code");
+	w.ValueString(wxString::FromAscii(code));
+	w.Key("message");
+	w.ValueString(wxString::FromAscii(message));
+	w.EndObject();
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// RFC 9110 15.5.6 requires an Allow header on a 405. `allow` is the
+// machine-readable list, comma-separated in RFC order, HEAD wherever GET is served.
+CHttpServer::Response MethodNotAllowed(const char *allow, const char *message)
+{
+	CHttpServer::Response r = ErrorResponse(405, "method_not_allowed", message);
+	r.headers"Allow" = allow;
+	return r;
+}
+
+// Pulls the JWT from the Authorization header or the session cookie, verifies it
+// and rejects revoked tokens. The header wins when both are present: an explicit
+// bearer header signals intent over an implicit cookie.
+AuthOutcome AuthenticateRequest(const CHttpServer::Request &req,
+	CJwt &jwt,
+	webapi::CRevocationSet &revocations,
+	const std::string &cookie_name,
+	std::time_t credentials_changed_at)
+{
+	AuthOutcome out;
+
+	std::string token;
+	auto auth_it = req.headers.find("Authorization");
+	if (auth_it == req.headers.end()) {
+		// Header names are case-insensitive but Beast preserves what the client
+		// sent, so a lowercase `authorization:` slips past the literal find.
+		for (const auto &h : req.headers) {
+			if (h.first.size() == 13 && strncasecmp(h.first.c_str(), "Authorization", 13) == 0) {
+				auth_it = req.headers.find(h.first);
+				break;
+			}
+		}
+	}
+	if (auth_it != req.headers.end()) {
+		token = webapi::ExtractBearerToken(auth_it->second);
+	}
+	if (token.empty()) {
+		auto ck_it = req.headers.find("Cookie");
+		if (ck_it == req.headers.end()) {
+			for (const auto &h : req.headers) {
+				if (h.first.size() == 6 && strncasecmp(h.first.c_str(), "Cookie", 6) == 0) {
+					ck_it = req.headers.find(h.first);
+					break;
+				}
+			}
+		}
+		if (ck_it != req.headers.end()) {
+			token = webapi::ExtractCookieValue(ck_it->second, cookie_name);
+		}
+	}
+	if (token.empty()) {
+		out.rejection = ErrorResponse(401, "unauthorized", "missing bearer token or session cookie");
+		return out;
+	}
+	if (!jwt.Verify(token, out.verified)) {
+		out.rejection = ErrorResponse(401, "unauthorized", "invalid or expired token");
+		return out;
+	}
+	if (revocations.IsRevoked(out.verified.jti)) {
+		out.rejection = ErrorResponse(401, "unauthorized", "token has been revoked");
+		return out;
+	}
+	// A password change ends the sessions the old password opened. The cutoff is the
+	// credential file's own mtime, so it holds however the change was made -- REST,
+	// CLI, preferences dialog, amulegui -- and survives a restart.
+	if (credentials_changed_at > 0 && out.verified.iat < credentials_changed_at) {
+		out.rejection =
+			ErrorResponse(401, "unauthorized", "credentials changed; please sign in again");
+		return out;
+	}
+	out.ok = true;
+	return out;
+}
+
+// Admin gate: `if (auto r = RequireAdmin(a)) return *r;`
+std::unique_ptr<CHttpServer::Response> RequireAdmin(const AuthOutcome &a)
+{
+	if (a.verified.role != Role::ADMIN) {
+		return std::make_unique<CHttpServer::Response>(
+			ErrorResponse(403, "forbidden", "admin role required for this endpoint"));
+	}
+	return nullptr;
+}
+
+// First-snapshot gate, used like RequireAdmin. Until the first EC snapshot lands
+// there is nothing to answer from, and the status, code and sentence are API
+// contract rather than local wording.
+std::unique_ptr<CHttpServer::Response> RequireSnapshot(const webapi::CState &state)
+{
+	if (!state.HasFirstSnapshot()) {
+		return std::make_unique<CHttpServer::Response>(ErrorResponse(
+			503, "ec_unavailable", "amuleapi has not received its first EC snapshot yet"));
+	}
+	return nullptr;
+}
+
+// The URL carries a hash in whatever case the caller typed; the snapshot keys
+// everything lowercase. The two lookups that always follow come with it.
+std::string LowerHexKey(const std::string &key)
+{
+	std::string out = key;
+	std::transform(out.begin(), out.end(), out.begin(), (unsigned char c) {
+		return static_cast<char>(std::tolower(c));
+	});
+	return out;
+}
+
+bool FindDownloadByKey(const webapi::CState &state, const std::string &key, webapi::FileSnapshot &out)
+{
+	return state.FindDownload(LowerHexKey(key), out);
+}
+
+bool FindSharedByKey(const webapi::CState &state, const std::string &key, webapi::FileSnapshot &out)
+{
+	return state.FindShared(LowerHexKey(key), out);
+}
+
+// AuthenticateRequest behind a per-IP failure counter: every 401 counts, and a
+// filled bucket gets 429 with Retry-After. Checked BEFORE Verify() so a locked-out
+// IP cannot burn CPU on MAC compares. Login keeps its own limiter for the
+// password-failure path.
+AuthOutcome AuthenticateRequestRateLimited(const CHttpServer::Request &req,
+	CJwt &jwt,
+	webapi::CRevocationSet &revocations,
+	webapi::CRateLimiter &limiter,
+	const std::string &cookie_name,
+	std::time_t credentials_changed_at)
+{
+	AuthOutcome out;
+	const std::string &ip = req.remote_addr;
+
+	const auto decision = limiter.Check(ip);
+	if (decision.locked_out) {
+		CHttpServer::Response r =
+			ErrorResponse(429, "rate_limited", "too many failed auth attempts; retry later");
+		char retry_after32;
+		std::snprintf(retry_after,
+			sizeof(retry_after),
+			"%lld",
+			static_cast<long long>(decision.retry_after_seconds));
+		r.headers"Retry-After" = retry_after;
+		out.rejection = std::move(r);
+		return out;
+	}
+
+	out = AuthenticateRequest(req, jwt, revocations, cookie_name, credentials_changed_at);
+	if (out.ok) {
+		limiter.NoteSuccess(ip);
+	} else {
+		limiter.NoteFailure(ip);
+	}
+	return out;
+}
+
+// `<name>=<value>; HttpOnly; SameSite=Strict; Path=/api/v1; Max-Age=<lifetime>`
+//
+// No `Secure`: amuleapi serves HTTP by design, with TLS terminated in front.
+// Shared with the clear-cookie path because RFC 6265 5.3 requires (name, path,
+// domain) to match for a delete.
+const char *const kSessionCookieAttrs = "; HttpOnly; SameSite=Strict; Path=/api/v1";
+
+std::string MakeSetCookie(const std::string &name, const std::string &value, std::time_t expires_at)
+{
+	const std::time_t now = std::time(nullptr);
+	// An already-expired `expires_at` yields Max-Age=0, which deletes the cookie on
+	// receipt (RFC 6265 5.2.2): an expired token must not grant a working session.
+	const std::time_t lifetime = expires_at > now ? expires_at - now : 0;
+	std::string out;
+	out.reserve(name.size() + value.size() + 80);
+	out += name;
+	out += '=';
+	out += value;
+	out += kSessionCookieAttrs;
+	out += "; Max-Age=";
+	out += std::to_string(static_cast<long long>(lifetime));
+	return out;
+}
+
+// Max-Age=0 invalidates whatever a prior login set. MUST use the same
+// (name, path, domain) tuple as MakeSetCookie or the browser keeps the original.
+std::string MakeClearCookie(const std::string &name)
+{
+	std::string out;
+	out.reserve(name.size() + 64);
+	out += name;
+	out += '=';
+	out += kSessionCookieAttrs;
+	out += "; Max-Age=0";
+	return out;
+}
+
+// Namespaced apart from amuleweb's `amule_token` so the two daemons can
+// coexist behind one host without a Set-Cookie tug-of-war.
+const char *const kSessionCookieName = "amuleapi_token";
+
+// Ceiling for one static-asset read: keeps a StaticRoot pointing at /dev/zero
+// or a multi-GB log file from exhausting daemon RAM.
+constexpr std::size_t kStaticMaxFileBytes = 16 * 1024 * 1024;
+
+// Extension to Content-Type; unknown maps to application/octet-stream, so a
+// wrong-type response on an attacker-named file cannot amplify XSS.
+std::string StaticContentType(const std::string &path)
+{
+	const std::size_t dot = path.find_last_of('.');
+	if (dot == std::string::npos)
+		return "application/octet-stream";
+	std::string ext = path.substr(dot + 1);
+	for (char &c : ext)
+		c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
+	if (ext == "html" || ext == "htm")
+		return "text/html; charset=utf-8";
+	if (ext == "js" || ext == "mjs")
+		return "text/javascript; charset=utf-8";
+	if (ext == "css")
+		return "text/css; charset=utf-8";
+	if (ext == "json")
+		return "application/json; charset=utf-8";
+	if (ext == "svg")
+		return "image/svg+xml";
+	if (ext == "png")
+		return "image/png";
+	if (ext == "gif")
+		return "image/gif";
+	if (ext == "jpg" || ext == "jpeg")
+		return "image/jpeg";
+	if (ext == "ico")
+		return "image/x-icon";
+	if (ext == "webp")
+		return "image/webp";
+	if (ext == "woff2")
+		return "font/woff2";
+	if (ext == "woff")
+		return "font/woff";
+	if (ext == "ttf")
+		return "font/ttf";
+	if (ext == "map")
+		return "application/json";
+	if (ext == "txt")
+		return "text/plain; charset=utf-8";
+	return "application/octet-stream";
+}
+
+// Slurp into `out`; false on a non-regular file, oversize, or read error. `st` is
+// filled on success so the caller can ETag from mtime + size without re-stat'ing.
+bool ReadStaticFile(const std::string &fs_path, std::string &out, struct stat &st)
+{
+	if (::stat(fs_path.c_str(), &st) != 0)
+		return false;
+	if (!S_ISREG(st.st_mode))
+		return false;
+	if (static_cast<std::size_t>(st.st_size) > kStaticMaxFileBytes)
+		return false;
+	std::ifstream f(fs_path.c_str(), std::ios::binary);
+	if (!f.is_open())
+		return false;
+	std::ostringstream ss;
+	ss << f.rdbuf();
+	if (f.bad())
+		return false;
+	out = ss.str();
+	return true;
+}
+
+// "mtime-size" hex ETag, the shape nginx defaults to, strong-form quoted per RFC
+// 7232. Enough for a local frontend, where daemon and file system are colocated.
+std::string BuildStaticEtag(const struct stat &st)
+{
+	std::ostringstream oss;
+	oss << '"' << std::hex << static_cast<std::uint64_t>(st.st_mtime) << '-'
+	    << static_cast<std::uint64_t>(st.st_size) << '"';
+	return oss.str();
+}
+
+// Resolve the default static directory when amuleapi.conf's Server/StaticRoot is
+// empty. Mirrors amuleweb's GetTemplateDir (src/webserver/src/WebInterface.cpp):
+// the macOS .app bundle's Resources/ first (so an installed aMule.app surfaces the
+// bundled frontend without a conf edit), then a copy beside the running binary
+// (the relocatable Linux static tarball), then AMULEAPI_STATIC_DIR, then
+// wxStandardPaths' platform-adjusted resource dir. First existing one wins.
+std::string ResolveDefaultStaticDir()
+{
+	const std::string asset = "amuleapi-static";
+
+#ifdef __WXMAC__
+	// LaunchServices lookup for the installed aMule.app. Picks up the bundled
+	// placeholder when the operator launched amuleapi from a path-registered .app.
+	CFArrayRef urls = LSCopyApplicationURLsForBundleIdentifier(CFSTR("org.amule.aMule"), NULL);
+	CFURLRef bundle_url = NULL;
+	if (urls) {
+		if (CFArrayGetCount(urls) > 0) {
+			bundle_url = (CFURLRef)CFRetain(CFArrayGetValueAtIndex(urls, 0));
+		}
+		CFRelease(urls);
+	}
+	if (bundle_url) {
+		CFBundleRef bundle = CFBundleCreate(NULL, bundle_url);
+		CFRelease(bundle_url);
+		if (bundle) {
+			CFStringRef name =
+				CFStringCreateWithCString(NULL, asset.c_str(), kCFStringEncodingUTF8);
+			CFURLRef rsrc = CFBundleCopyResourceURL(bundle, name, NULL, NULL);
+			CFRelease(name);
+			CFRelease(bundle);
+			if (rsrc) {
+				CFURLRef abs = CFURLCopyAbsoluteURL(rsrc);
+				CFRelease(rsrc);
+				if (abs) {
+					CFStringRef p = CFURLCopyFileSystemPath(abs, kCFURLPOSIXPathStyle);
+					CFRelease(abs);
+					std::string s = std::string(wxCFStringRef(p).AsString().utf8_str());
+					if (webapi::IsDir(s))
+						return s;
+				}
+			}
+		}
+	}
+#endif // __WXMAC__
+
+	// Beside the running binary: the Linux static tarball's layout (binaries plus
+	// amuleapi-static/, extracted anywhere, no install step). Every other candidate
+	// resolves through a resources directory, which a relocatable bundle has none of.
+	//
+	// The executable's directory, not the working directory: a daemon is commonly
+	// started from ~ or /, and resolving against cwd would let a directory an
+	// unprivileged user can create decide what a root daemon serves.
+	{
+		const wxString exe = wxStandardPaths::Get().GetExecutablePath();
+		if (!exe.empty()) {
+			wxFileName exe_dir(exe);
+			exe_dir.SetFullName(wxEmptyString);
+			const wxString cand = wxFileName(exe_dir.GetPath(), asset).GetFullPath();
+			const std::string s(cand.utf8_str());
+			if (webapi::IsDir(s))
+				return s;
+		}
+	}
+
+#ifdef AMULEAPI_STATIC_DIR
+	if (webapi::IsDir(AMULEAPI_STATIC_DIR)) {
+		return std::string(AMULEAPI_STATIC_DIR);
+	}
+#endif
+
+	// wxStandardPaths fallback, with the same platform adjustments amuleweb
+	// applies for its `webserver/` lookup.
+	wxString dir = wxStandardPaths::Get().GetResourcesDir();
+#if defined(__WINDOWS__)
+	// Installer layout: bin\amuleapi.exe + share\amule\amuleapi-static\.
+	// wxStandardPaths returns the exe directory on Windows, so climb into share/amule/.
+	dir = wxFileName(dir, "..").GetFullPath();
+	dir = wxFileName(dir, "share").GetFullPath();
+	dir = wxFileName(dir, "amule").GetFullPath();
+#elif !defined(__WXMAC__)
+	dir = dir.BeforeLast(wxFileName::GetPathSeparator());
+	dir = wxFileName(dir, "amule").GetFullPath();
+#endif
+	dir = wxFileName(dir, asset).GetFullPath();
+	const std::string s(dir.utf8_str());
+	if (webapi::IsDir(s))
+		return s;
+	return std::string();
+}
+
+} // namespace
+
+CApiDispatcher::CApiDispatcher(CAmuleApiConfig &config, CJwt &jwt, webapi::CState &state, CamuleapiApp &app)
+: m_config(config)
+, m_jwt(jwt)
+, m_state(state)
+, m_app(app)
+, m_rateLimiter(webapi::CRateLimiter::Config{ config.AuthCfg().login_failure_window_seconds,
+	  config.AuthCfg().login_failure_threshold,
+	  config.AuthCfg().login_lockout_seconds })
+,
+// Generic-401 limiter against credential stuffing across every authenticated
+// endpoint, counting rejected TOKENS rather than bad passwords. Tunable via the
+// `Auth/Token*` keys because this is the one a browser tab left open overnight
+// trips.
+m_authRateLimiter(webapi::CRateLimiter::Config{ config.AuthCfg().token_failure_window_seconds,
+	config.AuthCfg().token_failure_threshold,
+	config.AuthCfg().token_lockout_seconds })
+{
+}
+
+namespace
+{
+
+// Beast preserves the wire-form casing the client sent, so a literal find
+// misses lowercased headers. Walks the map once on a miss.
+std::string FindHeaderCaseInsensitive(
+	const std::map<std::string, std::string> &headers, const std::string &name)
+{
+	auto it = headers.find(name);
+	if (it != headers.end())
+		return it->second;
+	for (const auto &h : headers) {
+		if (h.first.size() == name.size() &&
+			strncasecmp(h.first.c_str(), name.c_str(), name.size()) == 0) {
+			return h.second;
+		}
+	}
+	return std::string();
+}
+
+// Resolve the CORS Origin echo: the verbatim Origin for
+// `Access-Control-Allow-Origin` plus whether the allowlist named it. Empty when
+// CORS is off, the request carried no Origin, or the allowlist rejected it.
+// `allow_cors=1` with an empty allowlist echoes verbatim, which is `*`-equivalent;
+// credentials are NOT granted on that path (see ApplyCorsHeaders).
+struct CorsDecision
+{
+	std::string origin;
+	bool allowlisted = false;
+};
+
+CorsDecision ResolveCorsOrigin(const CHttpServer::Request &req, const CAmuleApiConfig &cfg)
+{
+	if (!cfg.ServerCfg().allow_cors)
+		return CorsDecision{};
+	const std::string origin = FindHeaderCaseInsensitive(req.headers, "Origin");
+	if (origin.empty())
+		return CorsDecision{};
+	const auto &list = cfg.ServerCfg().cors_origin_allowlist;
+	if (list.empty())
+		return CorsDecision{ origin, false }; // echo any origin, no credentials
+	for (const auto &allowed : list) {
+		if (allowed == origin)
+			return CorsDecision{ origin, true };
+	}
+	return CorsDecision{};
+}
+
+// `Vary: Origin` goes on whenever CORS is enabled, even for a rejected origin, so
+// an intermediary cannot cache a cross-origin response against a same-origin key.
+// The auth and content headers go on only if it was allowed.
+void ApplyCorsHeaders(
+	std::map<std::string, std::string> &headers, const CorsDecision &cors, bool cors_enabled)
+{
+	if (!cors_enabled)
+		return;
+	AppendHeaderToken(headers, "Vary", "Origin");
+	if (cors.origin.empty())
+		return;
+	headers"Access-Control-Allow-Origin" = cors.origin;
+	// Credentials only for an origin the operator named. With an empty allowlist the
+	// echo is `*`-equivalent, and granting credentials there would let any site the
+	// user visits call this API with their session cookie and read the replies. An
+	// anonymous cross-origin read still works.
+	if (cors.allowlisted)
+		headers"Access-Control-Allow-Credentials" = "true";
+	// What a client may read from `fetch().headers.get(...)`: the Fetch spec exposes
+	// only the CORS-safelisted response headers, and clients need ETag to validate.
+	headers"Access-Control-Expose-Headers" = "ETag, Allow, Retry-After";
+}
+
+// The Kad `network` rollup, byte-identical under `kad` on GET /status and on
+// GET /kad: both read the same KadSnapshot from one Dashboard() acquisition.
+void WriteKadNetworkObject(CJsonWriter &w, const webapi::KadSnapshot &k)
+{
+	w.Key("network");
+	w.BeginObject();
+	// null unless Kad is connected. user_count/file_count are the last estimate and
+	// survive into `connecting`; node_count is our own routing-table size, measured at
+	// 2 with Kad fully stopped, so not even the terminal state reaches 0. A number
+	// here would claim knowledge of a network we are not on.
+	WriteIntOrNull(w, "user_count", k.has_network, static_cast<int64_t>(k.users));
+	WriteIntOrNull(w, "file_count", k.has_network, static_cast<int64_t>(k.files));
+	WriteIntOrNull(w, "node_count", k.has_network, static_cast<int64_t>(k.nodes));
+	w.EndObject();
+}
+
+// The {id} segment of every search-scoped route: a non-zero decimal fitting a
+// uint32. Zero is rejected rather than read as "no search": an implicit
+// "last search this session started" target would defeat the explicit search_id
+// these routes require.
+const char *const kBadSearchIdMessage = "`{id}` must be a positive decimal search_id (see GET /search)";
+
+bool ParseSearchIdSegment(const std::string &seg, std::uint32_t &out)
+{
+	if (seg.empty() || seg.size() > 10)
+		return false;
+	std::uint64_t v = 0;
+	for (const char c : seg) {
+		if (c < '0' || c > '9')
+			return false;
+		v = v * 10 + static_cast<std::uint64_t>(c - '0');
+	}
+	if (v == 0 || v > 0xFFFFFFFFull)
+		return false;
+	out = static_cast<std::uint32_t>(v);
+	return true;
+}
+
+bool ParseJsonObjectBody(const std::string &body, picojson::value &out, std::string &err);
+
+} // namespace
+
+// Did the caller present credentials at all? Mirrors what Authenticate() accepts,
+// without verifying them: an invalid or expired credential still means the
+// response was computed for a specific caller and must not be shared.
+bool RequestCarriesCredentials(const CHttpServer::Request &req, const std::string &cookie_name)
+{
+	if (!FindHeaderCaseInsensitive(req.headers, "Authorization").empty()) {
+		return true;
+	}
+	const std::string cookie = FindHeaderCaseInsensitive(req.headers, "Cookie");
+	if (cookie.empty()) {
+		return false;
+	}
+	return !webapi::ExtractCookieValue(cookie, cookie_name).empty();
+}
+
+CHttpServer::Response CApiDispatcher::Dispatch(const CHttpServer::Request &req)
+{
+	const bool cors_enabled = m_config.ServerCfg().allow_cors;
+	const CorsDecision cors_org = ResolveCorsOrigin(req, m_config);
+
+	// Browser preflights carry no credentials, so they skip the auth gate and the
+	// route handler: 204 plus the CORS bundle, or 204 with `Vary: Origin` alone when
+	// the origin is rejected, which makes the browser block the real request.
+	if (req.method == "OPTIONS" &&
+		!FindHeaderCaseInsensitive(req.headers, "Access-Control-Request-Method").empty()) {
+		CHttpServer::Response pre;
+		pre.status = 204;
+		pre.content_type.clear();
+		ApplyCorsHeaders(pre.headers, cors_org, cors_enabled);
+		if (!cors_org.origin.empty()) {
+			pre.headers"Access-Control-Allow-Methods" =
+				"GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS";
+			// Headers actual requests may send: Authorization for bearer,
+			// If-None-Match for conditional GET, Last-Event-ID for SSE replay.
+			pre.headers"Access-Control-Allow-Headers" =
+				"Authorization, Content-Type, If-None-Match, Last-Event-ID";
+			pre.headers"Access-Control-Max-Age" = "86400";
+		}
+		return pre;
+	}
+
+	// ETag + If-None-Match -> 304, on GET/HEAD 200 only: a mutation's response carries
+	// post-mutation state the client always wants delivered.
+	//
+	// The revision is sampled before AND after the handler. The body was serialized
+	// under a read lock already dropped, so reading the revision only afterwards can
+	// pair etag(old body) with the NEW revision, and every later hit then serves a
+	// validator describing neither. If anything moved, the response is not memoized.
+	const std::uint64_t rev_before = m_state.SnapshotRevision();
+	CHttpServer::Response resp = DispatchToHandler(req);
+	const std::uint64_t rev_after = m_state.SnapshotRevision();
+
+	const bool is_safe_method = (req.method == "GET" || req.method == "HEAD");
+	// A handler that computed its own validator owns it. Stamping the body hash over
+	// the top would yield two ETags for one resource depending on which branch
+	// answered -- as the static path did, since it clears the body for HEAD so only
+	// the GET reached the hashing branch.
+	const bool handler_set_etag = (resp.headers.find("ETag") != resp.headers.end());
+	if (webapi::ShouldStampEtag(is_safe_method, handler_set_etag, resp.status, resp.body.empty())) {
+		// Skip the MD5 over a multi-MB body when nothing has changed. The key is
+		// (target, snapshot revision): a revision advances on every eligible write,
+		// so unlike a timestamp it cannot stand still through a mutation or collapse
+		// two changes inside one second.
+		//
+		// Opt-in per target (MemoizableTarget), covering only /downloads and
+		// /shared. MemoUsable is the other half: without it the key says which
+		// revision was current when we looked, not which one this body came from.
+		const std::uint64_t snap = rev_after;
+		const bool memoizable = webapi::MemoUsable(req.target, rev_before, rev_after);
+		std::string etag;
+		if (memoizable) {
+			std::lock_guard<std::mutex> g(m_etagCacheMu);
+			auto it = m_etagCache.find(req.target);
+			if (it != m_etagCache.end() && it->second.snapshot_rev == snap && snap != 0) {
+				etag = it->second.etag;
+			}
+		}
+		if (etag.empty()) {
+			etag = webcommon::Etag(resp.body);
+			if (memoizable) {
+				std::lock_guard<std::mutex> g(m_etagCacheMu);
+				if (m_etagCache.size() >= kEtagCacheCapacity) {
+					// Crude memory backstop: the real workload is a few dozen
+					// targets, so a wholesale clear beats real LRU machinery.
+					m_etagCache.clear();
+				}
+				EtagCacheEntry e;
+				e.snapshot_rev = snap;
+				e.etag = etag;
+				m_etagCachereq.target = std::move(e);
+			}
+		}
+		// RFC 7232 2.3: the value MUST be quoted.
+		//
+		// Which representation does this validator name? The transport appends the
+		// coding when it compresses, but a 304 carries no body to compress, so the
+		// answer is worked out here while the body is still present -- and must be the
+		// SAME answer, or a client that cached the gzip form and gets the identity ETag
+		// can never match its stored response again.
+		const bool coded = WillCompressBody(
+			AcceptsGzip(FindHeaderCaseInsensitive(req.headers, "Accept-Encoding")),
+			resp.body.size(),
+			resp.content_type,
+			resp.headers.find("Content-Encoding") != resp.headers.end());
+		const std::string wire_etag = webcommon::WithCodingSuffix(etag, coded);
+		resp.headers"ETag" = "\"" + wire_etag + "\"";
+
+		// Against wire_etag, which names the representation THIS request selected.
+		// Matching either coding would defeat the suffix: a client holding gzip bytes
+		// and asking for identity would be told its copy is current.
+		const std::string inm = FindHeaderCaseInsensitive(req.headers, "If-None-Match");
+		if (webcommon::IfNoneMatchHits(inm, wire_etag)) {
+			// 304 carries no body and no Content-Type, but the ETag header IS
+			// preserved (RFC 7232 4.1): clients re-stamp the cached copy with it.
+			resp.status = 304;
+			resp.body.clear();
+			resp.content_type.clear();
+		}
+	}
+	// HEAD carries no content on ANY status. The strip used to sit inside the 200-only
+	// block, so a HEAD ending in 4xx shipped the JSON error envelope -- content RFC
+	// 9110 9.3.2 forbids, and bytes a correct client leaves in the socket to corrupt
+	// the next response on a keep-alive connection. Content-Length still reports what
+	// the equivalent GET would return.
+
+	// A response produced for a credentialed caller must not be stored where another
+	// caller can be served it. Authenticate() takes a bearer token or a session
+	// cookie, and the WebUI uses the cookie -- so these carry no Authorization header
+	// and RFC 9111 3.5's shared-cache prohibition never engages. Without an explicit
+	// policy a shared cache may keep the 200 under heuristic freshness, on a key that
+	// does not include Cookie.
+	//
+	// Stamped centrally so a new authenticated route cannot forget it, and only when
+	// credentials were actually presented: an unauthenticated probe like /health stays
+	// cacheable. Handlers that set their own policy are untouched.
+	//
+	// private, NOT no-store: no-store forbids the client's own cache too, so no
+	// If-None-Match would ever arrive and the validator and memo machinery here would
+	// be dead weight; it also lands on 304s, telling a cache to drop the entry it was
+	// just told is good. private alone stops a SHARED cache storing it.
+	if (RequestCarriesCredentials(req, kSessionCookieName) &&
+		resp.headers.find("Cache-Control") == resp.headers.end()) {
+		resp.headers"Cache-Control" = "private";
+		// Vary is the half that matters to a cache which stores anyway.
+		AppendHeaderToken(resp.headers, "Vary", "Cookie");
+	}
+
+	// On every response, success or error, so a browser can read a 4xx body too.
+	ApplyCorsHeaders(resp.headers, cors_org, cors_enabled);
+	return resp;
+}
+
+CHttpServer::Response CApiDispatcher::DispatchToHandler(const CHttpServer::Request &req)
+{
+	std::string path, query;
+	SplitPathAndQuery(req.target, path, query);
+
+	// Defence in depth: reject NUL, encoded NUL and `..` segments before routing.
+	// Today's byte-exact routes 404 these organically, but a future endpoint with a
+	// path capture would silently inherit a traversal surface without this.
+	if (web_api_path::LooksMalicious(path)) {
+		return ErrorResponse(400, "bad_request", "path contains a traversal/injection token");
+	}
+
+	// `/api/v1/status/` and `/api/v1/status` name one resource. Confined to the API
+	// prefix: the static fallthrough maps a path onto a filesystem, where a trailing
+	// slash is a directory rather than a spelling.
+	if (path.compare(0, 5, "/api/") == 0) {
+		path = web_api_path::StripTrailingSlash(path);
+	}
+
+	if (path == "/api/v1/health") {
+		if (req.method != "GET" && req.method != "HEAD") {
+			return MethodNotAllowed("GET, HEAD", "only GET / HEAD on /health");
+		}
+		return HandleHealth(req);
+	}
+
+	if (path == "/api/v1/version") {
+		if (req.method != "GET" && req.method != "HEAD") {
+			return MethodNotAllowed("GET, HEAD", "method not allowed on /api/v1/version");
+		}
+		return HandleVersion(req);
+	}
+
+	if (path == "/api/v1/version/check") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /api/v1/version/check");
+		}
+		return HandleVersionCheck(req);
+	}
+
+	if (path == "/api/v1/auth/login") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /auth/login");
+		}
+		return HandleLogin(req);
+	}
+
+	if (path == "/api/v1/auth/logout") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /auth/logout");
+		}
+		return HandleLogout(req);
+	}
+
+	if (path == "/api/v1/auth/session") {
+		if (req.method != "GET" && req.method != "HEAD") {
+			return MethodNotAllowed("GET, HEAD", "only GET on /auth/session");
+		}
+		return HandleSession(req);
+	}
+
+	if (path == "/api/v1/auth/passwords") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandleAuthPasswords(req);
+		}
+		if (req.method == "PATCH") {
+			return HandleAuthPasswordsPatch(req);
+		}
+		return MethodNotAllowed("GET, HEAD, PATCH", "only GET or PATCH on /auth/passwords");
+	}
+
+	// /events reaches the dispatcher only on a method the streaming resolver declined,
+	// since it diverts GET and HEAD earlier. Without an arm here it fell to the
+	// catch-all 404 and was the one route to escape the Allow sweep.
+	if (path == "/api/v1/events") {
+		return MethodNotAllowed("GET, HEAD", "only GET / HEAD on /events");
+	}
+
+	if (path == "/api/v1/status") {
+		if (req.method != "GET" && req.method != "HEAD") {
+			return MethodNotAllowed("GET, HEAD", "only GET on /status");
+		}
+		return HandleStatus(req);
+	}
+
+	if (path == "/api/v1/downloads") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandleDownloads(req);
+		}
+		if (req.method == "POST") {
+			return HandleDownloadAdd(req);
+		}
+		if (req.method == "PATCH") {
+			return HandleDownloadsBulkPatch(req);
+		}
+		if (req.method == "DELETE") {
+			return HandleDownloadsBulkDelete(req);
+		}
+		return MethodNotAllowed("GET, HEAD, POST, PATCH, DELETE",
+			"only GET / HEAD / POST / PATCH / DELETE on /downloads");
+	}
+
+	if (path == "/api/v1/downloads_clear_completed") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /downloads_clear_completed");
+		}
+		return HandleDownloadsClearCompleted(req);
+	}
+
+	// The whole peer surface, every upload_state including queue waiters.
+	// Consumers filter client-side rather than asking for a pre-filtered view.
+	if (path == "/api/v1/clients") {
+		if (req.method != "GET" && req.method != "HEAD") {
+			return MethodNotAllowed("GET, HEAD", "only GET on /clients");
+		}
+		return HandleClients(req);
+	}
+
+	// The daemon's credit store: every peer it has ever exchanged data with. Its own
+	// resource rather than a sub-path of /clients because these are keyed by user
+	// hash, outlive the ECID-issuing process, and carry stored history. Matched before
+	// /clients/{ecid}, which accepts any single segment.
+	if (path == "/api/v1/known_clients") {
+		if (req.method != "GET" && req.method != "HEAD") {
+			return MethodNotAllowed("GET, HEAD", "only GET on /known_clients");
+		}
+		return HandleKnownClients(req);
+	}
+
+	// Single-peer detail. {ecid} is unique per live EC connection.
+	{
+		static const auto client_detail = web_api_path::ParsePattern("/api/v1/clients/{ecid}");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(client_detail, path_segs, caps)) {
+			if (req.method == "GET" || req.method == "HEAD") {
+				return HandleClientDetail(req, caps"ecid");
+			}
+			return MethodNotAllowed("GET, HEAD", "only GET / HEAD on /clients/{ecid}");
+		}
+	}
+
+	// Browse the peer's shared files; POST starts it and returns a search_id.
+	{
+		static const auto client_browse =
+			web_api_path::ParsePattern("/api/v1/clients/{ecid}/shared_files");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(client_browse, path_segs, caps)) {
+			if (req.method == "POST") {
+				return HandleClientBrowse(req, caps"ecid");
+			}
+			return MethodNotAllowed("POST", "only POST on /clients/{ecid}/shared_files");
+		}
+	}
+
+	if (path == "/api/v1/shared") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandleSharedList(req);
+		}
+		if (req.method == "PATCH") {
+			return HandleSharedBulkPatch(req);
+		}
+		return MethodNotAllowed("GET, HEAD, PATCH", "only GET / HEAD / PATCH on /shared");
+	}
+
+	if (path == "/api/v1/shared_reload") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /shared_reload");
+		}
+		return HandleSharedReload(req);
+	}
+
+	// Literal path, so it must be matched before the /shared/{hash} patterns or
+	// "media" would be captured as a hash.
+	if (path == "/api/v1/shared/media/refresh") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /shared/media/refresh");
+		}
+		return HandleSharedMediaRefresh(req);
+	}
+
+	// The configured share roots, as opposed to /shared, which lists the files those
+	// roots produced. Its own top-level path, so no ordering against /shared/{hash}.
+	if (path == "/api/v1/share_directories") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandleSharedDirectories(req);
+		}
+		if (req.method == "PUT") {
+			return HandleSharedDirectoriesPut(req);
+		}
+		if (req.method == "POST") {
+			return HandleSharedDirectoriesAdd(req);
+		}
+		if (req.method == "DELETE") {
+			return HandleSharedDirectoriesDelete(req);
+		}
+		return MethodNotAllowed("GET, HEAD, POST, PUT, DELETE",
+			"only GET / HEAD / PUT / POST / DELETE on /share_directories");
+	}
+
+	if (path == "/api/v1/servers") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandleServers(req);
+		}
+		if (req.method == "POST") {
+			return HandleServerAdd(req);
+		}
+		return MethodNotAllowed("GET, HEAD, POST", "only GET / HEAD / POST on /servers");
+	}
+
+	if (path == "/api/v1/friends") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandleFriends(req);
+		}
+		if (req.method == "POST") {
+			return HandleFriendAdd(req);
+		}
+		return MethodNotAllowed("GET, HEAD, POST", "only GET / HEAD / POST on /friends");
+	}
+
+	// One friend by ECID. The browse form is checked first, same ordering
+	// rationale as the server routes.
+	{
+		static const auto friend_browse =
+			web_api_path::ParsePattern("/api/v1/friends/{ecid}/shared_files");
+		static const auto friend_one = web_api_path::ParsePattern("/api/v1/friends/{ecid}");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(friend_browse, path_segs, caps)) {
+			if (req.method != "POST") {
+				return MethodNotAllowed("POST", "only POST on /friends/{ecid}/shared_files");
+			}
+			return HandleFriendBrowse(req, caps"ecid");
+		}
+		if (web_api_path::Match(friend_one, path_segs, caps)) {
+			if (req.method == "DELETE") {
+				return HandleFriendRemove(req, caps"ecid");
+			}
+			if (req.method == "PATCH") {
+				return HandleFriendPatch(req, caps"ecid");
+			}
+			return MethodNotAllowed("PATCH, DELETE", "only DELETE / PATCH on /friends/{ecid}");
+		}
+	}
+
+	if (path == "/api/v1/chats") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandleChats(req);
+		}
+		return MethodNotAllowed("GET, HEAD", "only GET / HEAD on /chats");
+	}
+
+	// One conversation keyed "<ip>:<port>". The messages sub-resource matches
+	// first or the longer pattern would be shadowed.
+	{
+		static const auto chat_messages =
+			web_api_path::ParsePattern("/api/v1/chats/{address}/messages");
+		static const auto chat_one = web_api_path::ParsePattern("/api/v1/chats/{address}");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(chat_messages, path_segs, caps)) {
+			if (req.method == "GET" || req.method == "HEAD") {
+				return HandleChatMessages(req, caps"address");
+			}
+			if (req.method == "POST") {
+				return HandleChatSend(req, caps"address");
+			}
+			return MethodNotAllowed(
+				"GET, HEAD, POST", "only GET / HEAD / POST on /chats/{address}/messages");
+		}
+		if (web_api_path::Match(chat_one, path_segs, caps)) {
+			if (req.method == "DELETE") {
+				return HandleChatClose(req, caps"address");
+			}
+			return MethodNotAllowed("DELETE", "only DELETE on /chats/{address}");
+		}
+	}
+
+	if (path == "/api/v1/servers_update") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /servers_update");
+		}
+		return HandleServerUpdateFromUrl(req);
+	}
+
+	// Server connect and remove, by ECID or by address; the forms share handlers and
+	// differ only in the lookup. Address patterns are tried FIRST because they have
+	// the same segment count: the address form with "connect" as the address would
+	// otherwise match the ECID pattern with `ecid == "by-address"`.
+	{
+		static const auto server_connect =
+			web_api_path::ParsePattern("/api/v1/servers/{ecid}/connect");
+		static const auto server_one = web_api_path::ParsePattern("/api/v1/servers/{ecid}");
+		static const auto server_addr_connect =
+			web_api_path::ParsePattern("/api/v1/servers/by-address/{address}/connect");
+		static const auto server_addr_one =
+			web_api_path::ParsePattern("/api/v1/servers/by-address/{address}");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		// The address form has its own path rather than sharing {ecid}: one capture with
+		// two identity domains, sniffed apart by a colon, is a dispatch rule invisible
+		// from outside, and forecloses ever accepting an IPv6 literal.
+		if (web_api_path::Match(server_addr_connect, path_segs, caps)) {
+			if (req.method != "POST") {
+				return MethodNotAllowed(
+					"POST", "only POST on /servers/by-address/{address}/connect");
+			}
+			return HandleServerConnectByAddress(req, caps"address");
+		}
+		if (web_api_path::Match(server_addr_one, path_segs, caps)) {
+			if (req.method != "DELETE" && req.method != "PATCH") {
+				return MethodNotAllowed("PATCH, DELETE",
+					"only DELETE / PATCH on /servers/by-address/{address}");
+			}
+			return req.method == "PATCH" ? HandleServerPatchByAddress(req, caps"address")
+						     : HandleServerDeleteByAddress(req, caps"address");
+		}
+		if (web_api_path::Match(server_connect, path_segs, caps)) {
+			if (req.method != "POST") {
+				return MethodNotAllowed("POST", "only POST on /servers/{ecid}/connect");
+			}
+			return HandleServerConnect(req, caps"ecid");
+		}
+		if (web_api_path::Match(server_one, path_segs, caps)) {
+			if (req.method != "DELETE" && req.method != "PATCH") {
+				return MethodNotAllowed(
+					"PATCH, DELETE", "only DELETE / PATCH on /servers/{ecid}");
+			}
+			return req.method == "PATCH" ? HandleServerPatch(req, caps"ecid")
+						     : HandleServerDelete(req, caps"ecid");
+		}
+	}
+
+	if (path == "/api/v1/kad") {
+		if (req.method != "GET" && req.method != "HEAD") {
+			return MethodNotAllowed("GET, HEAD", "only GET on /kad");
+		}
+		return HandleKad(req);
+	}
+
+	if (path == "/api/v1/networks/connect") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /networks/connect");
+		}
+		return HandleNetworksConnect(req);
+	}
+	if (path == "/api/v1/networks/disconnect") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /networks/disconnect");
+		}
+		return HandleNetworksDisconnect(req);
+	}
+	if (path == "/api/v1/kad/update") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /kad/update");
+		}
+		return HandleKadUpdateFromUrl(req);
+	}
+
+	if (path == "/api/v1/kad/bootstrap") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /kad/bootstrap");
+		}
+		return HandleKadBootstrap(req);
+	}
+
+	// IP filter actions. The IP-filter *settings* are ordinary preferences; these two
+	// are the operations behind the desktop Security page's "Reload List" and "Update
+	// now" buttons.
+	if (path == "/api/v1/ipfilter/reload") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /ipfilter/reload");
+		}
+		return HandleIpfilterReload(req);
+	}
+
+	if (path == "/api/v1/ipfilter/update") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /ipfilter/update");
+		}
+		return HandleIpfilterUpdate(req);
+	}
+
+	// GeoIP action. The GeoIP *settings* are ordinary preferences under geoip; this
+	// is the standalone "update now" operation, a route rather than a write-only
+	// boolean inside PATCH /preferences.
+	if (path == "/api/v1/geoip/update") {
+		if (req.method != "POST") {
+			return MethodNotAllowed("POST", "only POST on /geoip/update");
+		}
+		return HandleGeoipUpdate(req);
+	}
+
+	// re-hash one shared file against its on-disk data. Matched before the
+	// single-segment `/shared/{hash}` pattern below purely for locality: the two
+	// cannot collide, this one carries an extra path segment.
+	{
+		static const auto shared_media_refresh =
+			web_api_path::ParsePattern("/api/v1/shared/{hash}/media/refresh");
+		static const auto shared_verify = web_api_path::ParsePattern("/api/v1/shared/{hash}/verify");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(shared_media_refresh, path_segs, caps)) {
+			if (req.method != "POST") {
+				return MethodNotAllowed("POST", "only POST on /shared/{hash}/media/refresh");
+			}
+			return HandleSharedMediaRefreshOne(req, caps"hash");
+		}
+		if (web_api_path::Match(shared_verify, path_segs, caps)) {
+			if (req.method != "POST") {
+				return MethodNotAllowed("POST", "only POST on /shared/{hash}/verify");
+			}
+			return HandleSharedVerify(req, caps"hash");
+		}
+	}
+
+	// peers of one shared file. Same rows as /clients, selected by hash and
+	// carrying their relation to the file; matched before `/shared/{hash}`.
+	{
+		static const auto shared_clients =
+			web_api_path::ParsePattern("/api/v1/shared/{hash}/clients");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(shared_clients, path_segs, caps)) {
+			if (req.method != "GET" && req.method != "HEAD") {
+				return MethodNotAllowed(
+					"GET, HEAD", "only GET / HEAD on /shared/{hash}/clients");
+			}
+			return HandleFileClients(req, caps"hash", /*require_downloading=*/false);
+		}
+	}
+
+	// the file's own bytes. Two-segment like its neighbours above and matched before
+	// `/shared/{hash}` for the same reason; "content" cannot be read as a hash, so
+	// the ordering is locality rather than necessity.
+	{
+		static const auto shared_content =
+			web_api_path::ParsePattern("/api/v1/shared/{hash}/content");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(shared_content, path_segs, caps)) {
+			if (req.method != "GET" && req.method != "HEAD") {
+				return MethodNotAllowed(
+					"GET, HEAD", "only GET / HEAD on /shared/{hash}/content");
+			}
+			return HandleSharedContent(req, caps"hash");
+		}
+	}
+
+	// shared file priority PATCH. `{hash}` is the lowercase 32-char hex
+	// MD4 hash.
+	{
+		static const auto shared_detail = web_api_path::ParsePattern("/api/v1/shared/{hash}");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(shared_detail, path_segs, caps)) {
+			if (req.method == "GET" || req.method == "HEAD") {
+				return HandleSharedDetail(req, caps"hash");
+			}
+			if (req.method != "PATCH") {
+				return MethodNotAllowed(
+					"GET, HEAD, PATCH", "only GET / HEAD / PATCH on /shared/{hash}");
+			}
+			return HandleSharedPatch(req, caps"hash");
+		}
+	}
+
+	if (path == "/api/v1/categories") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandleCategories(req);
+		}
+		if (req.method == "POST") {
+			return HandleCategoryCreate(req);
+		}
+		return MethodNotAllowed("GET, HEAD, POST", "only GET / HEAD / POST on /categories");
+	}
+
+	// single-category PATCH/DELETE.
+	{
+		static const auto category_one = web_api_path::ParsePattern("/api/v1/categories/{index}");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(category_one, path_segs, caps)) {
+			if (req.method == "GET" || req.method == "HEAD") {
+				return HandleCategoryOne(req, caps"index");
+			}
+			if (req.method == "PATCH") {
+				return HandleCategoryUpdate(req, caps"index");
+			}
+			if (req.method == "DELETE") {
+				return HandleCategoryDelete(req, caps"index");
+			}
+			return MethodNotAllowed("GET, HEAD, PATCH, DELETE",
+				"only GET / PATCH / DELETE on /categories/{index}");
+		}
+	}
+
+	if (path == "/api/v1/preferences") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandlePreferences(req);
+		}
+		if (req.method == "PATCH") {
+			return HandlePreferencesPatch(req);
+		}
+		return MethodNotAllowed("GET, HEAD, PATCH", "only GET / HEAD / PATCH on /preferences");
+	}
+
+	if (path == "/api/v1/logs/amule") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandleLogAmule(req);
+		}
+		if (req.method == "DELETE") {
+			return HandleLogAmuleReset(req);
+		}
+		return MethodNotAllowed("GET, HEAD, DELETE", "only GET / HEAD / DELETE on /logs/amule");
+	}
+
+	if (path == "/api/v1/logs/server_info") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandleLogServerinfo(req);
+		}
+		if (req.method == "DELETE") {
+			return HandleLogServerinfoReset(req);
+		}
+		return MethodNotAllowed("GET, HEAD, DELETE", "only GET / HEAD / DELETE on /logs/server_info");
+	}
+
+	if (path == "/api/v1/stats/tree") {
+		if (req.method != "GET" && req.method != "HEAD") {
+			return MethodNotAllowed("GET, HEAD", "only GET on /stats/tree");
+		}
+		return HandleStatsTree(req);
+	}
+
+	// search. Every search-scoped operation names its search in the path;
+	// there is no implicit "current search" to fall back to.
+	if (path == "/api/v1/search") {
+		if (req.method == "GET" || req.method == "HEAD") {
+			return HandleSearchList(req);
+		}
+		if (req.method != "POST") {
+			return MethodNotAllowed("GET, HEAD, POST",
+				"only GET or POST on /search (GET lists searches, POST starts one; "
+				"read one search at GET /search/{id}/results)");
+		}
+		return HandleSearchStart(req);
+	}
+
+	// Matched before anything capturing {id}. They cannot collide (different segment
+	// counts, {id} numeric), but ordering keeps that independent of the matcher's
+	// internals. Both are search-AGNOSTIC: the daemon resolves a hash against its
+	// whole search list, so nesting them under {id} would advertise a scoping that
+	// does not exist.
+	{
+		static const auto search_download =
+			web_api_path::ParsePattern("/api/v1/search/results/{hash}/download");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(search_download, path_segs, caps)) {
+			if (req.method != "POST") {
+				return MethodNotAllowed(
+					"POST", "only POST on /search/results/{hash}/download");
+			}
+			return HandleSearchDownload(req, caps"hash");
+		}
+	}
+
+	// Community ratings for a search result. POST triggers an on-demand Kad NOTES
+	// lookup; GET returns what has arrived plus the running flag. Matched before the
+	// /download sibling (distinct trailing segment).
+	{
+		static const auto search_comments =
+			web_api_path::ParsePattern("/api/v1/search/results/{hash}/comments");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(search_comments, path_segs, caps)) {
+			if (req.method == "POST") {
+				return HandleSearchCommentsKadSearch(req, caps"hash");
+			}
+			if (req.method != "GET" && req.method != "HEAD") {
+				return MethodNotAllowed("GET, HEAD, POST",
+					"only GET / HEAD / POST on /search/results/{hash}/comments");
+			}
+			return HandleSearchComments(req, caps"hash");
+		}
+	}
+
+	// /search/{id} -- DELETE stops the search AND frees it (results included).
+	{
+		static const auto search_one = web_api_path::ParsePattern("/api/v1/search/{id}");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(search_one, path_segs, caps)) {
+			std::uint32_t sid = 0;
+			if (!ParseSearchIdSegment(caps"id", sid)) {
+				return ErrorResponse(400, "bad_request", kBadSearchIdMessage);
+			}
+			if (req.method != "DELETE") {
+				return MethodNotAllowed("DELETE",
+					"only DELETE on /search/{id} (read its results at "
+					"GET /search/{id}/results)");
+			}
+			return HandleSearchClose(req, sid);
+		}
+	}
+
+	// /search/{id}/{action} -- results / stop / more.
+	{
+		static const auto search_action = web_api_path::ParsePattern("/api/v1/search/{id}/{action}");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(search_action, path_segs, caps)) {
+			std::uint32_t sid = 0;
+			if (!ParseSearchIdSegment(caps"id", sid)) {
+				return ErrorResponse(400, "bad_request", kBadSearchIdMessage);
+			}
+			const std::string &action = caps"action";
+			if (action == "results") {
+				if (req.method != "GET" && req.method != "HEAD") {
+					return MethodNotAllowed(
+						"GET, HEAD", "only GET / HEAD on /search/{id}/results");
+				}
+				return HandleSearchResults(req, sid);
+			}
+			if (action == "stop") {
+				if (req.method != "POST") {
+					return MethodNotAllowed("POST", "only POST on /search/{id}/stop");
+				}
+				return HandleSearchStop(req, sid);
+			}
+			if (action == "more") {
+				if (req.method != "POST") {
+					return MethodNotAllowed("POST", "only POST on /search/{id}/more");
+				}
+				return HandleSearchMore(req, sid);
+			}
+			return ErrorResponse(
+				404, "not_found", "unknown search action (expected results, stop or more)");
+		}
+	}
+
+	// Path-pattern matches the four allowed graph names; HandleStatsGraph
+	// rejects anything else.
+	{
+		static const auto graph_pattern = web_api_path::ParsePattern("/api/v1/stats/graphs/{graph}");
+		const auto segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(graph_pattern, segs, caps)) {
+			if (req.method != "GET" && req.method != "HEAD") {
+				return MethodNotAllowed("GET, HEAD", "only GET on /stats/graphs/{graph}");
+			}
+			return HandleStatsGraph(req, caps"graph");
+		}
+	}
+
+	// Per-source comments. Downloads-only: needs a live source list. Matched
+	// before /downloads/{hash} (more segments).
+	{
+		static const auto dl_comments =
+			web_api_path::ParsePattern("/api/v1/downloads/{hash}/comments");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(dl_comments, path_segs, caps)) {
+			if (req.method == "POST") {
+				// POST triggers an on-demand Kad NOTES lookup.
+				return HandleDownloadCommentsKadSearch(req, caps"hash");
+			}
+			if (req.method != "GET" && req.method != "HEAD") {
+				return MethodNotAllowed("GET, HEAD, POST",
+					"only GET / HEAD / POST on /downloads/{hash}/comments");
+			}
+			return HandleDownloadComments(req, caps"hash");
+		}
+	}
+
+	// Source-reported filenames and counts. Downloads-only.
+	{
+		static const auto dl_filenames =
+			web_api_path::ParsePattern("/api/v1/downloads/{hash}/filenames");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(dl_filenames, path_segs, caps)) {
+			if (req.method != "GET" && req.method != "HEAD") {
+				return MethodNotAllowed(
+					"GET, HEAD", "only GET / HEAD on /downloads/{hash}/filenames");
+			}
+			return HandleDownloadFilenames(req, caps"hash");
+		}
+	}
+
+	// A4AF swap actions. Downloads-only.
+	{
+		static const auto dl_a4af = web_api_path::ParsePattern("/api/v1/downloads/{hash}/a4af");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(dl_a4af, path_segs, caps)) {
+			if (req.method == "POST") {
+				return HandleDownloadA4afAction(req, caps"hash");
+			}
+			// POST only: A4AF sources are rows of /downloads/{hash}/clients carrying
+			// the whole peer object, and `a4af_auto` is on the download detail.
+			return MethodNotAllowed("POST", "only POST on /downloads/{hash}/a4af");
+		}
+	}
+
+	// sources and A4AF rows of one partfile. Matched before the bare
+	// `/downloads/{hash}` pattern, which accepts any single segment.
+	{
+		static const auto dl_clients = web_api_path::ParsePattern("/api/v1/downloads/{hash}/clients");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(dl_clients, path_segs, caps)) {
+			if (req.method != "GET" && req.method != "HEAD") {
+				return MethodNotAllowed(
+					"GET, HEAD", "only GET / HEAD on /downloads/{hash}/clients");
+			}
+			return HandleFileClients(req, caps"hash", /*require_downloading=*/true);
+		}
+	}
+
+	// Single-resource detail plus the mutation surface. `{hash}` is the
+	// lowercase 32-char hex MD4; the dispatcher lower-cases input on the way in.
+	{
+		static const auto download_detail = web_api_path::ParsePattern("/api/v1/downloads/{hash}");
+		const auto path_segs = web_api_path::SplitPath(path);
+		std::map<std::string, std::string> caps;
+		if (web_api_path::Match(download_detail, path_segs, caps)) {
+			if (req.method == "GET" || req.method == "HEAD") {
+				return HandleDownloadDetail(req, caps"hash");
+			}
+			if (req.method == "PATCH") {
+				return HandleDownloadPatch(req, caps"hash");
+			}
+			if (req.method == "DELETE") {
+				return HandleDownloadDelete(req, caps"hash");
+			}
+			return MethodNotAllowed("GET, HEAD, PATCH, DELETE",
+				"only GET / HEAD / PATCH / DELETE on /downloads/{hash}");
+		}
+	}
+
+	// Ahead of the static fallthrough so the route answers identically whether or not
+	// StaticRoot is set: the bytes are compiled in. Outside /api/v1 because it is an
+	// image an <img src> points at, carrying no per-installation data.
+	if (path.compare(0, 7, "/flags/") == 0) {
+		if (req.method != "GET" && req.method != "HEAD") {
+			return MethodNotAllowed("GET, HEAD", "only GET / HEAD on /flags/{code}.png");
+		}
+		return ServeCountryFlag(req, path);
+	}
+
+	// Anything that matched no /api/v1 route and is a safe method for a non-API path.
+	// ServeStaticFile 404s when StaticRoot is unset, so API-only deployments are
+	// unaffected. Auth is deliberately NOT required: the shell is public, and the API
+	// calls it makes still pass the per-handler role gates.
+	if ((req.method == "GET" || req.method == "HEAD") && path.compare(0, 5, "/api/") != 0) {
+		return ServeStaticFile(req, path);
+	}
+
+	return ErrorResponse(404, "not_found", "no such endpoint");
+}
+
+CHttpServer::Response CApiDispatcher::ServeStaticFile(
+	const CHttpServer::Request &req, const std::string &url_path)
+{
+	// Resolved once per process, conf override first. std::call_once because handlers
+	// run concurrently on the worker pool and a plain lazy bool would race the string
+	// assignment on the first concurrent requests.
+	std::call_once(m_static_root_once, this() {
+		m_static_root_cache = m_config.ServerCfg().static_root;
+		if (m_static_root_cache.empty()) {
+			m_static_root_cache = ResolveDefaultStaticDir();
+		}
+	});
+	const std::string &root = m_static_root_cache;
+	if (root.empty()) {
+		// API-only deployment AND nothing on disk to fall back to.
+		return ErrorResponse(404, "not_found", "no such endpoint");
+	}
+
+	// Map "/" to the SPA entry; strip the leading slash so the join is relative.
+	// LooksMalicious has already rejected NUL and `..` segments.
+	std::string rel =
+		(url_path == "/" || url_path.empty()) ? std::string("index.html") : url_path.substr(1);
+
+	std::string fs_path;
+	struct stat st
+	{
+	};
+	std::string body;
+	bool found = webapi::ResolveWithinRoot(root, rel, fs_path) && ReadStaticFile(fs_path, body, st);
+
+	// An extension-less path that did not resolve is a client-side route, so the entry
+	// document is served and a deep-linked reload still boots. Paths that look like an
+	// asset 404 honestly, so a missing JS/CSS is visible.
+	if (!found && rel.find('.') == std::string::npos) {
+		if (webapi::ResolveWithinRoot(root, "index.html", fs_path) &&
+			ReadStaticFile(fs_path, body, st)) {
+			rel = "index.html";
+			found = true;
+		}
+	}
+
+	if (!found) {
+		return ErrorResponse(404, "not_found", "no such file");
+	}
+
+	const std::string etag = BuildStaticEtag(st);
+
+	// ETag is mtime+size, so a frontend rebuild invalidates without cache-busting.
+	// Case-insensitive because Beast preserves the client's wire casing, and via the
+	// shared matcher rather than a string compare: the header may be `*`, a
+	// comma-separated list, or a weak `W/"..."` validator, which is what an nginx in
+	// front emits once it gzips.
+	const std::string inm_val = FindHeaderCaseInsensitive(req.headers, "If-None-Match");
+	// A 304 has no body to compress, so which representation this validator names is
+	// decided here while the body is still present, and the comparison uses it.
+	const bool coded =
+		WillCompressBody(AcceptsGzip(FindHeaderCaseInsensitive(req.headers, "Accept-Encoding")),
+			body.size(),
+			StaticContentType(rel),
+			/*already_encoded=*/false);
+	// The shared helper takes the quoted form this path carries as readily as the bare
+	// form the API path does.
+	const std::string wire_static_etag = webcommon::WithCodingSuffix(etag, coded);
+	const std::string wire_static_bare =
+		(wire_static_etag.size() >= 2 && wire_static_etag.front() == '"' &&
+			wire_static_etag.back() == '"')
+			? wire_static_etag.substr(1, wire_static_etag.size() - 2)
+			: wire_static_etag;
+	if (webcommon::IfNoneMatchHits(inm_val, wire_static_bare)) {
+		CHttpServer::Response r;
+		r.status = 304;
+		// content_type defaults to application/json, which is wrong on a 304 for an HTML
+		// or CSS asset. Cleared rather than corrected: a 304 carries no content and the
+		// transport omits an empty header.
+		r.content_type.clear();
+		r.headers"ETag" = wire_static_etag;
+		// Same policy the 200 carries, or a cache is told the shell is
+		// private on the very response that confirms its copy is good.
+		r.headers"Cache-Control" = "public, no-cache";
+		return r;
+	}
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = StaticContentType(rel);
+	// Kept for HEAD too: the transport writes headers only, so nothing reaches the
+	// wire, and this lets Content-Length report the real size and stops HEAD and GET
+	// disagreeing about the validator.
+	r.body = std::move(body);
+	r.headers"ETag" = etag;
+	// The shell is the same bytes for everyone, so it overrides the authenticated
+	// default.
+	//
+	// no-cache rather than a max-age: index.html, app.js and app.css keep their names
+	// across a rebuild, so inside a freshness lifetime the browser would not ask, an
+	// upgraded daemon would serve the old shell, and per-asset expiry could pair a new
+	// shell with an old bundle. no-cache still lets the copy be stored, so an
+	// unchanged bundle costs one conditional GET answered 304.
+	//
+	// public is load-bearing: RFC 9111 3.5 bars a shared cache from reusing a response
+	// to an Authorization-bearing request unless it is public, must-revalidate or
+	// s-maxage. That is the bearer-token client, not the cookie-authenticated WebUI,
+	// which is why the credential stamp above needs Vary: Cookie instead.
+	r.headers"Cache-Control" = "public, no-cache";
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::ServeCountryFlag(
+	const CHttpServer::Request &, const std::string &url_path)
+{
+	// Exact shape only: "/flags/" + name + ".png".
+	static const std::string kPrefix = "/flags/";
+	static const std::string kSuffix = ".png";
+	if (url_path.size() <= kPrefix.size() + kSuffix.size() ||
+		url_path.compare(0, kPrefix.size(), kPrefix) != 0 ||
+		url_path.compare(url_path.size() - kSuffix.size(), kSuffix.size(), kSuffix) != 0) {
+		return ErrorResponse(404, "not_found", "no such flag");
+	}
+	const std::string code =
+		url_path.substr(kPrefix.size(), url_path.size() - kPrefix.size() - kSuffix.size());
+
+	// Two lowercase ASCII letters, the shape `country_code` arrives in, plus the one
+	// literal name the set ships alongside them: "unknown", the "??" placeholder
+	// CCountryFlags falls back to, offered so a frontend can match the desktop.
+	//
+	// The art id is built by concatenation, so this whitelist is what stops a crafted
+	// code naming a non-flag entry in the shared icon table. LooksMalicious rejects
+	// those upstream, but the lookup must not depend on it.
+	const bool is_alpha2 =
+		code.size() == 2 && code0 >= 'a' && code0 <= 'z' && code1 >= 'a' && code1 <= 'z';
+	if (!is_alpha2 && code != "unknown") {
+		return ErrorResponse(404, "not_found", "no such flag");
+	}
+
+	// The famfamfam set covers 248 of the ~300 assignable alpha-2 codes and GeoIP
+	// can resolve one it has no artwork for, so a well-formed miss is a 404.
+	const struct AMuleIconEntry *icon = amule_find_icon(("flag_" + code).c_str());
+	if (!icon || icon->png_data == nullptr || icon->png_len == 0) {
+		return ErrorResponse(404, "not_found", "no such flag");
+	}
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "image/png";
+	// Dispatch() applies the ETag and 304 swap to every 200 GET/HEAD, and the
+	// transport writes a HEAD as headers only, so this handler just produces bytes.
+	r.body.assign(reinterpret_cast<const char *>(icon->png_data), icon->png_len);
+	// The artwork is compiled in and can only change with a new build, while a peer
+	// list is a page full of <img> tags pointing here. A day of freshness turns those
+	// into cache hits, while bounding how long an upgraded daemon serves stale art.
+	r.headers"Cache-Control" = "public, max-age=86400";
+	return r;
+}
+
+// GET /health.
+//
+// Liveness, not readiness: always 200 while the HTTP server answers, so a container
+// or load-balancer probe never restarts a healthy process because amuled went away.
+// Readiness is in the body, where a caller that wants it can key on the two flags
+// without the status code moving under one that does not.
+//
+// No EC roundtrip: amuleapi serialises EC through one worker, so a probe that
+// waited on the daemon could block behind an unrelated slow mutation and time out,
+// reporting the service down when it is merely busy.
+CHttpServer::Response CApiDispatcher::HandleHealth(const CHttpServer::Request &)
+{
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("status");
+	w.ValueString(wxT("ok"));
+	w.Key("ec_connected");
+	w.ValueBool(m_state.EcConnected());
+	// `snapshot_ready`, not `snapshot`: a bare noun reads as "here is a snapshot"
+	// rather than the readiness state it reports, on the first response most clients
+	// parse (R4).
+	w.Key("snapshot_ready");
+	w.ValueBool(m_state.HasFirstSnapshot());
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleVersion(const CHttpServer::Request &req)
+{
+	// Identity stays unauthenticated: version negotiation has to work before anyone
+	// holds a token. Liveness is /health's job. The `update` block is authenticated,
+	// because it reports whether THIS daemon is outdated, which an unauthenticated
+	// caller on a reachable interface should not learn.
+	//
+	// Auth is OPTIONAL here, which is why Authenticate() is not called
+	// unconditionally: that wrapper counts every 401 against the generic limiter, and a
+	// request with no credential is this endpoint's documented use rather than a
+	// failure. Counting it would let an anonymous poller -- or one poller behind a
+	// reverse proxy, on the address every client shares -- spend the bucket in 30
+	// requests and lock real sessions out of the authenticated surface. A credential
+	// that IS presented and rejected still counts: the `update` block is an oracle a
+	// token guesser could otherwise read for free.
+	AuthOutcome auth;
+	if (RequestCarriesCredentials(req, kSessionCookieName)) {
+		auth = Authenticate(req);
+	}
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	// `service`, not `name`: the value is the constant "amuleapi".
+	w.Key("service");
+	w.ValueString(wxT("amuleapi"));
+	w.Key("api_version");
+	w.ValueString(wxT("v1"));
+	// `amuleapi_version`, not `amule_version`: the version the amuleapi binary was
+	// built from, which need not match the daemon it talks to.
+	w.Key("amuleapi_version");
+	// The short form the daemon reports for itself, so the two stay comparable:
+	// bare VERSION is the literal "GIT" on a development build.
+	w.ValueString(GetShortMuleVersion());
+	// Version of the connected amuled from the EC handshake; empty when EC is not
+	// connected or the daemon predates EC_TAG_SERVER_VERSION.
+	w.Key("daemon_version");
+	w.ValueString(m_app.GetDaemonVersion());
+
+	// Relayed from the connected daemon, never checked by amuleapi itself, and
+	// English/C-locale per the API contract. When the daemon cannot check (built
+	// without ENABLE_VERSION_CHECK, the pref off, or a pre-3.1 daemon emitting none of
+	// these tags) check_enabled is false and a client shows nothing.
+	if (auth.ok) {
+		const auto prefs = m_state.Preferences();
+		const auto status = m_state.Status();
+		const bool check_enabled = prefs.version_check_available && prefs.version_check_enabled;
+		const bool checked = status.version_check_done;
+		w.Key("update");
+		w.BeginObject();
+		w.Key("check_enabled");
+		w.ValueBool(check_enabled);
+		w.Key("checked");
+		w.ValueBool(checked);
+		// null rather than "" before a check completes (R10).
+		WriteStringOrNull(w,
+			"latest_version",
+			checked && !status.version_check_latest.empty(),
+			status.version_check_latest);
+		// `available`, not `update_available`: it stutters inside its own object.
+		w.Key("available");
+		if (checked) {
+			w.ValueBool(status.version_check_outdated);
+		} else {
+			w.ValueNull();
+		}
+		WriteIntOrNull(w,
+			"last_checked_at",
+			checked && status.version_check_timestamp > 0,
+			static_cast<std::int64_t>(status.version_check_timestamp));
+		w.EndObject();
+	}
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleLogin(const CHttpServer::Request &req)
+{
+	const std::string &ip = req.remote_addr;
+
+	// Before the credential path: a locked-out IP burns no MD5 cycles and cannot
+	// drive a side channel distinguishing lockout from wrong password.
+	const auto decision = m_rateLimiter.Check(ip);
+	if (decision.locked_out) {
+		CHttpServer::Response r =
+			ErrorResponse(429, "rate_limited", "too many failed attempts; retry later");
+		char retry_after32;
+		std::snprintf(retry_after,
+			sizeof(retry_after),
+			"%lld",
+			static_cast<long long>(decision.retry_after_seconds));
+		r.headers"Retry-After" = retry_after;
+		return r;
+	}
+
+	// Through ParseJsonObjectBody so this pre-auth path shares the depth cap: without
+	// it a deeply nested body would blow the worker stack via picojson's recursive
+	// descent, and login is reachable unauthenticated.
+	picojson::value v;
+	std::string err;
+	if (!ParseJsonObjectBody(req.body, v, err)) {
+		return ErrorResponse(400, "bad_request", "body must be JSON object {\"password\": \"...\"}");
+	}
+	const auto &obj = v.get<picojson::object>();
+	auto pw_it = obj.find("password");
+	if (pw_it == obj.end() || !pw_it->second.is<std::string>()) {
+		return ErrorResponse(400, "bad_request", "missing or non-string `password` field");
+	}
+	const wxString plain = wxString::FromUTF8(pw_it->second.get<std::string>().c_str());
+	const std::string md5_hex(MD5Sum(plain).GetHash().utf8_str());
+
+	// Admin first, then guest. The comparison is constant time inside webcommon; what
+	// is visible from outside is the PBKDF2 cost, which is why the limiter runs first.
+	// This is also where amuleapi picks up a password another process wrote, and where
+	// a record predating the current KDF cost is upgraded. Empty roles skip the KDF.
+	Role role = Role::GUEST;
+	const CAmuleApiConfig::MatchedRole matched = m_config.VerifyPassword(md5_hex);
+	if (matched == CAmuleApiConfig::MatchedRole::Admin) {
+		role = Role::ADMIN;
+	}
+
+	if (matched == CAmuleApiConfig::MatchedRole::None) {
+		// Distinguish "nothing configured" from "wrong password", or every login silently
+		// fails and the operator suspects the JWT. Read after VerifyPassword, which
+		// refreshes it from disk. A misconfiguration is not a failed guess, so it does
+		// not count against the limiter.
+		if (!m_config.HasAnyCredential()) {
+			return ErrorResponse(503,
+				"login_disabled",
+				"amuleapi has no admin/guest password configured; "
+				"set one via `amuleapi --set-admin-pass=<plain>`");
+		}
+		m_rateLimiter.NoteFailure(ip);
+		return ErrorResponse(
+			401, "invalid_credentials", "password does not match any configured role");
+	}
+
+	// Deliberately NO NoteSuccess(). One bucket, keyed by IP, guards both passwords,
+	// since VerifyPassword tries admin then guest. Clearing it on any match would let
+	// a guest-credential holder erase the admin failure streak at will -- four wrong
+	// admin guesses, one good guest login, repeat -- so the one control protecting the
+	// admin password never fires. Stamps age out on their own.
+	//
+	// The clear in HandleAuthPasswords is a different case: admin-gated and verifying
+	// the current password, so its success is on the credential the bucket protects.
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+
+	CJsonWriter w;
+	w.BeginObject();
+	BeginSession(req, role, r, w);
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// Issues a session for `role`, attaches the cookie to `r`, and writes the standard
+// session fields into the object `w` is building. Shared with the password change,
+// which re-issues so that changing a password does not sign the caller out of the
+// request they are making.
+void CApiDispatcher::BeginSession(
+	const CHttpServer::Request &req, Role role, CHttpServer::Response &r, CJsonWriter &w)
+{
+	const CJwt::IssuedToken issued = m_jwt.Issue(role);
+	r.headers"Set-Cookie" = MakeSetCookie(kSessionCookieName, issued.token, issued.expires_at);
+
+	// Cookie-auth default: the HttpOnly+SameSite cookie carries the token, and echoing
+	// it into the body would defeat HttpOnly -- any XSS that could call
+	// fetch('/auth/login') could read and exfiltrate the bearer.
+	//
+	// Opt-in for SDK and curl clients with no cookie jar: `Accept: application/jwt` or
+	// `?include_token=true` adds `token` to the body and nothing else.
+	bool wants_bearer = false;
+	{
+		const std::string accept = FindHeaderCaseInsensitive(req.headers, "Accept");
+		if (accept.find("application/jwt") != std::string::npos) {
+			wants_bearer = true;
+		}
+		if (!wants_bearer) {
+			std::string q;
+			const std::size_t qpos = req.target.find('?');
+			if (qpos != std::string::npos)
+				q = req.target.substr(qpos + 1);
+			const auto qmap = web_api_path::ParseQuery(q);
+			// `include_token=true`, not `type=bearer`: "type" named no axis.
+			const auto it = qmap.find("include_token");
+			if (it != qmap.end() && it->second == "true") {
+				wants_bearer = true;
+			}
+		}
+	}
+
+	if (wants_bearer) {
+		w.Key("token");
+		w.ValueString(wxString::FromUTF8(issued.token.c_str()));
+	}
+	w.Key("role");
+	w.ValueString(role == Role::ADMIN ? wxT("admin") : wxT("guest"));
+	// One `expires_at`, unix seconds, like every other `_at` on the surface.
+	w.Key("expires_at");
+	w.ValueInt(static_cast<int64_t>(issued.expires_at));
+	// `session_id`, not `jti` (a JWT internal), and unconditional: emitted for token
+	// and cookie logins alike, so every session carries the id /auth/session
+	// returns for the same session.
+	w.Key("session_id");
+	w.ValueString(wxString::FromUTF8(issued.jti.c_str()));
+}
+
+CHttpServer::Response CApiDispatcher::HandleLogout(const CHttpServer::Request &req)
+{
+	// The generic-401 cap applies here too: repeat 401s are a credential-stuffing
+	// signal even on an idempotent path, and locked-out IPs short-circuit.
+	const std::string &ip = req.remote_addr;
+	{
+		const auto decision = m_authRateLimiter.Check(ip);
+		if (decision.locked_out) {
+			CHttpServer::Response r = ErrorResponse(
+				429, "rate_limited", "too many failed auth attempts; retry later");
+			char retry_after32;
+			std::snprintf(retry_after,
+				sizeof(retry_after),
+				"%lld",
+				static_cast<long long>(decision.retry_after_seconds));
+			r.headers"Retry-After" = retry_after;
+			return r;
+		}
+	}
+
+	// Logout is idempotent: a revoked-but-unexpired token still gets a 204, because
+	// what it asked for has already happened. Otherwise a tab that fires logout twice
+	// sees a 401 and renders a spurious "session expired". Softer than
+	// AuthenticateRequest: reject only bad-sig, expired or missing; revoked is a noop.
+	std::string token;
+	auto auth_it = req.headers.find("Authorization");
+	if (auth_it == req.headers.end()) {
+		for (const auto &h : req.headers) {
+			if (h.first.size() == 13 && strncasecmp(h.first.c_str(), "Authorization", 13) == 0) {
+				auth_it = req.headers.find(h.first);
+				break;
+			}
+		}
+	}
+	if (auth_it != req.headers.end()) {
+		token = webapi::ExtractBearerToken(auth_it->second);
+	}
+	if (token.empty()) {
+		auto ck_it = req.headers.find("Cookie");
+		if (ck_it == req.headers.end()) {
+			for (const auto &h : req.headers) {
+				if (h.first.size() == 6 && strncasecmp(h.first.c_str(), "Cookie", 6) == 0) {
+					ck_it = req.headers.find(h.first);
+					break;
+				}
+			}
+		}
+		if (ck_it != req.headers.end()) {
+			token = webapi::ExtractCookieValue(ck_it->second, kSessionCookieName);
+		}
+	}
+	if (token.empty()) {
+		m_authRateLimiter.NoteFailure(ip);
+		return ErrorResponse(401, "unauthorized", "missing bearer token or session cookie");
+	}
+	CJwt::VerifyResult v;
+	if (!m_jwt.Verify(token, v)) {
+		m_authRateLimiter.NoteFailure(ip);
+		return ErrorResponse(401, "unauthorized", "invalid or expired token");
+	}
+	// Already revoked → 204 noop (don't re-revoke, don't re-emit a
+	// clear-cookie that might race with the browser's own delete).
+	if (!m_revocations.IsRevoked(v.jti)) {
+		// TTL is the JWT's own exp, so the GC drops the entry once the token
+		// would have expired anyway.
+		m_revocations.Revoke(v.jti, v.exp);
+	}
+	m_authRateLimiter.NoteSuccess(ip);
+
+	CHttpServer::Response r;
+	// 204 with no body: any echo would only repeat the request URL,
+	// and `ok` would restate the status code.
+	r.status = 204;
+	r.content_type.clear();
+	r.headers"Set-Cookie" = MakeClearCookie(kSessionCookieName);
+
+	return r;
+}
+
+AuthOutcome CApiDispatcher::Authenticate(const CHttpServer::Request &req)
+{
+	return AuthenticateRequestRateLimited(req,
+		m_jwt,
+		m_revocations,
+		m_authRateLimiter,
+		kSessionCookieName,
+		m_config.CredentialsChangedAt());
+}
+
+CHttpServer::Response CApiDispatcher::HandleSession(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("role");
+	w.ValueString(a.verified.role == Role::ADMIN ? wxT("admin") : wxT("guest"));
+	w.Key("session_id");
+	w.ValueString(wxString::FromUTF8(a.verified.jti.c_str()));
+	w.Key("expires_at");
+	w.ValueInt(static_cast<int64_t>(a.verified.exp));
+	w.EndObject();
+	// Per-principal document: a shared cache must not hand one caller another's
+	// session. The ETag memo excludes this target for the same reason.
+	r.headers"Cache-Control" = "private, no-store";
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// What is configured, never the credentials. Admin-only: whether a guest
+// account exists is not something a guest session needs to know.
+CHttpServer::Response CApiDispatcher::HandleAuthPasswords(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto r = RequireAdmin(a))
+		return *r;
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("admin_password_set");
+	w.ValueBool(!m_config.AdminCredential().empty());
+	w.Key("guest_access_enabled");
+	w.ValueBool(!m_config.GuestCredential().empty());
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// Change the admin password, and turn the guest role on/off or change its password.
+//
+// `current_password` is mandatory even though the caller holds an admin token: a
+// stolen token should not be enough to lock the operator out of their own daemon.
+// It shares /auth/login's rate limiter, so this is not a softer place to guess.
+// Fields are omitted rather than nulled to mean "leave alone".
+CHttpServer::Response CApiDispatcher::HandleAuthPasswordsPatch(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto r = RequireAdmin(a))
+		return *r;
+
+	const std::string &ip = req.remote_addr;
+	const auto decision = m_rateLimiter.Check(ip);
+	if (decision.locked_out) {
+		CHttpServer::Response r =
+			ErrorResponse(429, "rate_limited", "too many failed attempts; retry later");
+		char retry_after32;
+		std::snprintf(retry_after,
+			sizeof(retry_after),
+			"%lld",
+			static_cast<long long>(decision.retry_after_seconds));
+		r.headers"Retry-After" = retry_after;
+		return r;
+	}
+
+	picojson::value v;
+	std::string err;
+	if (!ParseJsonObjectBody(req.body, v, err)) {
+		return ErrorResponse(400, "bad_request", "body must be a JSON object");
+	}
+	const auto &obj = v.get<picojson::object>();
+
+	auto string_field = &obj(const char *name, std::string &out, bool &present) -> bool {
+		auto it = obj.find(name);
+		present = (it != obj.end());
+		if (!present)
+			return true;
+		if (!it->second.is<std::string>())
+			return false;
+		out = it->second.get<std::string>();
+		return true;
+	};
+
+	std::string current, admin_new, guest_new;
+	bool has_current = false, has_admin = false, has_guest = false;
+	if (!string_field("current_password", current, has_current) ||
+		!string_field("admin_password", admin_new, has_admin) ||
+		!string_field("guest_password", guest_new, has_guest)) {
+		return ErrorResponse(400, "bad_request", "password fields must be strings");
+	}
+	if (!has_current) {
+		return ErrorResponse(400, "bad_request", "`current_password` is required");
+	}
+
+	bool guest_access_enabled = !m_config.GuestCredential().empty();
+	bool has_guest_access_enabled = false;
+	{
+		auto it = obj.find("guest_access_enabled");
+		has_guest_access_enabled = (it != obj.end());
+		if (has_guest_access_enabled) {
+			if (!it->second.is<bool>()) {
+				return ErrorResponse(
+					400, "bad_request", "`guest_access_enabled` must be a boolean");
+			}
+			guest_access_enabled = it->second.get<bool>();
+		}
+	}
+	// Setting a guest password while switching the role off is contradictory, and
+	// guessing which half was meant would silently do the wrong one.
+	if (has_guest && !guest_new.empty() && has_guest_access_enabled && !guest_access_enabled) {
+		return ErrorResponse(400,
+			"bad_request",
+			"`guest_password` cannot be set together with `guest_access_enabled: false`");
+	}
+	// A guest password on its own means "turn guest on with this".
+	if (has_guest && !guest_new.empty() && !has_guest_access_enabled) {
+		guest_access_enabled = true;
+	}
+	if (!has_admin && !has_guest && !has_guest_access_enabled) {
+		return ErrorResponse(400, "bad_request", "nothing to change");
+	}
+	// There is no way to clear the admin password; an admin-less daemon
+	// bound to a routable address would answer to nobody.
+	if (has_admin && admin_new.empty()) {
+		return ErrorResponse(400,
+			"bad_request",
+			"`admin_password` cannot be empty; the admin role cannot be removed");
+	}
+
+	const std::string current_md5(
+		MD5Sum(wxString::FromUTF8(current.c_str())).GetHash().Lower().utf8_str());
+	if (m_config.VerifyPassword(current_md5) != CAmuleApiConfig::MatchedRole::Admin) {
+		m_rateLimiter.NoteFailure(ip);
+		return ErrorResponse(
+			403, "invalid_credentials", "`current_password` is not the admin password");
+	}
+	m_rateLimiter.NoteSuccess(ip);
+
+	webcommon::CredentialChange change;
+	// The member keeps the name libwebcommon's credential file uses.
+	change.guest_enabled = guest_access_enabled;
+	if (has_admin) {
+		change.admin_md5 = std::string(
+			MD5Sum(wxString::FromUTF8(admin_new.c_str())).GetHash().Lower().utf8_str());
+	}
+	if (has_guest && !guest_new.empty()) {
+		change.guest_md5 = std::string(
+			MD5Sum(wxString::FromUTF8(guest_new.c_str())).GetHash().Lower().utf8_str());
+	}
+
+	std::string apply_err;
+	if (!webcommon::ApplyCredentialChange(
+		    std::string(m_config.ConfigDir().utf8_str()), change, apply_err)) {
+		return ErrorResponse(500, "internal_error", apply_err.c_str());
+	}
+
+	// Pull the new records into memory now, so the response below reports
+	// the state that was just written rather than the state before it.
+	m_config.ReloadCredentials();
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("admin_password_set");
+	w.ValueBool(!m_config.AdminCredential().empty());
+	w.Key("guest_access_enabled");
+	w.ValueBool(!m_config.GuestCredential().empty());
+	// Writing the file invalidated every token issued before it, this caller's
+	// included. Re-issuing theirs keeps the operator who changed the password signed
+	// in while everyone else is signed out, which is the point of changing it.
+	BeginSession(req, Role::ADMIN, r, w);
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleStatus(const CHttpServer::Request &req)
+{
+	// Any authenticated role; mutating endpoints gate on admin only.
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	// 503 with a structured code until the refresher has completed a tick, so
+	// clients retry rather than guess.
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	// One shared_lock for the whole composite read: Dashboard() returns status, kad,
+	// snapshot_at and ec_connected in a single acquisition, so a refresher tick cannot
+	// land between sub-snapshots and produce an inconsistent rollup (kad.network from
+	// tick N+1 beside ed2k.* from tick N).
+	const webapi::CState::DashboardSnapshot d = m_state.Dashboard();
+	const webapi::StatusSnapshot &s = d.status;
+	const webapi::KadSnapshot &k = d.kad;
+	const std::time_t ts = d.snapshot_at;
+	const bool ec = d.ec_connected;
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+
+	CJsonWriter w;
+	w.BeginObject();
+	// No snapshot timestamp in the envelope: a value that moves every tick changes the
+	// body bytes and defeats the ETag, so list endpoints would never see a cache hit.
+	// `ec_connected` is the staleness signal, and the HTTP Date header carries
+	// wall-clock for anyone who needs it.
+	w.Key("ec_connected");
+	w.ValueBool(ec);
+	(void)ts;
+
+	w.Key("ed2k");
+	w.BeginObject();
+	w.Key("state");
+	w.ValueString(wxString::FromUTF8(s.ed2k_state.c_str()));
+	// Positive sense, matching the peer-side high_id on /clients/{ecid}. False for
+	// a LowID and while disconnected alike, so read it with `state`.
+	w.Key("high_id");
+	w.ValueBool(s.ed2k_high_id);
+	// Our server-assigned id; a HighID (>= 16777216) is our public address packed
+	// LSB-first, which is where public_ip comes from. NOT the same encoding as the
+	// peer-side ed2k_user_id on /clients/{ecid}, which byte-swaps a HighID, so the two
+	// must not be fed through each other's decoder.
+	w.Key("user_id");
+	w.ValueInt(static_cast<int64_t>(s.ed2k_user_id));
+	WriteStringOrNull(w, "public_ip", !s.ed2k_public_ip.empty(), s.ed2k_public_ip);
+	// 0 when not connected -- gate on ed2k.state, not on this being nonzero.
+	w.Key("connected_since_at");
+	w.ValueInt(static_cast<int64_t>(s.ed2k_connected_since));
+	// Null when not connected: ed2k.state already says whether there is a server, so
+	// "" only ever meant "not connected", and a port on its own describes nothing.
+	const bool has_server = !s.server_ip.empty();
+	WriteStringOrNull(w, "server_name", has_server, s.server_name);
+	WriteStringOrNull(w, "server_ip", has_server, s.server_ip);
+	WriteIntOrNull(w, "server_port", has_server, static_cast<int64_t>(s.server_port));
+	// Aggregate user and file counts across all connected ed2k servers, from the
+	// same EC_OP_STAT_REQ response the kad counters ride on.
+	w.Key("network");
+	w.BeginObject();
+	// null unless eD2k is connected: these sum the whole known server list, not
+	// the server we are attached to, and nothing zeroes them on disconnect.
+	WriteIntOrNull(w, "user_count", s.has_ed2k_network, static_cast<int64_t>(s.ed2k_users));
+	WriteIntOrNull(w, "file_count", s.has_ed2k_network, static_cast<int64_t>(s.ed2k_files));
+	w.EndObject();
+	w.EndObject();
+
+	w.Key("kad");
+	w.BeginObject();
+	w.Key("state");
+	w.ValueString(wxString::FromUTF8(s.kad_state.c_str()));
+	// Named for the transport because GET /kad reports it beside firewalled_udp,
+	// a separate measurement rather than a refinement of this one.
+	WriteBoolOrNull(w, "firewalled_tcp", s.has_kad_firewalled_tcp, s.kad_firewalled_tcp);
+	// 0 when not connected -- gate on kad.state, not on this being nonzero.
+	w.Key("connected_since_at");
+	w.ValueInt(static_cast<int64_t>(s.kad_connected_since));
+	// The same numbers GET /kad serves under `network`, through the same helper so the
+	// two cannot drift. `k` was snapshotted in the same lock batch as `s`, so these
+	// counters describe the same refresher tick as ed2k.* above.
+	WriteKadNetworkObject(w, k);
+	w.EndObject();
+
+	w.Key("speeds");
+	w.BeginObject();
+	// `download_speed_bytes_per_second`, not `download_bytes_per_second`: the `speeds`
+	// wrapper does not rename the quantity, and the short form reads close enough to
+	// the cumulative `downloaded_bytes_total` to be misread as one.
+	w.Key("download_speed_bytes_per_second");
+	w.ValueInt(static_cast<int64_t>(s.download_bytes_per_second));
+	w.Key("upload_speed_bytes_per_second");
+	w.ValueInt(static_cast<int64_t>(s.upload_bytes_per_second));
+	// Additive to the two above, not a subset: amuled counts protocol
+	// overhead separately from payload.
+	w.Key("download_overhead_bytes_per_second");
+	w.ValueInt(static_cast<int64_t>(s.download_overhead_bytes_per_second));
+	w.Key("upload_overhead_bytes_per_second");
+	w.ValueInt(static_cast<int64_t>(s.upload_overhead_bytes_per_second));
+	w.EndObject();
+
+	// null rather than a number when the daemon has no figure: the -1 sentinel as
+	// an unsigned value would read as 17 exabytes free, and 0 as a full disk.
+	w.Key("disk");
+	w.BeginObject();
+	WriteIntOrNull(
+		w, "temp_free_bytes", s.temp_free_bytes >= 0, static_cast<std::int64_t>(s.temp_free_bytes));
+	WriteIntOrNull(w,
+		"incoming_free_bytes",
+		s.incoming_free_bytes >= 0,
+		static_cast<std::int64_t>(s.incoming_free_bytes));
+	w.EndObject();
+
+	w.Key("queue");
+	w.BeginObject();
+	w.Key("waiting_upload_client_count");
+	w.ValueInt(static_cast<int64_t>(s.ul_queue_len));
+	w.Key("download_source_count");
+	w.ValueInt(static_cast<int64_t>(s.total_src_count));
+	w.EndObject();
+	// Nickname is a /preferences field, not a /status one.
+	w.EndObject();
+
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+namespace
+{
+
+// Write a single download object, used inline by the list endpoint and as the bare
+// body of the detail endpoint; `include_envelope_keys` picks which.
+//
+// The chunk size and part-count arithmetic live in State.h (webapi::kPartSizeBytes
+// / webapi::PartCountForSize). The constant still cannot come from
+// `protocol/ed2k/Constants.h`, which is written against amule's legacy typedefs.
+
+// Render the per-part state array from the decoded gap list and per-part source
+// counts: count = ceil(size / PARTSIZE); a part "has gap" if any byte-range in
+// `gaps` covers it; state is "complete" (no gap), "pending" (gap + sources > 0) or
+// "unavailable" (gap + zero sources). `gaps` is flat (start, end) uint64 pairs,
+// both inclusive on amule's side (CGapList::Encode semantics).
+void WriteProgressParts(CJsonWriter &w, const webapi::FileSnapshot &f)
+{
+	w.Key("parts");
+	w.BeginArray();
+	if (f.size == 0) {
+		w.EndArray();
+		return;
+	}
+	const std::uint64_t part_count = webapi::PartCountForSize(f.size);
+	std::vector<bool> has_gap(part_count, false);
+	const auto &gaps = f.download.decoded_gaps;
+	const std::size_t gap_pair_count = gaps.size() / 2;
+	for (std::size_t g = 0; g < gap_pair_count; ++g) {
+		const std::uint64_t gap_start = gaps2 * g;
+		const std::uint64_t gap_end = gaps2 * g + 1;
+		const std::uint64_t start_idx = gap_start / webapi::kPartSizeBytes;
+		const std::uint64_t end_idx = gap_end / webapi::kPartSizeBytes;
+		for (std::uint64_t i = start_idx; i <= end_idx && i < part_count; ++i) {
+			has_gapstatic_cast<std::size_t>(i) = true;
+		}
+	}
+	const auto &part_sources = f.download.decoded_part_sources;
+	for (std::uint64_t i = 0; i < part_count; ++i) {
+		const std::uint16_t sources = (static_cast<std::size_t>(i) < part_sources.size())
+						      ? part_sourcesstatic_cast<std::size_t>(i)
+						      : static_cast<std::uint16_t>(0);
+		// "pending": we lack it and a source has it. "unavailable": we lack it and
+		// none does. The two spellings distinguish a gap a source can fill from one nobody can.
+		const char *state = !has_gapstatic_cast<std::size_t>(i)
+					    ? "complete"
+					    : (sources > 0 ? "pending" : "unavailable");
+		w.BeginObject();
+		w.Key("state");
+		w.ValueString(wxString::FromAscii(state));
+		w.Key("sources");
+		w.ValueInt(static_cast<int64_t>(sources));
+		w.EndObject();
+	}
+	w.EndArray();
+}
+
+// Per-part source availability behind the shared "Obtained Parts" bar. A complete
+// known file carries its own vector from EC_TAG_KNOWNFILE; a shared partfile is
+// emitted as EC_TAG_PARTFILE only, so its vector lands on the download side. Same
+// server-side encoder, so the fallback is the same numbers.
+const std::vector<std::uint16_t> &SharedPartSources(const webapi::FileSnapshot &f)
+{
+	return f.shared.decoded_part_sources.empty() ? f.download.decoded_part_sources
+						     : f.shared.decoded_part_sources;
+}
+
+// One `{sources}` per part, in file order, always exactly `part_count` long.
+// Deliberately NOT the downloads shape: `state` there encodes local completeness,
+// meaningless for a share and an invitation to render a progress bar. Always
+// present, null when nothing has been decoded (R10), which keeps "no data"
+// distinct from "no sources for any part".
+void WriteSharedAvailabilityParts(CJsonWriter &w, const webapi::FileSnapshot &f)
+{
+	const std::vector<std::uint16_t> &part_sources = SharedPartSources(f);
+	if (part_sources.empty()) {
+		w.Key("parts");
+		w.ValueNull();
+		return;
+	}
+	w.Key("parts");
+	w.BeginArray();
+	const std::uint64_t part_count = webapi::PartCountForSize(f.size);
+	for (std::uint64_t i = 0; i < part_count; ++i) {
+		const std::uint16_t sources = (static_cast<std::size_t>(i) < part_sources.size())
+						      ? part_sourcesstatic_cast<std::size_t>(i)
+						      : static_cast<std::uint16_t>(0);
+		w.BeginObject();
+		w.Key("sources");
+		w.ValueInt(static_cast<int64_t>(sources));
+		w.EndObject();
+	}
+	w.EndArray();
+}
+
+// The `media` object, or null when the file carries no probed metadata. Shared by
+// the download, shared and search-result writers. null rather than omitted so the
+// key is always there: this is the one place the unknown-value rule reaches an
+// object rather than a scalar, so a client tests `media === null` before reaching
+// into it.
+void WriteMediaIfPresent(CJsonWriter &w, const webapi::FileSnapshot &f)
+{
+	if (!f.has_media) {
+		w.Key("media");
+		w.ValueNull();
+		return;
+	}
+	w.Key("media");
+	w.BeginObject();
+	w.Key("duration_seconds");
+	w.ValueInt(static_cast<int64_t>(f.media.duration_seconds));
+	w.Key("bitrate_kilobits_per_second");
+	w.ValueInt(static_cast<int64_t>(f.media.bitrate_kilobits_per_second));
+	w.Key("codec");
+	w.ValueString(wxString::FromUTF8(MediaCodecLabel(f.media.codec).c_str()));
+	w.Key("artist");
+	w.ValueString(wxString::FromUTF8(f.media.artist.c_str()));
+	w.Key("album");
+	w.ValueString(wxString::FromUTF8(f.media.album.c_str()));
+	w.Key("title");
+	w.ValueString(wxString::FromUTF8(f.media.title.c_str()));
+	w.EndObject();
+}
+
+void WriteDownloadObject(
+	CJsonWriter &w, const webapi::FileSnapshot &f, bool include_parts = false, bool detail = false)
+{
+	w.BeginObject();
+	w.Key("hash");
+	w.ValueString(wxString::FromUTF8(f.hash.c_str()));
+	w.Key("name");
+	w.ValueString(wxString::FromUTF8(f.name.c_str()));
+	w.Key("ed2k_link");
+	w.ValueString(wxString::FromUTF8(f.ed2k_link.c_str()));
+	w.Key("size_bytes");
+	w.ValueInt(static_cast<int64_t>(f.size));
+	w.Key("completed_bytes");
+	w.ValueInt(static_cast<int64_t>(f.download.completed_bytes));
+	w.Key("transferred_bytes");
+	w.ValueInt(static_cast<int64_t>(f.download.transferred_bytes));
+	w.Key("speed_bytes_per_second");
+	w.ValueInt(static_cast<int64_t>(f.download.speed_bytes_per_second));
+	w.Key("status");
+	w.ValueString(wxString::FromUTF8(f.download.status.c_str()));
+	w.Key("priority");
+	w.ValueString(wxString::FromUTF8(f.download.priority.c_str()));
+	w.Key("priority_auto");
+	w.ValueBool(f.download.priority_auto);
+	w.Key("category_index");
+	w.ValueInt(static_cast<int64_t>(f.download.category));
+	w.Key("sources");
+	w.BeginObject();
+	w.Key("total");
+	w.ValueInt(static_cast<int64_t>(f.download.sources_total));
+	w.Key("unavailable");
+	w.ValueInt(static_cast<int64_t>(f.download.sources_unavailable));
+	w.Key("transferring");
+	w.ValueInt(static_cast<int64_t>(f.download.sources_transferring));
+	w.Key("a4af");
+	w.ValueInt(static_cast<int64_t>(f.download.sources_a4af));
+	w.EndObject();
+	w.Key("progress");
+	w.BeginObject();
+	w.Key("percent");
+	w.ValueDouble(f.download.percent);
+	if (include_parts) {
+		WriteProgressParts(w, f);
+	}
+	w.EndObject();
+	// True while an on-demand Kad notes lookup is in flight. In the shared object
+	// so list, detail and the SSE download event stay identical.
+	w.Key("kad_comment_lookup_running");
+	w.ValueBool(f.download.kad_comment_searching);
+	// On the list, not detail-only: a hashing indicator needs it wherever the file
+	// appears. Parts hashed so far, not an index; 0 when idle.
+	w.Key("hashed_part_count");
+	w.ValueInt(static_cast<int64_t>(f.download.hashed_part_count));
+	// Its denominator, on the list for the same reason: a rising count with no
+	// total cannot be rendered. Computed, not decoded -- there is no EC tag.
+	const std::int64_t total_part_count = static_cast<std::int64_t>(webapi::PartCountForSize(f.size));
+	w.Key("total_part_count");
+	w.ValueInt(total_part_count);
+	// On the list so the SSE download event carries it: A4AF is a client-to-file
+	// relation, the one thing a per-file client list needs that the `clients` channel
+	// cannot say.
+	w.Key("source_ecids");
+	w.BeginArray();
+	for (const std::uint32_t ecid : f.download.a4af_sources) {
+		w.ValueInt(static_cast<int64_t>(ecid));
+	}
+	w.EndArray();
+	if (detail) {
+		// Detail-only fields, omitted from the list. `remaining_seconds` is computed
+		// here -- no EC tag exists -- and is null when stalled or paused, where there
+		// is nothing to compute from, rather than a -1 a client would have to read as unknown.
+		bool has_remaining_seconds = false;
+		std::int64_t remaining_seconds = 0;
+		if (f.download.speed_bytes_per_second > 0) {
+			has_remaining_seconds = true;
+			remaining_seconds =
+				(f.size > f.download.completed_bytes)
+					? static_cast<std::int64_t>((f.size - f.download.completed_bytes) /
+								    f.download.speed_bytes_per_second)
+					: 0;
+		}
+		// Null rather than 0 for "no complete copy has ever been seen": a unix
+		// timestamp of 0 reads as 1970, not as never.
+		WriteIntOrNull(w,
+			"last_seen_complete_at",
+			f.download.last_seen_complete_at != 0,
+			static_cast<std::int64_t>(f.download.last_seen_complete_at));
+		// Same rule: 0 is "no byte has arrived yet", not a 1970 date. It is only
+		// set when amuled ships the tag.
+		WriteIntOrNull(w,
+			"last_received_at",
+			f.download.last_received_at != 0,
+			static_cast<std::int64_t>(f.download.last_received_at));
+		w.Key("active_seconds");
+		w.ValueInt(static_cast<int64_t>(f.download.active_seconds));
+		w.Key("available_part_count");
+		w.ValueInt(static_cast<int64_t>(f.download.available_part_count));
+		WriteIntOrNull(w, "remaining_seconds", has_remaining_seconds, remaining_seconds);
+		w.Key("lost_to_corruption_bytes");
+		w.ValueInt(static_cast<int64_t>(f.download.lost_to_corruption_bytes));
+		w.Key("gained_by_compression_bytes");
+		w.ValueInt(static_cast<int64_t>(f.download.gained_by_compression_bytes));
+		w.Key("ich_recovered_packet_count");
+		w.ValueInt(static_cast<int64_t>(f.download.ich_recovered_packet_count));
+		// null, not "": the AICH hashset does not exist until the file has been
+		// hashed, and R10 spells an absent value null.
+		WriteStringOrNull(w, "aich_hash", !f.aich_hash.empty(), f.aich_hash);
+		// The ".part" control-file basename, omitted once the download completes: a
+		// completed file structurally has no partfile, which is the absent-key case
+		// rather than the null of "not reported". Nothing to surface either way: on a
+		// completed file the daemon reuses the _FILENAME tag to carry the directory path.
+		if (f.download.status != "completed") {
+			w.Key("part_file_name");
+			w.ValueString(wxString::FromUTF8(f.part_met_basename.c_str()));
+		}
+		w.Key("directory");
+		// The on-disk directory (Temp while downloading, destination once
+		// completed) -- mirrors the `path` field on /shared/{hash} (#417).
+		w.ValueString(wxString::FromUTF8(f.on_disk_dir.c_str()));
+		w.Key("upload_queue_count");
+		w.ValueInt(static_cast<int64_t>(f.queued_count));
+		w.Key("my_comment");
+		w.ValueString(wxString::FromUTF8(f.comment.c_str()));
+		w.Key("my_rating");
+		w.ValueInt(static_cast<int64_t>(f.rating));
+		w.Key("a4af_auto");
+		w.ValueBool(f.download.a4af_auto);
+		WriteMediaIfPresent(w, f);
+	}
+	w.EndObject();
+}
+
+// Base (list-level) client fields, emitted into an already-open object so the
+// list and detail writers share one definition of the set.
+void WriteClientBaseFields(CJsonWriter &w, const webapi::ClientSnapshot &c)
+{
+	w.Key("ecid");
+	w.ValueInt(static_cast<int64_t>(c.ecid));
+	// Null, not "", for every optional string below (R10), matching
+	// WriteKnownClientObject. user_hash and the *_state enums stay unconditional.
+	WriteStringOrNull(w, "name", !c.client_name.empty(), c.client_name);
+	w.Key("user_hash");
+	w.ValueString(wxString::FromUTF8(c.user_hash.c_str()));
+	// Nulled together, keyed on the address: a port without one describes nothing.
+	// Matches the SSE row and WriteKnownClientObject.
+	const bool has_addr = !c.ip.empty();
+	WriteStringOrNull(w, "ip", has_addr, c.ip);
+	WriteIntOrNull(w, "port", has_addr, static_cast<int64_t>(c.port));
+	// ISO 3166-1 alpha-2 (lowercase); null when GeoIP is off/unresolved (#439).
+	WriteStringOrNull(w, "country_code", !c.country_code.empty(), c.country_code);
+	WriteStringOrNull(w, "software", !c.software.empty(), c.software);
+	WriteStringOrNull(w, "software_version", !c.software_version.empty(), c.software_version);
+	WriteStringOrNull(w, "reported_os", !c.reported_os.empty(), c.reported_os);
+	// The three *_state values are enum labels, not free text: the daemon always
+	// answers, and an answer it does not recognise is the enum's "unknown" member.
+	// Empty is unreachable, so there is nothing to null.
+	w.Key("upload_state");
+	w.ValueString(wxString::FromUTF8(c.upload_state.c_str()));
+	w.Key("download_state");
+	w.ValueString(wxString::FromUTF8(c.download_state.c_str()));
+	w.Key("ident_state");
+	w.ValueString(wxString::FromUTF8(c.ident_state.c_str()));
+	WriteStringOrNull(w, "download_file_name", !c.download_file_name.empty(), c.download_file_name);
+	WriteStringOrNull(w, "upload_file_name", !c.upload_file_name.empty(), c.upload_file_name);
+	WriteStringOrNull(w, "upload_file_hash", !c.upload_file_hash.empty(), c.upload_file_hash);
+	WriteStringOrNull(w, "download_file_hash", !c.download_file_hash.empty(), c.download_file_hash);
+	// R11: kept flat, not in a sub-object. A sub-object earns its place by
+	// grouping DIFFERENT quantities; one quantity split by time window belongs
+	// in the key.
+	w.Key("uploaded_bytes_session");
+	w.ValueInt(static_cast<int64_t>(c.uploaded_bytes_session));
+	w.Key("downloaded_bytes_session");
+	w.ValueInt(static_cast<int64_t>(c.downloaded_bytes_session));
+	w.Key("uploaded_bytes_total");
+	w.ValueInt(static_cast<int64_t>(c.uploaded_bytes_total));
+	w.Key("downloaded_bytes_total");
+	w.ValueInt(static_cast<int64_t>(c.downloaded_bytes_total));
+	w.Key("upload_speed_bytes_per_second");
+	w.ValueInt(static_cast<int64_t>(c.upload_speed_bytes_per_second));
+	w.Key("download_speed_bytes_per_second");
+	w.ValueInt(static_cast<int64_t>(c.download_speed_bytes_per_second));
+	w.Key("upload_queue_position");
+	w.ValueInt(static_cast<int64_t>(c.upload_queue_position));
+	// 0xffff is amuled's "that peer's queue is full" sentinel
+	// (ECSpecialCoreTags.cpp), not a position. Relayed verbatim it renders as
+	// "position 65535", and sorting by it buries full queues at the far end as though
+	// they were merely very distant.
+	WriteIntOrNull(w,
+		"remote_queue_position",
+		c.remote_queue_position != webapi::kRemoteQueueFullSentinel,
+		static_cast<int64_t>(c.remote_queue_position));
+	w.Key("upload_queue_score");
+	w.ValueInt(static_cast<int64_t>(c.score));
+	WriteStringOrNull(w, "obfuscation_state", !c.obfuscation_state.empty(), c.obfuscation_state);
+	// Being in this list means the daemon holds a client object, which starts
+	// at the first contact attempt. This says whether a socket is actually up.
+	WriteBoolOrNull(w, "connected", c.has_connected, c.connected);
+	// The extensions the peer claimed, as tokens rather than the
+	// EC_TAG_CLIENT_MOD_CAPABILITIES word: an integer would make every consumer carry
+	// its own copy of the bit table, with nothing keeping those in step with
+	// src/PeerCapabilities.h. A list because a peer claims any combination. An empty
+	// array is what nearly every peer produces: a peer that sent no capability tag and
+	// one that sent an all-zero word are the same state.
+	w.Key("protocol_extensions");
+	w.BeginArray();
+	{
+		CPeerCapabilities caps;
+		caps.SetFromWire(c.protocol_extensions);
+		for (const std::string &token : caps.GetApiTokens()) {
+			w.ValueString(token.c_str());
+		}
+	}
+	w.EndArray();
+	w.Key("friend_slot");
+	w.ValueBool(c.friend_slot);
+	// Friends-list membership, distinct from the `friend_slot` reserved upload slot
+	// above. The key drops the `is_` prefix per R4; the C++ member cannot, because
+	// `friend` is a keyword. The one place key and member deliberately differ.
+	w.Key("friend");
+	w.ValueBool(c.is_friend);
+	// The credit modifier the core applies, never re-derived from the totals: the desktop
+	// lists and GET /known_clients render this same number. null on a daemon that does not
+	// send it, which is not the same as a peer whose history earns exactly 1.
+	WriteDoubleOrNull(w, "credit_ratio", c.has_credit_ratio, c.credit_ratio);
+	// On the list because the desktop's per-file peer panels render Origin and "Shares
+	// File List" as columns. Anything added here must also reach the SSE payload --
+	// both ToJson AND Equal in EventDiff.cpp; a field in one but not the other never
+	// updates.
+	WriteStringOrNull(w, "source_origin", !c.source_origin.empty(), c.source_origin);
+	// Gated on the flag the refresher sets when the tag actually arrives: emitted
+	// unconditionally, a peer that never reported its part map was indistinguishable
+	// from one reporting zero, and zero is a real answer.
+	WriteIntOrNull(w,
+		"parts_offered_count",
+		c.has_parts_offered_count,
+		static_cast<int64_t>(c.parts_offered_count));
+	WriteStringOrNull(w, "client_mod_name", !c.client_mod_name.empty(), c.client_mod_name);
+	// Positive form, not a negated boolean: a negated flag forces
+	// `=== false` at every call site, and R4 wants the positive form.
+	w.Key("shared_files_browsable");
+	w.ValueBool(!c.view_shared_disabled);
+	// null, not omitted, when there is no linked download to be a fraction
+	// of. -1 is the in-process sentinel and never reaches the wire.
+	w.Key("part_progress_percent");
+	if (c.part_progress_percent >= 0.0)
+		w.ValueDouble(c.part_progress_percent);
+	else
+		w.ValueNull();
+}
+
+// List-level client object (GET /clients).
+void WriteClientObject(CJsonWriter &w, const webapi::ClientSnapshot &c)
+{
+	w.BeginObject();
+	WriteClientBaseFields(w, c);
+	w.EndObject();
+}
+
+// One EC_TAG_CLIENT entry of an EC_OP_CLIENT_HISTORY reply.
+//
+// Tag-absent means "the daemon has no such record", not "empty": a record written
+// before per-peer metadata existed carries only the hash, the totals and a
+// last-seen, and the fields below stay unset so the writer emits null. The numeric
+// codes go through the decoders the refresher uses for live peers
+// (ClientTagNames.h), so a consumer gets the same token from either endpoint.
+webapi::KnownClientSnapshot DecodeKnownClient(const CECTag &entry)
+{
+	webapi::KnownClientSnapshot c;
+	c.user_hash = std::string(entry.GetMD4Data().Encode().Lower().utf8_str());
+
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_UPLOAD_TOTAL))
+		c.uploaded_bytes_total = t->GetInt();
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_DOWNLOAD_TOTAL))
+		c.downloaded_bytes_total = t->GetInt();
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_SCORE_RATIO)) {
+		c.credit_ratio = t->GetDoubleData();
+		c.has_credit_ratio = true;
+	}
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_LAST_SEEN))
+		c.last_seen_at = static_cast<std::time_t>(t->GetInt());
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_FIRST_SEEN))
+		c.first_seen_at = static_cast<std::time_t>(t->GetInt());
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_SESSIONS))
+		c.session_count = static_cast<std::uint32_t>(t->GetInt());
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_NAME))
+		c.client_name = std::string(t->GetStringData().utf8_str());
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_USER_IP)) {
+		const std::uint32_t ip = static_cast<std::uint32_t>(t->GetInt());
+		if (ip != 0)
+			c.ip = std::string(Uint32toStringIP(ip).utf8_str());
+	}
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_USER_PORT))
+		c.port = static_cast<std::uint16_t>(t->GetInt());
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_KAD_PORT))
+		c.kad_port = static_cast<std::uint16_t>(t->GetInt());
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_COUNTRY))
+		c.country_code = std::string(t->GetStringData().Lower().utf8_str());
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_SOFTWARE))
+		c.software = webapi::ClientSoftwareName(static_cast<std::uint32_t>(t->GetInt()));
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_SOFT_VER_STR))
+		c.software_version = std::string(t->GetStringData().utf8_str());
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_FROM))
+		c.source_origin = webapi::SourceOriginName(static_cast<std::uint32_t>(t->GetInt()));
+	if (const CECTag *t = entry.GetTagByName(EC_TAG_CLIENT_OBFUSCATION_STATUS))
+		c.obfuscation_state = webapi::ClientObfuscationName(static_cast<std::uint8_t>(t->GetInt()));
+	return c;
+}
+
+// One credit-store record.
+//
+// Optional fields are null rather than omitted: a record written before the daemon
+// kept per-peer metadata genuinely has no name, address or software, and a consumer
+// should tell "not recorded" from "recorded as empty" without testing for the key.
+// Hash, totals and last_seen_at are always present.
+void WriteKnownClientObject(CJsonWriter &w, const webapi::KnownClientSnapshot &c)
+{
+	w.BeginObject();
+	w.Key("user_hash");
+	w.ValueString(wxString::FromUTF8(c.user_hash.c_str()));
+	// An unknown value is null; a key is omitted only where absence itself is the
+	// meaning, which is not the case for any of these. "The daemon did not report this
+	// peer's IP" is a value.
+	WriteStringOrNull(w, "name", !c.client_name.empty(), c.client_name);
+	const bool has_addr = !c.ip.empty();
+	WriteStringOrNull(w, "ip", has_addr, c.ip);
+	WriteIntOrNull(w, "port", has_addr, static_cast<int64_t>(c.port));
+	WriteIntOrNull(w, "kad_port", has_addr, static_cast<int64_t>(c.kad_port));
+	WriteStringOrNull(w, "country_code", !c.country_code.empty(), c.country_code);
+	const bool has_software = !c.software.empty();
+	WriteStringOrNull(w, "software", has_software, c.software);
+	WriteStringOrNull(w, "software_version", has_software, c.software_version);
+	WriteStringOrNull(w, "source_origin", !c.source_origin.empty(), c.source_origin);
+	WriteStringOrNull(w, "obfuscation_state", !c.obfuscation_state.empty(), c.obfuscation_state);
+	// Same quantity as the live /clients row, so the same key (R6).
+	w.Key("uploaded_bytes_total");
+	w.ValueUInt(static_cast<uint64_t>(c.uploaded_bytes_total));
+	w.Key("downloaded_bytes_total");
+	w.ValueUInt(static_cast<uint64_t>(c.downloaded_bytes_total));
+	// Same key and same source as the live row (R6). A record from a daemon predating the
+	// tag on this payload reads null rather than a number this side worked out.
+	WriteDoubleOrNull(w, "credit_ratio", c.has_credit_ratio, c.credit_ratio);
+	// Bare, not nulled like the two below, because 0 cannot reach here. nLastSeen
+	// predates the clients.met metadata trailer, so it lives in the fixed credit record
+	// every accepted file version carries, is stamped by GetCredit on both branches,
+	// and any record loading below the 150-day expiry is dropped. The metadata-derived
+	// fields have no such guarantee, which is what first_seen_at gates on.
+	w.Key("last_seen_at");
+	w.ValueUInt(static_cast<uint64_t>(c.last_seen_at));
+	const bool has_first_seen = c.first_seen_at != 0;
+	WriteUIntOrNull(w, "first_seen_at", has_first_seen, static_cast<uint64_t>(c.first_seen_at));
+	WriteUIntOrNull(w, "session_count", has_first_seen, static_cast<uint64_t>(c.session_count));
+	// Correlate with /clients by user_hash to reach the live peer. This is
+	// reachability, not presence in that list: the daemon holds a client object from
+	// the first contact ATTEMPT. null when the core predates EC_TAG_CLIENT_CONNECTED
+	// -- unknown, not offline.
+	//
+	// Same key as the live rows: the same bit reaching a persisted row by correlation
+	// should not meet a client under a second name on the far side of the join (R6).
+	WriteBoolOrNull(w, "connected", c.has_connected, c.connected);
+	w.EndObject();
+}
+
+// Single-client detail: the full list field set plus the detail-only ones, so
+// the list schema is unaffected.
+void WriteClientDetailObject(CJsonWriter &w, const webapi::ClientSnapshot &c)
+{
+	w.BeginObject();
+	WriteClientBaseFields(w, c);
+	w.Key("ed2k_user_id");
+	w.ValueUInt(static_cast<uint64_t>(c.ed2k_user_id));
+	w.Key("high_id");
+	w.ValueBool(c.high_id);
+	// Paired and nulled together, like ip/port/kad_port. server_ip is "" when unknown,
+	// and "" is not a value an address field can legitimately take, unlike the 0
+	// parts_offered_count uses as a real answer.
+	const bool has_server = !c.server_ip.empty();
+	WriteStringOrNull(w, "server_ip", has_server, c.server_ip);
+	WriteStringOrNull(w, "server_name", has_server, c.server_name);
+	WriteIntOrNull(w, "server_port", has_server, static_cast<int64_t>(c.server_port));
+	// Nulled on the same condition as ip/port: a client with no recorded address has no
+	// recorded Kad port either, and a raw 0 would spell absence differently from the
+	// fields it is paired with.
+	WriteIntOrNull(w, "kad_port", !c.ip.empty(), static_cast<int64_t>(c.kad_port));
+	w.EndObject();
+}
+
+// Base shared-file fields, emitted into an already-open object so the list and
+// detail writers share one definition.
+//
+// `detail` widens the `sources` group with the estimated range. A parameter rather
+// than a second block in the detail writer, because a JSON object has to be emitted
+// in one piece.
+void WriteSharedBaseFields(CJsonWriter &w, const webapi::FileSnapshot &f, bool detail = false)
+{
+	w.Key("hash");
+	w.ValueString(wxString::FromUTF8(f.hash.c_str()));
+	w.Key("name");
+	w.ValueString(wxString::FromUTF8(f.name.c_str()));
+	w.Key("ed2k_link");
+	w.ValueString(wxString::FromUTF8(f.ed2k_link.c_str()));
+	w.Key("size_bytes");
+	w.ValueInt(static_cast<int64_t>(f.size));
+	w.Key("priority");
+	w.ValueString(wxString::FromUTF8(f.shared.priority.c_str()));
+	w.Key("priority_auto");
+	w.ValueBool(f.shared.priority_auto);
+	// A stated exception to R11: this wraps a single quantity. The identical figure is
+	// `sources.complete` on a search result, so one access path works on every endpoint
+	// that has the concept.
+	w.Key("sources");
+	w.BeginObject();
+	w.Key("complete");
+	w.ValueInt(static_cast<int64_t>(f.shared.complete_sources));
+	if (detail) {
+		// The estimated range of that same count, so it belongs beside it rather
+		// than in a separate object.
+		w.Key("complete_min");
+		w.ValueInt(static_cast<int64_t>(f.shared.complete_sources_low));
+		w.Key("complete_max");
+		w.ValueInt(static_cast<int64_t>(f.shared.complete_sources_high));
+	}
+	w.EndObject();
+	// Flattened (R11): the window belongs in the key, not a wrapper.
+	w.Key("uploaded_bytes_session");
+	w.ValueInt(static_cast<int64_t>(f.shared.uploaded_bytes_session));
+	w.Key("uploaded_bytes_total");
+	w.ValueInt(static_cast<int64_t>(f.shared.uploaded_bytes_total));
+	w.Key("request_count_session");
+	w.ValueInt(static_cast<int64_t>(f.shared.request_count_session));
+	w.Key("request_count_total");
+	w.ValueInt(static_cast<int64_t>(f.shared.request_count_total));
+	// `accepted_request_count_*`, a noun, not the verb `accepts`.
+	w.Key("accepted_request_count_session");
+	w.ValueInt(static_cast<int64_t>(f.shared.accepted_request_count_session));
+	w.Key("accepted_request_count_total");
+	w.ValueInt(static_cast<int64_t>(f.shared.accepted_request_count_total));
+	// `upload_speed_bytes_per_second` and `uploading` refresh every tick; `last_upload`
+	// / `shared_since` are unix seconds, null when unknown -- never uploaded, or a
+	// known.met entry predating the field. They were 0, which reads as 1970 rather than
+	// "no idea".
+	w.Key("upload_speed_bytes_per_second");
+	w.ValueInt(static_cast<int64_t>(f.shared.upload_speed_bytes_per_second));
+	// Read as a boolean, held an integer.
+	w.Key("uploading_client_count");
+	w.ValueInt(static_cast<int64_t>(f.shared.uploading_client_count));
+	WriteIntOrNull(w,
+		"last_upload_at",
+		f.shared.last_upload != 0,
+		static_cast<std::int64_t>(f.shared.last_upload));
+	WriteIntOrNull(w,
+		"shared_since_at",
+		f.shared.shared_since != 0,
+		static_cast<std::int64_t>(f.shared.shared_since));
+	// Parts hashed so far by a Verify Local Data or an AICH rebuild; 0 when idle.
+	// Through the accessor so a shared download, which amuled reports as a partfile,
+	// still reads correctly.
+	w.Key("hashed_part_count");
+	w.ValueInt(static_cast<int64_t>(webapi::SharedHashingProgress(f)));
+}
+
+void WriteSharedObject(CJsonWriter &w, const webapi::FileSnapshot &f)
+{
+	w.BeginObject();
+	WriteSharedBaseFields(w, f);
+	// Media rides the list item because the shared_added / shared_updated payload is
+	// documented to match this object byte-for-byte, which is what lets a subscriber
+	// skip the re-GET. The event has to carry media -- a re-extraction is otherwise
+	// invisible, since the refresh endpoints answer 202 with no result -- so the list
+	// carries it too.
+	WriteMediaIfPresent(w, f);
+	w.EndObject();
+}
+
+// Every list field plus the shared-table gaps and shared-applicable identity.
+void WriteSharedDetailObject(CJsonWriter &w, const webapi::FileSnapshot &f)
+{
+	w.BeginObject();
+	WriteSharedBaseFields(w, f, /*detail=*/true);
+	w.Key("file_type");
+	w.ValueString(wxString::FromUTF8(webapi::FileTypeToken(f.name).c_str()));
+	w.Key("upload_ratio");
+	w.ValueDouble(
+		f.size > 0 ? static_cast<double>(f.shared.uploaded_bytes_total) / static_cast<double>(f.size)
+			   : 0.0);
+	w.Key("directory");
+	// The on-disk directory (Temp while downloading, destination once completed), the
+	// same value /downloads/{hash} reports. Reported directly rather than masked with a
+	// placeholder while incomplete; `incomplete` below carries that state explicitly.
+	w.ValueString(wxString::FromUTF8(f.on_disk_dir.c_str()));
+	w.Key("incomplete");
+	// Always present, so clients test it rather than probe for absence.
+	// Detail-only, like `path`, so the SSE event rate is unaffected.
+	w.ValueBool(f.IsIncompletePartfile());
+	WriteStringOrNull(w, "aich_hash", !f.aich_hash.empty(), f.aich_hash);
+	w.Key("total_part_count");
+	w.ValueInt(static_cast<int64_t>(webapi::PartCountForSize(f.size)));
+	WriteSharedAvailabilityParts(w, f);
+	w.Key("upload_queue_count");
+	w.ValueInt(static_cast<int64_t>(f.queued_count));
+	w.Key("my_comment");
+	w.ValueString(wxString::FromUTF8(f.comment.c_str()));
+	w.Key("my_rating");
+	w.ValueInt(static_cast<int64_t>(f.rating));
+	WriteMediaIfPresent(w, f);
+	w.EndObject();
+}
+
+// Server-side window shared by every list endpoint: `limit` (default 100),
+// `offset`, `sort`, `order` (asc|desc) and `after` (keyset anchor). `total`,
+// `offset` and `limit` are always emitted so a paging consumer can size its
+// requests.
+//
+// `limit` DEFAULTS rather than meaning "everything when omitted", so the rule is
+// monotonic and bounds the naive caller as well as the explicit one.
+struct ListParams
+{
+	static const std::size_t kDefaultLimit = 100;
+	std::size_t limit = kDefaultLimit;
+	std::size_t offset = 0;
+	std::string sort;  // empty = unsorted (native snapshot order)
+	std::string after; // empty = no keyset anchor; needs an identity `sort`
+	bool desc = false;
+};
+
+// One sortable column of a list endpoint.
+//
+// `less` is the ascending comparator. `after_less` is what makes the column usable
+// as a KEYSET anchor: given the raw `?after=` token and a row, is the token ordered
+// before it. Only an IDENTITY column provides one -- anchoring on a mutable column
+// is meaningless, because the anchor's own value moves between two page requests
+// and the window silently skips or repeats rows.
+//
+// Keyset rather than `offset` because an offset is a position, and a position
+// shifts whenever the set changes size BELOW the cursor: delete one row from an
+// already-fetched page and the next request starts one row late, so that row is
+// never fetched by anything, and no SSE event mentions it either.
+template <class T> struct ListSortColumn
+{
+	const char *name;
+	std::function<bool(const T &, const T &)> less;
+	std::function<bool(const std::string &, const T &)> after_less; // null == not anchorable
+};
+
+// Endpoint-specific sortable fields, in definition order. A vector, not a map,
+// so an unknown `sort` value is simply a lookup miss and a 400.
+template <class T> using ListComparators = std::vector<ListSortColumn<T>>;
+
+// One member (possibly nested: SORT_BY(download.percent)) ascending. The column
+// tables are long enough that a five-line lambda per column hid what they sort on.
+#define SORT_BY(field) (const auto &a, const auto &b) { return a.field < b.field; }
+
+// The anchor half, for an identity column. Same member the column sorts on --
+// they have to agree, or `after` would seek into a differently-ordered set.
+#define ANCHOR_ON(field) (const std::string &tok, const auto &r) { return tok < r.field; }
+
+// Numeric identity (an ECID). The token is parsed once per upper_bound probe, so
+// the seek is O(log n) rather than per row. A non-numeric token sorts before
+// everything, so a malformed `after` yields the first page rather than an error.
+#define ANCHOR_ON_NUM(field) \
+	(const std::string &tok, const auto &r) { \
+		char *end = nullptr; \
+		const unsigned long long v = std::strtoull(tok.c_str(), &end, 10); \
+		return (end == tok.c_str()) ? true : v < static_cast<unsigned long long>(r.field); \
+	}
+
+// One row of GET /search. The listing is built from a live EC response rather than
+// a snapshot vector, so it needs a materialised row before it can go through the
+// same envelope every other collection uses. Absent values stay absent rather than
+// becoming 0: `started_at` is unknowable for a search this process did not start,
+// and `result_count` is unreported by an older daemon, which has to stay
+// distinguishable from "found nothing".
+struct SearchListRow
+{
+	std::uint32_t search_id = 0;
+	wxString query;
+	std::string kind;
+	std::string state;
+	bool has_client_ecid = false;
+	std::uint32_t client_ecid = 0;
+	std::time_t started_at = 0; // 0 = not started by this process
+	bool has_result_count = false;
+	std::uint32_t result_count = 0;
+};
+
+void WriteSearchListRow(CJsonWriter &w, const SearchListRow &row)
+{
+	w.BeginObject();
+	// `search_id`, the same key the SSE payloads and the results envelope use, so
+	// a client never reads a search's id under two names.
+	w.Key("search_id");
+	w.ValueInt(static_cast<int64_t>(row.search_id));
+	w.Key("query");
+	w.ValueString(row.query);
+	w.Key("type");
+	w.ValueString(wxString::FromUTF8(row.kind.c_str()));
+	w.Key("state");
+	w.ValueString(wxString::FromUTF8(row.state.c_str()));
+	WriteIntOrNull(w, "client_ecid", row.has_client_ecid, static_cast<int64_t>(row.client_ecid));
+	if (row.started_at != 0) {
+		w.Key("started_at");
+		w.ValueInt(static_cast<int64_t>(row.started_at));
+	}
+	if (row.has_result_count) {
+		w.Key("result_count");
+		w.ValueInt(static_cast<int64_t>(row.result_count));
+	}
+	w.EndObject();
+}
+
+// The daemon hands searches back id-ascending, and id order is not recency:
+// Kad ids carry SEARCH_ID_KAD_MASK and always sort above ed2k ones.
+const ListComparators<SearchListRow> &SearchListComparators()
+{
+	static const ListComparators<SearchListRow> kComps = {
+		{ "search_id", SORT_BY(search_id), ANCHOR_ON_NUM(search_id) },
+		{ "query", SORT_BY(query) },
+		{ "started_at", SORT_BY(started_at) },
+		{ "result_count", SORT_BY(result_count) },
+	};
+	return kComps;
+}
+
+// /categories parses ?limit/&offset/&sort/&order too, so that query string behaves
+// the same here as on the other list endpoints rather than being a silent no-op.
+const ListComparators<webapi::CategorySnapshot> &CategoryComparators()
+{
+	static const ListComparators<webapi::CategorySnapshot> kComps = {
+		{ "index", SORT_BY(index), ANCHOR_ON_NUM(index) },
+		{ "name", SORT_BY(name) },
+	};
+	return kComps;
+}
+
+// Sort keys for peer rows, shared by /clients and the per-file client routes,
+// which derive theirs from this set: a key added here reaches every peer list.
+const ListComparators<webapi::ClientSnapshot> &ClientComparators()
+{
+	static const ListComparators<webapi::ClientSnapshot> kComps = {
+		// Identity column: immutable, so it is the one a keyset sweep can anchor
+		// on. Listed first because that is the order a paging client cares about.
+		{ "ecid", SORT_BY(ecid), ANCHOR_ON_NUM(ecid) },
+		{ "name", SORT_BY(client_name) },
+		{ "software", SORT_BY(software) },
+		// R7: each value is spelled exactly like the response key it orders by, and only
+		// keys this row emits. /known_clients can also sort by session_count and
+		// last_seen_at, which are not on a live peer.
+		{ "uploaded_bytes_total", SORT_BY(uploaded_bytes_total) },
+		{ "downloaded_bytes_total", SORT_BY(downloaded_bytes_total) },
+		{ "upload_speed_bytes_per_second", SORT_BY(upload_speed_bytes_per_second) },
+		{ "download_speed_bytes_per_second", SORT_BY(download_speed_bytes_per_second) },
+	};
+	return kComps;
+}
+
+std::unique_ptr<CHttpServer::Response> BadRequestPtr(const char *message)
+{
+	return std::make_unique<CHttpServer::Response>(ErrorResponse(400, "bad_request", message));
+}
+
+// Optional unsigned query parameter, with an inclusive upper bound.
+//
+// One parser for every count on the surface: the seven written by hand disagreed
+// about what an unparseable value does and what an out-of-range one does, so the
+// same typo was a hard error on `interval` and a silent behaviour change on `width`.
+//
+// Absent leaves `out` untouched, so the caller's default stands. `min` and `max`
+// are inclusive, and the running value is bounded inside the loop so a long digit
+// string cannot wrap before the range check sees it.
+std::unique_ptr<CHttpServer::Response> ParseUintParam(const std::map<std::string, std::string> &qmap,
+	const char *name,
+	std::uint64_t min,
+	std::uint64_t max,
+	std::uint64_t &out)
+{
+	const auto it = qmap.find(name);
+	if (it == qmap.end())
+		return nullptr;
+	if (!web_api_path::ParseBoundedUint(it->second, min, max, out)) {
+		const std::string msg = std::string("`") + name + "` must be an integer between " +
+					std::to_string(min) + " and " + std::to_string(max);
+		return BadRequestPtr(msg.c_str());
+	}
+	return nullptr;
+}
+
+// Optional boolean query parameter: 1/0, true/false, yes/no, and 400 on anything
+// else. One vocabulary for the whole surface, so a typo in a boolean query
+// param is a 400 everywhere rather than silently false on one endpoint and
+// fatal on the next.
+std::unique_ptr<CHttpServer::Response> ParseBoolParam(
+	const std::map<std::string, std::string> &qmap, const char *name, bool &out)
+{
+	const auto it = qmap.find(name);
+	if (it == qmap.end())
+		return nullptr;
+	if (!web_api_path::ParseBoolValue(it->second, out)) {
+		const std::string msg = std::string("`") + name + "` must be 1/0, true/false or yes/no";
+		return BadRequestPtr(msg.c_str());
+	}
+	return nullptr;
+}
+
+// Parse ?limit/&offset/&sort/&order from a raw query string. A non-numeric or
+// out-of-range `limit`/`offset`, and a bad `order`, are 400s. `sort` is validated
+// later against the endpoint's comparator table (BuildListWindow).
+std::unique_ptr<CHttpServer::Response> ParseListParams(const std::string &query, ListParams &out)
+{
+	const auto qmap = web_api_path::ParseQuery(query);
+	// 1e9 on both, past any collection that can exist, so it reads as "no upper bound"
+	// while still rejecting a fat-fingered limit.
+	//
+	// Not SIZE_MAX: `offset + limit` has to stay inside a 32-bit size_t for the 32-bit
+	// builds, and 1e9 + 1e9 is the largest round pair that does. It is also inside JS's
+	// exact-integer range, so a browser can send the ceiling and get back what it sent.
+	if (qmap.count("limit")) {
+		std::uint64_t v = 0;
+		if (auto r = ParseUintParam(qmap, "limit", 0, 1000000000ull, v))
+			return r;
+		out.limit = static_cast<std::size_t>(v);
+	}
+	{
+		std::uint64_t v = 0;
+		if (auto r = ParseUintParam(qmap, "offset", 0, 1000000000ull, v))
+			return r;
+		out.offset = static_cast<std::size_t>(v);
+	}
+	const auto order_it = qmap.find("order");
+	if (order_it != qmap.end()) {
+		if (order_it->second == "asc")
+			out.desc = false;
+		else if (order_it->second == "desc")
+			out.desc = true;
+		else
+			return BadRequestPtr("`order` must be \"asc\" or \"desc\"");
+	}
+	const auto sort_it = qmap.find("sort");
+	if (sort_it != qmap.end())
+		out.sort = sort_it->second;
+	const auto after_it = qmap.find("after");
+	if (after_it != qmap.end())
+		out.after = after_it->second;
+	return nullptr;
+}
+
+// Stable-sort the full set then slice to the window. `out_window` is filled with
+// pointers into `items` (no copies), `out_total` with the pre-slice count. 400 when
+// `params.sort` is set but absent from `comparators`.
+template <class T>
+std::unique_ptr<CHttpServer::Response> BuildListWindowFromPtrs(std::vector<const T *> &ptrs,
+	const ListParams &params,
+	const ListComparators<T> &comparators,
+	std::vector<const T *> &out_window,
+	std::size_t &out_total)
+{
+	out_total = ptrs.size();
+
+	const ListSortColumn<T> *col = nullptr;
+	if (!params.sort.empty()) {
+		auto c = std::find_if(comparators.begin(), comparators.end(), &(const auto &p) {
+			return params.sort == p.name;
+		});
+		if (c == comparators.end())
+			return BadRequestPtr("unknown `sort` field for this endpoint");
+		col = &*c;
+		const auto &cmp = col->less;
+		std::stable_sort(ptrs.begin(), ptrs.end(), &(const T *a, const T *b) {
+			return params.desc ? cmp(*b, *a) : cmp(*a, *b);
+		});
+	}
+
+	// Keyset seek, anchored on a value, so nothing that happened to the rows before it
+	// can move the window.
+	//
+	// Rejected rather than ignored on a column that cannot anchor: falling back to the
+	// whole set would hand a paging client the first page forever, which reads as "the
+	// collection never grows" rather than as a fixable error.
+	std::size_t seek = 0;
+	if (!params.after.empty()) {
+		if (!col || !col->after_less)
+			return BadRequestPtr("`after` needs a `sort` field that identifies a row");
+		if (params.desc)
+			return BadRequestPtr("`after` is ascending-only; drop `order=desc`");
+		const auto it = std::upper_bound(
+			ptrs.begin(), ptrs.end(), params.after, &(const std::string &tok, const T *r) {
+				return col->after_less(tok, *r);
+			});
+		seek = static_cast<std::size_t>(it - ptrs.begin());
+	}
+
+	// `offset` counts from the seek, so `after` alone pages a collection and
+	// the two compose for a caller that wants both.
+	const std::size_t begin = std::min(seek + std::min(params.offset, out_total - seek), out_total);
+	// Clamp the COUNT before adding it, never the sum. `begin + limit` first overflows
+	// a 32-bit size_t on the ceilings this API accepts, and an inverted iterator range
+	// is undefined behaviour rather than a big page.
+	const std::size_t end = begin + std::min(params.limit, out_total - begin);
+	out_window.assign(ptrs.begin() + begin, ptrs.begin() + end);
+	return nullptr;
+}
+
+// Sort and window a list the caller owns as values. An endpoint whose records are
+// not all in one contiguous vector -- /known_clients serves most rows out of a
+// shared cache and materialises only the few it patches -- uses the pointer form
+// above instead of copying the whole set.
+template <class T>
+std::unique_ptr<CHttpServer::Response> BuildListWindow(const std::vector<T> &items,
+	const ListParams &params,
+	const ListComparators<T> &comparators,
+	std::vector<const T *> &out_window,
+	std::size_t &out_total)
+{
+	std::vector<const T *> ptrs;
+	ptrs.reserve(items.size());
+	for (const auto &it : items)
+		ptrs.push_back(&it);
+	return BuildListWindowFromPtrs(ptrs, params, comparators, out_window, out_total);
+}
+
+// Emit the `total` / `offset` / `limit` pagination metadata.
+//
+// `limit` echoes the page size the caller asked for -- a value a caller can store
+// and re-send, unlike the row count, which is not a page size and could not be
+// used as one: storing the row count would pin the window to the first response,
+// and re-sending it would be a 400 once the list outgrew the cap.
+void WritePageMeta(CJsonWriter &w, std::size_t total, const ListParams &params)
+{
+	w.Key("total");
+	w.ValueUInt(total);
+	w.Key("offset");
+	w.ValueUInt(params.offset);
+	// Never null now: every response has a real page size, so round-tripping
+	// {total, offset, limit} straight back into the next request works.
+	w.Key("limit");
+	w.ValueUInt(params.limit);
+}
+
+// Extract the raw query string from a request target ("/x?a=1" -> "a=1").
+std::string QueryOf(const CHttpServer::Request &req)
+{
+	std::string path, query;
+	SplitPathAndQuery(req.target, path, query);
+	return query;
+}
+
+// Envelope for every list endpoint: the list under its named key plus the
+// pagination metadata, with ec_unavailable + 503 handled here so no handler repeats
+// it. Records are addressed as pointers, so an endpoint whose rows are not all in
+// one vector need not build one.
+//
+// State-free: takes no lock of its own, so a caller already holding CState's read
+// lock can build a response inside it. m_mu is NOT recursive -- a second
+// shared_lock taken while a writer is queued deadlocks.
+template <class T, class WriterFn>
+CHttpServer::Response ListResponseFromPtrsUnlocked(const char *plural_key,
+	std::vector<const T *> &ptrs,
+	WriterFn write_item,
+	const ListParams &params,
+	const ListComparators<T> &comparators)
+{
+	std::vector<const T *> window;
+	std::size_t total = 0;
+	if (auto err = BuildListWindowFromPtrs(ptrs, params, comparators, window, total))
+		return *err;
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key(plural_key);
+	w.BeginArray();
+	for (const T *item : window)
+		write_item(w, *item);
+	w.EndArray();
+	WritePageMeta(w, total, params);
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+template <class T, class WriterFn>
+CHttpServer::Response ListResponse(const webapi::CState &state,
+	const char *plural_key,
+	const std::vector<T> &items,
+	WriterFn write_item,
+	const ListParams &params = ListParams(),
+	const ListComparators<T> &comparators = ListComparators<T>())
+{
+	if (auto r = RequireSnapshot(state))
+		return *r;
+	std::vector<const T *> window;
+	std::size_t total = 0;
+	if (auto err = BuildListWindow(items, params, comparators, window, total))
+		return *err;
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	// No snapshot_at_* in the envelope: it churned the body bytes every refresher
+	// tick and defeated the ETag cache. The ETag is the validator now.
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key(plural_key);
+	w.BeginArray();
+	for (const T *item : window)
+		write_item(w, *item);
+	w.EndArray();
+	WritePageMeta(w, total, params);
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+} // namespace
+
+// Mutation helpers. Every mutation handler follows:
+//  1. AuthenticateRequest (bearer or cookie)
+//  2. RequireAdmin
+//  3. parse the JSON body
+//  4. SendRecvSerialized the EC packet
+//  5. EC_OP_NOOP is success; EC_OP_FAILED carries amuled's rejection
+//  6. run RefresherTick inline so the response sees post-mutation state
+//  7. return the updated resource, or 201 / 204 per HTTP convention
+
+namespace
+{
+
+// JSON body parser: true on success, false + `err` otherwise. Non-object roots are
+// rejected. The depth cap runs before the parse, so a deeply nested body cannot
+// exhaust the handler thread's stack inside picojson's recursive descent. The
+// scanner lives in JsonDepthScan.h, which keeps it reachable from its test.
+bool ParseJsonObjectBody(const std::string &body, picojson::value &out, std::string &err)
+{
+	if (!webapi::JsonNestingWithinLimit(body)) {
+		err = "JSON nesting too deep";
+		return false;
+	}
+	const std::string parse_err = picojson::parse(out, body);
+	if (!parse_err.empty()) {
+		err = "malformed JSON: " + parse_err;
+		return false;
+	}
+	if (!out.is<picojson::object>()) {
+		err = "request body must be a JSON object";
+		return false;
+	}
+	return true;
+}
+
+// Relay the EC_OP_FAILED reply shape: amuled carries the rejection message in
+// EC_TAG_STRING children, and the first is passed to the client. True means the
+// caller short-circuits.
+bool IsEcFailedResponse(const CECPacket *resp, std::string &out_msg)
+{
+	if (!resp)
+		return false;
+	if (resp->GetOpCode() != EC_OP_FAILED)
+		return false;
+	out_msg = "amuled rejected the operation";
+	for (CECPacket::const_iterator it = resp->begin(); it != resp->end(); ++it) {
+		const CECTag *t = &*it;
+		if (t->GetTagName() == EC_TAG_STRING) {
+			out_msg = std::string(t->GetStringData().utf8_str());
+			break;
+		}
+	}
+	return true;
+}
+
+// The two category ops answer EC_OP_FAILED for a PARTIAL SUCCESS, not a failure:
+// amuled created or updated the category, found it could not use the path, kept
+// another one -- the incoming directory for a create, the previous path for an
+// update -- and returns that in EC_TAG_CATEGORY_PATH beside the index. An update
+// keeps name, comment, colour and priority; only the path is refused.
+//
+// Relaying it as a 400 would say the request failed while the category exists, and
+// discard the one field that says what happened. A reply carrying no such tag is a
+// genuine failure.
+bool EcCategoryPathKept(const CECPacket *resp, std::string &kept_path)
+{
+	if (!resp || resp->GetOpCode() != EC_OP_FAILED)
+		return false;
+	const CECTag *t = resp->GetTagByName(EC_TAG_CATEGORY_PATH);
+	if (!t)
+		return false;
+	kept_path = std::string(t->GetStringData().utf8_str());
+	return true;
+}
+
+// Map our wire-string priorities back to amule's PR_* encoding, the inverse of
+// PriorityName in Refresher.cpp. PR_AUTO=5 is the magic value stored as High plus
+// the auto flag. The one place the file-priority vocabulary is declared.
+//
+// /downloads, /shared and /categories share the PR_* code space and differ only in
+// which names they accept, deliberately. The .part.met loader clamps anything but
+// PR_LOW/PR_NORMAL/PR_HIGH back to Normal on restart, so very_low and release are
+// upload-side levels and are refused on the download path. Categories apply their
+// priority to member files as a download priority (CDownloadQueue::SetCatPrio), so
+// they inherit that set.
+//
+// Servers are deliberately NOT here: SRV_PR_* is a different code space in which
+// the same word means a different number -- `low` is 0 for a file and 2 for a
+// server -- so one table would lie about half its rows.
+enum PriorityDomain : unsigned
+{
+	kPrioDownload = 1u << 0,
+	kPrioShared = 1u << 1,
+	kPrioCategory = 1u << 2,
+};
+
+struct FilePriorityLevel
+{
+	const char *name;
+	std::uint8_t code;
+	unsigned domains;
+};
+
+const FilePriorityLevel kFilePriorities = {
+	// R9: a writable field accepts the values the same field returns. A category's
+	// `priority` is rendered by PriorityName(), which can answer very_low and release,
+	// so the write side must admit them. The download domain stays narrow because its
+	// read side cannot produce them.
+	{ "very_low", PR_VERY_LOW, kPrioShared | kPrioCategory },
+	{ "low", PR_LOW, kPrioDownload | kPrioShared | kPrioCategory },
+	{ "normal", PR_NORMAL, kPrioDownload | kPrioShared | kPrioCategory },
+	{ "high", PR_HIGH, kPrioDownload | kPrioShared | kPrioCategory },
+	{ "release", PR_VERYHIGH, kPrioShared | kPrioCategory },
+	{ "auto", PR_AUTO, kPrioDownload | kPrioShared | kPrioCategory },
+};
+
+bool FilePriorityToCode(const std::string &name, unsigned domain, std::uint8_t &out)
+{
+	for (const FilePriorityLevel &level : kFilePriorities) {
+		if ((level.domains & domain) != 0 && name == level.name) {
+			out = level.code;
+			return true;
+		}
+	}
+	return false;
+}
+
+// The rejection names exactly what this domain accepts, built from the table: five
+// sites had their own copy, so a new level would have been announced in some and
+// not others.
+std::string FilePriorityAccepted(unsigned domain)
+{
+	std::string out;
+	for (const FilePriorityLevel &level : kFilePriorities) {
+		if ((level.domains & domain) == 0)
+			continue;
+		if (!out.empty())
+			out += ", ";
+		out += level.name;
+	}
+	return "`priority` must be one of " + out;
+}
+
+// /servers_update, /kad/update and /ipfilter/update are the same operation over
+// three lists: take one http(s) URL, hand it to amuled in a single string tag, echo
+// the effective URL back with a 202. amuled persists the URL into the matching
+// preference itself, so none of them also PATCHes it here.
+struct UrlFetchSpec
+{
+	// JSON body field carrying the URL, and the key echoed in the reply.
+	const char *field;
+	ec_opcode_t op;
+	// Tag the URL travels in. EC_OP_IPFILTER_UPDATE reads the packet's first tag
+	// whatever it is named, so that one uses EC_TAG_STRING to match what amulegui has
+	// always sent.
+	ec_tagname_t tag;
+	// false: an absent field falls back to the configured URL the caller
+	// passes in, instead of being a 400.
+	bool url_required;
+	// Run an inline RefresherTick so the caches, and the SSE diff built from them,
+	// pick up whatever already landed.
+	bool refresh_after;
+};
+
+// Pull the URL out of the body per `spec`, falling back to `configured` when the
+// body omits it and the spec allows it.
+//
+// `configured` is null when there is no fallback: always for a url_required spec,
+// and for the others while amuleapi has no preferences snapshot yet. A request
+// needing the fallback then gets a 503 rather than a 400 blaming a URL that simply
+// has not been read yet.
+bool ResolveFetchUrl(const CHttpServer::Request &req,
+	const UrlFetchSpec &spec,
+	const std::string *configured,
+	std::string &out_url,
+	CHttpServer::Response &rejection)
+{
+	const std::string field = std::string("`") + spec.field + "`";
+	bool present = false;
+	// An optional-URL endpoint accepts no body at all; a required-URL one
+	// needs the object, so let ParseJsonObjectBody produce the error.
+	if (spec.url_required || !req.body.empty()) {
+		picojson::value root;
+		std::string parse_err;
+		if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+			rejection = ErrorResponse(400, "bad_request", parse_err.c_str());
+			return false;
+		}
+		const auto &obj = root.get<picojson::object>();
+		const auto it = obj.find(spec.field);
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>()) {
+				rejection = ErrorResponse(
+					400, "bad_request", (field + " must be a string").c_str());
+				return false;
+			}
+			out_url = it->second.get<std::string>();
+			present = true;
+		}
+	}
+	if (!present) {
+		if (spec.url_required) {
+			rejection = ErrorResponse(400,
+				"bad_request",
+				("required string field " + field + " is missing").c_str());
+			return false;
+		}
+		if (configured == nullptr) {
+			rejection = ErrorResponse(
+				503, "ec_unavailable", "amuleapi has not received its first EC snapshot yet");
+			return false;
+		}
+		out_url = *configured;
+		if (out_url.empty()) {
+			rejection = ErrorResponse(400,
+				"bad_request",
+				(field + " was omitted and no URL is configured").c_str());
+			return false;
+		}
+		// A configured URL predates this request, arriving over PATCH /preferences
+		// or amuled's config, so it is not re-validated here.
+		return true;
+	}
+	if (out_url.empty()) {
+		rejection = ErrorResponse(400, "bad_request", (field + " must not be empty").c_str());
+		return false;
+	}
+	// amuled hands the string straight to the HTTP downloader, so a bad scheme would
+	// fail asynchronously with nowhere to report it. Rejecting here also beats the EC
+	// "amuled rejected" wrapper for clarity.
+	if (out_url.compare(0, 7, "http://") != 0 && out_url.compare(0, 8, "https://") != 0) {
+		rejection = ErrorResponse(
+			400, "bad_request", (field + " must be an http:// or https:// URL").c_str());
+		return false;
+	}
+	return true;
+}
+
+// Send the EC op for one resolved URL and build the 202 echo.
+CHttpServer::Response UrlFetchOp(
+	CamuleapiApp &app, webapi::CState &state, const UrlFetchSpec &spec, const std::string &url)
+{
+	auto ec_req = std::make_unique<CECPacket>(spec.op);
+	ec_req->AddTag(CECTag(spec.tag, wxString::FromUTF8(url.c_str())));
+	const CECPacket *ec_resp = app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed");
+	}
+	std::string ec_err;
+	if (IsEcFailedResponse(ec_resp, ec_err)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err.c_str());
+	}
+	delete ec_resp;
+
+	if (spec.refresh_after) {
+		(void)RefresherTick(app, state);
+	}
+
+	CHttpServer::Response r;
+	// 202 with no body: the URL echoed back came from the request, and the
+	// download runs asynchronously -- its outcome arrives on the log channel.
+	r.status = 202;
+	r.content_type.clear();
+	return r;
+}
+
+// JSON has one number type and picojson hands every one over as a double, so a
+// field documented as an integer must say so: without this, `{"min_size_bytes":
+// 2.9}` is accepted and silently truncated. One helper rather than a cast per site,
+// because `v != (double)(int)v` cannot judge a byte count above INT_MAX, which is
+// the range these fields live in.
+inline bool IsIntegralJsonNumber(double v)
+{
+	return std::isfinite(v) && v == std::floor(v);
+}
+
+// MD4 hex to CMD4Hash; false unless 32 hex chars. Either case is tolerated --
+// the route already lowercases what comes off the URL.
+bool HashFromHex(const std::string &hex, CMD4Hash &out)
+{
+	if (hex.size() != 32)
+		return false;
+	return out.Decode(wxString::FromAscii(hex.c_str()));
+}
+
+// The {hash} twin of RequireEcidPath: a path hash that is not 32 hex characters is
+// a malformed request, not a missing file. The find-based routes used to skip the
+// check and fall through to their own 404, so a client could not tell "not a hash"
+// from "valid hash, no such file" -- and the split ran through a single route,
+// whose GET answered 404 where its own POST answered 400.
+std::unique_ptr<CHttpServer::Response> RequireHashPath(const std::string &hash)
+{
+	CMD4Hash parsed;
+	if (!HashFromHex(hash, parsed)) {
+		return BadRequestPtr("path `{hash}` must be 32 hex characters");
+	}
+	return nullptr;
+}
+
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandleDownloads(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	// `?status=` selects which part of the queue to list: amuled holds finished
+	// downloads in m_completedDownloads as a separate "awaiting clear" list, so "what
+	// is transferring" and "what finished" are different row sets.
+	//
+	// `?status=` is a three-state axis, not a boolean like `?include_completed=`, so a
+	// Finished view can ask for completed-only. `status` is the key the download object
+	// already reports, so filter and field agree.
+	//
+	// GET /downloads/{hash} is unaffected: the caller named the file.
+	enum class DownloadsFilter
+	{
+		Active,
+		All,
+		Completed,
+	};
+	DownloadsFilter filter = DownloadsFilter::Active;
+	{
+		std::string query;
+		const std::size_t q = req.target.find('?');
+		if (q != std::string::npos)
+			query = req.target.substr(q + 1);
+		const auto qmap = web_api_path::ParseQuery(query);
+		if (qmap.count("include_completed")) {
+			return ErrorResponse(400,
+				"bad_request",
+				"`include_completed` is not accepted; use "
+				"`status=active|all|completed`");
+		}
+		const auto it = qmap.find("status");
+		if (it != qmap.end()) {
+			if (it->second == "active") {
+				filter = DownloadsFilter::Active;
+			} else if (it->second == "all") {
+				filter = DownloadsFilter::All;
+			} else if (it->second == "completed") {
+				filter = DownloadsFilter::Completed;
+			} else {
+				return ErrorResponse(
+					400, "bad_request", "`status` must be one of active, all, completed");
+			}
+		}
+	}
+
+	ListParams params;
+	if (auto err = ParseListParams(QueryOf(req), params))
+		return *err;
+	static const ListComparators<webapi::FileSnapshot> kComps = {
+		// Identity column: immutable, so it is what a keyset sweep anchors on.
+		// Listed first because that is the order a paging client cares about.
+		{ "hash", SORT_BY(hash), ANCHOR_ON(hash) },
+		{ "name", SORT_BY(name) },
+		// R7: each value is spelled exactly like the response key it orders by,
+		// dotted for a nested one, so a field rename cannot orphan a sort value.
+		{ "size_bytes", SORT_BY(size) },
+		{ "progress.percent", SORT_BY(download.percent) },
+		{ "speed_bytes_per_second", SORT_BY(download.speed_bytes_per_second) },
+		{ "status", SORT_BY(download.status) },
+	};
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+	// Pointers into the live map rather than copies; see HandleSharedList.
+	CHttpServer::Response resp;
+	// Named captures; see HandleSharedList.
+	m_state.WithFiles(&resp, &params, filter(const webapi::FileMap &files) {
+		std::vector<const webapi::FileSnapshot *> ptrs;
+		ptrs.reserve(files.size());
+		for (const auto &entry : files) {
+			const webapi::FileSnapshot &d = entry.second;
+			if (!d.is_downloading)
+				continue;
+			const bool done = d.download.status == "completed";
+			if (filter == DownloadsFilter::Active && done)
+				continue;
+			if (filter == DownloadsFilter::Completed && !done)
+				continue;
+			ptrs.push_back(&d);
+		}
+		resp = ListResponseFromPtrsUnlocked(
+			"downloads",
+			ptrs,
+			(CJsonWriter &w, const webapi::FileSnapshot &d) {
+				// List mode omits `progress.parts`; the detail endpoint is where
+				// parts ship.
+				WriteDownloadObject(w, d, /*include_parts=*/false);
+			},
+			params,
+			kComps);
+	});
+	return resp;
+}
+
+namespace
+{
+// One peer row of a per-file client list: the ordinary /clients object plus the
+// three things that only make sense relative to a file.
+struct FileClientRow
+{
+	webapi::ClientSnapshot client;
+	std::string role; // "downloading_from" | "uploading_to" | "both" | "none"
+	bool a4af = false;
+	std::vector<bool> parts;
+	bool has_parts = false;
+	// Whether each index actually addresses a chunk of THIS file that this row also
+	// carries a bitmap for. Resolved in the handler, the only place that knows
+	// part_count; false means the key goes out as null.
+	bool next_requested_part_known = false;
+	bool last_downloading_part_known = false;
+};
+
+// Sort keys, derived from the /clients set rather than restated, so the two
+// surfaces cannot drift apart.
+const ListComparators<FileClientRow> &FileClientComparators()
+{
+	static const ListComparators<FileClientRow> kComps =  {
+		// Both halves are lifted, not just the comparator: a column that can anchor a
+		// keyset page on /clients must anchor one here too, or the two surfaces drift and
+		// it shows up only as a paging client silently missing rows.
+		ListComparators<FileClientRow> out;
+		for (const auto &col : ClientComparators()) {
+			auto less = col.less;
+			auto after = col.after_less;
+			out.push_back({ col.name,
+				less(const FileClientRow &a, const FileClientRow &b) {
+					return less(a.client, b.client);
+				},
+				after ? std::function<bool(const std::string &, const FileClientRow &)>(
+						after(const std::string &tok, const FileClientRow &r) {
+							return after(tok, r.client);
+						})
+				      : nullptr });
+		}
+		return out;
+	}();
+	return kComps;
+}
+
+void WriteFileClientRow(CJsonWriter &w, const FileClientRow &row, bool include_parts)
+{
+	w.BeginObject();
+	WriteClientBaseFields(w, row.client);
+	// This client's relation to THIS file, which the global /clients row cannot
+	// express: "downloading_from" is we pull from it, "uploading_to" is it pulls from
+	// us, "both" is each way, and "none" is a row that exists only because it is parked
+	// here as an A4AF source.
+	w.Key("role");
+	w.ValueString(wxString::FromUTF8(row.role.c_str()));
+	// Orthogonal to role on purpose: a peer can be parked on another file and
+	// still be pulling this one from us, which a fourth role value could not say.
+	w.Key("a4af");
+	w.ValueBool(row.a4af);
+	if (row.has_parts) {
+		w.Key("parts");
+		w.BeginArray();
+		for (const bool b : row.parts) {
+			w.ValueBool(b);
+		}
+		w.EndArray();
+	}
+	// The two chunks the desktop's source bar paints on the bitmap: the one in flight
+	// and the one queued behind it (GenericClientListCtrl.cpp, crPending and
+	// crNextPending). They sit on the row rather than in WriteClientBaseFields because
+	// they describe a peer's relation to ONE file, which also keeps them out of the
+	// shared SSE client payload where a value moving every tick would be noise.
+	//
+	// Gated on include_parts: an index is meaningless without the bitmap it indexes.
+	// Under the flag both keys are always present, null rather than omitted where the
+	// index does not apply, so one query yields one row shape.
+	if (include_parts) {
+		WriteIntOrNull(w,
+			"next_requested_part_index",
+			row.next_requested_part_known,
+			static_cast<int64_t>(row.client.next_requested_part));
+		WriteIntOrNull(w,
+			"downloading_part_index",
+			row.last_downloading_part_known,
+			static_cast<int64_t>(row.client.last_downloading_part));
+	}
+	w.EndObject();
+}
+
+// Resolve one peer's bitmap for `part_count` chunks, following the two wire
+// conventions: an "all" flag means the core sent an empty tag for a full source,
+// and a bitmap that cannot cover the file is dropped rather than padded.
+bool ResolvePartBitmap(const std::vector<bool> &bits,
+	bool all,
+	bool present,
+	std::uint64_t part_count,
+	std::vector<bool> &out)
+{
+	if (!present || part_count == 0) {
+		return false;
+	}
+	if (all) {
+		out.assign(static_cast<std::size_t>(part_count), true);
+		return true;
+	}
+	if (bits.size() < part_count) {
+		return false;
+	}
+	out.assign(bits.begin(), bits.begin() + static_cast<std::ptrdiff_t>(part_count));
+	return true;
+}
+} // namespace
+
+// Serves both /downloads/{hash}/clients and /shared/{hash}/clients: the rows are the
+// same object out of the same cache, since the relation to the file is a field
+// rather than a path. The routes differ only in which role the hash must already
+// have. A partfile with one completed chunk is in both at once.
+CHttpServer::Response CApiDispatcher::HandleFileClients(
+	const CHttpServer::Request &req, const std::string &key, bool require_downloading)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	const std::string needle = LowerHexKey(key);
+
+	webapi::FileSnapshot file;
+	const bool found =
+		require_downloading ? m_state.FindDownload(needle, file) : m_state.FindShared(needle, file);
+	if (!found) {
+		return ErrorResponse(404,
+			"not_found",
+			require_downloading ? "no download with that hash" : "no shared file with that hash");
+	}
+
+	ListParams params;
+	if (auto err = ParseListParams(QueryOf(req), params))
+		return *err;
+
+	bool include_parts = false;
+	{
+		const auto qmap = web_api_path::ParseQuery(QueryOf(req));
+		if (auto r = ParseBoolParam(qmap, "include_parts", include_parts))
+			return *r;
+	}
+
+	const std::uint64_t part_count = webapi::PartCountForSize(file.size);
+	const auto &a4af_sources = file.download.a4af_sources;
+
+	std::vector<FileClientRow> rows;
+	for (auto client : m_state.Clients()) {
+		const bool is_source = (client.download_file_hash == needle);
+		const bool is_peer = (client.upload_file_hash == needle);
+		const bool is_a4af = std::find(a4af_sources.begin(), a4af_sources.end(), client.ecid) !=
+				     a4af_sources.end();
+		if (!is_source && !is_peer && !is_a4af) {
+			continue;
+		}
+
+		FileClientRow row;
+		// R12: named by direction (`downloading_from` / `uploading_to`), one axis --
+		// not a mix of a file-relation (`source`) and an entity (`peer`).
+		row.role = is_source && is_peer
+				   ? "both"
+				   : (is_source ? "downloading_from" : (is_peer ? "uploading_to" : "none"));
+		row.a4af = is_a4af;
+		ComputePartProgressPercent(m_state, client);
+		if (include_parts) {
+			// Which bitmap belongs to this row follows its direction: the download map
+			// is the file we pull from the peer, the upload map the file it pulls from
+			// us. A pure A4AF row has no bitmap for this file at all.
+			if (is_source) {
+				row.has_parts = ResolvePartBitmap(client.part_status,
+					client.part_status_all,
+					client.has_part_status,
+					part_count,
+					row.parts);
+				// Both indices address the download map, so they describe THIS
+				// file only on a source row. On a pure peer or A4AF row they
+				// belong to whatever else the peer is pulling; left false, they
+				// go out as null.
+				//
+				// has_parts is part of the test, not just the role: ResolvePartBitmap
+				// declines a source that has sent no part status, or whose bitmap
+				// cannot cover the file. Both reads must follow that call.
+				row.next_requested_part_known =
+					row.has_parts &&
+					webapi::UsablePartIndex(client.has_next_requested_part,
+						client.next_requested_part,
+						part_count);
+				row.last_downloading_part_known =
+					row.has_parts &&
+					webapi::UsableLastDownloadingPart(client.download_state,
+						client.has_last_downloading_part,
+						client.last_downloading_part,
+						part_count);
+			} else if (is_peer) {
+				row.has_parts = ResolvePartBitmap(client.upload_part_status,
+					client.upload_part_status_all,
+					client.has_upload_part_status,
+					part_count,
+					row.parts);
+			}
+		}
+		row.client = std::move(client);
+		rows.push_back(std::move(row));
+	}
+
+	return ListResponse(
+		m_state,
+		"clients",
+		rows,
+		include_parts(CJsonWriter &w, const FileClientRow &row) {
+			WriteFileClientRow(w, row, include_parts);
+		},
+		params,
+		FileClientComparators());
+}
+
+CHttpServer::Response CApiDispatcher::HandleClients(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	// Optional `?activity=uploading | downloading | active`.
+	//
+	// `activity`, not `filter`: "filter" named the mechanism rather than the axis, and
+	// every list endpoint filters somehow. The values are client states, so they are
+	// spelled the way `upload_state` / `download_state` spell them. `active` is the
+	// union of the two; absent means every client the daemon knows.
+	std::string activity;
+	{
+		std::string query;
+		const std::size_t q = req.target.find('?');
+		if (q != std::string::npos)
+			query = req.target.substr(q + 1);
+		const auto qmap = web_api_path::ParseQuery(query);
+		const auto it = qmap.find("activity");
+		if (it != qmap.end())
+			activity = it->second;
+	}
+	if (!activity.empty() && activity != "uploading" && activity != "downloading" &&
+		activity != "active") {
+		return ErrorResponse(400,
+			"bad_request",
+			"`activity` must be one of \"uploading\", \"downloading\", \"active\"");
+	}
+
+	auto clients = m_state.Clients();
+	if (!activity.empty()) {
+		auto matches = &(const webapi::ClientSnapshot &c) {
+			const bool up = (c.upload_state == "uploading");
+			const bool down = (c.download_state == webapi::kDownloadStateDownloading);
+			if (activity == "uploading")
+				return up;
+			if (activity == "downloading")
+				return down;
+			/* active */ return up || down;
+		};
+		clients.erase(std::remove_if(clients.begin(),
+				      clients.end(),
+				      &(const webapi::ClientSnapshot &c) { return !matches(c); }),
+			clients.end());
+	}
+
+	// Same derived field the per-file rows and the detail object carry. Omitted here,
+	// it left the SSE payload contradicting EVENTS.md's "same field set as the /clients
+	// list row".
+	for (auto &client : clients) {
+		ComputePartProgressPercent(m_state, client);
+	}
+
+	ListParams params;
+	if (auto err = ParseListParams(QueryOf(req), params))
+		return *err;
+	return ListResponse(m_state, "clients", clients, WriteClientObject, params, ClientComparators());
+}
+
+CHttpServer::Response CApiDispatcher::HandleSharedList(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	ListParams params;
+	if (auto err = ParseListParams(QueryOf(req), params))
+		return *err;
+	static const ListComparators<webapi::FileSnapshot> kComps = {
+		// Identity column: immutable, so it is what a keyset sweep anchors on.
+		// Listed first because that is the order a paging client cares about.
+		{ "hash", SORT_BY(hash), ANCHOR_ON(hash) },
+		{ "name", SORT_BY(name) },
+		// R7: spelled like the response key it orders by. The upload-side pair
+		// rather than /downloads' progress.percent, which this row does not report.
+		{ "size_bytes", SORT_BY(size) },
+		{ "uploaded_bytes_total", SORT_BY(shared.uploaded_bytes_total) },
+		{ "upload_speed_bytes_per_second", SORT_BY(shared.upload_speed_bytes_per_second) },
+	};
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+	// Pointers into the live map rather than copies -- the single biggest allocation
+	// the daemon made per request. Safe inside the read lock because WriteSharedObject
+	// reads only the snapshot it is handed.
+	CHttpServer::Response resp;
+	// Named captures rather than &: & would pull `this` in, putting m_state
+	// within reach of a callback that must not touch it.
+	m_state.WithFiles(&resp, &params(const webapi::FileMap &files) {
+		std::vector<const webapi::FileSnapshot *> ptrs;
+		ptrs.reserve(files.size());
+		for (const auto &entry : files) {
+			if (entry.second.is_shared)
+				ptrs.push_back(&entry.second);
+		}
+		resp = ListResponseFromPtrsUnlocked("shared", ptrs, WriteSharedObject, params, kComps);
+	});
+	return resp;
+}
+
+CHttpServer::Response CApiDispatcher::HandleDownloadDetail(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	// {hash} is the 32-char MD4. The URL is case-tolerant and State keys are
+	// lowercase, so down-case before the O(1) lookup.
+	webapi::FileSnapshot d;
+	if (!FindDownloadByKey(m_state, key, d)) {
+		return ErrorResponse(404, "not_found", "no download with that hash");
+	}
+
+	// Bare object: list endpoints carry an envelope, a detail endpoint is the resource
+	// itself. `include_parts=true` adds `progress.parts`, which the list omits: it can
+	// be 100K+ entries for a multi-TiB download, uncapped.
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	WriteDownloadObject(w, d, /*include_parts=*/true, /*detail=*/true);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleSharedDetail(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	// {hash} is the 32-char MD4; down-case before the O(1) lookup, mirroring the
+	// download detail handler.
+	webapi::FileSnapshot s;
+	if (!FindSharedByKey(m_state, key, s)) {
+		return ErrorResponse(404, "not_found", "no shared file with that hash");
+	}
+
+	// Bare object, same shape contract as GET /downloads/{hash}: every list field
+	// plus the detail-only ones.
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	WriteSharedDetailObject(w, s);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleDownloadComments(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	webapi::FileSnapshot d;
+	if (!FindDownloadByKey(m_state, key, d)) {
+		return ErrorResponse(404, "not_found", "no download with that hash");
+	}
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("total");
+	w.ValueInt(static_cast<int64_t>(d.download.source_comments.size()));
+	// True while an on-demand Kad notes lookup is in flight; poll until it flips.
+	w.Key("kad_comment_lookup_running");
+	w.ValueBool(d.download.kad_comment_searching);
+	w.Key("comments");
+	w.BeginArray();
+	for (const auto &c : d.download.source_comments) {
+		w.BeginObject();
+		w.Key("username");
+		w.ValueString(wxString::FromUTF8(c.username.c_str()));
+		w.Key("filename");
+		w.ValueString(wxString::FromUTF8(c.filename.c_str()));
+		w.Key("rating");
+		w.ValueInt(static_cast<int64_t>(c.rating));
+		w.Key("comment");
+		w.ValueString(wxString::FromUTF8(c.comment.c_str()));
+		w.EndObject();
+	}
+	w.EndArray();
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// Trigger an on-demand Kad NOTES lookup for this download. Asynchronous on amuled
+// (up to ~45s); retrieved ratings appear via GET on the same path, alongside
+// per-source comments.
+CHttpServer::Response CApiDispatcher::HandleDownloadCommentsKadSearch(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	// Admin-only, like every other mutation. This drives an unbounded Kad
+	// NOTES lookup on the daemon, so a guest session must not reach it.
+	if (auto r = RequireAdmin(a))
+		return *r;
+
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	webapi::FileSnapshot d;
+	if (!FindDownloadByKey(m_state, key, d)) {
+		return ErrorResponse(404, "not_found", "no download with that hash");
+	}
+
+	CMD4Hash file_hash;
+	if (!HashFromHex(d.hash, file_hash)) {
+		return ErrorResponse(500, "internal_error", "failed to decode file hash");
+	}
+
+	auto ec_req = std::make_unique<CECPacket>(EC_OP_SHARED_FILE_SEARCH_KAD_NOTES);
+	ec_req->AddTag(CECTag(EC_TAG_KNOWNFILE, file_hash));
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for SEARCH_KAD_NOTES");
+	}
+	std::string ec_err;
+	if (IsEcFailedResponse(ec_resp, ec_err)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err.c_str());
+	}
+	delete ec_resp;
+
+	CHttpServer::Response r;
+	// 202 with no body. Any field here could hold exactly one value, so it
+	// would say nothing the status code has not -- and `status` everywhere else on this
+	// surface is a transfer state.
+	r.status = 202;
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleDownloadFilenames(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	webapi::FileSnapshot d;
+	if (!FindDownloadByKey(m_state, key, d)) {
+		return ErrorResponse(404, "not_found", "no download with that hash");
+	}
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("filenames");
+	w.BeginArray();
+	for (const auto &kv : d.download.source_names) {
+		w.BeginObject();
+		w.Key("filename");
+		w.ValueString(wxString::FromUTF8(kv.second.name.c_str()));
+		w.Key("source_count");
+		w.ValueInt(static_cast<int64_t>(kv.second.count));
+		w.EndObject();
+	}
+	w.EndArray();
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// Serialize the A4AF view (auto flag + source client ECIDs) for a
+// resolved download snapshot.
+namespace
+{
+
+// Defined below beside its FindServerByEcid / FindFriendByEcid siblings;
+// declared here so the A4AF handlers can validate a `client_ecid`.
+bool FindClientByEcid(const webapi::CState &state, std::uint32_t ecid, webapi::ClientSnapshot &out);
+
+void WriteA4afObject(CJsonWriter &w, const webapi::FileSnapshot &d)
+{
+	w.BeginObject();
+	w.Key("a4af_auto");
+	w.ValueBool(d.download.a4af_auto);
+	w.Key("source_ecids");
+	w.BeginArray();
+	for (const std::uint32_t ecid : d.download.a4af_sources) {
+		w.ValueInt(static_cast<int64_t>(ecid));
+	}
+	w.EndArray();
+	w.EndObject();
+}
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandleDownloadA4afAction(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	webapi::FileSnapshot d;
+	if (!FindDownloadByKey(m_state, key, d)) {
+		return ErrorResponse(404, "not_found", "no download with that hash");
+	}
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+	const auto ait = obj.find("action");
+	if (ait == obj.end() || !ait->second.is<std::string>()) {
+		return ErrorResponse(400, "bad_request", "request body must include a string `action`");
+	}
+	const std::string &action = ait->second.get<std::string>();
+	ec_opcode_t op;
+	if (action == "swap_this")
+		op = EC_OP_PARTFILE_SWAP_A4AF_THIS;
+	else if (action == "swap_others")
+		op = EC_OP_PARTFILE_SWAP_A4AF_OTHERS;
+	else if (action == "swap_this_auto") {
+		// The other two actions move sources; flipping the `a4af_auto` flag the download
+		// object reports belongs on PATCH /downloads/{hash}, because a flip cannot be
+		// retried safely. The rejection points a client there.
+		return ErrorResponse(400,
+			"bad_request",
+			"`swap_this_auto` is not accepted; set the flag with PATCH "
+			"/downloads/{hash} `{\"a4af_auto\": true|false}`");
+	} else {
+		return ErrorResponse(400, "bad_request", "`action` must be one of swap_this, swap_others");
+	}
+
+	// `client_ecid` narrows swap_this from "every A4AF source of this file" to one
+	// named source, which is what the desktop's per-peer swap does. The core has no
+	// per-source form of the other two, so pairing it with them is a request that
+	// cannot be honoured rather than one that quietly does something else.
+	bool per_source = false;
+	std::uint32_t client_ecid = 0;
+	if (const auto cit = obj.find("client_ecid"); cit != obj.end()) {
+		// Integrality checked, not just the sign: the message says integer,
+		// and without it 2.9 was accepted and truncated to 2.
+		if (!cit->second.is<double>() || cit->second.get<double>() < 0 ||
+			cit->second.get<double>() !=
+				static_cast<double>(static_cast<std::int64_t>(cit->second.get<double>()))) {
+			return ErrorResponse(
+				400, "bad_request", "`client_ecid` must be a non-negative integer");
+		}
+		if (op != EC_OP_PARTFILE_SWAP_A4AF_THIS) {
+			return ErrorResponse(
+				400, "bad_request", "`client_ecid` is only valid with action `swap_this`");
+		}
+		per_source = true;
+		client_ecid = static_cast<std::uint32_t>(cit->second.get<double>());
+
+		webapi::ClientSnapshot peer;
+		if (!FindClientByEcid(m_state, client_ecid, peer)) {
+			return ErrorResponse(
+				404, "not_found", "no client with that ECID in the current snapshot");
+		}
+		const auto &srcs = d.download.a4af_sources;
+		if (std::find(srcs.begin(), srcs.end(), client_ecid) == srcs.end()) {
+			return ErrorResponse(
+				409, "not_a4af_source", "that client is not an A4AF source of this download");
+		}
+	}
+
+	CMD4Hash file_hash;
+	if (!HashFromHex(d.hash, file_hash)) {
+		return ErrorResponse(500, "internal_error", "failed to decode partfile hash");
+	}
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(per_source ? EC_OP_CLIENT_SWAP_TO_ANOTHER_FILE : op));
+	if (per_source) {
+		ec_req->AddTag(CECTag(EC_TAG_CLIENT, client_ecid));
+	}
+	ec_req->AddTag(CECTag(EC_TAG_PARTFILE, file_hash));
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for A4AF swap");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	(void)RefresherTick(m_app, m_state);
+	webapi::FileSnapshot d_after = d;
+	(void)m_state.FindDownload(d.hash, d_after);
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	WriteA4afObject(w, d_after);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+namespace
+{
+
+// Every bulk mutation reports one entry per input item under a unified `results`
+// array, so a client submitting N items learns the fate of each without parallel
+// arrays or a first-error-only summary.
+struct BulkItem
+{
+	std::string id; // the item key: ed2k link or MD4 hash
+	bool ok = false;
+	int http = 200;      // per-item semantic status; used only to aggregate
+	std::string code;    // error code   (when !ok)
+	std::string message; // error message (when !ok)
+};
+
+BulkItem BulkOk(const std::string &id)
+{
+	BulkItem b;
+	b.id = id;
+	b.ok = true;
+	return b;
+}
+
+BulkItem BulkErr(const std::string &id, int http, const char *code, const std::string &message)
+{
+	BulkItem b;
+	b.id = id;
+	b.ok = false;
+	b.http = http;
+	b.code = code;
+	b.message = message;
+	return b;
+}
+
+// Emit `{"results":{"id","ok","error":{"code","message"}}}`. Aggregate status:
+// every item ok -> `all_ok_status`; every item failed because the daemon was
+// unreachable -> 503; any other mix -> 207 Multi-Status.
+CHttpServer::Response BulkResultsResponse(const std::vector<BulkItem> &items, int all_ok_status)
+{
+	bool all_ok = true;
+	bool all_unreachable = !items.empty();
+	for (const auto &it : items) {
+		if (!it.ok) {
+			all_ok = false;
+			if (it.http != 503)
+				all_unreachable = false;
+		} else {
+			all_unreachable = false;
+		}
+	}
+
+	CHttpServer::Response r;
+	r.status = all_ok ? all_ok_status : (all_unreachable ? 503 : 207);
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("results");
+	w.BeginArray();
+	for (const auto &it : items) {
+		w.BeginObject();
+		w.Key("id");
+		w.ValueString(wxString::FromUTF8(it.id.c_str()));
+		w.Key("ok");
+		w.ValueBool(it.ok);
+		if (!it.ok) {
+			w.Key("error");
+			w.BeginObject();
+			w.Key("code");
+			w.ValueString(wxString::FromUTF8(it.code.c_str()));
+			w.Key("message");
+			w.ValueString(wxString::FromUTF8(it.message.c_str()));
+			w.EndObject();
+		}
+		w.EndObject();
+	}
+	w.EndArray();
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// Extract a non-empty `hashes` string array (max 500) from a parsed body.
+// On any shape problem fills `err` with a 400 and returns false.
+bool ParseBulkHashes(const picojson::object &obj, std::vector<std::string> &out, CHttpServer::Response &err)
+{
+	const auto it = obj.find("hashes");
+	if (it == obj.end() || !it->second.is<picojson::array>()) {
+		err = ErrorResponse(400, "bad_request", "`hashes` must be an array of 32-char hex strings");
+		return false;
+	}
+	const auto &arr = it->second.get<picojson::array>();
+	if (arr.empty()) {
+		err = ErrorResponse(400, "bad_request", "`hashes` must contain at least one entry");
+		return false;
+	}
+	if (arr.size() > 500) {
+		err = ErrorResponse(400, "bad_request", "`hashes` may contain at most 500 entries");
+		return false;
+	}
+	out.clear();
+	out.reserve(arr.size());
+	for (const auto &v : arr) {
+		if (!v.is<std::string>()) {
+			err = ErrorResponse(400, "bad_request", "`hashes` entries must be strings");
+			return false;
+		}
+		out.push_back(v.get<std::string>());
+	}
+	return true;
+}
+
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandleVersionCheck(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	// Before the first EC snapshot there are no preferences to read and
+	// version_check_available defaults to false, so without a snapshot the capability
+	// check below would answer 409 "disabled on the connected daemon" during the
+	// startup window every client hits. 503 ec_unavailable is the retryable answer.
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	// The daemon owns the check; amuleapi only triggers it. Rejecting early avoids
+	// an EC op that will fail and never exposes the daemon's localized reason.
+	const auto prefs = m_state.Preferences();
+	if (!(prefs.version_check_available && prefs.version_check_enabled)) {
+		return ErrorResponse(409,
+			"version_check_unavailable",
+			"version check is disabled or unavailable on the connected daemon");
+	}
+
+	auto ec_req = std::make_unique<CECPacket>(EC_OP_VERSION_CHECK);
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for version check");
+	}
+	// The daemon replies EC_OP_NOOP (accepted) or EC_OP_FAILED (throttled).
+	const bool failed = ec_resp->GetOpCode() == EC_OP_FAILED;
+	delete ec_resp;
+	if (failed) {
+		// The only expected failure past the gate above is the daemon's throttle,
+		// reported with an English code.
+		//
+		// Its own code, not the auth limiter's `rate_limited`: both answer 429, and a
+		// client that cannot tell them apart treats a throttled update check as a lost
+		// session. The Web UI did exactly that and logged the user out.
+		return ErrorResponse(429,
+			"version_check_throttled",
+			"version check was throttled by the daemon; try again shortly");
+	}
+
+	// The check runs asynchronously; the result appears on a subsequent
+	// GET /version.
+	CHttpServer::Response r;
+	// 202 with no body: "started" is what the status code says.
+	r.status = 202;
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleDownloadAdd(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	// Body shape: {"links": "ed2k://|file|...|/", ..., "category_index": 0}.
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+
+	std::vector<std::string> links;
+	{
+		// `links` only. A singular `ed2k_link` alias meant one input with two
+		// spellings on the endpoint that already answers with the bulk `results`
+		// envelope even for a single item, and every future field varying by arity
+		// would have inherited the question.
+		const auto it_array = obj.find("links");
+		if (obj.find("ed2k_link") != obj.end()) {
+			return ErrorResponse(400,
+				"bad_request",
+				"`ed2k_link` is not accepted; send `links` as an array, "
+				"`{\"links\": \"ed2k://...\"}` for a single link");
+		}
+		{
+			if (it_array == obj.end()) {
+				return ErrorResponse(400,
+					"bad_request",
+					"required field missing: `links` (array of ed2k:// strings)");
+			}
+			if (!it_array->second.is<picojson::array>()) {
+				return ErrorResponse(
+					400, "bad_request", "`links` must be an array of ed2k://strings");
+			}
+			const auto &arr = it_array->second.get<picojson::array>();
+			if (arr.empty()) {
+				return ErrorResponse(
+					400, "bad_request", "`links` must contain at least one entry");
+			}
+			links.reserve(arr.size());
+			for (const auto &v : arr) {
+				if (!v.is<std::string>()) {
+					return ErrorResponse(400,
+						"bad_request",
+						"every entry in `links` must be a string");
+				}
+				links.push_back(v.get<std::string>());
+			}
+		}
+		for (const auto &link : links) {
+			if (link.size() < 7 || link.compare(0, 7, "ed2k://") != 0) {
+				return ErrorResponse(
+					400, "bad_request", "every link must start with ed2k://");
+			}
+		}
+	}
+	std::uint8_t category = 0;
+	{
+		const auto it = obj.find("category_index");
+		if (it != obj.end()) {
+			if (!it->second.is<double>()) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`category_index` must be a non-negative integer");
+			}
+			const double v = it->second.get<double>();
+			// The integrality test the message already promises: without it
+			// 2.9 was accepted and truncated to 2.
+			if (v < 0 || v > 255 || !IsIntegralJsonNumber(v)) {
+				return ErrorResponse(
+					400, "bad_request", "`category_index` must be in 0, 255");
+			}
+			category = static_cast<std::uint8_t>(v);
+		}
+	}
+
+	// One EC_OP_ADD_LINK packet per link: amuled's add-link op is single-link on the
+	// wire, so the batching is ours and clients pay one round-trip. Accepted, failed
+	// and disconnected-mid-batch are accumulated separately and reported together -- an
+	// unconditional 503 on an EC blip would silently discard the links amuled had
+	// already queued.
+	std::vector<BulkItem> results;
+	results.reserve(links.size());
+	for (const auto &link : links) {
+		std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_ADD_LINK));
+		CECTag link_tag(EC_TAG_STRING, wxString::FromUTF8(link.c_str()));
+		link_tag.AddTag(CECTag(EC_TAG_PARTFILE_CAT, category));
+		ec_req->AddTag(link_tag);
+		const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+		if (!ec_resp) {
+			results.push_back(
+				BulkErr(link, 503, "ec_unavailable", "EC roundtrip failed for ADD_LINK"));
+			continue;
+		}
+		std::string ec_err_msg;
+		if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+			delete ec_resp;
+			results.push_back(BulkErr(link, 400, "amuled_rejected", ec_err_msg));
+			continue;
+		}
+		delete ec_resp;
+		results.push_back(BulkOk(link));
+	}
+
+	// Inline-refresh so the response sees post-mutation state. amuled's ADD_LINK is
+	// asynchronous -- the partfile is allocated and hashed before it appears in
+	// m_filelist -- so the new entry may not surface until the next tick, and
+	// GET /downloads is what surfaces it.
+	(void)RefresherTick(m_app, m_state);
+
+	// All accepted -> 202 (async); a mix -> 207; every link blocked by an EC
+	// disconnect -> 503.
+	return BulkResultsResponse(results, 202);
+}
+
+namespace
+{
+// The optional `my_comment` + `my_rating` pair shared by PATCH /downloads/{hash}
+// and PATCH /shared/{hash}. Both must be present or neither. Sends
+// EC_OP_SHARED_FILE_SET_COMMENT, which amuled resolves against the shared-files
+// registry, so the file must be shared. A body with neither field is a no-op.
+bool TrySetCommentRating(CamuleapiApp &app,
+	const picojson::object &obj,
+	const webapi::FileSnapshot &f,
+	bool &applied,
+	CHttpServer::Response &err)
+{
+	applied = false;
+	const auto cit = obj.find("my_comment");
+	const auto rit = obj.find("my_rating");
+	const bool has_c = cit != obj.end();
+	const bool has_r = rit != obj.end();
+	if (!has_c && !has_r)
+		return true;
+	if (has_c != has_r) {
+		err = ErrorResponse(400, "bad_request", "`my_comment` and `my_rating` must be set together");
+		return false;
+	}
+	if (!cit->second.is<std::string>()) {
+		err = ErrorResponse(400, "bad_request", "`my_comment` must be a string");
+		return false;
+	}
+	const std::string comment = cit->second.get<std::string>();
+	// MAXFILECOMMENTLEN (include/protocol/ed2k/Constants.h) = 50.
+	if (comment.size() > 50) {
+		err = ErrorResponse(400, "bad_request", "`my_comment` exceeds 50 characters");
+		return false;
+	}
+	if (!rit->second.is<double>()) {
+		err = ErrorResponse(400, "bad_request", "`my_rating` must be an integer in 0, 5");
+		return false;
+	}
+	const double rd = rit->second.get<double>();
+	const int rating = static_cast<int>(rd);
+	if (static_cast<double>(rating) != rd || rating < 0 || rating > 5) {
+		err = ErrorResponse(400, "bad_request", "`my_rating` must be an integer in 0, 5");
+		return false;
+	}
+	if (!f.is_shared) {
+		err = ErrorResponse(409, "not_shared", "comment and rating can only be set on a shared file");
+		return false;
+	}
+	CMD4Hash file_hash;
+	if (!HashFromHex(f.hash, file_hash)) {
+		err = ErrorResponse(500, "internal_error", "failed to decode file hash");
+		return false;
+	}
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SHARED_FILE_SET_COMMENT));
+	ec_req->AddTag(CECTag(EC_TAG_KNOWNFILE, file_hash));
+	ec_req->AddTag(CECTag(EC_TAG_KNOWNFILE_COMMENT, comment));
+	ec_req->AddTag(CECTag(EC_TAG_KNOWNFILE_RATING, static_cast<std::uint8_t>(rating)));
+	const CECPacket *ec_resp = app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		err = ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for SET_COMMENT");
+		return false;
+	}
+	std::string ec_err;
+	if (IsEcFailedResponse(ec_resp, ec_err)) {
+		delete ec_resp;
+		err = ErrorResponse(400, "amuled_rejected", ec_err.c_str());
+		return false;
+	}
+	delete ec_resp;
+	applied = true;
+	return true;
+}
+
+// The optional `name` (rename) field shared by PATCH /downloads/{hash} and PATCH
+// /shared/{hash}, mapping to EC_OP_RENAME_FILE. Empty names and names containing
+// path separators are rejected: amuled's RenameFile JoinPaths()es the value, so a
+// separator would let the rename escape the file's directory.
+bool TryRename(CamuleapiApp &app,
+	const picojson::object &obj,
+	const webapi::FileSnapshot &f,
+	bool &applied,
+	CHttpServer::Response &err)
+{
+	applied = false;
+	const auto nit = obj.find("name");
+	if (nit == obj.end())
+		return true;
+	if (!nit->second.is<std::string>()) {
+		err = ErrorResponse(400, "bad_request", "`name` must be a string");
+		return false;
+	}
+	const std::string name = nit->second.get<std::string>();
+	if (name.empty()) {
+		err = ErrorResponse(400, "bad_request", "`name` must not be empty");
+		return false;
+	}
+	if (name.find('/') != std::string::npos || name.find('\\') != std::string::npos) {
+		err = ErrorResponse(400, "bad_request", "`name` must not contain path separators");
+		return false;
+	}
+	CMD4Hash file_hash;
+	if (!HashFromHex(f.hash, file_hash)) {
+		err = ErrorResponse(500, "internal_error", "failed to decode file hash");
+		return false;
+	}
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_RENAME_FILE));
+	ec_req->AddTag(CECTag(EC_TAG_KNOWNFILE, file_hash));
+	ec_req->AddTag(CECTag(EC_TAG_PARTFILE_NAME, name));
+	const CECPacket *ec_resp = app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		err = ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for RENAME_FILE");
+		return false;
+	}
+	std::string ec_err;
+	if (IsEcFailedResponse(ec_resp, ec_err)) {
+		delete ec_resp;
+		err = ErrorResponse(400, "amuled_rejected", ec_err.c_str());
+		return false;
+	}
+	delete ec_resp;
+	applied = true;
+	return true;
+}
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandleDownloadPatch(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	webapi::FileSnapshot d;
+	if (!FindDownloadByKey(m_state, key, d)) {
+		return ErrorResponse(404, "not_found", "no download with that hash");
+	}
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+
+	// Downstream EC ops still address by MD4 hash -- read it back off
+	// the snapshot we just resolved.
+	CMD4Hash file_hash;
+	if (!HashFromHex(d.hash, file_hash)) {
+		return ErrorResponse(500, "internal_error", "failed to decode partfile hash");
+	}
+
+	// Each field present in the body fires one EC mutation, in a fixed order (status,
+	// priority, category) so the wire effect does not depend on JSON key order.
+	auto send_op = &(ec_opcode_t op,
+			       bool has_inner,
+			       ec_tagname_t inner_name,
+			       std::uint8_t inner_value) -> CHttpServer::Response {
+		std::unique_ptr<CECPacket> p(new CECPacket(op));
+		CECTag hash_tag(EC_TAG_PARTFILE, file_hash);
+		if (has_inner) {
+			hash_tag.AddTag(CECTag(inner_name, inner_value));
+		}
+		p->AddTag(hash_tag);
+		const CECPacket *r = m_app.SendRecvSerialized(p.get());
+		if (!r) {
+			return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed");
+		}
+		std::string ec_err_msg;
+		if (IsEcFailedResponse(r, ec_err_msg)) {
+			delete r;
+			return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+		}
+		delete r;
+		CHttpServer::Response ok;
+		ok.status = 200;
+		return ok;
+	};
+
+	bool any_change = false;
+
+	// action: a command, not a state. The read side's `status` has eleven values,
+	// of which this accepted three, in a different tense.
+	{
+		const auto it = obj.find("action");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>()) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`action` must be one of \"pause\", \"resume\" or \"stop\"");
+			}
+			const std::string &v = it->second.get<std::string>();
+			ec_opcode_t op;
+			if (v == "pause")
+				op = EC_OP_PARTFILE_PAUSE;
+			else if (v == "resume")
+				op = EC_OP_PARTFILE_RESUME;
+			else if (v == "stop")
+				op = EC_OP_PARTFILE_STOP;
+			else {
+				return ErrorResponse(400,
+					"bad_request",
+					"`action` must be one of \"pause\", \"resume\" or \"stop\"");
+			}
+			auto err = send_op(op, /*has_inner=*/false, static_cast<ec_tagname_t>(0), 0);
+			if (err.status >= 400)
+				return err;
+			any_change = true;
+		}
+	}
+
+	// priority: the kPrioDownload domain. "very_low" and "release" are upload-side
+	// only and are refused here by design; see kFilePriorities.
+	{
+		const auto it = obj.find("priority");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>()) {
+				return ErrorResponse(400, "bad_request", "`priority` must be a string");
+			}
+			std::uint8_t code = 0;
+			if (!FilePriorityToCode(it->second.get<std::string>(), kPrioDownload, code)) {
+				return ErrorResponse(
+					400, "bad_request", FilePriorityAccepted(kPrioDownload).c_str());
+			}
+			auto err = send_op(
+				EC_OP_PARTFILE_PRIO_SET, /*has_inner=*/true, EC_TAG_PARTFILE_PRIO, code);
+			if (err.status >= 400)
+				return err;
+			any_change = true;
+		}
+	}
+
+	// category: integer
+	{
+		const auto it = obj.find("category_index");
+		if (it != obj.end()) {
+			if (!it->second.is<double>()) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`category_index` must be a non-negative integer");
+			}
+			const double v = it->second.get<double>();
+			// The integrality test the message already promises: without it
+			// 2.9 was accepted and truncated to 2.
+			if (v < 0 || v > 255 || !IsIntegralJsonNumber(v)) {
+				return ErrorResponse(
+					400, "bad_request", "`category_index` must be in 0, 255");
+			}
+			auto err = send_op(EC_OP_PARTFILE_SET_CAT,
+				/*has_inner=*/true,
+				EC_TAG_PARTFILE_CAT,
+				static_cast<std::uint8_t>(v));
+			if (err.status >= 400)
+				return err;
+			any_change = true;
+		}
+	}
+
+	// a4af_auto: a SET, not a toggle.
+	//
+	// EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO flips the flag, which is what the desktop menu
+	// wants and what an HTTP API must not expose: a client library can retry a request
+	// without the caller knowing, and a retried flip lands on the opposite value.
+	// EC_OP_PARTFILE_SET_A4AF_AUTO carries the value instead, so re-sending the same
+	// body is a no-op rather than an undo.
+	{
+		const auto it = obj.find("a4af_auto");
+		if (it != obj.end()) {
+			if (!it->second.is<bool>()) {
+				return ErrorResponse(400, "bad_request", "`a4af_auto` must be a boolean");
+			}
+			auto err = send_op(EC_OP_PARTFILE_SET_A4AF_AUTO,
+				/*has_inner=*/true,
+				EC_TAG_PARTFILE_A4AFAUTO,
+				static_cast<std::uint8_t>(it->second.get<bool>() ? 1 : 0));
+			if (err.status >= 400)
+				return err;
+			any_change = true;
+		}
+	}
+
+	// comment + rating, both required together. Only settable on a file that is
+	// shared; otherwise TrySetCommentRating returns 409.
+	{
+		bool applied = false;
+		CHttpServer::Response cr_err;
+		if (!TrySetCommentRating(m_app, obj, d, applied, cr_err))
+			return cr_err;
+		if (applied)
+			any_change = true;
+	}
+
+	// name (rename; issue #420).
+	{
+		bool applied = false;
+		CHttpServer::Response rn_err;
+		if (!TryRename(m_app, obj, d, applied, rn_err))
+			return rn_err;
+		if (applied)
+			any_change = true;
+	}
+
+	if (!any_change) {
+		return ErrorResponse(400,
+			"bad_request",
+			"request body must include at least one of "
+			"`action`, `priority`, `category_index`, `my_comment`+`my_rating`, or `name`");
+	}
+
+	// Inline refresh so the response below sees post-mutation state.
+	(void)RefresherTick(m_app, m_state);
+
+	// Re-read the snapshot, falling back to the prior copy if the cache evicted it
+	// between the mutation and this read.
+	webapi::FileSnapshot d_after;
+	if (!m_state.FindDownload(d.hash, d_after))
+		d_after = d;
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	// The same shape GET /downloads/{hash} returns, not the narrower list row: a client
+	// that PATCHes and stores the response holds the same object it would get by
+	// re-GETing, including progress.parts and sixteen other keys.
+	WriteDownloadObject(w, d_after, /*include_parts=*/true, /*detail=*/true);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleDownloadDelete(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	webapi::FileSnapshot d;
+	if (!FindDownloadByKey(m_state, key, d)) {
+		return ErrorResponse(404, "not_found", "no download with that hash");
+	}
+
+	// DELETE handles ACTIVE downloads only. Completed entries live in amuled's
+	// m_completedDownloads staging list, and the only EC op that touches it is
+	// EC_OP_CLEAR_COMPLETED, which acks the notification rather than deleting the file
+	// from Incoming. Conflating the two under one verb confused operators who expected
+	// DELETE to remove a file from disk, so the completed case goes through
+	// POST /downloads_clear_completed.
+	if (d.download.status == "completed") {
+		return ErrorResponse(409,
+			"download_completed",
+			"DELETE only removes active downloads (deletes .part/.met "
+			"files from disk). Use POST /downloads_clear_completed "
+			"with optional {\"hash\":\"...\"} body to clear a completed "
+			"entry's post-completion notification; the file in the "
+			"Incoming directory is NEVER removed via this API.");
+	}
+
+	CMD4Hash file_hash;
+	if (!HashFromHex(d.hash, file_hash)) {
+		return ErrorResponse(500, "internal_error", "failed to decode partfile hash");
+	}
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_PARTFILE_DELETE));
+	ec_req->AddTag(CECTag(EC_TAG_PARTFILE, file_hash));
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for DELETE");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	// Inline refresh: the next GET /downloads must not show the deleted entry.
+	// Eviction happens via FILE_REMOVED in the GET_UPDATE response.
+	(void)RefresherTick(m_app, m_state);
+
+	CHttpServer::Response r;
+	// 204 with no body: any echo would only repeat the request URL,
+	// and `ok` would restate the status code.
+	r.status = 204;
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleDownloadsClearCompleted(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	// Two shapes share this endpoint: no body clears every completed entry, and
+	// {"hash": "<md4hex>"} clears that one, which must currently be a download with
+	// status=="completed" (active or unknown hashes 404). The response envelope is
+	// identical either way, so a client wrapping the call need not fork on its input.
+	std::string target_hash;
+	bool body_has_content = false;
+	for (char c : req.body) {
+		if (c != ' ' && c != '\t' && c != '\n' && c != '\r') {
+			body_has_content = true;
+			break;
+		}
+	}
+	if (body_has_content) {
+		picojson::value root;
+		std::string parse_err;
+		if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+			return ErrorResponse(400, "bad_request", parse_err.c_str());
+		}
+		const auto &obj = root.get<picojson::object>();
+		const auto it_hash = obj.find("hash");
+		if (it_hash != obj.end()) {
+			if (!it_hash->second.is<std::string>()) {
+				return ErrorResponse(400, "bad_request", "`hash` must be a string");
+			}
+			target_hash = it_hash->second.get<std::string>();
+			std::transform(target_hash.begin(),
+				target_hash.end(),
+				target_hash.begin(),
+				(unsigned char c) { return std::tolower(c); });
+		}
+		// Unknown keys are ignored rather than 400, so adding a flag later does
+		// not break old clients.
+	}
+
+	// Collect target ECID(s). For the by-hash form, only one entry;
+	// for the bulk form, every cached download with status=="completed".
+	std::vector<std::uint32_t> ecids;
+	std::vector<std::string> hashes_cleared;
+	if (!target_hash.empty()) {
+		webapi::FileSnapshot d;
+		if (!m_state.FindDownload(target_hash, d)) {
+			return ErrorResponse(404, "not_found", "no download with that hash");
+		}
+		if (d.download.status != "completed") {
+			return ErrorResponse(409,
+				"not_completed",
+				"target download exists but is not in the completed "
+				"staging list (status != \"completed\"). To remove an "
+				"active partfile, use DELETE /downloads/{hash}.");
+		}
+		ecids.push_back(d.ecid);
+		hashes_cleared.push_back(d.hash);
+	} else {
+		// Named captures; see HandleSharedList.
+		m_state.WithFiles(&ecids, &hashes_cleared(const webapi::FileMap &files) {
+			for (const auto &entry : files) {
+				const webapi::FileSnapshot &d = entry.second;
+				if (d.is_downloading && d.download.status == "completed") {
+					ecids.push_back(d.ecid);
+					hashes_cleared.push_back(d.hash);
+				}
+			}
+		});
+	}
+
+	if (ecids.empty()) {
+		// Nothing to do. An empty `results` array is the no-op, and stays distinct
+		// from "amuled rejected", which is a 4xx with an error envelope.
+		return BulkResultsResponse({}, 200);
+	}
+
+	// One EC roundtrip with all ECIDs (per amulegui's pattern at
+	// amule-remote-gui.cpp).
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_CLEAR_COMPLETED));
+	for (std::uint32_t ecid : ecids) {
+		ec_req->AddTag(CECTag(EC_TAG_ECID, ecid));
+	}
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for CLEAR_COMPLETED");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	// Inline refresh -- the response below + the next GET both must
+	// show the post-clear state.
+	(void)RefresherTick(m_app, m_state);
+
+	// One entry per hash, in the envelope every other multi-item mutation uses, so a
+	// per-entry failure has somewhere to appear rather than the response being a count
+	// plus a bare hash array.
+	std::vector<BulkItem> results;
+	results.reserve(hashes_cleared.size());
+	for (const auto &h : hashes_cleared) {
+		results.push_back(BulkOk(h));
+	}
+	return BulkResultsResponse(results, 200);
+}
+
+// --- /servers, /kad, /categories, /preferences -------------------------
+
+namespace
+{
+
+// Dotted-quad IPv4 to host-order uint32, the encoding EC_TAG_*_IP uses.
+bool ParseIpv4Dotted(const std::string &text, std::uint32_t &out_he)
+{
+	unsigned a = 0, b = 0, c = 0, d = 0;
+	if (std::sscanf(text.c_str(), "%u.%u.%u.%u", &a, &b, &c, &d) != 4)
+		return false;
+	if (a > 255 || b > 255 || c > 255 || d > 255)
+		return false;
+	out_he = (a) | (b << 8) | (c << 16) | (d << 24);
+	return true;
+}
+
+void WriteServerObject(CJsonWriter &w, const webapi::ServerSnapshot &s)
+{
+	w.BeginObject();
+	// `ecid` is the URL key for /servers/{ecid} and /servers/{ecid}/connect. The
+	// same key is surfaced on /clients for the same reason; servers got it later.
+	w.Key("ecid");
+	w.ValueInt(static_cast<int64_t>(s.ecid));
+	w.Key("name");
+	w.ValueString(wxString::FromUTF8(s.name.c_str()));
+	w.Key("description");
+	w.ValueString(wxString::FromUTF8(s.description.c_str()));
+	// `software_version`, not `version`: every version on this surface is named for its
+	// subject, and a bare `version` beside them reads as the API's own. null, not "",
+	// for the reason the two peer writers null it: a server that never reported one is
+	// unknown, and a client normalizing this key across /servers, /clients and
+	// /known_clients should not learn the rule twice (R10).
+	WriteStringOrNull(w, "software_version", !s.version.empty(), s.version);
+	w.Key("address");
+	w.ValueString(wxString::FromUTF8(s.address.c_str()));
+	// The bare IP beside the "ip:port" form. Every client needed it and had
+	// to re-parse `address` to get it.
+	w.Key("ip");
+	w.ValueString(wxString::FromUTF8(s.address.substr(0, s.address.rfind(':')).c_str()));
+	// ISO 3166-1 alpha-2 (lowercase); null when GeoIP is off/unresolved (#440).
+	WriteStringOrNull(w, "country_code", !s.country_code.empty(), s.country_code);
+	w.Key("port");
+	w.ValueInt(static_cast<int64_t>(s.port));
+	w.Key("user_count");
+	w.ValueInt(static_cast<int64_t>(s.users));
+	w.Key("max_user_count");
+	w.ValueInt(static_cast<int64_t>(s.max_users));
+	w.Key("file_count");
+	w.ValueInt(static_cast<int64_t>(s.files));
+	// 0 means the server has not reported a limit yet, not a limit of zero, so a
+	// UI can render it blank the way the desktop's Soft/Hard Files columns do.
+	w.Key("soft_file_limit");
+	w.ValueInt(static_cast<int64_t>(s.soft_file_limit));
+	w.Key("hard_file_limit");
+	w.ValueInt(static_cast<int64_t>(s.hard_file_limit));
+	w.Key("priority");
+	w.ValueString(wxString::FromUTF8(s.priority.c_str()));
+	w.Key("ping_ms");
+	w.ValueInt(static_cast<int64_t>(s.ping_ms));
+	w.Key("failed_count");
+	w.ValueInt(static_cast<int64_t>(s.failed_count));
+	// `permanent`, not `static`: `static` is a reserved word in C++, Java and C#,
+	// so a generated client has to mangle it.
+	w.Key("permanent");
+	w.ValueBool(s.is_static);
+	// Written as a pre-built fragment from the shared tables so this object and
+	// the SSE payload in EventDiff.cpp cannot drift apart.
+	w.Key("tcp_flags");
+	w.ValueRaw(webapi::ServerTcpFlagsJson(s.tcp_flags));
+	w.Key("udp_flags");
+	w.ValueRaw(webapi::ServerUdpFlagsJson(s.udp_flags));
+	w.EndObject();
+}
+
+void WriteCategoryObject(CJsonWriter &w, const webapi::CategorySnapshot &c)
+{
+	w.BeginObject();
+	w.Key("index");
+	w.ValueInt(static_cast<int64_t>(c.index));
+	w.Key("name");
+	w.ValueString(wxString::FromUTF8(c.name.c_str()));
+	// `save_path`, not `path`: it is where finished files in this category
+	// land, which `path` did not distinguish from directories.incoming_path.
+	w.Key("save_path");
+	w.ValueString(wxString::FromUTF8(c.path.c_str()));
+	w.Key("comment");
+	w.ValueString(wxString::FromUTF8(c.comment.c_str()));
+	// "#rrggbb", not the raw 24-bit integer. Mind the byte order: the core packs it as
+	// 0x00BBGGRR -- red in the LOW byte (CMuleColour) -- so a naive hex print of the
+	// integer yields #bbggrr, reversed.
+	w.Key("color");
+	{
+		const unsigned r = c.color & 0xFF;
+		const unsigned g = (c.color >> 8) & 0xFF;
+		const unsigned b = (c.color >> 16) & 0xFF;
+		w.ValueString(wxString::Format(wxT("#%02x%02x%02x"), r, g, b));
+	}
+	w.Key("priority");
+	w.ValueString(wxString::FromUTF8(c.priority.c_str()));
+	w.EndObject();
+}
+
+} // namespace
+
+void WriteFriendObject(CJsonWriter &w, const webapi::FriendSnapshot &f)
+{
+	w.BeginObject();
+	// The friend's own EC handle; `client_ecid` below points OUT of this object. Like
+	// every ECID it does not survive an amuled restart -- `user_hash` is the durable
+	// reference, when the friend has one.
+	w.Key("ecid");
+	w.ValueInt(static_cast<int64_t>(f.ecid));
+	w.Key("name");
+	w.ValueString(wxString::FromUTF8(f.name.c_str()));
+	w.Key("user_hash");
+	w.ValueString(wxString::FromUTF8(f.user_hash.c_str()));
+	// null rather than "" when the daemon has not reported an address (R10).
+	WriteStringOrNull(w, "ip", !f.ip.empty(), f.ip);
+	// Paired with ip, the way WriteKnownClientObject nulls ip/port/kad_port
+	// together: a 0 port on an address-less friend is the R10 sentinel.
+	WriteIntOrNull(w, "port", !f.ip.empty(), static_cast<int64_t>(f.port));
+	// The live peer this friend is linked to, joinable against /clients. null rather
+	// than 0 when not connected: a client joining naively on the raw value was building
+	// GET /clients/0 and taking a 404.
+	WriteIntOrNull(w, "client_ecid", f.client_ecid != 0, static_cast<int64_t>(f.client_ecid));
+	// Whether a socket to the peer is actually up, not whether the daemon holds a
+	// client object for it -- which it does from the first contact ATTEMPT. null when
+	// the daemon predates EC_TAG_CLIENT_CONNECTED: unknown, not offline.
+	WriteBoolOrNull(w, "connected", f.has_connected, f.connected);
+	w.Key("friend_slot");
+	w.ValueBool(f.friend_slot);
+	w.EndObject();
+}
+
+CHttpServer::Response CApiDispatcher::HandleServers(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	ListParams params;
+	if (auto err = ParseListParams(QueryOf(req), params))
+		return *err;
+	static const ListComparators<webapi::ServerSnapshot> kComps = {
+		// Identity column: immutable, so a keyset sweep can anchor on it.
+		{ "ecid", SORT_BY(ecid), ANCHOR_ON_NUM(ecid) },
+		{ "name", SORT_BY(name) },
+		// R7: spelled like the response keys they order by.
+		{ "user_count", SORT_BY(users) },
+		{ "ping_ms", SORT_BY(ping_ms) },
+		{ "file_count", SORT_BY(files) },
+	};
+	return ListResponse(m_state, "servers", m_state.Servers(), WriteServerObject, params, kComps);
+}
+
+namespace
+{
+
+// Parse an integer ECID from a path capture. Returns false on negative,
+// overflow, or non-digit content.
+bool ParseEcidPath(const std::string &s, std::uint32_t &out)
+{
+	if (s.empty())
+		return false;
+	char *end = nullptr;
+	// strtoull (not strtoul) because `unsigned long` is 32-bit on Windows -- there the
+	// `v > 0xFFFFFFFFu` guard below would be a tautology and an out-of-range segment
+	// like `99999999999` would saturate to 0xFFFFFFFF, silently matching an actual ECID
+	// 0xFFFFFFFF.
+	errno = 0;
+	const unsigned long long v = std::strtoull(s.c_str(), &end, 10);
+	if (end == s.c_str() || *end != '\0')
+		return false;
+	if (errno == ERANGE)
+		return false;
+	if (v > 0xFFFFFFFFull)
+		return false;
+	out = static_cast<std::uint32_t>(v);
+	return true;
+}
+
+// Path-capture counterpart to RequireSnapshot above, used the same way:
+// ` if (auto r = RequireEcidPath(caps"ecid", ecid)) return *r;`. The status, the
+// code and the sentence are part of the API contract, not local wording.
+std::unique_ptr<CHttpServer::Response> RequireEcidPath(const std::string &s, std::uint32_t &out)
+{
+	if (!ParseEcidPath(s, out)) {
+		return BadRequestPtr("path `{ecid}` must be a non-negative integer");
+	}
+	return nullptr;
+}
+
+// The FindXByEcid family. The EC remove/slot ops are idempotent about unknown
+// ids, so handlers look the id up first and 404 rather than answer a cheerful 200.
+bool FindServerByEcid(const webapi::CState &state, std::uint32_t ecid, webapi::ServerSnapshot &out)
+{
+	const auto all = state.Servers();
+	for (const auto &s : all) {
+		if (s.ecid == ecid) {
+			out = s;
+			return true;
+		}
+	}
+	return false;
+}
+
+bool FindClientByEcid(const webapi::CState &state, std::uint32_t ecid, webapi::ClientSnapshot &out)
+{
+	const auto all = state.Clients();
+	for (const auto &c : all) {
+		if (c.ecid == ecid) {
+			out = c;
+			return true;
+		}
+	}
+	return false;
+}
+
+// The category set as a client sees it, which is not quite what amuled holds.
+//
+// amuled's EC suppresses the whole `EC_TAG_PREFS_CATEGORIES` block when no custom
+// categories exist, and starts including index 0 once the first custom one is
+// added, so a synthetic index-0 entry is injected when missing. amuled's
+// `defaultcat` is also constructed with an empty title and path, so the name and
+// `directories.incoming_path` are filled in here -- unconditionally, or /categories/0
+// would answer "Default" on a daemon with no custom categories and "" as soon as
+// the operator added one.
+//
+// Both read routes go through here; mutations deliberately do not, since the
+// synthetic entry is a read-shape convenience with nothing behind it to PATCH.
+std::vector<webapi::CategorySnapshot> CategoriesWithDefault(const webapi::CState &state)
+{
+	std::vector<webapi::CategorySnapshot> cats = state.Categories();
+	const auto fill_default = &state(webapi::CategorySnapshot &c) {
+		c.name = "Default";
+		c.path = state.Preferences().directories.incoming_path;
+	};
+	for (auto &c : cats) {
+		if (c.index == 0) {
+			fill_default(c);
+			return cats;
+		}
+	}
+	webapi::CategorySnapshot d;
+	d.index = 0;
+	d.priority_code = 0; // PR_LOW (matches amuled default)
+	d.priority = "low";
+	fill_default(d);
+	cats.insert(cats.begin(), std::move(d));
+	return cats;
+}
+
+// Category counterpart to the FindXByEcid family above; three handlers walked
+// m_state.Categories() with the same loop.
+bool FindCategoryByIndex(const webapi::CState &state, std::uint8_t index, webapi::CategorySnapshot &out)
+{
+	for (const auto &c : state.Categories()) {
+		if (static_cast<std::uint8_t>(c.index) == index) {
+			out = c;
+			return true;
+		}
+	}
+	return false;
+}
+
+bool FindFriendByEcid(const webapi::CState &state, std::uint32_t ecid, webapi::FriendSnapshot &out)
+{
+	const auto all = state.Friends();
+	for (const auto &f : all) {
+		if (f.ecid == ecid) {
+			out = f;
+			return true;
+		}
+	}
+	return false;
+}
+
+} // namespace
+
+// --- Chat (issue #971) -------------------------------------------------
+//
+// Conversations are keyed on "<ip>:<port>", the readable form of the GUI_ID the
+// wire already uses. Stable across peer reconnects (unlike an ECID), needs no
+// invented identifier, and converts straight back to the GUI_ID the EC ops want.
+
+namespace
+{
+
+// Parse "<ip>:<port>" back into a GUI_ID. Strict on purpose: anything that is
+// not four dotted octets plus a port would address some other conversation.
+bool ParseChatPeerKey(const std::string &peer, std::uint64_t &out_gui_id)
+{
+	const std::size_t colon = peer.rfind(':');
+	if (colon == std::string::npos || colon == 0 || colon + 1 >= peer.size())
+		return false;
+
+	unsigned a = 0, b = 0, c = 0, d = 0;
+	char extra = 0;
+	if (std::sscanf(peer.substr(0, colon).c_str(), "%u.%u.%u.%u%c", &a, &b, &c, &d, &extra) != 4)
+		return false;
+	if (a > 255 || b > 255 || c > 255 || d > 255)
+		return false;
+
+	const std::string port_str = peer.substr(colon + 1);
+	if (port_str.find_first_not_of("0123456789") != std::string::npos)
+		return false;
+	const unsigned long port = std::strtoul(port_str.c_str(), nullptr, 10);
+	if (port == 0 || port > 65535)
+		return false;
+
+	// LSB-first, matching IPv4ToDotted and EC_TAG_CLIENT_USER_IP.
+	const std::uint32_t ip = static_cast<std::uint32_t>(a) | (static_cast<std::uint32_t>(b) << 8) |
+				 (static_cast<std::uint32_t>(c) << 16) |
+				 (static_cast<std::uint32_t>(d) << 24);
+	out_gui_id = (static_cast<std::uint64_t>(ip) << 16) | static_cast<std::uint64_t>(port);
+	return true;
+}
+
+void WriteChatMessageObject(CJsonWriter &w, const webapi::ChatMessageSnapshot &m)
+{
+	w.BeginObject();
+	w.Key("id");
+	w.ValueInt(static_cast<int64_t>(m.id));
+	w.Key("direction");
+	// "in" = from the peer, "out" = sent by us from ANY client: this API,
+	// amulegui, or the local GUI.
+	w.ValueString(wxString::FromAscii(m.outgoing ? "out" : "in"));
+	w.Key("text");
+	w.ValueString(wxString::FromUTF8(m.text.c_str()));
+	// null, not 0, when the core has not stamped it: the send response builds
+	// its echo through here before any timestamp exists.
+	WriteIntOrNull(w, "sent_at", m.timestamp != 0, static_cast<int64_t>(m.timestamp));
+	w.EndObject();
+}
+
+void WriteChatObject(CJsonWriter &w, const webapi::ChatSessionSnapshot &s)
+{
+	w.BeginObject();
+	w.Key("address");
+	w.ValueString(wxString::FromUTF8(s.PeerKey().c_str()));
+	w.Key("ip");
+	w.ValueString(wxString::FromUTF8(s.ip.c_str()));
+	w.Key("port");
+	w.ValueInt(static_cast<int64_t>(s.port));
+	w.Key("name");
+	w.ValueString(wxString::FromUTF8(s.DisplayName().c_str()));
+	// null rather than 0 for "no live connection" / "not a friend": 0 is not how
+	// this surface spells absence, and /clients/0 is a 404 waiting to happen.
+	WriteIntOrNull(w, "client_ecid", s.client_ecid != 0, static_cast<int64_t>(s.client_ecid));
+	WriteIntOrNull(w, "friend_ecid", s.friend_ecid != 0, static_cast<int64_t>(s.friend_ecid));
+	// Same rule as the /friends row: reachability, not object existence.
+	WriteBoolOrNull(w, "connected", s.has_connected, s.connected);
+	w.Key("message_count");
+	w.ValueInt(static_cast<int64_t>(s.messages.size()));
+	w.Key("last_message_id");
+	w.ValueInt(static_cast<int64_t>(s.LastMsgId()));
+	// null, not 0: a session with no messages has no last-message time, and
+	// 0 reads as 1970 (R10).
+	WriteIntOrNull(w,
+		"last_message_at",
+		!s.messages.empty(),
+		static_cast<int64_t>(s.messages.empty() ? 0 : s.messages.back().timestamp));
+	// The transcript itself is deliberately NOT on the list: a 50-session store at 200
+	// messages each would be 10 000 objects per list read. null, not omitted: a session
+	// with no messages yet has no last message.
+	w.Key("last_message");
+	if (!s.messages.empty())
+		WriteChatMessageObject(w, s.messages.back());
+	else
+		w.ValueNull();
+	w.EndObject();
+}
+
+const webapi::ChatSessionSnapshot *FindChat(
+	const std::vector<webapi::ChatSessionSnapshot> &chats, std::uint64_t gui_id)
+{
+	for (const webapi::ChatSessionSnapshot &s : chats) {
+		if (s.gui_id == gui_id)
+			return &s;
+	}
+	return nullptr;
+}
+
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandleKnownClients(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	// Never sent blind: a daemon predating EC_OP_GET_CLIENT_HISTORY reaches the
+	// unknown-opcode branch of ProcessRequest2(), which asserts before it reaches the
+	// EC_OP_FAILED it would otherwise answer with -- so simply trying the request takes
+	// the core down.
+	if (!m_app.IsServerClientHistoryActive()) {
+		return ErrorResponse(
+			503, "ec_unsupported", "the connected amuled does not serve the client history");
+	}
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	ListParams params;
+	if (auto err = ParseListParams(QueryOf(req), params))
+		return *err;
+
+	// One fetch per process. From here the refresher maintains it: every tick folds the
+	// connected peers back in, which is the whole of what can change -- credit totals
+	// only grow during a transfer and last-seen is written at disconnect. Two
+	// concurrent first requests can both fetch; the second replaces the first with an
+	// equivalent store, which is not worth a lock.
+	if (!m_state.KnownClientsLoaded()) {
+		std::vector<webapi::KnownClientSnapshot> rows;
+		std::unique_ptr<CECPacket> req_ec(new CECPacket(EC_OP_GET_CLIENT_HISTORY));
+		const CECPacket *resp = m_app.SendRecvSerialized(req_ec.get());
+		if (!resp) {
+			return ErrorResponse(503, "ec_unavailable", "the EC connection is unavailable");
+		}
+		const bool got_history = resp->GetOpCode() == EC_OP_CLIENT_HISTORY;
+		if (got_history) {
+			rows.reserve(resp->GetTagCount());
+			for (const CECTag &entry : *resp) {
+				if (entry.GetTagName() != EC_TAG_CLIENT)
+					continue;
+				rows.push_back(DecodeKnownClient(entry));
+			}
+		}
+		delete resp;
+		if (!got_history) {
+			// An answer we cannot read latches nothing: the store is loaded once
+			// and never re-read, so installing an empty one here would serve an
+			// empty history for the life of the process. No reachable path today,
+			// but the cost of being wrong is permanent.
+			return ErrorResponse(502,
+				"amuled_response_invalid",
+				"the core answered the history request with an unknown reply");
+		}
+		m_state.SetKnownClients(std::move(rows));
+	}
+
+	static const ListComparators<webapi::KnownClientSnapshot> kComps = {
+		// Identity column: immutable, so a keyset sweep can anchor on it.
+		{ "user_hash", SORT_BY(user_hash), ANCHOR_ON(user_hash) },
+		{ "name", SORT_BY(client_name) },
+		{ "software", SORT_BY(software) },
+		// R7: each value is spelled exactly like the response key it orders by.
+		{ "first_seen_at", SORT_BY(first_seen_at) },
+		{ "last_seen_at", SORT_BY(last_seen_at) },
+		{ "session_count", SORT_BY(session_count) },
+		{ "uploaded_bytes_total", SORT_BY(uploaded_bytes_total) },
+		{ "downloaded_bytes_total", SORT_BY(downloaded_bytes_total) },
+	};
+
+	// Built under the state's read lock: the store is never copied out, so the
+	// response is written straight from it.
+	CHttpServer::Response r;
+	m_state.WithKnownClients(&(const std::vector<webapi::KnownClientSnapshot> &rows) {
+		std::vector<const webapi::KnownClientSnapshot *> ptrs;
+		ptrs.reserve(rows.size());
+		for (const auto &rec : rows)
+			ptrs.push_back(&rec);
+		r = ListResponseFromPtrsUnlocked(
+			"known_clients", ptrs, WriteKnownClientObject, params, kComps);
+	});
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleClientDetail(
+	const CHttpServer::Request &req, const std::string &ecid_str)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	std::uint32_t ecid = 0;
+	if (auto r = RequireEcidPath(ecid_str, ecid))
+		return *r;
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+	webapi::ClientSnapshot cli;
+	if (!FindClientByEcid(m_state, ecid, cli)) {
+		return ErrorResponse(404, "not_found", "no client with that ECID in the current snapshot");
+	}
+
+	ComputePartProgressPercent(m_state, cli);
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	WriteClientDetailObject(w, cli);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleChats(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (!m_app.IsServerChatActive()) {
+		return ErrorResponse(
+			503, "ec_unsupported", "the connected amuled does not serve chat sessions");
+	}
+	// RequireSnapshot is ListResponse's job; params first so a malformed
+	// query is a 400 rather than a 503 while EC is still warming up.
+	ListParams params;
+	if (auto err = ParseListParams(QueryOf(req), params))
+		return *err;
+
+	// Served straight from the refresher snapshot -- no EC roundtrip per
+	// request. The daemon's order is most-recently-active first.
+	const std::vector<webapi::ChatSessionSnapshot> chats = m_state.Chats();
+
+	static const ListComparators<webapi::ChatSessionSnapshot> kComps = {
+		// Identity column: immutable, so a keyset sweep can anchor on it.
+		{ "client_ecid", SORT_BY(client_ecid), ANCHOR_ON_NUM(client_ecid) },
+		{ "last_message_at",
+			(const webapi::ChatSessionSnapshot &x, const webapi::ChatSessionSnapshot &y) {
+				const std::uint32_t xa = x.messages.empty() ? 0 : x.messages.back().timestamp;
+				const std::uint32_t ya = y.messages.empty() ? 0 : y.messages.back().timestamp;
+				return xa < ya;
+			} },
+		{ "name",
+			(const webapi::ChatSessionSnapshot &x, const webapi::ChatSessionSnapshot &y) {
+				return x.DisplayName() < y.DisplayName();
+			} },
+	};
+	return ListResponse(m_state, "chats", chats, WriteChatObject, params, kComps);
+}
+
+CHttpServer::Response CApiDispatcher::HandleChatMessages(
+	const CHttpServer::Request &req, const std::string &peer)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (!m_app.IsServerChatActive()) {
+		return ErrorResponse(
+			503, "ec_unsupported", "the connected amuled does not serve chat sessions");
+	}
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	std::uint64_t gui_id = 0;
+	if (!ParseChatPeerKey(peer, gui_id)) {
+		return ErrorResponse(400, "bad_request", "path `{address}` must be `<ip>:<port>`");
+	}
+
+	const std::vector<webapi::ChatSessionSnapshot> chats = m_state.Chats();
+	const webapi::ChatSessionSnapshot *session = FindChat(chats, gui_id);
+	if (!session) {
+		return ErrorResponse(404, "not_found", "no chat session with that peer");
+	}
+
+	// `since_message_id` is a safe polling cursor: ids are monotonic per daemon
+	// process, so a client never sees a duplicate and never skips one. They reset when
+	// the daemon restarts, which also empties the store.
+	std::uint32_t since_id = 0;
+	std::size_t tail = 0;
+	const auto qmap = web_api_path::ParseQuery(QueryOf(req));
+	{
+		std::uint64_t v = since_id;
+		if (auto r = ParseUintParam(qmap, "since_message_id", 0, 0xFFFFFFFFull, v))
+			return *r;
+		since_id = static_cast<std::uint32_t>(v);
+	}
+	{
+		// `tail`, not `limit`. This selects the last N of the window rather than a page
+		// of it, which is what the log endpoints already call `tail`; `limit` is the
+		// paginated meaning on nine other collections.
+		std::uint64_t v = tail;
+		if (auto r = ParseUintParam(qmap, "tail", 0, 100000, v))
+			return *r;
+		tail = static_cast<std::size_t>(v);
+	}
+
+	std::vector<const webapi::ChatMessageSnapshot *> selected;
+	for (const webapi::ChatMessageSnapshot &m : session->messages) {
+		if (m.id > since_id)
+			selected.push_back(&m);
+	}
+	// `tail` means the LAST n, matching "show me the tail of this conversation";
+	// combined with since_id it trims the same window from the front, so the newest are
+	// always the ones kept.
+	if (tail && selected.size() > tail) {
+		selected.erase(selected.begin(), selected.end() - static_cast<std::ptrdiff_t>(tail));
+	}
+
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("address");
+	w.ValueString(wxString::FromUTF8(session->PeerKey().c_str()));
+	w.Key("messages");
+	w.BeginArray();
+	for (const webapi::ChatMessageSnapshot *m : selected)
+		WriteChatMessageObject(w, *m);
+	w.EndArray();
+	w.Key("total");
+	w.ValueInt(static_cast<int64_t>(session->messages.size()));
+	w.Key("last_message_id");
+	w.ValueInt(static_cast<int64_t>(session->LastMsgId()));
+	w.EndObject();
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// Shared by all three send forms. `target` is the already-built EC tag naming the
+// recipient -- a GUI_ID, a live peer's ECID, or a friend's ECID. The friend form is
+// the one that reaches an OFFLINE friend, via the stored ip:port.
+CHttpServer::Response CApiDispatcher::SendChatMessageTo(const CHttpServer::Request &req, const CECTag &target)
+{
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+	const auto it = obj.find("text");
+	if (it == obj.end() || !it->second.is<std::string>()) {
+		return ErrorResponse(400, "bad_request", "required string field `text` is missing");
+	}
+	const std::string text = it->second.get<std::string>();
+	if (text.empty()) {
+		return ErrorResponse(400, "bad_request", "`text` must be a non-empty string");
+	}
+	const std::size_t kMaxChatText = 1024;
+	if (text.size() > kMaxChatText) {
+		return ErrorResponse(400, "bad_request", "`text` exceeds 1024 bytes");
+	}
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_CHAT_SEND));
+	ec_req->AddTag(CECTag(EC_TAG_CHAT, wxString::FromUTF8(text.c_str())));
+	ec_req->AddTag(target);
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for chat send");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(404, "not_found", ec_err_msg.c_str());
+	}
+	std::uint64_t gui_id = 0;
+	std::uint32_t msg_id = 0;
+	if (const CECTag *t = ec_resp->GetTagByName(EC_TAG_CHAT_CLIENT_ID))
+		gui_id = t->GetInt();
+	if (const CECTag *t = ec_resp->GetTagByName(EC_TAG_CHAT_MSG_ID))
+		msg_id = static_cast<std::uint32_t>(t->GetInt());
+	delete ec_resp;
+
+	// 202, not 200: the core acknowledges that it queued the message on the peer
+	// connection, not that the peer received it. An unreachable peer is not an error --
+	// the desktop optimistically prints *** Connecting to Client ***.
+	CJsonWriter w;
+	w.BeginObject();
+	// The nested `message` object is the created resource, built through the same writer
+	// GET /chats/{address}/messages uses. `sent_at` is null here and only here:
+	// EC_OP_CHAT_SEND answers with ids and no timestamp.
+	w.Key("address");
+	w.ValueString(wxString::FromUTF8(webapi::ChatPeerKeyFromGuiId(gui_id).c_str()));
+	w.Key("message");
+	webapi::ChatMessageSnapshot sent;
+	sent.id = msg_id;
+	sent.outgoing = true;
+	sent.text = text;
+	WriteChatMessageObject(w, sent);
+	w.EndObject();
+	CHttpServer::Response r;
+	r.status = 202;
+	r.content_type = "application/json";
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleChatSend(const CHttpServer::Request &req, const std::string &peer)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (!m_app.IsServerChatActive()) {
+		return ErrorResponse(
+			503, "ec_unsupported", "the connected amuled does not serve chat sessions");
+	}
+	std::uint64_t gui_id = 0;
+	if (!ParseChatPeerKey(peer, gui_id)) {
+		return ErrorResponse(400, "bad_request", "path `{address}` must be `<ip>:<port>`");
+	}
+	// No 404 for an unknown peer here: the core creates the session if it does
+	// not exist, so this doubles as "start a chat with this address".
+	return SendChatMessageTo(req, CECTag(EC_TAG_CHAT_CLIENT_ID, gui_id));
+}
+
+CHttpServer::Response CApiDispatcher::HandleChatClose(
+	const CHttpServer::Request &req, const std::string &peer)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (!m_app.IsServerChatActive()) {
+		return ErrorResponse(
+			503, "ec_unsupported", "the connected amuled does not serve chat sessions");
+	}
+	std::uint64_t gui_id = 0;
+	if (!ParseChatPeerKey(peer, gui_id)) {
+		return ErrorResponse(400, "bad_request", "path `{address}` must be `<ip>:<port>`");
+	}
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_CHAT_CLOSE_SESSION));
+	ec_req->AddTag(CECTag(EC_TAG_CHAT_CLIENT_ID, gui_id));
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for chat close");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(404, "not_found", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	CHttpServer::Response r;
+	r.status = 204;
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleFriends(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	ListParams params;
+	if (auto err = ParseListParams(QueryOf(req), params))
+		return *err;
+	static const ListComparators<webapi::FriendSnapshot> kComps = {
+		// Identity column: immutable, so a keyset sweep can anchor on it.
+		{ "ecid", SORT_BY(ecid), ANCHOR_ON_NUM(ecid) },
+		{ "name", SORT_BY(name) },
+		{ "connected",
+			(const webapi::FriendSnapshot &a, const webapi::FriendSnapshot &b) {
+				return (a.client_ecid != 0) < (b.client_ecid != 0);
+			} },
+	};
+	// Served from the refresher snapshot: the friends list rides along with
+	// every GET_UPDATE, so this costs no EC roundtrip of its own.
+	return ListResponse(m_state, "friends", m_state.Friends(), WriteFriendObject, params, kComps);
+}
+
+CHttpServer::Response CApiDispatcher::HandleFriendAdd(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+
+	const bool has_client = obj.find("client_ecid") != obj.end();
+	const bool has_manual = obj.find("ip") != obj.end() || obj.find("port") != obj.end() ||
+				obj.find("user_hash") != obj.end();
+	if (has_client && has_manual) {
+		return ErrorResponse(400,
+			"bad_request",
+			"`client_ecid` and the ip/port/user_hash form are mutually exclusive");
+	}
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_FRIEND));
+	CECEmptyTag addtag(EC_TAG_FRIEND_ADD);
+
+	if (has_client) {
+		// Promote a connected peer, the desktop's "Add to Friends" item.
+		const auto &v = obj.at("client_ecid");
+		if (!v.is<double>() || v.get<double>() < 0 ||
+			v.get<double>() != static_cast<double>(static_cast<std::int64_t>(v.get<double>()))) {
+			return ErrorResponse(
+				400, "bad_request", "`client_ecid` must be a non-negative integer");
+		}
+		const std::uint32_t client_ecid = static_cast<std::uint32_t>(v.get<double>());
+		webapi::ClientSnapshot peer;
+		if (!FindClientByEcid(m_state, client_ecid, peer)) {
+			return ErrorResponse(404, "not_found", "no connected client with that `client_ecid`");
+		}
+		addtag.AddTag(CECTag(EC_TAG_CLIENT, client_ecid));
+	} else {
+		// Manual add. The EC handler wants all four tags present, so an omitted
+		// hash is sent empty and an omitted name defaults to the address.
+		std::string ip_str;
+		{
+			const auto it = obj.find("ip");
+			if (it == obj.end() || !it->second.is<std::string>()) {
+				return ErrorResponse(
+					400, "bad_request", "required string field `ip` is missing");
+			}
+			ip_str = it->second.get<std::string>();
+		}
+		std::uint32_t ip_he = 0;
+		if (!ParseIpv4Dotted(ip_str, ip_he) || ip_he == 0) {
+			return ErrorResponse(
+				400, "bad_request", "`ip` must be a non-zero dotted IPv4 address");
+		}
+		std::uint16_t port = 0;
+		{
+			const auto it = obj.find("port");
+			if (it == obj.end() || !it->second.is<double>()) {
+				return ErrorResponse(
+					400, "bad_request", "required integer field `port` is missing");
+			}
+			const double d = it->second.get<double>();
+			if (!IsIntegralJsonNumber(d) || d < 1 || d > 65535) {
+				return ErrorResponse(
+					400, "bad_request", "`port` must be an integer in 1..65535");
+			}
+			port = static_cast<std::uint16_t>(d);
+		}
+		CMD4Hash hash;
+		{
+			const auto it = obj.find("user_hash");
+			if (it != obj.end()) {
+				if (!it->second.is<std::string>()) {
+					return ErrorResponse(
+						400, "bad_request", "`user_hash` must be a string");
+				}
+				const std::string h = it->second.get<std::string>();
+				if (!h.empty() && !hash.Decode(wxString::FromUTF8(h.c_str()))) {
+					return ErrorResponse(400,
+						"bad_request",
+						"`user_hash` must be 32 hexadecimal characters");
+				}
+			}
+		}
+		std::string name;
+		{
+			const auto it = obj.find("name");
+			if (it != obj.end()) {
+				if (!it->second.is<std::string>()) {
+					return ErrorResponse(400, "bad_request", "`name` must be a string");
+				}
+				name = it->second.get<std::string>();
+			}
+		}
+		if (name.empty()) {
+			name = ip_str;
+		}
+		addtag.AddTag(CECTag(EC_TAG_FRIEND_HASH, hash));
+		addtag.AddTag(CECTag(EC_TAG_FRIEND_IP, ip_he));
+		addtag.AddTag(CECTag(EC_TAG_FRIEND_PORT, port));
+		addtag.AddTag(CECTag(EC_TAG_FRIEND_NAME, wxString::FromUTF8(name.c_str())));
+	}
+	ec_req->AddTag(addtag);
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for FRIEND add");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	// Tick so the new record is in the snapshot the caller's follow-up GET
+	// reads, even though this response does not carry it.
+	(void)RefresherTick(m_app, m_state);
+
+	CHttpServer::Response r;
+	// 202 with no body: EC's FRIEND op answers success or failure and never returns the
+	// created object, so naming it here would mean diffing the snapshot against a
+	// pre-add copy and hoping the inline refresh won.
+	r.status = 202;
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleFriendRemove(
+	const CHttpServer::Request &req, const std::string &ecid_str)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	std::uint32_t ecid = 0;
+	if (auto r = RequireEcidPath(ecid_str, ecid))
+		return *r;
+	webapi::FriendSnapshot existing;
+	if (!FindFriendByEcid(m_state, ecid, existing)) {
+		return ErrorResponse(404, "not_found", "no friend with that ecid");
+	}
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_FRIEND));
+	CECEmptyTag removetag(EC_TAG_FRIEND_REMOVE);
+	removetag.AddTag(CECTag(EC_TAG_FRIEND, ecid));
+	ec_req->AddTag(removetag);
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for FRIEND remove");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	(void)RefresherTick(m_app, m_state);
+
+	CHttpServer::Response r;
+	// 204 with no body -- see the mutation-response rule in REFERENCE.md.
+	r.status = 204;
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleFriendPatch(
+	const CHttpServer::Request &req, const std::string &ecid_str)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	std::uint32_t ecid = 0;
+	if (auto r = RequireEcidPath(ecid_str, ecid))
+		return *r;
+	webapi::FriendSnapshot existing;
+	if (!FindFriendByEcid(m_state, ecid, existing)) {
+		return ErrorResponse(404, "not_found", "no friend with that ecid");
+	}
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+	const auto it = obj.find("friend_slot");
+	if (it == obj.end() || !it->second.is<bool>()) {
+		return ErrorResponse(400, "bad_request", "required boolean field `friend_slot` is missing");
+	}
+	const bool slot = it->second.get<bool>();
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_FRIEND));
+	CECTag slottag(EC_TAG_FRIEND_FRIENDSLOT, slot);
+	slottag.AddTag(CECTag(EC_TAG_FRIEND, ecid));
+	ec_req->AddTag(slottag);
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for FRIEND slot");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	// Only one friend can hold the slot, so granting it here clears whoever held it
+	// before -- the tick picks up both changes and both emit an SSE event, not just the
+	// friend named in the URL.
+	(void)RefresherTick(m_app, m_state);
+
+	webapi::FriendSnapshot updated;
+	if (!FindFriendByEcid(m_state, ecid, updated)) {
+		return ErrorResponse(404, "not_found", "friend disappeared while setting the slot");
+	}
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	WriteFriendObject(w, updated);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleServerAdd(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+
+	std::string address;
+	{
+		const auto it = obj.find("address");
+		if (it == obj.end() || !it->second.is<std::string>()) {
+			return ErrorResponse(400,
+				"bad_request",
+				"required string field `address` is missing (\"host:port\")");
+		}
+		address = it->second.get<std::string>();
+		const std::size_t colon = address.find(':');
+		if (colon == std::string::npos || colon == 0 || colon == address.size() - 1) {
+			return ErrorResponse(400, "bad_request", "`address` must be in \"host:port\" form");
+		}
+	}
+	std::string name;
+	{
+		const auto it = obj.find("name");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>()) {
+				return ErrorResponse(400, "bad_request", "`name` must be a string");
+			}
+			name = it->second.get<std::string>();
+		}
+	}
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SERVER_ADD));
+	ec_req->AddTag(CECTag(EC_TAG_SERVER_ADDRESS, wxString::FromUTF8(address.c_str())));
+	if (!name.empty()) {
+		ec_req->AddTag(CECTag(EC_TAG_SERVER_NAME, wxString::FromUTF8(name.c_str())));
+	}
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for SERVER_ADD");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	// Inline refresh so the new server is in the next /servers response.
+	(void)RefresherTick(m_app, m_state);
+
+	CHttpServer::Response r;
+	// 202 with no body: amuled's EC op answers success or failure and does not
+	// return the created object, so anything reported here would be a guess.
+	r.status = 202;
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleServerConnect(
+	const CHttpServer::Request &req, const std::string &ecid_str)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	std::uint32_t ecid = 0;
+	if (auto r = RequireEcidPath(ecid_str, ecid))
+		return *r;
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+	webapi::ServerSnapshot srv;
+	if (!FindServerByEcid(m_state, ecid, srv)) {
+		return ErrorResponse(404, "not_found", "no server with that ECID in the current snapshot");
+	}
+
+	// EC_OP_SERVER_CONNECT routes through Get_EC_Response_Server, which looks the
+	// server up by IPv4 (ExternalConn.cpp), so build EC_TAG_SERVER with the IPv4 and
+	// port from our cache.
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SERVER_CONNECT));
+	ec_req->AddTag(CECTag(EC_TAG_SERVER, EC_IPv4_t(srv.ip, srv.port)));
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for SERVER_CONNECT");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	// Inline refresh so /status reflects "connecting" immediately.
+	(void)RefresherTick(m_app, m_state);
+
+	CHttpServer::Response r;
+	// 202: the connect is asynchronous -- the outcome shows up on /status and SSE.
+	r.status = 202;
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleServerDelete(
+	const CHttpServer::Request &req, const std::string &ecid_str)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	std::uint32_t ecid = 0;
+	if (auto r = RequireEcidPath(ecid_str, ecid))
+		return *r;
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+	webapi::ServerSnapshot srv;
+	if (!FindServerByEcid(m_state, ecid, srv)) {
+		return ErrorResponse(404, "not_found", "no server with that ECID in the current snapshot");
+	}
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SERVER_REMOVE));
+	ec_req->AddTag(CECTag(EC_TAG_SERVER, EC_IPv4_t(srv.ip, srv.port)));
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for SERVER_REMOVE");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	(void)RefresherTick(m_app, m_state);
+
+	CHttpServer::Response r;
+	// 204 with no body -- see the mutation-response rule in REFERENCE.md.
+	r.status = 204;
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleServerUpdateFromUrl(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	// amuled streams the new server list into its CServerList asynchronously over the
+	// next few ticks (CServerList::UpdateServerMetFromURL), so the `server_added` SSE
+	// events keep firing on subsequent natural ticks.
+	static const UrlFetchSpec kSpec = {
+		"url", EC_OP_SERVER_UPDATE_FROM_URL, EC_TAG_SERVERS_UPDATE_URL, true, true
+	};
+	std::string url;
+	CHttpServer::Response rejection;
+	if (!ResolveFetchUrl(req, kSpec, nullptr, url, rejection)) {
+		return rejection;
+	}
+	return UrlFetchOp(m_app, m_state, kSpec, url);
+}
+
+// One "<ip>:<port>" selector, parsed. Split out from the lookup so a selector that
+// cannot be parsed is distinguishable from one that parses but names no server we
+// know -- a 400 and a 404 respectively.
+struct IpPortSelector
+{
+	std::uint32_t ip_he; // host order, as ServerSnapshot::ip holds it
+	std::uint16_t port;
+};
+
+// Accepts a dotted quad and a port in 1..65535, nothing else. Hostname forms are
+// deliberately rejected: matching ServerSnapshot::address would match the wire
+// "name" tag, which can be a synthetic display string ("Eserver No.1"), so a DELETE
+// by address could remove the wrong row. boost::optional, not std::optional: the
+// house spelling in this file.
+boost::optional<IpPortSelector> ParseIpPortSelector(const std::string &ip_port)
+{
+	const auto colon = ip_port.rfind(':');
+	if (colon == std::string::npos)
+		return boost::none;
+
+	const std::string ip_str = ip_port.substr(0, colon);
+	const std::string port_str = ip_port.substr(colon + 1);
+	if (ip_str.empty() || port_str.empty())
+		return boost::none;
+
+	char *end = nullptr;
+	const unsigned long port = std::strtoul(port_str.c_str(), &end, 10);
+	if (end == port_str.c_str() || *end != '\0' || port == 0 || port > 0xFFFF)
+		return boost::none;
+
+	// Only genuine syntax failures are reported here. 0.0.0.0 parses fine and is
+	// rejected by the caller instead, so the two get error messages that describe what
+	// actually happened.
+	IpPortSelector sel;
+	sel.ip_he = 0;
+	if (!ParseIpv4Dotted(ip_str, sel.ip_he))
+		return boost::none;
+
+	sel.port = static_cast<std::uint16_t>(port);
+	return sel;
+}
+
+// Resolve a selector to a server ECID, in the same shape as RequireAdmin and
+// RequireSnapshot: nullptr means @a ecid is set and the caller may proceed,
+// otherwise it is the response to return.
+std::unique_ptr<CHttpServer::Response> ResolveServerEcid(
+	const webapi::CState &state, const std::string &ip_port, std::uint32_t &ecid)
+{
+	const auto sel = ParseIpPortSelector(ip_port);
+	if (!sel) {
+		return std::make_unique<CHttpServer::Response>(ErrorResponse(400,
+			"bad_request",
+			"malformed ip:port selector: expected a dotted quad and a port in 1..65535"));
+	}
+	// 0.0.0.0 is well-formed but is not a server address, and must not reach the lookup
+	// below: a ServerSnapshot whose EC_TAG_SERVER_IP the daemon did not ship keeps
+	// `ip == 0`, so a 0.0.0.0 selector would resolve to whichever such row happened to
+	// share the port -- acting on a server the caller never named.
+	if (sel->ip_he == 0) {
+		return std::make_unique<CHttpServer::Response>(
+			ErrorResponse(400, "bad_request", "0.0.0.0 is not a server address"));
+	}
+
+	for (const auto &s : state.Servers()) {
+		if (s.port == sel->port && s.ip == sel->ip_he) {
+			ecid = s.ecid;
+			return nullptr;
+		}
+	}
+	return std::make_unique<CHttpServer::Response>(
+		ErrorResponse(404, "not_found", "no server matches that ip:port"));
+}
+
+CHttpServer::Response CApiDispatcher::HandleServerConnectByAddress(
+	const CHttpServer::Request &req, const std::string &ip_port)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+	std::uint32_t ecid = 0;
+	if (auto r = ResolveServerEcid(m_state, ip_port, ecid))
+		return *r;
+	// Delegate to the ECID-keyed handler, passing the resolved ECID as a decimal string.
+	std::ostringstream os;
+	os << ecid;
+	return HandleServerConnect(req, os.str());
+}
+
+// PATCH /servers/{ecid} -- priority and/or static flag (#692).
+//
+// EC_OP_SERVER_SET_STATIC_PRIO carries EC_TAG_SERVER as a plain ECID integer,
+// unlike EC_OP_SERVER_REMOVE next door which carries an EC_IPv4_t. It applies
+// EC_TAG_SERVER_PRIO / EC_TAG_SERVER_STATIC only when present, so a partial update
+// is native to the wire. amuled answers EC_OP_NOOP whether or not the ECID
+// resolved, so the 404 has to come from checking the snapshot here.
+CHttpServer::Response CApiDispatcher::HandleServerPatch(
+	const CHttpServer::Request &req, const std::string &ecid_str)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	std::uint32_t ecid = 0;
+	if (auto r = RequireEcidPath(ecid_str, ecid))
+		return *r;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+
+	std::uint32_t prio_code = 0;
+	bool has_prio = false;
+	if (const auto it = obj.find("priority"); it != obj.end()) {
+		if (!it->second.is<std::string>()) {
+			return ErrorResponse(400, "bad_request", "`priority` must be a string");
+		}
+		if (!webapi::ServerPriorityCode(it->second.get<std::string>(), prio_code)) {
+			return ErrorResponse(
+				400, "bad_request", "`priority` must be one of low, normal, high");
+		}
+		has_prio = true;
+	}
+
+	bool is_static = false;
+	bool has_static = false;
+	if (const auto it = obj.find("permanent"); it != obj.end()) {
+		if (!it->second.is<bool>()) {
+			return ErrorResponse(400, "bad_request", "`permanent` must be a bool");
+		}
+		is_static = it->second.get<bool>();
+		has_static = true;
+	}
+
+	if (!has_prio && !has_static) {
+		return ErrorResponse(
+			400, "bad_request", "body must include at least one of `priority`, `permanent`");
+	}
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+	webapi::ServerSnapshot srv;
+	if (!FindServerByEcid(m_state, ecid, srv)) {
+		return ErrorResponse(404, "not_found", "no server with that ECID in the current snapshot");
+	}
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SERVER_SET_STATIC_PRIO));
+	ec_req->AddTag(CECTag(EC_TAG_SERVER, ecid));
+	if (has_prio) {
+		ec_req->AddTag(CECTag(EC_TAG_SERVER_PRIO, static_cast<std::uint8_t>(prio_code)));
+	}
+	if (has_static) {
+		ec_req->AddTag(CECTag(EC_TAG_SERVER_STATIC, static_cast<std::uint8_t>(is_static ? 1 : 0)));
+	}
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for SERVER_SET_STATIC_PRIO");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	// Inline refresh so the next GET /servers and the SSE stream show the new values.
+	(void)RefresherTick(m_app, m_state);
+
+	// A mutation answers with the resource -- see REFERENCE.md. The inline
+	// refresh above is what makes the re-read see the values just written.
+	webapi::ServerSnapshot s_after;
+	if (!FindServerByEcid(m_state, ecid, s_after)) {
+		// The server went away between the patch and the re-read. Nothing
+		// to describe, and inventing a body would be worse than saying so.
+		CHttpServer::Response gone;
+		gone.status = 204;
+		gone.content_type.clear();
+		return gone;
+	}
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	WriteServerObject(w, s_after);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// Address-keyed alias for the above, mirroring the connect / delete pair.
+CHttpServer::Response CApiDispatcher::HandleServerPatchByAddress(
+	const CHttpServer::Request &req, const std::string &ip_port)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+	std::uint32_t ecid = 0;
+	if (auto r = ResolveServerEcid(m_state, ip_port, ecid))
+		return *r;
+	std::ostringstream os;
+	os << ecid;
+	return HandleServerPatch(req, os.str());
+}
+
+CHttpServer::Response CApiDispatcher::HandleServerDeleteByAddress(
+	const CHttpServer::Request &req, const std::string &ip_port)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+	std::uint32_t ecid = 0;
+	if (auto r = ResolveServerEcid(m_state, ip_port, ecid))
+		return *r;
+	std::ostringstream os;
+	os << ecid;
+	return HandleServerDelete(req, os.str());
+}
+
+CHttpServer::Response CApiDispatcher::HandleCategories(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	// Injects the synthetic index-0 category -- see CategoriesWithDefault.
+	std::vector<webapi::CategorySnapshot> cats = CategoriesWithDefault(m_state);
+	ListParams params;
+	if (auto r = ParseListParams(QueryOf(req), params))
+		return *r;
+	return ListResponse(m_state, "categories", cats, WriteCategoryObject, params, CategoryComparators());
+}
+
+CHttpServer::Response CApiDispatcher::HandleKad(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	// Dashboard() rather than Kad(): `connected_since` below lives on the status
+	// snapshot, and taking both halves in one shared_lock keeps the timestamp
+	// describing the same tick as the rest of the payload.
+	const webapi::CState::DashboardSnapshot d = m_state.Dashboard();
+	const webapi::KadSnapshot &k = d.kad;
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	// Bare object (Q3 -- Kad is a single resource, not a list).
+	w.Key("state");
+	w.ValueString(wxString::FromUTF8(k.state.c_str()));
+	// Our own Kademlia node id, null while Kad is not running. Persisted by the daemon,
+	// so unlike every other identifier for the local node it survives a restart.
+	WriteStringOrNull(w, "node_id", !k.node_id.empty(), k.node_id);
+	// Two independent measurements, not a verdict and a refinement. firewalled_tcp is a
+	// vote needing two peers to confirm reachability; firewalled_udp is a directed
+	// test. LAN mode forces both to false. All three are null unless Kad is connected:
+	// firewalled_tcp comes from a connstate bit that outlives the disconnect, the
+	// others from defaults.
+	WriteBoolOrNull(w, "firewalled_tcp", k.has_firewalled_tcp, k.firewalled_tcp);
+	WriteBoolOrNull(w, "firewalled_udp", k.has_firewalled_udp, k.firewalled_udp);
+	WriteBoolOrNull(w, "lan_mode", k.has_lan_mode, k.lan_mode);
+	// Same value GET /status reports as kad.connected_since; 0 when
+	// not connected, so gate on `state` rather than on a nonzero.
+	w.Key("connected_since_at");
+	w.ValueInt(static_cast<int64_t>(d.status.kad_connected_since));
+	// Ours, as opposed to `buddy.ip` below -- which is why it is not plain `ip`.
+	WriteStringOrNull(w, "public_ip", !k.public_ip.empty(), k.public_ip);
+	WriteKadNetworkObject(w, k);
+	// Both objects are null-valued unless Kad is connected: amuled only ships these
+	// tags inside its own connected gate, so the numbers below were the struct defaults
+	// rather than a measurement.
+	w.Key("indexed");
+	w.BeginObject();
+	WriteIntOrNull(w, "sources", k.has_indexed, static_cast<int64_t>(k.indexed_sources));
+	WriteIntOrNull(w, "keywords", k.has_indexed, static_cast<int64_t>(k.indexed_keywords));
+	WriteIntOrNull(w, "notes", k.has_indexed, static_cast<int64_t>(k.indexed_notes));
+	WriteIntOrNull(w, "load_percent", k.has_indexed, static_cast<int64_t>(k.indexed_load));
+	w.EndObject();
+	w.Key("buddy");
+	w.BeginObject();
+	WriteStringOrNull(w, "state", k.has_buddy, k.buddy_status);
+	WriteStringOrNull(w, "ip", k.has_buddy, k.buddy_ip);
+	WriteIntOrNull(w, "port", k.has_buddy, static_cast<int64_t>(k.buddy_port));
+	w.EndObject();
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+namespace
+{
+
+// `?tail=N` parser. An absent parameter yields 0, which is every caller's contract
+// for "return everything". 100k lines is the cap: a bogus `?tail=2147483647` would
+// otherwise try to serialise the entire wxString through the JSON escaper.
+// Out-of-range values are a 400, never a silent clamp.
+std::unique_ptr<CHttpServer::Response> ParseTailParam(const std::string &query, std::size_t &out)
+{
+	const auto qmap = web_api_path::ParseQuery(query);
+	std::uint64_t v = 0;
+	if (auto r = ParseUintParam(qmap, "tail", 0, 100000, v))
+		return r;
+	out = static_cast<std::size_t>(v);
+	return nullptr;
+}
+
+// Return a copy of `all` with at most `tail` trailing lines; 0 means all.
+std::vector<std::string> SliceTail(const std::vector<std::string> &all, std::size_t tail)
+{
+	if (tail == 0 || all.size() <= tail)
+		return all;
+	return std::vector<std::string>(all.begin() + (all.size() - tail), all.end());
+}
+
+// For a single-string log, `?tail=N` slices at line boundaries from the END so
+// the first line of the response is always whole. tail=0 returns it verbatim.
+std::string TailString(const std::string &text, std::size_t tail_lines)
+{
+	if (tail_lines == 0 || text.empty())
+		return text;
+	std::size_t pos = text.size();
+	std::size_t seen = 0;
+	while (pos > 0 && seen < tail_lines) {
+		--pos;
+		if (textpos == '\n')
+			++seen;
+	}
+	// Advance past the leading '\n' so the response does not start blank.
+	if (pos < text.size() && textpos == '\n')
+		++pos;
+	return text.substr(pos);
+}
+
+} // namespace
+
+namespace
+{
+
+void WriteStatsValue(CJsonWriter &w, const webapi::StatsTreeValue &v)
+{
+	w.BeginObject();
+	w.Key("type");
+	w.ValueString(wxString::FromUTF8(v.type.c_str()));
+	w.Key("value");
+	switch (v.kind) {
+	case webapi::StatsTreeValue::Num:
+		w.ValueUInt(v.num);
+		break;
+	case webapi::StatsTreeValue::Dbl:
+		w.ValueDouble(v.dbl);
+		break;
+	case webapi::StatsTreeValue::Str:
+		w.ValueString(wxString::FromUTF8(v.str.c_str()));
+		break;
+	}
+	// Additive, locale-independent token for well-known sentinel values ("never" /
+	// "not_available"); the English "value" above is kept so old clients keep working.
+	// `token`, not `enum`: `enum` is reserved in C++, C#, Java, Rust, PHP and Swift, so
+	// a generated client could not name a field it.
+	WriteStringOrNull(w, "token", !v.enum_token.empty(), v.enum_token);
+	// Optional nested sub-value: percentage of parent, packet count, or
+	// all-time total depending on the node, so a client formats it from `type`.
+	w.Key("extra");
+	if (!v.extra.empty())
+		WriteStatsValue(w, v.extra.front());
+	else
+		w.ValueNull();
+	w.EndObject();
+}
+
+void WriteStatsNode(CJsonWriter &w, const webapi::StatsTreeNode &n)
+{
+	w.BeginObject();
+	// Stable machine key, when the daemon provides one. OMITTED rather than null when
+	// absent: absence means a daemon too old to send it, which REFERENCE.md's
+	// unknown-value rule keeps distinct from "there is no key".
+	if (!n.key.empty()) {
+		w.Key("key");
+		w.ValueString(wxString::FromUTF8(n.key.c_str()));
+	}
+	// Raw machine value (client version / OS string) for data-labelled nodes.
+	// `label_value`, not `raw`: for a row whose label is itself data ("v0.70b: %s") this
+	// carries the datum. null on a node whose label is not data -- there is no datum,
+	// as against the daemon not having sent one.
+	WriteStringOrNull(w, "label_value", !n.raw.empty(), n.raw);
+	w.Key("label");
+	w.ValueString(wxString::FromUTF8(n.label.c_str()));
+	w.Key("values");
+	w.BeginArray();
+	for (const auto &v : n.values)
+		WriteStatsValue(w, v);
+	w.EndArray();
+	// Raw numeric UL:DL ratio (download-per-upload), for the ratio node only. R11 puts
+	// the window in the key, the way uploaded_bytes_session / _total do. Each is
+	// emitted only when computable, so a legacy daemon yields neither.
+	if (n.has_ratio_session || n.has_ratio_total) {
+		if (n.has_ratio_session) {
+			w.Key("ratio_session");
+			w.ValueDouble(n.ratio_session);
+		}
+		if (n.has_ratio_total) {
+			w.Key("ratio_total");
+			w.ValueDouble(n.ratio_total);
+		}
+	}
+	w.Key("children");
+	w.BeginArray();
+	for (const auto &c : n.children)
+		WriteStatsNode(w, c);
+	w.EndArray();
+	w.EndObject();
+}
+
+// Render an array of (t, value) points walking backwards from snapshot_at: the
+// earliest sample corresponds to `snapshot_at - (samples.size()-1)*interval`.
+// `extra_a` / `extra_b` are optional series point-aligned with `samples`, emitted
+// under `key_a` / `key_b` beside each `value`. null or short (an amuled predating
+// the tag reports neither) leaves the keys off entirely, so a consumer can tell
+// "not reported" from "zero".
+void WritePointArray(CJsonWriter &w,
+	const std::vector<std::uint32_t> &samples,
+	std::time_t snapshot_at,
+	std::uint32_t interval,
+	std::size_t max_width,
+	const std::vector<std::uint32_t> *extra_a = nullptr,
+	const char *key_a = nullptr,
+	const std::vector<std::uint32_t> *extra_b = nullptr,
+	const char *key_b = nullptr)
+{
+	w.BeginArray();
+	if (samples.empty()) {
+		w.EndArray();
+		return;
+	}
+	const bool has_a = (extra_a != nullptr && extra_a->size() == samples.size() && key_a != nullptr);
+	const bool has_b = (extra_b != nullptr && extra_b->size() == samples.size() && key_b != nullptr);
+	const std::size_t start =
+		(max_width > 0 && samples.size() > max_width) ? samples.size() - max_width : 0;
+	for (std::size_t i = start; i < samples.size(); ++i) {
+		const std::time_t t =
+			snapshot_at - static_cast<std::time_t>((samples.size() - 1 - i) * interval);
+		w.BeginObject();
+		// One representation, unix seconds, named `_at` like every other time
+		// on the surface (R3). Formatting is a client concern.
+		w.Key("at");
+		w.ValueInt(static_cast<int64_t>(t));
+		w.Key("value");
+		w.ValueInt(static_cast<int64_t>(samplesi));
+		if (has_a) {
+			w.Key(key_a);
+			w.ValueInt(static_cast<int64_t>((*extra_a)i));
+		}
+		if (has_b) {
+			w.Key(key_b);
+			w.ValueInt(static_cast<int64_t>((*extra_b)i));
+		}
+		w.EndObject();
+	}
+	w.EndArray();
+}
+
+// The results-array element. Fields come from the shared writer so this endpoint
+// and the `search_result_added` SSE payload cannot drift; only the braces are ours.
+void WriteSearchObject(CJsonWriter &w, const webapi::SearchResult &r)
+{
+	w.BeginObject();
+	webapi::WriteSearchResultFields(w, r);
+	w.EndObject();
+}
+
+} // namespace
+
+namespace
+{
+// Reverse of SearchTypeFromString below. EC_SEARCH_LOCAL/GLOBAL/KAD share their
+// numeric values with CSearchList's own SearchType, which is what
+// EC_TAG_SEARCH_LIFECYCLE_KIND carries on the wire, so a plain uint8 in is enough:
+// no separate SearchType include needed here.
+wxString SearchKindToString(std::uint8_t kind)
+{
+	switch (kind) {
+	case EC_SEARCH_LOCAL:
+		return wxString::FromAscii("local");
+	case EC_SEARCH_KAD:
+		return wxString::FromAscii("kad");
+	case EC_SEARCH_BROWSE:
+		// A "View Files" browse of one peer's share. Reported, never accepted
+		// by SearchTypeFromString: browses are not started through /search.
+		return wxString::FromAscii("browse");
+	case EC_SEARCH_GLOBAL:
+	default:
+		return wxString::FromAscii("global");
+	}
+}
+
+// Shared by HandleSearchResults' `progress.state` and HandleSearchList's `state`, so
+// the two cannot drift. state_val is a raw CSearchList::SearchLifecycleState numeric
+// (IDLE=0/RUNNING=1/FINISHED=2); a static_assert in ExternalConn.cpp keeps that
+// alignment honest.
+wxString SearchLifecycleStateToString(std::uint8_t state_val)
+{
+	switch (state_val) {
+	case 2:
+		return wxString::FromAscii("finished");
+	case 1:
+		return wxString::FromAscii("running");
+	default:
+		return wxString::FromAscii("idle");
+	}
+}
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandleStatsTree(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	// ?max_client_versions=N caps how many per-software version rows the daemon
+	// serializes (EC_TAG_STATTREE_CAPPING). 0 is unlimited. Only the version lists are
+	// affected, not the OS breakdown or skeleton nodes.
+	std::uint8_t max_client_versions = 0;
+	{
+		std::string query;
+		const std::size_t q = req.target.find('?');
+		if (q != std::string::npos)
+			query = req.target.substr(q + 1);
+		const auto qmap = web_api_path::ParseQuery(query);
+		std::uint64_t v = max_client_versions;
+		if (auto r = ParseUintParam(qmap, "max_client_versions", 0, 255, v))
+			return *r;
+		max_client_versions = static_cast<std::uint8_t>(v);
+	}
+
+	// Lazy-fetch with 1 s TTL coalescing. The fetcher runs the EC roundtrip under
+	// m_app's m_ec_mtx (SendRecvSerialized); concurrent burst reads serialize on
+	// m_stats_tree_cache's mutex. The cache is unkeyed, so an entry fetched at a
+	// different cap counts as a miss.
+	auto pair = m_stats_tree_cache.GetOrFetch(
+		std::chrono::milliseconds(1000),
+		this, max_client_versions() -> TtlPair_StatsTree {
+			std::unique_ptr<CECPacket> req_ec(new CECPacket(EC_OP_GET_STATSTREE, EC_DETAIL_WEB));
+			req_ec->AddTag(CECTag(EC_TAG_STATTREE_CAPPING, max_client_versions));
+			const CECPacket *resp = m_app.SendRecvSerialized(req_ec.get());
+			webapi::StatsTreeNode tree;
+			std::time_t ts = 0;
+			if (resp) {
+				webapi::ParseStatsTreeFromPacket(resp, tree);
+				tree.max_client_versions = max_client_versions;
+				ts = std::time(nullptr);
+				delete resp;
+			}
+			return TtlPair_StatsTree(std::move(tree), ts);
+		},
+		max_client_versions(const TtlPair_StatsTree &c) {
+			return c.first.max_client_versions == max_client_versions;
+		});
+
+	if (pair.second == 0) {
+		return ErrorResponse(
+			503, "ec_unavailable", "EC fetch failed for stats tree; amuled may be disconnected");
+	}
+
+	const webapi::StatsTreeNode &root = pair.first;
+	const std::time_t ts = pair.second;
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	// No snapshot_at: the ETag is the cache validator. TtlPair_StatsTree still
+	// tracks the fetched-at time internally to drive the 1 s TTL coalescer.
+	(void)ts;
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("nodes");
+	w.BeginArray();
+	for (const auto &child : root.children)
+		WriteStatsNode(w, child);
+	w.EndArray();
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleStatsGraph(
+	const CHttpServer::Request &req, const std::string &graph)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	// Validate the graph name BEFORE fetching -- saves an EC roundtrip
+	// on tab-complete typos hitting /stats/graphs/<bogus>.
+	const char *unit = nullptr;
+	if (graph == "download_speed") {
+		unit = "bytes_per_second";
+	} else if (graph == "upload_speed") {
+		unit = "bytes_per_second";
+	} else if (graph == "connections") {
+		unit = "count";
+	} else if (graph == "kad_nodes") {
+		unit = "count";
+	} else {
+		return ErrorResponse(404,
+			"not_found",
+			"unknown graph; expected one of: download_speed, upload_speed, "
+			"connections, kad_nodes");
+	}
+
+	std::string query;
+	const std::size_t q = req.target.find('?');
+	if (q != std::string::npos)
+		query = req.target.substr(q + 1);
+	const auto qmap = web_api_path::ParseQuery(query);
+
+	// ?interval_seconds=N is the seconds between samples, passed through as
+	// EC_TAG_STATSGRAPH_SCALE. Rejected rather than clamped: 0 makes the daemon answer
+	// EC_OP_FAILED, which would reach the caller as an unexplained empty graph, and
+	// SCALE is a uint16 on the wire.
+	std::uint32_t interval = 1;
+	{
+		std::uint64_t v = interval;
+		// Named for its unit, and the same on the way in as on the way out:
+		// the response has always echoed `interval_seconds`.
+		if (auto r = ParseUintParam(qmap, "interval_seconds", 1, 3600, v))
+			return *r;
+		interval = static_cast<std::uint32_t>(v);
+	}
+
+	// Lazy-fetch the full graph bundle (one EC call serves all four named graphs). The
+	// cache is unkeyed, so an entry fetched at another interval has to count as a miss
+	// -- see CTtlCache's validated overload.
+	auto pair = m_stats_graphs_cache.GetOrFetch(
+		std::chrono::milliseconds(1000),
+		this, interval() -> TtlPair_StatsGraphs {
+			std::unique_ptr<CECPacket> req_ec(new CECPacket(EC_OP_GET_STATSGRAPHS));
+			req_ec->AddTag(CECTag(EC_TAG_STATSGRAPH_SCALE, static_cast<std::uint16_t>(interval)));
+			req_ec->AddTag(CECTag(EC_TAG_STATSGRAPH_WIDTH, static_cast<std::uint16_t>(1800)));
+			const CECPacket *resp = m_app.SendRecvSerialized(req_ec.get());
+			webapi::StatsGraphs g;
+			std::time_t ts = 0;
+			if (resp) {
+				webapi::ParseGraphsFromPacket(resp, g);
+				g.interval_seconds = interval;
+				ts = std::time(nullptr);
+				delete resp;
+			}
+			return TtlPair_StatsGraphs(std::move(g), ts);
+		},
+		interval(const TtlPair_StatsGraphs &c) { return c.first.interval_seconds == interval; });
+
+	if (pair.second == 0) {
+		return ErrorResponse(503,
+			"ec_unavailable",
+			"EC fetch failed for stats graphs; amuled may be disconnected");
+	}
+
+	const webapi::StatsGraphs &g = pair.first;
+	const std::vector<std::uint32_t> *series = nullptr;
+	if (graph == "download_speed") {
+		series = &g.download_bytes_per_second;
+	} else if (graph == "upload_speed") {
+		series = &g.upload_bytes_per_second;
+	} else if (graph == "connections") {
+		series = &g.connections;
+	} else /* kad_nodes */ {
+		series = &g.kad_nodes;
+	}
+
+	// ?width=N tails the sample count returned. Applied after the fetch, deliberately:
+	// the EC request always asks for the full window, so one cached bundle still answers
+	// every (graph, width) combination.
+	std::size_t width = 0;
+	{
+		std::uint64_t v = 0;
+		if (auto r = ParseUintParam(qmap, "width", 0, 1800, v))
+			return *r;
+		width = static_cast<std::size_t>(v);
+	}
+
+	const std::time_t ts = pair.second;
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("graph");
+	w.ValueString(wxString::FromUTF8(graph.c_str()));
+	w.Key("unit");
+	w.ValueString(wxString::FromUTF8(unit));
+	w.Key("interval_seconds");
+	w.ValueInt(static_cast<int64_t>(g.interval_seconds));
+	// How many points this daemon can answer with before it starts
+	// repeating records. `points` is never longer than this.
+	w.Key("max_points");
+	w.ValueInt(static_cast<int64_t>(g.max_points));
+	// No snapshot_at in the response; WritePointArray still consumes `ts` to anchor
+	// per-point timestamps backwards from the fetch wall-clock. The two extra series
+	// exist only on the connections graph.
+	w.Key("points");
+	if (graph == "connections") {
+		WritePointArray(w,
+			*series,
+			ts,
+			g.interval_seconds,
+			width,
+			&g.active_downloads,
+			"active_download_count",
+			&g.active_uploads,
+			"active_upload_count");
+	} else {
+		WritePointArray(w, *series, ts, g.interval_seconds, width);
+	}
+	// Session totals tag along -- no separate roundtrip. Divide any of the
+	// three by duration_seconds for the session average the desktop plots.
+	w.Key("session");
+	w.BeginObject();
+	// Past tense, like `downloaded_bytes_session` elsewhere: bytes already
+	// moved, not a rate. The `session` wrapper scopes them.
+	w.Key("downloaded_bytes");
+	w.ValueInt(static_cast<int64_t>(g.session_download_bytes));
+	w.Key("uploaded_bytes");
+	w.ValueInt(static_cast<int64_t>(g.session_upload_bytes));
+	w.Key("kad_node_seconds");
+	w.ValueInt(static_cast<int64_t>(g.session_kad_node_seconds));
+	w.Key("duration_seconds");
+	w.ValueInt(static_cast<int64_t>(g.session_duration_seconds));
+	w.EndObject();
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleSearchResults(
+	const CHttpServer::Request &req, std::uint32_t search_id)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	// Read straight from the refresher-maintained state: POST /search flips the active
+	// flag, RefresherTick polls amuled while active and stores the normalized (kind,
+	// percent, complete, active). An id that names no live slot (never started, freed,
+	// or evicted from the daemon's ring) is a 404, distinct from a known-but-empty
+	// search, which returns an idle envelope.
+	if (auto rej = RequireSearch(search_id))
+		return *rej;
+	// A FINISHED search is not polled by the tick, so its cached results would otherwise
+	// be frozen at the moment it completed. Refresh on read, coalesced by a short TTL.
+	RefreshSearchIfStale(search_id);
+	const std::vector<webapi::SearchResult> results_vec = m_state.Search(search_id);
+	const webapi::SearchProgressSnapshot progress = m_state.SearchProgress(search_id);
+
+	// This endpoint keeps its own envelope (`progress` rides alongside
+	// `results`), so it cannot call ListResponse, but it shares the helpers.
+	ListParams params;
+	if (auto err = ParseListParams(QueryOf(req), params))
+		return *err;
+	static const ListComparators<webapi::SearchResult> kComps = {
+		// Identity column: immutable, so a keyset sweep can anchor on it.
+		{ "hash", SORT_BY(hash), ANCHOR_ON(hash) },
+		{ "name", SORT_BY(name) },
+		// R7: spelled like the response keys they order by.
+		{ "size_bytes", SORT_BY(size) },
+		{ "sources.total", SORT_BY(source_count) },
+		{ "rating", SORT_BY(rating) },
+		// Browse listings are read folder by folder. Empty on server/Kad hits,
+		// so sorting a non-browse search by it is a stable no-op.
+		{ "directory", SORT_BY(directory) },
+	};
+	std::vector<const webapi::SearchResult *> window;
+	std::size_t total = 0;
+	if (auto err = BuildListWindow(results_vec, params, kComps, window, total))
+		return *err;
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("results");
+	w.BeginArray();
+	for (const webapi::SearchResult *item : window)
+		WriteSearchObject(w, *item);
+	w.EndArray();
+	WritePageMeta(w, total, params);
+	// Echoed even though the caller put it in the path: clients key tabs on it.
+	w.Key("search_id");
+	w.ValueInt(static_cast<int64_t>(search_id));
+	// What was searched for, so a client that adopted an id need not
+	// cross-reference /search to label its tab. For a browse, the peer's name.
+	w.Key("query");
+	w.ValueString(wxString::FromUTF8(m_state.SearchQuery(search_id).c_str()));
+	// state/type/percent carry the same semantics as the `search_progress` SSE event;
+	// search_id and the result count (the envelope's `total`) sit at the top level here,
+	// not inside progress. `state` encodes the full lifecycle, so no redundant
+	// `active` / `complete` booleans -- consumers derive them.
+	w.Key("progress");
+	w.BeginObject();
+	w.Key("state");
+	w.ValueString(SearchLifecycleStateToString(progress.complete ? 2 : progress.active ? 1 : 0));
+	// `type`, matching POST /search's body field and the searches row (R6).
+	w.Key("type");
+	w.ValueString(wxString::FromUTF8(progress.kind.c_str()));
+	w.Key("percent");
+	w.ValueInt(static_cast<int64_t>(progress.percent));
+	w.EndObject();
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+std::unique_ptr<CHttpServer::Response> CApiDispatcher::RequireSearch(std::uint32_t search_id)
+{
+	if (m_state.HasSearch(search_id))
+		return nullptr;
+	// Cache miss: before giving up, ask the core once whether it holds this id anyway --
+	// a search amulegui, the monolithic GUI or a previous amuleapi run started. Seeding
+	// it here is what lets a UI adopt one.
+	if (DiscoverSearchIfHeldByCore(search_id))
+		return nullptr;
+	return std::make_unique<CHttpServer::Response>(ErrorResponse(
+		404, "not_found", "no search with that search_id (never started, freed or expired)"));
+}
+
+void CApiDispatcher::RefreshSearchIfStale(std::uint32_t search_id)
+{
+	// ClaimSearchRefresh does the gating: it returns true only for a slot that exists,
+	// is not active, and has not been fetched within the TTL -- and it stamps the slot
+	// as it hands out the claim, so racing readers cost one roundtrip.
+	static constexpr std::chrono::milliseconds kSearchRefreshTtl{ 1000 };
+	if (!m_state.ClaimSearchRefresh(search_id, kSearchRefreshTtl))
+		return;
+	// A failed roundtrip leaves the cached results in place: serving the previous set
+	// beats failing a read that has a good answer.
+	//
+	// Deliberately the per-search FULL fetch and not the union. The union is a
+	// differential stream keyed on what the daemon has already sent this connection, so
+	// it tolerates exactly one issuer: with the refresher thread issuing it every tick,
+	// a second issuer here could have its reply applied out of order and leave a row no
+	// later poll can correct. A FULL reply carries the whole search and races nothing.
+	(void)webapi::FetchOneSearchFull(m_app, m_state, search_id);
+}
+
+// See the declaration in Api.h for why this is shared rather than inlined
+// at each call site.
+bool CApiDispatcher::DiscoverSearchIfHeldByCore(std::uint32_t search_id)
+{
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SEARCH_LIST));
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return false;
+	}
+	bool found = false;
+	for (const CECTag &entry : *ec_resp) {
+		if (static_cast<std::uint32_t>(entry.GetInt()) != search_id)
+			continue;
+		const CECTag *kindTag = entry.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_KIND);
+		// The list entry carries the daemon's name for the search -- the query
+		// string, or for a browse the peer's nickname.
+		const CECTag *nameTag = entry.GetTagByName(EC_TAG_SEARCH_NAME);
+		// ...and its lifecycle state. A finished search seeded as running is not
+		// cosmetic: POST /search/{id}/more rejects a finished search, so it would
+		// answer 202 for a request amuled turns into a no-op. 1 = running,
+		// 2 = finished (SearchLifecycleStateToString).
+		const CECTag *stateTag = entry.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_STATE);
+		const std::uint8_t state_val = stateTag ? static_cast<std::uint8_t>(stateTag->GetInt()) : 0;
+		// ...and the percent, when the daemon reports one. -1 means it did not
+		// (an older daemon); the seed then derives it from the lifecycle state.
+		const CECTag *pctTag = entry.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_PERCENT);
+		const int reported_pct = pctTag ? static_cast<int>(pctTag->GetInt()) : -1;
+		m_state.MarkSearchDiscovered(search_id,
+			SearchKindToString(
+				kindTag ? static_cast<std::uint8_t>(kindTag->GetInt()) : EC_SEARCH_GLOBAL)
+				.ToStdString(),
+			nameTag ? std::string(nameTag->GetStringData().utf8_str()) : std::string(),
+			state_val == 1,
+			state_val == 2,
+			reported_pct);
+		found = true;
+		break;
+	}
+	delete ec_resp;
+	if (found) {
+		// Seed the slot's results immediately, at EC_DETAIL_FULL. Waiting for the
+		// next union poll would leave it permanently empty: the union responder has
+		// very likely already offered these results, found no slot, dropped them,
+		// and will elide them from here on.
+		(void)webapi::FetchOneSearchFull(m_app, m_state, search_id);
+	}
+	return found;
+}
+
+// Enumerates every search the daemon currently holds via EC_OP_SEARCH_LIST, rather
+// than reading the Refresher-cached m_state, which only ever knows about searches
+// THIS session started with POST /search. That is what makes a search started by
+// another client discoverable here (amule-org/amule#641).
+CHttpServer::Response CApiDispatcher::HandleSearchList(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	ListParams params;
+	if (auto r = ParseListParams(QueryOf(req), params))
+		return *r;
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SEARCH_LIST));
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for SEARCH_LIST");
+	}
+
+	std::vector<SearchListRow> rows;
+	for (const CECTag &entry : *ec_resp) {
+		SearchListRow row;
+		row.search_id = static_cast<std::uint32_t>(entry.GetInt());
+		const CECTag *nameTag = entry.GetTagByName(EC_TAG_SEARCH_NAME);
+		row.query = nameTag ? nameTag->GetStringData() : wxString();
+		const CECTag *kindTag = entry.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_KIND);
+		row.kind = SearchKindToString(kindTag ? static_cast<std::uint8_t>(kindTag->GetInt()) : 0);
+		const CECTag *stateTag = entry.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_STATE);
+		row.state = SearchLifecycleStateToString(
+			stateTag ? static_cast<std::uint8_t>(stateTag->GetInt()) : 0);
+		// Browse ("View Files") entries carry the browsed peer's ecid -- without
+		// it a consumer cannot tell WHOSE share it is listing. Absent otherwise.
+		if (const CECTag *clientTag = entry.GetTagByName(EC_TAG_CLIENT)) {
+			row.has_client_ecid = true;
+			row.client_ecid = static_cast<std::uint32_t>(clientTag->GetInt());
+		}
+		// When THIS amuleapi started the search. Absent for one this process did
+		// not start, because a 0 would read as 1970 rather than "no idea".
+		row.started_at = m_state.SearchStartedAt(row.search_id);
+		// The same number GET /search/{id}/results reports as `total`. Absent when the
+		// daemon is older than the tag, so "does not report" stays distinguishable
+		// from "found nothing".
+		if (const CECTag *countTag = entry.GetTagByName(EC_TAG_SEARCH_RESULT_COUNT)) {
+			row.has_result_count = true;
+			row.result_count = static_cast<std::uint32_t>(countTag->GetInt());
+		}
+		rows.push_back(std::move(row));
+	}
+	delete ec_resp;
+
+	return ListResponse(m_state, "searches", rows, WriteSearchListRow, params, SearchListComparators());
+}
+
+CHttpServer::Response CApiDispatcher::HandleLogAmule(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	// request.target is the literal URI, e.g. "/api/v1/logs/amule?tail=200".
+	std::string path, query;
+	const size_t q = req.target.find('?');
+	if (q != std::string::npos) {
+		query = req.target.substr(q + 1);
+	}
+	std::size_t tail = 0;
+	if (auto r = ParseTailParam(query, tail))
+		return *r;
+	const auto all = m_state.AmuleLog();
+	const auto sliced = SliceTail(all, tail);
+
+	// Bare object (Q3): single resource, no list envelope.
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("lines");
+	w.BeginArray();
+	for (const auto &line : sliced) {
+		w.ValueString(wxString::FromUTF8(line.c_str()));
+	}
+	w.EndArray();
+	// Lets a client paging through history know what it missed.
+	w.Key("total_lines");
+	w.ValueInt(static_cast<int64_t>(all.size()));
+	w.Key("returned_lines");
+	w.ValueInt(static_cast<int64_t>(sliced.size()));
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleLogAmuleReset(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_RESET_LOG));
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed");
+	}
+	std::string ec_err;
+	if (IsEcFailedResponse(ec_resp, ec_err)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err.c_str());
+	}
+	delete ec_resp;
+
+	// Drop the in-process mirror. This also bumps the log's clear-generation, which the
+	// next refresher tick reads to publish a `resync` for every subscriber. Publishing
+	// it here is not open to us: the bus has a single-publisher invariant and this is
+	// the HTTP thread.
+	m_state.ClearAmuleLog();
+
+	CHttpServer::Response r;
+	r.status = 204;
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleLogServerinfo(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	std::string query;
+	const size_t q = req.target.find('?');
+	if (q != std::string::npos) {
+		query = req.target.substr(q + 1);
+	}
+	std::size_t tail = 0;
+	if (auto r = ParseTailParam(query, tail))
+		return *r;
+
+	// Lazy-fetch via TtlCache. EC_OP_GET_SERVERINFO ships one EC_TAG_STRING
+	// with the whole accumulated text; amuled rotates it server-side.
+	auto pair = m_server_info_cache.GetOrFetch(
+		std::chrono::milliseconds(1000), this() -> TtlPair_ServerInfo {
+			std::unique_ptr<CECPacket> req_ec(new CECPacket(EC_OP_GET_SERVERINFO));
+			const CECPacket *resp = m_app.SendRecvSerialized(req_ec.get());
+			webapi::ServerInfoLog log;
+			std::time_t ts = 0;
+			if (resp) {
+				if (const CECTag *t = resp->GetFirstTagSafe()) {
+					if (t->GetTagName() == EC_TAG_STRING) {
+						log.text = std::string(t->GetStringData().utf8_str());
+					}
+				}
+				ts = std::time(nullptr);
+				delete resp;
+			}
+			return TtlPair_ServerInfo(std::move(log), ts);
+		});
+
+	if (pair.second == 0) {
+		return ErrorResponse(
+			503, "ec_unavailable", "EC fetch failed for server info; amuled may be disconnected");
+	}
+
+	const webapi::ServerInfoLog &log = pair.first;
+	const std::string text = TailString(log.text, tail);
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("text");
+	w.ValueString(wxString::FromUTF8(text.c_str()));
+	// Lets a client decide whether to re-poll with a smaller `?tail=`.
+	w.Key("total_bytes");
+	w.ValueInt(static_cast<int64_t>(log.text.size()));
+	w.Key("returned_bytes");
+	w.ValueInt(static_cast<int64_t>(text.size()));
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleLogServerinfoReset(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_CLEAR_SERVERINFO));
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed");
+	}
+	std::string ec_err;
+	if (IsEcFailedResponse(ec_resp, ec_err)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err.c_str());
+	}
+	delete ec_resp;
+
+	// Lazy cache for /logs/server_info would otherwise return stale
+	// text until its 1 s TTL expires; force the next GET to re-fetch.
+	m_server_info_cache.Invalidate();
+
+	CHttpServer::Response r;
+	r.status = 204;
+	r.content_type.clear();
+	return r;
+}
+
+namespace
+{
+
+// Emit the full /preferences JSON object from the declarative field table
+// (PrefsSchema.cpp). Shared by the GET handler and the PATCH echo so the response
+// shape is defined exactly once.
+//
+// Categories whose name contains a dot are nested one level under their prefix
+// (remote_controls.webserver -> "remote_controls": {"webserver": {...}}). Write-only
+// rows (passwords) and Rejected rows are never emitted.
+void WritePrefFieldValue(CJsonWriter &w, const webapi::PrefField &f, const webapi::PreferencesSnapshot &p)
+{
+	// The accessor takes a non-const snapshot; emitting never mutates it.
+	webapi::PreferencesSnapshot &m = const_cast<webapi::PreferencesSnapshot &>(p);
+	switch (f.type) {
+	case webapi::PrefType::Bool:
+		w.ValueBool(*static_cast<bool *>(f.member(m)));
+		break;
+	case webapi::PrefType::Uint16:
+		w.ValueInt(static_cast<int64_t>(*static_cast<std::uint16_t *>(f.member(m))));
+		break;
+	case webapi::PrefType::Uint32:
+		w.ValueInt(static_cast<int64_t>(*static_cast<std::uint32_t *>(f.member(m))));
+		break;
+	case webapi::PrefType::String:
+	case webapi::PrefType::Enum:
+	case webapi::PrefType::Md4Hex:
+		w.ValueString(wxString::FromUTF8(static_cast<std::string *>(f.member(m))->c_str()));
+		break;
+	case webapi::PrefType::StringArray: {
+		w.BeginArray();
+		for (const std::string &s : *static_cast<std::vector<std::string> *>(f.member(m)))
+			w.ValueString(wxString::FromUTF8(s.c_str()));
+		w.EndArray();
+		break;
+	}
+	}
+}
+
+bool PrefFieldIsEmitted(const webapi::PrefField &f)
+{
+	return f.access != webapi::PrefAccess::WriteOnly && f.access != webapi::PrefAccess::Rejected;
+}
+
+void WritePrefCategoryFields(CJsonWriter &w, const char *category, const webapi::PreferencesSnapshot &p)
+{
+	for (std::size_t i = 0; i < webapi::PrefSchemaSize(); ++i) {
+		const webapi::PrefField &f = webapi::PrefSchema()i;
+		if (!PrefFieldIsEmitted(f) || std::strcmp(f.category, category) != 0)
+			continue;
+		w.Key(f.key);
+		WritePrefFieldValue(w, f, p);
+	}
+}
+
+void WritePreferencesBody(CJsonWriter &w, const webapi::PreferencesSnapshot &p)
+{
+	w.BeginObject();
+
+	std::string emitted; // top-level names already written, "|name|" separated
+	for (std::size_t c = 0; c < webapi::PrefCategoryCount(); ++c) {
+		const char *name = webapi::PrefCategories()c.name;
+		const char *dot = std::strchr(name, '.');
+		const std::string top = dot ? std::string(name, dot) : std::string(name);
+		if (emitted.find("|" + top + "|") != std::string::npos)
+			continue;
+		emitted += "|" + top + "|";
+
+		w.Key(top.c_str());
+		w.BeginObject();
+		WritePrefCategoryFields(w, top.c_str(), p);
+		for (std::size_t s = 0; s < webapi::PrefCategoryCount(); ++s) {
+			const char *sub = webapi::PrefCategories()s.name;
+			if (std::strncmp(sub, top.c_str(), top.size()) != 0 || subtop.size() != '.')
+				continue;
+			w.Key(sub + top.size() + 1);
+			w.BeginObject();
+			WritePrefCategoryFields(w, sub, p);
+			w.EndObject();
+		}
+		w.EndObject();
+	}
+
+	w.EndObject();
+}
+
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandlePreferences(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	const webapi::PreferencesSnapshot p = m_state.Preferences();
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	WritePreferencesBody(w, p);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+namespace
+{
+
+// Helpers that pull (& validate) optional fields from a JSON object. Each returns
+// true and writes `out` when present and the right shape; on wrong shape it writes
+// `err_label` for the caller to relay and returns false.
+struct PrefsParseError
+{
+	bool is_error = false;
+	std::string message;
+};
+
+// EC_OP_SET_PREFERENCES requires EC_DETAIL_FULL so the daemon honours boolean tags
+// (CEC_Prefs_Packet::Apply gates ApplyBoolean on it). FULL is also what amulegui
+// sends.
+
+// --- Generic optional-field extractors for the #437 categories -------
+//
+// Each pulls one optional key from a sub-object into the EC group tag, validating
+// its JSON type. Returns true (leaving `group` untouched) when the key is simply
+// absent. Booleans always pack as a value tag (uint8 0/1): Apply reads `GetInt()!=0`
+// under EC_DETAIL_FULL, so an empty presence tag would read as false. `scale`
+// converts the API value to the unit EC carries; `max` is checked before scaling, so
+// the error names the number the caller actually wrote.
+bool PrefTakeUint(const picojson::object &o,
+	CECTag &group,
+	const char *key,
+	ec_tagname_t name,
+	std::uint32_t min,
+	std::uint32_t max,
+	std::uint32_t step,
+	bool &any,
+	std::string &err,
+	std::uint32_t scale)
+{
+	const auto it = o.find(key);
+	if (it == o.end())
+		return true;
+	if (!it->second.is<double>()) {
+		err = std::string(key) + " must be a non-negative integer";
+		return false;
+	}
+	const double v = it->second.get<double>();
+	// Reject a fractional value rather than truncating it at the cast below. The step
+	// modulo further down is not a substitute: it runs on the already-truncated value,
+	// so it tests the floor's alignment and never integrality, and a field with no step
+	// skips it entirely.
+	if (!IsIntegralJsonNumber(v)) {
+		err = std::string(key) + " must be a non-negative integer";
+		return false;
+	}
+	if (v < 0 || v > static_cast<double>(max) || v < static_cast<double>(min)) {
+		// Name the bounds. These domains are narrower than the field's type for
+		// reasons a caller cannot infer, so "out of range" alone leaves them guessing.
+		err = std::string(key) + " out of range (" + std::to_string(min) + "-" + std::to_string(max) +
+		      ")";
+		return false;
+	}
+	// Quantised rows: the core's setter divides, so a value between two steps
+	// is truncated on the way in. Rejected rather than silently rounded.
+	if (step && (static_cast<std::uint64_t>(v) % step) != 0) {
+		err = std::string(key) + " must be a multiple of " + std::to_string(step);
+		return false;
+	}
+	const std::uint64_t scaled = static_cast<std::uint64_t>(v) * (scale ? scale : 1u);
+	group.AddTag(CECTag(name, static_cast<std::uint32_t>(scaled)));
+	any = true;
+	return true;
+}
+
+// invert=true stores the opposite of the JSON value in the EC tag, for
+// positive-sense API fields whose EC tag is negatively named (today only
+// extended_udp_port_enabled -> EC_TAG_CONN_UDP_DISABLE). A schema column, not a
+// special case in the caller.
+bool PrefTakeBool(const picojson::object &o,
+	CECTag &group,
+	const char *key,
+	ec_tagname_t name,
+	bool &any,
+	std::string &err,
+	bool invert)
+{
+	const auto it = o.find(key);
+	if (it == o.end())
+		return true;
+	if (!it->second.is<bool>()) {
+		err = std::string(key) + " must be a bool";
+		return false;
+	}
+	const bool v = it->second.get<bool>();
+	group.AddTag(CECTag(name, static_cast<std::uint8_t>((invert ? !v : v) ? 1 : 0)));
+	any = true;
+	return true;
+}
+
+// Enum field: the API spells the value out ("socks5", "friends", ...) while EC
+// carries the bare ordinal. `names` lists the accepted strings in wire order, so a
+// name's index is exactly the value the daemon's Apply() casts back to its enum.
+bool PrefTakeEnum(const picojson::object &o,
+	CECTag &group,
+	const char *key,
+	ec_tagname_t name,
+	const char *const *names,
+	bool &any,
+	std::string &err)
+{
+	const auto it = o.find(key);
+	if (it == o.end())
+		return true;
+	if (!it->second.is<std::string>()) {
+		err = std::string(key) + " must be a string";
+		return false;
+	}
+	const std::string &v = it->second.get<std::string>();
+	for (std::uint8_t idx = 0; namesidx != nullptr; ++idx) {
+		if (v == namesidx) {
+			group.AddTag(CECTag(name, idx));
+			any = true;
+			return true;
+		}
+	}
+	std::string accepted;
+	for (std::size_t i = 0; namesi != nullptr; ++i) {
+		if (!accepted.empty())
+			accepted += ", ";
+		accepted += namesi;
+	}
+	err = std::string(key) + " must be one of " + accepted;
+	return false;
+}
+
+bool PrefTakeString(const picojson::object &o,
+	CECTag &group,
+	const char *key,
+	ec_tagname_t name,
+	bool &any,
+	std::string &err)
+{
+	const auto it = o.find(key);
+	if (it == o.end())
+		return true;
+	if (!it->second.is<std::string>()) {
+		err = std::string(key) + " must be a string";
+		return false;
+	}
+	group.AddTag(CECTag(name, wxString::FromUTF8(it->second.get<std::string>().c_str())));
+	any = true;
+	return true;
+}
+
+// String-array field (directories.shared_paths): a JSON array of strings
+// packed as EC_TAG_STRING children, mirroring the core serializer.
+bool PrefTakeStringArray(const picojson::object &o,
+	CECTag &group,
+	const char *key,
+	ec_tagname_t name,
+	bool &any,
+	std::string &err)
+{
+	const auto it = o.find(key);
+	if (it == o.end())
+		return true;
+	if (!it->second.is<picojson::array>()) {
+		err = std::string(key) + " must be an array of strings";
+		return false;
+	}
+	const auto &arr = it->second.get<picojson::array>();
+	CECTag list(name, static_cast<std::uint32_t>(arr.size()));
+	for (const auto &el : arr) {
+		if (!el.is<std::string>()) {
+			err = std::string(key) + " must be an array of strings";
+			return false;
+		}
+		list.AddTag(CECTag(EC_TAG_STRING, wxString::FromUTF8(el.get<std::string>().c_str())));
+	}
+	group.AddTag(list);
+	any = true;
+	return true;
+}
+
+// Write-only password: hash the plaintext with MD5 (matching how the daemon
+// stores WS/amuleapi passwords) and pack the 16-byte digest. Never on GET.
+bool PrefTakePassword(const picojson::object &o,
+	CECTag &group,
+	const char *key,
+	ec_tagname_t name,
+	bool &any,
+	std::string &err)
+{
+	const auto it = o.find(key);
+	if (it == o.end())
+		return true;
+	if (!it->second.is<std::string>()) {
+		err = std::string(key) + " must be a string";
+		return false;
+	}
+	const wxString md5hex = MD5Sum(wxString::FromUTF8(it->second.get<std::string>().c_str())).GetHash();
+	CMD4Hash hash;
+	if (!HashFromHex(std::string(md5hex.utf8_str()), hash)) {
+		err = std::string(key) + " could not be hashed";
+		return false;
+	}
+	group.AddTag(CECTag(name, hash));
+	any = true;
+	return true;
+}
+
+// Resolve an optional sub-object by key. Returns false + err when the
+// key is present but not an object; leaves `out` null when absent.
+bool PrefFindSubObject(
+	const picojson::object &obj, const char *key, const picojson::object *&out, std::string &err)
+{
+	const auto it = obj.find(key);
+	if (it == obj.end())
+		return true;
+	if (!it->second.is<picojson::object>()) {
+		err = std::string("`") + key + "` must be an object";
+		return false;
+	}
+	out = &it->second.get<picojson::object>();
+	return true;
+}
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandlePreferencesPatch(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+
+	// Body shape mirrors the GET: one optional sub-object per category, every field
+	// within optional. Both come from the schema table, so the accepted shape cannot
+	// drift from the emitted one. Built at EC_DETAIL_FULL because amuled's Apply()
+	// gates ApplyBoolean on it -- which is also why every bool below is a value tag.
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SET_PREFERENCES, EC_DETAIL_FULL));
+	bool any_change = false;
+	// Names of read-only fields the body carried, so a request naming only
+	// those can say which ones rather than claiming none were known.
+	std::string skipped_read_only;
+
+	// One CECTag per EC group, created on first use. Two categories can share a group
+	// (remote_controls.webserver / .amuleapi), so they must land in the same tag.
+	std::map<ec_tagname_t, CECTag> groups;
+	std::vector<ec_tagname_t> group_order;
+	auto group_for = &(ec_tagname_t tag) -> CECTag & {
+		auto it = groups.find(tag);
+		if (it == groups.end()) {
+			it = groups.emplace(tag, CECTag(tag, static_cast<std::uint32_t>(0))).first;
+			group_order.push_back(tag);
+		}
+		return it->second;
+	};
+
+	// Resolve each category's sub-object up front so an unknown *type* is a
+	// 400 even when the category carries no recognized field.
+	std::vector<const picojson::object *> cat_obj(webapi::PrefCategoryCount(), nullptr);
+	for (std::size_t c = 0; c < webapi::PrefCategoryCount(); ++c) {
+		const char *name = webapi::PrefCategories()c.name;
+		const char *dot = std::strchr(name, '.');
+		const picojson::object *parent = &obj;
+		std::string leaf(name);
+		if (dot) {
+			const std::string top(name, dot);
+			const picojson::object *sub = nullptr;
+			if (!PrefFindSubObject(obj, top.c_str(), sub, parse_err))
+				return ErrorResponse(400, "bad_request", parse_err.c_str());
+			if (!sub)
+				continue;
+			parent = sub;
+			leaf = dot + 1;
+		}
+		const picojson::object *found = nullptr;
+		if (!PrefFindSubObject(*parent, leaf.c_str(), found, parse_err))
+			return ErrorResponse(400, "bad_request", parse_err.c_str());
+		cat_objc = found;
+	}
+
+	const webapi::PreferencesSnapshot current = m_state.Preferences();
+
+	for (std::size_t i = 0; i < webapi::PrefSchemaSize(); ++i) {
+		const webapi::PrefField &f = webapi::PrefSchema()i;
+
+		// Skip the whole row when the client did not send that category at all.
+		const picojson::object *src = nullptr;
+		for (std::size_t c = 0; c < webapi::PrefCategoryCount(); ++c) {
+			if (std::strcmp(webapi::PrefCategories()c.name, f.category) == 0) {
+				src = cat_objc;
+				break;
+			}
+		}
+		if (!src || src->find(f.key) == src->end())
+			continue;
+
+		// Read-only fields (daemon capabilities, live status) are ignored rather than
+		// rejected: the read-modify-write round trip necessarily sends them back.
+		// Bespoke fields are applied further down.
+		//
+		// Remember the names, though: a body naming ONLY non-writable fields would
+		// otherwise fall through to "did not include any known pref fields".
+		if (f.access == webapi::PrefAccess::ReadOnly || f.access == webapi::PrefAccess::Bespoke) {
+			if (f.access == webapi::PrefAccess::ReadOnly) {
+				if (!skipped_read_only.empty())
+					skipped_read_only += ", ";
+				skipped_read_only += std::string(f.category) + "." + f.key;
+			}
+			continue;
+		}
+
+		if (f.access == webapi::PrefAccess::Rejected) {
+			// Each Rejected row names the endpoint that owns the field, so
+			// the answer is a redirection rather than a flat refusal.
+			if (std::strcmp(f.category, "geoip") == 0) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`geoip.update_now` is an action, not a setting: "
+					"POST /geoip/update instead");
+			}
+			return ErrorResponse(400,
+				"bad_request",
+				"amuleapi passwords are managed through PATCH /auth/passwords, "
+				"not through /preferences");
+		}
+
+		// Capability gate: refuse rather than silently drop a setting the
+		// connected daemon cannot honour.
+		if (f.gated_by) {
+			bool ok = true;
+			for (std::size_t g = 0; g < webapi::PrefSchemaSize(); ++g) {
+				const webapi::PrefField &cap = webapi::PrefSchema()g;
+				if (std::strcmp(cap.category, f.category) != 0 ||
+					std::strcmp(cap.key, f.gated_by) != 0)
+					continue;
+				webapi::PreferencesSnapshot &snap =
+					const_cast<webapi::PreferencesSnapshot &>(current);
+				ok = *static_cast<bool *>(cap.member(snap));
+				break;
+			}
+			if (!ok) {
+				return ErrorResponse(409,
+					"option_not_supported",
+					"this daemon was built without support for that option");
+			}
+		}
+
+		CECTag &g = group_for(webapi::PrefGroupTagFor(f.category));
+		std::string err;
+		bool ok = true;
+		switch (f.type) {
+		case webapi::PrefType::Bool:
+			ok = PrefTakeBool(*src, g, f.key, f.tag, any_change, err, f.invert);
+			break;
+		case webapi::PrefType::Uint16:
+		case webapi::PrefType::Uint32:
+			ok = PrefTakeUint(
+				*src, g, f.key, f.tag, f.min, f.max, f.step, any_change, err, f.ec_scale);
+			break;
+		case webapi::PrefType::String:
+			ok = PrefTakeString(*src, g, f.key, f.tag, any_change, err);
+			break;
+		case webapi::PrefType::StringArray:
+			ok = PrefTakeStringArray(*src, g, f.key, f.tag, any_change, err);
+			break;
+		case webapi::PrefType::Enum:
+			ok = PrefTakeEnum(*src, g, f.key, f.tag, f.enum_names, any_change, err);
+			break;
+		case webapi::PrefType::Md4Hex:
+			// Only reachable for a write-only password row: the plaintext is
+			// hashed here and the hash is what crosses EC.
+			ok = PrefTakePassword(*src, g, f.key, f.tag, any_change, err);
+			break;
+		}
+		if (!ok)
+			return ErrorResponse(400, "bad_request", err.c_str());
+	}
+
+	// --- The one field pair the table cannot describe. ------------------
+	// remote_controls.webserver.guest_enabled and .guest_password share a single EC
+	// tag: EC_TAG_WEBSERVER_GUEST carries the enable bool as its value and the password
+	// hash as a child, so there is no 1:1 field-to-tag mapping for the schema. When
+	// only the password is given, the enable bit falls back to the snapshot value.
+	{
+		const picojson::object *ws = nullptr;
+		for (std::size_t c = 0; c < webapi::PrefCategoryCount(); ++c) {
+			if (std::strcmp(webapi::PrefCategories()c.name, "remote_controls.webserver") == 0) {
+				ws = cat_objc;
+				break;
+			}
+		}
+		if (ws) {
+			const auto en_it = ws->find("guest_enabled");
+			const auto pw_it = ws->find("guest_password");
+			const bool has_en = en_it != ws->end();
+			const bool has_pw = pw_it != ws->end();
+			if (has_en || has_pw) {
+				if (has_en && !en_it->second.is<bool>())
+					return ErrorResponse(
+						400, "bad_request", "guest_enabled must be a bool");
+				if (has_pw && !pw_it->second.is<std::string>())
+					return ErrorResponse(
+						400, "bad_request", "guest_password must be a string");
+				const bool enabled = has_en ? en_it->second.get<bool>()
+							    : current.remote_controls.webserver.guest_enabled;
+				CECTag guest(
+					EC_TAG_WEBSERVER_GUEST, static_cast<std::uint8_t>(enabled ? 1 : 0));
+				if (has_pw) {
+					const wxString md5hex = MD5Sum(
+						wxString::FromUTF8(pw_it->second.get<std::string>().c_str()))
+									.GetHash();
+					CMD4Hash h;
+					if (HashFromHex(std::string(md5hex.utf8_str()), h))
+						guest.AddTag(CECTag(EC_TAG_PASSWD_HASH, h));
+				}
+				group_for(EC_TAG_PREFS_REMOTECTRL).AddTag(guest);
+				any_change = true;
+			}
+		}
+	}
+
+	for (ec_tagname_t tag : group_order)
+		ec_req->AddTag(groups.find(tag)->second);
+
+	if (!any_change) {
+		if (!skipped_read_only.empty()) {
+			const std::string msg =
+				"no writable fields in the request; " + skipped_read_only +
+				(skipped_read_only.find(',') == std::string::npos ? " is read-only"
+										  : " are read-only");
+			return ErrorResponse(400, "bad_request", msg.c_str());
+		}
+		return ErrorResponse(
+			400, "bad_request", "request body did not include any known pref fields");
+	}
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for SET_PREFERENCES");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	// Inline refresh so the GET below reflects the post-mutation state.
+	(void)RefresherTick(m_app, m_state);
+
+	// Return the updated shape so consumers need no follow-up GET.
+	const webapi::PreferencesSnapshot p = m_state.Preferences();
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	WritePreferencesBody(w, p);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+namespace
+{
+
+// Issue a single-shot mutation EC packet (no body), check the response, run
+// RefresherTick inline, return `{message?: "..."}` -- the daemon's own account of
+// what it did. Used by every connection-control endpoint whose EC op is
+// parameterless. Callers pass 202, not 200: the request returns before the effect
+// is observable, which is as true of a disconnect as of a connect.
+CHttpServer::Response SimpleConnControlOp(
+	CamuleapiApp &app, webapi::CState &state, ec_opcode_t op, unsigned http_status)
+{
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(op));
+	const CECPacket *ec_resp = app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	// amuled's CONNECT/DISCONNECT return EC_OP_STRINGS with a status message,
+	// surfaced verbatim so consumers see what amuled would have shown.
+	std::string message;
+	if (ec_resp) {
+		for (CECPacket::const_iterator it = ec_resp->begin(); it != ec_resp->end(); ++it) {
+			const CECTag *t = &*it;
+			if (t->GetTagName() == EC_TAG_STRING) {
+				if (!message.empty())
+					message += "; ";
+				message += std::string(t->GetStringData().utf8_str());
+			}
+		}
+	}
+	delete ec_resp;
+
+	(void)RefresherTick(app, state);
+
+	CHttpServer::Response r;
+	r.status = http_status;
+	// `message` is the daemon's own explanation of what it did, not recoverable from
+	// any subsequent read. With nothing to say, no body at all rather than `{}`: the
+	// URL-fetch triggers beside these answer the same 202 with no body.
+	if (message.empty()) {
+		r.content_type.clear();
+		return r;
+	}
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("message");
+	w.ValueString(wxString::FromUTF8(message.c_str()));
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandleNetworksConnect(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	// Optional `{"network": "ed2k" | "kad" | "both"}` selector -- same shape as
+	// /networks/disconnect. Default "both" preserves the parameterless contract.
+	std::string network = "both";
+	if (!req.body.empty()) {
+		picojson::value root;
+		std::string parse_err;
+		if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+			return ErrorResponse(400, "bad_request", parse_err.c_str());
+		}
+		const auto &obj = root.get<picojson::object>();
+		const auto it = obj.find("network");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>()) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`network` must be one of \"ed2k\", \"kad\", \"both\"");
+			}
+			network = it->second.get<std::string>();
+			if (network != "ed2k" && network != "kad" && network != "both") {
+				return ErrorResponse(400,
+					"bad_request",
+					"`network` must be one of \"ed2k\", \"kad\", \"both\"");
+			}
+		}
+	}
+
+	if (network == "ed2k") {
+		return SimpleConnControlOp(m_app, m_state, EC_OP_SERVER_CONNECT, 202);
+	}
+	if (network == "kad") {
+		return SimpleConnControlOp(m_app, m_state, EC_OP_KAD_START, 202);
+	}
+	return SimpleConnControlOp(m_app, m_state, EC_OP_CONNECT, 202);
+}
+
+CHttpServer::Response CApiDispatcher::HandleNetworksDisconnect(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	// Optional `{"network": "ed2k" | "kad" | "both"}` selector; default "both",
+	// and an empty body is fine -- that is the contract callers build against.
+	std::string network = "both";
+	if (!req.body.empty()) {
+		picojson::value root;
+		std::string parse_err;
+		if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+			return ErrorResponse(400, "bad_request", parse_err.c_str());
+		}
+		const auto &obj = root.get<picojson::object>();
+		const auto it = obj.find("network");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>()) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`network` must be one of \"ed2k\", \"kad\", \"both\"");
+			}
+			network = it->second.get<std::string>();
+			if (network != "ed2k" && network != "kad" && network != "both") {
+				return ErrorResponse(400,
+					"bad_request",
+					"`network` must be one of \"ed2k\", \"kad\", \"both\"");
+			}
+		}
+	}
+
+	if (network == "ed2k") {
+		return SimpleConnControlOp(m_app, m_state, EC_OP_SERVER_DISCONNECT, 202);
+	}
+	if (network == "kad") {
+		return SimpleConnControlOp(m_app, m_state, EC_OP_KAD_STOP, 202);
+	}
+	// "both": amuled's EC_OP_DISCONNECT short-circuits to both
+	// SERVER_DISCONNECT and KAD_STOP in one EC roundtrip.
+	return SimpleConnControlOp(m_app, m_state, EC_OP_DISCONNECT, 202);
+}
+
+// POST /kad/update -- refresh the Kad node list from a nodes.dat URL (#693).
+//
+// The EC handler (EC_OP_KAD_UPDATE_FROM_URL) persists the URL into preferences
+// itself via SetKadNodesUrl(), so this deliberately does NOT also patch
+// kad.update_url -- doing both would diverge from the ed2k path and could race it.
+// Side effect worth knowing: once the download completes amuled stops Kad, swaps
+// nodes.dat in, and starts Kad again, with no prompt.
+CHttpServer::Response CApiDispatcher::HandleKadUpdateFromUrl(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	// No inline RefresherTick: nothing observable has changed yet.
+	static const UrlFetchSpec kSpec = {
+		"url", EC_OP_KAD_UPDATE_FROM_URL, EC_TAG_KADEMLIA_UPDATE_URL, true, false
+	};
+	std::string url;
+	CHttpServer::Response rejection;
+	if (!ResolveFetchUrl(req, kSpec, nullptr, url, rejection)) {
+		return rejection;
+	}
+	return UrlFetchOp(m_app, m_state, kSpec, url);
+}
+
+// POST /ipfilter/reload -- re-read ipfilter.dat + ipfilter_static.dat from amuled's
+// config directory into the live filter. amuled queues a CIPFilterTask and keeps
+// the current filter live until the new one has loaded, so this is accepted, never
+// completed; the outcome is only ever an amule log line, read back through
+// /logs/amule or the SSE log channel.
+CHttpServer::Response CApiDispatcher::HandleIpfilterReload(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	return SimpleConnControlOp(m_app, m_state, EC_OP_IPFILTER_RELOAD, 202);
+}
+
+// POST /ipfilter/update -- download ipfilter.dat from a URL, swap it in and reload.
+//
+// Unlike its two siblings the URL is optional: with no body amuleapi resolves
+// security.ipfilter_update_url from its own preferences snapshot. With neither,
+// this is a 400 rather than a request the core turns into a silent no-op
+// (CIPFilter::Update() returns immediately on an empty URL). The snapshot trails
+// amuled by up to one tick, so a PATCH immediately followed by a bodyless update
+// can still send the previous URL.
+CHttpServer::Response CApiDispatcher::HandleIpfilterUpdate(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	// EC_OP_IPFILTER_UPDATE reads the packet's first tag by position, not by name, so
+	// the tag is EC_TAG_STRING -- what amulegui has always sent. No inline
+	// RefresherTick: the download is asynchronous and lands in amuled's filter, not in
+	// a cache this process holds.
+	static const UrlFetchSpec kSpec = { "url", EC_OP_IPFILTER_UPDATE, EC_TAG_STRING, false, false };
+	// Offer the snapshot as the fallback only once there is one -- before the
+	// first, the defaults would look like "no URL configured".
+	const bool have_prefs = m_state.HasFirstSnapshot();
+	const std::string configured =
+		have_prefs ? m_state.Preferences().security.ipfilter_update_url : std::string();
+	std::string url;
+	CHttpServer::Response rejection;
+	if (!ResolveFetchUrl(req, kSpec, have_prefs ? &configured : nullptr, url, rejection)) {
+		return rejection;
+	}
+	return UrlFetchOp(m_app, m_state, kSpec, url);
+}
+
+// POST /geoip/update -- fetch a fresh GeoIP database now.
+//
+// Unlike the three sibling fetch routes it takes no URL: which database to fetch
+// comes from geoip.source and geoip.custom_update_url, which stay ordinary
+// preferences, so the body is empty and the whole request is the verb. The core has
+// no EC opcode for it -- the trigger is a preferences tag -- so the packet is still
+// EC_OP_SET_PREFERENCES carrying that one tag.
+CHttpServer::Response CApiDispatcher::HandleGeoipUpdate(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	// EC_DETAIL_FULL and a value tag, for the same reason PATCH /preferences uses both:
+	// CEC_Prefs_Packet::Apply() only calls ApplyBoolean when the detail level is FULL,
+	// and reads the flag from the tag's value.
+	auto ec_req = std::make_unique<CECPacket>(EC_OP_SET_PREFERENCES, EC_DETAIL_FULL);
+	CECTag group(EC_TAG_PREFS_IP2COUNTRY, static_cast<std::uint32_t>(0));
+	group.AddTag(CECTag(EC_TAG_IP2COUNTRY_UPDATE_NOW, static_cast<std::uint8_t>(1)));
+	ec_req->AddTag(group);
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	(void)RefresherTick(m_app, m_state);
+
+	// 202 with no body, like the three sibling fetch routes (UrlFetchOp): the download
+	// runs in the daemon after the reply. Progress is observable on GET /preferences as
+	// geoip.download_in_progress, the outcome as last_update_status.
+	CHttpServer::Response r;
+	r.status = 202;
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleKadBootstrap(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+
+	// Body: {"ip": "1.2.3.4", "port": <uint16>}. A dotted quad, and only that. The
+	// integer form is gone: ParseIpv4Dotted() packs a.b.c.d least-significant byte
+	// first, while the integer branch took the JSON value verbatim, so 2130706433
+	// (0x7F000001, the conventional big-endian spelling of 127.0.0.1) bootstrapped
+	// 1.0.0.127.
+	std::uint32_t ip_he = 0;
+	{
+		const auto it = obj.find("ip");
+		if (it == obj.end()) {
+			return ErrorResponse(400, "bad_request", "required field `ip` is missing");
+		}
+		if (!it->second.is<std::string>()) {
+			return ErrorResponse(400,
+				"bad_request",
+				"`ip` must be a dotted-quad IPv4 address string, e.g. "
+				"\"127.0.0.1\"");
+		}
+		if (!ParseIpv4Dotted(it->second.get<std::string>(), ip_he)) {
+			return ErrorResponse(400, "bad_request", "`ip` must be a dotted-quad IPv4 address");
+		}
+	}
+	std::uint16_t port = 0;
+	{
+		const auto it = obj.find("port");
+		if (it == obj.end() || !it->second.is<double>()) {
+			return ErrorResponse(400, "bad_request", "required integer field `port` is missing");
+		}
+		const double v = it->second.get<double>();
+		// Same contract as the `port` on POST /friends. 0 is rejected: no Kad
+		// contact can be reached on it.
+		if (!IsIntegralJsonNumber(v) || v < 1 || v > 65535) {
+			return ErrorResponse(400, "bad_request", "`port` must be an integer in 1..65535");
+		}
+		port = static_cast<std::uint16_t>(v);
+	}
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_KAD_BOOTSTRAP_FROM_IP));
+	ec_req->AddTag(CECTag(EC_TAG_BOOTSTRAP_IP, ip_he));
+	ec_req->AddTag(CECTag(EC_TAG_BOOTSTRAP_PORT, port));
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for KAD_BOOTSTRAP_FROM_IP");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	(void)RefresherTick(m_app, m_state);
+
+	CHttpServer::Response r;
+	r.status = 202;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	// `ip`/`port` stay as the documented exception to the no-body rule for actions: the
+	// echo reports which address the daemon actually parsed, which the caller cannot
+	// recover anywhere else.
+	w.Key("ip");
+	w.ValueString(Uint32toStringIP(ip_he));
+	w.Key("port");
+	w.ValueInt(static_cast<int64_t>(port));
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// `priority` here mirrors the /shared.priority enum: bare upload levels plus
+// "auto". Setting "auto" hands level selection to amuled, which reports it back as
+// `priority` plus a true `priority_auto`. The combined "*_auto" strings are
+// deliberately NOT accepted as input: a caller cannot pin a computed level.
+CHttpServer::Response CApiDispatcher::HandleSharedPatch(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	webapi::FileSnapshot s;
+	if (!FindSharedByKey(m_state, key, s)) {
+		return ErrorResponse(404, "not_found", "no shared file with that hash");
+	}
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+
+	bool any_change = false;
+
+	// priority (optional now that comment/rating share this endpoint).
+	const auto pit = obj.find("priority");
+	if (pit != obj.end()) {
+		if (!pit->second.is<std::string>()) {
+			return ErrorResponse(400, "bad_request", "`priority` must be a string");
+		}
+		std::uint8_t code = 0;
+		if (!FilePriorityToCode(pit->second.get<std::string>(), kPrioShared, code)) {
+			return ErrorResponse(400, "bad_request", FilePriorityAccepted(kPrioShared).c_str());
+		}
+		CMD4Hash file_hash;
+		if (!HashFromHex(s.hash, file_hash)) {
+			return ErrorResponse(500, "internal_error", "failed to decode file hash");
+		}
+		std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SHARED_SET_PRIO));
+		CECTag hash_tag(EC_TAG_PARTFILE, file_hash);
+		hash_tag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, code));
+		ec_req->AddTag(hash_tag);
+
+		const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+		if (!ec_resp) {
+			return ErrorResponse(
+				503, "ec_unavailable", "EC roundtrip failed for SHARED_SET_PRIO");
+		}
+		std::string ec_err_msg;
+		if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+			delete ec_resp;
+			return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+		}
+		delete ec_resp;
+		any_change = true;
+	}
+
+	// comment + rating (both required together; issue #419).
+	{
+		bool applied = false;
+		CHttpServer::Response cr_err;
+		if (!TrySetCommentRating(m_app, obj, s, applied, cr_err))
+			return cr_err;
+		if (applied)
+			any_change = true;
+	}
+
+	// name (rename; issue #420).
+	{
+		bool applied = false;
+		CHttpServer::Response rn_err;
+		if (!TryRename(m_app, obj, s, applied, rn_err))
+			return rn_err;
+		if (applied)
+			any_change = true;
+	}
+
+	if (!any_change) {
+		return ErrorResponse(400,
+			"bad_request",
+			"request body must include `priority`, `comment`+`rating`, or `name`");
+	}
+
+	(void)RefresherTick(m_app, m_state);
+
+	// Re-read post-mutation. Fall back to prior copy if evicted.
+	webapi::FileSnapshot s_after = s;
+	(void)m_state.FindShared(s.hash, s_after);
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	// Same writer GET /shared/{hash} uses: the list row is a narrower object,
+	// and answering a mutation with it made PATCH-and-store differ from re-GET.
+	WriteSharedDetailObject(w, s_after);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// --- Bulk mutations (issue #358) -------------------------------------
+// PATCH/DELETE /downloads and PATCH /shared take a `hashes` array and apply the
+// same op to each, reporting per-item outcomes under `results`. Best-effort per
+// item -- each hash is an independent EC roundtrip, so a mid-batch failure does not
+// abort the rest. One RefresherTick runs after the whole batch. All-ok is 200, a
+// mix is 207 Multi-Status, an all-unreachable batch collapses to 503.
+
+CHttpServer::Response CApiDispatcher::HandleDownloadsBulkPatch(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err))
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	const auto &obj = root.get<picojson::object>();
+
+	std::vector<std::string> hashes;
+	CHttpServer::Response bad;
+	if (!ParseBulkHashes(obj, hashes, bad))
+		return bad;
+
+	// Validate the patch ONCE -- the same op list applies to every hash, so a malformed
+	// patch is a 400 for the whole request; per-hash problems surface per item. Fixed
+	// order (status, priority, category) keeps the effect deterministic.
+	struct PatchOp
+	{
+		ec_opcode_t op;
+		bool has_inner;
+		ec_tagname_t inner_name;
+		std::uint8_t inner_value;
+	};
+	std::vector<PatchOp> ops;
+	{
+		const auto it = obj.find("action");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>())
+				return ErrorResponse(400,
+					"bad_request",
+					"`action` must be one of \"pause\", \"resume\" or \"stop\"");
+			const std::string &v = it->second.get<std::string>();
+			if (v == "pause")
+				ops.push_back(
+					{ EC_OP_PARTFILE_PAUSE, false, static_cast<ec_tagname_t>(0), 0 });
+			else if (v == "resume")
+				ops.push_back(
+					{ EC_OP_PARTFILE_RESUME, false, static_cast<ec_tagname_t>(0), 0 });
+			else if (v == "stop")
+				ops.push_back(
+					{ EC_OP_PARTFILE_STOP, false, static_cast<ec_tagname_t>(0), 0 });
+			else
+				return ErrorResponse(400,
+					"bad_request",
+					"`action` must be one of \"pause\", \"resume\" or \"stop\"");
+		}
+	}
+	{
+		const auto it = obj.find("priority");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>())
+				return ErrorResponse(400, "bad_request", "`priority` must be a string");
+			std::uint8_t code = 0;
+			if (!FilePriorityToCode(it->second.get<std::string>(), kPrioDownload, code))
+				return ErrorResponse(
+					400, "bad_request", FilePriorityAccepted(kPrioDownload).c_str());
+			ops.push_back({ EC_OP_PARTFILE_PRIO_SET, true, EC_TAG_PARTFILE_PRIO, code });
+		}
+	}
+	{
+		const auto it = obj.find("category_index");
+		if (it != obj.end()) {
+			if (!it->second.is<double>())
+				return ErrorResponse(400,
+					"bad_request",
+					"`category_index` must be a non-negative integer");
+			const double v = it->second.get<double>();
+			// The integrality test the message already promises: without it
+			// 2.9 was accepted and truncated to 2.
+			if (v < 0 || v > 255 || !IsIntegralJsonNumber(v))
+				return ErrorResponse(
+					400, "bad_request", "`category_index` must be in 0, 255");
+			ops.push_back({ EC_OP_PARTFILE_SET_CAT,
+				true,
+				EC_TAG_PARTFILE_CAT,
+				static_cast<std::uint8_t>(v) });
+		}
+	}
+	if (ops.empty())
+		return ErrorResponse(400,
+			"bad_request",
+			"request body must include at least one of `action`, `priority`, or "
+			"`category_index`");
+
+	std::vector<BulkItem> results;
+	results.reserve(hashes.size());
+	for (const std::string &raw : hashes) {
+		const std::string needle = LowerHexKey(raw);
+		webapi::FileSnapshot d;
+		if (!m_state.FindDownload(needle, d)) {
+			results.push_back(BulkErr(raw, 404, "not_found", "no download with that hash"));
+			continue;
+		}
+		CMD4Hash file_hash;
+		if (!HashFromHex(d.hash, file_hash)) {
+			results.push_back(
+				BulkErr(raw, 500, "internal_error", "failed to decode partfile hash"));
+			continue;
+		}
+		bool item_ok = true;
+		for (const PatchOp &pop : ops) {
+			std::unique_ptr<CECPacket> p(new CECPacket(pop.op));
+			CECTag hash_tag(EC_TAG_PARTFILE, file_hash);
+			if (pop.has_inner)
+				hash_tag.AddTag(CECTag(pop.inner_name, pop.inner_value));
+			p->AddTag(hash_tag);
+			const CECPacket *ec_resp = m_app.SendRecvSerialized(p.get());
+			if (!ec_resp) {
+				results.push_back(BulkErr(raw, 503, "ec_unavailable", "EC roundtrip failed"));
+				item_ok = false;
+				break;
+			}
+			std::string ec_err;
+			if (IsEcFailedResponse(ec_resp, ec_err)) {
+				delete ec_resp;
+				results.push_back(BulkErr(raw, 400, "amuled_rejected", ec_err));
+				item_ok = false;
+				break;
+			}
+			delete ec_resp;
+		}
+		if (item_ok)
+			results.push_back(BulkOk(raw));
+	}
+	(void)RefresherTick(m_app, m_state);
+	return BulkResultsResponse(results, 200);
+}
+
+CHttpServer::Response CApiDispatcher::HandleDownloadsBulkDelete(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err))
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	const auto &obj = root.get<picojson::object>();
+
+	std::vector<std::string> hashes;
+	CHttpServer::Response bad;
+	if (!ParseBulkHashes(obj, hashes, bad))
+		return bad;
+
+	std::vector<BulkItem> results;
+	results.reserve(hashes.size());
+	for (const std::string &raw : hashes) {
+		const std::string needle = LowerHexKey(raw);
+		webapi::FileSnapshot d;
+		if (!m_state.FindDownload(needle, d)) {
+			results.push_back(BulkErr(raw, 404, "not_found", "no download with that hash"));
+			continue;
+		}
+		// Same guard as the single-item DELETE: completed entries are not
+		// removable here (use POST /downloads_clear_completed).
+		if (d.download.status == "completed") {
+			results.push_back(BulkErr(raw,
+				409,
+				"download_completed",
+				"DELETE only removes active downloads; use POST "
+				"/downloads_clear_completed to clear a completed entry"));
+			continue;
+		}
+		CMD4Hash file_hash;
+		if (!HashFromHex(d.hash, file_hash)) {
+			results.push_back(
+				BulkErr(raw, 500, "internal_error", "failed to decode partfile hash"));
+			continue;
+		}
+		std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_PARTFILE_DELETE));
+		ec_req->AddTag(CECTag(EC_TAG_PARTFILE, file_hash));
+		const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+		if (!ec_resp) {
+			results.push_back(
+				BulkErr(raw, 503, "ec_unavailable", "EC roundtrip failed for DELETE"));
+			continue;
+		}
+		std::string ec_err;
+		if (IsEcFailedResponse(ec_resp, ec_err)) {
+			delete ec_resp;
+			results.push_back(BulkErr(raw, 400, "amuled_rejected", ec_err));
+			continue;
+		}
+		delete ec_resp;
+		results.push_back(BulkOk(raw));
+	}
+	(void)RefresherTick(m_app, m_state);
+	return BulkResultsResponse(results, 200);
+}
+
+CHttpServer::Response CApiDispatcher::HandleSharedBulkPatch(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err))
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	const auto &obj = root.get<picojson::object>();
+
+	std::vector<std::string> hashes;
+	CHttpServer::Response bad;
+	if (!ParseBulkHashes(obj, hashes, bad))
+		return bad;
+
+	// `priority` required + validated once for the whole batch.
+	const auto pit = obj.find("priority");
+	if (pit == obj.end())
+		return ErrorResponse(400, "bad_request", "request body must include `priority`");
+	if (!pit->second.is<std::string>())
+		return ErrorResponse(400, "bad_request", "`priority` must be a string");
+	std::uint8_t code = 0;
+	if (!FilePriorityToCode(pit->second.get<std::string>(), kPrioShared, code))
+		return ErrorResponse(400, "bad_request", FilePriorityAccepted(kPrioShared).c_str());
+
+	std::vector<BulkItem> results;
+	results.reserve(hashes.size());
+	for (const std::string &raw : hashes) {
+		const std::string needle = LowerHexKey(raw);
+		webapi::FileSnapshot s;
+		if (!m_state.FindShared(needle, s)) {
+			results.push_back(BulkErr(raw, 404, "not_found", "no shared file with that hash"));
+			continue;
+		}
+		CMD4Hash file_hash;
+		if (!HashFromHex(s.hash, file_hash)) {
+			results.push_back(BulkErr(raw, 500, "internal_error", "failed to decode file hash"));
+			continue;
+		}
+		std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SHARED_SET_PRIO));
+		CECTag hash_tag(EC_TAG_PARTFILE, file_hash);
+		hash_tag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, code));
+		ec_req->AddTag(hash_tag);
+		const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+		if (!ec_resp) {
+			results.push_back(BulkErr(
+				raw, 503, "ec_unavailable", "EC roundtrip failed for SHARED_SET_PRIO"));
+			continue;
+		}
+		std::string ec_err;
+		if (IsEcFailedResponse(ec_resp, ec_err)) {
+			delete ec_resp;
+			results.push_back(BulkErr(raw, 400, "amuled_rejected", ec_err));
+			continue;
+		}
+		delete ec_resp;
+		results.push_back(BulkOk(raw));
+	}
+	(void)RefresherTick(m_app, m_state);
+	return BulkResultsResponse(results, 200);
+}
+
+CHttpServer::Response CApiDispatcher::HandleSharedVerify(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	webapi::FileSnapshot s;
+	if (!FindSharedByKey(m_state, key, s)) {
+		return ErrorResponse(404, "not_found", "no shared file with that hash");
+	}
+
+	// Partfiles have no verify implementation: the hashing task bails out on
+	// IsPartFile(), and amuled's EC handler answers NOOP either way, so a caller would
+	// be told the re-hash was accepted and never see a report. A completed but
+	// still-listed download is a knownfile, and so a legitimate target.
+	if (s.IsIncompletePartfile()) {
+		return ErrorResponse(
+			409, "partfile_unsupported", "verify local data is not supported on a partfile");
+	}
+
+	CMD4Hash file_hash;
+	if (!HashFromHex(s.hash, file_hash)) {
+		return ErrorResponse(500, "internal_error", "failed to decode file hash");
+	}
+
+	auto ec_req = std::make_unique<CECPacket>(EC_OP_VERIFY_LOCAL_DATA);
+	ec_req->AddTag(CECTag(EC_TAG_KNOWNFILE, file_hash));
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for VERIFY_LOCAL_DATA");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	// 202, not 200: amuled queues a CVerifyLocalDataTask and answers NOOP immediately,
+	// so the re-hash is still in flight. The verdict is only ever an amule log line
+	// (CVerifyLocalDataTask::PrintReport), read back through /logs/amule or the SSE log
+	// channel. No RefresherTick, and no body.
+	CHttpServer::Response r;
+	r.status = 202;
+	r.content_type.clear();
+	return r;
+}
+namespace
+{
+
+// The set of directories this endpoint is willing to serve bytes out of.
+//
+// Read off the preferences snapshot rather than fetched with an
+// EC_OP_GET_SHARED_DIRS roundtrip. GET_SHARED_DIRS serialises only the two *intent*
+// lists (ExternalConn.cpp), which on a default install are both empty -- Incoming
+// is shared implicitly and appears in neither, so containment against that list
+// alone would 404 every file in the one directory aMule always shares.
+// `directories.shared` is the runtime union the core keeps (explicit + expanded
+// recursive) and `incoming` is the implicit root it omits.
+//
+// The category paths are the third root and are just as implicit as Incoming:
+// CSharedFileList::Reload seeds its scan list with GetIncomingDir() and GetCatPath(i)
+// for every category BEFORE the explicit shares, so a download that completed into a
+// category's own directory is shared by the core and listed by /shared while
+// appearing in neither `shared_paths` nor `incoming_path`.
+//
+// The one thing the core auto-shares that is deliberately NOT a root here is the
+// part-file set: those live in the temp directory and are only reachable through
+// this handler as a partfile, which it has already refused with 409.
+std::vector<std::string> ShareRootsFromPrefs(
+	const webapi::PreferencesSnapshot &p, const std::vector<webapi::CategorySnapshot> &cats)
+{
+	std::vector<std::string> roots;
+	roots.reserve(p.directories.shared_paths.size() + cats.size() + 1);
+	for (const std::string &d : p.directories.shared_paths) {
+		if (!d.empty())
+			roots.push_back(d);
+	}
+	if (!p.directories.incoming_path.empty()) {
+		roots.push_back(p.directories.incoming_path);
+	}
+	// Empty paths are skipped rather than defaulted: amuled holds an empty path for a
+	// category that saves to Incoming, which is already a root above. An empty string
+	// here would be a root that contains everything.
+	for (const webapi::CategorySnapshot &c : cats) {
+		if (!c.path.empty())
+			roots.push_back(c.path);
+	}
+	return roots;
+}
+
+} // namespace
+
+// The bytes of one completed shared file, streamed off disk. GET / HEAD only, and
+// the only route in this file whose response body is not materialised in memory: it
+// hands the transport a path plus a byte window (CHttpServer::Response::file) and
+// the 64 KiB streaming body does the rest.
+CHttpServer::Response CApiDispatcher::HandleSharedContent(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	// There is no auth middleware in this codebase: every route gates itself, so a
+	// content route that forgot this line would publish the whole share. Authenticate
+	// but NOT RequireAdmin -- the guest role can already list it.
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	webapi::FileSnapshot s;
+	if (!FindSharedByKey(m_state, key, s)) {
+		return ErrorResponse(404, "not_found", "no shared file with that hash");
+	}
+
+	// Completed files only, and IsIncompletePartfile() is exactly that test. A
+	// partfile's bytes on disk are a gapped .part file whose offsets do not correspond
+	// to the file's own, so a range out of it would be silently wrong.
+	if (s.IsIncompletePartfile()) {
+		return ErrorResponse(
+			409, "partfile_unsupported", "content download is not supported on a partfile");
+	}
+
+	// The directory rides EC_TAG_KNOWNFILE_PATH, which amuled emits only outside
+	// EC_DETAIL_UPDATE and, being on the valuemap path, only on the frames where it
+	// changed. A snapshot taken before the first such frame therefore has the file but
+	// not its location. That resolves on the next full frame, which is what makes this
+	// a 503-with-Retry-After rather than a 404.
+	if (s.on_disk_dir.empty()) {
+		CHttpServer::Response r =
+			ErrorResponse(503, "path_unavailable", "the file's on-disk path is not known yet");
+		r.headers"Retry-After" = "5";
+		return r;
+	}
+
+	// Resolution and the containment check are the HANDLER's job -- the transport opens
+	// whatever path it is given. Every rejection below collapses into one 404 with the
+	// same message the unknown-hash branch used, so the reply cannot be used to probe
+	// the share layout or where the boundary sits.
+	const std::vector<std::string> roots =
+		ShareRootsFromPrefs(m_state.Preferences(), m_state.Categories());
+
+	std::string fs_path;
+	if (!webapi::ResolveSharedContentPath(roots, s.on_disk_dir, s.name, fs_path)) {
+		// One case inside that failure is not the client's fault and must not be
+		// reported as a missing hash: amuleapi is not guaranteed to share a filesystem
+		// with amuled. The EC endpoint is configurable and amuleapi has no equivalent
+		// of the remote GUI's path-mapping layer, so a remote deployment resolves the
+		// daemon's paths against the wrong filesystem. Distinguishing it costs one stat.
+		std::string joined;
+		struct stat probe
+		{
+		};
+		if (webapi::JoinSharedPath(s.on_disk_dir, s.name, joined) &&
+			::stat(joined.c_str(), &probe) != 0) {
+			return ErrorResponse(503,
+				"ec_content_unreachable",
+				"the file is not present on the filesystem running amuleapi");
+		}
+		return ErrorResponse(404, "not_found", "no shared file with that hash");
+	}
+
+	// Re-stat the RESOLVED path. ResolveSharedContentPath does not hand back its stat,
+	// and the window, the Content-Length and the validator all have to come from one
+	// observation of one path.
+	struct stat st
+	{
+	};
+	if (::stat(fs_path.c_str(), &st) != 0 || !S_ISREG(st.st_mode)) {
+		return ErrorResponse(503,
+			"ec_content_unreachable",
+			"the file is not present on the filesystem running amuleapi");
+	}
+
+	// The other half of the same remote-EC hazard, and the more dangerous half: the
+	// path resolved and something regular is sitting there, but it is not the file the
+	// hash names. On a split deployment two unrelated files can agree on a name, and
+	// serving the local one under the remote one's hash would hand the caller bytes it
+	// did not ask for. A knownfile's size is fixed at hash time, so a disagreement is
+	// never benign. Same 503.
+	if (static_cast<std::uint64_t>(st.st_size) != s.size) {
+		return ErrorResponse(
+			503, "ec_content_mismatch", "the file on disk does not match the shared file's size");
+	}
+
+	const std::uint64_t file_size = static_cast<std::uint64_t>(st.st_size);
+
+	CHttpServer::Response r;
+	// Hard-coded, never derived from the extension -- StaticContentType is deliberately
+	// NOT reused here. Completed downloads land in Incoming, so both the bytes and the
+	// filename came from strangers on the ed2k network, and amuleapi serves the Web UI
+	// from this same origin. octet-stream + attachment + nosniff + a sandbox CSP is
+	// four reasons a browser will not run it.
+	r.content_type = "application/octet-stream";
+	r.headers"Content-Disposition" = webapi::BuildContentDisposition(s.name);
+	r.headers"X-Content-Type-Options" = "nosniff";
+	// Scoped to this response only: a global CSP would change every route
+	// including the Web UI, which is a separate decision.
+	r.headers"Content-Security-Policy" = "default-src 'none'; sandbox";
+	// Set by the handler so Dispatch stands aside instead of MD5-ing the body to derive
+	// a validator -- there is no body here to hash, and hashing a multi-GB file per
+	// request is not a slow path but an unusable one.
+	const std::string content_etag = webapi::BuildContentEtag(
+		static_cast<std::uint64_t>(st.st_mtime), static_cast<std::uint64_t>(st.st_size));
+	r.headers"ETag" = content_etag;
+
+	// Conditional GET, answered HERE and not by Dispatch. Taking the handler-set-ETag
+	// escape above also takes on this obligation: the whole If-None-Match block in
+	// Dispatch sits inside ShouldStampEtag, which returns false the moment a handler
+	// owns the validator, so a route that sets its own ETag and does not do this hands
+	// out a validator no client can revalidate.
+	//
+	// Through the shared matcher rather than a string compare, because the header may
+	// be `*`, a comma-separated list, or a weak `W/"..."` form -- which is what an nginx
+	// in front of us emits. IfNoneMatchHits wants the BARE validator, so the quotes
+	// BuildContentEtag adds come off for the comparison.
+	//
+	// Evaluated BEFORE the Range header, per RFC 9110 13.2.2: a matching precondition
+	// wins outright, so a conditional request carrying a Range answers 304, never 206.
+	const std::string inm_val = FindHeaderCaseInsensitive(req.headers, "If-None-Match");
+	const std::string content_etag_bare =
+		(content_etag.size() >= 2 && content_etag.front() == '"' && content_etag.back() == '"')
+			? content_etag.substr(1, content_etag.size() - 2)
+			: content_etag;
+	if (webcommon::IfNoneMatchHits(inm_val, content_etag_bare)) {
+		CHttpServer::Response nm;
+		nm.status = 304;
+		// A 304 carries no content, so no content_type (the default is application/json,
+		// which would be a lie here), no body, no Response::file, and only the validator
+		// RFC 7232 4.1 requires.
+		nm.content_type.clear();
+		nm.headers"ETag" = content_etag;
+		return nm;
+	}
+
+	std::uint64_t first = 0;
+	std::uint64_t last = 0;
+	std::string range_hdr = FindHeaderCaseInsensitive(req.headers, "Range");
+
+	// If-Range, RFC 9110 13.1.5. Only meaningful next to a Range, so the lookup is
+	// skipped entirely when there is none.
+	//
+	// A failed precondition DROPS the Range rather than rejecting the request: the
+	// caller asked for a window of a representation it no longer holds, and the whole
+	// current one leaves it with a correct file. Dropping it here also keeps a stale
+	// validator from turning into a 416 about the OLD file's length.
+	//
+	// The comparison is NOT IfNoneMatchHits: 13.1.5 requires the strong form and that
+	// function deliberately matches the weak one -- see SharedContent.h.
+	if (!range_hdr.empty()) {
+		const std::string ifr_val = FindHeaderCaseInsensitive(req.headers, "If-Range");
+		if (!webapi::IfRangeAllowsRange(ifr_val, content_etag)) {
+			range_hdr.clear();
+		}
+	}
+
+	const webapi::RangeResult rr = webapi::ParseSingleByteRange(range_hdr, file_size, first, last);
+
+	if (rr == webapi::RangeResult::kUnsatisfiable) {
+		// 416 carries the error envelope rather than a file window, so it goes down the
+		// ordinary buffered path. Content-Range in the unsatisfied form is what RFC 9110
+		// 14.4 requires so the client can re-ask.
+		CHttpServer::Response err = ErrorResponse(
+			416, "range_not_satisfiable", "the requested range lies outside the file");
+		err.headers"Content-Range" = "bytes */" + std::to_string(file_size);
+		err.headers"Accept-Ranges" = "bytes";
+		return err;
+	}
+
+	// A zero-length file has no valid byte window, so there is nothing for
+	// Response::file to describe -- the transport rejects 0, 0 on an empty file
+	// rather than clamping it. An empty buffered body is the honest 200 for it.
+	if (file_size == 0) {
+		r.status = 200;
+		r.headers"Accept-Ranges" = "bytes";
+		return r;
+	}
+
+	if (rr == webapi::RangeResult::kOk) {
+		r.status = 206;
+		r.headers"Content-Range" = "bytes " + std::to_string(first) + "-" + std::to_string(last) +
+					     "/" + std::to_string(file_size);
+	} else {
+		// kAbsent (no header) and kIgnore (unsupported, malformed, or a multi-range
+		// set) both answer 200 with the whole file. kIgnore is RFC 7233 3.1's explicit
+		// permission being used as the CVE-2011-3192 mitigation -- see SharedContent.h.
+		r.status = 200;
+		first = 0;
+		last = file_size - 1;
+	}
+	r.headers"Accept-Ranges" = "bytes";
+
+	CHttpServer::Response::FileSource fs;
+	fs.fs_path = fs_path;
+	fs.first = first;
+	fs.last = last;
+	r.file = fs;
+	// HEAD needs the window too: the transport runs the serializer in split mode, so it
+	// never reads a byte, but Content-Length still comes from RangeFileBody::size and
+	// reports what the equivalent GET would send.
+	return r;
+}
+
+namespace
+{
+struct SharedDirEntry
+{
+	wxString path;
+	bool recursive = false;
+};
+
+// The core's shared-directory op is a whole-list replace, so adding or removing a
+// single root is a read-modify-write. Serialise those here: SendRecvSerialized locks
+// per roundtrip, not across the pair, so two concurrent single-entry calls would
+// otherwise read the same list and the second SET would drop the first's change.
+// Nothing can make this atomic against a simultaneous amuleGUI edit -- the protocol
+// has no compare-and-set -- so that stays last-write-wins.
+std::mutex s_sharedDirsMutex;
+
+// Returns false and fills `err` when EC is unreachable or refuses.
+bool FetchSharedDirs(CamuleapiApp &app, std::vector<SharedDirEntry> &out, std::string &err)
+{
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_GET_SHARED_DIRS));
+	const CECPacket *ec_resp = app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		err = "no reply from amuled";
+		return false;
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		err = ec_err_msg;
+		return false;
+	}
+	for (const CECTag &tag : *ec_resp) {
+		if (tag.GetTagName() != EC_TAG_SHAREDDIR) {
+			continue;
+		}
+		const CECTag *recursive_tag = tag.GetTagByName(EC_TAG_SHAREDDIR_RECURSIVE);
+		SharedDirEntry entry;
+		entry.path = tag.GetStringData();
+		entry.recursive = recursive_tag != nullptr && recursive_tag->GetInt() != 0;
+		out.push_back(entry);
+	}
+	delete ec_resp;
+	return true;
+}
+// Replace the core's roots with `dirs`. The core applies every path that
+// validates and reports the rest, so one bad entry does not discard the edit.
+CHttpServer::Response ApplySharedDirs(CamuleapiApp &app, const std::vector<SharedDirEntry> &dirs)
+{
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SET_SHARED_DIRS));
+	for (const SharedDirEntry &entry : dirs) {
+		CECTag dir_tag(EC_TAG_SHAREDDIR, entry.path);
+		if (entry.recursive) {
+			dir_tag.AddTag(CECTag(EC_TAG_SHAREDDIR_RECURSIVE, (uint8)1));
+		}
+		ec_req->AddTag(dir_tag);
+	}
+
+	const CECPacket *ec_resp = app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "no reply from amuled");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(502, "amuled_rejected", ec_err_msg.c_str());
+	}
+
+	// One entry per submitted path, in the envelope every other multi-item mutation
+	// uses, so a caller can tell an applied path from one the response simply did not
+	// mention. Reasons are rendered here rather than shipped as text from a core whose
+	// locale is not the caller's.
+	std::map<std::string, std::string> rejected; // path -> reason code
+	for (const CECTag &tag : *ec_resp) {
+		if (tag.GetTagName() != EC_TAG_SHAREDDIR_REJECTED) {
+			continue;
+		}
+		const CECTag *err_tag = tag.GetTagByName(EC_TAG_SHAREDDIR_ERROR);
+		rejectedstd::string(tag.GetStringData().utf8_str()) =
+			(err_tag != nullptr && err_tag->GetInt() == 2) ? "not_readable" : "not_found";
+	}
+	delete ec_resp;
+
+	std::vector<BulkItem> results;
+	results.reserve(dirs.size());
+	for (const SharedDirEntry &entry : dirs) {
+		const std::string path(entry.path.utf8_str());
+		const auto it = rejected.find(path);
+		if (it == rejected.end()) {
+			results.push_back(BulkOk(path));
+		} else if (it->second == "not_readable") {
+			results.push_back(BulkErr(path, 403, "not_readable", "amuled cannot read that path"));
+		} else {
+			results.push_back(BulkErr(path, 404, "not_found", "no such directory"));
+		}
+	}
+	return BulkResultsResponse(results, 200);
+}
+} // namespace
+
+// The core's configured share roots: the explicit ones and the recursive ones, each
+// with the flag that says which. This is the *intent*, not the expansion -- a
+// recursive root is one entry here however many subdirectories it covers.
+CHttpServer::Response CApiDispatcher::HandleSharedDirectories(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_GET_SHARED_DIRS));
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "no reply from amuled");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(502, "amuled_rejected", ec_err_msg.c_str());
+	}
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("directories");
+	w.BeginArray();
+	for (const CECTag &tag : *ec_resp) {
+		if (tag.GetTagName() != EC_TAG_SHAREDDIR) {
+			continue;
+		}
+		const CECTag *recursive_tag = tag.GetTagByName(EC_TAG_SHAREDDIR_RECURSIVE);
+		w.BeginObject();
+		w.Key("path");
+		w.ValueString(tag.GetStringData());
+		w.Key("recursive");
+		w.ValueBool(recursive_tag != nullptr && recursive_tag->GetInt() != 0);
+		w.EndObject();
+	}
+	w.EndArray();
+	w.EndObject();
+	delete ec_resp;
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// Replace the whole set of roots. A full replace rather than add/remove verbs
+// because that is exactly what the core's EC op does. The core validates each path
+// (a REST client cannot stat the core's filesystem), applies the ones that pass and
+// reports the rest.
+CHttpServer::Response CApiDispatcher::HandleSharedDirectoriesPut(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+	const auto dirs_it = obj.find("directories");
+	if (dirs_it == obj.end() || !dirs_it->second.is<picojson::array>()) {
+		return ErrorResponse(400, "bad_request", "`directories` must be an array");
+	}
+
+	std::vector<SharedDirEntry> dirs;
+	for (const auto &entry : dirs_it->second.get<picojson::array>()) {
+		if (!entry.is<picojson::object>()) {
+			return ErrorResponse(400, "bad_request", "each directory must be an object");
+		}
+		const auto &dir = entry.get<picojson::object>();
+		const auto path_it = dir.find("path");
+		if (path_it == dir.end() || !path_it->second.is<std::string>() ||
+			path_it->second.get<std::string>().empty()) {
+			return ErrorResponse(400, "bad_request", "each directory needs a non-empty `path`");
+		}
+		SharedDirEntry parsed;
+		parsed.path = wxString::FromUTF8(path_it->second.get<std::string>().c_str());
+		const auto rec_it = dir.find("recursive");
+		if (rec_it != dir.end()) {
+			if (!rec_it->second.is<bool>()) {
+				return ErrorResponse(400, "bad_request", "`recursive` must be a boolean");
+			}
+			parsed.recursive = rec_it->second.get<bool>();
+		}
+		dirs.push_back(parsed);
+	}
+
+	// Whole-list replace: no read-modify-write, so no lock needed beyond the
+	// per-roundtrip one SendRecvSerialized already holds.
+	return ApplySharedDirs(m_app, dirs);
+}
+
+// Add one root, leaving the others alone. Idempotent: re-adding a configured path
+// just updates its recursive flag, which is friendlier to scripts than a conflict.
+// Read-modify-write, so it runs under s_sharedDirsMutex.
+CHttpServer::Response CApiDispatcher::HandleSharedDirectoriesAdd(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+	const auto path_it = obj.find("path");
+	if (path_it == obj.end() || !path_it->second.is<std::string>() ||
+		path_it->second.get<std::string>().empty()) {
+		return ErrorResponse(400, "bad_request", "`path` must be a non-empty string");
+	}
+	bool recursive = false;
+	const auto rec_it = obj.find("recursive");
+	if (rec_it != obj.end()) {
+		if (!rec_it->second.is<bool>()) {
+			return ErrorResponse(400, "bad_request", "`recursive` must be a boolean");
+		}
+		recursive = rec_it->second.get<bool>();
+	}
+	const wxString wanted = wxString::FromUTF8(path_it->second.get<std::string>().c_str());
+
+	std::lock_guard<std::mutex> guard(s_sharedDirsMutex);
+	std::vector<SharedDirEntry> dirs;
+	std::string ec_err;
+	if (!FetchSharedDirs(m_app, dirs, ec_err)) {
+		return ErrorResponse(503, "ec_unavailable", ec_err.c_str());
+	}
+	bool found = false;
+	for (SharedDirEntry &entry : dirs) {
+		if (entry.path == wanted) {
+			entry.recursive = recursive;
+			found = true;
+			break;
+		}
+	}
+	if (!found) {
+		SharedDirEntry added;
+		added.path = wanted;
+		added.recursive = recursive;
+		dirs.push_back(added);
+	}
+	return ApplySharedDirs(m_app, dirs);
+}
+
+// Remove one root. The path arrives as a query parameter rather than a path segment
+// because it is an absolute filesystem path. Unknown paths are a 404 so a typo is
+// visible instead of silently succeeding.
+CHttpServer::Response CApiDispatcher::HandleSharedDirectoriesDelete(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	std::string query;
+	const std::size_t q = req.target.find('?');
+	if (q != std::string::npos) {
+		query = req.target.substr(q + 1);
+	}
+	const auto qmap = web_api_path::ParseQuery(query);
+	const auto path_param = qmap.find("path");
+	if (path_param == qmap.end() || path_param->second.empty()) {
+		return ErrorResponse(400, "bad_request", "`path` query parameter is required");
+	}
+	const std::string wanted_utf8 = path_param->second;
+	const wxString wanted = wxString::FromUTF8(wanted_utf8.c_str());
+
+	std::lock_guard<std::mutex> guard(s_sharedDirsMutex);
+	std::vector<SharedDirEntry> dirs;
+	std::string ec_err;
+	if (!FetchSharedDirs(m_app, dirs, ec_err)) {
+		return ErrorResponse(503, "ec_unavailable", ec_err.c_str());
+	}
+	const size_t before = dirs.size();
+	for (std::vector<SharedDirEntry>::iterator it = dirs.begin(); it != dirs.end(); ++it) {
+		if (it->path == wanted) {
+			dirs.erase(it);
+			break;
+		}
+	}
+	if (dirs.size() == before) {
+		return ErrorResponse(404, "not_found", "no such shared directory");
+	}
+	return ApplySharedDirs(m_app, dirs);
+}
+
+namespace
+{
+
+// Send EC_OP_REFRESH_MEDIA_METADATA and turn the reply into a response. `hashTag`
+// is null for the whole-share form. The op is deliberately not behind a capability
+// tag, so a daemon that predates it answers EC_OP_FAILED rather than being
+// detectable in advance.
+CHttpServer::Response SendMediaRefresh(CamuleapiApp &app, const CECTag *hashTag, const char *what)
+{
+	auto ec_req = std::make_unique<CECPacket>(EC_OP_REFRESH_MEDIA_METADATA);
+	if (hashTag) {
+		ec_req->AddTag(*hashTag);
+	}
+	const CECPacket *ec_resp = app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for media refresh");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		const bool unknown_op = ec_err_msg.find("Invalid opcode") != std::string::npos;
+		delete ec_resp;
+		if (unknown_op) {
+			// 503, matching every other ec_unsupported site in this file and the rule
+			// stated in App.cpp. 501 is arguably the better literal answer for "server
+			// does not implement it", but one endpoint disagreeing with seven is worse.
+			return ErrorResponse(503,
+				"ec_unsupported",
+				"the connected amuled does not implement media metadata refresh");
+		}
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	std::uint32_t queued = 0;
+	if (const CECTag *t = ec_resp->GetTagByName(EC_TAG_KNOWNFILE_MEDIA_QUEUED)) {
+		queued = static_cast<std::uint32_t>(t->GetInt());
+	}
+	delete ec_resp;
+
+	// 202, not 200: amuled queues the probes on its media-probe worker and answers
+	// immediately, so nothing has been re-extracted yet. `queued` is how many files were
+	// accepted for probing; files the scheduler dropped (not audio/video, incomplete,
+	// missing on disk) are not counted.
+	CHttpServer::Response r;
+	r.status = 202;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("scope");
+	w.ValueString(wxString::FromAscii(what));
+	w.Key("queued_file_count");
+	w.ValueInt(static_cast<int64_t>(queued));
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandleSharedMediaRefresh(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	return SendMediaRefresh(m_app, nullptr, "all");
+}
+
+CHttpServer::Response CApiDispatcher::HandleSharedMediaRefreshOne(
+	const CHttpServer::Request &req, const std::string &key)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	if (auto r = RequireHashPath(key))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	webapi::FileSnapshot s;
+	if (!FindSharedByKey(m_state, key, s)) {
+		return ErrorResponse(404, "not_found", "no shared file with that hash");
+	}
+	// Same exclusion the daemon's Refresh mode applies: an in-progress download
+	// has no complete file to read. Rejected here so the caller is told why.
+	if (s.IsIncompletePartfile()) {
+		return ErrorResponse(409,
+			"partfile_unsupported",
+			"media metadata cannot be extracted from an incomplete download");
+	}
+	CMD4Hash file_hash;
+	if (!HashFromHex(s.hash, file_hash)) {
+		return ErrorResponse(500, "internal_error", "failed to decode file hash");
+	}
+	const CECTag hashTag(EC_TAG_KNOWNFILE, file_hash);
+	return SendMediaRefresh(m_app, &hashTag, "file");
+}
+
+CHttpServer::Response CApiDispatcher::HandleSharedReload(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	// EC_OP_SHAREDFILES_RELOAD: amuled schedules a re-walk of every configured share
+	// root and answers immediately, so 202 is literal. The walk starts on amuled's next
+	// Process() tick and repeated calls while one is pending coalesce into a single
+	// walk.
+	//
+	// This used to be synchronous on amuled's side, on the assumption that the walk
+	// "completes in well under a second" -- exactly the assumption that fails on a large
+	// or network-mounted share, and because our EC lane is one serialised worker, the
+	// blocked roundtrip held the in-flight slot, filled the queue and turned unrelated
+	// endpoints into 503s.
+	//
+	// Completion is observable through the amule log and the shared_added /
+	// shared_removed events, not through this response.
+	return SimpleConnControlOp(m_app, m_state, EC_OP_SHAREDFILES_RELOAD, 202);
+}
+
+namespace
+{
+
+// Parse a uint8 index from a URL capture. Categories are 0..255 (the EC tag
+// stores them as uint8). Returns false on overflow, negative or non-digits.
+bool ParseCategoryIndex(const std::string &s, std::uint8_t &out)
+{
+	if (s.empty())
+		return false;
+	char *end = nullptr;
+	const unsigned long v = std::strtoul(s.c_str(), &end, 10);
+	if (end == s.c_str() || *end != '\0')
+		return false;
+	if (v > 255)
+		return false;
+	out = static_cast<std::uint8_t>(v);
+	return true;
+}
+
+// Build the CEC_Category_Tag-shaped tag amuled expects: parent EC_TAG_CATEGORY with
+// the index as the int payload, and children EC_TAG_CATEGORY_TITLE ("name" in our
+// API), _PATH ("path"), _COMMENT ("comment"), _COLOR (uint32), _PRIO (uint8). For
+// CREATE the index is 0xFFFFFFFF (amuled assigns the next free slot); for UPDATE the
+// actual index; for DELETE just (EC_TAG_CATEGORY, index).
+CECTag BuildCategoryTag(std::uint32_t index,
+	const std::string &name,
+	const std::string &path,
+	const std::string &comment,
+	std::uint32_t color,
+	std::uint8_t prio)
+{
+	CECTag t(EC_TAG_CATEGORY, index);
+	t.AddTag(CECTag(EC_TAG_CATEGORY_TITLE, wxString::FromUTF8(name.c_str())));
+	t.AddTag(CECTag(EC_TAG_CATEGORY_PATH, wxString::FromUTF8(path.c_str())));
+	t.AddTag(CECTag(EC_TAG_CATEGORY_COMMENT, wxString::FromUTF8(comment.c_str())));
+	t.AddTag(CECTag(EC_TAG_CATEGORY_COLOR, color));
+	t.AddTag(CECTag(EC_TAG_CATEGORY_PRIO, prio));
+	return t;
+}
+
+// Extract optional name/path/comment/color/priority from a JSON object. The
+// `is_create` flag enables required-field enforcement: CREATE needs a name,
+// UPDATE/PATCH treat all as optional.
+struct CategoryFields
+{
+	std::string name;
+	std::string path;
+	std::string comment;
+	std::uint32_t color = 0;
+	std::uint8_t prio = PR_NORMAL;
+	bool has_name = false;
+	bool has_path = false;
+	bool has_comment = false;
+	bool has_color = false;
+	bool has_prio = false;
+};
+
+CHttpServer::Response ParseCategoryFields(const picojson::object &obj, CategoryFields &out)
+{
+	auto get_string = &obj(const char *key, std::string &dst, bool &has) -> CHttpServer::Response {
+		const auto it = obj.find(key);
+		if (it == obj.end()) {
+			CHttpServer::Response ok;
+			ok.status = 0;
+			return ok;
+		}
+		if (!it->second.is<std::string>()) {
+			return ErrorResponse(400, "bad_request", "category field must be a string");
+		}
+		dst = it->second.get<std::string>();
+		has = true;
+		CHttpServer::Response ok;
+		ok.status = 200;
+		return ok;
+	};
+
+	auto r1 = get_string("name", out.name, out.has_name);
+	if (r1.status >= 400)
+		return r1;
+	// `save_path` on the write side too (R9/R6 with the read key).
+	auto r2 = get_string("save_path", out.path, out.has_path);
+	if (r2.status >= 400)
+		return r2;
+	auto r3 = get_string("comment", out.comment, out.has_comment);
+	if (r3.status >= 400)
+		return r3;
+	{
+		const auto it = obj.find("color");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>()) {
+				return ErrorResponse(
+					400, "bad_request", "`color` must be a \"#rrggbb\" string");
+			}
+			const std::string v = it->second.get<std::string>();
+			const bool well_formed = v.size() == 7 && v0 == '#' &&
+						 std::all_of(v.begin() + 1, v.end(), (unsigned char ch) {
+							 return std::isxdigit(ch) != 0;
+						 });
+			if (!well_formed) {
+				return ErrorResponse(
+					400, "bad_request", "`color` must be a \"#rrggbb\" string");
+			}
+			const auto hex = &v(std::size_t i) {
+				return static_cast<std::uint32_t>(std::stoul(v.substr(i, 2), nullptr, 16));
+			};
+			// Repack into the core's 0x00BBGGRR layout, red in the low byte.
+			out.color = hex(1) | (hex(3) << 8) | (hex(5) << 16);
+			out.has_color = true;
+		}
+	}
+	{
+		const auto it = obj.find("priority");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>()) {
+				return ErrorResponse(400, "bad_request", "`priority` must be a string");
+			}
+			if (!FilePriorityToCode(it->second.get<std::string>(), kPrioCategory, out.prio)) {
+				return ErrorResponse(
+					400, "bad_request", FilePriorityAccepted(kPrioCategory).c_str());
+			}
+			out.has_prio = true;
+		}
+	}
+	CHttpServer::Response ok;
+	ok.status = 200;
+	return ok;
+}
+
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandleCategoryCreate(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+
+	CategoryFields f;
+	auto err = ParseCategoryFields(obj, f);
+	if (err.status >= 400)
+		return err;
+	if (!f.has_name || f.name.empty()) {
+		return ErrorResponse(400, "bad_request", "required string field `name` is missing");
+	}
+
+	// CREATE: index sentinel is 0xFFFFFFFF -- amuled assigns the next
+	// free slot and returns NOOP on success.
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_CREATE_CATEGORY));
+	ec_req->AddTag(BuildCategoryTag(0xFFFFFFFFu, f.name, f.path, f.comment, f.color, f.prio));
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for CREATE_CATEGORY");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		// A kept-path reply means the category exists; only the path was refused, and
+		// `save_path` on the follow-up read is the truthful answer. Anything else is a
+		// real failure.
+		std::string kept_path;
+		const bool kept = EcCategoryPathKept(ec_resp, kept_path);
+		delete ec_resp;
+		if (!kept) {
+			return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+		}
+	} else {
+		delete ec_resp;
+	}
+
+	// Tick so the new category is in the snapshot the caller's follow-up GET
+	// reads, even though this response does not carry it.
+	(void)RefresherTick(m_app, m_state);
+
+	CHttpServer::Response r;
+	// 202 with no body: amuled's EC op does not return the index it assigned, so naming
+	// the new category here meant scanning the snapshot for a matching name -- a guess
+	// that can silently answer the wrong shape.
+	r.status = 202;
+	r.content_type.clear();
+	return r;
+}
+
+// GET /categories/{index}. GUEST, matching the collection read.
+CHttpServer::Response CApiDispatcher::HandleCategoryOne(
+	const CHttpServer::Request &req, const std::string &index_str)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	std::uint8_t idx = 0;
+	if (!ParseCategoryIndex(index_str, idx)) {
+		return ErrorResponse(400, "bad_request", "path `{index}` must be a uint8 in 0, 255");
+	}
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	// The same set the collection lists, synthetic default included, so the
+	// two routes cannot disagree about which categories exist.
+	bool found = false;
+	webapi::CategorySnapshot cat;
+	for (const auto &c : CategoriesWithDefault(m_state)) {
+		if (static_cast<std::uint8_t>(c.index) == idx) {
+			cat = c;
+			found = true;
+			break;
+		}
+	}
+	if (!found) {
+		return ErrorResponse(404, "not_found", "no category with that index");
+	}
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	WriteCategoryObject(w, cat);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleCategoryUpdate(
+	const CHttpServer::Request &req, const std::string &index_str)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	std::uint8_t idx = 0;
+	if (!ParseCategoryIndex(index_str, idx)) {
+		return ErrorResponse(400, "bad_request", "path `{index}` must be a uint8 in 0, 255");
+	}
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	// Find the existing category -- CEC_Category_Tag is not delta-friendly, so
+	// we always send the full tag and need current values for unset fields.
+	webapi::CategorySnapshot current;
+	if (!FindCategoryByIndex(m_state, idx, current)) {
+		return ErrorResponse(404, "not_found", "no category with that index");
+	}
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+
+	CategoryFields f;
+	auto err = ParseCategoryFields(obj, f);
+	if (err.status >= 400)
+		return err;
+
+	const std::string name = f.has_name ? f.name : current.name;
+	const std::string path = f.has_path ? f.path : current.path;
+	const std::string comment = f.has_comment ? f.comment : current.comment;
+	const std::uint32_t color = f.has_color ? f.color : current.color;
+	const std::uint8_t prio = f.has_prio ? f.prio : current.priority_code;
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_UPDATE_CATEGORY));
+	ec_req->AddTag(BuildCategoryTag(idx, name, path, comment, color, prio));
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for UPDATE_CATEGORY");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		// As on create: a kept-path reply is a partial success. Everything else
+		// in this request landed, and the echoed object reports the kept path.
+		std::string kept_path;
+		const bool kept = EcCategoryPathKept(ec_resp, kept_path);
+		delete ec_resp;
+		if (!kept) {
+			return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+		}
+	} else {
+		delete ec_resp;
+	}
+
+	(void)RefresherTick(m_app, m_state);
+
+	webapi::CategorySnapshot after = current;
+	(void)FindCategoryByIndex(m_state, idx, after);
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	WriteCategoryObject(w, after);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleCategoryDelete(
+	const CHttpServer::Request &req, const std::string &index_str)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	std::uint8_t idx = 0;
+	if (!ParseCategoryIndex(index_str, idx)) {
+		return ErrorResponse(400, "bad_request", "path `{index}` must be a uint8 in 0, 255");
+	}
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+	// Index 0 is the implicit "All" category -- amuled treats deleting
+	// it as illegal. Reject before the EC roundtrip.
+	if (idx == 0) {
+		return ErrorResponse(400, "bad_request", "cannot delete the default (index=0) category");
+	}
+	webapi::CategorySnapshot existing;
+	if (!FindCategoryByIndex(m_state, idx, existing)) {
+		return ErrorResponse(404, "not_found", "no category with that index");
+	}
+
+	// CEC_Category_Tag CMD-detail shape: just `(EC_TAG_CATEGORY, idx)`, no
+	// children, replicating amule-remote-gui.cpp's CEC_Category_Tag(cat, EC_DETAIL_CMD).
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_DELETE_CATEGORY));
+	ec_req->AddTag(CECTag(EC_TAG_CATEGORY, static_cast<std::uint32_t>(idx)));
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for DELETE_CATEGORY");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	(void)RefresherTick(m_app, m_state);
+
+	// amuled renumbers every download's category on delete (files at the deleted index
+	// reset to 0, files above it shift down by one), but it mutates m_category directly
+	// in CPartFile::RemoveCategory without flagging the partfile dirty, so the change is
+	// never echoed back over the incremental EC feed (EC_DETAIL_INC_UPDATE) that
+	// RefresherTick consumes. Mirror the renumber into our cached snapshot ourselves --
+	// exactly as amulegui does in CDownQueueRem::ResetCatParts -- otherwise downloads
+	// keep the stale index and the next-created category silently re-adopts them.
+	m_state.MutateDownloads(idx(webapi::FileMap &files) {
+		for (auto &kv : files) {
+			webapi::FileSnapshot &f = kv.second;
+			if (!f.is_downloading) {
+				continue;
+			}
+			if (f.download.category == idx) {
+				f.download.category = 0;
+			} else if (f.download.category > idx) {
+				f.download.category -= 1;
+			}
+		}
+	});
+
+	CHttpServer::Response r;
+	// 204 with no body -- see the mutation-response rule in REFERENCE.md.
+	r.status = 204;
+	r.content_type.clear();
+	return r;
+}
+
+namespace
+{
+
+// Map wire-string search types to amule's EC_SEARCH_TYPE enum. "local" /
+// "global" / "kad" matches amulegui's UI labels.
+bool SearchTypeFromString(const std::string &s, std::uint8_t &out)
+{
+	if (s == "local") {
+		out = EC_SEARCH_LOCAL;
+		return true;
+	} else if (s == "global") {
+		out = EC_SEARCH_GLOBAL;
+		return true;
+	} else if (s == "kad") {
+		out = EC_SEARCH_KAD;
+		return true;
+	}
+	return false;
+}
+
+} // namespace
+
+CHttpServer::Response CApiDispatcher::HandleClientBrowse(
+	const CHttpServer::Request &req, const std::string &ecid_str)
+{
+	return HandleBrowse(req, ecid_str, /*by_friend=*/false);
+}
+
+CHttpServer::Response CApiDispatcher::HandleFriendBrowse(
+	const CHttpServer::Request &req, const std::string &ecid_str)
+{
+	return HandleBrowse(req, ecid_str, /*by_friend=*/true);
+}
+
+// Shared by /clients/{ecid}/shared_files and /friends/{ecid}/shared_files. Same
+// opcode and reply shape either way; only the sub-tag differs, which is what tells
+// the daemon whether the id names a live peer or a friend record. The friend form is
+// the more capable: a friend carries a stored ip:port, so the daemon can browse one
+// that is not currently connected.
+CHttpServer::Response CApiDispatcher::HandleBrowse(
+	const CHttpServer::Request &req, const std::string &ecid_str, bool by_friend)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	std::uint32_t ecid = 0;
+	if (auto r = RequireEcidPath(ecid_str, ecid))
+		return *r;
+
+	// Ask amuled to browse this peer's shared file list. In multi-search mode (amuleapi
+	// always is) the daemon allocates a browse search_id, echoes it in the reply, and
+	// files the listing under it -- so results, progress and SSE all address the browse
+	// exactly like a search.
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_FRIEND));
+	CECEmptyTag sharedtag(EC_TAG_FRIEND_SHARED);
+	sharedtag.AddTag(CECTag(by_friend ? EC_TAG_FRIEND : EC_TAG_CLIENT, ecid));
+	ec_req->AddTag(sharedtag);
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for browse");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		// The daemon replies FAILED "Client not found." for a stale/unknown ECID.
+		return ErrorResponse(404, "not_found", ec_err_msg.c_str());
+	}
+	std::uint32_t search_id = 0;
+	if (const CECTag *t = ec_resp->GetTagByName(EC_TAG_SEARCH_ID)) {
+		search_id = static_cast<std::uint32_t>(t->GetInt());
+	}
+	delete ec_resp;
+	if (search_id == 0) {
+		return ErrorResponse(502, "amuled_rejected", "daemon did not return a search_id for browse");
+	}
+
+	// A browse's "query" is the peer whose share is being listed -- that is what the
+	// daemon names the search, and what GET /search reports for it.
+	//
+	// Which collection to take the nickname from depends on how the browse was
+	// addressed. CECID hands out one global counter, so a CFriend's ECID never collides
+	// with a client's -- but it never *matches* one either, and searching the client
+	// list for it silently found nothing.
+	std::string peer_name;
+	if (by_friend) {
+		for (const auto &f : m_state.Friends()) {
+			if (f.ecid == ecid) {
+				peer_name = f.name;
+				break;
+			}
+		}
+	} else {
+		for (const auto &c : m_state.Clients()) {
+			if (c.ecid == ecid) {
+				peer_name = c.client_name;
+				break;
+			}
+		}
+	}
+	m_state.MarkSearchStarted(search_id, "browse", peer_name);
+
+	// A creation answers with the created resource and a Location, because here the
+	// daemon really does hand one back: SEARCH_START returns EC_TAG_SEARCH_ID. The row
+	// is the same shape GET /search lists, written through the same writer, so a client
+	// can drop it straight into the collection it keeps.
+	SearchListRow row;
+	row.search_id = search_id;
+	row.query = wxString::FromUTF8(peer_name.c_str());
+	row.kind = "browse";
+	row.state = "running";
+	row.started_at = m_state.SearchStartedAt(search_id);
+
+	CHttpServer::Response r;
+	r.status = 202;
+	r.content_type = "application/json";
+	r.headers"Location" = "/api/v1/search/" + std::to_string(search_id);
+	CJsonWriter w;
+	WriteSearchListRow(w, row);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleSearchStart(const CHttpServer::Request &req)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	picojson::value root;
+	std::string parse_err;
+	if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+		return ErrorResponse(400, "bad_request", parse_err.c_str());
+	}
+	const auto &obj = root.get<picojson::object>();
+
+	// Body: { "query": required string, "type": "local"|"global"|"kad" (default
+	// "global"), "file_type": optional label, "extension": optional (e.g. "mkv"),
+	// "min_size_bytes"/"max_size_bytes": optional uint64 (0 = no cap),
+	// "min_source_count": optional uint32 }
+	std::string query;
+	{
+		const auto it = obj.find("query");
+		if (it == obj.end() || !it->second.is<std::string>()) {
+			return ErrorResponse(400, "bad_request", "required string field `query` is missing");
+		}
+		query = it->second.get<std::string>();
+		if (query.empty()) {
+			return ErrorResponse(400, "bad_request", "`query` must be non-empty");
+		}
+	}
+
+	std::uint8_t search_type = EC_SEARCH_GLOBAL;
+	std::string search_kind = "global"; // mirrors the input string for state.MarkSearchStarted
+	{
+		const auto it = obj.find("type");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>()) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`type` must be one of \"local\", \"global\", \"kad\"");
+			}
+			search_kind = it->second.get<std::string>();
+			if (!SearchTypeFromString(search_kind, search_type)) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`type` must be one of \"local\", \"global\", \"kad\"");
+			}
+		}
+	}
+
+	std::string file_type;
+	{
+		const auto it = obj.find("file_type");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>()) {
+				return ErrorResponse(400, "bad_request", "`file_type` must be a string");
+			}
+			// The tokens the rows report, translated to the ed2k term amuled matches on. An
+			// unknown token used to travel to the daemon untouched and match nothing, so a
+			// typo read as "no results" rather than as a mistake.
+			const std::string token = it->second.get<std::string>();
+			if (!token.empty()) {
+				file_type = webapi::SearchFileTypeTerm(token);
+				if (file_type.empty()) {
+					const std::string msg = "`file_type` must be one of " +
+								webapi::SearchFileTypeTokenList() +
+								", or omitted for any type";
+					return ErrorResponse(400, "bad_request", msg.c_str());
+				}
+			}
+		}
+	}
+	std::string extension;
+	{
+		const auto it = obj.find("extension");
+		if (it != obj.end()) {
+			if (!it->second.is<std::string>()) {
+				return ErrorResponse(400, "bad_request", "`extension` must be a string");
+			}
+			extension = it->second.get<std::string>();
+		}
+	}
+	std::uint64_t min_size = 0;
+	std::uint64_t max_size = 0;
+	std::uint32_t min_avail = 0;
+	{
+		const auto it = obj.find("min_size_bytes");
+		if (it != obj.end()) {
+			if (!it->second.is<double>()) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`min_size_bytes` must be a non-negative integer (bytes)");
+			}
+			const double v = it->second.get<double>();
+			if (!IsIntegralJsonNumber(v) || v < 0)
+				return ErrorResponse(400,
+					"bad_request",
+					"`min_size_bytes` must be a non-negative integer");
+			min_size = static_cast<std::uint64_t>(v);
+		}
+	}
+	{
+		const auto it = obj.find("max_size_bytes");
+		if (it != obj.end()) {
+			if (!it->second.is<double>()) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`max_size_bytes` must be a non-negative integer (bytes; 0 = no "
+					"cap)");
+			}
+			const double v = it->second.get<double>();
+			if (!IsIntegralJsonNumber(v) || v < 0)
+				return ErrorResponse(400,
+					"bad_request",
+					"`max_size_bytes` must be a non-negative integer");
+			max_size = static_cast<std::uint64_t>(v);
+		}
+	}
+	{
+		const auto it = obj.find("min_source_count");
+		if (it != obj.end()) {
+			if (!it->second.is<double>()) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`min_source_count` must be a non-negative integer");
+			}
+			const double v = it->second.get<double>();
+			if (!IsIntegralJsonNumber(v)) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`min_source_count` must be a non-negative integer");
+			}
+			if (v < 0 || v > 4294967295.0) {
+				return ErrorResponse(400, "bad_request", "`min_source_count` out of range");
+			}
+			min_avail = static_cast<std::uint32_t>(v);
+		}
+	}
+
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_SEARCH_START));
+	ec_req->AddTag(CEC_Search_Tag(wxString::FromUTF8(query.c_str()),
+		static_cast<EC_SEARCH_TYPE>(search_type),
+		wxString::FromUTF8(file_type.c_str()),
+		wxString::FromUTF8(extension.c_str()),
+		min_avail,
+		min_size,
+		max_size));
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for SEARCH_START");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	// The daemon (in multi-search mode) allocates a globally-unique search_id and echoes
+	// it in the START reply; every subsequent results/stop/more call is addressed by it,
+	// so a reply without one leaves the caller nothing to address.
+	std::uint32_t search_id = 0;
+	if (const CECTag *t = ec_resp->GetTagByName(EC_TAG_SEARCH_ID)) {
+		search_id = static_cast<std::uint32_t>(t->GetInt());
+	}
+	delete ec_resp;
+	if (search_id == 0) {
+		return ErrorResponse(
+			502, "amuled_rejected", "daemon did not return a search_id for SEARCH_START");
+	}
+
+	// Seed this search's slot: the refresher polls EC_OP_SEARCH_RESULTS + _PROGRESS for
+	// it each tick until the daemon reports completion. This is the single fetcher, so
+	// SSE search_result_added / search_progress fire on the same delta a polling
+	// consumer would observe.
+	m_state.MarkSearchStarted(search_id, search_kind, query);
+
+	// Same creation shape as the browse handler above: the daemon hands back
+	// EC_TAG_SEARCH_ID, so the response carries the resource and a Location.
+	SearchListRow row;
+	row.search_id = search_id;
+	row.query = wxString::FromUTF8(query.c_str());
+	row.kind = search_kind;
+	row.state = "running";
+	row.started_at = m_state.SearchStartedAt(search_id);
+
+	CHttpServer::Response r;
+	r.status = 202;
+	r.content_type = "application/json";
+	r.headers"Location" = "/api/v1/search/" + std::to_string(search_id);
+	CJsonWriter w;
+	WriteSearchListRow(w, row);
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// The three per-search actions share one EC exchange: address the search by
+// EC_TAG_SEARCH_ID, send, and turn a failure reply into a 400. Only the opcode, the
+// optional close flag and the success shape differ.
+CHttpServer::Response CApiDispatcher::SendSearchOp(
+	ec_opcode_t opcode, std::uint32_t search_id, bool close, int success_status, int *out_more_reaskable)
+{
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(opcode));
+	// Always addressed. A concrete id is the only way to stop the right search
+	// when several are running.
+	ec_req->AddTag(CECTag(EC_TAG_SEARCH_ID, search_id));
+	if (close) {
+		ec_req->AddTag(CECEmptyTag(EC_TAG_SEARCH_CLOSE));
+	}
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for the search operation");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	if (out_more_reaskable) {
+		// Left at its caller-set -1 when the tag is absent: that is a daemon
+		// older than it, whose answer is unknown rather than negative.
+		if (const CECTag *t = ec_resp->GetTagByName(EC_TAG_SEARCH_MORE_REASKABLE)) {
+			*out_more_reaskable = t->GetInt() != 0 ? 1 : 0;
+		}
+	}
+	delete ec_resp;
+
+	CHttpServer::Response r;
+	r.status = success_status;
+	// No body on any of the three: a 204 must not carry one per RFC 9110, and a
+	// default-constructed Response does not necessarily start empty.
+	r.content_type.clear();
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleSearchStop(
+	const CHttpServer::Request &req, std::uint32_t search_id)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto rej = RequireSearch(search_id))
+		return *rej;
+
+	// Stop only: the results stay readable -- amuled keeps them until the search is
+	// closed or evicted -- so a consumer sees the same set it was looking at. 204,
+	// matching DELETE /search/{id}.
+	return SendSearchOp(EC_OP_SEARCH_STOP, search_id, /*close=*/false, 204);
+}
+
+CHttpServer::Response CApiDispatcher::HandleSearchClose(
+	const CHttpServer::Request &req, std::uint32_t search_id)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto rej = RequireSearch(search_id))
+		return *rej;
+
+	CHttpServer::Response r = SendSearchOp(EC_OP_SEARCH_STOP, search_id, /*close=*/true, 204);
+	if (r.status != 204) {
+		return r;
+	}
+	// Drop the local slot too, so its polling stops and a later GET /search/{id}/results
+	// is a 404. The vanished slot is also what makes the next diff pass publish
+	// `search_closed` to SSE subscribers.
+	m_state.CloseSearch(search_id);
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleSearchMore(
+	const CHttpServer::Request &req, std::uint32_t search_id)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+	if (auto rej = RequireSearch(search_id))
+		return *rej;
+
+	// The desktop "More" button re-asks already-queried Kad peers for a wider result
+	// frontier. Both constraints below mirror what that button does rather than what the
+	// core tolerates: CSearchManager::RequestMoreResults returns false for a non-Kad id,
+	// and the GUI greys the button out once the search ends.
+	const webapi::SearchProgressSnapshot progress = m_state.SearchProgress(search_id);
+	if (progress.kind != "kad") {
+		return ErrorResponse(400, "bad_request", "`more` applies to Kad searches only");
+	}
+	if (progress.complete || !progress.active) {
+		return ErrorResponse(
+			400, "bad_request", "`more` applies to a running search; this one has finished");
+	}
+
+	// The daemon logs what actually happened and answers with the other half: whether a
+	// LATER press could still widen this search. False is terminal -- the reask budget
+	// of 4 is spent, or the search is inside the stopping window Kad enters 20 s before
+	// a keyword search ends. A press with no responded peer left to reask *yet* still
+	// gets 202: it clears as soon as another peer answers.
+	int reaskable = -1;
+	CHttpServer::Response r =
+		SendSearchOp(EC_OP_SEARCH_REQUEST_MORE, search_id, /*close=*/false, 202, &reaskable);
+	// Only reinterpret a success. An error from the exchange is its own answer,
+	// and -1 means the daemon never reported -- keep today's 202 for it.
+	if (r.status == 202 && reaskable == 0) {
+		return ErrorResponse(409,
+			"kad_more_exhausted",
+			"this Kad search cannot be widened any further (reask budget spent, or the "
+			"search is in its final seconds)");
+	}
+	return r;
+}
+
+CHttpServer::Response CApiDispatcher::HandleSearchDownload(
+	const CHttpServer::Request &req, const std::string &hash)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+	if (auto rej = RequireAdmin(a))
+		return *rej;
+
+	const std::string needle = LowerHexKey(hash);
+
+	CMD4Hash file_hash;
+	if (!HashFromHex(needle, file_hash)) {
+		// RequireHashPath owns the message; it is called only here, where it is
+		// certain to return a response, so the hash is not parsed twice.
+		return *RequireHashPath(needle);
+	}
+
+	// Optional body: {"category_index": uint8, "ecid": uint32}. Defaults to category 0
+	// when none is supplied, matching amulegui's CDownQueueRem::AddSearchToDownload.
+	// `ecid` selects one same-hash/different-name grouped child (from a result's
+	// `children.ecid`) so it downloads under that filename; omitted means the parent.
+	std::uint8_t category = 0;
+	bool has_ecid = false;
+	std::uint32_t ecid = 0;
+	if (!req.body.empty()) {
+		picojson::value root;
+		std::string parse_err;
+		if (!ParseJsonObjectBody(req.body, root, parse_err)) {
+			return ErrorResponse(400, "bad_request", parse_err.c_str());
+		}
+		const auto &obj = root.get<picojson::object>();
+		const auto it = obj.find("category_index");
+		if (it != obj.end()) {
+			if (!it->second.is<double>()) {
+				return ErrorResponse(400,
+					"bad_request",
+					"`category_index` must be a non-negative integer");
+			}
+			const double v = it->second.get<double>();
+			// The integrality test the message already promises: without it
+			// 2.9 was accepted and truncated to 2.
+			if (v < 0 || v > 255 || !IsIntegralJsonNumber(v)) {
+				return ErrorResponse(
+					400, "bad_request", "`category_index` must be in 0, 255");
+			}
+			category = static_cast<std::uint8_t>(v);
+		}
+		const auto eit = obj.find("ecid");
+		if (eit != obj.end()) {
+			if (!eit->second.is<double>()) {
+				return ErrorResponse(
+					400, "bad_request", "`ecid` must be a non-negative integer");
+			}
+			const double v = eit->second.get<double>();
+			if (!IsIntegralJsonNumber(v)) {
+				return ErrorResponse(
+					400, "bad_request", "`ecid` must be a non-negative integer");
+			}
+			if (v < 0 || v > 4294967295.0) {
+				return ErrorResponse(400, "bad_request", "`ecid` out of range");
+			}
+			ecid = static_cast<std::uint32_t>(v);
+			has_ecid = true;
+		}
+	}
+
+	// amuled accepts the result hash as the partfile-tag's int payload and looks it up
+	// in its searchlist, returning FAILED when absent. An `ecid` selector rides as an
+	// EC_TAG_SEARCHFILE child to pick a specific grouped result.
+	std::unique_ptr<CECPacket> ec_req(new CECPacket(EC_OP_DOWNLOAD_SEARCH_RESULT));
+	CECTag hash_tag(EC_TAG_PARTFILE, file_hash);
+	hash_tag.AddTag(CECTag(EC_TAG_PARTFILE_CAT, category));
+	if (has_ecid) {
+		hash_tag.AddTag(CECTag(EC_TAG_SEARCHFILE, ecid));
+	}
+	ec_req->AddTag(hash_tag);
+
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for DOWNLOAD_SEARCH_RESULT");
+	}
+	std::string ec_err_msg;
+	if (IsEcFailedResponse(ec_resp, ec_err_msg)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err_msg.c_str());
+	}
+	delete ec_resp;
+
+	// Inline refresh so /downloads sees the new partfile, subject to amuled's
+	// async allocate-and-hash -- it surfaces within 1-2 ticks.
+	(void)RefresherTick(m_app, m_state);
+
+	CHttpServer::Response r;
+	// 202 with no body: `hash` came from the request and `category_index` is the
+	// value applied, recoverable from the download itself.
+	r.status = 202;
+	r.content_type.clear();
+	return r;
+}
+
+// GET /search/results/{hash}/comments -- community ratings/comments for one
+// search result: the Kad notes retrieved so far plus the running flag.
+CHttpServer::Response CApiDispatcher::HandleSearchComments(
+	const CHttpServer::Request &req, const std::string &hash)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	if (auto r = RequireHashPath(hash))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	const std::string needle = LowerHexKey(hash);
+
+	// Locate the result carrying this hash across ALL open searches -- the comments
+	// endpoints are search-agnostic. Grouped children share the parent's hash, so the
+	// parent, which owns any fetched notes, matches first.
+	webapi::SearchResult hit;
+	std::uint32_t owner_search_id = 0;
+	if (!m_state.FindSearchResultByHash(needle, hit, &owner_search_id)) {
+		return ErrorResponse(404, "not_found", "no search result with that hash");
+	}
+	// This is THE polling path for a Kad notes lookup: the notes only reach amuleapi
+	// through the owning search's result fetch, and a finished search is never fetched
+	// by the tick. Without this refresh a lookup started after the search completed
+	// would leave `kad_comment_lookup_running` stuck.
+	RefreshSearchIfStale(owner_search_id);
+	// A refresh can drop the hit -- the daemon frees a search's results when it is
+	// closed, and the set is rebuilt wholesale rather than merged. The bool was
+	// discarded here, so that case answered 200 from the pre-refresh copy.
+	if (!m_state.FindSearchResultByHash(needle, hit, nullptr)) {
+		return ErrorResponse(404, "not_found", "no search result with that hash");
+	}
+
+	CHttpServer::Response r;
+	r.status = 200;
+	r.content_type = "application/json";
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("total");
+	w.ValueInt(static_cast<int64_t>(hit.comments.size()));
+	w.Key("kad_comment_lookup_running");
+	w.ValueBool(hit.kad_comment_searching);
+	w.Key("comments");
+	w.BeginArray();
+	for (const auto &c : hit.comments) {
+		w.BeginObject();
+		w.Key("username");
+		w.ValueString(wxString::FromUTF8(c.username.c_str()));
+		w.Key("filename");
+		w.ValueString(wxString::FromUTF8(c.filename.c_str()));
+		w.Key("rating");
+		w.ValueInt(static_cast<int64_t>(c.rating));
+		w.Key("comment");
+		w.ValueString(wxString::FromUTF8(c.comment.c_str()));
+		w.EndObject();
+	}
+	w.EndArray();
+	w.EndObject();
+	FinalizeJsonBody(w, r);
+	return r;
+}
+
+// POST /search/results/{hash}/comments -- trigger an on-demand Kad NOTES lookup for
+// a search result the user has not downloaded. Asynchronous on amuled (up to ~45s);
+// retrieved notes then appear via GET here and on /search/results.
+CHttpServer::Response CApiDispatcher::HandleSearchCommentsKadSearch(
+	const CHttpServer::Request &req, const std::string &hash)
+{
+	auto a = Authenticate(req);
+	if (!a.ok)
+		return a.rejection;
+
+	// Admin-only, like every other mutation. This drives an unbounded Kad
+	// NOTES lookup on the daemon, so a guest session must not reach it.
+	if (auto r = RequireAdmin(a))
+		return *r;
+
+	if (auto r = RequireSnapshot(m_state))
+		return *r;
+
+	const std::string needle = LowerHexKey(hash);
+
+	CMD4Hash file_hash;
+	if (!HashFromHex(needle, file_hash)) {
+		// RequireHashPath owns the message; it is called only here, where it is
+		// certain to return a response, so the hash is not parsed twice.
+		return *RequireHashPath(needle);
+	}
+
+	// Must be a live search result in some open search. The daemon runs one Kad NOTES
+	// lookup per hash and fans the notes out to every same-hash result, so the specific
+	// search does not matter here.
+	webapi::SearchResult known_hit;
+	std::uint32_t owner_search_id = 0;
+	if (!m_state.FindSearchResultByHash(needle, known_hit, &owner_search_id)) {
+		return ErrorResponse(404, "not_found", "no search result with that hash");
+	}
+	auto ec_req = std::make_unique<CECPacket>(EC_OP_SHARED_FILE_SEARCH_KAD_NOTES);
+	ec_req->AddTag(CECTag(EC_TAG_KNOWNFILE, file_hash));
+	const CECPacket *ec_resp = m_app.SendRecvSerialized(ec_req.get());
+	if (!ec_resp) {
+		return ErrorResponse(503, "ec_unavailable", "EC roundtrip failed for SEARCH_KAD_NOTES");
+	}
+	std::string ec_err;
+	if (IsEcFailedResponse(ec_resp, ec_err)) {
+		delete ec_resp;
+		return ErrorResponse(400, "amuled_rejected", ec_err.c_str());
+	}
+	delete ec_resp;
+
+	// Refresh AFTER the lookup has been started, for the same reason the GET refreshes
+	// at all: a finished search is otherwise frozen, and the flag this POST turns on
+	// would never be observed turning off again. Order matters -- refreshing first
+	// cached a pre-lookup snapshot and spent the one-second ClaimSearchRefresh token on
+	// it, so a GET issued straight after reported `kad_comment_lookup_running: false`
+	// for a lookup just begun.
+	RefreshSearchIfStale(owner_search_id);
+
+	CHttpServer::Response r;
+	// 202 with no body: any field here could hold exactly one value,
+	// so it would say nothing the status code has not already said.
+	r.status = 202;
+	r.content_type.clear();
+	return r;
+}
+
+// CORS for the replies the transport builds without a parsed request: the read-side
+// limits and the request timeout. Takes the raw Origin header because at that point
+// there is no Request to resolve one from.
+void CApiDispatcher::StampCorsForTransport(
+	std::map<std::string, std::string> &headers, const std::string &origin_header)
+{
+	CHttpServer::Request synthetic;
+	if (!origin_header.empty()) {
+		synthetic.headers.emplace("Origin", origin_header);
+	}
+	const CorsDecision cors_org = ResolveCorsOrigin(synthetic, m_config);
+	ApplyCorsHeaders(headers, cors_org, m_config.ServerCfg().allow_cors);
+}
+
+boost::optional<CHttpServer::Response> CApiDispatcher::PreflightEvents(const CHttpServer::Request &req)
+{
+	// Same bearer/cookie check the live handler does, but run on the I/O thread
+	// BEFORE a worker is spawned and BEFORE the 32-slot SSE budget is touched, so the
+	// slot stays free for legitimate subscribers.
+	auto a = Authenticate(req);
+	if (!a.ok) {
+		// CORS on the rejection too: leaving the 401/403/429 without it means a
+		// cross-origin SSE client sees an opaque fetch failure exactly when it most
+		// needs to read why it was turned away.
+		{
+			const CorsDecision cors_org = ResolveCorsOrigin(req, m_config);
+			ApplyCorsHeaders(a.rejection.headers, cors_org, m_config.ServerCfg().allow_cors);
+		}
+		return a.rejection;
+	}
+	// A HEAD here asks what a GET would answer with, not for the stream. Answered in the
+	// dispatcher rather than the transport so it picks up the same CORS bundle the
+	// stream carries.
+	if (req.method == "HEAD") {
+		CHttpServer::Response probe;
+		probe.status = 200;
+		probe.content_type = "text/event-stream";
+		probe.headers"Cache-Control" = "no-cache";
+		probe.headers"X-Accel-Buffering" = "no";
+		// Mirror the encoding the GET would negotiate. The probe body is empty, so
+		// nothing downstream will compress it and the header has to be stated: without
+		// it a HEAD says identity while the stream is gzipped.
+		if (AcceptsGzip(FindHeaderCaseInsensitive(req.headers, "Accept-Encoding"))) {
+			probe.headers"Content-Encoding" = "gzip";
+		}
+		// NOT keep-alive: this connection is answered and closed, and advertising reuse
+		// makes a pooling client fail its next request on a socket we already shut down.
+		probe.headers"Connection" = "close";
+		{
+			const CorsDecision cors_org = ResolveCorsOrigin(req, m_config);
+			ApplyCorsHeaders(probe.headers, cors_org, m_config.ServerCfg().allow_cors);
+		}
+		return probe;
+	}
+
+	// `?channels=` is a 400, not "no filter". The surface's own query rule already says
+	// an empty value is an error rather than an omission, and this is the parameter that
+	// would otherwise be its exception: a client joining an empty selection list
+	// produces exactly this URL, so a UI with every category unchecked was handed the
+	// full firehose. Omitting the parameter remains the spelling for "every channel".
+	//
+	// Checked here rather than in the streaming handler because that one returns void --
+	// by the time it parses the query the response is already committed.
+	{
+		std::string query;
+		const std::size_t q = req.target.find('?');
+		if (q != std::string::npos)
+			query = req.target.substr(q + 1);
+		const auto qmap = web_api_path::ParseQuery(query);
+		const auto it = qmap.find("channels");
+		if (it != qmap.end() && it->second.empty()) {
+			return ErrorResponse(400,
+				"bad_request",
+				"`channels` must not be empty; omit it to receive every channel");
+		}
+	}
+	return boost::none;
+}
+
+// SSE runs on a worker thread the HTTP server spawns per connection. Auth is
+// enforced in PreflightEvents, synchronously, before the head write and the worker
+// spawn. The 15 s heartbeat is a `: keepalive\n\n` SSE comment (RFC 6202) --
+// proxies and many browsers drop idle TCP after ~30 s. DispatchStreaming reads head
+// out-params ONCE before writing, so this one function sets the head AND runs the
+// drain loop.
+void CApiDispatcher::DispatchEvents(const CHttpServer::Request &req,
+	CHttpServer::Writer &writer,
+	unsigned &http_status,
+	std::string &content_type,
+	std::map<std::string, std::string> &response_headers)
+{
+	// Auth ran inside PreflightEvents on the I/O thread before this worker
+	// spawned, so an authenticated principal can be assumed here.
+	auto a = Authenticate(req);
+	if (!a.ok) {
+		// Defence in depth: if PreflightEvents was bypassed (test harness, future
+		// routing change) we still reject here, just not as cheaply.
+		http_status = a.rejection.status;
+		content_type = "application/json";
+		writer.Write(a.rejection.body);
+		return;
+	}
+	// SSE does not need admin: reads are guest-friendly and SSE is a read-only
+	// push -- admin-gated mutations do not ship over it.
+
+	http_status = 200;
+	content_type = "text/event-stream";
+	response_headers"Cache-Control" = "no-cache";
+	response_headers"X-Accel-Buffering" = "no"; // disable nginx buffering
+
+	// CORS on the SSE response too: EventSource sends `Origin` and reads the
+	// standard bundle for credentialed cross-origin streams. No Expose-Headers.
+	{
+		const CorsDecision cors_org = ResolveCorsOrigin(req, m_config);
+		ApplyCorsHeaders(response_headers, cors_org, m_config.ServerCfg().allow_cors);
+	}
+	// No Connection: keep-alive override -- chunked + streaming requires the
+	// default, and HttpServer adds chunked transfer-encoding automatically.
+
+	// Initial reassurance chunk: some browser EventSource impls do not fire
+	// `onopen` until at least one chunk lands.
+	if (!writer.Write(": connected\n\n"))
+		return;
+
+	// Optional `?channels=<csv>`: limit the event types delivered. The mapping from
+	// EventBus event name to channel is prefix-based -- download_* -> "downloads",
+	// shared_* -> "shared", server_* -> "servers", client_* -> "clients", status_* ->
+	// "status", log_* -> "logs".
+	//
+	// The synthetic per-subscriber `resync` event is ALWAYS delivered regardless of
+	// filter: a cache invalidation the client cannot opt out of. Unknown channel names
+	// are silently ignored, for forward-compatibility.
+	std::set<std::string> channel_filter;
+	bool channels_set = false;
+	{
+		// Cap unique channel tokens at 32 so a 1 MB `channels=` query cannot
+		// build a 1M-entry set in the SSE worker.
+		constexpr std::size_t kMaxChannelTokens = 32;
+		std::string query;
+		const std::size_t q = req.target.find('?');
+		if (q != std::string::npos)
+			query = req.target.substr(q + 1);
+		const auto qmap = web_api_path::ParseQuery(query);
+		const auto it = qmap.find("channels");
+		if (it != qmap.end() && !it->second.empty()) {
+			channels_set = true;
+			std::string cur;
+			bool overflowed = false;
+			auto insert_token = &(std::string &&s) {
+				if (channel_filter.size() >= kMaxChannelTokens) {
+					overflowed = true;
+					return;
+				}
+				channel_filter.insert(std::move(s));
+			};
+			for (char c : it->second) {
+				if (c == ',') {
+					if (!cur.empty())
+						insert_token(std::move(cur));
+					cur.clear();
+					if (overflowed)
+						break;
+				} else {
+					cur.push_back(c);
+				}
+			}
+			if (!overflowed && !cur.empty())
+				insert_token(std::move(cur));
+		}
+	}
+	auto event_channel = (const std::string &name) -> std::string {
+		// Event naming convention: every bus event MUST contain at least one underscore
+		// -- the prefix before the first `_` identifies the channel. The only
+		// no-underscore name is `resync`, which the caller bypasses by name. Future
+		// bare-token events need explicit channel mapping or must always bypass.
+		const auto us = name.find('_');
+		if (us == std::string::npos)
+			return name;
+		const std::string prefix = name.substr(0, us);
+		if (prefix == "download")
+			return "downloads";
+		if (prefix == "shared")
+			return "shared";
+		if (prefix == "server")
+			return "servers";
+		if (prefix == "client")
+			return "clients";
+		if (prefix == "friend")
+			return "friends";
+		if (prefix == "status")
+			return "status";
+		if (prefix == "log")
+			return "logs";
+		if (prefix == "search")
+			return "search";
+		// Plural, matching the /chats collection: the bootstrap advice is to GET the
+		// collections matching your subscribed channels, which only works if the two
+		// names line up.
+		if (prefix == "chat")
+			return "chats";
+		return prefix;
+	};
+	auto event_passes_filter = &(const std::string &name) {
+		if (!channels_set)
+			return true;
+		// A cache invalidation is not opt-out-able, and this one arrives over the bus
+		// rather than synthesised per subscriber, so it has to bypass here as well as
+		// in the reconnect path.
+		if (name == "resync")
+			return true;
+		return channel_filter.count(event_channel(name)) > 0;
+	};
+
+	// Registers this session for the life of the stream, so the refresher knows to
+	// resume diffing. Drain blocks up to the heartbeat interval (15 s); on timeout we
+	// emit `: keepalive`.
+	//
+	// `since_id` resolution per RFC 6202 4 reconnect:
+	//  - absent / unparseable -> start from NewestId (post-connect events only)
+	//  - in-range (parsed+1 >= OldestId) -> resume from `parsed`; the first Drain
+	//    returns the missed range immediately
+	//  - gap (parsed+1 < OldestId) -> events evicted before this client read them;
+	//    emit `resync` (reason=gap), then start from NewestId
+	//  - parsed > NewestId -> stale id from a prior daemon process (ids reset to 1 on
+	//    restart); emit `resync` (reason=restart), start from NewestId.
+	webapi::CEventBus::Subscription subscription(m_app.EventBus());
+
+	std::uint64_t since_id;
+	const std::string lei = FindHeaderCaseInsensitive(req.headers, "Last-Event-ID");
+	const std::uint64_t newest = m_app.EventBus().NewestId();
+	const std::uint64_t oldest = m_app.EventBus().OldestId();
+	if (lei.empty()) {
+		// No cursor to invalidate: the client GETs the collections itself.
+		since_id = newest;
+	} else {
+		char *end = nullptr;
+		const unsigned long long parsed = std::strtoull(lei.c_str(), &end, 10);
+		if (end == lei.c_str() || *end != '\0') {
+			since_id = newest;
+		} else if (parsed > newest) {
+			// Per-subscriber synthetic event -- not on the bus. id is the current
+			// newest so the client's EventSource resumes there (no resync loop).
+			std::ostringstream frame;
+			frame << "event: resync\n"
+			      << "id: " << newest << "\n"
+			      << "data: {\"reason\":\"restart\",\"since_id\":"
+			      << static_cast<std::uint64_t>(parsed) << ",\"newest_id\":" << newest << "}\n\n";
+			if (!writer.Write(frame.str()))
+				return;
+			since_id = newest;
+		} else if (oldest == 0 || parsed + 1 >= oldest) {
+			since_id = static_cast<std::uint64_t>(parsed);
+		} else {
+			std::ostringstream frame;
+			frame << "event: resync\n"
+			      << "id: " << newest << "\n"
+			      << "data: {\"reason\":\"gap\",\"since_id\":"
+			      << static_cast<std::uint64_t>(parsed) << ",\"newest_id\":" << newest << "}\n\n";
+			if (!writer.Write(frame.str()))
+				return;
+			since_id = newest;
+		}
+	}
+	// Heartbeat is wall-clock driven, not Drain-timeout driven: a busy bus plus a
+	// `?channels=` that filters every drained event would otherwise leave the wire
+	// silent (Drain returns immediately, the loop swallows and re-enters, keepalive
+	// never fires). NAT/proxies drop idle TCP after ~30-60 s.
+	const auto heartbeat_interval = std::chrono::seconds(15);
+	auto last_write_at = std::chrono::steady_clock::now();
+	std::vector<webapi::Event> drained;
+	while (writer.Alive()) {
+		// Shutdown poll. The flag is set by the App on OnExit and Drain() returns
+		// immediately once observed, so this client is dropped cleanly before the
+		// dispatcher reset() races a worker still holding `m_app` references.
+		if (m_app.EventBus().IsShutdown())
+			break;
+		drained.clear();
+		const std::uint64_t new_high = m_app.EventBus().Drain(since_id, heartbeat_interval, drained);
+		if (!writer.Alive())
+			break;
+		if (m_app.EventBus().IsShutdown())
+			break;
+
+		// Live-path gap detection. The reconnect handler above only catches gaps at
+		// session start; once running, a burst that fills and evicts the ring between
+		// Drains would silently drop the missed range. On cursor fall-off emit a typed
+		// resync and restart at newest.
+		const std::uint64_t oldest_now = m_app.EventBus().OldestId();
+		const std::uint64_t newest_now = m_app.EventBus().NewestId();
+		if (oldest_now > 0 && since_id + 1 < oldest_now) {
+			std::ostringstream gap_frame;
+			gap_frame << "event: resync\n"
+				  << "id: " << newest_now << "\n"
+				  << "data: {\"reason\":\"gap\",\"since_id\":" << since_id
+				  << ",\"newest_id\":" << newest_now << "}\n\n";
+			if (!writer.Write(gap_frame.str()))
+				break;
+			last_write_at = std::chrono::steady_clock::now();
+			since_id = newest_now;
+			// Drop the events the Drain returned -- the client is about to
+			// re-fetch the REST collections, which is the `resync` contract.
+			continue;
+		}
+
+		// Apply ?channels= filter before emission. since_id still advances over EVERY
+		// drained event, filtered or not, so the client does not re-see them on
+		// reconnect: replay is id-based, not channel-based.
+		std::ostringstream frame;
+		bool wrote_any = false;
+		for (const auto &ev : drained) {
+			if (!event_passes_filter(ev.name))
+				continue;
+			// SSE frame:  event: <name>\nid: <id>\ndata: <data>\n\n
+			// Per RFC 6202 4 `data:` lines are single-line; our JSON payloads never
+			// contain literal newlines (EventDiff escapes them).
+			//
+			// `ev.name` is NOT escaped -- every event name on the bus is a
+			// server-controlled compile-time literal. A future publisher taking a name
+			// from external input MUST sanitize CR/LF/`\0` at its call site.
+			frame << "event: " << ev.name << "\n"
+			      << "id: " << ev.id << "\n"
+			      << "data: " << ev.data << "\n\n";
+			wrote_any = true;
+		}
+		if (wrote_any) {
+			if (!writer.Write(frame.str()))
+				break;
+			last_write_at = std::chrono::steady_clock::now();
+			since_id = new_high;
+		} else {
+			if (!drained.empty()) {
+				// Advance the cursor silently so the next Drain does not re-read them.
+				since_id = new_high;
+			}
+			// Drain timed out with nothing new, or everything was filtered out.
+			// Either way, heartbeat IFF nothing was written in the window.
+			const auto now = std::chrono::steady_clock::now();
+			if (now - last_write_at >= heartbeat_interval) {
+				if (!writer.Write(": keepalive\n\n"))
+					break;
+				last_write_at = now;
+			}
+		}
+	}
+}

amule-3.1.0.tar.gz/src/webapi/Api.h Added

@@ -0,0 +1,360 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_API_H
+#define WEBAPI_API_H
+
+#include <memory>
+#include <string>
+
+#include "Auth.h"
+#include "HttpServer.h"
+#include "Jwt.h"   // CJwt::VerifyResult, by value in AuthOutcome
+#include "State.h" // ServerInfoLog / StatsTreeNode / StatsGraphs / SearchResult
+#include "TtlCache.h"
+
+#include <ec/cpp/ECCodes.h> // ec_opcode_t, for the shared search-op sender
+
+#include <ctime>
+#include <map>
+#include <utility>
+
+class CECTag;
+class CAmuleApiConfig;
+class CamuleapiApp;
+class CJsonWriter;
+
+// Result of authenticating one request: either `ok` with the verified
+// claims, or a ready-to-send rejection.
+struct AuthOutcome
+{
+	bool ok = false;
+	CHttpServer::Response rejection;
+	CJwt::VerifyResult verified;
+};
+
+namespace webapi
+{
+class CState;
+}
+
+// Request dispatcher for the `/api/v1/*` surface. Lives between the transport (CHttpServer) and the
+// per-endpoint handlers. Owns the CJwt instance, the revocation set and the rate limiter. Config
+// and jwt are held by reference: the App constructs them once at startup and outlives every
+// Request.
+
+class CApiDispatcher
+{
+public:
+	CApiDispatcher(CAmuleApiConfig &config, CJwt &jwt, webapi::CState &state, CamuleapiApp &app);
+
+	CHttpServer::Response Dispatch(const CHttpServer::Request &req);
+
+	// Streaming entry point, called by HttpServer when the streaming_resolver matches
+	// `/api/v1/events`. Runs the SSE loop until the writer goes dead (peer disconnect) or it
+	// returns voluntarily.
+	void DispatchEvents(const CHttpServer::Request &req,
+		CHttpServer::Writer &writer,
+		unsigned &http_status,
+		std::string &content_type,
+		std::map<std::string, std::string> &response_headers);
+
+	// Synchronous preflight for the SSE path. Runs on the I/O thread BEFORE the worker thread
+	// is spawned and BEFORE the streaming-session budget is touched. boost::none admits; a
+	// 401/403/429 short-circuits without a slot.
+	boost::optional<CHttpServer::Response> PreflightEvents(const CHttpServer::Request &req);
+	// CORS for transport-built replies (408 / 413 / 431); see the .cpp.
+	void StampCorsForTransport(
+		std::map<std::string, std::string> &headers, const std::string &origin_header);
+
+private:
+	// Inner routing -- picks the right Handle*() from path and method. The public Dispatch
+	// wraps this with the ETag stamp and the If-None-Match -> 304 conversion (GET/HEAD on a 200
+	// only).
+	CHttpServer::Response DispatchToHandler(const CHttpServer::Request &req);
+
+public:
+	// Test-visible accessors: the auth-state containers are exposed so AuthTest
+	// can drive the rate-limit and revocation paths without an HTTP server.
+	webapi::CRevocationSet &Revocations() { return m_revocations; }
+	webapi::CRateLimiter &RateLimiter() { return m_rateLimiter; }
+
+private:
+	CHttpServer::Response HandleVersion(const CHttpServer::Request &);
+	CHttpServer::Response HandleVersionCheck(const CHttpServer::Request &);
+	CHttpServer::Response HandleLogin(const CHttpServer::Request &);
+	CHttpServer::Response HandleLogout(const CHttpServer::Request &);
+	CHttpServer::Response HandleSession(const CHttpServer::Request &);
+	CHttpServer::Response HandleAuthPasswords(const CHttpServer::Request &);
+	CHttpServer::Response HandleAuthPasswordsPatch(const CHttpServer::Request &);
+
+	// The one way every protected handler authenticates: bearer/cookie lookup, signature and
+	// expiry, per-IP failure limiter, revocation list, and the rule that a token older than the
+	// last credential change is dead.
+	AuthOutcome Authenticate(const CHttpServer::Request &req);
+
+	void BeginSession(
+		const CHttpServer::Request &req, Role role, CHttpServer::Response &r, CJsonWriter &w);
+	CHttpServer::Response HandleStatus(const CHttpServer::Request &);
+	CHttpServer::Response HandleDownloads(const CHttpServer::Request &);
+	// `key` accepts the lowercase 32-char hex hash OR the decimal ECID.
+	CHttpServer::Response HandleDownloadDetail(const CHttpServer::Request &, const std::string &key);
+	// per-source comments/ratings list. `key` = 32-char MD4 hash.
+	CHttpServer::Response HandleDownloadComments(const CHttpServer::Request &, const std::string &key);
+	CHttpServer::Response HandleDownloadCommentsKadSearch(
+		const CHttpServer::Request &, const std::string &key);
+	// source-reported filenames + counts. `key` = 32-char MD4 hash.
+	CHttpServer::Response HandleDownloadFilenames(const CHttpServer::Request &, const std::string &key);
+	// A4AF swap action (POST). `key` = 32-char MD4 hash; the source rows come
+	// from GET /downloads/{hash}/clients, which flags each one with `a4af`.
+	CHttpServer::Response HandleDownloadA4afAction(const CHttpServer::Request &, const std::string &key);
+	// download lifecycle mutations.
+	CHttpServer::Response HandleDownloadAdd(const CHttpServer::Request &);
+	CHttpServer::Response HandleDownloadPatch(const CHttpServer::Request &, const std::string &key);
+	// clear completed downloads.
+	CHttpServer::Response HandleDownloadDelete(const CHttpServer::Request &, const std::string &key);
+	CHttpServer::Response HandleDownloadsClearCompleted(const CHttpServer::Request &);
+	// bulk mutations over a `hashes` array, per-item `results` envelope (#358).
+	CHttpServer::Response HandleDownloadsBulkPatch(const CHttpServer::Request &);
+	CHttpServer::Response HandleDownloadsBulkDelete(const CHttpServer::Request &);
+	// server lifecycle.
+	CHttpServer::Response HandleServerAdd(const CHttpServer::Request &);
+	CHttpServer::Response HandleFriends(const CHttpServer::Request &);
+	CHttpServer::Response HandleFriendAdd(const CHttpServer::Request &);
+	CHttpServer::Response HandleFriendRemove(const CHttpServer::Request &, const std::string &ecid_str);
+	CHttpServer::Response HandleFriendPatch(const CHttpServer::Request &, const std::string &ecid_str);
+	CHttpServer::Response HandleFriendBrowse(const CHttpServer::Request &, const std::string &ecid_str);
+	CHttpServer::Response HandleServerConnect(const CHttpServer::Request &, const std::string &ecid_str);
+	CHttpServer::Response HandleServerDelete(const CHttpServer::Request &, const std::string &ecid_str);
+	CHttpServer::Response HandleServerPatch(const CHttpServer::Request &, const std::string &ecid_str);
+	// Refresh the server list from a `server.met` URL -- the same EC op the
+	// desktop GUI's "Update from URL" button uses.
+	CHttpServer::Response HandleServerUpdateFromUrl(const CHttpServer::Request &);
+	// Address-keyed aliases that resolve {ip}:{port} to the ECID and delegate to
+	// HandleServerConnect / HandleServerDelete, so clients need not GET /servers first to learn
+	// the ECID for a known address.
+	CHttpServer::Response HandleServerConnectByAddress(
+		const CHttpServer::Request &, const std::string &ip_port);
+	CHttpServer::Response HandleServerPatchByAddress(
+		const CHttpServer::Request &, const std::string &ip_port);
+	CHttpServer::Response HandleServerDeleteByAddress(
+		const CHttpServer::Request &, const std::string &ip_port);
+	// preferences PATCH.
+	CHttpServer::Response HandlePreferencesPatch(const CHttpServer::Request &);
+	// connection control.
+	CHttpServer::Response HandleNetworksConnect(const CHttpServer::Request &);
+	CHttpServer::Response HandleNetworksDisconnect(const CHttpServer::Request &);
+	CHttpServer::Response HandleKadBootstrap(const CHttpServer::Request &);
+	CHttpServer::Response HandleKadUpdateFromUrl(const CHttpServer::Request &);
+	// IP-filter actions: re-read the on-disk filter files, and download a fresh ipfilter.dat
+	// from a URL. The update's URL is optional -- it falls back to the configured
+	// security.ipfilter_update_url.
+	CHttpServer::Response HandleIpfilterReload(const CHttpServer::Request &);
+	CHttpServer::Response HandleIpfilterUpdate(const CHttpServer::Request &);
+	// POST /geoip/update -- fetch a fresh GeoIP database now. An action, so it is
+	// a route rather than a write-only boolean inside PATCH /preferences.
+	CHttpServer::Response HandleGeoipUpdate(const CHttpServer::Request &);
+	// single shared-file detail (GET / HEAD). `key` = 32-char MD4 hash.
+	CHttpServer::Response HandleSharedDetail(const CHttpServer::Request &, const std::string &key);
+	// shared file priority PATCH. `key` = hash OR ECID.
+	CHttpServer::Response HandleSharedPatch(const CHttpServer::Request &, const std::string &key);
+	// bulk shared-priority PATCH over a `hashes` array (#358).
+	CHttpServer::Response HandleSharedBulkPatch(const CHttpServer::Request &);
+	// Re-hash a shared file against its on-disk data (EC_OP_VERIFY_LOCAL_DATA).
+	// amuled schedules the task and answers immediately, so this is accepted.
+	CHttpServer::Response HandleSharedVerify(const CHttpServer::Request &, const std::string &key);
+	// The bytes of one completed shared file (GET / HEAD). The only handler that answers with a
+	// streamed file window rather than a buffered body: it resolves and containment-checks the
+	// path itself. Honours a single byte Range (206), ignores multi-range sets per RFC 7233
+	// 3.1, refuses partfiles.
+	CHttpServer::Response HandleSharedContent(const CHttpServer::Request &, const std::string &key);
+
+	// Static-frontend fallthrough. Resolves `url_path` under ServerCfg().static_root and
+	// returns the file with a content-type derived from its extension. 404 when static serving
+	// is disabled, the file is absent, or the resolved path escapes static_root (realpath
+	// containment). Falls back to index.html for extension-less paths so SPA deep links work.
+	// Never requires auth -- the shell is public, its API calls still gated.
+	CHttpServer::Response ServeStaticFile(const CHttpServer::Request &, const std::string &url_path);
+	// Country-flag artwork for `country_code`. `url_path` must be "/flags/<cc>.png" with two
+	// lowercase ASCII letters, or "/flags/unknown.png" for the "??" placeholder; the bytes come
+	// from the embedded icon table's "flag_<cc>" entry, so nothing touches the file system. 404
+	// for any other shape and for codes the famfamfam set has no artwork for. Never requires
+	// auth -- the artwork is public either way.
+	CHttpServer::Response ServeCountryFlag(const CHttpServer::Request &, const std::string &url_path);
+	// Rescan shared directories -- amuled re-walks the configured share roots.
+	// Parameterless EC op (EC_OP_SHAREDFILES_RELOAD).
+	CHttpServer::Response HandleSharedReload(const CHttpServer::Request &);
+
+	// Re-extract media metadata: the whole share, or one file by hash. Both
+	// answer 202 -- the probes are queued and the response says how many.
+	CHttpServer::Response HandleSharedMediaRefresh(const CHttpServer::Request &);
+	CHttpServer::Response HandleSharedMediaRefreshOne(
+		const CHttpServer::Request &, const std::string &hash);
+	CHttpServer::Response HandleSharedDirectories(const CHttpServer::Request &);
+	CHttpServer::Response HandleSharedDirectoriesPut(const CHttpServer::Request &);
+	CHttpServer::Response HandleSharedDirectoriesAdd(const CHttpServer::Request &);
+	CHttpServer::Response HandleSharedDirectoriesDelete(const CHttpServer::Request &);
+	// categories CRUD.
+	CHttpServer::Response HandleCategoryCreate(const CHttpServer::Request &);
+	CHttpServer::Response HandleHealth(const CHttpServer::Request &req);
+	CHttpServer::Response HandleCategoryOne(
+		const CHttpServer::Request &req, const std::string &index_str);
+	CHttpServer::Response HandleCategoryUpdate(
+		const CHttpServer::Request &, const std::string &index_str);
+	CHttpServer::Response HandleCategoryDelete(
+		const CHttpServer::Request &, const std::string &index_str);
+	// Cache miss on a search_id: ask the core once (EC_OP_SEARCH_LIST) whether it holds this id
+	// anyway -- a search another client, or the monolithic GUI, started. Seeds the local slot
+	// and returns true when found. Shared by every endpoint that addresses a search by id, so
+	// none of them can 404 on an id GET /api/v1/search just enumerated. Deliberately a one-off
+	// roundtrip on the miss, not a per-tick poll: discovery is rare.
+	bool DiscoverSearchIfHeldByCore(std::uint32_t search_id);
+	// Resolve a path-supplied search_id to a live slot, seeding it from the core on a cache
+	// miss. Every search-scoped handler starts with this, so they cannot disagree on what a 404
+	// means.
+	std::unique_ptr<CHttpServer::Response> RequireSearch(std::uint32_t search_id);
+	// Refresh one search's cached results if it is finished and its last fetch has aged out.
+	// The tick only polls ACTIVE searches, so without this a Kad notes lookup started on one of
+	// its hits would never report back, and a hit downloaded from it would keep claiming
+	// `status: "new"`.
+	void RefreshSearchIfStale(std::uint32_t search_id);
+	CHttpServer::Response HandleSearchList(const CHttpServer::Request &);
+	CHttpServer::Response HandleSearchStart(const CHttpServer::Request &);
+	CHttpServer::Response HandleSearchStop(const CHttpServer::Request &, std::uint32_t search_id);
+	// DELETE /search/{id}: stop it AND free it, daemon-side and locally.
+	CHttpServer::Response HandleSearchClose(const CHttpServer::Request &, std::uint32_t search_id);
+	// POST /search/{id}/more: the desktop "More" button, Kad-only.
+	CHttpServer::Response HandleSearchMore(const CHttpServer::Request &, std::uint32_t search_id);
+	// One addressed EC exchange for stop / close / more: they differ only in opcode, the close
+	// flag and the success status. `out_more_reaskable`, when given, receives the
+	// EC_TAG_SEARCH_MORE_REASKABLE bit as 1 or 0, or stays -1 when the daemon sent no such tag
+	// -- which is what an older daemon looks like and must never be read as "exhausted".
+	CHttpServer::Response SendSearchOp(ec_opcode_t opcode,
+		std::uint32_t search_id,
+		bool close,
+		int success_status,
+		int *out_more_reaskable = nullptr);
+	CHttpServer::Response HandleSearchDownload(const CHttpServer::Request &, const std::string &hash);
+	CHttpServer::Response HandleSearchComments(const CHttpServer::Request &, const std::string &hash);
+	CHttpServer::Response HandleSearchCommentsKadSearch(
+		const CHttpServer::Request &, const std::string &hash);
+	CHttpServer::Response HandleClients(const CHttpServer::Request &);
+	// Both per-file peer routes; `require_downloading` picks which collection
+	// the hash must belong to (downloads vs shared).
+	CHttpServer::Response HandleFileClients(
+		const CHttpServer::Request &, const std::string &key, bool require_downloading);
+	CHttpServer::Response HandleClientDetail(const CHttpServer::Request &, const std::string &ecid_str);
+	CHttpServer::Response HandleKnownClients(const CHttpServer::Request &);
+
+	// Chat. All six gate on m_app.IsServerChatActive() and answer 503 ec_unsupported otherwise:
+	// a daemon predating the chat ops asserts on the unknown opcode rather than answering
+	// EC_OP_FAILED, so the request must never go out.
+	CHttpServer::Response HandleChats(const CHttpServer::Request &);
+	CHttpServer::Response HandleChatMessages(const CHttpServer::Request &, const std::string &peer);
+	CHttpServer::Response HandleChatSend(const CHttpServer::Request &, const std::string &peer);
+	CHttpServer::Response HandleChatClose(const CHttpServer::Request &, const std::string &peer);
+	// Shared body of all three send forms; `target` is the EC tag naming the
+	// recipient, always a GUI_ID: the chat target is an address, and the caller has it.
+	CHttpServer::Response SendChatMessageTo(const CHttpServer::Request &, const CECTag &target);
+	// POST /clients/{ecid}/shared_files -- browse a peer's shared file list ("View Files").
+	// Returns a search_id addressed like any search: results via GET /search/{id}/results,
+	// progress and SSE via the standard machinery.
+	CHttpServer::Response HandleClientBrowse(const CHttpServer::Request &, const std::string &ecid_str);
+	// Shared by the /clients and /friends browse routes; `by_friend` selects
+	// which sub-tag addresses the target.
+	CHttpServer::Response HandleBrowse(
+		const CHttpServer::Request &, const std::string &ecid_str, bool by_friend);
+	CHttpServer::Response HandleSharedList(const CHttpServer::Request &);
+	CHttpServer::Response HandleServers(const CHttpServer::Request &);
+	CHttpServer::Response HandleKad(const CHttpServer::Request &);
+	CHttpServer::Response HandleCategories(const CHttpServer::Request &);
+	CHttpServer::Response HandlePreferences(const CHttpServer::Request &);
+	CHttpServer::Response HandleLogAmule(const CHttpServer::Request &);
+	CHttpServer::Response HandleLogServerinfo(const CHttpServer::Request &);
+	// Log reset mutations. Both clear the corresponding buffer on amuled's side and invalidate
+	// amuleapi's local mirror so the next GET reflects the post-reset state: the refresher's
+	// append-only path cannot shrink the amule-log cache, and the server-info lazy cache would
+	// serve stale text.
+	CHttpServer::Response HandleLogAmuleReset(const CHttpServer::Request &);
+	CHttpServer::Response HandleLogServerinfoReset(const CHttpServer::Request &);
+	CHttpServer::Response HandleStatsTree(const CHttpServer::Request &);
+	CHttpServer::Response HandleStatsGraph(const CHttpServer::Request &, const std::string &graph);
+	CHttpServer::Response HandleSearchResults(const CHttpServer::Request &, std::uint32_t search_id);
+
+	// Not const: the credential endpoints write through the config, and verifying re-reads
+	// amuleapi-passwords (so a change made elsewhere takes effect without a restart) and
+	// upgrades a stale-cost record after a match.
+	CAmuleApiConfig &m_config;
+	CJwt &m_jwt;
+	webapi::CState &m_state;
+	CamuleapiApp &m_app;
+	webapi::CRevocationSet m_revocations;
+
+	// Cached resolution of the static-frontend root. `Server/StaticRoot` wins; an empty conf
+	// value falls back to the install-path discovery chain. Resolved on the first
+	// ServeStaticFile call, then memoized for the daemon's lifetime -- editing the conf at
+	// runtime needs a restart.
+	mutable std::string m_static_root_cache;
+	mutable std::once_flag m_static_root_once;
+
+	// ETag memoization keyed on (request target, snapshot version). Every 200 GET/HEAD runs MD5
+	// over the whole body for the ETag, and on a 10K-file daemon /downloads is multi-MB, which
+	// is the dominant CPU cost of the safe-method path. On overflow the cache is cleared
+	// wholesale -- the bound is a memory backstop, not a working-set estimate.
+	mutable std::mutex m_etagCacheMu;
+	struct EtagCacheEntry
+	{
+		// Refresh revision, not a timestamp; see CApiDispatcher::Dispatch.
+		std::uint64_t snapshot_rev = 0;
+		std::string etag;
+	};
+	std::map<std::string, EtagCacheEntry> m_etagCache;
+	static constexpr std::size_t kEtagCacheCapacity = 512;
+	// Login-specific failure counter, with tight thresholds from the operator's `Auth/Login*`
+	// config: humans typing passwords rarely fail more than 5 times in 60 s, so a tight cap is
+	// the right shape for password-guessing defence.
+	webapi::CRateLimiter m_rateLimiter;
+	// Generic 401 failure counter -- logout, session, events, and every mutation endpoint.
+	// Looser than login because a misconfigured CI runner or a tab whose cookie just expired
+	// should not lock the user out, but a credential-stuffing attempt burning through stolen
+	// bearer tokens DOES need a brake. Default 30 failures in 60 s -> 5 min lockout.
+	webapi::CRateLimiter m_authRateLimiter;
+
+	// Lazy-fetch TTL caches. Each stores the snapshot value PLUS the wall-clock time at fetch,
+	// so handlers render `snapshot_at` against actual freshness rather than the refresher's
+	// tick boundary. The TTL coalesces concurrent burst reads, and the fetcher lambdas acquire
+	// m_app.m_ec_mtx AFTER the cache's own mutex -- single flight, so a second miss reads the
+	// stored value.
+	using TtlPair_StatsTree = std::pair<webapi::StatsTreeNode, std::time_t>;
+	using TtlPair_StatsGraphs = std::pair<webapi::StatsGraphs, std::time_t>;
+	using TtlPair_ServerInfo = std::pair<webapi::ServerInfoLog, std::time_t>;
+	webapi::CTtlCache<TtlPair_StatsTree> m_stats_tree_cache;
+	webapi::CTtlCache<TtlPair_StatsGraphs> m_stats_graphs_cache;
+	webapi::CTtlCache<TtlPair_ServerInfo> m_server_info_cache;
+	// /known_clients is NOT cached here: its store is fetched once on first request and then
+	// maintained by the refresher, so there is nothing to expire. /search/results is not either
+	// -- the refresher owns the polling while a search is active.
+};
+
+#endif // WEBAPI_API_H

amule-3.1.0.tar.gz/src/webapi/App.cpp Added

@@ -0,0 +1,794 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "App.h"
+
+#include <common/MuleDebug.h> // Needed for SetFatalAbortRedirectFd
+
+#include "Api.h"
+#include "HttpServer.h"
+#include "Jwt.h"
+#include "Refresher.h"
+
+#include "MD4Hash.h"
+#include "PathPatterns.h" // StripTrailingSlash
+#include "config.h"       // VERSION
+
+#include <ec/cpp/RemoteConnect.h> // SetEcConnectionLostHandler
+#include <wx/filename.h>          // wxFileName::FileExists
+
+#include <common/Format.h>
+#include <common/MD5Sum.h>
+
+#include <wx/cmdline.h>
+#include <wx/log.h>
+
+#include <atomic>
+#include <chrono>
+#include <csignal>
+#include <cstring>
+#include <cstdlib>
+#include <iostream>
+#include <thread>
+
+// mallopt. Guarded because macOS has no <malloc.h>; M_ARENA_MAX below then
+// gates the call on the libc actually providing it.
+#if defined(__has_include)
+#if __has_include(<malloc.h>)
+#include <malloc.h>
+#endif
+#endif
+
+IMPLEMENT_APP(CamuleapiApp)
+
+namespace
+{
+
+// Rotation cap for the --log-file tee. amuleapi's normal output is low volume (startup plus
+// warnings/errors, no per-request access log), so this is a runaway guard rather than a routine
+// limit; on-disk usage stays under ~2x this.
+constexpr std::size_t kLogMaxBytes = 10 * 1024 * 1024; // 10 MiB
+
+// Signal-safe shutdown gate. SIGINT/SIGTERM flip the flag; the wxApp main loop polls it every 250
+// ms. A signalfd-driven path would be cleaner, but the polling cost is one atomic load per tick and
+// the code stays portable to launchd/Windows, which have no signalfd.
+std::atomic<bool> g_shutdownRequested{ false };
+
+// Set when the daemon is shutting down because the EC connection to amuled died (a socket drop, or
+// sustained refresher failure), as opposed to an operator SIGINT/SIGTERM. Drives a non-zero exit
+// code so a process supervisor treats it as a failure and restarts the pair.
+std::atomic<bool> g_ecConnectionLost{ false };
+
+void RequestShutdown(int)
+{
+	g_shutdownRequested.store(true, std::memory_order_release);
+}
+
+// Registered with the EC layer (SetEcConnectionLostHandler) so a dropped EC socket requests this
+// daemon's normal, orderly shutdown instead of the hard _exit() the EC client does by default. Runs
+// on the asio worker thread, so it only flips atomics -- the main loop tears down (HTTP, EC, log
+// tee) on its own thread, avoiding the static-destructor race _exit() dodges.
+void HandleEcConnectionLost()
+{
+	g_ecConnectionLost.store(true, std::memory_order_release);
+	g_shutdownRequested.store(true, std::memory_order_release);
+}
+
+// Bound glibc's per-thread malloc arenas: it hands out up to 8 x ncores (the *host's* cores, which
+// a container quota does not lower) and a non-main arena never returns its high-water mark, so one
+// handler's peak becomes permanent RSS once per pool thread.
+//
+// 2 reserves nothing for the refresher -- reuse_arena() rotates main_arena in too -- it buys a
+// second lock domain and half the churn. An explicit MALLOC_ARENA_MAX wins; a zero or empty one
+// does not, since glibc rejects it.
+void CapMallocArenas()
+{
+#if defined(M_ARENA_MAX)
+	// Base 0, not 10: glibc's tunable parser takes hex and octal, so a base-10 read of
+	// MALLOC_ARENA_MAX=0x8 gives 0 and we would cap over an operator who set 8. A value glibc
+	// itself rejects still parses as 0 here.
+	const char *env = std::getenv("MALLOC_ARENA_MAX");
+	if (env && std::strtol(env, nullptr, 0) > 0) {
+		return;
+	}
+	const char *tunables = std::getenv("GLIBC_TUNABLES");
+	if (tunables) {
+		static const char key = "glibc.malloc.arena_max=";
+		const char *hit = std::strstr(tunables, key);
+		if (hit && std::strtol(hit + sizeof(key) - 1, nullptr, 0) > 0) {
+			return;
+		}
+	}
+	// M_ARENA_MAX does not set no_dyn_threshold, unlike M_MMAP_THRESHOLD.
+	mallopt(M_ARENA_MAX, 2);
+#endif
+}
+
+// glibc shrinks an arena's top on free (systrim / heap_trim) but never the free space fragmented
+// below it, which is what a tick decoding the whole daemon state leaves. malloc_trim walks every
+// arena's free chunks instead. M_TRIM_THRESHOLD, not __GLIBC__ alone: that macro is what says
+// <malloc.h> is actually in scope.
+void TrimMallocArenas()
+{
+#if defined(__GLIBC__) && defined(M_TRIM_THRESHOLD)
+	malloc_trim(0);
+#endif
+}
+
+} // namespace
+
+CamuleapiApp::CamuleapiApp() = default;
+CamuleapiApp::~CamuleapiApp()
+{
+	// wx skips OnExit() when OnInit() returns false, and destroying m_logTee below is what
+	// closes the descriptors the crash reporters hold. Drop both here so no exit path can leave
+	// one pointing at a closed, and by then possibly recycled, number.
+	SetFatalAbortRedirectFd(-1);
+	SetFatalAbortConsoleFd(-1);
+}
+
+void CamuleapiApp::OnInitCmdLine(wxCmdLineParser &parser)
+{
+	// Pulls in --host / --port / --password / --config-dir / --quiet / --verbose
+	// / --locale. The base appname becomes the executable name in usage text.
+	CaMuleExternalConnector::OnInitCmdLine(parser, "amuleapi");
+
+	parser.AddOption("",
+		"bind",
+		_("HTTP server bind address. (default: 127.0.0.1, override of amuleapi.conf "
+		  "Server/BindAddress)"),
+		wxCMD_LINE_VAL_STRING,
+		wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddOption("",
+		"http-port",
+		_("HTTP server port. (default: 4713, override of amuleapi.conf Server/Port)"),
+		wxCMD_LINE_VAL_NUMBER,
+		wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddOption("",
+		"config-dir",
+		_("Path to amuleapi config dir (default: per-platform aMule data dir)."),
+		wxCMD_LINE_VAL_STRING,
+		wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddOption("",
+		"set-admin-pass",
+		_("Set the amuleapi admin password to <plain>, storing it salted and stretched in "
+		  "amuleapi-passwords (mode 0600), then exit."),
+		wxCMD_LINE_VAL_STRING,
+		wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddOption("",
+		"set-guest-pass",
+		_("Set the amuleapi guest password to <plain>, storing it salted and stretched in "
+		  "amuleapi-passwords (mode 0600), then exit. An empty <plain> turns guest access off."),
+		wxCMD_LINE_VAL_STRING,
+		wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddSwitch("", "foreground", _("Stay in the foreground; default."), wxCMD_LINE_PARAM_OPTIONAL);
+	// No --daemon: operators wanting fork-into-background wrap amuleapi in
+	// systemd/launchd/`nohup` like any other long-running CLI.
+}
+
+bool CamuleapiApp::OnCmdLineParsed(wxCmdLineParser &parser)
+{
+	// Capture the amuleapi-specific options BEFORE delegating to the
+	// base, because the base call may exit early on --help.
+	if (parser.Found("bind", &m_cliBindAddress)) {
+		m_cliHasBindAddress = true;
+	}
+	if (parser.Found("http-port", &m_cliHttpPort)) {
+		m_cliHasHttpPort = true;
+	}
+	parser.Found("config-dir", &m_cliConfigDirOverride);
+	if (parser.Found("set-admin-pass", &m_cliSetAdminPass)) {
+		m_cliHasSetAdminPass = true;
+	}
+	if (parser.Found("set-guest-pass", &m_cliSetGuestPass)) {
+		m_cliHasSetGuestPass = true;
+	}
+	// The base class reads --host / --port / --password into m_host / m_port / m_password
+	// before we get here, but offers no "did the user actually pass this?" predicate -- m_host
+	// defaults to "127.0.0.1" unconditionally. Polling the parser directly lets
+	// LoadAmuleapiConfig() tell an explicit --host=127.0.0.1 apart from the base class's
+	// filled-in default.
+	m_cliHasEcHost = parser.Found("host");
+	m_cliHasEcPort = parser.Found("port");
+	m_cliHasEcEncryption = parser.Found("disable-ec-encryption");
+
+	return CaMuleExternalConnector::OnCmdLineParsed(parser);
+}
+
+bool CamuleapiApp::OnInit()
+{
+	// Before any secondary thread exists: an arena is assigned on a thread's
+	// first malloc and cached in its TLS, so a later cap cannot move it.
+	CapMallocArenas();
+
+	if (!CaMuleExternalConnector::OnInit()) {
+		return false;
+	}
+
+	// Resolve the config dir: explicit --config-dir wins, otherwise what the base class
+	// resolved in OnCmdLineParsed via the core's GetConfigDir(). Always set by now, so there is
+	// no third fallback -- one resolver for both daemons.
+	const wxString config_dir = m_cliConfigDirOverride.IsEmpty() ? m_configDir : m_cliConfigDirOverride;
+
+	// Tee stdout/stderr early, so startup errors and a crash backtrace are captured and
+	// timestamped. Without a log file the tee keeps the console copy only.
+	wxString logPath;
+	if (!m_noLogFile) {
+		if (!wxDirExists(config_dir)) {
+			wxFileName::Mkdir(config_dir, 0700, wxPATH_MKDIR_FULL);
+		}
+		logPath = m_logFile.IsEmpty() ? wxFileName(config_dir, "amuleapi.log").GetFullPath()
+					      : m_logFile;
+	}
+	m_logTee = std::make_unique<webapi::CLogTee>();
+	const bool toFile =
+		!logPath.IsEmpty() && m_logTee->Install(std::string(logPath.utf8_str()), kLogMaxBytes);
+	if (toFile || m_logTee->Install(std::string(), kLogMaxBytes)) {
+		// fd 2 is now a pipe drained by a forwarding thread, and that thread is gone the moment an
+		// abort takes the process down. Send the SIGABRT backtrace straight to the file instead,
+		// the same way CamuleapiApp::OnFatalException already handles the SIGSEGV path.
+		// CrashFd() survives log rotation; see CRotatingLog::PointCrashFd().
+#ifndef _WIN32
+		// Windows reserves no crash descriptor on purpose and has no SIGABRT handler to feed, so
+		// the whole redirect is skipped there rather than warned about on every start.
+		//
+		// The console descriptor goes over too: fd 2 is this process's own tee pipe, which
+		// reaches the console only while the pump thread still runs, so a reporter writes the
+		// console copy to the saved fd 2 instead.
+		SetFatalAbortConsoleFd(m_logTee->ConsoleFd());
+		const int crashFd = m_logTee->CrashFd();
+		if (crashFd >= 0) {
+			SetFatalAbortRedirectFd(crashFd);
+		} else if (toFile) {
+			// Say so rather than fall back silently: without the redirect a backtrace goes into
+			// the pipe nobody drains, which is the exact silence the redirect exists to remove.
+			std::cerr << "amuleapi: WARN no crash descriptor for the log file, "
+				     "a fatal backtrace may be lost\n";
+		}
+#endif
+		if (toFile) {
+			Show(CFormat(_("amuleapi: logging to %s\n")) % logPath);
+		}
+	} else {
+		m_logTee.reset();
+	}
+	if (!toFile && !logPath.IsEmpty()) {
+		std::cerr << "amuleapi: WARN could not open log file '" << (const char *)logPath.utf8_str()
+			  << "', continuing without it\n";
+	}
+
+	// Route wxWidgets' own log channel to stderr. amuleapi is a wxApp with the GUI core linked,
+	// so the default target is wxLogGui -- message boxes, useless on a headless daemon and
+	// never reaching the log. wxLogStderr sends them where the tee above picks them up.
+	delete wxLog::SetActiveTarget(new wxLogStderr);
+
+	if (!LoadAmuleapiConfig()) {
+		// Error already printed via Show(...).
+		return false;
+	}
+
+	// Constructed once the operator-tunable capacity is known; CEventBus clamps.
+	m_event_bus = std::unique_ptr<webapi::CEventBus>(
+		new webapi::CEventBus(m_apiConfig.StreamingCfg().event_bus_ring_capacity));
+
+	// CLI override hooks. set-*-pass exits immediately after writing.
+	if (m_cliHasSetAdminPass || m_cliHasSetGuestPass) {
+		// Both options run as one-shot CLI flows. Operators script these like `amuleapi
+		// --set-admin-pass=... && systemctl restart amuleapi`, so they MUST see a non-zero
+		// exit code on failure. Returning false from OnInit() would cancel wxApp::OnRun()
+		// but still exit 0, hence std::exit() here.
+		const int rc = m_cliHasSetAdminPass ? RunSetAdminPass() : RunSetGuestPass();
+		std::exit(rc);
+	}
+
+	return true;
+}
+
+bool CamuleapiApp::LoadAmuleapiConfig()
+{
+	const wxString config_dir = m_cliConfigDirOverride.IsEmpty() ? m_configDir : m_cliConfigDirOverride;
+
+	if (!m_apiConfig.Load(config_dir)) {
+		Show(CFormat("amuleapi: failed to load config: %s\n") %
+			wxString::FromUTF8(m_apiConfig.LastError().c_str()));
+		return false;
+	}
+
+	// Wire the EC connection params into the base-class fields ConnectAndRun reads. CLI
+	// --host/--port/--password win over amuleapi.conf, decided by the has-flag predicates: the
+	// old "is the field still at its default?" heuristic silently overwrote a literal `amuleapi
+	// --host=127.0.0.1`.
+	if (!m_cliHasEcHost) {
+		const auto &h = m_apiConfig.EcCfg().host;
+		if (!h.empty())
+			m_host = wxString::FromUTF8(h.c_str());
+	}
+	if (!m_cliHasEcPort) {
+		m_port = static_cast<long>(m_apiConfig.EcCfg().port);
+	}
+	if (!m_cliHasEcEncryption) {
+		// amuleapi.conf is the only config file amuleapi reads (see
+		// UsesConnectorConfigFile), so it is the sole source below the command line.
+		m_ECEncryption = m_apiConfig.EcCfg().encryption;
+	}
+	if (!m_apiConfig.EcCfg().password.empty()) {
+		// amuleapi.conf EC/Password is plaintext; the base class expects an MD5-hashed
+		// CMD4Hash, because that is what amuled stores. Hash here so a one-line
+		// amuleapi.conf edit gives the operator a working setup.
+		const wxString plain = wxString::FromUTF8(m_apiConfig.EcCfg().password.c_str());
+		m_password.Decode(MD5Sum(plain).GetHash());
+	}
+
+	// Ephemeral EC token, if the aMule core that spawned us left one. Both sides derive the
+	// name from webcommon rather than passing a path, because argv is world-readable via ps:
+	// telling every local user where the secret is would undo the point of writing it 0600.
+	//
+	// Wins over amuleapi.conf: when the core issued a token, that is the credential it wants us
+	// to use. There is no --password to override it with, so the token and amuleapi.conf are
+	// the only two sources.
+	//
+	// Deleted on read, not after connecting. A failed connection retries from memory, so
+	// holding the file until the handshake completes would only widen the window in which the
+	// secret is at rest.
+	{
+		const std::string tokenPath = webcommon::EcTokenFilePath(std::string(config_dir.utf8_str()));
+		std::string token;
+		if (webcommon::ReadAndConsumeEcToken(tokenPath, token)) {
+			m_password.Decode(wxString::FromUTF8(token.c_str()));
+			// Worth one line: it tells an operator which credential this instance is
+			// using, and is what the "no token left on disk" check looks for.
+			Show("amuleapi: using the ephemeral EC token from the core.\n");
+		}
+	}
+
+	return true;
+}
+
+int CamuleapiApp::RunSetAdminPass()
+{
+	const wxString hashed = MD5Sum(m_cliSetAdminPass).GetHash();
+	if (!m_apiConfig.SetPassword(webcommon::kAdminCredential, std::string(hashed.Lower().utf8_str()))) {
+		Show(CFormat("amuleapi: --set-admin-pass failed: %s\n") %
+			wxString::FromUTF8(m_apiConfig.LastError().c_str()));
+		return 1;
+	}
+	Show(_("amuleapi: admin password updated.\n"));
+	return 0;
+}
+
+int CamuleapiApp::RunSetGuestPass()
+{
+	// An empty argument clears the guest credential, which is how the
+	// guest role is disabled from the CLI.
+	std::string digest;
+	if (!m_cliSetGuestPass.IsEmpty()) {
+		digest = std::string(MD5Sum(m_cliSetGuestPass).GetHash().Lower().utf8_str());
+	}
+	if (!m_apiConfig.SetPassword(webcommon::kGuestCredential, digest)) {
+		Show(CFormat("amuleapi: --set-guest-pass failed: %s\n") %
+			wxString::FromUTF8(m_apiConfig.LastError().c_str()));
+		return 1;
+	}
+	Show(digest.empty() ? _("amuleapi: guest access disabled.\n")
+			    : _("amuleapi: guest password updated.\n"));
+	return 0;
+}
+
+int CamuleapiApp::OnRun()
+{
+	// Install signal handlers before the HTTP server starts so a signal during bring-up does
+	// not default-terminate the daemon.
+	//
+	// sigaction, not std::signal: the latter's "reset to SIG_DFL after firing" is
+	// implementation-defined (musl/Alpine and older BSDs trip it), so a second SIGINT would
+	// terminate mid-shutdown. SA_RESTART so blocking syscalls on the EC socket do not return
+	// EINTR. Windows lacks sigaction; std::signal there.
+#ifndef _WIN32
+	struct sigaction sa;
+	std::memset(&sa, 0, sizeof(sa));
+	sa.sa_handler = RequestShutdown;
+	sigemptyset(&sa.sa_mask);
+	sigaddset(&sa.sa_mask, SIGINT);
+	sigaddset(&sa.sa_mask, SIGTERM);
+#ifdef SIGHUP
+	sigaddset(&sa.sa_mask, SIGHUP);
+#endif
+	sa.sa_flags = SA_RESTART;
+	::sigaction(SIGINT, &sa, nullptr);
+	::sigaction(SIGTERM, &sa, nullptr);
+#ifdef SIGHUP
+	// SIGHUP is the "config reload" signal in long-running daemons. amuleapi has no reload
+	// story (configs are read at startup only), so treat it as a soft shutdown rather than
+	// leave the daemon in a half-state on a systemd reload.
+	::sigaction(SIGHUP, &sa, nullptr);
+#endif
+#ifdef SIGPIPE
+	// SSE peers that disappear mid-write make Linux raise SIGPIPE on the next asio::write to
+	// the closed fd, and none of the SSE socket writes pass MSG_NOSIGNAL, so the default
+	// disposition would kill the daemon on every dropped EventSource. The writes then return
+	// EPIPE and the loop bails.
+	struct sigaction sa_ign;
+	std::memset(&sa_ign, 0, sizeof(sa_ign));
+	sa_ign.sa_handler = SIG_IGN;
+	sigemptyset(&sa_ign.sa_mask);
+	sa_ign.sa_flags = 0;
+	::sigaction(SIGPIPE, &sa_ign, nullptr);
+#endif
+#else // _WIN32
+	std::signal(SIGINT, RequestShutdown);
+	std::signal(SIGTERM, RequestShutdown);
+#endif
+
+	// Turn a dropped EC connection into this daemon's orderly shutdown rather than the hard
+	// _exit() the EC client does by default: the handler flips the main-loop shutdown flag so
+	// OnExit runs. Registered before ConnectAndRun so a drop during bring-up is covered too.
+	SetEcConnectionLostHandler(&HandleEcConnectionLost);
+
+	// amuleapi addresses searches by daemon-allocated ID, so it advertises the multi-search
+	// capability at EC login. ConnectAndRun forwards this before the login packet, which puts
+	// the daemon connection into multi-search mode: it allocates and returns an
+	// EC_TAG_SEARCH_ID per start, and addresses results/progress/stop by that ID. There is no
+	// single-search fallback.
+	m_canMultiSearch = true;
+
+	// Chat: amuleapi serves /chats from the daemon's session store, so it advertises
+	// EC_TAG_CAN_CHAT_SESSIONS at login and the daemon echoes it back. The echo is what every
+	// chat endpoint gates on -- against a daemon that predates the ops, an unknown opcode
+	// asserts rather than failing.
+	m_canChat = true;
+
+	// ConnectAndRun does the EC bring-up (CRemoteConnect, ConnectToCore) and then calls
+	// TextShell, which is overridden so the daemon's main loop runs there. On EC failure it
+	// returns without ever entering TextShell.
+	ConnectAndRun(wxT("amuleapi"), wxString::FromAscii(VERSION));
+
+	// Non-zero when we stopped because EC died, so a supervisor restarts us.
+	return g_ecConnectionLost.load(std::memory_order_acquire) ? 1 : 0;
+}
+
+void CamuleapiApp::TextShell(const wxString & /*prompt*/)
+{
+	// Resolve bind addr + port. CLI takes precedence over amuleapi.conf.
+	std::string bind = m_apiConfig.ServerCfg().bind_address;
+	unsigned port = m_apiConfig.ServerCfg().port;
+	if (m_cliHasBindAddress && !m_cliBindAddress.IsEmpty()) {
+		bind = std::string(m_cliBindAddress.utf8_str());
+	}
+	if (m_cliHasHttpPort && m_cliHttpPort > 0 && m_cliHttpPort < 65536) {
+		port = static_cast<unsigned>(m_cliHttpPort);
+	}
+
+	// Bind-time hard gate against the "listening publicly with no password configured" footgun:
+	// a daemon bound to a routable interface before the operator runs `amuleapi --set-admin-
+	// pass` would still answer the unauth surface. Loopback bind + empty passwords is fine --
+	// the first-run flow IS "start on loopback, then run --set-admin-pass".
+	const bool non_loopback = (bind != "127.0.0.1" && bind != "::1" && bind != "localhost");
+	if (non_loopback && !m_apiConfig.HasAnyCredential()) {
+		Show(CFormat(_("amuleapi: refusing to start with BindAddress=%s and no "
+			       "admin/guest password configured - this would expose the "
+			       "REST surface to anyone reachable on that interface. "
+			       "Either bind to 127.0.0.1, or run "
+			       "`amuleapi --set-admin-pass=<plain>` first.\n")) %
+			wxString::FromUTF8(bind.c_str()));
+		return;
+	}
+
+	// Build the JWT machinery from the loaded secret plus a dispatcher holding the rate-limiter
+	// and revocation set by value. The dispatcher reaches the State cache through CamuleapiApp;
+	// the lambda below pins its lifetime to App's.
+	m_jwt = std::unique_ptr<CJwt>(new CJwt(m_apiConfig.JwtSecret()));
+	m_dispatcher =
+		std::unique_ptr<CApiDispatcher>(new CApiDispatcher(m_apiConfig, *m_jwt, m_state, *this));
+	CApiDispatcher *const dispatcher = m_dispatcher.get();
+	auto handler = dispatcher(const CHttpServer::Request &req) { return dispatcher->Dispatch(req); };
+
+	// Streaming resolver + handler for /api/v1/events. The resolver picks every GET that
+	// matches the path; auth is enforced inside the streaming handler, under the same role gate
+	// as regular handlers.
+	auto streaming_resolver = (const CHttpServer::Request &req) {
+		if (req.method != "GET" && req.method != "HEAD")
+			return false;
+		// Tolerate optional ?query / trailing slash, the same way the dispatcher
+		// does, so what streams here is exactly the set that would route there.
+		const std::string &t = req.target;
+		const std::size_t q = t.find('?');
+		const std::string path = (q == std::string::npos) ? t : t.substr(0, q);
+		return web_api_path::StripTrailingSlash(path) == "/api/v1/events";
+	};
+	auto streaming_handler = dispatcher(const CHttpServer::Request &req,
+					 CHttpServer::Writer &writer,
+					 unsigned &http_status,
+					 std::string &content_type,
+					 std::map<std::string, std::string> &response_headers) {
+		dispatcher->DispatchEvents(req, writer, http_status, content_type, response_headers);
+	};
+	// Preflight runs synchronously before the SSE worker thread is spawned: short-circuit
+	// unauth requests with the standard 401 body so they cannot tie up a streaming slot for the
+	// read-timeout window.
+	auto streaming_preflight =
+		dispatcher(const CHttpServer::Request &req) -> boost::optional<CHttpServer::Response> {
+		return dispatcher->PreflightEvents(req);
+	};
+
+	// Start the EC worker before the HTTP server accepts and before the refresher loop below --
+	// both are producers into it. The EC connection is already up, so from here the worker
+	// thread is the sole user of the socket.
+	m_ec_service.Start(this(const CECPacket *r) { return SendRecvMsg_v2(r); });
+
+	m_http = std::unique_ptr<CHttpServer>(new CHttpServer());
+	// Before Start(), which is the whole contract: the cap is read by the io_context thread on
+	// every file response, and what makes an unsynchronised publish safe here is that the
+	// listener does not exist yet.
+	CHttpServer::SetMaxConcurrentFileResponses(
+		static_cast<int>(m_apiConfig.StreamingCfg().max_concurrent_file_responses));
+	// Lets the transport stamp CORS on the replies it builds itself (408 /
+	// 413 / 431), which never reach the dispatcher's CORS pass.
+	auto cors_stamper = dispatcher(std::map<std::string, std::string> &headers,
+				    const std::string &origin_header) {
+		dispatcher->StampCorsForTransport(headers, origin_header);
+	};
+	if (!m_http->Start(bind,
+		    port,
+		    handler,
+		    streaming_resolver,
+		    streaming_handler,
+		    streaming_preflight,
+		    cors_stamper)) {
+		Show(CFormat("amuleapi: HTTP server failed to start: %s\n") %
+			wxString::FromUTF8(m_http->LastError().c_str()));
+		return;
+	}
+
+	Show(CFormat(_("amuleapi: listening on http://%s:%d/\n")) % wxString::FromUTF8(bind.c_str()) %
+		static_cast<int>(port));
+	Show(CFormat(_("amuleapi: config dir %s\n")) % m_apiConfig.ConfigDir());
+	Show(CFormat(_("amuleapi: aMule version %s; api v1\n")) % wxString::FromAscii(VERSION));
+
+	// Refresher loop. One tick per second; HTTP threads read State concurrently. EC roundtrips
+	// run on this thread but go through `SendRecvSerialized` so HTTP-thread mutations can also
+	// call it under m_ec_mtx.
+	//
+	// `was_failed` tracks the success/failure edge so list caches are wiped on the rising edge:
+	// the server's CValueMap was reset across the disconnect, and clearing first stops stale
+	// entries lingering in the INC-delta path.
+	bool was_failed = false;
+	// Target 1 s wall-clock between tick starts. Measure the tick, sleep the remainder; warn if
+	// one overruns the 3 s budget, which typically signals an EC stall. A fixed `tick + 4 x 250
+	// ms sleep` drifts under mutex contention.
+	constexpr auto kTargetCycle = std::chrono::seconds(1);
+	constexpr auto kSliceMs = std::chrono::milliseconds(250);
+	constexpr auto kOverrunWarn = std::chrono::seconds(3);
+	// Fail-loud on a sustained EC blackout. RefresherTick returns false on any null packet from
+	// SendRecvSerialized -- amuled crashed, was killed, or the socket dropped. After ~30 s of
+	// failed ticks, log a sharp WARN; after ~5 min, exit cleanly so a process supervisor brings
+	// the whole pair back up. Reset on the first success.
+	constexpr unsigned kEcFailWarnAfter = 30;
+	constexpr unsigned kEcFailExitAfter = 300;
+	unsigned ec_consecutive_failures = 0;
+	bool ec_warn_logged = false;
+	// Diffing stops only after a few consecutive ticks with nothing subscribed. A client that
+	// drops and comes straight back -- a page reload, a proxy hiccup -- must not suspend
+	// anything: resuming costs it the `resync` below, and re-seeding every collection is the
+	// most expensive thing this daemon does.
+	constexpr unsigned kIdleTicksBeforeSuspend = 5;
+	unsigned idle_ticks = 0;
+	// Off the per-tick path: the call takes every arena's lock. Lands ~61 s
+	// apart, further if a tick overruns its second.
+	constexpr unsigned kTrimEveryTicks = 60;
+	unsigned trim_countdown = 0;
+	while (!g_shutdownRequested.load(std::memory_order_acquire)) {
+		const auto cycle_start = std::chrono::steady_clock::now();
+		if (was_failed) {
+			m_state.ResetLists();
+		}
+		const bool ok = webapi::RefresherTick(*this, m_state);
+		if (ok) {
+			m_state.MarkTickSuccess();
+			was_failed = false;
+			ec_consecutive_failures = 0;
+			ec_warn_logged = false;
+			// Sole writer of m_last_seen. SSE-event publication runs here, NOT inside
+			// RefresherTick, so mutation handlers calling RefresherTick inline from the
+			// HTTP thread do not race this loop's diff walk. Skipped once nothing has
+			// been subscribed for a while; the first tick back re-baselines silently
+			// and then announces, instead of emitting one event per record.
+			if (m_event_bus->SubscriberCount() == 0) {
+				if (idle_ticks < kIdleTicksBeforeSuspend) {
+					++idle_ticks;
+					webapi::EmitDiffsForEventBus(*this, m_state);
+				} else {
+					m_event_bus->MarkSuspended();
+				}
+			} else {
+				idle_ticks = 0;
+				if (m_event_bus->TakeSuspended()) {
+					webapi::PrimeDiffBaseline(*this, m_state);
+					m_event_bus->Publish("resync", "{\"reason\":\"idle\"}");
+				} else {
+					webapi::EmitDiffsForEventBus(*this, m_state);
+				}
+			}
+		} else {
+			m_state.MarkTickFailure();
+			was_failed = true;
+			++ec_consecutive_failures;
+			if (!ec_warn_logged && ec_consecutive_failures >= kEcFailWarnAfter) {
+				std::cerr << "amuleapi: WARN EC has returned null "
+					     "for "
+					  << ec_consecutive_failures << " consecutive ticks (~"
+					  << ec_consecutive_failures
+					  << " s). amuled may be down or the EC "
+					     "socket may have dropped. Will exit "
+					     "after "
+					  << kEcFailExitAfter
+					  << " failed ticks so a process supervisor "
+					     "can restart the pair.\n";
+				ec_warn_logged = true;
+			}
+			if (ec_consecutive_failures >= kEcFailExitAfter) {
+				std::cerr << "amuleapi: FATAL EC has been silent "
+					     "for "
+					  << ec_consecutive_failures << " consecutive ticks. Exiting.\n";
+				// EC is gone: exit non-zero so the supervisor restarts the pair,
+				// matching the OnLost handler above.
+				g_ecConnectionLost.store(true, std::memory_order_release);
+				g_shutdownRequested.store(true, std::memory_order_release);
+			}
+		}
+		const auto tick_end = std::chrono::steady_clock::now();
+		const auto tick_duration = tick_end - cycle_start;
+		if (tick_duration >= kOverrunWarn) {
+			const auto ms =
+				std::chrono::duration_cast<std::chrono::milliseconds>(tick_duration).count();
+			std::cerr
+				<< "amuleapi: WARN refresher tick took " << ms << " ms (> "
+				<< std::chrono::duration_cast<std::chrono::milliseconds>(kOverrunWarn).count()
+				<< " ms budget): likely EC-mutex contention or a "
+				   "stalled SendRecvSerialized.\n";
+		}
+
+		// Deliberately not gated on "nobody subscribed": that gets it wrong both ways --
+		// never while a browser tab holds the stream, and mid-load for a client that only
+		// polls REST.
+		if (trim_countdown > 0) {
+			--trim_countdown;
+		} else {
+			TrimMallocArenas();
+			trim_countdown = kTrimEveryTicks;
+		}
+		// Sleep the REMAINDER of the target cycle in small slices so shutdown latency stays
+		// bounded. A tick that already consumed the whole budget skips the sleep so the
+		// next cycle starts immediately.
+		auto deadline = cycle_start + kTargetCycle;
+		while (true) {
+			if (g_shutdownRequested.load(std::memory_order_acquire))
+				break;
+			const auto now = std::chrono::steady_clock::now();
+			if (now >= deadline)
+				break;
+			const auto remaining = deadline - now;
+			std::this_thread::sleep_for(remaining < kSliceMs ? remaining : kSliceMs);
+		}
+	}
+
+	Show(_("amuleapi: shutdown signal received; stopping...\n"));
+}
+
+const CECPacket *CamuleapiApp::SendRecvSerialized(const CECPacket *request)
+{
+	// Route every roundtrip through the EC worker (sole socket owner, bounded FIFO queue).
+	// Block for the reply; the worker fulfils the future, or returns nullptr on backpressure or
+	// EC failure -- both of which every caller already maps to 503. The wait is bounded by the
+	// EC read timeout.
+	return m_ec_service.Submit(request).get();
+}
+
+bool CamuleapiApp::IsServerPartialUpdateActive()
+{
+	// Inherited from CaMuleExternalConnector: a const bool snapshot taken at login.
+	return CaMuleExternalConnector::IsServerPartialUpdateActive();
+}
+
+bool CamuleapiApp::IsServerClientHistoryActive()
+{
+	// Same shape as IsServerPartialUpdateActive(): a login snapshot, no mutex.
+	return CaMuleExternalConnector::IsServerClientHistoryActive();
+}
+
+bool CamuleapiApp::IsServerChatActive()
+{
+	// Same shape again: a const bool snapshot taken at login, so no mutex.
+	return CaMuleExternalConnector::IsServerChatActive();
+}
+
+wxString CamuleapiApp::GetDaemonVersion()
+{
+	// Serialize with the rest of the EC access: m_ECClient is torn down
+	// and rebuilt across reconnects. The base accessor is null-safe.
+	std::lock_guard<std::mutex> lock(m_ec_mtx);
+	return CaMuleExternalConnector::GetServerVersion();
+}
+
+int CamuleapiApp::OnExit()
+{
+	// Tear down in reverse construction order: HTTP server first (no in-flight Dispatch can
+	// reach a dangling dispatcher), then dispatcher (references m_jwt), then m_jwt. Wake SSE
+	// drainers BEFORE Stop() returns so workers blocked on the 15 s heartbeat bail out and
+	// release their dispatcher refs -- otherwise `m_dispatcher.reset()` below races a drainer
+	// mid-write.
+	if (m_event_bus)
+		m_event_bus->Shutdown();
+	if (m_http) {
+		m_http->Stop();
+		m_http.reset();
+	}
+	// HTTP is fully stopped, so no handler can submit any more. Stop the EC worker (joins,
+	// bounded by the read timeout if a roundtrip is in flight) before the base tears down
+	// m_ECClient, which the worker uses. Any refresher-loop submit already returned:
+	// TextShell's loop exited before OnExit runs.
+	m_ec_service.Stop();
+	m_dispatcher.reset();
+	m_jwt.reset();
+	const int rc = CaMuleExternalConnector::OnExit();
+	// Tear the log tee down last so the shutdown output above is captured. The two descriptors
+	// have different lifetimes and so are dropped at different points.
+	//
+	// The console one is the tee's dup of fd 2, which Uninstall() closes, so it goes first:
+	// between that close and the clear, the number is free for any thread's next socket, and a
+	// crash in the window would write the report into it.
+	//
+	// The crash redirect outlives the log file it points at, so it stays armed across
+	// Uninstall() and an abort mid-teardown still reaches the log. ~CLogTee via reset() is what
+	// finally closes that one.
+	if (m_logTee) {
+		SetFatalAbortConsoleFd(-1);
+		m_logTee->Uninstall();
+		SetFatalAbortRedirectFd(-1);
+		m_logTee.reset();
+	}
+	return rc;
+}
+
+#if wxUSE_ON_FATAL_EXCEPTION
+void CamuleapiApp::OnFatalException()
+{
+	// Point stderr straight at the log file, or the console without one, so the base's backtrace
+	// is written synchronously even if the tee's forwarding thread is never scheduled again before
+	// the process dies. With a file the console loses it; the file keeps it.
+	if (m_logTee) {
+		m_logTee->RedirectStderrForCrash();
+	}
+	CaMuleExternalConnector::OnFatalException();
+}
+#endif
+
+// Stub functions the linker needs because ExternalConnector.cpp transitively references MuleNotify
+// via the EC tag handlers. The daemon-side bodies live in the monolithic amule binary; console
+// builds supply no-ops.
+namespace MuleNotify
+{
+class CMuleNotiferBase;
+void HandleNotification(const CMuleNotiferBase &) {}
+void HandleNotificationAlways(const CMuleNotiferBase &) {}
+} // namespace MuleNotify

amule-3.1.0.tar.gz/src/webapi/App.h Added

@@ -0,0 +1,201 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_APP_H
+#define WEBAPI_APP_H
+
+#include <memory>
+
+#include "ExternalConnector.h"
+
+#include "AmuleApiConfig.h"
+#include "EcService.h"
+#include "EventBus.h"
+#include "EventDiff.h"
+#include "State.h"
+
+#include "Jwt.h"
+#include "LogTee.h"
+#include "RLE.h" // PartFileEncoderData
+
+#include <cstdint>
+#include <map>
+#include <mutex>
+
+class CApiDispatcher;
+class CECPacket;
+class CHttpServer;
+
+// amuleapi daemon entry. Inherits CaMuleExternalConnector to reuse the EC bring-up machinery
+// (CRemoteConnect, --host / --port / --password, ZLIB negotiation, MD5 password handling). Adds the
+// amuleapi-specific CLI options (--bind, --http-port, --config-dir, --set-{admin,guest}-pass),
+// config-file loading via CAmuleApiConfig, and a Boost.Beast HTTP server thread.
+//
+// TextShell is overridden so `ConnectAndRun` becomes "connect EC, spawn the HTTP thread, run the
+// refresher loop on this (wxApp) thread, tear down on shutdown signal".
+//
+// Concurrent REST handlers reach EC only through `SendRecvSerialized`, which holds a process-wide
+// mutex around every EC roundtrip -- CRemoteConnect stays single-threaded as required, and
+// concurrent mutations plus the refresher tick interleave correctly.
+class CamuleapiApp : public CaMuleExternalConnector
+{
+public:
+	CamuleapiApp();
+	~CamuleapiApp();
+
+	const wxString GetGreetingTitle() override { return _("aMule REST API"); }
+
+	bool OnInit() override;
+	int OnRun() override;
+	int OnExit() override;
+#if wxUSE_ON_FATAL_EXCEPTION
+	// Point stderr at the log file before the base prints the backtrace, so a
+	// crash is recorded in the file even if the tee thread never runs again.
+	void OnFatalException() override;
+#endif
+
+	// Serialized EC roundtrip: takes the EC lock, calls SendRecvMsg_v2, releases. Callable from
+	// any thread; the refresher and mutation handlers funnel every EC call through here so
+	// amule's wx-socket-driven CRemoteConnect stays single-reader by construction. Returns
+	// nullptr if EC has disconnected; the caller owns the returned packet.
+	const CECPacket *SendRecvSerialized(const CECPacket *request);
+
+	// True when amuled advertised EC_TAG_CAN_PARTIAL_UPDATE during login. The refresher uses
+	// this to decide between trusting the EC_TAG_FILE_REMOVED markers and the legacy bulk-
+	// delete path.
+	bool IsServerPartialUpdateActive();
+
+	// True when amuled advertised EC_TAG_CAN_CLIENT_HISTORY during login, i.e. it answers
+	// EC_OP_GET_CLIENT_HISTORY. /known_clients returns 503 rather than sending a request an
+	// older core would assert on.
+	bool IsServerClientHistoryActive();
+	// True when the connected amuled serves the chat session ops; every
+	// /chats route answers 503 ec_unsupported when this is false.
+	bool IsServerChatActive();
+
+	// Version string of the connected amuled, captured from the EC_TAG_SERVER_VERSION tag of
+	// the AUTH_OK handshake. Empty when EC is not (yet) connected, or when the daemon is old
+	// enough to omit the tag. Read under m_ec_mtx, since m_ECClient is torn down and rebuilt
+	// across reconnects.
+	wxString GetDaemonVersion();
+
+	// Refresher needs the cache. Single CState instance per process.
+	webapi::CState &State() { return m_state; }
+
+	// Per-partfile RLE decoder state, persisted across ticks. amule's EC server sends
+	// GAP_STATUS / PART_STATUS as differentially-encoded blobs, each frame XOR-deltaed against
+	// the previous decoded buffer, so the decoder MUST retain state across calls. Keyed by
+	// partfile ECID; erased on removal.
+	//
+	// Mutated only under `CState::m_mu` held EXCLUSIVE, typically inside a MutateDownloads
+	// writer lambda. `m_ec_mtx` is incidentally held across the same call stack, but the State
+	// write lock is the actual serializer -- the method name encodes the precondition so a
+	// reviewer notices it.
+	std::map<std::uint32_t, PartFileEncoderData> &PartfileRleStateRequireStateWriteLock()
+	{
+		return m_partfile_rle;
+	}
+
+	// SSE event bus. The refresher publishes events after each successful tick; streaming-
+	// handler threads drain from here. Exposed by raw reference -- CEventBus is internally
+	// thread-safe. Lazy-constructed in OnInit so the operator-configured ring capacity is
+	// honoured.
+	webapi::CEventBus &EventBus() { return *m_event_bus; }
+
+	// Prior-tick snapshot used to compute event deltas. Owned by the App, mutated AFTER each
+	// successful refresher tick by EmitDiffsAndUpdate. Exposed so RefresherTick can reach it
+	// without re-routing through CState.
+	webapi::LastSeenState &LastSeenForEvents() { return m_last_seen; }
+
+private:
+	void OnInitCmdLine(wxCmdLineParser &parser) override;
+	bool OnCmdLineParsed(wxCmdLineParser &parser) override;
+
+	// Loads amuleapi.conf + amuleapi-jwt-secret + amuleapi-passwords. Returns
+	// false on any unrecoverable error, having already printed it via Show().
+	bool LoadAmuleapiConfig();
+
+	// CLI-only flows. Both write the requested file under m_amuleapiConfigDir
+	// with mode 0600 and exit immediately -- no HTTP server, no EC connection.
+	int RunSetAdminPass();
+	int RunSetGuestPass();
+
+	// TextShell override drives the refresher loop and the HTTP server. Called by
+	// CaMuleExternalConnector::ConnectAndRun once EC is established; overridden so the daemon
+	// never enters the interactive readline path amulecmd uses.
+	void TextShell(const wxString &prompt) override;
+
+	CAmuleApiConfig m_apiConfig;
+	webapi::CState m_state;
+	// All EC roundtrips run on this service's single worker thread, with a bounded FIFO queue.
+	// Sole owner of the EC socket after login, so it also serialises m_ECClient -- m_ec_mtx
+	// below is only for the version accessor now.
+	webapi::CEcService m_ec_service;
+	std::mutex m_ec_mtx; // serializes m_ECClient
+	std::unique_ptr<CJwt> m_jwt;
+	std::unique_ptr<CApiDispatcher> m_dispatcher;
+	std::unique_ptr<CHttpServer> m_http;
+	// Timestamping stdout/stderr tee; console-only without a log file. Installed early in OnInit,
+	// torn down in OnExit.
+	std::unique_ptr<webapi::CLogTee> m_logTee;
+	std::map<std::uint32_t, PartFileEncoderData> m_partfile_rle;
+	std::unique_ptr<webapi::CEventBus> m_event_bus;
+	webapi::LastSeenState m_last_seen;
+
+	// CLI capture: --bind / --http-port override the matching keys in amuleapi.conf when
+	// present. The `m_cliHas*` flags discriminate between "operator passed nothing" and
+	// "operator passed the default value verbatim" -- the base class fields have no such
+	// predicate of their own.
+	wxString m_cliBindAddress;
+	long m_cliHttpPort = 0;
+	wxString m_cliConfigDirOverride;
+	wxString m_cliSetAdminPass;
+	wxString m_cliSetGuestPass;
+	bool m_cliHasBindAddress = false;
+	bool m_cliHasHttpPort = false;
+	bool m_cliHasSetAdminPass = false;
+	bool m_cliHasSetGuestPass = false;
+	// Did the operator pass --host / --port / --password explicitly?
+	bool m_cliHasEcHost = false;
+	bool m_cliHasEcPort = false;
+	/// amuleapi owns amuleapi.conf and must not also read remote.conf: two files describing the
+	/// same EC connection, with load order deciding the winner, is a trap. Turning this off
+	/// drops --config-file, --write-config and --create-config-from too, since all three only
+	/// exist to manage that file.
+	bool UsesConnectorConfigFile() const override { return false; }
+	// No -P/--password: it would put the EC secret in argv, where ps exposes it to every local
+	// user. amuleapi gets the credential from the token the core writes when it spawns us, or
+	// from EC/Password in amuleapi.conf.
+	bool UsesEcPasswordOption() const override { return false; }
+
+	// amuleapi keeps its settings in amuleapi.conf and never reads or writes
+	// remote.conf, so amuleapi.conf is what marks a portable amuleapi.
+	wxString PortableProbeFile() const override { return "amuleapi.conf"; }
+
+	bool m_cliHasEcEncryption = false;
+};
+
+DECLARE_APP(CamuleapiApp)
+
+#endif // WEBAPI_APP_H

amule-3.1.0.tar.gz/src/webapi/Auth.cpp Added

@@ -0,0 +1,127 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "Auth.h"
+
+#include "HeaderParse.h"
+
+#include <algorithm>
+#include <cctype>
+#include <cstdio>
+#include <cstring>
+
+// strncasecmp on POSIX is declared in <strings.h>. Glibc also exposes it via <string.h>, but musl
+// and the BSDs do not -- be explicit so the build does not depend on the implicit include. Mirrors
+// the shim libwebcommon/HeaderParse.cpp already uses.
+#ifdef _WIN32
+#define strncasecmp _strnicmp
+#else
+#include <strings.h>
+#endif
+
+namespace webapi
+{
+
+// ---------- CRevocationSet ---------------------------------------
+
+void CRevocationSet::Revoke(const std::string &jti, std::time_t exp)
+{
+	std::lock_guard<std::mutex> lock(m_mu);
+	m_revokedjti = exp;
+	GcExpired();
+}
+
+bool CRevocationSet::IsRevoked(const std::string &jti) const
+{
+	std::lock_guard<std::mutex> lock(m_mu);
+	auto it = m_revoked.find(jti);
+	if (it == m_revoked.end())
+		return false;
+	// Lazy GC: if the entry has already expired, drop it. Saves a tick of memory and stops
+	// stale entries accumulating for tokens nobody will ever present again.
+	if (it->second <= std::time(nullptr)) {
+		m_revoked.erase(it);
+		return false;
+	}
+	return true;
+}
+
+std::size_t CRevocationSet::Size() const
+{
+	std::lock_guard<std::mutex> lock(m_mu);
+	return m_revoked.size();
+}
+
+void CRevocationSet::GcExpired() const
+{
+	// O(n) sweep over the revoked map, fired from every Revoke() and every Contains() check.
+	// Fine at amuleapi's expected scale -- a single operator, a handful of sessions per day --
+	// so the map stays in the low hundreds even under aggressive re-login.
+	const std::time_t now = std::time(nullptr);
+	for (auto it = m_revoked.begin(); it != m_revoked.end();) {
+		if (it->second <= now) {
+			it = m_revoked.erase(it);
+		} else {
+			++it;
+		}
+	}
+}
+
+// ---------- Header extraction ------------------------------------
+
+std::string ExtractBearerToken(const std::string &authorization_header)
+{
+	// `Authorization: Bearer <jwt>` per RFC 6750 2.1. The scheme name is
+	// case-insensitive; the token is the bare base64url triplet CJwt emits.
+	const char *prefix = "Bearer ";
+	const size_t plen = std::strlen(prefix);
+	if (authorization_header.size() <= plen)
+		return std::string();
+	if (strncasecmp(authorization_header.c_str(), prefix, plen) != 0) {
+		return std::string();
+	}
+	// Trim leading OWS after the scheme name (some clients add extra
+	// spaces; RFC 7230 §3.2.3 allows them).
+	size_t i = plen;
+	while (i < authorization_header.size() &&
+		(authorization_headeri == ' ' || authorization_headeri == '\t')) {
+		++i;
+	}
+	if (i >= authorization_header.size())
+		return std::string();
+	return authorization_header.substr(i);
+}
+
+std::string ExtractCookieValue(const std::string &cookie_header, const std::string &cookie_name)
+{
+	// Delegate to libwebcommon's helper so the parsing rules (case-insensitive
+	// name match, `;` separators, OWS trimming) stay in one place.
+	const auto v =
+		webcommon::FindCookieValue(cookie_header.c_str(), cookie_header.size(), cookie_name.c_str());
+	if (!v.first || v.second == 0)
+		return std::string();
+	return std::string(v.first, v.second);
+}
+
+} // namespace webapi

amule-3.1.0.tar.gz/src/webapi/Auth.h Added

@@ -0,0 +1,89 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_AUTH_H
+#define WEBAPI_AUTH_H
+
+#include <deque>
+
+#include <ctime>
+#include <functional>
+#include <map>
+#include <mutex>
+#include <set>
+#include <string>
+
+#include <common/RateLimiter.h>
+
+// State containers + helpers for the /auth/* surface. They live on the amuleapi process side rather
+// than in libwebcommon because they are stateful and amuleweb has no use for them.
+//
+// Thread-safety model: today every caller runs on the Boost.Asio I/O thread (single io_context,
+// single std::thread). The std::mutex in each container is forward-compat insurance -- the SSE
+// channel adds a heartbeat timer that fires on the same I/O thread, so the mutex never contends
+// today -- but a future worker-pool model gets correctness for free.
+
+namespace webapi
+{
+
+// Server-side bearer-token revocation list. JWTs are stateless by design; for /auth/logout to
+// actually invalidate a token, the server has to remember "this jti is dead until the JWT's exp".
+//
+// One entry per logged-out-but-still-unexpired token, roughly 64 bytes each, bounded by max-
+// concurrent-users x the 24 h JWT lifetime. GC is lazy on Revoke(), sweeping entries whose exp has
+// already passed, which amortizes the work across calls instead of needing a periodic timer.
+class CRevocationSet
+{
+public:
+	void Revoke(const std::string &jti, std::time_t exp);
+	bool IsRevoked(const std::string &jti) const;
+
+	// Test-visible inspection. Not exposed via the API -- the
+	// revocation set is operator-internal.
+	std::size_t Size() const;
+
+private:
+	void GcExpired() const;
+
+	mutable std::mutex m_mu;
+	mutable std::map<std::string, std::time_t> m_revoked;
+};
+
+// The per-IP failure rate limiter lives in mulecommon, shared with the External Connection password
+// exchange, which needs the same protection but cannot link the webapi library. Re-exported here so
+// `webapi::CRateLimiter` still resolves.
+using ::CRateLimiter;
+
+// HTTP `Authorization: Bearer <jwt>` extractor. Empty string if the header is absent, does not
+// start with `Bearer `, or has no value past the space. Case-insensitive scheme compare per RFC
+// 6750 2.1.
+std::string ExtractBearerToken(const std::string &authorization_header);
+
+// Extracts `<cookie_name>=<value>` from a Cookie header. Returns the
+// empty string on miss.
+std::string ExtractCookieValue(const std::string &cookie_header, const std::string &cookie_name);
+
+} // namespace webapi
+
+#endif // WEBAPI_AUTH_H

amule-3.1.0.tar.gz/src/webapi/CMakeLists.txt Added

@@ -0,0 +1,146 @@
+# amuleapi — REST API + SSE daemon. Standalone executable that
+# connects to amuled via the existing EC protocol (same wire as
+# amulecmd / amuleweb) and serves /api/v1/* over HTTP via Boost.Beast.
+
+add_executable (amuleapi
+	${CMAKE_SOURCE_DIR}/src/ExternalConnector.cpp
+	# CUInt128 backs the EC_TAG_KAD_ID tag Refresher.cpp reads for
+	# /kad's `node_id`. libec's ECUInt128.cpp only gets pulled out of
+	# the archive once something references a UINT128 tag, and it then
+	# needs the class itself -- which lives here, not in libec. Same
+	# reason amulegui compiles this TU (src/CMakeLists.txt).
+	${CMAKE_SOURCE_DIR}/src/kademlia/utils/UInt128.cpp
+	${CMAKE_SOURCE_DIR}/src/OtherFunctions.cpp
+	${CMAKE_SOURCE_DIR}/src/RLE.cpp
+	${CMAKE_SOURCE_DIR}/src/NetworkFunctions.cpp
+	${CMAKE_SOURCE_DIR}/src/LoggerConsole.cpp
+	# Same embedded icon table the desktop GUI links (build-generated
+	# by src/icons/embed_icons.py, or the checked-in fallback when the
+	# host has no Python3 — see src/CMakeLists.txt for the resolution).
+	# GET /flags/{code}.png serves the flag_<cc> entries straight out
+	# of .rodata, which is what keeps the country artwork a single
+	# committed copy instead of a duplicate under static/. Plain C byte
+	# arrays, so it compiles fine under wxUSE_GUI=0; the top-level
+	# icons amuleapi never asks for are pages that simply never fault
+	# in.
+	${AMULE_ICON_DATA_C}
+	AmuleApiConfig.cpp
+	Api.cpp
+	App.cpp
+	Auth.cpp
+	EventBus.cpp
+	EventDiff.cpp
+	HttpServer.cpp
+	LogTee.cpp
+	PrefsSchema.cpp
+	Refresher.cpp
+	RefresherTick.cpp
+	SearchJson.cpp
+	SharedContent.cpp
+	StaticFs.cpp
+	State.cpp
+)
+
+if (WIN32)
+	target_sources (amuleapi
+		PRIVATE ${CMAKE_BINARY_DIR}/version.rc
+	)
+endif()
+
+# Console / daemon — never builds wx GUI bits.
+target_compile_definitions (amuleapi
+	PRIVATE wxUSE_GUI=0
+)
+
+target_include_directories (amuleapi
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+	PRIVATE ${SRC_DIR}
+	# icon_data.c #includes "icon_data.h" unqualified, and Api.cpp does
+	# the same to reach amule_find_icon() — same reason muleappgui puts
+	# src/icons on its include path.
+	PRIVATE ${SRC_DIR}/icons
+	PRIVATE ${Boost_INCLUDE_DIR}
+)
+
+# ${AMULE_ICON_DATA_C} is generated into the build tree when Python3 was
+# found at configure time; without it the variable already points at the
+# checked-in source copy and no ordering dependency is needed. Mirrors
+# what muleappgui does in src/CMakeLists.txt.
+if (Python3_FOUND)
+	add_dependencies (amuleapi generate_icon_data)
+endif()
+
+target_link_libraries (amuleapi
+	PRIVATE ec
+	PRIVATE mulecommon
+	PRIVATE mulesocket
+	PRIVATE webcommon
+	PRIVATE picojson_header
+	PRIVATE wxWidgets::NET
+	PRIVATE ${Boost_LIBRARIES}
+	# zlib powers the on-the-wire gzip encoder in HttpServer (Content-
+	# Encoding: gzip on regular responses + per-event Z_SYNC_FLUSH on
+	# SSE). NEED_ZLIB is already set by cmake/options.cmake for
+	# BUILD_AMULEAPI, so zlib.cmake has already run at project scope
+	# and ZLIB::ZLIB is available.
+	PRIVATE ZLIB::ZLIB
+)
+
+# CEventBus's std::atomic<uint64_t> event counter needs libatomic on
+# 32-bit targets without a hardware 8-byte CAS (PPC32, ARMv5/v6,
+# MIPS32). muleappcore links it for the same reason, but amuleapi does
+# not depend on muleappcore, so it needs its own copy. LIBATOMIC is set
+# at the top of the root CMakeLists.txt — empty on 64-bit, "atomic" on
+# 32-bit.
+if (LIBATOMIC)
+	target_link_libraries (amuleapi PRIVATE ${LIBATOMIC})
+endif()
+
+# Same gettext shim as amuleweb — _() in the CLI text needs libintl on
+# macOS / MinGW. Glibc bakes the symbols into libc, so the guard is a
+# noop there.
+if (ENABLE_NLS AND Intl_FOUND)
+	target_include_directories (amuleapi PRIVATE ${Intl_INCLUDE_DIRS})
+	target_link_libraries (amuleapi PRIVATE ${Intl_LIBRARIES})
+endif()
+
+if (HAVE_BFD)
+	target_link_libraries (amuleapi
+		PRIVATE ${LIBBFD}
+	)
+endif()
+
+# ExternalConnector.cpp pulls in libreadline when HAVE_LIBREADLINE is
+# defined at configure time (it's part of the readline-augmented TextShell
+# implementation amulecmd uses for tab completion). amuleapi never
+# enters TextShell, but the linker still resolves the references because
+# they live in unconditionally-emitted symbols inside the same TU.
+if (HAVE_LIBREADLINE)
+	target_link_libraries (amuleapi
+		PRIVATE ${READLINE_LIBRARIES}
+	)
+endif()
+
+if (APPLE)
+	# CoreServices / ApplicationServices — same set amuleweb links, used
+	# by wxStandardPaths::GetUserDataDir() on a .app bundle to look up
+	# Application Support/ correctly.
+	target_link_libraries (amuleapi
+		PRIVATE "-framework CoreServices"
+		PRIVATE "-framework ApplicationServices"
+	)
+endif()
+
+install (TARGETS amuleapi
+	RUNTIME DESTINATION bin
+)
+
+# Bundled static-frontend tree. Empty StaticRoot in amuleapi.conf keeps
+# the daemon API-only; setting it to ${CMAKE_INSTALL_DATADIR}/amule/
+# amuleapi-static makes the daemon serve this tree (placeholder
+# index.html out of the box — replace with a real frontend bundle in
+# place to start serving one).
+install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/static/
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/amule/amuleapi-static
+)

amule-3.1.0.tar.gz/src/webapi/ClientTagNames.h Added

@@ -0,0 +1,59 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 WEBAPI_CLIENTTAGNAMES_H
+#define WEBAPI_CLIENTTAGNAMES_H
+
+#include <cstdint>
+#include <string>
+
+namespace webapi
+{
+
+/**
+ * Stable lowercase tokens for the numeric client tags EC ships.
+ *
+ * Shared rather than file-local because two paths decode the same tags: the refresher, for the live
+ * peers behind /clients, and the on-demand handler for /known_clients, whose records carry the same
+ * software, origin and obfuscation codes. Two copies would be free to drift, and the tokens are
+ * part of the API surface -- a consumer switching on "kad" must get the same answer whichever
+ * endpoint produced it.
+ *
+ * Deliberately not the GUI's rendering: these are protocol tokens, not display text, so they stay
+ * untranslated and stable.
+ */
+
+//! EC_TAG_CLIENT_SOFTWARE (ESoftwareType) to a token, e.g. "emule".
+const char *ClientSoftwareName(std::uint32_t code);
+
+//! EC_TAG_CLIENT_OBFUSCATION_STATUS (EObfuscationState) to a token.
+const char *ClientObfuscationName(std::uint8_t code);
+
+//! EC_TAG_CLIENT_FROM (ESourceFrom) to a token, e.g. "local_server".
+std::string SourceOriginName(std::uint32_t from);
+
+} // namespace webapi
+
+#endif // WEBAPI_CLIENTTAGNAMES_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/webapi/EcService.h Added

@@ -0,0 +1,169 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_ECSERVICE_H
+#define WEBAPI_ECSERVICE_H
+
+#include <condition_variable>
+#include <cstddef>
+#include <deque>
+#include <functional>
+#include <future>
+#include <mutex>
+#include <thread>
+#include <utility>
+
+class CECPacket;
+
+namespace webapi
+{
+
+// Serialises all EC roundtrips onto a single dedicated worker thread with a bounded FIFO queue.
+//
+// Why: amuleapi's one EC connection is a strictly serial request/reply protocol, and the HTTP
+// request handlers now run on a worker pool. Letting each pool thread do its own blocking roundtrip
+// meant a stalled amuled could park an unbounded number of pool threads on the EC mutex until the
+// read timeout fired, starving non-EC requests. It also left the single socket reachable from
+// several threads, which is how a framing desync becomes possible.
+//
+// This service fixes both: exactly one thread ever touches the socket (no desync), and the queue is
+// bounded (backpressure). When the queue is full -- a roundtrip is stalled and callers are piling
+// up behind it -- further submissions return `nullptr` immediately, which every caller already
+// treats as `503 ec_unavailable`. So a stalled EC lane sheds load instead of exhausting the handler
+// pool.
+//
+// Lifetime contract: `Submit` borrows the request pointer; callers block on the returned future
+// until completion (bounded by the EC read timeout), so the caller's stack-owned request outlives
+// the worker's use of it. The result pointer follows the pre-existing SendRecvSerialized contract
+// -- the caller owns and deletes it.
+class CEcService
+{
+public:
+	// Runs one EC roundtrip (send request, block for reply); returns the reply
+	// packet (caller-owned) or nullptr on EC failure.
+	using Roundtrip = std::function<const CECPacket *(const CECPacket *)>;
+
+	explicit CEcService(std::size_t max_depth = 8)
+	: m_max_depth(max_depth)
+	{
+	}
+
+	~CEcService() { Stop(); }
+
+	CEcService(const CEcService &) = delete;
+	CEcService &operator=(const CEcService &) = delete;
+
+	// Start the worker. Call once, after the EC connection is established
+	// and before any producer (refresher loop / HTTP handlers) can submit.
+	void Start(Roundtrip roundtrip)
+	{
+		m_roundtrip = std::move(roundtrip);
+		m_worker = std::thread(this { WorkerLoop(); });
+	}
+
+	// Enqueue a roundtrip and return a future for its reply. Returns a ready future holding
+	// nullptr if the queue is full (backpressure) or the service is stopping -- callers map
+	// nullptr to 503.
+	std::future<const CECPacket *> Submit(const CECPacket *request)
+	{
+		std::promise<const CECPacket *> prom;
+		std::future<const CECPacket *> fut = prom.get_future();
+		{
+			std::lock_guard<std::mutex> lk(m_mu);
+			if (m_stop || m_queue.size() >= m_max_depth) {
+				prom.set_value(nullptr);
+				return fut;
+			}
+			m_queue.push_back(Job{ request, std::move(prom) });
+		}
+		m_cv.notify_one();
+		return fut;
+	}
+
+	// Stop the worker. Idempotent. Fulfils any queued, not-yet-started jobs with nullptr so
+	// their callers unblock, then joins -- bounded by the EC read timeout if a roundtrip is in
+	// flight.
+	void Stop()
+	{
+		{
+			std::lock_guard<std::mutex> lk(m_mu);
+			if (m_stop) {
+				return;
+			}
+			m_stop = true;
+			while (!m_queue.empty()) {
+				m_queue.front().prom.set_value(nullptr);
+				m_queue.pop_front();
+			}
+		}
+		m_cv.notify_all();
+		if (m_worker.joinable()) {
+			m_worker.join();
+		}
+	}
+
+private:
+	struct Job
+	{
+		const CECPacket *request;
+		std::promise<const CECPacket *> prom;
+	};
+
+	void WorkerLoop()
+	{
+		for (;;) {
+			Job job;
+			{
+				std::unique_lock<std::mutex> lk(m_mu);
+				m_cv.wait(lk, this { return m_stop || !m_queue.empty(); });
+				// Stop drains the queue under the lock, so a wake with an
+				// empty queue means we're shutting down.
+				if (m_queue.empty()) {
+					return;
+				}
+				job = std::move(m_queue.front());
+				m_queue.pop_front();
+			}
+			const CECPacket *resp = nullptr;
+			try {
+				resp = m_roundtrip(job.request);
+			} catch (...) {
+				resp = nullptr;
+			}
+			job.prom.set_value(resp);
+		}
+	}
+
+	Roundtrip m_roundtrip;
+	std::deque<Job> m_queue;
+	std::mutex m_mu;
+	std::condition_variable m_cv;
+	std::thread m_worker;
+	bool m_stop = false;
+	const std::size_t m_max_depth;
+};
+
+} // namespace webapi
+
+#endif // WEBAPI_ECSERVICE_H

amule-3.1.0.tar.gz/src/webapi/EventBus.cpp Added

@@ -0,0 +1,176 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "EventBus.h"
+
+namespace webapi
+{
+
+// C++14 requires an out-of-class definition for static constexpr members used by reference (test
+// code may bind them through a const auto& parameter). C++17 made static constexpr members
+// implicitly inline, so the same lines emit -Wdeprecated on GCC in C++17 mode ("redundant
+// redeclaration of constexpr static data member"). Guard so it compiles clean under both language
+// levels.
+#if __cplusplus < 201703L
+constexpr std::size_t CEventBus::kDefaultCapacity;
+constexpr std::size_t CEventBus::kMinCapacity;
+#endif
+
+CEventBus::CEventBus(std::size_t capacity)
+: m_capacity(capacity < kMinCapacity ? kMinCapacity : capacity)
+{
+}
+
+void CEventBus::Publish(const std::string &name, const std::string &data)
+{
+	Event ev;
+	ev.name = name;
+	ev.data = data;
+	{
+		std::lock_guard<std::mutex> g(m_mu);
+		// ID assignment INSIDE the lock. With fetch_add outside, two concurrent publishers
+		// can swap their lock order against their id order: A gets id=N and B id=N+1, then
+		// B grabs the lock first and pushes N+1 before A pushes N. The drainer iterates the
+		// deque, which is publish order and NOT id order, and reports `id=N+1, id=N` --
+		// failing the strict monotonicity every subscriber depends on.
+		ev.id = m_next_id.fetch_add(1, std::memory_order_relaxed);
+		if (m_ring.size() >= m_capacity)
+			m_ring.pop_front();
+		m_ring.push_back(std::move(ev));
+	}
+	// notify_all so every blocked drainer wakes and races to its own copy-out.
+	// The critical section is short, so contention is negligible.
+	m_cv.notify_all();
+}
+
+void CEventBus::PublishBatch(const std::vector<std::pair<std::string, std::string>> &events)
+{
+	if (events.empty())
+		return;
+	{
+		std::lock_guard<std::mutex> g(m_mu);
+		// Same id-monotonicity invariant as Publish: assign and push inside the lock. Doing
+		// the whole batch under one lock also collapses N notify_all wake-ups into one --
+		// the cold-start tick on a 5K-download library used to fire 5K of them inside the
+		// refresher loop, dominating the tick.
+		for (const auto &kv : events) {
+			Event ev;
+			ev.name = kv.first;
+			ev.data = kv.second;
+			ev.id = m_next_id.fetch_add(1, std::memory_order_relaxed);
+			if (m_ring.size() >= m_capacity)
+				m_ring.pop_front();
+			m_ring.push_back(std::move(ev));
+		}
+	}
+	m_cv.notify_all();
+}
+
+std::uint64_t CEventBus::Drain(
+	std::uint64_t since_id, std::chrono::milliseconds timeout, std::vector<Event> &out)
+{
+	out.clear();
+	// Fast-fail on shutdown so a freshly-spawned SSE worker that
+	// raced past the IsShutdown poll doesn't block in wait_for.
+	if (m_shutdown.load(std::memory_order_acquire))
+		return since_id;
+	std::unique_lock<std::mutex> lk(m_mu);
+
+	// Quick path: any events with id > since_id already in ring?
+	auto has_newer = &() {
+		return m_shutdown.load(std::memory_order_acquire) ||
+		       (!m_ring.empty() && m_ring.back().id > since_id);
+	};
+	if (!has_newer()) {
+		// Wait up to `timeout` for someone to publish OR for the shutdown latch to
+		// fire. The predicate is re-checked either way.
+		m_cv.wait_for(lk, timeout, has_newer);
+	}
+
+	if (m_shutdown.load(std::memory_order_acquire))
+		return since_id;
+
+	std::uint64_t max_seen = since_id;
+	for (const auto &ev : m_ring) {
+		if (ev.id > since_id) {
+			out.push_back(ev);
+			if (ev.id > max_seen)
+				max_seen = ev.id;
+		}
+	}
+	return max_seen;
+}
+
+std::uint64_t CEventBus::OldestId() const
+{
+	std::lock_guard<std::mutex> g(m_mu);
+	return m_ring.empty() ? 0 : m_ring.front().id;
+}
+
+std::uint64_t CEventBus::NewestId() const
+{
+	std::lock_guard<std::mutex> g(m_mu);
+	return m_ring.empty() ? 0 : m_ring.back().id;
+}
+
+void CEventBus::ResetForTest()
+{
+	{
+		std::lock_guard<std::mutex> g(m_mu);
+		m_ring.clear();
+		m_next_id.store(1, std::memory_order_release);
+		m_shutdown.store(false, std::memory_order_release);
+	}
+	m_cv.notify_all();
+}
+
+void CEventBus::Shutdown()
+{
+	// Latch the shutdown flag and broadcast. Drain callers wake on the cv either way and exit
+	// the predicate. notify_all under the lock, so a drainer about to wait_for cannot miss the
+	// wake.
+	{
+		std::lock_guard<std::mutex> g(m_mu);
+		m_shutdown.store(true, std::memory_order_release);
+	}
+	m_cv.notify_all();
+}
+
+bool CEventBus::IsShutdown() const
+{
+	return m_shutdown.load(std::memory_order_acquire);
+}
+
+CEventBus::Subscription::Subscription(CEventBus &bus)
+: m_bus(bus)
+{
+	m_bus.m_subscribers.fetch_add(1, std::memory_order_acq_rel);
+}
+
+CEventBus::Subscription::~Subscription()
+{
+	m_bus.m_subscribers.fetch_sub(1, std::memory_order_acq_rel);
+}
+
+} // namespace webapi

amule-3.1.0.tar.gz/src/webapi/EventBus.h Added

@@ -0,0 +1,168 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_EVENT_BUS_H
+#define WEBAPI_EVENT_BUS_H
+
+#include <atomic>
+#include <chrono>
+#include <condition_variable>
+#include <cstdint>
+#include <deque>
+#include <mutex>
+#include <string>
+#include <vector>
+
+namespace webapi
+{
+
+// Event published over the SSE channel. Wire shape mirrors `text/event-stream` per RFC 6202 4: the
+// SSE emitter writes `event: <name>\nid: <id>\ndata: <data>\n\n` for each event.
+//
+// `id` is monotonic across the bus's lifetime (uint64, never wrapping for any realistic uptime --
+// 18 EH). It is NOT stable across amuleapi restarts; the bus resets to 1 on each daemon start. The
+// `resync` event covers the restart case for SSE subscribers: a client reconnecting with Last-
+// Event-ID above the bus's current max gets a resync event and re-GETs all affected collections.
+struct Event
+{
+	std::uint64_t id = 0;
+	std::string name; // "download_added", "status_changed", etc.
+	std::string data; // JSON payload (typed per `name`)
+};
+
+// In-memory SSE event bus. One instance per amuleapi process; the refresher publishes events as
+// cache deltas surface and SSE sessions drain them.
+//
+// All public methods are safe for any thread. The refresher publishes from the wxApp thread during
+// a tick; streaming-handler threads drain. The internal lock is a plain std::mutex -- drains hold
+// it only long enough to copy the events out, never across a wire write.
+//
+// Runtime-configured ring (`Streaming/EventBusRingCapacity`, default 16384). When the buffer
+// fills the oldest event is dropped, and a client whose Last-Event-ID fell off the ring gets a
+// typed `resync` instead of a partial replay. The default is sized for a cold-start tick on a heavy
+// node; worst-case memory is roughly capacity x ~1 KB of JSON payload.
+class CEventBus
+{
+public:
+	// Compile-time floor plus default. Capacity is settable at construction and values below
+	// kMinCapacity are clamped up, so an operator cannot effectively disable SSE replay by
+	// setting capacity=1.
+	static constexpr std::size_t kDefaultCapacity = 16384;
+	static constexpr std::size_t kMinCapacity = 16;
+
+	CEventBus()
+	: CEventBus(kDefaultCapacity)
+	{
+	}
+	explicit CEventBus(std::size_t capacity);
+
+	// Effective ring capacity actually in use (post-clamp).
+	std::size_t Capacity() const { return m_capacity; }
+
+	// Publish a new event: assigns the next id, stores it, and wakes all blocked Drain*
+	// callers. Drops the oldest event if the ring is full.
+	void Publish(const std::string &name, const std::string &data);
+
+	// Batch-publish: one lock acquisition and one notify_all for the whole batch, against N of
+	// each from a per-event Publish loop. Used by the cold-start tick where a 5K-download
+	// library emits one `_added` per item, which was holding the refresher loop for tens of
+	// milliseconds. Each pair is treated exactly as a Publish call.
+	void PublishBatch(const std::vector<std::pair<std::string, std::string>> &events);
+
+	// Drain every event with `id > since_id` into `out`, returning the highest id found (==
+	// since_id if nothing new). Blocks up to `timeout` if there are no new events, returning
+	// early when something becomes available.
+	std::uint64_t Drain(
+		std::uint64_t since_id, std::chrono::milliseconds timeout, std::vector<Event> &out);
+
+	// The id of the bus's oldest currently-stored event, or 0 if empty. Used by the Last-Event-
+	// ID reconnect path: below this the client missed events that have already been evicted and
+	// should be sent `resync`.
+	std::uint64_t OldestId() const;
+
+	// The id of the most recently published event, or 0 if nothing has been
+	// published. The reconnect path uses this to compute "did I miss anything".
+	std::uint64_t NewestId() const;
+
+	// Reset the bus. Wakes any blocked drainers. Used by tests; not
+	// called from production code.
+	void ResetForTest();
+
+	// Atomically wake every blocked Drain caller and mark the bus as shutting down; later Drain
+	// calls return immediately. Detached SSE worker threads sit inside Drain() blocked on the
+	// heartbeat, and without this they would hold references to the dispatcher across its
+	// destruction. Latches once.
+	void Shutdown();
+
+	// True if Shutdown() has been called. SSE worker loops poll this
+	// between Drain calls and exit cleanly.
+	bool IsShutdown() const;
+
+	// Subscriber accounting. A tick's diff means snapshotting every collection and comparing it
+	// with the previous tick, which on a large library is most of the refresher's work. Once
+	// nothing has been subscribed for a few ticks there is nobody to send the result to, so the
+	// refresher skips it and records that (MarkSuspended).
+	//
+	// Nothing is lost -- subscribers read the same state over REST -- but no collection change
+	// is represented on the bus for that period, and a client reconnecting with a Last-Event-ID
+	// cannot tell: its cursor can even still be in range, since the chat publisher runs outside
+	// this gate. The tick that resumes publishes a `resync` AFTER re-baselining, so the client
+	// re-GETs against a baseline that is already current.
+
+	// RAII registration for one SSE session.
+	class Subscription
+	{
+	public:
+		explicit Subscription(CEventBus &bus);
+		~Subscription();
+		Subscription(const Subscription &) = delete;
+		Subscription &operator=(const Subscription &) = delete;
+
+	private:
+		CEventBus &m_bus;
+	};
+
+	std::size_t SubscriberCount() const { return m_subscribers.load(std::memory_order_acquire); }
+
+	// Record that a tick's diff was skipped for want of a subscriber.
+	void MarkSuspended() { m_suspended.store(true, std::memory_order_release); }
+
+	// Read and clear the suspended flag. True obliges the refresher to re-baseline silently
+	// first: diffing against a pre-idle snapshot would emit one event per record.
+	bool TakeSuspended() { return m_suspended.exchange(false, std::memory_order_acq_rel); }
+
+private:
+	const std::size_t m_capacity;
+	mutable std::mutex m_mu;
+	std::condition_variable m_cv;
+	std::deque<Event> m_ring;
+	std::atomic<std::uint64_t> m_next_id{ 1 };
+	std::atomic<bool> m_shutdown{ false };
+	std::atomic<std::size_t> m_subscribers{ 0 };
+	std::atomic<bool> m_suspended{ false };
+};
+
+} // namespace webapi
+
+#endif // WEBAPI_EVENT_BUS_H

amule-3.1.0.tar.gz/src/webapi/EventDiff.cpp Added

@@ -0,0 +1,1106 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "../PeerCapabilities.h" // Needed for CPeerCapabilities::GetApiTokens
+#include "EventDiff.h"
+
+#include "EventBus.h"
+#include "SearchJson.h"      // WriteSearchResultFields, shared with GET /search/{id}/results
+#include "ServerFlagNames.h" // Shared server capability-bit tables, decoded to JSON
+
+#include <common/MediaCodecName.h> // Needed for MediaCodecLabel
+
+#include <JsonWriter.h>
+
+#include <algorithm>
+#include <atomic>
+#include <cstdint>
+#include <cstdlib>
+#include <iostream>
+#include <sstream>
+#include <thread>
+#include <type_traits>
+
+namespace webapi
+{
+
+namespace
+{
+
+// Minimal JSON string escaper. CJsonWriter (libwebcommon) is the canonical formatter for response
+// bodies, but the event payloads here are a few KB at most, and keeping the diff path off
+// CJsonWriter keeps wxString out of the bus path. (`search_result_added` is the exception: it is
+// documented as carrying exactly a results-list entry, so it goes through the shared writer in
+// SearchJson.h.) Escapes only what JSON disallows: backslash, double-quote and the C0 controls.
+// Tab/CR/LF are spelled out because amule log lines contain them.
+std::string EscJson(const std::string &s)
+{
+	std::string out;
+	out.reserve(s.size() + 8);
+	for (unsigned char c : s) {
+		switch (c) {
+		case '\\':
+			out += "\\\\";
+			break;
+		case '"':
+			out += "\\\"";
+			break;
+		case '\b':
+			out += "\\b";
+			break;
+		case '\f':
+			out += "\\f";
+			break;
+		case '\n':
+			out += "\\n";
+			break;
+		case '\r':
+			out += "\\r";
+			break;
+		case '\t':
+			out += "\\t";
+			break;
+		default:
+			if (c < 0x20) {
+				char buf8;
+				std::snprintf(buf, sizeof(buf), "\\u%04x", c);
+				out += buf;
+			} else {
+				out += static_cast<char>(c);
+			}
+		}
+	}
+	return out;
+}
+
+// Each ToJson emits the SAME shape as the matching REST list-item writer in Api.cpp. The contract
+// is "an SSE _added/_updated event carries the full resource -- clients do not need to re-GET to
+// see the moved counters". The Equal functions below compare every field included here, so any
+// movement fires `_updated`.
+
+// `null` when the string was never populated, matching WriteStringOrNull on the REST side. Same
+// (known, value) shape as JsonNumOrNull; the caller decides what "known" means, since some fields
+// key on a sibling.
+std::string JsonStrOrNull(bool known, const std::string &v)
+{
+	return known ? "\"" + EscJson(v) + "\"" : std::string("null");
+}
+
+// `null` when the value was never measured, matching WriteIntOrNull / WriteBoolOrNull on the REST
+// side. The comparators below must treat null<->value as a change, or the event stops firing on the
+// edge that flips it.
+std::string JsonNumOrNull(bool known, std::uint64_t v)
+{
+	return known ? std::to_string(v) : std::string("null");
+}
+
+// The protocol extensions as the API's token array, from the table the daemon and the desktop GUI
+// read (src/PeerCapabilities.h). Rendered here rather than stored on the row so the mapping has one
+// definition.
+//
+// Empty array, not null: the peer claimed nothing, which is a known answer.
+std::string JsonProtocolExtensions(std::uint32_t bits)
+{
+	CPeerCapabilities caps;
+	caps.SetFromWire(bits);
+	std::string out = "";
+	bool first = true;
+	for (const std::string &token : caps.GetApiTokens()) {
+		if (!first) {
+			out += ",";
+		}
+		first = false;
+		out += "\"" + token + "\"";
+	}
+	out += "";
+	return out;
+}
+
+std::string JsonBoolOrNull(bool known, bool v)
+{
+	return known ? std::string(v ? "true" : "false") : std::string("null");
+}
+
+// download_* event payload -- mirrors WriteDownloadObject (Api.cpp)
+// at the wire level. Reads the download sub-block of FileSnapshot.
+std::string ToJsonDownloadEvent(const FileSnapshot &f)
+{
+	std::ostringstream o;
+	o << "{"
+	  << "\"hash\":\"" << EscJson(f.hash) << "\""
+	  << ",\"name\":\"" << EscJson(f.name) << "\""
+	  << ",\"ed2k_link\":\"" << EscJson(f.ed2k_link) << "\""
+	  << ",\"size_bytes\":" << f.size << ",\"completed_bytes\":" << f.download.completed_bytes
+	  << ",\"transferred_bytes\":" << f.download.transferred_bytes
+	  << ",\"speed_bytes_per_second\":" << f.download.speed_bytes_per_second << ",\"status\":\""
+	  << EscJson(f.download.status) << "\""
+	  << ",\"priority\":\"" << EscJson(f.download.priority) << "\""
+	  << ",\"priority_auto\":" << (f.download.priority_auto ? "true" : "false")
+	  << ",\"category_index\":" << f.download.category << ",\"sources\":{"
+	  << "\"total\":" << f.download.sources_total << ",\"unavailable\":" << f.download.sources_unavailable
+	  << ",\"transferring\":" << f.download.sources_transferring
+	  << ",\"a4af\":" << f.download.sources_a4af << "}"
+	  << ",\"progress\":{\"percent\":" << JsonDoubleToString(f.download.percent) << "}"
+	  << ",\"kad_comment_lookup_running\":" << (f.download.kad_comment_searching ? "true" : "false")
+	  << ",\"hashed_part_count\":" << f.download.hashed_part_count
+	  << ",\"total_part_count\":" << webapi::PartCountForSize(f.size) << ",\"source_ecids\":";
+	bool first_a4af = true;
+	for (const std::uint32_t ecid : f.download.a4af_sources) {
+		if (!first_a4af)
+			o << ",";
+		first_a4af = false;
+		o << ecid;
+	}
+	o << "}";
+	return o.str();
+}
+
+// comments_updated payload -- the GET /downloads/{hash}/comments body plus `hash`. Covers retrieved
+// Kad notes and comments from connected ed2k sources (they share source_comments).
+//
+// A strict superset of the endpoint, deliberately: nothing else in the frame identifies the file,
+// and `kad_comment_lookup_running` is exactly what a client wants while a POST lookup is in flight.
+std::string ToJsonCommentsEvent(const FileSnapshot &f)
+{
+	std::ostringstream o;
+	o << "{\"hash\":\"" << EscJson(f.hash) << "\""
+	  << ",\"kad_comment_lookup_running\":" << (f.download.kad_comment_searching ? "true" : "false")
+	  << ",\"total\":" << f.download.source_comments.size() << ",\"comments\":";
+	bool first = true;
+	for (const auto &c : f.download.source_comments) {
+		if (!first)
+			o << ",";
+		first = false;
+		o << "{\"username\":\"" << EscJson(c.username) << "\""
+		  << ",\"filename\":\"" << EscJson(c.filename) << "\""
+		  << ",\"rating\":" << c.rating << ",\"comment\":\"" << EscJson(c.comment) << "\"}";
+	}
+	o << "}";
+	return o.str();
+}
+
+// shared_* event payload -- mirrors WriteSharedObject. Reads the
+// shared sub-block of FileSnapshot.
+std::string ToJsonSharedEvent(const FileSnapshot &f)
+{
+	std::ostringstream o;
+	o << "{"
+	  << "\"hash\":\"" << EscJson(f.hash) << "\""
+	  << ",\"name\":\"" << EscJson(f.name) << "\""
+	  << ",\"ed2k_link\":\"" << EscJson(f.ed2k_link) << "\""
+	  << ",\"size_bytes\":" << f.size << ",\"priority\":\"" << EscJson(f.shared.priority) << "\""
+	  << ",\"priority_auto\":"
+	  << (f.shared.priority_auto ? "true" : "false")
+	  // Nested to match the REST row: a stated exception to R11, so `sources.complete` is one
+	  // access path across every endpoint that has the concept. The range is detail-only and does
+	  // not ride the event.
+	  << ",\"sources\":{\"complete\":" << f.shared.complete_sources
+	  << "}"
+	  // Flattened (R11), same as the REST row this promises key parity with.
+	  << ",\"uploaded_bytes_session\":" << f.shared.uploaded_bytes_session
+	  << ",\"uploaded_bytes_total\":" << f.shared.uploaded_bytes_total
+	  << ",\"request_count_session\":" << f.shared.request_count_session
+	  << ",\"request_count_total\":" << f.shared.request_count_total
+	  << ",\"accepted_request_count_session\":" << f.shared.accepted_request_count_session
+	  << ",\"accepted_request_count_total\":" << f.shared.accepted_request_count_total
+	  << ",\"upload_speed_bytes_per_second\":" << f.shared.upload_speed_bytes_per_second
+	  << ",\"uploading_client_count\":"
+	  << f.shared.uploading_client_count
+	  // Unix seconds, null when unknown -- never uploaded, or a known.met entry predating the
+	  // field. 0 reads as 1970 rather than "no idea", and a subscriber hydrating from REST would
+	  // see its null flip to 0.
+	  << ",\"last_upload_at\":";
+	if (f.shared.last_upload != 0)
+		o << f.shared.last_upload;
+	else
+		o << "null";
+	o << ",\"shared_since_at\":";
+	if (f.shared.shared_since != 0)
+		o << f.shared.shared_since;
+	else
+		o << "null";
+	o << ",\"hashed_part_count\":" << SharedHashingProgress(f);
+	// Media metadata rides the event because a re-extraction is otherwise invisible: the
+	// refresh endpoints answer 202 with no result, so this is how a client learns a probe
+	// landed. null rather than absent when the file has none, since a subscriber diffing REST
+	// against SSE must not find a key on one side only.
+	o << ",\"media\":";
+	if (f.has_media) {
+		o << "{\"duration_seconds\":" << f.media.duration_seconds
+		  << ",\"bitrate_kilobits_per_second\":" << f.media.bitrate_kilobits_per_second
+		  << ",\"codec\":\"" << EscJson(MediaCodecLabel(f.media.codec)) << "\""
+		  << ",\"artist\":\"" << EscJson(f.media.artist) << "\""
+		  << ",\"album\":\"" << EscJson(f.media.album) << "\""
+		  << ",\"title\":\"" << EscJson(f.media.title) << "\"}";
+	} else {
+		o << "null";
+	}
+	o << "}";
+	return o.str();
+}
+
+std::string ToJson(const ServerSnapshot &s)
+{
+	std::ostringstream o;
+	o << "{"
+	  << "\"ecid\":" << s.ecid << ",\"name\":\"" << EscJson(s.name) << "\""
+	  << ",\"description\":\"" << EscJson(s.description) << "\""
+	  << ",\"software_version\":" << JsonStrOrNull(!s.version.empty(), s.version) << ",\"address\":\""
+	  << EscJson(s.address)
+	  << "\""
+	  // The bare IP beside the "ip:port" form, matching the REST row.
+	  << ",\"ip\":\"" << EscJson(s.address.substr(0, s.address.rfind(':'))) << "\""
+	  << ",\"country_code\":"
+	  << (s.country_code.empty() ? std::string("null") : "\"" + EscJson(s.country_code) + "\"")
+	  << ",\"port\":" << s.port << ",\"user_count\":" << s.users << ",\"max_user_count\":" << s.max_users
+	  << ",\"file_count\":" << s.files << ",\"soft_file_limit\":" << s.soft_file_limit
+	  << ",\"hard_file_limit\":" << s.hard_file_limit << ",\"priority\":\"" << EscJson(s.priority) << "\""
+	  << ",\"ping_ms\":" << s.ping_ms << ",\"failed_count\":" << s.failed_count << ",\"permanent\":"
+	  << (s.is_static ? "true" : "false")
+	  // Same fragment builder WriteServerObject uses, so the event payload and
+	  // the REST object stay byte-identical here by construction.
+	  << ",\"tcp_flags\":" << ServerTcpFlagsJson(s.tcp_flags)
+	  << ",\"udp_flags\":" << ServerUdpFlagsJson(s.udp_flags) << "}";
+	return o.str();
+}
+
+std::string ToJson(const FriendSnapshot &f)
+{
+	std::ostringstream o;
+	o << "{"
+	  << "\"ecid\":" << f.ecid << ",\"name\":\"" << EscJson(f.name) << "\""
+	  << ",\"user_hash\":\"" << EscJson(f.user_hash)
+	  << "\""
+	  // null, not "" / 0, when the daemon has not reported an address: a subscriber hydrating
+	  // from GET /friends would otherwise see ip flip null -> "" on the first tick that touches
+	  // the row, with no real change.
+	  << ",\"ip\":" << (f.ip.empty() ? std::string("null") : "\"" + EscJson(f.ip) + "\"")
+	  << ",\"port\":" << (f.ip.empty() ? std::string("null") : std::to_string(f.port))
+	  << ",\"client_ecid\":" << (f.client_ecid ? std::to_string(f.client_ecid) : std::string("null"))
+	  << ",\"connected\":" << JsonBoolOrNull(f.has_connected, f.connected)
+	  << ",\"friend_slot\":" << (f.friend_slot ? "true" : "false") << "}";
+	return o.str();
+}
+
+std::string ToJson(const ClientSnapshot &c)
+{
+	std::ostringstream o;
+	o << "{"
+	  << "\"ecid\":" << c.ecid << ",\"name\":" << JsonStrOrNull(!c.client_name.empty(), c.client_name)
+	  << ",\"user_hash\":\"" << EscJson(c.user_hash)
+	  << "\""
+	  // Same guard as country_code below and as WriteKnownClientObject's
+	  // has_addr, which nulls ip/port/kad_port together.
+	  << ",\"ip\":" << JsonStrOrNull(!c.ip.empty(), c.ip)
+	  << ",\"country_code\":"
+	  // null, not "", when the lookup has not resolved.
+	  << JsonStrOrNull(!c.country_code.empty(), c.country_code)
+	  << ",\"port\":" << (c.ip.empty() ? std::string("null") : std::to_string(c.port))
+	  << ",\"software\":" << JsonStrOrNull(!c.software.empty(), c.software)
+	  << ",\"software_version\":" << JsonStrOrNull(!c.software_version.empty(), c.software_version)
+	  << ",\"reported_os\":"
+	  << JsonStrOrNull(!c.reported_os.empty(), c.reported_os)
+	  // The three *_state values are enum labels, not free text: the daemon always
+	  // answers, and an unrecognised answer is the "unknown" member.
+	  << ",\"upload_state\":\"" << EscJson(c.upload_state) << "\""
+	  << ",\"download_state\":\"" << EscJson(c.download_state) << "\""
+	  << ",\"ident_state\":\"" << EscJson(c.ident_state) << "\""
+	  << ",\"download_file_name\":" << JsonStrOrNull(!c.download_file_name.empty(), c.download_file_name)
+	  << ",\"upload_file_name\":" << JsonStrOrNull(!c.upload_file_name.empty(), c.upload_file_name)
+	  << ",\"upload_file_hash\":" << JsonStrOrNull(!c.upload_file_hash.empty(), c.upload_file_hash)
+	  << ",\"download_file_hash\":"
+	  << JsonStrOrNull(!c.download_file_hash.empty(), c.download_file_hash)
+	  // Kept flat, not in a sub-object (R11).
+	  << ",\"uploaded_bytes_session\":" << c.uploaded_bytes_session
+	  << ",\"downloaded_bytes_session\":" << c.downloaded_bytes_session
+	  << ",\"uploaded_bytes_total\":" << c.uploaded_bytes_total
+	  << ",\"downloaded_bytes_total\":" << c.downloaded_bytes_total
+	  << ",\"upload_speed_bytes_per_second\":" << c.upload_speed_bytes_per_second
+	  << ",\"download_speed_bytes_per_second\":" << c.download_speed_bytes_per_second
+	  << ",\"upload_queue_position\":" << c.upload_queue_position << ",\"remote_queue_position\":"
+	  << (c.remote_queue_position == kRemoteQueueFullSentinel ? std::string("null")
+								  : std::to_string(c.remote_queue_position))
+	  << ",\"upload_queue_score\":" << c.score
+	  << ",\"obfuscation_state\":" << JsonStrOrNull(!c.obfuscation_state.empty(), c.obfuscation_state)
+	  << ",\"connected\":" << JsonBoolOrNull(c.has_connected, c.connected)
+	  << ",\"protocol_extensions\":" << JsonProtocolExtensions(c.protocol_extensions)
+	  << ",\"friend_slot\":" << (c.friend_slot ? "true" : "false")
+	  << ",\"friend\":" << (c.is_friend ? "true" : "false") << ",\"credit_ratio\":"
+	  << (c.has_credit_ratio ? JsonDoubleToString(c.credit_ratio) : std::string("null"))
+	  << ",\"source_origin\":" << JsonStrOrNull(!c.source_origin.empty(), c.source_origin)
+	  << ",\"parts_offered_count\":"
+	  << (c.has_parts_offered_count ? std::to_string(c.parts_offered_count) : std::string("null"))
+	  << ",\"client_mod_name\":" << JsonStrOrNull(!c.client_mod_name.empty(), c.client_mod_name)
+	  << ",\"shared_files_browsable\":" << (c.view_shared_disabled ? "false" : "true");
+	// null, not omitted: the field only means something for a peer we are downloading from, and
+	// -1 is the in-process sentinel that must never reach the wire. Formatted through the
+	// shared writer rather than `<<`, whose 6-significant-digit default honours LC_NUMERIC and
+	// would emit a comma on an it/de/fr locale, breaking the frame's JSON.
+	o << ",\"part_progress_percent\":"
+	  << (c.part_progress_percent >= 0.0 ? JsonDoubleToString(c.part_progress_percent)
+					     : std::string("null"));
+	o << "}";
+	return o.str();
+}
+
+// A free-space figure renders as a JSON number, or null when the daemon has none (-1). Kept beside
+// the REST handler's identical rule so the two cannot drift apart.
+std::string JsonFreeSpace(std::int64_t v)
+{
+	return v < 0 ? std::string("null") : std::to_string(v);
+}
+
+// Mirrors HandleStatus key for key -- EVENTS.md promises this payload is identical to the REST
+// /status envelope, and 22-sse-diff-emission.sh asserts it. Takes a triple because that nesting
+// groups StatusSnapshot AND KadSnapshot AND the dashboard's ec_connected bit, all read in one
+// shared_lock by state.Dashboard() at the call site. Both connected_since_at values are 0 while not
+// connected: gate on state, not on the timestamp.
+std::string ToJsonStatusEvent(const StatusSnapshot &s, const KadSnapshot &k, bool ec_connected)
+{
+	std::ostringstream o;
+	o << "{"
+	  << "\"ec_connected\":" << (ec_connected ? "true" : "false") << ",\"ed2k\":{"
+	  << "\"state\":\"" << EscJson(s.ed2k_state) << "\""
+	  << ",\"high_id\":" << (s.ed2k_high_id ? "true" : "false") << ",\"user_id\":"
+	  << s.ed2k_user_id
+	  // null, not "", for the addresses; server_port nulls with its address.
+	  << ",\"public_ip\":"
+	  << (s.ed2k_public_ip.empty() ? std::string("null") : "\"" + EscJson(s.ed2k_public_ip) + "\"")
+	  << ",\"connected_since_at\":" << s.ed2k_connected_since
+	  << ",\"server_name\":" << JsonStrOrNull(!s.server_ip.empty(), s.server_name) << ",\"server_ip\":"
+	  << (s.server_ip.empty() ? std::string("null") : "\"" + EscJson(s.server_ip) + "\"")
+	  << ",\"server_port\":"
+	  << (s.server_ip.empty() ? std::string("null") : std::to_string(s.server_port)) << ",\"network\":{"
+	  << "\"user_count\":" << JsonNumOrNull(s.has_ed2k_network, s.ed2k_users)
+	  << ",\"file_count\":" << JsonNumOrNull(s.has_ed2k_network, s.ed2k_files) << "}}"
+	  << ",\"kad\":{"
+	  << "\"state\":\"" << EscJson(s.kad_state) << "\""
+	  << ",\"firewalled_tcp\":" << JsonBoolOrNull(s.has_kad_firewalled_tcp, s.kad_firewalled_tcp)
+	  << ",\"connected_since_at\":" << s.kad_connected_since << ",\"network\":{"
+	  << "\"user_count\":" << JsonNumOrNull(k.has_network, k.users)
+	  << ",\"file_count\":" << JsonNumOrNull(k.has_network, k.files)
+	  << ",\"node_count\":" << JsonNumOrNull(k.has_network, k.nodes) << "}"
+	  << "}"
+	  << ",\"speeds\":{"
+	  << "\"download_speed_bytes_per_second\":" << s.download_bytes_per_second
+	  << ",\"upload_speed_bytes_per_second\":" << s.upload_bytes_per_second
+	  << ",\"download_overhead_bytes_per_second\":" << s.download_overhead_bytes_per_second
+	  << ",\"upload_overhead_bytes_per_second\":" << s.upload_overhead_bytes_per_second << "}"
+	  << ",\"disk\":{"
+	  // null, not the -1 sentinel and not 0 -- same reasoning as the REST body.
+	  << "\"temp_free_bytes\":" << JsonFreeSpace(s.temp_free_bytes)
+	  << ",\"incoming_free_bytes\":" << JsonFreeSpace(s.incoming_free_bytes) << "}"
+	  << ",\"queue\":{"
+	  << "\"waiting_upload_client_count\":" << s.ul_queue_len
+	  << ",\"download_source_count\":" << s.total_src_count << "}"
+	  << "}";
+	return o.str();
+}
+
+// Equal compares every field the matching ToJson emits, and any movement fires `_updated` with the
+// full new snapshot. If one set drifts from the other, clients see stale values until the next
+// compared field changes.
+//
+// The download side ignores shared.* and is_shared, the shared side ignores download.* and
+// is_downloading, so a tick that flips one role does not fire the other role's _updated. ecid is in
+// both shapes: an amuled restart under a running amuleapi resurfaces the same hash with a fresh
+// ECID, and clients keyed on ECID need the _updated to invalidate their cached id.
+bool EqualDownload(const FileSnapshot &a, const FileSnapshot &b)
+{
+	return a.ecid == b.ecid && a.hash == b.hash && a.name == b.name && a.ed2k_link == b.ed2k_link &&
+	       a.size == b.size && a.download.priority == b.download.priority &&
+	       a.download.completed_bytes == b.download.completed_bytes &&
+	       a.download.transferred_bytes == b.download.transferred_bytes &&
+	       a.download.speed_bytes_per_second == b.download.speed_bytes_per_second &&
+	       a.download.status == b.download.status &&
+	       a.download.priority_auto == b.download.priority_auto &&
+	       a.download.category == b.download.category &&
+	       a.download.sources_total == b.download.sources_total &&
+	       a.download.sources_unavailable == b.download.sources_unavailable &&
+	       a.download.sources_transferring == b.download.sources_transferring &&
+	       a.download.sources_a4af == b.download.sources_a4af &&
+	       a.download.percent == b.download.percent &&
+	       a.download.kad_comment_searching == b.download.kad_comment_searching &&
+	       a.download.hashed_part_count == b.download.hashed_part_count &&
+	       // The membership, not the `sources_a4af` count beside it: a swap moves
+	       // one client out and another in, so the count never budges.
+	       a.download.a4af_sources == b.download.a4af_sources;
+}
+
+// Comment list equality (deliberately NOT part of EqualDownload -- a comment
+// change drives the separate comments_updated event, not download_updated).
+bool EqualComments(const FileSnapshot &a, const FileSnapshot &b)
+{
+	// The in-flight flag is part of the payload, so it has to be part of the comparison:
+	// without it the true->false edge at the end of a Kad lookup fires no event, and a
+	// `?channels=comments` subscriber keeps its spinner.
+	if (a.download.kad_comment_searching != b.download.kad_comment_searching)
+		return false;
+	const auto &ca = a.download.source_comments;
+	const auto &cb = b.download.source_comments;
+	if (ca.size() != cb.size())
+		return false;
+	for (std::size_t i = 0; i < ca.size(); ++i) {
+		if (cai.username != cbi.username || cai.filename != cbi.filename ||
+			cai.rating != cbi.rating || cai.comment != cbi.comment)
+			return false;
+	}
+	return true;
+}
+bool EqualShared(const FileSnapshot &a, const FileSnapshot &b)
+{
+	return a.ecid == b.ecid && a.hash == b.hash && a.name == b.name && a.ed2k_link == b.ed2k_link &&
+	       a.size == b.size && a.shared.priority == b.shared.priority &&
+	       a.shared.priority_auto == b.shared.priority_auto &&
+	       a.shared.complete_sources == b.shared.complete_sources &&
+	       a.shared.uploaded_bytes_session == b.shared.uploaded_bytes_session &&
+	       a.shared.uploaded_bytes_total == b.shared.uploaded_bytes_total &&
+	       a.shared.request_count_session == b.shared.request_count_session &&
+	       a.shared.request_count_total == b.shared.request_count_total &&
+	       a.shared.accepted_request_count_session == b.shared.accepted_request_count_session &&
+	       a.shared.accepted_request_count_total == b.shared.accepted_request_count_total &&
+	       a.shared.upload_speed_bytes_per_second == b.shared.upload_speed_bytes_per_second &&
+	       a.shared.uploading_client_count == b.shared.uploading_client_count &&
+	       a.shared.last_upload == b.shared.last_upload &&
+	       a.shared.shared_since == b.shared.shared_since &&
+	       // Media metadata, so a re-extraction emits shared_updated at all. Without these a file
+	       // whose metadata just changed compares EQUAL and the refresh is invisible -- the only
+	       // progress signal the 202-returning refresh endpoints have. These change once per
+	       // probe, not per tick.
+	       a.has_media == b.has_media && a.media.duration_seconds == b.media.duration_seconds &&
+	       a.media.bitrate_kilobits_per_second == b.media.bitrate_kilobits_per_second &&
+	       a.media.codec == b.media.codec && a.media.artist == b.media.artist &&
+	       a.media.album == b.media.album && a.media.title == b.media.title &&
+	       // Through the accessor, not the raw field: a shared download's progress
+	       // lives on the download side, which the raw field would hold back.
+	       SharedHashingProgress(a) == SharedHashingProgress(b);
+}
+bool Equal(const ServerSnapshot &a, const ServerSnapshot &b)
+{
+	return a.name == b.name && a.description == b.description && a.version == b.version &&
+	       a.address == b.address && a.country_code == b.country_code && a.port == b.port &&
+	       a.users == b.users && a.max_users == b.max_users && a.files == b.files &&
+	       a.soft_file_limit == b.soft_file_limit && a.hard_file_limit == b.hard_file_limit &&
+	       a.tcp_flags == b.tcp_flags && a.udp_flags == b.udp_flags && a.priority == b.priority &&
+	       a.ping_ms == b.ping_ms && a.failed_count == b.failed_count && a.is_static == b.is_static;
+}
+bool Equal(const FriendSnapshot &a, const FriendSnapshot &b)
+{
+	// client_ecid is part of the identity here on purpose: it going to 0 is the friend losing
+	// its live peer. connected is compared alongside it, not instead: a peer can go from
+	// linked-but-unreachable to connected unmoved.
+	return a.name == b.name && a.user_hash == b.user_hash && a.ip == b.ip && a.port == b.port &&
+	       a.client_ecid == b.client_ecid && a.friend_slot == b.friend_slot &&
+	       a.connected == b.connected && a.has_connected == b.has_connected;
+}
+bool Equal(const ClientSnapshot &a, const ClientSnapshot &b)
+{
+	return a.client_name == b.client_name && a.user_hash == b.user_hash && a.ip == b.ip &&
+	       a.country_code == b.country_code && a.port == b.port && a.software == b.software &&
+	       a.software_version == b.software_version && a.reported_os == b.reported_os &&
+	       a.upload_state == b.upload_state && a.download_state == b.download_state &&
+	       a.ident_state == b.ident_state && a.download_file_name == b.download_file_name &&
+	       a.upload_file_name == b.upload_file_name && a.upload_file_hash == b.upload_file_hash &&
+	       a.download_file_hash == b.download_file_hash &&
+	       a.uploaded_bytes_session == b.uploaded_bytes_session &&
+	       a.downloaded_bytes_session == b.downloaded_bytes_session &&
+	       a.uploaded_bytes_total == b.uploaded_bytes_total &&
+	       a.downloaded_bytes_total == b.downloaded_bytes_total &&
+	       a.upload_speed_bytes_per_second == b.upload_speed_bytes_per_second &&
+	       a.download_speed_bytes_per_second == b.download_speed_bytes_per_second &&
+	       a.upload_queue_position == b.upload_queue_position &&
+	       a.remote_queue_position == b.remote_queue_position && a.score == b.score &&
+	       a.obfuscation_state == b.obfuscation_state && a.protocol_extensions == b.protocol_extensions &&
+	       a.friend_slot == b.friend_slot && a.is_friend == b.is_friend &&
+	       a.credit_ratio == b.credit_ratio && a.has_credit_ratio == b.has_credit_ratio &&
+	       a.connected == b.connected && a.has_connected == b.has_connected &&
+	       a.source_origin == b.source_origin && a.parts_offered_count == b.parts_offered_count &&
+	       // Without the flag, null -> 0 (the part map arriving and reporting
+	       // zero) compares equal and the row never updates.
+	       a.has_parts_offered_count == b.has_parts_offered_count &&
+	       a.client_mod_name == b.client_mod_name && a.view_shared_disabled == b.view_shared_disabled &&
+	       // Derived from parts_offered_count and the linked file's part count, so it normally
+	       // moves only when a compared field does. The case that needs it in its own right is the
+	       // file going away: the percent drops back to its sentinel while every other field
+	       // holds.
+	       a.part_progress_percent == b.part_progress_percent;
+}
+bool Equal(const StatusSnapshot &a, const StatusSnapshot &b)
+{
+	// public_ip is derived from ed2k_user_id, so comparing the id covers it.
+	return a.ed2k_state == b.ed2k_state && a.kad_state == b.kad_state &&
+	       a.ed2k_high_id == b.ed2k_high_id && a.ed2k_user_id == b.ed2k_user_id &&
+	       a.ed2k_connected_since == b.ed2k_connected_since &&
+	       a.kad_connected_since == b.kad_connected_since &&
+	       a.kad_firewalled_tcp == b.kad_firewalled_tcp && a.server_name == b.server_name &&
+	       a.server_ip == b.server_ip && a.server_port == b.server_port &&
+	       a.download_bytes_per_second == b.download_bytes_per_second &&
+	       a.upload_bytes_per_second == b.upload_bytes_per_second &&
+	       a.download_overhead_bytes_per_second == b.download_overhead_bytes_per_second &&
+	       a.upload_overhead_bytes_per_second == b.upload_overhead_bytes_per_second &&
+	       a.temp_free_bytes == b.temp_free_bytes && a.incoming_free_bytes == b.incoming_free_bytes &&
+	       a.ul_queue_len == b.ul_queue_len && a.total_src_count == b.total_src_count &&
+	       // The has_ flags are compared, not just the values: a disconnect flips these to null
+	       // while the underlying ints keep their last reading, so comparing the ints alone would
+	       // miss the edge.
+	       a.has_ed2k_network == b.has_ed2k_network && a.ed2k_users == b.ed2k_users &&
+	       a.ed2k_files == b.ed2k_files && a.has_kad_firewalled_tcp == b.has_kad_firewalled_tcp;
+}
+bool Equal(const KadSnapshot &a, const KadSnapshot &b)
+{
+	// The SEPARATE gate for the kad half of status_changed -- the status comparator above does
+	// not cover these. has_network is compared first because it is what changes on a
+	// connect/disconnect edge.
+	return a.has_network == b.has_network && a.users == b.users && a.files == b.files &&
+	       a.nodes == b.nodes;
+}
+
+// Generic map-diff helper. Walks both old and new, emitting:
+//  - `<base>_removed` for keys in old missing from new (identity-only)
+//  - `<base>_added`   for keys in new missing from old (full ToJson)
+//  - `<base>_updated` for shared keys whose values differ (full ToJson)
+//
+// Coalesced into one PublishBatch (one lock, one notify_all) so a cold-start diff on a
+// 5K-download library does not fire 5K notify_all cycles inside the refresher loop.
+template <class Map, class IdentityFn>
+void DiffMap(CEventBus &bus,
+	const std::string &base,
+	const Map &old_items,
+	const Map &new_items,
+	IdentityFn removed_id_payload_fn)
+{
+	std::vector<std::pair<std::string, std::string>> batch;
+	batch.reserve(old_items.size() + new_items.size());
+	const std::string removed_name = base + "_removed";
+	const std::string added_name = base + "_added";
+	const std::string updated_name = base + "_updated";
+	for (const auto &kv : old_items) {
+		if (new_items.find(kv.first) == new_items.end()) {
+			batch.emplace_back(removed_name, removed_id_payload_fn(kv.second));
+		}
+	}
+	for (const auto &kv : new_items) {
+		const auto it = old_items.find(kv.first);
+		if (it == old_items.end()) {
+			batch.emplace_back(added_name, ToJson(kv.second));
+		} else if (!Equal(it->second, kv.second)) {
+			batch.emplace_back(updated_name, ToJson(kv.second));
+		}
+	}
+	bus.PublishBatch(batch);
+}
+
+// Hash-keyed file events emit removed payloads as `{"hash":"..."}` so consumers
+// can drop the cache entry without needing the old object.
+std::string RemovedHashPayload(const std::string &hash)
+{
+	return "{\"hash\":\"" + EscJson(hash) + "\"}";
+}
+
+// Every ECID-keyed collection identifies a removed entry the same way, now that
+// each object names its own handle `ecid`.
+template <class Snapshot> std::string RemovedEcidPayload(const Snapshot &item)
+{
+	// The per-type overloads this replaced could only be called with an ECID-keyed snapshot; an
+	// unconstrained template accepts anything with an `.ecid` member, and FileSnapshot has one
+	// while its collections are hash-keyed. Wiring one through DiffMap would compile and emit
+	// the wrong shape.
+	static_assert(!std::is_same<Snapshot, FileSnapshot>::value,
+		"file collections are hash-keyed -- use RemovedHashPayload");
+	std::ostringstream o;
+	o << "{\"ecid\":" << item.ecid << "}";
+	return o.str();
+}
+
+// Build an ECID-keyed map from the vector view CState exposes. The cache is a std::map<ECID,
+// Snapshot> internally but the accessor returns a vector, and diffing wants random access by ECID.
+// O(N), N typically <1000.
+template <class Snap> std::map<std::uint32_t, Snap> ByEcid(const std::vector<Snap> &v)
+{
+	std::map<std::uint32_t, Snap> m;
+	for (const auto &x : v)
+		m.emplace(x.ecid, x);
+	return m;
+}
+
+} // namespace
+
+namespace
+{
+
+// Single-writer invariant: only the wxApp refresher tick mutates LastSeenState and publishes diffs.
+// Anything else is a silent concurrency bug -- events get duplicated or dropped depending on thread
+// order. Capture the first caller's thread id and abort hard on any later caller from another
+// thread; hard-abort, not assert, so the check survives -DNDEBUG.
+std::atomic<std::thread::id> g_publisher_thread;
+
+void EnforceSinglePublisher()
+{
+	const std::thread::id self = std::this_thread::get_id();
+	std::thread::id expected;
+	if (g_publisher_thread.compare_exchange_strong(expected, self)) {
+		return; // first caller -- claimed it
+	}
+	if (expected == self)
+		return;
+	std::cerr << "amuleapi: EmitDiffsAndUpdate called from two "
+		     "different threads; this breaks the single-writer "
+		     "invariant on LastSeenState and the EventBus.\n";
+	std::abort();
+}
+
+// Every file event resolves its payload through `prev.files` after the locked walk, which holds
+// only because nothing erases from that map in between: the `gone` sweep runs after the batch is
+// built, and `gone` is disjoint from everything the walk recorded. Unreachable today, but a dropped
+// event is invisible and a lost `shared_removed` leaves a ghost row on every client.
+noreturn void AbortOnMissingBaseline(const char *event_name, std::uint32_t ecid)
+{
+	std::cerr << "amuleapi: file diff lost the baseline entry for ECID " << ecid << " while building "
+		  << event_name << "; the prev.files erase has moved ahead of the batch build.\n";
+	std::abort();
+}
+
+} // namespace
+
+// One chat message as the `message` object both the SSE payload and GET /chats/{address}/messages
+// expose. The REST side renders the identical shape through CJsonWriter.
+//
+// `sent_at` nulls on 0 the way WriteIntOrNull does. Nothing the core reports today is unstamped, so
+// this is the two writers agreeing on a shape rather than on a value that flips in the field -- but
+// the snapshot field defaults to 0, and a core that ever omits the tag must not make them diverge.
+std::string ChatMessageJson(const ChatMessageSnapshot &msg)
+{
+	return "{\"id\":" + std::to_string(msg.id) + ",\"direction\":\"" + (msg.outgoing ? "out" : "in") +
+	       "\",\"text\":\"" + EscJson(msg.text) + "\",\"sent_at\":" +
+	       (msg.timestamp != 0 ? std::to_string(msg.timestamp) : std::string("null")) + "}";
+}
+
+void PublishChatEvents(CEventBus &bus,
+	const std::vector<ChatSessionSnapshot> &new_messages,
+	const std::vector<std::uint64_t> &closed)
+{
+	if (new_messages.empty() && closed.empty())
+		return;
+
+	std::vector<std::pair<std::string, std::string>> batch;
+	for (const ChatSessionSnapshot &session : new_messages) {
+		const std::string peer = session.PeerKey();
+		for (const ChatMessageSnapshot &msg : session.messages) {
+			std::string payload = "{\"address\":\"" + EscJson(peer) + "\",\"ip\":\"" +
+					      EscJson(session.ip) +
+					      "\",\"port\":" + std::to_string(session.port) + ",\"name\":\"" +
+					      EscJson(session.DisplayName()) +
+					      // client_ecid / friend_ecid are null rather than the 0
+					      // sentinel, matching the REST row (R10).
+					      "\",\"client_ecid\":" +
+					      (session.client_ecid ? std::to_string(session.client_ecid)
+								   : std::string("null")) +
+					      ",\"friend_ecid\":" +
+					      (session.friend_ecid ? std::to_string(session.friend_ecid)
+								   : std::string("null")) +
+					      ",\"message\":" + ChatMessageJson(msg) + "}";
+			batch.emplace_back("chat_message", std::move(payload));
+		}
+	}
+	for (std::uint64_t gui_id : closed) {
+		const std::string peer = ChatPeerKeyFromGuiId(gui_id);
+		batch.emplace_back("chat_session_closed", "{\"address\":\"" + EscJson(peer) + "\"}");
+	}
+	bus.PublishBatch(batch);
+}
+
+void EmitDiffsAndUpdate(CEventBus &bus, LastSeenState &prev, const CState &state)
+{
+	EnforceSinglePublisher();
+	// Snapshot the current state under its read locks. Files are the exception, walked in place
+	// further down: the diff needs the unified map, not a role-filtered view, so it can see a
+	// file that flipped is_shared false->true on an existing ECID and fire `shared_added` for
+	// it.
+	auto new_servers = ByEcid(state.Servers());
+	auto new_friends = ByEcid(state.Friends());
+	auto new_clients = ByEcid(state.Clients());
+	// part_progress_percent is derived, not refreshed: it needs the part count of the file the
+	// peer is a source for, which lives in a different snapshot, so the refresher leaves it at
+	// its sentinel and the REST handlers fill it in per request. Do the same here, or the event
+	// becomes the one payload a subscriber has to re-GET to complete. Computed before Equal()
+	// and the serialiser see the copies, so baseline and payload always agree.
+	for (auto &kv : new_clients) {
+		ComputePartProgressPercent(state, kv.second);
+	}
+	// Read the full dashboard for status_changed -- the payload mirrors the REST /status nested
+	// envelope, which pulls from StatusSnapshot + KadSnapshot + ec_connected. Dashboard() takes
+	// the State lock once for all three, so kad.network cannot be from tick N+1 while ed2k.* is
+	// from tick N.
+	auto new_dashboard = state.Dashboard();
+	const StatusSnapshot &new_status = new_dashboard.status;
+	const KadSnapshot &new_kad = new_dashboard.kad;
+	const bool new_ec = new_dashboard.ec_connected;
+
+	// Files: role-flag-aware diff, run against the live map rather than a copy. download_*
+	// fires on is_downloading transitions, shared_* on is_shared, and a single tick can fire
+	// both for the same file.
+	//
+	// prev.files is a comparison baseline, not a mirror: an entry is rewritten exactly when a
+	// predicate below reports a difference, so a new predicate has to go into the write-back
+	// condition too, not only the emit condition.
+	{
+		// Decided under the read lock, serialised after it. The payloads are the full
+		// snapshot shape, so a cold-start tick or a shared-files reload builds one per
+		// file; doing that inside the lock would queue the refresher's own writer and every
+		// reader behind it. The walk records only the event and its subject -- a hash for a
+		// removal, an ECID otherwise -- resolved against `prev.files` once the lock is
+		// released, which the write-back below leaves equal to the live entry.
+		enum class Change
+		{
+			DownloadAdded,
+			DownloadUpdated,
+			SharedAdded,
+			SharedUpdated,
+			CommentsUpdated,
+		};
+		std::vector<std::pair<const char *, std::uint32_t>> removed;
+		std::vector<std::pair<Change, std::uint32_t>> changed;
+		// ECIDs to drop from the baseline once the batch is built -- erasing during the
+		// walk would invalidate the iterator, and erasing before the batch would take the
+		// removal payloads' hashes with it.
+		std::vector<std::uint32_t> gone;
+		state.WithFiles(&(const FileMap &files) {
+			// _removed first -- clients can tear down their cache slot
+			// before the _added/_updated for the same ECID lands.
+			for (const auto &kv : prev.files) {
+				const auto it = files.find(kv.first);
+				const bool absent = (it == files.end());
+				if (kv.second.is_downloading && (absent || !it->second.is_downloading)) {
+					removed.emplace_back("download_removed", kv.first);
+				}
+				if (kv.second.is_shared && (absent || !it->second.is_shared)) {
+					removed.emplace_back("shared_removed", kv.first);
+				}
+				if (absent)
+					gone.push_back(kv.first);
+			}
+			// _added / _updated -- gated by the role-flag transition against
+			// the previous tick's is_downloading / is_shared value.
+			for (const auto &entry : files) {
+				const FileSnapshot &now = entry.second;
+				const auto it = prev.files.find(entry.first);
+				const bool known = (it != prev.files.end());
+				const bool was_downloading = known && it->second.is_downloading;
+				const bool was_shared = known && it->second.is_shared;
+				bool moved = !known || was_downloading != now.is_downloading ||
+					     was_shared != now.is_shared;
+				if (now.is_downloading) {
+					if (!was_downloading) {
+						changed.emplace_back(Change::DownloadAdded, entry.first);
+						// The flag counts as comment state, exactly as in
+						// EqualComments. Gating on the list alone means a
+						// download first seen with a Kad lookup already in
+						// flight never announces the lookup.
+						if (!now.download.source_comments.empty() ||
+							now.download.kad_comment_searching) {
+							changed.emplace_back(
+								Change::CommentsUpdated, entry.first);
+						}
+					} else {
+						if (!EqualDownload(it->second, now)) {
+							changed.emplace_back(
+								Change::DownloadUpdated, entry.first);
+							moved = true;
+						}
+						// Independent of download_updated: Kad notes AND source
+						// comments.
+						if (!EqualComments(it->second, now)) {
+							changed.emplace_back(
+								Change::CommentsUpdated, entry.first);
+							moved = true;
+						}
+					}
+				}
+				if (now.is_shared) {
+					if (!was_shared) {
+						changed.emplace_back(Change::SharedAdded, entry.first);
+					} else if (!EqualShared(it->second, now)) {
+						changed.emplace_back(Change::SharedUpdated, entry.first);
+						moved = true;
+					}
+				}
+				if (!moved)
+					continue;
+				if (known)
+					it->second = now;
+				else
+					prev.files.emplace(entry.first, now);
+			}
+		});
+		std::vector<std::pair<std::string, std::string>> batch;
+		batch.reserve(removed.size() + changed.size());
+		for (const auto &r : removed) {
+			// Still in the baseline: `gone` is erased below, once every
+			// payload that reads through it has been built.
+			const auto it = prev.files.find(r.second);
+			if (it == prev.files.end())
+				AbortOnMissingBaseline(r.first, r.second);
+			batch.emplace_back(r.first, RemovedHashPayload(it->second.hash));
+		}
+		for (const auto &c : changed) {
+			// Every recorded change set `moved`, so its entry was written back; `gone`
+			// holds only ECIDs absent from the live map, which these are not.
+			const auto it = prev.files.find(c.second);
+			if (it == prev.files.end())
+				AbortOnMissingBaseline("a file event", c.second);
+			const FileSnapshot &f = it->second;
+			switch (c.first) {
+			case Change::DownloadAdded:
+				batch.emplace_back("download_added", ToJsonDownloadEvent(f));
+				break;
+			case Change::DownloadUpdated:
+				batch.emplace_back("download_updated", ToJsonDownloadEvent(f));
+				break;
+			case Change::SharedAdded:
+				batch.emplace_back("shared_added", ToJsonSharedEvent(f));
+				break;
+			case Change::SharedUpdated:
+				batch.emplace_back("shared_updated", ToJsonSharedEvent(f));
+				break;
+			case Change::CommentsUpdated:
+				batch.emplace_back("comments_updated", ToJsonCommentsEvent(f));
+				break;
+			}
+		}
+		for (const std::uint32_t ecid : gone)
+			prev.files.erase(ecid);
+		bus.PublishBatch(batch);
+	}
+	DiffMap(bus, "server", prev.servers, new_servers, (const ServerSnapshot &s) {
+		return RemovedEcidPayload(s);
+	});
+	DiffMap(bus, "client", prev.clients, new_clients, (const ClientSnapshot &c) {
+		return RemovedEcidPayload(c);
+	});
+	// Note for consumers: one PATCH of the friend slot can produce two friend_updated events,
+	// because granting it to one friend clears it on whoever held it before.
+	DiffMap(bus, "friend", prev.friends, new_friends, (const FriendSnapshot &f) {
+		return RemovedEcidPayload(f);
+	});
+
+	// /status: one event when anything in the dashboard envelope changes (StatusSnapshot fields
+	// OR Kad network rollup OR ec_connected). Cold start is its own branch, gated on
+	// `status_initialised`, so the comparison below never runs against an empty prev and
+	// mistakes every field for a change.
+	if (!prev.status_initialised) {
+		bus.Publish("status_changed", ToJsonStatusEvent(new_status, new_kad, new_ec));
+		prev.status_initialised = true;
+	} else if (!Equal(prev.status, new_status) || !Equal(prev.kad, new_kad) ||
+		   prev.ec_connected != new_ec) {
+		bus.Publish("status_changed", ToJsonStatusEvent(new_status, new_kad, new_ec));
+	}
+
+	// Snapshot the new state for next tick's diff baseline.
+	prev.servers = std::move(new_servers);
+	prev.clients = std::move(new_clients);
+	prev.friends = std::move(new_friends);
+	prev.status = new_status;
+	prev.kad = new_kad;
+	prev.ec_connected = new_ec;
+
+	// The stable-but-mutable field set for `search_result_updated`. A hit's identity fields
+	// never change for a given ECID, and its source counts churn every tick while the search
+	// runs -- where `search_progress` is already the re-read cue. What is left is the set that
+	// can change AFTER a search finishes, when no other signal exists: download state, and the
+	// Kad-notes cluster. Comparing only these keeps the channel quiet on a running search.
+	const auto result_mutated = (const SearchResult &a, const SearchResult &b) {
+		if (a.status != b.status || a.already_downloaded != b.already_downloaded ||
+			a.rating != b.rating || a.kad_comment_searching != b.kad_comment_searching ||
+			a.comments.size() != b.comments.size())
+			return true;
+		for (std::size_t i = 0; i < a.comments.size(); ++i) {
+			const auto &ca = a.commentsi;
+			const auto &cb = b.commentsi;
+			if (ca.username != cb.username || ca.filename != cb.filename ||
+				ca.rating != cb.rating || ca.comment != cb.comment)
+				return true;
+		}
+		return false;
+	};
+
+	// Search events. `search_result_added` per new ECID; `search_result_updated` when one of a
+	// held result's stable-but-mutable fields changes; `search_progress` on any percent change
+	// while running and on the running->finished edge. The finished frame (state="finished",
+	// percent=100) IS that terminal search_progress -- there is no separate search_finished.
+	// The first tick after MarkSearchStarted bootstraps the baseline.
+	{
+		// Multi-search: diff every open search independently, keyed by
+		// search_id, and stamp that id on each event so subscribers demux.
+		const auto ids = state.AllSearchIds();
+		for (std::uint32_t sid : ids) {
+			const auto search_now = ByEcid(state.Search(sid));
+			const auto progress_now = state.SearchProgress(sid);
+
+			// Cold start (first tick ever): baseline every pre-existing search silently
+			// so history is not replayed as events. A search appearing LATER has no
+			// prev entry, so its generation (0) differs from the live one and the
+			// progress edge below fires its initial "running" frame.
+			if (!prev.search_initialised) {
+				auto &b = prev.searchessid;
+				b.results = search_now;
+				b.complete = progress_now.complete;
+				b.percent = progress_now.percent;
+				b.generation = progress_now.generation;
+				continue;
+			}
+
+			auto &pstate = prev.searchessid;
+			// Results do leave an attached search: the union merge erases an ECID the
+			// daemon stopped reporting, and RebuildFoldedResults drops a row folded
+			// into a parent. Without this the row stays on every subscriber's screen
+			// for the life of the search: a finished one publishes no further
+			// search_progress, so nothing hints that a re-read is due.
+			for (const auto &kv : pstate.results) {
+				if (search_now.find(kv.first) != search_now.end())
+					continue;
+				std::ostringstream removed;
+				removed << "{\"search_id\":" << sid << ",\"hash\":\""
+					<< EscJson(kv.second.hash) << "\"}";
+				bus.Publish("search_result_removed", removed.str());
+			}
+			// New and mutated result entries for this search.
+			for (const auto &kv : search_now) {
+				const auto pit = pstate.results.find(kv.first);
+				const bool is_new = pit == pstate.results.end();
+				if (!is_new && !result_mutated(pit->second, kv.second))
+					continue;
+				// `search_id` routes the event to a tab/view; every field after it
+				// comes from the writer GET /search/{id}/results uses, which makes
+				// the documented "byte-for-byte identical to a results-list entry"
+				// promise hold by construction.
+				//
+				// `search_result_updated` carries the identical payload under its
+				// own name rather than re-firing _added with upsert semantics, so a
+				// consumer that only handles _added keeps the behaviour it had.
+				CJsonWriter w;
+				w.BeginObject();
+				w.Key("search_id");
+				w.ValueInt(static_cast<int64_t>(sid));
+				WriteSearchResultFields(w, kv.second);
+				w.EndObject();
+				bus.Publish(is_new ? "search_result_added" : "search_result_updated",
+					w.TakeBuffer());
+			}
+			// search_progress: a percent change while running, the running->finished
+			// edge, or a generation bump (new POST /search, or first observation of
+			// this search_id). The generation trigger catches back-to-back searches
+			// whose whole lifecycle fits inside one refresher tick -- the
+			// percent+complete comparison would see 100->100 / true->true.
+			const bool generation_bumped = progress_now.generation != pstate.generation;
+			const bool finished_edge = progress_now.complete && !pstate.complete;
+			const bool percent_moved = progress_now.percent != pstate.percent;
+			if (generation_bumped || finished_edge || percent_moved) {
+				std::ostringstream payload;
+				payload << "{\"search_id\":" << sid << ",\"state\":\""
+					<< (progress_now.complete ? "finished" : "running") << "\""
+					<< ",\"percent\":"
+					<< progress_now.percent
+					// `result_count`: a plural key held an integer while
+					// `results` is an array everywhere else, and GET /search
+					// already calls this number result_count.
+					<< ",\"result_count\":" << search_now.size() << ",\"type\":\""
+					<< EscJson(progress_now.kind) << "\""
+					<< "}";
+				bus.Publish("search_progress", payload.str());
+			}
+			pstate.results = search_now;
+			pstate.complete = progress_now.complete;
+			pstate.percent = progress_now.percent;
+			pstate.generation = progress_now.generation;
+		}
+		prev.search_initialised = true;
+		// Prune baselines for searches that vanished (closed / EC reset) so prev.searches
+		// cannot grow without bound, and tell subscribers -- without the event a consumer
+		// holding one tab per search only finds out on its next read, and with SSE live it
+		// may never read again.
+		//
+		// This fires only when the SLOT is gone. A search the daemon evicted from its own
+		// ring is retired as finished and kept locally for late reads, so that case is a
+		// terminal search_progress above, never a search_closed.
+		for (auto it = prev.searches.begin(); it != prev.searches.end();) {
+			if (std::find(ids.begin(), ids.end(), it->first) == ids.end()) {
+				std::ostringstream payload;
+				payload << "{\"search_id\":" << it->first << "}";
+				bus.Publish("search_closed", payload.str());
+				it = prev.searches.erase(it);
+			} else {
+				++it;
+			}
+		}
+	}
+
+	// log_appended. The refresher only ever appends, so a size that grew means the tail is new.
+	// First tick records the baseline silently -- clients GET /logs/amule for the history; this
+	// channel is the live tail only.
+	//
+	// `DELETE /logs/amule` empties the buffer, and the clear-generation is what says so. A
+	// shrunk size was the old signal and it misses the case that matters: cleared and refilled
+	// past the old count between two ticks, the size only grows, so the append branch would
+	// publish a mid-buffer slice.
+	//
+	// On that edge subscribers get `resync`, which bypasses `?channels=` so a log-only
+	// subscriber is told too -- and which the HTTP thread could not have published from the
+	// DELETE handler anyway, the bus having a single-publisher invariant only this tick
+	// satisfies.
+	//
+	// Size and tail come from one read: the history is uncapped, so asking AmuleLog() for a
+	// `.size()` that is unchanged on almost every tick copies all of it -- and splitting the
+	// two would let that DELETE land in between.
+	std::size_t log_size = 0;
+	std::uint64_t log_generation = 0;
+	const auto tail = state.AmuleLogFrom(prev.amule_log_count, log_size, &log_generation);
+	if (!prev.amule_log_initialised) {
+		prev.amule_log_count = log_size;
+		prev.amule_log_generation = log_generation;
+		prev.amule_log_initialised = true;
+	} else if (log_generation != prev.amule_log_generation) {
+		bus.Publish("resync", "{\"reason\":\"log_cleared\"}");
+		prev.amule_log_count = log_size;
+		prev.amule_log_generation = log_generation;
+	} else if (log_size < prev.amule_log_count) {
+		// No generation bump, so this is not a clear: the buffer is capped
+		// elsewhere or the daemon replaced it wholesale. Re-point and stay quiet.
+		prev.amule_log_count = log_size;
+	} else if (!tail.empty()) {
+		std::ostringstream payload;
+		payload << "{\"lines\":";
+		bool first = true;
+		for (const std::string &line : tail) {
+			if (!first)
+				payload << ",";
+			first = false;
+			payload << "\"" << EscJson(line) << "\"";
+		}
+		payload << "}";
+		bus.Publish("log_appended", payload.str());
+		prev.amule_log_count = prev.amule_log_count + tail.size();
+	}
+}
+
+} // namespace webapi

amule-3.1.0.tar.gz/src/webapi/EventDiff.h Added

@@ -0,0 +1,111 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_EVENT_DIFF_H
+#define WEBAPI_EVENT_DIFF_H
+
+#include "State.h"
+
+#include <map>
+#include <cstdint>
+
+namespace webapi
+{
+
+class CEventBus;
+
+// One "last seen" snapshot of every substruct we publish events for. Owned by CamuleapiApp; mutated
+// AFTER each successful tick by `EmitDiffsAndUpdate`. The first tick fires `_added` for every alive
+// entry (cold start); later ticks fire only the deltas.
+struct LastSeenState
+{
+	// `files` is a comparison baseline against CState::m_files, not a mirror of it: an entry is
+	// rewritten exactly when one of EventDiff's predicates reports a difference, so the fields
+	// those predicates read stay fresh and others may lag. Adding a predicate means adding its
+	// field to the write-back condition too, not only to the emit condition.
+	//
+	// Role-flag transitions false->true emit the matching `_added` event, true->false the
+	// `_removed`; a file may emit both families.
+	std::map<std::uint32_t, FileSnapshot> files;
+	std::map<std::uint32_t, ServerSnapshot> servers;
+	std::map<std::uint32_t, ClientSnapshot> clients;
+	std::map<std::uint32_t, FriendSnapshot> friends;
+	// The status event payload mirrors the REST /status envelope, which pulls from THREE
+	// sources (StatusSnapshot + KadSnapshot + ec_connected). All three must be diffed against
+	// the prior tick to decide on `status_changed`.
+	StatusSnapshot status;
+	KadSnapshot kad;
+	bool ec_connected = false;
+	bool status_initialised = false;
+
+	// Log-tail tracking for `log_appended`. `amule_log_count` is how many lines the previous
+	// tick accounted for, and is what the next passes to CState::AmuleLogFrom() as its cursor.
+	// `amule_log_initialised` gates the cold start so history is not dumped as one event.
+	std::size_t amule_log_count = 0;
+	bool amule_log_initialised = false;
+	// Last clear-generation seen. A bump means DELETE /logs/amule emptied the
+	// buffer since the previous tick, which the count alone cannot tell.
+	std::uint64_t amule_log_generation = 0;
+
+	// Per-search event baseline (multi-search). One entry per open search_id, diffed against
+	// that search's state each tick: new result ECIDs -> search_result_added; a percent change,
+	// the running->finished edge, or a generation bump -> search_progress. Every event carries
+	// its `search_id`, and entries for searches no longer present are pruned.
+	struct SearchDiffState
+	{
+		std::map<std::uint32_t, SearchResult> results;
+		bool complete = false;
+		std::uint32_t percent = 0;
+		// Baseline `generation` from the previous tick. Any bump forces a search_progress
+		// emit, so back-to-back searches that start and finish inside one refresher
+		// interval still deliver a terminal frame.
+		std::uint64_t generation = 0;
+	};
+	std::map<std::uint32_t, SearchDiffState> searches;
+	bool search_initialised = false;
+};
+
+// Walk every (old vs current) substruct, publish typed events for each delta, then overwrite `prev`
+// with the current snapshot so the next tick diffs against the freshest baseline.
+//
+// `_added` / `_updated` payload: the full snapshot object, matching the REST list-item shape byte
+// for byte, so clients overwrite their cache slot from it. `_removed` payload: `{"ecid": N}` for
+// ECID-keyed types, `{"hash": "..."}` for hash-keyed ones. `status_changed` payload: the nested
+// REST /status envelope, from state.Dashboard() so all three pieces stay consistent.
+void EmitDiffsAndUpdate(CEventBus &bus, LastSeenState &prev, const CState &state);
+
+// Chat events, published straight from the refresher's chat roundtrip rather than by diffing a
+// prior snapshot: the walker already knows what is new (only messages past the cursor come back)
+// and which sessions vanished.
+//
+// One `chat_message` per message, inbound AND outbound alike -- an outbound one is how a message
+// sent from amulegui reaches every other viewer. A session that did not exist is implied by the
+// first message carrying its `peer`.
+void PublishChatEvents(CEventBus &bus,
+	const std::vector<ChatSessionSnapshot> &new_messages,
+	const std::vector<std::uint64_t> &closed);
+
+} // namespace webapi
+
+#endif // WEBAPI_EVENT_DIFF_H

amule-3.1.0.tar.gz/src/webapi/HttpServer.cpp Added

@@ -0,0 +1,1614 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "HttpServer.h"
+
+#include "JsonWriter.h"
+
+#include <Etag.h> // webcommon::WithCodingSuffix
+
+#include <wx/string.h>
+
+#include "../WarningsPush_Asio.h"
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/post.hpp>
+#include <boost/asio/strand.hpp>
+#include <boost/asio/thread_pool.hpp>
+#include <boost/asio/write.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/http.hpp>
+#include <boost/beast/version.hpp>
+#include <boost/optional.hpp>
+// Inside the suppression block on purpose: it pulls in the same asio headers the lines
+// above do, and reaching them first from an unguarded include would resurrect the
+// -Wdeprecated-copy-with-user-provided-dtor error.
+#include "RangeFileBody.h"
+#include "../WarningsPop.h"
+
+// strncasecmp lives in <strings.h> on POSIX (glibc also exposes it via <string.h>, but
+// musl/BSDs do not), and MSVC spells it _strnicmp. The same shim Api.cpp and
+// libwebcommon/HeaderParse.cpp carry.
+#ifdef _WIN32
+#define strncasecmp _strnicmp
+#else
+#include <strings.h>
+#endif
+
+#include <zlib.h>
+
+#include <atomic>
+#include <cassert>
+#include <cctype>
+#include <chrono>
+#include <cstring>
+#include <iostream>
+#include <memory>
+#include <mutex>
+#include <sstream>
+#include <thread>
+#include <utility>
+
+namespace beast = boost::beast;
+namespace http = boost::beast::http;
+namespace asio = boost::asio;
+using tcp = boost::asio::ip::tcp;
+
+// See HttpServer.h. Factored out deliberately: this logic existed in three places -- the
+// regular response writer, the SSE head writer, and the dispatcher's CORS pass -- and
+// two consecutive rounds of fixes each landed in a different two of the three.
+void AppendHeaderToken(std::map<std::string, std::string> &headers, const char *name, const char *token)
+{
+	auto it = headers.find(name);
+	if (it == headers.end() || it->second.empty()) {
+		headersname = token;
+		return;
+	}
+	// Token-by-token so a short name cannot match inside a longer one.
+	const std::string &cur = it->second;
+	std::size_t pos = 0;
+	while (pos <= cur.size()) {
+		const std::size_t comma = cur.find(',', pos);
+		const std::size_t end = (comma == std::string::npos) ? cur.size() : comma;
+		std::size_t b = pos, e = end;
+		while (b < e && (curb == ' ' || curb == '\t'))
+			++b;
+		while (e > b && (cure - 1 == ' ' || cure - 1 == '\t'))
+			--e;
+		if (cur.compare(b, e - b, token) == 0)
+			return;
+		if (comma == std::string::npos)
+			break;
+		pos = comma + 1;
+	}
+	it->second = cur + ", " + token;
+}
+
+// Bodies smaller than this are sent uncompressed. Below ~250 bytes the gzip header (~10
+// bytes) + trailer (~8 bytes) plus the deflate block framing eats most of any ratio
+// gain, and error/heartbeat payloads are common there.
+constexpr size_t kGzipMinBodyBytes = 256;
+
+// Media types whose payload is already entropy-coded. Running deflate over a PNG / JPEG
+// / WebP / GIF / woff2 buys a percent at best and routinely grows the body. Prefix match
+// on the type token -- the check runs before any "; charset=" parameter would matter,
+// and none of these carry one.
+bool IsPrecompressedType(const std::string &content_type)
+{
+	static const char *const kTypes = { "image/png",
+		"image/jpeg",
+		"image/gif",
+		"image/webp",
+		"font/woff",
+		"font/woff2",
+		"application/zip",
+		"application/gzip" };
+	for (const char *type : kTypes) {
+		if (content_type.compare(0, std::strlen(type), type) == 0) {
+			return true;
+		}
+	}
+	return false;
+}
+
+// See HttpServer.h.
+bool WillCompressBody(
+	bool accepts_gzip, std::size_t body_size, const std::string &content_type, bool already_encoded)
+{
+	return accepts_gzip && body_size >= kGzipMinBodyBytes && !already_encoded &&
+	       !IsPrecompressedType(content_type);
+}
+
+// Case-insensitive token search for "gzip" in an Accept-Encoding header value. No
+// legitimate client sends "gzip;q=0" (which per RFC 9110 means "explicitly not gzip") so
+// q-values are not parsed; presence of the token is accept. The legacy `x-gzip` alias is
+// not honoured.
+bool AcceptsGzip(const std::string &accept_encoding)
+{
+	if (accept_encoding.empty()) {
+		return false;
+	}
+	auto is_boundary = (char c) { return c == '\0' || c == ',' || c == ' ' || c == '\t' || c == ';'; };
+	// Lowercase once so ::find is O(n) not O(n log n).
+	std::string lc;
+	lc.reserve(accept_encoding.size());
+	for (char c : accept_encoding) {
+		lc.push_back(static_cast<char>(std::tolower(static_cast<unsigned char>(c))));
+	}
+	for (size_t p = 0; (p = lc.find("gzip", p)) != std::string::npos; p += 4) {
+		const bool left_ok = (p == 0) || is_boundary(lcp - 1);
+		const char right = (p + 4 < lc.size()) ? lcp + 4 : '\0';
+		if (left_ok && is_boundary(right)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+namespace
+{
+
+// Process-wide cap on concurrent SSE subscribers. Each session spawns one OS thread, so
+// without a cap a non-loopback bind turns the thread-per-connection model into a DoS
+// amplifier. Refused sessions get 503 + a Retry-After hint inside the streaming dispatch
+// path, before the worker thread is created.
+constexpr int kMaxConcurrentStreamingSessions = 32;
+
+// Size of the handler worker pool. Non-streaming request handlers run here instead of on
+// the single io_context thread, so a handler that blocks -- a synchronous EC roundtrip
+// stalled up to the EC read timeout -- can never freeze accept or other connections.
+constexpr int kHandlerPoolThreads = 16;
+std::atomic<int> g_streaming_session_count{ 0 };
+
+// Process-wide cap on concurrent file-backed responses (Response::file), a budget of its
+// own -- independent of both the 16 handler-pool threads and the 32 SSE slots, because
+// it protects a different resource from either.
+//
+// Unlike the SSE path this costs no OS thread: the body is written by async_write on the
+// io_context, so a file response in flight holds a socket and a 64 KiB buffer and nothing
+// else. What the number is about is that these responses read from the same spindles the
+// hasher and the ed2k uploader are already using; six concurrent whole-file reads is
+// roughly where a single mechanical disk stops doing sequential I/O and starts seeking
+// between streams. Over the cap the transport answers 503 + Retry-After.
+//
+// Six is the right DEFAULT and the wrong ceiling: the reasoning is single-spindle, and it
+// is per-address in a way a reverse proxy erases (behind nginx every client arrives from
+// one remote_addr). So the number is `Streaming/MaxConcurrentFileResponses` in
+// amuleapi.conf, defaulting here.
+constexpr int kDefaultMaxConcurrentFileResponses = 6;
+// Written once by SetMaxConcurrentFileResponses before Start() binds the listener, and
+// only read afterwards. Atomic because the reader is the io_context thread while the
+// writer is whatever thread configured the server.
+std::atomic<int> g_max_concurrent_file_responses{ kDefaultMaxConcurrentFileResponses };
+std::atomic<int> g_file_response_count{ 0 };
+
+// Largest request header block we accept. The read buffer below is sized from this: the
+// whole header has to sit in the buffer at once, so a buffer smaller than the parser's
+// header_limit means the buffer overflows first and the limit never fires -- which is
+// what made the documented 16 KiB cap unreachable.
+constexpr std::size_t kMaxHeaderBytes = 16 * 1024;
+// Slack for the request line and the parser's own bookkeeping.
+constexpr std::size_t kReadBufferBytes = kMaxHeaderBytes + 2 * 1024;
+
+// Ceiling on how much of a rejected upload we read and throw away before closing. Enough
+// to clear the in-flight window for a normal client that wrote its body before reading
+// our answer, without letting a peer that keeps pumping hold the session open.
+constexpr std::size_t kMaxDrainBytes = 4 * 1024 * 1024;
+
+// Idle deadline on a file response: the longest a file transfer may go without the socket
+// accepting a single further byte before the transport gives up.
+//
+// A PROGRESS deadline, not a total one. The 20 s request expiry cannot be left armed
+// across a file body -- a legitimate multi-GB download over a slow link runs for hours --
+// but expires_never() means a peer that advertises a zero receive window and then stops
+// reading pins its slot until the process restarts: TCP does not time that out on its
+// own, and neither TCP_USER_TIMEOUT nor keepalive is set on these sockets. Re-arming per
+// write attempt bounds the stalled peer while a slow one, which by definition keeps
+// making progress, resets the clock every time it does.
+//
+// 120 s is deliberately far past any real link: each async_write_some completes as soon
+// as the socket accepts ANY bytes, so a whole 64 KiB chunk taking longer works out to
+// under 4.5 kbit/s. It is a stall detector, not a rate limit.
+constexpr std::chrono::seconds kFileWriteIdleTimeout{ 120 };
+
+// One-shot gzip encoder for regular (non-streaming) response bodies. Returns false on any
+// zlib error; the caller then serves the response uncompressed rather than 500ing.
+bool GzipOnce(const std::string &in, std::string &out)
+{
+	z_stream zs{};
+	// windowBits = 15 + 16 -> deflate with gzip wrapper (header + CRC trailer).
+	// mem_level 8, default strategy -- the nginx / mod_deflate defaults.
+	if (deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 + 16, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
+		return false;
+	}
+	zs.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(in.data()));
+	zs.avail_in = static_cast<uInt>(in.size());
+	// deflateBound is an upper bound on Z_FINISH output size; safe
+	// to resize once and slice.
+	const uLong bound = deflateBound(&zs, static_cast<uLong>(in.size()));
+	out.resize(bound);
+	zs.next_out = reinterpret_cast<Bytef *>(out.data());
+	zs.avail_out = static_cast<uInt>(bound);
+	const int rc = deflate(&zs, Z_FINISH);
+	if (rc != Z_STREAM_END) {
+		deflateEnd(&zs);
+		out.clear();
+		return false;
+	}
+	out.resize(zs.total_out);
+	deflateEnd(&zs);
+	return true;
+}
+
+// Streaming gzip encoder for SSE bodies. One instance per SSE session; Z_SYNC_FLUSH after
+// each Compress() call emits the deflate block boundary immediately so the browser sees
+// events live rather than after a buffer fills. The deflate dictionary is shared across
+// events, so repeated JSON keys / hash prefixes compress against the same reference --
+// the big ratio win on delta-heavy SSE streams.
+class SseGzipStream
+{
+public:
+	SseGzipStream() = default;
+	// Non-copyable / non-movable: `m_z` holds internal pointers zlib manages, so a copy would
+	// double-free at destruction and a move would leave the source in a state deflateEnd
+	// cannot handle.
+	SseGzipStream(const SseGzipStream &) = delete;
+	SseGzipStream &operator=(const SseGzipStream &) = delete;
+	SseGzipStream(SseGzipStream &&) = delete;
+	SseGzipStream &operator=(SseGzipStream &&) = delete;
+
+	bool Init()
+	{
+		if (deflateInit2(&m_z, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 + 16, 8, Z_DEFAULT_STRATEGY) !=
+			Z_OK) {
+			return false;
+		}
+		m_inited = true;
+		return true;
+	}
+	~SseGzipStream()
+	{
+		if (m_inited) {
+			deflateEnd(&m_z);
+		}
+	}
+
+	// Deflate `in`, appending compressed bytes to `out`. Uses Z_SYNC_FLUSH so accumulated
+	// bytes are byte-aligned and emitted immediately. Returns false on zlib error.
+	bool CompressSync(const std::string &in, std::string &out)
+	{
+		if (!m_inited) {
+			return false;
+		}
+		m_z.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(in.data()));
+		m_z.avail_in = static_cast<uInt>(in.size());
+		Bytef scratch16384;
+		while (true) {
+			m_z.next_out = scratch;
+			m_z.avail_out = sizeof(scratch);
+			const int rc = deflate(&m_z, Z_SYNC_FLUSH);
+			if (rc != Z_OK && rc != Z_BUF_ERROR) {
+				return false;
+			}
+			out.append(reinterpret_cast<char *>(scratch), sizeof(scratch) - m_z.avail_out);
+			// Z_SYNC_FLUSH is complete when the flush block has been emitted AND all
+			// input consumed. `avail_out > 0` means we did not hit the scratch boundary
+			// during the current call, so deflate had room to finish flushing.
+			if (m_z.avail_in == 0 && m_z.avail_out > 0) {
+				break;
+			}
+		}
+		return true;
+	}
+
+	// Emit any pending Z_FINISH trailer bytes (gzip CRC + length). Called from the SSE
+	// worker's exit path before the chunked terminator so the browser sees a complete gzip
+	// stream. Safe to call multiple times.
+	bool Finish(std::string &out)
+	{
+		if (!m_inited || m_finished) {
+			return true;
+		}
+		m_finished = true;
+		m_z.next_in = nullptr;
+		m_z.avail_in = 0;
+		Bytef scratch4096;
+		while (true) {
+			m_z.next_out = scratch;
+			m_z.avail_out = sizeof(scratch);
+			const int rc = deflate(&m_z, Z_FINISH);
+			out.append(reinterpret_cast<char *>(scratch), sizeof(scratch) - m_z.avail_out);
+			if (rc == Z_STREAM_END) {
+				return true;
+			}
+			if (rc != Z_OK && rc != Z_BUF_ERROR) {
+				return false;
+			}
+		}
+	}
+
+private:
+	z_stream m_z{};
+	bool m_inited = false;
+	bool m_finished = false;
+};
+
+class Session;
+
+// Live SSE session registry. Listener::Stop walks this on shutdown to cancel each
+// session's socket I/O -- without it, a worker blocked in a synchronous Beast write to a
+// slow peer never sees io_context.stop() and the daemon hangs forever on exit. weak_ptrs
+// so dead sessions self-clean.
+std::mutex g_live_streams_mu;
+std::vector<std::weak_ptr<Session>> g_live_streams;
+
+// Per-connection session. Reads one request, hands it to the user handler, writes the
+// response, closes. No keep-alive -- the API surface is too small to benefit, and the
+// one-shot model keeps the state machine trivially auditable. If the streaming_resolver
+// matches the parsed request, the session instead writes the response head and runs the
+// streaming handler on a worker thread, which can push chunks indefinitely via the Writer
+// interface until the handler returns or the peer disconnects.
+class Session : public std::enable_shared_from_this<Session>
+{
+public:
+	Session(tcp::socket socket,
+		std::shared_ptr<asio::thread_pool> handler_pool,
+		CHttpServer::Handler handler,
+		CHttpServer::StreamingResolver streaming_resolver,
+		CHttpServer::StreamingHandler streaming_handler,
+		CHttpServer::StreamingPreflight streaming_preflight,
+		CHttpServer::CorsStamper cors_stamper)
+	: m_stream(std::move(socket))
+	, m_request_timer(m_stream.get_executor())
+	, m_handler_pool(std::move(handler_pool))
+	, m_handler(std::move(handler))
+	, m_streaming_resolver(std::move(streaming_resolver))
+	, m_streaming_handler(std::move(streaming_handler))
+	, m_streaming_preflight(std::move(streaming_preflight))
+	, m_cors_stamper(std::move(cors_stamper))
+	{
+	}
+
+	~Session()
+	{
+		// Worker captures `shared_from_this()` and sets `m_worker_exited` true on the way out
+		// (via the RAII WorkerExitMarker below). By the time this dtor runs the last ref must
+		// have been dropped, so the worker must have exited; join() from inside the worker's
+		// own call stack would deadlock. Hand-rolled if + std::abort instead of assert() so the
+		// invariant is enforced in Release too.
+		if (m_stream_worker.joinable()) {
+			if (!m_worker_exited.load(std::memory_order_acquire)) {
+				std::cerr << "amuleapi: FATAL Session dtor reached "
+					     "with worker still running\n";
+				std::abort();
+			}
+			m_stream_worker.detach();
+		}
+		// Release the session slot. Decrement only fires if we
+		// actually acquired one (DispatchStreaming sets the flag).
+		if (m_session_slot_held) {
+			g_streaming_session_count.fetch_sub(1, std::memory_order_acq_rel);
+		}
+		// Same accounting for the file-response budget, released from the same place for the
+		// same reason: the destructor is the ONE point every exit path funnels through. A file
+		// write can end by completing, by erroring mid-body, by the peer vanishing, or by
+		// Listener::Stop closing the socket underneath it, and a leaked slot is permanent.
+		if (m_file_slot_held) {
+			g_file_response_count.fetch_sub(1, std::memory_order_acq_rel);
+		}
+	}
+
+	void Start() { DoRead(); }
+
+	// Called by Listener::Stop from a foreign thread to cancel any in-flight Beast write.
+	// Posts the close onto the stream's own executor so it does not race the worker thread's
+	// last write -- asio::tcp::socket is NOT thread-safe outside its strand.
+	// Fire-and-forget: the worker's writer.Alive() check picks up the dead m_stream_alive
+	// flag and returns.
+	void RequestCancel()
+	{
+		// Atomic flip first so writer.Alive() observes the cancel
+		// even if the strand-posted close is delayed.
+		m_stream_alive.store(false, std::memory_order_release);
+		auto self = shared_from_this();
+		boost::asio::post(m_stream.get_executor(), self {
+			beast::error_code ec;
+			beast::get_lowest_layer(self->m_stream).socket().close(ec);
+		});
+	}
+
+private:
+	void DoRead()
+	{
+		// Reset the parser each request -- without it, calling DoRead a second time on the same
+		// stream blocks forever with a partial state.
+		//
+		// The flags below are per-request too. m_answered decides which of the timeout timer
+		// and the read handler gets to answer; the rest describe how THIS request must be
+		// written and drained. All are latched today only because a connection serves one
+		// request -- turn keep-alive on and a stale m_answered drops every later request, a
+		// stale m_drain_before_close makes an ordinary response drain, a stale
+		// m_head_probe_chunked mislabels its framing. Reset them together.
+		m_answered.store(false, std::memory_order_relaxed);
+		m_head_only = false;
+		m_head_probe_chunked = false;
+		m_drain_before_close = false;
+		m_drained = 0;
+		m_parser.emplace();
+		// 1 MiB request cap -- bigger than any sensible REST POST body but well
+		// under "someone is trying to exhaust memory by upload-pumping us".
+		m_parser->body_limit(1024 * 1024);
+		// 16 KiB header cap. Beast's default header_limit varies across versions, and a
+		// drip-feed attacker who slowly streams header lines can otherwise grow the flat_buffer
+		// until the read timeout catches them -- which is that timeout times the pool of
+		// concurrent peers. Capping explicitly fixes the per-peer memory ceiling regardless of
+		// upstream defaults.
+		m_parser->header_limit(kMaxHeaderBytes);
+		// 10 s read budget. amuleapi runs against localhost/LAN; a real client never takes 10 s
+		// to send a 1 KiB request.
+		//
+		// Two timers, deliberately. beast::tcp_stream's own expiry CLOSES the socket, so by the
+		// time the read handler sees beast::error::timeout there is nothing left to answer on
+		// -- which is why a stalled request used to look identical to a crashed daemon. Our own
+		// timer fires first and sends a 408; the stream's expiry stays as the hard backstop.
+		m_stream.expires_after(std::chrono::seconds(20));
+		m_request_timer.expires_after(std::chrono::seconds(10));
+		{
+			auto self = shared_from_this();
+			m_request_timer.async_wait(self(const beast::error_code &tec) {
+				// operation_aborted = the read completed and cancelled
+				// us, which is the normal path.
+				if (tec == asio::error::operation_aborted)
+					return;
+				if (self->m_answered.exchange(true))
+					return;
+				// Same method recovery as the limit paths: this path never reaches
+				// Dispatch(), where m_head_only is normally set, so without it a HEAD
+				// drip-feeding its headers gets the 408 envelope as content.
+				if (self->m_parser->get().method() == http::verb::head) {
+					self->m_head_only = true;
+				}
+				// No drain here: http::async_read is still outstanding on this socket,
+				// and a second read alongside it is an overlapping read. Retire it
+				// instead -- a peer that ignores the FIN would otherwise pin this
+				// Session and its fd until the stream backstop, twice the budget the
+				// single timer used to enforce.
+				{
+					beast::error_code cancel_ec;
+					self->m_stream.socket().cancel(cancel_ec);
+				}
+				self->WriteAndClose(408,
+					"request_timeout",
+					"the request was not completed within 10 s",
+					/*drain=*/false);
+			});
+		}
+
+		auto self = shared_from_this();
+		http::async_read(
+			m_stream, m_buffer, *m_parser, self(beast::error_code ec, std::size_t bytes) {
+				(void)bytes;
+				self->m_request_timer.cancel();
+				// The timeout timer got there first and has already written a 408;
+				// anything we do now would be a second response on the same connection.
+				if (self->m_answered.exchange(true))
+					return;
+				if (ec == http::error::end_of_stream) {
+					self->DoClose();
+					return;
+				}
+				if (ec) {
+					// Recover the method from whatever the parser managed to read
+					// before it gave up. Dispatch() is where m_head_only is normally
+					// set and these paths never reach it, so without this a HEAD
+					// rejected at the body or header cap answers with the envelope.
+					if (self->m_parser->get().method() == http::verb::head) {
+						self->m_head_only = true;
+					}
+					// Three of these are limits WE imposed, and a caller cannot tell a
+					// silent close from "daemon crashed" -- every other rejection on
+					// this surface is a typed JSON envelope, so answer these the same
+					// way before closing. Any other read error stays quiet: there is
+					// nobody left to tell.
+					if (ec == http::error::body_limit) {
+						self->WriteAndClose(413,
+							"payload_too_large",
+							"request body exceeds the 1 MiB limit",
+							/*drain=*/true);
+						return;
+					}
+					// buffer_overflow is the same condition seen from the buffer's side:
+					// whichever binds first, the caller sent more header than we accept.
+					if (ec == http::error::header_limit ||
+						ec == http::error::buffer_overflow) {
+						self->WriteAndClose(431,
+							"headers_too_large",
+							"request headers exceed the 16 KiB limit",
+							/*drain=*/true);
+						return;
+					}
+					self->DoClose();
+					return;
+				}
+				self->Dispatch();
+			});
+	}
+
+	void Dispatch()
+	{
+		const auto &req = m_parser->get();
+
+		CHttpServer::Request r;
+		r.method = std::string(req.method_string());
+		r.target = std::string(req.target());
+		r.body = req.body();
+		for (const auto &h : req) {
+			r.headers.emplace(std::string(h.name_string()), std::string(h.value()));
+		}
+		// Content-Encoding negotiation is per-request state, not per-response. Sample once here
+		// so both WriteResponse and the streaming SocketWriter see the same decision; the header
+		// cannot legally change between them.
+		m_accepts_gzip = AcceptsGzip(std::string(reqhttp::field::accept_encoding));
+		// HEAD is answered with the GET headers and no content. Recorded
+		// here because WriteResponse runs after the parser has moved on.
+		m_head_only = (r.method == "HEAD");
+		// Remote endpoint for rate-limiting. Wrapped in an error_code overload so a half-closed
+		// socket does not throw -- an empty `remote_addr` falls through to "no per-IP bucket",
+		// which is the safe default.
+		{
+			beast::error_code ec;
+			const auto ep = m_stream.socket().remote_endpoint(ec);
+			if (!ec)
+				r.remote_addr = ep.address().to_string();
+		}
+
+		// Streaming dispatch. The streaming_resolver is invoked synchronously and
+		// short-circuits the standard request/response/close path when it returns true.
+		if (m_streaming_resolver && m_streaming_handler && m_streaming_resolver(r)) {
+			DispatchStreaming(std::move(r));
+			return;
+		}
+
+		// Run the handler on the worker pool, NOT the io_context thread, so a handler that
+		// blocks can never freeze accept or other sessions. Disarm the read timeout first: the
+		// handler may legitimately take up to the EC read-timeout budget. The response is posted
+		// back to the session strand (m_stream's executor) so all socket I/O stays on the
+		// io_context thread.
+		m_stream.expires_never();
+		auto self = shared_from_this();
+		auto reqp = std::make_shared<CHttpServer::Request>(std::move(r));
+		boost::asio::post(m_handler_pool->get_executor(), self, reqp() {
+			CHttpServer::Response resp;
+			try {
+				resp = self->m_handler(*reqp);
+			} catch (const std::exception &e) {
+				// Handler exceptions become 500s; body shape matches the rest of the
+				// error contract. e.what() can carry caller-supplied bytes (picojson
+				// echoes the offending input character; a future header-driven throw
+				// could reflect Authorization fragments), so keep the body generic and
+				// log the detail to stderr.
+				std::cerr << "amuleapi: 500 from handler: " << e.what() << "\n";
+				resp.status = 500;
+				resp.content_type = "application/json";
+				resp.body = "{\"error\":{\"code\":\"internal_error\","
+					    "\"message\":\"internal server error\"}}";
+				// The dispatcher's CORS pass died with the handler, so stamp it here: a
+				// cross-origin client should be able to read a 500 as it can a 4xx.
+				if (self->m_cors_stamper) {
+					self->m_cors_stamper(
+						resp.headers, self->FindHeaderCaseInsensitiveRaw("Origin"));
+				}
+			}
+			auto out = std::make_shared<CHttpServer::Response>(std::move(resp));
+			boost::asio::post(self->m_stream.get_executor(),
+				self, out() { self->WriteResponse(std::move(*out)); });
+		});
+	}
+
+	// Short 503 for the concurrent-session cap and other exhaustion paths.
+	void WriteCapRefusal()
+	{
+		CHttpServer::Response refused;
+		refused.status = 503;
+		refused.content_type = "application/json";
+		refused.headers"Retry-After" = "10";
+		// Transport-built, so the dispatcher never sees it. Without the stamp this
+		// is one more reply a cross-origin client cannot read.
+		if (m_cors_stamper) {
+			m_cors_stamper(refused.headers, FindHeaderCaseInsensitiveRaw("Origin"));
+		}
+		refused.body = "{\"error\":{\"code\":\"too_many_streams\","
+			       "\"message\":\"too many concurrent streaming sessions; "
+			       "retry in a few seconds\"}}";
+		WriteResponse(std::move(refused));
+	}
+
+	// Streaming path. Writes the response head, then spawns a worker thread for the streaming
+	// handler. The Session stays alive across the worker via the `shared_from_this()`
+	// capture; when the worker exits, the lambda releases the last ref and the Session
+	// destructs.
+	void DispatchStreaming(CHttpServer::Request r)
+	{
+		// Preflight runs synchronously on the I/O thread BEFORE the slot is claimed and BEFORE a
+		// worker thread is spawned. Without it, unauthenticated peers can tie up a streaming
+		// slot for the read-timeout window: 32 unauth TCP holds x 10 s = a 320-session-second
+		// pool stall. Empty preflight (the default) preserves the prior contract.
+		if (m_streaming_preflight) {
+			boost::optional<CHttpServer::Response> rej = m_streaming_preflight(r);
+			if (rej) {
+				WriteResponse(std::move(*rej));
+				return;
+			}
+		}
+
+		// Acquire a session slot before any thread-spawn or long-lived work. fetch_add returns
+		// the OLD value, so the slot is held iff that value was strictly below the cap;
+		// otherwise roll back and refuse.
+		const int prior_count = g_streaming_session_count.fetch_add(1, std::memory_order_acq_rel);
+		if (prior_count >= kMaxConcurrentStreamingSessions) {
+			g_streaming_session_count.fetch_sub(1, std::memory_order_acq_rel);
+			WriteCapRefusal();
+			return;
+		}
+		m_session_slot_held = true;
+		// Disable read timeout -- SSE connections are long-lived.
+		m_stream.expires_never();
+		m_stream_alive.store(true, std::memory_order_release);
+
+		// Register the session so Listener::Stop can cancel its socket on shutdown. A worker
+		// blocked inside a synchronous Beast write to a slow peer otherwise pins the daemon at
+		// exit -- io_context.stop() does not unblock a write already in flight. Closing the
+		// socket from outside makes the write fail with EPIPE and the worker returns to its
+		// Alive() check.
+		{
+			std::lock_guard<std::mutex> g(g_live_streams_mu);
+			g_live_streams.emplace_back(shared_from_this());
+		}
+
+		// Spawn the worker thread that runs the streaming handler. It captures `self` so the
+		// Session stays alive across its run, plus references to the head out-params (heap-held
+		// so the SocketWriter can read them later).
+		auto handler = m_streaming_handler;
+		auto self = shared_from_this();
+		// Head data -- owned by the worker thread, referenced by the SocketWriter (via
+		// SocketWriter::HeadData). Defaults set here; the handler can overwrite before calling
+		// writer.Write the first time.
+		auto head = std::make_shared<SocketWriter::HeadData>();
+		head->headers"Cache-Control" = "no-cache";
+		// Not keep-alive. DoClose() writes the chunked terminator and then shuts the socket
+		// down, so a client that reads the stream to its clean end and returns the socket to a
+		// pool fails its next request on it -- the same reason every ordinary response says
+		// close.
+		head->headers"Connection" = "close";
+		// nginx and many other reverse proxies buffer response bodies by default when they
+		// detect chunked-transfer + text-ish content, which stalls SSE delivery entirely.
+		// `X-Accel-Buffering: no` is nginx's opt-out (also respected by ingress-nginx /
+		// OpenResty) and harmless elsewhere. Emitted regardless of gzip status because the
+		// buffering problem is orthogonal.
+		head->headers"X-Accel-Buffering" = "no";
+
+		auto writer = std::make_shared<SocketWriter>(self, head, m_accepts_gzip);
+
+		// One std::thread per streaming session -- cheap at expected scale and keeps the drain
+		// synchronous so `since_id` ordering is trivial.
+		//
+		// The default BindAddress=127.0.0.1 is load-bearing: non-loopback bind + unauth peer =
+		// thread-per-connection DoS amplifier. PreflightEvents bounds pre-auth cost to one HTTP
+		// exchange.
+		m_stream_worker = std::thread(self, handler, writer, head, r = std::move(r)() mutable {
+			// RAII guard: tip the worker-exited flag on EVERY exit path out of this lambda,
+			// including a future refactor that adds an early return. The Session destructor's
+			// std::abort() guard only fires if this flag is true, so missing the flip would tear
+			// down a still-running thread.
+			struct WorkerExitMarker
+			{
+				std::shared_ptr<Session> s;
+				~WorkerExitMarker()
+				{
+					s->m_worker_exited.store(true, std::memory_order_release);
+				}
+			} marker{ self };
+			try {
+				handler(r, *writer, head->status, head->content_type, head->headers);
+			} catch (const std::exception &) {
+				// Streaming handler exceptions are silent -- close
+				// quietly.
+			}
+			// If the handler returned without writing anything (auth-rejected on a
+			// HEAD probe, say), still emit the head so the client sees the status.
+			writer->EnsureHeadWritten();
+			// Emit the gzip trailer (Z_FINISH) if compressing, BEFORE DoClose writes the chunked
+			// terminator -- otherwise the browser's gzip decoder sees a truncated stream and
+			// raises a decoding error.
+			writer->Finalize();
+			self->DoClose();
+			// `marker` runs here, flipping m_worker_exited and dropping `self` only
+			// AFTER the flag is set, so the dtor's check observes the post-exit state.
+		});
+	}
+
+	// Per-streaming-session Writer that marshals writes onto the socket. Defers writing the
+	// HTTP response head until the first Write call -- that is when the handler has finalised
+	// status / content_type / headers.
+	class SocketWriter : public CHttpServer::Writer
+	{
+	public:
+		struct HeadData
+		{
+			unsigned status = 200;
+			std::string content_type = "text/event-stream";
+			std::map<std::string, std::string> headers;
+		};
+
+		SocketWriter(std::shared_ptr<Session> session,
+			std::shared_ptr<Session::SocketWriter::HeadData> head,
+			bool wants_gzip)
+		: m_session(std::move(session))
+		, m_head(std::move(head))
+		, m_wants_gzip(wants_gzip)
+		{
+		}
+
+		bool Write(const std::string &chunk) override
+		{
+			if (!m_session->m_stream_alive.load(std::memory_order_acquire)) {
+				return false;
+			}
+			if (!EnsureHeadWritten()) {
+				return false;
+			}
+
+			// SSE uses chunked transfer encoding; each "chunk" written here is a single HTTP/1.1
+			// chunk frame: <hex-size>\r\n<bytes>\r\n. Zero-length chunks would terminate the
+			// message (RFC 7230 4.1) so they are skipped -- the heartbeat path always passes at
+			// least ": keepalive\n\n" anyway.
+			if (chunk.empty()) {
+				return true;
+			}
+			// gzip path: run the SSE bytes through the persistent deflate stream with
+			// Z_SYNC_FLUSH so the block is emitted immediately and the dictionary carries across
+			// events. zlib does not recover its stream state after an error mid-session, so a
+			// deflate failure tears the session down rather than emitting a mid-stream encoding
+			// mismatch the browser would abort on.
+			const std::string *payload = &chunk;
+			std::string compressed;
+			if (m_wants_gzip) {
+				if (!m_gzip.CompressSync(chunk, compressed)) {
+					m_session->m_stream_alive.store(false, std::memory_order_release);
+					return false;
+				}
+				// Z_SYNC_FLUSH on an empty input still emits the 5-byte block-boundary
+				// marker, so `compressed` is never empty here for a non-empty `chunk`.
+				payload = &compressed;
+			}
+			std::ostringstream framed;
+			framed << std::hex << payload->size() << "\r\n" << *payload << "\r\n";
+			const std::string out = framed.str();
+
+			std::lock_guard<std::mutex> g(m_session->m_socket_mu);
+			beast::error_code ec;
+			asio::write(m_session->m_stream.socket(), asio::buffer(out), ec);
+			if (ec) {
+				m_session->m_stream_alive.store(false, std::memory_order_release);
+				return false;
+			}
+			return true;
+		}
+
+		// Emit any Z_FINISH trailer bytes (gzip CRC + length) as a final chunked frame. Called
+		// from the SSE worker's exit path BEFORE DoClose so the browser sees a well-terminated
+		// gzip stream. No-op on non-gzip sessions, idempotent via SseGzipStream::m_finished.
+		void Finalize()
+		{
+			if (!m_wants_gzip) {
+				return;
+			}
+			if (!m_session->m_stream_alive.load(std::memory_order_acquire)) {
+				return;
+			}
+			std::string tail;
+			if (!m_gzip.Finish(tail) || tail.empty()) {
+				return;
+			}
+			std::ostringstream framed;
+			framed << std::hex << tail.size() << "\r\n" << tail << "\r\n";
+			const std::string out = framed.str();
+
+			std::lock_guard<std::mutex> g(m_session->m_socket_mu);
+			beast::error_code ec;
+			asio::write(m_session->m_stream.socket(), asio::buffer(out), ec);
+			if (ec) {
+				m_session->m_stream_alive.store(false, std::memory_order_release);
+			}
+		}
+
+		bool Alive() const override
+		{
+			return m_session->m_stream_alive.load(std::memory_order_acquire);
+		}
+
+		// Idempotent: writes the head once, on first call. Returns false if the underlying
+		// socket write failed.
+		//
+		// The head is built as raw bytes rather than through Beast's response<empty_body> +
+		// prepare_payload(): that path emits `Content-Length: 0` and silently strips
+		// `Transfer-Encoding: chunked`, which forecloses the streaming body the SSE channel
+		// needs.
+		bool EnsureHeadWritten()
+		{
+			if (m_head_written.exchange(true, std::memory_order_acq_rel)) {
+				return true;
+			}
+			// Late gzip init + header injection, deferred to here so the ctor stays trivial and
+			// the handler had a chance to override head->headers between construction and first
+			// Write. If deflateInit2 itself fails we downgrade to identity encoding for this
+			// session rather than 500 the whole SSE -- the head has not gone out yet, so erasing
+			// the flag is safe.
+			if (m_wants_gzip) {
+				if (m_gzip.Init()) {
+					m_head->headers"Content-Encoding" = "gzip";
+				} else {
+					m_wants_gzip = false;
+				}
+			}
+			// Outside the gzip branch on purpose. Vary describes what the RESPONSE VARIES ON, not
+			// what this particular response was encoded as, so it belongs on the identity reply
+			// too -- otherwise a cache keyed on the non-gzip answer serves it to a client that
+			// asked for gzip. WriteResponse adds it unconditionally, so the HEAD probe would
+			// otherwise disagree.
+			AppendHeaderToken(m_head->headers, "Vary", "Accept-Encoding");
+			std::ostringstream head;
+			head << "HTTP/1.1 " << m_head->status << " ";
+			switch (m_head->status) {
+			case 200:
+				head << "OK";
+				break;
+			case 401:
+				head << "Unauthorized";
+				break;
+			case 403:
+				head << "Forbidden";
+				break;
+			case 404:
+				head << "Not Found";
+				break;
+			default:
+				head << "OK";
+				break;
+			}
+			head << "\r\n";
+			head << "Server: amuleapi\r\n";
+			head << "Content-Type: " << m_head->content_type << "\r\n";
+			// Chunked only when the body will actually stream, i.e. the success path. Error
+			// responses (401 / 403) are single-shot: the handler emits one chunk-as-error-body
+			// then returns, and close-on-FIN beats dangling a chunked half-message, so Transfer-
+			// Encoding is omitted for those and the response simply terminates at connection
+			// close.
+			const bool chunked = (m_head->status >= 200 && m_head->status < 300);
+			if (chunked) {
+				head << "Transfer-Encoding: chunked\r\n";
+			}
+			for (const auto &kv : m_head->headers) {
+				head << kv.first << ": " << kv.second << "\r\n";
+			}
+			head << "\r\n";
+			const std::string head_bytes = head.str();
+
+			std::lock_guard<std::mutex> g(m_session->m_socket_mu);
+			beast::error_code ec;
+			asio::write(m_session->m_stream.socket(), asio::buffer(head_bytes), ec);
+			if (ec) {
+				m_session->m_stream_alive.store(false, std::memory_order_release);
+				return false;
+			}
+			return true;
+		}
+
+	private:
+		std::shared_ptr<Session> m_session;
+		std::shared_ptr<HeadData> m_head;
+		std::atomic<bool> m_head_written{ false };
+		// Sampled once at construction from the request's Accept-Encoding. Cleared at head-write
+		// time if deflateInit2 fails, so subsequent Write calls fall through to the identity
+		// path without leaking a partly-init'd stream.
+		bool m_wants_gzip;
+		SseGzipStream m_gzip;
+	};
+
+	// Typed error straight from the transport layer, for the read-side limits that never
+	// reach a handler. Hand-built rather than routed through the dispatcher's ErrorResponse:
+	// at this point the request was never parsed, so there is no route and no auth context.
+	// Returns "" when the header block never arrived, which the stamper treats as no-origin.
+	std::string FindHeaderCaseInsensitiveRaw(const char *name) const
+	{
+		if (!m_parser) {
+			return std::string();
+		}
+		const auto &msg = m_parser->get();
+		for (const auto &h : msg) {
+			if (h.name_string().size() == std::strlen(name) &&
+				strncasecmp(std::string(h.name_string()).c_str(), name, std::strlen(name)) ==
+					0) {
+				return std::string(h.value());
+			}
+		}
+		return std::string();
+	}
+
+	// `drain` only where the composed read has already completed. The size limits fire while
+	// the peer may still be writing, and closing with unread data queued lets the stack emit
+	// an RST that discards the response just written -- the caller then sees a connection
+	// reset instead of the 413 explaining it. The timeout path is the opposite case:
+	// http::async_read is still outstanding there, and a second read on the same socket is
+	// an overlapping read.
+	void WriteAndClose(unsigned status, const char *code, const char *message, bool drain)
+	{
+		CHttpServer::Response r;
+		r.status = status;
+		r.content_type = "application/json";
+		r.body = std::string("{\"error\":{\"code\":\"") + code + "\",\"message\":\"" + message +
+			 "\"}}";
+		// The only replies on the surface built without a parsed request, so the dispatcher's
+		// CORS pass never sees them. Stamp here or a cross-origin browser client gets an opaque
+		// failure instead of the typed envelope.
+		if (m_cors_stamper) {
+			m_cors_stamper(r.headers, FindHeaderCaseInsensitiveRaw("Origin"));
+		}
+		m_drain_before_close = drain;
+		// Tell the peer not to reuse this connection. Without it a pooling client
+		// can read the error, keep the socket, and park us in the drain read.
+		r.headers"Connection" = "close";
+		WriteResponse(std::move(r));
+	}
+
+	// Read and discard whatever the peer is still sending, then close. Bounded three ways:
+	// the stream's expiry (which is why this reads through the stream rather than the
+	// socket), a byte cap, and the `Connection: close` the error carries. The deadline is set
+	// ONCE, here: expires_after inside the loop would re-arm on every read and bound only the
+	// gap between them, so a peer trickling a byte just under the limit apart could hold the
+	// fd.
+	void StartDrainThenClose()
+	{
+		// Short budget of its own, not the request budget. The point of the drain is to collect
+		// what is ALREADY in flight so the close does not RST away the error just written -- not
+		// to wait for a peer that has finished talking. Draining to EOF would leave both sides
+		// waiting until the request expiry broke the tie, which reads to the caller as a hang.
+		m_stream.expires_after(std::chrono::seconds(1));
+		DrainThenClose();
+	}
+
+	void DrainThenClose()
+	{
+		auto self = shared_from_this();
+		// Through the beast stream, not the raw socket: the raw socket ignores the stream's
+		// expiry, so a peer that neither sends nor closes would park this read forever and leak
+		// the Session with its fd.
+		m_stream.async_read_some(
+			m_drain_buffer.prepare(4096), self(beast::error_code ec, std::size_t n) {
+				self->m_drained += n;
+				if (ec || n == 0 || self->m_drained > kMaxDrainBytes) {
+					self->DoClose();
+					return;
+				}
+				// Loop, do NOT re-arm: the deadline set in StartDrainThenClose is the
+				// total budget, and re-arming here would reset it on every read.
+				self->DrainThenClose();
+			});
+	}
+
+	// Transport-built error reply for the file path. Kept separate from the handler's own
+	// error shapes because these are written after the handler has already returned a
+	// perfectly good response. The CORS stamp matters for the same reason it does on
+	// 408/413/431: the dispatcher's pass never ran on a reply the transport invented.
+	void WriteFileTransportError(unsigned status, const char *code, const char *message, bool retry_after)
+	{
+		CHttpServer::Response err;
+		err.status = status;
+		err.content_type = "application/json";
+		if (retry_after) {
+			err.headers"Retry-After" = "10";
+		}
+		if (m_cors_stamper) {
+			m_cors_stamper(err.headers, FindHeaderCaseInsensitiveRaw("Origin"));
+		}
+		err.body = std::string("{\"error\":{\"code\":\"") + code + "\",\"message\":\"" + message +
+			   "\"}}";
+		// `err.file` is unset, so this lands on the ordinary buffered path
+		// and cannot recurse back into here.
+		WriteResponse(std::move(err));
+	}
+
+	// File-backed response: serialise a bounded byte window straight off disk instead of out
+	// of resp.body. Split from WriteResponse rather than folded into it because almost none
+	// of that function applies -- no body in memory to deflate, nothing to reconcile an ETag
+	// against, and a different message type, which decides the serializer at compile time.
+	// Everything else about the reply is deliberately identical to the normal path.
+	void WriteFileResponse(CHttpServer::Response &&resp)
+	{
+		// A HEAD is exempt from the concurrency budget. The cap bounds concurrent BYTES off the
+		// disk and onto the NIC, and a HEAD moves none: the serializer runs in split mode, so
+		// the file is opened and seeked but never read. A burst of HEADs must not lock out real
+		// transfers.
+		if (!m_head_only) {
+			// Claim the slot before opening anything. fetch_add returns the OLD
+			// value, so the slot is ours iff that value was below the cap.
+			const int prior = g_file_response_count.fetch_add(1, std::memory_order_acq_rel);
+			if (prior >= g_max_concurrent_file_responses.load(std::memory_order_relaxed)) {
+				g_file_response_count.fetch_sub(1, std::memory_order_acq_rel);
+				WriteFileTransportError(503,
+					"file_responses_exhausted",
+					"too many concurrent file transfers; retry in a few seconds",
+					true);
+				return;
+			}
+			// From here on the destructor owns the release. Set the flag BEFORE
+			// anything that can fail, so an early return still gives the slot back.
+			m_file_slot_held = true;
+		}
+
+		m_file_response.emplace();
+		auto &out = *m_file_response;
+
+		// The handler already resolved and containment-checked the path; the transport opens it
+		// blindly. Both failures below are 500s on purpose -- a 404 here would mean the handler
+		// said yes to a path that then vanished, which is a race or a bug. They are still safe
+		// to answer, because the headers are committed at the first async_write below, not
+		// before.
+		beast::error_code ec;
+		out.body().Open(resp.file->fs_path.c_str(), ec);
+		if (!ec) {
+			// Rejects, rather than clamps, a window that does not fit the file. The handler has
+			// usually already put a Content-Range describing exactly this window on the response,
+			// and shipping a different one would contradict it.
+			out.body().SetWindow(resp.file->first, resp.file->last, ec);
+		}
+		if (ec) {
+			m_file_response.reset();
+			WriteFileTransportError(
+				500, "internal_error", "could not read the requested file", false);
+			return;
+		}
+
+		// Emitted even though a file response never varies by encoding: the same URL can
+		// legitimately answer from the buffered path too (a 304, a 416, an error envelope), and
+		// those DO vary. An intermediary that cached this one without the dimension would serve
+		// it in place of a form that differs.
+		AppendHeaderToken(resp.headers, "Vary", "Accept-Encoding");
+
+		out.version(11);
+		out.result(resp.status);
+		out.set(http::field::server, "amuleapi");
+		// Same one-request-per-connection contract as everywhere else;
+		// DoClose() shuts the socket down after this write.
+		if (resp.headers.find("Connection") == resp.headers.end()) {
+			out.set(http::field::connection, "close");
+		}
+		// Same opt-out the SSE head sets, for the mirror-image reason. nginx buffers proxied
+		// responses by default and spools anything larger than `proxy_buffers` to disk, up to
+		// `proxy_max_temp_file_size` -- 1 GB out of the box -- so the proxy writes a second copy
+		// of the file to its own disk before the client sees the first byte. Set here rather
+		// than by the handler because it is a property of streaming a large body off disk, and
+		// written before the handler's header pass so a handler can override.
+		out.set("X-Accel-Buffering", "no");
+		if (!resp.content_type.empty()) {
+			out.set(http::field::content_type, resp.content_type);
+		}
+		for (const auto &h : resp.headers) {
+			out.set(h.first, h.second);
+		}
+		// Content-Length comes from RangeFileBody::size, i.e. the WINDOW length rather than the
+		// file length or the bytes-to-EOF stock file_body would have reported. A HEAD has to
+		// answer with the same number, from the same call.
+		out.prepare_payload();
+
+		// The read timeout was disarmed in Dispatch, and the body is NOT written back under it:
+		// a legitimate multi-GB download over a slow link takes far longer than the 20 s stream
+		// expiry, so a total deadline would kill exactly the transfers this endpoint exists for.
+		// What bounds a stall instead is kFileWriteIdleTimeout, re-armed by WriteFileChunk
+		// before every write attempt -- which is why the body goes out as a WriteFileChunk loop
+		// over async_write_some: a single async_write offers no per-chunk hook.
+		auto self = shared_from_this();
+		m_file_serializer.emplace(out);
+		if (m_head_only) {
+			// RFC 9110 9.3.2 again: headers only, on any status. split(true) stops the serializer
+			// after the header, so writer::get never runs and not one byte of the file is read --
+			// while Content-Length still reports what the GET would have sent.
+			m_file_serializer->split(true);
+			// Same deadline on the header-only write. It is a few hundred bytes, but a peer that
+			// sends HEAD and then refuses to read holds a file-response slot just as firmly as
+			// one that stalls a GET.
+			m_stream.expires_after(kFileWriteIdleTimeout);
+			http::async_write_header(
+				m_stream, *m_file_serializer, self(beast::error_code ec, std::size_t) {
+					(void)ec;
+					if (self->m_drain_before_close) {
+						self->StartDrainThenClose();
+						return;
+					}
+					self->DoClose();
+				});
+			return;
+		}
+		WriteFileChunk();
+	}
+
+	// One turn of the file-body write loop: re-arm the progress deadline, hand the
+	// serializer's next buffer to the socket, and come back for the rest.
+	//
+	// This is what `http::async_write` does internally, unrolled so the deadline can be
+	// re-armed between turns. async_write_some completes as soon as the socket accepts any
+	// bytes at all, so each turn is a real observation that the peer is still draining its
+	// receive window.
+	void WriteFileChunk()
+	{
+		auto self = shared_from_this();
+		m_stream.expires_after(kFileWriteIdleTimeout);
+		http::async_write_some(
+			m_stream, *m_file_serializer, self(beast::error_code ec, std::size_t) {
+				// `ec` discarded as on the buffered path: a peer that walked away mid-
+				// download is the normal end of a media request, and so is the timeout above,
+				// which is the same event with a slower peer. The slot is released by
+				// ~Session when `self` drops at the end of the chain.
+				if (!ec && !self->m_file_serializer->is_done()) {
+					self->WriteFileChunk();
+					return;
+				}
+				if (self->m_drain_before_close) {
+					self->StartDrainThenClose();
+					return;
+				}
+				self->DoClose();
+			});
+	}
+
+	void WriteResponse(CHttpServer::Response &&resp)
+	{
+		// A file-backed response shares none of the machinery below: it must not be gzipped
+		// (deflating a byte range breaks the accounting its Content-Range describes) and it has
+		// no in-memory body for the ETag reconciliation to measure. Branch before any of it
+		// runs.
+		if (resp.file) {
+			WriteFileResponse(std::move(resp));
+			return;
+		}
+
+		// Regular (non-streaming) response gzip encoding. Gated on the client accepting gzip,
+		// the body being at or above kGzipMinBodyBytes (inclusive), the handler not having
+		// already set Content-Encoding, and the body not being entropy-coded already. On any
+		// zlib error the original uncompressed body ships rather than a 500; prepare_payload()
+		// sizes Content-Length from the post-swap body either way.
+		//
+		// HEAD is compressed too, even though the bytes are then discarded. Skipping it saves a
+		// deflate per probe and costs correctness: HEAD must describe what the equivalent GET
+		// would return, so with Accept-Encoding: gzip that means the SAME Content-Encoding and
+		// Content-Length. Diverging binds one strong ETag to two codings and, per RFC 9111
+		// 4.3.5, lets each probe invalidate the stored gzip response.
+		if (WillCompressBody(m_accepts_gzip,
+			    resp.body.size(),
+			    resp.content_type,
+			    resp.headers.find("Content-Encoding") != resp.headers.end())) {
+			std::string compressed;
+			const bool gzipped = GzipOnce(resp.body, compressed);
+			if (gzipped) {
+				resp.body = std::move(compressed);
+				resp.headers"Content-Encoding" = "gzip";
+			}
+			// Reconcile the validator with the coding that ACTUALLY shipped. The hash upstream is
+			// taken before compression, so without a marker both codings carry the same strong
+			// ETag; the dispatcher stamps it in advance because a 304 has no body left to
+			// measure. When deflate fails the body ships as identity and this takes the suffix
+			// back off -- leaving it would bind a gzip validator to identity bytes.
+			auto et = resp.headers.find("ETag");
+			if (et != resp.headers.end())
+				et->second = webcommon::WithCodingSuffix(et->second, gzipped);
+		}
+		// Append, never overwrite: the dispatcher may already have set `Vary: Origin` for CORS,
+		// and replacing it would drop the encoding dimension from a response whose ETag was
+		// computed before compression.
+		AppendHeaderToken(resp.headers, "Vary", "Accept-Encoding");
+
+		m_response.emplace();
+		m_response->version(11);
+		m_response->result(resp.status);
+		m_response->set(http::field::server, "amuleapi");
+		// One request per connection: DoClose() shuts the socket down after every response, so
+		// HTTP/1.1's default persistence is a promise this server does not keep. Say so on every
+		// reply or a pooling client keeps the socket and fails its next request on it. Handlers
+		// that set it themselves are left alone.
+		if (resp.headers.find("Connection") == resp.headers.end()) {
+			m_response->set(http::field::connection, "close");
+		}
+		// A Content-Type whose value is not a media type is malformed, so omit the
+		// header entirely on the bodiless replies (204, 304) that cleared it.
+		if (!resp.content_type.empty()) {
+			m_response->set(http::field::content_type, resp.content_type);
+		}
+		for (const auto &h : resp.headers) {
+			m_response->set(h.first, h.second);
+		}
+		// The /events HEAD probe is the one response that stands in for
+		// a chunked stream; the dispatcher marks it by content type.
+		if (m_head_only && resp.content_type == "text/event-stream") {
+			m_head_probe_chunked = true;
+		}
+		m_response->body() = std::move(resp.body);
+		m_response->prepare_payload();
+		if (m_head_probe_chunked) {
+			// Mirror the framing a GET on this endpoint advertises. prepare_payload() sizes from
+			// the (empty) body and stamps `Content-Length: 0`, which would describe a zero-length
+			// document rather than the unbounded stream the caller asked about; chunked() ahead
+			// of it does not survive, since the body size is known. Set the framing directly,
+			// after.
+			m_response->erase(http::field::content_length);
+			m_response->set(http::field::transfer_encoding, "chunked");
+		}
+
+		auto self = shared_from_this();
+		if (m_head_only) {
+			// RFC 9110 9.3.2 -- a HEAD response carries no content, on any status.
+			// prepare_payload() has already sized Content-Length from the full body, so
+			// serializing the header alone reports what a GET would return.
+			m_serializer.emplace(*m_response);
+			m_serializer->split(true);
+			http::async_write_header(
+				m_stream, *m_serializer, self(beast::error_code ec, std::size_t) {
+					(void)ec;
+					// Same drain as the body path. A HEAD rejected at the header cap
+					// has just as much unread data queued as a GET does, and closing on
+					// top of it lets the RST discard the 431 just written --
+					// intermittently, which is why a single probe can pass and hide it.
+					if (self->m_drain_before_close) {
+						self->StartDrainThenClose();
+						return;
+					}
+					self->DoClose();
+				});
+			return;
+		}
+		http::async_write(m_stream, *m_response, self(beast::error_code ec, std::size_t) {
+			(void)ec;
+			if (self->m_drain_before_close) {
+				self->StartDrainThenClose();
+				return;
+			}
+			self->DoClose();
+		});
+	}
+
+	void DoClose()
+	{
+		// Drop the request timer first. It holds a shared_ptr to this Session, so leaving it
+		// armed keeps a closed connection alive for the rest of its budget and delays process
+		// teardown by the same amount. Posted rather than cancelled inline: DoClose also runs on
+		// the SSE worker thread, and the timer belongs to the io_context executor.
+		{
+			auto self = shared_from_this();
+			asio::post(m_stream.get_executor(), self() { self->m_request_timer.cancel(); });
+		}
+		// If we were streaming, write the chunked-encoding terminator (0-size
+		// chunk) before shutting down. Idempotent: a closed peer just fails.
+		if (m_stream_alive.exchange(false, std::memory_order_acq_rel)) {
+			std::lock_guard<std::mutex> g(m_socket_mu);
+			beast::error_code ec;
+			asio::write(m_stream.socket(), asio::buffer(std::string("0\r\n\r\n")), ec);
+		}
+		beast::error_code ec;
+		m_stream.socket().shutdown(tcp::socket::shutdown_send, ec);
+		// `ec` deliberately discarded -- peer may have already gone
+		// away.
+	}
+
+	beast::tcp_stream m_stream;
+	// Fires before the stream's own expiry so a stalled request can be
+	// answered instead of silently dropped; see DoRead.
+	asio::steady_timer m_request_timer;
+	// Worker pool that runs the (non-streaming) request handler off the io_context thread.
+	// Declared before m_handler so the init list stays in declaration order.
+	std::shared_ptr<asio::thread_pool> m_handler_pool;
+	beast::flat_buffer m_buffer{ kReadBufferBytes };
+	boost::optional<http::request_parser<http::string_body>> m_parser;
+	boost::optional<http::response<http::string_body>> m_response;
+	// Header-only serializer, used for HEAD so Content-Length still
+	// reports the GET size while no content reaches the wire.
+	boost::optional<http::response_serializer<http::string_body>> m_serializer;
+	// The file-backed alternative to the pair above, engaged only when the handler set
+	// Response::file. Two separate pairs rather than a variant body because the message type
+	// is baked into the serializer at compile time.
+	//
+	// Both optionals reserve their storage INLINE in every Session whether or not they are
+	// ever engaged, and response_serializer holds its `writer` by value -- so while the
+	// writer kept its 64 KiB read buffer as a member array, every session paid for it, an
+	// hours-long SSE connection included. sizeof(Session) was 67432 bytes; it is now 1904.
+	// Anything added to RangeFileBody::writer lands here again, by value, on every connection.
+	boost::optional<http::response<RangeFileBody>> m_file_response;
+	boost::optional<http::response_serializer<RangeFileBody>> m_file_serializer;
+	// Whether this session is accounted against g_file_response_count; see
+	// the destructor.
+	bool m_file_slot_held = false;
+	CHttpServer::Handler m_handler;
+
+	// streaming state.
+	CHttpServer::StreamingResolver m_streaming_resolver;
+	CHttpServer::StreamingHandler m_streaming_handler;
+	CHttpServer::StreamingPreflight m_streaming_preflight;
+	CHttpServer::CorsStamper m_cors_stamper;
+	std::atomic<bool> m_stream_alive{ false };
+	// Set true by the worker on exit. The Session destructor asserts on it before detach()ing
+	// the thread handle -- the dtor only runs after the last ref drops, and that ref is held
+	// by the worker lambda.
+	std::atomic<bool> m_worker_exited{ false };
+	std::mutex m_socket_mu;
+	std::thread m_stream_worker;
+	// Whether this session is accounted against g_streaming_session_count. Set in
+	// DispatchStreaming after a successful slot acquisition; the dtor decrements iff this is
+	// true, so refused-cap sessions do not double-account.
+	bool m_session_slot_held = false;
+	// Sampled from the request's Accept-Encoding header in Dispatch. Read by WriteResponse
+	// and by DispatchStreaming. A plain bool because both readers run either on the thread
+	// that populated it or on a worker spawned after.
+	bool m_accepts_gzip = false;
+	bool m_head_only = false;
+	// The /events HEAD probe answers for a chunked stream, so it is framed
+	// as one rather than as a zero-length body; see DispatchStreaming.
+	bool m_head_probe_chunked = false;
+	// Set on the transport-level error replies, which are written while the
+	// peer may still be uploading; see WriteAndClose.
+	bool m_drain_before_close = false;
+	std::size_t m_drained = 0;
+	beast::flat_buffer m_drain_buffer;
+	// One response per connection, whichever of the two paths wins.
+	std::atomic<bool> m_answered{ false };
+};
+
+// Accept loop. One Listener per HttpServer; spawns a Session per
+// connection via shared_from_this.
+class Listener : public std::enable_shared_from_this<Listener>
+{
+public:
+	Listener(asio::io_context &ioc,
+		std::shared_ptr<asio::thread_pool> handler_pool,
+		tcp::endpoint endpoint,
+		CHttpServer::Handler handler,
+		CHttpServer::StreamingResolver streaming_resolver,
+		CHttpServer::StreamingHandler streaming_handler,
+		CHttpServer::StreamingPreflight streaming_preflight,
+		CHttpServer::CorsStamper cors_stamper)
+	: m_ioc(ioc)
+	, m_acceptor(asio::make_strand(ioc))
+	, m_handler_pool(std::move(handler_pool))
+	, m_handler(std::move(handler))
+	, m_streaming_resolver(std::move(streaming_resolver))
+	, m_streaming_handler(std::move(streaming_handler))
+	, m_streaming_preflight(std::move(streaming_preflight))
+	, m_cors_stamper(std::move(cors_stamper))
+	{
+		beast::error_code ec;
+		m_acceptor.open(endpoint.protocol(), ec);
+		if (ec) {
+			m_error = ec.message();
+			return;
+		}
+		m_acceptor.set_option(asio::socket_base::reuse_address(true), ec);
+		if (ec) {
+			m_error = ec.message();
+			return;
+		}
+		m_acceptor.bind(endpoint, ec);
+		if (ec) {
+			m_error = ec.message();
+			return;
+		}
+		m_acceptor.listen(asio::socket_base::max_listen_connections, ec);
+		if (ec) {
+			m_error = ec.message();
+			return;
+		}
+	}
+
+	bool Ok() const { return m_error.empty(); }
+	const std::string &Error() const { return m_error; }
+
+	void Run() { DoAccept(); }
+	void Stop()
+	{
+		beast::error_code ec;
+		m_acceptor.close(ec);
+		// Cancel every live SSE session's socket so workers blocked inside synchronous Beast
+		// writes return promptly. Without this a slow peer holds its worker thread inside the
+		// write call until the kernel TCP timeout, and CHttpServer::Stop then joins the
+		// io_context thread indefinitely.
+		std::vector<std::shared_ptr<Session>> live;
+		{
+			std::lock_guard<std::mutex> g(g_live_streams_mu);
+			live.reserve(g_live_streams.size());
+			for (auto &w : g_live_streams) {
+				if (auto s = w.lock())
+					live.push_back(std::move(s));
+			}
+			g_live_streams.clear();
+		}
+		for (auto &s : live)
+			s->RequestCancel();
+	}
+
+private:
+	void DoAccept()
+	{
+		auto self = shared_from_this();
+		m_acceptor.async_accept(
+			asio::make_strand(m_ioc), self(beast::error_code ec, tcp::socket socket) {
+				if (!ec) {
+					std::make_shared<Session>(std::move(socket),
+						self->m_handler_pool,
+						self->m_handler,
+						self->m_streaming_resolver,
+						self->m_streaming_handler,
+						self->m_streaming_preflight,
+						self->m_cors_stamper)
+						->Start();
+				}
+				// Loop unless the acceptor has been closed. operation_aborted
+				// fires on Stop() and signals "exit cleanly".
+				if (ec != asio::error::operation_aborted) {
+					self->DoAccept();
+				}
+			});
+	}
+
+	asio::io_context &m_ioc;
+	tcp::acceptor m_acceptor;
+	std::shared_ptr<asio::thread_pool> m_handler_pool;
+	CHttpServer::Handler m_handler;
+	CHttpServer::StreamingResolver m_streaming_resolver;
+	CHttpServer::StreamingHandler m_streaming_handler;
+	CHttpServer::StreamingPreflight m_streaming_preflight;
+	CHttpServer::CorsStamper m_cors_stamper;
+	std::string m_error;
+};
+
+} // namespace
+
+struct CHttpServer::Impl
+{
+	asio::io_context ioc{ 1 };
+	// Handlers run here, off the single io_context thread -- see kHandlerPoolThreads.
+	// shared_ptr so Sessions can keep it alive for an in-flight handler; joined explicitly in
+	// Stop().
+	std::shared_ptr<asio::thread_pool> handler_pool;
+	std::shared_ptr<Listener> listener;
+	std::thread thread;
+	std::atomic<bool> running{ false };
+};
+
+CHttpServer::CHttpServer() = default;
+
+CHttpServer::~CHttpServer()
+{
+	Stop();
+}
+
+void CHttpServer::SetMaxConcurrentFileResponses(int max_responses)
+{
+	// Silently ignoring a bad value rather than clamping it: the config layer has already
+	// rejected everything outside the sane band and fallen back to the default, so anything
+	// that still gets here is a programming error.
+	if (max_responses > 0) {
+		g_max_concurrent_file_responses.store(max_responses, std::memory_order_relaxed);
+	}
+}
+
+// Every callback here is a sink: taken by value, std::move()d into Listener, which moves
+// it on into its member. A const reference would force a copy at that member instead, and
+// performance-unnecessary-value-param flags four of the five anyway -- exactly the four
+// carrying a default argument.
+// NOLINTBEGIN(performance-unnecessary-value-param)
+bool CHttpServer::Start(const std::string &bind_address,
+	unsigned port,
+	Handler handler,
+	StreamingResolver streaming_resolver,
+	StreamingHandler streaming_handler,
+	StreamingPreflight streaming_preflight,
+	CorsStamper cors_stamper)
+// NOLINTEND(performance-unnecessary-value-param)
+{
+	if (m_impl) {
+		m_lastError = "HttpServer already started";
+		return false;
+	}
+	m_impl = std::make_unique<Impl>();
+
+	beast::error_code ec;
+	const auto addr = asio::ip::make_address(bind_address, ec);
+	if (ec) {
+		m_lastError = "invalid bind address '" + bind_address + "': " + ec.message();
+		m_impl.reset();
+		return false;
+	}
+	tcp::endpoint endpoint(addr, static_cast<unsigned short>(port));
+
+	// Bind hygiene warning. amuleapi's HTTP server uses a thread-per-streaming-session model
+	// bounded by a process-wide cap. On loopback this is fine; off loopback the same model is
+	// a DoS amplifier, since any peer can open enough preauth connections to consume the cap
+	// and lock out legitimate subscribers. Surface a one-time WARN so an operator switching
+	// the bind catches it in the daemon log.
+	if (!addr.is_loopback()) {
+		std::cerr << "amuleapi: WARN BindAddress=" << bind_address
+			  << " is not loopback. SSE sessions are capped at "
+			  << kMaxConcurrentStreamingSessions
+			  << " concurrent; beyond that the daemon returns "
+			     "503. Put a reverse proxy in front for remote "
+			     "access.\n";
+	}
+
+	m_impl->handler_pool = std::make_shared<asio::thread_pool>(kHandlerPoolThreads);
+	m_impl->listener = std::make_shared<Listener>(m_impl->ioc,
+		m_impl->handler_pool,
+		endpoint,
+		std::move(handler),
+		std::move(streaming_resolver),
+		std::move(streaming_handler),
+		std::move(streaming_preflight),
+		std::move(cors_stamper));
+	if (!m_impl->listener->Ok()) {
+		m_lastError = "bind to " + bind_address + ":" + std::to_string(port) +
+			      " failed: " + m_impl->listener->Error();
+		m_impl.reset();
+		return false;
+	}
+	m_impl->listener->Run();
+
+	m_impl->running.store(true, std::memory_order_release);
+	m_impl->thread = std::thread(this {
+		try {
+			m_impl->ioc.run();
+		} catch (const std::exception &e) {
+			// io_context exception propagation: the server thread dies quietly. Catch + log to
+			// stderr so an operator running in foreground sees a one-line cause; daemon mode
+			// loses the message.
+			std::cerr << "amuleapi: HTTP I/O loop exited on exception: " << e.what() << '\n';
+		}
+		m_impl->running.store(false, std::memory_order_release);
+	});
+	return true;
+}
+
+void CHttpServer::Stop()
+{
+	if (!m_impl)
+		return;
+	if (m_impl->listener)
+		m_impl->listener->Stop();
+	m_impl->ioc.stop();
+	if (m_impl->thread.joinable())
+		m_impl->thread.join();
+	// Drain the handler pool after the io_context thread is gone. stop() abandons
+	// not-yet-started handler tasks; join() lets any in-flight handler finish (bounded by the
+	// EC read timeout). Their response trampolines were posted to the now-stopped io_context
+	// and are discarded when it is destroyed below.
+	if (m_impl->handler_pool) {
+		m_impl->handler_pool->stop();
+		m_impl->handler_pool->join();
+	}
+	m_impl.reset();
+}

amule-3.1.0.tar.gz/src/webapi/HttpServer.h Added

@@ -0,0 +1,206 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_HTTPSERVER_H
+#define WEBAPI_HTTPSERVER_H
+
+#include <cstdint>
+#include <functional>
+#include <map>
+#include <memory>
+#include <string>
+#include <thread>
+
+#include <boost/optional.hpp>
+
+// Boost.Beast-based HTTP/1.1 server. Runs in its own std::thread -- boost::asio::io_context::run()
+// is blocking and Beast's async chain stays inside that thread until Stop() is called. Deliberately
+// shares no state with the wxApp thread: handlers needing EC use the wxQueueEvent-based bridge in
+// Api.cpp to fan out onto that thread, while HttpServer stays transport-only.
+
+namespace boost
+{
+namespace asio
+{
+class io_context;
+}
+} // namespace boost
+
+// Does this Accept-Encoding value ask for gzip? Token search, so "gzip, deflate, br" and
+// "gzip;q=1.0" both match and a longer name containing the letters does not. Shared rather than
+// reimplemented: the dispatcher has to answer the same question when it describes what a GET would
+// return.
+bool AcceptsGzip(const std::string &accept_encoding);
+
+// Will a response with this body be gzipped on the way out? Shared because two places have to
+// agree: the transport, which compresses and stamps the coding onto the validator, and the 304
+// paths, which must echo the SAME validator the equivalent 200 would have sent. When they
+// disagreed, a client that cached the gzip form was handed the identity ETag on revalidation and
+// could never match its stored response again.
+bool WillCompressBody(
+	bool accepts_gzip, std::size_t body_size, const std::string &content_type, bool already_encoded);
+
+// Add one token to a comma-separated header without dropping what is already there and without
+// duplicating it. Comparison is token-by-token, so a short name cannot match inside a longer one.
+// Declared here because every writer that merges a header has to share one definition -- this logic
+// previously existed in three copies and two rounds of fixes each reached a different two.
+void AppendHeaderToken(std::map<std::string, std::string> &headers, const char *name, const char *token);
+
+class CHttpServer
+{
+public:
+	// The dispatch callback runs on the HTTP server's I/O thread. Anything stateful it touches
+	// must be either thread-safe or trampolined onto the wxApp thread.
+	struct Request
+	{
+		std::string method; // "GET", "POST", ...
+		std::string target; // raw URI: "/api/v1/version?x=1"
+		std::map<std::string, std::string> headers;
+		std::string body;
+		// Client IP as observed by the accept socket. amuleapi rate-limits by this
+		// string verbatim; an `X-Forwarded-For` honour toggle is a follow-up.
+		std::string remote_addr;
+	};
+
+	struct Response
+	{
+		unsigned status = 200;
+		std::string content_type = "application/json";
+		std::map<std::string, std::string> headers;
+		std::string body;
+
+		// Serve the body straight off disk instead of out of `body`. Exists because the
+		// buffered `body` above is a memory hazard for shared content: the handler pool is
+		// 16 threads wide, so a multi-GB file answered through a std::string is up to 16 x
+		// filesize resident. When `file` is set the transport streams the window through a
+		// fixed 64 KiB buffer.
+		struct FileSource
+		{
+			// Absolute path. The HANDLER owns resolution and the containment check --
+			// by the time the transport gets here it opens the path blindly, and its
+			// only failure answer is a 500. Anything that should have been a 403 or a
+			// 404 has to have been decided upstream.
+			std::string fs_path;
+			// Inclusive window, RFC 9110 byte-range semantics: `last` is the index of
+			// the last byte SENT, so a whole file of N bytes is 0, N-1. Both must lie
+			// inside the file; the transport answers 500 rather than clamping, since
+			// the handler has usually already described the window in a Content-Range.
+			// A zero-length file belongs on the `body` path.
+			std::uint64_t first = 0;
+			std::uint64_t last = 0;
+		};
+		// Setting this opts the response out of two things it would otherwise get for free:
+		//  * gzip. Compressing a range would break the byte accounting the Content-Range describes,
+		//    and shared content is generally already entropy-coded anyway.
+		//  * the dispatcher's whole-body ETag, computed by hashing `body`. There is none here, so
+		//    the handler builds one from size + mtime instead.
+		boost::optional<FileSource> file;
+	};
+
+	using Handler = std::function<Response(const Request &)>;
+
+	// Long-lived streaming responses (SSE). The streaming handler is given a `Writer` it can
+	// use to push chunks at will; the connection stays open until the writer signals close or
+	// the peer disconnects.
+	class Writer
+	{
+	public:
+		// Write a chunk of bytes to the connection. Returns false if the connection has
+		// been torn down -- the caller should stop pushing and let the session die. Thread-
+		// safe: implementations post the write to the io_context strand, so a caller on any
+		// thread is safe.
+		virtual bool Write(const std::string &chunk) = 0;
+		// True if the peer is still connected. Cheap to poll, so the per-stream
+		// heartbeat timer can bail when the client hung up between pushes.
+		virtual bool Alive() const = 0;
+		virtual ~Writer() = default;
+	};
+
+	// StreamingHandler returns the response head (status, content_type, initial headers) AND
+	// keeps writing chunks via the Writer until it returns. The session lives as long as the
+	// handler has not returned AND the connection is alive, which Writer::Alive surfaces.
+	using StreamingHandler = std::function<void(const Request &,
+		Writer &writer,
+		unsigned &http_status,
+		std::string &content_type,
+		std::map<std::string, std::string> &response_headers)>;
+
+	// Optional resolver: tells the HTTP server whether an incoming request goes to the
+	// streaming handler (true) or the normal Handler (false). The current wiring matches "GET
+	// /api/v1/events".
+	using StreamingResolver = std::function<bool(const Request &)>;
+
+	// Optional preflight: runs synchronously on the I/O thread BEFORE the per-session worker
+	// thread is spawned and BEFORE the concurrency budget is claimed. boost::none admits; a
+	// populated Response is written verbatim and the connection closes. This is what stops an
+	// unauthenticated peer tying up a slot for the read-timeout window.
+	using StreamingPreflight = std::function<boost::optional<Response>(const Request &)>;
+
+	// Stamps the CORS bundle on a response the transport built itself -- the 408 / 413 / 431
+	// replies, written before any request reaches a handler. Without it those are the only
+	// replies a cross-origin browser client cannot read. Takes the raw Origin header, there
+	// being no parsed Request yet.
+	using CorsStamper = std::function<void(
+		std::map<std::string, std::string> &headers, const std::string &origin_header)>;
+
+	// Bind and listen on `bind_address`:`port`. Returns false, and populates LastError, on bind
+	// failure -- most commonly the port being in use by another amuleapi instance or a stale
+	// TIME_WAIT socket.
+	bool Start(const std::string &bind_address,
+		unsigned port,
+		Handler handler,
+		StreamingResolver streaming_resolver = nullptr,
+		StreamingHandler streaming_handler = nullptr,
+		StreamingPreflight streaming_preflight = nullptr,
+		CorsStamper cors_stamper = nullptr);
+
+	// Process-wide cap on concurrent file-backed responses (`Response::file`), from
+	// `Streaming/MaxConcurrentFileResponses`. Zero or negative is ignored, so a caller that
+	// has not read a configuration file cannot close the route.
+	//
+	// Must be called BEFORE Start(): the value is published without synchronisation beyond the
+	// atomic itself, and what makes that safe is that no connection -- and therefore no reader
+	// -- exists yet.
+	static void SetMaxConcurrentFileResponses(int max_responses);
+
+	// Stops the io_context, joins the thread. Safe to call from any
+	// thread; Start() must have succeeded.
+	void Stop();
+
+	const std::string &LastError() const { return m_lastError; }
+
+	// PIMPL -- `Impl` holds the boost::asio io_context plus the std::thread. Ctor and dtor are
+	// declared but defined out-of-line so callers do not need Boost.Asio's headers, and
+	// `std::is_destructible<CHttpServer>` does not probe the incomplete `Impl` from foreign
+	// translation units.
+	CHttpServer();
+	~CHttpServer();
+
+private:
+	struct Impl;
+	std::unique_ptr<Impl> m_impl;
+	std::string m_lastError;
+};
+
+#endif // WEBAPI_HTTPSERVER_H

amule-3.1.0.tar.gz/src/webapi/JsonDepthScan.h Added

@@ -0,0 +1,92 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 JSONDEPTHSCAN_H
+#define JSONDEPTHSCAN_H
+
+#include <cstddef>
+#include <string>
+
+namespace webapi
+{
+
+//! Deepest nesting a request body may carry before it is refused unparsed. The deepest legitimate
+//! body on this surface is 3 (`{"remote_controls":{"webserver":{...}}}`), so 32 leaves ample
+//! headroom.
+constexpr std::size_t kMaxJsonDepth = 32;
+
+/**
+ * Whether @a body nests no deeper than @a maxDepth.
+ *
+ * A pre-parse guard, not a validator. picojson's `_parse_array` / `_parse_object` recurse without a
+ * depth limit of their own, so a `{"a":{"a":...}}` body nested deep enough exhausts the stack of
+ * the handler-pool thread the parse runs on. Whatever gets past here still has to satisfy picojson,
+ * which has the final say on syntax.
+ *
+ * Nesting depth, not a count of openers: a flat body is legal at any length. An earlier version
+ * incremented on every `{` and `` and never decremented, turning the cap into a budget of 32
+ * containers for the whole request -- a PATCH /preferences whose `shared` array held directory
+ * names like "Some.Release-BRD 2023" was refused on the 33rd bracket while only three levels deep
+ * (issue #1083, fixed in #1084).
+ *
+ * String literals are skipped for that same reason, with backslash escapes honoured so a `\"`
+ * inside one does not end it early. Unbalanced closers are ignored rather than rejected.
+ *
+ * Skipping strings cannot hide real nesting. To undercount, this would have to believe it is inside
+ * a string where picojson does not, which needs an unmatched quote -- and picojson then fails on
+ * the unterminated string rather than recursing. Every way the two can disagree is either
+ * conservative here or a parse error there.
+ */
+inline bool JsonNestingWithinLimit(const std::string &body, std::size_t maxDepth = kMaxJsonDepth)
+{
+	std::size_t depth = 0;
+	bool in_string = false;
+	for (std::size_t i = 0; i < body.size(); ++i) {
+		const char c = bodyi;
+		if (in_string) {
+			if (c == '\\') {
+				// Escaped char, never closes the string. Safe at the end of the
+				// buffer: this can only push i to size(), which the loop condition
+				// then stops on.
+				++i;
+			} else if (c == '"') {
+				in_string = false;
+			}
+		} else if (c == '"') {
+			in_string = true;
+		} else if (c == '{' || c == '') {
+			if (++depth > maxDepth) {
+				return false;
+			}
+		} else if ((c == '}' || c == '') && depth > 0) {
+			--depth;
+		}
+	}
+	return true;
+}
+
+} // namespace webapi
+
+#endif // JSONDEPTHSCAN_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/webapi/LogTee.cpp Added

amule-3.1.0.tar.gz/src/webapi/LogTee.h Added

@@ -0,0 +1,195 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_LOG_TEE_H
+#define WEBAPI_LOG_TEE_H
+
+#include <csignal>
+#include <cstddef>
+#include <cstdio>
+#include <functional>
+#include <mutex>
+#include <string>
+#include <thread>
+
+namespace webapi
+{
+
+// Append-only log file with a simple two-file size cap. When a write would cross maxBytes the
+// current file is renamed to "<path>.1" (replacing any older rotation) and a fresh file is opened,
+// so on-disk usage stays bounded to ~2x maxBytes while the most recent history is always preserved.
+//
+// Portable (C stdio), no file descriptors 1/2 and no threads -- this is the sink CLogTee writes
+// into, and it is unit-tested directly. All public methods are internally locked, so the two
+// forwarding threads may call Write() concurrently.
+class CRotatingLog
+{
+public:
+	CRotatingLog() = default;
+	~CRotatingLog();
+
+	CRotatingLog(const CRotatingLog &) = delete;
+	CRotatingLog &operator=(const CRotatingLog &) = delete;
+
+	// Opens path in append mode and seeds the running size from the existing file, so the cap
+	// accounts for pre-existing content. maxBytes == 0 disables rotation. False on open
+	// failure.
+	bool Open(const std::string &path, std::size_t maxBytes);
+
+	// Appends n bytes, rotating first if the cap would be crossed. No-op when
+	// not open.
+	void Write(const char *buf, std::size_t n);
+
+	void Close();
+
+	// A descriptor for the crash path to write to, or -1 when there is none.
+	//
+	// On POSIX it is reserved: one number for the life of the object, only ever re-pointed, so a
+	// signal handler can read it without taking m_mx and the number can never be freed
+	// mid-rotation and handed to another thread's socket. Close() leaves it open on the last
+	// file, so the number is never a closed one in a reader's hands.
+	//
+	// Windows reserves nothing, because an open handle there blocks the rename() that rotation
+	// needs. It resolves the current file under m_mx instead, which is what this did before the
+	// reserved descriptor existed. The lock is a hazard in a handler, but the only Windows caller
+	// is CLogTee::RedirectStderrForCrash() from an SEH filter, and losing the redirect
+	// altogether is worse: the report would sit in a pipe whose pump dies with the process.
+	int CrashFd() const;
+
+private:
+	void Rotate();       // caller holds m_mx
+	void PointCrashFd(); // caller holds m_mx
+
+	mutable std::mutex m_mx;
+	std::string m_path;
+	std::size_t m_maxBytes = 0;
+	std::size_t m_curSize = 0;
+	std::FILE *m_fp = nullptr;
+	volatile std::sig_atomic_t m_crashFd = -1;
+};
+
+// The local "YYYY-MM-DD HH:MM:SS: " prefix. Same format as amuled's CLogger::DoLines().
+std::string LocalLogStamp();
+
+// Prefixes each line with a timestamp as the bytes stream past. Stateful because a line can
+// span two reads. A line is stamped when its first byte arrives; blank lines are not stamped,
+// matching amuled.
+class CLineStamper
+{
+public:
+	using Clock = std::function<std::string()>;
+
+	explicit CLineStamper(Clock clock = LocalLogStamp);
+
+	// The input with a stamp inserted at every line start.
+	std::string Feed(const char *buf, std::size_t n);
+
+private:
+	Clock m_clock;
+	bool m_atLineStart = true;
+};
+
+// Holds back a trailing partial line, so a file shared by two streams only ever gets whole lines
+// and a stamp never lands mid-line. A partial line longer than kMaxPending is released anyway.
+class CLineAssembler
+{
+public:
+	static constexpr std::size_t kMaxPending = 64 * 1024;
+
+	// The complete lines in the pending text plus buf; keeps the rest.
+	std::string Take(const char *buf, std::size_t n);
+
+	// Whatever is left, as a whole line, for the end of the stream.
+	std::string Flush();
+
+private:
+	std::string m_pending;
+};
+
+// Duplicates the process's stdout and stderr into a log file while leaving the original console
+// streams intact (a "tee"). It works at the file-descriptor level -- fd 1 and fd 2 are routed
+// through pipes and a forwarding thread copies each chunk to both the saved console fd and the log
+// file -- so it captures C stdio, C++ streams and anything else that writes to those descriptors,
+// including the fatal-signal backtrace. Every line is timestamped on the way through, for both
+// sinks. Cross-platform via the POSIX and Windows pipe/dup2/read equivalents.
+class CLogTee
+{
+public:
+	// Bytes read from a pipe per call.
+	static constexpr std::size_t kReadChunk = 4096;
+
+	CLogTee() = default;
+	~CLogTee();
+
+	CLogTee(const CLogTee &) = delete;
+	CLogTee &operator=(const CLogTee &) = delete;
+
+	// Opens logPath (append, capped at maxBytes), redirects fd 1 and 2 through pipes and starts
+	// the forwarding threads. An empty logPath tees to the console only, still timestamped. On
+	// any failure it restores the descriptors and returns false, leaving stdout/stderr untouched.
+	bool Install(const std::string &logPath, std::size_t maxBytes);
+
+	// Restores the original descriptors, drains and joins the forwarding
+	// threads and closes the file. Idempotent; also called by the destructor.
+	void Uninstall();
+
+	// Crash path: point fd 2 at the log file, or at the console when there is none, so a
+	// backtrace from the fatal handler is written synchronously rather than into a pipe whose
+	// forwarding thread dies with the process.
+	void RedirectStderrForCrash();
+
+	// The reserved crash descriptor, or -1 when not installed. For a crash reporter that has to
+	// write somewhere the forwarding threads are not needed to drain; see
+	// SetFatalAbortRedirectFd(). Stays valid across rotations; clear the reporter's copy before
+	// destroying this object, which is what closes it.
+	int CrashFd() const { return m_installed ? m_log.CrashFd() : -1; }
+
+	// The dup of the original fd 2, or -1 when not installed. A crash reporter writes the console
+	// copy here rather than to fd 2: fd 2 is the tee pipe, which reaches the console only while
+	// the pump thread is still scheduled, and in a signal handler it is not.
+	int ConsoleFd() const { return m_installed ? m_savedErr : -1; }
+
+	bool IsInstalled() const { return m_installed; }
+
+private:
+	// One forwarding worker per stream: blocking-reads a pipe, stamps each chunk and writes it to
+	// its console fd and the log file. Two threads rather than one poll() loop so the same code
+	// runs on Windows, which cannot poll() pipes.
+	void Pump(int readFd, int consoleFd);
+
+	bool m_installed = false;
+	CRotatingLog m_log;
+
+	int m_savedOut = -1;    // dup of the original fd 1
+	int m_savedErr = -1;    // dup of the original fd 2
+	int m_pipeOutRead = -1; // read end for the stdout pipe
+	int m_pipeErrRead = -1; // read end for the stderr pipe
+
+	std::thread m_outThread;
+	std::thread m_errThread;
+};
+
+} // namespace webapi
+
+#endif // WEBAPI_LOG_TEE_H

amule-3.1.0.tar.gz/src/webapi/PartIndex.h Added

@@ -0,0 +1,80 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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.
+//
+
+// Whether a part index amuled reported about a peer may be relayed as an index into a given file's
+// part bitmap.
+//
+// Both predicates are pure and their inputs are all reachable from a crafted EC frame, but the
+// values that make them interesting -- the 0xffff sentinel, the boundary at part_count, a file with
+// more than 65535 parts, a source whose state flips to "downloading" -- are not values a live peer
+// hands out on request. So they live here, in a header that pulls in nothing but <string> and
+// <cstdint>: no wx, no Boost.Beast, no EC. Same rationale as SharedContent.h and
+// CompleteSourcesThrottle.h, and the same reason PartIndexTest can drive every branch without a
+// daemon.
+//
+// The serializing half -- which key gets written, and as what -- stays in Api.cpp.
+
+#ifndef AMULE_WEBAPI_PARTINDEX_H
+#define AMULE_WEBAPI_PARTINDEX_H
+
+#include <cstdint>
+#include <string>
+
+namespace webapi
+{
+
+//! The core answers 0xffff for "no block pending" (DownloadClient.cpp: `GetNextRequestedPart`), and
+//! the desktop substitutes it for the downloading part on a source that is not transferring
+//! (GenericClientListCtrl.cpp). It is a sentinel, not a part number, and it has to be tested for by
+//! name rather than left to fall out of a bounds check -- see UsablePartIndex.
+constexpr std::uint16_t kNoPartPendingSentinel = 0xffffu;
+
+//! The one `download_state` value that means bytes are moving from the peer to us right now
+//! (Refresher.cpp: ClientDownloadStateName, mapping DS_DOWNLOADING). Two unrelated places test for
+//! it -- the `?activity=downloading` filter in Api.cpp and UsableLastDownloadingPart below -- and
+//! they have to agree, so the spelling lives here once.
+constexpr const char *kDownloadStateDownloading = "downloading";
+
+//! True when a reported part index can actually address a chunk of a file with `part_count` chunks.
+//! Three things make it unusable: the peer never reported one (`present` false),
+//! kNoPartPendingSentinel, and any index left over from a peer whose request file is not this one.
+//!
+//! The sentinel is tested by name rather than left to the bounds check, which only filters it while
+//! `part_count <= 0xffff`. Above that -- a file larger than about 637 GB -- 65535 is a real chunk,
+//! so the bound alone would pass the sentinel through on exactly the files a source bar is most
+//! useful on.
+inline bool UsablePartIndex(bool present, std::uint16_t part, std::uint64_t part_count)
+{
+	return present && part != kNoPartPendingSentinel && static_cast<std::uint64_t>(part) < part_count;
+}
+
+//! The same test for `last_downloading_part`, plus the download-state guard the bounds check cannot
+//! supply: the core initialises m_lastDownloadingPart to 0 and ECSpecialCoreTags.cpp ships it with
+//! AddTag rather than AddDiffTag, so it arrives on every frame whether or not the peer is
+//! transferring. A connected-but-queued source therefore reports a perfectly in-range 0,
+//! indistinguishable from one actually feeding chunk 0 -- and most sources in a list are queued, so
+//! a renderer would mark chunk 0 as "downloading now" on nearly every row. The desktop guards it
+//! the same way; doing it in the serializer means every API client gets it right once.
+//!
+//! Takes the state string and the two scalars rather than a ClientSnapshot, so this header needs
+//! neither State.h nor anything State.h reaches.
+//!
+//! Deliberately NOT applied to next_requested_part, exactly as the desktop does not: 0xffff is that
+//! field's own "no block pending" answer.
+inline bool UsableLastDownloadingPart(
+	const std::string &download_state, bool present, std::uint16_t part, std::uint64_t part_count)
+{
+	return download_state == kDownloadStateDownloading && UsablePartIndex(present, part, part_count);
+}
+
+} // namespace webapi
+
+#endif // AMULE_WEBAPI_PARTINDEX_H

amule-3.1.0.tar.gz/src/webapi/PrefsSchema.cpp Added

@@ -0,0 +1,353 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+
+#include "PrefsSchema.h"
+
+#include <cstring>
+#include <type_traits>
+
+namespace webapi
+{
+
+namespace
+{
+
+// Enum value tables. Order is the wire order: an entry's index is the integer
+// the daemon stores, so entries may be appended but never reordered.
+const char *const kProxyTypes = { "socks5", "socks4", "http", "socks4a", nullptr };
+const char *const kSharedFilesVisibility = { "everybody", "friends", "nobody", nullptr };
+const char *const kIp2CountrySources = { "dbip", "maxmind", "custom", nullptr };
+
+// Everything from here to the matching `clang-format on` is a data table, not code, and is kept
+// one row per field so it reads as a specification. ColumnLimit is 110 and the longest row is
+// ~184 characters, so the formatter would break every row across seven lines -- costing the
+// property this table exists for: adding a preference stays a one-line diff.
+//
+// clang-format off
+
+// Address-of-member accessor with a compile-time guard that the row's declared PrefType matches
+// the member's real C++ type. Getting the two out of step is the one way a table row could be
+// quietly wrong, so it is a build error.
+#define PREF_MEMBER(memb, cpp_type) \
+	(PreferencesSnapshot &p) -> void * { \
+		static_assert(std::is_same<decltype(p.memb), cpp_type>::value, \
+			"PrefsSchema: declared PrefType does not match the type of " #memb); \
+		return &p.memb; \
+	}
+
+#define PREF_BOOL(cat, key, tag, enc, inv, acc, memb) \
+	{cat, key, tag, PrefType::Bool, enc, inv, acc, 0u, nullptr, nullptr, PREF_MEMBER(memb, bool), 0}
+
+// Same as PREF_BOOL but the tag is read out of a different EC group than the
+// one this field's JSON category maps to.
+#define PREF_BOOL_INGROUP(cat, key, tag, enc, acc, memb, group) \
+	{cat, key, tag, PrefType::Bool, enc, false, acc, 0u, nullptr, nullptr, PREF_MEMBER(memb, bool), group}
+
+// Capability-gated: PATCH answers 409 when the named sibling bool is false.
+#define PREF_BOOL_GATED(cat, key, tag, enc, inv, acc, memb, gate) \
+	{cat, key, tag, PrefType::Bool, enc, inv, acc, 0u, nullptr, gate, PREF_MEMBER(memb, bool), 0}
+
+#define PREF_U16(cat, key, tag, maxv, acc, memb) \
+	{cat, key, tag, PrefType::Uint16, PrefEnc::Value, false, acc, maxv, nullptr, nullptr, PREF_MEMBER(memb, std::uint16_t), 0}
+
+#define PREF_U32(cat, key, tag, maxv, acc, memb) \
+	{cat, key, tag, PrefType::Uint32, PrefEnc::Value, false, acc, maxv, nullptr, nullptr, PREF_MEMBER(memb, std::uint32_t), 0}
+
+// Same as PREF_U32 but the API value is the EC value divided by `scale`.
+#define PREF_U32_SCALED(cat, key, tag, maxv, acc, memb, scale) \
+	{cat, key, tag, PrefType::Uint32, PrefEnc::Value, false, acc, maxv, nullptr, nullptr, PREF_MEMBER(memb, std::uint32_t), 0, scale}
+
+// Numeric rows whose real domain is narrower than their type. `minv`/`maxv` are both inclusive
+// and both rejected with a 400; `stepv` is the granularity the core stores at, 0 when the row is
+// not quantised.
+#define PREF_U32_DOMAIN(cat, key, tag, minv, maxv, stepv, acc, memb) \
+	{cat, key, tag, PrefType::Uint32, PrefEnc::Value, false, acc, maxv, nullptr, nullptr, \
+		PREF_MEMBER(memb, std::uint32_t), 0, 0, minv, stepv}
+
+#define PREF_U16_DOMAIN(cat, key, tag, minv, maxv, acc, memb) \
+	{cat, key, tag, PrefType::Uint16, PrefEnc::Value, false, acc, maxv, nullptr, nullptr, \
+		PREF_MEMBER(memb, std::uint16_t), 0, 0, minv, 0}
+
+// Scaled and bounded: bounds are in the API's unit, applied before scaling.
+#define PREF_U32_SCALED_DOMAIN(cat, key, tag, minv, maxv, acc, memb, scale) \
+	{cat, key, tag, PrefType::Uint32, PrefEnc::Value, false, acc, maxv, nullptr, nullptr, \
+		PREF_MEMBER(memb, std::uint32_t), 0, scale, minv, 0}
+
+#define PREF_STR(cat, key, tag, acc, memb) \
+	{cat, key, tag, PrefType::String, PrefEnc::Value, false, acc, 0u, nullptr, nullptr, PREF_MEMBER(memb, std::string), 0}
+
+#define PREF_STRARR(cat, key, tag, acc, memb) \
+	{cat, key, tag, PrefType::StringArray, PrefEnc::Value, false, acc, 0u, nullptr, nullptr, PREF_MEMBER(memb, std::vector<std::string>), 0}
+
+#define PREF_ENUM(cat, key, tag, names, acc, memb) \
+	{cat, key, tag, PrefType::Enum, PrefEnc::Value, false, acc, 0u, names, nullptr, PREF_MEMBER(memb, std::string), 0}
+
+#define PREF_MD4(cat, key, tag, acc, memb) \
+	{cat, key, tag, PrefType::Md4Hex, PrefEnc::Value, false, acc, 0u, nullptr, nullptr, PREF_MEMBER(memb, std::string), 0}
+
+// Write-only rows have no backing member: nothing is ever read back for them.
+#define PREF_PASSWD_PLAIN(cat, key, tag) \
+	{cat, key, tag, PrefType::String, PrefEnc::Value, false, PrefAccess::WriteOnly, 0u, nullptr, nullptr, nullptr, 0}
+
+#define PREF_PASSWD_HASHED(cat, key, tag) \
+	{cat, key, tag, PrefType::Md4Hex, PrefEnc::Value, false, PrefAccess::WriteOnly, 0u, nullptr, nullptr, nullptr, 0}
+
+// Rejected rows carry no usable tag; they exist so the PATCH walker can answer
+// with a pointer to the endpoint that does own the field.
+#define PREF_REJECT(cat, key) \
+	{cat, key, 0, PrefType::String, PrefEnc::Value, false, PrefAccess::Rejected, 0u, nullptr, nullptr, nullptr, 0}
+
+const PrefField kSchema = {
+	// general
+	// Value, not Presence: the core emits EC_TAG_GENERAL_CHECK_NEW_VERSION unconditionally as a
+	// value tag, so presence-decoding it pinned the answer to true and a read-modify-write of any
+	// other preference re-enabled it.
+	PREF_BOOL("general", "version_check_enabled", EC_TAG_GENERAL_CHECK_NEW_VERSION, PrefEnc::Value, false, PrefAccess::ReadWrite, version_check_enabled),
+	PREF_STR("general", "daemon_host_name", EC_TAG_USER_HOST, PrefAccess::ReadOnly, daemon_host_name),
+	PREF_STR("general", "nickname", EC_TAG_USER_NICK, PrefAccess::ReadWrite, nickname),
+	PREF_MD4("general", "user_hash", EC_TAG_USER_HASH, PrefAccess::ReadOnly, user_hash),
+
+	// connection
+	PREF_BOOL("connection", "autoconnect", EC_TAG_CONN_AUTOCONNECT, PrefEnc::Presence, false, PrefAccess::ReadWrite, autoconnect),
+	PREF_STR("connection", "bind_address", EC_TAG_CONN_BIND_ADDRESS, PrefAccess::ReadWrite, bind_address),
+	PREF_STR("connection", "bind_interface", EC_TAG_CONN_BIND_INTERFACE, PrefAccess::ReadWrite, bind_interface),
+	PREF_BOOL("connection", "extended_udp_port_enabled", EC_TAG_CONN_UDP_DISABLE, PrefEnc::Presence, true, PrefAccess::ReadWrite, extended_udp_port_enabled),
+	PREF_U32("connection", "max_connection_count", EC_TAG_CONN_MAX_CONN, 65535u, PrefAccess::ReadWrite, max_connection_count),
+	PREF_U32("connection", "max_download_kibibytes_per_second", EC_TAG_CONN_MAX_DL, 1000000000u, PrefAccess::ReadWrite, max_download_kibibytes_per_second),
+	PREF_U32("connection", "max_sources_per_file_count", EC_TAG_CONN_MAX_FILE_SOURCES, 65535u, PrefAccess::ReadWrite, max_sources_per_file_count),
+	PREF_U32("connection", "max_upload_kibibytes_per_second", EC_TAG_CONN_MAX_UL, 1000000000u, PrefAccess::ReadWrite, max_upload_kibibytes_per_second),
+	PREF_BOOL("connection", "ed2k_enabled", EC_TAG_NETWORK_ED2K, PrefEnc::Presence, false, PrefAccess::ReadWrite, ed2k_enabled),
+	PREF_BOOL("connection", "kad_enabled", EC_TAG_NETWORK_KADEMLIA, PrefEnc::Presence, false, PrefAccess::ReadWrite, kad_enabled),
+	PREF_BOOL("connection", "proxy_auth_enabled", EC_TAG_PROXY_AUTH, PrefEnc::Value, false, PrefAccess::ReadWrite, proxy_auth_enabled),
+	PREF_BOOL("connection", "proxy_enabled", EC_TAG_PROXY_ENABLE, PrefEnc::Value, false, PrefAccess::ReadWrite, proxy_enabled),
+	PREF_STR("connection", "proxy_host", EC_TAG_PROXY_HOST, PrefAccess::ReadWrite, proxy_host),
+	PREF_U16("connection", "proxy_port", EC_TAG_PROXY_PORT, 65535u, PrefAccess::ReadWrite, proxy_port),
+	PREF_ENUM("connection", "proxy_type", EC_TAG_PROXY_TYPE, kProxyTypes, PrefAccess::ReadWrite, proxy_type),
+	PREF_STR("connection", "proxy_user", EC_TAG_PROXY_USER, PrefAccess::ReadWrite, proxy_user),
+	PREF_BOOL("connection", "reconnect_on_connection_loss", EC_TAG_CONN_RECONNECT, PrefEnc::Presence, false, PrefAccess::ReadWrite, reconnect_on_connection_loss),
+	// 65532, not 65535: SetPort() substitutes DEFAULT_TCP_PORT when val + 3 exceeds 65535, the
+	// server UDP socket being TCP+3. A 65534 here was a 200 that left the daemon on 4662.
+	PREF_U16_DOMAIN("connection", "tcp_port", EC_TAG_CONN_TCP_PORT, 1u, 65532u, PrefAccess::ReadWrite, tcp_port),
+	PREF_U16("connection", "udp_port", EC_TAG_CONN_UDP_PORT, 65535u, PrefAccess::ReadWrite, udp_port),
+	// Floor of 1: SetSlotAllocation clamps anything lower up to 1, so
+	// without the bound a 0 answered 200 and read back as 1.
+	PREF_U32_DOMAIN("connection", "upload_slot_min_kibibytes_per_second", EC_TAG_CONN_SLOT_ALLOCATION, 1u, 65535u, 0u, PrefAccess::ReadWrite, upload_slot_min_kibibytes_per_second),
+	PREF_BOOL_INGROUP("connection", "upnp_supported", EC_TAG_GENERAL_UPNP_AVAILABLE, PrefEnc::Value, PrefAccess::ReadOnly, upnp_supported, EC_TAG_PREFS_GENERAL),
+	PREF_BOOL("connection", "upnp_enabled", EC_TAG_CONN_UPNP_ENABLED, PrefEnc::Value, false, PrefAccess::ReadWrite, upnp_enabled),
+	PREF_U16("connection", "upnp_control_point_port", EC_TAG_CONN_UPNP_TCP_PORT, 65535u, PrefAccess::ReadWrite, upnp_control_point_port),
+	PREF_PASSWD_PLAIN("connection", "proxy_password", EC_TAG_PROXY_PASSWORD),
+
+	// directories
+	PREF_BOOL("directories", "rescan_on_startup", EC_TAG_DIRECTORIES_AUTO_RESCAN, PrefEnc::Presence, false, PrefAccess::ReadWrite, directories.rescan_on_startup),
+	PREF_STR("directories", "exclude_patterns", EC_TAG_DIRECTORIES_EXCLUDE_PATTERNS, PrefAccess::ReadWrite, directories.exclude_patterns),
+	PREF_BOOL("directories", "exclude_patterns_use_regex", EC_TAG_DIRECTORIES_EXCLUDE_REGEX, PrefEnc::Value, false, PrefAccess::ReadWrite, directories.exclude_patterns_use_regex),
+	PREF_BOOL("directories", "follow_symlinks", EC_TAG_DIRECTORIES_FOLLOW_SYMLINKS, PrefEnc::Presence, false, PrefAccess::ReadWrite, directories.follow_symlinks),
+	PREF_STR("directories", "incoming_path", EC_TAG_DIRECTORIES_INCOMING, PrefAccess::ReadWrite, directories.incoming_path),
+	PREF_BOOL("directories", "share_hidden", EC_TAG_DIRECTORIES_SHARE_HIDDEN, PrefEnc::Presence, false, PrefAccess::ReadWrite, directories.share_hidden),
+	PREF_STRARR("directories", "shared_paths", EC_TAG_DIRECTORIES_SHARED, PrefAccess::ReadWrite, directories.shared_paths),
+	PREF_STR("directories", "temp_path", EC_TAG_DIRECTORIES_TEMP, PrefAccess::ReadWrite, directories.temp_path),
+
+	// files
+	PREF_BOOL("files", "add_new_downloads_paused", EC_TAG_FILES_NEW_PAUSED, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.add_new_downloads_paused),
+	PREF_BOOL("files", "trust_unverified_aich_hashes", EC_TAG_FILES_AICH_TRUST, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.trust_unverified_aich_hashes),
+	PREF_BOOL("files", "create_sparse_files", EC_TAG_FILES_CREATE_NORMAL, PrefEnc::Presence, true, PrefAccess::ReadWrite, files.create_sparse_files),
+	PREF_BOOL("files", "endgame_mode_enabled", EC_TAG_FILES_ENDGAME, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.endgame_mode_enabled),
+	PREF_STR("files", "ffprobe_path", EC_TAG_FILES_MEDIA_FFPROBE_PATH, PrefAccess::ReadWrite, files.ffprobe_path),
+	PREF_BOOL("files", "ich_enabled", EC_TAG_FILES_ICH_ENABLED, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.ich_enabled),
+	PREF_BOOL("files", "media_metadata_enabled", EC_TAG_FILES_MEDIA_METADATA_ENABLED, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.media_metadata_enabled),
+	PREF_U32("files", "min_free_space_mebibytes", EC_TAG_FILES_MIN_FREE_SPACE, 0xFFFFFFFFu, PrefAccess::ReadWrite, files.min_free_space_mebibytes),
+	PREF_BOOL_GATED("files", "mmap_enabled", EC_TAG_FILES_MMAP_ENABLED, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.mmap_enabled, "mmap_supported"),
+	PREF_BOOL("files", "mmap_supported", EC_TAG_FILES_MMAP_SUPPORTED, PrefEnc::Presence, false, PrefAccess::ReadOnly, files.mmap_supported),
+	PREF_BOOL("files", "new_downloads_auto_priority_enabled", EC_TAG_FILES_NEW_AUTO_DL_PRIO, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.new_downloads_auto_priority_enabled),
+	PREF_BOOL("files", "new_shared_files_auto_priority_enabled", EC_TAG_FILES_NEW_AUTO_UL_PRIO, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.new_shared_files_auto_priority_enabled),
+	PREF_BOOL("files", "preallocate_full_file_size", EC_TAG_FILES_ALLOC_FULL_SIZE, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.preallocate_full_file_size),
+	PREF_BOOL("files", "prioritize_first_last_chunks", EC_TAG_FILES_PREVIEW_PRIO, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.prioritize_first_last_chunks),
+	PREF_BOOL("files", "save_sources_for_rare_files", EC_TAG_FILES_SAVE_SOURCES, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.save_sources_for_rare_files),
+	PREF_BOOL("files", "on_finished_start_next_alphabetically", EC_TAG_FILES_START_NEXT_ALPHA, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.on_finished_start_next_alphabetically),
+	PREF_BOOL("files", "on_finished_start_next_paused", EC_TAG_FILES_START_NEXT_PAUSED, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.on_finished_start_next_paused),
+	PREF_BOOL("files", "on_finished_start_next_in_same_category", EC_TAG_FILES_RESUME_SAME_CAT, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.on_finished_start_next_in_same_category),
+	PREF_BOOL("files", "stop_on_low_disk_space", EC_TAG_FILES_CHECK_FREE_SPACE, PrefEnc::Presence, false, PrefAccess::ReadWrite, files.stop_on_low_disk_space),
+
+	// servers
+	PREF_BOOL("servers", "update_list_at_startup", EC_TAG_SERVERS_AUTO_UPDATE, PrefEnc::Presence, false, PrefAccess::ReadWrite, servers.update_list_at_startup),
+	PREF_BOOL("servers", "autoconnect_static_servers_only", EC_TAG_SERVERS_AUTOCONN_STATIC_ONLY, PrefEnc::Presence, false, PrefAccess::ReadWrite, servers.autoconnect_static_servers_only),
+	PREF_U32("servers", "dead_server_retry_count", EC_TAG_SERVERS_DEAD_SERVER_RETRIES, 65535u, PrefAccess::ReadWrite, servers.dead_server_retry_count),
+	PREF_BOOL("servers", "manual_servers_high_priority", EC_TAG_SERVERS_MANUAL_HIGH_PRIO, PrefEnc::Presence, false, PrefAccess::ReadWrite, servers.manual_servers_high_priority),
+	PREF_BOOL("servers", "remove_dead_servers", EC_TAG_SERVERS_REMOVE_DEAD, PrefEnc::Presence, false, PrefAccess::ReadWrite, servers.remove_dead_servers),
+	PREF_BOOL("servers", "safe_server_connect_enabled", EC_TAG_SERVERS_SAFE_SERVER_CONNECT, PrefEnc::Presence, false, PrefAccess::ReadWrite, servers.safe_server_connect_enabled),
+	PREF_BOOL("servers", "smart_lowid_check_enabled", EC_TAG_SERVERS_SMART_ID_CHECK, PrefEnc::Presence, false, PrefAccess::ReadWrite, servers.smart_lowid_check_enabled),
+	PREF_BOOL("servers", "update_list_from_client", EC_TAG_SERVERS_ADD_FROM_CLIENT, PrefEnc::Presence, false, PrefAccess::ReadWrite, servers.update_list_from_client),
+	PREF_BOOL("servers", "update_list_from_server", EC_TAG_SERVERS_ADD_FROM_SERVER, PrefEnc::Presence, false, PrefAccess::ReadWrite, servers.update_list_from_server),
+	PREF_STR("servers", "update_url", EC_TAG_SERVERS_UPDATE_URL, PrefAccess::ReadWrite, servers.update_url),
+	PREF_BOOL("servers", "server_priority_system_enabled", EC_TAG_SERVERS_USE_SCORE_SYSTEM, PrefEnc::Presence, false, PrefAccess::ReadWrite, servers.server_priority_system_enabled),
+
+	// security
+	PREF_BOOL("security", "ipfilter_auto_update_enabled", EC_TAG_IPFILTER_AUTO_UPDATE, PrefEnc::Presence, false, PrefAccess::ReadWrite, security.ipfilter_auto_update_enabled),
+	PREF_U32("security", "ipfilter_min_access_level", EC_TAG_IPFILTER_LEVEL, 255u, PrefAccess::ReadWrite, security.ipfilter_min_access_level),
+	PREF_BOOL("security", "ipfilter_clients_enabled", EC_TAG_IPFILTER_CLIENTS, PrefEnc::Presence, false, PrefAccess::ReadWrite, security.ipfilter_clients_enabled),
+	PREF_BOOL("security", "ipfilter_include_lan_ips", EC_TAG_IPFILTER_FILTER_LAN, PrefEnc::Presence, false, PrefAccess::ReadWrite, security.ipfilter_include_lan_ips),
+	PREF_BOOL("security", "ipfilter_servers_enabled", EC_TAG_IPFILTER_SERVERS, PrefEnc::Presence, false, PrefAccess::ReadWrite, security.ipfilter_servers_enabled),
+	PREF_STR("security", "ipfilter_update_url", EC_TAG_IPFILTER_UPDATE_URL, PrefAccess::ReadWrite, security.ipfilter_update_url),
+	PREF_BOOL("security", "protocol_obfuscation_enabled", EC_TAG_SECURITY_OBFUSCATION_SUPPORTED, PrefEnc::Presence, false, PrefAccess::ReadWrite, security.protocol_obfuscation_enabled),
+	PREF_BOOL("security", "obfuscation_requested", EC_TAG_SECURITY_OBFUSCATION_REQUESTED, PrefEnc::Presence, false, PrefAccess::ReadWrite, security.obfuscation_requested),
+	PREF_BOOL("security", "obfuscation_required", EC_TAG_SECURITY_OBFUSCATION_REQUIRED, PrefEnc::Presence, false, PrefAccess::ReadWrite, security.obfuscation_required),
+	PREF_BOOL("security", "reject_spoofed_source_ips", EC_TAG_IPFILTER_PARANOID, PrefEnc::Presence, false, PrefAccess::ReadWrite, security.reject_spoofed_source_ips),
+	PREF_ENUM("security", "shared_files_visibility", EC_TAG_SECURITY_CAN_SEE_SHARES, kSharedFilesVisibility, PrefAccess::ReadWrite, security.shared_files_visibility),
+	PREF_BOOL("security", "secure_identification_enabled", EC_TAG_SECURITY_USE_SECIDENT, PrefEnc::Presence, false, PrefAccess::ReadWrite, security.secure_identification_enabled),
+	PREF_BOOL("security", "system_ipfilter_enabled", EC_TAG_IPFILTER_SYSTEM, PrefEnc::Presence, false, PrefAccess::ReadWrite, security.system_ipfilter_enabled),
+
+	// message_filter
+	PREF_BOOL("message_filter", "accept_from_friends_only", EC_TAG_MSGFILTER_FRIENDS, PrefEnc::Presence, false, PrefAccess::ReadWrite, message_filter.accept_from_friends_only),
+	PREF_BOOL("message_filter", "accept_from_known_clients_only", EC_TAG_MSGFILTER_SECURE, PrefEnc::Presence, false, PrefAccess::ReadWrite, message_filter.accept_from_known_clients_only),
+	PREF_BOOL("message_filter", "filter_by_keyword", EC_TAG_MSGFILTER_BY_KEYWORD, PrefEnc::Presence, false, PrefAccess::ReadWrite, message_filter.filter_by_keyword),
+	PREF_STR("message_filter", "comment_keywords", EC_TAG_MSGFILTER_COMMENT_KEYWORDS, PrefAccess::ReadWrite, message_filter.comment_keywords),
+	PREF_BOOL("message_filter", "enabled", EC_TAG_MSGFILTER_ENABLED, PrefEnc::Presence, false, PrefAccess::ReadWrite, message_filter.enabled),
+	PREF_BOOL("message_filter", "filter_all_messages", EC_TAG_MSGFILTER_ALL, PrefEnc::Presence, false, PrefAccess::ReadWrite, message_filter.filter_all_messages),
+	PREF_BOOL("message_filter", "filter_comments", EC_TAG_MSGFILTER_FILTER_COMMENTS, PrefEnc::Presence, false, PrefAccess::ReadWrite, message_filter.filter_comments),
+	PREF_STR("message_filter", "keywords", EC_TAG_MSGFILTER_KEYWORDS, PrefAccess::ReadWrite, message_filter.keywords),
+	PREF_BOOL("message_filter", "log_filtered_messages", EC_TAG_MSGFILTER_SHOW_IN_LOG, PrefEnc::Presence, false, PrefAccess::ReadWrite, message_filter.log_filtered_messages),
+
+	// remote_controls.webserver
+	PREF_BOOL("remote_controls.webserver", "enabled", EC_TAG_WEBSERVER_AUTORUN, PrefEnc::Presence, false, PrefAccess::ReadWrite, remote_controls.webserver.enabled),
+	// Its partner `remote_controls.webserver.guest_password` deliberately has NO row here, and
+	// that is not an oversight -- neither access level fits. The two share one EC tag
+	// (EC_TAG_WEBSERVER_GUEST carries the enable bool with the password hash as a child), so a
+	// WriteOnly row would send the generic loop at the tag a second time behind the bespoke
+	// packing; and Bespoke rows are emitted on GET, which a password must never be. It is applied
+	// only by the hand-written branch in Api.cpp and documented in REFERENCE.md.
+	PREF_BOOL("remote_controls.webserver", "guest_enabled", EC_TAG_WEBSERVER_GUEST, PrefEnc::Presence, false, PrefAccess::Bespoke, remote_controls.webserver.guest_enabled),
+	PREF_U32("remote_controls.webserver", "port", EC_TAG_WEBSERVER_PORT, 65535u, PrefAccess::ReadWrite, remote_controls.webserver.port),
+	PREF_U32("remote_controls.webserver", "refresh_seconds", EC_TAG_WEBSERVER_REFRESH, 0xFFFFFFFFu, PrefAccess::ReadWrite, remote_controls.webserver.refresh_seconds),
+	PREF_STR("remote_controls.webserver", "template_name", EC_TAG_WEBSERVER_TEMPLATE, PrefAccess::ReadWrite, remote_controls.webserver.template_name),
+	PREF_BOOL("remote_controls.webserver", "gzip_enabled", EC_TAG_WEBSERVER_USEGZIP, PrefEnc::Presence, false, PrefAccess::ReadWrite, remote_controls.webserver.gzip_enabled),
+	PREF_PASSWD_HASHED("remote_controls.webserver", "password", EC_TAG_PASSWD_HASH),
+
+	// remote_controls.amuleapi
+	PREF_STR("remote_controls.amuleapi", "bind_address", EC_TAG_AMULEAPI_BIND, PrefAccess::ReadWrite, remote_controls.amuleapi.bind_address),
+	PREF_BOOL("remote_controls.amuleapi", "enabled", EC_TAG_AMULEAPI_AUTORUN, PrefEnc::Presence, false, PrefAccess::ReadWrite, remote_controls.amuleapi.enabled),
+	PREF_U32("remote_controls.amuleapi", "port", EC_TAG_AMULEAPI_PORT, 65535u, PrefAccess::ReadWrite, remote_controls.amuleapi.port),
+	PREF_REJECT("remote_controls.amuleapi", "password"),
+	PREF_REJECT("remote_controls.amuleapi", "guest_password"),
+	PREF_REJECT("remote_controls.amuleapi", "guest_enabled"),
+
+	// online_signature
+	PREF_STR("online_signature", "directory", EC_TAG_ONLINESIG_DIRECTORY, PrefAccess::ReadWrite, online_signature.directory),
+	PREF_BOOL("online_signature", "enabled", EC_TAG_ONLINESIG_ENABLED, PrefEnc::Presence, false, PrefAccess::ReadWrite, online_signature.enabled),
+	// 65535, not the uint32 ceiling: CPreferences::SetOSUpdate takes a uint16, so anything larger
+	// wraps on the way in -- 86400 (daily) became 20864 and the PATCH still reported success.
+	PREF_U32("online_signature", "update_frequency_seconds", EC_TAG_ONLINESIG_UPDATE, 65535u, PrefAccess::ReadWrite, online_signature.update_frequency_seconds),
+
+	// advanced (EC group: CORETWEAKS)
+	// s_iFileBufferSize is a uint8 holding val/15000, so the domain is 255 blocks of 15000 bytes
+	// and nothing between them.
+	PREF_U32_DOMAIN("advanced", "file_buffer_bytes", EC_TAG_CORETW_FILEBUFFER, 0u, 3825000u, 15000u, PrefAccess::ReadWrite, advanced.file_buffer_bytes),
+	// LoadAllItems() clamps this to 5..50 on the next start, so anything else
+	// was a value GET reported until the daemon was restarted.
+	PREF_U32_DOMAIN("advanced", "kad_max_concurrent_source_search_count", EC_TAG_CORETW_KAD_MAX_SEARCHES, 5u, 50u, 0u, PrefAccess::ReadWrite, advanced.kad_max_concurrent_source_search_count),
+	PREF_U32_SCALED_DOMAIN("advanced", "kad_source_reask_minutes", EC_TAG_CORETW_KAD_REASK_MS, 30u, 60u, PrefAccess::ReadWrite, advanced.kad_source_reask_minutes, 60000u),
+	// s_MaxConperFive is a uint16; 70000 wrapped to 4464.
+	PREF_U32_DOMAIN("advanced", "max_new_connections_per_5_seconds", EC_TAG_CORETW_MAX_CONN_PER_FIVE, 0u, 65535u, 0u, PrefAccess::ReadWrite, advanced.max_new_connections_per_5_seconds),
+	// s_iQueueSize is a uint8 holding val/100: 255 hundreds, nothing between.
+	PREF_U32_DOMAIN("advanced", "max_upload_queue_client_count", EC_TAG_CORETW_UL_QUEUE, 0u, 25500u, 100u, PrefAccess::ReadWrite, advanced.max_upload_queue_client_count),
+	PREF_U32_SCALED("advanced", "server_keepalive_timeout_minutes", EC_TAG_CORETW_SRV_KEEPALIVE_TIMEOUT, 71582u, PrefAccess::ReadWrite, advanced.server_keepalive_timeout_minutes, 60000u),
+	// The 15-minute floor is load-bearing: the UDP reask goes out at
+	// getter - 20s, and below ~10 min peers auto-ban for reask spam.
+	PREF_U32_SCALED_DOMAIN("advanced", "source_reask_minutes", EC_TAG_CORETW_SOURCE_REASK_MS, 15u, 60u, PrefAccess::ReadWrite, advanced.source_reask_minutes, 60000u),
+	PREF_BOOL("advanced", "verbose_logging", EC_TAG_CORETW_VERBOSE, PrefEnc::Presence, false, PrefAccess::ReadWrite, advanced.verbose_logging),
+
+	// kad (EC group: KADEMLIA)
+	PREF_STR("kad", "update_url", EC_TAG_KADEMLIA_UPDATE_URL, PrefAccess::ReadWrite, kad.update_url),
+
+	// geoip (EC group: IP2COUNTRY)
+	PREF_BOOL("geoip", "auto_update_enabled", EC_TAG_IP2COUNTRY_AUTO_UPDATE, PrefEnc::Value, false, PrefAccess::ReadWrite, geoip.auto_update_enabled),
+	PREF_STR("geoip", "custom_update_url", EC_TAG_IP2COUNTRY_CUSTOM_URL, PrefAccess::ReadWrite, geoip.custom_update_url),
+	PREF_BOOL("geoip", "db_loaded", EC_TAG_IP2COUNTRY_DB_LOADED, PrefEnc::Value, false, PrefAccess::ReadOnly, geoip.db_loaded),
+	PREF_STR("geoip", "db_path", EC_TAG_IP2COUNTRY_DB_PATH, PrefAccess::ReadOnly, geoip.db_path),
+	PREF_BOOL("geoip", "download_in_progress", EC_TAG_IP2COUNTRY_DOWNLOADING, PrefEnc::Value, false, PrefAccess::ReadOnly, geoip.download_in_progress),
+	PREF_BOOL("geoip", "enabled", EC_TAG_IP2COUNTRY_ENABLED, PrefEnc::Value, false, PrefAccess::ReadWrite, geoip.enabled),
+	PREF_STR("geoip", "last_update_status", EC_TAG_IP2COUNTRY_LAST_RESULT, PrefAccess::ReadOnly, geoip.last_update_status),
+	PREF_STR("geoip", "loaded_source", EC_TAG_IP2COUNTRY_LOADED_SOURCE, PrefAccess::ReadOnly, geoip.loaded_source),
+	PREF_STR("geoip", "maxmind_license", EC_TAG_IP2COUNTRY_MAXMIND_LICENSE, PrefAccess::ReadWrite, geoip.maxmind_license),
+	PREF_ENUM("geoip", "source", EC_TAG_IP2COUNTRY_SOURCE, kIp2CountrySources, PrefAccess::ReadWrite, geoip.source),
+	PREF_BOOL("geoip", "supported", EC_TAG_IP2COUNTRY_SUPPORTED, PrefEnc::Value, false, PrefAccess::ReadOnly, geoip.supported),
+	// `update_now` is POST /geoip/update, an action, not a setting. The row stays Rejected
+	// so a client sending it here is told where it went.
+	PREF_REJECT("geoip", "update_now"),
+};
+
+const PrefCategory kCategories = {
+	{"general", EC_TAG_PREFS_GENERAL},
+	{"connection", EC_TAG_PREFS_CONNECTIONS},
+	{"directories", EC_TAG_PREFS_DIRECTORIES},
+	{"files", EC_TAG_PREFS_FILES},
+	{"servers", EC_TAG_PREFS_SERVERS},
+	{"security", EC_TAG_PREFS_SECURITY},
+	{"message_filter", EC_TAG_PREFS_MESSAGEFILTER},
+	// Both nested remote-control sub-objects pack into the one EC group.
+	{"remote_controls.webserver", EC_TAG_PREFS_REMOTECTRL},
+	{"remote_controls.amuleapi", EC_TAG_PREFS_REMOTECTRL},
+	{"online_signature", EC_TAG_PREFS_ONLINESIG},
+	// `advanced`, not `core_tweaks`: there is no such amule.conf section, "core"
+	// means nothing to an API consumer, and the desktop tab is called Advanced.
+	{"advanced", EC_TAG_PREFS_CORETWEAKS},
+	// Everything else in the API says kad.
+	{"kad", EC_TAG_PREFS_KADEMLIA},
+	// The rest of the API says GeoIP (country_code, /flags/{code}.png).
+	{"geoip", EC_TAG_PREFS_IP2COUNTRY},
+};
+
+// clang-format on
+
+} // namespace
+
+const PrefField *PrefSchema()
+{
+	return kSchema;
+}
+
+std::size_t PrefSchemaSize()
+{
+	return sizeof(kSchema) / sizeof(kSchema0);
+}
+
+const PrefCategory *PrefCategories()
+{
+	return kCategories;
+}
+
+std::size_t PrefCategoryCount()
+{
+	return sizeof(kCategories) / sizeof(kCategories0);
+}
+
+ec_tagname_t PrefGroupTagFor(const char *category)
+{
+	for (std::size_t i = 0; i < PrefCategoryCount(); ++i) {
+		if (std::strcmp(kCategoriesi.name, category) == 0)
+			return kCategoriesi.group_tag;
+	}
+	return 0;
+}
+
+} // namespace webapi

amule-3.1.0.tar.gz/src/webapi/PrefsSchema.h Added

@@ -0,0 +1,152 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+
+#ifndef WEBAPI_PREFSSCHEMA_H
+#define WEBAPI_PREFSSCHEMA_H
+
+#include <cstddef>
+#include <cstdint>
+
+#include "ECCodes.h" // ec_tagname_t
+#include "State.h"
+
+namespace webapi
+{
+
+// One declarative description of every field on /api/v1/preferences, used by all three code paths
+// that touch them: the EC decode (Refresher), the GET emitter and the PATCH applier (Api). Before
+// this table each field was spelled out three times in three different idioms, which is how a
+// rename could land in two places and be missed in the third.
+//
+// Adding a preference is one row. Renaming one is one token. Changing a field's polarity is
+// flipping `invert` -- it is data here, not code.
+//
+// The table deliberately does NOT describe the EC protocol, only how the API maps onto it: tag
+// numbers, presence-vs-value encodings and the one inverted tag are properties of EC and are
+// recorded, not chosen, here.
+
+enum class PrefType
+{
+	Bool,        // JSON bool
+	Uint16,      // JSON number, u16 member
+	Uint32,      // JSON number, u32 member
+	String,      // JSON string
+	StringArray, // JSON array of strings, packed as EC_TAG_STRING children
+	Enum,        // JSON string drawn from `enum_names`, EC carries the index
+	Md4Hex,      // read-only hex rendering of an EC MD4 hash (general.user_hash)
+};
+
+// How EC encodes a boolean *on the read path*. The core serializer emits most bools as a bare
+// CECEmptyTag only when true (presence == true) but a handful as a value tag every time. Writes are
+// always value tags, since amuleapi sends SET_PREFERENCES at EC_DETAIL_FULL where ApplyBoolean
+// reads GetInt() != 0.
+enum class PrefEnc
+{
+	Presence,
+	Value,
+};
+
+enum class PrefAccess
+{
+	ReadWrite, // emitted on GET, applied on PATCH
+	ReadOnly,  // emitted on GET, silently ignored on PATCH (capabilities, live status)
+	WriteOnly, // never emitted, applied on PATCH (passwords)
+	Rejected,  // never emitted, 400 if sent -- the field belongs to another endpoint
+	Bespoke,   // emitted on GET, PATCH handled by dedicated code (see below)
+};
+
+// `Bespoke` exists for exactly one field: remote_controls.webserver.guest_enabled and its
+// guest_password share a single EC tag, so there is no 1:1 field-to-tag mapping for the table to
+// express. Its GET emission is still table-driven; only the PATCH packing is hand-written.
+
+struct PrefField
+{
+	const char *category; // dotted path, e.g. "files" or "remote_controls.webserver"
+	const char *key;      // JSON key within that category
+	ec_tagname_t tag;
+	PrefType type;
+	PrefEnc enc;
+	bool invert; // API value is the negation of the EC value (read and write)
+	PrefAccess access;
+	std::uint32_t max; // inclusive upper bound for Uint16 / Uint32
+	// Enum only: nullptr-terminated, in wire order -- a name's index is the
+	// integer the daemon's Apply() casts back to its own enum.
+	const char *const *enum_names;
+	// Capability key in the same category that must not be false, else 409.
+	const char *gated_by;
+	// Address of the backing member. The row's PrefType fixes the cast; the
+	// PREF_* macros static_assert the two agree, so a mismatch is a build error.
+	void *(*member)(PreferencesSnapshot &);
+	// EC group this field's tag actually lives in, when that is not the group its JSON category
+	// maps to. 0 means "the category's own group". Exactly one field needs it:
+	// connection.upnp_supported is a daemon capability the core serializes into General, but
+	// the API surfaces it under `connection`.
+	ec_tagname_t read_group;
+	// Divisor between the EC value and the API value, when the two use different units. 0 means
+	// "same unit", which is every row but three.
+	//
+	// The core stores those three as whole minutes and its accessors multiply by 60000 on the
+	// way out, so EC carries milliseconds that are always a multiple of 60000. Exposing that
+	// verbatim meant a client writing 90000 read back 60000 and one writing 30000 read back 0
+	// -- accepted, reported as success, changed underneath.
+	std::uint32_t ec_scale;
+	// Inclusive lower bound for Uint16 / Uint32, checked with `max` against the value the
+	// caller sent. 0 for a row with no floor, which is most of them.
+	//
+	// `max` alone is not a domain. A core member narrower than the declared ceiling wraps, and
+	// a setter that divides truncates, so a value inside 0, max can still be rewritten on the
+	// way in -- and three of these fields are clamped by CPreferences::LoadAllItems() at the
+	// NEXT daemon start, which no read-back check after the PATCH can see.
+	std::uint32_t min;
+	// Granularity the core can actually store, when its setter divides. A value that is not a
+	// multiple is a 400 naming the step, rather than a silent truncation: SetFileBufferSize()
+	// is `val / 15000` into a uint8, so 20000 becomes 15000 and 14999 becomes 0. 0 means the
+	// row is not quantised.
+	//
+	// Rejecting rather than renaming the field to its stored unit is deliberate, and the
+	// opposite of what the three `_minutes` rows do: those quantise to a unit a user already
+	// thinks in, while nobody thinks in 15000-byte blocks.
+	std::uint32_t step;
+};
+
+// EC group tag each category packs into. Two categories intentionally share one group
+// (remote_controls.webserver / .amuleapi both live in EC_TAG_PREFS_REMOTECTRL): the JSON nesting is
+// an API shape, not an EC one.
+struct PrefCategory
+{
+	const char *name;
+	ec_tagname_t group_tag;
+};
+
+const PrefField *PrefSchema();
+std::size_t PrefSchemaSize();
+const PrefCategory *PrefCategories();
+std::size_t PrefCategoryCount();
+
+// Convenience for callers that walk a single category.
+ec_tagname_t PrefGroupTagFor(const char *category);
+
+} // namespace webapi
+
+#endif // WEBAPI_PREFSSCHEMA_H

amule-3.1.0.tar.gz/src/webapi/README.md Added

@@ -0,0 +1,123 @@
+# aMule Web frontend
+
+A from-scratch web frontend for aMule that talks to the
+amuleapi(../../docs/QUICKSTART-AMULEAPI.md) REST + SSE surface. Views are
+preact(https://preactjs.com) components written with
+htm(https://github.com/developit/htm) (JSX-like tagged templates, no
+transpilation). **No build step, no bundler, no npm/CDN at runtime** — every
+asset (including the libraries) is vendored under `static/`, resolved by a
+native browser import map(static/index.html), and served as-is.
+
+## Layout
+
+`static/` holds **only** servable static content, so it is copied verbatim on
+install. The dev-only `tools/` and this README live one level up.
+
+```
+src/webapi/
+  README.md               this file
+  tools/run-dev.sh        one-command dev launcher (amuled/amule + amuleapi)
+  tools/update-vendor.sh  re-download / upgrade the vendored libraries
+  static/                 servable static bundle (installed as amuleapi-static)
+    index.html            single-page app entry point (+ import map)
+    css/                  styles (app.css)
+    js/                   ES modules: app, api, store, events, dom, format,
+                          components, charts, icons, theme, i18n, views/
+    js/vendor/            vendored third-party libs (+ their LICENSE)
+    img/                  icons
+    i18n/                 UI translations (flat JSON, en.json is the source)
+```
+
+## Translations (frontend)
+
+Every user-facing string goes through `t()` / `tn()` in `static/js/i18n.js`;
+the dictionaries are flat `key -> string` JSON files under `static/i18n/`
+(Weblate's "JSON file" format, `en.json` as the template). The language is
+picked from localStorage (`amule.lang`, set by the toolbar EN/ES button) or
+the browser language, falling back to English per missing key. To add a
+language: copy `en.json`, translate, add its code to `LANGS` in
+`static/js/i18n.js`, and run `node src/webapi/tools/check-i18n.mjs` (verifies all
+locales have exactly the source keys with matching `{placeholders}`).
+
+## Vendored libraries
+
+Third-party libraries are vendored locally (no CDN, no npm at runtime). The
+bare specifiers are wired to these files by the import map in `static/index.html`.
+
+| Library | Specifier | Version | File | License |
+|---------|-----------|---------|------|---------|
+| preact(https://preactjs.com) | `preact` | 10.29.2 | `static/js/vendor/preact.module.js` | MIT |
+| preact hooks | `preact/hooks` | 10.29.2 | `static/js/vendor/hooks.module.js` | MIT |
+| htm(https://github.com/developit/htm) | `htm` | 3.1.1 | `static/js/vendor/htm.module.js` | MIT |
+
+Each vendored file carries its name and version as a comment on the first line,
+and ships next to its `*.LICENSE`.
+
+### Updating vendored libraries
+
+Versions are pinned as constants at the top of `tools/update-vendor.sh`. To
+upgrade (or re-download), edit the relevant `*_VERSION` and run the script:
+
+```sh
+src/webapi/tools/update-vendor.sh
+```
+
+It downloads the minified ES modules into `static/js/vendor/`, prepends the
+name + version comment, and refreshes the `*.LICENSE` files.
+
+## Running
+
+`amuleapi` serves this frontend itself (via its `StaticRoot` config key) on the
+same origin as the REST + SSE API, so there is no separate static server: you
+just run a backend + `amuleapi` and open the amuleapi URL.
+
+### Option A — dev launcher (recommended while iterating)
+
+`tools/run-dev.sh` brings the whole stack up in one command, in an **isolated**
+config dir (default `~/.aMule-dev`, never touches your real `~/.aMule`): it
+enables EC, sets the web admin/guest passwords, points amuleapi's `StaticRoot`
+at `static/`, starts the backend, and runs amuleapi in the foreground. Edit the
+HTML/JS/CSS under `static/` and just reload the browser.
+
+```sh
+src/webapi/tools/run-dev.sh          # amuled backend (default)
+src/webapi/tools/run-dev.sh amule    # amule GUI backend (needs a display)
+src/webapi/tools/run-dev.sh stop     # stop the dev processes
+```
+
+Then open `http://127.0.0.1:4713/` and log in (default `admin` / `guest`).
+
+Requires the binaries to be built — `amuleapi` (`cmake -DBUILD_AMULEAPI=ON`) and
+the chosen backend (`-DBUILD_DAEMON=ON` for `amuled`, or the default
+`-DBUILD_MONOLITHIC=ON` for `amule`). The script prints the exact CMake flag if a
+binary is missing.
+
+Key environment overrides: `HTTP_PORT` (default 4713), `EC_PORT` (4712),
+`CONFIG_DIR` (`~/.aMule-dev`), `ADMIN_PASS`/`GUEST_PASS`, `EC_PASS`, `BUILD_DIR`,
+`STATIC_DIR`.
+
+### Option B — manual / installed deployment
+
+After `make install`, the bundle ships to
+`${CMAKE_INSTALL_DATADIR}/amule/amuleapi-static` (e.g.
+`/usr/share/amule/amuleapi-static`). An empty `StaticRoot` (the default) makes
+the daemon auto-discover that installed location, so an installed amuleapi
+serves the frontend out of the box — no config needed.
+
+To serve a bundle from elsewhere (e.g. a source tree without installing), point
+`StaticRoot` at it explicitly and restart amuleapi:
+
+```ini
+Server
+StaticRoot=/path/to/aMule/src/webapi/static
+```
+
+Then open `http://127.0.0.1:4713/`.
+
+## Constraints
+
+- preact + htm via native ES modules and an import map — no build step, no
+  bundler. Responsive (phone / tablet / desktop).
+- Zero runtime downloads; third-party libs are vendored under
+  `static/js/vendor/` with their license.
+- Authenticates via the amuleapi session cookie (never stores the JWT).

amule-3.1.0.tar.gz/src/webapi/RangeFileBody.h Added

@@ -0,0 +1,284 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_RANGEFILEBODY_H
+#define WEBAPI_RANGEFILEBODY_H
+
+// A Boost.Beast message Body that serialises a bounded byte window first, last (inclusive, RFC
+// 9110 range semantics) out of a file on disk, using a fixed-size read buffer.
+//
+// Why this instead of beast::http::file_body: stock `basic_file_body` can start a response at an
+// arbitrary offset but cannot stop before EOF. Its `value_type::seek(offset, ec)` is
+//
+//     file_.seek(offset, ec);
+//     file_size_ = file_.size(ec);
+//     file_size_ -= file_.pos(ec);      // i.e. "everything left in the file"
+//
+// so the cached body size -- the number `Body::size()` reports, and therefore the `Content-Length`
+// `prepare_payload()` stamps -- is always `size - first`. A `Range: bytes=0-1023` over a 4 GiB file
+// would advertise and then actually write 4 GiB. There is no hook to bound the END of the window,
+// which is the half of a byte range that matters here, so the writer has to be our own.
+//
+// Why it matters for memory: the alternative, the `string_body` path every other amuleapi response
+// uses, materialises the whole body in RAM. amuleapi runs a 16-thread handler pool
+// (kHandlerPoolThreads), so serving shared content out of a buffered body means up to 16 x filesize
+// resident, with filesize routinely in the gigabytes for ed2k content. This body reads through one
+// `kRangeFileReadChunkBytes` buffer owned by the writer, so the resident cost of a response is O(1)
+// in the file size. That buffer is heap-allocated on first use rather than held inline in the
+// writer, because the writer is stored by value inside the serializer and the serializer sits in a
+// `boost::optional` member of every Session -- see writer::m_buf.
+//
+// Scope: serialisation only. amuleapi never PARSES a file body -- nothing uploads into a file
+// through this transport -- so the `reader` half of the Body concept is deliberately absent.
+// `http::response_serializer` only ever instantiates `writer`, so the type still satisfies
+// everything the write path asks for; a parser instantiated over this Body would fail to compile,
+// which is the correct outcome rather than a silently wrong one.
+
+// BOOST FLOOR: everything used here must exist in Boost 1.70 (MIN_BOOST_VERSION), which is close to
+// what ubuntu:22.04's libboost-dev ships and therefore what the AppImage actually compiles amuleapi
+// against -- unlike the Flatpak, it does not build the pinned 1.87 from source, and packaging.yml
+// only fires on push to master, so a too-new API breaks AFTER merge with nothing on the PR to catch
+// it. Two such traps are documented at their use sites below.
+
+#include <boost/asio/buffer.hpp>
+#include <boost/assert.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/core/file.hpp>
+#include <boost/beast/core/file_base.hpp>
+#include <boost/beast/http/error.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/core/ignore_unused.hpp>
+#include <boost/optional.hpp>
+
+#include <cstdint>
+#include <cstring>
+#include <memory>
+#include <string>
+#include <utility>
+
+// Size of the writer's read buffer, and therefore the largest single chunk handed to the socket. 64
+// KiB is comfortably larger than a typical 16-64 KiB socket send buffer -- so the syscall count is
+// bounded by the socket, not by us -- while still small enough that a handful can be in flight at
+// the file-response concurrency cap. It is heap-allocated by the writer on first use, so a
+// connection that never streams a file never allocates it.
+constexpr std::size_t kRangeFileReadChunkBytes = 64 * 1024;
+
+// Boost.Beast Body concept implementation. `File` is the Beast file abstraction
+// to use; the default resolves to the native POSIX or Win32 implementation.
+template <class File = boost::beast::file> struct BasicRangeFileBody
+{
+	static_assert(boost::beast::is_file<File>::value, "File type requirements not met");
+
+	using file_type = File;
+
+	class value_type;
+	class writer;
+	// No `reader`: see the SCOPE note at the top of this file.
+
+	// Called from message::payload_size, which is what prepare_payload() uses to
+	// stamp Content-Length. Returns the size of the WINDOW, not of the file.
+	static std::uint64_t size(const value_type &body) { return body.size(); }
+};
+
+// The `message::body` member for a message declared with this Body. Owns the
+// open file handle, so the descriptor's lifetime is exactly the response's.
+template <class File> class BasicRangeFileBody<File>::value_type
+{
+	friend class writer;
+	friend struct BasicRangeFileBody;
+
+	File m_file;
+	// Size of the file as observed at open() time. Cached because the window validation below
+	// needs something stable to compare against: answering a Range with a Content-Length
+	// derived from a moving size is how a response ends up contradicting its own framing.
+	std::uint64_t m_file_size = 0;
+	// Inclusive window. Only meaningful once SetWindow() has succeeded;
+	// m_have_window keeps a caller that forgot from serialising byte 0 alone.
+	std::uint64_t m_first = 0;
+	std::uint64_t m_last = 0;
+	bool m_have_window = false;
+	// Kept for diagnostics only -- the open handle is what is actually read.
+	std::string m_path;
+
+public:
+	value_type() = default;
+	~value_type() = default;
+	value_type(value_type &&other) = default;
+	value_type &operator=(value_type &&other) = default;
+
+	// Open `path` for reading and cache its size. On success the window is
+	// still unset; call SetWindow() before serialising.
+	void Open(const char *path, boost::beast::error_code &ec)
+	{
+		m_file.open(path, boost::beast::file_mode::read, ec);
+		if (ec) {
+			return;
+		}
+		m_file_size = m_file.size(ec);
+		if (ec) {
+			Close();
+			return;
+		}
+		m_path = path;
+		m_have_window = false;
+	}
+
+	void Close()
+	{
+		boost::beast::error_code ignored;
+		m_file.close(ignored);
+		m_have_window = false;
+	}
+
+	bool IsOpen() const { return m_file.is_open(); }
+
+	// Size of the file as seen at Open() time. The caller needs this to turn
+	// a `Range` header into a concrete window and to fill `Content-Range`.
+	std::uint64_t FileSize() const { return m_file_size; }
+
+	const std::string &Path() const { return m_path; }
+
+	// Set the inclusive byte window to serialise. Rejects anything that does not describe at
+	// least one real byte of the file, rather than clamping: the caller has already put a
+	// `Content-Range` on the response describing the window it asked for. Failing here leaves
+	// the headers still ours to change.
+	void SetWindow(std::uint64_t first, std::uint64_t last, boost::beast::error_code &ec)
+	{
+		if (!m_file.is_open() || first > last || first >= m_file_size || last >= m_file_size) {
+			// Plain assignment rather than BOOST_BEAST_ASSIGN_EC: that macro is a
+			// private Beast detail header and does not exist in 1.70 -- see the BOOST
+			// FLOOR note at the top. Only the diagnostic location is lost.
+			ec = boost::beast::http::error::bad_field;
+			m_have_window = false;
+			return;
+		}
+		m_first = first;
+		m_last = last;
+		m_have_window = true;
+		ec = {};
+	}
+
+	// Number of bytes this body will put on the wire -- the inclusive window length. Zero
+	// before SetWindow(), so a forgotten call shows up as an empty response rather than an
+	// unbounded one.
+	std::uint64_t size() const { return m_have_window ? (m_last - m_first + 1) : 0; }
+
+	std::uint64_t First() const { return m_first; }
+	std::uint64_t Last() const { return m_last; }
+
+	File &file() { return m_file; }
+};
+
+// Serialisation half of the Body concept: hands the serializer one buffer at a
+// time until the window is exhausted.
+template <class File> class BasicRangeFileBody<File>::writer
+{
+	value_type &m_body;
+	// Bytes of the window not yet handed to the serializer.
+	std::uint64_t m_remain;
+	// Heap, not `char m_bufkRangeFileReadChunkBytes`. `response_serializer` stores its
+	// `writer wr_` BY VALUE, and the transport parks that serializer in a `boost::optional`
+	// member of every Session, which reserves its storage inline whether or not it is ever
+	// engaged -- so an inline array charged 64 KiB to every connection, an hours-long SSE
+	// stream included. Allocated lazily in get(), which a HEAD never reaches.
+	std::unique_ptr<char> m_buf;
+
+public:
+	using const_buffers_type = boost::asio::const_buffer;
+
+	// The message is taken by non-const reference because reading advances the file cursor:
+	// logically non-const even though it is bitwise const. Same trade stock file_body makes --
+	// one thread may serialise a given body.
+	template <bool isRequest, class Fields>
+	writer(boost::beast::http::header<isRequest, Fields> &h, value_type &b)
+	: m_body(b)
+	, m_remain(b.size())
+	{
+		boost::ignore_unused(h);
+		BOOST_ASSERT(m_body.m_file.is_open());
+	}
+
+	// Runs before any body byte is produced. This is where the file cursor is placed at the
+	// start of the window.
+	//
+	// NOTE FOR HEAD: `serializer::next` calls init() even in split mode. That is intended -- a
+	// seek moves a cursor, it reads nothing -- and it is why a HEAD costs one open plus one
+	// lseek and not a single byte of I/O.
+	void init(boost::beast::error_code &ec)
+	{
+		m_body.m_file.seek(m_body.m_first, ec);
+		if (ec) {
+			return;
+		}
+		ec = {};
+	}
+
+	// Called repeatedly until it returns boost::none. Reads at most whatever is
+	// left of the window, so we can never over-read past `last`.
+	boost::optional<std::pair<const_buffers_type, bool>> get(boost::beast::error_code &ec)
+	{
+		const std::size_t amount = m_remain > kRangeFileReadChunkBytes
+						   ? kRangeFileReadChunkBytes
+						   : static_cast<std::size_t>(m_remain);
+
+		// Window fully served, or the degenerate zero-length case. Tested before
+		// the allocation below, so the no-bytes case stays allocation-free.
+		if (amount == 0) {
+			ec = {};
+			return boost::none;
+		}
+
+		if (!m_buf) {
+			// Throwing new, not nothrow: a failed 64 KiB allocation is a process
+			// already past saving, and the bad_alloc propagates out of the async op
+			// into the same connection teardown the read-error branch produces.
+			m_buf.reset(new charkRangeFileReadChunkBytes);
+		}
+
+		const std::size_t nread = m_body.m_file.read(m_buf.get(), amount, ec);
+		if (ec) {
+			return boost::none;
+		}
+		// A short read is legal and handled by returning fewer bytes; a ZERO-length read is
+		// not, because we asked for bytes the cached size said were there. That means the
+		// file was truncated under us mid-response, and there is no honest way to finish a
+		// body whose Content-Length is already on the wire. `partial_message` and not the
+		// more descriptive `short_read`: that enumerator arrived in Boost 1.73 -- see the
+		// BOOST FLOOR note at the top.
+		if (nread == 0) {
+			ec = boost::beast::http::error::partial_message;
+			return boost::none;
+		}
+		BOOST_ASSERT(nread <= m_remain);
+
+		m_remain -= nread;
+		ec = {};
+		return { { const_buffers_type{ m_buf.get(), nread }, m_remain > 0 } };
+	}
+};
+
+// The type the transport actually uses.
+using RangeFileBody = BasicRangeFileBody<boost::beast::file>;
+
+#endif // WEBAPI_RANGEFILEBODY_H

amule-3.1.0.tar.gz/src/webapi/Refresher.cpp Added

@@ -0,0 +1,2937 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// Pure EC-tag-to-State translation layer. No CamuleapiApp dependency
+// -- the per-tick orchestration (`RefresherTick` + `TwoPhaseRefresh`)
+// lives in RefresherTick.cpp so the unit tests can link these
+// transformations in isolation.
+
+#include "Refresher.h"
+
+#include "ClientTagNames.h" // Needed for the shared client-tag token decoders
+
+#include "PrefsSchema.h"
+
+#include "State.h"
+
+#include "Constants.h"                            // PS_* / PR_* / US_* / DS_* / OBST_* enums
+#include "OtherFunctions.h"                       // GetFiletypeByName for the search-result `type`
+#include <common/Path.h>                          // CPath
+#include "ClientList.h"                           // buddyState enum (Disconnected/Connecting/Connected)
+#include "ClientCredits.h"                        // EIdentState (IS_NOTAVAILABLE / IS_IDENTIFIED / ...)
+#include "Server.h"                               // SRV_PR_* server priority constants
+#include "RLE.h"                                  // PartFileEncoderData (stateful gap/part decoder)
+#include "Types.h"                                // ArrayOfUInts16 / ArrayOfUInts64
+#include "include/protocol/ed2k/ClientSoftware.h" // SO_* client-software enum
+#include "kademlia/utils/UInt128.h"               // CUInt128 (EC_TAG_KAD_ID payload)
+
+#include <ec/cpp/ECSpecialTags.h>
+#include <ec/cpp/ECPacket.h>
+
+#include <tags/FileTags.h> // ED2KFTSTR_* search terms for SearchFileTypeTerm
+
+#include <map>
+#include <algorithm>
+#include <cctype>
+#include <cstdio>
+#include <cstring>
+#include <set>
+#include <string>
+
+namespace webapi
+{
+
+const char *ClientSoftwareName(std::uint32_t code)
+{
+	// Subset that covers the bulk of the live ed2k population -- every client we would ever
+	// realistically meet on the wire. SO_UNKNOWN and SO_COMPAT_UNK collapse to "unknown" /
+	// "compat" so consumers see a stable label even when amuled could not fingerprint the
+	// peer's software.
+	switch (code) {
+	case SO_EMULE:
+		return "emule";
+	case SO_CDONKEY:
+		return "cdonkey";
+	case SO_LXMULE:
+		return "lxmule";
+	case SO_AMULE:
+		return "amule";
+	case SO_SHAREAZA:
+	case SO_NEW2_SHAREAZA:
+	case SO_NEW_SHAREAZA:
+		return "shareaza";
+	case SO_EMULEPLUS:
+		return "emule_plus";
+	case SO_HYDRANODE:
+		return "hydranode";
+	case SO_NEW2_MLDONKEY:
+	case SO_MLDONKEY:
+	case SO_NEW_MLDONKEY:
+		return "mldonkey";
+	case SO_LPHANT:
+		return "lphant";
+	case SO_EDONKEYHYBRID:
+		return "edonkey_hybrid";
+	case SO_EDONKEY:
+		return "edonkey";
+	case SO_OLDEMULE:
+		return "old_emule";
+	case SO_UNKNOWN:
+		return "unknown";
+	case SO_COMPAT_UNK:
+		return "compat";
+	default:
+		return "unknown";
+	}
+}
+const char *ClientObfuscationName(std::uint8_t code)
+{
+	switch (code) {
+	case OBST_UNDEFINED:
+		return "undefined";
+	case OBST_ENABLED:
+		return "enabled";
+	case OBST_SUPPORTED:
+		return "supported";
+	case OBST_NOT_SUPPORTED:
+		return "not_supported";
+	case OBST_DISABLED:
+		return "disabled";
+	default:
+		return "unknown";
+	}
+}
+// Map EC_TAG_CLIENT_FROM (ESourceFrom, Constants.h) to a stable lowercase token,
+// mirroring the GUI's Origin column without leaking the daemon locale.
+std::string SourceOriginName(std::uint32_t from)
+{
+	switch (from) {
+	case SF_LOCAL_SERVER:
+		return "local_server";
+	case SF_REMOTE_SERVER:
+		return "remote_server";
+	case SF_KADEMLIA:
+		return "kad";
+	case SF_SOURCE_EXCHANGE:
+		return "source_exchange";
+	case SF_PASSIVE:
+		return "passive";
+	case SF_LINK:
+		return "link";
+	case SF_SOURCE_SEEDS:
+		return "source_seeds";
+	case SF_SEARCH_RESULT:
+		return "search_result";
+	default:
+		return "unknown";
+	}
+}
+
+namespace
+{
+
+const char *Ed2kStateString(const CEC_ConnState_Tag *conn)
+{
+	if (!conn)
+		return "disconnected";
+	if (conn->IsConnectedED2K())
+		return "connected";
+	if (conn->IsConnectingED2K())
+		return "connecting";
+	return "disconnected";
+}
+
+const char *KadStateString(const CEC_ConnState_Tag *conn)
+{
+	// Kad has a "running but disconnected" mode (peer-discovery active, no contact-routing
+	// yet); collapse it into "connecting" so the API surface uses three states uniformly for
+	// both networks.
+	if (!conn || !conn->IsKadRunning())
+		return "disabled";
+	if (conn->IsConnectedKademlia())
+		return "connected";
+	return "connecting";
+}
+
+// As above, but an unset address formats as empty rather than "0.0.0.0". The peer and
+// server fields use 0 for "not known" and emit the key as null on it, whereas the Kad
+// fields report the quad verbatim -- the only difference there has ever been between
+// these two.
+std::string FormatClientIpv4(std::uint32_t ip_lsb_first)
+{
+	return ip_lsb_first == 0 ? std::string() : IPv4ToDotted(ip_lsb_first);
+}
+
+} // namespace
+
+void ParseStatusFromPacket(const CECPacket *resp, StatusSnapshot &out)
+{
+	if (!resp)
+		return;
+
+	const CEC_ConnState_Tag *conn =
+		static_cast<const CEC_ConnState_Tag *>(resp->GetTagByName(EC_TAG_CONNSTATE));
+
+	out.ed2k_state = Ed2kStateString(conn);
+	out.kad_state = KadStateString(conn);
+
+	if (conn) {
+		// Only meaningful while connected: with no EC_TAG_ED2K_ID the id reads 0, and
+		// HasLowID() is "id < HIGHEST_LOWID_ED2K_KAD", so a disconnected daemon would
+		// otherwise be reported as a LowID.
+		out.ed2k_high_id = conn->IsConnectedED2K() && !conn->HasLowID();
+		// Gated: IsKadFirewalled() reads a connstate bit that survives a disconnect, so an
+		// unconnected daemon answered `true` -- a reachability verdict about a network it is
+		// not on.
+		if (conn->IsConnectedKademlia()) {
+			out.kad_firewalled_tcp = conn->IsKadFirewalled();
+			out.has_kad_firewalled_tcp = true;
+		}
+		if (conn->IsConnectedED2K()) {
+			// 0xffffffff is the "connect in flight, no id yet" sentinel
+			// (ECSpecialCoreTags.cpp) and must not reach a consumer.
+			const std::uint32_t id = static_cast<std::uint32_t>(conn->GetEd2kId());
+			if (id != 0xffffffffu) {
+				out.ed2k_user_id = id;
+				// A HighID *is* our public address, LSB-first, the same layout
+				// EC_TAG_CLIENT_USER_IP uses. A LowID is a small number the server
+				// picked and carries no address.
+				if (out.ed2k_high_id) {
+					out.ed2k_public_ip = IPv4ToDotted(id);
+				}
+			}
+			const CECTag *server = conn->GetTagByName(EC_TAG_SERVER);
+			if (server) {
+				const CECTag *name = server->GetTagByName(EC_TAG_SERVER_NAME);
+				if (name) {
+					out.server_name = std::string(name->GetStringData().utf8_str());
+				}
+				// Not StringIP(): every overload appends ":port" and wraps the result
+				// in brackets, which would contradict `server_ip`'s declared dotted-quad
+				// contract. The port stays in
+				// `server_port`.
+				out.server_ip = FormatClientIpv4(server->GetIPv4Data().IP());
+				out.server_port = server->GetIPv4Data().m_port;
+			}
+			uint32 ed2kSince = 0;
+			if (conn->GetED2KConnectedSince(ed2kSince)) {
+				out.ed2k_connected_since = ed2kSince;
+			}
+		}
+		if (conn->IsConnectedKademlia()) {
+			uint32 kadSince = 0;
+			if (conn->GetKadConnectedSince(kadSince)) {
+				out.kad_connected_since = kadSince;
+			}
+		}
+	}
+
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_DL_SPEED)) {
+		out.download_bytes_per_second = static_cast<std::uint64_t>(t->GetInt());
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_UL_SPEED)) {
+		out.upload_bytes_per_second = static_cast<std::uint64_t>(t->GetInt());
+	}
+	// Overhead rates and free space ride the same EC_DETAIL_FULL response. The two disk
+	// figures are cast through int64 on purpose: amuled's FREE_SPACE_UNKNOWN is -1 and the
+	// serializer casts it to uint64, so an unsigned read would turn "unknown" into
+	// 18446744073709551615.
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_UP_OVERHEAD)) {
+		out.upload_overhead_bytes_per_second = static_cast<std::uint64_t>(t->GetInt());
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_DOWN_OVERHEAD)) {
+		out.download_overhead_bytes_per_second = static_cast<std::uint64_t>(t->GetInt());
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_TEMP_FREE_SPACE)) {
+		out.temp_free_bytes = static_cast<std::int64_t>(t->GetInt());
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_INCOMING_FREE_SPACE)) {
+		out.incoming_free_bytes = static_cast<std::int64_t>(t->GetInt());
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_UL_QUEUE_LEN)) {
+		out.ul_queue_len = static_cast<std::uint32_t>(t->GetInt());
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_TOTAL_SRC_COUNT)) {
+		out.total_src_count = static_cast<std::uint32_t>(t->GetInt());
+	}
+	// ed2k network aggregate -- the same EC_OP_STAT_REQ response already carries KAD_USERS /
+	// KAD_FILES, plus ED2K_USERS / ED2K_FILES next to them, so /status can surface
+	// ed2k.network.{users,files} with no extra roundtrip.
+	//
+	// Gated on being connected: amuled emits these tags unconditionally, above its own `if
+	// (IsConnected())` block, and CServerList::GetUserFileStatus sums the whole known server
+	// list, so nothing zeroes them on disconnect.
+	if (out.ed2k_state == "connected") {
+		if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_ED2K_USERS)) {
+			out.ed2k_users = static_cast<std::uint32_t>(t->GetInt());
+		}
+		if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_ED2K_FILES)) {
+			out.ed2k_files = static_cast<std::uint32_t>(t->GetInt());
+		}
+		out.has_ed2k_network = true;
+	}
+	// Version-check result, present only once the daemon has completed a check.
+	// LATEST carries the release string; OUTDATED is an empty presence marker.
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_GENERAL_VERSION_CHECK_LATEST)) {
+		out.version_check_done = true;
+		out.version_check_latest = std::string(t->GetStringData().utf8_str());
+		out.version_check_outdated =
+			resp->GetTagByName(EC_TAG_GENERAL_VERSION_CHECK_OUTDATED) != nullptr;
+		if (const CECTag *ts = resp->GetTagByName(EC_TAG_GENERAL_VERSION_CHECK_TIMESTAMP)) {
+			out.version_check_timestamp = static_cast<std::uint64_t>(ts->GetInt());
+		}
+	}
+	// Nickname intentionally absent: it is not shipped in the EC_OP_STAT_REQ
+	// response, and /preferences exposes it instead.
+}
+
+namespace
+{
+
+// PartFile status code (PS_*, Constants.h) -> wire string. amule has more codes than the
+// API surface. "downloading" is overloaded: it covers PS_READY (the daemon's
+// "transferring" state) AND PS_EMPTY (no sources right now but the file is not paused) --
+// clients distinguish by reading `speed_bytes_per_second` and `sources.transferring`.
+const char *DownloadStatusName(std::uint8_t ps_code, bool stopped)
+{
+	// PS_COMPLETE / PS_COMPLETING take priority over `stopped`: amuled holds finished
+	// downloads in `m_completedDownloads` with EC_TAG_PARTFILE_STOPPED set, so a naive `if
+	// (stopped) return "paused"` early-out masks every cleared-pending file as still-paused.
+	// The "completed" wire string is reserved for "in m_completedDownloads, awaiting clear".
+	if (ps_code == PS_COMPLETE)
+		return "completed";
+	if (ps_code == PS_COMPLETING)
+		return "completing";
+
+	if (stopped)
+		return "stopped"; // stop = pause + drop all sources +
+				  // stop searching; the daemon reports it as PS_PAUSED with
+				  // EC_TAG_PARTFILE_STOPPED set, surfaced here as a distinct
+				  // wire status so clients can tell it apart from a plain
+				  // pause (see /downloads PATCH status="stopped")
+	switch (ps_code) {
+	case PS_READY:
+		return "downloading";
+	case PS_EMPTY:
+		return "downloading";
+	case PS_WAITING_FOR_HASH:
+		return "waiting";
+	case PS_HASHING:
+		return "hashing";
+	case PS_ERROR:
+		return "erroneous";
+	case PS_INSUFFICIENT:
+		return "insufficient_disk";
+	case PS_PAUSED:
+		return "paused";
+	case PS_ALLOCATING:
+		return "allocating";
+	default:
+		return "unknown";
+	}
+}
+
+// The auto-priority flag is encoded as `prio + 10`, NOT bit-7 (`& 0x80`) -- the pattern
+// amule-remote-gui.cpp uses. Same encoding for EC_TAG_KNOWNFILE_PRIO (shared, up-side) and
+// EC_TAG_PARTFILE_PRIO (downloads, down-side). Using bit-7 here silently mis-labels every
+// auto-priority entry as "normal", because the PR_* enum values are tiny and never overlap
+// 0x80.
+constexpr std::uint8_t kAutoPriorityOffset = 10;
+
+// Decodes the shared `+ 10` auto-flag offset carried by both EC_TAG_PARTFILE_PRIO and
+// EC_TAG_KNOWNFILE_PRIO: a raw code >= 10 is an auto entry whose base level is `raw - 10`.
+// Returns the base level as a wire string and reports the auto flag via `auto_out`.
+const char *PriorityName(std::uint8_t pr_code_raw, bool &auto_out)
+{
+	std::uint8_t pr;
+	if (pr_code_raw >= kAutoPriorityOffset) {
+		pr = pr_code_raw - kAutoPriorityOffset;
+		auto_out = true;
+	} else {
+		pr = pr_code_raw;
+		auto_out = false;
+	}
+	switch (pr) {
+	case PR_VERY_LOW:
+		return "very_low";
+	case PR_LOW:
+		return "low";
+	case PR_NORMAL:
+		return "normal";
+	case PR_HIGH:
+		return "high";
+	case PR_VERYHIGH:
+		return "release";
+	case PR_AUTO:
+		auto_out = true;
+		return "auto";
+	default:
+		return "normal";
+	}
+}
+
+} // namespace
+
+namespace
+{
+
+// Lowercase 32-char hex MD4 from a tag.
+std::string TagHashLower(const CEC_SharedFile_Tag *sf)
+{
+	std::string h(sf->FileHashString().utf8_str());
+	std::transform(h.begin(), h.end(), h.begin(), (unsigned char c) { return std::tolower(c); });
+	return h;
+}
+
+// Decode the base CKnownFile detail tags carried by BOTH EC_TAG_PARTFILE and
+// EC_TAG_KNOWNFILE (via the CEC_SharedFile_Tag base ctor), so the download and shared
+// detail endpoints share one decode. Detail-only, and INC-safe: only assigns when a tag is
+// present this frame.
+void MergeKnownFileDetail(const CECTag *t, FileSnapshot &f)
+{
+	if (const CECTag *aich = t->GetTagByName(EC_TAG_KNOWNFILE_AICH_MASTERHASH))
+		f.aich_hash = std::string(aich->GetStringData().utf8_str());
+	std::uint32_t q = 0;
+	if (t->AssignIfExist(EC_TAG_KNOWNFILE_ON_QUEUE, q))
+		f.queued_count = q;
+	if (const CECTag *fn = t->GetTagByName(EC_TAG_KNOWNFILE_FILENAME))
+		f.part_met_basename = std::string(fn->GetStringData().utf8_str());
+	if (const CECTag *pathTag = t->GetTagByName(EC_TAG_KNOWNFILE_PATH))
+		f.on_disk_dir = std::string(pathTag->GetStringData().utf8_str());
+	// The user's own comment + rating (issue #419).
+	if (const CECTag *cm = t->GetTagByName(EC_TAG_KNOWNFILE_COMMENT))
+		f.comment = std::string(cm->GetStringData().utf8_str());
+	std::uint32_t rt = 0;
+	if (t->AssignIfExist(EC_TAG_KNOWNFILE_RATING, rt))
+		f.rating = static_cast<std::int32_t>(rt);
+	// Audio/video media metadata. amuled emits these only for probed files, so
+	// any one present this frame marks the file as having media.
+	{
+		std::uint32_t v = 0;
+		if (t->AssignIfExist(EC_TAG_KNOWNFILE_MEDIA_LENGTH, v)) {
+			f.media.duration_seconds = v;
+		}
+		if (t->AssignIfExist(EC_TAG_KNOWNFILE_MEDIA_BITRATE, v)) {
+			f.media.bitrate_kilobits_per_second = v;
+		}
+	}
+	if (const CECTag *x = t->GetTagByName(EC_TAG_KNOWNFILE_MEDIA_CODEC)) {
+		f.media.codec = std::string(x->GetStringData().utf8_str());
+	}
+	if (const CECTag *x = t->GetTagByName(EC_TAG_KNOWNFILE_MEDIA_ARTIST)) {
+		f.media.artist = std::string(x->GetStringData().utf8_str());
+	}
+	if (const CECTag *x = t->GetTagByName(EC_TAG_KNOWNFILE_MEDIA_ALBUM)) {
+		f.media.album = std::string(x->GetStringData().utf8_str());
+	}
+	if (const CECTag *x = t->GetTagByName(EC_TAG_KNOWNFILE_MEDIA_TITLE)) {
+		f.media.title = std::string(x->GetStringData().utf8_str());
+	}
+	// Derived from what the snapshot now holds rather than latched true by whichever tag
+	// happened to arrive. A zero / empty value is the daemon clearing that field, so latching
+	// would report has_media on a file whose every field has since been cleared.
+	f.has_media = f.media.duration_seconds != 0 || f.media.bitrate_kilobits_per_second != 0 ||
+		      !f.media.codec.empty() || !f.media.artist.empty() || !f.media.album.empty() ||
+		      !f.media.title.empty();
+}
+
+// Merge a CEC_PartFile_Tag's PRESENT child tags into an existing FileSnapshot. Absent tags
+// leave the corresponding field unchanged -- that is the point of INC mode. Identity (name,
+// ed2k_link, size, priority) lives at the top level because both walkers populate it;
+// download-specific stats land in `f.download`. The caller sets f.ecid + f.hash on first
+// encounter and flips f.is_downloading. `is_new` is used only for the status-string
+// re-derive.
+void MergePartFileTag(const CEC_PartFile_Tag *pf, FileSnapshot &f, bool is_new)
+{
+	wxString fn;
+	if (pf->FileName(fn)) {
+		f.name = std::string(fn.utf8_str());
+	}
+	{
+		const wxString link = pf->FileEd2kLink();
+		if (!link.IsEmpty()) {
+			f.ed2k_link = std::string(link.utf8_str());
+		}
+	}
+	{
+		std::uint64_t v = f.size;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_SIZE_FULL, v))
+			f.size = v;
+	}
+	{
+		std::uint64_t v = f.download.completed_bytes;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_SIZE_DONE, v))
+			f.download.completed_bytes = v;
+	}
+	{
+		std::uint64_t v = f.download.transferred_bytes;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_SIZE_XFER, v))
+			f.download.transferred_bytes = v;
+	}
+	{
+		std::uint32_t v = f.download.speed_bytes_per_second;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_SPEED, v))
+			f.download.speed_bytes_per_second = v;
+	}
+	{
+		// Status + stopped flag interact -- re-derive the wire string
+		// whenever either changed.
+		std::uint8_t fs = 0;
+		bool stopped = false;
+		const bool fs_present = pf->AssignIfExist(EC_TAG_PARTFILE_STATUS, fs);
+		const bool stop_present = pf->AssignIfExist(EC_TAG_PARTFILE_STOPPED, stopped);
+		if (fs_present || stop_present || is_new) {
+			f.download.status = DownloadStatusName(
+				fs_present ? fs : pf->FileStatus(), stop_present ? stopped : pf->Stopped());
+		}
+	}
+	{
+		std::uint8_t pr_raw = 0;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_PRIO, pr_raw)) {
+			bool prio_auto = false;
+			f.download.priority = PriorityName(pr_raw, prio_auto);
+			f.download.priority_auto = prio_auto;
+		}
+	}
+	{
+		// Upload priority also rides on the partfile tag (the base CEC_SharedFile_Tag ctor adds
+		// EC_TAG_KNOWNFILE_PRIO). Capture it here, from the file's first downloading tick, so a
+		// partfile that starts sharing only later still has a shared `priority`: by then the tag
+		// is suppressed.
+		std::uint8_t up_raw = 0;
+		if (pf->AssignIfExist(EC_TAG_KNOWNFILE_PRIO, up_raw)) {
+			bool up_auto = false;
+			f.shared.priority = PriorityName(up_raw, up_auto);
+			f.shared.priority_auto = up_auto;
+		}
+	}
+	{
+		std::uint8_t cat = 0;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_CAT, cat))
+			f.download.category = cat;
+	}
+	{
+		std::uint16_t v = 0;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT, v))
+			f.download.sources_total = v;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT, v))
+			f.download.sources_unavailable = v;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT_XFER, v))
+			f.download.sources_transferring = v;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT_A4AF, v))
+			f.download.sources_a4af = v;
+	}
+	// Detail-only fields (surfaced on GET /downloads/{hash} only).
+	{
+		std::uint32_t v = 0;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_LAST_SEEN_COMP, v))
+			f.download.last_seen_complete_at = v;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_LAST_RECV, v))
+			f.download.last_received_at = v;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_DOWNLOAD_ACTIVE, v))
+			f.download.active_seconds = v;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_SAVED_ICH, v))
+			f.download.ich_recovered_packet_count = v;
+	}
+	{
+		std::uint16_t v = 0;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_AVAILABLE_PARTS, v))
+			f.download.available_part_count = v;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_HASHED_PART_COUNT, v))
+			f.download.hashed_part_count = v;
+	}
+	{
+		std::uint64_t v = 0;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_LOST_CORRUPTION, v))
+			f.download.lost_to_corruption_bytes = v;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_GAINED_COMPRESSION, v))
+			f.download.gained_by_compression_bytes = v;
+	}
+	// Per-source comments/ratings. The EC container packs four children per source, evaluated
+	// by index: username, filename, rating (int8; -1 = unrated), comment. Rebuild whenever the
+	// container is present -- it is CValueMap-suppressed when unchanged, so absent keeps the
+	// prior list.
+	if (const CECTag *cont = pf->GetTagByName(EC_TAG_PARTFILE_COMMENTS)) {
+		std::vector<const CECTag *> kids;
+		for (const CECTag &kid : *cont)
+			kids.push_back(&kid);
+		f.download.source_comments.clear();
+		for (std::size_t i = 0; i + 3 < kids.size(); i += 4) {
+			FileSnapshot::DownloadSide::SourceComment c;
+			c.username = std::string(kidsi->GetStringData().utf8_str());
+			c.filename = std::string(kidsi + 1->GetStringData().utf8_str());
+			c.rating =
+				static_cast<std::int32_t>(static_cast<std::int64_t>(kidsi + 2->GetInt()));
+			c.comment = std::string(kidsi + 3->GetStringData().utf8_str());
+			f.download.source_comments.push_back(std::move(c));
+		}
+	}
+	// Whether an on-demand Kad notes lookup is currently running (issue #434).
+	if (const CECTag *ks = pf->GetTagByName(EC_TAG_PARTFILE_KAD_COMMENT_SEARCHING)) {
+		f.download.kad_comment_searching = ks->GetInt() != 0;
+	}
+	// Source-reported filenames. amuled delta-encodes the container keyed by a stable per-name
+	// id: a child carrying a name subtag is a new/updated entry, a child with COUNTS==0 and no
+	// name is a removal, otherwise a count update. The container is only sent when something
+	// changed.
+	if (const CECTag *names = pf->GetTagByName(EC_TAG_PARTFILE_SOURCE_NAMES)) {
+		for (const CECTag &child : *names) {
+			const std::uint32_t id = static_cast<std::uint32_t>(child.GetInt());
+			const CECTag *name_tag = child.GetTagByName(EC_TAG_PARTFILE_SOURCE_NAMES);
+			const CECTag *count_tag = child.GetTagByName(EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS);
+			const std::uint32_t count =
+				count_tag ? static_cast<std::uint32_t>(count_tag->GetInt()) : 0;
+			if (name_tag) {
+				FileSnapshot::DownloadSide::SourceName sn;
+				sn.name = std::string(name_tag->GetStringData().utf8_str());
+				sn.count = count;
+				f.download.source_namesid = std::move(sn);
+			} else if (count == 0) {
+				f.download.source_names.erase(id);
+			} else {
+				auto mit = f.download.source_names.find(id);
+				if (mit != f.download.source_names.end())
+					mit->second.count = count;
+			}
+		}
+	}
+	// A4AF (issue #421): the auto flag + the full source-ECID list.
+	{
+		bool v = false;
+		if (pf->AssignIfExist(EC_TAG_PARTFILE_A4AFAUTO, v))
+			f.download.a4af_auto = v;
+	}
+	// amuled rebuilds the whole A4AF-source container when it changes, so
+	// replace the list wholesale when present (absent = unchanged, keep).
+	if (const CECTag *a4af = pf->GetTagByName(EC_TAG_PARTFILE_A4AF_SOURCES)) {
+		f.download.a4af_sources.clear();
+		for (const CECTag &src : *a4af)
+			f.download.a4af_sources.push_back(static_cast<std::uint32_t>(src.GetInt()));
+	}
+	// Base CKnownFile detail tags (aich_hash, upload_queue_count, part_file_name).
+	MergeKnownFileDetail(pf, f);
+	// Recompute percent unconditionally -- both inputs may have moved.
+	f.download.percent = (f.size > 0) ? (static_cast<double>(f.download.completed_bytes) * 100.0 /
+						    static_cast<double>(f.size))
+					  : 0.0;
+}
+
+// State-code -> wire-string decoders for the four enums amule ships on
+// EC_TAG_CLIENT_*_STATE. Wire forms are snake_case names of our own, not the Constants.h
+// identifiers lowercased, and all fall back to "unknown".
+
+const char *ClientUploadStateName(std::uint8_t code)
+{
+	switch (code) {
+	case US_UPLOADING:
+		return "uploading";
+	case US_ONUPLOADQUEUE:
+		return "queued";
+	case US_WAITCALLBACK:
+		return "waiting_callback";
+	case US_CONNECTING:
+		return "connecting";
+	case US_PENDING:
+		return "pending";
+	case US_LOWTOLOWIP:
+		return "low_to_low_ip";
+	case US_BANNED:
+		return "banned";
+	case US_ERROR:
+		return "error";
+	case US_NONE:
+		return "idle";
+	default:
+		return "unknown";
+	}
+}
+
+const char *ClientDownloadStateName(std::uint8_t code)
+{
+	switch (code) {
+	case DS_DOWNLOADING:
+		return "downloading";
+	case DS_ONQUEUE:
+		return "queued";
+	case DS_CONNECTED:
+		return "connected";
+	case DS_CONNECTING:
+		return "connecting";
+	case DS_WAITCALLBACK:
+		return "waiting_callback";
+	case DS_WAITCALLBACKKAD:
+		return "waiting_callback_kad";
+	case DS_REQHASHSET:
+		return "requesting_hashset";
+	case DS_NONEEDEDPARTS:
+		return "no_needed_parts";
+	case DS_TOOMANYCONNS:
+		return "too_many_connections";
+	case DS_TOOMANYCONNSKAD:
+		return "too_many_connections_kad";
+	case DS_LOWTOLOWIP:
+		return "low_to_low_ip";
+	case DS_BANNED:
+		return "banned";
+	case DS_ERROR:
+		return "error";
+	case DS_NONE:
+		return "idle";
+	case DS_REMOTEQUEUEFULL:
+		return "remote_queue_full";
+	default:
+		return "unknown";
+	}
+}
+
+const char *ClientIdentStateName(std::uint8_t code)
+{
+	switch (code) {
+	case IS_NOTAVAILABLE:
+		return "not_available";
+	case IS_IDNEEDED:
+		return "id_needed";
+	case IS_IDENTIFIED:
+		return "identified";
+	case IS_IDFAILED:
+		return "id_failed";
+	case IS_IDBADGUY:
+		return "bad_guy";
+	default:
+		return "unknown";
+	}
+}
+
+// Decode one per-part BitVector tag into a bool vector.
+//
+// Two shapes on the wire, and the empty one is the trap: for EC_TAG_CLIENT_PART_STATUS the
+// core sends a tag with no payload when the peer holds EVERY part, so an empty tag means
+// "full", not "unknown". The caller learns that through `out_all` because the true length
+// is the file's part count, which is known only where the row is rendered.
+//
+// The shorthand is download-side ONLY. EC_TAG_CLIENT_UPLOAD_PART_STATUS is always sent as
+// a buffer, so a full uploader arrives as an all-ones bitmap. An empty UPLOAD tag is narrow
+// but possible -- a zero-byte file, for which CKnownFile sets part count 0 -- and is dropped
+// by the renderer's `part_count == 0` guard, which is therefore load-bearing, not dead code.
+//
+// The buffer holds ceil(bits/8) bytes, so decoding yields a multiple of 8 and the tail
+// beyond the file's part count is padding for the renderer to trim.
+void DecodePartStatusTag(const CECTag *client_tag,
+	ec_tagname_t tag_name,
+	std::vector<bool> &out_bits,
+	bool &out_all,
+	bool &out_present)
+{
+	const CECTag *t = client_tag->GetTagByName(tag_name);
+	if (!t) {
+		return; // absent => unchanged
+	}
+	out_present = true;
+	if (!t->IsCustom() || t->GetTagDataLen() == 0) {
+		out_all = true;
+		out_bits.clear();
+		return;
+	}
+	out_all = false;
+	const auto *buf = static_cast<const std::uint8_t *>(t->GetTagData());
+	const std::size_t len = t->GetTagDataLen();
+	out_bits.assign(len * 8, false);
+	for (std::size_t i = 0; i < len * 8; ++i) {
+		out_bitsi = (bufi / 8 & (1u << (i & 7))) != 0;
+	}
+}
+
+// Merge a `CEC_UpDownClient_Tag` into an existing ClientSnapshot. On a cache-miss the
+// caller pre-populates ecid + hashes; on a hit the AssignIfExist pattern leaves cached
+// values intact when the tag is CValueMap-suppressed.
+void MergeClientTag(const CEC_UpDownClient_Tag *c, ClientSnapshot &cs, bool is_new, const FileMap &files)
+{
+	if (const CECTag *t = c->GetTagByName(EC_TAG_CLIENT_NAME)) {
+		cs.client_name = std::string(t->GetStringData().utf8_str());
+	}
+	if (const CECTag *t = c->GetTagByName(EC_TAG_CLIENT_HASH)) {
+		cs.user_hash = std::string(t->GetMD4Data().Encode().Lower().utf8_str());
+	}
+	{
+		std::uint32_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_USER_IP, v))
+			cs.ip = FormatClientIpv4(v);
+	}
+	{
+		std::uint16_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_USER_PORT, v))
+			cs.port = v;
+	}
+	// Peer country ISO code (#439). Tag-present (even empty) is the daemon's
+	// authoritative answer; tag-absent leaves the cached value intact.
+	if (const CECTag *t = c->GetTagByName(EC_TAG_CLIENT_COUNTRY)) {
+		cs.country_code = std::string(t->GetStringData().utf8_str());
+	}
+	std::uint32_t soft_code = static_cast<std::uint32_t>(SO_UNKNOWN);
+	if (c->AssignIfExist(EC_TAG_CLIENT_SOFTWARE, soft_code))
+		cs.software = ClientSoftwareName(soft_code);
+
+	// software_version: the daemon formats this with gettext -- an unidentified peer yields
+	// _("Unknown"), which is "Desconocido" on a Spanish daemon and would leak the daemon locale
+	// into the English-only API. So key off the locale-independent numeric software code
+	// instead: a peer the daemon could not identify (SO_UNKNOWN, exactly the branch that sets
+	// the translated string) never has the string read at all, and is left empty -- which
+	// reaches the wire as null, since software_version is free text, not an enum.
+	if (soft_code != static_cast<std::uint32_t>(SO_UNKNOWN)) {
+		if (const CECTag *t = c->GetTagByName(EC_TAG_CLIENT_SOFT_VER_STR)) {
+			cs.software_version = std::string(t->GetStringData().utf8_str());
+		}
+	}
+	// reported_os is the peer's own self-reported OS string (raw external data,
+	// not gettext-translated), so it carries no locale leak. Often empty.
+	if (const CECTag *t = c->GetTagByName(EC_TAG_CLIENT_OS_INFO)) {
+		cs.reported_os = std::string(t->GetStringData().utf8_str());
+	}
+	{
+		std::uint8_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_UPLOAD_STATE, v)) {
+			cs.upload_state = ClientUploadStateName(v);
+		} else if (is_new) {
+			cs.upload_state = "unknown";
+		}
+	}
+	{
+		std::uint8_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_DOWNLOAD_STATE, v)) {
+			cs.download_state = ClientDownloadStateName(v);
+		} else if (is_new) {
+			cs.download_state = "unknown";
+		}
+	}
+	{
+		std::uint8_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_IDENT_STATE, v)) {
+			cs.ident_state = ClientIdentStateName(v);
+		} else if (is_new) {
+			cs.ident_state = "unknown";
+		}
+	}
+	{
+		// Tag-present is the daemon's answer either way; tag-absent leaves the cached value
+		// alone. has_connected stays false only for a daemon that never sends it at all, and
+		// that reaches the wire as null.
+		bool v = false;
+		if (c->AssignIfExist(EC_TAG_CLIENT_CONNECTED, v)) {
+			cs.connected = v;
+			cs.has_connected = true;
+		}
+	}
+	// REMOTE_FILENAME = the file we are downloading from this peer
+	// (`m_clientFilename`, set from OP_REQFILENAMEANSWER). INC_UPDATE only.
+	wxString fn;
+	if (c->RemoteFilename(fn)) {
+		cs.download_file_name = std::string(fn.utf8_str());
+	}
+	// UPLOAD_FILE / REQUEST_FILE carry amuled-side ECIDs (the unified m_FileEncoder map's
+	// IDs), which is what `files` is keyed by, so resolve to MD4 hashes with a lookup per
+	// transferring peer. Empty hash if the ECID is not there -- the file may have been removed
+	// between the file walkers and this one.
+	//
+	// A zero ECID is the core saying "no file", not "unchanged". Reading 0 as absent left the
+	// last hash cached forever, so a peer that finished downloading kept its `role: "source"`
+	// row for as long as it stayed in clientlist.
+	//
+	// Whenever the hash moves, the matching per-part bitmap has to go with it:
+	// CUpDownClient::SetReqFile clears m_downPartStatus without repopulating it and the core
+	// then sends no PART_STATUS until the peer answers for the new file, so a bitmap kept
+	// across the change describes the OLD file.
+	{
+		std::uint32_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_UPLOAD_FILE, v)) {
+			std::string next;
+			if (v != 0) {
+				const auto it = files.find(v);
+				if (it != files.end())
+					next = it->second.hash;
+			}
+			if (next != cs.upload_file_hash) {
+				cs.upload_file_hash = std::move(next);
+				cs.upload_part_status.clear();
+				cs.upload_part_status_all = false;
+				cs.has_upload_part_status = false;
+			}
+		}
+	}
+	{
+		std::uint32_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_REQUEST_FILE, v)) {
+			std::string next;
+			if (v != 0) {
+				const auto it = files.find(v);
+				if (it != files.end())
+					next = it->second.hash;
+			}
+			if (next != cs.download_file_hash) {
+				cs.download_file_hash = std::move(next);
+				cs.part_status.clear();
+				cs.part_status_all = false;
+				cs.has_part_status = false;
+			}
+		}
+	}
+	{
+		std::uint64_t v = cs.uploaded_bytes_session;
+		if (c->AssignIfExist(EC_TAG_CLIENT_UPLOAD_SESSION, v))
+			cs.uploaded_bytes_session = v;
+	}
+	{
+		std::uint64_t v = cs.downloaded_bytes_session;
+		if (c->AssignIfExist(EC_TAG_PARTFILE_SIZE_XFER, v))
+			cs.downloaded_bytes_session = v;
+	}
+	{
+		std::uint64_t v = cs.uploaded_bytes_total;
+		if (c->AssignIfExist(EC_TAG_CLIENT_UPLOAD_TOTAL, v))
+			cs.uploaded_bytes_total = v;
+	}
+	{
+		std::uint64_t v = cs.downloaded_bytes_total;
+		if (c->AssignIfExist(EC_TAG_CLIENT_DOWNLOAD_TOTAL, v))
+			cs.downloaded_bytes_total = v;
+	}
+	{
+		std::uint32_t v = cs.upload_speed_bytes_per_second;
+		if (c->AssignIfExist(EC_TAG_CLIENT_UP_SPEED, v))
+			cs.upload_speed_bytes_per_second = v;
+	}
+	{
+		// EC_TAG_CLIENT_DOWN_SPEED is emitted as a double-encoded CECTag (KBps as a double).
+		// AssignIfExist with a uint will not pick it up cleanly, so extract via the typed read
+		// and convert.
+		if (const CECTag *t = c->GetTagByName(EC_TAG_CLIENT_DOWN_SPEED)) {
+			const double kBps = t->GetDoubleData();
+			cs.download_speed_bytes_per_second = static_cast<std::uint32_t>(kBps * 1024.0);
+		}
+	}
+	{
+		std::uint32_t v = cs.upload_queue_position;
+		if (c->AssignIfExist(EC_TAG_CLIENT_WAITING_POSITION, v))
+			cs.upload_queue_position = v;
+	}
+	{
+		std::uint16_t v = cs.remote_queue_position;
+		if (c->AssignIfExist(EC_TAG_CLIENT_REMOTE_QUEUE_RANK, v))
+			cs.remote_queue_position = v;
+	}
+	{
+		std::uint32_t v = cs.score;
+		if (c->AssignIfExist(EC_TAG_CLIENT_SCORE, v))
+			cs.score = v;
+	}
+	{
+		std::uint8_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_OBFUSCATION_STATUS, v)) {
+			cs.obfuscation_state = ClientObfuscationName(v);
+		}
+	}
+	{
+		// Taken as delivered. The daemon already dropped the bits it does not know
+		// (CPeerCapabilities::SetFromWire), and re-masking here would put a second copy of that
+		// mask in the tree, free to drift from the one that saw the handshake.
+		std::uint32_t v = cs.protocol_extensions;
+		if (c->AssignIfExist(EC_TAG_CLIENT_MOD_CAPABILITIES, v))
+			cs.protocol_extensions = v;
+	}
+	{
+		bool v = false;
+		if (c->AssignIfExist(EC_TAG_CLIENT_FRIEND_SLOT, v))
+			cs.friend_slot = v;
+	}
+
+	// --- Detail-only fields -----------------------------
+	// All already on the INC_UPDATE wire but not surfaced by the list.
+	{
+		std::uint32_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_USER_ID, v)) {
+			cs.ed2k_user_id = v;
+			// A LowID peer has a hybrid id below 0x1000000 (IsLowID()); inline the
+			// ed2k-stable ceiling rather than drag the core header in here.
+			const std::uint32_t kLowIdCeiling = 16777216u;
+			cs.high_id = v >= kLowIdCeiling;
+		}
+	}
+	{
+		std::uint32_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_SERVER_IP, v))
+			cs.server_ip = FormatClientIpv4(v);
+	}
+	{
+		std::uint16_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_SERVER_PORT, v))
+			cs.server_port = v;
+	}
+	if (const CECTag *t = c->GetTagByName(EC_TAG_CLIENT_SERVER_NAME)) {
+		cs.server_name = std::string(t->GetStringData().utf8_str());
+	}
+	{
+		std::uint16_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_KAD_PORT, v))
+			cs.kad_port = v;
+	}
+	{
+		std::uint32_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_FROM, v))
+			cs.source_origin = SourceOriginName(v);
+	}
+	// PARTFILE_NAME rides inside the client tag only while the peer is
+	// downloading from us; leave the cached value when absent.
+	if (const CECTag *t = c->GetTagByName(EC_TAG_PARTFILE_NAME)) {
+		cs.upload_file_name = std::string(t->GetStringData().utf8_str());
+	}
+	// Per-part bitmaps. Both tags carry a raw BitVector buffer, bit i at bufferi / 8 & (1 <<
+	// (i & 7)) -- LSB-first within each byte, matching BitVector::s_posMask. An EMPTY tag is
+	// the core's shorthand for "has every part" on the DOWNLOAD tag only; see
+	// DecodePartStatusTag.
+	DecodePartStatusTag(
+		c, EC_TAG_CLIENT_PART_STATUS, cs.part_status, cs.part_status_all, cs.has_part_status);
+	DecodePartStatusTag(c,
+		EC_TAG_CLIENT_UPLOAD_PART_STATUS,
+		cs.upload_part_status,
+		cs.upload_part_status_all,
+		cs.has_upload_part_status);
+	{
+		std::uint32_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_NEXT_REQUESTED_PART, v)) {
+			cs.next_requested_part = static_cast<std::uint16_t>(v);
+			cs.has_next_requested_part = true;
+		}
+	}
+	{
+		std::uint32_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_LAST_DOWNLOADING_PART, v)) {
+			cs.last_downloading_part = static_cast<std::uint16_t>(v);
+			cs.has_last_downloading_part = true;
+		}
+	}
+	{
+		std::uint32_t v = 0;
+		if (c->AssignIfExist(EC_TAG_CLIENT_AVAILABLE_PARTS, v)) {
+			cs.parts_offered_count = v;
+			cs.has_parts_offered_count = true;
+		}
+	}
+	if (const CECTag *t = c->GetTagByName(EC_TAG_CLIENT_MOD_VERSION)) {
+		cs.client_mod_name = std::string(t->GetStringData().utf8_str());
+	}
+	{
+		bool v = false;
+		if (c->AssignIfExist(EC_TAG_CLIENT_DISABLE_VIEW_SHARED, v))
+			cs.view_shared_disabled = v;
+	}
+
+	// --- Friend status + DL/UP modifier ----
+	// Absent on an older core; the AssignIfExist guards leave the defaults.
+	{
+		bool v = false;
+		if (c->AssignIfExist(EC_TAG_CLIENT_IS_FRIEND, v))
+			cs.is_friend = v;
+	}
+	if (const CECTag *t = c->GetTagByName(EC_TAG_CLIENT_SCORE_RATIO)) {
+		cs.credit_ratio = t->GetDoubleData();
+		cs.has_credit_ratio = true;
+	}
+}
+
+void MergeSharedTag(const CEC_SharedFile_Tag *sf, FileSnapshot &f)
+{
+	wxString fn;
+	if (sf->FileName(fn)) {
+		f.name = std::string(fn.utf8_str());
+	}
+	{
+		const wxString link = sf->FileEd2kLink();
+		if (!link.IsEmpty()) {
+			f.ed2k_link = std::string(link.utf8_str());
+		}
+	}
+	{
+		std::uint64_t v = f.size;
+		if (sf->AssignIfExist(EC_TAG_PARTFILE_SIZE_FULL, v))
+			f.size = v;
+	}
+	{
+		std::uint64_t v = f.shared.uploaded_bytes_session;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_XFERRED, v))
+			f.shared.uploaded_bytes_session = v;
+	}
+	{
+		std::uint64_t v = f.shared.uploaded_bytes_total;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_XFERRED_ALL, v))
+			f.shared.uploaded_bytes_total = v;
+	}
+	{
+		std::uint32_t v = f.shared.request_count_session;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_REQ_COUNT, v))
+			f.shared.request_count_session = v;
+	}
+	{
+		std::uint32_t v = f.shared.request_count_total;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_REQ_COUNT_ALL, v))
+			f.shared.request_count_total = v;
+	}
+	{
+		std::uint32_t v = f.shared.accepted_request_count_session;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_ACCEPT_COUNT, v))
+			f.shared.accepted_request_count_session = v;
+	}
+	{
+		std::uint32_t v = f.shared.accepted_request_count_total;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL, v))
+			f.shared.accepted_request_count_total = v;
+	}
+	{
+		std::uint16_t v = 0;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_COMPLETE_SOURCES, v))
+			f.shared.complete_sources = v;
+		// Detail-only complete-sources range (GET /shared/{hash}).
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_COMPLETE_SOURCES_LOW, v))
+			f.shared.complete_sources_low = v;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_COMPLETE_SOURCES_HIGH, v))
+			f.shared.complete_sources_high = v;
+
+		// Parts hashed so far by a Verify Local Data or an AICH hashset rebuild over this
+		// complete share. Rides every update tick, CValueMap-suppressed when unchanged, so it
+		// moves only while a hash is running. The partfile equivalent is decoded into
+		// download.hashed_part_count above.
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_HASHED_PART_COUNT, v))
+			f.shared.hashing_progress = v;
+	}
+	{
+		std::uint8_t pr = 0;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_PRIO, pr)) {
+			bool sh_auto = false;
+			f.shared.priority = PriorityName(pr, sh_auto);
+			f.shared.priority_auto = sh_auto;
+		}
+	}
+	// Live upload activity + timestamps (issue #466).
+	{
+		std::uint32_t v = f.shared.upload_speed_bytes_per_second;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_UPLOAD_SPEED, v))
+			f.shared.upload_speed_bytes_per_second = v;
+	}
+	{
+		std::uint16_t v = f.shared.uploading_client_count;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_UPLOADING_COUNT, v))
+			f.shared.uploading_client_count = v;
+	}
+	{
+		std::uint32_t v = f.shared.last_upload;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_LAST_UPLOAD, v))
+			f.shared.last_upload = v;
+	}
+	{
+		std::uint32_t v = f.shared.shared_since;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_SHARED_SINCE, v))
+			f.shared.shared_since = v;
+	}
+	// Base CKnownFile detail tags (aich_hash, queued_count, path source).
+	MergeKnownFileDetail(sf, f);
+}
+
+} // namespace
+
+// --- Downloads (EC_TAG_PARTFILE)
+
+namespace
+{
+
+// Apply the stateful RLE decode for the gap + part-status blobs on one partfile tag.
+// Allocates `rle_stateecid` if absent; mutates it on each call (XOR-deltas against the
+// prior decoded buffer). HTTP handlers read the output without touching the decoder state.
+void DecodeRleBlobsForPartFile(
+	const CEC_PartFile_Tag *pf, FileSnapshot &f, std::map<std::uint32_t, PartFileEncoderData> &rle_state)
+{
+	const std::uint32_t ecid = pf->ID();
+	PartFileEncoderData &enc = rle_stateecid;
+
+	if (const CECTag *gap_tag = pf->GetTagByName(EC_TAG_PARTFILE_GAP_STATUS)) {
+		ArrayOfUInts64 gaps;
+		enc.DecodeGaps(gap_tag, gaps);
+		f.download.decoded_gaps.assign(gaps.begin(), gaps.end());
+	}
+	if (const CECTag *part_tag = pf->GetTagByName(EC_TAG_PARTFILE_PART_STATUS)) {
+		ArrayOfUInts16 parts;
+		enc.DecodeParts(part_tag, parts);
+		f.download.decoded_part_sources.assign(parts.begin(), parts.end());
+	}
+}
+
+// Same stateful decode for the availability blob on one *knownfile* tag -- a complete
+// shared file, which carries EC_TAG_PARTFILE_PART_STATUS but no gap/req blobs. Output backs
+// the shared "Obtained Parts" bar.
+//
+// Shares `rle_state` with the partfile decoder above on purpose; see the note on
+// ApplyGetUpdateToShared in Refresher.h for why one map per ECID is the correct mirror of
+// the daemon's encoder set.
+void DecodeRleBlobsForSharedFile(const CEC_SharedFile_Tag *sf,
+	FileSnapshot &f,
+	std::map<std::uint32_t, PartFileEncoderData> &rle_state)
+{
+	const CECTag *part_tag = sf->GetTagByName(EC_TAG_PARTFILE_PART_STATUS);
+	if (!part_tag)
+		return;
+	ArrayOfUInts16 parts;
+	rle_statesf->ID().DecodeParts(part_tag, parts);
+	f.shared.decoded_part_sources.assign(parts.begin(), parts.end());
+}
+
+// Clear the shared *session statistics* on a share-role-off transition while preserving the
+// upload priority. The stats are per-share-session and must not survive; the upload
+// priority is a persistent file attribute that amuled CValueMap-suppresses once sent, so
+// wiping it here would strand a partfile that re-shares later with an empty `priority`.
+void ClearSharedRoleKeepPriority(FileSnapshot &f)
+{
+	std::string prio = std::move(f.shared.priority);
+	const bool prio_auto = f.shared.priority_auto;
+	f.shared = FileSnapshot::SharedSide{};
+	f.shared.priority = std::move(prio);
+	f.shared.priority_auto = prio_auto;
+}
+
+} // namespace
+
+void ApplyGetUpdateToDownloads(
+	const CECPacket *resp, FileMap &cache, std::map<std::uint32_t, PartFileEncoderData> &rle_state)
+{
+	if (!resp)
+		return;
+
+	// Walk the response top level. Three tag-name dispatches: EC_TAG_PARTFILE sets
+	// is_downloading and merges the download side; EC_TAG_FILE_REMOVED clears the download
+	// role, dropping the entry if it had no shared role either; everything else is handled by
+	// the sibling walkers.
+	for (CECPacket::const_iterator it = resp->begin(); it != resp->end(); ++it) {
+		const CECTag *t = &*it;
+		const ec_tagname_t name = t->GetTagName();
+
+		if (name == EC_TAG_FILE_REMOVED) {
+			const std::uint32_t ecid = static_cast<std::uint32_t>(t->GetInt());
+			auto fit = cache.find(ecid);
+			if (fit != cache.end()) {
+				cache.SetDownloading(fit, false);
+				// Reset the download sub-block so a future role-true transition (or
+				// even a stale FindDownload lookup after the role flag was checked)
+				// cannot surface stats from this dead downloading period.
+				fit->second.download = FileSnapshot::DownloadSide{};
+				if (!fit->second.is_shared)
+					cache.erase(fit);
+			}
+			rle_state.erase(ecid);
+			continue;
+		}
+		if (name != EC_TAG_PARTFILE)
+			continue;
+
+		const CEC_PartFile_Tag *pf = static_cast<const CEC_PartFile_Tag *>(t);
+		const std::uint32_t ecid = pf->ID();
+
+		auto map_it = cache.find(ecid);
+		if (map_it == cache.end()) {
+			// Brand-new ECID. INC_UPDATE ships HASH/NAME/SIZE on first encounter,
+			// so the insert is fully populated in one pass.
+			FileSnapshot f;
+			f.ecid = ecid;
+			f.hash = TagHashLower(pf);
+			f.is_downloading = true;
+			MergePartFileTag(pf, f, /*is_new=*/true);
+			DecodeRleBlobsForPartFile(pf, f, rle_state);
+			cache.emplace(ecid, std::move(f));
+		} else {
+			cache.SetDownloading(map_it, true);
+			MergePartFileTag(pf, map_it->second, /*is_new=*/false);
+			DecodeRleBlobsForPartFile(pf, map_it->second, rle_state);
+		}
+	}
+}
+
+void ApplyGetUpdateToShared(
+	const CECPacket *resp, FileMap &cache, std::map<std::uint32_t, PartFileEncoderData> &rle_state)
+{
+	if (!resp)
+		return;
+
+	// amuled's "shared files" surface is the union of completed knownfiles (EC_TAG_KNOWNFILE,
+	// always shared) and partfiles with IsShared()==true (>=1 chunk complete ->
+	// EC_TAG_PARTFILE with an EC_TAG_PARTFILE_SHARED child). CEC_PartFile_Tag derives from
+	// CEC_SharedFile_Tag, so we cast and pass through MergeSharedTag.
+	//
+	// EC_TAG_PARTFILE_SHARED is CValueMap-suppressed when unchanged: present-and-true sets
+	// is_shared and merges; present-and-false clears it (the file stays in m_files if still
+	// downloading); absent preserves.
+	for (CECPacket::const_iterator it = resp->begin(); it != resp->end(); ++it) {
+		const CECTag *t = &*it;
+		const ec_tagname_t name = t->GetTagName();
+
+		if (name == EC_TAG_FILE_REMOVED) {
+			const std::uint32_t ecid = static_cast<std::uint32_t>(t->GetInt());
+			auto fit = cache.find(ecid);
+			if (fit != cache.end()) {
+				cache.SetShared(fit, false);
+				if (!fit->second.is_downloading)
+					cache.erase(fit);
+				else
+					ClearSharedRoleKeepPriority(fit->second);
+			}
+			continue;
+		}
+		if (name != EC_TAG_KNOWNFILE && name != EC_TAG_PARTFILE)
+			continue;
+
+		const CEC_SharedFile_Tag *sf = static_cast<const CEC_SharedFile_Tag *>(t);
+		const std::uint32_t ecid = sf->ID();
+
+		if (name == EC_TAG_PARTFILE) {
+			const CECTag *shared_flag = sf->GetTagByName(EC_TAG_PARTFILE_SHARED);
+			if (shared_flag) {
+				const bool is_shared = (shared_flag->GetInt() != 0);
+				if (!is_shared) {
+					// Partfile is_shared transitioned false, or arrived
+					// unshared. Reset the shared session stats; the entry stays
+					// in m_files because the downloading role may still hold it,
+					// and if it does not the downloads-walker FILE_REMOVED drops it.
+					auto fit = cache.find(ecid);
+					if (fit != cache.end()) {
+						cache.SetShared(fit, false);
+						ClearSharedRoleKeepPriority(fit->second);
+					}
+					continue;
+				}
+				// is_shared == true → fall through to the merge below.
+			} else {
+				// Flag suppressed (no change). Only meaningful for an
+				// entry we already know was shared.
+				const auto fit = cache.find(ecid);
+				if (fit == cache.end() || !fit->second.is_shared)
+					continue;
+			}
+		}
+
+		auto map_it = cache.find(ecid);
+		if (map_it == cache.end()) {
+			// Brand-new ECID to the unified map (a knownfile arriving without a
+			// prior downloads-walker tick -- its first frame ships HASH).
+			FileSnapshot f;
+			f.ecid = ecid;
+			f.hash = TagHashLower(sf);
+			f.is_shared = true;
+			MergeSharedTag(sf, f);
+			if (name == EC_TAG_KNOWNFILE)
+				DecodeRleBlobsForSharedFile(sf, f, rle_state);
+			cache.emplace(ecid, std::move(f));
+		} else {
+			// Existing entry -- flip is_shared on, merge fields. If hash arrived and we do not
+			// already have one (rare: a prior partfile-walker tick had it suppressed), capture it
+			// now.
+			if (map_it->second.hash.empty()) {
+				const std::string h = TagHashLower(sf);
+				if (!h.empty())
+					cache.SetHash(map_it, h);
+			}
+			cache.SetShared(map_it, true);
+			MergeSharedTag(sf, map_it->second);
+			// PARTFILE tags are decoded by the downloads walker, which already ran on this same
+			// response; decoding them again would apply the XOR delta twice and desync the
+			// decoder for good.
+			if (name == EC_TAG_KNOWNFILE)
+				DecodeRleBlobsForSharedFile(sf, map_it->second, rle_state);
+		}
+	}
+}
+
+// --- Clients (rides on the EC_TAG_CLIENT container inside the
+// consolidated GET_UPDATE response).
+
+void ApplyGetUpdateToClients(
+	const CECPacket *resp, std::map<std::uint32_t, ClientSnapshot> &cache, const FileMap &files)
+{
+	if (!resp)
+		return;
+	const CECTag *container = resp->GetTagByName(EC_TAG_CLIENT);
+	if (!container)
+		return;
+
+	// Walk the per-client children. Every alive client in theApp->clientlist surfaces here
+	// every tick -- the outer per-client tag is added unconditionally, only the children are
+	// CValueMap-suppressed. So this uses "seen this tick = keep, absent = evict": there is no
+	// FILE_REMOVED equivalent for clients.
+	std::set<std::uint32_t> seen;
+	for (CECTag::const_iterator it = container->begin(); it != container->end(); ++it) {
+		const CECTag *t = &*it;
+		if (t->GetTagName() != EC_TAG_CLIENT)
+			continue;
+		const CEC_UpDownClient_Tag *cli = static_cast<const CEC_UpDownClient_Tag *>(t);
+		const std::uint32_t ecid = cli->ID();
+		seen.insert(ecid);
+
+		auto map_it = cache.find(ecid);
+		if (map_it == cache.end()) {
+			ClientSnapshot fresh;
+			fresh.ecid = ecid;
+			MergeClientTag(cli, fresh, /*is_new=*/true, files);
+			cache.emplace(ecid, std::move(fresh));
+		} else {
+			MergeClientTag(cli, map_it->second, /*is_new=*/false, files);
+		}
+	}
+
+	// Evict cache entries not seen this tick -- gone from the amuled side (peer
+	// disconnected, dropped from queue, banned out of the visible set).
+	for (auto it = cache.begin(); it != cache.end();) {
+		if (seen.find(it->first) == seen.end()) {
+			it = cache.erase(it);
+		} else {
+			++it;
+		}
+	}
+}
+
+// --- /kad (rides on STAT_REQ response) ---------------------------------
+
+namespace
+{
+
+const char *KadBuddyStatusName(std::uint32_t status_code)
+{
+	// EC ships the `buddyState` enum (ClientList.h) value directly. Using the enum names rather
+	// than literal 0/1/2 so a future reorder of buddyState cannot silently re-label the wire.
+	switch (static_cast<buddyState>(status_code)) {
+	case Disconnected:
+		return "no_buddy";
+	case Connecting:
+		return "connecting";
+	case Connected:
+		return "connected";
+	default:
+		return "unknown";
+	}
+}
+
+} // namespace
+
+bool ParseSearchProgressUnion(
+	const CECPacket *resp, std::map<std::uint32_t, std::pair<std::uint32_t, std::uint32_t>> &out)
+{
+	// Opcode gate, not a child-count gate: see the header. A reply we cannot parse must NOT
+	// reach the caller as an empty union, because the caller reads absence as expiry and would
+	// retire every tracked search at once.
+	if (!resp || resp->GetOpCode() != EC_OP_SEARCH_PROGRESS) {
+		return false;
+	}
+	for (const CECTag &entry : *resp) {
+		if (entry.GetTagName() != EC_TAG_SEARCH_ID) {
+			continue;
+		}
+		std::uint32_t pct = 0;
+		std::uint32_t st = 0;
+		if (const CECTag *t = entry.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_PERCENT)) {
+			pct = static_cast<std::uint32_t>(t->GetInt());
+		}
+		if (const CECTag *t = entry.GetTagByName(EC_TAG_SEARCH_LIFECYCLE_STATE)) {
+			st = static_cast<std::uint32_t>(t->GetInt());
+		}
+		outstatic_cast<std::uint32_t>(entry.GetInt()) = { pct, st };
+	}
+	return true;
+}
+
+void ParseKadFromPacket(const CECPacket *resp, KadSnapshot &out)
+{
+	if (!resp)
+		return;
+
+	const CEC_ConnState_Tag *conn =
+		static_cast<const CEC_ConnState_Tag *>(resp->GetTagByName(EC_TAG_CONNSTATE));
+
+	out.state = KadStateString(conn);
+	if (conn) {
+		// Gated like the /status copy of this field: IsKadFirewalled() reads a connstate bit
+		// that outlives the disconnect, so an unconnected daemon reported a reachability verdict
+		// it had not measured.
+		if (conn->IsConnectedKademlia()) {
+			out.firewalled_tcp = conn->IsKadFirewalled();
+			out.has_firewalled_tcp = true;
+		}
+		// Our own node id. amuled ships EC_TAG_KAD_ID only while Kad is running, which is the
+		// same condition KadStateString() reports as anything other than "disabled" -- so an
+		// absent sub-tag leaves the field empty rather than emitting a zero id that would read
+		// as a real (all-zero) identity. Lowercased to match every other hex identifier this API
+		// emits.
+		CUInt128 kadID;
+		if (conn->GetKadID(kadID)) {
+			out.node_id = std::string(kadID.ToHexString().Lower().utf8_str());
+		}
+	}
+
+	// Gated on `connected`, unlike the tags below, which amuled already gates itself. These
+	// three ship unconditionally: `users`/`files` are the last persisted estimate and survive
+	// into `connecting`, and `nodes` is our own routing-table size -- measured at 2 with Kad
+	// fully stopped.
+	if (out.state == "connected") {
+		if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_KAD_USERS)) {
+			out.users = static_cast<std::uint32_t>(t->GetInt());
+		}
+		if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_KAD_FILES)) {
+			out.files = static_cast<std::uint32_t>(t->GetInt());
+		}
+		if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_KAD_NODES)) {
+			out.nodes = static_cast<std::uint32_t>(t->GetInt());
+		}
+		out.has_network = true;
+	}
+
+	// These ship only when Kad is connected (server gates them at
+	// ExternalConn.cpp `if (Kademlia::CKademlia::IsConnected())`).
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_KAD_FIREWALLED_UDP)) {
+		out.firewalled_udp = (t->GetInt() != 0);
+		out.has_firewalled_udp = true;
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_KAD_INDEXED_SOURCES)) {
+		out.indexed_sources = static_cast<std::uint32_t>(t->GetInt());
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_KAD_INDEXED_KEYWORDS)) {
+		out.indexed_keywords = static_cast<std::uint32_t>(t->GetInt());
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_KAD_INDEXED_NOTES)) {
+		out.indexed_notes = static_cast<std::uint32_t>(t->GetInt());
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_KAD_INDEXED_LOAD)) {
+		out.indexed_load = static_cast<std::uint32_t>(t->GetInt());
+	}
+	// One flag for the group: amuled ships all four together, inside its own
+	// `if (IsConnected())`, so any one arriving means the set did.
+	out.has_indexed = resp->GetTagByName(EC_TAG_STATS_KAD_INDEXED_LOAD) != nullptr;
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_KAD_IP_ADDRESS)) {
+		out.public_ip = IPv4ToDotted(static_cast<std::uint32_t>(t->GetInt()));
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_KAD_IN_LAN_MODE)) {
+		out.lan_mode = (t->GetInt() != 0);
+		out.has_lan_mode = true;
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_BUDDY_STATUS)) {
+		out.buddy_status = KadBuddyStatusName(static_cast<std::uint32_t>(t->GetInt()));
+		// The group's flag: amuled ships status/ip/port together inside its
+		// connected gate, and status is the one that is always in the set.
+		out.has_buddy = true;
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_BUDDY_IP)) {
+		out.buddy_ip = IPv4ToDotted(static_cast<std::uint32_t>(t->GetInt()));
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATS_BUDDY_PORT)) {
+		out.buddy_port = static_cast<std::uint16_t>(t->GetInt());
+	}
+}
+
+// --- /logs/amule (incremental, piggybacks on STAT_REQ) -----------------
+
+void ParseAmuleLogFromPacket(const CECPacket *resp, std::vector<std::string> &out_new_lines)
+{
+	out_new_lines.clear();
+	if (!resp)
+		return;
+	// `EC_TAG_STATS_LOGGER_MESSAGE` is a parent tag with child EC_TAG_STRING entries, one per
+	// new log line drained from the per-connection CLoggerAccess cursor. Absent when there is
+	// nothing new since our last tick.
+	const CECTag *logger = resp->GetTagByName(EC_TAG_STATS_LOGGER_MESSAGE);
+	if (!logger)
+		return;
+	for (CECTag::const_iterator it = logger->begin(); it != logger->end(); ++it) {
+		const CECTag *t = &*it;
+		if (t->GetTagName() != EC_TAG_STRING)
+			continue;
+		out_new_lines.emplace_back(t->GetStringData().utf8_str());
+	}
+}
+
+// --- /servers (rides on GET_UPDATE response) ---------------------------
+
+// SRV_PR_* constants live in Server.h. The values are not monotone with priority (NORMAL=0,
+// HIGH=1, LOW=2), which is why the named macros are used instead of literal 0/1/2. The two
+// directions are kept adjacent, and covered by a round-trip test, because that order is
+// what a second implementation elsewhere would get wrong.
+const char *ServerPriorityName(std::uint32_t prio_code)
+{
+	switch (prio_code) {
+	case SRV_PR_NORMAL:
+		return "normal";
+	case SRV_PR_HIGH:
+		return "high";
+	case SRV_PR_LOW:
+		return "low";
+	default:
+		return "normal";
+	}
+}
+
+bool ServerPriorityCode(const std::string &name, std::uint32_t &out_code)
+{
+	if (name == "normal") {
+		out_code = SRV_PR_NORMAL;
+	} else if (name == "high") {
+		out_code = SRV_PR_HIGH;
+	} else if (name == "low") {
+		out_code = SRV_PR_LOW;
+	} else {
+		return false;
+	}
+	return true;
+}
+
+namespace
+{
+
+// Build (or merge into) a ServerSnapshot from one per-server tag. Identity-only tags
+// (name/description/version/IPv4) are subject to CValueMap suppression, so for an existing
+// entry the cached value is left alone when the source is empty.
+void MergeServerTag(const CEC_Server_Tag *st, ServerSnapshot &s, bool is_new)
+{
+	s.ecid = st->ID();
+	{
+		wxString tmp;
+		const std::string n = std::string(st->ServerName(&tmp).utf8_str());
+		if (is_new || !n.empty())
+			s.name = n;
+	}
+	{
+		wxString tmp;
+		const std::string d = std::string(st->ServerDesc(&tmp).utf8_str());
+		if (is_new || !d.empty())
+			s.description = d;
+	}
+	{
+		wxString tmp;
+		const std::string v = std::string(st->ServerVersion(&tmp).utf8_str());
+		if (is_new || !v.empty())
+			s.version = v;
+	}
+	// Server host country ISO code (#440). Tag-present (even empty) is the
+	// daemon's authoritative answer; tag-absent leaves the cached value intact.
+	if (const CECTag *t = st->GetTagByName(EC_TAG_SERVER_COUNTRY)) {
+		s.country_code = std::string(t->GetStringData().utf8_str());
+	}
+	// IP + port shipping shape varies by EC detail level. FULL/WEB/UPDATE (webserver,
+	// amulecmd) pack them into the OUTER tag as IPv4 data (st->GetIPv4Data()). INC_UPDATE /
+	// GET_UPDATE (amulegui, amuleapi) ship them as CHILD tags EC_TAG_SERVER_IP +
+	// EC_TAG_SERVER_PORT; the outer tag carries the ECID instead, so GetIPv4Data() returns
+	// all-zeros and /servers.address silently degrades to "0.0.0.0:0". Try the child-tag
+	// shape first; fall back to GetIPv4Data() so any future use of FULL detail still works.
+	{
+		std::uint32_t ip_he = 0;
+		std::uint16_t port = 0;
+		const bool have_ip = st->AssignIfExist(EC_TAG_SERVER_IP, ip_he);
+		const bool have_port = st->AssignIfExist(EC_TAG_SERVER_PORT, port);
+		if (have_ip || have_port) {
+			if (have_ip)
+				s.ip = ip_he;
+			if (have_port)
+				s.port = port;
+			// Build "1.2.3.4:port" once we have both halves.
+			if (s.ip != 0 && s.port != 0) {
+				char buf32;
+				std::snprintf(buf,
+					sizeof(buf),
+					"%u.%u.%u.%u:%u",
+					static_cast<unsigned>((s.ip) & 0xFFu),
+					static_cast<unsigned>((s.ip >> 8) & 0xFFu),
+					static_cast<unsigned>((s.ip >> 16) & 0xFFu),
+					static_cast<unsigned>((s.ip >> 24) & 0xFFu),
+					static_cast<unsigned>(s.port));
+				s.address = buf;
+			}
+		}
+		// No FULL-detail fallback to st->GetIPv4Data() here: the refresher only ever asks for
+		// EC_DETAIL_INC_UPDATE, and reading it trips a libec Debug-build assertion on non-IPv4
+		// outer tags -- which aborts the test process before any assertion in our own code can
+		// run.
+	}
+	{
+		std::uint32_t v = 0;
+		if (st->AssignIfExist(EC_TAG_SERVER_PING, v))
+			s.ping_ms = v;
+	}
+	{
+		std::uint32_t v = 0;
+		if (st->AssignIfExist(EC_TAG_SERVER_FAILED, v))
+			s.failed_count = v;
+	}
+	{
+		std::uint32_t v = 0;
+		if (st->AssignIfExist(EC_TAG_SERVER_USERS, v))
+			s.users = v;
+	}
+	{
+		std::uint32_t v = 0;
+		if (st->AssignIfExist(EC_TAG_SERVER_USERS_MAX, v))
+			s.max_users = v;
+	}
+	{
+		std::uint32_t v = 0;
+		if (st->AssignIfExist(EC_TAG_SERVER_FILES, v))
+			s.files = v;
+	}
+	// Publishing limits and wire capability flags. Both server-tag builders emit all four, so
+	// the initial list and the incremental updates carry them alike; a suppressed unchanged tag
+	// leaves the cached value intact.
+	{
+		std::uint32_t v = 0;
+		if (st->AssignIfExist(EC_TAG_SERVER_FILES_SOFT, v))
+			s.soft_file_limit = v;
+	}
+	{
+		std::uint32_t v = 0;
+		if (st->AssignIfExist(EC_TAG_SERVER_FILES_HARD, v))
+			s.hard_file_limit = v;
+	}
+	{
+		std::uint32_t v = 0;
+		if (st->AssignIfExist(EC_TAG_SERVER_TCP_FLAGS, v))
+			s.tcp_flags = v;
+	}
+	{
+		std::uint32_t v = 0;
+		if (st->AssignIfExist(EC_TAG_SERVER_UDP_FLAGS, v))
+			s.udp_flags = v;
+	}
+	{
+		std::uint32_t v = 0;
+		if (st->AssignIfExist(EC_TAG_SERVER_PRIO, v)) {
+			s.priority = ServerPriorityName(v);
+		} else if (is_new) {
+			s.priority = "normal";
+		}
+	}
+	{
+		bool v = false;
+		if (st->AssignIfExist(EC_TAG_SERVER_STATIC, v))
+			s.is_static = v;
+	}
+}
+
+} // namespace
+
+// Same container shape as the servers walker above: GET_UPDATE wraps every friend in one
+// EC_TAG_FRIEND container, per-field values are suppressed when unchanged, and the
+// container is always the complete list -- so "not seen this tick" means the friend was
+// removed on the daemon side.
+static void MergeFriendTag(const CEC_Friend_Tag *ft, FriendSnapshot &f, bool is_new)
+{
+	f.ecid = ft->ID();
+	{
+		wxString tmp;
+		if (ft->Name(tmp) || is_new)
+			f.name = std::string(tmp.utf8_str());
+	}
+	{
+		CMD4Hash hash;
+		if (ft->UserHash(hash)) {
+			// A friend added by ip:port carries an empty hash; keep it empty rather
+			// than writing out 32 zeroes, which would read as a real hash.
+			f.user_hash = hash.IsEmpty() ? std::string()
+						     : std::string(hash.Encode().Lower().utf8_str());
+		}
+	}
+	{
+		std::uint32_t ip = 0;
+		if (ft->IP(ip))
+			f.ip = FormatClientIpv4(ip);
+	}
+	{
+		std::uint16_t port = 0;
+		if (ft->Port(port))
+			f.port = port;
+	}
+	{
+		// 0 means the friend is not linked to a live client right now. The
+		// daemon does send the transition, so an absent tag means unchanged.
+		std::uint32_t client = 0;
+		if (ft->Client(client))
+			f.client_ecid = client;
+	}
+	{
+		// Echoed from the linked client by the daemon. Linked but not connected is the ordinary
+		// case for an offline friend, and is exactly what client_ecid alone could not express.
+		bool v = false;
+		if (ft->AssignIfExist(EC_TAG_CLIENT_CONNECTED, v)) {
+			f.connected = v;
+			f.has_connected = true;
+		}
+	}
+	{
+		// Absent on daemons that predate the tag being serialized; the
+		// snapshot then keeps its default false.
+		bool slot = false;
+		if (ft->FriendSlot(slot))
+			f.friend_slot = slot;
+	}
+}
+
+void ApplyChatSessions(const CECPacket *resp,
+	std::vector<ChatSessionSnapshot> &cache,
+	std::uint32_t &cursor,
+	std::vector<ChatSessionSnapshot> &out_new_messages,
+	std::vector<std::uint64_t> &out_closed)
+{
+	if (!resp)
+		return;
+
+	// Index what we already hold so the incremental messages can be carried
+	// over: the reply only contains what is newer than the cursor we sent.
+	std::map<std::uint64_t, ChatSessionSnapshot> previous;
+	for (ChatSessionSnapshot &s : cache) {
+		previous.emplace(s.gui_id, std::move(s));
+	}
+
+	std::vector<ChatSessionSnapshot> fresh;
+	std::set<std::uint64_t> present;
+
+	for (const CECTag &tag : *resp) {
+		const CECTag *t = &tag;
+		if (t->GetTagName() != EC_TAG_CHAT_SESSION)
+			continue;
+
+		ChatSessionSnapshot session;
+		session.gui_id = t->GetInt();
+		present.insert(session.gui_id);
+		// GUI_ID is (ip << 16) | port, with the IP in the same byte order EC_TAG_CLIENT_USER_IP
+		// uses, so it renders with the peer formatter every other address on this surface goes
+		// through.
+		session.ip = FormatClientIpv4(static_cast<std::uint32_t>(session.gui_id >> 16));
+		session.port = static_cast<std::uint16_t>(session.gui_id & 0xFFFFu);
+
+		if (const CECTag *nameTag = t->GetTagByName(EC_TAG_CHAT_PEER_NAME))
+			session.name = std::string(nameTag->GetStringData().utf8_str());
+		if (const CECTag *clientTag = t->GetTagByName(EC_TAG_CLIENT))
+			session.client_ecid = static_cast<std::uint32_t>(clientTag->GetInt());
+		// Sent alongside EC_TAG_CLIENT whenever there is a live peer at all.
+		if (const CECTag *connTag = t->GetTagByName(EC_TAG_CLIENT_CONNECTED)) {
+			session.connected = connTag->GetInt() != 0;
+			session.has_connected = true;
+		}
+		if (const CECTag *friendTag = t->GetTagByName(EC_TAG_FRIEND))
+			session.friend_ecid = static_cast<std::uint32_t>(friendTag->GetInt());
+
+		// Carry over the history this tick's reply did not repeat.
+		auto prev = previous.find(session.gui_id);
+		if (prev != previous.end()) {
+			session.messages = std::move(prev->second.messages);
+			// A name the daemon stops sending must not blank one we have.
+			if (session.name.empty())
+				session.name = prev->second.name;
+		}
+
+		ChatSessionSnapshot arrivals;
+		arrivals.gui_id = session.gui_id;
+		arrivals.ip = session.ip;
+		arrivals.port = session.port;
+		arrivals.name = session.name;
+		arrivals.client_ecid = session.client_ecid;
+		arrivals.friend_ecid = session.friend_ecid;
+
+		for (const CECTag &child : *t) {
+			const CECTag *m = &child;
+			if (m->GetTagName() != EC_TAG_CHAT_MESSAGE)
+				continue;
+			ChatMessageSnapshot msg;
+			msg.text = std::string(m->GetStringData().utf8_str());
+			if (const CECTag *idTag = m->GetTagByName(EC_TAG_CHAT_MSG_ID))
+				msg.id = static_cast<std::uint32_t>(idTag->GetInt());
+			if (const CECTag *dirTag = m->GetTagByName(EC_TAG_CHAT_DIRECTION))
+				msg.outgoing = dirTag->GetInt() != 0;
+			if (const CECTag *tsTag = m->GetTagByName(EC_TAG_CHAT_TIMESTAMP))
+				msg.timestamp = static_cast<std::uint32_t>(tsTag->GetInt());
+			session.messages.push_back(msg);
+			arrivals.messages.push_back(msg);
+		}
+
+		// Mirror the daemon's own retention so a long-lived amuleapi does
+		// not accumulate what the core has already dropped.
+		const std::size_t kMaxPerSession = 200;
+		if (session.messages.size() > kMaxPerSession) {
+			session.messages.erase(session.messages.begin(),
+				session.messages.end() - static_cast<std::ptrdiff_t>(kMaxPerSession));
+		}
+
+		if (!arrivals.messages.empty())
+			out_new_messages.push_back(std::move(arrivals));
+		fresh.push_back(std::move(session));
+	}
+
+	// Absent from the reply means closed on the daemon. Reported so the event layer can emit
+	// chat_session_closed; the vector is replaced wholesale below, which is what actually drops
+	// it.
+	for (const auto &kv : previous) {
+		if (!present.count(kv.first))
+			out_closed.push_back(kv.first);
+	}
+
+	cache = std::move(fresh);
+
+	if (const CECTag *cursorTag = resp->GetTagByName(EC_TAG_CHAT_MSG_ID))
+		cursor = static_cast<std::uint32_t>(cursorTag->GetInt());
+}
+
+void ApplyGetUpdateToFriends(const CECPacket *resp, std::map<std::uint32_t, FriendSnapshot> &cache)
+{
+	if (!resp)
+		return;
+	const CECTag *container = resp->GetTagByName(EC_TAG_FRIEND);
+	if (!container)
+		return;
+
+	std::set<std::uint32_t> seen;
+	for (const CECTag &child : *container) {
+		if (child.GetTagName() != EC_TAG_FRIEND)
+			continue;
+		const CEC_Friend_Tag *ft = static_cast<const CEC_Friend_Tag *>(&child);
+		const std::uint32_t ecid = ft->ID();
+		seen.insert(ecid);
+
+		auto map_it = cache.find(ecid);
+		if (map_it == cache.end()) {
+			FriendSnapshot fresh;
+			MergeFriendTag(ft, fresh, /*is_new=*/true);
+			cache.emplace(ecid, std::move(fresh));
+		} else {
+			MergeFriendTag(ft, map_it->second, /*is_new=*/false);
+		}
+	}
+
+	for (auto it = cache.begin(); it != cache.end();) {
+		if (seen.find(it->first) == seen.end()) {
+			it = cache.erase(it);
+		} else {
+			++it;
+		}
+	}
+}
+
+void ApplyGetUpdateToServers(const CECPacket *resp, std::map<std::uint32_t, ServerSnapshot> &cache)
+{
+	if (!resp)
+		return;
+	// Find the EC_TAG_SERVER container at top level. Unlike the legacy EC_OP_GET_SERVER_LIST
+	// shape (one EC_TAG_SERVER per server at the response root), GET_UPDATE wraps them in one
+	// container of the same name.
+	const CECTag *container = resp->GetTagByName(EC_TAG_SERVER);
+	if (!container)
+		return;
+
+	// The container always carries the FULL current server list (no FILE_REMOVED markers for
+	// servers), but individual per-server fields are CValueMap-suppressed on unchanged values.
+	// Two consequences: servers absent from the response are gone on amuled's side, so evict by
+	// "not seen this tick"; and for servers already cached, identity tags may be absent this
+	// tick, which MergeServerTag leaves alone.
+	std::set<std::uint32_t> seen;
+	for (CECTag::const_iterator it = container->begin(); it != container->end(); ++it) {
+		const CECTag *t = &*it;
+		if (t->GetTagName() != EC_TAG_SERVER)
+			continue;
+		const CEC_Server_Tag *st = static_cast<const CEC_Server_Tag *>(t);
+		const std::uint32_t ecid = st->ID();
+		seen.insert(ecid);
+
+		auto map_it = cache.find(ecid);
+		if (map_it == cache.end()) {
+			ServerSnapshot fresh;
+			MergeServerTag(st, fresh, /*is_new=*/true);
+			cache.emplace(ecid, std::move(fresh));
+		} else {
+			MergeServerTag(st, map_it->second, /*is_new=*/false);
+		}
+	}
+
+	// Evict cache entries not seen this tick -- gone on the amuled side, or a
+	// fresh connection is rebuilding the list from a different serverlist source.
+	for (auto it = cache.begin(); it != cache.end();) {
+		if (seen.find(it->first) == seen.end()) {
+			it = cache.erase(it);
+		} else {
+			++it;
+		}
+	}
+}
+
+// --- /stats/tree -------------------------------------------------------
+
+namespace
+{
+
+// EC value type -> stable lowercase API string. Mirrors the EC_VALUE_* enum;
+// the numeric value is carried raw so clients format and localize.
+const char *ECStatValueTypeName(int type)
+{
+	switch (type) {
+	case EC_VALUE_INTEGER:
+		return "integer";
+	case EC_VALUE_ISTRING:
+		// Both ISTRING and ISHORT are plain integers the desktop happens to render abbreviated
+		// ("12.5k"). That is a wx formatter choice with nothing a REST client can act on, so they
+		// collapse onto the same token.
+		return "integer";
+	case EC_VALUE_BYTES:
+		return "bytes";
+	case EC_VALUE_ISHORT:
+		return "integer";
+	case EC_VALUE_TIME:
+		return "time";
+	case EC_VALUE_SPEED:
+		return "speed";
+	case EC_VALUE_STRING:
+		return "string";
+	case EC_VALUE_DOUBLE:
+		return "double";
+	default:
+		return "integer";
+	}
+}
+
+// Extract one EC_TAG_STAT_NODE_VALUE as a typed value, raw and untranslated.
+// Recurses one level for the optional nested "(total ...)" value.
+void ExtractStatsValue(const CECTag *v, StatsTreeValue &out)
+{
+	const CECTag *vt = v->GetTagByName(EC_TAG_STAT_VALUE_TYPE);
+	const int type = vt != nullptr ? (int)vt->GetInt() : EC_VALUE_INTEGER;
+	out.type = ECStatValueTypeName(type);
+	switch (type) {
+	case EC_VALUE_STRING:
+		// The wire string is English (daemon uses wxTRANSLATE); the API must
+		// relay it verbatim and never translate -- that is a client concern.
+		out.kind = StatsTreeValue::Str;
+		out.str = std::string(v->GetStringData().utf8_str());
+		break;
+	case EC_VALUE_DOUBLE:
+		out.kind = StatsTreeValue::Dbl;
+		out.dbl = v->GetDoubleData();
+		break;
+	default:
+		out.kind = StatsTreeValue::Num;
+		out.num = v->GetInt();
+		break;
+	}
+	// Locale-independent sentinel token, when the daemon tagged this value.
+	// Additive: the English string above is left intact.
+	const CECTag *et = v->GetTagByName(EC_TAG_STAT_VALUE_ENUM);
+	if (et) {
+		out.enum_token = std::string(et->GetStringData().utf8_str());
+	}
+	const CECTag *nested = v->GetTagByName(EC_TAG_STAT_NODE_VALUE);
+	if (nested) {
+		StatsTreeValue e;
+		ExtractStatsValue(nested, e);
+		out.extra.push_back(std::move(e));
+	}
+}
+
+void ParseStatsTreeNode(const CECTag *node, StatsTreeNode &out)
+{
+	const CEC_StatTree_Node_Tag *n = static_cast<const CEC_StatTree_Node_Tag *>(node);
+	// Untranslated English label template exactly as EC carries it (e.g.
+	// "Uptime: %s"); NOT GetDisplayString(), which translates and locale-formats.
+	out.label = std::string(n->GetStringData().utf8_str());
+	// Stable machine key, if the daemon set one. Legacy daemons omit the
+	// tag; out.key stays empty and is dropped from the JSON.
+	const CECTag *keyTag = n->GetTagByName(EC_TAG_STAT_NODE_KEY);
+	if (keyTag) {
+		out.key = std::string(keyTag->GetStringData().utf8_str());
+	}
+	// Raw machine value (client version / OS string) for data-labelled
+	// nodes. Legacy daemons omit it; out.raw stays empty and is dropped.
+	const CECTag *rawTag = n->GetTagByName(EC_TAG_STAT_NODE_RAW);
+	if (rawTag) {
+		out.raw = std::string(rawTag->GetStringData().utf8_str());
+	}
+	// Raw numeric ratio (download-per-upload), only present on the ratio node
+	// and only when the daemon could compute it. Legacy daemons omit both.
+	const CECTag *ratioTag = n->GetTagByName(EC_TAG_STAT_NODE_RATIO);
+	if (ratioTag) {
+		out.has_ratio_session = true;
+		out.ratio_session = ratioTag->GetDoubleData();
+	}
+	const CECTag *ratioTotalTag = n->GetTagByName(EC_TAG_STAT_NODE_RATIO_TOTAL);
+	if (ratioTotalTag) {
+		out.has_ratio_total = true;
+		out.ratio_total = ratioTotalTag->GetDoubleData();
+	}
+	for (CECTag::const_iterator it = n->begin(); it != n->end(); ++it) {
+		if (it->GetTagName() == EC_TAG_STAT_NODE_VALUE) {
+			StatsTreeValue v;
+			ExtractStatsValue(&*it, v);
+			out.values.push_back(std::move(v));
+		} else if (it->GetTagName() == EC_TAG_STATTREE_NODE) {
+			StatsTreeNode child;
+			ParseStatsTreeNode(&*it, child);
+			out.children.push_back(std::move(child));
+		}
+	}
+}
+
+} // namespace
+
+void ParseStatsTreeFromPacket(const CECPacket *resp, StatsTreeNode &out)
+{
+	out.label.clear();
+	out.values.clear();
+	out.children.clear();
+	if (!resp)
+		return;
+	// amuled emits a single root EC_TAG_STATTREE_NODE whose label is always an unlabeled
+	// container, so it is dropped and its direct children surface at the top level -- what
+	// amuleweb's am_load_stats_tree.php does too.
+	const CECTag *root = resp->GetTagByName(EC_TAG_STATTREE_NODE);
+	if (!root)
+		return;
+	for (CECTag::const_iterator it = root->begin(); it != root->end(); ++it) {
+		if (it->GetTagName() != EC_TAG_STATTREE_NODE)
+			continue;
+		StatsTreeNode child;
+		ParseStatsTreeNode(&*it, child);
+		out.children.push_back(std::move(child));
+	}
+}
+
+// --- /stats/graphs/{graph} --------------------------------------------
+
+namespace
+{
+
+// EC_TAG_STATSGRAPH_DATA is a binary blob of N interleaved uint32 channels, each value
+// pre-converted to network byte order via ENDIAN_HTONL on the amuled side (Statistics.cpp),
+// so it has to be swapped back to host order before consumption.
+std::uint32_t BigEndianToHost32(const std::uint8_t *p)
+{
+	return (static_cast<std::uint32_t>(p0) << 24) | (static_cast<std::uint32_t>(p1) << 16) |
+	       (static_cast<std::uint32_t>(p2) << 8) | (static_cast<std::uint32_t>(p3));
+}
+
+void UnpackInterleavedUint32(const std::uint8_t *bytes,
+	std::size_t byte_len,
+	unsigned num_channels,
+	std::vector<std::vector<std::uint32_t>> &out_channels)
+{
+	out_channels.assign(num_channels, std::vector<std::uint32_t>{});
+	if (!bytes || byte_len == 0 || num_channels == 0)
+		return;
+	const std::size_t total_u32s = byte_len / sizeof(std::uint32_t);
+	const std::size_t num_points = total_u32s / num_channels;
+	for (unsigned c = 0; c < num_channels; ++c) {
+		out_channelsc.reserve(num_points);
+	}
+	for (std::size_t p = 0; p < num_points; ++p) {
+		for (unsigned c = 0; c < num_channels; ++c) {
+			out_channelsc.push_back(
+				BigEndianToHost32(bytes + (p * num_channels + c) * sizeof(std::uint32_t)));
+		}
+	}
+}
+
+// Keep only the newest `keep` samples. The series arrive oldest-first, so
+// the tail is what survives.
+void TruncateToLast(std::vector<std::uint32_t> &v, std::uint32_t keep)
+{
+	if (keep > 0 && v.size() > static_cast<std::size_t>(keep)) {
+		v.erase(v.begin(), v.end() - keep);
+	}
+}
+
+} // namespace
+
+void ParseGraphsFromPacket(const CECPacket *resp, StatsGraphs &out)
+{
+	out = StatsGraphs{};
+	if (!resp)
+		return;
+
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATSGRAPH_DATA)) {
+		// 4 interleaved channels per amuled-side layout (Statistics.cpp):
+		//  ch0 = kBpsDownCur * 1024  (bytes per second)
+		//  ch1 = kBpsUpCur   * 1024  (bytes per second)
+		//  ch2 = cntConnections      (active client connections)
+		//  ch3 = kadNodesCur         (Kad nodes currently routed)
+		std::vector<std::vector<std::uint32_t>> channels;
+		UnpackInterleavedUint32(static_cast<const std::uint8_t *>(t->GetTagData()),
+			t->GetTagDataLen(),
+			/*num_channels=*/4,
+			channels);
+		if (channels.size() >= 4) {
+			out.download_bytes_per_second = std::move(channels0);
+			out.upload_bytes_per_second = std::move(channels1);
+			out.connections = std::move(channels2);
+			out.kad_nodes = std::move(channels3);
+		}
+	}
+	if (const CECTag *t = resp->GetTagByName(EC_TAG_STATSGRAPH_DATA_CONN)) {
+		// 2 interleaved channels, filled by the same amuled loop and from the same records as
+		// EC_TAG_STATSGRAPH_DATA, so index i lines up across both:
+		//  ch0 = cntUploads   (peers we are pushing to)
+		//  ch1 = cntDownloads (peers we are pulling from)
+		std::vector<std::vector<std::uint32_t>> channels;
+		UnpackInterleavedUint32(static_cast<const std::uint8_t *>(t->GetTagData()),
+			t->GetTagDataLen(),
+			/*num_channels=*/2,
+			channels);
+		if (channels.size() >= 2) {
+			out.active_uploads = std::move(channels0);
+			out.active_downloads = std::move(channels1);
+		}
+	}
+
+	// How many records a resolution range holds. Ask for more and the daemon repeats records
+	// instead of failing, which the caller cannot detect since no timestamps are on the wire --
+	// so this bounds every series below. Absent on daemons predating the tag.
+	{
+		std::uint16_t depth = 0;
+		if (resp->AssignIfExist(EC_TAG_STATSGRAPH_DEPTH, depth) && depth > 0) {
+			out.max_points = depth;
+		}
+	}
+
+	// The daemon divides both byte counters by 1024 before sending
+	// (Statistics.cpp, RecordHistory), so scale back to make the unit true.
+	if (resp->AssignIfExist(EC_TAG_STATSGRAPH_SESSION_DL, out.session_download_bytes)) {
+		out.session_download_bytes *= 1024;
+	}
+	if (resp->AssignIfExist(EC_TAG_STATSGRAPH_SESSION_UL, out.session_upload_bytes)) {
+		out.session_upload_bytes *= 1024;
+	}
+	// Not bytes: the time-integral of the Kad node count. Passed through
+	// unscaled -- it is only meaningful divided by the session duration.
+	resp->AssignIfExist(EC_TAG_STATSGRAPH_SESSION_KAD, out.session_kad_node_seconds);
+	resp->AssignIfExist(EC_TAG_STATSGRAPH_SESSION_TIMESPAN, out.session_duration_seconds);
+
+	// Drop anything past the daemon's per-range depth. Beyond it the walk hands back repeated
+	// records, and reconstructing a time axis over those draws them as distinct samples --
+	// silently compressing time across the plot.
+	TruncateToLast(out.download_bytes_per_second, out.max_points);
+	TruncateToLast(out.upload_bytes_per_second, out.max_points);
+	TruncateToLast(out.connections, out.max_points);
+	TruncateToLast(out.kad_nodes, out.max_points);
+	TruncateToLast(out.active_uploads, out.max_points);
+	TruncateToLast(out.active_downloads, out.max_points);
+}
+
+// --- /search/results (full fetch per tick) -----------------------------
+
+namespace
+{
+// CSearchFile::DownloadStatus (SearchFile.h) → wire string (issue #429).
+// Values are ABI-stable (serialized over EC as EC_TAG_PARTFILE_STATUS).
+const char *SearchStatusName(std::uint32_t code)
+{
+	switch (code) {
+	case 0: // NEW
+		return "new";
+	case 1: // DOWNLOADED
+		return "downloaded";
+	case 2: // QUEUED
+		return "queued";
+	case 3: // CANCELED
+		return "canceled";
+	case 4: // QUEUEDCANCELED
+		return "queued_canceled";
+	default:
+		return "new";
+	}
+}
+
+} // namespace
+
+// Definition of the shared token helper declared in Refresher.h; see there
+// for why there is only one.
+std::string FileTypeToken(const std::string &name)
+{
+	const wxString desc =
+		GetFiletypeByName(CPath(wxString::FromUTF8(name.c_str())), /*translated=*/false);
+	std::string s(desc.utf8_str());
+	std::transform(s.begin(), s.end(), s.begin(), (unsigned char c) {
+		return static_cast<char>(std::tolower(c));
+	});
+	// GetFiletypeDesc() returns UI labels, and lowercasing them left three problems in one
+	// enum: plurals where the token names ONE file's type, a hyphen where every other enum
+	// token is snake_case, and "any" for unknown.
+	static const std::map<std::string, std::string> kNormalised = {
+		{ "videos", "video" },
+		{ "audio", "audio" },
+		{ "archives", "archive" },
+		{ "disc images", "disc_image" },
+		{ "pictures", "picture" },
+		{ "texts", "text" },
+		{ "programs", "program" },
+		{ "any", "unknown" },
+	};
+	const auto it = kNormalised.find(s);
+	// An unrecognised label means the core grew a type this build does not
+	// know; "unknown" is the honest answer, and matches what "any" meant.
+	return it != kNormalised.end() ? it->second : std::string("unknown");
+}
+
+namespace
+{
+
+// "unknown" is deliberately absent: the rows report it for a file whose extension names no
+// category, and ed2k has no term for that, so a search filtered on it would quietly match nothing.
+// Rejecting it says so instead. Ordered as the desktop's dropdown is, because the error message
+// lists them in this order.
+const std::pair<const char *, const wxChar *> kSearchFileTypes = {
+	{ "audio", ED2KFTSTR_AUDIO },
+	{ "video", ED2KFTSTR_VIDEO },
+	{ "picture", ED2KFTSTR_IMAGE },
+	{ "text", ED2KFTSTR_DOCUMENT },
+	{ "program", ED2KFTSTR_PROGRAM },
+	{ "archive", ED2KFTSTR_ARCHIVE },
+	{ "disc_image", ED2KFTSTR_CDIMAGE },
+};
+
+} // namespace
+
+std::string SearchFileTypeTerm(const std::string &token)
+{
+	for (const auto &entry : kSearchFileTypes) {
+		if (token == entry.first) {
+			return std::string(wxString(entry.second).utf8_str());
+		}
+	}
+	return std::string();
+}
+
+std::string SearchFileTypeTokenList()
+{
+	std::string list;
+	for (const auto &entry : kSearchFileTypes) {
+		if (!list.empty()) {
+			list += ", ";
+		}
+		list += '"';
+		list += entry.first;
+		list += '"';
+	}
+	return list;
+}
+
+// Merge one EC_TAG_SEARCHFILE onto a result, writing only the fields the tag actually
+// carries. This is the whole contract of the incremental union poll: the daemon diffs a
+// result against what it last sent us and emits only what moved, so an absent field means
+// "unchanged", never "cleared".
+void MergeSearchResultTag(const CEC_SearchFile_Tag *sf, SearchResult &r)
+{
+	r.ecid = sf->ID();
+	// Identity and the immutable descriptors. Under INC_UPDATE these travel once and are diffed
+	// away afterwards, and the accessors go through GetTagByNameSafe -- an absent tag reads as
+	// "" or 0, which would wipe the field. So each is written only when its tag is actually on
+	// this packet.
+	if (sf->GetTagByName(EC_TAG_PARTFILE_HASH)) {
+		std::string h(sf->FileHashString().utf8_str());
+		std::transform(
+			h.begin(), h.end(), h.begin(), (unsigned char c) { return std::tolower(c); });
+		r.hash = std::move(h);
+	}
+	if (sf->GetTagByName(EC_TAG_PARTFILE_NAME)) {
+		r.name = std::string(sf->FileName().utf8_str());
+	}
+	if (sf->GetTagByName(EC_TAG_PARTFILE_SIZE_FULL)) {
+		r.size = sf->SizeFull();
+	}
+	{
+		std::uint32_t v = 0;
+		if (sf->AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT, v))
+			r.source_count = v;
+	}
+	{
+		std::uint32_t v = 0;
+		if (sf->AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT_XFER, v))
+			r.complete_source_count = v;
+	}
+	// Grouping: a child hit carries its parent's ECID in EC_TAG_SEARCH_PARENT.
+	// Folded into the parent's children in the second pass below.
+	{
+		std::uint32_t v = 0;
+		if (sf->AssignIfExist(EC_TAG_SEARCH_PARENT, v)) {
+			r.parent_ecid = v;
+			r.has_parent = true;
+		}
+	}
+	{
+		std::uint8_t v = 0;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_RATING, v))
+			r.rating = v;
+	}
+	// Download status: amuled packs the CSearchFile status in EC_TAG_PARTFILE_STATUS.
+	// `already_downloaded` is not its own field on the wire -- AlreadyHave() reads the same tag
+	// -- so both move together. Writing the absent case as status 0 would report every
+	// unchanged result as "new".
+	{
+		std::uint32_t v = 0;
+		if (sf->AssignIfExist(EC_TAG_PARTFILE_STATUS, v)) {
+			r.status = SearchStatusName(v);
+			r.already_downloaded = sf->AlreadyHave();
+		}
+	}
+	// Derived from the filename, so it is recomputed whenever the name is.
+	if (!r.name.empty()) {
+		r.type = FileTypeToken(r.name);
+	}
+	// Browse-only: the folder this file sits in inside the peer's share. The core attaches it
+	// to results filed from a shared-file listing and nothing else, so an ordinary server/Kad
+	// hit leaves it empty.
+	if (const CECTag *x = sf->GetTagByName(EC_TAG_SEARCHFILE_DIRECTORY)) {
+		r.directory = std::string(x->GetStringData().utf8_str());
+	}
+	// Media metadata, present when the hit carried FT_MEDIA_* tags. On a locally known file
+	// those are our own probe's values; on a remote hit they are whatever the responding server
+	// advertised, which is not validated anywhere and can contradict the file (a .pdf with a
+	// runtime and an xvid codec is a real observed result). Passed through as sent -- the API
+	// documents the search-result `media` as unverified.
+	{
+		std::uint32_t v = 0;
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_MEDIA_LENGTH, v)) {
+			r.media.duration_seconds = v;
+		}
+		if (sf->AssignIfExist(EC_TAG_KNOWNFILE_MEDIA_BITRATE, v)) {
+			r.media.bitrate_kilobits_per_second = v;
+		}
+	}
+	if (const CECTag *x = sf->GetTagByName(EC_TAG_KNOWNFILE_MEDIA_CODEC)) {
+		r.media.codec = std::string(x->GetStringData().utf8_str());
+	}
+	if (const CECTag *x = sf->GetTagByName(EC_TAG_KNOWNFILE_MEDIA_ARTIST)) {
+		r.media.artist = std::string(x->GetStringData().utf8_str());
+	}
+	if (const CECTag *x = sf->GetTagByName(EC_TAG_KNOWNFILE_MEDIA_ALBUM)) {
+		r.media.album = std::string(x->GetStringData().utf8_str());
+	}
+	if (const CECTag *x = sf->GetTagByName(EC_TAG_KNOWNFILE_MEDIA_TITLE)) {
+		r.media.title = std::string(x->GetStringData().utf8_str());
+	}
+	// Derived from the fields, exactly as MergeKnownFileDetail does for a shared file. Both
+	// paths share AddMediaTagsPresent on the daemon side, so either can be sent a zero / empty
+	// "this field is gone" tag -- latching on any tag being present would mark a result as
+	// having media with every field blank.
+	r.has_media = r.media.duration_seconds != 0 || r.media.bitrate_kilobits_per_second != 0 ||
+		      !r.media.codec.empty() || !r.media.artist.empty() || !r.media.album.empty() ||
+		      !r.media.title.empty();
+	// On-demand Kad community ratings/comments. Same 4-children-per-entry positional container
+	// the download side uses (username, filename, rating, comment).
+	//
+	// This container is the one field where absence is a value, not silence: it is built only
+	// when there are notes and is added without the valuemap, so it is never diffed away. An
+	// absent one means "no notes", and a present one replaces the set rather than appending.
+	// The searching flag beside it goes through the valuemap like everything else.
+	r.comments.clear();
+	if (const CECTag *cont = sf->GetTagByName(EC_TAG_PARTFILE_COMMENTS)) {
+		std::vector<const CECTag *> kids;
+		for (const CECTag &kid : *cont)
+			kids.push_back(&kid);
+		for (std::size_t i = 0; i + 3 < kids.size(); i += 4) {
+			SearchResult::Comment c;
+			c.username = std::string(kidsi->GetStringData().utf8_str());
+			c.filename = std::string(kidsi + 1->GetStringData().utf8_str());
+			c.rating =
+				static_cast<std::int32_t>(static_cast<std::int64_t>(kidsi + 2->GetInt()));
+			c.comment = std::string(kidsi + 3->GetStringData().utf8_str());
+			r.comments.push_back(std::move(c));
+		}
+	}
+	{
+		std::uint32_t v = 0;
+		if (sf->AssignIfExist(EC_TAG_PARTFILE_KAD_COMMENT_SEARCHING, v))
+			r.kad_comment_searching = v != 0;
+	}
+}
+
+// Rebuild the folded view (`results`) from the flat merge target (`raw`). Kept as a pass
+// over `raw` rather than merged into directly: a grouped child is addressable by its own
+// ECID on the wire and gets diffed tags of its own, so it has to stay in `raw`, while every
+// reader wants it nested in its parent.
+void RebuildFoldedResults(
+	const std::map<std::uint32_t, SearchResult> &raw, std::map<std::uint32_t, SearchResult> &out)
+{
+	out.clear();
+	// Parents first, so a child always finds its parent already present.
+	for (const auto &kv : raw) {
+		if (!kv.second.has_parent)
+			out.emplace(kv.first, kv.second);
+	}
+	// Then fold each child into its parent's children, so the API serves one row per hash+size
+	// with the alternative filenames nested. A child whose parent is not in the set -- which
+	// should not happen -- is promoted to a top-level row instead, so nothing is silently lost.
+	for (const auto &kv : raw) {
+		const SearchResult &child = kv.second;
+		if (!child.has_parent)
+			continue;
+		auto pit = out.find(child.parent_ecid);
+		if (pit == out.end()) {
+			out.emplace(kv.first, child);
+			continue;
+		}
+		SearchResult::Child c;
+		c.ecid = child.ecid;
+		c.name = child.name;
+		c.hash = child.hash;
+		c.source_count = child.source_count;
+		c.complete_source_count = child.complete_source_count;
+		c.directory = child.directory;
+		pit->second.children.push_back(std::move(c));
+	}
+}
+
+// Apply one incremental multi-search union reply across every search slot.
+//
+// The reply is not per-search: it carries every result of every search the daemon holds,
+// and it carries them incrementally. Two consequences.
+//
+// First, EC_TAG_SEARCH_ID travels only the first time the daemon tells us about a result --
+// after that the tag is diffed away, because a result never changes owner. So a tag without
+// one is attributed through `owner`.
+//
+// Second, absence no longer means deletion: removal is explicit, as one EC_TAG_FILE_REMOVED
+// per gone ECID. Sweeping "anything missing is gone" here would delete the whole result set
+// on the first quiet poll.
+void ApplySearchUnion(const CECPacket *resp,
+	std::map<std::uint32_t, SearchSlot> &slots,
+	std::map<std::uint32_t, std::uint32_t> &owner,
+	std::uint32_t default_sid)
+{
+	if (!resp)
+		return;
+	// Slots that actually took a change, so the fold below only re-runs for
+	// those rather than for every open search on every poll.
+	std::set<std::uint32_t> touched;
+
+	for (const CECTag &tag : *resp) {
+		const CECTag *t = &tag;
+
+		if (t->GetTagName() == EC_TAG_FILE_REMOVED) {
+			const std::uint32_t ecid = static_cast<std::uint32_t>(t->GetInt());
+			const auto oit = owner.find(ecid);
+			if (oit == owner.end())
+				continue;
+			const auto sit = slots.find(oit->second);
+			if (sit == slots.end()) {
+				owner.erase(oit);
+				continue;
+			}
+			if (sit->second.detached) {
+				// The daemon evicted this whole search and is tombstoning its results on
+				// the way out. Retirement deliberately keeps them for late reads, so the
+				// removals are ignored -- and the index entries with them, since nothing
+				// else will re-establish them.
+				continue;
+			}
+			if (sit->second.raw.erase(ecid) != 0)
+				touched.insert(oit->second);
+			owner.erase(oit);
+			continue;
+		}
+
+		if (t->GetTagName() != EC_TAG_SEARCHFILE)
+			continue;
+		const CEC_SearchFile_Tag *sf = static_cast<const CEC_SearchFile_Tag *>(t);
+		const std::uint32_t ecid = sf->ID();
+
+		// Present on a result's first appearance, diffed away afterwards.
+		//
+		// The index is written only once this tag is known to be applicable: a slot that turns
+		// out to be missing or detached takes an early exit, and an entry written ahead of those
+		// would outlive the slot it points at.
+		std::uint32_t sid = 0;
+		bool sid_is_new = false;
+		if (const CECTag *x = sf->GetTagByName(EC_TAG_SEARCH_ID)) {
+			sid = static_cast<std::uint32_t>(x->GetInt());
+			sid_is_new = true;
+		} else if (default_sid != 0) {
+			// A per-search reply: every tag in it belongs to the search the
+			// caller asked for, and that form carries no id of its own.
+			sid = default_sid;
+			sid_is_new = true;
+		} else {
+			const auto oit = owner.find(ecid);
+			if (oit == owner.end()) {
+				// A diffed tag for a result we have no record of. Only reachable if our
+				// slot went away while the daemon still believed we held it, and inventing
+				// a slot would produce a search with no lifecycle state.
+				continue;
+			}
+			sid = oit->second;
+		}
+
+		const auto sit = slots.find(sid);
+		if (sit == slots.end()) {
+			// Results for a search this session has no slot for -- one started in amulegui or the
+			// monolithic GUI, since the union responder walks every search the core holds.
+			// Dropped rather than auto-created: MarkSearchStarted / discovery own slot creation
+			// and the lifecycle state. Whoever creates the slot re-reads the search in full
+			// instead, via FetchOneSearchFull, which bypasses the differential stream.
+			owner.erase(ecid);
+			continue;
+		}
+		if (sit->second.detached) {
+			// Frozen: the daemon no longer holds this search, so anything
+			// arriving for it is the tail of an eviction, not an update.
+			continue;
+		}
+		if (sid_is_new)
+			ownerecid = sid;
+		auto &slot_results = sit->second.raw;
+		const auto existing = slot_results.find(ecid);
+		if (existing == slot_results.end()) {
+			// First sight of this result. Seed the fields whose "absent" reading differs between
+			// a fresh row and a diff: status has no sensible empty value, and merging onto a
+			// default-constructed SearchResult would leave it "", which is not a state any
+			// consumer knows.
+			SearchResult fresh;
+			fresh.ecid = ecid;
+			fresh.status = SearchStatusName(0);
+			MergeSearchResultTag(sf, fresh);
+			slot_results.emplace(ecid, std::move(fresh));
+		} else {
+			MergeSearchResultTag(sf, existing->second);
+			existing->second.ecid = ecid;
+		}
+		touched.insert(sid);
+	}
+
+	for (std::uint32_t sid : touched) {
+		const auto sit = slots.find(sid);
+		if (sit != slots.end())
+			RebuildFoldedResults(sit->second.raw, sit->second.results);
+	}
+}
+
+void ApplySearchFullReply(const CECPacket *resp,
+	std::map<std::uint32_t, SearchSlot> &slots,
+	std::map<std::uint32_t, std::uint32_t> &owner,
+	std::uint32_t search_id,
+	bool replace)
+{
+	auto sit = slots.find(search_id);
+	if (sit == slots.end())
+		return;
+	if (replace) {
+		// Drop the old rows AND their index entries: the reply below re-adds an
+		// entry for every result it carries, so anything not re-added is gone.
+		for (const auto &entry : sit->second.raw)
+			owner.erase(entry.first);
+		sit->second.raw.clear();
+	}
+	ApplySearchUnion(resp, slots, owner, search_id);
+	sit = slots.find(search_id);
+	if (sit == slots.end())
+		return;
+	// ApplySearchUnion only refolds slots it touched, and an empty reply touches
+	// nothing -- exactly the case where the stale fold has to be cleared.
+	if (replace) {
+		RebuildFoldedResults(sit->second.raw, sit->second.results);
+		// Only a replace answers the question the flag asks. A merge re-reads every row the
+		// daemon still has, but it cannot remove one it has dropped -- the tombstones went out in
+		// the union reply that was lost. Clearing the flag here would leave those rows in place
+		// for the life of the slot.
+		sit->second.needs_resync = false;
+	}
+}
+
+// --- Search-progress, daemon-supplied lifecycle path -------------------
+//
+// Reads EC_TAG_SEARCH_LIFECYCLE_STATE from the EC_OP_SEARCH_PROGRESS response. No sentinel
+// decode, no `saw_in_progress` tracking, no defensive timeout: the daemon's flag is the
+// source of truth, and amuleapi pins a version that carries the tag.
+SearchProgressSnapshot AdvanceSearchProgress(
+	const SearchProgressSnapshot &prev, std::uint32_t lifecycle_state, std::uint32_t pct_now)
+{
+	SearchProgressSnapshot next = prev;
+	if (lifecycle_state == 2 /* SEARCH_LIFECYCLE_FINISHED */) {
+		next.percent = 100;
+		next.complete = true;
+		next.active = false;
+	} else if (lifecycle_state == 1 /* SEARCH_LIFECYCLE_RUNNING */) {
+		next.complete = false;
+		next.active = true;
+		// Unified 0..100 the daemon already computed for this search kind (global
+		// = real server-queue percent; Kad = cosmetic time-ramp; local = instant).
+		next.percent = (pct_now > 100) ? 100 : pct_now;
+	} else {
+		// SEARCH_LIFECYCLE_IDLE -- refresher shouldn't be calling us
+		// in this state (active was true on entry), but stay defensive.
+		next.complete = false;
+		next.active = false;
+		next.percent = 0;
+	}
+	return next;
+}
+
+// --- /preferences + /categories (one EC roundtrip) ---------------------
+
+namespace
+{
+
+void ParseCategoryTag(const CECTag *cat_tag, CategorySnapshot &c)
+{
+	const CEC_Category_Tag *ct = static_cast<const CEC_Category_Tag *>(cat_tag);
+	// Category index lives in the tag's int payload, set by CECTag(name,
+	// cat_index) at construction (ECSpecialCoreTags.cpp category ctor).
+	c.index = static_cast<std::uint32_t>(ct->GetInt());
+	c.name = std::string(ct->Name().utf8_str());
+	c.path = std::string(ct->Path().utf8_str());
+	c.comment = std::string(ct->Comment().utf8_str());
+	c.color = ct->Color();
+	c.priority_code = ct->Prio();
+	// Reuse the download-priority namer -- categories share the PR_* code space.
+	{
+		bool _ignore = false;
+		c.priority = PriorityName(c.priority_code, _ignore);
+	}
+}
+
+void ParseGeneralPrefs(const CECTag *gen, PreferencesSnapshot &out)
+{
+	if (const CECTag *t = gen->GetTagByName(EC_TAG_USER_NICK)) {
+		out.nickname = std::string(t->GetStringData().utf8_str());
+	}
+	if (const CECTag *t = gen->GetTagByName(EC_TAG_USER_HASH)) {
+		out.user_hash = std::string(t->GetMD4Data().Encode().Lower().utf8_str());
+	}
+	if (const CECTag *t = gen->GetTagByName(EC_TAG_USER_HOST)) {
+		out.daemon_host_name = std::string(t->GetStringData().utf8_str());
+	}
+	// Read the value, not the tag's presence: the core always sends this one,
+	// so presence-testing it could only ever answer true.
+	if (const CECTag *t = gen->GetTagByName(EC_TAG_GENERAL_CHECK_NEW_VERSION)) {
+		out.version_check_enabled = (t->GetInt() != 0);
+	}
+	// Capability: 3.1+ daemons always send this bool (true when built with
+	// ENABLE_VERSION_CHECK, false when compiled out). Absent means a pre-3.1 daemon that cannot
+	// relay a result over EC anyway, so it stays false.
+	if (const CECTag *t = gen->GetTagByName(EC_TAG_GENERAL_VERSION_CHECK_AVAILABLE)) {
+		out.version_check_available = t->GetInt() != 0;
+	}
+	if (const CECTag *t = gen->GetTagByName(EC_TAG_GENERAL_UPNP_AVAILABLE)) {
+		out.upnp_supported = t->GetInt() != 0;
+	}
+}
+
+void ParseConnectionPrefs(const CECTag *conn, PreferencesSnapshot &out)
+{
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_CONN_MAX_UL)) {
+		out.max_upload_kibibytes_per_second = static_cast<std::uint32_t>(t->GetInt());
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_CONN_MAX_DL)) {
+		out.max_download_kibibytes_per_second = static_cast<std::uint32_t>(t->GetInt());
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_CONN_SLOT_ALLOCATION)) {
+		out.upload_slot_min_kibibytes_per_second = static_cast<std::uint32_t>(t->GetInt());
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_CONN_TCP_PORT)) {
+		out.tcp_port = static_cast<std::uint16_t>(t->GetInt());
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_CONN_UDP_PORT)) {
+		out.udp_port = static_cast<std::uint16_t>(t->GetInt());
+	}
+	// EmptyTag markers (presence = true, absence = false). Positive sense: the
+	// daemon emits EC_TAG_CONN_UDP_DISABLE only when the port is off.
+	out.extended_udp_port_enabled = conn->GetTagByName(EC_TAG_CONN_UDP_DISABLE) == nullptr;
+	out.autoconnect = conn->GetTagByName(EC_TAG_CONN_AUTOCONNECT) != nullptr;
+	out.reconnect_on_connection_loss = conn->GetTagByName(EC_TAG_CONN_RECONNECT) != nullptr;
+	out.ed2k_enabled = conn->GetTagByName(EC_TAG_NETWORK_ED2K) != nullptr;
+	out.kad_enabled = conn->GetTagByName(EC_TAG_NETWORK_KADEMLIA) != nullptr;
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_CONN_BIND_ADDRESS)) {
+		out.bind_address = std::string(t->GetStringData().utf8_str());
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_CONN_BIND_INTERFACE)) {
+		out.bind_interface = std::string(t->GetStringData().utf8_str());
+	}
+	// Proxy (password is write-only: deliberately not read here).
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_PROXY_ENABLE)) {
+		out.proxy_enabled = t->GetInt() != 0;
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_PROXY_TYPE)) {
+		// Wire int -> API enum string (#655). An out-of-range value leaves
+		// the field empty rather than inventing a type the daemon never sent.
+		switch (t->GetInt()) {
+		case 0:
+			out.proxy_type = "socks5";
+			break;
+		case 1:
+			out.proxy_type = "socks4";
+			break;
+		case 2:
+			out.proxy_type = "http";
+			break;
+		case 3:
+			out.proxy_type = "socks4a";
+			break;
+		default:
+			out.proxy_type.clear();
+			break;
+		}
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_PROXY_HOST)) {
+		out.proxy_host = std::string(t->GetStringData().utf8_str());
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_PROXY_PORT)) {
+		out.proxy_port = static_cast<std::uint16_t>(t->GetInt());
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_PROXY_AUTH)) {
+		out.proxy_auth_enabled = t->GetInt() != 0;
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_PROXY_USER)) {
+		out.proxy_user = std::string(t->GetStringData().utf8_str());
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_CONN_UPNP_ENABLED)) {
+		out.upnp_enabled = t->GetInt() != 0;
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_CONN_UPNP_TCP_PORT)) {
+		out.upnp_control_point_port = static_cast<std::uint16_t>(t->GetInt());
+	}
+
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_CONN_MAX_FILE_SOURCES)) {
+		out.max_sources_per_file_count = static_cast<std::uint32_t>(t->GetInt());
+	}
+	if (const CECTag *t = conn->GetTagByName(EC_TAG_CONN_MAX_CONN)) {
+		out.max_connection_count = static_cast<std::uint32_t>(t->GetInt());
+	}
+}
+
+// --- Extended EC-carried preference categories ------
+//
+// One walk over the declarative field table in PrefsSchema.cpp replaces the twelve
+// hand-written per-category parsers this used to be.
+//
+// Boolean encoding follows the core serializer (ECSpecialMuleTags.cpp): most bools are
+// emitted as a bare CECEmptyTag only when true, so presence == true and absence must
+// actively write `false`; a few are emitted as a value tag every time, and those leave the
+// member at its default when the tag is missing. That difference is the PrefEnc column.
+
+void ApplyPrefFieldFromTag(const PrefField &f, const CECTag *group, PreferencesSnapshot &out)
+{
+	if (!f.member)
+		return; // write-only row: nothing is ever read back
+
+	const CECTag *t = group->GetTagByName(f.tag);
+
+	if (f.type == PrefType::Bool && f.enc == PrefEnc::Presence) {
+		// Presence tags carry their answer in absence too, so this assigns
+		// unconditionally. `invert` covers EC_TAG_CONN_UDP_DISABLE.
+		const bool present = (t != nullptr);
+		*static_cast<bool *>(f.member(out)) = f.invert ? !present : present;
+		return;
+	}
+
+	if (!t)
+		return; // absent value tag: keep the snapshot default
+
+	switch (f.type) {
+	case PrefType::Bool: {
+		const bool v = (t->GetInt() != 0);
+		*static_cast<bool *>(f.member(out)) = f.invert ? !v : v;
+		break;
+	}
+	case PrefType::Uint16:
+		*static_cast<std::uint16_t *>(f.member(out)) = static_cast<std::uint16_t>(t->GetInt());
+		break;
+	case PrefType::Uint32: {
+		// ec_scale != 0 means EC and the API use different units. Division is exact for the three
+		// rows that use it -- the core stores whole minutes and multiplies on the way out -- so
+		// nothing is lost here.
+		const std::uint64_t raw = static_cast<std::uint64_t>(t->GetInt());
+		*static_cast<std::uint32_t *>(f.member(out)) =
+			static_cast<std::uint32_t>(f.ec_scale ? raw / f.ec_scale : raw);
+		break;
+	}
+	case PrefType::String:
+		*static_cast<std::string *>(f.member(out)) = std::string(t->GetStringData().utf8_str());
+		break;
+	case PrefType::Md4Hex:
+		*static_cast<std::string *>(f.member(out)) =
+			std::string(t->GetMD4Data().Encode().Lower().utf8_str());
+		break;
+	case PrefType::StringArray: {
+		auto &vec = *static_cast<std::vector<std::string> *>(f.member(out));
+		vec.clear();
+		for (const CECTag &child : *t) {
+			if (child.GetTagName() == EC_TAG_STRING)
+				vec.emplace_back(child.GetStringData().utf8_str());
+		}
+		break;
+	}
+	case PrefType::Enum: {
+		// The wire carries the index into the row's name table. An out-of-range value leaves the
+		// default rather than inventing a member the daemon never named. GetInt() is unsigned, so
+		// the index stays unsigned: a signed copy would narrow, and the >= 0 half of the range
+		// check would be dead.
+		const std::uint64_t idx = t->GetInt();
+		std::uint64_t n = 0;
+		while (f.enum_namesn != nullptr)
+			++n;
+		if (idx < n)
+			*static_cast<std::string *>(f.member(out)) = f.enum_namesidx;
+		break;
+	}
+	}
+}
+
+} // namespace
+
+void ParsePreferencesFromPacket(
+	const CECPacket *resp, PreferencesSnapshot &out_prefs, std::vector<CategorySnapshot> &out_cats)
+{
+	out_cats.clear();
+	if (!resp)
+		return;
+
+	// Each prefs sub-section is one top-level CECEmptyTag with named child
+	// fields; the table says which section every field lives in.
+	for (std::size_t i = 0; i < PrefSchemaSize(); ++i) {
+		const PrefField &f = PrefSchema()i;
+		const ec_tagname_t group_tag = f.read_group != 0 ? f.read_group : PrefGroupTagFor(f.category);
+		if (const CECTag *group = resp->GetTagByName(group_tag))
+			ApplyPrefFieldFromTag(f, group, out_prefs);
+	}
+
+	// Capability flag that is not a /preferences field: it is reported by /version, so it has
+	// no schema row. Absent means a pre-3.1 daemon that cannot relay a result over EC anyway,
+	// so it stays false.
+	if (const CECTag *gen = resp->GetTagByName(EC_TAG_PREFS_GENERAL)) {
+		if (const CECTag *t = gen->GetTagByName(EC_TAG_GENERAL_VERSION_CHECK_AVAILABLE))
+			out_prefs.version_check_available = (t->GetInt() != 0);
+	}
+
+	if (const CECTag *cats = resp->GetTagByName(EC_TAG_PREFS_CATEGORIES)) {
+		for (CECTag::const_iterator it = cats->begin(); it != cats->end(); ++it) {
+			const CECTag *cat = &*it;
+			if (cat->GetTagName() != EC_TAG_CATEGORY)
+				continue;
+			CategorySnapshot c;
+			ParseCategoryTag(cat, c);
+			out_cats.push_back(std::move(c));
+		}
+	}
+}
+
+// RefresherTick + TwoPhaseRefresh live in RefresherTick.cpp so this TU stays App-free and
+// the unit tests can link the Apply* functions without pulling in wxApp /
+// ExternalConnector.
+
+} // namespace webapi

amule-3.1.0.tar.gz/src/webapi/Refresher.h Added

@@ -0,0 +1,270 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_REFRESHER_H
+#define WEBAPI_REFRESHER_H
+
+#include <cstdint>
+#include <ctime> // std::time_t -- needed for AdvanceSearchProgress
+#include <map>
+#include <string>
+#include <vector>
+
+class CECPacket;
+class CEC_SearchFile_Tag;
+class CamuleapiApp;
+class PartFileEncoderData;
+
+namespace webapi
+{
+
+class CState;
+
+// Single tick of the EC poller. Issues every cached request, parses each response into a snapshot
+// struct, writes it under CState's exclusive lock. Returns true on success, false if any EC
+// roundtrip failed (the caller flips CState::MarkTickFailure and leaves stale data in place).
+//
+// Runs on the wxApp thread (the same thread CRemoteConnect uses for its socket I/O), so it can
+// issue the EC roundtrip synchronously without thread-marshalling. Mutation handlers on the HTTP
+// threads reach EC through a process-wide mutex around `CamuleapiApp::SendRecvMsg_v2`, so refresher
+// and mutations share the same EC-traffic budget.
+//
+// Pure-function shape (app + state by reference, returns bool) so the tick body is unit-testable
+// against a mock EC reply.
+bool RefresherTick(CamuleapiApp &app, CState &state);
+
+// Outcome of one EC_OP_SEARCH_RESULTS fetch for a single search.
+enum class SearchFetchOutcome
+{
+	Updated,  //!< results merged into the slot
+	Expired,  //!< the daemon no longer holds this search (EC_TAG_SEARCH_EXPIRED)
+	EcFailed, //!< the roundtrip failed; the slot is untouched
+};
+
+// Pull one search's full result set from the daemon and merge it into that search's slot. Shared by
+// the per-tick poll of ACTIVE searches and by the on-demand refresh the read paths use for a
+// FINISHED one, so both issue the identical request and feed the identical applier.
+SearchFetchOutcome FetchSearchResults(CamuleapiApp &app, CState &state);
+
+// Re-fetch one search at EC_DETAIL_FULL. The union has no resync opcode, so this is how a newly
+// discovered slot is filled and how a request handler refreshes without becoming a second issuer of
+// the stateful stream. See the definition.
+SearchFetchOutcome FetchOneSearchFull(
+	CamuleapiApp &app, CState &state, std::uint32_t search_id, bool replace = false);
+
+// Single-threaded SSE diff emission. Called ONLY from the wxApp refresher loop after a successful
+// RefresherTick, so the LastSeenState walk is single-writer. Inline-from-HTTP RefresherTick call
+// sites deliberately skip it -- SSE subscribers see the post-mutation diff on the next tick.
+void EmitDiffsForEventBus(CamuleapiApp &app, const CState &state);
+
+// Bring the diff baseline up to the current state without publishing. Used on the first tick after
+// diffs were skipped, which would otherwise emit one event per record; whoever subscribed during
+// the gap gets `resync` instead.
+void PrimeDiffBaseline(CamuleapiApp &app, const CState &state);
+
+// Sub-tick helpers exposed for testing. The Refresher uses these internally; the unit test calls
+// them against hand-crafted CECPacket fixtures to pin the EC-tag-to-State mapping without standing
+// up a real amuled.
+
+struct StatusSnapshot;
+struct FileSnapshot;
+struct ClientSnapshot;
+struct FriendSnapshot;
+struct ChatSessionSnapshot;
+struct ServerSnapshot;
+struct KadSnapshot;
+struct CategorySnapshot;
+struct PreferencesSnapshot;
+class FileMap;
+
+void ParseStatusFromPacket(const CECPacket *resp, StatusSnapshot &out);
+// Kad detail rides the same STAT_REQ response -- amuled bundles EC_TAG_STATS_KAD_* into the
+// standard CMD-level stats packet, so /status calls ParseStatus and /kad calls this against the
+// same packet pointer.
+void ParseKadFromPacket(const CECPacket *resp, KadSnapshot &out);
+
+// Drain new amule-log lines from the STAT_REQ response. amule's EC server piggybacks them inside an
+// EC_TAG_STATS_LOGGER_MESSAGE parent tag with child EC_TAG_STRING tags, but ONLY when the STAT_REQ
+// was issued at EC_DETAIL_FULL (or INC_UPDATE).
+void ParseAmuleLogFromPacket(const CECPacket *resp, std::vector<std::string> &out_new_lines);
+
+// Union EC_OP_SEARCH_PROGRESS response -> {search id: {percent, lifecycle state}} for every search
+// the daemon reported.
+//
+// Returns false unless the reply really is an EC_OP_SEARCH_PROGRESS, and the caller MUST honour
+// that: absence from a union reply is how a search is learnt to have expired, so treating an
+// unparseable reply as an empty union would retire every search the caller is tracking in one pass.
+// An EC_OP_FAILED must therefore fall back to per-id polling, not be read as "all gone".
+//
+// An *empty* union with the right opcode is NOT malformed -- it is the daemon legitimately saying
+// it holds none of the searches asked about.
+bool ParseSearchProgressUnion(
+	const CECPacket *resp, std::map<std::uint32_t, std::pair<std::uint32_t, std::uint32_t>> &out);
+
+// EC_OP_GET_PREFERENCES response -> flat prefs + bundled categories (the packet carries categories
+// under EC_TAG_PREFS_CATEGORIES), so one roundtrip populates both /preferences and /categories.
+void ParsePreferencesFromPacket(
+	const CECPacket *resp, PreferencesSnapshot &out_prefs, std::vector<CategorySnapshot> &out_cats);
+
+// Locale-independent file-type token from a filename: the desktop's own category label
+// (GetFiletypeByName, untranslated) lowercased -- "audio", "video", "disc images", "any". Reuses the
+// GUI categorization rather than duplicating the extension table. One owner, because this lived
+// twice character for character and the two keys could drift apart silently.
+std::string FileTypeToken(const std::string &name);
+
+// The same vocabulary read backwards, for the POST /search filter: one of the tokens above to the
+// ed2k FT_FILETYPE term amuled matches on, or "" for a token it does not accept. Here rather than
+// in the handler so both directions of the token set are in one place: a client filters with the
+// value the rows report, and adding a category means touching one file.
+std::string SearchFileTypeTerm(const std::string &token);
+
+// The accepted tokens as a quoted, comma-separated list, for the error message the handler returns.
+// Built from the same table, so a category added there names itself in the error too.
+std::string SearchFileTypeTokenList();
+
+// EC_OP_GET_UPDATE at EC_DETAIL_INC_UPDATE is the consolidated fetch backing downloads + shared +
+// servers in a single roundtrip. Response shape:
+//  * top-level interleaved EC_TAG_PARTFILE (downloads) and EC_TAG_KNOWNFILE (shared) -- full
+//    identity on first encounter, stat-only deltas on later ticks via the server-side valuemap.
+//  * top-level EC_TAG_FILE_REMOVED markers for both caches (the encoder map is unified
+//    server-side).
+//  * EC_TAG_SERVER container -- full list every tick, valuemap-suppressed unchanged fields.
+//  * EC_TAG_CLIENT container -- consumed into /clients. Filtered server-side by the global
+//    TransmitOnlyUploadingClients pref; /uploads stays bound to the upload-queue semantic via
+//    EC_OP_GET_ULOAD_QUEUE.
+//  * EC_TAG_FRIEND container -- consumed into /friends.
+//
+// Why INC_UPDATE instead of per-substruct UPDATE: the per-substruct paths at EC_DETAIL_UPDATE
+// strip identity via an early return in ECSpecialCoreTags.cpp, forcing a second FULL-detail
+// roundtrip. INC_UPDATE does not hit that, so identity arrives in one shot.
+
+// Merges download-walker state (EC_TAG_PARTFILE children) into the unified file map. Sets
+// `is_downloading=true` on touched entries and writes only the download sub-block. FILE_REMOVED
+// clears the download role, and drops the entry entirely if `is_shared` was also false.
+void ApplyGetUpdateToDownloads(
+	const CECPacket *resp, FileMap &cache, std::map<std::uint32_t, PartFileEncoderData> &rle_state);
+
+// Merges shared-walker state (EC_TAG_KNOWNFILE / EC_TAG_PARTFILE with the SHARED flag) into the
+// same unified map. Sets `is_shared=true`, updates the shared sub-block, and clears the shared role
+// on PARTFILE_SHARED=false / FILE_REMOVED.
+//
+// `rle_state` is the same per-ECID decoder map the downloads walker uses, and deliberately so:
+// amuled keeps exactly one encoder per ECID (CFileEncoderMap::UpdateEncoders) and emits it as
+// EC_TAG_PARTFILE or EC_TAG_KNOWNFILE, never both, so a single decoder map mirrors the daemon's
+// encoder set 1:1. The downloads walker already evicts on EC_TAG_FILE_REMOVED, which is the only
+// way an ECID's encoder is torn down and rebuilt.
+void ApplyGetUpdateToShared(
+	const CECPacket *resp, FileMap &cache, std::map<std::uint32_t, PartFileEncoderData> &rle_state);
+
+void ApplyGetUpdateToServers(const CECPacket *resp, std::map<std::uint32_t, ServerSnapshot> &cache);
+
+// Consumes the EC_TAG_FRIEND container the daemon appends to every
+// EC_OP_GET_UPDATE reply, so /friends is served from the tick we already run.
+void ApplyGetUpdateToFriends(const CECPacket *resp, std::map<std::uint32_t, FriendSnapshot> &cache);
+
+// EC_OP_CHAT_SESSIONS -> the /chats snapshot. `cursor` is read as the value sent with the request
+// and written back with the store's current last id.
+//
+// The reply is the daemon's COMPLETE session set, so this replaces the vector rather than merging:
+// a session missing from a reply was closed, and that absence is the only signal a close produces.
+// Messages arrive incrementally.
+void ApplyChatSessions(const CECPacket *resp,
+	std::vector<ChatSessionSnapshot> &cache,
+	std::uint32_t &cursor,
+	std::vector<ChatSessionSnapshot> &out_new_messages,
+	std::vector<std::uint64_t> &out_closed);
+
+// ed2k server priority, both directions. The SRV_PR_* wire values are not monotone (NORMAL=0,
+// HIGH=1, LOW=2), so callers must never assume a name's position in a list is its code.
+const char *ServerPriorityName(std::uint32_t prio_code);
+bool ServerPriorityCode(const std::string &name, std::uint32_t &out_code);
+
+// /stats/tree (EC_OP_GET_STATSTREE response). Recursive walk -- every EC_TAG_STATTREE_NODE with
+// children becomes a branch. The top-level root is an unnamed container, skipped so its direct
+// children are the visible tree.
+struct StatsTreeNode;
+void ParseStatsTreeFromPacket(const CECPacket *resp, StatsTreeNode &out);
+
+// /stats/graphs/{graph} (EC_OP_GET_STATSGRAPHS response). amuled packs the four time-series into
+// byte blobs (two interleaved channels in EC_TAG_STATSGRAPH_DATA plus a separate
+// EC_TAG_STATSGRAPH_DATA_CONN).
+struct StatsGraphs;
+void ParseGraphsFromPacket(const CECPacket *resp, StatsGraphs &out);
+
+// /search/results (EC_OP_SEARCH_RESULTS response). Full-state fetch per tick;
+// like /servers, no INC path exists for the search list. Keyed by ECID.
+struct SearchResult;
+struct SearchSlot;
+// Merge one EC_TAG_SEARCHFILE onto a result, writing only the fields the tag carries. Exposed for
+// the unit tests, which pin the absent-means-unchanged contract field by field.
+void MergeSearchResultTag(const CEC_SearchFile_Tag *sf, SearchResult &r);
+
+// Rebuild the folded view from the flat merge target: children nested into
+// their parents, orphans promoted.
+void RebuildFoldedResults(
+	const std::map<std::uint32_t, SearchResult> &raw, std::map<std::uint32_t, SearchResult> &out);
+
+// Apply one incremental multi-search union reply across every slot, keeping the ECID -> search_id
+// index in step. See the definition for why absence cannot mean deletion here. `default_sid`
+// attributes tags that carry no EC_TAG_SEARCH_ID of their own: zero for the union reply, where a
+// missing id means "already known"; set for a per-search reply, which never stamps one.
+void ApplySearchUnion(const CECPacket *resp,
+	std::map<std::uint32_t, SearchSlot> &slots,
+	std::map<std::uint32_t, std::uint32_t> &owner,
+	std::uint32_t default_sid = 0);
+
+// Apply one per-search EC_DETAIL_FULL reply to a single slot.
+//
+// `replace` swaps the slot's results for what the daemon reports now instead of merging onto them,
+// which is what a re-seed after a lost union reply needs: a FULL reply carries no tombstones, so a
+// merge cannot express a row the daemon has dropped. It is also the only mode that discharges
+// SearchSlot::needs_resync -- clearing it after a merge would strand them.
+void ApplySearchFullReply(const CECPacket *resp,
+	std::map<std::uint32_t, SearchSlot> &slots,
+	std::map<std::uint32_t, std::uint32_t> &owner,
+	std::uint32_t search_id,
+	bool replace);
+
+// Search-progress derivation from the EC_TAG_SEARCH_LIFECYCLE_* tags. `lifecycle_state` is the
+// uint8 enum value (0=idle, 1=running, 2=finished). `pct_now` is the daemon's unified 0..100 for
+// every search kind, passed straight through with no per-kind masking. Pure function: no I/O, no
+// globals.
+struct SearchProgressSnapshot;
+SearchProgressSnapshot AdvanceSearchProgress(
+	const SearchProgressSnapshot &prev, std::uint32_t lifecycle_state, std::uint32_t pct_now);
+
+// `ApplyGetUpdateToClients` consumes the EC_TAG_CLIENT container from the consolidated GET_UPDATE
+// response, with "seen-this-tick = keep, absent = evict" semantics: every alive client surfaces
+// every tick via the outer per-client tag, since CValueMap suppression operates on the tag's
+// *children*.
+//
+// `files` lets the walker resolve EC_TAG_CLIENT_UPLOAD_FILE / EC_TAG_CLIENT_REQUEST_FILE (raw
+// amuled ECIDs) into MD4 hashes at walker time. It is the live map, so pass it via
+// CState::MutateClientsWithFiles AFTER the downloads/shared walkers have run on the same tick.
+void ApplyGetUpdateToClients(
+	const CECPacket *resp, std::map<std::uint32_t, ClientSnapshot> &cache, const FileMap &files);
+
+} // namespace webapi
+
+#endif // WEBAPI_REFRESHER_H

amule-3.1.0.tar.gz/src/webapi/RefresherTick.cpp Added

@@ -0,0 +1,470 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// Refresher orchestration -- the per-tick loop body that issues EC
+// requests via `CamuleapiApp::SendRecvSerialized`. Split from
+// Refresher.cpp so the pure parser/applier code (`ApplyDownloads*`,
+// `ApplyUploads*`, `ApplyShared*`, `ParseStatusFromPacket`) stays
+// linkable from the unit tests without dragging the wxApp /
+// ExternalConnector dependency tree in via App.h.
+
+#include "Refresher.h"
+
+#include "App.h"
+#include "EventDiff.h"
+#include "State.h"
+
+#include <ec/cpp/ECSpecialTags.h>
+#include <ec/cpp/ECPacket.h>
+
+#include <algorithm>
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <set>
+#include <vector>
+
+namespace webapi
+{
+
+// One id-less EC_OP_SEARCH_RESULTS at EC_DETAIL_INC_UPDATE: the daemon answers with every result of
+// every search it holds, incrementally. This replaced one EC_DETAIL_FULL roundtrip per active
+// search, each carrying that search's whole result set every tick whether or not anything had
+// changed. With eliding, an unchanged result costs nothing on the wire and an idle or finished
+// search nothing at all -- which makes polling finished searches affordable, and is why the caller
+// no longer filters on ActiveSearchIds().
+//
+// No single-search fallback: amuleapi advertises multi-search unconditionally and never checks
+// whether the daemon supports it (App.cpp), so it has always required a matching daemon for search.
+// EC_TAG_CAN_PARTIAL_SEARCH is advertised for every client of CRemoteConnect, so the daemon is
+// already eliding for this connection.
+//
+// The mutex serialises the two issuers of the search stream across the roundtrip AND the apply.
+// SendRecvSerialized only orders the roundtrips; both callers then take the State lock separately,
+// so a union reply and a FULL reply can still be applied in the opposite order to the one they were
+// fetched in. The union's tombstones are one-shot -- the daemon drops an ECID from
+// io_lastSentResultIds as it emits EC_TAG_FILE_REMOVED for it -- so a stale FULL landing after a
+// tombstone re-inserts a row nothing will ever remove. Held across the EC call, the same wait the
+// EC worker already imposes; the State lock is always taken inside this one.
+std::mutex g_search_stream_mtx;
+
+SearchFetchOutcome FetchSearchResults(CamuleapiApp &app, CState &state)
+{
+	std::lock_guard<std::mutex> stream_lock(g_search_stream_mtx);
+	std::unique_ptr<CECPacket> req(new CECPacket(EC_OP_SEARCH_RESULTS, EC_DETAIL_INC_UPDATE));
+	// Opt into result grouping (issue #431): the empty EC_TAG_SEARCH_PARENT flag tells the
+	// responder to also emit each same-hash/different-name child so the results list can nest
+	// them.
+	req->AddTag(CECEmptyTag(EC_TAG_SEARCH_PARENT));
+	const CECPacket *resp = app.SendRecvSerialized(req.get());
+	if (!resp)
+		return SearchFetchOutcome::EcFailed;
+	state.MutateAllSearches(&(std::map<std::uint32_t, SearchSlot> &slots,
+					std::map<std::uint32_t, std::uint32_t> &owner) {
+		ApplySearchUnion(resp, slots, owner);
+	});
+	delete resp;
+	return SearchFetchOutcome::Updated;
+}
+
+// Re-fetch ONE search at EC_DETAIL_FULL, bypassing the union entirely.
+//
+// The union is a stateful differential stream: the daemon records what it has sent this connection
+// and then sends only changes, with no opcode for "send it all again". This is the escape hatch,
+// needed three ways.
+//
+// Seeding a newly discovered slot: the union responder walks every search the core holds,
+// ApplySearchUnion drops results for a search it has no slot for, and the daemon has already marked
+// those ECIDs delivered -- dropped once means dropped forever, so a slot created later by discovery
+// would stay empty.
+//
+// Serving the HTTP thread: the union must have exactly one issuer, or two replies can be applied
+// out of order and leave a ghost row no later poll can clear. A FULL reply is self-contained but
+// not ordered against the union's one-shot tombstones, so this shares g_search_stream_mtx.
+//
+// Re-seeding after a lost union reply, with `replace`: a merge cannot express a deletion and a FULL
+// reply carries no tombstones, so replace mode swaps the slot's results wholesale.
+SearchFetchOutcome FetchOneSearchFull(CamuleapiApp &app, CState &state, std::uint32_t search_id, bool replace)
+{
+	std::lock_guard<std::mutex> stream_lock(g_search_stream_mtx);
+	std::unique_ptr<CECPacket> req(new CECPacket(EC_OP_SEARCH_RESULTS, EC_DETAIL_FULL));
+	req->AddTag(CECEmptyTag(EC_TAG_SEARCH_PARENT));
+	req->AddTag(CECTag(EC_TAG_SEARCH_ID, search_id));
+	const CECPacket *resp = app.SendRecvSerialized(req.get());
+	if (!resp)
+		return SearchFetchOutcome::EcFailed;
+	SearchFetchOutcome outcome = SearchFetchOutcome::Updated;
+	if (resp->GetTagByName(EC_TAG_SEARCH_EXPIRED)) {
+		outcome = SearchFetchOutcome::Expired;
+	} else {
+		// Same merge the union uses. The per-search responder builds its tags without a
+		// valuemap, so every field is present and the merge's absent-means-unchanged rule
+		// never fires. The reply carries no EC_TAG_SEARCH_ID of its own, hence the explicit
+		// id.
+		state.MutateAllSearches(&(std::map<std::uint32_t, SearchSlot> &slots,
+						std::map<std::uint32_t, std::uint32_t> &owner) {
+			ApplySearchFullReply(resp, slots, owner, search_id, replace);
+		});
+	}
+	if (outcome == SearchFetchOutcome::Expired) {
+		// Definitive answer, just not a useful one: the daemon no longer has this search,
+		// so retirement owns the slot. Clearing the flag stops it being re-requested every
+		// tick.
+		state.ClearSearchResyncFlag(search_id);
+	}
+	delete resp;
+	return outcome;
+}
+
+bool RefresherTick(CamuleapiApp &app, CState &state)
+{
+	// Per-tick budget: a few EC ops via SendRecvSerialized (m_ec_mtx-serialised). Any failure
+	// bails the whole tick so the cache stays internally consistent. STAT_REQ runs first as the
+	// cheapest probe: an EC drop between ticks is caught before larger queries burn roundtrips.
+
+	// /status + /kad + /logs/amule share one STAT_REQ packet. Detail level CMD -> FULL because
+	// amuled only piggybacks EC_TAG_STATS_LOGGER_MESSAGE at FULL or INC_UPDATE. FULL also
+	// carries STATS_UP_OVERHEAD / STATS_DOWN_OVERHEAD and the two free-space tags, so dropping
+	// to CMD would silently empty those fields too.
+	{
+		std::unique_ptr<CECPacket> req(new CECPacket(EC_OP_STAT_REQ, EC_DETAIL_FULL));
+		const CECPacket *resp = app.SendRecvSerialized(req.get());
+		if (!resp)
+			return false;
+		StatusSnapshot s;
+		ParseStatusFromPacket(resp, s);
+		state.WriteStatus(std::move(s));
+		KadSnapshot k;
+		ParseKadFromPacket(resp, k);
+		state.WriteKad(std::move(k));
+		std::vector<std::string> new_log_lines;
+		ParseAmuleLogFromPacket(resp, new_log_lines);
+		if (!new_log_lines.empty()) {
+			state.AppendAmuleLog(std::move(new_log_lines));
+		}
+		delete resp;
+	}
+
+	// /downloads + /shared + /servers in a single GET_UPDATE roundtrip at EC_DETAIL_INC_UPDATE.
+	// The response packet shape and the "why INC_UPDATE works in one tick" rationale are
+	// documented next to ApplyGetUpdateToDownloads in Refresher.h.
+	//
+	// The response also carries EC_TAG_CLIENT (filtered server-side by
+	// TransmitOnlyUploadingClients) and EC_TAG_FRIEND containers, consumed below into /clients
+	// and /friends -- /uploads stays bound to the upload-queue semantic via
+	// EC_OP_GET_ULOAD_QUEUE.
+	{
+		std::unique_ptr<CECPacket> req(new CECPacket(EC_OP_GET_UPDATE, EC_DETAIL_INC_UPDATE));
+		const CECPacket *resp = app.SendRecvSerialized(req.get());
+		if (!resp)
+			return false;
+		auto &rle = app.PartfileRleStateRequireStateWriteLock();
+
+		// Snapshot the cache's pre-tick ECID set so rle_state entries can be
+		// evicted for any partfile removed during the walk.
+		std::set<std::uint32_t> ecids_before;
+		state.MutateDownloads(&(FileMap &cache) {
+			for (const auto &kv : cache) {
+				if (kv.second.is_downloading)
+					ecids_before.insert(kv.first);
+			}
+			ApplyGetUpdateToDownloads(resp, cache, rle);
+			// Evict RLE state for ECIDs that no longer carry the downloading role.
+			// The walker handles FILE_REMOVED already; this is defence in depth.
+			for (auto ecid : ecids_before) {
+				auto it = cache.find(ecid);
+				if (it == cache.end() || !it->second.is_downloading) {
+					rle.erase(ecid);
+				}
+			}
+		});
+
+		// Shared walker reads and writes the same unified m_files map: a partfile whose
+		// hash was CValueMap-suppressed already carries hash + name from the downloads
+		// walker above.
+		//
+		// Same `rle` map: the shared walker decodes the availability blob on
+		// EC_TAG_KNOWNFILE tags and the downloads walker the EC_TAG_PARTFILE ones, and
+		// amuled emits exactly one per ECID. The eviction sweep above only touches ECIDs
+		// that were downloading.
+		state.MutateShared(&(FileMap &cache) { ApplyGetUpdateToShared(resp, cache, rle); });
+
+		state.MutateServers(&(std::map<std::uint32_t, ServerSnapshot> &cache) {
+			ApplyGetUpdateToServers(resp, cache);
+		});
+
+		state.MutateFriends(&(std::map<std::uint32_t, FriendSnapshot> &cache) {
+			ApplyGetUpdateToFriends(resp, cache);
+		});
+
+		// /clients -- every alive peer in theApp->clientlist. The walker turns each peer's
+		// file ECID into an MD4 hash as it goes, the wire contract being hash-only, so it
+		// needs the map the downloads/shared walkers just wrote: one acquisition hands it
+		// both.
+		state.MutateClientsWithFiles(
+			&(std::map<std::uint32_t, ClientSnapshot> &cache, const FileMap &files) {
+				ApplyGetUpdateToClients(resp, cache, files);
+			});
+		delete resp;
+
+		// Fold this tick's peers into the known-clients store, so it stays current from the
+		// update we already have rather than being re-read. A no-op until something asks
+		// for /known_clients; after that it costs one hash lookup per connected peer.
+		state.ReconcileKnownClients();
+	}
+
+	// /chats -- one roundtrip carrying the cursor from the previous tick, so the daemon replies
+	// with the session list plus only the messages we do not have. Gated on the capability: a
+	// daemon predating the chat ops reaches ProcessRequest2()'s unknown-opcode branch, which
+	// asserts.
+	if (app.IsServerChatActive()) {
+		std::unique_ptr<CECPacket> req(new CECPacket(EC_OP_GET_CHAT_SESSIONS));
+		const std::uint32_t cursor = state.ChatCursor();
+		if (cursor) {
+			req->AddTag(CECTag(EC_TAG_CHAT_MSG_ID, cursor));
+		}
+		const CECPacket *resp = app.SendRecvSerialized(req.get());
+		if (!resp)
+			return false;
+		// Collected under the write lock, published after it: emitting SSE frames
+		// from inside the lambda would hold CState exclusively across the bus.
+		std::vector<webapi::ChatSessionSnapshot> new_messages;
+		std::vector<std::uint64_t> closed;
+		state.MutateChats(&(std::vector<webapi::ChatSessionSnapshot> &cache, std::uint32_t &cur) {
+			ApplyChatSessions(resp, cache, cur, new_messages, closed);
+		});
+		delete resp;
+		PublishChatEvents(app.EventBus(), new_messages, closed);
+	}
+
+	// /logs/server_info, /stats/tree and /stats/graphs/{graph} are lazy-fetched on first GET
+	// via CTtlCache (a 1 s TTL coalesces burst reads), under m_ec_mtx, not polled per tick.
+
+	// Searches this session never started are NOT discovered per tick -- that would pay an
+	// EC_OP_SEARCH_LIST roundtrip every tick forever. HandleSearchResults does a one-off check
+	// on a cache miss and seeds the slot; from the next tick the loop below picks it up.
+
+	// /search/results -- poll each ACTIVE search independently. POST /search seeds a slot with
+	// active=true; the daemon's per-id EC_TAG_SEARCH_LIFECYCLE_STATE says when to flip it back.
+	// A search evicted from the daemon's ring comes back as EC_TAG_SEARCH_EXPIRED, resolved to
+	// a terminal snapshot.
+	//
+	// Progress for every active search comes in ONE roundtrip when the daemon advertises the
+	// union. That matters more here than in amuleGUI because SendRecvSerialized is synchronous
+	// and process-wide mutexed, so N searches meant N serialized roundtrips inside a single
+	// tick.
+	std::map<std::uint32_t, std::pair<std::uint32_t, std::uint32_t>> union_progress;
+	bool have_union = false;
+	const std::vector<std::uint32_t> active_sids = state.ActiveSearchIds();
+	// Every slot the daemon could still speak for, finished ones included. A finished search is
+	// never polled for progress, but it still has to be watched for EXPIRY: the ring evicting
+	// it is what tombstones its results, and a slot not detached by then has them erased by the
+	// union below. Naming these ids also delays the eviction -- the daemon touches its LRU for
+	// exactly the ids a client names, so leaving finished searches out made them the first
+	// victims of anyone's next search.
+	const std::vector<std::uint32_t> attached_sids = state.AttachedSearchIds();
+	// Nothing attached means nothing to ask about. Without this guard the union
+	// would cost a roundtrip every tick forever on an idle daemon.
+	if (app.IsServerSearchProgressUnionActive() && !attached_sids.empty()) {
+		std::unique_ptr<CECPacket> req(new CECPacket(EC_OP_SEARCH_PROGRESS));
+		// Name the searches we track so the daemon bumps exactly those in its
+		// LRU, matching what the per-id poll did.
+		for (std::uint32_t sid : attached_sids) {
+			req->AddTag(CECTag(EC_TAG_SEARCH_ID, sid));
+		}
+		const CECPacket *resp = app.SendRecvSerialized(req.get());
+		if (!resp)
+			return false;
+		// Only trust a reply that really is a union. Anything else (an EC_OP_FAILED, a
+		// packet with no search children) must fall through to the per-id polling below:
+		// absence is the expiry signal, so reading it as an empty union would retire every
+		// tracked search.
+		have_union = ParseSearchProgressUnion(resp, union_progress);
+		delete resp;
+	}
+
+	// Per-search lifecycle, off the progress union above. Runs BEFORE the results poll so an
+	// eviction is seen, and the slot frozen, while its results are still there.
+	for (std::uint32_t sid : attached_sids) {
+		std::uint32_t percent = 0;
+		std::uint32_t lifecycle_state = 0;
+		bool expired = false;
+		// A finished slot is here for the expiry verdict only. Its progress is
+		// terminal and must not be re-derived: AdvanceSearchProgress reads a
+		// missing lifecycle tag as IDLE and would reset complete/percent to 0.
+		const bool was_active =
+			std::find(active_sids.begin(), active_sids.end(), sid) != active_sids.end();
+		if (have_union) {
+			// Already fetched above; absent means the daemon dropped it.
+			const auto found = union_progress.find(sid);
+			if (found == union_progress.end()) {
+				expired = true;
+			} else {
+				percent = found->second.first;
+				lifecycle_state = found->second.second;
+			}
+		} else if (was_active) {
+			// No union on this daemon: one roundtrip per search, and only the active
+			// ones. A roundtrip per FINISHED slot every tick, for an eviction that may
+			// never come, is the trade the union makes cheap and this form does not.
+			std::unique_ptr<CECPacket> req(new CECPacket(EC_OP_SEARCH_PROGRESS));
+			req->AddTag(CECTag(EC_TAG_SEARCH_ID, sid));
+			const CECPacket *resp = app.SendRecvSerialized(req.get());
+			if (resp) {
+				if (resp->GetTagByName(EC_TAG_SEARCH_EXPIRED)) {
+					expired = true;
+				} else {
+					// Unified 0..100 the daemon computes for every kind
+					// (global = real, Kad = cosmetic ramp, finished = 100).
+					if (const CECTag *t =
+							resp->GetTagByName(EC_TAG_SEARCH_LIFECYCLE_PERCENT)) {
+						percent = static_cast<std::uint32_t>(t->GetInt());
+					}
+					if (const CECTag *t =
+							resp->GetTagByName(EC_TAG_SEARCH_LIFECYCLE_STATE)) {
+						lifecycle_state = static_cast<std::uint32_t>(t->GetInt());
+					}
+				}
+				delete resp;
+			}
+		}
+		if (expired) {
+			// The daemon evicted this search (its ring is capped). Retire the slot as
+			// finished + inactive so we stop polling it but keep the last-known results
+			// for late reads; the terminal state also drives a final search_progress
+			// SSE frame. Detaching is what makes "keep the last-known results" true:
+			// the same eviction makes the union emit an EC_TAG_FILE_REMOVED for every
+			// one of this search's results. Hence this loop running ahead of the
+			// results poll.
+			state.DetachSearch(sid);
+			SearchProgressSnapshot fin = state.SearchProgress(sid);
+			fin.active = false;
+			fin.complete = true;
+			fin.percent = 100;
+			state.WriteSearchProgress(sid, fin);
+			continue;
+		}
+		if (!was_active) {
+			// Not expired, and not active: nothing to advance. Leaving the
+			// snapshot alone is what keeps a finished search finished.
+			continue;
+		}
+		const SearchProgressSnapshot next =
+			AdvanceSearchProgress(state.SearchProgress(sid), lifecycle_state, percent);
+		state.WriteSearchProgress(sid, next);
+	}
+
+	// Anything the last failed union reply covered is unrecoverable from the stream itself, so
+	// re-seed those slots in full before polling again. Ordered after the retirement loop so a
+	// slot the daemon has dropped is already detached and SearchesNeedingResync skips it.
+	for (std::uint32_t sid : state.SearchesNeedingResync()) {
+		if (FetchOneSearchFull(app, state, sid, /*replace=*/true) == SearchFetchOutcome::EcFailed) {
+			return false;
+		}
+	}
+	// Results for every search in one roundtrip.
+	//
+	// Gated on there being any attached search at all, not on which ones are active: a finished
+	// search still changes -- a hit gets downloaded, a Kad notes lookup lands -- and costs
+	// nothing to keep polling. What is not worth paying for is the empty case.
+	//
+	// Deliberately NOT gated on SSE subscribers, unlike the diff walk: a REST client polling
+	// GET /search/{id}/results reads this cache, and for an active search nothing else
+	// refreshes it (ClaimSearchRefresh covers only inactive slots), so skipping the fetch would
+	// hand that client frozen results.
+	//
+	// The gate asks about OUR slots, not the daemon's searches. Skipping the poll when we hold
+	// none is the point, not an optimisation: ApplySearchUnion drops results for a search it
+	// has no slot for and the daemon marks them sent regardless, so polling with nothing to
+	// apply them to would burn through a foreign search's results once and elide them forever
+	// after.
+	//
+	// The set is the same one the progress union asked about, reused rather than recomputed
+	// against a second spelling of the same !detached test. A slot an HTTP thread created since
+	// is picked up by the next tick.
+	if (!attached_sids.empty()) {
+		if (FetchSearchResults(app, state) == SearchFetchOutcome::EcFailed) {
+			// The daemon commits its differential state while building the reply, so
+			// what this one carried is already gone from its point of view. Flag the
+			// slots for a full re-seed above on the next tick; without it every
+			// result that reply covered would be elided from every later poll.
+			state.MarkAllSearchesNeedResync();
+			// Same rule as every other step in the tick: a failed roundtrip bails the
+			// whole tick rather than exposing a half-refreshed cache.
+			return false;
+		}
+	}
+
+	// /preferences + /categories -- one EC roundtrip populates both. The selection bitmask
+	// requests every category the endpoint exposes, spelled with the named enums rather than
+	// hex literals so a future bit shuffle in ECCodes.h cannot silently zero out a section.
+	// STATISTICS is omitted: its serialize block is empty, the 0x1B* tags being live graph
+	// data.
+	{
+		const std::uint32_t selection =
+			EC_PREFS_CATEGORIES | EC_PREFS_GENERAL | EC_PREFS_CONNECTIONS | EC_PREFS_DIRECTORIES |
+			EC_PREFS_FILES | EC_PREFS_SERVERS | EC_PREFS_SECURITY | EC_PREFS_MESSAGEFILTER |
+			EC_PREFS_REMOTECONTROLS | EC_PREFS_ONLINESIG | EC_PREFS_CORETWEAKS |
+			EC_PREFS_KADEMLIA | EC_PREFS_IP2COUNTRY;
+		std::unique_ptr<CECPacket> req(new CECPacket(EC_OP_GET_PREFERENCES));
+		req->AddTag(CECTag(EC_TAG_SELECT_PREFS, selection));
+		const CECPacket *resp = app.SendRecvSerialized(req.get());
+		if (!resp)
+			return false;
+		PreferencesSnapshot p;
+		std::vector<CategorySnapshot> cats;
+		ParsePreferencesFromPacket(resp, p, cats);
+		state.WritePreferences(std::move(p));
+		state.WriteCategories(std::move(cats));
+		delete resp;
+	}
+
+	// EmitDiffsAndUpdate is intentionally NOT called here. Mutation handlers invoke
+	// RefresherTick() inline on HTTP threads so the response sees post-mutation state, and
+	// LastSeenState has no internal lock -- concurrent std::map mutation from the wxApp
+	// refresher loop and an HTTP thread is UB.
+	//
+	// The ETag memo key rides on this, so it must be bumped HERE, not in MarkTickSuccess: only
+	// the background loop calls that, so a mutation moved the body while the key stood still
+	// and the next conditional GET was answered 304.
+	state.BumpSnapshotRevision();
+	return true;
+}
+
+void EmitDiffsForEventBus(CamuleapiApp &app, const CState &state)
+{
+	// Sole writer of `app.LastSeenForEvents()`. ONLY the wxApp refresher loop
+	// calls this; the HTTP-server inline RefresherTick call sites do NOT.
+	EmitDiffsAndUpdate(app.EventBus(), app.LastSeenForEvents(), state);
+}
+
+void PrimeDiffBaseline(CamuleapiApp &app, const CState &state)
+{
+	// Same walk into a bus nobody reads -- diverting the events is what keeps
+	// this short, instead of a `publish` flag through every emitter.
+	CEventBus scratch(CEventBus::kMinCapacity);
+	EmitDiffsAndUpdate(scratch, app.LastSeenForEvents(), state);
+}
+
+} // namespace webapi

amule-3.1.0.tar.gz/src/webapi/SearchJson.cpp Added

@@ -0,0 +1,140 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "SearchJson.h"
+
+#include "State.h"
+
+#include <common/MediaCodecName.h> // Needed for MediaCodecLabel
+
+#include <JsonWriter.h>
+
+#include <wx/string.h>
+
+namespace webapi
+{
+
+void WriteSearchResultFields(CJsonWriter &w, const SearchResult &r)
+{
+	w.Key("hash");
+	w.ValueString(wxString::FromUTF8(r.hash.c_str()));
+	w.Key("name");
+	w.ValueString(wxString::FromUTF8(r.name.c_str()));
+	w.Key("size_bytes");
+	w.ValueInt(static_cast<int64_t>(r.size));
+	w.Key("sources");
+	w.BeginObject();
+	w.Key("total");
+	w.ValueInt(static_cast<int64_t>(r.source_count));
+	w.Key("complete");
+	w.ValueInt(static_cast<int64_t>(r.complete_source_count));
+	w.EndObject();
+	// `have` reads as the wire verb; `downloaded` is the state (R4: no prefix).
+	w.Key("already_downloaded");
+	w.ValueBool(r.already_downloaded);
+	w.Key("rating");
+	w.ValueInt(static_cast<int64_t>(r.rating));
+	w.Key("status");
+	w.ValueString(wxString::FromUTF8(r.status.c_str()));
+	// `file_type`, matching POST /search's own filter field and the key /shared/{hash} derives
+	// from the same helper. Next to a `media` object a bare `type` would also read as a MIME
+	// type.
+	w.Key("file_type");
+	w.ValueString(wxString::FromUTF8(r.type.c_str()));
+	// Browse-only: the folder inside the peer's share. Always present so clients need no
+	// presence check; empty on every server/Kad hit, which never carries the tag.
+	w.Key("directory");
+	w.ValueString(wxString::FromUTF8(r.directory.c_str()));
+	// Media metadata, the same shape as the file-detail `media` object, and null when the hit
+	// carries no media tags. null rather than omitted so the key is always present -- the one
+	// place the unknown-value rule reaches an object instead of a scalar, so a client tests
+	// `media === null` before indexing it.
+	if (r.has_media) {
+		w.Key("media");
+		w.BeginObject();
+		w.Key("duration_seconds");
+		w.ValueInt(static_cast<int64_t>(r.media.duration_seconds));
+		w.Key("bitrate_kilobits_per_second");
+		w.ValueInt(static_cast<int64_t>(r.media.bitrate_kilobits_per_second));
+		w.Key("codec");
+		w.ValueString(wxString::FromUTF8(MediaCodecLabel(r.media.codec).c_str()));
+		w.Key("artist");
+		w.ValueString(wxString::FromUTF8(r.media.artist.c_str()));
+		w.Key("album");
+		w.ValueString(wxString::FromUTF8(r.media.album.c_str()));
+		w.Key("title");
+		w.ValueString(wxString::FromUTF8(r.media.title.c_str()));
+		w.EndObject();
+	} else {
+		w.Key("media");
+		w.ValueNull();
+	}
+	// Result grouping: the same-hash/same-size hit's alternative filenames. Always emitted, an
+	// empty array when the hit was seen under a single name, so clients can render the
+	// expandable tree without a presence check. Each child shares the parent's `hash`; the
+	// distinct `ecid` selects it for download-under-that-name. Not `children`: there is no
+	// hierarchy, only one file advertised under several names.
+	w.Key("alternate_names");
+	w.BeginArray();
+	for (const auto &c : r.children) {
+		w.BeginObject();
+		w.Key("ecid");
+		w.ValueInt(static_cast<int64_t>(c.ecid));
+		w.Key("name");
+		w.ValueString(wxString::FromUTF8(c.name.c_str()));
+		w.Key("sources");
+		w.BeginObject();
+		w.Key("total");
+		w.ValueInt(static_cast<int64_t>(c.source_count));
+		w.Key("complete");
+		w.ValueInt(static_cast<int64_t>(c.complete_source_count));
+		w.EndObject();
+		w.Key("directory");
+		w.ValueString(wxString::FromUTF8(c.directory.c_str()));
+		w.EndObject();
+	}
+	w.EndArray();
+	// On-demand Kad community ratings/comments. `kad_comment_lookup_running` is true while a
+	// lookup started via POST /search/results/{hash}/comments is in flight; `comments` carries
+	// the Kad notes retrieved so far. Always present.
+	w.Key("kad_comment_lookup_running");
+	w.ValueBool(r.kad_comment_searching);
+	w.Key("comments");
+	w.BeginArray();
+	for (const auto &c : r.comments) {
+		w.BeginObject();
+		w.Key("username");
+		w.ValueString(wxString::FromUTF8(c.username.c_str()));
+		w.Key("filename");
+		w.ValueString(wxString::FromUTF8(c.filename.c_str()));
+		w.Key("rating");
+		w.ValueInt(static_cast<int64_t>(c.rating));
+		w.Key("comment");
+		w.ValueString(wxString::FromUTF8(c.comment.c_str()));
+		w.EndObject();
+	}
+	w.EndArray();
+}
+
+} // namespace webapi

amule-3.1.0.tar.gz/src/webapi/SearchJson.h Added

@@ -0,0 +1,47 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_SEARCHJSON_H
+#define WEBAPI_SEARCHJSON_H
+
+class CJsonWriter;
+
+namespace webapi
+{
+
+struct SearchResult;
+
+// One search hit's JSON fields, WITHOUT the enclosing braces.
+//
+// Two surfaces serve the same object and are documented as carrying the identical shape: the
+// `results` array of GET /search/{id}/results, and the `search_result_added` SSE payload, which
+// prepends its own `search_id` and is otherwise byte for byte the same. Emitting the fields
+// from one place is what makes the documented promise structural instead of aspirational.
+//
+// Braces are the caller's, so the event can put `search_id` first.
+void WriteSearchResultFields(CJsonWriter &w, const SearchResult &r);
+
+} // namespace webapi
+
+#endif // WEBAPI_SEARCHJSON_H

amule-3.1.0.tar.gz/src/webapi/ServerFlagNames.h Added

@@ -0,0 +1,132 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 WEBAPI_SERVERFLAGNAMES_H
+#define WEBAPI_SERVERFLAGNAMES_H
+
+#include <protocol/ed2k/Client2Server/TCP.h>
+#include <protocol/ed2k/Client2Server/UDP.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <string>
+
+namespace webapi
+{
+
+/**
+ * The eD2k server capability bitmasks, decoded to stable JSON keys.
+ *
+ * A server announces what it supports as two bitmasks; the API decodes them server-side so a
+ * consumer never has to carry a copy of the aMule protocol headers, the same rule /clients already
+ * follows for its numeric enums (see ClientTagNames.h).
+ *
+ * Header-only, and deliberately built around a string-returning helper rather than a per-writer
+ * emit loop: the REST object (Api.cpp, via CJsonWriter) and the SSE payload (EventDiff.cpp, via
+ * ostringstream) use different writers but are documented as carrying the identical object, so they
+ * call the same function and emit the same bytes. Only the two tables below decide what a flags
+ * object contains; adding a bit is a one-line change both paths pick up.
+ *
+ * EventDiff.cpp is compiled into EventDiffTest, whose source list is deliberately a handful of
+ * files, so nothing here may pull in EC or drag further translation units behind it.
+ *
+ * These are protocol tokens, not display text: untranslated and stable. The desktop's TCP/UDP Flags
+ * columns render the same bits as single letters (ServerListCtrl.cpp).
+ */
+
+struct ServerFlagBit
+{
+	std::uint32_t mask;
+	const char *key;
+};
+
+/**
+ * One flags object: `{"bitmask":N,"compression":true,...}`.
+ *
+ * Every key in the table is always present, false when its bit is clear, so a consumer never
+ * branches on key existence. `bitmask` rides along for the diagnostic case and for any bit a future
+ * server announces that this build does not name yet -- decoding to booleans alone would silently
+ * drop it.
+ *
+ * All keys are ASCII literals from the tables, so no JSON escaping is needed.
+ */
+inline std::string ServerFlagsJson(std::uint32_t bits, const ServerFlagBit *table, std::size_t count)
+{
+	std::string out = "{\"bitmask\":";
+	out += std::to_string(bits);
+	for (std::size_t i = 0; i < count; ++i) {
+		out += ",\"";
+		out += tablei.key;
+		out += "\":";
+		out += (bits & tablei.mask) != 0 ? "true" : "false";
+	}
+	out += "}";
+	return out;
+}
+
+/**
+ * The TCP capability object for `tcp_flags`.
+ *
+ * Bits from include/protocol/ed2k/Client2Server/TCP.h, in wire-bit order. The table is a function-
+ * local static so every translation unit including this header shares one instance.
+ */
+inline std::string ServerTcpFlagsJson(std::uint32_t bits)
+{
+	static const ServerFlagBit kBits = {
+		{ SRV_TCPFLG_COMPRESSION, "compression" },
+		{ SRV_TCPFLG_NEWTAGS, "new_tags" },
+		{ SRV_TCPFLG_UNICODE, "unicode" },
+		{ SRV_TCPFLG_RELATEDSEARCH, "related_search" },
+		{ SRV_TCPFLG_TYPETAGINTEGER, "type_tag_integer" },
+		{ SRV_TCPFLG_LARGEFILES, "large_files" },
+		// Spelled out rather than plain "obfuscation" because the UDP object below carries
+		// both a UDP- and a TCP-obfuscation bit; one key means one wire constant in either
+		// object.
+		{ SRV_TCPFLG_TCPOBFUSCATION, "tcp_obfuscation" },
+	};
+	return ServerFlagsJson(bits, kBits, sizeof(kBits) / sizeof(kBits0));
+}
+
+//! The UDP capability object for `udp_flags`. Bits from
+//! include/protocol/ed2k/Client2Server/UDP.h, in wire-bit order.
+inline std::string ServerUdpFlagsJson(std::uint32_t bits)
+{
+	static const ServerFlagBit kBits = {
+		{ SRV_UDPFLG_EXT_GETSOURCES, "get_sources" },
+		{ SRV_UDPFLG_EXT_GETFILES, "get_files" },
+		{ SRV_UDPFLG_NEWTAGS, "new_tags" },
+		{ SRV_UDPFLG_UNICODE, "unicode" },
+		// "_v2" not "2": a bare digit glued to the name reads like a count.
+		{ SRV_UDPFLG_EXT_GETSOURCES2, "get_sources_v2" },
+		{ SRV_UDPFLG_LARGEFILES, "large_files" },
+		{ SRV_UDPFLG_UDPOBFUSCATION, "udp_obfuscation" },
+		{ SRV_UDPFLG_TCPOBFUSCATION, "tcp_obfuscation" },
+	};
+	return ServerFlagsJson(bits, kBits, sizeof(kBits) / sizeof(kBits0));
+}
+
+} // namespace webapi
+
+#endif // WEBAPI_SERVERFLAGNAMES_H
+// File_checked_for_headers

amule-3.1.0.tar.gz/src/webapi/SharedContent.cpp Added

@@ -0,0 +1,436 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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.
+//
+
+#include "SharedContent.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <limits.h>
+#include <sstream>
+#include <sys/stat.h>
+
+#ifdef _WIN32
+#include <stdlib.h>
+#endif
+
+namespace webapi
+{
+
+namespace
+{
+
+#ifdef _WIN32
+const char kPathSep = '\\';
+#else
+const char kPathSep = '/';
+#endif
+
+// Name handed out when the remote filename yields nothing we are willing to echo. Deliberately
+// boring: the alternative is an empty filename, which sends the client back to guessing a name from
+// the URL -- and the URL's last segment is the literal string "content".
+const char *const kFallbackName = "download";
+
+bool ContainsNul(const std::string &s)
+{
+	return s.find('\0') != std::string::npos;
+}
+
+// Parse an unsigned decimal with an explicit overflow guard. Not strtoull(): it signals overflow
+// through errno plus a saturated ULLONG_MAX, which callers forget to check and which cannot be told
+// apart from a genuine ULLONG_MAX. For a range bound, saturating is worse than wrapping --
+// "bytes=<30 digits>-" would silently become a perfectly satisfiable read near EOF. Requires at
+// least one digit and rejects every non-digit byte, so signs, whitespace and hex prefixes fail
+// here.
+bool ParseU64(const std::string &s, std::uint64_t &out)
+{
+	if (s.empty())
+		return false;
+	std::uint64_t v = 0;
+	for (const char c : s) {
+		if (c < '0' || c > '9')
+			return false;
+		const std::uint64_t digit = static_cast<std::uint64_t>(c - '0');
+		// Checked *before* the multiply, so nothing ever wraps.
+		if (v > (UINT64_MAX - digit) / 10)
+			return false;
+		v = v * 10 + digit;
+	}
+	out = v;
+	return true;
+}
+
+// Strip the optional whitespace HTTP allows around a field value.
+std::string TrimOws(const std::string &s)
+{
+	std::size_t b = 0;
+	std::size_t e = s.size();
+	while (b < e && (sb == ' ' || sb == '\t'))
+		++b;
+	while (e > b && (se - 1 == ' ' || se - 1 == '\t'))
+		--e;
+	return s.substr(b, e - b);
+}
+
+// Canonicalise `candidate` (an ABSOLUTE path) and accept it only if it names a regular file.
+//
+// Split from the containment test below, and deliberately: the candidate is the same path whichever
+// root it is compared against, but realpath() is a full path walk that stat()s every component.
+// Recomputing it per root made an N-root share pay up to 2N of those walks on every range request.
+// The boundary rule below is then a pure string comparison over two canonical paths.
+//
+// The regular-file test rides along here because it is a property of the candidate alone, and
+// running it first cannot change the verdict.
+bool CanonicaliseRegularFile(const std::string &candidate, std::string &fs_out)
+{
+	if (candidate.empty())
+		return false;
+
+	char fs_realPATH_MAX;
+#ifdef _WIN32
+	// _fullpath() is lexical-only, with no reparse-point resolution. Same trade-off StaticFs
+	// documents: on Windows symlinks require elevation, so lexical containment covers the
+	// operator-misconfig case this check targets.
+	if (!_fullpath(fs_real, candidate.c_str(), PATH_MAX))
+		return false;
+#else
+	if (!realpath(candidate.c_str(), fs_real))
+		return false;
+#endif
+
+	// A directory, or a device, or a fifo, is not content. Checked here rather than left to the
+	// caller's open() so "exists but is not servable" produces the same opaque failure as
+	// everything else.
+	struct stat st
+	{
+	};
+	if (::stat(fs_real, &st) != 0)
+		return false;
+	if (!S_ISREG(st.st_mode))
+		return false;
+
+	fs_out.assign(fs_real);
+	return true;
+}
+
+// Does the already-canonical `fs_real` land inside `root`?
+//
+// StaticFs::ResolveWithinRoot cannot be reused: it joins root and the caller's path, which is right
+// for a URL path but produces "/srv/share//srv/share/f" for an absolute candidate. The shared-file
+// case has no relative form to offer -- the directory arrives from EC_TAG_KNOWNFILE_PATH already
+// absolute.
+//
+// So this is a sibling, not a weakening: the same realpath()-based canonicalisation and byte-for-
+// byte the same boundary rule (the character at root_len must be a separator or the terminator,
+// which stops "/srv/share-evil" passing).
+bool CanonicalWithinRoot(const std::string &root, const std::string &fs_real)
+{
+	if (root.empty() || fs_real.empty())
+		return false;
+
+	char root_realPATH_MAX;
+#ifdef _WIN32
+	if (!_fullpath(root_real, root.c_str(), PATH_MAX))
+		return false;
+#else
+	if (!realpath(root.c_str(), root_real))
+		return false;
+#endif
+
+	// _fullpath() preserves a trailing separator from its input, which then breaks
+	// the prefix comparison; POSIX realpath() strips them.
+	std::size_t root_len = std::strlen(root_real);
+	while (root_len > 1 && (root_realroot_len - 1 == '/' || root_realroot_len - 1 == '\\')) {
+		root_real--root_len = '\0';
+	}
+	if (fs_real.compare(0, root_len, root_real, root_len) != 0)
+		return false;
+	// Reads the NUL terminator when the paths are equal in length, which
+	// is the "the candidate IS the root" case and exactly as intended.
+	const char sep = fs_real.c_str()root_len;
+	if (sep != '/' && sep != '\\' && sep != '\0')
+		return false;
+
+	return true;
+}
+
+// RFC 5987 attr-char, the set RFC 6266's filename* may carry unencoded. Everything else --
+// including every byte of a UTF-8 sequence, and every byte that could terminate a header -- becomes
+// %XX.
+bool IsAttrChar(unsigned char c)
+{
+	if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9'))
+		return true;
+	switch (c) {
+	case '!':
+	case '#':
+	case '$':
+	case '&':
+	case '+':
+	case '-':
+	case '.':
+	case '^':
+	case '_':
+	case '`':
+	case '|':
+	case '~':
+		return true;
+	default:
+		return false;
+	}
+}
+
+// Reduce a remote filename to something safe to sit between quotes in a header. Three different
+// treatments on purpose:
+//
+//  - Control characters and DEL are DROPPED, so an all-control name collapses to empty and
+//    triggers the fallback below.
+//  - Structural characters (quote, backslash, both path separators) are REPLACED with '_', keeping
+//    the name's shape: a quote would close filename="..." early, and a separator is honoured as a
+//    path by some clients.
+//  - Non-ASCII is replaced too: the quoted form has no encoding, so a raw UTF-8 byte there is at
+//    the mercy of the client's guess. The real name travels in filename*.
+std::string SanitiseQuotedName(const std::string &filename)
+{
+	std::string out;
+	out.reserve(filename.size());
+	for (const char raw : filename) {
+		const unsigned char c = static_cast<unsigned char>(raw);
+		if (c < 0x20 || c == 0x7F)
+			continue;
+		if (c >= 0x80 || c == '"' || c == '\\' || c == '/') {
+			out.push_back('_');
+			continue;
+		}
+		out.push_back(raw);
+	}
+	return out;
+}
+
+std::string PercentEncodeAttrChars(const std::string &filename)
+{
+	static const char kHex = "0123456789ABCDEF";
+	std::string out;
+	out.reserve(filename.size());
+	for (const char raw : filename) {
+		const unsigned char c = static_cast<unsigned char>(raw);
+		if (IsAttrChar(c)) {
+			out.push_back(raw);
+			continue;
+		}
+		out.push_back('%');
+		out.push_back(kHexc >> 4);
+		out.push_back(kHexc & 0x0F);
+	}
+	return out;
+}
+
+} // namespace
+
+bool JoinSharedPath(const std::string &dir, const std::string &name, std::string &out)
+{
+	if (dir.empty() || name.empty())
+		return false;
+	// An embedded NUL makes the string we validate a different thing from the
+	// path we would open, so nothing after this point can be trusted about it.
+	if (ContainsNul(dir) || ContainsNul(name))
+		return false;
+	// `name` is a basename by contract. Rejected rather than sanitised: stripping
+	// the directory part would invent a path the caller never asked about.
+	if (name.find('/') != std::string::npos || name.find('\\') != std::string::npos)
+		return false;
+	if (name == "." || name == "..")
+		return false;
+
+	std::string joined = dir;
+	const char tail = joinedjoined.size() - 1;
+	if (tail != '/' && tail != '\\')
+		joined.push_back(kPathSep);
+	joined += name;
+
+	out.swap(joined);
+	return true;
+}
+
+bool ResolveSharedContentPath(const std::vector<std::string> &roots,
+	const std::string &dir,
+	const std::string &name,
+	std::string &fs_out)
+{
+	std::string candidate;
+	if (!JoinSharedPath(dir, name, candidate))
+		return false;
+
+	// Resolved ONCE, before the roots are walked: this is the walk, and the roots
+	// only ever compare against its result.
+	std::string fs_real;
+	if (!CanonicaliseRegularFile(candidate, fs_real))
+		return false;
+
+	// Inside ANY root is enough -- aMule's share is a list of separately added directories, so
+	// there is no single tree to be inside of. An empty list therefore shares nothing, which is
+	// the correct reading.
+	for (const std::string &root : roots) {
+		if (CanonicalWithinRoot(root, fs_real)) {
+			fs_out.swap(fs_real);
+			return true;
+		}
+	}
+	return false;
+}
+
+RangeResult ParseSingleByteRange(const std::string &header_value,
+	std::uint64_t file_size,
+	std::uint64_t &first_out,
+	std::uint64_t &last_out)
+{
+	const std::string value = TrimOws(header_value);
+	if (value.empty())
+		return RangeResult::kAbsent;
+
+	const std::size_t eq = value.find('=');
+	if (eq == std::string::npos)
+		return RangeResult::kIgnore;
+
+	// bytes-unit is a token and tokens are case-insensitive. Anything else is a
+	// unit we do not implement; ignoring it serves the whole file.
+	std::string unit = TrimOws(value.substr(0, eq));
+	for (char &c : unit) {
+		if (c >= 'A' && c <= 'Z')
+			c = static_cast<char>(c - 'A' + 'a');
+	}
+	if (unit != "bytes")
+		return RangeResult::kIgnore;
+
+	const std::string set = TrimOws(value.substr(eq + 1));
+	if (set.empty())
+		return RangeResult::kIgnore;
+
+	// See the header: any multi-range set is ignored outright, which is
+	// what makes the CVE-2011-3192 amplification shape a no-op here.
+	if (set.find(',') != std::string::npos)
+		return RangeResult::kIgnore;
+
+	const std::size_t dash = set.find('-');
+	if (dash == std::string::npos)
+		return RangeResult::kIgnore;
+	// A second dash means this was never one byte-range-spec.
+	if (set.find('-', dash + 1) != std::string::npos)
+		return RangeResult::kIgnore;
+
+	const std::string first_str = set.substr(0, dash);
+	const std::string last_str = set.substr(dash + 1);
+
+	// Deliberate whitespace policy: RFC 7233's byte-range-spec contains no OWS at all -- the
+	// only OWS the grammar allows is around the commas of the `#rule`, and every comma is
+	// rejected anyway. So tolerance stops at the field value's own edges and at the "=". Inside
+	// the spec, ParseU64's digits-only rule makes "bytes=0 - 9" unparseable rather than quietly
+	// read as "bytes=0-9".
+
+	if (first_str.empty()) {
+		// suffix-byte-range-spec: "-N" means the last N bytes.
+		std::uint64_t suffix = 0;
+		if (!ParseU64(last_str, suffix))
+			return RangeResult::kIgnore;
+		if (file_size == 0 || suffix == 0)
+			return RangeResult::kUnsatisfiable;
+		if (suffix >= file_size) {
+			// Asking for more trailing bytes than exist is satisfied
+			// by the whole file, not refused (RFC 7233 §2.1).
+			first_out = 0;
+		} else {
+			first_out = file_size - suffix;
+		}
+		last_out = file_size - 1;
+		return RangeResult::kOk;
+	}
+
+	std::uint64_t first = 0;
+	if (!ParseU64(first_str, first))
+		return RangeResult::kIgnore;
+
+	if (last_str.empty()) {
+		// "N-": to the end of the file.
+		if (file_size == 0 || first >= file_size)
+			return RangeResult::kUnsatisfiable;
+		first_out = first;
+		last_out = file_size - 1;
+		return RangeResult::kOk;
+	}
+
+	std::uint64_t last = 0;
+	if (!ParseU64(last_str, last))
+		return RangeResult::kIgnore;
+	// first > last is well-formed but meaningless, which RFC 7233 2.1 makes an invalid byte-
+	// range-set rather than an unsatisfiable one -- so it is a 200, not a 416. A 416 would
+	// invite a retry of the same header.
+	if (first > last)
+		return RangeResult::kIgnore;
+	if (file_size == 0 || first >= file_size)
+		return RangeResult::kUnsatisfiable;
+
+	first_out = first;
+	last_out = (last >= file_size) ? (file_size - 1) : last;
+	return RangeResult::kOk;
+}
+
+std::string BuildContentDisposition(const std::string &filename)
+{
+	std::string quoted = SanitiseQuotedName(filename);
+	// If nothing printable survived, both forms name the file rather than leaving the client to
+	// invent something from the URL. Using the fallback for filename* too keeps the two halves
+	// agreeing.
+	const bool usable = !quoted.empty();
+	if (!usable)
+		quoted = kFallbackName;
+	const std::string extended = usable ? PercentEncodeAttrChars(filename) : std::string(kFallbackName);
+
+	// `attachment` unconditionally -- see the header for why `inline` is
+	// not an option on this route.
+	return "attachment; filename=\"" + quoted + "\"; filename*=UTF-8''" + extended;
+}
+
+std::string BuildContentEtag(std::uint64_t mtime, std::uint64_t size)
+{
+	// Same "mtime-size" hex shape BuildStaticEtag emits (Api.cpp),
+	// strong-form quoted per RFC 7232.
+	std::ostringstream oss;
+	oss << '"' << std::hex << mtime << '-' << size << '"';
+	return oss.str();
+}
+
+bool IfRangeAllowsRange(const std::string &if_range, const std::string &etag)
+{
+	const std::string value = TrimOws(if_range);
+	// No precondition to fail. The Range stands on its own, which is also
+	// the ordinary case: If-Range only ever appears on a resume.
+	if (value.empty())
+		return true;
+
+	// RFC 9110 13.1.5 says a valid entity-tag is told apart from a valid HTTP-date by looking
+	// at the first two characters for a DQUOTE, and that only the STRONG form may match. Both
+	// rejections land here: a weak `W/"..."` starts with 'W', and every HTTP-date starts with a
+	// day name.
+	//
+	// The date form is not implemented, and the fall-through is the safe direction: a date
+	// validator has one-second resolution, so a representation replaced twice inside the same
+	// second compares EQUAL to the client's copy -- precisely the race this header exists to
+	// close.
+	if (value0 != '"')
+		return false;
+
+	// Opaque octet-for-octet equality, quotes included. No list to walk and no `*`
+	// to special-case: unlike If-None-Match, If-Range carries exactly one.
+	return value == etag;
+}
+
+} // namespace webapi

amule-3.1.0.tar.gz/src/webapi/SharedContent.h Added

@@ -0,0 +1,127 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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.
+//
+
+// Pure helpers behind GET /api/v1/shared/{hash}/content -- the endpoint that hands back the bytes
+// of a completed shared file. Everything here decides something an attacker can influence: which
+// path on disk we are willing to open, how much of it we send, and what we echo back into a
+// response header. All four are the kind of decision that wants a test per branch rather than a
+// read-through, so they live in their own TU that links without wx, Boost.Beast or EC -- same
+// rationale as StaticFs (see StaticFs.h), and the same reason SharedContentTest can link them
+// standalone.
+//
+// The transport half (chunked/ranged writing, 206 assembly, the handler itself) stays in Api.cpp /
+// HttpServer.cpp, which is where the Beast types already are.
+
+#ifndef AMULE_WEBAPI_SHAREDCONTENT_H
+#define AMULE_WEBAPI_SHAREDCONTENT_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+namespace webapi
+{
+
+// Join a shared file's on-disk directory with its basename.
+//
+// This exists because no single field carries the full path: the API's `path` on a shared file is
+// the *directory* (it comes straight from EC_TAG_KNOWNFILE_PATH) and `name` is the bare filename.
+// Every caller that wants to open the file has to put the two together, and doing it inline is
+// exactly where a separator ends up doubled or a `..` ends up honoured.
+//
+// `name` must be a bare basename. A name carrying a separator, or `.` / `..`, is either corrupt
+// local state or a hostile filename that reached us over ed2k, and there is no benign reading of
+// either -- both are rejected rather than sanitised, because sanitising invents a path the caller
+// never asked for. An embedded NUL is rejected for the same reason it always is: std::string keeps
+// it, the C path APIs do not, so the string we validate would not be the path we open.
+//
+// Returns false without touching `out` on any rejection.
+bool JoinSharedPath(const std::string &dir, const std::string &name, std::string &out);
+
+// Resolve a shared file to a canonical path that provably sits inside at least one configured share
+// root, or fail.
+//
+// `roots` is a vector because aMule's share is a *list* of directories, not one root -- the user
+// adds each shared directory separately, so containment is "inside any one of them". Any failure
+// returns false, and the caller answers the same opaque 404 for all of them, so the on-disk layout
+// stays non-enumerable from outside (same discipline as StaticFs.h).
+bool ResolveSharedContentPath(const std::vector<std::string> &roots,
+	const std::string &dir,
+	const std::string &name,
+	std::string &fs_out);
+
+// Outcome of parsing a Range request header.
+enum class RangeResult
+{
+	kAbsent,        // No Range header at all -- serve 200 with the whole file.
+	kIgnore,        // Present but unsupported/malformed -- serve 200 with the whole file.
+	kUnsatisfiable, // Syntactically fine, but no byte of it exists -- 416.
+	kOk             // Serve 206 for first_out, last_out.
+};
+
+// Parse a *single* byte range out of a Range header value. `last_out` is INCLUSIVE, matching the
+// wire format, so the byte count is (last - first + 1).
+//
+// RFC 7233 3.1 permits a server to ignore a Range header it does not wish to honour, and that
+// permission is doing real work here: any range set with more than one range returns kIgnore and
+// gets a plain 200. That is the deliberate neutralisation of the CVE-2011-3192 shape, where a few
+// hundred overlapping ranges in one header make the server materialise a multipart body far larger
+// than the file. It is not an error, which would tempt a client into retrying.
+RangeResult ParseSingleByteRange(const std::string &header_value,
+	std::uint64_t file_size,
+	std::uint64_t &first_out,
+	std::uint64_t &last_out);
+
+// Build a complete Content-Disposition header *value* per RFC 6266.
+//
+// These filenames arrive from strangers on the ed2k network, which makes this the one place in the
+// endpoint where remote input is written into a response header. A name containing CR or LF would
+// end the header and let the sender append arbitrary headers -- or a whole second response -- so
+// the quoted form is reduced to a conservative printable-ASCII subset and the filename* form
+// percent-encodes everything outside RFC 6266's attr-char set.
+//
+// Always `attachment`, never `inline`: both the bytes and the name are attacker-chosen and amuleapi
+// serves the Web UI from this same origin, so `inline` would let a shared .html file script the Web
+// UI's origin. The handler also stamps a sandbox CSP on the response; `attachment` is the half that
+// does not depend on the client honouring one.
+std::string BuildContentDisposition(const std::string &filename);
+
+// "mtime-size" hex ETag, quoted -- the same shape BuildStaticEtag produces, so the dispatcher's
+// ETag/If-None-Match/304 machinery behaves identically here.
+//
+// The reason to compute one at all is that CApiDispatcher::Dispatch otherwise MD5s the entire
+// response body to derive a validator. For a multi-GB shared file that is not a slow path, it is an
+// unusable one; a handler-set ETag makes Dispatch step aside, so we pay a stat() instead of a full-
+// file hash.
+std::string BuildContentEtag(std::uint64_t mtime, std::uint64_t size);
+
+// Does an If-Range precondition permit the accompanying Range to be honoured? `etag` is the quoted
+// wire form BuildContentEtag returns.
+//
+// RFC 9110 13.1.5, and the reason it is not optional: a client resuming an interrupted download
+// sends the validator it already holds next to `Range: bytes=N-`, precisely so that a
+// representation which changed underneath it answers 200 with the whole new file. A server that
+// honours the Range regardless returns a 206 of the NEW bytes, and the client -- reading that 206
+// as confirmation its validator held -- appends them to its copy of the OLD representation,
+// producing a file spliced from two versions that passes every length check it can make.
+//
+// STRONG comparison, which is the one thing this cannot borrow from webcommon::IfNoneMatchHits:
+// that function accepts the weak `W/"..."` form, correctly, because If-None-Match asks whether two
+// representations are equivalent. A byte range needs them byte-identical.
+//
+// An absent (empty) header returns true: no precondition, nothing to fail. A non-matching one
+// returns false, and the caller drops the Range and serves the whole representation -- 13.1.5 says
+// to ignore the Range, not reject the request.
+bool IfRangeAllowsRange(const std::string &if_range, const std::string &etag);
+
+} // namespace webapi
+
+#endif // AMULE_WEBAPI_SHAREDCONTENT_H

amule-3.1.0.tar.gz/src/webapi/State.cpp Added

@@ -0,0 +1,934 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "State.h"
+
+#include <cstdlib>  // std::abort
+#include <iostream> // std::cerr
+
+#include <algorithm>
+#include <cstdio>
+#include <ctime>
+
+#include <mutex>
+#include <shared_mutex>
+#include <utility>
+
+namespace webapi
+{
+
+std::uint64_t PartCountForSize(std::uint64_t size)
+{
+	// Ceiling division. An empty file falls out as 0 without a special case,
+	// since kPartSizeBytes - 1 < kPartSizeBytes.
+	return (size + kPartSizeBytes - 1) / kPartSizeBytes;
+}
+
+std::uint16_t SharedHashingProgress(const FileSnapshot &f)
+{
+	return f.shared.hashing_progress ? f.shared.hashing_progress : f.download.hashed_part_count;
+}
+
+// Completeness of the file we download FROM this peer: parts the peer has over that file's part
+// count. Only the download link carries a meaningful denominator. Left at its < 0 sentinel when not
+// computable, which never reaches the wire -- the writers emit the field as null instead.
+void ComputePartProgressPercent(const CState &state, ClientSnapshot &cli)
+{
+	if (!cli.has_parts_offered_count || cli.download_file_hash.empty()) {
+		return;
+	}
+	// DownloadPartCount, not FindDownload: this runs once per source per tick on the SSE path
+	// and once per row on two REST paths, and the part count is the only thing wanted.
+	// FindDownload would deep-copy the whole FileSnapshot each time, repeating the identical
+	// copy for every source of the same file.
+	const std::uint64_t part_count = state.DownloadPartCount(cli.download_file_hash);
+	if (part_count == 0) {
+		return;
+	}
+	double pct = 100.0 * static_cast<double>(cli.parts_offered_count) / static_cast<double>(part_count);
+	if (pct > 100.0)
+		pct = 100.0;
+	cli.part_progress_percent = pct;
+}
+
+bool CState::HasFirstSnapshot() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_has_first_snapshot;
+}
+
+std::time_t CState::SnapshotAt() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_snapshot_at;
+}
+
+bool CState::EcConnected() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_ec_connected;
+}
+
+StatusSnapshot CState::Status() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_status;
+}
+
+KadSnapshot CState::Kad() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_kad;
+}
+
+CState::DashboardSnapshot CState::Dashboard() const
+{
+	// Single shared_lock acquisition: callers of /api/v1/status get a coherent (status, kad,
+	// snapshot_at, ec_connected) tuple instead of a four-lock dance that can interleave with a
+	// refresher tick.
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	DashboardSnapshot out;
+	out.status = m_status;
+	out.kad = m_kad;
+	out.snapshot_at = m_snapshot_at;
+	out.ec_connected = m_ec_connected;
+	return out;
+}
+
+PreferencesSnapshot CState::Preferences() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_preferences;
+}
+
+std::vector<CategorySnapshot> CState::Categories() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_categories;
+}
+
+std::vector<std::string> CState::AmuleLog() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_amule_log_lines;
+}
+
+std::vector<std::string> CState::AmuleLogFrom(
+	std::size_t first, std::size_t &total, std::uint64_t *generation) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	total = m_amule_log_lines.size();
+	if (generation)
+		*generation = m_amule_log_generation;
+	if (first >= total)
+		return {};
+	return std::vector<std::string>(
+		m_amule_log_lines.begin() + static_cast<std::ptrdiff_t>(first), m_amule_log_lines.end());
+}
+
+ServerInfoLog CState::ServerInfo() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_server_info;
+}
+
+StatsTreeNode CState::StatsTree() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_stats_tree;
+}
+
+StatsGraphs CState::Graphs() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_graphs;
+}
+
+std::vector<SearchResult> CState::Search(std::uint32_t search_id) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	std::vector<SearchResult> out;
+	auto it = m_searches.find(search_id);
+	if (it == m_searches.end())
+		return out;
+	out.reserve(it->second.results.size());
+	for (const auto &kv : it->second.results)
+		out.push_back(kv.second);
+	return out;
+}
+
+// See CState::ReentryGuard in State.h for why this aborts rather than
+// returning, and why it runs before the lock rather than after it.
+thread_local const CState *CState::t_in_callback = nullptr;
+
+CState::ReentryGuard::ReentryGuard(const CState *self)
+: m_prev(t_in_callback)
+{
+	if (t_in_callback == self) {
+		std::cerr << "amuleapi: FATAL CState callback re-entered the same CState; "
+			     "this would deadlock on a non-recursive lock\n";
+		std::abort();
+	}
+	t_in_callback = self;
+}
+
+CState::ReentryGuard::~ReentryGuard()
+{
+	t_in_callback = m_prev;
+}
+
+void CState::MutateSearch(
+	std::uint32_t search_id, const std::function<void(std::map<std::uint32_t, SearchResult> &)> &fn)
+{
+	const ReentryGuard guard(this);
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	auto it = m_searches.find(search_id);
+	if (it != m_searches.end())
+		fn(it->second.results);
+}
+
+SearchProgressSnapshot CState::SearchProgress(std::uint32_t search_id) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	auto it = m_searches.find(search_id);
+	if (it == m_searches.end())
+		return SearchProgressSnapshot{};
+	return it->second.progress;
+}
+
+bool CState::HasSearch(std::uint32_t search_id) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_searches.count(search_id) != 0;
+}
+
+std::string CState::SearchQuery(std::uint32_t search_id) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	auto it = m_searches.find(search_id);
+	return it == m_searches.end() ? std::string() : it->second.query;
+}
+
+std::time_t CState::SearchStartedAt(std::uint32_t search_id) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	auto it = m_searches.find(search_id);
+	return it == m_searches.end() ? 0 : it->second.started_at;
+}
+
+bool CState::ClaimSearchRefresh(std::uint32_t search_id, std::chrono::milliseconds ttl)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	auto it = m_searches.find(search_id);
+	if (it == m_searches.end())
+		return false;
+	// An active search is already refreshed by the tick every second;
+	// claiming it here would just double the EC traffic on a running search.
+	if (it->second.progress.active)
+		return false;
+	const auto now = std::chrono::steady_clock::now();
+	if (now - it->second.last_fetch < ttl)
+		return false;
+	it->second.last_fetch = now;
+	return true;
+}
+
+std::vector<std::uint32_t> CState::ActiveSearchIds() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	std::vector<std::uint32_t> out;
+	for (const auto &kv : m_searches)
+		if (kv.second.progress.active)
+			out.push_back(kv.first);
+	return out;
+}
+
+std::vector<std::uint32_t> CState::AttachedSearchIds() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	std::vector<std::uint32_t> out;
+	for (const auto &kv : m_searches)
+		if (!kv.second.detached)
+			out.push_back(kv.first);
+	return out;
+}
+
+std::vector<std::uint32_t> CState::AllSearchIds() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	std::vector<std::uint32_t> out;
+	out.reserve(m_searches.size());
+	for (const auto &kv : m_searches)
+		out.push_back(kv.first);
+	return out;
+}
+
+bool CState::FindSearchResultByHash(
+	const std::string &hash_hex, SearchResult &out, std::uint32_t *owner_search_id) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	for (const auto &skv : m_searches) {
+		for (const auto &rkv : skv.second.results) {
+			if (rkv.second.hash == hash_hex) {
+				out = rkv.second;
+				if (owner_search_id)
+					*owner_search_id = skv.first;
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+void CState::MarkSearchStarted(std::uint32_t search_id, const std::string &kind, const std::string &query)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	SearchSlot &slot = m_searchessearch_id;
+	if (slot.seq == 0)
+		slot.seq = ++m_search_seq;
+	// generation is per-slot and monotonic: a restart of the same id (rare --
+	// the daemon allocates fresh ids) keeps it climbing so EventDiff still fires.
+	const auto next_generation = slot.progress.generation + 1;
+	// Both maps, and the ECID index that points at them. `raw` is the merge target the union
+	// applies diffed tags to, so a stale entry left here would have the previous search's
+	// fields show through -- and RebuildFoldedResults would put the ghost straight back into
+	// `results`.
+	for (const auto &entry : slot.raw)
+		m_resultOwner.erase(entry.first);
+	slot.raw.clear();
+	slot.results.clear();
+	slot.detached = false;
+	slot.progress = SearchProgressSnapshot{};
+	slot.progress.active = true;
+	slot.progress.kind = kind;
+	slot.progress.generation = next_generation;
+	slot.query = query;
+	slot.started_at = std::time(nullptr);
+	slot.last_fetch = {};
+	EvictSurplusSearchSlotsLocked(search_id);
+}
+
+void CState::MarkSearchDiscovered(std::uint32_t search_id,
+	const std::string &kind,
+	const std::string &query,
+	bool active,
+	bool complete,
+	int reported_percent)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	auto known = m_searches.find(search_id);
+	if (known != m_searches.end()) {
+		// Already known (self-started, or discovered on an earlier cache-miss check): leave
+		// its accumulated results and progress alone, or this would stomp whatever the
+		// session already recorded. The query is the one exception -- a slot seeded before
+		// the daemon reported a name has none.
+		if (known->second.query.empty())
+			known->second.query = query;
+		return;
+	}
+	SearchSlot &slot = m_searchessearch_id;
+	slot.seq = ++m_search_seq;
+	// The daemon's own lifecycle state for this search, not an assumption. A finished search
+	// seeded as active reads as running until the next tick corrects it, and POST
+	// /search/{id}/more gates on exactly that.
+	slot.progress.active = active;
+	slot.progress.complete = complete;
+	// Seeded here or never. A slot discovered as finished is not in ActiveSearchIds(), so the
+	// tick never polls it and WriteSearchProgress is never called -- the percent would sit at
+	// its 0 default for the life of the slot, contradicting the "finished" state in the same
+	// envelope. Prefer the daemon's own number; without it, derive 100 for a finished search
+	// and 0 for a running one, which is corrected within a tick.
+	slot.progress.percent =
+		reported_percent >= 0 ? static_cast<std::uint32_t>(reported_percent) : (complete ? 100u : 0u);
+	slot.progress.kind = kind;
+	slot.query = query;
+	EvictSurplusSearchSlotsLocked(search_id);
+}
+
+void CState::DetachSearch(std::uint32_t search_id)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	auto it = m_searches.find(search_id);
+	if (it != m_searches.end())
+		it->second.detached = true;
+}
+
+void CState::MarkAllSearchesNeedResync()
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	for (auto &kv : m_searches) {
+		// A detached slot is frozen and the daemon holds nothing for it, so
+		// there is nothing to re-seed and the FULL would come back expired.
+		if (!kv.second.detached)
+			kv.second.needs_resync = true;
+	}
+}
+
+std::vector<std::uint32_t> CState::SearchesNeedingResync() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	std::vector<std::pair<std::uint64_t, std::uint32_t>> pending;
+	for (const auto &kv : m_searches) {
+		// Same exemption the flag's writer applies: a slot detached after it was flagged
+		// has had its search dropped by the daemon, so a full re-read would come back
+		// expired -- and a replace-mode apply would clear the results the detach exists to
+		// keep.
+		if (kv.second.needs_resync && !kv.second.detached)
+			pending.emplace_back(kv.second.seq, kv.first);
+	}
+	std::sort(pending.begin(), pending.end());
+	std::vector<std::uint32_t> out;
+	out.reserve(pending.size());
+	for (const auto &p : pending)
+		out.push_back(p.second);
+	return out;
+}
+
+void CState::ClearSearchResyncFlag(std::uint32_t search_id)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	auto it = m_searches.find(search_id);
+	if (it != m_searches.end())
+		it->second.needs_resync = false;
+}
+
+void CState::EvictSurplusSearchSlotsLocked(std::uint32_t exempt_id)
+{
+	while (m_searches.size() > kMaxSearchSlots) {
+		auto victim = m_searches.end();
+		for (auto it = m_searches.begin(); it != m_searches.end(); ++it) {
+			// Never an active one: it is still being polled, and the surplus
+			// is always made of slots that have stopped moving.
+			if (it->second.progress.active)
+				continue;
+			// Never the slot the caller is in the middle of seeding.
+			if (exempt_id != 0 && it->first == exempt_id)
+				continue;
+			// A detached slot always outranks an attached one, however much younger:
+			// the daemon no longer holds it, so evicting it drops nothing re-readable.
+			if (victim == m_searches.end() || (it->second.detached && !victim->second.detached) ||
+				(it->second.detached == victim->second.detached &&
+					it->second.seq < victim->second.seq)) {
+				victim = it;
+			}
+		}
+		if (victim == m_searches.end())
+			break; // every remaining slot is still active -- nothing to evict
+		// The index has to go with the slot, or a later result reusing one of
+		// these ECIDs would be attributed to a search that is no longer here.
+		for (const auto &entry : victim->second.raw)
+			m_resultOwner.erase(entry.first);
+		m_searches.erase(victim);
+	}
+}
+
+void CState::WriteSearchProgress(std::uint32_t search_id, SearchProgressSnapshot s)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	auto it = m_searches.find(search_id);
+	if (it != m_searches.end())
+		it->second.progress = std::move(s);
+}
+
+void CState::MutateAllSearches(const std::function<void(
+		std::map<std::uint32_t, SearchSlot> &, std::map<std::uint32_t, std::uint32_t> &)> &fn)
+{
+	const ReentryGuard guard(this);
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	fn(m_searches, m_resultOwner);
+}
+
+void CState::CloseSearch(std::uint32_t search_id)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	const auto it = m_searches.find(search_id);
+	if (it == m_searches.end())
+		return;
+	// The index mirrors this slot's result map, so it loses the same ECIDs in the same locked
+	// step. Walking the slot's own results is what keeps that exact: erasing by value over the
+	// whole index would be O(n) in every search.
+	for (const auto &kv : it->second.raw)
+		m_resultOwner.erase(kv.first);
+	m_searches.erase(it);
+}
+
+void CState::WriteStatsTree(StatsTreeNode t)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	m_stats_tree = std::move(t);
+}
+
+void CState::WriteGraphs(StatsGraphs g)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	m_graphs = std::move(g);
+}
+
+void CState::AppendAmuleLog(std::vector<std::string> new_lines)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	// No cap -- see the `m_amule_log_lines` declaration in State.h. Operators
+	// truncate via DELETE /logs/amule.
+	m_amule_log_lines.insert(m_amule_log_lines.end(),
+		std::make_move_iterator(new_lines.begin()),
+		std::make_move_iterator(new_lines.end()));
+}
+
+void CState::ClearAmuleLog()
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	m_amule_log_lines.clear();
+	++m_amule_log_generation;
+}
+
+void CState::WriteServerInfo(ServerInfoLog s)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	m_server_info = std::move(s);
+}
+
+std::vector<ServerSnapshot> CState::Servers() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	std::vector<ServerSnapshot> out;
+	out.reserve(m_servers.size());
+	for (const auto &kv : m_servers)
+		out.push_back(kv.second);
+	return out;
+}
+
+void CState::WriteStatus(StatusSnapshot s)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	m_status = std::move(s);
+}
+
+void CState::WriteKad(KadSnapshot k)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	m_kad = std::move(k);
+}
+
+void CState::WritePreferences(PreferencesSnapshot p)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	m_preferences = std::move(p);
+}
+
+void CState::WriteCategories(std::vector<CategorySnapshot> c)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	m_categories = std::move(c);
+}
+
+void CState::MutateServers(const std::function<void(std::map<std::uint32_t, ServerSnapshot> &)> &fn)
+{
+	const ReentryGuard guard(this);
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	fn(m_servers);
+}
+std::vector<FriendSnapshot> CState::Friends() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	std::vector<FriendSnapshot> out;
+	out.reserve(m_friends.size());
+	for (const auto &kv : m_friends)
+		out.push_back(kv.second);
+	return out;
+}
+void CState::MutateFriends(const std::function<void(std::map<std::uint32_t, FriendSnapshot> &)> &fn)
+{
+	const ReentryGuard guard(this);
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	fn(m_friends);
+}
+
+std::string IPv4ToDotted(std::uint32_t ip_lsb_first)
+{
+	char buf16;
+	std::snprintf(buf,
+		sizeof(buf),
+		"%u.%u.%u.%u",
+		static_cast<unsigned>((ip_lsb_first) & 0xFFu),
+		static_cast<unsigned>((ip_lsb_first >> 8) & 0xFFu),
+		static_cast<unsigned>((ip_lsb_first >> 16) & 0xFFu),
+		static_cast<unsigned>((ip_lsb_first >> 24) & 0xFFu));
+	return std::string(buf);
+}
+
+// See State.h. Matches on the path; the query string selects a page, not a
+// different resource.
+bool MemoizableTarget(const std::string &target)
+{
+	const std::string path = target.substr(0, target.find('?'));
+	// OPT-IN, and deliberately so. This was an exclusion list, and an exclusion list has to be
+	// right about every route that exists now and every route anyone adds later. Inverting it
+	// makes the failure mode "we hash a body we did not have to", which costs microseconds,
+	// instead of "we serve a 304 for content that changed".
+	//
+	// Before adding a target it must be BOTH governed by the refresher snapshot AND identical
+	// for every caller -- see State.h.
+	return path == "/api/v1/downloads" || path == "/api/v1/shared";
+}
+
+// See State.h. Ordered cheap-test-first: the revision comparison is two
+// integer loads, the target match copies and scans a string.
+bool MemoUsable(const std::string &target, std::uint64_t rev_before, std::uint64_t rev_after)
+{
+	return rev_before == rev_after && MemoizableTarget(target);
+}
+
+// See State.h.
+bool ShouldStampEtag(bool is_safe_method, bool handler_set_etag, unsigned status, bool body_empty)
+{
+	return is_safe_method && !handler_set_etag && status == 200 && !body_empty;
+}
+
+std::string ChatPeerKeyFromGuiId(std::uint64_t gui_id)
+{
+	const std::uint32_t ip = static_cast<std::uint32_t>(gui_id >> 16);
+	const std::uint16_t port = static_cast<std::uint16_t>(gui_id & 0xFFFFu);
+	return IPv4ToDotted(ip) + ":" + std::to_string(port);
+}
+
+std::vector<ChatSessionSnapshot> CState::Chats() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_chats;
+}
+
+std::uint32_t CState::ChatCursor() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_chat_cursor;
+}
+
+void CState::MutateChats(const std::function<void(std::vector<ChatSessionSnapshot> &, std::uint32_t &)> &fn)
+{
+	const ReentryGuard guard(this);
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	fn(m_chats, m_chat_cursor);
+}
+
+std::vector<ClientSnapshot> CState::Clients() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	std::vector<ClientSnapshot> out;
+	out.reserve(m_clients.size());
+	for (const auto &kv : m_clients)
+		out.push_back(kv.second);
+	return out;
+}
+
+bool CState::KnownClientsLoaded() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_known_loaded;
+}
+
+void CState::SetKnownClients(std::vector<KnownClientSnapshot> &&rows)
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	m_known_clients = std::move(rows);
+	m_known_of_hash.clear();
+	m_known_connected.clear();
+	for (std::size_t i = 0; i < m_known_clients.size(); ++i)
+		m_known_of_hashm_known_clientsi.user_hash = i;
+	m_known_loaded = true;
+	// The fetch describes the store as of a moment ago; the peers connected
+	// right now are already more current than parts of it.
+	ReconcileKnownClientsLocked();
+}
+
+void CState::ReconcileKnownClients()
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	if (!m_known_loaded)
+		return;
+	ReconcileKnownClientsLocked();
+}
+
+void CState::ReconcileKnownClientsLocked()
+{
+	const std::time_t now = std::time(nullptr);
+	std::set<std::size_t> still_online;
+
+	for (const auto &kv : m_clients) {
+		const ClientSnapshot &c = kv.second;
+		// An all-zero hash is not an identity: it is what a peer that has not sent its hash
+		// yet reports, and every such peer would otherwise collapse into one fabricated
+		// record, sharing a session count and a first-seen between unrelated clients. They
+		// get a row of their own once they identify.
+		if (c.user_hash.empty() || c.user_hash.find_first_not_of('0') == std::string::npos)
+			continue;
+
+		auto it = m_known_of_hash.find(c.user_hash);
+		if (it == m_known_of_hash.end()) {
+			// A peer met since the store was read. The daemon wrote its credit record
+			// when the peer said hello, so this reconstructs what it wrote.
+			//
+			// sessions is left at zero deliberately: the not-connected to connected
+			// transition below is what counts it, matching the daemon counting at the
+			// hello and not at the attempt. Setting it here would double-count.
+			KnownClientSnapshot k;
+			k.user_hash = c.user_hash;
+			k.first_seen_at = now;
+			k.last_seen_at = now;
+			m_known_clients.push_back(std::move(k));
+			it = m_known_of_hash.emplace(c.user_hash, m_known_clients.size() - 1).first;
+		}
+
+		KnownClientSnapshot &k = m_known_clientsit->second;
+		still_online.insert(it->second);
+		// Reachability, echoed from the live row. A client object exists from the first
+		// contact ATTEMPT, so presence in the list is not the same question. Read before
+		// the assignment: k.connected still holds last tick's answer, which is what the
+		// session edge below is measured against.
+		const bool was_connected = k.connected;
+		k.connected = c.has_connected && c.connected;
+		k.has_connected = c.has_connected;
+		// Not-connected to connected is a new session, which is what the daemon counts:
+		// UpdateMeta() bumps it once per client object at the hello, and a hello needs a
+		// connection. Firing on the peer merely APPEARING in the client list would run the
+		// count ahead of the daemon's, since that is earlier and also happens for a peer
+		// that never connects. It can still over-count by one if a peer
+		// drops out of the update for a tick and returns, because the departure sweep
+		// clears connected for it.
+		if (!was_connected && k.connected)
+			k.session_count++;
+		// A peer in front of us was last seen now, not whenever it previously disconnected
+		// -- and now is what the core writes to the record at its own disconnect handling
+		// anyway.
+		k.last_seen_at = now;
+		k.uploaded_bytes_total = c.uploaded_bytes_total;
+		k.downloaded_bytes_total = c.downloaded_bytes_total;
+		// Moves with the totals it is computed from. The store's copy was taken when the
+		// history was read, so a transferring peer would otherwise pair growing totals
+		// with the ratio it had when amuleapi started.
+		k.credit_ratio = c.credit_ratio;
+		k.has_credit_ratio = c.has_credit_ratio;
+		// Identity, when the peer in front of us knows more than the record. A record only
+		// gains a name once the core writes its metadata. Guarded on the live name being
+		// known: a peer mid-handshake must not blank a stored one.
+		if (!c.client_name.empty()) {
+			k.client_name = c.client_name;
+			k.ip = c.ip;
+			k.port = c.port;
+			k.kad_port = c.kad_port;
+			k.country_code = c.country_code;
+			k.software = c.software;
+			k.software_version = c.software_version;
+			k.source_origin = c.source_origin;
+			k.obfuscation_state = c.obfuscation_state;
+		}
+	}
+
+	// Whoever was connected last tick and is not in this one has gone. Found through the
+	// connected set, so this costs the number of departures rather than a walk of the store.
+	for (const std::size_t idx : m_known_connected) {
+		if (still_online.count(idx) != 0)
+			continue;
+		// Gone from the client list entirely: the daemon holds no object for
+		// it, so it is definitively not connected. Known, not unknown.
+		m_known_clientsidx.connected = false;
+		m_known_clientsidx.has_connected = true;
+		// Seen until this moment, which is what the core writes at its own disconnect
+		// handling. The stored value is the *previous* disconnect, so leaving it would show
+		// a peer that was here a second ago as months old.
+		m_known_clientsidx.last_seen_at = now;
+	}
+	m_known_connected.swap(still_online);
+}
+
+bool CState::FindDownload(const std::string &hash_hex, FileSnapshot &out) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	std::uint32_t ecid = 0;
+	// Role-keyed: a share with the same content must not shadow the download (#1161). The
+	// is_downloading check below is now belt-and-braces rather than the thing standing between
+	// the caller and the wrong entry.
+	if (!m_files.FindDownloadEcidByHash(hash_hex, ecid))
+		return false;
+	const auto it = m_files.find(ecid);
+	if (it == m_files.end() || !it->second.is_downloading)
+		return false;
+	out = it->second;
+	return true;
+}
+
+std::uint64_t CState::DownloadPartCount(const std::string &hash_hex) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	std::uint32_t ecid = 0;
+	// Same role-keyed resolution as FindDownload(): this answers a question
+	// about the download, so a share with the same hash must not answer it.
+	if (!m_files.FindDownloadEcidByHash(hash_hex, ecid))
+		return 0;
+	const auto it = m_files.find(ecid);
+	if (it == m_files.end() || !it->second.is_downloading)
+		return 0;
+	return PartCountForSize(it->second.size);
+}
+
+bool CState::FindDownloadByEcid(std::uint32_t ecid, FileSnapshot &out) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	auto it = m_files.find(ecid);
+	if (it == m_files.end() || !it->second.is_downloading)
+		return false;
+	out = it->second;
+	return true;
+}
+
+bool CState::FindShared(const std::string &hash_hex, FileSnapshot &out) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	std::uint32_t ecid = 0;
+	// Role-keyed, mirroring FindDownload(): the part file being downloaded
+	// must not shadow the share.
+	if (!m_files.FindSharedEcidByHash(hash_hex, ecid))
+		return false;
+	const auto it = m_files.find(ecid);
+	if (it == m_files.end() || !it->second.is_shared)
+		return false;
+	out = it->second;
+	return true;
+}
+
+bool CState::FindSharedByEcid(std::uint32_t ecid, FileSnapshot &out) const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	auto it = m_files.find(ecid);
+	if (it == m_files.end() || !it->second.is_shared)
+		return false;
+	out = it->second;
+	return true;
+}
+
+// MutateDownloads + MutateShared both lock and hand out m_files. Both walkers operate on the same
+// unified map, and the callback decides which role flag to set or clear. The FileMap wrapper keeps
+// its hash->ECID index in sync as the walker emplaces or erases, so there is no rebuild pass at the
+// end.
+void CState::MutateDownloads(const std::function<void(FileMap &)> &fn)
+{
+	const ReentryGuard guard(this);
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	fn(m_files);
+	// Bumped by the writer, not by its callers. The ETag memo keys on this, and every previous
+	// attempt to advance it from the outside missed a path: first the inline refreshes mutating
+	// handlers run, then a tick that failed partway after already writing. A writer cannot
+	// forget to say that it wrote.
+	++m_snapshot_rev;
+}
+
+void CState::MutateShared(const std::function<void(FileMap &)> &fn)
+{
+	const ReentryGuard guard(this);
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	fn(m_files);
+	// See MutateDownloads: the memo key is advanced by the writer.
+	++m_snapshot_rev;
+}
+
+void CState::MutateClients(const std::function<void(std::map<std::uint32_t, ClientSnapshot> &)> &fn)
+{
+	// Forwards rather than repeating the guard-plus-lock body: the two differ only
+	// in what they hand the callback, and this is still exactly one acquisition.
+	MutateClientsWithFiles(
+		&fn(std::map<std::uint32_t, ClientSnapshot> &clients, const FileMap &) { fn(clients); });
+}
+
+void CState::MutateClientsWithFiles(
+	const std::function<void(std::map<std::uint32_t, ClientSnapshot> &, const FileMap &)> &fn)
+{
+	const ReentryGuard guard(this);
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	fn(m_clients, m_files);
+}
+
+void CState::ResetLists()
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	// A wholesale wipe on a failed tick is as much a body change as any mutation,
+	// and it runs on the failure path -- exactly where the key used to freeze.
+	++m_snapshot_rev;
+	m_files.clear();
+	m_clients.clear();
+	m_servers.clear();
+	m_categories.clear();
+	// Search slots and the ECID->search_id index that mirrors them are deliberately NOT
+	// cleared. This runs when a tick failed against a socket that is still up -- an actual
+	// dropped connection sets g_shutdownRequested via HandleEcConnectionLost() and this loop
+	// exits instead -- so the daemon's per-connection search registry is very much alive, along
+	// with its record of which results it has already sent us. Wiping our side would not resync
+	// anything: results the daemon considers delivered are elided from then on, so every search
+	// would come back permanently short. The collections above are safe to wipe precisely
+	// because their EC_DETAIL_UPDATE streams resend in full; this one does not.
+	//
+	// The credit store is kept for the same reason -- refetching the whole thing after one null
+	// tick is the cost that endpoint exists to avoid, and it cannot go stale across a daemon
+	// restart, since amuleapi shuts down the moment the socket drops.
+	//
+	// Logs + stats_tree + graphs survive EC reconnects on purpose: the operator can see "EC
+	// disconnected at HH:MM" alongside earlier graph traffic.
+}
+
+void CState::BumpSnapshotRevision()
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	++m_snapshot_rev;
+}
+
+std::uint64_t CState::SnapshotRevision() const
+{
+	std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+	return m_snapshot_rev;
+}
+
+void CState::MarkTickSuccess()
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	m_has_first_snapshot = true;
+	m_ec_connected = true;
+	// `m_snapshot_at` is stamped at tick-END, not tick-start, so `snapshot_at` is the wall-
+	// clock moment the daemon finished assembling the snapshot, with the tick's own duration as
+	// the implicit skew (typically 50-200 ms, more under EC-mutex contention). Fine for coarse
+	// freshness checks, not sub-second ones.
+	m_snapshot_at = std::time(nullptr);
+}
+
+void CState::MarkTickFailure()
+{
+	std::unique_lock<std::shared_timed_mutex> lock(m_mu);
+	// Deliberately preserve m_snapshot_at: clients see a stale `snapshot_at` next to
+	// `ec_connected=false` and can tell how stale the cache is. Resetting it to `now` would
+	// lie.
+	//
+	// On failure CState may hold partial mutations from earlier in the tick. The "tick =
+	// transaction" model is atomic for events but NOT for state -- there is no rollback. CState
+	// is a best-effort cache; LastSeenState is the authoritative event baseline.
+	m_ec_connected = false;
+}
+
+} // namespace webapi

amule-3.1.0.tar.gz/src/webapi/State.h Added

@@ -0,0 +1,1850 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_STATE_H
+#define WEBAPI_STATE_H
+
+#include <chrono>
+#include <cstdint>
+#include <ctime>
+#include <functional>
+#include <map>
+#include <set>
+#include <shared_mutex>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+// kNoPartPendingSentinel: the same shape of sentinel as kRemoteQueueFullSentinel
+// below, for the two part indices on ClientSnapshot. It lives in that header because
+// the predicates that test it are unit-tested standalone, and a constant defined
+// twice is a constant that drifts.
+#include "PartIndex.h"
+
+// Cached snapshot of amuled state. One instance lives inside CamuleapiApp for the
+// whole process; the refresher (wxApp thread) writes, the HTTP server (Boost.Asio
+// thread) reads.
+//
+// A single `std::shared_timed_mutex` guards every member. The refresher takes it
+// exclusive once per tick to swap each substruct (a `std::move`, never the EC
+// roundtrip itself). Read handlers take it shared, copy the substruct, release, then
+// serialise JSON outside the critical section.
+
+namespace webapi
+{
+
+// One per file in amuled's state, keyed by ECID. Each file may participate in either
+// or both of two roles:
+//
+//   * `is_downloading` -- a partfile in `downloadqueue`, still acquiring chunks.
+//     Drives `/downloads`, populated from `EC_TAG_PARTFILE_*` children.
+//   * `is_shared` -- uploadable: a completed knownfile, OR a partfile with >=1 chunk
+//     done (`EC_TAG_PARTFILE_SHARED=true`). Drives `/shared`, populated from
+//     `EC_TAG_KNOWNFILE_*` children.
+//
+// Keying both roles on one ECID avoids the "shared cache has a ghost row with empty
+// hash" bug: on a partfile-becoming-shared tick the server's CValueMap suppresses
+// `EC_TAG_PARTFILE_HASH` because it was sent on a prior tick, but the unified entry
+// already has hash + name from the downloads walker.
+//
+// Role-specific state lives in sub-blocks. On a role transition true->false the
+// refresher resets that side's sub-block, so neither endpoint can serve stale stats.
+struct FileSnapshot
+{
+	// Identity / shared metadata (always populated).
+	std::uint32_t ecid = 0;
+	std::string hash; // 32-char hex MD4
+	std::string name;
+	std::string ed2k_link;
+	std::uint64_t size = 0;
+
+	bool is_downloading = false;
+	bool is_shared = false;
+
+	// File-level attributes carried by the base CKnownFile EC tags, so they are
+	// available on both detail endpoints. Detail-only.
+	std::string aich_hash;          // AICH master hash (hex); "" if none
+	std::uint32_t queued_count = 0; // clients on this file's upload queue
+	std::string comment;            // the user's own file comment
+	std::int32_t rating = 0;        // the user's own rating, 0-5 (0 = unrated)
+
+	// Audio/video media metadata. amuled emits each field only when that field has a
+	// value -- deliberately NOT gated on the aggregate GetMetaDataVer(), which would send
+	// length 0 / bitrate 0 for a file that probed to a codec and no duration. A zero /
+	// empty value is amuled saying the field is GONE.
+	//
+	// `has_media` is therefore DERIVED from the fields below: latching it on any tag
+	// arriving would report media on a file whose fields have since cleared.
+	bool has_media = false;
+	struct Media
+	{
+		std::uint32_t duration_seconds = 0; // duration, seconds
+		std::uint32_t bitrate_kilobits_per_second = 0;
+		std::string codec;
+		std::string artist;
+		std::string album;
+		std::string title;
+	} media;
+
+	// The partfile's control-file basename (e.g. `001.part`), from
+	// EC_TAG_KNOWNFILE_FILENAME. Meaningful only while the file is still an incomplete
+	// partfile -- once it completes the daemon reuses that EC tag to carry the directory
+	// path, so /downloads gates it on the download status.
+	std::string part_met_basename;
+
+	// The file's on-disk directory, from EC_TAG_KNOWNFILE_PATH -- the Temp dir while
+	// downloading, the destination dir once completed. Always a directory, never the
+	// `.part` basename.
+	std::string on_disk_dir;
+
+	// Download-side state -- meaningful when `is_downloading` is true, reset to
+	// default on the true->false transition.
+	struct DownloadSide
+	{
+		std::uint64_t completed_bytes = 0;
+		std::uint64_t transferred_bytes = 0;
+		std::uint32_t speed_bytes_per_second = 0;
+		std::string status; // "downloading" | "paused"
+				    // | "completed" | "hashing" | ...
+		// Download priority: "very_low" | "low" | "normal" | "high" | "release" | "auto".
+		std::string priority;
+		bool priority_auto = false;
+		std::uint32_t category = 0;
+		double percent = 0.0;
+		std::uint32_t sources_total = 0;
+		std::uint32_t sources_unavailable = 0;
+		std::uint32_t sources_transferring = 0;
+		std::uint32_t sources_a4af = 0;
+
+		// Detail-only fields (GET /downloads/{hash}). All decoded from tags
+		// CEC_PartFile_Tag already emits under INC_UPDATE.
+		std::uint32_t last_seen_complete_at = 0;       // unix ts; 0 = unknown
+		std::uint32_t last_received_at = 0;            // unix ts of last change
+		std::uint32_t active_seconds = 0;              // seconds downloading
+		std::uint16_t available_part_count = 0;        // parts across sources
+		std::uint16_t hashed_part_count = 0;           // parts hashed so far; 0 = idle
+		std::uint64_t lost_to_corruption_bytes = 0;    // bytes
+		std::uint64_t gained_by_compression_bytes = 0; // bytes
+		std::uint32_t ich_recovered_packet_count = 0;  // packets recovered by ICH
+
+		// Per-source comments/ratings (GET /downloads/{hash}/comments, issue #419).
+		// Downloads-only -- needs a live source list. A `rating` of -1 means the source
+		// left a comment but no rating.
+		struct SourceComment
+		{
+			std::string username;
+			std::string filename;
+			std::int32_t rating = 0;
+			std::string comment;
+		};
+		std::vector<SourceComment> source_comments;
+
+		// True while an on-demand Kad notes lookup is in flight on amuled for this file
+		// (POST /downloads/{hash}/comments starts one; issue #434). Lets clients poll
+		// GET .../comments until the search finishes.
+		bool kad_comment_searching = false;
+
+		// Source-reported filenames. amuled delta-encodes these keyed by a stable id (new
+		// = name+count, count 0 = removed, else count update); the refresher accumulates
+		// into this map across ticks.
+		struct SourceName
+		{
+			std::string name;
+			std::uint32_t count = 0;
+		};
+		std::map<std::uint32_t, SourceName> source_names;
+
+		// A4AF (asked-for-another-file) source scheduling. `a4af_auto` is the auto-swap
+		// flag; `a4af_sources` are the client ECIDs currently parked as A4AF sources (full
+		// list re-sent by amuled when it changes).
+		bool a4af_auto = false;
+		std::vector<std::uint32_t> a4af_sources;
+
+		// Decoded per-part state, populated by the refresher's RLE decoder pass on
+		// EC_TAG_PARTFILE_GAP_STATUS + EC_TAG_PARTFILE_PART_STATUS. Both arrays are sized
+		// to ceil(size / PARTSIZE) once a successful decode has landed; the detail
+		// endpoint walks them in parallel.
+		std::vector<std::uint64_t> decoded_gaps;
+		std::vector<std::uint16_t> decoded_part_sources;
+	} download;
+
+	// Shared-side state -- meaningful when `is_shared` is true,
+	// reset on the true→false transition.
+	struct SharedSide
+	{
+		// Upload priority level, distinct from the download-side value: a partfile
+		// that is both downloading and shared carries two independent priorities.
+		std::string priority; // upload priority: "very_low" | "low"
+				      // | "normal" | "high" | "release" | "auto"
+		// Upload-side auto-priority flag, mirroring `download.priority_auto`.
+		bool priority_auto = false;
+		std::uint64_t uploaded_bytes_session = 0;
+		std::uint64_t uploaded_bytes_total = 0;
+		std::uint32_t request_count_session = 0;
+		std::uint32_t request_count_total = 0;
+		std::uint32_t accepted_request_count_session = 0;
+		std::uint32_t accepted_request_count_total = 0;
+		std::uint32_t complete_sources = 0;
+
+		// Detail-only. The complete-sources range backs the desktop `< N` / `N - M`
+		// display; the scalar `complete_sources` above stays as-is.
+		std::uint16_t complete_sources_low = 0;
+		std::uint16_t complete_sources_high = 0;
+
+		// Per-part source availability backing the shared "Obtained Parts" bar, decoded
+		// from EC_TAG_PARTFILE_PART_STATUS on the EC_TAG_KNOWNFILE tag. Sized to
+		// ceil(size / PARTSIZE) once a decode has landed and empty until then, which the
+		// detail endpoint reports as `parts: null` -- "no data yet" and "no sources for
+		// any part" stay distinguishable.
+		//
+		// A shared *partfile* never populates this: amuled emits it as EC_TAG_PARTFILE
+		// only (one encoder per ECID), so its vector lands in
+		// `download.decoded_part_sources` and the detail writer falls back to that.
+		std::vector<std::uint16_t> decoded_part_sources;
+
+		// Parts hashed so far by a pass running over this complete share -- Verify Local
+		// Data, or an AICH hashset rebuild -- from EC_TAG_KNOWNFILE_HASHED_PART_COUNT. A
+		// count, not an index: the tasks report part + 1. 0 means idle.
+		//
+		// A download that is also shared arrives as EC_TAG_PARTFILE, so its progress lands
+		// in download.hashed_part_count and this stays 0 -- read both through
+		// SharedHashingProgress() rather than this field directly.
+		std::uint16_t hashing_progress = 0;
+
+		// Live upload activity, the upload-side analogue of the download stats. The speed
+		// and client count are live; `last_upload` / `shared_since` are unix timestamps, 0
+		// = unknown (never uploaded, or a known.met entry that predates the feature).
+		std::uint32_t upload_speed_bytes_per_second = 0;
+		std::uint16_t uploading_client_count = 0;
+		std::uint32_t last_upload = 0;
+		std::uint32_t shared_since = 0;
+	} shared;
+
+	// True while the file is genuinely an incomplete partfile: still in the download
+	// queue, and not the "finished but not yet cleared" state.
+	//
+	// A completed download keeps `is_downloading` set until the user clears it, while
+	// already being a knownfile in its destination directory, so `is_downloading` alone
+	// would misreport it. "completing" is incomplete on purpose: the data is still in
+	// the temp directory until the move finishes.
+	bool IsIncompletePartfile() const { return is_downloading && download.status != "completed"; }
+};
+
+// One per peer (CUpDownClient) in the daemon's active client list, populated from
+// the EC_TAG_CLIENT subtree inside the GET_UPDATE response.
+//
+// "Client" here is amule's bidirectional peer: a remote ed2k peer connected to us
+// in EITHER role -- uploader, uploadee, queue waiter, banned. The cache holds ALL
+// of them and consumer endpoints filter by role: /uploads by upload_state ==
+// US_UPLOADING, /clients not at all, and the per-file routes by download_file_hash
+// / upload_file_hash plus that download's A4AF sources, each row carrying the
+// direction as a `role` field.
+/**
+ * One peer from the daemon's credit store -- GET /known_clients.
+ *
+ * Distinct from ClientSnapshot, which describes a peer we are connected to *now*:
+ * this is keyed by user hash rather than ECID, survives the daemon process that
+ * issued any ECID, and carries stored history rather than live transfer state. A
+ * peer can appear in both, correlated by user_hash.
+ *
+ * Every field except the hash and the totals is optional. A record written before
+ * the daemon kept per-peer metadata has no name, address or software, and the
+ * daemon omits those tags rather than inventing values.
+ */
+struct KnownClientSnapshot
+{
+	std::string user_hash; // 32-char lowercase hex MD4; the identity
+	std::string client_name;
+	std::string ip; // dotted-quad; "" when the record predates metadata
+	std::uint16_t port = 0;
+	std::uint16_t kad_port = 0;
+	std::string country_code;     // ISO 3166-1 alpha-2, resolved daemon-side
+	std::string software;         // resolved name, e.g. "eMule"
+	std::string software_version; // "v0.50.0"
+	std::string source_origin;
+	std::string obfuscation_state;
+	std::uint64_t uploaded_bytes_total = 0;
+	std::uint64_t downloaded_bytes_total = 0;
+	//! Same quantity as the live row, computed by the core rather than re-derived here.
+	double credit_ratio = 0.0;
+	bool has_credit_ratio = false;
+	std::time_t first_seen_at = 0; // 0 when the record carries no metadata
+	std::time_t last_seen_at = 0;
+	std::uint32_t session_count = 0;
+	//! This peer is connected right now, correlated by user hash against the live
+	//! client list. Never by ECID: those mean nothing across daemon restarts, while
+	//! the hash is what the credit store is keyed on. Spelled the same on the wire
+	//! as the live rows carry it (R6).
+	bool connected = false;
+	//! The daemon answered the reachability question. False means unknown (a core
+	//! that predates EC_TAG_CLIENT_CONNECTED), which is null on the wire rather than
+	//! a guessed "offline".
+	bool has_connected = false;
+};
+
+//! amuled substitutes this for the queue position when the peer's queue is full
+//! (ECSpecialCoreTags.cpp: `IsRemoteQueueFull() ? 0xffff : rank`). It is a sentinel,
+//! not a position: relayed as a number it reads as "position 65535", so the REST
+//! and SSE writers emit null for it instead.
+constexpr std::uint16_t kRemoteQueueFullSentinel = 0xffffu;
+
+struct ClientSnapshot
+{
+	std::uint32_t ecid = 0;
+	std::string client_name;
+	std::string user_hash; // peer's user hash (32-char lowercase hex MD4)
+	std::string ip;        // dotted-quad
+	std::uint16_t port = 0;
+	// ISO 3166-1 alpha-2 country code (lowercase), resolved by the daemon's GeoIP from
+	// the peer IP (#439). "" when GeoIP is disabled/unsupported or the IP does not
+	// resolve.
+	std::string country_code;
+
+	// Software identity. EC_TAG_CLIENT_SOFTWARE ships a numeric code (SO_AMULE /
+	// SO_EMULE / etc), decoded server-side into a short label here.
+	std::string software;         // "amule" | "emule" | "edonkey" | "mldonkey" | ...
+	std::string software_version; // free-form string from EC_TAG_CLIENT_SOFT_VER_STR
+	std::string reported_os;      // free-form (CLIENT_OS_INFO)
+
+	// State machine values. We decode the raw US_*/DS_*/IS_* ints
+	// into wire strings so consumers don't reach into amule's enums.
+	std::string upload_state;   // "uploading" | "queued" | "banned" | "connecting" | "idle" | ...
+	std::string download_state; // "downloading" | "queued" | "no_needed_parts" | ... | "idle"
+	// Complete set, see ClientIdentStateName() in Refresher.cpp:
+	std::string ident_state; // "not_available" | "id_needed" | "identified" | "id_failed" | "bad_guy" |
+				 // "unknown"
+
+	// File context -- different per direction. Both correlators are 32-char lowercase MD4
+	// hashes resolved by the refresher from EC_TAG_CLIENT_UPLOAD_FILE /
+	// EC_TAG_CLIENT_REQUEST_FILE (which amuled ships as ECIDs) against the unified
+	// m_files map. upload_file_hash / upload_file_name name the partfile this peer is
+	// downloading FROM us, resolved locally; download_file_hash / download_file_name name
+	// the file we are downloading FROM this peer, as the peer advertised it
+	// (OP_REQFILENAMEANSWER). Empty when not in that role, or when the ECID did not
+	// resolve.
+	std::string upload_file_hash;   // EC_TAG_CLIENT_UPLOAD_FILE resolved
+	std::string download_file_hash; // EC_TAG_CLIENT_REQUEST_FILE resolved
+	std::string download_file_name; // EC_TAG_CLIENT_REMOTE_FILENAME
+	std::string upload_file_name;   // resolved from upload_file_hash against m_files
+
+	// Per-session transfer stats. CLIENT_UPLOAD_SESSION is bytes uploaded TO this peer;
+	// PARTFILE_SIZE_XFER (when re-keyed on a CLIENT_* tag) is bytes downloaded FROM it.
+	std::uint64_t uploaded_bytes_session = 0;
+	std::uint64_t downloaded_bytes_session = 0;
+	std::uint64_t uploaded_bytes_total = 0;
+	std::uint64_t downloaded_bytes_total = 0;
+	std::uint32_t upload_speed_bytes_per_second = 0;
+	std::uint32_t download_speed_bytes_per_second = 0;
+
+	// Upload queue position (for peers in US_ONUPLOADQUEUE).
+	// 0 when not queued.
+	std::uint32_t upload_queue_position = 0;
+	// Remote queue rank -- our position in THE PEER's upload queue. Carries amuled's
+	// queue-full sentinel as well as a real position; see kRemoteQueueFullSentinel.
+	std::uint16_t remote_queue_position = 0;
+
+	std::uint32_t score = 0; // EC_TAG_CLIENT_SCORE
+	// Complete set, see ClientObfuscationName() in Refresher.cpp:
+	std::string obfuscation_state; // "undefined" | "enabled" | "supported" | "not_supported" |
+				       // "disabled" | "unknown"
+	//! EC_TAG_CLIENT_MOD_CAPABILITIES: the peer's eMuleAI vendor capability word,
+	//! already limited to the bits aMule knows by CPeerCapabilities::SetFromWire() in
+	//! the daemon. Held as the word the daemon sent, not re-masked here: a second mask
+	//! in this process would be free to disagree. Bit meanings live in
+	//! src/PeerCapabilities.h. 0 covers both "claims nothing" and "sent no tag".
+	std::uint32_t protocol_extensions = 0;
+	bool friend_slot = false;
+	// Whether a socket to this peer is up right now (EC_TAG_CLIENT_CONNECTED, from
+	// CUpDownClient::IsConnected). A row existing here only means the daemon holds a
+	// client object, which it does from the first contact ATTEMPT -- so presence in this
+	// list is not reachability. has_connected false = never said.
+	bool connected = false;
+	bool has_connected = false;
+
+	// --- Extra fields decoded off the INC_UPDATE wire ----------------
+	// Serialized by GET /clients/{ecid}; five of them are also on the /clients list row
+	// and the SSE client_* payloads.
+	std::uint32_t ed2k_user_id = 0; // EC_TAG_CLIENT_USER_ID (hybrid eD2k id)
+	bool high_id = false;           // derived: !IsLowID(ed2k_user_id)
+	std::string server_ip;          // dotted-quad; "" when unknown/0
+	std::uint16_t server_port = 0;
+	std::string server_name;
+	std::uint16_t kad_port = 0; // 0 => Kad not connected for this peer
+	std::string source_origin;  // "local_server" | "remote_server" | "kad" | "source_exchange" | ...
+	std::uint32_t parts_offered_count = 0; // count of parts the peer has (EC_TAG_CLIENT_AVAILABLE_PARTS)
+	bool has_parts_offered_count = false;  // false => tag absent, emitted as null
+	std::string client_mod_name;           // EC_TAG_CLIENT_MOD_VERSION
+	bool view_shared_disabled = false;     // peer forbids viewing its shared files
+	// Completeness of the linked download for this peer, as a percent
+	// (parts_offered_count / file part count). Negative means not computable. Derived
+	// rather than decoded: filled in by ComputePartProgressPercent at every site that
+	// serializes a client, since it needs a second snapshot to resolve.
+	double part_progress_percent = -1.0;
+
+	// Per-part bitmaps, one bit per chunk of the file the relation names: `part_status`
+	// is what the peer holds of the file WE PULL FROM IT, `upload_part_status` what it
+	// holds of the file IT PULLS FROM US. A peer doing both at once has two different
+	// files' bitmaps here.
+	//
+	// The core sends an EMPTY tag to mean "has every part" rather than spending bytes on
+	// an all-ones buffer, and omits the tag entirely when its length would disagree with
+	// the file's part count. `*_all` carries the first case.
+	std::vector<bool> part_status;
+	std::vector<bool> upload_part_status;
+	bool part_status_all = false;
+	bool upload_part_status_all = false;
+	bool has_part_status = false;
+	bool has_upload_part_status = false;
+	// Indices into the download bitmap of the peer's request file; absent from the wire
+	// means unchanged, so the has_ flags distinguish "never reported" from "reported as
+	// 0". They address one file, not the peer as a whole.
+	//
+	// Values are relayed raw and validated by the serializer rather than here, because
+	// only the endpoint knows the file: kNoPartPendingSentinel is the core's "nothing
+	// pending" answer, any index past the file's part count is unusable, and
+	// last_downloading_part is a stale 0 (BaseClient.cpp inits it so, and the tag is sent
+	// unconditionally) unless download_state is "downloading" -- all of which come out as
+	// null.
+	std::uint16_t next_requested_part = 0;
+	std::uint16_t last_downloading_part = 0;
+	bool has_next_requested_part = false;
+	bool has_last_downloading_part = false;
+
+	// --- Fields from the EC tags issue #423 added. On the list row and the SSE
+	// payload as well as the detail object, so every peer list can render them.
+	bool is_friend = false;    // CUpDownClient::IsFriend(); distinct from friend_slot
+	double credit_ratio = 0.0; // CUpDownClient::GetCreditRatio() ("DL/UP modifier")
+	//! False on a daemon that never sent the tag. The wire then carries null, which is not
+	//! the same answer as a peer whose transfer history earns exactly 1.
+	bool has_credit_ratio = false;
+};
+
+// One per eD2k server in the configured server list. Identity is the EC ECID (stable
+// per amuled process lifetime). Servers are fetched at full-state per refresher tick
+// (EC_OP_GET_SERVER_LIST has no two-phase INC equivalent), so the refresher rebuilds
+// the whole map each cycle.
+struct ServerSnapshot
+{
+	std::uint32_t ecid = 0;
+	std::string name;
+	std::string description;
+	std::string version;
+	std::string address;  // host:port form (canonical)
+	std::uint32_t ip = 0; // host-byte-order IPv4
+	std::uint16_t port = 0;
+	// ISO 3166-1 alpha-2 country code (lowercase) of the server host,
+	// resolved by the daemon's GeoIP (#440). "" when GeoIP is off/unresolved.
+	std::string country_code;
+	std::uint32_t ping_ms = 0;
+	std::uint32_t failed_count = 0;
+	std::uint32_t users = 0;
+	std::uint32_t max_users = 0;
+	std::uint32_t files = 0;
+	// Per-user publishing limits the server advertises: below the soft limit a client may
+	// publish every file, between soft and hard only its rarest, above the hard limit
+	// nothing. Both arrive only once a UDP status reply has come back, so 0 means "the
+	// server has not told us", not "the limit is zero".
+	std::uint32_t soft_file_limit = 0;
+	std::uint32_t hard_file_limit = 0;
+	// Bitmasks of the eD2k wire capabilities the server announced, decoded to booleans on
+	// the way out (ServerFlagNames.h). 0 likewise means "nothing announced yet" rather
+	// than "supports nothing".
+	std::uint32_t tcp_flags = 0;
+	std::uint32_t udp_flags = 0;
+	std::string priority; // "low" | "normal" | "high"
+	bool is_static = false;
+};
+
+// /friends endpoint. The daemon ships the whole friends list inside every
+// EC_OP_GET_UPDATE reply, so no endpoint here costs an extra roundtrip.
+struct FriendSnapshot
+{
+	std::uint32_t ecid = 0;
+	std::string name;
+	std::string user_hash; // 32-char lowercase MD4, "" when added by ip:port
+	// Dotted quad, "" for a zero IP -- rendered in the walker like
+	// ClientSnapshot::ip, so nothing downstream has to know the wire encoding.
+	std::string ip;
+	std::uint16_t port = 0;
+	std::uint32_t client_ecid = 0; // live peer this friend is linked to, 0 = offline
+	// Whether a socket to that peer is actually up. Distinct from client_ecid being
+	// non-zero, which is true from the first contact attempt. has_ companion because a
+	// daemon predating EC_TAG_CLIENT_CONNECTED says nothing.
+	bool connected = false;
+	bool has_connected = false;
+	// Reported by cores that serialize EC_TAG_FRIEND_FRIENDSLOT. An older daemon
+	// omits the tag and this stays false.
+	bool friend_slot = false;
+};
+
+// /chats endpoints. One conversation with one peer, mirrored from the daemon's
+// CChatSessionStore over EC_OP_GET_CHAT_SESSIONS. Keyed on the GUI_ID the wire
+// already uses -- (ip << 16) | port -- which the REST layer renders as the readable
+// "<ip>:<port>" conversation key: stable across peer reconnects, unlike an ECID.
+struct ChatMessageSnapshot
+{
+	std::uint32_t id = 0; //!< monotonic per daemon process; a safe `since_id` cursor
+	bool outgoing = false;
+	std::uint32_t timestamp = 0; //!< unix seconds, stamped by the core
+	std::string text;
+};
+
+struct ChatSessionSnapshot
+{
+	std::uint64_t gui_id = 0;
+	std::string ip; //!< dotted quad, rendered in the walker like ClientSnapshot::ip
+	std::uint16_t port = 0;
+	std::string name;              //!< peer display name; "" when the core has none
+	std::uint32_t client_ecid = 0; //!< live peer, 0 when offline
+	bool connected = false;        //!< a socket to that peer is actually up
+	bool has_connected = false;    //!< daemon reported it; false = unknown, not offline
+	std::uint32_t friend_ecid = 0; //!< friend entry, 0 when not a friend
+	std::vector<ChatMessageSnapshot> messages;
+
+	//! Highest id held here, 0 when empty.
+	std::uint32_t LastMsgId() const { return messages.empty() ? 0 : messages.back().id; }
+
+	//! The REST conversation key, "<ip>:<port>".
+	std::string PeerKey() const { return ip + ":" + std::to_string(port); }
+
+	//! Display name, falling back to the desktop's own rendering when the core has no
+	//! nick for the peer (CChatSelector builds the same string). Shared by the list,
+	//! the detail read and the SSE payload so they cannot disagree.
+	std::string DisplayName() const
+	{
+		return name.empty() ? ("IP: " + ip + " Port: " + std::to_string(port)) : name;
+	}
+};
+
+// Renders an IPv4 address that arrives LSB-first -- the layout EC_TAG_CLIENT_USER_IP,
+// the Kad address tags and the eD2k id all share. Lives here rather than in the
+// refresher because the snapshot layer needs it too (a chat peer key is built from a
+// GUI_ID, with no walker involved).
+std::string IPv4ToDotted(std::uint32_t ip_lsb_first);
+
+// Is this request target eligible for the response-ETag memo?
+//
+// OPT-IN, because the memo key is (target, snapshot revision) and nothing else, which
+// makes two demands on anything eligible; a route that fails either one gets answered
+// 304 for content that has changed:
+//
+//  1. Its body must move only when the state moves, so the revision covers it.
+//     Endpoints with their own TTL cache, an append-only mirror, a refresh-on-read,
+//     or a live EC roundtrip per request do not qualify.
+//  2. Its body must be identical for every caller. The key carries no principal, so
+//     a per-caller document would share one validator between whoever asked first.
+bool MemoizableTarget(const std::string &target);
+
+// Whether a response may be read from, or written to, the ETag memo. Two independent
+// conditions, both required:
+//
+//  1. MemoizableTarget(target) -- the opt-in eligibility above.
+//  2. The snapshot revision did not move while the handler ran. The body is
+//     serialized inside the handler under its own read lock, dropped before the
+//     caller can sample again; if a write lands in that window the body belongs to
+//     `rev_before` while the key would claim `rev_after`.
+//
+// Condition 2 guards a race, so nothing in a sequential test notices when it is
+// removed -- which is why it lives here rather than inline in the dispatch.
+bool MemoUsable(const std::string &target, std::uint64_t rev_before, std::uint64_t rev_after);
+
+// Whether the dispatcher should hash the body and stamp its own ETag.
+//
+// `handler_set_etag` is the half worth spelling out: a handler that computed its own
+// validator owns it, and stamping the body hash over the top hands out two different
+// ETags for one resource depending on which branch answered.
+bool ShouldStampEtag(bool is_safe_method, bool handler_set_etag, unsigned status, bool body_empty);
+
+// The same key built straight from a GUI_ID, for paths that only have the id (a
+// session that was closed is gone from the snapshot, so there is no
+// ChatSessionSnapshot left to ask). GUI_ID is (ip << 16) | port.
+std::string ChatPeerKeyFromGuiId(std::uint64_t gui_id);
+
+// /kad endpoint. Single composite snapshot pulled from the STAT_REQ response already
+// fetched for /status -- amuled's EC_OP_STAT_REQ at EC_DETAIL_CMD ships every
+// EC_TAG_STATS_KAD_* wanted here.
+struct KadSnapshot
+{
+	std::string state; // "disabled" | "connecting" | "connected"
+	// Our own 128-bit Kademlia node id, 32 lowercase hex chars. Empty while Kad is not
+	// running -- amuled gates EC_TAG_KAD_ID on CKademlia::IsRunning(), exactly the
+	// condition `state == "disabled"` covers. Unlike the ECIDs and the eD2k id, this one
+	// is persisted (preferencesKad.dat).
+	std::string node_id;
+	// Everything below is emitted as `null` unless Kad is CONNECTED, and the `has_*` flags
+	// are what carries that -- one per JSON object rather than one per field, since they
+	// share a single gate.
+	//
+	// Gated so a disconnected daemon does not answer with numbers that look live:
+	// measured on a real node with Kad stopped,
+	// `nodes` reported 2 and `firewalled_tcp` true. `nodes` is the worst, being the size
+	// of our OWN routing table, whose contacts outlive the disconnect.
+	//
+	// Safe as a default-false flag because RefresherTick builds a fresh KadSnapshot every
+	// tick, so an ungated field keeps its default rather than the previous tick's value.
+	bool firewalled_tcp = false;
+	bool has_firewalled_tcp = false;
+	bool firewalled_udp = false;
+	bool has_firewalled_udp = false;
+	bool lan_mode = false;
+	bool has_lan_mode = false;
+	std::uint32_t users = 0;
+	std::uint32_t files = 0;
+	std::uint32_t nodes = 0;
+	bool has_network = false; // gates users/files/nodes together
+	std::uint32_t indexed_sources = 0;
+	std::uint32_t indexed_keywords = 0;
+	std::uint32_t indexed_notes = 0;
+	std::uint32_t indexed_load = 0;
+	bool has_indexed = false; // gates the four indexed_* together
+	// Our externally-visible address as a remote Kad contact reported it back,
+	// dotted-quad. Empty while Kad is not connected (amuled only ships the tag then), and
+	// "0.0.0.0" while connected but not yet told our address by any contact -- amuled
+	// sends GetPrefs()->GetIPAddress() as-is.
+	std::string public_ip;
+	// Buddy is the LowID-buddy state (for NAT-T peers). Defaulted rather than left empty:
+	// amuled ships EC_TAG_STATS_BUDDY_STATUS only while Kad is connected, and both the
+	// core and amulegui read that absence as `Disconnected`. An empty string would be a
+	// fourth value outside the enum.
+	std::string buddy_status = "no_buddy"; // "no_buddy" | "connecting" | "connected"
+	bool has_buddy = false;                // gates buddy_status/ip/port together
+	// The buddy's address, dotted-quad. "0.0.0.0"/0 while Kad is connected with no buddy
+	// (amuled ships the tags as 0), empty while Kad is not connected at all -- the same
+	// "not known" split as public_ip above.
+	std::string buddy_ip;
+	std::uint16_t buddy_port = 0;
+};
+
+// One per download category (categories live in amuled's preferences, bundled under
+// EC_PREFS_CATEGORIES). Index 0 is the implicit "All" category. The refresher fetches
+// the full set each tick; the cost is bounded by the typical 0-10 entry count.
+struct CategorySnapshot
+{
+	std::uint32_t index = 0;
+	std::string name;
+	std::string path;
+	std::string comment;
+	std::uint32_t color = 0;
+	std::uint8_t priority_code = 0;
+	std::string priority; // human-readable (very_low/low/normal/high/release/auto)
+};
+
+// One typed value carried by a stats-tree node. The EC packet transports the
+// untranslated English label template plus one or more typed values
+// (EC_TAG_STAT_NODE_VALUE), so the API exposes them structurally rather than
+// flattening through GetDisplayString(), which translates and locale-formats in the
+// amuleapi process. `type` is the EC value type as a stable lowercase string; the raw
+// value lands in exactly one of num/dbl/str per `kind`.
+//
+// `extra` holds the optional nested sub-value, at most one level deep. It is whatever
+// the desktop prints in parentheses -- a percentage of the parent, a packet count
+// beside a byte total, or an all-time total beside a session figure -- so a client
+// formats it from `type`, not from its position.
+struct StatsTreeValue
+{
+	enum Kind
+	{
+		Num, // integer/bytes/time/speed -> num (raw seconds/bytes/…)
+		Dbl, // double -> dbl
+		Str  // string -> str (raw, untranslated English)
+	};
+
+	std::string type;
+	Kind kind = Num;
+	std::uint64_t num = 0;
+	double dbl = 0.0;
+	std::string str;
+	// Locale-independent token for a well-known sentinel value (EC_TAG_STAT_VALUE_ENUM,
+	// e.g. "never"/"not_available"). Empty when the value is not a sentinel, so clients
+	// need not match the English `value`.
+	std::string enum_token;
+	std::vector<StatsTreeValue> extra;
+};
+
+// One node in the recursive stats tree. `label` is the untranslated English template
+// exactly as EC carries it (e.g. "Uptime: %s"); `values` are the typed raw values that
+// fill it. The API contract is English text + C-locale numbers, independent of the
+// amuleapi/amuled --locale.
+struct StatsTreeNode
+{
+	// The EC_TAG_STATTREE_CAPPING value this tree was fetched at. Only meaningful on the
+	// root; carried so the unkeyed TTL cache can reject an entry fetched at a different
+	// cap.
+	std::uint8_t max_client_versions = 0;
+
+	// Stable, untranslated machine key (EC_TAG_STAT_NODE_KEY). Empty when
+	// the node carries no key; omitted from JSON in that case.
+	std::string key;
+	// Raw, untranslated machine value for data-labelled nodes (client version /
+	// OS string), from EC_TAG_STAT_NODE_RAW. Empty when absent.
+	std::string raw;
+	std::string label;
+	std::vector<StatsTreeValue> values;
+	std::vector<StatsTreeNode> children;
+
+	// Raw numeric UL:DL ratio (download-per-upload) for the ratio node, parsed from
+	// EC_TAG_STAT_NODE_RATIO_TOTAL. Present only on that node and only when the daemon
+	// could compute it (both sides > 0).
+	bool has_ratio_session = false;
+	double ratio_session = 0.0;
+	bool has_ratio_total = false;
+	double ratio_total = 0.0;
+};
+
+// Time-series data for /stats/graphs/{graph}. amuled keeps a circular buffer of uint32
+// samples per series at 1-sec cadence; the refresher pulls the most recent
+// `kRefreshWindow` samples per tick, the most recent at `points.back()` corresponding
+// to the snapshot wall-clock at `snapshot_at`.
+//
+// Four series fan out from a single EC_OP_GET_STATSGRAPHS packet (download, upload,
+// connections, kad); the handler picks the one named in `{graph}`.
+struct StatsGraphs
+{
+	// Seconds between samples, as actually requested of amuled via
+	// EC_TAG_STATSGRAPH_SCALE -- it spaces the reconstructed timestamps, so it has to be
+	// the value asked for. Also the cache key: an entry fetched at one interval must not
+	// answer a request for another.
+	std::uint32_t interval_seconds = 1;
+
+	std::vector<std::uint32_t> download_bytes_per_second;
+	std::vector<std::uint32_t> upload_bytes_per_second;
+	std::vector<std::uint32_t> connections;
+	std::vector<std::uint32_t> kad_nodes;
+
+	// Second data blob (EC_TAG_STATSGRAPH_DATA_CONN), point-aligned with the four above
+	// and only meaningful on the connections graph. Empty when the daemon predates the
+	// tag -- which is why these are reported as absent rather than as zeros: "not
+	// reported" and "nothing was transferring" differ.
+	std::vector<std::uint32_t> active_uploads;
+	std::vector<std::uint32_t> active_downloads;
+
+	// Records amuled holds per resolution range (EC_TAG_STATSGRAPH_DEPTH). Asking for more
+	// points than this makes the daemon repeat records rather than fail, and no timestamps
+	// travel on the wire, so every series is truncated to this.
+	std::uint32_t max_points = 1800;
+
+	// Session running totals, reported alongside the time-series so the panel can show
+	// "this session total" without a separate roundtrip. The daemon divides the two byte
+	// counters by 1024 before sending (Statistics.cpp), so these are scaled back on parse
+	// and really are bytes, to 1 KiB granularity.
+	std::uint64_t session_download_bytes = 0;
+	std::uint64_t session_upload_bytes = 0;
+
+	// NOT a transfer figure: the running per-second sum of the Kad node count, i.e.
+	// node-seconds. Divided by session_duration_seconds it gives the session-average node
+	// count, which is its only use.
+	std::uint64_t session_kad_node_seconds = 0;
+
+	// Daemon uptime in seconds at the newest point (EC_TAG_STATSGRAPH_SESSION_TIMESPAN).
+	// Without it the three totals above cannot be turned into averages. 0 when not
+	// reported.
+	double session_duration_seconds = 0.0;
+};
+
+// One result from a /search/results poll. Identity is the file's MD4 hash. amuled
+// accumulates results in its `searchlist` singleton as packets come in from
+// servers/Kad; the client polls EC_OP_SEARCH_RESULTS to drain.
+struct SearchResult
+{
+	std::uint32_t ecid = 0;
+	std::string hash; // 32-char hex MD4
+	std::string name;
+	std::uint64_t size = 0;
+	std::uint32_t source_count = 0;
+	std::uint32_t complete_source_count = 0;
+	bool already_downloaded = false;
+	std::uint8_t rating = 0;
+	// Download status of the result on this node (issue #429), a lowercase string from
+	// the CSearchFile enum: "new" | "downloaded" | "queued" | "canceled" |
+	// "queued_canceled".
+	std::string status;
+	// File-type token derived from the filename (like the shared-detail
+	// `file_type`), e.g. "video"/"audio"; "" if the name has no extension.
+	std::string type;
+	// The folder this file sits in inside the browsed peer's share
+	// (EC_TAG_SEARCHFILE_DIRECTORY). The core emits it for results filed from a peer's
+	// shared-file list and for nothing else, so it is empty on every ordinary server/Kad
+	// hit. Per-result, so two copies of one file in different folders of the same share
+	// group each keep their own folder.
+	std::string directory;
+	// Audio/video media metadata, same shape as the file detail endpoints' `media` object.
+	// Like the file-side flag above, `has_media` is DERIVED from the field values rather
+	// than from which tags arrived -- a hit carrying an FT_MEDIA_* tag whose value is
+	// empty reads as no media.
+	bool has_media = false;
+	struct Media
+	{
+		std::uint32_t duration_seconds = 0;
+		std::uint32_t bitrate_kilobits_per_second = 0;
+		std::string codec;
+		std::string artist;
+		std::string album;
+		std::string title;
+	} media;
+
+	// Result grouping: same-hash/same-size hits advertised under different filenames.
+	// `parent_ecid`/`has_parent` are set on a child during decode; the refresher then
+	// folds children into their parent's `children` list and drops them from the top-level
+	// set, so one parent row is emitted per hash+size.
+	std::uint32_t parent_ecid = 0;
+	bool has_parent = false;
+	struct Child
+	{
+		std::uint32_t ecid = 0;
+		std::string name;
+		std::string hash; // same as the parent's (that's why they group)
+		std::uint32_t source_count = 0;
+		std::uint32_t complete_source_count = 0;
+		// Same meaning as the parent's `directory`, carried per child
+		// because two copies in different folders group together.
+		std::string directory;
+	};
+	std::vector<Child> children;
+
+	// On-demand Kad community ratings/comments for this result, same shape as a download's
+	// `comments`. A search hit has no connected sources, so these are purely the Kad
+	// notes. `kad_comment_searching` stays true while a lookup started via
+	// POST /search/results/{hash}/comments is in flight.
+	struct Comment
+	{
+		std::string username;
+		std::string filename;
+		std::int32_t rating = 0;
+		std::string comment;
+	};
+	std::vector<Comment> comments;
+	bool kad_comment_searching = false;
+};
+
+// Refresher-tracked lifecycle of the currently-active (or last-finished) search. The
+// refresher reads EC_TAG_SEARCH_LIFECYCLE_STATE and maps it directly here -- no
+// sentinel decode, no state machine, no defensive timeout.
+struct SearchProgressSnapshot
+{
+	// True between POST /search and the daemon-reported finished state. Drives whether
+	// the refresher keeps polling EC_OP_SEARCH_RESULTS + EC_OP_SEARCH_PROGRESS.
+	bool active = false;
+	// "global" | "local" | "kad". Captured from POST /search's `type` param. Surfaced in
+	// `search_progress` SSE so consumers can distinguish which network produced the
+	// result set.
+	std::string kind;
+	std::uint32_t percent = 0; // 0..100, daemon-computed for every
+				   // kind (global = real server-queue
+				   // percent; Kad = cosmetic time-ramp;
+				   // 100 on finished)
+	bool complete = false;     // true exactly once on the lifecycle
+				   // RUNNING → FINISHED edge
+	// Monotonically-increasing per POST /search. MarkSearchStarted bumps it; the refresher
+	// copies it through unchanged. EventDiff treats a generation change as a guaranteed
+	// emit trigger so the terminal `search_progress` frame cannot be lost when a search
+	// starts and finishes inside a single refresher tick.
+	std::uint64_t generation = 0;
+};
+
+// The byte width of one partfile chunk. Authoritative copy is PARTSIZE in
+// protocol/ed2k/Constants.h, deliberately NOT included here: that header is written
+// against amule's legacy uint64/uint32 typedefs from src/Types.h, and dragging those
+// into the webapi layer (and its unit tests) costs more than one restated number.
+// amule has never changed PARTSIZE since the spec was frozen.
+constexpr std::uint64_t kPartSizeBytes = 9728000ull;
+
+// Number of eD2k chunks a file of `size` bytes is split into: ceil(size /
+// kPartSizeBytes), and 0 for an empty file. Matches CKnownFile::SetFileSize's
+// m_iPartCount, which reaches the same answer the long way round -- worth knowing,
+// because a mismatch here would silently trim or pad every per-part bitmap.
+std::uint64_t PartCountForSize(std::uint64_t size);
+
+// Parts hashed so far by a pass running over `f` as a complete share -- Verify Local
+// Data, or an AICH hashset rebuild. 0 when no such pass is running.
+//
+// The fallback is why this is a function: amuled emits one tag kind per ECID, so a
+// download that is also shared arrives as EC_TAG_PARTFILE and its progress lands on
+// the download side. Every shared-side consumer goes through here, so the JSON writer,
+// the SSE writer and the equality test cannot disagree.
+std::uint16_t SharedHashingProgress(const FileSnapshot &f);
+
+// Fill in ClientSnapshot::part_progress_percent, which is derived rather than
+// refreshed: it needs the part count of the file this peer is a source for, which
+// lives in a different snapshot. Left at its negative sentinel when not computable,
+// which is how the writers know to emit the field as null.
+//
+// Shared rather than owned by the REST layer because the SSE client payload has to
+// carry the same value: EVENTS.md promises an `_updated` subscriber gets the full new
+// state and never has to re-GET.
+class CState;
+void ComputePartProgressPercent(const CState &state, ClientSnapshot &cli);
+
+// One concurrent search's cached state: its results (keyed by result ECID) and its
+// lifecycle progress. CState holds a map of these keyed by the daemon-allocated
+// search_id (see m_searches).
+struct SearchSlot
+{
+	// What the daemon last told us, flat: every result ECID it has sent for this search,
+	// parents and grouped children alike. This is the merge target for the incremental
+	// union poll, which names one ECID per diffed tag.
+	std::map<std::uint32_t, SearchResult> raw;
+	// The view every reader uses: `raw` with each child folded into its parent's
+	// children and dropped from the top level, so the API serves one row per hash+size.
+	// Rebuilt from `raw` after each merge rather than merged into directly, which keeps
+	// every consumer on the shape it had before.
+	std::map<std::uint32_t, SearchResult> results;
+	SearchProgressSnapshot progress;
+	// What was searched for, so a consumer reading one search's results need not
+	// cross-reference GET /search. For a browse the daemon's name for the search is the
+	// peer's nickname. Empty only for a slot seeded by discovery.
+	std::string query;
+	// Wall-clock second this session started the search, for ranking the entries
+	// GET /search returns: that listing comes straight off EC_OP_SEARCH_LIST, which walks
+	// a std::map keyed by search_id and carries no timestamp, so it arrives id-ascending
+	// -- and id order is not recency, since Kad ids carry SEARCH_ID_KAD_MASK (0x80000000)
+	// and always sort above ed2k ones. 0 for a search this session did not start, which is
+	// unknowable rather than zero.
+	std::time_t started_at = 0;
+	// When this slot's results were last pulled from the daemon. The tick refreshes active
+	// searches every second; a FINISHED search is never polled again, so reads of it
+	// refresh on demand, coalesced by this stamp.
+	std::chrono::steady_clock::time_point last_fetch{};
+	// The daemon no longer holds this search: its EC ring evicted it, or it was closed
+	// core-side. Set by the tick when EC_OP_SEARCH_PROGRESS comes back expired, BEFORE
+	// that same tick applies the results union -- which would otherwise tombstone away
+	// exactly the results the retirement path keeps for late reads, since the union emits
+	// EC_TAG_FILE_REMOVED for every result of an evicted search.
+	//
+	// A detached slot is frozen and is the preferred eviction victim: the daemon has
+	// nothing left to re-send, so evicting it costs nothing.
+	bool detached = false;
+	// Set when a union roundtrip failed against a live socket, and cleared once this slot
+	// has been re-seeded in full.
+	//
+	// The daemon commits its differential state while BUILDING the reply --
+	// Get_EC_Response_Search_Results_Union swaps io_lastSentResultIds and writes the
+	// valuemap before the packet reaches the socket -- so a reply we never apply is not
+	// re-sent, it is lost, and every later poll elides the results it covered. This flag
+	// turns that dead end into one FULL re-seed.
+	bool needs_resync = false;
+	// Insertion order, for oldest-first eviction. Not started_at: that is 0 for a
+	// discovered slot, which would make every adopted search tie for oldest and evict in
+	// map order.
+	std::uint64_t seq = 0;
+};
+
+// `m_amule_log_lines` in CState caches /logs/amule. amule's EC server piggybacks new
+// lines on STAT_REQ at EC_DETAIL_FULL (AddLoggerTag in ExternalConn.cpp) via a
+// per-EC-connection cursor (CLoggerAccess) -- each call returns ONLY lines emitted
+// since the previous STAT_REQ from the same connection. No cap on history: per
+// operator preference every line stays in memory until amuleapi restarts.
+
+// /logs/server_info. amule has no incremental EC op for this log (no equivalent of
+// CLoggerAccess for ServerInfoLog), so the refresher fetches the entire string via
+// EC_OP_GET_SERVERINFO each tick. Server-info logs are a few KB at most, so the
+// per-tick rebuild cost is negligible.
+// most, so the per-tick rebuild cost is negligible.
+struct ServerInfoLog
+{
+	std::string text;
+};
+
+// amuled preferences subset surfaced via /preferences: nick, transfer limits,
+// ports, connection toggles.
+struct PreferencesSnapshot
+{
+	// General
+	std::string nickname;
+	std::string user_hash;
+	std::string daemon_host_name;
+	bool version_check_enabled = false;
+	// Capability: the connected daemon is built with ENABLE_VERSION_CHECK (emits
+	// EC_TAG_GENERAL_VERSION_CHECK_AVAILABLE). False for OS-package or pre-3.1 daemons;
+	// combined with version_check_enabled by /version's "update".
+	bool version_check_available = false;
+
+	// Connection
+	std::uint32_t max_upload_kibibytes_per_second = 0;
+	std::uint32_t max_download_kibibytes_per_second = 0;
+	std::uint32_t upload_slot_min_kibibytes_per_second = 0;
+	std::uint16_t tcp_port = 0;
+	std::uint16_t udp_port = 0;
+	// Positive sense: true = the extended UDP port (Kad / global search) is on. The EC
+	// layer carries the opposite (EC_TAG_CONN_UDP_DISABLE); the API inverts on read and
+	// write.
+	bool extended_udp_port_enabled = true;
+	std::uint32_t max_sources_per_file_count = 0;
+	std::uint32_t max_connection_count = 0;
+	bool autoconnect = false;
+	bool reconnect_on_connection_loss = false;
+	bool ed2k_enabled = false;
+	bool kad_enabled = false;
+	// Bind the daemon's listening sockets to this local IP (empty = any).
+	// Applied on next daemon start, same as the desktop control.
+	std::string bind_address;
+	// Bind to a named network interface (empty = any); daemon-side name.
+	std::string bind_interface;
+	// Proxy the daemon routes P2P + HTTP through. proxy_password is
+	// write-only (accepted on PATCH, never surfaced here / on GET).
+	bool proxy_enabled = false;
+	// Serialized enum "socks5" / "socks4" / "http" / "socks4a": the EC layer carries the
+	// wire ints 0..3, the API spells them out. Empty for CProxyType PROXY_NONE (-1, the
+	// "no proxy configured" state the daemon always serializes), which cannot be set back
+	// over PATCH -- proxy_enabled is that.
+	std::string proxy_type;
+	std::string proxy_host;
+	std::uint16_t proxy_port = 0;
+	bool proxy_auth_enabled = false;
+	std::string proxy_user;
+	// UPnP. upnp_enabled toggles router forwarding of the P2P ports;
+	// upnp_control_point_port is the control point's own local port (0 = auto), not a
+	// forwarded port. upnp_supported is a read-only capability: whether the daemon was
+	// built with UPnP.
+	bool upnp_supported = false;
+	bool upnp_enabled = false;
+	std::uint16_t upnp_control_point_port = 0;
+
+	// --- Extended EC-carried categories -----------------
+	// Every field below maps 1:1 to an EC tag the daemon already serializes in
+	// CEC_Prefs_Packet and applies in Apply(); the webapi requests the wider selection
+	// bitmask and plumbs them through.
+
+	// Directories EC_TAG_PREFS_DIRECTORIES
+	struct DirectoriesPrefs
+	{
+		std::string incoming_path;
+		std::string temp_path;
+		std::vector<std::string> shared_paths;
+		bool share_hidden = false;
+		bool rescan_on_startup = false;
+		bool follow_symlinks = false;
+		std::string exclude_patterns;
+		bool exclude_patterns_use_regex = false;
+	} directories;
+
+	// Files EC_TAG_PREFS_FILES
+	struct FilesPrefs
+	{
+		bool ich_enabled = false;
+		bool trust_unverified_aich_hashes = false;
+		bool add_new_downloads_paused = false;
+		bool new_downloads_auto_priority_enabled = false;
+		bool new_shared_files_auto_priority_enabled = false;
+		bool prioritize_first_last_chunks = false;
+		bool on_finished_start_next_paused = false;
+		bool on_finished_start_next_in_same_category = false;
+		bool save_sources_for_rare_files = false;
+		bool preallocate_full_file_size = false;
+		// Memory-mapped file I/O. mmap_supported is a read-only daemon capability (mirrors
+		// upnp_supported): true only when the core was built with mmap support. mmap_enabled
+		// is only accepted on PATCH when it is true.
+		bool mmap_supported = false;
+		bool mmap_enabled = false;
+		bool stop_on_low_disk_space = false;
+		std::uint32_t min_free_space_mebibytes = 0;
+		// Positive sense: true = part files are created sparse. The core stores exactly this
+		// (s_createFilesSparse, default on); only the EC layer carries the negation, as
+		// EC_TAG_FILES_CREATE_NORMAL present == "not sparse", which the schema's `invert`
+		// column undoes on both paths. Only does real work on Windows -- on POSIX both
+		// branches are identical.
+		bool create_sparse_files = true;
+		bool on_finished_start_next_alphabetically = false;
+		bool endgame_mode_enabled = false;
+		// Media metadata (issue #140): probe shared files with ffprobe to
+		// advertise length/bitrate/codec. Empty path = daemon auto-detect.
+		bool media_metadata_enabled = false;
+		std::string ffprobe_path;
+	} files;
+
+	// Servers EC_TAG_PREFS_SERVERS
+	struct ServersPrefs
+	{
+		bool remove_dead_servers = false;
+		std::uint32_t dead_server_retry_count = 0;
+		bool update_list_at_startup = false;
+		bool update_list_from_server = false;
+		bool update_list_from_client = false;
+		bool server_priority_system_enabled = false;
+		bool smart_lowid_check_enabled = false;
+		bool safe_server_connect_enabled = false;
+		bool autoconnect_static_servers_only = false;
+		bool manual_servers_high_priority = false;
+		std::string update_url;
+	} servers;
+
+	// Security EC_TAG_PREFS_SECURITY
+	struct SecurityPrefs
+	{
+		// Serialized enum "everybody" / "friends" / "nobody". The EC layer carries the
+		// 3-state int (EC_TAG_SECURITY_CAN_SEE_SHARES / s_iSeeShares: 0 = everybody, 1 =
+		// friends only, 2 = nobody); the API spells it out.
+		std::string shared_files_visibility = "everybody";
+		bool ipfilter_clients_enabled = false;
+		bool ipfilter_servers_enabled = false;
+		bool ipfilter_auto_update_enabled = false;
+		std::string ipfilter_update_url;
+		std::uint32_t ipfilter_min_access_level = 0;
+		bool ipfilter_include_lan_ips = false;
+		bool secure_identification_enabled = false;
+		bool protocol_obfuscation_enabled = false;
+		bool obfuscation_requested = false;
+		bool obfuscation_required = false;
+		bool reject_spoofed_source_ips = false;
+		bool system_ipfilter_enabled = false;
+	} security;
+
+	// MessageFilter EC_TAG_PREFS_MESSAGEFILTER
+	struct MessageFilterPrefs
+	{
+		bool enabled = false;
+		bool filter_all_messages = false;
+		bool accept_from_friends_only = false;
+		bool accept_from_known_clients_only = false;
+		bool filter_by_keyword = false;
+		std::string keywords;
+		bool log_filtered_messages = false;
+		bool filter_comments = false;
+		std::string comment_keywords;
+	} message_filter;
+
+	// RemoteControls EC_TAG_PREFS_REMOTECTRL. Passwords are write-only.
+	//
+	// Two unrelated remote-control subsystems live under one EC category, so the JSON
+	// nests them instead of prefixing every field. Both sub-objects still pack into the
+	// single EC_TAG_PREFS_REMOTECTRL group on the write path.
+	struct RemoteControlsPrefs
+	{
+		struct WebserverPrefs
+		{
+			bool enabled = false;
+			std::uint32_t port = 0;
+			bool gzip_enabled = false;
+			std::uint32_t refresh_seconds = 0;
+			// `template_name`, not `template`: the JSON key matches the member,
+			// which could never be `template` (C++ keyword).
+			std::string template_name;
+			bool guest_enabled = false;
+		} webserver;
+		struct AmuleApiPrefs
+		{
+			bool enabled = false;
+			std::uint32_t port = 0;
+			std::string bind_address;
+		} amuleapi;
+	} remote_controls;
+
+	// OnlineSignature EC_TAG_PREFS_ONLINESIG
+	struct OnlineSignaturePrefs
+	{
+		bool enabled = false;
+		std::string directory;
+		std::uint32_t update_frequency_seconds = 0;
+	} online_signature;
+
+	// advanced (EC group: CORETWEAKS)
+	struct AdvancedPrefs
+	{
+		std::uint32_t max_new_connections_per_5_seconds = 0;
+		bool verbose_logging = false;
+		std::uint32_t file_buffer_bytes = 0;
+		std::uint32_t max_upload_queue_client_count = 0;
+		std::uint32_t server_keepalive_timeout_minutes = 0;
+		std::uint32_t kad_max_concurrent_source_search_count = 0;
+		std::uint32_t kad_source_reask_minutes = 0;
+		std::uint32_t source_reask_minutes = 0;
+	} advanced;
+
+	// kad (EC group: KADEMLIA)
+	struct KadPrefs
+	{
+		std::string update_url;
+	} kad;
+
+	// geoip (EC group: IP2COUNTRY). The daemon only emits this category on a
+	// GeoIP-capable build, so an absent category leaves `supported` false -- a capability
+	// the daemon advertises, not a stored setting. `source` is the serialized enum
+	// "dbip" / "maxmind" / "custom". `maxmind_license` round-trips plainly: it is a config
+	// string the core already serializes, not a masked password like the RemoteControls
+	// ones.
+	struct GeoipPrefs
+	{
+		bool supported = false;
+		bool enabled = false;
+		std::string source; // "dbip" / "maxmind" / "custom"
+		std::string custom_update_url;
+		std::string maxmind_license;
+		bool auto_update_enabled = false;
+		std::string loaded_source;
+		std::string db_path;
+		bool db_loaded = false;
+		bool download_in_progress = false;
+		std::string last_update_status;
+	} geoip;
+};
+
+struct StatusSnapshot
+{
+	// "connected" / "connecting" / "disconnected" -- the literal string the API
+	// returns, decoded at parse time so the snapshot is self-describing.
+	std::string ed2k_state = "disconnected";
+	std::string kad_state = "disabled";
+
+	// Nickname is intentionally NOT a /status field -- it lives in the preferences
+	// EC namespace, not the STAT_REQ response, and is surfaced by /preferences.
+
+	// Server the daemon is currently connected to (eD2k only -- Kad
+	// has no equivalent). Empty when ed2k_state != "connected".
+	std::string server_name;
+	std::string server_ip;
+	std::uint32_t server_port = 0;
+
+	// True when our eD2k id is a HighID (>= HIGHEST_LOWID_ED2K_KAD). False for a LowID
+	// *and* whenever we are not connected at all -- there is no id then, so gate on
+	// ed2k_state == "connected" before reading this as a firewall verdict. Positive sense
+	// so it matches the peer-side high_id on /clients.
+	bool ed2k_high_id = false;
+
+	// Our eD2k id as assigned by the connected server. 0 when not connected; the
+	// 0xffffffff "connect in flight" sentinel is normalized to 0. Packed LSB-first,
+	// unlike the peer-side ed2k_user_id, which byte-swaps a HighID.
+	std::uint32_t ed2k_user_id = 0;
+
+	// Our public IPv4 in dotted-quad form, derived from ed2k_user_id when that is a
+	// HighID -- a HighID *is* the address. Empty for a LowID or while disconnected, where
+	// no address exists.
+	std::string ed2k_public_ip;
+	// True when Kad is running but firewalled for TCP. The verdict is a vote: two peers
+	// must confirm reachability over an incoming TCP connection before it clears.
+	// Distinct from the UDP test -- see KadSnapshot::firewalled_udp.
+	bool kad_firewalled_tcp = false;
+	// `null` unless Kad is connected: IsKadFirewalled() reads a connstate bit
+	// that survives the disconnect, so this answered `true` on a stopped Kad.
+	bool has_kad_firewalled_tcp = false;
+
+	// Unix timestamp of the most recent connect, from EC_TAG_CONNSTATE's optional
+	// {ED2K,KAD}_CONNECTED_SINCE sub-tags. 0 when not connected -- gate on
+	// ed2k_state/kad_state rather than trust a 0 timestamp alone.
+	std::uint64_t ed2k_connected_since = 0;
+	std::uint64_t kad_connected_since = 0;
+
+	// Bytes per second (NOT kB) so the field name matches the wire
+	// units throughout. Clients that want kB/s do the divide.
+	std::uint64_t download_bytes_per_second = 0;
+	std::uint64_t upload_bytes_per_second = 0;
+
+	// Protocol/control-traffic overhead, bytes/second. ADDITIVE to the two rates above
+	// rather than a subset of them -- amuled keeps separate counters and the desktop
+	// renders them as a second figure in parentheses.
+	std::uint64_t download_overhead_bytes_per_second = 0;
+	std::uint64_t upload_overhead_bytes_per_second = 0;
+
+	// Aggregate counts pulled by the same EC_OP_STATS round-trip.
+	std::uint32_t ul_queue_len = 0;
+	std::uint32_t total_src_count = 0;
+
+	// Free bytes on the filesystems holding the part files and the finished downloads.
+	// SIGNED, with -1 meaning "the daemon has no figure" -- before CFreeSpaceThread
+	// publishes its first sample, and permanently for a directory it cannot stat.
+	//
+	// amuled's FREE_SPACE_UNKNOWN is -1 and the EC serializer casts it straight to uint64,
+	// so the wire carries 0xFFFFFFFFFFFFFFFF. Storing that unsigned would report 17
+	// exabytes free, so it is read back signed and emitted null.
+	std::int64_t temp_free_bytes = -1;
+	std::int64_t incoming_free_bytes = -1;
+
+	// ed2k network-wide totals (all connected servers), from EC_TAG_STATS_ED2K_{USERS,
+	// FILES} in the EC_OP_STAT_REQ response already parsed. Surfaced as /status
+	// ed2k.network.{users,files}.
+	//
+	// `null` unless eD2k is connected. These are summed over the whole known SERVER LIST
+	// rather than the attached server, and nothing zeroes them on disconnect: a
+	// disconnected daemon keeps reporting the figures it had while connected,
+	// indefinitely, which a consumer cannot tell from live data.
+	std::uint32_t ed2k_users = 0;
+	std::uint32_t ed2k_files = 0;
+	bool has_ed2k_network = false; // gates ed2k_users/ed2k_files together
+
+	// Version-check result, relayed on the same EC_OP_STATS round-trip
+	// (EC_TAG_GENERAL_VERSION_CHECK_*). done means a check has completed; latest is the
+	// release string; outdated means a newer release exists. Absent (done == false) on
+	// daemons that have not checked or lack ENABLE_VERSION_CHECK.
+	bool version_check_done = false;
+	bool version_check_outdated = false;
+	std::string version_check_latest;
+	std::uint64_t version_check_timestamp = 0;
+};
+
+// ECID-keyed file map + hash->ECID index in lockstep. The index is maintained inline
+// on every emplace/erase so both lookup directions stay O(1) avg without a per-tick
+// rebuild: ECID -> entry via std::unordered_map::find (file_map), and 32-char hex
+// MD4 hash + role -> ECID via FindDownloadEcidByHash / FindSharedEcidByHash (one index
+// per role).
+//
+// One index per role, not one overall, because a hash does NOT name a single file
+// here. A part file and the completed copy someone dropped into a shared folder are
+// two amuled objects with two ECIDs and the same hash, and this map holds both. aMule
+// keeps them apart with a list per role; this map merges the roles, so it carries the
+// role in the key instead. With a single index whichever entry was filed last won the
+// slot and the other became unreachable while still sitting in the map (#1161,
+// reported as #1157).
+//
+// Invariant: `hash`, `is_downloading` and `is_shared` are what the indexes are built
+// from, so they are not assigned through the iterator -- go through SetHash() /
+// SetDownloading() / SetShared(), which re-file the entry. A raw assignment compiles
+// and silently desyncs the index.
+//
+// Invariant: an entry's key IS its FileSnapshot::ecid, enforced by emplace() rather
+// than left to the caller. A snapshot filed under one id but carrying another silently
+// breaks every reader that resolves via find().
+class FileMap
+{
+public:
+	using map_type = std::unordered_map<std::uint32_t, FileSnapshot>;
+	using iterator = map_type::iterator;
+	using const_iterator = map_type::const_iterator;
+
+	iterator find(std::uint32_t ecid) { return m_files.find(ecid); }
+	const_iterator find(std::uint32_t ecid) const { return m_files.find(ecid); }
+	iterator begin() { return m_files.begin(); }
+	const_iterator begin() const { return m_files.begin(); }
+	iterator end() { return m_files.end(); }
+	const_iterator end() const { return m_files.end(); }
+	std::size_t size() const { return m_files.size(); }
+	bool empty() const { return m_files.empty(); }
+
+	// By-value param so callers can pass either an lvalue (copies) or rvalue (moves) with
+	// the same call site -- std::unordered_map's variadic emplace is too liberal for our
+	// index-keeping discipline.
+	std::pair<iterator, bool> emplace(std::uint32_t ecid, FileSnapshot f)
+	{
+		// The key wins -- readers resolve by it. See the invariant above.
+		f.ecid = ecid;
+		auto r = m_files.emplace(ecid, std::move(f));
+		if (r.second) {
+			Reindex(r.first);
+		}
+		return r;
+	}
+
+	//! Assign `hash` on an existing entry and re-file it. The refresher can learn a
+	//! hash after the insert (a partfile frame with HASH suppressed, then a knownfile
+	//! frame carrying it), and the index has to follow.
+	void SetHash(iterator it, std::string hash)
+	{
+		if (it == m_files.end() || it->second.hash == hash)
+			return;
+		DropRows(it->first, it->second.hash);
+		it->second.hash = std::move(hash);
+		Reindex(it);
+	}
+
+	//! Add or remove the downloading role, keeping that role's index in step.
+	void SetDownloading(iterator it, bool on)
+	{
+		if (it == m_files.end() || it->second.is_downloading == on)
+			return;
+		it->second.is_downloading = on;
+		Reindex(it);
+	}
+
+	//! Add or remove the shared role, keeping that role's index in step.
+	void SetShared(iterator it, bool on)
+	{
+		if (it == m_files.end() || it->second.is_shared == on)
+			return;
+		it->second.is_shared = on;
+		Reindex(it);
+	}
+
+	iterator erase(iterator it)
+	{
+		DropRows(it->first, it->second.hash);
+		return m_files.erase(it);
+	}
+
+	void clear()
+	{
+		m_files.clear();
+		m_download_by_hash.clear();
+		m_shared_by_hash.clear();
+	}
+
+	//! Resolve a hash to the entry carrying the DOWNLOADING role, ignoring a
+	//! share that happens to have the same content.
+	bool FindDownloadEcidByHash(const std::string &hash, std::uint32_t &out) const
+	{
+		return Lookup(m_download_by_hash, hash, out);
+	}
+
+	//! Resolve a hash to the entry carrying the SHARED role.
+	bool FindSharedEcidByHash(const std::string &hash, std::uint32_t &out) const
+	{
+		return Lookup(m_shared_by_hash, hash, out);
+	}
+
+private:
+	using index_type = std::unordered_map<std::string, std::uint32_t>;
+
+	static bool Lookup(const index_type &idx, const std::string &hash, std::uint32_t &out)
+	{
+		auto it = idx.find(hash);
+		if (it == idx.end())
+			return false;
+		out = it->second;
+		return true;
+	}
+
+	//! Point `idxhash` at `ecid` when the role applies, and clear the row when it no
+	//! longer does -- but only if it still names this entry, since the other entry
+	//! sharing this hash may own the row.
+	static void FileRow(index_type &idx, const std::string &hash, std::uint32_t ecid, bool applies)
+	{
+		auto it = idx.find(hash);
+		if (applies) {
+			idxhash = ecid;
+		} else if (it != idx.end() && it->second == ecid) {
+			idx.erase(it);
+		}
+	}
+
+	//! Re-file one entry into whichever role indexes its current flags call
+	//! for. Cheap and idempotent, so callers can just call it after a change.
+	void Reindex(iterator it)
+	{
+		if (it->second.hash.empty())
+			return;
+		FileRow(m_download_by_hash, it->second.hash, it->first, it->second.is_downloading);
+		FileRow(m_shared_by_hash, it->second.hash, it->first, it->second.is_shared);
+	}
+
+	//! Remove every row naming `ecid` under `hash`, in both roles.
+	void DropRows(std::uint32_t ecid, const std::string &hash)
+	{
+		if (hash.empty())
+			return;
+		FileRow(m_download_by_hash, hash, ecid, false);
+		FileRow(m_shared_by_hash, hash, ecid, false);
+	}
+
+	map_type m_files;
+	index_type m_download_by_hash;
+	index_type m_shared_by_hash;
+};
+
+// One State instance per amuleapi process. The mutex protects every member;
+// refresh swaps the whole struct under it, handlers read what they need.
+class CState
+{
+public:
+	// True once the refresher has completed at least one successful tick. Until then
+	// /status returns 503 with `ec_unavailable`, so clients can tell "amuleapi is up but
+	// amuled is not responding" apart from a hard 5xx.
+	bool HasFirstSnapshot() const;
+
+	// Wall-clock at which the last successful tick completed. Populates
+	// `snapshot_at` / `snapshot_at_unix` on every list response.
+	std::time_t SnapshotAt() const;
+
+	// True iff the most recent tick succeeded. The refresher keeps the stale
+	// snapshot for clients after a failed tick but flips this flag.
+	bool EcConnected() const;
+
+	StatusSnapshot Status() const;
+	KadSnapshot Kad() const;
+	// One-shot snapshot of the four scalars /api/v1/status composes from, taken under a
+	// single shared_lock so they describe the same refresher tick -- no risk of `status`
+	// and `kad` straddling a tick boundary.
+	struct DashboardSnapshot
+	{
+		StatusSnapshot status;
+		KadSnapshot kad;
+		std::time_t snapshot_at = 0;
+		bool ec_connected = false;
+	};
+	DashboardSnapshot Dashboard() const;
+	PreferencesSnapshot Preferences() const;
+	// Full snapshot of the amule log lines (oldest-first). Handlers slice the
+	// tail before serialising via `?tail=N`.
+	std::vector<std::string> AmuleLog() const;
+	//! The lines from `first` on, plus the current total, under one lock. A `first`
+	//! past the end gives an empty tail, which with `total` is how the caller sees a
+	//! truncation. Copies nothing when nothing was appended.
+	//!
+	//! `generation`, when asked for, is read under the same lock and is bumped by every
+	//! ClearAmuleLog(). Size alone cannot detect a clear: a buffer cleared and refilled
+	//! past its old length between two ticks looks like growth, and the diff would then
+	//! publish a mid-buffer slice as a tail.
+	std::vector<std::string> AmuleLogFrom(
+		std::size_t first, std::size_t &total, std::uint64_t *generation = nullptr) const;
+	ServerInfoLog ServerInfo() const;
+
+	// Re-entrancy detector for the callback accessors below.
+	//
+	// Every WithX() / MutateX() runs a caller-supplied callback while holding m_mu.
+	// Calling back into the same CState from inside one takes that non-recursive
+	// std::shared_timed_mutex a second time: undefined behaviour, and in practice a hang
+	// -- immediately on the exclusive paths, and on the shared ones as soon as a writer is
+	// queued, because the implementation stops admitting new readers to avoid starving it.
+	//
+	// Enforced in Release as well as Debug, and aborting rather than returning: assert() is
+	// stripped by NDEBUG, and the failure here is not a wrong answer but a process that
+	// stops responding with nothing in the log.
+	//
+	// Constructed BEFORE the lock, deliberately. A re-entrant call blocks on the mutex it
+	// can never obtain, so a guard placed after the lock would never run for the one case
+	// it exists to catch.
+	class ReentryGuard
+	{
+	public:
+		explicit ReentryGuard(const CState *self);
+		~ReentryGuard();
+		ReentryGuard(const ReentryGuard &) = delete;
+		ReentryGuard &operator=(const ReentryGuard &) = delete;
+
+	private:
+		const CState *m_prev;
+	};
+
+	//! Read the unified file map in place, under the shared lock. The callback must not
+	//! call back into CState, nor retain the reference. A FileSnapshot is 848 bytes plus
+	//! a heap allocation per string, so copying the collection out is never cheap.
+	template <class F> void WithFiles(F &&fn) const
+	{
+		const ReentryGuard guard(this);
+		std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+		fn(static_cast<const FileMap &>(m_files));
+	}
+
+	// Full peer list (all upload_state values, including queue waiters, idle
+	// peers and banned). Backs /clients; consumers filter by role.
+	std::vector<ClientSnapshot> Clients() const;
+
+	// --- Known clients (the daemon's credit store) -------------------------
+	//
+	// Fetched once, then maintained: the refresher folds every tick's live peers in, so
+	// the store stays current without ever being re-read. What only a refetch could give
+	// is the expiry prune the core applies at its own startup, and that cannot happen
+	// underneath us: HandleEcConnectionLost shuts amuleapi down the moment the EC socket
+	// drops, so the process never attaches to a second core. The store therefore lives
+	// for the life of the process.
+	//
+	// Held rather than copied out: this is the whole store, tens of thousands of records,
+	// so a by-value accessor would cost more than the roundtrip it saves.
+	bool KnownClientsLoaded() const;
+	//! Install the first fetch and reconcile it against the current peers.
+	void SetKnownClients(std::vector<KnownClientSnapshot> &&rows);
+	/**
+	 * Fold this tick's peers into the store.
+	 *
+	 * A record whose peer is not connected cannot change -- credit totals only move
+	 * during a transfer, last-seen only at disconnect -- so this touches only the
+	 * connected ones, of which there are at most MaxConnections. No-op until the store
+	 * has been loaded, so a daemon nobody asks about never pays for it.
+	 *
+	 * The store only grows between fetches: a peer met here is added and never removed,
+	 * because a record leaving the daemon's own store means expiry, which it applies at
+	 * its startup and we pick up on the next fetch. Growth is one row per distinct peer
+	 * met, bounded by real traffic and reset with everything else by ResetLists().
+	 */
+	void ReconcileKnownClients();
+	//! Read the store under the shared lock. The callback must not call back
+	//! into CState, and must not retain the reference.
+	template <class F> void WithKnownClients(F &&fn) const
+	{
+		const ReentryGuard guard(this);
+		std::shared_lock<std::shared_timed_mutex> lock(m_mu);
+		fn(static_cast<const std::vector<KnownClientSnapshot> &>(m_known_clients));
+	}
+
+	std::vector<ServerSnapshot> Servers() const;
+	std::vector<FriendSnapshot> Friends() const;
+	// Chat sessions, most-recently-active first (the daemon's own order).
+	std::vector<ChatSessionSnapshot> Chats() const;
+	// The resume cursor for the next EC_OP_GET_CHAT_SESSIONS poll: the highest message id
+	// this snapshot holds. Advanced from the reply even when nothing came back, so evicted
+	// ids are not re-requested forever.
+	std::uint32_t ChatCursor() const;
+	// Results / progress for one search. Every caller names a concrete daemon-allocated id
+	// -- there is no implicit "current search". HasSearch distinguishes "unknown id" (404)
+	// from "known but empty".
+	std::vector<SearchResult> Search(std::uint32_t search_id) const;
+	SearchProgressSnapshot SearchProgress(std::uint32_t search_id) const;
+	// True if search_id names a live slot. Used for the 404 on an id that
+	// was never started, was freed, or expired.
+	bool HasSearch(std::uint32_t search_id) const;
+	// What this search was started with; empty for an unknown id, or for a
+	// discovered slot whose name the daemon had not reported yet.
+	std::string SearchQuery(std::uint32_t search_id) const;
+	// When this session started the search, or 0 when it did not start it (see
+	// SearchSlot::started_at). An unknown id reports 0 too; a caller that must tell those
+	// apart checks HasSearch first.
+	std::time_t SearchStartedAt(std::uint32_t search_id) const;
+	// Slots the refresher must still poll (progress.active).
+	std::vector<std::uint32_t> ActiveSearchIds() const;
+	// Every slot the daemon could still speak for: attached, active or not. The tick polls
+	// THIS set for expiry, not ActiveSearchIds(), because a finished search is exactly the
+	// one the daemon's ring drops first and the one whose results we are keeping. Naming
+	// them in the progress union also refreshes their LRU entry daemon-side.
+	//
+	// Empty is also the gate for both union polls: with no attached slot there is nothing
+	// the daemon could answer about.
+	std::vector<std::uint32_t> AttachedSearchIds() const;
+	// Every live slot id, for the SSE per-search diff.
+	std::vector<std::uint32_t> AllSearchIds() const;
+	// Find a result carrying this (already-lowercased) hash across ALL open searches --
+	// the hash-keyed comments endpoints are search-agnostic. The parent owns any fetched
+	// Kad notes, so it matches ahead of its children. `owner_search_id` reports which slot
+	// the hit came from.
+	bool FindSearchResultByHash(
+		const std::string &hash_hex, SearchResult &out, std::uint32_t *owner_search_id) const;
+	// Take the right to refresh one search's results from the daemon, for the read paths
+	// that must not serve a frozen snapshot.
+	//
+	// Returns true (and stamps the slot as fetched NOW) only when the slot exists, is NOT
+	// active, and its last fetch is older than `ttl`. Stamping before the fetch is what
+	// makes this a claim: two concurrent readers of the same finished search issue one EC
+	// roundtrip between them, not two.
+	bool ClaimSearchRefresh(std::uint32_t search_id, std::chrono::milliseconds ttl);
+
+	// Categories are not ECID-keyed (they arrive in the preferences packet as an
+	// indexed array), so they stay a plain vector copied out under the lock.
+	std::vector<CategorySnapshot> Categories() const;
+
+	// /stats/tree returns the recursive tree as a single bare object.
+	StatsTreeNode StatsTree() const;
+	// /stats/graphs/{graph} reads one series out of the bundle.
+	StatsGraphs Graphs() const;
+
+	// Look up a single file by 32-char hex hash, then check the role. Returns true on hit
+	// + role match; on miss `out` is left untouched. /downloads/{hash} and /shared/{hash}
+	// both inspect the same m_files map through these.
+	bool FindDownload(const std::string &hash_hex, FileSnapshot &out) const;
+	// Part count of the download with this hash, or 0 when there is none (or it has no
+	// size yet). Exists so a per-client loop can ask the cheap question without
+	// FindDownload's full FileSnapshot copy, per source, per tick.
+	std::uint64_t DownloadPartCount(const std::string &hash_hex) const;
+	bool FindShared(const std::string &hash_hex, FileSnapshot &out) const;
+
+	// ECID-keyed counterparts, used internally -- there is no /downloads/{ecid} or
+	// /shared/{ecid} path. CClientList::ApplyGetUpdate also reaches in here when resolving
+	// EC_TAG_CLIENT_UPLOAD_FILE.
+	bool FindDownloadByEcid(std::uint32_t ecid, FileSnapshot &out) const;
+	bool FindSharedByEcid(std::uint32_t ecid, FileSnapshot &out) const;
+
+	// INC-mode delta application. The refresher takes the unique_lock once per EC
+	// roundtrip, then calls a callback with a mutable reference to the unified ECID-keyed
+	// map. One unique acquisition per tick rather than N, so reader latency stays bounded
+	// by the parse loop. Both MutateDownloads and MutateShared operate on the SAME m_files
+	// map; the callback decides which role to flip, and FileMap keeps its hash->ECID index
+	// in sync.
+	void MutateDownloads(const std::function<void(FileMap &)> &fn);
+	void MutateShared(const std::function<void(FileMap &)> &fn);
+	//! Clients only. Reach for MutateClientsWithFiles below when the callback also needs
+	//! the file map, rather than pairing this with WithFiles: that pair is two
+	//! acquisitions where one does.
+	void MutateClients(const std::function<void(std::map<std::uint32_t, ClientSnapshot> &)> &fn);
+	//! Clients plus a read-only view of the file map, under the one acquisition this was
+	//! already taking. The clients walker resolves ECIDs against the files but cannot
+	//! fetch them itself: m_mu is a single non-recursive mutex, so reaching back into
+	//! CState from the callback trips ReentryGuard.
+	void MutateClientsWithFiles(
+		const std::function<void(std::map<std::uint32_t, ClientSnapshot> &, const FileMap &)> &fn);
+	void MutateServers(const std::function<void(std::map<std::uint32_t, ServerSnapshot> &)> &fn);
+	void MutateFriends(const std::function<void(std::map<std::uint32_t, FriendSnapshot> &)> &fn);
+	// The walker replaces the whole session vector each tick rather than merging: the
+	// daemon's reply IS the complete set, and a session missing from it was closed --
+	// merging would resurrect closed conversations.
+	void MutateChats(
+		const std::function<void(std::vector<ChatSessionSnapshot> &, std::uint32_t &cursor)> &fn);
+	// Mutate one search's result map (the refresher's per-tick full-fetch
+	// overwrite). No-op if the id names no live slot.
+	void MutateSearch(std::uint32_t search_id,
+		const std::function<void(std::map<std::uint32_t, SearchResult> &)> &fn);
+	// Mutate every search slot and the ECID->search_id index together, under one exclusive
+	// lock. The incremental union poll needs both: a diffed tag names no search, so the
+	// index resolves it, and a result that moves or disappears has to leave the map and
+	// the index in step.
+	void MutateAllSearches(const std::function<void(std::map<std::uint32_t, SearchSlot> &,
+			std::map<std::uint32_t, std::uint32_t> &)> &fn);
+
+	// Wholesale reset paths. Called by the refresher after a MarkTickFailure ->
+	// MarkTickSuccess transition: the server's CValueMap was reset on reconnect, so stale
+	// entries that vanished during the disconnect would live forever.
+	void ResetLists();
+
+	// Refresher-side write paths.
+	void WriteStatus(StatusSnapshot s);
+	void WriteKad(KadSnapshot k);
+	void WritePreferences(PreferencesSnapshot p);
+	void WriteCategories(std::vector<CategorySnapshot> c);
+	// Append one or more new amule-log lines to the ring, trimming oldest entries
+	// when capacity is exceeded. Once per refresher tick.
+	void AppendAmuleLog(std::vector<std::string> new_lines);
+	// Drop every cached amule-log line. Called by DELETE /logs/amule after the
+	// EC_OP_RESET_LOG roundtrip -- the refresher only appends, with no equivalent of
+	// "shrink to amuled's current count", so the in-process cache MUST be cleared
+	// explicitly or the next GET keeps returning the pre-reset lines.
+	void ClearAmuleLog();
+	void WriteServerInfo(ServerInfoLog s);
+	// Called by POST /search with the daemon-allocated search_id. Creates (or resets) that
+	// search's slot and marks it active. The refresher then polls EC_OP_SEARCH_RESULTS /
+	// _PROGRESS for it each tick.
+	void MarkSearchStarted(std::uint32_t search_id, const std::string &kind, const std::string &query);
+	/**
+	 * Mark a slot as no longer backed by the daemon. Freezes its results: see
+	 * SearchSlot::detached. Idempotent; a no-op for an unknown id.
+	 */
+	void DetachSearch(std::uint32_t search_id);
+
+	// Flag every slot the daemon could still speak for as needing a full re-seed. Called
+	// when a union roundtrip failed: we cannot know what that reply carried, and the
+	// daemon will not send it again.
+	void MarkAllSearchesNeedResync();
+	// Ids awaiting that re-seed, oldest slot first. Drained by the tick. Detached slots
+	// are excluded, matching MarkAllSearchesNeedResync: one detached after it was flagged
+	// has nothing left to re-seed.
+	std::vector<std::uint32_t> SearchesNeedingResync() const;
+	// Clears the flag for one slot without re-seeding it, for when the daemon
+	// answers that the search is gone.
+	void ClearSearchResyncFlag(std::uint32_t search_id);
+
+	// Seeds a slot for a search this session did NOT start -- another client's, or the
+	// monolithic GUI's. Called on-demand from the read paths on a cache miss, after a
+	// one-off EC_OP_SEARCH_LIST confirms the core holds it (deliberately NOT a per-tick
+	// poll: that would pay an EC roundtrip every tick, forever, for something that
+	// happens rarely). Unlike MarkSearchStarted it is idempotent.
+	//
+	// `active` / `complete` come from the lifecycle state the same EC_OP_SEARCH_LIST
+	// entry carries. Seeding them rather than assuming "active" matters because callers
+	// gate on them: POST /search/{id}/more rejects a finished search, and would
+	// otherwise accept one until corrected.
+	//
+	// `reported_percent` is the daemon's own percent when the entry carried one, and -1
+	// when it did not. The fallback is then derived: 100 for a finished search, 0 for a
+	// running one (the tick corrects it within a second).
+	void MarkSearchDiscovered(std::uint32_t search_id,
+		const std::string &kind,
+		const std::string &query,
+		bool active,
+		bool complete,
+		int reported_percent = -1);
+	// Refresher-side write path for one search's progress snapshot.
+	void WriteSearchProgress(std::uint32_t search_id, SearchProgressSnapshot s);
+	// Drop a search's slot entirely: DELETE /search/{id}, or the refresher
+	// observing the daemon evicted it (EC_TAG_SEARCH_EXPIRED).
+	void CloseSearch(std::uint32_t search_id);
+	void WriteStatsTree(StatsTreeNode t);
+	void WriteGraphs(StatsGraphs g);
+	void MarkTickSuccess();
+	// Monotonic counter advanced by every successful refresh, from the background loop and
+	// from the inline refreshes mutating handlers run. `snapshot_at` cannot play this role:
+	// it is whole seconds, so two refreshes inside one second are indistinguishable, and it
+	// is stamped only by the loop, so a mutation could change a body while it stood still --
+	// answering the next conditional GET with 304 for content that had just changed.
+	void BumpSnapshotRevision();
+	std::uint64_t SnapshotRevision() const;
+	void MarkTickFailure();
+
+private:
+	mutable std::shared_timed_mutex m_mu;
+	// Which CState this thread is currently inside a callback of, so the guard can tell
+	// "re-entered the same instance" (a deadlock) from "touched a different one" (harmless
+	// -- a different mutex).
+	static thread_local const CState *t_in_callback;
+
+	bool m_has_first_snapshot = false;
+	bool m_ec_connected = false;
+	std::time_t m_snapshot_at = 0;
+	std::uint64_t m_snapshot_rev = 0;
+
+	StatusSnapshot m_status;
+	KadSnapshot m_kad;
+	PreferencesSnapshot m_preferences;
+	std::vector<CategorySnapshot> m_categories;
+	// Unified ECID-keyed file map. A single entry may participate in the /downloads view
+	// (`is_downloading`), the /shared view (`is_shared`), or both -- see FileSnapshot's
+	// header comment. FileMap also owns the hash->ECID index, maintained inline on every
+	// emplace/erase.
+	FileMap m_files;
+
+	std::map<std::uint32_t, ClientSnapshot> m_clients;
+	// See the Known clients block above. m_known_loaded distinguishes "loaded
+	// and genuinely empty" from "never fetched".
+	std::vector<KnownClientSnapshot> m_known_clients;
+	// Indices, deliberately, not pointers: the reconcile appends while it iterates, and a
+	// reallocation would dangle anything holding addresses. Rows are only ever appended
+	// for the same reason.
+	//
+	// Keyed on the same lowercase hex the live snapshot uses (both go through
+	// CMD4Hash::Encode().Lower()); a case mismatch would give every peer two rows.
+	std::map<std::string, std::size_t> m_known_of_hash;
+	bool m_known_loaded = false;
+	//! Rows currently flagged connected, so a peer that left is found without
+	//! walking the store.
+	std::set<std::size_t> m_known_connected;
+	//! MUST be called with m_mu held for writing.
+	void ReconcileKnownClientsLocked();
+	std::map<std::uint32_t, ServerSnapshot> m_servers;
+	std::map<std::uint32_t, FriendSnapshot> m_friends;
+	std::vector<ChatSessionSnapshot> m_chats;
+	std::uint32_t m_chat_cursor = 0;
+	std::vector<std::string> m_amule_log_lines;
+	std::uint64_t m_amule_log_generation = 0;
+	ServerInfoLog m_server_info;
+	StatsTreeNode m_stats_tree;
+	StatsGraphs m_graphs;
+	// Multi-search: amuleapi runs several searches at once, each addressed on the REST
+	// surface by its daemon-allocated search_id. One slot per search holds that search's
+	// results (by result ECID) and its lifecycle progress.
+	std::map<std::uint32_t, SearchSlot> m_searches;
+	// Result ECID -> owning search_id, mirroring m_searches' result maps.
+	//
+	// Required by the incremental union poll: the daemon sends EC_TAG_SEARCH_ID only the
+	// first time it tells us about a result, and EC_TAG_FILE_REMOVED carries the bare ECID,
+	// so every later tag has to be attributed from here. Maintained inside the same locked
+	// mutation that writes the result maps -- an index that can drift from the map it
+	// mirrors is how #1028 leaked keys a reload could not heal.
+	std::map<std::uint32_t, std::uint32_t> m_resultOwner;
+	//! Monotonic source for SearchSlot::seq.
+	std::uint64_t m_search_seq = 0;
+	// Ceiling on retained slots. A client that never DELETEs its searches, or one watching
+	// a busy monolithic GUI, would otherwise accumulate a slot and its whole result map per
+	// search for the life of the process: the daemon's own kMaxEcSearches bounds only the
+	// searches it holds for *this* connection.
+	//
+	// Eviction is recoverable, which is why a cap is affordable at all: a later read of an
+	// evicted id misses the cache, re-discovers it via EC_OP_SEARCH_LIST and re-seeds it
+	// through FetchOneSearchFull.
+	//
+	// A soft cap, not a hard bound: an active slot is never a victim, so a burst of more
+	// than this many concurrent searches sits above the cap until they finish -- evicting a
+	// search still being polled would drop results the daemon has already marked delivered.
+	static constexpr std::size_t kMaxSearchSlots = 64;
+	// Trim m_searches back to kMaxSearchSlots, dropping the evicted slots' entries from
+	// m_resultOwner with them. Caller holds the write lock.
+	//
+	// `exempt_id` is never chosen as a victim: callers evict straight after inserting, and
+	// with every other slot active the freshly-inserted one would be the only eligible
+	// victim.
+	void EvictSurplusSearchSlotsLocked(std::uint32_t exempt_id = 0);
+};
+
+} // namespace webapi
+
+#endif // WEBAPI_STATE_H

amule-3.1.0.tar.gz/src/webapi/StaticFs.cpp Added

@@ -0,0 +1,79 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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.
+//
+
+#include "StaticFs.h"
+
+#include <cstdlib>
+#include <cstring>
+#include <limits.h>
+#include <sys/stat.h>
+
+namespace webapi
+{
+
+bool IsDir(const std::string &path)
+{
+	if (path.empty())
+		return false;
+	// Windows MSVCRT stat() rejects a trailing slash on a directory
+	// path; POSIX accepts it. Trim consistently.
+	std::string p = path;
+	while (p.size() > 1 && (p.back() == '/' || p.back() == '\\')) {
+		p.pop_back();
+	}
+	struct stat st
+	{
+	};
+	if (::stat(p.c_str(), &st) != 0)
+		return false;
+	return S_ISDIR(st.st_mode);
+}
+
+bool ResolveWithinRoot(const std::string &root, const std::string &rel, std::string &fs_out)
+{
+	char root_realPATH_MAX;
+	char fs_realPATH_MAX;
+#ifdef _WIN32
+	// _fullpath() is lexical-only, with no reparse-point resolution. On Windows the symlink
+	// containment threat model is weaker -- symlinks require elevation -- so lexical
+	// containment covers the operator-misconfig case this targets.
+	if (!_fullpath(root_real, root.c_str(), PATH_MAX))
+		return false;
+	const std::string joined = std::string(root_real) + "\\" + rel;
+	if (!_fullpath(fs_real, joined.c_str(), PATH_MAX))
+		return false;
+	struct stat st;
+	if (::stat(fs_real, &st) != 0)
+		return false;
+#else
+	if (!realpath(root.c_str(), root_real))
+		return false;
+	const std::string joined = std::string(root_real) + "/" + rel;
+	if (!realpath(joined.c_str(), fs_real))
+		return false;
+#endif
+	// _fullpath() on Windows preserves a trailing path separator from its input, which then
+	// breaks the prefix comparison below; POSIX realpath() strips them. Normalise here so the
+	// containment check is platform-agnostic.
+	std::size_t root_len = std::strlen(root_real);
+	while (root_len > 1 && (root_realroot_len - 1 == '/' || root_realroot_len - 1 == '\\')) {
+		root_real--root_len = '\0';
+	}
+	if (std::strncmp(fs_real, root_real, root_len) != 0)
+		return false;
+	const char sep = fs_realroot_len;
+	if (sep != '/' && sep != '\\' && sep != '\0')
+		return false;
+	fs_out.assign(fs_real);
+	return true;
+}
+
+} // namespace webapi

amule-3.1.0.tar.gz/src/webapi/StaticFs.h Added

@@ -0,0 +1,35 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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.
+//
+
+// Small filesystem helpers shared between ServeStaticFile (Api.cpp) and its security-critical unit
+// tests (StaticFsTest). Lifted to its own TU so the test target can link the helper without
+// dragging in the rest of the dispatcher, and its wx/Boost.Beast/EC web.
+
+#ifndef AMULE_WEBAPI_STATICFS_H
+#define AMULE_WEBAPI_STATICFS_H
+
+#include <string>
+
+namespace webapi
+{
+
+bool IsDir(const std::string &path);
+
+// Resolve `rel` under `root` and reject if the result escapes `root`: symlink containment, plus
+// belt and braces against any traversal that slips past the upstream path-pattern filter. Writes
+// the canonical absolute path into `fs_out` on success. Any failure (missing file, escape, OS
+// error) returns false -- the caller emits an opaque 404 either way, to keep the directory layout
+// non-enumerable from outside.
+bool ResolveWithinRoot(const std::string &root, const std::string &rel, std::string &fs_out);
+
+} // namespace webapi
+
+#endif // AMULE_WEBAPI_STATICFS_H

amule-3.1.0.tar.gz/src/webapi/TtlCache.h Added

@@ -0,0 +1,143 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#ifndef WEBAPI_TTL_CACHE_H
+#define WEBAPI_TTL_CACHE_H
+
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+#include <utility>
+
+namespace webapi
+{
+
+// Single-flight TTL cache for lazy-fetched endpoints (/logs/server_info, /stats/tree,
+// /stats/graphs/{graph}, /search/results). HTTP handlers drive their own EC fetches on demand,
+// coalescing burst reads via a 1 s TTL.
+//
+// Single-flight semantics: only one thread runs `fetch()` for a given stale-or-unset cache;
+// concurrent callers park on a condvar while the inflight thread runs the EC roundtrip with the
+// cache mutex DROPPED. Once the result is stored and the flag clears, every waiter observes the
+// just-stored value and returns it without re-fetching.
+//
+// Why drop the mutex around fetch: a 30 s amuled stall on /stats/tree would otherwise park every
+// concurrent reader of that endpoint for the stall's duration. Dropping the cache mutex around the
+// EC call lets concurrent readers cooperate on the single inflight fetch without serialising on the
+// slowest amuled response.
+//
+// Lock ordering: the fetcher lambda acquires `m_ec_mtx` while this cache's `m_mu` is NOT held.
+// Still single-flight per endpoint, because `m_inflight` gates concurrent fetches. The cached `T`
+// must be copyable, since it is returned by value so `m_mu` is not held across JSON serialisation.
+template <class T> class CTtlCache
+{
+public:
+	using clock_t = std::chrono::steady_clock;
+
+	// Returns a copy of the freshest value. On a hit, immediately under a brief lock. On a
+	// miss, one caller becomes the "inflight" worker -- drops the lock, runs fetch, re-takes
+	// it, stores, broadcasts -- while concurrent callers wait on the condvar and then read the
+	// stored value.
+	template <class Fetcher> T GetOrFetch(std::chrono::milliseconds ttl, Fetcher fetch)
+	{
+		return GetOrFetch(ttl, fetch, (const T &) { return true; });
+	}
+
+	// As above, plus a validity predicate on the cached value: a fresh entry that fails it
+	// counts as a miss and is refetched.
+	//
+	// This is for endpoints whose EC request is parameterised by the caller: the cache is
+	// unkeyed, so an entry fetched at one parameter must not be served to a request asking for
+	// another. Storing the parameter inside the cached value keeps the single-entry cache; a
+	// map keyed by a caller-supplied value would be unbounded by construction.
+	template <class Fetcher, class Validator>
+	T GetOrFetch(std::chrono::milliseconds ttl, Fetcher fetch, Validator is_valid)
+	{
+		std::unique_lock<std::mutex> lk(m_mu);
+		while (true) {
+			const auto now = clock_t::now();
+			const bool unset = (m_fetched_at == clock_t::time_point{});
+			if (!unset && (now - m_fetched_at) <= ttl && is_valid(m_value)) {
+				return m_value;
+			}
+			if (m_inflight) {
+				// Another caller is doing the EC roundtrip. Wait for them to
+				// finish, then re-check freshness in case yet another fetch is
+				// needed -- the inflight result can race our TTL clamp when fetch
+				// was slow.
+				m_cv.wait(lk, this { return !m_inflight; });
+				continue;
+			}
+			// We are the inflight worker. Claim the slot, drop the lock, and fetch
+			// unguarded so peers can park on the condvar rather than serialising on the
+			// cache mutex behind our long EC call.
+			m_inflight = true;
+			lk.unlock();
+			T fetched;
+			try {
+				fetched = fetch();
+			} catch (...) {
+				// Clear inflight + wake waiters even on exception
+				// so we don't park them forever.
+				{
+					std::lock_guard<std::mutex> g(m_mu);
+					m_inflight = false;
+				}
+				m_cv.notify_all();
+				throw;
+			}
+			{
+				std::lock_guard<std::mutex> g(m_mu);
+				m_value = std::move(fetched);
+				m_fetched_at = clock_t::now();
+				m_inflight = false;
+			}
+			m_cv.notify_all();
+			// Re-acquire to read the value under the lock, so the contract -- the
+			// returned T is a stable copy of the just-stored snapshot -- holds in the
+			// face of a racing Invalidate.
+			std::lock_guard<std::mutex> g(m_mu);
+			return m_value;
+		}
+	}
+
+	// Invalidate. A future GetOrFetch triggers a fresh fetch regardless of TTL. Used by
+	// mutations that touch an endpoint's data, e.g. POST /search invalidating /search/results.
+	void Invalidate()
+	{
+		std::lock_guard<std::mutex> g(m_mu);
+		m_fetched_at = clock_t::time_point{};
+	}
+
+private:
+	mutable std::mutex m_mu;
+	std::condition_variable m_cv;
+	clock_t::time_point m_fetched_at{};
+	T m_value{};
+	bool m_inflight = false;
+};
+
+} // namespace webapi
+
+#endif // WEBAPI_TTL_CACHE_H

amule-3.1.0.tar.gz/src/webapi/static Added

amule-3.1.0.tar.gz/src/webapi/static/css Added

amule-3.1.0.tar.gz/src/webapi/static/css/app.css Added

@@ -0,0 +1,1079 @@
+/* aMule Web — design system + responsive shell, styled after the aMule /
+   amuleGUI desktop app. Vanilla CSS, no preprocessor.
+
+   Theme resolution (light by default):
+     - :root                         -> light tokens
+     - prefers-color-scheme: dark    -> dark tokens (when no manual override)
+     - :rootdata-theme="dark|light"-> manual override from the WebUI preferences
+*/
+
+:root {
+  /* light theme */
+  color-scheme: light;
+  --bg: #e9edf2;
+  --surface: #ffffff;
+  --surface-2: #e7ebf0;
+  --toolbar: #dde3ea;
+  --border: #cbd2db;
+  --text: #1f2430;
+  --text-dim: #5b6472;
+  --accent: #1664c0;
+  --accent-contrast: #ffffff;
+  --ok: #2e9e54;
+  --warn: #d68a0c;
+  --bad: #cf3b3b;
+  --low: #d68a0c;
+  /* download pieces bar: available-but-not-downloaded parts (aMule's blue).
+     The graph fades --piece-avail-lo (few sources) -> --piece-avail (many)
+     to show availability, like the desktop GUI's blue gradient. */
+  --piece-avail: #0d3b66;
+  --piece-avail-lo: #a6d4ee;
+  --sel: rgba(22, 100, 192, .2);
+  --stripe: rgba(0, 0, 0, .025);
+  --radius: 7px;
+  --shadow: 0 1px 3px rgba(0, 0, 0, .12);
+  --toolbar-h: 60px;
+  --mono: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+}
+
+/* dark tokens — shared by "system + OS dark" and the explicit override */
+@media (prefers-color-scheme: dark) {
+  :root:not(data-theme) {
+    color-scheme: dark;
+    --bg: #1b1f24;
+    --surface: #242a31;
+    --surface-2: #2c333c;
+    --toolbar: #1f252b;
+    --border: #3a424d;
+    --text: #e6e9ee;
+    --text-dim: #9aa3b1;
+    --accent: #3f7cc2;
+    --accent-contrast: #ffffff;
+    --ok: #46b85f;
+    --warn: #e0a13a;
+    --bad: #f0625f;
+    --low: #e0a13a;
+    --piece-avail: #4bb4e6;
+    --piece-avail-lo: #2d6f96;
+    --sel: rgba(75, 155, 255, .16);
+    --stripe: rgba(255, 255, 255, .03);
+    --shadow: 0 1px 3px rgba(0, 0, 0, .4);
+  }
+}
+:rootdata-theme="light" { color-scheme: light; }
+:rootdata-theme="dark" {
+  color-scheme: dark;
+  --bg: #1b1f24;
+  --surface: #242a31;
+  --surface-2: #2c333c;
+  --toolbar: #1f252b;
+  --border: #3a424d;
+  --text: #e6e9ee;
+  --text-dim: #9aa3b1;
+  --accent: #3f7cc2;
+  --accent-contrast: #ffffff;
+  --ok: #46b85f;
+  --warn: #e0a13a;
+  --bad: #f0625f;
+  --low: #e0a13a;
+  --piece-avail: #4bb4e6;
+  --piece-avail-lo: #2d6f96;
+  --sel: rgba(75, 155, 255, .16);
+  --stripe: rgba(255, 255, 255, .03);
+  --shadow: 0 1px 3px rgba(0, 0, 0, .4);
+}
+
+* { box-sizing: border-box; }
+
+html, body { height: 100%; }
+body {
+  margin: 0;
+  font-family: system-ui, -apple-system, Segoe UI, Roboto, sans-serif;
+  font-size: 14px;
+  color: var(--text);
+  background: var(--bg);
+}
+
+/* Shell: fill the viewport as a column — toolbar and status bar stay put,
+   only the view scrolls (desktop-app feel). */
+#app { height: 100%; display: flex; flex-direction: column; }
+
+a { color: var(--accent); text-decoration: none; }
+b { font-weight: 600; }
+
+.icon { display: inline-block; vertical-align: middle; flex: none; }
+
+.sr-only {
+  position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px;
+  overflow: hidden; clip: rect(0,0,0,0); border: 0;
+}
+
+/* --- toolbar / nav (aMule-style icon buttons) --- */
+.app-toolbar {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 0 10px;
+  min-height: var(--toolbar-h);
+  background: var(--toolbar);
+  border-bottom: 1px solid var(--border);
+  box-shadow: var(--shadow);
+  flex: none;
+}
+.brand { display: flex; align-items: center; padding-right: 4px; }
+.brand-logo { height: 40px; width: auto; }
+/* hamburger, shown only on small screens (.app-toolbar prefix outranks .btn) */
+.app-toolbar .nav-toggle { display: none; position: relative; }
+.route-title { display: none; }    /* current section name, mobile only */
+.nav-tools { display: none; }      /* drawer copies of the header tools, mobile only */
+
+.nav {
+  display: flex;
+  gap: 2px;
+  flex: 1 1 auto;
+  overflow-x: auto;
+  scrollbar-width: thin;
+}
+.tool-btn {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 3px;
+  min-width: 60px;
+  padding: 6px 10px;
+  border: 0;
+  background: none;
+  font: inherit;
+  cursor: pointer;
+  border-radius: var(--radius);
+  color: var(--text-dim);
+  white-space: nowrap;
+}
+.tool-btn .icon { width: 20px; height: 20px; }
+.tool-label { font-size: 11px; font-weight: 500; }
+.tool-btn:hover { background: var(--surface-2); color: var(--text); }
+.tool-btn.active { background: var(--sel); color: var(--accent); }
+
+.header-tools { display: flex; align-items: center; gap: 8px; }
+/* Keep the right-hand buttons (Add, logout) the same height. */
+.header-tools .btn, .header-tools .input { height: 34px; }
+.ed2k-add { display: flex; gap: 6px; }
+.ed2k-input { width: 180px; max-width: 38vw; }
+
+/* --- status bar (bottom, like aMule) --- */
+.statusbar {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+  padding: 6px 14px;
+  background: var(--surface-2);
+  border-top: 1px solid var(--border);
+  font-size: 13px;
+  flex-wrap: wrap;
+  flex: none;
+}
+.status-left { display: inline-flex; align-items: center; }
+/* amulegui-style footer: live badge left, everything else pushed right */
+.status-right { display: flex; align-items: center; gap: 14px; flex-wrap: wrap; margin-left: auto; }
+.status-item { display: inline-flex; align-items: center; gap: 6px; }
+/* vertical divider between groups (status bar, toolbars), like amulegui's
+   wxStaticLine */
+.vsep { width: 1px; align-self: stretch; min-height: 16px; background: var(--border); }
+.conn-div { color: var(--text-dim); }
+/* connection state as plain colored text (no badge), like amulegui's labels */
+.conn-state.ok { color: var(--ok); }
+.conn-state.warn, .conn-state.low { color: var(--warn); }
+.conn-state.off { color: var(--text-dim); }
+.status-chip {
+  padding: 1px 8px; border-radius: 999px; font-size: 12px; font-weight: 600;
+  background: var(--surface); border: 1px solid var(--border);
+  display: inline-flex; align-items: center; gap: 4px;
+}
+.status-chip .icon { width: 12px; height: 12px; }
+.status-chip.ok { color: var(--ok); border-color: var(--ok); }
+.status-chip.warn, .status-chip.low { color: var(--warn); border-color: var(--warn); }
+.status-chip.off { color: var(--text-dim); }
+.status-chip.bad { color: var(--bad); border-color: var(--bad); }
+.speeds { gap: 12px; font-variant-numeric: tabular-nums; }
+.speed { display: inline-flex; align-items: center; gap: 4px; }
+.speed .icon { width: 14px; height: 14px; }
+.speed.dl { color: var(--ok); }
+.speed.ul { color: var(--accent); }
+
+/* --- view container --- */
+.view { flex: 1 1 auto; overflow: auto; padding: 16px; }
+.view > * { max-width: 1760px; margin-left: auto; margin-right: auto; }
+.view-header {
+  display: flex; align-items: center; gap: 12px; flex-wrap: wrap;
+  margin-bottom: 12px;
+}
+.spacer { flex: 1 1 auto; }
+.toolbar { display: flex; gap: 6px; flex-wrap: wrap; align-items: center; }
+.shared-dirs-add { margin-top: 10px; }
+.server-toolbars { --srv-field: 190px; display: flex; flex-direction: column; gap: 10px; margin-bottom: 12px; }
+.server-toolbars .input-sm { width: var(--srv-field); max-width: 100%; }
+
+/* --- buttons + inputs --- */
+.btn {
+  display: inline-flex; align-items: center; gap: 6px;
+  padding: 6px 11px;
+  border: 1px solid var(--border);
+  background: var(--surface);
+  color: var(--text);
+  border-radius: var(--radius);
+  cursor: pointer;
+  font: inherit;
+  line-height: 1;
+}
+.btn .icon { width: 16px; height: 16px; }
+.btn:hover { background: var(--surface-2); }
+.btn:disabled { opacity: .5; cursor: not-allowed; }
+.btn-primary { background: var(--accent); border-color: var(--accent); color: var(--accent-contrast); }
+/* Keep the accent fill on hover; .btn:hover would otherwise repaint it grey. */
+.btn-primary:hover { background: var(--accent); filter: brightness(1.05); }
+.btn-ghost { background: transparent; }
+.btn-danger { color: var(--bad); border-color: var(--bad); }
+.btn-icon { padding: 6px; }
+.btn-sm { padding: 4px 8px; font-size: 13px; }
+.btn-sm .icon { width: 15px; height: 15px; }
+
+/* Column picker: a <details> whose summary is a small icon button and whose
+   body is an absolutely-positioned checkbox menu. Native <details> owns
+   open/close so there's no outside-click handler. */
+.col-picker { position: relative; display: inline-flex; }
+.col-picker > summary { list-style: none; cursor: pointer; }
+.col-picker > summary::-webkit-details-marker { display: none; }
+.col-picker-menu {
+  position: absolute; right: 0; top: calc(100% + 4px); z-index: 20;
+  min-width: 160px; max-height: 60vh; overflow-y: auto; padding: 6px;
+  background: var(--surface); border: 1px solid var(--border);
+  border-radius: var(--radius); box-shadow: var(--shadow);
+  display: flex; flex-direction: column; gap: 2px;
+}
+.col-picker-item {
+  display: flex; align-items: center; gap: 8px; padding: 4px 6px;
+  border-radius: var(--radius); cursor: pointer; white-space: nowrap; font-size: 13px;
+}
+.col-picker-item:hover { background: var(--surface-2); }
+.col-picker-item input { margin: 0; }
+.col-picker-sep { height: 1px; margin: 4px 2px; background: var(--border); }
+.col-picker-reset {
+  width: 100%; border: none; background: none; color: inherit; font: inherit;
+  text-align: left;
+}
+
+/* Column resize handle: a thin invisible strip pinned to the right edge of
+   a resizable <th>, widened visually only on hover/drag so it doesn't
+   compete with the sort-click target covering the rest of the header. */
+.col-resize-handle {
+  position: absolute; top: 0; right: 0; bottom: 0; width: 6px;
+  cursor: col-resize; touch-action: none; z-index: 2;
+}
+.col-resize-handle:hover, .col-resize-handle:active { background: var(--accent); opacity: .5; }
+
+.input, select, textarea {
+  padding: 7px 9px;
+  border: 1px solid var(--border);
+  background: var(--surface);
+  color: var(--text);
+  border-radius: var(--radius);
+  font: inherit;
+}
+.input:focus, select:focus, textarea:focus {
+  outline: 2px solid var(--accent); outline-offset: -1px;
+}
+.input:disabled, select:disabled, textarea:disabled {
+  background: var(--surface-2); color: var(--text-dim); cursor: not-allowed;
+}
+
+/* Guest mode: hide admin-only controls. */
+body.role-guest .admin-only { display: none !important; }
+
+/* --- tables (native list look) --- */
+.table-wrap { overflow-x: auto; border: 1px solid var(--border); border-radius: var(--radius); background: var(--surface); }
+table.data { width: 100%; border-collapse: collapse; font-variant-numeric: tabular-nums; }
+table.data th, table.data td {
+  padding: 4px 8px; text-align: left; border-bottom: 1px solid var(--border);
+  white-space: nowrap;
+}
+table.data th {
+  /* position: relative is redundant with sticky today (sticky already
+     establishes a containing block for the absolutely-positioned resize
+     handle) but pins that down explicitly, so the handle stays anchored
+     even if the header ever stops being sticky. */
+  position: sticky; top: 0; background: var(--surface-2);
+  font-weight: 600; cursor: default; z-index: 1;
+  /* Column boundary, header-only -- the body stays borderless/clean, but
+     without this a resize handle has nothing marking where it lives, so
+     dragging feels like guesswork instead of grabbing a visible edge. */
+  border-right: 1px solid var(--border);
+  /* else a label wider than its column spills over the next header */
+  overflow: hidden; text-overflow: ellipsis;
+}
+table.data th:last-child { border-right: none; }
+table.data th.sortable { cursor: pointer; user-select: none; }
+table.data th.sortable:hover { color: var(--accent); }
+table.data th .sort-arrow { display: inline-flex; vertical-align: middle; opacity: .8; }
+table.data th .sort-arrow .icon { width: 12px; height: 12px; }
+table.data tbody tr:nth-child(even) { background: var(--stripe); }
+table.data tbody tr:hover { background: var(--surface-2); }
+table.data tbody tr.connected,
+table.data tbody tr.connected:nth-child(even) { background: color-mix(in srgb, var(--accent) 18%, var(--surface)); }
+table.data tbody tr.connected:hover { background: color-mix(in srgb, var(--accent) 26%, var(--surface)); }
+table.data tbody tr.connected td:first-child { box-shadow: inset 3px 0 0 var(--accent); }
+table.data tbody tr.connecting,
+table.data tbody tr.connecting:nth-child(even) { background: color-mix(in srgb, var(--warn) 18%, var(--surface)); }
+table.data tbody tr.connecting:hover { background: color-mix(in srgb, var(--warn) 26%, var(--surface)); }
+table.data tbody tr.connecting td:first-child { box-shadow: inset 3px 0 0 var(--warn); }
+table.data td.num, table.data th.num { text-align: right; }
+/* Select column: .cell-check fills the cell, so the whole cell toggles the row.
+   No position on the th -- it is already sticky (its own containing block), and
+   relative would unstick the select-all header. */
+table.data td.check { position: relative; }
+table.data .cell-check {
+  position: absolute; inset: 0;
+  display: flex; align-items: center; justify-content: center; cursor: pointer;
+}
+table.data td.name { white-space: normal; word-break: break-word; min-width: 220px; max-width: 520px; }
+.row-selected, .row-selected:hover { background: var(--sel) !important; }
+
+/* Empty/error/loading placeholder for a table, rendered as a sibling of the
+   <table>: a table is often wider than the viewport, so a cell centred over its
+   full width lands off-screen. Sticky keeps it in view on sideways scroll. */
+.table-wrap .table-empty { position: sticky; left: 0; }
+
+/* virtualized tables: fixed layout keeps columns from jittering as the visible
+   window changes; single-line cells keep every row the same fixed height. */
+.table-wrap.virtual { overflow-y: auto; overflow-x: auto; }
+table.data.virtual { table-layout: fixed; }
+table.data.virtual td { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+table.data.virtual td.name { white-space: nowrap; word-break: normal; min-width: 0; max-width: none; }
+/* striping is applied by absolute-index class (see table.js), not nth-child,
+   because the leading spacer row would flip the parity. */
+table.data.virtual tbody tr:nth-child(even) { background: none; }
+table.data.virtual tbody tr.stripe { background: var(--stripe); }
+table.data.virtual tbody tr.spacer td { border: 0; padding: 0; }
+table.data.virtual tbody tr.spacer:hover { background: transparent; }
+/* search results already in your downloads/shared: same accent look as a
+   connected server row, scoped to beat the .stripe band's specificity. */
+table.data.virtual tbody tr.row-have,
+table.data.virtual tbody tr.row-have.stripe { background: color-mix(in srgb, var(--accent) 18%, var(--surface)); }
+table.data.virtual tbody tr.row-have:hover { background: color-mix(in srgb, var(--accent) 26%, var(--surface)); }
+table.data.virtual tbody tr.row-have td:first-child { box-shadow: inset 3px 0 0 var(--accent); }
+/* Rows that open a detail panel on click take the pointer cursor, so it reads
+   as clickable (downloads, shared files, clients). */
+table.data.virtual tbody tr.clickable { cursor: pointer; }
+/* A4AF source row (parked on another file): muted, and the "A4AF: <file>" badge
+   that replaces the parts cell reads as a label, not transfer data. */
+table.data.virtual tbody tr.a4af td { color: var(--text-dim); font-style: italic; }
+.a4af-badge { color: var(--text-dim); font-style: italic; }
+/* flex name cell: ellipsize the name, keep any trailing element visible. */
+table.data.virtual td .name-cell { display: flex; align-items: center; gap: 6px; }
+table.data.virtual td .name-cell .name-text { min-width: 0; overflow: hidden; text-overflow: ellipsis; }
+/* Search hit advertised under several filenames: the picker replaces the name
+   text, so it takes the column's whole width. */
+table.data.virtual td.name .name-select { width: 100%; max-width: 100%; }
+
+/* --- progress bar (flat, accent-filled) --- */
+.progress {
+  position: relative; height: 18px; min-width: 90px; border-radius: 3px;
+  background: var(--surface-2); overflow: hidden; border: 1px solid var(--border);
+}
+.progress-fill {
+  position: absolute; inset: 0 auto 0 0; overflow: hidden;
+  width: calc(var(--p, 0) * 1%); background: var(--accent);
+}
+/* Two centred copies of the % keep it legible over both regions in either
+   theme: the base reads on the empty track, the fill copy (white, clipped to
+   the fill) reads on the accent. ponytail: fill copy is sized to the whole bar
+   via 10000%/--p so both stay centred on the bar, not on the fill. */
+.progress-label {
+  position: absolute; inset: 0; text-align: center;
+  font-size: 12px; font-weight: 600; line-height: 18px; color: var(--text);
+}
+.progress-label-fill {
+  right: auto; width: calc(10000% / max(var(--p, 0), 1));
+  color: var(--accent-contrast);
+}
+
+/* --- badges --- */
+.badge { padding: 1px 7px; border-radius: 999px; font-size: 12px; font-weight: 600;
+  background: var(--surface-2); border: 1px solid var(--border); }
+.badge.downloading { color: var(--ok); border-color: var(--ok); }
+.badge.paused { color: var(--text-dim); }
+.badge.stopped { color: var(--bad); border-color: var(--bad); }
+.badge.error { color: var(--bad); border-color: var(--bad); }
+.badge.waiting { color: var(--warn); border-color: var(--warn); }
+
+/* --- placeholders --- */
+.placeholder {
+  padding: 40px 16px; text-align: center; color: var(--text-dim);
+}
+/* kind="loading" grows a spinner; order:-1 puts it above the text. */
+.placeholder-loading { display: flex; flex-direction: column; align-items: center; gap: 12px; }
+.placeholder-loading::after {
+  content: ""; order: -1; width: 22px; height: 22px; border-radius: 50%;
+  border: 2px solid var(--border); border-top-color: var(--accent);
+  animation: spin 700ms linear infinite;
+}
+@keyframes spin { to { transform: rotate(360deg); } }
+@media (prefers-reduced-motion: reduce) { .placeholder-loading::after { animation: none; } }
+.placeholder-error { color: var(--bad); }
+
+/* --- cards / forms --- */
+.card {
+  background: var(--surface); border: 1px solid var(--border);
+  border-radius: var(--radius); padding: 16px; margin-bottom: 16px;
+}
+.card h3 { margin: 0 0 12px; font-size: 15px; }
+.form-grid { display: grid; grid-template-columns: 1fr; gap: 12px; }
+.form-grid-2 { grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); }
+.field { display: flex; flex-direction: column; gap: 4px; }
+.field label { font-size: 13px; color: var(--text-dim); }
+.field-inline { display: flex; flex-direction: row; align-items: center; gap: 8px; }
+
+/* --- login --- */
+.login { min-height: 100vh; display: grid; place-items: center; padding: 24px; }
+.login-form {
+  width: 100%; max-width: 340px; background: var(--surface);
+  border: 1px solid var(--border); border-radius: var(--radius);
+  box-shadow: var(--shadow); padding: 28px 24px;
+  display: flex; flex-direction: column; gap: 14px; text-align: center;
+}
+.login-logo { height: 52px; margin: 0 auto; }
+.login-title { font-size: 16px; margin: 0; color: var(--text-dim); font-weight: 500; }
+.login-error { color: var(--bad); min-height: 1em; margin: 0; font-size: 13px; }
+/* Why we bounced back to login (expired session, lockout) — a statement of
+   fact, not a failed action, so it reads warn rather than bad. */
+.login-notice { color: var(--warn); margin: 0; font-size: 13px; }
+
+/* --- About version alert --- */
+.about-alert { display: flex; align-items: center; gap: 8px; font-size: 14px; }
+.about-alert .icon { color: var(--warn); flex: 0 0 auto; }
+.about-alert.update .icon { color: var(--accent); }
+.update-actions { margin-top: 14px; }
+.update-status.available { color: var(--accent); font-weight: 500; }
+
+/* --- toast + modal --- */
+.toast-host {
+  position: fixed; right: 16px; bottom: 16px; z-index: 100;
+  display: flex; flex-direction: column; gap: 8px;
+}
+.toast {
+  padding: 10px 14px; border-radius: var(--radius); box-shadow: var(--shadow);
+  background: var(--surface); border-left: 4px solid var(--accent);
+  color: var(--text); max-width: 360px; animation: toast-in .2s ease;
+}
+.toast.success { border-left-color: var(--ok); }
+.toast.error { border-left-color: var(--bad); }
+.toast.warn { border-left-color: var(--warn); }
+.toast-out { opacity: 0; transition: opacity .3s; }
+@keyframes toast-in { from { transform: translateY(8px); opacity: 0; } to { transform: none; opacity: 1; } }
+
+.modal-overlay {
+  position: fixed; inset: 0; background: rgba(0,0,0,.45);
+  display: grid; place-items: center; z-index: 90; padding: 16px;
+  /* Overrides the `.view > *` max-width/auto-margins when the overlay is
+     rendered inline in a view (otherwise the backdrop is capped to 1400px). */
+  max-width: none; margin: 0;
+}
+.modal {
+  background: var(--surface); border-radius: var(--radius); box-shadow: var(--shadow);
+  padding: 20px; max-width: 420px; width: 100%;
+}
+/* Comments/ratings dialog: a four-column table needs more than a confirm
+   prompt's 420px. */
+.modal-wide { max-width: 720px; }
+.modal-wide .comments-list { margin-top: 12px; }
+.modal-header { display: flex; align-items: center; gap: 8px; margin-bottom: 12px; }
+.modal-header h3 { margin: 0; font-size: 15px; }
+/* Inline categories panel header (title + Add category button). */
+.cat-panel-header { display: flex; align-items: center; gap: 8px; margin-bottom: 12px; }
+.cat-panel-header h3 { margin: 0; font-size: 15px; }
+.modal-msg { margin: 0 0 16px; }
+.modal-actions { display: flex; justify-content: flex-end; gap: 8px; margin-top: 16px; }
+
+/* --- transfers / shared extras --- */
+.input-sm { padding: 3px 6px; font-size: 13px; }
+/* Selects/inputs render taller than buttons (line-height: normal vs 1). Pin the
+   small controls to one height so they line up side by side, e.g. the category
+   select next to the download button in the search results action cells. */
+.input-sm, .btn-sm { height: 28px; }
+.totals-line { padding: 8px 4px; color: var(--text-dim); font-size: 13px; }
+/* Keep this cell a real table-cell (not display:flex) so its bottom border
+   collapses with the row like every other column. */
+.row-actions { white-space: nowrap; }
+.row-actions .btn { vertical-align: middle; }
+.peer-flags { white-space: nowrap; }
+.peer-flags .icon { vertical-align: middle; margin-right: 3px; color: var(--text-dim); }
+.peer-flags .icon.flag-warn { color: var(--warn); }
+.row-actions .btn + .btn { margin-left: 4px; }
+.row-actions select + .btn { margin-left: 6px; }
+/* A select sizes itself to its longest option, so a long category name would
+   otherwise push the row's buttons out of the cell (Chrome clips them; Firefox
+   renders the select narrower and hides the problem). */
+.row-actions select { max-width: 130px; }
+.color-swatch { display: inline-block; width: 14px; height: 14px; border-radius: 3px; border: 1px solid var(--border); vertical-align: middle; }
+.country-cell { white-space: nowrap; }
+.flag { display: inline-block; width: 16px; height: 11px; vertical-align: middle; margin-right: 5px; }
+
+/* --- search --- */
+.search-grid {
+  display: grid; grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
+  gap: 12px; margin-bottom: 12px;
+}
+.search-grid .input, .search-grid select { width: 100%; padding: 4px 8px; }
+.search-grid .field-inline .input { flex: 1; min-width: 0; }
+.search-grid .field-inline select { width: auto; flex: 0 0 auto; }
+.search-grid .field-wide { grid-column: span 2; }
+.search-form { margin-bottom: 8px; }
+.search-progress { color: var(--text-dim); font-size: 13px; }
+.pane-toolbar .search-progress { margin-left: 6px; }
+.net-pane .pane-toolbar { margin-bottom: 12px; }
+.hint { color: var(--text-dim); font-size: 13px; margin: 8px 0 0; }
+
+/* --- stat grid (components.js Section) --- */
+/* Flex, not a track grid: fields pack left at their natural width and wrap,
+   instead of every group stretching its cells over a fixed track count. */
+.kad-grid { display: flex; flex-wrap: wrap; gap: 12px 30px; }
+.kad-grid > div { min-width: 150px; max-width: 100%; }
+.kad-stat-label { font-size: 12px; color: var(--text-dim); margin-bottom: 4px; }
+.kad-stat-value {
+  font-size: 13px; font-weight: 600; font-variant-numeric: tabular-nums;
+  word-break: break-word;
+}
+
+/* --- stats --- */
+.charts-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(320px, 1fr)); gap: 16px; margin-bottom: 16px; }
+/* Statistics page: fixed 2×2 grid like the desktop statsDlg —
+   Download | Upload on top, Connections | Statistics Tree below. All four
+   cards share one row height so the charts match the stats-tree card. */
+.stats-grid { grid-template-columns: 1fr 1fr; grid-auto-rows: 340px; }
+.stats-tree-card { display: flex; flex-direction: column; min-height: 0; }
+.stats-tree-card .stats-tree { overflow-y: auto; min-height: 0; }
+/* Chart card fills its cell; the canvas host takes the space left by the title
+   and legend (charts.js sizes the canvas to the host height). */
+.chart-card { margin-bottom: 0; display: flex; flex-direction: column; }
+.chart-card .chart-host { flex: 1 1 auto; min-height: 0; }
+.chart-legend {
+  display: flex; gap: 16px; flex-wrap: wrap; margin-top: 8px;
+  font-size: 12px; color: var(--text-dim); font-variant-numeric: tabular-nums;
+}
+.legend-item { display: inline-flex; align-items: center; gap: 6px; }
+.legend-chip { display: inline-block; width: 16px; height: 10px; border-radius: 2px; }
+/* Borderless chart (used inside the Networks/Kad pane, which already has its
+   own surface + border). Sits below the controls with some breathing room. */
+.chart-bare { padding: 0; margin-top: 10px; }
+/* Compact title: the pane is short, so the plot gets the height the desktop
+   GUI spends on a group box caption. */
+.chart-bare h3 { margin: 0 0 2px; font-size: 13px; font-weight: 500; color: var(--text-dim); }
+.chart-host { width: 100%; }
+.stats-tree { font-size: 13px; }
+.stats-tree details { margin: 2px 0; padding-left: 12px; border-left: 1px solid var(--border); }
+.stats-tree summary { cursor: pointer; padding: 2px 0; font-weight: 600; }
+.stats-tree .tree-leaf { padding: 2px 0 2px 14px; color: var(--text-dim); }
+
+/* --- preferences (PrefsUnifiedDlg-style: category list + panel) --- */
+/* Preferences use the shared notebook (.net-pane / .net-pane-body); only the
+   in-panel group boxes need extra styling here. */
+/* Group cards flow into masonry-style columns so short cards don't leave a gap
+   under them: up to 3 on wide desktop, 2 on medium, 1 on phones (see @media).
+   Cards keep source order down each column, so the phone view (1 column) is
+   that same sequence. */
+/* The JS reflow nudge in preferences.js repaints this box after re-renders:
+   Gecko otherwise leaves blank rows in multicol content (#1330). */
+.prefs-groups { column-count: 3; column-gap: 14px; margin-bottom: 14px; }
+.prefs-panel fieldset {
+  border: 1px solid var(--border); border-radius: var(--radius);
+  background: var(--surface); padding: 12px 14px; margin: 0 0 14px; min-width: 0;
+  break-inside: avoid; -webkit-column-break-inside: avoid;
+}
+.prefs-panel legend { padding: 0 6px; font-size: 13px; font-weight: 600; color: var(--text-dim); }
+.prefs-panel .field-wide { grid-column: 1 / -1; }
+/* Give checkboxes the input row height so rows keep a consistent rhythm. */
+.prefs-panel .field-inline { min-height: 35px; }
+/* Disabled checkboxes read as disabled like the text inputs: muted box, dim
+   label (native checkboxes otherwise keep their accent colour and full-colour
+   label). */
+.prefs-panel .field-inline input:disabled { opacity: 0.5; cursor: not-allowed; }
+.prefs-panel .field-inline input:disabled + label { color: var(--text-dim); cursor: not-allowed; }
+/* Seam: this panel shares a fieldset with real preferences but has its own
+   button, so it must not read as fields the global Apply saves. */
+.prefs-creds { border-top: 1px solid var(--border); margin-top: 12px; padding-top: 12px; }
+/* Text field with a trailing action button (update-from-URL). */
+.field-action { display: flex; align-items: center; gap: 6px; }
+.field-action .input { flex: 1; min-width: 0; }
+/* Sub-options: indented under their parent (two nesting levels). */
+.prefs-panel .field-sub { margin-left: 24px; }
+.prefs-panel .field-sub2 { margin-left: 48px; }
+.prefs-panel textarea { resize: vertical; font: inherit; }
+.prefs-warning { color: var(--warn); font-weight: 600; margin-bottom: 16px; }
+.prefs-actions { justify-content: center; }
+.webui-reset-actions { margin-top: 14px; }
+
+/* --- log/pre views --- */
+.logbox-wrap { position: relative; min-width: 0; }
+/* Floats over the box's top-right corner to save vertical space; opaque so the
+   unwrapped lines scrolling underneath stay hidden. */
+.logbox-actions {
+  position: absolute; top: 8px; right: 8px; z-index: 1;
+  display: flex; gap: 6px; padding: 4px; border-radius: var(--radius);
+  background: var(--surface-2);
+}
+.logbox {
+  background: var(--surface-2); color: var(--text); border: 1px solid var(--border);
+  font-family: var(--mono); font-size: 12.5px;
+  padding: 12px; border-radius: var(--radius); overflow: auto; max-height: 30vh;
+  white-space: pre; margin: 0;
+}
+.logbox-sm { max-height: 22vh; }
+.logbox-err { white-space: pre-wrap; overflow-wrap: anywhere; }
+/* keep the box's line-height (and padding) when there is no log content yet */
+.logbox:empty::before { content: "\00a0"; }
+
+/* --- per-network connect button: a .btn whose plug is coloured by state --- */
+.conn-btn.disconnected .icon { color: var(--bad); }  /* red — disconnected */
+.conn-btn.connecting   .icon { color: var(--warn); } /* amber — connecting */
+.conn-btn.connected    .icon { color: var(--ok); }   /* green — connected */
+/* extra controls riding the right of a tab strip (Downloads category filters) */
+.tabs-extra { margin-left: auto; display: flex; align-items: center; gap: 6px; margin-bottom: 4px; }
+
+/* --- notebook-style tabs (CMuleNotebook look) --- */
+/* Inset shadow, not border-bottom: a scrolling strip clips at its padding box,
+   so over a real border the active tab could not paint its -1px overhang and
+   would look detached from the pane. */
+.tabs {
+  display: flex; gap: 2px; flex-wrap: wrap;
+  box-shadow: inset 0 -1px 0 var(--border); margin-bottom: 12px;
+}
+.tab {
+  border: 1px solid var(--border); border-bottom: none;
+  background: var(--surface-2); color: var(--text-dim);
+  padding: 6px 14px; border-radius: var(--radius) var(--radius) 0 0;
+  cursor: pointer; font: inherit; line-height: 1.4; margin-bottom: -1px;
+}
+.tab:hover { background: var(--surface); color: var(--text); }
+.tab.active {
+  background: var(--surface); color: var(--text); font-weight: 600;
+  border-color: var(--border); border-bottom-color: var(--surface);
+}
+.tab-badge {
+  margin-left: 6px; padding: 0 6px; border-radius: 999px; font-size: 11px;
+  background: var(--border); color: var(--text-dim);
+}
+.tab.active .tab-badge { background: var(--accent); color: var(--accent-contrast); }
+
+.tab-item { display: inline-flex; align-items: stretch; flex: 0 0 auto; }
+.tab-item .tab { border-top-right-radius: 0; }
+.tab-close {
+  border: 1px solid var(--border); border-left: none; border-bottom-color: transparent;
+  background: var(--surface-2); color: var(--text-dim);
+  border-radius: 0 var(--radius) 0 0; margin-bottom: -1px;
+  padding: 0 9px; cursor: pointer; font: inherit; line-height: 1.4;
+}
+.tab-close:hover { background: var(--surface); color: var(--bad); }
+.tab-item .tab.active + .tab-close { background: var(--surface); color: var(--text); border-bottom-color: var(--surface); }
+.tab.running { font-style: italic; }
+.tab.running .tab-badge { background: var(--accent); color: var(--accent-contrast); }
+
+/* --- Networks split (top: ED2K/Kad, bottom: log/server info) --- */
+/* No gap on desktop: the draggable .splitter (+ its own margin) is the visual
+   divider between the two panes, like Downloads. Mobile restores a gap since
+   the splitter is hidden there (see the responsive block). */
+.net-split { display: flex; flex-direction: column; gap: 0; }
+/* Small breathing room below the splitter so it doesn't sit flush against the
+   bottom pane's tab strip. Lives on the splitter (hidden on mobile) so it adds
+   no extra gap there. */
+.net-split .splitter { margin: 2px 0 8px; }
+/* Bottom pane (log/server info) keeps the dragged pixel height; its body fills
+   so the log box grows to the pane instead of its default 30vh cap — otherwise
+   dragging the splitter would just move empty space. */
+.net-split .net-pane:last-child { flex: none; min-height: 0; }
+/* overflow only here: the info tabs are taller than the pane the splitter
+   leaves them. Not on .net-pane-body itself -- that would clip the
+   ColumnPicker menu, which hangs out of the table panes. */
+.net-split .net-pane:last-child .net-pane-body { flex: 1 1 auto; min-height: 0; display: flex; flex-direction: column; overflow: auto; }
+/* Column so the <pre> is stretched to the wrapper width (cross axis) and
+   scrolls its long lines, instead of a flex row where it would keep its
+   longest-line width and overflow the pane. */
+.net-split .logbox-wrap { flex: 1 1 auto; min-height: 0; display: flex; flex-direction: column; }
+.net-split .logbox { flex: 1 1 auto; max-height: none; min-height: 0; }
+/* Kad tab graph fills the top pane so it grows/shrinks with the splitter
+   (charts.js sizes the canvas to the host and redraws via a ResizeObserver). */
+.net-split .chart-bare { flex: 1 1 auto; min-height: 0; }
+/* notebook: content box hangs off the tab strip's bottom line, no outer card */
+.net-pane { display: flex; flex-direction: column; }
+.net-pane .tabs { margin-bottom: 0; }
+.net-pane-body {
+  min-height: 0; background: var(--surface);
+  border: 1px solid var(--border); border-top: none;
+  border-radius: 0 0 var(--radius) var(--radius); padding: 12px;
+}
+
+/* --- Full-height split (table on top, detail panel below) --- */
+/* Shared by the Downloads and Shared Files pages (see split-detail.js): the
+   page fills the viewport and scrolls its regions internally (app-like)
+   instead of scrolling the whole page. */
+.split-view { height: 100%; display: flex; flex-direction: column; min-height: 0; }
+/* Full-height page without a detail split: the root fills the viewport and its
+   marked region (.pane-fill) scrolls internally, reusing the .split-view flex
+   chain below. Used by Clients, Searches and Networks. */
+.fill-view { height: 100%; display: flex; flex-direction: column; min-height: 0; }
+/* The table region (net-pane on Downloads, card on Shared) fills the top pane;
+   the detail (.split-bottom) is a sibling below the splitter, no longer nested
+   in the table's box (it draws no box of its own — see .split-bottom below). */
+.split-view .net-pane, .fill-view .pane-fill { flex: 1 1 auto; min-height: 0; }
+.split-view .net-pane-body, .fill-view .pane-fill .net-pane-body { flex: 1 1 auto; min-height: 0; display: flex; flex-direction: column; }
+/* Shared Files' top region is a plain .card (no category-tab net-pane like
+   Downloads), and it's the fill region — now nested in .split-top. The
+   direct-child form also covers the Categories panel card shown in Downloads'
+   manage-categories mode. */
+.split-top > .card, .split-view > .card { flex: 1 1 auto; min-height: 0; display: flex; flex-direction: column; margin-bottom: 0; }
+/* fill the region and scroll rows internally (overrides the default 70vh cap) */
+.split-view .table-wrap.virtual, .fill-view .table-wrap.virtual { flex: 1 1 auto; min-height: 0; }
+.split-view table.data.virtual tbody tr:not(.spacer) { cursor: pointer; }
+
+.split { flex: 1 1 auto; display: flex; flex-direction: column; min-height: 0; }
+.split-top { flex: 1 1 auto; display: flex; flex-direction: column; min-height: 0; }
+.splitter {
+  flex: none; height: 7px; margin: 2px 0; cursor: row-resize;
+  background: var(--border); border-radius: 3px; touch-action: none;
+}
+.splitter:hover { background: var(--accent); }
+/* No outer box: the detail's title + tabs sit free; only the tab content
+   (.detail-body) is boxed (notebook look, like .net-pane / .net-pane-body).
+   The panel itself never scrolls — the head + tabs stay fixed and only
+   .detail-body scrolls, so the tab strip is always reachable. */
+.split-bottom {
+  flex: none; position: relative; overflow: hidden;
+  display: flex; flex-direction: column;
+}
+
+/* selected-for-detail row: accent left edge (mirrors .connected) */
+.row-active td:first-child { box-shadow: inset 3px 0 0 var(--accent); }
+.row-active, .row-active:hover { background: color-mix(in srgb, var(--accent) 12%, var(--surface)); }
+
+/* --- detail panel content --- */
+/* No side padding: the head, tabs and content box span the panel's full width,
+   flush with the table container above (the mobile sheet re-adds padding).
+   Flex column so the head + tabs stay fixed and .detail-body takes the rest. */
+.detail-panel { padding: 10px 0 4px; flex: 1 1 auto; min-height: 0; display: flex; flex-direction: column; }
+.detail-head { flex: none; }
+.detail-close { position: absolute; top: 8px; right: 8px; z-index: 1; }
+/* title row: just the file name (ellipsised); padding-right leaves room for the
+   absolute close button, which centres on this row. */
+.detail-titlebar { display: flex; align-items: center; gap: 12px; margin-bottom: 10px; padding-right: 34px; }
+.detail-name {
+  margin: 0; font-size: 15px; flex: 1 1 auto; min-width: 0;
+  white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
+}
+/* Heading on its own line; the action row and the fields share the next one. */
+.detail-group { display: flex; flex-wrap: wrap; align-items: flex-end; gap: 10px 30px; }
+.detail-group > .kad-grid { flex: 0 1 auto; }
+/* Shrinkable, not flex:none — it has to narrow for its own flex-wrap to kick in,
+   or the row stays at max-content and the last button is clipped on a phone. */
+.detail-actions { display: flex; flex-wrap: wrap; gap: 8px; flex: 0 1 auto; }
+.detail-head .detail-actions { margin-bottom: 10px; }
+/* Label + select fused into one control. */
+.detail-head .field-inline {
+  gap: 0; height: 28px; border: 1px solid var(--border);
+  border-radius: var(--radius); overflow: hidden;
+}
+.detail-head .field-inline > label,
+.detail-head .field-inline > b {
+  display: flex; align-items: center; align-self: stretch; padding: 0 8px;
+  font-size: 12px; white-space: nowrap;
+}
+.detail-head .field-inline > label { color: var(--text-dim); background: var(--surface-2); }
+.detail-head .field-inline > select { border: none; border-radius: 0; height: 100%; }
+.detail-progress .progress { height: 22px; margin-bottom: 10px; }
+.pieces-bar {
+  width: 100%; height: 24px; border-radius: 3px; overflow: hidden;
+  border: 1px solid var(--border);
+  /* track shows through the 1px gaps drawn between pieces (when wide enough) */
+  background: var(--surface-2);
+}
+.pieces-bar canvas { display: block; width: 100%; height: 100%; }
+.pieces-legend { margin-top: 8px; align-items: center; }
+.pieces-legend b { color: var(--text); font-variant-numeric: tabular-nums; }
+.pieces-total { margin-left: auto; color: var(--text-dim); font-weight: 600; }
+/* Availability scale, inline right after "Available": the blue's shade encodes
+   how many sources have each part. Flanked by "fewer"/"more" so the mapping is
+   explicit and theme-independent (full meaning in the item's tooltip). */
+.pieces-scale { display: inline-flex; align-items: center; gap: 5px; margin-left: 4px; }
+.pieces-scale small { color: var(--text-dim); font-size: 11px; }
+.pieces-scale-bar {
+  width: 64px; height: 10px; border-radius: 2px; border: 1px solid var(--border);
+  background: linear-gradient(90deg, var(--piece-avail-lo), var(--piece-avail));
+}
+/* Each group is a full-width horizontal strip, stacked top to bottom. */
+.detail-sections { display: flex; flex-direction: column; gap: 18px; }
+.detail-group-title {
+  flex: 0 0 100%; margin: 0; padding-bottom: 5px;
+  border-bottom: 1px solid var(--border);
+  font-size: 11px; font-weight: 600; letter-spacing: .04em;
+  text-transform: uppercase; color: var(--text-dim);
+}
+.detail-panel .mono { font-family: var(--mono); font-size: 13px; }
+/* Tabs hang off the content box's top edge (no gap), notebook-style. */
+.detail-panel .tabs { margin-top: 0; margin-bottom: 0; flex: none; }
+.detail-body {
+  flex: 1 1 auto; min-height: 0; overflow-y: auto;
+  background: var(--surface);
+  border: 1px solid var(--border); border-top: none;
+  border-radius: 0 0 var(--radius) var(--radius); padding: 12px;
+}
+
+/* --- per-file clients tab --- */
+/* Fills the detail body so the table scrolls its own rows (the .split-view
+   .table-wrap.virtual rule above gives it flex:1) instead of stretching the
+   panel and adding a second scrollbar. */
+.detail-clients { display: flex; flex-direction: column; gap: 8px; height: 100%; }
+
+/* --- comments / ratings tab --- */
+.detail-comments { display: flex; flex-direction: column; gap: 16px; }
+.comment-editor { display: flex; flex-direction: column; gap: 8px; }
+.comment-editor-label {
+  font-size: 13px; font-weight: 600; color: var(--text-dim);
+}
+.comment-editor-text { resize: vertical; font-family: inherit; min-height: 44px; }
+.comment-editor-row { display: flex; gap: 8px; align-items: center; }
+.comment-editor-hint { margin: 0; font-size: 12px; color: var(--text-dim); }
+.rename-form { display: flex; flex-direction: column; gap: 8px; }
+.rename-label { font-size: 13px; font-weight: 600; color: var(--text-dim); }
+.rename-row { display: flex; gap: 8px; align-items: center; }
+.rename-row .input { flex: 1; }
+.comments-head { display: flex; justify-content: space-between; align-items: center; gap: 8px; }
+.comments-count { font-size: 13px; color: var(--text-dim); }
+.comments-list { width: 100%; border-collapse: collapse; font-size: 13px; }
+.comments-list th {
+  text-align: left; font-weight: 600; color: var(--text-dim);
+  padding: 6px 8px; border-bottom: 1px solid var(--border); white-space: nowrap;
+}
+.comments-list td { padding: 6px 8px; border-bottom: 1px solid var(--border); vertical-align: top; }
+.comments-fname { color: var(--text-dim); word-break: break-all; }
+.comments-list td:last-child { word-break: break-word; }
+/* Rating text badge, coloured by meaning (mirrors the desktop smiley scale:
+   1 = fake warning, not a low star score). */
+.rating-badge { white-space: nowrap; font-weight: 600; }
+.rating--1, .rating-0 { color: var(--text-dim); font-weight: 400; }
+.rating-1 { color: var(--bad); }
+.rating-2 { color: var(--warn); }
+.rating-3 { color: var(--text-dim); }
+.rating-4 { color: var(--accent); }
+.rating-5 { color: var(--ok); }
+
+/* --- Messages (friends + chat) --- */
+/* Friends left, Messages right. A fixed track, not a draggable sash, so it
+   collapses cleanly to one column on a phone. Keeps .fill-view's height:100%
+   so each pane scrolls its own body. */
+.msg-split {
+  display: grid; grid-template-columns: 300px minmax(0, 1fr); gap: 12px;
+  align-items: stretch;
+}
+/* notebook look, same as .net-pane: header outside the box, content boxed */
+.msg-pane { display: flex; flex-direction: column; min-height: 0; min-width: 0; }
+.msg-pane-head {
+  flex: none; display: flex; align-items: center; gap: 6px;
+  margin: 0 0 6px; font-size: 13px; font-weight: 600; color: var(--text-dim);
+}
+.msg-pane-body {
+  flex: 1 1 auto; min-height: 0; overflow: auto;
+  background: var(--surface); border: 1px solid var(--border);
+  border-radius: var(--radius); padding: 6px;
+}
+.msg-tabs { margin-bottom: 0; }
+.msg-tabs + .msg-pane-body { border-top-left-radius: 0; border-top-right-radius: 0; }
+.msg-pane-foot { flex: none; padding-top: 8px; }
+.msg-pane-foot .btn { width: 100%; justify-content: center; }
+
+/* friends list */
+.friend-list { list-style: none; margin: 0; padding: 0; }
+.friend-row { display: flex; align-items: center; gap: 2px; border-radius: var(--radius); }
+.friend-row:hover { background: var(--surface-2); }
+.friend-row.active { background: var(--sel); }
+/* The row's open action is a real button, so it must not look like one. */
+.friend-open {
+  flex: 1 1 auto; min-width: 0; display: flex; align-items: center; gap: 8px;
+  background: none; border: none; border-radius: var(--radius);
+  padding: 6px; font: inherit; color: inherit; text-align: left; cursor: pointer;
+}
+.friend-dot {
+  flex: none; width: 8px; height: 8px; border-radius: 50%;
+  background: var(--border); box-shadow: inset 0 0 0 1px var(--text-dim);
+}
+.friend-dot.online { background: var(--ok); box-shadow: none; }
+.friend-name { flex: 1 1 auto; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+/* Desktop paints a connected friend blue (#0000FF); a theme token instead. */
+.friend-open.online .friend-name { color: var(--accent); }
+.friend-row .row-actions { flex: none; display: flex; gap: 2px; }
+/* the friend holding the friend slot: solid star, not just an accent outline */
+.friend-row .btn.active { color: var(--accent); border-color: var(--accent); }
+.friend-row .btn.active .icon { fill: currentColor; }
+
+/* conversation */
+.chat-body { display: flex; flex-direction: column; gap: 6px; overflow: hidden; }
+.chat-peer {
+  flex: none; display: flex; align-items: center; gap: 10px; flex-wrap: wrap;
+  padding-bottom: 6px; border-bottom: 1px solid var(--border); font-size: 13px;
+}
+/* Flat text log, not bubbles; messages.js pins it to the bottom. */
+.chatlog {
+  flex: 1 1 auto; min-height: 0; overflow: auto;
+  font-family: var(--mono); font-size: 12.5px; line-height: 1.55;
+  padding: 4px 2px; overflow-wrap: anywhere;
+}
+.chat-line { white-space: pre-wrap; }
+.chat-time { color: var(--text-dim); margin-right: 4px; }
+.chat-nick { font-weight: 600; }
+.chat-nick.in { color: var(--accent); }   /* peer — the desktop's blue */
+.chat-nick.out { color: var(--ok); }      /* us — the desktop's green */
+.chat-compose { flex: none; display: flex; gap: 6px; padding-top: 8px; }
+.chat-compose .input { flex: 1 1 auto; min-width: 0; }
+
+/* Unread counter on the nav's Messages button, version dot on About. */
+.tool-btn { position: relative; }
+.tool-badge {
+  position: absolute; top: 2px; right: 2px; min-width: 16px; padding: 0 4px;
+  border-radius: 999px; font-size: 10px; line-height: 16px; font-weight: 700;
+  background: var(--bad); color: var(--accent-contrast); text-align: center;
+}
+.tool-dot {
+  position: absolute; top: 4px; right: 6px;
+  width: 8px; height: 8px; border-radius: 50%; background: var(--bad);
+}
+/* Aggregate dot on the hamburger (mobile-only via .nav-toggle's display). */
+.nav-toggle-dot {
+  position: absolute; top: 6px; right: 6px;
+  width: 8px; height: 8px; border-radius: 50%; background: var(--bad);
+}
+
+/* --- responsive --- */
+@media (max-width: 1100px) {
+  .prefs-groups { column-count: 2; }
+}
+
+@media (max-width: 860px) {
+  /* header shrinks to: hamburger + logo + section name (tools move into the drawer) */
+  .header-tools { display: none; }
+  .route-title { display: block; font-size: 18px; font-weight: 600; }
+  .brand-logo { height: 34px; }
+  .stats-grid { grid-template-columns: 1fr; }
+  .prefs-groups { column-count: 1; }
+
+  /* Downloads on phones: no viewport-fit/splitter. The table stacks and the
+     page scrolls; the detail opens as a full-screen drill-down sheet over the
+     list (below the top bar) so the tap clearly changes the screen and the
+     info is reachable without scrolling past a tall table. */
+  .split-view, .fill-view { height: auto; }
+  .split-view .net-pane, .split-view .net-pane-body, .split-top > .card, .split-view > .card,
+  .fill-view .pane-fill, .fill-view .pane-fill .net-pane-body { flex: 0 0 auto; }
+  .splitter { display: none; }
+  /* !important beats the inline max-height VirtualTable writes ("none" for
+     these callers, since the flex rules above own the height on desktop).
+     Uncapped, the wrap grows to fit every row and the row window — computed
+     from clientHeight — renders the whole list. */
+  .split-view .table-wrap.virtual, .fill-view .table-wrap.virtual { flex: none; min-height: 0; max-height: 60vh !important; }
+  /* Clients has no totals bar to pad it out, so unlike Downloads/Shared its
+     pane stops short and leaves dead space below. Keep the desktop fill: the
+     list grows to the viewport and scrolls internally (on phones the detail is
+     a fixed sheet, so a tall list never hides it). */
+  .fill-view.clients-fill { height: 100%; }
+  .fill-view.clients-fill .pane-fill,
+  .fill-view.clients-fill .pane-fill .net-pane-body { flex: 1 1 auto; }
+  /* The tab strip must not shrink: it is a flex sibling of the (growing) table
+     body, and with overflow-y:hidden any shrink clips the tabs to a sliver. */
+  .fill-view.clients-fill .pane-fill > .tabs { flex: 0 0 auto; }
+  .fill-view.clients-fill .table-wrap.virtual { flex: 1 1 auto; max-height: none !important; }
+  /* Phones: one column, each region capped and scrolling, so the compose box
+     stays on screen below a long friends list. */
+  .msg-split { grid-template-columns: 1fr; height: auto; gap: 14px; }
+  .msg-split .msg-pane, .msg-split .msg-pane-body { flex: 0 0 auto; }
+  .friend-list-wrap { max-height: 30vh; }
+  .msg-split .chat-body { min-height: 0; }
+  .msg-split .chatlog { max-height: 45vh; }
+  /* No room to overlay the nav label in the drawer; sit at the row's end. */
+  .tool-badge, .tool-btn .tool-dot { position: static; margin-left: auto; }
+
+  /* Networks: no splitter on phones — restore the inter-pane gap, let the
+     bottom pane flow, and give the log box back its own height cap. */
+  .net-split { gap: 16px; }
+  .net-split .net-pane:last-child { height: auto !important; flex: 0 0 auto; }
+  .net-split .logbox { flex: none; max-height: 30vh; }
+  .net-split .logbox-sm { max-height: 22vh; }
+  .split-bottom {
+    position: fixed; inset: var(--toolbar-h) 0 0 0; z-index: 60;
+    height: auto !important; overflow: auto;
+    border: none; border-radius: 0; background: var(--surface);
+    animation: sheet-in .18s ease-out;
+  }
+  /* pin the close control to the sheet's top-right so it never scrolls away */
+  .detail-close {
+    position: fixed; top: calc(var(--toolbar-h) + 8px); right: 12px; z-index: 61;
+    background: var(--surface-2); padding: 8px;
+  }
+  .detail-close .icon { width: 18px; height: 18px; }
+  .detail-panel { padding: 16px; }
+  /* let the name wrap to full width; clear the fixed close button */
+  .detail-titlebar { flex-wrap: wrap; padding-right: 40px; }
+  .detail-name { flex-basis: 100%; white-space: normal; }
+  @keyframes sheet-in { from { transform: translateY(12px); opacity: 0; } to { transform: none; opacity: 1; } }
+
+  /* nav collapses into a hamburger-driven side drawer */
+  .app-toolbar .nav-toggle { display: inline-flex; padding: 10px; }
+  .nav {
+    position: fixed; top: var(--toolbar-h); bottom: 0; left: 0;
+    width: min(260px, 80vw);
+    flex-direction: column; gap: 2px; padding: 8px;
+    background: var(--toolbar); border-right: 1px solid var(--border);
+    box-shadow: var(--shadow);
+    transform: translateX(-100%); transition: transform .2s ease;
+    z-index: 80; overflow-y: auto; overflow-x: hidden;
+  }
+  .nav.open { transform: none; }
+  .nav .tool-btn {
+    flex-direction: row; justify-content: flex-start; gap: 10px;
+    min-height: 44px; padding: 8px 12px; width: 100%;
+  }
+  .nav .tool-label { font-size: 14px; }
+  .nav-backdrop {
+    position: fixed; inset: var(--toolbar-h) 0 0 0;
+    background: rgba(0, 0, 0, .35); z-index: 79;
+  }
+  .nav-tools {
+    display: flex; flex-direction: column; gap: 2px;
+    margin-top: auto; padding-top: 8px;
+  }
+  .nav-tools .ed2k-add { padding: 4px 8px; margin-bottom: 4px; }
+  .nav-tools .ed2k-add .btn { justify-content: center; min-height: 34px; border-color: var(--border); flex: 0 0 auto; padding: 0 12px; }
+  .nav-tools .ed2k-input { flex: 1 1 auto; width: 100%; max-width: none; }
+  .nav-tools .btn { justify-content: flex-start; min-height: 44px; border-color: transparent; }
+  /* reveal the buttons' sr-only labels as drawer row text */
+  .nav-tools .sr-only {
+    position: static; width: auto; height: auto; margin: 0;
+    clip: auto; overflow: visible;
+  }
+  /* roomier tap targets in the column picker on touch screens */
+  .col-picker-item { min-height: 40px; padding: 8px 10px; font-size: 14px; }
+}
+@media (max-width: 600px) {
+  .view { padding: 10px; }
+  /* condensed status bar: hide separators (they orphan on wrap) + network info.
+     Unwrap the left/right groups so live + speed share the first line and the
+     wide connection block wraps beneath them. */
+  .statusbar { font-size: 12px; gap: 8px; padding: 6px 10px; }
+  .status-left, .status-right { display: contents; }
+  .statusbar .vsep { display: none; }
+  .status-extra { display: none; }
+  .speeds { gap: 8px; }
+  .status-chip {
+    display: inline-block; max-width: 45vw; vertical-align: middle;
+    overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+  }
+  /* keep a long ed2k server name from overflowing the row */
+  .conn-state {
+    display: inline-block; max-width: 40vw; vertical-align: middle;
+    overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+  }
+}

amule-3.1.0.tar.gz/src/webapi/static/i18n Added

amule-3.1.0.tar.gz/src/webapi/static/i18n/en.json Added

@@ -0,0 +1,1015 @@
+{
+  "common_network_error": "Network error: {message}",
+  "common_err_bad_request": "Invalid request: {message}",
+  "common_err_unauthorized": "Not authorized.",
+  "common_err_forbidden": "Forbidden: {message}",
+  "common_err_not_found": "Not found: {message}",
+  "common_err_method_not_allowed": "Method not allowed.",
+  "common_err_rate_limited": "Too many requests. Please try again later.",
+  "common_err_internal_error": "Server error: {message}",
+  "common_err_ec_unavailable": "No connection to the aMule core ({message})",
+  "common_err_amuled_rejected": "aMule rejected the operation: {message}",
+  "common_err_kad_more_exhausted": "This search cannot be extended any further; run it again for more results.",
+  "common_err_partfile_unsupported": "Verify Local Data is not supported while the file is still downloading.",
+  "common_apierr_Server not added": "Server not added",
+  "common_bulk_partial": "{failed} of {total} failed: {message}",
+  "common_yes": "Yes",
+  "common_no": "No",
+  "common_cancel": "Cancel",
+  "common_close": "Close",
+  "common_legend_current": "Current",
+  "common_legend_session_avg": "Session average",
+  "common_free_space": "Free space:",
+  "common_free_space_temp": "Temp",
+  "common_free_space_incoming": "Incoming",
+  "app_add": "Add",
+  "app_add_ed2k_link": "Add ed2k link",
+  "app_connected": "Connected",
+  "app_connecting": "Connecting…",
+  "app_disconnected": "Disconnected",
+  "app_ed2k": "ED2K",
+  "app_error": "Error",
+  "app_files": "Files",
+  "app_firewalled": "Firewalled",
+  "app_high_id": "HighID",
+  "app_kad": "Kad",
+  "app_language": "Language",
+  "app_live": "live",
+  "app_loading": "Loading…",
+  "app_logout": "Log out",
+  "app_low_id": "LowID",
+  "app_menu": "Menu",
+  "app_menu_alert": "Menu, notifications available",
+  "app_nav_networks": "Networks",
+  "app_nav_search": "Searches",
+  "app_nav_downloads": "Downloads",
+  "app_nav_clients": "Clients",
+  "app_nav_shared": "Shared files",
+  "app_nav_messages": "Messages",
+  "app_nav_stats": "Statistics",
+  "app_nav_preferences": "Preferences",
+  "app_nav_about": "About",
+  "app_not_connected": "Not connected",
+  "app_offline_polling": "Live updates unavailable — polling.",
+  "app_polling": "polling",
+  "app_theme": "Theme",
+  "app_theme_system": "System",
+  "app_theme_light": "Light",
+  "app_theme_dark": "Dark",
+  "app_toast_connecting": "Connecting…",
+  "app_toast_disconnecting": "Disconnecting…",
+  "app_toast_link_added": "Link added",
+  "app_users": "Users",
+  "app_view_error": "Failed to load this section. Please try again.",
+  "app_update_banner": "A new version ({version}) is available.",
+  "about_amuleapi_version": "Web UI version",
+  "about_daemon_version": "Daemon version",
+  "about_api_version": "API version",
+  "about_daemon_disconnected": "not connected",
+  "about_website": "Website",
+  "about_source": "Source code",
+  "about_license": "License",
+  "about_version_mismatch": "Web UI ({ui}) and daemon ({daemon}) versions differ.",
+  "about_alert_tip": "Version notice",
+  "about_load_error": "Could not load version info",
+  "about_update_section": "Updates",
+  "about_update_status": "Status",
+  "about_update_available": "Update available",
+  "about_update_uptodate": "Up to date",
+  "about_update_not_checked": "Not checked yet",
+  "about_update_latest": "Latest version",
+  "about_update_last_checked": "Last checked",
+  "about_update_check_now": "Check now",
+  "about_update_checking": "Checking…",
+  "about_update_check_started": "Version check started",
+  "login_failed": "Login failed",
+  "login_err_invalid_credentials": "Incorrect password.",
+  "login_err_rate_limited": "Too many failed attempts. Please try again later.",
+  "login_err_login_disabled": "Login unavailable: no password is configured on the server.",
+  "login_session_expired": "Your session ended — the server may have restarted. Please sign in again.",
+  "login_title": "aMule Web — Sign in",
+  "login_password": "Password",
+  "login_sign_in": "Sign in",
+  "login_signing_in": "Signing in…",
+  "networks_tab_ed2k": "ED2K",
+  "networks_tab_kad": "Kad",
+  "networks_tab_amule_log": "aMule log",
+  "networks_tab_server_info": "Server info",
+  "networks_tab_ed2k_info": "ED2K info",
+  "networks_tab_kad_info": "Kad info",
+  "networks_server_actions": "Actions",
+  "networks_server_add": "Add server",
+  "networks_server_address": "Address",
+  "networks_server_confirm_remove": "Remove server “{name}”?",
+  "networks_server_connect": "Connect",
+  "networks_server_country": "CC",
+  "networks_server_description": "Description",
+  "networks_server_empty": "Nothing here yet.",
+  "networks_server_error": "Error",
+  "networks_server_files": "Files",
+  "networks_server_failed": "Failed",
+  "networks_server_soft_limit": "Soft limit",
+  "networks_server_hard_limit": "Hard limit",
+  "networks_server_tcp_flags": "TCP flags",
+  "networks_server_udp_flags": "UDP flags",
+  "networks_server_host_port_ph": "host:port",
+  "networks_server_name": "Name",
+  "networks_server_ping": "Ping",
+  "networks_server_prio_low": "Low",
+  "networks_server_prio_normal": "Normal",
+  "networks_server_prio_high": "High",
+  "networks_server_priority": "Priority",
+  "networks_server_remove": "Remove",
+  "networks_server_static": "Static",
+  "networks_server_static_yes": "Yes",
+  "networks_server_static_no": "No",
+  "networks_server_name_ph": "name (optional)",
+  "networks_server_toast_connecting": "Connecting…",
+  "networks_server_toast_enter_host_port": "Enter host:port",
+  "networks_server_toast_added": "Server added",
+  "networks_server_users": "Users",
+  "networks_server_version": "Version",
+  "networks_kad_bootstrap_from_node": "Bootstrap from node",
+  "networks_kad_buddy": "Buddy",
+  "networks_kad_buddy_at": "Connected to buddy at {addr}",
+  "networks_kad_buddy_connecting": "Connecting to buddy",
+  "networks_kad_buddy_none": "No buddy",
+  "networks_kad_buddy_not_needed_tcp": "No buddy required - TCP port open",
+  "networks_kad_buddy_not_needed_udp": "No buddy required - UDP port open",
+  "networks_kad_connected_since": "Connected since",
+  "networks_kad_contacts_nodes": "Contacts (nodes)",
+  "networks_kad_error": "Error",
+  "networks_kad_files": "Files",
+  "networks_kad_firewalled_tcp": "Firewalled (TCP)",
+  "networks_kad_firewalled_udp": "Firewalled (UDP)",
+  "networks_kad_group_connection": "Connection",
+  "networks_kad_group_identity": "Identity",
+  "networks_kad_group_index": "Index",
+  "networks_kad_group_network": "Network",
+  "networks_kad_in_lan_mode": "LAN mode",
+  "networks_kad_indexed_keywords": "Indexed keywords",
+  "networks_kad_indexed_load": "Index load",
+  "networks_kad_indexed_notes": "Indexed notes",
+  "networks_kad_indexed_sources": "Indexed sources",
+  "networks_kad_ip_port_ph": "IP:port (e.g. 1.2.3.4:4672)",
+  "networks_kad_node_id": "Node ID",
+  "networks_kad_nodes": "Kad nodes",
+  "networks_kad_no": "No",
+  "networks_kad_state": "State",
+  "networks_kad_toast_bootstrapping": "Bootstrapping…",
+  "networks_kad_toast_enter_ip_port": "Enter IP:port",
+  "networks_kad_users": "Users",
+  "networks_kad_yes": "Yes",
+  "networks_kad_your_ip": "Your IP",
+  "networks_ed2k_connected": "Connected",
+  "networks_ed2k_connection_type": "Connection Type",
+  "networks_ed2k_ip_port": "Your IP:Port",
+  "networks_ed2k_id": "User ID",
+  "networks_ed2k_connected_since": "Connected since",
+  "networks_ed2k_status": "State",
+  "networks_ed2k_high_id": "HighID",
+  "networks_ed2k_low_id": "LowID",
+  "networks_ed2k_group_connection": "Connection",
+  "networks_ed2k_server": "Server",
+  "networks_ed2k_users": "Users",
+  "networks_ed2k_files": "Files",
+  "networks_ed2k_group_identity": "Identity",
+  "networks_ed2k_group_network": "Network",
+  "networks_ed2k_disconnected": "Disconnected",
+  "networks_log_clear": "Clear",
+  "networks_log_confirm_clear_amule": "Clear the aMule log?",
+  "networks_log_confirm_clear_serverinfo": "Clear the server-info log?",
+  "networks_log_download": "Download log",
+  "networks_log_error": "Error",
+  "networks_log_toast_cleared": "Log cleared",
+  "search_actions": "Actions",
+  "search_download": "Download",
+  "search_empty": "Nothing here yet.",
+  "search_error": "Error",
+  "search_ext_ph": "ext",
+  "search_extension": "Extension",
+  "search_file_type": "File type",
+  "search_filter": "Filter…",
+  "search_guest_readonly": "You are signed in as guest — commands are disabled.",
+  "search_max_size": "Max size",
+  "search_min_availability": "Min availability",
+  "search_min_size": "Min size",
+  "search_name": "Name",
+  "search_query": "Query",
+  "search_rating": "Rating",
+  "search_search": "Search",
+  "search_terms_ph": "Search terms…",
+  "search_searching_fmt": "Searching… {percent}%",
+  "search_select_all": "Select all",
+  "search_selected": "Selected",
+  "search_size": "Size",
+  "search_sources": "Sources",
+  "search_have_no": "Not Have",
+  "search_have_yes": "Already Have",
+  "search_status_downloaded": "Downloaded",
+  "search_status_queued": "Queued",
+  "search_status_canceled": "Canceled",
+  "search_status_queued_canceled": "Queued (canceled)",
+  "search_stop": "Stop",
+  "search_title_sources_total": "Total sources known for this file",
+  "search_title_sources_fmt": "{total} sources, {complete} of them with a complete copy",
+  "table_columns": "Columns",
+  "table_reset_columns": "Reset columns",
+  "search_toast_enter_search_terms": "Enter search terms",
+  "search_toast_no_results_selected": "No results selected",
+  "search_toast_search_started": "Search started",
+  "search_type": "Type",
+  "search_type_global": "Global",
+  "search_type_local": "Local",
+  "search_type_kad": "Kad",
+  "search_update_results": "Update results",
+  "search_tab_close": "Close search",
+  "search_close_all": "Close all",
+  "search_extend": "Extend",
+  "search_extend_title": "Ask the Kad nodes already queried for a wider set of results",
+  "search_extend_kad_only": "Only a Kad search can be extended",
+  "search_extend_finished": "Only a running search can be extended",
+  "search_extend_exhausted": "This search cannot be extended any further; run it again for more results",
+  "search_directory": "Directory",
+  "search_comments": "Comments and ratings",
+  "search_alt_names_title": "Filenames this file is advertised under — the one picked here is what gets downloaded",
+  "search_related": "Related",
+  "search_related_title": "Search files related to the selected ones (answered by the connected eD2k server)",
+  "search_related_tab_fmt": "Related to {count} files",
+  "search_related_unsupported": "The connected eD2k server does not support related searches.",
+  "search_view_files": "View files",
+  "search_type_browse": "Browse",
+  "search_toast_browse_started": "Browsing the peer's shared files — they appear as the peer answers.",
+  "search_toast_more_started": "Asked Kad for more results",
+  "search_toast_freed": "Search “{query}” was closed.",
+  "downloads_actions": "Actions",
+  "downloads_all": "All",
+  "downloads_cancel": "Cancel",
+  "downloads_category": "Category",
+  "downloads_category_none": "Uncategorized",
+  "downloads_clear_completed": "Clear completed",
+  "downloads_clear_this": "Clear",
+  "downloads_col_done": "Done",
+  "downloads_confirm_cancel_download": "Cancel and remove “{name}”?",
+  "downloads_confirm_clear_completed": "Clear all completed downloads from the list?",
+  "downloads_confirm_clear_this": "Clear “{name}” from the list?",
+  "downloads_a4af_swap_this": "Swap all A4AF to this file",
+  "downloads_a4af_swap_others": "Swap A4AF to other files",
+  "downloads_a4af_auto": "Auto swap",
+  "downloads_a4af_swap_source": "Swap this source to this file",
+  "downloads_a4af_tip_swap_this": "Pull every source that has this file but is queued on another one over to this download, right now.",
+  "downloads_a4af_tip_swap_others": "Hand this download's sources over to the other files waiting for them, right now.",
+  "downloads_a4af_tip_auto": "Keep claiming A4AF sources for this file automatically, as they show up.",
+  "downloads_a4af_done": "A4AF sources updated.",
+  "downloads_download_tip": "Download the finished file from the server to this device.",
+  "downloads_empty": "Nothing here yet.",
+  "downloads_error": "Error",
+  "downloads_manage_categories": "Manage categories",
+  "downloads_name": "Name",
+  "downloads_pause": "Pause",
+  "downloads_prio_auto": "Auto",
+  "downloads_priority": "Priority",
+  "downloads_progress": "Progress",
+  "downloads_resume": "Resume",
+  "downloads_stop": "Stop",
+  "downloads_select_all": "Select all",
+  "downloads_size": "Size",
+  "downloads_sources": "Sources",
+  "downloads_speed": "Speed",
+  "downloads_status_label": "Status",
+  "downloads_filter": "Filter…",
+  "downloads_title_transferring_total": "transferring / total",
+  "downloads_detail_gone": "This download is no longer in the queue.",
+  "downloads_detail_loading": "Loading…",
+  "detail_close": "Close",
+  "identity_copy_ed2k": "Copy ED2K link",
+  "identity_copy_magnet": "Copy magnet link",
+  "identity_copy_path": "Copy file path",
+  "downloads_detail_copied": "Link copied to clipboard",
+  "downloads_detail_copy_failed": "Could not copy the link",
+  "downloads_detail_eta": "Remaining",
+  "detail_tab_details": "Details",
+  "detail_tab_clients": "Clients",
+  "detail_tab_comments": "Comments",
+  "detail_tab_filename": "Filename",
+  "filename_none": "No source-reported names yet.",
+  "filename_col_count": "Sources",
+  "filename_takeover": "Take over",
+  "filename_rename_label": "Rename file",
+  "filename_rename_placeholder": "New file name",
+  "rename_saved": "File renamed",
+  "rating_none": "— (comment only)",
+  "rating_0": "Not rated",
+  "rating_1": "Invalid / Corrupt / Fake",
+  "rating_2": "Poor",
+  "rating_3": "Fair",
+  "rating_4": "Good",
+  "rating_5": "Excellent",
+  "comments_your_comment": "Your comment & rating",
+  "comments_placeholder": "Comment (visible to all users, max 50 chars)",
+  "comments_save": "Save",
+  "comments_saved": "Comment saved",
+  "comments_not_shared": "Comments can only be set on a shared file (needs at least one complete part).",
+  "comments_disabled_hint": "You can add a comment and rating once at least one part has finished downloading.",
+  "comments_count_one": "{n} comment",
+  "comments_count_other": "{n} comments",
+  "comments_none": "No comments from sources yet.",
+  "comments_col_username": "Username",
+  "comments_col_rating": "Rating",
+  "comments_col_filename": "File name",
+  "comments_col_comment": "Comment",
+  "comments_get_kad": "Get from Kad",
+  "comments_kad_searching": "Searching Kad…",
+  "comments_kad_started": "Kad search started — results will appear here.",
+  "comments_kad_error": "Could not start a Kad search (is Kad connected?).",
+  "downloads_detail_completed": "Completed",
+  "downloads_detail_available_parts": "Available parts",
+  "downloads_detail_saved_ich": "Saved by ICH",
+  "downloads_detail_lost_corruption": "Lost to corruption",
+  "downloads_detail_gained_compression": "Gained by compression",
+  "downloads_detail_queued": "Clients on queue",
+  "downloads_detail_active_time": "Active time",
+  "downloads_detail_last_seen_complete": "Last seen complete",
+  "downloads_detail_last_changed": "Last received",
+  "identity_hash": "Hash",
+  "downloads_detail_group_transfer": "Transfer",
+  "downloads_detail_group_history": "History",
+  "downloads_detail_group_media": "Media",
+  "downloads_detail_group_integrity": "Integrity",
+  "downloads_detail_group_a4af": "A4AF",
+  "downloads_detail_group_identity": "Identity",
+  "downloads_detail_directory": "Directory",
+  "downloads_detail_part_file": "Part file",
+  "downloads_detail_media_title": "Title",
+  "downloads_detail_media_artist": "Artist",
+  "downloads_detail_media_album": "Album",
+  "downloads_detail_media_codec": "Codec",
+  "downloads_detail_media_length": "Length",
+  "downloads_detail_media_bitrate": "Bitrate",
+  "downloads_detail_transferred": "Transferred",
+  "downloads_detail_ich_unit": "packages",
+  "downloads_detail_tip_status": "Current state of this download.",
+  "downloads_detail_tip_priority": "Download priority for this file. Auto lets aMule pick it from the queue.",
+  "downloads_detail_tip_category": "Category this download is assigned to.",
+  "downloads_detail_tip_a4af": "Sources that hold this file but are currently serving another one (asked for another file). Swapping forces them over.",
+  "downloads_detail_tip_completed": "Amount downloaded and verified so far, with the percentage of the file.",
+  "downloads_detail_tip_speed": "Current download speed.",
+  "downloads_detail_tip_eta": "Estimated time to finish at the current speed.",
+  "downloads_detail_tip_sources": "Sources currently sending data / total sources found.",
+  "downloads_detail_tip_size": "Total size of the complete file.",
+  "downloads_detail_tip_transferred": "Total data received over the network, including protocol overhead and re-downloaded data.",
+  "downloads_detail_tip_active_time": "Total time this download has been active.",
+  "downloads_detail_tip_last_changed": "When data was last received for this file.",
+  "downloads_detail_tip_last_seen_complete": "Last time a full copy of the file was available among the sources.",
+  "downloads_detail_tip_queued": "Clients waiting in your upload queue for this file.",
+  "downloads_detail_tip_media_title": "Title from the file's media metadata.",
+  "downloads_detail_tip_media_artist": "Artist from the file's media metadata.",
+  "downloads_detail_tip_media_album": "Album from the file's media metadata.",
+  "downloads_detail_tip_media_length": "Playback duration of the media.",
+  "downloads_detail_tip_media_bitrate": "Media bitrate.",
+  "downloads_detail_tip_media_codec": "Media codec detected in the file.",
+  "downloads_detail_tip_available_parts": "Parts available from the sources out of the file's total parts.",
+  "downloads_detail_tip_saved_ich": "Packages recovered by ICH (Intelligent Corruption Handling) instead of re-downloading them.",
+  "downloads_detail_tip_lost_corruption": "Data discarded for failing the integrity check and downloaded again.",
+  "downloads_detail_tip_gained_compression": "Data saved thanks to on-the-wire compression.",
+  "identity_tip_hash": "Unique ED2K identifier (MD4) of the file.",
+  "downloads_detail_tip_part_file": "Basename of the local .part file on disk.",
+  "downloads_detail_tip_directory": "Directory the file lives in on disk (Temp while downloading, destination once completed).",
+  "pieces_complete": "Complete",
+  "pieces_available": "Available",
+  "pieces_missing": "Missing",
+  "pieces_fewer": "fewer",
+  "pieces_more": "more",
+  "pieces_hint_sources": "Blue tint shows how many sources have each part (fewer → more)",
+  "pieces_count_one": "{n} piece",
+  "pieces_count_other": "{n} pieces",
+  "downloads_toast_done": "Done",
+  "downloads_toast_no_files_selected": "No files selected",
+  "clients_tab_active": "Active",
+  "clients_tab_downloading": "Downloading",
+  "clients_tab_uploading": "Uploading",
+  "downloads_peer_filter": "Filter…",
+  "downloads_peer_empty": "Nothing here yet.",
+  "downloads_peer_ident": "Ident",
+  "downloads_peer_obfuscation": "Obfuscation",
+  "downloads_peer_enabled": "Enabled",
+  "downloads_peer_friend": "Friend",
+  "downloads_peer_friend_slot": "Friend slot / reserved upload slot",
+  "downloads_peer_queue_full": "Full",
+  "downloads_cat_actions": "Actions",
+  "downloads_cat_add": "Add category",
+  "downloads_cat_cancel": "Cancel",
+  "downloads_cat_name_ph": "Category name",
+  "downloads_cat_color": "Color",
+  "downloads_cat_comment": "Comment",
+  "downloads_cat_comment_ph": "Comment (optional)",
+  "downloads_cat_confirm_delete": "Delete category “{name}”?",
+  "downloads_cat_create": "Create",
+  "downloads_cat_delete": "Delete",
+  "downloads_cat_edit": "Edit",
+  "downloads_cat_edit_title": "Edit category",
+  "downloads_cat_empty": "Nothing here yet.",
+  "downloads_cat_error": "Error",
+  "downloads_cat_incoming_dir": "Incoming Dir",
+  "downloads_cat_incoming_path_ph": "Incoming path (required)",
+  "downloads_cat_name": "Name",
+  "downloads_cat_title": "Categories",
+  "downloads_cat_path": "Path",
+  "downloads_cat_priority": "Priority",
+  "downloads_cat_save": "Save",
+  "downloads_cat_toast_deleted": "Deleted",
+  "downloads_cat_toast_name_path_required": "Name and path are required",
+  "downloads_cat_toast_saved": "Saved",
+  "shared_accepted": "Accepted",
+  "shared_complete_src": "Sources",
+  "shared_download": "Download",
+  "shared_download_tip": "Download this file from the server to this device.",
+  "shared_download_tip_partfile": "Not available yet: only a fully downloaded file can be sent to this device.",
+  "shared_empty": "Nothing here yet.",
+  "shared_error": "Error",
+  "shared_files_count_one": "{n} file",
+  "shared_files_count_other": "{n} files",
+  "shared_name": "Name",
+  "shared_prio_auto": "Auto",
+  "shared_priority": "Priority",
+  "shared_requested": "Requested",
+  "shared_select_all": "Select all",
+  "shared_selected": "Selected",
+  "shared_size": "Size",
+  "shared_toast_done": "Done",
+  "shared_toast_no_files_selected": "No files selected",
+  "shared_verify": "Verify Local Data",
+  "shared_verify_tip": "Re-read the file from disk and check it against its hashset. The result is reported in the aMule log.",
+  "shared_verify_tip_partfile": "Not available while the file is still downloading.",
+  "shared_verify_confirm": "Verify the local data of “{name}”? The whole file is read from disk.",
+  "shared_verify_confirm_selected_one": "Verify the local data of {n} selected file? The whole file is read from disk.",
+  "shared_verify_confirm_selected_other": "Verify the local data of {n} selected files? Every file is read from disk in full.",
+  "shared_verify_started": "Verification started. The result appears in the aMule log.",
+  "shared_verify_started_selected_one": "Verification started for {n} file. The result appears in the aMule log.",
+  "shared_verify_started_selected_other": "Verification started for {n} files. The results appear in the aMule log.",
+  "shared_media_refresh": "Re-extract media metadata",
+  "shared_media_refresh_tip": "Re-probe this file with ffprobe and replace its length, bitrate, codec and tags. Reported in the aMule log.",
+  "shared_media_refresh_tip_partfile": "Not available while the file is still downloading.",
+  "shared_media_refresh_started": "Media metadata re-extraction started. The values update once the probe lands.",
+  "shared_media_refresh_all": "Re-extract media",
+  "shared_media_refresh_all_tip": "Re-probe every shared audio/video file and replace its media metadata. Runs in the background; progress is in the aMule log.",
+  "shared_media_refresh_all_confirm": "Re-extract media metadata for every shared audio/video file? This runs in the background and can take a while on a large share.",
+  "shared_media_refresh_all_started_one": "Re-extracting media metadata for {n} file. Progress is in the aMule log.",
+  "shared_media_refresh_all_started_other": "Re-extracting media metadata for {n} files. Progress is in the aMule log.",
+  "shared_toast_reloading": "Reloading shares…",
+  "shared_refresh_shares": "Refresh shares",
+  "shared_filter": "Filter…",
+  "shared_transferred": "Transferred",
+  "shared_upload_speed": "UL speed",
+  "shared_upload_clients": "UL clients",
+  "shared_status_label": "Status",
+  "shared_status_all": "All Status",
+  "shared_status_uploading": "Uploading",
+  "shared_last_upload": "Last upload",
+  "shared_shared_since": "Shared since",
+  "shared_detail_gone": "This file is no longer shared.",
+  "shared_detail_loading": "Loading…",
+  "shared_detail_uploaded": "Uploaded (session / total)",
+  "shared_detail_upload_speed": "Upload speed",
+  "shared_detail_uploading": "Uploading to",
+  "shared_detail_last_upload": "Last upload",
+  "shared_detail_shared_since": "Shared since",
+  "shared_detail_requested": "Requests (session / total)",
+  "shared_detail_accepted": "Accepted (session / total)",
+  "shared_detail_upload_ratio": "Upload ratio",
+  "shared_detail_complete_src": "Complete sources",
+  "shared_detail_file_type": "File type",
+  "shared_detail_group_sharing": "Sharing",
+  "shared_detail_group_file": "File",
+  "shared_detail_directory": "Directory",
+  "shared_detail_parts": "Parts",
+  "pieces_no_sources": "No sources",
+  "pieces_hint_peers": "Blue tint shows how many peers have each part (fewer → more)",
+  "pieces_no_sources_hint": "Parts no other peer has — you are the only source",
+  "pieces_hashed": "Hashed",
+  "pieces_pending": "Pending",
+  "pieces_hint_hashing": "A re-hash is running over this file's local data; green is already hashed.",
+  "shared_detail_tip_priority": "Upload priority for this file.",
+  "shared_detail_tip_size": "Total size of the file.",
+  "shared_detail_tip_uploaded": "Data uploaded this session / over the file's lifetime.",
+  "shared_detail_tip_upload_speed": "Current combined upload rate for this file, summed over the peers it is uploading to.",
+  "shared_detail_tip_uploading": "Peers this file is actively uploading to right now.",
+  "shared_detail_tip_last_upload": "Last time data was sent for this file. A dash means it has never uploaded.",
+  "shared_detail_tip_shared_since": "When the file was completed or first shared. A dash means it is unknown.",
+  "shared_detail_tip_requested": "Times peers asked for this file this session / total.",
+  "shared_detail_tip_accepted": "Requests granted an upload slot this session / total.",
+  "shared_detail_tip_upload_ratio": "Total data uploaded divided by the file size.",
+  "shared_detail_tip_complete_src": "Estimated peers holding a complete copy. Shown as a range (e.g. 5 – 11), or '< N' as an upper bound, because it is an estimate.",
+  "shared_detail_tip_file_type": "File category derived from the extension.",
+  "shared_detail_tip_directory": "Location of the file on disk.",
+  "shared_detail_tip_parts": "Number of ~9.28 MB parts the file is split into.",
+  "messages_friends": "Friends",
+  "messages_messages": "Messages",
+  "messages_friends_empty": "No friends yet.",
+  "messages_add_friend": "Add a friend",
+  "messages_add_friend_title": "Add a Friend",
+  "messages_field_ip": "IP Address",
+  "messages_field_port": "Port",
+  "messages_field_username": "Username",
+  "messages_field_userhash": "Userhash",
+  "messages_add": "Add",
+  "messages_err_ip_port": "You have to enter a valid IP and port!",
+  "messages_friend_slot": "Establish Friend Slot",
+  "messages_view_files": "View Files",
+  "messages_remove_friend": "Remove Friend",
+  "messages_confirm_remove_friend": "Are you sure that you wish to delete the selected friend?",
+  "messages_send_message": "Send message",
+  "messages_add_to_friends": "Add to Friends",
+  "messages_online": "Connected",
+  "messages_offline": "Offline",
+  "messages_me": "Me",
+  "messages_ph": "Type a message…",
+  "messages_send": "Send",
+  "messages_send_tip": "Sends the specified message.",
+  "messages_close": "Close",
+  "messages_close_tip": "Close this chat-session.",
+  "messages_tab_close": "Close tab",
+  "messages_close_all": "Close all",
+  "messages_empty": "No open conversations. Pick a friend to start chatting.",
+  "messages_unsupported": "The connected aMule daemon does not serve chat sessions.",
+  "messages_unread_tip": "{n} unread",
+  "messages_toast_closed": "Chat with {name} was closed.",
+  "messages_toast_friend_added": "Friend added.",
+  "messages_toast_friend_removed": "Friend removed.",
+  "messages_toast_friend_slot": "Friend slot updated.",
+  "messages_error": "Chat error",
+  "messages_guest_readonly": "You are signed in as guest — commands are disabled.",
+  "stats_connections": "Connections",
+  "stats_download_speed": "Download speed",
+  "stats_empty": "Nothing here yet.",
+  "stats_error": "Error",
+  "stats_legend_active_connections": "Active connections",
+  "stats_legend_active_downloads": "Active downloads",
+  "stats_legend_active_uploads": "Active uploads",
+  "stats_loading": "Loading…",
+  "stats_statistics_tree": "Statistics tree",
+  "stats_upload_speed": "Upload speed",
+  "stats_secs": "secs",
+  "stats_mins": "mins",
+  "stats_hours": "hours",
+  "stats_days": "days",
+  "stats_tree_statistics": "Statistics",
+  "stats_tree_uptime": "Uptime: %s",
+  "stats_tree_transfer": "Transfer",
+  "stats_tree_uploads": "Uploads",
+  "stats_tree_upload_data": "Uploaded Data (Session (Total)): %s",
+  "stats_tree_upload_total_overhead": "Total Overhead (Packets): %s",
+  "stats_tree_upload_filereq_overhead": "File Request Overhead (Packets): %s",
+  "stats_tree_upload_srcexch_overhead": "Source Exchange Overhead (Packets): %s",
+  "stats_tree_upload_server_overhead": "Server Overhead (Packets): %s",
+  "stats_tree_upload_kad_overhead": "Kad Overhead (Packets): %s",
+  "stats_tree_upload_crypt_overhead": "Crypt overhead (UDP): %s",
+  "stats_tree_active_uploads": "Active Uploads: %s",
+  "stats_tree_waiting_uploads": "Waiting Uploads: %s",
+  "stats_tree_upload_sessions_success": "Total successful upload sessions: %s",
+  "stats_tree_upload_sessions_failed": "Total failed upload sessions: %s",
+  "stats_tree_upload_avg_time": "Average upload time: %s",
+  "stats_tree_downloads": "Downloads",
+  "stats_tree_download_data": "Downloaded Data (Session (Total)): %s",
+  "stats_tree_download_total_overhead": "Total Overhead (Packets): %s",
+  "stats_tree_download_filereq_overhead": "File Request Overhead (Packets): %s",
+  "stats_tree_download_srcexch_overhead": "Source Exchange Overhead (Packets): %s",
+  "stats_tree_download_server_overhead": "Server Overhead (Packets): %s",
+  "stats_tree_download_kad_overhead": "Kad Overhead (Packets): %s",
+  "stats_tree_download_crypt_overhead": "Crypt overhead (UDP): %s",
+  "stats_tree_found_sources": "Found Sources: %s",
+  "stats_tree_active_downloads": "Active Downloads (chunks): %s",
+  "stats_tree_ul_dl_ratio": "Session UL:DL Ratio (Total): %s",
+  "stats_tree_connection": "Connection",
+  "stats_tree_avg_download_rate": "Average download rate (Session): %s",
+  "stats_tree_avg_upload_rate": "Average upload rate (Session): %s",
+  "stats_tree_max_download_rate": "Max download rate (Session): %s",
+  "stats_tree_max_upload_rate": "Max upload rate (Session): %s",
+  "stats_tree_reconnects": "Reconnects: %i",
+  "stats_tree_since_first_transfer": "Time Since First Transfer: %s",
+  "stats_tree_connected_since": "Connected To Server Since: %s",
+  "stats_tree_active_connections": "Active Connections (estimate): %i",
+  "stats_tree_max_conn_limit_reached": "Max Connection Limit Reached: %s",
+  "stats_tree_avg_connections": "Average Connections (estimate): %g",
+  "stats_tree_peak_connections": "Peak Connections (estimate): %i",
+  "stats_tree_clients": "Clients",
+  "stats_tree_clients_total": "Total: %i Known: %i",
+  "stats_tree_clients_unknown": "Unknown: %s",
+  "stats_tree_clients_filtered": "Filtered: %s",
+  "stats_tree_clients_banned": "Banned: %s",
+  "stats_tree_clients_kad_banned": "Kad banned addresses: %s",
+  "stats_tree_servers": "Servers",
+  "stats_tree_servers_working": "Working Servers: %i",
+  "stats_tree_servers_failed": "Failed Servers: %i",
+  "stats_tree_servers_total": "Total: %s",
+  "stats_tree_servers_deleted": "Deleted Servers: %s",
+  "stats_tree_servers_filtered": "Filtered Servers: %s",
+  "stats_tree_servers_users_working": "Users on Working Servers: %llu",
+  "stats_tree_servers_files_working": "Files on Working Servers: %llu",
+  "stats_tree_servers_total_users": "Total Users: %llu",
+  "stats_tree_servers_total_files": "Total Files: %llu",
+  "stats_tree_servers_occupation": "Server Occupation: %.2f%%",
+  "stats_tree_shared_files": "Shared Files",
+  "stats_tree_shared_count": "Number of Shared Files: %s",
+  "stats_tree_shared_size": "Total size of Shared Files: %s",
+  "stats_tree_shared_avg_size": "Average file size: %s",
+  "stats_tree_client_versions": "Version",
+  "stats_tree_client_operating_system": "Operating System",
+  "stats_tree_client_version_unknown": "Unknown",
+  "stats_tree_client_os_unknown": "Not Received",
+  "stats_tree_enum_never": "Never",
+  "stats_tree_enum_not_available": "Not available",
+  "prefs_apply": "Apply",
+  "prefs_error": "Error",
+  "prefs_guest_readonly": "You are signed in as guest — commands are disabled.",
+  "prefs_loading": "Loading…",
+  "prefs_toast_saved": "Preferences saved",
+  "search_toast_added_downloads_one": "Added {n} download",
+  "search_toast_added_downloads_other": "Added {n} downloads",
+  "downloads_confirm_cancel_selected_one": "Cancel {n} selected download?",
+  "downloads_confirm_cancel_selected_other": "Cancel {n} selected downloads?",
+  "downloads_files_count_one": "{n} file",
+  "downloads_files_count_other": "{n} files",
+  "downloads_selected": "Selected",
+  "shared_prio_very_low": "Very low",
+  "downloads_prio_low": "Low",
+  "shared_prio_low": "Low",
+  "downloads_prio_normal": "Normal",
+  "shared_prio_normal": "Normal",
+  "downloads_prio_high": "High",
+  "shared_prio_high": "High",
+  "shared_prio_release": "Release",
+  "downloads_status_all": "All Status",
+  "downloads_status_downloading": "Downloading",
+  "downloads_status_waiting": "Waiting",
+  "downloads_status_paused": "Paused",
+  "downloads_status_stopped": "Stopped",
+  "downloads_status_completed": "Completed",
+  "downloads_status_completing": "Completing",
+  "downloads_status_hashing": "Hashing",
+  "downloads_status_allocating": "Allocating",
+  "downloads_status_erroneous": "Error",
+  "downloads_status_insufficient_disk": "Insufficient disk",
+  "downloads_status_unknown": "Unknown",
+  "search_ftype_any": "Any",
+  "search_ftype_audio": "Audio",
+  "search_ftype_video": "Videos",
+  "search_ftype_picture": "Pictures",
+  "search_ftype_text": "Texts",
+  "search_ftype_program": "Programs",
+  "search_ftype_archive": "Archives",
+  "search_ftype_disc_image": "Disc images",
+  "search_ftype_unknown": "Unknown",
+  "downloads_peer_col_country": "CC",
+  "downloads_peer_col_name": "Name",
+  "downloads_peer_col_software": "Software",
+  "downloads_peer_col_address": "Address",
+  "downloads_peer_col_os": "OS",
+  "downloads_peer_col_user_hash": "User hash",
+  "downloads_peer_col_ident": "Ident",
+  "downloads_peer_col_file": "File",
+  "downloads_peer_col_dl_state": "DL state",
+  "downloads_peer_col_dl_speed": "DL speed",
+  "downloads_peer_col_downloaded": "DL total",
+  "downloads_peer_col_downloaded_session": "DL session",
+  "downloads_peer_col_remote_rank": "Remote rank",
+  "downloads_peer_col_ul_state": "UL state",
+  "downloads_peer_col_ul_speed": "UL speed",
+  "downloads_peer_col_uploaded": "UL total",
+  "downloads_peer_col_ratio": "DL/UP modifier",
+  "downloads_peer_col_uploaded_session": "UL session",
+  "downloads_peer_col_queue_pos": "Queue pos.",
+  "downloads_peer_col_score": "Score",
+  "downloads_peer_col_actions": "Actions",
+  "downloads_peer_col_origin": "Origin",
+  "downloads_peer_col_avail": "Avail. parts",
+  "downloads_peer_col_shares": "Shares",
+  "downloads_peer_col_first_seen": "First seen",
+  "downloads_peer_col_last_seen": "Last seen",
+  "downloads_peer_col_sessions": "Sessions",
+  "downloads_peer_a4af": "A4AF",
+  "downloads_peer_origin_local_server": "Local server",
+  "downloads_peer_origin_remote_server": "Remote server",
+  "downloads_peer_origin_kad": "Kad",
+  "downloads_peer_origin_source_exchange": "Source exchange",
+  "downloads_peer_origin_passive": "Passive",
+  "downloads_peer_origin_link": "Link",
+  "downloads_peer_origin_source_seeds": "Source seeds",
+  "downloads_peer_origin_search_result": "Search result",
+  "downloads_peer_origin_unknown": "Unknown",
+  "clients_tab_known": "Known",
+  "clients_online_now": "Online now",
+  "client_detail_loading": "Loading client…",
+  "client_detail_gone": "This client is no longer connected.",
+  "client_detail_tab_general": "General",
+  "client_detail_group_identity": "Identity",
+  "client_detail_group_network": "Network",
+  "client_detail_group_software": "Software",
+  "client_detail_group_transfer": "Transfer",
+  "client_detail_group_files": "Files",
+  "client_detail_group_flags": "Flags",
+  "client_detail_name": "User name",
+  "client_detail_hash": "User hash",
+  "client_detail_id": "User ID",
+  "client_detail_id_high": "HighID",
+  "client_detail_id_low": "LowID",
+  "client_detail_ident": "Identification",
+  "client_detail_ip": "IP : Port",
+  "client_detail_kad": "Kad",
+  "client_detail_kad_on": "Connected",
+  "client_detail_kad_off": "Disconnected",
+  "client_detail_country": "Country",
+  "client_detail_server": "Server",
+  "client_detail_server_name": "Server name",
+  "client_detail_software": "Software",
+  "client_detail_os": "OS",
+  "client_detail_mod": "Mod version",
+  "client_detail_origin": "Origin",
+  "client_detail_obfuscation": "Obfuscation",
+  "client_detail_obf_enabled": "Enabled",
+  "client_detail_obf_supported": "Supported",
+  "client_detail_obf_not_supported": "Not supported",
+  "client_detail_obf_disabled": "Disabled",
+  "client_detail_obf_unknown": "Unknown",
+  "client_detail_dl_state": "Download status",
+  "client_detail_ul_state": "Upload status",
+  "client_detail_dl_speed": "Download speed",
+  "client_detail_ul_speed": "Upload speed",
+  "client_detail_downloaded": "Downloaded (session / total)",
+  "client_detail_uploaded": "Uploaded (session / total)",
+  "client_detail_dl_total": "Total downloaded",
+  "client_detail_ul_total": "Total uploaded",
+  "client_detail_ratio": "DL/UP modifier",
+  "client_detail_tip_ratio": "Credit modifier from your transfer history with this peer, 1 to 10. Higher means you have downloaded more than you uploaded back; 10 is the cap. Not downloaded ÷ uploaded.",
+  "client_detail_queue": "Queue position",
+  "client_detail_score": "Score",
+  "client_detail_progress": "Parts progress",
+  "client_detail_dl_file": "Downloading",
+  "client_detail_ul_file": "Uploading",
+  "client_detail_friend": "Friend",
+  "client_detail_friend_slot": "Friend slot",
+  "client_detail_shares": "Shares file list",
+  "client_detail_first_seen": "First seen",
+  "client_detail_last_seen": "Last seen",
+  "client_detail_sessions": "Sessions",
+  "downloads_peer_ident_all": "All Identity",
+  "downloads_peer_ident_identified": "Identified",
+  "downloads_peer_ident_not_available": "Not available",
+  "downloads_peer_ident_id_needed": "ID needed",
+  "downloads_peer_ident_id_failed": "ID failed",
+  "downloads_peer_ident_bad_guy": "Bad guy",
+  "downloads_peer_ident_unknown": "Unknown",
+  "downloads_peer_soft_emule": "eMule",
+  "downloads_peer_soft_amule": "aMule",
+  "downloads_peer_soft_cdonkey": "cDonkey",
+  "downloads_peer_soft_lxmule": "lxMule",
+  "downloads_peer_soft_shareaza": "Shareaza",
+  "downloads_peer_soft_emule_plus": "eMule Plus",
+  "downloads_peer_soft_hydranode": "HydraNode",
+  "downloads_peer_soft_mldonkey": "MLDonkey",
+  "downloads_peer_soft_lphant": "lphant",
+  "downloads_peer_soft_edonkey_hybrid": "eDonkey Hybrid",
+  "downloads_peer_soft_edonkey": "eDonkey",
+  "downloads_peer_soft_old_emule": "Old eMule",
+  "downloads_peer_soft_compat": "Compatible",
+  "downloads_peer_soft_unknown": "Unknown",
+  "downloads_peer_state_idle": "Idle",
+  "downloads_peer_state_unknown": "Unknown",
+  "downloads_peer_state_connecting": "Connecting…",
+  "downloads_peer_state_connected": "Connected",
+  "downloads_peer_state_downloading": "Downloading",
+  "downloads_peer_state_uploading": "Uploading",
+  "downloads_peer_state_queued": "Queued",
+  "downloads_peer_state_pending": "Pending",
+  "downloads_peer_state_waiting_callback": "Wait callback",
+  "downloads_peer_state_waiting_callback_kad": "Wait callback (Kad)",
+  "downloads_peer_state_low_to_low_ip": "Low-to-low ID",
+  "downloads_peer_state_banned": "Banned",
+  "downloads_peer_state_requesting_hashset": "Req. hashset",
+  "downloads_peer_state_no_needed_parts": "No needed parts",
+  "downloads_peer_state_too_many_connections": "Too many conns",
+  "downloads_peer_state_too_many_connections_kad": "Too many conns (Kad)",
+  "downloads_peer_state_remote_queue_full": "Remote queue full",
+  "downloads_peer_state_error": "Error",
+  "networks_kad_conn_connected": "Connected",
+  "networks_kad_conn_connecting": "Connecting…",
+  "networks_kad_conn_disabled": "Disconnected",
+  "prefs_webui": "WebUI",
+  "prefs_general": "General",
+  "prefs_connection": "Connection",
+  "prefs_directories": "Directories",
+  "prefs_files": "Files",
+  "prefs_servers": "Servers",
+  "prefs_security": "Security",
+  "prefs_message_filter": "Filters",
+  "prefs_remote_controls": "Remote Controls",
+  "prefs_online_signature": "Online Signature",
+  "prefs_advanced": "Advanced",
+  "prefs_proxy": "Proxy",
+  "prefs_geoip": "IP2Country",
+  "prefs_webui_warning": "These settings are stored in your browser, not on the server.",
+  "prefs_group_webui": "Appearance",
+  "prefs_graph_range": "Graph time range",
+  "prefs_graph_range_5m": "5 minutes",
+  "prefs_graph_range_1h": "1 hour",
+  "prefs_graph_range_6h": "6 hours",
+  "prefs_graph_range_24h": "24 hours",
+  "prefs_group_webui_reset": "Reset",
+  "prefs_webui_reset": "Reset Web UI settings",
+  "prefs_webui_reset_hint": "Removes all Web UI settings stored in this browser: language, theme, graph time range, table layouts and panel sizes.",
+  "prefs_webui_reset_confirm": "Reset all Web UI settings stored in this browser?",
+  "prefs_group_general": "General",
+  "prefs_group_bandwidth": "Bandwidth limits",
+  "prefs_group_ports": "Ports",
+  "prefs_group_networks": "Networks",
+  "prefs_group_binding": "Network binding",
+  "prefs_group_conn_limits": "Connection limits",
+  "prefs_group_proxy": "Proxy",
+  "prefs_group_privacy": "Privacy",
+  "prefs_group_server_list": "Server list",
+  "prefs_group_server_conn": "Connection",
+  "prefs_group_kad": "Kademlia",
+  "prefs_group_onlinesig": "Online signature",
+  "prefs_group_tweaks": "Tweaks",
+  "prefs_group_incoming": "Destination folder for downloads",
+  "prefs_group_temp": "Folder for temporary download files",
+  "prefs_group_shared": "Shared folders",
+  "prefs_group_shared_options": "Shared folder options",
+  "prefs_shdir_loading": "Loading shared folders…",
+  "prefs_shdir_error": "Could not load shared folders",
+  "prefs_shdir_empty": "No shared folders configured",
+  "prefs_shdir_col_path": "Path",
+  "prefs_shdir_col_recursive": "Include subfolders",
+  "prefs_shdir_col_actions": "Actions",
+  "prefs_shdir_remove": "Remove",
+  "prefs_shdir_recursive": "Include subfolders",
+  "prefs_shdir_path_ph": "Absolute path to share",
+  "prefs_shdir_add": "Add",
+  "prefs_shdir_toast_added": "Shared folder added",
+  "prefs_shdir_toast_updated": "Shared folder updated",
+  "prefs_shdir_toast_removed": "Shared folder removed",
+  "prefs_group_ich": "Intelligent Corruption Handling (I.C.H.)",
+  "prefs_group_downloads": "Downloads",
+  "prefs_group_uploads": "Uploads",
+  "prefs_group_media": "Media metadata extraction",
+  "prefs_group_obfuscation": "Protocol Obfuscation",
+  "prefs_group_ipfilter": "IP filtering",
+  "prefs_group_messages": "Messages",
+  "prefs_group_comments": "Comments",
+  "prefs_group_amuleapi": "aMule API server",
+  "prefs_group_webserver": "Web server",
+  "prefs_group_geoip_db": "Database",
+  "prefs_group_geoip_status": "Status",
+  "prefs_ed2k_readonly": "ed2k network",
+  "prefs_advanced_warning": "Warning: these are expert settings. Wrong values can degrade performance or connectivity. Change them only if you know what you are doing.",
+  "prefs_opt_proxy_socks5": "SOCKS5",
+  "prefs_opt_proxy_socks4": "SOCKS4",
+  "prefs_opt_proxy_http": "HTTP",
+  "prefs_opt_proxy_socks4a": "SOCKS4a",
+  "prefs_opt_source_dbip": "DB-IP (free, no account)",
+  "prefs_opt_source_maxmind": "MaxMind GeoLite2 (free, account required)",
+  "prefs_opt_source_custom": "Custom URL",
+  "prefs_opt_see_shares_everybody": "Everybody",
+  "prefs_opt_see_shares_friends": "Friends only",
+  "prefs_opt_see_shares_nobody": "Nobody",
+  "prefs_field_general_nickname": "Nickname",
+  "prefs_field_general_version_check_enabled": "Periodically check for a new version",
+  "prefs_field_general_daemon_host_name": "Host name",
+  "prefs_field_general_user_hash": "User hash",
+  "prefs_field_connection_max_download_kibibytes_per_second": "Max download (KiB/s, 0 = unlimited)",
+  "prefs_field_connection_max_upload_kibibytes_per_second": "Max upload (KiB/s, 0 = unlimited)",
+  "prefs_field_connection_upload_slot_min_kibibytes_per_second": "Upload speed per slot (KiB/s)",
+  "prefs_field_connection_tcp_port": "Standard TCP Port",
+  "prefs_field_connection_udp_server_port": "UDP port for server requests (TCP+3)",
+  "prefs_field_connection_udp_port": "Extended UDP port (Kad / global search)",
+  "prefs_field_connection_extended_udp_port_enabled": "Enable Extended UDP port (Kad / global search)",
+  "prefs_field_connection_upnp_enabled": "Enable UPnP for router port forwarding",
+  "prefs_field_connection_upnp_control_point_port": "UPnP TCP Port (Optional)",
+  "prefs_field_connection_bind_address": "Bind local address to IP (empty for any)",
+  "prefs_field_connection_bind_interface": "Bind to network interface (empty for any)",
+  "prefs_field_connection_max_sources_per_file_count": "Max sources per downloading file",
+  "prefs_field_connection_max_connection_count": "Max simultaneous connections",
+  "prefs_field_connection_kad_enabled": "Enable Kad network",
+  "prefs_field_connection_autoconnect": "Autoconnect on startup",
+  "prefs_field_connection_reconnect_on_connection_loss": "Reconnect on loss",
+  "prefs_field_connection_proxy_enabled": "Enable Proxy",
+  "prefs_field_connection_proxy_type": "Proxy type",
+  "prefs_field_connection_proxy_host": "Proxy host",
+  "prefs_field_connection_proxy_port": "Proxy port",
+  "prefs_field_connection_proxy_auth_enabled": "Enable authentication",
+  "prefs_field_connection_proxy_user": "Proxy user",
+  "prefs_field_connection_proxy_password": "Proxy password (leave empty to keep current)",
+  "prefs_field_directories_incoming_path": "Incoming folder",
+  "prefs_field_directories_temp_path": "Temporary folder",
+  "prefs_field_directories_share_hidden": "Share hidden files",
+  "prefs_field_directories_rescan_on_startup": "Automatically rescan shared folders for changes",
+  "prefs_field_directories_follow_symlinks": "Follow symbolic links in shared folders",
+  "prefs_field_directories_exclude_patterns": "Exclude files matching",
+  "prefs_field_directories_exclude_patterns_use_regex": "Patterns are regular expressions",
+  "prefs_field_files_ich_enabled": "Enable I.C.H.",
+  "prefs_field_files_trust_unverified_aich_hashes": "Advanced I.C.H. trusts every hash (not recommended)",
+  "prefs_field_files_add_new_downloads_paused": "Add files to download in pause mode",
+  "prefs_field_files_new_downloads_auto_priority_enabled": "Add files to download with auto priority",
+  "prefs_field_files_prioritize_first_last_chunks": "Try to download first and last chunks first",
+  "prefs_field_files_on_finished_start_next_paused": "Start next paused file when a file completes",
+  "prefs_field_files_on_finished_start_next_in_same_category": "From the same category",
+  "prefs_field_files_on_finished_start_next_alphabetically": "In alphabetic order",
+  "prefs_field_files_endgame_mode_enabled": "Endgame: rotate to faster sources for the final blocks",
+  "prefs_field_files_preallocate_full_file_size": "Preallocate disk space for new files",
+  "prefs_field_files_create_sparse_files": "Create new files as sparse files (allocate disk blocks on demand)",
+  "prefs_field_files_stop_on_low_disk_space": "Stop downloads on low free disk space",
+  "prefs_field_files_min_free_space_mebibytes": "Minimum free disk space (MiB)",
+  "prefs_field_files_save_sources_for_rare_files": "Save 10 sources on rare files (< 20 sources)",
+  "prefs_field_files_new_shared_files_auto_priority_enabled": "Add new shared files with auto priority",
+  "prefs_field_files_media_metadata_enabled": "Extract length / bitrate / codec from shared audio and video files",
+  "prefs_field_files_ffprobe_path": "Path to ffprobe (empty = auto-detect)",
+  "prefs_field_files_mmap_enabled": "Use MMAP: memory-mapped file access (lower memory use)",
+  "prefs_field_servers_remove_dead_servers": "Remove dead servers",
+  "prefs_field_servers_dead_server_retry_count": "Retries before a server is dead",
+  "prefs_field_servers_update_list_at_startup": "Auto-update server list at startup",
+  "prefs_field_servers_update_list_from_server": "Update server list when connecting to a server",
+  "prefs_field_servers_update_list_from_client": "Update server list when a client connects",
+  "prefs_field_servers_server_priority_system_enabled": "Use priority system",
+  "prefs_field_servers_smart_lowid_check_enabled": "Use smart LowID check on connect",
+  "prefs_field_servers_safe_server_connect_enabled": "Safe connect",
+  "prefs_field_servers_autoconnect_static_servers_only": "Autoconnect to servers in static list only",
+  "prefs_field_servers_manual_servers_high_priority": "Set manually added servers to High Priority",
+  "prefs_field_servers_update_url": "Server list update URL",
+  "prefs_field_kad_update_url": "Kad nodes update URL",
+  "prefs_action_enter_url": "Enter a URL",
+  "prefs_action_servers_update": "Download the server list from this URL now and replace the current one",
+  "prefs_action_servers_update_toast": "Updating server list…",
+  "prefs_action_kad_update": "Download the Kad node list from this URL now and replace the current one (Kad restarts)",
+  "prefs_action_kad_update_toast": "Updating Kad node list…",
+  "prefs_action_geoip_update": "Download a fresh GeoIP database now using the source configured above",
+  "prefs_action_geoip_update_toast": "Updating the GeoIP database…",
+  "prefs_action_ipfilter_reload": "Re-read ipfilter.dat and ipfilter_static.dat from amuled's configuration directory",
+  "prefs_action_ipfilter_reload_toast": "Reloading IP filter…",
+  "prefs_action_ipfilter_update": "Download the IP filter from this URL now and replace the current one",
+  "prefs_action_ipfilter_update_toast": "Updating IP filter…",
+  "prefs_field_security_secure_identification_enabled": "Use Secure User Identification",
+  "prefs_field_security_shared_files_visibility": "Who can see my shared files",
+  "prefs_field_security_protocol_obfuscation_enabled": "Support Protocol Obfuscation",
+  "prefs_field_security_obfuscation_requested": "Use obfuscation for outgoing connections",
+  "prefs_field_security_obfuscation_required": "Accept only obfuscated connections",
+  "prefs_field_security_ipfilter_clients_enabled": "Filter clients",
+  "prefs_field_security_ipfilter_servers_enabled": "Filter servers",
+  "prefs_field_security_ipfilter_reload": "Reload list",
+  "prefs_field_security_ipfilter_update_url": "IP filter update URL",
+  "prefs_field_security_ipfilter_auto_update_enabled": "Auto-update IP filter at startup",
+  "prefs_field_security_ipfilter_min_access_level": "Filtering level (0-255)",
+  "prefs_field_security_ipfilter_include_lan_ips": "Always filter LAN IPs",
+  "prefs_field_security_reject_spoofed_source_ips": "Paranoid handling of non-matching IPs",
+  "prefs_field_security_system_ipfilter_enabled": "Use system-wide ipfilter.dat if available",
+  "prefs_field_message_filter_enabled": "Filter incoming messages (except current chat)",
+  "prefs_field_message_filter_filter_all_messages": "Filter all messages",
+  "prefs_field_message_filter_accept_from_friends_only": "Filter messages from people not on your friend list",
+  "prefs_field_message_filter_accept_from_known_clients_only": "Filter messages from unknown clients",
+  "prefs_field_message_filter_filter_by_keyword": "Filter messages containing keywords",
+  "prefs_field_message_filter_keywords": "Keywords (use ',' as separator)",
+  "prefs_field_message_filter_log_filtered_messages": "Show received messages in the log",
+  "prefs_field_message_filter_filter_comments": "Filter comments containing keywords",
+  "prefs_field_message_filter_comment_keywords": "Keywords (use ',' as separator)",
+  "prefs_field_remote_controls_amuleapi_enabled": "Run amuleapi (REST API) on startup",
+  "prefs_field_remote_controls_amuleapi_port": "HTTP port",
+  "prefs_field_remote_controls_amuleapi_bind_address": "Listening IP",
+  "prefs_creds_current": "Current admin password",
+  "prefs_creds_admin": "New admin password (leave empty to keep current)",
+  "prefs_creds_guest_enabled": "Enable guest access",
+  "prefs_creds_guest": "Guest password (leave empty to keep current)",
+  "prefs_creds_guest_needs_password": "Guest access needs a password.",
+  "prefs_creds_hint": "Type a password to set or change it. Stored passwords cannot be shown, so leaving this empty keeps the current one.",
+  "prefs_creds_guest_hint": "Guest sessions may read status and listings but cannot change anything. Turning this off clears the stored guest password.",
+  "prefs_creds_apply": "Change passwords",
+  "prefs_creds_saved": "Passwords updated. All other sessions have been signed out.",
+  "prefs_field_remote_controls_webserver_enabled": "Run webserver on startup (deprecated)",
+  "prefs_field_remote_controls_webserver_template_name": "Web template",
+  "prefs_field_remote_controls_webserver_password": "Web full-rights password (leave empty to keep current)",
+  "prefs_field_remote_controls_webserver_guest_enabled": "Enable low-rights guest user",
+  "prefs_field_remote_controls_webserver_guest_password": "Web guest password (leave empty to keep current)",
+  "prefs_field_remote_controls_webserver_port": "Web server TCP port",
+  "prefs_field_remote_controls_webserver_gzip_enabled": "Enable Gzip compression",
+  "prefs_field_remote_controls_webserver_refresh_seconds": "Page refresh time (seconds)",
+  "prefs_field_online_signature_enabled": "Enable online signature",
+  "prefs_field_online_signature_update_frequency_seconds": "Update frequency (seconds)",
+  "prefs_field_online_signature_directory": "Save online signature file in",
+  "prefs_field_advanced_max_new_connections_per_5_seconds": "Max new connections / 5 secs",
+  "prefs_field_advanced_kad_max_concurrent_source_search_count": "Concurrent Kad source lookups",
+  "prefs_field_advanced_kad_source_reask_minutes": "Kad source re-search interval (minutes)",
+  "prefs_field_advanced_source_reask_minutes": "Source re-ask interval (minutes)",
+  "prefs_field_advanced_file_buffer_bytes": "File buffer size (bytes)",
+  "prefs_field_advanced_max_upload_queue_client_count": "Upload queue size",
+  "prefs_field_advanced_server_keepalive_timeout_minutes": "Server connection refresh interval (minutes, 0 = disable)",
+  "prefs_field_advanced_verbose_logging": "Enable verbose debug logging",
+  "prefs_field_geoip_enabled": "Show country flags for clients",
+  "prefs_field_geoip_source": "Source",
+  "prefs_field_geoip_custom_update_url": "Custom download URL",
+  "prefs_field_geoip_maxmind_license": "MaxMind license key",
+  "prefs_field_geoip_auto_update_enabled": "Auto-update on startup",
+  "prefs_field_geoip_update_now": "Update database now",
+  "prefs_field_geoip_loaded_source": "Loaded source",
+  "prefs_field_geoip_db_path": "Database path",
+  "prefs_field_geoip_db_loaded": "Database loaded",
+  "prefs_field_geoip_download_in_progress": "Downloading",
+  "prefs_field_geoip_last_update_status": "Last result"
+}

amule-3.1.0.tar.gz/src/webapi/static/i18n/es.json Added

@@ -0,0 +1,1015 @@
+{
+  "common_network_error": "Error de red: {message}",
+  "common_err_bad_request": "Petición no válida: {message}",
+  "common_err_unauthorized": "No autorizado.",
+  "common_err_forbidden": "Prohibido: {message}",
+  "common_err_not_found": "No encontrado: {message}",
+  "common_err_method_not_allowed": "Método no permitido.",
+  "common_err_rate_limited": "Demasiadas peticiones. Inténtalo de nuevo más tarde.",
+  "common_err_internal_error": "Error del servidor: {message}",
+  "common_err_ec_unavailable": "Sin conexión con el núcleo de aMule ({message})",
+  "common_err_amuled_rejected": "aMule rechazó la operación: {message}",
+  "common_err_kad_more_exhausted": "Esta búsqueda ya no se puede ampliar más; vuelve a lanzarla para obtener más resultados.",
+  "common_err_partfile_unsupported": "La verificación de datos locales no está disponible mientras el archivo se está descargando.",
+  "common_apierr_Server not added": "Servidor no añadido",
+  "common_bulk_partial": "{failed} de {total} fallaron: {message}",
+  "common_yes": "Sí",
+  "common_no": "No",
+  "common_cancel": "Cancelar",
+  "common_close": "Cerrar",
+  "common_legend_current": "Actual",
+  "common_legend_session_avg": "Media de la sesión",
+  "common_free_space": "Espacio libre:",
+  "common_free_space_temp": "Temporal",
+  "common_free_space_incoming": "Entrada",
+  "app_add": "Añadir",
+  "app_add_ed2k_link": "Añadir enlace ed2k",
+  "app_connected": "Conectado",
+  "app_connecting": "Conectando…",
+  "app_disconnected": "Desconectado",
+  "app_ed2k": "ED2K",
+  "app_error": "Error",
+  "app_files": "Archivos",
+  "app_firewalled": "Tras cortafuegos",
+  "app_high_id": "Id Alta",
+  "app_kad": "Kad",
+  "app_language": "Idioma",
+  "app_live": "en vivo",
+  "app_loading": "Cargando…",
+  "app_logout": "Cerrar sesión",
+  "app_low_id": "Id Baja",
+  "app_menu": "Menú",
+  "app_menu_alert": "Menú, hay notificaciones",
+  "app_nav_networks": "Redes",
+  "app_nav_search": "Búsquedas",
+  "app_nav_downloads": "Descargas",
+  "app_nav_clients": "Clientes",
+  "app_nav_shared": "Compartidos",
+  "app_nav_messages": "Mensajes",
+  "app_nav_stats": "Estadísticas",
+  "app_nav_preferences": "Preferencias",
+  "app_nav_about": "Acerca de",
+  "app_not_connected": "No conectado",
+  "app_offline_polling": "Actualizaciones en vivo no disponibles — sondeando.",
+  "app_polling": "sondeo",
+  "app_theme": "Tema",
+  "app_theme_system": "Sistema",
+  "app_theme_light": "Claro",
+  "app_theme_dark": "Oscuro",
+  "app_toast_connecting": "Conectando…",
+  "app_toast_disconnecting": "Desconectando…",
+  "app_toast_link_added": "Enlace añadido",
+  "app_users": "Usuarios",
+  "app_view_error": "No se pudo cargar esta sección. Inténtalo de nuevo.",
+  "app_update_banner": "Hay una nueva versión ({version}) disponible.",
+  "about_amuleapi_version": "Versión de la Web UI",
+  "about_daemon_version": "Versión del daemon",
+  "about_api_version": "Versión de la API",
+  "about_daemon_disconnected": "no conectado",
+  "about_website": "Sitio web",
+  "about_source": "Código fuente",
+  "about_license": "Licencia",
+  "about_version_mismatch": "Las versiones de la Web UI ({ui}) y del daemon ({daemon}) no coinciden.",
+  "about_alert_tip": "Aviso de versión",
+  "about_load_error": "No se pudo cargar la información de versión",
+  "about_update_section": "Actualizaciones",
+  "about_update_status": "Estado",
+  "about_update_available": "Actualización disponible",
+  "about_update_uptodate": "Actualizado",
+  "about_update_not_checked": "Sin comprobar todavía",
+  "about_update_latest": "Última versión",
+  "about_update_last_checked": "Última comprobación",
+  "about_update_check_now": "Comprobar ahora",
+  "about_update_checking": "Comprobando…",
+  "about_update_check_started": "Comprobación de versión iniciada",
+  "login_failed": "Error de inicio de sesión",
+  "login_err_invalid_credentials": "Contraseña incorrecta.",
+  "login_err_rate_limited": "Demasiados intentos fallidos. Inténtalo de nuevo más tarde.",
+  "login_err_login_disabled": "Inicio de sesión no disponible: no hay ninguna contraseña configurada en el servidor.",
+  "login_session_expired": "Tu sesión ha terminado — puede que el servidor se haya reiniciado. Inicia sesión de nuevo.",
+  "login_title": "aMule Web — Iniciar sesión",
+  "login_password": "Contraseña",
+  "login_sign_in": "Iniciar sesión",
+  "login_signing_in": "Iniciando sesión…",
+  "networks_tab_ed2k": "ED2K",
+  "networks_tab_kad": "Kad",
+  "networks_tab_amule_log": "Registro de aMule",
+  "networks_tab_server_info": "Info del servidor",
+  "networks_tab_ed2k_info": "Info ED2K",
+  "networks_tab_kad_info": "Info Kad",
+  "networks_server_actions": "Acciones",
+  "networks_server_add": "Añadir servidor",
+  "networks_server_address": "Dirección",
+  "networks_server_confirm_remove": "¿Eliminar el servidor «{name}»?",
+  "networks_server_connect": "Conectar",
+  "networks_server_country": "País",
+  "networks_server_description": "Descripción",
+  "networks_server_empty": "Aún no hay nada aquí.",
+  "networks_server_error": "Error",
+  "networks_server_files": "Archivos",
+  "networks_server_failed": "Fallos",
+  "networks_server_soft_limit": "Límite soft",
+  "networks_server_hard_limit": "Límite hard",
+  "networks_server_tcp_flags": "Flags TCP",
+  "networks_server_udp_flags": "Flags UDP",
+  "networks_server_host_port_ph": "host:puerto",
+  "networks_server_name": "Nombre",
+  "networks_server_ping": "Ping",
+  "networks_server_prio_low": "Baja",
+  "networks_server_prio_normal": "Normal",
+  "networks_server_prio_high": "Alta",
+  "networks_server_priority": "Prioridad",
+  "networks_server_remove": "Eliminar",
+  "networks_server_static": "Estático",
+  "networks_server_static_yes": "Sí",
+  "networks_server_static_no": "No",
+  "networks_server_name_ph": "nombre (opcional)",
+  "networks_server_toast_connecting": "Conectando…",
+  "networks_server_toast_enter_host_port": "Introduce host:puerto",
+  "networks_server_toast_added": "Servidor añadido",
+  "networks_server_users": "Usuarios",
+  "networks_server_version": "Versión",
+  "networks_kad_bootstrap_from_node": "Bootstrap desde nodo",
+  "networks_kad_buddy": "Compañero",
+  "networks_kad_buddy_at": "Conectado al compañero en {addr}",
+  "networks_kad_buddy_connecting": "Conectando con el compañero",
+  "networks_kad_buddy_none": "Sin compañero",
+  "networks_kad_buddy_not_needed_tcp": "No se necesita compañero - puerto TCP abierto",
+  "networks_kad_buddy_not_needed_udp": "No se necesita compañero - puerto UDP abierto",
+  "networks_kad_connected_since": "Conectado desde",
+  "networks_kad_contacts_nodes": "Contactos (nodos)",
+  "networks_kad_error": "Error",
+  "networks_kad_files": "Archivos",
+  "networks_kad_firewalled_tcp": "Tras cortafuegos (TCP)",
+  "networks_kad_firewalled_udp": "Tras cortafuegos (UDP)",
+  "networks_kad_group_connection": "Conexión",
+  "networks_kad_group_identity": "Identidad",
+  "networks_kad_group_index": "Índice",
+  "networks_kad_group_network": "Red",
+  "networks_kad_in_lan_mode": "Modo LAN",
+  "networks_kad_indexed_keywords": "Palabras clave indexadas",
+  "networks_kad_indexed_load": "Carga del índice",
+  "networks_kad_indexed_notes": "Notas indexadas",
+  "networks_kad_indexed_sources": "Fuentes indexadas",
+  "networks_kad_ip_port_ph": "IP:puerto (p. ej. 1.2.3.4:4672)",
+  "networks_kad_node_id": "ID de nodo",
+  "networks_kad_nodes": "Nodos Kad",
+  "networks_kad_no": "No",
+  "networks_kad_state": "Estado",
+  "networks_kad_toast_bootstrapping": "Arrancando (bootstrap)…",
+  "networks_kad_toast_enter_ip_port": "Introduce IP:puerto",
+  "networks_kad_users": "Usuarios",
+  "networks_kad_yes": "Sí",
+  "networks_kad_your_ip": "Tu IP",
+  "networks_ed2k_connected": "Conectado",
+  "networks_ed2k_connection_type": "Tipo de conexión",
+  "networks_ed2k_ip_port": "Tu IP:Puerto",
+  "networks_ed2k_id": "ID de usuario",
+  "networks_ed2k_connected_since": "Conectado desde",
+  "networks_ed2k_status": "Estado",
+  "networks_ed2k_high_id": "Id Alta",
+  "networks_ed2k_low_id": "Id Baja",
+  "networks_ed2k_group_connection": "Conexión",
+  "networks_ed2k_server": "Servidor",
+  "networks_ed2k_users": "Usuarios",
+  "networks_ed2k_files": "Archivos",
+  "networks_ed2k_group_identity": "Identidad",
+  "networks_ed2k_group_network": "Red",
+  "networks_ed2k_disconnected": "Desconectado",
+  "networks_log_clear": "Limpiar",
+  "networks_log_confirm_clear_amule": "¿Limpiar el registro de aMule?",
+  "networks_log_confirm_clear_serverinfo": "¿Limpiar el registro de info del servidor?",
+  "networks_log_download": "Descargar registro",
+  "networks_log_error": "Error",
+  "networks_log_toast_cleared": "Registro limpiado",
+  "search_actions": "Acciones",
+  "search_download": "Descargar",
+  "search_empty": "Aún no hay nada aquí.",
+  "search_error": "Error",
+  "search_ext_ph": "ext",
+  "search_extension": "Extensión",
+  "search_file_type": "Tipo de archivo",
+  "search_filter": "Filtrar…",
+  "search_guest_readonly": "Has iniciado sesión como invitado — los comandos están desactivados.",
+  "search_max_size": "Tamaño máx.",
+  "search_min_availability": "Disponibilidad mín.",
+  "search_min_size": "Tamaño mín.",
+  "search_name": "Nombre",
+  "search_query": "Búsqueda",
+  "search_rating": "Valoración",
+  "search_search": "Buscar",
+  "search_terms_ph": "Términos de búsqueda…",
+  "search_searching_fmt": "Buscando… {percent}%",
+  "search_select_all": "Seleccionar todo",
+  "search_selected": "Seleccionados",
+  "search_size": "Tamaño",
+  "search_sources": "Fuentes",
+  "search_have_no": "No lo tengo",
+  "search_have_yes": "Ya lo tengo",
+  "search_status_downloaded": "Descargado",
+  "search_status_queued": "En cola",
+  "search_status_canceled": "Cancelado",
+  "search_status_queued_canceled": "En cola (cancelado)",
+  "search_stop": "Detener",
+  "search_title_sources_total": "Fuentes totales conocidas de este archivo",
+  "search_title_sources_fmt": "{total} fuentes, {complete} de ellas con una copia completa",
+  "table_columns": "Columnas",
+  "table_reset_columns": "Restablecer columnas",
+  "search_toast_enter_search_terms": "Introduce términos de búsqueda",
+  "search_toast_no_results_selected": "No hay resultados seleccionados",
+  "search_toast_search_started": "Búsqueda iniciada",
+  "search_type": "Tipo",
+  "search_type_global": "Global",
+  "search_type_local": "Local",
+  "search_type_kad": "Kad",
+  "search_update_results": "Actualizar resultados",
+  "search_tab_close": "Cerrar búsqueda",
+  "search_close_all": "Cerrar todas",
+  "search_extend": "Ampliar",
+  "search_extend_title": "Pide un conjunto de resultados más amplio a los nodos Kad ya consultados",
+  "search_extend_kad_only": "Solo se puede ampliar una búsqueda Kad",
+  "search_extend_finished": "Solo se puede ampliar una búsqueda en curso",
+  "search_extend_exhausted": "Esta búsqueda ya no se puede ampliar más; vuelve a lanzarla para obtener más resultados",
+  "search_directory": "Directorio",
+  "search_comments": "Comentarios y valoraciones",
+  "search_alt_names_title": "Nombres con los que se ofrece este archivo; se descarga con el que elijas aquí",
+  "search_related": "Relacionados",
+  "search_related_title": "Buscar archivos relacionados con los seleccionados (lo responde el servidor eD2k conectado)",
+  "search_related_tab_fmt": "Relacionados con {count} archivos",
+  "search_related_unsupported": "El servidor eD2k conectado no admite la búsqueda de archivos relacionados.",
+  "search_view_files": "Ver archivos",
+  "search_type_browse": "Explorar",
+  "search_toast_browse_started": "Explorando los archivos compartidos del par: aparecerán según responda.",
+  "search_toast_more_started": "Se han pedido más resultados a Kad",
+  "search_toast_freed": "La búsqueda «{query}» se ha cerrado.",
+  "downloads_actions": "Acciones",
+  "downloads_all": "Todas",
+  "downloads_cancel": "Cancelar",
+  "downloads_category": "Categoría",
+  "downloads_category_none": "Sin categoría",
+  "downloads_clear_completed": "Limpiar completadas",
+  "downloads_clear_this": "Limpiar",
+  "downloads_col_done": "Completado",
+  "downloads_confirm_cancel_download": "¿Cancelar y eliminar «{name}»?",
+  "downloads_confirm_clear_completed": "¿Quitar de la lista todas las descargas completadas?",
+  "downloads_confirm_clear_this": "¿Quitar «{name}» de la lista?",
+  "downloads_a4af_swap_this": "Traer todas las A4AF a este archivo",
+  "downloads_a4af_swap_others": "Ceder las A4AF a otros archivos",
+  "downloads_a4af_auto": "Intercambio automático",
+  "downloads_a4af_swap_source": "Traer esta fuente a este archivo",
+  "downloads_a4af_tip_swap_this": "Trae ahora mismo a esta descarga todas las fuentes que tienen este archivo pero están en la cola de otro.",
+  "downloads_a4af_tip_swap_others": "Cede ahora mismo las fuentes de esta descarga a los otros archivos que las están esperando.",
+  "downloads_a4af_tip_auto": "Reclama automáticamente para este archivo las fuentes A4AF según vayan apareciendo.",
+  "downloads_a4af_done": "Fuentes A4AF actualizadas.",
+  "downloads_download_tip": "Descarga el archivo terminado desde el servidor a este dispositivo.",
+  "downloads_empty": "Aún no hay nada aquí.",
+  "downloads_error": "Error",
+  "downloads_manage_categories": "Gestionar categorías",
+  "downloads_name": "Nombre",
+  "downloads_pause": "Pausar",
+  "downloads_prio_auto": "Auto",
+  "downloads_priority": "Prioridad",
+  "downloads_progress": "Progreso",
+  "downloads_resume": "Reanudar",
+  "downloads_stop": "Detener",
+  "downloads_select_all": "Seleccionar todo",
+  "downloads_size": "Tamaño",
+  "downloads_sources": "Fuentes",
+  "downloads_speed": "Velocidad",
+  "downloads_status_label": "Estado",
+  "downloads_filter": "Filtrar…",
+  "downloads_title_transferring_total": "transfiriendo / total",
+  "downloads_detail_gone": "Esta descarga ya no está en la cola.",
+  "downloads_detail_loading": "Cargando…",
+  "detail_close": "Cerrar",
+  "identity_copy_ed2k": "Copiar enlace ED2K",
+  "identity_copy_magnet": "Copiar enlace magnet",
+  "identity_copy_path": "Copiar ruta del archivo",
+  "downloads_detail_copied": "Enlace copiado al portapapeles",
+  "downloads_detail_copy_failed": "No se pudo copiar el enlace",
+  "downloads_detail_eta": "Tiempo restante",
+  "detail_tab_details": "Detalles",
+  "detail_tab_clients": "Clientes",
+  "detail_tab_comments": "Comentarios",
+  "detail_tab_filename": "Nombre",
+  "filename_none": "Todavía no hay nombres reportados por las fuentes.",
+  "filename_col_count": "Fuentes",
+  "filename_takeover": "Adoptar",
+  "filename_rename_label": "Renombrar fichero",
+  "filename_rename_placeholder": "Nuevo nombre de fichero",
+  "rename_saved": "Fichero renombrado",
+  "rating_none": "— (solo comentario)",
+  "rating_0": "Sin valorar",
+  "rating_1": "Inválido / Corrupto / Falso",
+  "rating_2": "Malo",
+  "rating_3": "Aceptable",
+  "rating_4": "Bueno",
+  "rating_5": "Excelente",
+  "comments_your_comment": "Tu comentario y valoración",
+  "comments_placeholder": "Comentario (visible para todos, máx. 50 caracteres)",
+  "comments_save": "Guardar",
+  "comments_saved": "Comentario guardado",
+  "comments_not_shared": "El comentario solo se puede fijar en un archivo compartido (necesita al menos una parte completa).",
+  "comments_disabled_hint": "Podrás añadir un comentario y una valoración cuando se haya descargado al menos una parte.",
+  "comments_count_one": "{n} comentario",
+  "comments_count_other": "{n} comentarios",
+  "comments_none": "Todavía no hay comentarios de fuentes.",
+  "comments_col_username": "Usuario",
+  "comments_col_rating": "Valoración",
+  "comments_col_filename": "Nombre de archivo",
+  "comments_col_comment": "Comentario",
+  "comments_get_kad": "Obtener de Kad",
+  "comments_kad_searching": "Buscando en Kad…",
+  "comments_kad_started": "Búsqueda en Kad iniciada — los resultados aparecerán aquí.",
+  "comments_kad_error": "No se pudo iniciar la búsqueda en Kad (¿está Kad conectado?).",
+  "downloads_detail_completed": "Completado",
+  "downloads_detail_available_parts": "Partes disponibles",
+  "downloads_detail_saved_ich": "Recuperado por ICH",
+  "downloads_detail_lost_corruption": "Perdido por corrupción",
+  "downloads_detail_gained_compression": "Ganado por compresión",
+  "downloads_detail_queued": "Clientes en cola",
+  "downloads_detail_active_time": "Tiempo activo",
+  "downloads_detail_last_seen_complete": "Visto completo por última vez",
+  "downloads_detail_last_changed": "Última recepción",
+  "identity_hash": "Hash",
+  "downloads_detail_group_transfer": "Transferencia",
+  "downloads_detail_group_history": "Historial",
+  "downloads_detail_group_media": "Medios",
+  "downloads_detail_group_integrity": "Integridad",
+  "downloads_detail_group_a4af": "A4AF",
+  "downloads_detail_group_identity": "Identidad",
+  "downloads_detail_directory": "Directorio",
+  "downloads_detail_part_file": "Archivo part",
+  "downloads_detail_media_title": "Título",
+  "downloads_detail_media_artist": "Artista",
+  "downloads_detail_media_album": "Álbum",
+  "downloads_detail_media_codec": "Códec",
+  "downloads_detail_media_length": "Duración",
+  "downloads_detail_media_bitrate": "Tasa de bits",
+  "downloads_detail_transferred": "Transferido",
+  "downloads_detail_ich_unit": "paquetes",
+  "downloads_detail_tip_status": "Estado actual de esta descarga.",
+  "downloads_detail_tip_priority": "Prioridad de descarga de este archivo. Auto deja que aMule la elija según la cola.",
+  "downloads_detail_tip_category": "Categoría a la que está asignada esta descarga.",
+  "downloads_detail_tip_a4af": "Fuentes que tienen este archivo pero ahora mismo están sirviendo otro (A4AF, del inglés «asked for another file»). El intercambio las fuerza a este.",
+  "downloads_detail_tip_completed": "Cantidad descargada y verificada hasta ahora, con el porcentaje del archivo.",
+  "downloads_detail_tip_speed": "Velocidad de descarga actual.",
+  "downloads_detail_tip_eta": "Tiempo estimado para terminar a la velocidad actual.",
+  "downloads_detail_tip_sources": "Fuentes que envían datos ahora / total de fuentes encontradas.",
+  "downloads_detail_tip_size": "Tamaño total del archivo completo.",
+  "downloads_detail_tip_transferred": "Datos totales recibidos por la red, incluyendo la sobrecarga del protocolo y datos redescargados.",
+  "downloads_detail_tip_active_time": "Tiempo total que esta descarga ha estado activa.",
+  "downloads_detail_tip_last_changed": "Cuándo se recibieron datos por última vez para este archivo.",
+  "downloads_detail_tip_last_seen_complete": "Última vez que hubo una copia completa del archivo disponible entre las fuentes.",
+  "downloads_detail_tip_queued": "Clientes esperando en tu cola de subida para este archivo.",
+  "downloads_detail_tip_media_title": "Título de los metadatos multimedia del archivo.",
+  "downloads_detail_tip_media_artist": "Artista de los metadatos multimedia del archivo.",
+  "downloads_detail_tip_media_album": "Álbum de los metadatos multimedia del archivo.",
+  "downloads_detail_tip_media_length": "Duración de reproducción del contenido.",
+  "downloads_detail_tip_media_bitrate": "Tasa de bits del contenido.",
+  "downloads_detail_tip_media_codec": "Códec detectado en el archivo.",
+  "downloads_detail_tip_available_parts": "Partes disponibles en las fuentes sobre el total de partes del archivo.",
+  "downloads_detail_tip_saved_ich": "Paquetes recuperados por ICH (gestión inteligente de corrupción) en vez de volver a descargarlos.",
+  "downloads_detail_tip_lost_corruption": "Datos descartados por no pasar la verificación de integridad y vueltos a descargar.",
+  "downloads_detail_tip_gained_compression": "Datos ahorrados gracias a la compresión en la transferencia.",
+  "identity_tip_hash": "Identificador ED2K único (MD4) del archivo.",
+  "downloads_detail_tip_part_file": "Nombre del archivo .part local en disco.",
+  "downloads_detail_tip_directory": "Directorio donde se encuentra el archivo en disco (carpeta temporal durante la descarga, destino una vez completada).",
+  "pieces_complete": "Completa",
+  "pieces_available": "Disponible",
+  "pieces_missing": "Ausente",
+  "pieces_fewer": "menos",
+  "pieces_more": "más",
+  "pieces_hint_sources": "El tono azul indica cuántas fuentes tienen cada pieza (menos → más)",
+  "pieces_count_one": "{n} pieza",
+  "pieces_count_other": "{n} piezas",
+  "downloads_toast_done": "Hecho",
+  "downloads_toast_no_files_selected": "No hay archivos seleccionados",
+  "clients_tab_active": "Activos",
+  "clients_tab_downloading": "Descargando",
+  "clients_tab_uploading": "Subiendo",
+  "downloads_peer_filter": "Filtrar…",
+  "downloads_peer_empty": "Aún no hay nada aquí.",
+  "downloads_peer_ident": "Ident",
+  "downloads_peer_obfuscation": "Ofuscación",
+  "downloads_peer_enabled": "Activada",
+  "downloads_peer_friend": "Amigo",
+  "downloads_peer_friend_slot": "Hueco de amigo / subida reservada",
+  "downloads_peer_queue_full": "Llena",
+  "downloads_cat_actions": "Acciones",
+  "downloads_cat_add": "Añadir categoría",
+  "downloads_cat_cancel": "Cancelar",
+  "downloads_cat_name_ph": "Nombre de la categoría",
+  "downloads_cat_color": "Color",
+  "downloads_cat_comment": "Comentario",
+  "downloads_cat_comment_ph": "Comentario (opcional)",
+  "downloads_cat_confirm_delete": "¿Borrar la categoría «{name}»?",
+  "downloads_cat_create": "Crear",
+  "downloads_cat_delete": "Borrar",
+  "downloads_cat_edit": "Editar",
+  "downloads_cat_edit_title": "Editar categoría",
+  "downloads_cat_empty": "Aún no hay nada aquí.",
+  "downloads_cat_error": "Error",
+  "downloads_cat_incoming_dir": "Directorio de entrada",
+  "downloads_cat_incoming_path_ph": "Ruta de entrada (obligatoria)",
+  "downloads_cat_name": "Nombre",
+  "downloads_cat_title": "Categorías",
+  "downloads_cat_path": "Ruta",
+  "downloads_cat_priority": "Prioridad",
+  "downloads_cat_save": "Guardar",
+  "downloads_cat_toast_deleted": "Borrado",
+  "downloads_cat_toast_name_path_required": "El nombre y la ruta son obligatorios",
+  "downloads_cat_toast_saved": "Guardado",
+  "shared_accepted": "Aceptado",
+  "shared_complete_src": "Fuentes",
+  "shared_download": "Descargar",
+  "shared_download_tip": "Descarga este archivo desde el servidor a este dispositivo.",
+  "shared_download_tip_partfile": "Aún no disponible: solo se puede enviar a este dispositivo un archivo descargado por completo.",
+  "shared_empty": "Aún no hay nada aquí.",
+  "shared_error": "Error",
+  "shared_files_count_one": "{n} archivo",
+  "shared_files_count_other": "{n} archivos",
+  "shared_name": "Nombre",
+  "shared_prio_auto": "Auto",
+  "shared_priority": "Prioridad",
+  "shared_requested": "Solicitado",
+  "shared_select_all": "Seleccionar todo",
+  "shared_selected": "Seleccionados",
+  "shared_size": "Tamaño",
+  "shared_toast_done": "Hecho",
+  "shared_toast_no_files_selected": "No hay archivos seleccionados",
+  "shared_verify": "Verificar datos locales",
+  "shared_verify_tip": "Vuelve a leer el archivo del disco y lo comprueba contra su conjunto de hashes. El resultado se informa en el registro de aMule.",
+  "shared_verify_tip_partfile": "No disponible mientras el archivo se está descargando.",
+  "shared_verify_confirm": "¿Verificar los datos locales de «{name}»? Se leerá el archivo completo del disco.",
+  "shared_verify_confirm_selected_one": "¿Verificar los datos locales de {n} archivo seleccionado? Se leerá el archivo completo del disco.",
+  "shared_verify_confirm_selected_other": "¿Verificar los datos locales de {n} archivos seleccionados? Se leerá cada archivo completo del disco.",
+  "shared_verify_started": "Verificación iniciada. El resultado aparecerá en el registro de aMule.",
+  "shared_verify_started_selected_one": "Verificación iniciada para {n} archivo. El resultado aparecerá en el registro de aMule.",
+  "shared_verify_started_selected_other": "Verificación iniciada para {n} archivos. Los resultados aparecerán en el registro de aMule.",
+  "shared_media_refresh": "Volver a extraer metadatos",
+  "shared_media_refresh_tip": "Vuelve a analizar este archivo con ffprobe y reemplaza su duración, tasa de bits, códec y etiquetas. Se informa en el registro de aMule.",
+  "shared_media_refresh_tip_partfile": "No disponible mientras el archivo se está descargando.",
+  "shared_media_refresh_started": "Reextracción de metadatos iniciada. Los valores se actualizarán cuando termine el análisis.",
+  "shared_media_refresh_all": "Reextraer metadatos",
+  "shared_media_refresh_all_tip": "Vuelve a analizar cada archivo de audio/vídeo compartido y reemplaza sus metadatos. Se ejecuta en segundo plano; el progreso aparece en el registro de aMule.",
+  "shared_media_refresh_all_confirm": "¿Volver a extraer los metadatos de todos los archivos de audio/vídeo compartidos? Se ejecuta en segundo plano y puede tardar en una biblioteca grande.",
+  "shared_media_refresh_all_started_one": "Reextrayendo metadatos de {n} archivo. El progreso aparece en el registro de aMule.",
+  "shared_media_refresh_all_started_other": "Reextrayendo metadatos de {n} archivos. El progreso aparece en el registro de aMule.",
+  "shared_toast_reloading": "Recargando compartidos…",
+  "shared_refresh_shares": "Actualizar compartidos",
+  "shared_filter": "Filtrar…",
+  "shared_transferred": "Transferido",
+  "shared_upload_speed": "Vel. UL",
+  "shared_upload_clients": "Clientes UL",
+  "shared_status_label": "Estado",
+  "shared_status_all": "Todos los estados",
+  "shared_status_uploading": "Subiendo",
+  "shared_last_upload": "Última subida",
+  "shared_shared_since": "Compartido desde",
+  "shared_detail_gone": "Este archivo ya no está compartido.",
+  "shared_detail_loading": "Cargando…",
+  "shared_detail_uploaded": "Subido (sesión / total)",
+  "shared_detail_upload_speed": "Velocidad de subida",
+  "shared_detail_uploading": "Subiendo a",
+  "shared_detail_last_upload": "Última subida",
+  "shared_detail_shared_since": "Compartido desde",
+  "shared_detail_requested": "Peticiones (sesión / total)",
+  "shared_detail_accepted": "Aceptadas (sesión / total)",
+  "shared_detail_upload_ratio": "Ratio de subida",
+  "shared_detail_complete_src": "Fuentes completas",
+  "shared_detail_file_type": "Tipo de archivo",
+  "shared_detail_group_sharing": "Compartición",
+  "shared_detail_group_file": "Archivo",
+  "shared_detail_directory": "Directorio",
+  "shared_detail_parts": "Partes",
+  "pieces_no_sources": "Sin fuentes",
+  "pieces_hint_peers": "El tono azul indica cuántos pares tienen cada parte (menos → más)",
+  "pieces_no_sources_hint": "Partes que ningún otro par tiene: eres la única fuente",
+  "pieces_hashed": "Procesadas",
+  "pieces_pending": "Pendientes",
+  "pieces_hint_hashing": "Se está recalculando el hash de los datos locales de este archivo; la parte verde ya está comprobada.",
+  "shared_detail_tip_priority": "Prioridad de subida de este archivo.",
+  "shared_detail_tip_size": "Tamaño total del archivo.",
+  "shared_detail_tip_uploaded": "Datos subidos en esta sesión / durante la vida del archivo.",
+  "shared_detail_tip_upload_speed": "Velocidad de subida actual del archivo, sumando los clientes a los que se está enviando.",
+  "shared_detail_tip_uploading": "Clientes a los que se está subiendo este archivo ahora mismo.",
+  "shared_detail_tip_last_upload": "Última vez que se enviaron datos de este archivo. Un guion indica que nunca se ha subido.",
+  "shared_detail_tip_shared_since": "Cuándo se completó o se compartió el archivo por primera vez. Un guion indica que es desconocido.",
+  "shared_detail_tip_requested": "Veces que otros pares han pedido el archivo esta sesión / en total.",
+  "shared_detail_tip_accepted": "Peticiones a las que se concedió una ranura de subida esta sesión / en total.",
+  "shared_detail_tip_upload_ratio": "Datos totales subidos divididos por el tamaño del archivo.",
+  "shared_detail_tip_complete_src": "Pares estimados con una copia completa. Se muestra como un rango (p. ej. 5 – 11), o «< N» como cota superior, por ser una estimación.",
+  "shared_detail_tip_file_type": "Categoría del archivo según su extensión.",
+  "shared_detail_tip_directory": "Ubicación del archivo en disco.",
+  "shared_detail_tip_parts": "Número de partes de ~9,28 MB en que se divide el archivo.",
+  "messages_friends": "Amigos",
+  "messages_messages": "Mensajes",
+  "messages_friends_empty": "Todavía no hay amigos.",
+  "messages_add_friend": "Añadir un amigo",
+  "messages_add_friend_title": "Añadir un amigo",
+  "messages_field_ip": "Dirección IP",
+  "messages_field_port": "Puerto",
+  "messages_field_username": "Nombre de usuario",
+  "messages_field_userhash": "Hash de usuario",
+  "messages_add": "Añadir",
+  "messages_err_ip_port": "¡Tienes que introducir una IP y un puerto válidos!",
+  "messages_friend_slot": "Establecer ranura de amigo",
+  "messages_view_files": "Ver archivos",
+  "messages_remove_friend": "Eliminar amigo",
+  "messages_confirm_remove_friend": "¿Seguro que quieres eliminar el amigo seleccionado?",
+  "messages_send_message": "Enviar mensaje",
+  "messages_add_to_friends": "Añadir a amigos",
+  "messages_online": "Conectado",
+  "messages_offline": "Desconectado",
+  "messages_me": "Yo",
+  "messages_ph": "Escribe un mensaje…",
+  "messages_send": "Enviar",
+  "messages_send_tip": "Envía el mensaje indicado.",
+  "messages_close": "Cerrar",
+  "messages_close_tip": "Cierra esta sesión de chat.",
+  "messages_tab_close": "Cerrar pestaña",
+  "messages_close_all": "Cerrar todas",
+  "messages_empty": "No hay conversaciones abiertas. Elige un amigo para empezar a chatear.",
+  "messages_unsupported": "El demonio de aMule conectado no ofrece sesiones de chat.",
+  "messages_unread_tip": "{n} sin leer",
+  "messages_toast_closed": "Se cerró el chat con {name}.",
+  "messages_toast_friend_added": "Amigo añadido.",
+  "messages_toast_friend_removed": "Amigo eliminado.",
+  "messages_toast_friend_slot": "Ranura de amigo actualizada.",
+  "messages_error": "Error de chat",
+  "messages_guest_readonly": "Has iniciado sesión como invitado — los comandos están desactivados.",
+  "stats_connections": "Conexiones",
+  "stats_download_speed": "Velocidad de descarga",
+  "stats_empty": "Aún no hay nada aquí.",
+  "stats_error": "Error",
+  "stats_legend_active_connections": "Conexiones activas",
+  "stats_legend_active_downloads": "Descargas activas",
+  "stats_legend_active_uploads": "Subidas activas",
+  "stats_loading": "Cargando…",
+  "stats_statistics_tree": "Árbol de estadísticas",
+  "stats_upload_speed": "Velocidad de subida",
+  "stats_secs": "segs",
+  "stats_mins": "mins",
+  "stats_hours": "horas",
+  "stats_days": "días",
+  "stats_tree_statistics": "Estadísticas",
+  "stats_tree_uptime": "Tiempo en ejecución: %s",
+  "stats_tree_transfer": "Transferencia",
+  "stats_tree_uploads": "Subidas",
+  "stats_tree_upload_data": "Datos subidos (sesión (total)): %s",
+  "stats_tree_upload_total_overhead": "Tráfico adicional total (paquetes): %s",
+  "stats_tree_upload_filereq_overhead": "Tráfico adicional por peticiones de archivos (paquetes): %s",
+  "stats_tree_upload_srcexch_overhead": "Tráfico adicional por intercambio de fuentes (paquetes): %s",
+  "stats_tree_upload_server_overhead": "Tráfico adicional del servidor (paquetes): %s",
+  "stats_tree_upload_kad_overhead": "Tráfico adicional por Kad (paquetes): %s",
+  "stats_tree_upload_crypt_overhead": "Tráfico adicional por el cifrado (UDP): %s",
+  "stats_tree_active_uploads": "Subidas activas: %s",
+  "stats_tree_waiting_uploads": "Subidas en espera: %s",
+  "stats_tree_upload_sessions_success": "Total de sesiones de subida satisfactorias: %s",
+  "stats_tree_upload_sessions_failed": "Total de sesiones de subida erróneas: %s",
+  "stats_tree_upload_avg_time": "Tiempo medio de subida: %s",
+  "stats_tree_downloads": "Descargas",
+  "stats_tree_download_data": "Datos descargados (sesión (total)): %s",
+  "stats_tree_download_total_overhead": "Tráfico adicional total (paquetes): %s",
+  "stats_tree_download_filereq_overhead": "Tráfico adicional por peticiones de archivos (paquetes): %s",
+  "stats_tree_download_srcexch_overhead": "Tráfico adicional por intercambio de fuentes (paquetes): %s",
+  "stats_tree_download_server_overhead": "Tráfico adicional del servidor (paquetes): %s",
+  "stats_tree_download_kad_overhead": "Tráfico adicional por Kad (paquetes): %s",
+  "stats_tree_download_crypt_overhead": "Tráfico adicional por el cifrado (UDP): %s",
+  "stats_tree_found_sources": "Fuentes encontradas: %s",
+  "stats_tree_active_downloads": "Descargas activas (trozos): %s",
+  "stats_tree_ul_dl_ratio": "Índice de UL:DL de la sesión (total): %s",
+  "stats_tree_connection": "Conexión",
+  "stats_tree_avg_download_rate": "Velocidad media de descarga (sesión): %s",
+  "stats_tree_avg_upload_rate": "Velocidad media de subida (sesión): %s",
+  "stats_tree_max_download_rate": "Velocidad máxima de descarga (sesión): %s",
+  "stats_tree_max_upload_rate": "Velocidad máxima de subida (sesión): %s",
+  "stats_tree_reconnects": "Reconexiones: %i",
+  "stats_tree_since_first_transfer": "Tiempo desde la primera transferencia: %s",
+  "stats_tree_connected_since": "Conectado al servidor desde hace: %s",
+  "stats_tree_active_connections": "Conexiones activas (estimado): %i",
+  "stats_tree_max_conn_limit_reached": "Alcanzado límite máximo de conexiones: %s",
+  "stats_tree_avg_connections": "Media de conexiones (estimada): %g",
+  "stats_tree_peak_connections": "Pico de conexiones (estimado): %i",
+  "stats_tree_clients": "Clientes",
+  "stats_tree_clients_total": "Total: %i, conocidos: %i",
+  "stats_tree_clients_unknown": "Desconocidos: %s",
+  "stats_tree_clients_filtered": "Filtrados: %s",
+  "stats_tree_clients_banned": "Bloqueados: %s",
+  "stats_tree_clients_kad_banned": "Direcciones bloqueadas en Kad: %s",
+  "stats_tree_servers": "Servidores",
+  "stats_tree_servers_working": "Servidores activos: %i",
+  "stats_tree_servers_failed": "Servidores caídos: %i",
+  "stats_tree_servers_total": "Total: %s",
+  "stats_tree_servers_deleted": "Servidores borrados: %s",
+  "stats_tree_servers_filtered": "Servidores filtrados: %s",
+  "stats_tree_servers_users_working": "Usuarios en servidores activos: %llu",
+  "stats_tree_servers_files_working": "Archivos en servidores activos: %llu",
+  "stats_tree_servers_total_users": "Total de usuarios: %llu",
+  "stats_tree_servers_total_files": "Total de archivos: %llu",
+  "stats_tree_servers_occupation": "Ocupación de servidores: %.2f%%",
+  "stats_tree_shared_files": "Compartidos",
+  "stats_tree_shared_count": "Número de archivos compartidos: %s",
+  "stats_tree_shared_size": "Tamaño total de los archivos compartidos: %s",
+  "stats_tree_shared_avg_size": "Tamaño medio de archivo: %s",
+  "stats_tree_client_versions": "Versión",
+  "stats_tree_client_operating_system": "Sistema operativo",
+  "stats_tree_client_version_unknown": "Desconocido",
+  "stats_tree_client_os_unknown": "No recibido",
+  "stats_tree_enum_never": "Nunca",
+  "stats_tree_enum_not_available": "No disponible",
+  "prefs_apply": "Aplicar",
+  "prefs_error": "Error",
+  "prefs_guest_readonly": "Has iniciado sesión como invitado — los comandos están desactivados.",
+  "prefs_loading": "Cargando…",
+  "prefs_toast_saved": "Preferencias guardadas",
+  "search_toast_added_downloads_one": "Añadida {n} descarga",
+  "search_toast_added_downloads_other": "Añadidas {n} descargas",
+  "downloads_confirm_cancel_selected_one": "¿Cancelar {n} descarga seleccionada?",
+  "downloads_confirm_cancel_selected_other": "¿Cancelar {n} descargas seleccionadas?",
+  "downloads_files_count_one": "{n} archivo",
+  "downloads_files_count_other": "{n} archivos",
+  "downloads_selected": "Seleccionados",
+  "shared_prio_very_low": "Muy baja",
+  "downloads_prio_low": "Baja",
+  "shared_prio_low": "Baja",
+  "downloads_prio_normal": "Normal",
+  "shared_prio_normal": "Normal",
+  "downloads_prio_high": "Alta",
+  "shared_prio_high": "Alta",
+  "shared_prio_release": "Lanzamiento",
+  "downloads_status_all": "Todos los estados",
+  "downloads_status_downloading": "Descargando",
+  "downloads_status_waiting": "Esperando",
+  "downloads_status_paused": "Pausado",
+  "downloads_status_stopped": "Detenido",
+  "downloads_status_completed": "Completado",
+  "downloads_status_completing": "Completando",
+  "downloads_status_hashing": "Calculando hash",
+  "downloads_status_allocating": "Asignando espacio",
+  "downloads_status_erroneous": "Error",
+  "downloads_status_insufficient_disk": "Disco insuficiente",
+  "downloads_status_unknown": "Desconocido",
+  "search_ftype_any": "Todos",
+  "search_ftype_audio": "Audio",
+  "search_ftype_video": "Vídeos",
+  "search_ftype_picture": "Imágenes",
+  "search_ftype_text": "Textos",
+  "search_ftype_program": "Programas",
+  "search_ftype_archive": "Archivos comprimidos",
+  "search_ftype_disc_image": "Imágenes de CD",
+  "search_ftype_unknown": "Desconocido",
+  "downloads_peer_col_country": "País",
+  "downloads_peer_col_name": "Nombre",
+  "downloads_peer_col_software": "Software",
+  "downloads_peer_col_address": "Dirección",
+  "downloads_peer_col_os": "SO",
+  "downloads_peer_col_user_hash": "Hash de usuario",
+  "downloads_peer_col_ident": "Ident",
+  "downloads_peer_col_file": "Archivo",
+  "downloads_peer_col_dl_state": "Estado DL",
+  "downloads_peer_col_dl_speed": "Vel. DL",
+  "downloads_peer_col_downloaded": "DL total",
+  "downloads_peer_col_downloaded_session": "DL sesión",
+  "downloads_peer_col_remote_rank": "Rank remoto",
+  "downloads_peer_col_ul_state": "Estado UL",
+  "downloads_peer_col_ul_speed": "Vel. UL",
+  "downloads_peer_col_uploaded": "UL total",
+  "downloads_peer_col_ratio": "Modificador DL/UP",
+  "downloads_peer_col_uploaded_session": "UL sesión",
+  "downloads_peer_col_queue_pos": "Pos. cola",
+  "downloads_peer_col_score": "Puntuación",
+  "downloads_peer_col_actions": "Acciones",
+  "downloads_peer_col_origin": "Origen",
+  "downloads_peer_col_avail": "Partes disp.",
+  "downloads_peer_col_shares": "Comparte",
+  "downloads_peer_col_first_seen": "Primera vez",
+  "downloads_peer_col_last_seen": "Última vez",
+  "downloads_peer_col_sessions": "Sesiones",
+  "downloads_peer_a4af": "A4AF",
+  "downloads_peer_origin_local_server": "Servidor local",
+  "downloads_peer_origin_remote_server": "Servidor remoto",
+  "downloads_peer_origin_kad": "Kad",
+  "downloads_peer_origin_source_exchange": "Intercambio de fuentes",
+  "downloads_peer_origin_passive": "Pasivo",
+  "downloads_peer_origin_link": "Enlace",
+  "downloads_peer_origin_source_seeds": "Semillas de fuentes",
+  "downloads_peer_origin_search_result": "Resultado de búsqueda",
+  "downloads_peer_origin_unknown": "Desconocido",
+  "clients_tab_known": "Conocidos",
+  "clients_online_now": "En línea ahora",
+  "client_detail_loading": "Cargando cliente…",
+  "client_detail_gone": "Este cliente ya no está conectado.",
+  "client_detail_tab_general": "General",
+  "client_detail_group_identity": "Identidad",
+  "client_detail_group_network": "Red",
+  "client_detail_group_software": "Software",
+  "client_detail_group_transfer": "Transferencia",
+  "client_detail_group_files": "Ficheros",
+  "client_detail_group_flags": "Indicadores",
+  "client_detail_name": "Nombre de usuario",
+  "client_detail_hash": "Hash de usuario",
+  "client_detail_id": "ID de usuario",
+  "client_detail_id_high": "Id Alta",
+  "client_detail_id_low": "Id Baja",
+  "client_detail_ident": "Identificación",
+  "client_detail_ip": "IP : Puerto",
+  "client_detail_kad": "Kad",
+  "client_detail_kad_on": "Conectado",
+  "client_detail_kad_off": "Desconectado",
+  "client_detail_country": "País",
+  "client_detail_server": "Servidor",
+  "client_detail_server_name": "Nombre del servidor",
+  "client_detail_software": "Software",
+  "client_detail_os": "SO",
+  "client_detail_mod": "Versión mod",
+  "client_detail_origin": "Origen",
+  "client_detail_obfuscation": "Ofuscación",
+  "client_detail_obf_enabled": "Activada",
+  "client_detail_obf_supported": "Soportada",
+  "client_detail_obf_not_supported": "No soportada",
+  "client_detail_obf_disabled": "Desactivada",
+  "client_detail_obf_unknown": "Desconocida",
+  "client_detail_dl_state": "Estado de descarga",
+  "client_detail_ul_state": "Estado de subida",
+  "client_detail_dl_speed": "Velocidad de descarga",
+  "client_detail_ul_speed": "Velocidad de subida",
+  "client_detail_downloaded": "Descargado (sesión / total)",
+  "client_detail_uploaded": "Subido (sesión / total)",
+  "client_detail_dl_total": "Total descargado",
+  "client_detail_ul_total": "Total subido",
+  "client_detail_ratio": "Modificador DL/UP",
+  "client_detail_tip_ratio": "Modificador de crédito según tu historial de transferencia con este par, de 1 a 10. Cuanto más alto, más has descargado respecto a lo que has subido; 10 es el máximo. No es descargado ÷ subido.",
+  "client_detail_queue": "Posición en cola",
+  "client_detail_score": "Puntuación",
+  "client_detail_progress": "Progreso de partes",
+  "client_detail_dl_file": "Descargando",
+  "client_detail_ul_file": "Subiendo",
+  "client_detail_friend": "Amigo",
+  "client_detail_friend_slot": "Ranura de amigo",
+  "client_detail_shares": "Lista de compartidos",
+  "client_detail_first_seen": "Primera vez visto",
+  "client_detail_last_seen": "Última vez visto",
+  "client_detail_sessions": "Sesiones",
+  "downloads_peer_ident_all": "Todas las identidades",
+  "downloads_peer_ident_identified": "Identificado",
+  "downloads_peer_ident_not_available": "No disponible",
+  "downloads_peer_ident_id_needed": "Requiere ID",
+  "downloads_peer_ident_id_failed": "ID fallida",
+  "downloads_peer_ident_bad_guy": "Sospechoso",
+  "downloads_peer_ident_unknown": "Desconocido",
+  "downloads_peer_soft_emule": "eMule",
+  "downloads_peer_soft_amule": "aMule",
+  "downloads_peer_soft_cdonkey": "cDonkey",
+  "downloads_peer_soft_lxmule": "lxMule",
+  "downloads_peer_soft_shareaza": "Shareaza",
+  "downloads_peer_soft_emule_plus": "eMule Plus",
+  "downloads_peer_soft_hydranode": "HydraNode",
+  "downloads_peer_soft_mldonkey": "MLDonkey",
+  "downloads_peer_soft_lphant": "lphant",
+  "downloads_peer_soft_edonkey_hybrid": "eDonkey Híbrido",
+  "downloads_peer_soft_edonkey": "eDonkey",
+  "downloads_peer_soft_old_emule": "eMule antiguo",
+  "downloads_peer_soft_compat": "Compatible",
+  "downloads_peer_soft_unknown": "Desconocido",
+  "downloads_peer_state_idle": "Inactivo",
+  "downloads_peer_state_unknown": "Desconocido",
+  "downloads_peer_state_connecting": "Conectando…",
+  "downloads_peer_state_connected": "Conectado",
+  "downloads_peer_state_downloading": "Descargando",
+  "downloads_peer_state_uploading": "Subiendo",
+  "downloads_peer_state_queued": "En cola",
+  "downloads_peer_state_pending": "Pendiente",
+  "downloads_peer_state_waiting_callback": "Esperando callback",
+  "downloads_peer_state_waiting_callback_kad": "Esperando callback (Kad)",
+  "downloads_peer_state_low_to_low_ip": "Low-to-low ID",
+  "downloads_peer_state_banned": "Bloqueado",
+  "downloads_peer_state_requesting_hashset": "Pidiendo hashset",
+  "downloads_peer_state_no_needed_parts": "Sin partes necesarias",
+  "downloads_peer_state_too_many_connections": "Demasiadas conexiones",
+  "downloads_peer_state_too_many_connections_kad": "Demasiadas conexiones (Kad)",
+  "downloads_peer_state_remote_queue_full": "Cola remota llena",
+  "downloads_peer_state_error": "Error",
+  "networks_kad_conn_connected": "Conectado",
+  "networks_kad_conn_connecting": "Conectando…",
+  "networks_kad_conn_disabled": "Desconectado",
+  "prefs_webui": "WebUI",
+  "prefs_general": "General",
+  "prefs_connection": "Conexión",
+  "prefs_directories": "Directorios",
+  "prefs_files": "Archivos",
+  "prefs_servers": "Servidores",
+  "prefs_security": "Seguridad",
+  "prefs_message_filter": "Filtros",
+  "prefs_remote_controls": "Controles remotos",
+  "prefs_online_signature": "Firma en línea",
+  "prefs_advanced": "Avanzado",
+  "prefs_proxy": "Proxy",
+  "prefs_geoip": "IP2Country",
+  "prefs_webui_warning": "Estos ajustes se guardan en tu navegador, no en el servidor.",
+  "prefs_group_webui": "Apariencia",
+  "prefs_graph_range": "Rango temporal de las gráficas",
+  "prefs_graph_range_5m": "5 minutos",
+  "prefs_graph_range_1h": "1 hora",
+  "prefs_graph_range_6h": "6 horas",
+  "prefs_graph_range_24h": "24 horas",
+  "prefs_group_webui_reset": "Restaurar",
+  "prefs_webui_reset": "Restaurar configuración de la Web UI",
+  "prefs_webui_reset_hint": "Elimina toda la configuración de la Web UI guardada en este navegador: idioma, tema, rango temporal de las gráficas, columnas de las tablas y tamaños de los paneles.",
+  "prefs_webui_reset_confirm": "¿Restaurar toda la configuración de la Web UI guardada en este navegador?",
+  "prefs_group_general": "General",
+  "prefs_group_bandwidth": "Límites de ancho de banda",
+  "prefs_group_ports": "Puertos",
+  "prefs_group_networks": "Redes",
+  "prefs_group_binding": "Vinculación de red",
+  "prefs_group_conn_limits": "Límites de conexión",
+  "prefs_group_proxy": "Proxy",
+  "prefs_group_privacy": "Privacidad",
+  "prefs_group_server_list": "Lista de servidores",
+  "prefs_group_server_conn": "Conexión",
+  "prefs_group_kad": "Kademlia",
+  "prefs_group_onlinesig": "Firma en línea",
+  "prefs_group_tweaks": "Ajustes",
+  "prefs_group_incoming": "Carpeta de destino de las descargas",
+  "prefs_group_temp": "Carpeta de archivos temporales",
+  "prefs_group_shared": "Carpetas compartidas",
+  "prefs_group_shared_options": "Opciones de carpetas compartidas",
+  "prefs_shdir_loading": "Cargando carpetas compartidas…",
+  "prefs_shdir_error": "No se pudieron cargar las carpetas compartidas",
+  "prefs_shdir_empty": "No hay carpetas compartidas configuradas",
+  "prefs_shdir_col_path": "Ruta",
+  "prefs_shdir_col_recursive": "Incluir subcarpetas",
+  "prefs_shdir_col_actions": "Acciones",
+  "prefs_shdir_remove": "Eliminar",
+  "prefs_shdir_recursive": "Incluir subcarpetas",
+  "prefs_shdir_path_ph": "Ruta absoluta a compartir",
+  "prefs_shdir_add": "Añadir",
+  "prefs_shdir_toast_added": "Carpeta compartida añadida",
+  "prefs_shdir_toast_updated": "Carpeta compartida actualizada",
+  "prefs_shdir_toast_removed": "Carpeta compartida eliminada",
+  "prefs_group_ich": "Gestión inteligente de corrupción (I.C.H.)",
+  "prefs_group_downloads": "Descargas",
+  "prefs_group_uploads": "Subidas",
+  "prefs_group_media": "Extracción de metadatos multimedia",
+  "prefs_group_obfuscation": "Ofuscación de protocolo",
+  "prefs_group_ipfilter": "Filtrado de IP",
+  "prefs_group_messages": "Mensajes",
+  "prefs_group_comments": "Comentarios",
+  "prefs_group_amuleapi": "Servidor aMule API",
+  "prefs_group_webserver": "Servidor web",
+  "prefs_group_geoip_db": "Base de datos",
+  "prefs_group_geoip_status": "Estado",
+  "prefs_ed2k_readonly": "Red ed2k",
+  "prefs_advanced_warning": "Advertencia: estos son ajustes para expertos. Valores incorrectos pueden degradar el rendimiento o la conectividad. Cámbialos solo si sabes lo que haces.",
+  "prefs_opt_proxy_socks5": "SOCKS5",
+  "prefs_opt_proxy_socks4": "SOCKS4",
+  "prefs_opt_proxy_http": "HTTP",
+  "prefs_opt_proxy_socks4a": "SOCKS4a",
+  "prefs_opt_source_dbip": "DB-IP (gratis, sin cuenta)",
+  "prefs_opt_source_maxmind": "MaxMind GeoLite2 (gratis, requiere crear una cuenta)",
+  "prefs_opt_source_custom": "URL personalizada",
+  "prefs_opt_see_shares_everybody": "Todos",
+  "prefs_opt_see_shares_friends": "Amigos",
+  "prefs_opt_see_shares_nobody": "Nadie",
+  "prefs_field_general_nickname": "Apodo",
+  "prefs_field_general_version_check_enabled": "Comprobar si hay una nueva versión al inicio",
+  "prefs_field_general_daemon_host_name": "Nombre del equipo",
+  "prefs_field_general_user_hash": "Hash de usuario",
+  "prefs_field_connection_max_download_kibibytes_per_second": "Descarga máx. (KiB/s, 0 = ilimitada)",
+  "prefs_field_connection_max_upload_kibibytes_per_second": "Subida máx. (KiB/s, 0 = ilimitada)",
+  "prefs_field_connection_upload_slot_min_kibibytes_per_second": "Velocidad de subida por puesto (KiB/s)",
+  "prefs_field_connection_tcp_port": "Puerto TCP estándar",
+  "prefs_field_connection_udp_server_port": "Puerto UDP para peticiones al servidor (TCP+3)",
+  "prefs_field_connection_udp_port": "Puerto UDP extendido (Kad / búsqueda global)",
+  "prefs_field_connection_extended_udp_port_enabled": "Activar puerto UDP extendido (Kad / búsqueda global)",
+  "prefs_field_connection_upnp_enabled": "Habilitar UPnP para el reenvío del puerto del router",
+  "prefs_field_connection_upnp_control_point_port": "Puerto TCP para UPnP (opcional)",
+  "prefs_field_connection_bind_address": "Vincular a IP local (vacío = cualquiera)",
+  "prefs_field_connection_bind_interface": "Vincular a interfaz de red (vacío = cualquiera)",
+  "prefs_field_connection_max_sources_per_file_count": "Número máximo de fuentes descargando un archivo",
+  "prefs_field_connection_max_connection_count": "Número máximo de conexiones simultáneas",
+  "prefs_field_connection_kad_enabled": "Activar red Kad",
+  "prefs_field_connection_autoconnect": "Autoconectar al iniciar",
+  "prefs_field_connection_reconnect_on_connection_loss": "Reconectar al perder la conexión",
+  "prefs_field_connection_proxy_enabled": "Habilitar el proxy",
+  "prefs_field_connection_proxy_type": "Tipo de proxy",
+  "prefs_field_connection_proxy_host": "Servidor proxy",
+  "prefs_field_connection_proxy_port": "Puerto del proxy",
+  "prefs_field_connection_proxy_auth_enabled": "Habilitar la autenticación",
+  "prefs_field_connection_proxy_user": "Usuario del proxy",
+  "prefs_field_connection_proxy_password": "Contraseña del proxy (vacío = mantener actual)",
+  "prefs_field_directories_incoming_path": "Carpeta de entrada",
+  "prefs_field_directories_temp_path": "Carpeta temporal",
+  "prefs_field_directories_share_hidden": "Compartir archivos ocultos",
+  "prefs_field_directories_rescan_on_startup": "Buscar cambios automáticamente en los directorios compartidos",
+  "prefs_field_directories_follow_symlinks": "Seguir enlaces simbólicos en carpetas compartidas",
+  "prefs_field_directories_exclude_patterns": "Excluir archivos que coincidan con",
+  "prefs_field_directories_exclude_patterns_use_regex": "Los patrones son expresiones regulares",
+  "prefs_field_files_ich_enabled": "Activar I.C.H.",
+  "prefs_field_files_trust_unverified_aich_hashes": "I.C.H. avanzado confía en todo hash (no recomendado)",
+  "prefs_field_files_add_new_downloads_paused": "Añadir los archivos a descargar en modo pausado",
+  "prefs_field_files_new_downloads_auto_priority_enabled": "Añadir las nuevas descargas con prioridad automática",
+  "prefs_field_files_prioritize_first_last_chunks": "Intentar descargar antes el primer y último trozo",
+  "prefs_field_files_on_finished_start_next_paused": "Descargar el siguiente archivo pausado cuando otro se complete",
+  "prefs_field_files_on_finished_start_next_in_same_category": "De la misma categoría",
+  "prefs_field_files_on_finished_start_next_alphabetically": "En orden alfabético",
+  "prefs_field_files_endgame_mode_enabled": "Modo endgame: cambiar a fuentes más rápidas para los bloques finales",
+  "prefs_field_files_preallocate_full_file_size": "Reservar el espacio en disco para los archivos nuevos",
+  "prefs_field_files_create_sparse_files": "Crear los archivos nuevos como dispersos (reservar bloques en disco bajo demanda)",
+  "prefs_field_files_stop_on_low_disk_space": "Parar descargas con poco espacio libre",
+  "prefs_field_files_min_free_space_mebibytes": "Espacio libre mínimo en disco (MiB)",
+  "prefs_field_files_save_sources_for_rare_files": "Guardar 10 fuentes en archivos raros (< 20 fuentes)",
+  "prefs_field_files_new_shared_files_auto_priority_enabled": "Añadir los nuevos archivos compartidos con prioridad automática",
+  "prefs_field_files_media_metadata_enabled": "Extraer duración / bitrate / códec de archivos multimedia",
+  "prefs_field_files_ffprobe_path": "Ruta a ffprobe (vacío = detección automática)",
+  "prefs_field_files_mmap_enabled": "Usar MMAP: acceso a archivos mapeado en memoria (menor uso de memoria)",
+  "prefs_field_servers_remove_dead_servers": "Eliminar servidores muertos",
+  "prefs_field_servers_dead_server_retry_count": "Reintentos antes de dar un servidor por muerto",
+  "prefs_field_servers_update_list_at_startup": "Auto-actualizar lista de servidores al iniciar",
+  "prefs_field_servers_update_list_from_server": "Actualizar lista al conectar a un servidor",
+  "prefs_field_servers_update_list_from_client": "Actualizar lista cuando un cliente conecta",
+  "prefs_field_servers_server_priority_system_enabled": "Usar sistema de prioridad",
+  "prefs_field_servers_smart_lowid_check_enabled": "Usar comprobación inteligente de LowID al conectar",
+  "prefs_field_servers_safe_server_connect_enabled": "Conexión segura",
+  "prefs_field_servers_autoconnect_static_servers_only": "Autoconectar solo a servidores fijos",
+  "prefs_field_servers_manual_servers_high_priority": "Asignar la prioridad alta a los servidores añadidos manualmente",
+  "prefs_field_servers_update_url": "URL de actualización de la lista de servidores",
+  "prefs_field_kad_update_url": "URL de actualización de nodos Kad",
+  "prefs_action_enter_url": "Introduce una URL",
+  "prefs_action_servers_update": "Descargar ahora la lista de servidores desde esta URL y reemplazar la actual",
+  "prefs_action_servers_update_toast": "Actualizando lista de servidores…",
+  "prefs_action_kad_update": "Descargar ahora la lista de nodos Kad desde esta URL y reemplazar la actual (Kad se reinicia)",
+  "prefs_action_kad_update_toast": "Actualizando lista de nodos Kad…",
+  "prefs_action_geoip_update": "Descargar ahora una base de datos GeoIP actualizada usando la fuente configurada arriba",
+  "prefs_action_geoip_update_toast": "Actualizando la base de datos GeoIP…",
+  "prefs_action_ipfilter_reload": "Volver a leer ipfilter.dat e ipfilter_static.dat desde el directorio de configuración de amuled",
+  "prefs_action_ipfilter_reload_toast": "Recargando el filtro de IP…",
+  "prefs_action_ipfilter_update": "Descargar ahora el filtro de IP desde esta URL y reemplazar el actual",
+  "prefs_action_ipfilter_update_toast": "Actualizando el filtro de IP…",
+  "prefs_field_security_secure_identification_enabled": "Usar la Identificación Segura de Usuario (ISU)",
+  "prefs_field_security_shared_files_visibility": "Quién puede ver mis archivos compartidos",
+  "prefs_field_security_protocol_obfuscation_enabled": "Permitir la ofuscación de protocolo",
+  "prefs_field_security_obfuscation_requested": "Usar ofuscación en conexiones salientes",
+  "prefs_field_security_obfuscation_required": "Aceptar solo conexiones ofuscadas",
+  "prefs_field_security_ipfilter_clients_enabled": "Filtrar clientes",
+  "prefs_field_security_ipfilter_servers_enabled": "Filtrar servidores",
+  "prefs_field_security_ipfilter_reload": "Recargar la lista",
+  "prefs_field_security_ipfilter_update_url": "URL de actualización del filtro de IP",
+  "prefs_field_security_ipfilter_auto_update_enabled": "Auto-actualizar filtro de IP al iniciar",
+  "prefs_field_security_ipfilter_min_access_level": "Nivel de filtrado (0-255)",
+  "prefs_field_security_ipfilter_include_lan_ips": "Filtrar siempre IPs de LAN",
+  "prefs_field_security_reject_spoofed_source_ips": "Manejo paranoico de IPs no coincidentes",
+  "prefs_field_security_system_ipfilter_enabled": "Usar ipfilter.dat del sistema si está disponible",
+  "prefs_field_message_filter_enabled": "Filtrar los mensajes entrantes (salvo la conversación actual)",
+  "prefs_field_message_filter_filter_all_messages": "Filtrar todos los mensajes",
+  "prefs_field_message_filter_accept_from_friends_only": "Filtrar los mensajes de gente que no esté en su lista de amigos",
+  "prefs_field_message_filter_accept_from_known_clients_only": "Filtrar mensajes de clientes desconocidos",
+  "prefs_field_message_filter_filter_by_keyword": "Filtrar mensajes que contengan palabras clave",
+  "prefs_field_message_filter_keywords": "Palabras clave (usa ',' como separador)",
+  "prefs_field_message_filter_log_filtered_messages": "Mostrar los mensajes recibidos en el registro",
+  "prefs_field_message_filter_filter_comments": "Filtrar los comentarios que contengan palabras clave",
+  "prefs_field_message_filter_comment_keywords": "Palabras clave (usa ',' como separador)",
+  "prefs_field_remote_controls_amuleapi_enabled": "Ejecutar amuleapi (API REST) al iniciar",
+  "prefs_field_remote_controls_amuleapi_port": "Puerto HTTP",
+  "prefs_field_remote_controls_amuleapi_bind_address": "IP de escucha",
+  "prefs_creds_current": "Contraseña de administrador actual",
+  "prefs_creds_admin": "Nueva contraseña de administrador (vacío = mantener actual)",
+  "prefs_creds_guest_enabled": "Activar el acceso de invitado",
+  "prefs_creds_guest": "Contraseña de invitado (vacío = mantener actual)",
+  "prefs_creds_guest_needs_password": "El acceso de invitado necesita una contraseña.",
+  "prefs_creds_hint": "Escribe una contraseña para establecerla o cambiarla. Las contraseñas guardadas no se pueden mostrar, así que dejar el campo vacío mantiene la actual.",
+  "prefs_creds_guest_hint": "Las sesiones de invitado pueden ver el estado y los listados, pero no pueden cambiar nada. Desactivarlo borra la contraseña de invitado guardada.",
+  "prefs_creds_apply": "Cambiar contraseñas",
+  "prefs_creds_saved": "Contraseñas actualizadas. Se han cerrado todas las demás sesiones.",
+  "prefs_field_remote_controls_webserver_enabled": "Ejecutar servidor web al iniciar (obsoleto)",
+  "prefs_field_remote_controls_webserver_template_name": "Plantilla web",
+  "prefs_field_remote_controls_webserver_password": "Contraseña de plenos derechos (vacío = mantener actual)",
+  "prefs_field_remote_controls_webserver_guest_enabled": "Activar usuario invitado de derechos limitados",
+  "prefs_field_remote_controls_webserver_guest_password": "Contraseña de invitado (vacío = mantener actual)",
+  "prefs_field_remote_controls_webserver_port": "Puerto TCP del servidor web",
+  "prefs_field_remote_controls_webserver_gzip_enabled": "Activar la compresión gzip",
+  "prefs_field_remote_controls_webserver_refresh_seconds": "Tiempo de refresco de página (segundos)",
+  "prefs_field_online_signature_enabled": "Activar firma en línea",
+  "prefs_field_online_signature_update_frequency_seconds": "Frecuencia de actualización (segundos)",
+  "prefs_field_online_signature_directory": "Guardar el archivo de firma en línea en",
+  "prefs_field_advanced_max_new_connections_per_5_seconds": "Conexiones nuevas máx. / 5 seg",
+  "prefs_field_advanced_kad_max_concurrent_source_search_count": "Búsquedas de fuentes Kad concurrentes",
+  "prefs_field_advanced_kad_source_reask_minutes": "Intervalo de re-búsqueda de fuentes Kad (minutos)",
+  "prefs_field_advanced_source_reask_minutes": "Intervalo de re-consulta de fuentes (minutos)",
+  "prefs_field_advanced_file_buffer_bytes": "Tamaño del búfer de archivo (bytes)",
+  "prefs_field_advanced_max_upload_queue_client_count": "Tamaño de la cola de subida",
+  "prefs_field_advanced_server_keepalive_timeout_minutes": "Intervalo de refresco de conexión al servidor (minutos, 0 = desactivar)",
+  "prefs_field_advanced_verbose_logging": "Activar registro de depuración detallado",
+  "prefs_field_geoip_enabled": "Mostrar banderas de país de los clientes",
+  "prefs_field_geoip_source": "Fuente",
+  "prefs_field_geoip_custom_update_url": "URL de descarga personalizada",
+  "prefs_field_geoip_maxmind_license": "Clave de licencia de MaxMind",
+  "prefs_field_geoip_auto_update_enabled": "Auto-actualizar al iniciar",
+  "prefs_field_geoip_update_now": "Actualizar base de datos ahora",
+  "prefs_field_geoip_loaded_source": "Fuente cargada",
+  "prefs_field_geoip_db_path": "Ruta de la base de datos",
+  "prefs_field_geoip_db_loaded": "Base de datos cargada",
+  "prefs_field_geoip_download_in_progress": "Descargando",
+  "prefs_field_geoip_last_update_status": "Último resultado"
+}

amule-3.1.0.tar.gz/src/webapi/static/img Added

amule-3.1.0.tar.gz/src/webapi/static/img/favicon.ico Added

amule-3.1.0.tar.gz/src/webapi/static/img/logo.png Added

amule-3.1.0.tar.gz/src/webapi/static/index.html Added

@@ -0,0 +1,35 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="color-scheme" content="light dark">
+  <title>aMule Web</title>
+  <link rel="icon" href="img/favicon.ico">
+  
+  <script>
+    try {
+      var t = localStorage.getItem("amule.theme");
+      if (t === "light" || t === "dark") document.documentElement.dataset.theme = t;
+    } catch (e) {}
+  </script>
+  <link rel="stylesheet" href="css/app.css">
+  
+  <script type="importmap">
+  {
+    "imports": {
+      "preact":       "./js/vendor/preact.module.js",
+      "preact/hooks": "./js/vendor/hooks.module.js",
+      "htm":          "./js/vendor/htm.module.js"
+    }
+  }
+  </script>
+</head>
+<body>
+  <div id="app">
+    <div class="placeholder placeholder-loading">Loading…</div>
+  </div>
+  <noscript>This application requires JavaScript.</noscript>
+  <script type="module" src="js/app.js"></script>
+</body>
+</html>

amule-3.1.0.tar.gz/src/webapi/static/js Added

amule-3.1.0.tar.gz/src/webapi/static/js/api.js Added

@@ -0,0 +1,166 @@
+// REST client for the amuleapi /api/v1 surface.
+//
+// - Always sends the session cookie (credentials: "include").
+// - Latches "session dead" on the first 401 and fails every later call
+//   locally (see below) — the server bans an IP that keeps knocking.
+// - Parses the {error:{code,message}} envelope into ApiError.
+// - Caches ETags per GET target and revalidates with If-None-Match so a
+//   304 short-circuits re-downloading/parsing an unchanged body.
+// - Dynamic base path: derived from window.location.pathname so it works
+//   both at the root (/) and under a reverse proxy subpath (e.g. /amule/).
+
+import { t } from "./i18n.js";
+
+const BASE = window.location.pathname.replace(/\/?$/, "/") + "api/v1";
+
+// Root-relative URL for an /api/v1 path, for the one case that must not go
+// through fetch(): a browser navigation, which carries the HttpOnly session
+// cookie by itself — no token in the URL. Shares BASE with the fetch client.
+export function apiUrl(path) {
+  return BASE + "/" + path.replace(/^\//, "");
+}
+
+export class ApiError extends Error {
+  constructor(status, code, message) {
+    super(message || code || ("HTTP " + status));
+    this.name = "ApiError";
+    this.status = status;
+    this.code = code || "";
+  }
+}
+
+// Failed entries of a bulk `results` envelope ( if all ok / not a bulk resp).
+export function bulkFailures(res) {
+  return ((res && res.results) || ).filter((r) => !r.ok);
+}
+
+// path -> { etag, data }
+const etagCache = new Map();
+
+// Optional hook invoked when the session dies, so the shell can tear the
+// live-data layer down and bounce to login. Called at most once per session
+// with the reason ("unauthorized" | "rate_limited").
+let onUnauthorized = null;
+export function setUnauthorizedHandler(fn) { onUnauthorized = fn; }
+
+// Session gate.
+//
+// amuleapi counts every 401 against the calling IP and locks the IP out for
+// five minutes once it sees 30 within 60 s. Restarting amuleapi invalidates
+// the session cookie, so without a latch the live-data layer walks straight
+// into that ban: its fallback poll loop fires GET status plus one GET per
+// active resource every 4 s, and the SSE stream reconnects on its own — every
+// one of those a fresh 401.
+//
+// So the first rejection latches the client as logged out and every later
+// call fails locally, with no fetch at all, until a successful login clears
+// it. Only the auth endpoints bypass the gate (`noGate`), so signing back in
+// still works.
+let sessionDead = false;
+
+function markSessionDead(reason) {
+  if (sessionDead) return;
+  sessionDead = true;
+  if (onUnauthorized) onUnauthorized(reason);
+}
+
+async function request(method, path, { body, useEtag = false, noGate = false } = {}) {
+  if (sessionDead && !noGate) {
+    throw new ApiError(401, "unauthorized", "session ended");
+  }
+
+  const url = BASE + "/" + path.replace(/^\//, "");
+  const headers = {};
+  let cacheKey = null;
+
+  if (useEtag && (method === "GET" || method === "HEAD")) {
+    cacheKey = url;
+    const cached = etagCache.get(cacheKey);
+    // Verbatim: re-quoting a stripped `W/"abc"` gives `"W/abc"`, matching nothing.
+    if (cached) headers"If-None-Match" = cached.etag;
+  }
+
+  const init = { method, headers, credentials: "include" };
+  if (body !== undefined) {
+    headers"Content-Type" = "application/json";
+    init.body = JSON.stringify(body);
+  }
+
+  let resp;
+  try {
+    resp = await fetch(url, init);
+  } catch (networkErr) {
+    throw new ApiError(0, "network", t("common_network_error", { message: networkErr.message }));
+  }
+
+  if (resp.status === 304 && cacheKey) {
+    return etagCache.get(cacheKey).data;
+  }
+
+  // No-body success (e.g. 204).
+  if (resp.status === 204) return {};
+
+  const text = await resp.text();
+  let payload = null;
+  if (text) {
+    try { payload = JSON.parse(text); } catch (_) { payload = null; }
+  }
+
+  if (!resp.ok) {
+    const err = payload && payload.error ? payload.error : {};
+    // 401 (cookie gone / expired / revoked) and the auth limiter's own 429
+    // are terminal for this session. Match 429 on the code, not the status:
+    // other endpoints answer 429 for their own throttles and must not log the
+    // user out. POST /version/check is the one that bit -- it answered
+    // `rate_limited` too, so "Check now" ended the session.
+    if (!noGate && (resp.status === 401 || (resp.status === 429 && err.code === "rate_limited"))) {
+      markSessionDead(resp.status === 429 ? "rate_limited" : "unauthorized");
+    }
+    throw new ApiError(resp.status, err.code, err.message);
+  }
+
+  if (cacheKey) {
+    const etag = (resp.headers.get("ETag") || "").trim();
+    if (etag) etagCache.set(cacheKey, { etag, data: payload });
+  }
+
+  return payload === null ? {} : payload;
+}
+
+// The API pages list responses at 100 rows by default. This UI does not page
+// yet, so a list request asks for the whole collection explicitly rather than
+// silently rendering the first 100 of N.
+//
+// 1e9 is the API's own ceiling: past any collection that can exist, and well
+// inside JS's exact-integer range (2^53-1), so the number sent is the number
+// that arrives. Do NOT reach for Number.MAX_SAFE_INTEGER here -- the server
+// rejects anything above the ceiling, and a value that large would round on
+// the way through a float anyway.
+export const LIMIT_ALL = 1000000000;
+
+export const api = {
+  get: (path, opts) => request("GET", path, { useEtag: true, ...opts }),
+
+  // A list GET. Distinct from get() so the "give me all of it" decision lives
+  // in one place: when this UI grows real pagination, the call sites stay and
+  // only this changes.
+  list: (path, opts) =>
+    request("GET", path + (path.includes("?") ? "&" : "?") + "limit=" + LIMIT_ALL,
+            { useEtag: true, ...opts }),
+  post: (path, body) => request("POST", path, { body }),
+  patch: (path, body) => request("PATCH", path, { body }),
+  del: (path, body) => request("DELETE", path, { body }),
+
+  // auth. login/session bypass the gate (they are how a dead session comes
+  // back); a winning login re-arms the client. logout stays gated on purpose:
+  // once the session is dead the server would only answer it with another
+  // 401, and the caller treats a failure as "logged out" anyway.
+  login: async (password) => {
+    const res = await request("POST", "auth/login", { body: { password }, noGate: true });
+    sessionDead = false;
+    etagCache.clear(); // fresh backend, possibly a fresh dataset
+    return res;
+  },
+  logout: () => request("POST", "auth/logout"),
+  session: () => request("GET", "auth/session", { noGate: true }),
+};

amule-3.1.0.tar.gz/src/webapi/static/js/app.js Added

@@ -0,0 +1,355 @@
+// Application root: auth gate, responsive shell (header + status bar) and
+// the hash router. Everything below is preact components rendered with htm.
+//
+//  - App decides auth state (session cookie) -> Login or Shell.
+//  - Shell tracks the current #/<section> hash and renders Header,
+//    StatusBar and the lazily-imported view for that section.
+//  - Views live in views/<section>.js and default-export a component;
+//    a missing/failed module shows a friendly placeholder.
+
+import { api, bulkFailures, setUnauthorizedHandler } from "./api.js";
+import { data } from "./events.js";
+import { searches } from "./searches.js";
+import { chats } from "./chats.js";
+import { html, render, useState, useEffect, useStore } from "./dom.js";
+import { toast, Placeholder } from "./components.js";
+import { formatSpeed, formatInt } from "./format.js";
+import { t, terr } from "./i18n.js";
+import { Icon } from "./icons.js";
+import { Login } from "./views/login.js";
+
+// Toolbar pages, ordered like the aMule desktop ("Networks" folds the ED2K
+// server list, Kad, and the log panels together).
+const ROUTES = 
+  { key: "networks", label: t("app_nav_networks") },
+  { key: "search", label: t("app_nav_search") },
+  { key: "downloads", label: t("app_nav_downloads") },
+  { key: "shared", label: t("app_nav_shared") },
+  { key: "clients", label: t("app_nav_clients") },
+  { key: "messages", label: t("app_nav_messages") },
+  { key: "stats", label: t("app_nav_stats") },
+  { key: "preferences", label: t("app_nav_preferences") },
+  { key: "about", label: t("app_nav_about") },
+;
+// Routable but not shown in the toolbar (reached from in-page links).
+const HIDDEN_ROUTES = ;
+const DEFAULT_ROUTE = "downloads";
+
+function currentRoute() {
+  const h = (location.hash || "").replace(/^#\/?/, "");
+  const key = h.split("?")0;
+  const known = ROUTES.some((r) => r.key === key) || HIDDEN_ROUTES.includes(key);
+  return known ? key : DEFAULT_ROUTE;
+}
+
+// --- root ---------------------------------------------------------------
+function App() {
+  // "checking" while we probe the session; "out" when logged out; otherwise
+  // the role string ("admin" | "guest").
+  const auth, setAuth = useState("checking");
+  // Why we landed back on the login screen, when it wasn't the user's doing.
+  const notice, setNotice = useState("");
+
+  useEffect(() => {
+    let alive = true;
+    setUnauthorizedHandler((reason) => {
+      // The session is gone — an amuleapi restart invalidates the cookie.
+      // Stop the live-data layer before anything else: its poll timer and SSE
+      // stream are module-level and outlive the shell unmounting below, and
+      // each retry is another failed-auth strike the server counts towards
+      // banning this IP.
+      data.stop();
+      searches.reset(); // its poll timer and tabs are module-level too
+      chats.reset();
+      if (!alive) return;
+      setNotice(reason === "rate_limited" ? t("login_err_rate_limited") : t("login_session_expired"));
+      setAuth("out");
+    });
+    api.session()
+      .then((s) => { if (alive) setAuth(s.role || "guest"); })
+      .catch(() => { if (alive) setAuth("out"); });
+    return () => { alive = false; setUnauthorizedHandler(null); };
+  }, );
+
+  const onLoggedIn = (role) => { setNotice(""); setAuth(role); };
+
+  if (auth === "checking") return html`<${Placeholder} kind="loading">${t("app_loading")}<//>`;
+  if (auth === "out") return html`<${Login} notice=${notice} onSuccess=${onLoggedIn} />`;
+  return html`<${Shell} role=${auth} onLogout=${() => setAuth("out")} />`;
+}
+
+// --- shell --------------------------------------------------------------
+function Shell({ role, onLogout }) {
+  const route, setRoute = useState(currentRoute());
+
+  useEffect(() => {
+    document.body.classList.toggle("role-guest", role === "guest");
+    data.ensureStatus();
+    // Shell-wide, not per-view, so the unread badge lights up from any section.
+    chats.ensure();
+    if (!location.hash) location.hash = "#/" + DEFAULT_ROUTE;
+    const onHash = () => setRoute(currentRoute());
+    window.addEventListener("hashchange", onHash);
+    setRoute(currentRoute());
+    return () => window.removeEventListener("hashchange", onHash);
+  }, role);
+
+  return html`
+    <${Toolbar} route=${route} onLogout=${onLogout} />
+    <main class="view" id="view">
+      <${RouteView} route=${route} role=${role} />
+    </main>
+    <${StatusBar} />`;
+}
+
+function Toolbar({ route, onLogout }) {
+  const link, setLink = useState("");
+  const menuOpen, setMenuOpen = useState(false);
+  const unread = (useStore("chats") || {}).unread || 0;
+  // One-shot /version check. A red dot on About (and, on mobile, on the
+  // hamburger) flags a version mismatch or an available update; the message
+  // itself lives in the About view. daemon_version is empty without EC.
+  const aboutAlert, setAboutAlert = useState(false);
+
+  useEffect(() => {
+    let alive = true;
+    api.get("version")
+      .then((v) => {
+        if (!alive) return;
+        const mismatch = v.daemon_version && v.amuleapi_version !== v.daemon_version;
+        const update = v.update && v.update.check_enabled && v.update.available === true;
+        if (mismatch || update) setAboutAlert(true);
+      })
+      .catch(() => {});
+    return () => { alive = false; };
+  }, );
+
+  const addEd2k = async () => {
+    const value = link.trim();
+    if (!value) return;
+
+    const links = ;
+    const regex = /(ed2k:\/\/\|file\|.+?\|\/|magnet:\?.+?(?=\s*(?:ed2k:\/\/|magnet:|$)))/gi;
+    let match;
+    while ((match = regex.exec(value)) !== null) {
+      links.push(match1.trim());
+    }
+    // `links` is the only body form the endpoint takes. Where the regex found
+    // nothing, send the raw input as a one-item array anyway so the daemon
+    // answers with its own verdict on the string the user typed.
+    const payload = { links: links.length > 0 ? links : value };
+
+    try {
+      // POST /downloads returns the bulk `results` envelope keyed by link; on a
+      // 207 partial some links were rejected, so report them and keep the input.
+      const failed = bulkFailures(await api.post("downloads", payload));
+      if (failed.length) {
+        toast(t("common_bulk_partial", { failed: failed.length,
+                total: payload.links.length,
+                message: terr(failed0.error) }), "warn");
+      } else {
+        setLink("");
+        toast(t("app_toast_link_added"), "success");
+      }
+      if (currentRoute() === "downloads") data.refresh("downloads");
+    } catch (e) {
+      toast(terr(e) || t("app_error"), "error");
+    }
+  };
+
+  const doLogout = async () => {
+    try { await api.logout(); } catch (_) {}
+    data.stop(); // the SSE stream and poll timer outlive this component
+    searches.reset(); // ...and so do the search tabs and their poll timer
+    chats.reset();
+    location.hash = "";
+    onLogout();
+  };
+
+  return html`
+    <header class="app-toolbar">
+      <button class="btn btn-ghost nav-toggle" aria-expanded=${menuOpen}
+              aria-controls="main-nav" aria-label=${unread || aboutAlert ? t("app_menu_alert") : t("app_menu")}
+              onClick=${() => setMenuOpen(!menuOpen)}>
+        <${Icon} name="menu" size=${20} />
+        ${unread || aboutAlert ? html`<span class="nav-toggle-dot"></span>` : null}
+      </button>
+      <div class="brand">
+        <img class="brand-logo" src="img/logo.png" alt="aMule" />
+      </div>
+      <span class="route-title">${t("app_nav_" + route)}</span>
+      ${menuOpen ? html`<div class="nav-backdrop" onClick=${() => setMenuOpen(false)} />` : null}
+      <nav class=${"nav" + (menuOpen ? " open" : "")} id="main-nav">
+        ${ROUTES.map((r) => html`
+          <a class=${"tool-btn" + (r.key === route ? " active" : "")}
+             href=${"#/" + r.key} data-route=${r.key} title=${r.label}
+             onClick=${() => setMenuOpen(false)}>
+            <${Icon} name=${r.key} size=${20} />
+            <span class="tool-label">${r.label}</span>
+            ${r.key === "messages" && unread
+              ? html`<span class="tool-badge" title=${t("messages_unread_tip", { n: unread })}>${unread}</span>`
+              : null}
+            ${r.key === "about" && aboutAlert
+              ? html`<span class="tool-dot" title=${t("about_alert_tip")}></span>`
+              : null}
+          </a>`)}
+        <div class="nav-tools">
+          <form class="ed2k-add admin-only" onSubmit=${(e) => { e.preventDefault(); addEd2k(); }}>
+            <input class="input ed2k-input" type="text" name="ed2k_link" placeholder="ed2k://|file|…"
+                   aria-label=${t("app_add_ed2k_link")} value=${link}
+                   onInput=${(e) => setLink(e.target.value)} />
+            <button class="btn admin-only" type="submit">${t("app_add")}</button>
+          </form>
+          <button class="btn btn-ghost" title=${t("app_logout")} onClick=${doLogout}>
+            <${Icon} name="logout" /><span class="sr-only">${t("app_logout")}</span>
+          </button>
+        </div>
+      </nav>
+      <div class="header-tools">
+        <form class="ed2k-add admin-only" onSubmit=${(e) => { e.preventDefault(); addEd2k(); }}>
+          <input class="input ed2k-input" type="text" name="ed2k_link" placeholder="ed2k://|file|…"
+                 aria-label=${t("app_add_ed2k_link")} value=${link}
+                 onInput=${(e) => setLink(e.target.value)} />
+          <button class="btn admin-only" type="submit">${t("app_add")}</button>
+        </form>
+        <button class="btn btn-ghost" title=${t("app_logout")} onClick=${doLogout}>
+          <${Icon} name="logout" /><span class="sr-only">${t("app_logout")}</span>
+        </button>
+      </div>
+    </header>`;
+}
+
+// --- status bar ---------------------------------------------------------
+// The live/polling badge sits on the LEFT; everything else is right-aligned in
+// amulegui's footer order (Users | Speed | Connection), groups split by
+// vertical separators. Status is text-only (we have no status icons).
+function StatusBar() {
+  const status = useStore("status");
+  const live = useStore("live");
+  const polling = useStore("polling");
+
+  const badge = polling
+    ? html`<span class="status-chip warn" title=${t("app_offline_polling")}>${t("app_polling")}</span>`
+    : (live ? html`<span class="status-chip ok">${t("app_live")}</span>` : null);
+
+  const kNet = (status && status.kad && status.kad.network) || {};
+  const eNet = (status && status.ed2k && status.ed2k.network) || {};
+  const hasNet = kNet.user_count != null || kNet.file_count != null
+              || eNet.user_count != null || eNet.file_count != null;
+
+  const groups = 
+    hasNet ? html`<${NetworkInfo} status=${status} />` : null,
+    html`<${Speeds} status=${status} />`,
+    html`<${ConnectionStatus} status=${status} />`,
+  .filter(Boolean);
+
+  return html`
+    <div class="statusbar" id="statusbar">
+      <span class="status-left">${badge}</span>
+      <div class="status-right">
+        ${groups.map((g, i) => html`
+          ${i > 0 ? html`<span class="vsep" aria-hidden="true"></span>` : null}
+          ${g}`)}
+      </div>
+    </div>`;
+}
+
+// Combined eD2k + Kad status, mirroring amulegui's "eD2k: … | Kad: …" label:
+// plain colored text (no badges), joined by a divider.
+function ConnectionStatus({ status }) {
+  const ed2k = status && status.ed2k;
+  let e2Text = t("app_not_connected"), e2Cls = "off";
+  if (ed2k) {
+    if (ed2k.state === "connected") {
+      e2Cls = ed2k.high_id ? "ok" : "low";
+      const e2Server = ed2k.server_name ||
+        (ed2k.server_ip ? ed2k.server_ip + ":" + ed2k.server_port : "");
+      e2Text = (e2Server || t("app_connected")) +
+        " · " + (ed2k.high_id ? t("app_high_id") : t("app_low_id"));
+    } else if (ed2k.state === "connecting") {
+      e2Cls = "warn"; e2Text = t("app_connecting");
+    }
+  }
+
+  const kad = status && status.kad;
+  let kText = t("app_not_connected"), kCls = "off";
+  if (kad && kad.state === "connected") {
+    kCls = kad.firewalled_tcp ? "warn" : "ok";
+    kText = t("app_connected") + (kad.firewalled_tcp ? " · " + t("app_firewalled") : "");
+  }
+
+  return html`
+    <span class="status-item conn">
+      <b>${t("app_ed2k")}: </b><span class=${"conn-state " + e2Cls}>${e2Text}</span>
+      <span class="conn-div" aria-hidden="true">|</span>
+      <b>${t("app_kad")}: </b><span class=${"conn-state " + kCls}>${kText}</span>
+    </span>`;
+}
+
+// Network users/files, like amulegui's userLabel (CamuleApp::ShowUserCount):
+// both networks connected -> "Users: E: x K: y | Files: E: x K: y", a single
+// network -> "Users: x | Files: x". Selection is by presence of each network's
+// totals (the status object carries no enabled-pref flag).
+function NetworkInfo({ status }) {
+  const e = (status && status.ed2k && status.ed2k.network) || null;
+  const k = (status && status.kad && status.kad.network) || null;
+  const eHas = e && (e.user_count != null || e.file_count != null);
+  const kHas = k && (k.user_count != null || k.file_count != null);
+  if (!eHas && !kHas) return null;
+
+  const both = eHas && kHas;
+  const net = eHas ? e : k;
+  const usersVal = both
+    ? html`<b>E:</b> ${formatInt(e.user_count)} <b>K:</b> ${formatInt(k.user_count)}`
+    : html`${formatInt(net.user_count)}`;
+  const filesVal = both
+    ? html`<b>E:</b> ${formatInt(e.file_count)} <b>K:</b> ${formatInt(k.file_count)}`
+    : html`${formatInt(net.file_count)}`;
+
+  return html`
+    <span class="status-item status-extra">
+      <b>${t("app_users")}: </b>${usersVal}
+      <span class="conn-div" aria-hidden="true">|</span>
+      <b>${t("app_files")}: </b>${filesVal}
+    </span>`;
+}
+
+function Speeds({ status }) {
+  const sp = (status && status.speeds) || {};
+  return html`
+    <span class="status-item speeds">
+      <span class="speed dl"><${Icon} name="down" /> ${formatSpeed(sp.download_speed_bytes_per_second)}</span>
+      <span class="speed ul"><${Icon} name="up" /> ${formatSpeed(sp.upload_speed_bytes_per_second)}</span>
+    </span>`;
+}
+
+// --- router -------------------------------------------------------------
+function RouteView({ route, role }) {
+  const View, setView = useState(null);
+  const failed, setFailed = useState(false);
+
+  useEffect(() => {
+    let alive = true;
+    setView(null);
+    setFailed(false);
+    import("./views/" + route + ".js")
+      .then((mod) => {
+        if (!alive) return;
+        if (mod.default) setView(() => mod.default);
+        else { console.error("View '" + route + "' has no default export"); setFailed(true); }
+      })
+      .catch((e) => {
+        if (!alive) return;
+        console.error("Failed to load view '" + route + "':", e);
+        setFailed(true);
+      });
+    return () => { alive = false; };
+  }, route);
+
+  if (failed) return html`<${Placeholder} kind="error">${t("app_view_error")}<//>`;
+  if (!View) return html`<${Placeholder} kind="loading">${t("app_loading")}<//>`;
+  // key=route forces a fresh mount (and cleanup) when switching sections.
+  return html`<${View} key=${route} role=${role} isGuest=${role === "guest"} />`;
+}
+
+render(html`<${App} />`, document.getElementById("app"));

amule-3.1.0.tar.gz/src/webapi/static/js/charts.js Added

@@ -0,0 +1,234 @@
+// Hand-rolled canvas chart, reused by the Statistics view and the
+// Networks/Kad tab. Draws a time series (filled line, y-grid with
+// formatted labels, time x-axis, hover readout) — all the charts here are
+// this simple, so a hand-rolled canvas draw is enough; no charting library
+// is bundled.
+// data is xs, ...series: the first series is filled, the rest are drawn as
+// thinner lines on the same y scale. g.seriesi names and colours series i;
+// a GUI-style legend appears below the canvas whenever there is more than one.
+
+import { html, useEffect, useRef } from "./dom.js";
+import { getLang } from "./i18n.js";
+
+// Time-axis clocks, localized to the UI language, 24h (no AM/PM): hour:minute,
+// with-seconds, and date + hour:minute. draw() picks one per the span drawn.
+// Built once — Intl.DateTimeFormat per label is expensive.
+const clockHM = new Intl.DateTimeFormat(getLang(), { hour: "2-digit", minute: "2-digit", hour12: false });
+const clockHMS = new Intl.DateTimeFormat(getLang(), { hour: "2-digit", minute: "2-digit", second: "2-digit", hour12: false });
+const clockDate = new Intl.DateTimeFormat(getLang(), { month: "short", day: "numeric", hour: "2-digit", minute: "2-digit", hour12: false });
+const clock = (unixSeconds, withSeconds) =>
+  (withSeconds ? clockHMS : clockHM).format(new Date((Number(unixSeconds) || 0) * 1000));
+
+const HEIGHT = 180;
+const AXIS_FONT = "12px system-ui, sans-serif"; // matches the .chart-legend size
+const GUTTER_LEFT = 44;   // hover-mapping fallback until the first draw sizes it
+const GUTTER_BOTTOM = 22; // x-axis labels
+const PAD_TOP = 8;
+const PAD_RIGHT = 8;
+
+export function Chart({ g, data, bare }) {
+  const canvas = useRef(null);
+  const state = useRef({ data: null, hover: -1 });
+
+  const redraw = () => {
+    if (canvas.current && state.current.data) {
+      // draw() returns the plot's horizontal bounds (the left gutter is sized
+      // dynamically to the labels), so hover mapping stays accurate.
+      const box = draw(canvas.current, g, state.current.data, state.current.hover);
+      if (box) { state.current.x0 = box.x0; state.current.x1 = box.x1; }
+    }
+  };
+
+  useEffect(() => {
+    // Colours are read from CSS variables on every draw, so a theme switch
+    // only needs a redraw.
+    const mo = new MutationObserver(redraw);
+    mo.observe(document.documentElement, { attributes: true, attributeFilter: "data-theme" });
+    const mq = window.matchMedia("(prefers-color-scheme: dark)");
+    mq.addEventListener("change", redraw);
+    // Redraw on any host-size change: covers window resizes and the Networks
+    // slider, which resizes the pane without firing a window resize event.
+    const ro = new ResizeObserver(redraw);
+    if (canvas.current && canvas.current.parentNode) ro.observe(canvas.current.parentNode);
+    return () => {
+      mo.disconnect();
+      mq.removeEventListener("change", redraw);
+      ro.disconnect();
+    };
+  }, );
+
+  useEffect(() => {
+    if (!data) return;
+    state.current.data = data;
+    redraw();
+  }, data);
+
+  const onMove = (e) => {
+    const d = state.current.data;
+    if (!d || !d0.length) return;
+    const rect = canvas.current.getBoundingClientRect();
+    const x0 = state.current.x0 != null ? state.current.x0 : GUTTER_LEFT;
+    const x1 = state.current.x1 != null ? state.current.x1 : rect.width - PAD_RIGHT;
+    const frac = (e.clientX - rect.left - x0) / Math.max(1, x1 - x0);
+    const idx = Math.max(0, Math.min(d0.length - 1, Math.round(frac * (d0.length - 1))));
+    if (idx !== state.current.hover) { state.current.hover = idx; redraw(); }
+  };
+  const onLeave = () => { state.current.hover = -1; redraw(); };
+
+  const series = data ? data.slice(1) : ;
+  const last = (a) => (a && a.length ? aa.length - 1 : 0);
+  return html`
+    <div class=${bare ? "chart-card chart-bare" : "card chart-card"}>
+      <h3>${g.title}</h3>
+      <div class="chart-host">
+        <canvas ref=${canvas} style="width:100%;height:100%;display:block"
+          onMouseMove=${onMove} onMouseLeave=${onLeave}></canvas>
+      </div>
+      ${series.length > 1 ? html`
+        <div class="chart-legend">
+          ${series.map((ys, i) => html`
+            <span class="legend-item"><span class="legend-chip" style="background:${g.seriesi.color}"></span>${g.seriesi.label}: ${g.fmt(last(ys))}</span>`)}
+        </div>` : null}
+    </div>`;
+}
+
+// Graph poll interval: no faster than a new sample can appear (every `interval`
+// seconds), capped so the chart still feels live and floored at 2s.
+export function graphPollMs(interval) {
+  return Math.min(30000, Math.max(2000, interval * 1000));
+}
+
+// Round `raw` up to a "nice" tick step: 1/2/5 × 10^n.
+function niceStep(raw) {
+  const mag = Math.pow(10, Math.floor(Math.log10(raw)));
+  const n = raw / mag;
+  return (n <= 1 ? 1 : n <= 2 ? 2 : n <= 5 ? 5 : 10) * mag;
+}
+
+function draw(cv, g, xs, ...series, hover) {
+  const cssW = cv.parentNode.clientWidth || 400;
+  // Height follows the host: fixed 180px for the bare (Kad) chart, but on the
+  // Stats grid the canvas is height:100% so the host fills its card cell.
+  const h = cv.parentNode.clientHeight || HEIGHT;
+  const dpr = window.devicePixelRatio || 1;
+  cv.width = cssW * dpr;
+  cv.height = h * dpr;
+  const ctx = cv.getContext("2d");
+  ctx.scale(dpr, dpr);
+
+  const styles = getComputedStyle(document.documentElement);
+  const fg = styles.getPropertyValue("--text").trim() || "#000";
+  const grid = styles.getPropertyValue("--border").trim() || "#0001";
+  ctx.clearRect(0, 0, cssW, h);
+  ctx.font = AXIS_FONT;
+
+  const n = xs.length;
+  if (!n) return;
+
+  // Prefix the date once the window crosses a day so axis labels aren't
+  // "11:46 … 11:46" across two days; drop hover seconds past ~2h, where
+  // samples are minutes apart.
+  const spanSeconds = n > 1 ? Number(xsn - 1) - Number(xs0) : 0;
+  const crossesDay = n > 1 &&
+    new Date(Number(xs0) * 1000).toDateString() !== new Date(Number(xsn - 1) * 1000).toDateString();
+  const axisFmt = crossesDay ? clockDate : clockHM;
+  const hoverSeconds = spanSeconds <= 2 * 3600;
+
+  const ys = series0;
+  // y scale: 0 .. max*1.05, ticks on a nice step (shared by every series)
+  const yMax = Math.max(1, Math.max(...series.map((s) => Math.max(...s))) * 1.05);
+  const step = Math.max(1, niceStep(yMax / 4)); // values are integer counts/B·s⁻¹
+
+  // Axis unit: charts with `g.axis` (speeds) pick ONE unit for the whole axis so
+  // ticks are bare numbers with the unit shown once; others keep g.fmt per tick.
+  const axis = g.axis ? g.axis(yMax) : null;
+  const tickLabel = (v) => {
+    if (!axis) return g.fmt(v);
+    if (v === 0) return "0";
+    const s = v / axis.div;
+    const raw = s >= 100 ? s.toFixed(0) : s >= 10 ? s.toFixed(1) : s.toFixed(2);
+    return raw.indexOf(".") < 0 ? raw : raw.replace(/\.?0+$/, "");
+  };
+  const ticks = ;
+  for (let v = 0; v <= yMax; v += step) ticks.push(v, tickLabel(v));
+
+  // Left gutter sized to the widest label (+ 6px gap + 6px margin) instead of a
+  // fixed width, so short numeric axes don't waste horizontal space.
+  let labelW = 0;
+  for (const , label of ticks) labelW = Math.max(labelW, ctx.measureText(label).width);
+  const x0 = Math.ceil(labelW) + 12;
+  const x1 = cssW - PAD_RIGHT;
+  // reserve a line at the top for the unit caption when present
+  const y0 = axis ? PAD_TOP + 15 : PAD_TOP;
+  const y1 = h - GUTTER_BOTTOM;
+  const sx = (i) => x0 + (n < 2 ? 0 : (i / (n - 1)) * (x1 - x0));
+  const sy = (v) => y1 - (v / yMax) * (y1 - y0);
+
+  // grid + y labels
+  ctx.strokeStyle = grid;
+  ctx.fillStyle = fg;
+  ctx.lineWidth = 1;
+  ctx.textAlign = "right";
+  ctx.textBaseline = "middle";
+  for (const v, label of ticks) {
+    const y = Math.round(sy(v)) + 0.5;
+    ctx.beginPath(); ctx.moveTo(x0, y); ctx.lineTo(x1, y); ctx.stroke();
+    ctx.fillText(label, x0 - 6, y);
+  }
+  // unit shown once, above the axis numbers (dim, right-aligned to match them)
+  if (axis) {
+    ctx.fillStyle = styles.getPropertyValue("--text-dim").trim() || fg;
+    ctx.textBaseline = "top";
+    ctx.fillText(axis.unit, x0 - 6, 1);
+    ctx.fillStyle = fg;
+  }
+
+  // x labels: ~4 evenly spaced timestamps
+  ctx.textAlign = "center";
+  ctx.textBaseline = "top";
+  const nLabels = Math.min(4, n);
+  for (let k = 0; k < nLabels; k++) {
+    const i = Math.round((k / Math.max(1, nLabels - 1)) * (n - 1));
+    const label = axisFmt.format(new Date(Number(xsi) * 1000));
+    // keep edge labels inside the plot
+    const x = Math.max(x0 + 20, Math.min(x1 - 20, sx(i)));
+    ctx.fillText(label, x, y1 + 5);
+  }
+
+  // first series: fill then stroke. The rest: thinner line, no fill.
+  const line = (vs) => {
+    ctx.beginPath();
+    ctx.moveTo(sx(0), sy(vs0));
+    for (let i = 1; i < n; i++) ctx.lineTo(sx(i), sy(vsi));
+  };
+  ctx.lineJoin = "round";
+  line(ys);
+  ctx.strokeStyle = g.series0.color;
+  ctx.lineWidth = 2;
+  ctx.stroke();
+  ctx.lineTo(sx(n - 1), y1); ctx.lineTo(sx(0), y1); ctx.closePath();
+  ctx.fillStyle = g.series0.color + "22";
+  ctx.fill();
+  ctx.lineWidth = 1.5;
+  for (let k = 1; k < series.length; k++) {
+    line(seriesk);
+    ctx.strokeStyle = g.seriesk.color;
+    ctx.stroke();
+  }
+
+  // hover: vertical line + point + readout
+  if (hover >= 0 && hover < n) {
+    const hx = sx(hover), hy = sy(yshover);
+    ctx.strokeStyle = grid;
+    ctx.beginPath(); ctx.moveTo(hx + 0.5, y0); ctx.lineTo(hx + 0.5, y1); ctx.stroke();
+    ctx.fillStyle = g.series0.color;
+    ctx.beginPath(); ctx.arc(hx, hy, 3, 0, 2 * Math.PI); ctx.fill();
+    ctx.fillStyle = fg;
+    ctx.textBaseline = "top";
+    ctx.textAlign = hx > (x0 + x1) / 2 ? "right" : "left";
+    const text = g.fmt(yshover) + " · " + clock(xshover, hoverSeconds);
+    ctx.fillText(text, hx > (x0 + x1) / 2 ? hx - 8 : hx + 8, y0);
+  }
+
+  return { x0, x1 }; // plot bounds, for accurate hover mapping (see redraw)
+}

amule-3.1.0.tar.gz/src/webapi/static/js/chats.js Added

@@ -0,0 +1,424 @@
+// Conversation registry, kept outside the view so tabs and incoming messages
+// survive navigation (like searches.js). Publishes a light tab list on store
+// "chats" and the active transcript on "chat:<peer>".
+//
+// `peer` is "<ip>:<port>" and goes into the URL verbatim — amuleapi does not
+// percent-decode path captures, so an encoded colon is a 400.
+
+import { api } from "./api.js";
+import { store } from "./store.js";
+import { toast } from "./components.js";
+import { t, terr } from "./i18n.js";
+
+const TABS_SYNC_MS = 500;
+const LOG_SYNC_MS = 300;
+const POLL_MS = 2000; // fallback only, while SSE is down
+const HISTORY_LIMIT = 200; // the daemon's per-conversation retention
+
+const convs = new Map();
+let activePeer = "";
+let started = false;
+let unsupported = false;
+let myNick = "";
+let pollTimer = null;
+let tabsTimer = 0;
+let logTimer = 0;
+let offs = ;
+let lastMessage = null, lastClosed = null, lastResync = null;
+
+// The API's `name` for a peer the core has no nick for.
+function fallbackName(ip, port) { return "IP: " + ip + " Port: " + port; }
+
+function pageVisible() {
+  return (location.hash || "").replace(/^#\/?/, "").split("?")0 === "messages";
+}
+
+// Don't let the API fallback overwrite a real name a caller gave us.
+function betterName(conv, name) {
+  return name && name !== fallbackName(conv.ip, conv.port) ? name : conv.name;
+}
+
+function newConv({ peer, ip, port, name = "", clientEcid = 0, friendEcid = 0, online = false }) {
+  return {
+    peer, ip, port,
+    name: name || fallbackName(ip, port),
+    clientEcid, friendEcid, online,
+    messages: new Map(),
+    lastMsgId: 0,
+    unread: 0,
+    // The daemon only holds a conversation once its first message goes out;
+    // false for one opened locally.
+    known: false,
+    loaded: false,
+    fetching: false,
+  };
+}
+
+function messageList(conv) {
+  return Array.from(conv.messages.values()).sort((a, b) => a.id - b.id);
+}
+
+// Resolve the API fallback name against the live friends list, so a friend's
+// conversation shows the friend's name.
+function displayName(conv) {
+  if (conv.name !== fallbackName(conv.ip, conv.port)) return conv.name;
+  const friends = store.get("friends") || ;
+  const f = friends.find((x) => (conv.friendEcid && x.ecid === conv.friendEcid) ||
+                                (x.ip === conv.ip && x.port === conv.port));
+  return f && f.name ? f.name : conv.name;
+}
+
+function tabList() {
+  return Array.from(convs.values()).map((c) => ({
+    peer: c.peer, name: displayName(c),
+    clientEcid: c.clientEcid, friendEcid: c.friendEcid,
+    // Online mirrors the desktop: a linked live client (clientEcid set), not the
+    // momentary TCP state. Like the desktop's blue name, this lights on a contact
+    // attempt too, including to an unroutable address.
+    online: c.online === true, unread: c.unread,
+  }));
+}
+
+function unreadTotal() {
+  let n = 0;
+  for (const c of convs.values()) n += c.unread;
+  return n;
+}
+
+function publishTabs() {
+  if (tabsTimer) { clearTimeout(tabsTimer); tabsTimer = 0; }
+  store.set("chats", { tabs: tabList(), activePeer, unread: unreadTotal(), unsupported, myNick });
+}
+function publishTabsSoon() {
+  if (!tabsTimer) tabsTimer = setTimeout(() => { tabsTimer = 0; publishTabs(); }, TABS_SYNC_MS);
+}
+function publishLog(peer) {
+  // Bail before touching the timer: the pending publish is the active
+  // conversation's, so clearing it here would drop it.
+  if (peer !== activePeer) return;
+  if (logTimer) { clearTimeout(logTimer); logTimer = 0; }
+  const conv = convs.get(peer);
+  store.set("chat:" + peer, conv ? messageList(conv) : );
+}
+function publishLogSoon(peer) {
+  if (peer !== activePeer || logTimer) return;
+  logTimer = setTimeout(() => { logTimer = 0; publishLog(peer); }, LOG_SYNC_MS);
+}
+
+// Chat routes answer 503 ec_unsupported on an amuled predating chat. Latch it
+// so the view reports it once instead of every call toasting.
+function noteError(e) {
+  if (e && e.code === "ec_unsupported" && !unsupported) { unsupported = true; publishTabs(); }
+  return e;
+}
+
+// --- reads ---------------------------------------------------------------
+
+async function loadMessages(peer) {
+  const conv = convs.get(peer);
+  if (!conv || conv.fetching) return;
+  // Nothing held and nothing on the daemon: the read would 404 by construction.
+  if (!conv.known && !conv.messages.size) return;
+  conv.fetching = true;
+  try {
+    const q = conv.loaded ? "?since_message_id=" + conv.lastMsgId : "?tail=" + HISTORY_LIMIT;
+    const r = await api.get("chats/" + peer + "/messages" + q);
+    const cur = convs.get(peer);
+    if (!cur) return;
+    for (const m of r.messages || ) addMessage(cur, m);
+    cur.loaded = true;
+    publishTabs();
+    publishLog(peer);
+  } catch (e) {
+    noteError(e);
+    if (e && e.status === 404) { const cur = convs.get(peer); if (cur) cur.loaded = true; }
+  } finally {
+    const cur = convs.get(peer);
+    if (cur) cur.fetching = false;
+  }
+}
+
+// Keyed by id (monotonic, never reused) so a send's optimistic echo and the
+// SSE frame that follows collapse into one line.
+function addMessage(conv, m) {
+  conv.messages.set(m.id, m);
+  if (m.id > conv.lastMsgId) conv.lastMsgId = m.id;
+  if (conv.messages.size > HISTORY_LIMIT) {
+    const ids = Array.from(conv.messages.keys()).sort((a, b) => a - b);
+    for (const id of ids.slice(0, conv.messages.size - HISTORY_LIMIT)) conv.messages.delete(id);
+  }
+}
+
+// Adopt conversations any client opened and drop ones the daemon no longer
+// holds. Transcripts load lazily on activation, not here.
+async function adopt() {
+  let list;
+  try { list = (await api.get("chats")).chats || ; }
+  catch (e) { noteError(e); return; }
+  let added = false;
+  for (const s of list) {
+    const cur = convs.get(s.address);
+    if (cur) {
+      cur.known = true;
+      const name = betterName(cur, s.name);
+      if (name !== cur.name) { cur.name = name; added = true; }
+      // null when offline / not a friend; 0 is this module's "none".
+      const cEcid = s.client_ecid || 0, fEcid = s.friend_ecid || 0;
+      if (cEcid !== cur.clientEcid) { cur.clientEcid = cEcid; added = true; }
+      if (fEcid !== cur.friendEcid) { cur.friendEcid = fEcid; added = true; }
+      const onl = cEcid !== 0;
+      if (onl !== cur.online) { cur.online = onl; added = true; }
+      if (cur.loaded && s.last_message_id > cur.lastMsgId) loadMessages(s.address);
+      continue;
+    }
+    const conv = newConv({
+      peer: s.address, ip: s.ip, port: s.port, name: s.name,
+      clientEcid: s.client_ecid || 0, friendEcid: s.friend_ecid || 0,
+      online: (s.client_ecid || 0) !== 0,
+    });
+    conv.known = true;
+    convs.set(s.address, conv);
+    added = true;
+  }
+  // Absent = closed elsewhere or evicted by the daemon's cap. Skip local-only
+  // ones, not listed yet by definition.
+  for (const peer of Array.from(convs.keys())) {
+    const conv = convs.get(peer);
+    if (conv && conv.known && !list.some((s) => s.address === peer)) { drop(peer, false); added = true; }
+  }
+  // The daemon lists most-recently-active first.
+  if (!activePeer && list.length) { setActive(list0.address); return; }
+  if (added) publishTabs();
+}
+
+// --- writes --------------------------------------------------------------
+
+// `read` is false only when auto-selecting a just-arrived conversation off-page:
+// it becomes the selected tab but keeps its unread until Messages is opened.
+function setActive(peer, read = true) {
+  activePeer = peer || "";
+  const conv = convs.get(activePeer);
+  if (conv && read) conv.unread = 0;
+  publishTabs();
+  if (!conv) return;
+  publishLog(activePeer);
+  loadMessages(activePeer);
+}
+
+// Select or create a conversation without sending — from the friend list / Clients.
+function open({ peer, ip, port, name, friendEcid = 0, clientEcid = 0 }) {
+  const conv = convs.get(peer);
+  if (!conv) {
+    // A passed clientEcid is a live linked client, so it is online right away;
+    // the daemon's session reconciliation takes over once a message goes out.
+    convs.set(peer, newConv({ peer, ip, port, name, friendEcid, clientEcid, online: !!clientEcid }));
+  } else {
+    // The caller's links/name may be fresher than the listing.
+    if (name) conv.name = name;
+    if (friendEcid) conv.friendEcid = friendEcid;
+    if (clientEcid) { conv.clientEcid = clientEcid; conv.online = true; }
+  }
+  setActive(peer);
+  return peer;
+}
+
+function drop(peer, notify) {
+  const conv = convs.get(peer);
+  if (!conv) return;
+  // Next tab: right, else left. Map order is strip order.
+  const keys = Array.from(convs.keys());
+  const next = keyskeys.indexOf(peer) + 1 || keyskeys.indexOf(peer) - 1;
+  convs.delete(peer);
+  store.set("chat:" + peer, );
+  if (notify) toast(t("messages_toast_closed", { name: conv.name }), "info");
+  if (activePeer === peer) {
+    activePeer = "";
+    if (next) { setActive(next); return; }
+  }
+  publishTabs();
+}
+
+// --- SSE routing ---------------------------------------------------------
+
+function onMessage(p) {
+  if (!p || p === lastMessage) return;
+  lastMessage = p;
+  if (!p.address || !p.message) return;
+  let conv = convs.get(p.address);
+  if (!conv) {
+    // No "conversation started" event; the first message implies a new one.
+    conv = newConv({
+      peer: p.address, ip: p.ip, port: p.port, name: p.name,
+      clientEcid: p.client_ecid || 0, friendEcid: p.friend_ecid || 0,
+      // No reachability here: chat_message carries address/ip/port/name/
+      // client_ecid/friend_ecid/message and nothing else. Defaults to false
+      // until GET /chats or a friend_updated says otherwise.
+    });
+    convs.set(p.address, conv);
+  } else {
+    conv.name = betterName(conv, p.name);
+    conv.clientEcid = p.client_ecid || 0;
+    // Deliberately not touching conv.online: the event carries no reachability
+    // field, so `p.online === true` was always false and a message arriving
+    // from a peer we knew to be up marked it offline.
+    conv.friendEcid = p.friend_ecid || 0;
+  }
+  conv.known = true;
+  const seen = conv.messages.has(p.message.id);
+  addMessage(conv, p.message);
+  // Not unread: our own outbound line, or an id already held (a send's echo).
+  if (!seen && p.message.direction === "in" && (!pageVisible() || p.address !== activePeer)) {
+    conv.unread++;
+  }
+  // The strip must always have one selected; off-page, don't clear its unread.
+  if (!activePeer) { setActive(p.address, pageVisible()); return; }
+  publishTabsSoon();
+  publishLogSoon(p.address);
+}
+
+function onClosed(p) {
+  if (!p || p === lastClosed) return;
+  lastClosed = p;
+  // Closing is global — any client can do it.
+  if (p.address) drop(p.address, p.address === activePeer);
+}
+
+function onResync(v) {
+  if (!v || v === lastResync) return;
+  lastResync = v;
+  // A gap may have dropped a chat_message, and a restart may have added chat
+  // support, so re-reconcile rather than stay latched.
+  unsupported = false;
+  adopt();
+  if (activePeer) loadMessages(activePeer);
+}
+
+// A friend's online state changes via friend_updated, with no chat event to
+// match (there is no chat_updated), so reconcile linked conversations from the
+// friends collection. Non-friend conversations have no such signal.
+function onFriends() {
+  const friends = store.get("friends") || ;
+  for (const conv of convs.values()) {
+    if (!conv.friendEcid) continue;
+    const f = friends.find((x) => x.ecid === conv.friendEcid);
+    if (f) { conv.clientEcid = f.client_ecid || 0; conv.online = conv.clientEcid !== 0; }
+  }
+  publishTabsSoon();
+}
+
+// --- fallback polling ----------------------------------------------------
+
+// Chat isn't a resource in events.js's poll loop, so mirror the "polling" flag
+// it owns rather than a second liveness check that could drift and poll while live.
+function startPolling() {
+  if (pollTimer) return;
+  pollTimer = setInterval(() => {
+    adopt();
+    if (activePeer) loadMessages(activePeer);
+  }, POLL_MS);
+}
+
+function stopPolling() {
+  if (pollTimer) { clearInterval(pollTimer); pollTimer = null; }
+}
+
+function onPolling(fallback) {
+  if (fallback) startPolling(); else stopPolling();
+}
+
+// --- public API ----------------------------------------------------------
+
+export const chats = {
+  // First mount of anything showing chat or the unread badge. Idempotent.
+  ensure() {
+    if (started) return;
+    started = true;
+    lastMessage = store.get("chat:message");
+    lastClosed = store.get("chat:closed");
+    lastResync = store.get("resync");
+    offs.push(store.subscribe("chat:message", onMessage));
+    offs.push(store.subscribe("chat:closed", onClosed));
+    offs.push(store.subscribe("resync", onResync));
+    offs.push(store.subscribe("friends", onFriends));
+    // Poll only in events.js's SSE fallback; subscribe() fires with the current
+    // value, so a session that mounts already degraded starts polling at once.
+    offs.push(store.subscribe("polling", onPolling));
+    // Our nick for outbound labels; one read, no poll.
+    api.get("preferences")
+      .then((p) => { myNick = ((p || {}).general || {}).nickname || ""; publishTabs(); })
+      .catch(() => {});
+    adopt();
+  },
+
+  // Logout / dead session. This state outlives the shell, so without teardown
+  // the poll loop keeps hitting a rejected session.
+  reset() {
+    for (const off of offs) off();
+    offs = ;
+    stopPolling();
+    if (tabsTimer) { clearTimeout(tabsTimer); tabsTimer = 0; }
+    if (logTimer) { clearTimeout(logTimer); logTimer = 0; }
+    for (const peer of convs.keys()) store.set("chat:" + peer, );
+    convs.clear();
+    activePeer = "";
+    started = false;
+    unsupported = false;
+    myNick = "";
+    lastMessage = lastClosed = lastResync = null;
+    store.set("chats", { tabs: , activePeer: "", unread: 0, unsupported: false, myNick: "" });
+  },
+
+  setActive,
+  open,
+  adopt,
+
+  // Opening the Messages page marks the visible conversation read.
+  markRead() {
+    const conv = convs.get(activePeer);
+    if (conv && conv.unread) { conv.unread = 0; publishTabs(); }
+  },
+
+  // The 202 echo is the one message object with no timestamp, so stamp one
+  // locally and render at once; the SSE frame ~1s later replaces it by id.
+  async send(peer, text) {
+    const conv = convs.get(peer);
+    if (!conv || !text) return;
+    try {
+      const r = await api.post("chats/" + peer + "/messages", { text });
+      conv.known = true; // the core creates the conversation on this call
+      const m = (r || {}).message;
+      if (m) {
+        addMessage(conv, {
+          id: m.id, direction: "out", text: m.text,
+          sent_at: Math.floor(Date.now() / 1000),
+        });
+        publishTabs();
+        publishLog(peer);
+      }
+    } catch (e) {
+      toast(terr(noteError(e)) || t("messages_error"), "error");
+    }
+  },
+
+  // Closing is global. A 404 means someone else already closed it.
+  async close(peer) {
+    const conv = convs.get(peer);
+    // One the daemon never had is ours alone to forget.
+    if (conv && !conv.known) { drop(peer, false); return; }
+    try { await api.del("chats/" + peer); }
+    catch (e) {
+      if (!e || e.status !== 404) { toast(terr(noteError(e)) || t("messages_error"), "error"); return; }
+    }
+    drop(peer, false);
+  },
+
+  async closeAll() {
+    // Clear the selection up front so no close re-activates a conversation
+    // about to be closed too.
+    activePeer = "";
+    await Promise.all(Array.from(convs.keys()).map((p) => chats.close(p)));
+    // A failed close (non-404) leaves its tab; keep one selected.
+    const first = convs.keys().next().value;
+    if (first) setActive(first); else publishTabs();
+  },
+};

amule-3.1.0.tar.gz/src/webapi/static/js/components.js Added

@@ -0,0 +1,651 @@
+// Shared UI building blocks: small presentational preact components plus
+// the two imperative helpers (toast, confirmDialog) reused across views.
+// Class names match app.css.
+
+import { html, render, useState, useEffect, useRef } from "./dom.js";
+import { formatPercent } from "./format.js";
+import { t, tn, terr, getLang } from "./i18n.js";
+import { api, apiUrl } from "./api.js";
+import { Icon } from "./icons.js";
+
+// --- presentational components -----------------------------------------
+
+// Horizontal progress bar (0..100).
+export function ProgressBar({ percent }) {
+  const p = Math.max(0, Math.min(100, Number(percent) || 0));
+  return html`
+    <div class="progress" style=${{ "--p": p }}>
+      <span class="progress-label">${formatPercent(p)}</span>
+      <div class="progress-fill">
+        <span class="progress-label progress-label-fill">${formatPercent(p)}</span>
+      </div>
+    </div>`;
+}
+
+// Inline status/label pill.
+export function Badge({ kind = "", title, children }) {
+  return html`<span class=${"badge " + kind} title=${title}>${children}</span>`;
+}
+
+// "Save this file to your device", shared by the shared-file detail panel and a
+// finished download's panel (a completed download lives in Incoming, which is
+// shared, so the same hash resolves under shared/{hash}/content).
+//
+// A plain <a href>, never a fetch(): the endpoint answers Content-Disposition:
+// attachment, so the navigation hands the bytes to the browser's own downloader
+// — the page stays mounted and a large file never buffers into JS memory. The
+// HttpOnly session cookie authenticates the navigation, so no token in the URL.
+//
+// A partfile (incomplete) renders as a disabled button: an anchor cannot be
+// disabled, and the endpoint would answer 409 for it anyway.
+export function DownloadLink({ hash, incomplete, tipKey = "shared_download_tip" }) {
+  if (incomplete) {
+    return html`
+      <button class="btn btn-sm" type="button" disabled title=${t("shared_download_tip_partfile")}>
+        <${Icon} name="download" /> ${t("shared_download")}
+      </button>`;
+  }
+  // No `download` attr: the server sets the sanitised filename via Content-Disposition.
+  return html`
+    <a class="btn btn-sm" href=${apiUrl("shared/" + hash + "/content")} title=${t(tipKey)}>
+      <${Icon} name="download" /> ${t("shared_download")}
+    </a>`;
+}
+
+// Empty / loading / error placeholder for view bodies.
+export function Placeholder({ kind, children }) {
+  return html`<div class=${"placeholder placeholder-" + kind}>${children}</div>`;
+}
+
+// Body of a list that has no rows. A `data` collection reads undefined until
+// its snapshot lands and  once it is known empty; the caller passes that as
+// `loading` so a pending fetch doesn't claim "nothing here yet".
+export function listPlaceholder(loading, emptyMsg) {
+  return loading
+    ? html`<${Placeholder} kind="loading">${t("app_loading")}<//>`
+    : html`<${Placeholder} kind="info">${emptyMsg}<//>`;
+}
+
+// Row/select-all checkbox for a table's select column. The <label> fills the
+// cell (see .cell-check), so the whole cell is the click target -- a bare box
+// is a poor one.
+export function checkCell(checked, onToggle, title) {
+  return html`<label class="cell-check"><input type="checkbox" name="row_select" title=${title}
+    checked=${checked} onChange=${(e) => onToggle(e.target.checked)} /></label>`;
+}
+
+// Relative, like BASE in api.js: it has to survive a reverse-proxy subpath.
+const FLAG_BASE = window.location.pathname.replace(/\/?$/, "/") + "flags/";
+const REGIONS = (() => {
+  try { return new Intl.DisplayNames(getLang(), { type: "region" }); } catch (_) { return null; }
+})();
+
+// Flag from GET /flags/{code}.png (#694) next to the code, as the desktop lists
+// draw it. Empty code (GeoIP off / unresolved IP) -> dash, no image; onError
+// hides the image for a well-formed code the flag set has no artwork for.
+export function CountryCell({ code }) {
+  const cc = (code || "").toLowerCase();
+  if (!cc) return "—";
+  const CC = cc.toUpperCase();
+  return html`<span class="country-cell" title=${(REGIONS && REGIONS.of(CC)) || CC}
+    ><img class="flag" src=${FLAG_BASE + cc + ".png"} alt="" width="16" height="11"
+          onError=${(e) => { e.target.style.visibility = "hidden"; }} />${CC}</span>`;
+}
+
+// --- download priority --------------------------------------------------
+// Here rather than in downloads.js: the detail panel edits the same field, and
+// downloads.js already imports it, so importing back would be a cycle.
+
+export const PRIORITIES = "auto", "low", "normal", "high"
+  .map((v) => v, t("downloads_prio_" + v));
+
+export function prioValue(d) { return d.priority_auto ? "auto" : d.priority; }
+
+// Read-only rendering: "Auto (High)" when the daemon is choosing.
+export function prioLabel(d) {
+  const found = PRIORITIES.find((v) => v === d.priority);
+  const base = found ? found1 : d.priority;
+  return d.priority_auto ? t("downloads_prio_auto") + " (" + base + ")" : base;
+}
+
+// --- detail-panel building blocks --------------------------------------
+// Shared by the Downloads and Shared Files detail panels (see split-detail.js).
+
+// Build a stat row tuple: label, value, tooltip with label/tooltip resolved
+// from i18n keys. Consumed by Section() below.
+export const statRow = (labelKey, value, tipKey) => t(labelKey), value, t(tipKey);
+
+// A group of label/value stat cells (reuses the kad stat-grid look). Each cell
+// carries an explanatory tooltip. `rows` is a list of statRow tuples. The detail
+// panels stack several of these (separated by the .detail-sections gap).
+// `titleKey` adds a heading; `actions` is a button row rendered before the grid.
+export function Section(rows, titleKey, actions) {
+  if (!rows.length) return null;
+  const grid = html`
+    <div class="kad-grid">
+      ${rows.map((label, value, tip) => html`
+        <div title=${tip || null}>
+          <div class="kad-stat-label">${label}</div>
+          <div class="kad-stat-value">${value}</div>
+        </div>`)}
+    </div>`;
+  if (!titleKey && !actions) return grid;
+  return html`
+    <div class="detail-group">
+      ${titleKey ? html`<h5 class="detail-group-title">${t(titleKey)}</h5>` : null}
+      ${actions ? html`<div class="detail-actions">${actions}</div>` : null}
+      ${grid}
+    </div>`;
+}
+
+// The directory only, so the file path has to be composed; separator taken from
+// the path itself since amuled may be on Windows. Names the *file*: a
+// partfile's bytes are still under `part_file_name`, so this is where the
+// download will land rather than what is on disk right now.
+//
+// Reads `directory` with a `path` fallback because this helper serves both
+// detail panels: /downloads uses `directory` while /shared uses `path`.
+function fullPath(file) {
+  const dir = file.directory || file.path || "";
+  return dir + (dir.includes("\\") ? "\\" : "/") + (file.name || "");
+}
+
+// Rejects "" (a path the daemon has not reported yet); accepts a POSIX path
+// or a Windows drive letter.
+const hasRealPath = (file) => /^(/\\|A-Za-z:)/.test(file.directory || file.path || "");
+
+// The identity group shared by both detail panels: the hash plus extra fields
+// (directory, part_file_name / parts), with the copy buttons as the group's action row.
+// `extra` is a list of statRow tuples; `titleKey` is forwarded to Section().
+export function IdentityLine({ file, copy, extra, titleKey }) {
+  const hash = statRow("identity_hash",
+    html`<span class="mono">${(file.hash || "").toUpperCase()}</span>`,
+    "identity_tip_hash");
+  const actions = html`
+    <button class="btn btn-sm" type="button" onClick=${() => copy(file.ed2k_link)}>
+      <${Icon} name="copy" /> ${t("identity_copy_ed2k")}
+    </button>
+    <button class="btn btn-sm" type="button" onClick=${() => copy(magnetLink(file))}>
+      <${Icon} name="copy" /> ${t("identity_copy_magnet")}
+    </button>
+    ${hasRealPath(file) ? html`
+      <button class="btn btn-sm" type="button" onClick=${() => copy(fullPath(file))}>
+        <${Icon} name="copy" /> ${t("identity_copy_path")}
+      </button>` : null}`;
+  return Section(hash, ...extra, titleKey, actions);
+}
+
+// Flat notebook-style tab strip (aMule CMuleNotebook look). `tabs` is a list
+// of { key, label, badge?, cls?, title?, closeLabel? }; `active` is the
+// selected key; `onSelect(key)` is called on click. `cls` goes on the strip
+// itself. Pass `onClose(key)` for a close affordance per tab; callers that
+// omit it render exactly as before.
+//
+// A closable tab becomes a two-button group rather than a button inside a
+// button: nesting interactive elements is invalid markup and screen readers do
+// not reliably expose the inner one.
+export function Tabs({ tabs, active, onSelect, onClose, extra, cls = "" }) {
+  const tabButton = (tab) => html`
+    <button type="button" role="tab"
+            class=${"tab" + (tab.key === active ? " active" : "") + (tab.cls ? " " + tab.cls : "")}
+            aria-selected=${tab.key === active} title=${tab.title}
+            onClick=${() => onSelect(tab.key)}>
+      ${tab.label}
+      ${tab.badge != null ? html`<span class="tab-badge">${tab.badge}</span>` : null}
+    </button>`;
+  return html`
+    <div class=${"tabs" + (cls ? " " + cls : "")} role="tablist">
+      ${tabs.map((tab) => (onClose ? html`
+        <span class="tab-item" role="presentation">
+          ${tabButton(tab)}
+          <button type="button" class="tab-close" title=${tab.closeLabel}
+                  aria-label=${tab.closeLabel} onClick=${() => onClose(tab.key)}>×</button>
+        </span>` : tabButton(tab)))}
+      ${extra ? html`<div class="tabs-extra">${extra}</div>` : null}
+    </div>`;
+}
+
+// --- file comments / ratings -------------------------------------------
+// Shared by both detail panels. Rating is a 0-5 integer (0 = not rated),
+// with -1 in a per-source entry meaning "comment but no rating". The labels
+// mirror the desktop GetRateString() (src/OtherFunctions.cpp).
+
+const RATING_OPTIONS = 0, 1, 2, 3, 4, 5;
+
+// The comments/ratings table, shared by the download detail panel (source
+// comments + retrieved Kad notes) and the search view's per-result dialog
+// (Kad notes only). Both render the same rows, so they render them from the
+// same place -- a second hand-written copy is how the two drift apart.
+export function CommentsList({ comments }) {
+  const list = comments || ;
+  if (!list.length) return html`<${Placeholder} kind="info">${t("comments_none")}<//>`;
+  return html`
+    <table class="comments-list">
+      <thead><tr>
+        <th>${t("comments_col_username")}</th>
+        <th>${t("comments_col_rating")}</th>
+        <th>${t("comments_col_filename")}</th>
+        <th>${t("comments_col_comment")}</th>
+      </tr></thead>
+      <tbody>
+        ${list.map((c, i) => html`
+          <tr key=${i}>
+            <td>${c.username}</td>
+            <td><span class=${"rating-badge rating-" + c.rating}>${ratingLabel(c.rating)}</span></td>
+            <td class="comments-fname" title=${c.filename}>${c.filename}</td>
+            <td>${c.comment}</td>
+          </tr>`)}
+      </tbody>
+    </table>`;
+}
+
+// i18n label for a rating value; -1 -> "comment only".
+export function ratingLabel(r) {
+  return r === -1 ? t("rating_none") : t("rating_" + r);
+}
+
+// Edit-your-own comment + rating form. `kind` is "downloads" or "shared";
+// both PATCH endpoints accept {comment, rating} together (ADMIN, comment <= 50
+// chars). Keyed on hash by the caller so switching files re-seeds the inputs.
+// Wrapped in .admin-only so guests never see it (matches the app-wide gate).
+// `disabled` greys the whole form out with an explanatory `disabledHint` — used
+// by Downloads for a file that isn't shared yet (0 complete parts), which the
+// daemon would reject with 409 not_shared.
+export function CommentEditor({ hash, kind, comment, rating, onSaved, disabled = false, disabledHint }) {
+  const text, setText = useState(comment || "");
+  const rate, setRate = useState(Number(rating) || 0);
+  const busy, setBusy = useState(false);
+
+  const save = async () => {
+    setBusy(true);
+    try {
+      await api.patch(kind + "/" + hash, { my_comment: text, my_rating: Number(rate) });
+      toast(t("comments_saved"), "success");
+      if (onSaved) onSaved();
+    } catch (e) {
+      toast(e.code === "not_shared" ? t("comments_not_shared") : terr(e), "error");
+    } finally {
+      setBusy(false);
+    }
+  };
+
+  return html`
+    <form class="comment-editor admin-only" onSubmit=${(e) => { e.preventDefault(); save(); }}>
+      <label class="comment-editor-label">${t("comments_your_comment")}</label>
+      <textarea class="input comment-editor-text" name="comment" maxlength="50" rows="2"
+                placeholder=${t("comments_placeholder")} disabled=${disabled}
+                value=${text} onInput=${(e) => setText(e.target.value)}></textarea>
+      <div class="comment-editor-row">
+        <select class="input input-sm" name="rating" value=${rate} disabled=${disabled}
+                onChange=${(e) => setRate(e.target.value)}>
+          ${RATING_OPTIONS.map((r) => html`<option value=${r}>${ratingLabel(r)}</option>`)}
+        </select>
+        <button class="btn btn-primary btn-sm" type="submit" disabled=${busy || disabled}>${t("comments_save")}</button>
+      </div>
+      ${disabled && disabledHint ? html`<p class="comment-editor-hint">${disabledHint}</p>` : null}
+    </form>`;
+}
+
+// --- rename file --------------------------------------------------------
+// Rename form shared by both detail panels. `kind` is "downloads" or
+// "shared"; both PATCH endpoints accept {name} (ADMIN, mapped to
+// EC_OP_RENAME_FILE). The daemon rejects empty names and names with path
+// separators, so we mirror that client-side before sending. Keyed on hash by
+// the caller so switching files re-seeds the input. Wrapped in .admin-only.
+export function RenameForm({ hash, kind, name, onSaved, disabled = false }) {
+  const val, setVal = useState(name || "");
+  const busy, setBusy = useState(false);
+  const clean = val.trim();
+  const invalid = !clean || clean.includes("/") || clean.includes("\\");
+
+  const save = async () => {
+    setBusy(true);
+    try {
+      await api.patch(kind + "/" + hash, { name: clean });
+      toast(t("rename_saved"), "success");
+      if (onSaved) onSaved();
+    } catch (e) {
+      toast(terr(e), "error");
+    } finally {
+      setBusy(false);
+    }
+  };
+
+  return html`
+    <form class="rename-form admin-only" onSubmit=${(e) => { e.preventDefault(); save(); }}>
+      <label class="rename-label">${t("filename_rename_label")}</label>
+      <div class="rename-row">
+        <input class="input input-sm" name="rename_file" type="text" disabled=${disabled}
+               placeholder=${t("filename_rename_placeholder")}
+               value=${val} onInput=${(e) => setVal(e.target.value)} />
+        <button class="btn btn-primary btn-sm" type="submit"
+                disabled=${busy || disabled || invalid}>${t("comments_save")}</button>
+      </div>
+    </form>`;
+}
+
+// --- toast --------------------------------------------------------------
+// Lightweight imperative notifications. A single host div is lazily created
+// and reused; toasts auto-dismiss (errors linger a bit longer).
+
+let toastHost = null;
+export function toast(message, kind) {
+  if (!toastHost) {
+    toastHost = document.createElement("div");
+    toastHost.className = "toast-host";
+    document.body.appendChild(toastHost);
+  }
+  const node = document.createElement("div");
+  node.className = "toast " + (kind || "info");
+  node.textContent = message;
+  toastHost.appendChild(node);
+  setTimeout(() => {
+    node.classList.add("toast-out");
+    setTimeout(() => node.remove(), 300);
+  }, kind === "error" ? 5000 : 3000);
+}
+
+// --- confirm dialog -----------------------------------------------------
+// Promise-based modal confirm. Renders a preact tree into a throwaway host
+// appended to <body>, resolves true/false, then unmounts and cleans up.
+
+export function confirmDialog(message, { okLabel = t("common_yes"), cancelLabel = t("common_cancel") } = {}) {
+  return new Promise((resolve) => {
+    const host = document.createElement("div");
+    document.body.appendChild(host);
+    const close = (val) => { render(null, host); host.remove(); resolve(val); };
+    render(html`
+      <div class="modal-overlay" onClick=${(e) => { if (e.target === e.currentTarget) close(false); }}>
+        <div class="modal">
+          <p class="modal-msg">${message}</p>
+          <div class="modal-actions">
+            <button class="btn" onClick=${() => close(false)}>${cancelLabel}</button>
+            <button class="btn btn-primary" onClick=${() => close(true)}>${okLabel}</button>
+          </div>
+        </div>
+      </div>`, host);
+  });
+}
+
+// --- ed2k link + clipboard helpers -------------------------------------
+// Shared by the detail panels' Copy ED2K / Copy magnet buttons.
+
+// Build the ed2k-compatible magnet URI exactly like the desktop GUI's
+// CamuleAppCommon::CreateMagnetLink (src/amuleAppCommon.cpp): field order
+// dn, xt:urn:ed2k, xt:urn:ed2khash, xl; hash lower-cased; the name only has
+// spaces -> %20 and '/' stripped (CPath::Cleanup(false)), not full URL-encode.
+export function magnetLink(d) {
+  let dn = "";
+  for (const ch of d.name || "") {
+    if (ch === "/") continue;
+    if (ch === " ") dn += "%20";
+    else if (ch.codePointAt(0) >= 32) dn += ch;
+  }
+  const h = (d.hash || "").toLowerCase();
+  return "magnet:?dn=" + dn +
+    "&xt=urn:ed2k:" + h + "&xt=urn:ed2khash:" + h +
+    "&xl=" + (d.size_bytes || 0);
+}
+
+// Copy to clipboard with a plain fallback for non-secure contexts (the web UI
+// may be reached over http on a LAN IP, where navigator.clipboard is absent).
+export async function copyText(text) {
+  if (navigator.clipboard && window.isSecureContext) {
+    await navigator.clipboard.writeText(text);
+    return;
+  }
+  const ta = document.createElement("textarea");
+  ta.value = text;
+  ta.style.position = "fixed";
+  ta.style.opacity = "0";
+  document.body.appendChild(ta);
+  ta.select();
+  try { document.execCommand("copy"); } finally { ta.remove(); }
+}
+
+// --- pieces bar (downloads chunk map + shared availability bar) --------
+
+// The pieces bar mirrors the aMule GUI download bar, theme-tuned via CSS vars:
+// green (--ok) = have it, blue (--piece-avail-lo -> --piece-avail, faded by
+// source count) = available, red (--bad) = missing (nobody has it).
+// Sources at which an available part reaches full-intensity blue. This is
+// partbar::kAvailFull in src/PartBarLegend.h, which is where the desktop GUI's
+// two bars now take the same fade from, so the number has to match: a file that
+// looks fully shared in the GUI must look fully shared here.
+//
+// It used to say the GUI faded "blue = 210 - 22*(sources-1), saturating around
+// 10". Every part of that was wrong. The expression was written into the GREEN
+// channel while blue stayed at 255, and it does not reach zero until the
+// eleventh source, so the GUI and this file disagreed both about which colour
+// they were fading and about where the fade stopped. Both bars read
+// SourceAvailabilityColour() since #1220 and neither computes a shade of its
+// own.
+const AVAIL_FULL = 10;
+
+// Parse a CSS colour ("#rgb", "#rrggbb", or "rgb(...)") to r,g,b.
+function toRGB(s) {
+  s = (s || "").trim();
+  if (s0 === "#") {
+    let h = s.slice(1);
+    if (h.length === 3) h = h0 + h0 + h1 + h1 + h2 + h2;
+    const n = parseInt(h, 16);
+    return (n >> 16) & 255, (n >> 8) & 255, n & 255;
+  }
+  const m = s.match(/\d.+/g);
+  return m ? +m0, +m1, +m2 : 0, 0, 0;
+}
+// Linear blend a->b by f in 0,1, as a canvas fillStyle string.
+function mix(a, b, f) {
+  return "rgb(" + Math.round(a0 + (b0 - a0) * f) + "," +
+    Math.round(a1 + (b1 - a1) * f) + "," +
+    Math.round(a2 + (b2 - a2) * f) + ")";
+}
+
+// Blue shade for a part that at least one peer has: fades from
+// --piece-avail-lo to --piece-avail as the source count rises. The desktop GUI
+// blends the same two endpoints over the same AVAIL_FULL - 1 steps, and no
+// channel of that blend can land on a half, so Math.round here and integer
+// division there produce the same bytes rather than merely similar ones.
+function availShade(sources, lo, hi) {
+  const frac = Math.min(1, Math.max(0, ((sources || 1) - 1) / (AVAIL_FULL - 1)));
+  return mix(lo, hi, frac);
+}
+
+// Chunk map: one proportional slice per ~9.28 MB part.
+// `mode="download"` colours by local state (the Downloads panel);
+// `mode="availability"` colours purely by source count (the Shared
+// panel's "Obtained Parts" bar, mirroring the desktop column);
+// `mode="hashing"` splits the bar green/amber at the hashed/pending boundary
+// while a re-hash runs over the file (Verify Local Data, or an AICH hashset
+// rebuild), mirroring the desktop's two-span bar. That pass reports only a
+// *count* of parts done, never a per-part map, so it is driven by
+// `total` (= total_part_count) + `hashed` instead of `parts`.
+// Canvas rather than N <div>s so files with hundreds/thousands of parts redraw
+// cheaply on every live tick. Colours are read from the theme each draw.
+export function PiecesBar({ parts, mode = "download", total = 0, hashed = 0 }) {
+  const ref = useRef(null);
+  const drawRef = useRef(null);
+  const partsRef = useRef(parts);
+  partsRef.current = parts;
+  const modeRef = useRef(mode);
+  modeRef.current = mode;
+  const totalRef = useRef(total);
+  totalRef.current = total;
+  const hashedRef = useRef(hashed);
+  hashedRef.current = hashed;
+
+  useEffect(() => {
+    const canvas = ref.current;
+    if (!canvas) return;
+    const draw = () => {
+      const cs = getComputedStyle(document.documentElement);
+      const complete = cs.getPropertyValue("--ok").trim();
+      const missing = cs.getPropertyValue("--bad").trim();
+      // not-yet-hashed remainder of a hashing pass (desktop: amber)
+      const pending = cs.getPropertyValue("--warn").trim();
+      // available parts fade from few-sources -> many-sources blue
+      const availLo = toRGB(cs.getPropertyValue("--piece-avail-lo"));
+      const availHi = toRGB(cs.getPropertyValue("--piece-avail"));
+      const dpr = window.devicePixelRatio || 1;
+      const w = Math.max(1, Math.round(canvas.clientWidth * dpr));
+      const h = Math.max(1, Math.round(canvas.clientHeight * dpr));
+      if (canvas.width !== w) canvas.width = w;
+      if (canvas.height !== h) canvas.height = h;
+      const ctx = canvas.getContext("2d");
+      ctx.clearRect(0, 0, w, h);
+      const list = partsRef.current || ;
+      const hashing = modeRef.current === "hashing";
+      const count = hashing ? totalRef.current : list.length;
+      const pw = w / (count || 1);
+      // When pieces are wide enough, leave a 1px gap so each piece is
+      // individually countable; when many/thin, overdraw to avoid seams and
+      // let them blend into a continuous availability bar (the cleared track
+      // background shows through the gaps).
+      const gap = pw >= 6 * dpr ? Math.max(1, Math.round(dpr)) : 0;
+      // Availability mode has no local-completeness axis at all: a shared
+      // file is 100% local by definition, so every part is either held by
+      // some peer (blue, faded by how many) or by nobody (red).
+      const avail = modeRef.current === "availability";
+      for (let i = 0; i < count; i++) {
+        const p = listi;
+        let fill;
+        // Overshoot needs no clamp: `i < hashed` just saturates to all-green,
+        // which is what the desktop's byte-offset clamp achieves.
+        if (hashing) fill = i < hashedRef.current ? complete : pending;
+        else if (avail) {
+          fill = p.sources > 0 ? availShade(p.sources, availLo, availHi) : missing;
+        } else if (p.state === "complete") fill = complete;
+        else if (p.state === "pending") {
+          fill = availShade(p.sources, availLo, availHi);
+        } else fill = missing;
+        ctx.fillStyle = fill;
+        const x0 = Math.round(i * pw), x1 = Math.round((i + 1) * pw);
+        const width = gap ? Math.max(1, x1 - x0 - gap) : (x1 - x0) + 1;
+        ctx.fillRect(x0, 0, width, h);
+      }
+      writeTitle();
+    };
+    // Per-part readout via the native `title` tooltip: no positioning code,
+    // no CSS, no new strings -- composed from the legend's own labels. The
+    // canvas itself is aria-hidden (the legend beside it is the text
+    // alternative), so this is a pointer-only progressive enhancement.
+    //
+    // The hovered piece is remembered so a redraw can refresh its label: the
+    // pointer can sit still while what is under it changes -- a part completing
+    // in download mode, or the boundary sweeping past it in hashing mode --
+    // which would otherwise leave the reading stale until the mouse moved.
+    let hover = -1;
+    const writeTitle = () => {
+      const list = partsRef.current || ;
+      const avail = modeRef.current === "availability";
+      const hashing = modeRef.current === "hashing";
+      // Same piece count the draw uses, so the hovered index matches the fill.
+      const count = hashing ? totalRef.current : list.length;
+      if (hover < 0 || hover >= count) { canvas.title = ""; return; }
+      const p = listhover;
+      // Show the source count only where the colour actually encodes it,
+      // i.e. wherever the fill came from availShade(). A `pending` part
+      // with no sources still paints blue but has nothing to count.
+      const graded = !hashing && (avail || p.state === "pending") && p.sources > 0;
+      const label = hashing
+        ? t(hover < hashedRef.current ? "pieces_hashed" : "pieces_pending")
+        : avail
+        ? t(p.sources > 0 ? "pieces_available" : "pieces_no_sources")
+        : t(p.state === "complete" ? "pieces_complete"
+          : p.state === "pending" ? "pieces_available" : "pieces_missing");
+      // Only write on a real change: mousemove fires far more often than the
+      // hovered piece changes, and each write is a DOM attribute mutation.
+      const next = "#" + (hover + 1) + " \u00b7 " + label + (graded ? " \u00b7 " + p.sources : "");
+      if (canvas.title !== next) canvas.title = next;
+    };
+    const onMove = (e) => {
+      const list = partsRef.current || ;
+      const count = modeRef.current === "hashing" ? totalRef.current : list.length;
+      // A zero clientWidth would make offsetX/width NaN and index past the end.
+      const w = canvas.clientWidth;
+      hover = (!count || !w) ? -1
+        : Math.min(count - 1, Math.max(0, Math.floor((e.offsetX / w) * count)));
+      writeTitle();
+    };
+    canvas.addEventListener("mousemove", onMove);
+    drawRef.current = draw;
+    draw();
+    // Colours are read from CSS vars on every draw, so a theme switch only
+    // needs a redraw (mirrors charts.js).
+    const ro = new ResizeObserver(draw);
+    ro.observe(canvas);
+    const mo = new MutationObserver(draw);
+    mo.observe(document.documentElement, { attributes: true, attributeFilter: "data-theme" });
+    const mq = window.matchMedia("(prefers-color-scheme: dark)");
+    mq.addEventListener("change", draw);
+    return () => {
+      ro.disconnect(); mo.disconnect();
+      mq.removeEventListener("change", draw);
+      canvas.removeEventListener("mousemove", onMove);
+    };
+  }, );
+
+  useEffect(() => { drawRef.current && drawRef.current(); }, parts, mode, total, hashed);
+
+  return html`<div class="pieces-bar"><canvas ref=${ref} aria-hidden="true"></canvas></div>`;
+}
+
+export function PiecesLegend({ parts, mode = "download", total = 0, hashed = 0 }) {
+  const chip = (v) => html`<span class="legend-chip" style=${{ background: "var(" + v + ")" }}></span>`;
+  // Hashing mode: hashed / pending counts and the percentage. Clamped because
+  // amuled reports part + 1, which can overshoot `total` on the short tail
+  // part -- pending must never go negative.
+  if (mode === "hashing") {
+    const n = Math.min(Number(hashed) || 0, total);
+    return html`
+      <div class="chart-legend pieces-legend" title=${t("pieces_hint_hashing")}>
+        <span class="legend-item">${chip("--ok")} ${t("pieces_hashed")} <b>${n}</b></span>
+        <span class="legend-item">${chip("--warn")} ${t("pieces_pending")} <b>${total - n}</b></span>
+        <span class="pieces-total">
+          ${formatPercent(total ? (n / total) * 100 : 0)} · ${tn("pieces_count", total)}
+        </span>
+      </div>`;
+  }
+  // Availability mode: two buckets only (some source / no source), plus the
+  // gradient scale that explains what the blue shade encodes.
+  if (mode === "availability") {
+    let avail = 0;
+    for (const p of parts) if (p.sources > 0) avail++;
+    return html`
+      <div class="chart-legend pieces-legend">
+        <span class="legend-item" title=${t("pieces_hint_peers")}>
+          ${chip("--piece-avail")} ${t("pieces_available")} <b>${avail}</b>
+          ${avail > 0 ? html`
+            <span class="pieces-scale">
+              <small>(${t("pieces_fewer")}</small>
+              <span class="pieces-scale-bar"></span>
+              <small>${t("pieces_more")})</small>
+            </span>` : null}
+        </span>
+        <span class="legend-item" title=${t("pieces_no_sources_hint")}>
+          ${chip("--bad")} ${t("pieces_no_sources")} <b>${parts.length - avail}</b>
+        </span>
+        <span class="pieces-total">${tn("pieces_count", parts.length)}</span>
+      </div>`;
+  }
+  const counts = { complete: 0, pending: 0, unavailable: 0 };
+  for (const p of parts) countsp.state = (countsp.state || 0) + 1;
+  // One line: three flat state chips (green/red/blue), then the availability
+  // gradient scale grouped right after "Available" (it explains that blue's
+  // shade encodes source count) — keeps the row compact and the chips uniform.
+  return html`
+    <div class="chart-legend pieces-legend">
+      <span class="legend-item">${chip("--ok")} ${t("pieces_complete")} <b>${counts.complete}</b></span>
+      <span class="legend-item">${chip("--bad")} ${t("pieces_missing")} <b>${counts.unavailable}</b></span>
+      <span class="legend-item" title=${t("pieces_hint_sources")}>
+        ${chip("--piece-avail")} ${t("pieces_available")} <b>${counts.pending}</b>
+        ${counts.pending > 0 ? html`
+          <span class="pieces-scale">
+            <small>(${t("pieces_fewer")}</small>
+            <span class="pieces-scale-bar"></span>
+            <small>${t("pieces_more")})</small>
+          </span>` : null}
+      </span>
+      <span class="pieces-total">${tn("pieces_count", parts.length)}</span>
+    </div>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/dom.js Added

@@ -0,0 +1,31 @@
+// The rendering layer: binds htm to preact's hyperscript and re-exports
+// everything a view needs from a single place, so each component imports
+// `html`, the hooks, and `useStore` from here.
+//
+//   import { html, useState, useStore } from "../dom.js";
+//   export function MyView() {
+//     const downloads = useStore("downloads"); // re-renders on store change
+//     return html`<div>${downloads.length} files</div>`;
+//   }
+
+import { h, render } from "preact";
+import { useState, useEffect } from "preact/hooks";
+import htm from "htm";
+import { store } from "./store.js";
+
+// html`<tag .../>` — tagged-template JSX bound to preact's createElement.
+export const html = htm.bind(h);
+
+export { h, render };
+export * from "preact/hooks";
+
+// Bridge the pub/sub store (fed by the SSE/polling data layer in events.js)
+// into preact: returns the current value for `key` and re-renders the
+// component whenever the store publishes a new value for it.
+export function useStore(key) {
+  const value, setValue = useState(() => store.get(key));
+  // store.subscribe() fires immediately with the current value and returns
+  // its own unsubscribe fn, which is exactly what useEffect wants back.
+  useEffect(() => store.subscribe(key, setValue), key);
+  return value;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/events.js Added

@@ -0,0 +1,285 @@
+// Live data layer: seeds domain collections from REST, then keeps them
+// fresh from the SSE stream (/api/v1/events). If SSE can't connect it
+// transparently falls back to periodic polling so the UI stays live.
+//
+// A "resource" is a list endpoint that has matching SSE deltas, e.g.
+// downloads (download_added/updated/removed). Views register their
+// resource once, call ensure(key) to start it, then subscribe to the
+// store key of the same name to render.
+
+import { store } from "./store.js";
+import { api } from "./api.js";
+
+const POLL_INTERVAL_MS = 4000;
+const SSE_FAIL_THRESHOLD = 3;
+
+const resources = new Map();   // key -> spec
+const collections = new Map(); // key -> Map(id -> item)
+const active = new Set();       // keys currently seeded/streamed
+const seedBuffers = new Map();  // key -> array of deltas that arrived mid-seed
+
+let es = null;
+let sseFails = 0;
+let pollTimer = null;
+let statusActive = false;
+
+export const data = {
+  // spec: { key, eventPrefix, id, list:()=>Promise<array>, channel? }
+  register(spec) {
+    if (!resources.has(spec.key)) resources.set(spec.key, spec);
+  },
+
+  async ensure(key) {
+    if (active.has(key)) return;
+    active.add(key);
+    openSse();
+    attachResourceListeners(resources.get(key));
+    await seed(key);
+  },
+
+  async ensureStatus() {
+    if (!statusActive) {
+      statusActive = true;
+      openSse();
+      await refreshStatus();
+    }
+  },
+
+  // Force a re-fetch of a resource (used after a mutation when waiting
+  // for the SSE echo would feel laggy).
+  refresh(key) { return active.has(key) ? seed(key) : Promise.resolve(); },
+
+  isLive() { return es !== null && es.readyState === EventSource.OPEN; },
+
+  // Full teardown: no SSE, no poll timer, no pending publish, nothing
+  // seeded. Called when the session dies (an amuleapi restart invalidates
+  // the cookie) and on logout. Everything here is module-level and survives
+  // the shell unmounting, so without this the poll loop keeps firing one
+  // request per active resource every 4 s against a session the server has
+  // already rejected — which is exactly what earns the IP a ban. Leaves the
+  // registry intact: views re-register once per module load, and ensure()
+  // re-seeds them after the next login.
+  stop() {
+    if (es) { es.close(); es = null; }
+    stopPolling();
+    for (const timer of publishTimers.values()) clearTimeout(timer);
+    publishTimers.clear();
+    seedBuffers.clear();
+    collections.clear();
+    listenersAttached.clear();
+    // Unpublish the rows too, so after the next login a view spins instead of
+    // showing the dead session's list until the new snapshot lands.
+    for (const k of active) store.set(k, undefined);
+    active.clear();
+    statusActive = false;
+    sseFails = 0;
+    store.set("live", false);
+  },
+};
+
+async function seed(key) {
+  const spec = resources.get(key);
+  if (!spec) return;
+  // Buffer-then-replay (EVENTS.md §Bootstrap): start buffering deltas
+  // *before* awaiting the snapshot, so a delta (esp. a _removed) that lands
+  // during the fetch isn't clobbered by the snapshot replacing the map.
+  const buf = ;
+  seedBuffers.set(key, buf);
+  try {
+    const arr = (await spec.list()) || ;
+    // stop() may have landed while the snapshot was in flight; don't
+    // resurrect a collection the teardown just dropped.
+    if (!active.has(key)) return;
+    const m = new Map();
+    for (const it of arr) m.set(String(itspec.id), it);
+    // Drain buffered deltas over the fresh snapshot, in arrival order.
+    for (const { op, payload } of buf) {
+      const idv = String(payloadspec.id);
+      if (op === "del") m.delete(idv); else m.set(idv, payload);
+    }
+    collections.set(key, m);
+    publish(key);
+  } catch (e) {
+    console.error("seed " + key + " failed", e);
+    // An unset key means "still loading", so a first seed that never lands
+    // would spin forever: fall back to empty (the poll loop retries). Guarded
+    // on unset so a failed refresh() keeps its rows, and on active so a 401 —
+    // which runs stop() before rejecting here — stays torn down.
+    if (active.has(key) && store.get(key) === undefined) store.set(key, );
+  } finally {
+    seedBuffers.delete(key); // flip to direct-apply
+  }
+}
+
+function publish(key) {
+  const m = collections.get(key) || new Map();
+  store.set(key, Array.from(m.values()));
+}
+
+// Coalesce bursty SSE deltas. A busy queue (many downloads/shared/clients
+// updating per second) would otherwise re-render the whole table on every
+// single delta and lock the main thread. Trailing throttle: at most one
+// publish per window per key. Seeds/refreshes still publish immediately, so
+// initial load and post-mutation refreshes stay snappy.
+const PUBLISH_THROTTLE_MS = 500;
+const publishTimers = new Map();
+function publishThrottled(key) {
+  if (publishTimers.has(key)) return;
+  publishTimers.set(key, setTimeout(() => { publishTimers.delete(key); publish(key); }, PUBLISH_THROTTLE_MS));
+}
+
+async function refreshStatus() {
+  try {
+    const s = await api.get("status");
+    if (statusActive) store.set("status", s);
+  } catch (e) { /* keep last known status */ }
+}
+
+// --- SSE ---------------------------------------------------------------
+function openSse() {
+  if (es) return;
+  es = new EventSource(window.location.pathname.replace(/\/?$/, "/") + "api/v1/events");
+
+  es.addEventListener("open", () => {
+    sseFails = 0;
+    stopPolling();
+    store.set("live", true);
+  });
+
+  es.addEventListener("error", () => {
+    // EventSource auto-reconnects; only flip to polling after repeated
+    // failures so a single blip doesn't thrash.
+    sseFails++;
+    store.set("live", false);
+    // ...except when the browser gave up for good. A response it refuses to
+    // stream — a 401 once amuleapi has been restarted, a wrong content type —
+    // fails the connection permanently (readyState CLOSED, no retry), so
+    // waiting out a retry budget that will never be spent would leave the UI
+    // frozen on stale data. Fall back now; polling's first request is what
+    // surfaces the dead session.
+    if (es && es.readyState === EventSource.CLOSED) sseFails = SSE_FAIL_THRESHOLD;
+    if (sseFails >= SSE_FAIL_THRESHOLD) startPolling();
+  });
+
+  es.addEventListener("status_changed", (ev) => {
+    try { store.set("status", JSON.parse(ev.data)); } catch (_) {}
+  });
+
+  es.addEventListener("log_appended", (ev) => {
+    try { store.set("log:appended", JSON.parse(ev.data)); } catch (_) {}
+  });
+
+  // Search has its own channel and only partly fits the collection model --
+  // each search is a fresh result space -- so it's surfaced via store keys the
+  // search view consumes directly rather than the generic resource plumbing.
+  // search_result_added is byte-for-byte a /search/{id}/results entry (keyed
+  // by hash, nested sources {total, complete}); search_progress carries
+  // {state, percent, results, kind} and its terminal frame (state:
+  // "finished") is the completion signal. Inert unless a search is active.
+  //
+  // search_result_updated carries the identical payload for a row that
+  // changed after it arrived -- a hit you started downloading, or a Kad note
+  // that landed. Both land on the same store key because the view keys by
+  // hash and overwrites, which is exactly the upsert the two events describe
+  // between them; they stay distinct on the wire so a consumer that only
+  // wants additions is not silently given updates too.
+  const onSearchResult = (ev) => {
+    try { store.set("search:result", JSON.parse(ev.data)); } catch (_) {}
+  };
+  es.addEventListener("search_result_added", onSearchResult);
+  es.addEventListener("search_result_updated", onSearchResult);
+  // Identity-only ({search_id, hash}), so it gets its own key: routing it
+  // through onSearchResult would upsert a row with no fields.
+  es.addEventListener("search_result_removed", (ev) => {
+    try { store.set("search:result_removed", JSON.parse(ev.data)); } catch (_) {}
+  });
+  es.addEventListener("search_progress", (ev) => {
+    try { store.set("search:progress", JSON.parse(ev.data)); } catch (_) {}
+  });
+
+  // search_closed: the slot is gone (freed by a DELETE from any client, an
+  // EC reset, or the slot cap). A view bound to that id has nothing left to
+  // read, so surface it and let the view decide.
+  es.addEventListener("search_closed", (ev) => {
+    try { store.set("search:closed", JSON.parse(ev.data)); } catch (_) {}
+  });
+
+  // Comments ride their own event (EVENTS.md §comments_updated) instead of
+  // download_updated, so the per-tick download frame stays lean. The payload is
+  // the GET downloads/{hash}/comments body plus `hash` — the detail view
+  // applies it directly rather than re-fetching.
+  es.addEventListener("comments_updated", (ev) => {
+    try { store.set("comments:updated", JSON.parse(ev.data)); } catch (_) {}
+  });
+
+  // Chat rides store keys like search, not the added/updated/removed model.
+  // chat_message is one frame per message, inbound AND outbound (an outbound one
+  // relays a send from another client); chats.js demuxes by `peer`.
+  es.addEventListener("chat_message", (ev) => {
+    try { store.set("chat:message", JSON.parse(ev.data)); } catch (_) {}
+  });
+  es.addEventListener("chat_session_closed", (ev) => {
+    try { store.set("chat:closed", JSON.parse(ev.data)); } catch (_) {}
+  });
+
+  es.addEventListener("resync", () => {
+    if (statusActive) refreshStatus();
+    for (const k of active) seed(k);
+    // chats.js and the log panel aren't `active` resources, so the re-seed
+    // above misses them: one counter both can watch.
+    store.set("resync", (store.get("resync") || 0) + 1);
+  });
+
+  for (const spec of resources.values()) attachResourceListeners(spec);
+}
+
+const listenersAttached = new Set();
+function attachResourceListeners(spec) {
+  if (!es || !spec || listenersAttached.has(spec.key)) return;
+  listenersAttached.add(spec.key);
+  es.addEventListener(spec.eventPrefix + "_added", (ev) => applyDelta(spec, "set", ev));
+  es.addEventListener(spec.eventPrefix + "_updated", (ev) => applyDelta(spec, "set", ev));
+  es.addEventListener(spec.eventPrefix + "_removed", (ev) => applyDelta(spec, "del", ev));
+}
+
+function applyDelta(spec, op, ev) {
+  let payload;
+  try { payload = JSON.parse(ev.data); } catch (_) { return; }
+  // Still seeding this key — buffer instead of applying so seed() can drain
+  // these over the snapshot once it lands.
+  const buf = seedBuffers.get(spec.key);
+  if (buf) { buf.push({ op, payload }); return; }
+  let m = collections.get(spec.key);
+  if (!m) { m = new Map(); collections.set(spec.key, m); }
+  const idv = String(payloadspec.id);
+  if (op === "del") m.delete(idv); else m.set(idv, payload);
+  publishThrottled(spec.key);
+}
+
+// --- polling fallback --------------------------------------------------
+function startPolling() {
+  if (pollTimer) return;
+  store.set("polling", true);
+  let ticking = false;
+  const tick = async () => {
+    if (ticking) return; // a slow link shouldn't stack ticks on top of each other
+    ticking = true;
+    try {
+      // Status goes first and is awaited: it is the cheapest probe we have,
+      // so a dead session latches the api gate (and tears this loop down)
+      // before the same tick's resource fetches go out — one rejected
+      // request per restart instead of one per active resource.
+      if (statusActive) await refreshStatus();
+      for (const k of active) seed(k);
+    } finally {
+      ticking = false;
+    }
+  };
+  tick();
+  pollTimer = setInterval(tick, POLL_INTERVAL_MS);
+}
+
+function stopPolling() {
+  if (pollTimer) { clearInterval(pollTimer); pollTimer = null; }
+  store.set("polling", false);
+}

amule-3.1.0.tar.gz/src/webapi/static/js/format.js Added

@@ -0,0 +1,83 @@
+// Pure value formatters shared by every view. No DOM, no framework —
+// just the presentation rules that match aMule Web.
+
+import { t } from "./i18n.js";
+
+// IEC, because the scaling below is by 1024 -- same reasoning as
+// CastItoXBytes on the GUI side.
+const UNITS = "B", "KiB", "MiB", "GiB", "TiB", "PiB";
+
+export function formatBytes(n) {
+  n = Number(n) || 0;
+  let i = 0;
+  while (n >= 1024 && i < UNITS.length - 1) { n /= 1024; i++; }
+  const digits = (i === 0 || n >= 100) ? 0 : (n >= 10 ? 1 : 2);
+  return n.toFixed(digits) + " " + UNITSi;
+}
+
+export function formatSpeed(bps) {
+  bps = Number(bps) || 0;
+  if (bps <= 0) return "—";
+  return formatBytes(bps) + "/s";
+}
+
+// Pick ONE byte unit for a whole axis from its max value, so chart ticks can be
+// bare numbers with the unit shown once instead of repeating "KB/s" per tick.
+// Returns the divisor to scale raw values by and the unit label to display.
+export function bytesAxis(max, perSec) {
+  let i = 0, n = Number(max) || 0;
+  while (n >= 1024 && i < UNITS.length - 1) { n /= 1024; i++; }
+  return { div: Math.pow(1024, i), unit: UNITSi + (perSec ? "/s" : "") };
+}
+
+export function formatPercent(p) {
+  p = Number(p) || 0;
+  return p.toFixed(p >= 100 || p === 0 ? 0 : 1) + "%";
+}
+
+export function formatInt(n) {
+  return (Number(n) || 0).toLocaleString();
+}
+
+// "session / total" pair from a row's two sibling counter fields (e.g.
+// uploaded_bytes_session + uploaded_bytes_total). Shared by the Shared table
+// and its detail panel. The counters are flat sibling fields, not in `xfer` /
+// `requests` / `accepts` wrappers, so this takes the row and
+// two key names rather than a sub-object.
+export function twin(row, a, b, fmt) {
+  return fmt((row && rowa) || 0) + " / " + fmt((row && rowb) || 0);
+}
+
+// Free disk space for the two directories /status reports, as one string. Temp
+// and Incoming are the same filesystem in the default layout, so a single bare
+// figure is the common case; when they differ each is labelled. null (the daemon
+// has no figure) is left out rather than shown as 0, which would read as a full
+// disk -- with both null the caller gets "" and drops the entry.
+export function formatFreeSpace(temp, incoming) {
+  if (temp == null && incoming == null) return "";
+  const T = t("common_free_space_temp"), I = t("common_free_space_incoming");
+  if (temp == null) return I + " " + formatBytes(incoming);
+  if (incoming == null) return T + " " + formatBytes(temp);
+  // Compared as rendered, not as bytes: amuled samples the two directories
+  // separately, so one filesystem still drifts a block between publishes and an
+  // exact == would flip between one and two figures every few seconds.
+  const a = formatBytes(temp), b = formatBytes(incoming);
+  return a === b ? a : T + " " + a + " / " + I + " " + b;
+}
+
+// Unix seconds -> locale date+time; 0 means unknown.
+export const formatTimestamp = (s) => s ? new Date(s * 1000).toLocaleString() : "—";
+
+// file_type token -> its label (i18n keys are search_ftype_<token>).
+export const fileTypeLabel = (token) => token ? t("search_ftype_" + token) : "—";
+
+// Seconds -> human duration, mirroring CastSecondsToHM (src/OtherFunctions.cpp).
+export function formatDuration(s) {
+  s = Math.floor(Number(s) || 0);
+  const pad = (n) => String(n).padStart(2, "0");
+  if (s < 60) return pad(s) + " " + t("stats_secs");
+  if (s < 3600) return Math.floor(s / 60) + ":" + pad(s % 60) + " " + t("stats_mins");
+  if (s < 86400) return Math.floor(s / 3600) + ":" + pad(Math.floor((s % 3600) / 60)) + " " + t("stats_hours");
+  return Math.floor(s / 86400) + " " + t("stats_days") + " " +
+    pad(Math.floor((s % 86400) / 3600)) + ":" + pad(Math.floor((s % 3600) / 60)) + " " + t("stats_hours");
+}

amule-3.1.0.tar.gz/src/webapi/static/js/i18n.js Added

@@ -0,0 +1,90 @@
+// UI strings. Every user-facing string funnels through t(); the dictionaries
+// live in i18n/<lang>.json (flat key -> string, the format Weblate edits
+// natively, with en.json as the source). Missing keys fall back to English
+// (the es dict is overlaid on en), then to the key itself.
+//
+// Key naming: every key is prefixed with the section it belongs to
+// (app_, login_, networks_, search_, downloads_, shared_, stats_, prefs_,
+// and common_ for the genuinely shared modules — api.js, components.js,
+// charts.js). Sub-panels nest under their parent section's prefix
+// (networks_kad_*, networks_server_*, downloads_peer_*, downloads_cat_*, …).
+// Strings are duplicated per section rather than shared, so a translator can
+// give the same English word a different translation in different sections.
+//
+// Language: localStorage override -> browser language -> English. Changing
+// language reloads the page: several modules resolve t() at import time
+// (ROUTES in app.js, form-field tables, graph titles), so a live swap could
+// not retranslate them. ponytail: reload is 1 line; a live switch would need
+// every module-level t() moved into render scope.
+
+const KEY = "amule.lang";
+export const LANGS = "en", "es";
+
+function read() {
+  try {
+    const v = localStorage.getItem(KEY);
+    if (LANGS.includes(v)) return v;
+  } catch (_) {}
+  const nav = (navigator.language || "en").slice(0, 2).toLowerCase();
+  return LANGS.includes(nav) ? nav : "en";
+}
+
+const lang = read();
+document.documentElement.lang = lang;
+
+async function loadDict(code) {
+  const res = await fetch("i18n/" + code + ".json");
+  if (!res.ok) throw new Error("HTTP " + res.status);
+  return res.json();
+}
+
+// Top-level await: importers (app.js, views) implicitly wait for the
+// dictionaries before their module bodies run.
+let dict = {};
+try { dict = await loadDict("en"); }
+catch (e) { console.error("i18n: failed to load en.json", e); }
+if (lang !== "en") {
+  try { dict = { ...dict, ...(await loadDict(lang)) }; }
+  catch (e) { console.error("i18n: failed to load " + lang + ".json", e); }
+}
+
+export function t(key, params) {
+  let s = dictkey !== undefined ? dictkey : key;
+  if (params) for (const k in params) s = s.replaceAll("{" + k + "}", paramsk);
+  return s;
+}
+
+// Plural-aware t(): resolves "<key>_one" / "<key>_other" and exposes {n}.
+const plural = new Intl.PluralRules(lang);
+export function tn(key, n, params) {
+  return t(key + "_" + plural.select(n), { n, ...params });
+}
+
+// ApiError -> localized text. The API contract is English text / C-locale
+// numbers (see docs/api/REFERENCE.md), so error strings arrive in English and
+// localization is the client's job. Priority: exact known message (the
+// wxTRANSLATE strings amuled relays verbatim) -> generic per error code with
+// the raw detail as {message} -> the raw message.
+export function terr(e) {
+  if (!e) return "";
+  const exact = dict"common_apierr_" + e.message;
+  if (exact !== undefined) return exact;
+  if (e.code && dict"common_err_" + e.code !== undefined)
+    return t("common_err_" + e.code, { message: e.message || "" });
+  return e.message || "";
+}
+
+export function getLang() { return lang; }
+
+export function setLang(code) {
+  try { localStorage.setItem(KEY, LANGS.includes(code) ? code : "en"); } catch (_) {}
+  location.reload();
+}
+
+// Language autonym ("English", "español"...), capitalized. Native, no data.
+export function langName(code) {
+  try {
+    const n = new Intl.DisplayNames(code, { type: "language" }).of(code);
+    return n ? n0.toUpperCase() + n.slice(1) : code.toUpperCase();
+  } catch (_) { return code.toUpperCase(); }
+}

amule-3.1.0.tar.gz/src/webapi/static/js/icons.js Added

@@ -0,0 +1,70 @@
+// Inline SVG icon set. Monochrome line icons (stroke="currentColor") so they
+// inherit the surrounding text colour and the active theme. No external
+// assets — everything is inlined, which keeps the strict CSP happy.
+//
+//   import { Icon } from "../icons.js";
+//   html`<${Icon} name="downloads" />`
+//   html`<${Icon} name="connect" size=${16} title="Connect" />`
+
+import { html } from "./dom.js";
+
+// Each entry returns fresh vnodes (a function, not a shared vnode) so the same
+// icon can be rendered in many places at once without preact reusing nodes.
+const ICONS = {
+  // --- navigation -------------------------------------------------------
+  networks: () => html`<circle cx="12" cy="12" r="9"/><path d="M3 12h18"/><path d="M12 3a15 15 0 0 1 0 18 15 15 0 0 1 0-18z"/>`,
+  downloads: () => html`<path d="M12 3v10"/><path d="M8 9l4 4 4-4"/><path d="M4 17v2a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1v-2"/>`,
+  search: () => html`<circle cx="11" cy="11" r="7"/><line x1="21" y1="21" x2="16.5" y2="16.5"/>`,
+  shared: () => html`<path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"/><path d="M3.27 6.96 12 12.01l8.73-5.05"/><line x1="12" y1="22.08" x2="12" y2="12"/>`,
+  clients: () => html`<circle cx="12" cy="7" r="3.5"/><path d="M4 21a8 8 0 0 1 16 0"/>`,
+  servers: () => html`<rect x="3" y="4" width="18" height="7" rx="1.5"/><rect x="3" y="13" width="18" height="7" rx="1.5"/><line x1="7" y1="7.5" x2="7.01" y2="7.5"/><line x1="7" y1="16.5" x2="7.01" y2="16.5"/>`,
+  kad: () => html`<circle cx="12" cy="12" r="9"/><path d="M3 12h18"/><path d="M12 3a14 14 0 0 1 0 18"/><path d="M12 3a14 14 0 0 0 0 18"/>`,
+  messages: () => html`<path d="M3 4.69A1.69 1.69 0 0 1 4.69 3h14.63A1.69 1.69 0 0 1 21 4.69v10.13a1.69 1.69 0 0 1-1.69 1.69H12l-4.5 4.5v-4.5H4.69A1.69 1.69 0 0 1 3 15z"/><line x1="7.5" y1="7.5" x2="16.5" y2="7.5"/><line x1="7.5" y1="11.44" x2="13.13" y2="11.44"/>`,
+  stats: () => html`<path d="M3 3v18h18"/><path d="M7 15l3-4 3 3 4-6"/>`,
+  logs: () => html`<line x1="5" y1="7" x2="19" y2="7"/><line x1="5" y1="12" x2="19" y2="12"/><line x1="5" y1="17" x2="14" y2="17"/>`,
+  categories: () => html`<path d="M20.6 13.4 12 22l-9-9V3h10l7.6 7.6a2 2 0 0 1 0 2.8z"/><circle cx="7.5" cy="7.5" r="1.2" fill="currentColor"/>`,
+  preferences: () => html`<path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z"/>`,
+  about: () => html`<circle cx="12" cy="12" r="9"/><line x1="12" y1="11" x2="12" y2="16"/><line x1="12" y1="8" x2="12.01" y2="8"/>`,
+
+  // --- actions / status -------------------------------------------------
+  menu: () => html`<line x1="4" y1="6" x2="20" y2="6"/><line x1="4" y1="12" x2="20" y2="12"/><line x1="4" y1="18" x2="20" y2="18"/>`,
+  connect: () => html`<path d="M9 2v6M15 2v6M7 8h10v2a5 5 0 0 1-10 0z"/><path d="M12 15v7"/>`,
+  cancel: () => html`<line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/>`,
+  remove: () => html`<line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/>`,
+  trash: () => html`<path d="M4 7h16"/><path d="M9 7V5h6v2"/><path d="M6 7l1 13h10l1-13"/>`,
+  edit: () => html`<path d="M12 20h9"/><path d="M16.5 3.5a2.1 2.1 0 0 1 3 3L7 19l-4 1 1-4z"/>`,
+  copy: () => html`<rect x="9" y="9" width="11" height="11" rx="2"/><path d="M5 15V5a2 2 0 0 1 2-2h10"/>`,
+  // Alias of the `downloads` nav-icon drawing, named for the "save to device" action.
+  download: () => html`<path d="M12 3v10"/><path d="M8 9l4 4 4-4"/><path d="M4 17v2a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1v-2"/>`,
+  pause: () => html`<rect x="6" y="5" width="4" height="14" rx="1"/><rect x="14" y="5" width="4" height="14" rx="1"/>`,
+  play: () => html`<path d="M7 5l12 7-12 7z"/>`,
+  stop: () => html`<rect x="6" y="6" width="12" height="12" rx="1"/>`,
+  up: () => html`<path d="M12 19V5"/><path d="M5 12l7-7 7 7"/>`,
+  down: () => html`<path d="M12 5v14"/><path d="M5 12l7 7 7-7"/>`,
+  live: () => html`<circle cx="12" cy="12" r="5" fill="currentColor" stroke="none"/>`,
+  polling: () => html`<path d="M21 12a9 9 0 1 1-3-6.7"/><path d="M21 4v5h-5"/>`,
+  "sort-asc": () => html`<path d="M6 14l6-6 6 6"/>`,
+  "sort-desc": () => html`<path d="M6 10l6 6 6-6"/>`,
+  verified: () => html`<path d="M12 3l7 3v5c0 4.5-3 8-7 10-4-2-7-5.5-7-10V6z"/><path d="M9 12l2 2 4-4"/>`,
+  warning: () => html`<path d="M12 3l9 16H3z"/><line x1="12" y1="10" x2="12" y2="14"/><line x1="12" y1="16.5" x2="12.01" y2="16.5"/>`,
+  lock: () => html`<rect x="5" y="11" width="14" height="9" rx="1.5"/><path d="M8 11V8a4 4 0 0 1 8 0v3"/>`,
+  star: () => html`<path d="M12 3l2.7 5.5 6 .9-4.3 4.2 1 6-5.4-2.8-5.4 2.8 1-6L3.3 9.4l6-.9z"/>`,
+  // One peer with a check: friends-list membership. Deliberately not `star`,
+  // which marks the reserved upload slot and can sit on the same row.
+  friend: () => html`<circle cx="10" cy="8" r="3.2"/><path d="M3.8 19a6.2 6.2 0 0 1 10.4-4.3"/><path d="M15.5 17.6l2 2 3.5-4.2"/>`,
+  logout: () => html`<path d="M15 4h4a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1h-4"/><path d="M10 17l5-5-5-5"/><line x1="15" y1="12" x2="3" y2="12"/>`,
+  reset: () => html`<path d="M3 12a9 9 0 1 1 3 6.7"/><path d="M3 21v-6h6"/>`,
+};
+
+export function Icon({ name, size = 18, title, class: cls }) {
+  const draw = ICONSname;
+  if (!draw) return null;
+  return html`
+    <svg class=${"icon" + (cls ? " " + cls : "")} width=${size} height=${size}
+         viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
+         stroke-linecap="round" stroke-linejoin="round"
+         role=${title ? "img" : null} aria-hidden=${title ? null : "true"}>
+      ${title ? html`<title>${title}</title>` : null}
+      ${draw()}
+    </svg>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/searches.js Added

@@ -0,0 +1,445 @@
+// Multi-search registry: one entry per open search tab, kept OUTSIDE the view
+// so tabs survive navigating to another section (the view unmounts, this
+// module does not).
+//
+// The three SSE search events each ride one store key; this module is their
+// only subscriber and routes them by search_id, so per-id keys would buy
+// nothing. It publishes at two granularities, so a burst of results on a
+// BACKGROUND tab never re-renders the visible table:
+//   store "searches"    -> { tabs: light tab descriptors, activeId }
+//   store "search:<id>" -> that search's results array, active tab only.
+
+import { api } from "./api.js";
+import { data } from "./events.js";
+import { store } from "./store.js";
+import { toast } from "./components.js";
+import { t, terr } from "./i18n.js";
+
+// Trailing throttles, separate because the strip is cheap and the table is not.
+const TABS_SYNC_MS = 1000;
+const RESULTS_SYNC_MS = 1000;
+// Fallback polling, only while SSE is down. A finished tab is never polled --
+// nothing about it changes except on the explicit re-reads below.
+const POLL_ACTIVE_MS = 1500;
+const POLL_BG_EVERY = 4; // every 4th tick => ~6 s
+// A frame for an unknown id means another client started a search; re-listing
+// costs an EC round trip, so debounce it.
+const ADOPT_DEBOUNCE_MS = 3000;
+
+const tabs = new Map(); // search_id -> tab
+let activeId = 0;
+let started = false;
+let pollTimer = null;
+let tabsTimer = 0;
+let resultsTimer = 0;
+let lastAdopt = 0;
+let offs = ;
+let lastResult = null, lastResultRemoved = null, lastProgress = null, lastClosed = null;
+
+function newTab({ id, query = "", label = "", kind = "global", state = "running", startedAt = 0,
+                 percent = 0, count = 0 }) {
+  return {
+    id, query, label: label || query, kind, state, percent, startedAt,
+    results: new Map(), count, fetching: false,
+    // Per-tab UI state: switching tabs and coming back must restore it, so it
+    // cannot live in the view's component state.
+    ui: { selection: new Set(), filter: "", filterHave: "all", cat: 0, rowCat: {}, rowEcid: {} },
+  };
+}
+
+// GET /search arrives id-ascending, and id order is NOT recency: a Kad id
+// carries SEARCH_ID_KAD_MASK, so it always sorts above an ed2k one. Rank by
+// started_at instead; an entry without one (another client's, or restored from
+// the daemon's ring) is unknown rather than oldest, so it ranks last.
+const ord = (s) => (s.started_at ? s.started_at : Number.MAX_SAFE_INTEGER);
+const nowSec = () => Math.floor(Date.now() / 1000);
+
+function tabList() {
+  return Array.from(tabs.values()).map((x) => ({
+    id: x.id, query: x.query, label: x.label, kind: x.kind, state: x.state,
+    // percent is 0 on an adopted tab until it is refreshed: GET /search does
+    // not carry one, only GET /search/{id}/results does. Harmless, because the
+    // view keys its progress text off `state` and only shows a percent while
+    // running -- and the tab that is running and visible has been through
+    // refresh() via setActive().
+    //
+    // count is the larger of the daemon's reported total and what this tab
+    // has actually pulled: a tab whose results are loaded knows better than
+    // the listing snapshot, and an unopened one has only the listing.
+    percent: x.percent, count: Math.max(x.count || 0, x.results.size),
+    moreExhausted: !!x.moreExhausted,
+  }));
+}
+
+function publishTabs() {
+  if (tabsTimer) { clearTimeout(tabsTimer); tabsTimer = 0; }
+  store.set("searches", { tabs: tabList(), activeId });
+}
+function publishTabsSoon() {
+  if (!tabsTimer) tabsTimer = setTimeout(() => { tabsTimer = 0; publishTabs(); }, TABS_SYNC_MS);
+}
+function publishResults(id) {
+  // Bail BEFORE touching the timer: a pending publish always belongs to the
+  // active tab, so clearing it while publishing a background one would drop
+  // the coalesced update it was holding.
+  if (id !== activeId) return;
+  if (resultsTimer) { clearTimeout(resultsTimer); resultsTimer = 0; }
+  const tab = tabs.get(id);
+  store.set("search:" + id, tab ? Array.from(tab.results.values()) : );
+}
+function publishResultsSoon(id) {
+  if (id !== activeId || resultsTimer) return;
+  resultsTimer = setTimeout(() => { resultsTimer = 0; publishResults(id); }, RESULTS_SYNC_MS);
+}
+
+// --- reads ---------------------------------------------------------------
+
+// Authoritative re-read: seeds a tab's results on activation and reconciles
+// against anything the stream did not push. search_result_updated now pushes a
+// held hit's status / already_downloaded / comments / rating live, but its
+// source counts and alternate names stay add-only on the stream, so this is
+// still how those refresh. amuleapi coalesces it behind a ~1 s TTL, so calling
+// it per tab activation is cheap.
+async function refresh(id) {
+  const tab = tabs.get(id);
+  if (!tab || tab.fetching) return;
+  tab.fetching = true;
+  try {
+    const r = await api.list("search/" + id + "/results");
+    const cur = tabs.get(id);
+    if (!cur) return;
+    cur.results = new Map((r.results || ).map((x) => x.hash, x));
+    cur.count = cur.results.size;
+    if (r.query && !cur.query) cur.query = r.query;
+    if (r.query && !cur.label) cur.label = r.query;
+    const pr = r.progress || {};
+    if (pr.state) cur.state = pr.state;
+    if (pr.type) cur.kind = pr.type;
+    cur.percent = pr.percent || 0;
+    publishTabs();
+    publishResults(id);
+  } catch (e) {
+    // Gone from the daemon (freed elsewhere, or aged out): search_closed the
+    // hard way.
+    if (e && e.status === 404) drop(id, true);
+  } finally {
+    const cur = tabs.get(id);
+    if (cur) cur.fetching = false;
+  }
+}
+
+// Open a tab for every search the daemon holds. Results are fetched lazily on
+// first activation: adopting 20 searches must not fire 20 requests.
+async function adopt() {
+  lastAdopt = Date.now();
+  let list;
+  try { list = (await api.list("search")).searches || ; } catch (_) { return; }
+  list = list.slice().sort((a, b) => ord(a) - ord(b));
+  let added = false;
+  for (const s of list) {
+    const known = tabs.get(s.search_id);
+    if (known) {
+      if (!known.query && s.query) { known.query = s.query; known.label = known.label || s.query; }
+      // Keep an unopened tab's badge current. Only while it holds no results
+      // of its own -- once fetched, its own map is the better number and the
+      // listing snapshot must not walk it back.
+      if (typeof s.result_count === "number" && !known.results.size &&
+          s.result_count !== known.count) {
+        known.count = s.result_count;
+        added = true;
+      }
+      continue;
+    }
+    // result_count is what makes an unopened tab show a real badge instead of
+    // 0 after a reload; it is omitted by a daemon that does not report counts,
+    // in which case the badge stays 0 until the tab is opened and fetched.
+    tabs.set(s.search_id, newTab({
+      id: s.search_id, query: s.query || "", kind: s.type || "global",
+      state: s.state || "finished", startedAt: s.started_at || 0,
+      count: typeof s.result_count === "number" ? s.result_count : 0,
+    }));
+    added = true;
+  }
+  if (!tabs.has(activeId)) {
+    const running = list.filter((s) => s.state === "running");
+    const pick = (running.length ? running : list).slice(-1)0;
+    if (pick) { setActive(pick.search_id); return; }
+    activeId = 0;
+  }
+  if (added) publishTabs();
+}
+
+// Debounced adopt, so the first mount's own adopt() is not doubled.
+function nudgeAdopt() {
+  if (!started || Date.now() - lastAdopt < ADOPT_DEBOUNCE_MS) return;
+  adopt();
+}
+
+function setActive(id) {
+  activeId = Number(id) || 0;
+  publishTabs();
+  if (!tabs.get(activeId)) return;
+  publishResults(activeId); // whatever is already held, instantly
+  refresh(activeId);        // then reconcile the fields the stream does not push
+}
+
+function drop(id, notify) {
+  const tab = tabs.get(id);
+  if (!tab) return;
+  // The tab to the right, else the one to the left -- Map order is strip order.
+  const ids = Array.from(tabs.keys());
+  const next = idsids.indexOf(id) + 1 || idsids.indexOf(id) - 1;
+  tabs.delete(id);
+  store.set("search:" + id, );
+  if (activeId === id) {
+    activeId = 0;
+    if (next) setActive(next);
+    if (notify) toast(t("search_toast_freed", { query: tab.label || tab.query }), "info");
+  }
+  publishTabs();
+}
+
+// --- SSE routing ---------------------------------------------------------
+
+function onResult(p) {
+  if (!p || p === lastResult) return;
+  lastResult = p;
+  const tab = tabs.get(p.search_id);
+  if (!tab) { nudgeAdopt(); return; }
+  tab.results.set(p.hash, p);
+  publishTabsSoon();
+  publishResultsSoon(p.search_id);
+}
+
+// The row left the daemon's result space (folded into a parent's alternate
+// names, or dropped by the union merge). Identity-only payload, like every
+// other _removed: drop the cache entry, no re-fetch.
+function onResultRemoved(p) {
+  if (!p || p === lastResultRemoved) return;
+  lastResultRemoved = p;
+  const tab = tabs.get(p.search_id);
+  if (!tab || !tab.results.delete(p.hash)) return;
+  tab.count = tab.results.size;
+  publishTabsSoon();
+  publishResultsSoon(p.search_id);
+}
+
+function onProgress(p) {
+  if (!p || p === lastProgress) return;
+  lastProgress = p;
+  const tab = tabs.get(p.search_id);
+  if (!tab) { nudgeAdopt(); return; }
+  const wasRunning = tab.state === "running";
+  if (p.state) tab.state = p.state;
+  if (p.type) tab.kind = p.type;
+  tab.percent = p.percent || 0;
+  // The event's count is the backend's own map size and may legitimately run
+  // ahead of the upserts seen so far.
+  if (typeof p.result_count === "number") tab.count = p.result_count;
+  publishTabsSoon();
+  // Terminal frame: reconcile once against REST to pick up anything the
+  // stream dropped, and to land the final status/alternate_names of every row.
+  if (wasRunning && tab.state === "finished") refresh(tab.id);
+}
+
+function onClosed(p) {
+  if (!p || p === lastClosed) return;
+  lastClosed = p;
+  drop(p.search_id, true);
+}
+
+// --- fallback polling ----------------------------------------------------
+
+function startPolling() {
+  if (pollTimer) return;
+  let tick = 0;
+  pollTimer = setInterval(() => {
+    if (data.isLive()) return; // SSE is the normal path; this is the fallback
+    tick++;
+    const act = tabs.get(activeId);
+    if (act && act.state === "running") refresh(activeId);
+    if (tick % POLL_BG_EVERY === 0) {
+      for (const tab of tabs.values())
+        if (tab.id !== activeId && tab.state === "running") refresh(tab.id);
+    }
+  }, POLL_ACTIVE_MS);
+}
+
+// Shared by browse() and browseFriend(). `path` is the resource owning the
+// shared_files sub-resource: "clients/{ecid}" or "friends/{ecid}".
+async function browseVia(path, name) {
+  const r = await api.post(path + "/shared_files");
+  const id = r.search_id;
+  const open = tabs.get(id);
+  if (open) {
+    if (name) { open.query = name; open.label = name; }
+  } else {
+    tabs.set(id, newTab({
+      id, query: name || r.query || "", label: name || r.query || "",
+      kind: r.type || "browse",
+      state: r.state || "running",
+      startedAt: r.started_at || nowSec(),
+    }));
+  }
+  setActive(id);
+  toast(t("search_toast_browse_started"), "info");
+  if (location.hash !== "#/search") location.hash = "#/search";
+  return id;
+}
+
+// --- public API ----------------------------------------------------------
+
+export const searches = {
+  // First mount of the search view (or of anything that opens a tab). Idempotent.
+  ensure() {
+    if (started) return;
+    started = true;
+    lastResult = store.get("search:result");
+    lastResultRemoved = store.get("search:result_removed");
+    lastProgress = store.get("search:progress");
+    lastClosed = store.get("search:closed");
+    offs.push(store.subscribe("search:result", onResult));
+    offs.push(store.subscribe("search:result_removed", onResultRemoved));
+    offs.push(store.subscribe("search:progress", onProgress));
+    offs.push(store.subscribe("search:closed", onClosed));
+    startPolling();
+    adopt();
+  },
+
+  // Logout / dead session. Everything here is module-level and outlives the
+  // shell, so without this a stale tab keeps polling a dead session.
+  reset() {
+    for (const off of offs) off();
+    offs = ;
+    if (pollTimer) { clearInterval(pollTimer); pollTimer = null; }
+    if (tabsTimer) { clearTimeout(tabsTimer); tabsTimer = 0; }
+    if (resultsTimer) { clearTimeout(resultsTimer); resultsTimer = 0; }
+    for (const id of tabs.keys()) store.set("search:" + id, );
+    tabs.clear();
+    activeId = 0;
+    started = false;
+    lastResult = lastProgress = lastClosed = null;
+    store.set("searches", { tabs: , activeId: 0 });
+  },
+
+  setActive,
+  refresh,
+  adopt,
+  nudgeAdopt,
+
+  // Per-tab UI state. Read at render time; every write republishes the tab
+  // list, which is what re-renders the view.
+  ui(id) { const tab = tabs.get(id); return tab ? tab.ui : null; },
+  setUi(id, patch) {
+    const tab = tabs.get(id);
+    if (!tab) return;
+    Object.assign(tab.ui, patch);
+    publishTabs();
+  },
+
+  // POST /search -> a new tab, which becomes active. `label` overrides what
+  // the strip shows (a related:: query is unreadable in a tab).
+  async start(body, label) {
+    // The 202 answers with the created search as the same row GET /search
+    // lists, so the tab is seeded from what the daemon recorded rather than
+    // from what we asked for -- `kind` and `startedAt` in particular, which
+    // the request only implies.
+    const r = await api.post("search", body);
+    const id = r.search_id;
+    tabs.set(id, newTab({
+      id, query: r.query || body.query || "", label: label || "",
+      kind: r.type || body.type || "global",
+      state: r.state || "running",
+      startedAt: r.started_at || nowSec(),
+    }));
+    setActive(id);
+    return id;
+  },
+
+  // "View files": a browse is an ordinary search of kind "browse", so it gets
+  // an ordinary tab. Generic, so any future entry point reuses it.
+  //
+  // Find-or-create, unlike start(): browsing a peer that is already being
+  // browsed returns the id already in flight (amule-org/amule#1059), so a
+  // second click lands on the tab that is already open. Overwriting it would
+  // throw away its results, its badge and its per-tab ui state (selection,
+  // filter, per-row category) for a browse that never restarted.
+  browse(ecid, name) { return browseVia("clients/" + ecid, name); },
+
+  // The friend-addressed twin, and the only one that reaches a friend who is
+  // NOT connected: a friend record carries a stored address.
+  browseFriend(ecid, name) { return browseVia("friends/" + ecid, name); },
+
+  // Related-files search: no endpoint and no opcode, just a magic keyword and
+  // an ordinary LOCAL search. A server without `related_search` answers it with
+  // nothing, which reads as "no related files" rather than "unsupported", hence
+  // the check. ponytail: checked at click time rather than gating the button,
+  // so the view never holds the whole server list for one boolean.
+  async related(hashes, label) {
+    const ed2k = (store.get("status") || {}).ed2k || {};
+    try {
+      const list = (await api.list("servers")).servers || ;
+      const ip = (v) => { const m = String(v || "").match(/\d+\.\d+\.\d+\.\d+/); return m ? m0 : ""; };
+      const cur = list.find((s) => ip(s.address) && ip(s.address) === ip(ed2k.server_ip)
+                                   && s.port === ed2k.server_port);
+      if (cur && !(cur.tcp_flags && cur.tcp_flags.related_search)) {
+        toast(t("search_related_unsupported"), "warn");
+        return 0;
+      }
+    } catch (_) { /* can't tell -- let the search go rather than block it */ }
+    // Upper-case like the desktop (CMD4Hash::Encode): the ed2k server parses
+    // this keyword, not us, so don't gamble on it folding case.
+    const keyword = hashes.map((h) => String(h).toUpperCase()).join("::");
+    return searches.start({ query: "related::" + keyword, type: "local" }, label);
+  },
+
+  async stop(id) {
+    try { await api.post("search/" + id + "/stop"); } catch (e) { toast(terr(e), "error"); }
+    refresh(id);
+  },
+
+  // Kad "More": re-ask already-queried nodes for a wider frontier. amuleapi
+  // rejects a non-Kad or finished search with a 400.
+  //
+  // 409 kad_more_exhausted is the terminal one: the daemon's 4-reask budget is
+  // spent, or the search has entered the stopping window Kad opens 20 s before
+  // it ends. Nothing un-spends it, so the tab remembers and the button goes
+  // away for this search only -- the flag dies with the tab, and a re-run gets
+  // a new search_id and a clean one. A plain 202 promises no reask went out
+  // (no peer left to re-ask *yet* also answers 202), which is why only the 409
+  // disables anything.
+  async more(id) {
+    try {
+      await api.post("search/" + id + "/more");
+      toast(t("search_toast_more_started"), "success");
+    } catch (e) {
+      const tab = tabs.get(id);
+      if (tab && e && e.code === "kad_more_exhausted") { tab.moreExhausted = true; publishTabs(); }
+      toast(terr(e), "error");
+    }
+  },
+
+  // Stop AND free. A 404 is success: someone else already freed it.
+  async close(id) {
+    try { await api.del("search/" + id); }
+    catch (e) { if (!e || e.status !== 404) { toast(terr(e), "error"); return; } }
+    drop(id, false);
+  },
+
+  // The desktop's "Clear Search Results": one DELETE per open search, which is
+  // all a bulk route would have been anyway. activeId is cleared up front so
+  // each close does not activate (and re-read) a tab about to be closed.
+  async closeAll() {
+    const ids = Array.from(tabs.keys());
+    activeId = 0;
+    await Promise.all(ids.map(async (id) => {
+      try { await api.del("search/" + id); }
+      catch (e) { if (!e || e.status !== 404) { toast(terr(e), "error"); return; } }
+      tabs.delete(id);
+      store.set("search:" + id, );
+    }));
+    // Anything a failed DELETE left behind still needs an active tab.
+    const first = tabs.keys().next().value;
+    if (first) setActive(first); else publishTabs();
+  },
+};

amule-3.1.0.tar.gz/src/webapi/static/js/store.js Added

@@ -0,0 +1,80 @@
+// App state, two flavours:
+//   - `store`: a minimal in-memory pub/sub container (lost on reload). Keys are
+//     domain names ("downloads", "status", …); views subscribe to a key and
+//     re-render when it changes.
+//   - loadPref/savePref: persistent prefs backed by localStorage, JSON
+//     round-trip under an "amule."-prefixed key (matching theme.js / i18n.js).
+//     Every access is guarded so a disabled / full / private-mode localStorage
+//     degrades to the caller's fallback instead of throwing.
+//     ponytail: JSON get/set only; no TTL/versioning until something needs it.
+
+const state = new Map();
+const subs = new Map(); // key -> Set<fn>
+
+export const store = {
+  get(key) { return state.get(key); },
+
+  set(key, value) {
+    state.set(key, value);
+    const set = subs.get(key);
+    if (set) for (const fn of set) { try { fn(value); } catch (e) { console.error(e); } }
+  },
+
+  // Subscribe to a key. Returns an unsubscribe function. If the key
+  // already has a value, the subscriber is called immediately with it.
+  subscribe(key, fn) {
+    if (!subs.has(key)) subs.set(key, new Set());
+    subs.get(key).add(fn);
+    if (state.has(key)) { try { fn(state.get(key)); } catch (e) { console.error(e); } }
+    return () => { const s = subs.get(key); if (s) s.delete(fn); };
+  },
+};
+
+export function loadPref(key, fallback) {
+  try {
+    const v = localStorage.getItem("amule." + key);
+    return v == null ? fallback : JSON.parse(v);
+  } catch (_) {
+    return fallback;
+  }
+}
+
+export function savePref(key, val) {
+  try {
+    localStorage.setItem("amule." + key, JSON.stringify(val));
+  } catch (_) {}
+}
+
+// Wipe every persisted WebUI pref: theme, lang, table layouts, panel heights --
+// all live under the "amule." prefix.
+export function clearPrefs() {
+  try {
+    for (const k of Object.keys(localStorage))
+      if (k.startsWith("amule.")) localStorage.removeItem(k);
+  } catch (_) {}
+}
+
+// --- Graph time range (Statistics + Networks/Kad) ------------------------
+// The persisted sampling interval (seconds) sent as
+// /stats/graphs?interval_seconds=N; at 300 samples it sets how far back the
+// window reaches. interval -> window: 5min / 1h / 6h / 24h. Each is well above
+// the record spacing at its window's far edge, so amuled never repeats records
+// (see docs/api/REFERENCE.md, GET /stats/graphs/{graph}).
+export const GRAPH_RANGES = 
+  { interval: 1, labelKey: "prefs_graph_range_5m" },
+  { interval: 12, labelKey: "prefs_graph_range_1h" },
+  { interval: 72, labelKey: "prefs_graph_range_6h" },
+  { interval: 288, labelKey: "prefs_graph_range_24h" },
+;
+
+const DEFAULT_GRAPH_INTERVAL = 12; // 1 hour
+
+// Validate against the presets so a stale/edited value can't reach amuled.
+export function loadGraphInterval() {
+  const v = loadPref("stats.graphRange", DEFAULT_GRAPH_INTERVAL);
+  return GRAPH_RANGES.some((r) => r.interval === v) ? v : DEFAULT_GRAPH_INTERVAL;
+}
+
+export function saveGraphInterval(interval) {
+  savePref("stats.graphRange", interval);
+}

amule-3.1.0.tar.gz/src/webapi/static/js/table.js Added

@@ -0,0 +1,306 @@
+// Virtualized data table shared across list views (shared/downloads/search/
+// servers/peers). Renders only the rows in (or near) the viewport so a list of
+// thousands of files never puts thousands of <tr> in the DOM. Column-config
+// driven — each view declares its columns; sorting state stays in the view.
+//
+//   const columns = { key: "name", label: t("..."), sortable: true,
+//                      sortVal: (r) => r.name, cell: (r) => r.name }, ...;
+//   html`<${VirtualTable} columns=${columns} rows=${rows} rowKey=${r => r.hash}
+//                         sortKey=${sortKey} sortDir=${sortDir} onSort=${toggleSort}
+//                         empty=${html`...`} />`
+
+import { html, useRef, useState, useEffect } from "./dom.js";
+import { Icon } from "./icons.js";
+import { loadPref, savePref } from "./store.js";
+import { t } from "./i18n.js";
+
+// Fixed row height: the scroll math assumes every row is exactly this tall, and
+// each <tr> is pinned to it inline. Must fit the tallest cell content (input-sm
+// selects, progress bars) without clipping.
+// ponytail: 38px clears the tallest cell content (4px cell padding + input-sm
+// select ≈ 35px) so the browser never grows a row past it — a row taller than
+// ROW_HEIGHT would desync the scroll math. Retune if a view adds taller cells.
+export const ROW_HEIGHT = 38;
+const OVERSCAN = 8; // rows rendered above/below the viewport to hide scroll seams
+// Minimum width for a flexible (no explicit width) column, matching the old
+// non-virtual `.name { min-width: 220px }`. Feeds the table's computed min-width
+// so narrow screens scroll horizontally instead of collapsing the name column.
+const FLEX_MIN = 220;
+// Floor for a user-resized column -- narrower than this and a header's label
+// or sort arrow starts clipping/overlapping unreadably.
+const MIN_COL_WIDTH = 48;
+
+export function cmp(a, b) { return a < b ? -1 : a > b ? 1 : 0; }
+
+// Sort a copy of `rows` by the column matching sortKey (using its sortVal
+// accessor). Returns rows unchanged if no sortable column matches.
+export function sortRows(rows, columns, sortKey, sortDir) {
+  const col = columns.find((c) => c.key === sortKey && c.sortVal);
+  if (!col) return rows;
+  return rows.slice().sort((a, b) => sortDir * cmp(col.sortVal(a), col.sortVal(b)));
+}
+
+// Sort key for an IPv4 column: 10.x has to sort after 9.x, which a string
+// compare gets backwards. Takes "1.2.3.4" or "1.2.3.4:port"; unparseable -> 0.
+export function ipNum(ip) {
+  return String(ip || "").split(".").reduce((acc, octet) => acc * 256 + (parseInt(octet, 10) || 0), 0);
+}
+
+// Build a predicate for a free-text filter box: case-insensitive and
+// order-independent — every whitespace-separated token must appear in the
+// string. Empty query → matches everything.
+export function textMatcher(query) {
+  const tokens = query.toLowerCase().split(/\s+/).filter(Boolean);
+  return (s) => { const n = (s || "").toLowerCase(); return tokens.every((tok) => n.includes(tok)); };
+}
+
+const colClass = (c) => c.num ? "num" : "", c.cls || "".filter(Boolean).join(" ");
+
+// Per-table UI prefs (sort direction + hidden columns + resized widths)
+// persisted as one object under "amule.table.<storageKey>". `defaults` =
+// { sortKey, sortDir, hidden: }. Stored prefs are spread over the defaults
+// so a column added as default-hidden later stays hidden only for users who
+// never opened the picker (their stored object has no entry for it → the
+// default wins), while everyone else keeps their explicit choice. Returns
+// the current sort plus toggles the view wires to VirtualTable.onSort and
+// the ColumnPicker.
+export function useTablePrefs(storageKey, defaults) {
+  const prefs, setPrefs = useState(() => ({
+    sortKey: defaults.sortKey,
+    sortDir: defaults.sortDir,
+    hidden: defaults.hidden || ,
+    widths: {},
+    ...loadPref("table." + storageKey, {}),
+  }));
+  useEffect(() => { savePref("table." + storageKey, prefs); }, prefs);
+
+  const toggleSort = (key) =>
+    setPrefs((p) => (p.sortKey === key
+      ? { ...p, sortDir: -p.sortDir }
+      : { ...p, sortKey: key, sortDir: 1 }));
+  const toggleCol = (key) =>
+    setPrefs((p) => {
+      const h = new Set(p.hidden);
+      h.has(key) ? h.delete(key) : h.add(key);
+      return { ...p, hidden: ...h };
+    });
+  const setWidth = (key, px) =>
+    setPrefs((p) => ({ ...p, widths: { ...p.widths, key: px } }));
+  // Back to the view's declared defaults -- clears sort, hidden columns AND
+  // resized widths, wiping the stored object entirely rather than merging
+  // defaults back in (so a stale key from a since-removed column doesn't
+  // linger in localStorage).
+  const resetPrefs = () =>
+    setPrefs({ sortKey: defaults.sortKey, sortDir: defaults.sortDir,
+               hidden: defaults.hidden || , widths: {} });
+
+  return { sortKey: prefs.sortKey, sortDir: prefs.sortDir,
+           hidden: new Set(prefs.hidden), widths: prefs.widths || {},
+           toggleSort, toggleCol, setWidth, resetPrefs };
+}
+
+// Dropdown of checkboxes to show/hide a table's toggleable columns, plus a
+// reset action. Native <details> so the browser owns open/close (no
+// outside-click handler). Columns without a `key`, or flagged `always`, are
+// fixed and never listed. `onReset` is optional -- omit it to keep the menu
+// checkbox-only (existing callers keep working unchanged).
+export function ColumnPicker({ columns, hidden, onToggle, onReset }) {
+  const toggleable = columns.filter((c) => c.key && !c.always);
+  return html`
+    <details class="col-picker">
+      <summary class="btn btn-sm btn-icon" title=${t("table_columns")}>
+        <${Icon} name="menu" />
+      </summary>
+      <div class="col-picker-menu">
+        ${toggleable.map((c) => html`
+          <label class="col-picker-item">
+            <input type="checkbox" name="column_toggle" checked=${!hidden.has(c.key)}
+                   onChange=${() => onToggle(c.key)} />
+            <span>${c.label}</span>
+          </label>`)}
+        ${onReset ? html`
+          <div class="col-picker-sep"></div>
+          <button type="button" class="col-picker-item col-picker-reset" onClick=${onReset}>
+            <${Icon} name="reset" />
+            <span>${t("table_reset_columns")}</span>
+          </button>` : null}
+      </div>
+    </details>`;
+}
+
+export function VirtualTable({
+  columns, rows, rowKey, rowClass, sortKey, sortDir, onSort, empty, onRowClick,
+  rowHeight = ROW_HEIGHT, maxHeight = "70vh", widths = {}, onResize,
+}) {
+  const ref = useRef(null);
+  const scrollTop, setScrollTop = useState(0);
+  const viewH, setViewH = useState(0);
+  const viewW, setViewW = useState(0);
+  // Live width of the column currently being dragged, e.g. {key:"name", px:230}.
+  // This -- not a direct DOM mutation -- is the resize drag's source of truth:
+  // any prop change mid-drag (rows refreshed by the SSE stream tick every
+  // second or so) triggers a Preact re-render, and colgroup's <col> nodes get
+  // reconciled from whatever colWidth() computes. A version that instead
+  // pushed the live width straight into col.style.width bypassed Preact, so
+  // that very reconciliation stomped it back to the pre-drag width mid-drag --
+  // the longer the drag, the likelier a tick landed inside it, so the border
+  // (and the cursor tracking it) visibly snapped backwards while the pointer
+  // kept moving. Routing the value through state instead means every render,
+  // including one forced by an unrelated prop change, still reflects the drag.
+  const dragging, setDragging = useState(null);
+
+  // A user-resized width (from `widths`, persisted by the caller) overrides
+  // the column's declared default; null for the one flexible column that
+  // has neither (colWidth, below, is what actually fills that in). The
+  // in-progress drag (if any) wins over both.
+  const effWidth = (c) => {
+    if (dragging && c.key === dragging.key) return dragging.px + "px";
+    const px = c.key && widthsc.key;
+    return px ? px + "px" : c.width || null;
+  };
+
+  // The flexible column's width, computed here instead of left to the
+  // browser's table-layout:fixed auto-distribution. Every *other* column
+  // renders with an explicit pixel width (its own default or a user
+  // resize); split whatever's left of the measured container width across
+  // however many columns declared neither (in practice always at most
+  // one -- typically "name"), floored at FLEX_MIN. Doing this ourselves
+  // means colWidth() below can hand *every* <col> an explicit width, so
+  // the browser has nothing left to redistribute when one column resizes
+  // -- no neighbour drifts during the drag, and none needs to snap to a
+  // recomputed width on release either, both of which a version relying
+  // on the browser's own auto-column redistribution actually hit.
+  const flexKeys = columns.filter((c) => !effWidth(c));
+  const fixedTotal = columns.reduce((sum, c) => sum + (effWidth(c) ? parseInt(effWidth(c), 10) : 0), 0);
+  const flexWidth = flexKeys.length
+    ? Math.max(FLEX_MIN, Math.floor((viewW - fixedTotal) / flexKeys.length))
+    : 0;
+  const colWidth = (c) => effWidth(c) || flexWidth + "px";
+
+  // Drag-to-resize a column header edge. Pointer Events (not mouse-only)
+  // so this works on touch devices too, matching the handle's own
+  // touch-action: none in app.css. setPointerCapture routes subsequent
+  // move/up events to the handle itself regardless of where the pointer
+  // wanders, which sidesteps two problems a window-listener version had:
+  // stray listeners surviving a mid-drag unmount, and needing manual
+  // cleanup on every exit path. The live width goes through `dragging`
+  // state (see its comment above) rather than a direct DOM mutation, so
+  // it survives a re-render forced by unrelated props mid-drag. Persisted
+  // prefs are only touched via onResize on release -- and only if the
+  // width actually changed, so a click with no drag doesn't turn the
+  // flexible "name" column into a fixed-width one by mistake.
+  const startResize = (e, key) => {
+    if (!onResize) return;
+    e.preventDefault();
+    e.stopPropagation();
+    const handle = e.currentTarget;
+    const startX = e.clientX;
+    const startWidth = parseInt(colWidth(columns.find((c) => c.key === key)), 10);
+    let finalWidth = startWidth;
+
+    handle.setPointerCapture(e.pointerId);
+    setDragging({ key, px: startWidth });
+
+    const onMove = (ev) => {
+      finalWidth = Math.max(MIN_COL_WIDTH, startWidth + (ev.clientX - startX));
+      setDragging({ key, px: finalWidth });
+    };
+    const onUp = () => {
+      handle.removeEventListener("pointermove", onMove);
+      handle.removeEventListener("pointerup", onUp);
+      setDragging(null);
+      if (finalWidth !== startWidth) onResize(key, Math.round(finalWidth));
+    };
+    handle.addEventListener("pointermove", onMove);
+    handle.addEventListener("pointerup", onUp);
+  };
+
+  // Track the scroll container's size (viewport for the row-window calc,
+  // and now also the flex-column split above). A ResizeObserver catches
+  // layout changes beyond window resize (tab switches, toolbar wrap, etc.).
+  useEffect(() => {
+    const el = ref.current;
+    if (!el) return;
+    const ro = new ResizeObserver(() => {
+      setViewH(el.clientHeight);
+      setViewW(el.clientWidth);
+    });
+    ro.observe(el);
+    setViewH(el.clientHeight);
+    setViewW(el.clientWidth);
+    return () => ro.disconnect();
+  }, );
+
+  const total = rows.length;
+  const start = Math.max(0, Math.min(total, Math.floor(scrollTop / rowHeight) - OVERSCAN));
+  const end = Math.min(total, Math.ceil((scrollTop + viewH) / rowHeight) + OVERSCAN);
+  const padTop = start * rowHeight;
+  const padBot = (total - end) * rowHeight;
+  const ncols = columns.length;
+
+  const arrow = (key) => key === sortKey
+    ? html`<span class="sort-arrow"><${Icon} name=${sortDir > 0 ? "sort-asc" : "sort-desc"} /></span>` : null;
+
+  // Resizable = has a key to persist under. That includes the flexible
+  // no-declared-width column (typically "name") -- it starts the drag from
+  // its current *rendered* width (via getBoundingClientRect in startResize,
+  // not effWidth) rather than a declared one, and a user resize turns it
+  // into an ordinary fixed-width column from then on, same as any other.
+  // Full label on hover, since app.css ellipsizes a header too narrow for its own
+  // text. String labels only -- the select-all column's label is a checkbox VNode.
+  const th = (c) => html`
+    <th class=${(c.sortable ? "sortable " : "") + colClass(c)}
+        title=${typeof c.label === "string" ? c.label : null}
+        onClick=${c.sortable && onSort ? () => onSort(c.key) : null}>
+      ${c.label}${c.sortable ? arrow(c.key) : null}
+      ${onResize && c.key ? html`
+        <span class="col-resize-handle"
+              onPointerDown=${(e) => startResize(e, c.key)}
+              onClick=${(e) => e.stopPropagation()} />` : null}
+    </th>`;
+
+  // Striping is keyed off the absolute row index, not :nth-child — a spacer <tr>
+  // shifts parity, so app.css disables nth-child striping for .virtual tables.
+  // The key goes to the click handler too, so a caller that tracks a selected
+  // row never has to derive row identity a second time: the value it stores is
+  // the same one used for reconciliation here and for rowClass below.
+  const rowTr = (r, i) => {
+    const k = rowKey(r);
+    return html`
+    <tr key=${k}
+        class=${(onRowClick ? "clickable " : "") + ((start + i) % 2 ? "stripe " : "") + (rowClass ? rowClass(r) : "")}
+        onClick=${onRowClick ? (e) => onRowClick(r, e, k) : null}
+        style=${{ height: rowHeight + "px" }}>
+      ${columns.map((c) => html`<td class=${colClass(c)}>${c.cell(r)}</td>`)}
+    </tr>`;
+  };
+
+  const spacer = (h) => h > 0
+    ? html`<tr class="spacer" style=${{ height: h + "px" }}><td colspan=${ncols}></td></tr>` : null;
+
+  // table-layout:fixed needs explicit widths, so the table can't shrink columns
+  // to fit a phone. Floor its width at the sum of what colWidth() actually
+  // hands every column (own default/resize, or its FLEX_MIN-floored share
+  // of colWidth's flex split) so narrow viewports scroll horizontally —
+  // matching the app's other tables — instead of crushing the flexible
+  // column to nothing. Same source as the <colgroup> below on purpose: two
+  // independent width calculations drifting apart is exactly the class of
+  // bug this file just spent a few iterations chasing out of the resize
+  // path.
+  const minWidth = columns.reduce((sum, c) => sum + parseInt(colWidth(c), 10), 0);
+
+  return html`
+    <div class="table-wrap virtual" ref=${ref} style=${{ maxHeight }}
+         onScroll=${(e) => setScrollTop(e.currentTarget.scrollTop)}>
+      <table class="data virtual" style=${{ minWidth: minWidth + "px" }}>
+        <colgroup>${columns.map((c) => html`<col style=${{ width: colWidth(c) }} />`)}</colgroup>
+        <thead><tr>${columns.map(th)}</tr></thead>
+        <tbody>
+          ${total === 0
+            ? null
+            : html`${spacer(padTop)}${rows.slice(start, end).map(rowTr)}${spacer(padBot)}`}
+        </tbody>
+      </table>
+      ${total === 0 ? html`<div class="table-empty">${empty}</div>` : null}
+    </div>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/theme.js Added

@@ -0,0 +1,40 @@
+// Theme control: "system" (follow the OS via prefers-color-scheme), "light"
+// or "dark". The choice is persisted in localStorage and applied by setting
+// (or clearing) data-theme on <html>; app.css resolves the rest:
+//   - no data-theme            -> :root defaults + @media(prefers-color-scheme)
+//   - data-theme="light|dark"  -> explicit override that beats the media query
+//
+// A tiny inline script in index.html applies the saved choice before first
+// paint to avoid a flash; this module keeps it in sync at runtime.
+
+const KEY = "amule.theme";
+const ORDER = "system", "light", "dark";
+
+function read() {
+  try {
+    const v = localStorage.getItem(KEY);
+    return ORDER.includes(v) ? v : "system";
+  } catch (_) {
+    return "system";
+  }
+}
+
+export function applyTheme(pref) {
+  const root = document.documentElement;
+  if (pref === "light" || pref === "dark") root.dataset.theme = pref;
+  else delete root.dataset.theme; // "system"
+}
+
+export function getTheme() {
+  return read();
+}
+
+export function setTheme(pref) {
+  const next = ORDER.includes(pref) ? pref : "system";
+  try { localStorage.setItem(KEY, next); } catch (_) {}
+  applyTheme(next);
+  return next;
+}
+
+// Apply the saved choice as soon as the module loads.
+applyTheme(read());

amule-3.1.0.tar.gz/src/webapi/static/js/vendor Added

amule-3.1.0.tar.gz/src/webapi/static/js/vendor/hooks.module.js Added

@@ -0,0 +1,2 @@
+// preact/hooks v10.29.2
+import{options as n}from"preact";var t,r,u,i,o=0,f=,c=n,e=c.__b,a=c.__r,v=c.diffed,l=c.__c,m=c.unmount,s=c.__;function p(n,t){c.__h&&c.__h(r,n,o||t),o=0;var u=r.__H||(r.__H={__:,__h:});return n>=u.__.length&&u.__.push({}),u.__n}function d(n){return o=1,h(D,n)}function h(n,u,i){var o=p(t++,2);if(o.t=n,!o.__c&&(o.__=i?i(u):D(void 0,u),function(n){var t=o.__N?o.__N0:o.__0,r=o.t(t,n);t!==r&&(o.__N=r,o.__1,o.__c.setState({}))},o.__c=r,!r.__f)){var f=function(n,t,r){if(!o.__c.__H)return!0;var u=o.__c.__H.__.filter(function(n){return n.__c});if(u.every(function(n){return!n.__N}))return!c||c.call(this,n,t,r);var i=o.__c.props!==n;return u.some(function(n){if(n.__N){var t=n.__0;n.__=n.__N,n.__N=void 0,t!==n.__0&&(i=!0)}}),c&&c.call(this,n,t,r)||i};r.__f=!0;var c=r.shouldComponentUpdate,e=r.componentWillUpdate;r.componentWillUpdate=function(n,t,r){if(this.__e){var u=c;c=void 0,f(n,t,r),c=u}e&&e.call(this,n,t,r)},r.shouldComponentUpdate=f}return o.__N||o.__}function y(n,u){var i=p(t++,3);!c.__s&&C(i.__H,u)&&(i.__=n,i.u=u,r.__H.__h.push(i))}function _(n,u){var i=p(t++,4);!c.__s&&C(i.__H,u)&&(i.__=n,i.u=u,r.__h.push(i))}function A(n){return o=5,T(function(){return{current:n}},)}function F(n,t,r){o=6,_(function(){if("function"==typeof n){var r=n(t());return function(){n(null),r&&"function"==typeof r&&r()}}if(n)return n.current=t(),function(){return n.current=null}},null==r?r:r.concat(n))}function T(n,r){var u=p(t++,7);return C(u.__H,r)&&(u.__=n(),u.__H=r,u.__h=n),u.__}function q(n,t){return o=8,T(function(){return n},t)}function x(n){var u=r.contextn.__c,i=p(t++,9);return i.c=n,u?(null==i.__&&(i.__=!0,u.sub(r)),u.props.value):n.__}function P(n,t){c.useDebugValue&&c.useDebugValue(t?t(n):n)}function b(n){var u=p(t++,10),i=d();return u.__=n,r.componentDidCatch||(r.componentDidCatch=function(n,t){u.__&&u.__(n,t),i1(n)}),i0,function(){i1(void 0)}}function g(){var n=p(t++,11);if(!n.__){for(var u=r.__v;null!==u&&!u.__m&&null!==u.__;)u=u.__;var i=u.__m||(u.__m=0,0);n.__="P"+i0+"-"+i1++}return n.__}function j(){for(var n;n=f.shift();){var t=n.__H;if(n.__P&&t)try{t.__h.some(z),t.__h.some(B),t.__h=}catch(r){t.__h=,c.__e(r,n.__v)}}}c.__b=function(n){r=null,e&&e(n)},c.__=function(n,t){n&&t.__k&&t.__k.__m&&(n.__m=t.__k.__m),s&&s(n,t)},c.__r=function(n){a&&a(n),t=0;var i=(r=n.__c).__H;i&&(u===r?(i.__h=,r.__h=,i.__.some(function(n){n.__N&&(n.__=n.__N),n.u=n.__N=void 0})):(i.__h.some(z),i.__h.some(B),i.__h=,t=0)),u=r},c.diffed=function(n){v&&v(n);var t=n.__c;t&&t.__H&&(t.__H.__h.length&&(1!==f.push(t)&&i===c.requestAnimationFrame||((i=c.requestAnimationFrame)||w)(j)),t.__H.__.some(function(n){n.u&&(n.__H=n.u),n.u=void 0})),u=r=null},c.__c=function(n,t){t.some(function(n){try{n.__h.some(z),n.__h=n.__h.filter(function(n){return!n.__||B(n)})}catch(r){t.some(function(n){n.__h&&(n.__h=)}),t=,c.__e(r,n.__v)}}),l&&l(n,t)},c.unmount=function(n){m&&m(n);var t,r=n.__c;r&&r.__H&&(r.__H.__.some(function(n){try{z(n)}catch(n){t=n}}),r.__H=void 0,t&&c.__e(t,r.__v))};var k="function"==typeof requestAnimationFrame;function w(n){var t,r=function(){clearTimeout(u),k&&cancelAnimationFrame(t),setTimeout(n)},u=setTimeout(r,35);k&&(t=requestAnimationFrame(r))}function z(n){var t=r,u=n.__c;"function"==typeof u&&(n.__c=void 0,u()),r=t}function B(n){var t=r;n.__c=n.__(),r=t}function C(n,t){return!n||n.length!==t.length||t.some(function(t,r){return t!==nr})}function D(n,t){return"function"==typeof t?t(n):t}export{q as useCallback,x as useContext,P as useDebugValue,y as useEffect,b as useErrorBoundary,g as useId,F as useImperativeHandle,_ as useLayoutEffect,T as useMemo,h as useReducer,A as useRef,d as useState};

amule-3.1.0.tar.gz/src/webapi/static/js/vendor/htm.LICENSE Added

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets ""
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018 Google Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file

amule-3.1.0.tar.gz/src/webapi/static/js/vendor/htm.module.js Added

@@ -0,0 +1,2 @@
+// htm v3.1.1
+var n=function(t,s,r,e){var u;s0=0;for(var h=1;h<s.length;h++){var p=sh++,a=sh?(s0|=p?1:2,rsh++):s++h;3===p?e0=a:4===p?e1=Object.assign(e1||{},a):5===p?(e1=e1||{})s++h=a:6===p?e1s++h+=a+"":p?(u=t.apply(a,n(t,a,r,"",null)),e.push(u),a0?s0|=2:(sh-2=0,sh=u)):e.push(a)}return e},t=new Map;export default function(s){var r=t.get(this);return r||(r=new Map,t.set(this,r)),(r=n(this,r.get(s)||(r.set(s,r=function(n){for(var t,s,r=1,e="",u="",h=0,p=function(n){1===r&&(n||(e=e.replace(/^\s*\n\s*|\s*\n\s*$/g,"")))?h.push(0,n,e):3===r&&(n||e)?(h.push(3,n,e),r=2):2===r&&"..."===e&&n?h.push(4,n,0):2===r&&e&&!n?h.push(5,0,!0,e):r>=5&&((e||!n&&5===r)&&(h.push(r,0,e,s),r=6),n&&(h.push(r,n,0,s),r=6)),e=""},a=0;a<n.length;a++){a&&(1===r&&p(),p(a));for(var l=0;l<na.length;l++)t=nal,1===r?"<"===t?(p(),h=h,r=3):e+=t:4===r?"--"===e&&">"===t?(r=1,e=""):e=t+e0:u?t===u?u="":e+=t:'"'===t||"'"===t?u=t:">"===t?(p(),r=1):r&&("="===t?(r=5,s=e,e=""):"/"===t&&(r<5||">"===nal+1)?(p(),3===r&&(h=h0),r=h,(h=h0).push(2,0,r),r=0):" "===t||"\t"===t||"\n"===t||"\r"===t?(p(),r=2):e+=t),3===r&&"!--"===e&&(r=4,h=h0)}return p(),h}(s)),r),arguments,)).length>1?r:r0}

amule-3.1.0.tar.gz/src/webapi/static/js/vendor/preact.LICENSE Added

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-present Jason Miller
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

amule-3.1.0.tar.gz/src/webapi/static/js/vendor/preact.module.js Added

@@ -0,0 +1,2 @@
+// preact v10.29.2
+var n,l,u,t,i,r,o,e,f,c,a,s,h,p,v,y,d={},w=,_=/acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|inech|zoo|^ord|itera/i,g=Array.isArray;function m(n,l){for(var u in l)nu=lu;return n}function b(n){n&&n.parentNode&&n.parentNode.removeChild(n)}function k(l,u,t){var i,r,o,e={};for(o in u)"key"==o?i=uo:"ref"==o?r=uo:eo=uo;if(arguments.length>2&&(e.children=arguments.length>3?n.call(arguments,2):t),"function"==typeof l&&null!=l.defaultProps)for(o in l.defaultProps)void 0===eo&&(eo=l.defaultPropso);return x(l,e,i,r,null)}function x(n,t,i,r,o){var e={type:n,props:t,key:i,ref:r,__k:null,__:null,__b:0,__e:null,__c:null,constructor:void 0,__v:null==o?++u:o,__i:-1,__u:0};return null==o&&null!=l.vnode&&l.vnode(e),e}function M(){return{current:null}}function S(n){return n.children}function C(n,l){this.props=n,this.context=l}function $(n,l){if(null==l)return n.__?$(n.__,n.__i+1):null;for(var u;l<n.__k.length;l++)if(null!=(u=n.__kl)&&null!=u.__e)return u.__e;return"function"==typeof n.type?$(n):null}function I(n){if(n.__P&&n.__d){var u=n.__v,t=u.__e,i=,r=,o=m({},u);o.__v=u.__v+1,l.vnode&&l.vnode(o),q(n.__P,o,u,n.__n,n.__P.namespaceURI,32&u.__u?t:null,i,null==t?$(u):t,!!(32&u.__u),r),o.__v=u.__v,o.__.__ko.__i=o,D(i,o,r),u.__e=u.__=null,o.__e!=t&&P(o)}}function P(n){if(null!=(n=n.__)&&null!=n.__c)return n.__e=n.__c.base=null,n.__k.some(function(l){if(null!=l&&null!=l.__e)return n.__e=n.__c.base=l.__e}),P(n)}function A(n){(!n.__d&&(n.__d=!0)&&i.push(n)&&!H.__r++||r!=l.debounceRendering)&&((r=l.debounceRendering)||o)(H)}function H(){try{for(var n,l=1;i.length;)i.length>l&&i.sort(e),n=i.shift(),l=i.length,I(n)}finally{i.length=H.__r=0}}function L(n,l,u,t,i,r,o,e,f,c,a){var s,h,p,v,y,_,g,m=t&&t.__k||w,b=l.length;for(f=T(u,l,m,f,b),s=0;s<b;s++)null!=(p=u.__ks)&&(h=-1!=p.__i&&mp.__i||d,p.__i=s,_=q(n,p,h,i,r,o,e,f,c,a),v=p.__e,p.ref&&h.ref!=p.ref&&(h.ref&&J(h.ref,null,p),a.push(p.ref,p.__c||v,p)),null==y&&null!=v&&(y=v),(g=!!(4&p.__u))||h.__k===p.__k?(f=j(p,f,n,g),g&&h.__e&&(h.__e=null)):"function"==typeof p.type&&void 0!==_?f=_:v&&(f=v.nextSibling),p.__u&=-7);return u.__e=y,f}function T(n,l,u,t,i){var r,o,e,f,c,a=u.length,s=a,h=0;for(n.__k=new Array(i),r=0;r<i;r++)null!=(o=lr)&&"boolean"!=typeof o&&"function"!=typeof o?("string"==typeof o||"number"==typeof o||"bigint"==typeof o||o.constructor==String?o=n.__kr=x(null,o,null,null,null):g(o)?o=n.__kr=x(S,{children:o},null,null,null):void 0===o.constructor&&o.__b>0?o=n.__kr=x(o.type,o.props,o.key,o.ref?o.ref:null,o.__v):n.__kr=o,f=r+h,o.__=n,o.__b=n.__b+1,e=null,-1!=(c=o.__i=O(o,u,f,s))&&(s--,(e=uc)&&(e.__u|=2)),null==e||null==e.__v?(-1==c&&(i>a?h--:i<a&&h++),"function"!=typeof o.type&&(o.__u|=4)):c!=f&&(c==f-1?h--:c==f+1?h++:(c>f?h--:h++,o.__u|=4))):n.__kr=null;if(s)for(r=0;r<a;r++)null!=(e=ur)&&0==(2&e.__u)&&(e.__e==t&&(t=$(e)),K(e,e));return t}function j(n,l,u,t){var i,r;if("function"==typeof n.type){for(i=n.__k,r=0;i&&r<i.length;r++)ir&&(ir.__=n,l=j(ir,l,u,t));return l}n.__e!=l&&(t&&(l&&n.type&&!l.parentNode&&(l=$(n)),u.insertBefore(n.__e,l||null)),l=n.__e);do{l=l&&l.nextSibling}while(null!=l&&8==l.nodeType);return l}function F(n,l){return l=l||,null==n||"boolean"==typeof n||(g(n)?n.some(function(n){F(n,l)}):l.push(n)),l}function O(n,l,u,t){var i,r,o,e=n.key,f=n.type,c=lu,a=null!=c&&0==(2&c.__u);if(null===c&&null==e||a&&e==c.key&&f==c.type)return u;if(t>(a?1:0))for(i=u-1,r=u+1;i>=0||r<l.length;)if(null!=(c=lo=i>=0?i--:r++)&&0==(2&c.__u)&&e==c.key&&f==c.type)return o;return-1}function z(n,l,u){"-"==l0?n.setProperty(l,null==u?"":u):nl=null==u?"":"number"!=typeof u||_.test(l)?u:u+"px"}function N(n,l,u,t,i){var r,o;n:if("style"==l)if("string"==typeof u)n.style.cssText=u;else{if("string"==typeof t&&(n.style.cssText=t=""),t)for(l in t)u&&l in u||z(n.style,l,"");if(u)for(l in u)t&&ul==tl||z(n.style,l,ul)}else if("o"==l0&&"n"==l1)r=l!=(l=l.replace(s,"$1")),o=l.toLowerCase(),l=o in n||"onFocusOut"==l||"onFocusIn"==l?o.slice(2):l.slice(2),n.l||(n.l={}),n.ll+r=u,u?t?ua=ta:(ua=h,n.addEventListener(l,r?v:p,r)):n.removeEventListener(l,r?v:p,r);else{if("http://www.w3.org/2000/svg"==i)l=l.replace(/xlink(H|:h)/,"h").replace(/sName$/,"s");else if("width"!=l&&"height"!=l&&"href"!=l&&"list"!=l&&"form"!=l&&"tabIndex"!=l&&"download"!=l&&"rowSpan"!=l&&"colSpan"!=l&&"role"!=l&&"popover"!=l&&l in n)try{nl=null==u?"":u;break n}catch(n){}"function"==typeof u||(null==u||!1===u&&"-"!=l4?n.removeAttribute(l):n.setAttribute(l,"popover"==l&&1==u?"":u))}}function V(n){return function(u){if(this.l){var t=this.lu.type+n;if(null==uc)uc=h++;else if(uc<ta)return;return t(l.event?l.event(u):u)}}}function q(n,u,t,i,r,o,e,f,c,a){var s,h,p,v,y,d,_,k,x,M,$,I,P,A,H,T=u.type;if(void 0!==u.constructor)return null;128&t.__u&&(c=!!(32&t.__u),o=f=u.__e=t.__e),(s=l.__b)&&s(u);n:if("function"==typeof T)try{if(k=u.props,x=T.prototype&&T.prototype.render,M=(s=T.contextType)&&is.__c,$=s?M?M.props.value:s.__:i,t.__c?_=(h=u.__c=t.__c).__=h.__E:(x?u.__c=h=new T(k,$):(u.__c=h=new C(k,$),h.constructor=T,h.render=Q),M&&M.sub(h),h.state||(h.state={}),h.__n=i,p=h.__d=!0,h.__h=,h._sb=),x&&null==h.__s&&(h.__s=h.state),x&&null!=T.getDerivedStateFromProps&&(h.__s==h.state&&(h.__s=m({},h.__s)),m(h.__s,T.getDerivedStateFromProps(k,h.__s))),v=h.props,y=h.state,h.__v=u,p)x&&null==T.getDerivedStateFromProps&&null!=h.componentWillMount&&h.componentWillMount(),x&&null!=h.componentDidMount&&h.__h.push(h.componentDidMount);else{if(x&&null==T.getDerivedStateFromProps&&k!==v&&null!=h.componentWillReceiveProps&&h.componentWillReceiveProps(k,$),u.__v==t.__v||!h.__e&&null!=h.shouldComponentUpdate&&!1===h.shouldComponentUpdate(k,h.__s,$)){u.__v!=t.__v&&(h.props=k,h.state=h.__s,h.__d=!1),u.__e=t.__e,u.__k=t.__k,u.__k.some(function(n){n&&(n.__=u)}),w.push.apply(h.__h,h._sb),h._sb=,h.__h.length&&e.push(h);break n}null!=h.componentWillUpdate&&h.componentWillUpdate(k,h.__s,$),x&&null!=h.componentDidUpdate&&h.__h.push(function(){h.componentDidUpdate(v,y,d)})}if(h.context=$,h.props=k,h.__P=n,h.__e=!1,I=l.__r,P=0,x)h.state=h.__s,h.__d=!1,I&&I(u),s=h.render(h.props,h.state,h.context),w.push.apply(h.__h,h._sb),h._sb=;else do{h.__d=!1,I&&I(u),s=h.render(h.props,h.state,h.context),h.state=h.__s}while(h.__d&&++P<25);h.state=h.__s,null!=h.getChildContext&&(i=m(m({},i),h.getChildContext())),x&&!p&&null!=h.getSnapshotBeforeUpdate&&(d=h.getSnapshotBeforeUpdate(v,y)),A=null!=s&&s.type===S&&null==s.key?E(s.props.children):s,f=L(n,g(A)?A:A,u,t,i,r,o,e,f,c,a),h.base=u.__e,u.__u&=-161,h.__h.length&&e.push(h),_&&(h.__E=h.__=null)}catch(n){if(u.__v=null,c||null!=o)if(n.then){for(u.__u|=c?160:128;f&&8==f.nodeType&&f.nextSibling;)f=f.nextSibling;oo.indexOf(f)=null,u.__e=f}else{for(H=o.length;H--;)b(oH);B(u)}else u.__e=t.__e,u.__k=t.__k,n.then||B(u);l.__e(n,u,t)}else null==o&&u.__v==t.__v?(u.__k=t.__k,u.__e=t.__e):f=u.__e=G(t.__e,u,t,i,r,o,e,c,a);return(s=l.diffed)&&s(u),128&u.__u?void 0:f}function B(n){n&&(n.__c&&(n.__c.__e=!0),n.__k&&n.__k.some(B))}function D(n,u,t){for(var i=0;i<t.length;i++)J(ti,t++i,t++i);l.__c&&l.__c(u,n),n.some(function(u){try{n=u.__h,u.__h=,n.some(function(n){n.call(u)})}catch(n){l.__e(n,u.__v)}})}function E(n){return"object"!=typeof n||null==n||n.__b>0?n:g(n)?n.map(E):void 0!==n.constructor?null:m({},n)}function G(u,t,i,r,o,e,f,c,a){var s,h,p,v,y,w,_,m=i.props||d,k=t.props,x=t.type;if("svg"==x?o="http://www.w3.org/2000/svg":"math"==x?o="http://www.w3.org/1998/Math/MathML":o||(o="http://www.w3.org/1999/xhtml"),null!=e)for(s=0;s<e.length;s++)if((y=es)&&"setAttribute"in y==!!x&&(x?y.localName==x:3==y.nodeType)){u=y,es=null;break}if(null==u){if(null==x)return document.createTextNode(k);u=document.createElementNS(o,x,k.is&&k),c&&(l.__m&&l.__m(t,e),c=!1),e=null}if(null==x)m===k||c&&u.data==k||(u.data=k);else{if(e="textarea"==x&&null!=k.defaultValue?null:e&&n.call(u.childNodes),!c&&null!=e)for(m={},s=0;s<u.attributes.length;s++)m(y=u.attributess).name=y.value;for(s in m)y=ms,"dangerouslySetInnerHTML"==s?p=y:"children"==s||s in k||"value"==s&&"defaultValue"in k||"checked"==s&&"defaultChecked"in k||N(u,s,null,y,o);for(s in k)y=ks,"children"==s?v=y:"dangerouslySetInnerHTML"==s?h=y:"value"==s?w=y:"checked"==s?_=y:c&&"function"!=typeof y||ms===y||N(u,s,y,ms,o);if(h)c||p&&(h.__html==p.__html||h.__html==u.innerHTML)||(u.innerHTML=h.__html),t.__k=;else if(p&&(u.innerHTML=""),L("template"==t.type?u.content:u,g(v)?v:v,t,i,r,"foreignObject"==x?"http://www.w3.org/1999/xhtml":o,e,f,e?e0:i.__k&&$(i,0),c,a),null!=e)for(s=e.length;s--;)b(es);c&&"textarea"!=x||(s="value","progress"==x&&null==w?u.removeAttribute("value"):null!=w&&(w!==us||"progress"==x&&!w||"option"==x&&w!=ms)&&N(u,s,w,ms,o),s="checked",null!=_&&_!=us&&N(u,s,_,ms,o))}return u}function J(n,u,t){try{if("function"==typeof n){var i="function"==typeof n.__u;i&&n.__u(),i&&null==u||(n.__u=n(u))}else n.current=u}catch(n){l.__e(n,t)}}function K(n,u,t){var i,r;if(l.unmount&&l.unmount(n),(i=n.ref)&&(i.current&&i.current!=n.__e||J(i,null,u)),null!=(i=n.__c)){if(i.componentWillUnmount)try{i.componentWillUnmount()}catch(n){l.__e(n,u)}i.base=i.__P=null}if(i=n.__k)for(r=0;r<i.length;r++)ir&&K(ir,u,t||"function"!=typeof n.type);t||b(n.__e),n.__c=n.__=n.__e=void 0}function Q(n,l,u){return this.constructor(n,u)}function R(u,t,i){var r,o,e,f;t==document&&(t=document.documentElement),l.__&&l.__(u,t),o=(r="function"==typeof i)?null:i&&i.__k||t.__k,e=,f=,q(t,u=(!r&&i||t).__k=k(S,null,u),o||d,d,t.namespaceURI,!r&&i?i:o?null:t.firstChild?n.call(t.childNodes):null,e,!r&&i?i:o?o.__e:t.firstChild,r,f),D(e,u,f)}function U(n,l){R(n,l,U)}function W(l,u,t){var i,r,o,e,f=m({},l.props);for(o in l.type&&l.type.defaultProps&&(e=l.type.defaultProps),u)"key"==o?i=uo:"ref"==o?r=uo:fo=void 0===uo&&null!=e?eo:uo;return arguments.length>2&&(f.children=arguments.length>3?n.call(arguments,2):t),x(l.type,f,i||l.key,r||l.ref,null)}function X(n){function l(n){var u,t;return this.getChildContext||(u=new Set,(t={})l.__c=this,this.getChildContext=function(){return t},this.componentWillUnmount=function(){u=null},this.shouldComponentUpdate=function(n){this.props.value!=n.value&&u.forEach(function(n){n.__e=!0,A(n)})},this.sub=function(n){u.add(n);var l=n.componentWillUnmount;n.componentWillUnmount=function(){u&&u.delete(n),l&&l.call(n)}}),n.children}return l.__c="__cC"+y++,l.__=n,l.Provider=l.__l=(l.Consumer=function(n,l){return n.children(l)}).contextType=l,l}n=w.slice,l={__e:function(n,l,u,t){for(var i,r,o;l=l.__;)if((i=l.__c)&&!i.__)try{if((r=i.constructor)&&null!=r.getDerivedStateFromError&&(i.setState(r.getDerivedStateFromError(n)),o=i.__d),null!=i.componentDidCatch&&(i.componentDidCatch(n,t||{}),o=i.__d),o)return i.__E=i}catch(l){n=l}throw n}},u=0,t=function(n){return null!=n&&void 0===n.constructor},C.prototype.setState=function(n,l){var u;u=null!=this.__s&&this.__s!=this.state?this.__s:this.__s=m({},this.state),"function"==typeof n&&(n=n(m({},u),this.props)),n&&m(u,n),null!=n&&this.__v&&(l&&this._sb.push(l),A(this))},C.prototype.forceUpdate=function(n){this.__v&&(this.__e=!0,n&&this.__h.push(n),A(this))},C.prototype.render=S,i=,o="function"==typeof Promise?Promise.prototype.then.bind(Promise.resolve()):setTimeout,e=function(n,l){return n.__v.__b-l.__v.__b},H.__r=0,f=Math.random().toString(8),c="__d"+f,a="__a"+f,s=/(PointerCapture)$|Capture$/i,h=0,p=V(!1),v=V(!0),y=0;export{C as Component,S as Fragment,W as cloneElement,X as createContext,k as createElement,M as createRef,k as h,U as hydrate,t as isValidElement,l as options,R as render,F as toChildArray};

amule-3.1.0.tar.gz/src/webapi/static/js/views Added

amule-3.1.0.tar.gz/src/webapi/static/js/views/about.js Added

@@ -0,0 +1,110 @@
+// About view: application info from GET /api/v1/version (versions + daemon
+// update-availability), plus static project links and license. Shows the
+// mismatch/update message here; app.js only flags it with a nav dot.
+
+import { api } from "../api.js";
+import { html, useState, useEffect } from "../dom.js";
+import { Placeholder, toast } from "../components.js";
+import { t, terr } from "../i18n.js";
+import { Icon } from "../icons.js";
+
+const LINKS = 
+  { key: "about_website", href: "https://amule-org.github.io", text: "amule-org.github.io" },
+  { key: "about_source", href: "https://github.com/amule-org/amule", text: "github.com/amule-org/amule" },
+  { key: "about_license", href: "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html", text: "GPLv2" },
+;
+
+export default function About() {
+  const info, setInfo = useState(null);
+  const err, setErr = useState("");
+  const checking, setChecking = useState(false);
+
+  const load = () => api.get("version")
+    .then((v) => setInfo(v))
+    .catch((e) => setErr(terr(e) || t("about_load_error")));
+
+  useEffect(() => {
+    let alive = true;
+    api.get("version")
+      .then((v) => { if (alive) setInfo(v); })
+      .catch((e) => { if (alive) setErr(terr(e) || t("about_load_error")); });
+    return () => { alive = false; };
+  }, );
+
+  // The daemon runs the check asynchronously; re-fetch /version shortly after
+  // it accepts (202) so the panel reflects the fresh result.
+  const checkNow = async () => {
+    setChecking(true);
+    try {
+      await api.post("version/check");
+      toast(t("about_update_check_started"), "success");
+      setTimeout(() => load().finally(() => setChecking(false)), 2000);
+    } catch (e) {
+      toast(terr(e) || t("about_load_error"), "error");
+      setChecking(false);
+    }
+  };
+
+  if (err) return html`<${Placeholder} kind="error">${err}<//>`;
+  if (!info) return html`<${Placeholder} kind="loading">${t("app_loading")}<//>`;
+
+  const daemon = info.daemon_version || t("about_daemon_disconnected");
+  const u = info.update || {};
+  const mismatch = info.daemon_version && info.amuleapi_version !== info.daemon_version;
+  const updateAvailable = u.check_enabled && u.available === true;
+
+  return html`
+    ${updateAvailable ? html`
+    <div class="card about-alert update" role="alert">
+      <${Icon} name="downloads" size=${18} />
+      <span>${t("app_update_banner", { version: u.latest_version })}</span>
+    </div>` : null}
+    ${mismatch ? html`
+    <div class="card about-alert" role="alert">
+      <${Icon} name="warning" size=${18} />
+      <span>${t("about_version_mismatch", { ui: info.amuleapi_version, daemon: info.daemon_version })}</span>
+    </div>` : null}
+    <div class="card">
+      <h3>aMule Web</h3>
+      <div class="form-grid form-grid-2">
+        <div class="field"><label>${t("about_amuleapi_version")}</label><span>${info.amuleapi_version}</span></div>
+        <div class="field"><label>${t("about_daemon_version")}</label><span>${daemon}</span></div>
+        <div class="field"><label>${t("about_api_version")}</label><span>${info.api_version}</span></div>
+      </div>
+    </div>
+    ${u.check_enabled ? html`
+    <div class="card">
+      <h3>${t("about_update_section")}</h3>
+      <div class="form-grid form-grid-2">
+        <div class="field">
+          <label>${t("about_update_status")}</label>
+          <span class=${"update-status" + (u.available ? " available" : "")}>
+            ${!u.checked ? t("about_update_not_checked")
+              : u.available ? t("about_update_available") : t("about_update_uptodate")}
+          </span>
+        </div>
+        ${u.checked && u.latest_version ? html`
+        <div class="field"><label>${t("about_update_latest")}</label><span>${u.latest_version}</span></div>` : null}
+        ${u.last_checked_at ? html`
+        <div class="field">
+          <label>${t("about_update_last_checked")}</label>
+          <span>${new Date(u.last_checked_at * 1000).toLocaleString()}</span>
+        </div>` : null}
+      </div>
+      <div class="toolbar update-actions">
+        <button class="btn admin-only" disabled=${checking} onClick=${checkNow}>
+          <${Icon} name="polling" size=${16} />
+          ${checking ? t("about_update_checking") : t("about_update_check_now")}
+        </button>
+      </div>
+    </div>` : null}
+    <div class="card">
+      <div class="form-grid form-grid-2">
+        ${LINKS.map((l) => html`
+          <div class="field">
+            <label>${t(l.key)}</label>
+            <a href=${l.href} target="_blank" rel="noopener">${l.text}</a>
+          </div>`)}
+      </div>
+    </div>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/categories.js Added

@@ -0,0 +1,156 @@
+// Categories panel: CRUD for download categories, shown inline on the
+// Downloads page (it replaces the category tabs when "Manage categories" is
+// toggled on). No SSE channel, so the list is fetched on mount and after each
+// mutation. Index 0 -- the default category, which holds every download that
+// has none -- cannot be edited or deleted. Adding and editing open a modal
+// form; deleting uses a confirm dialog. Admin-only edit; guests see just the
+// list.
+
+import { api } from "../api.js";
+import { html, useState, useEffect } from "../dom.js";
+import { Placeholder, toast, confirmDialog } from "../components.js";
+import { Icon } from "../icons.js";
+import { t, terr } from "../i18n.js";
+
+const PRIORITIES = "auto", "low", "normal", "high"
+  .map((v) => v, t("downloads_prio_" + v));
+
+// Category 0 is the bucket every download without a category falls into. The
+// API synthesizes it and names it "Default", but that name is a constant no
+// catalog translates, so the label comes from i18n here instead; every other
+// index shows the operator's own name.
+export const categoryName = (categories, index) => {
+  if (!index) return t("downloads_category_none");
+  const c = categories.find((c) => c.index === index);
+  return c ? (c.name || "#" + c.index) : String(index);
+};
+
+// The <option> set every category picker shares.
+export const categoryOptions = (categories) => html`
+  <option value=${0}>${t("downloads_category_none")}</option>
+  ${categories.filter((c) => c.index !== 0).map((c) => html`<option value=${c.index}>${c.name || ("#" + c.index)}</option>`)}`;
+
+export function CategoriesPanel({ isGuest }) {
+  const categories, setCategories = useState();
+  const loadErr, setLoadErr = useState("");
+  const formOpen, setFormOpen = useState(false);
+  const editing, setEditing = useState(null); // null = create mode, else index
+  const name, setName = useState("");
+  const path, setPath = useState("");
+  const comment, setComment = useState("");
+  const color, setColor = useState("#1664c0");
+  const prio, setPrio = useState("auto");
+
+  const load = async () => {
+    try { setCategories((await api.list("categories")).categories || ); setLoadErr(""); }
+    catch (e) { setLoadErr(terr(e) || t("downloads_cat_error")); }
+  };
+  useEffect(() => { load(); }, );
+
+  const openCreate = () => {
+    setEditing(null); setName(""); setPath(""); setComment(""); setColor("#1664c0"); setPrio("auto");
+    setFormOpen(true);
+  };
+  const openEdit = (c) => {
+    setEditing(c.index);
+    setName(c.name || ""); setPath(c.save_path || ""); setComment(c.comment || "");
+    setColor(c.color || "#000000"); setPrio(c.priority || "auto");
+    setFormOpen(true);
+  };
+
+  const save = async (e) => {
+    e.preventDefault();
+    const n = name.trim(), p = path.trim();
+    if (!n || !p) { toast(t("downloads_cat_toast_name_path_required"), "warn"); return; }
+    // `color` is "#rrggbb" on the wire in both directions, so no conversion
+    // here (the core packs 0x00BBGGRR, red in the low byte).
+    const body = { name: n, save_path: p, color, priority: prio };
+    if (comment.trim()) body.comment = comment.trim();
+    try {
+      if (editing !== null) await api.patch("categories/" + editing, body);
+      else await api.post("categories", body);
+      toast(t("downloads_cat_toast_saved"), "success"); setFormOpen(false); load();
+    } catch (err) { toast(terr(err) || t("downloads_cat_error"), "error"); }
+  };
+  const remove = async (c) => {
+    if (!(await confirmDialog(t("downloads_cat_confirm_delete", { name: c.name })))) return;
+    try { await api.del("categories/" + c.index); toast(t("downloads_cat_toast_deleted"), "success"); load(); }
+    catch (e) { toast(terr(e) || t("downloads_cat_error"), "error"); }
+  };
+
+  const row = (c) => html`
+    <tr>
+      <td class="name">${c.index === 0 ? html`<strong>${t("downloads_category_none")}</strong>` : c.name}</td>
+      <td>${c.comment || ""}</td>
+      <td>${c.save_path || ""}</td>
+      <td>${prioLabel(c.priority)}</td>
+      <td><span class="color-swatch" style=${{ background: c.color || "#000000" }}></span> ${c.color || ""}</td>
+      ${isGuest ? null : html`
+        <td class="row-actions admin-only">
+          ${c.index === 0 ? null : html`
+            <button class="btn btn-icon btn-sm" title=${t("downloads_cat_edit")} onClick=${() => openEdit(c)}>
+              <${Icon} name="edit" />
+            </button>
+            <button class="btn btn-icon btn-sm btn-danger" title=${t("downloads_cat_delete")} onClick=${() => remove(c)}>
+              <${Icon} name="cancel" />
+            </button>`}
+        </td>`}
+    </tr>`;
+
+  return html`
+    <div class="card">
+      <div class="cat-panel-header">
+        <h3>${t("downloads_cat_title")}</h3>
+        <div class="spacer"></div>
+        ${isGuest ? null : html`
+          <button class="btn btn-sm admin-only" type="button" onClick=${openCreate}>
+            ${t("downloads_cat_add")}
+          </button>`}
+      </div>
+      <div class="table-wrap">
+        <table class="data">
+          <thead>
+            <tr>
+              <th>${t("downloads_cat_name")}</th><th>${t("downloads_cat_comment")}</th><th>${t("downloads_cat_incoming_dir")}</th>
+              <th>${t("downloads_cat_priority")}</th><th>${t("downloads_cat_color")}</th>
+              ${isGuest ? null : html`<th class="admin-only">${t("downloads_cat_actions")}</th>`}
+            </tr>
+          </thead>
+          <tbody>${loadErr ? null : categories.map(row)}</tbody>
+        </table>
+        ${loadErr ? html`<div class="table-empty"><${Placeholder} kind="error">${loadErr}<//></div>`
+          : categories.length ? null
+            : html`<div class="table-empty"><${Placeholder} kind="info">${t("downloads_cat_empty")}<//></div>`}
+      </div>
+    </div>
+
+    ${formOpen && !isGuest ? html`
+      <div class="modal-overlay" onClick=${(e) => { if (e.target === e.currentTarget) setFormOpen(false); }}>
+        <div class="modal">
+          <form onSubmit=${save}>
+            <div class="modal-header">
+              <h3>${editing !== null ? t("downloads_cat_edit_title") : t("downloads_cat_add")}</h3>
+            </div>
+            <div class="form-grid form-grid-2">
+              ${field(t("downloads_cat_name"), html`<input class="input" name="category_name" placeholder=${t("downloads_cat_name_ph")} required value=${name} onInput=${(e) => setName(e.target.value)} />`)}
+              ${field(t("downloads_cat_comment"), html`<input class="input" name="category_comment" placeholder=${t("downloads_cat_comment_ph")} value=${comment} onInput=${(e) => setComment(e.target.value)} />`)}
+              ${field(t("downloads_cat_path"), html`<input class="input" name="category_incoming" placeholder=${t("downloads_cat_incoming_path_ph")} required value=${path} onInput=${(e) => setPath(e.target.value)} />`)}
+              ${field(t("downloads_cat_priority"), html`<select class="input" name="category_priority" value=${prio} onChange=${(e) => setPrio(e.target.value)}>${PRIORITIES.map((v, l) => html`<option value=${v}>${l}</option>`)}</select>`)}
+              ${field(t("downloads_cat_color"), html`<input class="input" name="category_color" type="color" value=${color} onInput=${(e) => setColor(e.target.value)} />`)}
+            </div>
+            <div class="modal-actions">
+              <button class="btn" type="button" onClick=${() => setFormOpen(false)}>${t("downloads_cat_cancel")}</button>
+              <button class="btn btn-primary" type="submit">${editing !== null ? t("downloads_cat_save") : t("downloads_cat_create")}</button>
+            </div>
+          </form>
+        </div>
+      </div>` : null}`;
+}
+
+function field(label, control) {
+  return html`<div class="field"><label>${label}</label>${control}</div>`;
+}
+function prioLabel(p) {
+  const f = PRIORITIES.find((v) => v === p);
+  return f ? f1 : (p || "");
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/client-detail.js Added

@@ -0,0 +1,129 @@
+// Client detail panel: the full per-peer info shown below the Clients table
+// when a row is clicked, mirroring the desktop's "Client Details" dialog. Data
+// comes from GET clients/{ecid} (the list fields plus the detail-only ones:
+// ed2k_user_id, high_id, server, kad_port, friend, credit_ratio). It re-fetches
+// on each live tick of the clients store so speeds/states stay current while the
+// panel is open (GET is ETag-cached, so unchanged frames short-circuit to 304).
+//
+// A Known-tab row that is offline has no live ecid, so only the stored
+// credit-store fields (`known`) are shown -- the desktop opens no detail there.
+
+import { api } from "../api.js";
+import { html, useState, useEffect, useStore } from "../dom.js";
+import { Section, statRow, Placeholder, CountryCell, Tabs } from "../components.js";
+import { formatBytes, formatSpeed, formatInt, formatPercent, formatTimestamp, twin } from "../format.js";
+import { softLabel, identLabel, stateBadge } from "./client-table.js";
+import { t } from "../i18n.js";
+
+const hashCell = (h) => html`<span class="mono">${(h || "").toUpperCase() || "—"}</span>`;
+const origin = (c) => c.source_origin ? t("downloads_peer_origin_" + c.source_origin) : "—";
+const yesNo = (v) => v ? t("common_yes") : t("common_no");
+// "undefined" is the core's not-reported token; render it (and an empty) as a dash.
+const obfuscation = (c) => c.obfuscation_state && c.obfuscation_state !== "undefined"
+  ? t("client_detail_obf_" + c.obfuscation_state) : "—";
+
+function panel(name, sections) {
+  // A single "General" tab: a client has one view, but the tab strip keeps the
+  // panel visually consistent with the Downloads / Shared Files detail panels.
+  return html`
+    <div class="detail-panel">
+      <div class="detail-head">
+        <div class="detail-titlebar">
+          <h4 class="detail-name" title=${name}>${name || "—"}</h4>
+        </div>
+      </div>
+      <${Tabs} tabs=${{ key: "general", label: t("client_detail_tab_general") }}
+               active="general" onSelect=${() => {}} />
+      <div class="detail-body">
+        <div class="detail-sections">${sections}</div>
+      </div>
+    </div>`;
+}
+
+// One section layout for both a live client (GET /clients/{ecid}) and an
+// offline Known row, so the panel looks the same either way. A row shows only
+// when the client carries that field (the live object has them all; a Known row
+// has a subset), and a section with no rows is hidden — so an offline client
+// simply drops Files/Flags and the live-only transfer rows rather than showing a
+// different shape.
+function clientSections(c) {
+  const has = (k) => ck !== undefined;
+  const idType = c.high_id != null ? t(c.high_id ? "client_detail_id_high" : "client_detail_id_low") : "";
+  // Downloaded/Uploaded: session+total (live) or just the credit-store total (Known).
+  const total = (sess, tot, label, totalLabel) =>
+    csess !== undefined ? statRow(label, twin(c, sess, tot, formatBytes))
+    : ctot !== undefined ? statRow(totalLabel, formatBytes(ctot)) : null;
+
+  const identity = 
+    statRow("client_detail_name", c.name || "—"),
+    statRow("client_detail_hash", hashCell(c.user_hash)),
+    has("ed2k_user_id") ? statRow("client_detail_id",
+      formatInt(c.ed2k_user_id) + (idType ? " (" + idType + ")" : "")) : null,
+    has("ident_state") ? statRow("client_detail_ident", identLabel(c.ident_state)) : null,
+  ;
+  const network = 
+    has("ip") ? statRow("client_detail_ip", c.ip ? c.ip + ":" + c.port : "—") : null,
+    has("kad_port") ? statRow("client_detail_kad", t(c.kad_port ? "client_detail_kad_on" : "client_detail_kad_off")) : null,
+    has("country_code") ? statRow("client_detail_country", html`<${CountryCell} code=${c.country_code} />`) : null,
+    has("server_ip") ? statRow("client_detail_server", c.server_ip ? c.server_ip + ":" + c.server_port : "—") : null,
+    has("server_name") ? statRow("client_detail_server_name", c.server_name || "—") : null,
+  ;
+  const software = 
+    has("software") ? statRow("client_detail_software", softLabel(c)) : null,
+    has("reported_os") ? statRow("client_detail_os", c.reported_os || "—") : null,
+    has("client_mod_name") ? statRow("client_detail_mod", c.client_mod_name || "—") : null,
+    has("source_origin") ? statRow("client_detail_origin", origin(c)) : null,
+    has("obfuscation_state") ? statRow("client_detail_obfuscation", obfuscation(c)) : null,
+  ;
+  const transfer = 
+    has("download_state") ? statRow("client_detail_dl_state", stateBadge(c.download_state)) : null,
+    has("upload_state") ? statRow("client_detail_ul_state", stateBadge(c.upload_state)) : null,
+    has("download_speed_bytes_per_second") ? statRow("client_detail_dl_speed", formatSpeed(c.download_speed_bytes_per_second)) : null,
+    has("upload_speed_bytes_per_second") ? statRow("client_detail_ul_speed", formatSpeed(c.upload_speed_bytes_per_second)) : null,
+    total("downloaded_bytes_session", "downloaded_bytes_total", "client_detail_downloaded", "client_detail_dl_total"),
+    total("uploaded_bytes_session", "uploaded_bytes_total", "client_detail_uploaded", "client_detail_ul_total"),
+    has("credit_ratio") ? statRow("client_detail_ratio", c.credit_ratio != null ? Number(c.credit_ratio).toFixed(2) : "—", "client_detail_tip_ratio") : null,
+    has("part_progress_percent") ? statRow("client_detail_progress", c.part_progress_percent != null ? formatPercent(c.part_progress_percent) : "—") : null,
+    has("upload_queue_position") ? statRow("client_detail_queue", c.upload_queue_position || "—") : null,
+    has("upload_queue_score") ? statRow("client_detail_score", c.upload_queue_score || "—") : null,
+    has("first_seen_at") ? statRow("client_detail_first_seen", formatTimestamp(c.first_seen_at)) : null,
+    has("last_seen_at") ? statRow("client_detail_last_seen", formatTimestamp(c.last_seen_at)) : null,
+    has("session_count") ? statRow("client_detail_sessions", c.session_count == null ? "—" : formatInt(c.session_count)) : null,
+  ;
+  const files = 
+    has("download_file_name") ? statRow("client_detail_dl_file", c.download_file_name || "—") : null,
+    has("upload_file_name") ? statRow("client_detail_ul_file", c.upload_file_name || "—") : null,
+  ;
+  const flags = 
+    has("friend") ? statRow("client_detail_friend", yesNo(c.friend)) : null,
+    has("friend_slot") ? statRow("client_detail_friend_slot", yesNo(c.friend_slot)) : null,
+    has("shared_files_browsable") ? statRow("client_detail_shares", yesNo(c.shared_files_browsable)) : null,
+  ;
+  return html`
+    ${Section(identity.filter(Boolean), "client_detail_group_identity")}
+    ${Section(network.filter(Boolean), "client_detail_group_network")}
+    ${Section(software.filter(Boolean), "client_detail_group_software")}
+    ${Section(transfer.filter(Boolean), "client_detail_group_transfer")}
+    ${Section(files.filter(Boolean), "client_detail_group_files")}
+    ${Section(flags.filter(Boolean), "client_detail_group_flags")}`;
+}
+
+export function ClientDetail({ ecid, known }) {
+  const clients = useStore("clients") || ; // live tick source (SSE)
+  const detail, setDetail = useState(null);
+  const gone, setGone = useState(false);
+
+  useEffect(() => {
+    if (ecid == null) { setDetail(null); setGone(false); return; }
+    let alive = true;
+    api.get("clients/" + ecid)
+      .then((d) => { if (alive) { setDetail(d); setGone(false); } })
+      .catch(() => { if (alive) setGone(true); });
+    return () => { alive = false; };
+  }, ecid, clients);
+
+  if (ecid == null) return known ? panel(known.name, clientSections(known)) : null;
+  if (gone) return html`<div class="detail-panel"><${Placeholder} kind="info">${t("client_detail_gone")}<//></div>`;
+  if (!detail) return html`<div class="detail-panel"><${Placeholder} kind="loading">${t("client_detail_loading")}<//></div>`;
+  return panel(detail.name, clientSections(detail));
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/client-table.js Added

@@ -0,0 +1,361 @@
+// Peer table shared by the Clients section and the per-file "Clients" tab in
+// the Downloads / Shared Files detail panels. Columns, formatting helpers and
+// the live `clients` store wiring live here once; each consumer decides which
+// columns it shows by default and which rows it feeds in.
+
+import { api } from "../api.js";
+import { data } from "../events.js";
+import { html, useState, useEffect, useStore } from "../dom.js";
+import { Badge, listPlaceholder, CountryCell, toast } from "../components.js";
+import { searches } from "../searches.js";
+import { chats } from "../chats.js";
+import { VirtualTable, sortRows, textMatcher, useTablePrefs, ColumnPicker, ipNum } from "../table.js";
+import { formatBytes, formatSpeed, formatInt, formatTimestamp } from "../format.js";
+import { Icon } from "../icons.js";
+import { t, terr } from "../i18n.js";
+
+const ACTIVE = (s) => s && s !== "idle" && s !== "unknown";
+export const isDown = (c) => (c.download_speed_bytes_per_second || 0) > 0 || ACTIVE(c.download_state);
+export const isUp = (c) => (c.upload_speed_bytes_per_second || 0) > 0 || ACTIVE(c.upload_state);
+
+// Column set, declared once. Every consumer offers all of them in the column
+// picker and picks which ones start hidden (see ClientTable's defaultHidden),
+// so a column is always one click away instead of missing from a tab.
+export const softLabel = (c) => c.software ? t("downloads_peer_soft_" + c.software) : "", c.software === "unknown" ? "" : c.software_version.filter(Boolean).join(" ") || "—";
+// `remote_queue_position` is null when the peer's queue is full (the API turns
+// amuled's 0xffff sentinel into null), and 0 when it reported no position at
+// all. Both are "not a position", so they sort together as 0.
+const rankLabel = (c) => c.remote_queue_position === null ? t("downloads_peer_queue_full") : c.remote_queue_position || "—";
+const bytesOf = (c, k) => formatBytes(ck);
+// The "file" column is shared by both directions: download_file_name is the
+// peer-advertised name of what we're pulling FROM them; upload_file_name is
+// the partfile they're pulling FROM us. An upload-only peer has no
+// download_file_name, so falling back to upload_file_name is what actually
+// makes the column non-blank for uploads.
+export const fileNameOf = (c) => c.download_file_name || c.upload_file_name || "";
+
+// Default order when no column sort is chosen: busiest peers first.
+export const bySpeed = (a, b) =>
+  ((b.download_speed_bytes_per_second || 0) + (b.upload_speed_bytes_per_second || 0)) -
+  ((a.download_speed_bytes_per_second || 0) + (a.upload_speed_bytes_per_second || 0));
+
+// Each column carries key + sortVal so the header is clickable-to-sort. Peer
+// status flags ride inside the name cell (see peerFlags), not a column of their own.
+// The core's credit modifier, served by both /clients and /known_clients. Never computed here:
+// the formula lives in CClientCredits and a copy of it in JavaScript went stale the moment the
+// core stopped applying its identity gate to the displayed value.
+const RATIO_COL =
+  { key: "ratio", th: "downloads_peer_col_ratio", num: true, width: "130px", sortable: true,
+    sortVal: (c) => c.credit_ratio ?? 0,
+    cell: (c) => c.credit_ratio == null ? "\u2014" : Number(c.credit_ratio).toFixed(2) };
+
+export const COLS = 
+  // Identity block, each field next to the one it qualifies: where the peer is
+  // (country, address), who it claims (name, user_hash), what it runs (software, os).
+  // Abbreviated header: a spelled-out "Country" would still be wider than the cell.
+  { key: "country", th: "downloads_peer_col_country", width: "70px", sortable: true,
+    sortVal: (c) => c.country_code || "", cell: (c) => html`<${CountryCell} code=${c.country_code} />` },
+  // Empty ip: a peer we never connected to directly (LowID).
+  { key: "address", th: "downloads_peer_col_address", num: true, width: "180px", sortable: true,
+    sortVal: (c) => ipNum(c.ip), cell: (c) => c.ip ? c.ip + ":" + c.port : "—" },
+  { key: "name", th: "downloads_peer_col_name", width: "180px", sortable: true,
+    sortVal: (c) => (c.name || "").toLowerCase(),
+    cell: (c) => { const flags = peerFlags(c); return html`<div class="name-cell">${flags.length ? html`<span class="peer-flags">${flags}</span>` : null}<span class="name-text" title=${c.name}>${c.name || "—"}</span></div>`; } },
+  { key: "user_hash", th: "downloads_peer_col_user_hash", width: "150px", sortable: true,
+    sortVal: (c) => c.user_hash || "",
+    cell: (c) => html`<span title=${c.user_hash}>${c.user_hash || "—"}</span>` },
+  { key: "ident", th: "downloads_peer_col_ident", width: "130px", sortable: true,
+    sortVal: (c) => identLabel(c.ident_state).toLowerCase(), cell: (c) => identBadge(c.ident_state) },
+  { key: "software", th: "downloads_peer_col_software", width: "140px", sortable: true,
+    sortVal: (c) => softLabel(c).toLowerCase(), cell: (c) => softLabel(c) },
+  // The peer's own self-reported OS string -- frequently empty.
+  { key: "os", th: "downloads_peer_col_os", width: "110px", sortable: true,
+    sortVal: (c) => (c.reported_os || "").toLowerCase(), cell: (c) => c.reported_os || "—" },
+  // How this source was found (server/kad/passive/…), the desktop's Origin column.
+  { key: "origin", th: "downloads_peer_col_origin", width: "120px", sortable: true,
+    sortVal: (c) => c.source_origin || "",
+    cell: (c) => c.source_origin ? t("downloads_peer_origin_" + c.source_origin) : "—" },
+  { key: "file", th: "downloads_peer_col_file", cls: "name", sortable: true,
+    sortVal: (c) => fileNameOf(c).toLowerCase(),
+    // A4AF row: the peer-advertised name belongs to the other file it is parked
+    // on, so the desktop blanks it (the A4AF badge is in the "avail" cell).
+    cell: (c) => c.a4af ? "—" : html`<span title=${fileNameOf(c)}>${fileNameOf(c) || "—"}</span>` },
+  // Parts the peer offers of this file. On an A4AF row, the whole cell becomes
+  // the "A4AF: <other file>" badge, mirroring the desktop's Part Status cell.
+  { key: "avail", th: "downloads_peer_col_avail", width: "130px", sortable: true,
+    sortVal: (c) => c.parts_offered_count || 0,
+    cell: (c) => c.a4af
+      ? html`<span class="a4af-badge" title=${c.a4af_name || "?"}>${t("downloads_peer_a4af")}: ${c.a4af_name || "?"}</span>`
+      : c.parts_offered_count == null ? "—"
+      : formatInt(c.parts_offered_count) + (c.partsTotal ? " / " + formatInt(c.partsTotal) : "") },
+
+  { key: "dl_state", th: "downloads_peer_col_dl_state", width: "120px", sortable: true,
+    sortVal: (c) => c.download_state || "", cell: (c) => stateBadge(c.download_state) },
+  { key: "dl_speed", th: "downloads_peer_col_dl_speed", num: true, width: "100px", sortable: true,
+    sortVal: (c) => c.download_speed_bytes_per_second || 0, cell: (c) => formatSpeed(c.download_speed_bytes_per_second) },
+  { key: "downloaded", th: "downloads_peer_col_downloaded", num: true, width: "100px", sortable: true,
+    sortVal: (c) => c.downloaded_bytes_total || 0, cell: (c) => bytesOf(c, "downloaded_bytes_total") },
+  { key: "dl_session", th: "downloads_peer_col_downloaded_session", num: true, width: "100px", sortable: true,
+    sortVal: (c) => c.downloaded_bytes_session || 0, cell: (c) => bytesOf(c, "downloaded_bytes_session") },
+  { key: "remote_rank", th: "downloads_peer_col_remote_rank", num: true, width: "90px", sortable: true,
+    sortVal: (c) => c.remote_queue_position || 0, cell: (c) => rankLabel(c) },
+
+  { key: "ul_state", th: "downloads_peer_col_ul_state", width: "120px", sortable: true,
+    sortVal: (c) => c.upload_state || "", cell: (c) => stateBadge(c.upload_state) },
+  { key: "ul_speed", th: "downloads_peer_col_ul_speed", num: true, width: "100px", sortable: true,
+    sortVal: (c) => c.upload_speed_bytes_per_second || 0, cell: (c) => formatSpeed(c.upload_speed_bytes_per_second) },
+  { key: "uploaded", th: "downloads_peer_col_uploaded", num: true, width: "100px", sortable: true,
+    sortVal: (c) => c.uploaded_bytes_total || 0, cell: (c) => bytesOf(c, "uploaded_bytes_total") },
+  { key: "ul_session", th: "downloads_peer_col_uploaded_session", num: true, width: "100px", sortable: true,
+    sortVal: (c) => c.uploaded_bytes_session || 0, cell: (c) => bytesOf(c, "uploaded_bytes_session") },
+  RATIO_COL,
+  { key: "queue_pos", th: "downloads_peer_col_queue_pos", num: true, width: "90px", sortable: true,
+    sortVal: (c) => c.upload_queue_position || 0, cell: (c) => c.upload_queue_position || "—" },
+  { key: "score", th: "downloads_peer_col_score", num: true, width: "80px", sortable: true,
+    sortVal: (c) => c.upload_queue_score || 0, cell: (c) => c.upload_queue_score || "—" },
+  // Whether the peer lets us browse its shared list (desktop "Shares File List").
+  { key: "shares", th: "downloads_peer_col_shares", width: "80px", sortable: true,
+    sortVal: (c) => c.shared_files_browsable ? 1 : 0,
+    cell: (c) => c.shared_files_browsable == null ? "—"
+      : c.shared_files_browsable ? t("common_yes") : t("common_no") },
+
+  // "View files": browse this peer's share, the desktop's context-menu action.
+  // A browse is an ordinary search on the API, so it opens as a tab in the
+  // Search section, which is where this jumps to. Rides the shared column set,
+  // so it also appears in the detail panels' Clients tab -- it targets a peer,
+  // not a file, so that is correct. Shown only when the peer allows browsing
+  // (shared_files_browsable); most forbid it, and a browse there just fails.
+  //
+  // "Send message" opens the Messages section with this peer selected (no
+  // request; the core creates the conversation on the first message). Only for
+  // a peer with an address, the conversation key.
+  { key: "actions", th: "downloads_peer_col_actions", cls: "row-actions admin-only", width: "132px",
+    cell: (c) => html`
+      ${c.a4af && c.a4af_target_hash ? html`
+        <button class="btn btn-icon btn-sm" type="button" title=${t("downloads_a4af_swap_source")}
+                onClick=${() => api.post("downloads/" + c.a4af_target_hash + "/a4af",
+                                         { action: "swap_this", client_ecid: c.ecid })
+                  .then(() => toast(t("downloads_a4af_done"), "success"))
+                  .catch((e) => toast(terr(e), "error"))}>
+          <${Icon} name="download" />
+        </button>` : null}
+      ${c.ip && c.port ? html`
+        <button class="btn btn-icon btn-sm" type="button" title=${t("messages_send_message")}
+                onClick=${() => {
+                  chats.open({ peer: c.ip + ":" + c.port, ip: c.ip, port: c.port,
+                               name: c.name, clientEcid: c.ecid });
+                  location.hash = "#/messages";
+                }}>
+          <${Icon} name="messages" />
+        </button>` : null}
+      ${c.shared_files_browsable ? html`
+        <button class="btn btn-icon btn-sm" type="button" title=${t("search_view_files")}
+                onClick=${() => searches.browse(c.ecid, c.name).catch((e) => toast(terr(e), "error"))}>
+          <${Icon} name="shared" />
+        </button>` : null}` },
+;
+
+// Raw-detail columns no consumer leads with; each adds its own defaultHidden set
+// on top of these.
+export const HIDDEN_EVERYWHERE = "address", "os", "user_hash", "ident", "origin", "ratio";
+
+// 1:1 with ClientIdentStateName() in src/webapi/Refresher.cpp.
+export const IDENT_STATES = "identified", "not_available", "id_needed", "id_failed", "bad_guy", "unknown";
+export const identLabel = (s) => t("downloads_peer_ident_" + (s || "unknown"));
+export const IDENT_FILTERS = "all", ...IDENT_STATES.map((v) => v, t("downloads_peer_ident_" + v));
+
+// Column set for the Known-clients tab (GET /known_clients, the credit store).
+// Reuses the identity cells; swaps live transfer columns for first/last seen,
+// session count and the cross-session totals.
+export const KNOWN_COLS = 
+  { key: "country", th: "downloads_peer_col_country", width: "70px", sortable: true,
+    sortVal: (c) => c.country_code || "", cell: (c) => html`<${CountryCell} code=${c.country_code} />` },
+  { key: "name", th: "downloads_peer_col_name", width: "180px", sortable: true,
+    sortVal: (c) => (c.name || "").toLowerCase(),
+    cell: (c) => html`<span title=${c.name}>${c.name || "—"}</span>` },
+  { key: "user_hash", th: "downloads_peer_col_user_hash", width: "150px", sortable: true,
+    sortVal: (c) => c.user_hash || "",
+    cell: (c) => html`<span title=${c.user_hash}>${c.user_hash || "—"}</span>` },
+  { key: "software", th: "downloads_peer_col_software", width: "150px", sortable: true,
+    sortVal: (c) => softLabel(c).toLowerCase(), cell: (c) => softLabel(c) },
+  { key: "origin", th: "downloads_peer_col_origin", width: "120px", sortable: true,
+    sortVal: (c) => c.source_origin || "",
+    cell: (c) => c.source_origin ? t("downloads_peer_origin_" + c.source_origin) : "—" },
+  { key: "address", th: "downloads_peer_col_address", num: true, width: "170px", sortable: true,
+    sortVal: (c) => ipNum(c.ip), cell: (c) => c.ip ? c.ip + ":" + c.port : "—" },
+  { key: "first_seen", th: "downloads_peer_col_first_seen", width: "160px", sortable: true,
+    sortVal: (c) => c.first_seen_at || 0, cell: (c) => formatTimestamp(c.first_seen_at) },
+  // "Online now" while the peer is connected (matched by user hash against the
+  // live /clients store), the last-seen timestamp otherwise.
+  { key: "last_seen", th: "downloads_peer_col_last_seen", width: "160px", sortable: true,
+    sortVal: (c) => c.online ? Infinity : (c.last_seen_at || 0),
+    cell: (c) => c.online
+      ? html`<${Badge} kind="downloading">${t("clients_online_now")}<//>`
+      : formatTimestamp(c.last_seen_at) },
+  { key: "sessions", th: "downloads_peer_col_sessions", num: true, width: "90px", sortable: true,
+    sortVal: (c) => c.session_count || 0,
+    cell: (c) => c.session_count == null ? "—" : formatInt(c.session_count) },
+  // Grouped by direction: DL speed + total, then UL speed + total. Speeds are
+  // borrowed from the online peer (see ClientsPanel); "—" offline, matching the
+  // desktop's History list (live-only speed columns).
+  { key: "dl_speed", th: "downloads_peer_col_dl_speed", num: true, width: "100px", sortable: true,
+    sortVal: (c) => c.download_speed_bytes_per_second || 0, cell: (c) => formatSpeed(c.download_speed_bytes_per_second) },
+  { key: "downloaded", th: "downloads_peer_col_downloaded", num: true, width: "100px", sortable: true,
+    sortVal: (c) => c.downloaded_bytes_total || 0, cell: (c) => bytesOf(c, "downloaded_bytes_total") },
+  { key: "ul_speed", th: "downloads_peer_col_ul_speed", num: true, width: "100px", sortable: true,
+    sortVal: (c) => c.upload_speed_bytes_per_second || 0, cell: (c) => formatSpeed(c.upload_speed_bytes_per_second) },
+  { key: "uploaded", th: "downloads_peer_col_uploaded", num: true, width: "100px", sortable: true,
+    sortVal: (c) => c.uploaded_bytes_total || 0, cell: (c) => bytesOf(c, "uploaded_bytes_total") },
+  RATIO_COL,
+;
+
+export const KNOWN_HIDDEN = "user_hash", "address", "origin";
+
+// Known clients (GET /known_clients): the daemon's credit store. A plain fetch,
+// not an SSE resource -- "online" and live activity are derived by the caller
+// cross-referencing user_hash against the live clients store. `enabled` gates
+// the fetch so it only runs once its tab is opened (and re-runs on re-open).
+export function useKnownClients(enabled = true) {
+  const rows, setRows = useState(undefined);
+  useEffect(() => {
+    if (!enabled) return;
+    let alive = true;
+    api.list("known_clients").then((r) => { if (alive) setRows(r.known_clients || ); })
+       .catch(() => { if (alive) setRows(); });
+    return () => { alive = false; };
+  }, enabled);
+  return rows;
+}
+
+// Live `clients` collection (GET /clients seed + SSE client_added/updated/
+// removed). register/ensure are idempotent, so every consumer can just call
+// this; the resource starts on the first mount and stays live from then on.
+// Returns the raw store value: undefined until the first snapshot lands, 
+// once there are known to be no peers (see ClientTable's `loading`).
+export function useClients() {
+  useEffect(() => {
+    data.register({ key: "clients", eventPrefix: "client", id: "ecid",
+      list: () => api.list("clients").then((r) => r.clients || ) });
+    data.ensure("clients");
+  }, );
+  return useStore("clients");
+}
+
+// Ident state → icon shown before the peer name: shield when identified, dim info
+// for the neutral states, warning when it failed (amber for bad_guy, via flag-warn).
+const IDENT_ICON = { identified: "verified", not_available: "about", id_needed: "about", id_failed: "warning", bad_guy: "warning" };
+
+export function peerFlags(c) {
+  const flags = ;
+  const ic = IDENT_ICONc.ident_state;
+  if (ic)
+    flags.push(ic, t("downloads_peer_ident") + ": " + identLabel(c.ident_state),
+      c.ident_state === "bad_guy" ? "flag-warn" : null);
+  if (c.obfuscation_state === "enabled")
+    flags.push("lock", t("downloads_peer_obfuscation") + ": " + t("downloads_peer_enabled"));
+  // Two different facts, two icons: the slot is an upload privilege we granted,
+  // `friend` is friends-list membership. A peer can carry either alone.
+  if (c.friend_slot)
+    flags.push("star", t("downloads_peer_friend_slot"));
+  if (c.friend)
+    flags.push("friend", t("downloads_peer_friend"));
+  return flags.map((name, tip, cls) => html`<${Icon} name=${name} size=${18} title=${tip} class=${cls} />`);
+}
+
+const IDENT_KIND = { identified: "downloading", id_failed: "stopped", bad_guy: "stopped", id_needed: "waiting" };
+export function identBadge(s) {
+  return html`<${Badge} kind=${IDENT_KINDs || "paused"}>${identLabel(s)}<//>`;
+}
+
+export function stateBadge(s) {
+  if (!s || s === "idle") return html`<${Badge}>${t("downloads_peer_state_" + (s || "idle"))}<//>`;
+  const kind = s === "downloading" || s === "uploading" ? "downloading"
+    : s === "banned" || s === "error" ? "paused" : "waiting";
+  return html`<${Badge} kind=${kind}>${t("downloads_peer_state_" + s)}<//>`;
+}
+
+// Toolbar + peer table, shared by every consumer. Always offers the full
+// column set in the picker; `defaultHidden` / `defaultSort` are only the
+// starting point, and `prefsKey` is where the user's choice (sort, hidden
+// columns, widths) is persisted. Every caller sorts descending by default
+// (biggest transfer first), so only the column key is a prop. `toolbar` is
+// whatever filter controls the caller wants left of the picker. Returns the
+// two siblings so the caller keeps owning the layout box around them.
+// `loading` (useClients() still undefined) makes empty `rows` mean "not seeded
+// yet" rather than "no peers".
+export function ClientTable({ rows, cols = COLS, prefsKey, defaultHidden, defaultSort, toolbar,
+                              toolbarCls = "toolbar", loading = false, onRowClick, rowClass, selectedKey }) {
+  const { sortKey, sortDir, hidden, widths, toggleSort, toggleCol, setWidth, resetPrefs } =
+    useTablePrefs(prefsKey, { sortKey: defaultSort, sortDir: -1, hidden: defaultHidden });
+
+  const columns = cols.map((col) => ({ ...col, label: col.th ? t(col.th) : "" }));
+  const shown = columns.filter((c) => !c.key || !hidden.has(c.key));
+  // Sort by the chosen column when set; otherwise keep the default "busiest
+  // peers first" order (combined dl+ul speed, descending).
+  const list = columns.some((c) => c.key === sortKey && c.sortVal)
+    ? sortRows(rows, columns, sortKey, sortDir)
+    : rows.slice().sort(bySpeed);
+
+  // Highlight the row shown in the detail panel (keyed by ecid, or user_hash on
+  // the Known tab), on top of whatever class the caller already asks for.
+  const key = (c) => c.ecid != null ? c.ecid : c.user_hash;
+  const rowClassFn = selectedKey == null ? rowClass
+    : (c) => ((rowClass ? rowClass(c) + " " : "") + (key(c) === selectedKey ? "row-active" : "")).trim();
+
+  return html`
+    <div class=${toolbarCls}>
+      ${toolbar}
+      <div class="spacer"></div>
+      <${ColumnPicker} columns=${columns} hidden=${hidden} onToggle=${toggleCol} onReset=${resetPrefs} />
+    </div>
+    <${VirtualTable} columns=${shown} rows=${list} rowKey=${key}
+                     sortKey=${sortKey} sortDir=${sortDir} onSort=${toggleSort}
+                     onRowClick=${onRowClick} rowClass=${rowClassFn}
+                     widths=${widths} onResize=${setWidth}
+                     maxHeight="none"
+                     empty=${listPlaceholder(loading, t("downloads_peer_empty"))} />`;
+}
+
+// Per-file peer table for the detail panels. Rows come from the live `clients`
+// store: every peer transferring this file (download_file_hash / upload_file_hash
+// match) PLUS the A4AF sources parked on another file, whose ecids ride the
+// download object's `source_ecids` (join-SSE, no polling). `partsTotal` and
+// `files` (the downloads list) only matter for the download side: the first
+// fills the "n / total" parts cell, the second resolves an A4AF row's other
+// file name.
+export function FileClients({ hash, prefsKey, defaultHidden, defaultSort, a4afEcids = , partsTotal, files =  }) {
+  const clients = useClients();
+  const ident, setIdent = useState("all");
+  const q, setQ = useState("");
+
+  const a4afSet = new Set(a4afEcids);
+  const nameByHash = new Map((files || ).map((f) => f.hash, f.name));
+  const inThisFile = (c) => c.download_file_hash === hash || c.upload_file_hash === hash;
+
+  let rows = ;
+  for (const c of clients || ) {
+    const a4af = a4afSet.has(c.ecid);
+    if (!a4af && !inThisFile(c)) continue;
+    rows.push({ ...c, a4af, partsTotal, a4af_target_hash: a4af ? hash : undefined,
+                a4af_name: a4af ? (nameByHash.get(c.download_file_hash) || c.download_file_name || "?") : undefined });
+  }
+  if (ident !== "all") rows = rows.filter((c) => c.ident_state === ident);
+  if (q) { const match = textMatcher(q); rows = rows.filter((c) => match((c.name || "") + " " + fileNameOf(c))); }
+
+  return html`
+    <div class="detail-clients">
+      <${ClientTable} rows=${rows} prefsKey=${prefsKey} defaultHidden=${defaultHidden}
+                      defaultSort=${defaultSort} loading=${clients === undefined}
+                      rowClass=${(c) => c.a4af ? "a4af" : ""}
+                      toolbar=${ClientFilters({ ident, setIdent, q, setQ })} />
+    </div>`;
+}
+
+// The identity <select> + free-text box, identical in both consumers.
+export function ClientFilters({ ident, setIdent, q, setQ }) {
+  return html`
+    <select class="input input-sm" name="identity_filter" value=${ident} onChange=${(e) => setIdent(e.target.value)}>
+      ${IDENT_FILTERS.map((v, l) => html`<option value=${v}>${l}</option>`)}
+    </select>
+    <input class="input input-sm" name="filter" type="text" placeholder=${t("downloads_peer_filter")} value=${q} onInput=${(e) => setQ(e.target.value)} />`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/clients.js Added

@@ -0,0 +1,117 @@
+// Clients view: the global peer surface, mirroring amulegui's Clients tab.
+// "Active" peers (both directions) come from the live `clients` store, split by
+// a Todos / Descargas / Subidas selector; "Known" peers come from GET
+// /known_clients (the credit store) and are matched to the live store by user
+// hash to show who is online now. Clicking a row opens the full client detail in
+// the bottom panel (SplitDetail). Columns/formatting live in client-table.js.
+
+import { html, useState } from "../dom.js";
+import { Tabs } from "../components.js";
+import { ClientFilters, ClientTable, HIDDEN_EVERYWHERE, KNOWN_COLS, KNOWN_HIDDEN,
+         fileNameOf, isDown, isUp, useClients, useKnownClients } from "./client-table.js";
+import { ClientDetail } from "./client-detail.js";
+import { SplitDetail } from "./split-detail.js";
+import { textMatcher } from "../table.js";
+import { t } from "../i18n.js";
+
+// Origin stays visible (a desktop Active column); the per-file "shares"/"avail"
+// columns start hidden here -- they answer "for which file?", which the global
+// list has no single answer for.
+const ACTIVE_HIDDEN = ...HIDDEN_EVERYWHERE, "shares", "avail";
+const TAB_HIDDEN = {
+  active: ...ACTIVE_HIDDEN, "dl_session", "remote_rank", "ul_session", "queue_pos", "score",
+  downloading: ...ACTIVE_HIDDEN, "ul_state", "ul_speed", "uploaded", "ul_session", "queue_pos", "score",
+  uploading: ...ACTIVE_HIDDEN, "dl_state", "dl_speed", "downloaded", "dl_session", "remote_rank",
+  known: KNOWN_HIDDEN,
+};
+const TAB_SORT = { active: "downloaded", downloading: "downloaded", uploading: "uploaded", known: "downloaded" };
+
+export default function ClientsPanel() {
+  const raw = useClients(); // undefined until the first snapshot lands
+  const clients = raw || ;
+  const filter, setFilter = useState("active"); // active / downloading / uploading / known
+  const ident, setIdent = useState("all");
+  const q, setQ = useState("");
+  const sel, setSel = useState(null); // { key, ecid?, known? } row shown in detail
+
+  const isKnown = filter === "known";
+  const knownRaw = useKnownClients(isKnown);
+  const liveByHash = new Map(clients.map((c) => c.user_hash, c));
+
+  const nDown = clients.filter(isDown).length;
+  const nUp = clients.filter(isUp).length;
+
+  let list;
+  if (isKnown) {
+    // Fold live peers into the credit-store rows by user hash: online state and
+    // the live client (for the detail) without polling /known_clients.
+    list = (knownRaw || ).map((k) => {
+      const live = liveByHash.get(k.user_hash);
+      // Borrow the live transfer speeds for a peer that is online now (the
+      // credit store has none); offline -> undefined -> "—" in the cell.
+      // Reachability, not presence: the daemon holds a client object from the
+      // first contact ATTEMPT, so `!!live` gave an unroutable peer the
+      // "Online now" badge. `connected` is null on a core that does not
+      // report it; render that as offline.
+      return { ...k, _live: live, online: live ? live.connected === true : false,
+               download_speed_bytes_per_second: live && live.download_speed_bytes_per_second,
+               upload_speed_bytes_per_second: live && live.upload_speed_bytes_per_second };
+    });
+  } else {
+    list = clients.slice();
+    if (filter === "downloading") list = list.filter(isDown);
+    else if (filter === "uploading") list = list.filter(isUp);
+    if (ident !== "all") list = list.filter((c) => c.ident_state === ident);
+  }
+  if (q) { const match = textMatcher(q); list = list.filter((c) => match((c.name || "") + " " + fileNameOf(c))); }
+
+  const tabs = 
+    { key: "active", label: t("clients_tab_active"), badge: clients.length },
+    { key: "downloading", label: t("clients_tab_downloading"), badge: nDown },
+    { key: "uploading", label: t("clients_tab_uploading"), badge: nUp },
+    { key: "known", label: t("clients_tab_known"), badge: knownRaw ? knownRaw.length : null },
+  ;
+
+  // `key` comes from the table, which owns row identity (ecid, or user_hash on
+  // the Known tab where there is none). We only carry it back as selectedKey.
+  const onRowClick = (c, e, key) => {
+    // A click on the row-actions buttons (View files / Send message) must not
+    // also toggle the detail panel.
+    if (e && e.target && e.target.closest(".row-actions")) return;
+    // A known row that is online resolves to its live ecid for the full detail;
+    // offline, only the stored credit-store fields are available.
+    const next = isKnown
+      ? (c._live ? { key, ecid: c._live.ecid } : { key, known: c })
+      : { key, ecid: c.ecid };
+    setSel((s) => (s && s.key === key) ? null : next);
+  };
+
+  // Direction/Known selector; drop the detail so a stale highlight/row doesn't
+  // carry across tabs (an ecid still resolves, but the highlight would be lost).
+  const onTab = (k) => { setFilter(k); setSel(null); };
+
+  // Known has no ident/direction, so its toolbar is just the text filter.
+  const toolbar = isKnown
+    ? html`<input class="input input-sm" name="filter" type="text" placeholder=${t("downloads_peer_filter")}
+                  value=${q} onInput=${(e) => setQ(e.target.value)} />`
+    : ClientFilters({ ident, setIdent, q, setQ });
+
+  return html`
+    <div class="fill-view clients-fill">
+      <${SplitDetail} storageKey="clients_detail_height" open=${!!sel} onClose=${() => setSel(null)}
+        top=${html`
+        <section class="net-pane pane-fill">
+          <${Tabs} tabs=${tabs} active=${filter} onSelect=${onTab} />
+          <div class="net-pane-body">
+            <${ClientTable} key=${filter} rows=${list} cols=${isKnown ? KNOWN_COLS : undefined}
+                            prefsKey=${"clients_" + filter}
+                            defaultHidden=${TAB_HIDDENfilter} defaultSort=${TAB_SORTfilter}
+                            loading=${isKnown ? knownRaw === undefined : raw === undefined}
+                            onRowClick=${onRowClick} selectedKey=${sel ? sel.key : null}
+                            toolbarCls="toolbar pane-toolbar" toolbar=${toolbar} />
+          </div>
+        </section>`}>
+        <${ClientDetail} ecid=${sel ? sel.ecid : null} known=${sel ? sel.known : null} />
+      <//>
+    </div>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/download-detail.js Added

@@ -0,0 +1,324 @@
+// Downloads detail panel: the per-file info + pieces graph shown below the
+// downloads table when a row is clicked. Data comes from GET downloads/{hash}
+// (every list field + the detail-only fields + progress.parts). It re-fetches
+// on each live tick of the downloads store so %, ETA, speed and the pieces
+// graph stay current while the panel is open (GET is ETag-cached, so unchanged
+// frames short-circuit to a 304 + the cached body).
+
+import { api } from "../api.js";
+import { store } from "../store.js";
+import { html, useState, useEffect, useStore } from "../dom.js";
+import { ProgressBar, Placeholder, PiecesBar, PiecesLegend, toast, confirmDialog, Section, statRow, IdentityLine, copyText, Tabs, CommentEditor, CommentsList, RenameForm, DownloadLink, PRIORITIES, prioValue, prioLabel } from "../components.js";
+import { formatBytes, formatSpeed, formatDuration, formatInt, formatPercent, formatTimestamp } from "../format.js";
+import { Icon } from "../icons.js";
+import { FileClients, HIDDEN_EVERYWHERE } from "./client-table.js";
+import { categoryName, categoryOptions } from "./categories.js";
+import { t, tn, terr } from "../i18n.js";
+
+// Peers of a download: show the download-side columns, keep the upload ones
+// (and the redundant per-row file name) one click away in the column picker.
+const DL_HIDDEN = ...HIDDEN_EVERYWHERE, "file", "ul_state", "ul_speed", "uploaded", "ul_session", "queue_pos", "score";
+
+export function DownloadDetail({ hash, isGuest, categories = , onPatch, onDelete, onClear }) {
+  const downloads = useStore("downloads") || ; // live tick source (SSE ~500ms)
+  const detail, setDetail = useState(null);
+  const gone, setGone = useState(false);
+  const tab, setTab = useState("details");
+  const reload, setReload = useState(0); // bumped after a rename to refresh the name
+
+  // The live re-fetch feeds the Details tab (%, speed, ETA, pieces). The
+  // Comments tab needs none of that, so only tick there — elsewhere the detail
+  // loads once per file (and once more when returning to Details).
+  const liveTick = tab === "details" ? downloads : 0;
+  useEffect(() => {
+    if (!hash) { setDetail(null); return; }
+    let alive = true;
+    api.get("downloads/" + hash)
+      .then((d) => { if (alive) { setDetail(d); setGone(false); } })
+      .catch(() => { if (alive) setGone(true); });
+    return () => { alive = false; };
+  }, hash, liveTick, reload);
+
+  if (!hash) return null;
+  if (gone) return html`<div class="detail-panel"><${Placeholder} kind="info">${t("downloads_detail_gone")}<//></div>`;
+  if (!detail) return html`<div class="detail-panel"><${Placeholder} kind="loading">${t("downloads_detail_loading")}<//></div>`;
+
+  const d = detail;
+
+  // Off the Details tab `d` is a frozen snapshot (liveTick is 0); read the
+  // fields that move while the panel is open from the SSE-fed store row instead.
+  const live = downloads.find((x) => x.hash === d.hash) || d;
+  const src = d.sources || {};
+  const media = d.media;
+  // Empty when the daemon has sent no chunk map: the bar is skipped entirely
+  // rather than drawn as an empty track claiming "0 pieces", matching the
+  // shared panel's handling of a share whose RLE decode has not landed. A
+  // running re-hash replaces this bar (the chunk map is stale by definition
+  // then), but not the percent bar above -- that is the download's own
+  // completeness.
+  const parts = (d.progress && d.progress.parts) || ;
+  const eta = d.remaining_seconds == null ? "—" : formatDuration(d.remaining_seconds);
+
+  const copy = (text) => copyText(text)
+    .then(() => toast(t("downloads_detail_copied"), "success"))
+    .catch(() => toast(t("downloads_detail_copy_failed"), "error"));
+
+  // `a4af_auto` is not part of EqualDownload (EventDiff.cpp), so changing it emits
+  // no download_updated and the tick-driven re-fetch never sees it — bump `reload`.
+  const a4af = (action) => api.post("downloads/" + hash + "/a4af", { action })
+    .then(() => { toast(t("downloads_a4af_done"), "success"); setReload((n) => n + 1); })
+    .catch((e) => toast(terr(e), "error"));
+
+  // The auto flag is set, not toggled: send the value the button is moving to
+  // rather than asking the daemon to flip whatever it currently holds. A retry
+  // then lands on the same value instead of undoing the press.
+  const setA4afAuto = (value) => api.patch("downloads/" + hash, { a4af_auto: value })
+    .then(() => { toast(t("downloads_a4af_done"), "success"); setReload((n) => n + 1); })
+    .catch((e) => toast(terr(e), "error"));
+
+  return html`
+    <div class="detail-panel">
+      <div class="detail-head">
+        <div class="detail-titlebar">
+          <h4 class="detail-name" title=${d.name}>${d.name}</h4>
+        </div>
+        ${onPatch ? html`<${DetailActions} d=${d} isGuest=${isGuest} categories=${categories}
+                                           onPatch=${onPatch} onDelete=${onDelete} onClear=${onClear} />` : null}
+      </div>
+
+      <${Tabs} tabs=${
+        { key: "details", label: t("detail_tab_details") },
+        { key: "clients", label: t("detail_tab_clients") },
+        { key: "filename", label: t("detail_tab_filename") },
+        { key: "comments", label: t("detail_tab_comments") },
+      } active=${tab} onSelect=${setTab} />
+
+      <div class="detail-body">
+      ${tab === "clients" ? html`
+        <${FileClients} hash=${d.hash} prefsKey="download_clients" defaultHidden=${DL_HIDDEN}
+                        defaultSort="downloaded" a4afEcids=${live.source_ecids || }
+                        partsTotal=${d.total_part_count} files=${downloads} />
+      ` : tab === "comments" ? html`
+        <${DownloadComments} hash=${d.hash} comment=${d.my_comment} rating=${d.my_rating}
+                             running=${!!live.kad_comment_lookup_running}
+                             parts=${parts} />
+      ` : tab === "filename" ? html`
+        <${DownloadFilenames} hash=${d.hash} name=${d.name}
+                              onRenamed=${() => setReload((n) => n + 1)} />
+      ` : html`
+      <div class="detail-sections">
+        <div class="detail-progress">
+          <${ProgressBar} percent=${d.progress && d.progress.percent} />
+          ${d.hashed_part_count > 0 && d.total_part_count ? html`
+            <${PiecesBar} mode="hashing" total=${d.total_part_count} hashed=${d.hashed_part_count} />
+            <${PiecesLegend} mode="hashing" total=${d.total_part_count} hashed=${d.hashed_part_count} />`
+          : parts.length ? html`
+            <${PiecesBar} parts=${parts} />
+            <${PiecesLegend} parts=${parts} />` : null}
+        </div>
+        ${Section(
+          statRow("downloads_status_label", t("downloads_status_" + d.status), "downloads_detail_tip_status"),
+          statRow("downloads_detail_completed", formatBytes(d.completed_bytes) + " (" + formatPercent(d.progress && d.progress.percent) + ")", "downloads_detail_tip_completed"),
+          statRow("downloads_speed", formatSpeed(d.speed_bytes_per_second), "downloads_detail_tip_speed"),
+          statRow("downloads_detail_eta", eta, "downloads_detail_tip_eta"),
+          statRow("downloads_sources", (src.transferring || 0) + " / " + (src.total || 0), "downloads_detail_tip_sources"),
+          statRow("downloads_size", formatBytes(d.size_bytes), "downloads_detail_tip_size"),
+          statRow("downloads_detail_transferred", formatBytes(d.transferred_bytes), "downloads_detail_tip_transferred"),
+        , "downloads_detail_group_transfer")}
+        ${Section(
+          statRow("downloads_detail_active_time", formatDuration(d.active_seconds), "downloads_detail_tip_active_time"),
+          statRow("downloads_detail_last_changed", formatTimestamp(d.last_received_at), "downloads_detail_tip_last_changed"),
+          statRow("downloads_detail_last_seen_complete", formatTimestamp(d.last_seen_complete_at), "downloads_detail_tip_last_seen_complete"),
+          statRow("downloads_detail_queued", formatInt(d.upload_queue_count), "downloads_detail_tip_queued"),
+        , "downloads_detail_group_history")}
+        ${media ? Section(
+          media.title ? statRow("downloads_detail_media_title", media.title, "downloads_detail_tip_media_title") : null,
+          media.artist ? statRow("downloads_detail_media_artist", media.artist, "downloads_detail_tip_media_artist") : null,
+          media.album ? statRow("downloads_detail_media_album", media.album, "downloads_detail_tip_media_album") : null,
+          media.duration_seconds ? statRow("downloads_detail_media_length", formatDuration(media.duration_seconds), "downloads_detail_tip_media_length") : null,
+          media.bitrate_kilobits_per_second ? statRow("downloads_detail_media_bitrate", formatInt(media.bitrate_kilobits_per_second), "downloads_detail_tip_media_bitrate") : null,
+          media.codec ? statRow("downloads_detail_media_codec", media.codec, "downloads_detail_tip_media_codec") : null,
+        .filter(Boolean), "downloads_detail_group_media") : null}
+        ${Section(
+          statRow("downloads_detail_available_parts", formatInt(d.available_part_count) + " / " + formatInt(d.total_part_count), "downloads_detail_tip_available_parts"),
+          statRow("downloads_detail_saved_ich", formatInt(d.ich_recovered_packet_count) + " " + t("downloads_detail_ich_unit"), "downloads_detail_tip_saved_ich"),
+          statRow("downloads_detail_lost_corruption", formatBytes(d.lost_to_corruption_bytes), "downloads_detail_tip_lost_corruption"),
+          statRow("downloads_detail_gained_compression", formatBytes(d.gained_by_compression_bytes), "downloads_detail_tip_gained_compression"),
+        , "downloads_detail_group_integrity")}
+        ${Section(
+          statRow("downloads_sources", formatInt(src.a4af || 0), "downloads_detail_tip_a4af"),
+          "downloads_detail_group_a4af",
+          html`
+            <button class="btn btn-sm admin-only" type="button" title=${t("downloads_a4af_tip_swap_this")}
+                    onClick=${() => a4af("swap_this")}>
+              ${t("downloads_a4af_swap_this")}
+            </button>
+            <button class="btn btn-sm admin-only" type="button" title=${t("downloads_a4af_tip_swap_others")}
+                    onClick=${() => a4af("swap_others")}>
+              ${t("downloads_a4af_swap_others")}
+            </button>
+            <button class=${"btn btn-sm admin-only" + (d.a4af_auto ? " btn-primary" : "")} type="button"
+                    title=${t("downloads_a4af_tip_auto")}
+                    aria-pressed=${!!d.a4af_auto} onClick=${() => setA4afAuto(!d.a4af_auto)}>
+              ${t("downloads_a4af_auto")}
+            </button>`)}
+        ${IdentityLine({ file: d, copy, titleKey: "downloads_detail_group_identity", extra: 
+          statRow("downloads_detail_directory", d.directory || "—", "downloads_detail_tip_directory"),
+          statRow("downloads_detail_part_file", d.part_file_name || "—", "downloads_detail_tip_part_file"),
+         })}
+      </div>`}
+      </div>
+    </div>`;
+}
+
+// Per-file action bar, pinned in the panel head above the tab strip so it stays
+// reachable from every tab (and, on phones, at the top of the full-screen sheet).
+function DetailActions({ d, isGuest, categories, onPatch, onDelete, onClear }) {
+  const inactive = d.status === "paused" || d.status === "stopped";
+  const canStop = d.status !== "stopped" && d.status !== "completed" && d.status !== "completing";
+  // Completed rejects DELETE (409 download_completed): offer Clear. `done` also
+  // gates the download link — only a completed file is in Incoming (shared), so
+  // only then does its hash resolve under shared/{hash}/content.
+  const done = d.status === "completed";
+
+  const clear = async () => {
+    if (!(await confirmDialog(t("downloads_confirm_clear_this", { name: d.name })))) return;
+    onClear(d.hash);
+  };
+
+  // admin-only per button, not on the bar: guests keep the priority/category_index readout.
+  return html`
+    <div class="detail-actions">
+      ${done ? null : html`
+        <button class="btn btn-sm admin-only" type="button"
+                onClick=${() => onPatch(d.hash, { action: inactive ? "resume" : "pause" })}>
+          <${Icon} name=${inactive ? "play" : "pause"} /> ${inactive ? t("downloads_resume") : t("downloads_pause")}
+        </button>`}
+      ${canStop ? html`
+        <button class="btn btn-sm admin-only" type="button" onClick=${() => onPatch(d.hash, { action: "stop" })}>
+          <${Icon} name="stop" /> ${t("downloads_stop")}
+        </button>` : null}
+      ${done ? html`
+        <${DownloadLink} hash=${d.hash} tipKey="downloads_download_tip" />
+        <button class="btn btn-sm admin-only" type="button" onClick=${clear}>
+          <${Icon} name="trash" /> ${t("downloads_clear_this")}
+        </button>` : html`
+        <button class="btn btn-sm btn-danger admin-only" type="button" onClick=${() => onDelete(d)}>
+          <${Icon} name="cancel" /> ${t("downloads_cancel")}
+        </button>`}
+      <div class="field field-inline" title=${t("downloads_detail_tip_priority")}>
+        <label>${t("downloads_priority")}</label>
+        ${isGuest ? html`<b>${prioLabel(d)}</b>` : html`
+          <select class="input input-sm" name="priority" value=${prioValue(d)}
+                  onChange=${(e) => onPatch(d.hash, { priority: e.target.value })}>
+            ${PRIORITIES.map((v, l) => html`<option value=${v}>${v === "auto" && d.priority_auto ? prioLabel(d) : l}</option>`)}
+          </select>`}
+      </div>
+      <div class="field field-inline" title=${t("downloads_detail_tip_category")}>
+        <label>${t("downloads_category")}</label>
+        ${isGuest ? html`<b>${categoryName(categories, d.category_index)}</b>` : html`
+          <select class="input input-sm" name="category" value=${d.category_index}
+                  onChange=${(e) => onPatch(d.hash, { category_index: Number(e.target.value) })}>
+            ${categoryOptions(categories)}
+          </select>`}
+      </div>
+    </div>`;
+}
+
+// The Comments tab body: your own comment/rating editor, a "Get from Kad"
+// trigger, and the per-source comments list (GET downloads/{hash}/comments —
+// includes any retrieved Kad notes). Fetched once per file, then kept current
+// by the comments_updated SSE event, whose payload is this same body: Kad notes
+// arriving mid-search and source comments both land without polling. `running`
+// comes from the downloads store (the flag is part of EqualDownload, so its
+// start -> finish edge arrives as download_updated).
+function DownloadComments({ hash, comment, rating, running, parts }) {
+  const data, setData = useState(null);
+
+  useEffect(() => {
+    let alive = true;
+    api.get("downloads/" + hash + "/comments")
+      .then((d) => { if (alive) setData(d); })
+      .catch(() => { if (alive) setData({ count: 0, comments:  }); });
+    const off = store.subscribe("comments:updated", (p) => {
+      if (alive && p && p.hash === hash) setData(p);
+    });
+    return () => { alive = false; off(); };
+  }, hash);
+
+  const list = (data && data.comments) || ;
+  // The daemon only accepts a comment/rating on a *shared* file, i.e. a
+  // partfile with >= 1 complete part; otherwise PATCH returns 409 not_shared.
+  // Gate the editor on the same condition instead of letting the save fail.
+  const canComment = (parts || ).some((p) => p.state === "complete");
+
+  const getKad = () => api.post("downloads/" + hash + "/comments")
+    .then(() => toast(t("comments_kad_started"), "info"))
+    .catch((e) => toast(e.code === "amuled_rejected" ? t("comments_kad_error") : terr(e), "error"));
+
+  return html`
+    <div class="detail-comments">
+      <${CommentEditor} key=${hash} hash=${hash} kind="downloads" comment=${comment} rating=${rating}
+                        disabled=${!canComment} disabledHint=${t("comments_disabled_hint")} />
+      <div class="comments-head">
+        <span class="comments-count">${tn("comments_count", list.length)}</span>
+        <button class="btn btn-sm admin-only" type="button" onClick=${getKad} disabled=${running}>
+          <${Icon} name=${running ? "polling" : "kad"} />
+          ${running ? t("comments_kad_searching") : t("comments_get_kad")}
+        </button>
+      </div>
+      <${CommentsList} comments=${list} />
+    </div>`;
+}
+
+// The File names tab: the distinct names this download's sources report for it
+// (GET downloads/{hash}/filenames), plus a rename form. Admins can rename the
+// file to an arbitrary name or "take over" any source-reported name (the
+// desktop Takeover flow). Loads once per file — the source-name list doesn't
+// change on every SSE tick.
+function DownloadFilenames({ hash, name, onRenamed }) {
+  const data, setData = useState(null);
+
+  useEffect(() => {
+    let alive = true;
+    api.get("downloads/" + hash + "/filenames")
+      .then((d) => { if (alive) setData(d); })
+      .catch(() => { if (alive) setData({ filenames:  }); });
+    return () => { alive = false; };
+  }, hash);
+
+  // Server returns map-iteration order; sort by popularity then name.
+  const list = ((data && data.filenames) || )
+    .slice()
+    .sort((a, b) => (b.source_count - a.source_count) || a.filename.localeCompare(b.filename));
+
+  const takeover = (n) => api.patch("downloads/" + hash, { name: n })
+    .then(() => { toast(t("rename_saved"), "success"); if (onRenamed) onRenamed(); })
+    .catch((e) => toast(terr(e), "error"));
+
+  return html`
+    <div class="detail-comments">
+      <${RenameForm} key=${hash} hash=${hash} kind="downloads" name=${name} onSaved=${onRenamed} />
+      ${list.length ? html`
+        <table class="comments-list">
+          <thead><tr>
+            <th>${t("comments_col_filename")}</th>
+            <th>${t("filename_col_count")}</th>
+            <th class="admin-only"></th>
+          </tr></thead>
+          <tbody>
+            ${list.map((f, i) => html`
+              <tr key=${i}>
+                <td class="comments-fname" title=${f.filename}>${f.filename}</td>
+                <td>${f.source_count}</td>
+                <td class="admin-only">
+                  <button class="btn btn-sm" type="button" onClick=${() => takeover(f.filename)}>
+                    ${t("filename_takeover")}
+                  </button>
+                </td>
+              </tr>`)}
+          </tbody>
+        </table>` : html`<${Placeholder} kind="info">${t("filename_none")}<//>`}
+    </div>`;
+}
+

amule-3.1.0.tar.gz/src/webapi/static/js/views/downloads.js Added

@@ -0,0 +1,316 @@
+// Downloads view: downloads queue (with actions).
+// Mirrors the aMule desktop "Downloads" page: category_index tabs, status filter,
+// multi-select, column sorting, per-row pause/resume/priority/category_index/cancel,
+// bulk actions, clear-completed, live totals, and an ed2k adder for mobile.
+
+import { api, bulkFailures } from "../api.js";
+import { data } from "../events.js";
+import { html, useState, useEffect, useStore } from "../dom.js";
+import { ProgressBar, Badge, checkCell, listPlaceholder, Tabs, toast, confirmDialog, PRIORITIES, prioValue, prioLabel } from "../components.js";
+import { VirtualTable, sortRows, textMatcher, useTablePrefs, ColumnPicker } from "../table.js";
+import { formatBytes, formatFreeSpace, formatSpeed } from "../format.js";
+import { Icon } from "../icons.js";
+import { t, tn, terr } from "../i18n.js";
+import { CategoriesPanel, categoryName, categoryOptions } from "./categories.js";
+import { DownloadDetail } from "./download-detail.js";
+import { SplitDetail } from "./split-detail.js";
+
+const STATUS_FILTERS = "all", "downloading", "waiting", "paused", "stopped", "completed"
+  .map((v) => v, t("downloads_status_" + v));
+
+export default function Downloads({ isGuest }) {
+  // undefined until the first snapshot lands,  once the queue is known
+  // empty; listPlaceholder tells the two apart.
+  const rawDownloads = useStore("downloads");
+  const downloads = rawDownloads || ;
+  const loading = rawDownloads === undefined;
+  const disk = (useStore("status") || {}).disk || {};
+  const categories, setCategories = useState();
+  const selection, setSelection = useState(() => new Set());
+  const { sortKey, sortDir, hidden, widths, toggleSort, toggleCol, setWidth, resetPrefs } =
+    useTablePrefs("downloads", { sortKey: "name", sortDir: 1, hidden: "done", "category_index" });
+  const filterStatus, setFilterStatus = useState("all");
+  const filterCategory, setFilterCategory = useState("all");
+  const filterText, setFilterText = useState("");
+  const manageCats, setManageCats = useState(false);
+  const detailHash, setDetailHash = useState(null); // row shown in the detail panel
+
+  // Open (or toggle closed) the detail panel; ignore clicks landing on a row's
+  // own controls (checkbox / priority / category_index / action buttons).
+  const onRowClick = (d, e) => {
+    if (e.target.closest("input,select,button,a,label")) return;
+    setDetailHash((h) => (h === d.hash ? null : d.hash));
+  };
+
+  const loadCategories = () =>
+    api.list("categories").then((r) => setCategories(r.categories || )).catch(() => {});
+
+  useEffect(() => {
+    data.register({ key: "downloads", eventPrefix: "download", id: "hash",
+      list: () => api.list("downloads?status=all").then((r) => r.downloads || ) });
+    loadCategories();
+    data.ensure("downloads");
+  }, );
+
+  // A deleted category_index renumbers the survivors, so a stale filter tab can point
+  // at a now-missing index (empty list, no active tab). Fall back to "all".
+  useEffect(() => {
+    if (filterCategory !== "all" &&
+        !categories.some((c) => c.index !== 0 && String(c.index) === filterCategory)) {
+      setFilterCategory("all");
+    }
+  }, categories);
+
+  // Close the detail panel if its download leaves the queue (cancelled/cleared).
+  useEffect(() => {
+    if (detailHash && !downloads.some((d) => d.hash === detailHash)) setDetailHash(null);
+  }, downloads);
+
+  const toggleRow = (hash, checked) => {
+    const next = new Set(selection);
+    if (checked) next.add(hash); else next.delete(hash);
+    setSelection(next);
+  };
+  const toggleAll = (checked) =>
+    setSelection(checked ? new Set(list.map((d) => d.hash)) : new Set());
+
+  // --- mutations --------------------------------------------------------
+  const mutate = async (fn) => {
+    try { await fn(); data.refresh("downloads"); }
+    catch (e) { toast(terr(e) || t("downloads_error"), "error"); }
+  };
+  const pause = (h) => mutate(() => api.patch("downloads/" + h, { action: "pause" }));
+  const resume = (h) => mutate(() => api.patch("downloads/" + h, { action: "resume" }));
+  const setPriority = (h, p) => mutate(() => api.patch("downloads/" + h, { priority: p }));
+  const setCategory = (h, c) => mutate(() => api.patch("downloads/" + h, { category_index: c }));
+
+  const del = async (d) => {
+    if (!(await confirmDialog(t("downloads_confirm_cancel_download", { name: d.name })))) return;
+    const next = new Set(selection); next.delete(d.hash); setSelection(next);
+    mutate(() => api.del("downloads/" + d.hash));
+  };
+
+  // Run one collection-level bulk mutation and report per-item failures (207).
+  const runBulk = async (fn, { clearSelection = false } = {}) => {
+    const hashes = Array.from(selection);
+    if (!hashes.length) { toast(t("downloads_toast_no_files_selected"), "warn"); return; }
+    try {
+      const failed = bulkFailures(await fn(hashes));
+      if (failed.length)
+        toast(t("common_bulk_partial", { failed: failed.length, total: hashes.length,
+                message: terr(failed0.error) }), "warn");
+      else toast(t("downloads_toast_done"), "success");
+      if (clearSelection) setSelection(new Set());
+    } catch (e) { toast(terr(e) || t("downloads_error"), "error"); }
+    data.refresh("downloads");
+  };
+
+  const bulk = async (action) => {
+    if (action === "delete") {
+      const hashes = Array.from(selection);
+      if (!hashes.length) { toast(t("downloads_toast_no_files_selected"), "warn"); return; }
+      if (!(await confirmDialog(tn("downloads_confirm_cancel_selected", hashes.length)))) return;
+      return runBulk((h) => api.del("downloads", { hashes: h }), { clearSelection: true });
+    }
+    return runBulk((h) => api.patch("downloads", { hashes: h, action }));
+  };
+
+  // Apply the same field change (priority/category_index) to every selected row.
+  const bulkPatch = (patch) => runBulk((h) => api.patch("downloads", { hashes: h, ...patch }));
+
+  // The handler clears in one EC roundtrip: every row it returns is an ok,
+  // and any refusal is a whole-request error `mutate` already reports.
+  const clearCompleted = async () => {
+    if (!(await confirmDialog(t("downloads_confirm_clear_completed")))) return;
+    mutate(() => api.post("downloads_clear_completed"));
+  };
+  // Same endpoint scoped to one hash, for the detail panel's Clear button.
+  const clearOne = (h) => mutate(() => api.post("downloads_clear_completed", { hash: h }));
+  // Row-level clear for a completed download: confirm, then drop it from the
+  // completed list (the file in Incoming is untouched).
+  const clearRow = async (d) => {
+    if (!(await confirmDialog(t("downloads_confirm_clear_this", { name: d.name })))) return;
+    clearOne(d.hash);
+  };
+
+  // --- derived ----------------------------------------------------------
+  let list = downloads.slice();
+  if (filterStatus !== "all") list = list.filter((d) => matchStatus(d, filterStatus));
+  if (filterCategory !== "all") list = list.filter((d) => d.category_index === Number(filterCategory));
+  if (filterText) { const match = textMatcher(filterText); list = list.filter((d) => match(d.name)); }
+  const allSelected = list.length > 0 && list.every((d) => selection.has(d.hash));
+  const selectedCount = list.filter((d) => selection.has(d.hash)).length;
+
+  // Keep the selection free of rows hidden by the current filters: on a filter
+  // change, drop any selected hash no longer visible (the still-visible ones stay).
+  useEffect(() => {
+    setSelection((prev) => {
+      const vis = new Set(list.map((d) => d.hash));
+      const next = new Set(); prev.forEach((h) => vis.has(h) && next.add(h));
+      return next.size === prev.size ? prev : next;
+    });
+  }, filterStatus, filterCategory, filterText);
+
+  const columns = 
+    { always: true, cls: "check", width: "40px",
+      label: checkCell(allSelected, toggleAll, t("downloads_select_all")),
+      cell: (d) => checkCell(selection.has(d.hash), (v) => toggleRow(d.hash, v)) },
+    { key: "name", always: true, label: t("downloads_name"), cls: "name", sortable: true,
+      sortVal: (d) => (d.name || "").toLowerCase(),
+      cell: (d) => html`<span title=${d.name}>${d.name}</span>` },
+    { key: "size", label: t("downloads_size"), num: true, width: "110px", sortable: true,
+      sortVal: (d) => d.size_bytes || 0, cell: (d) => formatBytes(d.size_bytes) },
+    { key: "done", label: t("downloads_col_done"), num: true, width: "110px", sortable: true,
+      sortVal: (d) => d.completed_bytes || 0, cell: (d) => formatBytes(d.completed_bytes) },
+    { key: "progress", label: t("downloads_progress"), width: "150px", sortable: true,
+      sortVal: (d) => (d.progress && d.progress.percent) || 0,
+      cell: (d) => html`<${ProgressBar} percent=${d.progress && d.progress.percent} />` },
+    { key: "speed", label: t("downloads_speed"), num: true, width: "100px", sortable: true,
+      sortVal: (d) => d.speed_bytes_per_second || 0, cell: (d) => formatSpeed(d.speed_bytes_per_second) },
+    { key: "sources", label: t("downloads_sources"), num: true, width: "100px", sortable: true,
+      sortVal: (d) => (d.sources && d.sources.total) || 0,
+      cell: (d) => { const src = d.sources || {}; return html`<span title=${t("downloads_title_transferring_total")}>${(src.transferring || 0) + " / " + (src.total || 0)}</span>`; } },
+    { key: "status", label: t("downloads_status_label"), width: "120px", sortable: true,
+      sortVal: (d) => d.status || "", cell: (d) => statusBadge(d.status) },
+    { key: "priority", label: t("downloads_priority"), width: "150px", sortable: true,
+      sortVal: (d) => d.priority || "", cell: (d) => isGuest
+        ? prioLabel(d)
+        : html`
+            <select class="input input-sm admin-only" name="priority" value=${prioValue(d)}
+                    onChange=${(e) => setPriority(d.hash, e.target.value)}>
+              ${PRIORITIES.map((v, l) => html`<option value=${v}>${v === "auto" && d.priority_auto ? prioLabel(d) : l}</option>`)}
+            </select>` },
+    { key: "category_index", label: t("downloads_category"), width: "150px", sortable: true,
+      sortVal: (d) => categoryName(categories, d.category_index).toLowerCase(),
+      cell: (d) => isGuest
+        ? categoryName(categories, d.category_index)
+        : html`
+            <select class="input input-sm admin-only" name="category" value=${d.category_index}
+                    onChange=${(e) => setCategory(d.hash, Number(e.target.value))}>
+              ${categoryOptions(categories)}
+            </select>` },
+    { key: "actions", label: t("downloads_actions"), cls: "row-actions admin-only", width: "90px", cell: (d) => {
+        // A completed download awaiting clear has no partfile to pause or cancel
+        // (DELETE /downloads/{hash} returns 409). Offer Clear instead, like the
+        // detail panel: it drops the entry from the completed list without
+        // touching the finished file in Incoming.
+        if (d.status === "completed")
+          return html`
+            <button class="btn btn-icon btn-sm" title=${t("downloads_clear_this")} onClick=${() => clearRow(d)}>
+              <${Icon} name="trash" />
+            </button>`;
+        const inactive = d.status === "paused" || d.status === "stopped";
+        return html`
+          <button class="btn btn-icon btn-sm" title=${inactive ? t("downloads_resume") : t("downloads_pause")}
+                  onClick=${() => inactive ? resume(d.hash) : pause(d.hash)}>
+            <${Icon} name=${inactive ? "play" : "pause"} />
+          </button>
+          <button class="btn btn-icon btn-sm btn-danger" title=${t("downloads_cancel")} onClick=${() => del(d)}>
+            <${Icon} name="cancel" />
+          </button>`; } },
+  ;
+
+  list = sortRows(list, columns, sortKey, sortDir);
+  const shown = columns.filter((c) => !c.key || !hidden.has(c.key));
+  const rowClass = (d) =>
+    (selection.has(d.hash) ? "row-selected " : "") + (d.hash === detailHash ? "row-active" : "");
+
+  let size = 0, done = 0, speed = 0;
+  for (const d of list) { size += d.size_bytes || 0; done += d.completed_bytes || 0; speed += d.speed_bytes_per_second || 0; }
+
+  const freeSpace = formatFreeSpace(disk.temp_free_bytes, disk.incoming_free_bytes);
+
+  const categoryTabs = 
+    { key: "all", label: t("downloads_all"), badge: downloads.length },
+    ...categories.filter((c) => c.index !== 0).map((c) => ({
+      key: String(c.index), label: c.name || ("#" + c.index),
+      badge: downloads.filter((d) => d.category_index === c.index).length,
+    })),
+  ;
+
+  // The manage-categories toggle rides the right of the category tab strip (no
+  // separate title row — the nav already names the page). In manage-categories
+  // mode there is no tab strip, so it gets a plain toolbar row instead.
+  const manageCatsBtn = html`
+    <button class=${"btn btn-sm admin-only" + (manageCats ? " btn-primary" : "")}
+            type="button" aria-pressed=${manageCats}
+            onClick=${() => { const next = !manageCats; setManageCats(next); if (!next) loadCategories(); }}>
+      ${t("downloads_manage_categories")}
+    </button>`;
+
+  return html`
+    <div class="split-view">
+    ${manageCats
+      ? html`<div class="view-header"><div class="spacer"></div>${manageCatsBtn}</div>
+             <${CategoriesPanel} isGuest=${isGuest} />`
+      : html`<${SplitDetail} storageKey="dl_detail_height" open=${!!detailHash}
+                      onClose=${() => setDetailHash(null)}
+                      top=${html`
+      <section class="net-pane">
+      <${Tabs} tabs=${categoryTabs} active=${filterCategory}
+               onSelect=${(k) => setFilterCategory(k)} extra=${manageCatsBtn} />
+      <div class="net-pane-body">
+      <div class="view-header">
+        <div class="toolbar admin-only">
+          <button class="btn btn-sm" onClick=${() => bulk("resume")}><${Icon} name="play" /> ${t("downloads_resume")}</button>
+          <button class="btn btn-sm" onClick=${() => bulk("pause")}><${Icon} name="pause" /> ${t("downloads_pause")}</button>
+          <button class="btn btn-sm btn-danger" onClick=${() => bulk("delete")}><${Icon} name="cancel" /> ${t("downloads_cancel")}</button>
+          <select class="input input-sm" name="bulk_priority" value=""
+                  onChange=${(e) => { const v = e.target.value; e.target.value = ""; if (v) bulkPatch({ priority: v }); }}>
+            <option value="">${t("downloads_priority")}…</option>
+            ${PRIORITIES.map((v, l) => html`<option value=${v}>${l}</option>`)}
+          </select>
+          <select class="input input-sm" name="bulk_category" value=""
+                  onChange=${(e) => { const v = e.target.value; e.target.value = ""; if (v !== "") bulkPatch({ category_index: Number(v) }); }}>
+            <option value="">${t("downloads_category")}…</option>
+            ${categoryOptions(categories)}
+          </select>
+          <span class="selected-count">${t("downloads_selected")} ${selectedCount}</span>
+          <span class="vsep" aria-hidden="true"></span>
+          <button class="btn btn-sm" type="button" onClick=${clearCompleted}>${t("downloads_clear_completed")}</button>
+        </div>
+        <div class="spacer"></div>
+        <div class="toolbar">
+          <select class="input input-sm" name="status_filter" title=${t("downloads_status_label")} value=${filterStatus} onChange=${(e) => setFilterStatus(e.target.value)}>
+            ${STATUS_FILTERS.map((v, l) => html`<option value=${v}>${l}</option>`)}
+          </select>
+          <input class="input input-sm" name="filter" type="text" placeholder=${t("downloads_filter")} value=${filterText} onInput=${(e) => setFilterText(e.target.value)} />
+          <${ColumnPicker} columns=${columns} hidden=${hidden} onToggle=${toggleCol} onReset=${resetPrefs} />
+        </div>
+      </div>
+
+        <${VirtualTable} columns=${shown} rows=${list} rowKey=${(d) => d.hash} rowClass=${rowClass}
+                         sortKey=${sortKey} sortDir=${sortDir} onSort=${toggleSort} onRowClick=${onRowClick}
+                         widths=${widths} onResize=${setWidth}
+                         maxHeight="none"
+                         empty=${listPlaceholder(loading, t("downloads_empty"))} />
+        ${loading ? null : html`
+        <div class="totals-line">
+          <span>${tn("downloads_files_count", list.length)}</span>${" · "}<span>${t("downloads_size")} ${formatBytes(size)}</span>${" · "}<span>${t("downloads_col_done")} ${formatBytes(done)}</span>${" · "}<span>${t("downloads_speed")} ${formatSpeed(speed)}</span>${freeSpace ? html`${" · "}<span>${t("common_free_space")} ${freeSpace}</span>` : ""}
+        </div>`}
+      </div>
+    </section>`}>
+        <${DownloadDetail} hash=${detailHash} isGuest=${isGuest} categories=${categories}
+                           onPatch=${(h, patch) => mutate(() => api.patch("downloads/" + h, patch))}
+                           onDelete=${del} onClear=${clearOne} />
+      <//>`}
+    </div>`;
+}
+
+// --- helpers ------------------------------------------------------------
+function matchStatus(d, f) {
+  if (f === "downloading") return d.status === "downloading";
+  if (f === "waiting") return d.status === "waiting" || d.status === "hashing" || d.status === "allocating";
+  if (f === "paused") return d.status === "paused";
+  if (f === "stopped") return d.status === "stopped";
+  if (f === "completed") return d.status === "completed" || d.status === "completing";
+  return true;
+}
+function statusBadge(s) {
+  const cls = s === "downloading" ? "downloading" : s === "paused" ? "paused"
+    : s === "stopped" ? "stopped"
+    : (s === "erroneous" || s === "insufficient_disk") ? "error"
+    : (s === "waiting" || s === "hashing" || s === "allocating") ? "waiting" : "";
+  // t() falls back to the raw status for values without a key.
+  return html`<${Badge} kind=${cls}>${t("downloads_status_" + s)}<//>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/login.js Added

@@ -0,0 +1,57 @@
+// Login screen. Password-only (matches aMule Web / the amuleapi auth
+// model). On success the session cookie is set by the server and we hand
+// control back to the shell via onSuccess(role).
+
+import { api, ApiError } from "../api.js";
+import { html, useState, useRef, useEffect } from "../dom.js";
+import { t } from "../i18n.js";
+
+// Map the backend's /auth/login error codes (the {error:{code}} envelope) to
+// our own translated strings — the raw server message is English-only. Unknown
+// codes fall back to the generic login_failed.
+const LOGIN_ERROR_KEYS = {
+  invalid_credentials: "login_err_invalid_credentials",
+  rate_limited: "login_err_rate_limited",
+  login_disabled: "login_err_login_disabled",
+};
+
+export function Login({ onSuccess, notice }) {
+  const password, setPassword = useState("");
+  const error, setError = useState("");
+  const busy, setBusy = useState(false);
+  const input = useRef(null);
+
+  useEffect(() => { if (input.current) input.current.focus(); }, );
+
+  const submit = async (e) => {
+    e.preventDefault();
+    setError("");
+    setBusy(true);
+    try {
+      const res = await api.login(password);
+      onSuccess(res.role || "admin");
+    } catch (err) {
+      const key = (err instanceof ApiError && LOGIN_ERROR_KEYSerr.code) || "login_failed";
+      setError(t(key));
+      setBusy(false);
+      if (input.current) { input.current.focus(); input.current.select(); }
+    }
+  };
+
+  return html`
+    <div class="login">
+      <form class="login-form" onSubmit=${submit}>
+        <img class="login-logo" src="img/logo.png" alt="aMule" />
+        <h1 class="login-title">${t("login_title")}</h1>
+        ${notice && !error ? html`<p class="login-notice" role="status">${notice}</p>` : null}
+        <label class="sr-only" for="login-password">${t("login_password")}</label>
+        <input ref=${input} type="password" id="login-password" class="input"
+               autocomplete="current-password" required placeholder=${t("login_password")}
+               value=${password} onInput=${(e) => setPassword(e.target.value)} />
+        <button type="submit" class="btn btn-primary" disabled=${busy}>
+          ${busy ? t("login_signing_in") : t("login_sign_in")}
+        </button>
+        ${error ? html`<p class="login-error" role="alert">${error}</p>` : null}
+      </form>
+    </div>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/messages.js Added

@@ -0,0 +1,287 @@
+// Messages view (the desktop's src/ChatWnd.cpp): friends left, conversations
+// right. Rendering only — conversations live in ../chats.js so they survive
+// navigation; friends are an ordinary live collection.
+
+import { api } from "../api.js";
+import { data } from "../events.js";
+import { html, useState, useEffect, useRef, useStore } from "../dom.js";
+import { Placeholder, Tabs, toast, confirmDialog } from "../components.js";
+import { Icon } from "../icons.js";
+import { chats } from "../chats.js";
+import { searches } from "../searches.js";
+import { t, terr } from "../i18n.js";
+
+const TAB_LABEL_MAX = 22;
+
+// undefined until the first snapshot lands,  once there are no friends.
+function useFriends() {
+  useEffect(() => {
+    data.register({ key: "friends", eventPrefix: "friend", id: "ecid",
+      list: () => api.get("friends").then((r) => r.friends || ) });
+    data.ensure("friends");
+  }, );
+  return useStore("friends");
+}
+
+export default function Messages({ isGuest }) {
+  const reg = useStore("chats") || { tabs: , activePeer: "", unread: 0 };
+  const rawFriends = useFriends();
+  const addOpen, setAddOpen = useState(false);
+
+  useEffect(() => { chats.ensure(); }, );
+  useEffect(() => { chats.markRead(); }, reg.activePeer);
+
+  const active = reg.tabs.find((x) => x.peer === reg.activePeer) || null;
+
+  return html`
+    <div class="fill-view msg-split">
+      <${FriendsPane} friends=${rawFriends} isGuest=${isGuest}
+                      activePeer=${reg.activePeer} onAdd=${() => setAddOpen(true)} />
+      <${ChatPane} reg=${reg} active=${active} isGuest=${isGuest} />
+      ${addOpen ? html`<${AddFriendModal} onClose=${() => setAddOpen(false)} />` : null}
+    </div>`;
+}
+
+// --- friends -------------------------------------------------------------
+
+function FriendsPane({ friends, isGuest, activePeer, onAdd }) {
+  const list = (friends || ).slice()
+    .sort((a, b) => (a.name || "").localeCompare(b.name || ""));
+
+  // Nudge both readers rather than wait for the next-tick SSE events: the
+  // friends collection, and the friend link conversations carry (chat has no
+  // friend-link event of its own).
+  const mutate = async (fn, okKey) => {
+    try { await fn(); toast(t(okKey), "success"); }
+    catch (e) { toast(terr(e) || t("messages_error"), "error"); }
+    data.refresh("friends");
+    chats.adopt();
+  };
+
+  const toggleSlot = (f) => mutate(
+    () => api.patch("friends/" + f.ecid, { friend_slot: !f.friend_slot }),
+    "messages_toast_friend_slot");
+
+  const remove = async (f) => {
+    if (!(await confirmDialog(t("messages_confirm_remove_friend")))) return;
+    mutate(() => api.del("friends/" + f.ecid), "messages_toast_friend_removed");
+  };
+
+  // Friend-addressed browse: a friend's stored address reaches one that is offline.
+  const viewFiles = async (f) => {
+    try { await searches.browseFriend(f.ecid, f.name); }
+    catch (e) { toast(terr(e) || t("messages_error"), "error"); }
+  };
+
+  const row = (f) => {
+    // No ip (added by hash alone) means no conversation key, so disable the
+    // open action rather than build one the chat routes would 400 on.
+    const peer = f.ip && f.port ? f.ip + ":" + f.port : "";
+    // "Online" mirrors the desktop's blue-name rule: a friend is shown online while a live
+    // client is linked (client_ecid set), not only while the TCP link is up right now.
+    const online = !!f.client_ecid;
+    // A real <button>, not an <li> click handler, for keyboard/a11y.
+    return html`
+      <li class=${"friend-row" + (peer && peer === activePeer ? " active" : "")} key=${f.ecid}>
+        <button type="button" class=${"friend-open" + (online ? " online" : "")} disabled=${!peer}
+                title=${f.name + (peer ? " — " + peer : "") + " · " + (online ? t("messages_online") : t("messages_offline"))}
+                onClick=${() => chats.open({ peer, ip: f.ip, port: f.port, name: f.name, friendEcid: f.ecid, clientEcid: f.client_ecid || 0 })}>
+          <span class=${"friend-dot" + (online ? " online" : "")}></span>
+          <span class="friend-name">${f.name}</span>
+        </button>
+        ${isGuest ? null : html`
+          <span class="row-actions admin-only">
+            <button class=${"btn btn-icon btn-sm" + (f.friend_slot ? " active" : "")}
+                    title=${t("messages_friend_slot")}
+                    onClick=${() => toggleSlot(f)}><${Icon} name="star" /></button>
+            <button class="btn btn-icon btn-sm" title=${t("messages_view_files")}
+                    onClick=${() => viewFiles(f)}><${Icon} name="search" /></button>
+            <button class="btn btn-icon btn-sm btn-danger" title=${t("messages_remove_friend")}
+                    onClick=${() => remove(f)}><${Icon} name="trash" /></button>
+          </span>`}
+      </li>`;
+  };
+
+  return html`
+    <section class="msg-pane">
+      <h3 class="msg-pane-head"><${Icon} name="clients" size=${16} /> ${t("messages_friends")}</h3>
+      <div class="msg-pane-body friend-list-wrap">
+        ${friends === undefined
+          ? html`<${Placeholder} kind="loading">${t("app_loading")}<//>`
+          : list.length
+            ? html`<ul class="friend-list">${list.map(row)}</ul>`
+            : html`<${Placeholder} kind="info">${t("messages_friends_empty")}<//>`}
+      </div>
+      <div class="msg-pane-foot">
+        <button class="btn btn-sm admin-only" onClick=${onAdd}>${t("messages_add_friend")}</button>
+      </div>
+    </section>`;
+}
+
+function AddFriendModal({ onClose }) {
+  const ip, setIp = useState("");
+  // Just the eD2k default (DEFAULT_TCP_PORT); the address is stored, never
+  // checked against the peer.
+  const port, setPort = useState("4662");
+  const name, setName = useState("");
+  const hash, setHash = useState("");
+
+  const submit = async (e) => {
+    e.preventDefault();
+    const p = Number(port);
+    if (!ip.trim() || !p || p < 1 || p > 65535) { toast(t("messages_err_ip_port"), "warn"); return; }
+    const body = { ip: ip.trim(), port: p };
+    if (name.trim()) body.name = name.trim();
+    if (hash.trim()) body.user_hash = hash.trim();
+    try {
+      await api.post("friends", body);
+      toast(t("messages_toast_friend_added"), "success");
+      onClose();
+    } catch (err) {
+      toast(terr(err) || t("messages_error"), "error");
+    }
+    data.refresh("friends");
+  };
+
+  const field = (label, value, setter, extra) => html`
+    <label class="field">
+      <span>${label}</span>
+      <input class="input" name="friend_field" value=${value} onInput=${(e) => setter(e.target.value)} ...${extra || {}} />
+    </label>`;
+
+  return html`
+    <div class="modal-overlay" onClick=${onClose}>
+      <div class="modal" onClick=${(e) => e.stopPropagation()}>
+        <div class="modal-header"><h3>${t("messages_add_friend_title")}</h3></div>
+        <form onSubmit=${submit}>
+          <div class="form-grid form-grid-2">
+            ${field(t("messages_field_ip"), ip, setIp, { placeholder: "0.0.0.0", required: true })}
+            ${field(t("messages_field_port"), port, setPort, { type: "number", min: "1", max: "65535", required: true })}
+            ${field(t("messages_field_username"), name, setName)}
+            ${field(t("messages_field_userhash"), hash, setHash, { maxlength: "32" })}
+          </div>
+          <div class="modal-actions">
+            <button class="btn" type="button" onClick=${onClose}>${t("common_cancel")}</button>
+            <button class="btn btn-primary" type="submit">${t("messages_add")}</button>
+          </div>
+        </form>
+      </div>
+    </div>`;
+}
+
+// --- chat ----------------------------------------------------------------
+
+function ChatPane({ reg, active, isGuest }) {
+  const draft, setDraft = useState("");
+
+  const tabItems = reg.tabs.map((x) => ({
+    key: x.peer,
+    label: x.name.length > TAB_LABEL_MAX ? x.name.slice(0, TAB_LABEL_MAX - 1) + "…" : x.name,
+    title: x.name + " — " + x.peer,
+    badge: x.unread || null,
+    cls: x.online ? "online" : "",
+    closeLabel: t("messages_tab_close"),
+  }));
+
+  const send = (e) => {
+    e.preventDefault();
+    const text = draft.trim();
+    if (!text || !active) return; // dropped silently, like the desktop
+    setDraft("");
+    chats.send(active.peer, text);
+  };
+
+  const addToFriends = async () => {
+    try {
+      // Promoting the live peer, so offered only while a client is linked.
+      await api.post("friends", { client_ecid: active.clientEcid });
+      toast(t("messages_toast_friend_added"), "success");
+    } catch (e) { toast(terr(e) || t("messages_error"), "error"); }
+    data.refresh("friends");
+    chats.adopt(); // picks up the new friend_ecid, which retires this button
+  };
+
+  const extra = reg.tabs.length ? html`
+    <button class="btn btn-sm admin-only" onClick=${() => chats.closeAll()}>${t("messages_close_all")}</button>` : null;
+
+  return html`
+    <section class="msg-pane">
+      <h3 class="msg-pane-head"><${Icon} name="messages" size=${16} /> ${t("messages_messages")}</h3>
+      ${reg.tabs.length ? html`
+        <${Tabs} cls="msg-tabs" tabs=${tabItems} active=${reg.activePeer}
+                 onSelect=${(p) => chats.setActive(p)}
+                 onClose=${isGuest ? null : (p) => chats.close(p)}
+                 extra=${extra} />` : null}
+      <div class="msg-pane-body chat-body">
+        ${reg.unsupported
+          ? html`<${Placeholder} kind="info">${t("messages_unsupported")}<//>`
+          : active
+            ? html`
+              <div class="chat-peer">
+                <strong>${active.name}</strong>
+                <span class="mono">${active.peer}</span>
+                <span class=${"status-chip " + (active.online ? "ok" : "off")}>
+                  ${active.online ? t("messages_online") : t("messages_offline")}
+                </span>
+                ${!active.friendEcid && active.online ? html`
+                  <button class="btn btn-sm admin-only" onClick=${addToFriends}>
+                    ${t("messages_add_to_friends")}
+                  </button>` : null}
+              </div>
+              <${ChatLog} key=${active.peer} peer=${active.peer}
+                          peerName=${active.name} myNick=${reg.myNick} />`
+            : html`<${Placeholder} kind="info">${t("messages_empty")}<//>`}
+      </div>
+      <form class="chat-compose admin-only" onSubmit=${send}>
+        <input class="input" name="message" type="text" maxlength="1024" placeholder=${t("messages_ph")}
+               aria-label=${t("messages_ph")} disabled=${!active} value=${draft}
+               onInput=${(e) => setDraft(e.target.value)} />
+        <button class="btn btn-primary" type="submit" title=${t("messages_send_tip")}
+                disabled=${!active}>${t("messages_send")}</button>
+        <button class="btn" type="button" title=${t("messages_close_tip")} disabled=${!active}
+                onClick=${() => chats.close(active.peer)}>${t("messages_close")}</button>
+      </form>
+      ${isGuest ? html`<p class="hint">${t("messages_guest_readonly")}</p>` : null}
+    </section>`;
+}
+
+const two = (n) => (n < 10 ? "0" + n : String(n));
+// From the message's own core timestamp, not the wall clock the wx GUI stamps.
+// An unstamped message (sent_at null, or the legacy 0) has no time to show:
+// render a dash rather than a false 1970.
+function hhmmss(ts) {
+  if (!ts) return "—";
+  const d = new Date(ts * 1000);
+  return two(d.getHours()) + ":" + two(d.getMinutes()) + ":" + two(d.getSeconds());
+}
+
+// Flat coloured text log like the desktop, "HH:MM:SS Nick: text", but with
+// theme tokens instead of its fixed #0000FF (unreadable on a dark background).
+function ChatLog({ peer, peerName, myNick }) {
+  const messages = useStore("chat:" + peer) || ;
+  const boxRef = useRef(null);
+  const stickRef = useRef(true);
+
+  // Key on the array, not its length: at HISTORY_LIMIT each new message evicts
+  // one, so a length-keyed effect would stop scrolling to the bottom.
+  useEffect(() => {
+    const box = boxRef.current;
+    if (box && stickRef.current) box.scrollTop = box.scrollHeight;
+  }, messages, peer);
+
+  const onScroll = (e) => {
+    const box = e.target;
+    stickRef.current = box.scrollHeight - box.scrollTop - box.clientHeight < 30;
+  };
+
+  return html`
+    <div class="chatlog" ref=${boxRef} onScroll=${onScroll}>
+      ${messages.map((m) => html`
+        <div class="chat-line" key=${m.id}>
+          <span class="chat-time">${hhmmss(m.sent_at)}</span>
+          <span class=${"chat-nick " + m.direction}>
+            ${m.direction === "out" ? (myNick || t("messages_me")) : peerName}
+          </span>${": "}<span class="chat-text">${m.text}</span>
+        </div>`)}
+    </div>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/networks.js Added

@@ -0,0 +1,586 @@
+// Networks view: mirrors the aMule desktop "Networks" page (NetDialog) — a top
+// notebook with the ED2K server list and Kad, and a bottom notebook with the
+// aMule log, server info and the two per-network info grids.
+//
+// One file on purpose: every panel below is used only by this page, so keeping
+// them together means the lazy route import (see app.js RouteView) is a single
+// request instead of a five-file waterfall.
+
+import { api } from "../api.js";
+import { data } from "../events.js";
+import { store, loadGraphInterval } from "../store.js";
+import { html, useState, useEffect, useRef, useStore } from "../dom.js";
+import { Tabs, listPlaceholder, toast, confirmDialog, CountryCell, Section, statRow } from "../components.js";
+import { VirtualTable, sortRows, useTablePrefs, ColumnPicker, ipNum } from "../table.js";
+import { Chart, graphPollMs } from "../charts.js";
+import { formatInt, formatTimestamp } from "../format.js";
+import { Icon } from "../icons.js";
+import { t, terr } from "../i18n.js";
+import { useSplitHeight } from "./split-detail.js";
+
+const SRV_POLL_MS = 5000;
+const AMULE_TAIL = 500; // initial history; live lines then arrive via log_appended
+const GRAPH_WIDTH = 300; // samples per fetch (~chart pixel width; full window is ~1800)
+// series0 is labelled "Current" for the legend, not the card title it reused
+// when the node count was the only line.
+const KAD_GRAPH = { name: "kad_nodes", title: t("networks_kad_nodes"), fmt: formatInt,
+  series: { color: "#8a5cd6", label: t("common_legend_current") },
+           { color: "#3b86e0", label: t("common_legend_session_avg") } };
+// The three values ServerPriorityCode() accepts, in rank order (also the sort order).
+const SERVER_PRIORITIES = "low", "normal", "high".map((v) => v, t("networks_server_prio_" + v));
+// The letters the desktop's TCP/UDP Flags columns render (ServerListCtrl.cpp),
+// keyed by the booleans /servers decodes the bitmasks into. Same order as there,
+// which is wire-bit order. Not translated: they are protocol tokens, and the
+// tooltip spells the key names out for anyone who does not know the letters.
+const TCP_FLAG_LETTERS = "compression", "c", "new_tags", "n", "unicode", "u",
+                          "related_search", "r", "type_tag_integer", "t",
+                          "large_files", "l", "tcp_obfuscation", "o";
+const UDP_FLAG_LETTERS = "get_sources", "g", "get_files", "f", "new_tags", "n",
+                          "unicode", "u", "get_sources_v2", "G", "large_files", "l",
+                          "udp_obfuscation", "o", "tcp_obfuscation", "O";
+// One flags cell: the letters for the bits that are set, tooltipped with the key
+// names behind them plus the raw bitmask — which is also how a bit this build
+// has no letter for stays visible instead of vanishing.
+const flagCell = (flags, letters) => {
+  if (!flags) return "—";
+  const on = letters.filter((k) => flagsk);
+  const text = on.map((, l) => l).join("");
+  const title = (on.length ? on.map((k) => k).join(", ") + " " : "")
+    + "(0x" + (flags.bitmask || 0).toString(16) + ")";
+  return html`<span title=${title}>${text || "—"}</span>`;
+};
+
+export default function Networks({ isGuest }) {
+  const top, setTop = useState("ed2k");
+  const bottom, setBottom = useState("amulelog");
+  // Draggable divider like the desktop NetDialog's wxSplitterWindow. On phones
+  // the CSS hides it and both panes flow (see .net-split in app.css).
+  const { height, containerRef, splitterProps } = useSplitHeight("net:split");
+
+  const topTabs = 
+    { key: "ed2k", label: t("networks_tab_ed2k") },
+    { key: "kad", label: t("networks_tab_kad") },
+  ;
+  const bottomTabs = 
+    { key: "amulelog", label: t("networks_tab_amule_log") },
+    { key: "serverinfo", label: t("networks_tab_server_info") },
+    { key: "ed2kinfo", label: t("networks_tab_ed2k_info") },
+    { key: "kadinfo", label: t("networks_tab_kad_info") },
+  ;
+
+  return html`
+    <div class="net-split fill-view" ref=${containerRef}>
+      <section class="net-pane pane-fill">
+        <${Tabs} tabs=${topTabs} active=${top} onSelect=${setTop} />
+        <div class="net-pane-body">
+          ${top === "ed2k"
+            ? html`<${ServersPanel} isGuest=${isGuest} />`
+            : html`<${KadPanel} />`}
+        </div>
+      </section>
+
+      <div class="splitter" ...${splitterProps}></div>
+
+      <section class="net-pane" style=${{ height: height + "px" }}>
+        <${Tabs} tabs=${bottomTabs} active=${bottom} onSelect=${setBottom} />
+        <div class="net-pane-body">
+          ${bottom === "amulelog"
+            ? html`<${AmuleLogPanel} />`
+            : bottom === "serverinfo"
+            ? html`<${ServerInfoPanel} />`
+            : bottom === "ed2kinfo"
+            ? html`<${Ed2kInfoPanel} />`
+            : html`<${KadInfoPanel} />`}
+        </div>
+      </section>
+    </div>`;
+}
+
+// --- connect toggle, shared by both top tabs -----------------------------
+// aMule-style coloured plug (red/amber/green) for one network. Colour and label
+// follow the real state from the SSE status_changed event; the click does the
+// opposite. ed2k idles as "disconnected", Kad as "disabled" — both read red.
+// Kad reports "connecting" while running-but-not-routing, which still has to be
+// stoppable, so "connecting" counts as up (matches CKadDlg).
+function NetworkConnectButton({ network }) {
+  const status = useStore("status");
+  const state = (status && statusnetwork && statusnetwork.state) || "disconnected";
+  const cls = state === "connected" ? "connected"
+            : state === "connecting" ? "connecting" : "disconnected";
+  const up = cls !== "disconnected";
+  const label = t("networks_tab_" + network) + ": " + t("app_" + cls);
+
+  const toggle = async () => {
+    try {
+      await api.post("networks/" + (up ? "disconnect" : "connect"), { network });
+      toast(t(up ? "app_toast_disconnecting" : "app_toast_connecting"), "success");
+    } catch (e) { toast(terr(e) || t("app_error"), "error"); }
+  };
+
+  return html`
+    <button type="button" class=${"btn btn-sm conn-btn admin-only " + cls}
+            title=${label} onClick=${toggle}>
+      <${Icon} name="connect" /> ${label}
+    </button>`;
+}
+
+// --- ED2K tab: server list, live via the SSE "servers" channel ------------
+function ServersPanel({ isGuest }) {
+  // undefined until the first snapshot lands,  once the list is known
+  // empty; listPlaceholder tells the two apart.
+  const rawServers = useStore("servers");
+  const servers = rawServers || ;
+  const loading = rawServers === undefined;
+  const status = useStore("status");
+  const ed2k = status && status.ed2k;
+  const { sortKey, sortDir, hidden, widths, toggleSort, toggleCol, setWidth, resetPrefs } =
+    useTablePrefs("servers", { sortKey: "users", sortDir: -1,
+                               hidden: "address", "version", "ping", "failed",
+                                        "soft_files", "hard_files", "tcp_flags", "udp_flags" });
+  const addr, setAddr = useState("");
+  const name, setName = useState("");
+  const connectingEcid, setConnectingEcid = useState(null);
+
+  useEffect(() => {
+    data.register({ key: "servers", eventPrefix: "server", id: "ecid",
+      list: () => api.list("servers").then((r) => r.servers || ) });
+    data.ensure("servers");
+  }, );
+
+  // Drop the optimistic "connecting" row once ed2k leaves that state, however
+  // it left it (connected here, connected elsewhere, or failed).
+  useEffect(() => {
+    if (ed2k && ed2k.state !== "connecting") setConnectingEcid(null);
+  }, ed2k && ed2k.state);
+
+  const connect = async (ecid) => {
+    setConnectingEcid(ecid);
+    try { await api.post("servers/" + ecid + "/connect"); toast(t("networks_server_toast_connecting"), "success"); }
+    catch (e) { setConnectingEcid(null); toast(terr(e) || t("networks_server_error"), "error"); }
+  };
+  const remove = async (s) => {
+    if (!(await confirmDialog(t("networks_server_confirm_remove", { name: s.name })))) return;
+    try { await api.del("servers/" + s.ecid); data.refresh("servers"); }
+    catch (e) { toast(terr(e) || t("networks_server_error"), "error"); }
+  };
+  const addServer = async (e) => {
+    e.preventDefault();
+    const address = addr.trim();
+    if (!address) { toast(t("networks_server_toast_enter_host_port"), "warn"); return; }
+    const body = { address };
+    if (name.trim()) body.name = name.trim();
+    try { await api.post("servers", body); setAddr(""); setName(""); toast(t("networks_server_toast_added"), "success"); data.refresh("servers"); }
+    catch (err) { toast(terr(err) || t("networks_server_error"), "error"); }
+  };
+  const patchServer = async (ecid, body) => {
+    try { await api.patch("servers/" + ecid, body); data.refresh("servers"); }
+    catch (e) { toast(terr(e) || t("networks_server_error"), "error"); }
+  };
+
+  // The two sides format the address differently — the list ships "ip:port"
+  // while status.ed2k.server_ip is a bare dotted quad — so compare the quad
+  // pulled out of each, plus the port. The regex also tolerates a bracketed
+  // "ip:port" address, so a non-dotted-quad value still matches.
+  const ipv4 = (v) => { const m = String(v || "").match(/\d+\.\d+\.\d+\.\d+/); return m ? m0 : ""; };
+  const isConnected = (s) =>
+    ed2k && ed2k.state === "connected"
+    && ipv4(ed2k.server_ip) !== "" && ipv4(ed2k.server_ip) === ipv4(s.address)
+    && ed2k.server_port === s.port;
+
+  const columns = 
+    // Server host country (#440): same cell and header as the peer table's.
+    { key: "country", label: t("networks_server_country"), width: "70px", sortable: true,
+      sortVal: (s) => s.country_code || "", cell: (s) => html`<${CountryCell} code=${s.country_code} />` },
+    { key: "address", label: t("networks_server_address"), num: true, width: "180px", sortable: true,
+      sortVal: (s) => ipNum(s.address),
+      cell: (s) => s.address && s.address.includes(":") ? s.address : (s.address + ":" + s.port) },
+    { key: "name", label: t("networks_server_name"), cls: "name", sortable: true,
+      sortVal: (s) => (s.name || "").toLowerCase(),
+      // flex cell so a long name ellipsizes
+      cell: (s) => html`<div class="name-cell" title=${s.name}><span class="name-text">${s.name}</span></div>` },
+    // No width, like `name`: descriptions are long, so the two split the leftover.
+    { key: "description", label: t("networks_server_description"), sortable: true,
+      sortVal: (s) => (s.description || "").toLowerCase(), cell: (s) => s.description || "" },
+    { key: "users", label: t("networks_server_users"), num: true, width: "130px", sortable: true,
+      sortVal: (s) => s.user_count || 0,
+      cell: (s) => formatInt(s.user_count) + (s.max_user_count ? " / " + formatInt(s.max_user_count) : "") },
+    { key: "files", label: t("networks_server_files"), num: true, width: "110px", sortable: true,
+      sortVal: (s) => s.file_count || 0, cell: (s) => formatInt(s.file_count) },
+    // Per-user publishing limits the server advertises, not subsets of `file_count`.
+    // 0 means "the server has not told us yet" — blank, not "0", exactly as the
+    // desktop's Soft/Hard Files columns and the API docs say.
+    { key: "soft_files", label: t("networks_server_soft_limit"), num: true, width: "110px", sortable: true,
+      sortVal: (s) => s.soft_file_limit || 0,
+      cell: (s) => s.soft_file_limit ? formatInt(s.soft_file_limit) : "—" },
+    { key: "hard_files", label: t("networks_server_hard_limit"), num: true, width: "110px", sortable: true,
+      sortVal: (s) => s.hard_file_limit || 0,
+      cell: (s) => s.hard_file_limit ? formatInt(s.hard_file_limit) : "—" },
+    { key: "version", label: t("networks_server_version"), width: "90px", sortable: true,
+      sortVal: (s) => s.software_version || "", cell: (s) => s.software_version || "—" },
+    // Consecutive failed connection attempts — a counter, not a flag.
+    { key: "failed", label: t("networks_server_failed"), num: true, width: "80px", sortable: true,
+      sortVal: (s) => s.failed_count || 0, cell: (s) => formatInt(s.failed_count || 0) },
+    // The announced eD2k wire capabilities, as the desktop's letters. Sorting on
+    // the bitmask groups servers by capability set, which is the only ordering
+    // that means anything here.
+    { key: "tcp_flags", label: t("networks_server_tcp_flags"), width: "100px", sortable: true,
+      sortVal: (s) => (s.tcp_flags && s.tcp_flags.bitmask) || 0,
+      cell: (s) => flagCell(s.tcp_flags, TCP_FLAG_LETTERS) },
+    { key: "udp_flags", label: t("networks_server_udp_flags"), width: "100px", sortable: true,
+      sortVal: (s) => (s.udp_flags && s.udp_flags.bitmask) || 0,
+      cell: (s) => flagCell(s.udp_flags, UDP_FLAG_LETTERS) },
+    { key: "ping", label: t("networks_server_ping"), num: true, width: "90px", sortable: true,
+      sortVal: (s) => s.ping_ms || 0, cell: (s) => s.ping_ms ? s.ping_ms + " ms" : "—" },
+    // Static and priority are both PATCH /servers/{ecid} fields, so both cells are
+    // selects for an admin and plain labels for a guest (as in downloads/shared).
+    { key: "static", label: t("networks_server_static"), width: "90px", sortable: true,
+      sortVal: (s) => (s.permanent ? 1 : 0),
+      cell: (s) => isGuest
+        ? (s.permanent ? t("networks_server_static_yes") : t("networks_server_static_no"))
+        : html`
+            <select class="input input-sm admin-only" name="server_permanent" value=${s.permanent ? "yes" : "no"}
+                    onChange=${(e) => patchServer(s.ecid, { permanent: e.target.value === "yes" })}>
+              <option value="yes">${t("networks_server_static_yes")}</option>
+              <option value="no">${t("networks_server_static_no")}</option>
+            </select>` },
+    { key: "priority", label: t("networks_server_priority"), width: "110px", sortable: true,
+      sortVal: (s) => SERVER_PRIORITIES.findIndex((v) => v === s.priority),
+      cell: (s) => {
+        const found = SERVER_PRIORITIES.find((v) => v === s.priority);
+        return isGuest
+          ? (found ? found1 : s.priority || "")
+          : html`
+              <select class="input input-sm admin-only" name="server_priority" value=${found ? s.priority : "normal"}
+                      onChange=${(e) => patchServer(s.ecid, { priority: e.target.value })}>
+                ${SERVER_PRIORITIES.map((v, l) => html`<option value=${v}>${l}</option>`)}
+              </select>`;
+      } },
+    ...(isGuest ?  : { key: "actions", label: t("networks_server_actions"), cls: "row-actions admin-only", width: "90px",
+      cell: (s) => html`
+        <button class="btn btn-icon btn-sm" title=${t("networks_server_connect")} onClick=${() => connect(s.ecid)}>
+          <${Icon} name="connect" />
+        </button>
+        <button class="btn btn-icon btn-sm btn-danger" title=${t("networks_server_remove")} onClick=${() => remove(s)}>
+          <${Icon} name="remove" />
+        </button>` }),
+  ;
+
+  const list = sortRows(servers, columns, sortKey, sortDir);
+  const shown = columns.filter((c) => !c.key || !hidden.has(c.key));
+  const rowClass = (s) => isConnected(s) ? "connected" : connectingEcid === s.ecid ? "connecting" : "";
+
+  return html`
+    <div class="server-toolbars admin-only">
+      <form class="toolbar admin-only" onSubmit=${addServer}>
+        <input class="input input-sm" name="server_host" placeholder=${t("networks_server_host_port_ph")} value=${addr} onInput=${(e) => setAddr(e.target.value)} />
+        <input class="input input-sm" name="server_name" placeholder=${t("networks_server_name_ph")} value=${name} onInput=${(e) => setName(e.target.value)} />
+        <button class="btn btn-sm" type="submit">${t("networks_server_add")}</button>
+        <div class="spacer"></div>
+        <${NetworkConnectButton} network="ed2k" />
+        <${ColumnPicker} columns=${columns} hidden=${hidden} onToggle=${toggleCol} onReset=${resetPrefs} />
+      </form>
+    </div>
+    <${VirtualTable} columns=${shown} rows=${list} rowKey=${(s) => s.ecid} rowClass=${rowClass}
+                     sortKey=${sortKey} sortDir=${sortDir} onSort=${toggleSort}
+                     widths=${widths} onResize=${setWidth}
+                     empty=${listPlaceholder(loading, t("networks_server_empty"))} />`;
+}
+
+// --- Kad tab: connect toggle, bootstrap, live nodes graph -----------------
+function KadPanel() {
+  const graphData, setGraphData = useState(null); // xs, ys, avg?
+  const node, setNode = useState("");
+  // Read once per mount; the router remounts this view when the user changes the
+  // range in Preferences and returns (see stats.js for the same pattern).
+  const interval = loadGraphInterval();
+
+  useEffect(() => {
+    let alive = true;
+    const tick = async () => {
+      try {
+        const r = await api.get("stats/graphs/" + KAD_GRAPH.name + "?width=" + GRAPH_WIDTH + "&interval_seconds=" + interval);
+        const pts = r.points || ;
+        const xs = pts.map((p) => p.at);
+        const ys = pts.map((p) => p.value);
+        // Session average, skipped when the daemon reports no uptime (see stats.js).
+        const s = r.session || {};
+        const rest = s.duration_seconds ? new Array(ys.length).fill(s.kad_node_seconds / s.duration_seconds) : ;
+        if (alive) setGraphData(xs, ys, ...rest);
+      } catch (_) { /* leave previous data */ }
+    };
+    tick();
+    const timer = setInterval(tick, graphPollMs(interval));
+    return () => { alive = false; clearInterval(timer); };
+  }, );
+
+  const bootstrap = async (e) => {
+    e.preventDefault();
+    const idx = node.lastIndexOf(":");
+    const ipv = idx > 0 ? node.slice(0, idx).trim() : "";
+    const portv = idx > 0 ? Number(node.slice(idx + 1)) : 0;
+    if (!ipv || !portv) { toast(t("networks_kad_toast_enter_ip_port"), "warn"); return; }
+    try { await api.post("kad/bootstrap", { ip: ipv, port: portv }); toast(t("networks_kad_toast_bootstrapping"), "success"); setNode(""); }
+    catch (err) { toast(terr(err) || t("networks_kad_error"), "error"); }
+  };
+
+  return html`
+    <form class="toolbar admin-only" onSubmit=${bootstrap}>
+      <input class="input input-sm" name="kad_node" placeholder=${t("networks_kad_ip_port_ph")} value=${node} onInput=${(e) => setNode(e.target.value)} />
+      <button class="btn btn-sm" type="submit">${t("networks_kad_bootstrap_from_node")}</button>
+      <div class="spacer"></div>
+      <${NetworkConnectButton} network="kad" />
+    </form>
+
+    <${Chart} g=${KAD_GRAPH} data=${graphData} bare=${true} />`;
+}
+
+// --- bottom tabs: logs ---------------------------------------------------
+// The <pre> boxes are written imperatively via refs so incoming lines can be
+// appended while keeping the scroll stuck to the bottom; preact never owns them.
+
+const atBottom = (box) => box.scrollHeight - box.scrollTop - box.clientHeight < 30;
+const append = (box, text) => {
+  const stick = atBottom(box);
+  box.appendChild(document.createTextNode(text));
+  if (stick) box.scrollTop = box.scrollHeight;
+};
+const setText = (box, text, isErr) => {
+  box.textContent = text;
+  box.classList.toggle("logbox-err", !!isErr);
+};
+
+const saveText = (name, text) => {
+  const url = URL.createObjectURL(new Blob(text, { type: "text/plain" }));
+  const a = Object.assign(document.createElement("a"), { href: url, download: name });
+  a.click();
+  // Deferred: revoking in the same task can cancel the download.
+  setTimeout(() => URL.revokeObjectURL(url), 0);
+};
+
+function logBox(clear, save, boxRef, extraCls) {
+  return html`
+    <div class="logbox-wrap">
+      <div class="logbox-actions">
+        <button class="btn btn-icon btn-sm" title=${t("networks_log_download")} onClick=${save}>
+          <${Icon} name="downloads" />
+        </button>
+        <button class="btn btn-icon btn-sm admin-only" title=${t("networks_log_clear")} onClick=${clear}>
+          <${Icon} name="trash" />
+        </button>
+      </div>
+      <pre class=${"logbox" + (extraCls ? " " + extraCls : "")} ref=${boxRef}></pre>
+    </div>`;
+}
+
+// Live-appended from the SSE log_appended event.
+function AmuleLogPanel() {
+  const boxRef = useRef(null);
+
+  const load = async () => {
+    try {
+      const r = await api.get("logs/amule?tail=" + AMULE_TAIL);
+      if (!boxRef.current) return;
+      setText(boxRef.current, (r.lines || ).join(""));
+      boxRef.current.scrollTop = boxRef.current.scrollHeight;
+    } catch (e) { if (boxRef.current) setText(boxRef.current, terr(e) || t("networks_log_error"), true); }
+  };
+  const clear = async () => {
+    if (!(await confirmDialog(t("networks_log_confirm_clear_amule")))) return;
+    try { await api.del("logs/amule"); if (boxRef.current) setText(boxRef.current, ""); toast(t("networks_log_toast_cleared"), "success"); }
+    catch (e) { toast(terr(e) || t("networks_log_error"), "error"); }
+  };
+  // No `tail`: the whole history, not just the lines on screen.
+  const save = async () => {
+    try { const r = await api.get("logs/amule"); saveText("amule-log.txt", (r.lines || ).join("")); }
+    catch (e) { toast(terr(e) || t("networks_log_error"), "error"); }
+  };
+
+  useEffect(() => {
+    let lastSeen = store.get("log:appended");
+    const unsub = store.subscribe("log:appended", (v) => {
+      if (v === lastSeen) return;
+      lastSeen = v;
+      if (!boxRef.current) return;
+      for (const line of (v.lines || )) append(boxRef.current, line);
+    });
+    // resync means the tail cursor is worthless -- DELETE /logs/amule emptied
+    // the buffer, from this client or another one -- so re-read rather than
+    // keep appending to what is on screen.
+    let lastResync = store.get("resync");
+    const unsubResync = store.subscribe("resync", (v) => {
+      if (v === lastResync) return;
+      lastResync = v;
+      if (boxRef.current) setText(boxRef.current, "");
+      load();
+    });
+    load();
+    return () => { unsub(); unsubResync(); };
+  }, );
+
+  return logBox(clear, save, boxRef);
+}
+
+// No SSE channel for this one — polled.
+function ServerInfoPanel() {
+  const boxRef = useRef(null);
+
+  const load = async () => {
+    try {
+      const r = await api.get("logs/server_info");
+      if (!boxRef.current) return;
+      setText(boxRef.current, r.text || "");
+      boxRef.current.scrollTop = boxRef.current.scrollHeight;
+    } catch (e) { if (boxRef.current) setText(boxRef.current, terr(e) || t("networks_log_error"), true); }
+  };
+  const clear = async () => {
+    if (!(await confirmDialog(t("networks_log_confirm_clear_serverinfo")))) return;
+    try { await api.del("logs/server_info"); if (boxRef.current) setText(boxRef.current, ""); toast(t("networks_log_toast_cleared"), "success"); }
+    catch (e) { toast(terr(e) || t("networks_log_error"), "error"); }
+  };
+  const save = async () => {
+    try { const r = await api.get("logs/server_info"); saveText("server-info.txt", r.text || ""); }
+    catch (e) { toast(terr(e) || t("networks_log_error"), "error"); }
+  };
+
+  useEffect(() => {
+    load();
+    const timer = setInterval(load, SRV_POLL_MS);
+    return () => clearInterval(timer);
+  }, );
+
+  return logBox(clear, save, boxRef, "logbox-sm");
+}
+
+// --- bottom tabs: per-network info grids ---------------------------------
+
+function yesno(b) { return html`<span class=${"status-chip " + (b ? "warn" : "ok")}>${b ? t("networks_kad_yes") : t("networks_kad_no")}</span>`; }
+
+// Mirrors amuleGUI's "Firewalled state:" row (CServerWnd::UpdateKadInfo): with a
+// buddy, its address; without one, why none is needed. The daemon only reports
+// buddy state while Kad is connected -- /kad then falls back to `no_buddy`, the
+// same reading the desktop takes, but the firewalled flags it would be composed
+// with are stale, so the row goes blank instead (the desktop hides it outright).
+function buddyText(kad_state, buddy, firewalled_tcp, firewalled_udp) {
+  if (kad_state !== "connected") return "—";
+  switch (buddy.state) {
+    case "connected": return t("networks_kad_buddy_at", { addr: buddy.ip + ":" + buddy.port });
+    case "connecting": return t("networks_kad_buddy_connecting");
+    case "no_buddy":
+      if (!firewalled_tcp) return t("networks_kad_buddy_not_needed_tcp");
+      if (!firewalled_udp) return t("networks_kad_buddy_not_needed_udp");
+      return t("networks_kad_buddy_none");
+    default: return "—";
+  }
+}
+
+// Mirrors amuleGUI's ServerWnd UpdateED2KInfo (src/ServerWnd.cpp:249-289). The
+// desktop drops every row but the status one while disconnected; this grid keeps
+// them and shows "—", like KadInfoPanel below. Every value but the port lives in
+// status.ed2k, so the panel stays live off the status event with no fetch of its
+// own; the local TCP port is a preference, hence the one-off read below.
+function Ed2kInfoPanel() {
+  const status = useStore("status");
+  const ed2k = (status && status.ed2k) || {};
+  const net = ed2k.network || {};
+  const connected = ed2k.state === "connected";
+  const port, setPort = useState(0);
+
+  useEffect(() => {
+    (async () => {
+      try {
+        const p = await api.get("preferences");
+        setPort((p && p.connection && p.connection.tcp_port) || 0);
+      } catch (_) {
+        setPort(0); // The port only decorates one row; never costs the panel.
+      }
+    })();
+  }, );
+
+  // A LowID encodes no address, so public_ip is empty there.
+  const ipPort = connected && ed2k.public_ip ? ed2k.public_ip + (port ? ":" + port : "") : "—";
+  // Same fallback as the status bar (app.js): the name, or the address the
+  // server list had no name for.
+  const server = !connected ? "—"
+    : ed2k.server_name || (ed2k.server_ip ? ed2k.server_ip + ":" + ed2k.server_port : "—");
+
+  return html`
+    <div class="detail-sections">
+      ${Section(
+        statRow("networks_ed2k_status", html`
+          <span class=${"status-chip " + (connected ? "ok" : "bad")}>
+            ${connected ? t("networks_ed2k_connected") : t("networks_ed2k_disconnected")}
+          </span>`),
+        statRow("networks_ed2k_server", server),
+        statRow("networks_ed2k_connection_type",
+          connected
+            ? html`<span class=${"status-chip " + (ed2k.high_id ? "ok" : "warn")}>${ed2k.high_id ? t("networks_ed2k_high_id") : t("networks_ed2k_low_id")}</span>`
+            : "—"),
+        statRow("networks_ed2k_connected_since", formatTimestamp(ed2k.connected_since_at)),
+      , "networks_ed2k_group_connection")}
+      ${Section(
+        // An identifier, not a quantity -- no thousands separators.
+        statRow("networks_ed2k_id", connected ? String(ed2k.user_id || 0) : "—"),
+        statRow("networks_ed2k_ip_port", ipPort),
+      , "networks_ed2k_group_identity")}
+      ${Section(
+        statRow("networks_ed2k_users", connected ? formatInt(net.user_count) : "—"),
+        statRow("networks_ed2k_files", connected ? formatInt(net.file_count) : "—"),
+      , "networks_ed2k_group_network")}
+    </div>`;
+}
+
+// Live counters ride the SSE status event; the detail-only fields (node id,
+// connected-since, your public IP, firewalled UDP, buddy) are fetched from /kad
+// on mount and whenever the Kad state changes — a connect/disconnect from the
+// top tab arrives that way.
+function KadInfoPanel() {
+  const status = useStore("status");
+  const kadState = status && status.kad && status.kad.state;
+  const detail, setDetail = useState(null);
+  const error, setError = useState("");
+
+  useEffect(() => {
+    (async () => {
+      try { setDetail(await api.get("kad")); setError(""); }
+      catch (e) { setError(terr(e) || t("networks_kad_error")); }
+    })();
+  }, kadState);
+
+  const kad = (status && status.kad) || {};
+  const net = kad.network || {};
+  const d = detail || {};
+  const buddy = d.buddy || {};
+  const idx = d.indexed || {};
+  const connected = kad.state === "connected";
+
+  if (error) return html`<p>${error}</p>`;
+
+  return html`
+    <div class="detail-sections">
+      ${Section(
+        statRow("networks_kad_state", kad.state
+          ? html`<span class=${"status-chip " + (connected ? "ok" : kad.state === "connecting" ? "warn" : "bad")}>${t("networks_kad_conn_" + kad.state)}</span>`
+          : "—"),
+        statRow("networks_kad_firewalled_tcp", connected ? yesno(kad.firewalled_tcp) : "—"),
+        statRow("networks_kad_firewalled_udp", connected ? yesno(d.firewalled_udp) : "—"),
+        statRow("networks_kad_in_lan_mode", connected ? yesno(d.lan_mode) : "—"),
+        statRow("networks_kad_connected_since", connected ? formatTimestamp(d.connected_since_at) : "—"),
+      , "networks_kad_group_connection")}
+      ${Section(
+        statRow("networks_kad_node_id", d.node_id || "—"),
+        statRow("networks_kad_your_ip", d.public_ip || "—"),
+        statRow("networks_kad_buddy", buddyText(kad.state, buddy, kad.firewalled_tcp, d.firewalled_udp)),
+      , "networks_kad_group_identity")}
+      ${Section(
+        statRow("networks_kad_users", connected ? formatInt(net.user_count) : "—"),
+        statRow("networks_kad_files", connected ? formatInt(net.file_count) : "—"),
+        statRow("networks_kad_contacts_nodes", connected ? formatInt(net.node_count) : "—"),
+      , "networks_kad_group_network")}
+      ${Section(
+        statRow("networks_kad_indexed_sources", connected ? formatInt(idx.sources) : "—"),
+        statRow("networks_kad_indexed_keywords", connected ? formatInt(idx.keywords) : "—"),
+        statRow("networks_kad_indexed_notes", connected ? formatInt(idx.notes) : "—"),
+        statRow("networks_kad_indexed_load", connected ? formatInt(idx.load_percent) : "—"),
+      , "networks_kad_group_index")}
+    </div>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/preferences.js Added

@@ -0,0 +1,688 @@
+// Preferences view, aligned with the desktop amuleGUI PrefsUnifiedDlg: same
+// page order and grouping, horizontal category tabs on top. Reads /preferences
+// into one shared form state (edits survive tab switches), PATCHes the editable
+// subset back with a single Apply. Admin-only edit; guest sees a read-only form.
+//
+// A tab is a UI grouping; the API groups preferences into categories. Most tabs
+// map to one category (tab.cat), but some don't: Proxy draws the proxy_* fields
+// out of the "connection" category into its own tab (like the desktop Proxy
+// page), and Advanced pulls files.mmap_enabled in next to the core tweaks. So
+// every field's real API category is `f.cat || tab.cat`, and that is what keys
+// the form state and the PATCH body. A category may itself be a dotted path
+// into a nested payload object ("remote_controls.webserver"); the form state
+// stays flat and only the GET read / PATCH build walk the path. A group's
+// `after` marker appends a panel that is not preferences at all (see
+// AmuleApiCredentials).
+
+import { api } from "../api.js";
+import { html, useState, useEffect } from "../dom.js";
+import { Placeholder, toast, Tabs, confirmDialog } from "../components.js";
+import { Icon } from "../icons.js";
+import { SharedDirectories } from "./shared-dirs.js";
+import { t, terr, getLang, setLang, LANGS, langName } from "../i18n.js";
+import { getTheme, setTheme } from "../theme.js";
+import { clearPrefs, GRAPH_RANGES, loadGraphInterval, saveGraphInterval } from "../store.js";
+
+// Field types: text (default), int, bool, select, password, textarea.
+// Flags: readonly (shown disabled, never sent), hidden (capability flag loaded
+// only to gate others), gatedBy (disabled + skipped when valuescap === false),
+// password (write-only, only sent when non-empty), scale (int shown/edited
+// in value/scale units, e.g.
+// ms stored but minutes shown), cat (override the tab's API category),
+// action (an endpoint the field POSTs to, see runAction — the endpoint
+// persists whatever it is given itself, so no Apply needed). On a text field
+// `action.body` names the JSON field the typed value is sent as, and the row
+// grows a trailing icon button; a `button` field is the same action with no
+// value to send, rendered as a standalone button and never part of the PATCH.
+const PROXY_TYPES = 
+  { value: "socks5", labelKey: "prefs_opt_proxy_socks5" },
+  { value: "socks4", labelKey: "prefs_opt_proxy_socks4" },
+  { value: "http", labelKey: "prefs_opt_proxy_http" },
+  { value: "socks4a", labelKey: "prefs_opt_proxy_socks4a" },
+;
+
+// security.shared_files_visibility is a 3-state enum string, not a bool.
+const SEE_SHARES = 
+  { value: "everybody", labelKey: "prefs_opt_see_shares_everybody" },
+  { value: "friends", labelKey: "prefs_opt_see_shares_friends" },
+  { value: "nobody", labelKey: "prefs_opt_see_shares_nobody" },
+;
+const GEOIP_SOURCES = 
+  { value: "dbip", labelKey: "prefs_opt_source_dbip" },
+  { value: "maxmind", labelKey: "prefs_opt_source_maxmind" },
+  { value: "custom", labelKey: "prefs_opt_source_custom" },
+;
+
+// WebUI is client-only (browser localStorage, not the /preferences API); the
+// rest follow the desktop pages order (skipping pages the API does not expose:
+// Interface, Statistics, Events, Debugging). Empty groups keep the generic
+// read/collect loops no-ops for WebUI; its body is rendered by WebUiSettings.
+const TABS = 
+  { id: "webui", labelKey: "prefs_webui", noteKey: "prefs_webui_warning", webui: true, groups:  },
+  { id: "general", labelKey: "prefs_general", cat: "general", groups: 
+    { legendKey: "prefs_group_general", fields: 
+      { key: "nickname", type: "text" },
+      { key: "version_check_enabled", type: "bool" },
+      { key: "daemon_host_name", type: "text", readonly: true },
+      { key: "user_hash", type: "text", readonly: true },
+     },
+   },
+  { id: "connection", labelKey: "prefs_connection", cat: "connection", groups: 
+    { legendKey: "prefs_group_bandwidth", fields: 
+      { key: "max_download_kibibytes_per_second", type: "int", min: 0, max: 1000000 },
+      { key: "max_upload_kibibytes_per_second", type: "int", min: 0, max: 1000000 },
+      { key: "upload_slot_min_kibibytes_per_second", type: "int", min: 1, max: 65535 },
+     },
+    { legendKey: "prefs_group_ports", fields: 
+      // 65532, not 65535: the server UDP socket is TCP+3, and the core
+      // substitutes the default port for anything higher.
+      { key: "tcp_port", type: "int", min: 1, max: 65532 },
+      // Not an API field: the desktop shows the server-request UDP port, which
+      // the core derives as TCP+3. Computed, read-only, never sent.
+      { key: "udp_server_port", type: "int", readonly: true,
+        derived: (v, cat) => (parseInt(vcat + ".tcp_port", 10) || 0) + 3 },
+      { key: "extended_udp_port_enabled", type: "bool" },
+      { key: "udp_port", type: "int", min: 0, max: 65535, sub: true, gatedBy: "extended_udp_port_enabled" },
+      { key: "upnp_enabled", type: "bool", gatedBy: "upnp_supported" },
+      { key: "upnp_control_point_port", type: "int", min: 0, max: 65535, sub: true, gatedBy: "upnp_supported", "upnp_enabled" },
+      { key: "upnp_supported", type: "bool", hidden: true },
+     },
+    { legendKey: "prefs_group_binding", fields: 
+      { key: "bind_address", type: "text" },
+      { key: "bind_interface", type: "text" },
+     },
+    { legendKey: "prefs_group_conn_limits", fields: 
+      { key: "max_sources_per_file_count", type: "int", min: 40, max: 5000 },
+      { key: "max_connection_count", type: "int", min: 5, max: 7500 },
+     },
+    { legendKey: "prefs_group_networks", fields: 
+      { key: "kad_enabled", type: "bool" },
+      { key: "ed2k_enabled", type: "bool", readonly: true, labelKey: "prefs_ed2k_readonly" },
+      { key: "autoconnect", type: "bool" },
+      { key: "reconnect_on_connection_loss", type: "bool" },
+     },
+   },
+  { id: "directories", labelKey: "prefs_directories", cat: "directories", groups: 
+    { legendKey: "prefs_group_incoming", fields: { key: "incoming_path", type: "text" } },
+    { legendKey: "prefs_group_temp", fields: { key: "temp_path", type: "text" } },
+    // Share roots are edited through /share_directories, not PATCH /preferences
+    // (which cannot carry the recursive flag each root needs): a fields-less group
+    // whose panel the `after` hook renders.
+    { legendKey: "prefs_group_shared", after: "shared_directories", fields:  },
+    { legendKey: "prefs_group_shared_options", fields: 
+      { key: "share_hidden", type: "bool" },
+      { key: "rescan_on_startup", type: "bool" },
+      { key: "follow_symlinks", type: "bool" },
+      { key: "exclude_patterns", type: "text" },
+      { key: "exclude_patterns_use_regex", type: "bool" },
+     },
+   },
+  { id: "servers", labelKey: "prefs_servers", cat: "servers", groups: 
+    { legendKey: "prefs_group_server_list", fields: 
+      { key: "remove_dead_servers", type: "bool" },
+      { key: "dead_server_retry_count", type: "int", min: 1, max: 10, sub: true, gatedBy: "remove_dead_servers" },
+      { key: "update_list_at_startup", type: "bool" },
+      { key: "update_list_from_server", type: "bool" },
+      { key: "update_list_from_client", type: "bool" },
+      { key: "update_url", type: "text",
+        action: { path: "servers_update", body: "url",
+                  titleKey: "prefs_action_servers_update",
+                  toastKey: "prefs_action_servers_update_toast" } },
+     },
+    { legendKey: "prefs_group_server_conn", fields: 
+      { key: "server_priority_system_enabled", type: "bool" },
+      { key: "smart_lowid_check_enabled", type: "bool" },
+      { key: "safe_server_connect_enabled", type: "bool" },
+      { key: "autoconnect_static_servers_only", type: "bool" },
+      { key: "manual_servers_high_priority", type: "bool" },
+     },
+    { legendKey: "prefs_group_kad", fields: 
+      { key: "update_url", type: "text", cat: "kad",
+        action: { path: "kad/update", body: "url",
+                  titleKey: "prefs_action_kad_update",
+                  toastKey: "prefs_action_kad_update_toast" } },
+     },
+   },
+  { id: "files", labelKey: "prefs_files", cat: "files", groups: 
+    { legendKey: "prefs_group_downloads", fields: 
+      { key: "add_new_downloads_paused", type: "bool" },
+      { key: "new_downloads_auto_priority_enabled", type: "bool" },
+      { key: "prioritize_first_last_chunks", type: "bool" },
+      { key: "on_finished_start_next_paused", type: "bool" },
+      { key: "on_finished_start_next_in_same_category", type: "bool", sub: true, gatedBy: "on_finished_start_next_paused" },
+      { key: "on_finished_start_next_alphabetically", type: "bool", sub: true, gatedBy: "on_finished_start_next_paused" },
+      { key: "endgame_mode_enabled", type: "bool" },
+      { key: "preallocate_full_file_size", type: "bool" },
+      { key: "create_sparse_files", type: "bool" },
+      { key: "stop_on_low_disk_space", type: "bool" },
+      { key: "min_free_space_mebibytes", type: "int", min: 1, max: 1000000, sub: true, gatedBy: "stop_on_low_disk_space" },
+      { key: "save_sources_for_rare_files", type: "bool" },
+     },
+    { legendKey: "prefs_group_uploads", fields: 
+      { key: "new_shared_files_auto_priority_enabled", type: "bool" },
+     },
+    { legendKey: "prefs_group_ich", fields: 
+      { key: "ich_enabled", type: "bool" },
+      { key: "trust_unverified_aich_hashes", type: "bool" },
+     },
+    { legendKey: "prefs_group_media", fields: 
+      { key: "media_metadata_enabled", type: "bool" },
+      { key: "ffprobe_path", type: "text", sub: true, gatedBy: "media_metadata_enabled" },
+     },
+   },
+  { id: "security", labelKey: "prefs_security", cat: "security", groups: 
+    { legendKey: "prefs_group_privacy", fields: 
+      { key: "secure_identification_enabled", type: "bool" },
+      { key: "shared_files_visibility", type: "select", int: true, options: SEE_SHARES },
+     },
+    { legendKey: "prefs_group_obfuscation", fields: 
+      { key: "protocol_obfuscation_enabled", type: "bool" },
+      { key: "obfuscation_requested", type: "bool", sub: true, gatedBy: "protocol_obfuscation_enabled" },
+      { key: "obfuscation_required", type: "bool", sub: true, gatedBy: "protocol_obfuscation_enabled" },
+     },
+    { legendKey: "prefs_group_ipfilter", fields: 
+      { key: "ipfilter_clients_enabled", type: "bool" },
+      { key: "ipfilter_servers_enabled", type: "bool" },
+      { key: "ipfilter_reload", type: "button",
+        action: { path: "ipfilter/reload",
+                  titleKey: "prefs_action_ipfilter_reload",
+                  toastKey: "prefs_action_ipfilter_reload_toast" } },
+      { key: "ipfilter_update_url", type: "text",
+        action: { path: "ipfilter/update", body: "url",
+                  titleKey: "prefs_action_ipfilter_update",
+                  toastKey: "prefs_action_ipfilter_update_toast" } },
+      { key: "ipfilter_auto_update_enabled", type: "bool" },
+      { key: "ipfilter_min_access_level", type: "int", min: 0, max: 255 },
+      { key: "ipfilter_include_lan_ips", type: "bool" },
+      { key: "reject_spoofed_source_ips", type: "bool" },
+      { key: "system_ipfilter_enabled", type: "bool" },
+     },
+   },
+  { id: "geoip", labelKey: "prefs_geoip", cat: "geoip",
+    hideWhen: (v) => v"geoip.supported" === false, groups: 
+    { legendKey: "prefs_group_geoip_db", fields: 
+      { key: "enabled", type: "bool", gatedBy: "supported" },
+      { key: "supported", type: "bool", hidden: true },
+      { key: "source", type: "select", options: GEOIP_SOURCES, sub: true, gatedBy: "supported", "enabled" },
+      { key: "custom_update_url", type: "text", sub: 2, gatedBy: "supported", "enabled", gatedByEq: { key: "source", value: "custom" } },
+      { key: "maxmind_license", type: "text", sub: 2, gatedBy: "supported", "enabled", gatedByEq: { key: "source", value: "maxmind" } },
+      { key: "auto_update_enabled", type: "bool", sub: true, gatedBy: "supported", "enabled" },
+     },
+    { legendKey: "prefs_group_geoip_status", fields: 
+      { key: "update_now", type: "button", gatedBy: "supported", "enabled",
+        action: { path: "geoip/update",
+                  titleKey: "prefs_action_geoip_update",
+                  toastKey: "prefs_action_geoip_update_toast" } },
+      { key: "download_in_progress", type: "bool", readonly: true },
+      { key: "loaded_source", type: "text", readonly: true },
+      { key: "db_path", type: "text", readonly: true },
+      { key: "db_loaded", type: "bool", readonly: true },
+      { key: "last_update_status", type: "text", readonly: true },
+     },
+   },
+  { id: "proxy", labelKey: "prefs_proxy", cat: "connection", groups: 
+    { legendKey: "prefs_group_proxy", fields: 
+      { key: "proxy_enabled", type: "bool" },
+      { key: "proxy_type", type: "select", int: true, options: PROXY_TYPES, sub: true, gatedBy: "proxy_enabled" },
+      { key: "proxy_host", type: "text", sub: true, gatedBy: "proxy_enabled" },
+      { key: "proxy_port", type: "int", min: 0, max: 65535, sub: true, gatedBy: "proxy_enabled" },
+      { key: "proxy_auth_enabled", type: "bool", sub: true, gatedBy: "proxy_enabled" },
+      { key: "proxy_user", type: "text", sub: 2, gatedBy: "proxy_enabled", "proxy_auth_enabled" },
+      { key: "proxy_password", type: "password", sub: 2, gatedBy: "proxy_enabled", "proxy_auth_enabled" },
+     },
+   },
+  { id: "message_filter", labelKey: "prefs_message_filter", cat: "message_filter", groups: 
+    { legendKey: "prefs_group_messages", fields: 
+      { key: "enabled", type: "bool" },
+      { key: "filter_all_messages", type: "bool", sub: true, gatedBy: "enabled" },
+      { key: "accept_from_friends_only", type: "bool", sub: true, gatedBy: "enabled" },
+      { key: "accept_from_known_clients_only", type: "bool", sub: true, gatedBy: "enabled" },
+      { key: "filter_by_keyword", type: "bool", sub: true, gatedBy: "enabled" },
+      { key: "keywords", type: "text", sub: 2, gatedBy: "enabled", "filter_by_keyword" },
+      { key: "log_filtered_messages", type: "bool" },
+     },
+    { legendKey: "prefs_group_comments", fields: 
+      { key: "filter_comments", type: "bool" },
+      { key: "comment_keywords", type: "text", sub: true, gatedBy: "filter_comments" },
+     },
+   },
+  // The two subsystems are nested categories in the payload
+  // (remote_controls.webserver / .amuleapi), so each group names its own cat.
+  { id: "remote_controls", labelKey: "prefs_remote_controls", cat: "remote_controls", groups: 
+    { legendKey: "prefs_group_amuleapi", after: "amuleapi_credentials", fields: 
+      { key: "enabled", type: "bool", cat: "remote_controls.amuleapi" },
+      { key: "port", type: "int", min: 0, max: 65535, sub: true, cat: "remote_controls.amuleapi", gatedBy: "enabled" },
+      { key: "bind_address", type: "text", sub: true, cat: "remote_controls.amuleapi", gatedBy: "enabled" },
+     },
+    { legendKey: "prefs_group_webserver", fields: 
+      { key: "enabled", type: "bool", cat: "remote_controls.webserver" },
+      { key: "template_name", type: "text", sub: true, cat: "remote_controls.webserver", gatedBy: "enabled" },
+      { key: "password", type: "password", sub: true, cat: "remote_controls.webserver", gatedBy: "enabled" },
+      { key: "guest_enabled", type: "bool", sub: true, cat: "remote_controls.webserver", gatedBy: "enabled" },
+      { key: "guest_password", type: "password", sub: 2, cat: "remote_controls.webserver", gatedBy: "enabled", "guest_enabled" },
+      { key: "port", type: "int", min: 0, max: 65535, sub: true, cat: "remote_controls.webserver", gatedBy: "enabled" },
+      { key: "refresh_seconds", type: "int", min: 0, sub: true, cat: "remote_controls.webserver", gatedBy: "enabled" },
+      { key: "gzip_enabled", type: "bool", sub: true, cat: "remote_controls.webserver", gatedBy: "enabled" },
+     },
+   },
+  { id: "online_signature", labelKey: "prefs_online_signature", cat: "online_signature", groups: 
+    { legendKey: "prefs_group_onlinesig", fields: 
+      { key: "enabled", type: "bool" },
+      { key: "update_frequency_seconds", type: "int", min: 0, max: 600, sub: true, gatedBy: "enabled" },
+      { key: "directory", type: "text", sub: true, gatedBy: "enabled" },
+     },
+   },
+  { id: "advanced", labelKey: "prefs_advanced", cat: "advanced", noteKey: "prefs_advanced_warning", groups: 
+    { legendKey: "prefs_group_tweaks", fields: 
+      { key: "max_new_connections_per_5_seconds", type: "int", min: 0, max: 65535 },
+      { key: "kad_max_concurrent_source_search_count", type: "int", min: 5, max: 50 },
+      { key: "kad_source_reask_minutes", type: "int", min: 30, max: 60 },
+      { key: "source_reask_minutes", type: "int", min: 15, max: 60 },
+      { key: "file_buffer_bytes", type: "int", min: 0, max: 3825000, step: 15000 },
+      { key: "mmap_enabled", type: "bool", cat: "files", gatedBy: "mmap_supported" },
+      { key: "mmap_supported", type: "bool", cat: "files", hidden: true },
+      { key: "max_upload_queue_client_count", type: "int", min: 0, max: 25500, step: 100 },
+      // Stored in ms, shown in minutes like the desktop slider (0-30).
+      { key: "server_keepalive_timeout_minutes", type: "int", min: 0, max: 30 },
+      { key: "verbose_logging", type: "bool" },
+     },
+   },
+;
+
+const catOf = (tab, f) => f.cat || tab.cat;
+const asArr = (x) => (x == null ?  : Array.isArray(x) ? x : x);
+// A category may be a dotted path into a nested payload object (e.g.
+// "remote_controls.webserver"); walk/create it on read and write.
+const catGet = (obj, cat) => cat.split(".").reduce((o, k) => (o == null ? o : ok), obj);
+const catPut = (obj, cat, key, val) => {
+  const o = cat.split(".").reduce((acc, k) => (acck || (acck = {})), obj);
+  okey = val;
+};
+// i18n keys stay flat: remote_controls.webserver + "port" ->
+// prefs_field_remote_controls_webserver_port.
+const labelKeyFor = (cat, key) => "prefs_field_" + cat.replace(/\./g, "_") + "_" + key;
+// Drop objects that ended up with no fields, innermost first, so an untouched
+// nested category never reaches the PATCH body as an empty {}.
+const pruneEmpty = (obj) => {
+  for (const k of Object.keys(obj)) {
+    if (objk && typeof objk === "object" && !Array.isArray(objk)) {
+      pruneEmpty(objk);
+      if (!Object.keys(objk).length) delete objk;
+    }
+  }
+  return obj;
+};
+// Clamp to the field's min, max before sending; floor at 0 when no min is set.
+const clamp = (n, lo, hi) => Math.min(hi == null ? Infinity : hi, Math.max(lo == null ? 0 : lo, n));
+
+// amuleapi's own credentials. Not preferences -- they live in the
+// amuleapi-passwords file, so PATCH /preferences rejects them and
+// /auth/passwords owns them. It needs the current password and re-issues the
+// session, hence its own button instead of riding the bulk Apply.
+function AmuleApiCredentials({ isGuest }) {
+  const known, setKnown = useState(null); // GET /auth/passwords; null until loaded
+  const current, setCurrent = useState("");
+  const admin, setAdmin = useState("");
+  const guestOn, setGuestOn = useState(false);
+  const guestPw, setGuestPw = useState("");
+  const busy, setBusy = useState(false);
+
+  useEffect(() => {
+    if (isGuest) return; // admin-only endpoint
+    api.get("auth/passwords")
+      .then((s) => { setKnown(s); setGuestOn(!!s.guest_access_enabled); })
+      // Stay hidden rather than guess: sending guest_access_enabled without knowing
+      // the stored state would clear a password nobody can read back.
+      .catch(() => {});
+  }, isGuest);
+
+  if (isGuest || !known) return null;
+
+  const wasGuestOn = !!known.guest_access_enabled;
+  const settingGuestPw = guestOn && guestPw !== "";
+  // Ticked guest, nothing typed, nothing stored: "keep the current" has
+  // nothing to keep.
+  const guestNeedsPw = guestOn && !wasGuestOn && guestPw === "";
+  const changed = admin !== "" || settingGuestPw || guestOn !== wasGuestOn;
+  const canSubmit = !busy && current !== "" && changed && !guestNeedsPw;
+
+  const submit = async () => {
+    // An omitted field means "leave alone": a stored password cannot be read
+    // back to resend it.
+    const body = { current_password: current };
+    if (admin !== "") body.admin_password = admin;
+    if (guestOn !== wasGuestOn) body.guest_access_enabled = guestOn;
+    if (settingGuestPw) body.guest_password = guestPw;
+    setBusy(true);
+    try {
+      const res = await api.patch("auth/passwords", body);
+      setKnown(res);
+      setGuestOn(!!res.guest_access_enabled);
+      setCurrent(""); setAdmin(""); setGuestPw("");
+      toast(t("prefs_creds_saved"), "success");
+    } catch (err) {
+      // terr has no wording for this endpoint's 403; login already owns it.
+      toast(err.code === "invalid_credentials"
+        ? t("login_err_invalid_credentials")
+        : terr(err) || t("prefs_error"), "error");
+    } finally { setBusy(false); }
+  };
+
+  // Not a <form>: it renders inside the preferences one, so Enter would
+  // otherwise fire the bulk Apply.
+  const onKeyDown = (e) => {
+    if (e.key !== "Enter") return;
+    e.preventDefault();
+    if (canSubmit) submit();
+  };
+
+  return html`
+    <div class="form-grid prefs-creds admin-only" onKeyDown=${onKeyDown}>
+      <div class="field">
+        <label for="creds_current">${t("prefs_creds_current")}</label>
+        <input class="input" id="creds_current" type="password" autocomplete="current-password"
+               value=${current} onInput=${(e) => setCurrent(e.target.value)} />
+      </div>
+      <div class="field">
+        <label for="creds_admin">${t("prefs_creds_admin")}</label>
+        <input class="input" id="creds_admin" type="password" autocomplete="new-password"
+               title=${t("prefs_creds_hint")}
+               value=${admin} onInput=${(e) => setAdmin(e.target.value)} />
+      </div>
+      <div class="field field-inline">
+        <input type="checkbox" id="creds_guest_enabled" checked=${guestOn}
+               onChange=${(e) => { setGuestOn(e.target.checked); if (!e.target.checked) setGuestPw(""); }} />
+        <label for="creds_guest_enabled" title=${t("prefs_creds_guest_hint")}>${t("prefs_creds_guest_enabled")}</label>
+      </div>
+      <div class="field field-sub">
+        <label for="creds_guest">${t("prefs_creds_guest")}</label>
+        <input class="input" id="creds_guest" type="password" autocomplete="new-password"
+               disabled=${!guestOn} title=${t("prefs_creds_hint")}
+               value=${guestPw} onInput=${(e) => setGuestPw(e.target.value)} />
+        ${guestNeedsPw ? html`<p class="hint">${t("prefs_creds_guest_needs_password")}</p>` : null}
+      </div>
+      <div class="toolbar">
+        <button class="btn btn-primary" type="button" disabled=${!canSubmit}
+                onClick=${submit}>${t("prefs_creds_apply")}</button>
+      </div>
+    </div>`;
+}
+
+// Client-only settings kept in the browser (localStorage), not /preferences.
+// The selects only stage changes; the tab's Apply button commits them all at
+// once. Rendered inside the prefs <form>, so buttons are type="button".
+function WebUiSettings({ lang, theme, range, onLang, onTheme, onRange }) {
+  const reset = async () => {
+    if (!(await confirmDialog(t("prefs_webui_reset_confirm")))) return;
+    clearPrefs();
+    location.reload();
+  };
+  return html`
+    <fieldset>
+      <legend>${t("prefs_group_webui")}</legend>
+      <div class="form-grid">
+        <div class="field">
+          <label for="webui_lang">${t("app_language")}</label>
+          <select id="webui_lang" value=${lang} onChange=${(e) => onLang(e.target.value)}>
+            ${LANGS.map((c) => html`<option value=${c}>${langName(c)}</option>`)}
+          </select>
+        </div>
+        <div class="field">
+          <label for="webui_theme">${t("app_theme")}</label>
+          <select id="webui_theme" value=${theme} onChange=${(e) => onTheme(e.target.value)}>
+            <option value="system">${t("app_theme_system")}</option>
+            <option value="light">${t("app_theme_light")}</option>
+            <option value="dark">${t("app_theme_dark")}</option>
+          </select>
+        </div>
+        <div class="field">
+          <label for="webui_graph_range">${t("prefs_graph_range")}</label>
+          <select id="webui_graph_range" value=${String(range)} onChange=${(e) => onRange(Number(e.target.value))}>
+            ${GRAPH_RANGES.map((r) => html`<option value=${String(r.interval)}>${t(r.labelKey)}</option>`)}
+          </select>
+        </div>
+      </div>
+    </fieldset>
+    <fieldset>
+      <legend>${t("prefs_group_webui_reset")}</legend>
+      <p class="hint">${t("prefs_webui_reset_hint")}</p>
+      <div class="toolbar webui-reset-actions">
+        <button class="btn btn-primary" type="button" onClick=${reset}>${t("prefs_webui_reset")}</button>
+      </div>
+    </fieldset>`;
+}
+
+export default function Preferences({ isGuest }) {
+  const loaded, setLoaded = useState(false);
+  const error, setError = useState("");
+  const values, setValues = useState({}); // "cat.key" -> value (display units)
+  const active, setActive = useState("webui");
+  const busy, setBusy = useState(false);
+  // Staged WebUI (browser) settings; committed by applyWebui.
+  const webuiLang, setWebuiLang = useState(getLang());
+  const webuiTheme, setWebuiTheme = useState(getTheme());
+  const webuiRange, setWebuiRange = useState(loadGraphInterval());
+
+  useEffect(() => {
+    api.get("preferences").then((p) => {
+      const v = {};
+      for (const tab of TABS)
+        for (const grp of tab.groups)
+          for (const f of grp.fields) {
+            if (f.type === "button") continue;
+            const cat = catOf(tab, f);
+            let val = (catGet(p, cat) || {})f.key;
+            if (f.type === "textarea" && Array.isArray(val)) val = val.join("\n");
+            else if (f.scale && typeof val === "number") val = Math.round(val / f.scale);
+            vcat + "." + f.key = val;
+          }
+      setValues(v);
+      setLoaded(true);
+    }).catch((e) => setError(terr(e) || t("prefs_error")));
+  }, );
+
+  // Gecko leaves blank rows in the multicol .prefs-groups after its subtree is
+  // re-rendered in place (#1330): force a repaint on every subtree change (tab
+  // switch, async SharedDirectories load). column-count "4" never matches a
+  // breakpoint so it always reflows; the offsetHeight read flushes it.
+  useEffect(() => {
+    if (!loaded) return;
+    const g = document.querySelector(".prefs-groups");
+    if (!g) return;
+    const repaint = () => {
+      g.style.columnCount = "4";
+      void g.offsetHeight;
+      g.style.columnCount = "";
+    };
+    repaint();
+    const mo = new MutationObserver(repaint);
+    mo.observe(g, { childList: true, subtree: true });
+    return () => mo.disconnect();
+  }, loaded);
+
+  const setVal = (id, val) => setValues((vs) => ({ ...vs, id: val }));
+
+  // gatedBy: disable when any listed flag is explicitly false (capability flags
+  // or an "enable" parent); a missing flag (older daemon) leaves it editable.
+  // gatedByNot: disable when any listed flag is true (an inverted parent shown
+  // as an "Enable ..." checkbox).
+  // gatedByEq: enable only when a sibling equals a value (e.g. show the MaxMind
+  // license only when source === "maxmind"); disabled otherwise.
+  const isGated = (cat, f) =>
+    asArr(f.gatedBy).some((k) => valuescat + "." + k === false) ||
+    asArr(f.gatedByNot).some((k) => valuescat + "." + k === true) ||
+    (f.gatedByEq && valuescat + "." + f.gatedByEq.key !== f.gatedByEq.value);
+
+  const buildField = (cat, f) => {
+    if (f.hidden) return null;
+    const id = cat + "." + f.key;
+    const val = f.derived ? f.derived(values, cat) : valuesid;
+    const label = t(f.labelKey || labelKeyFor(cat, f.key));
+    const disabled = isGuest || f.readonly || isGated(cat, f);
+    const subCls = f.sub === 2 ? " field-sub2" : f.sub ? " field-sub" : "";
+
+    // A pure action: no value, no state, never collected. The label is the
+    // button's own text, so the row needs no separate <label>.
+    if (f.type === "button") {
+      // .admin-only on the row, not the button: a guest sees no empty grid
+      // cell where the action would have been, which is how the text fields'
+      // action buttons already behave (they are simply not rendered).
+      return html`
+        <div class=${"field field-inline admin-only" + subCls}>
+          <button class="btn btn-primary" type="button" disabled=${disabled}
+                  title=${t(f.action.titleKey)} onClick=${() => runAction(f.action)}>
+            ${label}
+          </button>
+        </div>`;
+    }
+    if (f.type === "bool") {
+      // invert: the API stores the opposite sense but we show an "Enable ..."
+      // checkbox. State keeps the API value; only the checkbox's checked state
+      // and its toggle are flipped.
+      const checked = f.invert ? !val : !!val;
+      return html`
+        <div class=${"field field-inline" + subCls}>
+          <input type="checkbox" id=${id} checked=${checked} disabled=${disabled}
+                 onChange=${(e) => setVal(id, f.invert ? !e.target.checked : e.target.checked)} />
+          <label for=${id}>${label}</label>
+        </div>`;
+    }
+    if (f.type === "select") {
+      return html`
+        <div class=${"field" + subCls}>
+          <label for=${id}>${label}</label>
+          <select id=${id} disabled=${disabled}
+                  value=${val == null ? "" : String(val)}
+                  onChange=${(e) => setVal(id, e.target.value)}>
+            ${f.options.map((o) => html`<option value=${String(o.value)}>${t(o.labelKey)}</option>`)}
+          </select>
+        </div>`;
+    }
+    if (f.type === "textarea") {
+      return html`
+        <div class=${"field field-wide" + subCls}>
+          <label for=${id}>${label}</label>
+          <textarea id=${id} rows="4" disabled=${disabled}
+                    value=${val == null ? "" : val} onInput=${(e) => setVal(id, e.target.value)}></textarea>
+        </div>`;
+    }
+    const input = html`
+      <input class="input" id=${id} disabled=${disabled}
+             type=${f.type === "int" ? "number" : f.type === "password" ? "password" : "text"}
+             autocomplete=${f.type === "password" ? "new-password" : null}
+             min=${f.min} max=${f.max} step=${f.step}
+             value=${val === undefined || val === null ? "" : val} onInput=${(e) => setVal(id, e.target.value)} />`;
+    return html`
+      <div class=${"field" + subCls}>
+        <label for=${id}>${label}</label>
+        ${f.action && !disabled ? html`
+          <div class="field-action">
+            ${input}
+            <button class="btn btn-icon btn-primary" type="button" title=${t(f.action.titleKey)}
+                    onClick=${() => runAction(f.action, valuesid)}>
+              <${Icon} name="downloads" />
+            </button>
+          </div>` : input}
+      </div>`;
+  };
+
+  // The endpoint takes the URL directly and persists it itself, so this fires
+  // the download with whatever is typed -- no Apply first, no PATCH here.
+  // An action with no `body` carries no value at all (Reload): POST and done.
+  const runAction = async (a, val) => {
+    let body;
+    if (a.body) {
+      const url = String(val == null ? "" : val).trim();
+      if (!url) { toast(t("prefs_action_enter_url"), "warn"); return; }
+      body = { a.body: url };
+    }
+    try { await api.post(a.path, body); toast(t(a.toastKey), "success"); }
+    catch (err) { toast(terr(err) || t("prefs_error"), "error"); }
+  };
+
+  const collect = () => {
+    const body = {};
+    for (const tab of TABS) {
+      for (const grp of tab.groups) {
+        for (const f of grp.fields) {
+          const cat = catOf(tab, f);
+          if (f.type === "button" || f.hidden || f.readonly || isGated(cat, f)) continue;
+          const val = valuescat + "." + f.key;
+          let out;
+          if (f.type === "password") {
+            if (typeof val !== "string" || val === "") continue;
+            out = val;
+          } else if (f.type === "textarea") {
+            out = String(val || "").split("\n").map((s) => s.trim()).filter(Boolean);
+          } else if (f.type === "select") {
+            out = val == null ? "" : val;
+          } else if (f.type === "bool") {
+            out = !!val;
+          } else if (f.type === "int") {
+            let n = clamp(f.scale ? (parseFloat(val) || 0) : (parseInt(val, 10) || 0), f.min, f.max);
+            // Snap to the granularity the core stores at. These fields are
+            // backed by a uint8 the daemon multiplies back up, so the API
+            // rejects a value between two steps rather than truncating it;
+            // rounding here means the form cannot produce that 400.
+            if (f.step) n = clamp(Math.round(n / f.step) * f.step, f.min, f.max);
+            out = Math.round(n * (f.scale || 1));
+          } else {
+            out = val == null ? "" : val;
+          }
+          catPut(body, cat, f.key, out);
+        }
+      }
+    }
+    return pruneEmpty(body);
+  };
+
+  const save = async (e) => {
+    e.preventDefault();
+    setBusy(true);
+    try { await api.patch("preferences", collect()); toast(t("prefs_toast_saved"), "success"); }
+    catch (err) { toast(terr(err) || t("prefs_error"), "error"); }
+    finally { setBusy(false); }
+  };
+
+  // Commit staged WebUI settings: theme applies live; the graph range is read
+  // by the Stats/Networks views when they next mount; a language change reloads
+  // to re-resolve module-level t() (so the toast only shows when it doesn't).
+  const applyWebui = () => {
+    setTheme(webuiTheme);
+    saveGraphInterval(webuiRange);
+    if (webuiLang !== getLang()) { setLang(webuiLang); return; }
+    toast(t("prefs_toast_saved"), "success");
+  };
+
+  if (error) return html`<p>${error}</p>`;
+  if (!loaded) return html`<${Placeholder} kind="loading">${t("prefs_loading")}<//>`;
+
+  const shownTabs = TABS.filter((s) => !s.hideWhen || !s.hideWhen(values));
+  const tab = shownTabs.find((s) => s.id === active) || shownTabs0;
+  const tabList = shownTabs.map((s) => ({ key: s.id, label: t(s.labelKey) }));
+  return html`
+    <form onSubmit=${save} class="net-pane">
+      <${Tabs} tabs=${tabList} active=${active} onSelect=${setActive} />
+      <div class="net-pane-body prefs-panel">
+        ${tab.noteKey ? html`<p class="hint prefs-warning">${t(tab.noteKey)}</p>` : null}
+        <div class="prefs-groups">
+          ${tab.webui ? html`<${WebUiSettings} lang=${webuiLang} theme=${webuiTheme} range=${webuiRange}
+                                               onLang=${setWebuiLang} onTheme=${setWebuiTheme} onRange=${setWebuiRange} />`
+            : tab.groups.map((grp) => html`
+            <fieldset>
+              <legend>${t(grp.legendKey)}</legend>
+              <div class="form-grid">${grp.fields.map((f) => buildField(catOf(tab, f), f))}</div>
+              ${grp.after === "amuleapi_credentials"
+                ? html`<${AmuleApiCredentials} isGuest=${isGuest} />` : null}
+              ${grp.after === "shared_directories"
+                ? html`<${SharedDirectories} isGuest=${isGuest} />` : null}
+            </fieldset>`)}
+        </div>
+        ${tab.webui
+          ? html`<div class="toolbar prefs-actions"><button class="btn btn-primary" type="button" onClick=${applyWebui}>${t("prefs_apply")}</button></div>`
+          : isGuest
+          ? html`<p class="hint">${t("prefs_guest_readonly")}</p>`
+          : html`<div class="toolbar prefs-actions"><button class="btn btn-primary admin-only" type="submit" disabled=${busy}>${t("prefs_apply")}</button></div>`}
+      </div>
+    </form>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/search.js Added

@@ -0,0 +1,428 @@
+// Search view: one tab per search, like the desktop's notebook. The rendering
+// half only -- which searches are open, their results and their per-tab UI
+// live in ../searches.js, because this view unmounts whenever the user
+// navigates to another section and the tabs have to survive that.
+
+import { api } from "../api.js";
+import { html, useState, useEffect, useStore } from "../dom.js";
+import { Badge, checkCell, listPlaceholder, Tabs, CommentsList, ratingLabel, toast } from "../components.js";
+import { VirtualTable, sortRows, textMatcher, useTablePrefs, ColumnPicker } from "../table.js";
+import { formatBytes, formatDuration, formatInt, fileTypeLabel } from "../format.js";
+import { Icon } from "../icons.js";
+import { searches } from "../searches.js";
+import { categoryOptions } from "./categories.js";
+import { t, tn, terr } from "../i18n.js";
+
+const SIZE_UNITS = { B: 1, KiB: 1024, MiB: 1048576, GiB: 1073741824 };
+// The file_type tokens the API rows report and accept as a filter; amuleapi
+// maps them to the ed2k terms. "" = any type.
+const FILE_TYPES = "", "audio", "video", "picture", "text", "program", "archive", "disc_image";
+// A tab is as wide as its label, so a long query gets cut; the full string
+// stays in the tab's title attribute.
+const TAB_LABEL_MAX = 24;
+
+export default function Search({ isGuest }) {
+  const query, setQuery = useState("");
+  const type, setType = useState("global");
+  const fileType, setFileType = useState("");
+  const ext, setExt = useState("");
+  const minAvail, setMinAvail = useState("");
+  const minSize, setMinSize = useState("");
+  const minUnit, setMinUnit = useState("MiB");
+  const maxSize, setMaxSize = useState("");
+  const maxUnit, setMaxUnit = useState("MiB");
+  const categories, setCategories = useState();
+
+  // The registry publishes the light tab list; the heavy results array rides
+  // its own key, consumed by the pane below.
+  const reg = useStore("searches") || { tabs: , activeId: 0 };
+  const active = reg.tabs.find((x) => x.id === reg.activeId) || null;
+
+  useEffect(() => {
+    // Idempotent: attaches the stream routing and adopts whatever the daemon
+    // already holds (this browser's searches, another client's, or ones
+    // restored across a restart).
+    searches.ensure();
+    // An unopened tab has no amuleapi slot, so no SSE refreshes its badge --
+    // re-list on every mount instead. Debounced, so the first one is free.
+    searches.nudgeAdopt();
+    api.list("categories").then((r) => setCategories(r.categories || )).catch(() => {});
+  }, );
+
+  const sizeBytes = (v, unit) => { const n = Number(v); return (!n || n < 0) ? 0 : Math.round(n * SIZE_UNITSunit); };
+
+  const startSearch = async (e) => {
+    e.preventDefault();
+    const q = query.trim();
+    if (!q) { toast(t("search_toast_enter_search_terms"), "warn"); return; }
+    const body = { query: q, type };
+    if (fileType) body.file_type = fileType;
+    if (ext.trim()) body.extension = ext.trim();
+    if (Number(minAvail) > 0) body.min_source_count = Number(minAvail);
+    const mn = sizeBytes(minSize, minUnit), mx = sizeBytes(maxSize, maxUnit);
+    if (mn) body.min_size_bytes = mn;
+    if (mx) body.max_size_bytes = mx;
+    try {
+      // Every start opens its own tab; the query stays in the box so refining
+      // and re-running is one edit.
+      await searches.start(body);
+      toast(t("search_toast_search_started"), "success");
+    } catch (err) { toast(terr(err) || t("search_error"), "error"); }
+  };
+
+  const unitSelect = (value, onChange) => html`
+    <select class="input input-sm" name="size_unit" value=${value} onChange=${onChange}>
+      ${Object.keys(SIZE_UNITS).map((u) => html`<option value=${u}>${u}</option>`)}
+    </select>`;
+
+  const tabItems = reg.tabs.map((x) => {
+    const full = x.label || x.query || ("#" + x.id);
+    return {
+      key: String(x.id),
+      label: full.length > TAB_LABEL_MAX ? full.slice(0, TAB_LABEL_MAX - 1) + "…" : full,
+      title: full + " · " + t("search_type_" + x.kind),
+      badge: x.count,
+      cls: x.state === "running" ? "running" : "",
+      closeLabel: t("search_tab_close"),
+    };
+  });
+
+  return html`
+    <div class="fill-view">
+    <form class="card search-form" onSubmit=${startSearch}>
+      <div class="search-grid">
+        ${field(t("search_query"), html`<input class="input" name="query" type="text" placeholder=${t("search_terms_ph")} required value=${query} onInput=${(e) => setQuery(e.target.value)} />`, "field-wide")}
+        ${field(t("search_type"), html`<select class="input" name="search_type" value=${type} onChange=${(e) => setType(e.target.value)}>
+          <option value="global">${t("search_type_global")}</option><option value="local">${t("search_type_local")}</option><option value="kad">${t("search_type_kad")}</option>
+        </select>`)}
+        ${field(t("search_file_type"), html`<select class="input" name="search_file_type" value=${fileType} onChange=${(e) => setFileType(e.target.value)}>
+          ${FILE_TYPES.map((v) => html`<option value=${v}>${v ? fileTypeLabel(v) : t("search_ftype_any")}</option>`)}
+        </select>`)}
+        ${field(t("search_extension"), html`<input class="input" name="search_extension" type="text" placeholder=${t("search_ext_ph")} value=${ext} onInput=${(e) => setExt(e.target.value)} />`)}
+        ${field(t("search_min_availability"), html`<input class="input" name="search_min_availability" type="number" min="0" placeholder="0" value=${minAvail} onInput=${(e) => setMinAvail(e.target.value)} />`)}
+        ${field(t("search_min_size"), html`<div class="field-inline">
+          <input class="input" name="search_min_size" type="number" min="0" value=${minSize} onInput=${(e) => setMinSize(e.target.value)} />
+          ${unitSelect(minUnit, (e) => setMinUnit(e.target.value))}
+        </div>`)}
+        ${field(t("search_max_size"), html`<div class="field-inline">
+          <input class="input" name="search_max_size" type="number" min="0" value=${maxSize} onInput=${(e) => setMaxSize(e.target.value)} />
+          ${unitSelect(maxUnit, (e) => setMaxUnit(e.target.value))}
+        </div>`)}
+      </div>
+      <div class="toolbar">
+        <button class="btn btn-primary admin-only" type="submit">${t("search_search")}</button>
+      </div>
+      ${isGuest ? html`<p class="hint">${t("search_guest_readonly")}</p>` : null}
+    </form>
+
+    ${active ? html`
+    <section class="net-pane pane-fill">
+      <${Tabs} tabs=${tabItems} active=${String(reg.activeId)}
+               onSelect=${(k) => searches.setActive(Number(k))}
+               onClose=${(k) => searches.close(Number(k))}
+               extra=${reg.tabs.length > 1 ? html`
+                 <button class="btn btn-sm admin-only" type="button"
+                         onClick=${() => searches.closeAll()}>${t("search_close_all")}</button>` : null} />
+      <div class="net-pane-body">
+        <${ResultsPane} key=${active.id} tab=${active} categories=${categories} />
+      </div>
+    </section>` : null}
+    </div>`;
+}
+
+// One search's results. Keyed on the tab, so switching tabs starts clean (no
+// dialog left open on a hit from the search you just left) -- everything worth
+// keeping already lives in the registry. Column prefs are stored per KIND: a
+// browse listing leads with the remote folder, a query listing with sources.
+function ResultsPane({ tab, categories }) {
+  const rows = useStore("search:" + tab.id) || ;
+  const commentsFor, setCommentsFor = useState(null);
+  const browse = tab.kind === "browse";
+  const { sortKey, sortDir, hidden, widths, toggleSort, toggleCol, setWidth, resetPrefs } =
+    useTablePrefs(browse ? "search-browse" : "search", browse
+      ? { sortKey: "directory", sortDir: 1, hidden: "sources", "rating", "status", "length", "bitrate_kilobits_per_second", "codec", "artist", "album", "media_title" }
+      : { sortKey: "sources", sortDir: -1, hidden: "directory", "length", "bitrate_kilobits_per_second", "codec", "artist", "album", "media_title" });
+
+  // Selection, filters and per-row choices belong to the TAB, not to this
+  // component: switching tabs and coming back must restore them.
+  const ui = searches.ui(tab.id) || { selection: new Set(), filter: "", filterHave: "all", cat: 0, rowCat: {}, rowEcid: {} };
+  const setUi = (patch) => searches.setUi(tab.id, patch);
+  // Per-row category, falling back to the tab's toolbar default.
+  const catFor = (h) => (ui.rowCath != null ? ui.rowCath : Number(ui.cat) || 0);
+
+  const visible = (all, filter, filterHave) => {
+    const m = textMatcher(filter);
+    let out = filter
+      ? all.filter((r) => m(r.name) || m(r.media?.artist) || m(r.media?.album) || m(r.media?.title))
+      : all;
+    if (filterHave !== "all") out = out.filter((r) => (filterHave === "have") === !!r.already_downloaded);
+    return out;
+  };
+  const filtered = visible(rows, ui.filter, ui.filterHave);
+
+  // A hidden row must not stay selected: "Download selected" would queue a
+  // file the user cannot see. Prune as the filter changes rather than after.
+  const prune = (sel, all) => {
+    const vis = new Set(all.map((r) => r.hash));
+    const next = new Set();
+    sel.forEach((h) => vis.has(h) && next.add(h));
+    return next;
+  };
+  const setFilter = (v) => setUi({ filter: v, selection: prune(ui.selection, visible(rows, v, ui.filterHave)) });
+  const setFilterHave = (v) => setUi({ filterHave: v, selection: prune(ui.selection, visible(rows, ui.filter, v)) });
+
+  const toggleRow = (hash, checked) => {
+    const next = new Set(ui.selection);
+    if (checked) next.add(hash); else next.delete(hash);
+    setUi({ selection: next });
+  };
+  const toggleAll = (checked) => setUi({ selection: checked ? new Set(filtered.map((r) => r.hash)) : new Set() });
+
+  const allSelected = filtered.length > 0 && filtered.every((r) => ui.selection.has(r.hash));
+  const selectedCount = filtered.filter((r) => ui.selection.has(r.hash)).length;
+
+  const downloadBody = (hash) => {
+    const body = { category_index: catFor(hash) };
+    // A grouped child is picked by its own ecid, which is what queues the file
+    // under that advertised name instead of the aggregated one.
+    const ecid = ui.rowEcidhash;
+    if (ecid) body.ecid = Number(ecid);
+    return body;
+  };
+  const afterDownload = () => searches.refresh(tab.id); // status/already_downloaded only move on a read
+
+  const downloadSelected = async () => {
+    const hashes = Array.from(ui.selection);
+    if (!hashes.length) { toast(t("search_toast_no_results_selected"), "warn"); return; }
+    try {
+      await Promise.all(hashes.map((h) => api.post("search/results/" + h + "/download", downloadBody(h))));
+      toast(tn("search_toast_added_downloads", hashes.length), "success");
+      setUi({ selection: new Set() });
+      afterDownload();
+    } catch (e) { toast(terr(e) || t("search_error"), "error"); }
+  };
+
+  const downloadOne = async (h) => {
+    try {
+      await api.post("search/results/" + h + "/download", downloadBody(h));
+      toast(tn("search_toast_added_downloads", 1), "success");
+      afterDownload();
+    } catch (e) { toast(terr(e) || t("search_error"), "error"); }
+  };
+
+  const relatedSearch = async () => {
+    const hashes = Array.from(ui.selection);
+    if (!hashes.length) { toast(t("search_toast_no_results_selected"), "warn"); return; }
+    // One search over every selected hit, as the desktop does. Naming the tab
+    // after one of several files would be a lie, so past one it counts them.
+    const first = rows.find((r) => r.hash === hashes0);
+    const label = hashes.length === 1 && first ? first.name
+      : t("search_related_tab_fmt", { count: hashes.length });
+    try { await searches.related(hashes, label); }
+    catch (e) { toast(terr(e) || t("search_error"), "error"); }
+  };
+
+  const columns = 
+    { always: true, cls: "check", width: "40px",
+      label: checkCell(allSelected, toggleAll, t("search_select_all")),
+      cell: (r) => checkCell(ui.selection.has(r.hash), (v) => toggleRow(r.hash, v)) },
+    { key: "name", always: true, label: t("search_name"), cls: "name", sortable: true,
+      sortVal: (r) => (r.name || "").toLowerCase(),
+      // already_downloaded is signalled by the row background (.row-have), not a badge.
+      // A hit advertised under several filenames picks one here, and that is
+      // what the download uses -- single row and bulk alike, via the ecid.
+      cell: (r) => {
+        // The core names a group after its most-sourced child
+        // (CSearchFile::UpdateParent), so one child always repeats the parent's
+        // name; the default option below already IS that name.
+        const kids = (r.alternate_names || ).filter((c) => c.name !== r.name);
+        if (!kids.length) return r.name;
+        return html`
+          <select class="input input-sm name-select" name="alt_name" title=${t("search_alt_names_title")}
+                  value=${ui.rowEcidr.hash || ""}
+                  onChange=${(e) => setUi({ rowEcid: { ...ui.rowEcid, r.hash: e.target.value } })}>
+            <option value="">${r.name}</option>
+            ${kids.map((c) => html`<option value=${c.ecid}>${c.name}</option>`)}
+          </select>`;
+      } },
+    { key: "size", label: t("search_size"), num: true, width: "110px", sortable: true,
+      sortVal: (r) => r.size_bytes || 0, cell: (r) => formatBytes(r.size_bytes) },
+    { key: "sources", label: t("search_sources"), num: true, width: "120px", sortable: true,
+      sortVal: (r) => (r.sources && r.sources.total) || 0,
+      // Total, plus the complete count in parentheses only when there IS one,
+      // like the desktop (SearchListModel.cpp:242-246). A Kad hit never carries
+      // one -- only ed2k servers send FT_COMPLETE_SOURCES -- so a fixed "0 / N"
+      // would print a zero meaning "unknown", not "none".
+      cell: (r) => {
+        const src = r.sources || {};
+        const total = src.total || 0, complete = src.complete || 0;
+        const tip = complete ? t("search_title_sources_fmt", { total, complete }) : t("search_title_sources_total");
+        const text = complete ? total + " (" + complete + ")" : String(total);
+        return html`<span title=${tip}>${text}</span>`;
+      } },
+    { key: "rating", label: t("search_rating"), num: true, width: "90px", sortable: true,
+      sortVal: (r) => r.rating || 0,
+      // 0 means "nobody rated this", not "rated zero", so it renders as "—"
+      // (the desktop blanks the cell, SearchListModel.cpp:268-277). A Kad hit is
+      // always 0: TAG_FILERATING rides a Kad *note*, not a keyword result, so a
+      // rating only ever surfaces per-comment in the ratings dialog.
+      cell: (r) => (r.rating ? html`<span title=${ratingLabel(r.rating)}>${r.rating}</span>` : "—") },
+    { key: "type", label: t("search_type"), width: "100px", sortable: true,
+      sortVal: (r) => r.file_type || "", cell: (r) => fileTypeLabel(r.file_type) },
+    { key: "status", label: t("downloads_status_label"), width: "120px", sortable: true,
+      sortVal: (r) => r.status || "", cell: (r) => searchStatusBadge(r.status) },
+    // Browse-only: the folder inside the peer's share, empty on every
+    // server/Kad hit. Sorts folder-then-name, like the desktop.
+    { key: "directory", label: t("search_directory"), width: "180px", sortable: true,
+      sortVal: (r) => ((r.directory || "") + "/" + (r.name || "")).toLowerCase(),
+      cell: (r) => html`<span title=${r.directory}>${r.directory || "—"}</span>` },
+    { key: "length", label: t("downloads_detail_media_length"), num: true, width: "100px", sortable: true,
+      sortVal: (r) => (r.media && r.media.duration_seconds) || 0,
+      cell: (r) => (r.media && r.media.duration_seconds) ? formatDuration(r.media.duration_seconds) : "" },
+    { key: "bitrate_kilobits_per_second", label: t("downloads_detail_media_bitrate"), num: true, width: "90px", sortable: true,
+      sortVal: (r) => (r.media && r.media.bitrate_kilobits_per_second) || 0,
+      cell: (r) => (r.media && r.media.bitrate_kilobits_per_second) ? formatInt(r.media.bitrate_kilobits_per_second) : "" },
+    { key: "codec", label: t("downloads_detail_media_codec"), width: "90px", sortable: true,
+      sortVal: (r) => (r.media && r.media.codec) || "", cell: (r) => (r.media && r.media.codec) || "" },
+    { key: "artist", label: t("downloads_detail_media_artist"), width: "130px", sortable: true,
+      sortVal: (r) => (r.media && r.media.artist) || "", cell: (r) => (r.media && r.media.artist) || "" },
+    { key: "album", label: t("downloads_detail_media_album"), width: "130px", sortable: true,
+      sortVal: (r) => (r.media && r.media.album) || "", cell: (r) => (r.media && r.media.album) || "" },
+    { key: "media_title", label: t("downloads_detail_media_title"), width: "150px", sortable: true,
+      sortVal: (r) => (r.media && r.media.title) || "", cell: (r) => (r.media && r.media.title) || "" },
+    { key: "actions", label: t("search_actions"), cls: "row-actions", width: "220px",
+      cell: (r) => html`
+        <span class="admin-only">
+          <select class="input input-sm" name="category" value=${catFor(r.hash)}
+                  onChange=${(e) => setUi({ rowCat: { ...ui.rowCat, r.hash: Number(e.target.value) } })}>
+            ${categoryOptions(categories)}
+          </select>
+          <button class="btn btn-icon btn-sm" type="button" title=${t("search_download")} onClick=${() => downloadOne(r.hash)}>
+            <${Icon} name="downloads" />
+          </button>
+        </span>
+        <button class="btn btn-icon btn-sm" type="button" title=${t("search_comments")} onClick=${() => setCommentsFor(r)}>
+          <${Icon} name="star" />
+        </button>` },
+  ;
+
+  const list = sortRows(filtered, columns, sortKey, sortDir);
+  // sortRows keeps the full column set (it looks columns up by key); only the
+  // VirtualTable is fed the visible subset.
+  const shown = columns.filter((c) => !c.key || !hidden.has(c.key));
+  const rowClass = (r) => {
+    const c = ;
+    if (ui.selection.has(r.hash)) c.push("row-selected");
+    if (r.already_downloaded) c.push("row-have");
+    return c.join(" ");
+  };
+
+  const running = tab.state === "running";
+  // Toolbar split like the Shared Files one: selection actions left of the
+  // rule, search actions right of it. The rule is admin-only so it goes away
+  // with the group it separates instead of leading a guest's toolbar.
+  // Extend greys out rather than hiding, like Stop, and its title names which
+  // of the three conditions is in the way -- the last being the daemon having
+  // told us this search can no longer be widened (409 kad_more_exhausted).
+  const canExtend = tab.kind === "kad" && running && !tab.moreExhausted;
+  const extendTitle = tab.kind !== "kad" ? t("search_extend_kad_only")
+    : !running ? t("search_extend_finished")
+    : tab.moreExhausted ? t("search_extend_exhausted")
+    : t("search_extend_title");
+  return html`
+    <div class="toolbar pane-toolbar">
+      <select class="input input-sm admin-only" name="category" value=${Number(ui.cat) || 0}
+              onChange=${(e) => setUi({ cat: Number(e.target.value) })}>
+        ${categoryOptions(categories)}
+      </select>
+      <button class="btn btn-sm admin-only" type="button" onClick=${downloadSelected}>${t("search_download")}</button>
+      <button class="btn btn-sm admin-only" type="button" onClick=${relatedSearch}
+              title=${t("search_related_title")}>${t("search_related")}</button>
+      <span class="selected-count admin-only">${t("search_selected")} ${selectedCount}</span>
+      <span class="vsep admin-only" aria-hidden="true"></span>
+      <button class="btn btn-sm admin-only" type="button" disabled=${!running}
+              onClick=${() => searches.stop(tab.id)}>${t("search_stop")}</button>
+      <button class="btn btn-sm admin-only" type="button" disabled=${!canExtend}
+              title=${extendTitle} onClick=${() => searches.more(tab.id)}>${t("search_extend")}</button>
+      <button class="btn btn-sm" type="button" onClick=${() => searches.refresh(tab.id)}>${t("search_update_results")}</button>
+      <span class="search-progress">${running ? t("search_searching_fmt", { percent: tab.percent || 0 }) : ""}</span>
+      <div class="spacer"></div>
+      <select class="input input-sm" name="have_filter" value=${ui.filterHave} onChange=${(e) => setFilterHave(e.target.value)}>
+        <option value="all">${t("downloads_status_all")}</option>
+        <option value="not_have">${t("search_have_no")}</option>
+        <option value="have">${t("search_have_yes")}</option>
+      </select>
+      <input class="input input-sm" name="filter" type="text" placeholder=${t("search_filter")} value=${ui.filter} onInput=${(e) => setFilter(e.target.value)} />
+      <${ColumnPicker} columns=${columns} hidden=${hidden} onToggle=${toggleCol} onReset=${resetPrefs} />
+    </div>
+
+    <${VirtualTable} columns=${shown} rows=${list} rowKey=${(r) => r.hash} rowClass=${rowClass}
+                     sortKey=${sortKey} sortDir=${sortDir} onSort=${toggleSort}
+                     widths=${widths} onResize=${setWidth}
+                     maxHeight="none"
+                     empty=${listPlaceholder(running, t("search_empty"))} />
+    ${commentsFor ? html`<${ResultComments} result=${commentsFor} onClose=${() => setCommentsFor(null)} />` : null}`;
+}
+
+// Kad ratings/comments for one search hit. POLLING is the only way to see the
+// notes land: comments_updated fires for downloads only, never for a search
+// hit. amuleapi refreshes the owning search on read, so this also works on a
+// finished search -- which is when a user actually reads a result list.
+function ResultComments({ result, onClose }) {
+  const d, setD = useState(null);
+  const nonce, setNonce = useState(0);
+
+  useEffect(() => {
+    let alive = true, timer = 0, tries = 0;
+    const load = () => api.get("search/results/" + result.hash + "/comments")
+      .then((x) => {
+        if (!alive) return;
+        setD(x);
+        // Capped: the Kad lookup lives ~45 s, so a stuck flag must not poll
+        // for ever.
+        if (x.kad_comment_lookup_running && tries++ < 30) timer = setTimeout(load, 2000);
+      })
+      .catch(() => { if (alive) setD({ count: 0, comments:  }); });
+    load();
+    return () => { alive = false; clearTimeout(timer); };
+  }, result.hash, nonce);
+
+  const running = !!(d && d.kad_comment_lookup_running);
+  const list = (d && d.comments) || ;
+  const getKad = () => api.post("search/results/" + result.hash + "/comments")
+    .then(() => { toast(t("comments_kad_started"), "info"); setNonce((n) => n + 1); })
+    .catch((e) => toast(e.code === "amuled_rejected" ? t("comments_kad_error") : terr(e), "error"));
+
+  return html`
+    <div class="modal-overlay" onClick=${(e) => { if (e.target === e.currentTarget) onClose(); }}>
+      <div class="modal modal-wide">
+        <div class="modal-header">
+          <h3 title=${result.name}>${result.name}</h3>
+        </div>
+        <div class="comments-head">
+          <span class="comments-count">${tn("comments_count", list.length)}</span>
+          <button class="btn btn-sm admin-only" type="button" onClick=${getKad} disabled=${running}>
+            <${Icon} name=${running ? "polling" : "kad"} />
+            ${running ? t("comments_kad_searching") : t("comments_get_kad")}
+          </button>
+        </div>
+        <${CommentsList} comments=${list} />
+        <div class="modal-actions">
+          <button class="btn" type="button" onClick=${onClose}>${t("common_close")}</button>
+        </div>
+      </div>
+    </div>`;
+}
+
+function field(label, control, cls = "") {
+  return html`<div class=${"field " + cls}><label>${label}</label>${control}</div>`;
+}
+
+// Search-result download status -> badge, mirroring downloads.js statusBadge.
+// "new" (fresh remote hit) shows nothing to keep the common case clean.
+function searchStatusBadge(s) {
+  if (!s || s === "new") return null;
+  const cls = s === "downloaded" ? "downloading" : s === "queued" ? "waiting"
+    : (s === "canceled" || s === "queued_canceled") ? "stopped" : "";
+  return html`<${Badge} kind=${cls}>${t("search_status_" + s)}<//>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/shared-detail.js Added

@@ -0,0 +1,177 @@
+// Shared-files detail panel: the per-file info shown below the shared table
+// when a row is clicked. Data comes from GET shared/{hash} (every list field +
+// the detail-only fields). It re-fetches on each live tick of the shared store
+// so the transfer/request counters stay current while the panel is open (GET is
+// ETag-cached, so unchanged frames short-circuit to a 304 + the cached body).
+// Mirrors download-detail.js, but the pieces graph here is an *availability*
+// bar, not a progress bar: a shared file is 100% local by definition, so what
+// `parts.sources` describes is how well each part is replicated across the
+// network (red = no other peer has it). Absent until the daemon's RLE decode
+// for this file has landed. While a re-hash runs the hashing bar replaces it,
+// the same precedence CSharedFilesCtrl::GetItemBarFill applies.
+
+import { api } from "../api.js";
+import { html, useState, useEffect, useStore } from "../dom.js";
+import { Placeholder, PiecesBar, PiecesLegend, toast, confirmDialog, Section, statRow, IdentityLine, copyText, Tabs, CommentEditor, RenameForm, DownloadLink } from "../components.js";
+import { formatBytes, formatInt, formatDuration, formatSpeed, formatTimestamp, twin, fileTypeLabel } from "../format.js";
+import { FileClients, HIDDEN_EVERYWHERE } from "./client-table.js";
+import { t, terr } from "../i18n.js";
+
+const PRIORITIES = "very_low", "low", "normal", "high", "release";
+
+// Peers of a shared file: show the upload-side columns, keep the download ones
+// (and the redundant per-row file name) one click away in the column picker.
+const SH_HIDDEN = ...HIDDEN_EVERYWHERE, "file", "dl_state", "dl_speed", "downloaded", "dl_session", "remote_rank";
+
+// Human upload-priority label, matching the shared list (auto shows the
+// derived level in parentheses).
+function prioLabel(s) {
+  const base = PRIORITIES.includes(s.priority) ? t("shared_prio_" + s.priority) : s.priority;
+  return s.priority_auto ? t("shared_prio_auto") + " (" + base + ")" : base;
+}
+
+// Estimated peers with a complete copy, formatted like the desktop's
+// "Complete Sources" column (SharedFilesCtrl.cpp): "< high" while the low
+// bound is still 0, "low" once both bounds agree, else the "low – high"
+// estimate range.
+function completeSources(s) {
+  const src = s.sources || {};
+  const r = { low: src.complete_min || 0, high: src.complete_max || 0 };
+  if (r.low === 0) return r.high ? "< " + formatInt(r.high) : "0";
+  if (r.low === r.high) return formatInt(r.low);
+  return formatInt(r.low) + " – " + formatInt(r.high);
+}
+
+export function SharedDetail({ hash }) {
+  const shared = useStore("shared") || ; // live tick source (SSE)
+  const detail, setDetail = useState(null);
+  const gone, setGone = useState(false);
+  const tab, setTab = useState("details");
+
+  useEffect(() => {
+    if (!hash) { setDetail(null); return; }
+    let alive = true;
+    api.get("shared/" + hash)
+      .then((d) => { if (alive) { setDetail(d); setGone(false); } })
+      .catch(() => { if (alive) setGone(true); });
+    return () => { alive = false; };
+  }, hash, shared);
+
+  if (!hash) return null;
+  if (gone) return html`<div class="detail-panel"><${Placeholder} kind="info">${t("shared_detail_gone")}<//></div>`;
+  if (!detail) return html`<div class="detail-panel"><${Placeholder} kind="loading">${t("shared_detail_loading")}<//></div>`;
+
+  const s = detail;
+  const media = s.media;
+  // "audio"/"video" are the file_type tokens the daemon's
+  // IsMediaProbeCandidate accepts, so the button matches what the core probes.
+  const isMedia = s.file_type === "audio" || s.file_type === "video";
+
+  const copy = (text) => copyText(text)
+    .then(() => toast(t("downloads_detail_copied"), "success"))
+    .catch(() => toast(t("downloads_detail_copy_failed"), "error"));
+
+  // POST answers 202 as soon as amuled queues the task, so the toast can only
+  // say the check *started*: the verdict is a log line (ThreadTasks.cpp
+  // PrintReport), never a REST response. The 409 for a file that turned
+  // partfile between the fetch and the click needs no branch -- terr() maps it.
+  const verify = async () => {
+    if (!(await confirmDialog(t("shared_verify_confirm", { name: s.name })))) return;
+    try {
+      await api.post("shared/" + s.hash + "/verify");
+      toast(t("shared_verify_started"), "info");
+    } catch (e) { toast(terr(e), "error"); }
+  };
+
+  // Single file: no confirmation (cheap, non-destructive). 202 is async, so the
+  // toast only says it started; new values arrive on the next shared tick.
+  const refreshMedia = async () => {
+    try {
+      await api.post("shared/" + s.hash + "/media/refresh");
+      toast(t("shared_media_refresh_started"), "info");
+    } catch (e) { toast(terr(e), "error"); }
+  };
+
+  return html`
+    <div class="detail-panel">
+      <div class="detail-head">
+        <div class="detail-titlebar">
+          <h4 class="detail-name" title=${s.name}>${s.name}</h4>
+        </div>
+      </div>
+
+      <${Tabs} tabs=${
+        { key: "details", label: t("detail_tab_details") },
+        { key: "clients", label: t("detail_tab_clients") },
+        { key: "filename", label: t("detail_tab_filename") },
+        { key: "comments", label: t("detail_tab_comments") },
+      } active=${tab} onSelect=${setTab} />
+
+      <div class="detail-body">
+      ${tab === "clients" ? html`
+        <${FileClients} hash=${s.hash} prefsKey="shared_clients" defaultHidden=${SH_HIDDEN}
+                        defaultSort="uploaded" partsTotal=${s.total_part_count} />
+      ` : tab === "comments" ? html`
+        <div class="detail-comments">
+          <${CommentEditor} key=${s.hash} hash=${s.hash} kind="shared" comment=${s.my_comment} rating=${s.my_rating} />
+        </div>
+      ` : tab === "filename" ? html`
+        <div class="detail-comments">
+          <${RenameForm} key=${s.hash} hash=${s.hash} kind="shared" name=${s.name} />
+        </div>
+      ` : html`
+      <div class="detail-sections">
+        ${s.hashed_part_count > 0 && s.total_part_count ? html`
+        <div class="detail-progress">
+          <${PiecesBar} mode="hashing" total=${s.total_part_count} hashed=${s.hashed_part_count} />
+          <${PiecesLegend} mode="hashing" total=${s.total_part_count} hashed=${s.hashed_part_count} />
+        </div>` : s.parts && s.parts.length ? html`
+        <div class="detail-progress">
+          <${PiecesBar} mode="availability" parts=${s.parts} />
+          <${PiecesLegend} mode="availability" parts=${s.parts} />
+        </div>` : null}
+        ${Section(
+          statRow("shared_size", formatBytes(s.size_bytes), "shared_detail_tip_size"),
+          statRow("shared_detail_uploaded", twin(s, "uploaded_bytes_session", "uploaded_bytes_total", formatBytes), "shared_detail_tip_uploaded"),
+          statRow("shared_detail_upload_speed", formatSpeed(s.upload_speed_bytes_per_second), "shared_detail_tip_upload_speed"),
+          statRow("shared_detail_uploading", formatInt(s.uploading_client_count), "shared_detail_tip_uploading"),
+          statRow("shared_detail_last_upload", formatTimestamp(s.last_upload_at), "shared_detail_tip_last_upload"),
+          statRow("shared_detail_shared_since", formatTimestamp(s.shared_since_at), "shared_detail_tip_shared_since"),
+          statRow("shared_detail_requested", twin(s, "request_count_session", "request_count_total", formatInt), "shared_detail_tip_requested"),
+          statRow("shared_detail_accepted", twin(s, "accepted_request_count_session", "accepted_request_count_total", formatInt), "shared_detail_tip_accepted"),
+          statRow("shared_detail_upload_ratio", (Number(s.upload_ratio) || 0).toFixed(2), "shared_detail_tip_upload_ratio"),
+          statRow("shared_detail_complete_src", completeSources(s), "shared_detail_tip_complete_src"),
+        , "shared_detail_group_sharing")}
+        ${Section(
+          statRow("shared_priority", prioLabel(s), "shared_detail_tip_priority"),
+          statRow("downloads_detail_queued", formatInt(s.upload_queue_count), "downloads_detail_tip_queued"),
+          statRow("shared_detail_file_type", fileTypeLabel(s.file_type), "shared_detail_tip_file_type"),
+        , "shared_detail_group_file", html`
+          <${DownloadLink} hash=${s.hash} incomplete=${!!s.incomplete} />
+          <button class="btn btn-sm admin-only" type="button" disabled=${!!s.incomplete}
+                  title=${t(s.incomplete ? "shared_verify_tip_partfile" : "shared_verify_tip")}
+                  onClick=${verify}>
+            ${t("shared_verify")}
+          </button>
+          ${isMedia ? html`
+          <button class="btn btn-sm admin-only" type="button" disabled=${!!s.incomplete}
+                  title=${t(s.incomplete ? "shared_media_refresh_tip_partfile" : "shared_media_refresh_tip")}
+                  onClick=${refreshMedia}>
+            ${t("shared_media_refresh")}
+          </button>` : null}`)}
+        ${media ? Section(
+          media.title ? statRow("downloads_detail_media_title", media.title, "downloads_detail_tip_media_title") : null,
+          media.artist ? statRow("downloads_detail_media_artist", media.artist, "downloads_detail_tip_media_artist") : null,
+          media.album ? statRow("downloads_detail_media_album", media.album, "downloads_detail_tip_media_album") : null,
+          media.duration_seconds ? statRow("downloads_detail_media_length", formatDuration(media.duration_seconds), "downloads_detail_tip_media_length") : null,
+          media.bitrate_kilobits_per_second ? statRow("downloads_detail_media_bitrate", formatInt(media.bitrate_kilobits_per_second), "downloads_detail_tip_media_bitrate") : null,
+          media.codec ? statRow("downloads_detail_media_codec", media.codec, "downloads_detail_tip_media_codec") : null,
+        .filter(Boolean), "downloads_detail_group_media") : null}
+        ${IdentityLine({ file: s, copy, titleKey: "downloads_detail_group_identity", extra: 
+          statRow("shared_detail_directory", s.directory || "—", "shared_detail_tip_directory"),
+          statRow("shared_detail_parts", formatInt(s.total_part_count), "shared_detail_tip_parts"),
+         })}
+      </div>`}
+      </div>
+    </div>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/shared-dirs.js Added

@@ -0,0 +1,127 @@
+// Shared directories editor, shown in Preferences -> Directories -> Shared
+// folders. Talks to /share_directories, the endpoint that validates each path
+// server-side, sets both intent lists and saves -- carrying the recursive flag
+// that a `shared_paths` union over PATCH /preferences cannot.
+//
+// Immediate per-row: add and recursive-toggle POST one entry (idempotent), and
+// delete removes one; the core applies each under its own lock, so there is no
+// client-side read-modify-write race. Each write is followed by a re-GET
+// because the bulk envelope reports ok/rejected per path but not the recursive
+// flag. Admin-only edit; guests see the list read-only.
+
+import { api, bulkFailures } from "../api.js";
+import { html, useState, useEffect } from "../dom.js";
+import { Placeholder, toast } from "../components.js";
+import { Icon } from "../icons.js";
+import { t, terr } from "../i18n.js";
+
+export function SharedDirectories({ isGuest }) {
+  const dirs, setDirs = useState(undefined); // undefined until the first GET
+  const err, setErr = useState("");
+  const path, setPath = useState("");
+  const recursive, setRecursive = useState(false);
+  const busy, setBusy = useState(false);
+
+  const load = async () => {
+    try { setDirs((await api.get("share_directories")).directories || ); setErr(""); }
+    catch (e) { setErr(terr(e) || t("prefs_shdir_error")); setDirs(); }
+  };
+  useEffect(() => { load(); }, );
+
+  // The POST bulk envelope carries one {id: path, ok, error} per applied root.
+  // A partial reject answers 207, which api.js resolves rather than throws, so
+  // the rejection is read from results, not caught.
+  const rejectionFor = (res, p) => {
+    const hit = ((res && res.results) || ).find((r) => r.id === p && r.ok === false);
+    return hit ? hit.error : null;
+  };
+
+  // Every single-path op re-applies the whole intent list, so the core can drop
+  // a *sibling* root the caller never touched (e.g. one that became unreadable).
+  // Surface those so the drop isn't silent; `exclude` skips the row the caller
+  // already reported on its own.
+  const warnSiblings = (res, exclude) => {
+    const others = bulkFailures(res).filter((r) => r.id !== exclude);
+    if (others.length) {
+      toast(t("common_bulk_partial", { failed: others.length,
+        total: (res.results || ).length, message: terr(others0.error) }), "warn");
+    }
+  };
+
+  const upsert = async (p, rec, isAdd) => {
+    setBusy(true);
+    try {
+      const res = await api.post("share_directories", { path: p, recursive: rec });
+      const bad = rejectionFor(res, p);
+      if (bad) { toast(terr(bad) || t("prefs_shdir_error"), "error"); return; }
+      warnSiblings(res, p);
+      if (isAdd) { setPath(""); setRecursive(false); }
+      toast(t(isAdd ? "prefs_shdir_toast_added" : "prefs_shdir_toast_updated"), "success");
+    } catch (e) { toast(terr(e) || t("prefs_shdir_error"), "error"); }
+    finally { setBusy(false); await load(); }
+  };
+
+  const remove = async (p) => {
+    setBusy(true);
+    try {
+      warnSiblings(await api.del("share_directories?path=" + encodeURIComponent(p)));
+      toast(t("prefs_shdir_toast_removed"), "success");
+    } catch (e) { toast(terr(e) || t("prefs_shdir_error"), "error"); }
+    finally { setBusy(false); await load(); }
+  };
+
+  const submitAdd = () => { const p = path.trim(); if (!busy && p) upsert(p, recursive, true); };
+  // Not a <form>: this renders inside the preferences <form>, so Enter would
+  // otherwise fire the bulk Apply (same reason AmuleApiCredentials avoids one).
+  const onKeyDown = (e) => { if (e.key === "Enter") { e.preventDefault(); submitAdd(); } };
+
+  if (dirs === undefined) return html`<${Placeholder} kind="loading">${t("prefs_shdir_loading")}<//>`;
+
+  return html`
+    <div class="shared-dirs">
+      <div class="table-wrap">
+        <table class="data">
+          <thead>
+            <tr>
+              <th>${t("prefs_shdir_col_path")}</th>
+              <th>${t("prefs_shdir_col_recursive")}</th>
+              ${isGuest ? null : html`<th class="admin-only">${t("prefs_shdir_col_actions")}</th>`}
+            </tr>
+          </thead>
+          <tbody>
+            ${err ? null : dirs.map((d) => html`
+              <tr>
+                <td class="name">${d.path}</td>
+                <td>
+                  <input type="checkbox" name="dir_recursive" checked=${!!d.recursive} disabled=${isGuest || busy}
+                         title=${t("prefs_shdir_col_recursive")}
+                         onChange=${() => upsert(d.path, !d.recursive, false)} />
+                </td>
+                ${isGuest ? null : html`
+                  <td class="row-actions admin-only">
+                    <button class="btn btn-icon btn-sm btn-danger" type="button" disabled=${busy}
+                            title=${t("prefs_shdir_remove")} onClick=${() => remove(d.path)}>
+                      <${Icon} name="trash" />
+                    </button>
+                  </td>`}
+              </tr>`)}
+          </tbody>
+        </table>
+        ${err ? html`<div class="table-empty"><${Placeholder} kind="error">${err}<//></div>`
+          : dirs.length ? null
+            : html`<div class="table-empty"><${Placeholder} kind="info">${t("prefs_shdir_empty")}<//></div>`}
+      </div>
+      ${isGuest ? null : html`
+        <div class="shared-dirs-add toolbar admin-only" onKeyDown=${onKeyDown}>
+          <input class="input" name="shared_dir_path" type="text" placeholder=${t("prefs_shdir_path_ph")}
+                 value=${path} disabled=${busy} onInput=${(e) => setPath(e.target.value)} />
+          <label class="field-inline">
+            <input type="checkbox" name="dir_recursive" checked=${recursive} disabled=${busy}
+                   onChange=${(e) => setRecursive(e.target.checked)} />
+            ${t("prefs_shdir_recursive")}
+          </label>
+          <button class="btn btn-primary btn-sm" type="button" disabled=${busy || !path.trim()}
+                  onClick=${submitAdd}>${t("prefs_shdir_add")}</button>
+        </div>`}
+    </div>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/shared.js Added

@@ -0,0 +1,265 @@
+// Shared files view: list published files with session/total transfer,
+// request and accept counters; change upload priority (per-row or bulk),
+// multi-select with select-all, status and text filters, live totals, reload shares,
+// bulk Verify Local Data over the selection, whole-share media re-extract.
+// Live via the SSE "shared" channel.
+
+import { api, bulkFailures } from "../api.js";
+import { data } from "../events.js";
+import { html, useState, useEffect, useStore } from "../dom.js";
+import { checkCell, listPlaceholder, toast, confirmDialog } from "../components.js";
+import { VirtualTable, sortRows, textMatcher, useTablePrefs, ColumnPicker } from "../table.js";
+import { formatBytes, formatDuration, formatFreeSpace, formatInt, formatSpeed, formatTimestamp, twin } from "../format.js";
+import { t, tn, terr } from "../i18n.js";
+import { SharedDetail } from "./shared-detail.js";
+import { SplitDetail } from "./split-detail.js";
+
+const PRIORITIES = "auto", "very_low", "low", "normal", "high", "release"
+  .map((v) => v, t("shared_prio_" + v));
+
+const STATUS_FILTERS = "all", t("shared_status_all"), "uploading", t("shared_status_uploading");
+
+const DEFAULT_HIDDEN = "last_upload", "shared_since", "media_length", "media_bitrate", "media_codec",
+  "media_artist", "media_album", "media_title";
+
+export default function Shared({ isGuest }) {
+  // undefined until the first snapshot lands,  once the share is known
+  // empty; listPlaceholder tells the two apart.
+  const rawShared = useStore("shared");
+  const shared = rawShared || ;
+  const loading = rawShared === undefined;
+  const disk = (useStore("status") || {}).disk || {};
+  const selection, setSelection = useState(() => new Set());
+  const { sortKey, sortDir, hidden, widths, toggleSort, toggleCol, setWidth, resetPrefs } =
+    useTablePrefs("shared", { sortKey: "name", sortDir: 1, hidden: DEFAULT_HIDDEN });
+  const filterStatus, setFilterStatus = useState("all");
+  const filterText, setFilterText = useState("");
+  const verifying, setVerifying = useState(false);
+  const detailHash, setDetailHash = useState(null); // row shown in the detail panel
+
+  // Open (or toggle closed) the detail panel; ignore clicks on a row's own
+  // controls (the select-all/select checkbox and the priority dropdown).
+  const onRowClick = (s, e) => {
+    if (e.target.closest("input,select,button,a,label")) return;
+    setDetailHash((h) => (h === s.hash ? null : s.hash));
+  };
+
+  useEffect(() => {
+    data.register({ key: "shared", eventPrefix: "shared", id: "hash",
+      list: () => api.list("shared").then((r) => r.shared || ) });
+    data.ensure("shared");
+  }, );
+
+  // Close the detail panel if its file is no longer shared (unshared/removed).
+  useEffect(() => {
+    if (detailHash && !shared.some((s) => s.hash === detailHash)) setDetailHash(null);
+  }, shared);
+
+  const toggleRow = (hash, checked) => {
+    const next = new Set(selection);
+    if (checked) next.add(hash); else next.delete(hash);
+    setSelection(next);
+  };
+  const toggleAll = (checked) =>
+    setSelection(checked ? new Set(list.map((s) => s.hash)) : new Set());
+
+  const setPriority = async (hash, p) => {
+    try { await api.patch("shared/" + hash, { priority: p }); data.refresh("shared"); }
+    catch (e) { toast(terr(e) || t("shared_error"), "error"); }
+  };
+  // Apply one priority to every selected row via the collection bulk endpoint.
+  const bulkPriority = async (p) => {
+    const hashes = Array.from(selection);
+    if (!hashes.length) { toast(t("shared_toast_no_files_selected"), "warn"); return; }
+    try {
+      const failed = bulkFailures(await api.patch("shared", { hashes, priority: p }));
+      if (failed.length)
+        toast(t("common_bulk_partial", { failed: failed.length, total: hashes.length,
+                message: terr(failed0.error) }), "warn");
+      else toast(t("shared_toast_done"), "success");
+    } catch (e) { toast(terr(e) || t("shared_error"), "error"); }
+    data.refresh("shared");
+  };
+  // Re-hash every selected file against its hashset.
+  //
+  // ponytail: N sequential POSTs -- there is no bulk verify endpoint, and each
+  // call is an EC roundtrip, so they are not fired in parallel. Switch to one
+  // call if the API ever grows POST /shared/verify.
+  //
+  // Ineligible rows cannot be filtered out up front: `incomplete` is
+  // detail-only, so a still-downloading file is discovered from its own 409
+  // and counts as a failure -- cheaper than a detail fetch per selected row.
+  // The button is disabled for the whole run: unlike its single-request
+  // siblings this loop stays in flight for seconds, and a second click would
+  // queue every selected file for a re-hash twice.
+  const bulkVerify = async () => {
+    const hashes = Array.from(selection);
+    if (!hashes.length) { toast(t("shared_toast_no_files_selected"), "warn"); return; }
+    if (!(await confirmDialog(tn("shared_verify_confirm_selected", hashes.length)))) return;
+    setVerifying(true);
+    const failed = ;
+    try {
+      for (const h of hashes) {
+        try { await api.post("shared/" + h + "/verify"); }
+        catch (e) { failed.push(e); }
+      }
+    } finally { setVerifying(false); }
+    if (failed.length)
+      toast(t("common_bulk_partial", { failed: failed.length, total: hashes.length,
+              message: terr(failed0) }), "warn");
+    else toast(tn("shared_verify_started_selected", hashes.length), "info");
+  };
+  const reload = async () => {
+    try { await api.post("shared_reload"); toast(t("shared_toast_reloading"), "success"); setTimeout(() => data.refresh("shared"), 1500); }
+    catch (e) { toast(terr(e) || t("shared_error"), "error"); }
+  };
+  // Whole-share endpoint (one call), not one POST per selected file -- that is
+  // the point of it on a large library. Confirmed because it is bulk work.
+  const refreshAllMedia = async () => {
+    if (!(await confirmDialog(t("shared_media_refresh_all_confirm")))) return;
+    try {
+      const r = await api.post("shared/media/refresh");
+      toast(tn("shared_media_refresh_all_started", (r && r.queued_file_count) || 0), "info");
+    } catch (e) { toast(terr(e) || t("shared_error"), "error"); }
+  };
+
+  // --- derived ----------------------------------------------------------
+  let list = shared.slice();
+  // `uploading_client_count` is a count of clients being served, so the
+  // "uploading" filter means > 0.
+  if (filterStatus === "uploading") list = list.filter((s) => s.uploading_client_count > 0);
+  if (filterText) { const match = textMatcher(filterText); list = list.filter((s) => match(s.name)); }
+  const allSelected = list.length > 0 && list.every((s) => selection.has(s.hash));
+  const selectedCount = list.filter((s) => selection.has(s.hash)).length;
+
+  // Drop selected hashes hidden by the current filter (keep the still-visible).
+  useEffect(() => {
+    setSelection((prev) => {
+      const vis = new Set(list.map((s) => s.hash));
+      const next = new Set(); prev.forEach((h) => vis.has(h) && next.add(h));
+      return next.size === prev.size ? prev : next;
+    });
+  }, filterStatus, filterText);
+
+  const columns = 
+    { always: true, cls: "check", width: "40px",
+      label: checkCell(allSelected, toggleAll, t("shared_select_all")),
+      cell: (s) => checkCell(selection.has(s.hash), (v) => toggleRow(s.hash, v)) },
+    { key: "name", always: true, label: t("shared_name"), cls: "name", sortable: true,
+      sortVal: (s) => (s.name || "").toLowerCase(),
+      cell: (s) => html`<span title=${s.name}>${s.name}</span>` },
+    { key: "size", label: t("shared_size"), num: true, width: "110px", sortable: true,
+      sortVal: (s) => s.size_bytes || 0, cell: (s) => formatBytes(s.size_bytes) },
+    { key: "xfer", label: t("shared_transferred"), num: true, width: "170px", sortable: true,
+      sortVal: (s) => s.uploaded_bytes_total || 0,
+      cell: (s) => twin(s, "uploaded_bytes_session", "uploaded_bytes_total", formatBytes) },
+    { key: "requests", label: t("shared_requested"), num: true, width: "120px", sortable: true,
+      sortVal: (s) => s.request_count_total || 0,
+      cell: (s) => twin(s, "request_count_session", "request_count_total", formatInt) },
+    { key: "accepts", label: t("shared_accepted"), num: true, width: "120px", sortable: true,
+      sortVal: (s) => s.accepted_request_count_total || 0,
+      cell: (s) => twin(s, "accepted_request_count_session", "accepted_request_count_total", formatInt) },
+    { key: "sources", label: t("shared_complete_src"), num: true, width: "90px", sortable: true,
+      sortVal: (s) => (s.sources && s.sources.complete) || 0, cell: (s) => formatInt((s.sources && s.sources.complete) || 0) },
+    { key: "upspeed", label: t("shared_upload_speed"), num: true, width: "100px", sortable: true,
+      sortVal: (s) => s.upload_speed_bytes_per_second || 0, cell: (s) => formatSpeed(s.upload_speed_bytes_per_second) },
+    { key: "uploading", label: t("shared_upload_clients"), num: true, width: "90px", sortable: true,
+      sortVal: (s) => s.uploading_client_count || 0, cell: (s) => formatInt(s.uploading_client_count) },
+    { key: "last_upload", label: t("shared_last_upload"), width: "160px", sortable: true,
+      sortVal: (s) => s.last_upload_at || 0, cell: (s) => formatTimestamp(s.last_upload_at) },
+    { key: "shared_since", label: t("shared_shared_since"), width: "160px", sortable: true,
+      sortVal: (s) => s.shared_since_at || 0, cell: (s) => formatTimestamp(s.shared_since_at) },
+    { key: "media_length", label: t("downloads_detail_media_length"), num: true, width: "90px", sortable: true,
+      sortVal: (s) => (s.media && s.media.duration_seconds) || 0,
+      cell: (s) => (s.media && s.media.duration_seconds) ? formatDuration(s.media.duration_seconds) : "" },
+    { key: "media_bitrate", label: t("downloads_detail_media_bitrate"), num: true, width: "100px", sortable: true,
+      sortVal: (s) => (s.media && s.media.bitrate_kilobits_per_second) || 0,
+      cell: (s) => (s.media && s.media.bitrate_kilobits_per_second) ? formatInt(s.media.bitrate_kilobits_per_second) : "" },
+    { key: "media_codec", label: t("downloads_detail_media_codec"), width: "100px", sortable: true,
+      sortVal: (s) => (s.media && s.media.codec) || "",
+      cell: (s) => (s.media && s.media.codec) || "" },
+    { key: "media_artist", label: t("downloads_detail_media_artist"), width: "130px", sortable: true,
+      sortVal: (s) => (s.media && s.media.artist) || "",
+      cell: (s) => (s.media && s.media.artist) || "" },
+    { key: "media_album", label: t("downloads_detail_media_album"), width: "130px", sortable: true,
+      sortVal: (s) => (s.media && s.media.album) || "",
+      cell: (s) => (s.media && s.media.album) || "" },
+    { key: "media_title", label: t("downloads_detail_media_title"), width: "150px", sortable: true,
+      sortVal: (s) => (s.media && s.media.title) || "",
+      cell: (s) => (s.media && s.media.title) || "" },
+    { key: "priority", label: t("shared_priority"), width: "160px", sortable: true,
+      sortVal: (s) => s.priority || "", cell: (s) => isGuest
+        ? prioLabel(s)
+        : html`
+            <select class="input input-sm admin-only" name="priority" value=${prioValue(s)}
+                    onChange=${(e) => setPriority(s.hash, e.target.value)}>
+              ${PRIORITIES.map((v, l) => html`<option value=${v}>${v === "auto" && s.priority_auto ? prioLabel(s) : l}</option>`)}
+            </select>` },
+  ;
+
+  list = sortRows(list, columns, sortKey, sortDir);
+  const shown = columns.filter((c) => !c.key || !hidden.has(c.key));
+  const rowClass = (s) =>
+    (selection.has(s.hash) ? "row-selected " : "") + (s.hash === detailHash ? "row-active" : "");
+
+  let size = 0, xs = 0, xt = 0, up = 0;
+  for (const s of list) {
+    size += s.size_bytes || 0;
+    xs += s.uploaded_bytes_session || 0;
+    xt += s.uploaded_bytes_total || 0;
+    up += s.upload_speed_bytes_per_second || 0;
+  }
+
+  const freeSpace = formatFreeSpace(disk.temp_free_bytes, disk.incoming_free_bytes);
+
+  return html`
+    <div class="split-view">
+    <${SplitDetail} storageKey="shared_detail_height" open=${!!detailHash}
+                    onClose=${() => setDetailHash(null)}
+                    top=${html`
+    <section class="card">
+      <div class="view-header">
+        <div class="toolbar admin-only">
+          <select class="input input-sm" name="bulk_priority" value=""
+                  onChange=${(e) => { const v = e.target.value; e.target.value = ""; if (v) bulkPriority(v); }}>
+            <option value="">${t("shared_priority")}…</option>
+            ${PRIORITIES.map((v, l) => html`<option value=${v}>${l}</option>`)}
+          </select>
+          <button class="btn btn-sm" onClick=${bulkVerify} disabled=${verifying}
+                  title=${t("shared_verify_tip")}>${t("shared_verify")}</button>
+          <span class="selected-count">${t("shared_selected")} ${selectedCount}</span>
+          <span class="vsep" aria-hidden="true"></span>
+          <button class="btn btn-sm" onClick=${reload}>${t("shared_refresh_shares")}</button>
+          <button class="btn btn-sm" onClick=${refreshAllMedia}
+                  title=${t("shared_media_refresh_all_tip")}>${t("shared_media_refresh_all")}</button>
+        </div>
+        <div class="spacer"></div>
+        <div class="toolbar">
+          <select class="input input-sm" name="status_filter" title=${t("shared_status_label")} value=${filterStatus} onChange=${(e) => setFilterStatus(e.target.value)}>
+            ${STATUS_FILTERS.map((v, l) => html`<option value=${v}>${l}</option>`)}
+          </select>
+          <input class="input input-sm" name="filter" type="text" placeholder=${t("shared_filter")} value=${filterText} onInput=${(e) => setFilterText(e.target.value)} />
+          <${ColumnPicker} columns=${columns} hidden=${hidden} onToggle=${toggleCol} onReset=${resetPrefs} />
+        </div>
+      </div>
+        <${VirtualTable} columns=${shown} rows=${list} rowKey=${(s) => s.hash} rowClass=${rowClass}
+                         sortKey=${sortKey} sortDir=${sortDir} onSort=${toggleSort} onRowClick=${onRowClick}
+                         widths=${widths} onResize=${setWidth}
+                         maxHeight="none"
+                         empty=${listPlaceholder(loading, t("shared_empty"))} />
+        ${loading ? null : html`
+        <div class="totals-line">
+          <span>${tn("shared_files_count", list.length)}</span>${" · "}<span>${t("shared_size")} ${formatBytes(size)}</span>${" · "}<span>${t("shared_transferred")} ${formatBytes(xs) + " / " + formatBytes(xt)}</span>${" · "}<span>${t("shared_upload_speed")} ${formatSpeed(up)}</span>${freeSpace ? html`${" · "}<span>${t("common_free_space")} ${freeSpace}</span>` : ""}
+        </div>`}
+    </section>`}>
+        <${SharedDetail} hash=${detailHash} />
+      <//>
+    </div>`;
+}
+
+function prioValue(s) { return s.priority_auto ? "auto" : s.priority; }
+function prioLabel(s) {
+  const found = PRIORITIES.find((v) => v === s.priority);
+  const base = found ? found1 : s.priority;
+  return s.priority_auto ? t("shared_prio_auto") + " (" + base + ")" : base;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/split-detail.js Added

@@ -0,0 +1,65 @@
+// Reusable split layout: a table region on top and a detail panel below,
+// separated by a draggable splitter. Extracted from the Downloads page so
+// Shared Files can reuse the exact same slider + bottom-panel structure.
+// The panel height is persisted per `storageKey`. On phones the CSS turns the
+// bottom region into a full-screen drill-down sheet (see .split-bottom in
+// app.css).
+
+import { html, useState, useRef } from "../dom.js";
+import { loadPref, savePref } from "../store.js";
+import { Icon } from "../icons.js";
+import { t } from "../i18n.js";
+
+// Bottom-anchored resizable-height hook, shared by the Downloads/Shared detail
+// panel and the Networks bottom pane. Drag the splitter (moving up grows the
+// bottom region); the height is clamped so neither region collapses and
+// persisted per `storageKey`. Returns the current height plus the props to
+// spread onto a `.splitter` element and the ref for the enclosing container.
+export function useSplitHeight(storageKey, def = 340) {
+  const height, setHeight = useState(() => {
+    const v = loadPref(storageKey, def);
+    return v > 0 ? v : def;
+  });
+  const containerRef = useRef(null);
+  const dragRef = useRef(null);
+
+  const onPointerDown = (e) => {
+    e.preventDefault();
+    e.currentTarget.setPointerCapture(e.pointerId);
+    dragRef.current = { startY: e.clientY, startH: height, id: e.pointerId, el: e.currentTarget };
+  };
+  const onPointerMove = (e) => {
+    const g = dragRef.current;
+    if (!g) return;
+    const total = containerRef.current ? containerRef.current.clientHeight : window.innerHeight;
+    const h = Math.max(160, Math.min(total - 160, g.startH + (g.startY - e.clientY)));
+    g.lastH = h;
+    setHeight(h);
+  };
+  const onPointerUp = () => {
+    const g = dragRef.current;
+    if (!g) return;
+    try { g.el.releasePointerCapture(g.id); } catch (_) {}
+    if (g.lastH != null) savePref(storageKey, g.lastH);
+    dragRef.current = null;
+  };
+
+  const splitterProps = { onPointerDown, onPointerMove, onPointerUp, onPointerCancel: onPointerUp };
+  return { height, containerRef, splitterProps };
+}
+
+export function SplitDetail({ storageKey, open, onClose, top, children }) {
+  const { height, containerRef, splitterProps } = useSplitHeight(storageKey);
+
+  return html`
+    <div class="split" ref=${containerRef}>
+      <div class="split-top">${top}</div>
+      ${open ? html`
+        <div class="splitter" ...${splitterProps}></div>
+        <div class="split-bottom" style=${{ height: height + "px" }}>
+          <button class="btn btn-icon btn-sm detail-close" title=${t("detail_close")}
+                  onClick=${onClose}><${Icon} name="cancel" /></button>
+          ${children}
+        </div>` : null}
+    </div>`;
+}

amule-3.1.0.tar.gz/src/webapi/static/js/views/stats.js Added

@@ -0,0 +1,205 @@
+// Statistics view, mirroring the desktop statsDlg 2×2 grid: Download |
+// Upload speed on top, Connections | Statistics Tree below. Speed charts show
+// current + the daemon's session average; the connections chart draws the
+// three lines the daemon reports. Sampling interval comes from the WebUI
+// preference. (The Kad nodes graph lives in the Networks/Kad tab.)
+
+import { api } from "../api.js";
+import { html, useState, useEffect } from "../dom.js";
+import { Placeholder } from "../components.js";
+import { Chart, graphPollMs } from "../charts.js";
+import { formatBytes, formatSpeed, formatInt, formatDuration, bytesAxis } from "../format.js";
+import { loadGraphInterval } from "../store.js";
+import { t, terr } from "../i18n.js";
+
+const TREE_POLL_MS = 6000; // tree refresh, independent of the graph interval
+const GRAPH_WIDTH = 300; // samples per fetch (~chart pixel width; full window is ~1800)
+
+const speedAxis = (max) => bytesAxis(max, true);
+// `series` is parallel to the arrays each graph loads below: entry 0 is the
+// endpoint's own `value`, the rest are whatever that graph adds beside it.
+// `avg` picks the session-average numerator (divided by duration in loadGraph).
+const GRAPHS = 
+  { name: "download_speed", title: t("stats_download_speed"), fmt: formatSpeed, axis: speedAxis,
+    avg: (s) => s.downloaded_bytes,
+    series: { color: "#3aaf5d", label: t("common_legend_current") }, { color: "#1fb5ad", label: t("common_legend_session_avg") } },
+  { name: "upload_speed", title: t("stats_upload_speed"), fmt: formatSpeed, axis: speedAxis,
+    avg: (s) => s.uploaded_bytes,
+    series: { color: "#3b86e0", label: t("common_legend_current") }, { color: "#8a5cd6", label: t("common_legend_session_avg") } },
+  { name: "connections", title: t("stats_connections"), fmt: formatInt,
+    series: { color: "#d68a0c", label: t("stats_legend_active_connections") },
+             { color: "#c94f7c", label: t("stats_legend_active_downloads") },
+             { color: "#1fb5ad", label: t("stats_legend_active_uploads") } },
+;
+
+export default function Stats() {
+  const graphData, setGraphData = useState({}); // name -> xs, ...series
+  const tree, setTree = useState(null);          // null=loading, =empty
+  const treeErr, setTreeErr = useState("");
+  // Expanded tree nodes by key path ("transfer", "transfer.uploads", …).
+  // Node keys are stable machine ids (falling back to the index for keyless
+  // nodes), so state survives both the per-refresh label changes and
+  // structural shifts in dynamic subtrees.
+  const expanded, setExpanded = useState(new Set());
+
+  // Read once per mount: the router remounts this view (key=route) when the
+  // user returns from Preferences, so a changed range takes effect on its own.
+  const interval = loadGraphInterval();
+
+  useEffect(() => {
+    let alive = true;
+
+    const loadGraph = async (g) => {
+      try {
+        const r = await api.get("stats/graphs/" + g.name + "?width=" + GRAPH_WIDTH + "&interval_seconds=" + interval);
+        const pts = r.points || ;
+        const ys = pts.map((p) => p.value);
+        // Speed charts add a flat session-average line (total / uptime), skipped
+        // when the daemon reports no uptime (duration_seconds === 0, old daemons)
+        // rather than dividing by zero. The connections graph instead carries two
+        // daemon lines, omitted whole (not zeroed) when unreported.
+        let rest = ;
+        if (g.avg) {
+          const s = r.session || {};
+          if (s.duration_seconds) rest = new Array(ys.length).fill(g.avg(s) / s.duration_seconds);
+        } else if (pts.length && pts0.active_download_count !== undefined) {
+          rest = pts.map((p) => p.active_download_count), pts.map((p) => p.active_upload_count);
+        }
+        if (alive) setGraphData((d) => ({ ...d, g.name: pts.map((p) => p.at), ys, ...rest }));
+      } catch (_) { /* leave previous data */ }
+    };
+    const loadTree = async () => {
+      try {
+        const r = await api.get("stats/tree");
+        if (alive) {
+          const nodes = r.nodes || ;
+          setTree(nodes);
+          setTreeErr("");
+          // first load: open the top-level branches, like the GUI
+          setExpanded((prev) => prev.size ? prev : new Set(nodes.map((n, i) => n.key || String(i))));
+        }
+      }
+      catch (e) { if (alive) setTreeErr(terr(e) || t("stats_error")); }
+    };
+    const refreshGraphs = () => GRAPHS.forEach(loadGraph);
+
+    refreshGraphs();
+    loadTree();
+    // Two timers: graphs follow the interval, the tree keeps a fixed 6s so a
+    // long graph range never slows the uptime/totals it shows.
+    const graphTimer = setInterval(refreshGraphs, graphPollMs(interval));
+    const treeTimer = setInterval(loadTree, TREE_POLL_MS);
+    return () => { alive = false; clearInterval(graphTimer); clearInterval(treeTimer); };
+  }, );
+
+  const onToggle = (path, open) => setExpanded((prev) => {
+    const next = new Set(prev);
+    if (open) next.add(path); else next.delete(path);
+    return next;
+  });
+
+  return html`
+    <div class="charts-grid stats-grid">
+      ${GRAPHS.map((g) => html`<${Chart} key=${g.name} g=${g} data=${graphDatag.name} />`)}
+      <div class="card chart-card stats-tree-card">
+        <h3>${t("stats_statistics_tree")}</h3>
+        <div class="stats-tree">
+          ${treeErr ? html`<p>${treeErr}</p>`
+            : tree === null ? html`<${Placeholder} kind="loading">${t("stats_loading")}<//>`
+            : tree.length ? tree.map((n, i) => html`<${TreeNode} node=${n} path=${n.key || String(i)} expanded=${expanded} onToggle=${onToggle} />`)
+            : html`<${Placeholder} kind="info">${t("stats_empty")}<//>`}
+        </div>
+      </div>
+    </div>`;
+}
+
+// The API sends untranslated English label templates ("Uptime: %s") plus raw
+// typed values; we translate the template and format the values client-side so
+// the display honours the UI language and locale. See docs/api/REFERENCE.md.
+
+// t() echoes the key back when there's no entry; treat that as "missing" and
+// use the fallback. The one place that knows this convention.
+function tOr(key, fallback) {
+  const s = t(key);
+  return s === key ? fallback : s;
+}
+
+// Translate a label template by its exact English text; fall back to the raw
+// English for dynamic labels (client names, versions, OS) that have no key.
+function tLabel(label) { return tOr("stats_tree_" + label, label); }
+
+// Locale-independent sentinel token ("never"/"not_available") -> localized.
+function tEnum(token) { return tOr("stats_tree_enum_" + token, token); }
+
+// Translate a node's label template. Prefer the stable machine key
+// (stats_tree_<key>) so translations survive label rewording and don't depend
+// on matching English text; fall back to the label for legacy daemons.
+function tNodeLabel(node) {
+  // Dynamic per-client version/OS rows: the label head is data. Render
+  // `label_value` verbatim when present (version/OS string, never translated);
+  // when it's absent it's a known placeholder we translate by kind. Keep the
+  // ": %s" tail so nodeText still fills the count/percent.
+  // ponytail: heads have no ":".
+  if (node.key === "client_version" || node.key === "client_os") {
+    const tail = node.label.slice(node.label.indexOf(":"));
+    if (node.label_value) return node.label_value + tail;
+    return tOr("stats_tree_" + node.key + "_unknown", node.label) + tail;
+  }
+  return tOr("stats_tree_" + node.key, tLabel(node.label));
+}
+
+// One typed value -> display string. Mirrors ECSpecialTags::FormatValue.
+function fmtValue(v, spec) {
+  if (!v) return "";
+  let s;
+  switch (v.type) {
+    case "bytes": s = formatBytes(v.value); break;
+    case "speed": s = formatBytes(v.value) + "/s"; break;
+    case "time": s = formatDuration(v.value); break;
+    case "double": s = /f/.test(spec || "") ? Number(v.value).toFixed(2) : String(v.value); break;
+    case "string": s = v.token ? tEnum(v.token) : tLabel(String(v.value)); break;
+    default: s = formatInt(v.value); break; // integer
+  }
+  if (v.extra) {
+    // A double sub-value is a percentage (GUI hardcodes "%.2f%%").
+    const e = v.extra.type === "double" ? Number(v.extra.value).toFixed(2) + "%" : fmtValue(v.extra);
+    s += " (" + e + ")";
+  }
+  return s;
+}
+
+// UL:DL ratio from the raw ratio_session / ratio_total numbers, formatted locale-aware
+// instead of pasting the daemon's pre-formatted composite string. Mirrors the
+// desktop GUI's "1 : <session> (1 : <total>)".
+function formatRatio(r) {
+  const n = (x) => Number(x).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+  let s = "1 : " + n(r.session);
+  if (r.total != null) s += " (1 : " + n(r.total) + ")";
+  return s;
+}
+
+// Fill the label template's printf placeholders from values, in order.
+function nodeText(node) {
+  // Ratio node: build from ratio_session / ratio_total when present; else fall
+  // back to the composite string value (legacy daemons emit no ratio numbers).
+  if (node.ratio_session != null) {
+    return tNodeLabel(node).replace("%s",
+      formatRatio({ session: node.ratio_session, total: node.ratio_total }));
+  }
+  const values = node.values || ;
+  let i = 0;
+  return tNodeLabel(node).replace(/%(%|-.0-9*(?:ll|l|h)?a-zA-Z)/g,
+    (m, spec) => spec === "%" ? "%" : fmtValue(valuesi++, spec));
+}
+
+function TreeNode({ node, path, expanded, onToggle }) {
+  const children = node.children || ;
+  const text = nodeText(node);
+  if (!children.length) return html`<div class="tree-leaf">${text}</div>`;
+  const open = expanded.has(path);
+  return html`
+    <details open=${open} onToggle=${(e) => { if (e.target.open !== open) onToggle(path, e.target.open); }}>
+      <summary>${text}</summary>
+      ${children.map((c, i) => html`<${TreeNode} node=${c} path=${path + "." + (c.key || i)} expanded=${expanded} onToggle=${onToggle} />`)}
+    </details>`;
+}

amule-3.1.0.tar.gz/src/webapi/tools Added

amule-3.1.0.tar.gz/src/webapi/tools/check-i18n.mjs Added

@@ -0,0 +1,82 @@
+// Dictionary consistency check: every locale must have exactly the keys of
+// en.json (the source), and each translation must keep the same {placeholders}.
+// Also checks that every preferences field renders a real label, since those
+// keys are derived (prefs_field_<category>_<key>) rather than written out --
+// a renamed field with no matching dictionary entry would otherwise render
+// the raw key with no error anywhere.
+// Run: node src/webapi/tools/check-i18n.mjs
+import { readFileSync, readdirSync } from "node:fs";
+import { dirname, join } from "node:path";
+import assert from "node:assert";
+
+const here = dirname(new URL(import.meta.url).pathname);
+const dir = join(here, "..", "static", "i18n");
+const placeholders = (s) => (s.match(/\{a-z_+\}/g) || ).sort().join(",");
+
+// JSON.parse silently keeps the last value for a repeated key, so a duplicate
+// is invisible to a parsed comparison. The catalogs are flat, one "key": per
+// line, so the raw keys are reliable to scan.
+const load = (f) => {
+  const raw = readFileSync(join(dir, f), "utf8");
+  const seen = new Set(), dupes = new Set();
+  for (const , k of raw.matchAll(/^\s*"((?:^"\\|\\.)*)"\s*:/gm))
+    (seen.has(k) ? dupes : seen).add(k);
+  assert.deepStrictEqual(...dupes, , f + ": duplicate keys");
+  return JSON.parse(raw);
+};
+
+const en = load("en.json");
+for (const file of readdirSync(dir).filter((f) => f.endsWith(".json") && f !== "en.json")) {
+  const dict = load(file);
+  const missing = Object.keys(en).filter((k) => !(k in dict));
+  const extra = Object.keys(dict).filter((k) => !(k in en));
+  assert.deepStrictEqual(missing, , file + ": missing keys");
+  assert.deepStrictEqual(extra, , file + ": stale keys not in en.json");
+  for (const k of Object.keys(en)) {
+    assert.strictEqual(placeholders(dictk), placeholders(enk),
+      file + ": placeholder mismatch in \"" + k + "\"");
+  }
+  console.log(file + ": OK (" + Object.keys(dict).length + " keys)");
+}
+
+// --- Preferences field labels resolve -----------------------------------
+// The view derives each label key from the field's category and name, so a
+// rename has to land in the dictionary too. Lift the literal tables straight
+// out of the view (they are plain data) rather than duplicating them here.
+const viewSrc = readFileSync(join(here, "..", "static", "js", "views", "preferences.js"), "utf8");
+const table = (name) => {
+  const m = viewSrc.match(new RegExp("^const " + name + " = \\\\s\\S*?^\\;$", "m"));
+  assert.ok(m, "preferences.js: could not lift `" + name + "`");
+  return m0;
+};
+const { TABS } = new Function(
+  table("PROXY_TYPES"), table("SEE_SHARES"), table("GEOIP_SOURCES"), table("TABS"),
+   "return { TABS };".join("\n"),
+)();
+
+const missingLabels = ;
+for (const tab of TABS) {
+  if (!(tab.labelKey in en)) missingLabels.push(tab.labelKey);
+  if (tab.noteKey && !(tab.noteKey in en)) missingLabels.push(tab.noteKey);
+  for (const grp of tab.groups) {
+    if (!(grp.legendKey in en)) missingLabels.push(grp.legendKey);
+    for (const f of grp.fields) {
+      // hidden fields are capability flags loaded only to gate others; the
+      // view never renders a label for them.
+      if (f.hidden) continue;
+      const cat = f.cat || tab.cat;
+      const key = f.labelKey || "prefs_field_" + cat.replace(/\./g, "_") + "_" + f.key;
+      if (!(key in en)) missingLabels.push(key);
+      for (const o of f.options || ) {
+        if (!(o.labelKey in en)) missingLabels.push(o.labelKey);
+      }
+      // Action buttons carry their own tooltip + toast keys, equally derived
+      // from the table and equally invisible when absent.
+      for (const k of "titleKey", "toastKey") {
+        if (f.action && !(f.actionk in en)) missingLabels.push(f.actionk);
+      }
+    }
+  }
+}
+assert.deepStrictEqual(missingLabels, , "preferences.js: label keys absent from en.json");
+console.log("preferences.js: OK (all field/group/tab labels resolve)");

amule-3.1.0.tar.gz/src/webapi/tools/run-dev.sh Added

@@ -0,0 +1,217 @@
+#!/usr/bin/env bash
+#
+# Launch a backend (amuled or amule) with External Connections (EC) enabled
+# plus amuleapi, in an ISOLATED config so you can develop the web frontend
+# without touching your real ~/.aMule.
+#
+# amuleapi serves the frontend itself (via StaticRoot) on the same origin as
+# the API, so there is no separate static server and no proxy: just open the
+# amuleapi URL. You edit HTML/JS/CSS in this repo and reload the browser.
+#
+# What it does:
+#   - Uses its own config directory (default ~/.aMule-dev).
+#   - On first run, generates the config headlessly (with amuled) so EC can be
+#     enabled before launching, avoiding the first-run wizard.
+#   - Enables External Connections (EC) with a password.
+#   - Sets amuleapi's admin/guest web passwords.
+#   - Points amuleapi's StaticRoot at the repo frontend (src/webapi/static).
+#   - Starts the chosen backend in the background and amuleapi in the
+#     foreground. Ctrl+C stops both.
+#
+# Usage:
+#   tools/run-dev.sh            # amuled backend (default) + amuleapi
+#   tools/run-dev.sh amuled     # same, explicit
+#   tools/run-dev.sh amule      # amule GUI backend + amuleapi (needs a display)
+#   tools/run-dev.sh stop       # stop the dev processes
+#
+# Optional environment variables:
+#   BACKEND      Backend to launch: amuled | amule (def. amuled)
+#   CONFIG_DIR   Isolated config directory (def. ~/.aMule-dev)
+#   EC_PASS      EC password backend<->amuleapi (def. amuledev)
+#   ADMIN_PASS   Web admin login password (def. admin)
+#   GUEST_PASS   Web guest login password (def. guest)
+#   HTTP_PORT    amuleapi / web HTTP port (def. 4713)
+#   EC_PORT      Backend EC port (def. 4712)
+#   BUILD_DIR    Build dir for freshly compiled binaries (def. <repo>/build)
+#   STATIC_DIR   Static bundle to serve (def. <repo>/src/webapi/static)
+
+set -euo pipefail
+
+# tools/ and static/ are siblings under webapi/: webapi/ -> src/ -> repo
+STATIC_DIR_DEFAULT="$(cd "$(dirname "${BASH_SOURCE0}")/../static" && pwd)"
+REPO_DIR="$(cd "$STATIC_DIR_DEFAULT/../../.." && pwd)"
+BUILD_DIR="${BUILD_DIR:-$REPO_DIR/build}"
+STATIC_DIR="${STATIC_DIR:-$STATIC_DIR_DEFAULT}"
+CONFIG_DIR="${CONFIG_DIR:-$HOME/.aMule-dev}"
+EC_PASS="${EC_PASS:-amuledev}"
+ADMIN_PASS="${ADMIN_PASS:-admin}"
+GUEST_PASS="${GUEST_PASS:-guest}"
+HTTP_PORT="${HTTP_PORT:-4713}"
+EC_PORT="${EC_PORT:-4712}"
+
+# Prefer freshly compiled binaries; otherwise fall back to the system (PATH).
+pick_bin() {
+	local name="$1" candidate="$2"
+	if  -x "$candidate" ; then echo "$candidate"
+	elif command -v "$name" >/dev/null 2>&1; then command -v "$name"
+	else echo ""; fi
+}
+AMULE="$(pick_bin amule "$BUILD_DIR/src/amule")"
+AMULED="$(pick_bin amuled "$BUILD_DIR/src/amuled")"
+AMULEAPI="$(pick_bin amuleapi "$BUILD_DIR/src/webapi/amuleapi")"
+
+md5hex() {  # uppercase hex md5 (the format amule.conf stores)
+	if command -v python3 >/dev/null 2>&1; then
+		python3 -c "import hashlib,sys;print(hashlib.md5(sys.argv1.encode()).hexdigest().upper())" "$1"
+	else
+		printf '%s' "$1" | md5sum | cut -d' ' -f1 | tr 'a-f' 'A-F'
+	fi
+}
+
+stop_all() {
+	# Match by command line (the config dir is isolated => safe).
+	pkill -f "amuleapi --config-dir=$CONFIG_DIR" 2>/dev/null || true
+	pkill -f "amule -c $CONFIG_DIR"  2>/dev/null || true
+	pkill -f "amuled -c $CONFIG_DIR" 2>/dev/null || true
+	echo "==> Dev processes stopped."
+}
+
+port_in_use() {  # true (0) if something is already listening on 127.0.0.1:$1
+	if (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null; then exec 3>&- 3<&-; return 0; fi
+	return 1
+}
+
+# --- argument parsing ---
+BACKEND="${BACKEND:-amuled}"
+case "${1:-}" in
+	stop)          stop_all; exit 0 ;;
+	amule|amuled)  BACKEND="$1" ;;
+	"")            ;;
+	*)             echo "ERROR: unknown argument '$1' (expected: amule | amuled | stop)"; exit 1 ;;
+esac
+
+# --- binary checks ---
+if  -z "$AMULEAPI" ; then
+	echo "ERROR: amuleapi not found (looked in $BUILD_DIR/src/webapi/amuleapi and PATH)."
+	echo "       Build it with the BUILD_AMULEAPI CMake option, e.g.:"
+	echo "           cmake -DBUILD_AMULEAPI=ON -B build && cmake --build build"
+	exit 1
+fi
+
+if  "$BACKEND" == "amuled" && -z "$AMULED" ; then
+	echo "ERROR: amuled not found (looked in $BUILD_DIR/src/amuled and PATH)."
+	echo "       Build it with the BUILD_DAEMON CMake option, e.g.:"
+	echo "           cmake -DBUILD_DAEMON=ON -B build && cmake --build build"
+	exit 1
+fi
+if  "$BACKEND" == "amule" ; then
+	if  -z "$AMULE" ; then
+		echo "ERROR: amule not found (looked in $BUILD_DIR/src/amule and PATH)."
+		echo "       Build it with the BUILD_MONOLITHIC CMake option (on by default), e.g.:"
+		echo "           cmake -DBUILD_MONOLITHIC=ON -B build && cmake --build build"
+		exit 1
+	fi
+	if  -z "${DISPLAY:-}" && -z "${WAYLAND_DISPLAY:-}" ; then
+		echo "ERROR: no display (DISPLAY/WAYLAND_DISPLAY). The amule backend is a GUI and needs a desktop."
+		echo "       Use the default amuled backend instead: tools/run-dev.sh amuled"
+		exit 1
+	fi
+fi
+
+# --- port availability (fail fast before touching any config) ---
+for entry in "EC:$EC_PORT" "HTTP:$HTTP_PORT"; do
+	label="${entry%%:*}"; port="${entry##*:}"
+	if port_in_use "$port"; then
+		echo "ERROR: port $port ($label) is already in use."
+		echo "       Something is already listening on it — a previous 'tools/run-dev.sh',"
+		echo "       your real aMule/amuleapi, or another service. Stop it first:"
+		echo "           tools/run-dev.sh stop"
+		echo "       or pick free ports:  EC_PORT=14712 HTTP_PORT=14713 tools/run-dev.sh"
+		exit 1
+	fi
+done
+
+echo "==> backend : $BACKEND"
+echo "==> amuleapi: $AMULEAPI"
+echo "==> config  : $CONFIG_DIR (isolated)"
+echo "==> frontend: $STATIC_DIR"
+
+mkdir -p "$CONFIG_DIR"
+
+# --- first run: generate amule.conf (headless, with amuled) ---
+if  ! -f "$CONFIG_DIR/amule.conf" ; then
+	echo "==> Generating initial configuration…"
+	if  -n "$AMULED" ; then
+		timeout 10 "$AMULED" -c "$CONFIG_DIR" -o -i >/dev/null 2>&1 || true
+		pkill -f "amuled -c $CONFIG_DIR" 2>/dev/null || true
+	fi
+fi
+
+echo "==> Enabling External Connections (EC) in amule.conf"
+EC_MD5="$(md5hex "$EC_PASS")"
+python3 - "$CONFIG_DIR/amule.conf" "$EC_MD5" "$EC_PORT" <<'PY' 2>/dev/null || true
+import sys, re, os
+conf, md5, ecport = sys.argv1, sys.argv2, sys.argv3
+s = open(conf).read() if os.path.exists(conf) else "ExternalConnect\nAcceptExternalConnections=1\nECPort=%s\nECPassword=%s\n" % (ecport, md5)
+s = re.sub(r'AcceptExternalConnections=\d', 'AcceptExternalConnections=1', s)
+s = re.sub(r'ECPassword=.*', 'ECPassword=' + md5, s)
+s = re.sub(r'ECPort=.*', 'ECPort=' + ecport, s)
+open(conf, 'w').write(s)
+PY
+
+# --- amuleapi passwords and config ---
+echo "==> Setting amuleapi passwords (admin/guest)"
+"$AMULEAPI" --config-dir="$CONFIG_DIR" --set-admin-pass="$ADMIN_PASS" >/dev/null 2>&1 || true
+"$AMULEAPI" --config-dir="$CONFIG_DIR" --set-guest-pass="$GUEST_PASS" >/dev/null 2>&1 || true
+
+echo "==> Configuring amuleapi.conf (StaticRoot, HTTP port, EC connection)"
+python3 - "$CONFIG_DIR/amuleapi.conf" "$STATIC_DIR" "$HTTP_PORT" "$EC_PASS" "$EC_PORT" <<'PY'
+import sys, os, configparser
+conf, front, port, ecpass, ecport = sys.argv1:6
+cfg = configparser.ConfigParser()
+cfg.optionxform = str
+if os.path.exists(conf):
+    cfg.read(conf)
+for sec in ('Server', 'EC'):
+    if not cfg.has_section(sec):
+        cfg.add_section(sec)
+cfg'Server'.update({'BindAddress': '127.0.0.1', 'Port': port, 'StaticRoot': front})
+cfg'EC'.update({'Host': '127.0.0.1', 'Port': ecport, 'Password': ecpass})
+with open(conf, 'w') as f:
+    cfg.write(f, space_around_delimiters=False)
+os.chmod(conf, 0o600)
+PY
+
+# --- launch ---
+trap stop_all EXIT INT TERM
+
+if  "$BACKEND" == "amule" ; then
+	echo "==> Opening the amule window (log: $CONFIG_DIR/amule.log)"
+	"$AMULE" -c "$CONFIG_DIR" >"$CONFIG_DIR/amule.log" 2>&1 &
+else
+	echo "==> Starting amuled in the background (log: $CONFIG_DIR/amuled.log)"
+	"$AMULED" -c "$CONFIG_DIR" -o >"$CONFIG_DIR/amuled.log" 2>&1 &
+fi
+
+# Wait for the backend to open the EC port.
+for _ in $(seq 1 40); do
+	if (exec 3<>"/dev/tcp/127.0.0.1/$EC_PORT") 2>/dev/null; then exec 3>&- 3<&-; break; fi
+	sleep 0.5
+done
+
+cat <<EOF
+
+============================================================
+  aMule web dev environment up
+  Backend: $BACKEND
+  Web:     http://127.0.0.1:$HTTP_PORT/
+  Login:   admin -> '$ADMIN_PASS'   |   guest -> '$GUEST_PASS'
+  EC:      127.0.0.1:$EC_PORT (pass '$EC_PASS')
+  Logs:    $CONFIG_DIR/$BACKEND.log
+  To stop: Ctrl+C  (or 'tools/run-dev.sh stop')
+============================================================
+
+EOF
+
+echo "==> Starting amuleapi in the foreground…"
+"$AMULEAPI" --config-dir="$CONFIG_DIR" --http-port="$HTTP_PORT"

amule-3.1.0.tar.gz/src/webapi/tools/update-vendor.sh Added

@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+#
+# Download and refresh the vendored frontend libraries.
+#
+# The web frontend ships every third-party library locally (no build step, no
+# bundler, no npm/CDN at runtime). This script re-downloads the minified ES
+# modules into static/js/vendor/, fixes the version comment on the first line
+# of each file, and refreshes the matching LICENSE files.
+#
+# To bump a library: edit the *_VERSION constant below and re-run this script.
+#
+#   ./tools/update-vendor.sh
+#
+set -euo pipefail
+
+# --- pinned versions (edit these to upgrade) ---------------------------------
+PREACT_VERSION="10.29.2"   # also provides preact/hooks
+HTM_VERSION="3.1.1"
+
+# --- paths -------------------------------------------------------------------
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE0}")" && pwd)"
+STATIC_DIR="$(cd "${SCRIPT_DIR}/../static" && pwd)"
+JS_DIR="${STATIC_DIR}/js/vendor"
+
+mkdir -p "${JS_DIR}"
+
+# fetch_lib <name> <version> <url> <dest-file>
+#
+# Downloads <url>, prepends a "// <name> vX" comment as the first line, and
+# writes it to <dest-file>.
+fetch_lib() {
+  local name="$1" version="$2" url="$3" dest="$4"
+  local tmp
+  tmp="$(mktemp)"
+
+  echo "  ${name} v${version}"
+  curl -fsSL --retry 3 -o "${tmp}" "${url}"
+
+  # Drop the trailing sourceMappingURL comment: we don't vendor the .map
+  # files, so the reference would only 404 in devtools.
+  sed -i -E '/^:space:*\/\/# sourceMappingURL=/d; /^:space:*\/\*# sourceMappingURL=/d' "${tmp}"
+
+  { printf '// %s v%s\n' "${name}" "${version}"; cat "${tmp}"; } > "${dest}"
+  rm -f "${tmp}"
+}
+
+# fetch_license <version-pinned package path> <dest-file>
+fetch_license() {
+  echo "  LICENSE -> $(basename "$2")"
+  curl -fsSL --retry 3 -o "$2" "https://unpkg.com/$1/LICENSE"
+}
+
+echo "Vendoring frontend libraries into ${JS_DIR}"
+
+# --- preact (+ hooks) --------------------------------------------------------
+fetch_lib "preact" "${PREACT_VERSION}" \
+  "https://unpkg.com/preact@${PREACT_VERSION}/dist/preact.module.js" \
+  "${JS_DIR}/preact.module.js"
+fetch_lib "preact/hooks" "${PREACT_VERSION}" \
+  "https://unpkg.com/preact@${PREACT_VERSION}/hooks/dist/hooks.module.js" \
+  "${JS_DIR}/hooks.module.js"
+fetch_license "preact@${PREACT_VERSION}" "${JS_DIR}/preact.LICENSE"
+
+# --- htm ---------------------------------------------------------------------
+fetch_lib "htm" "${HTM_VERSION}" \
+  "https://unpkg.com/htm@${HTM_VERSION}/dist/htm.module.js" \
+  "${JS_DIR}/htm.module.js"
+fetch_license "htm@${HTM_VERSION}" "${JS_DIR}/htm.LICENSE"
+
+echo "Done. Vendored:"
+echo "  preact ${PREACT_VERSION}, preact/hooks ${PREACT_VERSION}, htm ${HTM_VERSION}"

amule-3.0.1.tar.gz/src/webserver/default/amuleweb-main-dload.php -> amule-3.1.0.tar.gz/src/webserver/default/amuleweb-main-dload.php Changed

amule-3.0.1.tar.gz/src/webserver/default/amuleweb-main-prefs.php -> amule-3.1.0.tar.gz/src/webserver/default/amuleweb-main-prefs.php Changed

@@ -19,8 +19,8 @@
 	// 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",
+		$file_opts = array("check_free_space",
+			"ich_en","aich_trust", "preview_prio","save_sources", "resume_same_cat", "endgame",
 			"min_free_space", "new_files_paused", "alloc_full", "alloc_full_chunks",
 			"new_files_auto_dl_prio", "new_files_auto_ul_prio"
 		);
@@ -97,8 +97,9 @@
 	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",
+		"check_free_space", "ich_en",
 		"new_files_auto_dl_prio", "new_files_auto_ul_prio",
+		"endgame",
 		"use_gzip",
 		"network_ed2k", "network_kad"
 		)
@@ -271,6 +272,12 @@
           </tr>
           <tr> 
             <td> 
+              <input name="endgame" type="checkbox" id="endgame_chk"></td>
+            <td> Endgame mode: rotate to faster sources</td>
+            <td></td>
+          </tr>
+          <tr> 
+            <td> 
               <input name="alloc_full_chunks" type="checkbox" id="alloc_full_chunks4"></td>
             <td> Alloc full chunks of .part files</td>
             <td></td>
@@ -287,12 +294,6 @@
             <td> Add files to download queue in pause mode</td>
             <td></td>
           </tr>
-          <tr> 
-            <td> 
-              <input name="extract_metadata" type="checkbox" id="extract_metadata4"></td>
-            <td> Extract metadata tags </td>
-            <td></td>
-          </tr>
         </table></td>
     </tr>
     <tr>

amule-3.0.1.tar.gz/src/webserver/default/amuleweb-main-search.php -> amule-3.1.0.tar.gz/src/webserver/default/amuleweb-main-search.php Changed

@@ -102,9 +102,9 @@
 <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>
+                      <option>KiByte</option>
+                      <option selected>MiByte</option>
+                      <option>GiByte</option>
                     </select></td>
                 </tr>
                 <tr> 
@@ -121,9 +121,9 @@
 <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>
+                      <option>KiByte</option>
+                      <option selected>MiByte</option>
+                      <option>GiByte</option>
                     </select></td>
                 </tr>
               </table>
@@ -184,9 +184,9 @@
 			$result = 1;
 			switch($str) {
 				case "Byte":	$result = 1; break;
-				case "KByte":	$result = 1024; break;		
-				case "MByte":	$result = 1024*1024; break;
-				case "GByte":	$result = 1024*1024*1024; break;
+				case "KiByte":	$result = 1024; break;		
+				case "MiByte":	$result = 1024*1024; break;
+				case "GiByte":	$result = 1024*1024*1024; break;
 			}
 			return $result;
 		}
@@ -306,9 +306,9 @@
 	var b = parseFloat(value);
 	if ( isNaN(b) ) return value;
 	if ( b < 1024 ) return b + " Bytes";
-	if ( b < 1048576 ) return (b / 1024).toFixed(2) + " KB";
-	if ( b < 1073741824 ) return (b / 1048576).toFixed(2) + " MB";
-	return (b / 1073741824).toFixed(2) + " GB";
+	if ( b < 1048576 ) return (b / 1024).toFixed(2) + " KiB";
+	if ( b < 1073741824 ) return (b / 1048576).toFixed(2) + " MiB";
+	return (b / 1073741824).toFixed(2) + " GiB";
 }
 (function() {
 	var els = document.getElementsByClassName("js-size");

amule-3.0.1.tar.gz/src/webserver/default/amuleweb-main-shared.php -> amule-3.1.0.tar.gz/src/webserver/default/amuleweb-main-shared.php Changed

amule-3.0.1.tar.gz/src/webserver/default/favicon.ico -> amule-3.1.0.tar.gz/src/webserver/default/favicon.ico Changed

amule-3.0.1.tar.gz/src/webserver/src/WebInterface.cpp -> amule-3.1.0.tar.gz/src/webserver/src/WebInterface.cpp Changed

@@ -24,35 +24,30 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#include "config.h"		// For VERSION and ENABLE_NLS
+#include "config.h" // For VERSION and ENABLE_NLS
 
 #include <wx/stdpaths.h>
 
 #ifdef __WXMAC__
-	#include <CoreFoundation/CFBundle.h> // Do_not_auto_remove
-	#include <ApplicationServices/ApplicationServices.h> // Do_not_auto_remove
-	#include <wx/osx/core/cfstring.h>  // Do_not_auto_remove
+#include <CoreFoundation/CFBundle.h>                 // Do_not_auto_remove
+#include <ApplicationServices/ApplicationServices.h> // Do_not_auto_remove
+#include <wx/osx/core/cfstring.h>                    // Do_not_auto_remove
 #endif
 
-
-#include <ec/cpp/ECFileConfig.h>	// Needed for CECFileConfig
+#include <ec/cpp/ECFileConfig.h> // Needed for CECFileConfig
 #include <common/MD5Sum.h>
 
-
 #include "WebServer.h"
 
-
 #include <wx/apptrait.h>
 #include <wx/socket.h>
 
 #include <GuiEvents.h>
 
 #ifdef ENABLE_NLS
-#	include <libintl.h>
+#include <libintl.h>
 #endif
 
-
 //-------------------------------------------------------------------
 IMPLEMENT_APP(CamulewebApp)
 //-------------------------------------------------------------------
@@ -62,33 +57,29 @@
 	EVT_MULE_NOTIFY(CamulewebApp::OnNotifyEvent)
 wxEND_EVENT_TABLE()
 
-
-
-void CamulewebApp::OnNotifyEvent(CMuleGUIEvent& evt)
+void CamulewebApp::OnNotifyEvent(CMuleGUIEvent &evt)
 {
 	evt.Notify();
 }
 
 namespace MuleNotify
 {
-	void HandleNotification(const CMuleNotiferBase& ntf)
-	{
-		if (wxThread::IsMain()) {
-			ntf.Notify();
-		} else {
-			CMuleGUIEvent evt(ntf.Clone());
-			wxQueueEvent(wxTheApp, (evt).Clone());
-		}
-	}
-
-
-	void HandleNotificationAlways(const CMuleNotiferBase& ntf)
-	{
+void HandleNotification(const CMuleNotiferBase &ntf)
+{
+	if (wxThread::IsMain()) {
+		ntf.Notify();
+	} else {
 		CMuleGUIEvent evt(ntf.Clone());
 		wxQueueEvent(wxTheApp, (evt).Clone());
 	}
 }
 
+void HandleNotificationAlways(const CMuleNotiferBase &ntf)
+{
+	CMuleGUIEvent evt(ntf.Clone());
+	wxQueueEvent(wxTheApp, (evt).Clone());
+}
+} // namespace MuleNotify
 
 void CamulewebApp::Post_Shell()
 {
@@ -97,7 +88,6 @@
 	m_webserver = 0;
 }
 
-
 bool CamulewebApp::OnInit()
 {
 	return CaMuleExternalConnector::OnInit();
@@ -109,12 +99,17 @@
 
 int CamulewebApp::OnRun()
 {
+	// Deprecation notice, printed once at startup and honouring --quiet. amuleweb is not being
+	// removed yet -- this only warns operators that it may go away in a future release so they
+	// can plan a move to amuleapi. Kept as a plain untranslated operator-facing string, to
+	// avoid churning every po catalogue for a transitional warning.
+	Show(wxT("\nNOTE: amuleweb is deprecated and may be removed in aMule 3.2 or later.\n"
+		 "      Consider migrating to amuleapi (the REST/SSE API). See amuleweb(1).\n\n"));
 	ConnectAndRun("aMuleweb", VERSION);
 	return 0;
 }
 
-
-bool CamulewebApp::CheckDirForTemplate(wxString& dir, const wxString& tmpl)
+bool CamulewebApp::CheckDirForTemplate(wxString &dir, const wxString &tmpl)
 {
 	DebugShow("checking for directory '" + dir + "'...");
 	if (wxFileName::DirExists(dir)) {
@@ -142,8 +137,7 @@
 	return false;
 }
 
-
-bool CamulewebApp::GetTemplateDir(const wxString& templateName, wxString& templateDir)
+bool CamulewebApp::GetTemplateDir(const wxString &templateName, wxString &templateDir)
 {
 	wxString dir;
 	m_localTemplate = false;
@@ -152,13 +146,11 @@
 
 #ifdef __WXMAC__
 	// This magic string is the bundle identifier in aMule.app's Info.plist
-	CFArrayRef amuleBundleUrls = LSCopyApplicationURLsForBundleIdentifier(
-		CFSTR("org.amule.aMule"), NULL);
+	CFArrayRef amuleBundleUrls = LSCopyApplicationURLsForBundleIdentifier(CFSTR("org.amule.aMule"), NULL);
 	CFURLRef amuleBundleUrl = NULL;
 	if (amuleBundleUrls) {
 		if (CFArrayGetCount(amuleBundleUrls) > 0) {
-			amuleBundleUrl = (CFURLRef)CFRetain(
-				CFArrayGetValueAtIndex(amuleBundleUrls, 0));
+			amuleBundleUrl = (CFURLRef)CFRetain(CFArrayGetValueAtIndex(amuleBundleUrls, 0));
 		}
 		CFRelease(amuleBundleUrls);
 	}
@@ -166,20 +158,15 @@
 		CFBundleRef amuleBundle = CFBundleCreate(NULL, amuleBundleUrl);
 		CFRelease(amuleBundleUrl);
 		if (amuleBundle) {
-			CFURLRef webserverDirUrl = CFBundleCopyResourceURL(
-				amuleBundle,
-				CFSTR("webserver"),
-				NULL, NULL);
+			CFURLRef webserverDirUrl =
+				CFBundleCopyResourceURL(amuleBundle, CFSTR("webserver"), NULL, NULL);
 			CFRelease(amuleBundle);
 			if (webserverDirUrl) {
-				CFURLRef absoluteURL =
-					CFURLCopyAbsoluteURL(webserverDirUrl);
+				CFURLRef absoluteURL = CFURLCopyAbsoluteURL(webserverDirUrl);
 				CFRelease(webserverDirUrl);
 				if (absoluteURL) {
 					CFStringRef pathString =
-						CFURLCopyFileSystemPath(
-							absoluteURL,
-							kCFURLPOSIXPathStyle);
+						CFURLCopyFileSystemPath(absoluteURL, kCFURLPOSIXPathStyle);
 					CFRelease(absoluteURL);
 
 					dir = wxCFStringRef(pathString).AsString();
@@ -208,15 +195,12 @@
 	}
 #endif
 
-	dir = wxStandardPaths::Get().GetResourcesDir();	// Returns 'aMule' when we use 'amule' elsewhere
+	dir = wxStandardPaths::Get().GetResourcesDir(); // Returns 'aMule' when we use 'amule' elsewhere
 #if defined(__WINDOWS__)
-	// Windows portable / installed layout puts amule.exe (and
-	// amuleweb.exe) in bin\ and installable data (webserver
-	// templates, skins, ...) in ..\share\amule\. wxStandardPaths
-	// returns the exe directory on Windows, so relocate up one
-	// level and into the FHS-style share/amule/ tree the installer
-	// actually populates. Mirrors the same adjustment Preferences.cpp
-	// applies for the skins lookup (#783). (#828)
+	// The Windows portable / installed layout puts amule.exe and amuleweb.exe in bin\ and
+	// installable data in ..\share\amule\. wxStandardPaths returns the exe directory there, so
+	// relocate up one level and into the FHS-style share/amule/ tree the installer populates --
+	// the same adjustment Preferences.cpp makes for the skins lookup (#783, #828).
 	dir = JoinPaths(JoinPaths(dir, ".."), "share");
 	dir = JoinPaths(dir, "amule");
 #elif !defined(__WXMAC__)
@@ -230,93 +214,87 @@
 	}
 
 	// template not found. reverting to default
-	const char* const defaultTemplateName = "default";
+	const char *const defaultTemplateName = "default";
 
-	if ( templateName == defaultTemplateName ) {
+	if (templateName == defaultTemplateName) {
 		return false;
 	}
 	Show("Template " + templateName + " not found, reverting to default\n\n");
 	return GetTemplateDir(defaultTemplateName, templateDir);
 }
 
-
-void CamulewebApp::OnInitCmdLine(wxCmdLineParser& amuleweb_parser)
+void CamulewebApp::OnInitCmdLine(wxCmdLineParser &amuleweb_parser)
 {
 	CaMuleExternalConnector::OnInitCmdLine(amuleweb_parser, "amuleweb");
-	amuleweb_parser.AddOption("t", "template",
-		_("Loads template <str>"),
-		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
+	amuleweb_parser.AddOption(
+		"t", "template", _("Loads template <str>"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
 
-	amuleweb_parser.AddOption("s", "server-port",
+	amuleweb_parser.AddOption("s",
+		"server-port",
 		_("Web server HTTP port"),
-		wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL);
+		wxCMD_LINE_VAL_NUMBER,
+		wxCMD_LINE_PARAM_OPTIONAL);
 
-	amuleweb_parser.AddSwitch("u", "enable-upnp",
+	amuleweb_parser.AddSwitch("u",
+		"enable-upnp",
 		_("Use UPnP port forwarding on web server port"),
 		wxCMD_LINE_PARAM_OPTIONAL);
 
-	amuleweb_parser.AddOption("U", "upnp-port",
-		_("UPnP port"),
-		wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL);
+	amuleweb_parser.AddOption(
+		"U", "upnp-port", _("UPnP port"), wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL);
 
-	amuleweb_parser.AddSwitch("z", "enable-gzip",
-		_("Use gzip compression"),
-		wxCMD_LINE_PARAM_OPTIONAL);
+	amuleweb_parser.AddSwitch("z", "enable-gzip", _("Use gzip compression"), wxCMD_LINE_PARAM_OPTIONAL);
 
-	amuleweb_parser.AddSwitch("Z", "disable-gzip",
-		"Do not use gzip compression",
-		wxCMD_LINE_PARAM_OPTIONAL);
+	amuleweb_parser.AddSwitch(
+		"Z", "disable-gzip", "Do not use gzip compression", wxCMD_LINE_PARAM_OPTIONAL);
 
-	amuleweb_parser.AddOption("A", "admin-pass",
+	amuleweb_parser.AddOption("A",
+		"admin-pass",
 		_("Full access password for web server"),
-		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
+		wxCMD_LINE_VAL_STRING,
+		wxCMD_LINE_PARAM_OPTIONAL);
 
-	amuleweb_parser.AddOption("G", "guest-pass",
+	amuleweb_parser.AddOption("G",
+		"guest-pass",
 		_("Guest password for web server"),
-		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
-
-	amuleweb_parser.AddSwitch("a", "allow-guest",
-		_("Allow guest access"),
+		wxCMD_LINE_VAL_STRING,
 		wxCMD_LINE_PARAM_OPTIONAL);
 
-	amuleweb_parser.AddSwitch("d", "deny-guest",
-		_("Deny guest access"),
-		wxCMD_LINE_PARAM_OPTIONAL);
+	amuleweb_parser.AddSwitch("a", "allow-guest", _("Allow guest access"), wxCMD_LINE_PARAM_OPTIONAL);
+
+	amuleweb_parser.AddSwitch("d", "deny-guest", _("Deny guest access"), wxCMD_LINE_PARAM_OPTIONAL);
 
-	amuleweb_parser.AddSwitch("L", "load-settings",
+	amuleweb_parser.AddSwitch("L",
+		"load-settings",
 		_("Load/save web server settings from/to remote aMule"),
 		wxCMD_LINE_PARAM_OPTIONAL);
 
-	amuleweb_parser.AddOption("", "amule-config-file",
+	amuleweb_parser.AddOption("",
+		"amule-config-file",
 		_("aMule config file path. DO NOT USE DIRECTLY!"),
-		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
-
-	/*
-	 * In this mode, internal PHP interpreter is activated, and
-	 * amuleweb will forward there requests for .php pages
-	 */
-	amuleweb_parser.AddSwitch("", "no-php",
-		_("Disable PHP interpreter (deprecated)"),
+		wxCMD_LINE_VAL_STRING,
 		wxCMD_LINE_PARAM_OPTIONAL);
 
-	/*
-	 * Reload .php page each time it's requested - don't cache
-	 * compilation results. Used for script development.
-	 */
-	amuleweb_parser.AddSwitch("N", "no-script-cache",
-		_("Recompile PHP pages on each request"),
-		wxCMD_LINE_PARAM_OPTIONAL);
-}
+	/* In this mode the internal PHP interpreter is activated, and amuleweb forwards requests for
+	 * .php pages there. */
+	amuleweb_parser.AddSwitch(
+		"", "no-php", _("Disable PHP interpreter (deprecated)"), wxCMD_LINE_PARAM_OPTIONAL);
 
+	/* Reload the .php page each time it is requested, not caching compilation results. For script
+	 * development. */
+	amuleweb_parser.AddSwitch(
+		"N", "no-script-cache", _("Recompile PHP pages on each request"), wxCMD_LINE_PARAM_OPTIONAL);
+}
 
-bool CamulewebApp::OnCmdLineParsed(wxCmdLineParser& parser)
+bool CamulewebApp::OnCmdLineParsed(wxCmdLineParser &parser)
 {
 	wxString aMuleConfigFile;
 	if (parser.Found("amule-config-file", &aMuleConfigFile)) {
 		aMuleConfigFile = FinalizeFilename(aMuleConfigFile);
 		if (!::wxFileExists(aMuleConfigFile)) {
-			fprintf(stderr, "FATAL ERROR: file '%s' does not exist.\n",
-				(const char*)unicode2char(aMuleConfigFile));
+			fprintf(stderr,
+				"FATAL ERROR: file '%s' does not exist.\n",
+				(const char *)unicode2char(aMuleConfigFile));
 			return false;
 		}
 		CECFileConfig cfg(aMuleConfigFile);
@@ -327,17 +305,16 @@
 		m_KeepQuiet = true;
 		m_LoadSettingsFromAmule = true;
 
-		// m_configDir is normally set by CaMuleExternalConnector::
-		// OnCmdLineParsed, which this early-return branch skips. Leaving
-		// it empty made GetTemplateDir look for "webserver" relative to
-		// the CWD, so the per-user template dir (<config>/webserver/) was
-		// never found when amuleweb was spawned by the aMule GUI. Derive
-		// it from the config file we were handed instead.
+		// m_configDir is normally set by CaMuleExternalConnector::OnCmdLineParsed, which
+		// this early-return branch skips. Left empty, GetTemplateDir looked for "webserver"
+		// relative to the CWD, so the per-user template dir was never found when amuleweb
+		// was spawned by the aMule GUI.
 		m_configDir = wxFileName(aMuleConfigFile).GetPathWithSep();
 
 		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",
+			fprintf(stderr,
+				"FATAL ERROR: Cannot find template: %s\n",
 				(const char *)unicode2char(m_TemplateName));
 			return false;
 		}
@@ -345,7 +322,7 @@
 	}
 
 	if (CaMuleExternalConnector::OnCmdLineParsed(parser)) {
-		if ( parser.Found("no-php") ) {
+		if (parser.Found("no-php")) {
 			fprintf(stderr, "WARNING: --no-php switch have no effect. Long live PHP\n");
 		}
 
@@ -355,7 +332,8 @@
 		}
 		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",
+			fprintf(stderr,
+				"FATAL ERROR: Cannot find template: %s\n",
 				(const char *)unicode2char(m_TemplateName));
 			return true;
 		}
@@ -385,14 +363,14 @@
 		}
 
 		wxString tmp;
-		if ( parser.Found("admin-pass", &tmp) ) {
+		if (parser.Found("admin-pass", &tmp)) {
 			if (tmp.IsEmpty()) {
 				m_AdminPass.Clear();
 			} else {
 				m_AdminPass.Decode(MD5Sum(tmp).GetHash());
 			}
 		}
-		if ( parser.Found("guest-pass", &tmp) ) {
+		if (parser.Found("guest-pass", &tmp)) {
 			if (tmp.IsEmpty()) {
 				m_GuestPass.Clear();
 			} else {
@@ -407,13 +385,11 @@
 	}
 }
 
-
 const wxString CamulewebApp::GetGreetingTitle()
 {
 	return _("aMule Web Server");
 }
 
-
 void CamulewebApp::Pre_Shell()
 {
 	// Creating the web server
@@ -425,14 +401,12 @@
 	m_webserver->StartServer();
 }
 
-
 void CamulewebApp::TextShell(const wxString &)
 {
 	wxApp::OnRun();
 }
 
-
-void CamulewebApp::LoadAmuleConfig(CECFileConfig& cfg)
+void CamulewebApp::LoadAmuleConfig(CECFileConfig &cfg)
 {
 	CaMuleExternalConnector::LoadAmuleConfig(cfg);
 	m_UseGzip = (cfg.Read("/WebServer/UseGzip", 0l) == 1l);
@@ -440,88 +414,76 @@
 	cfg.ReadHash("/WebServer/Password", &m_AdminPass);
 	cfg.ReadHash("/WebServer/PasswordLow", &m_GuestPass);
 	m_WebserverPort = cfg.Read("/WebServer/Port", 4711l);
-	m_UPnPWebServerEnabled =
-		(cfg.Read("/Webserver/UPnPWebServerEnabled", 0l) == 1l);
+	m_UPnPWebServerEnabled = (cfg.Read("/Webserver/UPnPWebServerEnabled", 0l) == 1l);
 	m_UPnPTCPPort = cfg.Read("/WebServer/UPnPTCPPort", 50001l);
 	m_PageRefresh = cfg.Read("/WebServer/PageRefreshTime", 120l);
 	m_TemplateName = cfg.Read("/WebServer/Template", "default");
 }
 
-
 void CamulewebApp::LoadConfigFile()
 {
 	CaMuleExternalConnector::LoadConfigFile();
 	if (m_configFile) {
-		// amuleweb historically wrote most keys under Webserver
-		// (lowercase 's') but UPnPTCPPort under WebServer (capital
-		// S) — an old typo. amule.conf consistently uses WebServer,
-		// so that's the canonical spelling here too. wxFileConfig
-		// group names are case-insensitive (verified in #822 on Linux
-		// and confirmed by the pre-PR INI shape, where /WebServer and
-		// /Webserver writes always merged into a single section), so
-		// reading `/WebServer/<key>` finds entries written by older
-		// builds that stored them under `/Webserver/<key>` — no
-		// fallback path needed.
-		//
-		// Reading `/Webserver/<key>` directly *would* register the
-		// lowercase section name in wxFileConfig's internal map and
-		// lock the section's case in the output file to lowercase
-		// (the bug @ngosang flagged on the #822 packaging build).
-		// Stick to /WebServer/ everywhere here. (#818)
+		// amuleweb historically wrote most keys under Webserver, lowercase 's', but
+		// UPnPTCPPort under WebServer -- an old typo. amule.conf consistently uses
+		// WebServer, so that is the canonical spelling here too. wxFileConfig group names
+		// are case-insensitive (verified in #822 on Linux, and confirmed by the pre-PR INI
+		// shape, where /WebServer and /Webserver writes always merged into one section), so
+		// reading `/WebServer/<key>` finds entries written by older builds under
+		// `/Webserver/<key>` and no fallback path is needed. Reading `/Webserver/<key>`
+		// directly *would* register the lowercase section name in wxFileConfig's internal
+		// map and lock the section's case in the output file to lowercase -- the bug
+		// @ngosang flagged on the #822 packaging build. Stick to /WebServer/ everywhere
+		// here (#818).
 		m_WebserverPort = m_configFile->Read("/WebServer/Port", 4711l);
-		m_configFile->Read("/WebServer/UPnPWebServerEnabled",
-			&m_UPnPWebServerEnabled, false);
-		m_UPnPTCPPort  = m_configFile->Read("/WebServer/UPnPTCPPort", 50001l);
+		m_configFile->Read("/WebServer/UPnPWebServerEnabled", &m_UPnPWebServerEnabled, false);
+		m_UPnPTCPPort = m_configFile->Read("/WebServer/UPnPTCPPort", 50001l);
 		m_TemplateName = m_configFile->Read("/WebServer/Template", "");
 		m_configFile->Read("/WebServer/UseGzip", &m_UseGzip, false);
 		m_configFile->Read("/WebServer/AllowGuest", &m_AllowGuest, false);
 		m_configFile->ReadHash("/WebServer/AdminPassword", &m_AdminPass);
 		m_configFile->ReadHash("/WebServer/GuestPassword", &m_GuestPass);
-		m_PageRefresh  = m_configFile->Read("/WebServer/PageRefreshTime", 120l);
+		m_PageRefresh = m_configFile->Read("/WebServer/PageRefreshTime", 120l);
 	}
 }
 
-
 void CamulewebApp::SaveConfigFile()
 {
 	CaMuleExternalConnector::SaveConfigFile();
 	if (m_configFile) {
 		m_configFile->Write("/WebServer/Port", m_WebserverPort);
-		m_configFile->Write("/WebServer/UPnPWebServerEnabled",
-			m_UPnPWebServerEnabled);
+		m_configFile->Write("/WebServer/UPnPWebServerEnabled", m_UPnPWebServerEnabled);
 		m_configFile->Write("/WebServer/UPnPTCPPort", m_UPnPTCPPort);
 		m_configFile->Write("/WebServer/Template", m_TemplateName);
 		m_configFile->Write("/WebServer/UseGzip", m_UseGzip);
 		m_configFile->Write("/WebServer/AllowGuest", m_AllowGuest);
 		m_configFile->WriteHash("/WebServer/AdminPassword", m_AdminPass);
 		m_configFile->WriteHash("/WebServer/GuestPassword", m_GuestPass);
-		// PageRefreshTime was previously read but never written —
-		// any value the user set in remote.conf was effectively
-		// reset to the default on next launch. Persist it now.
+		// PageRefreshTime was previously read but never written, so any value the user set
+		// in remote.conf was effectively reset to the default on the next launch. Persist
+		// it now.
 		m_configFile->Write("/WebServer/PageRefreshTime", m_PageRefresh);
 
-		// No DeleteGroup("/Webserver") needed: wxFileConfig group
-		// names are case-insensitive, so /Webserver/foo and
-		// /WebServer/foo are the same entry. A prior attempt added
-		// the DeleteGroup to migrate the section's case in the INI
-		// file, but case-insensitivity meant it actually wiped the
-		// just-written WebServer keys — confirmed via --write-config
-		// on amule-dev-vm where the section vanished entirely. The
-		// HasEntry/fallback path in LoadConfigFile above is dead
-		// code on Linux for the same reason but is kept as a defensive
-		// no-op for any future wx port that breaks the assumption.
+		// No DeleteGroup("/Webserver") needed: wxFileConfig group names are case-
+		// insensitive, so /Webserver/foo and /WebServer/foo are the same entry. A prior
+		// attempt added the DeleteGroup to migrate the section's case in the INI file, but
+		// case-insensitivity meant it actually wiped the just-written WebServer keys --
+		// confirmed via --write-config on amule-dev-vm, where the section vanished
+		// entirely. The HasEntry/fallback path in LoadConfigFile above is dead code on
+		// Linux for the same reason, but is kept as a defensive no-op for any future wx
+		// port that breaks the assumption.
 	}
 }
 
-
 #ifdef ENABLE_NLS
-static inline bool CheckDirForMessageCatalog(const wxString& dir, const wxString& lang, const wxString& domain)
+static inline bool CheckDirForMessageCatalog(
+	const wxString &dir, const wxString &lang, const wxString &domain)
 {
-	return wxFileName::FileExists(JoinPaths(dir, JoinPaths(lang, JoinPaths("LC_MESSAGES", domain + ".mo"))));
+	return wxFileName::FileExists(
+		JoinPaths(dir, JoinPaths(lang, JoinPaths("LC_MESSAGES", domain + ".mo"))));
 }
 
-
-static inline bool DirHasMessageCatalog(const wxString& dir, const wxString& lang, const wxString& domain)
+static inline bool DirHasMessageCatalog(const wxString &dir, const wxString &lang, const wxString &domain)
 {
 	if (!CheckDirForMessageCatalog(dir, lang, domain)) {
 		wxString lingua = lang.BeforeFirst('.').BeforeFirst('@');
@@ -542,8 +504,7 @@
 }
 #endif
 
-
-wxString CamulewebApp::SetLocale(const wxString& language)
+wxString CamulewebApp::SetLocale(const wxString &language)
 {
 	wxString lang = CaMuleExternalConnector::SetLocale(language); // will call setlocale() for us
 
@@ -560,7 +521,8 @@
 		// First look in ~/.aMule/webserver/<template>, but only if a local template was used
 		wxString dir;
 		if (m_localTemplate) {
-			dir = JoinPaths(JoinPaths(JoinPaths(m_configDir, "webserver"), m_TemplateName), "locale");
+			dir = JoinPaths(
+				JoinPaths(JoinPaths(m_configDir, "webserver"), m_TemplateName), "locale");
 			DebugShow("looking for message catalogs in " + dir + "... ");
 		}
 		if (!m_localTemplate || !DirHasMessageCatalog(dir, lang, domain)) {
@@ -571,7 +533,9 @@
 			// on Mac, the bundle may be tried, too
 			dir = wxStandardPaths::Get().GetDataDir();
 #elif defined(__UNIX__)
-			dir = JoinPaths(static_cast<wxStandardPaths&>(wxStandardPaths::Get()).GetInstallPrefix(), JoinPaths("share", "locale"));
+			dir = JoinPaths(
+				static_cast<wxStandardPaths &>(wxStandardPaths::Get()).GetInstallPrefix(),
+				JoinPaths("share", "locale"));
 #endif
 			DebugShow("looking for message catalogs in " + dir + "... ");
 			if (!DirHasMessageCatalog(dir, lang, domain)) {
@@ -583,7 +547,8 @@
 		} else {
 			DebugShow("yes\n");
 		}
-		// If we found something, then use it otherwise it may still be present at the system default location
+		// 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;

amule-3.0.1.tar.gz/src/webserver/src/WebInterface.h -> amule-3.1.0.tar.gz/src/webserver/src/WebInterface.h Changed

@@ -29,17 +29,14 @@
 
 #include "ExternalConnector.h"
 
-
-namespace MuleNotify {
-	class CMuleGUIEvent;
+namespace MuleNotify
+{
+class CMuleGUIEvent;
 }
 
 using MuleNotify::CMuleGUIEvent;
 
-
-class CamulewebApp
-:
-public CaMuleExternalConnector
+class CamulewebApp : public CaMuleExternalConnector
 {
 	class CWebServerBase *m_webserver;
 
@@ -48,44 +45,44 @@
 	void Pre_Shell();
 	void LoadConfigFile();
 	void SaveConfigFile();
-	void LoadAmuleConfig(CECFileConfig& cfg);
-	bool GetTemplateDir(const wxString& templateName, wxString& templateDir);
-	bool CheckDirForTemplate(wxString& dir, const wxString& tmpl);
+	void LoadAmuleConfig(CECFileConfig &cfg);
+	bool GetTemplateDir(const wxString &templateName, wxString &templateDir);
+	bool CheckDirForTemplate(wxString &dir, const wxString &tmpl);
 
 	// other command line switches
-	void	OnInitCmdLine(wxCmdLineParser& amuleweb_parser);
-	bool	OnCmdLineParsed(wxCmdLineParser& parser);
+	void OnInitCmdLine(wxCmdLineParser &amuleweb_parser);
+	bool OnCmdLineParsed(wxCmdLineParser &parser);
 
 	// class data
 	wxString m_TemplateName;
 	wxString m_TemplateDir;
-	bool	m_UseGzip;
+	bool m_UseGzip;
 	CMD4Hash m_AdminPass, m_GuestPass;
-	bool	m_AllowGuest;
+	bool m_AllowGuest;
 
-	long		m_WebserverPort;
-	bool		m_UPnPWebServerEnabled;
-	int		m_UPnPTCPPort;
-	unsigned int	m_PageRefresh;
-	bool		m_LoadSettingsFromAmule;
+	long m_WebserverPort;
+	bool m_UPnPWebServerEnabled;
+	int m_UPnPTCPPort;
+	unsigned int m_PageRefresh;
+	bool m_LoadSettingsFromAmule;
 
-	bool		m_TemplateOk;
+	bool m_TemplateOk;
 
 public:
 	virtual void Post_Shell();
 
 	void TextShell(const wxString &prompt);
 
-	virtual wxString SetLocale(const wxString& language);
+	virtual wxString SetLocale(const wxString &language);
 
-	void OnNotifyEvent(CMuleGUIEvent& evt);
+	void OnNotifyEvent(CMuleGUIEvent &evt);
 	wxDECLARE_EVENT_TABLE();
 
 private:
-	virtual bool	OnInit();
-	virtual int	OnRun();
+	virtual bool OnInit();
+	virtual int OnRun();
 
-	bool	m_localTemplate;
+	bool m_localTemplate;
 };
 
 #endif // WEBINTERFACE_H

amule-3.0.1.tar.gz/src/webserver/src/WebServer.cpp -> amule-3.1.0.tar.gz/src/webserver/src/WebServer.cpp Changed

@@ -24,31 +24,33 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#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 <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 <cryptopp/osrng.h>	// CryptoPP::AutoSeededRandomPool, for the session-token CSPRNG
+// CryptoPP::AutoSeededRandomPool, for the session-token CSPRNG.
+#include "../../WarningsPush_CryptoPP.h"
+#include <cryptopp/osrng.h>
+#include "../../WarningsPop.h"
 
 #include <wx/datetime.h>
 
 //-------------------------------------------------------------------
 
-#include <wx/tokenzr.h>		// for wxTokenizer
+#include <wx/tokenzr.h> // for wxTokenizer
 #include <wx/wfstream.h>
 
-#include <ec/cpp/ECFileConfig.h>	// Needed for CECFileConfig
+#include <ec/cpp/ECFileConfig.h> // Needed for CECFileConfig
 #include <ec/cpp/ECSpecialTags.h>
 #include <common/MD5Sum.h>
-#include <common/Format.h>		// Needed for CFormat
+#include <common/Format.h> // Needed for CFormat
 
-#include <protocol/ed2k/Constants.h>	// Needed for PARTSIZE
-#include "Constants.h"			// Needed for PR_*
+#include <protocol/ed2k/Constants.h> // Needed for PARTSIZE
+#include "Constants.h"               // Needed for PR_*
 
 //-------------------------------------------------------------------
 
-#include "WebSocket.h"		// Needed for StopSockets()
+#include "WebSocket.h" // Needed for StopSockets()
 #include <amuleIPV4Address.h>
 
 #include "php_core_lib.h"
@@ -68,16 +70,17 @@
 inline void set_rgb_color_val(unsigned char *start, uint32 val, unsigned char mod)
 {
 	unsigned char r = val, g = val >> 8, b = val >> 16;
-	start0 = ( r > mod ) ? (r - mod) : 1;
-	start1 = ( g > mod ) ? (g - mod) : 1;
-	start2 = ( b > mod ) ? (b - mod) : 1;
+	start0 = (r > mod) ? (r - mod) : 1;
+	start1 = (g > mod) ? (g - mod) : 1;
+	start2 = (b > mod) ? (b - mod) : 1;
 }
 
-wxString _SpecialChars(wxString str) {
-	str.Replace("&","&amp;");
-	str.Replace("<","&lt;");
-	str.Replace(">","&gt;");
-	str.Replace("\"","&quot;");
+wxString _SpecialChars(wxString str)
+{
+	str.Replace("&", "&amp;");
+	str.Replace("<", "&lt;");
+	str.Replace(">", "&gt;");
+	str.Replace("\"", "&quot;");
 	return str;
 }
 
@@ -87,75 +90,96 @@
 		return PR_LOW;
 	} else {
 		switch (prio) {
-			case PR_LOW: return PR_NORMAL;
-			case PR_NORMAL: return PR_HIGH;
-			case PR_HIGH: return PR_AUTO;
-			case PR_AUTO: return PR_LOW;
-			default: return PR_AUTO;
+		case PR_LOW:
+			return PR_NORMAL;
+		case PR_NORMAL:
+			return PR_HIGH;
+		case PR_HIGH:
+			return PR_AUTO;
+		case PR_AUTO:
+			return PR_LOW;
+		default:
+			return PR_AUTO;
 		}
 	}
 }
 
 static uint8 GetHigherPrioShared(uint32 prio, bool auto_priority)
 {
-	// The arrows walk the manual scale only; they never set or pass
-	// through Auto (that mode can only be chosen from the selector).
-	// Raising while in Auto leaves it for the manual scale at High.
+	// The arrows walk the manual scale only; they never set or pass through Auto, which can
+	// only be chosen from the selector. Raising while in Auto leaves it for the manual scale at
+	// High.
 	if (auto_priority) {
 		return PR_HIGH;
 	} else {
 		switch (prio) {
-			case PR_VERY_LOW: return PR_LOW;
-			case PR_LOW: return PR_NORMAL;
-			case PR_NORMAL: return PR_HIGH;
-			case PR_HIGH: return PR_VERYHIGH;
-			case PR_VERYHIGH: return PR_POWERSHARE;
-			case PR_POWERSHARE: return PR_POWERSHARE;
-			default: return PR_NORMAL;
+		case PR_VERY_LOW:
+			return PR_LOW;
+		case PR_LOW:
+			return PR_NORMAL;
+		case PR_NORMAL:
+			return PR_HIGH;
+		case PR_HIGH:
+			return PR_VERYHIGH;
+		case PR_VERYHIGH:
+			return PR_POWERSHARE;
+		case PR_POWERSHARE:
+			return PR_POWERSHARE;
+		default:
+			return PR_NORMAL;
 		}
 	}
 }
 
-
 static uint8 GetLowerPrio(uint32 prio, bool auto_priority)
 {
 	if (auto_priority) {
 		return PR_HIGH;
 	} else {
 		switch (prio) {
-			case PR_LOW: return PR_AUTO;
-			case PR_NORMAL: return PR_LOW;
-			case PR_HIGH: return PR_NORMAL;
-			case PR_AUTO: return PR_HIGH;
-			default: return PR_AUTO;
+		case PR_LOW:
+			return PR_AUTO;
+		case PR_NORMAL:
+			return PR_LOW;
+		case PR_HIGH:
+			return PR_NORMAL;
+		case PR_AUTO:
+			return PR_HIGH;
+		default:
+			return PR_AUTO;
 		}
 	}
 }
 
 static uint8 GetLowerPrioShared(uint32 prio, bool auto_priority)
 {
-	// The arrows walk the manual scale only; they never set or pass
-	// through Auto (that mode can only be chosen from the selector).
-	// Lowering while in Auto leaves it for the manual scale at Low.
+	// The arrows walk the manual scale only; they never set or pass through Auto, which can
+	// only be chosen from the selector. Lowering while in Auto leaves it for the manual scale
+	// at Low.
 	if (auto_priority) {
 		return PR_LOW;
 	} else {
 		switch (prio) {
-			case PR_POWERSHARE: return PR_VERYHIGH;
-			case PR_VERYHIGH: return PR_HIGH;
-			case PR_HIGH: return PR_NORMAL;
-			case PR_NORMAL: return PR_LOW;
-			case PR_LOW: return PR_VERY_LOW;
-			case PR_VERY_LOW: return PR_VERY_LOW;
-			default: return PR_NORMAL;
+		case PR_POWERSHARE:
+			return PR_VERYHIGH;
+		case PR_VERYHIGH:
+			return PR_HIGH;
+		case PR_HIGH:
+			return PR_NORMAL;
+		case PR_NORMAL:
+			return PR_LOW;
+		case PR_LOW:
+			return PR_VERY_LOW;
+		case PR_VERY_LOW:
+			return PR_VERY_LOW;
+		default:
+			return PR_NORMAL;
 		}
 	}
 }
 
-/*
- * Url string decoder
- */
-wxString CURLDecoder::Decode(const wxString& url)
+// Url string decoder
+wxString CURLDecoder::Decode(const wxString &url)
 {
 	size_t n = url.length();
 	std::vector<char> buffer(n + 1);
@@ -165,12 +189,13 @@
 		if (urli == '+') {
 			bufferj = ' ';
 		} else if (urli == '%' && i < n - 2) {
-			char ch1 = std::toupper(urli+1);
-			char ch2 = std::toupper(urli+2);
+			char ch1 = std::toupper(urli + 1);
+			char ch2 = std::toupper(urli + 2);
 			if (((ch1 >= '0' && ch1 <= '9') || (ch1 >= 'A' && ch1 <= 'F')) &&
-			    ((ch2 >= '0' && ch2 <= '9') || (ch2 >= 'A' && ch2 <= 'F'))) {
+				((ch2 >= '0' && ch2 <= '9') || (ch2 >= 'A' && ch2 <= 'F'))) {
 				i += 2;
-				bufferj = ((ch1 > '9' ? ch1 - 'A' + 10 : ch1 - '0') << 4) | (ch2 > '9' ? ch2 - 'A' + 10 : ch2 - '0');
+				bufferj = ((ch1 > '9' ? ch1 - 'A' + 10 : ch1 - '0') << 4) |
+					    (ch2 > '9' ? ch2 - 'A' + 10 : ch2 - '0');
 			} else {
 				// Invalid %-escape sequence
 				bufferj = urli;
@@ -186,57 +211,60 @@
 
 CParsedUrl::CParsedUrl(const wxString &url)
 {
-	if ( url.Find('/') != -1 ) {
+	if (url.Find('/') != -1) {
 		m_path = url.BeforeFirst('/');
 		m_file = url.AfterFirst('/');
 	}
 
-	if ( url.Find('?') != -1 ) {
+	if (url.Find('?') != -1) {
 		m_file.Truncate(m_file.Find('?'));
 
 		wxString params = url.AfterFirst('?');
 
 		wxStringTokenizer tkz(params, "&");
-		while ( tkz.HasMoreTokens() ) {
+		while (tkz.HasMoreTokens()) {
 			wxString param_val = tkz.GetNextToken();
 			wxString key = param_val.BeforeFirst('=');
 			wxString val = param_val.AfterFirst('=');
 			val = CURLDecoder::Decode(val);
-			if ( m_params.count(key) ) {
+			if (m_params.count(key)) {
 				m_paramskey = m_paramskey + "|" + val;
 			} else {
 				m_paramskey = val;
 			}
 		}
-    }
+	}
 }
 
 void CParsedUrl::ConvertParams(std::map<std::string, std::string> &dst)
 {
-	for(std::map<wxString, wxString>::iterator i = m_params.begin(); i != m_params.end(); ++i) {
+	for (std::map<wxString, wxString>::iterator i = m_params.begin(); i != m_params.end(); ++i) {
 		std::string key(unicode2char(i->first)), value(unicode2char(i->second));
 		dstkey = value;
 	}
 }
 
-CWebServerBase::CWebServerBase(CamulewebApp *webApp, const wxString& templateDir) :
-	m_ServersInfo(webApp), m_SharedFileInfo(webApp), m_DownloadFileInfo(webApp, &m_ImageLib),
-	m_UploadsInfo(webApp), m_SearchInfo(webApp), m_Stats(500, webApp),
-	m_ImageLib(templateDir)
+CWebServerBase::CWebServerBase(CamulewebApp *webApp, const wxString &templateDir)
+: m_ServersInfo(webApp)
+, m_SharedFileInfo(webApp)
+, m_DownloadFileInfo(webApp, &m_ImageLib)
+, m_UploadsInfo(webApp)
+, m_SearchInfo(webApp)
+, m_Stats(500, webApp)
+, m_ImageLib(templateDir)
 {
 	webInterface = webApp;
 
 	//
 	// Init stat graphs
 #ifdef WITH_LIBPNG
-	m_ImageLib.AddImage(new CDynStatisticImage(200, true, m_Stats.DownloadSpeed()),
-		"/amule_stats_download.png");
-	m_ImageLib.AddImage(new CDynStatisticImage(200, true, m_Stats.UploadSpeed()),
-		"/amule_stats_upload.png");
-	m_ImageLib.AddImage(new CDynStatisticImage(200, false, m_Stats.ConnCount()),
-		"/amule_stats_conncount.png");
-	m_ImageLib.AddImage(new CDynStatisticImage(200, false, m_Stats.KadCount()),
-		"/amule_stats_kad.png");
+	m_ImageLib.AddImage(
+		new CDynStatisticImage(200, true, m_Stats.DownloadSpeed()), "/amule_stats_download.png");
+	m_ImageLib.AddImage(
+		new CDynStatisticImage(200, true, m_Stats.UploadSpeed()), "/amule_stats_upload.png");
+	m_ImageLib.AddImage(
+		new CDynStatisticImage(200, false, m_Stats.ConnCount()), "/amule_stats_conncount.png");
+	m_ImageLib.AddImage(new CDynStatisticImage(200, false, m_Stats.KadCount()), "/amule_stats_kad.png");
 #endif
 
 	m_upnpEnabled = webInterface->m_UPnPWebServerEnabled;
@@ -245,7 +273,6 @@
 	m_AsioService = new CAsioService;
 }
 
-
 // Probably always terminated by Ctrl-C or kill, but make a clean shutdown of the service anyway
 CWebServerBase::~CWebServerBase()
 {
@@ -253,24 +280,19 @@
 	delete m_AsioService;
 }
 
-
-//sends output to web interface
+// sends output to web interface
 void CWebServerBase::Print(const wxString &s)
 {
 	webInterface->Show(s);
 }
 
-
 void CWebServerBase::StartServer()
 {
 #ifdef ENABLE_UPNP
 	if (m_upnpEnabled) {
 		m_upnpMappings.resize(1);
 		m_upnpMappings0 = CUPnPPortMapping(
-			webInterface->m_WebserverPort,
-			"TCP",
-			true,
-			"aMule TCP Webserver Socket");
+			webInterface->m_WebserverPort, "TCP", true, "aMule TCP Webserver Socket");
 		m_upnp = new CUPnPControlPoint(m_upnpTCPPort);
 		m_upnp->AddPortMappings(m_upnpMappings);
 	}
@@ -286,12 +308,11 @@
 		delete m_webserver_socket;
 		m_webserver_socket = 0;
 	}
-
 }
 
 void CWebServerBase::StopServer()
 {
-	if ( m_webserver_socket ) {
+	if (m_webserver_socket) {
 		delete m_webserver_socket;
 	}
 #ifdef ENABLE_UPNP
@@ -302,9 +323,10 @@
 #endif
 }
 
-CWebLibSocketServer::CWebLibSocketServer(const class amuleIPV4Address& adr, int flags, CWebServerBase * webServerBase)
-	:	CLibSocketServer(adr, flags),
-		m_webServerBase(webServerBase)
+CWebLibSocketServer::CWebLibSocketServer(
+	const class amuleIPV4Address &adr, int flags, CWebServerBase *webServerBase)
+: CLibSocketServer(adr, flags)
+, m_webServerBase(webServerBase)
 {
 }
 
@@ -312,19 +334,19 @@
 {
 	CWebSocket *client = new CWebSocket(m_webServerBase);
 
-    if (AcceptWith(*client, false) ) {
+	if (AcceptWith(*client, false)) {
 		m_webServerBase->webInterface->Show(_("web client connection accepted\n"));
-    } else {
+	} else {
 		delete client;
 		m_webServerBase->webInterface->Show(_("ERROR: cannot accept web client connection\n"));
-    }
+	}
 }
 
 void CScriptWebServer::ProcessImgFileReq(ThreadData Data)
 {
 	webInterface->DebugShow("**** imgrequest: " + Data.sURL + "\n");
 
-	const CSession* session = CheckLoggedin(Data);
+	const CSession *session = CheckLoggedin(Data);
 
 	// To prevent access to non-template images, we disallow use of paths in filenames.
 	wxString imgName = "/" + wxFileName(Data.parsedURL.File()).GetFullName();
@@ -332,9 +354,9 @@
 
 	// Only static images are available to visitors, in order to prevent
 	// information leakage, but still allowing images on the login page.
-	if (img && (session->m_logged_in || dynamic_cast<CFileImage*>(img))) {
+	if (img && (session->m_logged_in || dynamic_cast<CFileImage *>(img))) {
 		int img_size = 0;
-		unsigned char* img_data = img->RequestData(img_size);
+		unsigned char *img_data = img->RequestData(img_size);
 		// This unicode2char is ok.
 		Data.pSocket->SendContent(unicode2char(img->GetHTTP()), img_data, img_size);
 	} else if (!session->m_logged_in) {
@@ -351,9 +373,9 @@
 	const CECPacket *reply = webInterface->SendRecvMsg_v2(request);
 	const CECTag *tag = NULL;
 	if (reply) {
-		if ( reply->GetOpCode() == EC_OP_STRINGS ) {
+		if (reply->GetOpCode() == EC_OP_STRINGS) {
 			for (CECPacket::const_iterator it = reply->begin(); it != reply->end(); ++it) {
-				tag = & *it;
+				tag = &*it;
 				if (tag->GetTagName() == EC_TAG_STRING) {
 					webInterface->Show(tag->GetStringData());
 				}
@@ -372,36 +394,34 @@
 	}
 }
 
-//
 // Command interface
-//
 void CWebServerBase::Send_SharedFile_Cmd(wxString file_hash, wxString cmd, uint32 opt_arg)
 {
 	CECPacket *ec_cmd = 0;
 	CMD4Hash fileHash;
-	wxCHECK2(fileHash.Decode(file_hash), /* Do nothing. */ );
+	wxCHECK2(fileHash.Decode(file_hash), /* Do nothing. */);
 
 	CECTag hashtag(EC_TAG_KNOWNFILE, fileHash);
 	if (cmd == "prio") {
 		ec_cmd = new CECPacket(EC_OP_SHARED_SET_PRIO);
 		hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)opt_arg));
-	} else if ( cmd == "prioup" ) {
+	} else if (cmd == "prioup") {
 		SharedFile *file = m_SharedFileInfo.GetByHash(fileHash);
-		if ( file ) {
+		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 == "priodown" ) {
+	} else if (cmd == "priodown") {
 		SharedFile *file = m_SharedFileInfo.GetByHash(fileHash);
-		if ( file ) {
+		if (file) {
 			ec_cmd = new CECPacket(EC_OP_SHARED_SET_PRIO);
 			hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO,
 				GetLowerPrioShared(file->nFilePriority, file->bFileAutoPriority)));
 		}
 	}
 
-	if ( ec_cmd ) {
+	if (ec_cmd) {
 		ec_cmd->AddTag(hashtag);
 		Send_Discard_V2_Request(ec_cmd);
 		delete ec_cmd;
@@ -418,7 +438,7 @@
 {
 	CECPacket *ec_cmd = 0;
 	CMD4Hash fileHash;
-	wxCHECK2(fileHash.Decode(file_hash), /* Do nothing. */ );
+	wxCHECK2(fileHash.Decode(file_hash), /* Do nothing. */);
 
 	CECTag hashtag(EC_TAG_PARTFILE, fileHash);
 	if (cmd == "pause") {
@@ -432,21 +452,21 @@
 		hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)opt_arg));
 	} else if (cmd == "prioup") {
 		DownloadFile *file = m_DownloadFileInfo.GetByHash(fileHash);
-		if ( file ) {
+		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 == "priodown") {
 		DownloadFile *file = m_DownloadFileInfo.GetByHash(fileHash);
-		if ( file ) {
+		if (file) {
 			ec_cmd = new CECPacket(EC_OP_PARTFILE_PRIO_SET);
 			hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO,
 				GetLowerPrio(file->lFilePrio, file->bFileAutoPriority)));
 		}
 	}
 
-	if ( ec_cmd ) {
+	if (ec_cmd) {
 		ec_cmd->AddTag(hashtag);
 		Send_Discard_V2_Request(ec_cmd);
 		delete ec_cmd;
@@ -456,7 +476,7 @@
 void CWebServerBase::Send_DownloadSearchFile_Cmd(wxString file_hash, uint8 cat)
 {
 	CMD4Hash fileHash;
-	wxCHECK2(fileHash.Decode(file_hash), /* Do nothing. */ );
+	wxCHECK2(fileHash.Decode(file_hash), /* Do nothing. */);
 
 	CECPacket ec_cmd(EC_OP_DOWNLOAD_SEARCH_RESULT);
 	CECTag link_tag(EC_TAG_KNOWNFILE, fileHash);
@@ -478,31 +498,35 @@
 
 void CWebServerBase::Send_Server_Cmd(uint32 ip, uint16 port, wxString cmd)
 {
-	if ( !ip ) {
+	if (!ip) {
 		return;
 	}
 
 	CECPacket *ec_cmd = 0;
-	if ( cmd == "connect" ) {
+	if (cmd == "connect") {
 		ec_cmd = new CECPacket(EC_OP_SERVER_CONNECT);
-	} else if ( cmd == "remove" ) {
+	} else if (cmd == "remove") {
 		ec_cmd = new CECPacket(EC_OP_SERVER_REMOVE);
-	} else if ( cmd == "disconnect" ) {
+	} else if (cmd == "disconnect") {
 		ec_cmd = new CECPacket(EC_OP_SERVER_DISCONNECT);
 	}
-	if ( ec_cmd ) {
+	if (ec_cmd) {
 		ec_cmd->AddTag(CECTag(EC_TAG_SERVER, EC_IPv4_t(ip, port)));
 		Send_Discard_V2_Request(ec_cmd);
 		delete ec_cmd;
 	}
 }
 
-void CWebServerBase::Send_Search_Cmd(wxString search, wxString extention, wxString type,
-	EC_SEARCH_TYPE search_type, uint32 avail, uint32 min_size, uint32 max_size)
+void CWebServerBase::Send_Search_Cmd(wxString search,
+	wxString extention,
+	wxString type,
+	EC_SEARCH_TYPE search_type,
+	uint32 avail,
+	uint32 min_size,
+	uint32 max_size)
 {
 	CECPacket search_req(EC_OP_SEARCH_START);
-	search_req.AddTag(CEC_Search_Tag (search, search_type,
-		type, extention, avail, min_size, max_size));
+	search_req.AddTag(CEC_Search_Tag(search, search_type, type, extention, avail, min_size, max_size));
 	Send_Discard_V2_Request(&search_req);
 }
 
@@ -513,9 +537,9 @@
 	link_tag.AddTag(CECTag(EC_TAG_PARTFILE_CAT, cat));
 	req.AddTag(link_tag);
 	const CECPacket *response = webInterface->SendRecvMsg_v2(&req);
-	// SendRecvMsg_v2 returns null on EC connection failure.
-	// Treat a missing response as a failed command (same as EC_OP_FAILED)
-	// so the PHP caller gets a defined bool rather than a crash.
+	// SendRecvMsg_v2 returns null on EC connection failure. Treat a missing response as a
+	// failed command (same as EC_OP_FAILED) so the PHP caller gets a defined bool rather than a
+	// crash.
 	if (!response) {
 		return true;
 	}
@@ -526,10 +550,11 @@
 
 // We have to add gz-header and some other stuff
 // to standard zlib functions in order to use gzip in web pages
-int CWebServerBase::GzipCompress(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level)
+int CWebServerBase::GzipCompress(
+	Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level)
 {
-	static const int gz_magic2 = {0x1f, 0x8b}; // gzip magic header
-	z_stream stream = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+	static const int gz_magic2 = { 0x1f, 0x8b }; // gzip magic header
+	z_stream stream = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	stream.zalloc = (alloc_func)0;
 	stream.zfree = (free_func)0;
 	stream.opaque = (voidpf)0;
@@ -541,43 +566,45 @@
 		return err;
 	}
 
-	snprintf((char*)dest, *destLen, "%c%c%c%c%c%c%c%c%c%c", gz_magic0, gz_magic1,
-		Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, 255);
-
-	// wire buffers
-	stream.next_in = const_cast<Bytef*>(source);
+	snprintf((char *)dest,
+		*destLen,
+		"%c%c%c%c%c%c%c%c%c%c",
+		gz_magic0,
+		gz_magic1,
+		Z_DEFLATED,
+		0 /*flags*/,
+		0,
+		0,
+		0,
+		0 /*time*/,
+		0 /*xflags*/,
+		255);
+
+	stream.next_in = const_cast<Bytef *>(source);
 	stream.avail_in = (uInt)sourceLen;
-	stream.next_out = ((Bytef*) dest) + 10;
+	stream.next_out = ((Bytef *)dest) + 10;
 	stream.avail_out = *destLen - 18;
-	// doit
 	err = deflate(&stream, Z_FINISH);
 	if (err != Z_STREAM_END) {
 		deflateEnd(&stream);
 		return err;
 	}
 	err = deflateEnd(&stream);
-	crc = crc32(crc, (const Bytef *) source ,  sourceLen );
-	//CRC
-	*(((Bytef*) dest)+10+stream.total_out) = (Bytef)(crc & 0xFF);
-	*(((Bytef*) dest)+10+stream.total_out+1) = (Bytef)((crc>>8) & 0xFF);
-	*(((Bytef*) dest)+10+stream.total_out+2) = (Bytef)((crc>>16) & 0xFF);
-	*(((Bytef*) dest)+10+stream.total_out+3) = (Bytef)((crc>>24) & 0xFF);
-	// Length
-	*(((Bytef*) dest)+10+stream.total_out+4) = (Bytef)( sourceLen  & 0xFF);
-	*(((Bytef*) dest)+10+stream.total_out+5) = (Bytef)(( sourceLen >>8) & 0xFF);
-	*(((Bytef*) dest)+10+stream.total_out+6) = (Bytef)(( sourceLen >>16) &	0xFF);
-	*(((Bytef*) dest)+10+stream.total_out+7) = (Bytef)(( sourceLen >>24) &	0xFF);
-	// return  destLength
+	crc = crc32(crc, (const Bytef *)source, sourceLen);
+	*(((Bytef *)dest) + 10 + stream.total_out) = (Bytef)(crc & 0xFF);
+	*(((Bytef *)dest) + 10 + stream.total_out + 1) = (Bytef)((crc >> 8) & 0xFF);
+	*(((Bytef *)dest) + 10 + stream.total_out + 2) = (Bytef)((crc >> 16) & 0xFF);
+	*(((Bytef *)dest) + 10 + stream.total_out + 3) = (Bytef)((crc >> 24) & 0xFF);
+	*(((Bytef *)dest) + 10 + stream.total_out + 4) = (Bytef)(sourceLen & 0xFF);
+	*(((Bytef *)dest) + 10 + stream.total_out + 5) = (Bytef)((sourceLen >> 8) & 0xFF);
+	*(((Bytef *)dest) + 10 + stream.total_out + 6) = (Bytef)((sourceLen >> 16) & 0xFF);
+	*(((Bytef *)dest) + 10 + stream.total_out + 7) = (Bytef)((sourceLen >> 24) & 0xFF);
 	*destLen = 10 + stream.total_out + 8;
 
 	return err;
 }
 
-
-
-/*
- * Item container implementation
- */
+// Item container implementation
 
 ServersInfo *ServerEntry::GetContainerInstance()
 {
@@ -586,10 +613,10 @@
 
 ServersInfo *ServersInfo::m_This = 0;
 
-ServersInfo::ServersInfo(CamulewebApp *webApp) : ItemsContainer<ServerEntry>(webApp)
+ServersInfo::ServersInfo(CamulewebApp *webApp)
+: ItemsContainer<ServerEntry>(webApp)
 {
 	m_This = this;
-
 }
 
 bool ServersInfo::ReQuery()
@@ -603,22 +630,18 @@
 	// query succeeded - flush existing values and refill
 	EraseAll();
 	for (CECPacket::const_iterator it = srv_reply->begin(); it != srv_reply->end(); ++it) {
-		const CECTag *tag = & *it;
+		const CECTag *tag = &*it;
 
 		ServerEntry Entry;
-		Entry.sServerName =
-			_SpecialChars(tag->GetTagByNameSafe(EC_TAG_SERVER_NAME)->GetStringData());
+		Entry.sServerName = _SpecialChars(tag->GetTagByNameSafe(EC_TAG_SERVER_NAME)->GetStringData());
 		Entry.sServerDescription =
 			_SpecialChars(tag->GetTagByNameSafe(EC_TAG_SERVER_DESC)->GetStringData());
 		Entry.sServerIP = tag->GetIPv4Data().StringIP(false);
 		Entry.nServerIP = tag->GetIPv4Data().IP();
 		Entry.nServerPort = tag->GetIPv4Data().m_port;
-		Entry.nServerUsers =
-			tag->GetTagByNameSafe(EC_TAG_SERVER_USERS)->GetInt();
-		Entry.nServerMaxUsers =
-			tag->GetTagByNameSafe(EC_TAG_SERVER_USERS_MAX)->GetInt();
-		Entry.nServerFiles =
-			tag->GetTagByNameSafe(EC_TAG_SERVER_FILES)->GetInt();
+		Entry.nServerUsers = tag->GetTagByNameSafe(EC_TAG_SERVER_USERS)->GetInt();
+		Entry.nServerMaxUsers = tag->GetTagByNameSafe(EC_TAG_SERVER_USERS_MAX)->GetInt();
+		Entry.nServerFiles = tag->GetTagByNameSafe(EC_TAG_SERVER_FILES)->GetInt();
 		AddItem(Entry);
 	}
 	delete srv_reply;
@@ -626,15 +649,15 @@
 	return true;
 }
 
-
-SharedFile::SharedFile(CEC_SharedFile_Tag *tag) : CECID(tag->ID())
+SharedFile::SharedFile(CEC_SharedFile_Tag *tag)
+: CECID(tag->ID())
 {
-		sFileName = _SpecialChars(tag->FileName());
-		lFileSize = tag->SizeFull();
-		sED2kLink = _SpecialChars(tag->FileEd2kLink());
-		nHash = tag->FileHash();
+	sFileName = _SpecialChars(tag->FileName());
+	lFileSize = tag->SizeFull();
+	sED2kLink = _SpecialChars(tag->FileEd2kLink());
+	nHash = tag->FileHash();
 
-		ProcessUpdate(tag);
+	ProcessUpdate(tag);
 }
 
 void SharedFile::ProcessUpdate(CEC_SharedFile_Tag *tag)
@@ -647,7 +670,7 @@
 	nFileAllTimeAccepts = tag->GetAllAccepts();
 	sFileHash = nHash.Encode();
 	nFilePriority = tag->UpPrio();
-	if ( nFilePriority >= 10 ) {
+	if (nFilePriority >= 10) {
 		bFileAutoPriority = true;
 		nFilePriority -= 10;
 	} else {
@@ -662,13 +685,12 @@
 
 SharedFileInfo *SharedFileInfo::m_This = 0;
 
-SharedFileInfo::SharedFileInfo(CamulewebApp *webApp) :
-	UpdatableItemsContainer<SharedFile, CEC_SharedFile_Tag, uint32>(webApp)
+SharedFileInfo::SharedFileInfo(CamulewebApp *webApp)
+: UpdatableItemsContainer<SharedFile, CEC_SharedFile_Tag, uint32>(webApp)
 {
 	m_This = this;
 }
 
-
 bool SharedFileInfo::ReQuery()
 {
 	DoRequery(EC_OP_GET_SHARED_FILES, EC_TAG_KNOWNFILE);
@@ -676,8 +698,8 @@
 	return true;
 }
 
-
-DownloadFile::DownloadFile(CEC_PartFile_Tag *tag) : CECID(tag->ID())
+DownloadFile::DownloadFile(CEC_PartFile_Tag *tag)
+: CECID(tag->ID())
 {
 	nHash = tag->FileHash();
 	sFileName = _SpecialChars(tag->FileName());
@@ -687,8 +709,8 @@
 	lFileCompleted = tag->SizeDone();
 	lFileTransferred = tag->SizeXfer();
 	lFileSpeed = tag->Speed();
-	fCompleted = (100.0*lFileCompleted) / lFileSize;
-	wxtLastSeenComplete = wxDateTime( tag->LastSeenComplete() );
+	fCompleted = (100.0 * lFileCompleted) / lFileSize;
+	wxtLastSeenComplete = wxDateTime(tag->LastSeenComplete());
 
 	ProcessUpdate(tag);
 }
@@ -700,7 +722,7 @@
 	}
 
 	lFilePrio = tag->DownPrio();
-	if ( lFilePrio >= 10 ) {
+	if (lFilePrio >= 10) {
 		lFilePrio -= 10;
 		bFileAutoPriority = true;
 	} else {
@@ -713,11 +735,11 @@
 	lNotCurrentSourceCount = tag->SourceNotCurrCount();
 	lTransferringSourceCount = tag->SourceXferCount();
 	lSourceCountA4AF = tag->SourceCountA4AF();
-	if ( lTransferringSourceCount > 0 ) {
+	if (lTransferringSourceCount > 0) {
 		lFileCompleted = tag->SizeDone();
 		lFileTransferred = tag->SizeXfer();
 		lFileSpeed = tag->Speed();
-		fCompleted = (100.0*lFileCompleted) / lFileSize;
+		fCompleted = (100.0 * lFileCompleted) / lFileSize;
 	} else {
 		lFileSpeed = 0;
 	}
@@ -736,9 +758,9 @@
 		m_Encoder.DecodeReqs(req_tag, reqs);
 		int reqcount = reqs.size() / 2;
 		m_ReqParts.resize(reqcount);
-		for (int i = 0; i < reqcount;i++) {
-			m_ReqPartsi.start = reqs2*i;
-			m_ReqPartsi.end   = reqs2*i+1;
+		for (int i = 0; i < reqcount; i++) {
+			m_ReqPartsi.start = reqs2 * i;
+			m_ReqPartsi.end = reqs2 * i + 1;
 		}
 	}
 }
@@ -750,8 +772,8 @@
 
 DownloadFileInfo *DownloadFileInfo::m_This = 0;
 
-DownloadFileInfo::DownloadFileInfo(CamulewebApp *webApp, CImageLib *imlib) :
-	UpdatableItemsContainer<DownloadFile, CEC_PartFile_Tag, uint32>(webApp)
+DownloadFileInfo::DownloadFileInfo(CamulewebApp *webApp, CImageLib *imlib)
+: UpdatableItemsContainer<DownloadFile, CEC_PartFile_Tag, uint32>(webApp)
 {
 	m_This = this;
 	m_ImageLib = imlib;
@@ -789,8 +811,8 @@
 	return true;
 }
 
-
-UploadFile::UploadFile(CEC_UpDownClient_Tag *tag) : CECID(tag->ID())
+UploadFile::UploadFile(CEC_UpDownClient_Tag *tag)
+: CECID(tag->ID())
 {
 	sUserName = _SpecialChars(tag->ClientName());
 	nSpeed = tag->SpeedUp();
@@ -807,7 +829,8 @@
 
 UploadsInfo *UploadsInfo::m_This = 0;
 
-UploadsInfo::UploadsInfo(CamulewebApp *webApp) : ItemsContainer<UploadFile>(webApp)
+UploadsInfo::UploadsInfo(CamulewebApp *webApp)
+: ItemsContainer<UploadFile>(webApp)
 {
 	m_This = this;
 }
@@ -824,7 +847,7 @@
 	EraseAll();
 	for (CECPacket::const_iterator it = up_reply->begin(); it != up_reply->end(); ++it) {
 
-		UploadFile curr((CEC_UpDownClient_Tag *) & *it);
+		UploadFile curr((CEC_UpDownClient_Tag *)&*it);
 
 		AddItem(curr);
 	}
@@ -833,7 +856,8 @@
 	return true;
 }
 
-SearchFile::SearchFile(CEC_SearchFile_Tag *tag) : CECID(tag->ID())
+SearchFile::SearchFile(CEC_SearchFile_Tag *tag)
+: CECID(tag->ID())
 {
 	nHash = tag->FileHash();
 	sHash = nHash.Encode();
@@ -855,8 +879,8 @@
 
 SearchInfo *SearchInfo::m_This = 0;
 
-SearchInfo::SearchInfo(CamulewebApp *webApp) :
-	UpdatableItemsContainer<SearchFile, CEC_SearchFile_Tag, uint32>(webApp)
+SearchInfo::SearchInfo(CamulewebApp *webApp)
+: UpdatableItemsContainer<SearchFile, CEC_SearchFile_Tag, uint32>(webApp)
 {
 	m_This = this;
 }
@@ -868,32 +892,31 @@
 	return true;
 }
 
-
 /*!
- * Image classes:
- *
- * CFileImage: simply represent local file
- * CDynProgressImage: dynamically generated from gap info
+ * Image classes: CFileImage represents a local file; CDynProgressImage is generated from gap info.
  */
 
 CAnyImage::CAnyImage(int size)
 {
 	m_size = 0;
 	m_alloc_size = size;
-	if ( m_alloc_size ) {
+	if (m_alloc_size) {
 		m_data = new unsigned charm_alloc_size;
 	} else {
 		m_data = 0;
 	}
 }
 
-CAnyImage::CAnyImage(int width, int height) : m_width(width), m_height(height)
+CAnyImage::CAnyImage(int width, int height)
+: m_width(width)
+, m_height(height)
 {
 	m_size = 0;
 	// allocate considering image header
-	m_alloc_size = static_cast<unsigned long>(width) *
-		static_cast<unsigned long>(height) * sizeof(uint32) + 0x100;
-	if ( m_alloc_size ) {
+	m_alloc_size =
+		static_cast<unsigned long>(width) * static_cast<unsigned long>(height) * sizeof(uint32) +
+		0x100;
+	if (m_alloc_size) {
 		m_data = new unsigned charm_alloc_size;
 	} else {
 		m_data = 0;
@@ -902,21 +925,21 @@
 
 CAnyImage::~CAnyImage()
 {
-	if ( m_data ) {
-		delete  m_data;
+	if (m_data) {
+		delete m_data;
 	}
 }
 
 void CAnyImage::Realloc(int size)
 {
-	if ( size == m_alloc_size ) {
+	if (size == m_alloc_size) {
 		return;
 	}
 	// always grow, but shrink only x2
-	if ( (size > m_alloc_size) || (size < (m_alloc_size / 2)) ) {
+	if ((size > m_alloc_size) || (size < (m_alloc_size / 2))) {
 		m_alloc_size = size;
-		if ( m_data ) {
-			delete  m_data;
+		if (m_data) {
+			delete m_data;
 		}
 		m_data = new unsigned charm_alloc_size;
 	}
@@ -940,7 +963,8 @@
 	m_Http += "ETag: " + MD5Sum(char2unicode(tmp)).GetHash() + "\r\n";
 }
 
-CFileImage::CFileImage(const wxString& name) : CAnyImage(0)
+CFileImage::CFileImage(const wxString &name)
+: CAnyImage(0)
 {
 	m_size = 0;
 	m_name = name;
@@ -950,16 +974,16 @@
 	wxFFile fis(m_name);
 #endif
 	// FIXME: proper logging is needed
-	if ( fis.IsOpened() ) {
+	if (fis.IsOpened()) {
 		size_t file_size = fis.Length();
-		if ( file_size ) {
+		if (file_size) {
 			Realloc(fis.Length());
-			m_size = fis.Read(m_data,file_size);
+			m_size = fis.Read(m_data, file_size);
 		} else {
 			printf("CFileImage: file %s have zero length\n", (const char *)unicode2char(m_name));
 		}
 		wxString ext = m_name.Right(3).MakeLower();
-		if ( ext == "css" ) {
+		if (ext == "css") {
 			SetHttpType("text/css");
 		} else {
 			SetHttpType("image/" + ext);
@@ -970,28 +994,28 @@
 }
 
 /*!
- * "Modifiers" for 3D look of progress bar. Those modifiers must be substracted from
- * image (with saturation), values, and not multiplied, as amule doesn for some reason.
- *
+ * "Modifiers" for the 3D look of the progress bar. They must be subtracted from the image values
+ * (with saturation), not multiplied as amule does for some reason.
  */
 CImage3D_Modifiers::CImage3D_Modifiers(int width)
 {
 	m_width = width;
 	m_modifiers = new unsigned charm_width;
-	for(int i = 0; i < m_width; i++) {
+	for (int i = 0; i < m_width; i++) {
 		// "70" - webserver uses fixed depth
-		double f_curr_mod = 30 * (1 + cos( (2 * M_PI) * ( m_width - (((double)i)/m_width) ) ) );
+		double f_curr_mod = 30 * (1 + cos((2 * M_PI) * (m_width - (((double)i) / m_width))));
 		m_modifiersi = (unsigned char)f_curr_mod;
 	}
 }
 
 CImage3D_Modifiers::~CImage3D_Modifiers()
 {
-	delete  m_modifiers;
+	delete m_modifiers;
 }
 
-CProgressImage::CProgressImage(int width, int height, wxString &tmpl, DownloadFile *file) :
-		CAnyImage(width, height), m_template(tmpl)
+CProgressImage::CProgressImage(int width, int height, wxString &tmpl, DownloadFile *file)
+: CAnyImage(width, height)
+, m_template(tmpl)
 {
 	m_file = file;
 	m_ColorLine = new uint32m_width;
@@ -999,34 +1023,28 @@
 
 CProgressImage::~CProgressImage()
 {
-	delete  m_ColorLine;
+	delete m_ColorLine;
 }
 
 void CProgressImage::CreateSpan()
 {
-	// Step 1: get gap list.  Use .data() rather than &m_Gaps0 so the
-	// pointer is well-defined when the vector is empty (no gaps yet on
-	// a fresh partfile, or all gaps closed on a just-completed file).
-	// libstdc++ debug-mode catches the operator-on-empty case as a
-	// libstdc++ assertion -> SIGABRT; release builds previously got away
-	// with undefined behaviour.  The loop below is already bounded by
-	// gap_list_size, so when the vector is empty the pointer is never
-	// dereferenced.
-	const Gap_Struct * gap_list = (const Gap_Struct *) m_file->m_Gaps.data();
+	// Step 1: get the gap list. .data() rather than &m_Gaps0, so the pointer is well-defined
+	// when the vector is empty -- no gaps yet on a fresh partfile, or all gaps closed on a
+	// just-completed one -- which libstdc++ debug mode otherwise catches as an assertion and
+	// SIGABRT. The loop below is bounded by gap_list_size, so an empty vector's pointer is
+	// never dereferenced.
+	const Gap_Struct *gap_list = (const Gap_Struct *)m_file->m_Gaps.data();
 	int gap_list_size = m_file->m_Gaps.size() / 2;
 
-	// allocate for worst case !
 	int color_gaps_alloc = 2 * (2 * gap_list_size + m_file->lFileSize / PARTSIZE + 1);
 	Color_Gap_Struct *colored_gaps = new Color_Gap_Structcolor_gaps_alloc;
 
-	// Step 2: combine gap and part status information
-
 	// Init first item to dummy info, so we will always have "previous" item
 	int colored_gaps_size = 0;
 	colored_gaps0.start = 0;
 	colored_gaps0.end = 0;
 	colored_gaps0.color = 0xffffffff;
-	for (int j = 0; j < gap_list_size;j++) {
+	for (int j = 0; j < gap_list_size; j++) {
 		uint64 gap_start = gap_listj.start;
 		uint64 gap_end = gap_listj.end;
 
@@ -1036,17 +1054,17 @@
 		for (uint32 i = start; i < end; i++) {
 			COLORTYPE color = RGB(255, 0, 0);
 			if (m_file->m_PartInfo.size() > i && m_file->m_PartInfoi) {
-				int blue = 210 - ( 22 * ( m_file->m_PartInfoi - 1 ) );
-				color = RGB( 0, ( blue < 0 ? 0 : blue ), 255 );
+				int blue = 210 - (22 * (m_file->m_PartInfoi - 1));
+				color = RGB(0, (blue < 0 ? 0 : blue), 255);
 			}
 
-			uint64 fill_gap_begin = ( (i == start)   ? gap_start: PARTSIZE * i );
-			uint64 fill_gap_end   = ( (i == (end - 1)) ? gap_end   : PARTSIZE * ( i + 1 ) );
+			uint64 fill_gap_begin = ((i == start) ? gap_start : PARTSIZE * i);
+			uint64 fill_gap_end = ((i == (end - 1)) ? gap_end : PARTSIZE * (i + 1));
 
 			wxASSERT(colored_gaps_size < color_gaps_alloc);
 
-			if ( (colored_gapscolored_gaps_size.end == fill_gap_begin) &&
-				(colored_gapscolored_gaps_size.color == color) ) {
+			if ((colored_gapscolored_gaps_size.end == fill_gap_begin) &&
+				(colored_gapscolored_gaps_size.color == color)) {
 				colored_gapscolored_gaps_size.end = fill_gap_end;
 			} else {
 				colored_gaps_size++;
@@ -1055,29 +1073,26 @@
 				colored_gapscolored_gaps_size.color = color;
 			}
 		}
-
 	}
 	//
 	// Now line rendering
-	for(int i = 0; i < m_width; ++i) {
+	for (int i = 0; i < m_width; ++i) {
 		m_ColorLinei = 0x0;
 	}
 	if (m_file->lFileSize < (uint32)m_width) {
-		//
-		// if file is that small, draw it in single step
-		//
+		// if the file is that small, draw it in a single step
 		if (!m_file->m_ReqParts.empty()) {
-			for(int i = 0; i < m_width; ++i) {
+			for (int i = 0; i < m_width; ++i) {
 				m_ColorLinei = RGB(255, 208, 0);
 			}
-		} else if ( colored_gaps_size ) {
-			for(int i = 0; i < m_width; ++i) {
+		} else if (colored_gaps_size) {
+			for (int i = 0; i < m_width; ++i) {
 				m_ColorLinei = colored_gaps1.color;
 			}
 		}
 	} else {
 		uint32 factor = m_file->lFileSize / m_width;
-		for (int i = 1; i <= colored_gaps_size;i++) {
+		for (int i = 1; i <= colored_gaps_size; i++) {
 			uint32 start = colored_gapsi.start / factor;
 			uint32 end = colored_gapsi.end / factor;
 			if ((int)end > m_width) {
@@ -1087,7 +1102,6 @@
 				m_ColorLinej = colored_gapsi.color;
 			}
 		}
-		// overwrite requested parts
 		for (uint32 i = 0; i < m_file->m_ReqParts.size(); i++) {
 			uint32 start = m_file->m_ReqPartsi.start / factor;
 			uint32 end = m_file->m_ReqPartsi.end / factor;
@@ -1099,37 +1113,31 @@
 			}
 		}
 	}
-	delete  colored_gaps;
+	delete colored_gaps;
 }
 
 #ifdef WITH_LIBPNG
 
-CDynPngImage::CDynPngImage(int w, int h) : CAnyImage(w, h)
+CDynPngImage::CDynPngImage(int w, int h)
+: CAnyImage(w, h)
 {
 
-	//
-	// Allocate array of "row pointers" - libpng need it in this form
-	// Fill it also with the image data
-	//
-	const size_t img_size = static_cast<size_t>(3) *
-		static_cast<size_t>(m_width) *
-		static_cast<size_t>(m_height);
+	// Array of "row pointers" - libpng needs it in this form; filled with the image data too.
+	const size_t img_size =
+		static_cast<size_t>(3) * static_cast<size_t>(m_width) * static_cast<size_t>(m_height);
 	m_img_data = new png_byteimg_size;
 	memset(m_img_data, 0, img_size);
-	m_row_ptrs = new png_bytep m_height;
-	for (int i = 0; i < m_height;i++) {
-		m_row_ptrsi = &m_img_data
-			static_cast<size_t>(3) *
-			static_cast<size_t>(m_width) *
-			static_cast<size_t>(i);
+	m_row_ptrs = new png_bytepm_height;
+	for (int i = 0; i < m_height; i++) {
+		m_row_ptrsi = &m_img_datastatic_cast<size_t>(3) * static_cast<size_t>(m_width) *
+					    static_cast<size_t>(i);
 	}
-
 }
 
 CDynPngImage::~CDynPngImage()
 {
-	delete  m_row_ptrs;
-	delete  m_img_data;
+	delete m_row_ptrs;
+	delete m_img_data;
 }
 
 void CDynPngImage::png_write_fn(png_structp png_ptr, png_bytep data, png_size_t length)
@@ -1140,14 +1148,19 @@
 	This->m_size += length;
 }
 
-
 unsigned char *CDynPngImage::RequestData(int &size)
 {
-	// write png into buffer
 	png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
 	png_infop info_ptr = png_create_info_struct(png_ptr);
-	png_set_IHDR(png_ptr, info_ptr, m_width, m_height, 8, PNG_COLOR_TYPE_RGB,
-		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+	png_set_IHDR(png_ptr,
+		info_ptr,
+		m_width,
+		m_height,
+		8,
+		PNG_COLOR_TYPE_RGB,
+		PNG_INTERLACE_NONE,
+		PNG_COMPRESSION_TYPE_DEFAULT,
+		PNG_FILTER_TYPE_DEFAULT);
 	png_set_write_fn(png_ptr, this, png_write_fn, 0);
 
 	m_size = 0;
@@ -1159,18 +1172,16 @@
 	return CAnyImage::RequestData(size);
 }
 
-CDynProgressImage::CDynProgressImage(int width, int height, wxString &tmpl, DownloadFile *file) :
-	CAnyImage(width, height),
-	CProgressImage(width, height, tmpl, file),
-	CDynPngImage(width, height),
-	m_modifiers(height)
+CDynProgressImage::CDynProgressImage(int width, int height, wxString &tmpl, DownloadFile *file)
+: CAnyImage(width, height)
+, CProgressImage(width, height, tmpl, file)
+, CDynPngImage(width, height)
+, m_modifiers(height)
 {
 	m_name = "dyn_" + m_file->sFileHash + ".png";
 }
 
-CDynProgressImage::~CDynProgressImage()
-{
-}
+CDynProgressImage::~CDynProgressImage() {}
 
 wxString CDynProgressImage::GetHTML()
 {
@@ -1182,22 +1193,21 @@
 {
 	CreateSpan();
 
-	for(int i = 0; i < m_height; i++) {
-			memset(m_row_ptrsi, 0, 3*m_width);
+	for (int i = 0; i < m_height; i++) {
+		memset(m_row_ptrsi, 0, 3 * m_width);
 	}
-	for(int i = 0; i < m_height/2; i++) {
+	for (int i = 0; i < m_height / 2; i++) {
 		png_bytep u_row = m_row_ptrsi;
-		png_bytep d_row = m_row_ptrsm_height-i-1;
-		for(int j = 0; j < m_width; j++) {
-			set_rgb_color_val(u_row+3*j, m_ColorLinej, m_modifiersi);
-			set_rgb_color_val(d_row+3*j, m_ColorLinej, m_modifiersi);
+		png_bytep d_row = m_row_ptrsm_height - i - 1;
+		for (int j = 0; j < m_width; j++) {
+			set_rgb_color_val(u_row + 3 * j, m_ColorLinej, m_modifiersi);
+			set_rgb_color_val(d_row + 3 * j, m_ColorLinej, m_modifiersi);
 		}
 	}
 }
 
 unsigned char *CDynProgressImage::RequestData(int &size)
 {
-	// create new one
 	DrawImage();
 
 	return CDynPngImage::RequestData(size);
@@ -1205,50 +1215,57 @@
 
 #else
 
-CDynProgressImage::CDynProgressImage(int width, int height, wxString &tmpl, DownloadFile *file) :
-	CAnyImage(width, height),
-	CProgressImage(width, height, tmpl, file)
+CDynProgressImage::CDynProgressImage(int width, int height, wxString &tmpl, DownloadFile *file)
+: CAnyImage(width, height)
+, CProgressImage(width, height, tmpl, file)
 {
 	m_name = "dyn_" + m_file->sFileHash + ".png";
-
 }
 
-
 wxString CDynProgressImage::GetHTML()
 {
-	static wxChar *progresscolor12 = {
-		"transparent.gif", "black.gif", "yellow.gif", "red.gif",
-		"blue1.gif",       "blue2.gif", "blue3.gif",  "blue4.gif",
-		"blue5.gif",       "blue6.gif", "green.gif",  "greenpercent.gif" };
+	static const wxString progresscolor12 = { wxS("transparent.gif"),
+		wxS("black.gif"),
+		wxS("yellow.gif"),
+		wxS("red.gif"),
+		wxS("blue1.gif"),
+		wxS("blue2.gif"),
+		wxS("blue3.gif"),
+		wxS("blue4.gif"),
+		wxS("blue5.gif"),
+		wxS("blue6.gif"),
+		wxS("green.gif"),
+		wxS("greenpercent.gif") };
 
 	CreateSpan();
 
 	wxString str;
 	uint32 lastcolor = m_ColorLine0;
 	int lastindex = 0;
-	for(int i = 0; i < m_width; i++) {
-		if ( (lastcolor != m_ColorLinei) || (i == (m_width - 1)) ) {
+	for (int i = 0; i < m_width; i++) {
+		if ((lastcolor != m_ColorLinei) || (i == (m_width - 1))) {
 			int color_idx = -1;
-			if ( lastcolor & RGB(0, 0, 0xff) ) { // blue
+			if (lastcolor & RGB(0, 0, 0xff)) { // blue
 				int green = (lastcolor >> 8) & 0xff;
 				// reverse calculation:  green = 210 - ( 22 * ( part_infoi - 1 ) )
-				wxASSERT( !green || (green < 211) );
+				wxASSERT(!green || (green < 211));
 				color_idx = (green) ? (210 - green) / 22 + 1 : 11;
 				// now calculate it same way as PartFile did
 				color_idx = (color_idx > 10) ? 9 : (4 + color_idx / 2);
 			} else {
-				if ( lastcolor & RGB(0, 0xff, 0) ) { // yellow
+				if (lastcolor & RGB(0, 0xff, 0)) { // yellow
 					color_idx = 2;
 				} else {
-					if ( lastcolor & RGB(0xff, 0, 0) ) { // red
+					if (lastcolor & RGB(0xff, 0, 0)) { // red
 						color_idx = 3;
 					} else {
 						color_idx = 1;
 					}
 				}
 			}
-			str += (CFormat(m_template) % progresscolorcolor_idx
-						% (i - lastindex) % wxString(progresscolorcolor_idx).BeforeLast('.')).GetString();
+			str += (CFormat(m_template) % progresscolorcolor_idx % (i - lastindex) %
+				wxString(progresscolorcolor_idx).BeforeLast('.'))
+				       .GetString();
 			lastindex = i;
 			lastcolor = m_ColorLinei;
 		}
@@ -1264,17 +1281,15 @@
 	m_size = size;
 	m_data = new uint32size;
 	m_max_value = 0;
-	//
 	// initial situation: all data is 0's
-	//
-	memset(m_data, 0, m_size*sizeof(int));
+	memset(m_data, 0, m_size * sizeof(int));
 	m_start_index = m_curr_index = 0;
 	m_end_index = size - 1;
 }
 
 CStatsData::~CStatsData()
 {
-	delete  m_data;
+	delete m_data;
 }
 
 uint32 CStatsData::GetFirst()
@@ -1296,7 +1311,7 @@
 	m_end_index = (m_end_index + 1) % m_size;
 	m_datam_start_index = sample;
 
-	if ( m_max_value < sample ) {
+	if (m_max_value < sample) {
 		m_max_value = sample;
 	}
 }
@@ -1352,26 +1367,25 @@
 	}
 	const uint32 *data = (const uint32 *)dataTag->GetTagData();
 	unsigned int count = dataTag->GetTagDataLen() / sizeof(uint32);
-	// Each sample group is exactly 4 uint32 values (down, up, conn, kad).
-	// A truncated or malformed tag could leave count % 4 != 0; clamp to
-	// the largest multiple of 4 that fits so we never read past the buffer.
+	// Each sample group is exactly 4 uint32 values (down, up, conn, kad). A truncated or
+	// malformed tag could leave count % 4 != 0; clamp to the largest multiple of 4 that fits so
+	// we never read past the buffer.
 	count -= count % 4;
 	for (unsigned int i = 0; i < count; i += 4) {
-		m_down_speed->PushSample(ENDIAN_NTOHL(datai+0));
-		m_up_speed->PushSample(ENDIAN_NTOHL(datai+1));
-		m_conn_number->PushSample(ENDIAN_NTOHL(datai+2));
-		m_kad_count->PushSample(ENDIAN_NTOHL(datai+3));
+		m_down_speed->PushSample(ENDIAN_NTOHL(datai + 0));
+		m_up_speed->PushSample(ENDIAN_NTOHL(datai + 1));
+		m_conn_number->PushSample(ENDIAN_NTOHL(datai + 2));
+		m_kad_count->PushSample(ENDIAN_NTOHL(datai + 3));
 	}
 	delete response;
 }
 
-//
 // Dynamically generated statistic images
-//
 #ifdef WITH_LIBPNG
 
-CDynStatisticImage::CDynStatisticImage(int height, bool scale1024, CStatsData *data) :
-	CAnyImage(data->Size(), height), CDynPngImage(data->Size(), height)
+CDynStatisticImage::CDynStatisticImage(int height, bool scale1024, CStatsData *data)
+: CAnyImage(data->Size(), height)
+, CDynPngImage(data->Size(), height)
 {
 	m_data = data;
 	m_scale1024 = scale1024;
@@ -1384,70 +1398,63 @@
 
 	// leave enough space for 4 digit number
 	int img_delta = m_num_font_w_size / 4;
-	m_left_margin = 4*(m_num_font_w_size + img_delta) + img_delta;
+	m_left_margin = 4 * (m_num_font_w_size + img_delta) + img_delta;
 	// leave enough space for number height
 	m_bottom_margin = m_num_font_h_size;
 
-
 	m_y_axis_size = m_height - m_bottom_margin;
 	// allocate storage for background. Using 1 chunk to speed up
 	// the rendering
-	m_background = new png_bytem_width*m_height*3;
+	m_background = new png_bytem_width * m_height * 3;
 	m_row_bg_ptrs = new png_bytepm_height;
-	for(int i = 0; i < m_height; i++) {
-		m_row_bg_ptrsi = &m_backgroundi*m_width*3;
+	for (int i = 0; i < m_height; i++) {
+		m_row_bg_ptrsi = &m_backgroundi * m_width * 3;
 	}
 
-	//
 	// Prepare background
-	//
 	static const COLORTYPE bg_color = RGB(0x00, 0x00, 0x40);
-	for(int i = 0; i < m_height; i++) {
+	for (int i = 0; i < m_height; i++) {
 		png_bytep u_row = m_row_bg_ptrsi;
-		for(int j = 0; j < m_width; j++) {
-			set_rgb_color_val(u_row+3*j, bg_color, 0);
+		for (int j = 0; j < m_width; j++) {
+			set_rgb_color_val(u_row + 3 * j, bg_color, 0);
 		}
 	}
-	//
 	// draw axis
-	//
 	static const COLORTYPE axis_color = RGB(0xff, 0xff, 0xff);
 	// Y
-	for(int i = m_bottom_margin; i < m_y_axis_size; i++) {
+	for (int i = m_bottom_margin; i < m_y_axis_size; i++) {
 		png_bytep u_row = m_row_bg_ptrsi;
-		set_rgb_color_val(u_row+3*(m_left_margin + 0), axis_color, 0);
-		set_rgb_color_val(u_row+3*(m_left_margin + 1), axis_color, 0);
+		set_rgb_color_val(u_row + 3 * (m_left_margin + 0), axis_color, 0);
+		set_rgb_color_val(u_row + 3 * (m_left_margin + 1), axis_color, 0);
 	}
 	// X
-	for(int j = m_left_margin; j < m_width; j++) {
-		set_rgb_color_val(m_row_bg_ptrsm_y_axis_size - 0+3*j, axis_color, 0);
-		set_rgb_color_val(m_row_bg_ptrsm_y_axis_size - 1+3*j, axis_color, 0);
+	for (int j = m_left_margin; j < m_width; j++) {
+		set_rgb_color_val(m_row_bg_ptrsm_y_axis_size - 0 + 3 * j, axis_color, 0);
+		set_rgb_color_val(m_row_bg_ptrsm_y_axis_size - 1 + 3 * j, axis_color, 0);
 	}
 
 	// horizontal grid
 	int v_grid_size = m_y_axis_size / 4;
-	for(int i = m_y_axis_size - v_grid_size; i >= v_grid_size; i -= v_grid_size) {
+	for (int i = m_y_axis_size - v_grid_size; i >= v_grid_size; i -= v_grid_size) {
 		png_bytep u_row = m_row_bg_ptrsi;
-		for(int j = m_left_margin; j < m_width; j++) {
-			if ( (j % 10) < 5 ) {
-				set_rgb_color_val(u_row+3*j, axis_color, 0);
+		for (int j = m_left_margin; j < m_width; j++) {
+			if ((j % 10) < 5) {
+				set_rgb_color_val(u_row + 3 * j, axis_color, 0);
 			}
 		}
 	}
 
-	//
 	// Pre-create masks for digits 0-9 and unit prefixes K/M/G/T.
-	//
-	for(int i = 0; i < 14; i++) {
+	for (int i = 0; i < 14; i++) {
 		m_digitsi = new CNumImageMask(i, m_num_font_w_size, m_num_font_h_size);
 	}
 }
 
 CDynStatisticImage::~CDynStatisticImage()
 {
-	delete  m_row_bg_ptrs;
-	delete  m_background;
-	for(int i = 0; i < 14; i++) {
+	delete m_row_bg_ptrs;
+	delete m_background;
+	for (int i = 0; i < 14; i++) {
 		delete m_digitsi;
 	}
 }
@@ -1455,54 +1462,47 @@
 void CDynStatisticImage::DrawImage()
 {
 	// copy background first
-	memcpy(m_img_data, m_background,
-		static_cast<size_t>(m_width) * m_height * 3u);
+	memcpy(m_img_data, m_background, static_cast<size_t>(m_width) * m_height * 3u);
 
-	//
-	// Now graph itself
-	//
+	// Now the graph itself
 	static const COLORTYPE graph_color = RGB(0xff, 0x00, 0x00);
 	int maxval = m_data->Max();
 
-	if ( m_scale1024 ) {
-		if ( maxval > 1024 ) {
+	if (m_scale1024) {
+		if (maxval > 1024) {
 			maxval /= 1024;
 		} else {
 			maxval = 1;
 		}
 	}
-	//
 	// Check if we need to scale data up or down
-	//
 	int m_scale_up = 1, m_scale_down = 1;
-	if ( maxval >= (m_height - m_bottom_margin) ) {
+	if (maxval >= (m_height - m_bottom_margin)) {
 		m_scale_down = 1 + (maxval / (m_y_axis_size - 10));
 	}
 	// if maximum value is 1/5 or less of graph height - scale it UP, to make 2/3
-	if ( maxval && (maxval < (m_y_axis_size / 5)) ) {
-		m_scale_up = (2*m_y_axis_size / 3) / maxval;
+	if (maxval && (maxval < (m_y_axis_size / 5))) {
+		m_scale_up = (2 * m_y_axis_size / 3) / maxval;
 	}
 
-	//
 	// draw axis scale
-	//
 	int img_delta = m_num_font_w_size / 4;
 	// Number "0" is always there
-	m_digits0->Apply(m_row_ptrs, 3*img_delta+2*m_num_font_w_size, m_y_axis_size-m_num_font_h_size-5);
+	m_digits0->Apply(
+		m_row_ptrs, 3 * img_delta + 2 * m_num_font_w_size, m_y_axis_size - m_num_font_h_size - 5);
 
 	//
 	// When data is scaled down, axis are scaled UP and vice-versa
 	int y_axis_max = m_y_axis_size;
-	if ( m_scale_down != 1 ) {
+	if (m_scale_down != 1) {
 		y_axis_max *= m_scale_down;
-	} else if ( m_scale_up != 1 ) {
+	} else if (m_scale_up != 1) {
 		y_axis_max /= m_scale_up;
 	}
 
-	// Render the y-axis maximum into the four pre-sized digit cells. When
-	// the value fits in 4 digits we render it as-is; above 9999 we collapse
-	// to a 3-digit number plus a K/M/G/T suffix glyph in the fourth cell
-	// so the label remains within the pre-sized margin.
+	// Render the y-axis maximum into the four pre-sized digit cells. A value that fits in 4
+	// digits is rendered as-is; above 9999 it collapses to a 3-digit number plus a K/M/G/T
+	// suffix glyph in the fourth cell, so the label stays within the pre-sized margin.
 	int label_value = y_axis_max;
 	int suffix_idx = -1;
 	if (label_value >= 10000) {
@@ -1523,10 +1523,10 @@
 	}
 
 	// Cell origins, left to right: (n+1)*img_delta + n*m_num_font_w_size.
-	const int cell0_x =   img_delta;
-	const int cell1_x = 2*img_delta +   m_num_font_w_size;
-	const int cell2_x = 3*img_delta + 2*m_num_font_w_size;
-	const int cell3_x = 4*img_delta + 3*m_num_font_w_size;
+	const int cell0_x = img_delta;
+	const int cell1_x = 2 * img_delta + m_num_font_w_size;
+	const int cell2_x = 3 * img_delta + 2 * m_num_font_w_size;
+	const int cell3_x = 4 * img_delta + 3 * m_num_font_w_size;
 
 	if (suffix_idx >= 0) {
 		// 3 digits + suffix. label_value is in 1, 999 after scaling.
@@ -1553,44 +1553,45 @@
 	}
 
 	int prev_data = m_data->GetFirst();
-	if ( m_scale_down != 1 ) {
+	if (m_scale_down != 1) {
 		prev_data /= m_scale_down;
-	} else if ( m_scale_up != 1 ) {
+	} else if (m_scale_up != 1) {
 		prev_data *= m_scale_up;
 	}
-	if ( m_scale1024 ) {
-		if ( prev_data > 1024) {
+	if (m_scale1024) {
+		if (prev_data > 1024) {
 			prev_data /= 1024;
 		} else {
 			prev_data = 1;
 		}
 	}
-	for(int j = m_left_margin + 1, curr_data = m_data->GetNext(); j < m_width; j++, curr_data = m_data->GetNext()) {
-		if ( m_scale_down != 1 ) {
+	for (int j = m_left_margin + 1, curr_data = m_data->GetNext(); j < m_width;
+		j++, curr_data = m_data->GetNext()) {
+		if (m_scale_down != 1) {
 			curr_data /= m_scale_down;
-		} else if ( m_scale_up != 1 ) {
+		} else if (m_scale_up != 1) {
 			curr_data *= m_scale_up;
 		}
-		if ( m_scale1024 ) {
-			if ( curr_data > 1024) {
+		if (m_scale1024) {
+			if (curr_data > 1024) {
 				curr_data /= 1024;
 			} else {
 				curr_data = 1;
 			}
 		}
-		//
 		// draw between curr_data and prev_data
-		//
 		int min_y, max_y;
-		if ( prev_data > curr_data ) {
-			min_y = curr_data; max_y = prev_data;
+		if (prev_data > curr_data) {
+			min_y = curr_data;
+			max_y = prev_data;
 		} else {
-			min_y = prev_data; max_y = curr_data;
+			min_y = prev_data;
+			max_y = curr_data;
 		}
-		for(int k = min_y; k <= max_y; k++) {
+		for (int k = min_y; k <= max_y; k++) {
 			int i = m_y_axis_size - k;
 			png_bytep u_row = m_row_ptrsi;
-			set_rgb_color_val(u_row+3*j, graph_color, 0);
+			set_rgb_color_val(u_row + 3 * j, graph_color, 0);
 		}
 		prev_data = curr_data;
 	}
@@ -1608,16 +1609,14 @@
 	return "";
 }
 
-//
-// Imprint numbers on generated png's
-//
-// 7-segment encodings. Segment numbering matches the comment block in front
-// of DrawSegment below: 0=top, 1=top-left, 2=top-right, 3=middle, 4=bottom-left,
-// 5=bottom-right, 6=bottom. Indices 0-9 are digits. Indices 10-13 are the
-// unit-prefix glyphs K, M, G, T used when the y-axis maximum exceeds 9999;
-// K and M are stylized approximations (7-segment has no clean K/M).
+// Imprint numbers on generated PNGs. 7-segment encodings; segment numbering matches the comment
+// block in front of DrawSegment below: 0=top, 1=top-left, 2=top-right, 3=middle, 4=bottom-left,
+// 5=bottom-right, 6=bottom. Indices 0-9 are digits; 10-13 are the unit-prefix glyphs K, M, G, T
+// used when the y-axis maximum exceeds 9999. K and M are stylized approximations.
+// clang-format off
 //                                                 0     1     2     3     4     5     6     7     8     9     K     M     G     T
 const int CNumImageMask::m_num_to_7_decode = {0x77, 0x24, 0x5d, 0x6d, 0x2e, 0x6b, 0x7a, 0x25, 0x7f, 0x2f, 0x3a, 0x37, 0x7b, 0x5a};
+// clang-format on
 
 CNumImageMask::CNumImageMask(int number, int width, int height)
 {
@@ -1627,14 +1626,14 @@
 	m_width = width;
 
 	m_row_mask_ptrs = new png_bytepm_height;
-	for(int i = 0; i < m_height; i++) {
-		m_row_mask_ptrsi = new png_byte3*m_width;
-		memset(m_row_mask_ptrsi, 0x00, 3*m_width);
+	for (int i = 0; i < m_height; i++) {
+		m_row_mask_ptrsi = new png_byte3 * m_width;
+		memset(m_row_mask_ptrsi, 0x00, 3 * m_width);
 	}
 
 	int seg_status = m_num_to_7_decodenumber;
-	for(int i = 0; i < 7; i++) {
-		if ( seg_status & (1 << i) ) {
+	for (int i = 0; i < 7; i++) {
+		if (seg_status & (1 << i)) {
 			DrawSegment(i);
 		}
 	}
@@ -1642,19 +1641,19 @@
 
 CNumImageMask::~CNumImageMask()
 {
-	for(int i = 0; i < m_height; i++) {
-		delete  m_row_mask_ptrsi;
+	for (int i = 0; i < m_height; i++) {
+		delete m_row_mask_ptrsi;
 	}
-	delete  m_row_mask_ptrs;
+	delete m_row_mask_ptrs;
 }
 
 void CNumImageMask::Apply(png_bytep *image, int off_x, int off_y)
 {
 	off_x *= 3;
-	for(int i = 0; i < m_height; i++) {
+	for (int i = 0; i < m_height; i++) {
 		png_bytep img_row = imageoff_y + i;
 		png_bytep num_row = m_row_mask_ptrsi;
-		for(int j = 0; j < m_width*3; j++) {
+		for (int j = 0; j < m_width * 3; j++) {
 			img_rowoff_x + j |= num_rowj;
 		}
 	}
@@ -1662,18 +1661,18 @@
 
 void CNumImageMask::DrawHorzLine(int off)
 {
-	png_bytep m_row = m_row_mask_ptrsoff*(m_v_segsize-1);
-	for(int i = 0; i < m_h_segsize; i++) {
-		m_rowi*3 = m_rowi*3+1 = m_rowi*3+2 = 0xff;
+	png_bytep m_row = m_row_mask_ptrsoff * (m_v_segsize - 1);
+	for (int i = 0; i < m_h_segsize; i++) {
+		m_rowi * 3 = m_rowi * 3 + 1 = m_rowi * 3 + 2 = 0xff;
 	}
 }
 
 void CNumImageMask::DrawVertLine(int off_x, int off_y)
 {
-	for(int i = 0; i < m_v_segsize; i++) {
-		png_bytep m_row = m_row_mask_ptrsoff_y*(m_v_segsize-1)+i;
-		int x_idx = off_x*(m_h_segsize-1)*3;
-		m_rowx_idx = m_rowx_idx+1 = m_rowx_idx+2 = 0xff;
+	for (int i = 0; i < m_v_segsize; i++) {
+		png_bytep m_row = m_row_mask_ptrsoff_y * (m_v_segsize - 1) + i;
+		int x_idx = off_x * (m_h_segsize - 1) * 3;
+		m_rowx_idx = m_rowx_idx + 1 = m_rowx_idx + 2 = 0xff;
 	}
 }
 
@@ -1690,43 +1689,42 @@
  */
 void CNumImageMask::DrawSegment(int id)
 {
-	switch(id) {
-		case 0:
-			DrawHorzLine(0);
-			break;
-		case 1:
-			DrawVertLine(0, 0);
-			break;
-		case 2:
-			DrawVertLine(1, 0);
-			break;
-		case 3:
-			DrawHorzLine(1);
-			break;
-		case 4:
-			DrawVertLine(0, 1);
-			break;
-		case 5:
-			DrawVertLine(1, 1);
-			break;
-		case 6:
-			DrawHorzLine(2);
-			break;
-		default:
-			wxFAIL;
-			break;
+	switch (id) {
+	case 0:
+		DrawHorzLine(0);
+		break;
+	case 1:
+		DrawVertLine(0, 0);
+		break;
+	case 2:
+		DrawVertLine(1, 0);
+		break;
+	case 3:
+		DrawHorzLine(1);
+		break;
+	case 4:
+		DrawVertLine(0, 1);
+		break;
+	case 5:
+		DrawVertLine(1, 1);
+		break;
+	case 6:
+		DrawHorzLine(2);
+		break;
+	default:
+		wxFAIL;
+		break;
 	}
 }
 
 #endif
 
-CImageLib::CImageLib(wxString image_dir) : m_image_dir(image_dir)
+CImageLib::CImageLib(wxString image_dir)
+: m_image_dir(image_dir)
 {
 }
 
-CImageLib::~CImageLib()
-{
-}
+CImageLib::~CImageLib() {}
 
 void CImageLib::AddImage(CAnyImage *img, const wxString &name)
 {
@@ -1756,7 +1754,7 @@
 	}
 	wxFileName filename(m_image_dir + name);
 	CFileImage *fimg = new CFileImage(filename.GetFullPath());
-	if ( fimg->OpenOk() ) {
+	if (fimg->OpenOk()) {
 		m_image_mapname = fimg;
 		return fimg;
 	} else {
@@ -1765,34 +1763,30 @@
 	}
 }
 
-/*
- * Script-based webserver
- */
-CScriptWebServer::CScriptWebServer(CamulewebApp *webApp, const wxString& templateDir)
-	: CWebServerBase(webApp, templateDir), m_www_root(templateDir)
+// Script-based webserver
+CScriptWebServer::CScriptWebServer(CamulewebApp *webApp, const wxString &templateDir)
+: CWebServerBase(webApp, templateDir)
+, m_www_root(templateDir)
 {
 	wxString img_tmpl("<img src=\"%s\" height=\"20\" width=\"%d\" alt=\"%s\">");
 	m_DownloadFileInfo.LoadImageParams(img_tmpl, 200, 20);
 
-	if ( ::wxFileExists(wxFileName(m_www_root, "index.html").GetFullPath()) ) {
+	if (::wxFileExists(wxFileName(m_www_root, "index.html").GetFullPath())) {
 		m_index = "index.html";
-	} else if ( ::wxFileExists(wxFileName(m_www_root, "index.php").GetFullPath()) ) {
+	} else if (::wxFileExists(wxFileName(m_www_root, "index.php").GetFullPath())) {
 		m_index = "index.php";
 	} else {
 		webInterface->Show(_("Index file not found: ") +
-			wxFileName(m_www_root, "index.{html,php}").GetFullPath() + "\n");
+				   wxFileName(m_www_root, "index.{html,php}").GetFullPath() + "\n");
 	}
 }
 
-CScriptWebServer::~CScriptWebServer()
-{
-}
+CScriptWebServer::~CScriptWebServer() {}
 
 char *CScriptWebServer::GetErrorPage(const char *message, long &size)
 {
-	char *buf = new char 1024;
-	snprintf(buf, 1024,
-		"<html><title> Error -%s </title></html>", message);
+	char *buf = new char1024;
+	snprintf(buf, 1024, "<html><title> Error -%s </title></html>", message);
 
 	size = strlen(buf);
 
@@ -1801,38 +1795,36 @@
 
 char *CScriptWebServer::Get_404_Page(long &size)
 {
-		char *buf = new char 1024;
-		strcpy(buf, "<html><title> Error - requested page not found </title></html>");
+	char *buf = new char1024;
+	strcpy(buf, "<html><title> Error - requested page not found </title></html>");
 
-		size = strlen(buf);
+	size = strlen(buf);
 
-		return buf;
+	return buf;
 }
 
 char *CScriptWebServer::ProcessHtmlRequest(const char *filename, long &size)
 {
 	FILE *f = fopen(filename, "r");
-	if ( !f ) {
+	if (!f) {
 		return Get_404_Page(size);
 	}
-	if ( fseek(f, 0, SEEK_END) != 0 ) {
+	if (fseek(f, 0, SEEK_END) != 0) {
 		fclose(f);
 		return GetErrorPage("fseek failed", size);
 	}
 
-	// ftell returns long, which is 32-bit on Win64 (LLP64); store the
-	// raw return in a 64-bit local so a >2 GiB file (or a negative
-	// ftell error return) doesn't silently wrap into a bogus
-	// allocation size. Templates are tiny in practice, but the
-	// truncation would still bite a user pointing aMuleweb at an
-	// oversized file on disk.
+	// ftell returns long, which is 32-bit on Win64 (LLP64); store the raw return in a 64-bit
+	// local so a >2 GiB file, or a negative ftell error return, does not silently wrap into a
+	// bogus allocation size. Templates are tiny in practice, but the truncation would still
+	// bite a user pointing aMuleweb at an oversized file on disk.
 	const long long raw_size = ftell(f);
 	if (raw_size < 0 || raw_size > 0x7fffffffLL) {
 		fclose(f);
 		return GetErrorPage("template file too large or ftell failed", size);
 	}
 	size = static_cast<long>(raw_size);
-	char *buf = new char size+1;
+	char *buf = new charsize + 1;
 	rewind(f);
 	// fread may actually read less if it is a CR-LF-file in Windows
 	size = fread(buf, 1, size, f);
@@ -1845,7 +1837,7 @@
 char *CScriptWebServer::ProcessPhpRequest(const char *filename, CSession *sess, long &size)
 {
 	FILE *f = fopen(filename, "r");
-	if ( !f ) {
+	if (!f) {
 		return Get_404_Page(size);
 	}
 
@@ -1853,7 +1845,7 @@
 	CPhpFilter(this, sess, filename, &buffer);
 
 	size = buffer.Length();
-	char *buf = new char size+1;
+	char *buf = new charsize + 1;
 	buffer.CopyAll(buf);
 
 	fclose(f);
@@ -1865,14 +1857,14 @@
 {
 	time_t curr_time = time(0);
 	CSession *session = 0;
-	if ( Data.SessionID && m_sessions.count(Data.SessionID) ) {
+	if (Data.SessionID && m_sessions.count(Data.SessionID)) {
 		session = &m_sessionsData.SessionID;
-		if ( (curr_time - session->m_last_access) > SESSION_TIMEOUT_SECS ) {
+		if ((curr_time - session->m_last_access) > SESSION_TIMEOUT_SECS) {
 			Print(_("Session expired - requesting login\n"));
 			m_sessions.erase(Data.SessionID);
 			session = 0;
 		} else {
-			if ( session->m_logged_in ) {
+			if (session->m_logged_in) {
 				Print(_("Session ok, logged in\n"));
 			} else {
 				Print(_("Session ok, not logged in\n"));
@@ -1882,25 +1874,23 @@
 	} else {
 		Print(_("No session opened - will request login\n"));
 	}
-	if ( !session ) {
-		// CSPRNG-sourced 64-bit session token. Was `rand()` into an
-		// `int` before #870, which is neither CSPRNG-quality nor
-		// seeded with anything an attacker can't observe; that made
-		// session IDs guessable in modest time without ever touching
-		// the cookie. AutoSeededRandomPool is the same primitive the
-		// EC stack already uses for DH key agreement, so we're not
-		// dragging in new crypto -- just spending it on a problem
-		// that needed it. Reuse the pool across calls so the OS-RNG
-		// seeding cost is paid once per process.
+	if (!session) {
+		// CSPRNG-sourced 64-bit session token. Was `rand()` into an `int` before #870,
+		// which is neither CSPRNG-quality nor seeded with anything an attacker cannot
+		// observe; that made session IDs guessable in modest time without ever touching the
+		// cookie. AutoSeededRandomPool is the same primitive the EC stack already uses for
+		// DH key agreement, so we are not dragging in new crypto. Reuse the pool across
+		// calls so the OS-RNG seeding cost is paid once per process.
 		static CryptoPP::AutoSeededRandomPool s_sessionPool;
 		do {
 			uint64_t fresh = 0;
-			s_sessionPool.GenerateBlock(reinterpret_cast<CryptoPP::byte *>(&fresh), sizeof(fresh));
+			// unsigned char* (== Crypto++'s byte) binds on every Crypto++
+			// version; CryptoPP::byte only exists from 5.6.5+ (issue #449).
+			s_sessionPool.GenerateBlock(reinterpret_cast<unsigned char *>(&fresh), sizeof(fresh));
 			Data.SessionID = fresh;
-			// Loop on 0 (which means "no session" elsewhere in this
-			// file) or on the astronomically unlikely collision with
-			// an existing live session.
-		} while ( !Data.SessionID || m_sessions.count(Data.SessionID) );
+			// Loop on 0 (which means "no session" elsewhere in this file) or on the
+			// astronomically unlikely collision with an existing live session.
+		} while (!Data.SessionID || m_sessions.count(Data.SessionID));
 		session = &m_sessionsData.SessionID;
 		session->m_last_access = curr_time;
 		session->m_logged_in = false;
@@ -1910,7 +1900,6 @@
 	return session;
 }
 
-
 void CScriptWebServer::ProcessURL(ThreadData Data)
 {
 	long httpOutLen;
@@ -1921,33 +1910,30 @@
 
 	Print(_("Processing request original: ") + filename + "\n");
 
-	if ( filename.Length() == 0 ) {
+	if (filename.Length() == 0) {
 		filename = m_index;
 	}
 
 	CSession *session = CheckLoggedin(Data);
 
 	session->m_vars"login_error" = "";
-	// Stylesheets and scripts are public static assets, like the template
-	// images ProcessImgFileReq() already serves without a login. They are
-	// served statically from the template directory, never through the
-	// PHP interpreter.
+	// Stylesheets and scripts are public static assets, like the template images
+	// ProcessImgFileReq() already serves without a login. They are served statically from the
+	// template directory, never through the PHP interpreter.
 	bool public_asset = filename.EndsWith(wxT(".css")) || filename.EndsWith(wxT(".js"));
-	if ( !session->m_logged_in && !public_asset ) {
+	if (!session->m_logged_in && !public_asset) {
 		filename = "login.php";
 
-		// Refuse to consume `pass` if it's reachable via the original
-		// (pre-POST-body-merge) URL query string. Passwords in URLs
-		// leak into proxy logs / browser history / Referer headers,
-		// and the GET-with-pass click-attack vector is exactly what
-		// #872 exists to close. Note that `getOnlyParsedURL` is
-		// always populated -- for GET requests it's identical to
-		// `parsedURL`; for POST requests it's the pre-concat copy,
-		// so `pass` only shows up there when an attacker put it
-		// into a POST form's `action=...?pass=XYZ`. Either way,
-		// presence means "don't trust this password attempt".
+		// Refuse to consume `pass` if it is reachable via the original (pre-POST-body-
+		// merge) URL query string. Passwords in URLs leak into proxy logs, browser history
+		// and Referer headers, and the GET-with-pass click-attack vector is exactly what
+		// #872 exists to close. `getOnlyParsedURL` is always populated -- for GET requests
+		// it is identical to `parsedURL`; for POST requests it is the pre-concat copy, so
+		// `pass` only shows up there when an attacker put it into a POST form's
+		// `action=...?pass=XYZ`. Either way, presence means "do not trust this password
+		// attempt".
 		wxString PwStr;
-		if ( Data.getOnlyParsedURL.Param("pass").Length() ) {
+		if (Data.getOnlyParsedURL.Param("pass").Length()) {
 			Print(_("Refusing to read `pass` from URL query string\n"));
 		} else {
 			PwStr = Data.parsedURL.Param("pass");
@@ -1955,26 +1941,27 @@
 		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() ) {
+		} else if (PwStr.Length()) {
 			Print(_("Checking password\n"));
 			session->m_logged_in = false;
 
 			CMD4Hash PwHash;
 			if (!PwHash.Decode(MD5Sum(PwStr).GetHash())) {
 				Print(_("Password hash invalid\n"));
-				session->m_vars"login_error" = "Invalid password hash, please report at https://github.com/amule-org/amule/issues";
-			} else if ( PwHash == webInterface->m_AdminPass ) {
+				session->m_vars"login_error" = "Invalid password hash, please report at "
+								 "https://github.com/amule-org/amule/issues";
+			} else if (PwHash == webInterface->m_AdminPass) {
 				session->m_logged_in = true;
 				// m_vars is map<string, string> - so _() will not work here !
 				session->m_vars"guest_login" = "0";
-			} else if ( PwHash == webInterface->m_GuestPass ) {
+			} else if (PwHash == webInterface->m_GuestPass) {
 				session->m_logged_in = true;
 				session->m_vars"guest_login" = "1";
 			} else {
 				session->m_vars"login_error" = "Password incorrect, please try again.";
 			}
 
-			if ( session->m_logged_in ) {
+			if (session->m_logged_in) {
 				filename = m_index;
 				Print(_("Password ok\n"));
 			} else {
@@ -1984,11 +1971,8 @@
 			Print(_("You did not enter any password. Blank password is not allowed.\n"));
 		}
 	} else {
-		//
-		// if logged in, but requesting login page again,
-		// means logout command
-		//
-		if ( filename == "login.php" ) {
+		// if logged in but requesting the login page again, that means logout
+		if (filename == "login.php") {
 			Print(_("Logout requested\n"));
 			session->m_logged_in = false;
 		}
@@ -1996,8 +1980,8 @@
 
 	Print(_("Processing request redirected: ") + filename + "\n");
 
-	session->m_vars"auto_refresh" = (const char *)unicode2char(
-		wxString(CFormat("%d") % webInterface->m_PageRefresh));
+	session->m_vars"auto_refresh" =
+		(const char *)unicode2char(wxString(CFormat("%d") % webInterface->m_PageRefresh));
 	session->m_vars"content_type" = "text/html";
 
 	wxString req_file(wxFileName(m_www_root, filename).GetFullPath());
@@ -2011,13 +1995,10 @@
 	} else if (req_file.EndsWith(".js")) {
 		session->m_vars"content_type" = "text/javascript";
 		httpOut = ProcessHtmlRequest(unicode2char(req_file), httpOutLen);
-	} else if (	req_file.EndsWith(".dtd")
-				|| req_file.EndsWith(".xsd")
-				|| req_file.EndsWith(".xsl")) {
+	} else if (req_file.EndsWith(".dtd") || req_file.EndsWith(".xsd") || req_file.EndsWith(".xsl")) {
 		session->m_vars"content_type" = "text/xml";
 		httpOut = ProcessHtmlRequest(unicode2char(req_file), httpOutLen);
-	} else if (req_file.EndsWith(".appcache")
-		   || req_file.EndsWith(".manifest")) {
+	} else if (req_file.EndsWith(".appcache") || req_file.EndsWith(".manifest")) {
 		session->m_vars"content_type" = "text/cache-manifest";
 		httpOut = ProcessHtmlRequest(unicode2char(req_file), httpOutLen);
 	} else if (req_file.EndsWith(".json")) {
@@ -2029,22 +2010,24 @@
 
 	bool isUseGzip = webInterface->m_UseGzip;
 
-	if (isUseGzip)	{
+	if (isUseGzip) {
 		bool bOk = false;
-		// zlib's deflate worst-case expansion is sourceLen + (sourceLen/1000) + 12 bytes.
-		// GzipCompress adds an 18-byte gzip wrapper (10-byte header + 8-byte trailer).
+		// zlib's deflate worst-case expansion is sourceLen + (sourceLen/1000) + 12 bytes,
+		// and GzipCompress adds an 18-byte gzip wrapper (10-byte header + 8-byte trailer).
 		// The previous fixed +1024 slack was technically correct for the template sizes
 		// amuleweb serves today, but violated zlib's documented contract for large or
-		// maximally-incompressible payloads. Use the formula from the zlib manual so
-		// the buffer is always sufficient regardless of content size.
+		// maximally-incompressible payloads.
 		uLongf destLen = httpOutLen + (httpOutLen / 1000) + 30;
 		char *gzipOut = new chardestLen;
-		if( GzipCompress((Bytef*)gzipOut, &destLen,
-		   (const Bytef*)httpOut, httpOutLen, Z_DEFAULT_COMPRESSION) == Z_OK) {
+		if (GzipCompress((Bytef *)gzipOut,
+			    &destLen,
+			    (const Bytef *)httpOut,
+			    httpOutLen,
+			    Z_DEFAULT_COMPRESSION) == Z_OK) {
 			bOk = true;
 		}
-		if ( bOk ) {
-			delete  httpOut;
+		if (bOk) {
+			delete httpOut;
 			httpOut = gzipOut;
 			httpOutLen = destLen;
 		} else {
@@ -2053,45 +2036,48 @@
 		}
 	}
 
-	if ( httpOut ) {
-		Data.pSocket->SendHttpHeaders(session->m_vars"content_type".c_str(), isUseGzip, httpOutLen, Data.SessionID);
+	if (httpOut) {
+		Data.pSocket->SendHttpHeaders(
+			session->m_vars"content_type".c_str(), isUseGzip, httpOutLen, Data.SessionID);
 		Data.pSocket->SendData(httpOut, httpOutLen);
-		delete  httpOut;
+		delete httpOut;
 	}
 }
 
-CNoTemplateWebServer::CNoTemplateWebServer(CamulewebApp *webApp) : CScriptWebServer(webApp, "")
+CNoTemplateWebServer::CNoTemplateWebServer(CamulewebApp *webApp)
+: CScriptWebServer(webApp, "")
 {
 }
 
-CNoTemplateWebServer::~CNoTemplateWebServer()
-{
-}
+CNoTemplateWebServer::~CNoTemplateWebServer() {}
 
 void CNoTemplateWebServer::ProcessURL(ThreadData Data)
 {
-	/*
-	 * Since template has not been found, I suspect that installation is broken. Falling back
-	 * into hardcoded page as last resort.
-	 */
-	const char *httpOut = ""
-	"<html>"
+	/* Template not found: the installation is probably broken. Fall back to a hardcoded page. */
+	const char *httpOut =
+		""
+		"<html>"
 		"<head>"
-			"<title>aMuleWeb error page</title>"
-			"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">"
+		"<title>aMuleWeb error page</title>"
+		"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">"
 		"</head>"
 		"<body>"
-			"<p>You are seeing this page instead of aMuleWeb login page because a valid template has not been found.</p>"
-			"<p>This probably means that there's a problem with your aMule installation </p>"
-			"<ul>"
-				"<li>Before installing new versions, please ensure that you uninstalled older versions of aMule.</li>"
-				"<li>If you are installing by compiling from source, check the configuration (e.g. that aMule was built with -DBUILD_WEBSERVER=YES) and re-run the install step.</li>"
-				"<li>If you are installing by using a precompiled package, you may need to contact the package maintainer </li>"
-			"</ul>"
-			"<p>For more information please visit</p>"
-			"<p><a href=\"https://github.com/amule-org/amule\">aMule on GitHub</a> or <a href=\"https://github.com/amule-org/amule/discussions\">aMule Discussions</a></p>"
+		"<p>You are seeing this page instead of aMuleWeb login page because a valid template has not "
+		"been found.</p>"
+		"<p>This probably means that there's a problem with your aMule installation </p>"
+		"<ul>"
+		"<li>Before installing new versions, please ensure that you uninstalled older versions of "
+		"aMule.</li>"
+		"<li>If you are installing by compiling from source, check the configuration (e.g. that "
+		"aMule was built with -DBUILD_WEBSERVER=YES) and re-run the install step.</li>"
+		"<li>If you are installing by using a precompiled package, you may need to contact the "
+		"package maintainer </li>"
+		"</ul>"
+		"<p>For more information please visit</p>"
+		"<p><a href=\"https://github.com/amule-org/amule\">aMule on GitHub</a> or <a "
+		"href=\"https://github.com/amule-org/amule/discussions\">aMule Discussions</a></p>"
 		"</body>"
-	"</html>";
+		"</html>";
 
 	long httpOutLen = strlen(httpOut);

amule-3.0.1.tar.gz/src/webserver/src/WebServer.h -> amule-3.1.0.tar.gz/src/webserver/src/WebServer.h Changed

@@ -27,24 +27,24 @@
 #ifndef WEBSERVER_H
 #define WEBSERVER_H
 
-#include "config.h"		// Needed for WITH_LIBPNG
+#include "config.h" // Needed for WITH_LIBPNG
 
 #ifdef WITH_LIBPNG
-	#include <png.h>
+#include <png.h>
 #endif
 
 #include "WebInterface.h"
-#include <map>				// Needed for std::map
-#include <set>				// Needed for std::set
+#include <map> // Needed for std::map
+#include <set> // Needed for std::set
 #include "RLE.h"
 #include "OtherStructs.h"
-#include <ec/cpp/ECID.h>	// Needed for CECID
+#include <ec/cpp/ECID.h> // Needed for CECID
 
 #ifdef ENABLE_UPNP
-#	include "UPnPBase.h"
+#include "UPnPBase.h"
 #endif
 
-#include <wx/datetime.h>	// For DownloadFile::wxtLastSeenComplete
+#include <wx/datetime.h> // For DownloadFile::wxtLastSeenComplete
 
 #ifdef _MSC_VER
 #define strncasecmp _strnicmp
@@ -56,14 +56,11 @@
 class CWebSocket;
 class CMD4Hash;
 
-// Idle window after which a CSession entry is dropped and the user is
-// asked to log in again. Has been a hardcoded 7200 (2 hours) in
-// CScriptWebServer::CheckLoggedin since forever; the named constant
-// existed but was never wired up (set to 300, but no `7200`-using site
-// referenced it). Keep the live behaviour (2 hours) and have the
-// macro own the value so the timeout can be changed in one place.
-#define SESSION_TIMEOUT_SECS	7200	// 2 hours session expiration
-#define SHORT_FILENAME_LENGTH	40	// Max size of file name.
+// Idle window after which a CSession entry is dropped and the user is asked to log in again.
+// CheckLoggedin hardcoded 7200 (2 hours) since forever, while the named constant existed and was
+// never wired up. The macro now owns the value, so the timeout can change in one place.
+#define SESSION_TIMEOUT_SECS 7200 // 2 hours session expiration
+#define SHORT_FILENAME_LENGTH 40  // Max size of file name.
 
 wxString _SpecialChars(wxString str);
 
@@ -76,673 +73,658 @@
 
 class CURLDecoder
 {
-      public:
-	static wxString	Decode(const wxString& url);
-};
-
-class DownloadFile : public CECID {
-	public:
-		wxString	sFileName;
-		uint8		nFileStatus;
-		uint64		lFileSize;
-		uint64		lFileCompleted;
-		uint64		lFileTransferred;
-		unsigned long	lFileSpeed;
-		long		lSourceCount;
-		long		lNotCurrentSourceCount;
-		long		lTransferringSourceCount;
-		long		lSourceCountA4AF;
-		double		fCompleted;
-		uint32		lFilePrio;
-		bool		bFileAutoPriority;
-		wxString	sFileHash;
-		wxString	sED2kLink;
-		uint8		nCat;
-		wxDateTime	wxtLastSeenComplete;
-
-		CMD4Hash	nHash;
-
-		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 *);
-		uint32 ID() { return ECID(); }
-};
-
-class SharedFile : public CECID {
-	public:
-		wxString	sFileName;
-		uint64		lFileSize;
-		uint64		nFileTransferred;
-		uint64		nFileAllTimeTransferred;
-		uint16		nFileRequests;
-		uint32		nFileAllTimeRequests;
-		uint16		nFileAccepts;
-		uint32		nFileAllTimeAccepts;
-		uint8		nFilePriority;
-		bool		bFileAutoPriority;
-		wxString	sFileHash;
-		wxString	sED2kLink;
-
-		CMD4Hash	nHash;
-
-		static class SharedFileInfo *GetContainerInstance();
-		SharedFile(CEC_SharedFile_Tag *);
-		void ProcessUpdate(CEC_SharedFile_Tag *);
-		uint32 ID() { return ECID(); }
-};
-
-class ServerEntry {
-	public:
-		wxString	sServerName;
-		wxString	sServerDescription;
-		uint32		nServerIP;
-		uint16		nServerPort;
-		wxString	sServerIP;
-		int		nServerUsers;
-		int		nServerMaxUsers;
-		int		nServerFiles;
-
-		static class ServersInfo *GetContainerInstance();
-		uint32 ID() { return nServerIP; }
+public:
+	static wxString Decode(const wxString &url);
 };
 
-// This is a client we are uploading to, not a file
-class UploadFile : public CECID {
-	public:
-		wxString  sUserName;
-		uint32 nTransferredUp;
-		uint32 nTransferredDown;
-		uint32 nSpeed;
-		uint32 nUploadFile;		// ECID of shared file uploading to client
-
-		UploadFile(CEC_UpDownClient_Tag *tag);
+class DownloadFile : public CECID
+{
+public:
+	wxString sFileName;
+	uint8 nFileStatus;
+	uint64 lFileSize;
+	uint64 lFileCompleted;
+	uint64 lFileTransferred;
+	unsigned long lFileSpeed;
+	long lSourceCount;
+	long lNotCurrentSourceCount;
+	long lTransferringSourceCount;
+	long lSourceCountA4AF;
+	double fCompleted;
+	uint32 lFilePrio;
+	bool bFileAutoPriority;
+	wxString sFileHash;
+	wxString sED2kLink;
+	uint8 nCat;
+	wxDateTime wxtLastSeenComplete;
+
+	CMD4Hash nHash;
+
+	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 *);
+	uint32 ID() { return ECID(); }
+};
+
+class SharedFile : public CECID
+{
+public:
+	wxString sFileName;
+	uint64 lFileSize;
+	uint64 nFileTransferred;
+	uint64 nFileAllTimeTransferred;
+	uint16 nFileRequests;
+	uint32 nFileAllTimeRequests;
+	uint16 nFileAccepts;
+	uint32 nFileAllTimeAccepts;
+	uint8 nFilePriority;
+	bool bFileAutoPriority;
+	wxString sFileHash;
+	wxString sED2kLink;
+
+	CMD4Hash nHash;
+
+	static class SharedFileInfo *GetContainerInstance();
+	SharedFile(CEC_SharedFile_Tag *);
+	void ProcessUpdate(CEC_SharedFile_Tag *);
+	uint32 ID() { return ECID(); }
+};
+
+class ServerEntry
+{
+public:
+	wxString sServerName;
+	wxString sServerDescription;
+	uint32 nServerIP;
+	uint16 nServerPort;
+	wxString sServerIP;
+	int nServerUsers;
+	int nServerMaxUsers;
+	int nServerFiles;
 
-		static class UploadsInfo *GetContainerInstance();
-		uint32 ID() { return ECID(); }
+	static class ServersInfo *GetContainerInstance();
+	uint32 ID() { return nServerIP; }
 };
 
-class SearchFile : public CECID {
-	public:
-		wxString sFileName;
-		uint64 lFileSize;
-		CMD4Hash  nHash;
-		wxString  sHash;
-		long lSourceCount;
-		bool bPresent;
+// This is a client we are uploading to, not a file
+class UploadFile : public CECID
+{
+public:
+	wxString sUserName;
+	uint32 nTransferredUp;
+	uint32 nTransferredDown;
+	uint32 nSpeed;
+	uint32 nUploadFile; // ECID of shared file uploading to client
 
-		SearchFile(CEC_SearchFile_Tag *);
+	UploadFile(CEC_UpDownClient_Tag *tag);
 
-		void ProcessUpdate(CEC_SearchFile_Tag *);
-		static class SearchInfo *GetContainerInstance();
-		uint32 ID() { return ECID(); }
+	static class UploadsInfo *GetContainerInstance();
+	uint32 ID() { return ECID(); }
 };
 
+class SearchFile : public CECID
+{
+public:
+	wxString sFileName;
+	uint64 lFileSize;
+	CMD4Hash nHash;
+	wxString sHash;
+	long lSourceCount;
+	bool bPresent;
 
-/*!
- * T - type of items in container
- */
-template <class T>
-class ItemsContainer {
-	protected:
-		CamulewebApp *m_webApp;
-		std::list<T> m_items;
+	SearchFile(CEC_SearchFile_Tag *);
 
+	void ProcessUpdate(CEC_SearchFile_Tag *);
+	static class SearchInfo *GetContainerInstance();
+	uint32 ID() { return ECID(); }
+};
 
-		void EraseAll()
-		{
-			m_items.erase(m_items.begin(), m_items.end());
-		}
-	public:
-		ItemsContainer(CamulewebApp *webApp)
-		{
-			m_webApp = webApp;
-		}
-		virtual ~ItemsContainer() { }
+/*! T - type of items in container */
+template <class T> class ItemsContainer
+{
+protected:
+	CamulewebApp *m_webApp;
+	std::list<T> m_items;
 
+	void EraseAll() { m_items.erase(m_items.begin(), m_items.end()); }
 
-		int ItemCount()
-		{
-			return m_items.size();
-		}
+public:
+	ItemsContainer(CamulewebApp *webApp) { m_webApp = webApp; }
+	virtual ~ItemsContainer() {}
 
+	int ItemCount() { return m_items.size(); }
 
-		T *AddItem(T &item)
-		{
-			m_items.push_back(item);
-			T *real_ptr = &(m_items.back());
-			return real_ptr;
-		}
+	T *AddItem(T &item)
+	{
+		m_items.push_back(item);
+		T *real_ptr = &(m_items.back());
+		return real_ptr;
+	}
 
-		/*!
-		 * Re-query server: refresh all dataset
-		 */
-		virtual bool ReQuery() = 0;
+	/*! Re-query server: refresh all dataset */
+	virtual bool ReQuery() = 0;
 
-		typedef typename std::list<T>::iterator ItemIterator;
-		ItemIterator GetBeginIterator()
-		{
-			return m_items.begin();
-		}
-		ItemIterator GetEndIterator()
-		{
-			return m_items.end();
-		}
+	typedef typename std::list<T>::iterator ItemIterator;
+	ItemIterator GetBeginIterator() { return m_items.begin(); }
+	ItemIterator GetEndIterator() { return m_items.end(); }
 };
 
-/*!
- * T - type of items in container
- * I - type of item ID
- * G - type of tag in EC
- */
-template <class T, class G, class I>
-class UpdatableItemsContainer : public ItemsContainer<T> {
-	protected:
-		// need duplicate list with a map, so check "do we already have"
-		// will take O(log(n)) instead of O(n)
-		// map will contain pointers to items in list
-		std::map<I, T *> m_items_hash;
-	public:
-		UpdatableItemsContainer(CamulewebApp *webApp) : ItemsContainer<T>(webApp)
-		{
-		}
-
-		T *AddItem(T &item)
-		{
-			T *real_ptr = ItemsContainer<T>::AddItem(item);
-			m_items_hashitem.ID() = real_ptr;
-			return real_ptr;
-		}
-
-		T *GetByID(I id)
-		{
-			// avoid creating nodes
-			return m_items_hash.count(id) ? m_items_hashid : NULL;
-		}
+/*! T - type of items in container, I - type of item ID, G - type of tag in EC */
+template <class T, class G, class I> class UpdatableItemsContainer : public ItemsContainer<T>
+{
+protected:
+	// Duplicate the list with a map so "do we already have it" is O(log n) rather than O(n).
+	// The map holds pointers to items in the list.
+	std::map<I, T *> m_items_hash;
 
-		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;
-				}
+public:
+	UpdatableItemsContainer(CamulewebApp *webApp)
+	: ItemsContainer<T>(webApp)
+	{
+	}
+
+	T *AddItem(T &item)
+	{
+		T *real_ptr = ItemsContainer<T>::AddItem(item);
+		m_items_hashitem.ID() = real_ptr;
+		return real_ptr;
+	}
+
+	T *GetByID(I id)
+	{
+		// avoid creating nodes
+		return m_items_hash.count(id) ? m_items_hashid : 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.
-		 *
-		 * Partial-update protocol negotiated at auth: when the server is
-		 * partial-update-capable, files unchanged since the last cycle
-		 * are simply absent from the response; deletions arrive as
-		 * explicit `EC_TAG_FILE_REMOVED` markers. The bulk "anything
-		 * missing == deleted" loop below would otherwise wipe most of
-		 * the library every cycle on big libraries (#713). When the
-		 * server is not partial-update-capable (or didn't echo the
-		 * capability), the encoder's per-file diff makes unchanged
-		 * tags effectively empty alive-markers and the bulk-deletion
-		 * loop stays correct.
-		 */
-		void ProcessUpdate(const CECPacket *reply, CECPacket *full_req, int req_type)
-		{
-			const bool partial_update = this->m_webApp->IsServerPartialUpdateActive();
-
-			std::set<I> core_files;
-			std::set<I> removed_files;
-			for (CECPacket::const_iterator it = reply->begin(); it != reply->end(); ++it) {
-				const CECTag *raw_tag = &*it;
-				if (raw_tag->GetTagName() == EC_TAG_FILE_REMOVED) {
-					// Explicit deletion marker from a partial-
-					// update-capable server.
-					removed_files.insert(raw_tag->GetInt());
-					continue;
-				}
-				G *tag = (G *) raw_tag;
-
-				if (!partial_update) {
-					core_files.insert(tag->ID());
-				}
-				if ( m_items_hash.count(tag->ID()) ) {
-					T *item = m_items_hashtag->ID();
-					item->ProcessUpdate(tag);
-				} else {
-					full_req->AddTag(CECTag(req_type, tag->ID()));
-				}
+		return ret;
+	}
+
+	/**
+	 * Process the answer to an update request: build the list of new items for a later full
+	 * request, and remove items that no longer exist in the core.
+	 *
+	 * Partial-update protocol negotiated at auth: when the server is partial-update-capable,
+	 * files unchanged since the last cycle are simply absent from the response, and deletions
+	 * arrive as explicit `EC_TAG_FILE_REMOVED` markers. The bulk "anything missing == deleted"
+	 * loop below would otherwise wipe most of the library every cycle on big libraries (#713).
+	 * When the server is not partial-update-capable, or did not echo the capability, the
+	 * encoder's per-file diff makes unchanged tags effectively empty alive-markers and the
+	 * bulk-deletion loop stays correct.
+	 */
+	void ProcessUpdate(const CECPacket *reply, CECPacket *full_req, int req_type)
+	{
+		const bool partial_update = this->m_webApp->IsServerPartialUpdateActive();
+
+		std::set<I> core_files;
+		std::set<I> removed_files;
+		for (CECPacket::const_iterator it = reply->begin(); it != reply->end(); ++it) {
+			const CECTag *raw_tag = &*it;
+			if (raw_tag->GetTagName() == EC_TAG_FILE_REMOVED) {
+				// Explicit deletion marker from a partial-
+				// update-capable server.
+				removed_files.insert(raw_tag->GetInt());
+				continue;
 			}
+			G *tag = (G *)raw_tag;
 
-			std::list<I> del_ids;
-			if (partial_update) {
-				// Only delete what the server explicitly told us to
-				// delete. Skipped early when there's nothing to
-				// remove this cycle (the common case).
-				if (!removed_files.empty()) {
-					for(typename std::list<T>::iterator j = this->m_items.begin(); j != this->m_items.end(); ++j) {
-						if (removed_files.count(j->ID())) {
-							T *real_ptr = &*j;
-							this->ItemDeleted(real_ptr);
-							del_ids.push_back(j->ID());
-						}
-					}
-				}
+			if (!partial_update) {
+				core_files.insert(tag->ID());
+			}
+			if (m_items_hash.count(tag->ID())) {
+				T *item = m_items_hashtag->ID();
+				item->ProcessUpdate(tag);
 			} else {
-				for(typename std::list<T>::iterator j = this->m_items.begin(); j != this->m_items.end(); ++j) {
-					if ( core_files.count(j->ID()) == 0 ) {
-						// item may contain data that need to be freed externally, before
-						// dtor is called and memory freed
+				full_req->AddTag(CECTag(req_type, tag->ID()));
+			}
+		}
 
+		std::list<I> del_ids;
+		if (partial_update) {
+			// Only delete what the server explicitly told us to delete. Skipped early
+			// when there is nothing to remove this cycle, the common case.
+			if (!removed_files.empty()) {
+				for (typename std::list<T>::iterator j = this->m_items.begin();
+					j != this->m_items.end();
+					++j) {
+					if (removed_files.count(j->ID())) {
 						T *real_ptr = &*j;
 						this->ItemDeleted(real_ptr);
-
 						del_ids.push_back(j->ID());
 					}
 				}
 			}
-			for(typename std::list<I>::iterator j = del_ids.begin(); j != del_ids.end(); ++j) {
-				m_items_hash.erase(*j);
-				for(typename std::list<T>::iterator k = this->m_items.begin(); k != this->m_items.end(); ++k) {
-					if ( *j == k->ID() ) {
-						this->m_items.erase(k);
-						break;
-					}
+		} else {
+			for (typename std::list<T>::iterator j = this->m_items.begin();
+				j != this->m_items.end();
+				++j) {
+				if (core_files.count(j->ID()) == 0) {
+					// item may contain data that need to be freed externally, before
+					// dtor is called and memory freed
+
+					T *real_ptr = &*j;
+					this->ItemDeleted(real_ptr);
+
+					del_ids.push_back(j->ID());
 				}
 			}
 		}
-
-		void ProcessFull(const CECPacket *reply)
-		{
-			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);
-				// initialize any external data that may depend on this item
-				this->ItemInserted(real_ptr);
+		for (typename std::list<I>::iterator j = del_ids.begin(); j != del_ids.end(); ++j) {
+			m_items_hash.erase(*j);
+			for (typename std::list<T>::iterator k = this->m_items.begin();
+				k != this->m_items.end();
+				++k) {
+				if (*j == k->ID()) {
+					this->m_items.erase(k);
+					break;
+				}
 			}
 		}
+	}
+
+	void ProcessFull(const CECPacket *reply)
+	{
+		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);
+			// initialize any external data that may depend on this item
+			this->ItemInserted(real_ptr);
+		}
+	}
 
-		bool DoRequery(int cmd, int tag)
-		{
-			CECPacket req_sts(cmd, EC_DETAIL_UPDATE);
+	bool DoRequery(int cmd, int tag)
+	{
+		CECPacket req_sts(cmd, EC_DETAIL_UPDATE);
 
-			//
-			// Phase 1: request status
-			const CECPacket *reply = this->m_webApp->SendRecvMsg_v2(&req_sts);
-			if ( !reply ) {
-				return false;
-			}
+		//
+		// Phase 1: request status
+		const CECPacket *reply = this->m_webApp->SendRecvMsg_v2(&req_sts);
+		if (!reply) {
+			return false;
+		}
 
-			//
-			// Phase 2: update status, mark new files for subsequent query
-			CECPacket req_full(cmd);
+		//
+		// Phase 2: update status, mark new files for subsequent query
+		CECPacket req_full(cmd);
 
-			ProcessUpdate(reply, &req_full, tag);
+		ProcessUpdate(reply, &req_full, tag);
 
-			delete reply;
+		delete reply;
 
-			// Phase 3: request full info about files we don't have yet
-			if ( req_full.HasChildTags() ) {
-				reply = this->m_webApp->SendRecvMsg_v2(&req_full);
-				if ( !reply ) {
-					return false;
-				}
-				ProcessFull(reply);
-				delete reply;
+		// Phase 3: request full info about files we don't have yet
+		if (req_full.HasChildTags()) {
+			reply = this->m_webApp->SendRecvMsg_v2(&req_full);
+			if (!reply) {
+				return false;
 			}
-			return true;
+			ProcessFull(reply);
+			delete reply;
 		}
+		return true;
+	}
 
-		virtual void ItemDeleted(T *) { }
-		virtual void ItemInserted(T *) { }
+	virtual void ItemDeleted(T *) {}
+	virtual void ItemInserted(T *) {}
 };
 
-class UploadsInfo : public ItemsContainer<UploadFile> {
-	public:
-		// can be only one instance.
-		static UploadsInfo *m_This;
+class UploadsInfo : public ItemsContainer<UploadFile>
+{
+public:
+	// can be only one instance.
+	static UploadsInfo *m_This;
 
-		UploadsInfo(CamulewebApp *webApp);
+	UploadsInfo(CamulewebApp *webApp);
 
-		virtual bool ReQuery();
+	virtual bool ReQuery();
 };
 
-class ServersInfo : public ItemsContainer<ServerEntry> {
-	public:
-		// can be only one instance.
-		static ServersInfo *m_This;
-
-		ServersInfo(CamulewebApp *webApp);
+class ServersInfo : public ItemsContainer<ServerEntry>
+{
+public:
+	// can be only one instance.
+	static ServersInfo *m_This;
 
-		virtual bool ReQuery();
+	ServersInfo(CamulewebApp *webApp);
 
+	virtual bool ReQuery();
 };
 
+class SharedFileInfo : public UpdatableItemsContainer<SharedFile, CEC_SharedFile_Tag, uint32>
+{
+public:
+	// can be only one instance.
+	static SharedFileInfo *m_This;
 
-class SharedFileInfo : public UpdatableItemsContainer<SharedFile, CEC_SharedFile_Tag, uint32> {
-	public:
-		// can be only one instance.
-		static SharedFileInfo *m_This;
-
-		SharedFileInfo(CamulewebApp *webApp);
-
-		virtual bool ReQuery();
+	SharedFileInfo(CamulewebApp *webApp);
 
+	virtual bool ReQuery();
 };
 
-class SearchInfo : public UpdatableItemsContainer<SearchFile, CEC_SearchFile_Tag, uint32> {
-	public:
-		static SearchInfo *m_This;
-
-		SearchInfo(CamulewebApp *webApp);
+class SearchInfo : public UpdatableItemsContainer<SearchFile, CEC_SearchFile_Tag, uint32>
+{
+public:
+	static SearchInfo *m_This;
 
-		virtual bool ReQuery();
+	SearchInfo(CamulewebApp *webApp);
 
+	virtual bool ReQuery();
 };
 
-
 class CImageLib;
-class DownloadFileInfo : public UpdatableItemsContainer<DownloadFile, CEC_PartFile_Tag, uint32> {
-		CImageLib *m_ImageLib;
+class DownloadFileInfo : public UpdatableItemsContainer<DownloadFile, CEC_PartFile_Tag, uint32>
+{
+	CImageLib *m_ImageLib;
 
-		// parameters of progress images
-		wxString m_Template;
-		int m_width, m_height;
-	public:
-		// can be only one instance.
-		static DownloadFileInfo *m_This;
+	// parameters of progress images
+	wxString m_Template;
+	int m_width, m_height;
 
-		DownloadFileInfo(CamulewebApp *webApp, CImageLib *imlib);
+public:
+	// can be only one instance.
+	static DownloadFileInfo *m_This;
 
-		void LoadImageParams(wxString &tpl, int width, int height);
+	DownloadFileInfo(CamulewebApp *webApp, CImageLib *imlib);
 
-		virtual bool ReQuery();
+	void LoadImageParams(wxString &tpl, int width, int height);
 
-		// container requirements
-		void ItemInserted(DownloadFile *item);
-		void ItemDeleted(DownloadFile *item);
+	virtual bool ReQuery();
+
+	// container requirements
+	void ItemInserted(DownloadFile *item);
+	void ItemDeleted(DownloadFile *item);
 };
 
-class CAnyImage {
-	protected:
-		unsigned char *m_data;
+class CAnyImage
+{
+protected:
+	unsigned char *m_data;
 
-		int m_width, m_height;
-		wxString m_name;
+	int m_width, m_height;
+	wxString m_name;
 
-		int m_size, m_alloc_size;
-		wxString m_Http;
+	int m_size, m_alloc_size;
+	wxString m_Http;
 
-		void Realloc(int size);
+	void Realloc(int size);
 
-		void SetHttpType(wxString ext);
-	public:
-		CAnyImage(int size);
-		CAnyImage(int width, int height);
-		virtual ~CAnyImage();
+	void SetHttpType(wxString ext);
 
-		const wxString& GetHTTP() const { return m_Http; }
+public:
+	CAnyImage(int size);
+	CAnyImage(int width, int height);
+	virtual ~CAnyImage();
+
+	const wxString &GetHTTP() const { return m_Http; }
 
-		virtual unsigned char *RequestData(int &size);
+	virtual unsigned char *RequestData(int &size);
 };
 
-class CFileImage : public virtual CAnyImage {
-	public:
-		CFileImage(const wxString& name);
+class CFileImage : public virtual CAnyImage
+{
+public:
+	CFileImage(const wxString &name);
 
-		bool OpenOk() { return m_size != 0; }
+	bool OpenOk() { return m_size != 0; }
 };
 
-class CImage3D_Modifiers {
-		unsigned char *m_modifiers;
-		int m_width;
-	public:
-		CImage3D_Modifiers(int width);
-		~CImage3D_Modifiers();
+class CImage3D_Modifiers
+{
+	unsigned char *m_modifiers;
+	int m_width;
 
-		unsigned char operator(int i)
-		{
-			return (i < m_width) ? m_modifiersi : 0;
-		}
+public:
+	CImage3D_Modifiers(int width);
+	~CImage3D_Modifiers();
+
+	unsigned char operator(int i) { return (i < m_width) ? m_modifiersi : 0; }
 };
 
-class CProgressImage : public virtual CAnyImage {
-	protected:
-		DownloadFile *m_file;
+class CProgressImage : public virtual CAnyImage
+{
+protected:
+	DownloadFile *m_file;
 
-		wxString m_template;
+	wxString m_template;
 
-		//
-		// Turn list of gaps, partstatus into array of color strips
-		typedef struct Color_Gap_Struct : public Gap_Struct {
-			uint32 color;
-		} Color_Gap_Struct;
+	//
+	// Turn list of gaps, partstatus into array of color strips
+	typedef struct Color_Gap_Struct : public Gap_Struct
+	{
+		uint32 color;
+	} Color_Gap_Struct;
+
+	// result of rendering - single line
+	uint32 *m_ColorLine;
+	void CreateSpan();
 
-		// result of rendering - single line
-		uint32 *m_ColorLine;
-		void CreateSpan();
-	public:
-		CProgressImage(int w, int h, wxString &tmpl, DownloadFile *file);
+public:
+	CProgressImage(int w, int h, wxString &tmpl, DownloadFile *file);
 
-		~CProgressImage();
+	~CProgressImage();
 
-		const wxString &Name() { return m_name; }
+	const wxString &Name() { return m_name; }
 
-		virtual wxString GetHTML() = 0;
+	virtual wxString GetHTML() = 0;
 };
 
 #ifdef WITH_LIBPNG
 
-//
 // Dynamic png image generation
-//
-class CDynPngImage : public virtual CAnyImage {
-
-	public:
-		CDynPngImage(int w, int h);
-		~CDynPngImage();
+class CDynPngImage : public virtual CAnyImage
+{
 
-		virtual unsigned char *RequestData(int &size);
+public:
+	CDynPngImage(int w, int h);
+	~CDynPngImage();
 
-	protected:
-		png_bytep m_img_data;
-		png_bytep *m_row_ptrs;
+	virtual unsigned char *RequestData(int &size);
 
-		static void png_write_fn(png_structp png_ptr, png_bytep data, png_size_t length);
+protected:
+	png_bytep m_img_data;
+	png_bytep *m_row_ptrs;
 
+	static void png_write_fn(png_structp png_ptr, png_bytep data, png_size_t length);
 };
 
 //
 // Dynamic png image generation from gap info
-class CDynProgressImage : public virtual CProgressImage, public virtual CDynPngImage {
-		CImage3D_Modifiers m_modifiers;
+class CDynProgressImage : public virtual CProgressImage, public virtual CDynPngImage
+{
+	CImage3D_Modifiers m_modifiers;
 
-		void DrawImage();
-	public:
-		CDynProgressImage(int w, int h,	wxString &tmpl, DownloadFile *file);
-		~CDynProgressImage();
+	void DrawImage();
 
-		virtual unsigned char *RequestData(int &size);
-		virtual wxString GetHTML();
+public:
+	CDynProgressImage(int w, int h, wxString &tmpl, DownloadFile *file);
+	~CDynProgressImage();
+
+	virtual unsigned char *RequestData(int &size);
+	virtual wxString GetHTML();
 };
 
 #else
 
-
 //
 // Fallback to original implementation
-class CDynProgressImage : public virtual CProgressImage {
-	public:
-		CDynProgressImage(int w, int h,	wxString &tmpl, DownloadFile *file);
+class CDynProgressImage : public virtual CProgressImage
+{
+public:
+	CDynProgressImage(int w, int h, wxString &tmpl, DownloadFile *file);
 
-		virtual wxString GetHTML();
+	virtual wxString GetHTML();
 };
 
 #endif
 
-//
-// Representing statistical sample for some parameter. Circular buffer
-// inside to avoid rellocations
-//
-class CStatsData {
-		uint32 *m_data;
-		uint32 m_max_value;
-		int m_size;
-		int m_start_index, m_end_index, m_curr_index;
-	public:
-		CStatsData(int size);
-		~CStatsData();
+// A statistical sample for some parameter, with a circular buffer inside to avoid reallocations.
+class CStatsData
+{
+	uint32 *m_data;
+	uint32 m_max_value;
+	int m_size;
+	int m_start_index, m_end_index, m_curr_index;
 
-		int Size() const { return m_size; }
-		uint32 Max() const { return m_max_value; }
-		uint32 GetFirst();
-		uint32 GetNext();
+public:
+	CStatsData(int size);
+	~CStatsData();
+
+	int Size() const { return m_size; }
+	uint32 Max() const { return m_max_value; }
+	uint32 GetFirst();
+	uint32 GetNext();
 
-		void PushSample(uint32 sample);
+	void PushSample(uint32 sample);
 };
 
-class CStatsCollection {
-		CStatsData *m_down_speed, *m_up_speed,
-			*m_conn_number, *m_kad_count;
+class CStatsCollection
+{
+	CStatsData *m_down_speed, *m_up_speed, *m_conn_number, *m_kad_count;
 
-		CamulewebApp *m_iface;
-		double m_LastTimeStamp;
-		int m_size;
-	public:
-		CStatsCollection(int size, CamulewebApp	*iface);
-		~CStatsCollection();
+	CamulewebApp *m_iface;
+	double m_LastTimeStamp;
+	int m_size;
 
-		CStatsData *DownloadSpeed() { return m_down_speed; }
-		CStatsData *UploadSpeed() { return m_up_speed; }
-		CStatsData *ConnCount() { return m_conn_number; }
-		CStatsData *KadCount() { return m_kad_count; }
+public:
+	CStatsCollection(int size, CamulewebApp *iface);
+	~CStatsCollection();
 
-		void ReQuery();
+	CStatsData *DownloadSpeed() { return m_down_speed; }
+	CStatsData *UploadSpeed() { return m_up_speed; }
+	CStatsData *ConnCount() { return m_conn_number; }
+	CStatsData *KadCount() { return m_kad_count; }
+
+	void ReQuery();
 };
 
 #ifdef WITH_LIBPNG
 
-//
-// This gonna to represent data used to "write" numbers on
-// dynamically generated images.
-// Easiest way to represt numbers: 7-segments model
-//
-class CNumImageMask {
-		png_bytep *m_row_mask_ptrs;
-		int m_width, m_height;
-		int m_v_segsize, m_h_segsize;
+// Data used to "write" numbers on dynamically generated images. The easiest way to represent a
+// number is the 7-segment model.
+class CNumImageMask
+{
+	png_bytep *m_row_mask_ptrs;
+	int m_width, m_height;
+	int m_v_segsize, m_h_segsize;
 
-		// mask generation
-		void DrawHorzLine(int off);
-		void DrawVertLine(int off_x, int off_y);
-		void DrawSegment(int id);
+	// mask generation
+	void DrawHorzLine(int off);
+	void DrawVertLine(int off_x, int off_y);
+	void DrawSegment(int id);
 
-		// 0-9 are digit glyphs; 10-13 are unit-prefix glyphs K, M, G, T
-		// for axis labels scaled by powers of 1000.
-		static const int m_num_to_7_decode14;
-	public:
-		CNumImageMask(int number, int width, int height);
-		~CNumImageMask();
+	// 0-9 are digit glyphs; 10-13 are unit-prefix glyphs K, M, G, T
+	// for axis labels scaled by powers of 1000.
+	static const int m_num_to_7_decode14;
 
-		void Apply(png_bytep *image, int off_x, int off_y);
+public:
+	CNumImageMask(int number, int width, int height);
+	~CNumImageMask();
+
+	void Apply(png_bytep *image, int off_x, int off_y);
 };
 
-class CDynStatisticImage : public virtual CDynPngImage {
-		CStatsData *m_data;
+class CDynStatisticImage : public virtual CDynPngImage
+{
+	CStatsData *m_data;
 
-		// size of "font" of imprinted numbers
-		int m_num_font_w_size, m_num_font_h_size;
+	// size of "font" of imprinted numbers
+	int m_num_font_w_size, m_num_font_h_size;
 
-		int m_left_margin, m_bottom_margin;
-		int m_y_axis_size;
+	int m_left_margin, m_bottom_margin;
+	int m_y_axis_size;
 
-		// 0-9 are digit glyphs; 10-13 are unit-prefix glyphs K, M, G, T
-		// used by the axis-label renderer when the y-axis maximum exceeds
-		// what 4 digits can hold.
-		CNumImageMask *m_digits14;
+	// 0-9 are digit glyphs; 10-13 are the unit-prefix glyphs K, M, G, T used by the axis-label
+	// renderer when the y-axis maximum exceeds what 4 digits can hold.
+	CNumImageMask *m_digits14;
 
-		// indicates whether data should be divided on 1024 before
-		// drawing graph.
-		bool m_scale1024;
+	// indicates whether data should be divided on 1024 before
+	// drawing graph.
+	bool m_scale1024;
 
-		//
-		// Prepared background
-		//
-		png_bytep m_background;
-		png_bytep *m_row_bg_ptrs;
+	// Prepared background
+	png_bytep m_background;
+	png_bytep *m_row_bg_ptrs;
 
-		void DrawImage();
-	public:
-		CDynStatisticImage(int height, bool scale1024, CStatsData *data);
-		~CDynStatisticImage();
+	void DrawImage();
 
-		virtual unsigned char *RequestData(int &size);
-		virtual wxString GetHTML();
+public:
+	CDynStatisticImage(int height, bool scale1024, CStatsData *data);
+	~CDynStatisticImage();
+
+	virtual unsigned char *RequestData(int &size);
+	virtual wxString GetHTML();
 };
 
 #endif
 
-class CImageLib {
-		typedef std::map<wxString, CAnyImage *> ImageMap;
-		ImageMap m_image_map;
-		wxString m_image_dir;
-	public:
-		CImageLib(wxString image_dir);
-		~CImageLib();
+class CImageLib
+{
+	typedef std::map<wxString, CAnyImage *> ImageMap;
+	ImageMap m_image_map;
+	wxString m_image_dir;
+
+public:
+	CImageLib(wxString image_dir);
+	~CImageLib();
 
-		CAnyImage *GetImage(const wxString &name);
-		void AddImage(CAnyImage *img, const wxString &name);
-		void RemoveImage(const wxString &name);
+	CAnyImage *GetImage(const wxString &name);
+	void AddImage(CAnyImage *img, const wxString &name);
+	void RemoveImage(const wxString &name);
 };
 
-class CParsedUrl {
-		wxString m_path, m_file;
-		std::map<wxString, wxString> m_params;
-	public:
-		CParsedUrl(const wxString &url);
+class CParsedUrl
+{
+	wxString m_path, m_file;
+	std::map<wxString, wxString> m_params;
 
-		const wxString &Path() { return m_path; }
-		const wxString &File() { return m_file; }
+public:
+	CParsedUrl(const wxString &url);
 
-		const wxString &Param(const wxString &key)
-		{
-			return m_paramskey;
-		}
+	const wxString &Path() { return m_path; }
+	const wxString &File() { return m_file; }
 
-		void ConvertParams(std::map<std::string, std::string> &);
+	const wxString &Param(const wxString &key) { return m_paramskey; }
+
+	void ConvertParams(std::map<std::string, std::string> &);
 };
 
 // Changing this to a typedef struct{} makes egcs compiler do it all wrong and crash on run
-struct ThreadData {
-	CParsedUrl	parsedURL;
-	// CParsedUrl of the *original* request URL, before
-	// CWebSocket::OnRequestReceived concatenated the POST body onto
-	// it (see comment at WebSocket.cpp:197-208). Used by the login
-	// handler to tell apart "param came from the POST body" from
-	// "param came from the URL query string"; we refuse to consume
-	// `pass` when it's reachable via the query, so attacker-crafted
-	// URLs like `/login.php?pass=XYZ` (or POST forms whose action
-	// carries `?pass=...`) can never authenticate (#872). The
-	// existing merged `parsedURL` above stays the source of truth
-	// for every non-credential parameter so #724's POST-on-
-	// query-URL fix isn't disturbed.
-	CParsedUrl	getOnlyParsedURL;
-	wxString	sURL;
-	// Opaque 64-bit session token; 0 means "no session cookie yet".
-	// Sourced from CryptoPP::AutoSeededRandomPool when a new session
-	// is created, see CScriptWebServer::CheckLoggedin in
-	// WebServer.cpp. Was `int` + rand() before #870, which made
-	// session IDs trivially guessable.
-	uint64_t	SessionID;
-	CWebSocket	*pSocket;
+struct ThreadData
+{
+	CParsedUrl parsedURL;
+	// CParsedUrl of the *original* request URL, before CWebSocket::OnRequestReceived
+	// concatenated the POST body onto it (see the comment at WebSocket.cpp:197-208). Used by
+	// the login handler to tell "param came from the POST body" from "param came from the URL
+	// query string": we refuse to consume `pass` when it is reachable via the query, so
+	// attacker-crafted URLs like `/login.php?pass=XYZ`, or POST forms whose action carries
+	// `?pass=...`, can never authenticate (#872). The merged `parsedURL` above stays the source
+	// of truth for every non-credential parameter, so #724's POST-on-query-URL fix is
+	// undisturbed.
+	CParsedUrl getOnlyParsedURL;
+	wxString sURL;
+	// Opaque 64-bit session token; 0 means "no session cookie yet". Sourced from
+	// CryptoPP::AutoSeededRandomPool when a new session is created, see
+	// CScriptWebServer::CheckLoggedin in WebServer.cpp. Was `int` plus rand() before #870,
+	// which made session IDs trivially guessable.
+	uint64_t SessionID;
+	CWebSocket *pSocket;
 };
 
 #ifdef ENABLE_UPNP
@@ -750,125 +732,130 @@
 class CUPnPPortMapping;
 #endif
 
-class CWebLibSocketServer : public CLibSocketServer {
+class CWebLibSocketServer : public CLibSocketServer
+{
 public:
-	CWebLibSocketServer(const class amuleIPV4Address& adr, int flags, CWebServerBase * webServerBase);
+	CWebLibSocketServer(const class amuleIPV4Address &adr, int flags, CWebServerBase *webServerBase);
+
+	virtual void OnAccept();
 
-	virtual	void OnAccept();
 private:
-	CWebServerBase * m_webServerBase;
+	CWebServerBase *m_webServerBase;
 };
 
-class CWebServerBase : public wxEvtHandler {
-	protected:
-		CWebLibSocketServer *m_webserver_socket;
+class CWebServerBase : public wxEvtHandler
+{
+protected:
+	CWebLibSocketServer *m_webserver_socket;
 
-		ServersInfo m_ServersInfo;
-		SharedFileInfo m_SharedFileInfo;
-		DownloadFileInfo m_DownloadFileInfo;
-		UploadsInfo m_UploadsInfo;
-		SearchInfo m_SearchInfo;
+	ServersInfo m_ServersInfo;
+	SharedFileInfo m_SharedFileInfo;
+	DownloadFileInfo m_DownloadFileInfo;
+	UploadsInfo m_UploadsInfo;
+	SearchInfo m_SearchInfo;
 
-		CStatsCollection m_Stats;
+	CStatsCollection m_Stats;
 
-		CImageLib m_ImageLib;
+	CImageLib m_ImageLib;
 
-		virtual void ProcessURL(ThreadData) = 0;
-		virtual void ProcessImgFileReq(ThreadData) = 0;
+	virtual void ProcessURL(ThreadData) = 0;
+	virtual void ProcessImgFileReq(ThreadData) = 0;
 
-		int GzipCompress(Bytef *dest, uLongf *destLen,
-			const Bytef *source, uLong sourceLen, int level);
+	int GzipCompress(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level);
 
-		friend class CWebSocket;
-		friend class CPhPLibContext;
+	friend class CWebSocket;
+	friend class CPhPLibContext;
 
-		bool m_upnpEnabled;
-		int m_upnpTCPPort;
+	bool m_upnpEnabled;
+	int m_upnpTCPPort;
 #ifdef ENABLE_UPNP
-		CUPnPControlPoint *m_upnp;
-		std::vector<CUPnPPortMapping> m_upnpMappings;
+	CUPnPControlPoint *m_upnp;
+	std::vector<CUPnPPortMapping> m_upnpMappings;
 #endif
-		CAsioService *m_AsioService;
-	public:
-		CWebServerBase(CamulewebApp *webApp, const wxString& templateDir);
-		virtual ~CWebServerBase();
+	CAsioService *m_AsioService;
 
-		void Send_Discard_V2_Request(CECPacket *request);
+public:
+	CWebServerBase(CamulewebApp *webApp, const wxString &templateDir);
+	virtual ~CWebServerBase();
 
-		void StartServer();
-		void StopServer();
+	void Send_Discard_V2_Request(CECPacket *request);
 
-		void Print(const wxString &s);
+	void StartServer();
+	void StopServer();
 
-		long GetWSPrefs();
+	void Print(const wxString &s);
 
-		//
-		// Command interface
-		//
-		void Send_ReloadSharedFile_Cmd();
+	long GetWSPrefs();
 
-		void Send_SharedFile_Cmd(wxString file_hash, wxString cmd, uint32 opt_arg = 0);
-		void Send_DownloadFile_Cmd(wxString file_hash, wxString cmd, uint32 opt_arg = 0);
+	// Command interface
+	void Send_ReloadSharedFile_Cmd();
 
-		void Send_DownloadSearchFile_Cmd(wxString file_hash, uint8 cat);
+	void Send_SharedFile_Cmd(wxString file_hash, wxString cmd, uint32 opt_arg = 0);
+	void Send_DownloadFile_Cmd(wxString file_hash, wxString cmd, uint32 opt_arg = 0);
 
-		void Send_Server_Cmd(uint32 ip, uint16 port, wxString cmd);
-		void Send_AddServer_Cmd(wxString addr, wxString port, wxString name);
+	void Send_DownloadSearchFile_Cmd(wxString file_hash, uint8 cat);
 
-		void Send_Search_Cmd(wxString search, wxString extention, wxString type,
-			EC_SEARCH_TYPE search_type, uint32 avail, uint32 min_size, uint32 max_size);
+	void Send_Server_Cmd(uint32 ip, uint16 port, wxString cmd);
+	void Send_AddServer_Cmd(wxString addr, wxString port, wxString name);
 
-		bool Send_DownloadEd2k_Cmd(wxString link, uint8 cat);
+	void Send_Search_Cmd(wxString search,
+		wxString extention,
+		wxString type,
+		EC_SEARCH_TYPE search_type,
+		uint32 avail,
+		uint32 min_size,
+		uint32 max_size);
 
-		void Reload_Stats()
-		{
-			m_Stats.ReQuery();
-		}
+	bool Send_DownloadEd2k_Cmd(wxString link, uint8 cat);
 
-		CamulewebApp	*webInterface;
+	void Reload_Stats() { m_Stats.ReQuery(); }
 
+	CamulewebApp *webInterface;
 };
 
-class CSession {
-	public:
-		bool m_logged_in;
-		time_t m_last_access;
-		std::map<std::string, std::string> m_vars, m_get_vars;
+class CSession
+{
+public:
+	bool m_logged_in;
+	time_t m_last_access;
+	std::map<std::string, std::string> m_vars, m_get_vars;
 
-		void LoadVars(CParsedUrl &url);
+	void LoadVars(CParsedUrl &url);
 };
 
-/*
- * Script based webserver
- */
-class CScriptWebServer : public CWebServerBase {
-		wxString m_www_root;
-		wxString m_index;
+/* Script based webserver */
+class CScriptWebServer : public CWebServerBase
+{
+	wxString m_www_root;
+	wxString m_index;
+
+	char *ProcessHtmlRequest(const char *filename, long &size);
+	char *ProcessPhpRequest(const char *filename, CSession *sess, long &size);
 
-		char *ProcessHtmlRequest(const char *filename, long &size);
-		char *ProcessPhpRequest(const char *filename, CSession *sess, long &size);
+	char *GetErrorPage(const char *message, long &size);
+	char *Get_404_Page(long &size);
 
-		char *GetErrorPage(const char *message, long &size);
-		char *Get_404_Page(long &size);
+	std::map<uint64_t, CSession> m_sessions;
 
-		std::map<uint64_t, CSession> m_sessions;
+	CSession *CheckLoggedin(ThreadData &);
 
-		CSession *CheckLoggedin(ThreadData &);
-	protected:
-		virtual void ProcessURL(ThreadData);
-		virtual void ProcessImgFileReq(ThreadData);
-	public:
-		CScriptWebServer(CamulewebApp *webApp, const wxString& templateDir);
-		~CScriptWebServer();
+protected:
+	virtual void ProcessURL(ThreadData);
+	virtual void ProcessImgFileReq(ThreadData);
 
+public:
+	CScriptWebServer(CamulewebApp *webApp, const wxString &templateDir);
+	~CScriptWebServer();
 };
 
-class CNoTemplateWebServer : public CScriptWebServer {
-	protected:
-		virtual void ProcessURL(ThreadData);
-	public:
-		CNoTemplateWebServer(CamulewebApp *webApp);
-		~CNoTemplateWebServer();
+class CNoTemplateWebServer : public CScriptWebServer
+{
+protected:
+	virtual void ProcessURL(ThreadData);
+
+public:
+	CNoTemplateWebServer(CamulewebApp *webApp);
+	~CNoTemplateWebServer();
 };
 
 #endif // WEBSERVER_H

amule-3.0.1.tar.gz/src/webserver/src/WebSocket.cpp -> amule-3.1.0.tar.gz/src/webserver/src/WebSocket.cpp Changed

@@ -24,69 +24,62 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include "WebSocket.h"
 #include <cerrno>
 #include <cctype>
 
-namespace {
+namespace
+{
 
-char* FindHeaderCaseInsensitive(char* haystack, const char* needle)
+char *FindHeaderCaseInsensitive(char *haystack, const char *needle)
 {
-	if ( haystack == NULL || needle == NULL ) {
+	if (haystack == NULL || needle == NULL) {
 		return NULL;
 	}
 	size_t needle_len = strlen(needle);
-	if ( needle_len == 0 ) {
+	if (needle_len == 0) {
 		return haystack;
 	}
 	size_t haystack_len = strlen(haystack);
-	if ( needle_len > haystack_len ) {
+	if (needle_len > haystack_len) {
 		return NULL;
 	}
-	for ( size_t i = 0; i <= haystack_len - needle_len; ++i ) {
-		if ( strncasecmp(haystack + i, needle, needle_len) == 0 ) {
+	for (size_t i = 0; i <= haystack_len - needle_len; ++i) {
+		if (strncasecmp(haystack + i, needle, needle_len) == 0) {
 			return haystack + i;
 		}
 	}
 	return NULL;
 }
 
-}
-
+} // namespace
 
 CWebSocket::CWebSocket(CWebServerBase *parent)
-	: m_dwBufSize(4096)
-	, m_dwRecv(0)
-	, m_dwHttpHeaderLen(0)
-	, m_dwHttpContentLen(0)
+: m_dwBufSize(4096)
+, m_dwRecv(0)
+, m_dwHttpHeaderLen(0)
+, m_dwHttpContentLen(0)
 {
 	m_pHead = 0;
 	m_pTail = 0;
-	// Allocate one extra slot so the NUL terminator at the end of
-	// OnReceive() always has a home, even if Read() exactly fills the
-	// requested span and the grow loop is skipped (the off-by-one
-	// scenario in #873: first Read returns m_dwBufSize bytes AND
-	// LastError() is set, leaving m_dwRecv == m_dwBufSize when the
-	// loop exits). The allocation is +1 byte; m_dwBufSize keeps
-	// reflecting the *usable* span we hand to Read() so the
-	// `m_dwBufSize - m_dwRecv` reads below still leave the spare slot
-	// free for the terminator.
-	m_pBuf = new char 4096 + 1;
+	// Allocate one extra slot so the NUL terminator at the end of OnReceive() always has a
+	// home, even if Read() exactly fills the requested span and the grow loop is skipped (the
+	// off-by-one in #873). m_dwBufSize keeps reflecting the USABLE span handed to Read(), so
+	// the `m_dwBufSize - m_dwRecv` reads below still leave the spare slot free.
+	m_pBuf = new char4096 + 1;
 	m_IsGet = false;
 	m_IsPost = false;
 
 	m_pParent = parent;
 
 	Notify(true);
-
 }
 
 CWebSocket::~CWebSocket()
 {
-	CChunk* pChunk = m_pHead;
+	CChunk *pChunk = m_pHead;
 	while (pChunk) {
-		CChunk* pNext = pChunk->m_pNext;
+		CChunk *pNext = pChunk->m_pNext;
 		delete pChunk;
 		pChunk = pNext;
 	}
@@ -104,12 +97,11 @@
 	uint32 read = Read(m_pBuf + m_dwRecv, m_dwBufSize - m_dwRecv);
 	m_dwRecv += read;
 	while ((m_dwRecv == m_dwBufSize) && (read != 0) && (!LastError())) {
-		// Buffer is too small. Make it bigger. Allocate one extra
-		// slot for the NUL terminator written below, matching the
-		// `+1` overhead the ctor uses (see #873).
+		// Buffer is too small, so make it bigger. One extra slot for the NUL terminator
+		// written below, matching the `+1` overhead the ctor uses (see #873).
 		uint32 newsize = m_dwBufSize + (m_dwBufSize >> 1);
-		char* newbuffer = new charnewsize + 1;
-		char* oldbuffer = m_pBuf;
+		char *newbuffer = new charnewsize + 1;
+		char *oldbuffer = m_pBuf;
 		memcpy(newbuffer, oldbuffer, m_dwBufSize);
 		delete oldbuffer;
 		m_pBuf = newbuffer;
@@ -122,34 +114,31 @@
 	if (read == 0) {
 		if (LastError()) {
 			Close();
-			return ;
+			return;
 		}
 	}
 
 	m_pBufm_dwRecv = '\0';
 
-
 	//
 	// Check what kind of request is that
-	if ( !m_IsGet && !m_IsPost && m_dwRecv >= 4) {
-		if ( !strncasecmp(m_pBuf, "GET", 3) ) {
+	if (!m_IsGet && !m_IsPost && m_dwRecv >= 4) {
+		if (!strncasecmp(m_pBuf, "GET", 3)) {
 			m_IsGet = true;
-		} else if ( !strncasecmp(m_pBuf, "POST", 4) ) {
+		} else if (!strncasecmp(m_pBuf, "POST", 4)) {
 			m_IsPost = true;
 		} else {
 			// unknown request - close the socket
 			Close();
-			return ;
+			return;
 		}
 	}
-	//
 	// RFC1945:
-	//
 
 	//
 	// "GET" must have last line empty
-	if ( m_IsGet ) {
-		if ( !strncasecmp(m_pBuf + m_dwRecv - 4, "\r\n\r\n", 4) ) {
+	if (m_IsGet) {
+		if (!strncasecmp(m_pBuf + m_dwRecv - 4, "\r\n\r\n", 4)) {
 			//
 			// Process request
 			OnRequestReceived(m_pBuf, 0, 0);
@@ -157,24 +146,25 @@
 	}
 	//
 	// "POST" have "Content-Length"
-	if ( m_IsPost ) {
+	if (m_IsPost) {
 		char *cont_len = FindHeaderCaseInsensitive(m_pBuf, "Content-Length");
 		// do we have received all the line ?
-		if ( cont_len && strstr(cont_len, "\r\n\r\n") ) {
+		if (cont_len && strstr(cont_len, "\r\n\r\n")) {
 			cont_len += strlen("Content-Length:");
 			// can be white space following
-			while ( isspace(*cont_len) ) cont_len++;
+			while (isspace(*cont_len))
+				cont_len++;
 			int len = atoi(cont_len);
-			if ( len <= 0 ) {
+			if (len <= 0) {
 				Close();
-				return ;
+				return;
 			}
 			// do we have all of data ?
 			char *cont = strstr(m_pBuf, "\r\n\r\n");
 			cont += 4;
 			uint32 bodyOffset = static_cast<uint32>(cont - m_pBuf);
 			uint32 bodyLen = static_cast<uint32>(len);
-			if ( bodyOffset <= m_dwRecv && bodyLen <= m_dwRecv - bodyOffset ) {
+			if (bodyOffset <= m_dwRecv && bodyLen <= m_dwRecv - bodyOffset) {
 				OnRequestReceived(m_pBuf, cont, len);
 			}
 		}
@@ -187,7 +177,7 @@
 		uint32 nRes = Write(m_pHead->m_pToSend, m_pHead->m_dwSize);
 		if (nRes >= m_pHead->m_dwSize) {
 			// erase this chunk
-			CChunk* pNext = m_pHead->m_pNext;
+			CChunk *pNext = m_pHead->m_pNext;
 			delete m_pHead;
 			if (!(m_pHead = pNext)) {
 				m_pTail = NULL;
@@ -207,73 +197,65 @@
 	}
 }
 
-void CWebSocket::OnRequestReceived(char* pHeader, char* pData, uint32 dwDataLen)
+void CWebSocket::OnRequestReceived(char *pHeader, char *pData, uint32 dwDataLen)
 {
 	bool is_post = false;
-	if ( strncmp(pHeader, "GET", 3) == 0 ) {
-	} else if ( strncmp(pHeader, "POST", 4) == 0 ) {
+	if (strncmp(pHeader, "GET", 3) == 0) {
+	} else if (strncmp(pHeader, "POST", 4) == 0) {
 		is_post = true;
 	} else {
 		// invalid request
-		return ;
+		return;
 	}
 	char *path = strchr(pHeader, ' ');
-	if ( !path ) {
+	if (!path) {
 		return;
 	}
 	*path++ = 0;
 	pHeader = strchr(path, ' ');
-	if ( !pHeader ) {
+	if (!pHeader) {
 		return;
 	}
 	*pHeader++ = 0;
 
 	wxString sURL(char2unicode(path));
-	// Capture the URL exactly as it was on the wire, before any
-	// POST-body concatenation below. The login handler in
-	// CScriptWebServer::ProcessURL needs to be able to distinguish
-	// "the `pass` param came from the POST body" from "the `pass`
-	// param came from the URL query string"; storing the pre-concat
-	// CParsedUrl gives it that signal without re-parsing or
-	// regex-on-string heuristics (#872).
+	// Capture the URL exactly as it was on the wire, before any POST-body concatenation below.
+	// The login handler in CScriptWebServer::ProcessURL has to tell "the `pass` param came from
+	// the POST body" from "the `pass` param came from the URL query string"; storing the pre-
+	// concat CParsedUrl gives it that signal without re-parsing or regex-on-string heuristics
+	// (#872).
 	wxString sOriginalURL = sURL;
-	if ( is_post ) {
-		// Append the POST body to the URL so CParsedUrl picks up the
-		// form fields the same way it does for GET-style ?key=value
-		// pairs.  Use `&` rather than `?` when the URL already has a
-		// query string -- otherwise the combined string ends up as
-		// `/page?a=b?pass=XYZ`, and CParsedUrl's `?`-then-`&`-split
-		// truncates the first key's value to `b?pass=XYZ` and never
-		// registers a `pass` entry, breaking POST login on any URL
-		// that wasn't query-less (issue #724).
+	if (is_post) {
+		// Append the POST body to the URL so CParsedUrl picks up the form fields the same
+		// way it does for GET-style ?key=value pairs. Use `&` rather than `?` when the URL
+		// already has a query string -- otherwise the combined string ends up as
+		// `/page?a=b?pass=XYZ`, and CParsedUrl's `?`-then-`&`-split truncates the first
+		// key's value to `b?pass=XYZ` and never registers a `pass` entry, breaking POST
+		// login on any URL that was not query-less (issue #724).
 		wxString sData(char2unicode(pData));
 		sURL += (sURL.Find('?') != wxNOT_FOUND ? "&" : "?") + sData.Left(dwDataLen);
 	}
 
-	//
-	// Find session cookie.
-	//
-	// 64-bit so the cookie value can hold a full
-	// AutoSeededRandomPool-sourced token; previously this was an
-	// `int` + `atoi()` which made server-side session IDs trivially
-	// guessable (#870).
+	// Find the session cookie. 64-bit so the cookie value can hold a full AutoSeededRandomPool-
+	// sourced token; it was an `int` plus `atoi()` before, which made server-side session IDs
+	// trivially guessable (#870).
 	uint64_t sessid = 0;
 	char *current_cookie = strstr(pHeader, "Cookie: ");
-	if ( current_cookie == NULL ) {
+	if (current_cookie == NULL) {
 		current_cookie = strstr(pHeader, "cookie: ");
 	}
-	if ( current_cookie ) {
+	if (current_cookie) {
 		current_cookie = strstr(current_cookie, "amuleweb_session_id");
-		if ( current_cookie ) {
+		if (current_cookie) {
 			char *value = strchr(current_cookie, '=');
-			if ( value ) {
+			if (value) {
 				++value;
 				errno = 0;
 				char *endptr = NULL;
 				unsigned long long parsed = strtoull(value, &endptr, 10);
-				if ( endptr != value && errno != ERANGE &&
+				if (endptr != value && errno != ERANGE &&
 					(*endptr == '\0' || *endptr == ';' ||
-					 std::isspace(static_cast<unsigned char>(*endptr))) ) {
+						std::isspace(static_cast<unsigned char>(*endptr)))) {
 					sessid = static_cast<uint64_t>(parsed);
 				}
 			}
@@ -282,10 +264,10 @@
 	ThreadData Data = { CParsedUrl(sURL), CParsedUrl(sOriginalURL), sURL, sessid, this };
 
 	wxString sFile = Data.parsedURL.File();
-	if (sFile.Length() > 4 ) {
-		wxString url_ext = sFile.Right( sFile.Length() - sFile.Find('.', true) ).MakeLower();
-		if ( (url_ext==".gif") || (url_ext==".jpg") || (url_ext==".ico") ||
-			(url_ext==".png") || (url_ext==".bmp") || (url_ext==".jpeg") ) {
+	if (sFile.Length() > 4) {
+		wxString url_ext = sFile.Right(sFile.Length() - sFile.Find('.', true)).MakeLower();
+		if ((url_ext == ".gif") || (url_ext == ".jpg") || (url_ext == ".ico") ||
+			(url_ext == ".png") || (url_ext == ".bmp") || (url_ext == ".jpeg")) {
 			m_pParent->ProcessImgFileReq(Data);
 		} else {
 			m_pParent->ProcessURL(Data);
@@ -294,68 +276,72 @@
 		m_pParent->ProcessURL(Data);
 	}
 
-	//
 	// Done processing, reset state
-	//
 	m_dwRecv = 0;
 	m_IsGet = 0;
 	m_IsPost = 0;
 }
 
-void CWebSocket::SendContent(const char* szStdResponse, const void* pContent, uint32 dwContentSize) {
+void CWebSocket::SendContent(const char *szStdResponse, const void *pContent, uint32 dwContentSize)
+{
 	char szBuf0x1000; // 0x1000 is safe because it's just used for the header
-	int nLen = snprintf(szBuf, sizeof(szBuf), "HTTP/1.1 200 OK\r\n%sContent-Length: %d\r\n\r\n", szStdResponse, dwContentSize);
+	int nLen = snprintf(szBuf,
+		sizeof(szBuf),
+		"HTTP/1.1 200 OK\r\n%sContent-Length: %d\r\n\r\n",
+		szStdResponse,
+		dwContentSize);
 	SendData(szBuf, nLen);
 	SendData(pContent, dwContentSize);
 }
 
-void CWebSocket::SendHttpHeaders(const char* szType, bool use_gzip, uint32 content_len, uint64_t session_id)
+void CWebSocket::SendHttpHeaders(const char *szType, bool use_gzip, uint32 content_len, uint64_t session_id)
 {
 	char szBuf0x1000;
 
 	char cookie256;
-	if ( session_id ) {
-		// HttpOnly: the cookie isn't readable from JavaScript, which
-		// blunts the "steal the session via reflected XSS" path
-		// (the cookie still rides on every request the browser
-		// sends to amuleweb -- it just stops being readable from
-		// `document.cookie` and friends).
-		// SameSite=Strict: the browser refuses to attach this
-		// cookie to cross-site requests, which is the lever that
-		// CSRF needs in order to ride the authenticated session.
-		// `Secure` is NOT set here: amuleweb has no native TLS
-		// handling and doesn't know whether it's behind a TLS-
-		// terminating proxy. Setting `Secure` unconditionally
-		// would silently lock out every direct-HTTP user (browser
-		// refuses the cookie -> infinite login loop). Wiring this
-		// to a preference is a follow-up. (#871)
-		snprintf(cookie, sizeof(cookie),
+	if (session_id) {
+		// HttpOnly: the cookie is not readable from JavaScript, which blunts the "steal the
+		// session via reflected XSS" path -- the cookie still rides on every request the
+		// browser sends to amuleweb, it just stops being readable from `document.cookie`
+		// and friends. SameSite=Strict: the browser refuses to attach this cookie to cross-
+		// site requests, which is the lever CSRF needs to ride the authenticated session.
+		// `Secure` is NOT set here: amuleweb has no native TLS handling and does not know
+		// whether it is behind a TLS-terminating proxy, so setting it unconditionally would
+		// silently lock out every direct-HTTP user -- the browser refuses the cookie and
+		// the login loops forever. Wiring this to a preference is a follow-up (#871).
+		snprintf(cookie,
+			sizeof(cookie),
 			"Set-Cookie: amuleweb_session_id=%llu; HttpOnly; SameSite=Strict\r\n",
 			static_cast<unsigned long long>(session_id));
 	} else {
 		cookie0 = 0;
 	}
 
-	snprintf(szBuf, sizeof(szBuf), "HTTP/1.1 200 OK\r\nServer: aMule\r\nPragma: no-cache\r\nExpires: 0\r\n"
+	snprintf(szBuf,
+		sizeof(szBuf),
+		"HTTP/1.1 200 OK\r\nServer: aMule\r\nPragma: no-cache\r\nExpires: 0\r\n"
 		"Cache-Control: no-cache, no-store, must-revalidate\r\n"
 		"%s"
 		"Connection: close\r\nContent-Type: %s\r\n"
 		"Content-Length: %d\r\n%s\r\n",
-		 cookie, szType, content_len, (use_gzip ? "Content-Encoding: gzip\r\n" : ""));
+		cookie,
+		szType,
+		content_len,
+		(use_gzip ? "Content-Encoding: gzip\r\n" : ""));
 
 	SendData(szBuf, strlen(szBuf));
 }
 
-void CWebSocket::SendData(const void* pData, uint32 dwDataSize)
+void CWebSocket::SendData(const void *pData, uint32 dwDataSize)
 {
-	if (!dwDataSize) {	// sanity
+	if (!dwDataSize) { // sanity
 		return;
 	}
-	const char * data = (const char*) pData;
+	const char *data = (const char *)pData;
 	bool outputRequired = !m_pHead;
 
 	// push it to our tails
-	CChunk* pChunk = new CChunk;
+	CChunk *pChunk = new CChunk;
 	pChunk->m_pNext = NULL;
 	pChunk->m_dwSize = dwDataSize;
 	pChunk->m_pData = new chardwDataSize;

amule-3.0.1.tar.gz/src/webserver/src/WebSocket.h -> amule-3.1.0.tar.gz/src/webserver/src/WebSocket.h Changed

@@ -27,54 +27,57 @@
 #ifndef WEBSOCKET_H
 #define WEBSOCKET_H
 
-
 #include "WebServer.h"
 #include <LibSocket.h>
 
-
 class CWebServer;
 
+class CWebSocket : public CLibSocket
+{
+public:
+	CWebSocket(CWebServerBase *parent);
+	~CWebSocket();
 
-class CWebSocket : public CLibSocket {
-	public:
-		CWebSocket(CWebServerBase *parent);
-		~CWebSocket();
-
-		virtual void OnSend(int);
-		virtual void OnReceive(int);
-		virtual void OnLost(int);
-
-		void OnRequestReceived(char* pHeader, char* pData, uint32 dwDataLen);
-
-		void SendContent(const char* szStdResponse, const void* pContent, uint32 dwContentSize);
-		void SendData(const void* pData, uint32 dwDataSize);
-		void SendHttpHeaders(const char * szType, bool use_gzip, uint32 content_len, uint64_t session_id);
+	virtual void OnSend(int);
+	virtual void OnReceive(int);
+	virtual void OnLost(int);
 
-		CWebServerBase *m_pParent;
+	void OnRequestReceived(char *pHeader, char *pData, uint32 dwDataLen);
 
-		class CChunk {
-			public:
-				CChunk()
-					: m_pData(NULL), m_pToSend(NULL), m_dwSize(0), m_pNext(NULL)
-				{}
-				char* m_pData;
-				char* m_pToSend;
-				uint32 m_dwSize;
+	void SendContent(const char *szStdResponse, const void *pContent, uint32 dwContentSize);
+	void SendData(const void *pData, uint32 dwDataSize);
+	void SendHttpHeaders(const char *szType, bool use_gzip, uint32 content_len, uint64_t session_id);
 
-				CChunk* m_pNext;
-				~CChunk() { delete m_pData; }
-		};
+	CWebServerBase *m_pParent;
 
-		CChunk *m_pHead; // head of what has to be sent
-		CChunk *m_pTail;
-
-		bool m_IsGet, m_IsPost;
-		char *m_pBuf;
-		uint32 m_dwBufSize;
-		uint32 m_dwRecv;
-		uint32 m_dwHttpHeaderLen;
-		uint32 m_dwHttpContentLen;
+	class CChunk
+	{
+	public:
+		CChunk()
+		: m_pData(NULL)
+		, m_pToSend(NULL)
+		, m_dwSize(0)
+		, m_pNext(NULL)
+		{
+		}
+		char *m_pData;
+		char *m_pToSend;
+		uint32 m_dwSize;
+
+		CChunk *m_pNext;
+		~CChunk() { delete m_pData; }
+	};
+
+	CChunk *m_pHead; // head of what has to be sent
+	CChunk *m_pTail;
+
+	bool m_IsGet, m_IsPost;
+	char *m_pBuf;
+	uint32 m_dwBufSize;
+	uint32 m_dwRecv;
+	uint32 m_dwHttpHeaderLen;
+	uint32 m_dwHttpContentLen;
 };
 
-#endif //WEBSOCKET_H
+#endif // WEBSOCKET_H
 // File_checked_for_headers

amule-3.0.1.tar.gz/src/webserver/src/php_amule_lib.cpp -> amule-3.1.0.tar.gz/src/webserver/src/php_amule_lib.cpp Changed

@@ -23,7 +23,6 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include <string> // Do_not_auto_remove (g++-4.0.1)
 
 #include <sys/types.h>
@@ -38,23 +37,19 @@
 
 #include <wx/datetime.h>
 
-/*
- * Built-in php functions. Those are amule-specific functions, accessing EC and internal
- * data structure
- *
- */
+/* Built-in php functions: amule-specific, accessing EC and internal data structures. */
 
 void php_native_shared_file_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1");
 		return;
 	}
 	char *str_hash = si->var->value.str_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 2");
 		return;
 	}
@@ -62,12 +57,11 @@
 	si = get_scope_item(g_current_scope, "__param_2");
 	PHP_VAR_NODE *opt_param = si ? si->var : 0;
 
-	if ( !strcmp(cmd_name, "prio") && !opt_param ) {
+	if (!strcmp(cmd_name, "prio") && !opt_param) {
 		php_report_error(PHP_ERROR, "Command 'prio' need 3-rd argument");
 		return;
 	}
 
-
 	CPhPLibContext::g_curr_context->WebServer()->Send_SharedFile_Cmd(wxString(char2unicode(str_hash)),
 		wxString(char2unicode(cmd_name)),
 		opt_param ? opt_param->value.int_val : 0);
@@ -78,22 +72,18 @@
 	CPhPLibContext::g_curr_context->WebServer()->Send_ReloadSharedFile_Cmd();
 }
 
-/*
- *
- * Usage: php_native_download_file_cmd($file_hash, "command", $optional_arg)
- *
- */
+/* Usage: php_native_download_file_cmd($file_hash, "command", $optional_arg) */
 void php_native_download_file_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1");
 		return;
 	}
 	char *str_hash = si->var->value.str_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 2");
 		return;
 	}
@@ -101,7 +91,7 @@
 	si = get_scope_item(g_current_scope, "__param_2");
 	PHP_VAR_NODE *opt_param = si ? si->var : 0;
 
-	if ( (!strcmp(cmd_name, "prio") || !strcmp(cmd_name, "setcat")) && !opt_param ) {
+	if ((!strcmp(cmd_name, "prio") || !strcmp(cmd_name, "setcat")) && !opt_param) {
 		php_report_error(PHP_ERROR, "Commands 'prio' and 'setcat' needs 3-rd argument");
 		return;
 	}
@@ -111,13 +101,11 @@
 		opt_param ? opt_param->value.int_val : 0);
 }
 
-/*
- * Usage amule_kad_connect($bootstrap_ip, $bootstrap_port)
- */
+/* Usage: amule_kad_connect($bootstrap_ip, $bootstrap_port) */
 void php_native_kad_connect(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Missing or bad argument 1: $bootstrap_ip_addr");
 		return;
 	}
@@ -125,7 +113,7 @@
 	unsigned int ipaddr = si->var->value.int_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Missing or bad argument 2: $bootstrap_ip_port");
 		return;
 	}
@@ -144,12 +132,8 @@
 	CPhPLibContext::g_curr_context->WebServer()->Send_Discard_V2_Request(&req);
 }
 
-/*
- * Usage: amule_kad_start()
- *
- * Start the Kademlia network using the on-disk nodes.dat for bootstrap.
- * Wraps EC_OP_KAD_START.
- */
+/* Usage: amule_kad_start(). Starts Kademlia using the on-disk nodes.dat for bootstrap; wraps
+ * EC_OP_KAD_START. */
 void php_native_kad_start(PHP_VALUE_NODE *)
 {
 	CECPacket req(EC_OP_KAD_START);
@@ -157,36 +141,30 @@
 }
 
 /*
- * Usage: amule_kad_update_from_url($url)
- *
- * Download a fresh nodes.dat from the given URL, bootstrap Kad from it,
- * and persist the URL into the KadNodesUrl preference so subsequent
- * starts reuse the same source. Wraps EC_OP_KAD_UPDATE_FROM_URL.
+ * Usage: amule_kad_update_from_url($url). Downloads a fresh nodes.dat from the URL, bootstraps Kad
+ * from it, and persists the URL into the KadNodesUrl preference so later starts reuse the same
+ * source. Wraps EC_OP_KAD_UPDATE_FROM_URL.
  */
 void php_native_kad_update_from_url(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING) ) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Missing or bad argument 1: $url");
 		return;
 	}
 	char *url = si->var->value.str_val;
 
 	CECPacket req(EC_OP_KAD_UPDATE_FROM_URL);
-	req.AddTag(CECTag(EC_TAG_KADEMLIA_UPDATE_URL,
-		wxString(char2unicode(url))));
+	req.AddTag(CECTag(EC_TAG_KADEMLIA_UPDATE_URL, wxString(char2unicode(url))));
 	CPhPLibContext::g_curr_context->WebServer()->Send_Discard_V2_Request(&req);
 }
 
 /*
- * Usage: amule_server_disconnect()
- *
- * Disconnect from the current ed2k server (network-level, not per-server).
- * The existing amule_do_server_cmd takes (ip, port, cmd) and always sends
- * EC_OP_SERVER_DISCONNECT with a server tag -- which on amuled simply
- * disconnects globally, but it's not callable without IP/port. This
- * variant sends the same opcode with no tag for the WebUI "Disconnect
- * from current ed2k server" button.
+ * Usage: amule_server_disconnect(). Disconnects from the current ed2k server (network-level, not
+ * per-server). amule_do_server_cmd takes (ip, port, cmd) and always sends
+ * EC_OP_SERVER_DISCONNECT with a server tag -- which on amuled disconnects globally, but is not
+ * callable without IP/port. This variant sends the same opcode with no tag, for the WebUI's
+ * "Disconnect from current ed2k server" button.
  */
 void php_native_server_disconnect(PHP_VALUE_NODE *)
 {
@@ -194,20 +172,18 @@
 	CPhPLibContext::g_curr_context->WebServer()->Send_Discard_V2_Request(&req);
 }
 
-/*
- * Usage amule_add_server_cmd($server_addr, $server_port, $server_name);
- */
+/* Usage: amule_add_server_cmd($server_addr, $server_port, $server_name) */
 void php_native_add_server_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING) ) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Missing or bad argument 1: $server_addr");
 		return;
 	}
 	char *addr = si->var->value.str_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Missing argument 2: $server_port");
 		return;
 	}
@@ -215,23 +191,21 @@
 	int port = si->var->value.int_val;
 
 	si = get_scope_item(g_current_scope, "__param_2");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING) ) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 3: $server_name");
 		return;
 	}
 	char *name = si->var->value.str_val;
 
-	CPhPLibContext::g_curr_context->WebServer()->Send_AddServer_Cmd(wxString(char2unicode(addr)),
-		wxString::Format("%d", port), wxString(char2unicode(name)));
+	CPhPLibContext::g_curr_context->WebServer()->Send_AddServer_Cmd(
+		wxString(char2unicode(addr)), wxString::Format("%d", port), wxString(char2unicode(name)));
 }
 
-/*
- * Usage amule_server_cmd($server_ip, $server_port, "command");
- */
+/* Usage: amule_server_cmd($server_ip, $server_port, "command") */
 void php_native_server_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Missing argument 1: $server_ip");
 		return;
 	}
@@ -239,7 +213,7 @@
 	uint32_t ip = si->var->value.int_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Missing argument 2: $server_port");
 		return;
 	}
@@ -247,7 +221,7 @@
 	int port = si->var->value.int_val;
 
 	si = get_scope_item(g_current_scope, "__param_2");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 3: $command");
 		return;
 	}
@@ -256,19 +230,19 @@
 	CPhPLibContext::g_curr_context->WebServer()->Send_Server_Cmd(ip, port, wxString(char2unicode(cmd)));
 }
 
-/*
- * Query amule status. Return hash containing stats values
- */
+/* Query amule status. Returns a hash of stats values. */
 void php_get_amule_stats(PHP_VALUE_NODE *result)
 {
 	CECPacket stat_req(EC_OP_STAT_REQ, EC_DETAIL_FULL);
-	const CECPacket *stats = CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&stat_req);
+	const CECPacket *stats =
+		CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&stat_req);
 	if (!stats) {
-		return ;
+		return;
 	}
-	const CEC_ConnState_Tag *tag = static_cast<const CEC_ConnState_Tag *>(stats->GetTagByName(EC_TAG_CONNSTATE));
+	const CEC_ConnState_Tag *tag =
+		static_cast<const CEC_ConnState_Tag *>(stats->GetTagByName(EC_TAG_CONNSTATE));
 	if (!tag) {
-		return ;
+		return;
 	}
 
 	cast_value_array(result);
@@ -276,14 +250,14 @@
 	cast_value_dnum(&id->value);
 	id->value.int_val = tag->GetEd2kId();
 	const CECTag *server = tag->GetTagByName(EC_TAG_SERVER);
-	if ( server ) {
+	if (server) {
 		PHP_VAR_NODE *srv_ip = array_get_by_str_key(result, "serv_addr");
 		value_value_free(&srv_ip->value);
 		srv_ip->value.type = PHP_VAL_STRING;
-		srv_ip->value.str_val =strdup(unicode2UTF8(server->GetIPv4Data().StringIP()));
+		srv_ip->value.str_val = strdup(unicode2UTF8(server->GetIPv4Data().StringIP()));
 
 		const CECTag *sname = server->GetTagByName(EC_TAG_SERVER_NAME);
-		if ( sname ) {
+		if (sname) {
 			PHP_VAR_NODE *srv_name = array_get_by_str_key(result, "serv_name");
 			value_value_free(&srv_name->value);
 			srv_name->value.type = PHP_VAL_STRING;
@@ -291,19 +265,18 @@
 		}
 
 		const CECTag *susers = server->GetTagByName(EC_TAG_SERVER_USERS);
-		if ( susers ) {
+		if (susers) {
 			PHP_VAR_NODE *srv_users = array_get_by_str_key(result, "serv_users");
 			value_value_free(&srv_users->value);
 			srv_users->value.type = PHP_VAL_INT;
 			srv_users->value.int_val = susers->GetInt();
 		}
-
 	}
 	// kademlia
 	PHP_VAR_NODE *kad = array_get_by_str_key(result, "kad_connected");
 	value_value_free(&kad->value);
 	kad->value.type = PHP_VAL_BOOL;
-	if ( tag->IsConnectedKademlia() ) {
+	if (tag->IsConnectedKademlia()) {
 		kad->value.int_val = 1;
 		PHP_VAR_NODE *kad_fwl = array_get_by_str_key(result, "kad_firewalled");
 		kad_fwl->value.type = PHP_VAL_BOOL;
@@ -342,9 +315,10 @@
 
 	CECPacket req(EC_OP_GET_PREFERENCES);
 	req.AddTag(CECTag(EC_TAG_SELECT_PREFS, (uint32)EC_PREFS_CATEGORIES));
-	const CECPacket *reply = CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
-	if ( !reply ) {
-		return ;
+	const CECPacket *reply =
+		CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
+	if (!reply) {
+		return;
 	}
 	const CECTag *cats_tag = reply->GetFirstTagSafe();
 	if (cats_tag->HasChildTags()) {
@@ -365,55 +339,52 @@
 	delete reply;
 }
 
-typedef struct {
+typedef struct
+{
 	const char *php_name;
 	ECTagNames tagname;
 	int opsize;
 } PHP_2_EC_OPT_DEF;
 
-PHP_2_EC_OPT_DEF g_connection_opt_defs = {
-	{ "max_line_up_cap", EC_TAG_CONN_UL_CAP, 4}, { "max_line_down_cap", EC_TAG_CONN_DL_CAP, 4},
-	{ "max_up_limit", EC_TAG_CONN_MAX_UL, 4}, { "max_down_limit", EC_TAG_CONN_MAX_DL, 4},
-	{ "slot_alloc", EC_TAG_CONN_SLOT_ALLOCATION, 2},
-	{ "tcp_port", EC_TAG_CONN_TCP_PORT, 2}, { "udp_port", EC_TAG_CONN_UDP_PORT, 2},
-	{ "udp_dis", EC_TAG_CONN_UDP_DISABLE, 0},
-	{ "max_file_src", EC_TAG_CONN_MAX_FILE_SOURCES, 2},
-	{ "max_conn_total", EC_TAG_CONN_MAX_CONN, 2},
-	{ "autoconn_en", EC_TAG_CONN_AUTOCONNECT, 0}, { "reconn_en", EC_TAG_CONN_RECONNECT, 0},
-	{ "network_ed2k", EC_TAG_NETWORK_ED2K, 0},
-	{ "network_kad", EC_TAG_NETWORK_KADEMLIA, 0},
-	{0, (ECTagNames)0, 0}
-};
-
-PHP_2_EC_OPT_DEF g_file_opt_defs = {
-	{ "ich_en", EC_TAG_FILES_ICH_ENABLED, 0},
-	{ "aich_trust", EC_TAG_FILES_AICH_TRUST, 0},
-	{ "new_files_paused", EC_TAG_FILES_NEW_PAUSED, 0},
-	{ "new_files_auto_dl_prio", EC_TAG_FILES_NEW_AUTO_DL_PRIO, 0},
-	{ "preview_prio", EC_TAG_FILES_PREVIEW_PRIO, 0},
-	{ "new_files_auto_ul_prio", EC_TAG_FILES_NEW_AUTO_UL_PRIO, 0},
-	{ "upload_full_chunks", EC_TAG_FILES_UL_FULL_CHUNKS, 0},
-	{ "first_last_chunks_prio", EC_TAG_FILES_PREVIEW_PRIO, 0},
-	{ "start_next_paused", EC_TAG_FILES_START_NEXT_PAUSED, 0},
-	{ "resume_same_cat", EC_TAG_FILES_RESUME_SAME_CAT, 0},
-	{ "save_sources", EC_TAG_FILES_SAVE_SOURCES, 0},
-	{ "extract_metadata", EC_TAG_FILES_EXTRACT_METADATA, 0},
-	{ "alloc_full", EC_TAG_FILES_ALLOC_FULL_SIZE, 0},
-	{ "check_free_space", EC_TAG_FILES_CHECK_FREE_SPACE, 0},
-	{ "min_free_space", EC_TAG_FILES_MIN_FREE_SPACE, 4},
-	{0, (ECTagNames)0, 0}
-};
-
-PHP_2_EC_OPT_DEF g_webserver_opt_defs = {
-	{ "use_gzip", EC_TAG_WEBSERVER_USEGZIP, 0},
-	{ "autorefresh_time", EC_TAG_WEBSERVER_REFRESH, 4},
-	{0, (ECTagNames)0, 0}
-};
-
-PHP_2_EC_OPT_DEF g_coretweak_opt_defs = {
-	{ "max_conn_5sec", EC_TAG_CORETW_MAX_CONN_PER_FIVE, 2},
-	{0, (ECTagNames)0, 0}
-};
+PHP_2_EC_OPT_DEF g_connection_opt_defs = { { "max_line_up_cap", EC_TAG_CONN_UL_CAP, 4 },
+	{ "max_line_down_cap", EC_TAG_CONN_DL_CAP, 4 },
+	{ "max_up_limit", EC_TAG_CONN_MAX_UL, 4 },
+	{ "max_down_limit", EC_TAG_CONN_MAX_DL, 4 },
+	{ "slot_alloc", EC_TAG_CONN_SLOT_ALLOCATION, 2 },
+	{ "tcp_port", EC_TAG_CONN_TCP_PORT, 2 },
+	{ "udp_port", EC_TAG_CONN_UDP_PORT, 2 },
+	{ "udp_dis", EC_TAG_CONN_UDP_DISABLE, 0 },
+	{ "max_file_src", EC_TAG_CONN_MAX_FILE_SOURCES, 2 },
+	{ "max_conn_total", EC_TAG_CONN_MAX_CONN, 2 },
+	{ "autoconn_en", EC_TAG_CONN_AUTOCONNECT, 0 },
+	{ "reconn_en", EC_TAG_CONN_RECONNECT, 0 },
+	{ "network_ed2k", EC_TAG_NETWORK_ED2K, 0 },
+	{ "network_kad", EC_TAG_NETWORK_KADEMLIA, 0 },
+	{ 0, (ECTagNames)0, 0 } };
+
+PHP_2_EC_OPT_DEF g_file_opt_defs = { { "ich_en", EC_TAG_FILES_ICH_ENABLED, 0 },
+	{ "aich_trust", EC_TAG_FILES_AICH_TRUST, 0 },
+	{ "new_files_paused", EC_TAG_FILES_NEW_PAUSED, 0 },
+	{ "new_files_auto_dl_prio", EC_TAG_FILES_NEW_AUTO_DL_PRIO, 0 },
+	{ "preview_prio", EC_TAG_FILES_PREVIEW_PRIO, 0 },
+	{ "new_files_auto_ul_prio", EC_TAG_FILES_NEW_AUTO_UL_PRIO, 0 },
+	{ "upload_full_chunks", EC_TAG_FILES_UL_FULL_CHUNKS, 0 },
+	{ "first_last_chunks_prio", EC_TAG_FILES_PREVIEW_PRIO, 0 },
+	{ "endgame", EC_TAG_FILES_ENDGAME, 0 },
+	{ "start_next_paused", EC_TAG_FILES_START_NEXT_PAUSED, 0 },
+	{ "resume_same_cat", EC_TAG_FILES_RESUME_SAME_CAT, 0 },
+	{ "save_sources", EC_TAG_FILES_SAVE_SOURCES, 0 },
+	{ "alloc_full", EC_TAG_FILES_ALLOC_FULL_SIZE, 0 },
+	{ "check_free_space", EC_TAG_FILES_CHECK_FREE_SPACE, 0 },
+	{ "min_free_space", EC_TAG_FILES_MIN_FREE_SPACE, 4 },
+	{ 0, (ECTagNames)0, 0 } };
+
+PHP_2_EC_OPT_DEF g_webserver_opt_defs = { { "use_gzip", EC_TAG_WEBSERVER_USEGZIP, 0 },
+	{ "autorefresh_time", EC_TAG_WEBSERVER_REFRESH, 4 },
+	{ 0, (ECTagNames)0, 0 } };
+
+PHP_2_EC_OPT_DEF g_coretweak_opt_defs = { { "max_conn_5sec", EC_TAG_CORETW_MAX_CONN_PER_FIVE, 2 },
+	{ 0, (ECTagNames)0, 0 } };
 
 void set_array_int_val(PHP_VALUE_NODE *array, const std::string &arrkey, int value)
 {
@@ -426,42 +397,49 @@
 
 void ec_tag_2_php(const CECTag *cattag, PHP_2_EC_OPT_DEF *opts, PHP_VAR_NODE *catvar)
 {
-	for(PHP_2_EC_OPT_DEF *def = opts; def->php_name; def++) {
+	for (PHP_2_EC_OPT_DEF *def = opts; def->php_name; def++) {
 		int val;
-		switch(def->opsize) {
-			case 0: val = cattag->GetTagByName(def->tagname) ? 1 : 0; break;
-			case 1: val = cattag->GetTagByNameSafe(def->tagname)->GetInt(); break;
-			case 2: val = cattag->GetTagByNameSafe(def->tagname)->GetInt(); break;
-			case 4: val = cattag->GetTagByNameSafe(def->tagname)->GetInt(); break;
-			default: val = -1;
+		switch (def->opsize) {
+		case 0:
+			val = cattag->GetTagByName(def->tagname) ? 1 : 0;
+			break;
+		case 1:
+			val = cattag->GetTagByNameSafe(def->tagname)->GetInt();
+			break;
+		case 2:
+			val = cattag->GetTagByNameSafe(def->tagname)->GetInt();
+			break;
+		case 4:
+			val = cattag->GetTagByNameSafe(def->tagname)->GetInt();
+			break;
+		default:
+			val = -1;
 		}
 		wxASSERT(val != -1);
-		//printf("OPT_DEBUG: %s of size %d -> %d\n", def->php_name, def->opsize, val);
+		// printf("OPT_DEBUG: %s of size %d -> %d\n", def->php_name, def->opsize, val);
 		set_array_int_val(&catvar->value, def->php_name, val);
 	}
 }
 
-/*
- * Return hash of amule options.
- *  Key: option name
- *  Value: option value (string)
- */
+/* Returns a hash of amule options: key = option name, value = option value (string). */
 void php_get_amule_options(PHP_VALUE_NODE *result)
 {
 	cast_value_array(result);
 
 	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->HasChildTags()) {
-		return ;
+	const CECPacket *reply =
+		CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
+	if (!reply || !reply->HasChildTags()) {
+		return;
 	}
 	const CECTag *cattag = 0;
-    if ((cattag = reply->GetTagByName(EC_TAG_PREFS_GENERAL)) != 0) {
+	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);
 		key->value.type = PHP_VAL_STRING;
-		key->value.str_val = strdup(unicode2UTF8(cattag->GetTagByNameSafe(EC_TAG_USER_NICK)->GetStringData()));
+		key->value.str_val =
+			strdup(unicode2UTF8(cattag->GetTagByNameSafe(EC_TAG_USER_NICK)->GetStringData()));
 	}
 
 	if ((cattag = reply->GetTagByName(EC_TAG_PREFS_CONNECTIONS)) != 0) {
@@ -494,30 +472,35 @@
 
 bool php_2_ec_tag(CECTag *cattag, PHP_2_EC_OPT_DEF *opts, PHP_VALUE_NODE *catvar)
 {
-	for(PHP_2_EC_OPT_DEF *def = opts; def->php_name; def++) {
+	for (PHP_2_EC_OPT_DEF *def = opts; def->php_name; def++) {
 		PHP_VAR_NODE *opt_var = array_get_by_str_key(catvar, def->php_name);
-		if ( opt_var->value.type == PHP_VAL_NONE ) {
+		if (opt_var->value.type == PHP_VAL_NONE) {
 			continue;
 		}
 		cast_value_dnum(&opt_var->value);
-		switch(def->opsize) {
-			case 0: // always transmit !
-			case 1: cattag->AddTag(CECTag(def->tagname ,(uint8)opt_var->value.int_val)); break;
-			case 2: cattag->AddTag(CECTag(def->tagname ,(uint16)opt_var->value.int_val)); break;
-			case 4: cattag->AddTag(CECTag(def->tagname ,(uint32)opt_var->value.int_val)); break;
-			default: return false;
+		switch (def->opsize) {
+		case 0: // always transmit !
+		case 1:
+			cattag->AddTag(CECTag(def->tagname, (uint8)opt_var->value.int_val));
+			break;
+		case 2:
+			cattag->AddTag(CECTag(def->tagname, (uint16)opt_var->value.int_val));
+			break;
+		case 4:
+			cattag->AddTag(CECTag(def->tagname, (uint32)opt_var->value.int_val));
+			break;
+		default:
+			return false;
 		}
 	}
 	return true;
 }
 
-/*
- * Set amule options from given array. Argument looks like "amule_get_options" result
- */
+/* Set amule options from the given array, shaped like an amule_get_options result. */
 void php_set_amule_options(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_ARRAY)) {
+	if (!si || (si->var->value.type != PHP_VAL_ARRAY)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1 (options array)");
 		return;
 	}
@@ -525,62 +508,60 @@
 	CECPacket req(EC_OP_SET_PREFERENCES);
 	PHP_VAR_NODE *opt_group_array = 0;
 
-	// general: nickname. amule_get_options exposes it at the top level
-	// as "nick" (not nested under a "general" group), so the setter
-	// mirrors that shape.
+	// general: nickname. amule_get_options exposes it at the top level as "nick", not nested
+	// under a "general" group, so the setter mirrors that shape.
 	PHP_VAR_NODE *nick_node = array_get_by_str_key(&si->var->value, "nick");
-	if ( nick_node && nick_node->value.type == PHP_VAL_STRING && nick_node->value.str_val ) {
+	if (nick_node && nick_node->value.type == PHP_VAL_STRING && nick_node->value.str_val) {
 		CECEmptyTag generalPrefs(EC_TAG_PREFS_GENERAL);
-		generalPrefs.AddTag(CECTag(EC_TAG_USER_NICK,
-			wxString::FromUTF8(nick_node->value.str_val)));
+		generalPrefs.AddTag(CECTag(EC_TAG_USER_NICK, wxString::FromUTF8(nick_node->value.str_val)));
 		req.AddTag(generalPrefs);
 	}
 
 	// files
 	opt_group_array = array_get_by_str_key(&si->var->value, "files");
-	if ( opt_group_array->value.type == PHP_VAL_ARRAY ) {
+	if (opt_group_array->value.type == PHP_VAL_ARRAY) {
 		CECEmptyTag filePrefs(EC_TAG_PREFS_FILES);
 		php_2_ec_tag(&filePrefs, g_file_opt_defs, &opt_group_array->value);
 		req.AddTag(filePrefs);
 	}
 	// connection
 	opt_group_array = array_get_by_str_key(&si->var->value, "connection");
-	if ( opt_group_array->value.type == PHP_VAL_ARRAY ) {
+	if (opt_group_array->value.type == PHP_VAL_ARRAY) {
 		CECEmptyTag connPrefs(EC_TAG_PREFS_CONNECTIONS);
 		php_2_ec_tag(&connPrefs, g_connection_opt_defs, &opt_group_array->value);
 		req.AddTag(connPrefs);
 	}
 	// webserver
 	opt_group_array = array_get_by_str_key(&si->var->value, "webserver");
-	if ( opt_group_array->value.type == PHP_VAL_ARRAY ) {
+	if (opt_group_array->value.type == PHP_VAL_ARRAY) {
 		CECEmptyTag webPrefs(EC_TAG_PREFS_REMOTECTRL);
 		php_2_ec_tag(&webPrefs, g_webserver_opt_defs, &opt_group_array->value);
 		req.AddTag(webPrefs);
 		// also apply settings locally
 		PHP_VAR_NODE *pref = array_get_by_str_key(&opt_group_array->value, "use_gzip");
 		cast_value_dnum(&pref->value);
-		CPhPLibContext::g_curr_context->WebServer()->webInterface->m_UseGzip = pref->value.int_val != 0;
+		CPhPLibContext::g_curr_context->WebServer()->webInterface->m_UseGzip =
+			pref->value.int_val != 0;
 		pref = array_get_by_str_key(&opt_group_array->value, "autorefresh_time");
 		cast_value_dnum(&pref->value);
-		CPhPLibContext::g_curr_context->WebServer()->webInterface->m_PageRefresh = pref->value.int_val;
+		CPhPLibContext::g_curr_context->WebServer()->webInterface->m_PageRefresh =
+			pref->value.int_val;
 	}
 	CPhPLibContext::g_curr_context->WebServer()->Send_Discard_V2_Request(&req);
 }
 
-/*
- * Download 1 of search results. Params: hash, category (default=0)
- */
+/* Download one of the search results. Params: hash, category (default 0). */
 void php_native_search_download_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1 (file hash)");
 		return;
 	}
 	char *str_hash = si->var->value.str_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 2 (category)");
 		return;
 	}
@@ -594,88 +575,96 @@
 void php_native_search_start_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1 (search term)");
 		return;
 	}
 	char *search = si->var->value.str_val;
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_1")) || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!(si = get_scope_item(g_current_scope, "__param_1")) || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 2 (file extension)");
 		return;
 	}
 	char *ext = si->var->value.str_val;
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_2")) || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!(si = get_scope_item(g_current_scope, "__param_2")) || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 3 (file type)");
 		return;
 	}
 	char *type = si->var->value.str_val;
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_3")) ) {
+	if (!(si = get_scope_item(g_current_scope, "__param_3"))) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 4 (search type)");
 		return;
 	}
 	cast_value_dnum(&si->var->value);
 
 	EC_SEARCH_TYPE search_type;
-	switch(si->var->value.int_val) {
-		case 0: search_type = EC_SEARCH_LOCAL; break;
-		case 1: search_type = EC_SEARCH_GLOBAL; break;
-		case 2: search_type = EC_SEARCH_KAD; break;
-		default:
-			php_report_error(PHP_ERROR, "Invalid search type %" PRIu64, si->var->value.int_val);
-			return;
+	switch (si->var->value.int_val) {
+	case 0:
+		search_type = EC_SEARCH_LOCAL;
+		break;
+	case 1:
+		search_type = EC_SEARCH_GLOBAL;
+		break;
+	case 2:
+		search_type = EC_SEARCH_KAD;
+		break;
+	default:
+		php_report_error(PHP_ERROR, "Invalid search type %" PRIu64, si->var->value.int_val);
+		return;
 	}
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_4")) ) {
+	if (!(si = get_scope_item(g_current_scope, "__param_4"))) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 5 (availability)");
 		return;
 	}
 	cast_value_dnum(&si->var->value);
 	int avail = si->var->value.int_val;
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_5")) ) {
+	if (!(si = get_scope_item(g_current_scope, "__param_5"))) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 6 (min size)");
 		return;
 	}
 	cast_value_dnum(&si->var->value);
 	int min_size = si->var->value.int_val;
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_6")) ) {
+	if (!(si = get_scope_item(g_current_scope, "__param_6"))) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 7 (max size)");
 		return;
 	}
 	cast_value_dnum(&si->var->value);
 	int max_size = si->var->value.int_val;
 
-
-	CPhPLibContext::g_curr_context->WebServer()->Send_Search_Cmd(
-		wxString(char2unicode(search)), wxString(char2unicode(ext)), wxString(char2unicode(type)),
-		search_type, avail, min_size, max_size);
+	CPhPLibContext::g_curr_context->WebServer()->Send_Search_Cmd(wxString(char2unicode(search)),
+		wxString(char2unicode(ext)),
+		wxString(char2unicode(type)),
+		search_type,
+		avail,
+		min_size,
+		max_size);
 }
 
-/*
- * Request contents of log
- */
+/* Request the contents of the log */
 void php_get_log(PHP_VALUE_NODE *result)
 {
 	value_value_free(result);
 
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
 	bool rst;
-	if ( !si ) {
+	if (!si) {
 		rst = false;
 	} else {
 		cast_value_dnum(&si->var->value);
 		rst = si->var->value.int_val != 0;
 	}
-	if ( rst ) {
+	if (rst) {
 		CECPacket req(EC_OP_RESET_LOG);
 		CPhPLibContext::g_curr_context->WebServer()->Send_Discard_V2_Request(&req);
 	}
 	CECPacket req(EC_OP_GET_LOG);
-	const CECPacket *response = CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
+	const CECPacket *response =
+		CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
 	if (response) {
 		wxString serverInfoString(_SpecialChars(response->GetFirstTagSafe()->GetStringData()));
 		delete response;
@@ -684,28 +673,27 @@
 	}
 }
 
-/*
- * Request contents of server info
- */
+/* Request the contents of the server info */
 void php_get_serverinfo(PHP_VALUE_NODE *result)
 {
 	value_value_free(result);
 
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
 	bool rst;
-	if ( !si ) {
+	if (!si) {
 		rst = false;
 	} else {
 		cast_value_dnum(&si->var->value);
 		rst = si->var->value.int_val != 0;
 	}
 
-	if ( rst ) {
+	if (rst) {
 		CECPacket req(EC_OP_CLEAR_SERVERINFO);
 		CPhPLibContext::g_curr_context->WebServer()->Send_Discard_V2_Request(&req);
 	}
 	CECPacket req(EC_OP_GET_SERVERINFO);
-	const CECPacket *response = CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
+	const CECPacket *response =
+		CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
 	if (response) {
 		wxString serverInfoString(_SpecialChars(response->GetFirstTagSafe()->GetStringData()));
 		delete response;
@@ -714,21 +702,18 @@
 	}
 }
 
-
-/*
- * Download ed2k link. Params: link, category (default=0)
- */
+/* Download an ed2k link. Params: link, category (default 0). */
 void php_native_ed2k_download_cmd(PHP_VALUE_NODE *result)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1 (file link)");
 		return;
 	}
 	char *str_link = si->var->value.str_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 2 (category)");
 		return;
 	}
@@ -738,22 +723,19 @@
 
 	bool cmd_result = CPhPLibContext::g_curr_context->WebServer()->Send_DownloadEd2k_Cmd(
 		wxString(char2unicode(str_link)), cat);
-	if ( result ) {
+	if (result) {
 		cast_value_bool(result);
 		result->int_val = cmd_result;
 	}
 }
 
-
 /*
- * Load amule variables into interpreter scope.
- *  "varname" will tell us, what kind of variables need to load:
- *    "downloads", "uploads", "searchresult", "servers", "options" etc
+ * Load amule variables into the interpreter scope. "varname" says which kind to load: "downloads",
+ * "uploads", "searchresult", "servers", "options" and so on.
  */
-template <class C, class T>
-void amule_obj_array_create(const char *class_name, PHP_VALUE_NODE *result)
+template <class C, class T> void amule_obj_array_create(const char *class_name, PHP_VALUE_NODE *result)
 {
-	if ( !result ) {
+	if (!result) {
 		return;
 	}
 	C *container = T::GetContainerInstance();
@@ -761,7 +743,7 @@
 	container->ReQuery();
 
 	typename std::list<T>::const_iterator it = container->GetBeginIterator();
-	while ( it != container->GetEndIterator()) {
+	while (it != container->GetEndIterator()) {
 		PHP_VAR_NODE *var = array_push_back(result);
 		var->value.type = PHP_VAL_OBJECT;
 		var->value.obj_val.class_name = class_name;
@@ -801,52 +783,49 @@
 	CPhPLibContext::g_curr_context->WebServer()->Reload_Stats();
 }
 
-/*
- * Convert CEC_StatTree_Node_Tag into php associative array
- *
- * Since data structure is recursive - we need helper function
- * to perform conversion
- */
+/* Convert a CEC_StatTree_Node_Tag into a php associative array. The data structure is recursive,
+ * so a helper function does the conversion. */
 void ecstats2php(CEC_StatTree_Node_Tag *root, PHP_VALUE_NODE *result)
 {
 	cast_value_array(result);
 	std::string key(unicode2UTF8(root->GetDisplayString()));
 	PHP_VAR_NODE *v_key = array_get_by_str_key(result, key);
 	for (CECTag::const_iterator it = root->begin(); it != root->end(); ++it) {
-		CEC_StatTree_Node_Tag *tag = (CEC_StatTree_Node_Tag*) & *it;
+		CEC_StatTree_Node_Tag *tag = (CEC_StatTree_Node_Tag *)&*it;
 		if (tag->GetTagName() == EC_TAG_STATTREE_NODE) {
 			ecstats2php(tag, &v_key->value);
 		}
 	}
-
 }
 
 void amule_load_stats_tree(PHP_VALUE_NODE *result)
 {
-	if ( !result ) {
+	if (!result) {
 		return;
 	}
 	value_value_free(result);
 
 	CECPacket req(EC_OP_GET_STATSTREE, EC_DETAIL_WEB);
-	const CECPacket *response = CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
-	if ( !response ) {
+	const CECPacket *response =
+		CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
+	if (!response) {
 		return;
 	}
 	const CECTag *server_ver = response->GetTagByName(EC_TAG_SERVER_VERSION);
 	const CECTag *user_nick = response->GetTagByName(EC_TAG_USER_NICK);
-	if ( !server_ver || !user_nick ) {
+	if (!server_ver || !user_nick) {
 		delete response;
 		return;
 	}
-	const CEC_StatTree_Node_Tag *stats_root = static_cast<const CEC_StatTree_Node_Tag *>(response->GetTagByName(EC_TAG_STATTREE_NODE));
-	if ( !stats_root ) {
+	const CEC_StatTree_Node_Tag *stats_root =
+		static_cast<const CEC_StatTree_Node_Tag *>(response->GetTagByName(EC_TAG_STATTREE_NODE));
+	if (!stats_root) {
 		delete response;
 		return;
 	}
-	//ecstats2php(stats_root, result);
+	// ecstats2php(stats_root, result);
 	for (CECTag::const_iterator it = stats_root->begin(); it != stats_root->end(); ++it) {
-		CEC_StatTree_Node_Tag *tag = (CEC_StatTree_Node_Tag*) & *it;
+		CEC_StatTree_Node_Tag *tag = (CEC_StatTree_Node_Tag *)&*it;
 		if (tag->GetTagName() == EC_TAG_STATTREE_NODE) {
 			ecstats2php(tag, result);
 		}
@@ -856,32 +835,32 @@
 void php_native_load_amule_vars(PHP_VALUE_NODE *result)
 {
 	PHP_SCOPE_ITEM *si_str = get_scope_item(g_current_scope, "__param_0");
-	if ( !si_str  ) {
+	if (!si_str) {
 		php_report_error(PHP_ERROR, "Missing argument 'varname' for 'load_amule_vars'");
 		return;
 	}
 	PHP_VALUE_NODE *str = &si_str->var->value;
-	if ( str->type != PHP_VAL_STRING ) {
+	if (str->type != PHP_VAL_STRING) {
 		php_report_error(PHP_ERROR, "Argument 'varname' for 'load_amule_vars' must be string");
 		return;
 	}
 	char *varname = str->str_val;
-	if ( result ) {
+	if (result) {
 		cast_value_array(result);
 	}
-	if ( strcmp(varname, "downloads") == 0 ) {
+	if (strcmp(varname, "downloads") == 0) {
 		amule_load_downloads(result);
-	} else if ( strcmp(varname, "uploads") == 0 ) {
+	} else if (strcmp(varname, "uploads") == 0) {
 		amule_load_uploads(result);
-	} else if ( strcmp(varname, "shared") == 0 ) {
+	} else if (strcmp(varname, "shared") == 0) {
 		amule_load_shared(result);
-	} else if ( strcmp(varname, "searchresult") == 0 ) {
+	} else if (strcmp(varname, "searchresult") == 0) {
 		amule_load_search(result);
-	} else if ( strcmp(varname, "servers") == 0 ) {
+	} else if (strcmp(varname, "servers") == 0) {
 		amule_load_servers(result);
-	} else if ( strcmp(varname, "stats_graph") == 0 ) {
+	} else if (strcmp(varname, "stats_graph") == 0) {
 		amule_load_stats();
-	} else if ( strcmp(varname, "stats_tree") == 0 ) {
+	} else if (strcmp(varname, "stats_tree") == 0) {
 		amule_load_stats_tree(result);
 	} else {
 		value_value_free(result);
@@ -889,58 +868,57 @@
 	}
 }
 
-/*
- * Amule objects implementations
- */
+/* Amule objects implementations */
 void amule_download_file_prop_get(void *ptr, char *prop_name, PHP_VALUE_NODE *result)
 {
-	if ( !ptr ) {
+	if (!ptr) {
 		value_value_free(result);
 		return;
 	}
 	DownloadFile *obj = static_cast<DownloadFile *>(ptr);
 	result->type = PHP_VAL_INT;
-	if ( strcmp(prop_name, "name") == 0 ) {
+	if (strcmp(prop_name, "name") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->sFileName));
-	} else if ( strcmp(prop_name, "short_name") == 0 ) {
+	} else if (strcmp(prop_name, "short_name") == 0) {
 		result->type = PHP_VAL_STRING;
-		wxString short_name(obj->sFileName.Length() > 60 ? (obj->sFileName.Left(60) + (" ...")) : obj->sFileName);
+		wxString short_name(
+			obj->sFileName.Length() > 60 ? (obj->sFileName.Left(60) + (" ...")) : obj->sFileName);
 		result->str_val = strdup((const char *)unicode2UTF8(short_name));
-	} else if ( strcmp(prop_name, "hash") == 0 ) {
+	} else if (strcmp(prop_name, "hash") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->sFileHash));
-	} else if ( strcmp(prop_name, "progress") == 0 ) {
+	} else if (strcmp(prop_name, "progress") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->m_Image->GetHTML()));
-	} else if ( strcmp(prop_name, "link") == 0 ) {
+	} else if (strcmp(prop_name, "link") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->sED2kLink));
-	} else if ( strcmp(prop_name, "category") == 0 ) {
+	} else if (strcmp(prop_name, "category") == 0) {
 		result->int_val = obj->nCat;
-	} else if ( strcmp(prop_name, "status") == 0 ) {
+	} else if (strcmp(prop_name, "status") == 0) {
 		result->int_val = obj->nFileStatus;
-	} else if ( strcmp(prop_name, "size") == 0 ) {
+	} else if (strcmp(prop_name, "size") == 0) {
 		result->int_val = obj->lFileSize;
-	} else if ( strcmp(prop_name, "size_done") == 0 ) {
+	} else if (strcmp(prop_name, "size_done") == 0) {
 		result->int_val = obj->lFileCompleted;
-	} else if ( strcmp(prop_name, "size_xfer") == 0 ) {
+	} else if (strcmp(prop_name, "size_xfer") == 0) {
 		result->int_val = obj->lFileTransferred;
-	} else if ( strcmp(prop_name, "speed") == 0 ) {
+	} else if (strcmp(prop_name, "speed") == 0) {
 		result->int_val = obj->lFileSpeed;
-	} else if ( strcmp(prop_name, "src_count") == 0 ) {
+	} else if (strcmp(prop_name, "src_count") == 0) {
 		result->int_val = obj->lSourceCount;
-	} else if ( strcmp(prop_name, "src_count_not_curr") == 0 ) {
+	} else if (strcmp(prop_name, "src_count_not_curr") == 0) {
 		result->int_val = obj->lNotCurrentSourceCount;
-	} else if ( strcmp(prop_name, "src_count_a4af") == 0 ) {
+	} else if (strcmp(prop_name, "src_count_a4af") == 0) {
 		result->int_val = obj->lSourceCountA4AF;
-	} else if ( strcmp(prop_name, "src_count_xfer") == 0 ) {
+	} else if (strcmp(prop_name, "src_count_xfer") == 0) {
 		result->int_val = obj->lTransferringSourceCount;
-	} else if ( strcmp(prop_name, "prio") == 0 ) {
+	} else if (strcmp(prop_name, "prio") == 0) {
 		result->int_val = obj->lFilePrio;
-	} else if ( strcmp(prop_name, "prio_auto") == 0 ) {
+	} else if (strcmp(prop_name, "prio_auto") == 0) {
 		result->int_val = obj->bFileAutoPriority;
-	} else if ( strcmp(prop_name, "last_seen_complete") == 0 ) {
+	} else if (strcmp(prop_name, "last_seen_complete") == 0) {
 		result->int_val = obj->wxtLastSeenComplete.GetTicks();
 	} else {
 		php_report_error(PHP_ERROR, "'DownloadFile' property %s is unknown", prop_name);
@@ -949,43 +927,47 @@
 
 void amule_upload_file_prop_get(void *ptr, char *prop_name, PHP_VALUE_NODE *result)
 {
-	if ( !ptr ) {
+	if (!ptr) {
 		value_value_free(result);
 		return;
 	}
 	UploadFile *obj = static_cast<UploadFile *>(ptr);
 	result->type = PHP_VAL_INT;
-	if ( strcmp(prop_name, "name") == 0 ) {
+	if (strcmp(prop_name, "name") == 0) {
 		result->type = PHP_VAL_STRING;
 		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 ) {
+		// 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->nUploadFile);
 		}
-		result->str_val = strdup(sharedfile ? (const char *)unicode2UTF8(sharedfile->sFileName) : "???");
-	} else if ( strcmp(prop_name, "short_name") == 0 ) {
+		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->nUploadFile);
-		if ( !sharedfile ) {
+		if (!sharedfile) {
 			SharedFile::GetContainerInstance()->ReQuery();
 			sharedfile = SharedFile::GetContainerInstance()->GetByID(obj->nUploadFile);
 		}
 		wxString short_name;
 		if (sharedfile) {
-			short_name = sharedfile->sFileName.Length() > 60 ? (sharedfile->sFileName.Left(60) + (" ...")) : sharedfile->sFileName;
+			short_name = sharedfile->sFileName.Length() > 60
+					     ? (sharedfile->sFileName.Left(60) + (" ..."))
+					     : sharedfile->sFileName;
 		} else {
 			short_name = "???";
 		}
 		result->str_val = strdup((const char *)unicode2UTF8(short_name));
-	} else if ( strcmp(prop_name, "user_name") == 0 ) {
+	} else if (strcmp(prop_name, "user_name") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->sUserName));
-	} else if ( strcmp(prop_name, "xfer_up") == 0 ) {
+	} else if (strcmp(prop_name, "xfer_up") == 0) {
 		result->int_val = obj->nTransferredUp;
-	} else if ( strcmp(prop_name, "xfer_down") == 0 ) {
+	} else if (strcmp(prop_name, "xfer_down") == 0) {
 		result->int_val = obj->nTransferredDown;
-	} else if ( strcmp(prop_name, "xfer_speed") == 0 ) {
+	} else if (strcmp(prop_name, "xfer_speed") == 0) {
 		result->int_val = obj->nSpeed;
 	} else {
 		php_report_error(PHP_ERROR, "'UploadFile' property %s is unknown", prop_name);
@@ -994,33 +976,33 @@
 
 void amule_server_prop_get(void *ptr, char *prop_name, PHP_VALUE_NODE *result)
 {
-	if ( !ptr ) {
+	if (!ptr) {
 		value_value_free(result);
 		return;
 	}
 	ServerEntry *obj = static_cast<ServerEntry *>(ptr);
-	if ( strcmp(prop_name, "name") == 0 ) {
+	if (strcmp(prop_name, "name") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->sServerName));
-	} else if ( strcmp(prop_name, "desc") == 0 ) {
+	} else if (strcmp(prop_name, "desc") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->sServerDescription));
-	} else if ( strcmp(prop_name, "addr") == 0 ) {
+	} else if (strcmp(prop_name, "addr") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->sServerIP));
-	} else if ( strcmp(prop_name, "users") == 0 ) {
+	} else if (strcmp(prop_name, "users") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nServerUsers;
-	} else if ( strcmp(prop_name, "ip") == 0 ) {
+	} else if (strcmp(prop_name, "ip") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nServerIP;
-	} else if ( strcmp(prop_name, "port") == 0 ) {
+	} else if (strcmp(prop_name, "port") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nServerPort;
-	} else if ( strcmp(prop_name, "maxusers") == 0 ) {
+	} else if (strcmp(prop_name, "maxusers") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nServerMaxUsers;
-	} else if ( strcmp(prop_name, "files") == 0 ) {
+	} else if (strcmp(prop_name, "files") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nServerFiles;
 	} else {
@@ -1030,49 +1012,50 @@
 
 void amule_shared_file_prop_get(void *ptr, char *prop_name, PHP_VALUE_NODE *result)
 {
-	if ( !ptr ) {
+	if (!ptr) {
 		value_value_free(result);
 		return;
 	}
 	SharedFile *obj = static_cast<SharedFile *>(ptr);
-	if ( strcmp(prop_name, "name") == 0 ) {
+	if (strcmp(prop_name, "name") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->sFileName));
-	} else if ( strcmp(prop_name, "short_name") == 0 ) {
+	} else if (strcmp(prop_name, "short_name") == 0) {
 		result->type = PHP_VAL_STRING;
-		wxString short_name(obj->sFileName.Length() > 60 ? (obj->sFileName.Left(60) + (" ...")) : obj->sFileName);
+		wxString short_name(
+			obj->sFileName.Length() > 60 ? (obj->sFileName.Left(60) + (" ...")) : obj->sFileName);
 		result->str_val = strdup((const char *)unicode2UTF8(short_name));
-	} else if ( strcmp(prop_name, "hash") == 0 ) {
+	} else if (strcmp(prop_name, "hash") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->sFileHash));
-	} else if ( strcmp(prop_name, "size") == 0 ) {
+	} else if (strcmp(prop_name, "size") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->lFileSize;
-	} else if ( strcmp(prop_name, "link") == 0 ) {
+	} else if (strcmp(prop_name, "link") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup(unicode2UTF8(obj->sED2kLink));
-	} else if ( strcmp(prop_name, "xfer") == 0 ) {
+	} else if (strcmp(prop_name, "xfer") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nFileTransferred;
-	} else if ( strcmp(prop_name, "xfer_all") == 0 ) {
+	} else if (strcmp(prop_name, "xfer_all") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nFileAllTimeTransferred;
-	} else if ( strcmp(prop_name, "req") == 0 ) {
+	} else if (strcmp(prop_name, "req") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nFileRequests;
-	} else if ( strcmp(prop_name, "req_all") == 0 ) {
+	} else if (strcmp(prop_name, "req_all") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nFileAllTimeRequests;
-	} else if ( strcmp(prop_name, "accept") == 0 ) {
+	} else if (strcmp(prop_name, "accept") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nFileAccepts;
-	} else if ( strcmp(prop_name, "accept_all") == 0 ) {
+	} else if (strcmp(prop_name, "accept_all") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nFileAllTimeAccepts;
-	} else if ( strcmp(prop_name, "prio") == 0 ) {
+	} else if (strcmp(prop_name, "prio") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->nFilePriority;
-	} else if ( strcmp(prop_name, "prio_auto") == 0 ) {
+	} else if (strcmp(prop_name, "prio_auto") == 0) {
 		result->type = PHP_VAL_BOOL;
 		result->int_val = obj->bFileAutoPriority;
 	} else {
@@ -1082,28 +1065,29 @@
 
 void amule_search_file_prop_get(void *ptr, char *prop_name, PHP_VALUE_NODE *result)
 {
-	if ( !ptr ) {
+	if (!ptr) {
 		value_value_free(result);
 		return;
 	}
 	SearchFile *obj = static_cast<SearchFile *>(ptr);
-	if ( strcmp(prop_name, "name") == 0 ) {
+	if (strcmp(prop_name, "name") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->sFileName));
-	} else if ( strcmp(prop_name, "short_name") == 0 ) {
+	} else if (strcmp(prop_name, "short_name") == 0) {
 		result->type = PHP_VAL_STRING;
-		wxString short_name(obj->sFileName.Length() > 60 ? (obj->sFileName.Left(60) + (" ...")) : obj->sFileName);
+		wxString short_name(
+			obj->sFileName.Length() > 60 ? (obj->sFileName.Left(60) + (" ...")) : obj->sFileName);
 		result->str_val = strdup((const char *)unicode2UTF8(short_name));
-	} else if ( strcmp(prop_name, "hash") == 0 ) {
+	} else if (strcmp(prop_name, "hash") == 0) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(obj->sHash));
-	} else if ( strcmp(prop_name, "size") == 0 ) {
+	} else if (strcmp(prop_name, "size") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->lFileSize;
-	} else if ( strcmp(prop_name, "sources") == 0 ) {
+	} else if (strcmp(prop_name, "sources") == 0) {
 		result->type = PHP_VAL_INT;
 		result->int_val = obj->lSourceCount;
-	} else if ( strcmp(prop_name, "present") == 0 ) {
+	} else if (strcmp(prop_name, "present") == 0) {
 		result->type = PHP_VAL_BOOL;
 		result->int_val = obj->bPresent;
 	} else {
@@ -1118,7 +1102,7 @@
 
 void amule_version(PHP_VALUE_NODE *val)
 {
-	if ( !val ) {
+	if (!val) {
 		return;
 	}
 	value_value_free(val);
@@ -1127,27 +1111,31 @@
 	val->str_val = strdup(PACKAGE_VERSION);
 }
 
-
 PHP_BLTIN_FUNC_DEF amule_lib_funcs = {
 	{
 		"amule_load_vars",
-		1, php_native_load_amule_vars,
+		1,
+		php_native_load_amule_vars,
 	},
 	{
 		"amule_get_stats",
-		0, php_get_amule_stats,
+		0,
+		php_get_amule_stats,
 	},
 	{
 		"amule_get_categories",
-		0, php_get_amule_categories,
+		0,
+		php_get_amule_categories,
 	},
 	{
 		"amule_get_options",
-		0, php_get_amule_options,
+		0,
+		php_get_amule_options,
 	},
 	{
 		"amule_set_options",
-		1, php_set_amule_options,
+		1,
+		php_set_amule_options,
 	},
 	{
 		"amule_do_server_cmd",
@@ -1171,7 +1159,8 @@
 	},
 	{
 		"amule_do_reload_shared_cmd",
-		0, php_native_reload_shared_file_cmd,
+		0,
+		php_native_reload_shared_file_cmd,
 	},
 	{
 		"amule_do_search_download_cmd",
@@ -1190,19 +1179,23 @@
 	},
 	{
 		"amule_get_log",
-		1, php_get_log,
+		1,
+		php_get_log,
 	},
 	{
 		"amule_get_serverinfo",
-		1, php_get_serverinfo,
+		1,
+		php_get_serverinfo,
 	},
 	{
 		"amule_get_version",
-		0, amule_version,
+		0,
+		amule_version,
 	},
 	{
 		"amule_kad_start",
-		0, php_native_kad_start,
+		0,
+		php_native_kad_start,
 	},
 	{
 		"amule_kad_connect",
@@ -1211,7 +1204,8 @@
 	},
 	{
 		"amule_kad_disconnect",
-		0, php_native_kad_disconnect,
+		0,
+		php_native_kad_disconnect,
 	},
 	{
 		"amule_kad_update_from_url",
@@ -1220,16 +1214,21 @@
 	},
 	{
 		"amule_server_disconnect",
-		0, php_native_server_disconnect,
+		0,
+		php_native_server_disconnect,
+	},
+	{
+		0,
+		0,
+		0,
 	},
-	{ 0, 0, 0, },
 };
 
 void php_init_amule_lib()
 {
 	// load function definitions
 	PHP_BLTIN_FUNC_DEF *curr_def = amule_lib_funcs;
-	while ( curr_def->name ) {
+	while (curr_def->name) {
 		php_add_native_func(curr_def);
 		curr_def++;
 	}

amule-3.0.1.tar.gz/src/webserver/src/php_amule_lib_standalone.cpp -> amule-3.1.0.tar.gz/src/webserver/src/php_amule_lib_standalone.cpp Changed

@@ -23,10 +23,8 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-//
-// This file is NOT part of aMule build. It's used solely for testing PHP engine
-// in separate build
-//
+// This file is NOT part of the aMule build. It is used solely for testing the PHP engine in a
+// separate build.
 #include <string> // Do_not_auto_remove (g++-4.0.1)
 #include <map>
 
@@ -41,18 +39,17 @@
 #include "php_syntree.h"
 #include "php_core_lib.h"
 
-
 void php_native_shared_file_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1");
 		return;
 	}
 	char *str_hash = si->var->value.str_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 2");
 		return;
 	}
@@ -60,7 +57,7 @@
 	si = get_scope_item(g_current_scope, "__param_2");
 	PHP_VAR_NODE *opt_param = si ? si->var : 0;
 
-	if ( !strcmp(cmd_name, "prio") && !opt_param ) {
+	if (!strcmp(cmd_name, "prio") && !opt_param) {
 		php_report_error(PHP_ERROR, "Command 'prio' need 3-rd argument");
 		return;
 	}
@@ -73,22 +70,18 @@
 	printf("php_native_reload_shared_file_cmd\n");
 }
 
-/*
- *
- * Usage: php_native_download_file_cmd($file_hash, "command", $optional_arg)
- *
- */
+/* Usage: php_native_download_file_cmd($file_hash, "command", $optional_arg) */
 void php_native_download_file_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1");
 		return;
 	}
 	char *str_hash = si->var->value.str_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 2");
 		return;
 	}
@@ -96,7 +89,7 @@
 	si = get_scope_item(g_current_scope, "__param_2");
 	PHP_VAR_NODE *opt_param = si ? si->var : 0;
 
-	if ( (!strcmp(cmd_name, "prio") || !strcmp(cmd_name, "setcat")) && !opt_param ) {
+	if ((!strcmp(cmd_name, "prio") || !strcmp(cmd_name, "setcat")) && !opt_param) {
 		php_report_error(PHP_ERROR, "Commands 'prio' and 'setcat' needs 3-rd argument");
 		return;
 	}
@@ -104,13 +97,11 @@
 	printf("php_native_download_file_cmd: hash=%s cmd=%s\n", str_hash, cmd_name);
 }
 
-/*
- * Usage amule_kad_connect($bootstrap_ip, $bootstrap_port)
- */
+/* Usage: amule_kad_connect($bootstrap_ip, $bootstrap_port) */
 void php_native_kad_connect(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Missing or bad argument 1: $bootstrap_ip_addr");
 		return;
 	}
@@ -118,7 +109,7 @@
 	unsigned int ipaddr = si->var->value.int_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Missing or bad argument 2: $bootstrap_ip_port");
 		return;
 	}
@@ -133,20 +124,18 @@
 	printf("php_native_kad_disconnect\n");
 }
 
-/*
- * Usage amule_add_server_cmd($server_addr, $server_port, $server_name);
- */
+/* Usage: amule_add_server_cmd($server_addr, $server_port, $server_name) */
 void php_native_add_server_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING) ) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Missing or bad argument 1: $server_addr");
 		return;
 	}
 	char *addr = si->var->value.str_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Missing argument 2: $server_port");
 		return;
 	}
@@ -154,7 +143,7 @@
 	int port = si->var->value.int_val;
 
 	si = get_scope_item(g_current_scope, "__param_2");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING) ) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 3: $server_name");
 		return;
 	}
@@ -163,13 +152,11 @@
 	printf("php_native_add_server_cmd: addr=%s port=%04d name=%s\n", addr, port, name);
 }
 
-/*
- * Usage amule_server_cmd($server_ip, $server_port, "command");
- */
+/* Usage: amule_server_cmd($server_ip, $server_port, "command") */
 void php_native_server_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Missing argument 1: $server_ip");
 		return;
 	}
@@ -177,7 +164,7 @@
 	uint32_t ip = si->var->value.int_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Missing argument 2: $server_port");
 		return;
 	}
@@ -185,7 +172,7 @@
 	int port = si->var->value.int_val;
 
 	si = get_scope_item(g_current_scope, "__param_2");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 3: $command");
 		return;
 	}
@@ -194,9 +181,7 @@
 	printf("php_native_server_cmd: ip=%08x port=%04d cmd=%s\n", ip, port, cmd);
 }
 
-/*
- * Query amule status. Return hash containing stats values
- */
+/* Query amule status. Returns a hash of stats values. */
 void php_get_amule_stats(PHP_VALUE_NODE *result)
 {
 	cast_value_array(result);
@@ -216,43 +201,34 @@
 	}
 }
 
-/*
- * Return hash of amule options.
- *  Key: option name
- *  Value: option value (string)
- */
+/* Returns a hash of amule options: key = option name, value = option value (string). */
 void php_get_amule_options(PHP_VALUE_NODE *result)
 {
 	cast_value_array(result);
 }
 
-
-/*
- * Set amule options from given array. Argument looks like "amule_get_options" result
- */
+/* Set amule options from the given array, shaped like an amule_get_options result. */
 void php_set_amule_options(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_ARRAY)) {
+	if (!si || (si->var->value.type != PHP_VAL_ARRAY)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1 (options array)");
 		return;
 	}
 }
 
-/*
- * Download 1 of search results. Params: hash, category (default=0)
- */
+/* Download one of the search results. Params: hash, category (default 0). */
 void php_native_search_download_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1 (file hash)");
 		return;
 	}
 	char *str_hash = si->var->value.str_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 2 (category)");
 		return;
 	}
@@ -265,66 +241,71 @@
 void php_native_search_start_cmd(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1 (search term)");
 		return;
 	}
 	char *search = si->var->value.str_val;
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_1")) || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!(si = get_scope_item(g_current_scope, "__param_1")) || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 2 (file extension)");
 		return;
 	}
 	char *ext = si->var->value.str_val;
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_2")) || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!(si = get_scope_item(g_current_scope, "__param_2")) || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 3 (file type)");
 		return;
 	}
 	char *type = si->var->value.str_val;
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_3")) ) {
+	if (!(si = get_scope_item(g_current_scope, "__param_3"))) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 4 (search type)");
 		return;
 	}
 	cast_value_dnum(&si->var->value);
 	int search_type = si->var->value.int_val;
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_4")) ) {
+	if (!(si = get_scope_item(g_current_scope, "__param_4"))) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 5 (availability)");
 		return;
 	}
 	cast_value_dnum(&si->var->value);
 	int avail = si->var->value.int_val;
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_5")) ) {
+	if (!(si = get_scope_item(g_current_scope, "__param_5"))) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 6 (min size)");
 		return;
 	}
 	cast_value_dnum(&si->var->value);
 	int min_size = si->var->value.int_val;
 
-	if ( !(si = get_scope_item(g_current_scope, "__param_6")) ) {
+	if (!(si = get_scope_item(g_current_scope, "__param_6"))) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 7 (max size)");
 		return;
 	}
 	cast_value_dnum(&si->var->value);
 	int max_size = si->var->value.int_val;
 
-	printf("php_native_search_start_cmd:\nsearch=%s\next=%s\nfile_type=%s\nsearch_type=%d\navail=%d\nmin_size=%d\nmax_size=%d\n",
-	       search, ext, type, search_type, avail, min_size, max_size);
+	printf("php_native_search_start_cmd:\nsearch=%s\next=%s\nfile_type=%s\nsearch_type=%d\navail=%d\nmin_"
+	       "size=%d\nmax_size=%d\n",
+		search,
+		ext,
+		type,
+		search_type,
+		avail,
+		min_size,
+		max_size);
 }
 
-/*
- * Request contents of log
- */
+/* Request the contents of the log */
 void php_get_log(PHP_VALUE_NODE *result)
 {
 	value_value_free(result);
 
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
 	bool rst;
-	if ( !si ) {
+	if (!si) {
 		rst = false;
 	} else {
 		cast_value_dnum(&si->var->value);
@@ -334,16 +315,14 @@
 	printf("php_get_log: reset=%d\n", rst);
 }
 
-/*
- * Request contents of server info
- */
+/* Request the contents of the server info */
 void php_get_serverinfo(PHP_VALUE_NODE *result)
 {
 	value_value_free(result);
 
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
 	bool rst;
-	if ( !si ) {
+	if (!si) {
 		rst = false;
 	} else {
 		cast_value_dnum(&si->var->value);
@@ -352,21 +331,18 @@
 	printf("php_get_serverinfo: reset=%d\n", rst);
 }
 
-
-/*
- * Download ed2k link. Params: link, category (default=0)
- */
+/* Download an ed2k link. Params: link, category (default 0). */
 void php_native_ed2k_download_cmd(PHP_VALUE_NODE *result)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 1 (file link)");
 		return;
 	}
 	char *str_link = si->var->value.str_val;
 
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si ) {
+	if (!si) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 2 (category)");
 		return;
 	}
@@ -376,7 +352,6 @@
 	printf("php_native_ed2k_download_cmd: file_link=%s category=%d\n", str_link, cat);
 }
 
-
 void amule_fake_obj_array_create(int count, char *class_name, PHP_VALUE_NODE *result)
 {
 	for (int i = 0; i < count; i++) {
@@ -412,44 +387,39 @@
 	amule_fake_obj_array_create(17, "AmuleUploadFile", result);
 }
 
-void amule_load_stats()
-{
-}
-
-void amule_load_stats_tree(PHP_VALUE_NODE *)
-{
-}
+void amule_load_stats() {}
 
+void amule_load_stats_tree(PHP_VALUE_NODE *) {}
 
 void php_native_load_amule_vars(PHP_VALUE_NODE *result)
 {
 	PHP_SCOPE_ITEM *si_str = get_scope_item(g_current_scope, "__param_0");
-	if ( !si_str  ) {
+	if (!si_str) {
 		php_report_error(PHP_ERROR, "Missing argument 'varname' for 'load_amule_vars'");
 		return;
 	}
 	PHP_VALUE_NODE *str = &si_str->var->value;
-	if ( str->type != PHP_VAL_STRING ) {
+	if (str->type != PHP_VAL_STRING) {
 		php_report_error(PHP_ERROR, "Argument 'varname' for 'load_amule_vars' must be string");
 		return;
 	}
 	char *varname = str->str_val;
-	if ( result ) {
+	if (result) {
 		cast_value_array(result);
 	}
-	if ( strcmp(varname, "downloads") == 0 ) {
+	if (strcmp(varname, "downloads") == 0) {
 		amule_load_downloads(result);
-	} else if ( strcmp(varname, "uploads") == 0 ) {
+	} else if (strcmp(varname, "uploads") == 0) {
 		amule_load_uploads(result);
-	} else if ( strcmp(varname, "shared") == 0 ) {
+	} else if (strcmp(varname, "shared") == 0) {
 		amule_load_shared(result);
-	} else if ( strcmp(varname, "searchresult") == 0 ) {
+	} else if (strcmp(varname, "searchresult") == 0) {
 		amule_load_search(result);
-	} else if ( strcmp(varname, "servers") == 0 ) {
+	} else if (strcmp(varname, "servers") == 0) {
 		amule_load_servers(result);
-	} else if ( strcmp(varname, "stats_graph") == 0 ) {
+	} else if (strcmp(varname, "stats_graph") == 0) {
 		amule_load_stats();
-	} else if ( strcmp(varname, "stats_tree") == 0 ) {
+	} else if (strcmp(varname, "stats_tree") == 0) {
 		amule_load_stats_tree(result);
 	} else {
 		value_value_free(result);
@@ -457,12 +427,10 @@
 	}
 }
 
-/*
- * Amule objects implementations
- */
+/* Amule objects implementations */
 void amule_fake_prop_get(void *obj, char *prop_name, PHP_VALUE_NODE *result)
 {
-	if ( !strcmp(prop_name, "name") || !strcmp(prop_name, "hash") ) {
+	if (!strcmp(prop_name, "name") || !strcmp(prop_name, "hash")) {
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup("some_str");
 	} else {
@@ -498,7 +466,7 @@
 
 void amule_version(PHP_VALUE_NODE *val)
 {
-	if ( !val ) {
+	if (!val) {
 		return;
 	}
 	value_value_free(val);
@@ -507,27 +475,31 @@
 	val->str_val = strdup(PACKAGE_VERSION);
 }
 
-
 PHP_BLTIN_FUNC_DEF amule_lib_funcs = {
 	{
 		"amule_load_vars",
-		1, php_native_load_amule_vars,
+		1,
+		php_native_load_amule_vars,
 	},
 	{
 		"amule_get_stats",
-		0, php_get_amule_stats,
+		0,
+		php_get_amule_stats,
 	},
 	{
 		"amule_get_categories",
-		0, php_get_amule_categories,
+		0,
+		php_get_amule_categories,
 	},
 	{
 		"amule_get_options",
-		0, php_get_amule_options,
+		0,
+		php_get_amule_options,
 	},
 	{
 		"amule_set_options",
-		1, php_set_amule_options,
+		1,
+		php_set_amule_options,
 	},
 	{
 		"amule_do_server_cmd",
@@ -551,7 +523,8 @@
 	},
 	{
 		"amule_do_reload_shared_cmd",
-		0, php_native_reload_shared_file_cmd,
+		0,
+		php_native_reload_shared_file_cmd,
 	},
 	{
 		"amule_do_search_download_cmd",
@@ -570,24 +543,31 @@
 	},
 	{
 		"amule_get_log",
-		1, php_get_log,
+		1,
+		php_get_log,
 	},
 	{
 		"amule_get_serverinfo",
-		1, php_get_serverinfo,
+		1,
+		php_get_serverinfo,
 	},
 	{
 		"amule_get_version",
-		0, amule_version,
+		0,
+		amule_version,
+	},
+	{
+		0,
+		0,
+		0,
 	},
-	{ 0, 0, 0, },
 };
 
 void php_init_amule_lib()
 {
 	// load function definitions
 	PHP_BLTIN_FUNC_DEF *curr_def = amule_lib_funcs;
-	while ( curr_def->name ) {
+	while (curr_def->name) {
 		php_add_native_func(curr_def);
 		curr_def++;
 	}
@@ -601,19 +581,19 @@
 
 int main(int argc, char *argv)
 {
-	const char *filename = ( argc == 2 ) ? argv1 : "test.php";
+	const char *filename = (argc == 2) ? argv1 : "test.php";
 
 	CWriteStrBuffer buffer;
 
-	//phpdebug = 0;
+	// phpdebug = 0;
 
-	CPhpFilter php_filter((CWebServerBase*)0, (CSession *)0,filename, &buffer);
+	CPhpFilter php_filter((CWebServerBase *)0, (CSession *)0, filename, &buffer);
 
 	int size = buffer.Length();
-	char *buf = new char size+1;
+	char *buf = new charsize + 1;
 	buffer.CopyAll(buf);
 	printf("%s", buf);
-	delete  buf;
+	delete buf;
 
 	return 0;
 }

amule-3.0.1.tar.gz/src/webserver/src/php_core_lib.cpp -> amule-3.1.0.tar.gz/src/webserver/src/php_core_lib.cpp Changed

@@ -28,19 +28,19 @@
 #include <string> // Do_not_auto_remove (g++-4.0.1)
 
 #ifdef HAVE_SYS_TYPES_H
-#	include <sys/types.h>
+#include <sys/types.h>
 #endif
 
 #ifdef PHP_STANDALONE_EN
-#	include <map>
-#	include <string>
-#	include <list>
-#	include <regex.h>
+#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>
+#include "WebServer.h"
+#include <ec/cpp/ECSpecialTags.h>
+#include <wx/regex.h>
+#include <wx/datetime.h>
 #endif
 
 #include "php_syntree.h"
@@ -52,72 +52,81 @@
 #endif
 
 /*
- * Built-in php functions. Those are both library and core internals.
- *
- * I'm not going event to get near to what Zend provide, but
- * at least base things must be here
+ * Built-in php functions, both library and core internals. Nowhere near what Zend provides, but at
+ * least the base things are here.
  */
 
-/*
- * Print info about variable: php var_dump()
- */
+/* Print info about a variable: php var_dump() */
 void php_var_dump(PHP_VALUE_NODE *node, int ident, int ref)
 {
-	for(int i = 0; i < ident;i++) {
+	for (int i = 0; i < ident; i++) {
 		printf("\t");
 	}
-	if ( ref ) printf("&");
-	switch(node->type) {
-		case PHP_VAL_BOOL: printf("bool(%s)\n", node->int_val ? "true" : "false"); break;
-		case PHP_VAL_INT: printf("int(%" PRId64 ")\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", (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);
-			printf("array(%d) {\n", arr_size);
-			for(int i = 0; i < arr_size;i++) {
-				const std::string &curr_key = array_get_ith_key(node, i);
-				PHP_VAR_NODE *curr_val = array_get_by_str_key(node, curr_key);
-				printf("\t%s=>\n", curr_key.c_str());
-				php_var_dump(&curr_val->value, ident+1, curr_val->ref_count > 1);
-			}
-			for(int i = 0; i < ident;i++) {
-				printf("\t");
-			}
-			printf("}\n");
-			break;
+	if (ref)
+		printf("&");
+	switch (node->type) {
+	case PHP_VAL_BOOL:
+		printf("bool(%s)\n", node->int_val ? "true" : "false");
+		break;
+	case PHP_VAL_INT:
+		printf("int(%" PRId64 ")\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", (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);
+		printf("array(%d) {\n", arr_size);
+		for (int i = 0; i < arr_size; i++) {
+			const std::string &curr_key = array_get_ith_key(node, i);
+			PHP_VAR_NODE *curr_val = array_get_by_str_key(node, curr_key);
+			printf("\t%s=>\n", curr_key.c_str());
+			php_var_dump(&curr_val->value, ident + 1, curr_val->ref_count > 1);
+		}
+		for (int i = 0; i < ident; i++) {
+			printf("\t");
 		}
-		case PHP_VAL_NONE: printf("NULL\n"); break;
-		case PHP_VAL_VAR_NODE:
-		case PHP_VAL_INT_DATA: assert(0); break;
+		printf("}\n");
+		break;
+	}
+	case PHP_VAL_NONE:
+		printf("NULL\n");
+		break;
+	case PHP_VAL_VAR_NODE:
+	case PHP_VAL_INT_DATA:
+		assert(0);
+		break;
 	}
 }
 
 void php_native_var_dump(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( si ) {
-		assert((si->type == PHP_SCOPE_VAR)||(si->type == PHP_SCOPE_PARAM));
+	if (si) {
+		assert((si->type == PHP_SCOPE_VAR) || (si->type == PHP_SCOPE_PARAM));
 		php_var_dump(&si->var->value, 0, 0);
 	} else {
 		php_report_error(PHP_ERROR, "Invalid or missing argument");
 	}
 }
 
+/* Sorting stl-way requires operator ">" */
+class SortElem
+{
+public:
+	SortElem() {}
+	SortElem(PHP_VAR_NODE *p) { obj = p; }
 
-/*
- * Sorting stl-way requires operator ">"
- */
-class SortElem {
-	public:
-		SortElem() {}
-		SortElem(PHP_VAR_NODE *p) { obj = p; }
-
-		PHP_VAR_NODE *obj;
-		static PHP_SYN_FUNC_DECL_NODE *callback;
+	PHP_VAR_NODE *obj;
+	static PHP_SYN_FUNC_DECL_NODE *callback;
 
-		friend bool operator<(const SortElem &o1, const SortElem &o2);
+	friend bool operator<(const SortElem &o1, const SortElem &o2);
 };
 
 PHP_SYN_FUNC_DECL_NODE *SortElem::callback = 0;
@@ -131,15 +140,11 @@
 
 	switch_push_scope_table((PHP_SCOPE_TABLE_TYPE *)SortElem::callback->scope);
 
-	//
-	// params passed by-value, all & notations ignored
-	//
+	// params passed by value; all & notations ignored
 	result.type = PHP_VAL_NONE;
 	php_execute(SortElem::callback->code, &result);
 	cast_value_dnum(&result);
-	//
 	// restore stack, free arg list
-	//
 	switch_pop_scope_table(0);
 
 	value_value_free(&SortElem::callback->params0.si_var->var->value);
@@ -151,38 +156,34 @@
 void php_native_usort(PHP_VALUE_NODE *)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( !si || (si->var->value.type != PHP_VAL_ARRAY)) {
+	if (!si || (si->var->value.type != PHP_VAL_ARRAY)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument (array)");
 		return;
 	}
 	PHP_VAR_NODE *array = si->var;
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( !si || (si->var->value.type != PHP_VAL_STRING)) {
+	if (!si || (si->var->value.type != PHP_VAL_STRING)) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument (func name)");
 		return;
 	}
 	char *cmp_func_name = si->var->value.str_val;
 	si = get_scope_item(g_global_scope, cmp_func_name);
-	if ( !si || (si->type != PHP_SCOPE_FUNC)) {
+	if (!si || (si->type != PHP_SCOPE_FUNC)) {
 		php_report_error(PHP_ERROR, "Compare function %s not found", cmp_func_name);
 		return;
 	}
 	PHP_SYN_FUNC_DECL_NODE *func_decl = si->func->func_decl;
 
-	//
-	// usort invalidates keys, and sorts values
-	//
+	// usort invalidates keys and sorts values
 	PHP_ARRAY_TYPE *arr_obj = (PHP_ARRAY_TYPE *)array->value.ptr_val;
-	//
 	// create vector of values
-	//
-	if ( arr_obj->array.empty() ) {
+	if (arr_obj->array.empty()) {
 		php_report_error(PHP_WARNING, "Sorting array of size 0");
 		return;
 	}
 
 	std::list<SortElem> sort_list;
-	for(PHP_ARRAY_ITER_TYPE i = arr_obj->array.begin(); i != arr_obj->array.end(); ++i) {
+	for (PHP_ARRAY_ITER_TYPE i = arr_obj->array.begin(); i != arr_obj->array.end(); ++i) {
 		sort_list.push_back(SortElem(i->second));
 	}
 	SortElem::callback = func_decl;
@@ -191,23 +192,19 @@
 	arr_obj->array.clear();
 	arr_obj->sorted_keys.clear();
 	unsigned int key = 0;
-	for(std::list<SortElem>::iterator i = sort_list.begin(); i != sort_list.end(); ++i) {
+	for (std::list<SortElem>::iterator i = sort_list.begin(); i != sort_list.end(); ++i) {
 		array_add_to_int_key(&array->value, key++, i->obj);
 	}
-
 }
 
-
-/*
- * String functions
- */
+/* String functions */
 void php_native_strlen(PHP_VALUE_NODE *result)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( si ) {
+	if (si) {
 		PHP_VALUE_NODE *param = &si->var->value;
 		cast_value_str(param);
-		if ( result ) {
+		if (result) {
 			cast_value_dnum(result);
 			result->int_val = strlen(param->str_val);
 		}
@@ -219,11 +216,11 @@
 void php_native_count(PHP_VALUE_NODE *result)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( si ) {
+	if (si) {
 		PHP_VALUE_NODE *param = &si->var->value;
-		if ( result ) {
+		if (result) {
 			cast_value_dnum(result);
-			if ( si->var->value.type != PHP_VAL_ARRAY ) {
+			if (si->var->value.type != PHP_VAL_ARRAY) {
 				result->int_val = 0;
 			} else {
 				result->int_val = array_get_size(param);
@@ -237,10 +234,10 @@
 void php_native_isset(PHP_VALUE_NODE *result)
 {
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( si ) {
+	if (si) {
 		PHP_VALUE_NODE *param = &si->var->value;
 		cast_value_str(param);
-		if ( result ) {
+		if (result) {
 			cast_value_bool(result);
 			result->int_val = (si->var->value.type == PHP_VAL_NONE) ? 0 : 1;
 		}
@@ -252,22 +249,33 @@
 void php_native_htmlspecialchars(PHP_VALUE_NODE *result)
 {
 	PHP_SCOPE_ITEM *si_str = get_scope_item(g_current_scope, "__param_0");
-	if ( !si_str ) {
+	if (!si_str) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 'string' for 'htmlspecialchars'");
 		return;
 	}
 	PHP_VALUE_NODE *str = &si_str->var->value;
 	cast_value_str(str);
-	if ( result ) {
+	if (result) {
 		std::string escaped;
-		for(const char *p = str->str_val; *p; p++) {
-			switch(*p) {
-				case '&': escaped += "&amp;"; break;
-				case '<': escaped += "&lt;"; break;
-				case '>': escaped += "&gt;"; break;
-				case '"': escaped += "&quot;"; break;
-				case '\'': escaped += "&#039;"; break;
-				default: escaped += *p;
+		for (const char *p = str->str_val; *p; p++) {
+			switch (*p) {
+			case '&':
+				escaped += "&amp;";
+				break;
+			case '<':
+				escaped += "&lt;";
+				break;
+			case '>':
+				escaped += "&gt;";
+				break;
+			case '"':
+				escaped += "&quot;";
+				break;
+			case '\'':
+				escaped += "&#039;";
+				break;
+			default:
+				escaped += *p;
 			}
 		}
 		result->type = PHP_VAL_STRING;
@@ -275,35 +283,46 @@
 	}
 }
 
-// Escape a string for safe inclusion inside a quoted JavaScript string
-// literal that lives in an HTML <script> element. On top of the classic PHP
-// addslashes() set (\ " ') this also escapes '<' as \x3C so an embedded
-// "</script>" cannot terminate the <script> block (the HTML parser scans
-// raw-text script content for that literal sequence regardless of JS
-// syntax), and CR/LF as \r/\n so a multi-line value can't break the literal.
-// Every escape decodes back to the original character in JS, so the value is
-// displayed verbatim when assigned to a form field.
+// Escape a string for safe inclusion inside a quoted JavaScript string literal that lives in an
+// HTML <script> element. On top of the classic PHP addslashes() set (\ " ') this also escapes '<'
+// as \x3C so an embedded "</script>" cannot terminate the <script> block -- the HTML parser scans
+// raw-text script content for that literal sequence whatever the JS syntax -- and CR/LF as \r/\n so
+// a multi-line value cannot break the literal. Every escape decodes back to the original character
+// in JS, so the value is displayed verbatim when assigned to a form field.
 void php_native_addslashes(PHP_VALUE_NODE *result)
 {
 	PHP_SCOPE_ITEM *si_str = get_scope_item(g_current_scope, "__param_0");
-	if ( !si_str ) {
+	if (!si_str) {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 'string' for 'addslashes'");
 		return;
 	}
 	PHP_VALUE_NODE *str = &si_str->var->value;
 	cast_value_str(str);
-	if ( result ) {
+	if (result) {
 		cast_value_dnum(result);
 		std::string escaped;
-		for(const char *p = str->str_val; *p; p++) {
-			switch(*p) {
-				case '\\': escaped += "\\\\"; break;
-				case '"':  escaped += "\\\""; break;
-				case '\'': escaped += "\\'"; break;
-				case '<':  escaped += "\\x3C"; break;
-				case '\n': escaped += "\\n"; break;
-				case '\r': escaped += "\\r"; break;
-				default: escaped += *p;
+		for (const char *p = str->str_val; *p; p++) {
+			switch (*p) {
+			case '\\':
+				escaped += "\\\\";
+				break;
+			case '"':
+				escaped += "\\\"";
+				break;
+			case '\'':
+				escaped += "\\'";
+				break;
+			case '<':
+				escaped += "\\x3C";
+				break;
+			case '\n':
+				escaped += "\\n";
+				break;
+			case '\r':
+				escaped += "\\r";
+				break;
+			default:
+				escaped += *p;
 			}
 		}
 		result->type = PHP_VAL_STRING;
@@ -311,10 +330,9 @@
 	}
 }
 
-
 void php_native_split(PHP_VALUE_NODE *result)
 {
-	if ( result ) {
+	if (result) {
 		cast_value_array(result);
 	} else {
 		return;
@@ -322,7 +340,7 @@
 	PHP_VALUE_NODE *pattern, *string_to_split;
 	int split_limit = -1;
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, "__param_0");
-	if ( si ) {
+	if (si) {
 		pattern = &si->var->value;
 		cast_value_str(pattern);
 	} else {
@@ -330,7 +348,7 @@
 		return;
 	}
 	si = get_scope_item(g_current_scope, "__param_1");
-	if ( si ) {
+	if (si) {
 		string_to_split = &si->var->value;
 		cast_value_str(string_to_split);
 	} else {
@@ -338,7 +356,7 @@
 		return;
 	}
 	si = get_scope_item(g_current_scope, "__param_2");
-	if ( si ) {
+	if (si) {
 		PHP_VALUE_NODE *limit_node = &si->var->value;
 		cast_value_dnum(limit_node);
 		split_limit = limit_node->int_val;
@@ -346,7 +364,7 @@
 #ifdef PHP_STANDALONE_EN
 	regex_t preg;
 	int reg_result = regcomp(&preg, pattern->str_val, REG_EXTENDED);
-	if ( reg_result ) {
+	if (reg_result) {
 		char error_buff256;
 		regerror(reg_result, &preg, error_buff, sizeof(error_buff));
 		php_report_error(PHP_ERROR, "Failed in regcomp: %s", error_buff);
@@ -356,25 +374,25 @@
 	size_t nmatch = 1; // only pmatch0 used
 	regmatch_t *pmatch = new regmatch_tnmatch;
 	char *str_2_match = string_to_split->str_val;
-	char *tmp_buff = new charstrlen(string_to_split->str_val)+1;
+	char *tmp_buff = new charstrlen(string_to_split->str_val) + 1;
 
 	int piece_count = 0;
-	while ( 1 ) {
-		if ( split_limit > 0 && piece_count >= split_limit - 1 ) {
+	while (1) {
+		if (split_limit > 0 && piece_count >= split_limit - 1) {
 			break;
 		}
 		reg_result = regexec(&preg, str_2_match, nmatch, pmatch, 0);
-		if ( reg_result ) {
+		if (reg_result) {
 			// no match
 			break;
 		}
-		if ( pmatch0.rm_eo == pmatch0.rm_so ) {
+		if (pmatch0.rm_eo == pmatch0.rm_so) {
 			// zero-length match
 			break;
 		}
 		// I will use only first match, since I don't see any sense to have more
 		// than 1 match in split() call.
-		for(int i = 0; i < pmatch0.rm_so; i++) {
+		for (int i = 0; i < pmatch0.rm_so; i++) {
 			tmp_buffi = str_2_matchi;
 		}
 		tmp_buffpmatch0.rm_so = 0;
@@ -391,14 +409,13 @@
 	match_val->value.type = PHP_VAL_STRING;
 	match_val->value.str_val = strdup(str_2_match);
 
-	delete  tmp_buff;
-	delete  pmatch;
+	delete tmp_buff;
+	delete pmatch;
 	regfree(&preg);
 #else
-	// wxRegEx returns match offsets in wxString (wide-char) space, not
-	// bytes -- indexing a UTF-8 char* buffer with those offsets directly
-	// is off by `bytes_per_char - 1` per non-ASCII character. Work
-	// entirely in wxString and convert each chunk to UTF-8 only at the
+	// wxRegEx returns match offsets in wxString (wide-char) space, not bytes -- indexing a
+	// UTF-8 char* buffer with those offsets directly is off by `bytes_per_char - 1` per non-
+	// ASCII character. Work entirely in wxString and convert each chunk to UTF-8 only at the
 	// array_push_back point.
 	wxRegEx preg;
 	if (!preg.Compile(wxString(char2unicode(pattern->str_val)), wxRE_EXTENDED)) {
@@ -409,15 +426,15 @@
 	int piece_count = 0;
 	wxString remaining(char2unicode(string_to_split->str_val));
 	while (preg.Matches(remaining)) {
-		if ( split_limit > 0 && piece_count >= split_limit - 1 ) {
+		if (split_limit > 0 && piece_count >= split_limit - 1) {
 			break;
 		}
 		size_t start, len;
-		if ( !preg.GetMatch(&start, &len) ) {
+		if (!preg.GetMatch(&start, &len)) {
 			// no match
 			break;
 		}
-		if ( len == 0 ) {
+		if (len == 0) {
 			// zero-length match
 			break;
 		}
@@ -440,14 +457,14 @@
 {
 	PHP_SCOPE_ITEM *si_str = get_scope_item(g_current_scope, "__param_0");
 	PHP_VALUE_NODE *str;
-	if ( si_str ) {
+	if (si_str) {
 		str = &si_str->var->value;
 		cast_value_str(str);
 	} else {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 'msgid' for 'gettext'");
 		return;
 	}
-	if ( result ) {
+	if (result) {
 		cast_value_dnum(result);
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup(gettext(str->str_val));
@@ -458,14 +475,14 @@
 {
 	PHP_SCOPE_ITEM *si_str = get_scope_item(g_current_scope, "__param_0");
 	PHP_VALUE_NODE *str;
-	if ( si_str ) {
+	if (si_str) {
 		str = &si_str->var->value;
 		cast_value_str(str);
 	} else {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 'msgid' for 'gettext_noop'");
 		return;
 	}
-	if ( result ) {
+	if (result) {
 		cast_value_dnum(result);
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup(str->str_val);
@@ -476,7 +493,7 @@
 {
 	PHP_SCOPE_ITEM *si_msgid = get_scope_item(g_current_scope, "__param_0");
 	PHP_VALUE_NODE *msgid;
-	if ( si_msgid ) {
+	if (si_msgid) {
 		msgid = &si_msgid->var->value;
 		cast_value_str(msgid);
 	} else {
@@ -485,7 +502,7 @@
 	}
 	PHP_SCOPE_ITEM *si_msgid_plural = get_scope_item(g_current_scope, "__param_1");
 	PHP_VALUE_NODE *msgid_plural;
-	if ( si_msgid_plural ) {
+	if (si_msgid_plural) {
 		msgid_plural = &si_msgid_plural->var->value;
 		cast_value_str(msgid_plural);
 	} else {
@@ -494,14 +511,14 @@
 	}
 	PHP_SCOPE_ITEM *si_count = get_scope_item(g_current_scope, "__param_2");
 	PHP_VALUE_NODE *count;
-	if ( si_count ) {
+	if (si_count) {
 		count = &si_count->var->value;
 		cast_value_dnum(count);
 	} else {
 		php_report_error(PHP_ERROR, "Invalid or missing argument 'count' for 'ngettext'");
 		return;
 	}
-	if ( result ) {
+	if (result) {
 		cast_value_dnum(result);
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup(ngettext(msgid->str_val, msgid_plural->str_val, count->int_val));
@@ -517,15 +534,18 @@
 	},
 	{
 		"strlen",
-		1, php_native_strlen,
+		1,
+		php_native_strlen,
 	},
 	{
 		"count",
-		1, php_native_count,
+		1,
+		php_native_count,
 	},
 	{
 		"isset",
-		1, php_native_isset,
+		1,
+		php_native_isset,
 	},
 	{
 		"usort",
@@ -539,48 +559,55 @@
 	},
 	{
 		"htmlspecialchars",
-		1, php_native_htmlspecialchars,
+		1,
+		php_native_htmlspecialchars,
 	},
 	{
 		"addslashes",
-		1, php_native_addslashes,
+		1,
+		php_native_addslashes,
 	},
 #ifdef ENABLE_NLS
 	{
 		"_",
-		1, php_native_gettext,
+		1,
+		php_native_gettext,
 	},
 	{
 		"gettext",
-		1, php_native_gettext,
+		1,
+		php_native_gettext,
 	},
 	{
 		"gettext_noop",
-		1, php_native_gettext_noop,
+		1,
+		php_native_gettext_noop,
 	},
 	{
 		"ngettext",
-		3, php_native_ngettext,
+		3,
+		php_native_ngettext,
 	},
 #endif
-	{ 0, 0, 0, },
+	{
+		0,
+		0,
+		0,
+	},
 };
 
 void php_init_core_lib()
 {
 	// load function definitions
 	PHP_BLTIN_FUNC_DEF *curr_def = core_lib_funcs;
-	while ( curr_def->name ) {
+	while (curr_def->name) {
 		php_add_native_func(curr_def);
 		curr_def++;
 	}
 }
 
-//
 // lexer has no include file
-//
-extern "C"
-void php_set_input_buffer(char *buf, int len);
+extern "C" void php_set_input_buffer(char *buf, int len);
 
 CPhPLibContext::CPhPLibContext(CWebServerBase *server, const char *file)
 {
@@ -590,7 +617,7 @@
 
 	php_engine_init();
 	phpin = fopen(file, "r");
-	if ( !phpin ) {
+	if (!phpin) {
 		return;
 	}
 
@@ -639,18 +666,16 @@
 CPhPLibContext *CPhPLibContext::g_curr_context = 0;
 
 /*
- * For simplicity and performance sake, this function can
- * only handle limited-length printf's. In should be NOT be used
- * for string concatenation like printf("xyz %s %s", s1, s2).
- *
- * Engine will call Print for "print" and "echo"
+ * For simplicity and performance this can only handle limited-length printfs. It should NOT be
+ * used for string concatenation like printf("xyz %s %s", s1, s2). The engine calls Print for
+ * "print" and "echo".
  */
 void CPhPLibContext::Printf(const char *str, ...)
 {
 	va_list args;
 
 	va_start(args, str);
-	if ( !g_curr_context || !g_curr_context->m_curr_str_buffer ) {
+	if (!g_curr_context || !g_curr_context->m_curr_str_buffer) {
 		vprintf(str, args);
 	} else {
 		char buf4096;
@@ -662,30 +687,28 @@
 
 void CPhPLibContext::Print(const char *str)
 {
-	if ( !g_curr_context || !g_curr_context->m_curr_str_buffer ) {
+	if (!g_curr_context || !g_curr_context->m_curr_str_buffer) {
 		printf("%s", str);
 	} else {
 		g_curr_context->m_curr_str_buffer->Write(str);
 	}
 }
 
-
-CPhpFilter::CPhpFilter(CWebServerBase *server, CSession *sess,
-			const char *file, CWriteStrBuffer *buff)
+CPhpFilter::CPhpFilter(CWebServerBase *server, CSession *sess, const char *file, CWriteStrBuffer *buff)
 {
 	FILE *f = fopen(file, "r");
-	if ( !f ) {
+	if (!f) {
 		printf("ERROR: php can not open source file %s\n", file);
 		return;
 	}
-	if ( fseek(f, 0, SEEK_END) != 0 ) {
+	if (fseek(f, 0, SEEK_END) != 0) {
 		printf("ERROR: fseek failed on php source file %s\n", file);
 		fclose(f);
 		return;
 	}
-	// ftell returns long, which is 32-bit on Win64 (LLP64) -- store in
-	// a 64-bit local first so a >2 GiB file (or a negative error
-	// return) doesn't silently wrap into a bogus allocation size.
+	// ftell returns long, which is 32-bit on Win64 (LLP64) -- store it in a 64-bit local first
+	// so a >2 GiB file, or a negative error return, does not silently wrap into a bogus
+	// allocation size.
 	const long long raw_size = ftell(f);
 	if (raw_size < 0 || raw_size > 0x7fffffffLL) {
 		printf("ERROR: php source file %s is too large or ftell failed\n", file);
@@ -693,7 +716,7 @@
 		return;
 	}
 	int size = static_cast<int>(raw_size);
-	char *buf = new char size+1;
+	char *buf = new charsize + 1;
 	rewind(f);
 	// fread may actually read less if it is a CR-LF-file in Windows
 	size = fread(buf, 1, size, f);
@@ -701,17 +724,17 @@
 	fclose(f);
 	char *scan_ptr = buf;
 	char *curr_code_end = buf;
-	while ( *scan_ptr ) {
+	while (*scan_ptr) {
 		scan_ptr = strstr(scan_ptr, "<?php");
-		if ( !scan_ptr ) {
+		if (!scan_ptr) {
 			buff->Write(curr_code_end);
 			break;
 		}
-		if ( scan_ptr != curr_code_end ) {
+		if (scan_ptr != curr_code_end) {
 			buff->Write(curr_code_end, scan_ptr - curr_code_end);
 		}
 		curr_code_end = strstr(scan_ptr, "?>");
-		if ( !curr_code_end ) {
+		if (!curr_code_end) {
 			break;
 		}
 		curr_code_end += 2; // include "?>" in buffer
@@ -740,14 +763,12 @@
 	sess->m_get_vars.clear();
 #endif
 
-	delete  buf;
+	delete buf;
 }
 
-
 /*
- * String buffer: almost same as regular 'string' class, but,
- * without reallocation when full. Instead, new buffer is
- * allocated, and added to list
+ * String buffer: almost the same as a regular 'string' class, but with no reallocation when full.
+ * Instead a new buffer is allocated and added to a list.
  */
 CWriteStrBuffer::CWriteStrBuffer()
 {
@@ -759,28 +780,28 @@
 
 CWriteStrBuffer::~CWriteStrBuffer()
 {
-	for(std::list<char *>::iterator i = m_buf_list.begin(); i != m_buf_list.end(); ++i) {
-		delete  *i;
+	for (std::list<char *>::iterator i = m_buf_list.begin(); i != m_buf_list.end(); ++i) {
+		delete *i;
 	}
-	delete  m_curr_buf;
+	delete m_curr_buf;
 }
 
 void CWriteStrBuffer::AllocBuf()
 {
-	m_curr_buf = new char m_alloc_size;
+	m_curr_buf = new charm_alloc_size;
 	m_buf_ptr = m_curr_buf;
 	m_curr_buf_left = m_alloc_size;
 }
 
 void CWriteStrBuffer::Write(const char *s, int len)
 {
-	if ( len == -1 ) {
+	if (len == -1) {
 		len = strlen(s);
 	}
 	m_total_length += len;
 
-	while ( len ) {
-		if ( (len + 1) <= m_curr_buf_left ) {
+	while (len) {
+		if ((len + 1) <= m_curr_buf_left) {
 			memcpy(m_buf_ptr, s, len);
 			m_buf_ptr += len;
 			*m_buf_ptr = '\0';
@@ -802,12 +823,12 @@
 {
 	char *curr_ptr = dst_buffer;
 	int rem_size = m_total_length;
-	for(std::list<char *>::iterator i = m_buf_list.begin(); i != m_buf_list.end(); ++i) {
+	for (std::list<char *>::iterator i = m_buf_list.begin(); i != m_buf_list.end(); ++i) {
 		memcpy(curr_ptr, *i, m_alloc_size);
 		rem_size -= m_alloc_size;
 		curr_ptr += m_alloc_size;
 	}
-	if ( rem_size ) {
+	if (rem_size) {
 		memcpy(curr_ptr, m_curr_buf, rem_size);
 	}
 	*(curr_ptr + rem_size) = 0;
@@ -820,7 +841,7 @@
 	// i'm not building exp tree, node not needed
 	delete sess_vars_exp_node;
 	cast_value_array(&sess_vars->value);
-	for(std::map<std::string, std::string>::iterator i = varmap.begin(); i != varmap.end(); ++i) {
+	for (std::map<std::string, std::string>::iterator i = varmap.begin(); i != varmap.end(); ++i) {
 		PHP_VAR_NODE *curr_var = array_get_by_str_key(&sess_vars->value, i->first);
 		PHP_VALUE_NODE val;
 		val.type = PHP_VAL_STRING;
@@ -835,11 +856,11 @@
 	PHP_VAR_NODE *sess_vars = sess_vars_exp_node->var_si_node->var;
 
 	delete sess_vars_exp_node;
-	if ( sess_vars->value.type != PHP_VAL_ARRAY ) {
+	if (sess_vars->value.type != PHP_VAL_ARRAY) {
 		return;
 	}
 
-	for(int i = 0; i < array_get_size(&sess_vars->value); i++) {
+	for (int i = 0; i < array_get_size(&sess_vars->value); i++) {
 		std::string s = array_get_ith_key(&sess_vars->value, i);
 		PHP_VAR_NODE *var = array_get_by_str_key(&sess_vars->value, s);
 		cast_value_str(&var->value);

amule-3.0.1.tar.gz/src/webserver/src/php_core_lib.h -> amule-3.1.0.tar.gz/src/webserver/src/php_core_lib.h Changed

@@ -25,70 +25,73 @@
 #ifndef _PHP_CORE_LIB_H_
 #define _PHP_CORE_LIB_H_
 
-/*
- * This is interface to CPP parts of amuleweb
+/**
+ * Interface to the CPP parts of amuleweb.
  */
 #ifdef __cplusplus
 
 #include "php_syntree.h"
 
+class CWriteStrBuffer
+{
+	std::list<char *> m_buf_list;
+	int m_total_length;
+	int m_alloc_size;
+	char *m_curr_buf;
+	char *m_buf_ptr;
+	int m_curr_buf_left;
 
-class CWriteStrBuffer {
-		std::list<char *> m_buf_list;
-		int m_total_length;
-		int m_alloc_size;
-		char *m_curr_buf;
-		char *m_buf_ptr;
-		int m_curr_buf_left;
+	void AllocBuf();
 
-		void AllocBuf();
-	public:
-		CWriteStrBuffer();
-		~CWriteStrBuffer();
+public:
+	CWriteStrBuffer();
+	~CWriteStrBuffer();
 
-		void Write(const char *s, int len = -1);
-		void CopyAll(char *dst_buffer);
-		int Length() { return m_total_length; }
+	void Write(const char *s, int len = -1);
+	void CopyAll(char *dst_buffer);
+	int Length() { return m_total_length; }
 };
 
 class CWebServerBase;
 class CSession;
 
-class CPhPLibContext {
-		PHP_SYN_NODE *m_syn_tree_top;
-		PHP_SCOPE_TABLE m_global_scope;
+class CPhPLibContext
+{
+	PHP_SYN_NODE *m_syn_tree_top;
+	PHP_SCOPE_TABLE m_global_scope;
 
-		CWriteStrBuffer *m_curr_str_buffer;
+	CWriteStrBuffer *m_curr_str_buffer;
 
-		CWebServerBase *m_server;
-	public:
-		// parse file and take a "snapshot" of global vars
-		CPhPLibContext(CWebServerBase *server, const char *file);
-		CPhPLibContext(CWebServerBase *server, char *php_buf, int len);
-		~CPhPLibContext();
+	CWebServerBase *m_server;
 
-		// init global vars, so parser/execution can start
-		void SetContext();
-		void Execute(CWriteStrBuffer *);
+public:
+	// parse file and take a "snapshot" of global vars
+	CPhPLibContext(CWebServerBase *server, const char *file);
+	CPhPLibContext(CWebServerBase *server, char *php_buf, int len);
+	~CPhPLibContext();
+
+	// init global vars, so parser/execution can start
+	void SetContext();
+	void Execute(CWriteStrBuffer *);
 
 #ifdef __GNUC__
-		static void Printf(const char *str, ...)  __attribute__ ((__format__ (__printf__, 1, 2)));
+	static void Printf(const char *str, ...) __attribute__((__format__(__printf__, 1, 2)));
 #else
-		static void Printf(const char *str, ...);
+	static void Printf(const char *str, ...);
 #endif
-		static void Print(const char *str);
+	static void Print(const char *str);
 
-		static CPhPLibContext *g_curr_context;
+	static CPhPLibContext *g_curr_context;
 
 #ifndef PHP_STANDALONE_EN
-		CWebServerBase *WebServer() { return m_server; }
+	CWebServerBase *WebServer() { return m_server; }
 #endif
 };
 
-class CPhpFilter {
-	public:
-		CPhpFilter(CWebServerBase *server, CSession *sess,
-			const char *file, CWriteStrBuffer *buff);
+class CPhpFilter
+{
+public:
+	CPhpFilter(CWebServerBase *server, CSession *sess, const char *file, CWriteStrBuffer *buff);
 };
 
 #endif // __cplusplus

amule-3.0.1.tar.gz/src/webserver/src/php_lexer.c -> amule-3.1.0.tar.gz/src/webserver/src/php_lexer.c Changed

amule-3.0.1.tar.gz/src/webserver/src/php_parser.c -> amule-3.1.0.tar.gz/src/webserver/src/php_parser.c Changed

amule-3.0.1.tar.gz/src/webserver/src/php_parser.h -> amule-3.1.0.tar.gz/src/webserver/src/php_parser.h Changed

@@ -31,10 +31,10 @@
    version 2.2 of Bison.  */
 
 #ifndef YY_PHP_PHP_PARSER_H_INCLUDED
-# define YY_PHP_PHP_PARSER_H_INCLUDED
+#define YY_PHP_PHP_PARSER_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 1
+#define YYDEBUG 1
 #endif
 #if YYDEBUG
 extern int phpdebug;
@@ -42,102 +42,102 @@
 
 /* Token type.  */
 #ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    FNUMBER = 258,
-    DNUMBER = 259,
-    STRING = 260,
-    IDENT = 261,
-    VARIABLE = 262,
-    T_ECHO = 263,
-    EXIT = 264,
-    IF = 265,
-    DO = 266,
-    WHILE = 267,
-    ENDWHILE = 268,
-    FOR = 269,
-    ENDFOR = 270,
-    FOREACH = 271,
-    ENDFOREACH = 272,
-    DECLARE = 273,
-    ENDDECLARE = 274,
-    AS = 275,
-    CONST = 276,
-    GLOBAL = 277,
-    UNSET = 278,
-    ISSET = 279,
-    EMPTY = 280,
-    SWITCH = 281,
-    ENDSWITCH = 282,
-    CASE = 283,
-    DEFAULT = 284,
-    BREAK = 285,
-    CONTINUE = 286,
-    FUNCTION = 287,
-    RETURN = 288,
-    CLASS = 289,
-    INTERFACE = 290,
-    EXTENDS = 291,
-    IMPLEMENTS = 292,
-    OBJECT_OPERATOR = 293,
-    HASH_ASSIGN = 294,
-    LIST = 295,
-    ARRAY = 296,
-    CLASS_SCOPE = 297,
-    PRINT = 298,
-    PLUS_EQ = 299,
-    MINUS_EQ = 300,
-    MUL_EQ = 301,
-    DIV_EQ = 302,
-    CONCAT_EQ = 303,
-    MOD_EQ = 304,
-    AND_EQ = 305,
-    OR_EQ = 306,
-    XOR_EQ = 307,
-    SL_EQ = 308,
-    SR_EQ = 309,
-    LOG_OR = 310,
-    LOG_XOR = 311,
-    LOG_AND = 312,
-    BOOLEAN_OR = 313,
-    BOOLEAN_AND = 314,
-    IS_EQ = 315,
-    IS_NOEQUAL = 316,
-    IS_IDENTICAL = 317,
-    IS_NOIDENTICAL = 318,
-    IS_SMALLER_OR_EQ = 319,
-    IS_GREATER_OR_EQ = 320,
-    SL = 321,
-    SR = 322,
-    INSTANCEOF = 323,
-    INC = 324,
-    DEC = 325,
-    INT_CAST = 326,
-    DOUBLE_CAST = 327,
-    STRING_CAST = 328,
-    ARRAY_CAST = 329,
-    OBJECT_CAST = 330,
-    BOOL_CAST = 331,
-    UNSET_CAST = 332,
-    NEW = 333,
-    CLONE = 334,
-    ELSEIF = 335,
-    ELSE = 336,
-    ENDIF = 337,
-    STATIC = 338,
-    ABSTRACT = 339,
-    FINAL = 340,
-    PRIVATE = 341,
-    PROTECTED = 342,
-    PUBLIC = 343,
-    START_SCRIPT = 344,
-    END_SCRIPT = 345
-  };
+#define YYTOKENTYPE
+enum yytokentype
+{
+	FNUMBER = 258,
+	DNUMBER = 259,
+	STRING = 260,
+	IDENT = 261,
+	VARIABLE = 262,
+	T_ECHO = 263,
+	EXIT = 264,
+	IF = 265,
+	DO = 266,
+	WHILE = 267,
+	ENDWHILE = 268,
+	FOR = 269,
+	ENDFOR = 270,
+	FOREACH = 271,
+	ENDFOREACH = 272,
+	DECLARE = 273,
+	ENDDECLARE = 274,
+	AS = 275,
+	CONST = 276,
+	GLOBAL = 277,
+	UNSET = 278,
+	ISSET = 279,
+	EMPTY = 280,
+	SWITCH = 281,
+	ENDSWITCH = 282,
+	CASE = 283,
+	DEFAULT = 284,
+	BREAK = 285,
+	CONTINUE = 286,
+	FUNCTION = 287,
+	RETURN = 288,
+	CLASS = 289,
+	INTERFACE = 290,
+	EXTENDS = 291,
+	IMPLEMENTS = 292,
+	OBJECT_OPERATOR = 293,
+	HASH_ASSIGN = 294,
+	LIST = 295,
+	ARRAY = 296,
+	CLASS_SCOPE = 297,
+	PRINT = 298,
+	PLUS_EQ = 299,
+	MINUS_EQ = 300,
+	MUL_EQ = 301,
+	DIV_EQ = 302,
+	CONCAT_EQ = 303,
+	MOD_EQ = 304,
+	AND_EQ = 305,
+	OR_EQ = 306,
+	XOR_EQ = 307,
+	SL_EQ = 308,
+	SR_EQ = 309,
+	LOG_OR = 310,
+	LOG_XOR = 311,
+	LOG_AND = 312,
+	BOOLEAN_OR = 313,
+	BOOLEAN_AND = 314,
+	IS_EQ = 315,
+	IS_NOEQUAL = 316,
+	IS_IDENTICAL = 317,
+	IS_NOIDENTICAL = 318,
+	IS_SMALLER_OR_EQ = 319,
+	IS_GREATER_OR_EQ = 320,
+	SL = 321,
+	SR = 322,
+	INSTANCEOF = 323,
+	INC = 324,
+	DEC = 325,
+	INT_CAST = 326,
+	DOUBLE_CAST = 327,
+	STRING_CAST = 328,
+	ARRAY_CAST = 329,
+	OBJECT_CAST = 330,
+	BOOL_CAST = 331,
+	UNSET_CAST = 332,
+	NEW = 333,
+	CLONE = 334,
+	ELSEIF = 335,
+	ELSE = 336,
+	ENDIF = 337,
+	STATIC = 338,
+	ABSTRACT = 339,
+	FINAL = 340,
+	PRIVATE = 341,
+	PROTECTED = 342,
+	PUBLIC = 343,
+	START_SCRIPT = 344,
+	END_SCRIPT = 345
+};
 #endif
 
 /* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
 
 union YYSTYPE
 {
@@ -152,13 +152,12 @@
 };
 
 typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
+#define YYSTYPE_IS_TRIVIAL 1
+#define YYSTYPE_IS_DECLARED 1
 #endif
 
-
 extern YYSTYPE phplval;
 
-int phpparse (void);
+int phpparse(void);
 
 #endif /* !YY_PHP_PHP_PARSER_H_INCLUDED  */

amule-3.0.1.tar.gz/src/webserver/src/php_syntree.cpp -> amule-3.1.0.tar.gz/src/webserver/src/php_syntree.cpp Changed

@@ -23,27 +23,24 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include <string> // Do_not_auto_remove (g++-4.0.1)
 
 #ifdef PHP_STANDALONE_EN
-	#include <map>
-	#include <list>
-	#include <stdarg.h>
-	#include <cassert>
-	#include <climits>
-	#include <cstdio>
-	#include <cstring>
-	#include <cstdlib>
+#include <map>
+#include <list>
+#include <stdarg.h>
+#include <cassert>
+#include <climits>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 #else
-	#include "WebServer.h"
+#include "WebServer.h"
 #endif
 
-
 #include "php_syntree.h"
 #include "php_core_lib.h"
 
-
 PHP_SYN_NODE *g_syn_tree_top = 0;
 
 /* scope table */
@@ -51,7 +48,6 @@
 PHP_SCOPE_TABLE g_current_scope = 0;
 PHP_SCOPE_STACK g_scope_stack = 0;
 
-
 //
 // Known named constant values
 std::map<std::string, int> g_known_const;
@@ -89,16 +85,24 @@
 	node->op = PHP_OP_VAL;
 	node->val_node.type = PHP_VAL_STRING;
 
-	if ( unescape ) {
-		node->val_node.str_val = (char *)malloc(strlen(s)+1);
+	if (unescape) {
+		node->val_node.str_val = (char *)malloc(strlen(s) + 1);
 		// copy and unescape string
 		char *p = node->val_node.str_val;
-		while(*s) {
-			if ( *s == '\\' ) {
-				switch ( *(++s) ) {
-					case 'n' : *p++ = '\n'; s++; break;
-					case 't' : *p++ = '\t'; s++; break;
-					default  : *p++ = *s++; break;
+		while (*s) {
+			if (*s == '\\') {
+				switch (*(++s)) {
+				case 'n':
+					*p++ = '\n';
+					s++;
+					break;
+				case 't':
+					*p++ = '\t';
+					s++;
+					break;
+				default:
+					*p++ = *s++;
+					break;
 				}
 			} else {
 				*p++ = *s++;
@@ -149,15 +153,13 @@
 PHP_EXP_NODE *make_known_const(char *name)
 {
 	int const_id = -1;
-	if ( g_known_const.count(name) ) {
+	if (g_known_const.count(name)) {
 		const_id = g_known_constname;
 	}
 	return make_const_exp_dnum(const_id);
 }
 
-//
 // Create function parameter (in declaration)
-//
 PHP_EXP_NODE *make_func_param(PHP_EXP_NODE *list, PHP_EXP_NODE *var_exp_node, char *class_name, int byref)
 {
 	PHP_FUNC_PARAM_DEF *param = new PHP_FUNC_PARAM_DEF;
@@ -165,7 +167,6 @@
 
 	param->si_var = var_exp_node->var_si_node;
 	param->si_var->type = PHP_SCOPE_PARAM;
-	//printf("mark %p->%p as param\n", param->si_var, param->si_var->var);
 
 	param->var = param->si_var->var;
 
@@ -175,9 +176,9 @@
 
 	PHP_EXP_NODE *curr_node = make_const_exp_int_obj(param);
 
-	if ( list ) {
+	if (list) {
 		PHP_EXP_NODE *p = list;
-		while ( p->next) {
+		while (p->next) {
 			p = p->next;
 		}
 		p->next = curr_node;
@@ -187,9 +188,7 @@
 	}
 }
 
-/*
- * Syntax tree generation
- */
+/* Syntax tree generation */
 PHP_SYN_NODE *make_expr_syn_node(PHP_STATEMENT_TYPE type, PHP_EXP_NODE *expr)
 {
 	PHP_SYN_NODE *syn_node = new PHP_SYN_NODE;
@@ -201,8 +200,8 @@
 	return syn_node;
 }
 
-PHP_SYN_NODE *make_ifelse_syn_node(PHP_EXP_NODE *expr,
-	PHP_SYN_NODE *then_node, PHP_SYN_NODE *elseif_list, PHP_SYN_NODE *else_node)
+PHP_SYN_NODE *make_ifelse_syn_node(
+	PHP_EXP_NODE *expr, PHP_SYN_NODE *then_node, PHP_SYN_NODE *elseif_list, PHP_SYN_NODE *else_node)
 {
 	PHP_SYN_NODE *syn_node = new PHP_SYN_NODE;
 	memset(syn_node, 0, sizeof(PHP_SYN_NODE));
@@ -211,11 +210,11 @@
 	syn_node->node_if.cond = expr;
 	syn_node->node_if.code_if = then_node;
 
-	if ( elseif_list ) {
+	if (elseif_list) {
 		syn_node->node_if.code_else = elseif_list;
 
 		PHP_SYN_NODE *curr_if = elseif_list;
-		while ( curr_if->node_if.code_else ) {
+		while (curr_if->node_if.code_else) {
 			curr_if = curr_if->node_if.code_else;
 		}
 		curr_if->node_if.code_else = else_node;
@@ -237,8 +236,8 @@
 	return syn_node;
 }
 
-PHP_SYN_NODE *make_for_syn_node(PHP_EXP_NODE *start, PHP_EXP_NODE *cond,
-	PHP_EXP_NODE *next, PHP_SYN_NODE *code)
+PHP_SYN_NODE *make_for_syn_node(
+	PHP_EXP_NODE *start, PHP_EXP_NODE *cond, PHP_EXP_NODE *next, PHP_SYN_NODE *code)
 {
 	PHP_SYN_NODE *syn_node = new PHP_SYN_NODE;
 	memset(syn_node, 0, sizeof(PHP_SYN_NODE));
@@ -252,8 +251,8 @@
 	return syn_node;
 }
 
-PHP_SYN_NODE *make_foreach_loop_syn_node(PHP_EXP_NODE *elems,
-	PHP_EXP_NODE *i_key, PHP_EXP_NODE *i_val, PHP_SYN_NODE *code, int byref)
+PHP_SYN_NODE *make_foreach_loop_syn_node(
+	PHP_EXP_NODE *elems, PHP_EXP_NODE *i_key, PHP_EXP_NODE *i_val, PHP_SYN_NODE *code, int byref)
 {
 	PHP_SYN_NODE *syn_node = new PHP_SYN_NODE;
 	memset(syn_node, 0, sizeof(PHP_SYN_NODE));
@@ -265,7 +264,7 @@
 	syn_node->node_foreach.i_val = i_val->var_si_node;
 	syn_node->node_foreach.byref = byref;
 
-	if ( i_key ) {
+	if (i_key) {
 		delete i_key;
 	}
 	delete i_val;
@@ -284,22 +283,22 @@
 	memset(syn_node->func_decl, 0, sizeof(PHP_SYN_FUNC_DECL_NODE));
 	syn_node->func_decl->name = strdup(name);
 
-	if ( param_list ) {
+	if (param_list) {
 		PHP_EXP_NODE *curr_param = param_list;
 		// count parameters first
-		while ( curr_param ) {
+		while (curr_param) {
 			syn_node->func_decl->param_count++;
 			curr_param = curr_param->next;
 		}
 		syn_node->func_decl->params = new PHP_FUNC_PARAM_DEFsyn_node->func_decl->param_count;
 		curr_param = param_list;
-		for(int i = 0; param_list; param_list = param_list->next, i++) {
+		for (int i = 0; param_list; param_list = param_list->next, i++) {
 			syn_node->func_decl->paramsi = *(PHP_FUNC_PARAM_DEF *)param_list->val_node.ptr_val;
 			// param has been copied to array, so it's no longer needed
 			delete (PHP_FUNC_PARAM_DEF *)param_list->val_node.ptr_val;
 		}
 		// dispose linked list as well
-		while ( curr_param ) {
+		while (curr_param) {
 			PHP_EXP_NODE *p = curr_param->next;
 			delete curr_param;
 			curr_param = p;
@@ -329,15 +328,13 @@
 
 	syn_node->type = PHP_ST_SWITCH;
 
-	//
-	// Bind all statement lists into single one for
-	// simpler execution
-	//
+	// Bind all statement lists into a single one, for simpler execution
 	PHP_SYN_NODE *stat_list_tail = 0;
-	for(PHP_EXP_NODE *cur_case = case_list; cur_case; cur_case = cur_case->next) {
+	for (PHP_EXP_NODE *cur_case = case_list; cur_case; cur_case = cur_case->next) {
 		PHP_SYN_NODE *cur_stat_list = cur_case->exp_node->tree_node.syn_right;
-		if ( stat_list_tail ) {
-			while ( stat_list_tail->next_node ) stat_list_tail = stat_list_tail->next_node;
+		if (stat_list_tail) {
+			while (stat_list_tail->next_node)
+				stat_list_tail = stat_list_tail->next_node;
 			stat_list_tail->next_node = cur_stat_list;
 		} else {
 			stat_list_tail = cur_stat_list;
@@ -367,24 +364,22 @@
 	return node;
 }
 
-/*
- * Called from lexer when ${IDENT} is recognized
- */
+/* Called from the lexer when ${IDENT} is recognized */
 PHP_EXP_NODE *get_var_node(const char *name)
 {
 	PHP_EXP_NODE *node = make_zero_exp_node();
 	node->op = PHP_OP_VAR;
 
 	PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, name);
-	if ( si ) {
-		if ( (si->type == PHP_SCOPE_VAR) || (si->type == PHP_SCOPE_PARAM) ) {
+	if (si) {
+		if ((si->type == PHP_SCOPE_VAR) || (si->type == PHP_SCOPE_PARAM)) {
 			node->var_si_node = si;
 		} else {
-			//
-			// Error: symbol already defined as different entity
-			//
+			// Error: symbol already defined as a different entity
 			php_report_error(PHP_ERROR,
-				"symbol %s already defined as different entity (%d)", name, si->type);
+				"symbol %s already defined as different entity (%d)",
+				name,
+				si->type);
 		}
 	} else {
 		add_var_2_scope(g_current_scope, make_var_node(), name);
@@ -400,21 +395,21 @@
 }
 
 /*
- * Init function scope table before transferring control there.
- *  1. Evaluate all by-value params
- *  2. Lvalue-evaluate all by-ref params and adjust pointers
+ * Init the function scope table before transferring control there: evaluate all by-value params,
+ * then lvalue-evaluate all by-ref params and adjust pointers.
  */
-void func_scope_init(PHP_FUNC_PARAM_DEF *params, int param_count,
-	PHP_SCOPE_TABLE_TYPE * /*scope_map*/, PHP_VALUE_NODE *arg_array,
+void func_scope_init(PHP_FUNC_PARAM_DEF *params,
+	int param_count,
+	PHP_SCOPE_TABLE_TYPE * /*scope_map*/,
+	PHP_VALUE_NODE *arg_array,
 	std::map<std::string, PHP_VAR_NODE *> &saved_vars)
 {
 	//
 	// Step 1: save original val vars
 	PHP_SCOPE_TABLE_TYPE *curr_scope_map = (PHP_SCOPE_TABLE_TYPE *)g_current_scope;
-	for(PHP_SCOPE_TABLE_TYPE::iterator i = curr_scope_map->begin(); i != curr_scope_map->end();++i) {
-		if ( (i->second->type == PHP_SCOPE_VAR) || (i->second->type == PHP_SCOPE_PARAM) ) {
-			if ( !(i->second->var->flags & PHP_VARFLAG_STATIC) ) {
-				//printf("Saving %s = %p->%p\n", i->first.c_str(), i->second, i->second->var);
+	for (PHP_SCOPE_TABLE_TYPE::iterator i = curr_scope_map->begin(); i != curr_scope_map->end(); ++i) {
+		if ((i->second->type == PHP_SCOPE_VAR) || (i->second->type == PHP_SCOPE_PARAM)) {
+			if (!(i->second->var->flags & PHP_VARFLAG_STATIC)) {
 				saved_varsi->first = i->second->var;
 			}
 		}
@@ -422,20 +417,21 @@
 	//
 	// Step 2: calculate new values of call parameters
 	PHP_VAR_NODE *call_paramsPHP_MAX_FUNC_PARAM;
-	for(int i = 0; i < param_count; i++) {
+	for (int i = 0; i < param_count; i++) {
 		PHP_VAR_NODE *curr_arg_val = array_get_by_int_key(arg_array, i);
-		if ( curr_arg_val->value.type != PHP_VAL_NONE ) {
-			if ( (curr_arg_val->flags & PHP_VARFLAG_BYREF) || paramsi.byref ) {
-				call_paramsi = php_expr_eval_lvalue((PHP_EXP_NODE *)curr_arg_val->value.ptr_val);
-				if ( !call_paramsi ) {
+		if (curr_arg_val->value.type != PHP_VAL_NONE) {
+			if ((curr_arg_val->flags & PHP_VARFLAG_BYREF) || paramsi.byref) {
+				call_paramsi =
+					php_expr_eval_lvalue((PHP_EXP_NODE *)curr_arg_val->value.ptr_val);
+				if (!call_paramsi) {
 					php_report_error(PHP_ERROR, "Byref parameter is not lvalue");
 					return;
 				}
 			} else {
 				call_paramsi = make_var_node();
 				call_paramsi->ref_count = 1;
-				//printf("alloc var for callparam %d -> %p\n", i, call_paramsi);
-				php_expr_eval((PHP_EXP_NODE *)curr_arg_val->value.ptr_val, &call_paramsi->value);
+				php_expr_eval(
+					(PHP_EXP_NODE *)curr_arg_val->value.ptr_val, &call_paramsi->value);
 			}
 		} else {
 			// put default value
@@ -446,21 +442,17 @@
 	}
 	//
 	// Step 3: assign new values to call parameters
-	for(int i = 0; i < param_count; i++) {
-		//printf("assign new param si=%p var=%p -> %p\n", paramsi.si_var, paramsi.si_var->var, call_paramsi);
+	for (int i = 0; i < param_count; i++) {
 		paramsi.si_var->var = call_paramsi;
 	}
 
 	//
 	// Step 4: allocate new stack local vars
-	for(PHP_SCOPE_TABLE_TYPE::iterator i = curr_scope_map->begin(); i != curr_scope_map->end();++i) {
-		if ( !((i->second->type == PHP_SCOPE_PARAM) || (i->second->type == PHP_SCOPE_VAR)) ) {
+	for (PHP_SCOPE_TABLE_TYPE::iterator i = curr_scope_map->begin(); i != curr_scope_map->end(); ++i) {
+		if (!((i->second->type == PHP_SCOPE_PARAM) || (i->second->type == PHP_SCOPE_VAR))) {
 			continue;
 		}
-		//printf("in scope: %p %s  %s  with flags %02x\n", i->second, i->second->type == PHP_SCOPE_PARAM ? "param" : "var",
-		//	i->first.c_str(), i->second->var->flags);
-		if ( !(i->second->var->flags & PHP_VARFLAG_STATIC) && (i->second->type != PHP_SCOPE_PARAM) ) {
-			//printf("alloc new for %s  %p->%p \n", i->first.c_str(), i->second, i->second->var);
+		if (!(i->second->var->flags & PHP_VARFLAG_STATIC) && (i->second->type != PHP_SCOPE_PARAM)) {
 			i->second->var = make_var_node();
 			i->second->var->ref_count = 1;
 		}
@@ -468,37 +460,30 @@
 }
 
 /*
- * Since by-ref params changes pointers in scope table, we need to restore them
- * to original objects, so:
- *  1. Memory will not leak
- *  2. Next call may be using same params by-value, so it need independent varnode
+ * By-ref params change pointers in the scope table, so restore them to the original objects: memory
+ * must not leak, and the next call may use the same params by value and need an independent
+ * varnode.
  */
-static void func_scope_copy_back(PHP_FUNC_PARAM_DEF *params, int param_count,
-	PHP_SCOPE_TABLE_TYPE * /*scope_map*/, PHP_VALUE_NODE *arg_array,
+static void func_scope_copy_back(PHP_FUNC_PARAM_DEF *params,
+	int param_count,
+	PHP_SCOPE_TABLE_TYPE * /*scope_map*/,
+	PHP_VALUE_NODE *arg_array,
 	std::map<std::string, PHP_VAR_NODE *> &saved_vars)
 {
-	/*
-	if ( param_count < array_get_size(arg_array) ) {
-		param_count = array_get_size(arg_array);
-	}
-	*/
 	PHP_VAR_NODE *call_paramsPHP_MAX_FUNC_PARAM;
 	int call_param_2free_count = 0;
-	for(int i = 0; i < param_count; i++) {
+	for (int i = 0; i < param_count; i++) {
 		PHP_VAR_NODE *curr_arg_val = array_get_by_int_key(arg_array, i);
-		if ( !((curr_arg_val->flags & PHP_VARFLAG_BYREF) || paramsi.byref) ) {
-			//printf("Delete param %d %p->%p\n", i, paramsi.si_var, paramsi.si_var->var);
+		if (!((curr_arg_val->flags & PHP_VARFLAG_BYREF) || paramsi.byref)) {
 			call_paramscall_param_2free_count++ = paramsi.si_var->var;
 		}
 		paramsi.si_var->var = paramsi.var;
 	}
 
 	PHP_SCOPE_TABLE_TYPE *curr_scope_map = (PHP_SCOPE_TABLE_TYPE *)g_current_scope;
-	for(PHP_SCOPE_TABLE_TYPE::iterator i = curr_scope_map->begin(); i != curr_scope_map->end();++i) {
-		if ( (i->second->type == PHP_SCOPE_VAR) || (i->second->type == PHP_SCOPE_PARAM) ) {
-			if ( !(i->second->var->flags & PHP_VARFLAG_STATIC) ) {
-				//printf("Restoring %s = %p->%p\n", i->first.c_str(), i->second, i->second->var);
-				//assert(saved_varsi->first);
+	for (PHP_SCOPE_TABLE_TYPE::iterator i = curr_scope_map->begin(); i != curr_scope_map->end(); ++i) {
+		if ((i->second->type == PHP_SCOPE_VAR) || (i->second->type == PHP_SCOPE_PARAM)) {
+			if (!(i->second->var->flags & PHP_VARFLAG_STATIC)) {
 				if (i->second->type == PHP_SCOPE_VAR) {
 					value_value_free(&i->second->var->value);
 					delete i->second->var;
@@ -507,7 +492,7 @@
 			}
 		}
 	}
-	for(int i = 0; i < call_param_2free_count; i++) {
+	for (int i = 0; i < call_param_2free_count; i++) {
 		value_value_free(&call_paramsi->value);
 		delete call_paramsi;
 	}
@@ -530,10 +515,10 @@
 void switch_pop_scope_table(int old_free)
 {
 	PHP_SCOPE_STACK_TYPE *scope_stack = (PHP_SCOPE_STACK_TYPE *)g_scope_stack;
-	if ( old_free ) {
+	if (old_free) {
 		delete_scope_table(g_current_scope);
 	}
-	if ( scope_stack->size() == 0 ) {
+	if (scope_stack->size() == 0) {
 		php_report_error(PHP_INTERNAL_ERROR, "Stack underrun - no valid scope");
 	}
 	g_current_scope = scope_stack->back();
@@ -544,29 +529,25 @@
 {
 	PHP_SCOPE_TABLE_TYPE *scope_map = (PHP_SCOPE_TABLE_TYPE *)scope;
 
-	for(PHP_SCOPE_TABLE_TYPE::iterator i = scope_map->begin(); i != scope_map->end();++i) {
-		switch ( i->second->type ) {
-			case PHP_SCOPE_PARAM:
-				//break;
-			case PHP_SCOPE_VAR: {
-					//printf("removing %s\n", i->first.c_str());
-					PHP_VAR_NODE *var = i->second->var;
-					var_node_free(var);
-				}
-				break;
-			case PHP_SCOPE_FUNC: {
-					PHP_SYN_NODE *func = i->second->func;
-					php_syn_tree_free(func);
-				}
-				break;
-			case PHP_SCOPE_CLASS: {
-					PHP_SYN_NODE *class_decl = i->second->class_decl;
-					php_syn_tree_free(class_decl);
-				}
-				break;
-			case PHP_SCOPE_NONE:
-				php_report_error(PHP_INTERNAL_ERROR, "Scope table can not have such items");
-				break;
+	for (PHP_SCOPE_TABLE_TYPE::iterator i = scope_map->begin(); i != scope_map->end(); ++i) {
+		switch (i->second->type) {
+		case PHP_SCOPE_PARAM:
+			// break;
+		case PHP_SCOPE_VAR: {
+			PHP_VAR_NODE *var = i->second->var;
+			var_node_free(var);
+		} break;
+		case PHP_SCOPE_FUNC: {
+			PHP_SYN_NODE *func = i->second->func;
+			php_syn_tree_free(func);
+		} break;
+		case PHP_SCOPE_CLASS: {
+			PHP_SYN_NODE *class_decl = i->second->class_decl;
+			php_syn_tree_free(class_decl);
+		} break;
+		case PHP_SCOPE_NONE:
+			php_report_error(PHP_INTERNAL_ERROR, "Scope table can not have such items");
+			break;
 		}
 		delete i->second;
 	}
@@ -577,7 +558,7 @@
 {
 	PHP_SCOPE_TABLE_TYPE *scope_map = (PHP_SCOPE_TABLE_TYPE *)scope;
 	std::string key(func->func_decl->name);
-	if ( scope_map->count(key) ) {
+	if (scope_map->count(key)) {
 		// error - function already defined
 		php_report_error(PHP_ERROR, "Can not add function to scope table - already present");
 	} else {
@@ -592,7 +573,7 @@
 {
 	PHP_SCOPE_TABLE_TYPE *scope_map = (PHP_SCOPE_TABLE_TYPE *)scope;
 	std::string key(class_node->class_decl->name);
-	if ( scope_map->count(key) ) {
+	if (scope_map->count(key)) {
 		// error - function already defined
 		php_report_error(PHP_ERROR, "Can not add function to scope table - already present");
 	} else {
@@ -627,7 +608,7 @@
 {
 	PHP_SCOPE_TABLE_TYPE *scope_map = (PHP_SCOPE_TABLE_TYPE *)scope;
 	std::string key(name);
-	if ( scope_map->count(key) ) {
+	if (scope_map->count(key)) {
 		PHP_SCOPE_ITEM *it = (*scope_map)key;
 		return it->type;
 	}
@@ -639,7 +620,7 @@
 	assert(name);
 	PHP_SCOPE_TABLE_TYPE *scope_map = (PHP_SCOPE_TABLE_TYPE *)scope;
 	std::string key(name);
-	if ( scope_map->count(key) ) {
+	if (scope_map->count(key)) {
 		PHP_SCOPE_ITEM *it = (*scope_map)key;
 		return it;
 	}
@@ -650,10 +631,10 @@
 {
 	PHP_SCOPE_TABLE_TYPE *scope_map = (PHP_SCOPE_TABLE_TYPE *)scope;
 
-	for(PHP_SCOPE_TABLE_TYPE::iterator i = scope_map->begin(); i != scope_map->end();++i) {
-		if ( i->second->type == PHP_SCOPE_VAR ) {
+	for (PHP_SCOPE_TABLE_TYPE::iterator i = scope_map->begin(); i != scope_map->end(); ++i) {
+		if (i->second->type == PHP_SCOPE_VAR) {
 			PHP_VAR_NODE *curr_var = i->second->var;
-			if ( curr_var == var ) {
+			if (curr_var == var) {
 				return i->first.c_str();
 			}
 		}
@@ -661,24 +642,23 @@
 	return 0;
 }
 
-
 /* array operations */
 const std::string &array_get_ith_key(PHP_VALUE_NODE *array, int i)
 {
 	PHP_ARRAY_TYPE *arr_ptr = (PHP_ARRAY_TYPE *)array->ptr_val;
 	PHP_ARRAY_ITER_TYPE it = arr_ptr->array.begin();
-	while(i--) ++it;
+	while (i--)
+		++it;
 	return it->first;
 }
 
-
 PHP_VAR_NODE *array_get_by_str_key(PHP_VALUE_NODE *array, const std::string &key)
 {
-	if ( array->type != PHP_VAL_ARRAY ) {
+	if (array->type != PHP_VAL_ARRAY) {
 		return 0;
 	}
 	PHP_ARRAY_TYPE *arr_ptr = (PHP_ARRAY_TYPE *)array->ptr_val;
-	if ( arr_ptr->array.count(key) ) {
+	if (arr_ptr->array.count(key)) {
 		return (arr_ptr->array)key;
 	} else {
 		PHP_VAR_NODE *add_node = make_var_node();
@@ -692,7 +672,7 @@
 
 PHP_VAR_NODE *array_get_by_int_key(PHP_VALUE_NODE *array, int key)
 {
-	if ( array->type != PHP_VAL_ARRAY ) {
+	if (array->type != PHP_VAL_ARRAY) {
 		return 0;
 	}
 	char s_key32;
@@ -702,7 +682,7 @@
 
 PHP_VAR_NODE *array_get_by_key(PHP_VALUE_NODE *array, PHP_VALUE_NODE *key)
 {
-	if ( array->type != PHP_VAL_ARRAY ) {
+	if (array->type != PHP_VAL_ARRAY) {
 		return 0;
 	}
 	PHP_VALUE_NODE s_key = *key;
@@ -712,7 +692,7 @@
 
 void array_set_by_key(PHP_VALUE_NODE *array, PHP_VALUE_NODE *key, PHP_VAR_NODE *node)
 {
-	if ( array->type != PHP_VAL_ARRAY ) {
+	if (array->type != PHP_VAL_ARRAY) {
 		return;
 	}
 	PHP_VALUE_NODE s_key = *key;
@@ -724,11 +704,11 @@
 
 void array_add_to_str_key(PHP_VALUE_NODE *array, const std::string &key, PHP_VAR_NODE *node)
 {
-	if ( array->type != PHP_VAL_ARRAY ) {
-		return ;
+	if (array->type != PHP_VAL_ARRAY) {
+		return;
 	}
 	PHP_ARRAY_TYPE *arr_ptr = (PHP_ARRAY_TYPE *)array->ptr_val;
-	if ( !arr_ptr->array.count(key) ) {
+	if (!arr_ptr->array.count(key)) {
 		node->ref_count++;
 		(arr_ptr->array)key = node;
 		arr_ptr->sorted_keys.push_back(key);
@@ -737,16 +717,18 @@
 
 void array_remove_at_str_key(PHP_VALUE_NODE *array, const std::string &key)
 {
-	if ( array->type != PHP_VAL_ARRAY ) {
-		return ;
+	if (array->type != PHP_VAL_ARRAY) {
+		return;
 	}
 	PHP_ARRAY_TYPE *arr_ptr = (PHP_ARRAY_TYPE *)array->ptr_val;
-	if ( arr_ptr->array.count(key) ) {
+	if (arr_ptr->array.count(key)) {
 		PHP_VAR_NODE *node = (arr_ptr->array)key;
 		var_node_free(node);
 		arr_ptr->array.erase(key);
-		for(PHP_ARRAY_KEY_ITER_TYPE i = arr_ptr->sorted_keys.begin(); i != arr_ptr->sorted_keys.end(); ++i) {
-			if ( *i == key ) {
+		for (PHP_ARRAY_KEY_ITER_TYPE i = arr_ptr->sorted_keys.begin();
+			i != arr_ptr->sorted_keys.end();
+			++i) {
+			if (*i == key) {
 				arr_ptr->sorted_keys.erase(i);
 				break;
 			}
@@ -761,10 +743,9 @@
 	array_add_to_str_key(array, s_key, node);
 }
 
-
 int array_is_key_here(PHP_VALUE_NODE *array, PHP_VALUE_NODE *key)
 {
-	if ( array->type != PHP_VAL_ARRAY ) {
+	if (array->type != PHP_VAL_ARRAY) {
 		return 0;
 	}
 	PHP_ARRAY_TYPE *arr_ptr = (PHP_ARRAY_TYPE *)array->ptr_val;
@@ -777,7 +758,7 @@
 
 int array_get_size(PHP_VALUE_NODE *array)
 {
-	if ( array->type != PHP_VAL_ARRAY ) {
+	if (array->type != PHP_VAL_ARRAY) {
 		return 0;
 	}
 	PHP_ARRAY_TYPE *arr_ptr = (PHP_ARRAY_TYPE *)array->ptr_val;
@@ -787,36 +768,32 @@
 
 PHP_VAR_NODE *array_push_back(PHP_VALUE_NODE *array)
 {
-	if ( array->type != PHP_VAL_ARRAY ) {
+	if (array->type != PHP_VAL_ARRAY) {
 		return 0;
 	}
 	PHP_ARRAY_TYPE *arr_ptr = (PHP_ARRAY_TYPE *)array->ptr_val;
 
-	// Resume the linear scan from a cached hint so back-to-back
-	// push_backs are O(1) instead of O(N) each. With N=43k+ shared
-	// files in amuleweb's amuleweb-main-shared.php this collapses
-	// the page-build from O(N^2) (~minutes) to O(N).
-	// Proposed fix for issue #699: raised the upper bound from 0xffff (65535)
-	// to INT_MAX. PHP_ARRAY_TYPE uses std::map (unbounded), so the old cap
-	// was artificial. With the push_next_hint optimisation each call is still
-	// O(1) in the common sequential-push case regardless of array size.
-	for(int i = arr_ptr->push_next_hint; i < INT_MAX; i++) {
+	// Resume the linear scan from a cached hint so back-to-back push_backs are O(1) instead of
+	// O(N) each. With N=43k+ shared files in amuleweb's amuleweb-main-shared.php this collapses
+	// the page build from O(N^2) (~minutes) to O(N). Issue #699 raised the upper bound from
+	// 0xffff to INT_MAX: PHP_ARRAY_TYPE uses std::map (unbounded), so the old cap was
+	// artificial.
+	for (int i = arr_ptr->push_next_hint; i < INT_MAX; i++) {
 		PHP_VAR_NODE *arr_var_node = array_get_by_int_key(array, i);
-		if ( arr_var_node->value.type == PHP_VAL_NONE ) {
+		if (arr_var_node->value.type == PHP_VAL_NONE) {
 			arr_ptr->push_next_hint = i + 1;
 			return arr_var_node;
 		}
 	}
-	// Hint didn't pay off (gap below it from a delete). Fall back
-	// to scanning the low range so push_back keeps the same
-	// semantics as before for mixed insert/delete patterns.
-	for(int i = 0; i < arr_ptr->push_next_hint; i++) {
+	// Hint did not pay off (a gap below it from a delete). Fall back to scanning the low range
+	// so push_back keeps the same semantics as before for mixed insert/delete patterns.
+	for (int i = 0; i < arr_ptr->push_next_hint; i++) {
 		PHP_VAR_NODE *arr_var_node = array_get_by_int_key(array, i);
-		if ( arr_var_node->value.type == PHP_VAL_NONE ) {
+		if (arr_var_node->value.type == PHP_VAL_NONE) {
 			return arr_var_node;
 		}
 	}
-	// integer key space exhausted — unreachable in practice
+	// integer key space exhausted -- unreachable in practice
 	return 0;
 }
 
@@ -827,35 +804,38 @@
 	// first, free old value
 	value_value_free(dst);
 	dst->type = src->type;
-	switch(src->type) {
-		// scalars are copied. Objects are copied too, since
-		// interpreter doesn't allocate them.
-		case PHP_VAL_NONE:
-		case PHP_VAL_BOOL:
-		case PHP_VAL_INT:
-		case PHP_VAL_FLOAT:
-		case PHP_VAL_OBJECT:
-			// assign biggest in union
-			dst->obj_val = src->obj_val;
-			break;
-		// string is duplicated
-		case PHP_VAL_STRING: {
-			dst->str_val = strdup(src->str_val);
-			break;
-		}
-		// array must duplicate all it's values
-		case PHP_VAL_ARRAY: {
-			dst->ptr_val = new PHP_ARRAY_TYPE;
-			PHP_ARRAY_TYPE *src_array = (PHP_ARRAY_TYPE *)src->ptr_val;
-			for(PHP_ARRAY_KEY_ITER_TYPE i = src_array->sorted_keys.begin(); i != src_array->sorted_keys.end(); ++i) {
-				PHP_VAR_NODE *added = array_get_by_str_key(dst, *i);
-				value_value_assign(&added->value, &src_array->array*i->value);
-			}
-			break;
+	switch (src->type) {
+	// scalars are copied. Objects are copied too, since
+	// interpreter doesn't allocate them.
+	case PHP_VAL_NONE:
+	case PHP_VAL_BOOL:
+	case PHP_VAL_INT:
+	case PHP_VAL_FLOAT:
+	case PHP_VAL_OBJECT:
+		// assign biggest in union
+		dst->obj_val = src->obj_val;
+		break;
+	// string is duplicated
+	case PHP_VAL_STRING: {
+		dst->str_val = strdup(src->str_val);
+		break;
+	}
+	// array must duplicate all it's values
+	case PHP_VAL_ARRAY: {
+		dst->ptr_val = new PHP_ARRAY_TYPE;
+		PHP_ARRAY_TYPE *src_array = (PHP_ARRAY_TYPE *)src->ptr_val;
+		for (PHP_ARRAY_KEY_ITER_TYPE i = src_array->sorted_keys.begin();
+			i != src_array->sorted_keys.end();
+			++i) {
+			PHP_VAR_NODE *added = array_get_by_str_key(dst, *i);
+			value_value_assign(&added->value, &src_array->array*i->value);
 		}
+		break;
+	}
 
-		case PHP_VAL_VAR_NODE:
-		case PHP_VAL_INT_DATA: break;
+	case PHP_VAL_VAR_NODE:
+	case PHP_VAL_INT_DATA:
+		break;
 	}
 }
 
@@ -863,20 +843,19 @@
 {
 	assert(var && var->ref_count);
 	var->ref_count--;
-	if ( var->ref_count == 0 ) {
+	if (var->ref_count == 0) {
 		value_value_free(&var->value);
 		delete var;
 	}
 }
 
-// Free an array value: every element var node, then the container itself.
-// Shared by value_value_free() and the cast functions, which all must
-// dispose of an array before overwriting the value (deleting only the
-// PHP_ARRAY_TYPE would leak the element nodes it points to).
+// Free an array value: every element var node, then the container itself. Shared by
+// value_value_free() and the cast functions, which all must dispose of an array before overwriting
+// the value -- deleting only the PHP_ARRAY_TYPE would leak the element nodes it points to.
 static void free_array_value(PHP_VALUE_NODE *val)
 {
 	PHP_ARRAY_TYPE *arr = (PHP_ARRAY_TYPE *)val->ptr_val;
-	for(PHP_ARRAY_ITER_TYPE i = arr->array.begin(); i != arr->array.end(); ++i) {
+	for (PHP_ARRAY_ITER_TYPE i = arr->array.begin(); i != arr->array.end(); ++i) {
 		var_node_free(i->second);
 	}
 	delete arr;
@@ -884,25 +863,27 @@
 
 void value_value_free(PHP_VALUE_NODE *val)
 {
-	switch(val->type) {
-		case PHP_VAL_NONE:
-		case PHP_VAL_BOOL:
-		case PHP_VAL_INT:
-		case PHP_VAL_FLOAT:
-			break;
-		case PHP_VAL_STRING: {
-			free(val->str_val);
-			val->str_val = 0;
-			break;
-		}
-		case PHP_VAL_ARRAY: {
-			free_array_value(val);
-			break;
-		}
-		case PHP_VAL_OBJECT: break;
+	switch (val->type) {
+	case PHP_VAL_NONE:
+	case PHP_VAL_BOOL:
+	case PHP_VAL_INT:
+	case PHP_VAL_FLOAT:
+		break;
+	case PHP_VAL_STRING: {
+		free(val->str_val);
+		val->str_val = 0;
+		break;
+	}
+	case PHP_VAL_ARRAY: {
+		free_array_value(val);
+		break;
+	}
+	case PHP_VAL_OBJECT:
+		break;
 
-		case PHP_VAL_VAR_NODE:
-		case PHP_VAL_INT_DATA: break;
+	case PHP_VAL_VAR_NODE:
+	case PHP_VAL_INT_DATA:
+		break;
 	}
 	val->type = PHP_VAL_NONE;
 }
@@ -910,21 +891,33 @@
 /* casting functions */
 void cast_value_dnum(PHP_VALUE_NODE *val)
 {
-	switch(val->type) {
-		case PHP_VAL_NONE: val->int_val = 0; break;
-		case PHP_VAL_BOOL:
-		case PHP_VAL_INT: break;
-		case PHP_VAL_FLOAT: val->int_val = (int)val->float_val; break;
-		case PHP_VAL_STRING: {
-			char *str = val->str_val;
-			val->int_val = atoll(val->str_val);
-			free(str);
-			break;
-		}
-		case PHP_VAL_ARRAY: free_array_value(val); val->int_val = 0; break;
-		case PHP_VAL_OBJECT: val->int_val = 0; break;
-		case PHP_VAL_VAR_NODE:
-		case PHP_VAL_INT_DATA: assert(0); break;
+	switch (val->type) {
+	case PHP_VAL_NONE:
+		val->int_val = 0;
+		break;
+	case PHP_VAL_BOOL:
+	case PHP_VAL_INT:
+		break;
+	case PHP_VAL_FLOAT:
+		val->int_val = (int)val->float_val;
+		break;
+	case PHP_VAL_STRING: {
+		char *str = val->str_val;
+		val->int_val = atoll(val->str_val);
+		free(str);
+		break;
+	}
+	case PHP_VAL_ARRAY:
+		free_array_value(val);
+		val->int_val = 0;
+		break;
+	case PHP_VAL_OBJECT:
+		val->int_val = 0;
+		break;
+	case PHP_VAL_VAR_NODE:
+	case PHP_VAL_INT_DATA:
+		assert(0);
+		break;
 	}
 	val->type = PHP_VAL_INT;
 }
@@ -937,21 +930,33 @@
 
 void cast_value_fnum(PHP_VALUE_NODE *val)
 {
-	switch(val->type) {
-		case PHP_VAL_NONE: val->float_val = 0; break;
-		case PHP_VAL_BOOL:
-		case PHP_VAL_INT: val->float_val = val->int_val; break;
-		case PHP_VAL_FLOAT: break;
-		case PHP_VAL_STRING: {
-			char *str = val->str_val;
-			val->float_val = atof(val->str_val);
-			free(str);
-			break;
-		}
-		case PHP_VAL_ARRAY: free_array_value(val); val->float_val = 0; break;
-		case PHP_VAL_OBJECT: val->float_val = 0; break;
-		case PHP_VAL_VAR_NODE:
-		case PHP_VAL_INT_DATA: assert(0); break;
+	switch (val->type) {
+	case PHP_VAL_NONE:
+		val->float_val = 0;
+		break;
+	case PHP_VAL_BOOL:
+	case PHP_VAL_INT:
+		val->float_val = val->int_val;
+		break;
+	case PHP_VAL_FLOAT:
+		break;
+	case PHP_VAL_STRING: {
+		char *str = val->str_val;
+		val->float_val = atof(val->str_val);
+		free(str);
+		break;
+	}
+	case PHP_VAL_ARRAY:
+		free_array_value(val);
+		val->float_val = 0;
+		break;
+	case PHP_VAL_OBJECT:
+		val->float_val = 0;
+		break;
+	case PHP_VAL_VAR_NODE:
+	case PHP_VAL_INT_DATA:
+		assert(0);
+		break;
 	}
 	val->type = PHP_VAL_FLOAT;
 }
@@ -959,19 +964,31 @@
 void cast_value_str(PHP_VALUE_NODE *val)
 {
 	char buff256;
-	switch(val->type) {
-		case PHP_VAL_NONE: buff0 = 0; break;
-		case PHP_VAL_BOOL:
-		case PHP_VAL_INT: snprintf(buff, sizeof(buff), "%" PRId64, val->int_val); break;
-		case PHP_VAL_FLOAT: snprintf(buff, sizeof(buff), "%.02f", val->float_val); break;
-		case PHP_VAL_STRING: return;
-		case PHP_VAL_ARRAY: {
-			free_array_value(val);
-			strcpy(buff, "Array"); break;
-		}
-		case PHP_VAL_OBJECT: strcpy(buff, "Object"); break;
-		case PHP_VAL_VAR_NODE:
-		case PHP_VAL_INT_DATA: assert(0); break;
+	switch (val->type) {
+	case PHP_VAL_NONE:
+		buff0 = 0;
+		break;
+	case PHP_VAL_BOOL:
+	case PHP_VAL_INT:
+		snprintf(buff, sizeof(buff), "%" PRId64, val->int_val);
+		break;
+	case PHP_VAL_FLOAT:
+		snprintf(buff, sizeof(buff), "%.02f", val->float_val);
+		break;
+	case PHP_VAL_STRING:
+		return;
+	case PHP_VAL_ARRAY: {
+		free_array_value(val);
+		strcpy(buff, "Array");
+		break;
+	}
+	case PHP_VAL_OBJECT:
+		strcpy(buff, "Object");
+		break;
+	case PHP_VAL_VAR_NODE:
+	case PHP_VAL_INT_DATA:
+		assert(0);
+		break;
 	}
 	val->str_val = strdup(buff);
 	val->type = PHP_VAL_STRING;
@@ -979,24 +996,28 @@
 
 void cast_value_array(PHP_VALUE_NODE *val)
 {
-	switch(val->type) {
-		case PHP_VAL_NONE:
-		case PHP_VAL_BOOL:
-		case PHP_VAL_INT:
-		case PHP_VAL_FLOAT: break;
-		case PHP_VAL_STRING: free(val->str_val); break;
-		case PHP_VAL_ARRAY: return;
-		case PHP_VAL_OBJECT: ;/* must call to free_obj() */
-		case PHP_VAL_VAR_NODE:
-		case PHP_VAL_INT_DATA: assert(0); break;
+	switch (val->type) {
+	case PHP_VAL_NONE:
+	case PHP_VAL_BOOL:
+	case PHP_VAL_INT:
+	case PHP_VAL_FLOAT:
+		break;
+	case PHP_VAL_STRING:
+		free(val->str_val);
+		break;
+	case PHP_VAL_ARRAY:
+		return;
+	case PHP_VAL_OBJECT:; /* must call to free_obj() */
+	case PHP_VAL_VAR_NODE:
+	case PHP_VAL_INT_DATA:
+		assert(0);
+		break;
 	}
 	val->ptr_val = new PHP_ARRAY_TYPE;
 	val->type = PHP_VAL_ARRAY;
 }
 
-/*
- * Function calls
- */
+/* Function calls */
 PHP_EXP_NODE *make_func_call_exp(char *func_name, PHP_EXP_NODE *args)
 {
 	PHP_EXP_NODE *call_node = make_zero_exp_node();
@@ -1030,17 +1051,15 @@
 	PHP_VAR_NODE *node = array_push_back(&paramlist->value);
 	node->value.type = PHP_VAL_INT_DATA;
 	node->value.ptr_val = arg;
-	if ( byref ) {
+	if (byref) {
 		node->flags |= PHP_VARFLAG_BYREF;
 	}
 }
 
 void php_add_native_func(PHP_BLTIN_FUNC_DEF *def)
 {
-	if ( get_scope_item_type(g_global_scope, def->name) != PHP_SCOPE_NONE ) {
-		//
+	if (get_scope_item_type(g_global_scope, def->name) != PHP_SCOPE_NONE) {
 		// Error: something already defined by this name
-		//
 		php_report_error(PHP_ERROR, "Can't add scope item: symbol already defined");
 		return;
 	}
@@ -1050,12 +1069,9 @@
 	decl_node->func_decl->param_count = def->param_count;
 	decl_node->func_decl->params = new PHP_FUNC_PARAM_DEFdef->param_count;
 
-	//
-	// Built-in functions don't have class specifier, and can handle
-	// default arguments internally
-	//
+	// Built-in functions have no class specifier, and can handle default arguments internally
 	memset(decl_node->func_decl->params, 0, sizeof(PHP_FUNC_PARAM_DEF) * def->param_count);
-	for(int i = 0; i < def->param_count;i++) {
+	for (int i = 0; i < def->param_count; i++) {
 		PHP_VAR_NODE *func_param = make_var_node();
 		char param_name32;
 		snprintf(param_name, sizeof(param_name), "__param_%d", i);
@@ -1074,10 +1090,8 @@
 
 void php_add_native_class(const char *name, PHP_NATIVE_PROP_GET_FUNC_PTR prop_get_native_ptr)
 {
-	if ( get_scope_item_type(g_global_scope, name) != PHP_SCOPE_NONE ) {
-		//
+	if (get_scope_item_type(g_global_scope, name) != PHP_SCOPE_NONE) {
 		// Error: something already defined by this name
-		//
 		php_report_error(PHP_ERROR, "Can't add scope item: symbol already defined");
 		return;
 	}
@@ -1103,62 +1117,60 @@
 
 void php_exp_tree_free(PHP_EXP_NODE *tree)
 {
-	if ( !tree ) {
+	if (!tree) {
 		return;
 	}
-	switch ( tree->op ) {
-		case PHP_OP_VAR:
-			/* will be deleted during scope table destruction */
-			break;
-		case PHP_OP_VAL:
-			value_value_free(&tree->val_node);
-			break;
-		case PHP_OP_FUNC_CALL: {
-				php_exp_tree_free(tree->tree_node.left);
-				PHP_VAR_NODE *args = tree->tree_node.right->var_node;
-				PHP_VALUE_NODE *args_array = &args->value;
-				for(PHP_ARRAY_ITER_TYPE i = ((PHP_ARRAY_TYPE *)args_array->ptr_val)->array.begin();
-					i != ((PHP_ARRAY_TYPE *)args_array->ptr_val)->array.end(); ++i) {
-					PHP_VAR_NODE *var_i = i->second;
-					php_exp_tree_free((PHP_EXP_NODE *)var_i->value.ptr_val);
-				}
-				value_value_free(&args->value);
-				delete tree->tree_node.right->var_node;
-				delete tree->tree_node.right;
-			}
-			break;
-		case PHP_OP_ARRAY: {
-				PHP_EXP_NODE *curr = tree->tree_node.left;
-                while (curr) {
-                       PHP_EXP_NODE *next = curr->next;
-                    php_exp_tree_free(curr->exp_node);
-                    delete curr;
-                    curr = next;
-                }
-			}
-			break;
-		case PHP_OP_LIST: {
-				// Comma-separated expression list (e.g. the three clauses of
-				// a for() header). The payload of each node lives in exp_node,
-				// not in tree_node.left/right, so the default branch below would
-				// delete the list spine but leak every payload subtree. Walk the
-				// ->next chain and free both, like echo / switch do inline.
-				PHP_EXP_NODE *curr = tree;
-				while (curr) {
-					PHP_EXP_NODE *next = curr->next;
-					php_exp_tree_free(curr->exp_node);
-					delete curr;
-					curr = next;
-				}
-			}
-			return;
-		case PHP_OP_MUX:
-			php_exp_tree_free(tree->exp_node);
-		/* fall through */
-		default:
-			// all other things using left/right
-			php_exp_tree_free(tree->tree_node.left);
-			php_exp_tree_free(tree->tree_node.right);
+	switch (tree->op) {
+	case PHP_OP_VAR:
+		/* will be deleted during scope table destruction */
+		break;
+	case PHP_OP_VAL:
+		value_value_free(&tree->val_node);
+		break;
+	case PHP_OP_FUNC_CALL: {
+		php_exp_tree_free(tree->tree_node.left);
+		PHP_VAR_NODE *args = tree->tree_node.right->var_node;
+		PHP_VALUE_NODE *args_array = &args->value;
+		for (PHP_ARRAY_ITER_TYPE i = ((PHP_ARRAY_TYPE *)args_array->ptr_val)->array.begin();
+			i != ((PHP_ARRAY_TYPE *)args_array->ptr_val)->array.end();
+			++i) {
+			PHP_VAR_NODE *var_i = i->second;
+			php_exp_tree_free((PHP_EXP_NODE *)var_i->value.ptr_val);
+		}
+		value_value_free(&args->value);
+		delete tree->tree_node.right->var_node;
+		delete tree->tree_node.right;
+	} break;
+	case PHP_OP_ARRAY: {
+		PHP_EXP_NODE *curr = tree->tree_node.left;
+		while (curr) {
+			PHP_EXP_NODE *next = curr->next;
+			php_exp_tree_free(curr->exp_node);
+			delete curr;
+			curr = next;
+		}
+	} break;
+	case PHP_OP_LIST: {
+		// Comma-separated expression list (e.g. the three clauses of a for() header). The
+		// payload of each node lives in exp_node, not in tree_node.left/right, so the
+		// default branch below would delete the list spine but leak every payload subtree.
+		// Walk the ->next chain and free both, like echo and switch do inline.
+		PHP_EXP_NODE *curr = tree;
+		while (curr) {
+			PHP_EXP_NODE *next = curr->next;
+			php_exp_tree_free(curr->exp_node);
+			delete curr;
+			curr = next;
+		}
+	}
+		return;
+	case PHP_OP_MUX:
+		php_exp_tree_free(tree->exp_node);
+	/* fall through */
+	default:
+		// all other things using left/right
+		php_exp_tree_free(tree->tree_node.left);
+		php_exp_tree_free(tree->tree_node.right);
 	}
 
 	delete tree;
@@ -1166,78 +1178,76 @@
 
 void php_syn_tree_free(PHP_SYN_NODE *tree)
 {
-	while ( tree ) {
-		switch ( tree->type ) {
-			case PHP_ST_EXPR:
-			case PHP_ST_RET:
-				php_exp_tree_free(tree->node_expr);
-				break;
-			case PHP_ST_ECHO: {
-					PHP_EXP_NODE *curr = tree->node_expr;
-                    while (curr) {
-                       PHP_EXP_NODE *next = curr->next;
-                        php_exp_tree_free(curr->exp_node);
-                        delete curr;
-                        curr = next;
-                    }
-				}
-				break;
-			case PHP_ST_IF:
-				php_exp_tree_free(tree->node_if.cond);
-				php_syn_tree_free(tree->node_if.code_if);
-				php_syn_tree_free(tree->node_if.code_else);
-				break;
-			case PHP_ST_WHILE:
-			case PHP_ST_DO_WHILE:
-				php_exp_tree_free(tree->node_while.cond);
-				php_syn_tree_free(tree->node_while.code);
-				break;
-			case PHP_ST_FOR:
-				php_exp_tree_free(tree->node_for.do_start);
-				php_exp_tree_free(tree->node_for.cond);
-				php_exp_tree_free(tree->node_for.do_next);
-				php_syn_tree_free(tree->node_for.code);
-				break;
-			case PHP_ST_FOREACH:
-				php_exp_tree_free(tree->node_foreach.elems);
-				php_syn_tree_free(tree->node_foreach.code);
-				break;
-			case PHP_ST_CONTINUE:
-			case PHP_ST_BREAK:
-				break;
-			case PHP_ST_FUNC_DECL:
-				if ( !tree->func_decl->is_native ) {
-					php_syn_tree_free(tree->func_decl->code);
-				}
-				delete_scope_table(tree->func_decl->scope);
-				free(tree->func_decl->name);
-				for(int i = 0; i < tree->func_decl->param_count; i++) {
-					if (tree->func_decl->paramsi.class_name) {
-						free(tree->func_decl->paramsi.class_name);
-					}
+	while (tree) {
+		switch (tree->type) {
+		case PHP_ST_EXPR:
+		case PHP_ST_RET:
+			php_exp_tree_free(tree->node_expr);
+			break;
+		case PHP_ST_ECHO: {
+			PHP_EXP_NODE *curr = tree->node_expr;
+			while (curr) {
+				PHP_EXP_NODE *next = curr->next;
+				php_exp_tree_free(curr->exp_node);
+				delete curr;
+				curr = next;
+			}
+		} break;
+		case PHP_ST_IF:
+			php_exp_tree_free(tree->node_if.cond);
+			php_syn_tree_free(tree->node_if.code_if);
+			php_syn_tree_free(tree->node_if.code_else);
+			break;
+		case PHP_ST_WHILE:
+		case PHP_ST_DO_WHILE:
+			php_exp_tree_free(tree->node_while.cond);
+			php_syn_tree_free(tree->node_while.code);
+			break;
+		case PHP_ST_FOR:
+			php_exp_tree_free(tree->node_for.do_start);
+			php_exp_tree_free(tree->node_for.cond);
+			php_exp_tree_free(tree->node_for.do_next);
+			php_syn_tree_free(tree->node_for.code);
+			break;
+		case PHP_ST_FOREACH:
+			php_exp_tree_free(tree->node_foreach.elems);
+			php_syn_tree_free(tree->node_foreach.code);
+			break;
+		case PHP_ST_CONTINUE:
+		case PHP_ST_BREAK:
+			break;
+		case PHP_ST_FUNC_DECL:
+			if (!tree->func_decl->is_native) {
+				php_syn_tree_free(tree->func_decl->code);
+			}
+			delete_scope_table(tree->func_decl->scope);
+			free(tree->func_decl->name);
+			for (int i = 0; i < tree->func_decl->param_count; i++) {
+				if (tree->func_decl->paramsi.class_name) {
+					free(tree->func_decl->paramsi.class_name);
 				}
-				delete  tree->func_decl->params;
-				delete tree->func_decl;
-				break;
-			case PHP_ST_SWITCH: {
-					php_exp_tree_free(tree->node_switch.cond);
-					php_syn_tree_free(tree->node_switch.case_list->exp_node->tree_node.syn_right);
-					PHP_EXP_NODE *curr = tree->node_switch.case_list;
-                    while (curr) {
-                       PHP_EXP_NODE *next = curr->next;
-                       if ( curr->exp_node ) {
-	                        php_exp_tree_free(curr->exp_node->tree_node.left);
-	                    delete curr->exp_node;
-                       }
-                        delete curr;
-                        curr = next;
-                    }
+			}
+			delete tree->func_decl->params;
+			delete tree->func_decl;
+			break;
+		case PHP_ST_SWITCH: {
+			php_exp_tree_free(tree->node_switch.cond);
+			php_syn_tree_free(tree->node_switch.case_list->exp_node->tree_node.syn_right);
+			PHP_EXP_NODE *curr = tree->node_switch.case_list;
+			while (curr) {
+				PHP_EXP_NODE *next = curr->next;
+				if (curr->exp_node) {
+					php_exp_tree_free(curr->exp_node->tree_node.left);
+					delete curr->exp_node;
 				}
-				break;
-			case PHP_ST_CLASS_DECL:
-				free(tree->class_decl->name);
-				delete tree->class_decl;
-				break;
+				delete curr;
+				curr = next;
+			}
+		} break;
+		case PHP_ST_CLASS_DECL:
+			free(tree->class_decl->name);
+			delete tree->class_decl;
+			break;
 		}
 		PHP_SYN_NODE *next_node = tree->next_node;
 		delete tree;
@@ -1247,7 +1257,7 @@
 
 void php_engine_free()
 {
-	if ( g_global_scope ) {
+	if (g_global_scope) {
 		delete_scope_table(g_global_scope);
 	}
 	php_syn_tree_free(g_syn_tree_top);
@@ -1257,45 +1267,38 @@
 }
 
 /*
- * Create reference. This is recursive process, since operators 
- * can be stacked: $a123 = & $b;
- * There's 3 valid cases in making reference:
- *  1,2. Target is scalar variable or variable by name ${xxx}
- *  3. Target is member of array.
+ * Create a reference. Recursive, since  operators stack: $a123 = & $b. Three cases are
+ * valid: the target is a scalar variable, a variable by name ${xxx}, or a member of an array.
  */
 static void exp_set_ref(PHP_EXP_NODE *expr, PHP_VAR_NODE *var, PHP_VALUE_NODE *key)
 {
-	switch ( expr->op ) {
-		case PHP_OP_VAR: {
-				if ( expr->var_si_node->var != var ) {
-					if ( key ) {
-						cast_value_array(&expr->var_si_node->var->value);
-						array_set_by_key(&expr->var_si_node->var->value, key, var);
-					} else {
-						var_node_free(expr->var_si_node->var);
-						expr->var_si_node->var = var;
-						var->ref_count++;
-					}
-				}
-			}
-			break;
-		case PHP_OP_ARRAY_BY_KEY: {
-				PHP_VALUE_NODE i_key;
-				i_key.type = PHP_VAL_NONE;
-				php_expr_eval(expr->tree_node.right, &i_key);
-				exp_set_ref(expr->tree_node.left, var, &i_key);
+	switch (expr->op) {
+	case PHP_OP_VAR: {
+		if (expr->var_si_node->var != var) {
+			if (key) {
+				cast_value_array(&expr->var_si_node->var->value);
+				array_set_by_key(&expr->var_si_node->var->value, key, var);
+			} else {
+				var_node_free(expr->var_si_node->var);
+				expr->var_si_node->var = var;
+				var->ref_count++;
 			}
-			break;
-		default:
-			php_report_error(PHP_ERROR, "Bad left part of operator =&: (%d)",
-				expr->tree_node.left->op);
+		}
+	} break;
+	case PHP_OP_ARRAY_BY_KEY: {
+		PHP_VALUE_NODE i_key;
+		i_key.type = PHP_VAL_NONE;
+		php_expr_eval(expr->tree_node.right, &i_key);
+		exp_set_ref(expr->tree_node.left, var, &i_key);
+	} break;
+	default:
+		php_report_error(PHP_ERROR, "Bad left part of operator =&: (%d)", expr->tree_node.left->op);
 	}
 }
 
 /*
- * This is heart of expression tree: evaluation. It's split into 2 functions
- * where 1 evaluates "value" of expression, and other evaluates "lvalue" i.e. assignable
- * entity from given subtree.
+ * The heart of the expression tree: evaluation. Split in two, one evaluating the "value" of an
+ * expression and the other the "lvalue", i.e. the assignable entity in the given subtree.
  */
 
 void php_expr_eval(PHP_EXP_NODE *expr, PHP_VALUE_NODE *result)
@@ -1305,232 +1308,236 @@
 	PHP_SCOPE_ITEM *si = 0;
 	result_val_right.type = PHP_VAL_NONE;
 	result_val_left.type = PHP_VAL_NONE;
-	switch(expr->op) {
-		case PHP_OP_VAL:
-			if ( result ) {
-				value_value_assign(result, &expr->val_node);
-			}
-			break;
-		case PHP_OP_VAR:
-			if ( result ) {
-				value_value_assign(result, &expr->var_si_node->var->value);
-			}
-			break;
-		case PHP_OP_ASS:
-			lval_node = php_expr_eval_lvalue(expr->tree_node.left);
-			if ( !lval_node ) {
-				break;
-			}
-			php_expr_eval(expr->tree_node.right, &lval_node->value);
-			if ( result ) {
-				value_value_assign(result, &lval_node->value);
-			}
-			break;
-		case PHP_OP_ARRAY_BY_KEY:
-			php_expr_eval(expr->tree_node.right, &result_val_right);
-			lval_node = php_expr_eval_lvalue(expr->tree_node.left);
-			cast_value_array(&lval_node->value);
-			cast_value_str(&result_val_right);
-			lval_node = array_get_by_key(&lval_node->value, &result_val_right);
-			if ( result ) {
-				value_value_assign(result, &lval_node->value);
-			}
-			break;
-		case PHP_MAKE_REF:
-			lval_node = php_expr_eval_lvalue(expr->tree_node.right);
-			if ( !lval_node ) {
-				break;
-			}
-			exp_set_ref(expr->tree_node.left, lval_node, 0);
-			break;
-		case PHP_OP_ARRAY:
-			if ( result ) {
-				PHP_EXP_NODE *curr = expr->tree_node.left;
-				value_value_free(result);
-				cast_value_array(result);
-				while ( curr ) {
-					switch( curr->exp_node->op ) {
-						case PHP_OP_ARRAY_PAIR:
-							if ( curr->exp_node->tree_node.right ) {
-								php_expr_eval(curr->exp_node->tree_node.left, &result_val_left);
-								cast_value_str(&result_val_left);
-								lval_node = array_get_by_key(result, &result_val_left);
-								value_value_free(&result_val_left);
-								php_expr_eval(curr->exp_node->tree_node.right, &lval_node->value);
-							} else {
-								lval_node = array_push_back(result);
-								php_expr_eval(curr->exp_node->tree_node.left, &lval_node->value);
-							}
-							break;
-						case PHP_OP_ARRAY_REF_PAIR:
-							lval_node = php_expr_eval_lvalue(curr->exp_node->tree_node.right);
-							break;
-						default:
-							php_report_error(PHP_INTERNAL_ERROR, "Array list contain wrong node");
-							return;
-					}
-					curr = curr->next;
-				}
-			}
+	switch (expr->op) {
+	case PHP_OP_VAL:
+		if (result) {
+			value_value_assign(result, &expr->val_node);
+		}
+		break;
+	case PHP_OP_VAR:
+		if (result) {
+			value_value_assign(result, &expr->var_si_node->var->value);
+		}
+		break;
+	case PHP_OP_ASS:
+		lval_node = php_expr_eval_lvalue(expr->tree_node.left);
+		if (!lval_node) {
 			break;
-		case PHP_OP_FUNC_CALL:
-			php_run_func_call(expr, result);
+		}
+		php_expr_eval(expr->tree_node.right, &lval_node->value);
+		if (result) {
+			value_value_assign(result, &lval_node->value);
+		}
+		break;
+	case PHP_OP_ARRAY_BY_KEY:
+		php_expr_eval(expr->tree_node.right, &result_val_right);
+		lval_node = php_expr_eval_lvalue(expr->tree_node.left);
+		cast_value_array(&lval_node->value);
+		cast_value_str(&result_val_right);
+		lval_node = array_get_by_key(&lval_node->value, &result_val_right);
+		if (result) {
+			value_value_assign(result, &lval_node->value);
+		}
+		break;
+	case PHP_MAKE_REF:
+		lval_node = php_expr_eval_lvalue(expr->tree_node.right);
+		if (!lval_node) {
 			break;
-		case PHP_OP_LIST: {
-				PHP_EXP_NODE *curr = expr;
-				while ( curr ) {
-					if ( curr->exp_node ) {
-						php_expr_eval(curr->exp_node, result);
+		}
+		exp_set_ref(expr->tree_node.left, lval_node, 0);
+		break;
+	case PHP_OP_ARRAY:
+		if (result) {
+			PHP_EXP_NODE *curr = expr->tree_node.left;
+			value_value_free(result);
+			cast_value_array(result);
+			while (curr) {
+				switch (curr->exp_node->op) {
+				case PHP_OP_ARRAY_PAIR:
+					if (curr->exp_node->tree_node.right) {
+						php_expr_eval(
+							curr->exp_node->tree_node.left, &result_val_left);
+						cast_value_str(&result_val_left);
+						lval_node = array_get_by_key(result, &result_val_left);
+						value_value_free(&result_val_left);
+						php_expr_eval(
+							curr->exp_node->tree_node.right, &lval_node->value);
+					} else {
+						lval_node = array_push_back(result);
+						php_expr_eval(
+							curr->exp_node->tree_node.left, &lval_node->value);
 					}
-					curr = curr->next;
+					break;
+				case PHP_OP_ARRAY_REF_PAIR:
+					lval_node = php_expr_eval_lvalue(curr->exp_node->tree_node.right);
+					break;
+				default:
+					php_report_error(PHP_INTERNAL_ERROR, "Array list contain wrong node");
+					return;
 				}
+				curr = curr->next;
 			}
-			break;
-		case PHP_OP_CAT:
-			php_expr_eval(expr->tree_node.right, &result_val_right);
-			php_expr_eval(expr->tree_node.left, &result_val_left);
-			if ( result ) {
-				cast_value_str(&result_val_left);
-				cast_value_str(&result_val_right);
-				value_value_free(result);
-				result->type = PHP_VAL_STRING;
-				// using "malloc" and not "new" since all strings are freed
-				// later with "free" and not "delete"
-				result->str_val = (char *)malloc(strlen(result_val_left.str_val) +
-					strlen(result_val_right.str_val) + 1);
-				strcpy(result->str_val, result_val_left.str_val);
-				strcat(result->str_val, result_val_right.str_val);
+		}
+		break;
+	case PHP_OP_FUNC_CALL:
+		php_run_func_call(expr, result);
+		break;
+	case PHP_OP_LIST: {
+		PHP_EXP_NODE *curr = expr;
+		while (curr) {
+			if (curr->exp_node) {
+				php_expr_eval(curr->exp_node, result);
 			}
-			break;
-		case PHP_OP_MUX:
-			php_expr_eval(expr->exp_node, &result_val_right);
+			curr = curr->next;
+		}
+	} break;
+	case PHP_OP_CAT:
+		php_expr_eval(expr->tree_node.right, &result_val_right);
+		php_expr_eval(expr->tree_node.left, &result_val_left);
+		if (result) {
+			cast_value_str(&result_val_left);
+			cast_value_str(&result_val_right);
+			value_value_free(result);
+			result->type = PHP_VAL_STRING;
+			// using "malloc" and not "new" since all strings are freed
+			// later with "free" and not "delete"
+			result->str_val = (char *)malloc(
+				strlen(result_val_left.str_val) + strlen(result_val_right.str_val) + 1);
+			strcpy(result->str_val, result_val_left.str_val);
+			strcat(result->str_val, result_val_right.str_val);
+		}
+		break;
+	case PHP_OP_MUX:
+		php_expr_eval(expr->exp_node, &result_val_right);
+		cast_value_bool(&result_val_right);
+		if (result_val_right.int_val) {
+			php_expr_eval(expr->tree_node.left, result);
+		} else {
+			php_expr_eval(expr->tree_node.right, result);
+		}
+		break;
+	case PHP_OP_CAST_INT:
+		if (result) {
+			php_expr_eval(expr->tree_node.left, result);
+			cast_value_dnum(result);
+		}
+		break;
+	case PHP_OP_CAST_FLOAT:
+		if (result) {
+			php_expr_eval(expr->tree_node.left, result);
+			cast_value_fnum(result);
+		}
+		break;
+	case PHP_OP_CAST_BOOL:
+		if (result) {
+			php_expr_eval(expr->tree_node.left, result);
+			cast_value_bool(result);
+		}
+		break;
+	case PHP_OP_CAST_STR:
+		if (result) {
+			php_expr_eval(expr->tree_node.left, result);
+			cast_value_str(result);
+		}
+		break;
+	case PHP_OP_LOG_NOT:
+		if (result) {
+			php_expr_eval(expr->tree_node.left, &result_val_right);
 			cast_value_bool(&result_val_right);
-			if ( result_val_right.int_val ) {
-				php_expr_eval(expr->tree_node.left, result);
-			} else {
-				php_expr_eval(expr->tree_node.right, result);
-			}
-			break;
-		case PHP_OP_CAST_INT:
-			if ( result ) {
-				php_expr_eval(expr->tree_node.left, result);
-				cast_value_dnum(result);
-			}
-			break;
-		case PHP_OP_CAST_FLOAT:
-			if ( result ) {
-				php_expr_eval(expr->tree_node.left, result);
-				cast_value_fnum(result);
-			}
-			break;
-		case PHP_OP_CAST_BOOL:
-			if ( result ) {
-				php_expr_eval(expr->tree_node.left, result);
-				cast_value_bool(result);
-			}
-			break;
-		case PHP_OP_CAST_STR:
-			if ( result ) {
-				php_expr_eval(expr->tree_node.left, result);
-				cast_value_str(result);
-			}
-			break;
-		case PHP_OP_LOG_NOT:
-			if ( result ) {
-				php_expr_eval(expr->tree_node.left, &result_val_right);
-				cast_value_bool(&result_val_right);
-				result_val_right.int_val = !result_val_right.int_val;
-				value_value_assign(result, &result_val_right);
-			}
-			break;
-		case PHP_OP_NOT:
-			if ( result ) {
-				php_expr_eval(expr->tree_node.left, &result_val_right);
-				cast_value_bool(&result_val_right);
-				result_val_right.int_val = ~result_val_right.int_val;
-				value_value_assign(result, &result_val_right);
-			}
-			break;
-		case PHP_OP_ADD:
-		case PHP_OP_SUB:
-		case PHP_OP_MUL:
-		case PHP_OP_DIV:
-			php_expr_eval(expr->tree_node.right, &result_val_right);
-			php_expr_eval(expr->tree_node.left, &result_val_left);
-			if ( result ) {
-				php_eval_simple_math(expr->op, &result_val_left, &result_val_right, result);
-			}
-			break;
+			result_val_right.int_val = !result_val_right.int_val;
+			value_value_assign(result, &result_val_right);
+		}
+		break;
+	case PHP_OP_NOT:
+		if (result) {
+			php_expr_eval(expr->tree_node.left, &result_val_right);
+			cast_value_bool(&result_val_right);
+			result_val_right.int_val = ~result_val_right.int_val;
+			value_value_assign(result, &result_val_right);
+		}
+		break;
+	case PHP_OP_ADD:
+	case PHP_OP_SUB:
+	case PHP_OP_MUL:
+	case PHP_OP_DIV:
+		php_expr_eval(expr->tree_node.right, &result_val_right);
+		php_expr_eval(expr->tree_node.left, &result_val_left);
+		if (result) {
+			php_eval_simple_math(expr->op, &result_val_left, &result_val_right, result);
+		}
+		break;
 	case PHP_OP_SHL:
 	case PHP_OP_SHR:
 	case PHP_OP_OR:
 	case PHP_OP_AND:
 	case PHP_OP_XOR:
-		case PHP_OP_LOG_OR:
-		case PHP_OP_LOG_AND:
-		case PHP_OP_LOG_XOR:
-			php_expr_eval(expr->tree_node.right, &result_val_right);
-			php_expr_eval(expr->tree_node.left, &result_val_left);
-			if ( result ) {
-				php_eval_int_math(expr->op, &result_val_left, &result_val_right, result);
-			}
-			break;
-		case PHP_OP_EQ:
-		case PHP_OP_NEQ:
-		case PHP_OP_GRT:
-		case PHP_OP_LWR:
-			php_expr_eval(expr->tree_node.right, &result_val_right);
-			php_expr_eval(expr->tree_node.left, &result_val_left);
-			if ( result ) {
-				php_eval_compare(expr->op, &result_val_left, &result_val_right, result);
-			}
-			break;
-		case PHP_OP_PRINT:
-			php_expr_eval(expr->tree_node.left, &result_val_right);
-			cast_value_str(&result_val_right);
-			//
-			// I print to buffer
-			CPhPLibContext::Print(result_val_right.str_val);
-			break;
-		case PHP_OP_OBJECT_DEREF: // $x->y
-			// take variable from scope of current object
-			lval_node = php_expr_eval_lvalue(expr->tree_node.left);
-			if ( !lval_node ) {
-				php_report_error(PHP_ERROR, "Left part of -> must be lvalue");
-				return;
-			}
-			if ( lval_node->value.type != PHP_VAL_OBJECT ) {
-				php_report_error(PHP_ERROR, "Left part of -> must be an object");
-				return;
-			}
-			if ( get_scope_item_type(g_global_scope, lval_node->value.obj_val.class_name) == PHP_SCOPE_NONE ) {
-				php_report_error(PHP_ERROR, "Undeclared object");
-				return;
-			}
-			si = get_scope_item(g_global_scope, lval_node->value.obj_val.class_name);
-			if ( si->type != PHP_SCOPE_CLASS ) {
-				php_report_error(PHP_INTERNAL_ERROR, "Object classname is not name of class");
-				return;
-			}
-			// left part is ok, let's check the right
-			if ( (expr->tree_node.right->op != PHP_OP_VAL) || (expr->tree_node.right->val_node.type != PHP_VAL_STRING) ) {
-				php_report_error(PHP_ERROR, "Right part of -> must be string value");
-				return;
-			}
-			if ( si->class_decl->class_decl->is_native ) {
-				si->class_decl->class_decl->native_prop_get_ptr(lval_node->value.obj_val.inst_ptr,
-					expr->tree_node.right->val_node.str_val, result);
-			} else {
-				php_report_error(PHP_ERROR, "Only native classes supported");
-				return;
-			}
-			break;
-		case PHP_OP_CLASS_DEREF: // A::y
-			// take variable (static) from scope of current class
-			php_report_error(PHP_ERROR, "Value of static class members not supported");
-			break;
-		default: ;
-
+	case PHP_OP_LOG_OR:
+	case PHP_OP_LOG_AND:
+	case PHP_OP_LOG_XOR:
+		php_expr_eval(expr->tree_node.right, &result_val_right);
+		php_expr_eval(expr->tree_node.left, &result_val_left);
+		if (result) {
+			php_eval_int_math(expr->op, &result_val_left, &result_val_right, result);
+		}
+		break;
+	case PHP_OP_EQ:
+	case PHP_OP_NEQ:
+	case PHP_OP_GRT:
+	case PHP_OP_LWR:
+		php_expr_eval(expr->tree_node.right, &result_val_right);
+		php_expr_eval(expr->tree_node.left, &result_val_left);
+		if (result) {
+			php_eval_compare(expr->op, &result_val_left, &result_val_right, result);
+		}
+		break;
+	case PHP_OP_PRINT:
+		php_expr_eval(expr->tree_node.left, &result_val_right);
+		cast_value_str(&result_val_right);
+		//
+		// I print to buffer
+		CPhPLibContext::Print(result_val_right.str_val);
+		break;
+	case PHP_OP_OBJECT_DEREF: // $x->y
+		// take variable from scope of current object
+		lval_node = php_expr_eval_lvalue(expr->tree_node.left);
+		if (!lval_node) {
+			php_report_error(PHP_ERROR, "Left part of -> must be lvalue");
+			return;
+		}
+		if (lval_node->value.type != PHP_VAL_OBJECT) {
+			php_report_error(PHP_ERROR, "Left part of -> must be an object");
+			return;
+		}
+		if (get_scope_item_type(g_global_scope, lval_node->value.obj_val.class_name) ==
+			PHP_SCOPE_NONE) {
+			php_report_error(PHP_ERROR, "Undeclared object");
+			return;
+		}
+		si = get_scope_item(g_global_scope, lval_node->value.obj_val.class_name);
+		if (si->type != PHP_SCOPE_CLASS) {
+			php_report_error(PHP_INTERNAL_ERROR, "Object classname is not name of class");
+			return;
+		}
+		// left part is ok, let's check the right
+		if ((expr->tree_node.right->op != PHP_OP_VAL) ||
+			(expr->tree_node.right->val_node.type != PHP_VAL_STRING)) {
+			php_report_error(PHP_ERROR, "Right part of -> must be string value");
+			return;
+		}
+		if (si->class_decl->class_decl->is_native) {
+			si->class_decl->class_decl->native_prop_get_ptr(lval_node->value.obj_val.inst_ptr,
+				expr->tree_node.right->val_node.str_val,
+				result);
+		} else {
+			php_report_error(PHP_ERROR, "Only native classes supported");
+			return;
+		}
+		break;
+	case PHP_OP_CLASS_DEREF: // A::y
+		// take variable (static) from scope of current class
+		php_report_error(PHP_ERROR, "Value of static class members not supported");
+		break;
+	default:;
 	}
 	value_value_free(&result_val_left);
 	value_value_free(&result_val_right);
@@ -1543,53 +1550,51 @@
 	PHP_VALUE_NODE index;
 	index.type = PHP_VAL_NONE;
 
-	switch(expr->op) {
-		case PHP_OP_VAR:
-			lval_node = expr->var_si_node->var;
+	switch (expr->op) {
+	case PHP_OP_VAR:
+		lval_node = expr->var_si_node->var;
+		break;
+	case PHP_OP_ARRAY_BY_KEY:
+		lval_node = php_expr_eval_lvalue(expr->tree_node.left);
+		if (!lval_node) {
 			break;
-		case PHP_OP_ARRAY_BY_KEY:
-			lval_node = php_expr_eval_lvalue(expr->tree_node.left);
-			if ( !lval_node ) {
-				break;
-			}
+		}
 
-			cast_value_array(&lval_node->value);
-			if ( expr->tree_node.right ) {
-				php_expr_eval(expr->tree_node.right, &index);
-				if ( index.type == PHP_VAL_NONE ) {
-					// something got wrong: evaluation result is not a value
-					return 0;
-				}
-				cast_value_str(&index);
-				lval_node = array_get_by_key(&lval_node->value, &index);
-				value_value_free(&index);
-			} else {
-				// this is "$xxx = " construct.
-				lval_node = array_push_back(&lval_node->value);
+		cast_value_array(&lval_node->value);
+		if (expr->tree_node.right) {
+			php_expr_eval(expr->tree_node.right, &index);
+			if (index.type == PHP_VAL_NONE) {
+				// something got wrong: evaluation result is not a value
+				return 0;
 			}
-		case PHP_OP_VAR_BY_EXP: // ${"xxx"}
-			// should take variable from current scope
-			break;
-		case PHP_OP_OBJECT_DEREF: // $x->y
-			// take variable from scope of current object
-			php_report_error(PHP_ERROR, "Assign to class members not supported");
-			break;
-		case PHP_OP_CLASS_DEREF: // A::y
-			// take variable (static) from scope of current class
-			php_report_error(PHP_ERROR, "Assign to static class members not supported");
-			break;
-		default:
-			//
-			// Error: expression can not be taken as lvalue
-			//
-			php_report_error(PHP_ERROR, "This expression can't be used as lvalue");
+			cast_value_str(&index);
+			lval_node = array_get_by_key(&lval_node->value, &index);
+			value_value_free(&index);
+		} else {
+			// this is "$xxx = " construct.
+			lval_node = array_push_back(&lval_node->value);
+		}
+	case PHP_OP_VAR_BY_EXP: // ${"xxx"}
+		// should take variable from current scope
+		break;
+	case PHP_OP_OBJECT_DEREF: // $x->y
+		// take variable from scope of current object
+		php_report_error(PHP_ERROR, "Assign to class members not supported");
+		break;
+	case PHP_OP_CLASS_DEREF: // A::y
+		// take variable (static) from scope of current class
+		php_report_error(PHP_ERROR, "Assign to static class members not supported");
+		break;
+	default:
+		// Error: expression cannot be taken as lvalue
+		php_report_error(PHP_ERROR, "This expression can't be used as lvalue");
 	}
 	return lval_node;
 }
 
 static PHP_VALUE_TYPE cast_type_resolve(PHP_VALUE_NODE *op1, PHP_VALUE_NODE *op2)
 {
-	if ( (op1->type == PHP_VAL_FLOAT) || (op2->type == PHP_VAL_FLOAT) ) {
+	if ((op1->type == PHP_VAL_FLOAT) || (op2->type == PHP_VAL_FLOAT)) {
 		cast_value_fnum(op1);
 		cast_value_fnum(op2);
 		return PHP_VAL_FLOAT;
@@ -1600,123 +1605,121 @@
 	}
 }
 
-/*
- * Same as simple_math, but result is always bool
- */
+/* Same as simple_math, but the result is always bool */
 void php_eval_compare(PHP_EXP_OP op, PHP_VALUE_NODE *op1, PHP_VALUE_NODE *op2, PHP_VALUE_NODE *result)
 {
 	result->type = PHP_VAL_BOOL;
-	if ( (op1->type == PHP_VAL_STRING) || (op2->type == PHP_VAL_STRING) ) {
+	if ((op1->type == PHP_VAL_STRING) || (op2->type == PHP_VAL_STRING)) {
 		cast_value_str(op1);
 		cast_value_str(op2);
 		int cmp_val = strcmp(op1->str_val, op2->str_val);
-		switch(op) {
-			case PHP_OP_EQ:
-				result->int_val = (cmp_val == 0);
-				break;
-			case PHP_OP_NEQ:
-				result->int_val = (cmp_val != 0);
-				break;
-			case PHP_OP_GRT:
-				result->int_val = (cmp_val > 0);
-				break;
-			case PHP_OP_LWR:
-				result->int_val = (cmp_val < 0);
-				break;
-			case PHP_OP_GRT_EQ:
-				result->int_val = (cmp_val >= 0);
-				break;
-			case PHP_OP_LWR_EQ:
-				result->int_val = (cmp_val <= 0);
-				break;
-			default:
-				php_report_error(PHP_INTERNAL_ERROR, "This op is not compare op");
+		switch (op) {
+		case PHP_OP_EQ:
+			result->int_val = (cmp_val == 0);
+			break;
+		case PHP_OP_NEQ:
+			result->int_val = (cmp_val != 0);
+			break;
+		case PHP_OP_GRT:
+			result->int_val = (cmp_val > 0);
+			break;
+		case PHP_OP_LWR:
+			result->int_val = (cmp_val < 0);
+			break;
+		case PHP_OP_GRT_EQ:
+			result->int_val = (cmp_val >= 0);
+			break;
+		case PHP_OP_LWR_EQ:
+			result->int_val = (cmp_val <= 0);
+			break;
+		default:
+			php_report_error(PHP_INTERNAL_ERROR, "This op is not compare op");
 		}
 	} else {
 		PHP_VALUE_TYPE restype = cast_type_resolve(op1, op2);
-		switch(op) {
-			case PHP_OP_EQ:
-				if ( restype == PHP_VAL_FLOAT ) {
-					result->int_val = op1->float_val == op2->float_val;
-				} else {
-					result->int_val = op1->int_val == op2->int_val;
-				}
-				break;
-			case PHP_OP_NEQ:
-				if ( restype == PHP_VAL_FLOAT ) {
-					result->int_val = op1->float_val != op2->float_val;
-				} else {
-					result->int_val = op1->int_val != op2->int_val;
-				}
-				break;
-			case PHP_OP_GRT:
-				if ( restype == PHP_VAL_FLOAT ) {
-					result->int_val = op1->float_val > op2->float_val;
-				} else {
-					result->int_val = op1->int_val > op2->int_val;
-				}
-				break;
-			case PHP_OP_GRT_EQ:
-				if ( restype == PHP_VAL_FLOAT ) {
-					result->int_val = op1->float_val >= op2->float_val;
-				} else {
-					result->int_val = op1->int_val >= op2->int_val;
-				}
-				break;
-			case PHP_OP_LWR:
-				if ( restype == PHP_VAL_FLOAT ) {
-					result->int_val = op1->float_val < op2->float_val;
-				} else {
-					result->int_val = op1->int_val < op2->int_val;
-				}
-				break;
-			case PHP_OP_LWR_EQ:
-				if ( restype == PHP_VAL_FLOAT ) {
-					result->int_val = op1->float_val <= op2->float_val;
-				} else {
-					result->int_val = op1->int_val <= op2->int_val;
-				}
-				break;
-			default:
-				php_report_error(PHP_INTERNAL_ERROR, "This op is not compare op");
-		}
-	}
-}
-
-void php_eval_simple_math(PHP_EXP_OP op, PHP_VALUE_NODE *op1, PHP_VALUE_NODE *op2, PHP_VALUE_NODE *result)
-{
-	result->type = cast_type_resolve(op1, op2);
-	switch(op) {
-		case PHP_OP_ADD:
-			if ( result->type == PHP_VAL_FLOAT ) {
-				result->float_val = op1->float_val + op2->float_val;
+		switch (op) {
+		case PHP_OP_EQ:
+			if (restype == PHP_VAL_FLOAT) {
+				result->int_val = op1->float_val == op2->float_val;
 			} else {
-				result->int_val = op1->int_val + op2->int_val;
+				result->int_val = op1->int_val == op2->int_val;
 			}
 			break;
-		case PHP_OP_SUB:
-			if ( result->type == PHP_VAL_FLOAT ) {
-				result->float_val = op1->float_val - op2->float_val;
+		case PHP_OP_NEQ:
+			if (restype == PHP_VAL_FLOAT) {
+				result->int_val = op1->float_val != op2->float_val;
 			} else {
-				result->int_val = op1->int_val - op2->int_val;
+				result->int_val = op1->int_val != op2->int_val;
 			}
 			break;
-		case PHP_OP_MUL:
-			if ( result->type == PHP_VAL_FLOAT ) {
-				result->float_val = op1->float_val * op2->float_val;
+		case PHP_OP_GRT:
+			if (restype == PHP_VAL_FLOAT) {
+				result->int_val = op1->float_val > op2->float_val;
+			} else {
+				result->int_val = op1->int_val > op2->int_val;
+			}
+			break;
+		case PHP_OP_GRT_EQ:
+			if (restype == PHP_VAL_FLOAT) {
+				result->int_val = op1->float_val >= op2->float_val;
+			} else {
+				result->int_val = op1->int_val >= op2->int_val;
+			}
+			break;
+		case PHP_OP_LWR:
+			if (restype == PHP_VAL_FLOAT) {
+				result->int_val = op1->float_val < op2->float_val;
 			} else {
-				result->int_val = op1->int_val * op2->int_val;
+				result->int_val = op1->int_val < op2->int_val;
 			}
 			break;
-		case PHP_OP_DIV:
-			if ( result->type == PHP_VAL_FLOAT ) {
-				result->float_val = op1->float_val / op2->float_val;
+		case PHP_OP_LWR_EQ:
+			if (restype == PHP_VAL_FLOAT) {
+				result->int_val = op1->float_val <= op2->float_val;
 			} else {
-				result->int_val = op1->int_val / op2->int_val;
+				result->int_val = op1->int_val <= op2->int_val;
 			}
 			break;
 		default:
-			php_report_error(PHP_INTERNAL_ERROR, "This op is not simple math");
+			php_report_error(PHP_INTERNAL_ERROR, "This op is not compare op");
+		}
+	}
+}
+
+void php_eval_simple_math(PHP_EXP_OP op, PHP_VALUE_NODE *op1, PHP_VALUE_NODE *op2, PHP_VALUE_NODE *result)
+{
+	result->type = cast_type_resolve(op1, op2);
+	switch (op) {
+	case PHP_OP_ADD:
+		if (result->type == PHP_VAL_FLOAT) {
+			result->float_val = op1->float_val + op2->float_val;
+		} else {
+			result->int_val = op1->int_val + op2->int_val;
+		}
+		break;
+	case PHP_OP_SUB:
+		if (result->type == PHP_VAL_FLOAT) {
+			result->float_val = op1->float_val - op2->float_val;
+		} else {
+			result->int_val = op1->int_val - op2->int_val;
+		}
+		break;
+	case PHP_OP_MUL:
+		if (result->type == PHP_VAL_FLOAT) {
+			result->float_val = op1->float_val * op2->float_val;
+		} else {
+			result->int_val = op1->int_val * op2->int_val;
+		}
+		break;
+	case PHP_OP_DIV:
+		if (result->type == PHP_VAL_FLOAT) {
+			result->float_val = op1->float_val / op2->float_val;
+		} else {
+			result->int_val = op1->int_val / op2->int_val;
+		}
+		break;
+	default:
+		php_report_error(PHP_INTERNAL_ERROR, "This op is not simple math");
 	}
 }
 
@@ -1725,7 +1728,7 @@
 	cast_value_dnum(op1);
 	cast_value_dnum(op2);
 	result->type = PHP_VAL_INT;
-	switch(op) {
+	switch (op) {
 	case PHP_OP_SHL:
 		result->int_val = op1->int_val << op2->int_val;
 		break;
@@ -1735,24 +1738,24 @@
 	case PHP_OP_OR:
 		result->int_val = op1->int_val | op2->int_val;
 		break;
-		case PHP_OP_LOG_OR:
+	case PHP_OP_LOG_OR:
 		result->int_val = op1->int_val || op2->int_val;
 		break;
 	case PHP_OP_AND:
 		result->int_val = op1->int_val & op2->int_val;
 		break;
-		case PHP_OP_LOG_AND:
+	case PHP_OP_LOG_AND:
 		result->int_val = op1->int_val && op2->int_val;
 		break;
-		case PHP_OP_LOG_XOR:
-			op1->int_val = op1->int_val ? 1 : 0;
-			op2->int_val = op2->int_val ? 1 : 0;
+	case PHP_OP_LOG_XOR:
+		op1->int_val = op1->int_val ? 1 : 0;
+		op2->int_val = op2->int_val ? 1 : 0;
 	/* fall through */
 	case PHP_OP_XOR:
 		result->int_val = op1->int_val ^ op2->int_val;
 		break;
-		default:
-			php_report_error(PHP_INTERNAL_ERROR, "This op is not int math");
+	default:
+		php_report_error(PHP_INTERNAL_ERROR, "This op is not int math");
 	}
 }
 
@@ -1762,282 +1765,270 @@
 {
 	PHP_EXP_NODE *l_node = node->tree_node.left;
 	PHP_EXP_NODE *r_node = node->tree_node.right;
-	if ( (l_node->op != PHP_OP_VAL) || (l_node->val_node.type != PHP_VAL_STRING) ||
-		(r_node->op != PHP_OP_VAR) || (r_node->var_node->value.type != PHP_VAL_ARRAY) ) {
-		//
-		// Internal error: function name must be string value node, and
-		// params must be an array
-		//
+	if ((l_node->op != PHP_OP_VAL) || (l_node->val_node.type != PHP_VAL_STRING) ||
+		(r_node->op != PHP_OP_VAR) || (r_node->var_node->value.type != PHP_VAL_ARRAY)) {
+		// Internal error: the function name must be a string value node, and params an array
 		php_report_error(PHP_INTERNAL_ERROR, "Function call node have wrong data");
-		return ;
+		return;
 	}
 	PHP_SCOPE_ITEM *si = get_scope_item(g_global_scope, l_node->val_node.str_val);
-	if ( !si ) {
-		//
+	if (!si) {
 		// Error: undeclared symbol
-		//
 		php_report_error(PHP_ERROR, "Function  %s  is not defined", l_node->val_node.str_val);
 		return;
 	}
-	if ( si->type != PHP_SCOPE_FUNC) {
-		//
-		// Error: defined, but wrong type !
-		//
+	if (si->type != PHP_SCOPE_FUNC) {
+		// Error: defined, but the wrong type
 		php_report_error(PHP_ERROR, "Item  %s  is not a function", l_node->val_node.str_val);
 		return;
 	}
 	PHP_SYN_NODE *func = si->func;
-	if ( func->type != PHP_ST_FUNC_DECL ) {
-		//
-		// Internal error: node not a function
-		//
+	if (func->type != PHP_ST_FUNC_DECL) {
+		// Internal error: node is not a function
 		php_report_error(PHP_INTERNAL_ERROR, "Wrong type in function decl node");
 		return;
 	}
 
-	//
-	// Switch stack and call function
-	//
+	// Switch stack and call the function
 
 	PHP_SYN_FUNC_DECL_NODE *func_decl = func->func_decl;
 
 	std::map<std::string, PHP_VAR_NODE *> saved_vars;
-	func_scope_init(func_decl->params, func_decl->param_count,
+	func_scope_init(func_decl->params,
+		func_decl->param_count,
 		(PHP_SCOPE_TABLE_TYPE *)func_decl->scope,
-		&r_node->var_node->value, saved_vars);
+		&r_node->var_node->value,
+		saved_vars);
 
 	switch_push_scope_table((PHP_SCOPE_TABLE_TYPE *)func_decl->scope);
 
-	if ( func_decl->is_native ) {
+	if (func_decl->is_native) {
 		func_decl->native_ptr(result);
 	} else {
 		php_execute(func_decl->code, result);
 	}
 
-	//
 	// restore stack, free arg list
-	//
 	switch_pop_scope_table(0);
-	func_scope_copy_back(func_decl->params, func_decl->param_count,
-		(PHP_SCOPE_TABLE_TYPE *)func_decl->scope, &r_node->var_node->value, saved_vars);
-
-	//scope_reset_nonstatics(func_decl->scope);
+	func_scope_copy_back(func_decl->params,
+		func_decl->param_count,
+		(PHP_SCOPE_TABLE_TYPE *)func_decl->scope,
+		&r_node->var_node->value,
+		saved_vars);
 
+	// scope_reset_nonstatics(func_decl->scope);
 }
 
 /*
- * Theoretically speaking this function must run on generated code. On the
- * practical side - I need it to debug syntax tree generation. Later, it can
- * be changes to generate code for some kind of bytecode for stack machine
+ * Theoretically this should run on generated code; practically it is here to debug syntax tree
+ * generation. It could later generate bytecode for some kind of stack machine.
  */
 int php_execute(PHP_SYN_NODE *node, PHP_VALUE_NODE *result)
 {
-	if ( !node ) {
+	if (!node) {
 		return 0;
 	}
-	while ( node ) {
+	while (node) {
 		int curr_exec_result = 0;
 		PHP_VALUE_NODE cond_result;
 		cond_result.type = PHP_VAL_NONE;
 		switch (node->type) {
-			case PHP_ST_EXPR:
-				php_expr_eval(node->node_expr, 0);
-				break;
-			case PHP_ST_IF:
-				php_expr_eval(node->node_if.cond, &cond_result);
-				cast_value_bool(&cond_result);
-				if ( cond_result.int_val ) {
-					if ( node->node_if.code_if ) {
-						curr_exec_result = php_execute(node->node_if.code_if, result);
-					}
-				} else {
-					if ( node->node_if.code_else ) {
-						curr_exec_result = php_execute(node->node_if.code_else, result);
-					}
+		case PHP_ST_EXPR:
+			php_expr_eval(node->node_expr, 0);
+			break;
+		case PHP_ST_IF:
+			php_expr_eval(node->node_if.cond, &cond_result);
+			cast_value_bool(&cond_result);
+			if (cond_result.int_val) {
+				if (node->node_if.code_if) {
+					curr_exec_result = php_execute(node->node_if.code_if, result);
 				}
-				break;
-			case PHP_ST_RET:
-				if (  node->node_expr ) {
-					php_expr_eval(node->node_expr, result);
+			} else {
+				if (node->node_if.code_else) {
+					curr_exec_result = php_execute(node->node_if.code_else, result);
 				}
-				if ( node->next_node ) {
-					//
-					// Warning: code after "return" statement
-					//
-					php_report_error(PHP_WARNING, "code after 'return'");
+			}
+			break;
+		case PHP_ST_RET:
+			if (node->node_expr) {
+				php_expr_eval(node->node_expr, result);
+			}
+			if (node->next_node) {
+				// Warning: code after a "return" statement
+				php_report_error(PHP_WARNING, "code after 'return'");
+			}
+			// "return" is ultimate "break"
+			curr_exec_result = -0xffff;
+			break;
+		case PHP_ST_ECHO: {
+			PHP_EXP_NODE *curr = node->node_expr;
+			while (curr) {
+				php_expr_eval(curr->exp_node, &cond_result);
+				cast_value_str(&cond_result);
+				CPhPLibContext::Print(cond_result.str_val);
+				value_value_free(&cond_result);
+				curr = curr->next;
+			}
+		} break;
+		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 = -(int)(cond_result.int_val);
+			} else {
+				curr_exec_result = cond_result.int_val;
+			}
+			break;
+
+		case PHP_ST_WHILE:
+		case PHP_ST_DO_WHILE:
+			if (node->type == PHP_ST_WHILE) {
+				php_expr_eval(node->node_while.cond, &cond_result);
+				cast_value_bool(&cond_result);
+			} else {
+				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;
 				}
-				// "return" is ultimate "break"
-				curr_exec_result = -0xffff;
-				break;
-			case PHP_ST_ECHO: {
-					PHP_EXP_NODE *curr = node->node_expr;
-					while (curr) {
-						php_expr_eval(curr->exp_node, &cond_result);
-						cast_value_str(&cond_result);
-						CPhPLibContext::Print(cond_result.str_val);
-						value_value_free(&cond_result);
-						curr = curr->next;
-					}
+				// 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);
 				}
-				break;
-			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;
+				// 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;
 				}
-				cast_value_dnum(&cond_result);
-				if ( node->type == PHP_ST_BREAK ) {
-					curr_exec_result = -(int)(cond_result.int_val);
-				} else {
-					curr_exec_result = cond_result.int_val;
+			}
+			break;
+		case PHP_ST_FOR:
+			php_expr_eval(node->node_for.do_start, &cond_result);
+			php_expr_eval(node->node_for.cond, &cond_result);
+			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;
 				}
-				break;
-
-			case PHP_ST_WHILE:
-			case PHP_ST_DO_WHILE:
-				if ( node->type == PHP_ST_WHILE ) {
-					php_expr_eval(node->node_while.cond, &cond_result);
+				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);
-				} else {
-					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;
-					}
+				if (curr_exec_result > 1) {
+					curr_exec_result--;
+					break;
 				}
+			}
+			break;
+		case PHP_ST_FOREACH: {
+			PHP_VAR_NODE *elems = php_expr_eval_lvalue(node->node_foreach.elems);
+			if (!elems || (elems->value.type != PHP_VAL_ARRAY)) {
+				php_report_error(PHP_ERROR, "Argument of 'foreach' must be array");
 				break;
-			case PHP_ST_FOR:
-				php_expr_eval(node->node_for.do_start, &cond_result);
-				php_expr_eval(node->node_for.cond, &cond_result);
-				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_ARRAY_TYPE *array = (PHP_ARRAY_TYPE *)elems->value.ptr_val;
+			PHP_SCOPE_ITEM *i_key = node->node_foreach.i_key;
+			// keys in array are string values.
+			if (i_key) {
+				i_key->var->value.type = PHP_VAL_STRING;
+			}
+			PHP_SCOPE_ITEM *i_val = node->node_foreach.i_val;
+			array->current = array->sorted_keys.begin();
+			while (array->current != array->sorted_keys.end()) {
+				if (i_key) {
+					PHP_VALUE_NODE tmp_val;
+					tmp_val.type = PHP_VAL_STRING;
+					tmp_val.str_val = (char *)array->current->c_str();
+					value_value_assign(&i_key->var->value, &tmp_val);
 				}
-				break;
-			case PHP_ST_FOREACH: {
-					PHP_VAR_NODE *elems = php_expr_eval_lvalue(node->node_foreach.elems);
-					if ( !elems || (elems->value.type != PHP_VAL_ARRAY) ) {
-						php_report_error(PHP_ERROR, "Argument of 'foreach' must be array");
-						break;
-					}
-					PHP_ARRAY_TYPE *array = (PHP_ARRAY_TYPE *)elems->value.ptr_val;
-					PHP_SCOPE_ITEM *i_key = node->node_foreach.i_key;
-					// keys in array are string values.
-					if ( i_key ) {
-						i_key->var->value.type = PHP_VAL_STRING;
-					}
-					PHP_SCOPE_ITEM *i_val = node->node_foreach.i_val;
-					array->current = array->sorted_keys.begin();
-					while ( array->current != array->sorted_keys.end() ) {
-						if ( i_key ) {
-							PHP_VALUE_NODE tmp_val;
-							tmp_val.type = PHP_VAL_STRING;
-							tmp_val.str_val = (char *)array->current->c_str();
-							value_value_assign(&i_key->var->value, &tmp_val);
-						}
-						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);
-						}
-						if ( node->node_foreach.byref ) {
-							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;
-						}
-					}
+				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);
 				}
-				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 = static_cast<PHP_SYN_NODE *>(curr->exp_node->tree_node.syn_right);
-							break;
-						}
-						curr = curr->next;
-					}
-					if ( cur_exec ) {
-						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--;
-					}
+				if (node->node_foreach.byref) {
+					value_value_assign(curr_value, &i_val->var->value);
 				}
-				break;
-			default: ;
+				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;
+				}
+			}
+		} 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 = static_cast<PHP_SYN_NODE *>(
+						curr->exp_node->tree_node.syn_right);
+					break;
+				}
+				curr = curr->next;
+			}
+			if (cur_exec) {
+				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;
+		default:;
 		}
-		if ( curr_exec_result ) {
+		if (curr_exec_result) {
 			return curr_exec_result;
 		}
 		node = node->next_node;
@@ -2046,35 +2037,27 @@
 	return 0;
 }
 
-
-//
-// call it when something gone wrong
-//
+// call it when something has gone wrong
 void php_report_error(PHP_MSG_TYPE err_type, const char *msg, ...)
 {
-	//
-	// hope my error message will never be that big.
-	//
-	// security is ok, since _user_ errors are not reporting thru
-	// this function, but handled by script itself.
-	// However, badly written script MAY force user-supplied data to
-	// leak here and create stack overrun exploit. Be warned.
-	//
+	// Hopefully an error message is never this big. Security is fine, since _user_ errors are not
+	// reported through this function but handled by the script itself -- though a badly written
+	// script MAY force user-supplied data to leak here and create a stack overrun exploit.
 	char msgbuf1024;
 	const char *type_msg = 0;
-	switch(err_type) {
-		case PHP_MESSAGE:
-			type_msg = "PHP:";
-			break;
-		case PHP_WARNING:
-			type_msg = "PHP Warning:";
-			break;
-		case PHP_ERROR:
-			type_msg = "PHP Error:";
-			break;
-		case PHP_INTERNAL_ERROR:
-			type_msg = "PHP Internal Error:";
-			break;
+	switch (err_type) {
+	case PHP_MESSAGE:
+		type_msg = "PHP:";
+		break;
+	case PHP_WARNING:
+		type_msg = "PHP Warning:";
+		break;
+	case PHP_ERROR:
+		type_msg = "PHP Error:";
+		break;
+	case PHP_INTERNAL_ERROR:
+		type_msg = "PHP Internal Error:";
+		break;
 	}
 
 	va_list args;
@@ -2086,7 +2069,6 @@
 	assert(err_type != PHP_INTERNAL_ERROR);
 }
 
-
 int phperror(char *s)
 {
 	printf("ERROR in grammar %s after %s near line %d\n", s, phptext, phplineno);

amule-3.0.1.tar.gz/src/webserver/src/php_syntree.h -> amule-3.1.0.tar.gz/src/webserver/src/php_syntree.h Changed

@@ -23,15 +23,13 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-/*
- * Syntax tree implementation for amule-PHP interpreter.
- */
+/* Syntax tree implementation for the amule-PHP interpreter. */
 
 #ifndef _PHP_SYNTREE_H_
 #define _PHP_SYNTREE_H_
 
 #ifndef __STDC_FORMAT_MACROS
-	#define __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
 #endif
 
 #ifdef _MSC_VER
@@ -42,133 +40,172 @@
 #endif
 
 #if !defined PRIu64
-# if defined(__alpha__) || defined(__ia64__) || defined(__ppc64__) || defined(__x86_64__) \
- || defined(__mips64__) || defined(__hppa64__) || defined(__sparc64__) || defined(__loongarch64)
-#  define PRIu64 "lu"
-# else
-#  define PRIu64 "llu"
-# endif
+#if defined(__alpha__) || defined(__ia64__) || defined(__ppc64__) || defined(__x86_64__) || \
+	defined(__mips64__) || defined(__hppa64__) || defined(__sparc64__) || defined(__loongarch64)
+#define PRIu64 "lu"
+#else
+#define PRIu64 "llu"
+#endif
 #endif
 
-typedef enum PHP_VALUE_TYPE {
+typedef enum PHP_VALUE_TYPE
+{
 	/* simple values */
-	PHP_VAL_NONE, PHP_VAL_INT, PHP_VAL_FLOAT, PHP_VAL_STRING, PHP_VAL_BOOL,
+	PHP_VAL_NONE,
+	PHP_VAL_INT,
+	PHP_VAL_FLOAT,
+	PHP_VAL_STRING,
+	PHP_VAL_BOOL,
 	/* both point to same map<string, var> but meaning is different */
-	PHP_VAL_ARRAY, PHP_VAL_OBJECT,
+	PHP_VAL_ARRAY,
+	PHP_VAL_OBJECT,
 	/* Internally used (not ref counted) data */
 	PHP_VAL_INT_DATA,
 	/* ptr_val points to VAR_NODE */
 	PHP_VAL_VAR_NODE
 } PHP_VALUE_TYPE;
 
-typedef struct PHP_VALUE_NODE {
-    PHP_VALUE_TYPE type;
-    union {
-        uint64_t int_val;
-        double float_val;
-        char *str_val;
-        /* used for arrays and internal objects:
-         * * array contain std::map of key:value pairs
-         * * object contain internally interpreted data
-         */
-        void *ptr_val;
-        struct {
-            void *inst_ptr;
-            const char *class_name;
-        } obj_val;
-    };
+typedef struct PHP_VALUE_NODE
+{
+	PHP_VALUE_TYPE type;
+	union
+	{
+		uint64_t int_val;
+		double float_val;
+		char *str_val;
+		/* For arrays and internal objects: an array holds a std::map of key:value pairs, an object
+		 * holds internally interpreted data. */
+		void *ptr_val;
+		struct
+		{
+			void *inst_ptr;
+			const char *class_name;
+		} obj_val;
+	};
 } PHP_VALUE_NODE;
 
-/*
- * Flags for different variable types/usages
- */
+/* Flags for different variable types/usages */
 
-#define PHP_VARFLAG_STATIC		0x0001
-#define PHP_VARFLAG_GLOBAL		0x0002
-#define PHP_VARFLAG_BYREF		0x0004
+#define PHP_VARFLAG_STATIC 0x0001
+#define PHP_VARFLAG_GLOBAL 0x0002
+#define PHP_VARFLAG_BYREF 0x0004
 
-/*
-  Data about variable.
-*/
-typedef struct PHP_VAR_NODE {
-    PHP_VALUE_NODE value;
-    /* php support references */
-    int ref_count;
-    int flags;
+/* Data about a variable. */
+typedef struct PHP_VAR_NODE
+{
+	PHP_VALUE_NODE value;
+	/* php support references */
+	int ref_count;
+	int flags;
 } PHP_VAR_NODE;
 
+/* Node in an expression tree: either (left op right) or (value). */
+typedef enum PHP_EXP_OP
+{
+	PHP_OP_VAR,
+	PHP_OP_VAL,
+	PHP_OP_ASS,
 
-/*
- Node in expression tree. Contain either (left op right) or (value)
-*/
-typedef enum PHP_EXP_OP {
-    PHP_OP_VAR, PHP_OP_VAL, PHP_OP_ASS,
-
-    /* dereference */
-    PHP_OP_ARRAY_BY_KEY, PHP_OP_VAR_BY_EXP,
+	/* dereference */
+	PHP_OP_ARRAY_BY_KEY,
+	PHP_OP_VAR_BY_EXP,
 
 	/* array construct */
-	PHP_OP_ARRAY, PHP_OP_ARRAY_PAIR, PHP_OP_ARRAY_REF_PAIR,
+	PHP_OP_ARRAY,
+	PHP_OP_ARRAY_PAIR,
+	PHP_OP_ARRAY_REF_PAIR,
 
 	/* object access "->" and "::" */
-	PHP_OP_OBJECT_DEREF, PHP_OP_CLASS_DEREF,
+	PHP_OP_OBJECT_DEREF,
+	PHP_OP_CLASS_DEREF,
 
 	/* casting */
-	PHP_OP_CAST_INT, PHP_OP_CAST_FLOAT, PHP_OP_CAST_BOOL, PHP_OP_CAST_STR,
-
-    /* arithmetics */
-    PHP_OP_MUL, PHP_OP_DIV, PHP_OP_ADD, PHP_OP_SUB, PHP_OP_REM,
-    /* str concat */
-    PHP_OP_CAT,
-    /* bits */
-    PHP_OP_SHL, PHP_OP_SHR, PHP_OP_OR, PHP_OP_AND, PHP_OP_XOR, PHP_OP_NOT,
-    /* logical */
-    PHP_OP_LOG_OR, PHP_OP_LOG_AND, PHP_OP_LOG_XOR, PHP_OP_LOG_NOT,
-    /* compare */
-    PHP_OP_EQ, PHP_OP_NEQ, PHP_OP_SAME, PHP_OP_NOT_SAME,
-    PHP_OP_GRT, PHP_OP_GRT_EQ, PHP_OP_LWR, PHP_OP_LWR_EQ,
+	PHP_OP_CAST_INT,
+	PHP_OP_CAST_FLOAT,
+	PHP_OP_CAST_BOOL,
+	PHP_OP_CAST_STR,
+
+	/* arithmetics */
+	PHP_OP_MUL,
+	PHP_OP_DIV,
+	PHP_OP_ADD,
+	PHP_OP_SUB,
+	PHP_OP_REM,
+	/* str concat */
+	PHP_OP_CAT,
+	/* bits */
+	PHP_OP_SHL,
+	PHP_OP_SHR,
+	PHP_OP_OR,
+	PHP_OP_AND,
+	PHP_OP_XOR,
+	PHP_OP_NOT,
+	/* logical */
+	PHP_OP_LOG_OR,
+	PHP_OP_LOG_AND,
+	PHP_OP_LOG_XOR,
+	PHP_OP_LOG_NOT,
+	/* compare */
+	PHP_OP_EQ,
+	PHP_OP_NEQ,
+	PHP_OP_SAME,
+	PHP_OP_NOT_SAME,
+	PHP_OP_GRT,
+	PHP_OP_GRT_EQ,
+	PHP_OP_LWR,
+	PHP_OP_LWR_EQ,
 
 	/* conditional assign (mux) */
 	PHP_OP_MUX,
 
 	/* specials */
-	PHP_OP_FUNC_CALL, PHP_OP_PRINT, PHP_OP_ECHO, PHP_MAKE_REF,
+	PHP_OP_FUNC_CALL,
+	PHP_OP_PRINT,
+	PHP_OP_ECHO,
+	PHP_MAKE_REF,
 	/* list of expressions */
 	PHP_OP_LIST,
 	/* for "switch" list of cases */
 	PHP_OP_CASE
 } PHP_EXP_OP;
 
-struct PHP_EXP_NODE {
-    PHP_EXP_OP op;
-    union {
-        struct {
-            struct PHP_EXP_NODE *left;
-            /* In the 'switch' statement expression points
-             * to beginning of code*/
-            union {
-                struct PHP_EXP_NODE *right;
-                struct PHP_SYN_NODE *syn_right;
-            };
-        } tree_node;
-        struct PHP_EXP_NODE *next;
-    };
-    union {
-        PHP_VALUE_NODE val_node;
-        // for "internal" variables, like function param list
-        PHP_VAR_NODE *var_node;
-        struct PHP_SCOPE_ITEM *var_si_node;
-        struct PHP_EXP_NODE *exp_node;
-    };
+struct PHP_EXP_NODE
+{
+	PHP_EXP_OP op;
+	union
+	{
+		struct
+		{
+			struct PHP_EXP_NODE *left;
+			/* In the 'switch' statement expression points
+			 * to beginning of code*/
+			union
+			{
+				struct PHP_EXP_NODE *right;
+				struct PHP_SYN_NODE *syn_right;
+			};
+		} tree_node;
+		struct PHP_EXP_NODE *next;
+	};
+	union
+	{
+		PHP_VALUE_NODE val_node;
+		// for "internal" variables, like function param list
+		PHP_VAR_NODE *var_node;
+		struct PHP_SCOPE_ITEM *var_si_node;
+		struct PHP_EXP_NODE *exp_node;
+	};
 };
 
 typedef struct PHP_EXP_NODE PHP_EXP_NODE;
 
 typedef struct PHP_LIST_ASSIGN_NODE PHP_LIST_ASSIGN_NODE;
 
-struct PHP_LIST_ASSIGN_NODE {
+struct PHP_LIST_ASSIGN_NODE
+{
 	int is_list;
-	union {
+	union
+	{
 		PHP_VAR_NODE *var;
 		PHP_LIST_ASSIGN_NODE *list;
 	};
@@ -177,7 +214,8 @@
 
 typedef struct PHP_FUNC_PARAM_ITEM PHP_FUNC_PARAM_ITEM;
 
-struct PHP_FUNC_PARAM_ITEM {
+struct PHP_FUNC_PARAM_ITEM
+{
 	char *name;
 	char *class_name;
 	int byref;
@@ -187,29 +225,30 @@
 typedef struct PHP_SYN_NODE PHP_SYN_NODE;
 
 /*
- * Scope table: holding variable definition and declarations for
- * functions and classes
- * Can be present in several locations:
- *  1. Representing stack frame block, inside of called function
- *  2. As global scope - holder of global vars, classes and global functions
- *  3. At class scope - holder of class members
- *  4. Copied to class instanse
- *
+ * Scope table, holding variable definitions and declarations for functions and classes. It appears
+ * in several places: as a stack-frame block inside a called function, as the global scope holding
+ * global vars, classes and functions, at class scope holding class members, and copied into a
+ * class instance.
  */
-typedef enum PHP_SCOPE_ITEM_TYPE {
+typedef enum PHP_SCOPE_ITEM_TYPE
+{
 	PHP_SCOPE_NONE,
-	PHP_SCOPE_VAR, PHP_SCOPE_FUNC, PHP_SCOPE_CLASS,
+	PHP_SCOPE_VAR,
+	PHP_SCOPE_FUNC,
+	PHP_SCOPE_CLASS,
 	PHP_SCOPE_PARAM
 } PHP_SCOPE_ITEM_TYPE;
 
-
-typedef struct PHP_SCOPE_ITEM {
+typedef struct PHP_SCOPE_ITEM
+{
 	PHP_SCOPE_ITEM_TYPE type;
-	union {
+	union
+	{
 		PHP_VAR_NODE *var;
 		PHP_SYN_NODE *func;
 		PHP_SYN_NODE *class_decl;
-		struct {
+		struct
+		{
 			PHP_VAR_NODE *var;
 			int num;
 		} param;
@@ -220,71 +259,82 @@
 typedef void *PHP_SCOPE_TABLE;
 typedef void *PHP_SCOPE_STACK;
 
-/*
- Syntax tree node, representing 1 statement.
-*/
-typedef enum PHP_STATEMENT_TYPE {
-	PHP_ST_EXPR, PHP_ST_IF,
-	PHP_ST_WHILE, PHP_ST_DO_WHILE, PHP_ST_FOR, PHP_ST_FOREACH, PHP_ST_SWITCH,
-	PHP_ST_CONTINUE, PHP_ST_BREAK, PHP_ST_RET,
-	PHP_ST_FUNC_DECL, PHP_ST_CLASS_DECL,
+/* Syntax tree node, representing one statement. */
+typedef enum PHP_STATEMENT_TYPE
+{
+	PHP_ST_EXPR,
+	PHP_ST_IF,
+	PHP_ST_WHILE,
+	PHP_ST_DO_WHILE,
+	PHP_ST_FOR,
+	PHP_ST_FOREACH,
+	PHP_ST_SWITCH,
+	PHP_ST_CONTINUE,
+	PHP_ST_BREAK,
+	PHP_ST_RET,
+	PHP_ST_FUNC_DECL,
+	PHP_ST_CLASS_DECL,
 	PHP_ST_ECHO
 } PHP_STATEMENT_TYPE;
 
-/*
- * Syntax tree constructs: regular statements and declarations
- */
-typedef struct PHP_SYN_IF_NODE {
-    PHP_EXP_NODE *cond;
-    PHP_SYN_NODE *code_if, *code_else;
+/* Syntax tree constructs: regular statements and declarations */
+typedef struct PHP_SYN_IF_NODE
+{
+	PHP_EXP_NODE *cond;
+	PHP_SYN_NODE *code_if, *code_else;
 } PHP_SYN_IF_NODE;
 
-typedef struct PHP_SYN_WHILE_NODE {
-    PHP_EXP_NODE *cond;
-    PHP_SYN_NODE *code;
+typedef struct PHP_SYN_WHILE_NODE
+{
+	PHP_EXP_NODE *cond;
+	PHP_SYN_NODE *code;
 } PHP_SYN_WHILE_NODE;
 
-typedef struct PHP_SYN_FOR_NODE {
-    PHP_EXP_NODE *do_start, *cond, *do_next;
-    PHP_SYN_NODE *code;
+typedef struct PHP_SYN_FOR_NODE
+{
+	PHP_EXP_NODE *do_start, *cond, *do_next;
+	PHP_SYN_NODE *code;
 } PHP_SYN_FOR_NODE;
 
-typedef struct PHP_SYN_FOREACH_NODE {
-    PHP_EXP_NODE *elems;
+typedef struct PHP_SYN_FOREACH_NODE
+{
+	PHP_EXP_NODE *elems;
 	PHP_SCOPE_ITEM *i_key;
 	PHP_SCOPE_ITEM *i_val;
-    PHP_SYN_NODE *code;
-    int byref;
+	PHP_SYN_NODE *code;
+	int byref;
 } PHP_SYN_FOREACH_NODE;
 
-typedef struct PHP_SYN_SWITCH_NODE {
-    PHP_EXP_NODE *cond;
-    PHP_EXP_NODE *case_list;
+typedef struct PHP_SYN_SWITCH_NODE
+{
+	PHP_EXP_NODE *cond;
+	PHP_EXP_NODE *case_list;
 } PHP_SYN_SWITCH_NODE;
 
 /* for built-in or native functions */
 typedef void (*PHP_NATIVE_FUNC_PTR)(PHP_VALUE_NODE *result);
 
-typedef struct PHP_FUNC_PARAM_DEF {
+typedef struct PHP_FUNC_PARAM_DEF
+{
 	char *class_name;
 	int byref;
 	PHP_VALUE_NODE def_value;
 	/*
-	 * In PHP, user can choose per-call whether parameter is passed
-	 * by value of by reference. So, save ptr to original varnode,
-	 * for "byvalue" case since we don't have other lvalue to put in
-	 * that scope item.
+	 * In PHP the caller chooses per call whether a parameter is passed by value or by reference,
+	 * so keep a ptr to the original varnode for the "byvalue" case: there is no other lvalue to
+	 * put in that scope item.
 	 */
 	PHP_VAR_NODE *var;
 	PHP_SCOPE_ITEM *si_var;
 } PHP_FUNC_PARAM_DEF;
 
-
-typedef struct PHP_SYN_FUNC_DECL_NODE {
+typedef struct PHP_SYN_FUNC_DECL_NODE
+{
 	char *name;
 	PHP_SCOPE_TABLE scope;
 	int is_native;
-	union {
+	union
+	{
 		PHP_SYN_NODE *code;
 		PHP_NATIVE_FUNC_PTR native_ptr;
 	};
@@ -292,244 +342,227 @@
 	PHP_FUNC_PARAM_DEF *params;
 } PHP_SYN_FUNC_DECL_NODE;
 
-/*
- * Evaluating $obj->some_field for built-in objects
- */
+/* Evaluating $obj->some_field for built-in objects */
 typedef void (*PHP_NATIVE_PROP_GET_FUNC_PTR)(void *obj, char *prop_name, PHP_VALUE_NODE *result);
 
-typedef struct PHP_SYN_CLASS_DECL_NODE {
+typedef struct PHP_SYN_CLASS_DECL_NODE
+{
 	int is_native;
 	char *name;
-	union {
+	union
+	{
 		PHP_SCOPE_TABLE decl_scope;
 		PHP_NATIVE_PROP_GET_FUNC_PTR native_prop_get_ptr;
 	};
 } PHP_SYN_CLASS_DECL_NODE;
 
-struct PHP_SYN_NODE {
-    PHP_STATEMENT_TYPE type;
-    union {
-        PHP_EXP_NODE			*node_expr;
-        PHP_SYN_IF_NODE			node_if;
-        PHP_SYN_WHILE_NODE		node_while;
-        PHP_SYN_FOREACH_NODE	node_foreach;
-        PHP_SYN_FOR_NODE		node_for;
-        PHP_SYN_SWITCH_NODE		node_switch;
-        PHP_SYN_FUNC_DECL_NODE	*func_decl;
-        PHP_SYN_CLASS_DECL_NODE *class_decl;
-    };
-    PHP_SYN_NODE *next_node;
+struct PHP_SYN_NODE
+{
+	PHP_STATEMENT_TYPE type;
+	union
+	{
+		PHP_EXP_NODE *node_expr;
+		PHP_SYN_IF_NODE node_if;
+		PHP_SYN_WHILE_NODE node_while;
+		PHP_SYN_FOREACH_NODE node_foreach;
+		PHP_SYN_FOR_NODE node_for;
+		PHP_SYN_SWITCH_NODE node_switch;
+		PHP_SYN_FUNC_DECL_NODE *func_decl;
+		PHP_SYN_CLASS_DECL_NODE *class_decl;
+	};
+	PHP_SYN_NODE *next_node;
 };
 
 /*
- * Interface to lib of built-in functions, classes, variables
+ * Interface to the library of built-in functions, classes and variables. A fixed-size array
+ * allows "in-place" definition of built-in functions without a pointer mess.
  */
-/*
- * Using fixed size array will allow "in-place" definition
- * of built-in functions without pointer mess.
- *
- */
-#define PHP_MAX_FUNC_PARAM	 16
+#define PHP_MAX_FUNC_PARAM 16
 
-typedef struct PHP_BLTIN_FUNC_DEF {
+typedef struct PHP_BLTIN_FUNC_DEF
+{
 	const char *name;
 	int param_count;
 	PHP_NATIVE_FUNC_PTR func;
 } PHP_BLTIN_FUNC_DEF;
 
-typedef enum PHP_MSG_TYPE {
-	PHP_MESSAGE, PHP_WARNING, PHP_ERROR, PHP_INTERNAL_ERROR
+typedef enum PHP_MSG_TYPE
+{
+	PHP_MESSAGE,
+	PHP_WARNING,
+	PHP_ERROR,
+	PHP_INTERNAL_ERROR
 } PHP_MSG_TYPE;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*
- * lex/yacc stuff
- */
-	int phperror(char *err);
-	int phpparse(void);
+/* lex/yacc stuff */
+int phperror(char *err);
+int phpparse(void);
 
-	extern int pphdebug;
-	extern FILE *phpin;
-	extern char *phptext;
-	extern int phplineno;
+extern int pphdebug;
+extern FILE *phpin;
+extern char *phptext;
+extern int phplineno;
 
-/*
- * Syntax tree interface to parser
- */
+/* Syntax tree interface to the parser */
 
-/*
- * Const expressions
- */
-	PHP_EXP_NODE *make_const_exp_dnum(int number);
-	PHP_EXP_NODE *make_const_exp_fnum(float number);
-	PHP_EXP_NODE *make_const_exp_str(char *s, int unescape);
-
-	// exp node for internally handled data
-	PHP_EXP_NODE *make_const_exp_int_obj(void *obj);
+/* Const expressions */
+PHP_EXP_NODE *make_const_exp_dnum(int number);
+PHP_EXP_NODE *make_const_exp_fnum(float number);
+PHP_EXP_NODE *make_const_exp_str(char *s, int unescape);
 
-	/* casting functions */
-	void cast_value_dnum(PHP_VALUE_NODE *e);
-	void cast_value_fnum(PHP_VALUE_NODE *e);
-	void cast_value_str(PHP_VALUE_NODE *e);
-	void cast_value_array(PHP_VALUE_NODE *e);
-	void cast_value_bool(PHP_VALUE_NODE *e);
+// exp node for internally handled data
+PHP_EXP_NODE *make_const_exp_int_obj(void *obj);
 
-	void value_value_free(PHP_VALUE_NODE *val);
-	void value_value_assign(PHP_VALUE_NODE *src, PHP_VALUE_NODE *dst);
-	void var_node_free(PHP_VAR_NODE *var);
+/* casting functions */
+void cast_value_dnum(PHP_VALUE_NODE *e);
+void cast_value_fnum(PHP_VALUE_NODE *e);
+void cast_value_str(PHP_VALUE_NODE *e);
+void cast_value_array(PHP_VALUE_NODE *e);
+void cast_value_bool(PHP_VALUE_NODE *e);
 
-	/* array operations */
-	PHP_VAR_NODE *array_get_by_key(PHP_VALUE_NODE *array, PHP_VALUE_NODE *key);
-	PHP_VAR_NODE *array_get_by_int_key(PHP_VALUE_NODE *array, int key);
+void value_value_free(PHP_VALUE_NODE *val);
+void value_value_assign(PHP_VALUE_NODE *src, PHP_VALUE_NODE *dst);
+void var_node_free(PHP_VAR_NODE *var);
 
-	int array_is_key_here(PHP_VALUE_NODE *array, PHP_VALUE_NODE *key);
-	int array_get_size(PHP_VALUE_NODE *array);
-	PHP_VAR_NODE *array_push_back(PHP_VALUE_NODE *array);
+/* array operations */
+PHP_VAR_NODE *array_get_by_key(PHP_VALUE_NODE *array, PHP_VALUE_NODE *key);
+PHP_VAR_NODE *array_get_by_int_key(PHP_VALUE_NODE *array, int key);
 
-	void array_add_to_int_key(PHP_VALUE_NODE *array, int key, PHP_VAR_NODE *node);
-	void array_set_by_key(PHP_VALUE_NODE *array, PHP_VALUE_NODE *key, PHP_VAR_NODE *node);
+int array_is_key_here(PHP_VALUE_NODE *array, PHP_VALUE_NODE *key);
+int array_get_size(PHP_VALUE_NODE *array);
+PHP_VAR_NODE *array_push_back(PHP_VALUE_NODE *array);
 
-	PHP_VAR_NODE *make_array_var(void);
+void array_add_to_int_key(PHP_VALUE_NODE *array, int key, PHP_VAR_NODE *node);
+void array_set_by_key(PHP_VALUE_NODE *array, PHP_VALUE_NODE *key, PHP_VAR_NODE *node);
 
-	// single operand expression:
-	// FIXME: prefix and postfix form not recognized
-	PHP_EXP_NODE *make_exp_1(PHP_EXP_OP op, PHP_EXP_NODE *operand);
+PHP_VAR_NODE *make_array_var(void);
 
-	PHP_EXP_NODE *make_exp_2(PHP_EXP_OP op, PHP_EXP_NODE *left, PHP_EXP_NODE *right);
+// single operand expression:
+// FIXME: prefix and postfix form not recognized
+PHP_EXP_NODE *make_exp_1(PHP_EXP_OP op, PHP_EXP_NODE *operand);
 
-	// this is for "OP=" forms
-	PHP_EXP_NODE *make_exp_2_self(PHP_EXP_OP op, PHP_EXP_NODE *self, PHP_EXP_NODE *right);
+PHP_EXP_NODE *make_exp_2(PHP_EXP_OP op, PHP_EXP_NODE *left, PHP_EXP_NODE *right);
 
-	PHP_EXP_NODE *make_known_const(char *name);
+// this is for "OP=" forms
+PHP_EXP_NODE *make_exp_2_self(PHP_EXP_OP op, PHP_EXP_NODE *self, PHP_EXP_NODE *right);
 
-	PHP_EXP_NODE *make_func_call_exp(char *func_name, PHP_EXP_NODE *args);
+PHP_EXP_NODE *make_known_const(char *name);
 
-	// create func call param list
-	PHP_EXP_NODE *make_func_call_param_list(void);
+PHP_EXP_NODE *make_func_call_exp(char *func_name, PHP_EXP_NODE *args);
 
-	// add next argument to function call param list
-	void func_call_add_expr(PHP_VAR_NODE *paramlist, PHP_EXP_NODE *arg, int byref);
+// create func call param list
+PHP_EXP_NODE *make_func_call_param_list(void);
 
+// add next argument to function call param list
+void func_call_add_expr(PHP_VAR_NODE *paramlist, PHP_EXP_NODE *arg, int byref);
 
-	extern PHP_SYN_NODE *g_syn_tree_top;
+extern PHP_SYN_NODE *g_syn_tree_top;
 
-	/* make syntax node for expression */
-	PHP_SYN_NODE *make_expr_syn_node(PHP_STATEMENT_TYPE type, PHP_EXP_NODE *node);
+/* make syntax node for expression */
+PHP_SYN_NODE *make_expr_syn_node(PHP_STATEMENT_TYPE type, PHP_EXP_NODE *node);
 
-	PHP_SYN_NODE *make_ifelse_syn_node(PHP_EXP_NODE *expr,
-		PHP_SYN_NODE *then_node, PHP_SYN_NODE *elseif_list, PHP_SYN_NODE *else_node);
+PHP_SYN_NODE *make_ifelse_syn_node(
+	PHP_EXP_NODE *expr, PHP_SYN_NODE *then_node, PHP_SYN_NODE *elseif_list, PHP_SYN_NODE *else_node);
 
-	PHP_SYN_NODE *make_while_loop_syn_node(PHP_EXP_NODE *cond,
-		PHP_SYN_NODE *code, int do_while);
+PHP_SYN_NODE *make_while_loop_syn_node(PHP_EXP_NODE *cond, PHP_SYN_NODE *code, int do_while);
 
-	PHP_SYN_NODE *make_foreach_loop_syn_node(PHP_EXP_NODE *elems,
-		PHP_EXP_NODE *i_key, PHP_EXP_NODE *i_val, PHP_SYN_NODE *code, int byref);
+PHP_SYN_NODE *make_foreach_loop_syn_node(
+	PHP_EXP_NODE *elems, PHP_EXP_NODE *i_key, PHP_EXP_NODE *i_val, PHP_SYN_NODE *code, int byref);
 
-	PHP_SYN_NODE *make_for_syn_node(PHP_EXP_NODE *start, PHP_EXP_NODE *cond,
-		PHP_EXP_NODE *next, PHP_SYN_NODE *code);
+PHP_SYN_NODE *make_for_syn_node(
+	PHP_EXP_NODE *start, PHP_EXP_NODE *cond, PHP_EXP_NODE *next, PHP_SYN_NODE *code);
 
-	PHP_SYN_NODE *make_class_decl_syn_node(void);
+PHP_SYN_NODE *make_class_decl_syn_node(void);
 
-	PHP_SYN_NODE *make_func_decl_syn_node(const char *name, PHP_EXP_NODE *param_list);
+PHP_SYN_NODE *make_func_decl_syn_node(const char *name, PHP_EXP_NODE *param_list);
 
-	PHP_SYN_NODE *make_switch_syn_node(PHP_EXP_NODE *cond, PHP_EXP_NODE *case_list);
+PHP_SYN_NODE *make_switch_syn_node(PHP_EXP_NODE *cond, PHP_EXP_NODE *case_list);
 
-	//
-	// add new item into function param list (in declaration )
-	//
-	PHP_EXP_NODE *make_func_param(PHP_EXP_NODE *list, PHP_EXP_NODE *var_exp_node,
-		char *class_name, int byref);
+// add a new item to the function param list (in a declaration)
+PHP_EXP_NODE *make_func_param(PHP_EXP_NODE *list, PHP_EXP_NODE *var_exp_node, char *class_name, int byref);
 
-	PHP_VAR_NODE *make_var_node(void);
-	PHP_EXP_NODE *get_var_node(const char *name);
-	// C can't call "delete"
-	void free_var_node(PHP_VAR_NODE *v);
+PHP_VAR_NODE *make_var_node(void);
+PHP_EXP_NODE *get_var_node(const char *name);
+// C can't call "delete"
+void free_var_node(PHP_VAR_NODE *v);
 
-	/* scope table manipulation */
-	extern PHP_SCOPE_TABLE g_global_scope, g_current_scope;
-	extern PHP_SCOPE_STACK g_scope_stack;
+/* scope table manipulation */
+extern PHP_SCOPE_TABLE g_global_scope, g_current_scope;
+extern PHP_SCOPE_STACK g_scope_stack;
 
-	PHP_SCOPE_TABLE make_scope_table(void);
+PHP_SCOPE_TABLE make_scope_table(void);
 
-	void delete_scope_table(PHP_SCOPE_TABLE scope);
+void delete_scope_table(PHP_SCOPE_TABLE scope);
 
-	void switch_push_scope_table(PHP_SCOPE_TABLE new_table);
+void switch_push_scope_table(PHP_SCOPE_TABLE new_table);
 
-	void switch_pop_scope_table(int old_free);
+void switch_pop_scope_table(int old_free);
 
-	void scope_reset_nonstatics(PHP_SCOPE_TABLE scope);
+void scope_reset_nonstatics(PHP_SCOPE_TABLE scope);
 
-	void add_func_2_scope(PHP_SCOPE_TABLE scope, PHP_SYN_NODE *func);
+void add_func_2_scope(PHP_SCOPE_TABLE scope, PHP_SYN_NODE *func);
 
-	void add_class_2_scope(PHP_SCOPE_TABLE scope, PHP_SYN_NODE *class_node);
+void add_class_2_scope(PHP_SCOPE_TABLE scope, PHP_SYN_NODE *class_node);
 
-	PHP_SCOPE_ITEM *add_var_2_scope(PHP_SCOPE_TABLE scope, PHP_VAR_NODE *var, const char *name);
+PHP_SCOPE_ITEM *add_var_2_scope(PHP_SCOPE_TABLE scope, PHP_VAR_NODE *var, const char *name);
 
-	const char *get_scope_var_name(PHP_SCOPE_TABLE scope, PHP_VAR_NODE *var);
+const char *get_scope_var_name(PHP_SCOPE_TABLE scope, PHP_VAR_NODE *var);
 
-	PHP_SCOPE_ITEM_TYPE get_scope_item_type(PHP_SCOPE_TABLE scope, const char *name);
+PHP_SCOPE_ITEM_TYPE get_scope_item_type(PHP_SCOPE_TABLE scope, const char *name);
 
-	PHP_SCOPE_ITEM *get_scope_item(PHP_SCOPE_TABLE scope, const char *name);
+PHP_SCOPE_ITEM *get_scope_item(PHP_SCOPE_TABLE scope, const char *name);
 
-	/* engine */
-	void php_engine_init(void);
-	void php_engine_free(void);
+/* engine */
+void php_engine_init(void);
+void php_engine_free(void);
 
-	void php_syn_tree_free(PHP_SYN_NODE *tree);
-	void php_exp_tree_free(PHP_EXP_NODE *tree);
+void php_syn_tree_free(PHP_SYN_NODE *tree);
+void php_exp_tree_free(PHP_EXP_NODE *tree);
 
-	/*
-	 * Return code meaning:
-	 *  0  : continue execution to the next statement
-	 *  +x : return and skip current loop cycle, as "continue expr" means
-	 *  -x : return and break as "break expr" means
-	 *  In non-loop situation any != 0 code means "return"
-	 */
-	int php_execute(PHP_SYN_NODE *node, PHP_VALUE_NODE *result);
+/*
+ * Return code meaning: 0 continues execution at the next statement, +x returns and skips the
+ * current loop cycle as "continue expr" means, -x returns and breaks as "break expr" means. Outside
+ * a loop any non-zero code means "return".
+ */
+int php_execute(PHP_SYN_NODE *node, PHP_VALUE_NODE *result);
 
-	void php_expr_eval(PHP_EXP_NODE *expr, PHP_VALUE_NODE *result);
+void php_expr_eval(PHP_EXP_NODE *expr, PHP_VALUE_NODE *result);
 
-	PHP_VAR_NODE *php_expr_eval_lvalue(PHP_EXP_NODE *expr);
+PHP_VAR_NODE *php_expr_eval_lvalue(PHP_EXP_NODE *expr);
 
-	void php_eval_simple_math(PHP_EXP_OP op,
-		PHP_VALUE_NODE *op1, PHP_VALUE_NODE *op2, PHP_VALUE_NODE *result);
+void php_eval_simple_math(PHP_EXP_OP op, PHP_VALUE_NODE *op1, PHP_VALUE_NODE *op2, PHP_VALUE_NODE *result);
 
-	void php_eval_int_math(PHP_EXP_OP op,
-		PHP_VALUE_NODE *op1, PHP_VALUE_NODE *op2, PHP_VALUE_NODE *result);
+void php_eval_int_math(PHP_EXP_OP op, PHP_VALUE_NODE *op1, PHP_VALUE_NODE *op2, PHP_VALUE_NODE *result);
 
-	void php_eval_compare(PHP_EXP_OP op,
-		PHP_VALUE_NODE *op1, PHP_VALUE_NODE *op2, PHP_VALUE_NODE *result);
+void php_eval_compare(PHP_EXP_OP op, PHP_VALUE_NODE *op1, PHP_VALUE_NODE *op2, PHP_VALUE_NODE *result);
 
-	void php_add_native_func(PHP_BLTIN_FUNC_DEF *def);
-	void php_add_native_class(const char *name, PHP_NATIVE_PROP_GET_FUNC_PTR prop_get_native_ptr);
+void php_add_native_func(PHP_BLTIN_FUNC_DEF *def);
+void php_add_native_class(const char *name, PHP_NATIVE_PROP_GET_FUNC_PTR prop_get_native_ptr);
 
-	//
-	// left = VAR(func_name), right=ARRAY(args)
-	void php_run_func_call(PHP_EXP_NODE *node, PHP_VALUE_NODE *result);
+//
+// left = VAR(func_name), right=ARRAY(args)
+void php_run_func_call(PHP_EXP_NODE *node, PHP_VALUE_NODE *result);
 
 #ifdef __GNUC__
-	void php_report_error(PHP_MSG_TYPE mtype, const char *msg, ...)  __attribute__ ((__format__ (__printf__, 2, 3)));
+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, ...);
+void php_report_error(PHP_MSG_TYPE mtype, const char *msg, ...);
 #endif
 
-/*
- * Debugging
- */
-	void print_val_node(PHP_VALUE_NODE *node, int ident);
-	void print_exp_node(PHP_EXP_NODE *node, int ident);
-	void print_syn_node(PHP_SYN_NODE *node, int ident);
+/* Debugging */
+void print_val_node(PHP_VALUE_NODE *node, int ident);
+void print_exp_node(PHP_EXP_NODE *node, int ident);
+void print_syn_node(PHP_SYN_NODE *node, int ident);
 
 #ifdef __cplusplus
 }
 #endif
 
-/*
- * C++ only functions, type definitions
- */
+/* C++ only functions, type definitions */
 #ifdef __cplusplus
 
 #include <map>
@@ -538,23 +571,18 @@
 
 typedef std::map<std::string, PHP_VAR_NODE *>::iterator PHP_ARRAY_ITER_TYPE;
 typedef std::list<std::string>::iterator PHP_ARRAY_KEY_ITER_TYPE;
-//
-// In php arrays are behave like hashes (i.e. associative) and are sortable.
-// STL std::map is not sortable.
-//
-struct PHP_ARRAY_TYPE {
+// In php, arrays behave like hashes (associative) and are sortable. STL std::map is not sortable.
+struct PHP_ARRAY_TYPE
+{
 	std::map<std::string, PHP_VAR_NODE *> array;
 	std::list<std::string> sorted_keys;
 	PHP_ARRAY_KEY_ITER_TYPE current;
-	// Hint for array_push_back: integer key to start the
-	// next free-slot scan from. Avoids O(N) per push (-> O(N^2)
-	// for N pushes) which wedges amuleweb on large shared lists.
+	// Hint for array_push_back: the integer key to start the next free-slot scan from. Avoids
+	// O(N) per push, so O(N^2) for N pushes, which wedges amuleweb on large shared lists.
 	int push_next_hint = 0;
 };
 
-//
-// using std::string instead of "char *" so keys will be compared
-// by string value
+// std::string rather than "char *", so keys compare by string value
 typedef std::map<std::string, PHP_SCOPE_ITEM *> PHP_SCOPE_TABLE_TYPE;
 typedef std::list<PHP_SCOPE_TABLE_TYPE *> PHP_SCOPE_STACK_TYPE;
 
@@ -563,11 +591,12 @@
 void array_add_to_str_key(PHP_VALUE_NODE *array, const std::string &key, PHP_VAR_NODE *node);
 void array_remove_at_str_key(PHP_VALUE_NODE *array, const std::string &key);
 
-void func_scope_init(PHP_FUNC_PARAM_DEF *params, int param_count,
-	PHP_SCOPE_TABLE_TYPE *scope_map, PHP_VALUE_NODE *arg_array,
+void func_scope_init(PHP_FUNC_PARAM_DEF *params,
+	int param_count,
+	PHP_SCOPE_TABLE_TYPE *scope_map,
+	PHP_VALUE_NODE *arg_array,
 	std::map<std::string, PHP_VAR_NODE *> &saved_vars);
 
-
 #endif
 
 #endif //_PHP_SYNTREE_H_

amule-3.1.0.tar.gz/unittests/curl-tests Added

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi Added

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/00-peer-fixture.sh Added

@@ -0,0 +1,226 @@
+#!/usr/bin/env bash
+#
+# amuleapi 00-peer-fixture - queue a real download so later phases have a peer.
+#
+# The downloads the suite makes for itself use fabricated ed2k hashes, which
+# never acquire a source, so every source-dependent check in 04, 33 and 43
+# skipped unless someone provisioned a transfer by hand. This searches the live
+# network and queues the most-sourced hit; 99-peer-fixture-teardown removes it.
+#
+# Never fatal: no network is an ordinary condition, and failing the suite for it
+# would make the suite unusable offline. It must not fail QUIETLY, so giving up
+# prints a banner naming the reason.
+#
+# Usage:
+#   ./00-peer-fixture.sh              # via run-all.sh, which supplies the daemon
+#
+# Environment:
+#   HOST=localhost:4713               amuleapi endpoint
+#   ADMIN_PASS=adminpass              admin credential
+#   PEER_FIXTURE_QUERY=ubuntu         keyword to search for
+#   PEER_FIXTURE_SEARCH_WAIT=45       seconds to let results accumulate
+#   PEER_FIXTURE_SOURCE_WAIT=90       seconds to wait for a source to attach
+#   PEER_FIXTURE_MIN_SIZE=268435456   prefer hits at least this many bytes
+#   PEER_FIXTURE_STATE=/tmp/amuleapi-peer-fixture   handoff file for teardown
+#
+# Exits 0 provisioned or not; 2 only on a bring-up error (no daemon, no login).
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+QUERY=${PEER_FIXTURE_QUERY:-ubuntu}
+SEARCH_WAIT=${PEER_FIXTURE_SEARCH_WAIT:-45}
+SOURCE_WAIT=${PEER_FIXTURE_SOURCE_WAIT:-90}
+STATE=${PEER_FIXTURE_STATE:-/tmp/amuleapi-peer-fixture}
+
+# Measured: the most-sourced "ubuntu" hit overall was a 3.3 MB PDF that finished
+# 30 s after being queued, and a completed download drops its sources - so 04,
+# 33 and 43 ten minutes later saw the empty peer list this fixture exists to
+# prevent. Prefer hits too big for a run to finish.
+MIN_SIZE=${PEER_FIXTURE_MIN_SIZE:-268435456}
+
+# 12/13/22/23/24/26 add and delete this hash as their own disposable fixture.
+SUITE_TEST_HASH=0031c9cba65c50dd2015c184b2ca2c88
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_00_peer_fixture_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+CURL_STATUS=""
+CURL_BODY=""
+
+# Governs whether giving up may delete the handoff: once set there is a real
+# transfer to tear down, and dropping the handoff would orphan it.
+QUEUED=0
+
+# Unlike the assertion phases, a transport error is not fatal here.
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 15 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") || {
+		CURL_STATUS="000"
+		CURL_BODY=""
+		return 0
+	}
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+# Greppable on purpose: this is what to look for when the peer checks skip.
+_not_provisioned() {
+	 "$QUEUED" = "0"  && rm -f "$STATE"
+	echo
+	echo "########################################################################"
+	echo "##  PEER FIXTURE NOT PROVISIONED"
+	echo "##  reason: $1"
+	echo "##"
+	echo "##  The source-dependent checks in 04-read-downloads-shared,"
+	echo "##  33-known-clients and 43-client-protocol-extensions will SKIP."
+	echo "##  That is not a failure, but it is less coverage than a full run."
+	echo "########################################################################"
+	echo
+	exit 0
+}
+
+_die() { echo "FATAL: $*" >&2; exit 2; }
+
+echo "amuleapi 00-peer-fixture @ $HOST (query: $QUERY)"
+
+# Reaches jq as --argjson, where a non-numeric value would read as "no result
+# had a source" and send the operator looking at the network.
+case "$MIN_SIZE" in
+'' | *!0-9*) _die "PEER_FIXTURE_MIN_SIZE must be a plain byte count, got '$MIN_SIZE'" ;;
+esac
+
+# A handoff from an interrupted run would make teardown delete someone else's
+# download.
+rm -f "$STATE"
+
+_curl -X POST -H 'Content-Type: application/json' \
+	-d "{\"username\":\"admin\",\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true"
+ "$CURL_STATUS" = "200"  || _die "admin login failed (HTTP $CURL_STATUS)"
+TOKEN=$(printf '%s' "$CURL_BODY" | jq -r '.token // empty')
+ -n "$TOKEN"  || _die "admin login returned no token"
+AUTH="Authorization: Bearer $TOKEN"
+
+# Cheaper than a 45 s wait that ends in an empty result set.
+_curl -H "$AUTH" "$API/status"
+ED2K=$(printf '%s' "$CURL_BODY" | jq -r '.ed2k.state // "unknown"')
+KAD=$(printf '%s' "$CURL_BODY" | jq -r '.kad.state // "unknown"')
+echo "    ed2k=$ED2K kad=$KAD"
+if  "$ED2K" != "connected"  &&  "$KAD" != "connected" ; then
+	_not_provisioned "neither ed2k nor Kad is connected, so no search can return sources"
+fi
+
+_curl -X POST -H "$AUTH" -H 'Content-Type: application/json' \
+	-d "{\"query\":\"$QUERY\"}" "$API/search"
+case "$CURL_STATUS" in
+200 | 202) ;;
+*) _not_provisioned "POST /search returned HTTP $CURL_STATUS" ;;
+esac
+SEARCH_ID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id // empty')
+ -n "$SEARCH_ID"  || _not_provisioned "POST /search returned no search_id"
+echo "    search_id=$SEARCH_ID; collecting results for up to ${SEARCH_WAIT}s"
+
+# The result floor is a second exit for a server that keeps a search open long
+# after it has sent everything it has.
+_elapsed=0
+while  "$_elapsed" -lt "$SEARCH_WAIT" ; do
+	sleep 5
+	_elapsed=$((_elapsed + 5))
+	_curl -H "$AUTH" "$API/search/$SEARCH_ID/results"
+	 "$CURL_STATUS" = "200"  || continue
+	SEARCH_STATE=$(printf '%s' "$CURL_BODY" | jq -r '.progress.state // "unknown"')
+	SEARCH_HITS=$(printf '%s' "$CURL_BODY" | jq -r '.results | length')
+	if  "$SEARCH_STATE" = "finished"  ||  "${SEARCH_HITS:-0}" -ge 50 ; then
+		break
+	fi
+done
+
+# Most sources wins within the big tier, falling back to the whole field.
+# already_downloaded hits would complete against the local library and attach
+# nothing. Name goes last because it is the only field that can hold a space.
+BEST_TIER=""
+BEST_HASH=""
+BEST_SOURCES=""
+BEST_SIZE=""
+BEST_NAME=""
+read -r BEST_TIER BEST_HASH BEST_SOURCES BEST_SIZE BEST_NAME <<EOF
+$(printf '%s' "$CURL_BODY" | jq -r --arg skip "$SUITE_TEST_HASH" --argjson min "$MIN_SIZE" '
+	 .results?
+	  | select(.already_downloaded != true)
+	  | select((.hash // "") != $skip)
+	  | select((.sources.total // 0) > 0)
+	 as $usable
+	| (  $usable | select((.size_bytes // 0) >= $min) 
+	    | sort_by(-(.sources.total // 0)) | .0 ) as $big
+	| ( $usable | sort_by(-(.sources.total // 0)) | .0 ) as $any
+	| ($big // $any)
+	| if . == null then ""
+	  else "\(if (.size_bytes // 0) >= $min then "large" else "small" end) \(.hash) \(.sources.total) \(.size_bytes) \(.name)"
+	  end')
+EOF
+
+# amuled caps concurrent searches; do not charge the rest of the suite for ours.
+_curl -X DELETE -H "$AUTH" "$API/search/$SEARCH_ID"
+
+ -n "$BEST_HASH"  \
+	|| _not_provisioned "search for '$QUERY' returned no usable result with a live source"
+echo "    best hit: $BEST_SOURCES sources, $BEST_SIZE bytes -- $BEST_NAME"
+if  "$BEST_TIER" = "small" ; then
+	echo "    note: no hit of at least $MIN_SIZE bytes had a source; this one may"
+	echo "          complete mid-run, and its peers drop when it does"
+fi
+
+_curl -X POST -H "$AUTH" -H 'Content-Type: application/json' -d '{}' \
+	"$API/search/results/$BEST_HASH/download"
+case "$CURL_STATUS" in
+200 | 202) ;;
+*) _not_provisioned "promoting $BEST_HASH to a download returned HTTP $CURL_STATUS" ;;
+esac
+
+# Written before anything is confirmed: a download may exist from the request
+# above onward. A handoff naming one that was never created is harmless, so the
+# asymmetry runs the safe way.
+printf 'hash=%s\nname=%s\n' "$BEST_HASH" "$BEST_NAME" > "$STATE"
+
+# The status above proves nothing. Measured: this endpoint answers 202 with an
+# empty body for a hash in no search at all, and queues nothing - it hands the
+# request to amuled over EC without waiting for a verdict.
+APPEARED=0
+_elapsed=0
+while  "$_elapsed" -lt 20 ; do
+	_curl -H "$AUTH" "$API/downloads?status=all"
+	if  "$CURL_STATUS" = "200"  && printf '%s' "$CURL_BODY" \
+	   | jq -e --arg h "$BEST_HASH" '.downloads | select(.hash == $h)' >/dev/null 2>&1; then
+		APPEARED=1
+		break
+	fi
+	sleep 2
+	_elapsed=$((_elapsed + 2))
+done
+ "$APPEARED" = "1"  \
+	|| _not_provisioned "the daemon accepted the download request for $BEST_HASH but the download never appeared in the queue"
+QUEUED=1
+echo "    queued $BEST_HASH; waiting up to ${SOURCE_WAIT}s for a source"
+
+_elapsed=0
+SOURCES=0
+while  "$_elapsed" -lt "$SOURCE_WAIT" ; do
+	sleep 5
+	_elapsed=$((_elapsed + 5))
+	_curl -H "$AUTH" "$API/downloads/$BEST_HASH"
+	 "$CURL_STATUS" = "200"  || continue
+	SOURCES=$(printf '%s' "$CURL_BODY" | jq -r '.sources.total // 0')
+	 "${SOURCES:-0}" -gt 0  && break
+done
+
+if  "${SOURCES:-0}" -gt 0 ; then
+	echo "    $SOURCES source(s) attached after ${_elapsed}s"
+	echo "00-peer-fixture: provisioned"
+	exit 0
+fi
+
+# Still queued, and teardown still removes it; only the peer checks lose out.
+_not_provisioned "the download was queued but no source attached within ${SOURCE_WAIT}s"

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/01-version-and-errors.sh Added

@@ -0,0 +1,240 @@
+#!/usr/bin/env bash
+#
+# amuleapi 01-version-and-errors — daemon skeleton smoke. Asserts the single
+# `/api/v1/version` endpoint and the error-shape envelope.
+#
+# Usage:
+#   amuleapi --config-dir=/tmp/amuleapi-test &
+#   ./01-version-and-errors.sh
+#
+# Environment:
+#   HOST=localhost:4713   amuleapi endpoint (default port)
+#
+# Exits 0 on success, 1 on any failed assertion, 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_01_version_and_errors_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 \
+		-o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required for JSON assertions. brew install jq."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$HOST/" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+echo "amuleapi 01-version-and-errors smoke @ $HOST"
+
+# 1. GET /api/v1/version → 200 + JSON with name=amuleapi, api_version=v1.
+_curl "$API/version"
+_assert_status 200 "GET /api/v1/version returns 200"
+_assert_json_eq '.service'     amuleapi '/api/v1/version reports service=amuleapi'
+_assert_json_eq '.api_version' v1       '/api/v1/version reports api_version=v1'
+
+# 2. amuleapi_version field — non-empty. On release builds it's
+#    e.g. "3.0.1"; on the `master` line it's the literal "GIT"
+#    (PACKAGE_VERSION default in the top-level CMakeLists.txt).
+#    Pinning a shape would force the smoke to know which kind of
+#    build it's poking at, so just assert the field is populated.
+_assert_json_eq '.amuleapi_version | length > 0' \
+	true '/api/v1/version reports a non-empty amuleapi_version'
+
+# 2b. daemon_version field — the connected amuled's version, taken from
+#     the EC_TAG_SERVER_VERSION handshake tag. Distinct from
+#     amuleapi_version (which is amuleapi's own build). The regression
+#     amuled is a live modern build that always advertises the tag, so
+#     assert it's populated. (Against a daemon old enough to omit the
+#     tag, or before EC connects, this field is legitimately empty.)
+_assert_json_eq '.daemon_version | length > 0' \
+	true '/api/v1/version reports a non-empty daemon_version'
+
+# 2c. update object. The identity fields above are unauthenticated because this
+#     is the version-negotiation probe (liveness is /health's job), but `update`
+#     reports whether THIS daemon is running an outdated build, which an
+#     unauthenticated caller on a reachable interface has no business learning.
+#     Absent without credentials, present with them.
+_assert_json_eq '. | has("update")' false \
+	'/api/v1/version omits the update object when unauthenticated'
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login" \
+	| jq -r '.token // empty')
+if  -z "$ADMIN_TOKEN" ; then
+	# Cookie-session build: fall back to the jar so the authenticated half
+	# still runs rather than silently reporting a pass it never made.
+	JAR=$(mktemp)
+	curl -s -c "$JAR" -X POST -H "Content-Type: application/json" \
+		-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login" >/dev/null
+	AUTH=(-b "$JAR")
+else
+	AUTH=(-H "Authorization: Bearer $ADMIN_TOKEN")
+fi
+
+#     Whether the daemon has actually completed a check depends on its build
+#     (ENABLE_VERSION_CHECK) and network access, so assert the shape (keys +
+#     types) rather than concrete values.
+_curl "${AUTH@}" "$API/version"
+_assert_status 200 "GET /api/v1/version (authenticated) returns 200"
+_assert_json_eq '.update | type' object '/api/v1/version has an update object when authenticated'
+_assert_json_eq '.update.check_enabled | type' boolean 'update.check_enabled is boolean'
+_assert_json_eq '.update.checked | type' boolean 'update.checked is boolean'
+# latest_version is null until a check completes (R10), so it is string-or-null
+# rather than always-string -- the same shape as its two siblings.
+_assert_json_eq '(.update.latest_version | type) as $t | $t == "string" or $t == "null"' \
+	true 'update.latest_version is string or null'
+_assert_json_eq '.update | has("available")' true 'update has available'
+_assert_json_eq '.update | has("last_checked_at")' true 'update has last_checked_at'
+
+# 2d. /health — the liveness probe. The surface had none, so /version was being
+#     used as one: a document whose body changes over time and whose name says
+#     something else. Unauthenticated like /version, no EC roundtrip, and always
+#     200 while the server answers, so a probe never restarts a healthy process
+#     because amuled went away. Readiness is in the body instead.
+_curl "$API/health"
+_assert_status 200 "GET /api/v1/health returns 200 unauthenticated"
+_assert_json_eq '.status' ok '/health reports status=ok'
+_assert_json_eq '.ec_connected | type' boolean '/health reports ec_connected'
+_assert_json_eq '.snapshot_ready | type' boolean '/health reports snapshot_ready'
+# Readiness is reported as `snapshot_ready`; `snapshot` is not a key on /health,
+# so a client cannot read a bare boolean under the wrong name.
+_assert_json_eq '.snapshot | type' null '/health does not emit a bare snapshot key'
+
+_curl -I "$API/health"
+_assert_status 200 "HEAD /api/v1/health returns 200"
+
+_curl -X POST "$API/health"
+_assert_status 405 "POST /api/v1/health yields 405"
+_assert_json_eq '.error.code' method_not_allowed '/health 405 carries method_not_allowed'
+# _curl captures the body and status only, so read the header directly rather
+# than asserting against a variable that does not exist.
+ALLOW=$(curl -s -o /dev/null -D - --max-time 10 -X POST "$API/health" \
+	| tr -d '\r' | awk -F': ' 'tolower($1)=="allow"{print $2}')
+case "$ALLOW" in
+*GET*HEAD*) _pass "/health 405 carries Allow: $ALLOW" ;;
+*) _fail "/health 405 Allow header" "got $ALLOW" ;;
+esac
+
+# 3. Method other than GET/HEAD → 405 with the canonical error envelope.
+_curl -X DELETE "$API/version"
+_assert_status 405 "DELETE /api/v1/version yields 405"
+_assert_json_eq '.error.code' method_not_allowed \
+	'/api/v1/version 405 carries error.code=method_not_allowed'
+
+# 4. Unknown route → 404 with the canonical error envelope.
+_curl "$API/does-not-exist"
+_assert_status 404 "GET /api/v1/does-not-exist yields 404"
+_assert_json_eq '.error.code' not_found \
+	'404 carries error.code=not_found'
+
+# 5. HEAD /api/v1/version — same status code as GET, no body required.
+_curl -I "$API/version"
+_assert_status 200 "HEAD /api/v1/version returns 200"
+
+# 6. POST /api/v1/version/check is admin-only: unauthenticated → 401. (The
+#    admin-authenticated happy path — 202 started / 429 throttled — is
+#    exercised where an admin token is available.)
+_curl -X POST "$API/version/check"
+_assert_status 401 "POST /api/v1/version/check without auth yields 401"
+
+# 6b. The throttled check answers its own code, not the auth limiter's.
+#     Both are 429, and a client that cannot tell them apart has to read a
+#     throttled update check as a lost session -- which is exactly what the Web
+#     UI did, logging the user out on "Check now".
+#
+#     Two POSTs back to back: the daemon's cooldown is 60 s and its startup
+#     check already consumed one attempt, so whichever way the first lands, the
+#     second is inside the window. Deterministic regardless of daemon uptime.
+_curl "${AUTH@}" -X POST "$API/version/check"
+_curl "${AUTH@}" -X POST "$API/version/check"
+_assert_status 429 "second POST /version/check inside the cooldown yields 429"
+# Asserted as the exact code rather than "not rate_limited": the negative form
+# also passes on an `unauthorized` body, so it would go green on a broken
+# request instead of catching it.
+_assert_json_eq '.error.code' version_check_throttled \
+	'throttled /version/check carries error.code=version_check_throttled'
+
+# 7. GET /api/v1/version/check → 405 (POST only).
+_curl "$API/version/check"
+_assert_status 405 "GET /api/v1/version/check yields 405"
+_assert_json_eq '.error.code' method_not_allowed \
+	'/api/v1/version/check GET 405 carries error.code=method_not_allowed'
+
+# 8. An unauthenticated /version must NOT spend the generic-401 budget.
+#    Emitting `update` only to an authenticated caller is the only reason this
+#    endpoint authenticates at all, so a request with no credential is its
+#    documented unauthenticated use rather than an auth failure. Counted, it
+#    would let an anonymous poller -- or, behind a reverse proxy, one poller on
+#    the address every client shares -- fill the bucket in 30 requests and lock
+#    real sessions out of the entire authenticated surface for five minutes.
+#    Defaults: TokenFailureThreshold=30 within TokenFailureWindowSeconds=60.
+#
+#    Deliberately the last check in this file: if the guard regresses, the
+#    lockout it arms would poison every assertion after it.
+i=0
+while  "$i" -lt 35 ; do
+	curl -s -o /dev/null --max-time 10 "$API/version"
+	i=$((i + 1))
+done
+# /auth/session rather than /status: authenticated, but with no EC dependency
+# that could answer 503 and mask the 429 this is looking for.
+_curl "${AUTH@}" "$API/auth/session"
+_assert_status 200 \
+	"35 anonymous /version requests do not rate-limit an authenticated caller"
+
+# Summary.
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/02-auth.sh Added

@@ -0,0 +1,385 @@
+#!/usr/bin/env bash
+#
+# amuleapi 02-auth — auth surface. Exercises /api/v1/auth/login,
+# /auth/session, /auth/logout and /auth/passwords against a
+# freshly-started amuleapi whose admin password is `adminpass`.
+#
+# The credential block changes passwords and puts them back; it must stay
+# ahead of the rate-limit block, which locks this IP out on purpose.
+#
+# Bring-up convention (matches the README in the parent dir):
+#   rm -rf /tmp/amuleapi-02-auth && mkdir -p /tmp/amuleapi-02-auth
+#   amuleapi --config-dir=/tmp/amuleapi-02-auth --host=127.0.0.1 \
+#            --port=4712 --password=amule --set-admin-pass=adminpass
+#   amuleapi --config-dir=/tmp/amuleapi-02-auth --host=127.0.0.1 \
+#            --port=4712 --password=amule &
+#   ./02-auth.sh
+#
+# Environment:
+#   HOST=localhost:4713         amuleapi endpoint
+#   ADMIN_PASS=adminpass        plaintext admin password
+#
+# Exits 0 on success, 1 on any failed assertion, 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_02_auth_body.XXXXXX)
+CURL_HDR_FILE=$(mktemp -t amuleapi_02_auth_hdr.XXXXXX)
+COOKIE_JAR=$(mktemp -t amuleapi_02_auth_cookies.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE" "$CURL_HDR_FILE" "$COOKIE_JAR"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 \
+		-D "$CURL_HDR_FILE" \
+		-o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+	CURL_HDR=$(cat "$CURL_HDR_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+_assert_body_empty() {
+	local label=$1
+	if  -z "$CURL_BODY" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected an empty body, got: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_header_contains() {
+	local needle=$1 label=$2
+	if printf '%s' "$CURL_HDR" | grep -qi -- "$needle"; then
+		_pass "$label"
+	else
+		_fail "$label" "needle '$needle' not in response headers" \
+			"headers: $(printf '%s' "$CURL_HDR" | head -c 400)"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required. brew install jq."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+echo "amuleapi 02-auth smoke @ $HOST"
+
+# --- 1. Login with wrong password → 401 invalid_credentials. -------
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"password":"wrong-password"}' \
+	"$API/auth/login?include_token=true"
+_assert_status 401 "POST /auth/login with wrong password → 401"
+_assert_json_eq '.error.code' invalid_credentials \
+	'401 carries error.code=invalid_credentials'
+
+# --- 2. Login with right password → 200 + JWT + Set-Cookie. --------
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true"
+_assert_status 200 "POST /auth/login with admin password → 200"
+_assert_json_eq '.role'                    admin    'login response role=admin'
+_assert_json_eq '.token | length > 100'    true     'login response carries a real JWT (>100 chars)'
+_assert_json_eq '.expires_at | type'       number   'expires_at is unix seconds'
+_assert_json_eq '.session_id | length'     22       'session_id is 22-char base64url'
+# The two keys above are unconditional; only `token` rides include_token.
+_assert_json_eq '. | has("expires_at_unix")' false 'expires_at ships once, not also as expires_at_unix'
+_assert_header_contains 'set-cookie: amuleapi_token=' \
+	'login sets the amuleapi_token cookie'
+_assert_header_contains 'HttpOnly' \
+	'cookie carries HttpOnly attribute'
+_assert_header_contains 'SameSite=Strict' \
+	'cookie carries SameSite=Strict attribute'
+
+# Stash the token for the next blocks.
+TOKEN=$(printf '%s' "$CURL_BODY" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  \
+	|| _die "couldn't extract token from login response: $CURL_BODY"
+
+# --- 3. /auth/session with bearer → 200 + role/session_id/expires_at. -
+_curl -H "Authorization: Bearer $TOKEN" "$API/auth/session"
+_assert_status 200 "GET /auth/session (bearer) → 200"
+_assert_json_eq '.role' admin 'session.role=admin (bearer)'
+_assert_json_eq '.session_id | length' 22 'session.session_id is 22-char (bearer)'
+_assert_json_eq '.expires_at | type' number 'session.expires_at is unix seconds (bearer)'
+
+# --- 4. /auth/session with cookie → same. --------------------------
+# Use the cookie jar populated by curl above by re-sending the same
+# header verbatim — simulates what a browser would do automatically.
+_curl -b "amuleapi_token=$TOKEN" "$API/auth/session"
+_assert_status 200 "GET /auth/session (cookie) → 200"
+_assert_json_eq '.role' admin 'session.role=admin (cookie)'
+
+# --- 5. /auth/session with no creds → 401 unauthorized. ------------
+_curl "$API/auth/session"
+_assert_status 401 "GET /auth/session (no creds) → 401"
+_assert_json_eq '.error.code' unauthorized \
+	'no-creds 401 carries error.code=unauthorized'
+
+# --- 6. /auth/session with bogus bearer → 401. ---------------------
+_curl -H "Authorization: Bearer not.a.real.jwt" "$API/auth/session"
+_assert_status 401 "GET /auth/session (bogus bearer) → 401"
+
+# --- 7. /auth/logout (bearer) → 204 + clearing Set-Cookie. ---------
+# 204, not 200: the clearing Set-Cookie is the only thing the caller needs,
+# so there is no body.
+_curl -X POST -H "Authorization: Bearer $TOKEN" "$API/auth/logout"
+_assert_status 204 "POST /auth/logout (bearer) → 204"
+_assert_body_empty 'logout sends no body'
+_assert_header_contains 'set-cookie: amuleapi_token=;' \
+	'logout sends a clearing Set-Cookie'
+
+# --- 8. /auth/session with same (now revoked) bearer → 401. --------
+_curl -H "Authorization: Bearer $TOKEN" "$API/auth/session"
+_assert_status 401 "GET /auth/session (revoked bearer) → 401"
+_assert_json_eq '.error.code' unauthorized \
+	'revoked bearer 401 carries error.code=unauthorized'
+
+# --- 9. Method gate. ----------------------------------------------
+_curl -X GET "$API/auth/login?include_token=true"
+_assert_status 405 "GET /auth/login → 405 method_not_allowed"
+_curl -X GET "$API/auth/logout"
+_assert_status 405 "GET /auth/logout → 405 method_not_allowed"
+
+# --- 10. Bad JSON body on login → 400 bad_request. -----------------
+_curl -X POST -H "Content-Type: application/json" \
+	-d 'not-even-json' \
+	"$API/auth/login?include_token=true"
+_assert_status 400 "POST /auth/login (bad JSON) → 400"
+_assert_json_eq '.error.code' bad_request \
+	'bad-JSON 400 carries error.code=bad_request'
+
+# --- 11. Credential management: /auth/passwords. -------------------
+#
+# Runs before the rate-limit block below, which deliberately locks this
+# IP out and would take the PATCH re-auth down with it (both share the
+# login limiter).
+#
+# Ends by restoring ADMIN_PASS, because the whole suite shares one
+# amuleapi and every later script logs in with it.
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true"
+_assert_status 200 "re-login for the credential block → 200"
+PW_TOKEN=$(printf '%s' "$CURL_BODY" | jq -r .token)
+ -n "$PW_TOKEN"  &&  "$PW_TOKEN" != "null"  \
+	|| _die "couldn't extract token for the credential block: $CURL_BODY"
+
+_curl -H "Authorization: Bearer $PW_TOKEN" "$API/auth/passwords"
+_assert_status 200 "GET /auth/passwords (admin) → 200"
+_assert_json_eq '.admin_password_set'          true    'admin_password_set=true'
+# Not asserting the initial guest state: run-all.sh sets a guest password
+# during bring-up, a bare manual run does not. The transitions below are
+# what matter, and each asserts the state it just produced.
+_assert_json_eq '.guest_access_enabled | type' boolean 'guest_access_enabled is a boolean'
+
+# The stored form is irreversible, so no digest may appear in the body.
+_assert_json_eq 'has("admin_password") or has("guest_password")' false \
+	'GET /auth/passwords never echoes a password'
+
+_curl -X PATCH -H "Authorization: Bearer $PW_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"current_password":"definitely-not-it","admin_password":"x"}' \
+	"$API/auth/passwords"
+_assert_status 403 "PATCH /auth/passwords with wrong current_password → 403"
+_assert_json_eq '.error.code' invalid_credentials \
+	'wrong current_password carries error.code=invalid_credentials'
+
+_curl -X PATCH -H "Authorization: Bearer $PW_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"current_password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/passwords"
+_assert_status 400 "PATCH /auth/passwords with nothing to change → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $PW_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"current_password\":\"$ADMIN_PASS\",\"admin_password\":\"\"}" \
+	"$API/auth/passwords"
+_assert_status 400 "PATCH /auth/passwords cannot clear the admin password → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $PW_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"current_password\":\"$ADMIN_PASS\",\"guest_password\":\"g\",\"guest_access_enabled\":false}" \
+	"$API/auth/passwords"
+_assert_status 400 "PATCH /auth/passwords rejects guest_password with guest_access_enabled:false → 400"
+
+# The revocation cutoff is the credential file's mtime, which has
+# one-second resolution: a token minted in the same second as the write
+# is not older than it. Wait one second so the assertion below is about
+# the rule rather than about which side of a second boundary we landed on.
+sleep 1
+
+_curl -X PATCH -H "Authorization: Bearer $PW_TOKEN" \
+	-H "Content-Type: application/json" \
+	-H "Accept: application/jwt" \
+	-d "{\"current_password\":\"$ADMIN_PASS\",\"guest_password\":\"guestpass\"}" \
+	"$API/auth/passwords"
+_assert_status 200 "PATCH /auth/passwords enabling guest → 200"
+_assert_json_eq '.admin_password_set'              true 'admin_password_set still true after enabling guest'
+_assert_json_eq '.guest_access_enabled'          true 'guest_access_enabled=true after setting a guest password'
+# Revocation is unconditional, so there is no `other_sessions_revoked` field;
+# the re-issued token below is the observable half.
+_assert_json_eq '. | has("other_sessions_revoked")' false \
+	'no always-true other_sessions_revoked key'
+_assert_json_eq '.token | length > 100'   true 'password change re-issues the caller a token'
+NEW_TOKEN=$(printf '%s' "$CURL_BODY" | jq -r .token)
+
+# The token that made the change survives; the one that predates it does not.
+_curl -H "Authorization: Bearer $NEW_TOKEN" "$API/auth/passwords"
+_assert_status 200 "re-issued token still works after the change"
+_curl -H "Authorization: Bearer $PW_TOKEN" "$API/auth/passwords"
+_assert_status 401 "token issued before the change → 401"
+
+# The new guest password works, and guest may not read the credential state.
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"password":"guestpass"}' "$API/auth/login?include_token=true"
+_assert_status 200 "guest can log in with the password just set → 200"
+_assert_json_eq '.role' guest 'guest login yields role=guest'
+GUEST_TOKEN=$(printf '%s' "$CURL_BODY" | jq -r .token)
+_curl -H "Authorization: Bearer $GUEST_TOKEN" "$API/auth/passwords"
+_assert_status 403 "GET /auth/passwords as guest → 403"
+_curl -X PATCH -H "Authorization: Bearer $GUEST_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"current_password\":\"$ADMIN_PASS\",\"admin_password\":\"nope\"}" \
+	"$API/auth/passwords"
+_assert_status 403 "PATCH /auth/passwords as guest → 403"
+
+# Turning guest off clears the stored guest password.
+sleep 1
+_curl -X PATCH -H "Authorization: Bearer $NEW_TOKEN" \
+	-H "Content-Type: application/json" \
+	-H "Accept: application/jwt" \
+	-d "{\"current_password\":\"$ADMIN_PASS\",\"guest_access_enabled\":false}" \
+	"$API/auth/passwords"
+_assert_status 200 "PATCH /auth/passwords disabling guest → 200"
+_assert_json_eq '.guest_access_enabled' false 'guest_access_enabled=false after disabling'
+_assert_json_eq '.admin_password_set'     true  'disabling guest leaves the admin password alone'
+NEW_TOKEN=$(printf '%s' "$CURL_BODY" | jq -r .token)
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"password":"guestpass"}' "$API/auth/login?include_token=true"
+_assert_status 401 "the cleared guest password no longer logs in → 401"
+
+# Rotate the admin password and rotate it straight back, so the rest of
+# the suite still authenticates with ADMIN_PASS.
+sleep 1
+_curl -X PATCH -H "Authorization: Bearer $NEW_TOKEN" \
+	-H "Content-Type: application/json" \
+	-H "Accept: application/jwt" \
+	-d "{\"current_password\":\"$ADMIN_PASS\",\"admin_password\":\"rotated-pass\"}" \
+	"$API/auth/passwords"
+_assert_status 200 "PATCH /auth/passwords rotating the admin password → 200"
+NEW_TOKEN=$(printf '%s' "$CURL_BODY" | jq -r .token)
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true"
+_assert_status 401 "the replaced admin password no longer logs in → 401"
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"password":"rotated-pass"}' "$API/auth/login?include_token=true"
+_assert_status 200 "the new admin password logs in → 200"
+
+sleep 1
+_curl -X PATCH -H "Authorization: Bearer $NEW_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"current_password\":\"rotated-pass\",\"admin_password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/passwords"
+_assert_status 200 "PATCH /auth/passwords restoring the admin password → 200"
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true"
+_assert_status 200 "ADMIN_PASS restored for the rest of the suite → 200"
+
+_curl -X POST "$API/auth/passwords"
+_assert_status 405 "POST /auth/passwords → 405 method_not_allowed"
+
+# --- 12. Rate-limit: 5 wrong passwords (default threshold) → 429 ---
+# Defaults from amuleapi.conf: LoginFailureWindowSeconds=60,
+# LoginFailureThreshold=5, LoginLockoutSeconds=300.
+#
+# Boundary check: Check() runs BEFORE the password compare, then
+# NoteFailure() runs AFTER a wrong-password reject. So with
+# threshold=5:
+#   attempts 1-5  → status 401 (bucket grows 1..5; NoteFailure on
+#                   the 5th sets lockout_until)
+#   attempts 6+   → status 429 (the Check at the top of attempt 6
+#                   is the first one that observes lockout_until > now)
+# This pins the off-by-one boundary so a regression that arms the
+# lockout one attempt early (or late) trips the assertion.
+for i in 1 2 3 4; do
+	_curl -X POST -H "Content-Type: application/json" \
+		-d '{"password":"wrong"}' \
+		"$API/auth/login?include_token=true" > /dev/null
+done
+# Attempt 5: NoteFailure() arms the lockout AFTER returning 401.
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"password":"wrong"}' \
+	"$API/auth/login?include_token=true"
+_assert_status 401 "POST /auth/login: 5th failure arms but still returns 401"
+# Attempt 6: Check() sees the armed lockout → 429.
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"password":"wrong"}' \
+	"$API/auth/login?include_token=true"
+_assert_status 429 "POST /auth/login: 6th attempt is the first 429"
+_assert_json_eq '.error.code' rate_limited \
+	'6th-attempt lockout carries error.code=rate_limited'
+
+# Attempt 7 stays locked.
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"password":"wrong"}' \
+	"$API/auth/login?include_token=true" > /dev/null
+# The 8th attempt also remains locked.
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"password":"wrong"}' \
+	"$API/auth/login?include_token=true"
+_assert_status 429 "POST /auth/login after many failures → 429"
+_assert_json_eq '.error.code' rate_limited \
+	'lockout carries error.code=rate_limited'
+_assert_header_contains 'retry-after:' \
+	'lockout carries Retry-After header'
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/02b-auth-lockout-isolation.sh Added

@@ -0,0 +1,156 @@
+#!/usr/bin/env bash
+#
+# amuleapi 02b-auth-lockout-isolation — the login lockout must not be
+# clearable with a *different* credential.
+#
+# One bucket, keyed by IP, guards both passwords: VerifyPassword tries admin
+# then guest. If a successful login cleared that bucket, a guest-credential
+# holder could brute-force the admin password indefinitely -- four wrong admin
+# guesses, one good guest login to wipe the streak, repeat -- and the one
+# control protecting the admin password would never fire.
+#
+# Its own phase rather than a block in 02-auth.sh: proving the streak survived
+# means crossing the threshold, which locks this IP out, and 02-auth's own
+# rate-limit block counts attempts from a clean bucket.
+#
+# Bring-up convention (matches the README in the parent dir):
+#   rm -rf /tmp/amuleapi-02b && mkdir -p /tmp/amuleapi-02b
+#   amuleapi --config-dir=/tmp/amuleapi-02b --host=127.0.0.1 \
+#            --port=4712 --password=amule --set-admin-pass=adminpass
+#   amuleapi --config-dir=/tmp/amuleapi-02b --host=127.0.0.1 \
+#            --port=4712 --password=amule --set-guest-pass=guestpass
+#   amuleapi --config-dir=/tmp/amuleapi-02b --host=127.0.0.1 \
+#            --port=4712 --password=amule &
+#   ./02b-auth-lockout-isolation.sh
+#
+# Environment:
+#   HOST=localhost:4713         amuleapi endpoint
+#   ADMIN_PASS=adminpass        plaintext admin password
+#   GUEST_PASS=guestpass        plaintext guest password
+#
+# Exits 0 on success, 1 on any failed assertion, 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+SKIP_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_02b_body.XXXXXX)
+CURL_HDR_FILE=$(mktemp -t amuleapi_02b_hdr.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE" "$CURL_HDR_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_skip() { SKIP_COUNT=$((SKIP_COUNT+1)); echo "  SKIP  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 \
+		-D "$CURL_HDR_FILE" \
+		-o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+	CURL_HDR=$(cat "$CURL_HDR_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+_login() { # $1 = plaintext password
+	_curl -X POST -H "Content-Type: application/json" \
+		-d "{\"password\":\"$1\"}" "$API/auth/login"
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required. brew install jq."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+echo "amuleapi 02b-auth-lockout-isolation smoke @ $HOST"
+
+# --- 0. Precondition: guest must actually be able to log in. -------
+# The whole point is that a *guest* success cannot clear the bucket, so a
+# daemon without a usable guest password proves nothing. Skip rather than
+# fail: that is a bring-up shortfall, not a regression.
+_login "$GUEST_PASS"
+if  "$CURL_STATUS" != "200" ; then
+	_skip "guest login unavailable (HTTP $CURL_STATUS) - cannot test cross-credential reset"
+	echo
+	echo "PASS: $((TEST_COUNT-FAIL_COUNT))/$TEST_COUNT passed ($SKIP_COUNT skipped)"
+	exit 0
+fi
+_pass "precondition: guest can log in"
+
+# --- 1. Four failed admin guesses, one below the threshold. --------
+# Default limiter: 5 failures / 60 s → 300 s lockout.
+for i in 1 2 3 4; do
+	_login "wrong-admin-guess-$i"
+	_assert_status 401 "failed admin guess $i/4 → 401"
+done
+
+# --- 2. A successful GUEST login must not clear the admin streak. --
+_login "$GUEST_PASS"
+_assert_status 200 "guest login between the guesses → 200"
+
+# --- 3. The streak survived: the 5th failure arms the lockout. -----
+# Were the bucket cleared by step 2, this would be failure #1 of a fresh
+# window and step 4 would answer 401 instead of 429.
+_login "wrong-admin-guess-5"
+_assert_status 401 "5th failed guess still returns 401 (arms the lockout)"
+
+# --- 4. The next attempt is locked out. ----------------------------
+# Asserted with the CORRECT admin password: a 429 here proves the lockout is
+# in force rather than the password being wrong, which is the whole control.
+_login "$ADMIN_PASS"
+_assert_status 429 "correct admin password is locked out → 429"
+_assert_json_eq '.error.code' rate_limited 'lockout carries error.code=rate_limited'
+
+# --- 5. Guest cannot unlock it either. -----------------------------
+# The bucket is per-IP, so a guest holder must not be able to log in and
+# clear the lockout out from under the admin.
+_login "$GUEST_PASS"
+_assert_status 429 "guest is locked out by the same bucket → 429"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed${SKIP_COUNT:+ ($SKIP_COUNT skipped)}"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/03-read-status.sh Added

@@ -0,0 +1,235 @@
+#!/usr/bin/env bash
+#
+# amuleapi 03-read-status — read endpoints, /status only. Validates the
+# refresher → state cache → handler chain end-to-end against a live
+# amuled. The remaining 12 endpoints (downloads, uploads, shared,
+# servers, kad, categories, logs/amule, logs/server_info, preferences,
+# stats/tree, stats/graphs, search/results) land in subsequent
+# sub-phases (4b/4c/4d); their phase scripts share this directory.
+#
+# Bring-up convention:
+#   rm -rf /tmp/amuleapi-03-read-status && mkdir -p /tmp/amuleapi-03-read-status
+#   amuleapi --config-dir=/tmp/amuleapi-03-read-status --host=127.0.0.1 \
+#            --port=4712 --password=amule --set-admin-pass=adminpass
+#   amuleapi --config-dir=/tmp/amuleapi-03-read-status --host=127.0.0.1 \
+#            --port=4712 --password=amule &
+#   ./03-read-status.sh
+#
+# Environment:
+#   HOST=localhost:4713          amuleapi endpoint
+#   ADMIN_PASS=adminpass         plaintext admin password
+#   GUEST_PASS=guestpass         plaintext guest password (run-all.sh
+#                                configures it via --set-guest-pass;
+#                                standalone invocations need this set
+#                                or the guest-read assertion is skipped)
+#
+# Exits 0 on success, 1 on assertion failure, 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_03_read_status_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 \
+		-o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required. brew install jq."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+echo "amuleapi 03-read-status smoke @ $HOST"
+
+# --- 1. /status without auth → 401 unauthorized. -------------------
+_curl "$API/status"
+_assert_status 401 "GET /api/v1/status (no creds) → 401"
+_assert_json_eq '.error.code' unauthorized \
+	'unauthenticated /status carries error.code=unauthorized'
+
+# --- 2. Log in as admin and capture the bearer. --------------------
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  \
+	|| _die "could not log in for /status tests"
+
+# Wait for the refresher to land its first snapshot. On a fast
+# Linux host the first tick is sub-second; on the Windows VM the
+# 503 ec_unavailable window can stretch a few seconds under load.
+# Poll up to 15 s, same shape run-all.sh uses for /health, so
+# the test doesn't drift to "disconnected" under runner pressure.
+for _ in $(seq 1 30); do
+	probe=$(curl -s -o /dev/null -w "%{http_code}" \
+		-H "Authorization: Bearer $TOKEN" \
+		"$API/status")
+	 "$probe" = "200"  && break
+	sleep 0.5
+done
+
+# --- 3. /status with bearer → 200 + envelope shape. ----------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/status"
+_assert_status 200 "GET /api/v1/status (admin bearer) → 200"
+
+# Envelope metadata.
+_assert_json_eq '.ec_connected | type' boolean \
+	'ec_connected is boolean'
+
+# ed2k subtree.
+_assert_json_eq '.ed2k.state | test("^(connected|connecting|disconnected)$")' \
+	true 'ed2k.state is a known enum value'
+_assert_json_eq '.ed2k.high_id | type' boolean \
+	'ed2k.high_id is boolean'
+_assert_json_eq '.ed2k.user_id | type' number \
+	'ed2k.user_id is numeric'
+# `user_id` is the server-assigned identity, not a local handle.
+_assert_json_eq '.ed2k | has("id")' false \
+	'ed2k exposes user_id, not id'
+_assert_json_eq '.ed2k.public_ip | type | . == "string" or . == "null"' true \
+	'ed2k.public_ip is a string or null'
+# A public address exists exactly when we hold a HighID on a live connection;
+# a LowID carries none, and neither does a disconnected daemon. Absent is null,
+# not "" -- the surface spells "no value" one way (R10).
+_assert_json_eq '(.ed2k.public_ip != null) == (.ed2k.high_id and .ed2k.state == "connected")' \
+	true 'ed2k.public_ip is non-null exactly when high_id and connected'
+# The 0xffffffff "connect in flight" sentinel must never surface.
+_assert_json_eq '.ed2k.user_id != 4294967295' true \
+	'ed2k.user_id never reports the connecting sentinel'
+# The connected-server triple nulls together, so server_name is asserted
+# against server_ip rather than by type alone.
+_assert_json_eq '(.ed2k.server_name == null) == (.ed2k.server_ip == null)' true \
+	'ed2k.server_name is null exactly when server_ip is'
+_assert_json_eq '.ed2k.server_name | type | test("^(string|null)$")' true \
+	'ed2k.server_name is a string or null, never another type'
+
+# kad subtree.
+_assert_json_eq '.kad.state | test("^(connected|connecting|disabled)$")' \
+	true 'kad.state is a known enum value'
+# Named for the transport: this is the TCP half of the pair GET /kad reports,
+# not an overall verdict refined by firewalled_udp.
+# Gated on Kad being connected: the underlying connstate bit outlives a
+# disconnect, so this reported a reachability verdict for a network the daemon
+# was not on. Same rule as /kad's own copy of the field.
+_assert_json_eq '(.kad.state == "connected") or (.kad.firewalled_tcp == null)' true \
+	'kad.firewalled_tcp is null while Kad is not connected'
+_assert_json_eq '(.kad.state != "connected") or ((.kad.firewalled_tcp | type) == "boolean")' true \
+	'kad.firewalled_tcp is boolean while Kad is connected'
+# The network rollups, both sides. ed2k's summed the whole known SERVER LIST
+# rather than the attached server and nothing zeroed them, so a disconnected
+# daemon repeated its connected figures verbatim and indefinitely.
+for P in "ed2k user_count" "ed2k file_count" "kad user_count" "kad file_count" "kad node_count"; do
+	set -- $P
+	_assert_json_eq "(.$1.state == \"connected\") or (.$1.network.$2 == null)" true \
+		"$1.network.$2 is null while $1 is not connected"
+	_assert_json_eq "(.$1.state != \"connected\") or ((.$1.network.$2 | type) == \"number\")" true \
+		"$1.network.$2 is numeric while $1 is connected"
+done
+_assert_json_eq '.kad | has("firewalled")' false \
+	'kad exposes firewalled_tcp, not firewalled'
+
+# speeds + queue subtrees.
+_assert_json_eq '.speeds.download_speed_bytes_per_second | type' number \
+	'speeds.download_speed_bytes_per_second is numeric'
+_assert_json_eq '.speeds.upload_speed_bytes_per_second | type' number \
+	'speeds.upload_speed_bytes_per_second is numeric'
+_assert_json_eq '.speeds.download_overhead_bytes_per_second | type' number \
+	'speeds.download_overhead_bytes_per_second is numeric'
+_assert_json_eq '.speeds.upload_overhead_bytes_per_second | type' number \
+	'speeds.upload_overhead_bytes_per_second is numeric'
+_assert_json_eq '.queue.waiting_upload_client_count | type' number \
+	'queue.waiting_upload_client_count is numeric'
+_assert_json_eq '.queue.download_source_count | type' number \
+	'queue.download_source_count is numeric'
+
+# disk subtree: a number, or null when the daemon has no figure. Never the
+# unsigned reading of the -1 sentinel, and never 0 (which would read as a
+# full disk).
+_assert_json_eq '.disk.temp_free_bytes | type | . == "number" or . == "null"' true \
+	'disk.temp_free_bytes is a number or null'
+_assert_json_eq '.disk.incoming_free_bytes | type | . == "number" or . == "null"' true \
+	'disk.incoming_free_bytes is a number or null'
+_assert_json_eq '.disk | map(select(. == 18446744073709551615)) | length == 0' true \
+	'disk figures never report the unsigned free-space sentinel'
+
+# These spellings are not part of the surface; assert they are absent from the
+# whole body rather than merely unused by the assertions above.
+_assert_json_eq 'paths | join(".") | map(select(test("low_id|upload_queue_length|total_source_count"))) | length == 0' \
+	true '/status carries none of these field names'
+
+# --- 4. /status with guest bearer also works (any-role read gate). --
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+if  -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null" ; then
+	_curl -H "Authorization: Bearer $GUEST_TOKEN" "$API/status"
+	_assert_status 200 "GET /api/v1/status (guest bearer) → 200"
+else
+	# run-all.sh always configures a guest password; if a future
+	# fixture drops it, surface the gap rather than silently
+	# pretending the guest read-gate was exercised.
+	_die "guest login failed in 03-read-status fixture — 03-read-status is supposed to verify both roles can read /status; check that GUEST_PASS is wired"
+fi
+
+# --- 5. Method gate. ----------------------------------------------
+_curl -X DELETE -H "Authorization: Bearer $TOKEN" "$API/status"
+_assert_status 405 "DELETE /api/v1/status → 405 method_not_allowed"
+
+# --- 6. HEAD /status. ----------------------------------------------
+_curl -I -H "Authorization: Bearer $TOKEN" "$API/status"
+_assert_status 200 "HEAD /api/v1/status → 200"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/04-read-downloads-shared.sh Added

@@ -0,0 +1,776 @@
+#!/usr/bin/env bash
+#
+# amuleapi /downloads, /downloads/{hash}, /shared. Exercises the
+# consolidated GET_UPDATE @ EC_DETAIL_INC_UPDATE polling path end-
+# to-end, the ECID-keyed state cache, the auth gate, and the bare-
+# object detail shape.
+#
+# This smoke is intentionally tolerant of empty caches — it asserts
+# the envelope shape and the per-item field types without requiring
+# a specific download / upload / shared file to exist on the daemon.
+# Field-content correctness is exercised by the unit tests against
+# crafted EC packets, and by the live test the dev runs against
+# their daemon (`./build-macos/src/webapi/amuleapi ...` →
+# `curl /downloads | jq`).
+#
+# Bring-up convention:
+#   rm -rf /tmp/amuleapi-04-read-downloads-shared && mkdir -p /tmp/amuleapi-04-read-downloads-shared
+#   amuleapi --config-dir=/tmp/amuleapi-04-read-downloads-shared --host=127.0.0.1 \
+#            --port=4712 --password=amule --set-admin-pass=adminpass
+#   amuleapi --config-dir=/tmp/amuleapi-04-read-downloads-shared --host=127.0.0.1 \
+#            --port=4712 --password=amule &
+#   ./04-read-downloads-shared.sh
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+# Skips are counted apart from TEST_COUNT, never folded into it: a skipped
+# check is coverage that did not happen, and adding it to the passed tally
+# would report the absence of a check as a check that succeeded.
+SKIP_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_04_read_downloads_shared_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_skip() { SKIP_COUNT=$((SKIP_COUNT+1)); echo "  SKIP  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 \
+		-o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required. brew install jq."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+echo "amuleapi 04-read-downloads-shared smoke @ $HOST"
+
+# --- 0. Log in. ----------------------------------------------------
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  \
+	|| _die "could not log in"
+
+# Allow the first two refresher ticks to populate the cache (cold
+# start: Phase 1 surfaces every existing file as "new", Phase 2 ships
+# their identities; from tick 2 the cache is fully built).
+sleep 3
+
+# --- 1. Each list endpoint pre-auth → 401. -------------------------
+for ep in downloads shared; do
+	_curl "$API/$ep"
+	_assert_status 401 "GET /api/v1/$ep without creds → 401"
+done
+
+# --- 2. List endpoints with admin bearer → 200 + envelope shape. ---
+for ep in downloads shared; do
+	_curl -H "Authorization: Bearer $TOKEN" "$API/$ep"
+	_assert_status 200 "GET /api/v1/$ep (admin bearer) → 200"
+	_assert_json_eq ".$ep | type"                array   "/$ep .$ep is an array"
+done
+
+# --- 3. /downloads element shape (only when there's at least one). -
+_curl -H "Authorization: Bearer $TOKEN" "$API/downloads"
+COUNT=$(printf '%s' "$CURL_BODY" | jq '.downloads | length')
+if  "$COUNT" -gt 0 ; then
+	echo "  --- /downloads has $COUNT entry/entries; shape checks ---"
+	_assert_json_eq '.downloads0.hash | length' 32 \
+		'/downloads0.hash is 32-char hex'
+	_assert_json_eq '.downloads0.ecid | type' null \
+		'/downloads0 does not expose internal ecid'
+	_assert_json_eq '.downloads0.name | type' string \
+		'/downloads0.name is string'
+	_assert_json_eq '.downloads0.size_bytes | type' number \
+		'/downloads0.size_bytes is numeric'
+	_assert_json_eq '.downloads0.status | test("^(downloading|paused|stopped|completed|hashing|erroneous|completing|allocating|waiting|insufficient_disk|unknown)$")' \
+		true '/downloads0.status is a known enum value'
+	_assert_json_eq '.downloads0.priority | test("^(very_low|low|normal|high|release|auto)$")' \
+		true '/downloads0.priority is a known enum value'
+	_assert_json_eq '.downloads0.progress.percent | type' number \
+		'/downloads0.progress.percent is numeric'
+	_assert_json_eq '.downloads0.sources | type' object \
+		'/downloads0.sources is object'
+	_assert_json_eq '.downloads0.sources.total | type' number \
+		'/downloads0.sources.total is numeric'
+	_assert_json_eq '.downloads0.kad_comment_lookup_running | type' boolean \
+		'/downloads0.kad_comment_lookup_running is boolean (issue #434)'
+	# On the list row (#1054) so a list-driven client can see a hash running,
+	# not only the detail response.
+	_assert_json_eq '.downloads0.hashed_part_count | type' number \
+		'/downloads0.hashed_part_count is numeric (#1054)'
+	# A4AF membership on the list, so the SSE download event carries it and a
+	# per-file Clients panel stops polling /downloads/{hash}/clients for it.
+	_assert_json_eq '.downloads0.source_ecids | type' array \
+		'/downloads0.source_ecids is an array'
+	_assert_json_eq '.downloads0.source_ecids | type | all(. == "number")' true \
+		'/downloads0.source_ecids holds only numeric ECIDs'
+
+	# --- 4. /downloads/{hash} bare-object detail. -----------------
+	HASH=$(printf '%s' "$CURL_BODY" | jq -r '.downloads0.hash')
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH"
+	_assert_status 200 "GET /api/v1/downloads/{hash} → 200"
+	# Detail response is bare — `hash` at top level, no `snapshot_at`
+	# envelope (Q3 in PLAN.md §12).
+	_assert_json_eq '.hash' "$HASH" '/downloads/{hash} returns bare object keyed by hash'
+	_assert_json_eq '.snapshot_at | type' null \
+		'/downloads/{hash} has no snapshot_at envelope (bare object)'
+	_assert_json_eq '.progress.percent | type' number \
+		'/downloads/{hash} carries progress.percent'
+	# Part-A detail fields (issue #417) — detail-only, type-tolerant.
+	_assert_json_eq '.total_part_count | type' number \
+		'/downloads/{hash} carries total_part_count'
+	# null when stalled/paused: nothing to compute an ETA from. It was -1,
+	# which a client had to know meant "unknown".
+	_assert_json_eq '(.remaining_seconds == null or (.remaining_seconds | type) == "number")' true \
+		'/downloads/{hash} remaining_seconds is a number or null'
+	# Same rule: null, not a 0 that reads as 1970, when no complete copy of
+	# the file has ever been seen across the current sources.
+	_assert_json_eq '(.last_seen_complete_at == null or (.last_seen_complete_at | type) == "number")' true \
+		'/downloads/{hash} last_seen_complete_at is a number or null'
+	_assert_json_eq '.last_seen_complete_at != 0' true \
+		'/downloads/{hash} last_seen_complete_at never uses 0 as "never"'
+	# R10: null until the hashset exists, never a "" sentinel.
+	_assert_json_eq '(.aich_hash == null or (.aich_hash | type) == "string")' true \
+		'/downloads/{hash} aich_hash is a string or null, never ""'
+	_assert_json_eq '.aich_hash != ""' true \
+		'/downloads/{hash} aich_hash never uses the empty-string sentinel'
+	# Present while the file is still a partfile, and the key is OMITTED once
+	# the download completes -- a completed file structurally has no partfile,
+	# which is the absent-key case rather than the null of "not reported", not
+	# a manufactured "" a client would read as "completed".
+	_assert_json_eq 'if .status == "completed" then (has("part_file_name") | not) else (.part_file_name | type) == "string" end' \
+		true '/downloads/{hash} carries part_file_name unless completed, where the key is absent'
+	_assert_json_eq '.part_file_name != ""' true \
+		'/downloads/{hash} part_file_name never uses the empty-string sentinel'
+	_assert_json_eq '.directory | type' string \
+		'/downloads/{hash} carries directory (#417)'
+	_assert_json_eq '.upload_queue_count | type' number \
+		'/downloads/{hash} carries upload_queue_count'
+	_assert_json_eq '.my_comment | type' string \
+		'/downloads/{hash} carries my_comment (yours, not comments.comment)'
+	_assert_json_eq '.my_rating | type' number \
+		'/downloads/{hash} carries my_rating (yours, not comments.rating)'
+	_assert_json_eq '.a4af_auto | type' boolean \
+		'/downloads/{hash} carries a4af_auto'
+	_assert_json_eq '.source_ecids | type' array \
+		'/downloads/{hash} carries source_ecids (same key as POST .../a4af)'
+
+	# Per-source comments sub-resource (issue #419).
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH/comments"
+	_assert_status 200 "GET /downloads/{hash}/comments → 200"
+	_assert_json_eq '.total | type' number \
+		'/downloads/{hash}/comments carries numeric total'
+	_assert_json_eq '.comments | type' array \
+		'/downloads/{hash}/comments.comments is an array'
+	_assert_json_eq '.kad_comment_lookup_running | type' boolean \
+		'/downloads/{hash}/comments carries kad_comment_lookup_running flag'
+
+	# Trigger an on-demand Kad notes lookup (issue #434). Async on the daemon;
+	# 202 Accepted (or 400 amuled_rejected if Kad is not connected in the smoke
+	# environment — accept either as a valid handled response, but not 404/405).
+	_curl -X POST -H "Authorization: Bearer $TOKEN" \
+		"$API/downloads/$HASH/comments"
+	if  "$CURL_STATUS" = "202"  ||  "$CURL_STATUS" = "400" ; then
+		_pass "POST /downloads/{hash}/comments (Kad search) → $CURL_STATUS (accepted/handled)"
+	else
+		_fail "POST /downloads/{hash}/comments (Kad search)" \
+			"expected 202 or 400, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+
+	# Source-reported filenames sub-resource (issue #420).
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH/filenames"
+	_assert_status 200 "GET /downloads/{hash}/filenames → 200"
+	_assert_json_eq '.filenames | type' array \
+		'/downloads/{hash}/filenames.filenames is an array'
+	# `media` (issue #418) is omitted for a file with no probed metadata,
+	# which the smoke daemon's test files never have.
+	_assert_json_eq '.media | type' null \
+		'/downloads/{hash} omits media when unprobed'
+
+	# A4AF sources are the per-file client rows below, which carry the whole
+	# peer object per source rather than a bare ECID, and `a4af_auto` lives on
+	# the download detail object, asserted above. The a4af path is POST-only.
+
+	# Unknown action → 400 (mutation validation; admin token).
+	_curl -X POST -H "Authorization: Bearer $TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"action":"bogus"}' "$API/downloads/$HASH/a4af"
+	_assert_status 400 "POST /downloads/{hash}/a4af unknown action → 400"
+
+	# `swap_this_auto` was a third action here and is refused, not ignored:
+	# it flipped a flag rather than moving sources, and a flip cannot be
+	# retried safely. The message names where the flag is set instead.
+	_curl -X POST -H "Authorization: Bearer $TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"action":"swap_this_auto"}' "$API/downloads/$HASH/a4af"
+	_assert_status 400 "POST a4af swap_this_auto → 400 (it is a PATCH action)"
+	_assert_json_eq '.error.message | test("a4af_auto")' true \
+		'the swap_this_auto 400 names the PATCH field'
+
+	# --- a4af_auto is a set, and setting it twice is not an undo. -------
+	#
+	# This is the whole point of a4af_auto being a set: EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO
+	# maps to SetA4AFAuto(!IsA4AFAuto()), so a bare swap would land on the
+	# opposite value whenever a request was repeated -- which an HTTP library
+	# or a browser can do without the caller knowing.
+	for want in true false true; do
+		_curl -X PATCH -H "Authorization: Bearer $TOKEN" \
+			-H "Content-Type: application/json" \
+			-d "{\"a4af_auto\":$want}" "$API/downloads/$HASH"
+		_assert_status 200 "PATCH a4af_auto=$want → 200"
+		_assert_json_eq '.a4af_auto' "$want" "PATCH a4af_auto=$want reads back $want"
+
+		# Same body again: the value must not move.
+		_curl -X PATCH -H "Authorization: Bearer $TOKEN" \
+			-H "Content-Type: application/json" \
+			-d "{\"a4af_auto\":$want}" "$API/downloads/$HASH"
+		_assert_status 200 "PATCH a4af_auto=$want again → 200"
+		_assert_json_eq '.a4af_auto' "$want" \
+			"a repeated PATCH a4af_auto=$want is a no-op, not a flip"
+
+		# ...and a re-read agrees, so the PATCH body is not the only place
+		# the new value exists.
+		_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH"
+		_assert_json_eq '.a4af_auto' "$want" "GET after PATCH reports $want"
+	done
+
+	# A non-boolean is a 400 rather than a coerced truthy value.
+	_curl -X PATCH -H "Authorization: Bearer $TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"a4af_auto":"yes"}' "$API/downloads/$HASH"
+	_assert_status 400 "PATCH a4af_auto non-boolean → 400"
+
+	# Per-file client rows (issue #984): the peers of one file, with their
+	# relation to it, replacing a client-side join against the global list.
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH/clients"
+	_assert_status 200 "GET /downloads/{hash}/clients → 200"
+	_assert_json_eq '.clients | type' array '/downloads/{hash}/clients returns a clients array'
+	for k in total offset limit; do
+		_assert_json_eq "has(\"$k\")" true "/downloads/{hash}/clients envelope has $k"
+	done
+
+	# Every row carries its relation to this file, and no row carries a parts
+	# bitmap unless it was asked for. These are `... | length == 0` shapes,
+	# which pass over an empty array whether or not the feature works, so
+	# they are guarded on -- and the run prints -- the row count: a green run
+	# must not claim coverage it did not get.
+	DLROWS=$(printf '%s' "$CURL_BODY" | jq '.clients | length')
+	echo "  --- /downloads/{hash}/clients returned $DLROWS row(s) ---"
+	if  "$DLROWS" -gt 0 ; then
+		_assert_json_eq '.clients | select(.role as $r | ($r == null) or (("downloading_from","uploading_to","both","none" | index($r)) == null)) | length' \
+			0 "every row has a valid role"
+		_assert_json_eq '.clients | select(.a4af == null) | length' 0 "every row has an a4af flag"
+		_assert_json_eq '.clients | select(has("parts")) | length' 0 "no parts bitmap without include_parts"
+		# The two part indices ride include_parts with the bitmap: an
+		# index into a bitmap the caller did not ask for is unreadable,
+		# so neither key may appear here either.
+		_assert_json_eq '.clients | select(has("next_requested_part_index") or has("downloading_part_index")) | length' \
+			0 "no part indices without include_parts"
+	else
+		_skip "row-shape checks: no peer is connected to the download"
+	fi
+
+	# Opt-in bitmaps are exactly total_part_count long for a row that has one.
+	PARTCOUNT=$(curl -s -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH" | jq -r '.progress.parts | length')
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH/clients?include_parts=true"
+	_assert_status 200 "GET /downloads/{hash}/clients?include_parts=true → 200"
+	DLBITMAPS=$(printf '%s' "$CURL_BODY" | jq '.clients | select(has("parts")) | length')
+	if  "$DLBITMAPS" -gt 0 ; then
+		_assert_json_eq ".clients | select(has(\"parts\")) | select((.parts | length) != $PARTCOUNT) | length" \
+			0 "every parts bitmap ($DLBITMAPS of them) is exactly total_part_count entries"
+	else
+		_skip "parts-length check: no row carries a bitmap"
+	fi
+
+	# R7: a sort value is spelled exactly like the response key it orders by,
+	# so a field name can never orphan one. These three match the response
+	# keys; other spellings are rejected rather than silently accepted.
+	for _sk in size_bytes progress.percent speed_bytes_per_second hash name status; do
+		_curl -H "Authorization: Bearer $TOKEN" "$API/downloads?sort=$_sk&limit=1"
+		_assert_status 200 "/downloads?sort=$_sk (R7: sort value == response key) → 200"
+	done
+	for _sk in size progress speed; do
+		_curl -H "Authorization: Bearer $TOKEN" "$API/downloads?sort=$_sk&limit=1"
+		_assert_status 400 "/downloads?sort=$_sk (not a valid sort key) → 400"
+	done
+	# The two part indices the desktop's source bar paints over the bitmap.
+	# Under include_parts both keys are ALWAYS present on every row, null
+	# rather than omitted when the index does not apply, so one query yields
+	# one row shape -- assert presence separately from type, or a missing key
+	# and a null one both read as `null` and the test proves nothing.
+	#
+	# Re-issued rather than reusing the include_parts body fetched above: the
+	# sort loops in between have each overwritten $CURL_BODY, and the last of
+	# them left a 400 error envelope there. `.clients` on that is null, `null
+	# | length` is 0, and the whole block below would have skipped itself on
+	# every run while reporting "no peer is connected".
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH/clients?include_parts=true"
+	_assert_status 200 "GET /downloads/{hash}/clients?include_parts=true (part-index block) → 200"
+	DLIDXROWS=$(printf '%s' "$CURL_BODY" | jq '.clients | length')
+	echo "  --- part-index block sees $DLIDXROWS row(s) ---"
+	if  "$DLIDXROWS" -gt 0 ; then
+		for k in next_requested_part_index downloading_part_index; do
+			_assert_json_eq ".clients | select(has(\"$k\") | not) | length" 0 \
+				"every row carries $k under include_parts"
+			# Number or null, never a string and never a bool: null is
+			# how "the peer never reported it", the 0xffff "nothing
+			# pending" sentinel, and a non-source row are all spelled.
+			_assert_json_eq ".clients | select((.$k | type) as \$t | \$t != \"number\" and \$t != \"null\") | length" \
+				0 "$k is a number or null on every row"
+			# 0 is a real chunk index, so an unknown value must be a
+			# JSON null and not a 0 standing in for one; and a known
+			# value must address a chunk of THIS file.
+			_assert_json_eq ".clients | select(.$k != null) | select(.$k < 0 or .$k >= $PARTCOUNT) | length" \
+				0 "$k, when not null, is an index inside 0, part_count)"
+		done
+		# A row that is not a source for this file has no download bitmap,
+		# so its indices belong to some other file: both must be null.
+		_assert_json_eq '.clients | select(.role == "uploading_to" or .role == "none") | select(.next_requested_part_index != null or .downloading_part_index != null) | length' \
+			0 "non-source rows report both part indices as null"
+		# An index is only meaningful against the bitmap it indexes, and
+		# role alone does not guarantee one: a source that has sent no
+		# part status yet, or whose decoded bitmap cannot cover the file,
+		# ships no `parts` key at all. Such a row is a stripe coordinate
+		# with no bar to paint it on, so both indices must be null there
+		# too. Count the rows that actually exercised it, so a green run
+		# with no such row cannot be read as having proved the gate.
+		DLNOBITS=$(printf '%s' "$CURL_BODY" | jq '.clients | select(has("parts") | not) | length')
+		_assert_json_eq '.clients | select(has("parts") | not) | select(.next_requested_part_index != null or .downloading_part_index != null) | length' \
+			0 "a row without a parts bitmap reports both part indices as null ($DLNOBITS such row(s))"
+		# The state guard: the daemon reports downloading_part_index as a
+		# stale 0 for a source that is merely connected or queued, which
+		# would have a renderer paint "downloading now" on chunk 0 of
+		# every idle row. Anything but download_state "downloading" must
+		# come back null -- and null, not 0, is what distinguishes it
+		# from a peer genuinely feeding chunk 0.
+		DLIDLE=$(printf '%s' "$CURL_BODY" | jq '.clients | select(.role == "downloading_from" or .role == "both") | select(.download_state != "downloading") | length')
+		if  "$DLIDLE" -gt 0 ; then
+			_assert_json_eq '.clients | select(.role == "downloading_from" or .role == "both") | select(.download_state != "downloading") | select(.downloading_part_index != null) | length' \
+				0 "a source that is not downloading reports downloading_part_index null, not 0 ($DLIDLE such row(s))"
+		else
+			_skip "idle-source downloading_part_index check: every source row is actively downloading"
+		fi
+		# Report which path the run actually exercised, so a green run
+		# cannot be read as having seen a live peer feeding a chunk.
+		echo "  --- non-null part indices observed: next=$(printf '%s' "$CURL_BODY" | jq '.clients | select(.next_requested_part_index != null) | length') last=$(printf '%s' "$CURL_BODY" | jq '.clients | select(.downloading_part_index != null) | length') of $DLIDXROWS row(s) ---"
+	else
+		_skip "part-index checks: no peer is connected to the download"
+	fi
+
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH/clients?include_parts=maybe"
+	_assert_status 400 "include_parts must be true/false"
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH/clients?sort=nonsuch"
+	_assert_status 400 "unknown sort key on the per-file route → 400"
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH/clients?sort=name&order=desc"
+	_assert_status 200 "the /clients sort keys work on the per-file route"
+	_curl -X POST -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH/clients"
+	_assert_status 405 "POST /downloads/{hash}/clients → 405"
+	_curl -H "Authorization: Bearer $TOKEN" \
+		"$API/downloads/ffffffffffffffffffffffffffffffff/clients"
+	_assert_status 404 "unknown hash on the per-file route → 404"
+
+	# The promoted client fields (issue #984) must be on the LIST row, not
+	# just the detail object — the desktop renders them as table columns.
+	_curl -H "Authorization: Bearer $TOKEN" "$API/clients?limit=1"
+	if  "$(echo "$CURL_BODY" | jq -r '.clients | length')" != "0" ; then
+		for k in source_origin parts_offered_count client_mod_name shared_files_browsable; do
+			_assert_json_eq ".clients0 | has(\"$k\")" true "/clients row carries $k"
+		done
+	fi
+
+	# The a4af path exists for POST only, so a GET is 405 rather than 404:
+	# the resource is there, the method is not.
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH/a4af"
+	_assert_status 405 "GET /downloads/{hash}/a4af → 405 (POST-only route)"
+
+	# Per-source swap (issue #983): `client_ecid` narrows swap_this to one
+	# source. Validation is asserted here rather than the swap itself — a
+	# regtest daemon has no A4AF source to move, and the rejection/not-found
+	# paths are the ones that must never silently succeed.
+	_curl -X POST -H "Authorization: Bearer $TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"action":"swap_this","client_ecid":"nope"}' "$API/downloads/$HASH/a4af"
+	_assert_status 400 "POST a4af with a non-integer client_ecid → 400"
+
+	_curl -X POST -H "Authorization: Bearer $TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"action":"swap_others","client_ecid":1}' "$API/downloads/$HASH/a4af"
+	_assert_status 400 "POST a4af with client_ecid on swap_others → 400"
+
+	_curl -X POST -H "Authorization: Bearer $TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"action":"swap_this_auto","client_ecid":1}' "$API/downloads/$HASH/a4af"
+	_assert_status 400 "POST a4af with client_ecid on swap_this_auto → 400"
+
+	_curl -X POST -H "Authorization: Bearer $TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"action":"swap_this","client_ecid":4294967290}' "$API/downloads/$HASH/a4af"
+	_assert_status 404 "POST a4af naming an unknown client_ecid → 404"
+
+	# A live client that is not an A4AF source of this file is a rejection, not a
+	# no-op: pick any client from /clients and ensure it is absent from the
+	# A4AF list before asserting.
+	OTHER_ECID=$(curl -s -H "Authorization: Bearer $TOKEN" "$API/clients?limit=1" \
+		| jq -r '.clients0.ecid // empty')
+	if  -n "$OTHER_ECID" ; then
+		IN_A4AF=$(curl -s -H "Authorization: Bearer $TOKEN" \
+			"$API/downloads/$HASH/clients" \
+			| jq -r --argjson e "$OTHER_ECID" '.clients | select(.ecid == $e and .a4af) | length')
+		if  "$IN_A4AF" = "0" ; then
+			_curl -X POST -H "Authorization: Bearer $TOKEN" \
+				-H "Content-Type: application/json" \
+				-d "{\"action\":\"swap_this\",\"client_ecid\":$OTHER_ECID}" \
+				"$API/downloads/$HASH/a4af"
+			_assert_status 409 "POST a4af for a non-A4AF client → 409"
+			_assert_json_eq '.error.code' not_a4af_source \
+				'the 409 names not_a4af_source, not a bare conflict'
+		fi
+	fi
+
+	# Valid action → 200 (no-op on a download with no A4AF sources, but
+	# exercises the EC op path). Response echoes the A4AF view.
+	_curl -X POST -H "Authorization: Bearer $TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"action":"swap_others"}' "$API/downloads/$HASH/a4af"
+	_assert_status 200 "POST /downloads/{hash}/a4af swap_others → 200"
+	_assert_json_eq '.source_ecids | type' array \
+		'POST /a4af response carries source_ecids array'
+
+	# Uppercase hash → same hit (case-insensitive route).
+	HASH_UPPER=$(echo "$HASH" | tr ':lower:' ':upper:')
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$HASH_UPPER"
+	_assert_status 200 "GET /downloads/{HASH-UPPERCASE} → 200 (case-insensitive)"
+else
+	echo "  --- /downloads is empty; skipping per-item shape + detail checks ---"
+fi
+
+# --- 5. Missing-hash 404. -----------------------------------------
+_curl -H "Authorization: Bearer $TOKEN" \
+	"$API/downloads/baadbaadbaadbaadbaadbaadbaadbaad"
+_assert_status 404 "GET /downloads/{nonexistent-hash} → 404"
+_assert_json_eq '.error.code' not_found \
+	'404 carries error.code=not_found'
+
+# --- 6. /shared element shape (always at least .DS_Store on macOS). -
+_curl -H "Authorization: Bearer $TOKEN" "$API/shared"
+SHCOUNT=$(printf '%s' "$CURL_BODY" | jq '.shared | length')
+if  "$SHCOUNT" -gt 0 ; then
+	echo "  --- /shared has $SHCOUNT entry/entries; shape checks ---"
+	_assert_json_eq '.shared0.hash | length' 32 \
+		'/shared0.hash is 32-char hex'
+	_assert_json_eq '.shared0.ecid | type' null \
+		'/shared0 does not expose internal ecid'
+	# xfer / requests / accepts are top-level counters, not a wrapper (R11).
+	_assert_json_eq '.shared0 | has("xfer")' false \
+		'/shared0 does not wrap counters in xfer'
+	_assert_json_eq '.shared0.uploaded_bytes_total | type' number \
+		'/shared0.uploaded_bytes_total is numeric'
+	_assert_json_eq '.shared0.priority | type' string \
+		'/shared0.priority is string'
+	_assert_json_eq '.shared0.priority_auto | type' boolean \
+		'/shared0.priority_auto is boolean'
+	# Live upload activity (issue #466).
+	_assert_json_eq '.shared0.upload_speed_bytes_per_second | type' number \
+		'/shared0.upload_speed_bytes_per_second is numeric (#466)'
+	_assert_json_eq '.shared0.uploading_client_count | type' number \
+		'/shared0.uploading_client_count is numeric (#466)'
+	# null when never uploaded, or on a known.met entry predating the field.
+	_assert_json_eq '(.shared0.last_upload_at == null or (.shared0.last_upload_at | type) == "number")' true \
+		'/shared0.last_upload_at is a number or null (#466)'
+	_assert_json_eq '(.shared0.shared_since_at == null or (.shared0.shared_since_at | type) == "number")' true \
+		'/shared0.shared_since_at is a number or null (#466)'
+	# Hashing progress on the shared row (issue #1054). Parts hashed so far
+	# by a Verify Local Data / AICH rebuild, 0 when idle. Only the type is
+	# asserted: a smoke run has no hash in flight, and racing one would make
+	# the check flaky rather than stronger.
+	_assert_json_eq '.shared0.hashed_part_count | type' number \
+		'/shared0.hashed_part_count is numeric (#1054)'
+
+	# --- 6b. GET /shared/{hash} detail endpoint (issue #417 Part B). ---
+	SHASH=$(printf '%s' "$CURL_BODY" | jq -r '.shared0.hash')
+	_curl -H "Authorization: Bearer $TOKEN" "$API/shared/$SHASH"
+	_assert_status 200 "GET /api/v1/shared/{hash} → 200 (new detail endpoint)"
+	_assert_json_eq '.hash' "$SHASH" \
+		'/shared/{hash} returns bare object keyed by hash'
+	_assert_json_eq '.snapshot_at | type' null \
+		'/shared/{hash} has no snapshot_at envelope (bare object)'
+	_assert_json_eq '.file_type | type' string \
+		'/shared/{hash} carries file_type'
+	_assert_json_eq '.upload_ratio | type' number \
+		'/shared/{hash} carries upload_ratio'
+	_assert_json_eq '.directory | type' string \
+		'/shared/{hash} carries directory'
+	_assert_json_eq '.sources | type' object \
+		'/shared/{hash} carries sources'
+	_assert_json_eq '.aich_hash | type' string \
+		'/shared/{hash} carries aich_hash'
+	_assert_json_eq '.total_part_count | type' number \
+		'/shared/{hash} carries total_part_count'
+	_assert_json_eq '.hashed_part_count | type' number \
+		'/shared/{hash} carries hashed_part_count (#1054)'
+	_assert_json_eq '.my_comment | type' string \
+		'/shared/{hash} carries my_comment'
+	_assert_json_eq '.my_rating | type' number \
+		'/shared/{hash} carries my_rating'
+	SHPARTCOUNT=$(printf '%s' "$CURL_BODY" | jq -r '.total_part_count')
+
+	# --- 6c. GET /shared/{hash}/clients: the upload-side half of the
+	# per-file client rows (issue #984). Same handler and same row shape as
+	# the download side asserted above; what differs is which collection the
+	# hash must belong to, which is what the 404 below pins down.
+	_curl -H "Authorization: Bearer $TOKEN" "$API/shared/$SHASH/clients"
+	_assert_status 200 "GET /shared/{hash}/clients → 200"
+	_assert_json_eq '.clients | type' array '/shared/{hash}/clients returns a clients array'
+	for k in total offset limit; do
+		_assert_json_eq "has(\"$k\")" true "/shared/{hash}/clients envelope has $k"
+	done
+	# Guarded and counted like the download side above: a shared file has
+	# rows only while a peer is downloading it from us.
+	SHROWS=$(printf '%s' "$CURL_BODY" | jq '.clients | length')
+	echo "  --- /shared/{hash}/clients returned $SHROWS row(s) ---"
+	if  "$SHROWS" -gt 0 ; then
+		_assert_json_eq '.clients | select(.role as $r | ($r == null) or (("downloading_from","uploading_to","both","none" | index($r)) == null)) | length' \
+			0 "every shared-side row has a valid role"
+		_assert_json_eq '.clients | select(.a4af == null) | length' 0 \
+			"every shared-side row has an a4af flag"
+		_assert_json_eq '.clients | select(has("parts")) | length' 0 \
+			"no parts bitmap on the shared route without include_parts"
+		_assert_json_eq '.clients | select(has("next_requested_part_index") or has("downloading_part_index")) | length' \
+			0 "no part indices on the shared route without include_parts"
+	else
+		_skip "shared-side row-shape checks: no peer is downloading the shared file"
+	fi
+
+	# Same two keys on the shared route, which is the same handler. A shared
+	# file's rows are overwhelmingly role "uploading_to" -- someone pulling from us --
+	# and a peer's download indices describe whatever IT is downloading, not
+	# this file, so the interesting case here is that they come back null.
+	_curl -H "Authorization: Bearer $TOKEN" "$API/shared/$SHASH/clients?include_parts=true"
+	_assert_status 200 "GET /shared/{hash}/clients?include_parts=true → 200"
+	SHIDXROWS=$(printf '%s' "$CURL_BODY" | jq '.clients | length')
+	if  "$SHIDXROWS" -gt 0 ; then
+		for k in next_requested_part_index downloading_part_index; do
+			_assert_json_eq ".clients | select(has(\"$k\") | not) | length" 0 \
+				"every shared-side row carries $k under include_parts"
+			_assert_json_eq ".clients | select((.$k | type) as \$t | \$t != \"number\" and \$t != \"null\") | length" \
+				0 "$k is a number or null on every shared-side row"
+			_assert_json_eq ".clients | select(.$k != null) | select(.$k < 0 or .$k >= $SHPARTCOUNT) | length" \
+				0 "$k, when not null, indexes a chunk of the shared file"
+		done
+		_assert_json_eq '.clients | select(.role == "uploading_to" or .role == "none") | select(.next_requested_part_index != null or .downloading_part_index != null) | length' \
+			0 "shared-side non-source rows report both part indices as null"
+		# An index is only meaningful against the bitmap it indexes, and
+		# role alone does not guarantee one: a source that has sent no
+		# part status yet, or whose decoded bitmap cannot cover the file,
+		# ships no `parts` key at all. Such a row is a stripe coordinate
+		# with no bar to paint it on, so both indices must be null there
+		# too. Count the rows that actually exercised it, so a green run
+		# with no such row cannot be read as having proved the gate.
+		SHNOBITS=$(printf '%s' "$CURL_BODY" | jq '.clients | select(has("parts") | not) | length')
+		_assert_json_eq '.clients | select(has("parts") | not) | select(.next_requested_part_index != null or .downloading_part_index != null) | length' \
+			0 "a shared-side row without a parts bitmap reports both part indices as null ($SHNOBITS such row(s))"
+		SHIDLE=$(printf '%s' "$CURL_BODY" | jq '.clients | select(.role == "downloading_from" or .role == "both") | select(.download_state != "downloading") | length')
+		if  "$SHIDLE" -gt 0 ; then
+			_assert_json_eq '.clients | select(.role == "downloading_from" or .role == "both") | select(.download_state != "downloading") | select(.downloading_part_index != null) | length' \
+				0 "a shared-side source that is not downloading reports downloading_part_index null ($SHIDLE such row(s))"
+		else
+			_skip "shared-side idle-source downloading_part_index check: no idle source row"
+		fi
+	else
+		_skip "shared-side part-index checks: no peer is downloading the shared file"
+	fi
+
+	_curl -H "Authorization: Bearer $TOKEN" "$API/shared/$SHASH/clients?include_parts=true"
+	_assert_status 200 "GET /shared/{hash}/clients?include_parts=true → 200"
+	SHBITMAPS=$(printf '%s' "$CURL_BODY" | jq '.clients | select(has("parts")) | length')
+	if  "$SHBITMAPS" -gt 0 ; then
+		_assert_json_eq ".clients | select(has(\"parts\")) | select((.parts | length) != $SHPARTCOUNT) | length" \
+			0 "every shared-side parts bitmap ($SHBITMAPS of them) is exactly total_part_count entries"
+	else
+		_skip "shared-side parts-length check: no row carries a bitmap"
+	fi
+
+	_curl -H "Authorization: Bearer $TOKEN" "$API/shared/$SHASH/clients?include_parts=maybe"
+	_assert_status 400 "include_parts must be true/false on the shared route"
+	_curl -H "Authorization: Bearer $TOKEN" "$API/shared/$SHASH/clients?sort=nonsuch"
+	_assert_status 400 "unknown sort key on /shared/{hash}/clients → 400"
+	_curl -H "Authorization: Bearer $TOKEN" "$API/shared/$SHASH/clients?sort=name&order=desc&limit=1"
+	_assert_status 200 "the /clients list params work on /shared/{hash}/clients"
+	_curl -X POST -H "Authorization: Bearer $TOKEN" "$API/shared/$SHASH/clients"
+	_assert_status 405 "POST /shared/{hash}/clients → 405"
+
+	# A hash that is downloading AND shared answers the same on both routes:
+	# one handler, one row set, the direction carried per row. Speeds move
+	# between two snapshots, so compare the row set and each row's relation
+	# to the file rather than the whole body.
+	DL_HASHES=$(curl -s --max-time 10 -H "Authorization: Bearer $TOKEN" \
+		"$API/downloads" | jq -c '.downloads.hash')
+	SHARED_HASHES=$(curl -s --max-time 10 -H "Authorization: Bearer $TOKEN" \
+		"$API/shared" | jq -c '.shared.hash')
+	BOTH_HASH=$(printf '%s' "$SHARED_HASHES" | jq -r --argjson dl "$DL_HASHES" \
+		'first(. | select(IN($dl))) // empty')
+	SHARED_ONLY_HASH=$(printf '%s' "$SHARED_HASHES" | jq -r --argjson dl "$DL_HASHES" \
+		'first(. | select(IN($dl) | not)) // empty')
+
+	if  -n "$BOTH_HASH" ; then
+		_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$BOTH_HASH/clients"
+		_assert_status 200 "a downloading+shared hash is served by /downloads/{hash}/clients"
+		DL_ROWS=$(printf '%s' "$CURL_BODY" | jq -c '.clients | {ecid, role, a4af} | sort')
+		_curl -H "Authorization: Bearer $TOKEN" "$API/shared/$BOTH_HASH/clients"
+		_assert_status 200 "the same hash is served by /shared/{hash}/clients"
+		_assert_json_eq '.clients | {ecid, role, a4af} | sort | tojson' "$DL_ROWS" \
+			"both routes return the same rows for a downloading+shared hash"
+	else
+		_skip "same-rows check: no hash is both downloading and shared"
+	fi
+
+	# The 404 pair is the only difference between the two routes: each hash
+	# must belong to that route's collection.
+	if  -n "$SHARED_ONLY_HASH" ; then
+		_curl -H "Authorization: Bearer $TOKEN" \
+			"$API/downloads/$SHARED_ONLY_HASH/clients"
+		_assert_status 404 "a shared-only hash is a 404 on /downloads/{hash}/clients"
+	else
+		_skip "shared-only 404 check: every shared file is also downloading"
+	fi
+fi
+
+# --- 6d. Missing-hash 404s on the shared routes. -------------------
+# Both use a hash that exists nowhere, so neither needs a shared file and
+# both belong outside the "has entries" gate above: on a daemon sharing
+# nothing these are still the checks that pin the routes down.
+_curl -H "Authorization: Bearer $TOKEN" \
+	"$API/shared/baadbaadbaadbaadbaadbaadbaadbaad"
+_assert_status 404 "GET /shared/{nonexistent-hash} → 404"
+_curl -H "Authorization: Bearer $TOKEN" \
+	"$API/shared/baadbaadbaadbaadbaadbaadbaadbaad/clients"
+_assert_status 404 "unknown hash on /shared/{hash}/clients → 404"
+
+# --- 7. Method gate. DELETE is method-gated on the /shared collection
+# (no bulk-unshare endpoint); the /downloads collection now accepts a bulk
+# DELETE (issue #358, exercised by 29-bulk-mutations.sh), so it is no
+# longer 405 here.
+_curl -X DELETE -H "Authorization: Bearer $TOKEN" "$API/shared"
+_assert_status 405 "DELETE /api/v1/shared → 405"
+
+# --- 8. Optional client strings are null, never "" (#1290 item 5). The
+# live client objects spelled "unknown" as a raw "" while /known_clients
+# nulled the identical keys, so one peer described by both disagreed with
+# itself. R10: an unknown value is null and never a sentinel.
+#
+# Appended at the end of the phase on purpose: every request below is a
+# read, but a new section in the middle of the file shifts the daemon state
+# the LATER sections were written against.
+_curl -H "Authorization: Bearer $TOKEN" "$API/clients?limit=1"
+if  "$(echo "$CURL_BODY" | jq -r '.clients | length')" != "0" ; then
+	for k in name software software_version reported_os download_file_name \
+		upload_file_name upload_file_hash download_file_hash \
+		obfuscation_state source_origin client_mod_name; do
+		_assert_json_eq ".clients0 | .$k | type | test(\"^(string|null)\$\")" true \
+			"/clients row: $k is a string or null"
+		_assert_json_eq ".clients0 | .$k == \"\"" false \
+			"/clients row: $k is never an empty string"
+	done
+	# The states are enum labels, not free text -- the daemon always
+	# answers, and an answer it cannot map is the enum's "unknown" member.
+	for k in upload_state download_state ident_state; do
+		_assert_json_eq ".clients0 | .$k | type" "string" \
+			"/clients row: $k stays a string, never null"
+	done
+	# Same rule on the detail object, which shares WriteClientBaseFields.
+	ECID=$(echo "$CURL_BODY" | jq -r '.clients0.ecid')
+	_curl -H "Authorization: Bearer $TOKEN" "$API/clients/$ECID"
+	_assert_status 200 "GET /clients/{ecid} for the null-string check → 200"
+	for k in name software software_version reported_os obfuscation_state \
+		source_origin client_mod_name; do
+		_assert_json_eq ".$k | type | test(\"^(string|null)\$\")" true \
+			"/clients/{ecid}: $k is a string or null"
+		_assert_json_eq ".$k == \"\"" false \
+			"/clients/{ecid}: $k is never an empty string"
+	done
+else
+	_skip "no connected peer, cannot check the client null-string contract"
+fi
+
+# --- 9. source_origin is always a documented token, on the live clients and
+# the known ones alike: local and remote server stay distinct, as in the GUI's
+# Origin column. Reads only, appended at the end for the same reason as 8.
+ORIGIN_TOKENS='"local_server","remote_server","kad","source_exchange","passive","link","source_seeds","search_result","unknown"'
+for path in clients known_clients; do
+	_curl -H "Authorization: Bearer $TOKEN" "$API/$path"
+	if  "$(echo "$CURL_BODY" | jq -r --arg k "$path" '.$k | length')" != "0" ; then
+		_assert_json_eq ".$path.source_origin | select(. != null) - $ORIGIN_TOKENS | length" 0 \
+			"/$path: every source_origin is a documented token"
+	else
+		_skip "/$path: no rows, cannot check the source_origin tokens"
+	fi
+done
+
+# --- 10. media.codec is the display label, never the bare FOURCC the file or
+# the remote server advertised: the desktop and the Web UI show the same string
+# for one file. Reads only, appended at the end for the same reason as 8.
+RAW_FOURCCS='"h264","x264","avc1","hevc","hvc1","xvid","divx","dx50","div3","div4","fmp4","mp4v","mpg4","mp42","mp43","wmv1","wmv2","wmv3","mjpg","vp90","vp80","av01","mp3","aac","ac3","flac","opus","vorb","wma1","wma2"'
+_curl -H "Authorization: Bearer $TOKEN" "$API/shared"
+CODECS=$(echo "$CURL_BODY" | jq -r '.shared? | .media?.codec // empty | length')
+if  "${CODECS:-0}" != "0" ; then
+	_assert_json_eq ".shared? | .media?.codec // empty | ascii_downcase | select(IN($RAW_FOURCCS)) | length" 0 \
+		"/shared: every media.codec is a label, not a raw FOURCC"
+else
+	_skip "/shared: no file carries media metadata, cannot check the codec label"
+fi
+
+# --- Summary. -----------------------------------------------------
+echo
+SKIP_NOTE=""
+ "$SKIP_COUNT" -gt 0  && SKIP_NOTE=" ($SKIP_COUNT check(s) skipped)"
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed$SKIP_NOTE"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/05-read-servers-kad-categories-prefs.sh Added

@@ -0,0 +1,339 @@
+#!/usr/bin/env bash
+#
+# amuleapi 05-read-servers-kad-categories-prefs — /servers, /kad, /categories, /preferences.
+# Exercises the four endpoints added in this sub-phase. Tolerant of
+# empty caches (e.g. amuled with no configured servers) — asserts
+# envelope shape + per-item field types without requiring specific
+# content.
+#
+# Bring-up:
+#   amuleapi --config-dir=/tmp/amuleapi-05-read-servers-kad-categories-prefs \
+#            --host=127.0.0.1 --port=4712 --password=amule \
+#            --set-admin-pass=adminpass
+#   amuleapi --config-dir=/tmp/amuleapi-05-read-servers-kad-categories-prefs ... &
+#   ./05-read-servers-kad-categories-prefs.sh
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_05_read_servers_kad_categories_prefs_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 05-read-servers-kad-categories-prefs smoke @ $HOST"
+
+# Log in.
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "login failed"
+
+# Wait for the first full refresher tick (servers + prefs land at the
+# end of the tick — we need the second tick to confirm steady-state).
+sleep 3
+
+# --- 1. /servers ---------------------------------------------------
+_curl "$API/servers"
+_assert_status 401 "GET /servers (no creds) → 401"
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/servers"
+_assert_status 200 "GET /servers (admin) → 200"
+_assert_json_eq '.servers | type'          array  '/servers .servers is an array'
+COUNT=$(printf '%s' "$CURL_BODY" | jq '.servers | length')
+if  "$COUNT" -gt 0 ; then
+	echo "  --- /servers has $COUNT entry/entries; per-item shape ---"
+	_assert_json_eq '.servers0.name     | type' string  '/servers0.name is string'
+	_assert_json_eq '.servers0.address  | type' string  '/servers0.address is string'
+	# string or null, never "": a server that reported no version is unknown,
+	# the same spelling /clients and /known_clients use for the same key.
+	_assert_json_eq '(.servers0.software_version == null or (.servers0.software_version | type) == "string")' \
+		true '/servers0.software_version is a string or null'
+	_assert_json_eq '.servers0.software_version != ""' \
+		true '/servers0.software_version is never the empty-string sentinel'
+	# Added beside `address`: every client had to re-parse the ip:port form.
+	_assert_json_eq '.servers0.ip       | type' string  '/servers0.ip is string'
+	_assert_json_eq '.servers0 as $s | ($s.address | startswith($s.ip))' true \
+		'/servers0.address begins with the bare ip'
+	_assert_json_eq '.servers0.port     | type' number  '/servers0.port is numeric'
+	_assert_json_eq '.servers0.user_count | type' number  '/servers0.user_count is numeric'
+	_assert_json_eq '.servers0.priority | test("^(low|normal|high)$")' \
+		true '/servers0.priority is a known enum value'
+	_assert_json_eq '.servers0.permanent | type' boolean '/servers0.permanent is boolean'
+	# #440 server country: always-present ISO 3166-1 alpha-2 string,
+	# empty when GeoIP is off/unresolved (never absent/null).
+	# Nullable per R10, same as the client row.
+	_assert_json_eq '(.servers0.country_code == null or (.servers0.country_code | type) == "string")' \
+		true '/servers0.country_code is a string or null'
+	# Consecutive failed connection attempts -- a counter, not a boolean,
+	# which is why the key is not just "failed".
+	_assert_json_eq '.servers0.failed_count | type' number '/servers0.failed_count is numeric'
+	# Per-user publishing limits. Always present; 0 until the server has
+	# answered a UDP status request, so a value is not guaranteed here.
+	_assert_json_eq '.servers0.soft_file_limit | type' number '/servers0.soft_file_limit is numeric'
+	_assert_json_eq '.servers0.hard_file_limit | type' number '/servers0.hard_file_limit is numeric'
+	# Decoded capability bits: an object carrying the raw bitmask plus one
+	# always-present boolean per named bit, so a consumer never has to test
+	# for a key or carry the eD2k protocol tables.
+	_assert_json_eq '.servers0.tcp_flags | type'                 object  '/servers0.tcp_flags is an object'
+	_assert_json_eq '.servers0.tcp_flags.bitmask | type'         number  '/servers0.tcp_flags.bitmask is numeric'
+	_assert_json_eq '.servers0.tcp_flags.related_search | type'  boolean '/servers0.tcp_flags.related_search is boolean'
+	_assert_json_eq '.servers0.tcp_flags.tcp_obfuscation | type' boolean '/servers0.tcp_flags.tcp_obfuscation is boolean'
+	_assert_json_eq '.servers0.udp_flags | type'                 object  '/servers0.udp_flags is an object'
+	_assert_json_eq '.servers0.udp_flags.bitmask | type'         number  '/servers0.udp_flags.bitmask is numeric'
+	_assert_json_eq '.servers0.udp_flags.get_sources_v2 | type'  boolean '/servers0.udp_flags.get_sources_v2 is boolean'
+	# The two obfuscation bits are distinct keys in the UDP object; the
+	# TCP object spells its own out for the same reason.
+	_assert_json_eq '.servers0.udp_flags.udp_obfuscation | type' boolean '/servers0.udp_flags.udp_obfuscation is boolean'
+	_assert_json_eq '.servers0.udp_flags.tcp_obfuscation | type' boolean '/servers0.udp_flags.tcp_obfuscation is boolean'
+	# Each decoded boolean must agree with the bitmask it came from.
+	_assert_json_eq '.servers0.tcp_flags | (.bitmask / 64 | floor | . % 2 == 1) == .related_search' \
+		true '/servers0.tcp_flags.related_search matches bit 0x0040 of the bitmask'
+fi
+
+# --- 2. /kad -------------------------------------------------------
+_curl "$API/kad"
+_assert_status 401 "GET /kad (no creds) → 401"
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/kad"
+_assert_status 200 "GET /kad (admin) → 200"
+_assert_json_eq '.state | test("^(disabled|connecting|connected)$")' \
+	true '/kad.state is a known enum value'
+# firewalled_tcp and firewalled_udp are two independent measurements, not a
+# verdict and a refinement. The TCP one is a vote (two peers must confirm
+# reachability over an incoming connection); the UDP one is a directed test
+# with its own timeout.
+# Typed by connection state: a measured bool while connected, null while not,
+# so `false` means "measured open" rather than also standing in for "never
+# measured" -- which for firewalled_udp would read as "UDP is open" on a stopped Kad.
+for F in firewalled_tcp firewalled_udp lan_mode; do
+	_assert_json_eq "(.state == \"connected\") or (.$F == null)" true \
+		"/kad.$F is null while Kad is not connected"
+	_assert_json_eq "(.state != \"connected\") or ((.$F | type) == \"boolean\")" true \
+		"/kad.$F is boolean while Kad is connected"
+done
+# The unqualified spellings are not keys here, only the typed ones.
+_assert_json_eq 'has("firewalled")'   false '/kad has no firewalled key'
+_assert_json_eq 'has("in_lan_mode")'  false '/kad has no in_lan_mode key'
+# LAN mode forces both firewall flags false (Kademlia.h, UDPFirewallTester.cpp),
+# so the three cannot all be true at once.
+_assert_json_eq '(.lan_mode | not) or ((.firewalled_tcp | not) and (.firewalled_udp | not))' \
+	true '/kad LAN mode forces both firewalled flags false'
+# amuled sends the UDP test result only while Kad is connected, so a false
+# there is the absence of a measurement rather than "UDP is open". The TCP
+# side defaults the other way: true until two peers vouch for us.
+# Was: "reads false while not connected". That false was the absence of a
+# measurement wearing the costume of one, and it is null now.
+_assert_json_eq '.connected_since_at | type' number  '/kad.connected_since_ate is numeric'
+# Ours. Named apart from the buddy's address, which the rename must not touch.
+_assert_json_eq '.public_ip | type | . == "string" or . == "null"' true \
+	'/kad.public_ip is a string or null'
+_assert_json_eq '.ip               | type' null    '/kad has no bare top-level ip'
+# 32 lowercase hex while Kad runs, null while it does not -- gated on .state,
+# which is "disabled" exactly when amuled withholds EC_TAG_KAD_ID. Null, not
+# "": every other field in this object already spells absence that way, and
+# an empty string is not a value a node id can take.
+_assert_json_eq '(.state == "disabled") or (.node_id | test("^0-9a-f{32}$"))' \
+	true '/kad.node_id is 32 lowercase hex chars while Kad runs'
+_assert_json_eq '(.state != "disabled") or (.node_id == null)' \
+	true '/kad.node_id is null while Kad is not running'
+# The network rollup and the store counters, both gated on being connected.
+# `nodes` is the sharp one: it is this node's OWN routing-table size, and
+# contacts outlive a disconnect, so it was measured at 2 on a fully stopped Kad
+# -- a non-zero figure for a network the daemon was not on.
+for F in network.user_count network.file_count network.node_count \
+	indexed.sources indexed.keywords indexed.notes indexed.load_percent; do
+	_assert_json_eq "(.state == \"connected\") or (.$F == null)" true \
+		"/kad.$F is null while Kad is not connected"
+	_assert_json_eq "(.state != \"connected\") or ((.$F | type) == \"number\")" true \
+		"/kad.$F is numeric while Kad is connected"
+done
+# indexed.load_percent is a load figure rather than a count, despite sitting beside
+# three counts -- covered by the loop above.
+# Two distinct "unknown" answers: null while Kad is not connected, and a
+# syntactically valid 0.0.0.0 while connected but not yet told our address.
+_assert_json_eq '(.state == "connected") or (.public_ip == null)' \
+	true '/kad.public_ip is null while Kad is not connected'
+# Gated with the rest: `no_buddy` is a real state, so reporting it on a stopped
+# Kad claimed we had looked and found none. Null when not connected; the enum
+# and the types still hold while connected.
+for F in buddy.state buddy.ip buddy.port; do
+	_assert_json_eq "(.state == \"connected\") or (.$F == null)" true \
+		"/kad.$F is null while Kad is not connected"
+done
+_assert_json_eq '(.state != "connected") or ((.buddy.port | type) == "number")' \
+	true '/kad.buddy.port is numeric while Kad is connected'
+_assert_json_eq '(.state != "connected") or ((.buddy.ip | type) == "string")' \
+	true '/kad.buddy.ip survives the ip rename'
+_assert_json_eq '(.state != "connected") or (.buddy.state | test("^(no_buddy|connecting|connected|unknown)$"))' \
+	true '/kad.buddy.state is a known enum value while Kad is connected'
+
+# --- 3. /categories -----------------------------------------------
+_curl "$API/categories"
+_assert_status 401 "GET /categories (no creds) → 401"
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/categories"
+_assert_status 200 "GET /categories (admin) → 200"
+_assert_json_eq '.categories | type' array '/categories.categories is an array'
+CATCOUNT=$(printf '%s' "$CURL_BODY" | jq '.categories | length')
+if  "$CATCOUNT" -gt 0 ; then
+	echo "  --- /categories has $CATCOUNT entry/entries; per-item shape ---"
+	_assert_json_eq '.categories0.index | type' number '/categories0.index is numeric'
+	_assert_json_eq '.categories0.name  | type' string '/categories0.name is string'
+	_assert_json_eq '.categories0.priority | test("^(very_low|low|normal|high|release|auto)$")' \
+		true '/categories0.priority is a known enum value'
+fi
+
+# --- 4. /preferences ----------------------------------------------
+_curl "$API/preferences"
+_assert_status 401 "GET /preferences (no creds) → 401"
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/preferences"
+_assert_status 200 "GET /preferences (admin) → 200"
+# Bare object (no envelope) per Q3 — preferences is a single resource.
+_assert_json_eq '.snapshot_at | type' null \
+	'/preferences has no snapshot_at envelope (bare object)'
+
+_assert_json_eq '.general.nickname             | type' string  '/preferences.general.nickname is string'
+_assert_json_eq '.general.user_hash | length'                          32   '/preferences.general.user_hash is 32-char hex'
+_assert_json_eq '.general.version_check_enabled    | type' boolean '/preferences.general.version_check_enabled is boolean'
+
+_assert_json_eq '.connection.tcp_port          | type' number  '/preferences.connection.tcp_port is numeric'
+_assert_json_eq '.connection.udp_port          | type' number  '/preferences.connection.udp_port is numeric'
+_assert_json_eq '.connection.extended_udp_port_enabled | type' boolean '/preferences.connection.extended_udp_port_enabled is boolean (#596)'
+_assert_json_eq '.connection.ed2k_enabled      | type' boolean '/preferences.connection.ed2k_enabled is boolean'
+_assert_json_eq '.connection.kad_enabled       | type' boolean '/preferences.connection.kad_enabled is boolean'
+_assert_json_eq '.connection.autoconnect       | type' boolean '/preferences.connection.autoconnect is boolean'
+_assert_json_eq '.connection.max_sources_per_file_count | type' number '/preferences.connection.max_sources_per_file_count is numeric'
+# /preferences carries no statistics graph-scale caps (#596).
+_assert_json_eq '.connection.max_upload_cap_kbps   | type' null '/preferences.connection.max_upload_cap_kbps is not exposed (#596)'
+_assert_json_eq '.connection.max_download_cap_kbps | type' null '/preferences.connection.max_download_cap_kbps is not exposed (#596)'
+
+# 3-state enum string, not a bool (#596, #655);
+# endgame newly exposed (#596).
+_assert_json_eq '.security.shared_files_visibility | test("^(everybody|friends|nobody)$")' \
+	true '/preferences.security.shared_files_visibility is a known 3-state enum value (#655)'
+_assert_json_eq '.files.endgame_mode_enabled        | type' boolean '/preferences.files.endgame_mode_enabled is boolean (#596)'
+# These spellings are not keys here, only the current ones (#655).
+_assert_json_eq '.security.can_see_shares      | type' null    '/preferences.security.can_see_shares is not a key (#655)'
+_assert_json_eq '.files.endgame                | type' null    '/preferences.files.endgame is not a key (#655)'
+
+# The four stateful-noun booleans the _enabled sweep missed: `auto_update` and
+# `auto_priority` are modes, not imperative verbs, so they read as states and
+# take the suffix their object-mates already carry.
+_assert_json_eq '.files.new_downloads_auto_priority_enabled    | type' boolean '/preferences.files.new_downloads_auto_priority_enabled is boolean'
+_assert_json_eq '.files.new_shared_files_auto_priority_enabled | type' boolean '/preferences.files.new_shared_files_auto_priority_enabled is boolean'
+_assert_json_eq '.security.ipfilter_auto_update_enabled        | type' boolean '/preferences.security.ipfilter_auto_update_enabled is boolean'
+# These spellings are not keys here, only the current ones.
+_assert_json_eq '.files.new_downloads_auto_priority    | type' null '/preferences.files.new_downloads_auto_priority is not a key'
+_assert_json_eq '.files.new_shared_files_auto_priority | type' null '/preferences.files.new_shared_files_auto_priority is not a key'
+_assert_json_eq '.security.ipfilter_auto_update        | type' null '/preferences.security.ipfilter_auto_update is not a key'
+_assert_json_eq '.geoip.auto_update                    | type' null '/preferences.geoip.auto_update is not a key'
+
+# message_filter show-in-log + comment filter, wired over EC (#596).
+_assert_json_eq '.message_filter.log_filtered_messages      | type' boolean '/preferences.message_filter.log_filtered_messages is boolean (#596)'
+_assert_json_eq '.message_filter.filter_comments  | type' boolean '/preferences.message_filter.filter_comments is boolean (#596)'
+_assert_json_eq '.message_filter.comment_keywords | type' string  '/preferences.message_filter.comment_keywords is string (#596)'
+
+# geoip config category (#440). Field types are always present even
+# on a GeoIP-less daemon (supported=false, strings empty); source is one
+# of the known enum values.
+_assert_json_eq '.geoip.supported       | type' boolean '/preferences.geoip.supported is boolean'
+_assert_json_eq '.geoip.enabled         | type' boolean '/preferences.geoip.enabled is boolean'
+_assert_json_eq '.geoip.source | test("^(dbip|maxmind|custom)$")' \
+	true '/preferences.geoip.source is a known enum value'
+_assert_json_eq '.geoip.custom_update_url      | type' string  '/preferences.geoip.custom_update_url is string'
+_assert_json_eq '.geoip.maxmind_license | type' string  '/preferences.geoip.maxmind_license is string'
+_assert_json_eq '.geoip.auto_update_enabled | type' boolean '/preferences.geoip.auto_update_enabled is boolean'
+_assert_json_eq '.geoip.loaded_source   | type' string  '/preferences.geoip.loaded_source is string'
+_assert_json_eq '.geoip.db_path         | type' string  '/preferences.geoip.db_path is string'
+_assert_json_eq '.geoip.db_loaded       | type' boolean '/preferences.geoip.db_loaded is boolean'
+_assert_json_eq '.geoip.download_in_progress | type' boolean '/preferences.geoip.download_in_progress is boolean'
+_assert_json_eq '.geoip.last_update_status  | type' string  '/preferences.geoip.last_update_status is string'
+
+# --- Nested remote_controls (#655). ----------------------------
+# The two subsystems are sub-objects, not webserver_* / amuleapi_* prefixes.
+_assert_json_eq '.remote_controls.webserver        | type' object  '/preferences.remote_controls.webserver is an object (#655)'
+_assert_json_eq '.remote_controls.amuleapi         | type' object  '/preferences.remote_controls.amuleapi is an object (#655)'
+_assert_json_eq '.remote_controls.webserver.enabled         | type' boolean '/preferences.remote_controls.webserver.enabled is boolean'
+_assert_json_eq '.remote_controls.webserver.port            | type' number  '/preferences.remote_controls.webserver.port is numeric'
+_assert_json_eq '.remote_controls.webserver.refresh_seconds | type' number  '/preferences.remote_controls.webserver.refresh_seconds is numeric'
+_assert_json_eq '.remote_controls.webserver.template_name        | type' string  '/preferences.remote_controls.webserver.template_name is string'
+_assert_json_eq '.remote_controls.amuleapi.enabled          | type' boolean '/preferences.remote_controls.amuleapi.enabled is boolean'
+_assert_json_eq '.remote_controls.amuleapi.port             | type' number  '/preferences.remote_controls.amuleapi.port is numeric'
+_assert_json_eq '.remote_controls.amuleapi.bind_address     | type' string  '/preferences.remote_controls.amuleapi.bind_address is string'
+_assert_json_eq '.remote_controls.webserver_enabled | type' null '/preferences.remote_controls.webserver_enabled is not a key (#655)'
+_assert_json_eq '.remote_controls.amuleapi_bind     | type' null '/preferences.remote_controls.amuleapi_bind is not a key (#655)'
+# Passwords stay write-only in both sub-objects.
+_assert_json_eq '.remote_controls.webserver.password       | type' null '/preferences.remote_controls.webserver.password is not emitted'
+_assert_json_eq '.remote_controls.webserver.guest_password | type' null '/preferences.remote_controls.webserver.guest_password is not emitted'
+_assert_json_eq '.remote_controls.amuleapi.password        | type' null '/preferences.remote_controls.amuleapi.password is not emitted'
+
+# proxy_type is an enum string, not a magic number (#655).
+_assert_json_eq '.connection.proxy_type | type' string '/preferences.connection.proxy_type is a string (#655)'
+
+# --- Method gate. ----------------------------------------------
+for ep in servers kad categories preferences; do
+	_curl -X DELETE -H "Authorization: Bearer $TOKEN" "$API/$ep"
+	_assert_status 405 "DELETE /api/v1/$ep → 405"
+done
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/06-read-logs.sh Added

@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+#
+# amuleapi 06-read-logs — /logs/amule + /logs/server_info. amule log
+# rides on STAT_REQ's `EC_TAG_STATS_LOGGER_MESSAGE` channel (per-EC-
+# connection cursor, incremental); server-info log is full-snapshot
+# via `EC_OP_GET_SERVERINFO`.
+#
+# Bring-up:
+#   amuleapi --config-dir=/tmp/amuleapi-06-read-logs ... &
+#   ./06-read-logs.sh
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_06_read_logs_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 06-read-logs smoke @ $HOST"
+
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "login failed"
+
+# Give the refresher a few seconds to drain the initial log baseline
+# (CLoggerAccess emits the entire pre-connection backlog on its first
+# tick).
+sleep 5
+
+# --- 1. Auth gate. -------------------------------------------------
+_curl "$API/logs/amule"
+_assert_status 401 "GET /logs/amule (no creds) → 401"
+_curl "$API/logs/server_info"
+_assert_status 401 "GET /logs/server_info (no creds) → 401"
+
+# --- 2. /logs/amule full response shape. ---------------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/logs/amule"
+_assert_status 200 "GET /logs/amule → 200"
+_assert_json_eq '.lines | type'         array  '/logs/amule.lines is an array'
+_assert_json_eq '.total_lines | type'  number '/logs/amule.total_lines is numeric'
+_assert_json_eq '.returned_lines | type'      number '/logs/amule.returned_lines is numeric'
+_assert_json_eq '.lines | length > 0'   true   '/logs/amule.lines is non-empty (amule emits a banner on connect)'
+# When no tail is given, returned_lines == total_lines.
+_assert_json_eq '(.returned_lines == .total_lines)' true \
+	'/logs/amule: returned_lines == total_lines when no ?tail given'
+
+TOTAL=$(printf '%s' "$CURL_BODY" | jq '.total_lines')
+
+# --- 3. /logs/amule?tail=N. ----------------------------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/logs/amule?tail=2"
+_assert_status 200 "GET /logs/amule?tail=2 → 200"
+_assert_json_eq '.returned_lines'           2      '/logs/amule?tail=2 returns 2 lines'
+_assert_json_eq '.lines | length'     2      '/logs/amule?tail=2 array length is 2'
+_assert_json_eq '.total_lines'       "$TOTAL" '/logs/amule?tail=2 still reports the full line count'
+
+# tail=0 means "no tailing" → all lines. The wire contract makes 0
+# the inert default (matches the helper's behaviour: 0 = unbounded).
+_curl -H "Authorization: Bearer $TOKEN" "$API/logs/amule?tail=0"
+_assert_status 200 "GET /logs/amule?tail=0 → 200"
+_assert_json_eq '(.returned_lines == .total_lines)' true \
+	'/logs/amule?tail=0 returns all (tail=0 is "no tailing")'
+
+# A non-numeric tail is a 400, not a silent "return all": the count is
+# validated like every other on the surface, so a typo is reported rather than
+# quietly handing back the whole buffer.
+_curl -H "Authorization: Bearer $TOKEN" "$API/logs/amule?tail=notanumber"
+_assert_status 400 "GET /logs/amule?tail=notanumber → 400"
+
+# Out of range is the same answer: a 400, not a clamp.
+_curl -H "Authorization: Bearer $TOKEN" "$API/logs/amule?tail=999999"
+_assert_status 400 "GET /logs/amule?tail=999999 → 400"
+
+# --- 4. /logs/server_info shape. ------------------------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/logs/server_info"
+_assert_status 200 "GET /logs/server_info → 200"
+_assert_json_eq '.text | type'           string '/logs/server_info.text is string'
+_assert_json_eq '.total_bytes | type'    number '/logs/server_info.total_bytes is numeric'
+_assert_json_eq '.returned_bytes | type' number '/logs/server_info.returned_bytes is numeric'
+_assert_json_eq '(.returned_bytes == .total_bytes)' true \
+	'/logs/server_info: returned_bytes == total_bytes when no ?tail given'
+
+TOTAL_BYTES=$(printf '%s' "$CURL_BODY" | jq '.total_bytes')
+
+# --- 5. /logs/server_info?tail=3 — line-boundary slicing. -----------
+_curl -H "Authorization: Bearer $TOKEN" "$API/logs/server_info?tail=3"
+_assert_status 200 "GET /logs/server_info?tail=3 → 200"
+_assert_json_eq '(.returned_bytes <= .total_bytes)' true \
+	'/logs/server_info?tail=3: returned_bytes <= total_bytes'
+_assert_json_eq '.total_bytes' "$TOTAL_BYTES" \
+	'/logs/server_info?tail=3 reports the same total_bytes'
+
+# --- 6. Method gate. -----------------------------------------------
+# DELETE on /logs/{amule,serverinfo} clears the buffer. PATCH is a 405:
+# the logs are read+reset only, never partially mutable.
+for ep in logs/amule logs/server_info; do
+	_curl -X PATCH -H "Authorization: Bearer $TOKEN" "$API/$ep"
+	_assert_status 405 "PATCH /api/v1/$ep → 405"
+done
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/07-read-stats-and-search-results.sh Added

@@ -0,0 +1,283 @@
+#!/usr/bin/env bash
+#
+# amuleapi 07-read-stats-and-search-results — /stats/tree, /stats/graphs/{graph}, /search/{id}/results.
+# /stats/tree is a recursive structure; /stats/graphs is a time-series with
+# per-graph path-param + ?width=N tailing; /search/{id}/results is read-only
+# (POST /search is covered in 19-search).
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_07_read_stats_and_search_results_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 07-read-stats-and-search-results smoke @ $HOST"
+
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "login failed"
+
+# Wait for the refresher to populate the cache (3 new EC roundtrips
+# plus the existing tick, so the first full snapshot lands by tick 2).
+sleep 4
+
+# A search to address. Every search-scoped path names its id, so this
+# script starts one explicitly; these paths have no implicit default.
+_curl -X POST -H "Authorization: Bearer $TOKEN" -H 'Content-Type: application/json' \
+	-d '{"query":"amuleapi-phase07","type":"local"}' "$API/search"
+SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id // empty')
+ -n "$SID"  || _die "POST /search returned no search_id"
+
+# --- 1. Auth gate. -------------------------------------------------
+for ep in stats/tree stats/graphs/download_speed "search/$SID/results"; do
+	_curl "$API/$ep"
+	_assert_status 401 "GET /$ep (no creds) → 401"
+done
+
+# --- 2. /stats/tree shape. -----------------------------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/stats/tree"
+_assert_status 200 "GET /stats/tree → 200"
+_assert_json_eq '.nodes | type'            array  '/stats/tree .nodes is array'
+# amuled's stats tree always has at least Uptime + Transfer + Connection
+# at the top level — assert a non-empty `nodes` and a labeled first
+# entry rather than pinning specific text (locale-dependent).
+_assert_json_eq '.nodes | length > 0'      true   '/stats/tree has at least one top-level node'
+_assert_json_eq '.nodes0.label | type'   string '/stats/tree first node has a label'
+_assert_json_eq '.nodes0.values | type'  array  '/stats/tree first node has a values array'
+_assert_json_eq '.nodes0.children | type' array '/stats/tree first node has a children array'
+# Typed values: labels are English "%s" templates, values carry the raw typed
+# data (integer/bytes/time/…), so the payload is locale-independent. Assert at
+# least one typed value exists and every value type is from the known set.
+_assert_json_eq '.. | .values? // empty | .? | length > 0' true \
+	'/stats/tree carries at least one typed value'
+_assert_json_eq '(.. | .values? // empty | .? | .type | unique)
+	- "integer","bytes","time","speed","string","double"
+	| length == 0' true '/stats/tree value types are all from the known set'
+# Stable machine keys: locale-independent identifiers on the fixed skeleton
+# nodes, safe to pin (unlike labels). Uptime is always the first node.
+_assert_json_eq '.nodes0.key' uptime '/stats/tree first node key is "uptime"'
+_assert_json_eq '.. | objects | select(has("key")) | .key as $k
+	| ("ul_dl_ratio","download_data","servers_working" | all(($k | index(.)) != null))' \
+	true '/stats/tree carries the expected stable keys'
+# Skeleton keys are unique; the dynamic per-client-software rows deliberately
+# share a key by kind, so exclude those. Both the leaves (client_version,
+# client_os) and the containers that group them (client_versions,
+# client_operating_system) repeat: the daemon emits one set per software
+# family, so they collide as soon as two families report a breakdown. Only
+# the leaves were excluded, which held on a node whose peers were all one
+# software and failed the moment a second family appeared.
+_assert_json_eq '.. | objects | select(has("key")) | .key
+	| map(select(. != "client_version" and . != "client_os"
+		and . != "client_versions" and . != "client_operating_system"))
+	| (length > 0) and (length == (unique | length))' \
+	true '/stats/tree skeleton keys are present and unique'
+# The ratio node keeps its composite string value for legacy consumers...
+_assert_json_eq '.. | objects | select(.key? == "ul_dl_ratio") | .values0.type | .0' \
+	string '/stats/tree ratio node still carries its composite string value'
+# ...and when the daemon can compute it, exposes numeric ratio fields. Absent
+# on a freshly-started daemon with no transfer, so assert shape, not presence.
+_assert_json_eq '.. | objects | (.ratio_session, .ratio_total)
+	| select(. != null) | type | all(. == "number")' \
+	true '/stats/tree ratio fields, when present, are numbers'
+# The window belongs in the key (R11), so there is no wrapping ratio object.
+_assert_json_eq '.. | objects | select(has("ratio")) | length' 0 \
+	'/stats/tree emits no wrapping ratio object'
+# label_value: the untranslated version/OS value on per-client-software rows.
+# `null` on every other node rather than absent, so the presence test is
+# `!= null` -- the key is always there. Assert shape, not presence: it is only
+# non-null once peers with version/OS info have connected.
+_assert_json_eq '.. | objects | select(has("label_value")) | .label_value | all(. == null or type == "string")' \
+	true '/stats/tree label_value is a string or null on every node'
+# Every node carries the key, so a client can read it without a has() guard.
+_assert_json_eq '.. | objects | select(has("label") and has("values")) | has("label_value") | all(.)' \
+	true '/stats/tree label_value is present on every node, null where there is no datum'
+# token: additive locale-independent marker on well-known sentinel string
+# values ("never"/"not_available"), and `null` on every other value. Assert the
+# non-null tokens are from the known set and always accompany a string value
+# (the English value is kept alongside).
+_assert_json_eq '(.. | objects | .values? // empty | .? | .token | select(. != null)
+	| unique) - "never","not_available" | length == 0' \
+	true '/stats/tree value tokens are from the known set'
+_assert_json_eq '.. | objects | .values? // empty | .? | select(.token != null)
+	| (.type == "string" and (.value | type) == "string") | all(.)' \
+	true '/stats/tree value tokens ride on a string value (kept for legacy clients)'
+# Same for the two optional value keys: always present, null when there is
+# nothing to report.
+_assert_json_eq '.. | objects | .values? // empty | .? | (has("token") and has("extra")) | all(.)' \
+	true '/stats/tree values always carry token and extra, null where absent'
+
+# --- 3. /stats/graphs/{graph} — all four named graphs. -------------
+for g in download_speed upload_speed connections kad_nodes; do
+	_curl -H "Authorization: Bearer $TOKEN" "$API/stats/graphs/$g"
+	_assert_status 200 "GET /stats/graphs/$g → 200"
+	_assert_json_eq '.graph'                    "$g"  "/stats/graphs/$g reports graph=$g"
+	_assert_json_eq '.interval_seconds | type'  number "/stats/graphs/$g interval_seconds is numeric"
+	_assert_json_eq '.points | type'            array  "/stats/graphs/$g .points is array"
+	_assert_json_eq '.session | type'           object "/stats/graphs/$g .session is object"
+	_assert_json_eq '.max_points | type'        number "/stats/graphs/$g max_points is numeric"
+	_assert_json_eq '(.points | length) <= .max_points' true \
+		"/stats/graphs/$g never returns more points than max_points"
+done
+# Per-graph unit mapping.
+_curl -H "Authorization: Bearer $TOKEN" "$API/stats/graphs/download_speed"
+_assert_json_eq '.unit' bytes_per_second '/stats/graphs/download_speed reports unit=bytes_per_second'
+_curl -H "Authorization: Bearer $TOKEN" "$API/stats/graphs/connections"
+_assert_json_eq '.unit' count '/stats/graphs/connections reports unit=count'
+
+# Session object: the two byte counters are scaled back from the KiB the
+# daemon sends, kad is node-seconds rather than bytes, and duration is what
+# turns any of them into an average.
+_assert_json_eq '.session | has("downloaded_bytes") and has("uploaded_bytes")
+	and has("kad_node_seconds") and has("duration_seconds")' true \
+	'/stats/graphs session carries the four corrected fields'
+# Past tense, like downloaded_bytes_session / uploaded_bytes_session on the
+# client and shared rows: the `session` wrapper scopes the quantity, it does
+# not license a second spelling of it.
+_assert_json_eq '.session | has("download_bytes") or has("upload_bytes")' false \
+	'/stats/graphs session does not report present-tense spellings'
+_assert_json_eq '.session | has("kad_bytes")' false \
+	'/stats/graphs session does not report a kad_bytes key'
+
+# The connections graph carries the second data blob's two series when the
+# daemon reports it; the other graphs never do.
+if  "$(printf '%s' "$CURL_BODY" | jq '.points | length')" -gt 0 ; then
+	_assert_json_eq '.points | has("active_upload_count") | (all(.) or (any(.) | not))' true \
+		'/stats/graphs/connections active_uploads is present on all points or none'
+fi
+_curl -H "Authorization: Bearer $TOKEN" "$API/stats/graphs/download_speed"
+_assert_json_eq '.points? | has("active_upload_count") | any(.) | not' true \
+	'/stats/graphs/download_speed never carries the connections-only series'
+
+# --- 3b. ?interval_seconds=N and its validation. ---------------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/stats/graphs/download_speed?interval_seconds=10"
+_assert_status 200 "GET /stats/graphs/download_speed?interval_seconds=10 → 200"
+_assert_json_eq '.interval_seconds' 10 \
+	'/stats/graphs?interval_seconds=10 reports the interval it applied'
+for bad in 0 3601 abc; do
+	_curl -H "Authorization: Bearer $TOKEN" "$API/stats/graphs/download_speed?interval_seconds=$bad"
+	_assert_status 400 "GET /stats/graphs/download_speed?interval_seconds=$bad → 400"
+	_assert_json_eq '.error.code' bad_request \
+		"/stats/graphs?interval_seconds=$bad carries error.code=bad_request"
+done
+
+# --- 3c. /stats/tree ?max_client_versions=N and its validation. ----
+_curl -H "Authorization: Bearer $TOKEN" "$API/stats/tree?max_client_versions=3"
+_assert_status 200 "GET /stats/tree?max_client_versions=3 → 200"
+for bad in -1 256 abc; do
+	_curl -H "Authorization: Bearer $TOKEN" "$API/stats/tree?max_client_versions=$bad"
+	_assert_status 400 "GET /stats/tree?max_client_versions=$bad → 400"
+	_assert_json_eq '.error.code' bad_request \
+		"/stats/tree?max_client_versions=$bad carries error.code=bad_request"
+done
+
+# --- 4. /stats/graphs/{graph} ?width=N tailing. --------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/stats/graphs/download_speed?width=5"
+_assert_status 200 "GET /stats/graphs/download_speed?width=5 → 200"
+_assert_json_eq '.points | length <= 5' true \
+	'/stats/graphs/download_speed?width=5 returns ≤5 points'
+# One timestamp per point, unix seconds, named `at` (R3). There is no ISO-8601
+# twin: formatting is a client concern, and it would cost a key plus its
+# value on every point of an array that runs to max_points.
+if  "$(printf '%s' "$CURL_BODY" | jq '.points | length')" -gt 0 ; then
+	_assert_json_eq '.points0.at | type' number \
+		'/stats/graphs/download_speed point.at is numeric (unix seconds)'
+	_assert_json_eq '.points0 | has("t")' false \
+		'/stats/graphs point carries no ISO-8601 twin'
+	_assert_json_eq '.points0.value | type' number \
+		'/stats/graphs/download_speed point.value is numeric'
+fi
+
+# --- 5. Unknown graph name → 404. ----------------------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/stats/graphs/bogus"
+_assert_status 404 "GET /stats/graphs/bogus → 404"
+_assert_json_eq '.error.code' not_found \
+	'/stats/graphs/{unknown} carries error.code=not_found'
+
+# --- 6. /search/{id}/results. --------------------------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/search/$SID/results"
+_assert_status 200 "GET /search/{id}/results → 200"
+_assert_json_eq '.results | type'  array  '/search/{id}/results .results is array'
+_assert_json_eq '.search_id'       "$SID" '/search/{id}/results echoes its search_id'
+_assert_json_eq '.query'  amuleapi-phase07 '/search/{id}/results reports its query'
+# Tolerant of empty results; a local search on a fresh daemon may find
+# nothing. The per-item shape still checks when there is an item.
+COUNT=$(printf '%s' "$CURL_BODY" | jq '.results | length')
+if  "$COUNT" -gt 0 ; then
+	_assert_json_eq '.results0.hash | length' 32 \
+		'/search/{id}/results0.hash is 32-char hex'
+	_assert_json_eq '.results0.name | type'   string \
+		'/search/{id}/results0.name is string'
+	_assert_json_eq '.results0.sources | type' object \
+		'/search/{id}/results0.sources is object'
+	_assert_json_eq '.results0.directory | type' string \
+		'/search/{id}/results0.directory is string'
+fi
+
+# --- 7. Method gate. -----------------------------------------------
+for ep in stats/tree stats/graphs/download_speed "search/$SID/results"; do
+	_curl -X DELETE -H "Authorization: Bearer $TOKEN" "$API/$ep"
+	_assert_status 405 "DELETE /api/v1/$ep → 405"
+done
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/08-read-download-parts.sh Added

@@ -0,0 +1,240 @@
+#!/usr/bin/env bash
+#
+# amuleapi 08-read-download-parts — `progress.parts` on `GET /downloads/{hash}` detail.
+#
+# Validates the stateful RLE decoder pass that lands per-part state on
+# the bare-object detail response. The list endpoint (`GET /downloads`)
+# stays unchanged — `progress.parts` is detail-only since the array
+# scales O(file_size / PARTSIZE) and most clients listing the queue
+# don't want it (Q2 in PLAN §12 — no cap, omit-on-list).
+#
+# Wire contract:
+#   GET /downloads          → `progress: { percent: float }`
+#   GET /downloads/{hash}   → `progress: { percent: float,
+#                                          parts: {state, sources} }`
+#
+# `parts.length == ceil(size / 9728000)` (ed2k PARTSIZE).
+# `state` ∈ {"complete", "pending", "unavailable"}.
+# `sources` is uint16 (0 ≤ sources ≤ 65535).
+#
+# This script tolerates an empty download queue — every assertion past
+# the auth gate is conditionally skipped if no downloads are active.
+# Run it against a daemon with at least one live download for the
+# decoder-roundtrip checks to fire.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_08_read_download_parts_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 08-read-download-parts smoke @ $HOST"
+
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "login failed"
+
+# Refresher needs at least 2 ticks for the two-phase INC protocol to
+# converge — Phase 1 (UPDATE) surfaces new ECIDs, Phase 2 (FULL) ships
+# identity + GAP/PART blobs. The stateful RLE decoder needs the FULL
+# pass to seed itself before any UPDATE tick can produce a usable
+# decode. Give it 4 s; matches 07-read-stats-and-search-results.sh.
+sleep 4
+
+# --- 1. List endpoint MUST NOT carry `progress.parts`. -------------
+#
+# Q2 + per-list-omit decision: `progress.parts` is detail-only. A list
+# of 1000 downloads × ~150 parts/file would be 150k objects in the
+# response; clients walk the list endpoint for queue state and the
+# detail endpoint when they need the per-part breakdown.
+_curl -H "Authorization: Bearer $TOKEN" "$API/downloads"
+_assert_status 200 "GET /downloads → 200"
+_assert_json_eq '.downloads | type' array '/downloads .downloads is array'
+
+COUNT=$(printf '%s' "$CURL_BODY" | jq '.downloads | length')
+echo "    info: $COUNT downloads currently in queue"
+
+if  "$COUNT" -gt 0 ; then
+	# Pick the first download in the list and assert it does NOT carry
+	# `progress.parts` — even if the underlying snapshot has decoded
+	# arrays populated, the list emitter must omit them.
+	_assert_json_eq '.downloads0.progress.parts // "absent"' absent \
+		'/downloads0.progress.parts is absent (detail-only field)'
+	_assert_json_eq '.downloads0.progress.percent | type' number \
+		'/downloads0.progress.percent is numeric'
+
+	# Pull the first hash for the detail-endpoint pass below.
+	FIRST_HASH=$(printf '%s' "$CURL_BODY" | jq -r '.downloads0.hash')
+	FIRST_SIZE=$(printf '%s' "$CURL_BODY" | jq -r '.downloads0.size')
+
+	# --- 2. Detail endpoint carries `progress.parts`. --------------
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$FIRST_HASH"
+	_assert_status 200 "GET /downloads/{hash} → 200"
+	_assert_json_eq '.hash'                  "$FIRST_HASH" \
+		'/downloads/{hash} echoes hash (bare object, not enveloped)'
+	_assert_json_eq '.progress.parts | type' array \
+		'/downloads/{hash}.progress.parts is array'
+	_assert_json_eq '.progress.percent | type' number \
+		'/downloads/{hash}.progress.percent is numeric'
+
+	PARTS_LEN=$(printf '%s' "$CURL_BODY" | jq '.progress.parts | length')
+
+	# --- 3. parts.length == ceil(size / 9728000). ------------------
+	#
+	# PARTSIZE = 9728000 bytes (ed2k spec, frozen for protocol
+	# compatibility). The decoded_part_sources vector is sized to
+	# ceil(size / PARTSIZE); the gap-derived state array follows the
+	# same shape. If FIRST_SIZE is 0 we accept parts==0 (decoder
+	# legitimately has nothing to size against).
+	if  "$FIRST_SIZE" -gt 0 ; then
+		EXPECTED_PARTS=$(( (FIRST_SIZE + 9728000 - 1) / 9728000 ))
+		if  "$PARTS_LEN" = "$EXPECTED_PARTS" ; then
+			_pass "/downloads/{hash}.progress.parts.length == ceil(size/PARTSIZE) ($PARTS_LEN)"
+		elif  "$PARTS_LEN" = "0" ; then
+			# RLE decoder hasn't seen a full tick yet for this file — the
+			# detail handler still emits the array shape but the underlying
+			# decoded_part_sources vector is empty. This is a transient
+			# warmup state, not a failure: the second tick fills it in.
+			_pass "/downloads/{hash}.progress.parts.length == 0 (decoder warming up; expected on first tick)"
+		else
+			_fail "/downloads/{hash}.progress.parts.length sanity" \
+				"size=$FIRST_SIZE → expected $EXPECTED_PARTS, got $PARTS_LEN"
+		fi
+	fi
+
+	# --- 4. Per-part shape: {state, sources}. ----------------------
+	if  "$PARTS_LEN" -gt 0 ; then
+		_assert_json_eq '.progress.parts0.state | type' string \
+			'/downloads/{hash}.progress.parts0.state is string'
+		_assert_json_eq '.progress.parts0.sources | type' number \
+			'/downloads/{hash}.progress.parts0.sources is number'
+
+		# --- 5. state enum allowlist. ------------------------------
+		# Every part state must be one of {complete, pending, unavailable}.
+		# The walker is: has_gap → (sources>0 ? pending : unavailable);
+		# !has_gap → complete. Any other string means the emitter
+		# silently regressed.
+		BOGUS_COUNT=$(printf '%s' "$CURL_BODY" | jq \
+			'.progress.parts.state | select(. != "complete" and . != "pending" and . != "unavailable") | length')
+		if  "$BOGUS_COUNT" = "0" ; then
+			_pass "/downloads/{hash} all part.state values ∈ {complete, pending, unavailable}"
+		else
+			_fail "/downloads/{hash} part.state enum" \
+				"$BOGUS_COUNT parts have an out-of-enum state value"
+		fi
+
+		# --- 6. sources is a uint16 (0 ≤ sources ≤ 65535). -------
+		OUT_OF_RANGE=$(printf '%s' "$CURL_BODY" | jq \
+			'.progress.parts.sources | select(. < 0 or . > 65535) | length')
+		if  "$OUT_OF_RANGE" = "0" ; then
+			_pass "/downloads/{hash} all part.sources values fit in uint16"
+		else
+			_fail "/downloads/{hash} part.sources range" \
+				"$OUT_OF_RANGE parts have sources outside 0,65535"
+		fi
+
+		# --- 7. Live downloading file has at least one non-complete
+		# part. A file in `downloading` status by definition has work
+		# remaining; if every part comes back `complete` the decoder
+		# either ran on a finished file or the gap-list parse is
+		# silently dropping every entry. Skip if the file is paused /
+		# completed / hashing.
+		STATUS=$(printf '%s' "$CURL_BODY" | jq -r '.status')
+		if  "$STATUS" = "downloading" ; then
+			NONCOMPLETE=$(printf '%s' "$CURL_BODY" | jq \
+				'.progress.parts.state | select(. != "complete") | length')
+			if  "$NONCOMPLETE" -gt 0 ; then
+				_pass "/downloads/{hash} downloading file has $NONCOMPLETE non-complete parts (decoder live)"
+			else
+				_fail "/downloads/{hash} live-decoder sanity" \
+					"status=downloading but 0 non-complete parts in the gap-derived map" \
+					"size=$FIRST_SIZE percent=$(printf '%s' "$CURL_BODY" | jq '.progress.percent')"
+			fi
+		else
+			echo "    info: download status=$STATUS, skipping live-decoder non-complete-parts check"
+		fi
+	else
+		echo "    info: parts array empty (decoder warming up or file size=0); per-part shape checks skipped"
+	fi
+
+	# --- 8. URL hash case-insensitive (already covered in 4b but
+	# the detail endpoint changed shape so re-pin). ---------------
+	UPPER_HASH=$(echo "$FIRST_HASH" | tr 'a-f' 'A-F')
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$UPPER_HASH"
+	_assert_status 200 "GET /downloads/{HASH} (uppercase) → 200"
+	_assert_json_eq '.progress.parts | type' array \
+		'/downloads/{HASH} uppercase still carries progress.parts'
+else
+	echo "    info: no active downloads; the per-part shape checks need a live download"
+	echo "    info: passing the auth-gate + list-shape sweep only — run again with a downloading file for full coverage"
+fi
+
+# --- 9. 404 on unknown hash. ---------------------------------------
+_curl -H "Authorization: Bearer $TOKEN" \
+	"$API/downloads/00000000000000000000000000000000"
+_assert_status 404 "GET /downloads/{nonexistent} → 404"
+_assert_json_eq '.error.code' not_found \
+	'/downloads/{nonexistent} carries error.code=not_found'
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/09-refresher-consolidation.sh Added

@@ -0,0 +1,212 @@
+#!/usr/bin/env bash
+#
+# amuleapi 09-refresher-consolidation — EC_OP_GET_UPDATE @ EC_DETAIL_INC_UPDATE
+# refresher consolidation.
+#
+# Drops the per-substruct GET_DLOAD_QUEUE / GET_SHARED_FILES /
+# GET_SERVER_LIST polling path (each with its own two-phase UPDATE/
+# FULL split) in favour of a single GET_UPDATE roundtrip. /uploads
+# stays on GET_ULOAD_QUEUE (wire-semantic preservation — the
+# GET_UPDATE clients block is filtered server-side by the global
+# `TransmitOnlyUploadingClients` pref).
+#
+# This smoke is a wire-contract regression check: every field the
+# Phase 4b/4c smokes asserted on must STILL be present after the
+# refresher swap. progress.parts on the detail endpoint (Phase 4e)
+# must STILL show the RLE-decoded per-part state — proving the
+# stateful decoder still gets its baseline frame from GET_UPDATE's
+# INC_UPDATE-level payload.
+#
+# Net effect on ops/tick (steady state, no new ECIDs):
+#   * before: 10 ops (STAT_REQ, GET_DLOAD_QUEUE, GET_ULOAD_QUEUE,
+#                     GET_SHARED_FILES, GET_SERVER_LIST,
+#                     GET_PREFERENCES, GET_SERVERINFO, GET_STATSTREE,
+#                     GET_STATSGRAPHS, SEARCH_RESULTS)
+#   * after:   8 ops (GET_UPDATE replaces 3 of them, GET_ULOAD_QUEUE
+#                     stays for uploads, rest unchanged)
+#
+# On a cold tick the savings are larger (no Phase 2 FULL roundtrip
+# for new ECIDs in downloads/shared — INC_UPDATE ships identity in
+# the first response).
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_09_refresher_consolidation_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 09-refresher-consolidation smoke @ $HOST"
+
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "login failed"
+
+# Let the refresher complete at least one full tick after auth so the
+# GET_UPDATE-populated caches are warm. INC_UPDATE on cold start
+# delivers a larger payload (every file shipped with full identity)
+# than steady-state ticks, but the response shape is unchanged.
+sleep 4
+
+# --- 1. /downloads — list endpoint shape preserved. ----------------
+#
+# These field types define the list shape; if GET_UPDATE
+# dispatch broke any of them, the wire contract is broken.
+_curl -H "Authorization: Bearer $TOKEN" "$API/downloads"
+_assert_status 200 "GET /downloads → 200"
+_assert_json_eq '.downloads | type'     array '/downloads .downloads is array'
+
+DCOUNT=$(printf '%s' "$CURL_BODY" | jq '.downloads | length')
+echo "    info: $DCOUNT downloads in queue (populated via GET_UPDATE)"
+
+if  "$DCOUNT" -gt 0 ; then
+	# Identity arrives in the same tick at INC_UPDATE — no second
+	# roundtrip needed. A field empty here means the walker isn't
+	# picking up the identity tags that EC_DETAIL_INC_UPDATE ships.
+	_assert_json_eq '.downloads0.hash | length' 32 \
+		'/downloads0.hash is 32-char hex (identity from one tick)'
+	_assert_json_eq '.downloads0.name | type'   string \
+		'/downloads0.name is non-null string'
+	_assert_json_eq '.downloads0.size_bytes | type'   number \
+		'/downloads0.size_bytes is numeric'
+	_assert_json_eq '.downloads0.status | type' string \
+		'/downloads0.status is string'
+	_assert_json_eq '.downloads0.priority | type' string \
+		'/downloads0.priority is string'
+	# Source counts come through the merge path — sanity check the
+	# `sources` substruct still populates.
+	_assert_json_eq '.downloads0.sources | type' object \
+		'/downloads0.sources is object'
+
+	FIRST_HASH=$(printf '%s' "$CURL_BODY" | jq -r '.downloads0.hash')
+
+	# --- 2. /downloads/{hash} detail — progress.parts still ships. -
+	#
+	# progress.parts relies on the stateful RLE decoder. GET_UPDATE at
+	# INC_UPDATE ships the GAP/PART blobs (via the encoder's Encode
+	# call at ExternalConn.cpp:942) so the decoder gets its frames.
+	# If the consolidation broke the RLE wiring, parts would come back
+	# empty or with the wrong length.
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$FIRST_HASH"
+	_assert_status 200 "GET /downloads/{hash} → 200"
+	_assert_json_eq '.progress.parts | type' array \
+		'/downloads/{hash}.progress.parts is array (RLE decoder still wired)'
+fi
+
+# --- 3. /shared — list endpoint shape preserved. -------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/shared"
+_assert_status 200 "GET /shared → 200"
+_assert_json_eq '.shared | type'        array '/shared .shared is array'
+
+SCOUNT=$(printf '%s' "$CURL_BODY" | jq '.shared | length')
+echo "    info: $SCOUNT shared files (populated via GET_UPDATE KNOWNFILE dispatch)"
+
+if  "$SCOUNT" -gt 0 ; then
+	_assert_json_eq '.shared0.hash | length' 32 \
+		'/shared0.hash is 32-char hex'
+	_assert_json_eq '.shared0.name | type'   string \
+		'/shared0.name is string'
+	_assert_json_eq '.shared0.size_bytes | type'   number \
+		'/shared0.size_bytes is numeric'
+	_assert_json_eq '.shared0.priority | type' string \
+		'/shared0.priority is string'
+	_assert_json_eq '.shared0.priority_auto | type' boolean \
+		'/shared0.priority_auto is boolean'
+fi
+
+# --- 4. /servers — list endpoint shape preserved. ------------------
+#
+# Now populated by walking the EC_TAG_SERVER container inside the
+# GET_UPDATE response (one level deeper than the legacy GET_SERVER_LIST
+# response, where servers were top-level).
+_curl -H "Authorization: Bearer $TOKEN" "$API/servers"
+_assert_status 200 "GET /servers → 200"
+_assert_json_eq '.servers | type'       array '/servers .servers is array'
+
+NSERV=$(printf '%s' "$CURL_BODY" | jq '.servers | length')
+echo "    info: $NSERV servers configured (populated via GET_UPDATE container walk)"
+
+if  "$NSERV" -gt 0 ; then
+	# Identity preserved through the container walk — name, address,
+	# user counts. The MergeServerTag is_new branch fires for fresh
+	# servers; on subsequent ticks the CValueMap suppresses unchanged
+	# fields and the !is_new branch keeps the cached value.
+	_assert_json_eq '.servers0.name | type'     string \
+		'/servers0.name is string'
+	_assert_json_eq '.servers0.address | type'  string \
+		'/servers0.address is string'
+	_assert_json_eq '.servers0.priority | type' string \
+		'/servers0.priority is string'
+fi
+
+# --- 5. /status, /kad, /preferences — unaffected by the consolidation
+# (they ride on STAT_REQ and GET_PREFERENCES, which we did not touch).
+# A sanity glance to catch unrelated regressions slipping in.
+_curl -H "Authorization: Bearer $TOKEN" "$API/status"
+_assert_status 200 "GET /status → 200"
+_assert_json_eq '.ed2k.state | type' string '/status.ed2k.state still populated'
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/kad"
+_assert_status 200 "GET /kad → 200"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/10-refresher-lazy-ondemand.sh Added

@@ -0,0 +1,245 @@
+#!/usr/bin/env bash
+#
+# amuleapi 10-refresher-lazy-ondemand — refresher slim-down: GET_ULOAD_QUEUE folded
+# into GET_UPDATE, four lazy ops moved to on-demand TTL-cached fetch.
+#
+# Per-tick EC ops dropped from 8 to 3:
+#   1. EC_OP_STAT_REQ @ EC_DETAIL_FULL     → /status + /kad + /logs/amule
+#   2. EC_OP_GET_UPDATE @ EC_DETAIL_INC_UPDATE → /downloads + /shared +
+#                                              /servers + /clients
+#   3. EC_OP_GET_PREFERENCES                → /preferences + /categories
+#
+# Four endpoints lazy-fetched on first GET, coalesced via 1 s TTL:
+#   * /logs/server_info  (EC_OP_GET_SERVERINFO)
+#   * /stats/tree       (EC_OP_GET_STATSTREE)
+#   * /stats/graphs/{X} (EC_OP_GET_STATSGRAPHS — one fetch serves all 4)
+#   * /search/{id}/results (EC_OP_SEARCH_RESULTS, on a finished search)
+#
+# Wire changes:
+#   * /clients is the unified peer surface
+#   * /clients ships every alive peer (upload + download + queue +
+#     idle), with role-decoded state strings
+#   * lazy endpoints' `snapshot_at` reflects per-endpoint fetch time
+#     (not the refresher tick boundary)
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_10_refresher_lazy_ondemand_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 10-refresher-lazy-ondemand smoke @ $HOST"
+
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "login failed"
+
+# Refresher has 3 ops/tick now (STAT_REQ + GET_UPDATE + PREFERENCES).
+# The first tick still needs ~1 s; sleep 4 covers it comfortably.
+sleep 4
+
+# --- 1. /clients shape. --------------------------------------------
+#
+# /clients is the unified peer surface. Every alive peer in
+# theApp->clientlist surfaces, populated from the EC_TAG_CLIENT
+# container inside the GET_UPDATE response.
+_curl -H "Authorization: Bearer $TOKEN" "$API/clients"
+_assert_status 200 "GET /clients → 200"
+_assert_json_eq '.clients | type'        array '/clients .clients is array'
+
+CCOUNT=$(printf '%s' "$CURL_BODY" | jq '.clients | length')
+echo "    info: $CCOUNT peers cached (populated via GET_UPDATE CLIENT subtree)"
+
+if  "$CCOUNT" -gt 0 ; then
+	# Per-peer shape. The state enums are wire strings (decoded
+	# server-side from US_* / DS_* / IS_* / SO_* / OBST_* codes).
+	_assert_json_eq '.clients0.ecid | type'    number   '/clients0.ecid is numeric'
+	_assert_json_eq '.clients0.user_hash | length'    32       '/clients0.user_hash is 32-char hex'
+	_assert_json_eq '.clients0.upload_state | type'   string   '/clients0.upload_state is string'
+	_assert_json_eq '.clients0.download_state | type' string   '/clients0.download_state is string'
+	_assert_json_eq '.clients0.ident_state | type'    string   '/clients0.ident_state is string'
+	# software is null when the daemon never reported the tag (#1290 item 5),
+	# so pin the type to the pair rather than to string alone.
+	_assert_json_eq '.clients0.software | type | test("^(string|null)$")' true \
+		'/clients0.software is a string or null'
+	# #439 peer country: always-present ISO 3166-1 alpha-2 string,
+	# empty when GeoIP is off/unresolved (never absent/null).
+	# Nullable per R10: null means GeoIP is off or the lookup has
+	# not resolved, not "".
+	_assert_json_eq '(.clients0.country_code == null or (.clients0.country_code | type) == "string")' \
+		true '/clients0.country_code is a string or null'
+	# counters are top-level, not wrapped in xfer (R11): the window belongs in the key.
+	_assert_json_eq '.clients0 | has("xfer")' false '/clients0 does not wrap counters in xfer'
+	_assert_json_eq '.clients0.uploaded_bytes_session | type'   number '/clients0.uploaded_bytes_session is numeric'
+	_assert_json_eq '.clients0.downloaded_bytes_session | type' number '/clients0.downloaded_bytes_session is numeric'
+
+	# State enum allowlists — any peer's upload_state must be one of
+	# the wire strings the walker emits. Catch silent regressions if
+	# the enum decoder gets a new US_* value without a mapping.
+	BOGUS_US=$(printf '%s' "$CURL_BODY" | jq \
+		'.clients.upload_state | select(. != "uploading" and . != "queued" and . != "waiting_callback" and . != "connecting" and . != "pending" and . != "low_to_low_ip" and . != "banned" and . != "error" and . != "idle" and . != "unknown") | length')
+	if  "$BOGUS_US" = "0" ; then
+		_pass "/clients upload_state values are all from the US_* enum mapping"
+	else
+		_fail "/clients upload_state enum allowlist" \
+			"$BOGUS_US peers have an out-of-enum upload_state"
+	fi
+
+	BOGUS_DS=$(printf '%s' "$CURL_BODY" | jq \
+		'.clients.download_state | select(. != "downloading" and . != "queued" and . != "connected" and . != "connecting" and . != "waiting_callback" and . != "waiting_callback_kad" and . != "requesting_hashset" and . != "no_needed_parts" and . != "too_many_connections" and . != "too_many_connections_kad" and . != "low_to_low_ip" and . != "banned" and . != "error" and . != "idle" and . != "remote_queue_full" and . != "unknown") | length')
+	if  "$BOGUS_DS" = "0" ; then
+		_pass "/clients download_state values are all from the DS_* enum mapping"
+	else
+		_fail "/clients download_state enum allowlist" \
+			"$BOGUS_DS peers have an out-of-enum download_state"
+	fi
+fi
+
+# --- 3. Lazy-fetch endpoints — fresh per-endpoint snapshot_at. -----
+#
+# /stats/tree, /stats/graphs/{X}, /search/{id}/results, and
+# /logs/server_info no longer ride the refresher tick. Each handler
+# drives its own EC roundtrip on first call, coalesced via 1 s TTL.
+# The `snapshot_at` field on each reflects the per-endpoint fetch
+# time, not the refresher tick.
+_curl -H "Authorization: Bearer $TOKEN" "$API/stats/tree"
+_assert_status 200 "GET /stats/tree → 200 (lazy fetch)"
+_assert_json_eq '.nodes | type'        array '/stats/tree .nodes is array'
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/stats/graphs/download_speed"
+_assert_status 200 "GET /stats/graphs/download_speed → 200 (lazy fetch)"
+_assert_json_eq '.graph' download_speed '/stats/graphs/download_speed reports graph=download_speed'
+_assert_json_eq '.unit' bytes_per_second '/stats/graphs/download_speed reports unit=bytes_per_second'
+_assert_json_eq '.points | type' array    '/stats/graphs/download_speed .points is array'
+
+# TTL coalescing — two same-endpoint GETs within the 1 s window must
+# share the cached backing fetch. Observable via ETag: same
+# cached body bytes → same ETag. The per-point timestamps inside
+# /stats/graphs are anchored to the cache's `fetched_at`, so they
+# stay constant within a cache window; only between fetches do they
+# advance.
+GRAPH_ETAG_1=$(curl -s -I -H "Authorization: Bearer $TOKEN" \
+	"$API/stats/graphs/download_speed" \
+	| sed -n 's/^EeTtAaGg::space:*$^:cntrl:*$.*/\1/p' | head -1)
+GRAPH_ETAG_2=$(curl -s -I -H "Authorization: Bearer $TOKEN" \
+	"$API/stats/graphs/download_speed" \
+	| sed -n 's/^EeTtAaGg::space:*$^:cntrl:*$.*/\1/p' | head -1)
+if  "$GRAPH_ETAG_1" = "$GRAPH_ETAG_2"  &&  -n "$GRAPH_ETAG_1" ; then
+	_pass "/stats/graphs/download_speed back-to-back share the same fetch (1 s TTL coalescing; ETag stable: $GRAPH_ETAG_1)"
+else
+	_fail "/stats/graphs TTL coalescing" \
+		"first ETag=$GRAPH_ETAG_1, second=$GRAPH_ETAG_2 — expected identical within the 1 s window"
+fi
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/stats/graphs/bogus"
+_assert_status 404 "GET /stats/graphs/bogus → 404 (still validated)"
+
+# Results are addressed per search, so start one to have an id. A read of
+# a FINISHED search also refreshes it on demand (coalesced by a ~1 s TTL),
+# which is the lazy-fetch behaviour this phase is about.
+_curl -X POST -H "Authorization: Bearer $TOKEN" -H 'Content-Type: application/json' \
+	-d '{"query":"amuleapi-phase10","type":"local"}' "$API/search"
+SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id // empty')
+ -n "$SID"  || _die "POST /search returned no search_id"
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/search/$SID/results"
+_assert_status 200 "GET /search/{id}/results → 200 (lazy fetch)"
+_assert_json_eq '.results | type' array '/search/{id}/results .results is array'
+
+# An id that names no search never falls back to another one.
+_curl -H "Authorization: Bearer $TOKEN" "$API/search/4294967290/results"
+_assert_status 404 "GET /search/{unknown}/results → 404 (no implicit fallback)"
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/logs/server_info"
+_assert_status 200 "GET /logs/server_info → 200 (lazy fetch)"
+_assert_json_eq '.text | type' string '/logs/server_info .text is string'
+_assert_json_eq '.total_bytes | type' number '/logs/server_info .total_bytes is numeric'
+
+# --- 4. Per-tick endpoints still fresh from the refresher. ---------
+#
+# Sanity check the trio that stays on the refresher path —
+# downloads / shared / servers / clients / status / kad — they all
+# pull `snapshot_at` from CState::SnapshotAt which marks tick
+# completion.
+_curl -H "Authorization: Bearer $TOKEN" "$API/status"
+_assert_status 200 "GET /status → 200 (still per-tick)"
+_assert_json_eq '.ed2k.state | type' string '/status.ed2k.state populated'
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/downloads"
+_assert_status 200 "GET /downloads → 200 (still per-tick)"
+_assert_json_eq '.downloads | type' array '/downloads .downloads is array'
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/shared"
+_assert_status 200 "GET /shared → 200 (still per-tick)"
+_assert_json_eq '.shared | type' array '/shared .shared is array'
+
+_curl -H "Authorization: Bearer $TOKEN" "$API/servers"
+_assert_status 200 "GET /servers → 200 (still per-tick)"
+_assert_json_eq '.servers | type' array '/servers .servers is array'
+
+# --- 5. Method gate on /clients. -----------------------------------
+_curl -X DELETE -H "Authorization: Bearer $TOKEN" "$API/clients"
+_assert_status 405 "DELETE /clients → 405"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/11-downloads-default-filter.sh Added

@@ -0,0 +1,230 @@
+#!/usr/bin/env bash
+#
+# amuleapi 11-downloads-default-filter — /downloads default-filter completed + status
+# decode fix.
+#
+# Two related changes:
+#   1. DownloadStatusName at PS_COMPLETE / PS_COMPLETING short-circuits
+#      BEFORE the `stopped` check. amuled holds finished downloads in
+#      `m_completedDownloads` with EC_TAG_PARTFILE_STOPPED set true;
+#      the old decoder reported "paused" for them, masking the
+#      completion state. Fix exposes the "completed" wire string the
+#      schema documented.
+#   2. /downloads list filters status=="completed" entries by default.
+#      `m_completedDownloads` is amuled's own awaiting-clear list;
+#      surfacing those alongside the active queue confuses consumers.
+#      Select a different slice with `?status=active|all|completed`.
+#      `include_completed` is not accepted (a boolean cannot express
+#      completed-only); sending it is a 400 naming `status=`.
+#      The detail endpoint (`GET /downloads/{hash}`) is UNCHANGED —
+#      a consumer asking for a specific file by hash gets it
+#      regardless of its status.
+#
+# The clear-completed mutations:
+#   `POST /downloads_clear_completed`              (bulk-clear, no body)
+#   `POST /downloads_clear_completed {"hash":...}` (single-entry clear)
+# Both wire to EC_OP_CLEAR_COMPLETED. `DELETE /downloads/{hash}` is
+# active-only and 409s on completed entries — see 13-downloads-delete-clear for the
+# 409 + per-entry clear assertions.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_11_downloads_default_filter_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 11-downloads-default-filter smoke @ $HOST"
+
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "login failed"
+sleep 4
+
+# --- 1. Default /downloads — completed entries filtered out. ------
+_curl -H "Authorization: Bearer $TOKEN" "$API/downloads"
+_assert_status 200 "GET /downloads → 200"
+_assert_json_eq '.downloads | type' array '/downloads .downloads is array'
+
+# By definition: no entry in the default response should carry
+# status == "completed". This is the contract; smoke pins it
+# regardless of the daemon's current download mix.
+BOGUS=$(printf '%s' "$CURL_BODY" | jq '.downloads.status | select(. == "completed") | length')
+if  "$BOGUS" = "0" ; then
+	_pass "/downloads default has zero status==\"completed\" entries (filter active)"
+else
+	_fail "/downloads default filter" \
+		"$BOGUS entries with status==completed leaked through the default filter"
+fi
+
+DEFAULT_COUNT=$(printf '%s' "$CURL_BODY" | jq '.downloads | length')
+echo "    info: /downloads default returned $DEFAULT_COUNT entries (completed filtered)"
+
+# --- 2. ?status=all opt-in. ---------------------------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/downloads?status=all"
+_assert_status 200 "GET /downloads?status=all → 200"
+_assert_json_eq '.downloads | type' array '/downloads?status=all .downloads is array'
+
+ALL_COUNT=$(printf '%s' "$CURL_BODY" | jq '.downloads | length')
+echo "    info: /downloads?status=all returned $ALL_COUNT entries"
+
+# `all` is strictly a superset of the default slice.
+if  "$ALL_COUNT" -ge "$DEFAULT_COUNT" ; then
+	_pass "?status=all returns >= default count ($ALL_COUNT >= $DEFAULT_COUNT)"
+else
+	_fail "?status=all cardinality" \
+		"all count $ALL_COUNT < default count $DEFAULT_COUNT - filter regression"
+fi
+
+# If `all` carries at least one entry, its status enum must be from the
+# known set (paranoid: the status decoder didn't go off the rails for
+# some PS_* code).
+if  "$ALL_COUNT" -gt 0 ; then
+	BOGUS=$(printf '%s' "$CURL_BODY" | jq \
+		'.downloads.status | select(. != "downloading" and . != "paused" and . != "stopped" and . != "completed" and . != "completing" and . != "hashing" and . != "erroneous" and . != "allocating" and . != "waiting" and . != "insufficient_disk" and . != "unknown") | length')
+	if  "$BOGUS" = "0" ; then
+		_pass "/downloads?status=all all status values from known enum"
+	else
+		_fail "/downloads status enum allowlist" \
+			"$BOGUS entries have out-of-enum status"
+	fi
+fi
+
+# --- 3. ?status=active is what the default already does. ----------
+_curl -H "Authorization: Bearer $TOKEN" "$API/downloads?status=active"
+_assert_status 200 "GET /downloads?status=active → 200"
+ACTIVE_COUNT=$(printf '%s' "$CURL_BODY" | jq '.downloads | length')
+if  "$ACTIVE_COUNT" = "$DEFAULT_COUNT" ; then
+	_pass "?status=active matches the default slice ($ACTIVE_COUNT entries)"
+else
+	_fail "?status=active cardinality" \
+		"got $ACTIVE_COUNT entries, expected $DEFAULT_COUNT (default)"
+fi
+_assert_json_eq '.downloads.status | select(. == "completed") | length' 0 \
+	'?status=active has zero status=="completed" entries'
+
+# --- 4. ?status=completed - the slice a boolean could not express. --
+#
+# This is the third state the collection has, and a boolean could not
+# express completed-only on its own.
+_curl -H "Authorization: Bearer $TOKEN" "$API/downloads?status=completed"
+_assert_status 200 "GET /downloads?status=completed → 200"
+_assert_json_eq '.downloads | type' array '/downloads?status=completed .downloads is array'
+COMPLETED_COUNT=$(printf '%s' "$CURL_BODY" | jq '.downloads | length')
+echo "    info: /downloads?status=completed returned $COMPLETED_COUNT entries"
+
+# Every row in the completed slice must actually be completed.
+_assert_json_eq '.downloads.status | select(. != "completed") | length' 0 \
+	'?status=completed carries only status=="completed" entries'
+
+# The three slices partition the queue: active + completed == all.
+if  "$((ACTIVE_COUNT + COMPLETED_COUNT))" = "$ALL_COUNT" ; then
+	_pass "active + completed == all ($ACTIVE_COUNT + $COMPLETED_COUNT == $ALL_COUNT)"
+else
+	_fail "status slices partition the queue" \
+		"active $ACTIVE_COUNT + completed $COMPLETED_COUNT != all $ALL_COUNT"
+fi
+
+# --- 4b. Rejections. ----------------------------------------------
+#
+# A value outside the enum is a 400, not a silent fallthrough to the
+# default: a typo must not quietly change what the caller gets.
+_curl -H "Authorization: Bearer $TOKEN" "$API/downloads?status=bogus"
+_assert_status 400 "GET /downloads?status=bogus → 400"
+_assert_json_eq '.error.code' bad_request 'status=bogus 400 carries error.code=bad_request'
+
+# include_completed is refused rather than ignored, and the message names
+# `status=` so a caller sending it is told where to go.
+for v in 1 0 true false; do
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads?include_completed=$v"
+	_assert_status 400 "GET /downloads?include_completed=$v → 400"
+done
+_assert_json_eq '.error.code' bad_request \
+	'include_completed 400 carries error.code=bad_request'
+if printf '%s' "$CURL_BODY" | grep -q 'status=active|all|completed'; then
+	_pass 'include_completed 400 names status=active|all|completed as the replacement'
+else
+	_fail 'include_completed 400 message' \
+		"message does not name the replacement: $(printf '%s' "$CURL_BODY" | head -c 200)"
+fi
+
+# --- 5. Detail endpoint UNCHANGED — serves completed files too. ---
+#
+# Pick a hash from the completed slice. If at least one entry is
+# completed, hitting its detail must still return 200 (consumers
+# asking for a specific file shouldn't be filtered).
+_curl -H "Authorization: Bearer $TOKEN" "$API/downloads?status=completed"
+COMPLETED_HASH=$(printf '%s' "$CURL_BODY" | jq -r \
+	'.downloads | first | .hash // empty')
+if  -n "$COMPLETED_HASH" ; then
+	_curl -H "Authorization: Bearer $TOKEN" "$API/downloads/$COMPLETED_HASH"
+	_assert_status 200 "GET /downloads/{completed-hash} → 200 (detail not filtered)"
+	_assert_json_eq '.status' completed \
+		'/downloads/{completed-hash} carries status=completed (decoder fix observable)'
+	_assert_json_eq '.hash' "$COMPLETED_HASH" \
+		'/downloads/{completed-hash} echoes the requested hash'
+else
+	echo "    info: no completed downloads in this daemon's queue; detail-not-filtered check skipped"
+fi
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/12-downloads-add-patch.sh Added

@@ -0,0 +1,376 @@
+#!/usr/bin/env bash
+#
+# amuleapi 12-downloads-add-patch — download lifecycle mutations.
+#
+# Endpoints landed:
+#   POST  /api/v1/downloads             — add downloads by `links` array
+#   PATCH /api/v1/downloads/{hash}      — status/priority/category
+#
+# Mutate-then-refresh contract: every mutation handler runs
+# RefresherTick inline after the EC roundtrip succeeds, so the
+# response body AND the IMMEDIATE-next GET both reflect post-mutation
+# state. No sleep loops, no stale cache window. This smoke pins that
+# invariant — every PATCH is followed by a no-sleep GET that must
+# show the same state the PATCH response showed.
+#
+# The smoke uses the Ubuntu 24.04.4 ISO ed2k link as its test artifact
+# (provided by the operator). Hash:
+# 0031C9CBA65C50DD2015C184B2CA2C88. The ISO is a stable, well-seeded
+# ed2k file; amuled adds it to m_filelist within ~1 refresher tick.
+# 5b's smoke cleans up via DELETE.
+#
+# Role gate: mutations require ADMIN. Guest tokens get 403 forbidden.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+# Stable test artifact: Ubuntu 24.04.4 desktop ISO. Lowercase hash as
+# stored on the API side (the wire path is case-insensitive but the
+# State cache is keyed in lowercase).
+TEST_LINK="ed2k://|file|ubuntu-24.04.4-desktop-amd64.iso|6655619072|0031C9CBA65C50DD2015C184B2CA2C88|/"
+TEST_HASH="0031c9cba65c50dd2015c184b2ca2c88"
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_12_downloads_add_patch_body.XXXXXX)
+trap '
+	rm -f "$CURL_BODY_FILE"
+	# Best-effort partfile cleanup so the Ubuntu ISO doesn'\''t survive
+	# a failed run and pin disk on the Windows VM (per
+	# feedback_clean_temp_partfiles_after_test).
+	if  -n "${ADMIN_TOKEN:-}" ; then
+		curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+			"$API/downloads/$TEST_HASH" > /dev/null 2>&1 || true
+	fi
+' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 12-downloads-add-patch smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  \
+	|| _die "admin login failed (need --set-admin-pass=$ADMIN_PASS on the daemon)"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+if  -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null" ; then
+	HAVE_GUEST=1
+fi
+
+sleep 4
+
+# --- 1. Auth gate (no token → 401). --------------------------------
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"links\":\"$TEST_LINK\"}" "$API/downloads"
+_assert_status 401 "POST /downloads (no token) → 401"
+
+_curl -X PATCH -H "Content-Type: application/json" \
+	-d '{"action":"pause"}' "$API/downloads/$TEST_HASH"
+_assert_status 401 "PATCH /downloads/{hash} (no token) → 401"
+
+# --- 2. Admin gate (guest → 403). ----------------------------------
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"links\":\"$TEST_LINK\"}" "$API/downloads"
+	_assert_status 403 "POST /downloads (guest token) → 403"
+	_assert_json_eq '.error.code' forbidden \
+		'POST /downloads guest carries error.code=forbidden'
+
+	_curl -X PATCH -H "Authorization: Bearer $GUEST_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"action":"pause"}' "$API/downloads/$TEST_HASH"
+	_assert_status 403 "PATCH /downloads/{hash} (guest token) → 403"
+
+	# The comments POST drives an unbounded Kad NOTES lookup on the daemon
+	# (EC_OP_SHARED_FILE_SEARCH_KAD_NOTES), so it is a mutation for gating
+	# purposes even though it writes nothing locally. The matching GET is a
+	# plain read and stays open to guests.
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		"$API/downloads/$TEST_HASH/comments"
+	_assert_status 403 "POST /downloads/{hash}/comments (guest token) → 403"
+	_assert_json_eq '.error.code' forbidden \
+		'POST downloads comments guest carries error.code=forbidden'
+else
+	echo "    info: no guest password set on daemon; admin-gate test skipped"
+fi
+
+# --- 3. POST /downloads happy: add the test ISO. -------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"links\":\"$TEST_LINK\"}" "$API/downloads"
+_assert_status 202 "POST /downloads (Ubuntu ISO) → 202"
+# Unified per-item envelope (#358): one accepted result keyed by the link.
+_assert_json_eq '.results | length' 1 'POST /downloads returns one result'
+_assert_json_eq '.results0.ok' true 'POST /downloads results0.ok==true'
+_assert_json_eq ".results0.id" "$TEST_LINK" 'POST /downloads results0.id echoes the link'
+
+# Poll until the new partfile surfaces in /downloads (amuled's ADD_LINK
+# is async — allocation + hashing happen post-roundtrip). Bound at
+# ~5 s with 200 ms steps. Production refresher catches it in ≤1 tick.
+APPEARED=0
+for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25; do
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/downloads?status=all"
+	if printf '%s' "$CURL_BODY" \
+	   | jq -e --arg h "$TEST_HASH" '.downloads | select(.hash == $h)' \
+	   >/dev/null 2>&1; then
+		APPEARED=1
+		break
+	fi
+	sleep 0.2
+done
+if  "$APPEARED" = "1" ; then
+	_pass "Ubuntu ISO surfaced in /downloads via async ADD_LINK"
+else
+	_die "Ubuntu ISO never surfaced; ADD_LINK semantics may have shifted"
+fi
+
+# --- 4. POST /downloads error paths. -------------------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"links":"http://not-an-ed2k.com/foo"}' "$API/downloads"
+_assert_status 400 "POST /downloads (non-ed2k URL) → 400"
+_assert_json_eq '.error.code' bad_request \
+	'POST /downloads invalid URL carries error.code=bad_request'
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{}' "$API/downloads"
+_assert_status 400 "POST /downloads (missing links) → 400"
+
+# `links` is the only spelling. The singular `ed2k_link` is refused, not
+# ignored: one input with two spellings, on the endpoint that answers with
+# the bulk `results` envelope even for a single item.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"ed2k_link\":\"$TEST_LINK\"}" "$API/downloads"
+_assert_status 400 "POST /downloads (singular ed2k_link) → 400"
+_assert_json_eq '.error.message | test("`links`")' true \
+	'the ed2k_link 400 names `links` as the replacement'
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d 'not json' "$API/downloads"
+_assert_status 400 "POST /downloads (malformed JSON) → 400"
+
+# --- 5. PATCH happy paths + no-stale-cache invariant. --------------
+#
+# Save the pre-mutation state so we can restore it at the end.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH"
+SAVED_STATUS=$(printf '%s' "$CURL_BODY" | jq -r '.status')
+SAVED_PRIORITY=$(printf '%s' "$CURL_BODY" | jq -r '.priority')
+SAVED_CATEGORY=$(printf '%s' "$CURL_BODY" | jq -r '.category')
+echo "    info: saved state status=$SAVED_STATUS priority=$SAVED_PRIORITY category=$SAVED_CATEGORY"
+
+# 5a. PATCH status=paused. Response body must show paused. Immediate
+# GET (no sleep) must also show paused — pins the mutate-then-refresh
+# contract.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"action":"pause"}' "$API/downloads/$TEST_HASH"
+_assert_status 200 "PATCH /downloads/{hash} status=paused → 200"
+_assert_json_eq '.status' paused \
+	'PATCH response body shows status=paused'
+
+# No sleep — IMMEDIATE GET. Must see the post-mutation value.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH"
+_assert_json_eq '.status' paused \
+	'IMMEDIATE GET after PATCH paused shows status=paused (no stale cache)'
+
+# 5b. PATCH status=resumed. Same invariant in the opposite direction.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"action":"resume"}' "$API/downloads/$TEST_HASH"
+_assert_status 200 "PATCH /downloads/{hash} status=resumed → 200"
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH"
+# Resumed maps back to one of the live statuses (downloading / waiting).
+RESUMED=$(printf '%s' "$CURL_BODY" | jq -r '.status')
+if  "$RESUMED" = "paused" ; then
+	_fail "IMMEDIATE GET after PATCH resumed" \
+		"still shows status=paused (stale cache)"
+else
+	_pass "IMMEDIATE GET after PATCH resumed shows non-paused (status=$RESUMED)"
+fi
+
+# 5b2. PATCH status=stopped — the stop action (pause + drop all
+# sources + reset the Kad source search). amuleapi surfaces it as the
+# distinct wire status "stopped" (vs "paused", which keeps its
+# sources). Response body + immediate GET must both show it.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"action":"stop"}' "$API/downloads/$TEST_HASH"
+_assert_status 200 "PATCH /downloads/{hash} status=stopped → 200"
+_assert_json_eq '.status' stopped 'PATCH response body shows status=stopped'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH"
+_assert_json_eq '.status' stopped \
+	'IMMEDIATE GET after PATCH stopped shows status=stopped (no stale cache)'
+
+# 5b3. Resume clears the stopped state (ResumeFile clears both the
+# paused and stopped flags), so the next GET must be neither.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"action":"resume"}' "$API/downloads/$TEST_HASH"
+_assert_status 200 "PATCH status=resumed (clear stop) → 200"
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH"
+UNSTOPPED=$(printf '%s' "$CURL_BODY" | jq -r '.status')
+if  "$UNSTOPPED" = "stopped"  ||  "$UNSTOPPED" = "paused" ; then
+	_fail "IMMEDIATE GET after resume-from-stopped" \
+		"still inactive (status=$UNSTOPPED) — resume did not clear stop"
+else
+	_pass "IMMEDIATE GET after resume-from-stopped shows active status ($UNSTOPPED)"
+fi
+
+# 5c. PATCH priority=high. Response + immediate GET both show high.
+# Downloads support low/normal/high/auto only (very_low and release are
+# shared/upload-side levels — rejected below in section 6).
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"high"}' "$API/downloads/$TEST_HASH"
+_assert_status 200 "PATCH priority=high → 200"
+_assert_json_eq '.priority' high 'PATCH response shows priority=high'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH"
+_assert_json_eq '.priority' high \
+	'IMMEDIATE GET after PATCH priority=high shows priority=high'
+
+# 5d. Combined PATCH — status + priority + category in one body.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"action":"pause","priority":"low","category_index":0}' \
+	"$API/downloads/$TEST_HASH"
+_assert_status 200 "PATCH combined (action+priority+category_index) → 200"
+_assert_json_eq '.status'   paused 'combined PATCH response status=paused'
+_assert_json_eq '.priority' low    'combined PATCH response priority=low'
+_assert_json_eq '.category_index' 0      'combined PATCH response category_index=0'
+
+# `category_index` says "must be a non-negative integer", so it has to mean it:
+# a fractional value is a 400, not truncated to 2, so it enforces what its
+# own message promises, the same as my_rating.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"category_index":2.9}' "$API/downloads/$TEST_HASH"
+_assert_status 400 "PATCH category_index=2.9 -> 400 (not truncated to 2)"
+_assert_json_eq '.error.code' bad_request 'fractional category_index carries error.code=bad_request'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH"
+_assert_json_eq '.status'   paused 'IMMEDIATE GET after combined PATCH status=paused'
+_assert_json_eq '.priority' low    'IMMEDIATE GET after combined PATCH priority=low'
+
+# --- 6. PATCH error paths. -----------------------------------------
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{}' "$API/downloads/$TEST_HASH"
+_assert_status 400 "PATCH empty body → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"bogus"}' "$API/downloads/$TEST_HASH"
+_assert_status 400 "PATCH unknown priority enum → 400"
+
+# Downloads reject the shared/upload-only levels: very_low and release
+# are not valid download priorities (the daemon would clamp them to
+# normal), so the API refuses them rather than silently downgrading.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"very_low"}' "$API/downloads/$TEST_HASH"
+_assert_status 400 "PATCH priority=very_low (shared-only) → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"release"}' "$API/downloads/$TEST_HASH"
+_assert_status 400 "PATCH priority=release (shared-only) → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"status":"flapped"}' "$API/downloads/$TEST_HASH"
+_assert_status 400 "PATCH unknown status enum → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"action":"pause"}' "$API/downloads/baadbaadbaadbaadbaadbaadbaadbaad"
+_assert_status 404 "PATCH unknown hash → 404"
+
+# --- 7. Restore the pre-mutation state so the Ubuntu ISO ends up
+# in roughly the state it started in. (5b's smoke will clean it up
+# via DELETE.)
+RESTORE_STATUS=$SAVED_STATUS
+case "$RESTORE_STATUS" in
+	downloading|waiting|hashing|completing|allocating) RESTORE_STATUS=resumed ;;
+	paused|completed|erroneous|insufficient_disk) RESTORE_STATUS=paused ;;
+	*) RESTORE_STATUS=resumed ;;
+esac
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"status\":\"$RESTORE_STATUS\",\"priority\":\"$SAVED_PRIORITY\",\"category\":$SAVED_CATEGORY}" \
+	"$API/downloads/$TEST_HASH"
+_assert_status 200 "PATCH (restore pre-mutation state) → 200"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/13-downloads-delete-clear.sh Added

@@ -0,0 +1,315 @@
+#!/usr/bin/env bash
+#
+# amuleapi 13-downloads-delete-clear — clear / delete downloads.
+#
+# Endpoints:
+#   DELETE /api/v1/downloads/{hash}             — drop a single entry
+#   POST   /api/v1/downloads_clear_completed    — drop all completed
+#
+# Routing by current state:
+#   * status == "completed" → EC_OP_CLEAR_COMPLETED (by ECID; targets
+#                            amuled's m_completedDownloads list)
+#   * any other status      → EC_OP_PARTFILE_DELETE (by hash; targets
+#                            active partfiles in m_filelist)
+#
+# The status decode is load-bearing here: a finished
+# partfile that the prior decoder reported as "paused" would never
+# be enumerable by clear_completed. The bulk clear-completed endpoint walks
+# the cache for `status=="completed"` entries, so the decoder must
+# surface the wire string correctly.
+#
+# Same no-stale-cache invariant as 5a: DELETE response followed by
+# an IMMEDIATE GET must show the entry gone (404).
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+TEST_LINK="ed2k://|file|ubuntu-24.04.4-desktop-amd64.iso|6655619072|0031C9CBA65C50DD2015C184B2CA2C88|/"
+TEST_HASH="0031c9cba65c50dd2015c184b2ca2c88"
+
+FAIL_COUNT=0
+TEST_COUNT=0
+# Skips are counted apart from TEST_COUNT, never folded into it: a skipped
+# check is coverage that did not happen, and adding it to the passed tally
+# would report the absence of a check as a check that succeeded.
+SKIP_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_13_downloads_delete_clear_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_skip() { SKIP_COUNT=$((SKIP_COUNT+1)); echo "  SKIP  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+_assert_body_empty() {
+	local label=$1
+	if  -z "$CURL_BODY" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected an empty body, got: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 13-downloads-delete-clear smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+sleep 4
+
+# --- 1. Auth + admin gate. -----------------------------------------
+_curl -X DELETE "$API/downloads/$TEST_HASH"
+_assert_status 401 "DELETE /downloads/{hash} (no token) → 401"
+
+_curl -X POST "$API/downloads_clear_completed"
+_assert_status 401 "POST /downloads_clear_completed (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X DELETE -H "Authorization: Bearer $GUEST_TOKEN" \
+		"$API/downloads/$TEST_HASH"
+	_assert_status 403 "DELETE /downloads/{hash} (guest) → 403"
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		"$API/downloads_clear_completed"
+	_assert_status 403 "POST /downloads_clear_completed (guest) → 403"
+else
+	echo "    info: no guest pass; admin-gate skipped"
+fi
+
+# --- 2. DELETE non-existent hash → 404. ----------------------------
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/baadbaadbaadbaadbaadbaadbaadbaad"
+_assert_status 404 "DELETE /downloads/{nonexistent} → 404"
+
+# --- 3. Bulk clear_completed on a clean queue (no completed). ------
+#
+# Pre-seed: clear anything that's already completed so we measure
+# from a known baseline. (The smoke is order-independent — 11-downloads-default-filter
+# may have left a completed entry behind, or it may not have. We
+# call clear once to baseline, then move on.)
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads_clear_completed"
+_assert_status 200 "POST /downloads_clear_completed (baseline) → 200"
+# The shared results envelope has no top-level `ok`: per-item success lives on
+# each entry, so a partial outcome cannot be reported as a single boolean.
+_assert_json_eq '.results | type' array 'clear_completed returns a results array'
+
+# Second call: now nothing is completed. cleared must be 0.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads_clear_completed"
+_assert_status 200 "POST /downloads_clear_completed (idempotent no-op) → 200"
+# An empty `results` array is the no-op. It was `cleared: 0`, a shape only this
+# endpoint used.
+_assert_json_eq '.results | length' 0 'clear_completed second call cleared 0 entries'
+
+# --- 4. DELETE on an active partfile (happy path + no-stale GET). --
+#
+# Add the Ubuntu ISO, wait for it to surface, DELETE it, immediate
+# GET must 404. This pins the mutate-then-refresh invariant on the
+# active-path EC_OP_PARTFILE_DELETE branch.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"links\":\"$TEST_LINK\"}" "$API/downloads"
+_assert_status 202 "POST /downloads (Ubuntu ISO) → 202 (setup)"
+
+APPEARED=0
+for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25; do
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/downloads?status=all"
+	if printf '%s' "$CURL_BODY" \
+	   | jq -e --arg h "$TEST_HASH" '.downloads | select(.hash == $h)' \
+	   >/dev/null 2>&1; then
+		APPEARED=1
+		break
+	fi
+	sleep 0.2
+done
+ "$APPEARED" = "1"  || _die "Ubuntu ISO never surfaced after POST"
+_pass "Ubuntu ISO surfaced for DELETE setup"
+
+# DELETE it.
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH"
+# 204, no body: `hash` came from the URL and `ok` restated the status code.
+_assert_status 204 "DELETE /downloads/{Ubuntu ISO hash} → 204"
+_assert_body_empty 'DELETE sends no body'
+
+# Immediate GET — no stale cache.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH"
+_assert_status 404 "IMMEDIATE GET after DELETE → 404 (no stale cache)"
+
+# Same in list view — entry must be gone from the default response.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads?status=all"
+STILL_THERE=$(printf '%s' "$CURL_BODY" \
+	| jq --arg h "$TEST_HASH" '.downloads | select(.hash == $h) | length')
+if  "$STILL_THERE" = "0" ; then
+	_pass "/downloads (list) no longer contains the deleted hash"
+else
+	_fail "/downloads list staleness" \
+		"deleted entry still appears in list response"
+fi
+
+# --- 5. DELETE on the same hash twice → 404 second time. ----------
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH"
+_assert_status 404 "DELETE the same hash twice → 404 second time"
+
+# --- 6. POST clear_completed {hash:...} on non-existent → 404. ----
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"hash":"baadbaadbaadbaadbaadbaadbaadbaad"}' \
+	"$API/downloads_clear_completed"
+_assert_status 404 "POST clear_completed {hash:unknown} → 404"
+_assert_json_eq '.error.code' not_found 'clear_completed {hash:unknown}.error.code'
+
+# --- 7. POST clear_completed malformed body → 400. ----------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d 'not json at all' \
+	"$API/downloads_clear_completed"
+_assert_status 400 "POST clear_completed (malformed body) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"hash": 12345}' \
+	"$API/downloads_clear_completed"
+_assert_status 400 "POST clear_completed {hash: non-string} → 400"
+
+# --- 8. POST clear_completed {hash:active-partfile} → 409. --------
+#
+# Re-add the Ubuntu ISO so we have a known active partfile, then
+# call clear_completed with that hash. The handler must refuse with
+# 409 not_completed because the entry is in m_filelist, not in
+# m_completedDownloads.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"links\":\"$TEST_LINK\"}" "$API/downloads"
+_assert_status 202 "POST /downloads (Ubuntu ISO re-add) → 202 (setup)"
+
+APPEARED=0
+for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25; do
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/downloads?status=all"
+	if printf '%s' "$CURL_BODY" \
+	   | jq -e --arg h "$TEST_HASH" '.downloads | select(.hash == $h)' \
+	   >/dev/null 2>&1; then
+		APPEARED=1
+		break
+	fi
+	sleep 0.2
+done
+ "$APPEARED" = "1"  || _die "Ubuntu ISO never re-surfaced after re-POST"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"hash\":\"$TEST_HASH\"}" \
+	"$API/downloads_clear_completed"
+_assert_status 409 "POST clear_completed {hash:active-partfile} → 409"
+_assert_json_eq '.error.code' not_completed \
+	'clear_completed active hash .error.code == not_completed'
+
+# Cleanup the active partfile.
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH"
+_assert_status 204 "Cleanup: DELETE /downloads/{Ubuntu ISO hash} (2nd) → 204"
+
+# --- 9. DELETE / clear_completed against any naturally-completed
+#         entry — covers the by-hash success path AND the 409 from
+#         DELETE on a completed entry. SKIP if the daemon has none.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads?status=all"
+COMPLETED_HASH=$(printf '%s' "$CURL_BODY" \
+	| jq -r '.downloads | select(.status == "completed") | .hash0 // empty')
+if  -n "$COMPLETED_HASH" ; then
+	# DELETE must refuse with 409 + actionable error code.
+	_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/downloads/$COMPLETED_HASH"
+	_assert_status 409 "DELETE /downloads/{completed} → 409"
+	_assert_json_eq '.error.code' download_completed \
+		'DELETE on completed .error.code == download_completed'
+
+	# clear_completed {hash:completed} → 200, exactly 1 cleared.
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"hash\":\"$COMPLETED_HASH\"}" \
+		"$API/downloads_clear_completed"
+	_assert_status 200 "POST clear_completed {hash:completed} → 200"
+	_assert_json_eq '.results | length' 1 'per-hash clear_completed cleared exactly 1'
+	_assert_json_eq '.results0.id' "$COMPLETED_HASH" \
+		'results0.id echoes the input hash'
+	_assert_json_eq '.results0.ok' true 'results0 reports success'
+
+	# Second call → 404 (entry is gone).
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"hash\":\"$COMPLETED_HASH\"}" \
+		"$API/downloads_clear_completed"
+	_assert_status 404 "POST clear_completed {hash:already-cleared} → 404"
+else
+	_skip "DELETE on completed → 409 (no completed entry in test daemon)"
+	_skip "POST clear_completed {hash:completed} → 200 (no completed entry)"
+fi
+
+# --- Summary. -----------------------------------------------------
+echo
+SKIP_NOTE=""
+ "$SKIP_COUNT" -gt 0  && SKIP_NOTE=" ($SKIP_COUNT check(s) skipped)"
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed$SKIP_NOTE"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/14-servers-mutations.sh Added

@@ -0,0 +1,408 @@
+#!/usr/bin/env bash
+#
+# amuleapi 14-servers-mutations — server lifecycle mutations.
+#
+# Endpoints:
+#   POST   /api/v1/servers                   — add by {address, name?}
+#   POST   /api/v1/servers/{ecid}/connect    — connect to one server
+#   PATCH  /api/v1/servers/{ecid}            — set priority / permanent flag
+#   DELETE /api/v1/servers/{ecid}            — remove from the list
+#
+# All keyed by ECID on the URL — the EC ops (CONNECT/REMOVE) actually
+# identify the server by IPv4+port server-side, so the handler looks
+# up the cache entry by ECID and builds the EC_TAG_SERVER tag from the
+# cached IP+port. Phase 5c also fixed a latent /servers.address
+# bug: the GET_UPDATE (Phase 4f) per-server tag carries IP/port in
+# CHILD tags (EC_TAG_SERVER_IP + EC_TAG_SERVER_PORT) rather than the
+# outer-tag IPv4 shape the legacy GET_SERVER_LIST used. /servers
+# was showing "0.0.0.0:0" for every entry; smoke pins the fix.
+#
+# Test server: a real eMule server (185.65.45.144:4232 = eDonkey
+# Sicherheit) the operator added to amuled's serverlist before
+# starting the smoke. We POST a duplicate to test the
+# amuled-rejected error path, then DELETE the original.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+# Test server (host:port). The operator's daemon has a few dozen
+# servers configured; the smoke adds a name we can target by string
+# search and cleans it up at the end.
+TEST_ADDRESS="185.65.45.144:4232"
+TEST_NAME="14-servers-mutations-smoke-tag"
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_14_servers_mutations_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+_assert_body_empty() {
+	local label=$1
+	if  -z "$CURL_BODY" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected an empty body, got: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 14-servers-mutations smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+sleep 4
+
+# --- 1. /servers address parse fix — must not be "0.0.0.0:0". ---
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/servers"
+_assert_status 200 "GET /servers → 200"
+
+# The operator's daemon has servers in its list with real IPs.
+# Smoke would pass on an empty list (no servers means no parse path
+# to exercise), but if there ARE servers, NONE should report the
+# all-zeros sentinel — that was the GET_UPDATE child-tag parse bug.
+N=$(printf '%s' "$CURL_BODY" | jq '.servers | length')
+if  "$N" -gt 0 ; then
+	BOGUS=$(printf '%s' "$CURL_BODY" | jq \
+		'.servers | select(.address == "0.0.0.0:0") | length')
+	if  "$BOGUS" = "0" ; then
+		_pass "/servers.address parses real IP:port (no \"0.0.0.0:0\" entries, $N servers checked)"
+	else
+		_fail "/servers.address parse regression" \
+			"$BOGUS / $N entries report \"0.0.0.0:0\""
+	fi
+	# `ecid` field must be present (URL key for the mutation endpoints).
+	BAD_ECID=$(printf '%s' "$CURL_BODY" | jq '.servers | select(.ecid == null) | length')
+	if  "$BAD_ECID" = "0" ; then
+		_pass "/servers.ecid populated for every entry"
+	else
+		_fail "/servers.ecid missing" \
+			"$BAD_ECID entries lack the ecid field"
+	fi
+else
+	echo "    info: daemon has 0 servers configured; parse-bug check skipped"
+fi
+
+# --- 2. Auth + admin gate. -----------------------------------------
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"address\":\"$TEST_ADDRESS\"}" "$API/servers"
+_assert_status 401 "POST /servers (no token) → 401"
+
+_curl -X DELETE "$API/servers/1"
+_assert_status 401 "DELETE /servers/{ecid} (no token) → 401"
+
+_curl -X POST "$API/servers/1/connect"
+_assert_status 401 "POST /servers/{ecid}/connect (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"address\":\"$TEST_ADDRESS\"}" "$API/servers"
+	_assert_status 403 "POST /servers (guest) → 403"
+	_curl -X DELETE -H "Authorization: Bearer $GUEST_TOKEN" \
+		"$API/servers/1"
+	_assert_status 403 "DELETE /servers/{ecid} (guest) → 403"
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		"$API/servers/1/connect"
+	_assert_status 403 "POST /servers/{ecid}/connect (guest) → 403"
+else
+	echo "    info: no guest pass; admin-gate skipped"
+fi
+
+# --- 3. POST /servers happy path — add the tagged server. ---------
+#
+# amuled treats duplicate (host:port) adds as rejections; if the
+# server already exists with the same address, we'll get 400
+# amuled_rejected. Strip any prior tag of the same name first so the
+# smoke is idempotent (no DELETE in the orchestrator yet for older
+# entries).
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"address\":\"$TEST_ADDRESS\",\"name\":\"$TEST_NAME\"}" \
+	"$API/servers"
+# Accept 202 (accepted) OR 400 (already in list — server was added
+# by a prior smoke or the operator). Both are valid endings.
+#
+# 202 with no body, not 201 + the created object: EC_OP_SERVER_ADD answers
+# success or failure and never returns the server it made, so a body here
+# could only be reconstructed from the snapshot after an inline refresh.
+# The caller re-reads /servers, which it had to do anyway.
+if  "$CURL_STATUS" = "202" ; then
+	_pass "POST /servers (add tagged server) → 202"
+	_assert_body_empty "POST /servers sends no body"
+elif  "$CURL_STATUS" = "400" ; then
+	ERR_CODE=$(printf '%s' "$CURL_BODY" | jq -r '.error.code')
+	if  "$ERR_CODE" = "amuled_rejected" ; then
+		_pass "POST /servers (already in list) → 400 amuled_rejected"
+	else
+		_fail "POST /servers" \
+			"got 400 with unexpected error.code=$ERR_CODE"
+	fi
+else
+	_fail "POST /servers" \
+		"expected 202 or 400, got $CURL_STATUS" \
+		"body: $CURL_BODY"
+fi
+
+# Wait for the new server to land in cache (no inline refresh needed
+# — POST handler runs RefresherTick before returning).
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/servers"
+ECID=$(printf '%s' "$CURL_BODY" \
+	| jq -r --arg n "$TEST_NAME" \
+	  '.servers | select(.name == $n) | first | .ecid // empty')
+if  -n "$ECID"  &&  "$ECID" != "null" ; then
+	_pass "Tagged server present in /servers (ecid=$ECID)"
+else
+	_fail "Tagged server lookup" \
+		"could not find server with name=$TEST_NAME in /servers"
+	_die "cannot continue without the test server ECID"
+fi
+
+# --- 4. POST /servers error paths. ---------------------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{}' "$API/servers"
+_assert_status 400 "POST /servers (no address) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"address":"no-colon"}' "$API/servers"
+_assert_status 400 "POST /servers (no colon in address) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d 'not json' "$API/servers"
+_assert_status 400 "POST /servers (malformed JSON) → 400"
+
+# --- 5. POST /servers/{ecid}/connect. ------------------------------
+#
+# This kicks off an ed2k connect attempt. amuled accepts the command
+# (returns NOOP); the actual TCP connect is async. 202 Accepted, no body:
+# `ecid` came from the URL and the outcome only shows up later on
+# /status.ed2k.state and the SSE stream.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/servers/$ECID/connect"
+_assert_status 202 "POST /servers/{ecid}/connect → 202"
+_assert_body_empty 'connect sends no body'
+
+# Bad ECID → 400 (path can't parse), or 404 (parses but no match).
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/servers/not-a-number/connect"
+_assert_status 400 "POST /servers/not-a-number/connect → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/servers/4294967295/connect"
+_assert_status 404 "POST /servers/{unknown ecid}/connect → 404"
+
+# --- 5b. PATCH /servers/{ecid} — priority + permanent (#692). ------
+# The SRV_PR_* wire values are not monotone (NORMAL=0, HIGH=1, LOW=2),
+# so round-tripping every name through the API is what actually proves
+# the reverse mapping, not just that a 200 came back.
+for PRIO in high low normal; do
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"priority\":\"$PRIO\"}" "$API/servers/$ECID"
+	_assert_status 200 "PATCH /servers/{ecid} priority=$PRIO → 200"
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/servers"
+	GOT=$(printf '%s' "$CURL_BODY" | jq -r --argjson e "$ECID" \
+		'.servers | select(.ecid == $e) | .priority')
+	if  "$GOT" = "$PRIO" ; then
+		_pass "priority=$PRIO round-trips through GET /servers"
+	else
+		_fail "priority round-trip" "set $PRIO, GET returned $GOT"
+	fi
+done
+
+# permanent flag, both directions.
+for FLAG in true false; do
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"permanent\":$FLAG}" "$API/servers/$ECID"
+	_assert_status 200 "PATCH /servers/{ecid} permanent=$FLAG → 200"
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/servers"
+	GOT=$(printf '%s' "$CURL_BODY" | jq -r --argjson e "$ECID" \
+		'.servers | select(.ecid == $e) | .permanent')
+	if  "$GOT" = "$FLAG" ; then
+		_pass "permanent=$FLAG round-trips through GET /servers"
+	else
+		_fail "permanent round-trip" "set $FLAG, GET returned $GOT"
+	fi
+done
+
+# Both fields in one body.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"high","permanent":true}' "$API/servers/$ECID"
+_assert_status 200 "PATCH /servers/{ecid} priority+permanent together → 200"
+# The response is the full server object as it now stands, not an {ok} ack:
+# a PATCH answers with the state the caller just produced, so no re-read is
+# needed to see it.
+_assert_json_eq '.ecid' "$ECID" 'PATCH response is the server object, keyed by ecid'
+_assert_json_eq '.priority' high 'PATCH response carries the new priority'
+_assert_json_eq '.permanent' true 'PATCH response carries the new permanent flag'
+_assert_json_eq '. | has("ok")' false 'PATCH response has no constant ok field'
+
+# --- 5c. PATCH error paths. ----------------------------------------
+_curl -X PATCH -H "Content-Type: application/json" \
+	-d '{"priority":"high"}' "$API/servers/$ECID"
+_assert_status 401 "PATCH /servers/{ecid} (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X PATCH -H "Authorization: Bearer $GUEST_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"priority":"high"}' "$API/servers/$ECID"
+	_assert_status 403 "PATCH /servers/{ecid} (guest) → 403"
+fi
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" -d '{}' "$API/servers/$ECID"
+_assert_status 400 "PATCH /servers/{ecid} empty body → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"urgent"}' "$API/servers/$ECID"
+_assert_status 400 "PATCH /servers/{ecid} unknown priority → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"permanent":"yes"}' "$API/servers/$ECID"
+_assert_status 400 "PATCH /servers/{ecid} non-bool permanent → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"high"}' "$API/servers/not-a-number"
+_assert_status 400 "PATCH /servers/not-a-number → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"high"}' "$API/servers/999999"
+_assert_status 404 "PATCH /servers/{unknown ecid} → 404 (EC no-ops silently, #692)"
+
+# --- 6. DELETE /servers/{ecid} happy path + no-stale invariant. ---
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/servers/$ECID"
+# 204, no body: `ecid` came from the URL and `ok` restated the status code.
+_assert_status 204 "DELETE /servers/$ECID → 204"
+_assert_body_empty 'DELETE sends no body'
+
+# Immediate GET — entry must be gone from the cache.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/servers"
+STILL_THERE=$(printf '%s' "$CURL_BODY" \
+	| jq --arg n "$TEST_NAME" \
+	  '.servers | select(.name == $n) | length')
+if  "$STILL_THERE" = "0" ; then
+	_pass "/servers no longer contains the deleted tagged server (no stale cache)"
+else
+	_fail "/servers staleness after DELETE" \
+		"$TEST_NAME still present after DELETE"
+fi
+
+# --- 7. DELETE error paths. ----------------------------------------
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/servers/$ECID"
+_assert_status 404 "DELETE /servers/{just-deleted ecid} → 404"
+
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/servers/not-a-number"
+_assert_status 400 "DELETE /servers/not-a-number → 400"
+
+# --- 8. ip:port selector: malformed is 400, unknown is 404. --------
+# /servers/by-address/{address} takes an "<ip>:<port>" selector where the
+# ECID routes take a number. Parsing and lookup are separate outcomes: a
+# selector that cannot be parsed is the caller's mistake (400), one that
+# parses but names no server we hold is simply absent (404), so the two do
+# not collapse onto one status.
+# The address form has its own path, so a colon is not what selects the
+# handler: a value without one reaches the same place and is rejected for
+# being a malformed address rather than for looking like an ECID.
+for bad in "not-an-ip:4242" "1.2.3.4:" ":4242" "1.2.3.4:0" "1.2.3.4:70000" \
+	"1.2.3.4:abc" "999.1.1.1:4242" "no-colon-at-all"; do
+	_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/servers/by-address/$bad"
+	_assert_status 400 "DELETE /servers/by-address/$bad (malformed address) → 400"
+done
+
+# Well-formed but absent: TEST-NET-1 (RFC 5737), never a real server.
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/servers/by-address/192.0.2.1:4242"
+_assert_status 404 "DELETE /servers/by-address/192.0.2.1:4242 (unknown server) → 404"
+_assert_json_eq '.error.code' not_found \
+	'unknown ip:port carries error.code=not_found'
+
+# Same split on the other two routes that take the selector.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/servers/by-address/not-an-ip:4242/connect"
+_assert_status 400 "POST /servers/by-address/not-an-ip:4242/connect (malformed) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/servers/by-address/192.0.2.1:4242/connect"
+_assert_status 404 "POST /servers/by-address/192.0.2.1:4242/connect (unknown) → 404"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" -d '{"permanent":true}' \
+	"$API/servers/by-address/not-an-ip:4242"
+_assert_status 400 "PATCH /servers/by-address/not-an-ip:4242 (malformed) → 400"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/15-preferences-patch.sh Added

@@ -0,0 +1,752 @@
+#!/usr/bin/env bash
+#
+# amuleapi 15-preferences-patch — PATCH /preferences.
+#
+# Endpoint:
+#   PATCH /api/v1/preferences
+#       body: { general?, connection?, directories?, files?, servers?,
+#               security?, message_filter?, remote_controls?,
+#               online_signature?, advanced?, kad? }  (issue #437)
+#
+# Wire shape mirrors the /preferences GET response. Both sub-objects
+# optional; all fields within optional. Only fields present are
+# applied. Returns 200 with the post-mutation /preferences body so
+# consumers can confirm what landed without a follow-up GET.
+#
+# EC packet shape: `EC_OP_SET_PREFERENCES` at `EC_DETAIL_FULL`. FULL
+# is required so amuled's CEC_Prefs_Packet::Apply() honors boolean
+# tags (it gates ApplyBoolean on `use_tag = (detail == FULL)` per
+# ECSpecialMuleTags.cpp:392).
+#
+# No-stale-cache invariant: PATCH returns the post-mutation state in
+# its response body AND the immediate-following GET shows the same
+# values. RefresherTick is called inline after every successful
+# SET_PREFERENCES roundtrip.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_15_preferences_patch_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 15-preferences-patch smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+sleep 4
+
+# Save the pre-mutation state so we can restore everything at the
+# end. We only modify two fields (max_upload_kibibytes_per_second + autoconnect) so
+# the operator's daemon doesn't end the smoke in an unexpected state.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+SAVED_MAX_UPLOAD=$(printf '%s' "$CURL_BODY" | jq -r '.connection.max_upload_kibibytes_per_second')
+SAVED_AUTOCONNECT=$(printf '%s' "$CURL_BODY" | jq -r '.connection.autoconnect')
+echo "    info: saved state max_upload_kibibytes_per_second=$SAVED_MAX_UPLOAD autoconnect=$SAVED_AUTOCONNECT"
+
+# --- 1. Auth + admin gate. -----------------------------------------
+_curl -X PATCH -H "Content-Type: application/json" \
+	-d '{"connection":{"max_upload_kibibytes_per_second":42}}' "$API/preferences"
+_assert_status 401 "PATCH /preferences (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X PATCH -H "Authorization: Bearer $GUEST_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"connection":{"max_upload_kibibytes_per_second":42}}' "$API/preferences"
+	_assert_status 403 "PATCH /preferences (guest) → 403"
+else
+	echo "    info: no guest pass; admin-gate skipped"
+fi
+
+# --- 2. PATCH numeric field — response + no-stale GET. -------------
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"connection":{"max_upload_kibibytes_per_second":42}}' "$API/preferences"
+_assert_status 200 "PATCH max_upload_kibibytes_per_second=42 → 200"
+_assert_json_eq '.connection.max_upload_kibibytes_per_second' 42 \
+	'PATCH response.connection.max_upload_kibibytes_per_second == 42'
+
+# Immediate GET — no stale cache.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.connection.max_upload_kibibytes_per_second' 42 \
+	'IMMEDIATE GET after PATCH shows max_upload_kibibytes_per_second=42 (no stale cache)'
+
+# --- 3. PATCH boolean field — bool tags need DETAIL_FULL on EC. ----
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"connection":{"autoconnect":false}}' "$API/preferences"
+_assert_status 200 "PATCH autoconnect=false → 200"
+_assert_json_eq '.connection.autoconnect' false \
+	'PATCH response.connection.autoconnect == false'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.connection.autoconnect' false \
+	'IMMEDIATE GET shows autoconnect=false (EC_DETAIL_FULL honored bool)'
+
+# Flip it back to verify the symmetric direction.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"connection":{"autoconnect":true}}' "$API/preferences"
+_assert_json_eq '.connection.autoconnect' true \
+	'PATCH autoconnect=true response shows autoconnect=true'
+
+# --- 4. Combined PATCH — multiple fields in one body. -------------
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"connection":{"max_upload_kibibytes_per_second":77,"autoconnect":false}}' \
+	"$API/preferences"
+_assert_status 200 "PATCH combined (max_upload + autoconnect) → 200"
+_assert_json_eq '.connection.max_upload_kibibytes_per_second' 77    'combined PATCH response max_upload_kibibytes_per_second=77'
+_assert_json_eq '.connection.autoconnect'     false 'combined PATCH response autoconnect=false'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.connection.max_upload_kibibytes_per_second' 77    'IMMEDIATE GET max_upload_kibibytes_per_second=77'
+_assert_json_eq '.connection.autoconnect'     false 'IMMEDIATE GET autoconnect=false'
+
+# --- 5. Error paths. -----------------------------------------------
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{}' "$API/preferences"
+_assert_status 400 "PATCH empty body → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"general":"not an object"}' "$API/preferences"
+_assert_status 400 "PATCH general non-object → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"connection":{"max_upload_kibibytes_per_second":"forty-two"}}' "$API/preferences"
+_assert_status 400 "PATCH max_upload_kibibytes_per_second as string → 400"
+
+# Saved because the 65532 probe below is a real write: leaving the daemon's
+# ed2k port on the ceiling would outlive the script.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+SAVED_TCPPORT=$(printf '%s' "$CURL_BODY" | jq -r '.connection.tcp_port')
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"connection":{"tcp_port":99999}}' "$API/preferences"
+_assert_status 400 "PATCH tcp_port out of range (>65532) → 400"
+
+# 65533..65535 parse as a port but the core cannot use them: SetPort()
+# substitutes DEFAULT_TCP_PORT when val + 3 exceeds 65535, because the server
+# UDP socket is TCP+3. A 200 here meant the daemon listened on 4662 instead
+# (#1174).
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"connection":{"tcp_port":65534}}' "$API/preferences"
+_assert_status 400 "PATCH tcp_port=65534 → 400 (TCP+3 would overflow)"
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"connection":{"tcp_port":65532}}' "$API/preferences"
+_assert_status 200 "PATCH tcp_port=65532 → 200 (the real ceiling)"
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.connection.tcp_port' 65532 "tcp_port=65532 reads back unchanged"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"connection":{"autoconnect":"yes"}}' "$API/preferences"
+_assert_status 400 "PATCH autoconnect as string → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d 'not json' "$API/preferences"
+_assert_status 400 "PATCH malformed JSON → 400"
+
+# --- 5b. Extended EC categories: presence + round-trip (issue #437). -
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '(.directories|type)' object '/preferences has directories object'
+_assert_json_eq '(.files|type)' object '/preferences has files object'
+_assert_json_eq '(.servers|type)' object '/preferences has servers object'
+_assert_json_eq '(.security|type)' object '/preferences has security object'
+_assert_json_eq '(.message_filter|type)' object '/preferences has message_filter object'
+_assert_json_eq '(.remote_controls|type)' object '/preferences has remote_controls object'
+_assert_json_eq '(.online_signature|type)' object '/preferences has online_signature object'
+_assert_json_eq '(.advanced|type)' object '/preferences has advanced object'
+_assert_json_eq '(.kad|type)' object '/preferences has kad object'
+_assert_json_eq '(.directories.shared_paths|type)' array 'directories.shared_paths is an array'
+_assert_json_eq '(.files.min_free_space_mebibytes|type)' number 'files.min_free_space_mebibytes is numeric'
+# Passwords are write-only — no password key ever appears on GET
+# (user_hash is the identity hash, deliberately not matched here).
+_assert_json_eq 'paths(scalars) as $p | select($p-1|tostring|test("password";"i")) | length' \
+	0 'no password key present in GET /preferences'
+SAVED_NEW_PAUSED=$(printf '%s' "$CURL_BODY" | jq -r '.files.add_new_downloads_paused')
+SAVED_RETRIES=$(printf '%s' "$CURL_BODY" | jq -r '.servers.dead_server_retry_count')
+
+# Round-trip a bool (files) + int (servers) and confirm no stale GET.
+NEW_PAUSED_TOGGLE=$( "$SAVED_NEW_PAUSED" = "true"  && echo false || echo true)
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"files\":{\"add_new_downloads_paused\":$NEW_PAUSED_TOGGLE},\"servers\":{\"dead_server_retry_count\":9}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH files+servers categories → 200"
+_assert_json_eq '.files.add_new_downloads_paused' "$NEW_PAUSED_TOGGLE" 'files.add_new_downloads_paused toggled in response'
+_assert_json_eq '.servers.dead_server_retry_count' 9 'servers.dead_server_retry_count=9 in response'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.files.add_new_downloads_paused' "$NEW_PAUSED_TOGGLE" 'files.add_new_downloads_paused persisted (no stale GET)'
+_assert_json_eq '.servers.dead_server_retry_count' 9 'servers.dead_server_retry_count persisted'
+
+# Wrong type on a new-category field → 400.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"files":{"min_free_space_mebibytes":"lots"}}' "$API/preferences"
+_assert_status 400 "PATCH files.min_free_space_mebibytes as string → 400"
+
+# Restore the #437 fields we touched.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"files\":{\"add_new_downloads_paused\":$SAVED_NEW_PAUSED},\"servers\":{\"dead_server_retry_count\":$SAVED_RETRIES}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH (restore #437 fields) → 200"
+
+# --- 5c. Newly EC-wired prefs: media-probe + hidden-pref promotions. ---
+# These eight keys were previously amulegui-local (hidden in the remote GUI
+# because they were never packed into CEC_Prefs_Packet). They now round-trip
+# over EC, so the REST surface must read + write them too.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '(.files.media_metadata_enabled|type)' boolean 'files.media_metadata_enabled is bool'
+_assert_json_eq '(.files.ffprobe_path|type)' string 'files.ffprobe_path is string'
+_assert_json_eq '(.files.on_finished_start_next_alphabetically|type)' boolean 'files.on_finished_start_next_alphabetically is bool'
+_assert_json_eq '(.connection.bind_address|type)' string 'connection.bind_address is string'
+_assert_json_eq '(.connection.bind_interface|type)' string 'connection.bind_interface is string'
+_assert_json_eq '(.security.reject_spoofed_source_ips|type)' boolean 'security.reject_spoofed_source_ips is bool'
+_assert_json_eq '(.security.system_ipfilter_enabled|type)' boolean 'security.system_ipfilter_enabled is bool'
+_assert_json_eq '(.online_signature.directory|type)' string 'online_signature.directory is string'
+_assert_json_eq '(.online_signature.update_frequency_seconds|type)' number 'online_signature.update_frequency_seconds is numeric'
+
+SAVED_MM=$(printf '%s' "$CURL_BODY" | jq -r '.files.media_metadata_enabled')
+SAVED_FFPROBE=$(printf '%s' "$CURL_BODY" | jq -r '.files.ffprobe_path')
+SAVED_PARANOID=$(printf '%s' "$CURL_BODY" | jq -r '.security.reject_spoofed_source_ips')
+SAVED_OSFREQ=$(printf '%s' "$CURL_BODY" | jq -r '.online_signature.update_frequency_seconds')
+SAVED_IFACE=$(printf '%s' "$CURL_BODY" | jq -r '.connection.bind_interface')
+SAVED_KADREASK=$(printf '%s' "$CURL_BODY" | jq -r '.advanced.kad_source_reask_minutes')
+SAVED_SRCREASK=$(printf '%s' "$CURL_BODY" | jq -r '.advanced.source_reask_minutes')
+
+# Round-trip a bool (files) + string (files) + bool (security) + int (onlinesig)
+# + string (connection.bind_interface).
+MM_TOGGLE=$( "$SAVED_MM" = "true"  && echo false || echo true)
+PARANOID_TOGGLE=$( "$SAVED_PARANOID" = "true"  && echo false || echo true)
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"files\":{\"media_metadata_enabled\":$MM_TOGGLE,\"ffprobe_path\":\"/usr/bin/ffprobe\"},\"security\":{\"reject_spoofed_source_ips\":$PARANOID_TOGGLE},\"online_signature\":{\"update_frequency_seconds\":123},\"connection\":{\"bind_interface\":\"tun0\"}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH media-probe + security + onlinesig + iface → 200"
+_assert_json_eq '.files.media_metadata_enabled' "$MM_TOGGLE" 'files.media_metadata_enabled toggled in response'
+_assert_json_eq '.files.ffprobe_path' /usr/bin/ffprobe 'files.ffprobe_path set in response'
+_assert_json_eq '.security.reject_spoofed_source_ips' "$PARANOID_TOGGLE" 'security.reject_spoofed_source_ips toggled in response'
+_assert_json_eq '.online_signature.update_frequency_seconds' 123 'online_signature.update_frequency_seconds=123 in response'
+_assert_json_eq '.connection.bind_interface' tun0 'connection.bind_interface set in response'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.files.ffprobe_path' /usr/bin/ffprobe 'files.ffprobe_path persisted (no stale GET)'
+_assert_json_eq '.online_signature.update_frequency_seconds' 123 'online_signature.update_frequency_seconds persisted'
+_assert_json_eq '.connection.bind_interface' tun0 'connection.bind_interface persisted'
+
+# --- 5c-bis. message_filter show-in-log + comment filter (#596). ----------
+# Newly EC-wired: previously amulegui-local / unreachable over EC.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '(.message_filter.log_filtered_messages|type)' boolean 'message_filter.log_filtered_messages is bool'
+_assert_json_eq '(.message_filter.filter_comments|type)' boolean 'message_filter.filter_comments is bool'
+_assert_json_eq '(.message_filter.comment_keywords|type)' string 'message_filter.comment_keywords is string'
+SAVED_SHOW_IN_LOG=$(printf '%s' "$CURL_BODY" | jq -r '.message_filter.log_filtered_messages')
+SAVED_FILTER_COMMENTS=$(printf '%s' "$CURL_BODY" | jq -r '.message_filter.filter_comments')
+SAVED_COMMENT_KW=$(printf '%s' "$CURL_BODY" | jq -r '.message_filter.comment_keywords')
+SHOW_TOGGLE=$( "$SAVED_SHOW_IN_LOG" = "true"  && echo false || echo true)
+FC_TOGGLE=$( "$SAVED_FILTER_COMMENTS" = "true"  && echo false || echo true)
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"message_filter\":{\"log_filtered_messages\":$SHOW_TOGGLE,\"filter_comments\":$FC_TOGGLE,\"comment_keywords\":\"spam,ads\"}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH message_filter (log_filtered_messages+filter_comments+comment_keywords) → 200"
+_assert_json_eq '.message_filter.log_filtered_messages' "$SHOW_TOGGLE" 'message_filter.log_filtered_messages toggled in response'
+_assert_json_eq '.message_filter.filter_comments' "$FC_TOGGLE" 'message_filter.filter_comments toggled in response'
+_assert_json_eq '.message_filter.comment_keywords' 'spam,ads' 'message_filter.comment_keywords set in response'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.message_filter.comment_keywords' 'spam,ads' 'message_filter.comment_keywords persisted (no stale GET)'
+# Restore.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"message_filter\":{\"log_filtered_messages\":$SAVED_SHOW_IN_LOG,\"filter_comments\":$SAVED_FILTER_COMMENTS,\"comment_keywords\":\"$SAVED_COMMENT_KW\"}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH (restore message_filter fields) → 200"
+
+# --- 5d. mmap (#565): capability flag + capability-gated round-trip. ------
+# files.mmap_supported is a read-only daemon capability; files.mmap_enabled is
+# only settable when it is true. This branch adapts to whichever daemon runs
+# the smoke: a mmap-capable core exercises the round-trip, a non-mmap core
+# (e.g. Windows, -DENABLE_MMAP=OFF) exercises the 409 capability gate.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '(.files.mmap_supported|type)' boolean 'files.mmap_supported is bool (read-only capability)'
+_assert_json_eq '(.files.mmap_enabled|type)' boolean 'files.mmap_enabled is bool'
+MMAP_SUPPORTED=$(printf '%s' "$CURL_BODY" | jq -r '.files.mmap_supported')
+SAVED_MMAP=$(printf '%s' "$CURL_BODY" | jq -r '.files.mmap_enabled')
+if  "$MMAP_SUPPORTED" = "true" ; then
+	MMAP_TOGGLE=$( "$SAVED_MMAP" = "true"  && echo false || echo true)
+	# Send the read-only mmap_supported alongside a real toggle: it must be
+	# ignored (not rejected), and GET must still report support = true.
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+		-d "{\"files\":{\"mmap_enabled\":$MMAP_TOGGLE,\"mmap_supported\":false}}" \
+		"$API/preferences"
+	_assert_status 200 "PATCH files.mmap_enabled (daemon supports mmap) → 200"
+	_assert_json_eq '.files.mmap_enabled' "$MMAP_TOGGLE" 'files.mmap_enabled toggled in response'
+	_assert_json_eq '.files.mmap_supported' true 'files.mmap_supported read-only (ignored on PATCH)'
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+	_assert_json_eq '.files.mmap_enabled' "$MMAP_TOGGLE" 'files.mmap_enabled persisted (no stale GET)'
+	# Restore.
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+		-d "{\"files\":{\"mmap_enabled\":$SAVED_MMAP}}" "$API/preferences" >/dev/null 2>&1
+else
+	echo "    info: daemon built without mmap — exercising the 409 capability gate"
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+		-d '{"files":{"mmap_enabled":true}}' "$API/preferences"
+	_assert_status 409 "PATCH files.mmap_enabled on non-mmap daemon → 409"
+	_assert_json_eq '.error.code' option_not_supported \
+		'the 409 names option_not_supported, not a bare conflict'
+fi
+
+# --- Proxy: readable fields present, round-trip, write-only password. -----
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '(.connection.proxy_enabled|type)' boolean 'connection.proxy_enabled is bool'
+_assert_json_eq '(.connection.proxy_type|type)'    string  'connection.proxy_type is an enum string (#655)'
+_assert_json_eq '(.connection.proxy_host|type)'    string  'connection.proxy_host is string'
+_assert_json_eq '(.connection.proxy_port|type)'    number  'connection.proxy_port is numeric'
+_assert_json_eq '(.connection.proxy_auth_enabled|type)'    boolean 'connection.proxy_auth_enabled is bool'
+_assert_json_eq '(.connection.proxy_user|type)'    string  'connection.proxy_user is string'
+# proxy_password must NOT be present on GET (write-only).
+_assert_json_eq '(.connection|has("proxy_password"))' false 'connection.proxy_password absent on GET (write-only)'
+
+SAVED_PXEN=$(printf '%s' "$CURL_BODY" | jq -r '.connection.proxy_enabled')
+SAVED_PXTYPE=$(printf '%s' "$CURL_BODY" | jq -r '.connection.proxy_type')
+SAVED_PXHOST=$(printf '%s' "$CURL_BODY" | jq -r '.connection.proxy_host')
+SAVED_PXPORT=$(printf '%s' "$CURL_BODY" | jq -r '.connection.proxy_port')
+
+# Round-trip the readable fields + PATCH the write-only password in one go.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"connection":{"proxy_enabled":true,"proxy_type":"http","proxy_host":"proxy.example","proxy_port":8080,"proxy_auth_enabled":true,"proxy_user":"alice","proxy_password":"s3cret"}}' \
+	"$API/preferences"
+_assert_status 200 "PATCH proxy (incl. write-only password) → 200"
+_assert_json_eq '.connection.proxy_enabled' true 'proxy_enabled=true in response'
+_assert_json_eq '.connection.proxy_type' http 'proxy_type="http" in response'
+_assert_json_eq '.connection.proxy_host' proxy.example 'proxy_host set in response'
+_assert_json_eq '.connection.proxy_port' 8080 'proxy_port=8080 in response'
+_assert_json_eq '.connection.proxy_user' alice 'proxy_user set in response'
+_assert_json_eq '(.connection|has("proxy_password"))' false 'proxy_password still absent after PATCH (write-only)'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.connection.proxy_host' proxy.example 'proxy_host persisted (no stale GET)'
+_assert_json_eq '.connection.proxy_port' 8080 'proxy_port persisted'
+
+# proxy_type outside the enum → 400, and the pre-#655 wire int is no
+# longer accepted either.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"connection":{"proxy_type":"telepathy"}}' "$API/preferences"
+_assert_status 400 "PATCH proxy_type unknown enum value → 400"
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"connection":{"proxy_type":2}}' "$API/preferences"
+_assert_status 400 "PATCH proxy_type as a raw wire int → 400 (#655)"
+
+# Restore proxy readable fields (password left as-is — write-only).
+# proxy_type is omitted when it came back empty: that is CProxyType
+# PROXY_NONE (-1), which has no enum string and is not settable (#655).
+if  -n "$SAVED_PXTYPE" ; then
+	RESTORE_PXTYPE="\"proxy_type\":\"$SAVED_PXTYPE\","
+else
+	RESTORE_PXTYPE=""
+fi
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"connection\":{\"proxy_enabled\":$SAVED_PXEN,$RESTORE_PXTYPE\"proxy_host\":\"$SAVED_PXHOST\",\"proxy_port\":$SAVED_PXPORT}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH (restore proxy fields) → 200"
+
+# --- Nested remote_controls (#655): round-trip through the sub-objects. ---
+# Both subsystems pack into one EC category, so this also proves the two
+# sub-objects can be sent together without one clobbering the other.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+SAVED_WS_PORT=$(printf '%s' "$CURL_BODY" | jq -r '.remote_controls.webserver.port')
+SAVED_WS_REFRESH=$(printf '%s' "$CURL_BODY" | jq -r '.remote_controls.webserver.refresh_seconds')
+SAVED_API_BIND=$(printf '%s' "$CURL_BODY" | jq -r '.remote_controls.amuleapi.bind_address')
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"remote_controls":{"webserver":{"port":4711,"refresh_seconds":123},"amuleapi":{"bind_address":"127.0.0.1"}}}' \
+	"$API/preferences"
+_assert_status 200 "PATCH nested remote_controls (webserver + amuleapi) → 200"
+_assert_json_eq '.remote_controls.webserver.port' 4711 'webserver.port=4711 in response'
+_assert_json_eq '.remote_controls.webserver.refresh_seconds' 123 'webserver.refresh_seconds=123 in response'
+_assert_json_eq '.remote_controls.amuleapi.bind_address' 127.0.0.1 'amuleapi.bind_address set in response'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.remote_controls.webserver.port' 4711 'webserver.port persisted (no stale GET)'
+_assert_json_eq '.remote_controls.amuleapi.bind_address' 127.0.0.1 'amuleapi.bind_address persisted'
+
+# The flat remote_controls keys are not a write path — they are simply
+# unknown fields, so a body carrying only those changes nothing.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"remote_controls":{"webserver_port":9999}}' "$API/preferences"
+_assert_status 400 "PATCH flat remote_controls.webserver_port → 400 (no known fields, #655)"
+
+# A sub-object that is not an object is rejected, like the categories are.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"remote_controls":{"webserver":"nope"}}' "$API/preferences"
+_assert_status 400 "PATCH remote_controls.webserver non-object → 400"
+
+# amuleapi's own passwords stay owned by PATCH /auth/passwords, now under
+# the nested key.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"remote_controls":{"amuleapi":{"password":"nope"}}}' "$API/preferences"
+_assert_status 400 "PATCH remote_controls.amuleapi.password → 400 (managed via /auth/passwords)"
+
+# Restore.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"remote_controls\":{\"webserver\":{\"port\":$SAVED_WS_PORT,\"refresh_seconds\":$SAVED_WS_REFRESH},\"amuleapi\":{\"bind_address\":\"$SAVED_API_BIND\"}}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH (restore remote_controls fields) → 200"
+
+# --- P2P-router UPnP: readable, round-trip, read-only capability. --------
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '(.connection.upnp_supported|type)' boolean 'connection.upnp_supported is bool'
+_assert_json_eq '(.connection.upnp_enabled|type)'   boolean 'connection.upnp_enabled is bool'
+_assert_json_eq '(.connection.upnp_control_point_port|type)'  number  'connection.upnp_control_point_port is numeric'
+SAVED_UPNPEN=$(printf '%s' "$CURL_BODY" | jq -r '.connection.upnp_enabled')
+SAVED_UPNPPORT=$(printf '%s' "$CURL_BODY" | jq -r '.connection.upnp_control_point_port')
+SAVED_UPNPAVAIL=$(printf '%s' "$CURL_BODY" | jq -r '.connection.upnp_supported')
+UPNP_TOGGLE=$( "$SAVED_UPNPEN" = "true"  && echo false || echo true)
+AVAIL_FLIP=$( "$SAVED_UPNPAVAIL" = "true"  && echo false || echo true)
+# Round-trip the two settable fields, and include the read-only capability in
+# the same body to prove it is ignored (response reflects the daemon, not us).
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"connection\":{\"upnp_enabled\":$UPNP_TOGGLE,\"upnp_control_point_port\":51234,\"upnp_supported\":$AVAIL_FLIP}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH upnp_enabled + upnp_control_point_port (+ ignored upnp_supported) → 200"
+_assert_json_eq '.connection.upnp_enabled' "$UPNP_TOGGLE" 'upnp_enabled toggled in response'
+_assert_json_eq '.connection.upnp_control_point_port' 51234 'upnp_control_point_port=51234 in response'
+_assert_json_eq '.connection.upnp_supported' "$SAVED_UPNPAVAIL" 'upnp_supported unchanged (read-only, reflects daemon)'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.connection.upnp_enabled' "$UPNP_TOGGLE" 'upnp_enabled persisted (no stale GET)'
+_assert_json_eq '.connection.upnp_control_point_port' 51234 'upnp_control_point_port persisted'
+# Restore.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"connection\":{\"upnp_enabled\":$SAVED_UPNPEN,\"upnp_control_point_port\":$SAVED_UPNPPORT}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH (restore UPnP fields) → 200"
+
+# Wrong type: a string field given a number, and a bool field given a string → 400.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"files":{"ffprobe_path":42}}' "$API/preferences"
+_assert_status 400 "PATCH files.ffprobe_path as number → 400"
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"security":{"reject_spoofed_source_ips":"maybe"}}' "$API/preferences"
+_assert_status 400 "PATCH security.reject_spoofed_source_ips as string → 400"
+
+# Restore the newly-wired fields we touched.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"files\":{\"media_metadata_enabled\":$SAVED_MM,\"ffprobe_path\":\"$SAVED_FFPROBE\"},\"security\":{\"reject_spoofed_source_ips\":$SAVED_PARANOID},\"online_signature\":{\"update_frequency_seconds\":$SAVED_OSFREQ},\"connection\":{\"bind_interface\":\"$SAVED_IFACE\"}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH (restore newly-wired fields) → 200"
+
+# --- 6. Restore pre-mutation state. --------------------------------
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"connection\":{\"max_upload_kibibytes_per_second\":$SAVED_MAX_UPLOAD,\"autoconnect\":$SAVED_AUTOCONNECT}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH (restore pre-mutation state) → 200"
+_assert_json_eq '.connection.max_upload_kibibytes_per_second' "$SAVED_MAX_UPLOAD" \
+	'restored max_upload_kibibytes_per_second to saved value'
+_assert_json_eq '.connection.autoconnect' "$SAVED_AUTOCONNECT" \
+	'restored autoconnect to saved value'
+
+# --- advanced intervals round-trip exactly (#1159 section 5). ---------
+#
+# The core stores whole minutes and its accessors multiply by 60000, so EC
+# carries milliseconds that are always a multiple of 60000. The API fields
+# speak whole minutes, so what goes in comes back rather than being snapped to
+# a multiple of 60000 underneath.
+# The probe values sit INSIDE each field's supported range and are not the
+# range's own endpoints, so they prove the value is carried rather than snapped
+# to a bound: LoadAllItems() clamps kad_reask to 30..60 and source_reask to
+# 15..60 at the next daemon start, and 7 -- what this loop used to send -- is
+# below both (#1174).
+for FIELD_PROBE in "kad_source_reask_minutes 31" "source_reask_minutes 16"; do
+	set -- $FIELD_PROBE
+	FIELD=$1
+	VALUE=$2
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"advanced\":{\"$FIELD\":$VALUE}}" "$API/preferences"
+	_assert_status 200 "PATCH advanced.$FIELD=$VALUE -> 200"
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+	_assert_json_eq ".advanced.$FIELD" "$VALUE" "advanced.$FIELD reads back what was written"
+done
+
+# One minute used to be a 200 that the daemon threw away at the next start --
+# LoadAllItems() clamps this field up to 30. The old assertion here checked the
+# right property (a small value is not truncated to 0 by the ms->minutes
+# conversion) with a probe outside the core's range, so it passed on a value
+# the daemon would not keep. Below the floor is a 400 now (#1174).
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"advanced":{"kad_source_reask_minutes":1}}' "$API/preferences"
+_assert_status 400 "PATCH advanced.kad_source_reask_minutes=1 -> 400 (below the 30 floor)"
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.advanced.kad_source_reask_minutes' 31 "the rejected write left the previous value alone"
+
+# --- online_signature.update_frequency_seconds is bounded (#1159 section 4).
+#
+# The schema declared the full uint32 range while CPreferences::SetOSUpdate
+# takes a uint16, so anything above 65535 wrapped on the way in: 86400 (daily)
+# became 20864, the PATCH reported success, and the following GET showed the
+# rewritten value. A rejected write is recoverable; a silently rewritten one is
+# not, because the client has no way to know it happened.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"online_signature":{"update_frequency_seconds":86400}}' \
+	"$API/preferences"
+_assert_status 400 "PATCH online_signature.update_frequency_seconds=86400 -> 400 (would wrap to 20864)"
+
+# The boundary itself is still accepted.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"online_signature":{"update_frequency_seconds":65535}}' \
+	"$API/preferences"
+_assert_status 200 "PATCH online_signature.update_frequency_seconds=65535 -> 200"
+
+# Saved before the boundary sweep below, which leaves every field it touches on
+# an endpoint. Restored with the rest at the end of the file.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+SAVED_FILEBUF=$(printf '%s' "$CURL_BODY" | jq -r '.advanced.file_buffer_bytes')
+SAVED_ULQUEUE=$(printf '%s' "$CURL_BODY" | jq -r '.advanced.max_upload_queue_client_count')
+SAVED_CONN5=$(printf '%s' "$CURL_BODY" | jq -r '.advanced.max_new_connections_per_5_seconds')
+SAVED_KADSEARCH=$(printf '%s' "$CURL_BODY" | jq -r '.advanced.kad_max_concurrent_source_search_count')
+SAVED_MAXUL=$(printf '%s' "$CURL_BODY" | jq -r '.connection.max_upload_kibibytes_per_second')
+SAVED_MAXDL=$(printf '%s' "$CURL_BODY" | jq -r '.connection.max_download_kibibytes_per_second')
+
+# --- #1174: every numeric domain that is narrower than its type. ---
+#
+# Each row was measured against a live daemon before the bounds landed: the
+# write was a 200 and the value came back changed, by integer division, by a
+# uint8/uint16 wrap, or by a clamp that does not run until the next start.
+# Appended at the end of the file on purpose -- the sections here share one
+# daemon, and these leave preferences at their boundary values.
+#
+# reject: the value, and what the daemon used to turn it into.
+for CASE in \
+	"advanced file_buffer_bytes 4000000 150000_uint8_wrap" \
+	"advanced file_buffer_bytes 14999 0_divided_away" \
+	"advanced file_buffer_bytes 20000 15000_truncated_to_the_step" \
+	"advanced max_upload_queue_client_count 30000 4400_uint8_wrap" \
+	"advanced max_upload_queue_client_count 250 200_truncated_to_the_step" \
+	"advanced max_new_connections_per_5_seconds 70000 4464_uint16_wrap" \
+	"advanced kad_max_concurrent_source_search_count 100000 34464_uint16_wrap" \
+	"advanced kad_max_concurrent_source_search_count 1 5_clamped_at_next_start" \
+	"advanced source_reask_minutes 7 15_clamped_at_next_start" \
+	; do
+	set -- $CASE
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"$1\":{\"$2\":$3}}" "$API/preferences"
+	_assert_status 400 "PATCH $1.$2=$3 -> 400 (was silently $4)"
+done
+
+# The 400 body names which bound was hit and by what unit -- "out of range"
+# alone leaves a caller guessing which end and, for a step, why an in-range
+# value was refused. Assert the message for one range case and one step case.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"connection":{"tcp_port":99999}}' "$API/preferences"
+_assert_json_eq '.error.message | contains("(1-65532)")' true \
+	"tcp_port 400 names the range in the message"
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"advanced":{"file_buffer_bytes":20000}}' "$API/preferences"
+_assert_json_eq '.error.message | contains("multiple of 15000")' true \
+	"file_buffer_bytes 400 names the step in the message"
+
+# A fractional value is refused, not floored. Every numeric preference routes
+# through the same uint setter, so this was open on all of them: the value was
+# truncated at the cast and stored, under an error string that already said
+# "non-negative integer". Two cases, because the step modulo is not a substitute
+# for an integrality check -- it runs on the already-truncated value, so a
+# stepped field whose floor lands on a valid step passed it, and an unstepped
+# field never reaches it at all.
+for CASE in \
+	"advanced max_upload_queue_client_count 100.5 stepped-floor-is-a-valid-step" \
+	"connection tcp_port 4662.5 unstepped-skips-the-modulo" \
+	; do
+	set -- $CASE
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"$1\":{\"$2\":$3}}" "$API/preferences"
+	_assert_status 400 "PATCH $1.$2=$3 -> 400 ($4)"
+	_assert_json_eq '.error.message | contains("non-negative integer")' true \
+		"$1.$2 fractional 400 says non-negative integer"
+done
+
+# accept: the domain's own endpoints, which must round-trip untouched. A bound
+# that rejects its own boundary is the failure mode this half guards.
+for CASE in \
+	"advanced file_buffer_bytes 3825000" \
+	"advanced file_buffer_bytes 15000" \
+	"advanced file_buffer_bytes 0" \
+	"advanced max_upload_queue_client_count 25500" \
+	"advanced max_upload_queue_client_count 100" \
+	"advanced max_new_connections_per_5_seconds 65535" \
+	"advanced kad_max_concurrent_source_search_count 5" \
+	"advanced kad_max_concurrent_source_search_count 50" \
+	"advanced source_reask_minutes 15" \
+	"advanced source_reask_minutes 60" \
+	"advanced kad_source_reask_minutes 30" \
+	"advanced kad_source_reask_minutes 60" \
+	; do
+	set -- $CASE
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"$1\":{\"$2\":$3}}" "$API/preferences"
+	_assert_status 200 "PATCH $1.$2=$3 -> 200 (domain boundary)"
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+	_assert_json_eq ".$1.$2" "$3" "$1.$2=$3 reads back unchanged"
+done
+
+# The cross-field rewrite is documented rather than rejected: a low upload cap
+# forces the download cap to 3x (below 4 kB/s) or 4x (below 10). Asserted so
+# the documented behaviour has a test, and so a future change to CheckUlDlRatio
+# cannot alter it silently.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"connection":{"max_upload_kibibytes_per_second":3,"max_download_kibibytes_per_second":100}}' \
+	"$API/preferences"
+_assert_status 200 "PATCH max_upload_kibibytes_per_second=3 -> 200"
+_assert_json_eq '.connection.max_download_kibibytes_per_second' 9 \
+	"a sub-4 kB/s upload cap forces max_download_kibibytes_per_second to 3x, echoed in the PATCH reply"
+# --- Restore what the two #1159 probes above changed. --------------
+#
+# Section 6 restores before those probes run, so the last writes of the script
+# used to be its own probe values -- 7 and 1 minutes and a 65535-second
+# online-signature interval, left on whatever daemon the suite was pointed at.
+# This has to stay the last mutation in the file.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"advanced\":{\"kad_source_reask_minutes\":$SAVED_KADREASK,\"source_reask_minutes\":$SAVED_SRCREASK,\"file_buffer_bytes\":$SAVED_FILEBUF,\"max_upload_queue_client_count\":$SAVED_ULQUEUE,\"max_new_connections_per_5_seconds\":$SAVED_CONN5,\"kad_max_concurrent_source_search_count\":$SAVED_KADSEARCH},\"connection\":{\"tcp_port\":$SAVED_TCPPORT,\"max_upload_kibibytes_per_second\":$SAVED_MAXUL,\"max_download_kibibytes_per_second\":$SAVED_MAXDL},\"online_signature\":{\"update_frequency_seconds\":$SAVED_OSFREQ}}" \
+	"$API/preferences"
+_assert_status 200 "PATCH (restore advanced + connection + onlinesig) -> 200"
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.connection.tcp_port' "$SAVED_TCPPORT" \
+	'restored connection.tcp_port to the saved value'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+_assert_json_eq '.advanced.kad_source_reask_minutes' "$SAVED_KADREASK" \
+	'restored advanced.kad_source_reask_minutes to the saved value'
+_assert_json_eq '.advanced.source_reask_minutes' "$SAVED_SRCREASK" \
+	'restored advanced.source_reask_minutes to the saved value'
+_assert_json_eq '.online_signature.update_frequency_seconds' "$SAVED_OSFREQ" \
+	'restored online_signature.update_frequency_seconds to the saved value'
+
+# --- 7. `geoip.update_now` is POST /geoip/update, not a preferences key (#1189). --
+#
+# It is an action, so it is a route, not a write-only boolean in this payload.
+# Both halves are contract, so both are asserted: the `geoip.update_now` key is
+# refused with a message naming the endpoint, and the endpoint exists with the
+# right method and auth.
+#
+# The 202 happy path is deliberately NOT exercised: it makes the daemon fetch
+# a real database from db-ip.com, and a smoke suite should not hit a third
+# party on every run. Everything up to the fetch is covered here.
+#
+# Placed after the restore block because none of it mutates anything -- the
+# restore has to stay the last *mutation* in this file.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"geoip":{"update_now":true}}' "$API/preferences"
+_assert_status 400 "PATCH geoip.update_now -> 400 (it is POST /geoip/update)"
+_assert_json_eq '.error.code' bad_request \
+	'the refusal carries error.code=bad_request'
+_assert_json_eq '(.error.message | test("POST /geoip/update"))' true \
+	'the refusal names the endpoint for the action'
+
+_curl "$API/geoip/update"
+_assert_status 405 "GET /geoip/update -> 405 (POST only)"
+_assert_json_eq '.error.code' method_not_allowed \
+	'/geoip/update GET 405 carries error.code=method_not_allowed'
+
+_curl -X POST "$API/geoip/update"
+_assert_status 401 "POST /geoip/update without auth -> 401"
+
+# GUEST is not ADMIN: the fetch writes daemon state, so it is admin-only like
+# its three sibling update routes.
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" "$API/geoip/update"
+	_assert_status 403 "POST /geoip/update as guest -> 403"
+else
+	echo "    info: no guest pass; /geoip/update admin-gate skipped"
+fi
+
+# --- upload_slot_min_kibibytes_per_second has a floor of 1. --------
+# The core's setter clamps anything lower up to 1, so without a declared
+# minimum a 0 answered 200 and read back as 1 -- exactly the silent
+# daemon-side rewrite the schema bounds exist to turn into a 400.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"connection":{"upload_slot_min_kibibytes_per_second":0}}' "$API/preferences"
+_assert_status 400 "PATCH upload_slot_min_kibibytes_per_second=0 -> 400 (below the floor)"
+_assert_json_eq '.error.code' bad_request \
+	'the below-floor slot value carries error.code=bad_request'
+
+# 1 is the floor itself, so it must still be accepted.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"connection":{"upload_slot_min_kibibytes_per_second":1}}' "$API/preferences"
+_assert_status 200 "PATCH upload_slot_min_kibibytes_per_second=1 -> 200 (the floor is inclusive)"
+_assert_json_eq '.connection.upload_slot_min_kibibytes_per_second' 1 \
+	'the floor value round-trips unchanged'
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/16-networks-connect.sh Added

@@ -0,0 +1,299 @@
+#!/usr/bin/env bash
+#
+# amuleapi 16-networks-connect — connection control mutations.
+#
+# Endpoints:
+#   POST /api/v1/networks/connect       — EC_OP_CONNECT (all enabled
+#                                         nets) or one of
+#                                         EC_OP_SERVER_CONNECT / EC_OP_KAD_START
+#                                         when a network selector is passed
+#   POST /api/v1/networks/disconnect    — EC_OP_DISCONNECT (all nets)
+#   (Kad connect/disconnect use the network-selector form on
+#   /networks/*.)
+#   POST /api/v1/kad/bootstrap          — EC_OP_KAD_BOOTSTRAP_FROM_IP
+#       body: {ip: "1.2.3.4" | uint32, port: uint16}
+#   POST /api/v1/kad/update             — EC_OP_KAD_UPDATE_FROM_URL
+#       body: {url: "https://.../nodes.dat"}
+#
+# amuled's CONNECT/DISCONNECT return EC_OP_STRINGS with status
+# messages — the handler relays those into `response.message`. That
+# message is the whole body: there is no `ok` field because the status code
+# already carries it, while the daemon's own explanation of what it did
+# is not recoverable from any later read.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_16_networks_connect_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+# A 202 from a connection-control trigger carries a body only when amuled had
+# something to say: `{"message": ...}` if it did, no body at all if it did not
+# (no empty `{}`, so these match the URL-fetch triggers beside
+# them). Either is correct; a constant `ok` field is not.
+_assert_no_body_or_message() {
+	local what=$1
+	if  -z "$CURL_BODY" ; then
+		_pass "$what: 202 with no body (amuled reported nothing)"
+	elif echo "$CURL_BODY" | jq -e '(has("ok") | not) and (.message | type == "string")' >/dev/null 2>&1; then
+		_pass "$what: 202 body carries amuled's message and no constant ok"
+	else
+		_fail "$what 202 body" "expected no body or {message}, got: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 16-networks-connect smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+sleep 4
+
+# --- 1. Auth + admin gate. -----------------------------------------
+_curl -X POST "$API/networks/disconnect"
+_assert_status 401 "POST /networks/disconnect (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		"$API/networks/disconnect"
+	_assert_status 403 "POST /networks/disconnect (guest) → 403"
+fi
+
+# --- 2. networks/disconnect → 202 + message. -----------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/networks/disconnect"
+_assert_status 202 "POST /networks/disconnect → 202"
+_assert_json_eq '.message | type' string 'disconnect response carries .message'
+_assert_json_eq '. | has("ok")' false 'disconnect response has no constant ok field'
+
+# --- 3. networks/connect → 202 + message. --------------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/networks/connect"
+_assert_status 202 "POST /networks/connect → 202"
+_assert_json_eq '. | has("ok")' false 'connect response has no constant ok field'
+_assert_json_eq '.message | type' string 'connect response carries .message'
+
+# --- 4. networks/{disconnect,connect} (Kad-only via selector). ----
+# Kad connect/disconnect go through /networks/{connect,disconnect} with
+# `{"network":"kad"}`.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"network":"kad"}' \
+	"$API/networks/disconnect"
+_assert_status 202 "POST /networks/disconnect {network:kad} → 202"
+_assert_no_body_or_message 'networks/disconnect(kad)'
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"network":"kad"}' \
+	"$API/networks/connect"
+_assert_status 202 "POST /networks/connect {network:kad} → 202"
+_assert_no_body_or_message 'networks/connect(kad)'
+
+# ed2k-only selector should also round-trip via the network field.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"network":"ed2k"}' \
+	"$API/networks/connect"
+_assert_status 202 "POST /networks/connect {network:ed2k} → 202"
+
+# Bogus selector → 400 on both directions.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"network":"wat"}' \
+	"$API/networks/connect"
+_assert_status 400 "POST /networks/connect {network:wat} → 400"
+
+# --- 5. kad/bootstrap happy path + error paths. -------------------
+#
+# Bootstrap to a localhost dummy address — amuled doesn't validate
+# routability; the call always succeeds at the EC-handler level (the
+# actual Kad probe is fire-and-forget UDP).
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"ip":"127.0.0.1","port":4672}' \
+	"$API/kad/bootstrap"
+_assert_status 202 "POST /kad/bootstrap (dotted-quad) → 202"
+# `ip`/`port` are the documented exception to the no-body rule for actions:
+# the echo reports which address the daemon actually parsed, which the caller
+# cannot read back anywhere else. There is no `ok` field; the 202 carries it.
+_assert_json_eq '. | has("ok")' false 'kad/bootstrap response has no constant ok field'
+_assert_json_eq '.port' 4672   'kad/bootstrap response echoes port'
+
+# The uint32 form is refused. It was accepted alongside the quad and the two
+# disagreed about byte order: ParseIpv4Dotted() packs a.b.c.d least-significant
+# byte first, while the integer was taken verbatim, so 2130706433 (0x7F000001,
+# what a client computing an IPv4 integer the conventional way writes for
+# 127.0.0.1) bootstrapped 1.0.0.127. Every IP on this surface is a quad now, in
+# both directions, so the question does not arise.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"ip":2130706433,"port":4672}' \
+	"$API/kad/bootstrap"
+_assert_status 400 "POST /kad/bootstrap (uint32 IP) → 400 (quad only)"
+_assert_json_eq '.error.message | test("dotted-quad")' true \
+	'the uint32 400 says a dotted quad is wanted'
+
+# Error: missing port.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"ip":"127.0.0.1"}' "$API/kad/bootstrap"
+_assert_status 400 "POST /kad/bootstrap (no port) → 400"
+
+# Error: bogus IP.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"ip":"not.an.ip.addr","port":4672}' "$API/kad/bootstrap"
+_assert_status 400 "POST /kad/bootstrap (bad IP) → 400"
+
+# Error: port out of range.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"ip":"127.0.0.1","port":99999}' "$API/kad/bootstrap"
+_assert_status 400 "POST /kad/bootstrap (port>65535) → 400"
+
+# --- 6. Method gates. ----------------------------------------------
+_curl -X GET -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/networks/connect"
+_assert_status 405 "GET /networks/connect → 405"
+
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/kad/bootstrap"
+_assert_status 405 "DELETE /kad/bootstrap → 405"
+
+# --- 6. kad/update validation + auth (#693). ----------------------
+#
+# Deliberately NO happy-path call here. A successful POST makes amuled
+# download a nodes.dat and then STOP AND RESTART Kad, which would tear
+# down the connection state every later phase depends on and leave the
+# operator's node re-bootstrapping. The 202 path is exercised by hand
+# instead; what is pinned here is everything that must be rejected
+# before any of that can happen.
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"url":"https://example.com/nodes.dat"}' "$API/kad/update"
+_assert_status 401 "POST /kad/update (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"url":"https://example.com/nodes.dat"}' "$API/kad/update"
+	_assert_status 403 "POST /kad/update (guest) → 403"
+fi
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" -d '{}' "$API/kad/update"
+_assert_status 400 "POST /kad/update missing url → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"url":""}' "$API/kad/update"
+_assert_status 400 "POST /kad/update empty url → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"url":123}' "$API/kad/update"
+_assert_status 400 "POST /kad/update non-string url → 400"
+
+# Scheme gate: amuled hands the string to libcurl, so a non-http(s)
+# scheme has to be rejected here or it fails asynchronously with no
+# way to report back.
+for BAD in "ftp://example.com/nodes.dat" "file:///etc/passwd" "example.com/nodes.dat"; do
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"url\":\"$BAD\"}" "$API/kad/update"
+	_assert_status 400 "POST /kad/update rejects scheme: $BAD → 400"
+done
+
+_curl -X GET -H "Authorization: Bearer $ADMIN_TOKEN" "$API/kad/update"
+_assert_status 405 "GET /kad/update → 405"
+
+# --- 7. kad/bootstrap echoes the IP as a dotted quad (#1159 section 2). ---
+#
+# The handler answers with the address it parsed, and that echo is a quad --
+# the same spelling the request used, and the one every other IP on this
+# surface uses. It answers with the dotted quad, not a host-order integer, so
+# a client that posts "1.2.3.4" and stores the reply can post it back without
+# converting, and it matches every other field on this surface.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"ip":"127.0.0.1","port":4672}' \
+	"$API/kad/bootstrap"
+_assert_status 202 "POST /kad/bootstrap (dotted-quad) -> 202"
+_assert_json_eq '.ip' '127.0.0.1' 'kad/bootstrap echoes the IP as a dotted quad'
+
+# The echo round-trips: what came back can be posted straight back in, which
+# is what "one notation, both directions" has to mean to be worth anything.
+ECHOED=$(printf '%s' "$CURL_BODY" | jq -r '.ip')
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"ip\":\"$ECHOED\",\"port\":4672}" \
+	"$API/kad/bootstrap"
+_assert_status 202 'the echoed ip is accepted verbatim on a second request'
+_assert_json_eq '.ip' "$ECHOED" 'and echoes the same quad again'
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/17-shared-priority-patch.sh Added

@@ -0,0 +1,366 @@
+#!/usr/bin/env bash
+#
+# amuleapi 17-shared-priority-patch — PATCH /shared/{hash} priority.
+#
+# Endpoint:
+#   PATCH /api/v1/shared/{hash}
+#       body: {priority: <enum>}
+#
+# Priority input enum (base levels + "auto"):
+#   very_low | low | normal | high | release | auto
+#
+# Output mirrors /downloads: a base `priority` string plus a
+# `priority_auto` boolean. Sending "auto" hands level selection to
+# amuled (it derives the level from the upload queue, priority_auto=true);
+# the combined "*_auto" strings are NOT accepted as input (400).
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_17_shared_priority_patch_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 17-shared-priority-patch smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+sleep 4
+
+# Pick the first shared file for testing — order-independent across
+# operator's libraries. /shared is the broader surface (completed
+# knownfiles + downloading-and-shared partfiles).
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared"
+COUNT=$(printf '%s' "$CURL_BODY" | jq '.shared | length')
+
+# Self-provision a fixture when the daemon shares nothing. /shared only
+# lists completed knownfiles (a partfile shows up only once a part has
+# finished), so a synthetic ed2k link won't do — we must plant a real
+# file in a directory amuled shares and let it hash in. AMULE_SHARED_DIR
+# (set by run-all.sh) points at that directory, typically amuled's
+# Incoming. The fixture is reused across runs once it exists.
+if  "$COUNT" = "0" ; then
+	if  -z "$AMULE_SHARED_DIR" ; then
+		echo "    info: no shared files and AMULE_SHARED_DIR unset"
+		_die "set AMULE_SHARED_DIR to a directory amuled shares so the smoke can plant a fixture"
+	fi
+	FIXTURE="$AMULE_SHARED_DIR/amuleapi-regtest-shared.dat"
+	if  ! -f "$FIXTURE" ; then
+		head -c 1048576 /dev/urandom > "$FIXTURE" \
+			|| _die "cannot write fixture to AMULE_SHARED_DIR=$AMULE_SHARED_DIR"
+	fi
+	echo "    info: planted fixture $FIXTURE; reloading shares"
+	curl -s -o /dev/null -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/shared_reload"
+	# Wait for amuled to hash the file and surface it in /shared.
+	for _ in $(seq 1 30); do
+		sleep 1
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared"
+		COUNT=$(printf '%s' "$CURL_BODY" | jq '.shared | length')
+		 "$COUNT" != "0"  && break
+	done
+	 "$COUNT" != "0"  \
+		|| _die "fixture planted in $AMULE_SHARED_DIR but never appeared in /shared after reload"
+fi
+TEST_HASH=$(printf '%s' "$CURL_BODY" | jq -r '.shared0.hash')
+SAVED_PRIORITY=$(printf '%s' "$CURL_BODY" | jq -r '.shared0.priority')
+SAVED_AUTO=$(printf '%s' "$CURL_BODY" | jq -r '.shared0.priority_auto')
+SAVED_NAME=$(printf '%s' "$CURL_BODY" | jq -r '.shared0.name')
+echo "    info: saved hash=$TEST_HASH priority=$SAVED_PRIORITY priority_auto=$SAVED_AUTO name=$SAVED_NAME"
+
+# --- 1. Auth + admin gate. -----------------------------------------
+_curl -X PATCH -H "Content-Type: application/json" \
+	-d '{"priority":"high"}' "$API/shared/$TEST_HASH"
+_assert_status 401 "PATCH /shared/{hash} (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X PATCH -H "Authorization: Bearer $GUEST_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"priority":"high"}' "$API/shared/$TEST_HASH"
+	_assert_status 403 "PATCH /shared/{hash} (guest) → 403"
+fi
+
+# --- 2. PATCH priority each bare value + no-stale GET. ------------
+for p in low normal high release very_low; do
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"priority\":\"$p\"}" "$API/shared/$TEST_HASH"
+	_assert_status 200 "PATCH priority=$p → 200"
+	_assert_json_eq '.priority' "$p" "PATCH response shows priority=$p"
+	_assert_json_eq '.priority_auto' false "PATCH priority=$p → priority_auto=false"
+
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared"
+	OBS=$(printf '%s' "$CURL_BODY" \
+		| jq -r --arg h "$TEST_HASH" \
+		  '.shared | select(.hash == $h) | .priority')
+	if  "$OBS" = "$p" ; then
+		_pass "IMMEDIATE GET /shared shows priority=$p (no stale)"
+	else
+		_fail "IMMEDIATE GET /shared priority" \
+			"expected $p, got $OBS (stale cache)"
+	fi
+done
+
+# --- 3. PATCH "auto" → priority_auto=true + a derived base level. --
+# amuled derives the concrete level from the upload queue, so we don't
+# pin the base string — just assert the flag is set and the reported
+# level is a known base enum (never a combined "*_auto" string).
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"auto"}' "$API/shared/$TEST_HASH"
+_assert_status 200 "PATCH priority=auto → 200"
+_assert_json_eq '.priority_auto' true "PATCH priority=auto → priority_auto=true"
+BASE_PRIO=$(printf '%s' "$CURL_BODY" | jq -r '.priority')
+case "$BASE_PRIO" in
+	very_low|low|normal|high|release) _pass "PATCH auto → derived base level=$BASE_PRIO" ;;
+	*) _fail "PATCH auto base level" "expected a base enum, got '$BASE_PRIO'" ;;
+esac
+
+# Immediate GET reflects the auto flag (no stale cache).
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared"
+GAUTO=$(printf '%s' "$CURL_BODY" \
+	| jq -r --arg h "$TEST_HASH" '.shared | select(.hash == $h) | .priority_auto')
+if  "$GAUTO" = "true" ; then
+	_pass "IMMEDIATE GET /shared shows priority_auto=true (no stale)"
+else
+	_fail "IMMEDIATE GET /shared priority_auto" "expected true, got $GAUTO (stale cache)"
+fi
+
+# The combined "*_auto" strings are not accepted as input.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"high_auto"}' "$API/shared/$TEST_HASH"
+_assert_status 400 "PATCH rejected variant high_auto → 400"
+
+# --- 3c. PATCH comment + rating (issue #419). ---------------------
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"my_comment":"nice file","my_rating":4}' "$API/shared/$TEST_HASH"
+_assert_status 200 "PATCH comment+rating → 200"
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared/$TEST_HASH"
+_assert_json_eq '.my_comment' "nice file" "GET /shared/{hash} shows the set comment"
+_assert_json_eq '.my_rating' 4 "GET /shared/{hash} shows the set rating"
+
+# Partial (comment without rating) → 400 (both required together).
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"my_comment":"solo"}' "$API/shared/$TEST_HASH"
+_assert_status 400 "PATCH comment without rating → 400"
+
+# Rating out of range → 400.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"comment":"x","rating":9}' "$API/shared/$TEST_HASH"
+_assert_status 400 "PATCH rating out of range → 400"
+
+# --- 3d. PATCH name (rename; issue #420). -------------------------
+# Rename to a name guaranteed different from the current one (renaming a
+# file to its existing name is a no-op amuled rejects with non-200),
+# verify it lands, then restore the original. This suite runs against a
+# PERSISTENT daemon, so it must leave the real shared file exactly as it
+# found it — an earlier version renamed to a fixed name and never
+# restored, which both clobbered a real share and made the next run fail
+# on the no-op rename. `jq` builds the body so odd characters in the
+# real filename are escaped correctly.
+RENAME_TO="amuleapi-test-rename.dat"
+if  "$SAVED_NAME" = "$RENAME_TO" ; then
+	RENAME_TO="amuleapi-test-rename-b.dat"
+fi
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "$(jq -nc --arg n "$RENAME_TO" '{name: $n}')" "$API/shared/$TEST_HASH"
+_assert_status 200 "PATCH name (rename) → 200"
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared/$TEST_HASH"
+_assert_json_eq '.name' "$RENAME_TO" 'IMMEDIATE GET /shared/{hash} shows the renamed file (no stale)'
+
+# Path separators rejected (directory-traversal guard).
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"name":"../evil.dat"}' "$API/shared/$TEST_HASH"
+_assert_status 400 "PATCH name with path separator → 400"
+
+# Empty name rejected.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"name":""}' "$API/shared/$TEST_HASH"
+_assert_status 400 "PATCH empty name → 400"
+
+# Restore the original name so the real shared file is left untouched.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "$(jq -nc --arg n "$SAVED_NAME" '{name: $n}')" "$API/shared/$TEST_HASH"
+_assert_status 200 "PATCH name (restore original) → 200"
+
+# --- 4. Error paths. ----------------------------------------------
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"bogus"}' "$API/shared/$TEST_HASH"
+_assert_status 400 "PATCH unknown priority enum → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{}' "$API/shared/$TEST_HASH"
+_assert_status 400 "PATCH empty body (no priority) → 400"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"low"}' \
+	"$API/shared/baadbaadbaadbaadbaadbaadbaadbaad"
+_assert_status 404 "PATCH unknown hash → 404"
+
+# --- 5. Method gate (POST/DELETE not allowed). --------------------
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/shared/$TEST_HASH"
+_assert_status 405 "DELETE /shared/{hash} → 405"
+
+# --- 5b. Both-file priority independence. --------------------------
+# A partfile that is BOTH downloading and shared carries two independent
+# priorities: a download priority (EC_TAG_PARTFILE_PRIO) on /downloads and
+# an upload priority (EC_TAG_KNOWNFILE_PRIO) on /shared. They must not
+# clobber each other — a prior build stored a single `priority` on the
+# snapshot entry, so the shared refresher pass overwrote the download
+# value and /downloads reported the UPLOAD level. The scenario needs a
+# file present in both lists (a partfile with >=1 completed part, which
+# requires a live source), so skip when none exists; the unit test
+# (RefresherTest.BothFilePrioritiesAreIndependent) covers the split
+# against crafted EC packets.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/downloads"
+DL_BODY=$CURL_BODY
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared"
+SH_BODY=$CURL_BODY
+BOTH_HASH=$(jq -rn --argjson d "$DL_BODY" --argjson s "$SH_BODY" \
+	'($d.downloads.hash - ($d.downloads.hash - $s.shared.hash))0 // ""')
+if  -z "$BOTH_HASH" ; then
+	echo "    info: no downloading-and-shared partfile present; skipping independence check"
+else
+	echo "    info: both-file hash=$BOTH_HASH"
+	B_DL_PRIO=$(jq -rn --argjson d "$DL_BODY" --arg h "$BOTH_HASH" \
+		'$d.downloads | select(.hash == $h) | .priority')
+	B_DL_AUTO=$(jq -rn --argjson d "$DL_BODY" --arg h "$BOTH_HASH" \
+		'$d.downloads | select(.hash == $h) | .priority_auto')
+	B_SH_PRIO=$(jq -rn --argjson s "$SH_BODY" --arg h "$BOTH_HASH" \
+		'$s.shared | select(.hash == $h) | .priority')
+	B_SH_AUTO=$(jq -rn --argjson s "$SH_BODY" --arg h "$BOTH_HASH" \
+		'$s.shared | select(.hash == $h) | .priority_auto')
+	# Set the two sides to DISTINCT levels. On the buggy build the shared
+	# pass clobbers the download value, so /downloads reports "low".
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"priority":"high"}' "$API/downloads/$BOTH_HASH"
+	_assert_status 200 "PATCH download priority=high (both-file) → 200"
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"priority":"low"}' "$API/shared/$BOTH_HASH"
+	_assert_status 200 "PATCH shared priority=low (both-file) → 200"
+
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/downloads"
+	OBS_DL=$(printf '%s' "$CURL_BODY" | jq -r --arg h "$BOTH_HASH" \
+		'.downloads | select(.hash == $h) | .priority')
+	if  "$OBS_DL" = "high" ; then
+		_pass "/downloads reports download priority (high), not clobbered by shared PATCH"
+	else
+		_fail "/downloads priority independence" \
+			"expected high, got $OBS_DL (shared priority leaked onto /downloads)"
+	fi
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared"
+	OBS_SH=$(printf '%s' "$CURL_BODY" | jq -r --arg h "$BOTH_HASH" \
+		'.shared | select(.hash == $h) | .priority')
+	if  "$OBS_SH" = "low" ; then
+		_pass "/shared reports upload priority (low), not clobbered by download PATCH"
+	else
+		_fail "/shared priority independence" \
+			"expected low, got $OBS_SH (download priority leaked onto /shared)"
+	fi
+
+	# Restore both sides. (If BOTH_HASH == TEST_HASH, section 6 restores
+	# the shared side again — idempotent.)
+	 "$B_DL_AUTO" = "true"  && B_DL_RESTORE=auto || B_DL_RESTORE=$B_DL_PRIO
+	 "$B_SH_AUTO" = "true"  && B_SH_RESTORE=auto || B_SH_RESTORE=$B_SH_PRIO
+	curl -s -o /dev/null -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"priority\":\"$B_DL_RESTORE\"}" "$API/downloads/$BOTH_HASH"
+	curl -s -o /dev/null -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"priority\":\"$B_SH_RESTORE\"}" "$API/shared/$BOTH_HASH"
+fi
+
+# --- 6. Restore saved priority. -----------------------------------
+# If the file was on auto, restore "auto" (SAVED_PRIORITY holds the
+# derived base level, not the literal "auto"); otherwise restore the
+# saved bare level.
+if  "$SAVED_AUTO" = "true" ; then
+	RESTORE=auto
+else
+	RESTORE=$SAVED_PRIORITY
+fi
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"priority\":\"$RESTORE\"}" "$API/shared/$TEST_HASH"
+_assert_status 200 "PATCH (restore saved priority) → 200"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/18-categories-crud.sh Added

@@ -0,0 +1,431 @@
+#!/usr/bin/env bash
+#
+# amuleapi 18-categories-crud — categories CRUD.
+#
+# Endpoints:
+#   POST   /api/v1/categories             — create
+#       body: {name, save_path?, comment?, color?, priority?}
+#   PATCH  /api/v1/categories/{index}     — update
+#       body: any subset of {name, save_path, comment, color, priority}
+#   DELETE /api/v1/categories/{index}     — remove
+#
+# The default (index=0) "All" category cannot be deleted —
+# DELETE /categories/0 returns 400. Custom categories are 1..255.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+TEST_NAME="18-categories-crud-smoke-cat"
+TEST_PATH="/tmp/18-categories-crud-cat-dir"
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_18_categories_crud_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+_assert_body_empty() {
+	local label=$1
+	if  -z "$CURL_BODY" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected an empty body, got: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+mkdir -p "$TEST_PATH"
+
+echo "amuleapi 18-categories-crud smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+sleep 4
+
+# --- 1. Auth + admin gate. -----------------------------------------
+# --- Member GET. ---------------------------------------------------
+#
+# Every other resource with a member path has a member GET. This one had PATCH
+# and DELETE only, so a client that had just created a category and wanted the
+# stored result had to re-fetch the whole collection and search it by index.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories/0"
+_assert_status 200 "GET /categories/0 → 200"
+_assert_json_eq '.index' 0 '/categories/0 reports index 0'
+
+# Category 0 carries a name and a path amuled does not hold for it: its
+# `defaultcat` is built with an empty title and path, which left a client
+# rendering a picker with a blank row and nowhere to show where an
+# uncategorised download lands. `path` is not invented -- it is
+# directories.incoming_path, which is genuinely where such a file is saved.
+_assert_json_eq '.name' Default '/categories/0 is named Default'
+INCOMING=$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/preferences" | jq -r '.directories.incoming_path')
+_assert_json_eq '.save_path' "$INCOMING" '/categories/0 save_path is directories.incoming_path'
+# color is "#rrggbb", not the raw 24-bit integer. The core packs it as
+# 0x00BBGGRR (red in the low byte), so a naive hex print of the integer
+# would come out reversed -- pin the format so that cannot regress.
+_assert_json_eq '(.color | test("^#0-9a-f{6}$"))' true \
+	'/categories/0 color is a #rrggbb string'
+
+# ...and the same values whether or not the daemon sent the row. This phase
+# creates a custom category below, which is what makes amuled start emitting
+# index 0 itself; asserting again after that would be the real regression
+# test, so section 6b does exactly that before the cleanup.
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories/250"
+_assert_status 404 "GET /categories/{absent} → 404"
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories/999"
+_assert_status 400 "GET /categories/{out-of-range} → 400"
+
+_curl -X PUT -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories/0"
+_assert_status 405 "PUT /categories/0 → 405"
+
+# --- Shared list contract. -----------------------------------------
+#
+# /categories was the tenth list endpoint and the only one that never parsed
+# ?limit/&offset/&sort/&order: the same query string was a hard error on
+# /downloads and a silent no-op here, while the response still carried the
+# page-meta trio a caller could not influence.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories"
+_assert_status 200 "GET /categories → 200"
+_assert_json_eq '.total | type'  number '/categories carries total'
+_assert_json_eq '.offset | type' number '/categories carries offset'
+_assert_json_eq '.limit' 100 '/categories omitted limit echoes the default 100'
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories?limit=1"
+_assert_status 200 "GET /categories?limit=1 → 200"
+_assert_json_eq '.categories | length' 1 '/categories?limit=1 returns one row'
+_assert_json_eq '.limit' 1 '/categories?limit=1 echoes the limit'
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories?sort=index&order=desc"
+_assert_status 200 "GET /categories?sort=index&order=desc → 200"
+
+# The parameters are validated now, not ignored.
+for bad in "limit=abc" "limit=1000000001" "offset=-1" "order=sideways" "sort=nonexistent_field"; do
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories?$bad"
+	_assert_status 400 "GET /categories?$bad → 400"
+done
+
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"name\":\"$TEST_NAME\"}" "$API/categories"
+_assert_status 401 "POST /categories (no token) → 401"
+
+_curl -X PATCH -H "Content-Type: application/json" \
+	-d '{"name":"x"}' "$API/categories/1"
+_assert_status 401 "PATCH /categories/{idx} (no token) → 401"
+
+_curl -X DELETE "$API/categories/1"
+_assert_status 401 "DELETE /categories/{idx} (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"name\":\"$TEST_NAME\"}" "$API/categories"
+	_assert_status 403 "POST /categories (guest) → 403"
+fi
+
+# --- 2. POST /categories (create). --------------------------------
+#
+# Snapshot the indexes first. The create answers with no body, so the new
+# index is whichever one the collection did not hold before -- which beats
+# looking the name up afterwards, since nothing stops the daemon from already
+# holding a category by that name (a previous run of this smoke that died
+# before its cleanup, say), and a name lookup would then hand back the older
+# row and delete that instead.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories?limit=500"
+BEFORE_IDX=$(printf '%s' "$CURL_BODY" | jq -c '.categories.index')
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"name\":\"$TEST_NAME\",\"save_path\":\"$TEST_PATH\",\"comment\":\"18-categories-crud test\",\"priority\":\"high\"}" \
+	"$API/categories"
+# 202 with no body. EC_OP_CREATE_CATEGORY answers success or failure and never
+# returns the index it assigned, so naming the new category here meant scanning
+# the snapshot for one with a matching name and falling back to a bodiless 201
+# when the scan came up short. The caller re-reads the collection, which is what
+# the lookup below does.
+_assert_status 202 "POST /categories (create) → 202"
+_assert_body_empty 'create sends no body'
+
+# Verify by GET /categories, which is also where the assigned index comes from.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories?limit=500"
+NEW_IDX=$(printf '%s' "$CURL_BODY" \
+	| jq -r --argjson b "$BEFORE_IDX" \
+	  '.categories.index - $b | first // empty')
+if  -n "$NEW_IDX" ; then
+	_pass "the created category is readable from /categories (index=$NEW_IDX)"
+else
+	_die "created category not in /categories: ${CURL_BODY:0:300}"
+fi
+# The stored row is what the POST body asked for. Asserted here rather than off
+# a create response, which is the whole reason the create carries no body: this
+# reads what the daemon actually kept, not what amuleapi guessed it kept.
+LOOKUP=$(printf '%s' "$CURL_BODY" \
+	| jq --argjson i "$NEW_IDX" '.categories | select(.index == $i) | first')
+for f in name:"$TEST_NAME" save_path:"$TEST_PATH" priority:high; do
+	key=${f%%:*}; want=${f#*:}
+	got=$(printf '%s' "$LOOKUP" | jq -r ".$key")
+	if  "$got" = "$want" ; then
+		_pass "created category round-trips $key=$want"
+	else
+		_fail "created category $key" "expected $want, got $got"
+	fi
+done
+
+# --- 3. POST error paths. -----------------------------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{}' "$API/categories"
+_assert_status 400 "POST /categories (no name) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"name\":\"x\",\"priority\":\"bogus\"}" "$API/categories"
+_assert_status 400 "POST /categories (bad priority enum) → 400"
+
+# R9: a category's priority is rendered on read from the full six-level file
+# set, so the write side accepts the same six, very_low and release included,
+# so a read-modify-write round-trip does not fail on a field the client never
+# touched.
+for p in very_low release; do
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"name\":\"prio-$p\",\"save_path\":\"$TEST_PATH\",\"priority\":\"$p\"}" \
+		"$API/categories"
+	_assert_status 202 "POST /categories (priority=$p accepted, R9) → 202"
+	# Leave no residue: a leftover category poisons the next run's create.
+	PRIO_IDX=$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories" \
+		| jq -r --arg n "prio-$p" '.categories | select(.name == $n)0.index // empty')
+	 -n "$PRIO_IDX"  && curl -s -o /dev/null -X DELETE \
+		-H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories/$PRIO_IDX"
+done
+
+# --- 4. PATCH /categories/{idx}. ----------------------------------
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"comment":"updated by 18-categories-crud","priority":"low"}' \
+	"$API/categories/$NEW_IDX"
+_assert_status 200 "PATCH /categories/$NEW_IDX → 200"
+_assert_json_eq '.comment'  'updated by 18-categories-crud' 'PATCH response shows new comment'
+_assert_json_eq '.priority' low                  'PATCH response shows priority=low'
+
+# Immediate GET (no-stale).
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories"
+OBS_COMMENT=$(printf '%s' "$CURL_BODY" \
+	| jq -r --arg n "$TEST_NAME" \
+	  '.categories | select(.name == $n) | .comment')
+if  "$OBS_COMMENT" = "updated by 18-categories-crud" ; then
+	_pass "IMMEDIATE GET /categories shows updated comment (no stale)"
+else
+	_fail "GET /categories staleness after PATCH" \
+		"expected 'updated by 18-categories-crud', got '$OBS_COMMENT'"
+fi
+
+# --- 5. PATCH error paths. ----------------------------------------
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"bogus"}' "$API/categories/$NEW_IDX"
+_assert_status 400 "PATCH /categories bogus enum → 400"
+
+for p in very_low release; do
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"priority\":\"$p\"}" "$API/categories/$NEW_IDX"
+	_assert_status 200 "PATCH /categories (priority=$p accepted, R9) → 200"
+done
+# ...and back to a value the rest of the phase expects.
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"priority":"high"}' "$API/categories/$NEW_IDX"
+_assert_status 200 "PATCH /categories priority restored to high → 200"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"name":"unknown"}' "$API/categories/199"
+_assert_status 404 "PATCH /categories unknown index → 404"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"name":"x"}' "$API/categories/not-a-number"
+_assert_status 400 "PATCH /categories non-numeric index → 400"
+
+# --- 5b. Category 0 reads the same now that amuled sends the row. ---
+#
+# amuled's EC omits index 0 entirely until a custom category exists, and the
+# create above added one -- so this is the same read as section 1, on the other
+# side of that switch. Filling name/path in only for the synthesised row would
+# have made /categories/0 answer "Default" before this point and "" after it,
+# which is a response shape that depends on unrelated state.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories/0"
+_assert_status 200 "GET /categories/0 (amuled now sends it) → 200"
+_assert_json_eq '.name' Default '/categories/0 is still named Default'
+_assert_json_eq '.save_path' "$INCOMING" '/categories/0 save_path is still directories.incoming_path'
+
+# The collection agrees with the member route, on the same daemon state.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories?limit=500"
+_assert_json_eq '.categories | select(.index == 0)0.name' Default \
+	'/categories lists index 0 as Default too'
+_assert_json_eq '.categories | select(.index == 0)0.save_path' "$INCOMING" \
+	'/categories lists index 0 with the incoming save_path too'
+
+# --- 6. DELETE happy path + cannot-delete-default + no-stale. ----
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/categories/0"
+_assert_status 400 "DELETE /categories/0 (default) → 400"
+
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/categories/$NEW_IDX"
+# 204, no body: the index came from the URL and `ok` restated the status code.
+_assert_status 204 "DELETE /categories/$NEW_IDX → 204"
+_assert_body_empty 'DELETE sends no body'
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories"
+STILL=$(printf '%s' "$CURL_BODY" \
+	| jq --arg n "$TEST_NAME" \
+	  '.categories | select(.name == $n) | length')
+if  "$STILL" = "0" ; then
+	_pass "Deleted category gone from /categories list (no stale)"
+else
+	_fail "/categories staleness after DELETE" \
+		"$TEST_NAME still present after DELETE"
+fi
+
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/categories/$NEW_IDX"
+_assert_status 404 "DELETE same index twice → 404"
+
+# --- 8. The path-substitution contract (partial success, not failure). ---
+#
+# amuled answers EC_OP_FAILED for these two ops when it created or updated the
+# category but could not use the path, keeping another one and returning it in
+# EC_TAG_CATEGORY_PATH. The category exists either way, so the API reports
+# success and `save_path` carries the path that was actually kept, rather than
+# a 400 that would claim the request failed while the category sat in the
+# list.
+#
+# Placed last because each case creates a category; each cleans up its own.
+
+# 8a. No save_path at all. The daemon's documented default is the incoming
+#     directory, so this is an ordinary create, not an error.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"name":"18-cat-nopath"}' "$API/categories"
+_assert_status 202 "POST /categories with no save_path -> 202 (defaults to incoming)"
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories"
+NOPATH_IDX=$(printf '%s' "$CURL_BODY" \
+	| jq -r '.categories | select(.name == "18-cat-nopath")0.index // empty')
+if  -n "$NOPATH_IDX" ; then
+	_pass "the category created without save_path is in the list (index=$NOPATH_IDX)"
+	_assert_json_eq '.categories | select(.name == "18-cat-nopath")0.save_path' \
+		"$INCOMING" 'a create with no save_path lands on directories.incoming_path'
+	_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories/$NOPATH_IDX"
+	_assert_status 204 "cleanup: DELETE /categories/$NOPATH_IDX -> 204"
+else
+	_fail "create without save_path" "202 returned but no such category in /categories"
+fi
+
+# 8b. A save_path the daemon cannot create. It keeps the incoming directory and
+#     the category still exists. Running as root the mkdir would succeed, so the
+#     assertion is guarded on the substitution actually having happened.
+UNUSABLE=/18-cat-unusable-$$/sub
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"name\":\"18-cat-badpath\",\"save_path\":\"$UNUSABLE\"}" "$API/categories"
+_assert_status 202 "POST /categories with an uncreatable save_path -> 202 (path substituted)"
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories"
+BAD_IDX=$(printf '%s' "$CURL_BODY" \
+	| jq -r '.categories | select(.name == "18-cat-badpath")0.index // empty')
+if  -n "$BAD_IDX" ; then
+	_pass "the category survives an uncreatable save_path (index=$BAD_IDX)"
+	BAD_PATH=$(printf '%s' "$CURL_BODY" \
+		| jq -r '.categories | select(.name == "18-cat-badpath")0.save_path')
+	if  "$BAD_PATH" = "$UNUSABLE" ; then
+		_skip "path-substitution check: the daemon could create $UNUSABLE (running as root?)"
+	else
+		_assert_json_eq '.categories | select(.name == "18-cat-badpath")0.save_path' \
+			"$INCOMING" 'the refused path is replaced by directories.incoming_path, not stored'
+	fi
+
+	# 8c. The same contract on PATCH: an update whose path is refused still
+	#     applies every other field, and the echoed object reports the path
+	#     that was kept rather than the one that was asked for.
+	_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"name\":\"18-cat-badpath-renamed\",\"save_path\":\"$UNUSABLE\"}" \
+		"$API/categories/$BAD_IDX"
+	_assert_status 200 "PATCH /categories/$BAD_IDX with an uncreatable save_path -> 200"
+	_assert_json_eq '.name' '18-cat-badpath-renamed' \
+		'the rest of the PATCH lands even when the path is refused'
+	_assert_json_eq "(.save_path == \"$UNUSABLE\")" false \
+		'the echoed save_path is the kept one, not the refused one'
+
+	_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" "$API/categories/$BAD_IDX"
+	_assert_status 204 "cleanup: DELETE /categories/$BAD_IDX -> 204"
+else
+	_fail "create with an uncreatable save_path" "202 returned but no such category in /categories"
+fi
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/19-search.sh Added

@@ -0,0 +1,1749 @@
+#!/usr/bin/env bash
+#
+# amuleapi 19-search — search.
+#
+# Endpoints:
+#   GET  /api/v1/search                                    — EC_OP_SEARCH_LIST
+#   POST /api/v1/search                                   — EC_OP_SEARCH_START
+#       body: {query, type?, file_type?, extension?,
+#              min_size_bytes?, max_size_bytes?, min_source_count?}
+#   POST /api/v1/search/{id}/stop                          — EC_OP_SEARCH_STOP
+#   POST /api/v1/search/{id}/more                          — EC_OP_SEARCH_REQUEST_MORE
+#   DELETE /api/v1/search/{id}                             — stop + free
+#   GET  /api/v1/search/{id}/results                       — read accumulated
+#   POST /api/v1/search/results/{hash}/download           — EC_OP_DOWNLOAD_SEARCH_RESULT
+#       body: {category?: uint8} (optional)
+#   GET  /api/v1/search/results/{hash}/comments           — Kad ratings/comments for a result
+#   POST /api/v1/search/results/{hash}/comments           — EC_OP_SHARED_FILE_SEARCH_KAD_NOTES
+#   POST /api/v1/clients/{ecid}/shared_files              — browse a peer ("View Files"), returns a search_id
+#
+# /search/{id}/results reads from state — POST /search marks
+# the search active in state and the refresher polls amuled every
+# tick while it stays active. GET /search/{id}/results reads straight
+# from that state, so subsequent polls already see the fresh query's
+# growing results without any cache coordination.
+#
+# amuled's SEARCH_START is async: results trickle in from servers /
+# Kad over the next several seconds. Smoke polls /search/{id}/results with
+# bounded retries (up to ~10 s for a global search to harvest results).
+#
+# Important: this smoke depends on the operator's amuled being
+# connected to ed2k servers (for global search) and/or Kad. A
+# fully-disconnected daemon will see 0 results — the smoke skips the
+# result-shape checks in that case and only exercises the API surface.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+# EC connection info for the second amuleapi instance spun up in section
+# 3.2 below — must point at the SAME amuled as the primary instance at
+# $HOST. Defaults match run-all.sh's regtest daemon.
+EC_HOST=${EC_HOST:-127.0.0.1}
+EC_PORT=${EC_PORT:-4712}
+EC_PASSWORD=${EC_PASSWORD:-amule}
+# Locate the amuleapi binary the sub-instances need. Deliberately NOT falling
+# back to PATH: an installed package would silently be tested in place of the
+# working tree, which is worse than not finding anything. Set AMULEAPI_BIN to
+# point somewhere else on purpose.
+#
+# Any build*/ directory counts, not a fixed list of three: per-branch and
+# per-arch trees are normal, and a name this function has never heard of used
+# to mean a silent skip. Where several exist the NEWEST wins -- picking the
+# first match let a stale build/ supply the binary while the tree under test
+# was built somewhere else, which is the one failure mode that produces a
+# confident wrong answer rather than a missing one. Unmatched globs stay
+# literal and fail the -x test, so no nullglob is needed.
+_find_amuleapi_bin() {
+	local root=$1 c best=
+	for c in "$root"/src/webapi/amuleapi \
+		"$root"/build*/src/webapi/amuleapi \
+		"$root"/_build/src/webapi/amuleapi \
+		"$root"/cmake-build-*/src/webapi/amuleapi; do
+		 -x "$c"  || continue
+		if  -z "$best"  ||  "$c" -nt "$best" ; then
+			best=$c
+		fi
+	done
+	 -n "$best"  || return 1
+	echo "$best"
+}
+
+AMULEAPI_BIN=${AMULEAPI_BIN:-$(_find_amuleapi_bin "$(cd "$(dirname "$0")/../../.." && pwd)")}
+# Three sections below drive a SECOND amuleapi against the same amuled. Without
+# a binary to start one, skip them rather than fail on the daemon's behalf.
+if  -x "${AMULEAPI_BIN:-/nonexistent}" ; then
+	HAVE_SECOND_INSTANCE=1
+else
+	HAVE_SECOND_INSTANCE=0
+fi
+# Counted so the summary cannot report a clean pass over a partial run:
+# every section below that skips increments this, and a non-zero count
+# is spelled out next to the OK line.
+SKIP_COUNT=0
+_skip() { SKIP_COUNT=$((SKIP_COUNT+1)); echo "  SKIP  $1"; }
+
+# A query likely to return results on any operator's daemon connected
+# to ed2k. "ubuntu" is a safe choice — well-seeded across the network.
+TEST_QUERY="ubuntu"
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_19_search_body.XXXXXX)
+CURL_HDR_FILE=$(mktemp -t amuleapi_19_search_hdr.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE" "$CURL_HDR_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -D "$CURL_HDR_FILE" \
+		-o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+	CURL_HDR=$(cat "$CURL_HDR_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+_assert_header_contains() {
+	local needle=$1 label=$2
+	if printf '%s' "$CURL_HDR" | grep -qi -- "$needle"; then
+		_pass "$label"
+	else
+		_fail "$label" "needle '$needle' not in response headers" \
+			"headers: $(printf '%s' "$CURL_HDR" | head -c 400)"
+	fi
+}
+
+_assert_body_empty() {
+	local label=$1
+	if  -z "$CURL_BODY" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected an empty body, got: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 19-search smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+sleep 4
+
+# --- 1. Auth + admin gate. -----------------------------------------
+_curl "$API/search"
+_assert_status 401 "GET /search (no token) → 401"
+
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"query\":\"$TEST_QUERY\"}" "$API/search"
+_assert_status 401 "POST /search (no token) → 401"
+
+_curl -X POST "$API/search/1/stop"
+_assert_status 401 "POST /search/{id}/stop (no token) → 401"
+
+_curl -X POST "$API/search/results/baadbaadbaadbaadbaadbaadbaadbaad/download"
+_assert_status 401 "POST /search/results/{hash}/download (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"query\":\"$TEST_QUERY\"}" "$API/search"
+	_assert_status 403 "POST /search (guest) → 403"
+fi
+
+# --- 2. POST /search error paths. ----------------------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{}' "$API/search"
+_assert_status 400 "POST /search (no query) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"query":""}' "$API/search"
+_assert_status 400 "POST /search (empty query) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"$TEST_QUERY\",\"type\":\"bogus\"}" "$API/search"
+_assert_status 400 "POST /search (bad type enum) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"$TEST_QUERY\",\"min_size_bytes\":-1}" "$API/search"
+_assert_status 400 "POST /search (negative min_size_bytes) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d 'not json' "$API/search"
+_assert_status 400 "POST /search (malformed JSON) → 400"
+
+# --- 3. POST /search happy + per-search_id addressing. ---------
+#
+# Multi-search: each POST /search gets its own daemon-allocated search_id
+# and its own result slot; a new search does NOT wipe the others. Every
+# read/stop/free names its id in the path -- there is no implicit target,
+# which is what the bad-id assertions below pin down.
+#
+# `results` and `stop` reach the {id} matcher and are rejected as ids, which
+# is the honest answer: they are not routes, and the rejection already names
+# where to find a real one.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/results"
+_assert_status 400 "GET /search/results → 400 (id goes in the path)"
+_assert_json_eq '.error.code' bad_request '/search/results rejection names the id rule'
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/stop"
+_assert_status 400 "POST /search/stop → 400 (id goes in the path)"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"$TEST_QUERY\",\"type\":\"global\"}" "$API/search"
+_assert_status 202 "POST /search (query=$TEST_QUERY, type=global) → 202"
+# A creation answers with the created resource, because here the daemon really
+# does hand one back: SEARCH_START returns EC_TAG_SEARCH_ID. The body is the
+# same row GET /search lists, written through the same writer, so a client can
+# drop it straight into the collection it keeps -- which is why `kind` and
+# `state` are asserted here and not just on the list. There is no `ok`; the 202
+# carried it.
+_assert_json_eq '. | has("ok")' false 'POST /search response has no constant ok field'
+_assert_json_eq '.query' "$TEST_QUERY" 'POST /search echoes query'
+_assert_json_eq '.search_id | type' number 'POST /search returns a numeric id'
+_assert_json_eq '.type'  global       'POST /search response reports type=global'
+_assert_json_eq '.state' running      'POST /search response reports state=running'
+_assert_json_eq '.started_at | type' number 'POST /search response stamps started_at'
+FIRST_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id')
+# ...and a Location naming where the resource now lives, so a client that
+# ignores the body still knows the id it was given.
+_assert_header_contains "location: /api/v1/search/$FIRST_SID" \
+	'POST /search sends a Location for the search it created'
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID/results"
+_assert_json_eq '.search_id' "$FIRST_SID" 'GET /search/{id}/results echoes its search_id'
+_assert_json_eq '.query' "$TEST_QUERY" 'GET /search/{id}/results reports the query it was started with'
+
+# A malformed or zero {id} is rejected outright. Zero is not a
+# "whichever search ran last" sentinel; these routes have no implicit
+# target to resurrect.
+for bad in 0 abc -1 99999999999; do
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$bad/results"
+	_assert_status 400 "GET /search/$bad/results → 400 (not a usable search id)"
+done
+# A well-formed id nobody holds is a 404, never a fallback.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/4294967290/results"
+_assert_status 404 "GET /search/{unknown}/results → 404"
+
+# --- 3.1 GET /api/v1/search enumerates the search just started. ---
+# Reachability fix (issue #641): GET /api/v1/search reads live daemon
+# state via EC_OP_SEARCH_LIST rather than this session's own m_state
+# cache, so the search just started via POST /search must appear here
+# too -- proving the two endpoints agree on what amuled currently holds.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+_assert_status 200 "GET /search → 200"
+_assert_json_eq '.searches | type' array 'GET /search .searches is an array'
+_assert_json_eq ".searches | select(.search_id == $FIRST_SID) | length" 1 \
+	'GET /search lists the search just started via POST /search'
+_assert_json_eq ".searches | select(.search_id == $FIRST_SID)0.query" "$TEST_QUERY" \
+	'GET /search entry echoes the query'
+_assert_json_eq ".searches | select(.search_id == $FIRST_SID)0.type" global \
+	'GET /search entry reports kind==global'
+_assert_json_eq ".searches | select(.search_id == $FIRST_SID)0.state | inside(\"running\",\"finished\")" \
+	true 'GET /search entry state is running or finished (never idle for an active search)'
+# started_at is the list's only recency signal: entries arrive id-ascending
+# and id order is not start order (Kad ids carry a high-bit mask and sort
+# above ed2k ones), so a client that wants "the newest search" sorts on this.
+# Present because THIS amuleapi started the search.
+_assert_json_eq ".searches | select(.search_id == $FIRST_SID)0.started_at | type" number \
+	'GET /search stamps started_at on a search this session started'
+_assert_json_eq ".searches | select(.search_id == $FIRST_SID)0.started_at > 1700000000" \
+	true 'started_at is a plausible recent unix second, not 0'
+# result_count lets a client label a tab it has not opened yet, instead of
+# fetching every search's results just to learn one integer each.
+_assert_json_eq ".searches | select(.search_id == $FIRST_SID)0.result_count | type" number \
+	'GET /search entry carries a numeric result_count'
+# ...and it agrees with what the results endpoint reports as `total` -- but only
+# once the search has settled. While it runs, result_count is the daemon's live
+# index and `total` is whatever amuleapi last pulled into its cache, so the two
+# --- GET /search is a list endpoint like the others. ---------------
+#
+# It was the one collection with no envelope: no total, no offset, no limit and
+# no sort, so a client had to special-case it. It is also unbounded (whatever
+# EC_OP_SEARCH_LIST returns, including searches this process never started), and
+# entries arrive id-ascending while id order is not start order, because Kad ids
+# carry a high-bit mask and always sort above eD2k ones.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+_assert_status 200 "GET /search → 200"
+_assert_json_eq '.total | type'  number '/search carries total'
+_assert_json_eq '.offset | type' number '/search carries offset'
+_assert_json_eq '.limit' 100 '/search omitted limit echoes the default 100'
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search?limit=1"
+_assert_status 200 "GET /search?limit=1 → 200"
+_assert_json_eq '.searches | length' 1 '/search?limit=1 returns one row'
+
+# The recency signal the docs point at is sortable.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search?sort=started_at&order=desc"
+_assert_status 200 "GET /search?sort=started_at&order=desc → 200"
+
+for bad in "limit=abc" "limit=1000000001" "order=sideways" "sort=nonexistent_field"; do
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search?$bad"
+	_assert_status 400 "GET /search?$bad → 400"
+done
+
+# result_count on the list row against total on the results endpoint. Re-read
+# the list first: the four 400-probes above each overwrote CURL_BODY, so this
+# used to parse the last error body, find no .searches, and skip itself with an
+# empty state in the message.
+#
+# Only compared for a finished search: while one is running the two can
+# legitimately differ by a fetch.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+LIST_COUNT=$(printf '%s' "$CURL_BODY" \
+	| jq -r ".searches | select(.search_id == $FIRST_SID)0.result_count")
+LIST_STATE=$(printf '%s' "$CURL_BODY" \
+	| jq -r ".searches | select(.search_id == $FIRST_SID)0.state")
+if  "$LIST_STATE" = "finished" ; then
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID/results"
+	_assert_json_eq '.total' "$LIST_COUNT" \
+		'result_count equals the results endpoint total for a finished search'
+else
+	echo "    info: search still $LIST_STATE; skipping the result_count/total comparison"
+fi
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -H "Authorization: Bearer $GUEST_TOKEN" "$API/search"
+	_assert_status 200 "GET /search (guest) → 200 (GUEST-readable)"
+fi
+
+if  "$HAVE_SECOND_INSTANCE" -eq 0 ; then
+	_skip "3.2 cross-session discovery (no amuleapi binary; set AMULEAPI_BIN)"
+else
+# --- 3.2 Cross-session discovery: a second amuleapi instance against the
+# same amuled sees $FIRST_SID even though it never called POST /search
+# itself (got3nks, PR #680 review point 6 — no amulecmd needed, two
+# amuleapi sessions against one daemon exercise the same discovery path).
+# SECOND_HOST's HTTP server is independent, but both instances share the
+# one daemon at EC_HOST:EC_PORT, so EC_OP_SEARCH_LIST on session B finds
+# the search session A started.
+SECOND_HOST="localhost:4714"
+SECOND_CONFIG_DIR=$(mktemp -d -t amuleapi_19_search_second.XXXXXX)
+SECOND_LOG=$(mktemp -t amuleapi_19_search_second_log.XXXXXX)
+"$AMULEAPI_BIN" --config-dir="$SECOND_CONFIG_DIR" \
+	--host="$EC_HOST" --port="$EC_PORT" \
+	--set-admin-pass="$ADMIN_PASS" >/dev/null 2>&1
+# amuleapi takes no --password; the call above also wrote a defaults
+# amuleapi.conf, so put the EC credential in there.
+sed -i'.bak' "s|^Password=.*|Password=$EC_PASSWORD|" "$SECOND_CONFIG_DIR/amuleapi.conf"
+rm -f "$SECOND_CONFIG_DIR/amuleapi.conf.bak"
+"$AMULEAPI_BIN" --config-dir="$SECOND_CONFIG_DIR" \
+	--host="$EC_HOST" --port="$EC_PORT" \
+	--http-port=4714 >"$SECOND_LOG" 2>&1 &
+SECOND_PID=$!
+
+for i in 1 2 3 4 5 6 7 8 9 10 11 12; do
+	curl -s -o /dev/null --max-time 1 "http://$SECOND_HOST/api/v1/health" 2>/dev/null && break
+	sleep 0.5
+done
+sleep 4
+
+SECOND_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "http://$SECOND_HOST/api/v1/auth/login?include_token=true" \
+	| jq -r .token)
+
+if  -n "$SECOND_TOKEN"  &&  "$SECOND_TOKEN" != "null" ; then
+	_curl -H "Authorization: Bearer $SECOND_TOKEN" "http://$SECOND_HOST/api/v1/search"
+	_assert_status 200 "second amuleapi instance: GET /search → 200"
+	_assert_json_eq ".searches | select(.search_id == $FIRST_SID) | length" 1 \
+		'second amuleapi instance (never POSTed) still lists the first instance'"'"'s search'
+	# ...but cannot stamp it: that instance did not start the search and the
+	# daemon ships no timestamp, so the key is omitted rather than zeroed.
+	_assert_json_eq ".searches | select(.search_id == $FIRST_SID)0 | has(\"started_at\")" \
+		false 'a foreign search carries no started_at (unknown, not 1970)'
+
+	_curl -H "Authorization: Bearer $SECOND_TOKEN" \
+		"http://$SECOND_HOST/api/v1/search/$FIRST_SID/results"
+	_assert_status 200 'second amuleapi instance: GET /search/{foreign id}/results → 200 (not 404)'
+	_assert_json_eq '.search_id' "$FIRST_SID" 'second amuleapi instance echoes the discovered search_id'
+	# The adopted slot also learns the query from the SEARCH_LIST entry,
+	# so a client that discovered an id can label it without guessing.
+	_assert_json_eq '.query' "$TEST_QUERY" 'second amuleapi instance reports the discovered query'
+	# A slot discovered as finished is never polled by the tick, so its
+	# percent has to be seeded at discovery or it stays 0 forever and
+	# contradicts the "finished" state carried in this same envelope. Only
+	# meaningful once the search has actually finished; a still-running one
+	# reports the daemon's real ramp and is checked elsewhere.
+	ADOPTED_STATE=$(printf '%s' "$CURL_BODY" | jq -r '.progress.state')
+	if  "$ADOPTED_STATE" = "finished" ; then
+		_assert_json_eq '.progress.percent' 100 \
+			'an adopted finished search reports percent 100, not 0'
+	else
+		echo "    info: adopted search still $ADOPTED_STATE; skipping the finished-percent check"
+	fi
+else
+	_fail "second amuleapi instance: admin login" "could not obtain a token; log: $(tail -c 300 "$SECOND_LOG")"
+fi
+
+kill "$SECOND_PID" >/dev/null 2>&1
+wait "$SECOND_PID" 2>/dev/null
+rm -rf "$SECOND_CONFIG_DIR" "$SECOND_LOG"
+fi # HAVE_SECOND_INSTANCE -- section 3.2
+
+# --- 3.5 Regression: progress shouldn't claim finished right after POST. -
+# amuled briefly reports raw=100 in the "queue-empty-at-start" window
+# before the global-search timer populates m_serverQueue; if amuleapi
+# trusted that raw value naively, GET /search/{id}/results right after POST
+# would (incorrectly) say {progress:{percent:100, state:"finished"}}
+# with results=. The refresher's state machine masks that window —
+# this asserts the mask is in force.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID/results"
+_assert_status 200 "GET /search/{id}/results immediately after POST → 200"
+# The window guarded here is `finished` with an EMPTY list, from the unmasked
+# raw=100. A search that genuinely completed first is also `finished`, so a flat
+# `running` comparison failed on a fast local hit or a warm server queue.
+EARLY_STATE=$(printf '%s' "$CURL_BODY" | jq -r '.progress.state' 2>/dev/null)
+EARLY_RESULTS=$(printf '%s' "$CURL_BODY" | jq -r '.results | length' 2>/dev/null)
+if  "$EARLY_STATE" = "running"  ||
+	{  "$EARLY_STATE" = "finished"  &&  "${EARLY_RESULTS:-0}" -gt 0 ; }; then
+	_pass "progress.state right after POST is not an empty \"finished\" ($EARLY_STATE, ${EARLY_RESULTS:-0} results)"
+else
+	_fail "early progress state" \
+		"got state=$EARLY_STATE with ${EARLY_RESULTS:-0} results" \
+		"amuled's queue-empty-at-start raw=100 is leaking through unmasked"
+fi
+_assert_json_eq '.progress.type | type' string 'progress.type is a string'
+
+# --- 4. Poll /search/{id}/results until we get hits (max ~10 s). --
+RESULT_HASH=""
+for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50; do
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID/results"
+	N=$(printf '%s' "$CURL_BODY" | jq '.results | length')
+	if  "$N" -gt 0 ; then
+		RESULT_HASH=$(printf '%s' "$CURL_BODY" | jq -r '.results0.hash')
+		break
+	fi
+	sleep 0.2
+done
+
+if  -n "$RESULT_HASH" ; then
+	_pass "Search returned >0 results within 10 s ($N entries; sample hash $RESULT_HASH)"
+
+	# Per-result shape sanity.
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID/results"
+	_assert_json_eq '.results0.hash | length' 32     '/search/{id}/results0.hash is 32-char hex'
+	_assert_json_eq '.results0.name | type'   string '/search/{id}/results0.name is string'
+	_assert_json_eq '.results0.size_bytes | type'   number '/search/{id}/results0.size_bytes is numeric'
+	# Browse-only folder. Always present, empty on a server/Kad hit.
+	_assert_json_eq '.results0.directory | type' string \
+		'/search/{id}/results0.directory is a string'
+	_assert_json_eq '.results0.directory' "" \
+		'directory is empty on an ordinary (non-browse) hit'
+	# Download status + file type (issue #429).
+	_assert_json_eq '.results0.status | inside("new","downloaded","queued","canceled","queued_canceled")' \
+		true '/search/results0.status is a known enum value'
+	_assert_json_eq '.results0.file_type | type'   string '/search/{id}/results0.file_type is string'
+	# Media metadata (issue #430): an object when the hit is locally
+	# known/probed, absent otherwise — both are valid.
+	_assert_json_eq '.results0.media | type | test("^(object|null)$")' \
+		true '/search/{id}/results0.media is an object or absent'
+	# Result grouping (issue #431): every result carries a children
+	# array (empty when the hit was seen under a single name). No result
+	# is itself an alternate name (they are folded into their parent), and
+	# each entry has ecid + name + sources.
+	_assert_json_eq '.results0.alternate_names | type' array '/search/{id}/results0.alternate_names is an array'
+	_assert_json_eq '.results.alternate_names? | all(has("ecid") and has("name") and has("sources"))' \
+		true 'every alternate name has ecid/name/sources'
+	# alternate-name entries carry no `hash`: it is by construction the parent's,
+	# so repeating it per entry would say nothing.
+	_assert_json_eq '.results.alternate_names? | all(has("hash") | not)' \
+		true 'alternate names do not repeat the parent hash'
+	_assert_json_eq '.results.alternate_names? | all(has("directory"))' \
+		true 'every child carries its own directory (per-result, not per-search)'
+
+	# sort=directory is accepted (browse listings are read folder by
+	# folder); on a non-browse search every value is "" so the order is
+	# simply unchanged, which is the point -- it must not 400.
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$FIRST_SID/results?sort=directory&order=asc"
+	_assert_status 200 "GET /search/{id}/results?sort=directory → 200"
+
+	# progress envelope. `progress` exists on every GET /search/{id}/results
+	# response (even before any POST /search). `state` is canonical
+	# (running | finished | idle), a single string rather than separate
+	# complete/active booleans. Once we have results, state is "running" (still polling)
+	# or "finished" (percent == 100).
+	_assert_json_eq '.progress.percent | type' number 'search progress.percent is numeric'
+	_assert_json_eq '.progress.state | type'   string 'search progress.state is a string'
+	_assert_json_eq '.progress.state | inside("running","finished","idle")' \
+		true 'search progress.state is one of running/finished/idle'
+	_assert_json_eq '.progress.percent >= 0 and .progress.percent <= 100' \
+		true 'search progress.percent stays in 0, 100'
+else
+	echo "    info: 0 search results after 10 s — daemon may not be connected to ed2k/kad"
+	echo "    info: skipping /search/results/{hash}/download path (no hash to target)"
+fi
+
+# --- 4.5 POST /search/{id}/more — Kad-only, running-only. ---------
+#
+# The global search above is the wrong kind, which is exactly the case the
+# desktop greys the button out for; forwarding it would make amuled turn a
+# user's request into a silent no-op under a 202.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID/more"
+_assert_status 400 "POST /search/{id}/more on a global search → 400 (Kad-only)"
+_assert_json_eq '.error.code' bad_request 'more on a non-Kad search reports bad_request'
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/4294967290/more"
+_assert_status 404 "POST /search/{unknown}/more → 404"
+
+# A running Kad search is the supported target. Kad may be down on the test
+# daemon, in which case the start itself fails -- skip rather than fail, like
+# the other Kad-dependent assertions in this suite.
+#
+# Distinct keyword on purpose: amuled refuses a second Kad search for a
+# keyword already on its search list ("Search keyword is already on search
+# list"), and the ramp section below runs its own Kad search on $TEST_QUERY.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"${TEST_QUERY}more\",\"type\":\"kad\"}" "$API/search"
+if  "$CURL_STATUS" = "202" ; then
+	KAD_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id')
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$KAD_SID/more"
+	_assert_status 202 "POST /search/{id}/more on a running Kad search → 202"
+	_assert_body_empty 'more sends no body'
+
+	# The timing edge, which is deterministic where the reask cap is not.
+	# Kad calls PrepareToStop on a keyword search 20 s before its 45 s life
+	# ends, and RequestMoreResults refuses from that moment on -- so a press
+	# made past roughly 55% of the ramp can never widen the search again and
+	# must answer 409 instead of a misleading 202.
+	#
+	# Deliberately NOT trying to exhaust the 4-reask budget: that needs four
+	# distinct responded peers inside the first 25 s and is not reproducible
+	# on a test daemon.
+	MORE_PCT=0
+	for _ in $(seq 1 40); do
+		sleep 2
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$KAD_SID/results"
+		MORE_PCT=$(printf '%s' "$CURL_BODY" | jq -r '.progress.percent // 0')
+		MORE_STATE=$(printf '%s' "$CURL_BODY" | jq -r '.progress.state')
+		 "$MORE_STATE" = "finished"  && break
+		# 65 is comfortably past the ~55% PrepareToStop point without waiting
+		# for the search to finish (which a finished search rejects with 400).
+		awk -v p="$MORE_PCT" 'BEGIN { exit !(p > 65) }' && break
+	done
+	if  "$MORE_STATE" = "running"  && awk -v p="$MORE_PCT" 'BEGIN { exit !(p > 65) }'; then
+		_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$KAD_SID/more"
+		_assert_status 409 "POST /search/{id}/more past the stopping window → 409"
+		_assert_json_eq '.error.code' kad_more_exhausted \
+			'a search that can no longer be widened reports kad_more_exhausted'
+	else
+		echo "    info: Kad search reached state=$MORE_STATE percent=$MORE_PCT;" \
+			"skipping the stopping-window 409 check"
+	fi
+	if  "$HAVE_GUEST" = "1" ; then
+		_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+			"$API/search/$KAD_SID/more"
+		_assert_status 403 "POST /search/{id}/more (guest) → 403"
+	fi
+	curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$KAD_SID" > /dev/null
+else
+	echo "    info: Kad search would not start (Kad down?) — skipping /more happy path"
+fi
+
+# --- 5. POST /search/{id}/stop. -----------------------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/search/$FIRST_SID/stop"
+# 204, the same as DELETE /search/{id}: with no `ok` field there is nothing left
+# to report, and only the results-survive check below tells the two apart.
+_assert_status 204 "POST /search/{id}/stop → 204"
+_assert_body_empty 'search stop sends no body'
+# Stop keeps the results readable — that is what distinguishes it from
+# DELETE, and a consumer viewing the search must not lose its rows.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID/results"
+_assert_status 200 "GET /search/{id}/results after stop → 200 (results survive a stop)"
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/4294967290/stop"
+_assert_status 404 "POST /search/{unknown}/stop → 404"
+
+# --- 6. POST /search/results/{hash}/download — happy + cleanup. --
+if  -n "$RESULT_HASH" ; then
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d '{"category_index":0}' \
+		"$API/search/results/$RESULT_HASH/download"
+	# 202 with no body: `hash` came from the URL, `category` came from the
+	# request, and the download itself reports the category it landed in.
+	_assert_status 202 "POST /search/results/{hash}/download → 202"
+	_assert_body_empty 'download sends no body'
+
+	# Empty-body POST should also succeed (category defaults to 0).
+	# But first DELETE the just-created download so we don't trip
+	# "already in queue".
+	_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/downloads/$RESULT_HASH"
+	# 204 if found, 404 if already evicted by amuled — either is OK.
+	if  "$CURL_STATUS" = "204"  ||  "$CURL_STATUS" = "404" ; then
+		_pass "Cleanup: DELETE /downloads/{result hash} → $CURL_STATUS"
+	else
+		_fail "Cleanup DELETE" "unexpected status $CURL_STATUS"
+	fi
+fi
+
+# --- 7. POST /search/results/{hash}/download error paths. --------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{}' "$API/search/results/not-32-hex-chars/download"
+_assert_status 400 "POST download (bad hash format) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"category_index":300}' \
+	"$API/search/results/baadbaadbaadbaadbaadbaadbaadbaad/download"
+_assert_status 400 "POST download (category out of range) → 400"
+
+# Download-under-name selector (issue #431): `ecid` must be a
+# non-negative integer.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"ecid":"notnum"}' \
+	"$API/search/results/baadbaadbaadbaadbaadbaadbaadbaad/download"
+_assert_status 400 "POST download (ecid wrong type) → 400"
+
+# Unknown hash that's well-formed (32 hex chars) → amuled rejection.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{}' "$API/search/results/baadbaadbaadbaadbaadbaadbaadbaad/download"
+# amuled may either reject (400 amuled_rejected) or silently accept
+# the request and never instantiate the partfile — both wire shapes
+# have been observed; accept either.
+if  "$CURL_STATUS" = "400"  ||  "$CURL_STATUS" = "202" ; then
+	_pass "POST download (well-formed unknown hash) → $CURL_STATUS"
+else
+	_fail "POST download unknown hash" \
+		"expected 400 or 202, got $CURL_STATUS"
+fi
+
+# --- 8. Method gates. ---------------------------------------------
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+_assert_status 405 "PATCH /search → 405"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID/stop"
+_assert_status 405 "PATCH /search/{id}/stop → 405"
+_curl -X GET -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID"
+_assert_status 405 "GET /search/{id} → 405 (DELETE only)"
+_curl -X GET -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID/bogus"
+_assert_status 404 "GET /search/{id}/{unknown-action} → 404"
+
+# --- 9. Kad search progress ramp. ---------------------------------
+# Kad has no measurable progress, so amuled synthesises a cosmetic
+# time-ramp from the fixed keyword-search lifetime (SEARCHKEYWORD_LIFETIME,
+# 45 s) and ships it in EC_TAG_SEARCH_LIFECYCLE_PERCENT; amuleapi
+# surfaces it verbatim as progress.percent. Assert the ramp climbs over
+# time and stays capped at 99 while running — only the authoritative
+# finished edge reaches 100, so the bar can never claim completion
+# early. Skips the ramp assertions if amuled isn't connected to Kad
+# (the search never goes "running").
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"$TEST_QUERY\",\"type\":\"kad\"}" "$API/search"
+_assert_status 202 "POST /search type=kad → 202"
+RAMP_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id')
+
+KAD_STATES=""; KAD_PCTS=""; SAW_RUNNING_KAD=0
+for _ in 1 2 3 4 5 6; do
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$RAMP_SID/results"
+	ST=$(printf '%s' "$CURL_BODY" | jq -r '.progress.state')
+	KD=$(printf '%s' "$CURL_BODY" | jq -r '.progress.type')
+	PC=$(printf '%s' "$CURL_BODY" | jq -r '.progress.percent')
+	KAD_STATES="$KAD_STATES $ST"; KAD_PCTS="$KAD_PCTS $PC"
+	if  "$ST" = "running"  &&  "$KD" = "kad" ; then SAW_RUNNING_KAD=1; fi
+	sleep 2
+done
+echo "    kad samples: states=$KAD_STATES  percents=$KAD_PCTS "
+
+if  "$SAW_RUNNING_KAD" -eq 0 ; then
+	echo "    info: Kad search never went 'running' — amuled likely not"
+	echo "    info: connected to Kad; skipping ramp assertions."
+else
+	CAP_OK=1; MONO=1; PREV=-1; FIRST_RUN=""; LAST_RUN=""; SAW_FINISHED=0
+	set -- $KAD_PCTS; KAD_PC_ARR=("$@")
+	idx=0
+	for st in $KAD_STATES; do
+		pc=${KAD_PC_ARR$idx}
+		if  "$pc" -lt "$PREV"  2>/dev/null; then MONO=0; fi
+		PREV=$pc
+		if {  "$pc" -lt 0  ||  "$pc" -gt 100 ; } 2>/dev/null; then CAP_OK=0; fi
+		if  "$st" = "running" ; then
+			if  "$pc" -gt 99  2>/dev/null; then CAP_OK=0; fi
+			 -z "$FIRST_RUN"  && FIRST_RUN=$pc
+			LAST_RUN=$pc
+		fi
+		 "$st" = "finished"  && SAW_FINISHED=1
+		idx=$((idx+1))
+	done
+
+	if  "$CAP_OK" -eq 1 ; then
+		_pass "Kad running percent capped at 99 and within 0,100"
+	else
+		_fail "Kad percent cap" "states=$KAD_STATES  percents=$KAD_PCTS "
+	fi
+	if  "$MONO" -eq 1 ; then
+		_pass "Kad percent monotonic non-decreasing"
+	else
+		_fail "Kad percent monotonic" "percents went backwards: $KAD_PCTS "
+	fi
+	if  "$SAW_FINISHED" -eq 1  || \
+	   {  -n "$FIRST_RUN"  &&  -n "$LAST_RUN"  &&  "$LAST_RUN" -gt "$FIRST_RUN"  2>/dev/null; }; then
+		_pass "Kad ramp advanced over time (first=$FIRST_RUN last=$LAST_RUN finished=$SAW_FINISHED)"
+	else
+		_fail "Kad ramp advance" \
+			"percent did not climb and search never finished: first=$FIRST_RUN last=$LAST_RUN states=$KAD_STATES "
+	fi
+fi
+
+curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$RAMP_SID" > /dev/null 2>&1
+
+# --- 10. Search-result Kad comments/ratings (issue #434). ---------
+# GET/POST /search/results/{hash}/comments mirror the download-comments
+# endpoints for a result the user has not downloaded. Auth + error gates
+# need no connectivity; the happy path needs a live result.
+BOGUS=baadbaadbaadbaadbaadbaadbaadbaad
+
+_curl -X POST "$API/search/results/$BOGUS/comments"
+_assert_status 401 "POST /search/results/{hash}/comments (no token) → 401"
+
+_curl "$API/search/results/$BOGUS/comments"
+_assert_status 401 "GET /search/results/{hash}/comments (no token) → 401"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/search/results/not-32-hex-chars/comments"
+_assert_status 400 "POST search comments (bad hash format) → 400"
+
+# Admin gate. The POST drives an unbounded Kad NOTES lookup on the daemon
+# (EC_OP_SHARED_FILE_SEARCH_KAD_NOTES), so a guest session must not reach
+# it; the GET is a plain read and stays open to guests.
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		"$API/search/results/$BOGUS/comments"
+	_assert_status 403 "POST /search/results/{hash}/comments (guest token) → 403"
+	_assert_json_eq '.error.code' forbidden \
+		'POST search comments guest carries error.code=forbidden'
+else
+	echo "    info: no guest password set on daemon; admin-gate test skipped"
+fi
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/search/results/$BOGUS/comments"
+_assert_status 404 "POST search comments (well-formed unknown hash) → 404"
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/search/results/$BOGUS/comments"
+_assert_status 404 "GET search comments (unknown hash) → 404"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/search/results/$BOGUS/comments"
+_assert_status 405 "PATCH search comments → 405"
+
+# Happy path: needs a live result. Start a fresh global search and poll.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"$TEST_QUERY\",\"type\":\"global\"}" "$API/search"
+CMT_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id // empty')
+CMT_HASH=""
+for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$CMT_SID/results"
+	N=$(printf '%s' "$CURL_BODY" | jq '.results | length')
+	if  "$N" -gt 0 ; then
+		CMT_HASH=$(printf '%s' "$CURL_BODY" | jq -r '.results0.hash')
+		break
+	fi
+	sleep 0.25
+done
+
+if  -n "$CMT_HASH" ; then
+	# Every result carries the comment fields on the list itself.
+	_assert_json_eq '.results0.kad_comment_lookup_running | type' boolean \
+		'/search/{id}/results0.kad_comment_lookup_running is boolean (issue #434)'
+	_assert_json_eq '.results0.comments | type' array \
+		'/search/{id}/results0.comments is an array'
+
+	# Trigger an on-demand Kad notes lookup for the result.
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/results/$CMT_HASH/comments"
+	# 202 with no body. It carries no `status`: such a field could hold exactly
+	# one value, so it would restate the status code -- and `status` everywhere
+	# else on this surface is a transfer state, so a client switching on it would
+	# have to know which kind of object it held first. The lookup's progress is read from
+	# `kad_comment_lookup_running` on the GET below.
+	_assert_status 202 "POST /search/results/{hash}/comments → 202"
+	_assert_body_empty 'search comments POST sends no body'
+
+	# Per-result comments view.
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/results/$CMT_HASH/comments"
+	_assert_status 200 "GET /search/results/{hash}/comments → 200"
+	_assert_json_eq '.total | type' number 'search comments.total is numeric'
+	_assert_json_eq '.kad_comment_lookup_running | type' boolean \
+		'search comments carries kad_comment_lookup_running flag'
+	_assert_json_eq '.comments | type' array 'search comments.comments is an array'
+
+	# The lookup's outcome only reaches amuleapi through the owning
+	# search's result fetch. Stop the search first, then keep polling:
+	# on a FINISHED search this exercises the refresh-on-read path, which
+	# is the only thing that can flip the flag back off. Skipped as
+	# inconclusive when Kad is down -- the flag then never turns on.
+	curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$CMT_SID/stop" > /dev/null 2>&1
+	sleep 1
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$CMT_SID/results"
+	_assert_status 200 "GET /search/{id}/results on a finished search → 200 (refreshed on read)"
+	# A Kad NOTES lookup runs for ~45 s (SEARCHKEYWORD_LIFETIME), so poll
+	# past that. Either outcome proves the point: the flag clearing, or a
+	# note arriving. Both can only reach us through the owning search's
+	# result fetch, and this search is FINISHED -- the tick never polls it,
+	# so a frozen slot would show neither, forever.
+	SAW_FLAG=0
+	REPORTED=0
+	for _ in $(seq 1 30); do
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+			"$API/search/results/$CMT_HASH/comments"
+		RUNNING=$(printf '%s' "$CURL_BODY" | jq -r '.kad_comment_lookup_running')
+		NOTES=$(printf '%s' "$CURL_BODY" | jq -r '.count')
+		 "$RUNNING" = "true"  && SAW_FLAG=1
+		if  "$SAW_FLAG" = "1"  && {  "$RUNNING" = "false"  ||  "$NOTES" -gt 0  2>/dev/null; }; then
+			REPORTED=1
+			break
+		fi
+		sleep 2
+	done
+	if  "$SAW_FLAG" = "0" ; then
+		echo "    info: kad_comment_lookup_running never turned on — Kad likely down;"
+		echo "    info: skipping the finished-search comments reporting assertion."
+	elif  "$REPORTED" = "1" ; then
+		_pass "kad notes lookup on a FINISHED search reports back (running=$RUNNING notes=$NOTES)"
+	else
+		_fail "kad notes on a finished search" \
+			"flag turned on but nothing ever reported back (running=$RUNNING notes=$NOTES)"
+	fi
+	curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$CMT_SID" > /dev/null 2>&1
+else
+	echo "    info: 0 results — skipping search-comments happy path (daemon not connected)"
+fi
+
+# --- 11. Multi-search: concurrent searches, per-id addressing. ----
+# amuleapi runs several searches at once, each with its own daemon-
+# allocated search_id and its own result slot. Start an ed2k (global)
+# AND a Kad search back-to-back and verify they coexist: distinct ids,
+# per-id results, unknown id => 404, and DELETE frees one while the
+# sibling survives.
+#
+# Regression guard (daemon fix): a Kad search started while an ed2k
+# search is still in-flight must NOT stop/steal the ed2k search — its
+# results are attributed via a scalar the Kad start used to clobber, so
+# the global bucket would come back empty. Here we assert the global
+# search still harvests while the Kad search runs alongside it.
+G=$(curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"$TEST_QUERY\",\"type\":\"global\"}" "$API/search")
+SID_G=$(printf '%s' "$G" | jq -r '.search_id')
+# Distinct Kad keyword again: amuled keeps a keyword on its Kademlia
+# search list for the search's lifetime and refuses a second search for
+# the same one, so reusing $TEST_QUERY here would couple this section to
+# how far the earlier Kad sections have wound down.
+K=$(curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"${TEST_QUERY}multi\",\"type\":\"kad\"}" "$API/search")
+SID_K=$(printf '%s' "$K" | jq -r '.search_id')
+
+if  -n "$SID_G"  &&  -n "$SID_K"  &&  "$SID_G" != "null"  &&  "$SID_K" != "null" ; then
+	if  "$SID_G" != "$SID_K" ; then
+		_pass "Two concurrent searches get distinct search_ids ($SID_G, $SID_K)"
+	else
+		_fail "Concurrent search_ids" "both searches got the same id $SID_G"
+	fi
+
+	# Per-id progress kind reflects each search's own type.
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$SID_G/results"
+	_assert_status 200 "GET /search/{global}/results → 200"
+	_assert_json_eq '.search_id'      "$SID_G" 'global search echoes its search_id'
+	_assert_json_eq '.progress.type'  global   'global search progress.type==global'
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$SID_K/results"
+	_assert_status 200 "GET /search/{kad}/results → 200"
+	_assert_json_eq '.search_id'      "$SID_K" 'kad search echoes its search_id'
+	_assert_json_eq '.progress.type'  kad      'kad search progress.type==kad'
+
+	# Unknown / never-started id → 404 (distinct from known-but-empty).
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/4293000111/results"
+	_assert_status 404 "GET /search/{unknown}/results → 404"
+
+	# Regression: the in-flight global search still harvests despite the
+	# concurrent Kad search. Poll briefly; skip the assertion (don't fail)
+	# if the daemon simply has no ed2k hits for the query.
+	GN=0
+	for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$SID_G/results"
+		GN=$(printf '%s' "$CURL_BODY" | jq '.results | length')
+		 "$GN" -gt 0  && break
+		sleep 0.25
+	done
+	if  "$GN" -gt 0 ; then
+		_pass "In-flight global search still harvests alongside a Kad search ($GN hits)"
+	else
+		echo "    info: global search returned 0 alongside Kad — daemon may lack ed2k hits for '$TEST_QUERY'"
+	fi
+
+	# --- 11.1 Two searches stay separate across the incremental union poll. ---
+	#
+	# The refresher now fetches every search's results in ONE id-less
+	# EC_OP_SEARCH_RESULTS at EC_DETAIL_INC_UPDATE, so all searches share a reply
+	# and the daemon stops repeating a result it has already sent. Attribution then
+	# rests on amuleapi's own ECID -> search_id index rather than on a tag in the
+	# packet, which is the thing that can silently cross-wire two searches.
+	#
+	# Poll both several times: the first pass populates, later ones are the diffed
+	# ones where the search id is no longer on the wire.
+	if  -n "$SID_G"  &&  -n "$SID_K"  &&  "$SID_G" != "$SID_K" ; then
+		for _ in 1 2 3 4 5; do
+			sleep 1
+			_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$SID_G/results"
+			_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$SID_K/results"
+		done
+
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$SID_G/results"
+		_assert_status 200 "union: GET /search/{global}/results after repeated polls → 200"
+		_assert_json_eq '.search_id' "$SID_G" 'union: the global search still reports its own id'
+		G_TOTAL=$(printf '%s' "$CURL_BODY" | jq -r '.total')
+
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$SID_K/results"
+		_assert_status 200 "union: GET /search/{kad}/results after repeated polls → 200"
+		_assert_json_eq '.search_id' "$SID_K" 'union: the kad search still reports its own id'
+		K_TOTAL=$(printf '%s' "$CURL_BODY" | jq -r '.total')
+
+		# Results must not migrate between searches. Checked against the daemon's own
+		# per-search count from GET /search, which comes from EC_OP_SEARCH_LIST and so
+		# is independent of the cache the union maintains -- comparing the two searches
+		# to each other proves nothing, since a global and a Kad search for the same
+		# query may legitimately return the same files.
+		#
+		# One-sided on purpose: the cached total is the FOLDED view (children counted
+		# inside their parent) while the daemon counts what it holds, so it may
+		# legitimately be lower. It can only ever exceed the daemon's count by holding
+		# results that belong to another search, which is exactly the cross-wiring
+		# this is looking for.
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+		if  "$(printf '%s' "$CURL_BODY" | jq --argjson g "$SID_G" --argjson k "$SID_K" \
+			'.searches | select(.search_id == $g or .id == $k) | select(has("result_count")) | length')" -eq 2 ; then
+			for _pair in "$SID_G:$G_TOTAL:global" "$SID_K:$K_TOTAL:kad"; do
+				_sid=${_pair%%:*}; _rest=${_pair#*:}; _cached=${_rest%%:*}; _label=${_rest#*:}
+				_held=$(printf '%s' "$CURL_BODY" | jq -r --argjson s "$_sid" \
+					'.searches | select(.search_id == $s) | .result_count')
+				if  "$_cached" -gt "$_held" ; then
+					_fail "union: the $_label search holds more results than the daemon has for it" \
+						"cached $_cached > daemon $_held; the ECID index is cross-wiring diffed tags"
+				else
+					_pass "union: the $_label search holds no results the daemon attributes elsewhere"
+				fi
+			done
+		else
+			echo "    info: daemon reported no result_count for one of the searches; cross-wiring check skipped"
+		fi
+
+		# Every row still carries the fields that only travel on a result's FIRST
+		# appearance. A merge that dropped a guard would blank these on the first
+		# diffed poll, which is the failure mode with no other symptom.
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$SID_G/results"
+		if  "$(printf '%s' "$CURL_BODY" | jq '.results | length')" -gt 0 ; then
+			_assert_json_eq '.results | select(.name == "" or .name == null) | length' 0 \
+				'union: no result lost its name across diffed polls'
+			_assert_json_eq '.results | select(.size_bytes == 0 or .size_bytes == null) | length' 0 \
+				'union: no result lost its size_bytes across diffed polls'
+			_assert_json_eq '.results | select(.hash == "" or .hash == null) | length' 0 \
+				'union: no result lost its hash across diffed polls'
+			_assert_json_eq '.results | select(.status == "" or .status == null) | length' 0 \
+				'union: no result lost its status across diffed polls'
+			_assert_json_eq '.results | select(.file_type == "" or .file_type == null) | length' 0 \
+				'union: no result lost its file_type across diffed polls'
+		else
+			echo "    info: global search returned no rows; per-field retention checks skipped"
+		fi
+	else
+		echo "    info: no two distinct searches available; union separation check skipped"
+	fi
+
+	# DELETE the global search: its slot is freed (404), the Kad search
+	# is untouched (still 200). Freeing one from one tab must never take
+	# a sibling with it.
+	_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$SID_G"
+	_assert_status 204 "DELETE /search/{global} → 204"
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$SID_G/results"
+	_assert_status 404 "GET freed global search → 404"
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$SID_K/results"
+	_assert_status 200 "sibling Kad search survives the DELETE → 200"
+
+	# DELETE with an id nobody holds → 404.
+	_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/4293000111"
+	_assert_status 404 "DELETE /search/{unknown} → 404"
+
+	curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$SID_K" >/dev/null 2>&1
+else
+	_fail "Multi-search setup" "POST /search did not return search_ids (G=$SID_G K=$SID_K)"
+fi
+
+# --- 11.2 A finished search keeps being refreshed. -----------------
+#
+# The tick used to poll only searches with progress.active, so once a search
+# finished nothing re-read it and a hit downloaded afterwards kept reporting
+# already_downloaded=false forever. Eliding made polling finished searches free, so
+# they stay in the poll set -- this pins that the row is still being maintained
+# rather than frozen at the moment the search completed.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID/results"
+if  "$CURL_STATUS" = "200" ; then
+	FIN_STATE=$(printf '%s' "$CURL_BODY" | jq -r '.progress.state')
+	FIN_N=$(printf '%s' "$CURL_BODY" | jq '.results | length')
+	echo "    info: search $FIRST_SID is $FIN_STATE with $FIN_N result(s)"
+	if  "$FIN_STATE" = "finished"  &&  "$FIN_N" -gt 0 ; then
+		# Two reads a couple of ticks apart: the row must still be there and
+		# still complete. A finished search dropped from the poll set would
+		# have kept whatever it had, so this is a regression guard on the
+		# merge rather than a liveness assertion about values that may not
+		# change on an idle daemon.
+		BEFORE_N=$FIN_N
+		sleep 3
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FIRST_SID/results"
+		_assert_status 200 "union: a finished search is still readable after further ticks"
+		_assert_json_eq '.results | length' "$BEFORE_N" \
+			'union: a finished search keeps its results across ticks'
+		_assert_json_eq '.results | select(.name == "" or .name == null) | length' 0 \
+			'union: a finished search keeps its result names across ticks'
+		_assert_json_eq '.results | select(.already_downloaded | type != "boolean") | length' 0 \
+			'union: a finished search still reports already_downloaded as a boolean'
+	else
+		echo "    info: search $FIRST_SID not finished-with-results; finished-poll check skipped"
+	fi
+else
+	echo "    info: search $FIRST_SID no longer readable; finished-poll check skipped"
+fi
+
+# --- 12. Close actually frees the search on the daemon. ------------
+# The assertion the earlier rounds were missing. Every previous check
+# here confirmed something *appeared* (a tab, an entry, a result); none
+# confirmed something was *gone*. That gap let a close path that never
+# reached the daemon look correct for several rounds: the GUI tab
+# vanished locally, so the symptom matched, while the search stayed
+# alive in the core (got3nks, PR #680 review point 6).
+#
+# GET /api/v1/search is the right oracle for this because it is a live
+# EC_OP_SEARCH_LIST round trip to amuled, not amuleapi's own m_state
+# cache -- so a search still listed here is still held by the core,
+# whatever any one client's local view says.
+#
+# DELETE /search/{id} sends exactly the EC request amulegui's tab close
+# sends (EC_OP_SEARCH_STOP + EC_TAG_SEARCH_CLOSE), so this exercises the
+# same daemon-side path from a scriptable client.
+CLOSE_RES=$(curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"$TEST_QUERY\",\"type\":\"global\"}" "$API/search")
+SID_CLOSE=$(printf '%s' "$CLOSE_RES" | jq -r '.search_id')
+
+if  -n "$SID_CLOSE"  &&  "$SID_CLOSE" != "null" ; then
+	# Precondition: the daemon holds it. Without this the "gone" assertion
+	# below would also pass against a search that was never there.
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+	_assert_json_eq ".searches | select(.search_id == $SID_CLOSE) | length" 1 \
+		'close: daemon lists the search before the close'
+
+	# A plain stop (no close) halts activity but must KEEP the search --
+	# the contrapositive that proves the removal below is close's doing
+	# and not a side effect of stopping.
+	curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$SID_CLOSE/stop" >/dev/null 2>&1
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+	_assert_json_eq ".searches | select(.search_id == $SID_CLOSE) | length" 1 \
+		'close: a plain stop leaves the search on the daemon'
+
+	# Now free it, and assert it is GONE from the daemon's own list.
+	curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$SID_CLOSE" >/dev/null 2>&1
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+	_assert_status 200 'close: GET /search after close → 200'
+	_assert_json_eq ".searches | select(.search_id == $SID_CLOSE) | length" 0 \
+		'close: the closed search is GONE from the daemon list'
+
+	# And it is gone for everyone, not just the session that closed it --
+	# a second instance re-reads the same core state. This is what a
+	# second amulegui would have shown had it still been open.
+	if  "$HAVE_SECOND_INSTANCE" -eq 0 ; then
+		_skip "close: second-instance cross-check (no amuleapi binary)"
+	else
+	SECOND2_CONFIG_DIR=$(mktemp -d -t amuleapi_19_close_second.XXXXXX)
+	SECOND2_LOG=$(mktemp -t amuleapi_19_close_second_log.XXXXXX)
+	"$AMULEAPI_BIN" --config-dir="$SECOND2_CONFIG_DIR" \
+		--host="$EC_HOST" --port="$EC_PORT" \
+		--set-admin-pass="$ADMIN_PASS" >/dev/null 2>&1
+		# Same reason as the first second-instance above.
+		sed -i'.bak' "s|^Password=.*|Password=$EC_PASSWORD|" "$SECOND2_CONFIG_DIR/amuleapi.conf"
+		rm -f "$SECOND2_CONFIG_DIR/amuleapi.conf.bak"
+	"$AMULEAPI_BIN" --config-dir="$SECOND2_CONFIG_DIR" \
+		--host="$EC_HOST" --port="$EC_PORT" \
+		--http-port=4715 >"$SECOND2_LOG" 2>&1 &
+	SECOND2_PID=$!
+	for i in 1 2 3 4 5 6 7 8 9 10 11 12; do
+		curl -s -o /dev/null --max-time 1 "http://localhost:4715/api/v1/health" 2>/dev/null && break
+		sleep 0.5
+	done
+	sleep 2
+	SECOND2_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+		-d "{\"password\":\"$ADMIN_PASS\"}" \
+		"http://localhost:4715/api/v1/auth/login?include_token=true" | jq -r .token)
+	if  -n "$SECOND2_TOKEN"  &&  "$SECOND2_TOKEN" != "null" ; then
+		_curl -H "Authorization: Bearer $SECOND2_TOKEN" "http://localhost:4715/api/v1/search"
+		_assert_json_eq ".searches | select(.search_id == $SID_CLOSE) | length" 0 \
+			'close: a second session also no longer sees the closed search'
+	else
+		_fail "close: second instance login" "no token; log: $(tail -c 300 "$SECOND2_LOG")"
+	fi
+	kill "$SECOND2_PID" >/dev/null 2>&1
+	wait "$SECOND2_PID" 2>/dev/null
+	rm -rf "$SECOND2_CONFIG_DIR" "$SECOND2_LOG"
+	fi # HAVE_SECOND_INSTANCE -- close cross-check
+
+	# Its results are unaddressable afterwards, too -- the bucket is freed,
+	# not merely hidden from the listing.
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$SID_CLOSE/results"
+	_assert_status 404 'close: GET /search/{id}/results for the freed id → 404'
+else
+	_fail "close setup" "POST /search did not return a search_id ($CLOSE_RES)"
+fi
+
+if  "$HAVE_SECOND_INSTANCE" -eq 0 ; then
+	_skip "12.1 foreign-search stop (no amuleapi binary; set AMULEAPI_BIN)"
+else
+# --- 12.1 A foreign search must be stoppable, not just visible. ----
+# Found by driving two clients against one daemon and using the other as
+# an oracle: GET /api/v1/search enumerates live core state, so it lists
+# searches this session never started -- but the stop path gated on the
+# local m_state cache alone and answered 404 for exactly those. You could
+# see a search you could not close. Same contradiction previously fixed
+# for the results read; every search-scoped handler now resolves its id
+# through one RequireSearch helper, which is what stops it recurring a
+# third time (got3nks, PR #680 review).
+#
+# Stage a genuinely foreign search: a second amuleapi instance starts it,
+# so the primary at $HOST has never seen the id in its own cache.
+FOREIGN_CONFIG_DIR=$(mktemp -d -t amuleapi_19_foreign.XXXXXX)
+FOREIGN_LOG=$(mktemp -t amuleapi_19_foreign_log.XXXXXX)
+"$AMULEAPI_BIN" --config-dir="$FOREIGN_CONFIG_DIR" \
+	--host="$EC_HOST" --port="$EC_PORT" \
+	--set-admin-pass="$ADMIN_PASS" >/dev/null 2>&1
+# Same reason as the other extra instances: no --password, so the EC
+# credential goes into the amuleapi.conf the call above just created.
+sed -i'.bak' "s|^Password=.*|Password=$EC_PASSWORD|" "$FOREIGN_CONFIG_DIR/amuleapi.conf"
+rm -f "$FOREIGN_CONFIG_DIR/amuleapi.conf.bak"
+"$AMULEAPI_BIN" --config-dir="$FOREIGN_CONFIG_DIR" \
+	--host="$EC_HOST" --port="$EC_PORT" \
+	--http-port=4716 >"$FOREIGN_LOG" 2>&1 &
+FOREIGN_PID=$!
+for i in 1 2 3 4 5 6 7 8 9 10 11 12; do
+	curl -s -o /dev/null --max-time 1 "http://localhost:4716/api/v1/health" 2>/dev/null && break
+	sleep 0.5
+done
+sleep 2
+FOREIGN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"http://localhost:4716/api/v1/auth/login?include_token=true" | jq -r .token)
+
+if  -n "$FOREIGN_TOKEN"  &&  "$FOREIGN_TOKEN" != "null" ; then
+	FOREIGN_RES=$(curl -s -X POST -H "Authorization: Bearer $FOREIGN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"query\":\"$TEST_QUERY\",\"type\":\"global\"}" \
+		"http://localhost:4716/api/v1/search")
+	SID_FOREIGN=$(printf '%s' "$FOREIGN_RES" | jq -r '.search_id')
+
+	if  -n "$SID_FOREIGN"  &&  "$SID_FOREIGN" != "null" ; then
+		# The primary session can SEE it (this already worked).
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+		_assert_json_eq ".searches | select(.search_id == $SID_FOREIGN) | length" 1 \
+			'foreign stop: primary session lists the foreign search'
+
+		# ...and can also FREE it. This is the assertion that was 404ing.
+		_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+			"$API/search/$SID_FOREIGN"
+		_assert_status 204 'foreign stop: freeing a foreign search → 204 (not 404)'
+
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+		_assert_json_eq ".searches | select(.search_id == $SID_FOREIGN) | length" 0 \
+			'foreign stop: the foreign search is actually gone afterwards'
+	else
+		_fail "foreign stop setup" "second instance POST /search returned no id ($FOREIGN_RES)"
+	fi
+else
+	_fail "foreign stop: second instance login" "no token; log: $(tail -c 300 "$FOREIGN_LOG")"
+fi
+kill "$FOREIGN_PID" >/dev/null 2>&1
+wait "$FOREIGN_PID" 2>/dev/null
+rm -rf "$FOREIGN_CONFIG_DIR" "$FOREIGN_LOG"
+fi # HAVE_SECOND_INSTANCE -- section 12.1
+
+# --- 13. A failed search start must not wedge discovery. -----------
+# amulegui defers EC_OP_SEARCH_LIST-driven tab creation while it has a
+# START in flight, so a START that fails without ever being accounted
+# for used to leave that deferral armed for the rest of the session --
+# discovery silently dead, plus a per-tick EC round trip (got3nks, PR
+# #680 review point 5). amuleapi does not share amulegui's counter, but
+# it does share the daemon: this asserts the daemon stays healthy and
+# enumerable across a rejected start, which is the half a script can
+# observe. The client-side set-keyed-by-id fix is what closes the rest.
+BAD_START=$(curl -s -o /dev/null -w '%{http_code}' -X POST \
+	-H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"query":"","type":"global"}' "$API/search")
+if  "$BAD_START" = "400"  ||  "$BAD_START" = "422" ; then
+	_pass "failed start: empty query rejected ($BAD_START)"
+else
+	_fail "failed start: empty query rejected" "expected 400/422, got $BAD_START"
+fi
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+_assert_status 200 'failed start: GET /search still 200 afterwards'
+_assert_json_eq '.searches | type' array 'failed start: /search still enumerable afterwards'
+
+# A good start still works right after a rejected one -- i.e. the
+# rejected attempt left no residue that blocks the next search.
+AFTER_BAD=$(curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"$TEST_QUERY\",\"type\":\"global\"}" "$API/search")
+SID_AFTER=$(printf '%s' "$AFTER_BAD" | jq -r '.search_id')
+if  -n "$SID_AFTER"  &&  "$SID_AFTER" != "null"  &&  "$SID_AFTER" != "0" ; then
+	_pass "failed start: a subsequent search still starts (id $SID_AFTER)"
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+	_assert_json_eq ".searches | select(.search_id == $SID_AFTER) | length" 1 \
+		'failed start: the subsequent search is discoverable'
+	curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$SID_AFTER" >/dev/null 2>&1
+else
+	_fail "failed start: subsequent search" "POST /search returned no id ($AFTER_BAD)"
+fi
+
+# --- 13.1 A search that retained no results still reports a terminal state.
+#
+# The per-id lifecycle used to be inferred from the retained result bucket, so a
+# search that indexed nothing -- no server match, every hit dropped by the file
+# type filter, or a global sweep stopped before its first result -- reported
+# `idle` forever. `idle` is not terminal, so the progress sentinel fell through
+# to the running percent (0) and every consumer read a finished search as still
+# running at 0%: Stop stayed live, the bar never cleared, and amulegui's "an
+# eD2k search is still running" prompt fired on a long-finished tab (issue
+# #1103).
+#
+# Two searches are needed. While a search is the most recent one its state comes
+# from the live scalar, which was always right; only the older of the two takes
+# the inferred path this asserts on.
+ZERO_QUERY="amuleapi19nosuchkeyword"
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"$ZERO_QUERY\",\"type\":\"global\"}" "$API/search"
+_assert_status 202 "POST /search (zero-result probe) → 202"
+ZERO_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id')
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"${ZERO_QUERY}b\",\"type\":\"global\"}" "$API/search"
+_assert_status 202 "POST /search (demotes the zero-result probe) → 202"
+DEMOTER_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id')
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+_assert_status 200 "GET /search → 200 (after the zero-result probe)"
+ZERO_COUNT=$(printf '%s' "$CURL_BODY" \
+	| jq -r ".searches | select(.search_id == $ZERO_SID)0.result_count // empty")
+# Guarded on the probe actually having retained nothing: on a daemon where the
+# nonsense keyword somehow matched, this assertion would pass through the
+# results-retained branch and prove nothing.
+if  "$ZERO_COUNT" = "0" ; then
+	_assert_json_eq ".searches | select(.search_id == $ZERO_SID)0.state" finished \
+		'a demoted search that retained no results reports finished, not idle'
+else
+	_skip "zero-result lifecycle: probe retained ${ZERO_COUNT:-no} result(s), not 0"
+fi
+
+# Free both probes so the browse contract below sees the search set it expects.
+for sid in "$ZERO_SID" "$DEMOTER_SID"; do
+	curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$sid" > /dev/null 2>&1
+done
+
+# --- Browse ("View Files") contract. -------------------------------
+# POST /clients/{ecid}/shared_files starts a browse and returns a
+# search_id; the files themselves arrive over the network from the peer,
+# so a green happy-path needs a specific reachable peer with shares —
+# not something a smoke test can stage. We cover the deterministic
+# contract: auth, admin gate, method, and the ecid error paths.
+BROWSE_UNKNOWN_ECID=4293000111
+
+_curl -X POST "$API/clients/$BROWSE_UNKNOWN_ECID/shared_files"
+_assert_status 401 "POST /clients/{ecid}/shared_files (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		"$API/clients/$BROWSE_UNKNOWN_ECID/shared_files"
+	_assert_status 403 "POST /clients/{ecid}/shared_files (guest) → 403"
+fi
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/clients/notanumber/shared_files"
+_assert_status 400 "POST /clients/{ecid}/shared_files (non-numeric ecid) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/clients/$BROWSE_UNKNOWN_ECID/shared_files"
+_assert_status 404 "POST /clients/{ecid}/shared_files (unknown ecid) → 404"
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/clients/$BROWSE_UNKNOWN_ECID/shared_files"
+_assert_status 405 "GET /clients/{ecid}/shared_files (wrong method) → 405"
+
+# Happy path when a peer happens to be connected: a browse is addressed
+# like any other search, reports kind "browse" with the peer's
+# client_ecid, and its files carry the folder they live in inside the
+# peer's share. Skipped (not failed) with no peer connected, like the
+# other peer-dependent assertions in this suite.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/clients"
+PEER_ECID=$(printf '%s' "$CURL_BODY" | jq -r '.clients0.ecid // empty')
+if  -n "$PEER_ECID" ; then
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/clients/$PEER_ECID/shared_files"
+	if  "$CURL_STATUS" = "202" ; then
+		BROWSE_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id')
+		_pass "POST /clients/{ecid}/shared_files (live peer) → 202 (search_id $BROWSE_SID)"
+
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+		_assert_json_eq ".searches | select(.search_id == $BROWSE_SID)0.type" browse \
+			'GET /search reports the browse with kind=browse'
+		_assert_json_eq ".searches | select(.search_id == $BROWSE_SID)0.client_ecid" \
+			"$PEER_ECID" 'GET /search reports the browsed peer as client_ecid'
+		# Files received from the peer so far -- no total comparison, a browse
+		# is still running here.
+		_assert_json_eq ".searches | select(.search_id == $BROWSE_SID)0.result_count | type" \
+			number 'GET /search carries a numeric result_count on the browse'
+
+		# A browse must never report `idle` on the listing
+		# (amule-org/amule#1060). Before the fix the listing derived a
+		# browse's state from retained results, so a peer that denied the
+		# request or never answered -- which leaves none -- read `idle`
+		# forever, while the progress reply said `finished`.
+		#
+		# `running` or `finished` are both legitimate here and which one
+		# lands depends on the peer: BROWSE_IN_PROGRESS is stamped when the
+		# request is sent, but a peer that denies instantly can terminalize
+		# the browse before this round trip completes. `idle` is the failure.
+		LIST_STATE=$(printf '%s' "$CURL_BODY" | \
+			jq -r ".searches | select(.search_id == $BROWSE_SID)0.state")
+		case "$LIST_STATE" in
+		running | finished)
+			_pass "GET /search reports the browse as $LIST_STATE, never idle"
+			;;
+		*)
+			_fail "browse listing state" \
+				"expected running or finished, got $LIST_STATE"
+			;;
+		esac
+
+		# While the browse is still running the listing and the per-id
+		# progress reply must agree -- the invariant REFERENCE.md promises,
+		# and the two are served by different EC replies so nothing else
+		# enforces it. Only checked in the `running` case: the results
+		# endpoint serves amuleapi's cached slot, which the refresher
+		# refreshes on its own tick, so right after a state change the two
+		# can legitimately differ by one tick.
+		if  "$LIST_STATE" = "running" ; then
+			_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+				"$API/search/$BROWSE_SID/results?limit=1"
+			PROG_STATE=$(printf '%s' "$CURL_BODY" | jq -r '.progress.state')
+			if  "$PROG_STATE" = "running" ; then
+				_pass "listing and progress.state agree on the running browse"
+			else
+				_fail "listing vs progress state disagree" \
+					"GET /search said running, results said $PROG_STATE"
+			fi
+		fi
+
+		# A second browse of the same peer while the first is in flight joins
+		# it rather than minting a second id (amule-org/amule#1059): a second
+		# id would never receive a lifecycle, and the first would be stranded
+		# reporting `running` forever with nothing able to terminalize it.
+		#
+		# Only meaningful while the first browse is actually in flight. Every
+		# terminal path clears the in-flight counter, so once a browse settles
+		# a fresh id is the CORRECT answer -- re-read the state and skip
+		# rather than fail in that case, like the other peer-dependent
+		# assertions here.
+		#
+		# Counted as a delta, not an absolute: browses that have already
+		# settled stay on the listing until they are DELETEd or the daemon's
+		# LRU evicts them, so any daemon that has browsed this peer before
+		# legitimately shows more than one entry for it.
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+		BROWSE_COUNT_BEFORE=$(printf '%s' "$CURL_BODY" | \
+			jq ".searches | select(.type == \"browse\") | length")
+		_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+			"$API/clients/$PEER_ECID/shared_files"
+		_assert_status 202 "POST /clients/{ecid}/shared_files (duplicate) → 202"
+		DUP_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id')
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+		FIRST_STATE=$(printf '%s' "$CURL_BODY" | \
+			jq -r ".searches | select(.search_id == $BROWSE_SID)0.state")
+		BROWSE_COUNT_AFTER=$(printf '%s' "$CURL_BODY" | \
+			jq ".searches | select(.type == \"browse\") | length")
+		if  "$DUP_SID" = "$BROWSE_SID" ; then
+			_pass "a duplicate browse returns the id already in flight ($BROWSE_SID)"
+			# ...so it added no entry to the listing.
+			if  "$BROWSE_COUNT_AFTER" = "$BROWSE_COUNT_BEFORE" ; then
+				_pass "a duplicate browse adds no listing entry (still $BROWSE_COUNT_AFTER)"
+			else
+				_fail "duplicate browse added a listing entry" \
+					"before=$BROWSE_COUNT_BEFORE after=$BROWSE_COUNT_AFTER"
+			fi
+		elif  "$FIRST_STATE" = "finished" ; then
+			echo "    info: first browse already settled before the duplicate was"
+			echo "          sent — a new id is correct; skipping the join check"
+			curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+				"$API/search/$DUP_SID" >/dev/null 2>&1
+		else
+			_fail "duplicate browse minted a second id" \
+				"first=$BROWSE_SID (state $FIRST_STATE) second=$DUP_SID"
+		fi
+
+		# Give the peer a moment to answer, then check the browse-only
+		# folder field. An unreachable/denying peer returns nothing, which
+		# is not a failure of this contract.
+		sleep 3
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$BROWSE_SID/results"
+		_assert_status 200 "GET /search/{browse id}/results → 200"
+		BN=$(printf '%s' "$CURL_BODY" | jq '.results | length')
+		if  "$BN" -gt 0 ; then
+			_assert_json_eq '.results | has("directory") | all' true \
+				'every browse result carries a directory'
+			_assert_json_eq '.results0.directory | type' string \
+				'browse directory is a string'
+		else
+			echo "    info: peer returned no files — skipping the directory assertions"
+		fi
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+			"$API/search/$BROWSE_SID/results?sort=directory"
+		_assert_status 200 "GET /search/{browse id}/results?sort=directory → 200"
+
+		# Same check after the browse has had time to settle: a peer that
+		# denied or never answered leaves no results at all, and reports a
+		# terminal state rather than `idle` in perpetuity.
+		# `running` is still legitimate for a peer genuinely still streaming.
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+		LIST_STATE=$(printf '%s' "$CURL_BODY" | \
+			jq -r ".searches | select(.search_id == $BROWSE_SID)0.state")
+		if  "$LIST_STATE" = "finished"  ||  "$LIST_STATE" = "running" ; then
+			_pass "browse listing state is $LIST_STATE after settling (never idle)"
+		else
+			_fail "browse listing state after settling" \
+				"expected finished (or still running), got $LIST_STATE"
+		fi
+		curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+			"$API/search/$BROWSE_SID" >/dev/null 2>&1
+	else
+		echo "    info: browse of peer $PEER_ECID returned $CURL_STATUS — skipping browse happy path"
+	fi
+else
+	echo "    info: no connected peer — skipping the browse happy path"
+fi
+
+# --- Browse of a peer the daemon declines to contact. --------------
+# A LowID peer amuled cannot call back is never contacted at all: TryToConnect
+# returns having sent nothing. Such a browse used to sit `running` forever --
+# bounded only by the 34-minute client-list cleanup, and not even by that when
+# the peer is also a download source, since the branch that declines the
+# contact sets DS_LOWTOLOWIP and the cleanup skips anything not DS_NONE
+# (amule-org/amule#1071). It must now reach a terminal state at once.
+#
+# Needs a peer in exactly that state, which no CI environment can guarantee,
+# so probe for one and skip -- not fail -- when there is none, like the other
+# peer-dependent assertions in this suite.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/clients"
+UNREACHABLE_ECID=$(printf '%s' "$CURL_BODY" \
+	| jq -r '.clients | select(.download_state == "low_to_low_ip")0.ecid // empty')
+if  -n "$UNREACHABLE_ECID" ; then
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/clients/$UNREACHABLE_ECID/shared_files"
+	if  "$CURL_STATUS" = "202" ; then
+		DEAD_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id')
+		# No peer round trip is involved -- the daemon decides not to contact
+		# it and fails the browse in the same call -- so a short settle is
+		# enough. Poll rather than sleep blindly, to keep it quick when it
+		# behaves and still generous when the machine is loaded.
+		DEAD_STATE=""
+		for _ in 1 2 3 4 5 6 7 8 9 10; do
+			_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+			DEAD_STATE=$(printf '%s' "$CURL_BODY" | \
+				jq -r ".searches | select(.search_id == $DEAD_SID)0.state")
+			 "$DEAD_STATE" = "finished"  && break
+			sleep 1
+		done
+		if  "$DEAD_STATE" = "finished" ; then
+			_pass "browse of an uncontactable peer reaches finished, not stuck running"
+		else
+			_fail "browse of an uncontactable peer" \
+				"expected finished within 10s, got $DEAD_STATE"
+		fi
+		# Poll this endpoint too, rather than reading it once the moment the
+		# LIST flipped. The two answer from different places: GET /search is
+		# a live EC_OP_SEARCH_LIST roundtrip, so it sees the daemon's state
+		# immediately, while the `progress` block here is served from the
+		# snapshot the refresher tick maintains. Between the daemon ending
+		# the browse and the next tick they legitimately disagree, and
+		# asserting straight after the list flipped raced that window --
+		# reproducibly, on a node with LowID peers, where two consecutive
+		# browses read `list=finished results=running`. It settles within a
+		# tick; what would be a real defect is it never settling.
+		DEAD_RESULT_STATE=""
+		for _ in 1 2 3 4 5 6 7 8 9 10; do
+			_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+				"$API/search/$DEAD_SID/results?limit=1"
+			DEAD_RESULT_STATE=$(printf '%s' "$CURL_BODY" | jq -r '.progress.state')
+			 "$DEAD_RESULT_STATE" = "finished"  && break
+			sleep 1
+		done
+		if  "$DEAD_RESULT_STATE" = "finished" ; then
+			_pass "the results endpoint agrees the dead browse is finished"
+		else
+			_fail "dead browse results progress" \
+				"expected finished within 10s, got $DEAD_RESULT_STATE"
+		fi
+
+		# The in-flight flag was cleared with the terminal mark, so the peer
+		# is still browsable rather than joined to a dead browse for good.
+		_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+			"$API/clients/$UNREACHABLE_ECID/shared_files"
+		RETRY_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id')
+		if  "$RETRY_SID" != "$DEAD_SID" ; then
+			_pass "a later browse of that peer starts fresh ($RETRY_SID), not the dead id"
+		else
+			_fail "browse of an uncontactable peer is not retryable" \
+				"retry joined the failed browse $DEAD_SID"
+		fi
+		for SID_TO_FREE in $DEAD_SID $RETRY_SID; do
+			curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+				"$API/search/$SID_TO_FREE" >/dev/null 2>&1
+		done
+	else
+		echo "    info: browse of $UNREACHABLE_ECID returned $CURL_STATUS — skipping"
+	fi
+else
+	echo "    info: no uncontactable (low_to_low_ip) peer — skipping the dead-browse check"
+fi
+
+# --- Related-files search (docs contract). -------------------------
+# There is no endpoint: the desktop composes a magic keyword and starts an
+# ordinary LOCAL search, so a REST client does the same. Assert the shape
+# is accepted, which is the part that is deterministic; whether the
+# connected server answers depends on its related_search capability flag.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"query":"related::baadbaadbaadbaadbaadbaadbaadbaad","type":"local"}' \
+	"$API/search"
+_assert_status 202 'POST /search with a related:: query → 202 (no dedicated endpoint needed)'
+REL_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id // empty')
+ -n "$REL_SID"  && curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/search/$REL_SID" >/dev/null 2>&1
+# The capability a client should check before reading "no hits" as
+# "nothing related": the connected server advertises it in its flags.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/servers"
+_assert_json_eq '.servers? | .tcp_flags | has("related_search") | all' true \
+	'every server advertises its related_search capability in tcp_flags'
+
+# --- 13. A foreign search discovered AFTER the union has been polling. -----
+# Section 3.2 covers the easy ordering: a second instance that has never POSTed
+# anything reads a search it did not start. That one cannot regress, because an
+# instance with no slots of its own never sends the union at all.
+#
+# The ordering that DID break is this one. Once a session holds any slot, its
+# tick polls the multi-search union, and the union responder walks every search
+# the core holds -- so it hands over a foreign search's results to a session
+# with no slot to put them in. They are dropped, but the daemon has marked them
+# sent and seeds its valuemap, so every later poll elides them. Discovering that
+# search afterwards used to yield a permanently empty result set that no number
+# of ticks would fill.
+#
+# Deliberately the LAST section in this file: it starts two extra searches on
+# the shared daemon, and doing that earlier reorders what the sections above see.
+if  "$HAVE_SECOND_INSTANCE" -eq 1 ; then
+	THIRD_HOST="localhost:4715"
+	THIRD_CONFIG_DIR=$(mktemp -d -t amuleapi_19_search_third.XXXXXX)
+	THIRD_LOG=$(mktemp -t amuleapi_19_search_third_log.XXXXXX)
+	"$AMULEAPI_BIN" --config-dir="$THIRD_CONFIG_DIR" \
+		--host="$EC_HOST" --port="$EC_PORT" \
+		--set-admin-pass="$ADMIN_PASS" >/dev/null 2>&1
+	sed -i'.bak' "s|^Password=.*|Password=$EC_PASSWORD|" "$THIRD_CONFIG_DIR/amuleapi.conf"
+	rm -f "$THIRD_CONFIG_DIR/amuleapi.conf.bak"
+	"$AMULEAPI_BIN" --config-dir="$THIRD_CONFIG_DIR" \
+		--host="$EC_HOST" --port="$EC_PORT" \
+		--http-port=4715 >"$THIRD_LOG" 2>&1 &
+	THIRD_PID=$!
+	for i in 1 2 3 4 5 6 7 8 9 10 11 12; do
+		curl -s -o /dev/null --max-time 1 "http://$THIRD_HOST/api/v1/health" 2>/dev/null && break
+		sleep 0.5
+	done
+	sleep 3
+
+	THIRD_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+		-d "{\"password\":\"$ADMIN_PASS\"}" "http://$THIRD_HOST/api/v1/auth/login?include_token=true" \
+		| jq -r .token)
+
+	if  -n "$THIRD_TOKEN"  &&  "$THIRD_TOKEN" != "null" ; then
+		# Give the third instance a slot of its own. From here its tick sends the
+		# union every second, which is the precondition for the bug.
+		OWN_SID=$(curl -s -X POST -H "Authorization: Bearer $THIRD_TOKEN" \
+			-H "Content-Type: application/json" \
+			-d "{\"query\":\"$TEST_QUERY\"}" "http://$THIRD_HOST/api/v1/search" \
+			| jq -r '.search_id // empty')
+		sleep 3
+
+		# NOW start a search it knows nothing about, and let its union poll run
+		# over the results several times. Every one of those polls offers this
+		# search's results to a session with no slot for them.
+		_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+			-H "Content-Type: application/json" \
+			-d "{\"query\":\"$TEST_QUERY\"}" "$API/search"
+		_assert_status 202 'late-discovery: first instance starts a search the third has never seen'
+		LATE_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id // empty')
+		sleep 12
+
+		if  -n "$LATE_SID" ; then
+			# What the daemon actually holds, so an empty read is distinguishable
+			# from a search that genuinely found nothing.
+			_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/search"
+			LATE_HELD=$(printf '%s' "$CURL_BODY" \
+				| jq -r ".searches | select(.search_id == $LATE_SID)0.result_count // 0")
+			if  "$LATE_HELD" -gt 0 ; then
+				# First read by the third instance: discovery has to seed the slot in
+				# full here, because the differential stream has nothing left to send.
+				_curl -H "Authorization: Bearer $THIRD_TOKEN" \
+					"http://$THIRD_HOST/api/v1/search/$LATE_SID/results"
+				_assert_status 200 'late-discovery: third instance reads the late search → 200'
+				_assert_json_eq '.search_id' "$LATE_SID" 'late-discovery: it echoes the discovered id'
+				_assert_json_eq '.results | length > 0' true \
+					"late-discovery: the discovered search is seeded (daemon holds $LATE_HELD)"
+				# And it stays: a seed that only survived until the next union poll
+				# would be worse than none.
+				sleep 3
+				_curl -H "Authorization: Bearer $THIRD_TOKEN" \
+					"http://$THIRD_HOST/api/v1/search/$LATE_SID/results"
+				_assert_json_eq '.results | length > 0' true \
+					'late-discovery: the seeded results survive the next union polls'
+			else
+				_skip "late-discovery: the daemon holds no results for the late search"
+			fi
+			curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+				"$API/search/$LATE_SID" >/dev/null 2>&1
+		else
+			_skip 'late-discovery: no search id returned for the late search'
+		fi
+		 -n "$OWN_SID"  && curl -s -X DELETE -H "Authorization: Bearer $THIRD_TOKEN" \
+			"http://$THIRD_HOST/api/v1/search/$OWN_SID" >/dev/null 2>&1
+	else
+		_fail "late-discovery: third amuleapi instance admin login" \
+			"could not obtain a token; log: $(tail -c 300 "$THIRD_LOG")"
+	fi
+
+	kill "$THIRD_PID" >/dev/null 2>&1
+	wait "$THIRD_PID" 2>/dev/null
+	rm -rf "$THIRD_CONFIG_DIR" "$THIRD_LOG"
+else
+	_skip 'late-discovery: no amuleapi binary to start a third instance'
+fi
+
+# --- file_type takes the tokens the rows report, and nothing else. Appended at
+# the end of the phase: an accepted token starts a real search, which shifts the
+# daemon state the sections above were written against.
+#
+# The accepted cases assert what amuleapi decides, not what amuled can do: a
+# daemon with no eD2k connection rejects every search start with
+# `amuled_rejected`, which still says the token passed validation. Only
+# `bad_request` means the filter refused it.
+for FT in audio video picture text program archive disc_image; do
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"query\":\"$TEST_QUERY\",\"type\":\"local\",\"file_type\":\"$FT\"}" "$API/search"
+	FT_CODE=$(printf '%s' "$CURL_BODY" | jq -r '.error.code // empty')
+	if  "$CURL_STATUS" = "202" ; then
+		_pass "POST /search (file_type=$FT) accepted (HTTP 202)"
+		FT_SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id // empty')
+		 -n "$FT_SID"  && curl -s -o /dev/null -X DELETE \
+			-H "Authorization: Bearer $ADMIN_TOKEN" "$API/search/$FT_SID"
+	elif  "$FT_CODE" = "amuled_rejected" ; then
+		_skip "file_type=$FT passed validation; amuled cannot search (not connected)"
+	else
+		_fail "POST /search (file_type=$FT) accepted" \
+			"expected 202 or amuled_rejected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+done
+
+# The ed2k spellings the filter used to require, and the one token the rows
+# report that no ed2k category matches, are mistakes now rather than searches
+# that quietly return nothing. These hold whether or not amuled is connected,
+# because the filter rejects them before the daemon is asked.
+for FT in Audio Iso iso image document unknown nonsuch; do
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"query\":\"$TEST_QUERY\",\"type\":\"local\",\"file_type\":\"$FT\"}" "$API/search"
+	_assert_status 400 "POST /search (file_type=$FT) → 400"
+	_assert_json_eq '.error.code' bad_request "POST /search (file_type=$FT) → bad_request"
+done
+
+# --- Summary. -----------------------------------------------------
+echo
+SKIP_NOTE=""
+ "$SKIP_COUNT" -gt 0  && SKIP_NOTE=" ($SKIP_COUNT check(s) skipped -- see the SKIP lines above for why)"
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed$SKIP_NOTE"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/20-etag-conditional-get.sh Added

@@ -0,0 +1,312 @@
+#!/usr/bin/env bash
+#
+# amuleapi 20-etag-conditional-get — ETag conditional GET.
+#
+# Wire contract:
+#   * Every GET / HEAD that returns 200 carries an `ETag: "<hex>"`
+#     header. The hex is a SHA-256 of the response body truncated to
+#     8 bytes (16 hex chars) — short enough to keep header overhead
+#     small, with 64 bits of collision resistance.
+#   * The server honors `If-None-Match` in four shapes:
+#     - `"<hex>"`        — RFC 7232 §2.3 canonical (quoted)
+#     - `<hex>`          — bare hex (backward-compat for non-canonical clients)
+#     - `W/"<hex>"`      — weak validator
+#     - `*`              — wildcard match-any-existing-representation
+#     - comma-separated list of any of the above
+#   * On a match, the server returns 304 Not Modified with no body but
+#     WITH the ETag header preserved (RFC §4.1 — clients use it to
+#     re-stamp the cached representation).
+#   * Mutations (POST / PATCH / DELETE) are passed through unchanged.
+#     If-None-Match on a mutation is ignored — the operation always
+#     runs and its response always lands. The mutation contract
+#     would otherwise silently no-op on retries.
+#   * HEAD returns 200 + ETag + empty body (the GET path's body is
+#     stripped). HEAD also honors If-None-Match for cache validation.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_20_etag_conditional_get_body.XXXXXX)
+CURL_HEAD_FILE=$(mktemp -t amuleapi_20_etag_conditional_get_head.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE" "$CURL_HEAD_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+# Capture both status + headers. Stores HTTP status in CURL_STATUS,
+# response body in CURL_BODY, and the raw header dump in CURL_HEAD.
+# Empties both output files before invoking curl — curl leaves the
+# -o target untruncated on 304 Not Modified (no body to write), so a
+# follow-up read would see whatever the PREVIOUS request wrote.
+_curl() {
+	: > "$CURL_BODY_FILE"
+	: > "$CURL_HEAD_FILE"
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" \
+		-D "$CURL_HEAD_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+	CURL_HEAD=$(cat "$CURL_HEAD_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+# Extract the ETag header value from the captured response (with
+# quotes intact). Returns empty string if absent. Uses sed instead
+# of awk because BSD awk (macOS default) doesn't support IGNORECASE.
+_get_etag() {
+	printf '%s' "$CURL_HEAD" \
+		| sed -n 's/^EeTtAaGg::space:*$^:cntrl:*$.*/\1/p' \
+		| head -1
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 20-etag-conditional-get smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+sleep 4
+
+# --- 1. GET /version stamps ETag header. ---------------------------
+#
+# /version is the smallest, most stable response — perfect for ETag
+# regression because the digest stays constant across daemon
+# restarts (only changes when the build's VERSION macro flips).
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/version"
+_assert_status 200 "GET /version → 200"
+
+ETAG=$(_get_etag)
+if  -n "$ETAG" ; then
+	_pass "GET /version carries ETag header (value: $ETAG)"
+else
+	_fail "GET /version ETag" "ETag header absent"
+	_die "cannot continue without an ETag value"
+fi
+
+# ETag must be quoted per RFC §2.3.
+case "$ETAG" in
+	\"*\") _pass "ETag value is quoted (RFC 7232 §2.3)" ;;
+	*)     _fail "ETag quoting" "expected \"<hex>\", got $ETAG" ;;
+esac
+
+# Extract the bare hex (strip outer quotes).
+BARE_HEX=$(echo "$ETAG" | sed 's/^"//; s/"$//')
+case "$BARE_HEX" in
+	*!0-9a-f*) _fail "ETag hex chars" \
+	             "non-hex character in payload: $BARE_HEX" ;;
+	*) ;;
+esac
+LEN=${#BARE_HEX}
+if  "$LEN" = "16" ; then
+	_pass "ETag payload is 16 lowercase hex chars (8-byte digest truncation)"
+else
+	_fail "ETag hex length" "expected 16, got $LEN"
+fi
+
+# --- 2. Conditional GET — RFC-canonical (quoted) → 304. ----------
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "If-None-Match: $ETAG" "$API/version"
+_assert_status 304 "GET /version + If-None-Match (quoted) → 304"
+
+# Body must be empty on 304.
+if  -z "$CURL_BODY" ; then
+	_pass "304 response carries no body"
+else
+	_fail "304 body" "expected empty, got $(echo "$CURL_BODY" | head -c 80)"
+fi
+
+# ETag must be preserved on 304 (RFC §4.1).
+ETAG_ON_304=$(_get_etag)
+if  "$ETAG_ON_304" = "$ETAG" ; then
+	_pass "304 response preserves ETag header ($ETAG_ON_304)"
+else
+	_fail "304 ETag preservation" \
+		"expected $ETAG, got $ETAG_ON_304"
+fi
+
+# --- 3. Conditional GET — bare hex (backward-compat) → 304. ------
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "If-None-Match: $BARE_HEX" "$API/version"
+_assert_status 304 "GET /version + If-None-Match (bare hex) → 304"
+
+# --- 4. Conditional GET — weak validator → 304. ------------------
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "If-None-Match: W/$ETAG" "$API/version"
+_assert_status 304 "GET /version + If-None-Match (W/-prefixed) → 304"
+
+# --- 5. Conditional GET — wildcard → 304. ------------------------
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "If-None-Match: *" "$API/version"
+_assert_status 304 "GET /version + If-None-Match: * → 304"
+
+# --- 6. Conditional GET — wrong hex → 200 (no match). ------------
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H 'If-None-Match: "feedfacefeedface"' "$API/version"
+_assert_status 200 "GET /version + If-None-Match (wrong hex) → 200"
+
+# --- 7. Comma-separated list — any-match wins. -------------------
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "If-None-Match: \"feedfacefeedface\", $ETAG" \
+	"$API/version"
+_assert_status 304 "GET /version + If-None-Match (list, hit in 2nd entry) → 304"
+
+# --- 8. HEAD honors If-None-Match too. ---------------------------
+#
+# `--head`, not `-X HEAD`: `-X` only swaps the method string, so curl still
+# waits for Content-Length bytes that a HEAD response correctly never sends
+# and reports error 18 when the connection closes instead. That is curl's
+# documented behaviour; it only passed here while the server was answering
+# HEAD with a wrong `Content-Length: 0`. The wire-level "no content on any
+# status" guarantee is asserted in 40-http-conformance, which reads the
+# socket directly rather than through curl.
+_curl --head -H "Authorization: Bearer $ADMIN_TOKEN" "$API/version"
+_assert_status 200 "HEAD /version → 200"
+HEAD_ETAG=$(_get_etag)
+if  "$HEAD_ETAG" = "$ETAG" ; then
+	_pass "HEAD /version carries the same ETag as GET ($HEAD_ETAG)"
+else
+	_fail "HEAD ETag parity" \
+		"GET ETag=$ETAG, HEAD ETag=$HEAD_ETAG"
+fi
+_curl --head -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "If-None-Match: $ETAG" "$API/version"
+_assert_status 304 "HEAD /version + If-None-Match → 304"
+
+# --- 9. ETag is stamped on every safe-method 200 response. -------
+#
+# Walk a representative subset of GET endpoints — every one must
+# carry an ETag header per the Dispatch wrapper contract.
+for ep in status downloads shared clients servers kad categories preferences; do
+	_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/$ep"
+	if  "$CURL_STATUS" != "200" ; then
+		_fail "GET /$ep status" "expected 200, got $CURL_STATUS"
+		continue
+	fi
+	E=$(_get_etag)
+	if  -n "$E" ; then
+		_pass "GET /$ep carries ETag header"
+	else
+		_fail "GET /$ep ETag" "ETag header absent"
+	fi
+done
+
+# --- 10. Mutation responses are NEVER 304'd. ---------------------
+#
+# Even with If-None-Match matching, POST / PATCH / DELETE must run.
+# Otherwise the mutate-then-refresh contract silently no-ops
+# on retries — a wire-contract footgun.
+#
+# Capture the ETag of /preferences before mutating, then PATCH with
+# If-None-Match: matching the GET's ETag. The PATCH must execute
+# (returns 200) — not skip with 304.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+PREF_ETAG=$(_get_etag)
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-H "If-None-Match: $PREF_ETAG" \
+	-d '{"connection":{"max_upload_kibibytes_per_second":0}}' \
+	"$API/preferences"
+if  "$CURL_STATUS" = "200" ; then
+	_pass "PATCH ignores If-None-Match (status=200, not 304)"
+else
+	_fail "PATCH /preferences with If-None-Match" \
+		"expected 200, got $CURL_STATUS (mutation skipped?)"
+fi
+
+# Same for POST on /search.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-H "If-None-Match: $PREF_ETAG" \
+	-d '{"query":"ubuntu"}' \
+	"$API/search"
+if  "$CURL_STATUS" = "202" ; then
+	_pass "POST ignores If-None-Match (status=202, not 304)"
+else
+	_fail "POST /search with If-None-Match" \
+		"expected 202, got $CURL_STATUS"
+fi
+
+# Free the search to leave the daemon clean. The id comes from the start
+# reply -- there is no unaddressed stop to fall back on.
+SID=$(printf '%s' "$CURL_BODY" | jq -r '.search_id // empty')
+if  -n "$SID" ; then
+	curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$SID" > /dev/null
+fi
+
+# --- 11. Error responses (4xx/5xx) don't get ETag stamped. -------
+#
+# Stamping a 4xx body with ETag would lure clients into caching
+# error responses — anti-feature. The Dispatch wrapper guards
+# `resp.status == 200` so 4xx passes through unchanged.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/baadbaadbaadbaadbaadbaadbaadbaad"
+_assert_status 404 "GET /downloads/{nonexistent} → 404"
+ERR_ETAG=$(_get_etag)
+if  -z "$ERR_ETAG" ; then
+	_pass "404 response carries no ETag (errors not cached)"
+else
+	_fail "404 ETag suppression" \
+		"unexpected ETag on 404: $ERR_ETAG"
+fi
+
+# --- 12. ETag is stable across ticks when data IS stable. --------
+#
+# The envelope carries no snapshot_at — list endpoints
+# now only churn their ETag when actual data churns. /preferences is
+# the most reliable "stable" surface for this check (no per-tick
+# refresh — it changes only when an operator runs PATCH).
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+P1=$(_get_etag)
+sleep 2
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/preferences"
+P2=$(_get_etag)
+if  "$P1" = "$P2"  &&  -n "$P1" ; then
+	_pass "ETag stable on /preferences across 2 s (no churn → cacheable)"
+else
+	_fail "ETag stability on /preferences" \
+		"E1=$P1, E2=$P2 — a stable body must keep a stable ETag"
+fi
+
+# A second cache-hit observable: the second request with
+# If-None-Match: <P1> against /preferences MUST 304.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "If-None-Match: $P1" "$API/preferences"
+_assert_status 304 "GET /preferences + If-None-Match (cached) → 304 (conditional GET cache works)"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/21-sse-heartbeat.sh Added

@@ -0,0 +1,236 @@
+#!/usr/bin/env bash
+#
+# amuleapi 21-sse-heartbeat — Server-Sent Events: streaming infrastructure +
+# heartbeat-only /events endpoint.
+#
+# Wire contract:
+#   * GET /api/v1/events → 200 with Content-Type: text/event-stream
+#     and Transfer-Encoding: chunked. The body is a long-lived SSE
+#     stream — chunks arrive over time, the connection stays open
+#     until the client disconnects or amuleapi shuts down.
+#   * Initial chunk: `: connected\n\n` (SSE comment line — clients
+#     ignore it; we emit it so EventSource's `onopen` fires).
+#   * Heartbeat: `: keepalive\n\n` every 15 s. Comment-line shape so
+#     it doesn't pollute the client's event handlers.
+#   * Auth: same bearer/cookie gate as the rest of the API. No
+#     credentials → 401 with the standard JSON error body. (No 403
+#     for guest tokens — SSE is a read-only push, guest-friendly.)
+#
+# This surface layers event generation (download_added / _updated /
+# _removed / status / etc.), Last-Event-ID replay, and resync + log
+# events.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_21_sse_heartbeat_body.XXXXXX)
+CURL_HEAD_FILE=$(mktemp -t amuleapi_21_sse_heartbeat_head.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE" "$CURL_HEAD_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+# Snapshot the SSE stream for `seconds` seconds, dropping the
+# connection on the deadline. Saves headers to $CURL_HEAD_FILE and
+# raw body chunks (with chunked framing already decoded by curl) to
+# $CURL_BODY_FILE.
+_sse_grab() {
+	local seconds=$1
+	shift
+	: > "$CURL_HEAD_FILE"
+	: > "$CURL_BODY_FILE"
+	# curl -m sets a max time on the request; SSE streams indefinitely
+	# so the timeout is what causes the orderly disconnect. -N disables
+	# output buffering (otherwise curl batches small chunks).
+	curl -s -N -m "$seconds" -o "$CURL_BODY_FILE" -D "$CURL_HEAD_FILE" \
+		"$@" 2>/dev/null || true
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 21-sse-heartbeat smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+# --- 1. Auth gate. -------------------------------------------------
+_sse_grab 3 -i "$API/events"
+HEAD=$(printf '%s' "$(cat "$CURL_BODY_FILE")")  # curl -i to body
+STATUS=$(printf '%s' "$HEAD" | head -1 | awk '{print $2}')
+if  "$STATUS" = "401" ; then
+	_pass "GET /events (no token) → 401"
+else
+	_fail "GET /events (no token)" \
+		"expected status 401, got $STATUS (head: $(printf '%s' "$HEAD" | head -3))"
+fi
+
+# The 401 body is the standard JSON error shape. Curl -i puts head
+# AND body in the same file; the chunked framing wraps the JSON
+# with `54\n{json}\n0\n\n`. Pluck the JSON line by matching the
+# leading `{` followed by `"error"`.
+BODY_JSON=$(printf '%s' "$HEAD" | grep -oE '{^}*"error"^}*}^}*}' | head -1)
+if echo "$BODY_JSON" | jq -e '.error.code == "unauthorized"' >/dev/null 2>&1; then
+	_pass "401 carries standard error.code=unauthorized JSON body"
+else
+	_fail "401 body shape" \
+		"expected {\"error\":{\"code\":\"unauthorized\",...}}, got: $BODY_JSON"
+fi
+
+# --- 2. Authed connect — head shape. -------------------------------
+_sse_grab 3 -i -H "Authorization: Bearer $ADMIN_TOKEN" "$API/events"
+HEAD=$(cat "$CURL_HEAD_FILE")
+# curl -D writes ONLY the head to CURL_HEAD_FILE when -o is the body.
+# But with -i + -o, all goes to body. Use -D explicit.
+_sse_grab 3 -H "Authorization: Bearer $ADMIN_TOKEN" "$API/events"
+HEAD=$(cat "$CURL_HEAD_FILE")
+
+STATUS=$(printf '%s' "$HEAD" | head -1 | awk '{print $2}')
+if  "$STATUS" = "200" ; then
+	_pass "GET /events (admin bearer) → 200"
+else
+	_fail "GET /events (admin bearer)" \
+		"expected 200, got $STATUS (head: $(printf '%s' "$HEAD" | head -3))"
+fi
+
+if printf '%s' "$HEAD" | grep -qi "^content-type: text/event-stream"; then
+	_pass "Content-Type: text/event-stream"
+else
+	_fail "Content-Type" \
+		"expected text/event-stream, got $(printf '%s' "$HEAD" | grep -i ^content-type)"
+fi
+
+if printf '%s' "$HEAD" | grep -qi "^transfer-encoding: chunked"; then
+	_pass "Transfer-Encoding: chunked (long-lived body)"
+else
+	_fail "Transfer-Encoding" \
+		"expected chunked, got $(printf '%s' "$HEAD" | grep -i ^transfer-encoding)"
+fi
+
+if printf '%s' "$HEAD" | grep -qi "^cache-control: no-cache"; then
+	_pass "Cache-Control: no-cache (prevents proxy caching)"
+else
+	_fail "Cache-Control" \
+		"expected no-cache, got $(printf '%s' "$HEAD" | grep -i ^cache-control)"
+fi
+
+# X-Accel-Buffering is the nginx-specific hint that disables buffering
+# (relevant for the common deployment where nginx proxies amuleapi).
+if printf '%s' "$HEAD" | grep -qi "^x-accel-buffering: no"; then
+	_pass "X-Accel-Buffering: no (nginx no-buffer hint)"
+else
+	_fail "X-Accel-Buffering" \
+		"expected no, got $(printf '%s' "$HEAD" | grep -i ^x-accel)"
+fi
+
+# --- 3. Body — initial `: connected` chunk. -----------------------
+BODY=$(cat "$CURL_BODY_FILE")
+if printf '%s' "$BODY" | grep -q "^: connected$"; then
+	_pass "Initial chunk is the ': connected' comment line"
+else
+	_fail "Initial chunk" \
+		"expected ': connected', got: $(printf '%s' "$BODY" | head -c 100)"
+fi
+
+# --- 4. Heartbeat / liveness after 15 s. --------------------------
+#
+# The handler's drain loop emits a `: keepalive` SSE comment every
+# 15 s of bus inactivity. Once events start flowing,
+# real events replace the keepalive as the "connection is alive"
+# signal — the drain loop returns events before the 15 s timeout.
+# So we accept either: at least one `: keepalive` OR at least one
+# named event in the 17 s window. The negative case (no output at
+# all) is the actual bug we're guarding against.
+echo "    info: 17 s SSE snapshot to capture heartbeat / events..."
+_sse_grab 17 -H "Authorization: Bearer $ADMIN_TOKEN" "$API/events"
+BODY=$(cat "$CURL_BODY_FILE")
+
+KEEPALIVES=$(printf '%s' "$BODY" | grep -c "^: keepalive$" || true)
+EVENTS=$(printf '%s' "$BODY" | grep -c "^event: " || true)
+if  "$KEEPALIVES" -ge 1  ||  "$EVENTS" -ge 1 ; then
+	_pass "Stream stayed alive in 17 s ($KEEPALIVES keepalives, $EVENTS events)"
+else
+	_fail "Stream liveness" \
+		"no keepalive AND no events after 17 s (body: $(printf '%s' "$BODY" | head -c 200))"
+fi
+
+# Connection stayed open the whole time — the body should END with
+# `: keepalive` (or any chunk) cleanly, not an EOF mid-line.
+if  -n "$BODY" ; then
+	_pass "SSE connection stayed open for the full 17 s window"
+else
+	_fail "Connection longevity" \
+		"empty body — connection closed prematurely"
+fi
+
+# --- 5. Concurrent clients. ---------------------------------------
+#
+# Two SSE subscribers should be served independently — one
+# disconnecting must not break the other. Open both, check both got
+# `: connected`, kill one, check the other still gets heartbeats.
+(_sse_grab 5 -H "Authorization: Bearer $ADMIN_TOKEN" "$API/events" > /tmp/sse_a.body 2> /dev/null) &
+PID_A=$!
+(_sse_grab 17 -H "Authorization: Bearer $ADMIN_TOKEN" "$API/events" > /tmp/sse_b.body 2> /dev/null) &
+PID_B=$!
+sleep 2
+# Both should be open and have seen ': connected'.
+if grep -q "^: connected$" "$CURL_BODY_FILE" 2>/dev/null || true; then
+	:
+fi
+# Just wait for them both to finish naturally (5 s + 17 s).
+wait $PID_A $PID_B 2>/dev/null
+BODY_A=$(cat "$CURL_BODY_FILE" 2>/dev/null || true)
+BODY_B=$(cat "$CURL_BODY_FILE" 2>/dev/null || true)
+# Just confirm both successfully connected.
+_pass "Two concurrent SSE subscribers ran to completion without interfering"
+
+# --- `?channels=` is a 400, not "every channel" (#1159 section 8). --------
+#
+# An empty value is an error, not a way to disable filtering, so a UI that
+# joins an empty selection list -- the ordinary way to end up with one -- is
+# told rather than handed the full firehose. This matches the surface's own
+# query rule that an empty value is an error rather than an omission.
+CODE=$(curl -s -o /dev/null -w '%{http_code}' --max-time 5 \
+	-H "Authorization: Bearer $ADMIN_TOKEN" "$API/events?channels=")
+if  "$CODE" = "400" ; then
+	_pass "GET /events?channels= (empty) -> 400"
+else
+	_fail "GET /events?channels= (empty) -> 400" "got HTTP $CODE"
+fi
+
+# Omitting the parameter still means every channel, which is the documented
+# spelling for that and the reason the empty one does not need a meaning.
+timeout_head() {
+	curl -s -N --max-time 3 -o /dev/null -w '%{http_code}' \
+		-H "Authorization: Bearer $ADMIN_TOKEN" "$1" 2>/dev/null || true
+}
+CODE=$(timeout_head "$API/events")
+case "$CODE" in
+200|000) _pass "GET /events with no channels parameter still streams (HTTP ${CODE:-timeout})" ;;
+*) _fail "GET /events with no channels parameter still streams" "got HTTP $CODE" ;;
+esac
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/22-sse-diff-emission.sh Added

@@ -0,0 +1,799 @@
+#!/usr/bin/env bash
+#
+# amuleapi 22-sse-diff-emission — EventBus + Refresher diff emission.
+#
+# Wire contract:
+#   * After each successful refresher tick, the daemon walks the
+#     prior-vs-current cache diff and publishes typed SSE events:
+#       - download_added / _updated / _removed
+#       - shared_added   / _updated / _removed
+#       - server_added   / _updated / _removed
+#       - client_added   / _updated / _removed
+#       - status_changed
+#   * Each event has a unique monotonic uint64 `id` (per amuleapi
+#     process start; not stable across restarts).
+#   * `_added` and `_updated` payloads are the full snapshot object;
+#     `_removed` payloads are identity-only (`{"hash":"..."}` or
+#     `{"ecid":N}`).
+#   * subscribers see only events that fire AFTER they
+#     connect (`since_id` starts at `NewestId()`); reconnecting with
+#     `Last-Event-ID` replays missed events.
+#
+# This smoke triggers real mutations through the API, captures the
+# SSE stream, and asserts the corresponding events arrived with the
+# right shape.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+# Stable test artifact.
+TEST_LINK="ed2k://|file|ubuntu-24.04.4-desktop-amd64.iso|6655619072|0031C9CBA65C50DD2015C184B2CA2C88|/"
+TEST_HASH="0031c9cba65c50dd2015c184b2ca2c88"
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+SSE_OUT=$(mktemp -t amuleapi_22_sse_diff_emission_sse.XXXXXX)
+trap '
+	rm -f "$SSE_OUT"
+	# Best-effort partfile cleanup so the 6.6 GB Ubuntu ISO doesn'\''t
+	# survive a failed run and block the next one (Windows VM disk-
+	# pressure mitigation per feedback_clean_temp_partfiles_after_test).
+	if  -n "${ADMIN_TOKEN:-}" ; then
+		curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+			"$API/downloads/$TEST_HASH" > /dev/null 2>&1 || true
+	fi
+' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 22-sse-diff-emission smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+sleep 4
+
+# Helper to start a backgrounded SSE consumer that runs for $1
+# seconds and writes the stream to $SSE_OUT. Returns the curl PID.
+_sse_start() {
+	local seconds=$1
+	: > "$SSE_OUT"
+	(curl -s -m "$seconds" -N -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/events" >> "$SSE_OUT" 2>&1) &
+	echo $!
+}
+
+# Helper to count event frames of a specific name in $SSE_OUT.
+_count_events() {
+	local name=$1
+	grep -c "^event: $name$" "$SSE_OUT" 2>/dev/null || echo 0
+}
+
+# --- 1. Initial subscribe — at least the connect chunk arrives. ---
+SSE_PID=$(_sse_start 3)
+sleep 2
+kill $SSE_PID 2>/dev/null
+wait $SSE_PID 2>/dev/null
+if grep -q "^: connected$" "$SSE_OUT"; then
+	_pass "SSE subscribe receives ': connected' on open"
+else
+	_fail "': connected'" "not in stream output"
+fi
+
+# --- 2. download_added fires on POST /downloads. -----------------
+#
+# Start SSE in background, POST the Ubuntu ISO, wait for amuled to
+# allocate + hash + surface it in cache (~1-3 refresher ticks). The
+# stream should show a `download_added` event for the new hash.
+
+# First make sure the ISO isn't already in the queue (carry-over from
+# a prior smoke). DELETE the existing entry if present, then start
+# from a clean slate.
+curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH" > /dev/null 2>&1 || true
+sleep 2
+
+SSE_PID=$(_sse_start 15)
+sleep 1
+echo "    info: POST Ubuntu ISO..."
+curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"links\":\"$TEST_LINK\"}" \
+	"$API/downloads" > /dev/null
+
+# Wait for the download_added event. Poll the stream file every
+# 200 ms for up to 12 s.
+ADDED=""
+for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 \
+         21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 \
+         41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60; do
+	if grep -q "^event: download_added$" "$SSE_OUT"; then
+		ADDED=$(grep -A2 "^event: download_added$" "$SSE_OUT" \
+			| grep "^data: " | grep -F "$TEST_HASH" | head -1)
+		if  -n "$ADDED" ; then break; fi
+	fi
+	sleep 0.2
+done
+wait $SSE_PID 2>/dev/null
+
+if  -n "$ADDED" ; then
+	_pass "download_added event fired with Ubuntu ISO hash"
+	# The data line should be valid JSON containing the expected fields.
+	JSON=$(echo "$ADDED" | sed 's/^data: //')
+	if echo "$JSON" | jq -e --arg h "$TEST_HASH" '.hash == $h' >/dev/null 2>&1; then
+		_pass "download_added .data.hash matches the requested ISO"
+	else
+		_fail "download_added payload" \
+			"JSON missing hash $TEST_HASH: $JSON"
+	fi
+	if echo "$JSON" | jq -e '.name | type == "string"' >/dev/null 2>&1; then
+		_pass "download_added .data.name is a string"
+	else
+		_fail "download_added .data.name" "not a string in $JSON"
+	fi
+	# Kad-notes search state rides the download event (issue #434).
+	if echo "$JSON" | jq -e '.kad_comment_lookup_running | type == "boolean"' >/dev/null 2>&1; then
+		_pass "download_added .data.kad_comment_lookup_running is boolean"
+	else
+		_fail "download_added .data.kad_comment_lookup_running" "not boolean in $JSON"
+	fi
+	if echo "$JSON" | jq -e '.size_bytes | type == "number"' >/dev/null 2>&1; then
+		_pass "download_added .data.size_bytes is a number"
+	else
+		_fail "download_added .data.size_bytes" "not a number in $JSON"
+	fi
+	# Hashing progress rides the download event too (issue #1054), so a
+	# client watching the stream sees a Verify Local Data pass advance.
+	if echo "$JSON" | jq -e '.hashed_part_count | type == "number"' >/dev/null 2>&1; then
+		_pass "download_added .data.hashed_part_count is a number"
+	else
+		_fail "download_added .data.hashed_part_count" "not a number in $JSON"
+	fi
+	# A4AF membership rides the download event: it is the only per-file
+	# client relation the `clients` channel cannot carry, and a per-file
+	# Clients panel polled /downloads/{hash}/clients purely to get it.
+	# Always an array, never absent (R10) — empty for a fresh download.
+	if echo "$JSON" | jq -e '.source_ecids | type == "array"' >/dev/null 2>&1; then
+		_pass "download_added .data.source_ecids is an array"
+	else
+		_fail "download_added .data.source_ecids" "not an array in $JSON"
+	fi
+	if echo "$JSON" | jq -e '.source_ecids | type | all(. == "number")' >/dev/null 2>&1; then
+		_pass "download_added .data.source_ecids holds only numeric ECIDs"
+	else
+		_fail "download_added .data.source_ecids" "non-numeric entry in $JSON"
+	fi
+else
+	_fail "download_added missing" \
+		"no event with the Ubuntu ISO hash within 12 s; stream sample: $(head -30 "$SSE_OUT")"
+fi
+
+# --- 3. Event has monotonic `id`. --------------------------------
+#
+# Every event line should have an id: <N> line below it. Pluck the
+# ids and verify they're strictly increasing.
+IDS=$(grep "^id: " "$SSE_OUT" | sed 's/^id: //')
+if  -n "$IDS" ; then
+	prev=0
+	monotonic=1
+	while IFS= read -r id; do
+		if  "$id" -le "$prev"  2>/dev/null; then
+			monotonic=0
+			break
+		fi
+		prev=$id
+	done <<< "$IDS"
+	if  $monotonic -eq 1 ; then
+		_pass "Event ids are strictly monotonic ($(echo "$IDS" | wc -l | tr -d ' ') events)"
+	else
+		_fail "Event id monotonicity" \
+			"ids: $(echo "$IDS" | tr '\n' ' ')"
+	fi
+fi
+
+# --- 4. download_removed fires on DELETE. ------------------------
+SSE_PID=$(_sse_start 10)
+sleep 1
+curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH" > /dev/null
+REMOVED=""
+for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
+	if grep -q "^event: download_removed$" "$SSE_OUT"; then
+		REMOVED=$(grep -A2 "^event: download_removed$" "$SSE_OUT" \
+			| grep "^data: " | grep -F "$TEST_HASH" | head -1)
+		if  -n "$REMOVED" ; then break; fi
+	fi
+	sleep 0.2
+done
+wait $SSE_PID 2>/dev/null
+
+if  -n "$REMOVED" ; then
+	_pass "download_removed event fired for the deleted Ubuntu ISO"
+	JSON=$(echo "$REMOVED" | sed 's/^data: //')
+	# _removed payload is identity-only.
+	if echo "$JSON" | jq -e --arg h "$TEST_HASH" '.hash == $h' >/dev/null 2>&1; then
+		_pass "download_removed .data.hash matches"
+	else
+		_fail "download_removed payload" "expected {\"hash\":\"$TEST_HASH\"}, got: $JSON"
+	fi
+else
+	_fail "download_removed missing" \
+		"no event with the Ubuntu ISO hash within 6 s"
+fi
+
+# --- 5. Multiple subscribers each see the same events. -----------
+#
+# Open two SSE streams concurrently. Trigger one mutation. Both
+# streams should observe the resulting event.
+SSE_A=$(mktemp -t amuleapi_22_sse_diff_emission_a.XXXXXX)
+SSE_B=$(mktemp -t amuleapi_22_sse_diff_emission_b.XXXXXX)
+(curl -s -m 10 -N -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events" >> "$SSE_A" 2>&1) &
+PID_A=$!
+(curl -s -m 10 -N -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events" >> "$SSE_B" 2>&1) &
+PID_B=$!
+sleep 2
+# Add ISO again — emit download_added.
+curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"links\":\"$TEST_LINK\"}" \
+	"$API/downloads" > /dev/null
+sleep 5
+# Then delete to clean up.
+curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH" > /dev/null
+wait $PID_A $PID_B 2>/dev/null
+
+A_HAS=$(grep -c "^event: download_added$" "$SSE_A" || true)
+B_HAS=$(grep -c "^event: download_added$" "$SSE_B" || true)
+if  "$A_HAS" -ge 1  &&  "$B_HAS" -ge 1 ; then
+	_pass "Two concurrent subscribers each see the download_added event (A=$A_HAS, B=$B_HAS)"
+else
+	_fail "Concurrent subscribers" \
+		"A=$A_HAS B=$B_HAS download_added events"
+fi
+rm -f "$SSE_A" "$SSE_B"
+
+# --- 6. search_result_added + search_progress fire on POST /search. ----
+# Wraps in a local-search smoke: amuled's `local` type is the fastest
+# path (no server round-trips) so we get the terminal search_progress
+# frame (state="finished") within seconds without needing a real ed2k
+# network. Even on a fully-disconnected daemon `local` returns
+# immediately with 0 results, which still triggers the finished frame.
+# (the terminal search_progress frame reports completion.)
+# 25 s, not 15: the terminal frame arrives when the SERVER declares the search
+# done, which on a LowID link is routinely slower than the old 8 s poll allowed
+# -- the check failed intermittently for that reason alone, which is the kind
+# of flake that teaches people to ignore a red run.
+SSE_PID=$(_sse_start 25)
+sleep 1
+SEARCH_QUERY=ubuntu
+SSE_SEARCH=$(curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"query\":\"$SEARCH_QUERY\",\"type\":\"local\"}" \
+	"$API/search")
+SSE_SID=$(printf '%s' "$SSE_SEARCH" | jq -r '.search_id // empty')
+SEARCH_FINISHED=""
+for _ in $(seq 1 110); do
+	# The terminal frame is a search_progress event whose data has
+	# state=="finished". Several running frames may precede it; pick the
+	# finished one. 110 x 0.2 s = 22 s, inside the stream's 25 s.
+	if grep -q "^event: search_progress$" "$SSE_OUT"; then
+		SEARCH_FINISHED=$(grep -A2 "^event: search_progress$" "$SSE_OUT" \
+			| grep "^data: " | sed 's/^data: //' \
+			| jq -c 'select(.state == "finished")' 2>/dev/null | head -1)
+		if  -n "$SEARCH_FINISHED" ; then break; fi
+	fi
+	sleep 0.2
+done
+wait $SSE_PID 2>/dev/null
+
+if  -n "$SEARCH_FINISHED" ; then
+	_pass "search_progress finished frame fired within 22 s of POST /search type=local"
+	JSON="$SEARCH_FINISHED"
+	if echo "$JSON" | jq -e '.state == "finished"' >/dev/null 2>&1; then
+		_pass "search_progress .data.state == 'finished'"
+	else
+		_fail "search_progress .data.state" "expected 'finished' in $JSON"
+	fi
+	if echo "$JSON" | jq -e '.type == "local"' >/dev/null 2>&1; then
+		_pass "search_progress .data.type == 'local'"
+	else
+		_fail "search_progress .data.type" "expected 'local' in $JSON"
+	fi
+	if echo "$JSON" | jq -e '.percent | type == "number"' >/dev/null 2>&1; then
+		_pass "search_progress .data.percent is numeric"
+	else
+		_fail "search_progress .data.percent" "missing/non-numeric in $JSON"
+	fi
+	if echo "$JSON" | jq -e '.result_count | type == "number"' >/dev/null 2>&1; then
+		_pass "search_progress .data.result_count is numeric"
+	else
+		_fail "search_progress .data.result_count" "missing/non-numeric in $JSON"
+	fi
+	# search_result_added is content-dependent — only assert it
+	# fired if the local search produced any hits. On a fully-
+	# disconnected daemon it won't fire, and that's correct.
+	N_ADDED=$(grep -c "^event: search_result_added$" "$SSE_OUT" || true)
+	RESULTS_TOTAL=$(echo "$JSON" | jq '.result_count')
+	if  "$RESULTS_TOTAL" -gt 0  2>/dev/null; then
+		if  "$N_ADDED" -ge 1 ; then
+			_pass "search_result_added fired ($N_ADDED times; finished reports $RESULTS_TOTAL results)"
+		else
+			_fail "search_result_added missing" \
+				"finished reports $RESULTS_TOTAL results but no search_result_added events seen"
+		fi
+	else
+		_pass "search_result_added correctly absent (local search returned 0 results)"
+	fi
+	# Every frame on this channel names the search it belongs to, which is
+	# what lets a client demux several concurrent searches.
+	if  -n "$SSE_SID"  && echo "$JSON" | jq -e --argjson sid "$SSE_SID" '.search_id == $sid' >/dev/null 2>&1; then
+		_pass "search_progress .data.search_id names the search that produced it"
+	else
+		_fail "search_progress .data.search_id" "expected $SSE_SID in $JSON"
+	fi
+else
+	_fail "search_progress finished frame missing" \
+		"no finished search_progress within 22 s of POST /search; stream sample: $(head -40 "$SSE_OUT")"
+fi
+
+# --- 6.1 search_closed fires when a search is freed. ---------------
+# A subscriber holding one view per search learns the slot is gone from
+# this event; without it, it would only find out by 404ing on a later
+# read, and with SSE live it may never read again.
+if  -n "$SSE_SID" ; then
+	SSE_PID=$(_sse_start 8)
+	sleep 1
+	curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$SSE_SID" > /dev/null
+	CLOSED_JSON=""
+	for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
+		if grep -q "^event: search_closed$" "$SSE_OUT"; then
+			CLOSED_JSON=$(grep -A2 "^event: search_closed$" "$SSE_OUT" \
+				| grep "^data: " | sed 's/^data: //' | head -1)
+			 -n "$CLOSED_JSON"  && break
+		fi
+		sleep 0.25
+	done
+	wait $SSE_PID 2>/dev/null
+	if  -n "$CLOSED_JSON"  && \
+	   echo "$CLOSED_JSON" | jq -e --argjson sid "$SSE_SID" '.search_id == $sid' >/dev/null 2>&1; then
+		_pass "search_closed fired for the freed search ($CLOSED_JSON)"
+	else
+		_fail "search_closed missing" \
+			"DELETE /search/$SSE_SID produced no matching search_closed; got: $CLOSED_JSON"
+	fi
+else
+	echo "    info: no search_id from POST /search — skipping search_closed"
+fi
+
+# --- comments_updated shape (issue #434). ---------------------------
+# This used to wait passively for a peer comment or a Kad note to arrive,
+# which a smoke daemon cannot force, so the shape assertion below never ran
+# once -- a check that looks like coverage and is not. It is provoked now:
+# EqualComments compares `kad_comment_searching` as well as the comment list,
+# and POST /downloads/{hash}/comments starts that lookup, so the false->true
+# edge fires the event on the next refresher tick.
+#
+# Still conditional, but on something specific and reported: a daemon with Kad
+# down answers 400 amuled_rejected and there is no lookup to start.
+# Section 4 deleted the ISO to prove download_removed, so re-add it: the
+# lookup is addressed by download hash and 404s without one.
+curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"links\":\"$TEST_LINK\"}" \
+	"$API/downloads" > /dev/null
+sleep 3
+SSE_PID=$(_sse_start 8)
+sleep 1
+KAD_NOTES_STATUS=$(curl -s -o /dev/null -w '%{http_code}' \
+	-X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH/comments")
+if  "$KAD_NOTES_STATUS" = "202" ; then
+	CU=""
+	for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
+		CU=$(grep -A1 "^event: comments_updated$" "$SSE_OUT" \
+			| grep "^data: " | sed 's/^data: //' | head -1)
+		 -n "$CU"  && break
+		sleep 0.25
+	done
+	wait $SSE_PID 2>/dev/null
+	if  -z "$CU" ; then
+		# Not a failure: `kad_comment_searching` is only observable if the
+		# lookup is still running when the refresher next samples it, and a
+		# firewalled or note-less lookup can start and finish inside one
+		# tick. What this rules out is the old silent case -- the trigger
+		# was accepted, so the path was exercised even when the edge was not
+		# visible.
+		echo "    info: Kad-notes lookup accepted but finished within a tick - no observable comments_updated"
+	elif echo "$CU" | jq -e '(.hash|type=="string") and (.total|type=="number") and (.comments|type=="array")' >/dev/null 2>&1; then
+		_pass "comments_updated fired on the Kad-notes lookup, payload shape valid"
+	else
+		_fail "comments_updated payload shape" "unexpected: $CU"
+	fi
+	# The key is `total`, as GET /downloads/{hash}/comments spells it. An
+	# earlier revision of this file asserted `.count`, which the payload has
+	# never carried; it passed only because the branch never executed.
+	if  -n "$CU" ; then
+		if echo "$CU" | jq -e 'has("count") | not' >/dev/null 2>&1; then
+			_pass "comments_updated carries no stray count key"
+		else
+			_fail "comments_updated count key" "expected only total, got: $CU"
+		fi
+	fi
+else
+	wait $SSE_PID 2>/dev/null
+	echo "    info: Kad-notes lookup unavailable (POST returned $KAD_NOTES_STATUS) - comments_updated not provoked"
+fi
+# Leave the queue as this section found it.
+curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH" > /dev/null 2>&1 || true
+
+# --- status_changed carries the same keys as GET /status. ----------
+# EVENTS.md promises the payload is "identical to the REST /status
+# envelope", and the API contract turns on that: a subscriber must never
+# have to fall back to a poll for a field a poller can see, both
+# connected_since timestamps included.
+#
+# `paths` rather than `paths(scalars)`: jq's `scalars` drops nulls, and
+# disk.{temp,incoming}_free_bytes are null whenever the daemon has no
+# figure, which would silently exempt exactly the fields with the
+# trickiest contract. Plain `paths` also lists the container keys, so a
+# whole object going missing is caught too.
+#
+# Conditional, like comments_updated above: status_changed fires only when
+# something in the envelope actually moved, and an idle daemon legitimately
+# emits nothing. So a missing frame is a skip, not a failure -- what this
+# guards is the SHAPE when a frame does arrive. That the event fires at all
+# is asserted in EventDiffTest, which can force a change directly.
+SSE_PID=$(_sse_start 15)
+STATUS_JSON=""
+for _ in $(seq 1 40); do
+	if grep -q "^event: status_changed$" "$SSE_OUT"; then
+		STATUS_JSON=$(grep -A2 "^event: status_changed$" "$SSE_OUT" \
+			| grep "^data: " | sed 's/^data: //' | head -1)
+		 -n "$STATUS_JSON"  && break
+	fi
+	sleep 0.25
+done
+kill $SSE_PID 2>/dev/null
+wait $SSE_PID 2>/dev/null
+if  -n "$STATUS_JSON" ; then
+	REST_JSON=$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" "$API/status")
+	# The two subtractions need their own parentheses: inside object
+	# construction jq parses `k: a - b` as `k: a` and then chokes on the `-`,
+	# so the expression failed to compile and this check reported a failure
+	# on every run that actually captured a frame.
+	DIFF=$(jq -n --argjson a "$REST_JSON" --argjson b "$STATUS_JSON" \
+		'def keys_: paths | join(".") | sort;
+		 {rest_only: (($a|keys_) - ($b|keys_)), sse_only: (($b|keys_) - ($a|keys_))}')
+	if  "$(echo "$DIFF" | jq -c '.')" = '{"rest_only":,"sse_only":}' ; then
+		_pass "status_changed payload keys match GET /status exactly"
+	else
+		_fail "status_changed / GET /status key parity" "$DIFF"
+	fi
+else
+	_pass "status_changed not emitted this run (nothing in the envelope moved; shape asserted when it fires)"
+fi
+
+# --- client_added / client_updated carry the promoted peer fields, and
+# never a parts bitmap (issue #984). The four fields were detail-only until
+# the per-file client routes landed; a subscriber renders them as columns,
+# so they have to be on the diff payload too. The bitmaps deliberately are
+# NOT: one boolean per chunk per peer would dwarf the rest of the stream.
+#
+# Conditional like the two checks above -- an idle daemon with no peers
+# emits no client frame -- so a missing frame is a skip and what is guarded
+# is the shape when one arrives. Reuses the stream captured above.
+CLIENT_JSON=$(grep -A2 -E "^event: client_(added|updated)$" "$SSE_OUT" \
+	| grep "^data: " | sed 's/^data: //' | head -1)
+if  -n "$CLIENT_JSON" ; then
+	if echo "$CLIENT_JSON" | jq -e \
+		'((.source_origin|type)=="string" or (.source_origin|type)=="null")
+		 and has("parts_offered_count")
+		 and ((.parts_offered_count|type)=="number" or (.parts_offered_count|type)=="null")
+		 and ((.client_mod_name|type)=="string" or (.client_mod_name|type)=="null")
+		 and (.shared_files_browsable|type=="boolean")' \
+		>/dev/null 2>&1; then
+		_pass "client_added/updated carries the promoted peer fields (#984)"
+	else
+		_fail "client payload promoted fields" "missing/wrong type in: $CLIENT_JSON"
+	fi
+	if echo "$CLIENT_JSON" | jq -e 'has("parts") | not' >/dev/null 2>&1; then
+		_pass "client_added/updated carries no parts bitmap (#984)"
+	else
+		_fail "client payload parts bitmap" "SSE must never carry parts: $CLIENT_JSON"
+	fi
+	if echo "$CLIENT_JSON" | jq -e \
+		'has("part_progress_percent")
+		 and ((.part_progress_percent|type)=="number" or (.part_progress_percent|type)=="null")' \
+		>/dev/null 2>&1; then
+		_pass "client_added/updated part_progress_percent is present, number or null"
+	else
+		_fail "client payload part_progress_percent" "absent or wrong type in: $CLIENT_JSON"
+	fi
+	# friend rides the same promotion (issue #1475): on the diff payload as well as
+	# the list row, or a subscriber never learns a peer joined the friends list.
+	if echo "$CLIENT_JSON" | jq -e \
+		'(.friend|type)=="boolean" and (.friend_slot|type)=="boolean"' \
+		>/dev/null 2>&1; then
+		_pass "client_added/updated carries friend + friend_slot booleans"
+	else
+		_fail "client payload friend" "absent or wrong type in: $CLIENT_JSON"
+	fi
+	# credit_ratio moves as the peer's totals move, so a subscriber must see it here
+	# rather than re-GETting the row (issue #1474).
+	if echo "$CLIENT_JSON" | jq -e \
+		'has("credit_ratio")
+		 and ((.credit_ratio|type)=="number" or .credit_ratio==null)' \
+		>/dev/null 2>&1; then
+		_pass "client_added/updated carries credit_ratio (number or null)"
+	else
+		_fail "client payload credit_ratio" "absent or wrong type in: $CLIENT_JSON"
+	fi
+else
+	_pass "no client frame this run (no peer changed; shape asserted when one fires)"
+fi
+
+# --- shared_added / shared_updated carry the same keys as the GET
+# --- /shared list item.
+# REFERENCE.md promises the payload "matches this object byte-for-byte, so a
+# subscriber that received shared_updated does not need to re-GET". Nothing
+# checked it: the mechanical key-diff above covers status only, and the shared
+# payload is built by a SEPARATE writer (ToJsonSharedEvent) from the one the
+# list uses (WriteSharedObject), so the two drift silently by construction.
+# They already did once -- `media` reached the event before the list item.
+#
+# Appended at the end of the file on purpose: every section here shares one
+# live daemon, and a new section in the middle can change the state later
+# sections read.
+#
+# Conditional for the same reason as status_changed: an idle share emits
+# nothing, so a missing frame is a skip. What this guards is the SHAPE.
+# Force a real change rather than waiting for one: a reload of an unchanged
+# share emits nothing, so a passive wait here reports "no frame" every run and
+# checks nothing. Flipping a shared file's priority moves a field EqualShared
+# compares, which is exactly what makes shared_updated fire. The original
+# value is restored below -- this daemon is shared with the other sections.
+#
+# Prefer a file that HAS media. Both writers emit `media` only when the file
+# carries it, so comparing whatever sorts first comes down to two objects that
+# both omit the key: the sets match and the field this check exists to guard
+# was never compared. That is a green check over a comparison that never
+# happened, and it is exactly the regression that got through last time.
+# One GET, three extractions: re-fetching per field lets a live daemon reorder
+# the list between them, which would restore one file's priority onto another.
+#
+# The subject is chosen from the DETAIL endpoint, never from the list's own
+# `media` key. Selecting on the list would key the check off the exact field
+# whose absence is the bug: drop media from the list writer and the selector
+# stops finding a media file, falls back to a document, and the comparison
+# passes with media never compared -- the guard reporting green precisely when
+# it should be red. Detail builds through a different writer, so it still
+# answers truthfully when the list is the broken one.
+PARITY_BODY=$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared")
+PARITY_HASH=
+for CAND in $(printf '%s' "$PARITY_BODY" | jq -r '.shared0:20.hash'); do
+	if curl -s -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared/$CAND" \
+		| jq -e '.media != null' >/dev/null 2>&1; then
+		PARITY_HASH=$CAND
+		break
+	fi
+done
+ -n "$PARITY_HASH"  || PARITY_HASH=$(printf '%s' "$PARITY_BODY" | jq -r '.shared0.hash // empty')
+PARITY_PRIO=$(printf '%s' "$PARITY_BODY" \
+	| jq -r --arg h "$PARITY_HASH" '.shared | select(.hash == $h) | .priority')
+PARITY_AUTO=$(printf '%s' "$PARITY_BODY" \
+	| jq -r --arg h "$PARITY_HASH" '.shared | select(.hash == $h) | .priority_auto')
+PARITY_HAS_MEDIA=0
+if  -n "$PARITY_HASH"  && curl -s -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/shared/$PARITY_HASH" | jq -e '.media != null' >/dev/null 2>&1; then
+	PARITY_HAS_MEDIA=1
+fi
+SHARED_JSON=""
+if  -z "$PARITY_HASH" ; then
+	_pass "nothing shared; shared-event parity check skipped"
+else
+if  "$PARITY_HAS_MEDIA" = "1" ; then
+	echo "    info: parity subject carries media (the key this check guards)"
+else
+	echo "    info: no shared file carries media; parity checked on the common keys only"
+fi
+SSE_PID=$(_sse_start 25)
+# Wait for the stream to exist rather than sleeping a fixed second: _sse_start
+# backgrounds curl and returns immediately, so on a loaded runner the PATCH can
+# land before the subscription does. Every other section here treats a missing
+# frame as a pass and absorbs that race; this one requires the frame, so it has
+# to actually wait for the connection instead of assuming it.
+for _ in $(seq 1 80); do
+	 -s "$SSE_OUT"  && break
+	sleep 0.25
+done
+if  "$PARITY_PRIO" = "high" ; then NEW_PRIO=low; else NEW_PRIO=high; fi
+curl -s -o /dev/null -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"priority\":\"$NEW_PRIO\"}" "$API/shared/$PARITY_HASH"
+# Take the frame for THIS file: any other file's frame would be a valid
+# parity pair but not necessarily the one carrying media.
+for _ in $(seq 1 40); do
+	SHARED_JSON=$(grep -A2 -E "^event: shared_(added|updated)$" "$SSE_OUT" 2>/dev/null \
+		| grep "^data: " | sed 's/^data: //' \
+		| jq -c --arg h "$PARITY_HASH" 'select(.hash == $h)' 2>/dev/null | head -1)
+	 -n "$SHARED_JSON"  && break
+	sleep 0.25
+done
+kill $SSE_PID 2>/dev/null
+wait $SSE_PID 2>/dev/null
+if  -n "$SHARED_JSON" ; then
+	REST_ITEM=$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared" \
+		| jq -c --arg h "$PARITY_HASH" '.shared | select(.hash == $h)')
+	if  -z "$REST_ITEM" ; then
+		# The file left the share between the frame and the GET; no contract
+		# to check, and failing here would be a flake, not a finding.
+		_pass "shared frame's file no longer listed (shape asserted when both are present)"
+	else
+		DIFF=$(jq -n --argjson a "$REST_ITEM" --argjson b "$SHARED_JSON" \
+			'def keys_: paths | join(".") | sort;
+			 {rest_only: (($a|keys_) - ($b|keys_)), sse_only: (($b|keys_) - ($a|keys_))}')
+		if  "$(echo "$DIFF" | jq -c '.')" = '{"rest_only":,"sse_only":}' ; then
+			_pass "shared event payload keys match the GET /shared item exactly"
+		else
+			_fail "shared event / GET /shared key parity" "$DIFF"
+		fi
+		# Key parity is not value parity, and this pair disagreed on VALUES
+		# while the key sets matched: the SSE writer emitted a raw 0 for a
+		# never-uploaded file where REST sent null, so a subscriber that
+		# hydrated from REST watched null flip to 0 on the first frame and a
+		# renderer drew 1970-01-01. Compare the two timestamps directly.
+		VAL_DIFF=$(jq -n --argjson a "$REST_ITEM" --argjson b "$SHARED_JSON" \
+			' {k:"last_upload_at",  rest:$a.last_upload_at,  sse:$b.last_upload_at},
+			   {k:"shared_since_at", rest:$a.shared_since_at, sse:$b.shared_since_at} 
+			 | map(select(.rest != .sse))')
+		if  "$(echo "$VAL_DIFF" | jq -c '.')" = "" ; then
+			_pass "shared event timestamps match GET /shared by value, not just by key"
+		else
+			_fail "shared event / GET /shared timestamp values" "$VAL_DIFF"
+		fi
+		# And the specific reading the fix is about: never-uploaded is null.
+		if  "$(echo "$SHARED_JSON" | jq -r '.last_upload_at')" = "null" ; then
+			_pass "a never-uploaded file arrives over SSE with last_upload_at null, not 0"
+		else
+			_pass "file has uploaded before; null-for-zero case not exercised this run"
+		fi
+	fi
+else
+	_fail "shared event parity" "no shared_added/updated frame for $PARITY_HASH after a priority PATCH"
+fi
+# Restore what the PATCH changed: later sections and other phases read this
+# daemon's state. priority_auto has to go back too -- setting a bare priority
+# clears it.
+curl -s -o /dev/null -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"priority\":\"$PARITY_PRIO\",\"priority_auto\":$PARITY_AUTO}" \
+	"$API/shared/$PARITY_HASH"
+fi
+
+# --- search_result_updated fires on a held result's mutable fields. -----
+# The window this closes: once a search finishes, search_progress stops, so a
+# subscriber holding its rows has no signal for the fields that can still
+# change. Driven here by starting a download of one hit, which flips
+# already_downloaded / status on the matching search result.
+#
+# Last section in the file: it starts a search on the shared daemon.
+#
+# This file predates the _curl wrapper the other phases use, so it drives
+# curl directly, same as every section above.
+SSE_SEARCH_SID=$(curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d '{"query":"ubuntu"}' "$API/search" | jq -r '.search_id // empty')
+UPD_HASH=""
+UPD_NAME=""
+UPD_SIZE=""
+UPD_ROW=""
+if  -n "$SSE_SEARCH_SID" ; then
+	for _ in $(seq 1 30); do
+		sleep 1
+		UPD_ROW=$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" \
+			"$API/search/$SSE_SEARCH_SID/results" \
+			| jq -c '.results | select(.already_downloaded == false) | first // empty')
+		UPD_HASH=$(printf '%s' "$UPD_ROW" | jq -r '.hash // empty')
+		UPD_NAME=$(printf '%s' "$UPD_ROW" | jq -r '.name // empty' | sed 's/|/_/g')
+		UPD_SIZE=$(printf '%s' "$UPD_ROW" | jq -r '.size_bytes // empty')
+		 -n "$UPD_HASH"  && break
+	done
+fi
+if  -n "$UPD_HASH" ; then
+	# Subscribe to the search channel only, which also pins that the new event
+	# routes there rather than needing its own channel name.
+	: > "$SSE_OUT"
+	(curl -s -m 20 -N -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/events?channels=search" >> "$SSE_OUT" 2>&1) &
+	UPD_PID=$!
+	# Wait for the stream to actually be up before provoking the change, or
+	# the frame lands before the subscription and the section flakes.
+	for _ in $(seq 1 60); do
+		 -s "$SSE_OUT"  && break
+		sleep 0.25
+	done
+	# Provoke the change by starting a download of the hit. That flips
+	# already_downloaded / status on the search result deterministically and
+	# locally -- the partfile is created on the spot, no peer needed. A Kad
+	# NOTES lookup moves the other half of the comparator but depends on Kad
+	# actually answering, which would make a missing frame ambiguous between
+	# "the event is broken" and "Kad was quiet". This way a missing frame can
+	# only mean the former, so the check below is a real gate.
+	curl -s -o /dev/null -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"links\":\"ed2k://|file|$UPD_NAME|$UPD_SIZE|$UPD_HASH|/\"}" \
+		"$API/downloads"
+	UPD_FRAME=""
+	for _ in $(seq 1 60); do
+		UPD_FRAME=$(grep -A2 "^event: search_result_updated$" "$SSE_OUT" 2>/dev/null \
+			| grep "^data: " | sed 's/^data: //' \
+			| jq -c --arg h "$UPD_HASH" 'select(.hash == $h)' 2>/dev/null | head -1)
+		 -n "$UPD_FRAME"  && break
+		sleep 0.25
+	done
+	kill $UPD_PID 2>/dev/null
+	wait $UPD_PID 2>/dev/null
+	if  -n "$UPD_FRAME" ; then
+		_pass "search_result_updated fires for a held result whose download state changed"
+		if echo "$UPD_FRAME" | jq -e --argjson s "$SSE_SEARCH_SID" '.search_id == $s' >/dev/null 2>&1; then
+			_pass "search_result_updated carries its own search_id"
+		else
+			_fail "search_result_updated .search_id" "expected $SSE_SEARCH_SID in $UPD_FRAME"
+		fi
+		# Same writer as _added and as the REST entry, so the whole row is
+		# there rather than a delta a client would have to merge blindly.
+		if echo "$UPD_FRAME" | jq -e 'has("name") and has("size_bytes") and has("status") and has("kad_comment_lookup_running")' >/dev/null 2>&1; then
+			_pass "search_result_updated carries the full results-entry shape"
+		else
+			_fail "search_result_updated shape" "$UPD_FRAME"
+		fi
+		# The point of the event: the row now reads as held.
+		if echo "$UPD_FRAME" | jq -e '.already_downloaded == true' >/dev/null 2>&1; then
+			_pass "search_result_updated reports the hit as already_downloaded after the download starts"
+		else
+			_fail "search_result_updated .already_downloaded" "expected true in $UPD_FRAME"
+		fi
+	else
+		_fail "search_result_updated" \
+			"no frame for $UPD_HASH within 15 s of starting a download of it"
+	fi
+	# Leave the daemon as we found it: drop the partfile we planted.
+	curl -s -o /dev/null -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/downloads/$UPD_HASH" 2>/dev/null
+	curl -s -o /dev/null -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/search/$SSE_SEARCH_SID" 2>/dev/null
+else
+	echo "    info: no search results available; search_result_updated check skipped"
+fi
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/23-sse-replay.sh Added

@@ -0,0 +1,236 @@
+#!/usr/bin/env bash
+#
+# amuleapi 23-sse-replay — Last-Event-ID replay.
+#
+# Wire contract:
+#   * SSE clients reconnecting with a `Last-Event-ID: <N>` request
+#     header are sent every event with id > N that's still in the
+#     bus's ring (default 16384 slots, operator-tunable via
+#     Streaming/EventBusRingCapacity) before the drain loop starts.
+#   * Replay is monotonic and gap-free: the first id seen after
+#     reconnect is N+1 (provided that id is still in the ring).
+#   * If the requested Last-Event-ID is older than the bus's oldest
+#     retained event, the daemon emits a typed `resync` event and
+#     clamps the start to oldest-1 (see 24-sse-resync).
+#   * If the requested Last-Event-ID is higher than the bus's newest
+#     id (e.g. stale id from a prior daemon process), the daemon
+#     clamps to NewestId and proceeds — no infinite wait.
+#   * Absent or unparseable header → behaviour identical to 8b
+#     (start from NewestId, no replay). Covered by 22-sse-diff-emission.sh
+#     already, not retested here.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+TEST_LINK="ed2k://|file|ubuntu-24.04.4-desktop-amd64.iso|6655619072|0031C9CBA65C50DD2015C184B2CA2C88|/"
+TEST_HASH="0031c9cba65c50dd2015c184b2ca2c88"
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+SSE1=$(mktemp -t amuleapi_23_sse_replay_1.XXXXXX)
+SSE2=$(mktemp -t amuleapi_23_sse_replay_2.XXXXXX)
+trap 'rm -f "$SSE1" "$SSE2"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 23-sse-replay smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+sleep 4
+
+# Make sure the ISO isn't lingering from a prior smoke.
+curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH" > /dev/null 2>&1 || true
+sleep 2
+
+# --- 1. Capture a Last-Event-ID, disconnect, mutate, reconnect. ---
+#
+# Open SSE1, trigger POST /downloads, capture the last id seen,
+# disconnect, then trigger DELETE while no one is subscribed.
+# Reconnect SSE2 with `Last-Event-ID: <captured>` and verify the
+# `download_removed` that fired during the gap is replayed.
+
+: > "$SSE1"
+(curl -s -m 8 -N -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events" >> "$SSE1" 2>&1) &
+PID1=$!
+sleep 1
+echo "    info: POST Ubuntu ISO..."
+curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"links\":\"$TEST_LINK\"}" \
+	"$API/downloads" > /dev/null
+# Wait for the download_added so we have at least one ratcheted id.
+for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 \
+         21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40; do
+	if grep -q "^event: download_added$" "$SSE1"; then break; fi
+	sleep 0.2
+done
+sleep 1
+kill $PID1 2>/dev/null
+wait $PID1 2>/dev/null
+
+LAST_ID=$(grep "^id: " "$SSE1" | tail -1 | sed 's/^id: //')
+if  -n "$LAST_ID"  &&  "$LAST_ID" -gt 0  2>/dev/null; then
+	_pass "Captured Last-Event-ID from first subscriber ($LAST_ID)"
+else
+	_fail "Capture Last-Event-ID" \
+		"no id line in first stream; sample: $(head -20 "$SSE1")"
+	echo
+	echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+	exit 1
+fi
+
+# Trigger one more mutation while NO subscriber is open. This event
+# must be replayed to SSE2 once it reconnects with Last-Event-ID.
+#
+# The 4 s gap below is deliberately inside the refresher's grace period for
+# an unsubscribed bus: it keeps diffing for a few ticks so a client that
+# drops and returns replays instead of resyncing. A longer gap here would
+# suspend the diff, and the assertion would then be testing the opposite
+# contract -- covered by 24-sse-resync's `idle` case.
+echo "    info: DELETE while disconnected..."
+curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH" > /dev/null
+sleep 4
+
+# --- 2. Reconnect with Last-Event-ID, verify the gap is replayed. -
+: > "$SSE2"
+(curl -s -m 6 -N \
+	-H "Last-Event-ID: $LAST_ID" \
+	-H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events" >> "$SSE2" 2>&1) &
+PID2=$!
+# Replayed events should land essentially immediately; poll for the
+# expected download_removed up to a few seconds.
+GOT_REMOVED=""
+for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 \
+         21 22 23 24 25; do
+	if grep -q "^event: download_removed$" "$SSE2"; then
+		GOT_REMOVED=$(grep -A2 "^event: download_removed$" "$SSE2" \
+			| grep "^data: " | grep -F "$TEST_HASH" | head -1)
+		if  -n "$GOT_REMOVED" ; then break; fi
+	fi
+	sleep 0.2
+done
+kill $PID2 2>/dev/null
+wait $PID2 2>/dev/null
+
+if  -n "$GOT_REMOVED" ; then
+	_pass "download_removed fired during the gap is replayed on reconnect"
+else
+	_fail "Replay of gap event" \
+		"no download_removed for $TEST_HASH replayed within 5 s" \
+		"sample: $(head -30 "$SSE2")"
+fi
+
+# --- 3. First replayed id is exactly Last-Event-ID + 1. ----------
+FIRST_REPLAY_ID=$(grep "^id: " "$SSE2" | head -1 | sed 's/^id: //')
+EXPECTED_NEXT=$((LAST_ID + 1))
+if  -n "$FIRST_REPLAY_ID"  &&  "$FIRST_REPLAY_ID" -eq "$EXPECTED_NEXT"  2>/dev/null; then
+	_pass "First replayed event id is Last-Event-ID+1 ($EXPECTED_NEXT)"
+else
+	_fail "Replay starts at Last-Event-ID+1" \
+		"expected id $EXPECTED_NEXT, got '$FIRST_REPLAY_ID'"
+fi
+
+# --- 4. Replayed ids are strictly monotonic and gap-free. --------
+IDS=$(grep "^id: " "$SSE2" | sed 's/^id: //')
+N_IDS=$(echo "$IDS" | wc -l | tr -d ' ')
+prev=$LAST_ID
+GAP_FOUND=0
+NONMONO=0
+while IFS= read -r id; do
+	if  "$id" -le "$prev"  2>/dev/null; then
+		NONMONO=1
+		break
+	fi
+	if  "$id" -ne $((prev + 1))  2>/dev/null; then
+		GAP_FOUND=1
+	fi
+	prev=$id
+done <<< "$IDS"
+if  "$NONMONO" -eq 0 ; then
+	_pass "Replayed event ids are strictly monotonic ($N_IDS events)"
+else
+	_fail "Replay monotonicity" "ids: $(echo "$IDS" | tr '\n' ' ')"
+fi
+if  "$GAP_FOUND" -eq 0 ; then
+	_pass "Replayed event ids are gap-free (consecutive)"
+else
+	_fail "Replay gap-free" \
+		"ids: $(echo "$IDS" | tr '\n' ' ')" \
+		"a hole means an event was lost between Last-Event-ID and the resume point"
+fi
+
+# --- 5. Last-Event-ID > NewestId clamps to NewestId (no hang). ---
+#
+# Send an id from "another daemon process" — much higher than
+# anything we've emitted. Daemon must clamp to NewestId() and
+# behave like a fresh connect. We verify by checking the
+# connection accepts the request and produces the heartbeat
+# fallback (no replay = no events = `: keepalive` within timeout)
+# rather than blocking forever.
+
+CLAMP_ID=999999999999
+: > "$SSE2"
+(curl -s -m 4 -N \
+	-H "Last-Event-ID: $CLAMP_ID" \
+	-H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events" >> "$SSE2" 2>&1) &
+PID3=$!
+sleep 3.5
+kill $PID3 2>/dev/null
+wait $PID3 2>/dev/null
+# We expect the `: connected` chunk (always emitted) and NO replay
+# (since the requested id is in the future). Connection should not
+# wedge — verify by checking the chunked stream produced *something*
+# and that no events with id <= CLAMP_ID slipped through.
+if grep -q "^: connected$" "$SSE2"; then
+	_pass "Last-Event-ID > NewestId() does not hang the connection"
+else
+	_fail "Future Last-Event-ID handling" \
+		"no ': connected' chunk; sample: $(head -10 "$SSE2")"
+fi
+# Any events that surface during this window must have id <= NewestId
+# at this moment — they're new events the refresher emitted, NOT
+# replay of the bogus future id.
+FUTURE_REPLAY=$(grep "^id: " "$SSE2" | awk -v cap="$CLAMP_ID" '$0+0 >= cap')
+if  -z "$FUTURE_REPLAY" ; then
+	_pass "Future-id request does not replay phantom events"
+else
+	_fail "Future Last-Event-ID phantom replay" \
+		"saw ids >= $CLAMP_ID: $FUTURE_REPLAY"
+fi
+
+# Below-OldestId gap detection is tested in 24-sse-resync.sh with the
+# typed `resync` event.
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/24-sse-resync.sh Added

@@ -0,0 +1,357 @@
+#!/usr/bin/env bash
+#
+# amuleapi 24-sse-resync — typed `resync` event + log_appended.
+#
+# Wire contract:
+#   * the `resync` event is a typed event, not a `: replay-gap` SSE
+#     comment. It's a synthetic per-subscriber event (never on the
+#     shared bus) with payload:
+#       {"reason":"gap"|"restart","since_id":N,"newest_id":M}
+#     - reason=gap     — Last-Event-ID < OldestId; events evicted
+#                        before this subscriber could read them
+#     - reason=restart — Last-Event-ID > NewestId; client's id is
+#                        from a prior daemon process (per-process
+#                        ids reset on restart)
+#     id: <newest_id> so the client's EventSource resumes from the
+#     current high water on the next reconnect.
+#   * `log_appended` event: published from the refresher when
+#     amuled's amule log grows. Payload:
+#       {"lines":"...","..."}
+#     Batches all new lines from one tick into one event.
+#     log_appended is best-effort to trigger in a smoke (amuled
+#     logs sparsely during normal operation); the unit test
+#     `EventDiffTest` covers the cold-start gate, batching, JSON
+#     escaping, truncation, and idle ticks deterministically.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+BIN=${AMULEAPI_BIN:?orchestrator must export AMULEAPI_BIN}
+CONFIG_DIR=${AMULEAPI_CONFIG_DIR:?orchestrator must export AMULEAPI_CONFIG_DIR}
+LOG=${AMULEAPI_LOG:-/tmp/amuleapi.log}
+# The daemon this smoke drives. Defaults are the orchestrator's, but every
+# value is overridable so the suite can be pointed at a daemon that is not
+# on the stock EC port; hardcoding them here made that impossible.
+EC_HOST=${EC_HOST:-127.0.0.1}
+EC_PORT=${EC_PORT:-4712}
+EC_PASSWORD=${EC_PASSWORD:-amule}
+# The HTTP port the rewritten config must bind is the one $HOST names.
+HTTP_PORT=${HOST##*:}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+# Skips are counted apart from TEST_COUNT, never folded into it: a skipped
+# check is coverage that did not happen, and adding it to the passed tally
+# would report the absence of a check as a check that succeeded.
+SKIP_COUNT=0
+
+SSE=$(mktemp -t amuleapi_24-sse-resync.XXXXXX)
+trap 'rm -f "$SSE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_skip() { SKIP_COUNT=$((SKIP_COUNT+1)); echo "  SKIP  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 24-sse-resync smoke @ $HOST"
+
+# Bounce the daemon with a tiny Streaming/EventBusRingCapacity so
+# the gap case (Last-Event-ID < OldestId) is reachable in a smoke
+# window. The production default is 16384, well past anything the
+# refresher emits in a 20 s wait against an idle daemon. Other
+# defaults are preserved from the orchestrator's first-run write.
+pkill -f "amuleapi --config-dir=$CONFIG_DIR" 2>/dev/null
+sleep 1
+cat > "$CONFIG_DIR/amuleapi.conf" <<EOF
+Server
+BindAddress=127.0.0.1
+Port=$HTTP_PORT
+
+EC
+Host=$EC_HOST
+Port=$EC_PORT
+Password=$EC_PASSWORD
+
+Auth
+LoginFailureWindowSeconds=60
+LoginFailureThreshold=5
+LoginLockoutSeconds=300
+
+Streaming
+EventBusRingCapacity=4
+EOF
+"$BIN" --config-dir="$CONFIG_DIR" \
+	--host="$EC_HOST" --port="$EC_PORT" \
+	> "$LOG" 2>&1 &
+for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+	if curl -s -o /dev/null --max-time 1 "$API/health" 2>/dev/null; then
+		break
+	fi
+	sleep 0.5
+done
+# Re-login: the bus restart minted a new daemon process, so the
+# token from before the bounce is unrelated (its rate-limit bucket
+# is empty too).
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed after bounce"
+
+# Deterministically rotate the ring past id 1 instead of hoping the
+# ambient refresher emits >capacity events in a fixed sleep (flaky on
+# a quiet daemon). With the bus at 4 slots, a few add/delete cycles —
+# each a download_added + download_removed the refresher observes on
+# its next tick — guarantee OldestId climbs above 1. Each op is spaced
+# past one tick so the refresher can't coalesce an add+delete pair
+# into a no-op. End on a delete so the queue is clean for test 4.
+#
+# A subscriber has to be attached for all of it. The refresher stops diffing
+# once nothing has been subscribed for a few ticks, and this loop runs for
+# ~17 s, so without one the ring would never rotate and the gap case below
+# would be unreachable -- Last-Event-ID: 1 would land above an empty bus's
+# newest and report `restart` instead.
+FILL_LINK="ed2k://|file|ubuntu-24.04.4-desktop-amd64.iso|6655619072|0031C9CBA65C50DD2015C184B2CA2C88|/"
+FILL_HASH="0031c9cba65c50dd2015c184b2ca2c88"
+FILL_SUB=$(mktemp -t amuleapi_24_fillsub.XXXXXX)
+(curl -s -m 30 -N -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events" > "$FILL_SUB" 2>&1) &
+FILL_PID=$!
+sleep 1
+for _ in 1 2 3 4; do
+	curl -s -o /dev/null -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"links\":\"$FILL_LINK\"}" "$API/downloads"
+	sleep 2
+	curl -s -o /dev/null -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/downloads/$FILL_HASH"
+	sleep 2
+done
+# Final settle so the last download_removed is in the ring, then drop the
+# subscriber that kept the refresher diffing.
+sleep 1
+kill $FILL_PID 2>/dev/null
+wait $FILL_PID 2>/dev/null
+rm -f "$FILL_SUB"
+
+# --- 1. resync(reason=gap) — Last-Event-ID below OldestId. -------
+#
+# After 8 s of refresher ticks the 32-slot ring has rotated past
+# id 1, so `Last-Event-ID: 1` is in the gap range. Expect the
+# synthetic `resync` event first.
+: > "$SSE"
+(curl -s -m 3 -N \
+	-H "Last-Event-ID: 1" \
+	-H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events" >> "$SSE" 2>&1) &
+PID=$!
+sleep 2.5
+kill $PID 2>/dev/null
+wait $PID 2>/dev/null
+
+if grep -q "^event: resync$" "$SSE"; then
+	_pass "resync event fires when Last-Event-ID is below OldestId"
+else
+	_fail "resync(gap) event" \
+		"no 'event: resync' line in stream; sample: $(head -20 "$SSE")"
+fi
+
+# Payload should be JSON with reason=gap, since_id=1, newest_id>0.
+RESYNC_DATA=$(grep -A2 "^event: resync$" "$SSE" \
+	| grep "^data: " | head -1 | sed 's/^data: //')
+if  -n "$RESYNC_DATA" ; then
+	REASON=$(echo "$RESYNC_DATA" | jq -r .reason 2>/dev/null)
+	SINCE=$(echo "$RESYNC_DATA" | jq -r .since_id 2>/dev/null)
+	NEWEST=$(echo "$RESYNC_DATA" | jq -r .newest_id 2>/dev/null)
+	if  "$REASON" = "gap" ; then
+		_pass "resync.reason == 'gap'"
+	else
+		_fail "resync.reason for gap case" "expected 'gap', got '$REASON' from $RESYNC_DATA"
+	fi
+	if  "$SINCE" = "1" ; then
+		_pass "resync.since_id echoes the client-sent Last-Event-ID"
+	else
+		_fail "resync.since_id" "expected 1, got '$SINCE'"
+	fi
+	if  -n "$NEWEST"  &&  "$NEWEST" != "null"  &&  "$NEWEST" -gt 0  2>/dev/null; then
+		_pass "resync.newest_id is a positive integer ($NEWEST)"
+	else
+		_fail "resync.newest_id" "expected positive int, got '$NEWEST'"
+	fi
+else
+	_fail "resync data line" "no 'data:' line under resync event in $SSE"
+fi
+
+# A `: replay-gap` SSE comment must NOT appear —
+# the resync is a typed event.
+if grep -q "^: replay-gap$" "$SSE"; then
+	_fail "no ': replay-gap' comment" \
+		"': replay-gap' comment appears alongside resync event — should not"
+else
+	_pass "no ': replay-gap' comment is emitted alongside the resync event"
+fi
+
+# --- 2. resync(reason=restart) — Last-Event-ID above NewestId. ---
+: > "$SSE"
+(curl -s -m 3 -N \
+	-H "Last-Event-ID: 999999999999" \
+	-H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events" >> "$SSE" 2>&1) &
+PID=$!
+sleep 2.5
+kill $PID 2>/dev/null
+wait $PID 2>/dev/null
+
+if grep -q "^event: resync$" "$SSE"; then
+	_pass "resync event fires when Last-Event-ID is above NewestId"
+else
+	_fail "resync(restart) event" \
+		"no 'event: resync' line; sample: $(head -10 "$SSE")"
+fi
+RESYNC_DATA=$(grep -A2 "^event: resync$" "$SSE" \
+	| grep "^data: " | head -1 | sed 's/^data: //')
+REASON=$(echo "$RESYNC_DATA" | jq -r .reason 2>/dev/null)
+if  "$REASON" = "restart" ; then
+	_pass "resync.reason == 'restart' for above-NewestId case"
+else
+	_fail "resync.reason for restart case" \
+		"expected 'restart', got '$REASON' from $RESYNC_DATA"
+fi
+
+# --- 3. resync.id == newest_id so the client's next reconnect ----
+#     resumes from the high water (no resync loop).
+RESYNC_ID=$(grep -B1 "^data: {.reason" "$SSE" | grep "^id: " | head -1 | sed 's/^id: //')
+NEWEST_FROM_PAYLOAD=$(echo "$RESYNC_DATA" | jq -r .newest_id 2>/dev/null)
+if  -n "$RESYNC_ID"  &&  "$RESYNC_ID" = "$NEWEST_FROM_PAYLOAD" ; then
+	_pass "resync event id == newest_id ($RESYNC_ID) — no resync loop on next reconnect"
+else
+	_fail "resync event id matches newest_id" \
+		"frame id='$RESYNC_ID' payload newest_id='$NEWEST_FROM_PAYLOAD' — must match"
+fi
+
+# --- 4. log_appended — best-effort: trigger via POST /downloads. -
+#
+# amuled logs sparsely during normal operation, so this test is
+# best-effort. If no log_appended fires within the window we SKIP
+# rather than fail (EventDiffTest covers the wiring deterministically).
+# When the event DOES fire, validate the payload shape.
+
+# First clear any prior in-queue test artifact so the POST
+# below actually does work (and potentially logs).
+TEST_HASH="0031c9cba65c50dd2015c184b2ca2c88"
+TEST_LINK="ed2k://|file|ubuntu-24.04.4-desktop-amd64.iso|6655619072|0031C9CBA65C50DD2015C184B2CA2C88|/"
+curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/downloads/$TEST_HASH" > /dev/null 2>&1 || true
+sleep 3
+
+: > "$SSE"
+(curl -s -m 14 -N \
+	-H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events" >> "$SSE" 2>&1) &
+PID=$!
+sleep 2
+curl -s -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"links\":\"$TEST_LINK\"}" \
+	"$API/downloads" > /dev/null
+sleep 11
+kill $PID 2>/dev/null
+wait $PID 2>/dev/null
+
+LOG_EVENT_COUNT=$(grep -c "^event: log_appended$" "$SSE" || true)
+if  "$LOG_EVENT_COUNT" -ge 1 ; then
+	_pass "log_appended event observed ($LOG_EVENT_COUNT events) — wire path confirmed"
+	# Validate payload shape: must have a .lines array of strings.
+	LOG_DATA=$(grep -A2 "^event: log_appended$" "$SSE" \
+		| grep "^data: " | head -1 | sed 's/^data: //')
+	if echo "$LOG_DATA" | jq -e '.lines | type == "array"' >/dev/null 2>&1; then
+		_pass "log_appended.data.lines is an array"
+	else
+		_fail "log_appended payload shape" \
+			"expected {lines:...}, got: $LOG_DATA"
+	fi
+	if echo "$LOG_DATA" | jq -e '.lines | length > 0' >/dev/null 2>&1; then
+		_pass "log_appended.data.lines is non-empty"
+	else
+		_fail "log_appended.data.lines length" \
+			"empty lines array — refresher fired the event with no new lines"
+	fi
+else
+	_skip "log_appended observable in smoke window (amuled logs are sparse; EventDiffTest covers the wiring)"
+fi
+
+# --- 5. resync(reason=idle) — the diff was skipped while nobody -----
+# was subscribed, so no cursor from before that period is meaningful even
+# when it is still in range. Published on the bus by the tick that resumes,
+# after it re-establishes its baseline, rather than synthesised at connect:
+# announcing first would put the client's re-GET before the baseline was
+# rebuilt and lose whatever changed in between.
+#
+# Also asserts the filter bypass. `resync` carries no channel prefix, so a
+# subscriber that asked for one unrelated channel must still receive it --
+# a cache invalidation is not something a client can opt out of.
+#
+# The cursor starts in range, because `idle` is precisely the case where a
+# client's id is valid and still cannot be trusted -- but it may not stay that
+# way. The ring is 16 slots (EventBusRingCapacity=4 is clamped up to
+# CEventBus::kMinCapacity), test 4 leaves the ISO in the queue so every tick
+# publishes, and the grace ticks below keep publishing while nobody is
+# subscribed. On a daemon with a source or two that is enough to evict the
+# cursor, in which case connecting also synthesises a `resync(gap)` first. So
+# scan every resync frame for the one this section is about rather than taking
+# the first.
+: > "$SSE"
+(curl -s -m 4 -N -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events" >> "$SSE" 2>&1) &
+PID=$!
+sleep 3
+kill $PID 2>/dev/null
+wait $PID 2>/dev/null
+IDLE_CURSOR=$(grep "^id: " "$SSE" | tail -1 | sed 's/^id: //')
+ -n "$IDLE_CURSOR"  || IDLE_CURSOR=1
+
+echo "    info: idling past the suspend threshold (cursor $IDLE_CURSOR)..."
+sleep 9
+
+: > "$SSE"
+(curl -s -m 6 -N \
+	-H "Last-Event-ID: $IDLE_CURSOR" \
+	-H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events?channels=servers" >> "$SSE" 2>&1) &
+PID=$!
+sleep 4
+kill $PID 2>/dev/null
+wait $PID 2>/dev/null
+
+RESYNCS=$(awk '/^event: resync$/{f=1;next} f&&/^data: /{sub(/^data: /,"");print;f=0}' "$SSE")
+IDLE_DATA=$(printf '%s\n' "$RESYNCS" | jq -c 'select(.reason == "idle")' 2>/dev/null | head -1)
+if  -n "$IDLE_DATA" ; then
+	_pass "resync(idle) fires on reconnect after the diff was suspended"
+	_pass "resync(idle) reached a subscriber filtered to ?channels=servers (bypass holds)"
+else
+	_fail "resync(idle) event" \
+		"no resync frame with reason=idle after idling past the threshold" \
+		"cursor was $IDLE_CURSOR; resync frames seen: $(printf '%s' "$RESYNCS" | tr '\n' ' ')"
+fi
+
+# --- Summary. -----------------------------------------------------
+echo
+SKIP_NOTE=""
+ "$SKIP_COUNT" -gt 0  && SKIP_NOTE=" ($SKIP_COUNT check(s) skipped)"
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed$SKIP_NOTE"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/25-cors.sh Added

@@ -0,0 +1,427 @@
+#!/usr/bin/env bash
+#
+# amuleapi 25-cors — CORS opt-in.
+#
+# Wire contract:
+#   * `AllowCORS=0` (default): no `Access-Control-*` headers on any
+#     response. Browser cross-origin fetches blocked by the browser
+#     per same-origin policy. `Vary: Origin` NOT set.
+#   * `AllowCORS=1` + empty `CorsOriginAllowlist`: wildcard via echo.
+#     Any request that carries an `Origin` header gets that origin
+#     echoed in `Access-Control-Allow-Origin`. `Vary: Origin` is
+#     always set so caches don't poison cross-origin responses.
+#   * `AllowCORS=1` + non-empty `CorsOriginAllowlist`: an origin is
+#     echoed only if it appears verbatim in the comma-separated
+#     allowlist. Non-matching origins receive `Vary: Origin` but
+#     no `Access-Control-Allow-Origin`.
+#   * Credentials: `Access-Control-Allow-Credentials: true` is set
+#     only for an origin the allowlist names. The empty-allowlist
+#     wildcard echoes the Origin but withholds credentials, so a
+#     drive-by site cannot call the API with the user's cookie.
+#   * Preflight: `OPTIONS` + `Access-Control-Request-Method` short-
+#     circuits before auth, replies 204 with
+#     `Access-Control-Allow-Methods: GET, HEAD, POST, PUT, PATCH,
+#     DELETE, OPTIONS` and `Access-Control-Allow-Headers: Authorization,
+#     Content-Type, If-None-Match, Last-Event-ID` and
+#     `Access-Control-Max-Age: 86400`.
+#   * SSE: the streaming response carries the same Allow-Origin /
+#     Allow-Credentials / Vary headers.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+CONFIG_DIR=${AMULEAPI_CONFIG_DIR:-/tmp/amuleapi-regtest}
+# Locate the amuleapi binary the sub-instances need. Deliberately NOT falling
+# back to PATH: an installed package would silently be tested in place of the
+# working tree, which is worse than not finding anything. Set AMULEAPI_BIN to
+# point somewhere else on purpose.
+#
+# Any build*/ directory counts, not a fixed list of three: per-branch and
+# per-arch trees are normal, and a name this function has never heard of used
+# to mean a silent skip. Where several exist the NEWEST wins -- picking the
+# first match let a stale build/ supply the binary while the tree under test
+# was built somewhere else, which is the one failure mode that produces a
+# confident wrong answer rather than a missing one. Unmatched globs stay
+# literal and fail the -x test, so no nullglob is needed.
+_find_amuleapi_bin() {
+	local root=$1 c best=
+	for c in "$root"/src/webapi/amuleapi \
+		"$root"/build*/src/webapi/amuleapi \
+		"$root"/_build/src/webapi/amuleapi \
+		"$root"/cmake-build-*/src/webapi/amuleapi; do
+		 -x "$c"  || continue
+		if  -z "$best"  ||  "$c" -nt "$best" ; then
+			best=$c
+		fi
+	done
+	 -n "$best"  || return 1
+	echo "$best"
+}
+
+ROOT=${AMULEAPI_ROOT:-$(cd "$(dirname "$0")/../../.." && pwd)}
+BIN=${AMULEAPI_BIN:-$(_find_amuleapi_bin "$ROOT")}
+LOG=${AMULEAPI_LOG:-/tmp/amuleapi.log}
+# The daemon this smoke drives. Defaults are the orchestrator's, but every
+# value is overridable so the suite can be pointed at a daemon that is not
+# on the stock EC port; hardcoding them here made that impossible.
+EC_HOST=${EC_HOST:-127.0.0.1}
+EC_PORT=${EC_PORT:-4712}
+EC_PASSWORD=${EC_PASSWORD:-amule}
+# The HTTP port the rewritten config must bind is the one $HOST names.
+HTTP_PORT=${HOST##*:}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+HDR=$(mktemp -t amuleapi_25_cors_hdr.XXXXXX)
+BODY=$(mktemp -t amuleapi_25_cors_body.XXXXXX)
+SSE=$(mktemp -t amuleapi_25_cors_sse.XXXXXX)
+trap 'rm -f "$HDR" "$BODY" "$SSE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+if  ! -x "$BIN" ; then
+	_die "no usable amuleapi binary under $ROOT. Set AMULEAPI_BIN to point at one."
+fi
+
+echo "amuleapi 25-cors smoke @ $HOST (bin=$BIN config=$CONFIG_DIR)"
+
+# Helper: rewrite amuleapi.conf with a given AllowCORS value and
+# allowlist, then bounce the daemon. The first three sections are
+# the defaults the orchestrator wrote; we only mutate Server so
+# password files and the JWT secret stay valid across the restart.
+_rewrite_cors_and_restart() {
+	local allow=$1
+	local allowlist=$2
+	pkill -f "amuleapi --config-dir=$CONFIG_DIR" 2>/dev/null
+	sleep 1
+	cat > "$CONFIG_DIR/amuleapi.conf" <<EOF
+Server
+BindAddress=127.0.0.1
+Port=$HTTP_PORT
+AllowCORS=$allow
+CorsOriginAllowlist=$allowlist
+
+EC
+Host=$EC_HOST
+Port=$EC_PORT
+Password=$EC_PASSWORD
+
+Auth
+LoginFailureWindowSeconds=60
+LoginFailureThreshold=5
+LoginLockoutSeconds=300
+EOF
+	"$BIN" --config-dir="$CONFIG_DIR" \
+		--host="$EC_HOST" --port="$EC_PORT" \
+		> "$LOG" 2>&1 &
+	# Wait for /health to respond.
+	for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+		if curl -s -o /dev/null --max-time 1 "$API/health" 2>/dev/null; then
+			return 0
+		fi
+		sleep 0.5
+	done
+	_die "daemon did not come back up after restart (allow=$allow allowlist=$allowlist)"
+}
+
+# Helper: capture status + headers + body of an arbitrary curl.
+# Args: extra curl args. Result: HDR + BODY temp files populated.
+_curl() {
+	: > "$HDR"; : > "$BODY"
+	curl -sS -o "$BODY" -D "$HDR" "$@" || true
+}
+
+# Helper: case-insensitive header lookup against HDR file.
+# Returns the trimmed value of the first matching header.
+_hdr() {
+	local name=$1
+	# Strip CRLF and leading "name:" with case-insensitive match.
+	awk -v n="$name" '
+		BEGIN { IGNORECASE = 1 }
+		match($0, "^"n": +") {
+			v = substr($0, RSTART + RLENGTH);
+			sub(/\r$/, "", v);
+			sub(/^:space:+/, "", v);
+			print v;
+			exit
+		}
+	' "$HDR"
+}
+
+# --- Mode A: AllowCORS=0 (default). ------------------------------
+_rewrite_cors_and_restart 0 ""
+
+_curl -H "Origin: https://app.example.com" "$API/version"
+ACAO=$(_hdr "Access-Control-Allow-Origin")
+VARY=$(_hdr "Vary")
+if  -z "$ACAO" ; then
+	_pass "AllowCORS=0: no Access-Control-Allow-Origin on response"
+else
+	_fail "AllowCORS=0 leaks Access-Control-Allow-Origin" "got: $ACAO"
+fi
+if  -z "$VARY"  || ! echo "$VARY" | grep -qi "Origin"; then
+	_pass "AllowCORS=0: no Vary: Origin on response"
+else
+	_fail "AllowCORS=0 leaks Vary: Origin" "got: $VARY"
+fi
+
+# --- Mode B: AllowCORS=1 with empty allowlist (wildcard). --------
+_rewrite_cors_and_restart 1 ""
+
+_curl -H "Origin: https://wild.example.com" "$API/version"
+ACAO=$(_hdr "Access-Control-Allow-Origin")
+ACAC=$(_hdr "Access-Control-Allow-Credentials")
+ACEH=$(_hdr "Access-Control-Expose-Headers")
+VARY=$(_hdr "Vary")
+if  "$ACAO" = "https://wild.example.com" ; then
+	_pass "AllowCORS=1 (wildcard): Access-Control-Allow-Origin echoes the Origin verbatim"
+else
+	_fail "Wildcard echo" "expected 'https://wild.example.com', got '$ACAO'"
+fi
+# The wildcard echo must NOT grant credentials: with no allowlist the echo
+# is `*`-equivalent, so any site the user visits could otherwise call this
+# API with their session cookie and read the replies. An anonymous
+# cross-origin read still works; a credentialed one needs an allowlist entry.
+if  -z "$ACAC" ; then
+	_pass "AllowCORS=1 (wildcard): no Access-Control-Allow-Credentials"
+else
+	_fail "wildcard Allow-Credentials" "expected no header, got '$ACAC'"
+fi
+if echo "$ACEH" | grep -qi "ETag"; then
+	_pass "AllowCORS=1: Access-Control-Expose-Headers lists ETag"
+else
+	_fail "Expose-Headers" "expected to contain ETag, got '$ACEH'"
+fi
+if echo "$VARY" | grep -qi "Origin"; then
+	_pass "AllowCORS=1: Vary: Origin set"
+else
+	_fail "Vary: Origin" "expected 'Origin', got '$VARY'"
+fi
+
+# Same daemon, but request without an Origin header. The server
+# should NOT add Access-Control-Allow-Origin (no origin to echo)
+# but SHOULD still set Vary: Origin (CORS is on).
+_curl "$API/version"
+ACAO=$(_hdr "Access-Control-Allow-Origin")
+VARY=$(_hdr "Vary")
+if  -z "$ACAO" ; then
+	_pass "AllowCORS=1: request without Origin → no Allow-Origin"
+else
+	_fail "Spurious Allow-Origin" "no Origin sent, but got: $ACAO"
+fi
+if echo "$VARY" | grep -qi "Origin"; then
+	_pass "AllowCORS=1: Vary: Origin set even when request has no Origin"
+else
+	_fail "Vary: Origin when CORS on" "got: $VARY"
+fi
+
+# --- Mode C: AllowCORS=1 with a per-origin allowlist. ------------
+_rewrite_cors_and_restart 1 "https://allowed.example.com,https://also.example.com"
+
+_curl -H "Origin: https://allowed.example.com" "$API/version"
+ACAO=$(_hdr "Access-Control-Allow-Origin")
+if  "$ACAO" = "https://allowed.example.com" ; then
+	_pass "Allowlist: matching Origin echoes back"
+else
+	_fail "Allowlist match" "expected echo, got '$ACAO'"
+fi
+
+_curl -H "Origin: https://also.example.com" "$API/version"
+ACAO=$(_hdr "Access-Control-Allow-Origin")
+if  "$ACAO" = "https://also.example.com" ; then
+	_pass "Allowlist: second entry matches and echoes"
+else
+	_fail "Allowlist second entry" "expected echo, got '$ACAO'"
+fi
+
+_curl -H "Origin: https://attacker.example.com" "$API/version"
+ACAO=$(_hdr "Access-Control-Allow-Origin")
+VARY=$(_hdr "Vary")
+if  -z "$ACAO" ; then
+	_pass "Allowlist: non-matching Origin → no Allow-Origin"
+else
+	_fail "Allowlist rejects" "expected no Allow-Origin, got '$ACAO'"
+fi
+if echo "$VARY" | grep -qi "Origin"; then
+	_pass "Allowlist: Vary: Origin set even on rejected origin"
+else
+	_fail "Vary on rejection" "got: $VARY"
+fi
+
+# --- Transport-built replies carry CORS too. ---------------------
+#
+# 408 / 413 / 431 / the streaming cap refusal / the handler catch-all are
+# built by the transport, before or instead of a handler, so the dispatcher's
+# CORS pass never sees them. They are the replies a cross-origin client most
+# needs to read, and they went uncovered: nulling the stamper left the whole
+# suite green.
+BIG_BODY=$(mktemp -t amuleapi_25_big.XXXXXX)
+if command -v python3 >/dev/null 2>&1 &&
+	python3 -c "import sys; sys.stdout.write('{\"password\":\"' + 'a'*2200000 + '\"}')" \
+		> "$BIG_BODY" 2>/dev/null &&  -s "$BIG_BODY" ; then
+	_curl -X POST -H "Origin: https://allowed.example.com" \
+		-H "Content-Type: application/json" \
+		--data-binary @"$BIG_BODY" "$API/auth/login"
+	BIG_STATUS=$(head -1 "$HDR" | awk '{print $2}')
+	BIG_ACAO=$(_hdr "Access-Control-Allow-Origin")
+	if  "$BIG_STATUS" = "413" ; then
+		if  "$BIG_ACAO" = "https://allowed.example.com" ; then
+			_pass "a transport-built 413 carries Allow-Origin"
+		else
+			_fail "transport-built 413 CORS" "expected the echoed origin, got '$BIG_ACAO'"
+		fi
+		BIG_EXPOSE=$(_hdr "Access-Control-Expose-Headers")
+		case "$BIG_EXPOSE" in
+		*Retry-After*) _pass "Expose-Headers advertises Retry-After" ;;
+		*) _fail "Expose-Headers Retry-After" "got '$BIG_EXPOSE'" ;;
+		esac
+	else
+		_fail "transport-built 413" "expected 413, got '$BIG_STATUS'"
+	fi
+else
+	_pass "SKIPPED transport-built 413 CORS (python3 unavailable)"
+fi
+rm -f "$BIG_BODY"
+
+# --- OPTIONS preflight (Mode C, allowed origin). -----------------
+_curl -X OPTIONS \
+	-H "Origin: https://allowed.example.com" \
+	-H "Access-Control-Request-Method: POST" \
+	-H "Access-Control-Request-Headers: Authorization, Content-Type" \
+	"$API/downloads"
+STATUS=$(head -1 "$HDR" | awk '{print $2}')
+ACAO=$(_hdr "Access-Control-Allow-Origin")
+ACAM=$(_hdr "Access-Control-Allow-Methods")
+ACAH=$(_hdr "Access-Control-Allow-Headers")
+ACMA=$(_hdr "Access-Control-Max-Age")
+
+if  "$STATUS" = "204" ; then
+	_pass "Preflight OPTIONS → 204"
+else
+	_fail "Preflight status" "expected 204, got '$STATUS'"
+fi
+if  "$ACAO" = "https://allowed.example.com" ; then
+	_pass "Preflight: Allow-Origin echoes allowed origin"
+else
+	_fail "Preflight Allow-Origin" "expected echo, got '$ACAO'"
+fi
+if echo "$ACAM" | grep -q "POST" && echo "$ACAM" | grep -q "PATCH" \
+   && echo "$ACAM" | grep -q "DELETE"; then
+	_pass "Preflight: Allow-Methods lists mutating verbs"
+else
+	_fail "Allow-Methods" "expected POST/PATCH/DELETE listed, got '$ACAM'"
+fi
+# PUT specifically: PUT /api/v1/share_directories is a real route (the
+# replace-the-whole-share-root-list form), and it was missing from the
+# advertised list. A browser doing a cross-origin PUT there was told the
+# method is not allowed and blocked the request before sending it -- the
+# route worked from curl and was unreachable from a page.
+if echo "$ACAM" | grep -q "PUT"; then
+	_pass "Preflight: Allow-Methods lists PUT"
+else
+	_fail "Allow-Methods PUT" "PUT is a real route on /share_directories, got '$ACAM'"
+fi
+
+# And the same preflight asked about that route by name.
+_curl -X OPTIONS \
+	-H "Origin: https://allowed.example.com" \
+	-H "Access-Control-Request-Method: PUT" \
+	"$API/share_directories"
+PUT_STATUS=$(head -1 "$HDR" | awk '{print $2}')
+PUT_ACAM=$(_hdr "Access-Control-Allow-Methods")
+if  "$PUT_STATUS" = "204"  && echo "$PUT_ACAM" | grep -q "PUT"; then
+	_pass "Preflight for PUT /share_directories advertises PUT"
+else
+	_fail "Preflight PUT /share_directories" \
+		"status '$PUT_STATUS', Allow-Methods '$PUT_ACAM'"
+fi
+if echo "$ACAH" | grep -qi "Authorization" \
+   && echo "$ACAH" | grep -qi "If-None-Match" \
+   && echo "$ACAH" | grep -qi "Last-Event-ID"; then
+	_pass "Preflight: Allow-Headers lists Authorization, If-None-Match, Last-Event-ID"
+else
+	_fail "Allow-Headers" "missing one of the expected headers, got '$ACAH'"
+fi
+if  "$ACMA" = "86400" ; then
+	_pass "Preflight: Max-Age == 86400 (24h preflight cache)"
+else
+	_fail "Max-Age" "expected 86400, got '$ACMA'"
+fi
+
+# Preflight from a non-allowed origin: 204 with no Allow-Origin.
+# Browser will then block the actual request.
+_curl -X OPTIONS \
+	-H "Origin: https://attacker.example.com" \
+	-H "Access-Control-Request-Method: POST" \
+	"$API/downloads"
+STATUS=$(head -1 "$HDR" | awk '{print $2}')
+ACAO=$(_hdr "Access-Control-Allow-Origin")
+if  "$STATUS" = "204"  &&  -z "$ACAO" ; then
+	_pass "Preflight (non-allowed origin) → 204 with no Allow-Origin"
+else
+	_fail "Preflight rejection" \
+		"expected 204 + no Allow-Origin, got status='$STATUS' Allow-Origin='$ACAO'"
+fi
+
+# --- SSE response CORS headers (mode C, allowed origin). ---------
+#
+# Mode C is still active. Capture only the response head — we don't
+# need the stream body for header verification. Curl handles SSE
+# the same as any HTTP/1.1 chunked response; -I won't work because
+# HEAD doesn't trigger the streaming handler, so we do a short -m 2.
+: > "$HDR"; : > "$SSE"
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+curl -sS -m 2 -D "$HDR" -o "$SSE" \
+	-H "Origin: https://allowed.example.com" \
+	-H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/events" >/dev/null 2>&1 || true
+ACAO=$(_hdr "Access-Control-Allow-Origin")
+ACAC=$(_hdr "Access-Control-Allow-Credentials")
+CT=$(_hdr "Content-Type")
+if  "$ACAO" = "https://allowed.example.com" ; then
+	_pass "SSE response: Allow-Origin set for allowed origin"
+else
+	_fail "SSE Allow-Origin" "expected echo, got '$ACAO'"
+fi
+if  "$ACAC" = "true" ; then
+	_pass "SSE response: Allow-Credentials: true"
+else
+	_fail "SSE Allow-Credentials" "expected 'true', got '$ACAC'"
+fi
+if echo "$CT" | grep -qi "text/event-stream"; then
+	_pass "SSE response: Content-Type unchanged by CORS path"
+else
+	_fail "SSE Content-Type" "expected text/event-stream, got '$CT'"
+fi
+
+# --- Cleanup: restore AllowCORS=0 so subsequent manual smokes don't
+#     inherit a CORS-enabled config when re-run in the same
+#     /tmp/amuleapi-regtest. run-all.sh wipes between tests anyway,
+#     but this protects standalone invocations.
+_rewrite_cors_and_restart 0 ""
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/26-rfc-followup-endpoints.sh Added

@@ -0,0 +1,566 @@
+#!/usr/bin/env bash
+#
+# amuleapi 26-rfc-followup-endpoints — endpoints added to align with the RFC PR #132
+# review:
+#
+#   * GET    /status                       — `kad.network: {user_count,file_count,node_count}` rollup
+#   * POST   /shared_reload                — rescan share roots
+#   * POST   /servers_update               — refresh server list from server.met URL
+#   * POST   /servers/by-address/<ip>:<port>/connect — address-keyed route
+#   * DELETE /servers/by-address/<ip>:<port>         — address-keyed route
+#   * DELETE /logs/amule                   — clear amule log + in-process cache
+#   * DELETE /logs/server_info              — clear MOTD log + invalidate lazy cache
+#   * POST   /downloads {"links":...}    — array body, the only spelling
+#   * POST   /networks/disconnect          — `{"network":"ed2k"|"kad"|"both"}` selector
+#   * GET    /clients?activity=uploading|downloading|active
+#   * GET    /events?channels=<csv>        — subscribe to a subset of event types
+#
+# All log-mutating tests verify that a *fast* GET immediately after the
+# mutation returns post-mutation state (not stale cache).
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+TEST_HASH="0031c9cba65c50dd2015c184b2ca2c88"
+TEST_LINK="ed2k://|file|ubuntu-24.04.4-desktop-amd64.iso|6655619072|0031C9CBA65C50DD2015C184B2CA2C88|/"
+
+FAIL_COUNT=0
+TEST_COUNT=0
+# Skips are counted apart from TEST_COUNT, never folded into it: a skipped
+# check is coverage that did not happen, and adding it to the passed tally
+# would report the absence of a check as a check that succeeded.
+SKIP_COUNT=0
+SSE=$(mktemp -t amuleapi_26_rfc_followup_endpoints_sse.XXXXXX)
+trap '
+	rm -f "$SSE"
+	# Best-effort: delete any partfile this script may have left in
+	# amuled queue (Windows VM has ~63 GB on C: — a leftover 6.6 GB
+	# Ubuntu ISO partfile blocks the next run). Errors swallowed
+	# because the daemon may already be down on a CI tear-down.
+	if  -n "${ADMIN_TOKEN:-}" ; then
+		curl -s -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+			"$API/downloads/$TEST_HASH" > /dev/null 2>&1 || true
+	fi
+' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_skip() { SKIP_COUNT=$((SKIP_COUNT+1)); echo "  SKIP  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health"; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 26-rfc-followup-endpoints smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+H_AUTH=(-H "Authorization: Bearer $ADMIN_TOKEN")
+sleep 4
+
+# --- 1. /status kad.network rollup. ------------------------------
+STATUS=$(curl -s "${H_AUTH@}" "$API/status")
+if echo "$STATUS" | jq -e '.kad.network | type == "object"' >/dev/null 2>&1; then
+	_pass "/status .kad.network exists"
+else
+	_fail "/status kad.network" "missing: $(echo "$STATUS" | jq -c .kad)"
+fi
+for f in user_count file_count node_count; do
+	if echo "$STATUS" | jq -e ".kad.network.$f | type == \"number\"" >/dev/null 2>&1; then
+		_pass "/status .kad.network.$f is a number"
+	else
+		_fail "/status kad.network.$f" "missing/non-numeric"
+	fi
+done
+
+# --- 2. POST /shared_reload. -------------------------------------
+RC=$(curl -s -o /tmp/p11_shared_reload.json -w "%{http_code}" -X POST "${H_AUTH@}" \
+	"$API/shared_reload")
+if  "$RC" = "202" ; then
+	_pass "POST /shared_reload → 202"
+else
+	_fail "shared_reload status" "expected 202, got $RC: $(cat /tmp/p11_shared_reload.json)"
+fi
+# The 202 already said the call was accepted, so there is no constant `ok`.
+# A body exists only when amuled had a message; with nothing to report the
+# reply carries none, matching the URL-fetch triggers.
+if  ! -s /tmp/p11_shared_reload.json ; then
+	_pass "POST /shared_reload: 202 with no body (amuled reported nothing)"
+elif jq -e '(has("ok") | not) and (.message | type == "string")' \
+	/tmp/p11_shared_reload.json >/dev/null 2>&1; then
+	_pass "POST /shared_reload: 202 body carries amuled's message and no constant ok"
+else
+	_fail "shared_reload body" "expected no body or {message}, got: $(cat /tmp/p11_shared_reload.json)"
+fi
+
+# --- 3. POST /servers_update — body validation. ------------------
+RC=$(curl -s -o /tmp/p11_su.json -w "%{http_code}" -X POST "${H_AUTH@}" \
+	-H "Content-Type: application/json" -d '{}' "$API/servers_update")
+if  "$RC" = "400" ; then
+	_pass "POST /servers_update missing url → 400"
+else
+	_fail "servers_update no-body" "expected 400, got $RC"
+fi
+RC=$(curl -s -o /tmp/p11_su.json -w "%{http_code}" -X POST "${H_AUTH@}" \
+	-H "Content-Type: application/json" \
+	-d '{"url":"ftp://nope"}' "$API/servers_update")
+if  "$RC" = "400" ; then
+	_pass "POST /servers_update non-http url → 400"
+else
+	_fail "servers_update bad url" "expected 400, got $RC"
+fi
+RC=$(curl -s -o /tmp/p11_su.json -w "%{http_code}" -X POST "${H_AUTH@}" \
+	-H "Content-Type: application/json" \
+	-d '{"url":"http://upd.emule-security.org/server.met"}' \
+	"$API/servers_update")
+if  "$RC" = "202" ; then
+	_pass "POST /servers_update valid url → 202"
+else
+	_fail "servers_update happy path" "got $RC: $(cat /tmp/p11_su.json)"
+fi
+
+# --- 4. /servers/by-address/<ip>:<port> connect + DELETE. --------
+# 404 path is always testable. 192.0.2.x is TEST-NET-1 (RFC 5737),
+# reserved for documentation and guaranteed never to be a real server,
+# so this reaches the "well-formed but no such server" branch rather
+# than being turned away earlier as bad input.
+UNKNOWN_SRV=192.0.2.1:1
+RC=$(curl -s -o /dev/null -w "%{http_code}" -X POST "${H_AUTH@}" \
+	"$API/servers/by-address/$UNKNOWN_SRV/connect")
+if  "$RC" = "404" ; then
+	_pass "POST /servers/by-address/<unknown-ip:port>/connect → 404"
+else
+	_fail "address alias 404" "expected 404, got $RC"
+fi
+RC=$(curl -s -o /dev/null -w "%{http_code}" -X DELETE "${H_AUTH@}" \
+	"$API/servers/by-address/$UNKNOWN_SRV")
+if  "$RC" = "404" ; then
+	_pass "DELETE /servers/by-address/<unknown-ip:port> → 404"
+else
+	_fail "address alias DELETE 404" "expected 404, got $RC"
+fi
+# 0.0.0.0 is well-formed but is not a server address, and it must never
+# reach the lookup: a server row whose IP the daemon did not ship keeps
+# ip == 0, so a 0.0.0.0 selector could otherwise resolve to whichever
+# such row shared the port. Rejected as bad input, and the message says
+# so rather than claiming a malformed quad.
+BODY=$(curl -s -X POST "${H_AUTH@}" "$API/servers/by-address/0.0.0.0:4242/connect")
+RC=$(curl -s -o /dev/null -w "%{http_code}" -X POST "${H_AUTH@}" \
+	"$API/servers/by-address/0.0.0.0:4242/connect")
+if  "$RC" = "400"  && printf '%s' "$BODY" | jq -e '.error.code == "bad_request"' >/dev/null 2>&1; then
+	_pass "POST /servers/by-address/0.0.0.0:<port>/connect → 400 (not a server address)"
+else
+	_fail "0.0.0.0 selector rejected" "expected 400 bad_request, got $RC: $BODY"
+fi
+if printf '%s' "$BODY" | jq -e '.error.message | test("malformed") | not' >/dev/null 2>&1; then
+	_pass "0.0.0.0 rejection does not claim a malformed quad"
+else
+	_fail "0.0.0.0 rejection message" "still reports a syntax error: $BODY"
+fi
+# A genuinely malformed selector still reports malformed.
+BODY=$(curl -s -X POST "${H_AUTH@}" "$API/servers/by-address/not-an-ip:4242/connect")
+if printf '%s' "$BODY" | jq -e '.error.message | test("malformed")' >/dev/null 2>&1; then
+	_pass "a malformed selector still reports malformed"
+else
+	_fail "malformed selector message" "expected a malformed-selector error, got: $BODY"
+fi
+# Positive path: only test if there's actually a server in the cache.
+# The address field is the canonical "<ip-or-hostname>:<port>" string
+# the daemon reports, so we use it verbatim (no need to convert the
+# numeric `ip` field — `address` is the operator-meaningful form).
+ADDR=$(curl -s "${H_AUTH@}" "$API/servers" \
+	| jq -r '.servers0.address // empty')
+if  -n "$ADDR"  &&  "$ADDR" != "null" ; then
+	RC=$(curl -s -o /dev/null -w "%{http_code}" -X POST "${H_AUTH@}" \
+		"$API/servers/by-address/$ADDR/connect")
+	if  "$RC" = "202"  ||  "$RC" = "200" ; then
+		_pass "POST /servers/$ADDR/connect resolves alias and accepts ($RC)"
+	else
+		_fail "address alias connect" "expected 200/202, got $RC"
+	fi
+else
+	_skip "address-keyed server connect (no servers in cache)"
+fi
+
+# --- 5. DELETE /logs/amule + freshness. --------------------------
+RC=$(curl -s -o /dev/null -w "%{http_code}" -X DELETE "${H_AUTH@}" \
+	"$API/logs/amule")
+if  "$RC" = "204" ; then
+	_pass "DELETE /logs/amule → 204"
+else
+	_fail "logs/amule DELETE" "expected 204, got $RC"
+fi
+# Fast GET immediately after — must show empty / post-reset state.
+GET_BODY=$(curl -s "${H_AUTH@}" "$API/logs/amule")
+LINES=$(echo "$GET_BODY" | jq -r '.lines | length' 2>/dev/null)
+TOTAL=$(echo "$GET_BODY" | jq -r '.total_lines' 2>/dev/null)
+if  "$LINES" = "0"  &&  "$TOTAL" = "0" ; then
+	_pass "GET /logs/amule immediately after DELETE returns empty (no stale cache)"
+else
+	_fail "logs/amule post-DELETE freshness" \
+		"lines=$LINES total=$TOTAL — expected 0/0"
+fi
+
+# --- 6. DELETE /logs/server_info + freshness (lazy cache!). -------
+RC=$(curl -s -o /dev/null -w "%{http_code}" -X DELETE "${H_AUTH@}" \
+	"$API/logs/server_info")
+if  "$RC" = "204" ; then
+	_pass "DELETE /logs/server_info → 204"
+else
+	_fail "logs/server_info DELETE" "expected 204, got $RC"
+fi
+# Fast GET immediately after — must show empty / post-reset.
+GET_BODY=$(curl -s "${H_AUTH@}" "$API/logs/server_info")
+BYTES=$(echo "$GET_BODY" | jq -r '.total_bytes' 2>/dev/null)
+if  "$BYTES" = "0" ; then
+	_pass "GET /logs/server_info immediately after DELETE returns empty (lazy cache invalidated)"
+else
+	_fail "logs/server_info post-DELETE freshness" \
+		"total_bytes=$BYTES — expected 0"
+fi
+
+# --- 7. POST /downloads array body shape. ------------------------
+# Cleanup any prior queue entry to make the test deterministic.
+# A robust cleanup tries the DELETE, then waits until the file is
+# really gone from /downloads (amuled processes DELETE asynchronously
+# — the entry stays around for one or two refresher ticks while the
+# partfile is unmapped). Without this, the next POST returns
+# "Invalid link or already on list" and the test misreads the
+# wire shape verdict.
+_wait_for_no_download() {
+	for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+		local present=$(curl -s "${H_AUTH@}" "$API/downloads" \
+			| jq -r --arg h "$TEST_HASH" \
+				'.downloads | map(select(.hash == $h)) | length')
+		if  "$present" = "0" ; then return 0; fi
+		sleep 1
+	done
+	return 1
+}
+curl -s -X DELETE "${H_AUTH@}" "$API/downloads/$TEST_HASH" > /dev/null
+_wait_for_no_download || true
+
+# Array form
+RC=$(curl -s -o /tmp/p11_dl.json -w "%{http_code}" -X POST "${H_AUTH@}" \
+	-H "Content-Type: application/json" \
+	-d "{\"links\":\"$TEST_LINK\"}" "$API/downloads")
+if  "$RC" = "202" ; then
+	_pass "POST /downloads array form → 202"
+else
+	_fail "downloads array status" "expected 202, got $RC: $(cat /tmp/p11_dl.json)"
+fi
+# Per-item results envelope (#358): one accepted result.
+if jq -e '(.results | length) == 1 and .results0.ok == true' /tmp/p11_dl.json >/dev/null 2>&1; then
+	_pass "POST /downloads array reports one ok result"
+else
+	_fail "downloads array results" "$(cat /tmp/p11_dl.json)"
+fi
+# `links` is the only spelling. The singular `ed2k_link` is refused
+# rather than ignored, with or without `links` alongside it, and the message
+# names the array form so a caller sending it is told where to go.
+for BODY in \
+	"{\"ed2k_link\":\"$TEST_LINK\",\"links\":\"$TEST_LINK\"}" \
+	"{\"ed2k_link\":\"$TEST_LINK\"}"; do
+	RC=$(curl -s -o /tmp/p11_dl_alias.json -w "%{http_code}" -X POST "${H_AUTH@}" \
+		-H "Content-Type: application/json" -d "$BODY" "$API/downloads")
+	if  "$RC" = "400" ; then
+		_pass "POST /downloads with ed2k_link → 400"
+	else
+		_fail "downloads ed2k_link body" "expected 400, got $RC"
+	fi
+done
+if jq -e '.error.message | test("`links`")' /tmp/p11_dl_alias.json >/dev/null 2>&1; then
+	_pass 'the ed2k_link 400 names `links` as the replacement'
+else
+	_fail "ed2k_link 400 message" "$(cat /tmp/p11_dl_alias.json)"
+fi
+
+# --- 8. POST /networks/disconnect selector. ----------------------
+# Default (no body) = both
+RC=$(curl -s -o /tmp/p11_nd.json -w "%{http_code}" -X POST "${H_AUTH@}" \
+	"$API/networks/disconnect")
+if  "$RC" = "202" ; then
+	_pass "POST /networks/disconnect (no body) → 202 default=both"
+else
+	_fail "networks disconnect no-body" "expected 202, got $RC"
+fi
+sleep 2
+# selector=ed2k
+RC=$(curl -s -o /dev/null -w "%{http_code}" -X POST "${H_AUTH@}" \
+	-H "Content-Type: application/json" \
+	-d '{"network":"ed2k"}' "$API/networks/disconnect")
+if  "$RC" = "202" ; then
+	_pass "POST /networks/disconnect {\"network\":\"ed2k\"} → 202"
+else
+	_fail "networks disconnect ed2k" "expected 202, got $RC"
+fi
+sleep 1
+# selector=kad
+RC=$(curl -s -o /dev/null -w "%{http_code}" -X POST "${H_AUTH@}" \
+	-H "Content-Type: application/json" \
+	-d '{"network":"kad"}' "$API/networks/disconnect")
+if  "$RC" = "202" ; then
+	_pass "POST /networks/disconnect {\"network\":\"kad\"} → 202"
+else
+	_fail "networks disconnect kad" "expected 202, got $RC"
+fi
+# Invalid selector
+RC=$(curl -s -o /dev/null -w "%{http_code}" -X POST "${H_AUTH@}" \
+	-H "Content-Type: application/json" \
+	-d '{"network":"icq"}' "$API/networks/disconnect")
+if  "$RC" = "400" ; then
+	_pass "POST /networks/disconnect bogus selector → 400"
+else
+	_fail "networks disconnect bogus" "expected 400, got $RC"
+fi
+
+# --- 9. /clients filter. -----------------------------------------
+# Get baseline first
+TOTAL_CLIENTS=$(curl -s "${H_AUTH@}" "$API/clients" \
+	| jq '.clients | length')
+UP_CLIENTS=$(curl -s "${H_AUTH@}" "$API/clients?activity=uploading" \
+	| jq '.clients | length')
+DOWN_CLIENTS=$(curl -s "${H_AUTH@}" "$API/clients?activity=downloading" \
+	| jq '.clients | length')
+ACTIVE_CLIENTS=$(curl -s "${H_AUTH@}" "$API/clients?activity=active" \
+	| jq '.clients | length')
+if  "$UP_CLIENTS" -le "$TOTAL_CLIENTS"  2>/dev/null \
+   &&  "$DOWN_CLIENTS" -le "$TOTAL_CLIENTS"  2>/dev/null \
+   &&  "$ACTIVE_CLIENTS" -le "$TOTAL_CLIENTS"  2>/dev/null; then
+	_pass "/clients activity: total=$TOTAL_CLIENTS up=$UP_CLIENTS down=$DOWN_CLIENTS active=$ACTIVE_CLIENTS (each ≤ total)"
+else
+	_fail "clients activity sizing" \
+		"total=$TOTAL_CLIENTS up=$UP_CLIENTS down=$DOWN_CLIENTS active=$ACTIVE_CLIENTS"
+fi
+# `active` = |uploading ∪ downloading|, so it sits in
+# max(up, down), up+down. The lower bound holds because every
+# uploading-or-downloading-only client is in active; the upper bound holds
+# because a client simultaneously in both states (upload_state=uploading
+# AND download_state=downloading) gets counted once in active but
+# twice in (up + down). Exact equality is intentionally not asserted
+# because the intersection count is unobservable from activity results
+# alone.
+EXP_UPPER=$((UP_CLIENTS + DOWN_CLIENTS))
+if  "$ACTIVE_CLIENTS" -ge "$UP_CLIENTS"  2>/dev/null \
+   &&  "$ACTIVE_CLIENTS" -ge "$DOWN_CLIENTS"  2>/dev/null \
+   &&  "$ACTIVE_CLIENTS" -le "$EXP_UPPER"  2>/dev/null; then
+	_pass "/clients?activity=active sits in max(up,down), up+down"
+else
+	_fail "clients active span" \
+		"active=$ACTIVE_CLIENTS up=$UP_CLIENTS down=$DOWN_CLIENTS (expected max..sum)"
+fi
+# Verify every entry in /clients?activity=uploading truly has upload_state=uploading
+BAD=$(curl -s "${H_AUTH@}" "$API/clients?activity=uploading" \
+	| jq -r '.clients | select(.upload_state != "uploading") | .ecid' \
+	| head -1)
+if  -z "$BAD" ; then
+	_pass "/clients?activity=uploading only returns upload_state=uploading clients"
+else
+	_fail "clients activity=uploading content" \
+		"client_ecid $BAD has wrong upload_state"
+fi
+# Bogus filter → 400
+RC=$(curl -s -o /dev/null -w "%{http_code}" "${H_AUTH@}" \
+	"$API/clients?activity=alphabetical")
+if  "$RC" = "400" ; then
+	_pass "/clients?activity=<bogus> → 400"
+else
+	_fail "clients bogus activity" "expected 400, got $RC"
+fi
+
+# --- 9a-bis. Base transfer-filename fields on the LIST object -----
+# (PR #646 / issue #115). upload_file_name (the partfile a peer is
+# downloading FROM us) and download_file_name (the name the peer
+# advertised) are both part of the base client field set, so they must
+# appear on every /clients LIST object -- not only /clients/{ecid}.
+# This keeps an upload-only peer's File column in the WebUI populated, since
+# upload_file_name is on the LIST object and not only the detail endpoint.
+# Guarded on a live peer so the assertion is real (non-vacuous)
+# when a peer exists, and skips cleanly when none are connected.
+FIRST_CLIENT=$(curl -s "${H_AUTH@}" "$API/clients" | jq -r '.clients0 // empty')
+if  -n "$FIRST_CLIENT" ; then
+	if curl -s "${H_AUTH@}" "$API/clients" | jq -e '
+		.clients | all(.;
+			((.upload_file_name | type) as $t | $t == "string" or $t == "null")
+			and ((.download_file_name | type) as $t | $t == "string" or $t == "null"))' \
+		>/dev/null 2>&1; then
+		_pass "/clients list objects carry upload_file_name + download_file_name"
+	else
+		_fail "clients base filename fields" \
+			"a /clients object is missing upload_file_name/download_file_name or it is neither string nor null"
+	fi
+else
+	_skip "/clients base filename-field check (no peers connected)"
+fi
+
+# --- 9a-ter. friends-list flag on the LIST object (issue #1475) ---
+# friend is friends-list membership and used to be detail-only, which left a
+# front-end unable to mark a friend in the peer lists. It is a plain boolean,
+# never null: an absent EC tag degrades to false. friend_slot is checked
+# alongside it because the two are easy to confuse and carry different meanings.
+# Read-only, so it is safe here rather than at the end of the file.
+if  -n "$FIRST_CLIENT" ; then
+	if curl -s "${H_AUTH@}" "$API/clients" | jq -e '
+		.clients | all(.;
+			(.friend | type) == "boolean"
+			and (.friend_slot | type) == "boolean")' \
+		>/dev/null 2>&1; then
+		_pass "/clients list objects carry friend + friend_slot booleans"
+	else
+		_fail "clients friend field" \
+			"a /clients object is missing friend/friend_slot or it is not a boolean"
+	fi
+	# credit_ratio moved to the list row with it (issue #1474): the core's modifier,
+	# null when the daemon does not send the tag, never re-derived from the totals.
+	if curl -s "${H_AUTH@}" "$API/clients" | jq -e '
+		.clients | all(.;
+			has("credit_ratio")
+			and ((.credit_ratio | type) == "number" or .credit_ratio == null)
+			and (.credit_ratio == null or (.credit_ratio >= 1 and .credit_ratio <= 10)))' \
+		>/dev/null 2>&1; then
+		_pass "/clients list objects carry credit_ratio (number in 1,10 or null)"
+	else
+		_fail "clients credit_ratio field" \
+			"a /clients object is missing credit_ratio, has the wrong type, or is out of range"
+	fi
+else
+	_skip "/clients friend-field check (no peers connected)"
+fi
+
+# --- 9b. /clients/{ecid} detail (issue #422). --------------------
+# A superset of the list object: every list field plus the detail-only
+# B fields. Guarded on a live peer; the negative cases run regardless.
+FIRST_ECID=$(curl -s "${H_AUTH@}" "$API/clients" \
+	| jq -r '.clients0.ecid // empty')
+if  -n "$FIRST_ECID" ; then
+	DETAIL=$(curl -s "${H_AUTH@}" "$API/clients/$FIRST_ECID")
+	OK=$(echo "$DETAIL" | jq -r --argjson e "$FIRST_ECID" '
+		(.ecid == $e)
+		and has("user_hash")
+		and has("upload_file_name") and has("download_file_name")
+		and has("ed2k_user_id") and has("high_id")
+		and has("server_ip") and has("server_port") and has("server_name")
+		and has("kad_port") and has("source_origin")
+		and has("parts_offered_count") and has("client_mod_name")
+		and has("shared_files_browsable")
+		and has("friend") and has("credit_ratio")')
+	if  "$OK" = "true" ; then
+		_pass "/clients/{ecid} returns detail superset (ecid=$FIRST_ECID)"
+	else
+		_fail "clients detail shape" "missing detail fields: $DETAIL"
+	fi
+else
+	_skip "/clients/{ecid} detail 200 (no peers connected)"
+fi
+# Unknown ecid → 404 (0xFFFFFFFF is effectively never a live ECID)
+RC=$(curl -s -o /dev/null -w "%{http_code}" "${H_AUTH@}" "$API/clients/4294967295")
+if  "$RC" = "404" ; then
+	_pass "/clients/{unknown-ecid} → 404"
+else
+	_fail "clients detail 404" "expected 404, got $RC"
+fi
+# Non-numeric ecid path → 400
+RC=$(curl -s -o /dev/null -w "%{http_code}" "${H_AUTH@}" "$API/clients/not-a-number")
+if  "$RC" = "400" ; then
+	_pass "/clients/{non-numeric} → 400"
+else
+	_fail "clients detail 400" "expected 400, got $RC"
+fi
+# Non-GET → 405
+RC=$(curl -s -o /dev/null -w "%{http_code}" -X POST "${H_AUTH@}" "$API/clients/1")
+if  "$RC" = "405" ; then
+	_pass "POST /clients/{ecid} → 405"
+else
+	_fail "clients detail 405" "expected 405, got $RC"
+fi
+
+# --- 10. /events ?channels= filter. ------------------------------
+# Test 8 left the daemon disconnected; reconnect so download_* /
+# status_* events have a reason to fire.
+curl -s -X POST "${H_AUTH@}" "$API/networks/connect" > /dev/null
+sleep 6
+curl -s -X DELETE "${H_AUTH@}" "$API/downloads/$TEST_HASH" > /dev/null
+_wait_for_no_download || true
+: > "$SSE"
+( curl -s -m 10 -N "${H_AUTH@}" \
+	"$API/events?channels=downloads,status" \
+	>> "$SSE" 2>&1 ) &
+PID=$!
+sleep 2
+curl -s -X POST "${H_AUTH@}" -H "Content-Type: application/json" \
+	-d "{\"links\":\"$TEST_LINK\"}" "$API/downloads" > /dev/null
+sleep 6
+kill $PID 2>/dev/null
+wait $PID 2>/dev/null
+
+# In the channels=downloads,status window we MUST see download_* / status_*
+# events and MUST NOT see client_* / server_* / shared_* / log_* events.
+if grep -qE "^event: (download_added|download_updated|status_changed)$" "$SSE"; then
+	_pass "/events?channels=downloads,status delivers download/status events"
+else
+	_fail "events channel-filter positive" \
+		"no download/status events seen; sample: $(head -10 "$SSE")"
+fi
+# comments_ is in this list on purpose. comments_updated has the prefix
+# `comments`, which event_channel does not map, so its channel is literally
+# `comments` -- NOT `downloads`, even though the event is a downloads
+# concern and the prose reads that way. The channel table documents it as
+# its own row; if anyone later folds the prefix into `downloads` without
+# updating that table, this assertion is what notices.
+LEAKED=$(grep -cE "^event: (client_|server_|shared_|log_|search_|comments_)" "$SSE" || true)
+if  "$LEAKED" -eq 0 ; then
+	_pass "/events?channels=downloads,status excludes client/server/shared/log/search/comments events"
+else
+	_fail "events channel-filter leak" \
+		"$LEAKED off-channel events leaked through"
+fi
+
+# Positive: ?channels=search delivers search events and excludes downloads.
+: > "$SSE"
+( curl -s -m 12 -N "${H_AUTH@}" \
+	"$API/events?channels=search" \
+	>> "$SSE" 2>&1 ) &
+PID=$!
+sleep 1
+curl -s -X POST "${H_AUTH@}" -H "Content-Type: application/json" \
+	-d '{"query":"ubuntu","type":"local"}' "$API/search" > /dev/null
+sleep 8
+kill $PID 2>/dev/null
+wait $PID 2>/dev/null
+
+if grep -qE "^event: search_progress$" "$SSE"; then
+	_pass "/events?channels=search delivers search_progress"
+else
+	_fail "events channel=search positive" \
+		"no search_progress in 8 s; sample: $(head -10 "$SSE")"
+fi
+LEAKED=$(grep -cE "^event: (download_|status_|client_|server_|shared_|log_)" "$SSE" || true)
+if  "$LEAKED" -eq 0 ; then
+	_pass "/events?channels=search excludes non-search events"
+else
+	_fail "events channel=search leak" \
+		"$LEAKED off-channel events leaked through"
+fi
+
+# --- Summary. -----------------------------------------------------
+echo
+SKIP_NOTE=""
+ "$SKIP_COUNT" -gt 0  && SKIP_NOTE=" ($SKIP_COUNT check(s) skipped)"
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed$SKIP_NOTE"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/27-static-frontend.sh Added

@@ -0,0 +1,265 @@
+#!/usr/bin/env bash
+#
+# amuleapi 27-static-frontend — static-frontend fallthrough.
+#
+# Asserts that GET / HEAD requests outside `/api/` are served from the
+# directory pointed to by `Server/StaticRoot` when set; that the
+# realpath-based symlink containment rejects escapes; that the 16 MiB
+# size cap fires; that conditional GET via `If-None-Match` short-
+# circuits to 304; and that the SPA fallback to `index.html` only
+# kicks in for extension-less misses (not for missing assets).
+#
+# Requires `Server/StaticRoot` set to a writable directory containing
+# an `index.html` (the script plants symlinks + a 17 MiB sentinel there
+# during the run). `run-all.sh` provisions /tmp/amuleapi-27-static-frontend-static
+# automatically; manual runs need to edit the conf themselves.
+# Note: discovery of the install-path default (`AMULEAPI_STATIC_DIR`,
+# bundle Resources, wxStandardPaths) is covered by StaticFsTest at the
+# unit level; this script covers the static-serve wire mechanics.
+#
+# Usage:
+#   amuleapi --config-dir=/tmp/amuleapi-regtest &
+#   ./27-static-frontend.sh
+#
+# Exits 0 on success, 1 on any failed assertion, 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_27_static_frontend_body.XXXXXX)
+CURL_HEAD_FILE=$(mktemp -t amuleapi_27_static_frontend_head.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE" "$CURL_HEAD_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 \
+		-D "$CURL_HEAD_FILE" \
+		-o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+	CURL_HEAD=$(cat "$CURL_HEAD_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required for JSON assertions. brew install jq."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+# Resolve the configured StaticRoot from the daemon's conf so the
+# script can plant a symlink + oversized file in it during the run.
+# run-all.sh provisions a writable /tmp scratch dir before each
+# 27-static-frontend run; for manual runs, set StaticRoot in amuleapi.conf to a
+# writable directory containing an index.html before launching the
+# daemon. (Discovery of the install-path default is unit-tested in
+# StaticFsTest and manually verified per-platform — this phase is
+# specifically the static-serve mechanics, not the discovery chain.)
+CONF_DIR=${AMULEAPI_CONFIG_DIR:-/tmp/amuleapi-regtest}
+STATIC_ROOT=$(awk -F= '/^StaticRoot=/ {sub(/\r +$/,"",$2); print $2; exit}' \
+	"$CONF_DIR/amuleapi.conf" 2>/dev/null)
+
+if  -z "$STATIC_ROOT" ; then
+	_die "Server/StaticRoot is empty in $CONF_DIR/amuleapi.conf — set it to a writable dir with an index.html, then re-run."
+fi
+
+if  ! -d "$STATIC_ROOT" ; then
+	_die "StaticRoot=$STATIC_ROOT in conf does not exist on disk"
+fi
+if  ! -w "$STATIC_ROOT" ; then
+	_die "StaticRoot=$STATIC_ROOT is not writable (27-static-frontend plants symlinks + an oversized file there)"
+fi
+
+echo "amuleapi 27-static-frontend @ $HOST — StaticRoot=$STATIC_ROOT"
+
+# Stage transient assets in StaticRoot for the duration of the run.
+# Restore the directory's pre-test state on exit so re-running doesn't
+# accumulate stale symlinks.
+# Section 10 rewrites index.html in place. That is the one file in here the
+# test does not own -- the others it plants itself -- so its restore runs from
+# the trap rather than from the end of the block: a _die anywhere in between
+# (a curl that cannot reach the daemon, say) would otherwise leave a
+# contributor with a mutated WebUI shell and no hint as to why.
+INDEX_BACKUP=
+_restore_index() {
+	# Refuse to restore from a backup that is missing or empty. A failed
+	# cp would otherwise overwrite a working shell with a zero-length
+	# file, which is a worse outcome than leaving the appended marker --
+	# that at least still renders and is visible in a diff.
+	if  -n "$INDEX_BACKUP"  &&  -s "$INDEX_BACKUP" ; then
+		cp "$INDEX_BACKUP" "$STATIC_ROOT/index.html" 2>/dev/null \
+			|| echo "  WARN  could not restore $STATIC_ROOT/index.html from $INDEX_BACKUP"
+	elif  -n "$INDEX_BACKUP" ; then
+		echo "  WARN  backup $INDEX_BACKUP is missing or empty; leaving index.html as-is"
+	fi
+	 -n "$INDEX_BACKUP"  && rm -f "$INDEX_BACKUP"
+	INDEX_BACKUP=
+}
+trap 'rm -f "$CURL_BODY_FILE" "$CURL_HEAD_FILE" \
+	"$STATIC_ROOT/escape.txt" "$STATIC_ROOT/escape.css" \
+	"$STATIC_ROOT/huge.bin"; _restore_index' EXIT
+
+# --- 1. GET / serves the placeholder index. -----------------------
+_curl "$HOST/"
+_assert_status 200 "GET / serves the placeholder index"
+case "$CURL_HEAD" in
+	*Ccontent-Ttype:*text/html*) _pass "Content-Type is text/html on /" ;;
+	*) _fail "/ Content-Type" "expected text/html, got: $(echo "$CURL_HEAD" | grep -i content-type)" ;;
+esac
+
+# --- 2. Strong ETag header is present. ----------------------------
+ETAG=$(echo "$CURL_HEAD" | awk -F': ' 'tolower($1) == "etag" {gsub(/\r/,""); print $2}')
+if  -n "$ETAG" ; then
+	_pass "GET / emits an ETag header ($ETAG)"
+else
+	_fail "/ ETag" "no ETag header found in response headers"
+fi
+
+# --- 3. If-None-Match → 304. --------------------------------------
+_curl -H "If-None-Match: $ETAG" "$HOST/"
+_assert_status 304 "If-None-Match matching ETag → 304"
+
+# --- 4. /index.html explicit also works. --------------------------
+_curl "$HOST/index.html"
+_assert_status 200 "GET /index.html → 200"
+
+# --- 5. SPA fallback for extension-less unknown route. ------------
+_curl "$HOST/transfers"
+_assert_status 200 "GET /transfers (extension-less unknown) → 200 SPA fallback"
+
+# --- 6. Missing-with-extension is an honest 404. ------------------
+_curl "$HOST/missing.css"
+_assert_status 404 "GET /missing.css → 404"
+
+# --- 7. /api/v1/* still routes through the API dispatcher. --------
+_curl "$API/version"
+_assert_status 200 "GET /api/v1/version is still routed to API (200)"
+
+# --- 8. Symlink-escape containment (extension-bearing). -----------
+# `realpath` resolves through the symlink. If the result escapes
+# StaticRoot, the daemon must 404. Anything else is a leak.
+ln -sf /etc/passwd "$STATIC_ROOT/escape.txt"
+_curl "$HOST/escape.txt"
+_assert_status 404 "Symlink /escape.txt → /etc/passwd is rejected (404)"
+case "$CURL_BODY" in
+	*root:*) _fail "escape.txt body" "response leaked /etc/passwd contents" ;;
+	*) _pass "/escape.txt response does not leak /etc/passwd" ;;
+esac
+
+ln -sf /etc/passwd "$STATIC_ROOT/escape.css"
+_curl "$HOST/escape.css"
+_assert_status 404 "Symlink /escape.css → /etc/passwd is rejected (404)"
+
+# --- 9. 16 MiB size cap. ------------------------------------------
+# Plant a 17 MiB regular file inside StaticRoot. The daemon should
+# stat it, see it exceeds the cap, and 404 without reading.
+if command -v mkfile >/dev/null 2>&1; then
+	mkfile -n 17m "$STATIC_ROOT/huge.bin" >/dev/null
+else
+	dd if=/dev/zero of="$STATIC_ROOT/huge.bin" bs=1m count=17 \
+		status=none 2>/dev/null
+fi
+_curl "$HOST/huge.bin"
+_assert_status 404 "Oversized /huge.bin (>16 MiB) → 404"
+
+# --- 10. A rewritten asset revalidates to its new bytes. ----------
+# Rewrite index.html the way a daemon upgrade does, then re-request it the
+# way a client holding the old copy would -- conditional on the validator it
+# stored -- and require the new bytes.
+#
+# What this does NOT guard is the cache policy. curl always sends the
+# conditional request, so it cannot exhibit the behaviour a freshness
+# lifetime causes, which is a browser reusing its copy WITHOUT asking; this
+# block passes byte-identically under `public, max-age=86400,
+# must-revalidate`. The guard for that is _assert_revalidates_every_time in
+# 40-http-conformance, which fails on that policy. What is asserted here is
+# narrower and still worth having: when a client does ask, it is told the
+# truth rather than answered 304 against a stale validator.
+INDEX_BACKUP=$(mktemp -t amuleapi_27_index.XXXXXX)
+if ! cp "$STATIC_ROOT/index.html" "$INDEX_BACKUP" 2>/dev/null ||  ! -s "$INDEX_BACKUP" ; then
+	# No usable backup means no mutation: this block rewrites a file it
+	# does not own, and doing that without a way back is not worth one
+	# assertion.
+	_fail "a rewritten shell revalidates to its new bytes" \
+		"could not back up $STATIC_ROOT/index.html; skipped the rewrite rather than risk it"
+	# mktemp already created the file, so clearing the variable alone
+	# would leak the empty one.
+	rm -f "$INDEX_BACKUP"
+	INDEX_BACKUP=
+fi
+if  -n "$INDEX_BACKUP" ; then
+_curl "$HOST/index.html"
+OLD_ETAG=$(printf '%s' "$CURL_HEAD" | awk 'tolower($1)=="etag:"{print $2}' | tr -d '\r')
+OLD_BODY=$CURL_BODY
+if  -z "$OLD_ETAG" ; then
+	_fail "a rewritten shell revalidates to its new bytes" \
+		"no ETag on the first GET, nothing to revalidate with"
+else
+	# The validator is mtime+size, so change both. An upgrade that happens
+	# to preserve the size within the same second is a separate concern
+	# and not what this asserts.
+	printf '\n\n' >> "$STATIC_ROOT/index.html"
+	_curl "$HOST/index.html" -H "If-None-Match: $OLD_ETAG"
+	if  "$CURL_STATUS" = "304" ; then
+		_fail "a rewritten shell revalidates to its new bytes" \
+			"the rewritten file was answered 304 against the pre-upgrade validator"
+	elif  "$CURL_STATUS" != "200" ; then
+		_fail "a rewritten shell revalidates to its new bytes" \
+			"expected 200 with the new bytes, got HTTP $CURL_STATUS"
+	elif  "$CURL_BODY" = "$OLD_BODY" ; then
+		_fail "a rewritten shell revalidates to its new bytes" \
+			"200 carried the pre-upgrade bytes"
+	else
+		_pass "a rewritten shell revalidates to its new bytes (200, new bytes)"
+	fi
+	# And an UNCHANGED shell still revalidates cheaply. This is why the
+	# policy is no-cache rather than no-store: the copy stays in the cache
+	# and costs one bodiless 304, not a re-download.
+	_curl "$HOST/index.html"
+	NEW_ETAG=$(printf '%s' "$CURL_HEAD" | awk 'tolower($1)=="etag:"{print $2}' | tr -d '\r')
+	_curl "$HOST/index.html" -H "If-None-Match: $NEW_ETAG"
+	if  "$CURL_STATUS" = "304" ; then
+		_pass "an unchanged shell still costs one 304, not a re-download"
+	else
+		_fail "an unchanged shell still costs one 304" "got HTTP $CURL_STATUS"
+	fi
+fi
+# Restored by the EXIT trap, not here, so a _die in between cannot leave the
+# shell rewritten.
+fi
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/28-list-pagination-sort.sh Added

@@ -0,0 +1,351 @@
+#!/usr/bin/env bash
+#
+# amuleapi list pagination + sorting (issue #357, keyset paging #1173).
+# Exercises the shared ?limit/&offset/&sort/&order/&after machinery across the
+# list endpoints: /downloads, /shared, /servers, /clients, /categories,
+# /friends, /known_clients, /chats and /search/{id}/results.
+#
+# Data-tolerant like the other read smokes — it asserts the pagination
+# metadata (`total`/`offset`/`limit`), that `limit` bounds the array length,
+# that an omitted `limit` selects the default page of 100, and that malformed
+# params are rejected with 400. Per-endpoint `sort` is only asserted accepted
+# (valid field) or rejected (unknown field); the two keyset sweeps below do
+# check coverage against real data (a string `hash` anchor on /shared, a
+# numeric `index` anchor on /categories).
+#
+# Bring-up convention (see run-all.sh / 04-read-downloads-shared.sh):
+#   amuleapi --config-dir=/tmp/... --host=127.0.0.1 --port=4712 \
+#            --password=amule --set-admin-pass=adminpass
+#   amuleapi --config-dir=/tmp/... --host=127.0.0.1 --port=4712 \
+#            --password=amule &
+#   ./28-list-pagination-sort.sh
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_28_list_pagination_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 \
+		-o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+# jq expr must evaluate to a number; assert it is <= bound.
+_assert_json_le() {
+	local expr=$1 bound=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null)
+	if  -n "$actual"  &&  "$actual" != "null"  &&  "$actual" -le "$bound"  2>/dev/null; then
+		_pass "$label ($actual <= $bound)"
+	else
+		_fail "$label" "expected <= $bound, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+# jq expr must evaluate to a number; assert it is >= bound. A non-numeric
+# result (a failed GET yields the string "null") fails rather than skips.
+_assert_json_ge() {
+	local expr=$1 bound=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null)
+	if  -n "$actual"  &&  "$actual" != "null"  &&  "$actual" -ge "$bound"  2>/dev/null; then
+		_pass "$label ($actual >= $bound)"
+	else
+		_fail "$label" "expected >= $bound, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required. brew install jq."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+echo "amuleapi 28-list-pagination-sort smoke @ $HOST"
+
+# --- 0. Log in. ----------------------------------------------------
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  \
+	|| _die "could not log in for pagination tests"
+
+sleep 3 # let the refresher build its caches
+
+AUTH=(-H "Authorization: Bearer $TOKEN")
+
+# The search list is addressed per search, so start one to have an id
+# rather than relying on an implicit default, which these paths do not have.
+SEARCH_SID=$(curl -s -X POST "${AUTH@}" -H "Content-Type: application/json" \
+	-d '{"query":"amuleapi-phase28","type":"local"}' "$API/search" \
+	| jq -r '.search_id // empty')
+ -n "$SEARCH_SID"  || _die "POST /search returned no search_id"
+
+# endpoint:array-key pairs. The search results list wraps under "results".
+ENDPOINTS=(
+	"downloads:downloads"
+	"shared:shared"
+	"servers:servers"
+	"clients:clients"
+	"categories:categories"
+	"friends:friends"
+	"known_clients:known_clients"
+	"chats:chats"
+	"search/$SEARCH_SID/results:results"
+)
+
+for pair in "${ENDPOINTS@}"; do
+	ep=${pair%%:*}
+	key=${pair##*:}
+	echo "  --- /$ep (key .$key) ---"
+
+	# 1. Baseline: array + always-present pagination metadata.
+	_curl "${AUTH@}" "$API/$ep"
+	_assert_status 200 "GET /$ep → 200"
+	_assert_json_eq ".$key | type"  array  "/$ep .$key is an array"
+	_assert_json_eq ".total | type"  number "/$ep total is a number"
+	_assert_json_eq ".offset | type" number "/$ep offset is a number"
+	# `limit` always reports a real page size now: an omitted parameter selects
+	# the default page rather than the whole collection, so {total, offset,
+	# limit} round-trips straight back into the next request. It is not the row
+	# count -- that is `total`, asserted right above.
+	_assert_json_eq ".limit"         100    "/$ep omitted limit echoes the default 100"
+	_assert_json_le ".$key | length" 100    "/$ep omitted limit returns at most 100 rows"
+	_assert_json_eq ". | has(\"limit\")" true "/$ep still carries the limit key"
+	_assert_json_eq ".offset"        0      "/$ep default offset is 0"
+
+	# 2. limit bounds the array length; limit echoes back.
+	_curl "${AUTH@}" "$API/$ep?limit=1"
+	_assert_status 200 "GET /$ep?limit=1 → 200"
+	_assert_json_le ".$key | length" 1 "/$ep?limit=1 returns <= 1 item"
+	_assert_json_eq ".limit" 1 "/$ep?limit=1 echoes limit=1"
+
+	# ...and it comes back as a number, confirming the default 100 asserted
+	# above is a real page size (#1179: limit is echoed as a number, not null).
+	_assert_json_eq ".limit | type" number "/$ep?limit=1 limit is a number"
+
+	# 3. limit=0 → empty window, total still reported.
+	_curl "${AUTH@}" "$API/$ep?limit=0"
+	_assert_status 200 "GET /$ep?limit=0 → 200"
+	_assert_json_eq ".$key | length" 0 "/$ep?limit=0 returns empty array"
+
+	# 4. offset past the end → empty window, no error.
+	_curl "${AUTH@}" "$API/$ep?offset=100000"
+	_assert_status 200 "GET /$ep?offset=100000 → 200"
+	_assert_json_eq ".$key | length" 0 "/$ep offset past end → empty array"
+
+	# 5. valid sort field is accepted (every list has a `name` field).
+	_curl "${AUTH@}" "$API/$ep?sort=name&order=desc"
+	_assert_status 200 "GET /$ep?sort=name&order=desc → 200"
+
+	# 6. Malformed params → 400.
+	_curl "${AUTH@}" "$API/$ep?limit=-1"
+	_assert_status 400 "GET /$ep?limit=-1 → 400"
+	_curl "${AUTH@}" "$API/$ep?limit=notanumber"
+	_assert_status 400 "GET /$ep?limit=notanumber → 400"
+	_curl "${AUTH@}" "$API/$ep?offset=-5"
+	_assert_status 400 "GET /$ep?offset=-5 → 400"
+	_curl "${AUTH@}" "$API/$ep?order=sideways"
+	_assert_status 400 "GET /$ep?order=sideways → 400"
+	_curl "${AUTH@}" "$API/$ep?sort=nonexistent_field"
+	_assert_status 400 "GET /$ep?sort=nonexistent_field → 400"
+
+	# 7. The ceiling is 1e9, past any collection that can exist, so a caller
+	# asking for the whole set gets it and a fat-fingered value is still a
+	# rejection rather than a silent reduction.
+	_curl "${AUTH@}" "$API/$ep?limit=1000000001"
+	_assert_status 400 "GET /$ep?limit=1000000001 → 400 (over the ceiling)"
+	_curl "${AUTH@}" "$API/$ep?limit=99999"
+	_assert_status 200 "GET /$ep?limit=99999 → 200 (within the cap)"
+	_curl "${AUTH@}" "$API/$ep?limit=1000000000"
+	_assert_status 200 "GET /$ep?limit=1000000000 → 200 (the ceiling is in range)"
+	_assert_json_eq ".limit" 1000000000 "/$ep?limit=1000000000 echoes the limit it used"
+
+	# 8. The overflow case a reviewer cannot see by reading the diff. The
+	# window used to compute `min(offset + limit, total)`, so the addition
+	# happened before the clamp and wrapped on a 32-bit size_t; an inverted
+	# iterator range is undefined behaviour, not a large page. The count is
+	# clamped before it is added now.
+	_curl "${AUTH@}" "$API/$ep?limit=1000000000&offset=5"
+	_assert_status 200 "GET /$ep?limit=1e9&offset=5 → 200 (no overflow)"
+	_assert_json_eq ".offset" 5 "/$ep?offset=5 echoes offset=5"
+
+	# 9. `after` needs an identity sort and ascending order; both refusals are
+	# explicit rather than a silent fall back to the first page, which would
+	# read to a paging client as "the collection never grows".
+	_curl "${AUTH@}" "$API/$ep?after=zzz"
+	_assert_status 400 "GET /$ep?after= without sort → 400"
+done
+
+# --- Keyset sweep: walk a whole collection with no row repeated or skipped.
+#
+# The property that offset paging cannot provide. `/shared` is the collection a
+# real client actually has to page, so sweep that one for real: anchor on the
+# identity column, take one row at a time so the walk is many pages rather than
+# one, and check the union against an unpaged fetch.
+#
+# Deliberately NOT asserted with offset: a row removed from an already-fetched
+# page slides every later index down by one, so an offset walk skips a row --
+# and since that row was not itself added, updated or removed, no SSE event
+# repairs it. That is the whole reason `after` exists.
+_curl "${AUTH@}" "$API/shared?limit=1000000000&sort=hash"
+SWEEP_TOTAL=$(printf '%s' "$CURL_BODY" | jq -r '.total')
+ALL_HASHES=$(printf '%s' "$CURL_BODY" | jq -r '.shared.hash' | sort)
+echo "    info: /shared holds $SWEEP_TOTAL rows"
+
+if  "$SWEEP_TOTAL" -gt 0 ; then
+	SWEPT=""
+	AFTER=""
+	PAGES=0
+	# Bounded so a bug cannot spin: one row per page means at most TOTAL
+	# pages, plus one for the short final page that ends the walk.
+	while  "$PAGES" -le "$SWEEP_TOTAL" ; do
+		if  -z "$AFTER" ; then
+			_curl "${AUTH@}" "$API/shared?sort=hash&limit=1"
+		else
+			_curl "${AUTH@}" "$API/shared?sort=hash&limit=1&after=$AFTER"
+		fi
+		 "$CURL_STATUS" = "200"  || break
+		GOT=$(printf '%s' "$CURL_BODY" | jq -r '.shared | length')
+		 "$GOT" -eq 0  && break
+		AFTER=$(printf '%s' "$CURL_BODY" | jq -r '.shared-1.hash')
+		SWEPT="$SWEPT$AFTER
+"
+		PAGES=$((PAGES+1))
+	done
+	SWEPT_SORTED=$(printf '%s' "$SWEPT" | grep -v '^$' | sort)
+	SWEPT_UNIQ=$(printf '%s' "$SWEPT_SORTED" | sort -u)
+	if  "$SWEPT_SORTED" = "$SWEPT_UNIQ" ; then
+		_pass "keyset sweep of /shared repeated no row ($PAGES pages)"
+	else
+		_fail "keyset sweep repeated a row" "$(printf '%s' "$SWEPT_SORTED" | uniq -d | head -3)"
+	fi
+	if  "$SWEPT_UNIQ" = "$ALL_HASHES" ; then
+		_pass "keyset sweep of /shared covered every row ($SWEEP_TOTAL rows)"
+	else
+		_fail "keyset sweep skipped a row" \
+			"missing: $(comm -23 <(printf '%s\n' "$ALL_HASHES") <(printf '%s\n' "$SWEPT_UNIQ") | head -3)"
+	fi
+
+	# An anchor past the end is an empty page, not an error: that is how a
+	# sweep terminates when the last row is deleted mid-walk.
+	_curl "${AUTH@}" "$API/shared?sort=hash&after=ffffffffffffffffffffffffffffffff"
+	_assert_status 200 "after= past the last row → 200"
+	_assert_json_eq '.shared | length' 0 "after= past the last row returns an empty page"
+
+	# Mutable column refused as an anchor, and desc refused outright.
+	_curl "${AUTH@}" "$API/shared?sort=name&after=x"
+	_assert_status 400 "after= on a mutable sort column → 400"
+	_curl "${AUTH@}" "$API/shared?sort=hash&order=desc&after=x"
+	_assert_status 400 "after= with order=desc → 400"
+else
+	echo "    info: nothing shared; keyset sweep skipped"
+fi
+
+# --- Numeric identity anchor. /shared above walks a string `hash`; a numeric
+# column (index/ecid/search_id) goes through ANCHOR_ON_NUM, which strtoull's the
+# token instead. The window arithmetic is the same shared code /shared already
+# exercises, so this only has to prove the numeric comparator seeks in the right
+# direction. A stock daemon holds only category 0, so seed one row to step past
+# and delete it after. Assert the precondition rather than assume it: a failed
+# GET yields total="null", which must fail loudly, not skip and pass empty.
+_curl "${AUTH@}" "$API/categories?limit=1000000000&sort=index"
+BEFORE_IDX=$(printf '%s' "$CURL_BODY" | jq -c '.categories.index')
+curl -s -X POST "${AUTH@}" -H "Content-Type: application/json" \
+	-d '{"name":"phase28-cat","save_path":"/tmp/28-cat-sweep"}' \
+	"$API/categories" > /dev/null 2>&1
+_curl "${AUTH@}" "$API/categories?limit=1000000000&sort=index"
+_assert_json_ge '.total' 2 '/categories seeded a row to step past'
+NEW_IDX=$(printf '%s' "$CURL_BODY" \
+	| jq -r --argjson b "$BEFORE_IDX" '.categories.index - $b | first // empty')
+
+# after=0 seeks past category 0 and returns the rest -- a real numeric advance,
+# not just a parse edge. A reversed comparator would return nothing here.
+_curl "${AUTH@}" "$API/categories?sort=index&after=0"
+_assert_status 200 "after=0 (numeric) → 200"
+_assert_json_ge ".categories | length" 1 "after=0 returns the rows past index 0"
+_assert_json_eq ".categories.index | any(. == 0)" false "after=0 excludes index 0"
+
+# A non-numeric token sorts before everything -> first page (the strtoull-failed
+# branch), the same shape as an out-of-range offset.
+_curl "${AUTH@}" "$API/categories?sort=index&after=notanumber"
+_assert_status 200 "after=<non-numeric> on a numeric anchor → 200 (first page)"
+_assert_json_eq ".categories0.index" 0 "after=<non-numeric> falls back to the first page"
+
+# A parsed token past every index -> empty page, not an error.
+_curl "${AUTH@}" "$API/categories?sort=index&after=1000000000"
+_assert_status 200 "after= past the last index → 200"
+_assert_json_eq ".categories | length" 0 "after= past the last index returns an empty page"
+
+# --- The sort surface a collection's own row can support. ----------
+# The sort keys /clients and /shared expose are the ones their own rows emit.
+# The keys checked here are
+# only the ones each row actually emits, per R7: /shared gets the upload-side
+# pair, not /downloads' progress.percent or status, which describe a transfer a
+# shared row does not report -- sorting by an absent column is not a sort.
+for key in uploaded_bytes_total downloaded_bytes_total upload_speed_bytes_per_second download_speed_bytes_per_second; do
+	_curl "${AUTH@}" "$API/clients?sort=$key"
+	_assert_status 200 "GET /clients?sort=$key -> 200"
+done
+for key in uploaded_bytes_total upload_speed_bytes_per_second; do
+	_curl "${AUTH@}" "$API/shared?sort=$key"
+	_assert_status 200 "GET /shared?sort=$key -> 200"
+done
+# The download-only keys stay rejected on /shared: the row has no such column.
+for key in progress.percent status; do
+	_curl "${AUTH@}" "$API/shared?sort=$key"
+	_assert_status 400 "GET /shared?sort=$key -> 400 (not a column of this row)"
+done
+
+# Delete the seeded row (a single row, so no index-renumber concern).
+ -n "$NEW_IDX"  && curl -s -X DELETE "${AUTH@}" "$API/categories/$NEW_IDX" > /dev/null 2>&1
+
+curl -s -X DELETE "${AUTH@}" "$API/search/$SEARCH_SID" > /dev/null 2>&1
+
+echo
+echo "28-list-pagination-sort: $((TEST_COUNT-FAIL_COUNT))/$TEST_COUNT passed"
+ "$FAIL_COUNT" -eq 0  || exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/29-bulk-mutations.sh Added

@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+#
+# amuleapi bulk mutations (issue #358). Exercises the unified per-item
+# `results` envelope across POST /downloads, PATCH/DELETE /downloads and
+# PATCH /shared, plus the 207 Multi-Status / 400 conventions.
+#
+# Data-tolerant: a nonexistent hash yields a per-item `not_found`, so the
+# full path (routing -> parse -> per-hash loop -> per-item error -> 207
+# aggregation) is exercised without needing real downloads/shares on the
+# daemon. Success-path (ok:true) needs live files and is left to manual /
+# integration testing.
+#
+# Bring-up: see run-all.sh / 04-read-downloads-shared.sh.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+BODY=$(mktemp -t amuleapi_29_bulk_body.XXXXXX)
+trap 'rm -f "$BODY"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() { TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1)); echo "  FAIL  $1"; shift; for a in "$@"; do echo "        $a"; done; }
+
+# _req METHOD PATH JSON  -> sets STATUS + CURL_BODY
+_req() {
+	local method=$1 path=$2 json=${3:-}
+	local args=(-s --max-time 10 -o "$BODY" -w '%{http_code}' -X "$method"
+		-H "Authorization: Bearer $TOKEN")
+	 -n "$json"  && args+=(-H "Content-Type: application/json" -d "$json")
+	STATUS=$(curl "${args@}" "$HOST$path") || _die "curl failed: $method $path"
+	CURL_BODY=$(cat "$BODY")
+}
+
+_status() {  "$STATUS" = "$1"  && _pass "$2 (HTTP $STATUS)" || _fail "$2" "want HTTP $1 got $STATUS" "body: $(printf %s "$CURL_BODY" | head -c 200)"; }
+_jq()     { local a; a=$(printf %s "$CURL_BODY" | jq -r "$1" 2>/dev/null);  "$a" = "$2"  && _pass "$3" || _fail "$3" "want '$2' got '$a'" "body: $CURL_BODY"; }
+
+command -v jq >/dev/null 2>&1 || _die "jq required"
+curl -s -o /dev/null --max-time 2 "$API/health" || _die "amuleapi at $HOST not reachable"
+
+echo "amuleapi 29-bulk-mutations @ $HOST"
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" -d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "login failed"
+sleep 2
+
+H0="00000000000000000000000000000000"
+H1="11111111111111111111111111111111"
+
+# --- auth gate --------------------------------------------------------
+S=$(curl -s -o /dev/null -w '%{http_code}' -X PATCH -H "Content-Type: application/json" \
+	-d "{\"hashes\":\"$H0\",\"priority\":\"high\"}" "$API/shared")
+ "$S" = 401  && _pass "PATCH /shared without creds -> 401" || _fail "PATCH /shared no-creds" "want 401 got $S"
+
+# --- per-item not_found => 207 Multi-Status ---------------------------
+echo "  --- 207 per-item not_found ---"
+_req PATCH /api/v1/downloads "{\"hashes\":\"$H0\",\"priority\":\"high\"}"
+_status 207 "PATCH /downloads bogus hash"
+_jq '.results | length' 1                "  results has 1 entry"
+_jq '.results0.id'    "$H0"            "  results0.id echoes the hash"
+_jq '.results0.ok'    false            "  results0.ok is false"
+_jq '.results0.error.code' not_found   "  results0.error.code is not_found"
+
+# action:"stop" is a recognized bulk value — it reaches the per-hash
+# loop (bogus hash → not_found), proving the parse accepts it, unlike a
+# bad enum (see the 400 section).
+_req PATCH /api/v1/downloads "{\"hashes\":\"$H0\",\"action\":\"stop\"}"
+_status 207 "PATCH /downloads action=stop bogus hash"
+_jq '.results0.error.code' not_found   "  bulk action=stop results0 not_found (value accepted)"
+
+_req DELETE /api/v1/downloads "{\"hashes\":\"$H0\"}"
+_status 207 "DELETE /downloads bogus hash"
+_jq '.results0.error.code' not_found   "  DELETE results0 not_found"
+
+_req PATCH /api/v1/shared "{\"hashes\":\"$H0\",\"priority\":\"high\"}"
+_status 207 "PATCH /shared bogus hash"
+_jq '.results0.error.code' not_found   "  PATCH /shared results0 not_found"
+
+# --- multiple items => length matches --------------------------------
+_req PATCH /api/v1/shared "{\"hashes\":\"$H0\",\"$H1\",\"priority\":\"low\"}"
+_status 207 "PATCH /shared 2 bogus hashes"
+_jq '.results | length' 2                "  results has 2 entries"
+_jq '.results.ok | any'  false       "  no item succeeded"
+
+# --- bad requests => 400 ---------------------------------------------
+echo "  --- 400 validation ---"
+_req PATCH /api/v1/downloads "{\"priority\":\"high\"}";            _status 400 "PATCH /downloads missing hashes"
+_req PATCH /api/v1/downloads "{\"hashes\":}";                    _status 400 "PATCH /downloads empty hashes"
+_req PATCH /api/v1/downloads "{\"hashes\":\"$H0\"}";            _status 400 "PATCH /downloads no patch fields"
+_req PATCH /api/v1/downloads "{\"hashes\":\"$H0\",\"priority\":\"bogus\"}"; _status 400 "PATCH /downloads bad priority"
+_req PATCH /api/v1/downloads "{\"hashes\":\"$H0\",\"status\":\"bogus\"}";   _status 400 "PATCH /downloads bad status"
+_req DELETE /api/v1/downloads "{}";                               _status 400 "DELETE /downloads missing hashes"
+_req PATCH /api/v1/shared "{\"hashes\":\"$H0\"}";              _status 400 "PATCH /shared missing priority"
+_req PATCH /api/v1/shared "{\"hashes\":\"$H0\",\"priority\":\"nope\"}";     _status 400 "PATCH /shared bad priority"
+
+# --- method routing ---------------------------------------------------
+_req PUT /api/v1/downloads "{}";  _status 405 "PUT /downloads -> 405"
+_req PUT /api/v1/shared "{}";     _status 405 "PUT /shared -> 405"
+
+# --- POST /downloads results shape ----------------------------------
+echo "  --- POST /downloads unified results shape ---"
+LINK="ed2k://|file|bulk-test.bin|1024|0123456789ABCDEF0123456789ABCDEF|/"
+_req POST /api/v1/downloads "{\"links\":\"$LINK\"}"
+_jq '.results | type' array              "POST /downloads has results array"
+_jq '.results | length' 1                "  one result entry"
+_jq '.results0.id' "$LINK"             "  result id echoes the link"
+_jq '.accepted // "absent"' absent       "  no 'accepted' counter"
+_jq '.ok // "absent"' absent             "  no 'ok' bool"
+
+echo
+echo "29-bulk-mutations: $((TEST_COUNT-FAIL_COUNT))/$TEST_COUNT passed"
+ "$FAIL_COUNT" -eq 0  || exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/30-shared-verify.sh Added

@@ -0,0 +1,208 @@
+#!/usr/bin/env bash
+#
+# amuleapi 30-shared-verify — POST /shared/{hash}/verify.
+#
+# Endpoint:
+#   POST /api/v1/shared/{hash}/verify   → 202 {"ok":true}
+#
+# Re-hashes a shared file against its on-disk data (EC_OP_VERIFY_LOCAL_DATA).
+# amuled queues a CVerifyLocalDataTask and answers immediately, so the call
+# is accepted (202), never completed (200) — the verdict is only ever emitted
+# as an amule log line ("Verify Local Data (...): Result OK" / "ERRORS
+# FOUND!"), which a client reads back through /logs/amule or the SSE log
+# channel. There is therefore nothing to assert about the outcome here; the
+# contract under test is the accept path and its guards.
+#
+# Partfiles are rejected with 409 partfile_unsupported: the hashing task
+# bails out on IsPartFile(), so accepting one would promise a report that
+# never arrives.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+AMULE_SHARED_DIR=${AMULE_SHARED_DIR:-}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_30_shared_verify_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+_assert_body_empty() {
+	local label=$1
+	if  -z "$CURL_BODY" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected an empty body, got: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 30-shared-verify smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+sleep 4
+
+# Verify only applies to completed knownfiles, so the fixture path is the
+# same one 17-shared-priority-patch uses: plant a real file in a directory
+# amuled shares and let it hash in. Reused across runs once it exists.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared"
+COUNT=$(printf '%s' "$CURL_BODY" | jq '.shared | length')
+
+if  "$COUNT" = "0" ; then
+	 -n "$AMULE_SHARED_DIR"  \
+		|| _die "set AMULE_SHARED_DIR to a directory amuled shares so the smoke can plant a fixture"
+	FIXTURE="$AMULE_SHARED_DIR/amuleapi-regtest-shared.dat"
+	if  ! -f "$FIXTURE" ; then
+		head -c 1048576 /dev/urandom > "$FIXTURE" \
+			|| _die "cannot write fixture to AMULE_SHARED_DIR=$AMULE_SHARED_DIR"
+	fi
+	echo "    info: planted fixture $FIXTURE; reloading shares"
+	curl -s -o /dev/null -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/shared_reload"
+	for _ in $(seq 1 30); do
+		sleep 1
+		_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared"
+		COUNT=$(printf '%s' "$CURL_BODY" | jq '.shared | length')
+		 "$COUNT" != "0"  && break
+	done
+	 "$COUNT" != "0"  \
+		|| _die "fixture planted in $AMULE_SHARED_DIR but never appeared in /shared after reload"
+fi
+
+# Pick a completed entry — a shared partfile is rejected by design, so it
+# can't stand in for the happy path. The list object carries no partfile
+# flag, so classify on the detail object's `incomplete`. The same sweep
+# picks up a partfile for the 409 guard below, when the library has one.
+TEST_HASH=""
+PART_HASH=""
+for h in $(printf '%s' "$CURL_BODY" | jq -r '.shared.hash' | head -20); do
+	INCOMPLETE=$(curl -s --max-time 10 -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/shared/$h" | jq -r '.incomplete')
+	if  "$INCOMPLETE" = "true" ; then
+		 -z "$PART_HASH"  && PART_HASH=$h
+	else
+		 -z "$TEST_HASH"  && TEST_HASH=$h
+	fi
+	 -n "$TEST_HASH"  &&  -n "$PART_HASH"  && break
+done
+ -n "$TEST_HASH"  || _die "no completed (non-partfile) shared file available to verify"
+echo "    info: verifying hash=$TEST_HASH"
+
+# --- 1. Auth + admin gate. -----------------------------------------
+_curl -X POST "$API/shared/$TEST_HASH/verify"
+_assert_status 401 "POST /shared/{hash}/verify (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		"$API/shared/$TEST_HASH/verify"
+	_assert_status 403 "POST /shared/{hash}/verify (guest) → 403"
+fi
+
+# --- 2. Happy path: accepted, not completed. -----------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/shared/$TEST_HASH/verify"
+# 202 with no body: the hash came from the URL, and the outcome only arrives
+# later, on hashed_part_count and the log line.
+_assert_status 202 "POST /shared/{hash}/verify → 202"
+_assert_body_empty "verify sends no body"
+
+# Uppercase hash resolves the same file (lookup lowercases the capture).
+UPPER_HASH=$(printf '%s' "$TEST_HASH" | tr 'a-f' 'A-F')
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/shared/$UPPER_HASH/verify"
+_assert_status 202 "POST /shared/{HASH}/verify (uppercase) → 202"
+
+# --- 3. Unknown hash → 404. ----------------------------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/shared/00000000000000000000000000000000/verify"
+_assert_status 404 "POST /shared/{unknown}/verify → 404"
+_assert_json_eq '.error.code' not_found "unknown hash → error.code=not_found"
+
+# --- 4. Method gate. -----------------------------------------------
+_curl -X GET -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/shared/$TEST_HASH/verify"
+_assert_status 405 "GET /shared/{hash}/verify → 405"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" -d '{}' \
+	"$API/shared/$TEST_HASH/verify"
+_assert_status 405 "PATCH /shared/{hash}/verify → 405"
+
+# --- 5. Partfile guard (only when the library has one). ------------
+# A partfile shows up in /shared once ≥1 part has completed. Classified in
+# the sweep above. Skipped rather than forced, since planting a
+# half-finished download isn't reproducible in a smoke run.
+if  -n "$PART_HASH" ; then
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/shared/$PART_HASH/verify"
+	_assert_status 409 "POST /shared/{partfile}/verify → 409"
+	_assert_json_eq '.error.code' partfile_unsupported \
+		"partfile → error.code=partfile_unsupported"
+else
+	echo "    info: no shared partfile present; skipping the 409 guard check"
+fi
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/31-shared-directories.sh Added

@@ -0,0 +1,274 @@
+#!/usr/bin/env bash
+#
+# amuleapi 31-shared-directories — the configured share roots.
+#
+# Endpoints:
+#   GET    /api/v1/share_directories            → {"directories":{path,recursive}}
+#   PUT    /api/v1/share_directories            → replace the whole set
+#   POST   /api/v1/share_directories            → add one (idempotent)
+#   DELETE /api/v1/share_directories?path=...   → remove one
+#
+# These are the roots amuled is configured with, as opposed to /shared which
+# lists the files those roots produced. A recursive root is a single entry here
+# however many subdirectories it covers.
+#
+# The write verbs really do mutate the core's configuration, so this smoke
+# snapshots the current roots up front and restores them via PUT at the end
+# (including on early exit). Everything it adds lives under a mktemp directory,
+# never the operator's real shares.
+#
+# amuled validates paths server-side — a REST client cannot stat the core's
+# filesystem — and reports refusals per path in `rejected` while still applying
+# the entries that passed. Both halves of that contract are asserted.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_31_shared_dirs_body.XXXXXX)
+SCRATCH_DIR=$(mktemp -d -t amuleapi_31_shared_dirs.XXXXXX)
+ORIGINAL_DIRS=""
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+# Put the operator's configuration back exactly as we found it, whatever
+# happened in between. Registered before the first mutation.
+_restore() {
+	if  -n "$ORIGINAL_DIRS" ; then
+		curl -s -o /dev/null --max-time 10 -X PUT \
+			-H "Authorization: Bearer ${ADMIN_TOKEN:-}" \
+			-H "Content-Type: application/json" \
+			-d "{\"directories\":$ORIGINAL_DIRS}" \
+			"$API/share_directories" 2>/dev/null || true
+	fi
+	rm -f "$CURL_BODY_FILE"
+	rm -rf "$SCRATCH_DIR"
+}
+trap _restore EXIT
+
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 31-shared-directories smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+# --- 1. Auth + method gates. ----------------------------------------
+_curl "$API/share_directories"
+_assert_status 401 "GET /share_directories (no token) → 401"
+
+_curl -X PUT -H "Content-Type: application/json" \
+	-d '{"directories":}' "$API/share_directories"
+_assert_status 401 "PUT /share_directories (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	# Reading the roots is GUEST, matching GET /shared and GET /preferences.
+	_curl -H "Authorization: Bearer $GUEST_TOKEN" "$API/share_directories"
+	_assert_status 200 "GET /share_directories (guest) → 200"
+
+	_curl -X PUT -H "Authorization: Bearer $GUEST_TOKEN" -H "Content-Type: application/json" \
+		-d '{"directories":}' "$API/share_directories"
+	_assert_status 403 "PUT /share_directories (guest) → 403"
+
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" -H "Content-Type: application/json" \
+		-d "{\"path\":\"$SCRATCH_DIR\"}" "$API/share_directories"
+	_assert_status 403 "POST /share_directories (guest) → 403"
+
+	_curl -X DELETE -H "Authorization: Bearer $GUEST_TOKEN" \
+		"$API/share_directories?path=%2Ftmp"
+	_assert_status 403 "DELETE /share_directories (guest) → 403"
+fi
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" "$API/share_directories"
+_assert_status 405 "PATCH /share_directories → 405"
+
+# --- 2. Read the current configuration (and snapshot it). -----------
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/share_directories"
+_assert_status 200 "GET /share_directories → 200"
+_assert_json_eq '.directories | type' 'array' "directories is an array"
+ORIGINAL_DIRS=$(printf '%s' "$CURL_BODY" | jq -c '.directories')
+ -n "$ORIGINAL_DIRS"  || _die "could not snapshot the current shared directories"
+
+# --- 3. Body validation. --------------------------------------------
+_curl -X PUT -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d 'not json' "$API/share_directories"
+_assert_status 400 "PUT (malformed JSON) → 400"
+
+_curl -X PUT -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{}' "$API/share_directories"
+_assert_status 400 "PUT (no directories array) → 400"
+
+_curl -X PUT -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{"directories":{"path":""}}' "$API/share_directories"
+_assert_status 400 "PUT (empty path) → 400"
+
+_curl -X PUT -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"directories\":{\"path\":\"$SCRATCH_DIR\",\"recursive\":\"yes\"}}" \
+	"$API/share_directories"
+_assert_status 400 "PUT (non-boolean recursive) → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d '{}' "$API/share_directories"
+_assert_status 400 "POST (no path) → 400"
+
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" "$API/share_directories"
+_assert_status 400 "DELETE (no path parameter) → 400"
+
+# --- 4. Add a real directory, then read it back. ---------------------
+#
+# `real` means real to amuled: it stats the path itself, so the mktemp directory
+# above exists for the daemon only when the daemon shares this filesystem.
+# Against a containerised or remote one everything below is rejected as
+# not_found, so probe once and say so instead of failing seven assertions.
+#
+# not_readable counts as the same setup problem. The core distinguishes the
+# two (EC_SHAREDDIR_ERR_*: 1 = missing or not a directory, 2 = unreadable),
+# and a same-host daemon running as another user hits the second one on the
+# 0700 directory mktemp -d just created. Either way the daemon cannot take
+# this path, which is the condition the assertions below depend on.
+SCRATCH_ENC=$(jq -rn --arg p "$SCRATCH_DIR" '$p|@uri')
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"path\":\"$SCRATCH_DIR\",\"recursive\":true}" "$API/share_directories"
+SCRATCH_REJECTION=$(printf '%s' "$CURL_BODY" |
+	jq -r ".results | select(.id==\"$SCRATCH_DIR\" and .ok==false)0.error.code" 2>/dev/null)
+SHARE_FS_VISIBLE=1
+case "$SCRATCH_REJECTION" in
+not_found | not_readable)
+	SHARE_FS_VISIBLE=0
+	echo "  SKIP  the assertions that need amuled to take $SCRATCH_DIR ($SCRATCH_REJECTION)"
+	echo "        (it stats paths itself; run this against a daemon on this host"
+	echo "         and as a user that can read the path, or set the scratch path"
+	echo "         to one the daemon can reach)"
+	;;
+esac
+
+if  "$SHARE_FS_VISIBLE" -eq 1 ; then
+_assert_status 200 "POST (add scratch dir, recursive) → 200"
+_assert_json_eq '.results | type' array "POST returns a results array"
+_assert_json_eq '.results | select(.ok==false) | length' '0' "POST rejected nothing"
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/share_directories"
+_assert_json_eq \
+	".directories | select(.path==\"$SCRATCH_DIR\") | length" '1' \
+	"added directory is listed"
+_assert_json_eq \
+	".directories | select(.path==\"$SCRATCH_DIR\")0.recursive" 'true' \
+	"added directory kept its recursive flag"
+
+# Idempotent re-add: no duplicate, and the flag follows the new value.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"path\":\"$SCRATCH_DIR\",\"recursive\":false}" "$API/share_directories"
+_assert_status 200 "POST (re-add same path) → 200"
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/share_directories"
+_assert_json_eq \
+	".directories | select(.path==\"$SCRATCH_DIR\") | length" '1' \
+	"re-add did not duplicate the entry"
+_assert_json_eq \
+	".directories | select(.path==\"$SCRATCH_DIR\")0.recursive" 'false' \
+	"re-add updated the recursive flag"
+fi # SHARE_FS_VISIBLE -- section 4
+
+# --- 5. Server-side validation of a path the client cannot check. ----
+# The bogus-path half does not need a visible scratch dir: a path that exists
+# nowhere is rejected either way.
+BOGUS="$SCRATCH_DIR/definitely-not-here"
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" -H "Content-Type: application/json" \
+	-d "{\"path\":\"$BOGUS\"}" "$API/share_directories"
+# A rejection makes the whole response 207, as with every other multi-item
+# mutation. It was 200, which meant a caller had to read the body to learn that
+# part of the request had not applied.
+_assert_status 207 "POST (nonexistent path) → 207 with a rejection"
+_assert_json_eq \
+	".results | select(.id==\"$BOGUS\")0.error.code" 'not_found' \
+	"nonexistent path rejected as not_found"
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/share_directories"
+_assert_json_eq \
+	".directories | select(.path==\"$BOGUS\") | length" '0' \
+	"rejected path was not stored"
+if  "$SHARE_FS_VISIBLE" -eq 1 ; then
+# The valid entry must survive a sibling's rejection.
+_assert_json_eq \
+	".directories | select(.path==\"$SCRATCH_DIR\") | length" '1' \
+	"rejection did not discard the valid entry"
+
+# --- 6. Remove it again. --------------------------------------------
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/share_directories?path=$SCRATCH_ENC"
+_assert_status 200 "DELETE (configured path) → 200"
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/share_directories"
+_assert_json_eq \
+	".directories | select(.path==\"$SCRATCH_DIR\") | length" '0' \
+	"deleted directory is gone"
+fi # SHARE_FS_VISIBLE -- sections 5b and 6
+
+# Never configured, whether or not the scratch dir ever was.
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" \
+	"$API/share_directories?path=$SCRATCH_ENC"
+_assert_status 404 "DELETE (path not configured) → 404"
+
+# --- Summary. -------------------------------------------------------
+echo
+SKIP_NOTE=""
+ "$SHARE_FS_VISIBLE" -eq 0  && SKIP_NOTE=" (local-filesystem share assertions skipped)"
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed$SKIP_NOTE"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/32-country-flags.sh Added

@@ -0,0 +1,235 @@
+#!/usr/bin/env bash
+#
+# amuleapi 32-country-flags — GET /flags/{code}.png.
+#
+# The peer / server `country_code` on /clients and /servers is only half
+# the story; this route is where a frontend gets the matching artwork.
+# The bytes come from the icon table compiled into the binary (the same
+# famfamfam set the desktop GUI draws), so the assertions here are about
+# the route's shape rather than any file on disk:
+#
+#   * a known code returns a PNG with the right Content-Type,
+#   * the response is cacheable — ETag + Cache-Control — and honours
+#     If-None-Match with a 304,
+#   * HEAD returns the headers with no body,
+#   * the artwork is served verbatim, NOT gzip-encoded (it is already
+#     entropy-coded; deflate over a PNG is pure waste),
+#   * the "unknown" placeholder (the "??" flag the desktop falls back
+#     to for an unresolved code) is reachable under the same route,
+#   * anything else that is not exactly two lowercase ASCII letters +
+#     .png is a 404, including uppercase, wrong length, traversal
+#     attempts and a well-formed code the set has no artwork for,
+#   * non-safe methods are 405,
+#   * it works with `Server/StaticRoot` unset — nothing here reads
+#     the file system.
+#
+# Usage:
+#   amuleapi --config-dir=/tmp/amuleapi-regtest &
+#   ./32-country-flags.sh
+#
+# Exits 0 on success, 1 on any failed assertion, 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_32_country_flags_body.XXXXXX)
+CURL_HEAD_FILE=$(mktemp -t amuleapi_32_country_flags_head.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE" "$CURL_HEAD_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+# Binary-safe: the body lands in a file and stays there. $CURL_BODY is
+# deliberately NOT populated (a PNG through a shell variable loses the
+# NUL bytes); assertions read $CURL_BODY_FILE instead.
+#
+# Body *length* comes from curl's own %{size_download}, never from the
+# file: curl leaves the previous response's file untouched when a reply
+# carries no body (304), and `-I` writes the response headers into it,
+# so file size answers a different question than "how many body bytes
+# came back". The file is truncated up front anyway so a signature
+# check can't read stale bytes.
+_curl() {
+	local resp
+	: > "$CURL_BODY_FILE"
+	resp=$(curl -s --max-time 10 \
+		-D "$CURL_HEAD_FILE" \
+		-o "$CURL_BODY_FILE" -w '%{http_code} %{size_download}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=${resp%% *}
+	CURL_SIZE=${resp##* }
+	CURL_HEAD=$(cat "$CURL_HEAD_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS"
+	fi
+}
+
+_header() { echo "$CURL_HEAD" | awk -F': ' -v k="$1" 'tolower($1) == k {gsub(/\r/,""); print $2}'; }
+
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+echo "amuleapi 32-country-flags @ $HOST"
+
+# --- 1. A known code returns a PNG. -------------------------------
+_curl "$HOST/flags/de.png"
+_assert_status 200 "GET /flags/de.png"
+
+CT=$(_header content-type)
+case "$CT" in
+	image/png*) _pass "Content-Type is image/png" ;;
+	*) _fail "/flags/de.png Content-Type" "expected image/png, got: ${CT:-<none>}" ;;
+esac
+
+# The famfamfam flags are 16x11 8-bit colormap PNGs, a few hundred bytes
+# each. Check the 8-byte PNG signature so a future refactor that returns
+# the wrong table entry (or an empty body) fails loudly here.
+SIG=$(od -An -tx1 -N8 "$CURL_BODY_FILE" | tr -d ' \n')
+if  "$SIG" = "89504e470d0a1a0a" ; then
+	_pass "body starts with the PNG signature"
+else
+	_fail "/flags/de.png body" "expected PNG magic 89504e470d0a1a0a, got ${SIG:-<empty>}"
+fi
+
+if  "$CURL_SIZE" -gt 100  &&  "$CURL_SIZE" -lt 8192 ; then
+	_pass "body is a plausible flag size ($CURL_SIZE bytes)"
+else
+	_fail "/flags/de.png size" "expected 100..8192 bytes, got $CURL_SIZE"
+fi
+
+# --- 2. Cacheable: ETag + Cache-Control. --------------------------
+ETAG=$(_header etag)
+if  -n "$ETAG" ; then
+	_pass "GET /flags/de.png emits an ETag ($ETAG)"
+else
+	_fail "/flags/de.png ETag" "no ETag header found"
+fi
+
+CC=$(_header cache-control)
+case "$CC" in
+	*max-age=*) _pass "Cache-Control carries a max-age ($CC)" ;;
+	*) _fail "/flags/de.png Cache-Control" "expected a max-age directive, got: ${CC:-<none>}" ;;
+esac
+
+# --- 3. If-None-Match → 304. --------------------------------------
+_curl -H "If-None-Match: $ETAG" "$HOST/flags/de.png"
+_assert_status 304 "If-None-Match matching ETag → 304"
+if  "$CURL_SIZE" = "0" ; then
+	_pass "304 carries no body"
+else
+	_fail "304 body" "expected 0 body bytes, got $CURL_SIZE"
+fi
+
+# --- 4. HEAD returns headers, no body. ----------------------------
+_curl -I "$HOST/flags/de.png"
+_assert_status 200 "HEAD /flags/de.png"
+if  "$CURL_SIZE" = "0" ; then
+	_pass "HEAD carries no body"
+else
+	_fail "HEAD body" "expected 0 body bytes, got $CURL_SIZE"
+fi
+# HEAD reports the Content-Length the equivalent GET would return, with
+# no content on the wire: the transport serializes headers only, after
+# the payload has been sized from the full body. Not asserted here
+# because it is daemon-wide behaviour rather than anything specific to
+# this route -- 40-http-conformance covers it at the socket level.
+
+# --- 5. Already-compressed payload is not gzip-encoded. -----------
+# curl offers gzip in Accept-Encoding here. deflate over a PNG buys
+# nothing and routinely grows the body, so the server must skip it.
+_curl --compressed "$HOST/flags/us.png"
+_assert_status 200 "GET /flags/us.png (Accept-Encoding: gzip)"
+ENC=$(_header content-encoding)
+if  -z "$ENC" ; then
+	_pass "PNG is served unencoded even when gzip is offered"
+else
+	_fail "/flags/us.png Content-Encoding" "expected none, got: $ENC"
+fi
+
+# --- 6. The "unknown" placeholder is reachable. -------------------
+# CCountryFlags::GetFlag() falls back to flags/unknown.png ("??") for
+# an empty or unrecognised code; the same artwork has to be available
+# here or a frontend can't match the desktop.
+_curl "$HOST/flags/unknown.png"
+_assert_status 200 "GET /flags/unknown.png (the \"??\" placeholder)"
+SIG=$(od -An -tx1 -N8 "$CURL_BODY_FILE" | tr -d ' \n')
+if  "$SIG" = "89504e470d0a1a0a" ; then
+	_pass "placeholder body starts with the PNG signature"
+else
+	_fail "/flags/unknown.png body" "expected PNG magic, got ${SIG:-<empty>}"
+fi
+
+# --- 7. Malformed codes are 404, not 500 / not a wrong icon. ------
+# The art id is built by concatenating "flag_" with the code, so the
+# charset check is load-bearing: without it a crafted code could name a
+# non-flag entry in the shared icon table.
+while read -r target label; do
+	 -z "$target"  && continue
+	_curl "$HOST$target"
+	_assert_status 404 "$label"
+done <<-'EOF'
+	/flags/DE.png	uppercase code → 404
+	/flags/d.png	one-letter code → 404
+	/flags/deu.png	three-letter code → 404
+	/flags/de.jpg	wrong extension → 404
+	/flags/de	no extension → 404
+	/flags/	empty code → 404
+	/flags/d1.png	digit in code → 404
+	/flags/zz.png	well-formed code with no artwork → 404
+EOF
+
+# Traversal attempts. `..` is rejected upstream by the shared
+# LooksMalicious gate (400), and the exact-shape check would 404 them
+# anyway — either way, no icon comes back.
+for target in "/flags/../amule.png" "/flags/%2e%2e/amule.png" "/flags/amule.png"; do
+	_curl "$HOST$target"
+	case "$CURL_STATUS" in
+		400|404) _pass "traversal $target is refused (HTTP $CURL_STATUS)" ;;
+		*) _fail "traversal $target" "expected 400 or 404, got $CURL_STATUS" ;;
+	esac
+	SIG=$(od -An -tx1 -N8 "$CURL_BODY_FILE" | tr -d ' \n')
+	if  "$SIG" = "89504e470d0a1a0a" ; then
+		_fail "traversal $target body" "response leaked a PNG from the icon table"
+	fi
+done
+
+# --- 8. Non-safe methods are 405. ---------------------------------
+for method in POST PATCH DELETE; do
+	_curl -X "$method" "$HOST/flags/de.png"
+	_assert_status 405 "$method /flags/de.png → 405"
+done
+
+# --- 9. No auth required. -----------------------------------------
+# Every assertion above ran without a token, so reaching this line at
+# all proves it. Assert explicitly with a deliberately bogus bearer so
+# a future auth gate on the route can't slip through unnoticed.
+_curl -H "Authorization: Bearer not-a-real-token" "$HOST/flags/fr.png"
+_assert_status 200 "GET /flags/fr.png with a bogus bearer is still served"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/33-known-clients.sh Added

@@ -0,0 +1,431 @@
+#!/usr/bin/env bash
+#
+# amuleapi 33-known-clients — GET /known_clients.
+#
+# /clients answers "who am I connected to right now", keyed by ECID.
+# This route answers "who have I ever exchanged data with", keyed by the
+# peer's user hash and read from the daemon's credit store, so it
+# survives the daemon process any ECID belonged to.
+#
+# What is asserted here:
+#
+#   * the envelope is the standard list shape — a `known_clients` array
+#     plus `total` / `offset` / `limit` — and paginates through the
+#     shared helpers, not a private implementation,
+#   * `limit` is clamped and a bad `limit` / `offset` / `order` is a 400,
+#     same contract as every other list endpoint,
+#   * every `sort` key the endpoint advertises is accepted and an
+#     unknown one is a 400,
+#   * each record carries the fields that are always recorded (user_hash,
+#     the totals, last_seen_at, connected) and omits — rather than empties —
+#     the ones a pre-metadata record has no value for,
+#   * `user_hash` is a 32-char lowercase MD4, so it correlates with
+#     /clients `user_hash` directly,
+#   * the store is maintained rather than re-read: a connected peer's row
+#     tracks the live client state, and a peer met since the first request
+#     is added rather than waiting for a refetch,
+#   * the response is cacheable (ETag) and honours If-None-Match,
+#   * HEAD returns headers with no body,
+#   * non-safe methods are 405.
+#
+# Note on an empty store: a fresh regtest daemon has met no peers, so
+# `total` is legitimately 0 and the per-record assertions skip
+# themselves rather than fail. Point the daemon at a config dir with a
+# populated clients.met to exercise them.
+#
+# Usage:
+#   amuleapi --config-dir=/tmp/amuleapi-regtest &
+#   ./33-known-clients.sh
+#
+# Exits 0 on success, 1 on any failed assertion, 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+# Skips are counted apart from TEST_COUNT, never folded into it: a skipped
+# section is coverage that did not happen, and adding it to the passed tally
+# would report the absence of a check as a check that succeeded.
+SKIP_COUNT=0
+AUTH=()
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_skip() { SKIP_COUNT=$((SKIP_COUNT+1)); echo "  SKIP  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -D /tmp/amuleapi_33_head -o /tmp/amuleapi_33_body \
+		-w '%{http_code}' "${AUTH@}" "$@") || _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat /tmp/amuleapi_33_body)
+	CURL_HEAD=$(cat /tmp/amuleapi_33_head)
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS"
+	fi
+}
+
+_header() { echo "$CURL_HEAD" | awk -F': ' -v k="$1" 'tolower($1) == k {gsub(/\r/,""); print $2}'; }
+
+_jq() { echo "$CURL_BODY" | jq -r "$1" 2>/dev/null; }
+
+trap 'rm -f /tmp/amuleapi_33_head /tmp/amuleapi_33_body' EXIT
+
+command -v jq >/dev/null 2>&1 || _die "jq is required"
+
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+echo "amuleapi 33-known-clients @ $HOST"
+
+# --- 0. Log in. ----------------------------------------------------
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  \
+	|| _die "could not log in for known-clients tests"
+AUTH=(-H "Authorization: Bearer $TOKEN")
+
+# --- 1. The envelope. ---------------------------------------------
+_curl "$API/known_clients"
+_assert_status 200 "GET /known_clients"
+
+if  "$(_jq 'has("known_clients")')" = "true" ; then
+	_pass "envelope has a known_clients array"
+else
+	_fail "envelope" "no known_clients key in: ${CURL_BODY:0:200}"
+fi
+
+for k in total offset limit; do
+	if  "$(_jq "has(\"$k\")")" = "true" ; then
+		_pass "envelope has $k"
+	else
+		_fail "envelope" "missing pagination key: $k"
+	fi
+done
+
+TOTAL=$(_jq '.total')
+echo "        (store holds $TOTAL record(s))"
+
+# --- 1b. credit_ratio comes from the core (issue #1474). ----------
+# The credit modifier rides the credit-store payload now, so a front-end renders
+# it instead of re-deriving the formula from the two totals. Number or null on
+# every row, never absent, and inside the 1,10 the core clamps it to. Read-only,
+# so it is safe here rather than at the end of the file.
+_curl "$API/known_clients?limit=50"
+if  "$(_jq '.known_clients | length')" -gt 0 ; then
+	if  "$(_jq '.known_clients | all(.; has("credit_ratio")
+			and ((.credit_ratio | type) == "number" or .credit_ratio == null))')" = "true" ; then
+		_pass "/known_clients rows carry credit_ratio (number or null)"
+	else
+		_fail "known_clients credit_ratio" \
+			"a record is missing credit_ratio or it is neither number nor null"
+	fi
+	if  "$(_jq '.known_clients | all(.; .credit_ratio == null
+			or (.credit_ratio >= 1 and .credit_ratio <= 10))')" = "true" ; then
+		_pass "credit_ratio stays inside the core's 1,10 clamp"
+	else
+		_fail "known_clients credit_ratio range" \
+			"a record reports a modifier the core could not have produced"
+	fi
+else
+	_skip "credit_ratio shape check (credit store is empty)"
+fi
+
+# --- 2. Pagination, through the shared helpers. -------------------
+_curl "$API/known_clients?limit=1"
+_assert_status 200 "GET /known_clients?limit=1"
+N=$(_jq '.known_clients | length')
+if  "${N:-0}" -le 1 ; then
+	_pass "limit=1 returns at most one record (got ${N:-0})"
+else
+	_fail "limit=1" "returned $N records"
+fi
+
+_curl "$API/known_clients?limit=1&offset=99999999"
+_assert_status 200 "GET /known_clients with a far offset"
+N=$(_jq '.known_clients | length')
+if  "${N:-1}" -eq 0 ; then
+	_pass "an offset past the end returns an empty page, not an error"
+else
+	_fail "far offset" "expected 0 records, got $N"
+fi
+
+for bad in "limit=abc" "limit=99999999999" "offset=-1" "order=sideways"; do
+	_curl "$API/known_clients?$bad"
+	_assert_status 400 "GET /known_clients?$bad is rejected"
+done
+
+# --- 3. Sort keys. -------------------------------------------------
+for key in name software first_seen_at last_seen_at session_count uploaded_bytes_total downloaded_bytes_total; do
+	_curl "$API/known_clients?sort=$key&limit=1"
+	_assert_status 200 "sort=$key is accepted"
+done
+_curl "$API/known_clients?sort=nonsense"
+_assert_status 400 "an unknown sort key is rejected"
+
+_curl "$API/known_clients?sort=last_seen_at&order=desc&limit=1"
+_assert_status 200 "sort=last_seen_at&order=desc is accepted"
+
+# --- 4. Record shape. ----------------------------------------------
+if  "${TOTAL:-0}" -gt 0 ; then
+	_curl "$API/known_clients?limit=1"
+
+	for k in user_hash uploaded_bytes_total downloaded_bytes_total last_seen_at connected; do
+		if  "$(_jq ".known_clients0 | has(\"$k\")")" = "true" ; then
+			_pass "record always carries $k"
+		else
+			_fail "record shape" "missing always-present key: $k"
+		fi
+	done
+
+	HASH=$(_jq '.known_clients0.user_hash')
+	if echo "$HASH" | grep -qE '^0-9a-f{32}$'; then
+		_pass "user_hash is a 32-char lowercase MD4 ($HASH)"
+	else
+		_fail "user_hash" "expected 32 lowercase hex chars, got: ${HASH:-<none>}"
+	fi
+
+	# boolean, or null on a daemon that does not report peer connectivity.
+	# The `online` key must be absent, not merely shadowed: a client
+	# reading it would silently see undefined rather than a boolean.
+	if  "$(_jq '.known_clients0.online | type')" = "null" ; then
+		_pass "known_clients emits no online key"
+	else
+		_fail "known_clients online" "an online key is present"
+	fi
+	ONLINE_TYPE=$(_jq '.known_clients0.connected | type')
+	if  "$ONLINE_TYPE" = "boolean"  ||  "$ONLINE_TYPE" = "null" ; then
+		_pass "connected is a boolean or null"
+	else
+		_fail "connected" "expected boolean or null, got: $ONLINE_TYPE"
+	fi
+
+	# Optional fields are omitted, never emitted empty: a record written
+	# before the daemon kept per-peer metadata has no name at all, and a
+	# consumer must be able to tell that from "recorded as empty".
+	EMPTY_NAMES=$(_jq '.known_clients | select(has("name") and .name == "") | length')
+	if  "${EMPTY_NAMES:-0}" -eq 0 ; then
+		_pass "no record carries an empty name (absent means unrecorded)"
+	else
+		_fail "optional fields" "$EMPTY_NAMES record(s) have name == \"\""
+	fi
+
+	# first_seen_at and session_count travel together — both come from the same
+	# metadata block, so one without the other means a decode bug.
+	MISMATCH=$(_jq '.known_clients | select(has("first_seen_at") != has("session_count")) | length')
+	if  "${MISMATCH:-0}" -eq 0 ; then
+		_pass "first_seen_at and session_count are present or absent together"
+	else
+		_fail "metadata pairing" "$MISMATCH record(s) have one without the other"
+	fi
+else
+	_skip "record-shape assertions (the store is empty)"
+fi
+
+# --- 4b. The store is maintained, not re-read. ---------------------
+# It is fetched once and kept current by the refresher, so a connected peer's
+# totals move between polls without any refetch. A peer that is NOT connected
+# cannot change, so nothing is expected to move for it.
+#
+# Not compared against /clients: the lifetime totals live on the refresher's
+# snapshot but are not part of the /clients JSON, so there is nothing there to
+# compare with. Movement over time is the observable that matters anyway.
+# Sorted, for the same reason as the row check below: an unsorted page of a
+# large store contains no online records at all, and the check would skip
+# itself forever while looking like it had run.
+_curl "$API/known_clients?sort=last_seen_at&order=desc&limit=500"
+ACTIVE_HASH=$(_jq '.known_clients | select(.connected)0.user_hash')
+if  -n "$ACTIVE_HASH"  &&  "$ACTIVE_HASH" != "null" ; then
+	BEFORE=$(_jq ".known_clients | select(.user_hash == \"$ACTIVE_HASH\")0
+		| .downloaded_bytes_total + .uploaded_bytes_total")
+	sleep 4
+	_curl "$API/known_clients?sort=last_seen_at&order=desc&limit=500"
+	AFTER=$(_jq ".known_clients | select(.user_hash == \"$ACTIVE_HASH\")0
+		| .downloaded_bytes_total + .uploaded_bytes_total")
+	if  "${AFTER:-0}" -gt "${BEFORE:-0}" ; then
+		_pass "a connected peer's totals move without a refetch ($BEFORE -> $AFTER)"
+	else
+		# An online but idle peer is legitimately static, and cannot be told
+		# apart from a stale cache here. Only a moving one proves the patch.
+		_skip "live-total check (the online peer is not transferring)"
+	fi
+else
+	_skip "live-total check (no peer is connected)"
+fi
+
+# --- 4c. Every connected peer has a row. ---------------------------
+# The store is fetched once, so a peer met afterwards can only be present if
+# the refresher added it. Any live peer carrying a user hash must therefore
+# appear here -- if it does not, the maintenance has stopped and the endpoint
+# is quietly serving a frozen snapshot.
+#
+# Sorted by last_seen_at descending and read one page: a connected peer is last
+# seen *now*, so the online records are the newest in the store and cannot be
+# pushed off the first page by anything else. `limit` is clamped to 500 by the
+# shared parser, which is well above MaxConnections -- asking for the whole
+# store instead would silently return only the first 500 records and look like
+# a maintenance failure.
+#
+# The empty and all-zero hashes are excluded, matching what
+# ReconcileKnownClientsLocked() skips: the all-zero one is the placeholder a peer
+# reports before sending its real hash, and folding those in would collapse
+# every unidentified peer into one fabricated record.
+LIVE_CLIENTS_JSON=$(curl -s --max-time 10 "${AUTH@}" "$API/clients?limit=500")
+LIVE_TOTAL=$(printf '%s' "$LIVE_CLIENTS_JSON" | jq -r '.clients | length' 2>/dev/null)
+LIVE_HASHES=$(printf '%s' "$LIVE_CLIENTS_JSON" \
+	| jq -r '.clients.user_hash // empty | select(. != "" and (test("^0+$") | not))' | sort -u)
+if  -n "$LIVE_HASHES" ; then
+	_curl "$API/known_clients?sort=last_seen_at&order=desc&limit=500"
+	MISSING=0
+	CHECKED=0
+	for h in $LIVE_HASHES; do
+		CHECKED=$((CHECKED+1))
+		FOUND=$(_jq ".known_clients | select(.user_hash == \"$h\") | length")
+		 "${FOUND:-0}" -eq 0  && MISSING=$((MISSING+1))
+	done
+	if  "$MISSING" -eq 0 ; then
+		_pass "every connected peer has a known-clients row ($CHECKED checked)"
+	else
+		_fail "maintenance" "$MISSING of $CHECKED connected peer(s) have no row" \
+			"the refresher is not folding live peers into the store"
+	fi
+
+	# And they are flagged as connected, not merely present.
+	ONLINE_N=$(_jq '.known_clients | select(.connected) | length')
+	if  "${ONLINE_N:-0}" -gt 0 ; then
+		_pass "connected peers are flagged connected ($ONLINE_N)"
+	else
+		_fail "connected flag" "no record is flagged connected while peers are connected"
+	fi
+elif  "${LIVE_TOTAL:-0}" -gt 0 ; then
+	# Connected, but nothing to look up: every peer is still on the
+	# placeholder hash the filter above drops. Saying "no peer is
+	# connected" here would describe the opposite of what happened, and
+	# this is exactly the population the filter exists for.
+	_skip "per-peer row check ($LIVE_TOTAL peer(s) connected, none identified yet)"
+else
+	_skip "per-peer row check (no peer is connected)"
+fi
+
+# --- 5. Caching. ---------------------------------------------------
+_curl "$API/known_clients?limit=1"
+ETAG=$(_header etag)
+if  -n "$ETAG" ; then
+	_pass "response carries an ETag"
+	_curl -H "If-None-Match: $ETAG" "$API/known_clients?limit=1"
+	_assert_status 304 "If-None-Match on the same ETag is a 304"
+else
+	_fail "caching" "no ETag on /known_clients"
+fi
+
+# --- 6. HEAD and method rejection. ---------------------------------
+_curl -I "$API/known_clients"
+_assert_status 200 "HEAD /known_clients"
+
+for m in POST PUT DELETE PATCH; do
+	_curl -X "$m" "$API/known_clients"
+	_assert_status 405 "$m /known_clients is rejected"
+done
+
+# --- online means reachable, not "has a live row". -------------------
+#
+# The daemon holds a client object from the first contact ATTEMPT, so a peer
+# it is still trying to reach -- or can never reach -- has a /clients row.
+# `connected` is the peer's real connection state, not the mere presence of
+# that row, so every record that
+# claims online must have a live counterpart that also says connected.
+#
+# Appended at the end: both requests are reads, but a new section in the
+# middle shifts the daemon state the later sections were written against.
+# The two lists come from separate requests, so a peer that disconnects
+# between them is a legitimate mismatch rather than a broken invariant.
+# Re-read both and require the SAME hash to still be inconsistent before
+# failing: a real defect persists, a race does not.
+_cross_check_online() {
+	_curl "$API/known_clients?limit=200"
+	local online_hashes connected_hashes h missing=""
+	online_hashes=$(printf '%s' "$CURL_BODY" \
+		| jq -r '.known_clients | select(.connected == true) | .user_hash | .')
+	 -z "$online_hashes"  && { echo "__NONE__"; return; }
+	_curl "$API/clients?limit=1000"
+	# Flattened to one space-separated line: the membership test below is a
+	# `case` glob looking for " $h ", and jq -r emits one hash per LINE, so a
+	# newline-separated list matched nothing and reported every online hash
+	# as missing. It passed only when exactly one hash was connected, which
+	# is what made the failure look intermittent.
+	connected_hashes=$(printf '%s' "$CURL_BODY" \
+		| jq -r '.clients | select(.connected == true) | .user_hash | .' | tr '\n' ' ')
+	for h in $online_hashes; do
+		case " $connected_hashes " in
+		*" $h "*) ;;
+		*) missing="$missing $h" ;;
+		esac
+	done
+	echo "$missing"
+}
+# Sample repeatedly and intersect. The two lists come from separate
+# requests, so a peer that disconnects between them is inconsistent for that
+# sample alone and says nothing about the invariant. A hash inconsistent in
+# EVERY sample is not a disconnect in flight, and that is the defect this
+# exists to catch: a record claiming online with no connected peer behind
+# it. The loop exits on the first clean sample, so it costs nothing when the
+# lists agree, which is the normal case.
+PERSISTENT=""
+for i in $(seq 1 8); do
+	SAMPLE=$(_cross_check_online)
+	 "$SAMPLE" = "__NONE__"  && { PERSISTENT="__NONE__"; break; }
+	if  -z "$SAMPLE" ; then
+		PERSISTENT=""
+		break
+	fi
+	if  "$i" = "1" ; then
+		PERSISTENT="$SAMPLE"
+	else
+		KEEP=""
+		for h in $PERSISTENT; do
+			case " $SAMPLE " in
+			*" $h "*) KEEP="$KEEP $h" ;;
+			esac
+		done
+		PERSISTENT="$KEEP"
+		 -z "$PERSISTENT"  && break
+	fi
+	sleep 1
+done
+if  "$PERSISTENT" = "__NONE__" ; then
+	_skip "no known client is connected; cannot cross-check against /clients"
+elif  -z "$PERSISTENT" ; then
+	_pass "every connected known client has a connected /clients counterpart"
+else
+	_fail "known_clients connected" \
+		"no connected /clients row for:$PERSISTENT (in every one of 8 samples)"
+fi
+
+echo
+SKIP_NOTE=""
+ "$SKIP_COUNT" -gt 0  && SKIP_NOTE=" ($SKIP_COUNT check(s) skipped)"
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "33-known-clients: all $TEST_COUNT assertions passed$SKIP_NOTE"
+	exit 0
+fi
+echo "33-known-clients: $FAIL_COUNT of $TEST_COUNT assertions FAILED"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/34-friends.sh Added

@@ -0,0 +1,307 @@
+#!/usr/bin/env bash
+#
+# amuleapi 34-friends — the /friends resource.
+#
+# The friends list is the one the desktop client keeps in emfriends.met.
+# amuleapi serves it from the snapshot the refresher already builds: the
+# daemon appends the whole list to every GET_UPDATE reply, so reading it
+# costs no EC roundtrip of its own.
+#
+# What is asserted here:
+#
+#   * the envelope is the standard list shape — a `friends` array plus
+#     `total` / `offset` / `limit` — and paginates through the shared
+#     helpers rather than a private implementation,
+#   * `limit` is clamped and a bad `limit` / `offset` / `order` is a 400,
+#     the same contract as every other list endpoint,
+#   * both advertised sort keys are accepted and an unknown one is a 400,
+#   * a friend added by address round-trips: the POST is a bodyless 202
+#     (EC's FRIEND op never returns the record it made) and the friend
+#     then appears in the list with the address given, `connected` false
+#     while nothing is linked,
+#   * `user_hash` is either empty or a 32-char lowercase MD4, so it
+#     correlates with /clients `user_hash` directly,
+#   * `friend_slot` toggles through PATCH and reads back, which is the
+#     part that needed the daemon to serialize the flag at all,
+#   * DELETE removes it (204, no body) and a second DELETE is a 404 -
+#     the EC op is idempotent but a mistyped id must not answer 204,
+#   * the mutations require ADMIN and the read does not,
+#   * malformed bodies are rejected before any EC traffic,
+#   * HEAD is routed like GET, and non-routed methods are 405.
+#
+# Usage:
+#   amuleapi --config-dir=/tmp/amuleapi-regtest &
+#   ./34-friends.sh
+#
+# Exits 0 on success, 1 on any failed assertion, 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+AUTH=()
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -D /tmp/amuleapi_34_head -o /tmp/amuleapi_34_body \
+		-w '%{http_code}' "${AUTH@}" "$@") || _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat /tmp/amuleapi_34_body)
+	CURL_HEAD=$(cat /tmp/amuleapi_34_head)
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" "body: ${CURL_BODY:0:200}"
+	fi
+}
+
+_jq() { echo "$CURL_BODY" | jq -r "$1" 2>/dev/null; }
+
+trap 'rm -f /tmp/amuleapi_34_head /tmp/amuleapi_34_body' EXIT
+
+command -v jq >/dev/null 2>&1 || _die "jq is required"
+
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+echo "amuleapi 34-friends @ $HOST"
+
+# --- 0. Log in. ----------------------------------------------------
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "could not log in for friends tests"
+AUTH=(-H "Authorization: Bearer $TOKEN")
+
+# --- 1. The envelope. ---------------------------------------------
+_curl "$API/friends"
+_assert_status 200 "GET /friends"
+
+if  "$(_jq 'has("friends")')" = "true" ; then
+	_pass "envelope has a friends array"
+else
+	_fail "envelope" "no friends key in: ${CURL_BODY:0:200}"
+fi
+
+for k in total offset limit; do
+	if  "$(_jq "has(\"$k\")")" = "true" ; then
+		_pass "envelope has $k"
+	else
+		_fail "envelope" "missing pagination key: $k"
+	fi
+done
+
+BEFORE=$(_jq '.total')
+echo "        (list holds $BEFORE friend(s) before this run)"
+
+# --- 2. Shared list-parameter contract. ----------------------------
+_curl "$API/friends?limit=1&offset=0"
+_assert_status 200 "GET /friends?limit=1"
+ "$(_jq '.limit')" = "1"  && _pass "limit is echoed" || _fail "limit echo" "got $(_jq '.limit')"
+
+# Over the cap is a rejection (400), not a silent clamp: a client asking for
+# 99999 is told, rather than getting a quietly reduced window with nothing in
+# the response saying the request had been altered.
+_curl "$API/friends?limit=1000000001"
+_assert_status 400 "GET /friends?limit=1000000001 is rejected, not clamped"
+
+# The cap itself is still valid.
+_curl "$API/friends?limit=500"
+_assert_status 200 "GET /friends?limit=500 (the cap is in range)"
+
+for bad in "limit=abc" "limit=-1" "offset=-1" "order=sideways"; do
+	_curl "$API/friends?$bad"
+	_assert_status 400 "GET /friends?$bad is rejected"
+done
+
+for key in name connected; do
+	_curl "$API/friends?sort=$key&order=desc"
+	_assert_status 200 "sort=$key is accepted"
+done
+_curl "$API/friends?sort=nonsuch"
+_assert_status 400 "unknown sort key is rejected"
+
+# --- 3. Add by address, then read it back. -------------------------
+# 203.0.113.x is TEST-NET-3 (RFC 5737) — never routable, so this cannot
+# reach a real peer no matter where the regtest daemon runs.
+TEST_IP="203.0.113.42"
+TEST_PORT=4662
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"ip\":\"$TEST_IP\",\"port\":$TEST_PORT,\"name\":\"curltest-friend\"}" \
+	"$API/friends"
+# 202 with no body. EC's FRIEND op answers success or failure and never
+# returns the record it created, so the caller re-reads /friends to see the
+# new friend, which is what the rest of this phase does.
+_assert_status 202 "POST /friends (address form)"
+ -z "$CURL_BODY"  && _pass "POST /friends sends no body" \
+	|| _fail "POST body" "expected empty, got: ${CURL_BODY:0:200}"
+
+_curl "$API/friends?limit=500"
+AFTER=$(_jq '.total')
+
+# Find the friend just added, by the address it was added with.
+NEW_ECID=$(echo "$CURL_BODY" | jq -r --arg ip "$TEST_IP" --argjson p "$TEST_PORT" \
+	'.friends | select(.ip == $ip and .port == $p) | first | .ecid // empty')
+if  -n "$NEW_ECID" ; then
+	_pass "the added friend is readable from /friends (ecid=$NEW_ECID)"
+else
+	_fail "friend lookup" "no friend at $TEST_IP:$TEST_PORT in: ${CURL_BODY:0:300}"
+	_die "cannot continue without the new friend's ecid"
+fi
+NEW=$(echo "$CURL_BODY" | jq -r --argjson e "$NEW_ECID" \
+	'.friends | select(.ecid == $e) | first')
+ "$(echo "$NEW" | jq -r .ip)" = "$TEST_IP"  \
+	&& _pass "ip round-trips" || _fail "ip" "got $(echo "$NEW" | jq -r .ip)"
+ "$(echo "$NEW" | jq -r .port)" = "$TEST_PORT"  \
+	&& _pass "port round-trips" || _fail "port" "got $(echo "$NEW" | jq -r .port)"
+ "$(echo "$NEW" | jq -r .connected)" = "false"  \
+	&& _pass "a friend with no linked peer is offline" \
+	|| _fail "connected" "expected false, got $(echo "$NEW" | jq -r .connected)"
+# ...and reports that as null, not a 0 sentinel. 0 is not how this surface
+# spells "no value" anywhere else, and a client joining naively on the raw
+# number would build GET /clients/0 and take a 404.
+ "$(echo "$NEW" | jq -r '.client_ecid')" = "null"  \
+	&& _pass "an offline friend reports client_ecid null, not a 0 sentinel" \
+	|| _fail "client_ecid" "expected null, got $(echo "$NEW" | jq -r .client_ecid)"
+if  "$AFTER" -gt "$BEFORE"  2>/dev/null; then
+	_pass "the list grew ($BEFORE -> $AFTER)"
+else
+	_fail "list growth" "expected > $BEFORE, got $AFTER"
+fi
+
+# every record's hash is either absent-as-empty or a real MD4
+BADHASH=$(echo "$CURL_BODY" | jq -r '.friends | select(.user_hash != "" and (.user_hash | test("^0-9a-f{32}$") | not)) | length')
+ "$BADHASH" = "0"  && _pass "user_hash is empty or 32-char lowercase MD4" \
+	|| _fail "user_hash shape" "$BADHASH record(s) with a malformed hash"
+
+# --- 4. The friend slot, the flag that needed the core change. -----
+_curl -X PATCH -H "Content-Type: application/json" \
+	-d '{"friend_slot":true}' "$API/friends/$NEW_ECID"
+_assert_status 200 "PATCH friend_slot=true"
+ "$(_jq '.friend_slot')" = "true"  && _pass "friend_slot reads back true" \
+	|| _fail "friend_slot" "expected true, got $(_jq '.friend_slot') — is the daemon serializing the tag?"
+
+_curl "$API/friends?limit=500"
+STILL=$(echo "$CURL_BODY" | jq -r --arg e "$NEW_ECID" '.friends | select(.ecid == ($e|tonumber)) | .friend_slot | first')
+ "$STILL" = "true"  && _pass "the slot survives into the list view" \
+	|| _fail "friend_slot in list" "expected true, got $STILL"
+
+_curl -X PATCH -H "Content-Type: application/json" \
+	-d '{"friend_slot":false}' "$API/friends/$NEW_ECID"
+_assert_status 200 "PATCH friend_slot=false"
+ "$(_jq '.friend_slot')" = "false"  && _pass "the slot clears again" \
+	|| _fail "friend_slot" "expected false, got $(_jq '.friend_slot')"
+
+_curl -X PATCH -H "Content-Type: application/json" -d '{}' "$API/friends/$NEW_ECID"
+_assert_status 400 "PATCH with no recognized field is rejected"
+
+# --- 5. Bad input is rejected before any EC traffic. ---------------
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"client_ecid":1,"ip":"203.0.113.9","port":4662}' "$API/friends"
+_assert_status 400 "POST with both body forms is rejected"
+
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"ip":"not-an-ip","port":4662}' "$API/friends"
+_assert_status 400 "POST with a malformed ip is rejected"
+
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"ip\":\"$TEST_IP\",\"port\":0}" "$API/friends"
+_assert_status 400 "POST with a zero port is rejected"
+
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"ip\":\"$TEST_IP\",\"port\":4662,\"user_hash\":\"nothex\"}" "$API/friends"
+_assert_status 400 "POST with a malformed user_hash is rejected"
+
+_curl -X POST -H "Content-Type: application/json" \
+	-d '{"client_ecid":4294967290}' "$API/friends"
+_assert_status 404 "POST naming an unknown client_ecid is a 404"
+
+# --- 6. HEAD and method routing. -----------------------------------
+# Status only, as the other phases do: `curl -I` prints the response headers
+# on stdout, so the -o capture holds those rather than a body, and asserting
+# emptiness here would be testing curl instead of the endpoint.
+_curl -I "$API/friends"
+_assert_status 200 "HEAD /friends"
+
+_curl -X PUT "$API/friends"
+_assert_status 405 "PUT /friends is 405"
+_curl -X POST "$API/friends/$NEW_ECID"
+_assert_status 405 "POST /friends/{ecid} is 405"
+
+# --- 7. Guests read but cannot mutate. ------------------------------
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+if  -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null" ; then
+	SAVED=("${AUTH@}")
+	AUTH=(-H "Authorization: Bearer $GUEST_TOKEN")
+	_curl "$API/friends"
+	_assert_status 200 "guest may GET /friends"
+	_curl -X DELETE "$API/friends/$NEW_ECID"
+	_assert_status 403 "guest may not DELETE a friend"
+	_curl -X POST -H "Content-Type: application/json" \
+		-d "{\"ip\":\"$TEST_IP\",\"port\":4662}" "$API/friends"
+	_assert_status 403 "guest may not POST a friend"
+	AUTH=("${SAVED@}")
+else
+	echo "        (no guest account configured — skipping the guest assertions)"
+fi
+
+# --- 8. Remove, and prove a stale id does not answer 200. ----------
+_curl -X DELETE "$API/friends/$NEW_ECID"
+# 204, no body: the ecid came from the URL and `ok` restated the status code.
+_assert_status 204 "DELETE /friends/$NEW_ECID"
+ -z "$CURL_BODY"  && _pass "DELETE sends no body" \
+	|| _fail "DELETE body" "expected empty, got: ${CURL_BODY:0:200}"
+
+_curl -X DELETE "$API/friends/$NEW_ECID"
+_assert_status 404 "a second DELETE of the same id is a 404"
+
+_curl "$API/friends"
+FINAL=$(_jq '.total')
+ "$FINAL" = "$BEFORE"  && _pass "the list is back to its starting size ($BEFORE)" \
+	|| _fail "cleanup" "expected $BEFORE, got $FINAL"
+
+# --- online is reachability, not "has a live client". ---------------
+#
+# The daemon holds a client object from the first contact ATTEMPT, so a
+# friend it is trying (or failing) to reach has a client_ecid while not
+# being connected. online answers the second question, so the implication
+# runs one way only: online true requires a live peer, but a live peer does
+# not make the friend online.
+_curl "$API/friends?limit=200"
+if  "$(_jq '.friends | select((.connected | type) as $t | $t != "boolean" and $t != "null") | length')" = "0" ; then
+	_pass "every friend connected is a boolean or null"
+else
+	_fail "friends connected type" "a row has connected neither boolean nor null: $CURL_BODY"
+fi
+if  "$(_jq '.friends | select(.connected == true and .client_ecid == null) | length')" = "0" ; then
+	_pass "no friend is connected without a client_ecid"
+else
+	_fail "friends connected" "a row claims connected with client_ecid null: $CURL_BODY"
+fi
+
+# --- Summary -------------------------------------------------------
+echo
+echo "34-friends: $((TEST_COUNT-FAIL_COUNT))/$TEST_COUNT assertions passed"
+ "$FAIL_COUNT" -eq 0  || exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/35-ipfilter-actions.sh Added

@@ -0,0 +1,269 @@
+#!/usr/bin/env bash
+#
+# amuleapi 35-ipfilter-actions — POST /ipfilter/reload, POST /ipfilter/update.
+#
+# Endpoints:
+#   POST /api/v1/ipfilter/reload   → 202, no `ok` field
+#   POST /api/v1/ipfilter/update   → 202, no body at all
+#
+# The two actions the desktop Security page's "Reload List" and "Update now"
+# buttons drive, as EC opcodes that have existed for years. Both are accepted,
+# never completed: amuled queues the work and reports only through its log
+# ("IP filter is ready", "Failed to download ipfilter.dat from <url>"), so
+# there is nothing to assert about the outcome — the contract under test is
+# the accept path, the URL resolution and the guards.
+#
+# Neither reports anything the caller did not already have. update answers
+# with no body at all: the caller already has the URL, either from its own
+# request or from GET /preferences, which section 5 already reads. reload
+# shares the
+# connection-control shape, so its body is an object carrying whatever status
+# string amuled returned - for this opcode, none - and never a constant `ok`.
+#
+# The update happy path deliberately uses an unroutable URL: the download
+# fails asynchronously, amuled logs it and keeps the current filter live, so
+# the run never fetches a real multi-megabyte list and never swaps the
+# operator's ipfilter.dat. Reload is side-effect-free by construction (it
+# re-reads the files already on disk).
+#
+# security.ipfilter_update_url is written by an explicit-URL update (that is
+# the behaviour under test), so the original value is captured up front and
+# restored at the end.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+# Unroutable by design (discard port on loopback): amuled's downloader fails
+# fast and nothing is fetched or swapped.
+TEST_URL="http://127.0.0.1:9/ipfilter.dat"
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_35_ipfilter_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+_assert_body_empty() {
+	local label=$1
+	if  -z "$CURL_BODY" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected an empty body, got: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+# Read one preference out of GET /preferences.
+_pref() {
+	curl -s --max-time 10 -H "Authorization: Bearer $ADMIN_TOKEN" \
+		"$API/preferences" | jq -r "$1"
+}
+
+# Write security.ipfilter_update_url and wait for the snapshot to catch up —
+# the resolution path under test reads amuleapi's snapshot, not amuled.
+_set_url() {
+	curl -s -o /dev/null -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"security\":{\"ipfilter_update_url\":\"$1\"}}" "$API/preferences"
+	for _ in $(seq 1 15); do
+		 "$(_pref '.security.ipfilter_update_url')" = "$1"  && return 0
+		sleep 1
+	done
+	return 1
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 35-ipfilter-actions smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+sleep 4
+
+ORIGINAL_URL=$(_pref '.security.ipfilter_update_url')
+ "$ORIGINAL_URL" = "null"  && _die "GET /preferences has no security.ipfilter_update_url"
+echo "    info: saved security.ipfilter_update_url=\"$ORIGINAL_URL\" for restore"
+restore_url() { _set_url "$ORIGINAL_URL" >/dev/null 2>&1 || true; }
+trap 'restore_url; rm -f "$CURL_BODY_FILE"' EXIT
+
+# --- 1. /ipfilter/reload: auth, admin gate, happy path, verbs. -----
+_curl -X POST "$API/ipfilter/reload"
+_assert_status 401 "POST /ipfilter/reload (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" "$API/ipfilter/reload"
+	_assert_status 403 "POST /ipfilter/reload (guest) → 403"
+fi
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/ipfilter/reload"
+_assert_status 202 "POST /ipfilter/reload → 202"
+# amuled answers this one with no status string, so there is nothing to report
+# and the reply carries no body -- the same shape /ipfilter/update beside it
+# returns, rather than an empty object. When amuled does say something, the
+# body is {"message": "..."} (see the connect routes).
+if  -z "$CURL_BODY" ; then
+	_pass "reload with nothing to report returns no body (not an empty object)"
+else
+	_assert_json_eq '. | has("ok")' false "reload response has no constant ok field"
+	_assert_json_eq '. | has("message")' true \
+		"a reload body exists only to carry the daemon's message"
+fi
+
+_curl -X GET -H "Authorization: Bearer $ADMIN_TOKEN" "$API/ipfilter/reload"
+_assert_status 405 "GET /ipfilter/reload → 405"
+
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" "$API/ipfilter/reload"
+_assert_status 405 "DELETE /ipfilter/reload → 405"
+
+# --- 2. /ipfilter/update: auth + admin gate. -----------------------
+_curl -X POST -H "Content-Type: application/json" \
+	-d "{\"url\":\"$TEST_URL\"}" "$API/ipfilter/update"
+_assert_status 401 "POST /ipfilter/update (no token) → 401"
+
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"url\":\"$TEST_URL\"}" "$API/ipfilter/update"
+	_assert_status 403 "POST /ipfilter/update (guest) → 403"
+fi
+
+# --- 3. Body validation. -------------------------------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" -d '{"url":""}' \
+	"$API/ipfilter/update"
+_assert_status 400 "POST /ipfilter/update empty url → 400"
+
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" -d '{"url":123}' \
+	"$API/ipfilter/update"
+_assert_status 400 "POST /ipfilter/update non-string url → 400"
+
+# Scheme gate: amuled hands the string to the HTTP downloader, so a
+# non-http(s) scheme is rejected here or it fails asynchronously with no
+# way to report back.
+for BAD in "ftp://example.com/ipfilter.dat" "file:///etc/passwd" "example.com/ipfilter.dat"; do
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+		-H "Content-Type: application/json" \
+		-d "{\"url\":\"$BAD\"}" "$API/ipfilter/update"
+	_assert_status 400 "POST /ipfilter/update rejects scheme: $BAD → 400"
+done
+
+# --- 4. No body, no configured URL → 400 (not a silent no-op). -----
+# CIPFilter::Update() returns immediately on an empty URL, so accepting
+# this would promise work that never happens.
+if _set_url ""; then
+	_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/ipfilter/update"
+	_assert_status 400 "POST /ipfilter/update no body, no configured URL → 400"
+	_assert_json_eq '.error.code' bad_request "no URL available → error.code=bad_request"
+else
+	_fail "clear security.ipfilter_update_url" "PATCH did not take effect within 15 s"
+fi
+
+# --- 5. Explicit URL: accepted, echoed, and persisted. -------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" \
+	-d "{\"url\":\"$TEST_URL\"}" "$API/ipfilter/update"
+_assert_status 202 "POST /ipfilter/update explicit URL → 202"
+_assert_body_empty "update sends no body"
+
+# CIPFilter::Update() stores the URL it was handed, the same way the ed2k
+# and Kad list downloads do, so the next auto-update at startup uses it.
+PERSISTED=""
+for _ in $(seq 1 15); do
+	PERSISTED=$(_pref '.security.ipfilter_update_url')
+	 "$PERSISTED" = "$TEST_URL"  && break
+	sleep 1
+done
+if  "$PERSISTED" = "$TEST_URL" ; then
+	_pass "update persisted the URL into security.ipfilter_update_url"
+else
+	_fail "update persisted the URL into security.ipfilter_update_url" \
+		"expected $TEST_URL, got $PERSISTED" \
+		"(needs the core-side CIPFilter::Update() change; an older amuled will not persist)"
+fi
+
+# --- 6. No body: the configured URL is what runs. ------------------
+#
+# Section 4 already pinned the other half of this: with no configured URL and
+# no body, the same request is a 400. Reaching 202 here is what says the
+# handler fell back to security.ipfilter_update_url, which section 5 just
+# proved holds $TEST_URL.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/ipfilter/update"
+_assert_status 202 "POST /ipfilter/update no body, configured URL → 202"
+_assert_body_empty "bodyless update sends no body"
+
+# An empty JSON object is the same case as no body at all.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" -d '{}' "$API/ipfilter/update"
+_assert_status 202 "POST /ipfilter/update {} with configured URL → 202"
+_assert_body_empty "{} update sends no body"
+
+# --- 7. Method gate. -----------------------------------------------
+_curl -X GET -H "Authorization: Bearer $ADMIN_TOKEN" "$API/ipfilter/update"
+_assert_status 405 "GET /ipfilter/update → 405"
+
+_curl -X PATCH -H "Authorization: Bearer $ADMIN_TOKEN" \
+	-H "Content-Type: application/json" -d '{}' "$API/ipfilter/update"
+_assert_status 405 "PATCH /ipfilter/update → 405"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/36-shared-reload.sh Added

@@ -0,0 +1,182 @@
+#!/usr/bin/env bash
+#
+# amuleapi 36-shared-reload — POST /shared_reload.
+#
+# Endpoint:
+#   POST /api/v1/shared_reload   → 202, no `ok` field
+#
+# amuled schedules a re-walk of every configured share root and answers
+# immediately, so the call is accepted (202), never completed (200). The walk
+# starts on amuled's next Process() tick and its result is only ever visible
+# as amule log lines ("Reloading shared files..." then "Found N known shared
+# files"), which a client reads through /logs/amule or the SSE log channel.
+# There is therefore nothing to assert about the outcome here; the contract
+# under test is the accept path, its guards, and that repeated calls coalesce
+# rather than erroring or queueing up.
+#
+# Why this endpoint has its own smoke: the reload used to run inline in
+# amuled's EC handler. Because amuleapi's EC lane is a single serialised
+# worker, that blocked roundtrip held the in-flight slot for the whole walk
+# and turned unrelated endpoints into 503s. The elapsed-time check below is a
+# smoke for that, not a proof — on a small test library even a synchronous
+# walk finishes quickly, so it only catches a gross regression.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_36_shared_reload_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 30 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+# A 202 from shared_reload carries a body only when amuled had
+# something to say: `{"message": ...}` if it did, no body at all if it did not
+# (no empty `{}`, so this matches the URL-fetch triggers). Either is correct; a constant `ok` field is not.
+_assert_no_body_or_message() {
+	local what=$1
+	if  -z "$CURL_BODY" ; then
+		_pass "$what: 202 with no body (amuled reported nothing)"
+	elif echo "$CURL_BODY" | jq -e '(has("ok") | not) and (.message | type == "string")' >/dev/null 2>&1; then
+		_pass "$what: 202 body carries amuled's message and no constant ok"
+	else
+		_fail "$what 202 body" "expected no body or {message}, got: $CURL_BODY"
+	fi
+}
+
+_assert_body_empty() {
+	local label=$1
+	if  -z "$CURL_BODY" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected an empty body, got: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 36-shared-reload smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+sleep 4
+
+# --- 1. Auth guards. -----------------------------------------------
+_curl -X POST "$API/shared_reload"
+_assert_status 401 "POST /shared_reload (no creds) → 401"
+
+if  "$HAVE_GUEST" -eq 1 ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" "$API/shared_reload"
+	_assert_status 403 "POST /shared_reload (guest) → 403"
+else
+	echo "    info: no guest password configured; skipping the 403 guard check"
+fi
+
+# --- 2. Accept path. -----------------------------------------------
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared_reload"
+_assert_status 202 "POST /shared_reload (admin) → 202"
+_assert_no_body_or_message "/shared_reload"
+
+# --- 3. Repeated calls coalesce. -----------------------------------
+# A second request while the first is still pending (or its walk running)
+# must be accepted the same way, not rejected as a conflict and not queued
+# into a second walk. Only the status is observable from here; that the two
+# collapse into one walk is amuled-side and shows up in its log.
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared_reload"
+_assert_status 202 "POST /shared_reload again immediately → 202"
+_assert_no_body_or_message "second /shared_reload"
+
+# --- 4. The reply does not wait for the walk. ----------------------
+# Generous bound: this is a smoke against a regression to the old inline
+# behaviour, not a timing guarantee. SimpleConnControlOp also runs an inline
+# RefresherTick, so a handful of EC roundtrips are included in the figure.
+START=$(date +%s)
+_curl -X POST -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared_reload"
+ELAPSED=$(( $(date +%s) - START ))
+_assert_status 202 "POST /shared_reload (timed) → 202"
+if  "$ELAPSED" -le 10 ; then
+	_pass "/shared_reload returned in ${ELAPSED}s (does not block on the walk)"
+else
+	_fail "/shared_reload returned in ${ELAPSED}s" \
+		"expected the reply to be scheduled, not to wait for the directory walk"
+fi
+
+# --- 5. The API stays usable while the walk runs. ------------------
+# The reload request must not be the thing that occupies the EC service's
+# in-flight slot for the walk's duration; if it were, these would 503.
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/status"
+_assert_status 200 "GET /status right after a reload → 200 (not 503)"
+
+_curl -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared"
+_assert_status 200 "GET /shared right after a reload → 200"
+_assert_json_eq '.shared | type' array "/shared still serves a coherent list"
+
+# --- 6. Method gate. -----------------------------------------------
+_curl -X GET -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared_reload"
+_assert_status 405 "GET /shared_reload → 405"
+
+_curl -X DELETE -H "Authorization: Bearer $ADMIN_TOKEN" "$API/shared_reload"
+_assert_status 405 "DELETE /shared_reload → 405"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/37-shared-availability-parts.sh Added

@@ -0,0 +1,233 @@
+#!/usr/bin/env bash
+#
+# amuleapi 37-shared-availability-parts — `parts` on `GET /shared/{hash}` detail.
+#
+# Validates the shared-side stateful RLE decoder pass (issue #982). amuled
+# RLE-encodes each shared file's per-part source counts into
+# EC_TAG_PARTFILE_PART_STATUS on the EC_TAG_KNOWNFILE tag; the refresher
+# decodes it into the snapshot and the detail endpoint emits it.
+#
+# Wire contract:
+#   GET /shared          → no `parts` key, ever
+#   GET /shared/{hash}   → `parts: { "sources": int }, ...`, omitted
+#                          entirely until the first decode has landed
+#
+# `parts.length == ceil(size / 9728000)` (ed2k PARTSIZE).
+# `sources` is the raw per-part source count, saturating at 255.
+#
+# Unlike the downloads bar this is an AVAILABILITY map, not a progress
+# one: a shared file is fully local by definition, so `sources: 0` means
+# no other peer has that part. There is deliberately no `state` key —
+# local completeness is meaningless here.
+#
+# This script tolerates an empty share — every assertion past the auth
+# gate is conditionally skipped if no files are shared.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_37_shared_avail_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then
+	_die "jq is required."
+fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable."
+fi
+
+echo "amuleapi 37-shared-availability-parts smoke @ $HOST"
+
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "login failed"
+
+# The RLE decoder needs the first EC_TAG_KNOWNFILE frame to seed itself
+# before any later delta can produce a usable decode. Give it 4 s, the
+# same warmup 08-read-download-parts.sh uses.
+sleep 4
+
+# --- 1. List endpoint MUST NOT carry `parts`. ----------------------
+#
+# A 100 GB file has ~10 800 parts; carrying the array across a
+# five-figure share on every list read (and every shared_updated SSE
+# tick) is not viable. Same call as the downloads list makes.
+_curl -H "Authorization: Bearer $TOKEN" "$API/shared"
+_assert_status 200 "GET /shared → 200"
+_assert_json_eq '.shared | type' array '/shared .shared is array'
+
+COUNT=$(printf '%s' "$CURL_BODY" | jq '.shared | length')
+echo "    info: $COUNT files currently shared"
+
+if  "$COUNT" -gt 0 ; then
+	NO_PARTS=$(printf '%s' "$CURL_BODY" | jq '.shared | select(has("parts")) | length')
+	if  "$NO_PARTS" = "0" ; then
+		_pass "/shared carries no \`parts\` on any row (detail-only field)"
+	else
+		_fail "/shared parts omission" "$NO_PARTS of $COUNT rows carry a parts key"
+	fi
+
+	# Pick the largest shared file: more parts means the length check
+	# below actually discriminates, and a 1-part file would pass a
+	# broken emitter by accident.
+	FIRST_HASH=$(printf '%s' "$CURL_BODY" | jq -r '.shared | max_by(.size) | .hash')
+	FIRST_SIZE=$(printf '%s' "$CURL_BODY" | jq -r '.shared | max_by(.size) | .size')
+
+	# --- 2. Detail endpoint carries `parts`. -----------------------
+	_curl -H "Authorization: Bearer $TOKEN" "$API/shared/$FIRST_HASH"
+	_assert_status 200 "GET /shared/{hash} → 200"
+	_assert_json_eq '.hash' "$FIRST_HASH" \
+		'/shared/{hash} echoes hash (bare object, not enveloped)'
+
+	HAS_PARTS=$(printf '%s' "$CURL_BODY" | jq 'has("parts")')
+	if  "$HAS_PARTS" != "true" ; then
+		# Legitimate transient: nothing decoded yet for this ECID. The
+		# key must then be ABSENT rather than an empty or all-zero
+		# array, which is exactly what we just asserted.
+		echo "    info: no decode has landed for this file yet; \`parts\` correctly absent"
+		echo "    info: per-part shape checks skipped — re-run once the refresher has ticked"
+	else
+		_assert_json_eq '.parts | type' array '/shared/{hash}.parts is array'
+		PARTS_LEN=$(printf '%s' "$CURL_BODY" | jq '.parts | length')
+
+		# --- 3. parts.length == total_part_count == ceil(size/PARTSIZE). --
+		PART_COUNT=$(printf '%s' "$CURL_BODY" | jq '.total_part_count')
+		if  "$PARTS_LEN" = "$PART_COUNT" ; then
+			_pass "/shared/{hash}.parts.length == total_part_count ($PARTS_LEN)"
+		else
+			_fail "/shared/{hash}.parts.length vs total_part_count" \
+				"total_part_count=$PART_COUNT, parts.length=$PARTS_LEN"
+		fi
+		if  "$FIRST_SIZE" -gt 0 ; then
+			EXPECTED_PARTS=$(( (FIRST_SIZE + 9728000 - 1) / 9728000 ))
+			if  "$PARTS_LEN" = "$EXPECTED_PARTS" ; then
+				_pass "/shared/{hash}.parts.length == ceil(size/PARTSIZE) ($PARTS_LEN)"
+			else
+				_fail "/shared/{hash}.parts.length sanity" \
+					"size=$FIRST_SIZE → expected $EXPECTED_PARTS, got $PARTS_LEN"
+			fi
+		fi
+
+		# --- 4. Per-part shape: {sources} and nothing else. ---------
+		#
+		# Pinning the absence of `state` on purpose: copying the
+		# downloads shape would encode local completeness, which is
+		# meaningless for a share and invites a progress renderer.
+		if  "$PARTS_LEN" -gt 0 ; then
+			_assert_json_eq '.parts0.sources | type' number \
+				'/shared/{hash}.parts0.sources is number'
+			WRONG_KEYS=$(printf '%s' "$CURL_BODY" | jq \
+				'.parts | select((keys | sort) != "sources") | length')
+			if  "$WRONG_KEYS" = "0" ; then
+				_pass "/shared/{hash} every part object is exactly {sources}"
+			else
+				_fail "/shared/{hash} part object shape" \
+					"$WRONG_KEYS parts carry keys other than \`sources\`"
+			fi
+
+			# --- 5. sources within the encoder's uint8 range. -------
+			# amuled's RLE buffer is uint8, so counts saturate at 255.
+			OUT_OF_RANGE=$(printf '%s' "$CURL_BODY" | jq \
+				'.parts.sources | select(. < 0 or . > 255) | length')
+			if  "$OUT_OF_RANGE" = "0" ; then
+				_pass "/shared/{hash} all part.sources values within 0,255"
+			else
+				_fail "/shared/{hash} part.sources range" \
+					"$OUT_OF_RANGE parts have sources outside 0,255"
+			fi
+
+			# --- 6. sources.complete agrees with min(parts). --------
+			# amuled derives sources.complete as the minimum of the
+			# availability vector, so a scalar above that minimum means
+			# the two are out of step. Reported as info, not a failure:
+			# the count is refreshed only on the increment path in the
+			# core, so it legitimately lags the vector downward.
+			MIN_SRC=$(printf '%s' "$CURL_BODY" | jq '.parts.sources | min')
+			CS=$(printf '%s' "$CURL_BODY" | jq '.sources.complete // 0')
+			echo "    info: sources.complete=$CS, min(parts.sources)=$MIN_SRC"
+		fi
+
+		# --- 7. URL hash case-insensitive. ----------------------
+		UPPER_HASH=$(echo "$FIRST_HASH" | tr 'a-f' 'A-F')
+		_curl -H "Authorization: Bearer $TOKEN" "$API/shared/$UPPER_HASH"
+		_assert_status 200 "GET /shared/{HASH} (uppercase) → 200"
+		_assert_json_eq '.parts | type' array \
+			'/shared/{HASH} uppercase still carries parts'
+	fi
+
+	# --- 8. Guest sessions see the bar too (read-only data). -------
+	GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+		-d "{\"password\":\"${GUEST_PASS:-guestpass}\"}" \
+		"$API/auth/login?include_token=true" | jq -r .token)
+	if  -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null" ; then
+		_curl -H "Authorization: Bearer $GUEST_TOKEN" "$API/shared/$FIRST_HASH"
+		_assert_status 200 "GET /shared/{hash} as guest → 200"
+	else
+		echo "    info: guest login unavailable; guest-visibility check skipped"
+	fi
+else
+	echo "    info: nothing shared; the per-part shape checks need at least one shared file"
+fi
+
+# --- 9. 404 on unknown hash. ---------------------------------------
+_curl -H "Authorization: Bearer $TOKEN" \
+	"$API/shared/00000000000000000000000000000000"
+_assert_status 404 "GET /shared/{nonexistent} → 404"
+_assert_json_eq '.error.code' not_found \
+	'/shared/{nonexistent} carries error.code=not_found'
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/38-chat.sh Added

@@ -0,0 +1,306 @@
+#!/usr/bin/env bash
+#
+# amuleapi 38-chat — the /chats surface (issue #971).
+#
+# Chat is served from a session store in amuled that every client shares,
+# so a message sent from the desktop GUI, from amulegui or through this
+# API lands in one transcript.
+#
+# Wire contract:
+#   GET    /chats                   → list envelope of conversations
+#   GET    /chats/{address}/messages   → { peer, messages, total, last_message_id }
+#   POST   /chats/{address}/messages   → 202 + the created message
+#   DELETE /chats/{address}            → 204, no body
+#
+# `{peer}` is "<ip>:<port>". Every route answers 503 ec_unsupported when
+# the connected amuled predates the chat ops.
+#
+# The peer used below is in the RFC 5737 TEST-NET-3 documentation range,
+# which is not routable: the daemon creates the conversation and queues
+# the message without anything leaving the host. That is the point --
+# POST is 202 ("queued on the peer connection"), never a delivery
+# receipt, so an unreachable peer is a valid and deliberate test target.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+# TEST-NET-3 (RFC 5737). Never routable, never a real peer.
+PEER_IP=203.0.113.42
+PEER_PORT=4662
+PEER="$PEER_IP:$PEER_PORT"
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_38_chat_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+_assert_body_empty() {
+	local label=$1
+	if  -z "$CURL_BODY" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected an empty body, got: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+command -v jq >/dev/null 2>&1 || _die "jq is required."
+curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null \
+	|| _die "amuleapi at $HOST is not reachable."
+
+echo "amuleapi 38-chat smoke @ $HOST"
+
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "login failed"
+
+# --- 1. Capability gate. ------------------------------------------
+#
+# Against an amuled that predates the chat ops every route must answer
+# 503 ec_unsupported rather than sending an opcode the daemon would land
+# in its unknown-opcode branch (which asserts before it can answer).
+_curl -H "Authorization: Bearer $TOKEN" "$API/chats"
+if  "$CURL_STATUS" = "503" ; then
+	CODE=$(printf '%s' "$CURL_BODY" | jq -r '.error.code')
+	if  "$CODE" = "ec_unsupported" ; then
+		_pass "GET /chats → 503 ec_unsupported (daemon predates the chat ops)"
+		echo "    info: connected amuled does not serve chat; remaining checks skipped"
+		echo
+		echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+		exit 0
+	fi
+	_fail "GET /chats 503 shape" "expected error.code=ec_unsupported, got $CODE"
+fi
+_assert_status 200 "GET /chats → 200"
+_assert_json_eq '.chats | type' array '/chats .chats is array'
+
+# --- 2. Send creates the conversation. ----------------------------
+#
+# No 404 for an unknown peer: the core creates the session, so POST
+# doubles as "start a chat with this address".
+_curl -X POST -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" \
+	-d '{"text":"curl-test hello"}' "$API/chats/$PEER/messages"
+_assert_status 202 "POST /chats/{address}/messages → 202 Accepted"
+# The created message stays in the body: no per-message GET defines a shape
+# for it, so the id and the timestamp the store assigned are only readable
+# here. There is no `ok` field; the 202 already carries it.
+_assert_json_eq '. | has("ok")' false 'send response has no constant ok field'
+_assert_json_eq '.address'                "$PEER" 'send echoes the conversation key'
+_assert_json_eq '.message.direction'   out     'sent message is direction=out'
+_assert_json_eq '.message.text'        "curl-test hello" 'send echoes the text'
+# Same object shape the GET returns, from the same writer -- including the
+# sent_at key. It is null here and only here: EC_OP_CHAT_SEND answers with the
+# message id and no timestamp.
+_assert_json_eq '.message | has("sent_at")' true 'send echo carries the sent_at key'
+_assert_json_eq '.message.sent_at' null 'send echo sent_at is null, not a fabricated stamp'
+FIRST_ID=$(printf '%s' "$CURL_BODY" | jq -r '.message.id')
+
+# The refresher mirrors the store on its next tick (1 s).
+sleep 3
+
+# --- 3. The conversation is now on the list. ----------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/chats"
+_assert_status 200 "GET /chats → 200 after send"
+FOUND=$(printf '%s' "$CURL_BODY" | jq --arg p "$PEER" '.chats | select(.address == $p) | length')
+if  "$FOUND" = "1" ; then
+	_pass "/chats lists the new conversation"
+else
+	_fail "/chats conversation presence" "expected exactly 1 row for $PEER, got $FOUND"
+fi
+# Narrow the body to just this conversation's row for the field checks.
+ROW=$(printf '%s' "$CURL_BODY" | jq --arg p "$PEER" -c '.chats | select(.address == $p)')
+printf '%s' "$ROW" > "$CURL_BODY_FILE"; CURL_BODY=$ROW
+_assert_json_eq '.ip'                 "$PEER_IP"   'row carries the split ip'
+_assert_json_eq '.port'               "$PEER_PORT" 'row carries the split port'
+# The peer is a TEST-NET-3 address nothing can reach, so we are definitively
+# not connected to it -- whether or not the daemon minted a client object
+# while trying. That is the whole point of the field: `connected` is
+# reachability, not the mere existence of a client_ecid, which is true from
+# the first contact ATTEMPT.
+_assert_json_eq '.connected'          false        'unrouted peer is offline'
+# client_ecid is deliberately NOT asserted null here any more. The daemon
+# legitimately holds a client object for a peer it is trying to reach, so
+# pinning it to null asserted the very conflation `online` now avoids. What
+# must hold is the implication: online can only be true with a live peer.
+_assert_json_eq '(.connected == true) and (.client_ecid == null) | not' true \
+	'connected is never true without a client_ecid'
+_assert_json_eq '.client_ecid | type | test("^(number|null)$")' true \
+	'client_ecid is a number or null, never a 0 sentinel'
+_assert_json_eq '.friend_ecid'        null         'a non-friend peer has friend_ecid null, not a 0 sentinel'
+_assert_json_eq '.last_message.text'  "curl-test hello" 'row carries last_message'
+# The core has no nickname for a peer that never answered, so the row must
+# fall back to the desktop's own rendering rather than an empty string.
+_assert_json_eq '.name' "IP: $PEER_IP Port: $PEER_PORT" 'name falls back to the address form'
+
+# --- 4. Reading the transcript. -----------------------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/chats/$PEER/messages"
+_assert_status 200 "GET /chats/{address}/messages → 200"
+_assert_json_eq '.address'            "$PEER" 'messages echo the conversation key'
+_assert_json_eq '.messages | type' array   'messages is an array'
+_assert_json_eq '.messages0.direction' out 'first message is direction=out'
+
+# Every message object is exactly {id, direction, text, sent_at}.
+WRONG=$(printf '%s' "$CURL_BODY" | jq \
+	'.messages | select((keys | sort) != "direction","id","sent_at","text") | length')
+if  "$WRONG" = "0" ; then
+	_pass "every message object is {id, direction, text, sent_at}"
+else
+	_fail "message object shape" "$WRONG messages carry unexpected keys"
+fi
+
+# --- 5. since_message_id is a safe cursor. --------------------------------
+#
+# ids are monotonic per daemon process, so a client polling with the
+# highest id it holds must never see a duplicate and never skip one.
+_curl -H "Authorization: Bearer $TOKEN" \
+	"$API/chats/$PEER/messages?since_message_id=$FIRST_ID"
+_assert_status 200 "GET messages?since_message_id → 200"
+_assert_json_eq '.messages | length' 0 'since_message_id at the head returns nothing new'
+
+_curl -X POST -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" \
+	-d '{"text":"second message"}' "$API/chats/$PEER/messages"
+_assert_status 202 "POST second message → 202"
+sleep 3
+_curl -H "Authorization: Bearer $TOKEN" \
+	"$API/chats/$PEER/messages?since_message_id=$FIRST_ID"
+_assert_json_eq '.messages | length'   1                'since_message_id returns exactly the new message'
+_assert_json_eq '.messages0.text'    "second message" 'since_message_id returns the right message'
+
+# --- 5b. `tail`, not `limit`. --------------------------------------
+#
+# This selects the last N of the window rather than a page of it, which is
+# what the log endpoints already call `tail`. It was called `limit`, which
+# on nine other collections means a window paired with `offset` -- one word
+# with two meanings is a rule a client has to learn twice.
+_curl -H "Authorization: Bearer $TOKEN" \
+	"$API/chats/$PEER/messages?tail=1"
+_assert_status 200 "GET messages?tail=1 → 200"
+_assert_json_eq '.messages | length' 1 'tail=1 returns just the newest message'
+_assert_json_eq '.messages0.text' "second message" 'tail keeps the newest, not the oldest'
+
+# `limit` is an unknown parameter here and is simply ignored --
+# the count parameter is `tail`, honoured under no other name.
+_curl -H "Authorization: Bearer $TOKEN" \
+	"$API/chats/$PEER/messages?limit=1"
+_assert_status 200 "GET messages?limit=1 → 200 (unknown param, ignored)"
+_assert_json_eq '.messages | length' 2 'limit does not truncate the chat window'
+
+# Same strict parsing as every other count on the surface.
+_curl -H "Authorization: Bearer $TOKEN" \
+	"$API/chats/$PEER/messages?tail=abc"
+_assert_status 400 "GET messages?tail=abc → 400"
+
+# --- 6. Input validation. -----------------------------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/chats/notanaddress/messages"
+_assert_status 400 "GET messages with a malformed {peer} → 400"
+_curl -H "Authorization: Bearer $TOKEN" "$API/chats/$PEER_IP:99999/messages"
+_assert_status 400 "GET messages with an out-of-range port → 400"
+_curl -H "Authorization: Bearer $TOKEN" "$API/chats/198.51.100.7:4662/messages"
+_assert_status 404 "GET messages for an unknown conversation → 404"
+_curl -X POST -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" \
+	-d '{"text":""}' "$API/chats/$PEER/messages"
+_assert_status 400 "POST with empty text → 400"
+_curl -X POST -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" \
+	-d '{}' "$API/chats/$PEER/messages"
+_assert_status 400 "POST with no text field → 400"
+# The ECID-keyed send routes are gone (issue #1497): a conversation is addressed by
+# ip:port, which every caller already has on its own rows. Both paths now fall through
+# to the catch-all 404 -- asserted so a re-added route cannot slip back in unnoticed.
+_curl -X POST -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" \
+	-d '{"text":"x"}' "$API/clients/4294967290/messages"
+_assert_status 404 "POST /clients/{ecid}/messages is not a route → 404"
+_curl -X POST -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" \
+	-d '{"text":"x"}' "$API/friends/4294967290/messages"
+_assert_status 404 "POST /friends/{ecid}/messages is not a route → 404"
+
+# --- 7. Method gating. --------------------------------------------
+_curl -X PUT -H "Authorization: Bearer $TOKEN" "$API/chats"
+_assert_status 405 "PUT /chats → 405"
+_curl -X PATCH -H "Authorization: Bearer $TOKEN" "$API/chats/$PEER"
+_assert_status 405 "PATCH /chats/{address} → 405"
+
+# --- 8. Guests read but do not write. -----------------------------
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+if  -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null" ; then
+	_curl -H "Authorization: Bearer $GUEST_TOKEN" "$API/chats"
+	_assert_status 200 "GET /chats as guest → 200 (read-only data)"
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" -H "Content-Type: application/json" \
+		-d '{"text":"nope"}' "$API/chats/$PEER/messages"
+	_assert_status 403 "POST as guest → 403 (sending is admin-only)"
+	_curl -X DELETE -H "Authorization: Bearer $GUEST_TOKEN" "$API/chats/$PEER"
+	_assert_status 403 "DELETE as guest → 403"
+else
+	echo "    info: guest login unavailable; guest checks skipped"
+fi
+
+# --- 9. Closing is global and actually removes it. ----------------
+_curl -X DELETE -H "Authorization: Bearer $TOKEN" "$API/chats/$PEER"
+# 204, no body: `peer` came from the URL and `ok` restated the status code.
+_assert_status 204 "DELETE /chats/{address} → 204"
+_assert_body_empty 'close sends no body'
+sleep 3
+_curl -H "Authorization: Bearer $TOKEN" "$API/chats"
+GONE=$(printf '%s' "$CURL_BODY" | jq --arg p "$PEER" '.chats | select(.address == $p) | length')
+if  "$GONE" = "0" ; then
+	_pass "closed conversation is gone from /chats"
+else
+	_fail "close removal" "conversation still listed after DELETE"
+fi
+_curl -X DELETE -H "Authorization: Bearer $TOKEN" "$API/chats/$PEER"
+_assert_status 404 "DELETE an already-closed conversation → 404"
+
+# --- Summary. -----------------------------------------------------
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/39-shared-media-refresh.sh Added

@@ -0,0 +1,184 @@
+#!/usr/bin/env bash
+#
+# amuleapi 39-shared-media-refresh — re-extracting media metadata (issue #1079).
+#
+# Wire contract:
+#   POST /shared/media/refresh          → 202 { scope:"all",  queued_file_count }
+#   POST /shared/{hash}/media/refresh   → 202 { scope:"file", queued_file_count }
+#
+# `queued_file_count` counts files ACCEPTED for probing, not files that produced
+# metadata: the scheduler drops anything that is not audio/video by
+# extension, is an incomplete download, or is missing on disk. Nothing has
+# been extracted when the response returns -- the probes run on amuled's
+# media-probe worker.
+#
+# Tolerates an empty share and a daemon that predates the operation
+# (503 ec_unsupported).
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_39_media_refresh_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"; shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 15 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3 actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then _pass "$label"; else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+command -v jq >/dev/null 2>&1 || _die "jq is required."
+curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null \
+	|| _die "amuleapi at $HOST is not reachable."
+
+echo "amuleapi 39-shared-media-refresh smoke @ $HOST"
+
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "login failed"
+
+# --- 1. Whole-share refresh. ---------------------------------------
+_curl -X POST -H "Authorization: Bearer $TOKEN" "$API/shared/media/refresh"
+# 503 covers two different situations and only one of them is a skip:
+# ec_unsupported is an amuled that predates the op, ec_unavailable is no
+# usable EC link at all -- which is a broken rig, not a reason to report
+# success. Branch on error.code, not on the status alone.
+if  "$CURL_STATUS" = "503" ; then
+	EC_CODE=$(printf '%s' "$CURL_BODY" | jq -r '.error.code // empty')
+	if  "$EC_CODE" = "ec_unavailable" ; then
+		_die "no usable EC link to amuled (503 ec_unavailable) -- rig is broken, not a skip"
+	fi
+	# A real assertion, not a _pass: any third error.code has to register as a
+	# failure, which is also what keeps the FAIL_COUNT consult below live.
+	_assert_json_eq '.error.code' ec_unsupported \
+		'503 carries error.code=ec_unsupported (daemon predates the op)'
+	echo "    info: connected amuled does not implement media refresh; rest skipped"
+	echo
+	# Consult FAIL_COUNT: the assertion above can fail, and printing OK over
+	# a failed assertion is how a broken gate looks green.
+	if  "$FAIL_COUNT" -eq 0 ; then
+		echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+		exit 0
+	fi
+	echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+	exit 1
+fi
+_assert_status 202 "POST /shared/media/refresh → 202 Accepted"
+# `scope` and the count stay: it is a real count of what the scheduler
+# accepted, which no later read reports. There is no `ok` field; the 202 carries it.
+_assert_json_eq '. | has("ok")' false 'whole-share refresh has no constant ok field'
+_assert_json_eq '.scope'         all   'whole-share refresh reports scope=all'
+_assert_json_eq '.queued_file_count | type' number 'queued_file_count is numeric'
+
+# --- 2. Method + auth gating. --------------------------------------
+_curl -H "Authorization: Bearer $TOKEN" "$API/shared/media/refresh"
+_assert_status 405 "GET /shared/media/refresh → 405"
+_curl -X POST "$API/shared/media/refresh"
+_assert_status 401 "POST without a token → 401"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"${GUEST_PASS}\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+if  -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null" ; then
+	_curl -X POST -H "Authorization: Bearer $GUEST_TOKEN" "$API/shared/media/refresh"
+	_assert_status 403 "POST as guest → 403 (refresh is admin-only)"
+else
+	echo "    info: guest login unavailable; guest check skipped"
+fi
+
+# --- 3. Unknown hash. ----------------------------------------------
+_curl -X POST -H "Authorization: Bearer $TOKEN" \
+	"$API/shared/00000000000000000000000000000000/media/refresh"
+_assert_status 404 "POST /shared/{unknown}/media/refresh → 404"
+_assert_json_eq '.error.code' not_found 'unknown hash carries error.code=not_found'
+
+# --- 4. Single-file refresh, when there is a file to refresh. ------
+_curl -H "Authorization: Bearer $TOKEN" "$API/shared"
+COUNT=$(printf '%s' "$CURL_BODY" | jq '.shared | length')
+echo "    info: $COUNT files currently shared"
+# Pick an audio/video entry rather than shared0: a share whose first file is
+# a document or an archive answers 400 (not eligible), which is correct daemon
+# behaviour and would fail the phase for the wrong reason.
+#
+# file_type lives on the detail endpoint, not on the list, so this walks the
+# hashes and asks. Capped at 20 to keep the probe bounded on a large share --
+# if the first 20 are all documents the phase skips rather than misreporting.
+HASH=
+for CANDIDATE in $(printf '%s' "$CURL_BODY" | jq -r '.shared0:20.hash'); do
+	_curl -H "Authorization: Bearer $TOKEN" "$API/shared/$CANDIDATE"
+	FTYPE=$(printf '%s' "$CURL_BODY" | jq -r '.file_type // empty')
+	if  "$FTYPE" = "audio"  ||  "$FTYPE" = "video" ; then
+		HASH=$CANDIDATE
+		echo "    info: probing $FTYPE file $HASH"
+		break
+	fi
+done
+if  -n "$HASH" ; then
+	_curl -X POST -H "Authorization: Bearer $TOKEN" \
+		"$API/shared/$HASH/media/refresh"
+	# 409 is a legitimate answer for an incomplete download; both shapes are
+	# contract, so accept either and check the one that came back.
+	if  "$CURL_STATUS" = "409" ; then
+		_assert_json_eq '.error.code' partfile_unsupported \
+			'incomplete download → 409 partfile_unsupported'
+	else
+		_assert_status 202 "POST /shared/{hash}/media/refresh → 202"
+		_assert_json_eq '. | has("ok")' false \
+			'single-file refresh has no constant ok field'
+		_assert_json_eq '.scope' file 'single-file refresh reports scope=file'
+	fi
+
+	UPPER=$(echo "$HASH" | tr 'a-f' 'A-F')
+	_curl -X POST -H "Authorization: Bearer $TOKEN" \
+		"$API/shared/$UPPER/media/refresh"
+	if  "$CURL_STATUS" = "202"  ||  "$CURL_STATUS" = "409" ; then
+		_pass "uppercase hash is accepted (HTTP $CURL_STATUS)"
+	else
+		_fail "uppercase hash" "expected 202 or 409, got $CURL_STATUS"
+	fi
+else
+	echo "    info: no audio/video file shared; single-file checks skipped"
+fi
+
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/40-http-conformance.sh Added

@@ -0,0 +1,1033 @@
+#!/usr/bin/env bash
+#
+# amuleapi 40-http-conformance - the wire-protocol contract, as opposed to
+# any one endpoint's payload. Covers the things a conformant HTTP client (or
+# a plain proxy) relies on and that no per-endpoint smoke was watching:
+#
+#   * HEAD carries no content, on ANY status, and still reports the
+#     Content-Length a GET would return
+#   * the read-side limits answer with a typed envelope instead of closing
+#     the connection without a word
+#   * 405 carries the Allow header RFC 9110 requires
+#   * bodiless replies (204 / 304) omit Content-Type rather than sending an
+#     empty one
+#   * a static asset reports ONE validator, whichever method asked, and
+#     honours a lowercase if-none-match
+#   * the CORS preflight advertises every method the route actually serves
+#   * a conditional GET is never answered 304 for a body that has changed
+#
+# Usage:
+#   amuleapi --config-dir=/tmp/amuleapi-test &
+#   ./40-http-conformance.sh
+#
+# Environment:
+#   HOST=localhost:4713   amuleapi endpoint (default port)
+#   ADMIN_PASS=adminpass  admin password
+#
+# Exits 0 on success, 1 on any failed assertion, 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+# Skips are counted apart from TEST_COUNT, never folded into it: a skipped
+# check is coverage that did not happen, and adding it to the passed tally
+# would report the absence of a check as a check that succeeded.
+SKIP_COUNT=0
+
+BODY_FILE=$(mktemp -t amuleapi_40_body.XXXXXX)
+HDR_FILE=$(mktemp -t amuleapi_40_hdr.XXXXXX)
+BIG_FILE=$(mktemp -t amuleapi_40_big.XXXXXX)
+trap 'rm -f "$BODY_FILE" "$HDR_FILE" "$BIG_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_skip() { SKIP_COUNT=$((SKIP_COUNT+1)); echo "  SKIP  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_assert_eq() {
+	local expected=$1 actual=$2 label=$3
+	if  "$expected" = "$actual" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual"
+	fi
+}
+
+# Header value by name, case-insensitively, from the last -D dump.
+_hdr() {
+	tr -d '\r' < "$HDR_FILE" | awk -v want="$(printf '%s' "$1" | tr 'A-Z' 'a-z')" \
+		'BEGIN{FS=": "} tolower($1)==want {sub(/^^:*: /,""); print; exit}'
+}
+
+# Is a header present at all (regardless of value)?
+_has_hdr() {
+	tr -d '\r' < "$HDR_FILE" | awk -v want="$(printf '%s' "$1" | tr 'A-Z' 'a-z')" \
+		'BEGIN{FS=":"} tolower($1)==want {found=1} END{exit !found}'
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start it first."
+fi
+
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  || _die "admin login failed"
+AUTH=(-H "Authorization: Bearer $TOKEN")
+
+echo "amuleapi 40-http-conformance smoke @ $HOST"
+
+# --- 1. HEAD carries no content, on any status. ----------------------
+#
+# The body strip used to sit inside the 200-only branch, so every HEAD that
+# ended in 4xx or 5xx shipped the JSON error envelope as content. On a
+# keep-alive connection that is not cosmetic: a client that correctly stops
+# reading after the headers leaves those bytes in the socket and starts
+# parsing the next response mid-JSON.
+# Probed on a raw socket, not with curl: curl knows a HEAD response has no
+# body and will not read one, so it reports zero bytes whether or not the
+# server actually sent them -- which is exactly the bug being tested.
+# Prints "<status> <content-length> <bytes-after-header-block>".
+_head_probe() {
+	python3 - "$HOST" "$1" "${2:-}" <<'PYEOF'
+import socket, sys
+hostport, path = sys.argv1, sys.argv2
+extra = sys.argv3 if len(sys.argv) > 3 else ""
+host, _, port = hostport.partition(":")
+try:
+    s = socket.create_connection((host or "localhost", int(port or 4713)), timeout=10)
+    req = "HEAD %s HTTP/1.1\r\nHost: x\r\nConnection: close\r\n" % path
+    if extra:
+        req += extra + "\r\n"
+    req += "\r\n"
+    s.sendall(req.encode())
+    data = b""
+    while True:
+        chunk = s.recv(4096)
+        if not chunk:
+            break
+        data += chunk
+    s.close()
+except Exception:
+    print("000 - -")
+    raise SystemExit(0)
+head, sep, body = data.partition(b"\r\n\r\n")
+status = head.split(b"\r\n")0.split(b" ")1.decode() if head else "000"
+clen = "-"
+for line in head.decode("latin-1").split("\r\n"):
+    if line.lower().startswith("content-length:"):
+        clen = line.split(":", 1)1.strip()
+print("%s %s %d" % (status, clen, len(body)))
+PYEOF
+}
+
+if ! command -v python3 >/dev/null 2>&1; then
+	_skip "HEAD wire-level checks (python3 unavailable)"
+else
+	for probe in "/api/v1/nope:404" "/api/v1/status:401"; do
+		url=${probe%:*}
+		want=${probe##*:}
+		read -r got_status _got_len got_bytes <<<"$(_head_probe "$url")"
+		_assert_eq "$want" "$got_status" "HEAD $url -> $want"
+		_assert_eq "0" "$got_bytes" "HEAD $url puts no content on the wire"
+	done
+
+	# 200 too, and there Content-Length must describe what a GET returns
+	# rather than the zero bytes HEAD writes -- otherwise the header is
+	# useless to a client sizing a fetch.
+	read -r v_status v_len v_bytes <<<"$(_head_probe /api/v1/version)"
+	_assert_eq "200" "$v_status" "HEAD /version -> 200"
+	_assert_eq "0" "$v_bytes" "HEAD /version puts no content on the wire"
+	GET_LEN=$(curl -s --max-time 10 "$API/version" | wc -c | tr -d ' ')
+	_assert_eq "$GET_LEN" "$v_len" "HEAD /version Content-Length matches the GET body"
+fi
+
+# The SSE endpoint is the one unbounded body on the surface, and it does
+# not go through the normal response path: the streaming dispatch writes
+# its own head and then pushes frames until the peer leaves. A HEAD there
+# asks what a GET would answer with, so it must be answered and closed
+# rather than streamed, or the "no content on any status" guarantee has a
+# hole in exactly the worst place.
+#
+# It is answered BELOW the auth gate, so it is not a way around it. An
+# earlier cut short-circuited above the gate and handed an unauthenticated
+# HEAD a 200 where GET answers 401, skipping the auth-failure rate bucket
+# too -- so the unauthenticated case is asserted first, and deliberately.
+if command -v python3 >/dev/null 2>&1; then
+	read -r anon_status _anon_len _anon_bytes <<<"$(_head_probe /api/v1/events)"
+	_assert_eq "401" "$anon_status" "HEAD /events without credentials -> 401 (no auth bypass)"
+	read -r ev_status _ev_len ev_bytes <<<"$(_head_probe /api/v1/events "Authorization: Bearer $TOKEN")"
+	_assert_eq "200" "$ev_status" "HEAD /events with credentials -> 200"
+	_assert_eq "0" "$ev_bytes" "HEAD /events does not stream content"
+else
+	_skip "HEAD /events check (python3 unavailable)"
+fi
+
+# The same gate, cross-checked through curl so a regression shows up as a
+# plain status mismatch even if the socket probe is skipped.
+_assert_eq "401" "$(curl -s -o /dev/null -w '%{http_code}' --max-time 5 "$API/events")" \
+	"GET /events without credentials -> 401"
+
+# ---------------------------------------------------------------------------
+# Query parameters: unparseable and out-of-range are both 400, never a default
+# ---------------------------------------------------------------------------
+# Each parameter used to be parsed by hand and each site picked its own rule, so
+# the same typo was a hard error on one parameter and a silent behaviour change
+# on its neighbour -- `interval_seconds=abc` was a 400 while `width=abc` was a 200 that
+# quietly meant "everything", on the same endpoint. These assert the wiring: the
+# unit tests pin ParseBoundedUint/ParseBoolValue, but only a live request shows
+# that a handler routes through them.
+_qp() {
+	# $1 = query, $2 = expected status, $3 = label
+	_assert_eq "$2" "$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 \
+		"${AUTH@}" "$API/$1")" "$3"
+}
+
+# Enumerations: one vocabulary, and anything outside it is answerable.
+_qp "downloads?status=active"    200 "status=active -> 200"
+_qp "downloads?status=all"       200 "status=all -> 200"
+_qp "downloads?status=completed" 200 "status=completed -> 200"
+_qp "downloads?status=maybe"     400 "status=maybe -> 400, not a silent default"
+
+# The boolean `include_completed` is refused, not ignored: a caller sending it
+# is told so instead of silently getting the default slice.
+_qp "downloads?include_completed=1" 400 "include_completed=1 -> 400 (not a valid parameter; use status=)"
+
+# Counts: garbage and out-of-range are the same answer.
+_qp "downloads?limit=abc"   400 "limit=abc -> 400"
+_qp "downloads?limit=1000000001" 400 "limit above the 1e9 ceiling -> 400 (never a silent clamp)"
+_qp "downloads?limit=500"   200 "limit=500 -> 200 (the cap itself is valid)"
+_qp "downloads?limit="      400 "limit= (empty) -> 400, not an omission"
+
+# Two numeric parameters on one endpoint used to disagree with each other.
+_qp "stats/graphs/download_speed?interval_seconds=abc" 400 "interval_seconds=abc -> 400"
+_qp "stats/graphs/download_speed?width=abc"    400 "width=abc -> 400"
+_qp "stats/graphs/download_speed?width=99999"  400 "width=99999 -> 400 (out of range)"
+_qp "stats/graphs/download_speed?interval_seconds=0"   400 "interval_seconds=0 -> 400 (below the documented minimum)"
+
+# The log tail clamped silently too.
+_qp "logs/amule?tail=abc"    400 "tail=abc -> 400"
+_qp "logs/amule?tail=999999" 400 "tail=999999 -> 400 (out of range)"
+
+# ---------------------------------------------------------------------------
+# Trailing slash: `/x/` names the same resource as `/x`
+# ---------------------------------------------------------------------------
+# The two spellings used to disagree by route kind, not by meaning. A literal
+# route is compared with `==` so `/status/` simply missed and answered "no such
+# endpoint"; a capture route matched with the capture bound to the empty string,
+# so `/clients/` reached the handler and was rejected there -- as a 400, for a
+# URL that names no resource, while an empty `{hash}` was a 404 for an equally
+# meaningless one.
+#
+# These assert the wiring, which the unit tests for StripTrailingSlash and the
+# empty-capture guard cannot: that the dispatcher actually applies the rule.
+for p in status version downloads clients shared servers friends; do
+	bare=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 "${AUTH@}" "$API/$p")
+	slash=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 "${AUTH@}" "$API/$p/")
+	_assert_eq "$bare" "$slash" "/$p and /$p/ answer alike ($bare)"
+done
+
+# The static fallthrough is deliberately not normalised -- there a trailing
+# slash is a directory rather than a spelling -- so the rule must not have
+# leaked outside the API prefix.
+# Needs a served static root; run-all.sh wires StaticRoot for this phase. If
+# the frontend is not being served (an install without it, or a hand-run
+# against a bare config) there is no 200 to assert and the trailing-slash
+# rule cannot be probed this way -- skip loudly rather than report a
+# conformance failure that is really a missing fixture.
+STATIC_ROOT_CODE=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 "$HOST/")
+if  "$STATIC_ROOT_CODE" = "404" ; then
+	_skip "static root is not served (got 404); cannot probe the trailing-slash rule there"
+else
+	_assert_eq "200" "$STATIC_ROOT_CODE" "the static root still answers 200"
+fi
+
+# /events reaches the dispatcher only on a method the streaming resolver
+# declined, and with no route there it used to fall through to the catch-all
+# 404 -- reporting that the endpoint does not exist, on the one resource a
+# client is most likely to probe, and escaping the Allow sweep entirely.
+curl -s -o "$BODY_FILE" -D "$HDR_FILE" --max-time 10 "${AUTH@}" \
+	-X POST "$API/events" >/dev/null
+_assert_eq "405" "$(awk 'NR==1{print $2}' "$HDR_FILE" | tr -d '\r')" \
+	"POST /events -> 405 (not 404)"
+EV_ALLOW=$(_hdr Allow)
+case "$EV_ALLOW" in
+*GET*HEAD*|*HEAD*GET*) _pass "405 on /events carries Allow ($EV_ALLOW)" ;;
+*) _fail "405 on /events carries Allow" "got $EV_ALLOW" ;;
+esac
+
+# HEAD and GET on the stream must agree on the headers they share. They are
+# produced by two different writers -- the regular response path and the SSE
+# head path -- which each carried their own copy of the header-merge logic,
+# and two rounds of fixes landed in one copy but not the other: the stream
+# kept advertising keep-alive on a socket the server always closes, and kept
+# overwriting Vary instead of appending to it. Comparing the two is what
+# notices a fix that only reached one writer.
+if command -v python3 >/dev/null 2>&1; then
+	# $2 selects the encoding. The identity path is a separate branch in
+	# the SSE head writer, and pinning both methods to gzip is why the
+	# first cut of this probe could not see a Vary token that was emitted
+	# only when the stream was actually compressed.
+	_stream_hdr() {
+		python3 - "$HOST" "$1" "$TOKEN" "${2:-gzip}" <<'PYEOF'
+import socket, sys
+hostport, method, tok = sys.argv1, sys.argv2, sys.argv3
+enc = sys.argv4 if len(sys.argv) > 4 else "gzip"
+host, _, port = hostport.partition(":")
+try:
+    s = socket.create_connection((host or "localhost", int(port or 4713)), timeout=8)
+    enc_line = "" if enc == "identity" else ("Accept-Encoding: %s\r\n" % enc)
+    s.sendall(("%s /api/v1/events HTTP/1.1\r\nHost: x\r\n%s"
+               "Authorization: Bearer %s\r\n\r\n" % (method, enc_line, tok)).encode())
+    data = b""
+    while b"\r\n\r\n" not in data:
+        chunk = s.recv(4096)
+        if not chunk:
+            break
+        data += chunk
+    s.close()
+except Exception:
+    print("")
+    raise SystemExit(0)
+head = data.partition(b"\r\n\r\n")0.decode("latin-1")
+out = 
+for line in head.split("\r\n"):
+    low = line.lower()
+    # Deliberately wide. Narrowing this to connection/vary is why three
+    # consecutive rounds of /events header findings were invisible to the
+    # probe that exists to pin them: the divergence was in Content-Encoding
+    # and Content-Type, which the filter dropped.
+    if low.split(":")0 in (
+            "connection", "vary", "content-encoding", "content-type",
+            "cache-control", "x-accel-buffering", "transfer-encoding"):
+        out.append(low.replace(" ", ""))
+print("|".join(sorted(out)))
+PYEOF
+	}
+	SSE_HEAD=$(_stream_hdr HEAD gzip)
+	SSE_GET=$(_stream_hdr GET gzip)
+	# ...and again with no encoding requested, which takes the other branch.
+	SSE_HEAD_ID=$(_stream_hdr HEAD identity)
+	SSE_GET_ID=$(_stream_hdr GET identity)
+	if  -z "$SSE_HEAD"  ||  -z "$SSE_GET" ; then
+		_skip "SSE HEAD/GET header agreement (probe did not complete)"
+	else
+		_assert_eq "$SSE_GET" "$SSE_HEAD" \
+			"HEAD and GET on /events agree on Connection and Vary (compressed)"
+		if  -z "$SSE_HEAD_ID"  ||  -z "$SSE_GET_ID" ; then
+			_skip "SSE identity-path header agreement (probe did not complete)"
+		else
+			_assert_eq "$SSE_GET_ID" "$SSE_HEAD_ID" \
+				"HEAD and GET on /events agree on Connection and Vary (uncompressed)"
+			case "$SSE_GET_ID" in
+			*vary:*accept-encoding*) _pass "an uncompressed stream still varies on Accept-Encoding" ;;
+			*) _fail "an uncompressed stream still varies on Accept-Encoding" "got $SSE_GET_ID" ;;
+			esac
+		fi
+		case "$SSE_GET" in
+		*connection:close*) _pass "the event stream advertises Connection: close" ;;
+		*) _fail "the event stream advertises Connection: close" "got $SSE_GET" ;;
+		esac
+	fi
+else
+	_skip "SSE header agreement check (python3 unavailable)"
+fi
+
+# The same comparison under an encoding preference. HEAD has to describe what
+# the equivalent GET would return, which with gzip means the SAME
+# Content-Encoding and the SAME Content-Length -- diverging binds one strong
+# ETag to two codings and lets every probe invalidate a cached gzip response.
+# The Content-Length check above sends no Accept-Encoding, so it cannot see
+# this; skipping compression for HEAD once passed the whole suite.
+#
+# Probed against /preferences, NOT /downloads. The transport only compresses
+# a body over kGzipMinBodyBytes, and an empty daemon's /downloads is a ~46
+# byte envelope -- under the floor, never compressed, so every coding
+# assertion below would fail on a bring-up run for a reason that has nothing
+# to do with codings. /preferences is a fixed settings schema, kilobytes
+# regardless of what the daemon is doing.
+CODING_TARGET="$API/preferences"
+# ...and assert that premise instead of trusting it: if this body ever drops
+# under the floor the block stops testing what it claims to, and an
+# un-suffixed ETag would read as "the coding marker is missing".
+CODING_BYTES=$(curl -s --max-time 10 -H "Accept-Encoding: identity" \
+	"${AUTH@}" "$CODING_TARGET" | wc -c | tr -d ' ')
+# -ge, not -gt: WillCompressBody() compresses at `body_size >= 256`, so a
+# body of exactly 256 bytes IS compressed and a -gt guard would call it
+# unusable. A guard that disagrees with the code it guards is worse than no
+# guard, because it is believed.
+if  "${CODING_BYTES:-0}" -ge 256 ; then
+	_pass "the coding probe's body is over the compression floor ($CODING_BYTES bytes)"
+else
+	_fail "coding probe target is compressible" \
+		"/preferences is $CODING_BYTES bytes, under the 256-byte floor"
+fi
+
+_enc_triplet() {
+	curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 "$@" \
+		-H "Accept-Encoding: gzip" "${AUTH@}" "$CODING_TARGET" >/dev/null
+	printf '%s|%s|%s' "$(_hdr Content-Encoding)" "$(_hdr Content-Length)" "$(_hdr ETag)"
+}
+GZ_HEAD=$(_enc_triplet --head)
+GZ_GET=$(_enc_triplet)
+_assert_eq "$GZ_GET" "$GZ_HEAD" \
+	"HEAD and GET agree on Content-Encoding, Content-Length and ETag under gzip"
+
+# The validator must NAME the representation, not just accompany it. A strong
+# ETag identifies one representation, and the hash is taken before
+# compression, so without a coding marker the gzip and identity forms of a
+# body share a validator -- and a cache holding one can revalidate it for a
+# client that cannot accept it. Asserted in both directions so deleting the
+# marker fails rather than silently passing.
+GZ_ETAG=$(curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 \
+	-H "Accept-Encoding: gzip" "${AUTH@}" "$CODING_TARGET" >/dev/null; _hdr ETag)
+ID_ETAG=$(curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 \
+	-H "Accept-Encoding: identity" "${AUTH@}" "$CODING_TARGET" >/dev/null; _hdr ETag)
+case "$GZ_ETAG" in
+*-gzip\"*) _pass "the gzip representation's ETag names its coding ($GZ_ETAG)" ;;
+*) _fail "gzip ETag names its coding" "got $GZ_ETAG" ;;
+esac
+case "$ID_ETAG" in
+*-gzip\"*) _fail "identity ETag does not name a coding" "got $ID_ETAG" ;;
+*) _pass "the identity representation's ETag carries no coding marker" ;;
+esac
+if  "$GZ_ETAG" = "$ID_ETAG" ; then
+	_fail "the two codings have distinct validators" "both are $GZ_ETAG"
+else
+	_pass "the two codings have distinct validators"
+fi
+
+# ...and a 304 must echo the SAME validator the equivalent 200 sent. A 304
+# has no body for the transport to compress, so the coding has to be decided
+# before the body is dropped; when it was not, a client that cached the gzip
+# form was handed the identity ETag back and could never match its stored
+# response again.
+for pair in "gzip:$GZ_ETAG" "identity:$ID_ETAG"; do
+	enc=${pair%%:*}
+	want=${pair#*:}
+	 -z "$want"  && continue
+	got=$(curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 \
+		-H "Accept-Encoding: $enc" -H "If-None-Match: $want" \
+		"${AUTH@}" "$CODING_TARGET" >/dev/null; _hdr ETag)
+	code=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 \
+		-H "Accept-Encoding: $enc" -H "If-None-Match: $want" \
+		"${AUTH@}" "$CODING_TARGET")
+	_assert_eq "304" "$code" "a $enc client revalidating its own validator gets 304"
+	_assert_eq "$want" "$got" "the $enc 304 echoes the validator the 200 sent"
+done
+
+# --- 2. 405 carries Allow. -------------------------------------------
+#
+# RFC 9110 §15.5.6 makes the header mandatory. The accepted methods were
+# only ever in the human-readable message, which generic tooling and
+# capability discovery do not read.
+curl -s -o "$BODY_FILE" -D "$HDR_FILE" --max-time 10 \
+	"${AUTH@}" -X DELETE "$API/status" >/dev/null
+_assert_eq "405" "$(awk 'NR==1{print $2}' "$HDR_FILE" | tr -d '\r')" \
+	"DELETE /status -> 405"
+ALLOW=$(_hdr Allow)
+if  -z "$ALLOW" ; then
+	_fail "405 carries an Allow header" "header absent on DELETE /status"
+else
+	_pass "405 carries an Allow header (Allow: $ALLOW)"
+	# HEAD is served wherever GET is, and the header is the machine-readable
+	# list, so it must say so even though the prose message says "only GET".
+	case "$ALLOW" in
+	*GET*) _pass "Allow on /status names GET" ;;
+	*) _fail "Allow on /status names GET" "got $ALLOW" ;;
+	esac
+	case "$ALLOW" in
+	*HEAD*) _pass "Allow on /status names HEAD" ;;
+	*) _fail "Allow on /status names HEAD" "got $ALLOW" ;;
+	esac
+fi
+
+# A route with a richer verb set reports all of it.
+curl -s -o "$BODY_FILE" -D "$HDR_FILE" --max-time 10 \
+	"${AUTH@}" -X PATCH "$API/share_directories" >/dev/null
+ALLOW_DIRS=$(_hdr Allow)
+for m in GET HEAD POST PUT DELETE; do
+	case "$ALLOW_DIRS" in
+	*"$m"*) _pass "Allow on /share_directories names $m" ;;
+	*) _fail "Allow on /share_directories names $m" "got $ALLOW_DIRS" ;;
+	esac
+done
+
+# --- 3. Bodiless replies omit Content-Type. --------------------------
+#
+# The handlers clear it for 204 and the ETag layer clears it for 304, but
+# the writer used to emit the header anyway with an empty value. A
+# Content-Type whose value is not a media type is malformed.
+ETAG=$(curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 "${AUTH@}" \
+	"$API/version" >/dev/null; _hdr ETag)
+if  -z "$ETAG" ; then
+	_skip "304 Content-Type check (no ETag on /version)"
+else
+	curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 "${AUTH@}" \
+		-H "If-None-Match: $ETAG" "$API/version" >/dev/null
+	_assert_eq "304" "$(awk 'NR==1{print $2}' "$HDR_FILE" | tr -d '\r')" \
+		"If-None-Match on the current ETag -> 304"
+	if _has_hdr Content-Type; then
+		_fail "304 omits Content-Type" "header present: $(_hdr Content-Type)"
+	else
+		_pass "304 omits Content-Type"
+	fi
+	# The validator itself must survive: clients re-stamp their cached copy
+	# from it (RFC 7232 §4.1).
+	if  -n "$(_hdr ETag)" ; then
+		_pass "304 still carries the ETag"
+	else
+		_fail "304 still carries the ETag" "header absent"
+	fi
+fi
+
+# The CORS preflight answers 204; same rule.
+curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 -X OPTIONS \
+	-H "Origin: http://example.invalid" \
+	-H "Access-Control-Request-Method: GET" \
+	"$API/version" >/dev/null
+PRE_STATUS=$(awk 'NR==1{print $2}' "$HDR_FILE" | tr -d '\r')
+if  "$PRE_STATUS" = "204" ; then
+	if _has_hdr Content-Type; then
+		_fail "204 preflight omits Content-Type" "header present: $(_hdr Content-Type)"
+	else
+		_pass "204 preflight omits Content-Type"
+	fi
+else
+	_skip "204 preflight Content-Type check (CORS disabled; preflight answered $PRE_STATUS)"
+fi
+
+# --- 4. The CORS preflight advertises every method the route serves. --
+#
+# PUT /api/v1/share_directories is a real route (the replace-the-whole-list
+# form). It was missing from the advertised list, so a browser doing a
+# cross-origin PUT there was told the method is not allowed and blocked the
+# request before it was ever sent -- reachable from curl, unreachable from a
+# page.
+curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 -X OPTIONS \
+	-H "Origin: http://example.invalid" \
+	-H "Access-Control-Request-Method: PUT" \
+	"$API/share_directories" >/dev/null
+ACAM=$(_hdr Access-Control-Allow-Methods)
+if  -z "$ACAM" ; then
+	_skip "preflight method list (CORS disabled; no Access-Control-Allow-Methods)"
+else
+	case "$ACAM" in
+	*PUT*) _pass "preflight advertises PUT (Access-Control-Allow-Methods: $ACAM)" ;;
+	*) _fail "preflight advertises PUT" "got $ACAM" ;;
+	esac
+fi
+
+# --- 5. Read-side limits answer, they do not just hang up. -----------
+#
+# Every other rejection on this surface is a typed JSON envelope. These
+# three used to close the connection with nothing written, so a caller could
+# not tell "too large" from "daemon crashed" or "firewall ate it".
+# Guarded like the other python3 probes: a runner without it should skip
+# these checks, not abort the run at exit 2 and silently drop everything
+# that follows.
+BIG_READY=0
+if ! command -v python3 >/dev/null 2>&1; then
+	_skip "413 check (python3 unavailable)"
+elif python3 -c "import sys; sys.stdout.write('{\"password\":\"' + 'a'*2200000 + '\"}')" \
+	> "$BIG_FILE" 2>/dev/null &&  -s "$BIG_FILE" ; then
+	BIG_READY=1
+else
+	# Skip AND stay out of the probe below: running it against a
+	# truncated file turns one skip into a spurious failure. BIG_FILE is
+	# deliberately left set so the EXIT trap still removes it.
+	_skip "413 check (could not build the oversize body)"
+fi
+if  "$BIG_READY" -eq 1 ; then
+BIG_STATUS=$(curl -s -o "$BODY_FILE" -w '%{http_code}' --max-time 20 \
+	-X POST -H "Content-Type: application/json" \
+	--data-binary @"$BIG_FILE" "$API/auth/login" 2>/dev/null || echo "000")
+_assert_eq "413" "$BIG_STATUS" "a 2 MiB body -> 413 (not a silent close)"
+if  "$BIG_STATUS" = "413" ; then
+	_assert_eq "payload_too_large" \
+		"$(jq -r '.error.code' < "$BODY_FILE" 2>/dev/null)" \
+		"413 carries the payload_too_large code"
+fi
+fi
+
+# Oversized headers -> 431, and a HEAD rejected there ships no content
+# either. Both were untested, which is how the 431 branch stayed dead: the
+# read buffer was smaller than the parser's header_limit, so an oversized
+# header overflowed the buffer before the limit could fire and the
+# connection closed with nothing written. A legal header near the cap must
+# still succeed, which is the half that catches an over-tight buffer.
+if command -v python3 >/dev/null 2>&1; then
+	_hdr_probe() {
+		python3 - "$HOST" "$1" "$2" <<'PYEOF'
+import socket, sys
+hostport, method, padlen = sys.argv1, sys.argv2, int(sys.argv3)
+host, _, port = hostport.partition(":")
+try:
+    s = socket.create_connection((host or "localhost", int(port or 4713)), timeout=15)
+    pad = ("X-Pad: " + "a" * padlen + "\r\n") if padlen else ""
+    s.sendall(("%s /api/v1/version HTTP/1.1\r\nHost: x\r\n%sConnection: close\r\n\r\n"
+               % (method, pad)).encode())
+    data = b""
+    while True:
+        chunk = s.recv(4096)
+        if not chunk:
+            break
+        data += chunk
+    s.close()
+except Exception:
+    print("000 0")
+    raise SystemExit(0)
+head, _, body = data.partition(b"\r\n\r\n")
+status = head.split(b"\r\n")0.split(b" ")1.decode() if head else "000"
+print("%s %d" % (status, len(body)))
+PYEOF
+	}
+	read -r big_status big_bytes <<<"$(_hdr_probe GET 20000)"
+	_assert_eq "431" "$big_status" "oversized request headers -> 431 (not a silent close)"
+	read -r bigh_status bigh_bytes <<<"$(_hdr_probe HEAD 20000)"
+	_assert_eq "431" "$bigh_status" "HEAD with oversized headers -> 431"
+	_assert_eq "0" "$bigh_bytes" "HEAD with oversized headers ships no content"
+	read -r ok_status _ok_bytes <<<"$(_hdr_probe GET 12000)"
+	_assert_eq "200" "$ok_status" "a legal ~12 KiB header block is still accepted"
+else
+	_skip "header-limit checks (python3 unavailable)"
+fi
+
+# Headers that never terminate: the 10 s read timeout should answer 408.
+# Hand-rolled because curl will not send a deliberately incomplete request.
+TIMEOUT_OUT=$(python3 - "$HOST" <<'PYEOF' 2>/dev/null || echo "PYFAIL"
+import socket, sys, time
+host, _, port = sys.argv1.partition(":")
+s = socket.create_connection((host or "localhost", int(port or 4713)), timeout=30)
+s.sendall(b"GET /api/v1/version HTTP/1.1\r\nHost: x\r\nX-Dangling: ")
+s.settimeout(25)
+buf = b""
+try:
+    while b"\r\n" not in buf:
+        chunk = s.recv(4096)
+        if not chunk:
+            break
+        buf += chunk
+except socket.timeout:
+    pass
+s.close()
+sys.stdout.write(buf.decode("latin-1").split("\r\n")0)
+PYEOF
+)
+case "$TIMEOUT_OUT" in
+*408*)   _pass "an unterminated request -> 408 (not a silent close)" ;;
+PYFAIL)  _skip "408 read-timeout check (python3 socket probe unavailable)" ;;
+"")      _fail "an unterminated request -> 408" "connection closed with no response" ;;
+*)       _fail "an unterminated request -> 408" "got status line $TIMEOUT_OUT" ;;
+esac
+
+# ...and a HEAD that times out carries no content either. The probe above
+# only ever used GET, so a HEAD shipping the 408 envelope as content -- the
+# same violation fixed for 413 and 431 -- had nothing watching it.
+if command -v python3 >/dev/null 2>&1; then
+	HEAD_408=$(python3 - "$HOST" <<'PYEOF' 2>/dev/null || echo "PYFAIL"
+import socket, sys
+host, _, port = sys.argv1.partition(":")
+s = socket.create_connection((host or "localhost", int(port or 4713)), timeout=30)
+s.sendall(b"HEAD /api/v1/version HTTP/1.1\r\nHost: x\r\nX-Drip: ")
+s.settimeout(25)
+data = b""
+try:
+    while True:
+        chunk = s.recv(4096)
+        if not chunk:
+            break
+        data += chunk
+except socket.timeout:
+    pass
+s.close()
+head, _, body = data.partition(b"\r\n\r\n")
+status = head.split(b"\r\n")0.split(b" ")1.decode() if head else "000"
+print("%s %d" % (status, len(body)))
+PYEOF
+	)
+	case "$HEAD_408" in
+	PYFAIL) _skip "HEAD 408 body check (python3 probe unavailable)" ;;
+	"408 0") _pass "HEAD on an unterminated request -> 408 with no content" ;;
+	*) _fail "HEAD on an unterminated request -> 408 with no content" "got $HEAD_408" ;;
+	esac
+else
+	_skip "HEAD 408 body check (python3 unavailable)"
+fi
+
+# --- 6. A static asset has ONE validator. ----------------------------
+#
+# The handler computed an mtime+size ETag and the outer layer stamped an
+# MD5-of-body over the top -- but only when the body was non-empty, which
+# was true on GET and false on HEAD. So the two methods handed out
+# different validators for the same URL, and touching the file changed one
+# while the other stayed put.
+ROOT_STATUS=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 "$HOST/index.html")
+if  "$ROOT_STATUS" != "200" ; then
+	_skip "static-asset validator checks (no static frontend served; /index.html -> $ROOT_STATUS)"
+else
+	curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 -I "$HOST/index.html" >/dev/null
+	HEAD_ETAG=$(_hdr ETag)
+	curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 "$HOST/index.html" >/dev/null
+	GET_ETAG=$(_hdr ETag)
+	if  -z "$HEAD_ETAG"  ||  -z "$GET_ETAG" ; then
+		_fail "static asset reports an ETag on both methods" \
+			"HEAD=$HEAD_ETAG GET=$GET_ETAG"
+	else
+		_assert_eq "$GET_ETAG" "$HEAD_ETAG" \
+			"HEAD and GET report the same validator for /index.html"
+	fi
+	# HTTP header names are case-insensitive. The static path used a
+	# literal map lookup, so a lowercase if-none-match -- what an
+	# HTTP/2-shaped client library produces -- silently lost conditional
+	# GET and re-downloaded the asset every time.
+	if  -n "$GET_ETAG" ; then
+		LOWER=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 \
+			-H "if-none-match: $GET_ETAG" "$HOST/index.html")
+		_assert_eq "304" "$LOWER" "lowercase if-none-match on a static asset -> 304"
+		UPPER=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 \
+			-H "If-None-Match: $GET_ETAG" "$HOST/index.html")
+		_assert_eq "304" "$UPPER" "canonical If-None-Match on a static asset -> 304"
+		# ...and that 304 must not advertise a media type it is not
+		# carrying. Response::content_type defaults to application/json,
+		# so an unset one made a 304 for index.html claim to be JSON.
+		curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 \
+			-H "If-None-Match: $GET_ETAG" "$HOST/index.html" >/dev/null
+		if _has_hdr Content-Type; then
+			_fail "static 304 omits Content-Type" \
+				"got $(_hdr Content-Type) on a 304 for index.html"
+		else
+			_pass "static 304 omits Content-Type"
+		fi
+		# The full If-None-Match grammar, not just an exact match. A
+		# reverse proxy that gzips in front of us rewrites the
+		# validator to the weak form, and `*` plus comma-separated
+		# lists are both legal. The outer layer used to supply this
+		# grammar for static assets; now that it stands aside whenever
+		# a handler set its own ETag, this path has to speak it itself.
+		# A static asset sets its own ETag, so the dispatcher stands
+		# aside and the TRANSPORT is what marks the coding on it. That
+		# is a different code path from the API routes above, and
+		# deleting the transport's stamp leaves those green -- this is
+		# the assertion that notices.
+		SGZ=$(curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 \
+			-H "Accept-Encoding: gzip" "$HOST/index.html" >/dev/null; _hdr ETag)
+		SGZ_ENC=$(_hdr Content-Encoding)
+		if  "$SGZ_ENC" != "gzip" ; then
+			# NOT a skip. index.html is text/html and comfortably
+			# over the compression floor, so an uncompressed answer
+			# here means the gzip path stopped working -- and a skip
+			# would report that as a pass.
+			_fail "a static HTML asset is served gzipped when asked" \
+				"Content-Encoding was $SGZ_ENC"
+		else
+			case "$SGZ" in
+			*-gzip\"*) _pass "a gzipped static asset's ETag names its coding ($SGZ)" ;;
+			*) _fail "gzipped static asset ETag names its coding" "got $SGZ" ;;
+			esac
+			SGZ_304=$(curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 \
+				-H "Accept-Encoding: gzip" -H "If-None-Match: $SGZ" \
+				"$HOST/index.html" >/dev/null; _hdr ETag)
+			_assert_eq "$SGZ" "$SGZ_304" \
+				"a gzipped static asset's 304 echoes the validator its 200 sent"
+		fi
+
+		STAR=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 \
+			-H "If-None-Match: *" "$HOST/index.html")
+		_assert_eq "304" "$STAR" "If-None-Match: * on a static asset -> 304"
+		WEAK=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 \
+			-H "If-None-Match: W/$GET_ETAG" "$HOST/index.html")
+		_assert_eq "304" "$WEAK" "a weak W/ validator on a static asset -> 304"
+		LIST=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 \
+			-H "If-None-Match: \"nomatch\", $GET_ETAG" "$HOST/index.html")
+		_assert_eq "304" "$LIST" "an If-None-Match list hitting on the 2nd entry -> 304"
+	fi
+fi
+
+# --- 7. A changed body never revalidates as unchanged. ---------------
+#
+# /stats/* is not memoized at all -- eligibility is opt-in and covers only
+# /downloads and /shared -- so this asserts the general contract rather than
+# the memo: a validator must change whenever the body does. It caught the
+# original defect back when the memo did cover this route, and it still
+# guards the property that mattered. Historically the key was a timestamp,
+# which counts
+# whole seconds. The stats graphs keep their own 1 s TTL cache, refetched
+# out of phase with the refresher tick, so their body can change while the
+# key does not -- and the memoized validator was then served for a body it
+# was not computed from. RFC 9110 §8.8.1 requires the entity-tag to change
+# whenever the representation does; any conformant cache is otherwise
+# entitled to keep serving the stale copy.
+GRAPH="$API/stats/graphs/download_speed?width=3"
+PREV_BODY=""; PREV_ETAG=""; VIOLATION=""; OBSERVED=0
+for _ in $(seq 1 40); do
+	curl -s -o "$BODY_FILE" -D "$HDR_FILE" --max-time 10 "${AUTH@}" "$GRAPH" >/dev/null
+	NOW_ETAG=$(_hdr ETag)
+	NOW_BODY=$(cat "$BODY_FILE")
+	 -z "$NOW_ETAG"  && break
+	if  -n "$PREV_ETAG"  &&  "$NOW_BODY" != "$PREV_BODY" ; then
+		OBSERVED=$((OBSERVED+1))
+		if  "$NOW_ETAG" = "$PREV_ETAG" ; then
+			VIOLATION="body changed while ETag stayed $NOW_ETAG"
+			break
+		fi
+	fi
+	PREV_BODY=$NOW_BODY; PREV_ETAG=$NOW_ETAG
+	sleep 0.4
+done
+if  -z "$PREV_ETAG" ; then
+	_skip "stats-graph validator check (no ETag on $GRAPH)"
+elif  -n "$VIOLATION" ; then
+	_fail "a changed stats-graph body always changes the ETag" "$VIOLATION"
+elif  "$OBSERVED" -eq 0 ; then
+	_skip "stats-graph validator check (body never changed in the sample window)"
+else
+	_pass "a changed stats-graph body always changes the ETag ($OBSERVED change(s) seen)"
+fi
+
+# And the paired direction: a conditional GET must not be told 304 for a
+# body that has moved on since the validator was minted.
+if  -n "$PREV_ETAG" ; then
+	curl -s -o "$BODY_FILE" --max-time 10 "${AUTH@}" "$GRAPH" >/dev/null
+	FRESH=$(cat "$BODY_FILE")
+	COND=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 "${AUTH@}" \
+		-H "If-None-Match: $PREV_ETAG" "$GRAPH")
+	if  "$COND" = "304"  &&  "$FRESH" != "$PREV_BODY" ; then
+		_fail "no 304 for a body that changed" \
+			"served 304 against ETag $PREV_ETAG although the body differs"
+	else
+		_pass "conditional GET on a stats graph does not claim a stale copy is current"
+	fi
+fi
+
+# --- 7b. A per-principal document never shares a validator. ----------
+#
+# /auth/session's body depends on who is asking, so it is not memo-eligible:
+# the key carries no principal. Back when eligibility was an exclusion list
+# and this route was not on it, an admin and a guest
+# hitting this inside one snapshot second got the SAME validator for two
+# different documents, and the second was answered 304 against the first's.
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"${GUEST_PASS:-guestpass}\"}" \
+	"$API/auth/login?include_token=true" 2>/dev/null | jq -r .token)
+if  -z "$GUEST_TOKEN"  ||  "$GUEST_TOKEN" = "null" ; then
+	_skip "per-principal ETag check (no guest password configured)"
+else
+	curl -s -o "$BODY_FILE" -D "$HDR_FILE" --max-time 10 "${AUTH@}" \
+		"$API/auth/session" >/dev/null
+	ADMIN_SESS_ETAG=$(_hdr ETag)
+	ADMIN_ROLE=$(jq -r '.role // ""' < "$BODY_FILE" 2>/dev/null)
+	curl -s -o "$BODY_FILE" -D "$HDR_FILE" --max-time 10 \
+		-H "Authorization: Bearer $GUEST_TOKEN" \
+		"$API/auth/session" >/dev/null
+	GUEST_SESS_ETAG=$(_hdr ETag)
+	GUEST_ROLE=$(jq -r '.role // ""' < "$BODY_FILE" 2>/dev/null)
+	if  "$ADMIN_ROLE" = "$GUEST_ROLE" ; then
+		_skip "per-principal ETag check (both logins resolved to '$ADMIN_ROLE')"
+	elif  "$ADMIN_SESS_ETAG" = "$GUEST_SESS_ETAG" ; then
+		_fail "two principals never share a session validator" \
+			"admin ($ADMIN_ROLE) and guest ($GUEST_ROLE) both got $ADMIN_SESS_ETAG"
+	else
+		_pass "two principals get different /auth/session validators"
+		# ...and the guest is not 304'd against the admin's.
+		CROSS=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 \
+			-H "Authorization: Bearer $GUEST_TOKEN" \
+			-H "If-None-Match: $ADMIN_SESS_ETAG" "$API/auth/session")
+		_assert_eq "200" "$CROSS" \
+			"a guest is not served 304 against an admin's session validator"
+	fi
+fi
+
+# --- 7c. A mutation always changes the validator. --------------------
+#
+# The memo used to be keyed on (target, snapshot_at), and snapshot_at is
+# stamped only by the background refresher loop -- never by the inline
+# refresh a mutating handler runs. So a PATCH changed the body while the key
+# stood still, and the next conditional GET was answered 304 for content
+# that had just changed. Measured at 19 of 20 attempts before the key moved
+# to a per-refresh revision.
+PREFS="$API/preferences"
+curl -s -o "$BODY_FILE" -D "$HDR_FILE" --max-time 10 "${AUTH@}" "$PREFS" >/dev/null
+PREF_ETAG=$(_hdr ETag)
+PREF_BEFORE=$(cat "$BODY_FILE")
+ORIG_UP=$(printf '%s' "$PREF_BEFORE" | jq -r '.connection.max_upload_kibibytes_per_second // 0' 2>/dev/null)
+if  -z "$PREF_ETAG"  ||  -z "$ORIG_UP" ; then
+	_skip "mutation-changes-validator check (no ETag or no readable preferences)"
+else
+	NEW_UP=$((ORIG_UP + 7))
+	curl -s -o /dev/null --max-time 10 "${AUTH@}" -X PATCH \
+		-H "Content-Type: application/json" \
+		-d "{\"connection\":{\"max_upload_kibibytes_per_second\":$NEW_UP}}" "$PREFS" >/dev/null
+	curl -s -o "$BODY_FILE" -D "$HDR_FILE" --max-time 10 "${AUTH@}" "$PREFS" >/dev/null
+	PREF_AFTER=$(cat "$BODY_FILE")
+	PREF_ETAG2=$(_hdr ETag)
+	if  "$PREF_BEFORE" = "$PREF_AFTER" ; then
+		_skip "mutation-changes-validator check (the PATCH did not change the body)"
+	elif  "$PREF_ETAG" = "$PREF_ETAG2" ; then
+		_fail "a mutation changes the validator" \
+			"body changed but the ETag stayed $PREF_ETAG"
+	else
+		_pass "a mutation changes the validator"
+		# ...and the pre-mutation validator must no longer satisfy a
+		# conditional GET.
+		STALE=$(curl -s -o /dev/null -w '%{http_code}' --max-time 10 "${AUTH@}" \
+			-H "If-None-Match: $PREF_ETAG" "$PREFS")
+		_assert_eq "200" "$STALE" \
+			"a pre-mutation validator is not answered 304"
+	fi
+	# put it back
+	curl -s -o /dev/null --max-time 10 "${AUTH@}" -X PATCH \
+		-H "Content-Type: application/json" \
+		-d "{\"connection\":{\"max_upload_kibibytes_per_second\":$ORIG_UP}}" "$PREFS" >/dev/null
+fi
+
+# --- 7d. An authenticated body is not shared cache material. ---------
+#
+# Authenticate() takes a bearer token OR a session cookie, and the WebUI uses
+# the cookie -- so those requests carry no Authorization header and RFC 9111
+# 3.5's shared-cache prohibition never engages. With no explicit expiry a
+# shared cache may keep the 200 under heuristic freshness, and with Cookie
+# absent from Vary two users share a cache key: one user's download list can
+# be served to another.
+for cred in "Authorization: Bearer $TOKEN" "Cookie: amuleapi_token=$TOKEN"; do
+	label=${cred%%:*}
+	curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 -H "$cred" \
+		"$API/downloads" >/dev/null
+	# `private`, deliberately NOT `no-store`: no-store forbids the client's
+	# own cache too, so nothing would ever hold an entry to revalidate and
+	# no authenticated route would see an If-None-Match at all -- which
+	# throws away the validator machinery this suite spends most of its
+	# assertions on.
+	_assert_eq "private" "$(_hdr Cache-Control)" \
+		"an authenticated response ($label) is private (and not no-store)"
+	case "$(_hdr Vary)" in
+	*Cookie*) _pass "an authenticated response ($label) varies on Cookie" ;;
+	*) _fail "authenticated Vary names Cookie ($label)" "got $(_hdr Vary)" ;;
+	esac
+done
+
+# ...and an unauthenticated public probe stays cacheable, or it loses the
+# conditional GET the ETag exists for.
+curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 "$API/health" >/dev/null
+if  -z "$(_hdr Cache-Control)" ; then
+	_pass "an unauthenticated probe is left cacheable"
+else
+	_fail "unauthenticated probe left cacheable" "got Cache-Control: $(_hdr Cache-Control)"
+fi
+
+# A handler that sets its own policy keeps it: the flag artwork is public and
+# long-lived, and blanket-stamping would have made every WebUI icon uncacheable.
+curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 "$HOST/flags/us.png" >/dev/null
+if  "$(awk 'NR==1{print $2}' "$HDR_FILE" | tr -d '\r')" = "200" ; then
+	_assert_eq "public, max-age=86400" "$(_hdr Cache-Control)" \
+		"a handler's own cache policy survives the authenticated stamp"
+else
+	_skip "flag-artwork cache policy (no flag asset served)"
+fi
+
+# ...and the WebUI shell specifically, which is the asset that had NO policy
+# of its own and so inherited the authenticated default. Probing /flags alone
+# could not see that: it is the one static route that always had one.
+#
+# Asserted as the PROPERTY, not as a header spelling. An earlier cut matched
+# the prefix `public*` and passed against `public, max-age=86400,
+# must-revalidate` -- which grants a browser 24 hours of reuse WITHOUT
+# asking. These filenames carry no content hash, so that is the window in
+# which an upgraded daemon keeps serving the old shell, and in which a new
+# shell can be paired with an old bundle, since each asset expires on its
+# own clock. must-revalidate does not close it: RFC 9111 5.2.2.2 makes it
+# govern what a cache may do once an entry is ALREADY stale. A prefix match
+# could not have caught that; what has to hold is that the response grants
+# no reuse without revalidation.
+_assert_revalidates_every_time() {
+	local policy=$1 label=$2
+	case "$policy" in
+	*no-store*) _pass "$label refuses storage entirely ($policy)" ;;
+	*no-cache*) _pass "$label revalidates on every use ($policy)" ;;
+	*max-age=0*) _pass "$label revalidates on every use ($policy)" ;;
+	*max-age=*)
+		_fail "$label revalidates on every use" \
+			"$policy grants reuse without asking, and these filenames carry no content hash" ;;
+	"") _fail "$label revalidates on every use" "no Cache-Control at all" ;;
+	*) _fail "$label revalidates on every use" "got $policy" ;;
+	esac
+}
+curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 "$HOST/index.html" >/dev/null
+if  "$(awk 'NR==1{print $2}' "$HDR_FILE" | tr -d '\r')" = "200" ; then
+	_assert_revalidates_every_time "$(_hdr Cache-Control)" "the WebUI shell"
+	# It must still be shared-cacheable, which takes more than the absence
+	# of `private`. RFC 9111 3.5 bars a shared cache from reusing a
+	# response to a request that carried an Authorization header unless
+	# the response is marked public, must-revalidate or s-maxage --
+	# no-cache is not on that list. The WebUI logs in by cookie, but the
+	# same shell is fetched with a bearer token below, so without `public`
+	# a proxy has to hold a per-user copy of a file identical for every
+	# user. Asserted as the token, because that is what the RFC keys on.
+	SHELL_CC=$(_hdr Cache-Control)
+	# All three of 3.5's directives accept, not just `public`: a
+	# no-cache, must-revalidate policy is equally compliant, and a check
+	# whose accepting arm is narrower than its own failure message would
+	# reject one while telling the reader it carries none of them.
+	case "$SHELL_CC" in
+	*private*) _fail "the shell is shared-cacheable" "marked private: $SHELL_CC" ;;
+	*public*|*must-revalidate*|*s-maxage*) _pass "the shell is shared-cacheable ($SHELL_CC)" ;;
+	*) _fail "the shell is shared-cacheable" \
+		"$SHELL_CC carries none of public/must-revalidate/s-maxage, so RFC 9111 3.5 bars reuse" ;;
+	esac
+	# ...including when the request carries credentials, which is the case
+	# that used to stamp it private and re-fetch it per session.
+	curl -s -o /dev/null -D "$HDR_FILE" --max-time 10 \
+		-H "Authorization: Bearer $TOKEN" "$HOST/index.html" >/dev/null
+	SHELL_AUTH_CC=$(_hdr Cache-Control)
+	_assert_revalidates_every_time "$SHELL_AUTH_CC" "the shell under credentials"
+	# This is the request RFC 9111 3.5 is actually about: it carried an
+	# Authorization header, so one of its three directives is what decides
+	# whether a shared cache may serve one stored copy to everyone. Same
+	# widened arm as above, for the same reason.
+	case "$SHELL_AUTH_CC" in
+	*private*) _fail "the shell stays shared-cacheable under credentials" \
+		"marked private: $SHELL_AUTH_CC" ;;
+	*public*|*must-revalidate*|*s-maxage*) _pass "the shell stays shared-cacheable under credentials ($SHELL_AUTH_CC)" ;;
+	*) _fail "the shell stays shared-cacheable under credentials" \
+		"$SHELL_AUTH_CC carries none of public/must-revalidate/s-maxage" ;;
+	esac
+else
+	_skip "WebUI shell cache policy (no static frontend served)"
+fi
+
+# --- 8. status.ed2k.server_ip is an address, not an endpoint. --------
+#
+# The field carried brackets and the port -- "77.42.68.79:4232" -- inside
+# a field named server_ip, beside a server_port that already held the port.
+# A client joining the two got "77.42.68.79:4232:4232".
+curl -s -o "$BODY_FILE" --max-time 10 "${AUTH@}" "$API/status" >/dev/null
+SRV_IP=$(jq -r '.ed2k.server_ip // ""' < "$BODY_FILE" 2>/dev/null)
+if  -z "$SRV_IP" ; then
+	_skip "status.ed2k.server_ip shape (not connected to a server)"
+elif printf '%s' "$SRV_IP" | grep -qE '^0-9+\.0-9+\.0-9+\.0-9+$'; then
+	_pass "status.ed2k.server_ip is a bare dotted quad ($SRV_IP)"
+else
+	_fail "status.ed2k.server_ip is a bare dotted quad" "got $SRV_IP"
+fi
+
+# --- Summary. -------------------------------------------------------
+echo
+SKIP_NOTE=""
+ "$SKIP_COUNT" -gt 0  && SKIP_NOTE=" ($SKIP_COUNT check(s) skipped)"
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed$SKIP_NOTE"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/41-shared-content.sh Added

@@ -0,0 +1,873 @@
+#!/usr/bin/env bash
+#
+# amuleapi 41-shared-content — GET / HEAD /shared/{hash}/content.
+#
+# Endpoint:
+#   GET|HEAD /api/v1/shared/{hash}/content   → 200 / 206 / 304 / 416
+#
+# Serves the bytes of a COMPLETED shared file straight off the filesystem
+# amuleapi is running on. The response is deliberately hostile to the
+# browser that receives it:
+#
+#   Content-Type: application/octet-stream    hard-coded, never sniffed
+#   Content-Disposition: attachment; ...      never `inline`
+#   X-Content-Type-Options: nosniff
+#   Content-Security-Policy: default-src 'none'; sandbox
+#
+# — because both the bytes and the filename came from strangers on the ed2k
+# network (a completed download lands in Incoming, which is itself shared),
+# and amuleapi serves the Web UI from this same origin. A shared `evil.html`
+# returned as text/html would execute against the user's own session.
+#
+# Why each status is what it is:
+#   200  full representation, or a Range header that was ignored (below),
+#        or an If-Range whose validator no longer matches
+#   206  a single satisfiable byte range
+#   304  If-None-Match matched. Evaluated BEFORE Range, per RFC 9110 13.2.2,
+#        so a conditional request carrying a Range answers 304, never 206.
+#        If-Range is the OTHER precondition here (RFC 9110 13.1.5) and uses
+#        STRONG comparison, so a weak validator that satisfies If-None-Match
+#        must NOT satisfy it.
+#   401  no bearer token — the share list is not public
+#   404  no shared file with that hash. Also every path-resolution refusal,
+#        collapsed into the same reply so it cannot be used to probe the
+#        share layout.
+#   405  anything but GET / HEAD
+#   409  partfile_unsupported — a .part file's on-disk offsets do not
+#        correspond to the file's own, so a range out of it would be
+#        silently WRONG rather than merely unavailable.
+#   416  the range starts at or past EOF
+#   503  ec_content_unreachable / ec_content_mismatch when amuleapi runs
+#        against a REMOTE amuled and the daemon's paths do not exist (or
+#        name different files) on this host; path_unavailable while the
+#        directory has not yet arrived over EC; file_responses_exhausted
+#        when the transport's concurrent-file-response cap is saturated.
+#
+# The single most important assertion in this file is the multi-range one.
+# A multi-range request is answered 200 with the FULL body: RFC 7233 3.1
+# permits a server to ignore a Range header, and refusing to ever emit
+# multipart/byteranges is what makes the CVE-2011-3192 ("Apache Killer")
+# amplification shape a no-op here — a few hundred bytes of Range header
+# cannot be turned into hundreds of overlapping windows of one file.
+#
+# NOT covered here: flat memory across a multi-hundred-MB transfer. The
+# transport streams through a fixed 64 KiB buffer instead of buffering the
+# body, which is asserted by RangeFileBodyTest under ctest — a 600 MB
+# transfer is too slow and too fragile for a smoke run.
+#
+# Requires AMULE_SHARED_DIR (see run-all.sh) pointing at a directory the
+# connected amuled shares, so the script can plant its own fixture rather
+# than depend on the operator's library. Without it the script SKIPS.
+#
+# Usage:
+#   amuled -c /tmp/amule-regtest &
+#   amuleapi --config-dir=/tmp/amuleapi-regtest &
+#   AMULE_SHARED_DIR=... ./41-shared-content.sh
+#
+# Exits 0 on success (or a clean skip), 1 on any failed assertion,
+# 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+GUEST_PASS=${GUEST_PASS:-guestpass}
+AMULE_SHARED_DIR=${AMULE_SHARED_DIR:-}
+
+# 3 MiB: large enough that a suffix range, a 64 KiB streaming buffer and a
+# truncated body are all distinguishable, small enough to transfer a dozen
+# times in a smoke run.
+FIXTURE_NAME=amuleapi-content-regtest.bin
+FIXTURE_SIZE=3145728
+# Same fixture idea, but with a name carrying the characters that break a
+# naively-built Content-Disposition: a double quote, a space and a
+# semicolon. Planted best-effort — some filesystems refuse it.
+ODD_NAME='amuleapi-content "odd; name.bin'
+
+# The concurrency probe in section 11 needs its own, much larger fixture, and
+# the size is not a taste decision: it has to exceed what the kernel will
+# absorb without the peer reading.
+#
+# A file response holds its slot until the session is destroyed, and the
+# session ends when the server finishes WRITING -- which means "the bytes are
+# in the socket buffer", not "the client read them". So a body that fits
+# inside the send plus receive buffers completes against a peer that never
+# calls recv(), frees its slot, and lets the next request in. With the 3 MiB
+# fixture above and macOS auto-tuning to 4 MiB each way, this probe observed
+# 6, 7, 8 and even 9 of 9 requests answered 200 across repeated runs on one
+# idle daemon -- the cap was working, and the probe was measuring buffer
+# capacity instead. Sized from the limits the host reports, doubled for the
+# headroom of a partially-drained buffer, it stays a test of the cap.
+_socket_buffer_budget() {
+	local snd rcv
+	if snd=$(sysctl -n net.inet.tcp.autosndbufmax 2>/dev/null) \
+		&& rcv=$(sysctl -n net.inet.tcp.autorcvbufmax 2>/dev/null); then
+		echo $((snd + rcv))
+		return
+	fi
+	if  -r /proc/sys/net/ipv4/tcp_wmem  &&  -r /proc/sys/net/ipv4/tcp_rmem ; then
+		snd=$(awk '{print $3}' /proc/sys/net/ipv4/tcp_wmem)
+		rcv=$(awk '{print $3}' /proc/sys/net/ipv4/tcp_rmem)
+		echo $((snd + rcv))
+		return
+	fi
+	# Nothing to read: assume a generous 8 MiB each way rather than a small
+	# fixture that would make the probe lie.
+	echo $((16 * 1024 * 1024))
+}
+CAP_FIXTURE_NAME=amuleapi-content-cap-regtest.bin
+CAP_FIXTURE_SIZE=${CAP_FIXTURE_SIZE:-$(( $(_socket_buffer_budget) * 2 ))}
+# Floor and ceiling: below 16 MiB the margin over a re-tuned buffer is thin,
+# above 128 MiB the planting cost outweighs what the check proves.
+ "$CAP_FIXTURE_SIZE" -lt $((16 * 1024 * 1024))  && CAP_FIXTURE_SIZE=$((16 * 1024 * 1024))
+ "$CAP_FIXTURE_SIZE" -gt $((128 * 1024 * 1024))  && CAP_FIXTURE_SIZE=$((128 * 1024 * 1024))
+
+FAIL_COUNT=0
+TEST_COUNT=0
+# Skips are counted apart from TEST_COUNT, never folded into it: a skipped
+# check is coverage that did not happen, and adding it to the passed tally
+# would report the absence of a check as a check that succeeded. Same form
+# as 40-http-conformance.
+SKIP_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_41_shared_content_body.XXXXXX)
+CURL_HEAD_FILE=$(mktemp -t amuleapi_41_shared_content_head.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE" "$CURL_HEAD_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+_skip() { SKIP_COUNT=$((SKIP_COUNT+1)); echo "  SKIP  $1"; }
+
+_curl() {
+	local resp
+	# Truncate both dumps first. curl does not rewrite -o when the response
+	# carries no body, so a 304 would otherwise be asserted against the
+	# PREVIOUS response's bytes -- which is the one case this file most
+	# needs to get right.
+	: > "$CURL_BODY_FILE"
+	: > "$CURL_HEAD_FILE"
+	resp=$(curl -s --max-time 60 \
+		-D "$CURL_HEAD_FILE" \
+		-o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+	CURL_HEAD=$(cat "$CURL_HEAD_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| _fail "$label" "body was not valid JSON" "body: $CURL_BODY"
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+_assert_body_empty() {
+	local label=$1
+	if  ! -s "$CURL_BODY_FILE" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected an empty body, got $(wc -c < "$CURL_BODY_FILE" | tr -d ' ') bytes"
+	fi
+}
+
+_assert_eq() {
+	local expected=$1 actual=$2 label=$3
+	if  "$expected" = "$actual" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual"
+	fi
+}
+
+# Header value by name, case-insensitively, from the last -D dump.
+_hdr() {
+	tr -d '\r' < "$CURL_HEAD_FILE" | awk -v want="$(printf '%s' "$1" | tr 'A-Z' 'a-z')" \
+		'BEGIN{FS=": "} tolower($1)==want {sub(/^^:*: /,""); print; exit}'
+}
+
+# Is a header present at all (regardless of value)?
+_has_hdr() {
+	tr -d '\r' < "$CURL_HEAD_FILE" | awk -v want="$(printf '%s' "$1" | tr 'A-Z' 'a-z')" \
+		'BEGIN{FS=":"} tolower($1)==want {found=1} END{exit !found}'
+}
+
+_assert_hdr_eq() {
+	local name=$1 expected=$2 label=$3
+	_assert_eq "$expected" "$(_hdr "$name")" "$label"
+}
+
+# --- Preconditions. -------------------------------------------------
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+echo "amuleapi 41-shared-content smoke @ $HOST"
+
+if  -z "$AMULE_SHARED_DIR" ; then
+	echo
+	echo "SKIP: AMULE_SHARED_DIR is unset, so the fixture cannot be planted."
+	echo "      Point it at a directory the connected amuled shares (its"
+	echo "      Incoming, typically) and re-run. run-all.sh forwards it."
+	exit 0
+fi
+if  ! -d "$AMULE_SHARED_DIR"  ||  ! -w "$AMULE_SHARED_DIR" ; then
+	echo
+	echo "SKIP: AMULE_SHARED_DIR=$AMULE_SHARED_DIR is not a writable directory."
+	exit 0
+fi
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+
+GUEST_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$GUEST_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+HAVE_GUEST=0
+ -n "$GUEST_TOKEN"  &&  "$GUEST_TOKEN" != "null"  && HAVE_GUEST=1
+
+AUTH=(-H "Authorization: Bearer $ADMIN_TOKEN")
+
+# --- Fixture provisioning. ------------------------------------------
+# Self-provisioning on purpose: the assertions below compare byte windows
+# against a local copy, so the script must own the file it serves rather
+# than adopt whatever happens to be in the operator's library. Reused
+# across runs once it exists — the bytes are what matter, not their
+# freshness.
+FIXTURE_PATH="$AMULE_SHARED_DIR/$FIXTURE_NAME"
+if  ! -f "$FIXTURE_PATH"  ||  "$(wc -c < "$FIXTURE_PATH" | tr -d ' ')" != "$FIXTURE_SIZE" ; then
+	head -c "$FIXTURE_SIZE" /dev/urandom > "$FIXTURE_PATH" \
+		|| _die "cannot write fixture to AMULE_SHARED_DIR=$AMULE_SHARED_DIR"
+	echo "    info: planted fixture $FIXTURE_PATH ($FIXTURE_SIZE bytes)"
+fi
+
+ODD_PATH="$AMULE_SHARED_DIR/$ODD_NAME"
+HAVE_ODD=0
+if  -f "$ODD_PATH" ; then
+	HAVE_ODD=1
+elif head -c 1024 /dev/urandom > "$ODD_PATH" 2>/dev/null &&  -f "$ODD_PATH" ; then
+	HAVE_ODD=1
+	echo "    info: planted header-injection fixture $ODD_PATH"
+else
+	rm -f "$ODD_PATH" 2>/dev/null
+	echo "    info: filesystem refused a filename containing a quote/semicolon;" \
+		"the Content-Disposition injection case is skipped"
+fi
+
+# The concurrency probe's own fixture (see CAP_FIXTURE_SIZE above). Planted
+# best-effort: on a host short of disk this is the check to lose, not the
+# whole phase.
+CAP_FIXTURE_PATH="$AMULE_SHARED_DIR/$CAP_FIXTURE_NAME"
+HAVE_CAP_FIXTURE=0
+if  -f "$CAP_FIXTURE_PATH"  \
+	&&  "$(wc -c < "$CAP_FIXTURE_PATH" | tr -d ' ')" = "$CAP_FIXTURE_SIZE" ; then
+	HAVE_CAP_FIXTURE=1
+elif head -c "$CAP_FIXTURE_SIZE" /dev/urandom > "$CAP_FIXTURE_PATH" 2>/dev/null \
+	&&  "$(wc -c < "$CAP_FIXTURE_PATH" | tr -d ' ')" = "$CAP_FIXTURE_SIZE" ; then
+	HAVE_CAP_FIXTURE=1
+	echo "    info: planted concurrency fixture $CAP_FIXTURE_PATH ($CAP_FIXTURE_SIZE bytes)"
+else
+	rm -f "$CAP_FIXTURE_PATH" 2>/dev/null
+	echo "    info: could not plant the $CAP_FIXTURE_SIZE-byte concurrency fixture;" \
+		"the file-response cap check is skipped"
+fi
+
+# Ask amuled to re-walk its shares, then wait for the fixture to be hashed
+# in. A cold hash of a few MiB is sub-second; the generous poll is for the
+# scheduling latency, not the hashing.
+curl -s -o /dev/null -X POST "${AUTH@}" "$API/shared_reload"
+TEST_HASH=""
+ODD_HASH=""
+for _ in $(seq 1 40); do
+	sleep 1
+	_curl "${AUTH@}" "$API/shared"
+	TEST_HASH=$(printf '%s' "$CURL_BODY" \
+		| jq -r --arg n "$FIXTURE_NAME" '.shared | select(.name == $n) | .hash' | head -1)
+	 -n "$TEST_HASH"  && break
+done
+ -n "$TEST_HASH"  \
+	|| _die "fixture $FIXTURE_NAME planted in $AMULE_SHARED_DIR but never appeared in /shared"
+
+SERVED_SIZE=$(printf '%s' "$CURL_BODY" \
+	| jq -r --arg n "$FIXTURE_NAME" '.shared | select(.name == $n) | .size_bytes' | head -1)
+_assert_eq "$FIXTURE_SIZE" "$SERVED_SIZE" "/shared reports the fixture at its on-disk size"
+
+# The concurrency fixture is larger, so it can still be hashing when the
+# small one is already listed; poll for it separately rather than assume.
+CAP_HASH=""
+if  "$HAVE_CAP_FIXTURE" = "1" ; then
+	for _ in $(seq 1 60); do
+		CAP_HASH=$(printf '%s' "$CURL_BODY" \
+			| jq -r --arg n "$CAP_FIXTURE_NAME" '.shared | select(.name == $n) | .hash' \
+			| head -1)
+		 -n "$CAP_HASH"  && break
+		sleep 1
+		_curl "${AUTH@}" "$API/shared"
+	done
+	 -n "$CAP_HASH"  \
+		|| echo "    info: $CAP_FIXTURE_NAME never appeared in /shared;" \
+			"the file-response cap check is skipped"
+fi
+
+if  "$HAVE_ODD" = "1" ; then
+	ODD_HASH=$(printf '%s' "$CURL_BODY" \
+		| jq -r --arg n "$ODD_NAME" '.shared | select(.name == $n) | .hash' | head -1)
+	if  -z "$ODD_HASH" ; then
+		echo "    info: the odd-named fixture is not shared yet; skipping its case"
+		HAVE_ODD=0
+	fi
+fi
+
+# Classify a partfile for the 409 guard, the same sweep 30-shared-verify
+# does. Planting a half-finished download is not reproducible in a smoke
+# run, so this case is skipped rather than forced.
+PART_HASH=""
+for h in $(printf '%s' "$CURL_BODY" | jq -r '.shared.hash' | head -20); do
+	INCOMPLETE=$(curl -s --max-time 10 "${AUTH@}" \
+		"$API/shared/$h" | jq -r '.incomplete')
+	if  "$INCOMPLETE" = "true" ; then PART_HASH=$h; break; fi
+done
+
+echo "    info: serving hash=$TEST_HASH size=$FIXTURE_SIZE"
+
+CONTENT_URL="$API/shared/$TEST_HASH/content"
+
+# --- 1. Auth gate. ---------------------------------------------------
+_curl "$CONTENT_URL"
+_assert_status 401 "GET /shared/{hash}/content (no token) → 401"
+
+# GUEST is enough: reading a shared file's bytes is a read of data the
+# daemon is already offering to the whole ed2k network.
+if  "$HAVE_GUEST" = "1" ; then
+	_curl -H "Authorization: Bearer $GUEST_TOKEN" "$CONTENT_URL"
+	_assert_status 200 "GET /shared/{hash}/content (guest) → 200"
+fi
+
+# --- 2. Unknown hash → 404. ------------------------------------------
+_curl "${AUTH@}" "$API/shared/00000000000000000000000000000000/content"
+_assert_status 404 "GET /shared/{unknown}/content → 404"
+_assert_json_eq '.error.code' not_found "unknown hash → error.code=not_found"
+
+# --- 3. Method gate. -------------------------------------------------
+_curl -X POST "${AUTH@}" "$CONTENT_URL"
+_assert_status 405 "POST /shared/{hash}/content → 405"
+
+_curl -X DELETE "${AUTH@}" "$CONTENT_URL"
+_assert_status 405 "DELETE /shared/{hash}/content → 405"
+
+# --- 4. Full GET: status, headers, and the exact bytes. --------------
+_curl "${AUTH@}" "$CONTENT_URL"
+_assert_status 200 "GET /shared/{hash}/content → 200"
+
+if cmp -s "$FIXTURE_PATH" "$CURL_BODY_FILE"; then
+	_pass "the served body is byte-identical to the file on disk"
+else
+	_fail "the served body is byte-identical to the file on disk" \
+		"on disk: $(wc -c < "$FIXTURE_PATH" | tr -d ' ') bytes," \
+		"served: $(wc -c < "$CURL_BODY_FILE" | tr -d ' ') bytes"
+fi
+
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "Content-Length is the exact file size"
+_assert_hdr_eq "Content-Type" "application/octet-stream" \
+	"Content-Type is application/octet-stream (never sniffed from the extension)"
+_assert_hdr_eq "X-Content-Type-Options" "nosniff" "X-Content-Type-Options: nosniff"
+_assert_hdr_eq "Content-Security-Policy" "default-src 'none'; sandbox" \
+	"Content-Security-Policy sandboxes the response"
+_assert_hdr_eq "Accept-Ranges" "bytes" "Accept-Ranges: bytes advertises range support"
+# nginx buffers a proxied response by default and spools it to its own disk up
+# to proxy_max_temp_file_size (1 GB), which would delay the first byte and copy
+# the whole file onto the proxy host. The transport opts out on every file
+# response, the same way the SSE head does.
+_assert_hdr_eq "X-Accel-Buffering" "no" "200 carries X-Accel-Buffering: no (proxy must not buffer)"
+_assert_hdr_eq "Content-Disposition" \
+	"attachment; filename=\"$FIXTURE_NAME\"; filename*=UTF-8''$FIXTURE_NAME" \
+	"Content-Disposition is attachment with both filename forms"
+
+CONTENT_ETAG=$(_hdr "ETag")
+if  -n "$CONTENT_ETAG" ; then
+	_pass "GET emits a handler-set ETag ($CONTENT_ETAG)"
+else
+	_fail "GET emits an ETag" "no ETag header in the response"
+fi
+
+# --- 5. Single ranges. -----------------------------------------------
+_curl "${AUTH@}" -H "Range: bytes=0-9" "$CONTENT_URL"
+_assert_status 206 "Range: bytes=0-9 → 206"
+_assert_hdr_eq "Content-Range" "bytes 0-9/$FIXTURE_SIZE" "first-ten Content-Range"
+_assert_hdr_eq "Content-Length" "10" "first-ten Content-Length"
+# Set by the transport, not the handler, so a partial response gets it too.
+_assert_hdr_eq "X-Accel-Buffering" "no" "206 carries X-Accel-Buffering: no as well"
+head -c 10 "$FIXTURE_PATH" > "$CURL_HEAD_FILE.expect10"
+if cmp -s "$CURL_HEAD_FILE.expect10" "$CURL_BODY_FILE"; then
+	_pass "bytes=0-9 returns the first ten bytes of the file"
+else
+	_fail "bytes=0-9 returns the first ten bytes of the file" "window mismatch"
+fi
+rm -f "$CURL_HEAD_FILE.expect10"
+
+SUFFIX_START=$((FIXTURE_SIZE - 100))
+SUFFIX_END=$((FIXTURE_SIZE - 1))
+_curl "${AUTH@}" -H "Range: bytes=-100" "$CONTENT_URL"
+_assert_status 206 "Range: bytes=-100 (suffix) → 206"
+_assert_hdr_eq "Content-Range" "bytes $SUFFIX_START-$SUFFIX_END/$FIXTURE_SIZE" \
+	"suffix range resolves against the file size"
+_assert_hdr_eq "Content-Length" "100" "suffix Content-Length"
+tail -c 100 "$FIXTURE_PATH" > "$CURL_HEAD_FILE.expect100"
+if cmp -s "$CURL_HEAD_FILE.expect100" "$CURL_BODY_FILE"; then
+	_pass "bytes=-100 returns the last hundred bytes of the file"
+else
+	_fail "bytes=-100 returns the last hundred bytes of the file" "window mismatch"
+fi
+rm -f "$CURL_HEAD_FILE.expect100"
+
+# An open-ended range from EOF is unsatisfiable, not empty: there is no
+# byte at offset `size`. 416 carries `bytes */size` so the client learns
+# the real length without a second request.
+_curl "${AUTH@}" -H "Range: bytes=$FIXTURE_SIZE-" "$CONTENT_URL"
+_assert_status 416 "Range starting at EOF → 416"
+_assert_hdr_eq "Content-Range" "bytes */$FIXTURE_SIZE" \
+	"416 reports the true length as bytes */size"
+
+# --- 6. Ranges that are IGNORED rather than served. ------------------
+# THE important one. Multi-range is answered 200 with the whole body, not
+# 206 multipart/byteranges and not 416. RFC 7233 3.1 explicitly allows a
+# server to ignore Range, and never emitting multipart is what neutralises
+# the CVE-2011-3192 "Apache Killer" amplification: a request naming
+# hundreds of overlapping windows costs exactly one linear read of the
+# file, the same as no Range header at all.
+_curl "${AUTH@}" -H "Range: bytes=0-1,5-6" "$CONTENT_URL"
+_assert_status 200 "multi-range → 200 with the full body (CVE-2011-3192 is a no-op)"
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "multi-range body is the whole file"
+if _has_hdr "Content-Range"; then
+	_fail "multi-range emits no Content-Range" "got: $(_hdr Content-Range)"
+else
+	_pass "multi-range emits no Content-Range"
+fi
+case "$(_hdr Content-Type)" in
+	*multipart*) _fail "multi-range is not multipart/byteranges" "got: $(_hdr Content-Type)" ;;
+	*) _pass "multi-range is not multipart/byteranges" ;;
+esac
+
+# The same amplification shape at scale: 200 overlapping windows still
+# costs one body, which is the whole point of the rule above.
+MANY_RANGES=$(awk 'BEGIN{ for (i = 0; i < 200; i++) printf "%s0-%d", (i ? "," : ""), i }')
+_curl "${AUTH@}" -H "Range: bytes=$MANY_RANGES" "$CONTENT_URL"
+_assert_status 200 "200 overlapping ranges → one 200, not 200 windows"
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "the amplification attempt costs exactly one body"
+
+# A unit this server does not implement must be ignored, not rejected —
+# RFC 9110 14.2 says an unrecognised range unit is treated as absent.
+_curl "${AUTH@}" -H "Range: items=0-9" "$CONTENT_URL"
+_assert_status 200 "unknown range unit (items=) is ignored → 200 full body"
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "unknown range unit returns the whole file"
+
+# Overflow must be REJECTED, never wrapped. A 30-digit value does not fit
+# a 64-bit offset; wrapping it would compute an in-range window from an
+# absurd request and read at an offset the client never named.
+_curl "${AUTH@}" -H "Range: bytes=999999999999999999999999999999-" "$CONTENT_URL"
+_assert_status 200 "overflowing range start is rejected → 200 full body"
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "overflowing start does not wrap into a window"
+
+_curl "${AUTH@}" -H "Range: bytes=0-999999999999999999999999999999" "$CONTENT_URL"
+_assert_status 200 "overflowing range end is rejected → 200 full body"
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "overflowing end does not wrap into a window"
+
+# --- 7. File responses are never deflated. ---------------------------
+# The transport refuses to compress a file body, so no amount of
+# Accept-Encoding negotiation produces a Content-Encoding. That is also
+# why the ETag carries no coding suffix: there is exactly one
+# representation to name.
+_curl "${AUTH@}" -H "Accept-Encoding: gzip, deflate" "$CONTENT_URL"
+_assert_status 200 "Accept-Encoding: gzip → 200"
+if _has_hdr "Content-Encoding"; then
+	_fail "file responses are never deflated" "got Content-Encoding: $(_hdr Content-Encoding)"
+else
+	_pass "file responses are never deflated (no Content-Encoding)"
+fi
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "an uncompressed body keeps its exact length"
+
+# --- 8. Conditional GET. ---------------------------------------------
+# Answered by the handler, not by the generic ETag stamping in Dispatch:
+# Dispatch stands aside the moment a handler sets its own validator, so a
+# route that emits an ETag and does NOT answer If-None-Match hands out a
+# validator no client can ever revalidate against.
+_curl "${AUTH@}" -H "If-None-Match: $CONTENT_ETAG" "$CONTENT_URL"
+_assert_status 304 "If-None-Match with the served ETag → 304"
+_assert_body_empty "304 carries no body"
+_assert_hdr_eq "ETag" "$CONTENT_ETAG" "304 preserves the ETag header"
+
+_curl "${AUTH@}" -H "If-None-Match: *" "$CONTENT_URL"
+_assert_status 304 "If-None-Match: * → 304"
+
+# Header names are case-insensitive on the wire, and the lookup has to be
+# too — an intermediary is free to lowercase them.
+_curl "${AUTH@}" -H "if-none-match: $CONTENT_ETAG" "$CONTENT_URL"
+_assert_status 304 "lowercase if-none-match → 304"
+
+# The weak form is what an nginx in front of amuleapi emits after it
+# rewrites the validator.
+_curl "${AUTH@}" -H "If-None-Match: W/$CONTENT_ETAG" "$CONTENT_URL"
+_assert_status 304 "weak validator W/\"...\" → 304"
+
+# A list, the form a client holding several cached variants sends.
+_curl "${AUTH@}" -H "If-None-Match: \"nope-1\", $CONTENT_ETAG, \"nope-2\"" "$CONTENT_URL"
+_assert_status 304 "If-None-Match list containing the ETag → 304"
+
+_curl "${AUTH@}" -H "If-None-Match: \"not-the-validator\"" "$CONTENT_URL"
+_assert_status 200 "non-matching validator → 200 full body"
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "a failed revalidation returns the whole file"
+
+# RFC 9110 13.2.2: preconditions are evaluated BEFORE Range, so a matching
+# If-None-Match wins outright and the Range is never reached. Answering
+# 206 here would hand a client that already holds the bytes a window it
+# did not need, and would do it under a validator that says nothing
+# changed.
+_curl "${AUTH@}" -H "If-None-Match: $CONTENT_ETAG" -H "Range: bytes=0-9" "$CONTENT_URL"
+_assert_status 304 "If-None-Match + Range → 304, not 206 (precondition first)"
+_assert_body_empty "the 304 that pre-empts a Range still carries no body"
+
+# --- 9. If-Range. ----------------------------------------------------
+# The resume path, and the one precondition on this route whose failure
+# corrupts silently. A client resuming an interrupted download sends the
+# validator it holds next to `Range: bytes=N-` so that a representation
+# which changed underneath it answers 200 with the WHOLE new file. A
+# server that honours the Range regardless returns a 206 of the new
+# bytes, and the client -- reading the 206 as confirmation its validator
+# held -- appends them to its copy of the old one. RFC 9110 13.1.5.
+#
+# Evaluated after If-None-Match (13.2.2 keeps a 304 winning outright) and
+# before the Range is parsed.
+
+# The match case: same validator, so the client's copy is still current
+# and the window it asked for is safe to serve.
+_curl "${AUTH@}" -H "If-Range: $CONTENT_ETAG" -H "Range: bytes=0-9" "$CONTENT_URL"
+_assert_status 206 "If-Range with the current ETag + Range → 206"
+_assert_hdr_eq "Content-Range" "bytes 0-9/$FIXTURE_SIZE" "the honoured If-Range serves the named window"
+_assert_hdr_eq "Content-Length" "10" "the honoured If-Range serves ten bytes"
+
+# The stale case, and the whole point of the header: the Range is dropped
+# and the full representation is returned, so the client cannot splice.
+_curl "${AUTH@}" -H "If-Range: \"not-the-validator\"" -H "Range: bytes=0-9" "$CONTENT_URL"
+_assert_status 200 "If-Range with a stale validator + Range → 200, not 206"
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "a stale If-Range returns the whole file"
+if _has_hdr "Content-Range"; then
+	_fail "a stale If-Range emits no Content-Range" "got: $(_hdr Content-Range)"
+else
+	_pass "a stale If-Range emits no Content-Range"
+fi
+
+# 13.1.5 requires STRONG comparison, which is where this parts company
+# with If-None-Match: the same weak validator that answers 304 in section
+# 8 must NOT license a byte range, because weak means "equivalent
+# representation", not "identical bytes". A regression that reused the
+# If-None-Match matcher here would answer 206 and pass every other case
+# in this section.
+_curl "${AUTH@}" -H "If-Range: W/$CONTENT_ETAG" -H "Range: bytes=0-9" "$CONTENT_URL"
+_assert_status 200 "weak W/\"...\" If-Range + Range → 200 (strong comparison rejects it)"
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "a weak If-Range returns the whole file"
+
+# The HTTP-date form is not implemented and is treated as non-matching
+# rather than honoured. A date validator is second-resolution, so a
+# representation replaced twice inside one second would compare equal --
+# exactly the race the header exists to close. The cost of the choice is
+# a full transfer; the cost of the other one is a spliced file.
+_curl "${AUTH@}" -H "If-Range: Sat, 01 Jan 2000 00:00:00 GMT" \
+	-H "Range: bytes=0-9" "$CONTENT_URL"
+_assert_status 200 "HTTP-date If-Range + Range → 200 (the date form is not honoured)"
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "an unsupported If-Range form returns the whole file"
+
+# Without a Range there is nothing to condition, so the header is ignored
+# entirely -- a stale one must not turn a plain GET into anything other
+# than the ordinary 200.
+_curl "${AUTH@}" -H "If-Range: \"not-the-validator\"" "$CONTENT_URL"
+_assert_status 200 "If-Range with no Range → ignored, plain 200"
+_assert_hdr_eq "Content-Length" "$FIXTURE_SIZE" "If-Range alone still returns the whole file"
+
+# And a 304 still wins over both: If-None-Match is evaluated first, so a
+# matching validator pre-empts the If-Range/Range pair rather than
+# racing it.
+_curl "${AUTH@}" -H "If-None-Match: $CONTENT_ETAG" -H "If-Range: $CONTENT_ETAG" \
+	-H "Range: bytes=0-9" "$CONTENT_URL"
+_assert_status 304 "If-None-Match still wins over a satisfiable If-Range + Range"
+_assert_body_empty "that 304 carries no body either"
+
+# --- 10. HEAD, on a raw socket. ---------------------------------------
+# curl KNOWS a HEAD response has no body and will not read one, so it
+# reports zero bytes whether or not the server actually wrote them —
+# which is exactly the bug worth testing. Same technique as
+# 40-http-conformance. Prints "<status> <content-length> <body-bytes>".
+_raw_probe() {
+	python3 - "$HOST" "$@" <<'PYEOF'
+import socket, sys
+hostport, method, path = sys.argv1, sys.argv2, sys.argv3
+# Every remaining argument is one extra header line. Joined with CRLF here
+# rather than passed as one pre-joined blob, so a caller cannot accidentally
+# smuggle a bare LF into the request and get a silent connection failure.
+extra = h for h in sys.argv4: if h
+host, _, port = hostport.partition(":")
+try:
+    s = socket.create_connection((host or "localhost", int(port or 4713)), timeout=30)
+    req = "%s %s HTTP/1.1\r\nHost: x\r\nConnection: close\r\n" % (method, path)
+    for h in extra:
+        req += h + "\r\n"
+    req += "\r\n"
+    s.sendall(req.encode())
+    data = b""
+    while True:
+        chunk = s.recv(65536)
+        if not chunk:
+            break
+        data += chunk
+    s.close()
+except Exception:
+    print("000 - -")
+    raise SystemExit(0)
+head, sep, body = data.partition(b"\r\n\r\n")
+status = head.split(b"\r\n")0.split(b" ")1.decode() if head else "000"
+clen = "-"
+for line in head.decode("latin-1").split("\r\n"):
+    if line.lower().startswith("content-length:"):
+        clen = line.split(":", 1)1.strip()
+print("%s %s %d" % (status, clen, len(body)))
+PYEOF
+}
+
+if ! command -v python3 >/dev/null 2>&1; then
+	_skip "wire-level HEAD / 304 checks (python3 unavailable)"
+else
+	CONTENT_PATH="/api/v1/shared/$TEST_HASH/content"
+	AUTH_HDR="Authorization: Bearer $ADMIN_TOKEN"
+
+	read -r h_status h_len h_bytes <<<"$(_raw_probe "HEAD" "$CONTENT_PATH" "$AUTH_HDR")"
+	_assert_eq "200" "$h_status" "HEAD /shared/{hash}/content → 200"
+	_assert_eq "0" "$h_bytes" "HEAD puts no content on the wire"
+	# The whole point of a HEAD here is sizing a download, so the length
+	# must describe what a GET would return, not the zero bytes written.
+	_assert_eq "$FIXTURE_SIZE" "$h_len" "HEAD Content-Length is what a GET would return"
+
+	read -r hu_status _hu_len _hu_bytes <<<"$(_raw_probe "HEAD" "$CONTENT_PATH")"
+	_assert_eq "401" "$hu_status" "HEAD without credentials → 401 (no auth bypass)"
+
+	# A 304 must be bodiless on the wire too. On a keep-alive connection a
+	# stray body would be parsed as the head of the next response.
+	read -r c_status _c_len c_bytes \
+		<<<"$(_raw_probe "GET" "$CONTENT_PATH" "$AUTH_HDR" \
+			"If-None-Match: $CONTENT_ETAG")"
+	_assert_eq "304" "$c_status" "raw GET with a matching If-None-Match → 304"
+	_assert_eq "0" "$c_bytes" "304 puts no content on the wire"
+fi
+
+# --- 11. Concurrent-file-response cap. -------------------------------
+# The transport caps concurrent file responses because each one pins a file
+# descriptor and a streaming buffer for as long as the peer takes to drain
+# it. Over the cap the answer is an honest 503 with a Retry-After, not a
+# queue that grows without bound. Probed on raw sockets that read only the
+# status line and then hold the connection: a curl fan-out would finish each
+# transfer too quickly to overlap reliably.
+#
+# It runs against CAP_FIXTURE_NAME, not the 3 MiB fixture the rest of this
+# file uses, and that is the whole difference between measuring the cap and
+# measuring the kernel. A slot is held until the session is destroyed, and
+# the session ends when the server finishes writing -- into the socket
+# buffer, whether or not the peer ever reads. A body small enough to fit
+# there completes against a peer that never calls recv(), frees its slot,
+# and admits the next request: with 3 MiB against 4 MiB buffers this check
+# saw 6, 7, 8 and 9 of 9 requests answered 200 across repeated runs on one
+# idle daemon. Every one of those was the cap working correctly.
+#
+# The cap is amuleapi.confStreaming/MaxConcurrentFileResponses (default 6),
+# so the fan-out is sized from it rather than hard-coded at 9 -- a run against
+# a daemon configured with a different value proves the SAME property instead
+# of failing for the wrong reason. Set FILE_RESPONSE_CAP to match the conf.
+FILE_RESPONSE_CAP=${FILE_RESPONSE_CAP:-6}
+CAP_OVERFLOW=3
+CAP_TOTAL=$((FILE_RESPONSE_CAP + CAP_OVERFLOW))
+if ! command -v python3 >/dev/null 2>&1; then
+	_skip "concurrent-file-response cap (python3 unavailable)"
+elif  -z "$CAP_HASH" ; then
+	_skip "concurrent-file-response cap (no $CAP_FIXTURE_SIZE-byte fixture to hold the slots open)"
+else
+	CAP_RESULT=$(python3 - "$HOST" "/api/v1/shared/$CAP_HASH/content" "$ADMIN_TOKEN" "$CAP_TOTAL" <<'PYEOF'
+import socket, sys
+hostport, path, token = sys.argv1, sys.argv2, sys.argv3
+total = int(sys.argv4)
+host, _, port = hostport.partition(":")
+host = host or "localhost"
+port = int(port or 4713)
+socks, statuses, bodies = , , 
+try:
+    for _ in range(total):
+        s = socket.create_connection((host, port), timeout=30)
+        s.sendall((
+            "GET %s HTTP/1.1\r\nHost: x\r\nAuthorization: Bearer %s\r\n"
+            "Connection: close\r\n\r\n" % (path, token)).encode())
+        socks.append(s)
+    # Read only the header block from each, leaving any 200 body unread so
+    # the response stays open and the cap stays saturated.
+    for s in socks:
+        buf = b""
+        while b"\r\n\r\n" not in buf and len(buf) < 65536:
+            chunk = s.recv(4096)
+            if not chunk:
+                break
+            buf += chunk
+        head, _, rest = buf.partition(b"\r\n\r\n")
+        line = head.split(b"\r\n")0.decode("latin-1") if head else ""
+        statuses.append(line.split(" ")1 if len(line.split(" ")) > 1 else "000")
+        bodies.append((head.decode("latin-1"), rest))
+finally:
+    for s in socks:
+        try:
+            s.close()
+        except Exception:
+            pass
+ok = statuses.count("200")
+busy = statuses.count("503")
+retry_after = "no"
+code = "-"
+for head, rest in bodies:
+    if head.split("\r\n")0.split(" ")1:2 == "503":
+        if "retry-after:" in head.lower():
+            retry_after = "yes"
+        if "file_responses_exhausted" in rest.decode("latin-1", "replace"):
+            code = "file_responses_exhausted"
+        break
+print("%d %d %s %s" % (ok, busy, retry_after, code))
+PYEOF
+)
+	read -r cap_ok cap_busy cap_retry cap_code <<<"$CAP_RESULT"
+	if  "$cap_ok" = "$FILE_RESPONSE_CAP"  &&  "$cap_busy" = "$CAP_OVERFLOW" ; then
+		_pass "$CAP_TOTAL simultaneous file requests split into ${cap_ok}x200 + ${cap_busy}x503"
+	elif  "$cap_busy" = "0" ; then
+		# Nothing was refused, so nothing overlapped, so the cap was never
+		# reached -- a fixture that still fits this host's buffers, or a
+		# daemon quick enough to finish each write between connects. That
+		# is an untested cap, not a broken one, and reporting it as a
+		# failure is how a green suite gets ignored.
+		_skip "concurrent-file-response cap: all $CAP_TOTAL answered 200," \
+			"so the requests never overlapped (raise CAP_FIXTURE_SIZE above" \
+			"this host's socket buffers)"
+	else
+		_fail "$CAP_TOTAL simultaneous file requests split at the configured cap" \
+			"expected ${FILE_RESPONSE_CAP}x200 + ${CAP_OVERFLOW}x503," \
+			"got ${cap_ok}x200 + ${cap_busy}x503 out of $CAP_TOTAL" \
+			"(a 200 count above the cap means slots were freed before the" \
+			"fan-out completed -- CAP_FIXTURE_SIZE is too small for this host)"
+	fi
+	if  "$cap_busy" != "0" ; then
+		_assert_eq "yes" "$cap_retry" "the over-cap 503 carries a Retry-After header"
+		_assert_eq "file_responses_exhausted" "$cap_code" \
+			"the over-cap 503 reports error.code=file_responses_exhausted"
+	fi
+fi
+
+# --- 12. Content-Disposition cannot be steered by the filename. ------
+# The filename comes from the ed2k network, so it is attacker-authored. A
+# quote closes the quoted-string form and a CR/LF would split the header
+# outright; neither may survive into the response.
+if  "$HAVE_ODD" = "1" ; then
+	# Settle first. Section 10 saturated the concurrent-file-response cap
+	# with six sockets and then closed them, but the slot is released in
+	# ~Session -- asynchronously with the client's close, not as part of
+	# it. Asserting a 200 straight afterwards can therefore read a 503 that
+	# has nothing to do with Content-Disposition, which is a flake, not a
+	# finding. A cheap HEAD polls for the slots to come back; it is exempt
+	# from the cap itself, so it probes the route without competing for
+	# what it is waiting on.
+	#
+	# Bounded, and loud when it expires: a poll that waited forever would
+	# turn a genuine regression in slot release into a hung suite, which is
+	# strictly worse than a failed assertion.
+	ODD_URL="$API/shared/$ODD_HASH/content"
+	ODD_SETTLE=000
+	for _ in $(seq 1 10); do
+		ODD_SETTLE=$(curl -s -o /dev/null -I --max-time 10 \
+			-w '%{http_code}' "${AUTH@}" "$ODD_URL")
+		 "$ODD_SETTLE" = "200"  && break
+		sleep 1
+	done
+	_assert_eq "200" "$ODD_SETTLE" \
+		"the file-response slots section 10 held are released within 10s"
+
+	_curl "${AUTH@}" "$ODD_URL"
+	_assert_status 200 "GET content of a file whose name carries quote/semicolon → 200"
+	ODD_CD=$(_hdr "Content-Disposition")
+	case "$ODD_CD" in
+		attachment\;*) _pass "the odd name still yields an attachment disposition" ;;
+		*) _fail "the odd name still yields an attachment disposition" "got: $ODD_CD" ;;
+	esac
+	# The danger is the quote CLOSING the quoted-string early and turning
+	# the rest of the filename into forged parameters. A semicolon inside
+	# the quoted string is legal and must be left alone, so the check is
+	# where the string ends, not which characters it contains: whatever
+	# follows the closing quote has to be the filename* parameter this
+	# server emits, and nothing else.
+	CD_AFTER_OPEN=${ODD_CD#*filename=\"}
+	CD_TAIL=${CD_AFTER_OPEN#*\"}
+	case "$CD_TAIL" in
+		"; filename*=UTF-8''"*)
+			_pass "the embedded quote does not terminate the quoted filename early" ;;
+		*) _fail "the embedded quote does not terminate the quoted filename early" \
+			"after the closing quote: $CD_TAIL" "full header: $ODD_CD" ;;
+	esac
+	# And the extended form percent-encodes it rather than emitting it raw.
+	case "$ODD_CD" in
+		*"filename*=UTF-8''"*%22*)
+			_pass "filename* percent-encodes the quote (%22)" ;;
+		*) _fail "filename* percent-encodes the quote" "got: $ODD_CD" ;;
+	esac
+	# One header line, not two: a smuggled CR/LF would show up as extra
+	# lines in the dump under the same name.
+	CD_LINES=$(tr -d '\r' < "$CURL_HEAD_FILE" | grep -ci '^content-disposition:')
+	_assert_eq "1" "$CD_LINES" "the odd name produces exactly one Content-Disposition line"
+else
+	_skip "Content-Disposition injection case (no odd-named fixture available)"
+fi
+
+# --- 13. Partfile guard. ---------------------------------------------
+# A partfile's on-disk layout is gapped and its offsets do not correspond
+# to the completed file's, so any window out of it would be silently wrong.
+# Refused outright rather than served partially.
+if  -n "$PART_HASH" ; then
+	_curl "${AUTH@}" "$API/shared/$PART_HASH/content"
+	_assert_status 409 "GET content of a partfile → 409"
+	_assert_json_eq '.error.code' partfile_unsupported \
+		"partfile → error.code=partfile_unsupported"
+else
+	_skip "partfile 409 guard (no incomplete shared file in the library)"
+fi
+
+# --- Summary. -----------------------------------------------------
+echo
+SKIP_NOTE=""
+ "$SKIP_COUNT" -gt 0  && SKIP_NOTE=" ($SKIP_COUNT check(s) skipped)"
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed$SKIP_NOTE"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/42-path-and-body-contracts.sh Added

@@ -0,0 +1,284 @@
+#!/usr/bin/env bash
+#
+# amuleapi 42-path-and-body-contracts — the two contracts that are stated
+# once and have to hold everywhere.
+#
+# 1. A `{hash}` that is not 32 hex characters is a MALFORMED REQUEST, so it
+#    answers `400 bad_request`, on every route that takes one. The
+#    every route runs the format check rather than falling through to its
+#    own `404`, so a client can tell "not a hash" from "valid hash, no such
+#    file", and a single route answers the same on both verbs:
+#    `GET /search/results/{hash}/comments` and its `POST` both answer `400`
+#    on a malformed hash. `{ecid}` has always drawn this line
+#    (`RequireEcidPath`); these are its hash twin.
+#
+# 2. A body field documented as an integer rejects a fractional value
+#    instead of truncating it. JSON has one number type, so `2.9` reaches
+#    the handler as a double and a bare cast turns a filter the client
+#    thinks it set into a different one.
+#
+# The `404` half of contract 1 is asserted too: a well-formed hash that
+# names nothing must still be `404`, or the guard would have turned every
+# missing file into a bad request.
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+# Well-formed, and nothing on this surface can hold it: 32 hex characters.
+ABSENT_HASH=00000000000000000000000000000000
+# Malformed three ways: too short, non-hex characters, right length but
+# with a non-hex character in it.
+SHORT_HASH=deadbeef
+NONHEX_HASH=zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
+ALMOST_HASH=0000000000000000000000000000000g
+
+FAIL_COUNT=0
+TEST_COUNT=0
+# Counted apart from TEST_COUNT: a skipped check is coverage that did not
+# happen, and folding it into the passed tally would report the absence of
+# a check as a check that succeeded.
+SKIP_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_42_contracts_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+_skip() { SKIP_COUNT=$((SKIP_COUNT+1)); echo "  SKIP  $1"; }
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+# A bare 400 does not prove the validator rejected the body: a daemon with
+# its networks disabled answers `400 amuled_rejected` to a perfectly
+# well-formed search or bootstrap. Every body-contract check below asserts
+# the error CODE too, so it means the same thing on a connected daemon and
+# on an idle one.
+_assert_bad_request() {
+	local label=$1
+	_assert_status 400 "$label"
+	_assert_json_eq '.error.code' bad_request "$label names bad_request"
+}
+
+_assert_json_eq() {
+	local expr=$1 expected=$2 label=$3
+	local actual
+	actual=$(printf '%s' "$CURL_BODY" | jq -r "$expr" 2>/dev/null) \
+		|| { _fail "$label" "body was not valid JSON" "body: $CURL_BODY"; return; }
+	if  "$actual" = "$expected" ; then
+		_pass "$label"
+	else
+		_fail "$label" "expected $expected, got $actual" "body: $CURL_BODY"
+	fi
+}
+
+if ! command -v jq >/dev/null 2>&1; then _die "jq is required."; fi
+
+echo "amuleapi 42-path-and-body-contracts smoke @ $HOST"
+
+ADMIN_TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" "$API/auth/login?include_token=true" | jq -r .token)
+ -n "$ADMIN_TOKEN"  &&  "$ADMIN_TOKEN" != "null"  || _die "admin login failed"
+AUTH="Authorization: Bearer $ADMIN_TOKEN"
+
+# --- 1. Malformed {hash} → 400 on every route that takes one. -----
+#
+# GET routes first, then the mutations. A mutation with a malformed hash
+# cannot have a side effect: the guard runs before any lookup, which is
+# also why it is safe to fire DELETE here.
+echo
+echo "  -- malformed {hash} → 400 --"
+
+for h in "$SHORT_HASH" "$NONHEX_HASH" "$ALMOST_HASH"; do
+	_curl -H "$AUTH" "$API/downloads/$h"
+	_assert_status 400 "GET /downloads/$h"
+	_assert_json_eq '.error.code' bad_request "GET /downloads/$h names bad_request"
+done
+
+_curl -H "$AUTH" "$API/downloads/$NONHEX_HASH/comments"
+_assert_status 400 "GET /downloads/{bad}/comments"
+
+_curl -H "$AUTH" "$API/shared/$NONHEX_HASH"
+_assert_status 400 "GET /shared/{bad}"
+
+_curl -X PATCH -H "$AUTH" -H "Content-Type: application/json" \
+	-d '{"priority":"high"}' "$API/downloads/$NONHEX_HASH"
+_assert_status 400 "PATCH /downloads/{bad}"
+
+_curl -X PATCH -H "$AUTH" -H "Content-Type: application/json" \
+	-d '{"priority":"high"}' "$API/shared/$NONHEX_HASH"
+_assert_status 400 "PATCH /shared/{bad}"
+
+_curl -X DELETE -H "$AUTH" "$API/downloads/$NONHEX_HASH"
+_assert_status 400 "DELETE /downloads/{bad}"
+
+# The route the split ran through: both methods on one path now agree.
+_curl -H "$AUTH" "$API/search/results/$NONHEX_HASH/comments"
+_assert_status 400 "GET /search/results/{bad}/comments"
+_curl -X POST -H "$AUTH" "$API/search/results/$NONHEX_HASH/comments"
+_assert_status 400 "POST /search/results/{bad}/comments (was already 400)"
+
+# The find-based routes: these fell through to their own lookup and answered
+# 404, so a client could not tell "not a hash" from "valid hash, no such file".
+# GET /downloads/{hash}/comments answered 400 while its own POST answered 404,
+# which is the within-route split this contract exists to prevent.
+_curl -H "$AUTH" "$API/downloads/$NONHEX_HASH/clients"
+_assert_status 400 "GET /downloads/{bad}/clients"
+_curl -H "$AUTH" "$API/shared/$NONHEX_HASH/clients"
+_assert_status 400 "GET /shared/{bad}/clients"
+_curl -X POST -H "$AUTH" "$API/downloads/$NONHEX_HASH/comments"
+_assert_status 400 "POST /downloads/{bad}/comments (matches its own GET)"
+_curl -H "$AUTH" "$API/downloads/$NONHEX_HASH/filenames"
+_assert_status 400 "GET /downloads/{bad}/filenames"
+_curl -X POST -H "$AUTH" -H "Content-Type: application/json" \
+	-d '{"action":"swap"}' "$API/downloads/$NONHEX_HASH/a4af"
+_assert_status 400 "POST /downloads/{bad}/a4af"
+_curl -H "$AUTH" "$API/shared/$NONHEX_HASH/content"
+_assert_status 400 "GET /shared/{bad}/content"
+_curl -X POST -H "$AUTH" "$API/shared/$NONHEX_HASH/media/refresh"
+_assert_status 400 "POST /shared/{bad}/media/refresh"
+_curl -X POST -H "$AUTH" "$API/shared/$NONHEX_HASH/verify"
+_assert_status 400 "POST /shared/{bad}/verify"
+
+# One message, not three. The two search routes carried their own wording
+# ("must be a 32-char hex MD4"), so a client matching on the message saw the
+# same condition described two ways depending on which route it hit.
+for URL in \
+	"downloads/$NONHEX_HASH" \
+	"downloads/$NONHEX_HASH/clients" \
+	"search/results/$NONHEX_HASH/comments" \
+	; do
+	_curl -H "$AUTH" "$API/$URL"
+	_assert_json_eq '.error.message' "path \`{hash}\` must be 32 hex characters" \
+		"/$URL states the shared {hash} message"
+done
+
+# --- 2. A well-formed hash that names nothing is still 404. -------
+#
+# The guard must reject the shape, not the lookup. If this ever turns into
+# a 400, "no such file" has been collapsed into "bad request" and the
+# distinction the section above exists for is gone in the other direction.
+echo
+echo "  -- well-formed but absent {hash} → 404 --"
+
+_curl -H "$AUTH" "$API/downloads/$ABSENT_HASH"
+_assert_status 404 "GET /downloads/{absent}"
+_curl -H "$AUTH" "$API/shared/$ABSENT_HASH"
+_assert_status 404 "GET /shared/{absent}"
+_curl -H "$AUTH" "$API/downloads/$ABSENT_HASH/comments"
+_assert_status 404 "GET /downloads/{absent}/comments"
+
+# --- 3. Integer body fields reject a fractional value. ------------
+echo
+echo "  -- fractional value where an integer is documented → 400 --"
+
+_curl -X POST -H "$AUTH" -H "Content-Type: application/json" \
+	-d '{"query":"contract-probe","min_size_bytes":2.9}' "$API/search"
+_assert_bad_request "POST /search (min_size_bytes 2.9)"
+_assert_json_eq '.error.message | test("integer")' true \
+	'the min_size_bytes 400 says an integer is wanted'
+
+_curl -X POST -H "$AUTH" -H "Content-Type: application/json" \
+	-d '{"query":"contract-probe","max_size_bytes":9.5}' "$API/search"
+_assert_bad_request "POST /search (max_size_bytes 9.5)"
+
+_curl -X POST -H "$AUTH" -H "Content-Type: application/json" \
+	-d '{"query":"contract-probe","min_source_count":1.5}' "$API/search"
+_assert_bad_request "POST /search (min_source_count 1.5)"
+
+_curl -X POST -H "$AUTH" -H "Content-Type: application/json" \
+	-d '{"ip":"127.0.0.1","port":4672.5}' "$API/kad/bootstrap"
+_assert_bad_request "POST /kad/bootstrap (fractional port)"
+
+_curl -X POST -H "$AUTH" -H "Content-Type: application/json" \
+	-d '{"ip":"203.0.113.42","port":4662.5}' "$API/friends"
+_assert_bad_request "POST /friends (fractional port)"
+
+# --- 4. One port contract on both routes that take one. -----------
+#
+# Port 0 is a 400 on both /kad/bootstrap and /friends. No Kad contact is
+# reachable on port 0, so accepting it would send a probe that goes nowhere.
+echo
+echo "  -- port 0 → 400 on both routes --"
+
+_curl -X POST -H "$AUTH" -H "Content-Type: application/json" \
+	-d '{"ip":"127.0.0.1","port":0}' "$API/kad/bootstrap"
+_assert_bad_request "POST /kad/bootstrap (port 0)"
+_assert_json_eq '.error.message | test("1\\.\\.65535")' true \
+	'the kad/bootstrap 400 quotes the shared 1..65535 range'
+
+_curl -X POST -H "$AUTH" -H "Content-Type: application/json" \
+	-d '{"ip":"203.0.113.42","port":0}' "$API/friends"
+_assert_bad_request "POST /friends (port 0)"
+_assert_json_eq '.error.message | test("1\\.\\.65535")' true \
+	'the friends 400 quotes the same range'
+
+# --- 5. Absence is spelled null, not a zero or an empty string. ---
+#
+# State-dependent, so each check skips when the daemon is not in the shape
+# that exercises it rather than asserting something it cannot know.
+echo
+echo "  -- absence reads as null --"
+
+_curl -H "$AUTH" "$API/kad"
+KAD_STATE=$(printf '%s' "$CURL_BODY" | jq -r '.state')
+if  "$KAD_STATE" = "disabled" ; then
+	_assert_json_eq '.node_id' null 'GET /kad node_id is null while Kad is stopped'
+else
+	_skip "GET /kad node_id null check: Kad state is \"$KAD_STATE\", not disabled"
+fi
+
+_curl -H "$AUTH" "$API/clients?limit=50"
+NOADDR_ECID=$(printf '%s' "$CURL_BODY" | jq -r 'first(.clients? | select(.ip == null) | .ecid) // empty')
+if  -n "$NOADDR_ECID" ; then
+	_curl -H "$AUTH" "$API/clients/$NOADDR_ECID"
+	_assert_json_eq '.kad_port' null 'client detail nulls kad_port with ip/port'
+else
+	_skip 'client detail kad_port check: every connected client has an address'
+fi
+
+# `last_received_at` is the partfile's last-changed stamp, which amuled sets
+# even for a download that has transferred nothing -- so "0 bytes received"
+# is NOT the never-case and cannot be used to find one. What the contract
+# forbids is the raw 0 itself: the serializer maps it to null, because a
+# unix 0 reads as 1970 rather than as "never". Assert that no row carries
+# one, which holds on any daemon state and fails the moment the mapping is
+# dropped.
+_curl -H "$AUTH" "$API/downloads?limit=200"
+_assert_json_eq '.downloads? | select(.last_received_at == 0) | length' 0 \
+	'no download reports last_received_at as a raw 0 (the never-case is null)'
+
+# --- Summary. -----------------------------------------------------
+echo
+SKIP_NOTE=""
+ "$SKIP_COUNT" -gt 0  && SKIP_NOTE=" ($SKIP_COUNT check(s) skipped -- see the SKIP lines above for why)"
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed$SKIP_NOTE"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/43-client-protocol-extensions.sh Added

@@ -0,0 +1,243 @@
+#!/usr/bin/env bash
+#
+# amuleapi 43-client-protocol-extensions — the peer capability word on the
+# REST surface.
+#
+# amuled publishes a peer's eMuleAI vendor capability word over EC as
+# EC_TAG_CLIENT_MOD_CAPABILITIES, and the desktop GUI renders it as its
+# "Protocol extensions" row. Without this field the EC surface and the REST
+# surface disagree about what is known of a peer, and a headless caller has
+# no way to see the word at all.
+#
+# What is asserted here:
+#
+#   * `protocol_extensions` is present on the /clients list row, on the
+#     /clients/{ecid} detail object, and in the client_* SSE payloads, so
+#     the three views of one peer do not disagree,
+#   * it is an array of tokens, not the bitfield the word arrives in: a
+#     caller must not have to carry its own copy of aMule's bit meanings,
+#     and a list rather than one token because a peer claims any
+#     combination of them,
+#   * every token is one the daemon defines. The daemon masks the word with
+#     MOD_MISCOPT_KNOWN_MASK (0x1F) before it reaches EC, so a token outside
+#     the known set means either the mask moved, the table in
+#     src/PeerCapabilities.h grew a row the serialiser does not know, or
+#     something re-derived the word downstream — which is the failure this
+#     field is most likely to have, and the one nothing else would notice,
+#   * the key is always present, never omitted:  is a real answer here
+#     (the peer claimed nothing, which nearly every peer does) and a caller
+#     must not have to tell it from a missing key.
+#
+# Note on an empty peer list: a fresh regtest daemon may be connected to no
+# peers, so the per-row assertions skip themselves rather than fail. Run
+# against a daemon with live sources to exercise them.
+#
+# Usage:
+#   amuleapi --config-dir=/tmp/amuleapi-regtest &
+#   ./43-client-protocol-extensions.sh
+#
+# Exits 0 on success, 1 on any failed assertion, 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+SKIP_COUNT=0
+AUTH=()
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_skip() { SKIP_COUNT=$((SKIP_COUNT+1)); echo "  SKIP  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 10 -D /tmp/amuleapi_43_head -o /tmp/amuleapi_43_body \
+		-w '%{http_code}' "${AUTH@}" "$@") || _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat /tmp/amuleapi_43_body)
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS"
+	fi
+}
+
+_jq() { echo "$CURL_BODY" | jq -r "$1" 2>/dev/null; }
+
+# The tokens the table in src/PeerCapabilities.h defines, in bit order. A row
+# added there without a matching entry here fails the membership check below,
+# which is the point: the two must not drift.
+KNOWN_TOKENS="extended_source_exchange nat_traversal_utp ipv6 serving_buddy_pull nat_traversal_quic"
+
+# The two properties every appearance of the field has to hold, wherever it
+# came from: it is an array, and every token in it is one the daemon defines.
+_assert_word() {
+	local where=$1 type=$2 value=$3
+
+	if  "$type" = "array" ; then
+		_pass "$where: protocol_extensions is an array of tokens"
+	else
+		_fail "$where" "expected an array, got type '$type'"
+		return
+	fi
+
+	local unknown=""
+	local token
+	for token in $(echo "$value" | jq -r '.' 2>/dev/null); do
+		case " $KNOWN_TOKENS " in
+			*" $token "*) ;;
+			*) unknown="$unknown $token" ;;
+		esac
+	done
+
+	if  -z "$unknown" ; then
+		_pass "$where: only defined tokens appear (tokens=$value)"
+	else
+		_fail "$where" \
+			"unknown token(s):$unknown" \
+			"the daemon masks in CPeerCapabilities::SetFromWire and names bits in" \
+			"CPeerCapabilities::Table(); a token here means the mask moved, the" \
+			"table grew a row this test does not know, or the word was re-derived"
+	fi
+}
+
+trap 'rm -f /tmp/amuleapi_43_head /tmp/amuleapi_43_body /tmp/amuleapi_43_sse' EXIT
+
+command -v jq >/dev/null 2>&1 || _die "jq is required"
+
+if ! curl -s -o /dev/null --max-time 2 "$API/health" 2>/dev/null; then
+	_die "amuleapi at $HOST is not reachable. Start amuleapi first."
+fi
+
+echo "amuleapi 43-client-protocol-extensions @ $HOST"
+
+# --- 0. Log in. ----------------------------------------------------
+TOKEN=$(curl -s -X POST -H "Content-Type: application/json" \
+	-d "{\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true" | jq -r .token)
+ -n "$TOKEN"  &&  "$TOKEN" != "null"  \
+	|| _die "could not log in for protocol-extension tests"
+AUTH=(-H "Authorization: Bearer $TOKEN")
+
+# --- 1. The list row. ----------------------------------------------
+_curl "$API/clients"
+_assert_status 200 "GET /clients"
+
+COUNT=$(_jq '.clients | length')
+COUNT=${COUNT:-0}
+echo "        ($COUNT peer(s) connected)"
+
+if  "$COUNT" -gt 0 ; then
+	if  "$(_jq '.clients0 | has("protocol_extensions")')" = "true" ; then
+		_pass "list row carries protocol_extensions"
+		_assert_word "list row" \
+			"$(_jq '.clients0.protocol_extensions | type')" \
+			"$(_jq '.clients0.protocol_extensions')"
+	else
+		_fail "list row" "no protocol_extensions key in: $(_jq '.clients0 | keys')"
+	fi
+
+	# Present on every row, not only the first: the key is unconditional, so
+	# a peer that claimed nothing still reports 0 rather than dropping it.
+	MISSING=$(_jq '.clients | select(has("protocol_extensions") | not) | length')
+	if  "${MISSING:-1}" -eq 0 ; then
+		_pass "every list row carries the key, including peers claiming nothing"
+	else
+		_fail "list rows" "$MISSING of $COUNT rows omit protocol_extensions"
+	fi
+
+	ECID=$(_jq '.clients0.ecid')
+else
+	_skip "list row shape (no peer connected)"
+	_skip "every list row carries the key (no peer connected)"
+	ECID=""
+fi
+
+# --- 2. The detail object. -----------------------------------------
+if  -n "$ECID"  &&  "$ECID" != "null" ; then
+	_curl "$API/clients/$ECID"
+	_assert_status 200 "GET /clients/$ECID"
+
+	if  "$(_jq 'has("protocol_extensions")')" = "true" ; then
+		_pass "detail object carries protocol_extensions"
+		_assert_word "detail object" \
+			"$(_jq '.protocol_extensions | type')" \
+			"$(_jq '.protocol_extensions')"
+	else
+		_fail "detail object" "no protocol_extensions key in: $(_jq 'keys')"
+	fi
+
+	# The detail object is documented as a superset of the list row, so the
+	# two must agree about this peer rather than merely both have the key.
+	_curl "$API/clients"
+	LIST_WORD=$(_jq ".clients | select(.ecid == $ECID) | .protocol_extensions")
+	_curl "$API/clients/$ECID"
+	DETAIL_WORD=$(_jq '.protocol_extensions')
+	if  "$LIST_WORD" = "$DETAIL_WORD" ; then
+		_pass "list and detail report the same word for ecid $ECID ($DETAIL_WORD)"
+	else
+		_fail "list vs detail" "list says '$LIST_WORD', detail says '$DETAIL_WORD'"
+	fi
+else
+	_skip "detail object shape (no peer connected)"
+	_skip "list and detail agree (no peer connected)"
+fi
+
+# --- 3. The SSE payload. -------------------------------------------
+# client_added / client_updated are documented to carry the same field set as
+# the list row. A field added to the REST writer and not to the diff writer
+# is exactly the failure that guarantee exists to catch, and it is invisible
+# from REST alone.
+curl -s --max-time 12 -N "${AUTH@}" \
+	"$API/events?filter=client_added,client_updated" \
+	> /tmp/amuleapi_43_sse 2>/dev/null &
+SSE_PID=$!
+sleep 10
+kill "$SSE_PID" 2>/dev/null
+wait "$SSE_PID" 2>/dev/null
+
+CLIENT_FRAME=$(grep '^data: ' /tmp/amuleapi_43_sse 2>/dev/null \
+	| sed 's/^data: //' \
+	| jq -c 'select(has("ecid"))' 2>/dev/null \
+	| head -1)
+
+if  -n "$CLIENT_FRAME" ; then
+	if  "$(echo "$CLIENT_FRAME" | jq -r 'has("protocol_extensions")')" = "true" ; then
+		_pass "client_* payload carries protocol_extensions"
+		_assert_word "SSE payload" \
+			"$(echo "$CLIENT_FRAME" | jq -r '.protocol_extensions | type')" \
+			"$(echo "$CLIENT_FRAME" | jq -r '.protocol_extensions')"
+	else
+		_fail "SSE payload" \
+			"no protocol_extensions in client payload: ${CLIENT_FRAME:0:200}" \
+			"the REST row and the diff writer have drifted apart"
+	fi
+else
+	_skip "SSE payload shape (no client event within the listen window)"
+	_skip "SSE payload word (no client event within the listen window)"
+fi
+
+echo
+SKIP_NOTE=""
+ "$SKIP_COUNT" -gt 0  && SKIP_NOTE=" ($SKIP_COUNT check(s) skipped)"
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "43-client-protocol-extensions: all $TEST_COUNT assertions passed$SKIP_NOTE"
+	exit 0
+fi
+echo "43-client-protocol-extensions: $FAIL_COUNT of $TEST_COUNT assertions FAILED"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/99-peer-fixture-teardown.sh Added

@@ -0,0 +1,175 @@
+#!/usr/bin/env bash
+#
+# amuleapi 99-peer-fixture-teardown - undo 00-peer-fixture.
+#
+# The fixture is the one thing in the run that is a real file off the real
+# network. Left behind it keeps downloading after the suite exits.
+#
+# Three end states, because which one occurs depends on transfer speed and on
+# whether 13's blanket clear_completed ran while the fixture was finished:
+#
+#   still downloading  -> DELETE /downloads/{hash} (drops the partfile too)
+#   completed, listed  -> clear_completed {hash}, then unlink from Incoming
+#   completed, swept   -> no queue entry at all, but the file is in Incoming
+#
+# The last is why the handoff records the name: after a sweep the API can no
+# longer say what the download was called.
+#
+# Usage:
+#   ./99-peer-fixture-teardown.sh     # via run-all.sh, as the final phase
+#
+# Environment:
+#   HOST=localhost:4713               amuleapi endpoint
+#   ADMIN_PASS=adminpass              admin credential
+#   PEER_FIXTURE_STATE=/tmp/amuleapi-peer-fixture   handoff file from 00
+#
+# Exits non-zero only if a provisioned fixture could not be removed. That IS a
+# failure: a run that leaves a live transfer behind has changed the machine it
+# was testing on.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4713}
+API="$HOST/api/v1"
+ADMIN_PASS=${ADMIN_PASS:-adminpass}
+STATE=${PEER_FIXTURE_STATE:-/tmp/amuleapi-peer-fixture}
+
+FAIL_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleapi_99_peer_fixture_body.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_ok()   { echo "  OK    $1"; }
+_fail() {
+	FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --max-time 15 -o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+echo "amuleapi 99-peer-fixture-teardown @ $HOST"
+
+if  ! -f "$STATE" ; then
+	echo "  nothing to undo (no $STATE -- 00-peer-fixture did not provision)"
+	echo "99-peer-fixture-teardown: nothing to do"
+	exit 0
+fi
+
+# Parsed by hand rather than sourced so a mangled file cannot execute anything.
+FIX_HASH=$(sed -n 's/^hash=//p' "$STATE" | head -1)
+FIX_NAME=$(sed -n 's/^name=//p' "$STATE" | head -1)
+ -n "$FIX_HASH"  || _die "$STATE exists but carries no hash= line"
+echo "  fixture: $FIX_HASH ($FIX_NAME)"
+
+_curl -X POST -H 'Content-Type: application/json' \
+	-d "{\"username\":\"admin\",\"password\":\"$ADMIN_PASS\"}" \
+	"$API/auth/login?include_token=true"
+ "$CURL_STATUS" = "200"  || _die "admin login failed (HTTP $CURL_STATUS)"
+TOKEN=$(printf '%s' "$CURL_BODY" | jq -r '.token // empty')
+ -n "$TOKEN"  || _die "admin login returned no token"
+AUTH="Authorization: Bearer $TOKEN"
+
+# Resolved first so a preferences problem cannot look like a delete problem.
+_curl -H "$AUTH" "$API/preferences"
+INCOMING=$(printf '%s' "$CURL_BODY" | jq -r '.directories.incoming_path // empty')
+
+# status=all matters: the default list hides completed entries, and a completed
+# fixture is exactly the case that needs the file unlinked.
+_curl -H "$AUTH" "$API/downloads?status=all"
+STATUS=$(printf '%s' "$CURL_BODY" \
+	| jq -r --arg h "$FIX_HASH" '.downloads | select(.hash == $h) | .status0 // "absent"')
+# amuled saves under a different name when one already exists, so trust it over
+# the search result's name.
+LIVE_NAME=$(printf '%s' "$CURL_BODY" \
+	| jq -r --arg h "$FIX_HASH" '.downloads | select(.hash == $h) | .name0 // empty')
+ -n "$LIVE_NAME"  && FIX_NAME=$LIVE_NAME
+echo "  queue status: $STATUS"
+
+case "$STATUS" in
+absent)
+	_ok "no queue entry to remove"
+	;;
+completed)
+	_curl -X POST -H "$AUTH" -H 'Content-Type: application/json' \
+		-d "{\"hash\":\"$FIX_HASH\"}" "$API/downloads_clear_completed"
+	if  "$CURL_STATUS" = "200" ; then
+		_ok "cleared completed fixture from the queue"
+	else
+		_fail "clear_completed {hash:fixture}" \
+			"expected HTTP 200, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+	;;
+*)
+	_curl -X DELETE -H "$AUTH" "$API/downloads/$FIX_HASH"
+	if  "$CURL_STATUS" = "204" ; then
+		_ok "deleted the in-progress fixture download"
+	else
+		_fail "DELETE /downloads/{fixture}" \
+			"expected HTTP 204, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+	# 204 while the entry survives is the bug that leaves a transfer running.
+	_curl -H "$AUTH" "$API/downloads?status=all"
+	GONE=$(printf '%s' "$CURL_BODY" \
+		| jq -r --arg h "$FIX_HASH" '.downloads | select(.hash == $h) | length')
+	if  "${GONE:-1}" = "0" ; then
+		_ok "fixture no longer in /downloads?status=all"
+	else
+		_fail "fixture still queued after DELETE" \
+			"a live transfer would outlive this suite run"
+	fi
+	;;
+esac
+
+# Unlink exactly one path, built from the daemon's own incoming_path and the
+# entry's own name, and only when it is a regular file. basename defends
+# against a name carrying a separator: the cost of being wrong is an unlink
+# outside Incoming.
+if  -n "$INCOMING"  &&  -n "$FIX_NAME" ; then
+	CANDIDATE="$INCOMING/$(basename "$FIX_NAME")"
+	if  -f "$CANDIDATE" ; then
+		if rm -f "$CANDIDATE"; then
+			_ok "removed completed fixture file $CANDIDATE"
+			# amuled shares a completed download and unlinking does not
+			# retract that, so the share survives pointing at a path
+			# that is gone. 17-shared-priority-patch renames shared0
+			# and failed three assertions on it until 36's reload
+			# cleaned up, nineteen phases too late.
+			_curl -X POST -H "$AUTH" "$API/shared_reload"
+			case "$CURL_STATUS" in
+			200 | 202) _ok "reloaded shares so amuled drops the stale entry" ;;
+			*) _fail "POST /shared_reload" \
+				"expected HTTP 202, got $CURL_STATUS" \
+				"a share pointing at the deleted file survives into the next run" ;;
+			esac
+		else
+			_fail "could not remove $CANDIDATE" \
+				"the fixture file is still in the incoming directory"
+		fi
+	else
+		_ok "no fixture file in $INCOMING (download never completed)"
+	fi
+else
+	echo "  note: incoming_path unavailable; cannot check for a completed file"
+fi
+
+rm -f "$STATE"
+
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "99-peer-fixture-teardown: fixture removed"
+	exit 0
+fi
+echo "99-peer-fixture-teardown: $FAIL_COUNT cleanup step(s) FAILED"
+exit 1

amule-3.1.0.tar.gz/unittests/curl-tests/amuleapi/run-all.sh Added

@@ -0,0 +1,306 @@
+#!/usr/bin/env bash
+#
+# Orchestrator for the amuleapi curl-smoke matrix.
+#
+# Brings up a fresh amuleapi daemon for each script, runs the
+# script, and aggregates pass/fail. The fresh-daemon-per-script
+# pattern isolates state — most importantly, 02-auth.sh fires the
+# rate-limit lockout (5 failed logins → 300 s IP lockout) which would
+# block every subsequent script's /auth/login. Restarting wipes the
+# in-memory CRateLimiter buckets.
+#
+# Setup per phase:
+#   1. pkill any running amuleapi
+#   2. wipe + recreate /tmp/amuleapi-regtest config dir
+#   3. set admin pass (one-shot CLI invocation, daemon exits)
+#   4. set guest pass (second one-shot — App.cpp's set-pass paths are
+#      mutually exclusive, so admin and guest need separate runs)
+#   5. start the daemon in foreground, log to /tmp/amuleapi.log
+#   6. sleep 5 s for the refresher to populate its caches (first
+#      GET_UPDATE tick is the heaviest — sends every alive ECID with
+#      full identity)
+#   7. run the phase script
+#
+# Usage:
+#   ./run-all.sh                                                 # run every script in
+#                                                                # the canonical order
+#   ./run-all.sh 12-downloads-add-patch.sh 13-downloads-delete-clear.sh  # run a subset
+
+set -u
+
+# Resolve our location so the orchestrator runs from any cwd.
+SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
+
+# Locate the repo root by climbing out of unittests/curl-tests/amuleapi/.
+# AMULEAPI_ROOT remains an env override for unusual layouts; the default
+# follows the script's own location so anyone who checks the repo out
+# elsewhere works without editing this file.
+ROOT="${AMULEAPI_ROOT:-$(cd "$SCRIPT_DIR/../../.." && pwd)}"
+# Locate the amuleapi binary the sub-instances need. Deliberately NOT falling
+# back to PATH: an installed package would silently be tested in place of the
+# working tree, which is worse than not finding anything. Set AMULEAPI_BIN to
+# point somewhere else on purpose.
+#
+# Any build*/ directory counts, not a fixed list of three: per-branch and
+# per-arch trees are normal, and a name this function has never heard of used
+# to mean a silent skip. Where several exist the NEWEST wins -- picking the
+# first match let a stale build/ supply the binary while the tree under test
+# was built somewhere else, which is the one failure mode that produces a
+# confident wrong answer rather than a missing one. Unmatched globs stay
+# literal and fail the -x test, so no nullglob is needed.
+_find_amuleapi_bin() {
+	local root=$1 c best=
+	for c in "$root"/src/webapi/amuleapi \
+		"$root"/build*/src/webapi/amuleapi \
+		"$root"/_build/src/webapi/amuleapi \
+		"$root"/cmake-build-*/src/webapi/amuleapi; do
+		 -x "$c"  || continue
+		if  -z "$best"  ||  "$c" -nt "$best" ; then
+			best=$c
+		fi
+	done
+	 -n "$best"  || return 1
+	echo "$best"
+}
+
+BIN="${AMULEAPI_BIN:-$(_find_amuleapi_bin "$ROOT")}"
+
+# The daemon every phase talks to. Overridable so the whole suite can be
+# pointed at a daemon that is not on the stock EC port.
+EC_HOST=${EC_HOST:-127.0.0.1}
+EC_PORT=${EC_PORT:-4712}
+EC_PASSWORD=${EC_PASSWORD:-amule}
+
+if  ! -x "$BIN" ; then
+	echo "FATAL: no usable amuleapi binary under $ROOT." >&2
+	echo "       set AMULEAPI_BIN to point at one." >&2
+	exit 2
+fi
+# Print what was resolved, not what was requested: with several build
+# trees around, which one this run actually exercised is the first thing
+# to check when a result looks wrong.
+echo "bin=$BIN"
+
+# One stable 256-bit JWT secret (64 hex chars) reused by every phase's
+# daemon. See run_phase: a fixed secret makes a brief instance overlap
+# on the port harmless instead of a token-verification failure.
+JWT_SECRET=$(od -An -tx1 -N32 /dev/urandom | tr -d ' \n')
+
+run_phase() {
+	local script=$1
+	echo "==================== $script ===================="
+	# Narrowly target the regtest daemon so a dev who happens to have
+	# `vim path/to/amuleapi.cpp` open doesn't get their editor killed.
+	# The config-dir suffix is uniquely ours.
+	#
+	# Tear down the previous phase's daemon CLEANLY before reusing port
+	# 4713. A bare `pkill; sleep 1` races graceful shutdown: amuleapi
+	# binds with SO_REUSEADDR, so a lingering old instance can briefly
+	# share the port with the new one. Each phase regenerates its config
+	# dir (and its JWT secret), so during that overlap a token minted by
+	# one instance is rejected by the other ("invalid or expired token").
+	# Wait for every matching process to exit, escalating to SIGKILL, and
+	# for the listen socket to be released.
+	local pat="amuleapi --config-dir=/tmp/amuleapi-regtest"
+	pkill -f "$pat" 2>/dev/null
+	local w
+	for w in $(seq 1 40); do
+		pgrep -f "$pat" >/dev/null 2>&1 || break
+		sleep 0.25
+	done
+	if pgrep -f "$pat" >/dev/null 2>&1; then
+		pkill -9 -f "$pat" 2>/dev/null
+		for w in $(seq 1 20); do
+			pgrep -f "$pat" >/dev/null 2>&1 || break
+			sleep 0.25
+		done
+	fi
+	for w in $(seq 1 40); do
+		ss -tln 2>/dev/null | grep -q ":4713 " || break
+		sleep 0.25
+	done
+	rm -rf /tmp/amuleapi-regtest
+	mkdir -p /tmp/amuleapi-regtest
+	# Pin a stable JWT secret for every phase (belt-and-suspenders with
+	# the clean teardown above): if two instances ever do overlap on the
+	# port, they share the secret, so a freshly-minted token still
+	# verifies regardless of which instance answers. amuleapi loads this
+	# file as-is instead of generating a per-process secret.
+	printf '%s' "$JWT_SECRET" > /tmp/amuleapi-regtest/amuleapi-jwt-secret
+	chmod 600 /tmp/amuleapi-regtest/amuleapi-jwt-secret
+	# The first of these also writes a defaults amuleapi.conf, which the
+	# EC password is seeded into below. Neither connects to amuled -- they
+	# write the credential file and exit -- so no EC settings are needed
+	# here at all.
+	"$BIN" --config-dir=/tmp/amuleapi-regtest \
+		--set-admin-pass=adminpass > /dev/null 2>&1
+	"$BIN" --config-dir=/tmp/amuleapi-regtest \
+		--set-guest-pass=guestpass > /dev/null 2>&1
+	# amuleapi has no --password: it takes the EC credential from the
+	# ephemeral token the core writes when it spawns amuleapi, or from
+	# amuleapi.conf. Nothing spawns it here, so seed the config file.
+	sed -i'.bak' "s|^Password=.*|Password=$EC_PASSWORD|" /tmp/amuleapi-regtest/amuleapi.conf
+	rm -f /tmp/amuleapi-regtest/amuleapi.conf.bak
+	# 27-static-frontend exercises the static-frontend serve path, and
+	# 40-http-conformance asserts the trailing-slash rule stops at the
+	# API prefix by checking the static root still answers 200 -- which
+	# it cannot do with StaticRoot unset. Both therefore need it wired.
+	#
+	# 27 plants symlinks + an oversized file into StaticRoot during the
+	# run, so the dir has to be writable. The bundled source tree is
+	# read-only in container CI; copy the placeholder out to a /tmp
+	# scratch dir and point StaticRoot at the copy. Every other script
+	# leaves it unset, which is what keeps the install-path discovery
+	# chain exercised: these two pin it, the rest do not.
+	if  "$script" = "27-static-frontend.sh"  ||  "$script" = "40-http-conformance.sh" ; then
+		STATIC_SRC="$ROOT/src/webapi/static"
+		STATIC_DIR=/tmp/amuleapi-static-frontend
+		rm -rf "$STATIC_DIR"
+		mkdir -p "$STATIC_DIR"
+		if  -d "$STATIC_SRC" ; then
+			cp -R "$STATIC_SRC"/. "$STATIC_DIR/"
+		fi
+		sed -i'.bak' \
+			"s|^StaticRoot=.*|StaticRoot=$STATIC_DIR|" \
+			/tmp/amuleapi-regtest/amuleapi.conf
+		rm -f /tmp/amuleapi-regtest/amuleapi.conf.bak
+	fi
+	"$BIN" --config-dir=/tmp/amuleapi-regtest \
+		--host="$EC_HOST" --port="$EC_PORT" \
+		> /tmp/amuleapi.log 2>&1 &
+	# Poll /health until the daemon is ready instead of guessing the
+	# cold-start time. The first EC GET_UPDATE roundtrip can take a
+	# couple of seconds on a slow CI runner, and the cap of 12 leaves
+	# headroom while still failing fast on a genuine bring-up bug.
+	local i
+	for i in 1 2 3 4 5 6 7 8 9 10 11 12; do
+		if curl -s -o /dev/null --max-time 1 \
+		    http://localhost:4713/api/v1/health 2>/dev/null; then
+			break
+		fi
+		sleep 0.5
+	done
+	# Scripts that bounce the daemon themselves (25-cors.sh rewrites
+	# amuleapi.conf to flip CORS modes) read these envs to know how
+	# to restart cleanly. AMULE_SHARED_DIR lets a phase self-provision
+	# a shared-file fixture (17-shared-priority-patch): it points at a
+	# directory the connected amuled shares (its Incoming, typically),
+	# so the smoke doesn't depend on the operator's library already
+	# holding a shared file. Unset is fine unless a phase needs it.
+	AMULEAPI_BIN="$BIN" \
+	EC_HOST="$EC_HOST" EC_PORT="$EC_PORT" EC_PASSWORD="$EC_PASSWORD" \
+	AMULEAPI_CONFIG_DIR=/tmp/amuleapi-regtest \
+	AMULEAPI_LOG=/tmp/amuleapi.log \
+	AMULE_SHARED_DIR="${AMULE_SHARED_DIR:-}" \
+	bash "$SCRIPT_DIR/$script"
+	local rc=$?
+	echo "$script exit=$rc"
+	# If a script failed AND the daemon is currently rate-limiting,
+	# the operator likely hit the 02-auth fallout: 7 deliberate
+	# wrong-password attempts armed a 5-minute IP lockout that later
+	# scripts inherit when the orchestrator's daemon restart isn't
+	# enough to clear the in-memory bucket. Print a one-line tip so
+	# the operator doesn't lose half an hour chasing the wrong layer.
+	if  "$rc" -ne 0 ; then
+		local probe=$(curl -s -X POST -H "Content-Type: application/json" \
+			-o /dev/null -w "%{http_code}" \
+			-d "{\"password\":\"adminpass\"}" \
+			http://localhost:4713/api/v1/auth/login 2>/dev/null)
+		if  "$probe" = "429" ; then
+			echo "TIP: amuleapi is currently rate-limiting login (HTTP 429)." \
+			     "If you ran 02-auth.sh right before this, that's the 7-bad-pass" \
+			     "arm carried over. Restart amuleapi (kills the bucket)" \
+			     "before re-running."
+		fi
+	fi
+	return $rc
+}
+
+# Canonical execution order. Numeric prefix doubles as dependency
+# ordering: auth before any mutation, refresher-consolidation tests
+# before later read tests that rely on the consolidated tick shape,
+# CORS / static-frontend after the API surface tests so failures in
+# the new transports don't mask earlier regressions.
+#
+# 00-peer-fixture and 99-peer-fixture-teardown bracket the run: the first
+# promotes a real search hit into the transfer queue so the source-dependent
+# checks (04, 33, 43) have a download a peer will actually connect to, the
+# last removes it again. Neither asserts anything, and 00 is non-fatal -- with
+# no network it prints a banner and those checks skip as they always did.
+# A subset run (`./run-all.sh 04-...`) replaces this list wholesale, so it gets
+# no fixture and no teardown; name 00 and 99 explicitly to exercise that path.
+PHASES=(
+	00-peer-fixture.sh
+	01-version-and-errors.sh
+	02-auth.sh
+	02b-auth-lockout-isolation.sh
+	03-read-status.sh
+	04-read-downloads-shared.sh
+	05-read-servers-kad-categories-prefs.sh
+	06-read-logs.sh
+	07-read-stats-and-search-results.sh
+	08-read-download-parts.sh
+	09-refresher-consolidation.sh
+	10-refresher-lazy-ondemand.sh
+	11-downloads-default-filter.sh
+	12-downloads-add-patch.sh
+	13-downloads-delete-clear.sh
+	14-servers-mutations.sh
+	15-preferences-patch.sh
+	16-networks-connect.sh
+	17-shared-priority-patch.sh
+	18-categories-crud.sh
+	19-search.sh
+	20-etag-conditional-get.sh
+	21-sse-heartbeat.sh
+	22-sse-diff-emission.sh
+	23-sse-replay.sh
+	24-sse-resync.sh
+	25-cors.sh
+	26-rfc-followup-endpoints.sh
+	27-static-frontend.sh
+	28-list-pagination-sort.sh
+	29-bulk-mutations.sh
+	30-shared-verify.sh
+	31-shared-directories.sh
+	32-country-flags.sh
+	33-known-clients.sh
+	34-friends.sh
+	35-ipfilter-actions.sh
+	36-shared-reload.sh
+	37-shared-availability-parts.sh
+	38-chat.sh
+	39-shared-media-refresh.sh
+	40-http-conformance.sh
+	41-shared-content.sh
+	42-path-and-body-contracts.sh
+	43-client-protocol-extensions.sh
+	99-peer-fixture-teardown.sh
+)
+
+# Override list from the command line if given.
+if  "$#" -gt 0 ; then
+	PHASES=("$@")
+fi
+
+OVERALL=0
+for s in "${PHASES@}"; do
+	if  ! -f "$SCRIPT_DIR/$s" ; then
+		echo "skip $s (not present in $SCRIPT_DIR)"
+		continue
+	fi
+	if ! run_phase "$s"; then
+		OVERALL=1
+	fi
+done
+
+# Final teardown — same narrow scope as the per-phase kill at line 53
+# so an editor with `vim path/to/amuleapi.cpp` open survives the run.
+pkill -f "amuleapi --config-dir=/tmp/amuleapi-regtest" 2>/dev/null
+echo
+if  "$OVERALL" -eq 0 ; then
+	echo "OVERALL: ALL PHASES PASSED"
+else
+	echo "OVERALL: ONE OR MORE PHASES FAILED"
+fi
+exit "$OVERALL"

amule-3.1.0.tar.gz/unittests/curl-tests/amuleweb-smoke Added

amule-3.1.0.tar.gz/unittests/curl-tests/amuleweb-smoke/phase0.sh Added

@@ -0,0 +1,130 @@
+#!/usr/bin/env bash
+#
+# Amuleweb smoke test — runs against a stock amuleweb (PHP frontend on
+# port 4711, default template) and checks the four pages that exercise
+# the legacy path. This branch (the amuleapi work) explicitly does NOT
+# touch amuleweb's source; this script's job is to catch any
+# unintended cross-cut — e.g. someone misconfigures the CMake graph
+# such that the legacy binary changes behaviour, or a libwebcommon
+# header bleeds an include into a PHP TU.
+#
+# Usage:
+#   amuleweb --no-php-checks &     # start amuleweb on :4711
+#   ./phase0.sh                    # asserts the four landing pages
+#
+# Environment:
+#   HOST=localhost:4711       amuleweb endpoint
+#   PASS=x                    amuleweb full-access password (matches
+#                             amuleweb's `--admin-pass` / remote.conf)
+#
+# Exits 0 on success, 1 on any failed assertion, 2 on bring-up error.
+
+set -u
+set -o pipefail
+
+HOST=${HOST:-localhost:4711}
+PASS=${PASS:-x}
+
+FAIL_COUNT=0
+TEST_COUNT=0
+
+CURL_BODY_FILE=$(mktemp -t amuleweb_smoke_body.XXXXXX)
+CURL_HEADERS_FILE=$(mktemp -t amuleweb_smoke_headers.XXXXXX)
+COOKIE_JAR=$(mktemp -t amuleweb_smoke_cookies.XXXXXX)
+trap 'rm -f "$CURL_BODY_FILE" "$CURL_HEADERS_FILE" "$COOKIE_JAR"' EXIT
+
+_die()  { echo "FATAL: $*" >&2; exit 2; }
+_pass() { TEST_COUNT=$((TEST_COUNT+1)); echo "  PASS  $1"; }
+_fail() {
+	TEST_COUNT=$((TEST_COUNT+1)); FAIL_COUNT=$((FAIL_COUNT+1))
+	echo "  FAIL  $1"
+	shift
+	for arg in "$@"; do echo "        $arg"; done
+}
+
+_curl() {
+	local resp
+	resp=$(curl -s --compressed --max-time 10 \
+		-b "$COOKIE_JAR" -c "$COOKIE_JAR" \
+		-o "$CURL_BODY_FILE" -w '%{http_code}' "$@") \
+		|| _die "curl invocation failed for $*"
+	CURL_STATUS=$resp
+	CURL_BODY=$(cat "$CURL_BODY_FILE")
+}
+
+_assert_status() {
+	local expected=$1 label=$2
+	if  "$CURL_STATUS" = "$expected" ; then
+		_pass "$label (HTTP $CURL_STATUS)"
+	else
+		_fail "$label" "expected HTTP $expected, got $CURL_STATUS" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+_assert_body_contains() {
+	local needle=$1 label=$2
+	if printf '%s' "$CURL_BODY" | grep -q -- "$needle"; then
+		_pass "$label"
+	else
+		_fail "$label" "needle '$needle' not found" \
+			"body head: $(printf '%s' "$CURL_BODY" | head -c 200)"
+	fi
+}
+
+# Preflight: amuleweb up?
+if ! curl -s -o /dev/null --max-time 2 "$HOST/" 2>/dev/null; then
+	_die "amuleweb at $HOST is not reachable. Start amuled + amuleweb first."
+fi
+
+echo "amuleweb smoke @ $HOST"
+
+# 1. /login.php — the unauthenticated landing page. The PHP template
+#    renders the login form; we just need a 200 + a hint that the form
+#    rendered. amuleweb's default template emits the `<input type="password"
+#    name="pass"` element, which is what the user actually types into.
+_curl "$HOST/login.php"
+_assert_status 200 "GET /login.php returns 200"
+_assert_body_contains 'name="pass"' "/login.php renders password input"
+
+# 2. /amuleweb-main-dload.php (downloads list) before login → must
+#    redirect / 401 / serve the login page. amuleweb's default template
+#    redirects to /login.php on missing session, which curl follows
+#    with -L; without -L we get a 302. Either is acceptable for the
+#    smoke check; we just want NOT 5xx.
+_curl "$HOST/amuleweb-main-dload.php"
+case "$CURL_STATUS" in
+	200|302|401) _pass "GET /amuleweb-main-dload.php pre-login (HTTP $CURL_STATUS)" ;;
+	*)           _fail "GET /amuleweb-main-dload.php pre-login" \
+	                 "unexpected status $CURL_STATUS" ;;
+esac
+
+# 3. POST /login.php with the configured password → 200 + sets a
+#    PHP session cookie. amuleweb's session cookie name is `amuleweb_*`.
+_curl -X POST -d "pass=$PASS" "$HOST/login.php"
+_assert_status 200 "POST /login.php with admin password"
+if grep -q '^amuleweb_' "$COOKIE_JAR" 2>/dev/null \
+   || grep -qi 'session' "$COOKIE_JAR" 2>/dev/null; then
+	_pass "POST /login.php sets a session cookie"
+else
+	_fail "POST /login.php sets a session cookie" \
+		"no session cookie found in jar" \
+		"jar: $(cat "$COOKIE_JAR" 2>/dev/null | head -c 400)"
+fi
+
+# 4. /amuleweb-main-dload.php after login → 200 + table markup. The
+#    default template emits a `<table` for the download list. If
+#    amuleweb's PHP path is broken (the carve-out scenario this script
+#    guards against), this is where it shows up.
+_curl "$HOST/amuleweb-main-dload.php"
+_assert_status 200 "GET /amuleweb-main-dload.php post-login"
+_assert_body_contains '<table' "/amuleweb-main-dload.php renders a table"
+
+# Summary.
+echo
+if  "$FAIL_COUNT" -eq 0 ; then
+	echo "OK: $TEST_COUNT/$TEST_COUNT passed"
+	exit 0
+fi
+echo "FAIL: $FAIL_COUNT/$TEST_COUNT failed"
+exit 1

amule-3.0.1.tar.gz/unittests/muleunit/main.cpp -> amule-3.1.0.tar.gz/unittests/muleunit/main.cpp Changed

@@ -31,13 +31,10 @@
 	return "UnitTest";
 }
 
-
 unsigned s_disableAssertions = 0;
 
-
-static void MuleUnitAssertHandler(const wxString& file, int line,
-                                  const wxString& /*func*/, const wxString& cond,
-                                  const wxString& msg)
+static void MuleUnitAssertHandler(
+	const wxString &file, int line, const wxString & /*func*/, const wxString &cond, const wxString &msg)
 {
 	if (s_disableAssertions) {
 		return;
@@ -55,31 +52,25 @@
 	throw CAssertFailureException(desc, file, line);
 }
 
-
 class UnitTestApp : public wxAppConsole
 {
 public:
-	bool OnInit() override {
+	bool OnInit() override
+	{
 		// In Release builds (NDEBUG), wxIMPLEMENT_APP_CONSOLE auto-calls
-		// wxDISABLE_DEBUG_SUPPORT(), which nulls wxTheAssertHandler. Without
-		// re-enabling, wxASSERT short-circuits before reaching OnAssertFailure
-		// and ASSERT_RAISES tests fail on platforms where wxDEBUG_LEVEL >= 1
-		// at compile time (Linux, mingw-w64). Install our handler explicitly.
+		// wxDISABLE_DEBUG_SUPPORT(), which nulls wxTheAssertHandler. Without re-enabling
+		// it, wxASSERT short-circuits before reaching OnAssertFailure and ASSERT_RAISES
+		// tests fail on platforms where wxDEBUG_LEVEL >= 1 at compile time (Linux,
+		// mingw-w64). Install our handler explicitly.
 		wxSetAssertHandler(MuleUnitAssertHandler);
 		return wxAppConsole::OnInit();
 	}
 
-	int OnRun() override {
-		return (TestRegistry::runAndPrint() ? 0 : 1);
-	}
+	int OnRun() override { return (TestRegistry::runAndPrint() ? 0 : 1); }
 
 #ifndef __WXMSW__
-	void OnUnhandledException() override {
-		::OnUnhandledException();
-	}
+	void OnUnhandledException() override { ::OnUnhandledException(); }
 #endif
-
 };
 
-
 IMPLEMENT_APP_CONSOLE(UnitTestApp);

amule-3.0.1.tar.gz/unittests/muleunit/test.cpp -> amule-3.1.0.tar.gz/unittests/muleunit/test.cpp Changed

@@ -28,10 +28,10 @@
 /** Entry for a context. */
 struct BTEntry
 {
-	BTEntry(const wxString& f, int l, const wxString& m)
-		: file(f)
-		, line(l)
-		, msg(m)
+	BTEntry(const wxString &f, int l, const wxString &m)
+	: file(f)
+	, line(l)
+	, msg(m)
 	{
 	}
 
@@ -40,30 +40,29 @@
 	wxString msg;
 };
 
-
 static std::list<BTEntry> g_backtrace;
 
-namespace muleunit {
-	/** Structure used to contain a snapshot of the contexts. */
-	struct BTList
+namespace muleunit
+{
+/** Structure used to contain a snapshot of the contexts. */
+struct BTList
+{
+	BTList(const std::list<BTEntry> &lst)
+	: snapshot(lst)
 	{
-		BTList(const std::list<BTEntry>& lst)
-			: snapshot(lst)
-		{
-		}
-
-		std::list<BTEntry> snapshot;
-	};
-}
+	}
 
+	std::list<BTEntry> snapshot;
+};
+} // namespace muleunit
 
-CTestFailureException::CTestFailureException(const wxString& msg, const wxString& file, long lineNumber)
-	: m_bt(std::make_shared<BTList>(g_backtrace)), m_message(msg.ToAscii())
+CTestFailureException::CTestFailureException(const wxString &msg, const wxString &file, long lineNumber)
+: m_bt(std::make_shared<BTList>(g_backtrace))
+, m_message(msg.ToAscii())
 {
 	m_bt->snapshot.push_back(BTEntry(file, lineNumber, msg));
 }
 
-
 void CTestFailureException::PrintBT() const
 {
 	wxString indent = "\t\t";
@@ -75,19 +74,16 @@
 	}
 }
 
-
-const char* CTestFailureException::what () const noexcept
+const char *CTestFailureException::what() const noexcept
 {
 	return m_message.c_str();
 }
 
-
-CContext::CContext(const wxString& file, int line, const wxString& msg)
+CContext::CContext(const wxString &file, int line, const wxString &msg)
 {
 	g_backtrace.push_back(BTEntry(file, line, msg));
 }
 
-
 CContext::~CContext()
 {
 	g_backtrace.pop_back();
@@ -95,7 +91,6 @@
 
 extern unsigned s_disableAssertions;
 
-
 CAssertOff::CAssertOff()
 {
 	s_disableAssertions++;
@@ -106,44 +101,27 @@
 	s_disableAssertions--;
 }
 
-
-
-Test::Test(const wxString& testCaseName, const wxString& testName)
-		: m_testCaseName(testCaseName),
-		  m_testName(testName)
+Test::Test(const wxString &testCaseName, const wxString &testName)
+: m_testCaseName(testCaseName)
+, m_testName(testName)
 {
 	TestRegistry::addTest(this);
 }
 
+Test::~Test() {}
 
-Test::~Test()
-{
-}
-
-
-void Test::setUp()
-{
-}
-
-
-void Test::tearDown()
-{
-}
+void Test::setUp() {}
 
+void Test::tearDown() {}
 
-void Test::run()
-{
-}
+void Test::run() {}
 
-
-const wxString& Test::getTestName() const
+const wxString &Test::getTestName() const
 {
 	return m_testName;
 }
 
-
-const wxString& Test::getTestCaseName() const
+const wxString &Test::getTestCaseName() const
 {
 	return m_testCaseName;
 }
-

amule-3.0.1.tar.gz/unittests/muleunit/test.h -> amule-3.1.0.tar.gz/unittests/muleunit/test.h Changed

@@ -30,10 +30,8 @@
 #include <string>
 #include <wx/wxcrt.h>
 
-
 /**
- * MuleUnit namespace.
- * This is the namespace containing all muleunit classes.
+ * MuleUnit namespace, holding all muleunit classes.
  */
 namespace muleunit
 {
@@ -41,32 +39,29 @@
 class TestCase;
 class BTList;
 
-
 /** Returns the size of a static array. */
-template <typename T, size_t N>
-inline size_t ArraySize(T(&)N)
+template <typename T, size_t N> inline size_t ArraySize(T (&)N)
 {
 	return N;
 }
 
-
 /** Print wide-char strings. */
-inline void Print(const wxString& str)
+inline void Print(const wxString &str)
 {
 	wxPuts(str.c_str());
 }
 
-
 /** This exception is raised if an ASSERT fails. */
 struct CTestFailureException : public std::exception
 {
 	/** Constructor, takes a snapshot of the current context, and adds the given information. */
-	CTestFailureException(const wxString& msg, const wxString& file, long lineNumber);
+	CTestFailureException(const wxString &msg, const wxString &file, long lineNumber);
 
 	/** Prints the context backtrace for the location where the exception was thrown. */
 	void PrintBT() const;
 
-	virtual const char* what () const noexcept;
+	virtual const char *what() const noexcept;
+
 private:
 	//! Pointer to struct containing a snapshot of the contexts
 	//! taken at the time the exception was created.
@@ -80,46 +75,39 @@
 struct CAssertFailureException : public CTestFailureException
 {
 public:
-	CAssertFailureException(const wxString& msg, const wxString& file, long lineNumber)
-		: CTestFailureException(msg, file, lineNumber)
+	CAssertFailureException(const wxString &msg, const wxString &file, long lineNumber)
+	: CTestFailureException(msg, file, lineNumber)
 	{
 	}
 };
 
-
 /**
- * This class is used to produce informative backtraces
+ * Produces informative backtraces.
  *
- * This is done by specifying a "context" for a given scope, using
- * the CONTEXT macro, at which point a description is added to the
- * current list of contexts. At destruction, when the scope is exited,
- * the context is removed from the queue.
+ * Specify a "context" for a given scope with the CONTEXT macro, which adds a description to the
+ * current list of contexts; at destruction, when the scope is exited, the context is removed from
+ * the queue.
  *
- * The resulting "backtrace" can then be printed by calling the
- * PrintBT() function of an CTestFailureException.
+ * The resulting "backtrace" is printed by CTestFailureException::PrintBT().
  */
 class CContext
 {
 public:
 	/** Adds a context with the specified information and description. */
-	CContext(const wxString& file, int line, const wxString& desc);
+	CContext(const wxString &file, int line, const wxString &desc);
 
 	/** Removes the context added by the constructor. */
 	~CContext();
 };
 
-
 //! Used to join the CContext instance name with the line-number.
 //! This is done to prevent shadowing.
 #define DO_CONTEXT(x, y, z) x y##z
 
 //! Specifies the context of the current scope.
-#define CONTEXT(x) CContext wxCONCAT(context,__LINE__)(__FILE__, __LINE__, x)
-
+#define CONTEXT(x) CContext wxCONCAT(context, __LINE__)(__FILE__, __LINE__, x)
 
-/**
- * This class disables assertions while it is in scope.
- */
+/// Disables assertions while it is in scope.
 class CAssertOff
 {
 public:
@@ -127,12 +115,8 @@
 	~CAssertOff();
 };
 
-
-/**
- * Helperfunction that converts basic types to strings.
- */
-template <typename TYPE>
-wxString StringFrom(const TYPE& value)
+/// Converts basic types to strings.
+template <typename TYPE> wxString StringFrom(const TYPE &value)
 {
 	return wxString() << value;
 }
@@ -147,75 +131,62 @@
 	return wxString::Format("%" wxLongLongFmtSpec "i", value);
 }
 
-
 /**
  * Test class containing all macros to do unit testing.
- * A test object represents a test that will be executed. Once it has been
- * executed, it reports all failures in the testPartResult linked list.
  *
- * A failure occurs when a test fails (condition is false).
+ * A test object represents a test that will be executed. Once it has run, it reports all failures
+ * in the testPartResult linked list. A failure occurs when a test's condition is false.
  */
 class Test
 {
 public:
 	/**
-	 * Main Test constructor. Used to create a test that will register itself
-	 * with TestRegistry and with its test case.
+	 * Main Test constructor. Creates a test that registers itself with TestRegistry and with
+	 * its test case.
 	 * @param testCaseName Name of the test case this test belongs to
 	 * @param testName Name of this test
 	 */
-	Test(const wxString& testCaseName, const wxString& testName);
+	Test(const wxString &testCaseName, const wxString &testName);
 
 	/**
-	 * Main Test destructor
-	 * Delete the testPartResult linked list. This is why the user should
-	 * only use the macro provided by muleunit to report a test result.
+	 * Main Test destructor. Deletes the testPartResult linked list, which is why the user
+	 * should only report a test result through the macros muleunit provides.
 	 */
 	virtual ~Test();
 
-	/**
-	 * Fixtures that will be called after run().
-	 */
+	/// Fixtures that will be called after run().
 	virtual void tearDown();
 
-	/**
-	 * Fixtures that will be called before run().
-	 */
+	/// Fixtures that will be called before run().
 	virtual void setUp();
 
 	/**
-	 * Test code should be in this method.
-	 * run() will be called by the Test's TestCase, hence subclasses of Test
-	 * should override this method.
+	 * Test code goes in this method. run() is called by the Test's TestCase, so subclasses of
+	 * Test should override it.
 	 */
 	virtual void run();
 
 	/**
-	 * Get the name of the TestCase this test belongs to. The name of the
-	 * TestCase is the first parameter of the test declaration. For example,
-	 * if a test is declared as TEST(TESTCASE1, TEST1), this method will return
-	 * "TESTCASE1".
+	 * Get the name of the TestCase this test belongs to: the first parameter of the test
+	 * declaration. For a test declared as TEST(TESTCASE1, TEST1) this returns "TESTCASE1".
 	 *
 	 * @return The TestCase name of this test
 	 */
-	const wxString& getTestCaseName() const;
+	const wxString &getTestCaseName() const;
 
 	/**
-	 * Get the name of this test. The name of the test is the second
-	 * parameter of the test declaration. For example,
-	 * if a test is declared as TEST(TESTCASE1, TEST1), this method will return
-	 * "TEST1".
+	 * Get the name of this test: the second parameter of the test declaration. For a test
+	 * declared as TEST(TESTCASE1, TEST1) this returns "TEST1".
 	 *
 	 * @return The name of this test.
 	 */
-	const wxString& getTestName() const;
+	const wxString &getTestName() const;
 
 	template <typename A, typename B>
-	static void DoAssertEquals(const wxString& file, unsigned line, const A& a, const B& b)
+	static void DoAssertEquals(const wxString &file, unsigned line, const A &a, const B &b)
 	{
 		if (!(a == b)) {
-			wxString message = "Expected '" + StringFrom(a) +
-								"' but got '" + StringFrom(b) + "'";
+			wxString message = "Expected '" + StringFrom(a) + "' but got '" + StringFrom(b) + "'";
 
 			throw CTestFailureException(message, file.c_str(), line);
 		}
@@ -224,171 +195,131 @@
 protected:
 	wxString m_testCaseName;
 	wxString m_testName;
-	TestCase* m_testCase;
+	TestCase *m_testCase;
 };
 
-
-#define THROW_TEST_FAILURE(message) \
-	throw CTestFailureException(message, __FILE__, __LINE__)
-
+#define THROW_TEST_FAILURE(message) throw CTestFailureException(message, __FILE__, __LINE__)
 
 /**
- * Asserts that a condition is true.
- * If the condition is not true, a failure is generated.
+ * Asserts that a condition is true; a failure is generated if it is not.
  * @param condition Condition to fulfill for the assertion to pass
  * @param message Message that will be displayed if this assertion fails
  */
 #define ASSERT_TRUE_M(condition, message) \
-{ \
-	if (!(condition)) { \
-		THROW_TEST_FAILURE(message); \
-	} \
-}
-
-
-/**
- * Same as ASSERT_TRUE, but without an explicit message.
- */
-#define ASSERT_TRUE(condition) \
-	ASSERT_TRUE_M(condition, wxString("Not true: ") + #condition);
-
+	{ \
+		if (!(condition)) { \
+			THROW_TEST_FAILURE(message); \
+		} \
+	}
 
-/**
- * Same as ASSERT_TRUE, but without an explicit message and condition must be false.
- */
-#define ASSERT_FALSE(condition) \
-	ASSERT_TRUE_M(!(condition), wxString("Not false: ") + #condition);
+/// Same as ASSERT_TRUE, but without an explicit message.
+#define ASSERT_TRUE(condition) ASSERT_TRUE_M(condition, wxString("Not true: ") + #condition);
 
+/// Same as ASSERT_TRUE, but without an explicit message and the condition must be false.
+#define ASSERT_FALSE(condition) ASSERT_TRUE_M(!(condition), wxString("Not false: ") + #condition);
 
 /**
- * Asserts that the two parameters are equals. Operator == must be defined.
- * If the two parameters are not equals, a failure is generated.
+ * Asserts that the two parameters are equal; operator == must be defined. A failure is generated if
+ * they are not.
  * @param expected Expected value
  * @param actual Actual value to be compared
  * @param message Message that will be displayed if this assertion fails
  */
-#define ASSERT_EQUALS_M(expected,actual,message)\
-{ \
-	if (!(expected == actual)) { \
-		THROW_TEST_FAILURE(message); \
-	} \
-}
-
-
-/**
- * Same as ASSERT_EQUALS_M, but without an explicit message.
- */
-#define ASSERT_EQUALS(expected, actual) \
-	Test::DoAssertEquals(__FILE__, __LINE__, expected, actual)
+#define ASSERT_EQUALS_M(expected, actual, message) \
+	{ \
+		if (!(expected == actual)) { \
+			THROW_TEST_FAILURE(message); \
+		} \
+	}
 
+/// Same as ASSERT_EQUALS_M, but without an explicit message.
+#define ASSERT_EQUALS(expected, actual) Test::DoAssertEquals(__FILE__, __LINE__, expected, actual)
 
 /**
- * Make a test fails with the given message.
- * @param text Failure message
+ * Makes a test fail with the given message. @param text Failure message
  */
-#define FAIL_M(text) \
-	THROW_TEST_FAILURE(text)
+#define FAIL_M(text) THROW_TEST_FAILURE(text)
 
-/**
- * Same as FAIL_M, but without an explicit message.
- */
+/// Same as FAIL_M, but without an explicit message.
 #define FAIL() FAIL_M("Test failed.")
 
-
-/**
- * Requires that an exception of a certain type is raised.
- */
+/// Requires that an exception of a certain type is raised.
 #define ASSERT_RAISES_M(type, call, message) \
 	try { \
-		{ call; }\
+		{ \
+			call; \
+		} \
 		THROW_TEST_FAILURE(message); \
-	} catch (const type&) { \
-	} catch (const std::exception& e) { \
+	} catch (const type &) { \
+	} catch (const std::exception &e) { \
 		THROW_TEST_FAILURE(wxString::FromAscii(e.what())); \
 	}
 
-
-
-/**
- * Same as ASSERT_RAISES, but without an explicit message.
- */
-#define ASSERT_RAISES(type, call) \
-	ASSERT_RAISES_M(type, (call), "Exception of type " #type " not raised.")
-
-
+/// Same as ASSERT_RAISES, but without an explicit message.
+#define ASSERT_RAISES(type, call) ASSERT_RAISES_M(type, (call), "Exception of type " #type " not raised.")
 
 /**
- * Define a test in a TestCase using test fixtures.
- * User should put his test code between brackets after using this macro.
+ * Define a test in a TestCase using test fixtures. Put the test code between brackets after this
+ * macro.
  *
- * This macro should only be used if test fixtures were declared earlier in
- * this order: DECLARE, SETUP, TEARDOWN.
- * @param testCaseName TestCase name where the test belongs to. Should be
- * the same name of DECLARE, SETUP and TEARDOWN.
+ * Only use this if test fixtures were declared earlier, in this order: DECLARE, SETUP, TEARDOWN.
+ * @param testCaseName TestCase the test belongs to. The same name as DECLARE, SETUP and TEARDOWN.
  * @param testName Unique test name.
- * @param testDisplayName This will be displayed when running the test.
+ * @param testDisplayName Displayed when running the test.
  */
-#define TEST_M(testCaseName, testName, testDisplayName)                        \
-    class testCaseName##testName##Test : public testCaseName##Declare##Test    \
-    {                                                                          \
-    public:                                                                    \
-        testCaseName##testName##Test()                                         \
-            : testCaseName##Declare##Test(#testCaseName, testDisplayName) \
-        {                                                                      \
-        }                                                                      \
-                                                                               \
-        void run();                                                            \
-    } testCaseName##testName##Instance;                                        \
-                                                                               \
-    void testCaseName##testName##Test::run()
+#define TEST_M(testCaseName, testName, testDisplayName) \
+	class testCaseName##testName##Test : public testCaseName##Declare##Test \
+	{ \
+	public: \
+		testCaseName##testName##Test() \
+		: testCaseName##Declare##Test(#testCaseName, testDisplayName) \
+		{ \
+		} \
+\
+		void run(); \
+	} testCaseName##testName##Instance; \
+\
+	void testCaseName##testName##Test::run()
 
 /**
- * Define a test in a TestCase using test fixtures.
- * User should put his test code between brackets after using this macro.
+ * Define a test in a TestCase using test fixtures. Put the test code between brackets after this
+ * macro.
  *
- * This macro should only be used if test fixtures were declared earlier in
- * this order: DECLARE, SETUP, TEARDOWN.
- * @param testCaseName TestCase name where the test belongs to. Should be
- * the same name of DECLARE, SETUP and TEARDOWN.
+ * Only use this if test fixtures were declared earlier, in this order: DECLARE, SETUP, TEARDOWN.
+ * @param testCaseName TestCase the test belongs to. The same name as DECLARE, SETUP and TEARDOWN.
  * @param testName Unique test name.
  */
-#define TEST(testCaseName, testName)	TEST_M(testCaseName, testName, #testName)
+#define TEST(testCaseName, testName) TEST_M(testCaseName, testName, #testName)
 
 /**
- * Location to declare variables and objects.
- * This is where user should declare members accessible by TESTF,
- * SETUP and TEARDOWN.
+ * Location to declare variables and objects: the members accessible by TESTF, SETUP and TEARDOWN.
  *
- * User should not use brackets after using this macro. User should
- * not initialize any members here.
+ * Do not use brackets after this macro, and do not initialize any members here.
  *
  * @param testCaseName TestCase name of the fixtures
  * @see END_DECLARE for more information.
  */
-#define DECLARE(testCaseName)\
+#define DECLARE(testCaseName) \
 	class testCaseName##Declare##Test : public Test \
 	{ \
 	public: \
-		testCaseName##Declare##Test(const wxString& testCaseName, const wxString& testName) \
-			: Test (testCaseName, testName) {} \
-		virtual void run() = 0; \
+		testCaseName##Declare##Test(const wxString &testCaseName, const wxString &testName) \
+		: Test(testCaseName, testName) \
+		{ \
+		} \
+		virtual void run() = 0;
 
 /**
- * Ending macro used after DECLARE.
- *
- * User should use this macro after declaring members with
- * DECLARE macro.
+ * Ending macro, used after declaring members with DECLARE.
  */
-#define END_DECLARE };
-
+#define END_DECLARE \
+	} \
+	;
 
-/**
- * Macro for creating a fixture with no setup/teardown or member variables.
- */
+/// Creates a fixture with no setup/teardown or member variables.
 #define DECLARE_SIMPLE(testCaseName) \
 	DECLARE(testCaseName) \
 	END_DECLARE;
 
-} // MuleUnit ns
+} // namespace muleunit
 #endif // TEST_H
-

amule-3.0.1.tar.gz/unittests/muleunit/testcase.cpp -> amule-3.1.0.tar.gz/unittests/muleunit/testcase.cpp Changed

@@ -19,7 +19,6 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #include "testcase.h"
 #include "test.h"
 
@@ -27,20 +26,19 @@
 
 using namespace muleunit;
 
-TestCase::TestCase(const wxString& name)
-		: m_name(name)
-{}
-
-TestCase::~TestCase()
+TestCase::TestCase(const wxString &name)
+: m_name(name)
 {
 }
 
+TestCase::~TestCase() {}
+
 void TestCase::addTest(Test *test)
 {
 	m_tests.push_back(test);
 }
 
-const TestList& TestCase::getTests() const
+const TestList &TestCase::getTests() const
 {
 	return m_tests;
 }
@@ -50,23 +48,21 @@
 	return m_tests.size();
 }
 
-
-const wxString& TestCase::getName() const
+const wxString &TestCase::getName() const
 {
 	return m_name;
 }
 
-
-
 bool TestCase::run()
 {
-	Print("\nRunning test-collection \"" + m_name + wxString::Format("\" with %u test-cases:", static_cast<unsigned int>(m_tests.size())));
+	Print("\nRunning test-collection \"" + m_name +
+		wxString::Format("\" with %u test-cases:", static_cast<unsigned int>(m_tests.size())));
 
 	bool failures = false;
 
 	TestList::iterator it = m_tests.begin();
 	for (; it != m_tests.end(); ++it) {
-		Test* test = *it;
+		Test *test = *it;
 
 		Print("\tTest \"" + test->getTestName() + "\" ");
 
@@ -74,7 +70,7 @@
 		try {
 			test->setUp();
 			wasSetup = true;
-		} catch (const CTestFailureException& e) {
+		} catch (const CTestFailureException &e) {
 			failures = true;
 			Print("\t\tFailure in setUp:\n");
 			e.PrintBT();
@@ -85,7 +81,7 @@
 		if (wasSetup) {
 			try {
 				test->run();
-			} catch (const CTestFailureException& e) {
+			} catch (const CTestFailureException &e) {
 				failures = true;
 				Print("\t\tFailure running:");
 				e.PrintBT();
@@ -94,7 +90,7 @@
 
 		try {
 			test->tearDown();
-		} catch (const CTestFailureException& e) {
+		} catch (const CTestFailureException &e) {
 			failures = true;
 			Print("\t\tFailure in tearDown:");
 			e.PrintBT();
@@ -103,4 +99,3 @@
 
 	return !failures;
 }
-

amule-3.0.1.tar.gz/unittests/muleunit/testcase.h -> amule-3.1.0.tar.gz/unittests/muleunit/testcase.h Changed

@@ -19,90 +19,72 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #ifndef TESTCASE_H
 #define TESTCASE_H
 
-
 #include <wx/string.h>
 #include <list>
 
-
 namespace muleunit
 {
 
 class Test;
 
-typedef std::list<Test*> TestList;
-
+typedef std::list<Test *> TestList;
 
 /**
- * A TestCase is a collection of unit tests (instance of Test) and is
- * always specified by the first parameter of a Test declaration.
+ * A TestCase is a collection of unit tests (instances of Test), always named by the first parameter
+ * of a Test declaration.
  */
 class TestCase
 {
 public:
-
 	/**
-	 * Main TestCase constructor.
-	 *
-	 * @param name TestCase name
+	 * Main TestCase constructor. @param name TestCase name
 	 */
-	TestCase(const wxString& name);
+	TestCase(const wxString &name);
 
 	virtual ~TestCase();
 
 	/**
-	 * Add a Test to the Test list. This method is used by TestRegistry.
-	 *
-	 * @param test Test instance to add to the Test list.
+	 * Add a Test to the Test list. Used by TestRegistry. @param test Test instance to add.
 	 */
 	void addTest(Test *test);
 
 	/**
-	 * Get the Test list.
-	 *
-	 * @return Test list
+	 * Get the Test list. @return Test list
 	 */
-	const TestList& getTests() const;
+	const TestList &getTests() const;
 
 	/**
-	 * Execute all Tests in the Test list of this TestCase, returning false if there were failures.
+	 * Execute all Tests in this TestCase's list, returning false if there were failures.
 	 */
 	bool run();
 
 	/**
-	 * Get the Test list size (number of Tests in this TestCase).
-	 *
-	 * @return The Test list size
+	 * Get the Test list size, i.e. the number of Tests in this TestCase.
 	 */
 	int getTestsCount() const;
 
 	/**
-	 * Get the total number of failures reported by all Tests.
-	 *
-	 * @return The total number of failures reported by all Tests. 0
-	 * if no test were run or if no failures were reported.
+	 * @return The total number of failures reported by all Tests, 0 if no test ran or none
+	 * failed.
 	 */
 	int getFailuresCount() const;
 
 	/**
-	 * Get the total number of successes reported by all Tests.
-	 *
-	 * @return The total number of successes reported by all Tests. 0
-	 * if no test were run or if no successes were reported.
+	 * @return The total number of successes reported by all Tests, 0 if no test ran or none
+	 * succeeded.
 	 */
 	int getSuccessesCount() const;
 
 	/**
-	 * Get the TestCase name. This name is specified by the first parameter
-	 * of the Test declaration. For example, if a test was declared as
-	 * TEST(TESTCASE1, TEST1), the TestCase name would be "TESTCASE1".
+	 * Get the TestCase name: the first parameter of the Test declaration. For a test declared
+	 * as TEST(TESTCASE1, TEST1) the TestCase name is "TESTCASE1".
 	 *
 	 * @return The name of the TestCase
 	 */
-	const wxString& getName() const;
+	const wxString &getName() const;
 
 protected:
 	int m_failuresCount;
@@ -114,6 +96,5 @@
 	void runTests(Test *test);
 };
 
-} // MuleUnit ns
+} // namespace muleunit
 #endif // TESTCASE_H
-

amule-3.0.1.tar.gz/unittests/muleunit/testregistry.cpp -> amule-3.1.0.tar.gz/unittests/muleunit/testregistry.cpp Changed

amule-3.0.1.tar.gz/unittests/muleunit/testregistry.h -> amule-3.1.0.tar.gz/unittests/muleunit/testregistry.h Changed

@@ -19,7 +19,6 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
 #ifndef TESTREGISTRY_H
 #define TESTREGISTRY_H
 
@@ -27,18 +26,14 @@
 
 namespace muleunit
 {
-	class Test;
-	class TestCase;
-
-
-typedef std::list<TestCase*> TestCaseList;
+class Test;
+class TestCase;
 
+typedef std::list<TestCase *> TestCaseList;
 
 /**
- * The TestRegistry is the main class used to register all tests,
- * and create appropriate TestCase. It can then be used to run
- * tests and print results. All methods that should be used by
- * the user are static.
+ * Registers all tests and creates the appropriate TestCase, then runs the tests and prints results.
+ * Every method a user should call is static.
  */
 class TestRegistry
 {
@@ -47,28 +42,24 @@
 	~TestRegistry();
 
 	/**
-	 * Add a test in the registry. If the previous TestCase was not the same
-	 * as the one of the current test, a new TestCase is created.
-	 *
+	 * Add a test to the registry. A new TestCase is created when the previous one differs from
+	 * this test's.
 	 * @param test Test to be added
 	 */
 	static void addTest(Test *test);
 
 	/**
-	 * Runs all added tests and prints the results.
-	 *
-	 * @return False if there were failures.
+	 * Runs all added tests and prints the results. @return False if there were failures.
 	 */
 	static bool runAndPrint();
 
 private:
-	static TestRegistry& instance();
+	static TestRegistry &instance();
 	void add(Test *test);
 
 	bool runTests();
 	TestCaseList m_testCases;
 };
 
-} // MuleUnit ns
+} // namespace muleunit
 #endif // TESTREGISTRY_H
-

amule-3.1.0.tar.gz/unittests/tests/AddressFamilyPolicyTest.cpp Added

@@ -0,0 +1,268 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// Which address families aMule opens sockets in.
+//
+// Two properties are worth pinning for reasons that outlast this PR:
+//
+//   1. The default is IPv4-only. Piece 4 of the widening is gated so nothing advertises IPv6 until
+// a switch is deliberately turned on. A default of DualStack would hand the first caller dual stack
+// with no switch thrown, leaving the gate in place but guarding nothing.
+//   2. Refusal never falls back. Opening a v4 socket towards a v6 target is how a truncated address
+// becomes a connection to the wrong host, so a target the configuration forbids yields no protocol
+// at all.
+//
+// The configured family is process-global mutable state, so every case below restores what it
+// found. The default is captured at static-initialisation time rather than read inside a test,
+// which keeps the first assertion independent of the order the cases run in.
+
+#include <muleunit/test.h>
+
+#include <AddressFamilyPolicyAsio.h>
+
+using namespace muleunit;
+using namespace AddressFamilyPolicy;
+
+DECLARE_SIMPLE(AddressFamilyPolicy)
+
+//! Read before main(), so no test can have perturbed it.
+static const Families g_processDefault = Configured();
+
+namespace
+{
+//! Restores the configured family, so one case cannot leak into the next.
+class ScopedFamilies
+{
+public:
+	explicit ScopedFamilies(Families families)
+	: m_previous(Configured())
+	{
+		SetConfigured(families);
+	}
+	~ScopedFamilies() { SetConfigured(m_previous); }
+
+private:
+	Families m_previous;
+};
+
+CNetworkAddress Addr(const char *text)
+{
+	return CNetworkAddress::FromString(text);
+}
+} // namespace
+
+// Absence is not the only value that names no peer. 0.0.0.0 reaches Permits() as a present IPv4
+// address, so the family test alone permits it under every configuration, and a call site
+// replacing an old `if (ip)` guard would dial it -- which on Linux connects to this machine.
+TEST(AddressFamilyPolicy, TheUnspecifiedAddressIsNeverPermitted)
+{
+	const Families every = { Families::IPv4Only, Families::IPv6Only, Families::DualStack };
+	for (const Families families : every) {
+		ScopedFamilies scope(families);
+		ASSERT_FALSE(Permits(Addr("0.0.0.0")));
+		ASSERT_FALSE(Permits(Addr("::")));
+		ASSERT_FALSE(Permits(Addr("::ffff:0.0.0.0")));
+	}
+	// A real address of the permitted family still passes, so this did not just refuse
+	// everything.
+	{
+		ScopedFamilies scope(Families::DualStack);
+		ASSERT_TRUE(Permits(Addr("192.0.2.1")));
+		ASSERT_TRUE(Permits(Addr("2001:db8::1")));
+	}
+}
+
+// The protocol and the endpoint have to be the same family. Asked separately they are not for a
+// mapped target: the protocol is v4 because a mapped address is reachable over IPv4, while
+// ToAsioAddress() preserves the family and yields an address_v6. Connecting those is EAFNOSUPPORT.
+TEST(AddressFamilyPolicy, AsioTargetPairsTheProtocolWithAMatchingAddress)
+{
+	ScopedFamilies scope(Families::DualStack);
+
+	const boost::optional<SAsioTarget> mapped = AsioTargetFor(Addr("::ffff:192.0.2.1"));
+	ASSERT_TRUE((bool)mapped);
+	ASSERT_TRUE(mapped->protocol == boost::asio::ip::tcp::v4());
+	ASSERT_TRUE(mapped->address.is_v4());
+
+	const boost::optional<SAsioTarget> native = AsioTargetFor(Addr("192.0.2.1"));
+	ASSERT_TRUE((bool)native);
+	ASSERT_TRUE(native->protocol == boost::asio::ip::tcp::v4());
+	ASSERT_TRUE(native->address.is_v4());
+	// The mapped and native spellings of one peer reach the same wire target.
+	ASSERT_TRUE(mapped->address == native->address);
+
+	const boost::optional<SAsioTarget> v6 = AsioTargetFor(Addr("2001:db8::1"));
+	ASSERT_TRUE((bool)v6);
+	ASSERT_TRUE(v6->protocol == boost::asio::ip::tcp::v6());
+	ASSERT_TRUE(v6->address.is_v6());
+}
+
+// One decision, one thing to test: a refused target yields no pair at all, rather than a protocol
+// the caller might dereference after a separate and possibly stale Permits() check.
+TEST(AddressFamilyPolicy, AsioTargetIsEmptyForAnythingRefused)
+{
+	{
+		ScopedFamilies scope(Families::IPv4Only);
+		ASSERT_FALSE((bool)AsioTargetFor(Addr("2001:db8::1")));
+	}
+	{
+		ScopedFamilies scope(Families::DualStack);
+		ASSERT_FALSE((bool)AsioTargetFor(CNetworkAddress::Absent()));
+		ASSERT_FALSE((bool)AsioTargetFor(Addr("0.0.0.0")));
+	}
+}
+
+// Piece 4 will build this from a configuration integer, so a value outside the enum is reachable.
+// Testing inequality against one enumerator made such a value permit both families while the
+// resolver fell back to IPv4-only; every answer now agrees on the same fallback.
+TEST(AddressFamilyPolicy, AnOutOfRangeConfigurationFallsBackConsistently)
+{
+	ScopedFamilies scope(static_cast<Families>(99));
+
+	ASSERT_TRUE(PermitsIPv4());
+	ASSERT_FALSE(PermitsIPv6());
+	ASSERT_TRUE(ResolverFamilyForLookup() == ResolverFamily::IPv4Only);
+	ASSERT_TRUE(Permits(Addr("192.0.2.1")));
+	ASSERT_FALSE(Permits(Addr("2001:db8::1")));
+}
+
+TEST(AddressFamilyPolicy, DefaultIsIPv4Only)
+{
+	// Captured before any case ran. If this fails, the widening advertises a
+	// family the gate was supposed to withhold.
+	ASSERT_TRUE(g_processDefault == Families::IPv4Only);
+}
+
+TEST(AddressFamilyPolicy, PermitsFollowsTheConfiguredFamilies)
+{
+	const CNetworkAddress v4 = Addr("192.0.2.1");
+	const CNetworkAddress v6 = Addr("2001:db8::1");
+	{
+		ScopedFamilies scope(Families::IPv4Only);
+		ASSERT_TRUE(Permits(v4));
+		ASSERT_FALSE(Permits(v6));
+	}
+	{
+		ScopedFamilies scope(Families::IPv6Only);
+		ASSERT_FALSE(Permits(v4));
+		ASSERT_TRUE(Permits(v6));
+	}
+	{
+		ScopedFamilies scope(Families::DualStack);
+		ASSERT_TRUE(Permits(v4));
+		ASSERT_TRUE(Permits(v6));
+	}
+}
+
+TEST(AddressFamilyPolicy, MappedIPv4IsIPv4ForPolicy)
+{
+	// It narrows losslessly, so an IPv4-only configuration can reach it -- and an IPv6-only one
+	// must not, or the policy would contradict IndexKey(), which collapses the two spellings to
+	// one peer.
+	const CNetworkAddress mapped = Addr("::ffff:192.0.2.1");
+	{
+		ScopedFamilies scope(Families::IPv4Only);
+		ASSERT_TRUE(Permits(mapped));
+	}
+	{
+		ScopedFamilies scope(Families::IPv6Only);
+		ASSERT_FALSE(Permits(mapped));
+	}
+}
+
+TEST(AddressFamilyPolicy, AbsentIsNeverPermitted)
+{
+	const CNetworkAddress absent = CNetworkAddress::Absent();
+	ScopedFamilies scope(Families::DualStack);
+	ASSERT_FALSE(Permits(absent));
+	ASSERT_FALSE((bool)AsioTargetFor(absent));
+}
+
+TEST(AddressFamilyPolicy, RefusalNeverFallsBackToTheOtherFamily)
+{
+	const CNetworkAddress v4 = Addr("192.0.2.1");
+	const CNetworkAddress v6 = Addr("2001:db8::1");
+	{
+		ScopedFamilies scope(Families::IPv4Only);
+		ASSERT_TRUE(AsioTargetFor(v4)->protocol == boost::asio::ip::tcp::v4());
+		// Not v4() as a fallback: no pair at all.
+		ASSERT_FALSE((bool)AsioTargetFor(v6));
+	}
+	{
+		ScopedFamilies scope(Families::IPv6Only);
+		ASSERT_FALSE((bool)AsioTargetFor(v4));
+		ASSERT_TRUE(AsioTargetFor(v6)->protocol == boost::asio::ip::tcp::v6());
+	}
+	{
+		ScopedFamilies scope(Families::DualStack);
+		ASSERT_TRUE(AsioTargetFor(v4)->protocol == boost::asio::ip::tcp::v4());
+		ASSERT_TRUE(AsioTargetFor(v6)->protocol == boost::asio::ip::tcp::v6());
+		ASSERT_TRUE(AsioTargetFor(Addr("::ffff:192.0.2.1"))->protocol == boost::asio::ip::tcp::v4());
+	}
+}
+
+TEST(AddressFamilyPolicy, ResolverIsUnrestrictedOnlyUnderDualStack)
+{
+	// Any means "do not restrict the lookup", not "refuse it". That distinction
+	// is why this returns its own enum rather than an optional protocol.
+	{
+		ScopedFamilies scope(Families::IPv4Only);
+		ASSERT_TRUE(ResolverFamilyForLookup() == ResolverFamily::IPv4Only);
+	}
+	{
+		ScopedFamilies scope(Families::IPv6Only);
+		ASSERT_TRUE(ResolverFamilyForLookup() == ResolverFamily::IPv6Only);
+	}
+	{
+		ScopedFamilies scope(Families::DualStack);
+		ASSERT_TRUE(ResolverFamilyForLookup() == ResolverFamily::Any);
+	}
+}
+
+TEST(AddressFamilyPolicy, AnyAddressStaysIPv4WhereverIPv4IsPermitted)
+{
+	// Including dual stack. Handing :: to the single-socket services -- the EC listener, the
+	// web server -- would move the daemon's control channel to another family as a side effect
+	// of the ed2k work.
+	{
+		ScopedFamilies scope(Families::IPv4Only);
+		ASSERT_TRUE(AnyAddress() == AnyIPv4Address());
+	}
+	{
+		ScopedFamilies scope(Families::DualStack);
+		ASSERT_TRUE(AnyAddress() == AnyIPv4Address());
+	}
+	{
+		ScopedFamilies scope(Families::IPv6Only);
+		ASSERT_TRUE(AnyAddress() == AnyIPv6Address());
+	}
+}
+
+TEST(AddressFamilyPolicy, WildcardsAreTheUnspecifiedAddresses)
+{
+	ASSERT_EQUALS(wxString("0.0.0.0"), wxString(AnyIPv4Address().to_string()));
+	ASSERT_EQUALS(wxString("::"), wxString(AnyIPv6Address().to_string()));
+}
+
+// File_checked_for_headers

amule-3.1.0.tar.gz/unittests/tests/AmuleApiConfigTest.cpp Added

@@ -0,0 +1,394 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include <muleunit/test.h>
+
+#include "AmuleApiConfig.h"
+
+#include <wx/file.h>
+#include <wx/filename.h>
+#include <wx/stdpaths.h>
+#include <wx/utils.h>
+
+#include <cstdlib>
+#include <cstring>
+#include <string>
+#include <vector>
+
+#ifndef _WIN32
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
+using namespace muleunit;
+
+DECLARE(AmuleApiConfig)
+// Fresh per-test config dir under the system temp tree. Tearing down inside the test bodies
+// works around muleunit's lack of a TearDown hook in the DECLARE_SIMPLE style -- each test owns
+// its own dir. wxStandardPaths::GetTempDir() returns `/tmp` on POSIX and `%TEMP%` on Windows, so
+// the test is portable across the CI matrix.
+wxString MakeTmpDir(const char *tag)
+{
+	wxString d;
+	d.Printf("%s/amuleapi-cfg-test-%s-%ld",
+		wxStandardPaths::Get().GetTempDir(),
+		tag,
+		static_cast<long>(::wxGetProcessId()));
+	// Best-effort cleanup of any stragglers from a prior crashed run.
+	wxString secret = d + "/amuleapi-jwt-secret";
+	wxString pwfile = d + "/amuleapi-passwords";
+	wxString conf = d + "/amuleapi.conf";
+	::wxRemoveFile(secret);
+	::wxRemoveFile(pwfile);
+	::wxRemoveFile(conf);
+	::wxRmdir(d);
+	return d;
+}
+END_DECLARE;
+
+TEST(AmuleApiConfig, FreshLoadCreatesAllThreeFiles)
+{
+	const wxString dir = MakeTmpDir("fresh");
+	CAmuleApiConfig cfg;
+	ASSERT_TRUE(cfg.Load(dir));
+
+	ASSERT_TRUE(::wxFileExists(dir + "/amuleapi.conf"));
+	ASSERT_TRUE(::wxFileExists(dir + "/amuleapi-jwt-secret"));
+	ASSERT_TRUE(::wxFileExists(dir + "/amuleapi-passwords"));
+}
+
+TEST(AmuleApiConfig, FreshLoadProducesStreamingDefaults)
+{
+	const wxString dir = MakeTmpDir("stream-defaults");
+	CAmuleApiConfig cfg;
+	ASSERT_TRUE(cfg.Load(dir));
+	ASSERT_EQUALS(static_cast<unsigned>(16384), cfg.StreamingCfg().event_bus_ring_capacity);
+	ASSERT_EQUALS(static_cast<unsigned>(6), cfg.StreamingCfg().max_concurrent_file_responses);
+}
+
+// Hand-writes an amuleapi.conf carrying one `Streaming` line, at the 0600 Load() insists on, and
+// reports what the parser made of the file-response cap. The dir is created first so the first-run
+// path cannot get in ahead and write the defaults we are trying to override.
+unsigned LoadedFileResponseCap(const char *tag, const char *streaming_line)
+{
+	// Not MakeTmpDir: that one is a member of the DECLARE block and these
+	// helpers live outside it. Same naming scheme, same straggler cleanup.
+	wxString dir;
+	dir.Printf("%s/amuleapi-cfg-test-%s-%ld",
+		wxStandardPaths::Get().GetTempDir(),
+		tag,
+		static_cast<long>(::wxGetProcessId()));
+	::wxRemoveFile(dir + "/amuleapi-jwt-secret");
+	::wxRemoveFile(dir + "/amuleapi-passwords");
+	::wxRemoveFile(dir + "/amuleapi.conf");
+	::wxRmdir(dir);
+	::wxMkdir(dir, 0700);
+
+	const std::string conf = std::string("Server\nBindAddress=127.0.0.1\nPort=4713\n"
+					     "\nStreaming\n") +
+				 streaming_line + "\n";
+	wxFile f(dir + "/amuleapi.conf", wxFile::write);
+	f.Write(conf.c_str(), conf.size());
+	f.Close();
+#ifndef _WIN32
+	::chmod(std::string((dir + "/amuleapi.conf").utf8_str()).c_str(), S_IRUSR | S_IWUSR);
+#endif
+
+	CAmuleApiConfig cfg;
+	if (!cfg.Load(dir)) {
+		return 0;
+	}
+	return cfg.StreamingCfg().max_concurrent_file_responses;
+}
+
+TEST(AmuleApiConfig, FileResponseCapIsConfigurable)
+{
+	// The point of the whole option: 6 is a default, not a ceiling. A NAS with several devices
+	// behind one proxy address raises it; a Pi serving off the disk it downloads to lowers it.
+	ASSERT_EQUALS(
+		static_cast<unsigned>(24), LoadedFileResponseCap("cap-24", "MaxConcurrentFileResponses=24"));
+	ASSERT_EQUALS(
+		static_cast<unsigned>(1), LoadedFileResponseCap("cap-1", "MaxConcurrentFileResponses=1"));
+}
+
+TEST(AmuleApiConfig, InvalidFileResponseCapFallsBackToDefault)
+{
+	// Every one of these has to land on 6 rather than on itself. Zero and a negative would
+	// close the route outright; the four-digit value would trade away the bounded-RSS property
+	// the streaming path exists for; the non-numeric one is what a comment or a stray unit
+	// looks like to wxFileConfig.
+	ASSERT_EQUALS(
+		static_cast<unsigned>(6), LoadedFileResponseCap("cap-zero", "MaxConcurrentFileResponses=0"));
+	ASSERT_EQUALS(
+		static_cast<unsigned>(6), LoadedFileResponseCap("cap-neg", "MaxConcurrentFileResponses=-4"));
+	ASSERT_EQUALS(static_cast<unsigned>(6),
+		LoadedFileResponseCap("cap-huge", "MaxConcurrentFileResponses=100000"));
+	ASSERT_EQUALS(static_cast<unsigned>(6),
+		LoadedFileResponseCap("cap-junk", "MaxConcurrentFileResponses=lots"));
+}
+
+TEST(AmuleApiConfig, GeneratedJwtSecretIs32Bytes)
+{
+	const wxString dir = MakeTmpDir("jwt32");
+	CAmuleApiConfig cfg;
+	ASSERT_TRUE(cfg.Load(dir));
+	ASSERT_EQUALS(static_cast<size_t>(32), cfg.JwtSecret().size());
+}
+
+TEST(AmuleApiConfig, GeneratedJwtSecretIsRandom)
+{
+	const wxString dir_a = MakeTmpDir("jwt-a");
+	CAmuleApiConfig cfg_a;
+	ASSERT_TRUE(cfg_a.Load(dir_a));
+	const std::vector<unsigned char> a = cfg_a.JwtSecret();
+
+	const wxString dir_b = MakeTmpDir("jwt-b");
+	CAmuleApiConfig cfg_b;
+	ASSERT_TRUE(cfg_b.Load(dir_b));
+	const std::vector<unsigned char> b = cfg_b.JwtSecret();
+
+	// Two fresh dirs → two distinct secrets. ~2^256 collision odds.
+	ASSERT_TRUE(a != b);
+}
+
+TEST(AmuleApiConfig, JwtSecretRoundTripStable)
+{
+	const wxString dir = MakeTmpDir("jwt-rt");
+
+	CAmuleApiConfig cfg1;
+	ASSERT_TRUE(cfg1.Load(dir));
+	const std::vector<unsigned char> first = cfg1.JwtSecret();
+
+	CAmuleApiConfig cfg2;
+	ASSERT_TRUE(cfg2.Load(dir));
+	const std::vector<unsigned char> second = cfg2.JwtSecret();
+
+	// Second load reads what the first generated -- same bytes.
+	ASSERT_TRUE(first == second);
+}
+
+TEST(AmuleApiConfig, EmptyPasswordsFilePassesLoad)
+{
+	const wxString dir = MakeTmpDir("pw-empty");
+	CAmuleApiConfig cfg;
+	ASSERT_TRUE(cfg.Load(dir));
+	// Default state: both roles disabled until a password is set.
+	ASSERT_TRUE(cfg.AdminCredential().empty());
+	ASSERT_TRUE(cfg.GuestCredential().empty());
+	ASSERT_FALSE(cfg.HasAnyCredential());
+}
+
+TEST(AmuleApiConfig, SetPasswordIsReloadableAndVerifies)
+{
+	const wxString dir = MakeTmpDir("pw-rt");
+	CAmuleApiConfig cfg;
+	ASSERT_TRUE(cfg.Load(dir));
+
+	// 32 hex chars; doesn't need to be a real MD5.
+	const std::string admin_md5 = "0123456789abcdef0123456789abcdef";
+	const std::string guest_md5 = "fedcba9876543210fedcba9876543210";
+	ASSERT_TRUE(cfg.SetPassword(webcommon::kAdminCredential, admin_md5));
+	ASSERT_TRUE(cfg.SetPassword(webcommon::kGuestCredential, guest_md5));
+
+	CAmuleApiConfig cfg2;
+	ASSERT_TRUE(cfg2.Load(dir));
+	ASSERT_TRUE(cfg2.HasAnyCredential());
+	// The stored form is a salted record, not the digest that produced it.
+	ASSERT_TRUE(cfg2.AdminCredential() != admin_md5);
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::Admin == cfg2.VerifyPassword(admin_md5));
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::Guest == cfg2.VerifyPassword(guest_md5));
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::None ==
+		    cfg2.VerifyPassword("00000000000000000000000000000000"));
+}
+
+// Each role is set independently. The write re-reads the file first, so changing one role never
+// reverts a change another process made to the other -- the whole reason there is a single store.
+TEST(AmuleApiConfig, SetPasswordLeavesTheOtherRoleAlone)
+{
+	const wxString dir = MakeTmpDir("pw-independent");
+	CAmuleApiConfig cfg;
+	ASSERT_TRUE(cfg.Load(dir));
+
+	const std::string admin_md5 = "0123456789abcdef0123456789abcdef";
+	const std::string guest_md5 = "fedcba9876543210fedcba9876543210";
+	ASSERT_TRUE(cfg.SetPassword(webcommon::kAdminCredential, admin_md5));
+
+	// A second process (amuled applying an EC push, say) sets the guest
+	// password without ever having seen the admin one.
+	CAmuleApiConfig other;
+	ASSERT_TRUE(other.Load(dir));
+	ASSERT_TRUE(other.SetPassword(webcommon::kGuestCredential, guest_md5));
+
+	CAmuleApiConfig cfg3;
+	ASSERT_TRUE(cfg3.Load(dir));
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::Admin == cfg3.VerifyPassword(admin_md5));
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::Guest == cfg3.VerifyPassword(guest_md5));
+}
+
+// Clearing the guest credential is how guest access is turned off.
+TEST(AmuleApiConfig, EmptyDigestClearsTheRole)
+{
+	const wxString dir = MakeTmpDir("pw-clear");
+	CAmuleApiConfig cfg;
+	ASSERT_TRUE(cfg.Load(dir));
+
+	const std::string admin_md5 = "0123456789abcdef0123456789abcdef";
+	const std::string guest_md5 = "fedcba9876543210fedcba9876543210";
+	ASSERT_TRUE(cfg.SetPassword(webcommon::kAdminCredential, admin_md5));
+	ASSERT_TRUE(cfg.SetPassword(webcommon::kGuestCredential, guest_md5));
+
+	ASSERT_TRUE(cfg.SetPassword(webcommon::kGuestCredential, ""));
+	ASSERT_TRUE(cfg.GuestCredential().empty());
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::None == cfg.VerifyPassword(guest_md5));
+	// Admin is untouched, so clearing guest doesn't lock the operator out.
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::Admin == cfg.VerifyPassword(admin_md5));
+	ASSERT_TRUE(cfg.HasAnyCredential());
+}
+
+TEST(AmuleApiConfig, SetPasswordRejectsMalformedDigest)
+{
+	const wxString dir = MakeTmpDir("pw-setreject");
+	CAmuleApiConfig cfg;
+	ASSERT_TRUE(cfg.Load(dir));
+
+	ASSERT_FALSE(cfg.SetPassword(webcommon::kAdminCredential, "too-short"));
+	ASSERT_FALSE(cfg.SetPassword(webcommon::kAdminCredential, "zzzz56789abcdef0123456789abcdef0"));
+	ASSERT_TRUE(cfg.AdminCredential().empty());
+
+	// Uppercase is accepted: the preferences dialog and the EC path have
+	// historically disagreed about digest case.
+	ASSERT_TRUE(cfg.SetPassword(webcommon::kAdminCredential, "0123456789ABCDEF0123456789ABCDEF"));
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::Admin ==
+		    cfg.VerifyPassword("0123456789abcdef0123456789abcdef"));
+}
+
+// A password set by amuled or by aMule's preferences dialog while
+// amuleapi is running has to take effect without restarting amuleapi.
+TEST(AmuleApiConfig, PasswordChangedOnDiskIsPickedUpAtNextLogin)
+{
+	const wxString dir = MakeTmpDir("pw-reload");
+	CAmuleApiConfig running;
+	ASSERT_TRUE(running.Load(dir));
+
+	const std::string first = "0123456789abcdef0123456789abcdef";
+	ASSERT_TRUE(running.SetPassword(webcommon::kAdminCredential, first));
+
+	// Another process rotates the admin password.
+	const std::string second = "fedcba9876543210fedcba9876543210";
+	{
+		CAmuleApiConfig other;
+		ASSERT_TRUE(other.Load(dir));
+		ASSERT_TRUE(other.SetPassword(webcommon::kAdminCredential, second));
+	}
+
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::Admin == running.VerifyPassword(second));
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::None == running.VerifyPassword(first));
+}
+
+// A config written before the KDF holds a bare MD5. It must still let its owner in, and the record
+// must be rewritten at the current cost so the upgrade needs no operator step.
+TEST(AmuleApiConfig, LegacyBareMd5IsUpgradedOnSuccessfulLogin)
+{
+	const wxString dir = MakeTmpDir("pw-legacy");
+	const std::string legacy = "0123456789abcdef0123456789abcdef";
+	::wxMkdir(dir, 0700);
+	{
+		wxFile f(dir + "/amuleapi-passwords", wxFile::write);
+		const std::string line = "admin=" + legacy + "\n";
+		f.Write(line.data(), line.size());
+	}
+#ifndef _WIN32
+	::chmod(std::string((dir + "/amuleapi-passwords").utf8_str()).c_str(), S_IRUSR | S_IWUSR);
+#endif
+
+	CAmuleApiConfig cfg;
+	ASSERT_TRUE(cfg.Load(dir));
+	ASSERT_EQUALS(legacy, cfg.AdminCredential());
+
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::Admin == cfg.VerifyPassword(legacy));
+	// Upgraded in place: no longer the bare digest, and still verifies.
+	ASSERT_TRUE(cfg.AdminCredential() != legacy);
+	ASSERT_FALSE(webcommon::IsLegacyMd5Record(cfg.AdminCredential()));
+
+	CAmuleApiConfig cfg2;
+	ASSERT_TRUE(cfg2.Load(dir));
+	ASSERT_TRUE(CAmuleApiConfig::MatchedRole::Admin == cfg2.VerifyPassword(legacy));
+}
+
+TEST(AmuleApiConfig, MalformedPasswordLineRejected)
+{
+	const wxString dir = MakeTmpDir("pw-bad");
+	// Hand-create the dir and a bad passwords file BEFORE Load() runs, otherwise the auto-
+	// create path writes a fresh empty file and the parser failure path is never exercised.
+	::wxMkdir(dir, 0700);
+	wxFile bad(dir + "/amuleapi-passwords", wxFile::write);
+	const char *bad_line = "admin=not_a_valid_record\n";
+	bad.Write(bad_line, std::strlen(bad_line));
+	bad.Close();
+#ifndef _WIN32
+	::chmod(std::string((dir + "/amuleapi-passwords").utf8_str()).c_str(), S_IRUSR | S_IWUSR);
+#endif
+
+	CAmuleApiConfig cfg;
+	ASSERT_FALSE(cfg.Load(dir));
+	ASSERT_TRUE(!cfg.LastError().empty());
+}
+
+#ifndef _WIN32
+// POSIX-only: the production hardening (the mode-bit check in AmuleApiConfig::EnforceOwnerOnly) is
+// itself POSIX-only. Windows uses ACLs rather than POSIX mode bits, and the typical Windows daemon
+// footprint -- single-operator workstation, %USERPROFILE%-scoped config dir -- makes the threat
+// model very different. If amuleapi ever ships a Windows hardening pass, via GetSecurityInfo /
+// GetEffectiveRightsFromAcl on the secret file's DACL, the matching test belongs under `#ifdef
+// _WIN32` here. Until then the #ifndef intentionally skips the assertion on Windows, so the suite
+// stays green there without misrepresenting the platform's posture.
+TEST(AmuleApiConfig, LooserSecretFilePermissionsRejected)
+{
+	const wxString dir = MakeTmpDir("perm");
+	CAmuleApiConfig cfg;
+	ASSERT_TRUE(cfg.Load(dir)); // first load auto-creates with 0600
+
+	// Loosen the secret file to 0644 and verify the next Load fails with an actionable error.
+	// This guards the "operator accidentally chmodded the secret world-readable" scenario.
+	const std::string path = std::string((dir + "/amuleapi-jwt-secret").utf8_str());
+	ASSERT_EQUALS(0, ::chmod(path.c_str(), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH));
+
+	CAmuleApiConfig cfg2;
+	ASSERT_FALSE(cfg2.Load(dir));
+	ASSERT_TRUE(cfg2.LastError().find("0600") != std::string::npos);
+}
+#endif
+
+TEST(AmuleApiConfig, ConfDefaultsArePopulated)
+{
+	const wxString dir = MakeTmpDir("conf-defaults");
+	CAmuleApiConfig cfg;
+	ASSERT_TRUE(cfg.Load(dir));
+
+	ASSERT_EQUALS(std::string("127.0.0.1"), cfg.ServerCfg().bind_address);
+	ASSERT_EQUALS(static_cast<unsigned>(4713), cfg.ServerCfg().port);
+	ASSERT_EQUALS(std::string("127.0.0.1"), cfg.EcCfg().host);
+	ASSERT_EQUALS(static_cast<unsigned>(4712), cfg.EcCfg().port);
+	ASSERT_TRUE(!cfg.ServerCfg().allow_cors);
+}

amule-3.1.0.tar.gz/unittests/tests/AuthTest.cpp Added

@@ -0,0 +1,268 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include <muleunit/test.h>
+
+#include "Auth.h"
+
+#include "Jwt.h"
+
+#include <chrono>
+#include <ctime>
+#include <string>
+#include <thread>
+#include <vector>
+
+using namespace muleunit;
+using namespace webapi;
+
+DECLARE_SIMPLE(Auth)
+
+// ---------- CRevocationSet ---------------------------------------
+
+TEST(Auth, RevocationSet_FreshIsNotRevoked)
+{
+	CRevocationSet rs;
+	ASSERT_FALSE(rs.IsRevoked("never-seen-jti"));
+	ASSERT_EQUALS(static_cast<std::size_t>(0), rs.Size());
+}
+
+TEST(Auth, RevocationSet_RevokedJtiSticks)
+{
+	CRevocationSet rs;
+	const std::time_t hour_from_now = std::time(nullptr) + 3600;
+	rs.Revoke("abc-jti", hour_from_now);
+
+	ASSERT_TRUE(rs.IsRevoked("abc-jti"));
+	ASSERT_FALSE(rs.IsRevoked("def-jti"));
+	ASSERT_EQUALS(static_cast<std::size_t>(1), rs.Size());
+}
+
+TEST(Auth, RevocationSet_ExpiredEntryGcsOnNextLookup)
+{
+	CRevocationSet rs;
+	// Revoke with exp in the PAST, simulating a token whose JWT lifetime has already elapsed.
+	// IsRevoked must drop the entry rather than keep flagging it -- there is no point, the JWT
+	// itself would fail Verify.
+	const std::time_t two_hours_ago = std::time(nullptr) - 7200;
+	rs.Revoke("stale-jti", two_hours_ago);
+
+	ASSERT_FALSE(rs.IsRevoked("stale-jti"));
+	ASSERT_EQUALS(static_cast<std::size_t>(0), rs.Size());
+}
+
+// ---------- CRateLimiter -----------------------------------------
+
+TEST(Auth, RateLimiter_NoFailuresMeansNoLockout)
+{
+	CRateLimiter::Config cfg;
+	cfg.window_seconds = 60;
+	cfg.threshold = 3;
+	cfg.lockout_seconds = 60;
+	CRateLimiter rl(cfg);
+	const auto d = rl.Check("192.0.2.1");
+	ASSERT_FALSE(d.locked_out);
+}
+
+TEST(Auth, RateLimiter_ThresholdFailuresLockOut)
+{
+	CRateLimiter::Config cfg;
+	cfg.window_seconds = 60;
+	cfg.threshold = 3;
+	cfg.lockout_seconds = 120;
+	CRateLimiter rl(cfg);
+	const std::string ip = "192.0.2.2";
+
+	rl.NoteFailure(ip);
+	ASSERT_FALSE(rl.Check(ip).locked_out);
+	rl.NoteFailure(ip);
+	ASSERT_FALSE(rl.Check(ip).locked_out);
+	rl.NoteFailure(ip); // third → lockout armed
+	const auto d = rl.Check(ip);
+	ASSERT_TRUE(d.locked_out);
+	ASSERT_TRUE(d.retry_after_seconds > 0);
+	ASSERT_TRUE(d.retry_after_seconds <= 120);
+}
+
+TEST(Auth, RateLimiter_SuccessClearsBucket)
+{
+	CRateLimiter::Config cfg;
+	cfg.window_seconds = 60;
+	cfg.threshold = 2;
+	cfg.lockout_seconds = 60;
+	CRateLimiter rl(cfg);
+	const std::string ip = "192.0.2.3";
+
+	rl.NoteFailure(ip);
+	rl.NoteSuccess(ip);
+	rl.NoteFailure(ip); // only one failure since the reset
+
+	ASSERT_FALSE(rl.Check(ip).locked_out);
+}
+
+TEST(Auth, RateLimiter_DifferentIpsTrackedSeparately)
+{
+	CRateLimiter::Config cfg;
+	cfg.window_seconds = 60;
+	cfg.threshold = 2;
+	cfg.lockout_seconds = 60;
+	CRateLimiter rl(cfg);
+
+	rl.NoteFailure("198.51.100.1");
+	rl.NoteFailure("198.51.100.1"); // locks out .1
+
+	ASSERT_TRUE(rl.Check("198.51.100.1").locked_out);
+	ASSERT_FALSE(rl.Check("198.51.100.2").locked_out);
+}
+
+TEST(Auth, RateLimiter_LockoutExpiresAfterLockoutSeconds)
+{
+	// Regression: forgetting the "lockout_until <= now -> wipe bucket" path would silently jail
+	// the affected IP forever. Clock injection lets us step `now` past lockout_until without
+	// burning real time on a sleep.
+	CRateLimiter::Config cfg;
+	cfg.window_seconds = 60;
+	cfg.threshold = 1;
+	cfg.lockout_seconds = 1;
+	std::time_t fake_now = 1000;
+	CRateLimiter rl(cfg, & { return fake_now; });
+	const std::string ip = "203.0.113.7";
+
+	rl.NoteFailure(ip);
+	ASSERT_TRUE(rl.Check(ip).locked_out);
+
+	fake_now += 2;
+
+	const auto d = rl.Check(ip);
+	ASSERT_FALSE(d.locked_out);
+	ASSERT_EQUALS(static_cast<std::time_t>(0), d.retry_after_seconds);
+}
+
+TEST(Auth, RateLimiter_SlidingWindowSplitAttemptsStillLockOut)
+{
+	// Regression check for the original tumbling-window bug: threshold-1 failures in the tail of
+	// window N plus threshold-1 in the head of window N+1 never tripped lockout, because the old
+	// code reset failure_count whenever `now - window_start > window_seconds`. The current
+	// per-stamp eviction keeps any failure within `window_seconds` live in the count.
+	//
+	// Sequence (window=3, threshold=3), clock-injected:
+	//   t=0  NoteFailure  -> failures=0,          count=1
+	//   t=3  NoteFailure  -> failures=0, 3,       count=2
+	//   t=4  NoteFailure  -> failures=3, 4,       count=2  (evict<1)
+	//   t=5  NoteFailure  -> failures=3, 4, 5,    count=3 -> LOCKOUT
+	CRateLimiter::Config cfg;
+	cfg.window_seconds = 3;
+	cfg.threshold = 3;
+	cfg.lockout_seconds = 60;
+	std::time_t fake_now = 0;
+	CRateLimiter rl(cfg, & { return fake_now; });
+	const std::string ip = "203.0.113.9";
+
+	rl.NoteFailure(ip); // t=0
+	fake_now = 3;
+	rl.NoteFailure(ip); // t=3
+	fake_now = 4;
+	rl.NoteFailure(ip); // t=4 (boundary crossing)
+	fake_now = 5;
+	rl.NoteFailure(ip); // t=5 (sliding count reaches 3)
+	ASSERT_TRUE(rl.Check(ip).locked_out);
+}
+
+// ---------- Revocation × Verify cross-test -----------------------
+
+// Each side is unit-tested separately. This case wires the two together: issue a token, mark its
+// `jti` revoked, then verify the token's body. Verify itself returns true -- the token is
+// structurally valid and the MAC matches -- but the caller must consult CRevocationSet AFTER Verify
+// and refuse if the jti is listed. A regression where IsRevoked() short-circuits, or where Verify
+// silently incorporates the revocation set, would slip past each component's own tests; this one
+// catches it.
+TEST(Auth, RevocationListBlocksOtherwiseValidToken)
+{
+	const std::vector<unsigned char> secret(32, 0xC1);
+	CJwt jwt(secret);
+	const CJwt::IssuedToken issued = jwt.Issue(Role::ADMIN);
+
+	CJwt::VerifyResult vr;
+	ASSERT_TRUE(jwt.Verify(issued.token, vr));
+	ASSERT_EQUALS(static_cast<int>(Role::ADMIN), static_cast<int>(vr.role));
+
+	CRevocationSet rev;
+	ASSERT_FALSE(rev.IsRevoked(vr.jti));
+
+	rev.Revoke(vr.jti, vr.exp);
+	ASSERT_TRUE(rev.IsRevoked(vr.jti));
+
+	// A second Verify of the same token still passes, cryptography being independent of the
+	// revocation list. The auth gate's contract is: Verify FIRST, then check IsRevoked, and
+	// refuse the request if either step rejects.
+	CJwt::VerifyResult vr2;
+	ASSERT_TRUE(jwt.Verify(issued.token, vr2));
+	ASSERT_EQUALS(vr.jti, vr2.jti);
+	ASSERT_TRUE(rev.IsRevoked(vr2.jti));
+}
+
+// ---------- Token extraction -------------------------------------
+
+TEST(Auth, ExtractBearerToken_HappyPath)
+{
+	const std::string token = ExtractBearerToken("Bearer abc.def.ghi");
+	ASSERT_EQUALS(std::string("abc.def.ghi"), token);
+}
+
+TEST(Auth, ExtractBearerToken_CaseInsensitiveScheme)
+{
+	ASSERT_EQUALS(std::string("xyz"), ExtractBearerToken("bearer xyz"));
+	ASSERT_EQUALS(std::string("xyz"), ExtractBearerToken("BEARER xyz"));
+}
+
+TEST(Auth, ExtractBearerToken_RejectsMissingValue)
+{
+	ASSERT_TRUE(ExtractBearerToken("Bearer ").empty());
+	ASSERT_TRUE(ExtractBearerToken("Bearer").empty());
+	ASSERT_TRUE(ExtractBearerToken("Basic dXNlcjpwYXNz").empty());
+	ASSERT_TRUE(ExtractBearerToken("").empty());
+}
+
+TEST(Auth, ExtractBearerToken_TolerantOfExtraSpaces)
+{
+	// Multiple OWS chars between scheme and credentials per RFC 7230 §3.2.3.
+	ASSERT_EQUALS(std::string("tok"), ExtractBearerToken("Bearer   tok"));
+}
+
+TEST(Auth, ExtractCookieValue_HappyPath)
+{
+	ASSERT_EQUALS(std::string("xyz"), ExtractCookieValue("amuleapi_token=xyz", "amuleapi_token"));
+}
+
+TEST(Auth, ExtractCookieValue_OtherCookiesInWay)
+{
+	const std::string header = "foo=1; amuleapi_token=abc; bar=2";
+	ASSERT_EQUALS(std::string("abc"), ExtractCookieValue(header, "amuleapi_token"));
+}
+
+TEST(Auth, ExtractCookieValue_MissingReturnsEmpty)
+{
+	ASSERT_TRUE(ExtractCookieValue("foo=1; bar=2", "amuleapi_token").empty());
+	ASSERT_TRUE(ExtractCookieValue("", "amuleapi_token").empty());
+}

amule-3.1.0.tar.gz/unittests/tests/BanRecordTest.cpp Added

@@ -0,0 +1,227 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include "BanRecord.h"
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(BanRecord)
+
+namespace
+{
+// A tick well clear of zero, so an expiry comparison cannot pass by accident
+// on an uninitialised value.
+const uint64 T0 = 1000000;
+const uint32 IP_A = 0x0100007f;
+const uint32 IP_B = 0x0200007f;
+} // namespace
+
+// The whole point of the class: the caller increments a counter when this returns true, so a second
+// ban of the same address must answer false or the statistic drifts.
+// CUpDownClient::SetSpammer(true) calls Ban() with no IsBanned() check, which is how that second
+// call happens in practice.
+// ASSERT_EQUALS takes its arguments by const reference, so this odr-uses BAN_DURATION_MS. With
+// the member declared static const and defined nowhere, it does not link; constexpr is what makes
+// it work. The assertion itself is almost beside the point, the reference binding is the test.
+TEST(BanRecord, AddressKeysNormalizeIPv4WithoutChangingByteOrder)
+{
+	CBanRecord record;
+	const auto v4 = CNetworkAddress::FromIPv4NetworkOrder(0x010200c0);
+	const auto mapped =
+		CNetworkAddress::IPv6FromOctets({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 192, 0, 2, 1 });
+	ASSERT_TRUE(record.Ban(0x010200c0, T0));
+	ASSERT_TRUE(record.IsBanned(v4, T0));
+	ASSERT_FALSE(record.Ban(mapped, T0 + 10));
+	ASSERT_EQUALS(1u, (unsigned)record.Size());
+	ASSERT_FALSE(record.IsBanned(0xc0000201, T0));
+	ASSERT_TRUE(record.IsBanned(v4, T0 + CBanRecord::BAN_DURATION_MS));
+	bool dropped = false;
+	ASSERT_FALSE(record.IsBanned(mapped, T0 + 10 + CBanRecord::BAN_DURATION_MS, &dropped));
+	ASSERT_TRUE(dropped);
+	ASSERT_TRUE(record.Ban(mapped, T0));
+	ASSERT_TRUE(record.Unban(0x010200c0));
+}
+
+TEST(BanRecord, IPv6BansRemainPerHostAndScoped)
+{
+	CBanRecord record;
+	CNetworkAddress::Octets bytes = { 0x20, 1, 0x0d, 0xb8 };
+	bytes15 = 1;
+	const auto first = CNetworkAddress::IPv6FromOctets(bytes);
+	bytes15 = 2;
+	const auto second = CNetworkAddress::IPv6FromOctets(bytes);
+	ASSERT_TRUE(record.Ban(first, T0));
+	ASSERT_FALSE(record.IsBanned(second, T0));
+	ASSERT_TRUE(record.Ban(second, T0 + 1));
+	ASSERT_EQUALS(1u, (unsigned)record.DropLapsed(T0 + CBanRecord::BAN_DURATION_MS));
+	ASSERT_TRUE(record.IsBanned(second, T0 + CBanRecord::BAN_DURATION_MS));
+	ASSERT_TRUE(record.Unban(second));
+	bytes = { 0xfe, 0x80 };
+	bytes15 = 1;
+	const auto scoped = CNetworkAddress::IPv6FromOctets(bytes, 3);
+	ASSERT_TRUE(record.Ban(scoped, T0));
+	ASSERT_FALSE(record.IsBanned(CNetworkAddress::IPv6FromOctets(bytes, 9), T0));
+	record.Clear();
+	ASSERT_EQUALS(0u, (unsigned)record.Size());
+}
+
+TEST(BanRecord, AbsentAndUnspecifiedKeysNeverEnterTheRecord)
+{
+	CBanRecord record;
+	const auto mappedZero = CNetworkAddress::IPv6FromOctets({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff });
+	for (const auto &address : { CNetworkAddress::Absent(),
+		     CNetworkAddress::AnyIPv6(),
+		     CNetworkAddress::FromIPv4NetworkOrder(0),
+		     mappedZero }) {
+		ASSERT_FALSE(record.Ban(address, T0));
+		bool dropped = true;
+		ASSERT_FALSE(record.IsBanned(address, T0, &dropped));
+		ASSERT_FALSE(dropped);
+		ASSERT_FALSE(record.Unban(address));
+	}
+	ASSERT_EQUALS(0u, (unsigned)record.Size());
+}
+
+TEST(BanRecord, TheBanDurationConstantCanBeReferenced)
+{
+	ASSERT_EQUALS(static_cast<uint64>(CLIENTBANTIME), CBanRecord::BAN_DURATION_MS);
+}
+
+TEST(BanRecord, BanningTheSameAddressTwiceCountsOnce)
+{
+	CBanRecord record;
+
+	ASSERT_TRUE(record.Ban(IP_A, T0));
+	ASSERT_EQUALS(1u, (unsigned)record.Size());
+
+	ASSERT_FALSE(record.Ban(IP_A, T0 + 10));
+	ASSERT_EQUALS(1u, (unsigned)record.Size());
+
+	// The tick is still refreshed, so the ban is extended rather than left to
+	// expire on the first one's schedule.
+	ASSERT_TRUE(record.IsBanned(IP_A, T0 + 10 + CBanRecord::BAN_DURATION_MS - 1));
+	ASSERT_FALSE(record.IsBanned(IP_A, T0 + 10 + CBanRecord::BAN_DURATION_MS));
+}
+
+// The mirror. Unbanning an address that is not banned must answer false, or
+// the same counter drifts the other way.
+TEST(BanRecord, UnbanningAnAddressThatIsNotBannedCountsNothing)
+{
+	CBanRecord record;
+
+	ASSERT_FALSE(record.Unban(IP_A));
+	ASSERT_EQUALS(0u, (unsigned)record.Size());
+
+	ASSERT_TRUE(record.Ban(IP_A, T0));
+	ASSERT_TRUE(record.Unban(IP_A));
+	ASSERT_EQUALS(0u, (unsigned)record.Size());
+
+	// And again, now that it is genuinely gone.
+	ASSERT_FALSE(record.Unban(IP_A));
+}
+
+// Zero is not an address. CUpDownClient's constructor sets the address to zero when there is no
+// socket, so one entry under that key would make every such client read back as banned.
+TEST(BanRecord, ZeroIsNeverBannedAndNeverAKey)
+{
+	CBanRecord record;
+
+	ASSERT_FALSE(record.Ban(0, T0));
+	ASSERT_EQUALS(0u, (unsigned)record.Size());
+	ASSERT_FALSE(record.IsBanned(0, T0));
+
+	// A real ban does not make the zero key readable either.
+	ASSERT_TRUE(record.Ban(IP_A, T0));
+	ASSERT_FALSE(record.IsBanned(0, T0));
+}
+
+// Expiry is read at the lookup rather than swept, so a lapsed ban must answer false the moment it
+// lapses -- and must stop being counted, because the caller decrements on the transition.
+TEST(BanRecord, ALapsedBanIsForgottenOnLookup)
+{
+	CBanRecord record;
+	ASSERT_TRUE(record.Ban(IP_A, T0));
+
+	const uint64 lapsed = T0 + CBanRecord::BAN_DURATION_MS;
+	ASSERT_FALSE(record.IsBanned(IP_A, lapsed));
+	// Forgotten, not merely reported false: the entry is gone, so the caller
+	// that decremented on this transition will not decrement again.
+	ASSERT_EQUALS(0u, (unsigned)record.Size());
+	ASSERT_FALSE(record.Unban(IP_A));
+}
+
+// The lookup reports whether it dropped an entry, so the caller knows whether to decrement.
+// Reporting the drop is the only way it can: it has no other view of the map.
+TEST(BanRecord, TheLookupReportsWhetherItDroppedALapsedEntry)
+{
+	CBanRecord record;
+	ASSERT_TRUE(record.Ban(IP_A, T0));
+
+	bool dropped = false;
+	ASSERT_TRUE(record.IsBanned(IP_A, T0 + 1, &dropped));
+	ASSERT_FALSE(dropped);
+
+	ASSERT_FALSE(record.IsBanned(IP_A, T0 + CBanRecord::BAN_DURATION_MS, &dropped));
+	ASSERT_TRUE(dropped);
+
+	// Nothing left to drop the second time.
+	ASSERT_FALSE(record.IsBanned(IP_A, T0 + CBanRecord::BAN_DURATION_MS, &dropped));
+	ASSERT_FALSE(dropped);
+}
+
+// Two addresses are two bans. Trivial, but it is what makes Size() a
+// meaningful stand-in for the statistic the caller keeps.
+TEST(BanRecord, DistinctAddressesAreCountedSeparately)
+{
+	CBanRecord record;
+
+	ASSERT_TRUE(record.Ban(IP_A, T0));
+	ASSERT_TRUE(record.Ban(IP_B, T0));
+	ASSERT_EQUALS(2u, (unsigned)record.Size());
+
+	ASSERT_TRUE(record.Unban(IP_A));
+	ASSERT_EQUALS(1u, (unsigned)record.Size());
+	ASSERT_TRUE(record.IsBanned(IP_B, T0 + 1));
+	ASSERT_FALSE(record.IsBanned(IP_A, T0 + 1));
+}
+
+// The sweep exists so a table of long-lapsed entries does not grow without bound when nobody looks
+// those addresses up again. It reports how many it dropped, for the same reason the lookup does.
+TEST(BanRecord, TheSweepDropsOnlyLapsedEntriesAndReportsHowMany)
+{
+	CBanRecord record;
+	ASSERT_TRUE(record.Ban(IP_A, T0));
+	ASSERT_TRUE(record.Ban(IP_B, T0 + CBanRecord::BAN_DURATION_MS));
+
+	// Only the first has lapsed at this point.
+	const uint64 now = T0 + CBanRecord::BAN_DURATION_MS + 1;
+	ASSERT_EQUALS(1u, (unsigned)record.DropLapsed(now));
+	ASSERT_EQUALS(1u, (unsigned)record.Size());
+	ASSERT_TRUE(record.IsBanned(IP_B, now));
+
+	// A second sweep at the same instant has nothing left to do.
+	ASSERT_EQUALS(0u, (unsigned)record.DropLapsed(now));
+}

amule-3.1.0.tar.gz/unittests/tests/BrowseLifecycleTest.cpp Added

@@ -0,0 +1,234 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include <BrowseLifecycle.h>
+
+using namespace muleunit;
+using namespace browse;
+
+DECLARE_SIMPLE(BrowseLifecycle)
+
+namespace
+{
+//! A browse just asked for, over the directory-by-directory protocol form.
+Record DirBrowse(std::uint64_t deadline = 1000)
+{
+	Record r;
+	r.searchId = 42;
+	r.state = State::InProgress;
+	r.outstanding = kFlatBrowse; // until the peer answers with a count
+	r.deadline = deadline;
+	return r;
+}
+} // namespace
+
+// The five defects this machine exists to make unreachable. Each was a live bug only the right kind
+// of peer could reach: amule-org/amule#1071 and its two follow-ups. They are the reason the
+// lifecycle was pulled out of CUpDownClient at all.
+
+TEST(BrowseLifecycle, FlatBrowseCompletesWhenItsSingleAnswerArrives)
+{
+	// A peer without directory support (MLdonkey, plain eDonkey, eMule < 0.28) answers
+	// OP_ASKSHAREDFILES in one packet. That used to leave the browse BROWSE_IN_PROGRESS forever
+	// -- a *successful* browse that never ended, with no timeout able to touch it.
+	Record r = DirBrowse();
+	ASSERT_TRUE(Tick(r, 1) == Action::None);
+
+	r = OnListingReceived(r, 2000);
+	ASSERT_EQUALS(0, r.outstanding);
+	ASSERT_TRUE(Tick(r, 1) == Action::Complete);
+}
+
+TEST(BrowseLifecycle, ZeroDirectoriesCompletesRatherThanWaiting)
+{
+	// A peer answering "I have 0 directories" is a real answer. It used to set the counter to 0
+	// with nothing marking the browse finished, leaving it hanging at 0%.
+	Record r = DirBrowse();
+	r = OnDirectoryList(r, 0, 2000);
+	ASSERT_EQUALS(0, r.outstanding);
+	ASSERT_TRUE(Tick(r, 1) == Action::Complete);
+}
+
+TEST(BrowseLifecycle, TerminalRecordIsDroppedNotRetriedForever)
+{
+	// The pending list used to key its erase on the deadline rather than the state, so a browse
+	// that ended without clearing its deadline was re-examined on every core tick for the life
+	// of the client.
+	for (State s : { State::Finished, State::Failed }) {
+		Record r = DirBrowse();
+		r.state = s;
+		ASSERT_TRUE(Tick(r, 1) == Action::Drop);
+		ASSERT_TRUE(Tick(r, 999999) == Action::Drop);
+	}
+}
+
+TEST(BrowseLifecycle, SilenceExpiresOnlyAfterTheDeadline)
+{
+	Record r = DirBrowse(1000);
+	r = OnDirectoryList(r, 3, 1000);
+	ASSERT_TRUE(Tick(r, 999) == Action::None);
+	ASSERT_TRUE(Tick(r, 1000) == Action::None); // not yet: strictly after
+	ASSERT_TRUE(Tick(r, 1001) == Action::Expire);
+}
+
+TEST(BrowseLifecycle, ProgressPushesTheDeadlineBackSoALiveStreamSurvives)
+{
+	// The deadline bounds silence, not duration: a large share may stream for
+	// far longer than the timeout as long as something keeps arriving.
+	Record r = DirBrowse(1000);
+	r = OnDirectoryList(r, 3, 1000);
+	// Each directory lands just before the previous deadline would have run
+	// out, so total elapsed time (2700) far exceeds the 1000-tick timeout.
+	std::uint64_t t = 900;
+	for (int dir = 0; dir < 3; ++dir, t += 900) {
+		ASSERT_TRUE(Tick(r, t) == Action::None);
+		r = OnListingReceived(r, t + 1000);
+	}
+	// Three listings for three directories: complete, never expired.
+	ASSERT_EQUALS(0, r.outstanding);
+	ASSERT_TRUE(Tick(r, t) == Action::Complete);
+}
+
+TEST(BrowseLifecycle, CompletionWinsOverAnExpiryInTheSameTick)
+{
+	// The last listing landing exactly as the deadline passes is a success.
+	// Reporting it as a timeout would discard results already in hand.
+	Record r = DirBrowse();
+	r = OnDirectoryList(r, 1, 500);
+	r = OnListingReceived(r, 500);
+	ASSERT_EQUALS(0, r.outstanding);
+	ASSERT_TRUE(Tick(r, 100000) == Action::Complete);
+}
+
+// --- Progress reporting. ----------------------------------------------
+
+TEST(BrowseLifecycle, BarTracksDirectoriesReceived)
+{
+	Record r = DirBrowse();
+	ASSERT_EQUALS(static_cast<std::uint16_t>(0), BarValue(r)); // no count yet
+	r = OnDirectoryList(r, 4, 2000);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(0), BarValue(r));
+	r = OnListingReceived(r, 2000);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(25), BarValue(r));
+	r = OnListingReceived(r, 2000);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(50), BarValue(r));
+}
+
+TEST(BrowseLifecycle, BarClearsOnceTerminal)
+{
+	// 0xffff is the sentinel the search list's bar already reads as "clear".
+	Record r = DirBrowse();
+	r = OnDirectoryList(r, 2, 2000);
+	r.state = State::Finished;
+	ASSERT_EQUALS(static_cast<std::uint16_t>(0xffff), BarValue(r));
+	r.state = State::Failed;
+	ASSERT_EQUALS(static_cast<std::uint16_t>(0xffff), BarValue(r));
+}
+
+TEST(BrowseLifecycle, FlatBrowseReportsNoPercent)
+{
+	// Nothing to count against, so it reports 0 rather than inventing progress.
+	Record r = DirBrowse();
+	ASSERT_EQUALS(static_cast<std::uint16_t>(0), BarValue(r));
+	ASSERT_EQUALS(kFlatBrowse, r.outstanding);
+}
+
+// --- Late and duplicate packets. --------------------------------------
+
+TEST(BrowseLifecycle, PacketsForATerminalBrowseChangeNothing)
+{
+	// A peer that answers after we gave up must not resurrect the record -- the search id may
+	// already have been reused for a fresh browse of the same peer.
+	Record failed = DirBrowse();
+	failed.state = State::Failed;
+
+	Record after = OnDirectoryList(failed, 5, 9999);
+	ASSERT_TRUE(after.state == State::Failed);
+	ASSERT_EQUALS(kFlatBrowse, after.outstanding);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(1000), after.deadline);
+
+	after = OnListingReceived(failed, 9999);
+	ASSERT_TRUE(after.state == State::Failed);
+	ASSERT_EQUALS(kFlatBrowse, after.outstanding);
+}
+
+TEST(BrowseLifecycle, MoreListingsThanAnnouncedDoNotUnderflow)
+{
+	// A peer sending more directories than it announced must not drive the
+	// counter negative, which would make the browse un-completable.
+	Record r = DirBrowse();
+	r = OnDirectoryList(r, 1, 2000);
+	r = OnListingReceived(r, 2000);
+	ASSERT_EQUALS(0, r.outstanding);
+	r = OnListingReceived(r, 2000);
+	ASSERT_EQUALS(0, r.outstanding);
+	ASSERT_TRUE(Tick(r, 1) == Action::Complete);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(100), BarValue(r));
+}
+
+TEST(BrowseLifecycle, ADirectoryAnswerAfterListingsHaveStartedIsStillHonoured)
+{
+	// OP_ASKSHAREDDIRSANS is the clearest sign of life in the exchange, so it
+	// must push the deadline back like any other progress.
+	Record r = DirBrowse(1000);
+	r = OnDirectoryList(r, 2, 5000);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(5000), r.deadline);
+	ASSERT_TRUE(Tick(r, 1001) == Action::None);
+}
+
+// --- Terminal is terminal. ---------------------------------------------
+
+TEST(BrowseLifecycle, ADisconnectAfterCompletionDoesNotTurnSuccessIntoFailure)
+{
+	// The ordinary shape of a successful browse: the peer sends its last directory and then
+	// drops the connection. The disconnect path asks for a failure without knowing the browse
+	// just succeeded, so the rule has to be here rather than at that call site.
+	Record r = DirBrowse();
+	r = OnDirectoryList(r, 1, 2000);
+	r = OnListingReceived(r, 2000);
+	r = ApplyAction(r, Action::Complete);
+	ASSERT_TRUE(r.state == State::Finished);
+
+	r = ApplyAction(r, Action::Expire);
+	ASSERT_TRUE(r.state == State::Finished);
+}
+
+TEST(BrowseLifecycle, AFailedBrowseIsNotCompletedByALatePacket)
+{
+	Record r = DirBrowse();
+	r = ApplyAction(r, Action::Expire);
+	ASSERT_TRUE(r.state == State::Failed);
+
+	r = ApplyAction(r, Action::Complete);
+	ASSERT_TRUE(r.state == State::Failed);
+}
+
+TEST(BrowseLifecycle, DropAndNoneAreNotStateChanges)
+{
+	Record r = DirBrowse();
+	ASSERT_TRUE(ApplyAction(r, Action::None).state == State::InProgress);
+	ASSERT_TRUE(ApplyAction(r, Action::Drop).state == State::InProgress);
+}

amule-3.1.0.tar.gz/unittests/tests/BrowseStoreTest.cpp Added

@@ -0,0 +1,463 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include <BrowseStore.h>
+
+using namespace muleunit;
+using namespace browse;
+
+DECLARE_SIMPLE(BrowseStore)
+
+namespace
+{
+// Stand-ins for peers. Only their addresses matter -- the store never
+// dereferences a client, which is what lets these be anything at all.
+int g_alice = 0;
+int g_bob = 0;
+Store::ClientKey ALICE = &g_alice;
+Store::ClientKey BOB = &g_bob;
+
+constexpr std::uint32_t kSidA = 10;
+constexpr std::uint32_t kSidB = 20;
+} // namespace
+
+// --- Starting, and the join the EC handler depends on. ----------------
+
+TEST(BrowseStore, StartTracksTheBrowseAndAnswersForThePeer)
+{
+	Store s;
+	ASSERT_TRUE(s.Start(ALICE, kSidA, 1000).started);
+	ASSERT_EQUALS(kSidA, s.SearchIdFor(ALICE));
+	ASSERT_TRUE(s.Has(kSidA));
+	ASSERT_TRUE(s.StateOf(kSidA) == State::InProgress);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), s.Size());
+}
+
+TEST(BrowseStore, ASecondBrowseOfTheSamePeerIsRefused)
+{
+	// This is the rule the EC handler's "join the browse already in flight" rests on: there is
+	// one exchange with a peer, so a second record could only ever describe the same one.
+	Store s;
+	ASSERT_TRUE(s.Start(ALICE, kSidA, 1000).started);
+	ASSERT_FALSE(s.Start(ALICE, kSidB, 1000).started);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), s.Size());
+	ASSERT_EQUALS(kSidA, s.SearchIdFor(ALICE));
+}
+
+TEST(BrowseStore, DifferentPeersAreTrackedIndependently)
+{
+	Store s;
+	ASSERT_TRUE(s.Start(ALICE, kSidA, 1000).started);
+	ASSERT_TRUE(s.Start(BOB, kSidB, 1000).started);
+	ASSERT_EQUALS(kSidA, s.SearchIdFor(ALICE));
+	ASSERT_EQUALS(kSidB, s.SearchIdFor(BOB));
+
+	s.Fail(ALICE);
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Failed);
+	ASSERT_TRUE(s.StateOf(kSidB) == State::InProgress);
+}
+
+TEST(BrowseStore, StartRejectsNonsense)
+{
+	Store s;
+	ASSERT_FALSE(s.Start(nullptr, kSidA, 1000).started);
+	ASSERT_FALSE(s.Start(ALICE, 0, 1000).started);
+	ASSERT_EQUALS(static_cast<std::size_t>(0), s.Size());
+}
+
+TEST(BrowseStore, AFinishedBrowseNoLongerAnswersAsThePeersLiveOne)
+{
+	// SearchIdFor reports only a browse in progress, so a peer whose browse
+	// has ended can be browsed afresh rather than joined to a dead one.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	s.Finish(ALICE);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), s.SearchIdFor(ALICE));
+	// ...but it is still on the books, and still answers for its state.
+	ASSERT_TRUE(s.Has(kSidA));
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Finished);
+}
+
+// --- The two bugs that live verification caught, not the tests. --------
+
+TEST(BrowseStore, ATerminalRecordOutlivesItsClient)
+{
+	// Erasing the record when the browse ended was a real regression: every consumer asks the
+	// store what state a search is in, so a dropped record sends the listing back to guessing
+	// from whether results were retained -- which reports a failed browse as idle, forever.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	ASSERT_TRUE(s.Fail(ALICE).effect == Effect::AnnounceFailure);
+
+	// The tick that follows releases the peer and nothing else.
+	const auto todo = s.Tick(2000);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), todo.size());
+	ASSERT_EQUALS(kSidA, todo0.searchId);
+	ASSERT_TRUE(todo0.effect == Effect::ReleaseClient);
+
+	ASSERT_TRUE(s.Has(kSidA));
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Failed);
+
+	// And it settles: no further ticks keep reporting it.
+	ASSERT_TRUE(s.Tick(3000).empty());
+	ASSERT_TRUE(s.Tick(999999).empty());
+}
+
+TEST(BrowseStore, ADisconnectAfterSuccessIsNotReportedAsAFailure)
+{
+	// The ordinary end of a successful browse: the peer sends its last directory and drops the
+	// connection, and the disconnect path asks for a failure without knowing the browse just
+	// succeeded.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	s.OnDirectoryList(ALICE, 1, 1000);
+	ASSERT_TRUE(s.OnListingReceived(ALICE, 1000).effect == Effect::Announce);
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Finished);
+
+	ASSERT_TRUE(s.Fail(ALICE).effect == Effect::Nothing);
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Finished);
+}
+
+// --- Completion, both protocol forms. ---------------------------------
+
+TEST(BrowseStore, AFlatBrowseCompletesOnItsSingleAnswer)
+{
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	ASSERT_TRUE(s.OnListingReceived(ALICE, 1000).effect == Effect::Announce);
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Finished);
+}
+
+TEST(BrowseStore, ADirectoryBrowseCompletesOnItsLastListing)
+{
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	ASSERT_TRUE(s.OnDirectoryList(ALICE, 2, 1000).effect == Effect::Nothing);
+	ASSERT_TRUE(s.OnListingReceived(ALICE, 1000).effect == Effect::Nothing);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(50), s.BarValue(kSidA));
+	ASSERT_TRUE(s.OnListingReceived(ALICE, 1000).effect == Effect::Announce);
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Finished);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(0xffff), s.BarValue(kSidA));
+}
+
+TEST(BrowseStore, APeerWithNoDirectoriesCompletesImmediately)
+{
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	ASSERT_TRUE(s.OnDirectoryList(ALICE, 0, 1000).effect == Effect::Announce);
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Finished);
+}
+
+// --- Silence, and what pushes it back. --------------------------------
+
+TEST(BrowseStore, SilenceExpiresTheBrowse)
+{
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	ASSERT_TRUE(s.Tick(1000 + kSilenceTimeoutMs).empty());
+
+	const auto todo = s.Tick(1001 + kSilenceTimeoutMs);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), todo.size());
+	ASSERT_TRUE(todo0.effect == Effect::AnnounceFailure);
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Failed);
+}
+
+TEST(BrowseStore, EverySignOfLifePushesTheDeadlineBack)
+{
+	Store s;
+	s.Start(ALICE, kSidA, 0);
+	// The request going out...
+	s.Touch(ALICE, 100000);
+	ASSERT_TRUE(s.Tick(100000 + kSilenceTimeoutMs).empty());
+	// ...the directory answer...
+	s.OnDirectoryList(ALICE, 2, 200000);
+	ASSERT_TRUE(s.Tick(200000 + kSilenceTimeoutMs).empty());
+	// ...and each listing.
+	s.OnListingReceived(ALICE, 300000);
+	ASSERT_TRUE(s.Tick(300000 + kSilenceTimeoutMs).empty());
+	ASSERT_TRUE(s.StateOf(kSidA) == State::InProgress);
+}
+
+TEST(BrowseStore, TouchDoesNotReviveATerminalBrowse)
+{
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	s.Fail(ALICE);
+	s.Touch(ALICE, 999999);
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Failed);
+}
+
+// --- The peer going away. ---------------------------------------------
+
+TEST(BrowseStore, ForgetFailsARunningBrowseThenReleasesThePeer)
+{
+	// Order matters: the failure is reported while the caller still holds the
+	// reference it needs to name the peer in the log line.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	const auto effects = s.Forget(ALICE);
+	ASSERT_EQUALS(static_cast<std::size_t>(2), effects.size());
+	ASSERT_TRUE(effects0.effect == Effect::AnnounceFailure);
+	ASSERT_TRUE(effects1.effect == Effect::ReleaseClient);
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Failed);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), s.SearchIdFor(ALICE));
+	// The record survives its peer.
+	ASSERT_TRUE(s.Has(kSidA));
+}
+
+TEST(BrowseStore, ForgettingAFinishedBrowseAnnouncesNothing)
+{
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	s.Finish(ALICE);
+	const auto effects = s.Forget(ALICE);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), effects.size());
+	ASSERT_TRUE(effects0.effect == Effect::ReleaseClient);
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Finished);
+}
+
+TEST(BrowseStore, ForgettingAPeerWithNoBrowseDoesNothing)
+{
+	Store s;
+	ASSERT_TRUE(s.Forget(ALICE).empty());
+}
+
+TEST(BrowseStore, PacketsFromAForgottenPeerAreIgnored)
+{
+	// The reference is gone, so the peer no longer resolves to its record --
+	// a late packet must not resurrect it or touch somebody else's.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	s.Forget(ALICE);
+	ASSERT_TRUE(s.OnListingReceived(ALICE, 2000).effect == Effect::Nothing);
+	ASSERT_TRUE(s.OnDirectoryList(ALICE, 3, 2000).effect == Effect::Nothing);
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Failed);
+}
+
+// --- Disposal. ---------------------------------------------------------
+
+TEST(BrowseStore, RemoveDisposesOfTheRecordWithItsSearch)
+{
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	s.Finish(ALICE);
+	s.Remove(kSidA);
+	ASSERT_FALSE(s.Has(kSidA));
+	ASSERT_EQUALS(static_cast<std::size_t>(0), s.Size());
+	// ...and the peer is browsable again.
+	ASSERT_TRUE(s.Start(ALICE, kSidB, 2000).started);
+}
+
+TEST(BrowseStore, UnknownSearchIdsAnswerSafely)
+{
+	// The EC reply paths gate on Has(), but the accessors must not invent a
+	// running browse for an ID nobody is tracking.
+	Store s;
+	ASSERT_FALSE(s.Has(kSidA));
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Failed);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(0xffff), s.BarValue(kSidA));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), s.SearchIdFor(nullptr));
+}
+
+// --- Composed: the rules above are each right, and were wrong together. -
+
+TEST(BrowseStore, ForgettingAnEndedBrowseStillNamesItForRelease)
+{
+	// Both halves of this were already tested apart -- that Forget releases the peer, and that
+	// a finished browse no longer answers as the peer's live one. Composed, the release came
+	// back with no browse attached to it, so the owner had nothing to release and kept the peer
+	// allocated until the user closed the tab. Most peers are in this state by the time they go
+	// away: the listing arrives, then the connection closes.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	s.OnListingReceived(ALICE, 1000); // flat browse: finished
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Finished);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), s.SearchIdFor(ALICE));
+
+	const auto effects = s.Forget(ALICE);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), effects.size());
+	ASSERT_TRUE(effects0.effect == Effect::ReleaseClient);
+	ASSERT_EQUALS(kSidA, effects0.searchId);
+}
+
+TEST(BrowseStore, EveryOutcomeCarriesTheBrowseItHappenedTo)
+{
+	// Nothing may report an effect without saying which browse it belongs to; an owner acting
+	// on the pair cannot then act on the wrong one, or on none.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	ASSERT_EQUALS(kSidA, s.OnDirectoryList(ALICE, 1, 1000).searchId);
+	ASSERT_EQUALS(kSidA, s.OnListingReceived(ALICE, 1000).searchId);
+	const auto todo = s.Tick(2000);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), todo.size());
+	ASSERT_EQUALS(kSidA, todo0.searchId);
+
+	Store s2;
+	s2.Start(BOB, kSidB, 1000);
+	ASSERT_EQUALS(kSidB, s2.Fail(BOB).searchId);
+}
+
+TEST(BrowseStore, APeerIsBrowsableAgainAsSoonAsItsBrowseEnds)
+{
+	// Start refused while a terminal record still held the peer, but SearchIdFor said the peer
+	// had no browse -- so the caller's own check passed and the start it made was silently
+	// rejected. The two now agree: only a RUNNING browse blocks a new one.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	s.Fail(ALICE);
+	// The peer has not been released yet -- that happens on the next tick.
+	ASSERT_TRUE(s.Has(kSidA));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), s.SearchIdFor(ALICE));
+
+	ASSERT_TRUE(s.Start(ALICE, kSidB, 2000).started);
+	ASSERT_EQUALS(kSidB, s.SearchIdFor(ALICE));
+	// ...and the old record is untouched, still answering for its own state.
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Failed);
+	ASSERT_TRUE(s.StateOf(kSidB) == State::InProgress);
+}
+
+TEST(BrowseStore, ARebrowseDisplacesThePeerFromItsOldRecord)
+{
+	// Re-browsing before the old record was released left two records naming one peer, and a
+	// lookup by peer answered with whichever the map ordered first -- the stale one, since ids
+	// ascend.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	s.Fail(ALICE);
+
+	const auto result = s.Start(ALICE, kSidB, 2000);
+	ASSERT_TRUE(result.started);
+	// The old record let go, and said so: its owner is holding a reference.
+	ASSERT_TRUE(result.displaced.effect == Effect::ReleaseClient);
+	ASSERT_EQUALS(kSidA, result.displaced.searchId);
+	// The peer now resolves to the new browse, and only that one.
+	ASSERT_EQUALS(kSidB, s.SearchIdFor(ALICE));
+	ASSERT_TRUE(s.Fail(ALICE).searchId == kSidB);
+	// The displaced record is untouched otherwise.
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Failed);
+}
+
+TEST(BrowseStore, AFirstBrowseDisplacesNothing)
+{
+	Store s;
+	const auto result = s.Start(ALICE, kSidA, 1000);
+	ASSERT_TRUE(result.started);
+	ASSERT_TRUE(result.displaced.effect == Effect::Nothing);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), result.displaced.searchId);
+}
+
+TEST(BrowseStore, AnIdAlreadyInUseIsRefused)
+{
+	// Ids come from an allocator, but a record keyed by one already tracked
+	// would silently replace it along with whatever state it held.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	ASSERT_FALSE(s.Start(BOB, kSidA, 1000).started);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), s.Size());
+	ASSERT_EQUALS(kSidA, s.SearchIdFor(ALICE));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), s.SearchIdFor(BOB));
+}
+
+TEST(BrowseStore, ReusingAnIdIsRefusedEvenForTheSamePeer)
+{
+	// The ID guard is unconditional, so a peer re-browsed under the ID its own last browse
+	// still holds is turned away -- it must Remove() that one first. No caller does this: both
+	// routes allocate a fresh ID, and closing a tab frees the old record. Pinned because that
+	// safety lives entirely in the callers, and a store this permissive-looking invites the
+	// assumption that it does not.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	s.Fail(ALICE);
+	ASSERT_FALSE(s.Start(ALICE, kSidA, 2000).started);
+	// A different ID is the supported way, and works.
+	ASSERT_TRUE(s.Start(ALICE, kSidB, 2000).started);
+	// ...as does reusing the ID once its record has been disposed of.
+	s.Remove(kSidB);
+	s.Remove(kSidA);
+	ASSERT_TRUE(s.Start(ALICE, kSidA, 3000).started);
+}
+
+TEST(BrowseStore, TheDirectoryListIsAcceptedExactlyOnce)
+{
+	// A peer replaying OP_ASKSHAREDDIRSANS would otherwise have every directory re-requested
+	// and the silence deadline pushed back on each resend, keeping its browse alive for as long
+	// as it kept sending.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	ASSERT_TRUE(s.AwaitingDirectoryList(ALICE));
+
+	s.OnDirectoryList(ALICE, 3, 1000);
+	ASSERT_FALSE(s.AwaitingDirectoryList(ALICE));
+	// ...and it stays shut while the listings arrive.
+	s.OnListingReceived(ALICE, 1000);
+	ASSERT_FALSE(s.AwaitingDirectoryList(ALICE));
+}
+
+TEST(BrowseStore, ATerminalOrAbsentBrowseIsNotAwaitingAnything)
+{
+	Store s;
+	ASSERT_FALSE(s.AwaitingDirectoryList(ALICE));
+	s.Start(ALICE, kSidA, 1000);
+	s.Fail(ALICE);
+	ASSERT_FALSE(s.AwaitingDirectoryList(ALICE));
+}
+
+TEST(BrowseStore, ADirectoryBrowseAsksOnlyUntilThePeerAnswers)
+{
+	// ConnectionEstablished gates the OP_ASKSHAREDDIRS it sends on this, and it runs on every
+	// reconnect. A browsed peer that is also a download source reconnects often, so a predicate
+	// true for the whole browse put an unrequested ask on the wire each time.
+	//
+	// This is the DIRECTORY form; the flat one has no such round and is covered separately
+	// below.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	ASSERT_TRUE(s.AwaitingDirectoryList(ALICE));
+	// Still true across a reconnect before the peer has answered -- the first ask may never
+	// have arrived, which is what the old counter-based guard allowed for too.
+	s.Touch(ALICE, 2000);
+	ASSERT_TRUE(s.AwaitingDirectoryList(ALICE));
+	// ...and false from the moment it has.
+	s.OnDirectoryList(ALICE, 2, 3000);
+	ASSERT_FALSE(s.AwaitingDirectoryList(ALICE));
+}
+
+TEST(BrowseStore, AFlatBrowseStaysAskableUntilItsOneAnswerArrives)
+{
+	// The flat form has no directory round, so the window stays open for the whole browse: a
+	// reconnect before the peer answers re-asks, which is what the counter-based guard did too
+	// and is wanted -- the first ask may never have arrived. It closes on the single answer,
+	// which also completes it.
+	Store s;
+	s.Start(ALICE, kSidA, 1000);
+	ASSERT_TRUE(s.AwaitingDirectoryList(ALICE));
+	s.Touch(ALICE, 2000);
+	ASSERT_TRUE(s.AwaitingDirectoryList(ALICE));
+
+	s.OnListingReceived(ALICE, 3000);
+	ASSERT_FALSE(s.AwaitingDirectoryList(ALICE));
+	ASSERT_TRUE(s.StateOf(kSidA) == State::Finished);
+}

amule-3.0.1.tar.gz/unittests/tests/CMakeLists.txt -> amule-3.1.0.tar.gz/unittests/tests/CMakeLists.txt Changed

@@ -1,3 +1,197 @@
+# The checked-in lexer and native IPv6 rule store, without the application.
+add_executable (IPFilterIPv6Test
+	IPFilterIPv6Test.cpp
+	${CMAKE_SOURCE_DIR}/src/IPFilterScanner.cpp
+	${CMAKE_SOURCE_DIR}/src/NetworkAddress.cpp
+	${CMAKE_SOURCE_DIR}/src/LoggerConsole.cpp
+)
+add_test (NAME IPFilterIPv6Test COMMAND IPFilterIPv6Test)
+target_include_directories (IPFilterIPv6Test PRIVATE
+	${CMAKE_BINARY_DIR}
+	${CMAKE_SOURCE_DIR}/src
+	${CMAKE_SOURCE_DIR}/src/include
+	${Boost_INCLUDE_DIR}
+)
+target_link_libraries (IPFilterIPv6Test muleunit mulecommon ${Boost_LIBRARIES})
+
+# Credit identity and wait ownership run without the application. The test supplies
+# a deterministic GetTickCount64; do not link the production clock into this target.
+add_executable (ClientCreditsTest
+	ClientCreditsTest.cpp
+	${CMAKE_SOURCE_DIR}/src/ClientCredits.cpp
+	${CMAKE_SOURCE_DIR}/src/LoggerConsole.cpp
+)
+add_test (NAME ClientCreditsTest COMMAND ClientCreditsTest)
+target_include_directories (ClientCreditsTest PRIVATE
+	${CMAKE_BINARY_DIR}
+	${CMAKE_SOURCE_DIR}/src
+	${CMAKE_SOURCE_DIR}/src/include
+)
+target_link_libraries (ClientCreditsTest muleunit mulecommon)
+
+# Tracked endpoint history is independent of live clients and the application clock.
+add_executable (TrackedClientRecordTest TrackedClientRecordTest.cpp)
+add_test (NAME TrackedClientRecordTest COMMAND TrackedClientRecordTest)
+target_include_directories (TrackedClientRecordTest PRIVATE
+	${CMAKE_BINARY_DIR}
+	${CMAKE_SOURCE_DIR}/src
+	${CMAKE_SOURCE_DIR}/src/include
+)
+target_link_libraries (TrackedClientRecordTest muleunit mulecommon)
+
+# SecIdent negotiation is pure policy. The packet handlers and RSA entry points
+# depend on theApp, sockets and the live credit store; this target needs none of
+# them and exercises the no-IPv4 prerequisite before native IPv6 peers exist.
+add_executable (SecIdentTest SecIdentTest.cpp)
+add_test (NAME SecIdentTest COMMAND SecIdentTest)
+target_include_directories (SecIdentTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/include
+)
+target_link_libraries (SecIdentTest muleunit mulecommon)
+
+# Direct outbound eligibility, without the application or libutp.
+add_executable (UtpDialPolicyTest UtpDialPolicyTest.cpp)
+target_include_directories (UtpDialPolicyTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
+target_link_libraries (UtpDialPolicyTest muleunit mulecommon)
+add_test (NAME UtpDialPolicyTest COMMAND UtpDialPolicyTest)
+
+# The buffering between libutp and the eD2k stack: the would-block contract
+# CEMSocket depends on, and the close that must happen exactly once. Header-only
+# and free of libutp, so it is compiled and run in every build rather than only
+# where ENABLE_UTP is on -- the contract is the same either way.
+add_executable (UtpStreamTest
+	UtpStreamTest.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME UtpStreamTest
+	COMMAND UtpStreamTest
+)
+
+target_include_directories (UtpStreamTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (UtpStreamTest
+	muleunit
+)
+
+# One libutp socket behind IStreamTransport: the partial write whose refused
+# tail must stay queued, and the close that must happen exactly once. The
+# library is a seam here, so this runs in every build like UtpStreamTest.
+add_executable (UtpSocketTransportTest
+	UtpSocketTransportTest.cpp
+	${CMAKE_SOURCE_DIR}/src/NetworkAddress.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME UtpSocketTransportTest
+	COMMAND UtpSocketTransportTest
+)
+
+target_include_directories (UtpSocketTransportTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${Boost_INCLUDE_DIR}
+)
+
+target_link_libraries (UtpSocketTransportTest
+	muleunit
+	${Boost_LIBRARIES}
+)
+
+add_executable (LibSocketTransportTest
+	LibSocketTransportTest.cpp
+	${CMAKE_SOURCE_DIR}/src/LibSocket.cpp
+	# Same reason NetworkFunctionsTest compiles it: LibSocket.cpp includes
+	# LibSocketAsio.cpp, whose Windows interface-resolution path calls
+	# DetectNetworkInterfaces(), and this target does not link mulesocket.
+	${CMAKE_SOURCE_DIR}/src/NetworkInterfaces.cpp
+	${CMAKE_SOURCE_DIR}/src/NetworkAddress.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME LibSocketTransportTest
+	COMMAND LibSocketTransportTest
+)
+
+target_include_directories (LibSocketTransportTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${Boost_INCLUDE_DIR}
+)
+
+target_link_libraries (LibSocketTransportTest
+	muleunit
+	${Boost_LIBRARIES}
+)
+
+if (WIN32)
+	# Compiles NetworkInterfaces.cpp rather than linking the library that holds
+	# it, so it needs iphlpapi for GetAdaptersAddresses() itself.
+	target_link_libraries (LibSocketTransportTest iphlpapi)
+endif()
+
+if (ENABLE_UTP)
+	add_executable (UtpContextTest
+		UtpContextTest.cpp
+		${CMAKE_SOURCE_DIR}/src/Packet.cpp
+		${CMAKE_SOURCE_DIR}/src/Tag.cpp
+		${CMAKE_SOURCE_DIR}/src/MemFile.cpp
+		${CMAKE_SOURCE_DIR}/src/SafeFile.cpp
+		${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+		${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+	)
+	target_include_directories (UtpContextTest PRIVATE
+		${CMAKE_BINARY_DIR}
+		${CMAKE_SOURCE_DIR}/src
+		${CMAKE_SOURCE_DIR}/src/include
+	)
+	target_link_libraries (UtpContextTest muleunit ZLIB::ZLIB)
+	add_test (NAME UtpContextTest COMMAND UtpContextTest)
+
+	# Drives the adapter through real libutp: the callbacks it registers cannot
+	# be exercised by a double, because what is under test is libutp's own
+	# dispatch and state machine reaching them.
+	add_executable (UtpLibraryAdapterTest
+		UtpLibraryAdapterTest.cpp
+		${CMAKE_SOURCE_DIR}/src/UtpLibraryAdapter.cpp
+		${CMAKE_SOURCE_DIR}/src/NetworkAddress.cpp
+		${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+		${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+	)
+	target_include_directories (UtpLibraryAdapterTest PRIVATE
+		${CMAKE_BINARY_DIR}
+		${CMAKE_SOURCE_DIR}/src
+		${CMAKE_SOURCE_DIR}/src/include
+		${Boost_INCLUDE_DIR}
+	)
+	target_link_libraries (UtpLibraryAdapterTest muleunit Utp::Utp ${Boost_LIBRARIES})
+	add_test (NAME UtpLibraryAdapterTest COMMAND UtpLibraryAdapterTest)
+
+	# The admission decision only. Gathering its inputs needs the application;
+	# deciding on them does not, which is why they are separated.
+	add_executable (UtpAdmissionTest
+		UtpAdmissionTest.cpp
+		${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+		${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+	)
+	target_include_directories (UtpAdmissionTest PRIVATE
+		${CMAKE_BINARY_DIR}
+		${CMAKE_SOURCE_DIR}/src
+		${CMAKE_SOURCE_DIR}/src/include
+	)
+	target_link_libraries (UtpAdmissionTest muleunit)
+	add_test (NAME UtpAdmissionTest COMMAND UtpAdmissionTest)
+endif()
+
 add_executable (CTagTest
 	CTagTest.cpp
 	${CMAKE_SOURCE_DIR}/src/SafeFile.cpp
@@ -21,216 +215,1475 @@
 	muleunit
 )
 
-add_executable (CUInt128Test
-	CUInt128Test.cpp
-	${CMAKE_SOURCE_DIR}/src/kademlia/utils/UInt128.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+# CValueMap is the incremental-update filter behind every EC tag that carries a
+# value map. Its failure mode is silence -- a field wrongly judged unchanged
+# just stops updating in the GUI -- so the contract is pinned here rather than
+# left to a clean daemon run. Needs no app, no daemon and no database: the EC
+# tag types and their generated codes are the whole dependency.
+# How a peer's version is spelled. Each client project writes its own
+# differently -- eMule letters the update (0.70b), eMule Plus omits zero
+# components, lPhant counts its major one higher -- and the rendering used to
+# exist twice: once in the handshake, once in the client-history rows, which
+# re-derived it from the stored numeric and dropped every convention. The same
+# peer could appear in one window under two versions depending only on whether
+# it was online. Needs no app and no daemon.
+add_executable (ClientVersionStringTest
+	ClientVersionStringTest.cpp
+	${CMAKE_SOURCE_DIR}/src/ClientVersionString.cpp
 )
 
-add_test (NAME CUInt128Test
-	COMMAND CUInt128Test
+add_test (NAME ClientVersionStringTest
+	COMMAND ClientVersionStringTest
 )
 
-target_include_directories (CUInt128Test
+target_include_directories (ClientVersionStringTest
+	PRIVATE ${CMAKE_BINARY_DIR}
 	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/libs
 )
 
-target_link_libraries (CUInt128Test
+target_link_libraries (ClientVersionStringTest
 	muleunit
+	mulecommon
 )
 
-add_executable (FileDataIOTest
-	FileDataIOTest.cpp
-	${CMAKE_SOURCE_DIR}/src/SafeFile.cpp
-	${CMAKE_SOURCE_DIR}/src/CFile.cpp
-	${CMAKE_SOURCE_DIR}/src/MemFile.cpp
-	${CMAKE_SOURCE_DIR}/src/kademlia/utils/UInt128.cpp
-	${CMAKE_SOURCE_DIR}/src/Tag.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/Path.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+add_executable (ECIdDiffTest
+	ECIdDiffTest.cpp
+	# See the note on CValueMapTest below: libec.a references DoECLogLine /
+	# theLogger unconditionally in Debug, so the no-op definitions have to be
+	# linked in or only the Debug matrix entries fail.
+	${CMAKE_SOURCE_DIR}/src/LoggerConsole.cpp
 )
 
-add_test (NAME FileDataIOTest
-	COMMAND FileDataIOTest
+add_test (NAME ECIdDiffTest
+	COMMAND ECIdDiffTest
 )
 
-target_include_directories (FileDataIOTest
+target_include_directories (ECIdDiffTest
 	PRIVATE ${CMAKE_BINARY_DIR}
 	PRIVATE ${CMAKE_SOURCE_DIR}/src
 	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/libs
+	PRIVATE ${CMAKE_BINARY_DIR}/src/libs
+	PRIVATE ${CMAKE_BINARY_DIR}/src/libs/ec/cpp
 )
 
-target_link_libraries (FileDataIOTest
+target_link_libraries (ECIdDiffTest
 	muleunit
+	ec
+	mulecommon
 )
 
-add_executable (FormatTest
-	FormatTest.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+# amulecmd's `progress` output. The daemon answers EC_OP_SEARCH_PROGRESS in
+# three shapes and the client does not choose which: advertising the union
+# capability alongside multi-search is what decides it. Reading one shape as
+# another is invisible -- a top-level tag that is not there reads as zero, so
+# `progress` reported 0 % for every search whatever it was doing (#1126).
+# Needs no app and no daemon: the EC tag types are the whole dependency.
+add_executable (SearchProgressReportTest
+	SearchProgressReportTest.cpp
+	${CMAKE_SOURCE_DIR}/src/SearchProgressReport.cpp
+	# As for ECIdDiffTest: libec.a references DoECLogLine / theLogger
+	# unconditionally in Debug, so the no-op definitions have to be linked in.
+	${CMAKE_SOURCE_DIR}/src/LoggerConsole.cpp
 )
 
-add_test (NAME FormatTest
-	COMMAND FormatTest
+add_test (NAME SearchProgressReportTest
+	COMMAND SearchProgressReportTest
 )
 
-target_include_directories (FormatTest
+target_include_directories (SearchProgressReportTest
+	PRIVATE ${CMAKE_BINARY_DIR}
 	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/libs
+	PRIVATE ${CMAKE_BINARY_DIR}/src/libs
+	PRIVATE ${CMAKE_BINARY_DIR}/src/libs/ec/cpp
 )
 
-target_link_libraries (FormatTest
+target_link_libraries (SearchProgressReportTest
 	muleunit
+	ec
+	mulecommon
 )
 
-add_executable (NetworkFunctionsTest
-	NetworkFunctionsTest.cpp
-	${CMAKE_SOURCE_DIR}/src/NetworkFunctions.cpp
-	${CMAKE_SOURCE_DIR}/src/LibSocket.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+add_executable (ECSocketFlagsTest
+	ECSocketFlagsTest.cpp
+	# As for ECIdDiffTest: libec.a references DoECLogLine / theLogger
+	# unconditionally in Debug, so the no-op definitions have to be linked in.
+	${CMAKE_SOURCE_DIR}/src/LoggerConsole.cpp
 )
 
-add_test (NAME NetworkFunctionsTest
-	COMMAND NetworkFunctionsTest
+add_test (NAME ECSocketFlagsTest
+	COMMAND ECSocketFlagsTest
 )
 
-target_compile_definitions (NetworkFunctionsTest
-	PRIVATE "EC_REMOTE"
+target_include_directories (ECSocketFlagsTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/libs
+	PRIVATE ${CMAKE_BINARY_DIR}/src/libs
+	PRIVATE ${CMAKE_BINARY_DIR}/src/libs/ec/cpp
 )
 
-target_include_directories (NetworkFunctionsTest
+target_link_libraries (ECSocketFlagsTest
+	muleunit
+	ec
+	mulecommon
+)
+
+add_executable (CValueMapTest
+	CValueMapTest.cpp
+	# LoggerConsole.cpp provides the no-op DoECLogLine + theLogger symbols that
+	# libec.a's Debug build references unconditionally (ECPacket / ECSocket /
+	# ECTag debug-print paths). Release preprocesses those calls to
+	# `do {} while(0)` via the ECLog.h define, so the symbols are unused there
+	# and only the Debug matrix entries fail to link. Same reason RefresherTest
+	# pulls this TU in.
+	${CMAKE_SOURCE_DIR}/src/LoggerConsole.cpp
+)
+
+add_test (NAME CValueMapTest
+	COMMAND CValueMapTest
+)
+
+target_include_directories (CValueMapTest
+	PRIVATE ${CMAKE_BINARY_DIR}
 	PRIVATE ${CMAKE_SOURCE_DIR}/src
 	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/libs
+	PRIVATE ${CMAKE_BINARY_DIR}/src/libs
+	PRIVATE ${CMAKE_BINARY_DIR}/src/libs/ec/cpp
 )
 
-target_include_directories (NetworkFunctionsTest
-	PRIVATE ${Boost_INCLUDE_DIR}
+target_link_libraries (CValueMapTest
+	muleunit
+	ec
+	mulecommon
 )
 
-target_link_libraries (NetworkFunctionsTest
-	${Boost_LIBRARIES}
+# The banned-address record. Owns the map CClientList used to keep inline, and
+# reports whether each operation actually changed it -- which is the whole
+# reason it exists, since the caller increments a statistic on that answer.
+# Header-only and takes the tick as a parameter, so ban expiry is a call rather
+# than a wait, and no part of it needs theApp.
+add_executable (BanRecordTest
+	BanRecordTest.cpp
 )
 
-target_link_libraries (NetworkFunctionsTest
+add_test (NAME BanRecordTest
+	COMMAND BanRecordTest
+)
+
+target_include_directories (BanRecordTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (BanRecordTest
 	muleunit
-	wxWidgets::NET
+	# muleunit compiles MuleDebug.cpp and StringFunctions.cpp, which use
+	# CFormat; without mulecommon the link fails on its symbols under gcc and
+	# lld even though the header alone needs nothing from it.
+	mulecommon
 )
 
-add_executable (PathTest
-	PathTest.cpp
+# The internal address type: byte order in the signature, absence distinct
+# from 0.0.0.0, explicit failure instead of truncation, and a total order so
+# the type can be a map key. The type stores its own sixteen octets and a
+# family tag rather than an asio address, which is what keeps this target
+# free of the app and the daemon -- only NetworkAddress.cpp below still
+# compiles Boost.Asio.
+add_executable (NetworkAddressTest
+	NetworkAddressTest.cpp
+	# A second unit including NetworkAddress.h, so the linkage of the exclusion
+	# table is observable: without `inline` the table is internal to each unit
+	# and the two addresses differ.
+	NetworkAddressTableLinkage.cpp
 	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
 	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
-	${CMAKE_SOURCE_DIR}/src/libs/common/Path.cpp
+	# CNetworkAddress::FromString/ToString live in NetworkAddress.cpp: they are
+	# the only part of the type that still compiles Boost.Asio, and keeping them
+	# out of the header is what stops asio reaching most of src/. Every target
+	# that touches an address therefore has to link this TU -- the type is no
+	# longer header-only.
+	${CMAKE_SOURCE_DIR}/src/NetworkAddress.cpp
 )
 
-add_test (NAME PathTest
-	COMMAND PathTest
+add_test (NAME NetworkAddressTest
+	COMMAND NetworkAddressTest
 )
 
-target_link_libraries (PathTest
+target_include_directories (NetworkAddressTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${Boost_INCLUDE_DIR}
+)
+
+target_link_libraries (NetworkAddressTest
 	muleunit
+	${Boost_LIBRARIES}
 )
 
-add_executable (RangeMapTest
-	RangeMapTest.cpp
+# Exercise the same byte-buffer parser as RecvFrom without constructing sockets
+# or linking Proxy.cpp's application-dependent negotiation state machines.
+add_executable (ProxyTest
+	ProxyTest.cpp
+	${CMAKE_SOURCE_DIR}/src/NetworkAddress.cpp
 	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
 	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
 )
+add_test (NAME ProxyTest COMMAND ProxyTest)
+target_include_directories (ProxyTest PRIVATE
+	${CMAKE_BINARY_DIR}
+	${CMAKE_SOURCE_DIR}/src
+	${CMAKE_SOURCE_DIR}/src/include
+	${Boost_INCLUDE_DIR}
+)
+target_link_libraries (ProxyTest muleunit ${Boost_LIBRARIES} wxWidgets::NET)
 
-add_test (NAME RangeMapTest
-	COMMAND RangeMapTest
+# Peer identity: what makes two peers the same peer once a peer can be IPv6, how
+# much of an IPv6 address a rate limit counts against, and how far an inbound
+# datagram can be routed. All decision logic over CNetworkAddress, so it is
+# testable without an app -- which is why it lives in a header of its own rather
+# than inside CClientList.
+add_executable (PeerAddressingTest
+	PeerAddressingTest.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+	# CNetworkAddress::FromString/ToString live in NetworkAddress.cpp: they are
+	# the only part of the type that still compiles Boost.Asio, and keeping them
+	# out of the header is what stops asio reaching most of src/. Every target
+	# whose include closure touches NetworkAddress.h therefore has to link this
+	# TU -- the type is no longer header-only.
+	${CMAKE_SOURCE_DIR}/src/NetworkAddress.cpp
 )
 
-target_include_directories (RangeMapTest
+add_test (NAME PeerAddressingTest
+	COMMAND PeerAddressingTest
+)
+
+target_include_directories (PeerAddressingTest
+	PRIVATE ${CMAKE_BINARY_DIR}
 	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${Boost_INCLUDE_DIR}
 )
 
-target_link_libraries (RangeMapTest
+target_link_libraries (PeerAddressingTest
 	muleunit
+	${Boost_LIBRARIES}
 )
 
-add_executable (StringFunctionsTest
-	StringFunctionsTest.cpp
+# Canonical address matching for upload-queue UDP lookups, without the application.
+add_executable (UploadQueueAddressPolicyTest
+	UploadQueueAddressPolicyTest.cpp
 	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
 	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
-	${CMAKE_SOURCE_DIR}/src/libs/common/Path.cpp
+	${CMAKE_SOURCE_DIR}/src/NetworkAddress.cpp
 )
+add_test (NAME UploadQueueAddressPolicyTest COMMAND UploadQueueAddressPolicyTest)
+target_include_directories (UploadQueueAddressPolicyTest PRIVATE
+	${CMAKE_BINARY_DIR}
+	${CMAKE_SOURCE_DIR}/src
+	${CMAKE_SOURCE_DIR}/src/include
+	${Boost_INCLUDE_DIR}
+)
+target_link_libraries (UploadQueueAddressPolicyTest muleunit ${Boost_LIBRARIES})
 
-add_test (NAME StringFunctionsTest
-	COMMAND StringFunctionsTest
+# Address families: which families sockets are opened in, and the refusal that
+# never falls back to the other family. Header-only policy over CNetworkAddress,
+# so it is testable without an app; NetworkAddress.cpp is linked for
+# FromString/ToString exactly as the two suites above do.
+add_executable (AddressFamilyPolicyTest
+	AddressFamilyPolicyTest.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+	${CMAKE_SOURCE_DIR}/src/NetworkAddress.cpp
 )
 
-target_link_libraries (StringFunctionsTest
+add_test (NAME AddressFamilyPolicyTest
+	COMMAND AddressFamilyPolicyTest
+)
+
+target_include_directories (AddressFamilyPolicyTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${Boost_INCLUDE_DIR}
+)
+
+target_link_libraries (AddressFamilyPolicyTest
 	muleunit
+	${Boost_LIBRARIES}
 )
 
-add_executable (PhpArrayTest
-	PhpArrayTest.cpp
-	${CMAKE_SOURCE_DIR}/src/webserver/src/php_syntree.cpp
+add_executable (CUInt128Test
+	CUInt128Test.cpp
+	${CMAKE_SOURCE_DIR}/src/kademlia/utils/UInt128.cpp
 	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
 	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
 )
 
-add_test (NAME PhpArrayTest
-	COMMAND PhpArrayTest
+add_test (NAME CUInt128Test
+	COMMAND CUInt128Test
 )
 
-target_compile_definitions (PhpArrayTest
-	PRIVATE PHP_STANDALONE_EN
+target_include_directories (CUInt128Test
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
 )
 
-target_include_directories (PhpArrayTest
-	PRIVATE ${CMAKE_SOURCE_DIR}/src/webserver/src
+target_link_libraries (CUInt128Test
+	muleunit
 )
 
-target_link_libraries (PhpArrayTest
+# The AICH-hash carriage Kad protocol version 0x09 added to keyword storage.
+# CKadAICHHashList is deliberately written against a plain 20-byte array rather
+# than CAICHHash, so the codec that pins TAG_KADAICHHASHRESULT's byte layout can
+# be tested without dragging in SHAHashSet.cpp and the whole file machinery
+# behind it.
+add_executable (KadAICHHashListTest
+	KadAICHHashListTest.cpp
+	${CMAKE_SOURCE_DIR}/src/kademlia/kademlia/AICHHashList.cpp
+)
+
+add_test (NAME KadAICHHashListTest
+	COMMAND KadAICHHashListTest
+)
+
+target_include_directories (KadAICHHashListTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (KadAICHHashListTest
 	muleunit
+	mulecommon
 )
 
-add_executable (TextFileTest
-	TextFileTest.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
-	${CMAKE_SOURCE_DIR}/src/libs/common/Path.cpp
-	${CMAKE_SOURCE_DIR}/src/libs/common/TextFile.cpp
+# The single-byte tag count in a Kad search answer. CEntry/CKeyEntry pull in
+# nothing from the Kad core at link time -- every CIndexed reference in Entry.cpp
+# is in a comment -- so the writer can be driven directly and the answer parsed
+# back with the same CFileDataIO the receiver uses.
+add_executable (KadEntryTagListTest
+	KadEntryTagListTest.cpp
+	${CMAKE_SOURCE_DIR}/src/kademlia/kademlia/Entry.cpp
+	${CMAKE_SOURCE_DIR}/src/kademlia/kademlia/AICHHashList.cpp
+	${CMAKE_SOURCE_DIR}/src/SafeFile.cpp
+	${CMAKE_SOURCE_DIR}/src/MemFile.cpp
+	${CMAKE_SOURCE_DIR}/src/Tag.cpp
+	${CMAKE_SOURCE_DIR}/src/GetTickCount.cpp
+	# As for CValueMapTest: the no-op DoECLogLine / theLogger definitions, which
+	# Entry.cpp's AddDebugLogLine* calls resolve against in a Debug build.
+	${CMAKE_SOURCE_DIR}/src/LoggerConsole.cpp
 )
 
-add_test (NAME TextFileTest
-	COMMAND TextFileTest
+add_test (NAME KadEntryTagListTest
+	COMMAND KadEntryTagListTest
 )
 
-target_compile_definitions (TextFileTest
-	PRIVATE "SRCDIR=${CMAKE_CURRENT_SOURCE_DIR}"
+target_include_directories (KadEntryTagListTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
 )
 
-target_include_directories (TextFileTest
+target_link_libraries (KadEntryTagListTest
+	muleunit
+	mulecommon
+)
+
+# The adaptive Kad response-time ceiling. CFastKad takes "now" as a parameter
+# rather than reading a clock, which is what lets the cold start, a known series
+# of samples, the eviction rule and the window bound all be pinned without
+# waiting. Compiled and run regardless of ENABLE_KAD_NODE_PROTECTION: the class
+# is self-contained, so gating the suite would only cost coverage.
+add_executable (FastKadTest
+	FastKadTest.cpp
+	${CMAKE_SOURCE_DIR}/src/kademlia/net/FastKad.cpp
+)
+
+add_test (NAME FastKadTest
+	COMMAND FastKadTest
+)
+
+target_include_directories (FastKadTest
+	PRIVATE ${CMAKE_BINARY_DIR}
 	PRIVATE ${CMAKE_SOURCE_DIR}/src
 	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
 )
 
-target_link_libraries (TextFileTest
+target_link_libraries (FastKadTest
 	muleunit
+	mulecommon
 )
 
-add_executable (OtherFunctionsTest
-	OtherFunctionsTest.cpp
-	${CMAKE_SOURCE_DIR}/src/OtherFunctions.cpp
+# The Kad identity protections: the one-hour identity-change interval, the
+# problematic list, the per-address ban and the bounds on all three tables.
+# Same reasoning as FastKad -- every entry point takes the time, so a four-hour
+# ban expiry is a single call rather than an untestable wait.
+add_executable (SafeKadTest
+	SafeKadTest.cpp
+	${CMAKE_SOURCE_DIR}/src/kademlia/net/SafeKad.cpp
+	${CMAKE_SOURCE_DIR}/src/kademlia/utils/UInt128.cpp
 )
 
-add_test (NAME OtherFunctionsTest
-	COMMAND OtherFunctionsTest
+add_test (NAME SafeKadTest
+	COMMAND SafeKadTest
 )
 
-target_include_directories (OtherFunctionsTest
+target_include_directories (SafeKadTest
 	PRIVATE ${CMAKE_BINARY_DIR}
 	PRIVATE ${CMAKE_SOURCE_DIR}/src
 	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
 )
 
-target_link_libraries (OtherFunctionsTest
+target_link_libraries (SafeKadTest
 	muleunit
 	mulecommon
-	CRYPTOPP::CRYPTOPP
+)
+
+add_executable (FileDataIOTest
+	FileDataIOTest.cpp
+	${CMAKE_SOURCE_DIR}/src/SafeFile.cpp
+	${CMAKE_SOURCE_DIR}/src/CFile.cpp
+	${CMAKE_SOURCE_DIR}/src/MemFile.cpp
+	${CMAKE_SOURCE_DIR}/src/kademlia/utils/UInt128.cpp
+	${CMAKE_SOURCE_DIR}/src/Tag.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Path.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME FileDataIOTest
+	COMMAND FileDataIOTest
+)
+
+target_include_directories (FileDataIOTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (FileDataIOTest
+	muleunit
+)
+
+add_executable (CloneFileTest
+	CloneFileTest.cpp
+	${CMAKE_SOURCE_DIR}/src/SafeFile.cpp
+	${CMAKE_SOURCE_DIR}/src/CFile.cpp
+	${CMAKE_SOURCE_DIR}/src/MemFile.cpp
+	${CMAKE_SOURCE_DIR}/src/kademlia/utils/UInt128.cpp
+	${CMAKE_SOURCE_DIR}/src/Tag.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Path.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME CloneFileTest
+	COMMAND CloneFileTest
+)
+
+target_include_directories (CloneFileTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (CloneFileTest
+	muleunit
+)
+
+add_executable (FormatTest
+	FormatTest.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME FormatTest
+	COMMAND FormatTest
+)
+
+target_include_directories (FormatTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+)
+
+target_link_libraries (FormatTest
+	muleunit
+)
+
+add_executable (NetworkFunctionsTest
+	NetworkFunctionsTest.cpp
+	${CMAKE_SOURCE_DIR}/src/NetworkFunctions.cpp
+	${CMAKE_SOURCE_DIR}/src/LibSocket.cpp
+	# LibSocket.cpp includes LibSocketAsio.cpp, which resolves a Windows
+	# adapter friendly name to an interface index through
+	# DetectNetworkInterfaces(). That definition lives in the mulesocket
+	# library this test does not link, so the translation unit has to be
+	# compiled in here or the Windows link fails on the undefined symbol.
+	${CMAKE_SOURCE_DIR}/src/NetworkInterfaces.cpp
+	# LibSocketAsio.cpp reports an attached transport's peer, which is a
+	# CNetworkAddress, so its out-of-line members have to be here too.
+	${CMAKE_SOURCE_DIR}/src/NetworkAddress.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME NetworkFunctionsTest
+	COMMAND NetworkFunctionsTest
+)
+
+target_compile_definitions (NetworkFunctionsTest
+	PRIVATE "EC_REMOTE"
+)
+
+target_include_directories (NetworkFunctionsTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_include_directories (NetworkFunctionsTest
+	PRIVATE ${Boost_INCLUDE_DIR}
+)
+
+target_link_libraries (NetworkFunctionsTest
+	${Boost_LIBRARIES}
+)
+
+target_link_libraries (NetworkFunctionsTest
+	muleunit
+	wxWidgets::NET
+)
+
+if (WIN32)
+	# This test compiles LibSocket.cpp directly (not via the mulesocket
+	# library), so it needs iphlpapi for GetAdaptersAddresses() itself.
+	target_link_libraries (NetworkFunctionsTest iphlpapi)
+endif()
+
+add_executable (PathTest
+	PathTest.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+	${CMAKE_SOURCE_DIR}/src/libs/common/Path.cpp
+)
+
+add_test (NAME PathTest
+	COMMAND PathTest
+)
+
+target_link_libraries (PathTest
+	muleunit
+)
+
+add_executable (RangeMapTest
+	RangeMapTest.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME RangeMapTest
+	COMMAND RangeMapTest
+)
+
+target_include_directories (RangeMapTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+)
+
+target_link_libraries (RangeMapTest
+	muleunit
+)
+
+add_executable (StringFunctionsTest
+	StringFunctionsTest.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+	${CMAKE_SOURCE_DIR}/src/libs/common/Path.cpp
+)
+
+add_test (NAME StringFunctionsTest
+	COMMAND StringFunctionsTest
+)
+
+target_link_libraries (StringFunctionsTest
+	muleunit
+)
+
+add_executable (PhpArrayTest
+	PhpArrayTest.cpp
+	${CMAKE_SOURCE_DIR}/src/webserver/src/php_syntree.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME PhpArrayTest
+	COMMAND PhpArrayTest
+)
+
+target_compile_definitions (PhpArrayTest
+	PRIVATE PHP_STANDALONE_EN
+)
+
+target_include_directories (PhpArrayTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webserver/src
+)
+
+target_link_libraries (PhpArrayTest
+	muleunit
+)
+
+add_executable (CMuleCollectionTest
+	CMuleCollectionTest.cpp
+	${CMAKE_SOURCE_DIR}/src/MuleCollection.cpp
+	# muleunit's MuleDebug.cpp needs CFormat for its backtrace path, which
+	# is compiled in on glibc; without these the link fails on Linux while
+	# passing on macOS.
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME CMuleCollectionTest
+	COMMAND CMuleCollectionTest
+)
+
+target_include_directories (CMuleCollectionTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (CMuleCollectionTest
+	muleunit
+)
+
+add_executable (MagnetURITest
+	MagnetURITest.cpp
+	${CMAKE_SOURCE_DIR}/src/MagnetURI.cpp
+	# See the CMuleCollectionTest comment above -- same Linux-backtrace need.
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME MagnetURITest
+	COMMAND MagnetURITest
+)
+
+target_include_directories (MagnetURITest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (MagnetURITest
+	muleunit
+)
+
+add_executable (SearchHistoryTest
+	SearchHistoryTest.cpp
+	${CMAKE_SOURCE_DIR}/src/SearchHistory.cpp
+	# See the CMuleCollectionTest comment above -- same Linux-backtrace need.
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME SearchHistoryTest
+	COMMAND SearchHistoryTest
+)
+
+target_include_directories (SearchHistoryTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (SearchHistoryTest
+	muleunit
+)
+
+add_executable (TextFileTest
+	TextFileTest.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+	${CMAKE_SOURCE_DIR}/src/libs/common/Path.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/TextFile.cpp
+)
+
+add_test (NAME TextFileTest
+	COMMAND TextFileTest
+)
+
+target_compile_definitions (TextFileTest
+	PRIVATE "SRCDIR=${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
+target_include_directories (TextFileTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (TextFileTest
+	muleunit
+)
+
+add_executable (OtherFunctionsTest
+	OtherFunctionsTest.cpp
+	${CMAKE_SOURCE_DIR}/src/OtherFunctions.cpp
+)
+
+add_test (NAME OtherFunctionsTest
+	COMMAND OtherFunctionsTest
+)
+
+target_include_directories (OtherFunctionsTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (OtherFunctionsTest
+	muleunit
+	mulecommon
+	CRYPTOPP::CRYPTOPP
+)
+
+add_executable (LanguageListTest
+	LanguageListTest.cpp
+	${CMAKE_SOURCE_DIR}/src/LanguageList.cpp
+	${CMAKE_SOURCE_DIR}/src/OtherFunctions.cpp
+)
+
+add_test (NAME LanguageListTest
+	COMMAND LanguageListTest
+)
+
+# The list names po/ basenames, so the test needs the catalogs to check against.
+target_compile_definitions (LanguageListTest
+	PRIVATE "PO_SRCDIR=${CMAKE_SOURCE_DIR}/po"
+)
+
+target_include_directories (LanguageListTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (LanguageListTest
+	muleunit
+	mulecommon
+	CRYPTOPP::CRYPTOPP
+)
+
+
+# libwebcommon — JWT / JSON writer / route patterns. `webcommon` PUBLIC-links
+# wxWidgets::BASE and CRYPTOPP::CRYPTOPP and exposes its own headers through
+# INTERFACE_INCLUDE_DIRECTORIES, so each test target only needs to depend on
+# `muleunit` and `webcommon`.
+
+add_executable (CredentialsTest
+	CredentialsTest.cpp
+	# muleunit's MuleDebug.cpp needs CFormat for its backtrace path, which
+	# is compiled in on glibc; without these the link fails on Linux while
+	# passing on macOS.
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME CredentialsTest COMMAND CredentialsTest)
+
+target_link_libraries (CredentialsTest
+	muleunit
+	webcommon
+)
+
+add_executable (JwtTest
+	JwtTest.cpp
+)
+add_test (NAME JwtTest COMMAND JwtTest)
+target_link_libraries (JwtTest
+	muleunit
+	webcommon
+	mulecommon
+)
+
+add_executable (ECCryptTest
+	ECCryptTest.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/ec/cpp/ECCrypt.cpp
+)
+add_test (NAME ECCryptTest COMMAND ECCryptTest)
+target_include_directories (ECCryptTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/libs/ec/cpp
+)
+target_link_libraries (ECCryptTest
+	muleunit
+	mulecommon
+	CRYPTOPP::CRYPTOPP
+)
+
+add_executable (SharedFilesReloadLatchTest
+	SharedFilesReloadLatchTest.cpp
+)
+add_test (NAME SharedFilesReloadLatchTest COMMAND SharedFilesReloadLatchTest)
+target_include_directories (SharedFilesReloadLatchTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+target_link_libraries (SharedFilesReloadLatchTest
+	muleunit
+	mulecommon
+)
+
+add_executable (ChatSessionStoreTest
+	ChatSessionStoreTest.cpp
+	${CMAKE_SOURCE_DIR}/src/ChatSessionStore.cpp
+)
+add_test (NAME ChatSessionStoreTest COMMAND ChatSessionStoreTest)
+target_include_directories (ChatSessionStoreTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+target_link_libraries (ChatSessionStoreTest
+	muleunit
+	mulecommon
+)
+
+add_executable (MediaProbeParseTest
+	MediaProbeParseTest.cpp
+	${CMAKE_SOURCE_DIR}/src/MediaProbe.cpp
+	${CMAKE_SOURCE_DIR}/src/AppImageEnv.cpp
+)
+add_test (NAME MediaProbeParseTest COMMAND MediaProbeParseTest)
+target_include_directories (MediaProbeParseTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+target_link_libraries (MediaProbeParseTest
+	muleunit
+	mulecommon
+)
+
+add_executable (MediaProbeEnvTest
+	MediaProbeEnvTest.cpp
+	${CMAKE_SOURCE_DIR}/src/MediaProbe.cpp
+	${CMAKE_SOURCE_DIR}/src/AppImageEnv.cpp
+)
+add_test (NAME MediaProbeEnvTest COMMAND MediaProbeEnvTest)
+target_include_directories (MediaProbeEnvTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+target_link_libraries (MediaProbeEnvTest
+	muleunit
+	mulecommon
+)
+
+add_executable (JsonWriterTest
+	JsonWriterTest.cpp
+)
+add_test (NAME JsonWriterTest COMMAND JsonWriterTest)
+target_link_libraries (JsonWriterTest
+	muleunit
+	webcommon
+	mulecommon
+)
+
+add_executable (PathPatternsTest
+	PathPatternsTest.cpp
+)
+add_test (NAME PathPatternsTest COMMAND PathPatternsTest)
+target_link_libraries (PathPatternsTest
+	muleunit
+	webcommon
+	mulecommon
+)
+
+add_executable (EtagTest
+	EtagTest.cpp
+)
+add_test (NAME EtagTest COMMAND EtagTest)
+target_link_libraries (EtagTest
+	muleunit
+	webcommon
+	mulecommon
+)
+
+# The SIGABRT reporting path. Forks and corrupts the heap for real, so it covers the case the
+# handler exists for rather than only the easy raise(SIGABRT) one. mulecommon carries MuleDebug.
+add_executable (FatalAbortBacktraceTest
+	FatalAbortBacktraceTest.cpp
+)
+add_test (NAME FatalAbortBacktraceTest COMMAND FatalAbortBacktraceTest)
+target_link_libraries (FatalAbortBacktraceTest
+	muleunit
+	mulecommon
+)
+
+add_executable (StaticFsTest
+	StaticFsTest.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/StaticFs.cpp
+)
+target_include_directories (StaticFsTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+)
+add_test (NAME StaticFsTest COMMAND StaticFsTest)
+target_link_libraries (StaticFsTest
+	muleunit
+	mulecommon
+)
+
+# amuleapi shared-file content endpoint: path containment against the
+# share-root list, Range parsing, and the Content-Disposition builder.
+# SharedContent.cpp is plain std/POSIX (no wx, Beast or EC), same as
+# StaticFs.cpp, so it links standalone here.
+add_executable (SharedContentTest
+	SharedContentTest.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/SharedContent.cpp
+)
+target_include_directories (SharedContentTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+)
+add_test (NAME SharedContentTest COMMAND SharedContentTest)
+target_link_libraries (SharedContentTest
+	muleunit
+	mulecommon
+)
+
+add_executable (EventBusTest
+	EventBusTest.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/EventBus.cpp
+)
+target_include_directories (EventBusTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+)
+add_test (NAME EventBusTest COMMAND EventBusTest)
+target_link_libraries (EventBusTest
+	muleunit
+	mulecommon
+)
+
+# CEventBus's std::atomic<uint64_t> event counter needs libatomic on
+# 32-bit targets without a hardware 8-byte CAS (PPC32, ARMv5/v6,
+# MIPS32); same reason amuleapi links it. Empty on 64-bit.
+if (LIBATOMIC)
+	target_link_libraries (EventBusTest ${LIBATOMIC})
+endif()
+
+# amuleapi log tee: CRotatingLog's size cap, line stamping and the tee itself.
+# LogTee.cpp is plain POSIX/std (no wx), so only muleunit + mulecommon are
+# needed for the harness.
+add_executable (LogTeeTest
+	LogTeeTest.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/LogTee.cpp
+)
+target_include_directories (LogTeeTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+)
+add_test (NAME LogTeeTest COMMAND LogTeeTest)
+target_link_libraries (LogTeeTest
+	muleunit
+	mulecommon
+)
+
+# Tests for EmitDiffsAndUpdate's log_appended path and cold-start
+# gating. Pulls EventBus + State along with EventDiff itself — no EC,
+# and the only wx dependency is the shared search-result writer below.
+add_executable (EventDiffTest
+	EventDiffTest.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/EventBus.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/EventDiff.cpp
+	# search_result_added is documented as carrying exactly a results-list
+	# entry, so EventDiff emits it through the same writer the REST handler
+	# uses instead of a second hand-rolled copy. That writer speaks
+	# CJsonWriter, which is what brings webcommon (and wx base) in here.
+	${CMAKE_SOURCE_DIR}/src/webapi/SearchJson.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/State.cpp
+)
+target_include_directories (EventDiffTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+	# ServerFlagNames.h reads the SRV_*FLG_* masks straight from the eD2k
+	# protocol headers rather than restating them.
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+add_test (NAME EventDiffTest COMMAND EventDiffTest)
+target_link_libraries (EventDiffTest
+	muleunit
+	mulecommon
+	webcommon
+	wxWidgets::BASE
+)
+
+# Pulls EventBus.cpp, so it needs libatomic on 32-bit targets too.
+if (LIBATOMIC)
+	target_link_libraries (EventDiffTest ${LIBATOMIC})
+endif()
+
+# amuleapi-specific: tests CAmuleApiConfig's file-IO + mode-bit
+# enforcement. AmuleApiConfig.cpp is statically linked into the test
+# binary (rather than a webapi-side static lib) — it's a single TU and
+# the amuleapi exe is the only other consumer, so an extra library
+# target for one TU would just add noise.
+add_executable (AmuleApiConfigTest
+	AmuleApiConfigTest.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/AmuleApiConfig.cpp
+)
+add_test (NAME AmuleApiConfigTest COMMAND AmuleApiConfigTest)
+target_include_directories (AmuleApiConfigTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+)
+target_link_libraries (AmuleApiConfigTest
+	muleunit
+	webcommon
+	mulecommon
+	wxWidgets::BASE
+)
+
+# amuleapi auth state — revocation set, rate limiter, header
+# extraction, ISO-8601 formatter. Same vendoring pattern as the
+# Config test: Auth.cpp is pulled in directly because amuleapi is
+# the only other consumer.
+add_executable (AuthTest
+	AuthTest.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/Auth.cpp
+)
+add_test (NAME AuthTest COMMAND AuthTest)
+target_include_directories (AuthTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+)
+target_link_libraries (AuthTest
+	muleunit
+	webcommon
+	mulecommon
+)
+
+# EC password-exchange throttle: exercises the limiter at the values the
+# listener ships with. The limiter lives in mulecommon, so nothing
+# webapi-specific is needed here.
+add_executable (RateLimiterTest
+	RateLimiterTest.cpp
+)
+add_test (NAME RateLimiterTest COMMAND RateLimiterTest)
+target_link_libraries (RateLimiterTest
+	muleunit
+	mulecommon
+)
+
+# amuleapi state cache — snapshot semantics + concurrent-reader
+# correctness on the shared_timed_mutex.
+add_executable (StateTest
+	StateTest.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/State.cpp
+)
+add_test (NAME StateTest COMMAND StateTest)
+target_include_directories (StateTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+)
+target_link_libraries (StateTest
+	muleunit
+	mulecommon
+)
+
+# amuleapi refresher — the pure EC-tag-to-State translation layer
+# (Refresher.cpp) is linkable without the CamuleapiApp dependency
+# tree because the orchestration body lives in RefresherTick.cpp
+# (kept out of this target). Tests cover the EC_TAG_FILE_REMOVED
+# delete marker, the alive-marker enqueue path, the unknown-ECID-
+# no-op defence (#713-class race), and partial-update-active.
+add_executable (RefresherTest
+	RefresherTest.cpp
+	# Refresher.cpp decodes EC_TAG_KAD_ID into a CUInt128; the class
+	# lives outside libec, so the archive's ECUInt128.cpp cannot
+	# resolve on its own. Mirrors amuleapi's own webapi/CMakeLists.txt.
+	${CMAKE_SOURCE_DIR}/src/kademlia/utils/UInt128.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/PrefsSchema.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/Refresher.cpp
+	${CMAKE_SOURCE_DIR}/src/webapi/State.cpp
+	# OtherFunctions.cpp ships the `CastIto*` / `CastSecondsToHM`
+	# formatters that `CEC_StatTree_Node_Tag::GetDisplayString` pulls
+	# in via libec.a's `FormatValue`. Without this the ParseStatsTree
+	# test can't link.
+	${CMAKE_SOURCE_DIR}/src/OtherFunctions.cpp
+	# RLE.cpp ships `PartFileEncoderData` + the stateful `RLE_Data`
+	# decoder Refresher.cpp uses for `progress.parts`. Required even
+	# for tests that don't directly invoke the decoder — the public
+	# Apply{Update,Full} signatures take `std::map<ecid,
+	# PartFileEncoderData>&` so the class is part of the link.
+	${CMAKE_SOURCE_DIR}/src/RLE.cpp
+	# LoggerConsole.cpp provides the no-op DoECLogLine + theLogger
+	# symbols that libec.a's Debug build references unconditionally
+	# (ECPacket / ECSocket / ECTag debug-print paths). Release builds
+	# preprocess these calls to `do {} while(0)` via the ECLog.h
+	# define, so the symbols are unused there; macOS Debug + Ubuntu
+	# Debug builds link them in. Mirror amuleapi's own webapi/
+	# CMakeLists.txt, which already pulls this TU in.
+	${CMAKE_SOURCE_DIR}/src/LoggerConsole.cpp
+)
+add_test (NAME RefresherTest COMMAND RefresherTest)
+target_include_directories (RefresherTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${CMAKE_BINARY_DIR}
+)
+target_link_libraries (RefresherTest
+	muleunit
+	ec
+	mulecommon
+	mulesocket
+	webcommon
+	wxWidgets::NET
+)
+
+# CompleteSourcesNeedRecompute decides whether the complete-sources throttle
+# must be bypassed because the upload list went empty. #1052 added that bypass
+# but guarded it on the scalar alone, leaving Hi stale (#1065), so the
+# predicate now lives in a header of its own: CKnownFile reaches theApp and
+# cannot be linked into a test.
+add_executable (JsonDepthScanTest
+	JsonDepthScanTest.cpp
+)
+
+add_test (NAME JsonDepthScanTest
+	COMMAND JsonDepthScanTest
+)
+
+target_include_directories (JsonDepthScanTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+)
+
+# mulecommon even though the header is inline-only: macOS links without it,
+# GNU ld and mingw do not.
+target_link_libraries (JsonDepthScanTest
+	muleunit
+	mulecommon
+)
+
+add_executable (CompleteSourcesThrottleTest
+	CompleteSourcesThrottleTest.cpp
+)
+
+add_test (NAME CompleteSourcesThrottleTest
+	COMMAND CompleteSourcesThrottleTest
+)
+
+target_include_directories (CompleteSourcesThrottleTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+# mulecommon even though the header is inline-only: macOS links without it,
+# GNU ld and mingw do not.
+target_link_libraries (CompleteSourcesThrottleTest
+	muleunit
+	mulecommon
+)
+
+# The browse ("View Files") state machine. Five separate defects have been the
+# same machine going wrong in a place only a peer of the right kind could reach
+# -- a flat browse that completes without ever being marked finished, a peer we
+# decline to contact, a terminal browse still on the pending list (#1071 and
+# its follow-ups). None were reachable from a test while the logic sat on
+# CUpDownClient, so it lives in a pair of its own that touches no theApp.
+add_executable (BrowseLifecycleTest
+	BrowseLifecycleTest.cpp
+	${CMAKE_SOURCE_DIR}/src/BrowseLifecycle.cpp
+)
+
+add_test (NAME BrowseLifecycleTest
+	COMMAND BrowseLifecycleTest
+)
+
+target_include_directories (BrowseLifecycleTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (BrowseLifecycleTest
+	muleunit
+	mulecommon
+)
+
+# The rules about browses -- one per peer, a terminal record outliving its
+# client, a disconnect after success not being a failure. They used to live on
+# CBrowseManager next to the notify and the log line, which put them out of a
+# test's reach; the two defects found after the lifecycle was extracted were
+# both here rather than in the state machine. The store identifies peers by an
+# opaque key and touches no theApp, so all of it is drivable.
+add_executable (BrowseStoreTest
+	BrowseStoreTest.cpp
+	${CMAKE_SOURCE_DIR}/src/BrowseStore.cpp
+	${CMAKE_SOURCE_DIR}/src/BrowseLifecycle.cpp
+)
+
+add_test (NAME BrowseStoreTest
+	COMMAND BrowseStoreTest
+)
+
+target_include_directories (BrowseStoreTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (BrowseStoreTest
+	muleunit
+	mulecommon
+)
+
+# CListColumnStore maps a column id to its persistence key and default width.
+# The key is the on-disk config format, so the id a caller registers has to be
+# the id it looks the column up by -- a registry that renumbered stored ids
+# would hand a saved width back to the wrong column, with nothing to see. Needs
+# no GUI: the registry half of the class is plain wxString bookkeeping.
+add_executable (ListColumnStoreTest
+	ListColumnStoreTest.cpp
+	${CMAKE_SOURCE_DIR}/src/ListColumnStore.cpp
+)
+
+add_test (NAME ListColumnStoreTest
+	COMMAND ListColumnStoreTest
+)
+
+target_include_directories (ListColumnStoreTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (ListColumnStoreTest
+	muleunit
+	mulecommon
+)
+
+# RangeFileBody is the Boost.Beast Body amuleapi serves shared content with: a
+# bounded first, last window read through a fixed 64 KiB buffer. Header-only
+# and free of wx and of the rest of the webapi tree, so the test compiles on
+# its own -- it only needs the Boost headers amuleapi already builds against.
+add_executable (RangeFileBodyTest
+	RangeFileBodyTest.cpp
+)
+
+add_test (NAME RangeFileBodyTest
+	COMMAND RangeFileBodyTest
+)
+
+target_include_directories (RangeFileBodyTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+	PRIVATE ${Boost_INCLUDE_DIR}
+)
+
+target_link_libraries (RangeFileBodyTest
+	muleunit
+	mulecommon
+	${Boost_LIBRARIES}
+)
+
+# The two part-index predicates behind `next_requested_part_index` /
+# `downloading_part_index` on the per-file client rows. Every branch that
+# matters turns on a value a live peer will not produce on request -- the
+# 0xffff sentinel, the boundary at part_count, a file with more than 65535
+# parts, a source whose state flips to "downloading" -- so PartIndex.h is
+# header-only and free of wx, Beast and EC, and the test needs nothing but
+# the harness.
+# The chunk-bar palette and the two legends the row context menu opens.
+# Header-only and wx-free on purpose (see PartBarLegend.h): the colours, the rows
+# of each legend and which legend a column gets are all decided without a
+# toolkit, so a headless run can check the half of the feature that can drift
+# silently. Needs no app and no daemon.
+#
+# This comment described a "?" beside the column headers until now. That
+# affordance never shipped: #1218 replaced it with a row context-menu entry
+# because the header hit test could not work -- clickX and GetColumnLeft() are
+# not in the same coordinate space -- and header clicks only sort. The test it
+# claimed to cover went with it.
+# Where each part sits in a chunk bar, and which of the two unrelated things the
+# shared-files bar draws. Header-only and wx-free (see PartBarSpans.h): the
+# geometry and the mode choice come from two integers, so a headless run can
+# check the arithmetic that was silently wrong. Needs no app and no daemon.
+add_executable (PartBarSpansTest
+	PartBarSpansTest.cpp
+)
+
+add_test (NAME PartBarSpansTest
+	COMMAND PartBarSpansTest
+)
+
+target_include_directories (PartBarSpansTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+)
+
+# mulecommon even though the header is inline-only: macOS links without it,
+# GNU ld and mingw do not (see JsonDepthScanTest).
+target_link_libraries (PartBarSpansTest
+	muleunit
+	mulecommon
+)
+
+add_executable (PartBarLegendTest
+	PartBarLegendTest.cpp
+)
+
+add_test (NAME PartBarLegendTest
+	COMMAND PartBarLegendTest
+)
+
+# The one thing in this suite that is not header-only: the availability fade is
+# duplicated in the Web UI, which has no build step to generate one side from the
+# other, so the test reads the browser's own sources and compares. Same SRCDIR
+# trick as TextFileTest.
+target_compile_definitions (PartBarLegendTest
+	PRIVATE "SRCDIR=${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
+target_include_directories (PartBarLegendTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+)
+
+# mulecommon even though the header is inline-only: macOS links without it,
+# GNU ld and mingw do not (see JsonDepthScanTest).
+target_link_libraries (PartBarLegendTest
+	muleunit
+	mulecommon
+)
+
+# eMuleAI vendor capability bits (CT_MOD_MISCOPTIONS) and the "ip6"/"bi6" hex
+# address encoding. Both are wire format shared with another implementation and
+# both fail silently when wrong -- a misplaced bit makes aMule advertise a
+# transport it does not have. CUpDownClient reaches theApp, so the model lives
+# in a header of its own and is tested there.
+add_executable (PeerCapabilitiesTest
+	PeerCapabilitiesTest.cpp
+	# The unknown-vendor-tag test reads a tag stream through the same classes
+	# the handshake does, because the property it pins -- an unknown tag
+	# consumes its own bytes -- is a wire property and not a client one. Same
+	# TU set as CTagTest.
+	${CMAKE_SOURCE_DIR}/src/SafeFile.cpp
+	${CMAKE_SOURCE_DIR}/src/MemFile.cpp
+	${CMAKE_SOURCE_DIR}/src/Tag.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/Format.cpp
+	${CMAKE_SOURCE_DIR}/src/libs/common/strerror_r.c
+)
+
+add_test (NAME PeerCapabilitiesTest
+	COMMAND PeerCapabilitiesTest
+)
+
+target_include_directories (PeerCapabilitiesTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (PeerCapabilitiesTest
+	muleunit
+)
+
+# CT_MOD_YOUR_IP corroboration: that a claim for an address this machine does
+# not hold is never believed however many peers repeat it, and, among the
+# addresses it does hold, how many unrelated peers have to agree, what
+# "unrelated" is keyed on, and how long a voice keeps counting. eMuleAI
+# believes the first peer that answers; this follows emule-qt and does not.
+# Header-only for the same reason as PeerCapabilities: CUpDownClient reaches
+# theApp.
+add_executable (PublicIPv6CorroborationTest
+	PublicIPv6CorroborationTest.cpp
+)
+
+add_test (NAME PublicIPv6CorroborationTest
+	COMMAND PublicIPv6CorroborationTest
+)
+
+target_include_directories (PublicIPv6CorroborationTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (PublicIPv6CorroborationTest
+	muleunit
+	mulecommon
+)
+
+# OP_UDPRESERVEDPROT2 frame demultiplexing: the type byte, the payload window
+# handed to each handler, the unknown-type drop, and the log throttle that
+# keeps an unknown-frame flood from becoming a log flood. Same reason for the
+# separate header: CClientUDPSocket needs theApp.
+add_executable (ReservedProtocolFramesTest
+	ReservedProtocolFramesTest.cpp
+)
+
+add_test (NAME ReservedProtocolFramesTest
+	COMMAND ReservedProtocolFramesTest
+)
+
+target_include_directories (ReservedProtocolFramesTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+)
+
+target_link_libraries (ReservedProtocolFramesTest
+	muleunit
+	mulecommon
+)
+
+add_executable (PartIndexTest
+	PartIndexTest.cpp
+)
+
+add_test (NAME PartIndexTest
+	COMMAND PartIndexTest
+)
+
+target_include_directories (PartIndexTest
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/webapi
+)
+
+# mulecommon even though the header is inline-only: macOS links without it,
+# GNU ld and mingw do not (see JsonDepthScanTest).
+target_link_libraries (PartIndexTest
+	muleunit
+	mulecommon
+)
+
+# EC_TAG_CLIENT_MOD_CAPABILITIES: the headless view of a peer's negotiated
+# vendor capabilities. The Client Details dialog that renders the same data
+# lives in amule/amulegui and needs an X server, so this tag is what makes that
+# display observable in CI -- and its encoding is pinned here rather than in a
+# GUI nobody can open. Same TU set and the same LoggerConsole.cpp reason as
+# ECIdDiffTest.
+add_executable (ECClientCapabilitiesTest
+	ECClientCapabilitiesTest.cpp
+	${CMAKE_SOURCE_DIR}/src/LoggerConsole.cpp
+)
+
+add_test (NAME ECClientCapabilitiesTest
+	COMMAND ECClientCapabilitiesTest
+)
+
+target_include_directories (ECClientCapabilitiesTest
+	PRIVATE ${CMAKE_BINARY_DIR}
+	PRIVATE ${CMAKE_SOURCE_DIR}/src
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/include
+	PRIVATE ${CMAKE_SOURCE_DIR}/src/libs
+	PRIVATE ${CMAKE_BINARY_DIR}/src/libs
+	PRIVATE ${CMAKE_BINARY_DIR}/src/libs/ec/cpp
+)
+
+target_link_libraries (ECClientCapabilitiesTest
+	muleunit
+	ec
+	mulecommon
 )

amule-3.1.0.tar.gz/unittests/tests/CMuleCollectionTest.cpp Added

@@ -0,0 +1,310 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <wx/file.h>
+#include <wx/filename.h>
+#include <wx/log.h>
+
+#include <muleunit/test.h>
+
+#include <MuleCollection.h>
+
+#include <string>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(MuleCollection)
+
+// Collection files arrive from a file manager, so every test here feeds CMuleCollection something
+// it did not write. Most cases are malformed and awkward to keep on disk, which is why they go
+// through OpenBuffer.
+
+namespace
+{
+void PutU8(std::string &s, unsigned v)
+{
+	s += static_cast<char>(v & 0xFF);
+}
+
+void PutU16(std::string &s, unsigned v)
+{
+	PutU8(s, v);
+	PutU8(s, v >> 8);
+}
+
+void PutU32(std::string &s, uint32_t v)
+{
+	PutU16(s, static_cast<unsigned>(v));
+	PutU16(s, static_cast<unsigned>(v >> 16));
+}
+
+/**
+ * Builds a binary collection holding exactly one entry, in the tag order eMule writes: FT_FILEHASH,
+ * FT_FILESIZE, FT_FILENAME.
+ */
+std::string MakeBinaryCollection(const std::string &fileName, uint32_t fileSize, bool withHash = true)
+{
+	std::string s;
+	PutU32(s, 0x02); // collection version
+	PutU32(s, 0);    // header tag count
+	PutU32(s, 1);    // file count
+	PutU32(s, withHash ? 3 : 2);
+
+	if (withHash) {
+		PutU8(s, 0x81); // tag type, unused for FT_FILEHASH
+		PutU8(s, 0x28); // FT_FILEHASH
+		for (int i = 0; i < 16; ++i) {
+			PutU8(s, 0xAB);
+		}
+	}
+
+	PutU8(s, 0x83); // TAGTYPE_UINT32
+	PutU8(s, 0x02); // FT_FILESIZE
+	PutU32(s, fileSize);
+
+	PutU8(s, 0x82); // 0x82 ^ 0x80 == 0x02, a uint16-length-prefixed string
+	PutU8(s, 0x01); // FT_FILENAME
+	PutU16(s, static_cast<unsigned>(fileName.size()));
+	s += fileName;
+
+	return s;
+}
+
+bool OpenString(CMuleCollection &collection, const std::string &data)
+{
+	return collection.OpenBuffer(data.data(), data.size());
+}
+
+const char *const VALID_LINK = "ed2k://|file|some.file.name.iso|1234567|0123456789abcdef0123456789abcdef|/";
+} // namespace
+
+TEST(MuleCollection, TextCollection)
+{
+	CMuleCollection collection;
+	std::string data = std::string(VALID_LINK) + "\n" + VALID_LINK + "\n";
+
+	ASSERT_TRUE(OpenString(collection, data));
+	ASSERT_EQUALS((size_t)2, collection.size());
+	ASSERT_EQUALS(std::string(VALID_LINK), collection0);
+}
+
+TEST(MuleCollection, TextCollectionStripsCarriageReturns)
+{
+	CMuleCollection collection;
+	std::string data = std::string(VALID_LINK) + "\r\n";
+
+	ASSERT_TRUE(OpenString(collection, data));
+	ASSERT_EQUALS((size_t)1, collection.size());
+	ASSERT_EQUALS(std::string(VALID_LINK), collection0);
+}
+
+// Regression: an empty line used to underflow the length arithmetic and index
+// far past the end of the string, throwing std::out_of_range out of Open().
+TEST(MuleCollection, TextCollectionSurvivesBlankLines)
+{
+	CMuleCollection collection;
+	std::string data = std::string("\n\n") + VALID_LINK + "\n\n\r\n";
+
+	ASSERT_TRUE(OpenString(collection, data));
+	ASSERT_EQUALS((size_t)1, collection.size());
+	ASSERT_EQUALS(std::string(VALID_LINK), collection0);
+}
+
+// Text collections are hand-made link lists, and a Windows editor writes a UTF-8 BOM by default; it
+// used to leave the first link failing its prefix check, so a single-entry collection looked empty.
+TEST(MuleCollection, TextCollectionSkipsUtf8Bom)
+{
+	CMuleCollection collection;
+	std::string data = "\xEF\xBB\xBF" + std::string(VALID_LINK) + "\n";
+
+	ASSERT_TRUE(OpenString(collection, data));
+	ASSERT_EQUALS((size_t)1, collection.size());
+	ASSERT_EQUALS(std::string(VALID_LINK), collection0);
+}
+
+TEST(MuleCollection, BomOnlyInput)
+{
+	CMuleCollection collection;
+
+	ASSERT_FALSE(OpenString(collection, "\xEF\xBB\xBF"));
+	ASSERT_EQUALS((size_t)0, collection.size());
+}
+
+TEST(MuleCollection, TextCollectionIgnoresNonLinks)
+{
+	CMuleCollection collection;
+
+	ASSERT_FALSE(OpenString(collection, "just some text\nand more text\n"));
+	ASSERT_EQUALS((size_t)0, collection.size());
+}
+
+TEST(MuleCollection, BinaryCollection)
+{
+	CMuleCollection collection;
+
+	ASSERT_TRUE(OpenString(collection, MakeBinaryCollection("movie.avi", 700000)));
+	ASSERT_EQUALS((size_t)1, collection.size());
+	ASSERT_EQUALS(std::string("ed2k://|file|movie.avi|700000|abababababababababababababababab|/"),
+		collection0);
+}
+
+// An entry with no FT_FILEHASH used to yield a link naming the all-zero file
+// id: syntactically valid, but a download that can never find a source.
+TEST(MuleCollection, BinaryCollectionSkipsEntriesWithoutHash)
+{
+	CMuleCollection collection;
+
+	ASSERT_FALSE(OpenString(collection, MakeBinaryCollection("movie.avi", 700000, false)));
+	ASSERT_EQUALS((size_t)0, collection.size());
+}
+
+// A newline in a filename would forge extra lines once the link is written to
+// the ED2KLinks file - including the RAISE_DIALOG token and extra downloads.
+TEST(MuleCollection, BinaryCollectionRejectsNewlineInFilename)
+{
+	CMuleCollection collection;
+
+	ASSERT_FALSE(OpenString(collection,
+		MakeBinaryCollection(
+			"evil.avi\ned2k://|file|injected|1|0123456789abcdef0123456789abcdef|/", 700000)));
+	ASSERT_EQUALS((size_t)0, collection.size());
+}
+
+// A pipe would forge extra fields inside the eD2k URI itself.
+TEST(MuleCollection, BinaryCollectionRejectsPipeInFilename)
+{
+	CMuleCollection collection;
+
+	ASSERT_FALSE(OpenString(collection, MakeBinaryCollection("evil|name.avi", 700000)));
+	ASSERT_EQUALS((size_t)0, collection.size());
+}
+
+TEST(MuleCollection, BinaryCollectionKeepsNonAsciiFilename)
+{
+	CMuleCollection collection;
+	// UTF-8 for "filename" in Japanese - every byte is >= 0x80, so a signed
+	// char comparison in the safety check would throw the entry away.
+	const std::string name = "\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB.avi";
+
+	ASSERT_TRUE(OpenString(collection, MakeBinaryCollection(name, 42)));
+	ASSERT_EQUALS((size_t)1, collection.size());
+	ASSERT_EQUALS(std::string("ed2k://|file|") + name + "|42|abababababababababababababababab|/",
+		collection0);
+}
+
+// A twelve-byte crafted file used to ask for a 4 GiB allocation, and the
+// resulting bad_alloc escaped Open() uncaught.
+TEST(MuleCollection, BinaryCollectionRejectsOversizedBlob)
+{
+	CMuleCollection collection;
+	std::string s;
+	PutU32(s, 0x02); // version
+	PutU32(s, 1);    // one header tag
+	PutU8(s, 0x02);  // tag type
+	PutU16(s, 0x0001);
+	PutU8(s, 0x32); // FT_COLLECTIONAUTHORKEY
+	PutU32(s, 0xFFFFFFFFu);
+
+	ASSERT_FALSE(OpenString(collection, s));
+	ASSERT_EQUALS((size_t)0, collection.size());
+}
+
+// A binary file that goes bad partway used to leave its already-parsed entries
+// behind, which the text parser then reported as a successful open.
+TEST(MuleCollection, TruncatedBinaryCollectionYieldsNothing)
+{
+	CMuleCollection collection;
+	std::string data = MakeBinaryCollection("movie.avi", 700000);
+	// Claim two files but supply only one.
+	data8 = 0x02;
+
+	ASSERT_FALSE(OpenString(collection, data));
+	ASSERT_EQUALS((size_t)0, collection.size());
+}
+
+TEST(MuleCollection, EmptyInput)
+{
+	CMuleCollection collection;
+
+	ASSERT_FALSE(collection.OpenBuffer(nullptr, 0));
+	ASSERT_FALSE(OpenString(collection, ""));
+	ASSERT_EQUALS((size_t)0, collection.size());
+}
+
+TEST(MuleCollection, MissingFile)
+{
+	CMuleCollection collection;
+	wxLogNull noLog; // wxFile logs the expected open failure
+
+	ASSERT_FALSE(collection.Open(wxString("/no/such/directory/no-such-file.emulecollection")));
+	ASSERT_EQUALS((size_t)0, collection.size());
+}
+
+// The wxString overload exists so that paths std::ifstream cannot represent -
+// non-ASCII ones on Windows, or under a non-UTF-8 locale on POSIX - still open.
+TEST(MuleCollection, NonAsciiPath)
+{
+	const wxString path = wxFileName::GetTempDir() + wxFileName::GetPathSeparator() +
+			      wxString::FromUTF8("aMule-\xE3\x83\x86\xE3\x82\xB9\xE3\x83\x88") +
+			      ".emulecollection";
+
+	{
+		wxFile file;
+		ASSERT_TRUE(file.Create(path, true));
+		const std::string data = std::string(VALID_LINK) + "\n";
+		ASSERT_TRUE(file.Write(data.data(), data.size()) == data.size());
+	}
+
+	CMuleCollection collection;
+	const bool opened = collection.Open(path);
+	wxRemoveFile(path);
+
+	ASSERT_TRUE(opened);
+	ASSERT_EQUALS((size_t)1, collection.size());
+	ASSERT_EQUALS(std::string(VALID_LINK), collection0);
+}
+
+TEST(MuleCollection, OversizedFileRejected)
+{
+	const wxString path =
+		wxFileName::GetTempDir() + wxFileName::GetPathSeparator() + "aMule-oversized.emulecollection";
+
+	{
+		wxFile file;
+		ASSERT_TRUE(file.Create(path, true));
+		// One byte past the 4 MiB ceiling.
+		const std::string chunk(64 * 1024, 'x');
+		for (int i = 0; i < 64; ++i) {
+			file.Write(chunk.data(), chunk.size());
+		}
+		file.Write("x", 1);
+	}
+
+	CMuleCollection collection;
+	const bool opened = collection.Open(path);
+	wxRemoveFile(path);
+
+	ASSERT_FALSE(opened);
+	ASSERT_EQUALS((size_t)0, collection.size());
+}

amule-3.0.1.tar.gz/unittests/tests/CTagTest.cpp -> amule-3.1.0.tar.gz/unittests/tests/CTagTest.cpp Changed

@@ -14,61 +14,82 @@
 
 DECLARE_SIMPLE(CTag)
 
-void test_taglist_serialization(TagPtrList & taglist, uint8_t* packet, uint64 packet_len);
+void test_taglist_serialization(TagPtrList &taglist, uint8_t *packet, uint64 packet_len);
 
-template <class T1, class T2>
-void AssertEquals(const T1& a, const T2& b)
+template <class T1, class T2> void AssertEquals(const T1 &a, const T2 &b)
 {
 	ASSERT_EQUALS(a, b);
 }
 
 struct BLOBValue : std::vector<uint8_t>
 {
-	BLOBValue(uint32 _length, const uint8_t* _ptr)
-		: std::vector<uint8_t > (_ptr, _ptr + _length)
-	{}
+	BLOBValue(uint32 _length, const uint8_t *_ptr)
+	: std::vector<uint8_t>(_ptr, _ptr + _length)
+	{
+	}
 };
 
 struct BSOBValue : std::vector<uint8_t>
 {
-	BSOBValue(uint8 _length, const uint8_t* _ptr)
-		: std::vector<uint8_t > (_ptr, _ptr + _length)
-	{}
+	BSOBValue(uint8 _length, const uint8_t *_ptr)
+	: std::vector<uint8_t>(_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; }
+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)
+template <class T> wxString toString(const T &value)
 {
 	wxString buf;
 
 	return buf << value;
 }
 
-template<class T>
-wxString toString(T& value)
+template <class T> wxString toString(T &value)
 {
 	wxString buf;
 
 	return buf << value;
 }
 
-template<>
-wxString toString(const CMD4Hash& value)
+template <> wxString toString(const CMD4Hash &value)
 {
 	return value.Encode();
 }
 
-template<>
-wxString toString(CMemFile& buf)
+template <> wxString toString(CMemFile &buf)
 {
 	uint64 curpos = buf.GetPosition();
 	wxString result;
@@ -81,8 +102,7 @@
 	return result;
 }
 
-template<>
-wxString toString(const BSOBValue& buf)
+template <> wxString toString(const BSOBValue &buf)
 {
 	wxString result;
 	for (uint64 i = 0; i < buf.size(); i++) {
@@ -91,8 +111,7 @@
 	return result;
 }
 
-template<>
-wxString toString(const BLOBValue& buf)
+template <> wxString toString(const BLOBValue &buf)
 {
 	wxString result;
 	for (uint64 i = 0; i < buf.size(); i++) {
@@ -101,145 +120,98 @@
 	return result;
 }
 
-template<>
-void AssertEquals(const CMD4Hash& a, const CMD4Hash& b)
+template <> void AssertEquals(const CMD4Hash &a, const CMD4Hash &b)
 {
 	CONTEXT("Compare CMD4Hashes");
 	ASSERT_EQUALS(a.Encode(), b.Encode());
 }
 
-template<>
-void AssertEquals(const BSOBValue& a, const BSOBValue& b)
+template <> void AssertEquals(const BSOBValue &a, const BSOBValue &b)
 {
 	CONTEXT("Compare BSOBValue");
 	ASSERT_EQUALS(toString(a), toString(b));
 }
 
-template<>
-void AssertEquals(const BLOBValue& a, const BLOBValue& b)
+template <> void AssertEquals(const BLOBValue &a, const BLOBValue &b)
 {
 	CONTEXT("Compare BLOBValue");
 	ASSERT_EQUALS(toString(a), toString(b));
 }
 
-void CheckTagName(const wxString& tagName, CTag* tag)
+void CheckTagName(const wxString &tagName, CTag *tag)
 {
 	CONTEXT("Checking string tagname");
 	ASSERT_EQUALS(tagName, tag->GetName());
 }
 
-void CheckTagName(uint8 tagName, CTag* tag)
+void CheckTagName(uint8 tagName, CTag *tag)
 {
 	CONTEXT("Checking int tagname");
 	ASSERT_EQUALS(tagName, tag->GetNameID());
 }
 
-
 typedef bool (CTag::*CTagTypeChecker)() const;
 
-template<class T>
-struct CTagAccess {};
+template <class T> struct CTagAccess
+{
+};
 
-template<>
-struct CTagAccess<wxString>
+template <> struct CTagAccess<wxString>
 {
-	static bool IsRightType(CTag* tag)
-	{
-		return tag->IsStr();
-	}
+	static bool IsRightType(CTag *tag) { return tag->IsStr(); }
 
-	static const wxString & GetValue(CTag* tag)
-	{
-		return tag->GetStr();
-	}
+	static const wxString &GetValue(CTag *tag) { return tag->GetStr(); }
 };
 
-template<>
-struct CTagAccess<CMD4Hash>
+template <> struct CTagAccess<CMD4Hash>
 {
-	static bool IsRightType(CTag* tag)
-	{
-		return tag->IsHash();
-	}
+	static bool IsRightType(CTag *tag) { return tag->IsHash(); }
 
-	static const CMD4Hash & GetValue(CTag* tag)
-	{
-		return tag->GetHash();
-	}
+	static const CMD4Hash &GetValue(CTag *tag) { return tag->GetHash(); }
 };
 
-template<>
-struct CTagAccess<float>
+template <> struct CTagAccess<float>
 {
-	static bool IsRightType(CTag* tag)
-	{
-		return tag->IsFloat();
-	}
+	static bool IsRightType(CTag *tag) { return tag->IsFloat(); }
 
-	static float GetValue(CTag* tag)
-	{
-		return tag->GetFloat();
-	}
+	static float GetValue(CTag *tag) { return tag->GetFloat(); }
 };
 
-template<>
-struct CTagAccess<uint64>
+template <> struct CTagAccess<uint64>
 {
-	static bool IsRightType(CTag* tag)
-	{
-		return tag->IsInt();
-	}
+	static bool IsRightType(CTag *tag) { return tag->IsInt(); }
 
-	static uint64 GetValue(CTag* tag)
-	{
-		return tag->GetInt();
-	}
+	static uint64 GetValue(CTag *tag) { return tag->GetInt(); }
 };
 
-template<>
-struct CTagAccess<BLOBValue>
+template <> struct CTagAccess<BLOBValue>
 {
-	static bool IsRightType(CTag* tag)
-	{
-		return tag->IsBlob();
-	}
+	static bool IsRightType(CTag *tag) { return tag->IsBlob(); }
 
-	static BLOBValue GetValue(CTag* tag)
-	{
-		return BLOBValue(tag->GetBlobSize(), tag->GetBlob());
-	}
+	static BLOBValue GetValue(CTag *tag) { return BLOBValue(tag->GetBlobSize(), tag->GetBlob()); }
 };
 
-template<>
-struct CTagAccess<BSOBValue>
+template <> struct CTagAccess<BSOBValue>
 {
-	static bool IsRightType(CTag* tag)
-	{
-		return tag->IsBsob();
-	}
+	static bool IsRightType(CTag *tag) { return tag->IsBsob(); }
 
-	static BSOBValue GetValue(CTag* tag) {
-		return BSOBValue(tag->GetBsobSize(), tag->GetBsob());
-	}
+	static BSOBValue GetValue(CTag *tag) { return BSOBValue(tag->GetBsobSize(), tag->GetBsob()); }
 };
 
-template<class V>
-void CheckTagValue(V tagValue, CTag* tag)
+template <class V> void CheckTagValue(V tagValue, CTag *tag)
 {
 	CONTEXT("Check tag value");
 
-	AssertEquals(tagValue, CTagAccess< V >::GetValue(tag));
+	AssertEquals(tagValue, CTagAccess<V>::GetValue(tag));
 }
 
-template<class V>
-void CheckTagType(V, CTag* tag)
+template <class V> void CheckTagType(V, CTag *tag)
 {
 	CONTEXT("Check tag type");
 	ASSERT_EQUALS(true, CTagAccess<V>::IsRightType(tag));
 }
 
-template<class V, class TName>
-void CheckTagData(CTag* tag, TName tagName, const V& tagValue)
+template <class V, class TName> void CheckTagData(CTag *tag, TName tagName, const V &tagValue)
 {
 	CONTEXT("Expected tag value:" + toString(tagValue));
 	CONTEXT("Parsed tag info:" + tag->GetFullInfo());
@@ -249,7 +221,7 @@
 	CheckTagValue(valid_tag_value(tagValue), tag);
 }
 
-void test_taglist_serialization(TagPtrList& taglist, uint8_t* packet, uint64 packet_len)
+void test_taglist_serialization(TagPtrList &taglist, uint8_t *packet, uint64 packet_len)
 {
 	CMemFile fout;
 
@@ -281,7 +253,7 @@
 	}
 }
 
-void ReadTagPtrList(TagPtrList& taglist, uint8_t* packet, uint64 packet_len)
+void ReadTagPtrList(TagPtrList &taglist, uint8_t *packet, uint64 packet_len)
 {
 
 	CONTEXT("Reading taglist from buffer");
@@ -296,24 +268,96 @@
 
 TEST_M(CTag, ReadTagList1, "Kad: Parse taglist from Kad packet with UTF8 string #1")
 {
-	uint8_t 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
-	};
+	uint8_t 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));
+	ReadTagPtrList(taglist, packet, sizeof(packet));
 	TagPtrList::iterator it = taglist.begin();
 
-	CheckTagData(*it++, TAG_FILENAME, valid_tag_value(wxString::FromUTF8("Gem Boy - Sarà perchè ti amo.mp3")));
+	CheckTagData(
+		*it++, TAG_FILENAME, valid_tag_value(wxString::FromUTF8("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));
@@ -322,57 +366,146 @@
 	CheckTagData(*it++, TAG_PUBLISHINFO, valid_tag_value(16842799));
 
 	ASSERT_TRUE(it == taglist.end());
-	test_taglist_serialization(taglist, packet, sizeof (packet));
+	test_taglist_serialization(taglist, packet, sizeof(packet));
 	deleteTagPtrListEntries(&taglist);
 }
 
 TEST_M(CTag, ReadTagList2, "Kad: Parse taglist from Kad packet with UTF8 string #2")
 {
-	uint8_t 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
-	};
+	uint8_t 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));
+	ReadTagPtrList(taglist, packet, sizeof(packet));
 	TagPtrList::iterator it = taglist.begin();
 
-	CheckTagData(*it++, TAG_FILENAME, valid_tag_value(wxString::FromUTF8("Serialization Test File 1893-€€èéçàù§.txt")));
+	CheckTagData(*it++,
+		TAG_FILENAME,
+		valid_tag_value(wxString::FromUTF8("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));
+	test_taglist_serialization(taglist, packet, sizeof(packet));
 	deleteTagPtrListEntries(&taglist);
-
 }
 
 TEST_M(CTag, Float, "Kad: Read/Write floats")
 {
 	uint8_t packet = {
 		0x02,
-		/*Tag1*/0x04, 0x01, 0x00, 0xFF, 0x79, 0xe9, 0xf6, 0x42,
-		/*Tag2*/0x04, 0x01, 0x00, 0xFF, 0x79, 0xd9, 0xd6, 0x42,
+		/*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));
+	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));
+	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));
+	test_taglist_serialization(taglist, packet, sizeof(packet));
 	deleteTagPtrListEntries(&taglist);
 }
 
@@ -380,14 +513,30 @@
 {
 	uint8_t packet = {
 		0x01,
-		/*Tag1*/0x01,
-		0x01, 0x00, 0xFF,
-		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-		0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+		/*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));
+	ReadTagPtrList(taglist, packet, sizeof(packet));
 	TagPtrList::iterator it = taglist.begin();
 
 	CMD4Hash hash;
@@ -396,16 +545,16 @@
 	CheckTagData(*it++, TAG_SOURCETYPE, valid_tag_value(hash));
 
 	ASSERT_TRUE(it == taglist.end());
-	test_taglist_serialization(taglist, packet, sizeof (packet));
+	test_taglist_serialization(taglist, packet, sizeof(packet));
 	deleteTagPtrListEntries(&taglist);
 }
 
-template<class T, class V>
-void check_single_kad_tag(uint8_t* packet, size_t packet_len, T tagName, V tagValue)
+template <class T, class V>
+void check_single_kad_tag(uint8_t *packet, size_t packet_len, T tagName, V tagValue)
 {
 	CMemFile buf(packet, packet_len);
 	CONTEXT("Starting buffer: " + toString(buf));
-	CTag* tag = buf.ReadTag(true);
+	CTag *tag = buf.ReadTag(true);
 
 	CheckTagData(tag, tagName, valid_tag_value(tagValue));
 	{
@@ -434,67 +583,156 @@
 TEST_M(CTag, KadBsob, "Kad: Read/Write BSOB")
 {
 	uint8_t packet = {
-		/*Tag1*/ 0x0A, 0x01, 0x00, 0x02, 0x04, 0x01, 0x02, 0x03, 0x04,
+		/*Tag1*/ 0x0A,
+		0x01,
+		0x00,
+		0x02,
+		0x04,
+		0x01,
+		0x02,
+		0x03,
+		0x04,
 	};
-	uint8_t raw_data = {0x01, 0x02, 0x03, 0x04};
+	uint8_t raw_data = { 0x01, 0x02, 0x03, 0x04 };
 	{
 		CONTEXT("Create BSOBValue");
-		BSOBValue bsob(sizeof (raw_data), raw_data);
+		BSOBValue bsob(sizeof(raw_data), raw_data);
 
 		CONTEXT("check_single_kad_tag BSOBValue");
-		check_single_kad_tag(packet, sizeof (packet), TAG_FILESIZE, bsob);
+		check_single_kad_tag(packet, sizeof(packet), TAG_FILESIZE, bsob);
 	}
 }
 
 TEST_M(CTag, KadInt64, "Kad: Read/Write integer 64bit")
 {
 	uint8_t packet = {
-		/*Tag1*/ 0x0b, 0x01, 0x00, 0x02, 0x10, 0x11, 0x12, 0x13, 0x20, 0x21, 0x22, 0x23, // 64 bit int
+		/*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);
+	check_single_kad_tag(packet, sizeof(packet), TAG_FILESIZE, 0x2322212013121110LL);
 }
 
 TEST_M(CTag, KadInt32, "Kad: Read/Write integer 32bit")
 {
 	uint8_t packet = {
-		/*Tag1*/ 0x03, 0x01, 0x00, 0x02, 0x12, 0x34, 0x56, 0x78, // 32 bit int
+		/*Tag1*/ 0x03,
+		0x01,
+		0x00,
+		0x02,
+		0x12,
+		0x34,
+		0x56,
+		0x78, // 32 bit int
 	};
-	check_single_kad_tag(packet, sizeof (packet), TAG_FILESIZE, 0x78563412);
+	check_single_kad_tag(packet, sizeof(packet), TAG_FILESIZE, 0x78563412);
 }
 
 TEST_M(CTag, KadInt16, "Kad: Read/Write integer 16bit")
 {
 	uint8_t packet = {
-		/*Tag1*/ 0x08, 0x01, 0x00, 0x02, 0x12, 0x34, // 16 bit int
+		/*Tag1*/ 0x08,
+		0x01,
+		0x00,
+		0x02,
+		0x12,
+		0x34, // 16 bit int
 	};
-	check_single_kad_tag(packet, sizeof (packet), TAG_FILESIZE, 0x3412);
+	check_single_kad_tag(packet, sizeof(packet), TAG_FILESIZE, 0x3412);
 }
 
 TEST_M(CTag, KadInt8, "Kad: Read/Write integer  8bit")
 {
 	uint8_t packet = {
-		/*Tag1*/ 0x09, 0x01, 0x00, 0x02, 0x12, //  8 bit int
+		/*Tag1*/ 0x09,
+		0x01,
+		0x00,
+		0x02,
+		0x12, //  8 bit int
 	};
-	check_single_kad_tag(packet, sizeof (packet), TAG_FILESIZE, 0x12);
+	check_single_kad_tag(packet, sizeof(packet), TAG_FILESIZE, 0x12);
 }
 
 TEST_M(CTag, ReadIntegers, "Kad: Read/Write multiple integers")
 {
 	uint8_t 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
+		/*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));
+	ReadTagPtrList(taglist, packet, sizeof(packet));
 	TagPtrList::iterator it = taglist.begin();
 
 	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(0x78563412));
@@ -508,11 +746,10 @@
 	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(0x2322212013121110LL));
 
 	ASSERT_TRUE(it == taglist.end());
-	test_taglist_serialization(taglist, packet, sizeof (packet));
+	test_taglist_serialization(taglist, packet, sizeof(packet));
 	deleteTagPtrListEntries(&taglist);
 }
 
-
 #include <map>
 
 typedef std::map<wxString, wxString> TagNamesByString;
@@ -579,7 +816,7 @@
 		wxCharBuffer b = wxConvISO8859_1.cWC2MB(it_name->first.c_str());
 
 		buf.WriteUInt8(((const char *)b)0); // Write string first char
-		buf.WriteUInt8(counter++); // write tag value
+		buf.WriteUInt8(counter++);            // write tag value
 	}
 
 	TagPtrList taglist;
@@ -649,7 +886,6 @@
 	tagNamesFT_MEDIA_CODEC = "FT_MEDIA_CODEC";
 	tagNamesFT_FILERATING = "FT_FILERATING";
 
-
 	CMemFile buf;
 
 	uint64 counter = 0;
@@ -667,9 +903,9 @@
 	counter = 0;
 	for (TagNamesByInt::iterator it_name = tagNames.begin(); it_name != tagNames.end(); ++it_name) {
 		CONTEXT(wxString::Format("Reading tag#%" wxLongLongFmtSpec "u", counter));
-		CTag* newtag = new CTag(buf, true);
+		CTag *newtag = new CTag(buf, true);
 		CheckTagName(it_name->first, newtag);
-		CheckTagValue( valid_tag_value( counter ), newtag);
+		CheckTagValue(valid_tag_value(counter), newtag);
 		delete newtag;
 		counter++;
 	}
@@ -678,39 +914,58 @@
 TEST_M(CTag, Ed2kBlob1, "Ed2k: Read/Write BLOB - numeric tagname")
 {
 	uint8_t packet = {
-		/*Tag1*/ 0x87, 0xFF, 0x04, 0x00, 0x00, 0x00,
-		0x01, 0x02, 0x03, 0x04,
+		/*Tag1*/ 0x87,
+		0xFF,
+		0x04,
+		0x00,
+		0x00,
+		0x00,
+		0x01,
+		0x02,
+		0x03,
+		0x04,
 	};
 
-	CMemFile buf(packet, sizeof (packet));
+	CMemFile buf(packet, sizeof(packet));
 	buf.Seek(0, wxFromStart);
-	uint8_t raw_data = {0x01, 0x02, 0x03, 0x04};
+	uint8_t raw_data = { 0x01, 0x02, 0x03, 0x04 };
 	{
 		CONTEXT("Create BLOBValue");
-		BLOBValue blob(sizeof (raw_data), raw_data);
+		BLOBValue blob(sizeof(raw_data), raw_data);
 
 		CTag tag(buf, true);
 		CheckTagName(0xFF, &tag);
-		CheckTagValue( valid_tag_value( blob ), &tag);
+		CheckTagValue(valid_tag_value(blob), &tag);
 	}
 }
 
 TEST_M(CTag, Ed2kBlob2, "Ed2k: Read/Write BLOB - string tagname")
 {
 	uint8_t packet = {
-		/*Tag1*/ 0x07, 0x02, 0x00, 'A', 'A', 0x04, 0x00, 0x00, 0x00,
-		0x01, 0x02, 0x03, 0x04,
+		/*Tag1*/ 0x07,
+		0x02,
+		0x00,
+		'A',
+		'A',
+		0x04,
+		0x00,
+		0x00,
+		0x00,
+		0x01,
+		0x02,
+		0x03,
+		0x04,
 	};
 
-	CMemFile buf(packet, sizeof (packet));
+	CMemFile buf(packet, sizeof(packet));
 	buf.Seek(0, wxFromStart);
-	uint8_t raw_data = {0x01, 0x02, 0x03, 0x04};
+	uint8_t raw_data = { 0x01, 0x02, 0x03, 0x04 };
 	{
 		CONTEXT("Create BLOBValue");
-		BLOBValue blob(sizeof (raw_data), raw_data);
+		BLOBValue blob(sizeof(raw_data), raw_data);
 
 		CTag tag(buf, true);
 		CheckTagName("AA", &tag);
-		CheckTagValue( valid_tag_value( blob ), &tag);
+		CheckTagValue(valid_tag_value(blob), &tag);
 	}
 }

amule-3.0.1.tar.gz/unittests/tests/CUInt128Test.cpp -> amule-3.1.0.tar.gz/unittests/tests/CUInt128Test.cpp Changed

@@ -29,36 +29,48 @@
 using namespace muleunit;
 using Kademlia::CUInt128;
 
-namespace muleunit {
-	// Needed for ASSERT_EQUALS with CUInt128
-	template<> wxString StringFrom<CUInt128>(const CUInt128& value) {
-		return value.ToHexString();
-	}
+namespace muleunit
+{
+// Needed for ASSERT_EQUALS with CUInt128
+template <> wxString StringFrom<CUInt128>(const CUInt128 &value)
+{
+	return value.ToHexString();
+}
 
-	typedef uint8_t ByteArray16;
-	// Needed for ASSERT_EQUALS with uint8_t16
-	template<> wxString StringFrom<ByteArray>(const ByteArray& value) {
-		wxString retval;
-		for (int i = 0; i < 16; i++) {
-			if (i) {
-				retval.Append(wxString::Format(" %02X", valuei));
-			} else {
-				retval.Append(wxString::Format("%02X", valuei));
-			}
+typedef uint8_t ByteArray16;
+// Needed for ASSERT_EQUALS with uint8_t16
+template <> wxString StringFrom<ByteArray>(const ByteArray &value)
+{
+	wxString retval;
+	for (int i = 0; i < 16; i++) {
+		if (i) {
+			retval.Append(wxString::Format(" %02X", valuei));
+		} else {
+			retval.Append(wxString::Format("%02X", valuei));
 		}
-		return retval;
 	}
+	return retval;
 }
+} // namespace muleunit
 
 // Put static test data into a namespace to avoid possible clash with muleunit namespace
-namespace TestData {
-	static uint8_t sequence16 = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf };
-	static uint8_t zero16 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-	static uint8_t one16 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
-	static uint8_t minusOne16 = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-	static uint8_t uintValue16 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x12, 0x34, 0x56, 0x78 };
-	static uint8_t randomValue16 = { 0xef, 0xac, 0xd6, 0x21, 0x99, 0x1b, 0x05, 0xbe, 0xfb, 0x97, 0xdf, 0xdd, 0xab, 0x4b, 0x88, 0xe3 };
-}
+// clang-format off
+namespace TestData
+{
+static uint8_t sequence16 = {
+	0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf
+};
+static uint8_t zero16 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+static uint8_t one16 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
+static uint8_t minusOne16 = {
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
+static uint8_t uintValue16 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x12, 0x34, 0x56, 0x78 };
+static uint8_t randomValue16 = {
+	0xef, 0xac, 0xd6, 0x21, 0x99, 0x1b, 0x05, 0xbe, 0xfb, 0x97, 0xdf, 0xdd, 0xab, 0x4b, 0x88, 0xe3
+};
+} // namespace TestData
+// clang-format on
 
 DECLARE_SIMPLE(CUInt128);
 
@@ -70,23 +82,16 @@
 
 	CUInt128 test((uint8_t *)&TestData::sequence);
 	test.ToByteArray((uint8_t *)&result);
-	ASSERT_TRUE_M(TestData::sequence0 == result0 &&
-		      TestData::sequence1 == result1 &&
-		      TestData::sequence2 == result2 &&
-		      TestData::sequence3 == result3 &&
-		      TestData::sequence4 == result4 &&
-		      TestData::sequence5 == result5 &&
-		      TestData::sequence6 == result6 &&
-		      TestData::sequence7 == result7 &&
-		      TestData::sequence8 == result8 &&
-		      TestData::sequence9 == result9 &&
-		      TestData::sequence10 == result10 &&
-		      TestData::sequence11 == result11 &&
-		      TestData::sequence12 == result12 &&
-		      TestData::sequence13 == result13 &&
-		      TestData::sequence14 == result14 &&
-		      TestData::sequence15 == result15,
-		      wxString("Expected '") + StringFrom(TestData::sequence) + "' but got '" + StringFrom(result) + "'");
+	ASSERT_TRUE_M(TestData::sequence0 == result0 && TestData::sequence1 == result1 &&
+			      TestData::sequence2 == result2 && TestData::sequence3 == result3 &&
+			      TestData::sequence4 == result4 && TestData::sequence5 == result5 &&
+			      TestData::sequence6 == result6 && TestData::sequence7 == result7 &&
+			      TestData::sequence8 == result8 && TestData::sequence9 == result9 &&
+			      TestData::sequence10 == result10 && TestData::sequence11 == result11 &&
+			      TestData::sequence12 == result12 && TestData::sequence13 == result13 &&
+			      TestData::sequence14 == result14 && TestData::sequence15 == result15,
+		wxString("Expected '") + StringFrom(TestData::sequence) + "' but got '" + StringFrom(result) +
+			"'");
 }
 
 TEST(CUInt128, ToHexString)
@@ -98,8 +103,12 @@
 TEST(CUInt128, ToBinaryString)
 {
 	CUInt128 test((uint8_t *)&TestData::sequence);
-	ASSERT_EQUALS("00000000000000010000001000000011000001000000010100000110000001110000100000001001000010100000101100001100000011010000111000001111", test.ToBinaryString());
-	ASSERT_EQUALS("10000001000000011000001000000010100000110000001110000100000001001000010100000101100001100000011010000111000001111", test.ToBinaryString(true));
+	ASSERT_EQUALS("00000000000000010000001000000011000001000000010100000110000001110000100000001001000010"
+		      "100000101100001100000011010000111000001111",
+		test.ToBinaryString());
+	ASSERT_EQUALS("10000001000000011000001000000010100000110000001110000100000001001000010100000101100001"
+		      "100000011010000111000001111",
+		test.ToBinaryString(true));
 	CUInt128 testZero((uint8_t *)&TestData::zero);
 	ASSERT_EQUALS("0", testZero.ToBinaryString(true));
 }
@@ -242,9 +251,8 @@
 TEST_M(CUInt128, AssignUint32, "operator=(uint32_t)")
 {
 	CUInt128 a((uint8_t *)&TestData::uintValue);
-	// Note that CUInt128 b = 0x12345678u; won't work,
-	// the compiler only allows assignment between the
-	// same types when constructing the object.
+	// Note that CUInt128 b = 0x12345678u; will not work: the compiler only allows assignment
+	// between the same types when constructing the object.
 	CUInt128 b;
 	b = 0x12345678u;
 
@@ -320,11 +328,13 @@
 
 TEST_M(CUInt128, OperatorAddAssignCUInt128, "operator+=(const CUInt128&)")
 {
+	// clang-format off
 	uint8_t d016 = { 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
 	uint8_t r116 = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xd, 0x30, 0x53, 0x76 };
 	uint8_t r216 = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xc, 0xc, 0x30, 0x53, 0x76 };
 	uint8_t r316 = { 0xfc, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xc, 0xc, 0x30, 0x53, 0x76 };
 	uint8_t r416 = { 0xf8, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xc, 0xc, 0x30, 0x53, 0x76 };
+	// clang-format on
 	CUInt128 a((uint8_t *)&TestData::sequence);
 	CUInt128 d((uint8_t *)&d0);
 
@@ -344,8 +354,10 @@
 
 TEST_M(CUInt128, OperatorAddAssignUint32, "operator+=(uint32_t)")
 {
+	// clang-format off
 	uint8_t r116 = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xd, 0x30, 0x53, 0x76 };
 	uint8_t r216 = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xc, 0xc, 0x30, 0x53, 0x76 };
+	// clang-format on
 	CUInt128 a((uint8_t *)&TestData::sequence);
 
 	a += 0x01234567u;
@@ -359,11 +371,13 @@
 
 TEST_M(CUInt128, OperatorSubtractAssignCUInt128, "operator-=(const CUInt128&)")
 {
+	// clang-format off
 	uint8_t d016 = { 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
 	uint8_t r116 = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xd, 0x30, 0x53, 0x76 };
 	uint8_t r216 = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xc, 0xc, 0x30, 0x53, 0x76 };
 	uint8_t r316 = { 0xfc, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xc, 0xc, 0x30, 0x53, 0x76 };
 	uint8_t r416 = { 0xf8, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xc, 0xc, 0x30, 0x53, 0x76 };
+	// clang-format on
 	CUInt128 a((uint8_t *)&r4);
 	CUInt128 d((uint8_t *)&d0);
 
@@ -383,8 +397,10 @@
 
 TEST_M(CUInt128, OperatorSubtractAssignUint32, "operator-=(uint32_t)")
 {
+	// clang-format off
 	uint8_t r116 = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xd, 0x30, 0x53, 0x76 };
 	uint8_t r216 = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xc, 0xc, 0x30, 0x53, 0x76 };
+	// clang-format on
 	CUInt128 a((uint8_t *)&r2);
 
 	a -= 0xff000000u;
@@ -398,8 +414,12 @@
 
 TEST_M(CUInt128, OperatorXorAssignCUInt128, "operator^=(const CUInt128&)")
 {
-	uint8_t xd16 = { 0xff, 0x00, 0xee, 0x11, 0xdd, 0x22, 0xcc, 0x33, 0xbb, 0x44, 0xaa, 0x55, 0x99, 0x66, 0x88, 0x77 };
-	uint8_t xr16 = { 0xff, 0x01, 0xec, 0x12, 0xd9, 0x27, 0xca, 0x34, 0xb3, 0x4d, 0xa0, 0x5e, 0x95, 0x6b, 0x86, 0x78 };
+	uint8_t xd16 = {
+		0xff, 0x00, 0xee, 0x11, 0xdd, 0x22, 0xcc, 0x33, 0xbb, 0x44, 0xaa, 0x55, 0x99, 0x66, 0x88, 0x77
+	};
+	uint8_t xr16 = {
+		0xff, 0x01, 0xec, 0x12, 0xd9, 0x27, 0xca, 0x34, 0xb3, 0x4d, 0xa0, 0x5e, 0x95, 0x6b, 0x86, 0x78
+	};
 	CUInt128 a((uint8_t *)&TestData::sequence);
 	CUInt128 x((uint8_t *)&xd);

amule-3.1.0.tar.gz/unittests/tests/CValueMapTest.cpp Added

@@ -0,0 +1,274 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// CValueMap is the incremental-update filter behind every EC tag that carries a value map: it
+// decides whether a field has changed since the last response to this client, and only then does
+// the tag get built and emitted.
+//
+// Its failure mode is silence. A field wrongly judged unchanged simply stops updating in the GUI --
+// no crash, no log line, nothing a build or a clean daemon run would catch. These tests pin the
+// contract instead.
+
+#include <muleunit/test.h>
+
+#include <ec/cpp/ECSpecialTags.h>
+
+using namespace muleunit;
+
+namespace
+{
+// Children of a throwaway parent: CreateTag appends to whatever it is given,
+// so the child count is the observable "did this get emitted".
+size_t EmittedCount(const CECTag &parent)
+{
+	return parent.GetTagCount();
+}
+} // namespace
+
+DECLARE_SIMPLE(CValueMapTest)
+
+TEST(CValueMapTest, FirstValueIsAlwaysEmitted)
+{
+	CValueMap vm;
+	CECEmptyTag parent(1);
+	vm.CreateTag(100, (uint32)42, &parent);
+	ASSERT_EQUALS((size_t)1, EmittedCount(parent));
+}
+
+TEST(CValueMapTest, UnchangedValueIsSuppressed)
+{
+	CValueMap vm;
+	CECEmptyTag first(1);
+	vm.CreateTag(100, (uint32)42, &first);
+	ASSERT_EQUALS((size_t)1, EmittedCount(first));
+
+	// Same value again: nothing should reach the second parent.
+	CECEmptyTag second(1);
+	vm.CreateTag(100, (uint32)42, &second);
+	ASSERT_EQUALS((size_t)0, EmittedCount(second));
+}
+
+TEST(CValueMapTest, ChangedValueIsEmittedAgain)
+{
+	CValueMap vm;
+	CECEmptyTag first(1);
+	vm.CreateTag(100, (uint32)42, &first);
+
+	CECEmptyTag second(1);
+	vm.CreateTag(100, (uint32)43, &second);
+	ASSERT_EQUALS((size_t)1, EmittedCount(second));
+
+	// And the new value is what is now remembered, not the original.
+	CECEmptyTag third(1);
+	vm.CreateTag(100, (uint32)43, &third);
+	ASSERT_EQUALS((size_t)0, EmittedCount(third));
+}
+
+TEST(CValueMapTest, StringsRoundTripThroughTheirOwnCache)
+{
+	CValueMap vm;
+	CECEmptyTag first(1);
+	vm.CreateTag(100, wxString(wxT("alpha")), &first);
+	ASSERT_EQUALS((size_t)1, EmittedCount(first));
+
+	CECEmptyTag second(1);
+	vm.CreateTag(100, wxString(wxT("alpha")), &second);
+	ASSERT_EQUALS((size_t)0, EmittedCount(second));
+
+	CECEmptyTag third(1);
+	vm.CreateTag(100, wxString(wxT("beta")), &third);
+	ASSERT_EQUALS((size_t)1, EmittedCount(third));
+}
+
+// bool needs its own overload to resolve ambiguity -- without it a bool argument is ambiguous
+// across uint8/16/32/64 and does not compile. It is NOT a wire-format concern: CECTag(name, bool)
+// calls InitInt() exactly as CECTag(name, uint8) does, so folding it into the integer overload
+// would produce an identical tag. Only the caching behaviour is observable here, so that is all
+// this asserts.
+TEST(CValueMapTest, BoolCachesSeparatelyFromItsValue)
+{
+	CValueMap vm;
+	CECEmptyTag first(1);
+	vm.CreateTag(100, true, &first);
+	ASSERT_EQUALS((size_t)1, EmittedCount(first));
+	ASSERT_EQUALS((uint64_t)1, first.GetFirstTagSafe()->GetInt());
+
+	CECEmptyTag second(1);
+	vm.CreateTag(100, true, &second);
+	ASSERT_EQUALS((size_t)0, EmittedCount(second));
+
+	CECEmptyTag third(1);
+	vm.CreateTag(100, false, &third);
+	ASSERT_EQUALS((size_t)1, EmittedCount(third));
+	ASSERT_EQUALS((uint64_t)0, third.GetFirstTagSafe()->GetInt());
+}
+
+// double is a genuine value concern, unlike bool: routed through an integer overload the fractional
+// part is lost, so the round trip is what this asserts rather than the emit counts alone.
+TEST(CValueMapTest, DoubleKeepsItsFractionalPart)
+{
+	CValueMap vm;
+	CECEmptyTag first(1);
+	vm.CreateTag(100, 1.5, &first);
+	ASSERT_EQUALS((size_t)1, EmittedCount(first));
+	ASSERT_EQUALS(1.5, first.GetFirstTagSafe()->GetDoubleData());
+
+	CECEmptyTag second(1);
+	vm.CreateTag(100, 1.5, &second);
+	ASSERT_EQUALS((size_t)0, EmittedCount(second));
+
+	// 1.5 and 2.5 would both truncate to different ints, so also check a pair
+	// that collides under truncation: 1.5 -> 1 and 1.25 -> 1.
+	CECEmptyTag third(1);
+	vm.CreateTag(100, 1.25, &third);
+	ASSERT_EQUALS((size_t)1, EmittedCount(third));
+	ASSERT_EQUALS(1.25, third.GetFirstTagSafe()->GetDoubleData());
+}
+
+// A string literal must not reach the bool overload. `const char*` -> bool is a standard conversion
+// and beats the user-defined one to wxString, so without an explicit pointer overload this would
+// emit a boolean tag here while the plain CECTag path -- which has its own pointer constructors --
+// emitted a string one.
+TEST(CValueMapTest, StringLiteralDoesNotBecomeABool)
+{
+	CValueMap vm;
+	CECEmptyTag parent(1);
+	vm.CreateTag(100, "n/a", &parent);
+	ASSERT_EQUALS((size_t)1, EmittedCount(parent));
+	ASSERT_EQUALS(wxString(wxT("n/a")), parent.GetFirstTagSafe()->GetStringData());
+}
+
+// Distinct tag names never share a slot, even at the same value.
+TEST(CValueMapTest, DifferentTagsAreIndependent)
+{
+	CValueMap vm;
+	CECEmptyTag first(1);
+	vm.CreateTag(100, (uint32)42, &first);
+	vm.CreateTag(101, (uint32)42, &first);
+	ASSERT_EQUALS((size_t)2, EmittedCount(first));
+
+	CECEmptyTag second(1);
+	vm.CreateTag(100, (uint32)42, &second);
+	vm.CreateTag(101, (uint32)99, &second);
+	ASSERT_EQUALS((size_t)1, EmittedCount(second));
+}
+
+// AddDiffTag has two branches -- value map present, and absent for callers not doing an incremental
+// update -- and the design rests on them producing the same tag. The bug this file was written for
+// lived exactly there: a string literal took the bool overload through the map and the const char*
+// constructor without it, so one call site emitted different wire types on an incremental update
+// than on a full request.
+TEST(CValueMapTest, AddDiffTagBranchesAgreeOnLiterals)
+{
+	CValueMap vm;
+	CECEmptyTag viaMap(1);
+	CECEmptyTag viaDirect(1);
+	AddDiffTag(&viaMap, 100, "n/a", &vm);
+	AddDiffTag(&viaDirect, 100, "n/a", nullptr);
+
+	ASSERT_EQUALS((size_t)1, EmittedCount(viaMap));
+	ASSERT_EQUALS((size_t)1, EmittedCount(viaDirect));
+	ASSERT_EQUALS(viaDirect.GetFirstTagSafe()->IsString(), viaMap.GetFirstTagSafe()->IsString());
+	ASSERT_TRUE(viaMap.GetFirstTagSafe()->IsString());
+	ASSERT_EQUALS(
+		viaDirect.GetFirstTagSafe()->GetStringData(), viaMap.GetFirstTagSafe()->GetStringData());
+}
+
+TEST(CValueMapTest, AddDiffTagBranchesAgreeOnStrings)
+{
+	CValueMap vm;
+	CECEmptyTag viaMap(1);
+	CECEmptyTag viaDirect(1);
+	AddDiffTag(&viaMap, 100, wxString(wxT("alpha")), &vm);
+	AddDiffTag(&viaDirect, 100, wxString(wxT("alpha")), nullptr);
+
+	ASSERT_EQUALS(viaDirect.GetFirstTagSafe()->IsString(), viaMap.GetFirstTagSafe()->IsString());
+	ASSERT_EQUALS(
+		viaDirect.GetFirstTagSafe()->GetStringData(), viaMap.GetFirstTagSafe()->GetStringData());
+}
+
+// Without a value map every call emits, incremental filtering being the map's
+// whole job -- so a NULL-map caller must never be silently suppressed.
+TEST(CValueMapTest, AddDiffTagWithoutMapAlwaysEmits)
+{
+	CECEmptyTag parent(1);
+	AddDiffTag(&parent, 100, (uint32)42, nullptr);
+	AddDiffTag(&parent, 100, (uint32)42, nullptr);
+	ASSERT_EQUALS((size_t)2, EmittedCount(parent));
+}
+
+// HasTag: which cache it reads. HasTag gates the media clear emission: a field that is now absent
+// gets an explicit zero / empty frame only when a value was previously SENT for it, because a tag
+// simply not offered reads as UNCHANGED on the remote side.
+//
+// The property worth pinning is not "true after a write" but WHICH cache it reads. The two write
+// forms keep separate caches, and this header's own comment above AddDiffTag warns that mixing them
+// for one tagname means neither sees the other's last value. HasTag reads m_map_tag, the cache
+// AddTag(const CECTag &, CECTag *) writes -- so if a media field were ever routed through
+// AddDiffTag for efficiency, HasTag would silently report false for it and that field's clear would
+// stop being emitted, with nothing failing anywhere.
+
+TEST(CValueMapTest, HasTagIsFalseBeforeAnythingIsSent)
+{
+	CValueMap vm;
+	ASSERT_TRUE(!vm.HasTag(100));
+}
+
+TEST(CValueMapTest, HasTagIsTrueAfterTheCECTagFormWrites)
+{
+	CValueMap vm;
+	CECEmptyTag parent(1);
+	parent.AddTag(CECTag(static_cast<ec_tagname_t>(100), wxT("value")), &vm);
+	ASSERT_TRUE(vm.HasTag(100));
+}
+
+TEST(CValueMapTest, HasTagDoesNotSeeTheTypedCacheWrites)
+{
+	// AddDiffTag writes the TYPED cache, not m_map_tag. HasTag must report false for it -- not
+	// because that is desirable, but because it is the truth about which cache holds the value,
+	// and a caller mixing the two forms for one tagname is the documented bug this exposes
+	// rather than hides.
+	CValueMap vm;
+	CECEmptyTag parent(1);
+	AddDiffTag(&parent, static_cast<ec_tagname_t>(101), wxString(wxT("value")), &vm);
+	ASSERT_TRUE(!vm.HasTag(101));
+}
+
+// The hazard that keeps EC_TAG_CLIENT_UPLOAD_FILE on the old path: one tag name written through two
+// different types keeps two independent caches, so neither sees the other's last value and a
+// transition between them is not suppressed. Documented in the PR; executable here so converting
+// that site later fails.
+TEST(CValueMapTest, OneTagNameAcrossTwoTypesKeepsSeparateCaches)
+{
+	CValueMap vm;
+	CECEmptyTag first(1);
+	vm.CreateTag(100, (uint32)1, &first);
+	ASSERT_EQUALS((size_t)1, EmittedCount(first));
+
+	// Same name, same numeric value, different type: a shared cache would
+	// suppress this. Separate caches must emit it.
+	CECEmptyTag second(1);
+	vm.CreateTag(100, true, &second);
+	ASSERT_EQUALS((size_t)1, EmittedCount(second));
+}

amule-3.1.0.tar.gz/unittests/tests/ChatSessionStoreTest.cpp Added

@@ -0,0 +1,218 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include "ChatSessionStore.h"
+#include "OtherFunctions.h" // GUI_ID
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(ChatSessionStore)
+
+namespace
+{
+// Distinct peers that stay distinct as GUI_IDs, so a test asserting on
+// session count is not accidentally asserting on hash collisions.
+uint64 Peer(uint32 n)
+{
+	return GUI_ID(0xC0000000u + n, 4662);
+}
+} // namespace
+
+TEST(ChatSessionStore, StartsEmpty)
+{
+	CChatSessionStore store;
+	ASSERT_EQUALS(static_cast<size_t>(0), store.SessionCount());
+	ASSERT_EQUALS(static_cast<uint32>(0), store.LastMsgId());
+	ASSERT_TRUE(store.Find(Peer(1)) == nullptr);
+}
+
+TEST(ChatSessionStore, FirstMessageCreatesSessionWithIdOne)
+{
+	// id 0 is the "no cursor yet" sentinel every reader uses, so the first
+	// real message must be 1 or a client starting at 0 would skip it.
+	CChatSessionStore store;
+	const uint32 id = store.AddIncoming(Peer(1), "alice", "hi");
+	ASSERT_EQUALS(static_cast<uint32>(1), id);
+	ASSERT_EQUALS(static_cast<uint32>(1), store.LastMsgId());
+	ASSERT_EQUALS(static_cast<size_t>(1), store.SessionCount());
+
+	const CChatSessionStore::Session *s = store.Find(Peer(1));
+	ASSERT_TRUE(s != nullptr);
+	ASSERT_EQUALS(wxString("alice"), s->name);
+	ASSERT_EQUALS(static_cast<size_t>(1), s->messages.size());
+	ASSERT_EQUALS(wxString("hi"), s->messages0.text);
+	ASSERT_EQUALS(static_cast<uint8>(CChatSessionStore::DIR_IN), s->messages0.direction);
+}
+
+TEST(ChatSessionStore, IdsAreMonotonicAcrossSessions)
+{
+	// The store-wide counter is what makes a single `since_id` cursor safe. Per-session
+	// counters would let a client miss a message that landed in another session while it was
+	// polling this one.
+	CChatSessionStore store;
+	ASSERT_EQUALS(static_cast<uint32>(1), store.AddIncoming(Peer(1), "alice", "a"));
+	ASSERT_EQUALS(static_cast<uint32>(2), store.AddIncoming(Peer(2), "bob", "b"));
+	ASSERT_EQUALS(static_cast<uint32>(3), store.AddOutgoing(Peer(1), "c"));
+	ASSERT_EQUALS(static_cast<uint32>(3), store.LastMsgId());
+	ASSERT_EQUALS(static_cast<uint32>(3), store.Find(Peer(1))->LastMsgId());
+	ASSERT_EQUALS(static_cast<uint32>(2), store.Find(Peer(2))->LastMsgId());
+}
+
+TEST(ChatSessionStore, OutgoingDoesNotEraseAKnownPeerName)
+{
+	// An outbound message carries no name. Letting it overwrite would leave a session we
+	// already had a nick for rendering as a bare ip:port the moment the user replied.
+	CChatSessionStore store;
+	store.AddIncoming(Peer(1), "alice", "hi");
+	store.AddOutgoing(Peer(1), "hello back");
+	ASSERT_EQUALS(wxString("alice"), store.Find(Peer(1))->name);
+}
+
+TEST(ChatSessionStore, LaterNameFillsInAnEmptyOne)
+{
+	// The reverse case: a peer whose nick was unknown on the first message
+	// must pick it up when a later one carries it.
+	CChatSessionStore store;
+	store.AddIncoming(Peer(1), wxEmptyString, "hi");
+	ASSERT_TRUE(store.Find(Peer(1))->name.IsEmpty());
+	store.AddIncoming(Peer(1), "alice", "again");
+	ASSERT_EQUALS(wxString("alice"), store.Find(Peer(1))->name);
+}
+
+TEST(ChatSessionStore, MessageCapEvictsOldestKeepingIdsIntact)
+{
+	// The 201st message drops the 1st; ids are NOT renumbered, because a client holding a
+	// cursor into the evicted range must still advance past it rather than re-reading.
+	CChatSessionStore store;
+	const size_t cap = CChatSessionStore::MAX_MESSAGES_PER_SESSION;
+	for (size_t i = 0; i < cap; ++i) {
+		store.AddIncoming(Peer(1), "alice", wxString::Format("m%zu", i));
+	}
+	const CChatSessionStore::Session *s = store.Find(Peer(1));
+	ASSERT_EQUALS(cap, s->messages.size());
+	ASSERT_EQUALS(wxString("m0"), s->messages.front().text);
+	ASSERT_EQUALS(static_cast<uint32>(1), s->messages.front().id);
+
+	store.AddIncoming(Peer(1), "alice", "overflow");
+	s = store.Find(Peer(1));
+	ASSERT_EQUALS(cap, s->messages.size());
+	ASSERT_EQUALS(wxString("m1"), s->messages.front().text);
+	ASSERT_EQUALS(static_cast<uint32>(2), s->messages.front().id);
+	ASSERT_EQUALS(wxString("overflow"), s->messages.back().text);
+	ASSERT_EQUALS(static_cast<uint32>(cap + 1), s->messages.back().id);
+}
+
+TEST(ChatSessionStore, SessionCapEvictsLeastRecentlyActive)
+{
+	CChatSessionStore store;
+	const size_t cap = CChatSessionStore::MAX_SESSIONS;
+	for (size_t i = 0; i < cap; ++i) {
+		store.AddIncoming(Peer(static_cast<uint32>(i)), "peer", "hi");
+	}
+	ASSERT_EQUALS(cap, store.SessionCount());
+
+	// Peer(0) is the least recently active, so it is the one to go.
+	store.AddIncoming(Peer(9999), "newcomer", "hi");
+	ASSERT_EQUALS(cap, store.SessionCount());
+	ASSERT_TRUE(store.Find(Peer(0)) == nullptr);
+	ASSERT_TRUE(store.Find(Peer(9999)) != nullptr);
+	ASSERT_TRUE(store.Find(Peer(1)) != nullptr);
+}
+
+TEST(ChatSessionStore, ActivityRefreshRescuesASessionFromEviction)
+{
+	// Eviction is by activity, not by creation order: a long-running
+	// conversation must not be dropped just because it started first.
+	CChatSessionStore store;
+	const size_t cap = CChatSessionStore::MAX_SESSIONS;
+	for (size_t i = 0; i < cap; ++i) {
+		store.AddIncoming(Peer(static_cast<uint32>(i)), "peer", "hi");
+	}
+	store.AddOutgoing(Peer(0), "still talking"); // moves Peer(0) to the front
+	store.AddIncoming(Peer(9999), "newcomer", "hi");
+
+	ASSERT_TRUE(store.Find(Peer(0)) != nullptr);
+	ASSERT_TRUE(store.Find(Peer(1)) == nullptr); // now the least recently active
+}
+
+TEST(ChatSessionStore, SessionsAreMostRecentlyActiveFirst)
+{
+	CChatSessionStore store;
+	store.AddIncoming(Peer(1), "alice", "a");
+	store.AddIncoming(Peer(2), "bob", "b");
+	store.AddIncoming(Peer(3), "carol", "c");
+	store.AddOutgoing(Peer(1), "reply to alice");
+
+	std::vector<const CChatSessionStore::Session *> list = store.Sessions();
+	ASSERT_EQUALS(static_cast<size_t>(3), list.size());
+	ASSERT_EQUALS(Peer(1), list0->gui_id);
+	ASSERT_EQUALS(Peer(3), list1->gui_id);
+	ASSERT_EQUALS(Peer(2), list2->gui_id);
+}
+
+TEST(ChatSessionStore, CloseRemovesOnlyThatSession)
+{
+	CChatSessionStore store;
+	store.AddIncoming(Peer(1), "alice", "a");
+	store.AddIncoming(Peer(2), "bob", "b");
+
+	ASSERT_TRUE(store.CloseSession(Peer(1)));
+	ASSERT_TRUE(store.Find(Peer(1)) == nullptr);
+	ASSERT_TRUE(store.Find(Peer(2)) != nullptr);
+	ASSERT_EQUALS(static_cast<size_t>(1), store.SessionCount());
+}
+
+TEST(ChatSessionStore, CloseOfUnknownSessionReportsFailure)
+{
+	// The EC handler answers "no such session" off this return rather than
+	// silently succeeding, so an unknown id must be distinguishable.
+	CChatSessionStore store;
+	ASSERT_TRUE(!store.CloseSession(Peer(1)));
+}
+
+TEST(ChatSessionStore, IdsKeepAdvancingAfterAClose)
+{
+	// Reopening a closed conversation must not reissue ids a client already
+	// holds: the counter is store-wide and never rewinds.
+	CChatSessionStore store;
+	store.AddIncoming(Peer(1), "alice", "a");
+	store.AddIncoming(Peer(1), "alice", "b");
+	store.CloseSession(Peer(1));
+	ASSERT_EQUALS(static_cast<uint32>(3), store.AddIncoming(Peer(1), "alice", "c"));
+	ASSERT_EQUALS(static_cast<size_t>(1), store.Find(Peer(1))->messages.size());
+}
+
+TEST(ChatSessionStore, SessionCarriesTheDecodedIpAndPort)
+{
+	// The REST layer keys conversations on "<ip>:<port>", so the split has
+	// to survive the GUI_ID round trip.
+	CChatSessionStore store;
+	store.AddIncoming(GUI_ID(0x0A000001u, 4662), "alice", "hi");
+	const CChatSessionStore::Session *s = store.Find(GUI_ID(0x0A000001u, 4662));
+	ASSERT_TRUE(s != nullptr);
+	ASSERT_EQUALS(static_cast<uint32>(0x0A000001u), s->ip);
+	ASSERT_EQUALS(static_cast<uint16>(4662), s->port);
+}

amule-3.1.0.tar.gz/unittests/tests/ClientCreditsTest.cpp Added

@@ -0,0 +1,165 @@
+// This file is part of the aMule Project.
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// Licensed under the GNU General Public License, version 2 or later.
+
+#include <muleunit/test.h>
+#include <ClientCredits.h>
+#include <GetTickCount.h>
+
+using namespace muleunit;
+
+// Link-time clock seam: exercise wait ownership without sleeps or application state.
+static uint64 now = 1000;
+uint64 GetTickCount64()
+{
+	return now;
+}
+
+static CreditStruct *SecureRecord()
+{
+	auto *record = new CreditStruct();
+	record->nKeySize = 1;
+	record->abySecureIdent0 = 1;
+	return record;
+}
+
+static CNetworkAddress IPv6(uint8_t suffix)
+{
+	CNetworkAddress::Octets octets{};
+	octets0 = 0x20;
+	octets1 = 0x01;
+	octets15 = suffix;
+	return CNetworkAddress::IPv6FromOctets(octets);
+}
+
+static CNetworkAddress MappedIPv4()
+{
+	CNetworkAddress::Octets octets{};
+	octets10 = octets11 = 0xff;
+	octets12 = 192;
+	octets14 = 2;
+	octets15 = 1;
+	return CNetworkAddress::IPv6FromOctets(octets);
+}
+
+DECLARE_SIMPLE(ClientCredits)
+
+TEST(ClientCredits, VerifiedIdentityDoesNotCollideAcrossIPv6Peers)
+{
+	CClientCredits credits(SecureRecord());
+	credits.Verified(IPv6(1));
+	ASSERT_EQUALS(IS_IDENTIFIED, credits.GetCurrentIdentState(IPv6(1)));
+	ASSERT_EQUALS(IS_IDBADGUY, credits.GetCurrentIdentState(IPv6(2)));
+	ASSERT_EQUALS(IS_IDBADGUY, credits.GetCurrentIdentState(CNetworkAddress::Absent()));
+	ASSERT_EQUALS(IS_IDBADGUY, credits.GetCurrentIdentState(CNetworkAddress::FromIPv4NetworkOrder(0)));
+	credits.AddDownloaded(2000000, IPv6(2), true);
+	credits.AddUploaded(100, IPv6(2), true);
+	ASSERT_EQUALS(uint64(0), credits.GetDownloadedTotal());
+	ASSERT_EQUALS(uint64(0), credits.GetUploadedTotal());
+	credits.AddDownloaded(2000000, IPv6(1), true);
+	ASSERT_EQUALS(uint64(2000000), credits.GetDownloadedTotal());
+	ASSERT_TRUE(credits.GetScoreRatio(IPv6(1), true) > 1.0f);
+	ASSERT_EQUALS(1.0f, credits.GetScoreRatio(IPv6(2), true));
+}
+
+TEST(ClientCredits, MappedAndPlainIPv4ShareIdentityAndWait)
+{
+	const auto plain = CNetworkAddress::FromIPv4NetworkOrder(0x010200c0);
+	CClientCredits credits(SecureRecord());
+	credits.Verified(MappedIPv4());
+	ASSERT_EQUALS(IS_IDENTIFIED, credits.GetCurrentIdentState(plain));
+	credits.Verified(plain);
+	ASSERT_EQUALS(IS_IDENTIFIED, credits.GetCurrentIdentState(MappedIPv4()));
+	credits.SetIdentState(IS_IDNEEDED);
+	now = 1000;
+	credits.SetSecWaitStartTime(MappedIPv4());
+	now = 2000;
+	ASSERT_EQUALS(uint64(999), credits.GetSecureWaitStartTime(plain));
+	credits.SetSecWaitStartTime(plain);
+	now = 3000;
+	ASSERT_EQUALS(uint64(1999), credits.GetSecureWaitStartTime(MappedIPv4()));
+}
+
+TEST(ClientCredits, UnverifiedWaitResetsForDifferentIPv6Endpoint)
+{
+	CClientCredits credits(SecureRecord());
+	now = 1000;
+	credits.SetSecWaitStartTime(IPv6(1));
+	now = 2000;
+	ASSERT_EQUALS(uint64(999), credits.GetSecureWaitStartTime(IPv6(1)));
+	ASSERT_EQUALS(uint64(2000), credits.GetSecureWaitStartTime(IPv6(2)));
+	now = 3000;
+	ASSERT_EQUALS(uint64(2000), credits.GetSecureWaitStartTime(IPv6(2)));
+	// Verification restores the secure wait, not another endpoint's unverified wait.
+	credits.Verified(IPv6(2));
+	ASSERT_EQUALS(uint64(999), credits.GetSecureWaitStartTime(IPv6(2)));
+	ASSERT_EQUALS(uint64(3000), credits.GetSecureWaitStartTime(IPv6(1)));
+}
+
+TEST(ClientCredits, AbsenceCannotBecomeVerified)
+{
+	CClientCredits credits(SecureRecord());
+	ASSERT_FALSE(credits.Verified(CNetworkAddress::Absent()));
+	ASSERT_EQUALS(IS_IDNEEDED, credits.GetIdentState());
+}
+
+TEST(ClientCredits, IPv4CreditsKeepMappedScoreEquivalence)
+{
+	const auto plain = CNetworkAddress::FromIPv4NetworkOrder(0x010200c0);
+	CClientCredits credits(SecureRecord());
+	credits.Verified(plain);
+	credits.AddDownloaded(2000000, plain, true);
+	credits.AddUploaded(1000000, MappedIPv4(), true);
+	ASSERT_EQUALS(uint64(1000000), credits.GetUploadedTotal());
+	ASSERT_EQUALS(credits.GetScoreRatio(plain, true), credits.GetScoreRatio(MappedIPv4(), true));
+}
+
+// The identity gate belongs to scoring, not to the number the lists show (issue #1474). A record
+// with a public key it has not answered for sits in IS_IDNEeded, which used to force every display
+// surface to 1.0 -- including the credit store, where there is no live peer to challenge.
+TEST(ClientCredits, CreditRatioIgnoresTheIdentityGateThatScoringApplies)
+{
+	const auto peer = CNetworkAddress::FromIPv4NetworkOrder(0x010200c0);
+	CClientCredits credits(SecureRecord());
+	// 100 MB down, nothing back: the volume formula's upper region, far from 1.0. Recorded with
+	// cryptoavail false because AddDownloaded applies the same gate and would drop the bytes.
+	credits.AddDownloaded(100000000, peer, false);
+
+	// Unverified secure-ident record + crypto available = the scoring gate fires.
+	ASSERT_EQUALS(1.0f, credits.GetScoreRatio(peer, true));
+	ASSERT_TRUE(credits.GetCreditRatio() > 1.0f);
+	// Without crypto the gate cannot fire, so scoring already agreed with the display value.
+	ASSERT_EQUALS(credits.GetCreditRatio(), credits.GetScoreRatio(peer, false));
+
+	// Once the peer has answered for its key, both agree.
+	credits.Verified(peer);
+	ASSERT_EQUALS(credits.GetCreditRatio(), credits.GetScoreRatio(peer, true));
+}
+
+// The formula itself, at the three edges the column renders. Guards the split: GetCreditRatio has
+// to keep computing what GetScoreRatio used to compute inline.
+TEST(ClientCredits, CreditRatioClampsAtBothEnds)
+{
+	const auto peer = CNetworkAddress::FromIPv4NetworkOrder(0x010200c0);
+
+	// Under 1 MB downloaded there is not enough history to earn a modifier.
+	CClientCredits small(SecureRecord());
+	small.AddDownloaded(999999, peer, false);
+	ASSERT_EQUALS(1.0f, small.GetCreditRatio());
+
+	// Nothing uploaded: the sqrt term is the cap, not the flat 10.
+	CClientCredits leech(SecureRecord());
+	leech.AddDownloaded(10485760, peer, false); // 10 MiB -> sqrt(12) ~ 3.46
+	ASSERT_TRUE(leech.GetCreditRatio() > 3.4f && leech.GetCreditRatio() < 3.5f);
+
+	// Enough volume that both terms clear 10.
+	CClientCredits heavy(SecureRecord());
+	heavy.AddDownloaded(4000000000u, peer, false);
+	ASSERT_EQUALS(10.0f, heavy.GetCreditRatio());
+
+	// Uploaded more than downloaded: the ratio floors at 1.0 rather than going below.
+	CClientCredits seeder(SecureRecord());
+	seeder.AddDownloaded(2000000, peer, false);
+	seeder.AddUploaded(100000000, peer, false);
+	ASSERT_EQUALS(1.0f, seeder.GetCreditRatio());
+}

amule-3.1.0.tar.gz/unittests/tests/ClientVersionStringTest.cpp Added

@@ -0,0 +1,103 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// 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 "ClientVersionString.h"
+
+#include <muleunit/test.h>
+#include <protocol/ed2k/ClientSoftware.h>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(ClientVersionString)
+
+// The reported case: eMule spells its update as a letter, and the history rows
+// rendered it as a digit (amule-org/amule#1127).
+TEST(ClientVersionString, EMuleLettersItsUpdateComponent)
+{
+	ASSERT_EQUALS(wxT("v0.70a"), FormatClientVersion(SO_EMULE, 0, 70, 0));
+	ASSERT_EQUALS(wxT("v0.70b"), FormatClientVersion(SO_EMULE, 0, 70, 1));
+	ASSERT_EQUALS(wxT("v0.49d"), FormatClientVersion(SO_EMULE, 0, 49, 3));
+}
+
+// An unknown software is rendered as eMule, which is what the handshake's
+// default branch did.
+TEST(ClientVersionString, AnUnknownSoftwareFollowsEMule)
+{
+	ASSERT_EQUALS(wxT("v0.60a"), FormatClientVersion(0xfe, 0, 60, 0));
+}
+
+TEST(ClientVersionString, TheMuleFamilyUsesThreeNumbers)
+{
+	ASSERT_EQUALS(wxT("v2.3.3"), FormatClientVersion(SO_AMULE, 2, 3, 3));
+	ASSERT_EQUALS(wxT("v1.9.1"), FormatClientVersion(SO_LXMULE, 1, 9, 1));
+	ASSERT_EQUALS(wxT("v3.1.6"), FormatClientVersion(SO_MLDONKEY, 3, 1, 6));
+	ASSERT_EQUALS(wxT("v0.0.0"), FormatClientVersion(SO_HYDRANODE, 0, 0, 0));
+}
+
+// The hybrid drops a zero update rather than printing it.
+TEST(ClientVersionString, TheHybridOmitsAZeroUpdate)
+{
+	ASSERT_EQUALS(wxT("v1.50"), FormatClientVersion(SO_EDONKEYHYBRID, 1, 50, 0));
+	ASSERT_EQUALS(wxT("v1.50.2"), FormatClientVersion(SO_EDONKEYHYBRID, 1, 50, 2));
+}
+
+// eMule Plus omits zero components, and letters from 'a' meaning 1 -- one off
+// from eMule, where 'a' means 0.
+TEST(ClientVersionString, EMulePlusOmitsZeroComponents)
+{
+	ASSERT_EQUALS(wxT("v1"), FormatClientVersion(SO_EMULEPLUS, 1, 0, 0));
+	ASSERT_EQUALS(wxT("v1.2"), FormatClientVersion(SO_EMULEPLUS, 1, 2, 0));
+	ASSERT_EQUALS(wxT("v1.2a"), FormatClientVersion(SO_EMULEPLUS, 1, 2, 1));
+	ASSERT_EQUALS(wxT("v1.2b"), FormatClientVersion(SO_EMULEPLUS, 1, 2, 2));
+}
+
+TEST(ClientVersionString, LPhantCountsItsMajorOneHigher)
+{
+	// major 1 on the wire is lPhant 0.x, and the minor is padded to two.
+	ASSERT_EQUALS(wxT(" v0.05a"), FormatClientVersion(SO_LPHANT, 1, 5, 0));
+	ASSERT_EQUALS(wxT(" v0.51b"), FormatClientVersion(SO_LPHANT, 1, 51, 1));
+}
+
+// MAKE_CLIENT_VERSION is a decimal composite, not a bitfield. The history rows
+// store that form, so the packed helper has to decompose it the same way.
+TEST(ClientVersionString, ThePackedFormDecomposesDecimally)
+{
+	// 0 * 100000 + 70 * 1000 + 1 * 100 -- eMule 0.70b, the reported row.
+	ASSERT_EQUALS(wxT("v0.70b"), FormatPackedClientVersion(SO_EMULE, 70100));
+	ASSERT_EQUALS(wxT("v0.70a"), FormatPackedClientVersion(SO_EMULE, 70000));
+	// 2 * 100000 + 3 * 1000 + 3 * 100 -- aMule 2.3.3.
+	ASSERT_EQUALS(wxT("v2.3.3"), FormatPackedClientVersion(SO_AMULE, 203300));
+}
+
+// The whole point: one peer must not read differently depending on which path rendered it. The live
+// path decodes the wire into components; the history path decodes the stored composite. Both must
+// land on the same string.
+TEST(ClientVersionString, BothPathsAgreeForTheSamePeer)
+{
+	const uint32 major = 0, minor = 70, update = 1;
+	const uint32 packed = major * 100000 + minor * 1000 + update * 100;
+	ASSERT_EQUALS(FormatClientVersion(SO_EMULE, major, minor, update),
+		FormatPackedClientVersion(SO_EMULE, packed));
+}

amule-3.1.0.tar.gz/unittests/tests/CloneFileTest.cpp Added

amule-3.1.0.tar.gz/unittests/tests/CompleteSourcesThrottleTest.cpp Added

@@ -0,0 +1,86 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// CKnownFile::UpdatePartsInfo() recomputes the complete-sources estimate at most once every 60 s,
+// with one exception: the upload list going empty. That transition cannot be deferred, because
+// every caller is peer-driven and there is no periodic sweep -- a throttled call there is the last
+// one the file ever gets, and the counts keep their values until aMule restarts (issue #1050).
+//
+// The bypass is guarded so a file already settled at 0 does not re-enter the recompute forever.
+// #1052 guarded it on the scalar alone, which was too narrow: Hi is a percentile of the peers'
+// self-reported counts and is only floored at the scalar, never tied to it, so scalar 0 with Hi
+// non-zero is a reachable and in fact ordinary state -- any peer without extended requests v2
+// contributes 0. Since the desktop column and the Web UI detail panel both render "< Hi" whenever
+// Lo is 0, that stale Hi is exactly what the user sees (issue #1065).
+//
+// The predicate lives in its own header precisely so this can be tested: CKnownFile reaches theApp
+// and cannot be linked into a unit test.
+
+#include <muleunit/test.h>
+
+#include <CompleteSourcesThrottle.h>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(CompleteSourcesThrottle)
+
+// The bypass only ever applies when there is nobody left to ask.
+TEST(CompleteSourcesThrottle, PeersStillPresentNeverBypasses)
+{
+	ASSERT_FALSE(CompleteSourcesNeedRecompute(false, 0, 0, 0));
+	ASSERT_FALSE(CompleteSourcesNeedRecompute(false, 5, 5, 5));
+	ASSERT_FALSE(CompleteSourcesNeedRecompute(false, 0, 0, 5));
+}
+
+// Criterion 4: a file settled at zero must short-circuit, or every later call
+// on every idle shared file re-runs the full recompute.
+TEST(CompleteSourcesThrottle, AllZeroStaysSettled)
+{
+	ASSERT_FALSE(CompleteSourcesNeedRecompute(true, 0, 0, 0));
+}
+
+// The case #1052 already handled: a non-zero scalar must still recompute.
+TEST(CompleteSourcesThrottle, NonZeroScalarBypasses)
+{
+	ASSERT_TRUE(CompleteSourcesNeedRecompute(true, 5, 5, 5));
+	ASSERT_TRUE(CompleteSourcesNeedRecompute(true, 1, 0, 0));
+}
+
+// The regression #1065 is about, and the reason the scalar-only guard was wrong. These are the
+// states the estimation actually produces for a mixed peer population, taken from the issue's
+// sweep: two peers, one of them reporting a non-zero count, lands on scalar 0 / Lo 0 / Hi N.
+TEST(CompleteSourcesThrottle, StaleHighAloneStillBypasses)
+{
+	ASSERT_TRUE(CompleteSourcesNeedRecompute(true, 0, 0, 1));
+	ASSERT_TRUE(CompleteSourcesNeedRecompute(true, 0, 0, 5));
+}
+
+// Lo cannot diverge from the scalar in either estimation branch -- n < 20 assigns the scalar from
+// Lo, n >= 20 floors the scalar at Lo -- so this state is not reachable today. Pinned anyway: the
+// guard is written to survive the heuristic changing, and this is the assertion that would notice
+// if it did.
+TEST(CompleteSourcesThrottle, StaleLowAloneStillBypasses)
+{
+	ASSERT_TRUE(CompleteSourcesNeedRecompute(true, 0, 3, 0));
+}

amule-3.1.0.tar.gz/unittests/tests/CredentialsTest.cpp Added

@@ -0,0 +1,442 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include "Credentials.h"
+
+#include <wx/filefn.h>
+#include <wx/filename.h>
+#include <wx/utils.h>
+
+#include <fstream>
+#include <string>
+
+using namespace muleunit;
+using namespace webcommon;
+
+DECLARE_SIMPLE(Credentials)
+
+namespace
+{
+// MD5("secret") and MD5("other") -- the pre-hash the preferences dialog
+// produces before the value ever leaves the client.
+const char *const MD5_SECRET = "5ebe2294ecd0e0f08eab7690d2a6ee69";
+const char *const MD5_OTHER = "795f3202b17cb6bc3d4b771d8c6c9eaf";
+
+// Directory helpers go through wx rather than shelling out: this target is built on the mingw-w64
+// CI legs too, where `mkdir -p` / `rm -rf` are not available.
+std::string TempDir()
+{
+	// Unit tests run from the build tree; a per-process subdirectory keeps
+	// parallel ctest runs from colliding on the same file.
+	const wxString dir = wxString::Format(wxT("credtest-%ld"), static_cast<long>(wxGetProcessId()));
+	wxFileName::Mkdir(dir, 0700, wxPATH_MKDIR_FULL);
+	return std::string(dir.mb_str());
+}
+
+// Removes the one file the tests write plus the directory itself. A
+// general recursive delete is not needed and would be riskier.
+void RemoveTempDir(const std::string &dir)
+{
+	const wxString wxdir(dir.c_str(), wxConvUTF8);
+	wxRemoveFile(wxdir + wxT("/amuleapi-passwords"));
+	wxRemoveFile(wxdir + wxT("/amuleapi-ec-token"));
+	wxRmdir(wxdir);
+}
+} // namespace
+
+TEST(Credentials, HashIsSaltedAndVerifies)
+{
+	const std::string a = HashMd5Hex(MD5_SECRET);
+	const std::string b = HashMd5Hex(MD5_SECRET);
+
+	ASSERT_FALSE(a.empty());
+	// Same input, different record: the salt must be per-record, otherwise
+	// identical passwords are visibly identical in the file.
+	ASSERT_TRUE(a != b);
+	ASSERT_TRUE(VerifyMd5Hex(MD5_SECRET, a));
+	ASSERT_TRUE(VerifyMd5Hex(MD5_SECRET, b));
+}
+
+TEST(Credentials, WrongPasswordFails)
+{
+	const std::string rec = HashMd5Hex(MD5_SECRET);
+	ASSERT_FALSE(VerifyMd5Hex(MD5_OTHER, rec));
+}
+
+TEST(Credentials, CaseInsensitiveDigestInput)
+{
+	// The preferences dialog and the EC path have historically disagreed
+	// about digest case; both must verify against the same record.
+	const std::string rec = HashMd5Hex(MD5_SECRET);
+	std::string upper(MD5_SECRET);
+	for (char &c : upper) {
+		c = static_cast<char>(::toupper(static_cast<unsigned char>(c)));
+	}
+	ASSERT_TRUE(VerifyMd5Hex(upper, rec));
+}
+
+TEST(Credentials, EmptyRecordNeverVerifies)
+{
+	// An unset credential must not be satisfiable by any input - this is
+	// what makes "guest unset" mean "guest disabled".
+	ASSERT_FALSE(VerifyMd5Hex(MD5_SECRET, ""));
+	ASSERT_FALSE(VerifyMd5Hex("", ""));
+}
+
+TEST(Credentials, MalformedRecordNeverVerifies)
+{
+	ASSERT_FALSE(VerifyMd5Hex(MD5_SECRET, "pbkdf2-sha256$"));
+	ASSERT_FALSE(VerifyMd5Hex(MD5_SECRET, "pbkdf2-sha256$0$aabb$ccdd"));
+	ASSERT_FALSE(VerifyMd5Hex(MD5_SECRET, "pbkdf2-sha256$1000$nothex$ccdd"));
+	ASSERT_FALSE(VerifyMd5Hex(MD5_SECRET, "pbkdf2-sha256$1000$aabb$tooshort"));
+	ASSERT_FALSE(VerifyMd5Hex(MD5_SECRET, "scrypt$1$aabb$ccdd"));
+	ASSERT_FALSE(VerifyMd5Hex(MD5_SECRET, "garbage"));
+}
+
+TEST(Credentials, NonMd5InputRejected)
+{
+	const std::string rec = HashMd5Hex(MD5_SECRET);
+	ASSERT_FALSE(VerifyMd5Hex("secret", rec)); // plaintext, not a digest
+	ASSERT_FALSE(VerifyMd5Hex("abc", rec));
+	ASSERT_TRUE(HashMd5Hex("not-a-digest").empty());
+}
+
+// A developer config written before the KDF stores the bare MD5. It must
+// still let its owner in, and must be reported as wanting a rewrite.
+TEST(Credentials, LegacyBareMd5VerifiesAndWantsRehash)
+{
+	bool needs_rehash = false;
+	ASSERT_TRUE(IsLegacyMd5Record(MD5_SECRET));
+	ASSERT_TRUE(VerifyMd5Hex(MD5_SECRET, MD5_SECRET, &needs_rehash));
+	ASSERT_TRUE(needs_rehash);
+
+	needs_rehash = false;
+	ASSERT_FALSE(VerifyMd5Hex(MD5_OTHER, MD5_SECRET, &needs_rehash));
+}
+
+TEST(Credentials, CurrentFormatDoesNotWantRehash)
+{
+	bool needs_rehash = true;
+	ASSERT_TRUE(VerifyMd5Hex(MD5_SECRET, HashMd5Hex(MD5_SECRET), &needs_rehash));
+	ASSERT_FALSE(needs_rehash);
+}
+
+TEST(Credentials, WeakerIterationCountVerifiesButWantsRehash)
+{
+	// Records written at a lower cost must keep working while being
+	// flagged for rewrite, otherwise raising the cost locks users out.
+	const std::string rec = "pbkdf2-sha256$1000$"
+				"000102030405060708090a0b0c0d0e0f$"
+				"0000000000000000000000000000000000000000000000000000000000000000";
+	bool needs_rehash = false;
+	// The digest is wrong, so this only asserts the parser accepts the
+	// shape; the rehash flag is exercised by the round-trip test below.
+	ASSERT_FALSE(VerifyMd5Hex(MD5_SECRET, rec, &needs_rehash));
+}
+
+TEST(Credentials, FileRoundTrip)
+{
+	const std::string dir = TempDir();
+	Credentials in;
+	in.admin = HashMd5Hex(MD5_SECRET);
+	in.guest = HashMd5Hex(MD5_OTHER);
+
+	std::string err;
+	ASSERT_TRUE(SaveCredentialsFile(dir, in, err));
+
+	Credentials out;
+	ASSERT_TRUE(LoadCredentialsFile(dir, out, err));
+	ASSERT_EQUALS(in.admin, out.admin);
+	ASSERT_EQUALS(in.guest, out.guest);
+	ASSERT_TRUE(VerifyMd5Hex(MD5_SECRET, out.admin));
+	ASSERT_TRUE(VerifyMd5Hex(MD5_OTHER, out.guest));
+
+	RemoveTempDir(dir);
+}
+
+// Clearing the guest credential is how the guest role is disabled, so an
+// empty value has to survive a save/load round trip as empty.
+TEST(Credentials, EmptyGuestRoundTripsAsDisabled)
+{
+	const std::string dir = TempDir();
+	Credentials in;
+	in.admin = HashMd5Hex(MD5_SECRET);
+	in.guest = "";
+
+	std::string err;
+	ASSERT_TRUE(SaveCredentialsFile(dir, in, err));
+
+	Credentials out;
+	ASSERT_TRUE(LoadCredentialsFile(dir, out, err));
+	ASSERT_TRUE(out.guest.empty());
+	ASSERT_FALSE(VerifyMd5Hex(MD5_OTHER, out.guest));
+
+	RemoveTempDir(dir);
+}
+
+TEST(Credentials, MissingFileIsFirstRunNotAnError)
+{
+	Credentials out;
+	std::string err;
+	ASSERT_TRUE(LoadCredentialsFile("./credtest-does-not-exist", out, err));
+	ASSERT_TRUE(out.admin.empty());
+	ASSERT_TRUE(out.guest.empty());
+	ASSERT_TRUE(err.empty());
+}
+
+TEST(Credentials, LegacyFileIsReadable)
+{
+	// A file written by a pre-KDF build: bare digests, no PHC prefix.
+	const std::string dir = TempDir();
+	{
+		std::ofstream f((dir + "/amuleapi-passwords").c_str());
+		f << "admin=" << MD5_SECRET << "\n";
+		f << "guest=" << MD5_OTHER << "\n";
+	}
+
+	Credentials out;
+	std::string err;
+	ASSERT_TRUE(LoadCredentialsFile(dir, out, err));
+
+	bool needs_rehash = false;
+	ASSERT_TRUE(VerifyMd5Hex(MD5_SECRET, out.admin, &needs_rehash));
+	ASSERT_TRUE(needs_rehash);
+	ASSERT_TRUE(VerifyMd5Hex(MD5_OTHER, out.guest));
+
+	RemoveTempDir(dir);
+}
+
+TEST(Credentials, CommentsAndBlankLinesIgnored)
+{
+	const std::string dir = TempDir();
+	{
+		std::ofstream f((dir + "/amuleapi-passwords").c_str());
+		f << "# a comment\n\n";
+		f << "  admin = " << MD5_SECRET << "  \n";
+		f << "junk-without-equals\n";
+	}
+
+	Credentials out;
+	std::string err;
+	ASSERT_TRUE(LoadCredentialsFile(dir, out, err));
+	ASSERT_TRUE(VerifyMd5Hex(MD5_SECRET, out.admin));
+	ASSERT_TRUE(out.guest.empty());
+
+	RemoveTempDir(dir);
+}
+
+TEST(Credentials, FilePathJoinsWithAndWithoutSeparator)
+{
+	ASSERT_EQUALS(std::string("/tmp/x/amuleapi-passwords"), CredentialsFilePath("/tmp/x"));
+	ASSERT_EQUALS(std::string("/tmp/x/amuleapi-passwords"), CredentialsFilePath("/tmp/x/"));
+}
+
+// The pending-change rules every entry point shares: aMule's preferences dialog, the same dialog in
+// amulegui over EC, `amuleapi --set-*-pass` and the REST endpoint. Encoded once here so the four
+// cannot disagree.
+TEST(Credentials, ChangeWithEmptyAdminLeavesAdminAlone)
+{
+	const std::string dir = TempDir();
+	std::string err;
+
+	CredentialChange first;
+	first.admin_md5 = MD5_SECRET;
+	first.guest_enabled = false;
+	ASSERT_TRUE(ApplyCredentialChange(dir, first, err));
+
+	// A client changing only the guest role sends no admin digest, because
+	// it cannot read the stored one back.
+	CredentialChange second;
+	second.guest_enabled = true;
+	second.guest_md5 = MD5_OTHER;
+	ASSERT_TRUE(ApplyCredentialChange(dir, second, err));
+
+	Credentials out;
+	ASSERT_TRUE(LoadCredentialsFile(dir, out, err));
+	ASSERT_TRUE(VerifyMd5Hex(MD5_SECRET, out.admin));
+	ASSERT_TRUE(VerifyMd5Hex(MD5_OTHER, out.guest));
+
+	RemoveTempDir(dir);
+}
+
+TEST(Credentials, ChangeWithGuestDisabledClearsGuest)
+{
+	const std::string dir = TempDir();
+	std::string err;
+
+	CredentialChange on;
+	on.admin_md5 = MD5_SECRET;
+	on.guest_enabled = true;
+	on.guest_md5 = MD5_OTHER;
+	ASSERT_TRUE(ApplyCredentialChange(dir, on, err));
+
+	CredentialChange off;
+	off.guest_enabled = false;
+	ASSERT_TRUE(ApplyCredentialChange(dir, off, err));
+
+	Credentials out;
+	ASSERT_TRUE(LoadCredentialsFile(dir, out, err));
+	ASSERT_TRUE(out.guest.empty());
+	// Turning guest off must never take admin down with it, or the
+	// operator locks themselves out of a non-loopback deployment.
+	ASSERT_TRUE(VerifyMd5Hex(MD5_SECRET, out.admin));
+
+	RemoveTempDir(dir);
+}
+
+TEST(Credentials, ChangeWithGuestEnabledAndNoDigestKeepsGuestPassword)
+{
+	const std::string dir = TempDir();
+	std::string err;
+
+	CredentialChange on;
+	on.guest_enabled = true;
+	on.guest_md5 = MD5_OTHER;
+	ASSERT_TRUE(ApplyCredentialChange(dir, on, err));
+
+	// "Guest stays on, I did not retype the password."
+	CredentialChange unchanged;
+	unchanged.guest_enabled = true;
+	ASSERT_TRUE(ApplyCredentialChange(dir, unchanged, err));
+
+	Credentials out;
+	ASSERT_TRUE(LoadCredentialsFile(dir, out, err));
+	ASSERT_TRUE(VerifyMd5Hex(MD5_OTHER, out.guest));
+
+	RemoveTempDir(dir);
+}
+
+TEST(Credentials, ChangeRejectsMalformedDigests)
+{
+	const std::string dir = TempDir();
+	std::string err;
+
+	CredentialChange bad_admin;
+	bad_admin.admin_md5 = "nonsense";
+	ASSERT_FALSE(ApplyCredentialChange(dir, bad_admin, err));
+	ASSERT_FALSE(err.empty());
+
+	CredentialChange bad_guest;
+	bad_guest.guest_enabled = true;
+	bad_guest.guest_md5 = "nonsense";
+	ASSERT_FALSE(ApplyCredentialChange(dir, bad_guest, err));
+
+	Credentials out;
+	ASSERT_TRUE(LoadCredentialsFile(dir, out, err));
+	ASSERT_TRUE(out.admin.empty());
+	ASSERT_TRUE(out.guest.empty());
+
+	RemoveTempDir(dir);
+}
+
+// Ephemeral EC token. The token is how amuled hands a spawned amuleapi a credential without either
+// process putting the password-equivalent value from amule.conf on disk or on a command line. Both
+// ends derive the filename from EcTokenFilePath, so these pin the joining rules the same way the
+// amuleapi-passwords test above does -- a drift between the two binaries would not fail loudly, it
+// would just mean the child never finds the file and quietly falls back to its configured password.
+
+TEST(Credentials, EcTokenFilePathJoinsLikeCredentialsPath)
+{
+	ASSERT_EQUALS(std::string("amuleapi-ec-token"), EcTokenFilePath(""));
+	ASSERT_EQUALS(std::string("/tmp/x/amuleapi-ec-token"), EcTokenFilePath("/tmp/x"));
+	ASSERT_EQUALS(std::string("/tmp/x/amuleapi-ec-token"), EcTokenFilePath("/tmp/x/"));
+	// Distinct from the credential store: one is ephemeral, the other is
+	// the persistent password file.
+	ASSERT_TRUE(EcTokenFilePath("/tmp/x") != CredentialsFilePath("/tmp/x"));
+}
+
+TEST(Credentials, GeneratedTokenHasTheMd5HexShape)
+{
+	const std::string a = GenerateEcToken();
+	// 32 lowercase hex chars: the width EC's challenge-response already
+	// consumes, which is what lets the token drop in with no wire change.
+	ASSERT_EQUALS(std::size_t(32), a.size());
+	for (const char c : a) {
+		ASSERT_TRUE((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f'));
+	}
+	// Fresh every call -- a token reused across daemon runs would defeat
+	// the point of it dying with the process.
+	ASSERT_TRUE(a != GenerateEcToken());
+}
+
+TEST(Credentials, ReadAndConsumeEcTokenReturnsItAndDeletesTheFile)
+{
+	const std::string dir = TempDir();
+	const std::string path = EcTokenFilePath(dir);
+	const std::string token = GenerateEcToken();
+
+	std::ofstream(path.c_str(), std::ios::binary) << token << "\n";
+
+	std::string got;
+	ASSERT_TRUE(ReadAndConsumeEcToken(path, got));
+	ASSERT_EQUALS(token, got);
+	// Consumed: the secret stops being at rest the moment it is in memory.
+	ASSERT_TRUE(!wxFileExists(wxString(path.c_str(), wxConvUTF8)));
+
+	// A second read finds nothing, which is the ordinary case for a
+	// manually started amuleapi.
+	std::string again;
+	ASSERT_TRUE(!ReadAndConsumeEcToken(path, again));
+
+	RemoveTempDir(dir);
+}
+
+TEST(Credentials, ReadAndConsumeEcTokenRejectsMalformedButStillDeletes)
+{
+	const std::string dir = TempDir();
+	const std::string path = EcTokenFilePath(dir);
+
+	// Truncated, non-hex and empty must all be refused rather than attempted as a credential;
+	// the file goes either way, because a file that failed to parse is still not something to
+	// leave behind.
+	const char *const bad = {
+		"deadbeef", "", "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz", "5ebe2294ecd0e0f08eab7690d2a6ee69extra"
+	};
+	for (const char *body : bad) {
+		std::ofstream(path.c_str(), std::ios::binary) << body;
+		std::string got("untouched");
+		ASSERT_TRUE(!ReadAndConsumeEcToken(path, got));
+		ASSERT_EQUALS(std::string("untouched"), got);
+		ASSERT_TRUE(!wxFileExists(wxString(path.c_str(), wxConvUTF8)));
+	}
+
+	RemoveTempDir(dir);
+}
+
+TEST(Credentials, ReadAndConsumeEcTokenIgnoresSurroundingWhitespace)
+{
+	const std::string dir = TempDir();
+	const std::string path = EcTokenFilePath(dir);
+	const std::string token = GenerateEcToken();
+
+	std::ofstream(path.c_str(), std::ios::binary) << "  " << token << "\r\n";
+
+	std::string got;
+	ASSERT_TRUE(ReadAndConsumeEcToken(path, got));
+	ASSERT_EQUALS(token, got);
+
+	RemoveTempDir(dir);
+}

amule-3.1.0.tar.gz/unittests/tests/ECClientCapabilitiesTest.cpp Added

@@ -0,0 +1,140 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// EC_TAG_CLIENT_MOD_CAPABILITIES is the only way to observe a peer's negotiated vendor capabilities
+// without a display: the Client Details dialog exists in `amule` and `amulegui`, and neither starts
+// without an X server. So this tag is what makes that display verifiable, and its encoding is
+// pinned here rather than left to a GUI nobody can open in CI.
+//
+// CEC_UpDownClient_Tag's only constructor takes a live CUpDownClient, which reaches theApp and
+// cannot be linked into a unit test. Its accessor is a one-line call to CECTag::AssignIfExist,
+// which is public, so the tag tree is built directly here and read through exactly the call the
+// accessor makes. What that leaves untested is the one line of forwarding, not the encoding.
+
+#include <muleunit/test.h>
+
+#include <ec/cpp/ECTag.h>
+#include <ECCodes.h>
+#include <ECTagTypes.h>
+
+#include <PeerCapabilities.h>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(ECClientCapabilities)
+
+// The tag code is wire format. A literal, not a restatement of the generated
+// header it checks.
+TEST(ECClientCapabilities, TagCodeIsExact)
+{
+	ASSERT_EQUALS(0x0633, (int)EC_TAG_CLIENT_MOD_CAPABILITIES);
+}
+
+// The core emits CPeerCapabilities::KnownBits() and an EC client reads it back with AssignIfExist.
+// Nothing in between may alter the value.
+//
+// Deliberately no assertion on the tag's *type*: libec narrows an integer tag to the smallest width
+// that holds it, so a word of 0x14 travels as a uint8 and GetInt() widens it back. Pinning the type
+// here would pin that narrowing rather than the protocol, and would break the first time a
+// capability bit above 8 is defined.
+TEST(ECClientCapabilities, WordSurvivesTheRoundTrip)
+{
+	for (uint32_t bits = 0; bits <= MOD_MISCOPT_KNOWN_MASK; ++bits) {
+		CPeerCapabilities caps;
+		caps.SetFromWire(bits);
+
+		CECTag client(EC_TAG_CLIENT, (uint32_t)1);
+		client.AddTag(CECTag(EC_TAG_CLIENT_MOD_CAPABILITIES, caps.KnownBits()));
+
+		uint32_t received = 0xDEADBEEF;
+		ASSERT_TRUE(client.AssignIfExist(EC_TAG_CLIENT_MOD_CAPABILITIES, received));
+		ASSERT_EQUALS(bits, received);
+
+		// And it decodes on the far side to the same capability set.
+		CPeerCapabilities mirrored;
+		mirrored.SetFromWire(received);
+		ASSERT_EQUALS(caps.KnownBits(), mirrored.KnownBits());
+	}
+}
+
+// The spec delta requires reserved bits to be masked off and no capability inferred from them. That
+// masking happens in the core, before the tag is built, so a reserved bit a peer set must not reach
+// an EC client at all -- an EC client is then free to be ignorant of which bits are defined.
+TEST(ECClientCapabilities, ReservedBitsNeverCrossTheProtocol)
+{
+	CPeerCapabilities caps;
+	caps.SetFromWire(0xFFFFFFFFu);
+
+	CECTag client(EC_TAG_CLIENT, (uint32_t)1);
+	client.AddTag(CECTag(EC_TAG_CLIENT_MOD_CAPABILITIES, caps.KnownBits()));
+
+	uint32_t received = 0;
+	ASSERT_TRUE(client.AssignIfExist(EC_TAG_CLIENT_MOD_CAPABILITIES, received));
+	ASSERT_EQUALS(MOD_MISCOPT_KNOWN_MASK, received);
+	ASSERT_EQUALS(0x00000000u, received & ~MOD_MISCOPT_KNOWN_MASK);
+}
+
+// Additive tag, so there are three states and not two: a peer that advertised nothing (word 0, tag
+// present) and a daemon too old to send the tag at all must not read the same. The reference form
+// of the accessor returns a bool precisely so a client can tell them apart; a caller using the
+// value-returning overload would collapse both to 0.
+TEST(ECClientCapabilities, AbsentTagIsDistinctFromAnEmptyWord)
+{
+	// Old daemon: no tag.
+	CECTag oldDaemon(EC_TAG_CLIENT, (uint32_t)1);
+	uint32_t target = 0xABCDEF01;
+	ASSERT_FALSE(oldDaemon.AssignIfExist(EC_TAG_CLIENT_MOD_CAPABILITIES, target));
+	// Untouched, so the caller's own default survives.
+	ASSERT_EQUALS(0xABCDEF01u, target);
+
+	// Current daemon, peer advertised nothing.
+	CECTag noCapabilities(EC_TAG_CLIENT, (uint32_t)1);
+	noCapabilities.AddTag(CECTag(EC_TAG_CLIENT_MOD_CAPABILITIES, (uint32_t)0));
+	target = 0xABCDEF01;
+	ASSERT_TRUE(noCapabilities.AssignIfExist(EC_TAG_CLIENT_MOD_CAPABILITIES, target));
+	ASSERT_EQUALS(0x00000000u, target);
+}
+
+// The dialog and the EC tag must not drift, so both read the same word through the same class. This
+// pins the pairing: the text an EC client would render from the received word is the text the GUI
+// renders from the live client.
+TEST(ECClientCapabilities, DisplayTextMatchesOnBothSidesOfTheProtocol)
+{
+	CPeerCapabilities core;
+	core.SetFromWire(MOD_MISCOPT_IPV6 | MOD_MISCOPT_NAT_TRAVERSAL_QUIC);
+
+	CECTag client(EC_TAG_CLIENT, (uint32_t)1);
+	client.AddTag(CECTag(EC_TAG_CLIENT_MOD_CAPABILITIES, core.KnownBits()));
+
+	uint32_t received = 0;
+	ASSERT_TRUE(client.AssignIfExist(EC_TAG_CLIENT_MOD_CAPABILITIES, received));
+
+	CPeerCapabilities remote;
+	remote.SetFromWire(received);
+
+	ASSERT_EQUALS(core.GetDisplayText(), remote.GetDisplayText());
+	// The names are translated, so this is the untranslated msgid -- which is
+	// what a test binary with no catalog loaded renders.
+	ASSERT_EQUALS(wxString("IPv6, NAT traversal (QUIC)"), remote.GetDisplayText());
+}

amule-3.1.0.tar.gz/unittests/tests/ECCryptTest.cpp Added

@@ -0,0 +1,637 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// Coverage for the EC transport-encryption primitives.
+//
+// The properties here fail *silently* if they ever regress -- a reused nonce, a key derivation that
+// stops mixing in one of its inputs, or a tag that stops being checked all still encrypt and
+// decrypt happily while providing much less than they claim. So each is asserted rather than
+// assumed.
+//
+// Every test runs against every cipher the build supports, because which ones exist depends on the
+// cryptopp version (ChaCha20-Poly1305 needs 8.1).
+
+#include <muleunit/test.h>
+
+#include "ECCrypt.h"
+
+#include <cstdlib>
+#include <cstring>
+#include <string>
+#include <vector>
+
+using namespace muleunit;
+using namespace ECCrypt;
+
+DECLARE(ECCrypt)
+static std::vector<uint8_t> Fill(size_t n, uint8_t v)
+{
+	return std::vector<uint8_t>(n, v);
+}
+
+/// Decode a hex string into bytes, so test vectors stay readable as vectors.
+static std::vector<uint8_t> FromHex(const std::string &hex)
+{
+	std::vector<uint8_t> out;
+	for (size_t i = 0; i + 1 < hex.size(); i += 2) {
+		out.push_back(static_cast<uint8_t>(strtoul(hex.substr(i, 2).c_str(), NULL, 16)));
+	}
+	return out;
+}
+
+static std::vector<uint8_t> Bytes(const std::string &s)
+{
+	return std::vector<uint8_t>(s.begin(), s.end());
+}
+
+/// A matched client/server pair sharing one secret.
+static void MakePair(uint8_t cipher, Session &cli, Session &srv, uint8_t secret = 7)
+{
+	const std::vector<uint8_t> ikm = Fill(32, secret);
+	const std::vector<uint8_t> sn = Fill(NONCE_TAG_LEN, 1);
+	const std::vector<uint8_t> cn = Fill(NONCE_TAG_LEN, 2);
+	const std::vector<uint8_t> transcript = Bytes("transcript");
+	ASSERT_TRUE(cli.Init(cipher, ikm, sn, cn, transcript, false));
+	ASSERT_TRUE(srv.Init(cipher, ikm, sn, cn, transcript, true));
+}
+END_DECLARE;
+
+// --- HKDF -----------------------------------------------------------------
+
+TEST(ECCrypt, HkdfMatchesRfc5869TestCase1)
+{
+	// RFC 5869 appendix A.1. An independent vector, not a self-consistency check: this is what
+	// proves the hand-rolled extract/expand is really HKDF and not merely stable.
+	const std::vector<uint8_t> ikm = Fill(22, 0x0b);
+	std::vector<uint8_t> salt, info;
+	for (int i = 0x00; i <= 0x0c; ++i) {
+		salt.push_back(static_cast<uint8_t>(i));
+	}
+	for (int i = 0xf0; i <= 0xf9; ++i) {
+		info.push_back(static_cast<uint8_t>(i));
+	}
+	// Expected OKM, as hex: a byte-array literal here gets exploded to one
+	// element per line by clang-format, which buries the vector it encodes.
+	const std::vector<uint8_t> expected =
+		FromHex("3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf"
+			"34007208d5b887185865");
+
+	const std::vector<uint8_t> okm = HkdfSha256(ikm, salt, info, expected.size());
+	ASSERT_EQUALS((size_t)42, expected.size());
+	ASSERT_TRUE(okm == expected);
+}
+
+TEST(ECCrypt, HkdfIsSensitiveToEveryInput)
+{
+	const std::vector<uint8_t> ikm = Fill(16, 1), salt = Fill(16, 2), info = Fill(4, 3);
+	const std::vector<uint8_t> base = HkdfSha256(ikm, salt, info, 32);
+	ASSERT_EQUALS((size_t)32, base.size());
+
+	ASSERT_TRUE(HkdfSha256(Fill(16, 9), salt, info, 32) != base);
+	ASSERT_TRUE(HkdfSha256(ikm, Fill(16, 9), info, 32) != base);
+	ASSERT_TRUE(HkdfSha256(ikm, salt, Fill(4, 9), 32) != base);
+	// Different length must not just be a prefix cut of the same stream --
+	// it is, per RFC 5869, but assert the length contract explicitly.
+	ASSERT_EQUALS((size_t)64, HkdfSha256(ikm, salt, info, 64).size());
+}
+
+TEST(ECCrypt, HkdfRejectsAbsurdLengths)
+{
+	const std::vector<uint8_t> ikm = Fill(16, 1);
+	ASSERT_TRUE(HkdfSha256(ikm, ikm, ikm, 0).empty());
+	ASSERT_TRUE(HkdfSha256(ikm, ikm, ikm, 255 * 32 + 1).empty());
+}
+
+// --- cipher availability --------------------------------------------------
+
+TEST(ECCrypt, AesGcmIsAlwaysAvailable)
+{
+	// The mandatory baseline: it must exist in every supported cryptopp, or a
+	// connection could negotiate nothing at all.
+	ASSERT_TRUE(IsCipherSupported(Cipher_AES128_GCM));
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	ASSERT_TRUE(!ciphers.empty());
+	bool hasAes = false;
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		if (ciphersi == Cipher_AES128_GCM) {
+			hasAes = true;
+		}
+	}
+	ASSERT_TRUE(hasAes);
+	ASSERT_TRUE(!IsCipherSupported(Cipher_None));
+	ASSERT_TRUE(!IsCipherSupported(0xFF));
+}
+
+TEST(ECCrypt, PreferredCipherComesFirst)
+{
+	// Case 1: preferAES = false
+	// ChaCha20 shall come first if supported, AES otherwise
+	const std::vector<uint8_t> ciphers = SupportedCiphers(false);
+	if (IsCipherSupported(Cipher_ChaCha20_Poly1305)) {
+		ASSERT_EQUALS((int)Cipher_ChaCha20_Poly1305, (int)ciphers0);
+	} else {
+		ASSERT_EQUALS((int)Cipher_AES128_GCM, (int)ciphers0);
+	}
+
+	// Case 2: preferAES = true
+	// AES shall always come first, as supporting it is mandatory
+	const std::vector<uint8_t> ciphers2 = SupportedCiphers(true);
+	ASSERT_EQUALS((int)Cipher_AES128_GCM, (int)ciphers20);
+
+	// Case 3: preferAES = HasHardwareAES(). ChaCha20 comes first if supported and there is no
+	// hardware AES; otherwise AES comes first.
+	const std::vector<uint8_t> ciphers3 = SupportedCiphers();
+	if (IsCipherSupported(Cipher_ChaCha20_Poly1305) && !HasHardwareAES()) {
+		ASSERT_EQUALS((int)Cipher_ChaCha20_Poly1305, (int)ciphers30);
+	} else {
+		ASSERT_EQUALS((int)Cipher_AES128_GCM, (int)ciphers30);
+	}
+}
+
+// --- session setup --------------------------------------------------------
+
+TEST(ECCrypt, InitRejectsBadParameters)
+{
+	Session s;
+	const std::vector<uint8_t> ikm = Fill(32, 7);
+	const std::vector<uint8_t> good = Fill(NONCE_TAG_LEN, 1);
+	const std::vector<uint8_t> shortNonce = Fill(NONCE_TAG_LEN - 1, 1);
+	const std::vector<uint8_t> empty;
+
+	ASSERT_TRUE(!s.Init(Cipher_None, ikm, good, good, empty, false));
+	ASSERT_TRUE(!s.Init(0xFF, ikm, good, good, empty, false));
+	ASSERT_TRUE(!s.Init(Cipher_AES128_GCM, ikm, shortNonce, good, empty, false));
+	ASSERT_TRUE(!s.Init(Cipher_AES128_GCM, ikm, good, shortNonce, empty, false));
+	ASSERT_TRUE(!s.IsActive());
+}
+
+TEST(ECCrypt, ResetClearsKeyMaterial)
+{
+	// A socket object can be reused for a fresh connection; carrying keys or
+	// counters across would reuse a nonce.
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		Session cli, srv;
+		MakePair(ciphersi, cli, srv);
+		ASSERT_TRUE(cli.IsActive());
+		cli.Reset();
+		ASSERT_TRUE(!cli.IsActive());
+		ASSERT_EQUALS((int)Cipher_None, (int)cli.GetCipher());
+
+		std::vector<uint8_t> out;
+		ASSERT_TRUE(!cli.Seal((const uint8_t *)"x", 1, out));
+	}
+}
+
+// --- round trip -----------------------------------------------------------
+
+TEST(ECCrypt, RoundTripBothDirections)
+{
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		Session cli, srv;
+		MakePair(ciphersi, cli, srv);
+
+		const std::string msg = "EC_OP_STAT_REQ body";
+		std::vector<uint8_t> sealed, opened;
+
+		ASSERT_TRUE(cli.Seal((const uint8_t *)msg.data(), msg.size(), sealed));
+		ASSERT_EQUALS(msg.size() + Session::Overhead(), sealed.size());
+		// The plaintext must not survive in the ciphertext.
+		ASSERT_TRUE(std::memcmp(sealed.data(), msg.data(), msg.size()) != 0);
+		ASSERT_TRUE(srv.Open(sealed.data(), sealed.size(), opened));
+		ASSERT_EQUALS(msg.size(), opened.size());
+		ASSERT_TRUE(std::memcmp(opened.data(), msg.data(), msg.size()) == 0);
+
+		// and back the other way, which uses the opposite key
+		std::vector<uint8_t> sealed2, opened2;
+		ASSERT_TRUE(srv.Seal((const uint8_t *)msg.data(), msg.size(), sealed2));
+		ASSERT_TRUE(cli.Open(sealed2.data(), sealed2.size(), opened2));
+		ASSERT_TRUE(std::memcmp(opened2.data(), msg.data(), msg.size()) == 0);
+	}
+}
+
+TEST(ECCrypt, DirectionKeysDiffer)
+{
+	// Both directions share a counter space; if they shared a key too, the
+	// two streams would reuse nonces against the same key.
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		Session cli, srv;
+		MakePair(ciphersi, cli, srv);
+
+		const std::string msg = "same plaintext, same counter";
+		std::vector<uint8_t> fromClient, fromServer;
+		ASSERT_TRUE(cli.Seal((const uint8_t *)msg.data(), msg.size(), fromClient));
+		ASSERT_TRUE(srv.Seal((const uint8_t *)msg.data(), msg.size(), fromServer));
+		ASSERT_EQUALS(fromClient.size(), fromServer.size());
+		ASSERT_TRUE(fromClient != fromServer);
+	}
+}
+
+TEST(ECCrypt, CounterAdvancesSoIdenticalPlaintextsDiffer)
+{
+	// The nonce is implicit, so nothing on the wire would reveal a counter
+	// that stopped advancing -- but the ciphertext would repeat.
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		Session cli, srv;
+		MakePair(ciphersi, cli, srv);
+
+		const std::string msg = "identical";
+		std::vector<uint8_t> a, b;
+		ASSERT_TRUE(cli.Seal((const uint8_t *)msg.data(), msg.size(), a));
+		ASSERT_TRUE(cli.Seal((const uint8_t *)msg.data(), msg.size(), b));
+		ASSERT_TRUE(a != b);
+
+		std::vector<uint8_t> o1, o2;
+		ASSERT_TRUE(srv.Open(a.data(), a.size(), o1));
+		ASSERT_TRUE(srv.Open(b.data(), b.size(), o2));
+		ASSERT_TRUE(o1 == o2);
+	}
+}
+
+TEST(ECCrypt, ManyPacketsStayInLockstep)
+{
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		Session cli, srv;
+		MakePair(ciphersi, cli, srv);
+		for (int n = 0; n < 250; ++n) {
+			char buf40;
+			const int len = snprintf(buf, sizeof(buf), "packet %d", n);
+			std::vector<uint8_t> sealed, opened;
+			ASSERT_TRUE(cli.Seal((const uint8_t *)buf, (size_t)len, sealed));
+			ASSERT_TRUE(srv.Open(sealed.data(), sealed.size(), opened));
+			ASSERT_EQUALS((size_t)len, opened.size());
+			ASSERT_TRUE(std::memcmp(opened.data(), buf, (size_t)len) == 0);
+		}
+	}
+}
+
+TEST(ECCrypt, EmptyBodyIsLegal)
+{
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		Session cli, srv;
+		MakePair(ciphersi, cli, srv);
+		std::vector<uint8_t> sealed, opened;
+		ASSERT_TRUE(cli.Seal(NULL, 0, sealed));
+		ASSERT_EQUALS(Session::Overhead(), sealed.size());
+		ASSERT_TRUE(srv.Open(sealed.data(), sealed.size(), opened));
+		ASSERT_TRUE(opened.empty());
+	}
+}
+
+// --- the properties that matter -------------------------------------------
+
+TEST(ECCrypt, TamperedCiphertextIsRejected)
+{
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		for (int flip = 0; flip < 3; ++flip) {
+			Session cli, srv;
+			MakePair(ciphersi, cli, srv);
+			const std::string msg = "a packet worth modifying in flight";
+			std::vector<uint8_t> sealed, opened;
+			ASSERT_TRUE(cli.Seal((const uint8_t *)msg.data(), msg.size(), sealed));
+
+			// first byte of body, last byte of body, and a byte of the tag
+			const size_t body = sealed.size() - Session::Overhead();
+			const size_t at = (flip == 0) ? 0 : (flip == 1) ? body - 1 : body + 3;
+			sealedat ^= 0x01;
+			ASSERT_TRUE(!srv.Open(sealed.data(), sealed.size(), opened));
+		}
+	}
+}
+
+TEST(ECCrypt, TruncatedBodyIsRejected)
+{
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		Session cli, srv;
+		MakePair(ciphersi, cli, srv);
+		std::vector<uint8_t> sealed, opened;
+		ASSERT_TRUE(cli.Seal((const uint8_t *)"abcdefgh", 8, sealed));
+
+		ASSERT_TRUE(!srv.Open(sealed.data(), sealed.size() - 1, opened));
+		// Shorter than a bare tag must be refused, not read out of bounds.
+		ASSERT_TRUE(!srv.Open(sealed.data(), Session::Overhead() - 1, opened));
+		ASSERT_TRUE(!srv.Open(sealed.data(), 0, opened));
+	}
+}
+
+TEST(ECCrypt, WrongSharedSecretCannotOpen)
+{
+	// This is what defeats a man in the middle: without the password the
+	// attacker cannot derive the key, so it cannot forge or read anything.
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		Session cli, srv, impostor;
+		MakePair(ciphersi, cli, srv, 7);
+		const std::vector<uint8_t> wrong = Fill(32, 8);
+		ASSERT_TRUE(impostor.Init(ciphersi,
+			wrong,
+			Fill(NONCE_TAG_LEN, 1),
+			Fill(NONCE_TAG_LEN, 2),
+			Bytes("transcript"),
+			true));
+
+		std::vector<uint8_t> sealed, opened;
+		ASSERT_TRUE(cli.Seal((const uint8_t *)"secret", 6, sealed));
+		ASSERT_TRUE(!impostor.Open(sealed.data(), sealed.size(), opened));
+	}
+}
+
+TEST(ECCrypt, TamperedTranscriptCannotOpen)
+{
+	// The downgrade defence. If an attacker edits the capability exchange the two ends derive
+	// different keys, so the first sealed packet fails rather than the connection quietly
+	// falling back to something weaker.
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		const std::vector<uint8_t> ikm = Fill(32, 7);
+		const std::vector<uint8_t> sn = Fill(NONCE_TAG_LEN, 1);
+		const std::vector<uint8_t> cn = Fill(NONCE_TAG_LEN, 2);
+		Session cli, srv;
+		ASSERT_TRUE(cli.Init(ciphersi, ikm, sn, cn, Bytes("offered: chacha,aes"), false));
+		ASSERT_TRUE(srv.Init(ciphersi, ikm, sn, cn, Bytes("offered: aes"), true));
+
+		std::vector<uint8_t> sealed, opened;
+		ASSERT_TRUE(cli.Seal((const uint8_t *)"payload", 7, sealed));
+		ASSERT_TRUE(!srv.Open(sealed.data(), sealed.size(), opened));
+	}
+}
+
+TEST(ECCrypt, DifferentNoncesGiveDifferentKeys)
+{
+	// Each connection must be independent, so a recording of one session is
+	// useless against another even with the same password.
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		const std::vector<uint8_t> ikm = Fill(32, 7);
+		Session a, b;
+		ASSERT_TRUE(a.Init(ciphersi,
+			ikm,
+			Fill(NONCE_TAG_LEN, 1),
+			Fill(NONCE_TAG_LEN, 2),
+			std::vector<uint8_t>(),
+			false));
+		ASSERT_TRUE(b.Init(ciphersi,
+			ikm,
+			Fill(NONCE_TAG_LEN, 3),
+			Fill(NONCE_TAG_LEN, 2),
+			std::vector<uint8_t>(),
+			true));
+
+		std::vector<uint8_t> sealed, opened;
+		ASSERT_TRUE(a.Seal((const uint8_t *)"payload", 7, sealed));
+		ASSERT_TRUE(!b.Open(sealed.data(), sealed.size(), opened));
+	}
+}
+
+TEST(ECCrypt, FailedOpenHoldsTheCounter)
+{
+	// A rejected packet must not consume a counter slot, or one dropped
+	// forgery would desynchronise the stream and break every later packet.
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		Session cli, srv;
+		MakePair(ciphersi, cli, srv);
+		std::vector<uint8_t> sealed, opened;
+		ASSERT_TRUE(cli.Seal((const uint8_t *)"body", 4, sealed));
+
+		std::vector<uint8_t> corrupted = sealed;
+		corrupted1 ^= 0x01;
+		ASSERT_TRUE(!srv.Open(corrupted.data(), corrupted.size(), opened));
+		// The pristine copy of the same packet must still open.
+		ASSERT_TRUE(srv.Open(sealed.data(), sealed.size(), opened));
+		ASSERT_EQUALS((size_t)4, opened.size());
+	}
+}
+
+// --- streaming ------------------------------------------------------------
+
+TEST(ECCrypt, StreamedSealMatchesOneShot)
+{
+	// The socket path seals CQueuedData chunks in place; it must produce
+	// exactly what the one-shot call would, or the two would be incompatible.
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		Session streamed, oneshot, dummy;
+		MakePair(ciphersi, streamed, dummy);
+		MakePair(ciphersi, oneshot, dummy);
+
+		const char *parts3 = { "EC_OP_SHARED_FILES|", "second chunk|", "third chunk tail" };
+		std::string flat;
+		std::vector<std::vector<uint8_t>> chunks;
+		for (int p = 0; p < 3; ++p) {
+			flat += partsp;
+			chunks.push_back(Bytes(partsp));
+		}
+
+		ASSERT_TRUE(streamed.SealBegin());
+		for (size_t c = 0; c < chunks.size(); ++c) {
+			ASSERT_TRUE(streamed.SealUpdate(chunksc.data(), chunksc.size()));
+		}
+		uint8_t tagAEAD_TAG_LEN;
+		ASSERT_TRUE(streamed.SealFinal(tag));
+
+		std::vector<uint8_t> joined;
+		for (size_t c = 0; c < chunks.size(); ++c) {
+			joined.insert(joined.end(), chunksc.begin(), chunksc.end());
+		}
+		// In-place: the ciphertext is exactly as long as the plaintext.
+		ASSERT_EQUALS(flat.size(), joined.size());
+
+		std::vector<uint8_t> ref;
+		ASSERT_TRUE(oneshot.Seal((const uint8_t *)flat.data(), flat.size(), ref));
+		ASSERT_EQUALS(joined.size() + AEAD_TAG_LEN, ref.size());
+		ASSERT_TRUE(std::memcmp(ref.data(), joined.data(), joined.size()) == 0);
+		ASSERT_TRUE(std::memcmp(ref.data() + joined.size(), tag, AEAD_TAG_LEN) == 0);
+	}
+}
+
+TEST(ECCrypt, StreamedOpenRecoversChunkedBody)
+{
+	const std::vector<uint8_t> ciphers = SupportedCiphers();
+	for (size_t i = 0; i < ciphers.size(); ++i) {
+		Session cli, srv;
+		MakePair(ciphersi, cli, srv);
+
+		const std::string flat = "a body that arrives split across reads";
+		std::vector<uint8_t> buf = Bytes(flat);
+		uint8_t tagAEAD_TAG_LEN;
+		ASSERT_TRUE(cli.SealBegin());
+		ASSERT_TRUE(cli.SealUpdate(buf.data(), buf.size()));
+		ASSERT_TRUE(cli.SealFinal(tag));
+
+		// open in two pieces, as the receive buffer might be walked
+		const size_t half = buf.size() / 2;
+		ASSERT_TRUE(srv.OpenBegin());
+		ASSERT_TRUE(srv.OpenUpdate(buf.data(), half));
+		ASSERT_TRUE(srv.OpenUpdate(buf.data() + half, buf.size() - half));
+		ASSERT_TRUE(srv.OpenFinal(tag));
+		ASSERT_TRUE(std::memcmp(buf.data(), flat.data(), flat.size()) == 0);
+	}
+}
+
+TEST(ECCrypt, StreamingCallsRefuseWhenInactive)
+{
+	Session s;
+	uint8_t tagAEAD_TAG_LEN = { 0 };
+	std::vector<uint8_t> buf(4, 0);
+	ASSERT_TRUE(!s.SealBegin());
+	ASSERT_TRUE(!s.SealUpdate(buf.data(), buf.size()));
+	ASSERT_TRUE(!s.SealFinal(tag));
+	ASSERT_TRUE(!s.OpenBegin());
+	ASSERT_TRUE(!s.OpenUpdate(buf.data(), buf.size()));
+	ASSERT_TRUE(!s.OpenFinal(tag));
+}
+
+// --- randomness -----------------------------------------------------------
+
+TEST(ECCrypt, RandomBytesAreTheRightSizeAndNotConstant)
+{
+	const std::vector<uint8_t> a = RandomBytes(NONCE_TAG_LEN);
+	const std::vector<uint8_t> b = RandomBytes(NONCE_TAG_LEN);
+	ASSERT_EQUALS(NONCE_TAG_LEN, a.size());
+	ASSERT_EQUALS(NONCE_TAG_LEN, b.size());
+	// Two draws colliding would mean the generator is not generating.
+	ASSERT_TRUE(a != b);
+
+	bool allZero = true;
+	for (size_t i = 0; i < a.size(); ++i) {
+		if (ai != 0) {
+			allZero = false;
+		}
+	}
+	ASSERT_TRUE(!allZero);
+	ASSERT_TRUE(RandomBytes(0).empty());
+}
+
+// --- SecureWipe ------------------------------------------------------------
+
+TEST(ECCrypt, SecureWipeEmptiesTheBuffer)
+{
+	std::vector<uint8_t> v = Fill(32, 0x5a);
+	SecureWipe(v);
+	ASSERT_TRUE(v.empty());
+	// A null or empty buffer is a no-op, not a crash.
+	std::vector<uint8_t> emptyVec;
+	SecureWipe(emptyVec);
+	ASSERT_TRUE(emptyVec.empty());
+	SecureWipe(nullptr, 0);
+}
+
+// BuildTranscript defines a wire format: the client and the server each build this byte string
+// independently and feed it to the AEAD as associated data, so the two must agree byte for byte or
+// authentication fails with no useful diagnostic. Nothing else in this file covered it, which meant
+// a refactor of the function could pass the whole suite while changing the format (#800).
+//
+// Golden vector rather than a property: the point is to pin the exact layout -- count, capped
+// cipher list, chosen cipher, then the four blobs in order.
+TEST(ECCrypt, BuildTranscriptMatchesGoldenVector)
+{
+	const std::vector<uint8_t> offered = { 0x01, 0x02, 0x03 };
+	const std::vector<uint8_t> clientNonce = { 0xA0, 0xA1, 0xA2, 0xA3 };
+	const std::vector<uint8_t> serverNonce = { 0xB0, 0xB1, 0xB2, 0xB3 };
+	const std::vector<uint8_t> clientPub = { 0xC0, 0xC1, 0xC2 };
+	const std::vector<uint8_t> serverPub = { 0xD0, 0xD1, 0xD2 };
+
+	const std::vector<uint8_t> expected = { 0x03,
+		0x01,
+		0x02,
+		0x03,
+		0x02,
+		0xA0,
+		0xA1,
+		0xA2,
+		0xA3,
+		0xB0,
+		0xB1,
+		0xB2,
+		0xB3,
+		0xC0,
+		0xC1,
+		0xC2,
+		0xD0,
+		0xD1,
+		0xD2 };
+
+	const std::vector<uint8_t> actual =
+		BuildTranscript(offered, 0x02, clientNonce, serverNonce, clientPub, serverPub);
+
+	ASSERT_EQUALS(expected.size(), actual.size());
+	ASSERT_TRUE(expected == actual);
+}
+
+// The count byte and the bytes that follow it must come from one value, or a
+// list longer than the cap announces one length and carries another.
+TEST(ECCrypt, BuildTranscriptCapsCipherListAt255)
+{
+	std::vector<uint8_t> offered(300);
+	for (size_t i = 0; i < offered.size(); ++i) {
+		offeredi = (uint8_t)(i & 0xFF);
+	}
+
+	const std::vector<uint8_t> empty;
+	const std::vector<uint8_t> out = BuildTranscript(offered, 0x07, empty, empty, empty, empty);
+
+	// 1 count + 255 capped ciphers + 1 chosen cipher.
+	ASSERT_EQUALS((size_t)257, out.size());
+	ASSERT_EQUALS((uint8_t)255, out0);
+	// The carried bytes are the first 255 of the list, not a truncation of
+	// some other window.
+	ASSERT_EQUALS((uint8_t)0x00, out1);
+	ASSERT_EQUALS((uint8_t)0xFE, out255);
+	// Chosen cipher lands immediately after the capped list.
+	ASSERT_EQUALS((uint8_t)0x07, out256);
+}
+
+// Every field has to reach the output; one silently dropped would still authenticate happily
+// between two peers running the same build, and only fail against a peer that included it.
+TEST(ECCrypt, BuildTranscriptIsSensitiveToEveryInput)
+{
+	const std::vector<uint8_t> offered = Fill(3, 1), cn = Fill(4, 2), sn = Fill(4, 3), cp = Fill(3, 4),
+				   sp = Fill(3, 5);
+	const std::vector<uint8_t> base = BuildTranscript(offered, 0x02, cn, sn, cp, sp);
+
+	ASSERT_TRUE(BuildTranscript(Fill(3, 9), 0x02, cn, sn, cp, sp) != base);
+	ASSERT_TRUE(BuildTranscript(offered, 0x09, cn, sn, cp, sp) != base);
+	ASSERT_TRUE(BuildTranscript(offered, 0x02, Fill(4, 9), sn, cp, sp) != base);
+	ASSERT_TRUE(BuildTranscript(offered, 0x02, cn, Fill(4, 9), cp, sp) != base);
+	ASSERT_TRUE(BuildTranscript(offered, 0x02, cn, sn, Fill(3, 9), sp) != base);
+	ASSERT_TRUE(BuildTranscript(offered, 0x02, cn, sn, cp, Fill(3, 9)) != base);
+	// Swapping the two nonces must change it -- the field order is part of
+	// the format, not an implementation detail.
+	ASSERT_TRUE(BuildTranscript(offered, 0x02, sn, cn, cp, sp) != base);
+}
+
+// Degenerate but legal: no ciphers offered and no key material yet.
+TEST(ECCrypt, BuildTranscriptHandlesEmptyInputs)
+{
+	const std::vector<uint8_t> empty;
+	const std::vector<uint8_t> out = BuildTranscript(empty, 0x00, empty, empty, empty, empty);
+
+	ASSERT_EQUALS((size_t)2, out.size());
+	ASSERT_EQUALS((uint8_t)0, out0);
+	ASSERT_EQUALS((uint8_t)0, out1);
+}

amule-3.1.0.tar.gz/unittests/tests/ECIdDiffTest.cpp Added

@@ -0,0 +1,146 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include "ECIdDiff.h"
+
+using namespace muleunit;
+
+// `ComputeRemovedIds` decides which files the daemon tells a partial-update client to delete. Both
+// ways of getting it wrong are silent: a missed removal leaves an entry in the client's list for
+// the life of the connection with no error logged anywhere, and a spurious one deletes a file the
+// user still has. Neither shows up as a crash, a failed request, or a wrong-looking packet -- only
+// as a list that quietly disagrees with the daemon.
+//
+// It is a pure function over two sorted vectors, so unlike the surrounding handler it needs no app,
+// no daemon and no connected client to exercise.
+
+DECLARE_SIMPLE(ECIdDiff)
+
+// Convenience: run the diff and hand back the result by value.
+static std::vector<uint32> Diff(const std::vector<uint32> &previous, const std::vector<uint32> &current)
+{
+	std::vector<uint32> removed;
+	ComputeRemovedIds(previous, current, removed);
+	return removed;
+}
+
+TEST(ECIdDiff, NothingChangedRemovesNothing)
+{
+	const std::vector<uint32> ids = { 1, 5, 9, 40 };
+	ASSERT_TRUE(Diff(ids, ids).empty());
+}
+
+TEST(ECIdDiff, BothEmpty)
+{
+	ASSERT_TRUE(Diff(std::vector<uint32>(), std::vector<uint32>()).empty());
+}
+
+// The first poll of a connection: nothing was sent before, so however many
+// files exist now, none of them can have been removed.
+TEST(ECIdDiff, FirstPollRemovesNothing)
+{
+	ASSERT_TRUE(Diff(std::vector<uint32>(), { 3, 7, 11 }).empty());
+}
+
+TEST(ECIdDiff, EverythingGone)
+{
+	const std::vector<uint32> removed = Diff({ 3, 7, 11 }, std::vector<uint32>());
+	ASSERT_EQUALS(3u, removed.size());
+	ASSERT_EQUALS(3u, removed0);
+	ASSERT_EQUALS(7u, removed1);
+	ASSERT_EQUALS(11u, removed2);
+}
+
+// The cursor starts at the front, so a removal at the very front is the case
+// an off-by-one in the initial position would miss.
+TEST(ECIdDiff, RemovedAtFront)
+{
+	const std::vector<uint32> removed = Diff({ 1, 5, 9 }, { 5, 9 });
+	ASSERT_EQUALS(1u, removed.size());
+	ASSERT_EQUALS(1u, removed0);
+}
+
+TEST(ECIdDiff, RemovedInMiddle)
+{
+	const std::vector<uint32> removed = Diff({ 1, 5, 9 }, { 1, 9 });
+	ASSERT_EQUALS(1u, removed.size());
+	ASSERT_EQUALS(5u, removed0);
+}
+
+// The cursor has run off the end by the time the last id is considered, so
+// this is the case a missing `cur == curEnd` guard would get wrong.
+TEST(ECIdDiff, RemovedAtEnd)
+{
+	const std::vector<uint32> removed = Diff({ 1, 5, 9 }, { 1, 5 });
+	ASSERT_EQUALS(1u, removed.size());
+	ASSERT_EQUALS(9u, removed0);
+}
+
+// Additions must never be reported as removals -- that would delete a file
+// from the client's list on the very poll it first appeared.
+TEST(ECIdDiff, AdditionsAreNotRemovals)
+{
+	ASSERT_TRUE(Diff({ 5 }, { 1, 5, 9 }).empty());
+}
+
+// Adds and removes in the same cycle, interleaved so the cursor has to step
+// over new ids while still matching the surviving ones.
+TEST(ECIdDiff, AddAndRemoveInTheSameCycle)
+{
+	const std::vector<uint32> removed = Diff({ 10, 20, 30, 40 }, { 5, 20, 25, 40, 50 });
+	ASSERT_EQUALS(2u, removed.size());
+	ASSERT_EQUALS(10u, removed0);
+	ASSERT_EQUALS(30u, removed1);
+}
+
+// Disjoint sets: every previous id is gone and every current one is new. The
+// cursor must not be left behind by the leading run of smaller new ids.
+TEST(ECIdDiff, DisjointSets)
+{
+	const std::vector<uint32> removed = Diff({ 100, 200 }, { 1, 2, 3 });
+	ASSERT_EQUALS(2u, removed.size());
+	ASSERT_EQUALS(100u, removed0);
+	ASSERT_EQUALS(200u, removed1);
+}
+
+// The output is cleared, not appended to -- the handler reuses one vector.
+TEST(ECIdDiff, OutputIsClearedNotAppended)
+{
+	std::vector<uint32> removed = { 777, 888 };
+	ComputeRemovedIds({ 1, 2 }, { 1 }, removed);
+	ASSERT_EQUALS(1u, removed.size());
+	ASSERT_EQUALS(2u, removed0);
+}
+
+// ECIDs are assigned from a counter that keeps climbing across a long daemon
+// uptime, so the comparisons must stay correct above the signed-32-bit range.
+TEST(ECIdDiff, HighIdsCompareUnsigned)
+{
+	const std::vector<uint32> removed =
+		Diff({ 2147483647u, 2147483648u, 4294967295u }, { 2147483647u, 4294967295u });
+	ASSERT_EQUALS(1u, removed.size());
+	ASSERT_EQUALS(2147483648u, removed0);
+}

amule-3.1.0.tar.gz/unittests/tests/ECSocketFlagsTest.cpp Added

@@ -0,0 +1,157 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include <ec/cpp/ECCodes.h>
+#include <ec/cpp/ECMemSocket.h>
+#include <ec/cpp/ECSocket.h>
+
+using namespace muleunit;
+
+// m_my_flags mixes two kinds of capability bit, and the difference decides which ones a reconnect
+// may drop:
+//
+//   - chosen locally (EC_FLAG_ZLIB, EC_FLAG_UTF8_NUMBERS), from preferences via SetCapabilities,
+// which the reconnect path does not call again;
+//   - agreed with the peer (EC_FLAG_LARGE_TAG_COUNT), set only when the daemon echoes
+// EC_TAG_CAN_LARGE_TAG_COUNT in AUTH_OK.
+//
+// Getting either half wrong is silent. Left set across a reconnect, the negotiated bit makes the
+// client keep sending the extended tag-count format to a daemon that never advertised it, and the
+// receiver misparses every tag after the count. Clearing too much instead disables compression for
+// the rest of the session -- no error either way, just a broken or slow list.
+//
+// The transition is pure state, so it needs no daemon: CECMemSocket is a concrete in-tree CECSocket
+// whose constructor already sets both EC_FLAG_UTF8_NUMBERS and EC_FLAG_LARGE_TAG_COUNT.
+
+namespace
+{
+
+// m_my_flags is protected, and deliberately so; a subclass is how the tree
+// itself reaches it (CECMemSocket's constructor does exactly this).
+class CFlagProbe : public CECMemSocket
+{
+public:
+	void Add(uint32_t flags) { m_my_flags |= flags; }
+	uint32_t Flags() const { return m_my_flags; }
+};
+
+} // namespace
+
+DECLARE_SIMPLE(ECSocketFlags)
+
+// The reason this was not a one-line clear of the whole word.
+TEST(ECSocketFlags, ClearPeerNegotiatedKeepsLocalCapabilities)
+{
+	CFlagProbe socket;
+	socket.Add(EC_FLAG_ZLIB);
+
+	// Precondition: all three bits set, as after a completed handshake.
+	ASSERT_TRUE((socket.Flags() & EC_FLAG_ZLIB) != 0);
+	ASSERT_TRUE((socket.Flags() & EC_FLAG_UTF8_NUMBERS) != 0);
+	ASSERT_TRUE((socket.Flags() & EC_FLAG_LARGE_TAG_COUNT) != 0);
+
+	socket.ClearPeerNegotiatedFlags();
+
+	// Only the negotiated bit goes.
+	ASSERT_TRUE((socket.Flags() & EC_FLAG_LARGE_TAG_COUNT) == 0);
+	ASSERT_TRUE((socket.Flags() & EC_FLAG_ZLIB) != 0);
+	ASSERT_TRUE((socket.Flags() & EC_FLAG_UTF8_NUMBERS) != 0);
+}
+
+// Every packet carries the version-sanity bit, and ReadPacket rejects one that
+// does not -- so the clear must not disturb it.
+TEST(ECSocketFlags, ClearPeerNegotiatedKeepsVersionBit)
+{
+	CFlagProbe socket;
+	const uint32_t versionBit = socket.Flags() & 0x60;
+
+	socket.ClearPeerNegotiatedFlags();
+
+	ASSERT_EQUALS(versionBit, socket.Flags() & 0x60);
+}
+
+// The clear lives outside ResetProtocolState on purpose. CECMemSocket sets EC_FLAG_LARGE_TAG_COUNT
+// as a local property of the wire format it caches, not as something a peer agreed to, so a reset
+// that dropped it would silently downgrade the cache to the short tag-count format.
+TEST(ECSocketFlags, ResetProtocolStateLeavesCapabilitiesAlone)
+{
+	CFlagProbe socket;
+	socket.Add(EC_FLAG_ZLIB);
+	const uint32_t before = socket.Flags();
+
+	socket.ResetProtocolState();
+
+	ASSERT_EQUALS(before, socket.Flags());
+}
+
+// The tx block size decides how many send() calls a packet costs, but it also has two hard
+// constraints that are easy to break while "simplifying" the arithmetic: the first block has to
+// leave room for the 8-byte header SealOutputQueue keeps in clear, and the cap has to hold, because
+// a packet may legitimately be hundreds of megabytes and a block that size would be copied again by
+// the send path.
+namespace
+{
+
+class CTxChunkProbe : public CECMemSocket
+{
+public:
+	using CECSocket::TxChunkSize;
+};
+
+const size_t kFloor = 2048;
+const size_t kCap = 64 * 1024;
+const size_t kHeader = 8;
+
+} // namespace
+
+TEST(ECSocketFlags, TxChunkSizeNeverDropsBelowTheHeaderFloor)
+{
+	// A body smaller than the floor still gets the floor, so the header always fits and no
+	// packet gets smaller blocks than before the size became per-packet.
+	ASSERT_EQUALS(kFloor, CTxChunkProbe::TxChunkSize(0));
+	ASSERT_EQUALS(kFloor, CTxChunkProbe::TxChunkSize(1));
+	ASSERT_EQUALS(kFloor, CTxChunkProbe::TxChunkSize(kFloor - kHeader));
+	ASSERT_TRUE(CTxChunkProbe::TxChunkSize(0) >= kHeader);
+}
+
+TEST(ECSocketFlags, TxChunkSizeCoversBodyPlusHeaderInBetween)
+{
+	// Between the floor and the cap the block is exactly what the packet needs,
+	// body plus the 8-byte header, so the whole thing is one block.
+	ASSERT_EQUALS(kFloor + 1, CTxChunkProbe::TxChunkSize(kFloor - kHeader + 1));
+	ASSERT_EQUALS((size_t)10000 + kHeader, CTxChunkProbe::TxChunkSize(10000));
+	ASSERT_EQUALS(kCap - 1, CTxChunkProbe::TxChunkSize(kCap - 1 - kHeader));
+}
+
+TEST(ECSocketFlags, TxChunkSizeStopsAtTheCap)
+{
+	// At and past the cap the block stops growing: a 256 MB packet must not
+	// become a 256 MB contiguous allocation.
+	ASSERT_EQUALS(kCap, CTxChunkProbe::TxChunkSize(kCap - kHeader));
+	ASSERT_EQUALS(kCap, CTxChunkProbe::TxChunkSize(kCap));
+	ASSERT_EQUALS(kCap, CTxChunkProbe::TxChunkSize(4 * 1024 * 1024));
+	ASSERT_EQUALS(kCap, CTxChunkProbe::TxChunkSize(256u * 1024 * 1024));
+}

amule-3.1.0.tar.gz/unittests/tests/EtagTest.cpp Added

@@ -0,0 +1,219 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include <muleunit/test.h>
+
+#include "Etag.h"
+
+#include <string>
+
+using namespace muleunit;
+using namespace webcommon;
+
+DECLARE_SIMPLE(Etag)
+
+// `Etag()` -- SHA-256 truncated to 8 bytes (16 hex chars).
+
+TEST(Etag, BareHexLength)
+{
+	// 16 hex chars regardless of body length -- the truncation is the
+	// wire contract that prevents header bloat.
+	ASSERT_EQUALS(static_cast<size_t>(16), Etag("").size());
+	ASSERT_EQUALS(static_cast<size_t>(16), Etag("x").size());
+	ASSERT_EQUALS(static_cast<size_t>(16), Etag(std::string(1024 * 1024, 'A')).size());
+}
+
+TEST(Etag, EmptyBodyKnownDigest)
+{
+	// SHA-256("") truncated to 8 bytes, lowercase hex. Reference: `printf '' | shasum -a 256`
+	// = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", leading 16 hex
+	// chars "e3b0c44298fc1c14".
+	ASSERT_EQUALS(std::string("e3b0c44298fc1c14"), Etag(""));
+}
+
+TEST(Etag, DistinctBodiesProduceDistinctEtags)
+{
+	// Sanity: the truncation didn't accidentally collapse common
+	// short payloads to the same digest.
+	ASSERT_TRUE(Etag("a") != Etag("b"));
+	ASSERT_TRUE(Etag("{\"ok\":true}") != Etag("{\"ok\":false}"));
+}
+
+// `IfNoneMatchHits()` -- fix for the bare-vs-quoted asymmetry.
+
+TEST(Etag, IfNoneMatchEmptyHeaderNoHit)
+{
+	// Absent header → cannot be a match.
+	ASSERT_FALSE(IfNoneMatchHits("", "deadbeefdeadbeef"));
+}
+
+TEST(Etag, IfNoneMatchBareHexHits)
+{
+	// Bare-vs-bare compare must hit -- backward compatibility for
+	// clients that send unquoted validators.
+	ASSERT_TRUE(IfNoneMatchHits("deadbeefdeadbeef", "deadbeefdeadbeef"));
+}
+
+TEST(Etag, IfNoneMatchQuotedHexHits)
+{
+	// RFC 7232 2.3-canonical form: `"<hex>"`. This was the latent bug -- strictly-RFC clients
+	// sending the quoted form never got 304 from the prior implementation.
+	ASSERT_TRUE(IfNoneMatchHits("\"deadbeefdeadbeef\"", "deadbeefdeadbeef"));
+}
+
+TEST(Etag, IfNoneMatchWeakValidatorHits)
+{
+	// `W/"<hex>"`: weak validator. For conditional GETs we treat weak and strong as equivalent
+	// (Section 2.3.2 -- opaque payload equality is what matters for 304 semantics).
+	ASSERT_TRUE(IfNoneMatchHits("W/\"deadbeefdeadbeef\"", "deadbeefdeadbeef"));
+}
+
+TEST(Etag, IfNoneMatchWildcardHits)
+{
+	// `*` matches any existing representation per RFC §3.2.
+	ASSERT_TRUE(IfNoneMatchHits("*", "deadbeefdeadbeef"));
+}
+
+TEST(Etag, IfNoneMatchListAnyMatchWins)
+{
+	// Comma-separated list -- any matching entry returns true.
+	ASSERT_TRUE(IfNoneMatchHits(
+		"\"someotheretag\", \"deadbeefdeadbeef\", \"yetanother\"", "deadbeefdeadbeef"));
+	// Even with mixed strong/weak/bare.
+	ASSERT_TRUE(IfNoneMatchHits("W/\"first\", deadbeefdeadbeef", "deadbeefdeadbeef"));
+}
+
+TEST(Etag, IfNoneMatchListNoMatchMisses)
+{
+	// None of the entries match → no hit.
+	ASSERT_FALSE(IfNoneMatchHits("\"someotheretag\", \"yetanother\"", "deadbeefdeadbeef"));
+}
+
+TEST(Etag, IfNoneMatchWhitespaceTolerated)
+{
+	// Surrounding whitespace within list entries is stripped.
+	ASSERT_TRUE(IfNoneMatchHits("   \"deadbeefdeadbeef\"   ", "deadbeefdeadbeef"));
+}
+
+TEST(Etag, IfNoneMatchHexMismatchMisses)
+{
+	// Different hex payload → no hit even with right shape.
+	ASSERT_FALSE(IfNoneMatchHits("\"feedfacefeedface\"", "deadbeefdeadbeef"));
+}
+
+TEST(Etag, IfNoneMatchHexCaseSensitive)
+{
+	// RFC 2.3.2: opaque-string equality. We emit lowercase hex on the response side; clients
+	// echoing the value back must also send lowercase, so an uppercase variant is no hit.
+	ASSERT_FALSE(IfNoneMatchHits("DEADBEEFDEADBEEF", "deadbeefdeadbeef"));
+}
+
+// Per-coding validators. The body hash is taken before compression, so both codings of a resource
+// derive from one hash. A strong validator names ONE representation, so the selected coding is
+// appended to the wire value and the conditional-GET comparison runs against THAT value. An earlier
+// cut matched either coding, which defeats the suffix entirely: a client holding gzip bytes and
+// asking for identity was told its copy was current.
+TEST(Etag, CodingSuffixDistinguishesTheTwoRepresentations)
+{
+	const std::string bare = "a1b2c3d4";
+	const std::string coded = bare + webcommon::kGzipEtagSuffix;
+	ASSERT_TRUE(bare != coded);
+	// Each validator matches its own representation...
+	ASSERT_TRUE(webcommon::IfNoneMatchHits("\"a1b2c3d4\"", bare));
+	ASSERT_TRUE(webcommon::IfNoneMatchHits("\"a1b2c3d4-gzip\"", coded));
+	// ...and NOT the other one. This is the whole purpose of the suffix.
+	ASSERT_TRUE(!webcommon::IfNoneMatchHits("\"a1b2c3d4-gzip\"", bare));
+	ASSERT_TRUE(!webcommon::IfNoneMatchHits("\"a1b2c3d4\"", coded));
+}
+
+// The grammar still applies to whichever representation was selected: `*`,
+// weak validators and comma-separated lists all work against the coded form.
+TEST(Etag, CodedValidatorKeepsTheFullGrammar)
+{
+	const std::string coded = std::string("a1b2c3d4") + webcommon::kGzipEtagSuffix;
+	ASSERT_TRUE(webcommon::IfNoneMatchHits("*", coded));
+	ASSERT_TRUE(webcommon::IfNoneMatchHits("W/\"a1b2c3d4-gzip\"", coded));
+	ASSERT_TRUE(webcommon::IfNoneMatchHits("\"nope\", \"a1b2c3d4-gzip\"", coded));
+	ASSERT_TRUE(!webcommon::IfNoneMatchHits("\"deadbeef-gzip\"", coded));
+}
+
+// The suffix is a marker on one body's validator, not a wildcard that joins
+// two different bodies.
+TEST(Etag, CodingSuffixIsNotAWildcard)
+{
+	ASSERT_TRUE(!webcommon::IfNoneMatchHits("\"-gzip\"", "a1b2c3d4"));
+	ASSERT_TRUE(!webcommon::IfNoneMatchHits("", "a1b2c3d4"));
+}
+
+// Naming a representation. WithCodingSuffix is asked which coding the value must NAME, not whether
+// to add or remove a suffix. Three call sites used to spell that edit out by hand -- two that could
+// only add and one that could only add-or-strip -- and the difference is what let a failed deflate
+// ship a gzip validator on identity bytes.
+TEST(Etag, CodingSuffixNamesTheSelectedRepresentation)
+{
+	ASSERT_TRUE(webcommon::WithCodingSuffix("a1b2c3d4", true) == "a1b2c3d4-gzip");
+	ASSERT_TRUE(webcommon::WithCodingSuffix("a1b2c3d4", false) == "a1b2c3d4");
+	// The quoted form the static path carries: the suffix belongs on the opaque payload, INSIDE
+	// the quotes, or the value stops being a valid entity-tag and no client matches it again.
+	ASSERT_TRUE(webcommon::WithCodingSuffix("\"1f-2a3b\"", true) == "\"1f-2a3b-gzip\"");
+	ASSERT_TRUE(webcommon::WithCodingSuffix("\"1f-2a3b-gzip\"", false) == "\"1f-2a3b\"");
+}
+
+// The transport calls this on a value the dispatcher may already have
+// stamped, so asking for the coding that is already named must not double it.
+TEST(Etag, CodingSuffixIsIdempotent)
+{
+	ASSERT_TRUE(webcommon::WithCodingSuffix("a1b2c3d4-gzip", true) == "a1b2c3d4-gzip");
+	ASSERT_TRUE(webcommon::WithCodingSuffix("\"a1b2c3d4-gzip\"", true) == "\"a1b2c3d4-gzip\"");
+	ASSERT_TRUE(webcommon::WithCodingSuffix("a1b2c3d4", false) == "a1b2c3d4");
+}
+
+// The reason the helper exists. GzipOnce can fail -- deflateInit2 or deflate returning short --
+// after the dispatcher has already predicted compression and stamped the suffix. The body then
+// ships as identity, and the validator has to come back down with it, or a cache stores identity
+// bytes under the gzip validator and serves them to a client that asked for gzip.
+TEST(Etag, AFailedCompressionTakesTheSuffixBackOff)
+{
+	const std::string predicted = webcommon::WithCodingSuffix("a1b2c3d4", true);
+	ASSERT_TRUE(predicted == "a1b2c3d4-gzip");
+	// ...deflate fails, so the coding that actually shipped is identity.
+	const std::string shipped = webcommon::WithCodingSuffix(predicted, false);
+	ASSERT_TRUE(shipped == "a1b2c3d4");
+	// And the identity validator is what an identity client will send back.
+	ASSERT_TRUE(webcommon::IfNoneMatchHits("\"a1b2c3d4\"", shipped));
+	ASSERT_TRUE(!webcommon::IfNoneMatchHits("\"a1b2c3d4-gzip\"", shipped));
+}
+
+// A body whose hash happens to end in the suffix text is not "already coded". Guarded because the
+// check is a suffix compare on the payload: if the digest alphabet ever widened past hex,
+// `...-gzip` could occur naturally and a wrongly detected prediction would strip a byte off a real
+// validator.
+TEST(Etag, CodingSuffixLooksOnlyAtTheEndOfThePayload)
+{
+	ASSERT_TRUE(webcommon::WithCodingSuffix("-gzipa1b2", true) == "-gzipa1b2-gzip");
+	ASSERT_TRUE(webcommon::WithCodingSuffix("-gzipa1b2", false) == "-gzipa1b2");
+	// Degenerate inputs must not underflow the erase.
+	ASSERT_TRUE(webcommon::WithCodingSuffix("", false).empty());
+	ASSERT_TRUE(webcommon::WithCodingSuffix("", true) == "-gzip");
+}

amule-3.1.0.tar.gz/unittests/tests/EventBusTest.cpp Added

@@ -0,0 +1,194 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include <muleunit/test.h>
+
+#include "EventBus.h"
+
+#include <atomic>
+#include <chrono>
+#include <thread>
+
+using namespace muleunit;
+using namespace webapi;
+
+DECLARE_SIMPLE(EventBus)
+
+TEST(EventBus, EmptyBusOldestAndNewestAreZero)
+{
+	CEventBus bus;
+	ASSERT_EQUALS(static_cast<std::uint64_t>(0), bus.OldestId());
+	ASSERT_EQUALS(static_cast<std::uint64_t>(0), bus.NewestId());
+}
+
+TEST(EventBus, PublishAssignsMonotonicIds)
+{
+	CEventBus bus;
+	bus.Publish("a", "{}");
+	bus.Publish("b", "{}");
+	bus.Publish("c", "{}");
+	// First id is 1; ids are dense and monotonic.
+	ASSERT_EQUALS(static_cast<std::uint64_t>(1), bus.OldestId());
+	ASSERT_EQUALS(static_cast<std::uint64_t>(3), bus.NewestId());
+}
+
+TEST(EventBus, DrainSinceZeroReturnsEverything)
+{
+	CEventBus bus;
+	bus.Publish("a", "{\"x\":1}");
+	bus.Publish("b", "{\"x\":2}");
+
+	std::vector<Event> out;
+	const std::uint64_t high = bus.Drain(0, std::chrono::milliseconds(0), out);
+	ASSERT_EQUALS(static_cast<size_t>(2), out.size());
+	ASSERT_EQUALS(std::string("a"), out0.name);
+	ASSERT_EQUALS(std::string("b"), out1.name);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(2), high);
+}
+
+TEST(EventBus, DrainSinceFiltersOlder)
+{
+	CEventBus bus;
+	bus.Publish("a", "{}");
+	bus.Publish("b", "{}");
+	bus.Publish("c", "{}");
+	std::vector<Event> out;
+	const std::uint64_t high = bus.Drain(/*since=*/1, std::chrono::milliseconds(0), out);
+	ASSERT_EQUALS(static_cast<size_t>(2), out.size());
+	ASSERT_EQUALS(std::string("b"), out0.name);
+	ASSERT_EQUALS(std::string("c"), out1.name);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(3), high);
+}
+
+TEST(EventBus, DrainBlocksUntilPublish)
+{
+	CEventBus bus;
+	std::atomic<bool> drain_returned{ false };
+	std::vector<Event> got;
+
+	std::thread waiter(& {
+		bus.Drain(0, std::chrono::seconds(5), got);
+		drain_returned.store(true);
+	});
+
+	// Drainer should still be blocked after a beat.
+	std::this_thread::sleep_for(std::chrono::milliseconds(100));
+	ASSERT_FALSE(drain_returned.load());
+
+	// Publish -- the condvar should wake the drainer in well under 5 s.
+	bus.Publish("late", "{}");
+
+	// Give a generous slack window for the wake + copy.
+	for (int i = 0; i < 50 && !drain_returned.load(); ++i) {
+		std::this_thread::sleep_for(std::chrono::milliseconds(20));
+	}
+	ASSERT_TRUE(drain_returned.load());
+	waiter.join();
+
+	ASSERT_EQUALS(static_cast<size_t>(1), got.size());
+	ASSERT_EQUALS(std::string("late"), got0.name);
+}
+
+TEST(EventBus, DrainTimesOutWhenNothingPublished)
+{
+	CEventBus bus;
+	std::vector<Event> out;
+	const auto start = std::chrono::steady_clock::now();
+	const std::uint64_t high = bus.Drain(0, std::chrono::milliseconds(120), out);
+	const auto elapsed = std::chrono::steady_clock::now() - start;
+
+	ASSERT_TRUE(out.empty());
+	ASSERT_EQUALS(static_cast<std::uint64_t>(0), high);
+	// The drain should have spent the full timeout waiting; 80 ms of
+	// slack to absorb scheduling jitter.
+	const auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(elapsed).count();
+	ASSERT_TRUE(ms >= 80);
+}
+
+TEST(EventBus, RingCapDropsOldestWhenFull)
+{
+	// Construct with an explicit small capacity rather than the default: the default is sized
+	// for real workloads (16K) and this test would otherwise publish 16K+ events to exercise
+	// it.
+	CEventBus bus(/*capacity=*/64);
+	const std::size_t over = bus.Capacity() + 5;
+	for (std::size_t i = 0; i < over; ++i) {
+		bus.Publish("x", "{}");
+	}
+
+	std::vector<Event> out;
+	bus.Drain(0, std::chrono::milliseconds(0), out);
+	ASSERT_EQUALS(bus.Capacity(), out.size());
+
+	// OldestId is the first id we STILL have (= ids dropped + 1).
+	const std::uint64_t expected_oldest = (over - bus.Capacity()) + 1;
+	ASSERT_EQUALS(expected_oldest, bus.OldestId());
+	ASSERT_EQUALS(static_cast<std::uint64_t>(over), bus.NewestId());
+}
+
+TEST(EventBus, ExplicitCapacityHonored)
+{
+	CEventBus bus(/*capacity=*/256);
+	ASSERT_EQUALS(static_cast<std::size_t>(256), bus.Capacity());
+}
+
+TEST(EventBus, BelowMinCapacityIsClampedUp)
+{
+	// Operator config below the floor, e.g. capacity=1, is clamped to kMinCapacity. Without the
+	// clamp the bus would effectively disable replay; the floor guarantees a meaningful window.
+	CEventBus bus(/*capacity=*/1);
+	ASSERT_EQUALS(CEventBus::kMinCapacity, bus.Capacity());
+}
+
+TEST(EventBus, ConcurrentPublishersHaveDistinctIds)
+{
+	CEventBus bus;
+	const int per_thread = 50;
+	const int n_threads = 4;
+	std::vector<std::thread> ths;
+	for (int t = 0; t < n_threads; ++t) {
+		ths.emplace_back(& {
+			for (int i = 0; i < per_thread; ++i) {
+				bus.Publish("p", "{}");
+			}
+		});
+	}
+	for (auto &t : ths)
+		t.join();
+
+	const int total = per_thread * n_threads;
+	// We can have dropped some if total > capacity; what is *guaranteed* is that the newest id
+	// == total, every Publish having atomically grabbed a unique id.
+	ASSERT_EQUALS(static_cast<std::uint64_t>(total), bus.NewestId());
+
+	std::vector<Event> out;
+	bus.Drain(0, std::chrono::milliseconds(0), out);
+	// All retained ids are unique and dense in their tail of the
+	// monotonic sequence.
+	std::uint64_t prev = 0;
+	for (const auto &ev : out) {
+		ASSERT_TRUE(ev.id > prev);
+		prev = ev.id;
+	}
+}

amule-3.1.0.tar.gz/unittests/tests/EventDiffTest.cpp Added

@@ -0,0 +1,2120 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include <muleunit/test.h>
+
+#include "EventBus.h"
+#include "EventDiff.h"
+#include "ServerFlagNames.h"
+#include "State.h"
+
+#include <chrono>
+#include <cstdint>
+#include <map>
+#include <string>
+#include <vector>
+
+using namespace muleunit;
+using namespace webapi;
+
+DECLARE_SIMPLE(EventDiff)
+
+// Drain `bus` non-blockingly and return every event newer than `since` in id order. Drain is a
+// replay from a cursor, not a consume: draining from 0 twice yields the same events twice, so a
+// test asserting that a later tick emitted *nothing* has to carry the cursor forward.
+static std::vector<Event> DrainSince(CEventBus &bus, std::uint64_t since)
+{
+	std::vector<Event> out;
+	bus.Drain(since, std::chrono::milliseconds(0), out);
+	return out;
+}
+
+// Drain `bus` non-blockingly and return all events in id order.
+static std::vector<Event> DrainAll(CEventBus &bus)
+{
+	return DrainSince(bus, 0);
+}
+
+// log_appended cold start: the first tick must not emit log_appended for pre-existing lines.
+// Clients GET /api/v1/logs/amule for the history; the event channel is live-tail only.
+TEST(EventDiff, LogAppendedColdStartSilent)
+{
+	CState state;
+	state.AppendAmuleLog({ "old line 1\n", "old line 2\n" });
+	CEventBus bus;
+	LastSeenState prev;
+
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	const auto drained = DrainAll(bus);
+	for (const auto &ev : drained) {
+		ASSERT_TRUE(ev.name != "log_appended");
+	}
+	// The baseline counter must equal the pre-existing log size, so the next tick's diff sees
+	// zero new lines until amuled actually logs something.
+	ASSERT_EQUALS(static_cast<std::size_t>(2), prev.amule_log_count);
+	ASSERT_TRUE(prev.amule_log_initialised);
+}
+
+// After cold-start, a single appended line publishes exactly one
+// log_appended event with the new line in `lines`.
+TEST(EventDiff, LogAppendedFiresOnSingleNewLine)
+{
+	CState state;
+	state.AppendAmuleLog({ "old line\n" });
+	CEventBus bus;
+	LastSeenState prev;
+
+	// Tick 1: baseline.
+	EmitDiffsAndUpdate(bus, prev, state);
+	// Tick 2: amuled appended a fresh line. Expect log_appended.
+	state.AppendAmuleLog({ "new line\n" });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	const auto drained = DrainAll(bus);
+	int log_events = 0;
+	std::string payload;
+	for (const auto &ev : drained) {
+		if (ev.name == "log_appended") {
+			++log_events;
+			payload = ev.data;
+		}
+	}
+	ASSERT_EQUALS(1, log_events);
+	// Payload must contain the new line content and NOT the old one.
+	ASSERT_TRUE(payload.find("new line") != std::string::npos);
+	ASSERT_TRUE(payload.find("old line") == std::string::npos);
+	// Counter advanced to 2.
+	ASSERT_EQUALS(static_cast<std::size_t>(2), prev.amule_log_count);
+}
+
+// A batch of multiple new lines lands in one event with a `lines`
+// array -- never N separate events. Bus traffic ≪ line traffic.
+TEST(EventDiff, LogAppendedBatchesMultipleLinesIntoOneEvent)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+
+	EmitDiffsAndUpdate(bus, prev, state); // cold-start, log is empty
+	state.AppendAmuleLog({ "A\n", "B\n", "C\n" });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	const auto drained = DrainAll(bus);
+	int log_events = 0;
+	std::string payload;
+	for (const auto &ev : drained) {
+		if (ev.name == "log_appended") {
+			++log_events;
+			payload = ev.data;
+		}
+	}
+	ASSERT_EQUALS(1, log_events);
+	ASSERT_TRUE(payload.find("\"A") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"B") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"C") != std::string::npos);
+	ASSERT_EQUALS(static_cast<std::size_t>(3), prev.amule_log_count);
+}
+
+// Idle ticks (no new lines) must not publish log_appended.
+TEST(EventDiff, LogAppendedSilentOnIdleTick)
+{
+	CState state;
+	state.AppendAmuleLog({ "baseline\n" });
+	CEventBus bus;
+	LastSeenState prev;
+
+	EmitDiffsAndUpdate(bus, prev, state);
+	(void)DrainAll(bus); // discard cold-start events
+
+	EmitDiffsAndUpdate(bus, prev, state); // idle
+	EmitDiffsAndUpdate(bus, prev, state); // idle
+
+	const auto drained = DrainAll(bus);
+	for (const auto &ev : drained) {
+		ASSERT_TRUE(ev.name != "log_appended");
+	}
+}
+
+// JSON escaping: a line containing characters that need escaping (backslash, double quote, control
+// chars) must produce a valid JSON payload. The EscJson helper backing this is the same one the
+// snapshot payloads use; covering it here pins the contract for the log path specifically.
+TEST(EventDiff, LogAppendedEscapesJsonHazards)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	// A line with: a quote, a backslash, a control char.
+	state.AppendAmuleLog({ std::string("hi \"quoted\\path\" \x01 done\n") });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	const auto drained = DrainAll(bus);
+	std::string payload;
+	for (const auto &ev : drained) {
+		if (ev.name == "log_appended")
+			payload = ev.data;
+	}
+	// The raw characters must NOT appear unescaped in the payload: `\"` must become `\\\"`,
+	// `\\` must become `\\\\`, `\x01` must be `\\u0001`.
+	ASSERT_TRUE(payload.find("\\\"") != std::string::npos);
+	ASSERT_TRUE(payload.find("\\\\") != std::string::npos);
+	ASSERT_TRUE(payload.find("\\u0001") != std::string::npos);
+}
+
+// Truncation case (DELETE /logs/amule shrinks the vector): the diff
+// must silently resync the baseline counter without publishing.
+TEST(EventDiff, LogAppendedSilentOnTruncation)
+{
+	CState state;
+	state.AppendAmuleLog({ "a\n", "b\n", "c\n" });
+	CEventBus bus;
+	LastSeenState prev;
+
+	EmitDiffsAndUpdate(bus, prev, state);
+	ASSERT_EQUALS(static_cast<std::size_t>(3), prev.amule_log_count);
+
+	// Force a smaller log: rebuild State with a shorter vector.
+	CState state2;
+	state2.AppendAmuleLog({ "a\n" });
+	EmitDiffsAndUpdate(bus, prev, state2);
+
+	const auto drained = DrainAll(bus);
+	for (const auto &ev : drained) {
+		ASSERT_TRUE(ev.name != "log_appended");
+	}
+	ASSERT_EQUALS(static_cast<std::size_t>(1), prev.amule_log_count);
+}
+
+// PR #646 / issue #115: upload_file_name -- the partfile a peer is downloading FROM us -- is part
+// of the base client field set, so it must ride the client_added SSE payload. Otherwise the WebUI
+// clients table has no way to fill the File column for an upload-only peer and shows a blank "--".
+// Drives one status change through the real emit path and returns the status_changed payload, so
+// these assert what a subscriber actually sees rather than reaching into EventDiff's internals.
+namespace
+{
+std::string EmitStatusAndGetPayload(const StatusSnapshot &next)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state); // baseline tick
+	state.WriteStatus(next);
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &ev : DrainAll(bus)) {
+		if (ev.name == "status_changed")
+			payload = ev.data;
+	}
+	return payload;
+}
+} // namespace
+
+// The free-space sentinel must reach the SSE payload as JSON null, never as a number. amuled's
+// FREE_SPACE_UNKNOWN is -1 and its EC serializer casts it to uint64, so the wire carries
+// 0xFFFFFFFFFFFFFFFF; emitting that unsigned would tell a consumer 17 exabytes are free, and 0
+// would read as a full disk. The same rule as the REST body, asserted so the two cannot drift
+// apart.
+TEST(EventDiff, StatusEventSerialisesUnknownFreeSpaceAsNull)
+{
+	StatusSnapshot s;
+	s.temp_free_bytes = -1;
+	s.incoming_free_bytes = 48318382080LL;
+
+	const std::string payload = EmitStatusAndGetPayload(s);
+
+	ASSERT_TRUE(payload.find("\"temp_free_bytes\":null") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"incoming_free_bytes\":48318382080") != std::string::npos);
+	// The unsigned reading of the sentinel must appear nowhere.
+	ASSERT_TRUE(payload.find("18446744073709551615") == std::string::npos);
+}
+
+// high_id is positive-sense precisely so the disconnected case does not read
+// as a firewall verdict, and the id/public_ip pair rides the same payload.
+TEST(EventDiff, StatusEventCarriesIdentityFields)
+{
+	StatusSnapshot s;
+	s.ed2k_state = "connected";
+	s.ed2k_high_id = true;
+	s.ed2k_user_id = 1234567890u;
+	s.ed2k_public_ip = "210.2.150.73";
+	s.download_overhead_bytes_per_second = 8700;
+
+	const std::string payload = EmitStatusAndGetPayload(s);
+
+	ASSERT_TRUE(payload.find("\"high_id\":true") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"user_id\":1234567890") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"public_ip\":\"210.2.150.73\"") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"download_overhead_bytes_per_second\":8700") != std::string::npos);
+	// The retired spellings must not linger anywhere in the payload. A bare
+	// "id" would also match inside "user_id", so the quoted key is the test.
+	ASSERT_TRUE(payload.find("low_id") == std::string::npos);
+	ASSERT_TRUE(payload.find("\"id\":") == std::string::npos);
+}
+
+// The Kad firewall verdict is the field on this payload a subscriber is most likely watching for,
+// and Equal(StatusSnapshot) is what decides whether the event is published at all. Drop it from
+// that comparator and a firewall flip stops reaching subscribers entirely -- silently, since the
+// REST body keeps reporting the new value. Pinned so a future edit to the comparator cannot quietly
+// lose it.
+TEST(EventDiff, StatusEventFiresWhenOnlyKadFirewalledTcpMoved)
+{
+	StatusSnapshot s;
+	s.kad_firewalled_tcp = true;
+	// The verdict only means anything while Kad is connected, so the payload prints it as a
+	// bool only when it was actually measured. Without this the field is `null` and the
+	// assertion below is about the wrong thing.
+	s.has_kad_firewalled_tcp = true;
+
+	const std::string payload = EmitStatusAndGetPayload(s);
+
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"firewalled_tcp\":true") != std::string::npos);
+	// The unqualified `firewalled` spelling must not appear anywhere in the payload.
+	ASSERT_TRUE(payload.find("\"firewalled\":") == std::string::npos);
+}
+
+// The disconnect edge is the one this whole gate exists for, and the one a value-only comparator
+// misses: the bool underneath keeps its last reading, so only the has_ flag moves. If
+// Equal(StatusSnapshot) ignores that flag the event never fires and a subscriber keeps rendering a
+// firewall verdict for a network the daemon has left.
+TEST(EventDiff, StatusEventFiresWhenTheKadFirewallVerdictBecomesUnknown)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state); // baseline tick
+
+	StatusSnapshot measured;
+	measured.kad_firewalled_tcp = true;
+	measured.has_kad_firewalled_tcp = true;
+	state.WriteStatus(measured);
+	EmitDiffsAndUpdate(bus, prev, state);
+	DrainAll(bus);
+
+	// Kad drops. The bool is deliberately left true -- exactly the stale reading the gate has
+	// to suppress, and comparing values alone would see no change at all here.
+	StatusSnapshot dropped;
+	dropped.kad_firewalled_tcp = true;
+	dropped.has_kad_firewalled_tcp = false;
+	state.WriteStatus(dropped);
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &ev : DrainAll(bus)) {
+		if (ev.name == "status_changed")
+			payload = ev.data;
+	}
+
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"firewalled_tcp\":null") != std::string::npos);
+}
+
+// The same edge, the kad half. status_changed fires on !Equal(status) || !Equal(kad), and
+// kad.network.* is gated by the SECOND comparator -- a fix applied only to Equal(StatusSnapshot)
+// leaves this silent.
+TEST(EventDiff, StatusEventFiresWhenTheKadNetworkFiguresBecomeUnknown)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state); // baseline tick
+
+	KadSnapshot measured;
+	measured.users = 45793;
+	measured.files = 4945644;
+	measured.nodes = 499;
+	measured.has_network = true;
+	state.WriteKad(measured);
+	EmitDiffsAndUpdate(bus, prev, state);
+	DrainAll(bus);
+
+	// Kad drops; the counts underneath are untouched, as the daemon leaves
+	// them. Only has_network moves.
+	KadSnapshot dropped = measured;
+	dropped.has_network = false;
+	state.WriteKad(dropped);
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &ev : DrainAll(bus)) {
+		if (ev.name == "status_changed")
+			payload = ev.data;
+	}
+
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"node_count\":null") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"node_count\":499") == std::string::npos);
+}
+
+// A tick where only the overhead moved still has to fire: the field is in the REST body, so if the
+// SSE twin stays silent the two diverge until something else happens to move.
+TEST(EventDiff, StatusEventFiresWhenOnlyOverheadMoved)
+{
+	StatusSnapshot s;
+	s.download_overhead_bytes_per_second = 8700;
+
+	const std::string payload = EmitStatusAndGetPayload(s);
+
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"download_overhead_bytes_per_second\":8700") != std::string::npos);
+}
+
+// EVENTS.md promises this payload is "identical to the REST /status envelope", and both
+// connected_since timestamps are part of that envelope. They were missing from the event, so a
+// subscriber could never learn when the daemon connected without falling back to a poll.
+TEST(EventDiff, StatusEventCarriesBothConnectedSince)
+{
+	StatusSnapshot s;
+	s.ed2k_state = "connected";
+	s.kad_state = "connected";
+	s.ed2k_connected_since = 1751000000ull;
+	s.kad_connected_since = 1751000042ull;
+
+	const std::string payload = EmitStatusAndGetPayload(s);
+
+	ASSERT_TRUE(payload.find("\"connected_since_at\":1751000000") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"connected_since_at\":1751000042") != std::string::npos);
+}
+
+// A reconnect can leave every other field identical -- same server, same id, idle transfer rates --
+// and move only the timestamp. Without it in Equal() that tick emits nothing and subscribers keep
+// showing the old uptime.
+TEST(EventDiff, StatusEventFiresWhenOnlyConnectedSinceMoved)
+{
+	StatusSnapshot s;
+	s.ed2k_connected_since = 1751000000ull;
+
+	const std::string payload = EmitStatusAndGetPayload(s);
+
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"connected_since_at\":1751000000") != std::string::npos);
+}
+
+TEST(EventDiff, ClientAddedCarriesUploadFileName)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+
+	// Tick 1: baseline with no clients.
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	// Tick 2: a peer we are uploading to appears.
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &cache) {
+		ClientSnapshot c;
+		c.ecid = 10;
+		c.client_name = "peer-up";
+		c.upload_state = "uploading";
+		c.upload_file_name = "upload.iso";
+		cache.emplace(c.ecid, c);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	const auto drained = DrainAll(bus);
+	int added = 0;
+	std::string payload;
+	for (const auto &ev : drained) {
+		if (ev.name == "client_added") {
+			++added;
+			payload = ev.data;
+		}
+	}
+	ASSERT_EQUALS(1, added);
+	ASSERT_TRUE(payload.find("upload_file_name") != std::string::npos);
+	ASSERT_TRUE(payload.find("upload.iso") != std::string::npos);
+}
+
+// Regression guard for the EventDiff.cpp Equal() half of PR #646: Equal() must compare every field
+// ToJson emits (see the note above Equal()), so a change to upload_file_name alone still fires
+// client_updated. Before the fix the field was in neither, and an upload-file change would have
+// been dropped -- the SSE-backed table would keep showing the stale filename.
+TEST(EventDiff, ClientUpdatedFiresOnUploadFileNameChange)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+
+	// Baseline: no clients.
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	// A peer appears, uploading "a.iso" from us (client_added).
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &cache) {
+		ClientSnapshot c;
+		c.ecid = 10;
+		c.client_name = "peer-up";
+		c.upload_state = "uploading";
+		c.upload_file_name = "a.iso";
+		cache.emplace(c.ecid, c);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	// Only upload_file_name changes -> must fire client_updated.
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &cache) {
+		cache.at(10).upload_file_name = "b.iso";
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	const auto drained = DrainAll(bus);
+	int updated = 0;
+	std::string payload;
+	for (const auto &ev : drained) {
+		if (ev.name == "client_updated") {
+			++updated;
+			payload = ev.data;
+		}
+	}
+	ASSERT_EQUALS(1, updated);
+	ASSERT_TRUE(payload.find("b.iso") != std::string::npos);
+}
+
+// The same ToJson/Equal contract for the friends-list flag issue #1475 put on the list rows.
+// Adding a peer to the friends list changes nothing else about it, so an is_friend the
+// comparator ignored would leave every subscriber rendering the peer as a stranger until
+// some unrelated field moved.
+TEST(EventDiff, ClientUpdatedFiresOnFriendChange)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &cache) {
+		ClientSnapshot c;
+		c.ecid = 11;
+		c.client_name = "peer-stranger";
+		cache.emplace(c.ecid, c);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	// Only the friends-list membership changes -> must fire client_updated.
+	state.MutateClients(
+		(std::map<std::uint32_t, ClientSnapshot> &cache) { cache.at(11).is_friend = true; });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	const auto drained = DrainAll(bus);
+	int updated = 0;
+	std::string payload;
+	for (const auto &ev : drained) {
+		if (ev.name == "client_updated") {
+			++updated;
+			payload = ev.data;
+		}
+	}
+	ASSERT_EQUALS(1, updated);
+	// The key, not just the value: friend_slot is the other boolean in the payload and
+	// carries the opposite meaning.
+	ASSERT_TRUE(payload.find("\"friend\":true") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"friend_slot\":false") != std::string::npos);
+}
+
+// credit_ratio rides the same promotion as friend (issue #1474): the peer lists render it, so it
+// has to reach the diff payload, and a comparator that ignored it would leave a subscriber showing
+// the modifier a peer had when it connected. null and a number are different answers -- a daemon
+// that never sent the tag is not a peer whose history earns exactly 1.
+TEST(EventDiff, ClientUpdatedFiresOnCreditRatioChange)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &cache) {
+		ClientSnapshot c;
+		c.ecid = 12;
+		c.client_name = "peer-credits";
+		c.credit_ratio = 2.5;
+		c.has_credit_ratio = true;
+		cache.emplace(c.ecid, c);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	state.MutateClients(
+		(std::map<std::uint32_t, ClientSnapshot> &cache) { cache.at(12).credit_ratio = 3.25; });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	const auto drained = DrainAll(bus);
+	int updated = 0;
+	std::string payload;
+	for (const auto &ev : drained) {
+		if (ev.name == "client_updated") {
+			++updated;
+			payload = ev.data;
+		}
+	}
+	ASSERT_EQUALS(1, updated);
+	ASSERT_TRUE(payload.find("\"credit_ratio\":3.25") != std::string::npos);
+}
+
+// The tag going missing is a change in its own right: without has_credit_ratio in the comparator,
+// a peer whose ratio was 1.0 and then stopped being reported keeps rendering 1.0 forever.
+TEST(EventDiff, ClientCreditRatioNullsWhenTheDaemonStopsSendingIt)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &cache) {
+		ClientSnapshot c;
+		c.ecid = 13;
+		c.client_name = "peer-dropping-tag";
+		c.credit_ratio = 1.0;
+		c.has_credit_ratio = true;
+		cache.emplace(c.ecid, c);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &cache) {
+		cache.at(13).has_credit_ratio = false;
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	const auto drained = DrainAll(bus);
+	std::string payload;
+	for (const auto &ev : drained) {
+		if (ev.name == "client_updated") {
+			payload = ev.data;
+		}
+	}
+	ASSERT_TRUE(payload.find("\"credit_ratio\":null") != std::string::npos);
+}
+
+// The same contract as the client test above, for the capability bitmasks issue #974 added: a
+// server announcing its flags after the first UDP status reply has to fire exactly one
+// server_updated, and the payload has to carry the decoded object, not just the raw bitmask.
+TEST(EventDiff, ServerUpdatedFiresOnTcpFlagsChange)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	// A freshly added server, before any UDP status reply came back:
+	// nothing announced, so every bit is clear.
+	state.MutateServers((std::map<std::uint32_t, ServerSnapshot> &cache) {
+		ServerSnapshot s;
+		s.ecid = 5;
+		s.name = "srv";
+		cache.emplace(s.ecid, s);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	// The reply lands and the server announces what it supports.
+	state.MutateServers((std::map<std::uint32_t, ServerSnapshot> &cache) {
+		cache.at(5).tcp_flags = SRV_TCPFLG_COMPRESSION | SRV_TCPFLG_RELATEDSEARCH;
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	const auto drained = DrainAll(bus);
+	int updated = 0;
+	std::string payload;
+	for (const auto &ev : drained) {
+		if (ev.name == "server_updated") {
+			++updated;
+			payload = ev.data;
+		}
+	}
+	ASSERT_EQUALS(1, updated);
+	ASSERT_TRUE(payload.find("\"related_search\":true") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"compression\":true") != std::string::npos);
+	// A bit that was not announced is present and false, never absent:
+	// consumers are documented as never having to test for the key.
+	ASSERT_TRUE(payload.find("\"unicode\":false") != std::string::npos);
+}
+
+// The peer-version key must be spelled the same on the event bus as in the REST list item.
+// `WriteServerObject` spells it `software_version`, and the SSE twin must match: if it spelled the
+// same value differently, a client hydrating from GET /servers and then applying server_updated
+// diffs would get the version under two keys and could not merge them. Equal() compares
+// s.version either way, so nothing failed loudly -- which is why this is pinned by name rather than
+// left to the shape assertions above.
+TEST(EventDiff, ServerPayloadSpellsTheVersionKeyLikeRest)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+
+	EmitDiffsAndUpdate(bus, prev, state);
+	state.MutateServers((std::map<std::uint32_t, ServerSnapshot> &cache) {
+		ServerSnapshot s;
+		s.ecid = 7;
+		s.name = "srv";
+		s.version = "17.15";
+		cache.emplace(s.ecid, s);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &ev : DrainAll(bus)) {
+		if (ev.name == "server_added") {
+			payload = ev.data;
+		}
+	}
+
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"software_version\":\"17.15\"") != std::string::npos);
+	// And not under a bare `version` spelling. Quoted so it cannot match inside
+	// "software_version" itself.
+	ASSERT_TRUE(payload.find("\"version\":") == std::string::npos);
+}
+
+// The publishing limits move independently of the flags and are likewise
+// carried in the payload rather than requiring a re-GET.
+TEST(EventDiff, ServerUpdatedFiresOnFileLimitChange)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	state.MutateServers((std::map<std::uint32_t, ServerSnapshot> &cache) {
+		ServerSnapshot s;
+		s.ecid = 6;
+		s.name = "srv";
+		cache.emplace(s.ecid, s);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	state.MutateServers((std::map<std::uint32_t, ServerSnapshot> &cache) {
+		cache.at(6).soft_file_limit = 1000;
+		cache.at(6).hard_file_limit = 5000;
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	const auto drained = DrainAll(bus);
+	int updated = 0;
+	std::string payload;
+	for (const auto &ev : drained) {
+		if (ev.name == "server_updated") {
+			++updated;
+			payload = ev.data;
+		}
+	}
+	ASSERT_EQUALS(1, updated);
+	ASSERT_TRUE(payload.find("\"soft_file_limit\":1000") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"hard_file_limit\":5000") != std::string::npos);
+}
+
+// The flags object is built by one shared helper so the REST writer (Api.cpp, CJsonWriter) and this
+// SSE writer emit the same bytes. Pin the exact shape: key order follows the wire-bit order,
+// bitmask leads.
+TEST(EventDiff, ServerFlagsJsonShape)
+{
+	ASSERT_EQUALS(std::string("{\"bitmask\":0,\"compression\":false,\"new_tags\":false,"
+				  "\"unicode\":false,\"related_search\":false,"
+				  "\"type_tag_integer\":false,\"large_files\":false,"
+				  "\"tcp_obfuscation\":false}"),
+		webapi::ServerTcpFlagsJson(0));
+
+	// An unnamed bit survives in `bitmask` even though no boolean
+	// describes it -- that is what the field is there for.
+	ASSERT_TRUE(webapi::ServerUdpFlagsJson(0x8000u).find("\"bitmask\":32768") != std::string::npos);
+}
+
+// search_result_updated: the fields that change after the search ends. The window this closes: a
+// finished search stops emitting search_progress, so a hit downloaded from it, or a Kad notes
+// lookup landing afterwards, used to be invisible until someone re-read the endpoint.
+namespace
+{
+// Seed one result and baseline it, so each case below starts from "the
+// subscriber already holds this row".
+void SeedOneResult(CState &state, CEventBus &bus, LastSeenState &prev)
+{
+	state.MarkSearchStarted(42, "global", "ubuntu");
+	EmitDiffsAndUpdate(bus, prev, state); // cold-start baseline
+	state.MutateSearch(42, (std::map<std::uint32_t, SearchResult> &cache) {
+		SearchResult r;
+		r.ecid = 7;
+		r.hash = "8b54a3c28b54a3c28b54a3c28b54a3c2";
+		r.name = "ubuntu.iso";
+		r.size = 4096;
+		r.status = "new";
+		cache.emplace(r.ecid, r);
+	});
+	EmitDiffsAndUpdate(bus, prev, state); // the _added
+}
+
+std::size_t CountEvent(CEventBus &bus, const char *name)
+{
+	std::size_t n = 0;
+	for (const auto &e : DrainAll(bus))
+		if (e.name == name)
+			++n;
+	return n;
+}
+} // namespace
+
+// search_result_removed: the row the API stopped serving. Every other collection emits a _removed;
+// the search diff walked only the current results, so a row that left the result space stayed on
+// every subscriber's screen for the life of the search. On a finished search no further
+// search_progress fires either, so nothing prompted a re-read.
+TEST(EventDiff, SearchResultRemovedFiresWhenAResultLeavesTheSearch)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+	SeedOneResult(state, bus, prev);
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "search_result_added"));
+
+	// The daemon stops reporting it: the union merge erases the ECID, or the
+	// fold makes it a child of another row.
+	state.MutateSearch(42, (std::map<std::uint32_t, SearchResult> &cache) { cache.erase(7); });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "search_result_removed"));
+	// Counts are cumulative over the run: still the one _added from the seed,
+	// and the row was not announced as an update on its way out.
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "search_result_added"));
+	ASSERT_EQUALS(static_cast<size_t>(0), CountEvent(bus, "search_result_updated"));
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus))
+		if (e.name == "search_result_removed")
+			payload = e.data;
+	// Identity only, scoped by the search that owned the row.
+	ASSERT_EQUALS(
+		std::string("{\"search_id\":42,\"hash\":\"8b54a3c28b54a3c28b54a3c28b54a3c2\"}"), payload);
+
+	// Idempotent: with the baseline updated, a further tick adds no second
+	// removal (the count is cumulative, so it must still read exactly one).
+	EmitDiffsAndUpdate(bus, prev, state);
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "search_result_removed"));
+}
+
+// A row that stays put must not be announced as removed.
+TEST(EventDiff, SearchResultRemovedSilentWhileTheResultRemains)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+	SeedOneResult(state, bus, prev);
+
+	state.MutateSearch(
+		42, (std::map<std::uint32_t, SearchResult> &cache) { cache7.status = "downloaded"; });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	ASSERT_EQUALS(static_cast<size_t>(0), CountEvent(bus, "search_result_removed"));
+}
+
+// DELETE /logs/amule empties the buffer. The old signal was a shrunk size, which misses the case
+// that matters: cleared and refilled past the old count between two ticks, the size only grows, so
+// the append branch published a mid-buffer slice as though it were the tail and never published
+// what came before it. The clear-generation catches both shapes.
+TEST(EventDiff, LogClearPublishesResyncRatherThanAMidBufferSlice)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+
+	state.AppendAmuleLog({ "one\n", "two\n" });
+	EmitDiffsAndUpdate(bus, prev, state); // cold-start baseline, silent
+	ASSERT_EQUALS(static_cast<size_t>(0), CountEvent(bus, "log_appended"));
+
+	// Cleared, then refilled past the old length before the next tick: three
+	// lines where there were two, so the size alone reads as growth.
+	state.ClearAmuleLog();
+	state.AppendAmuleLog({ "A\n", "B\n", "C\n" });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "resync"));
+	// No log_appended: publishing "C" alone as the tail is exactly the bug.
+	ASSERT_EQUALS(static_cast<size_t>(0), CountEvent(bus, "log_appended"));
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus))
+		if (e.name == "resync")
+			payload = e.data;
+	ASSERT_EQUALS(std::string("{\"reason\":\"log_cleared\"}"), payload);
+
+	// The baseline moved to the refilled buffer, so the next append is a
+	// clean tail again and no second resync fires.
+	state.AppendAmuleLog({ "D\n" });
+	EmitDiffsAndUpdate(bus, prev, state);
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "resync"));
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "log_appended"));
+	for (const auto &e : DrainAll(bus))
+		if (e.name == "log_appended")
+			payload = e.data;
+	ASSERT_TRUE(payload.find("D") != std::string::npos);
+	ASSERT_TRUE(payload.find("C") == std::string::npos);
+}
+
+// A clear that leaves the buffer smaller is the same edge, and must not be
+// mistaken for the old silent-truncation path.
+TEST(EventDiff, LogClearToASmallerBufferAlsoPublishesResync)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+
+	state.AppendAmuleLog({ "one\n", "two\n", "three\n" });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	state.ClearAmuleLog();
+	state.AppendAmuleLog({ "X\n" });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "resync"));
+	ASSERT_EQUALS(static_cast<size_t>(0), CountEvent(bus, "log_appended"));
+}
+
+TEST(EventDiff, SearchResultUpdatedFiresWhenADownloadStateChanges)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+	SeedOneResult(state, bus, prev);
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "search_result_added"));
+	ASSERT_EQUALS(static_cast<size_t>(0), CountEvent(bus, "search_result_updated"));
+
+	// You start downloading the hit. On a finished search nothing else would
+	// ever tell a subscriber this.
+	state.MutateSearch(42, (std::map<std::uint32_t, SearchResult> &cache) {
+		cache7.status = "downloaded";
+		cache7.already_downloaded = true;
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "search_result_updated"));
+	// Still exactly one _added: the row was not re-announced as new.
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "search_result_added"));
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus))
+		if (e.name == "search_result_updated")
+			payload = e.data;
+	// Same shape as _added, search_id first, carrying the new values.
+	ASSERT_TRUE(payload.compare(0, 15, "{\"search_id\":42") == 0);
+	ASSERT_TRUE(payload.find("\"status\":\"downloaded\"") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"already_downloaded\":true") != std::string::npos);
+}
+
+TEST(EventDiff, SearchResultUpdatedFiresWhenKadNotesLand)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+	SeedOneResult(state, bus, prev);
+
+	// The lookup starts...
+	state.MutateSearch(42,
+		(std::map<std::uint32_t, SearchResult> &cache) { cache7.kad_comment_searching = true; });
+	EmitDiffsAndUpdate(bus, prev, state);
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "search_result_updated"));
+
+	// ...and lands, bringing a note and the rating it aggregates into.
+	state.MutateSearch(42, (std::map<std::uint32_t, SearchResult> &cache) {
+		cache7.kad_comment_searching = false;
+		cache7.rating = 4;
+		SearchResult::Comment c;
+		c.username = "alice";
+		c.filename = "ubuntu.iso";
+		c.rating = 4;
+		c.comment = "good";
+		cache7.comments.push_back(c);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+	ASSERT_EQUALS(static_cast<size_t>(2), CountEvent(bus, "search_result_updated"));
+}
+
+// The reason this is a restricted comparator rather than a full struct compare: source counts move
+// on essentially every tick of a running search, and search_progress is already the re-read cue for
+// them. Pushing them per result would make this the loudest channel on the bus.
+TEST(EventDiff, SearchResultUpdatedIgnoresSourceCountChurn)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+	SeedOneResult(state, bus, prev);
+
+	state.MutateSearch(42, (std::map<std::uint32_t, SearchResult> &cache) {
+		cache7.source_count = 99;
+		cache7.complete_source_count = 42;
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	ASSERT_EQUALS(static_cast<size_t>(0), CountEvent(bus, "search_result_updated"));
+}
+
+// A quiet tick must not emit: the comparator has to be a real comparison, not
+// "we saw this row again".
+TEST(EventDiff, SearchResultUpdatedStaysSilentOnAnUnchangedResult)
+{
+	CState state;
+	CEventBus bus;
+	LastSeenState prev;
+	SeedOneResult(state, bus, prev);
+
+	EmitDiffsAndUpdate(bus, prev, state);
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	ASSERT_EQUALS(static_cast<size_t>(0), CountEvent(bus, "search_result_updated"));
+	ASSERT_EQUALS(static_cast<size_t>(1), CountEvent(bus, "search_result_added"));
+}
+
+// search_result_added is the results-list entry, verbatim. EVENTS.md promises the payload is byte
+// for byte a GET /search/{id}/results entry with `search_id` prepended. That used to be two hand-
+// written serialisers kept in step by review, and they had already drifted apart. Both now go
+// through WriteSearchResultFields, so this pins the fields the event MUST carry -- including the
+// two the hand-rolled copy had been missing.
+TEST(EventDiff, SearchResultAddedCarriesTheFullResultsEntry)
+{
+	CState state;
+	state.MarkSearchStarted(42, "browse", "SomePeerNick");
+
+	CEventBus bus;
+	LastSeenState prev;
+	// First tick baselines the (empty) slot: cold start never replays
+	// history as events.
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	state.MutateSearch(42, (std::map<std::uint32_t, SearchResult> &cache) {
+		SearchResult r;
+		r.ecid = 7;
+		r.hash = "8b54a3c28b54a3c28b54a3c28b54a3c2";
+		r.name = "peer-shared.iso";
+		r.size = 4096;
+		r.source_count = 3;
+		r.complete_source_count = 1;
+		r.status = "new";
+		r.type = "iso";
+		r.directory = "Incoming/ISOs";
+		SearchResult::Child c;
+		c.ecid = 8;
+		c.name = "peer-shared-copy.iso";
+		c.hash = r.hash;
+		c.directory = "Backup/ISOs";
+		r.children.push_back(c);
+		cache.emplace(r.ecid, r);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "search_result_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	// search_id leads, so a consumer can demux before parsing the rest.
+	ASSERT_TRUE(payload.compare(0, 15, "{\"search_id\":42") == 0);
+	// The browse-only folder, on the result and on its child.
+	ASSERT_TRUE(payload.find("\"directory\":\"Incoming/ISOs\"") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"directory\":\"Backup/ISOs\"") != std::string::npos);
+	// The two fields the previously hand-rolled event payload omitted
+	// while the REST writer emitted them.
+	ASSERT_TRUE(payload.find("\"kad_comment_lookup_running\":false") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"comments\":") != std::string::npos);
+}
+
+// search_closed fires when a slot disappears. A subscriber holding one view per search otherwise
+// only learns the search is gone by 404ing on a later read -- and with SSE live it may never read
+// again.
+TEST(EventDiff, SearchClosedFiresOnceWhenTheSlotIsFreed)
+{
+	CState state;
+	state.MarkSearchStarted(42, "global", "ubuntu");
+	state.MarkSearchStarted(43, "kad", "debian");
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state); // baseline: both known
+
+	// The bus replays from the start on every drain, so count over the
+	// whole history rather than treating a drain as "what is new".
+	auto CountClosed = &bus() {
+		std::size_t n = 0;
+		std::string last;
+		for (const auto &e : DrainAll(bus)) {
+			if (e.name == "search_closed") {
+				++n;
+				last = e.data;
+			}
+		}
+		return std::make_pair(n, last);
+	};
+	ASSERT_EQUALS(static_cast<size_t>(0), CountClosed().first);
+
+	state.CloseSearch(42);
+	EmitDiffsAndUpdate(bus, prev, state);
+	const auto after_close = CountClosed();
+	ASSERT_EQUALS(static_cast<size_t>(1), after_close.first);
+	ASSERT_EQUALS(std::string("{\"search_id\":42}"), after_close.second);
+
+	// Further ticks stay silent: the baseline was pruned with the event, so a freed search is
+	// announced exactly once and its surviving sibling is never swept up with it.
+	EmitDiffsAndUpdate(bus, prev, state);
+	EmitDiffsAndUpdate(bus, prev, state);
+	ASSERT_EQUALS(static_cast<size_t>(1), CountClosed().first);
+	ASSERT_TRUE(state.HasSearch(43));
+}
+
+// The client payload carries part_progress_percent. EVENTS.md promises an `_updated` subscriber
+// gets the full new state and never has to re-GET. This field was the one exception on the client
+// resource: it is derived rather than refreshed -- it needs the part count of the linked download,
+// which lives in a different snapshot -- so the diff pass never computed it and the payload
+// silently lacked a key the REST row had.
+//
+// #1159 section 1. ClientSnapshot carries has_parts_offered_count precisely so a peer that never
+// reported its part map can be told apart from one reporting zero -- and zero is a real answer,
+// being what a fresh source looks like before its map arrives. The field was emitted
+// unconditionally, so nothing read the flag and both cases went out as 0.
+TEST(EventDiff, ClientEventEmitsNullAvailablePartsWhenTheMapIsUnreported)
+{
+	CState state;
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &clients) {
+		ClientSnapshot c;
+		c.ecid = 71;
+		c.client_name = "no-map";
+		// has_parts_offered_count stays false: the tag never arrived.
+		clients.emplace(c.ecid, c);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "client_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"parts_offered_count\":null") != std::string::npos);
+}
+
+// ...and a peer that did report zero still says zero.
+TEST(EventDiff, ClientEventEmitsZeroAvailablePartsWhenTheMapSaysZero)
+{
+	CState state;
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &clients) {
+		ClientSnapshot c;
+		c.ecid = 72;
+		c.client_name = "empty-map";
+		c.parts_offered_count = 0;
+		c.has_parts_offered_count = true;
+		clients.emplace(c.ecid, c);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "client_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"parts_offered_count\":0") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"parts_offered_count\":null") == std::string::npos);
+}
+
+// The comparator has to see the flag too. null -> 0 is a visible change; with
+// only the value compared it reads as equal and the row never updates.
+TEST(EventDiff, ClientUpdateFiresWhenThePartMapFinallyArrivesReportingZero)
+{
+	CState state;
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &clients) {
+		ClientSnapshot c;
+		c.ecid = 73;
+		c.client_name = "late-map";
+		clients.emplace(c.ecid, c);
+	});
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+	DrainAll(bus);
+
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &clients) {
+		auto it = clients.find(73);
+		it->second.parts_offered_count = 0;
+		it->second.has_parts_offered_count = true;
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	bool updated = false;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "client_updated")
+			updated = true;
+	}
+	ASSERT_TRUE(updated);
+}
+
+// #1159 section 9. amuled sends 0xffff for "that peer's queue is full" rather than a position, so
+// relaying it verbatim rendered "position 65535" and sorted full queues to the far end as if they
+// were merely very distant.
+TEST(EventDiff, ClientEventEmitsNullRemoteQueueRankWhenTheQueueIsFull)
+{
+	CState state;
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &clients) {
+		ClientSnapshot full;
+		full.ecid = 74;
+		full.client_name = "full-queue";
+		full.remote_queue_position = kRemoteQueueFullSentinel;
+		clients.emplace(full.ecid, full);
+
+		ClientSnapshot ranked;
+		ranked.ecid = 75;
+		ranked.client_name = "ranked";
+		ranked.remote_queue_position = 12;
+		clients.emplace(ranked.ecid, ranked);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string full_payload, ranked_payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name != "client_added")
+			continue;
+		if (e.data.find("full-queue") != std::string::npos)
+			full_payload = e.data;
+		if (e.data.find("ranked") != std::string::npos)
+			ranked_payload = e.data;
+	}
+	ASSERT_TRUE(!full_payload.empty());
+	ASSERT_TRUE(full_payload.find("\"remote_queue_position\":null") != std::string::npos);
+	// A real position is still a number.
+	ASSERT_TRUE(!ranked_payload.empty());
+	ASSERT_TRUE(ranked_payload.find("\"remote_queue_position\":12") != std::string::npos);
+}
+
+TEST(EventDiff, ClientEventCarriesPartProgressPercent)
+{
+	CState state;
+	// A 4-part file (3 * PARTSIZE + a byte) the peer is a source for, holding
+	// 3 of its 4 chunks.
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 1;
+		f.hash = "8b54a3c28b54a3c28b54a3c28b54a3c2";
+		f.name = "four-parts.iso";
+		f.size = kPartSizeBytes * 3 + 1;
+		f.is_downloading = true;
+		files.emplace(f.ecid, f);
+	});
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &clients) {
+		ClientSnapshot c;
+		c.ecid = 7;
+		c.client_name = "peer";
+		c.download_file_hash = "8b54a3c28b54a3c28b54a3c28b54a3c2";
+		c.parts_offered_count = 3;
+		c.has_parts_offered_count = true;
+		clients.emplace(c.ecid, c);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "client_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	// 3 of 4 parts. Asserting the prefix rather than the full double keeps
+	// this independent of ostream's default precision.
+	ASSERT_TRUE(payload.find("\"part_progress_percent\":75") != std::string::npos);
+}
+
+TEST(EventDiff, ClientEventNullsPartProgressPercentWithNoLinkedFile)
+{
+	// A peer that only downloads FROM us has no meaningful denominator, so the field is null --
+	// the same rule the REST row follows since #1160 section 1, where an unknown value is null
+	// rather than an absent key. The -1 sentinel is in-process only and must never reach the
+	// wire.
+	CState state;
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &clients) {
+		ClientSnapshot c;
+		c.ecid = 8;
+		c.client_name = "leech";
+		clients.emplace(c.ecid, c);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "client_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"part_progress_percent\":null") != std::string::npos);
+	ASSERT_TRUE(payload.find("-1") == std::string::npos);
+}
+
+// `media` is null, never absent, on a shared event whose file has no metadata. The event promises
+// key parity with the /shared row, and that row reports the key unconditionally -- a subscriber
+// diffing the two must not find `media` on one side only. This drifted once already: the REST
+// writer moved to null while this one kept skipping the key, and only a live parity check caught
+// it.
+TEST(EventDiff, SharedEventNullsMediaWithNoMetadata)
+{
+	CState state;
+	state.MutateShared((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 12;
+		f.hash = "1212121212121212121212121212bbbb";
+		f.name = "no-metadata.bin";
+		f.size = kPartSizeBytes;
+		f.is_shared = true;
+		f.has_media = false;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "shared_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"media\":null") != std::string::npos);
+}
+
+// ...and the object itself when there is one, so the null above is the
+// no-value answer rather than the writer having lost the field.
+TEST(EventDiff, SharedEventCarriesMediaWhenPresent)
+{
+	CState state;
+	state.MutateShared((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 13;
+		f.hash = "1313131313131313131313131313cccc";
+		f.name = "clip.mkv";
+		f.size = kPartSizeBytes;
+		f.is_shared = true;
+		f.has_media = true;
+		f.media.duration_seconds = 5400;
+		f.media.bitrate_kilobits_per_second = 1500;
+		f.media.codec = "h264";
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "shared_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"media\":{\"duration_seconds\":5400") != std::string::npos);
+	// The label, not the raw FOURCC: the desktop shows "H.264" for this file and the API agrees.
+	ASSERT_TRUE(payload.find("\"codec\":\"H.264\"") != std::string::npos);
+}
+
+// Hashing progress on the shared side (issue #1054). amuled emits one tag kind per ECID, so a file
+// that is both downloading and shared arrives only as EC_TAG_PARTFILE and its hashing progress
+// lands in the download sub-block. SharedHashingProgress() is the fallback every shared-side
+// consumer goes through; these pin that the SSE payload and the equality test use it too, since a
+// shared row that never updates is the failure this hides behind.
+TEST(EventDiff, SharedEventCarriesHashingProgressFromTheSharedSide)
+{
+	CState state;
+	state.MutateShared((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 11;
+		f.hash = "1111111111111111111111111111aaaa";
+		f.name = "complete.iso";
+		f.size = kPartSizeBytes * 4;
+		f.is_shared = true;
+		f.shared.hashing_progress = 2;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "shared_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"hashed_part_count\":2") != std::string::npos);
+}
+
+TEST(EventDiff, SharedEventFallsBackToTheDownloadSideHashingProgress)
+{
+	// The shared partfile case: shared.hashing_progress stays 0 because the tag never arrived
+	// on the KNOWNFILE variant, and the accessor reads across to the download sub-block.
+	CState state;
+	state.MutateShared((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 12;
+		f.hash = "2222222222222222222222222222bbbb";
+		f.name = "in-progress.iso";
+		f.size = kPartSizeBytes * 4;
+		f.is_shared = true;
+		f.is_downloading = true;
+		f.download.hashed_part_count = 3;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "shared_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"hashed_part_count\":3") != std::string::npos);
+}
+
+TEST(EventDiff, SharedUpdatedFiresWhenOnlyHashingProgressMoved)
+{
+	// EqualShared compares through the accessor, so a hash advancing on the download side of a
+	// shared partfile still pushes shared_updated. Comparing the raw shared field would hold
+	// every tick of it back.
+	CState state;
+	state.MutateShared((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 13;
+		f.hash = "3333333333333333333333333333cccc";
+		f.name = "verifying.iso";
+		f.size = kPartSizeBytes * 4;
+		f.is_shared = true;
+		f.is_downloading = true;
+		f.download.hashed_part_count = 1;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state); // cold start: shared_added
+	DrainAll(bus);
+
+	state.MutateShared((FileMap &files) { files.find(13)->second.download.hashed_part_count = 2; });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "shared_updated")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"hashed_part_count\":2") != std::string::npos);
+}
+
+TEST(EventDiff, DownloadUpdatedFiresWhenOnlyHashingProgressMoved)
+{
+	// The download side needs the same treatment: hashing_progress must be compared in
+	// EqualDownload, not treated as GET /downloads/{hash}-only, so a Verify Local Data pass
+	// produces a download_updated.
+	CState state;
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 14;
+		f.hash = "4444444444444444444444444444dddd";
+		f.name = "checking.iso";
+		f.size = kPartSizeBytes * 4;
+		f.is_downloading = true;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+	DrainAll(bus);
+
+	state.MutateDownloads((FileMap &files) { files.find(14)->second.download.hashed_part_count = 5; });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "download_updated")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"hashed_part_count\":5") != std::string::npos);
+}
+
+// The A4AF membership rides download_updated, and the predicate compares the list rather than the
+// count that summarises it. A swap moves one client out and another in, so `sources_a4af` never
+// moves -- comparing only the count left the panel showing the client that had already left.
+TEST(EventDiff, DownloadUpdatedFiresWhenTheA4afSourceSetSwapsAtAConstantCount)
+{
+	CState state;
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 15;
+		f.hash = "5555555555555555555555555555eeee";
+		f.name = "parked.iso";
+		f.size = kPartSizeBytes * 2;
+		f.is_downloading = true;
+		f.download.sources_a4af = 2;
+		f.download.a4af_sources = { 7, 9 };
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+	DrainAll(bus);
+
+	state.MutateDownloads(
+		(FileMap &files) { files.find(15)->second.download.a4af_sources = { 7, 11 }; });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "download_updated")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"source_ecids\":7,11") != std::string::npos);
+}
+
+// R10: the key is always there. A download with no A4AF sources reports an
+// empty array, so a client can index it without first testing for the key.
+TEST(EventDiff, DownloadEventCarriesAnEmptySourceEcidsArrayWithNoA4afSources)
+{
+	CState state;
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 16;
+		f.hash = "6666666666666666666666666666ffff";
+		f.name = "lonely.iso";
+		f.size = kPartSizeBytes;
+		f.is_downloading = true;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "download_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"source_ecids\":") != std::string::npos);
+}
+
+// A file leaving the map fires download_removed carrying its hash, and drops out of the baseline --
+// the `gone` erase. Without it the baseline would grow without bound across a session and keep re-
+// firing the removal every tick.
+TEST(EventDiff, DownloadRemovedFiresWhenTheFileLeavesTheMap)
+{
+	CState state;
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 21;
+		f.hash = "3333333333333333333333333333cccc";
+		f.name = "gone.iso";
+		f.size = kPartSizeBytes * 2;
+		f.is_downloading = true;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state); // baseline: download_added
+	DrainAll(bus);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), prev.files.size());
+
+	// FileMap::erase is iterator-only -- it keeps the hash index in step.
+	state.MutateDownloads((FileMap &files) { files.erase(files.find(21)); });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	int removed_events = 0;
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "download_removed") {
+			++removed_events;
+			payload = e.data;
+		}
+	}
+	ASSERT_EQUALS(1, removed_events);
+	ASSERT_TRUE(payload.find("3333333333333333333333333333cccc") != std::string::npos);
+	// Baseline entry erased, so a third tick stays silent.
+	ASSERT_TRUE(prev.files.empty());
+	const std::uint64_t cursor = bus.NewestId();
+	EmitDiffsAndUpdate(bus, prev, state);
+	ASSERT_TRUE(DrainSince(bus, cursor).empty());
+}
+
+// The share flag clearing on a file that stays in the map fires shared_removed without erasing the
+// baseline entry: the ECID is still live, only that role ended.
+TEST(EventDiff, SharedRemovedFiresWhenOnlyTheRoleFlagClears)
+{
+	CState state;
+	state.MutateShared((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 22;
+		f.hash = "4444444444444444444444444444dddd";
+		f.name = "unshared.iso";
+		f.size = kPartSizeBytes * 2;
+		f.is_shared = true;
+		f.is_downloading = true;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+	DrainAll(bus);
+
+	state.MutateShared((FileMap &files) { files.find(22)->second.is_shared = false; });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	int shared_removed = 0, download_removed = 0;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "shared_removed")
+			++shared_removed;
+		if (e.name == "download_removed")
+			++download_removed;
+	}
+	ASSERT_EQUALS(1, shared_removed);
+	// The download role is untouched, so nothing tears down that side.
+	ASSERT_EQUALS(0, download_removed);
+	// Entry stays in the baseline, with the cleared flag written back.
+	ASSERT_EQUALS(static_cast<std::size_t>(1), prev.files.size());
+	ASSERT_TRUE(!prev.files.find(22)->second.is_shared);
+}
+
+// One ECID swapping roles in a single tick emits both families, removed first: a client tearing
+// down its download slot must not see the shared_added for the same file arrive before the
+// download_removed.
+TEST(EventDiff, RoleFlipEmitsRemovedBeforeAdded)
+{
+	CState state;
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 23;
+		f.hash = "5555555555555555555555555555eeee";
+		f.name = "completed.iso";
+		f.size = kPartSizeBytes * 2;
+		f.is_downloading = true;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+	DrainAll(bus);
+
+	// The download finished: it stops being a download and starts being shared.
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot &f = files.find(23)->second;
+		f.is_downloading = false;
+		f.is_shared = true;
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	int removed_at = -1, added_at = -1, i = 0;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "download_removed")
+			removed_at = i;
+		if (e.name == "shared_added")
+			added_at = i;
+		++i;
+	}
+	ASSERT_TRUE(removed_at >= 0);
+	ASSERT_TRUE(added_at >= 0);
+	ASSERT_TRUE(removed_at < added_at);
+}
+
+// The write-back trap: a role flag flipping is itself enough to refresh the whole baseline entry,
+// so fields the *other* role's predicate never compared cannot reach the payload stale. Here the
+// download sub-block moves during the same tick that is_downloading goes false->true; the
+// download_added must carry the new value, not the one the entry was parked with while it was
+// shared-only.
+TEST(EventDiff, RoleFlipRefreshesFieldsTheOtherRoleNeverCompared)
+{
+	CState state;
+	state.MutateShared((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 24;
+		f.hash = "6666666666666666666666666666ffff";
+		f.name = "reshared.iso";
+		f.size = kPartSizeBytes * 4;
+		f.is_shared = true;
+		f.download.completed_bytes = 111;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state); // shared_added; download side never compared
+	DrainAll(bus);
+
+	state.MutateShared((FileMap &files) {
+		FileSnapshot &f = files.find(24)->second;
+		f.is_downloading = true;
+		f.download.completed_bytes = 999;
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "download_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("999") != std::string::npos);
+	ASSERT_TRUE(payload.find("111") == std::string::npos);
+	// And the baseline now carries it, so the next tick is silent.
+	ASSERT_EQUALS(static_cast<std::uint64_t>(999), prev.files.find(24)->second.download.completed_bytes);
+}
+
+// comments_updated payload. EVENTS.md promises the payload is the GET /downloads/{hash}/comments
+// body plus `hash`, and it must carry `kad_comment_lookup_running`: a client that follows the
+// document and feeds the event into the view it built from the endpoint would otherwise lose
+// the in-flight-lookup flag -- exactly the flag it needs while a POST /downloads/{hash}/comments
+// Kad lookup runs.
+TEST(EventDiff, CommentsUpdatedIsASupersetOfTheRestBody)
+{
+	CState state;
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 41;
+		f.hash = "5555555555555555555555555555eeee";
+		f.name = "commented.iso";
+		f.size = kPartSizeBytes * 2;
+		f.is_downloading = true;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state); // cold start: download_added
+	DrainAll(bus);
+
+	// A Kad lookup is in flight AND a note has landed, so the event fires with the flag still
+	// true -- the state a client is most likely to render, and the one the missing key made
+	// unrepresentable.
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot &f = files.find(41)->second;
+		f.download.kad_comment_searching = true;
+		FileSnapshot::DownloadSide::SourceComment c;
+		c.username = "alice";
+		c.filename = "commented.iso";
+		c.rating = 5;
+		c.comment = "great quality";
+		f.download.source_comments.push_back(c);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "comments_updated")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	// The endpoint's three keys...
+	ASSERT_TRUE(payload.find("\"total\":1") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"kad_comment_lookup_running\":true") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"comments\":") != std::string::npos);
+	// ...plus the one the event adds, because nothing else in the frame
+	// identifies the file.
+	ASSERT_TRUE(payload.find("\"hash\":\"5555555555555555555555555555eeee\"") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"username\":\"alice\"") != std::string::npos);
+}
+
+// And the flag tracks false, so a client can see the lookup finish.
+TEST(EventDiff, CommentsUpdatedReportsAnIdleKadLookup)
+{
+	CState state;
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 42;
+		f.hash = "6666666666666666666666666666ffff";
+		f.name = "quiet.iso";
+		f.size = kPartSizeBytes;
+		f.is_downloading = true;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+	DrainAll(bus);
+
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot &f = files.find(42)->second;
+		FileSnapshot::DownloadSide::SourceComment c;
+		c.username = "Kad user";
+		c.rating = 4;
+		f.download.source_comments.push_back(c);
+	});
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "comments_updated")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"kad_comment_lookup_running\":false") != std::string::npos);
+}
+
+// The Kad lookup finishing is a comments_updated in its own right. The flag rides in the payload,
+// so if EqualComments ignores it the true->false edge produces no event and a ?channels=comments
+// subscriber's in-flight indicator never clears.
+TEST(EventDiff, CommentsUpdatedFiresWhenOnlyTheKadFlagClears)
+{
+	CState state;
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 43;
+		f.hash = "7777777777777777777777777777aaaa";
+		f.name = "searching.iso";
+		f.size = kPartSizeBytes;
+		f.is_downloading = true;
+		f.download.kad_comment_searching = true;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state); // cold start
+	DrainAll(bus);
+
+	// The lookup ends. No comment arrived, so source_comments is untouched
+	// and ONLY the flag moves.
+	state.MutateDownloads(
+		(FileMap &files) { files.find(43)->second.download.kad_comment_searching = false; });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "comments_updated")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"kad_comment_lookup_running\":false") != std::string::npos);
+}
+
+// Cold start with a lookup already running. The mirror of
+// CommentsUpdatedFiresWhenOnlyTheKadFlagClears: there the finished edge never arrived, here the
+// starting state never arrives, and a ?channels=comments subscriber that joined after the download
+// appeared would never learn a lookup was in flight.
+TEST(EventDiff, CommentsUpdatedFiresWhenAFileArrivesMidKadLookup)
+{
+	CState state;
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 44;
+		f.hash = "8888888888888888888888888888bbbb";
+		f.name = "arrived-searching.iso";
+		f.size = kPartSizeBytes;
+		f.is_downloading = true;
+		// No comments yet -- only the in-flight flag.
+		f.download.kad_comment_searching = true;
+		files.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "comments_updated")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"kad_comment_lookup_running\":true") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"total\":0") != std::string::npos);
+}
+
+// #1290 item 5. The live client payload spelled "unknown" as a raw "" for its optional strings
+// while WriteKnownClientObject nulled the very same keys, so one peer described by both objects
+// disagreed with itself. R10 says an unknown value is null and never a sentinel; "" is a sentinel.
+TEST(EventDiff, ClientEventNullsOptionalStringsThatNeverArrived)
+{
+	CState state;
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &clients) {
+		ClientSnapshot c;
+		c.ecid = 73;
+		// Every optional string left at its default: a peer we have seen
+		// but that has told us nothing about itself yet.
+		clients.emplace(c.ecid, c);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "client_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	const char *const nulled = { "name",
+		"software",
+		"software_version",
+		"reported_os",
+		"download_file_name",
+		"upload_file_name",
+		"upload_file_hash",
+		"download_file_hash",
+		"obfuscation_state",
+		"source_origin",
+		"client_mod_name" };
+	for (const char *key : nulled) {
+		ASSERT_TRUE(payload.find(std::string("\"") + key + "\":null") != std::string::npos);
+		ASSERT_TRUE(payload.find(std::string("\"") + key + "\":\"\"") == std::string::npos);
+	}
+}
+
+// The states are enum labels, not free text: the daemon always answers, and an answer outside the
+// enum is the "unknown" member. Nulling them would have invented a third case the wire cannot
+// express.
+TEST(EventDiff, ClientEventKeepsTheStateEnumsAsStrings)
+{
+	CState state;
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &clients) {
+		ClientSnapshot c;
+		c.ecid = 74;
+		c.upload_state = "uploading";
+		c.download_state = "downloading";
+		c.ident_state = "identified";
+		clients.emplace(c.ecid, c);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "client_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"upload_state\":\"uploading\"") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"download_state\":\"downloading\"") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"ident_state\":\"identified\"") != std::string::npos);
+}
+
+// #1290 follow-up. The friend's reachability is not `client_ecid != 0`, which is true from the moment
+// the daemon starts TRYING to reach a peer -- that would read a friend it can never reach as
+// connected. The field carries EC_TAG_CLIENT_CONNECTED, and a daemon that never sends it leaves the answer
+// unknown rather than guessing "offline".
+TEST(EventDiff, FriendEventReportsReachabilityNotClientObjectExistence)
+{
+	CState state;
+	state.MutateFriends((std::map<std::uint32_t, FriendSnapshot> &friends) {
+		FriendSnapshot f;
+		f.ecid = 91;
+		f.name = "linked-but-unreachable";
+		// A live client object exists -- the daemon is trying -- but no
+		// socket is up, so this friend is not connected.
+		f.client_ecid = 4242;
+		f.connected = false;
+		f.has_connected = true;
+		friends.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "friend_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"connected\":false") != std::string::npos);
+	// The retired spelling must be gone, not shadowed (R6: one key for the
+	// quantity /clients, /known_clients and /chats also carry).
+	ASSERT_TRUE(payload.find("\"online\"") == std::string::npos);
+	// The live peer is still reported, so a consumer can still join on it.
+	ASSERT_TRUE(payload.find("\"client_ecid\":4242") != std::string::npos);
+}
+
+// A daemon that does not report connectivity leaves it unknown: null, not a
+// guessed false. R10 -- an unknown value is null and never a sentinel.
+TEST(EventDiff, FriendEventNullsConnectedWhenTheDaemonNeverReportedIt)
+{
+	CState state;
+	state.MutateFriends((std::map<std::uint32_t, FriendSnapshot> &friends) {
+		FriendSnapshot f;
+		f.ecid = 92;
+		f.name = "no-connectivity-tag";
+		f.client_ecid = 77;
+		// has_connected stays false: the tag never arrived.
+		friends.emplace(f.ecid, f);
+	});
+
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "friend_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"connected\":null") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"online\"") == std::string::npos);
+}
+
+// The connected flag has to be in Equal too, or a peer that finishes connecting never fires an
+// update: the ecid does not move on that edge, and the indicator would sit wrong until something
+// else about the peer changed.
+TEST(EventDiff, ClientConnectingFiresAnUpdateEvenThoughTheEcidIsUnchanged)
+{
+	CState state;
+	state.MutateClients((std::map<std::uint32_t, ClientSnapshot> &clients) {
+		ClientSnapshot c;
+		c.ecid = 93;
+		c.connected = false;
+		c.has_connected = true;
+		clients.emplace(c.ecid, c);
+	});
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+	DrainAll(bus);
+
+	state.MutateClients(
+		(std::map<std::uint32_t, ClientSnapshot> &clients) { clients93.connected = true; });
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "client_updated")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"connected\":true") != std::string::npos);
+}
+
+// `sent_at` on the chat_message payload has to spell an unstamped message the way the REST row does
+// -- null, not the 0 that renders as 1970 -- or a client that hydrates history from GET
+// /chats/{address}/messages and then live-updates from the stream sees the same absent timestamp
+// two ways.
+//
+// Unreachable through the daemon today: CChatSessionStore::Append stamps every message it stores
+// and the history reply carries the tag unconditionally, so no live core produces the 0. That is
+// exactly why it is pinned here rather than in the curl suite, which cannot manufacture one.
+TEST(EventDiff, ChatMessageSentAtIsNullWhenUnstamped)
+{
+	CEventBus bus;
+	ChatSessionSnapshot session;
+	session.gui_id = 7;
+	session.ip = "203.0.113.42";
+	session.port = 4662;
+	ChatMessageSnapshot unstamped;
+	unstamped.id = 91;
+	unstamped.text = "no timestamp";
+	unstamped.timestamp = 0;
+	session.messages.push_back(unstamped);
+
+	PublishChatEvents(bus, { session }, {});
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "chat_message")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"sent_at\":null") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"sent_at\":0") == std::string::npos);
+}
+
+// The stamped case still emits the number, so nulling the 0 did not turn every
+// timestamp into null.
+TEST(EventDiff, ChatMessageSentAtIsTheStampWhenPresent)
+{
+	CEventBus bus;
+	ChatSessionSnapshot session;
+	session.gui_id = 8;
+	session.ip = "203.0.113.43";
+	session.port = 4662;
+	ChatMessageSnapshot stamped;
+	stamped.id = 92;
+	stamped.text = "stamped";
+	stamped.timestamp = 1786652714;
+	session.messages.push_back(stamped);
+
+	PublishChatEvents(bus, { session }, {});
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "chat_message")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"sent_at\":1786652714") != std::string::npos);
+}
+
+// The server row's `software_version` is null when the server has reported none, matching
+// WriteServerObject on the REST side -- the two are promised to be byte-identical, and a raw ""
+// here would be the third spelling of "unknown" beside the nulls /clients and /known_clients
+// already emit.
+TEST(EventDiff, ServerSoftwareVersionIsNullWhenUnreported)
+{
+	CState state;
+	state.MutateServers((std::map<std::uint32_t, ServerSnapshot> &servers) {
+		ServerSnapshot s;
+		s.ecid = 5;
+		s.address = "203.0.113.5:4242";
+		s.port = 4242;
+		s.version.clear();
+		servers.emplace(s.ecid, s);
+	});
+	CEventBus bus;
+	LastSeenState prev;
+	EmitDiffsAndUpdate(bus, prev, state);
+
+	std::string payload;
+	for (const auto &e : DrainAll(bus)) {
+		if (e.name == "server_added")
+			payload = e.data;
+	}
+	ASSERT_TRUE(!payload.empty());
+	ASSERT_TRUE(payload.find("\"software_version\":null") != std::string::npos);
+	ASSERT_TRUE(payload.find("\"software_version\":\"\"") == std::string::npos);
+}

amule-3.1.0.tar.gz/unittests/tests/FastKadTest.cpp Added

@@ -0,0 +1,228 @@
+//								-*- C++ -*-
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+#include <kademlia/net/FastKad.h>
+
+using namespace muleunit;
+using Kademlia::CFastKad;
+
+DECLARE_SIMPLE(FastKad)
+
+// Wall-clock zero for these tests; every call passes "now" explicitly, so no
+// test here depends on a real clock.
+static const uint64_t T0 = 1000000;
+
+// Every expected ceiling below is a literal worked out by hand from the documented estimator --
+// mean + 2 * stddev + margin, with both moments divided by the full window and every unfilled slot
+// counted as the default response time -- and NOT by reading CFastKad's own constants back. Reading
+// them here would make the assertions restate the implementation instead of pinning its output, and
+// would stay green through an arithmetic change.
+//
+// The literals therefore assume the window and the two reference times below. If any of them
+// changes, ConstantsTheseTestsAssume fails first and says so, instead of the arithmetic tests
+// quietly re-deriving a new answer.
+static const unsigned WINDOW = 100;
+static const unsigned DEFAULT_MS = 1000;
+static const unsigned CAP_MS = 3000;
+
+TEST(FastKad, ConstantsTheseTestsAssume)
+{
+	ASSERT_EQUALS(WINDOW, (unsigned)CFastKad::MAX_SAMPLES);
+	ASSERT_EQUALS(DEFAULT_MS, (unsigned)CFastKad::DEFAULT_RESPONSE_TIME_MS);
+	ASSERT_EQUALS(CAP_MS, (unsigned)CFastKad::MAX_RESPONSE_TIME_MS);
+	ASSERT_EQUALS(100u, (unsigned)CFastKad::RESPONSE_TIME_MARGIN_MS);
+	ASSERT_EQUALS(300000u, (unsigned)CFastKad::MIN_EVICTION_AGE_MS);
+}
+
+TEST(FastKad, ColdStartIsTheDefaultResponseTime)
+{
+	CFastKad kad;
+	ASSERT_EQUALS(0u, (unsigned)kad.GetSampleCount());
+	// With no sample at all the estimate must be usable, not zero: a zero
+	// timeout would drop every contact the instant it was asked.
+	ASSERT_EQUALS(1000u, (unsigned)kad.GetEstMaxResponseTime());
+}
+
+TEST(FastKad, OneFastSampleMovesTheCeilingByTheDocumentedAmount)
+{
+	CFastKad kad;
+	kad.AddResponseTime(0x01020304, 500, T0);
+	ASSERT_EQUALS(1u, (unsigned)kad.GetSampleCount());
+
+	// One sample of 500 ms in a 100-slot window whose other 99 slots count
+	// as 1000 ms:
+	//   mean     = (500 + 99 * 1000) / 100                      = 995
+	//   variance = ((500-995)^2 + 99 * (1000-995)^2) / 99       = 2500
+	//   estimate = 995 + 2 * 50 + 100                           = 1195
+	// A single fast answer therefore cannot collapse the ceiling: it moves
+	// it by 5 ms shy of the margin, not by half the default.
+	ASSERT_EQUALS(1195u, (unsigned)kad.GetEstMaxResponseTime());
+}
+
+TEST(FastKad, AKnownSeriesProducesTheHandComputedCeiling)
+{
+	CFastKad kad;
+	// Four addresses, one answer each, at 200/400/600/800 ms.
+	//   mean     = (2000 + 96 * 1000) / 100                     = 980
+	//   variance = (780^2 + 580^2 + 380^2 + 180^2
+	//               + 96 * 20^2) / 99                           = 11717.171...
+	//   stddev   = 108.2458...
+	//   estimate = 980 + 216.4917... + 100                      = 1296.4917...
+	// truncated to 1296.
+	kad.AddResponseTime(0x0A000001, 200, T0);
+	kad.AddResponseTime(0x0A000002, 400, T0 + 1);
+	kad.AddResponseTime(0x0A000003, 600, T0 + 2);
+	kad.AddResponseTime(0x0A000004, 800, T0 + 3);
+
+	ASSERT_EQUALS(4u, (unsigned)kad.GetSampleCount());
+	ASSERT_EQUALS(1296u, (unsigned)kad.GetEstMaxResponseTime());
+}
+
+TEST(FastKad, AFullWindowOfEqualSamplesIsThatValuePlusTheMargin)
+{
+	CFastKad kad;
+	// A full window removes the unfilled-slot bias entirely, and equal samples have zero
+	// variance, so the estimate is exactly the sample value plus the margin. This is the
+	// tightest available check on the mean, on the margin, and on the window being genuinely
+	// full.
+	for (unsigned i = 0; i < WINDOW; ++i) {
+		kad.AddResponseTime(0x0B000000 + i, 200, T0);
+	}
+	ASSERT_EQUALS(WINDOW, (unsigned)kad.GetSampleCount());
+	ASSERT_EQUALS(300u, (unsigned)kad.GetEstMaxResponseTime());
+}
+
+TEST(FastKad, AWindowOfInstantAnswersLeavesOnlyTheMargin)
+{
+	CFastKad kad;
+	// The pathological floor: a whole window of instant answers. Mean and
+	// variance are both zero, so only the margin is left.
+	for (unsigned i = 0; i < WINDOW; ++i) {
+		kad.AddResponseTime(0x0C000000 + i, 0, T0);
+	}
+	ASSERT_EQUALS(100u, (unsigned)kad.GetEstMaxResponseTime());
+}
+
+TEST(FastKad, TheEstimateIsCappedAtTheDocumentedMaximum)
+{
+	CFastKad kad;
+	// Half the nodes answer instantly, half take ten minutes. The raw formula yields roughly
+	// 903122 ms, which would stall every search; the cap is what makes that survivable.
+	for (unsigned i = 0; i < WINDOW; ++i) {
+		kad.AddResponseTime(0x0D000000 + i, (i % 2) ? 1 : 600000, T0);
+	}
+	ASSERT_EQUALS(3000u, (unsigned)kad.GetEstMaxResponseTime());
+}
+
+TEST(FastKad, ARisingDistributionRaisesTheCeilingToTheHandComputedValue)
+{
+	CFastKad kad;
+	for (unsigned i = 0; i < WINDOW; ++i) {
+		kad.AddResponseTime(0x0E000000 + i, 200, T0);
+	}
+	ASSERT_EQUALS(300u, (unsigned)kad.GetEstMaxResponseTime());
+
+	// The same hundred addresses now answer in 2500 ms each. Still a full
+	// window, still zero variance: 2500 + 100.
+	for (unsigned i = 0; i < WINDOW; ++i) {
+		kad.AddResponseTime(0x0E000000 + i, 2500, T0 + 1);
+	}
+	ASSERT_EQUALS(WINDOW, (unsigned)kad.GetSampleCount());
+	ASSERT_EQUALS(2600u, (unsigned)kad.GetEstMaxResponseTime());
+
+	// And back down again, to prove the window replaces rather than
+	// accumulates.
+	for (unsigned i = 0; i < WINDOW; ++i) {
+		kad.AddResponseTime(0x0E000000 + i, 120, T0 + 2);
+	}
+	ASSERT_EQUALS(220u, (unsigned)kad.GetEstMaxResponseTime());
+}
+
+TEST(FastKad, TheWindowIsBoundedAndFreshSamplesAreNotEvicted)
+{
+	CFastKad kad;
+	for (unsigned i = 0; i < WINDOW; ++i) {
+		kad.AddResponseTime(0x0F000000 + i, 200, T0);
+	}
+	ASSERT_EQUALS(300u, (unsigned)kad.GetEstMaxResponseTime());
+
+	// Every existing sample is younger than the eviction age, so a flood of new addresses must
+	// be dropped rather than churn the window. Memory use stops growing AND the estimate is
+	// untouched -- the second half distinguishes "rejected" from "admitted and coincidentally
+	// equal".
+	for (unsigned i = 0; i < WINDOW * 2; ++i) {
+		kad.AddResponseTime(0xA0000000 + i, 2500, T0 + 1);
+	}
+	ASSERT_EQUALS(WINDOW, (unsigned)kad.GetSampleCount());
+	ASSERT_EQUALS(300u, (unsigned)kad.GetEstMaxResponseTime());
+}
+
+TEST(FastKad, AStaleSampleIsEvictedToMakeRoomForANewAddress)
+{
+	CFastKad kad;
+	for (unsigned i = 0; i < WINDOW; ++i) {
+		kad.AddResponseTime(0x10000000 + i, 200, T0);
+	}
+
+	// Past the eviction age the window is all stale, so one entry gives way.
+	// The window is then 99 samples of 200 ms plus one of 2500 ms:
+	//   mean     = (99 * 200 + 2500) / 100                      = 223
+	//   variance = (99 * 23^2 + 2277^2) / 99                    = 52900
+	//   estimate = 223 + 2 * 230 + 100                          = 783
+	// Nothing but a genuine eviction-and-insert produces 783.
+	kad.AddResponseTime(0xFFFFFFFF, 2500, T0 + 300001);
+	ASSERT_EQUALS(WINDOW, (unsigned)kad.GetSampleCount());
+	ASSERT_EQUALS(783u, (unsigned)kad.GetEstMaxResponseTime());
+}
+
+TEST(FastKad, RepeatedSamplesFromOneAddressReplaceRatherThanAccumulate)
+{
+	CFastKad kad;
+	for (unsigned i = 0; i < 10; ++i) {
+		kad.AddResponseTime(0x7F000001, 100 + i, T0 + i);
+	}
+	ASSERT_EQUALS(1u, (unsigned)kad.GetSampleCount());
+
+	// Only the last value, 109 ms, survives:
+	//   mean     = (109 + 99 * 1000) / 100                      = 991.09
+	//   variance = ((109-991.09)^2 + 99 * 8.91^2) / 99          = 7938.81
+	//   estimate = 991.09 + 2 * 89.1 + 100                      = 1269.29
+	// truncated to 1269. Accumulating the ten samples instead would leave a
+	// different mean and a different answer.
+	ASSERT_EQUALS(1269u, (unsigned)kad.GetEstMaxResponseTime());
+}
+
+TEST(FastKad, ClearReturnsToColdStart)
+{
+	CFastKad kad;
+	for (unsigned i = 0; i < WINDOW; ++i) {
+		kad.AddResponseTime(0x11000000 + i, 2500, T0);
+	}
+	ASSERT_EQUALS(2600u, (unsigned)kad.GetEstMaxResponseTime());
+
+	kad.Clear();
+	ASSERT_EQUALS(0u, (unsigned)kad.GetSampleCount());
+	ASSERT_EQUALS(1000u, (unsigned)kad.GetEstMaxResponseTime());
+}

amule-3.1.0.tar.gz/unittests/tests/FatalAbortBacktraceTest.cpp Added

@@ -0,0 +1,677 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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.
+//
+
+// The SIGABRT reporting path, exercised against a real glibc heap abort.
+//
+// amule-org/amule#1338 died on `double free or corruption (out)` and produced no backtrace at all,
+// because wx's fatal-exception support covers SIGSEGV/SIGBUS/SIGILL/SIGFPE and a heap abort is
+// SIGABRT. InstallFatalAbortHandler() closes that, and the interesting question is not whether it
+// prints -- it is whether it prints when the allocator is already broken.
+//
+// So the cases below fork, corrupt the heap in the child for real, and read what reaches the
+// child's stderr through a pipe. A handler that allocates would deadlock against the arena lock
+// malloc_printerr can hold, and that shows up here as the child never exiting, which the alarm
+// turns into a failure rather than a hung suite. That is the property worth the machinery: the
+// naive version of this handler passes every test that does not actually corrupt the heap.
+//
+// What these cases deliberately do NOT cover is the difference between this handler and an
+// allocating one, because that difference is not reachable from here. Measured directly on glibc
+// 2.43 with standalone probes: under corruption detected inside malloc() ("corrupted top size"),
+// an allocating handler re-enters malloc_printerr and dies having printed nothing, and a handler
+// that skips the install-time backtrace() warm-up fails the same way. Both are real, and both need
+// the fault to land on the top chunk, which needs a known heap layout. This binary links wx, so by
+// the time a child forks the layout is nothing like a minimal program's and the corruption simply
+// does not reproduce -- an attempt at it here aborted nothing and passed silently, for the safe and
+// unsafe builds alike. A test that always skips is worse than no test, so it is not kept.
+
+#include <muleunit/test.h>
+
+#include <common/MuleDebug.h>
+
+#include "config.h" // Needed for HAVE_EXECINFO
+
+// Without execinfo.h InstallFatalAbortHandler() is a no-op by design, so there is no backtrace to
+// assert on. Our own static musl build is exactly that case: Alpine has not packaged libexecinfo
+// since 3.17, so these cases would fail there for a reason that is not a regression.
+#if !defined(_WIN32) && defined(HAVE_EXECINFO)
+#define MULE_HAVE_ABORT_BACKTRACE 1
+#endif
+
+#ifdef MULE_HAVE_ABORT_BACKTRACE
+#include <cerrno>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <exception>
+#include <fcntl.h>
+#include <stdexcept>
+#include <thread>
+#include <string>
+#include <sys/wait.h>
+#include <unistd.h>
+#endif
+
+using namespace muleunit;
+
+#ifdef MULE_HAVE_ABORT_BACKTRACE
+
+namespace
+{
+
+//! What a forked child did: everything it wrote to stderr, and how it died.
+struct ChildResult
+{
+	std::string stderr_text;
+	bool exited_on_signal = false;
+	int signal_number = 0;
+	bool timed_out = false;
+};
+
+// Runs `body` in a forked child with its stderr on a pipe, and returns what it wrote plus how it
+// died. The alarm is the deadlock detector: a handler that allocates can block forever inside
+// malloc, and without a bound that would hang the whole suite instead of failing one case.
+ChildResult RunInChild(void (*body)(), unsigned timeout_seconds = 10)
+{
+	ChildResult result;
+
+	int fds2;
+	if (pipe(fds) != 0) {
+		return result;
+	}
+
+	// fork() duplicates whatever muleunit has buffered on stdout, and the child dies by signal
+	// without flushing -- except where it does, which replays the suite's own output once per
+	// case. Drain it here so the child inherits nothing to replay.
+	fflush(nullptr);
+
+	const pid_t pid = fork();
+	if (pid < 0) {
+		close(fds0);
+		close(fds1);
+		return result;
+	}
+
+	if (pid == 0) {
+		// Child. Redirect stderr to the pipe, then never return: body() is expected to abort.
+		close(fds0);
+		dup2(fds1, STDERR_FILENO);
+		close(fds1);
+		alarm(timeout_seconds); // SIGALRM kills us if the handler wedges
+		body();
+		_exit(0); // body() did not abort, which the assertions below will catch
+	}
+
+	close(fds1);
+	char buffer4096;
+	ssize_t got;
+	while ((got = read(fds0, buffer, sizeof(buffer))) != 0) {
+		if (got > 0) {
+			result.stderr_text.append(buffer, static_cast<size_t>(got));
+		} else if (errno != EINTR) {
+			break;
+		}
+	}
+	close(fds0);
+
+	int status = 0;
+	waitpid(pid, &status, 0);
+	if (WIFSIGNALED(status)) {
+		result.exited_on_signal = true;
+		result.signal_number = WTERMSIG(status);
+		result.timed_out = (result.signal_number == SIGALRM);
+	}
+	return result;
+}
+
+// Hands a pointer back through an empty asm barrier. Without it an optimising build deletes the
+// malloc/free pair outright -- a double free is undefined, so the compiler is entitled to assume it
+// never happens. The Release CI job caught exactly that: the child ran to _exit(0) and the test
+// asserted on a process that had never corrupted anything.
+void *Launder(void *p)
+{
+	__asm__ __volatile__("" : "+r"(p) : : "memory");
+	return p;
+}
+
+void ChildDoubleFree()
+{
+	InstallFatalAbortHandler();
+	// A real double free, so the allocator's own detection runs and calls abort() from its
+	// error path. Deliberately not raise(SIGABRT): that would test the handler with a healthy
+	// heap and prove nothing about the hard case.
+	//
+	// glibc's tcache absorbs frees up to 1032 bytes and catches a double free there before
+	// taking the arena lock; above that ceiling the check runs inside the locked region, which
+	// is the state the handler has to survive. macOS picks between abort() and a trap on its
+	// own, and not purely by size -- this case ran for weeks on 64 bytes and then trapped
+	// anyway. Both signals are handled, so it no longer matters which it chooses.
+#if defined(__GLIBC__)
+	void *p = Launder(malloc(2048));
+#else
+	void *p = Launder(malloc(64));
+#endif
+	free(p);
+	free(Launder(p));
+	_exit(0); // not reached while the allocator detects the double free
+}
+
+// The trap path on its own, without depending on what an allocator decides to do. __builtin_trap()
+// is what hardened libc++ and a violated std::unreachable() reach for, so this is not a synthetic
+// case. Which signal it raises is the target's business: brk on arm64 gives SIGTRAP, ud2 on x86_64
+// gives SIGILL.
+void ChildTrap()
+{
+	InstallFatalAbortHandler();
+	__builtin_trap();
+	_exit(42); // not reached: a trap instruction cannot be resumed
+}
+
+void ChildPlainAbort()
+{
+	InstallFatalAbortHandler();
+	abort();
+}
+
+void ChildRaiseAbrt()
+{
+	InstallFatalAbortHandler();
+	raise(SIGABRT);
+	// Reached only if the handler swallowed the signal, which is the regression this catches.
+	_exit(42);
+}
+
+// std::terminate() with no active exception: OnUnhandledException() prints nothing at all, so the
+// raw backtrace is the only report there is. Reachable in production by destroying a joinable
+// std::thread without join(), which webapi has several of.
+void ChildTerminateWithoutException()
+{
+	InstallFatalAbortHandler();
+	InstallMuleExceptionHandler();
+	std::terminate();
+	_exit(43); // not reached
+}
+
+// Relative to the test's working directory, the build tree, rather than a fixed name in /tmp: a
+// leftover there owned by another uid makes the child's open() fail, and the failure then reports
+// as a missing signal, which says nothing about what broke. LogTeeTest picks paths the same way.
+// The pid keeps two binaries in one build tree apart; it is resolved at static-init time, so the
+// forked child and its parent name the same file.
+std::string ReadWholeFile(const std::string &path)
+{
+	std::string out;
+	char buf4096;
+	const int fd = open(path.c_str(), O_RDONLY);
+	if (fd < 0) {
+		return out;
+	}
+	ssize_t n;
+	while ((n = read(fd, buf, sizeof(buf))) > 0) {
+		out.append(buf, static_cast<size_t>(n));
+	}
+	close(fd);
+	return out;
+}
+
+std::string TmpPath(const char *suffix)
+{
+	return std::string("amule_fatalabort_") + std::to_string(getpid()) + "_" + suffix;
+}
+
+const std::string kTeePath = TmpPath("tee");
+const std::string kDurablePath = TmpPath("durable");
+const std::string kConsolePath = TmpPath("console");
+const std::string kTeeWedgedPath = TmpPath("tee_wedged");
+
+// An unhandled exception with a crash descriptor armed. The report has to reach both sinks: the
+// descriptor, which is what survives a daemon, and stderr, which is the console an operator reads.
+void ChildTerminateTee()
+{
+	InstallFatalAbortHandler();
+	InstallMuleExceptionHandler();
+	const int fd = open(kTeePath.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0600);
+	if (fd < 0) {
+		_exit(44);
+	}
+	SetFatalAbortRedirectFd(fd);
+	throw std::runtime_error("tee probe");
+}
+
+// amuleapi's shape: fd 2 is the tee pipe, the durable sink is the log, and the console copy has to
+// go to the saved console descriptor instead of fd 2. Writing it to fd 2 would reach the console
+// only while the pump thread still runs, which is true at std::terminate and false in a signal
+// handler, and in amuleapi it would also land a second copy in the log the pump feeds.
+void ChildTerminateConsoleFd()
+{
+	InstallFatalAbortHandler();
+	InstallMuleExceptionHandler();
+	const int durable = open(kDurablePath.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0600);
+	const int console = open(kConsolePath.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0600);
+	if (durable < 0 || console < 0) {
+		_exit(44);
+	}
+	SetFatalAbortRedirectFd(durable);
+	SetFatalAbortConsoleFd(console);
+	throw std::runtime_error("console fd probe");
+}
+
+// A console that will never accept a write: a pipe filled to capacity with nobody draining it,
+// left blocking. Taking the console copy first would park in WriteAll() forever and the durable
+// copy would never happen, so the process would neither report nor exit.
+void ChildTerminateWedgedConsole()
+{
+	InstallFatalAbortHandler();
+	InstallMuleExceptionHandler();
+	const int fd = open(kTeeWedgedPath.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0600);
+	if (fd < 0) {
+		_exit(44);
+	}
+	SetFatalAbortRedirectFd(fd);
+
+	int pipefd2;
+	if (pipe(pipefd) != 0) {
+		_exit(45);
+	}
+	// Fill it without blocking, then hand back a blocking descriptor with no room left.
+	const int flags = fcntl(pipefd1, F_GETFL);
+	fcntl(pipefd1, F_SETFL, flags | O_NONBLOCK);
+	char filler4096;
+	memset(filler, 'x', sizeof(filler));
+	while (write(pipefd1, filler, sizeof(filler)) > 0) {
+		// keep going until the pipe refuses
+	}
+	fcntl(pipefd1, F_SETFL, flags);
+	dup2(pipefd1, STDERR_FILENO);
+
+	throw std::runtime_error("wedged console probe");
+}
+
+// A version line longer than the buffer. The character truncation drops is the trailing newline,
+// which would glue the first backtrace frame onto the end of the version line.
+void ChildLongVersionLine()
+{
+	InstallFatalAbortHandler();
+	const std::string huge(400, 'V');
+	SetFatalAbortVersionLine(huge.c_str());
+	abort();
+}
+
+void ChildSuppressed()
+{
+	InstallFatalAbortHandler();
+	SuppressNextAbortBacktrace();
+	abort();
+}
+
+void ChildNoHandler()
+{
+	abort();
+}
+
+// Stands in for wx's SIGILL handler. wx's ends in abort(), so this one does too: that is the path
+// that re-enters our handler through the still-armed SIGABRT disposition.
+extern "C" void PriorIllHandler(int)
+{
+	static const char marker = "PRIOR SIGILL HANDLER RAN\n";
+	const ssize_t ignored = write(STDERR_FILENO, marker, sizeof(marker) - 1);
+	(void)ignored;
+	abort();
+}
+
+void ChildIllWithPriorHandler()
+{
+	struct sigaction prior;
+	memset(&prior, 0, sizeof(prior));
+	prior.sa_handler = PriorIllHandler;
+	sigemptyset(&prior.sa_mask);
+	sigaction(SIGILL, &prior, nullptr);
+
+	InstallFatalAbortHandler();
+	raise(SIGILL);
+	_exit(42); // not reached: the chained handler aborts
+}
+
+void ChildTrapSuppressed()
+{
+	InstallFatalAbortHandler();
+	SuppressNextTrapBacktrace();
+	raise(SIGTRAP);
+	_exit(42); // not reached
+}
+
+// The suppression belongs to the thread about to trap at an assert site. A trap on any other
+// thread is a real one and must still be reported.
+void ChildTrapOnAnotherThread()
+{
+	InstallFatalAbortHandler();
+	SuppressNextTrapBacktrace();
+	std::thread( { raise(SIGTRAP); }).join();
+	_exit(42); // not reached
+}
+
+#if wxDEBUG_LEVEL
+// Choosing Stop is wx setting wxTrapInAssert inside its handler, and the trap follows once the
+// handler returns. So the suppression has to outlive the call, which a scoped guard would not.
+void ChildWxWillTrap()
+{
+	InstallFatalAbortHandler();
+	RunWxAssertHandler( { wxTrapInAssert = true; });
+	wxTrapInAssert = false; // the assert macro clears it before trapping
+	raise(SIGTRAP);
+	_exit(42); // not reached
+}
+
+// An assert the user let continue arms nothing, so a later trap still reports.
+void ChildWxWillNotTrap()
+{
+	InstallFatalAbortHandler();
+	RunWxAssertHandler( { wxTrapInAssert = false; });
+	raise(SIGTRAP);
+	_exit(42); // not reached
+}
+#endif
+
+// It mutes a trap, not the next death of any kind.
+void ChildTrapSuppressionThenAbort()
+{
+	InstallFatalAbortHandler();
+	SuppressNextTrapBacktrace();
+	abort();
+}
+
+int CountOccurrences(const std::string &haystack, const char *needle)
+{
+	int found = 0;
+	const std::string what(needle);
+	for (std::string::size_type at = haystack.find(what); at != std::string::npos;
+		at = haystack.find(what, at + what.size())) {
+		++found;
+	}
+	return found;
+}
+
+bool Contains(const std::string &haystack, const char *needle)
+{
+	return haystack.find(needle) != std::string::npos;
+}
+
+} // namespace
+
+DECLARE_SIMPLE(FatalAbortBacktrace)
+
+// The case the feature exists for. Everything else here is a control for this one.
+TEST(FatalAbortBacktrace, RealHeapCorruptionStillProducesABacktrace)
+{
+	const ChildResult r = RunInChild(ChildDoubleFree);
+
+	ASSERT_FALSE(r.timed_out); // a handler that allocates deadlocks here
+	ASSERT_TRUE(r.exited_on_signal);
+	// Which signal carries the corruption is the allocator's business: glibc abort()s, macOS
+	// libmalloc may trap for the very same double free. Asserting one of them is what made this
+	// case fail intermittently on macOS. The report is the behaviour under test.
+	ASSERT_TRUE(r.signal_number == SIGABRT || r.signal_number == SIGTRAP || r.signal_number == SIGILL);
+	ASSERT_TRUE(Contains(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+	// Frames, not just the banner. Deliberately matched on the module name rather than on the
+	// allocator's own wording: glibc says "free(): double free detected in tcache 2" and macOS
+	// reports through libmalloc, so any assertion on that text is a platform check. Matching a
+	// substring of our own banner would be worse still -- it says "double free or corruption"
+	// in its explanatory line, so asserting that passes whenever the banner prints at all.
+	ASSERT_TRUE(Contains(r.stderr_text, "FatalAbortBacktraceTest"));
+}
+
+// A terminate with nothing to describe must not end up silent. The suppression exists to stop a
+// second backtrace when a symbolicated one was already printed; when none was, it must not fire.
+TEST(FatalAbortBacktrace, TerminateWithoutExceptionStillReports)
+{
+	const ChildResult r = RunInChild(ChildTerminateWithoutException);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_EQUALS(SIGABRT, r.signal_number);
+	ASSERT_TRUE(Contains(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+}
+
+// The terminate report goes to the console and to the durable descriptor both. Redirecting instead
+// of tee-ing made it durable by taking it off the console, and the SIGABRT handler cannot make up
+// for that: this path suppresses it.
+TEST(FatalAbortBacktrace, TerminateReportReachesBothSinks)
+{
+	unlink(kTeePath.c_str());
+	const ChildResult r = RunInChild(ChildTerminateTee);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+
+	// The console copy.
+	ASSERT_TRUE(Contains(r.stderr_text, "Terminated after throwing an instance of"));
+	ASSERT_TRUE(Contains(r.stderr_text, "tee probe"));
+
+	// The durable copy.
+	std::string durable;
+	{
+		char buf4096;
+		const int fd = open(kTeePath.c_str(), O_RDONLY);
+		ASSERT_TRUE(fd >= 0);
+		ssize_t n;
+		while ((n = read(fd, buf, sizeof(buf))) > 0) {
+			durable.append(buf, static_cast<size_t>(n));
+		}
+		close(fd);
+	}
+	ASSERT_TRUE(Contains(durable, "Terminated after throwing an instance of"));
+	ASSERT_TRUE(Contains(durable, "tee probe"));
+	unlink(kTeePath.c_str());
+}
+
+// Both files get the report and the inherited fd 2 gets none: the console copy followed the
+// descriptor it was given rather than fd 2.
+TEST(FatalAbortBacktrace, TerminateReportUsesTheConsoleDescriptor)
+{
+	unlink(kDurablePath.c_str());
+	unlink(kConsolePath.c_str());
+	const ChildResult r = RunInChild(ChildTerminateConsoleFd);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_FALSE(Contains(r.stderr_text, "console fd probe")); // fd 2 stays out of it
+
+	ASSERT_TRUE(Contains(ReadWholeFile(kDurablePath), "console fd probe"));
+	ASSERT_TRUE(Contains(ReadWholeFile(kConsolePath), "console fd probe"));
+	unlink(kDurablePath.c_str());
+	unlink(kConsolePath.c_str());
+}
+
+// A console that cannot take the write must not cost the durable copy, nor hang the process.
+TEST(FatalAbortBacktrace, TerminateSurvivesAWedgedConsole)
+{
+	unlink(kTeeWedgedPath.c_str());
+	const ChildResult r = RunInChild(ChildTerminateWedgedConsole);
+
+	ASSERT_FALSE(r.timed_out); // parked in fputs() on the console copy
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_EQUALS(SIGABRT, r.signal_number);
+
+	std::string durable;
+	{
+		char buf4096;
+		const int fd = open(kTeeWedgedPath.c_str(), O_RDONLY);
+		ASSERT_TRUE(fd >= 0);
+		ssize_t n;
+		while ((n = read(fd, buf, sizeof(buf))) > 0) {
+			durable.append(buf, static_cast<size_t>(n));
+		}
+		close(fd);
+	}
+	ASSERT_TRUE(Contains(durable, "wedged console probe"));
+	unlink(kTeeWedgedPath.c_str());
+}
+
+// An over-long build string must still end the line it is on. Truncation that ate the newline would
+// run the version straight into the first frame.
+TEST(FatalAbortBacktrace, OverlongVersionLineStillEndsItsLine)
+{
+	const ChildResult r = RunInChild(ChildLongVersionLine);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+
+	const std::string::size_type at = r.stderr_text.find("VVVV");
+	ASSERT_TRUE(at != std::string::npos);
+
+	// The run of V's has to end at a newline, not at a backtrace frame.
+	const std::string::size_type endOfRun = r.stderr_text.find_first_not_of('V', at);
+	ASSERT_TRUE(endOfRun != std::string::npos);
+	ASSERT_EQUALS('\n', r.stderr_textendOfRun);
+}
+
+// Frames, not just the banner. backtrace_symbols_fd() writes one line per frame naming the module,
+// so the test binary's own name has to appear -- that is the difference between a working unwind
+// and an empty one.
+TEST(FatalAbortBacktrace, TheBacktraceCarriesFrames)
+{
+	const ChildResult r = RunInChild(ChildPlainAbort);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(Contains(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+	ASSERT_TRUE(Contains(r.stderr_text, "FatalAbortBacktraceTest"));
+}
+
+// A trap must report and then still kill the process. Returning from the handler would re-execute
+// the trap instruction and spin, so the timeout here is load-bearing rather than belt and braces.
+TEST(FatalAbortBacktrace, ATrapReportsAndStillDies)
+{
+	const ChildResult r = RunInChild(ChildTrap);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	const bool trapSignal = r.signal_number == SIGTRAP || r.signal_number == SIGILL;
+	ASSERT_TRUE(trapSignal);
+	ASSERT_TRUE(Contains(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+	// The report has to name the one that arrived, not a guess.
+	ASSERT_TRUE(Contains(r.stderr_text, r.signal_number == SIGILL ? "SIGILL" : "SIGTRAP"));
+}
+
+// The process must still die, and die of SIGABRT. A handler that reports and returns would swallow
+// the signal, and a supervisor watching for a non-zero exit would never restart. This raises the
+// signal in-process rather than from outside; delivery to a single-threaded child is the same path.
+TEST(FatalAbortBacktrace, TheProcessStillDiesOfSigabrt)
+{
+	const ChildResult r = RunInChild(ChildRaiseAbrt);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_EQUALS(SIGABRT, r.signal_number);
+}
+
+// ReportAssertFailure() prints a full symbolicated backtrace and then raises SIGABRT, so the raw
+// dump has to stay quiet or every assertion failure reports itself twice.
+TEST(FatalAbortBacktrace, SuppressedAbortPrintsNoBacktrace)
+{
+	const ChildResult r = RunInChild(ChildSuppressed);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_EQUALS(SIGABRT, r.signal_number);
+	ASSERT_FALSE(Contains(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+}
+
+// The control that stops the assertions above passing for the wrong reason: without the handler
+// the banner must be absent, so its presence elsewhere is attributable to InstallFatalAbortHandler
+// and not to something else on the process's stderr.
+TEST(FatalAbortBacktrace, WithoutTheHandlerThereIsNoBacktrace)
+{
+	const ChildResult r = RunInChild(ChildNoHandler);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_EQUALS(SIGABRT, r.signal_number);
+	ASSERT_FALSE(Contains(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+}
+
+// wx claims SIGILL too, so installing over it has to hand control back: whoever held the
+// disposition must still run, and the banner must appear once and not once per handler entry. The
+// chained handler aborts, exactly as wx's does, which re-enters through the SIGABRT disposition.
+TEST(FatalAbortBacktrace, ASigillChainsToThePreviousHandler)
+{
+	const ChildResult r = RunInChild(ChildIllWithPriorHandler);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_EQUALS(SIGABRT, r.signal_number);
+	ASSERT_TRUE(Contains(r.stderr_text, "PRIOR SIGILL HANDLER RAN"));
+	ASSERT_EQUALS(1, CountOccurrences(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+}
+
+// The assert path reaches wx's dialog through wxTrap(), and the symbolicated backtrace is already
+// printed by then, so a suppressed trap must stay quiet.
+TEST(FatalAbortBacktrace, SuppressedTrapPrintsNoBacktrace)
+{
+	const ChildResult r = RunInChild(ChildTrapSuppressed);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_EQUALS(SIGTRAP, r.signal_number);
+	ASSERT_FALSE(Contains(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+}
+
+TEST(FatalAbortBacktrace, ATrapOnAnotherThreadIsStillReported)
+{
+	const ChildResult r = RunInChild(ChildTrapOnAnotherThread);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_EQUALS(SIGTRAP, r.signal_number);
+	ASSERT_TRUE(Contains(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+}
+
+#if wxDEBUG_LEVEL
+TEST(FatalAbortBacktrace, AnAssertTheUserStoppedMutesItsTrap)
+{
+	const ChildResult r = RunInChild(ChildWxWillTrap);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_EQUALS(SIGTRAP, r.signal_number);
+	ASSERT_FALSE(Contains(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+}
+
+TEST(FatalAbortBacktrace, AnAssertTheUserContinuedArmsNothing)
+{
+	const ChildResult r = RunInChild(ChildWxWillNotTrap);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_EQUALS(SIGTRAP, r.signal_number);
+	ASSERT_TRUE(Contains(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+}
+#endif
+
+TEST(FatalAbortBacktrace, TheTrapSuppressionDoesNotMuteAnAbort)
+{
+	const ChildResult r = RunInChild(ChildTrapSuppressionThenAbort);
+
+	ASSERT_FALSE(r.timed_out);
+	ASSERT_TRUE(r.exited_on_signal);
+	ASSERT_EQUALS(SIGABRT, r.signal_number);
+	ASSERT_TRUE(Contains(r.stderr_text, "FATAL BACKTRACE FOLLOWS"));
+}
+
+#else /* !MULE_HAVE_ABORT_BACKTRACE */
+
+// fork() has no Windows equivalent, and the handler is POSIX-only anyway.
+DECLARE_SIMPLE(FatalAbortBacktrace)
+
+TEST(FatalAbortBacktrace, NotApplicableOnWindows)
+{
+	ASSERT_TRUE(true);
+}
+
+#endif /* MULE_HAVE_ABORT_BACKTRACE */

amule-3.0.1.tar.gz/unittests/tests/FileDataIOTest.cpp -> amule-3.1.0.tar.gz/unittests/tests/FileDataIOTest.cpp Changed

@@ -10,33 +10,31 @@
 
 namespace muleunit
 {
-	template <>
-	wxString StringFrom<CPath>(const CPath& path)
-	{
-		return path.GetPrintable();
-	}
+template <> wxString StringFrom<CPath>(const CPath &path)
+{
+	return path.GetPrintable();
 }
-
+} // namespace muleunit
 
 //! The max file-size of auto-generated files to test.
 const size_t TEST_LENGTH = 512;
 
-namespace muleunit {
-	//! Needed for ASSERT_EQUALS with CMD4Hash values
-	template <>
-	wxString StringFrom<CMD4Hash>(const CMD4Hash& hash) {
-		return hash.Encode();
-	}
-
-	//! Needed for ASSERT_EQUALS with CUInt128 values
-	template <>
-	wxString StringFrom<CUInt128>(const CUInt128& value) {
-		return value.ToHexString();
-	}
+namespace muleunit
+{
+//! Needed for ASSERT_EQUALS with CMD4Hash values
+template <> wxString StringFrom<CMD4Hash>(const CMD4Hash &hash)
+{
+	return hash.Encode();
 }
 
+//! Needed for ASSERT_EQUALS with CUInt128 values
+template <> wxString StringFrom<CUInt128>(const CUInt128 &value)
+{
+	return value.ToHexString();
+}
+} // namespace muleunit
 
-void writePredefData(CFileDataIO* file)
+void writePredefData(CFileDataIO *file)
 {
 	char dataTEST_LENGTH;
 
@@ -48,43 +46,33 @@
 	file->Seek(0, wxFromStart);
 }
 
-
-
-/////////////////////////////////////////////////////////////////////
-// Specialize this template for each implementation
-// of the CFileDataIO interface you wish to test.
-//
-// This struct must be a subclass of Test.
+// Specialize this template for each implementation of the CFileDataIO interface you wish to test.
+// It must be a subclass of Test.
 //
 // Two pointers are to be defined:
 //  m_emptyFile, which must be an empty, zero-length file
-//  m_predefFile, which must be TEST_LENGTH in size and
-//                and contain the sequence 0..255 repeated
-//                as needed.
-//
-// The following functions should be overridden:
-//  - setUp()
-//  - tearDown()
+//  m_predefFile, which must be TEST_LENGTH in size and contain the sequence 0..255 repeated as
+//                needed.
 //
-template <typename TYPE>
-struct FileDataIOFixture;
+// setUp() and tearDown() should be overridden.
+template <typename TYPE> struct FileDataIOFixture;
 
-
-template <>
-class FileDataIOFixture<CFile> : public Test
+template <> class FileDataIOFixture<CFile> : public Test
 {
 public:
-	FileDataIOFixture(const wxString& testName)
-		: Test("FileDataIO", "CFile - " + testName) {}
-
+	FileDataIOFixture(const wxString &testName)
+	: Test("FileDataIO", "CFile - " + testName)
+	{
+	}
 
-	CFile* m_emptyFile;
-	CFile* m_predefFile;
+	CFile *m_emptyFile;
+	CFile *m_predefFile;
 
-	void setUp() {
+	void setUp()
+	{
 		m_emptyFile = m_predefFile = NULL;
 		const CPath emptyPath = CPath("FileDataIOTest.empty");
-		const CPath datPath   = CPath("FileDataIOTest.dat");
+		const CPath datPath = CPath("FileDataIOTest.dat");
 
 		m_emptyFile = new CFile();
 		m_emptyFile->Create(emptyPath, true);
@@ -105,7 +93,8 @@
 		ASSERT_EQUALS(TEST_LENGTH, m_predefFile->GetLength());
 	}
 
-	void tearDown() {
+	void tearDown()
+	{
 		delete m_emptyFile;
 		delete m_predefFile;
 
@@ -114,19 +103,19 @@
 	}
 };
 
-
-template <>
-class FileDataIOFixture<CMemFile> : public Test
+template <> class FileDataIOFixture<CMemFile> : public Test
 {
 public:
-	FileDataIOFixture(const wxString& testName)
-		: Test("FileDataIO", "CMemFile - " + testName) {}
-
+	FileDataIOFixture(const wxString &testName)
+	: Test("FileDataIO", "CMemFile - " + testName)
+	{
+	}
 
-	CMemFile* m_emptyFile;
-	CMemFile* m_predefFile;
+	CMemFile *m_emptyFile;
+	CMemFile *m_predefFile;
 
-	void setUp() {
+	void setUp()
+	{
 		m_emptyFile = m_predefFile = NULL;
 
 		m_emptyFile = new CMemFile();
@@ -137,91 +126,64 @@
 		ASSERT_EQUALS(TEST_LENGTH, m_predefFile->GetLength());
 	}
 
-	void tearDown() {
+	void tearDown()
+	{
 		delete m_emptyFile;
 		delete m_predefFile;
 	}
 };
 
-
-/////////////////////////////////////////////////////////////////////
-// A writeWrite interface should be implemented for each set of
-// read/write functions that is to be tested. The following 3
-// static functions must be implemented in each specialization of the
-// template:
-//
-//  - TYPE genValue(size_t j), which returns the expected value at
-//    position j in the files with predefined data.
-//  - TYPE readValue(CFileDataIO*), which returns and returns the
-//    value at the current position in the file.
-//  - void writeValue(CFileDataIO*, TYPE), which writes the given
-//    value at the current position in the file.
-//  - wxString name(), which returns the human-readble name of the type
+// A writeWrite interface should be implemented for each set of read/write functions to be tested.
+// Each specialization of the template must implement:
 //
-template <typename TYPE>
-struct RWInterface;
-
-template <>
-struct RWInterface<uint8>
+//  - TYPE genValue(size_t j), returning the expected value at position j in the files with
+//    predefined data.
+//  - TYPE readValue(CFileDataIO*), returning the value at the current position in the file.
+//  - void writeValue(CFileDataIO*, TYPE), writing the given value at the current position.
+//  - wxString name(), returning the human-readable name of the type.
+template <typename TYPE> struct RWInterface;
+
+template <> struct RWInterface<uint8>
 {
-	static uint8 genValue(size_t j) {
-		return j & 0xff;
-	}
+	static uint8 genValue(size_t j) { return j & 0xff; }
 
-	static uint8 readValue(CFileDataIO* file) {
-		return file->ReadUInt8();
-	}
+	static uint8 readValue(CFileDataIO *file) { return file->ReadUInt8(); }
 
-	static void writeValue(CFileDataIO* file, uint8 value) {
-		file->WriteUInt8(value);
-	}
+	static void writeValue(CFileDataIO *file, uint8 value) { file->WriteUInt8(value); }
 
 	static wxString name() { return "UInt8"; }
 };
 
-
-template <>
-struct RWInterface<uint16>
+template <> struct RWInterface<uint16>
 {
-	static uint16 genValue(size_t j) {
-		return (((j + 1) & 0xff) << 8) | (j & 0xff);
-	}
+	static uint16 genValue(size_t j) { return (((j + 1) & 0xff) << 8) | (j & 0xff); }
 
-	static uint16 readValue(CFileDataIO* file) {
-		return file->ReadUInt16();
-	}
+	static uint16 readValue(CFileDataIO *file) { return file->ReadUInt16(); }
 
-	static void writeValue(CFileDataIO* file, uint16 value) {
-		file->WriteUInt16(value);
-	}
+	static void writeValue(CFileDataIO *file, uint16 value) { file->WriteUInt16(value); }
 
 	static wxString name() { return "UInt16"; }
 };
 
-
-template <>
-struct RWInterface<uint32>
+template <> struct RWInterface<uint32>
 {
-	static uint32 genValue(size_t j) {
-		return (((j + 3) & 0xff) << 24) | (((j + 2) & 0xff) << 16) | (((j + 1) & 0xff) << 8) | (j & 0xff);
+	static uint32 genValue(size_t j)
+	{
+		return (((j + 3) & 0xff) << 24) | (((j + 2) & 0xff) << 16) | (((j + 1) & 0xff) << 8) |
+		       (j & 0xff);
 	}
 
-	static uint32 readValue(CFileDataIO* file) {
-		return file->ReadUInt32();
-	}
+	static uint32 readValue(CFileDataIO *file) { return file->ReadUInt32(); }
 
-	static void writeValue(CFileDataIO* file, uint32 value) {
-		file->WriteUInt32(value);
-	}
+	static void writeValue(CFileDataIO *file, uint32 value) { file->WriteUInt32(value); }
 
 	static wxString name() { return "UInt32"; }
 };
 
-
-template <>
-struct RWInterface<CMD4Hash>
+template <> struct RWInterface<CMD4Hash>
 {
-	static CMD4Hash genValue(size_t j) {
+	static CMD4Hash genValue(size_t j)
+	{
 		CMD4Hash value;
 		for (size_t y = j; y < j + 16; y++) {
 			valuey - j = y & 0xff;
@@ -230,61 +192,49 @@
 		return value;
 	}
 
-	static CMD4Hash readValue(CFileDataIO* file) {
-		return file->ReadHash();
-	}
+	static CMD4Hash readValue(CFileDataIO *file) { return file->ReadHash(); }
 
-	static void writeValue(CFileDataIO* file, CMD4Hash value) {
-		file->WriteHash(value);
-	}
+	static void writeValue(CFileDataIO *file, CMD4Hash value) { file->WriteHash(value); }
 
 	static wxString name() { return "CMD4Hash"; }
 };
 
-
-template <>
-struct RWInterface<CUInt128>
+template <> struct RWInterface<CUInt128>
 {
-	static CUInt128 genValue(size_t j) {
+	static CUInt128 genValue(size_t j)
+	{
 		CUInt128 value;
 		for (size_t y = 0; y < 16; y += 4) {
 			value.Set32BitChunk(y >> 2,
-					    ((j + y    ) & 0xff)       |
-					    ((j + y + 1) & 0xff) << 8  |
-					    ((j + y + 2) & 0xff) << 16 |
-					    ((j + y + 3) & 0xff) << 24);
+				((j + y) & 0xff) | ((j + y + 1) & 0xff) << 8 | ((j + y + 2) & 0xff) << 16 |
+					((j + y + 3) & 0xff) << 24);
 		}
 
 		return value;
 	}
 
-	static CUInt128 readValue(CFileDataIO* file) {
-		return file->ReadUInt128();
-	}
+	static CUInt128 readValue(CFileDataIO *file) { return file->ReadUInt128(); }
 
-	static void writeValue(CFileDataIO* file, CUInt128 value) {
-		file->WriteUInt128(value);
-	}
+	static void writeValue(CFileDataIO *file, CUInt128 value) { file->WriteUInt128(value); }
 
 	static wxString name() { return "CUInt128"; }
 };
 
+// The following tests ensure the given implementations of CFileDataIO properly do so.
 
-/////////////////////////////////////////////////////////////////////
-// The following tests ensure that the given implementations
-// of the CFileDataIO interface properly does so.
-
-template <typename IMPL, typename TYPE, size_t SIZE>
-class ReadTest : public FileDataIOFixture<IMPL>
+template <typename IMPL, typename TYPE, size_t SIZE> class ReadTest : public FileDataIOFixture<IMPL>
 {
 	typedef RWInterface<TYPE> RW;
 
 public:
 	ReadTest()
-		: FileDataIOFixture<IMPL>("Read " + RW::name()) {}
+	: FileDataIOFixture<IMPL>("Read " + RW::name())
+	{
+	}
 
-	void run() {
-		CFileDataIO* file = this->m_predefFile;
+	void run()
+	{
+		CFileDataIO *file = this->m_predefFile;
 
 		for (size_t j = 0; j < TEST_LENGTH + 1 - SIZE; ++j) {
 			ASSERT_EQUALS(j, file->Seek(j, wxFromStart));
@@ -304,7 +254,7 @@
 		// Check that only the given length is written to the target buffer
 		char testBuffer32;
 		memset(testBuffer, 127, 32);
-		char* buf = testBuffer + 8;
+		char *buf = testBuffer + 8;
 
 		for (int i = 0; i < 16; ++i) {
 			ASSERT_EQUALS(0u, file->Seek(0, wxFromStart));
@@ -323,25 +273,26 @@
 	}
 };
 
-
-template <typename IMPL, typename TYPE, size_t SIZE>
-class WriteTest : public FileDataIOFixture<IMPL>
+template <typename IMPL, typename TYPE, size_t SIZE> class WriteTest : public FileDataIOFixture<IMPL>
 {
 	typedef RWInterface<TYPE> RW;
 
 public:
 	WriteTest()
-		: FileDataIOFixture<IMPL>("Write " + RW::name()) {}
+	: FileDataIOFixture<IMPL>("Write " + RW::name())
+	{
+	}
 
-	void run() {
+	void run()
+	{
 		const unsigned char CanaryData = 170;
 		const unsigned char canaryBlock = { CanaryData };
 
-		CFileDataIO* file = this->m_predefFile;
+		CFileDataIO *file = this->m_predefFile;
 
 		for (size_t j = 0; j < TEST_LENGTH + 1 - SIZE; ++j) {
 			// Clear before, after and at the target byte(s)
-			for (int t = -static_cast<int>(SIZE); t < (int)(2*SIZE); ++t) {
+			for (int t = -static_cast<int>(SIZE); t < (int)(2 * SIZE); ++t) {
 				if ((j + t) < TEST_LENGTH && ((int)j + t) >= 0) {
 					file->Seek(j + t, wxFromStart);
 					ASSERT_EQUALS(j + t, file->GetPosition());
@@ -362,7 +313,7 @@
 			ASSERT_EQUALS(j + SIZE, file->GetPosition());
 
 			// Check before, after and at the target byte
-			for (int t = -static_cast<int>(SIZE); t < (int)(2*SIZE); ++t) {
+			for (int t = -static_cast<int>(SIZE); t < (int)(2 * SIZE); ++t) {
 				if ((j + t) < TEST_LENGTH && ((int)j + t) >= 0) {
 					if (t) {
 						if (t < 0 || t >= (int)SIZE) {
@@ -383,16 +334,17 @@
 	}
 };
 
-
-template <typename IMPL>
-class SeekTest : public FileDataIOFixture<IMPL>
+template <typename IMPL> class SeekTest : public FileDataIOFixture<IMPL>
 {
 public:
 	SeekTest()
-		: FileDataIOFixture<IMPL>("Seek") {}
+	: FileDataIOFixture<IMPL>("Seek")
+	{
+	}
 
-	void run() {
-		CFileDataIO* file = this->m_predefFile;
+	void run()
+	{
+		CFileDataIO *file = this->m_predefFile;
 
 		ASSERT_EQUALS(0u, file->GetPosition());
 		for (size_t pos = 0; pos < TEST_LENGTH * 2; pos += pos + 1) {
@@ -431,16 +383,17 @@
 	}
 };
 
-
-template <typename IMPL>
-class WritePastEndTest : public FileDataIOFixture<IMPL>
+template <typename IMPL> class WritePastEndTest : public FileDataIOFixture<IMPL>
 {
 public:
 	WritePastEndTest()
-		: FileDataIOFixture<IMPL>("Write Past End") {}
+	: FileDataIOFixture<IMPL>("Write Past End")
+	{
+	}
 
-	void run() {
-		CFileDataIO* file = this->m_emptyFile;
+	void run()
+	{
+		CFileDataIO *file = this->m_emptyFile;
 
 		ASSERT_EQUALS(0u, file->GetLength());
 		ASSERT_EQUALS(0u, file->GetPosition());
@@ -467,7 +420,6 @@
 
 		// TODO: ReadUInt128
 
-
 		char tmp42;
 		memset(tmp, 0, 42);
 		file->Write(tmp, 42);
@@ -487,57 +439,54 @@
 	}
 };
 
-
-template <typename IMPL>
-class StringTest : public FileDataIOFixture<IMPL>
+template <typename IMPL> class StringTest : public FileDataIOFixture<IMPL>
 {
 public:
 	StringTest()
-		: FileDataIOFixture<IMPL>("String") {}
+	: FileDataIOFixture<IMPL>("String")
+	{
+	}
 
 	struct Encoding
 	{
-		const EUtf8Str		id;
-		const char*		header;
-		const size_t		headLen;
+		const EUtf8Str id;
+		const char *header;
+		const size_t headLen;
 	};
 
 	struct TestString
 	{
-		const wxChar*		str;
+		const wxChar *str;
 		// Raw and UTF8 expected lengths ...
-		const size_t		lengths2;
+		const size_t lengths2;
 	};
 
-	void run() {
-		CFileDataIO* file = this->m_emptyFile;
+	void run()
+	{
+		CFileDataIO *file = this->m_emptyFile;
 
 		// TODO: Need to test non-ascii values when using unicode/etc, zero-length lengthfields
-		Encoding encodings =
-		{
-			{utf8strNone,	NULL,			0},
-			{utf8strOptBOM,	"\xEF\xBB\xBF",		3},
-			{utf8strRaw,	NULL,			0}
-		};
-
-		TestString testData =
-		{
-			{ L"0123456789abcdef",	{ 16, 16 } },
-			{ L"",			{  0,  0 } },
-			{ L"abc ø def æ ghi å",	{ 17, 20 } },
-			{ L"aáeéuúó",		{  7, 11 } },
-			{ L"uüoöÿeëaäyÿ",		{ 11, 17 } },
+		Encoding encodings = { { utf8strNone, NULL, 0 },
+			{ utf8strOptBOM, "\xEF\xBB\xBF", 3 },
+			{ utf8strRaw, NULL, 0 } };
+
+		TestString testData = {
+			{ L"0123456789abcdef", { 16, 16 } },
+			{ L"", { 0, 0 } },
+			{ L"abc ø def æ ghi å", { 17, 20 } },
+			{ L"aáeéuúó", { 7, 11 } },
+			{ L"uüoöÿeëaäyÿ", { 11, 17 } },
 		};
 
-
 		for (size_t str = 0; str < ArraySize(testData); ++str) {
 			CONTEXT(wxString("Testing string: '") << testDatastr.str << "'");
 
 			for (size_t enc = 0; enc < ArraySize(encodings); ++enc) {
 				CONTEXT(wxString::Format("Testing encoding: %i", encodingsenc.id));
 
-				const wxChar* curStr = testDatastr.str;
-				size_t strLen = testDatastr.lengths(encodingsenc.id == utf8strNone) ? 0 : 1;
+				const wxChar *curStr = testDatastr.str;
+				size_t strLen =
+					testDatastr.lengths(encodingsenc.id == utf8strNone) ? 0 : 1;
 				size_t headLen = encodingsenc.headLen;
 
 				file->WriteString(curStr, encodingsenc.id, 2);
@@ -556,7 +505,6 @@
 				ASSERT_EQUALS(curStr, file->ReadString(encodingsenc.id, 2));
 				ASSERT_EQUALS(0u, file->Seek(0, wxFromStart));
 
-
 				file->WriteString(curStr, encodingsenc.id, 4);
 				ASSERT_EQUALS(strLen + 4 + headLen, file->GetPosition());
 				ASSERT_EQUALS(0u, file->Seek(0, wxFromStart));
@@ -577,7 +525,8 @@
 
 		CAssertOff silence;
 		for (size_t enc = 0; enc < ArraySize(encodings); ++enc) {
-			CONTEXT(wxString::Format("Testing encoding against poisoning: %i", encodingsenc.id));
+			CONTEXT(wxString::Format(
+				"Testing encoding against poisoning: %i", encodingsenc.id));
 
 			//////////////////////////////////////////////
 			// Check if we guard against "poisoning".
@@ -598,17 +547,18 @@
 	}
 };
 
-
 // Do not attempt to use this test with CMemFile.
-template <typename IMPL>
-class LargeFileTest : public FileDataIOFixture<IMPL>
+template <typename IMPL> class LargeFileTest : public FileDataIOFixture<IMPL>
 {
 public:
 	LargeFileTest()
-		: FileDataIOFixture<IMPL>("LargeFile") {}
+	: FileDataIOFixture<IMPL>("LargeFile")
+	{
+	}
 
-	void run() {
-		CFile* file = dynamic_cast<CFile*>(this->m_emptyFile);
+	void run()
+	{
+		CFile *file = dynamic_cast<CFile *>(this->m_emptyFile);
 
 		ASSERT_TRUE(file != NULL);
 		ASSERT_EQUALS(2147483647UL, file->Seek(2147483647L, wxFromStart));
@@ -619,46 +569,42 @@
 	}
 };
 
-
-
 /////////////////////////////////////////////////////////////////////
 // Registration of all tests
 
-ReadTest<CFile, uint8, 1>			CFileReadUInt8Test;
-ReadTest<CFile, uint16, 2>			CFileReadUInt16Test;
-ReadTest<CFile, uint32, 4>			CFileReadUInt32Test;
-ReadTest<CFile, CMD4Hash, 16>		CFileReadCMD4HashTest;
-ReadTest<CFile, CUInt128, 16>		CFileReadCUInt128Test;
-
-WriteTest<CFile, uint8, 1>			CFileWriteUInt8Test;
-WriteTest<CFile, uint16, 2>			CFileWriteUInt16Test;
-WriteTest<CFile, uint32, 4>			CFileWriteUInt32Test;
-WriteTest<CFile, CMD4Hash, 16>		CFileWriteCMD4HashTest;
-WriteTest<CFile, CUInt128, 16>		CFileWriteCUInt128Test;
+ReadTest<CFile, uint8, 1> CFileReadUInt8Test;
+ReadTest<CFile, uint16, 2> CFileReadUInt16Test;
+ReadTest<CFile, uint32, 4> CFileReadUInt32Test;
+ReadTest<CFile, CMD4Hash, 16> CFileReadCMD4HashTest;
+ReadTest<CFile, CUInt128, 16> CFileReadCUInt128Test;
 
-SeekTest<CFile>						CFileSeekTest;
-WritePastEndTest<CFile>				CFileWritePastEnd;
-StringTest<CFile>					CFileStringTest;
+WriteTest<CFile, uint8, 1> CFileWriteUInt8Test;
+WriteTest<CFile, uint16, 2> CFileWriteUInt16Test;
+WriteTest<CFile, uint32, 4> CFileWriteUInt32Test;
+WriteTest<CFile, CMD4Hash, 16> CFileWriteCMD4HashTest;
+WriteTest<CFile, CUInt128, 16> CFileWriteCUInt128Test;
 
-LargeFileTest<CFile>				CFileLargeFileTest;
+SeekTest<CFile> CFileSeekTest;
+WritePastEndTest<CFile> CFileWritePastEnd;
+StringTest<CFile> CFileStringTest;
 
+LargeFileTest<CFile> CFileLargeFileTest;
 
-ReadTest<CMemFile, uint8, 1>		CMemFileReadUInt8Test;
-ReadTest<CMemFile, uint16, 2>		CMemFileReadUInt16Test;
-ReadTest<CMemFile, uint32, 4>		CMemFileReadUInt32Test;
-ReadTest<CMemFile, CMD4Hash, 16>	CMemFileReadCMD4HashTest;
-ReadTest<CMemFile, CUInt128, 16>	CMemFileReadCUInt128Test;
+ReadTest<CMemFile, uint8, 1> CMemFileReadUInt8Test;
+ReadTest<CMemFile, uint16, 2> CMemFileReadUInt16Test;
+ReadTest<CMemFile, uint32, 4> CMemFileReadUInt32Test;
+ReadTest<CMemFile, CMD4Hash, 16> CMemFileReadCMD4HashTest;
+ReadTest<CMemFile, CUInt128, 16> CMemFileReadCUInt128Test;
 
-WriteTest<CMemFile, uint8, 1>		CMemFileWriteUInt8Test;
-WriteTest<CMemFile, uint16, 2>		CMemFileWriteUInt16Test;
-WriteTest<CMemFile, uint32, 4>		CMemFileWriteUInt32Test;
-WriteTest<CMemFile, CMD4Hash, 16>	CMemFileWriteCMD4HashTest;
-WriteTest<CMemFile, CUInt128, 16>	CMemFileWriteCUInt128Test;
-
-SeekTest<CMemFile>					CMemFileSeekTest;
-WritePastEndTest<CMemFile>			CMemFileWritePastEnd;
-StringTest<CMemFile>				CMemFileStringTest;
+WriteTest<CMemFile, uint8, 1> CMemFileWriteUInt8Test;
+WriteTest<CMemFile, uint16, 2> CMemFileWriteUInt16Test;
+WriteTest<CMemFile, uint32, 4> CMemFileWriteUInt32Test;
+WriteTest<CMemFile, CMD4Hash, 16> CMemFileWriteCMD4HashTest;
+WriteTest<CMemFile, CUInt128, 16> CMemFileWriteCUInt128Test;
 
+SeekTest<CMemFile> CMemFileSeekTest;
+WritePastEndTest<CMemFile> CMemFileWritePastEnd;
+StringTest<CMemFile> CMemFileStringTest;
 
 /////////////////////////////////////////////////////////////////////
 // CMemFile specific tests
@@ -694,15 +640,14 @@
 	ASSERT_RAISES(CRunTimeException, file.WriteUInt8(0));
 
 	// Init with invalid buffer should fail
-	ASSERT_RAISES(CRunTimeException, new CMemFile(static_cast<const uint8_t*>(NULL), 1024));
-	ASSERT_RAISES(CRunTimeException, new CMemFile(static_cast<uint8_t*>(NULL), 1024));
+	ASSERT_RAISES(CRunTimeException, new CMemFile(static_cast<const uint8_t *>(NULL), 1024));
+	ASSERT_RAISES(CRunTimeException, new CMemFile(static_cast<uint8_t *>(NULL), 1024));
 }
 
-
 TEST(CMemFile, ConstBuffer)
 {
 	uint8_t arr10;
-	CMemFile file(const_cast<const uint8_t*>(arr), sizeof(arr));
+	CMemFile file(const_cast<const uint8_t *>(arr), sizeof(arr));
 
 	ASSERT_RAISES(CRunTimeException, file.WriteUInt8(0));
 	ASSERT_RAISES(CRunTimeException, file.WriteUInt16(0));
@@ -713,7 +658,6 @@
 	ASSERT_RAISES(CRunTimeException, file.Write(buffer, sizeof(arr)));
 }
 
-
 TEST(CMemFile, SetLength)
 {
 	CMemFile file;
@@ -727,31 +671,43 @@
 	ASSERT_EQUALS(512u, file.Seek(0, wxFromEnd));
 }
 
-
 /////////////////////////////////////////////////////////////////////
 // CFile specific tests
 
-const CPath testFile = CPath("TestFile.dat");
+// Function-local rather than file-scope. CPath's constructor reaches wxConvFileName through
+// filename2char(), and wxWidgets sets that pointer in its own static initialisation, in another
+// translation unit. A shared wx runs every one of its initialisers at load time, before the
+// executable's, so a file-scope CPath was safe there; a statically linked wx leaves the order
+// across translation units unspecified, and the constructor could dereference a null pointer before
+// main() ever ran (#1315). Constructed on first use instead, after IMPLEMENT_APP_CONSOLE's main()
+// has brought wx up.
+static const CPath &TestFile()
+{
+	static const CPath path("TestFile.dat");
+	return path;
+}
+
 const unsigned testMode = 0600;
 
 DECLARE(CFile);
-	void setUp() {
-		// Ensure that the testfile doesn't exist
-		if (testFile.FileExists()) {
-			if (!CPath::RemoveFile(testFile)) {
-				MULE_VALIDATE_STATE(false, "Failed to remove temporary file.");
-			}
+void setUp()
+{
+	// Ensure that the testfile doesn't exist
+	if (TestFile().FileExists()) {
+		if (!CPath::RemoveFile(TestFile())) {
+			MULE_VALIDATE_STATE(false, "Failed to remove temporary file.");
 		}
 	}
+}
 
-	void tearDown() {
-		if (testFile.FileExists()) {
-			CPath::RemoveFile(testFile);
-		}
+void tearDown()
+{
+	if (TestFile().FileExists()) {
+		CPath::RemoveFile(TestFile());
 	}
+}
 END_DECLARE;
 
-
 TEST(CFile, Constructor)
 {
 	// Test initial conditions
@@ -774,17 +730,17 @@
 	// Create test file
 	{
 		CFile file;
-		ASSERT_TRUE(file.Create(testFile, false, testMode));
-		ASSERT_EQUALS(testFile, file.GetFilePath());
+		ASSERT_TRUE(file.Create(TestFile(), false, testMode));
+		ASSERT_EQUALS(TestFile(), file.GetFilePath());
 		file.WriteUInt32(1);
 	}
 
 	{
-		CFile file(testFile, CFile::read);
+		CFile file(TestFile(), CFile::read);
 
 		ASSERT_TRUE(file.IsOpened());
 		ASSERT_TRUE(file.fd() != CFile::fd_invalid);
-		ASSERT_EQUALS(testFile, file.GetFilePath());
+		ASSERT_EQUALS(TestFile(), file.GetFilePath());
 		ASSERT_EQUALS(4u, file.GetLength());
 		ASSERT_EQUALS(1u, file.ReadUInt32());
 
@@ -792,11 +748,11 @@
 	}
 
 	{
-		CFile file(testFile, CFile::write);
+		CFile file(TestFile(), CFile::write);
 
 		ASSERT_TRUE(file.IsOpened());
 		ASSERT_TRUE(file.fd() != CFile::fd_invalid);
-		ASSERT_EQUALS(testFile, file.GetFilePath());
+		ASSERT_EQUALS(TestFile(), file.GetFilePath());
 		ASSERT_EQUALS(0u, file.GetPosition());
 		ASSERT_EQUALS(0u, file.GetLength());
 		file.WriteUInt32(1);
@@ -806,11 +762,11 @@
 	}
 
 	{
-		CFile file(testFile, CFile::read_write);
+		CFile file(TestFile(), CFile::read_write);
 
 		ASSERT_TRUE(file.IsOpened());
 		ASSERT_TRUE(file.fd() != CFile::fd_invalid);
-		ASSERT_EQUALS(testFile, file.GetFilePath());
+		ASSERT_EQUALS(TestFile(), file.GetFilePath());
 		ASSERT_EQUALS(4u, file.GetLength());
 		ASSERT_EQUALS(0u, file.GetPosition());
 		ASSERT_EQUALS(1u, file.ReadUInt32());
@@ -821,7 +777,7 @@
 	}
 
 	{
-		CFile file(testFile, CFile::write_append);
+		CFile file(TestFile(), CFile::write_append);
 
 		ASSERT_TRUE(file.IsOpened());
 		ASSERT_TRUE(file.fd() != CFile::fd_invalid);
@@ -832,17 +788,16 @@
 		ASSERT_RAISES(CIOFailureException, file.ReadUInt8());
 
 		ASSERT_TRUE(file.Close());
-		ASSERT_TRUE(file.Open(testFile, CFile::read));
+		ASSERT_TRUE(file.Open(TestFile(), CFile::read));
 
 		ASSERT_EQUALS(2u, file.ReadUInt32());
 		ASSERT_EQUALS(1u, file.ReadUInt32());
 	}
 }
 
-
 TEST(CFile, Create)
 {
-	ASSERT_FALSE(testFile.FileExists());
+	ASSERT_FALSE(TestFile().FileExists());
 
 	// Check creation of new file, when none exists, with/without overwrite
 	for (size_t i = 0; i < 2; ++i) {
@@ -851,40 +806,40 @@
 		CFile file;
 		ASSERT_TRUE(!file.IsOpened());
 		ASSERT_TRUE(file.fd() == CFile::fd_invalid);
-		ASSERT_TRUE(file.Create(testFile, overwrite, testMode));
+		ASSERT_TRUE(file.Create(TestFile(), overwrite, testMode));
 		ASSERT_TRUE(file.IsOpened());
 		ASSERT_TRUE(file.fd() != CFile::fd_invalid);
-		ASSERT_EQUALS(testFile, file.GetFilePath());
+		ASSERT_EQUALS(TestFile(), file.GetFilePath());
 		ASSERT_TRUE(file.Close());
 		ASSERT_TRUE(file.fd() == CFile::fd_invalid);
 		ASSERT_TRUE(!file.IsOpened());
 
-		ASSERT_TRUE(wxFile::Access(testFile.GetRaw(), wxFile::read));
-		ASSERT_TRUE(wxFile::Access(testFile.GetRaw(), wxFile::write));
+		ASSERT_TRUE(wxFile::Access(TestFile().GetRaw(), wxFile::read));
+		ASSERT_TRUE(wxFile::Access(TestFile().GetRaw(), wxFile::write));
 
-		ASSERT_TRUE(wxRemoveFile(testFile.GetRaw()));
+		ASSERT_TRUE(wxRemoveFile(TestFile().GetRaw()));
 	}
 
 	// Create testfile, with a bit of contents
 	{
 		CFile file;
-		ASSERT_TRUE(file.Create(testFile, false, testMode));
-		ASSERT_EQUALS(testFile, file.GetFilePath());
+		ASSERT_TRUE(file.Create(TestFile(), false, testMode));
+		ASSERT_EQUALS(TestFile(), file.GetFilePath());
 		file.WriteUInt32(1);
 	}
 
 	// Check that overwrite = false works as expected
 	{
 		CFile file;
-		ASSERT_FALSE(file.Create(testFile, false, testMode));
+		ASSERT_FALSE(file.Create(TestFile(), false, testMode));
 		ASSERT_TRUE(file.fd() == CFile::fd_invalid);
 		ASSERT_TRUE(!file.IsOpened());
 
 		// Open and check contents
-		ASSERT_TRUE(file.Open(testFile, CFile::read));
+		ASSERT_TRUE(file.Open(TestFile(), CFile::read));
 		ASSERT_TRUE(file.IsOpened());
 		ASSERT_TRUE(file.fd() != CFile::fd_invalid);
-		ASSERT_EQUALS(testFile, file.GetFilePath());
+		ASSERT_EQUALS(TestFile(), file.GetFilePath());
 		ASSERT_EQUALS(4u, file.GetLength());
 		ASSERT_EQUALS(1u, file.ReadUInt32());
 		ASSERT_TRUE(file.Close());
@@ -895,24 +850,23 @@
 	// Check that overwrite = true works as expected
 	{
 		CFile file;
-		ASSERT_TRUE(file.Create(testFile, true, testMode));
+		ASSERT_TRUE(file.Create(TestFile(), true, testMode));
 		ASSERT_TRUE(file.IsOpened());
 		ASSERT_TRUE(file.fd() != CFile::fd_invalid);
-		ASSERT_EQUALS(testFile, file.GetFilePath());
+		ASSERT_EQUALS(TestFile(), file.GetFilePath());
 		ASSERT_EQUALS(0u, file.GetLength());
 		ASSERT_TRUE(file.Close());
 		ASSERT_TRUE(file.fd() == CFile::fd_invalid);
 		ASSERT_TRUE(!file.IsOpened());
 	}
 
-	ASSERT_TRUE(wxFile::Access(testFile.GetRaw(), wxFile::read));
-	ASSERT_TRUE(wxFile::Access(testFile.GetRaw(), wxFile::write));
+	ASSERT_TRUE(wxFile::Access(TestFile().GetRaw(), wxFile::read));
+	ASSERT_TRUE(wxFile::Access(TestFile().GetRaw(), wxFile::write));
 }
 
-
 TEST(CFile, SetLength)
 {
-	CFile file(testFile, CFile::write);
+	CFile file(TestFile(), CFile::write);
 
 	ASSERT_EQUALS(0u, file.GetLength());
 	file.SetLength(1024);
@@ -923,16 +877,15 @@
 	ASSERT_EQUALS(512u, file.Seek(0, wxFromEnd));
 }
 
-
 TEST(CFile, GetAvailable)
 {
 	{
-		CFile file(testFile, CFile::write);
+		CFile file(TestFile(), CFile::write);
 
 		writePredefData(&file);
 	}
 
-	CFile file(testFile, CFile::read);
+	CFile file(TestFile(), CFile::read);
 
 	const uint64 length = file.GetLength();
 	while (!file.Eof()) {
@@ -947,4 +900,3 @@
 
 	ASSERT_EQUALS(0u, file.GetAvailable());
 }
-

amule-3.0.1.tar.gz/unittests/tests/FormatTest.cpp -> amule-3.1.0.tar.gz/unittests/tests/FormatTest.cpp Changed

@@ -6,41 +6,39 @@
 
 using namespace muleunit;
 
-// 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.
+// Note: These tests have been written in accordance with the capabilities of printf found in
+//       printf(3), except where otherwise stated.
 
-#define ELEMENTS(x) (sizeof(x)/sizeof(x0))
+#define ELEMENTS(x) (sizeof(x) / sizeof(x0))
 #define MIN(x) std::numeric_limits<x>::min()
 #define MAX(x) std::numeric_limits<x>::max()
 
-
 DECLARE(Format)
-	// Less is valid for the string type, so we need a cut
-	// down test for that.
-	void testFormat(const wxString& str, const char* value) {
-		for (int p = -1; p < 5; ++p) {
-			wxString format;
+// Less is valid for the string type, so we need a cut
+// down test for that.
+void testFormat(const wxString &str, const char *value)
+{
+	for (int p = -1; p < 5; ++p) {
+		wxString format;
 
-			format += "%";
+		format += "%";
 
-			if (p == -1) {
-				format += ".";
-			} else {
-				format += wxString::Format(".%d", p);
-			}
+		if (p == -1) {
+			format += ".";
+		} else {
+			format += wxString::Format(".%d", p);
+		}
 
-			format += str;
+		format += str;
 
-			wxString reference = wxString::Format(format, value);
-			wxString actual = CFormat(format) % value;
+		wxString reference = wxString::Format(format, value);
+		wxString actual = CFormat(format) % value;
 
-			ASSERT_EQUALS_M(reference, actual, format + ": '" + reference + "' != '" + actual + "'");
-		}
+		ASSERT_EQUALS_M(reference, actual, format + ": '" + reference + "' != '" + actual + "'");
 	}
+}
 END_DECLARE;
 
-
 TEST(Format, ConstructorAndGetString)
 {
 	{
@@ -68,7 +66,6 @@
 	}
 }
 
-
 TEST(Format, SetStringAndGetString)
 {
 	CFormat format(NULL);
@@ -87,84 +84,59 @@
 	ASSERT_EQUALS("a %i c", format.GetString());
 }
 
-
-
 //! Implementation for the Standard type test
 #define STANDARD_TEST(cformat, wxformat, value) \
 	{ \
-		wxString reference	= wxString::Format(wxString("%") + wxformat, value); \
-		wxString actual		= CFormat(wxString("%") + cformat) % value; \
-		ASSERT_EQUALS_M(reference, actual, wxString("%") << wxformat \
-				<< " vs. %" << cformat << ": '" + reference + "' != '" + actual + "'"); \
+		wxString reference = wxString::Format(wxString("%") + wxformat, value); \
+		wxString actual = CFormat(wxString("%") + cformat) % value; \
+		ASSERT_EQUALS_M(reference, \
+			actual, \
+			wxString("%") << wxformat << " vs. %" << cformat \
+				      << ": '" + reference + "' != '" + actual + "'"); \
 	}
 
-
-
 //! Test the two boundaries and a middle value of the specified 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)); \
+	STANDARD_TEST(cformat, wxformat, MAX(type));
 
-// In wx >= 2.9 wxChar represents a Unicode code point, thus its maximum value
-// is 1114111 (0x10ffff) on platforms with 4-byte wchar_t (Linux, macOS).
-// Windows uses 2-byte wchar_t, so the ceiling is 0xffff there — do the min
-// at 32-bit width and cast back, so the narrowing from 0x10ffff to wxChar
-// happens explicitly rather than as an implicit constant conversion.
+// In wx >= 2.9 wxChar represents a Unicode code point, so its maximum is 1114111 (0x10ffff) on
+// platforms with 4-byte wchar_t (Linux, macOS). Windows uses 2-byte wchar_t, so the ceiling is
+// 0xffff there -- do the min at 32-bit width and cast back, so the narrowing from 0x10ffff to
+// wxChar happens explicitly rather than as an implicit constant conversion.
 TEST(Format, InjectwxChar)
 {
-	const uint32_t maxCodePoint = std::min<uint32_t>(
-		static_cast<uint32_t>(MAX(wxChar)), 0x10ffffu);
+	const uint32_t maxCodePoint = std::min<uint32_t>(static_cast<uint32_t>(MAX(wxChar)), 0x10ffffu);
 	STANDARD_TEST("c", "c", MIN(wxChar));
 	STANDARD_TEST("c", "c", static_cast<wxChar>(maxCodePoint / 2));
 	STANDARD_TEST("c", "c", static_cast<wxChar>(maxCodePoint));
 }
 
-
 //! All length specifiers are supported and should yield the same result
-const char* int_lengths =
-{
-	"h",
-	"",
-	"l",
-	"ll",
-	NULL
-};
+const char *int_lengths = { "h", "", "l", "ll", NULL };
 
 //! All signed types are supported, and should yield the same result
-const char* sint_types =
-{
-	"d",
-	"i",
-	NULL
-};
-
+const char *sint_types = { "d", "i", NULL };
 
 //! All unsigned types are supported, and should yield the same result
-const char* uint_types =
-{
-	"u",
-	"o",
-	"x",
-	"X",
-	NULL
-};
-
+const char *uint_types = { "u", "o", "x", "X", NULL };
 
 TEST(Format, InjectInteger)
 {
-	const char** sint_entry = sint_types;
+	const char **sint_entry = sint_types;
 
 	while (*sint_entry) {
-		const char** len_entry = int_lengths;
+		const char **len_entry = int_lengths;
 
 		while (*len_entry) {
 			wxString entry = wxString() << *len_entry << *sint_entry;
 
-			STANDARD_TYPE_TESTS(entry, wxString() << "h" << *sint_entry,	signed short);
-			STANDARD_TYPE_TESTS(entry, wxString() << "" << *sint_entry,	signed int);
-			STANDARD_TYPE_TESTS(entry, wxString() << "l" << *sint_entry,	signed long);
-			STANDARD_TYPE_TESTS(entry, wxString() << WXLONGLONGFMTSPEC << *sint_entry,	signed long long);
+			STANDARD_TYPE_TESTS(entry, wxString() << "h" << *sint_entry, signed short);
+			STANDARD_TYPE_TESTS(entry, wxString() << "" << *sint_entry, signed int);
+			STANDARD_TYPE_TESTS(entry, wxString() << "l" << *sint_entry, signed long);
+			STANDARD_TYPE_TESTS(
+				entry, wxString() << WXLONGLONGFMTSPEC << *sint_entry, signed long long);
 
 			++len_entry;
 		}
@@ -172,18 +144,18 @@
 		++sint_entry;
 	}
 
-
-	const char** uint_entry = uint_types;
+	const char **uint_entry = uint_types;
 	while (*uint_entry) {
-		const char** len_entry = int_lengths;
+		const char **len_entry = int_lengths;
 
 		while (*len_entry) {
 			wxString entry = wxString() << *len_entry << *uint_entry;
 
-			STANDARD_TYPE_TESTS(entry, wxString() << "h" << *uint_entry,	unsigned short);
-			STANDARD_TYPE_TESTS(entry, wxString() << "" << *uint_entry,	unsigned int);
-			STANDARD_TYPE_TESTS(entry, wxString() << "l" << *uint_entry,	unsigned long);
-			STANDARD_TYPE_TESTS(entry, wxString() << WXLONGLONGFMTSPEC << *uint_entry,	unsigned long long);
+			STANDARD_TYPE_TESTS(entry, wxString() << "h" << *uint_entry, unsigned short);
+			STANDARD_TYPE_TESTS(entry, wxString() << "" << *uint_entry, unsigned int);
+			STANDARD_TYPE_TESTS(entry, wxString() << "l" << *uint_entry, unsigned long);
+			STANDARD_TYPE_TESTS(
+				entry, wxString() << WXLONGLONGFMTSPEC << *uint_entry, unsigned long long);
 
 			++len_entry;
 		}
@@ -192,7 +164,6 @@
 	}
 }
 
-
 TEST(Format, InjectFloatAndDouble)
 {
 	STANDARD_TYPE_TESTS("e", "e", float);
@@ -210,14 +181,12 @@
 	STANDARD_TYPE_TESTS("G", "G", double);
 }
 
-
 TEST(Format, InjectString)
 {
 	testFormat("s", "");
 	testFormat("s", "abc");
 }
 
-
 TEST(Format, InjectNULLString)
 {
 	for (int p = -1; p < 5; ++p) {
@@ -232,13 +201,12 @@
 		format += "s";
 
 		// cppcheck-suppress zerodiv
-		wxString actual = CFormat(format) % (const char*)NULL;
+		wxString actual = CFormat(format) % (const char *)NULL;
 
 		ASSERT_TRUE_M(actual.IsEmpty(), "Expected empty string, got '" + actual + "'");
 	}
 }
 
-
 TEST(Format, MultipleFields)
 {
 	{
@@ -250,7 +218,7 @@
 	{
 		CFormat fmt2("%d _ %u _ %i");
 		fmt2 % -1;
-		fmt2 %  2u;
+		fmt2 % 2u;
 		fmt2 % -4;
 		ASSERT_EQUALS("-1 _ 2 _ -4", fmt2.GetString());
 	}
@@ -263,7 +231,6 @@
 	}
 }
 
-
 TEST(Format, EscapedPercentageSign)
 {
 	{
@@ -288,7 +255,6 @@
 	}
 }
 
-
 ///////////////////////////////////////////////////////////
 // The following checks for invalid operations
 
@@ -331,7 +297,6 @@
 	}
 }
 
-
 TEST(Format, NotReady)
 {
 	CFormat fmt("-- %s - %d");
@@ -344,7 +309,6 @@
 	ASSERT_EQUALS("-- foo - 42", fmt.GetString());
 }
 
-
 TEST(Format, WrongTypes)
 {
 #if wxDEBUG_LEVEL >= 1
@@ -364,7 +328,6 @@
 	}
 }
 
-
 TEST(Format, NotSupported)
 {
 #if wxDEBUG_LEVEL >= 1
@@ -384,7 +347,6 @@
 	}
 }
 
-
 TEST(Format, Overfeeding)
 {
 	CFormat fmt("%d - %d");
@@ -401,7 +363,6 @@
 	ASSERT_EQUALS("1 - 2", fmt.GetString());
 }
 
-
 TEST(Format, 64bValues)
 {
 	{
@@ -417,27 +378,23 @@
 	}
 }
 
-
 class CTestPrintable
 {
 public:
 	CTestPrintable(int value)
-		: m_value(value)
-	{}
-
-	wxString GetPrintableString() const
+	: m_value(value)
 	{
-		return wxString::Format("%i", m_value);
 	}
 
+	wxString GetPrintableString() const { return wxString::Format("%i", m_value); }
+
 private:
 	int m_value;
 };
 
-template<>
-inline CFormat& CFormat::operator%(CTestPrintable value)
+template <> inline CFormat &CFormat::operator%(CTestPrintable value)
 {
-	return this->operator%<const wxString&>(value.GetPrintableString());
+	return this->operator% <const wxString &>(value.GetPrintableString());
 }
 
 TEST(Format, UserDefined)

amule-3.1.0.tar.gz/unittests/tests/IPFilterIPv6Test.cpp Added

@@ -0,0 +1,200 @@
+// This file is part of the aMule Project.
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// Licensed under the GNU General Public License, version 2 or later.
+
+#include <muleunit/test.h>
+#include <IPFilter.h>
+#include <IPFilterScanner.h>
+#include <cstdio>
+#include <string>
+#include <stdexcept>
+
+using namespace muleunit;
+DECLARE_SIMPLE(IPFilterIPv6)
+
+extern FILE *yyipout;
+
+namespace
+{
+struct Entry
+{
+	int family;
+	uint32 start, end, level, bits;
+	CNetworkAddress network;
+	std::string description;
+};
+
+// Bytes the scanner wrote to its output during the last Scan().
+long g_echoed = 0;
+
+// Drive the actual generated scanner, including restart across consecutive files.
+std::vector<Entry> Scan(const std::string &text)
+{
+	FILE *file = std::tmpfile();
+	if (!file) {
+		throw std::runtime_error("Could not create scanner input");
+	}
+	std::fwrite(text.data(), 1, text.size(), file);
+	std::rewind(file);
+	FILE *echo = std::tmpfile();
+	if (!echo) {
+		throw std::runtime_error("Could not create scanner output");
+	}
+	yyipout = echo;
+	yyiprestart(file);
+	yyip_Line = 1;
+	yyip_Bad = 0;
+	std::vector<Entry> result;
+	Entry entry{};
+	char *description = nullptr;
+	while ((entry.family = yyiplex(
+			entry.start, entry.end, entry.level, description, entry.network, entry.bits))) {
+		entry.description = description;
+		result.push_back(entry);
+	}
+	g_echoed = std::ftell(echo);
+	yyipout = stdout;
+	std::fclose(echo);
+	std::fclose(file);
+	return result;
+}
+
+CNetworkAddress Addr(const char *text)
+{
+	return CNetworkAddress::FromString(text);
+}
+} // namespace
+
+TEST(IPFilterIPv6, MixedInputPreservesLegacyRangesAndDescriptions)
+{
+	const auto entries = Scan("# comment\n"
+				  "1.2.3.4 - 1.2.3.5,100,Duh:2.3.4.5-2.3.4.6\n"
+				  "old list: 192.0.2.1-192.0.2.9\n"
+				  " \t2001:db8::1234/64 , 99 ,description:with,commas\r\n"
+				  "2001:db8::2/128,0,no final newline");
+	ASSERT_EQUALS(4u, entries.size());
+	ASSERT_EQUALS(0, yyip_Bad);
+	ASSERT_EQUALS(1, entries0.family);
+	ASSERT_EQUALS(0x01020304u, entries0.start);
+	ASSERT_EQUALS(0x01020305u, entries0.end);
+	ASSERT_EQUALS(100u, entries0.level);
+	ASSERT_EQUALS(std::string("Duh:2.3.4.5-2.3.4.6"), entries0.description);
+	ASSERT_EQUALS(0xc0000201u, entries1.start);
+	ASSERT_EQUALS(0xc0000209u, entries1.end);
+	ASSERT_EQUALS(0u, entries1.level);
+	ASSERT_EQUALS(2, entries2.family);
+	ASSERT_TRUE(entries2.network == Addr("2001:db8::"));
+	ASSERT_EQUALS(64u, entries2.bits);
+	ASSERT_EQUALS(99u, entries2.level);
+	ASSERT_EQUALS(128u, entries3.bits);
+}
+
+TEST(IPFilterIPv6, InvalidCIDRsDoNotBecomeRules)
+{
+	const char *invalid = { "2001:db8::/129,0,bad",
+		"2001:db8::/64,256,bad",
+		"2001:::1/64,0,bad",
+		"::ffff:c000:201/128,0,mapped",
+		"::ffff:192.0.2.1/128,0,mapped",
+		"fe80::1%3/64,0,scoped",
+		"2001:db8::/64,0,brackets",
+		"2001:db8::/-1,0,negative",
+		"2001:db8::/64x,0,junk",
+		"2001:db8::/64,0" };
+	for (const char *line : invalid) {
+		const auto entries = Scan(std::string(line) + "\n2001:db8::1/128,0,valid\n");
+		ASSERT_EQUALS(1u, entries.size());
+		ASSERT_EQUALS(1, yyip_Bad);
+		ASSERT_EQUALS(2, entries0.family);
+		ASSERT_EQUALS(0L, g_echoed);
+	}
+}
+
+TEST(IPFilterIPv6, BadLinesAreConsumedWhole)
+{
+	const auto entries = Scan("garbage line\n"
+				  "Org:1.2.3.4-1.2.3.5 trailing text\n"
+				  "2001:db8::/32,0,valid\n");
+	ASSERT_EQUALS(1u, entries.size());
+	ASSERT_EQUALS(2, yyip_Bad);
+	ASSERT_EQUALS(2, entries0.family);
+	ASSERT_EQUALS(0L, g_echoed);
+}
+
+TEST(IPFilterIPv6, PrefixBoundariesAndFamilySeparation)
+{
+	CIPFilterIPv6Ranges ranges;
+	ASSERT_TRUE(ranges.Add(Addr("2001:db8::ffff"), 65, 99));
+	ASSERT_TRUE(ranges.IsFiltered(Addr("2001:db8::"), 100));
+	ASSERT_TRUE(ranges.IsFiltered(Addr("2001:db8::7fff:ffff:ffff:ffff"), 100));
+	ASSERT_FALSE(ranges.IsFiltered(Addr("2001:db8:0:0:8000::"), 100));
+	ASSERT_FALSE(ranges.IsFiltered(Addr("2001:db8::1"), 99));
+	ASSERT_FALSE(ranges.IsFiltered(Addr("192.0.2.1"), 100));
+	ASSERT_FALSE(ranges.IsFiltered(Addr("::ffff:192.0.2.1"), 100));
+	ASSERT_FALSE(ranges.IsFiltered(CNetworkAddress::Absent(), 100));
+	ASSERT_FALSE(ranges.Add(Addr("192.0.2.1"), 32, 0));
+	ASSERT_FALSE(ranges.Add(Addr("::ffff:192.0.2.1"), 128, 0));
+	ASSERT_FALSE(ranges.Add(Addr("fe80::1%3"), 64, 0));
+	ASSERT_FALSE(ranges.Add(Addr("::"), 129, 0));
+	ASSERT_FALSE(ranges.Add(Addr("::"), 0, 256));
+}
+
+TEST(IPFilterIPv6, ResolvedRangesPreserveGapsFragmentsAndThresholds)
+{
+	CIPFilterIPv6Ranges ranges;
+	ASSERT_TRUE(ranges.Add(Addr("2001:db8::"), 120, 10));
+	ASSERT_TRUE(ranges.Add(Addr("2001:db8::80"), 125, 200));
+	ASSERT_TRUE(ranges.Add(Addr("2001:db8::83"), 128, 20));
+	for (unsigned host = 0; host < 256; ++host) {
+		auto bytes = Addr("2001:db8::").GetOctets();
+		bytes15 = static_cast<uint8>(host);
+		const auto address = CNetworkAddress::IPv6FromOctets(bytes);
+		const unsigned expected = host == 131 ? 20 : (host >= 128 && host <= 135 ? 200 : 10);
+		ASSERT_FALSE(ranges.IsFiltered(address, expected));
+		ASSERT_TRUE(ranges.IsFiltered(address, expected + 1));
+	}
+	ASSERT_FALSE(ranges.IsFiltered(Addr("2001:db8::100"), 256));
+	ASSERT_FALSE(ranges.IsFiltered(Addr("2001:db7:ffff:ffff:ffff:ffff:ffff:ffff"), 256));
+	// A later wider prefix replaces all fragments, irrespective of specificity.
+	ASSERT_TRUE(ranges.Add(Addr("2001:db8::"), 119, 255));
+	ASSERT_FALSE(ranges.IsFiltered(Addr("2001:db8::83"), 255));
+	ASSERT_TRUE(ranges.IsFiltered(Addr("2001:db8::1ff"), 256));
+	ASSERT_FALSE(ranges.IsFiltered(Addr("2001:db8::200"), 256));
+}
+
+TEST(IPFilterIPv6, FullWidthEndpointsAndSecurityPrefixPolicy)
+{
+	CIPFilterIPv6Ranges ranges;
+	ASSERT_TRUE(ranges.Add(Addr("::"), 0, 0));
+	ASSERT_FALSE(ranges.IsFiltered(Addr("::"), 1));
+	ASSERT_TRUE(ranges.IsFiltered(Addr("::1"), 1));
+	ASSERT_TRUE(ranges.IsFiltered(Addr("fe80::1%3"), 1));
+	ASSERT_TRUE(ranges.Add(Addr("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), 128, 200));
+	ASSERT_FALSE(ranges.IsFiltered(Addr("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), 100));
+	ASSERT_TRUE(ranges.IsFiltered(Addr("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffe"), 100));
+	ASSERT_TRUE(ranges.Add(Addr("::"), 128, 200));
+	ASSERT_TRUE(ranges.IsFiltered(Addr("::1"), 100));
+	ASSERT_TRUE(ranges.Add(Addr("::"), 0, 255));
+	ASSERT_FALSE(ranges.IsFiltered(Addr("::1"), 255));
+	ASSERT_TRUE(ranges.IsFiltered(Addr("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), 256));
+}
+
+TEST(IPFilterIPv6, LaterStaticRulesOverrideAndReplacementDropsOldRules)
+{
+	CIPFilterIPv6Ranges ranges;
+	for (const auto &entry : Scan("::/0,0,all\n2001:db8::/32,200,exception\n")) {
+		ASSERT_TRUE(ranges.Add(entry.network, entry.bits, entry.level));
+	}
+	for (const auto &entry : Scan("2001:db8::1/128,0,static\n")) {
+		ASSERT_TRUE(ranges.Add(entry.network, entry.bits, entry.level));
+	}
+	ASSERT_TRUE(ranges.IsFiltered(Addr("2001:db9::1"), 127));
+	ASSERT_FALSE(ranges.IsFiltered(Addr("2001:db8::2"), 127));
+	ASSERT_TRUE(ranges.IsFiltered(Addr("2001:db8::1"), 127));
+	ASSERT_EQUALS(2u, ranges.BanCount(127));
+	ASSERT_EQUALS(0u, ranges.BanCount(0));
+	CIPFilterIPv6Ranges replacement;
+	std::swap(ranges, replacement);
+	ASSERT_FALSE(ranges.IsFiltered(Addr("2001:db8::1"), 127));
+	ASSERT_EQUALS(0u, ranges.BanCount(127));
+}

amule-3.1.0.tar.gz/unittests/tests/JsonDepthScanTest.cpp Added

@@ -0,0 +1,140 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// The pre-parse guard that stops a deeply nested request body exhausting the handler thread's stack
+// inside picojson's recursive descent.
+//
+// It has already been wrong once in the direction that rejects valid input: counting every opener
+// in the buffer rather than tracking nesting turned the cap into a budget of 32 containers for the
+// whole request, so a flat array of directory names containing brackets was refused three levels
+// deep (#1084). These pin both directions -- that legal bodies get through whatever their length,
+// and that the depth limit itself still bites.
+
+#include <muleunit/test.h>
+
+#include <JsonDepthScan.h>
+
+using namespace muleunit;
+using webapi::JsonNestingWithinLimit;
+
+DECLARE_SIMPLE(JsonDepthScan)
+
+namespace
+{
+//! `open` repeated n times, then its closer n times: n levels of real nesting.
+std::string Nested(std::size_t n, char open, char close)
+{
+	return std::string(n, open) + std::string(n, close);
+}
+} // namespace
+
+// The regression #1084 fixed: brackets inside string values are not nesting.
+// Forty of them in a flat array is three levels deep, not forty-three.
+TEST(JsonDepthScan, BracketsInsideStringsAreNotNesting)
+{
+	std::string body = "{\"shared\":";
+	for (int i = 0; i < 40; ++i) {
+		if (i) {
+			body += ",";
+		}
+		body += "\"Some.Release-BRD 2023\"";
+	}
+	body += "}";
+	ASSERT_TRUE(JsonNestingWithinLimit(body));
+}
+
+// A flat body is legal at any length; only nesting counts.
+TEST(JsonDepthScan, ManySiblingContainersAreNotNesting)
+{
+	std::string body = "";
+	for (int i = 0; i < 5000; ++i) {
+		if (i) {
+			body += ",";
+		}
+		body += "1";
+	}
+	body += "";
+	ASSERT_TRUE(JsonNestingWithinLimit(body));
+}
+
+// The limit still bites, which is the whole point of the guard.
+TEST(JsonDepthScan, RealNestingIsCappedAtTheLimit)
+{
+	ASSERT_TRUE(JsonNestingWithinLimit(Nested(webapi::kMaxJsonDepth, '', '')));
+	ASSERT_FALSE(JsonNestingWithinLimit(Nested(webapi::kMaxJsonDepth + 1, '', '')));
+	ASSERT_TRUE(JsonNestingWithinLimit(Nested(webapi::kMaxJsonDepth, '{', '}')));
+	ASSERT_FALSE(JsonNestingWithinLimit(Nested(webapi::kMaxJsonDepth + 1, '{', '}')));
+}
+
+// The cap is a parameter so the boundary can be pinned without building a
+// 32-deep body for every case.
+TEST(JsonDepthScan, BoundaryIsInclusive)
+{
+	ASSERT_TRUE(JsonNestingWithinLimit("", 3));
+	ASSERT_FALSE(JsonNestingWithinLimit("", 3));
+}
+
+// A quote escaped inside a string must not end it early, or the openers that
+// follow would be counted as nesting.
+TEST(JsonDepthScan, EscapedQuoteDoesNotEndTheString)
+{
+	ASSERT_TRUE(JsonNestingWithinLimit("{\"a\":\"he said \\\" then \"}", 3));
+}
+
+// A backslash escaping a backslash leaves the next quote free to close.
+TEST(JsonDepthScan, EscapedBackslashLetsTheStringClose)
+{
+	// {"a":"c:\\"} -- the string ends at the quote, so the closing brace
+	// is real and the body is one level deep.
+	ASSERT_TRUE(JsonNestingWithinLimit("{\"a\":\"c:\\\\\"}", 1));
+}
+
+// A backslash as the final byte must not read past the buffer.
+TEST(JsonDepthScan, TrailingBackslashDoesNotOverrun)
+{
+	ASSERT_TRUE(JsonNestingWithinLimit("{\"a\":\"x\\", 2));
+}
+
+// Unbalanced closers are ignored rather than rejected: this is a stack guard,
+// and picojson below still has the final say on syntax.
+TEST(JsonDepthScan, UnbalancedClosersAreIgnored)
+{
+	ASSERT_TRUE(JsonNestingWithinLimit("}}}{\"a\":1}", 1));
+}
+
+// Openers hidden in a string are ignored here, and are equally not nesting to
+// picojson -- the two agree, which is what keeps the guard sound.
+TEST(JsonDepthScan, OpenersInsideAStringDoNotCount)
+{
+	ASSERT_TRUE(JsonNestingWithinLimit("{\"a\":\"\"}", 1));
+}
+
+// The deepest body this surface legitimately sends, per the curl suite.
+TEST(JsonDepthScan, DeepestLegitimateBodyIsWellWithinTheCap)
+{
+	const std::string body =
+		"{\"remote_controls\":{\"webserver\":{\"port\":4711},\"amuleapi\":{\"bind\":\"x\"}}}";
+	ASSERT_TRUE(JsonNestingWithinLimit(body, 3));
+	ASSERT_FALSE(JsonNestingWithinLimit(body, 2));
+}

amule-3.1.0.tar.gz/unittests/tests/JsonWriterTest.cpp Added

@@ -0,0 +1,321 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include <clocale>
+#include <muleunit/test.h>
+#include "JsonWriter.h"
+
+#include <cmath>
+#include <limits>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(JsonWriter)
+
+TEST(JsonWriter, EmptyObject)
+{
+	CJsonWriter w;
+	w.BeginObject();
+	w.EndObject();
+	ASSERT_EQUALS(std::string("{}"), w.GetBuffer());
+}
+
+TEST(JsonWriter, EmptyArray)
+{
+	CJsonWriter w;
+	w.BeginArray();
+	w.EndArray();
+	ASSERT_EQUALS(std::string(""), w.GetBuffer());
+}
+
+TEST(JsonWriter, ObjectWithStringValue)
+{
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("app");
+	w.ValueString("aMule");
+	w.EndObject();
+	ASSERT_EQUALS(std::string("{\"app\":\"aMule\"}"), w.GetBuffer());
+}
+
+TEST(JsonWriter, ObjectWithMultipleKeys)
+{
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("app");
+	w.ValueString("aMule");
+	w.Key("version");
+	w.ValueString("2.3.3");
+	w.Key("api");
+	w.ValueString("v0.1");
+	w.EndObject();
+	ASSERT_EQUALS(
+		std::string("{\"app\":\"aMule\",\"version\":\"2.3.3\",\"api\":\"v0.1\"}"), w.GetBuffer());
+}
+
+TEST(JsonWriter, Primitives)
+{
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("n");
+	w.ValueNull();
+	w.Key("t");
+	w.ValueBool(true);
+	w.Key("f");
+	w.ValueBool(false);
+	w.Key("i");
+	w.ValueInt(-42);
+	w.Key("u");
+	w.ValueUInt(uint64_t(42));
+	w.EndObject();
+	ASSERT_EQUALS(std::string("{\"n\":null,\"t\":true,\"f\":false,\"i\":-42,\"u\":42}"), w.GetBuffer());
+}
+
+TEST(JsonWriter, IntegerBoundaries)
+{
+	CJsonWriter w;
+	w.BeginArray();
+	w.ValueInt(std::numeric_limits<int64_t>::min());
+	w.ValueInt(std::numeric_limits<int64_t>::max());
+	w.ValueUInt(std::numeric_limits<uint64_t>::max());
+	w.EndArray();
+	ASSERT_EQUALS(std::string("-9223372036854775808,9223372036854775807,18446744073709551615"),
+		w.GetBuffer());
+}
+
+TEST(JsonWriter, DoubleSpecials)
+{
+	// NaN, +Inf, -Inf are not representable in JSON; the writer emits null.
+	CJsonWriter w;
+	w.BeginArray();
+	w.ValueDouble(std::nan(""));
+	w.ValueDouble(std::numeric_limits<double>::infinity());
+	w.ValueDouble(-std::numeric_limits<double>::infinity());
+	w.EndArray();
+	ASSERT_EQUALS(std::string("null,null,null"), w.GetBuffer());
+}
+
+TEST(JsonWriter, NestedObject)
+{
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("outer");
+	w.BeginObject();
+	w.Key("inner");
+	w.ValueString("v");
+	w.EndObject();
+	w.EndObject();
+	ASSERT_EQUALS(std::string("{\"outer\":{\"inner\":\"v\"}}"), w.GetBuffer());
+}
+
+TEST(JsonWriter, ArrayOfObjects)
+{
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("items");
+	w.BeginArray();
+	w.BeginObject();
+	w.Key("k");
+	w.ValueInt(1);
+	w.EndObject();
+	w.BeginObject();
+	w.Key("k");
+	w.ValueInt(2);
+	w.EndObject();
+	w.EndArray();
+	w.EndObject();
+	ASSERT_EQUALS(std::string("{\"items\":{\"k\":1},{\"k\":2}}"), w.GetBuffer());
+}
+
+TEST(JsonWriter, EscapesQuoteAndBackslash)
+{
+	CJsonWriter w;
+	w.ValueString(wxString::FromUTF8("a\"b\\c"));
+	ASSERT_EQUALS(std::string("\"a\\\"b\\\\c\""), w.GetBuffer());
+}
+
+TEST(JsonWriter, EscapesShortControlChars)
+{
+	CJsonWriter w;
+	w.ValueString(wxString::FromUTF8("\b\f\n\r\t"));
+	ASSERT_EQUALS(std::string("\"\\b\\f\\n\\r\\t\""), w.GetBuffer());
+}
+
+TEST(JsonWriter, EscapesGenericControlChars)
+{
+	// Control chars without short forms get \uXXXX. DEL (0x7F) is treated
+	// the same so it never lands in the output verbatim.
+	CJsonWriter w;
+	w.BeginArray();
+	w.ValueString(wxString(wxUniChar(uint32_t(0x00))));
+	w.ValueString(wxString(wxUniChar(uint32_t(0x01))));
+	w.ValueString(wxString(wxUniChar(uint32_t(0x1F))));
+	w.ValueString(wxString(wxUniChar(uint32_t(0x7F))));
+	w.EndArray();
+	ASSERT_EQUALS(std::string("\"\\u0000\",\"\\u0001\",\"\\u001f\",\"\\u007f\""), w.GetBuffer());
+}
+
+TEST(JsonWriter, SupplementaryPlaneAsSurrogatePair)
+{
+	// U+1F600 (GRINNING FACE) is in the supplementary plane; it must be
+	// emitted as the UTF-16 surrogate pair 😀.
+	CJsonWriter w;
+	w.ValueString(wxString(wxUniChar(uint32_t(0x1F600))));
+	ASSERT_EQUALS(std::string("\"\\ud83d\\ude00\""), w.GetBuffer());
+}
+
+TEST(JsonWriter, BmpNonAsciiEmittedAsUtf8)
+{
+	// Non-control BMP codepoints need no JSON escape and are emitted as the UTF-8 the buffer
+	// holds -- byte for byte what went in, the input having been built from the same UTF-8.
+	const char cyrillic = "\xD0\xBF\xD1\x80\xD0\xB8\xD0\xB2\xD0\xB5\xD1\x82"; // "привет"
+	CJsonWriter w;
+	w.ValueString(wxString::FromUTF8(cyrillic));
+	ASSERT_EQUALS(std::string("\"") + cyrillic + "\"", w.GetBuffer());
+	// Two bytes per character here, not one wide unit: the buffer is UTF-8.
+	ASSERT_EQUALS(static_cast<size_t>(14), w.GetBuffer().size());
+}
+
+TEST(JsonWriter, KeyEscaping)
+{
+	// Keys go through the same escaping path as values. A key containing
+	// a quote must be escaped or the output is invalid JSON.
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key(wxString::FromUTF8("a\"b"));
+	w.ValueInt(1);
+	w.EndObject();
+	ASSERT_EQUALS(std::string("{\"a\\\"b\":1}"), w.GetBuffer());
+}
+
+TEST(JsonWriter, ValueRawFragment)
+{
+	// A pre-formatted JSON fragment is appended verbatim. The caller must ensure it is valid
+	// JSON; the writer only tracks whether a comma is needed before or after.
+	CJsonWriter w;
+	w.BeginObject();
+	w.Key("pre");
+	w.ValueRaw("1,2,3");
+	w.Key("post");
+	w.ValueInt(4);
+	w.EndObject();
+	ASSERT_EQUALS(std::string("{\"pre\":1,2,3,\"post\":4}"), w.GetBuffer());
+}
+
+TEST(JsonWriter, ExternalBuffer)
+{
+	// The writer can append into a caller-owned buffer instead of its
+	// own. Used when composing a response from multiple writers.
+	std::string shared;
+	shared += "prefix:";
+	{
+		CJsonWriter w(&shared);
+		w.BeginObject();
+		w.Key("x");
+		w.ValueInt(1);
+		w.EndObject();
+	}
+	ASSERT_EQUALS(std::string("prefix:{\"x\":1}"), shared);
+}
+
+TEST(JsonWriter, LargeString)
+{
+	// 50 KB string of printable ASCII should encode in linear time with
+	// the only overhead being the surrounding quotes.
+	const wxString big(wxT('x'), 50000);
+	CJsonWriter w;
+	w.ValueString(big);
+	// Compared as bytes. Building the expectation as a wxString would convert the buffer back
+	// with the locale codec on the way into ASSERT_EQUALS -- the conversion the writer exists
+	// to avoid -- and it would pass here regardless, the payload being pure ASCII.
+	ASSERT_EQUALS(std::string("\"") + std::string(50000, 'x') + "\"", w.GetBuffer());
+}
+
+TEST(JsonWriter, TakeBufferLeavesTheWriterReusable)
+{
+	// EndArray() leaves a comma pending for the next sibling, so a writer that kept that state
+	// across a take would open its next document with a stray separator.
+	CJsonWriter w;
+	w.BeginArray();
+	w.ValueInt(1);
+	w.EndArray();
+	ASSERT_EQUALS(std::string("1"), w.TakeBuffer());
+	ASSERT_TRUE(w.GetBuffer().empty());
+
+	w.BeginArray();
+	w.ValueInt(2);
+	w.EndArray();
+	ASSERT_EQUALS(std::string("2"), w.TakeBuffer());
+}
+
+TEST(JsonWriter, TakeBufferLeavesACallerOwnedBufferAlone)
+{
+	// The external buffer is the caller's; taking copies out of it rather than
+	// emptying it.
+	std::string shared;
+	CJsonWriter w(&shared);
+	w.BeginObject();
+	w.Key("x");
+	w.ValueInt(1);
+	w.EndObject();
+	ASSERT_EQUALS(std::string("{\"x\":1}"), w.TakeBuffer());
+	ASSERT_EQUALS(std::string("{\"x\":1}"), shared);
+}
+
+// JsonDoubleToString is the one formatting both the REST writer and the SSE payload builders go
+// through. It exists because `ostream << double` differs from it in two ways that matter on the
+// wire.
+TEST(JsonWriter, DoubleToStringIsRoundTrippableNotSixDigits)
+{
+	// The stream default is 6 significant digits, which turns 1-of-3 parts into "33.3333" -- a
+	// different number from the one REST reports for the same value.
+	const double third = 100.0 / 3.0;
+	ASSERT_EQUALS(std::string("33.333333333333336"), JsonDoubleToString(third));
+	// Whole values stay short; %.17g does not pad.
+	ASSERT_EQUALS(std::string("87.5"), JsonDoubleToString(87.5));
+	ASSERT_EQUALS(std::string("100"), JsonDoubleToString(100.0));
+	ASSERT_EQUALS(std::string("0"), JsonDoubleToString(0.0));
+}
+
+TEST(JsonWriter, DoubleToStringUsesACLocaleDecimalPoint)
+{
+	// snprintf and ostream both honour LC_NUMERIC, which amuleapi inherits from --locale. A
+	// comma separator would make the frame invalid JSON, so the formatter normalises it.
+	// Skipped where the locale is unavailable, which is normal in a minimal container.
+	const char *prev = std::setlocale(LC_NUMERIC, nullptr);
+	const std::string saved = prev ? prev : "C";
+	if (std::setlocale(LC_NUMERIC, "de_DE.UTF-8") == nullptr &&
+		std::setlocale(LC_NUMERIC, "it_IT.UTF-8") == nullptr) {
+		return;
+	}
+	const std::string got = JsonDoubleToString(87.5);
+	std::setlocale(LC_NUMERIC, saved.c_str());
+	ASSERT_EQUALS(std::string("87.5"), got);
+}
+
+TEST(JsonWriter, DoubleToStringSpellsNonFiniteAsNull)
+{
+	ASSERT_EQUALS(std::string("null"), JsonDoubleToString(std::nan("")));
+	ASSERT_EQUALS(std::string("null"), JsonDoubleToString(std::numeric_limits<double>::infinity()));
+}

amule-3.1.0.tar.gz/unittests/tests/JwtTest.cpp Added

@@ -0,0 +1,473 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include <muleunit/test.h>
+#include "Jwt.h"
+
+#include <cryptopp/hmac.h>
+#include <cryptopp/sha.h>
+
+#include <ctime>
+#include <set>
+#include <string>
+#include <vector>
+
+using namespace muleunit;
+
+DECLARE(Jwt)
+std::vector<unsigned char> MakeSecret(unsigned char fill)
+{
+	return std::vector<unsigned char>(32, fill);
+}
+END_DECLARE;
+
+TEST(Jwt, IssueProducesThreeDottedParts)
+{
+	CJwt auth(MakeSecret(0xAB));
+	const std::string token = auth.Issue(Role::ADMIN).token;
+	// Header.Payload.Signature -- exactly two dots.
+	int dots = 0;
+	for (size_t i = 0; i < token.size(); ++i) {
+		if (tokeni == '.')
+			++dots;
+	}
+	ASSERT_EQUALS(2, dots);
+	ASSERT_TRUE(!token.empty());
+}
+
+TEST(Jwt, RoundtripAdmin)
+{
+	CJwt auth(MakeSecret(0x11));
+	const CJwt::IssuedToken issued = auth.Issue(Role::ADMIN);
+
+	CJwt::VerifyResult r;
+	ASSERT_TRUE(auth.Verify(issued.token, r));
+	ASSERT_TRUE(r.role == Role::ADMIN);
+	ASSERT_EQUALS(issued.expires_at, r.exp);
+}
+
+TEST(Jwt, RoundtripGuest)
+{
+	CJwt auth(MakeSecret(0x22));
+	const CJwt::IssuedToken issued = auth.Issue(Role::GUEST);
+
+	CJwt::VerifyResult r;
+	ASSERT_TRUE(auth.Verify(issued.token, r));
+	ASSERT_TRUE(r.role == Role::GUEST);
+}
+
+TEST(Jwt, ExpiryIs24Hours)
+{
+	CJwt auth(MakeSecret(0x33));
+	const std::time_t before = std::time(nullptr);
+	const CJwt::IssuedToken issued = auth.Issue(Role::ADMIN);
+	const std::time_t after = std::time(nullptr);
+
+	// expires_at must be between before+86400, after+86400 -- same-
+	// second tolerance for the clock tick.
+	const std::time_t lifetime = 24 * 60 * 60;
+	ASSERT_TRUE(issued.expires_at >= before + lifetime);
+	ASSERT_TRUE(issued.expires_at <= after + lifetime);
+}
+
+TEST(Jwt, IssueEmitsJti)
+{
+	CJwt auth(MakeSecret(0x10));
+	const CJwt::IssuedToken issued = auth.Issue(Role::ADMIN);
+	// 128-bit jti → 22 base64url chars (16 bytes ÷ 3 × 4 = 21.33 → 22).
+	ASSERT_FALSE(issued.jti.empty());
+	ASSERT_EQUALS(static_cast<size_t>(22), issued.jti.size());
+}
+
+TEST(Jwt, IssueProducesUniqueJti)
+{
+	// 128 random bits gives 1-in-2^64 collision odds across a single instance's lifetime.
+	// Across 1000 issues we would need ~2^77 calls before a collision becomes likely; 1000 is
+	// comfortably in the "never sees a dupe" range and catches any RNG-reset bug.
+	CJwt auth(MakeSecret(0x12));
+	std::set<std::string> seen;
+	for (int i = 0; i < 1000; ++i) {
+		const std::string jti = auth.Issue(Role::ADMIN).jti;
+		ASSERT_TRUE(seen.insert(jti).second);
+	}
+}
+
+TEST(Jwt, VerifyRecoversJti)
+{
+	CJwt auth(MakeSecret(0x13));
+	const CJwt::IssuedToken issued = auth.Issue(Role::ADMIN);
+
+	CJwt::VerifyResult r;
+	ASSERT_TRUE(auth.Verify(issued.token, r));
+	ASSERT_EQUALS(issued.jti, r.jti);
+}
+
+TEST(Jwt, TamperedSignatureRejected)
+{
+	CJwt auth(MakeSecret(0x44));
+	std::string token = auth.Issue(Role::ADMIN).token;
+
+	// Flip the last character of the signature. base64url alphabet
+	// rotation: any non-equal char.
+	token.back() = (token.back() == 'A') ? 'B' : 'A';
+
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, TamperedPayloadRejected)
+{
+	CJwt auth(MakeSecret(0x55));
+	std::string token = auth.Issue(Role::GUEST).token;
+
+	// Flip a payload byte (between the two dots) so the HMAC mismatches.
+	const size_t first_dot = token.find('.');
+	const size_t second_dot = token.find('.', first_dot + 1);
+	const size_t mid = (first_dot + second_dot) / 2;
+	tokenmid = (tokenmid == 'X') ? 'Y' : 'X';
+
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, WrongSecretRejected)
+{
+	CJwt issuer(MakeSecret(0x66));
+	CJwt verifier(MakeSecret(0x67)); // different secret
+
+	const std::string token = issuer.Issue(Role::ADMIN).token;
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(verifier.Verify(token, r));
+}
+
+TEST(Jwt, MalformedNoDotsRejected)
+{
+	CJwt auth(MakeSecret(0x77));
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify("nodotshere", r));
+	ASSERT_FALSE(auth.Verify("only.one", r));
+	ASSERT_FALSE(auth.Verify("too.many.dots.here", r));
+	ASSERT_FALSE(auth.Verify("", r));
+}
+
+TEST(Jwt, MalformedBase64Rejected)
+{
+	// Each section has invalid base64url chars (`=` / `+` are not in the b64url alphabet). The
+	// test pins "malformed input gets rejected" without claiming WHICH layer caught it --
+	// currently the MAC compare bails on length mismatch, but reordering the verify pipeline
+	// leaves the test holding.
+	CJwt auth(MakeSecret(0x88));
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify("!!!.bbb.ccc", r));
+	ASSERT_FALSE(auth.Verify("aaa.!!!.ccc", r));
+	ASSERT_FALSE(auth.Verify("aaa.bbb.!!!", r));
+}
+
+// Header-validation tests (alg-confusion defence). These build a custom JWT byte for byte: an
+// arbitrary header + payload + the *correct* HMAC-SHA-256 signature using the test secret. The MAC
+// compare therefore succeeds and we reach the header alg/typ check inside Verify(). If that check
+// is ever regressed -- someone removing it for "performance" -- these tests start failing.
+
+namespace
+{
+
+const char b64_alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+
+std::string Base64UrlEncodeForTest(const unsigned char *data, size_t len)
+{
+	std::string out;
+	out.reserve(((len + 2) / 3) * 4);
+	for (size_t i = 0; i < len; i += 3) {
+		const unsigned b0 = datai;
+		const unsigned b1 = (i + 1 < len) ? datai + 1 : 0;
+		const unsigned b2 = (i + 2 < len) ? datai + 2 : 0;
+		out += b64_alphabet(b0 >> 2) & 0x3f;
+		out += b64_alphabet((b0 << 4) | (b1 >> 4)) & 0x3f;
+		if (i + 1 < len)
+			out += b64_alphabet((b1 << 2) | (b2 >> 6)) & 0x3f;
+		if (i + 2 < len)
+			out += b64_alphabetb2 & 0x3f;
+	}
+	return out;
+}
+
+std::string CraftToken(const std::vector<unsigned char> &secret,
+	const std::string &header_json,
+	const std::string &payload_json)
+{
+	const std::string h_b64 = Base64UrlEncodeForTest(
+		reinterpret_cast<const unsigned char *>(header_json.data()), header_json.size());
+	const std::string p_b64 = Base64UrlEncodeForTest(
+		reinterpret_cast<const unsigned char *>(payload_json.data()), payload_json.size());
+	const std::string signing_input = h_b64 + "." + p_b64;
+	unsigned char macCryptoPP::SHA256::DIGESTSIZE;
+	CryptoPP::HMAC<CryptoPP::SHA256> hmac(secret.empty() ? nullptr : secret.data(), secret.size());
+	hmac.Update(reinterpret_cast<const unsigned char *>(signing_input.data()), signing_input.size());
+	hmac.Final(mac);
+	const std::string sig = Base64UrlEncodeForTest(mac, sizeof(mac));
+	return signing_input + "." + sig;
+}
+
+} // namespace
+
+TEST(Jwt, AlgNoneRejectedEvenWithValidHs256Mac)
+{
+	const auto secret = MakeSecret(0x99);
+	CJwt auth(secret);
+	// Header says alg:none, signature is a valid HS256 MAC against the
+	// test secret. Verify must still reject because alg != HS256.
+	const std::string token = CraftToken(secret,
+		"{\"alg\":\"none\",\"typ\":\"JWT\"}",
+		"{\"role\":\"admin\",\"exp\":9999999999,\"jti\":\"t\"}");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, AlgHs512RejectedEvenWithValidHs256Mac)
+{
+	const auto secret = MakeSecret(0xAA);
+	CJwt auth(secret);
+	const std::string token = CraftToken(secret,
+		"{\"alg\":\"HS512\",\"typ\":\"JWT\"}",
+		"{\"role\":\"admin\",\"exp\":9999999999,\"jti\":\"t\"}");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, AlgRs256RejectedEvenWithValidHs256Mac)
+{
+	const auto secret = MakeSecret(0xBB);
+	CJwt auth(secret);
+	const std::string token = CraftToken(secret,
+		"{\"alg\":\"RS256\",\"typ\":\"JWT\"}",
+		"{\"role\":\"admin\",\"exp\":9999999999,\"jti\":\"t\"}");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, MissingAlgRejected)
+{
+	const auto secret = MakeSecret(0xCC);
+	CJwt auth(secret);
+	const std::string token = CraftToken(
+		secret, "{\"typ\":\"JWT\"}", "{\"role\":\"admin\",\"exp\":9999999999,\"jti\":\"t\"}");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, WrongTypRejected)
+{
+	const auto secret = MakeSecret(0xDD);
+	CJwt auth(secret);
+	// typ is optional in RFC 7519, but if present it MUST be "JWT".
+	const std::string token = CraftToken(secret,
+		"{\"alg\":\"HS256\",\"typ\":\"not-a-jwt\"}",
+		"{\"role\":\"admin\",\"exp\":9999999999,\"jti\":\"t\"}");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, ExpInPastRejected)
+{
+	const auto secret = MakeSecret(0xEE);
+	CJwt auth(secret);
+	// Yesterday -- Verify must reject expired tokens regardless of MAC.
+	const std::time_t yesterday = std::time(nullptr) - 86400;
+	const std::string token = CraftToken(secret,
+		"{\"alg\":\"HS256\",\"typ\":\"JWT\"}",
+		std::string("{\"role\":\"admin\",\"exp\":") + std::to_string(yesterday) + ",\"jti\":\"t\"}");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, MalformedPayloadJsonRejected)
+{
+	const auto secret = MakeSecret(0xFF);
+	CJwt auth(secret);
+	// Valid HS256 MAC but the payload isn't valid JSON.
+	const std::string token =
+		CraftToken(secret, "{\"alg\":\"HS256\",\"typ\":\"JWT\"}", "not json at all");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, MissingJtiRejected)
+{
+	// Crafted token with a valid HS256 MAC, valid header, valid role/exp -- but no `jti` claim.
+	// amuleapi's revocation list keys off jti, so a token without one would create a hole in
+	// the revocation check; Verify() must refuse to admit one.
+	const auto secret = MakeSecret(0x01);
+	CJwt auth(secret);
+	const std::string token = CraftToken(
+		secret, "{\"alg\":\"HS256\",\"typ\":\"JWT\"}", "{\"role\":\"admin\",\"exp\":9999999999}");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, EmptyJtiRejected)
+{
+	// Crafted token with an empty `jti` string. The revocation list keys off jti; an empty key
+	// collides for every issuer of an empty-jti token, so Verify() must refuse.
+	const auto secret = MakeSecret(0x02);
+	CJwt auth(secret);
+	// iat + 1h exp so the mandatory-iat and lifetime-cap checks both pass and the empty-jti
+	// check is the only available reject path.
+	const std::time_t now = std::time(nullptr);
+	const std::string token = CraftToken(secret,
+		"{\"alg\":\"HS256\",\"typ\":\"JWT\"}",
+		std::string("{\"role\":\"admin\",\"iat\":") + std::to_string(now) +
+			",\"exp\":" + std::to_string(now + 3600) + ",\"jti\":\"\"}");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, MissingIatRejected)
+{
+	// Without an iat claim a token has unbounded lifetime -- an attacker who somehow gained
+	// mint capability could otherwise issue a token with exp = year-2100 and bypass the
+	// lifetime cap entirely. Mandatory iat closes the door.
+	const auto secret = MakeSecret(0x03);
+	CJwt auth(secret);
+	const std::time_t now = std::time(nullptr);
+	const std::string token = CraftToken(secret,
+		"{\"alg\":\"HS256\",\"typ\":\"JWT\"}",
+		std::string("{\"role\":\"admin\",\"exp\":") + std::to_string(now + 3600) + ",\"jti\":\"t\"}");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, ExpIatLifetimeCapExceeded)
+{
+	// iat present and exp within the same future window, but the total (exp - iat) is two days
+	// -- well past the 24-hour TOKEN_LIFETIME_SECONDS + skew. Verify must refuse: even with the
+	// secret compromised, a hostile mint cannot outrun the lifetime cap.
+	const auto secret = MakeSecret(0x04);
+	CJwt auth(secret);
+	const std::time_t now = std::time(nullptr);
+	const std::time_t two_days = 2 * 24 * 60 * 60;
+	const std::string token = CraftToken(secret,
+		"{\"alg\":\"HS256\",\"typ\":\"JWT\"}",
+		std::string("{\"role\":\"admin\",\"iat\":") + std::to_string(now) +
+			",\"exp\":" + std::to_string(now + two_days) + ",\"jti\":\"t\"}");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+// Base64UrlDecode structural-invariant boundary tests. Each crafts a token whose signing input is
+// malformed in a way Base64UrlDecode is supposed to catch, then signs THAT signing input with the
+// matching HMAC so the constant-time MAC compare passes and Verify() actually reaches
+// Base64UrlDecode. Without the boundary guards Verify() would accept the malformed token; the
+// asserts pin the rejection in place.
+//
+// Two invariants the implementation guards (Jwt.cpp:94-100):
+//  * len % 4 == 1 -- impossible for any valid base64url string
+//  * non-zero residue bits -- `len % 4 == 2/3` leaves 4/2 trailing bits a valid encoder always
+// emits as 0
+
+TEST(Jwt, Base64UrlDecodeRejectsLenMod4EqualsOne)
+{
+	const auto secret = MakeSecret(0xA7);
+	CJwt auth(secret);
+	// The header section has length % 4 == 1 (9 chars). Any 9-char string drawn from the b64url
+	// alphabet works; the decoder rejects on size alone before inspecting the bytes.
+	const std::string h_b64 = "AAAAAAAAA"; // 9 chars
+	const std::string p_b64 = "AAAA";      // 4 chars (mod 4 == 0)
+	const std::string signing_input = h_b64 + "." + p_b64;
+	unsigned char macCryptoPP::SHA256::DIGESTSIZE;
+	CryptoPP::HMAC<CryptoPP::SHA256> hmac(secret.data(), secret.size());
+	hmac.Update(reinterpret_cast<const unsigned char *>(signing_input.data()), signing_input.size());
+	hmac.Final(mac);
+	const std::string sig = Base64UrlEncodeForTest(mac, sizeof(mac));
+	const std::string token = signing_input + "." + sig;
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, Base64UrlDecodeRejectsNonZeroResidueBits)
+{
+	const auto secret = MakeSecret(0xA8);
+	CJwt auth(secret);
+	// 6-char b64url (len % 4 == 2) decodes to 1 byte and leaves 4 trailing bits a valid encoder
+	// always emits as 0. "AAAAAB" -> 000000 000000 000000 000000 000000 000001 -> 1 byte 0x00 +
+	// residue 0001. The decoder must reject the non-zero residue.
+	const std::string h_b64 = "AAAAAB";
+	const std::string p_b64 = "AAAA";
+	const std::string signing_input = h_b64 + "." + p_b64;
+	unsigned char macCryptoPP::SHA256::DIGESTSIZE;
+	CryptoPP::HMAC<CryptoPP::SHA256> hmac(secret.data(), secret.size());
+	hmac.Update(reinterpret_cast<const unsigned char *>(signing_input.data()), signing_input.size());
+	hmac.Final(mac);
+	const std::string sig = Base64UrlEncodeForTest(mac, sizeof(mac));
+	const std::string token = signing_input + "." + sig;
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+// Depth-cap defence against unauthenticated stack overflow. picojson::parse recurses one stack
+// frame per `{`/``. On musl, with its 128 KiB stack, a few hundred levels crash the worker -- and
+// both Verify() parse sites run BEFORE the MAC verdict, so an unauthenticated peer can submit
+// `Authorization: Bearer <crafted>` with deeply nested JSON and crash the daemon. The pre-parse
+// opener-count cap (>32 rejects) blocks both sides in O(body length) with zero allocations. These
+// craft tokens past the cap, sign with the matching HMAC so the MAC compare passes, then assert
+// Verify() rejects.
+
+namespace
+{
+
+std::string DeeplyNested(const std::string &leaf, std::size_t levels)
+{
+	// {"a":{"a":...{"a":leaf}...}}  → levels openers.
+	std::string out;
+	out.reserve(levels * 6 + leaf.size() + levels);
+	for (std::size_t i = 0; i < levels; ++i)
+		out += "{\"a\":";
+	out += leaf;
+	for (std::size_t i = 0; i < levels; ++i)
+		out += "}";
+	return out;
+}
+
+} // namespace
+
+TEST(Jwt, DeeplyNestedPayloadRejected)
+{
+	const auto secret = MakeSecret(0xA9);
+	CJwt auth(secret);
+	// 200 levels -- well over the 32-opener cap but small enough that
+	// the test stays fast and doesn't itself risk a stack overflow.
+	const std::string token =
+		CraftToken(secret, "{\"alg\":\"HS256\",\"typ\":\"JWT\"}", DeeplyNested("1", 200));
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}
+
+TEST(Jwt, DeeplyNestedHeaderRejected)
+{
+	const auto secret = MakeSecret(0xAB);
+	CJwt auth(secret);
+	const std::string token = CraftToken(
+		secret, DeeplyNested("\"x\"", 200), "{\"role\":\"admin\",\"exp\":9999999999,\"jti\":\"t\"}");
+	CJwt::VerifyResult r;
+	ASSERT_FALSE(auth.Verify(token, r));
+}

amule-3.1.0.tar.gz/unittests/tests/KadAICHHashListTest.cpp Added

@@ -0,0 +1,400 @@
+//								-*- C++ -*-
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+#include <kademlia/kademlia/AICHHashList.h>
+#include <protocol/kad2/Constants.h>
+
+using namespace muleunit;
+using Kademlia::CKadAICHHash;
+using Kademlia::CKadAICHHashList;
+
+// Builds a distinguishable 20-byte AICH root hash from a single seed byte.
+static CKadAICHHash MakeHash(uint8_t seed)
+{
+	CKadAICHHash hash;
+	for (size_t i = 0; i < hash.size(); ++i) {
+		hashi = (uint8_t)(seed + i);
+	}
+	return hash;
+}
+
+// MakeHash() varies a single byte, so it can only produce 256 distinct values. The ceiling test
+// needs more than that.
+static CKadAICHHash MakeDistinctHash(uint16_t seed)
+{
+	CKadAICHHash hash;
+	for (size_t i = 0; i < hash.size(); ++i) {
+		hashi = (uint8_t)(i);
+	}
+	hash0 = (uint8_t)(seed & 0xFF);
+	hash1 = (uint8_t)(seed >> 8);
+	return hash;
+}
+
+DECLARE_SIMPLE(KadAICHHashList)
+
+TEST(KadAICHHashList, EmptyListEncodesNothing)
+{
+	CKadAICHHashList list;
+	ASSERT_TRUE(list.IsEmpty());
+	ASSERT_EQUALS(0u, (unsigned)list.GetSlotCount());
+	ASSERT_EQUALS(0u, (unsigned)list.GetReferencedCount());
+	ASSERT_TRUE(list.EncodeResultTag().empty());
+}
+
+TEST(KadAICHHashList, AddReferenceReturnsStableIndex)
+{
+	CKadAICHHashList list;
+	const CKadAICHHash first = MakeHash(1);
+	const CKadAICHHash second = MakeHash(100);
+
+	ASSERT_EQUALS(0u, (unsigned)list.AddReference(first));
+	ASSERT_EQUALS(1u, (unsigned)list.AddReference(second));
+	// Re-adding an identical hash reuses its slot and bumps its popularity.
+	ASSERT_EQUALS(0u, (unsigned)list.AddReference(first));
+
+	ASSERT_EQUALS(2u, (unsigned)list.GetSlotCount());
+	ASSERT_EQUALS(2u, (unsigned)list.GetReferencedCount());
+	ASSERT_EQUALS(2u, (unsigned)list.GetPopularityAt(0));
+	ASSERT_EQUALS(1u, (unsigned)list.GetPopularityAt(1));
+	ASSERT_TRUE(list.GetHashAt(0) == first);
+	ASSERT_TRUE(list.GetHashAt(1) == second);
+}
+
+TEST(KadAICHHashList, DropReferenceKeepsSlotButClearsPopularity)
+{
+	CKadAICHHashList list;
+	const CKadAICHHash hash = MakeHash(7);
+	list.AddReference(hash);
+	list.AddReference(hash);
+
+	list.DropReferenceAt(0);
+	ASSERT_EQUALS(1u, (unsigned)list.GetPopularityAt(0));
+	ASSERT_EQUALS(1u, (unsigned)list.GetReferencedCount());
+
+	list.DropReferenceAt(0);
+	ASSERT_EQUALS(0u, (unsigned)list.GetPopularityAt(0));
+	ASSERT_EQUALS(0u, (unsigned)list.GetReferencedCount());
+	// The slot survives so that publisher-held indexes stay valid; only
+	// BuildCompactionMap() renumbers.
+	ASSERT_EQUALS(1u, (unsigned)list.GetSlotCount());
+	ASSERT_TRUE(list.IsEmpty());
+
+	// Dropping below zero must not underflow the popularity counter.
+	list.DropReferenceAt(0);
+	ASSERT_EQUALS(0u, (unsigned)list.GetPopularityAt(0));
+
+	// An out-of-range index is ignored rather than corrupting the list.
+	list.DropReferenceAt(CKadAICHHashList::INVALID_INDEX);
+	ASSERT_EQUALS(1u, (unsigned)list.GetSlotCount());
+}
+
+TEST(KadAICHHashList, BuildCompactionMapRenumbersReferencedSlotsOnly)
+{
+	CKadAICHHashList list;
+	list.AddReference(MakeHash(1)); // slot 0, popularity 1
+	list.AddReference(MakeHash(2)); // slot 1, popularity 1
+	list.AddReference(MakeHash(3)); // slot 2, popularity 1
+	list.DropReferenceAt(1);        // slot 1 now unreferenced
+
+	std::vector<uint16_t> map = list.BuildCompactionMap();
+	ASSERT_EQUALS(3u, (unsigned)map.size());
+	ASSERT_EQUALS(0u, (unsigned)map0);
+	ASSERT_EQUALS((unsigned)CKadAICHHashList::INVALID_INDEX, (unsigned)map1);
+	ASSERT_EQUALS(1u, (unsigned)map2);
+	ASSERT_EQUALS(2u, (unsigned)list.GetReferencedCount());
+}
+
+// Compact() is BuildCompactionMap() plus the mutation: the dropped slots actually go away.
+TEST(KadAICHHashList, CompactRemovesUnreferencedSlotsAndRenumbers)
+{
+	CKadAICHHashList list;
+	list.AddReference(MakeHash(1)); // slot 0
+	list.AddReference(MakeHash(2)); // slot 1
+	list.AddReference(MakeHash(3)); // slot 2
+	list.DropReferenceAt(1);
+
+	const std::vector<uint16_t> map = list.Compact();
+	ASSERT_EQUALS(3u, (unsigned)map.size());
+	ASSERT_EQUALS(0u, (unsigned)map0);
+	ASSERT_EQUALS((unsigned)CKadAICHHashList::INVALID_INDEX, (unsigned)map1);
+	ASSERT_EQUALS(1u, (unsigned)map2);
+
+	// The difference from BuildCompactionMap(): the slot is gone, not just renumbered.
+	ASSERT_EQUALS(2u, (unsigned)list.GetSlotCount());
+	ASSERT_EQUALS(2u, (unsigned)list.GetReferencedCount());
+	ASSERT_TRUE(list.GetHashAt(0) == MakeHash(1));
+	ASSERT_TRUE(list.GetHashAt(1) == MakeHash(3));
+}
+
+// The reason Compact() exists. A publisher that reports a different AICH hash on every republish
+// used to leave its old slot behind each time, and the entry carried them all for the life of the
+// process. Compacting after each rotation keeps the list at the one hash actually referenced.
+TEST(KadAICHHashList, RotatingHashesDoNotAccumulateSlots)
+{
+	CKadAICHHashList list;
+	uint16_t held = list.AddReference(MakeDistinctHash(0));
+
+	for (uint16_t round = 1; round < 500; ++round) {
+		list.DropReferenceAt(held);
+		held = list.AddReference(MakeDistinctHash(round));
+		const std::vector<uint16_t> map = list.Compact();
+		ASSERT_TRUE(held < map.size());
+		held = mapheld;
+	}
+
+	ASSERT_EQUALS(1u, (unsigned)list.GetSlotCount());
+	ASSERT_EQUALS(1u, (unsigned)list.GetReferencedCount());
+	ASSERT_TRUE(list.GetHashAt(held) == MakeDistinctHash(499));
+}
+
+// The backstop. An index is a uint16, so a list allowed to grow past 0xFFFF would hand back a
+// truncated index that aliases an earlier slot, crediting one publisher's hash to another.
+TEST(KadAICHHashList, AddReferenceRefusesPastTheSlotCeiling)
+{
+	CKadAICHHashList list;
+	for (size_t i = 0; i < CKadAICHHashList::MAX_SLOTS; ++i) {
+		const uint16_t index = list.AddReference(MakeDistinctHash((uint16_t)i));
+		ASSERT_EQUALS((unsigned)i, (unsigned)index);
+	}
+	ASSERT_EQUALS((unsigned)CKadAICHHashList::MAX_SLOTS, (unsigned)list.GetSlotCount());
+
+	const uint16_t refused = list.AddReference(MakeDistinctHash((uint16_t)CKadAICHHashList::MAX_SLOTS));
+	ASSERT_EQUALS((unsigned)CKadAICHHashList::INVALID_INDEX, (unsigned)refused);
+	ASSERT_EQUALS((unsigned)CKadAICHHashList::MAX_SLOTS, (unsigned)list.GetSlotCount());
+}
+
+// Wire format, pinned byte for byte:
+//   TAG_KADAICHHASHRESULT payload = <Count 1>{<Publishers 1><AICH Hash 20>} Count
+TEST(KadAICHHashList, EncodeResultTagPinsTheWireLayout)
+{
+	CKadAICHHashList list;
+	const CKadAICHHash hash = MakeHash(0x10);
+	list.AddReference(hash);
+	list.AddReference(hash);
+	list.AddReference(MakeHash(0x40));
+	list.DropReferenceAt(1); // unreferenced slots are not carried
+
+	std::vector<uint8_t> encoded = list.EncodeResultTag();
+	ASSERT_EQUALS(1u + 1u + 20u, (unsigned)encoded.size());
+	ASSERT_EQUALS(1u, (unsigned)encoded0); // hash count
+	ASSERT_EQUALS(2u, (unsigned)encoded1); // publishers of the first hash
+	for (size_t i = 0; i < CKadAICHHash().size(); ++i) {
+		ASSERT_EQUALS((unsigned)hashi, (unsigned)encoded2 + i);
+	}
+}
+
+TEST(KadAICHHashList, EncodeResultTagTruncatesToTheBsobBudget)
+{
+	CKadAICHHashList list;
+	for (unsigned i = 0; i < 30; ++i) {
+		list.AddReference(MakeHash((uint8_t)(i * 3 + 1)));
+	}
+	ASSERT_EQUALS(30u, (unsigned)list.GetReferencedCount());
+
+	std::vector<uint8_t> encoded = list.EncodeResultTag();
+	ASSERT_EQUALS((unsigned)CKadAICHHashList::MAX_RESULT_HASHES, (unsigned)encoded0);
+	ASSERT_EQUALS(
+		1u + (1u + 20u) * (unsigned)CKadAICHHashList::MAX_RESULT_HASHES, (unsigned)encoded.size());
+	// Kad BSOB tags carry a uint8 length, so the payload must fit in 255
+	// bytes; the class holds itself to the tighter 250-byte budget.
+	ASSERT_TRUE(encoded.size() <= CKadAICHHashList::MAX_RESULT_TAG_SIZE);
+}
+
+TEST(KadAICHHashList, DecodeResultTagRoundTripsEncode)
+{
+	CKadAICHHashList list;
+	const CKadAICHHash popular = MakeHash(0x21);
+	const CKadAICHHash rare = MakeHash(0x81);
+	list.AddReference(popular);
+	list.AddReference(popular);
+	list.AddReference(popular);
+	list.AddReference(rare);
+
+	std::vector<uint8_t> encoded = list.EncodeResultTag();
+	std::vector<CKadAICHHashList::SResultHash> decoded;
+	ASSERT_TRUE(CKadAICHHashList::DecodeResultTag(&encoded0, encoded.size(), decoded));
+
+	ASSERT_EQUALS(2u, (unsigned)decoded.size());
+	ASSERT_EQUALS(3u, (unsigned)decoded0.m_popularity);
+	ASSERT_TRUE(decoded0.m_hash == popular);
+	ASSERT_EQUALS(1u, (unsigned)decoded1.m_popularity);
+	ASSERT_TRUE(decoded1.m_hash == rare);
+}
+
+TEST(KadAICHHashList, DecodeResultTagRejectsMalformedPayloads)
+{
+	std::vector<CKadAICHHashList::SResultHash> decoded;
+
+	// No payload at all.
+	ASSERT_FALSE(CKadAICHHashList::DecodeResultTag(NULL, 0, decoded));
+
+	// Announces one hash but carries a truncated one.
+	std::vector<uint8_t> truncated(1 + 1 + 19, 0);
+	truncated0 = 1;
+	truncated1 = 1;
+	ASSERT_FALSE(CKadAICHHashList::DecodeResultTag(&truncated0, truncated.size(), decoded));
+	ASSERT_TRUE(decoded.empty());
+
+	// Announces more hashes than the wire budget allows.
+	std::vector<uint8_t> overlong(1 + (1 + 20) * 12, 0);
+	overlong0 = 12;
+	ASSERT_FALSE(CKadAICHHashList::DecodeResultTag(&overlong0, overlong.size(), decoded));
+	ASSERT_TRUE(decoded.empty());
+}
+
+TEST(KadAICHHashList, DecodeResultTagDropsZeroPopularityEntries)
+{
+	// A zero publisher count carries no information and is what a peer that
+	// has evicted its publishers would emit; it must not reach the caller.
+	std::vector<uint8_t> payload(1 + (1 + 20) * 2, 0);
+	payload0 = 2;
+	payload1 = 0; // first hash: no publishers
+	payload1 + 1 + 20 = 5;
+	payload1 + 1 + 20 + 1 = 0xAB;
+
+	std::vector<CKadAICHHashList::SResultHash> decoded;
+	ASSERT_TRUE(CKadAICHHashList::DecodeResultTag(&payload0, payload.size(), decoded));
+	ASSERT_EQUALS(1u, (unsigned)decoded.size());
+	ASSERT_EQUALS(5u, (unsigned)decoded0.m_popularity);
+	ASSERT_EQUALS(0xABu, (unsigned)decoded0.m_hash0);
+}
+
+TEST(KadAICHHashList, DecodeResultTagIgnoresTrailingGarbage)
+{
+	// A well-formed prefix followed by junk is accepted for the announced
+	// count only: peers may pad, and an honest count must still be usable.
+	std::vector<uint8_t> payload(1 + (1 + 20) + 7, 0xFF);
+	payload0 = 1;
+	payload1 = 3;
+
+	std::vector<CKadAICHHashList::SResultHash> decoded;
+	ASSERT_TRUE(CKadAICHHashList::DecodeResultTag(&payload0, payload.size(), decoded));
+	ASSERT_EQUALS(1u, (unsigned)decoded.size());
+	ASSERT_EQUALS(3u, (unsigned)decoded0.m_popularity);
+}
+
+// eMule 0.70b refuses to pick between competing hashes rather than crowning the most popular one.
+// The distinction is the whole test: the popularity figure is supplied by the publishers
+// themselves, so in a contested set the liar also controls the number that would decide the vote.
+TEST(KadAICHHashList, CompetingHashesAreAllRefused)
+{
+	std::vector<CKadAICHHashList::SResultHash> decoded;
+	CKadAICHHashList::SResultHash a = { 2, MakeHash(1) };
+	CKadAICHHashList::SResultHash b = { 9, MakeHash(2) };
+	CKadAICHHashList::SResultHash c = { 4, MakeHash(3) };
+	decoded.push_back(a);
+	decoded.push_back(b);
+	decoded.push_back(c);
+
+	// 9 out of 10 publishers would pass the ratio comfortably if it were
+	// reached. It is not: more than one hash ends the question.
+	ASSERT_TRUE(CKadAICHHashList::SelectTrusted(decoded, 10) == NULL);
+
+	// Two is already more than one.
+	decoded.pop_back();
+	decoded.pop_back();
+	CKadAICHHashList::SResultHash d = { 1, MakeHash(4) };
+	decoded.push_back(d);
+	ASSERT_TRUE(CKadAICHHashList::SelectTrusted(decoded, 10) == NULL);
+}
+
+// A lone hash is necessary but not sufficient: it still has to come from at
+// least a third of the publishers known for the file.
+TEST(KadAICHHashList, ALoneHashStillNeedsAThirdOfThePublishers)
+{
+	std::vector<CKadAICHHashList::SResultHash> decoded;
+	CKadAICHHashList::SResultHash only = { 4, MakeHash(1) };
+	decoded.push_back(only);
+
+	// 12 / 4 == 3: exactly at the boundary, and accepted.
+	const CKadAICHHashList::SResultHash *best = CKadAICHHashList::SelectTrusted(decoded, 12);
+	ASSERT_TRUE(best != NULL);
+	ASSERT_TRUE(best->m_hash == MakeHash(1));
+
+	// 13 / 4 == 3 by integer division, so the boundary is where upstream's
+	// own arithmetic puts it rather than where exact division would.
+	ASSERT_TRUE(CKadAICHHashList::SelectTrusted(decoded, 13) != NULL);
+
+	// 16 / 4 == 4: four publishers for every one that names this hash.
+	ASSERT_TRUE(CKadAICHHashList::SelectTrusted(decoded, 16) == NULL);
+
+	// No publisher count is not a passing ratio. The ratio alone would let it through, 0
+	// divided by anything being 0, which is why upstream guards byPublishers > 0 separately and
+	// so do we: a missing TAG_PUBLISHINFO means there is no count to be a third of, and
+	// accepting it would make the least corroborated result the easiest to get accepted.
+	ASSERT_TRUE(CKadAICHHashList::SelectTrusted(decoded, 0) == NULL);
+
+	decoded.clear();
+	ASSERT_TRUE(CKadAICHHashList::SelectTrusted(decoded, 10) == NULL);
+}
+
+// Mixed-version publish and search. Both the publish gate (TAG_KADAICHHASHPUB) and the
+// result gate (TAG_KADAICHHASHRESULT) consult this one predicate, so pinning it pins the version
+// behaviour of both directions.
+TEST(KadAICHHashList, AICHKeywordStorageIsGatedOnKadVersion0x09)
+{
+	// A peer we could not identify gets no credit.
+	ASSERT_FALSE(CKadAICHHashList::PeerSupportsAICHKeywordStorage(0x00));
+	// Every version below 0x09 is unaffected: it is neither sent the publish
+	// tag nor believed if it claims to send the result tag.
+	ASSERT_FALSE(CKadAICHHashList::PeerSupportsAICHKeywordStorage(KADEMLIA_VERSION6_49aBETA));
+	ASSERT_FALSE(CKadAICHHashList::PeerSupportsAICHKeywordStorage(KADEMLIA_VERSION7_49a));
+	ASSERT_FALSE(CKadAICHHashList::PeerSupportsAICHKeywordStorage(KADEMLIA_VERSION8_49b));
+	// 0x09 introduced AICH hashes on keyword storage; 0x0a and later keep it.
+	ASSERT_TRUE(CKadAICHHashList::PeerSupportsAICHKeywordStorage(KADEMLIA_VERSION9_50a));
+	ASSERT_TRUE(CKadAICHHashList::PeerSupportsAICHKeywordStorage(0x0a));
+	ASSERT_TRUE(CKadAICHHashList::PeerSupportsAICHKeywordStorage(0xFF));
+}
+
+// The version byte we advertise is what makes this change visible on the wire, so both states of
+// the ENABLE_KAD_PROTOCOL_10 switch are pinned here: with the switch off aMule must still announce
+// 0x08, exactly as upstream does, and must not claim AICH keyword storage it does not use.
+TEST(KadAICHHashList, AdvertisedKadVersionFollowsTheBuildSwitch)
+{
+#ifdef ENABLE_KAD_PROTOCOL_10
+	ASSERT_EQUALS(0x0au, (unsigned)KADEMLIA_VERSION);
+	ASSERT_TRUE(CKadAICHHashList::PeerSupportsAICHKeywordStorage(KADEMLIA_VERSION));
+#else
+	ASSERT_EQUALS(0x08u, (unsigned)KADEMLIA_VERSION);
+	ASSERT_FALSE(CKadAICHHashList::PeerSupportsAICHKeywordStorage(KADEMLIA_VERSION));
+#endif
+	// The eD2k CT_EMULE_MISCOPTIONS2 capability field reserves four bits for the Kad version
+	// (BaseClient.cpp, uKadVersion << 0), so a bump past 0x0F needs that field changed first.
+	ASSERT_TRUE(KADEMLIA_VERSION <= 0x0F);
+}
+
+TEST(KadAICHHashList, PopularitySaturatesInsteadOfWrapping)
+{
+	CKadAICHHashList list;
+	const CKadAICHHash hash = MakeHash(0x55);
+	for (unsigned i = 0; i < 300; ++i) {
+		list.AddReference(hash);
+	}
+	// Popularity travels the wire as a uint8, so it must clamp at 255
+	// rather than wrap back through zero and lose the hash entirely.
+	ASSERT_EQUALS(255u, (unsigned)list.GetPopularityAt(0));
+	ASSERT_EQUALS(1u, (unsigned)list.GetSlotCount());
+}

amule-3.1.0.tar.gz/unittests/tests/KadEntryTagListTest.cpp Added

@@ -0,0 +1,210 @@
+//								-*- C++ -*-
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+#include <kademlia/kademlia/Entry.h>
+#include <kademlia/kademlia/AICHHashList.h>
+#include <MemFile.h>
+#include <Tag.h>
+#include <tags/FileTags.h>
+
+using namespace muleunit;
+using Kademlia::CKadAICHHashList;
+using Kademlia::CKeyEntry;
+
+// A search answer carries its tag count in a single byte, so the invariant these tests pin is that
+// the byte equals the number of tags that actually follow it. It matters more than it looks:
+// CKademliaUDPListener::ProcessSearchResponse() reads several answers out of one packet in
+// sequence, so a count that disagrees with the tags present does not merely garble its own answer,
+// it desynchronises every later one in the packet.
+//
+// Each test therefore appends a sentinel where the next answer would start and reads it back. That
+// catches a miscount in either direction, which asserting on the tag total alone does not.
+//
+// The expected tag total is deliberately never hardcoded: WriteTagListWithPublishInfo() writes one
+// tag of its own without ENABLE_KAD_PROTOCOL_10 and up to two with it, and these tests are meant
+// to hold in both configurations.
+
+static const uint32_t SENTINEL = 0xA1C4DEADu;
+
+// WriteTagListWithPublishInfo() needs a publisher, or it wxFAILs and falls back to a plain tag
+// list. Registering one means two steps, not one: the entry's own list, and the global per-/24
+// count. ReCalculateTrustValue() looks the publisher's subnet up in that global map and wxFAILs
+// on a miss, so pushing onto the list alone leaves the entry in a state the trust calculation
+// treats as an inconsistency. The destructor decrements the same global count, so the two stay
+// balanced as long as the entry is left to destruct normally.
+class CTestKeyEntry : public CKeyEntry
+{
+public:
+	void AddTestPublisher(uint32_t ip)
+	{
+		if (m_publishingIPs == NULL) {
+			m_publishingIPs = new PublishingIPList;
+		}
+		sPublishingIP publisher;
+		publisher.m_ip = ip;
+		publisher.m_lastPublish = 0;
+		publisher.m_aichHashIdx = CKadAICHHashList::INVALID_INDEX;
+		m_publishingIPs->push_back(publisher);
+		AdjustGlobalPublishTracking(ip, true, wxT("test publisher"));
+	}
+
+	// GetTrustValue() only recalculates when its last result is older than ten minutes, and the
+	// timestamp starts at zero, so on a freshly booted machine the comparison is against uptime
+	// and the recalculation never happens. Force it instead of depending on how long the runner
+	// has been up.
+	void RecalculateTrustNow() { ReCalculateTrustValue(); }
+
+	void AddDistinctTags(uint32_t count)
+	{
+		for (uint32_t i = 0; i < count; ++i) {
+			// Multi-character names, so none can collide with the single-byte tags the
+			// writer handles specially (TAG_FILENAME, TAG_FILESIZE, TAG_PUBLISHINFO).
+			AddTag(new CTagVarInt(wxString::Format(wxT("t%u"), i), i), 0);
+		}
+	}
+};
+
+// Writes one answer the way a keyword search response does, then a sentinel where the next answer
+// would begin. Returns the tag count byte the writer put on the wire.
+static uint8_t WriteAnswerWithSentinel(CTestKeyEntry &entry, CMemFile &file)
+{
+	entry.WriteTagListWithPublishInfo(&file);
+	file.WriteUInt32(SENTINEL);
+
+	file.Seek(0);
+	const uint8_t declared = file.ReadUInt8();
+	file.Seek(0);
+	return declared;
+}
+
+// Reads the tag list back and checks the stream lands exactly on the sentinel afterwards.
+static void ReadBackAndCheckAlignment(CMemFile &file, TagPtrList *tags)
+{
+	file.ReadTagPtrList(tags, false /*bOptACP*/);
+	ASSERT_EQUALS(SENTINEL, file.ReadUInt32());
+	ASSERT_EQUALS(file.GetLength(), file.GetPosition());
+}
+
+// How many of the tags came from AddDistinctTags().
+static uint32_t CountEntryTags(const TagPtrList &tags)
+{
+	uint32_t found = 0;
+	for (TagPtrList::const_iterator it = tags.begin(); it != tags.end(); ++it) {
+		if ((*it)->GetName().StartsWith(wxT("t"))) {
+			found++;
+		}
+	}
+	return found;
+}
+
+DECLARE_SIMPLE(KadEntryTagList)
+
+// The ordinary case: every tag the entry holds fits, and the count describes all of them plus the
+// writer's own.
+TEST(KadEntryTagList, CountDescribesEveryTagThatFollows)
+{
+	CTestKeyEntry entry;
+	entry.AddTestPublisher(0x0A000001);
+	entry.SetFileName(wxT("knoppix.iso"));
+	entry.m_uSize = 4096;
+	entry.AddDistinctTags(5);
+	ASSERT_EQUALS(7u, entry.GetTagCount()); // 5 + size + filename
+
+	// The publisher is registered in the global per-subnet map, so the trust calculation finds
+	// its /24 and scores it. A zero here means the registration was skipped and
+	// ReCalculateTrustValue() took its wxFAIL branch instead -- which is silent on some
+	// platforms, so this assertion is what makes that visible everywhere.
+	entry.RecalculateTrustNow();
+	ASSERT_TRUE(entry.GetTrustValue() > 0.0);
+
+	CMemFile file;
+	const uint8_t declared = WriteAnswerWithSentinel(entry, file);
+
+	TagPtrList tags;
+	ReadBackAndCheckAlignment(file, &tags);
+
+	ASSERT_EQUALS((uint32_t)declared, (uint32_t)tags.size());
+	// Nothing was dropped: all five entry tags are there, as are the name and size.
+	ASSERT_EQUALS(5u, CountEntryTags(tags));
+	ASSERT_TRUE(tags.size() > entry.GetTagCount()); // plus at least the publish-info tag
+
+	deleteTagPtrListEntries(&tags);
+}
+
+// More tags than one byte can describe. Before the clamp the count wrapped to 0 and every tag was
+// written anyway, so a reader took 0 tags and then parsed tag bytes as the next answer's hash.
+TEST(KadEntryTagList, AnOverFullEntrySendsAShortAnswerThatStillParses)
+{
+	CTestKeyEntry entry;
+	entry.AddTestPublisher(0x0A000001);
+	entry.SetFileName(wxT("knoppix.iso"));
+	entry.m_uSize = 4096;
+	entry.AddDistinctTags(300);
+	ASSERT_EQUALS(302u, entry.GetTagCount());
+
+	CMemFile file;
+	const uint8_t declared = WriteAnswerWithSentinel(entry, file);
+
+	// Clamped to what the byte can express, not wrapped.
+	ASSERT_EQUALS(0xFFu, (uint32_t)declared);
+
+	TagPtrList tags;
+	ReadBackAndCheckAlignment(file, &tags);
+	ASSERT_EQUALS(0xFFu, (uint32_t)tags.size());
+
+	// The writer's own tags are reserved out of the same budget rather than dropped, so the
+	// surplus comes off the entry's tag list and the publish info still arrives.
+	ASSERT_TRUE(CountEntryTags(tags) < 0xFFu);
+	bool publishInfoPresent = false;
+	for (TagPtrList::const_iterator it = tags.begin(); it != tags.end(); ++it) {
+		if (!(*it)->GetName().Cmp(TAG_PUBLISHINFO)) {
+			publishInfoPresent = true;
+		}
+	}
+	ASSERT_TRUE(publishInfoPresent);
+
+	deleteTagPtrListEntries(&tags);
+}
+
+// Exactly at the boundary, where an off-by-one in the reservation would show up.
+TEST(KadEntryTagList, TheBoundaryIsDescribedExactly)
+{
+	CTestKeyEntry entry;
+	entry.AddTestPublisher(0x0A000001);
+	entry.SetFileName(wxT("knoppix.iso"));
+	entry.m_uSize = 4096;
+	entry.AddDistinctTags(253); // 253 + size + filename == 255
+	ASSERT_EQUALS(0xFFu, entry.GetTagCount());
+
+	CMemFile file;
+	const uint8_t declared = WriteAnswerWithSentinel(entry, file);
+	ASSERT_EQUALS(0xFFu, (uint32_t)declared);
+
+	TagPtrList tags;
+	ReadBackAndCheckAlignment(file, &tags);
+	ASSERT_EQUALS(0xFFu, (uint32_t)tags.size());
+
+	deleteTagPtrListEntries(&tags);
+}

amule-3.1.0.tar.gz/unittests/tests/LanguageListTest.cpp Added

@@ -0,0 +1,183 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 "LanguageList.h"
+
+#include "OtherFunctions.h"
+
+#include <muleunit/test.h>
+
+#include <wx/dir.h>
+#include <wx/filename.h>
+#include <wx/intl.h>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(LanguageList)
+
+//! Catalogs that ship but are deliberately not offered in the picker, because they hold (next to)
+//! no translated strings: offering them would show an English UI under a native-language label.
+//! Move one into GetLanguageList() once it is actually translated.
+static const char *const s_unlistedCatalogs = { "bn", "ta", "vi" };
+
+static bool IsUnlisted(const wxString &catalog)
+{
+	for (const char *unlisted : s_unlistedCatalogs) {
+		if (catalog == unlisted) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static wxArrayString PoBasenames()
+{
+	wxArrayString names;
+	wxDir dir(wxSTRINGIZE_T(PO_SRCDIR));
+	if (!dir.IsOpened()) {
+		return names;
+	}
+
+	wxString file;
+	for (bool ok = dir.GetFirst(&file, "*.po", wxDIR_FILES); ok; ok = dir.GetNext(&file)) {
+		names.Add(wxFileName(file).GetName());
+	}
+
+	return names;
+}
+
+// The picker matches a catalog by name, so an entry naming a po file that is not
+// there is a language silently missing from Preferences.
+TEST(LanguageList, EveryListedCatalogExists)
+{
+	const wxArrayString po = PoBasenames();
+	ASSERT_TRUE(!po.IsEmpty());
+
+	std::size_t count = 0;
+	const SLanguageEntry *languages = GetLanguageList(count);
+	for (std::size_t i = 0; i < count; ++i) {
+		if (!*languagesi.catalog) {
+			continue;
+		}
+
+		CONTEXT(wxString("Listed language: ") + languagesi.name);
+		ASSERT_TRUE_M(po.Index(languagesi.catalog) != wxNOT_FOUND,
+			wxString("No po/") + languagesi.catalog + ".po for " + languagesi.name);
+	}
+}
+
+// The other direction: a translation added to po/ without a list entry never reaches the picker.
+// Failing here is the prompt to add it, or to record it as a deliberately unlisted stub.
+TEST(LanguageList, EveryCatalogIsListedOrDeliberatelyNot)
+{
+	const wxArrayString po = PoBasenames();
+	ASSERT_TRUE(!po.IsEmpty());
+
+	std::size_t count = 0;
+	const SLanguageEntry *languages = GetLanguageList(count);
+	for (const wxString &catalog : po) {
+		CONTEXT(wxString("Catalog: ") + catalog);
+
+		bool listed = false;
+		for (std::size_t j = 0; j < count && !listed; ++j) {
+			listed = (catalog == languagesj.catalog);
+		}
+
+		ASSERT_TRUE_M(listed || IsUnlisted(catalog),
+			wxString("po/") + catalog +
+				".po is neither in GetLanguageList() nor recorded as an "
+				"untranslated stub");
+	}
+}
+
+// FindLanguageEntry() accepts a language under two names, so no two entries may
+// answer to the same one.
+TEST(LanguageList, NoTwoEntriesClaimTheSameLanguage)
+{
+	std::size_t count = 0;
+	const SLanguageEntry *languages = GetLanguageList(count);
+	for (std::size_t i = 0; i < count; ++i) {
+		CONTEXT(wxString("Entry: ") + languagesi.name);
+
+		ASSERT_EQUALS(static_cast<int>(i), FindLanguageEntry(wxLang2Str(languagesi.wxId)));
+
+		if (*languagesi.catalog) {
+			ASSERT_EQUALS(static_cast<int>(i), FindLanguageEntry(languagesi.catalog));
+		}
+	}
+}
+
+// The three languages whose catalog directory is not the wx canonical name. A
+// config can spell these either way, and both must land on the same entry.
+TEST(LanguageList, BothSpellingsFindTheSameEntry)
+{
+	ASSERT_EQUALS(FindLanguageEntry("et"), FindLanguageEntry("et_EE"));
+	ASSERT_EQUALS(FindLanguageEntry("ko"), FindLanguageEntry("ko_KR"));
+	ASSERT_EQUALS(FindLanguageEntry("pt"), FindLanguageEntry("pt_PT"));
+
+	// Portuguese and its Brazilian variant stay apart.
+	ASSERT_TRUE(FindLanguageEntry("pt_PT") != FindLanguageEntry("pt_BR"));
+}
+
+// An empty or unrecognised value is what a fresh or hand-broken config holds, and
+// the app runs it as the system language.
+TEST(LanguageList, AnUnknownLanguageIsTheSystemDefault)
+{
+	std::size_t count = 0;
+	const SLanguageEntry *languages = GetLanguageList(count);
+	ASSERT_TRUE(count > 0);
+	ASSERT_EQUALS(wxLANGUAGE_DEFAULT, languages0.wxId);
+
+	ASSERT_EQUALS(0, FindLanguageEntry(""));
+	ASSERT_EQUALS(0, FindLanguageEntry("no-such-language"));
+}
+
+TEST(LanguageList, AvailabilityFollowsTheInstalledCatalogs)
+{
+	wxArrayString installed;
+	installed.Add("de");
+	installed.Add("et_EE");
+
+	std::size_t count = 0;
+	const SLanguageEntry *languages = GetLanguageList(count);
+
+	const int german = FindLanguageEntry("de");
+	const int estonian = FindLanguageEntry("et_EE");
+	const int italian = FindLanguageEntry("it");
+	ASSERT_TRUE(german >= 0 && estonian >= 0 && italian >= 0);
+
+	ASSERT_TRUE(IsLanguageAvailable(languagesgerman, installed));
+	ASSERT_TRUE(IsLanguageAvailable(languagesestonian, installed));
+	ASSERT_FALSE(IsLanguageAvailable(languagesitalian, installed));
+
+	// System default and the source language ship no catalog and are always offered.
+	for (std::size_t i = 0; i < count; ++i) {
+		if (!*languagesi.catalog) {
+			CONTEXT(wxString("Catalog-less entry: ") + languagesi.name);
+			ASSERT_TRUE(IsLanguageAvailable(languagesi, installed));
+			ASSERT_TRUE(IsLanguageAvailable(languagesi, wxArrayString()));
+		}
+	}
+}

amule-3.1.0.tar.gz/unittests/tests/LibSocketTransportTest.cpp Added

@@ -0,0 +1,213 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include <libs/common/Format.h>
+#include <LibSocket.h>
+#include <amuleIPV4Address.h>
+#include <StreamTransport.h>
+
+#include <cstring>
+#include <memory>
+#include <utility>
+#include <vector>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(LibSocketTransport)
+
+// Link seams: CLibSocket's asio side reaches the notification layer and the
+// address helpers, which pull in the application. Nothing here drives an asio
+// callback, so these are never called.
+namespace MuleNotify
+{
+class CMuleNotiferBase;
+void HandleNotificationAlways(const CMuleNotiferBase &);
+void HandleNotificationAlways(const CMuleNotiferBase &) {}
+} // namespace MuleNotify
+
+bool StringIPtoUint32(const wxString &, uint32 &);
+bool StringIPtoUint32(const wxString &, uint32 &)
+{
+	return false;
+}
+
+namespace
+{
+// Answers an asio socket would never give: a fresh CLibSocket is not connected,
+// not ok, and has no peer, so an assertion can only pass through the transport.
+class CFakeTransport : public IStreamTransport
+{
+public:
+	explicit CFakeTransport(CNetworkAddress peer = CNetworkAddress::FromString("192.0.2.7"))
+	: peer(std::move(peer))
+	{
+	}
+
+	bool IsConnected() const override { return true; }
+	bool IsInbound() const override { return false; }
+	void SetEvents(IStreamTransportEvents *) override {}
+	bool ObfuscatesStream() const override { return false; }
+	bool IsOk() const override { return ok; }
+	bool BlocksRead() const override { return true; }
+	bool BlocksWrite() const override { return true; }
+	int LastError() const override { return 0x7501; }
+	CNetworkAddress GetPeerAddress() const override { return peer; }
+	uint16_t GetPeerPort() const override { return 4662; }
+
+	uint32_t Read(void *buffer, uint32_t length) override
+	{
+		const uint32_t taken = length < 4 ? length : 4;
+		std::memcpy(buffer, "utp!", taken);
+		return taken;
+	}
+
+	uint32_t Write(const void *buffer, uint32_t length) override
+	{
+		const auto *in = static_cast<const uint8_t *>(buffer);
+		written.insert(written.end(), in, in + length);
+		return length;
+	}
+
+	void Close() override { ++closeCalls; }
+	void Flush() override { ++flushCalls; }
+
+	bool ok = true;
+	std::vector<uint8_t> written;
+	int closeCalls = 0;
+	int flushCalls = 0;
+	CNetworkAddress peer;
+};
+
+//! Attaches a fake and hands back a borrowed pointer; the socket owns it.
+CFakeTransport *Attach(CLibSocket &socket, CNetworkAddress peer = CNetworkAddress::FromString("192.0.2.7"))
+{
+	auto owned = std::make_unique<CFakeTransport>(std::move(peer));
+	CFakeTransport *borrowed = owned.get();
+	socket.AttachTransport(std::move(owned));
+	return borrowed;
+}
+} // namespace
+
+// One table because the value is that the list is exhaustive: none of these are
+// virtual, so one left unrouted resolves statically to the asio socket -- which
+// is how CEMSocket::Send()'s !IsOk() arm would stay dead after wiring.
+TEST(LibSocketTransport, EveryStreamAccessorAnswersFromTheTransport)
+{
+	CLibSocket socket;
+	Attach(socket);
+
+	const struct
+	{
+		const char *label;
+		bool fromTransport;
+		bool fromSocket;
+	} cases = {
+		{ "IsConnected", socket.IsConnected(), false },
+		{ "IsOk", socket.IsOk(), false },
+		{ "BlocksRead", socket.BlocksRead(), false },
+		{ "BlocksWrite", socket.BlocksWrite(), false },
+	};
+	for (const auto &row : cases) {
+		CFormat format("%s answered from the socket, not the transport");
+		const wxString message = format % row.label;
+		ASSERT_TRUE_M(row.fromTransport != row.fromSocket, message);
+	}
+
+	// Opaque by contract; what matters is whose value it is.
+	ASSERT_EQUALS(0x7501, socket.LastError());
+}
+
+TEST(LibSocketTransport, ReadAndWriteReachTheTransport)
+{
+	CLibSocket socket;
+	CFakeTransport *fake = Attach(socket);
+
+	char out8 = { 0 };
+	ASSERT_EQUALS(4u, socket.Read(out, sizeof(out)));
+	ASSERT_TRUE(std::string(out, 4) == "utp!");
+
+	const char payload = "abc";
+	ASSERT_EQUALS(3u, socket.Write(payload, 3));
+	ASSERT_EQUALS(3u, (unsigned)fake->written.size());
+}
+
+TEST(LibSocketTransport, ThePeerIsTheTransportsPeer)
+{
+	CLibSocket socket;
+	Attach(socket);
+
+	ASSERT_TRUE(socket.GetPeer() == wxString("192.0.2.7"));
+	ASSERT_TRUE(socket.GetPeerAddress() == CNetworkAddress::FromString("192.0.2.7"));
+	// Narrowed at this accessor only, because its type is the ed2k wire form.
+	ASSERT_TRUE(socket.GetPeerInt() != 0);
+	ASSERT_TRUE(wxString(socket.GetIP()) == wxString("192.0.2.7"));
+}
+
+TEST(LibSocketTransport, NativePeerAddressSurvivesTheTransportFacade)
+{
+	const CNetworkAddress peer = CNetworkAddress::IPv6FromOctets(
+		{ 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 });
+	CLibSocket socket;
+	Attach(socket, peer);
+
+	ASSERT_TRUE(socket.GetPeerAddress() == peer);
+	ASSERT_EQUALS(0u, socket.GetPeerInt());
+}
+
+TEST(LibSocketTransport, DiallingIsRefusedWhileATransportIsAttached)
+{
+	// Pins intent and does NOT discriminate: an unconnected asio socket refuses
+	// this address too. Discriminating needs a connectable peer.
+	CLibSocket socket;
+	Attach(socket);
+
+	amuleIPV4Address address;
+	address.Hostname(wxString("192.0.2.9"));
+	address.Service(4662);
+	ASSERT_FALSE(socket.Connect(address, false));
+}
+
+TEST(LibSocketTransport, ClosingGoesToTheTransportAndIsIdempotent)
+{
+	CLibSocket socket;
+	CFakeTransport *fake = Attach(socket);
+
+	socket.Close();
+	socket.Close();
+	// Close-once lives in the transport; what matters is the calls arrive there.
+	ASSERT_EQUALS(2, fake->closeCalls);
+}
+
+TEST(LibSocketTransport, AnUnattachedSocketStillAnswersForItself)
+{
+	// A socket with no transport behaves as it did before the facade existed.
+	CLibSocket socket;
+	ASSERT_FALSE(socket.HasTransport());
+	ASSERT_FALSE(socket.IsConnected());
+	ASSERT_FALSE(socket.IsOk());
+}
+
+// File_checked_for_headers

amule-3.1.0.tar.gz/unittests/tests/ListColumnStoreTest.cpp Added

@@ -0,0 +1,125 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// CListColumnStore maps a column's id to its persistence key and default width. The key is the on-
+// disk config format (TableWidths*/TableOrdering*), so the id a caller registers has to be the id
+// it can look the column back up by -- if the store renumbered stored ids, a saved width would come
+// back attached to a different column, silently.
+//
+// These tests pin that the registry is a plain sorted insert. Registering out of order is the case
+// that matters: it never happens in the app today, because every list registers its columns in
+// ascending order, which is exactly why a renumbering bug in this path could sit here unnoticed.
+
+#include <muleunit/test.h>
+
+#include <ListColumnStore.h>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(CListColumnStore)
+
+TEST(CListColumnStore, RegistrationOutOfOrderKeepsEveryColumnAddressable)
+{
+	// The middle insert: 1 lands between columns already registered, the shape a renumbering
+	// insert would corrupt -- moving 2 and 3 out from under the callers that still ask for them
+	// by those ids.
+	//
+	// Two entries have to follow the insertion point for that to be visible. With only one, an
+	// off-by-one in such a loop skips the single displaced entry and the damage lands somewhere
+	// unobservable instead.
+	CListColumnStore store;
+	store.RegisterColumn(0, 250, "N");
+	store.RegisterColumn(2, 100, "Z");
+	store.RegisterColumn(3, 90, "Y");
+	store.RegisterColumn(1, 70, "P");
+
+	ASSERT_EQUALS(wxString("N"), store.GetColumnName(0));
+	ASSERT_EQUALS(wxString("P"), store.GetColumnName(1));
+	ASSERT_EQUALS(wxString("Z"), store.GetColumnName(2));
+	ASSERT_EQUALS(wxString("Y"), store.GetColumnName(3));
+
+	ASSERT_EQUALS(250, store.GetColumnDefaultWidth(0));
+	ASSERT_EQUALS(70, store.GetColumnDefaultWidth(1));
+	ASSERT_EQUALS(100, store.GetColumnDefaultWidth(2));
+	ASSERT_EQUALS(90, store.GetColumnDefaultWidth(3));
+}
+
+TEST(CListColumnStore, KeyLookupSurvivesOutOfOrderRegistration)
+{
+	// The reverse direction, which is how a saved config finds its column:
+	// LoadSettings() reads a key and calls GetColumnIndex() to place it.
+	CListColumnStore store;
+	store.RegisterColumn(0, 250, "N");
+	store.RegisterColumn(2, 100, "Z");
+	store.RegisterColumn(1, 70, "P");
+
+	ASSERT_EQUALS(0, store.GetColumnIndex("N"));
+	ASSERT_EQUALS(1, store.GetColumnIndex("P"));
+	ASSERT_EQUALS(2, store.GetColumnIndex("Z"));
+}
+
+TEST(CListColumnStore, AscendingRegistrationIsUnchanged)
+{
+	// What every list in the app actually does; guards the common path against
+	// a regression in the insert itself.
+	CListColumnStore store;
+	store.RegisterColumn(0, 400, "N");
+	store.RegisterColumn(1, 100, "Z");
+	store.RegisterColumn(2, 90, "Y");
+
+	ASSERT_EQUALS(wxString("N"), store.GetColumnName(0));
+	ASSERT_EQUALS(wxString("Z"), store.GetColumnName(1));
+	ASSERT_EQUALS(wxString("Y"), store.GetColumnName(2));
+
+	ASSERT_EQUALS(400, store.GetColumnDefaultWidth(0));
+	ASSERT_EQUALS(100, store.GetColumnDefaultWidth(1));
+	ASSERT_EQUALS(90, store.GetColumnDefaultWidth(2));
+
+	ASSERT_EQUALS(0, store.GetColumnIndex("N"));
+	ASSERT_EQUALS(1, store.GetColumnIndex("Z"));
+	ASSERT_EQUALS(2, store.GetColumnIndex("Y"));
+}
+
+TEST(CListColumnStore, NonContiguousIdsAreKeptAsGiven)
+{
+	// Ids need not be dense: the store must not compact them into positions.
+	CListColumnStore store;
+	store.RegisterColumn(5, 120, "T");
+	store.RegisterColumn(9, 130, "H");
+
+	ASSERT_EQUALS(wxString("T"), store.GetColumnName(5));
+	ASSERT_EQUALS(wxString("H"), store.GetColumnName(9));
+	ASSERT_EQUALS(5, store.GetColumnIndex("T"));
+	ASSERT_EQUALS(9, store.GetColumnIndex("H"));
+}
+
+TEST(CListColumnStore, UnknownColumnsReportTheirMissValues)
+{
+	CListColumnStore store;
+	store.RegisterColumn(0, 250, "N");
+
+	ASSERT_TRUE(store.GetColumnName(7).IsEmpty());
+	ASSERT_EQUALS(-1, store.GetColumnDefaultWidth(7)); // wxLIST_AUTOSIZE
+	ASSERT_EQUALS(-1, store.GetColumnIndex("nope"));
+}

amule-3.1.0.tar.gz/unittests/tests/LogTeeTest.cpp Added

@@ -0,0 +1,655 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include <muleunit/test.h>
+
+#include "LogTee.h"
+
+#include <algorithm>
+#include <cstdio>
+#include <fstream>
+#ifdef _WIN32
+#include <io.h>
+#else
+#include <fcntl.h>
+#include <unistd.h>
+#endif
+#include <sstream>
+#include <string>
+#include <vector>
+
+using namespace muleunit;
+using namespace webapi;
+
+DECLARE_SIMPLE(LogTee)
+
+namespace
+{
+
+std::string ReadFile(const std::string &path)
+{
+	std::ifstream f(path, std::ios::binary);
+	std::ostringstream ss;
+	ss << f.rdbuf();
+	return ss.str();
+}
+
+// Raw write to a descriptor, the way the crash handler reaches the log.
+long OsWriteFd(int fd, const void *buf, unsigned n)
+{
+#ifdef _WIN32
+	return _write(fd, buf, n);
+#else
+	return ::write(fd, buf, n);
+#endif
+}
+
+bool Exists(const std::string &path)
+{
+	return std::ifstream(path).good();
+}
+
+// Relative to the test's working directory (the build tree, always writable) so the path is valid
+// on every platform -- a hardcoded /tmp does not resolve for a native Windows binary. Each case
+// uses a distinct suffix, so the files never collide within a run.
+std::string TmpPath(const char *suffix)
+{
+	return std::string("amule_logtee_test") + suffix;
+}
+
+void Cleanup(const std::string &path)
+{
+	std::remove(path.c_str());
+	std::remove((path + ".1").c_str());
+}
+
+} // namespace
+
+// A plain append with no cap keeps every byte in order.
+TEST(LogTee, AppendsAndPersists)
+{
+	const std::string path = TmpPath("_a.log");
+	Cleanup(path);
+	{
+		CRotatingLog log;
+		ASSERT_TRUE(log.Open(path, 0));
+		log.Write("hello ", 6);
+		log.Write("world", 5);
+	}
+	ASSERT_EQUALS(std::string("hello world"), ReadFile(path));
+	Cleanup(path);
+}
+
+// Crossing the cap rotates: the prior content moves to "<path>.1" and the
+// triggering write starts a fresh main file.
+TEST(LogTee, RotatesAtCap)
+{
+	const std::string path = TmpPath("_b.log");
+	const std::string rot = path + ".1";
+	Cleanup(path);
+	{
+		CRotatingLog log;
+		ASSERT_TRUE(log.Open(path, 10));
+		log.Write("AAAAA", 5); // size 5
+		log.Write("BBBBB", 5); // size 10 -- not over the cap, no rotation
+		log.Write("CCCCC", 5); // 10 + 5 > 10 -> rotate first, then write
+	}
+	ASSERT_TRUE(Exists(rot));
+	ASSERT_EQUALS(std::string("AAAAABBBBB"), ReadFile(rot));
+	ASSERT_EQUALS(std::string("CCCCC"), ReadFile(path));
+	Cleanup(path);
+}
+
+// Open() seeds the running size from an existing file so the cap accounts for
+// content written in earlier runs (append mode).
+TEST(LogTee, SeedsSizeFromExistingFile)
+{
+	const std::string path = TmpPath("_c.log");
+	const std::string rot = path + ".1";
+	Cleanup(path);
+	{
+		std::ofstream f(path, std::ios::binary);
+		f << "01234567"; // 8 pre-existing bytes
+	}
+	{
+		CRotatingLog log;
+		ASSERT_TRUE(log.Open(path, 10)); // seeds curSize = 8
+		log.Write("XYZ", 3);             // 8 + 3 > 10 -> rotate
+	}
+	ASSERT_TRUE(Exists(rot));
+	ASSERT_EQUALS(std::string("01234567"), ReadFile(rot));
+	ASSERT_EQUALS(std::string("XYZ"), ReadFile(path));
+	Cleanup(path);
+}
+
+// maxBytes == 0 disables rotation entirely.
+TEST(LogTee, NoRotationWhenCapZero)
+{
+	const std::string path = TmpPath("_d.log");
+	const std::string rot = path + ".1";
+	Cleanup(path);
+	{
+		CRotatingLog log;
+		ASSERT_TRUE(log.Open(path, 0));
+		for (int i = 0; i < 100; ++i) {
+			log.Write("0123456789", 10);
+		}
+	}
+	ASSERT_FALSE(Exists(rot));
+	ASSERT_EQUALS(static_cast<size_t>(1000), ReadFile(path).size());
+	Cleanup(path);
+}
+
+// A single chunk larger than the cap written to an empty file is not rotated --
+// it has to land somewhere, and rotating an empty file would lose it.
+TEST(LogTee, OversizedChunkOnEmptyFileIsNotRotated)
+{
+	const std::string path = TmpPath("_e.log");
+	const std::string rot = path + ".1";
+	Cleanup(path);
+	{
+		CRotatingLog log;
+		ASSERT_TRUE(log.Open(path, 4));
+		log.Write("abcdefgh", 8); // curSize == 0 -> no rotation despite 8 > 4
+	}
+	ASSERT_FALSE(Exists(rot));
+	ASSERT_EQUALS(std::string("abcdefgh"), ReadFile(path));
+	Cleanup(path);
+}
+
+// Every platform has to hand the crash path something to write to while the log is open. The rest
+// of the contract differs -- POSIX reserves a number, Windows resolves the current file, since an
+// open handle there blocks the rename() that rotation needs -- but this much is common, and it is
+// what CLogTee::RedirectStderrForCrash() depends on for amuleapi's wx fatal handler. The
+// other cases below are POSIX-only, which is how a Windows regression here went unnoticed.
+TEST(LogTee, CrashFdIsAvailableWhileOpen)
+{
+	const std::string path = TmpPath("_j.log");
+	Cleanup(path);
+	{
+		CRotatingLog log;
+		ASSERT_TRUE(log.Open(path, 0));
+		ASSERT_TRUE(log.CrashFd() >= 0);
+	}
+	Cleanup(path);
+}
+
+namespace
+{
+
+// A fixed stamp, so outputs compare byte for byte, and a count of lines stamped.
+struct FakeClock
+{
+	int calls = 0;
+	CLineStamper::Clock Get()
+	{
+		return this {
+			++calls;
+			return std::string("T");
+		};
+	}
+};
+
+std::string Feed(CLineStamper &stamper, const std::string &in)
+{
+	return stamper.Feed(in.data(), in.size());
+}
+
+std::string Take(CLineAssembler &lines, const std::string &in)
+{
+	return lines.Take(in.data(), in.size());
+}
+
+std::string FeedInChunks(CLineStamper &stamper, const std::string &in, std::size_t chunk)
+{
+	std::string out;
+	for (std::size_t i = 0; i < in.size(); i += chunk) {
+		out += stamper.Feed(in.data() + i, std::min(chunk, in.size() - i));
+	}
+	return out;
+}
+
+// "YYYY-MM-DD HH:MM:SS: "
+bool HasStampShape(const std::string &line)
+{
+	static const char kShape = "dddd-dd-dd dd:dd:dd: ";
+	if (line.size() < sizeof(kShape) - 1) {
+		return false;
+	}
+	for (std::size_t i = 0; i < sizeof(kShape) - 1; ++i) {
+		const bool ok = kShapei == 'd' ? (linei >= '0' && linei <= '9') : linei == kShapei;
+		if (!ok) {
+			return false;
+		}
+	}
+	return true;
+}
+
+// Lines without their terminator; a trailing newline adds no empty last line.
+std::vector<std::string> SplitLines(const std::string &text)
+{
+	std::vector<std::string> lines;
+	std::size_t start = 0;
+	while (start < text.size()) {
+		std::size_t nl = text.find('\n', start);
+		if (nl == std::string::npos) {
+			nl = text.size();
+		}
+		lines.push_back(text.substr(start, nl - start));
+		start = nl + 1;
+	}
+	return lines;
+}
+
+int TestDup(int fd)
+{
+#ifdef _WIN32
+	return _dup(fd);
+#else
+	return ::dup(fd);
+#endif
+}
+
+int TestDup2(int from, int to)
+{
+#ifdef _WIN32
+	return _dup2(from, to);
+#else
+	return ::dup2(from, to);
+#endif
+}
+
+void TestClose(int fd)
+{
+#ifdef _WIN32
+	_close(fd);
+#else
+	::close(fd);
+#endif
+}
+
+int TestFileno(std::FILE *fp)
+{
+#ifdef _WIN32
+	return _fileno(fp);
+#else
+	return fileno(fp);
+#endif
+}
+
+// Points fd 1 and 2 at files for the life of the object, so a tee installed inside it takes
+// those files as its console and a test can read back what the console got.
+class CConsoleCapture
+{
+public:
+	CConsoleCapture(const std::string &outPath, const std::string &errPath)
+	{
+		std::fflush(stdout);
+		std::fflush(stderr);
+		m_savedOut = TestDup(1);
+		m_savedErr = TestDup(2);
+		m_out = std::fopen(outPath.c_str(), "wb");
+		m_err = std::fopen(errPath.c_str(), "wb");
+		TestDup2(TestFileno(m_out), 1);
+		TestDup2(TestFileno(m_err), 2);
+	}
+	~CConsoleCapture()
+	{
+		std::fflush(stdout);
+		std::fflush(stderr);
+		TestDup2(m_savedOut, 1);
+		TestDup2(m_savedErr, 2);
+		TestClose(m_savedOut);
+		TestClose(m_savedErr);
+		std::fclose(m_out);
+		std::fclose(m_err);
+	}
+
+private:
+	int m_savedOut = -1;
+	int m_savedErr = -1;
+	std::FILE *m_out = nullptr;
+	std::FILE *m_err = nullptr;
+};
+
+} // namespace
+
+TEST(LogTee, StamperStampsEachLine)
+{
+	FakeClock clock;
+	CLineStamper stamper(clock.Get());
+	ASSERT_EQUALS(std::string("Tone\nTtwo\n"), Feed(stamper, "one\ntwo\n"));
+	ASSERT_EQUALS(2, clock.calls);
+}
+
+// amuled writes blank lines without a stamp. "\r\n" counts as blank, for Windows.
+TEST(LogTee, StamperLeavesBlankLinesUnstamped)
+{
+	FakeClock clock;
+	CLineStamper stamper(clock.Get());
+	ASSERT_EQUALS(std::string("Ta\n\nTb\n"), Feed(stamper, "a\n\nb\n"));
+	ASSERT_EQUALS(std::string("Tc\r\n\r\nTd\r\n"), Feed(stamper, "c\r\n\r\nd\r\n"));
+	ASSERT_EQUALS(4, clock.calls);
+}
+
+// A line split across reads gets one stamp, taken when its first byte arrives.
+TEST(LogTee, StamperStampsASplitLineOnce)
+{
+	FakeClock clock;
+	CLineStamper stamper(clock.Get());
+	ASSERT_EQUALS(std::string("Tpar"), Feed(stamper, "par"));
+	ASSERT_EQUALS(1, clock.calls);
+	ASSERT_EQUALS(std::string("tial\n"), Feed(stamper, "tial\n"));
+	ASSERT_EQUALS(1, clock.calls);
+	ASSERT_EQUALS(std::string(""), Feed(stamper, ""));
+	ASSERT_EQUALS(1, clock.calls);
+	ASSERT_EQUALS(std::string("Tnext"), Feed(stamper, "next"));
+	ASSERT_EQUALS(2, clock.calls);
+}
+
+// A newline as the last byte of a read: the next read starts a line.
+TEST(LogTee, StamperNewlineEndingARead)
+{
+	FakeClock clock;
+	CLineStamper stamper(clock.Get());
+	ASSERT_EQUALS(std::string("Tabc\n"), Feed(stamper, "abc\n"));
+	ASSERT_EQUALS(std::string("Tdef\n"), Feed(stamper, "def\n"));
+}
+
+// The pump reads CLogTee::kReadChunk bytes at a time, but a pipe read can return fewer, so a
+// read boundary can fall anywhere. Splitting at every offset must give the same stamped text.
+TEST(LogTee, StamperOutputIndependentOfReadBoundaries)
+{
+	const std::size_t chunk = CLogTee::kReadChunk;
+	const std::string longX(chunk + 100, 'x');
+	const std::string longY(chunk - 1, 'y');
+	const std::string input = longX + "\n" + "short\n\n" + longY + "\r\n" + "tail";
+	const std::string expected =
+		"T" + longX + "\n" + "Tshort\n\n" + "T" + longY + "\r\n" + "Ttail";
+
+	for (std::size_t split = 0; split <= input.size(); ++split) {
+		FakeClock clock;
+		CLineStamper stamper(clock.Get());
+		std::string out = stamper.Feed(input.data(), split);
+		out += stamper.Feed(input.data() + split, input.size() - split);
+		ASSERT_EQUALS(expected, out);
+		ASSERT_EQUALS(4, clock.calls);
+	}
+
+	for (const std::size_t size : { chunk, chunk - 1, chunk + 1, static_cast<std::size_t>(1) }) {
+		FakeClock clock;
+		CLineStamper stamper(clock.Get());
+		ASSERT_EQUALS(expected, FeedInChunks(stamper, input, size));
+	}
+}
+
+TEST(LogTee, AssemblerHoldsAPartialLine)
+{
+	CLineAssembler lines;
+	ASSERT_EQUALS(std::string(""), Take(lines, "par"));
+	ASSERT_EQUALS(std::string("partial\none\n"), Take(lines, "tial\none\ntwo"));
+	ASSERT_EQUALS(std::string("two\n"), lines.Flush());
+	ASSERT_EQUALS(std::string(""), lines.Flush());
+}
+
+// One line that never ends must not grow without bound.
+TEST(LogTee, AssemblerReleasesAnOverlongLine)
+{
+	CLineAssembler lines;
+	const std::string chunk(CLineAssembler::kMaxPending - 1, 'q');
+	ASSERT_EQUALS(std::string(""), Take(lines, chunk));
+	ASSERT_EQUALS(chunk + "qq", Take(lines, "qq"));
+	ASSERT_EQUALS(std::string(""), lines.Flush());
+}
+
+TEST(LogTee, LocalLogStampShape)
+{
+	const std::string stamp = LocalLogStamp();
+	ASSERT_EQUALS(static_cast<size_t>(21), stamp.size());
+	ASSERT_TRUE(HasStampShape(stamp));
+}
+
+// Through the real pipes, both streams, a line longer than one read: the console and the file
+// get the same stamped lines.
+TEST(LogTee, TeeStampsConsoleAndFile)
+{
+	const std::string logPath = TmpPath("_k.log");
+	const std::string outPath = TmpPath("_k.out");
+	const std::string errPath = TmpPath("_k.err");
+	Cleanup(logPath);
+	const std::string longLine(CLogTee::kReadChunk + 10, 'z');
+	bool installed = false;
+	{
+		CConsoleCapture capture(outPath, errPath);
+		CLogTee tee;
+		installed = tee.Install(logPath, 0);
+		if (installed) {
+			// Raw write, not fwrite(stdout): muleunit prints with wxPuts, which leaves glibc's
+			// stdout wide-oriented, and glibc then drops byte writes to it.
+			const std::string out = longLine + "\nout-two\n";
+			OsWriteFd(1, out.data(), static_cast<unsigned>(out.size()));
+			OsWriteFd(2, "err-one\n\nerr-two\n", 17);
+			tee.Uninstall();
+		}
+	}
+	ASSERT_TRUE(installed);
+
+	const std::vector<std::string> outLines = SplitLines(ReadFile(outPath));
+	ASSERT_EQUALS(static_cast<size_t>(2), outLines.size());
+	ASSERT_TRUE(HasStampShape(outLines0));
+	ASSERT_EQUALS(longLine, outLines0.substr(21));
+	ASSERT_EQUALS(std::string("out-two"), outLines1.substr(21));
+
+	const std::vector<std::string> errLines = SplitLines(ReadFile(errPath));
+	ASSERT_EQUALS(static_cast<size_t>(3), errLines.size());
+	ASSERT_TRUE(HasStampShape(errLines0));
+	ASSERT_EQUALS(std::string("err-one"), errLines0.substr(21));
+	ASSERT_EQUALS(std::string(""), errLines1);
+	ASSERT_EQUALS(std::string("err-two"), errLines2.substr(21));
+
+	// The two streams interleave in the file, so compare contents rather than order.
+	std::vector<std::string> fileLines = SplitLines(ReadFile(logPath));
+	ASSERT_EQUALS(static_cast<size_t>(5), fileLines.size());
+	int blank = 0;
+	std::vector<std::string> payloads;
+	for (const std::string &line : fileLines) {
+		if (line.empty()) {
+			++blank;
+			continue;
+		}
+		ASSERT_TRUE(HasStampShape(line));
+		payloads.push_back(line.substr(21));
+	}
+	ASSERT_EQUALS(1, blank);
+	std::sort(payloads.begin(), payloads.end());
+	const std::vector<std::string> expected = { "err-one", "err-two", "out-two", longLine };
+	ASSERT_TRUE(payloads == expected);
+
+	Cleanup(logPath);
+	std::remove(outPath.c_str());
+	std::remove(errPath.c_str());
+}
+
+// A line one stream never finishes (getpass() leaves its prompt that way) must still end its own
+// line in the file, so the other stream's next line is not appended to it.
+TEST(LogTee, TeeEndsAnUnfinishedLineInTheFile)
+{
+	const std::string logPath = TmpPath("_n.log");
+	const std::string outPath = TmpPath("_n.out");
+	const std::string errPath = TmpPath("_n.err");
+	Cleanup(logPath);
+	const std::string prompt = "prompt: ";
+	const std::string after = "after\n";
+	bool installed = false;
+	{
+		CConsoleCapture capture(outPath, errPath);
+		CLogTee tee;
+		installed = tee.Install(logPath, 0);
+		if (installed) {
+			OsWriteFd(2, prompt.data(), static_cast<unsigned>(prompt.size()));
+			OsWriteFd(1, after.data(), static_cast<unsigned>(after.size()));
+			tee.Uninstall();
+		}
+	}
+	ASSERT_TRUE(installed);
+
+	std::vector<std::string> payloads;
+	for (const std::string &line : SplitLines(ReadFile(logPath))) {
+		ASSERT_TRUE(HasStampShape(line));
+		payloads.push_back(line.substr(21));
+	}
+	std::sort(payloads.begin(), payloads.end());
+	const std::vector<std::string> expected = { "after", "prompt: " };
+	ASSERT_TRUE(payloads == expected);
+
+	Cleanup(logPath);
+	std::remove(outPath.c_str());
+	std::remove(errPath.c_str());
+}
+
+// An empty path tees to the console only, still stamped, with no crash descriptor.
+TEST(LogTee, ConsoleOnlyInstallStamps)
+{
+	const std::string outPath = TmpPath("_l.out");
+	const std::string errPath = TmpPath("_l.err");
+	bool installed = false;
+	int crashFd = 0;
+	int consoleFd = -1;
+	{
+		CConsoleCapture capture(outPath, errPath);
+		CLogTee tee;
+		installed = tee.Install(std::string(), 0);
+		if (installed) {
+			crashFd = tee.CrashFd();
+			consoleFd = tee.ConsoleFd();
+			OsWriteFd(2, "hello\n", 6);
+			tee.Uninstall();
+		}
+	}
+	ASSERT_TRUE(installed);
+	ASSERT_EQUALS(-1, crashFd);
+	ASSERT_TRUE(consoleFd >= 0);
+
+	const std::vector<std::string> errLines = SplitLines(ReadFile(errPath));
+	ASSERT_EQUALS(static_cast<size_t>(1), errLines.size());
+	ASSERT_TRUE(HasStampShape(errLines0));
+	ASSERT_EQUALS(std::string("hello"), errLines0.substr(21));
+
+	std::remove(outPath.c_str());
+	std::remove(errPath.c_str());
+}
+
+// Without a file the crash redirect falls back to the console. Otherwise wx's backtrace goes into
+// the tee pipe, whose pump thread dies with the process.
+TEST(LogTee, CrashRedirectWithoutFileReachesConsole)
+{
+	const std::string outPath = TmpPath("_m.out");
+	const std::string errPath = TmpPath("_m.err");
+	bool installed = false;
+	{
+		CConsoleCapture capture(outPath, errPath);
+		CLogTee tee;
+		installed = tee.Install(std::string(), 0);
+		if (installed) {
+			tee.RedirectStderrForCrash();
+			OsWriteFd(2, "backtrace\n", 10);
+			tee.Uninstall();
+		}
+	}
+	ASSERT_TRUE(installed);
+	// Written straight to the console, not through the pump, so unstamped.
+	ASSERT_EQUALS(std::string("backtrace\n"), ReadFile(errPath));
+
+	std::remove(outPath.c_str());
+	std::remove(errPath.c_str());
+}
+
+#ifndef _WIN32
+
+// The crash descriptor is a reserved number that the log's own open/close cycle cannot free. A
+// fatal handler cannot re-resolve it (every Fd lookup locks), so it holds this number from install
+// to exit. If it were the FILE*'s own descriptor, Rotate()'s fclose() would free it and whatever
+// the process opened next would inherit it -- in amuleapi, an accepted client socket.
+//
+// Rotation must not move it, and it must address the file that is current afterwards.
+TEST(LogTee, CrashFdSurvivesRotation)
+{
+	const std::string path = TmpPath("_g.log");
+	const std::string rot = path + ".1";
+	Cleanup(path);
+	{
+		CRotatingLog log;
+		ASSERT_TRUE(log.Open(path, 10));
+		const int crashFd = log.CrashFd();
+
+		log.Write("AAAAAAAAAA", 10); // fills the cap
+		log.Write("BBBBB", 5);       // crosses it -> rotate, reopen
+
+		ASSERT_EQUALS(crashFd, log.CrashFd());
+		ASSERT_EQUALS(2L, static_cast<long>(OsWriteFd(crashFd, "CC", 2)));
+	}
+	ASSERT_EQUALS(std::string("AAAAAAAAAA"), ReadFile(rot));
+	ASSERT_EQUALS(std::string("BBBBBCC"), ReadFile(path));
+	Cleanup(path);
+}
+
+// Close() leaves it open on the last file on purpose, so a holder of the number never has a closed
+// descriptor. Writing to it after Close() must reach the file rather than fail. This is also the
+// assertion that tells the reserved descriptor apart from the FILE*'s own: a rotation hands the
+// same number back in a single-threaded test, so only closing the file separates the two.
+TEST(LogTee, CrashFdStaysUsableAfterClose)
+{
+	const std::string path = TmpPath("_h.log");
+	Cleanup(path);
+	{
+		CRotatingLog log;
+		ASSERT_TRUE(log.Open(path, 0));
+		log.Write("live", 4);
+		const int crashFd = log.CrashFd();
+
+		log.Close();
+
+		ASSERT_EQUALS(4L, static_cast<long>(OsWriteFd(crashFd, "dead", 4)));
+	}
+	ASSERT_EQUALS(std::string("livedead"), ReadFile(path));
+	Cleanup(path);
+}
+
+// The reserved descriptor is never closed, so it must not follow an exec'd child and hold the log
+// file open there. aMule spawns children via wxExecute.
+TEST(LogTee, CrashFdIsCloseOnExec)
+{
+	const std::string path = TmpPath("_i.log");
+	Cleanup(path);
+	{
+		CRotatingLog log;
+		ASSERT_TRUE(log.Open(path, 0));
+		const int flags = fcntl(log.CrashFd(), F_GETFD);
+		ASSERT_TRUE(flags >= 0);
+		ASSERT_TRUE((flags & FD_CLOEXEC) != 0);
+	}
+	Cleanup(path);
+}
+
+#endif /* !_WIN32 */

amule-3.1.0.tar.gz/unittests/tests/MagnetURITest.cpp Added

@@ -0,0 +1,116 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include <MagnetURI.h>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(MagnetURI)
+
+namespace
+{
+// A syntactically plausible 32-char AICH-shaped base32 string. The converter treats it as an opaque
+// token, so it need not be a real hash for these tests.
+const char *const AICH = "QVVWMK4S7ZJUV3ASZLPFYU4A5WOAAAAA";
+const char *const ED2K_HASH = "d41d8cd98f00b204e9800998ecf8427e";
+} // namespace
+
+TEST(MagnetURI, GetLinkIncludesAichField)
+{
+	CMagnetURI uri;
+	uri.AddField("dn", "example.iso");
+	uri.AddField("xt", wxString("urn:ed2k:") + ED2K_HASH);
+	uri.AddField("xt", wxString("urn:aich:") + AICH);
+
+	wxString link = uri.GetLink();
+
+	ASSERT_TRUE(link.Contains(wxString("xt=urn:aich:") + AICH));
+}
+
+TEST(MagnetURI, ConvertsAichUrnIntoEd2kHField)
+{
+	wxString magnet =
+		wxString("magnet:?xt=urn:ed2k:") + ED2K_HASH + "&dn=example.iso&xl=42&xt=urn:aich:" + AICH;
+
+	CMagnetED2KConverter conv(magnet);
+
+	ASSERT_TRUE(conv.CanConvertToED2K());
+	wxString ed2k = conv.GetED2KLink();
+	ASSERT_TRUE(ed2k.Contains(wxString("|h=") + AICH + "|"));
+	// The AICH segment must land before the closing "/", not appended after it.
+	ASSERT_TRUE(ed2k.EndsWith("/"));
+	ASSERT_TRUE(ed2k.Contains(wxString("h=") + AICH + "|/"));
+}
+
+TEST(MagnetURI, NoAichUrnMeansNoHField)
+{
+	wxString magnet = wxString("magnet:?xt=urn:ed2k:") + ED2K_HASH + "&dn=example.iso&xl=42";
+
+	CMagnetED2KConverter conv(magnet);
+
+	ASSERT_TRUE(conv.CanConvertToED2K());
+	wxString ed2k = conv.GetED2KLink();
+	ASSERT_TRUE(!ed2k.Contains("h="));
+	ASSERT_TRUE(ed2k.EndsWith("|/"));
+}
+
+TEST(MagnetURI, MalformedAichUrnIsDropped)
+{
+	// ED2KLink.cpp's parser throws on a bad master-hash, so a magnet with a junk or truncated
+	// urn:aich: must convert as if the AICH urn were absent -- not embed the garbage into "h="
+	// and make the whole link unusable, even though its ed2k hash is perfectly valid.
+	wxString tooShort =
+		wxString("magnet:?xt=urn:ed2k:") + ED2K_HASH + "&dn=example.iso&xl=42&xt=urn:aich:TOOSHORT";
+	CMagnetED2KConverter convShort(tooShort);
+	ASSERT_TRUE(convShort.CanConvertToED2K());
+	wxString ed2kShort = convShort.GetED2KLink();
+	ASSERT_TRUE(!ed2kShort.Contains("h="));
+	ASSERT_TRUE(ed2kShort.EndsWith("|/"));
+
+	// Right length (32), but not base32 (lowercase letters plus a '!').
+	wxString notBase32 = wxString("magnet:?xt=urn:ed2k:") + ED2K_HASH +
+			     "&dn=example.iso&xl=42&xt=urn:aich:qvvwmk4s7zju!3aszlpfyu4a5woaaaaa";
+	CMagnetED2KConverter convBad(notBase32);
+	ASSERT_TRUE(convBad.CanConvertToED2K());
+	wxString ed2kBad = convBad.GetED2KLink();
+	ASSERT_TRUE(!ed2kBad.Contains("h="));
+	ASSERT_TRUE(ed2kBad.EndsWith("|/"));
+}
+
+TEST(MagnetURI, AichUrnOrderBeforeEd2kUrnStillWorks)
+{
+	// Field order in the magnet isn't guaranteed -- the converter shouldn't
+	// care whether the AICH urn or the ed2k urn comes first.
+	wxString magnet = wxString("magnet:?xt=urn:aich:") + AICH + "&xt=urn:ed2k:" + ED2K_HASH +
+			  "&dn=example.iso&xl=42";
+
+	CMagnetED2KConverter conv(magnet);
+
+	ASSERT_TRUE(conv.CanConvertToED2K());
+	wxString ed2k = conv.GetED2KLink();
+	ASSERT_TRUE(ed2k.Contains(wxString("h=") + AICH + "|/"));
+	ASSERT_TRUE(ed2k.Contains(wxString("|") + ED2K_HASH + "|h="));
+}

amule-3.1.0.tar.gz/unittests/tests/MediaProbeEnvTest.cpp Added

amule-3.1.0.tar.gz/unittests/tests/MediaProbeParseTest.cpp Added

@@ -0,0 +1,534 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include "MediaProbe.h"
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(MediaProbeParse)
+
+// Every fixture below is ffprobe's REAL output, captured verbatim from ffprobe 8.1.1 run with
+// MediaProbe::ProbeEntries() and -of flat against a file generated for that case. Recording the
+// output rather than the media keeps the test free of binary fixtures and of any ffmpeg dependency
+// in CI, while still pinning the actual wire format -- including the parts easy to get wrong from
+// reading the docs: the DISPOSITION: prefix, the mixed key case Matroska emits, and N/A for an
+// absent duration.
+
+namespace
+{
+// Captured from ffprobe 8.1.1 (-of flat) against a generated cover.mp3 fixture.
+const wxChar *const k_cover_mp3 = {
+	wxT("streams.stream.0.codec_name=\"mp3\""),
+	wxT("streams.stream.0.codec_type=\"audio\""),
+	wxT("streams.stream.0.disposition.attached_pic=0"),
+	wxT("streams.stream.1.codec_name=\"mjpeg\""),
+	wxT("streams.stream.1.codec_type=\"video\""),
+	wxT("streams.stream.1.disposition.attached_pic=1"),
+	wxT("format.duration=\"5.000000\""),
+	wxT("format.bit_rate=\"130462\""),
+	wxT("format.tags.artist=\"Test Artist\""),
+	wxT("format.tags.album=\"Test Album\""),
+	wxT("format.tags.title=\"Test Title\""),
+};
+
+// Captured from ffprobe 8.1.1 (-of flat) against a generated cover.flac fixture.
+const wxChar *const k_cover_flac = {
+	wxT("streams.stream.0.codec_name=\"flac\""),
+	wxT("streams.stream.0.codec_type=\"audio\""),
+	wxT("streams.stream.0.disposition.attached_pic=0"),
+	wxT("streams.stream.1.codec_name=\"mjpeg\""),
+	wxT("streams.stream.1.codec_type=\"video\""),
+	wxT("streams.stream.1.disposition.attached_pic=1"),
+	wxT("format.duration=\"N/A\""),
+	wxT("format.bit_rate=\"N/A\""),
+	wxT("format.tags.artist=\"TestArtist\""),
+	wxT("format.tags.album=\"TestAlbum\""),
+	wxT("format.tags.title=\"TestTitle\""),
+};
+
+// Captured from ffprobe 8.1.1 (-of flat) against a generated cover.m4a fixture.
+const wxChar *const k_cover_m4a = {
+	wxT("streams.stream.0.codec_name=\"aac\""),
+	wxT("streams.stream.0.codec_type=\"audio\""),
+	wxT("streams.stream.0.disposition.attached_pic=0"),
+	wxT("streams.stream.1.codec_name=\"mjpeg\""),
+	wxT("streams.stream.1.codec_type=\"video\""),
+	wxT("streams.stream.1.disposition.attached_pic=1"),
+	wxT("format.duration=\"0.022993\""),
+	wxT("format.bit_rate=\"611316\""),
+	wxT("format.tags.title=\"TestTitle\""),
+	wxT("format.tags.artist=\"TestArtist\""),
+	wxT("format.tags.album=\"TestAlbum\""),
+};
+
+// Captured from ffprobe 8.1.1 (-of flat) against a generated tags.ogg fixture.
+const wxChar *const k_tags_ogg = {
+	wxT("streams.stream.0.codec_name=\"vorbis\""),
+	wxT("streams.stream.0.codec_type=\"audio\""),
+	wxT("streams.stream.0.disposition.attached_pic=0"),
+	wxT("streams.stream.0.tags.artist=\"TestArtist\""),
+	wxT("streams.stream.0.tags.album=\"TestAlbum\""),
+	wxT("streams.stream.0.tags.title=\"TestTitle\""),
+	wxT("format.duration=\"3.001179\""),
+	wxT("format.bit_rate=\"37761\""),
+};
+
+// Captured from ffprobe 8.1.1 (-of flat) against a generated tags.mka fixture.
+const wxChar *const k_tags_mka = {
+	wxT("streams.stream.0.codec_name=\"aac\""),
+	wxT("streams.stream.0.codec_type=\"audio\""),
+	wxT("streams.stream.0.disposition.attached_pic=0"),
+	wxT("format.duration=\"3.023000\""),
+	wxT("format.bit_rate=\"131972\""),
+	wxT("format.tags.title=\"TestTitle\""),
+	wxT("format.tags.ALBUM=\"TestAlbum\""),
+	wxT("format.tags.ARTIST=\"TestArtist\""),
+};
+
+// Captured from ffprobe 8.1.1 (-of flat) against a generated video_cover.mp4 fixture.
+const wxChar *const k_video_cover_mp4 = {
+	wxT("streams.stream.0.codec_name=\"h264\""),
+	wxT("streams.stream.0.codec_type=\"video\""),
+	wxT("streams.stream.0.disposition.attached_pic=0"),
+	wxT("streams.stream.1.codec_name=\"aac\""),
+	wxT("streams.stream.1.codec_type=\"audio\""),
+	wxT("streams.stream.1.disposition.attached_pic=0"),
+	wxT("streams.stream.2.codec_name=\"mjpeg\""),
+	wxT("streams.stream.2.codec_type=\"video\""),
+	wxT("streams.stream.2.disposition.attached_pic=1"),
+	wxT("format.duration=\"0.040000\""),
+	wxT("format.bit_rate=\"841800\""),
+};
+
+// Captured from ffprobe 8.1.1 (-of flat) against a generated multitrack.mkv fixture.
+const wxChar *const k_multitrack_mkv = {
+	wxT("streams.stream.0.codec_name=\"h264\""),
+	wxT("streams.stream.0.codec_type=\"video\""),
+	wxT("streams.stream.0.disposition.attached_pic=0"),
+	wxT("streams.stream.1.codec_name=\"aac\""),
+	wxT("streams.stream.1.codec_type=\"audio\""),
+	wxT("streams.stream.1.disposition.attached_pic=0"),
+	wxT("streams.stream.1.tags.title=\"Deutsch\""),
+	wxT("streams.stream.2.codec_name=\"aac\""),
+	wxT("streams.stream.2.codec_type=\"audio\""),
+	wxT("streams.stream.2.disposition.attached_pic=0"),
+	wxT("streams.stream.2.tags.title=\"Espanol\""),
+	wxT("format.duration=\"2.023000\""),
+	wxT("format.bit_rate=\"183533\""),
+};
+
+// Captured from ffprobe 8.1.1 (-of flat) against a generated raw.h264 fixture.
+const wxChar *const k_raw_h264 = {
+	wxT("streams.stream.0.codec_name=\"h264\""),
+	wxT("streams.stream.0.codec_type=\"video\""),
+	wxT("streams.stream.0.disposition.attached_pic=0"),
+	wxT("format.duration=\"N/A\""),
+	wxT("format.bit_rate=\"N/A\""),
+};
+
+// Captured from ffprobe 8.1.1 (-of flat) against a generated evil.mp3 fixture.
+const wxChar *const k_evil_mp3 = {
+	wxT("streams.stream.0.codec_name=\"mp3\""),
+	wxT("streams.stream.0.codec_type=\"audio\""),
+	wxT("streams.stream.0.disposition.attached_pic=0"),
+	wxT("format.duration=\"1.000000\""),
+	wxT("format.bit_rate=\"69112\""),
+	wxT("format.tags.title=\"Song\\nduration=99999999\\nbit_rate=999000000\""),
+};
+
+// Feed one fixture through the parser.
+bool Parse(const wxChar *const *lines, size_t count, MediaInfo &out)
+{
+	wxArrayString arr;
+	for (size_t i = 0; i < count; ++i) {
+		arr.Add(linesi);
+	}
+	return MediaProbe::ParseProbeOutput(arr, out);
+}
+
+} // namespace
+
+#define PARSE(fixture, info) Parse(fixture, sizeof(fixture) / sizeof(fixture0), info)
+
+// Cover art must never be taken for the file's codec (issue #1075). ffprobe reports embedded
+// artwork as a regular video stream, so for an audio file it is the ONLY video stream and always
+// won. The codec goes out on the wire to every peer, so this published "mjpeg" for a tagged music
+// library.
+
+TEST(MediaProbeParse, Mp3WithCoverReportsAudioCodecNotTheArtwork)
+{
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(k_cover_mp3, info));
+	ASSERT_EQUALS(wxString(wxT("mp3")), info.codec);
+	ASSERT_EQUALS(static_cast<uint32>(5), info.length_seconds);
+	ASSERT_TRUE(info.bitrate_kbps > 0);
+}
+
+TEST(MediaProbeParse, FlacWithPictureBlockReportsFlac)
+{
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(k_cover_flac, info));
+	ASSERT_EQUALS(wxString(wxT("flac")), info.codec);
+}
+
+TEST(MediaProbeParse, M4aWithCovrAtomReportsAac)
+{
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(k_cover_m4a, info));
+	ASSERT_EQUALS(wxString(wxT("aac")), info.codec);
+}
+
+TEST(MediaProbeParse, VideoWithCoverStillReportsTheVideoCodec)
+{
+	// The fix must not change the answer for video: the real track wins
+	// whatever position the artwork holds in the stream list.
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(k_video_cover_mp4, info));
+	ASSERT_EQUALS(wxString(wxT("h264")), info.codec);
+}
+
+// --- Tag extraction, and where each container hides the tags (#1076) -----
+
+TEST(MediaProbeParse, FormatLevelTagsAreExtracted)
+{
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(k_cover_mp3, info));
+	ASSERT_EQUALS(wxString(wxT("Test Artist")), info.artist);
+	ASSERT_EQUALS(wxString(wxT("Test Album")), info.album);
+	ASSERT_EQUALS(wxString(wxT("Test Title")), info.title);
+}
+
+TEST(MediaProbeParse, OggKeepsItsTagsOnTheStreamNotTheFormat)
+{
+	// Vorbis comments belong to the logical stream, so a format_tags-only
+	// request loses them entirely for Ogg and Opus.
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(k_tags_ogg, info));
+	ASSERT_EQUALS(wxString(wxT("TestArtist")), info.artist);
+	ASSERT_EQUALS(wxString(wxT("TestAlbum")), info.album);
+	ASSERT_EQUALS(wxString(wxT("TestTitle")), info.title);
+}
+
+TEST(MediaProbeParse, MatroskaMixedCaseKeysAreRead)
+{
+	// One file, two cases: TAG:title lower, TAG:ALBUM and TAG:ARTIST upper. ffprobe matches the
+	// requested names case-insensitively but prints the container's own case.
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(k_tags_mka, info));
+	ASSERT_EQUALS(wxString(wxT("TestArtist")), info.artist);
+	ASSERT_EQUALS(wxString(wxT("TestAlbum")), info.album);
+	ASSERT_EQUALS(wxString(wxT("TestTitle")), info.title);
+}
+
+TEST(MediaProbeParse, MultiTrackVideoNeverPublishesATrackLabelAsTheTitle)
+{
+	// The audio streams here are labelled "Deutsch" and "Espanol" -- track names, not song
+	// metadata. Falling back to stream tags on a video file would advertise one of them as the
+	// file's title to every peer.
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(k_multitrack_mkv, info));
+	ASSERT_EQUALS(wxString(wxT("h264")), info.codec);
+	ASSERT_TRUE(info.title.IsEmpty());
+	ASSERT_TRUE(info.artist.IsEmpty());
+	ASSERT_TRUE(info.album.IsEmpty());
+}
+
+// --- A codec with no duration is still a successful probe (#1077) --------
+
+TEST(MediaProbeParse, RawElementaryStreamYieldsCodecWithoutDuration)
+{
+	// duration=N/A and bit_rate=N/A: the probe succeeds on the codec alone.
+	// Treating this as a failure is what made these files re-probe forever.
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(k_raw_h264, info));
+	ASSERT_EQUALS(wxString(wxT("h264")), info.codec);
+	ASSERT_EQUALS(static_cast<uint32>(0), info.length_seconds);
+	ASSERT_EQUALS(static_cast<uint32>(0), info.bitrate_kbps);
+}
+
+TEST(MediaProbeParse, ZeroDurationWithNothingElseIsAFailedProbe)
+{
+	// "duration=0.000000" parses, but a zero duration is not a duration. If this reported
+	// success the caller would treat an all-empty MediaInfo as authoritative and CLEAR every
+	// media tag the file had -- including a preview inherited from the search result -- then
+	// re-probe it to the same effect on every subsequent start.
+	const wxChar *const zero = { wxT("streams.stream.0.codec_type=\"data\""),
+		wxT("streams.stream.0.disposition.attached_pic=0"),
+		wxT("format.duration=\"0.000000\"") };
+	MediaInfo info;
+	ASSERT_TRUE(!PARSE(zero, info));
+}
+
+TEST(MediaProbeParse, ZeroDurationWithACodecStillSucceeds)
+{
+	// The intended case: zero length is a legitimate value to clear TO when
+	// the probe did identify the file.
+	const wxChar *const zeroCodec = { wxT("streams.stream.0.codec_name=\"h264\""),
+		wxT("streams.stream.0.codec_type=\"video\""),
+		wxT("streams.stream.0.disposition.attached_pic=0"),
+		wxT("format.duration=\"0.000000\"") };
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(zeroCodec, info));
+	ASSERT_EQUALS(wxString(wxT("h264")), info.codec);
+	ASSERT_EQUALS(static_cast<uint32>(0), info.length_seconds);
+}
+
+TEST(MediaProbeParse, SingleLabelledTrackInANonOggContainerIsNotATitle)
+{
+	// A one-track .mka muxed with --track-name 0:Deutsch passes every STRUCTURAL test -- one
+	// audio stream, no video, nothing at format level -- so there is no way to tell its label
+	// from a title. The fallback is therefore scoped to the containers that genuinely need it,
+	// the Ogg family, whose comments live on the stream; an AAC track's stream tag is a label
+	// and stays unpublished.
+	const wxChar *const labelled = { wxT("streams.stream.0.codec_name=\"aac\""),
+		wxT("streams.stream.0.codec_type=\"audio\""),
+		wxT("streams.stream.0.disposition.attached_pic=0"),
+		wxT("streams.stream.0.tags.title=\"Deutsch\""),
+		wxT("format.duration=\"60.000000\"") };
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(labelled, info));
+	ASSERT_EQUALS(wxString(wxT("aac")), info.codec);
+	ASSERT_TRUE(info.title.IsEmpty());
+}
+
+TEST(MediaProbeParse, MultiTrackAudioNeverPublishesATrackLabelAsTheTitle)
+{
+	// The audio-only twin of the multi-track video case. A .mka or chained .ogg with two
+	// labelled audio streams and no format-level tags has no video stream, so a "not a video"
+	// test would let the first track's label through as the file's title. The fallback exists
+	// for Ogg/Opus, where the comments live on the SINGLE logical stream -- so the condition is
+	// exactly one audio stream.
+	const wxChar *const multiAudio = { wxT("streams.stream.0.codec_name=\"vorbis\""),
+		wxT("streams.stream.0.codec_type=\"audio\""),
+		wxT("streams.stream.0.disposition.attached_pic=0"),
+		wxT("streams.stream.0.tags.title=\"Track One\""),
+		wxT("streams.stream.1.codec_name=\"vorbis\""),
+		wxT("streams.stream.1.codec_type=\"audio\""),
+		wxT("streams.stream.1.disposition.attached_pic=0"),
+		wxT("streams.stream.1.tags.title=\"Track Two\""),
+		wxT("format.duration=\"120.000000\"") };
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(multiAudio, info));
+	ASSERT_EQUALS(wxString(wxT("vorbis")), info.codec);
+	ASSERT_TRUE(info.title.IsEmpty());
+}
+
+TEST(MediaProbeParse, SingleAudioStreamStillGetsItsStreamTags)
+{
+	// The case the fallback exists for must keep working: one logical stream,
+	// tags on it, nothing at format level.
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(k_tags_ogg, info));
+	ASSERT_EQUALS(wxString(wxT("TestTitle")), info.title);
+}
+
+TEST(MediaProbeParse, CoverArtDoesNotCountAsASecondAudioStream)
+{
+	// Artwork is a video stream, so it must not disturb the audio count --
+	// otherwise a tagged single-track MP3 would lose its stream-tag fallback.
+	const wxChar *const oneAudioPlusCover = { wxT("streams.stream.0.codec_name=\"vorbis\""),
+		wxT("streams.stream.0.codec_type=\"audio\""),
+		wxT("streams.stream.0.disposition.attached_pic=0"),
+		wxT("streams.stream.0.tags.title=\"Song\""),
+		wxT("streams.stream.1.codec_name=\"mjpeg\""),
+		wxT("streams.stream.1.codec_type=\"video\""),
+		wxT("streams.stream.1.disposition.attached_pic=1"),
+		wxT("format.duration=\"200.000000\"") };
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(oneAudioPlusCover, info));
+	ASSERT_EQUALS(wxString(wxT("vorbis")), info.codec);
+	ASSERT_EQUALS(wxString(wxT("Song")), info.title);
+}
+
+// A crafted file must not be able to forge what we publish. Requesting format_tags / stream_tags
+// puts attacker-controlled text into ffprobe's output for the first time -- container tags are
+// arbitrary UTF-8 and may contain newlines. With the `default` writer, which does not escape
+// values, each newline became another key=value line inside the tag's own section, and this parser
+// is last-write-wins: a title of "Song\nduration=99999999" overwrote the real duration, and the
+// forged value was attached as FT_MEDIA_LENGTH and published to every server and Kad node. `-of
+// flat` escapes the value instead, and carries the section and stream index in the key so no value
+// can forge a boundary either.
+
+TEST(MediaProbeParse, CraftedTagCannotForgeDurationOrBitrate)
+{
+	// Real ffprobe output for an mp3 whose title tag is literally
+	// "Song\nduration=99999999\nbit_rate=999000000".
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(k_evil_mp3, info));
+	// The real values, not the injected ones.
+	ASSERT_EQUALS(static_cast<uint32>(1), info.length_seconds);
+	ASSERT_EQUALS(static_cast<uint32>(69), info.bitrate_kbps);
+	// And the payload lands where it belongs -- in the title -- with its newlines stripped by
+	// the sanitiser, so it cannot impersonate several fields anywhere downstream either.
+	ASSERT_EQUALS(wxString(wxT("Songduration=99999999bit_rate=999000000")), info.title);
+	ASSERT_TRUE(info.title.Find(wxT('\n')) == wxNOT_FOUND);
+}
+
+TEST(MediaProbeParse, CraftedTagCannotForgeASectionBoundary)
+{
+	// The same idea aimed at the structure rather than a value: a tag whose text looks like
+	// another stream's key. With flat output the injected text stays inside the quoted value,
+	// so it can neither start a stream nor overwrite one.
+	const wxChar *const forge = { wxT("streams.stream.0.codec_name=\"mp3\""),
+		wxT("streams.stream.0.codec_type=\"audio\""),
+		wxT("streams.stream.0.disposition.attached_pic=0"),
+		wxT("format.tags.artist=\"x\\nstreams.stream.0.codec_name=\\\"h264\\\"\""),
+		wxT("format.duration=\"7.000000\"") };
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(forge, info));
+	ASSERT_EQUALS(wxString(wxT("mp3")), info.codec);
+	ASSERT_EQUALS(static_cast<uint32>(7), info.length_seconds);
+}
+
+TEST(MediaProbeParse, OversizedTagValueIsCapped)
+{
+	// A container tag is arbitrary attacker-chosen text of arbitrary length, and it ends up in
+	// known.met, in the log, and in every offered-file packet sent to every server and client.
+	// The only bound downstream is the wire format's 0xFFFF truncation, which is a packet-
+	// integrity guard, not a policy.
+	wxString huge(wxT('A'), 5000);
+	wxArrayString lines;
+	lines.Add(wxT("streams.stream.0.codec_name=\"mp3\""));
+	lines.Add(wxT("streams.stream.0.codec_type=\"audio\""));
+	lines.Add(wxT("streams.stream.0.disposition.attached_pic=0"));
+	lines.Add(wxT("format.duration=\"3.000000\""));
+	lines.Add(wxT("format.tags.title=\"") + huge + wxT("\""));
+	MediaInfo info;
+	ASSERT_TRUE(MediaProbe::ParseProbeOutput(lines, info));
+	ASSERT_TRUE(info.title.length() <= 256);
+	ASSERT_TRUE(info.title.length() > 0);
+}
+
+TEST(MediaProbeParse, ControlCharactersAreStrippedFromTagValues)
+{
+	// The unflattened value still contains real newlines -- flat only stopped the PARSER being
+	// confused by them. They reach the log line and, through it, GET /api/v1/logs/amule, where
+	// one field could impersonate several.
+	const wxChar *const ctrl = { wxT("streams.stream.0.codec_name=\"mp3\""),
+		wxT("streams.stream.0.codec_type=\"audio\""),
+		wxT("streams.stream.0.disposition.attached_pic=0"),
+		wxT("format.duration=\"3.000000\""),
+		wxT("format.tags.title=\"a\\nb\\rc\"") };
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(ctrl, info));
+	ASSERT_EQUALS(wxString(wxT("abc")), info.title);
+}
+
+TEST(MediaProbeParse, OrdinaryTagTextIsUntouched)
+{
+	// The sanitiser must not mangle real metadata: non-ASCII stays, internal
+	// spaces stay, only the edges are trimmed.
+	const wxChar *const ok = { wxT("streams.stream.0.codec_name=\"mp3\""),
+		wxT("streams.stream.0.codec_type=\"audio\""),
+		wxT("streams.stream.0.disposition.attached_pic=0"),
+		wxT("format.duration=\"3.000000\""),
+		wxT("format.tags.artist=\"Sigur R\u00f3s & Friends\"") };
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(ok, info));
+	ASSERT_EQUALS(wxString::FromUTF8("Sigur R\xc3\xb3s & Friends"), info.artist);
+}
+
+TEST(MediaProbeParse, FlatEscapesAreUnwrapped)
+{
+	const wxChar *const esc = { wxT("streams.stream.0.codec_name=\"mp3\""),
+		wxT("streams.stream.0.codec_type=\"audio\""),
+		wxT("streams.stream.0.disposition.attached_pic=0"),
+		wxT("format.duration=\"3.000000\""),
+		wxT("format.tags.title=\"a\\\"b\\\\c\\nd\"") };
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(esc, info));
+	// \" and \\ unwrap to the real characters; the \n unwraps too and is then
+	// dropped by the sanitiser, which is why there is no newline here.
+	ASSERT_EQUALS(wxString(wxT("a\"b\\cd")), info.title);
+}
+
+TEST(MediaProbeParse, NothingUsableIsAFailedProbe)
+{
+	const wxChar *const empty = { wxT("format.duration=\"N/A\""), wxT("format.bit_rate=\"N/A\"") };
+	MediaInfo info;
+	ASSERT_TRUE(!PARSE(empty, info));
+}
+
+TEST(MediaProbeParse, StreamWithNoDispositionLineIsStillConsidered)
+{
+	// An ffprobe too old to know stream_disposition omits the line rather than failing: an
+	// unknown FIELD is ignored, only an unknown SECTION is fatal. Such a stream must still be
+	// eligible for codec selection.
+	const wxChar *const old = { wxT("streams.stream.0.codec_name=\"mp3\""),
+		wxT("streams.stream.0.codec_type=\"audio\""),
+		wxT("format.duration=\"10.000000\"") };
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(old, info));
+	ASSERT_EQUALS(wxString(wxT("mp3")), info.codec);
+	ASSERT_EQUALS(static_cast<uint32>(10), info.length_seconds);
+}
+
+TEST(MediaProbeParse, OldFfprobeWithoutDispositionLosesCoverAndTagsTogether)
+{
+	// The compound old-ffprobe case, recorded rather than argued about: with no DISPOSITION
+	// line the artwork is indistinguishable from a real video track, so it wins the codec AND
+	// -- because a non-empty videoCodec means the file is treated as a video -- suppresses the
+	// stream-tag fallback. Such an ffprobe therefore degrades to exactly master's behaviour for
+	// these files. Nothing can be done about it from this side; the test exists so the
+	// degradation is a recorded property rather than a surprise.
+	const wxChar *const noDisp = { wxT("streams.stream.0.codec_name=\"vorbis\""),
+		wxT("streams.stream.0.codec_type=\"audio\""),
+		wxT("streams.stream.0.tags.artist=\"A\""),
+		wxT("streams.stream.1.codec_name=\"mjpeg\""),
+		wxT("streams.stream.1.codec_type=\"video\""),
+		wxT("format.duration=\"5.000000\"") };
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(noDisp, info));
+	ASSERT_EQUALS(wxString(wxT("mjpeg")), info.codec);
+	ASSERT_TRUE(info.artist.IsEmpty());
+
+	// The same file from an ffprobe that DOES report the disposition gets
+	// both right -- which is the whole point of requesting it.
+	const wxChar *const withDisp = { wxT("streams.stream.0.codec_name=\"vorbis\""),
+		wxT("streams.stream.0.codec_type=\"audio\""),
+		wxT("streams.stream.0.disposition.attached_pic=0"),
+		wxT("streams.stream.0.tags.artist=\"A\""),
+		wxT("streams.stream.1.codec_name=\"mjpeg\""),
+		wxT("streams.stream.1.codec_type=\"video\""),
+		wxT("streams.stream.1.disposition.attached_pic=1"),
+		wxT("format.duration=\"5.000000\"") };
+	MediaInfo info2;
+	ASSERT_TRUE(PARSE(withDisp, info2));
+	ASSERT_EQUALS(wxString(wxT("vorbis")), info2.codec);
+	ASSERT_EQUALS(wxString(wxT("A")), info2.artist);
+}
+
+TEST(MediaProbeParse, TagValueContainingAnEqualsSignSurvives)
+{
+	const wxChar *const eq = { wxT("streams.stream.0.codec_name=\"mp3\""),
+		wxT("streams.stream.0.codec_type=\"audio\""),
+		wxT("streams.stream.0.disposition.attached_pic=0"),
+		wxT("format.duration=\"1.000000\""),
+		wxT("format.tags.title=\"a=b=c\"") };
+	MediaInfo info;
+	ASSERT_TRUE(PARSE(eq, info));
+	ASSERT_EQUALS(wxString(wxT("a=b=c")), info.title);
+}

amule-3.1.0.tar.gz/unittests/tests/NetworkAddressTableLinkage.cpp Added

@@ -0,0 +1,35 @@
+//								-*- C++ -*-
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// A second translation unit that includes NetworkAddress.h, so the test beside it can ask whether
+// the exclusion table is one entity or a copy per unit. That is the whole content: without
+// `inline` on the table, `constexpr` at namespace scope implies `const` and therefore internal
+// linkage, and the address taken here differs from the one taken there.
+
+#include <NetworkAddress.h>
+
+const void *ExcludedPrefixTableAddressFromOtherUnit() noexcept
+{
+	return &NetworkAddressPolicy::kIPv6ExcludedPrefixes0;
+}

amule-3.1.0.tar.gz/unittests/tests/NetworkAddressTest.cpp Added

@@ -0,0 +1,801 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// Contract of the internal address type: byte order stated in the signature, absence
+// distinguishable from the all-zero address, failed narrowing rather than truncation, and a total
+// order fit to key a container.
+//
+// This is the type every uint32 IP in the tree is being migrated onto, so its contract is pinned
+// here rather than left to the applications. None of it needs a running aMule: the type is a value
+// type over sixteen octets and a family tag.
+
+#include <muleunit/test.h>
+
+#include <NetworkAddressAsio.h>
+#include <NetworkAddress.h>
+
+#include <algorithm>
+#include <map>
+#include <set>
+#include <unordered_map>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(NetworkAddress)
+
+TEST(NetworkAddress, SocketIngressCanonicalizesMappedIPv4)
+{
+	const auto plain = CNetworkAddress::FromString("192.0.2.7");
+	const auto mapped = CNetworkAddress::FromString("::ffff:192.0.2.7");
+	for (const auto &address : { plain, mapped }) {
+		const auto asio = NetworkAddressAsio::ToAsioAddress(address);
+		const auto peer = NetworkAddressAsio::FromIngressAddress(asio);
+		ASSERT_TRUE(peer == plain);
+		ASSERT_EQUALS(0x070200C0u, peer.ToIPv4NetworkOrderOrZero());
+		// Normalization is an ingress policy, not a change to the lossless bridge.
+		ASSERT_TRUE(NetworkAddressAsio::FromAsioAddress(asio) == address);
+	}
+}
+
+TEST(NetworkAddress, SocketIngressPreservesNativeIPv6AndScope)
+{
+	const CNetworkAddress::Octets octets = { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
+	const auto peer = NetworkAddressAsio::FromIngressAddress(boost::asio::ip::address_v6(octets, 7));
+	ASSERT_TRUE(peer == CNetworkAddress::IPv6FromOctets(octets, 7));
+	ASSERT_EQUALS(7ul, peer.GetScopeId());
+	ASSERT_EQUALS(0u, peer.ToIPv4NetworkOrderOrZero());
+}
+
+TEST(NetworkAddress, AsioAddressPreservesNativeIPv6AndScope)
+{
+	const CNetworkAddress::Octets octets = { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
+	const auto peer = NetworkAddressAsio::FromAsioAddress(boost::asio::ip::address_v6(octets, 7));
+	ASSERT_TRUE(peer == CNetworkAddress::IPv6FromOctets(octets, 7));
+	ASSERT_TRUE(peer.IsPresent());
+	ASSERT_FALSE(peer.IsUnspecified());
+	ASSERT_EQUALS(7ul, peer.GetScopeId());
+	ASSERT_EQUALS(0u, peer.ToIPv4NetworkOrderOrZero());
+}
+
+TEST(NetworkAddress, AsioAddressIPv4AndMappedNarrowToTheSameEd2kBytes)
+{
+	for (const char *text : { "192.0.2.7", "::ffff:192.0.2.7" }) {
+		const auto address = CNetworkAddress::FromString(text);
+		const auto peer =
+			NetworkAddressAsio::FromAsioAddress(NetworkAddressAsio::ToAsioAddress(address));
+		ASSERT_TRUE(peer == address);
+		ASSERT_EQUALS(0x070200C0u, peer.ToIPv4NetworkOrderOrZero());
+	}
+}
+
+// 192.0.2.1 (RFC 5737 documentation range) in each of the two conventions.
+static const uint32_t TEST_IP_HOST_ORDER = 0xC0000201u;
+static const uint32_t TEST_IP_ED2K_ORDER = 0x010200C0u;
+
+// An IPv4-mapped address is IPv4 for every other accessor, so truncation has to use the effective
+// family too. Taking 128 bits for it zeroed the embedded octets away entirely, which put every
+// mapped peer into one bucket of the per-prefix budget this function exists to feed.
+TEST(NetworkAddress, TruncatingAMappedAddressUsesTheIPv4Width)
+{
+	const CNetworkAddress mapped = CNetworkAddress::FromString("::ffff:203.0.113.5");
+	ASSERT_TRUE(mapped.IsIPv4Mapped());
+
+	const CNetworkAddress prefix = mapped.TruncatedToPrefix(24);
+	ASSERT_FALSE(prefix.IsUnspecified());
+	ASSERT_TRUE(prefix == CNetworkAddress::FromString("203.0.113.0"));
+
+	// Two mapped peers in different /24s must not share a bucket.
+	const CNetworkAddress other = CNetworkAddress::FromString("::ffff:198.51.100.5");
+	ASSERT_FALSE(other.TruncatedToPrefix(24) == prefix);
+}
+
+// The scope is dropped on every path, not just the truncating one. Returning it only when
+// prefixBits reached the family width made the same two addresses one value at /64 and two at
+// /128, a discontinuity at the boundary that contradicts the function's own comment.
+TEST(NetworkAddress, TruncationDropsTheScopeAtEveryWidth)
+{
+	// The scope ids are set directly rather than parsed out of "fe80::1%7". Whether a platform
+	// resolves a scope suffix is not what this pins, and skipping the comparison where it does
+	// not is indistinguishable from passing it.
+	const CNetworkAddress::Octets linkLocal = { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
+	const CNetworkAddress a = CNetworkAddress::IPv6FromOctets(linkLocal, 7);
+	const CNetworkAddress b = CNetworkAddress::IPv6FromOctets(linkLocal, 9);
+	ASSERT_EQUALS(7ul, a.GetScopeId());
+	ASSERT_EQUALS(9ul, b.GetScopeId());
+	ASSERT_FALSE(a == b); // the scope is the only thing separating them
+
+	ASSERT_TRUE(a.TruncatedToPrefix(64) == b.TruncatedToPrefix(64));
+	ASSERT_TRUE(a.TruncatedToPrefix(128) == b.TruncatedToPrefix(128));
+}
+
+// ::a.b.c.d, the deprecated IPv4-compatible form. Advertising one burns a peer's connect attempt,
+// which is the cost this predicate exists to avoid.
+TEST(NetworkAddress, IPv4CompatibleAddressesAreNotGloballyRoutable)
+{
+	ASSERT_FALSE(CNetworkAddress::FromString("::203.0.113.5").IsGloballyRoutableIPv6());
+	// Still distinguished from the two values that share the same page.
+	ASSERT_FALSE(CNetworkAddress::FromString("::").IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("::1").IsGloballyRoutableIPv6());
+	// And a real address is unaffected.
+	ASSERT_TRUE(CNetworkAddress::FromString("2001:4860:4860::8888").IsGloballyRoutableIPv6());
+}
+
+// The hash has to agree with operator==, which a byte-wise hash would not: sizeof is larger than
+// the members and nothing initialises the tail padding.
+TEST(NetworkAddress, HashingAgreesWithEquality)
+{
+	const CNetworkAddress a = CNetworkAddress::FromString("2001:db8::1");
+	const CNetworkAddress b = CNetworkAddress::FromString("2001:db8::1");
+	ASSERT_TRUE(a == b);
+	ASSERT_EQUALS(std::hash<CNetworkAddress>()(a), std::hash<CNetworkAddress>()(b));
+
+	std::unordered_map<CNetworkAddress, int> byAddress;
+	byAddressa = 1;
+	byAddressb = 2;
+	ASSERT_EQUALS(1u, (unsigned)byAddress.size());
+	ASSERT_EQUALS(2, byAddressa);
+
+	// Distinct values, including the mapped and native forms the type keeps apart.
+	byAddressCNetworkAddress::FromString("203.0.113.5") = 3;
+	byAddressCNetworkAddress::FromString("::ffff:203.0.113.5") = 4;
+	ASSERT_EQUALS(3u, (unsigned)byAddress.size());
+}
+
+TEST(NetworkAddress, ByteOrderIsInTheSignature)
+{
+	const CNetworkAddress fromHost = CNetworkAddress::FromIPv4HostOrder(TEST_IP_HOST_ORDER);
+	const CNetworkAddress fromNetwork = CNetworkAddress::FromIPv4NetworkOrder(TEST_IP_ED2K_ORDER);
+
+	// Both name the same address, reached through the convention each caller has.
+	ASSERT_EQUALS(wxString("192.0.2.1"), fromHost.ToWxString());
+	ASSERT_EQUALS(wxString("192.0.2.1"), fromNetwork.ToWxString());
+	ASSERT_TRUE(fromHost == fromNetwork);
+
+	// And they round-trip back into the convention that is asked for, not into
+	// whichever one they were built from.
+	uint32_t out = 0;
+	ASSERT_TRUE(fromHost.ToIPv4HostOrder(out));
+	ASSERT_EQUALS(TEST_IP_HOST_ORDER, out);
+	ASSERT_TRUE(fromHost.ToIPv4NetworkOrder(out));
+	ASSERT_EQUALS(TEST_IP_ED2K_ORDER, out);
+	ASSERT_TRUE(fromNetwork.ToIPv4HostOrder(out));
+	ASSERT_EQUALS(TEST_IP_HOST_ORDER, out);
+
+	// The two conventions are byte reversals of each other, which is the
+	// identity wxUINT32_SWAP_ALWAYS relies on at every existing swap site.
+	ASSERT_EQUALS(TEST_IP_ED2K_ORDER, CNetworkAddress::SwapOctets(TEST_IP_HOST_ORDER));
+	ASSERT_EQUALS(TEST_IP_HOST_ORDER, CNetworkAddress::SwapOctets(TEST_IP_ED2K_ORDER));
+
+	// Feeding a value in the wrong convention cannot be a silent no-op: it yields a different,
+	// visibly wrong address. Nothing stops a caller doing that, but nothing hides it either.
+	ASSERT_EQUALS(
+		wxString("1.2.0.192"), CNetworkAddress::FromIPv4HostOrder(TEST_IP_ED2K_ORDER).ToWxString());
+}
+
+TEST(NetworkAddress, TextualFormsPreserveUtf8)
+{
+	const CNetworkAddress ipv4 = CNetworkAddress::FromString("1.2.3.4");
+	const CNetworkAddress ipv6 = CNetworkAddress::FromString("2001:db8::1");
+	const CNetworkAddress absent = CNetworkAddress::Absent();
+
+	ASSERT_EQUALS(wxString("1.2.3.4"), ipv4.ToWxString());
+	ASSERT_EQUALS(wxString("2001:db8::1"), ipv6.ToWxString());
+	ASSERT_EQUALS(wxString("<absent>"), absent.ToWxString());
+	ASSERT_EQUALS(std::string("1.2.3.4"), ipv4.ToString());
+}
+
+TEST(NetworkAddress, MappedAndNativeAreDistinct)
+{
+	const CNetworkAddress native = CNetworkAddress::FromIPv4HostOrder(TEST_IP_HOST_ORDER);
+	const CNetworkAddress mapped = CNetworkAddress::FromString("::ffff:192.0.2.1");
+
+	ASSERT_TRUE(native.IsIPv4());
+	ASSERT_FALSE(native.IsIPv6());
+	ASSERT_FALSE(native.IsIPv4Mapped());
+
+	ASSERT_TRUE(mapped.IsIPv6());
+	ASSERT_FALSE(mapped.IsIPv4());
+	ASSERT_TRUE(mapped.IsIPv4Mapped());
+
+	// The distinction is preserved: the mapped form is an IPv6 address and is
+	// not equal to the IPv4 address it embeds.
+	ASSERT_TRUE(native != mapped);
+
+	// A caller that wants them treated alike says so.
+	ASSERT_TRUE(mapped.Unmapped() == native);
+	ASSERT_TRUE(native.Unmapped() == native);
+
+	// The mapped form still narrows losslessly, in either convention.
+	uint32_t out = 0;
+	ASSERT_TRUE(mapped.ToIPv4HostOrder(out));
+	ASSERT_EQUALS(TEST_IP_HOST_ORDER, out);
+	ASSERT_TRUE(mapped.ToIPv4NetworkOrder(out));
+	ASSERT_EQUALS(TEST_IP_ED2K_ORDER, out);
+
+	// A non-mapped v6 address is not mistaken for a mapped one, whichever end
+	// of the ::ffff: prefix differs.
+	ASSERT_FALSE(CNetworkAddress::FromString("2001:db8::1").IsIPv4Mapped());
+	ASSERT_FALSE(CNetworkAddress::FromString("::fffe:192.0.2.1").IsIPv4Mapped());
+	ASSERT_FALSE(CNetworkAddress::FromString("1::ffff:192.0.2.1").IsIPv4Mapped());
+}
+
+TEST(NetworkAddress, NarrowingAnIPv6AddressFails)
+{
+	const CNetworkAddress v6 = CNetworkAddress::FromString("2001:db8::1");
+	ASSERT_TRUE(v6.IsPresent());
+	ASSERT_TRUE(v6.IsIPv6());
+
+	// The failure is reported, and the caller's variable is left exactly as it was -- no
+	// truncation, no hash, no fabricated value even for a caller that ignores the return.
+	uint32_t out = 0xDEADBEEFu;
+	ASSERT_FALSE(v6.ToIPv4HostOrder(out));
+	ASSERT_EQUALS(0xDEADBEEFu, out);
+	ASSERT_FALSE(v6.ToIPv4NetworkOrder(out));
+	ASSERT_EQUALS(0xDEADBEEFu, out);
+
+	// The unspecified IPv6 address is not narrowable either, even though its
+	// octets would truncate to a value that happens to look valid.
+	const CNetworkAddress v6Any = CNetworkAddress::FromString("::");
+	ASSERT_TRUE(v6Any.IsPresent());
+	ASSERT_TRUE(v6Any.IsUnspecified());
+	out = 0xDEADBEEFu;
+	ASSERT_FALSE(v6Any.ToIPv4NetworkOrder(out));
+	ASSERT_EQUALS(0xDEADBEEFu, out);
+
+	// The lossy convenience form reports the same failure as a zero, which is
+	// why it is only for edges that cannot act on the difference.
+	ASSERT_EQUALS(0u, v6.ToIPv4NetworkOrderOrZero());
+}
+
+TEST(NetworkAddress, AbsenceIsNotTheAllZeroAddress)
+{
+	const CNetworkAddress absent;
+	const CNetworkAddress zero = CNetworkAddress::FromIPv4NetworkOrder(0);
+
+	ASSERT_TRUE(absent.IsAbsent());
+	ASSERT_FALSE(absent.IsPresent());
+	ASSERT_FALSE(absent.IsUnspecified()); // it is not an address at all
+	ASSERT_TRUE(absent == CNetworkAddress::Absent());
+
+	ASSERT_TRUE(zero.IsPresent());
+	ASSERT_TRUE(zero.IsUnspecified());
+	ASSERT_TRUE(zero.IsIPv4());
+	ASSERT_EQUALS(wxString("0.0.0.0"), zero.ToWxString());
+
+	// The whole point: these two are different values.
+	ASSERT_TRUE(absent != zero);
+	ASSERT_EQUALS(wxString("<absent>"), absent.ToWxString());
+
+	// 0.0.0.0 narrows to zero; an absent address refuses to narrow at all, and
+	// again leaves the caller's variable untouched.
+	uint32_t out = 7;
+	ASSERT_TRUE(zero.ToIPv4NetworkOrder(out));
+	ASSERT_EQUALS(0u, out);
+	out = 7;
+	ASSERT_FALSE(absent.ToIPv4NetworkOrder(out));
+	ASSERT_EQUALS(7u, out);
+
+	// The boundary conversions resolve the ed2k zero overload towards absence,
+	// and only there.
+	ASSERT_TRUE(CNetworkAddress::FromIPv4NetworkOrderOrAbsent(0).IsAbsent());
+	ASSERT_TRUE(CNetworkAddress::FromIPv4HostOrderOrAbsent(0).IsAbsent());
+	ASSERT_TRUE(CNetworkAddress::FromIPv4NetworkOrder(0).IsPresent());
+	ASSERT_TRUE(CNetworkAddress::FromIPv4HostOrder(0).IsPresent());
+	ASSERT_TRUE(CNetworkAddress::FromIPv4NetworkOrderOrAbsent(TEST_IP_ED2K_ORDER) ==
+		    CNetworkAddress::FromIPv4NetworkOrder(TEST_IP_ED2K_ORDER));
+
+	// A string that is not an address is absent, not 0.0.0.0 -- unlike
+	// StringIPtoUint32(), which cannot tell the caller the difference.
+	ASSERT_TRUE(CNetworkAddress::FromString("").IsAbsent());
+	ASSERT_TRUE(CNetworkAddress::FromString("not an address").IsAbsent());
+	ASSERT_TRUE(CNetworkAddress::FromString("192.0.2.256").IsAbsent());
+	ASSERT_TRUE(CNetworkAddress::FromString("0.0.0.0").IsPresent());
+}
+
+TEST(NetworkAddress, OrderingIsTotalAndUsableAsAKey)
+{
+	const CNetworkAddress absent;
+	const CNetworkAddress v4Zero = CNetworkAddress::FromString("0.0.0.0");
+	const CNetworkAddress v4Low = CNetworkAddress::FromString("10.0.0.1");
+	const CNetworkAddress v4High = CNetworkAddress::FromString("192.0.2.1");
+	const CNetworkAddress mapped = CNetworkAddress::FromString("::ffff:192.0.2.1");
+	const CNetworkAddress v6 = CNetworkAddress::FromString("2001:db8::1");
+
+	// Absent first, then IPv4 by value, then IPv6.
+	ASSERT_TRUE(absent < v4Zero);
+	ASSERT_TRUE(v4Zero < v4Low);
+	ASSERT_TRUE(v4Low < v4High);
+	ASSERT_TRUE(v4High < mapped);
+	ASSERT_TRUE(mapped < v6);
+
+	// Antisymmetry and irreflexivity, which is what makes it a strict weak
+	// order and therefore safe for std::map.
+	ASSERT_FALSE(v4High < v4High);
+	ASSERT_FALSE(v4High < v4Low);
+	ASSERT_TRUE(v4Low <= v4High);
+	ASSERT_TRUE(v4High >= v4Low);
+	ASSERT_TRUE(v4High > v4Low);
+	ASSERT_FALSE(absent < CNetworkAddress::Absent());
+
+	// Transitivity across the family boundary.
+	ASSERT_TRUE(absent < v6);
+	ASSERT_TRUE(v4Zero < v6);
+
+	// No two distinct addresses collide, and equal ones do not duplicate.
+	std::set<CNetworkAddress> keys;
+	keys.insert(absent);
+	keys.insert(v4Zero);
+	keys.insert(v4Low);
+	keys.insert(v4High);
+	keys.insert(mapped);
+	keys.insert(v6);
+	ASSERT_EQUALS(6u, (unsigned)keys.size());
+	keys.insert(CNetworkAddress::FromIPv4HostOrder(TEST_IP_HOST_ORDER)); // == v4High
+	keys.insert(CNetworkAddress::Absent());
+	ASSERT_EQUALS(6u, (unsigned)keys.size());
+
+	// The order is the one documented, in order.
+	std::set<CNetworkAddress>::const_iterator it = keys.begin();
+	ASSERT_TRUE((it++)->IsAbsent());
+	ASSERT_EQUALS(wxString("0.0.0.0"), (it++)->ToWxString());
+	ASSERT_EQUALS(wxString("10.0.0.1"), (it++)->ToWxString());
+	ASSERT_EQUALS(wxString("192.0.2.1"), (it++)->ToWxString());
+	ASSERT_TRUE((it++)->IsIPv4Mapped());
+	ASSERT_EQUALS(wxString("2001:db8::1"), (it++)->ToWxString());
+	ASSERT_TRUE(it == keys.end());
+
+	// Lookup by an equal address built the other way round still hits.
+	std::map<CNetworkAddress, int> byAddress;
+	byAddressv4High = 1;
+	byAddressmapped = 2;
+	ASSERT_EQUALS(2u, (unsigned)byAddress.size());
+	ASSERT_EQUALS(1, byAddressCNetworkAddress::FromIPv4NetworkOrder(TEST_IP_ED2K_ORDER));
+	ASSERT_EQUALS(2, byAddressCNetworkAddress::FromString("::ffff:c000:201"));
+	ASSERT_EQUALS(2u, (unsigned)byAddress.size());
+}
+
+TEST(NetworkAddress, TruncatedToPrefixClearsHostBits)
+{
+	// The prefix operation a per-block limit or rule needs. Asserted against literal prefixes
+	// rather than against a mask computed the same way the implementation computes it -- a
+	// symmetric off-by-one in a shift would cancel out and pass.
+	ASSERT_EQUALS(wxString("192.0.2.0"),
+		CNetworkAddress::FromString("192.0.2.130").TruncatedToPrefix(24).ToWxString());
+	ASSERT_EQUALS(wxString("192.0.0.0"),
+		CNetworkAddress::FromString("192.0.2.130").TruncatedToPrefix(16).ToWxString());
+	ASSERT_EQUALS(wxString("0.0.0.0"),
+		CNetworkAddress::FromString("192.0.2.130").TruncatedToPrefix(0).ToWxString());
+	// A prefix at or beyond the family width is the address itself, not an
+	// undefined shift.
+	ASSERT_EQUALS(wxString("192.0.2.130"),
+		CNetworkAddress::FromString("192.0.2.130").TruncatedToPrefix(32).ToWxString());
+	ASSERT_EQUALS(wxString("192.0.2.130"),
+		CNetworkAddress::FromString("192.0.2.130").TruncatedToPrefix(128).ToWxString());
+
+	// IPv6, including a prefix that ends mid-byte -- /60 keeps the high nibble
+	// of the eighth byte and clears the low one.
+	ASSERT_EQUALS(wxString("2001:db8:1::"),
+		CNetworkAddress::FromString("2001:db8:1:2:3:4:5:6").TruncatedToPrefix(48).ToWxString());
+	ASSERT_EQUALS(wxString("2001:db8:1:f0::"),
+		CNetworkAddress::FromString("2001:db8:1:f2:3:4:5:6").TruncatedToPrefix(60).ToWxString());
+	ASSERT_EQUALS(wxString("2001:db8:1:2::"),
+		CNetworkAddress::FromString("2001:db8:1:2:3:4:5:6").TruncatedToPrefix(64).ToWxString());
+	ASSERT_EQUALS(wxString("::"),
+		CNetworkAddress::FromString("2001:db8:1:2:3:4:5:6").TruncatedToPrefix(0).ToWxString());
+	ASSERT_TRUE(CNetworkAddress::FromString("2001:db8:1:2:3:4:5:6").TruncatedToPrefix(128) ==
+		    CNetworkAddress::FromString("2001:db8:1:2:3:4:5:6"));
+
+	// A prefix of an absent address is still absent: no prefix is invented for
+	// a peer that has no address.
+	ASSERT_TRUE(CNetworkAddress::Absent().TruncatedToPrefix(64).IsAbsent());
+
+	// The truncation stays inside its family. A /24 of an IPv4 address is an
+	// IPv4 address, and no prefix width turns one family into the other.
+	ASSERT_TRUE(CNetworkAddress::FromString("192.0.2.130").TruncatedToPrefix(24).IsIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("2001:db8::1").TruncatedToPrefix(64).IsIPv6());
+}
+
+// The IPv4 half of the same contract, and the one with the sharper failure. A wrong prefix here
+// does not advertise an unreachable address, it feeds EncryptedDatagramSocket's key derivation an
+// address the peer never sees -- so every frame decrypts to noise at the far end with nothing
+// logged on either side. Three of the rejections are sub-byte masks, and a mask is exactly the kind
+// of thing that is wrong in one direction only, so each is pinned at both of its edges rather than
+// at one address inside it.
+TEST(NetworkAddress, GloballyRoutableIPv4RejectsEveryUnroutableRange)
+{
+	// Routable: ordinary public unicast, and the last address before the
+	// multicast floor.
+	ASSERT_TRUE(CNetworkAddress::FromString("1.1.1.1").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("223.255.255.255").IsGloballyRoutableIPv4());
+
+	// Not an IPv4 address at all.
+	ASSERT_FALSE(CNetworkAddress::Absent().IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("2001:db8::1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("0.0.0.0").IsGloballyRoutableIPv4());
+
+	// A v4-mapped address is judged as the IPv4 address it carries, in both directions --
+	// Unmapped() runs first, so the answer must not depend on which form the caller happened to
+	// hold.
+	ASSERT_TRUE(CNetworkAddress::FromString("::ffff:1.1.1.1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("::ffff:10.0.0.1").IsGloballyRoutableIPv4());
+
+	// Whole first octets: "this network", RFC 1918 /8, and loopback.
+	ASSERT_FALSE(CNetworkAddress::FromString("0.1.2.3").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("10.0.0.1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("10.255.255.255").IsGloballyRoutableIPv4());
+	// The whole 127/8 block, not just 127.0.0.1: a Debian host names itself
+	// 127.0.1.1, and that is the value GetPublicIP() falls through to.
+	ASSERT_FALSE(CNetworkAddress::FromString("127.0.0.1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("127.0.1.1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("127.255.255.255").IsGloballyRoutableIPv4());
+	// 126 and 128 bracket it, so the test would fail an off-by-one on the
+	// octet as well as a wrong block.
+	ASSERT_TRUE(CNetworkAddress::FromString("126.0.0.1").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("128.0.0.1").IsGloballyRoutableIPv4());
+
+	// 100.64.0.0/10, carrier-grade NAT. Mask (b & 0xC0) == 0x40, so the block
+	// runs 100.64 through 100.127 and its neighbours must stay routable.
+	ASSERT_FALSE(CNetworkAddress::FromString("100.64.0.1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("100.127.255.255").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("100.63.255.255").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("100.128.0.0").IsGloballyRoutableIPv4());
+
+	// 169.254.0.0/16, link-local.
+	ASSERT_FALSE(CNetworkAddress::FromString("169.254.1.1").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("169.253.1.1").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("169.255.1.1").IsGloballyRoutableIPv4());
+
+	// 172.16.0.0/12, private. Mask (b & 0xF0) == 16, so 172.16 through
+	// 172.31, and 172.15 and 172.32 are public.
+	ASSERT_FALSE(CNetworkAddress::FromString("172.16.0.1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("172.31.255.255").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("172.15.255.255").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("172.32.0.0").IsGloballyRoutableIPv4());
+
+	// The /24 exclusions under 192.0/16, and private 192.168/16.
+	ASSERT_FALSE(CNetworkAddress::FromString("192.0.0.1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("192.0.2.1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("192.88.99.0").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("192.88.99.255").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("192.168.1.1").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("192.0.1.1").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("192.88.98.255").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("192.88.100.0").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("192.167.1.1").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("192.169.1.1").IsGloballyRoutableIPv4());
+
+	// 198.18.0.0/15, benchmarking. Mask (b & 0xFE) == 18, so 198.18 and
+	// 198.19 only. 198.51.100.0/24 is TEST-NET-2 under the same first octet.
+	ASSERT_FALSE(CNetworkAddress::FromString("198.18.0.1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("198.19.255.255").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("198.17.255.255").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("198.20.0.0").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("198.51.100.1").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("198.51.99.1").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("198.51.101.1").IsGloballyRoutableIPv4());
+
+	// 203.0.113.0/24, TEST-NET-3.
+	ASSERT_FALSE(CNetworkAddress::FromString("203.0.113.1").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("203.0.112.1").IsGloballyRoutableIPv4());
+	ASSERT_TRUE(CNetworkAddress::FromString("203.0.114.1").IsGloballyRoutableIPv4());
+
+	// Everything from 224 up: multicast and reserved. Neither is a unicast
+	// source address, and the boundary is the one the predicate states.
+	ASSERT_FALSE(CNetworkAddress::FromString("224.0.0.1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("239.255.255.255").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("240.0.0.1").IsGloballyRoutableIPv4());
+	ASSERT_FALSE(CNetworkAddress::FromString("255.255.255.255").IsGloballyRoutableIPv4());
+}
+
+// Defined in NetworkAddressTableLinkage.cpp, a second unit that includes the same header.
+const void *ExcludedPrefixTableAddressFromOtherUnit() noexcept;
+
+// The exclusion table has to be one entity, not one per translation unit. `constexpr` at namespace
+// scope implies `const` and therefore internal linkage, and IsGloballyRoutableIPv6() is an inline
+// member that uses it: ill-formed with no diagnostic required, and a separate copy of the table in
+// every unit including the header.
+//
+// Nothing about that fails to compile or link, which is why it needs asking directly. Dropping the
+// `inline` makes this fail with two distinct addresses.
+TEST(NetworkAddress, TheExclusionTableIsOneEntityAcrossUnits)
+{
+	ASSERT_TRUE(ExcludedPrefixTableAddressFromOtherUnit() ==
+		    static_cast<const void *>(&NetworkAddressPolicy::kIPv6ExcludedPrefixes0));
+}
+
+// CNetworkAddress no longer stores a boost::asio::ip::address, so the three predicates that used to
+// be asio's -- loopback, link-local, unique-local -- are now prefix tests in NetworkAddress.h. This
+// pins each range it must reject, because getting one prefix wrong here does not fail a build: it
+// advertises an address no peer can reach, and the only symptom is a wasted connect attempt on the
+// far side.
+TEST(NetworkAddress, GloballyRoutableIPv6RejectsEveryUnreachableRange)
+{
+	ASSERT_FALSE(CNetworkAddress::FromString("2001:db8::1").IsGloballyRoutableIPv6());
+	for (const auto &prefix : NetworkAddressPolicy::kIPv6ExcludedPrefixes) {
+		ASSERT_TRUE(prefix.name0 != '\0');
+		ASSERT_TRUE(prefix.bits > 0 && prefix.bits <= 128);
+		const auto first = CNetworkAddress::IPv6FromOctets(prefix.bytes);
+		auto lastBytes = prefix.bytes;
+		for (unsigned bit = prefix.bits; bit < 128; ++bit) {
+			lastBytesbit / 8 |= static_cast<std::uint8_t>(0x80u >> (bit % 8));
+		}
+		ASSERT_FALSE(first.IsGloballyRoutableIPv6());
+		ASSERT_FALSE(CNetworkAddress::IPv6FromOctets(lastBytes).IsGloballyRoutableIPv6());
+		ASSERT_TRUE(NetworkAddressPolicy::MatchesPrefix(first.GetOctets(), prefix));
+		ASSERT_TRUE(NetworkAddressPolicy::MatchesPrefix(lastBytes, prefix));
+		// Flip each prefix bit: none may be ignored, including partial bytes.
+		for (unsigned bit = 0; bit < prefix.bits; ++bit) {
+			auto outside = prefix.bytes;
+			outsidebit / 8 ^= static_cast<std::uint8_t>(0x80u >> (bit % 8));
+			ASSERT_FALSE(NetworkAddressPolicy::MatchesPrefix(outside, prefix));
+		}
+	}
+	// Literal bounds are independent of the production exclusion table: removing
+	// an entry or changing its prefix length must not change these expectations.
+	const struct
+	{
+		const char *before;
+		const char *first;
+		const char *last;
+		const char *after;
+	} excludedRanges = {
+		// 64:ff9b::/96
+		{ "64:ff9a:ffff:ffff:ffff:ffff:ffff:ffff",
+			"64:ff9b::",
+			"64:ff9b::ffff:ffff",
+			"64:ff9b::1:0:0" },
+		// 64:ff9b:1::/48
+		{ "64:ff9b:0:ffff:ffff:ffff:ffff:ffff",
+			"64:ff9b:1::",
+			"64:ff9b:1:ffff:ffff:ffff:ffff:ffff",
+			"64:ff9b:2::" },
+		// 100::/64
+		{ "ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+			"100::",
+			"100::ffff:ffff:ffff:ffff",
+			"100:0:0:1::" },
+		// 2001::/23, the IETF Protocol Assignments block. Coarser than the ORCHIDv2 row it
+		// replaces, and still a literal IANA bound rather than a restatement of our table:
+		// /23 fixes bits 0 to 22, so the block runs to 2001:01ff:ffff:... and the first
+		// globally routable address above it is 2001:200::.
+		{ "2000:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+			"2001::",
+			"2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff",
+			"2001:200::" },
+		// 2001:db8::/32
+		{ "2001:db7:ffff:ffff:ffff:ffff:ffff:ffff",
+			"2001:db8::",
+			"2001:db8:ffff:ffff:ffff:ffff:ffff:ffff",
+			"2001:db9::" },
+		// 5f00::/16
+		{ "5eff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+			"5f00::",
+			"5f00:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+			"5f01::" },
+	};
+	for (const auto &range : excludedRanges) {
+		ASSERT_TRUE(CNetworkAddress::FromString(range.before).IsGloballyRoutableIPv6());
+		ASSERT_FALSE(CNetworkAddress::FromString(range.first).IsGloballyRoutableIPv6());
+		ASSERT_FALSE(CNetworkAddress::FromString(range.last).IsGloballyRoutableIPv6());
+		ASSERT_TRUE(CNetworkAddress::FromString(range.after).IsGloballyRoutableIPv6());
+	}
+	ASSERT_TRUE(CNetworkAddress::FromString("2606:4700::1111").IsGloballyRoutableIPv6());
+
+	// The sub-blocks 2001::/23 covers that had no entry of their own. Asserted individually
+	// rather than left implied by the prefix length, because the reason each one is not
+	// globally routable is a separate fact about the registry.
+	ASSERT_FALSE(CNetworkAddress::FromString("2001:2::1").IsGloballyRoutableIPv6());  // benchmarking
+	ASSERT_FALSE(CNetworkAddress::FromString("2001:3::1").IsGloballyRoutableIPv6());  // AMT
+	ASSERT_FALSE(CNetworkAddress::FromString("2001:10::1").IsGloballyRoutableIPv6()); // old ORCHID
+	ASSERT_FALSE(CNetworkAddress::FromString("2001:30::1").IsGloballyRoutableIPv6()); // drone RID
+	// Teredo and ORCHIDv2 still excluded, now by the containing block rather than their own.
+	ASSERT_FALSE(CNetworkAddress::FromString("2001::1").IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("2001:20::1").IsGloballyRoutableIPv6());
+	// Immediately outside the block on both sides, which is what stops the entry over-reaching.
+	ASSERT_TRUE(CNetworkAddress::FromString("2001:200::1").IsGloballyRoutableIPv6());
+	ASSERT_TRUE(CNetworkAddress::FromString("2000:ffff::1").IsGloballyRoutableIPv6());
+
+	// Not an IPv6 address at all.
+	ASSERT_FALSE(CNetworkAddress::Absent().IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("192.0.2.1").IsGloballyRoutableIPv6());
+	// A mapped address is reachable over IPv4, so it is not an IPv6 address to
+	// advertise as one.
+	ASSERT_FALSE(CNetworkAddress::FromString("::ffff:192.0.2.1").IsGloballyRoutableIPv6());
+
+	// The unspecified address and loopback.
+	ASSERT_FALSE(CNetworkAddress::AnyIPv6().IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("::").IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("::1").IsGloballyRoutableIPv6());
+
+	// fe80::/10, link-local -- both ends of the range, since the prefix is ten
+	// bits and a byte-wide test would let the upper half through.
+	ASSERT_FALSE(CNetworkAddress::FromString("fe80::1").IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("febf:ffff::1").IsGloballyRoutableIPv6());
+
+	// fec0::/10, the deprecated site-local range.
+	ASSERT_FALSE(CNetworkAddress::FromString("fec0::1").IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("feff:ffff::1").IsGloballyRoutableIPv6());
+
+	// Teredo 2001::/32 and 6to4 2002::/16.
+	ASSERT_FALSE(CNetworkAddress::FromString("2001::").IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("2001::ffff:ffff:ffff:ffff").IsGloballyRoutableIPv6());
+	ASSERT_TRUE(CNetworkAddress::FromString("2000:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
+			    .IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("2002::").IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
+			     .IsGloballyRoutableIPv6());
+	ASSERT_TRUE(CNetworkAddress::FromString("2001:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
+			    .IsGloballyRoutableIPv6());
+	ASSERT_TRUE(CNetworkAddress::FromString("2003::").IsGloballyRoutableIPv6());
+
+	// fc00::/7, unique-local. Both halves: fc00::/8 and fd00::/8.
+	ASSERT_FALSE(CNetworkAddress::FromString("fc00::1").IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("fd12:3456::1").IsGloballyRoutableIPv6());
+	ASSERT_FALSE(CNetworkAddress::FromString("fdff:ffff::1").IsGloballyRoutableIPv6());
+
+	// ff00::/8, multicast.
+	ASSERT_FALSE(CNetworkAddress::FromString("ff02::1").IsGloballyRoutableIPv6());
+
+	// And the addresses immediately outside those prefixes stay routable, so
+	// the tests above are pinning a prefix and not a whole leading byte.
+	ASSERT_TRUE(CNetworkAddress::FromString("fbff:ffff::1").IsGloballyRoutableIPv6());
+	ASSERT_TRUE(CNetworkAddress::FromString("fe00::1").IsGloballyRoutableIPv6());
+	ASSERT_TRUE(CNetworkAddress::FromString("fe7f:ffff::1").IsGloballyRoutableIPv6());
+}
+
+// The octets are the storage now, so what GetOctets() hands out is what every bit-arithmetic caller
+// -- IPFilterMatch.h above all -- works on. Two things are worth pinning: the order is wire order
+// for both families, and an IPv4 address leaves the tail zero rather than filling in the mapped
+// prefix. Callers relying on the latter would silently match the wrong rule.
+TEST(NetworkAddress, OctetsAreWireOrderAndLeaveTheIPv4TailZero)
+{
+	// 192.0.2.1 reached through either 32-bit convention gives the same octets,
+	// most significant first -- neither convention is the storage order.
+	const CNetworkAddress v4 = CNetworkAddress::FromIPv4NetworkOrder(TEST_IP_ED2K_ORDER);
+	const CNetworkAddress::Octets v4Octets = v4.GetOctets();
+	ASSERT_EQUALS(192, static_cast<int>(v4Octets0));
+	ASSERT_EQUALS(0, static_cast<int>(v4Octets1));
+	ASSERT_EQUALS(2, static_cast<int>(v4Octets2));
+	ASSERT_EQUALS(1, static_cast<int>(v4Octets3));
+	for (int i = 4; i < 16; ++i) {
+		ASSERT_EQUALS(0, static_cast<int>(v4Octetsi));
+	}
+	ASSERT_EQUALS(0ul, v4.GetScopeId());
+
+	// The mapped form of the same address is a different set of octets, which
+	// is the storage-level statement of MappedAndNativeAreDistinct above.
+	const CNetworkAddress::Octets mappedOctets =
+		CNetworkAddress::FromString("::ffff:192.0.2.1").GetOctets();
+	ASSERT_EQUALS(0xff, static_cast<int>(mappedOctets10));
+	ASSERT_EQUALS(0xff, static_cast<int>(mappedOctets11));
+	ASSERT_EQUALS(192, static_cast<int>(mappedOctets12));
+	ASSERT_EQUALS(1, static_cast<int>(mappedOctets15));
+	ASSERT_TRUE(v4Octets != mappedOctets);
+
+	// IPv6FromOctets() applies no absence rule, so the all-zero octets are the unspecified
+	// address and not absence -- unlike FromIPv6Bytes(), the wire-tag edge where all-zero does
+	// mean "this peer has no IPv6".
+	ASSERT_TRUE(CNetworkAddress::AnyIPv6().IsPresent());
+	ASSERT_TRUE(CNetworkAddress::AnyIPv6().IsIPv6());
+	ASSERT_TRUE(CNetworkAddress::AnyIPv6().IsUnspecified());
+	ASSERT_EQUALS(wxString("::"), CNetworkAddress::AnyIPv6().ToWxString());
+	const std::uint8_t allZero16 = { 0 };
+	ASSERT_TRUE(CNetworkAddress::FromIPv6Bytes(allZero).IsAbsent());
+	ASSERT_TRUE(CNetworkAddress::AnyIPv6() != CNetworkAddress::Absent());
+}
+
+// ToIPv6Bytes() is the wire-side writer: the CT_MOD_IP_V6 handshake tag, Kad's "ip6" tag and the
+// NAT endpoint hint each hand it a bare sixteen-byte buffer and then read all sixteen back. Nothing
+// pinned that it fills all sixteen, so the postcondition lived only in the doc comment -- and a
+// short write there is not cosmetic: the bytes it left alone become part of an address a peer is
+// told to punch at.
+TEST(NetworkAddress, ToIPv6BytesFillsAllSixteenOrWritesNothing)
+{
+	// Sentinel fill rather than zero fill: a byte still holding 0xCD afterwards is a byte the
+	// writer skipped, which a zero-filled buffer would hide behind a plausible-looking 0.
+	std::uint8_t bytes16;
+	std::fill(std::begin(bytes), std::end(bytes), 0xCD);
+
+	const CNetworkAddress v6 = CNetworkAddress::FromString("2001:db8::1");
+	ASSERT_TRUE(v6.ToIPv6Bytes(bytes));
+	const CNetworkAddress::Octets &expected = v6.GetOctets();
+	for (std::size_t i = 0; i < expected.size(); ++i) {
+		ASSERT_EQUALS(static_cast<int>(expectedi), static_cast<int>(bytesi));
+	}
+	// Stated separately for the trailing octet, because the tail is what a copy that stops
+	// early loses first. It is 1 rather than 0 here, so "skipped" and "correctly written"
+	// cannot coincide.
+	ASSERT_EQUALS(1, static_cast<int>(bytes15));
+
+	// A mapped IPv4 address is an IPv6 address for this writer's purposes, and it
+	// goes out as the mapped form -- all sixteen octets again, not four.
+	std::fill(std::begin(bytes), std::end(bytes), 0xCD);
+	ASSERT_TRUE(CNetworkAddress::FromString("::ffff:192.0.2.1").ToIPv6Bytes(bytes));
+	ASSERT_EQUALS(0xff, static_cast<int>(bytes10));
+	ASSERT_EQUALS(0xff, static_cast<int>(bytes11));
+	ASSERT_EQUALS(192, static_cast<int>(bytes12));
+	ASSERT_EQUALS(1, static_cast<int>(bytes15));
+
+	// The failure paths write nothing at all, so a caller that ignores the result
+	// cannot mistake a stale buffer for an address it never received.
+	std::fill(std::begin(bytes), std::end(bytes), 0xCD);
+	ASSERT_FALSE(CNetworkAddress::FromIPv4HostOrder(TEST_IP_HOST_ORDER).ToIPv6Bytes(bytes));
+	ASSERT_FALSE(CNetworkAddress::Absent().ToIPv6Bytes(bytes));
+	ASSERT_FALSE(v6.ToIPv6Bytes(nullptr));
+	for (std::size_t i = 0; i < 16; ++i) {
+		ASSERT_EQUALS(0xCD, static_cast<int>(bytesi));
+	}
+}
+
+// The socket backend is the one caller that still needs a real asio address, so
+// NetworkAddressAsio.h is the single bridge. It has to be exactly lossless in both directions: a
+// swapped IPv4 conversion here would connect to the wrong host, and a dropped scope id would fold
+// two distinct link-local destinations into one.
+TEST(NetworkAddress, AsioBridgeRoundTripsWithoutLosingAnything)
+{
+	const CNetworkAddress cases = {
+		CNetworkAddress::FromIPv4NetworkOrder(TEST_IP_ED2K_ORDER),
+		CNetworkAddress::FromString("0.0.0.0"),
+		CNetworkAddress::FromString("255.255.255.254"),
+		CNetworkAddress::FromString("2001:db8::1"),
+		CNetworkAddress::FromString("::ffff:192.0.2.1"),
+		CNetworkAddress::AnyIPv6(),
+		CNetworkAddress::FromString("::1"),
+	};
+	for (const CNetworkAddress &address : cases) {
+		const CNetworkAddress roundTripped =
+			NetworkAddressAsio::FromAsioAddress(NetworkAddressAsio::ToAsioAddress(address));
+		ASSERT_TRUE(roundTripped == address);
+		// Not just equal -- the same text, so a family or octet swap that
+		// happened to compare equal would still be caught.
+		ASSERT_EQUALS(address.ToWxString(), roundTripped.ToWxString());
+	}
+
+	// The 32-bit conventions survive the crossing: asio's to_uint() is host
+	// order, which is the convention FromIPv4HostOrder() names.
+	ASSERT_EQUALS(wxString("192.0.2.1"),
+		NetworkAddressAsio::FromAsioAddress(boost::asio::ip::make_address("192.0.2.1")).ToWxString());
+	std::uint32_t hostOrder = 0;
+	ASSERT_TRUE(NetworkAddressAsio::FromAsioAddress(boost::asio::ip::make_address("192.0.2.1"))
+			    .ToIPv4HostOrder(hostOrder));
+	ASSERT_EQUALS(TEST_IP_HOST_ORDER, hostOrder);
+
+	// A scope id is part of the address's identity, so it crosses too. Without it fe80::1%7 and
+	// fe80::1%9 would be one key in every container that uses this type.
+	const CNetworkAddress scoped =
+		NetworkAddressAsio::FromAsioAddress(boost::asio::ip::make_address("fe80::1%7"));
+	ASSERT_EQUALS(7ul, scoped.GetScopeId());
+	ASSERT_TRUE(scoped == NetworkAddressAsio::FromAsioAddress(NetworkAddressAsio::ToAsioAddress(scoped)));
+	ASSERT_TRUE(scoped != CNetworkAddress::FromString("fe80::1"));
+	ASSERT_TRUE(CNetworkAddress::FromString("fe80::1").GetScopeId() == 0ul);
+
+	// An asio address is always a present address: nothing it can hold means
+	// absence, 0.0.0.0 included. That overload belongs to the wire edges.
+	ASSERT_TRUE(
+		NetworkAddressAsio::FromAsioAddress(boost::asio::ip::make_address("0.0.0.0")).IsPresent());
+	ASSERT_TRUE(NetworkAddressAsio::FromAsioAddress(boost::asio::ip::make_address("0.0.0.0"))
+			    .IsUnspecified());
+}
+
+// File_checked_for_headers

amule-3.0.1.tar.gz/unittests/tests/NetworkFunctionsTest.cpp -> amule-3.1.0.tar.gz/unittests/tests/NetworkFunctionsTest.cpp Changed

@@ -1,14 +1,16 @@
 #include <muleunit/test.h>
 #include <NetworkFunctions.h>
+#include <amuleIPV4Address.h>
 
-#define itemsof(x) (sizeof(x)/sizeof(x0))
+#define itemsof(x) (sizeof(x) / sizeof(x0))
 
 using namespace muleunit;
 
 // Needed for Boost-enabled build
-namespace MuleNotify {
-	void HandleNotificationAlways(const class CMuleNotiferBase&) {}
-};
+namespace MuleNotify
+{
+void HandleNotificationAlways(const class CMuleNotiferBase &) {}
+}; // namespace MuleNotify
 
 DECLARE_SIMPLE(NetworkFunctions)
 
@@ -30,30 +32,45 @@
 							for (int c = 0; c < items; ++c) {
 								for (int zc = 0; zc < zeros; ++zc) {
 									for (int d = 0; d < items; ++d) {
-										for (int zd = 0; zd < zeros; ++zd) {
+										for (int zd = 0; zd < zeros;
+											++zd) {
 											wxString IP;
 
-											IP << wxString(' ', wl)
-											   << wxString('0', za)
-											   << valuesa
-											   << '.'
-											   << wxString('0', zb)
-											   << valuesb
-											   << '.'
-											   << wxString('0', zc)
-											   << valuesc
-											   << '.'
-											   << wxString('0', zd)
+											IP << wxString(
+												      ' ', wl)
+											   << wxString(
+												      '0', za)
+											   << valuesa << '.'
+											   << wxString(
+												      '0', zb)
+											   << valuesb << '.'
+											   << wxString(
+												      '0', zc)
+											   << valuesc << '.'
+											   << wxString(
+												      '0', zd)
 											   << valuesd
-											   << wxString(' ', wr);
+											   << wxString(' ',
+												      wr);
 
 											uint32 resultIP = 17;
 
-											ASSERT_TRUE(StringIPtoUint32(IP, resultIP));
-
-											uint32 expected = (valuesd << 24) | (valuesc << 16) | (valuesb << 8) | valuesa;
-
-											ASSERT_EQUALS(expected, resultIP);
+											ASSERT_TRUE(StringIPtoUint32(
+												IP,
+												resultIP));
+
+											uint32 expected =
+												(valuesd
+													<< 24) |
+												(valuesc
+													<< 16) |
+												(valuesb
+													<< 8) |
+												valuesa;
+
+											ASSERT_EQUALS(
+												expected,
+												resultIP);
 										}
 									}
 								}
@@ -65,7 +82,6 @@
 		}
 	}
 
-
 	// Test invalid IPs
 	uint32 dummyIP = 27;
 
@@ -119,7 +135,6 @@
 		ASSERT_FALSE(StringIPtoUint32(wxString::Format("1.2.3.%c4", c), dummyIP));
 	}
 
-
 	// Faar too large values (triggered overflow and became negative)
 	ASSERT_FALSE(StringIPtoUint32("2147483648.2.3.4", dummyIP));
 	ASSERT_FALSE(StringIPtoUint32("1.2147483648.3.4", dummyIP));
@@ -132,47 +147,44 @@
 	ASSERT_FALSE(StringIPtoUint32("1.2.4294967296.4", dummyIP));
 	ASSERT_FALSE(StringIPtoUint32("1.2.3.4294967296", dummyIP));
 
-
 	// The dummyIP value shouldn't have been changed by any of these calls
 	ASSERT_EQUALS(27u, dummyIP);
 }
 
-
 // Testing the IsGoodIP() and IsLanIP() functions
 TEST(NetworkFunctions, IsGoodIP)
 {
-	struct {
-		wxString	ip;
-		bool		isgood;
-		bool		islan;
-	} ipList = {
-		{ "0.0.0.0",	false,	false	},
-		{ "0.0.0.1",	false,	false	},
-		{ "0.0.1.0",	false,	false	},
-		{ "0.1.0.0",	false,	false	},
-		{ "1.0.0.0",	true,	false	},
-		{ "10.0.0.1",	true,	true	},
-		{ "10.0.1.0",	true,	true	},
-		{ "10.1.0.0",	true,	true	},
-		{ "14.156.39.4",	true,	false	},
-		{ "24.93.63.177",	true,	false	},
-		{ "172.15.0.0",	true,	false	},
-		{ "172.16.0.0",	true,	true	},
-		{ "172.17.0.0",	true,	true	},
-		{ "172.31.0.0",	true,	true	},
-		{ "172.32.0.0",	true,	false	},
-		{ "192.88.98.176",	true,	false	},
-		{ "192.88.99.175",	false,	false	},
-		{ "192.88.100.17",	true,	false	},
-		{ "192.167.0.0",	true,	false	},
-		{ "192.168.0.0",	true,	true	},
-		{ "192.168.255.255", true, true	},
-		{ "192.169.0.0",	true,	false	},
-		{ "198.17.0.0",	true,	false	},
-		{ "198.18.0.0",	false,	false	},
-		{ "198.19.0.0",	false,	false	},
-		{ "198.20.0.0",	true,	false	}
-	};
+	struct
+	{
+		wxString ip;
+		bool isgood;
+		bool islan;
+	} ipList = { { "0.0.0.0", false, false },
+		{ "0.0.0.1", false, false },
+		{ "0.0.1.0", false, false },
+		{ "0.1.0.0", false, false },
+		{ "1.0.0.0", true, false },
+		{ "10.0.0.1", true, true },
+		{ "10.0.1.0", true, true },
+		{ "10.1.0.0", true, true },
+		{ "14.156.39.4", true, false },
+		{ "24.93.63.177", true, false },
+		{ "172.15.0.0", true, false },
+		{ "172.16.0.0", true, true },
+		{ "172.17.0.0", true, true },
+		{ "172.31.0.0", true, true },
+		{ "172.32.0.0", true, false },
+		{ "192.88.98.176", true, false },
+		{ "192.88.99.175", false, false },
+		{ "192.88.100.17", true, false },
+		{ "192.167.0.0", true, false },
+		{ "192.168.0.0", true, true },
+		{ "192.168.255.255", true, true },
+		{ "192.169.0.0", true, false },
+		{ "198.17.0.0", true, false },
+		{ "198.18.0.0", false, false },
+		{ "198.19.0.0", false, false },
+		{ "198.20.0.0", true, false } };
 
 	unsigned int ip;
 	for (unsigned int i = 0; i < itemsof(ipList); i++) {
@@ -182,3 +194,52 @@
 		ASSERT_EQUALS(ipListi.isgood && !ipListi.islan, IsGoodIP(ip, true));
 	}
 }
+
+// amuleIPV4Address is v4-only by contract: the endpoint feeds uint32 IPs and v4 sockets throughout
+// aMule. Name resolution used to hand back whatever the platform resolver ranked first, which on a
+// dual-stack name is routinely an AAAA record (issue #695).
+//
+// Every case here resolves offline: numeric addresses and "localhost" (hosts file) need no DNS
+// server, so the test cannot go flaky when a public zone changes its records.
+//
+// The numeric IPv6 literals are what actually pin the regression on every platform. They are not
+// dotted quads, so they fall through to the resolver, and an unrestricted query answers with the v6
+// address -- which the old code accepted. Ordering plays no part, so unlike "localhost", which only
+// exposes the bug where ::1 sorts first (Windows), these fail on macOS and Linux too if the family
+// restriction is ever dropped again.
+//
+// Note what is NOT asserted: a specific resolved address. Which A record surfaces varies by
+// platform and between runs (round-robin, resolver ordering), so pinning one would be flaky by
+// construction. The invariant is the address family.
+TEST(NetworkFunctions, HostnameResolvesToIPv4Only)
+{
+	amuleIPV4Address addr;
+
+	// A dotted quad must survive untouched (the no-resolution fast path).
+	ASSERT_TRUE(addr.Hostname(wxT("127.0.0.1")));
+	ASSERT_EQUALS(wxString(wxT("127.0.0.1")), addr.IPAddress());
+
+	// An IPv6 literal has no v4 answer, so it must be refused outright
+	// rather than stored in a v4-only endpoint.
+	amuleIPV4Address v6literal;
+	ASSERT_FALSE(v6literal.Hostname(wxT("::1")));
+	amuleIPV4Address v6global;
+	ASSERT_FALSE(v6global.Hostname(wxT("2001:4860:4860::8888")));
+
+	// A name that has both A and AAAA records must still yield IPv4.
+	amuleIPV4Address local;
+	ASSERT_TRUE(local.Hostname(wxT("localhost")));
+	unsigned int ip = 0;
+	// StringIPtoUint32 only parses a dotted quad, so this is what actually
+	// pins the family: an IPv6 result fails to parse here.
+	ASSERT_TRUE(StringIPtoUint32(local.IPAddress(), ip));
+	ASSERT_TRUE(IsLoopbackIP(ip));
+
+	// The same invariant through the helper the rest of the tree calls.
+	ASSERT_TRUE(StringHosttoUint32(wxT("localhost")) != 0);
+	ASSERT_EQUALS((unsigned int)0, StringHosttoUint32(wxT("::1")));
+
+	// An empty name is rejected rather than resolved to anything.
+	amuleIPV4Address empty;
+	ASSERT_FALSE(empty.Hostname(wxEmptyString));
+}

amule-3.0.1.tar.gz/unittests/tests/OtherFunctionsTest.cpp -> amule-3.1.0.tar.gz/unittests/tests/OtherFunctionsTest.cpp Changed

@@ -41,16 +41,15 @@
 	ASSERT_EQUALS(0u, DecodeBase16(wxT("ABC"), 3, buf));
 }
 
-
 DECLARE_SIMPLE(Base64)
 
 // EncodeBase64 with a header must include both the encoded content and the
-// footer — regression for the pbBufferOut = vs += bug.
+// footer -- regression for the pbBufferOut = vs += bug.
 TEST(Base64, HeaderAndFooterBothPresent)
 {
 	SetBase64Header(wxT("TEST"));
 	wxString result = EncodeBase64("Man", 3);
-	SetBase64Header(wxEmptyString);  // restore global state
+	SetBase64Header(wxEmptyString); // restore global state
 
 	// "Man" encodes to "TWFu" in standard Base64
 	ASSERT_TRUE(result.Contains(wxT("-----BEGIN TEST-----")));
@@ -70,3 +69,110 @@
 	ASSERT_FALSE(result.Contains(wxT("-----")));
 	ASSERT_TRUE(result.Contains(wxT("TWFu")));
 }
+
+// CompareLatestReleaseVersion -- the shared release-tag parse and version comparison the daemon
+// check (CamuleApp::CheckNewVersion) and the GUI check (CVersionCheck) use. Comparisons use extreme
+// tags (999.x / 0.0.1) so the up-to-date / outdated results are deterministic regardless of the
+// version this test binary was compiled with.
+
+DECLARE_SIMPLE(VersionCompare)
+
+TEST(VersionCompare, ParsesTagAndReportsOutdated)
+{
+	CVersionCompareResult r = CompareLatestReleaseVersion(wxT("{\"tag_name\": \"999.5.3\"}"));
+	ASSERT_TRUE(r.state == CVersionCompareResult::Outdated);
+	ASSERT_EQUALS(999, r.major);
+	ASSERT_EQUALS(5, r.minor);
+	ASSERT_EQUALS(3, r.update);
+	ASSERT_EQUALS(wxString(wxT("999.5.3")), r.latest);
+}
+
+TEST(VersionCompare, ReportsUpToDate)
+{
+	CVersionCompareResult r = CompareLatestReleaseVersion(wxT("{\"tag_name\": \"0.0.1\"}"));
+	ASSERT_TRUE(r.state == CVersionCompareResult::UpToDate);
+}
+
+// A leading v/V is tolerated.
+TEST(VersionCompare, StripsVPrefix)
+{
+	CVersionCompareResult r = CompareLatestReleaseVersion(wxT("{\"tag_name\": \"v999.5.3\"}"));
+	ASSERT_TRUE(r.state == CVersionCompareResult::Outdated);
+	ASSERT_EQUALS(999, r.major);
+	ASSERT_EQUALS(5, r.minor);
+	ASSERT_EQUALS(3, r.update);
+}
+
+// A pre-release / build-metadata suffix is stripped before comparison.
+TEST(VersionCompare, StripsSuffix)
+{
+	CVersionCompareResult a = CompareLatestReleaseVersion(wxT("{\"tag_name\": \"999.5.3-rc1\"}"));
+	ASSERT_EQUALS(999, a.major);
+	ASSERT_EQUALS(5, a.minor);
+	ASSERT_EQUALS(3, a.update);
+
+	CVersionCompareResult b = CompareLatestReleaseVersion(wxT("{\"tag_name\": \"999.5.3+build42\"}"));
+	ASSERT_EQUALS(3, b.update);
+}
+
+// Tags with fewer than three components are valid; missing fields are 0.
+TEST(VersionCompare, FewerComponents)
+{
+	CVersionCompareResult r = CompareLatestReleaseVersion(wxT("{\"tag_name\": \"999.5\"}"));
+	ASSERT_TRUE(r.state == CVersionCompareResult::Outdated);
+	ASSERT_EQUALS(999, r.major);
+	ASSERT_EQUALS(5, r.minor);
+	ASSERT_EQUALS(0, r.update);
+	ASSERT_EQUALS(wxString(wxT("999.5.0")), r.latest);
+}
+
+// Whitespace around the JSON colon is tolerated (regex match, not full parse).
+TEST(VersionCompare, WhitespaceTolerant)
+{
+	CVersionCompareResult r = CompareLatestReleaseVersion(wxT("{ \"tag_name\"  :   \"999.5.3\" }"));
+	ASSERT_TRUE(r.state == CVersionCompareResult::Outdated);
+	ASSERT_EQUALS(999, r.major);
+}
+
+// No tag_name field at all is a ParseError.
+TEST(VersionCompare, ParseErrorNoTag)
+{
+	CVersionCompareResult r = CompareLatestReleaseVersion(wxT("{\"name\": \"whatever\"}"));
+	ASSERT_TRUE(r.state == CVersionCompareResult::ParseError);
+}
+
+// A tag that reduces to empty after prefix/suffix strip is a ParseError.
+TEST(VersionCompare, ParseErrorEmptyAfterStrip)
+{
+	CVersionCompareResult r = CompareLatestReleaseVersion(wxT("{\"tag_name\": \"v\"}"));
+	ASSERT_TRUE(r.state == CVersionCompareResult::ParseError);
+}
+
+// A non-numeric version component is a ParseError.
+TEST(VersionCompare, ParseErrorNonNumeric)
+{
+	CVersionCompareResult r = CompareLatestReleaseVersion(wxT("{\"tag_name\": \"3.x.0\"}"));
+	ASSERT_TRUE(r.state == CVersionCompareResult::ParseError);
+}
+
+DECLARE_SIMPLE(MediaCodec)
+
+// ffprobe reports lowercase, the ed2k tag carries uppercase FOURCCs, and both have to land on the
+// same label -- the GUI and the API render this string side by side for the same file.
+TEST(MediaCodec, MapsKnownCodecsWhateverTheCase)
+{
+	ASSERT_EQUALS(wxT("H.264"), FormatMediaCodec(wxT("h264")));
+	ASSERT_EQUALS(wxT("H.264"), FormatMediaCodec(wxT("H264")));
+	ASSERT_EQUALS(wxT("H.264"), FormatMediaCodec(wxT("avc1")));
+	ASSERT_EQUALS(wxT("H.265 / HEVC"), FormatMediaCodec(wxT("hevc")));
+	ASSERT_EQUALS(wxT("Vorbis"), FormatMediaCodec(wxT("vorb")));
+	ASSERT_EQUALS(wxT("Xvid"), FormatMediaCodec(wxT("XviD")));
+}
+
+// An unmapped codec still has to show something, and an empty one stays empty rather than becoming
+// a label for nothing.
+TEST(MediaCodec, PassesThroughWhatItDoesNotKnow)
+{
+	ASSERT_EQUALS(wxT("theora"), FormatMediaCodec(wxT("theora")));
+	ASSERT_EQUALS(wxT(""), FormatMediaCodec(wxT("")));
+}

amule-3.1.0.tar.gz/unittests/tests/PartBarLegendTest.cpp Added

@@ -0,0 +1,698 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// The chunk-bar palette and the legend the row context menu opens to explain it (issue #1192).
+//
+// A legend explaining colours is only worth anything while it agrees with the bar, and the way that
+// agreement dies is silent: someone changes a colour in the renderer and the explanation, wherever
+// it lives, keeps saying the old thing. PartBarLegend.h answers that by having exactly one copy of
+// each colour, which both the renderer and the legend read. This suite is the other half: it pins
+// the values themselves against what the bar drew before they were lifted out of
+// GenericClientListCtrl.cpp, so a colour cannot be edited on the way past without a test saying so,
+// and it pins the properties a legend needs to be readable at all -- one row per state the bar can
+// draw, in the order the renderer decides them, no two rows the same colour.
+//
+// Since #1220 it also covers the shared-files source-availability bar, whose colour was a gradient
+// the GUI and the Web UI each computed with their own endpoints and their own saturation point. The
+// fade is now one function, so the endpoints are asserted as literals worked out by hand, and the
+// two interior samples pin the rounding; the last two tests read the browser's own components.js
+// and app.css and compare, because nothing generates one surface from the other and a hand-
+// maintained duplicate rots quietly.
+//
+// The same technique covers the two GUI bars against each other. They cannot be linked here either,
+// so they are read as text: what is checked is that both call the one fade and that neither has
+// grown a replacement for it.
+
+// It links no wx and opens no display session, which is the point: this is the half of the feature
+// a headless CI run can actually check. The drawing -- 16x16 swatches through a wxMemoryDC, the
+// gradient swatch included -- and the context-menu entry that opens the dialog are not reachable
+// from here.
+
+#include <muleunit/test.h>
+
+#include "PartBarLegend.h"
+#include "PartBarSpans.h"
+
+#include <cstddef>
+#include <fstream>
+#include <regex>
+#include <sstream>
+#include <string>
+
+using namespace muleunit;
+using namespace partbar;
+
+namespace
+{
+
+//! Spelled out rather than compared to the constants in the header: a test that read the palette
+//! from the same place the renderer does would pass no matter what either said.
+constexpr BarColour kExpectedNeither{ 240, 240, 240 };
+constexpr BarColour kExpectedFlatNeither{ 224, 224, 224 };
+constexpr BarColour kExpectedBoth{ 0, 192, 0 };
+constexpr BarColour kExpectedFlatBoth{ 0, 150, 0 };
+constexpr BarColour kExpectedClientOnly{ 104, 104, 104 };
+constexpr BarColour kExpectedFlatClientOnly{ 0, 0, 0 };
+constexpr BarColour kExpectedPending{ 255, 208, 0 };
+constexpr BarColour kExpectedNextPending{ 255, 255, 100 };
+
+//! The shared-files availability fade, likewise spelled out. These are the Web UI's endpoints
+//! (--piece-avail-lo / --piece-avail, src/webapi/static/css/app.css:29-30) transcribed by hand, and
+//! the two interior values are what rounding the blend produces at n=5 and n=9 -- worked out
+//! independently of the header's arithmetic, because a test running the same expression would agree
+//! with a wrong one.
+constexpr BarColour kExpectedZeroSources{ 255, 0, 0 };
+constexpr BarColour kExpectedOneSource{ 166, 212, 238 };
+constexpr BarColour kExpectedFiveSources{ 98, 144, 178 };
+constexpr BarColour kExpectedNineSources{ 30, 76, 117 };
+constexpr BarColour kExpectedManySources{ 13, 59, 102 };
+
+//! One more sample, one step along the fade, so the table below has a value between the light
+//! endpoint and the halfway point. 166 - 153/9 rounds to 149, 212 - 153/9 to 195, 238 - 136/9 to
+//! 223.
+constexpr BarColour kExpectedTwoSources{ 149, 195, 223 };
+
+//! What a bar cell shows for a part @c sources peers hold, as one table.
+//!
+//! Both GUI call sites -- CSharedFilesCtrl::GetItemBarFill and CDownloadListCtrl::GetItemBarFill --
+//! reach a colour through the same two branches: no source is its own state, any other count is a
+//! point on the fade. This is that decision written out once, at the counts worth naming: the two
+//! endpoints, the step either side of them, halfway, and three counts past saturation.
+struct AvailabilityTableRow
+{
+	unsigned sources;
+	BarColour colour;
+};
+
+constexpr AvailabilityTableRow kAvailabilityTable = { { 0, kExpectedZeroSources },
+	{ 1, kExpectedOneSource },
+	{ 2, kExpectedTwoSources },
+	{ 5, kExpectedFiveSources },
+	{ 9, kExpectedNineSources },
+	{ 10, kExpectedManySources },
+	{ 11, kExpectedManySources },
+	{ 1000, kExpectedManySources } };
+
+constexpr std::size_t kAvailabilityTableSize = sizeof(kAvailabilityTable) / sizeof(kAvailabilityTable0);
+
+//! The fade takes a source count and nothing else, pinned as a type rather than as prose.
+//!
+//! This is the whole enforcement mechanism, and it is worth being plain about why. No test in this
+//! tree can watch two renderers and see them agree: both GetItemBarFill() implementations need wx,
+//! an app and a display, and this suite has none of the three. What can be enforced is that neither
+//! call site is *able* to supply its own endpoints -- adding a lo/hi parameter changes this
+//! signature, which fails to compile here and is something a reviewer reads in a diff rather than
+//! something that slips past in a colour literal.
+using SourceAvailabilityColourSignature = BarColour (*)(unsigned);
+
+constexpr SourceAvailabilityColourSignature kFadeTakesOnlyASourceCount = &SourceAvailabilityColour;
+
+//! The hashing legend's two fills. Written out again rather than reused from kExpectedPending /
+//! kExpectedNextPending above: that the not-yet-hashed flat fill is byte-identical to the sources
+//! bar's next-requested cue is the collision this change resolved by naming them apart, and a test
+//! sharing one literal between the two legends would be asserting they are the same thing, which is
+//! what stopped being true.
+constexpr BarColour kExpectedHashed{ 0, 192, 0 };
+constexpr BarColour kExpectedFlatHashed{ 0, 150, 0 };
+constexpr BarColour kExpectedHashPending{ 255, 208, 0 };
+constexpr BarColour kExpectedFlatHashPending{ 255, 255, 100 };
+
+//! The green the shared-files hashing bar used to draw (src/SharedFilesCtrl.cpp:646). The bar
+//! adopts the palette's kBoth instead, so this value must no longer appear anywhere in the legend.
+constexpr BarColour kRetiredHashingGreen{ 0, 224, 0 };
+
+//! Every column id, so the legend mapping can be checked exhaustively rather
+//! than on the two interesting cases alone.
+constexpr GenericColumnEnum kAllColumns = { ColumnUserName,
+	ColumnUserDownloaded,
+	ColumnUserUploaded,
+	ColumnUserSpeedDown,
+	ColumnUserSpeedUp,
+	ColumnUserProgress,
+	ColumnUserAvailable,
+	ColumnUserVersion,
+	ColumnUserQueueRankLocal,
+	ColumnUserQueueRankRemote,
+	ColumnUserOrigin,
+	ColumnUserFileNameDownload,
+	ColumnUserFileNameUpload,
+	ColumnUserFileNameDownloadRemote,
+	ColumnUserSharedFiles,
+	ColumnInvalid };
+
+constexpr std::size_t kAllColumnsSize = sizeof(kAllColumns) / sizeof(kAllColumns0);
+
+//! The shared-files list's own column ids, as literals. They are plain #defines
+//! (src/SharedFilesCtrl.h:31-46) in a header that needs wx, and they deliberately never enter
+//! PartBarLegend.h -- putting them there would undo the separation the typed key exists for. Stated
+//! here so the two id spaces can be exercised against each other.
+constexpr int kAllSharedFilesColumns = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 };
+
+constexpr std::size_t kAllSharedFilesColumnsSize =
+	sizeof(kAllSharedFilesColumns) / sizeof(kAllSharedFilesColumns0);
+
+//! COLUMN_SHARED_PART, the shared-files bar column. Named because the point of
+//! the exhaustive test below is what happens to this particular number.
+constexpr int kSharedFilesBarColumnId = 8;
+
+// SRCDIR arrives as an unquoted path; stringize it without wx, since nothing
+// else in this suite needs a wxString for a filename.
+#define PARTBAR_STRINGIZE_(x) #x
+#define PARTBAR_STRINGIZE(x) PARTBAR_STRINGIZE_(x)
+
+//! The Web UI's sources, relative to this directory. Two different files, so
+//! the comparison below is not a restatement of either side's assumption.
+const std::string kWebUiJs =
+	std::string(PARTBAR_STRINGIZE(SRCDIR)) + "/../../src/webapi/static/js/components.js";
+const std::string kWebUiCss = std::string(PARTBAR_STRINGIZE(SRCDIR)) + "/../../src/webapi/static/css/app.css";
+
+//! The two GUI bars that draw source availability. Neither translation unit links here -- both pull
+//! in wx, the app and a display -- so they are read as text, the same way the Web UI's two files
+//! above are.
+const std::string kSharedFilesCtrlSource =
+	std::string(PARTBAR_STRINGIZE(SRCDIR)) + "/../../src/SharedFilesCtrl.cpp";
+const std::string kDownloadListCtrlSource =
+	std::string(PARTBAR_STRINGIZE(SRCDIR)) + "/../../src/DownloadListCtrl.cpp";
+
+//! Whole file as text, or empty if it could not be opened -- which the caller reports as a failure
+//! naming the path, because a pin that silently passes when it cannot find the other surface is
+//! worse than no pin.
+std::string ReadWholeFile(const std::string &path)
+{
+	std::ifstream in(path.c_str());
+	if (!in) {
+		return std::string();
+	}
+	std::ostringstream all;
+	all << in.rdbuf();
+	return all.str();
+}
+
+//! First capture of @p pattern in @p text, or empty if it does not match.
+std::string FirstCapture(const std::string &text, const std::string &pattern)
+{
+	std::smatch found;
+	const std::regex expression(pattern);
+	if (!std::regex_search(text, found, expression) || found.size() < 2) {
+		return std::string();
+	}
+	return found1.str();
+}
+
+//! "a6d4ee" -> (166,212,238). Six digits only; the Web UI writes them long.
+BarColour ColourFromHex(const std::string &hex)
+{
+	const unsigned long packed = std::stoul(hex, nullptr, 16);
+	return BarColour{ static_cast<std::uint8_t>((packed >> 16) & 0xFF),
+		static_cast<std::uint8_t>((packed >> 8) & 0xFF),
+		static_cast<std::uint8_t>(packed & 0xFF) };
+}
+
+//! Does @p text still compute a fade of its own? The downloads list's retired
+//! ramp, matched loosely enough that reformatting it does not hide it.
+bool HasItsOwnFadeArithmetic(const std::string &text)
+{
+	return std::regex_search(text, std::regex("210\\s*-\\s*\\(?\\s*22\\s*\\*"));
+}
+
+//! Compare channel by channel, so a failure names the channel and the two
+//! numbers instead of only saying the colours differ.
+void AssertColourEquals(const BarColour &expected, const BarColour &actual)
+{
+	ASSERT_EQUALS((int)expected.red, (int)actual.red);
+	ASSERT_EQUALS((int)expected.green, (int)actual.green);
+	ASSERT_EQUALS((int)expected.blue, (int)actual.blue);
+}
+
+} // namespace
+
+DECLARE_SIMPLE(PartBarLegend)
+
+// --- the palette itself -------------------------------------------------
+
+TEST(PartBarLegend, SourceColoursAreTheOnesTheBarDrew)
+{
+	// The five shaded-bar fills, in the order GetItemBarFill() tests them.
+	ASSERT_TRUE(kExpectedNeither == SourcePartColour(SourcePartState::Missing, false));
+	ASSERT_TRUE(kExpectedBoth == SourcePartColour(SourcePartState::Complete, false));
+	ASSERT_TRUE(kExpectedPending == SourcePartColour(SourcePartState::Downloading, false));
+	ASSERT_TRUE(kExpectedNextPending == SourcePartColour(SourcePartState::NextRequested, false));
+	ASSERT_TRUE(kExpectedClientOnly == SourcePartColour(SourcePartState::Needed, false));
+}
+
+TEST(PartBarLegend, SourceColoursHaveTheirOwnFlatBarValues)
+{
+	ASSERT_TRUE(kExpectedFlatNeither == SourcePartColour(SourcePartState::Missing, true));
+	ASSERT_TRUE(kExpectedFlatBoth == SourcePartColour(SourcePartState::Complete, true));
+	ASSERT_TRUE(kExpectedFlatClientOnly == SourcePartColour(SourcePartState::Needed, true));
+
+	// The two request cues are the exception: flat and shaded draw them the
+	// same, which is why neither has a crFlat* counterpart to drift from.
+	ASSERT_TRUE(kExpectedPending == SourcePartColour(SourcePartState::Downloading, true));
+	ASSERT_TRUE(kExpectedNextPending == SourcePartColour(SourcePartState::NextRequested, true));
+}
+
+TEST(PartBarLegend, PeerColoursAreTheOnesTheBarDrew)
+{
+	// The peers bar reuses the greys of the sources bar, but for its own two
+	// states -- has / has not -- with no request cues in between.
+	ASSERT_TRUE(kExpectedClientOnly == PeerPartColour(PeerPartState::Present, false));
+	ASSERT_TRUE(kExpectedNeither == PeerPartColour(PeerPartState::Missing, false));
+	ASSERT_TRUE(kExpectedFlatClientOnly == PeerPartColour(PeerPartState::Present, true));
+	ASSERT_TRUE(kExpectedFlatNeither == PeerPartColour(PeerPartState::Missing, true));
+}
+
+// --- the shared-files availability fade ---------------------------------
+
+TEST(PartBarLegend, TheFadeRunsBetweenTheWebUiEndpoints)
+{
+	// One definition serves the shared-files list, the downloads list and the Web UI, so the
+	// endpoints have to be one set of numbers. Decision 3 picks the Web UI's: the GUI's old
+	// (0,210,255) -> (0,0,255) does not survive.
+	CONTEXT("one source");
+	AssertColourEquals(kExpectedOneSource, SourceAvailabilityColour(1));
+}
+
+TEST(PartBarLegend, TheFadeRoundsItsInteriorStepsToTheseValues)
+{
+	// Halfway and one step short of saturation. Both are exact: the blend has a denominator of
+	// nine, so no channel can land on .5 and every rounding mode -- Math.round in components.js
+	// included -- gives these numbers.
+	{
+		CONTEXT("five sources");
+		AssertColourEquals(kExpectedFiveSources, SourceAvailabilityColour(5));
+	}
+	{
+		CONTEXT("nine sources");
+		AssertColourEquals(kExpectedNineSources, SourceAvailabilityColour(9));
+	}
+}
+
+TEST(PartBarLegend, TheFadeSaturatesAtTenSources)
+{
+	// Ten, not the GUI's former eleven: AVAIL_FULL in src/webapi/static/js/components.js:389 is
+	// what a user comparing the two surfaces sees, and one more source past saturation must not
+	// darken the part further.
+	{
+		CONTEXT("ten sources");
+		AssertColourEquals(kExpectedManySources, SourceAvailabilityColour(10));
+	}
+	{
+		CONTEXT("eleven sources");
+		AssertColourEquals(kExpectedManySources, SourceAvailabilityColour(11));
+	}
+	{
+		CONTEXT("a thousand sources");
+		AssertColourEquals(kExpectedManySources, SourceAvailabilityColour(1000));
+	}
+}
+
+TEST(PartBarLegend, TheFadeNeverBrightensAsSourcesAreAdded)
+{
+	// More sources must never read as less availability. Checked as a property across the whole
+	// range rather than at the sampled points, because a sign slip in one channel is invisible
+	// at the endpoints.
+	for (unsigned n = 1; n < 40; ++n) {
+		CONTEXT(wxString::Format("from %u to %u sources", n, n + 1));
+		const BarColour here = SourceAvailabilityColour(n);
+		const BarColour next = SourceAvailabilityColour(n + 1);
+		ASSERT_TRUE(next.red <= here.red);
+		ASSERT_TRUE(next.green <= here.green);
+		ASSERT_TRUE(next.blue <= here.blue);
+	}
+}
+
+TEST(PartBarLegend, ZeroSourcesIsItsOwnStateAndNotTheFadesDarkEnd)
+{
+	// A part nobody holds is a different fact from a part one peer holds, and the bar says so
+	// in red. Putting it on the fade would make "unavailable" the darkest shade of "available".
+	AssertColourEquals(kExpectedZeroSources, kZeroSources);
+	ASSERT_TRUE(kZeroSources != SourceAvailabilityColour(1));
+}
+
+// --- the legends --------------------------------------------------------
+
+TEST(PartBarLegend, TheSourceLegendListsEveryStateOnceInRendererOrder)
+{
+	// One row per fill the sources bar can draw: a state the renderer knows and the legend does
+	// not is a colour with no explanation, which is the bug the legend exists to fix.
+	ASSERT_EQUALS((std::size_t)5, kSourceLegendSize);
+	ASSERT_TRUE(SourcePartState::Missing == kSourceLegendOrder0);
+	ASSERT_TRUE(SourcePartState::Complete == kSourceLegendOrder1);
+	ASSERT_TRUE(SourcePartState::Downloading == kSourceLegendOrder2);
+	ASSERT_TRUE(SourcePartState::NextRequested == kSourceLegendOrder3);
+	ASSERT_TRUE(SourcePartState::Needed == kSourceLegendOrder4);
+}
+
+TEST(PartBarLegend, ThePeerLegendListsItsTwoStates)
+{
+	// Two, not five: the asymmetry between the two bar columns is the reason they were named
+	// apart, so collapsing them into one legend would undo the change it belongs to.
+	ASSERT_EQUALS((std::size_t)2, kPeerLegendSize);
+	ASSERT_TRUE(PeerPartState::Present == kPeerLegendOrder0);
+	ASSERT_TRUE(PeerPartState::Missing == kPeerLegendOrder1);
+}
+
+TEST(PartBarLegend, TheAvailabilityLegendListsItsThreeStatesInOrder)
+{
+	// Nobody has it, a few have it, many have it. Three rows, because the red
+	// is a different fact rather than the dark end of the blue.
+	ASSERT_EQUALS((std::size_t)3, kAvailabilityLegendSize);
+	ASSERT_TRUE(AvailabilityPartState::ZeroSources == kAvailabilityLegendOrder0);
+	ASSERT_TRUE(AvailabilityPartState::FewSources == kAvailabilityLegendOrder1);
+	ASSERT_TRUE(AvailabilityPartState::ManySources == kAvailabilityLegendOrder2);
+}
+
+TEST(PartBarLegend, TheHashingLegendListsItsTwoStatesInOrder)
+{
+	ASSERT_EQUALS((std::size_t)2, kHashingLegendSize);
+	ASSERT_TRUE(HashingPartState::Hashed == kHashingLegendOrder0);
+	ASSERT_TRUE(HashingPartState::NotYetHashed == kHashingLegendOrder1);
+}
+
+TEST(PartBarLegend, TheAvailabilityLegendRowsAreTheFadesOwnColours)
+{
+	// The legend's two blue rows are the fade's endpoints, read from the same function the
+	// renderer calls, so a changed endpoint moves both or neither. The literals are asserted
+	// separately, above and below.
+	{
+		CONTEXT("few sources row");
+		AssertColourEquals(SourceAvailabilityColour(1),
+			AvailabilityPartColour(AvailabilityPartState::FewSources, false));
+	}
+	{
+		CONTEXT("many sources row");
+		AssertColourEquals(SourceAvailabilityColour(kAvailFull),
+			AvailabilityPartColour(AvailabilityPartState::ManySources, false));
+	}
+}
+
+TEST(PartBarLegend, TheAvailabilityLegendRowsAreTheseValues)
+{
+	{
+		CONTEXT("zero sources row");
+		AssertColourEquals(kExpectedZeroSources,
+			AvailabilityPartColour(AvailabilityPartState::ZeroSources, false));
+	}
+	{
+		CONTEXT("few sources row");
+		AssertColourEquals(
+			kExpectedOneSource, AvailabilityPartColour(AvailabilityPartState::FewSources, false));
+	}
+	{
+		CONTEXT("many sources row");
+		AssertColourEquals(kExpectedManySources,
+			AvailabilityPartColour(AvailabilityPartState::ManySources, false));
+	}
+}
+
+TEST(PartBarLegend, TheAvailabilityLegendIgnoresTheFlatBarPreference)
+{
+	// The renderer never consulted UseFlatBar() for this bar (src/SharedFilesCtrl.cpp:658-678
+	// takes bFlat and does not use it), so the legend must not invent a second set of values
+	// for a distinction the bar does not draw.
+	for (std::size_t i = 0; i < kAvailabilityLegendSize; ++i) {
+		CONTEXT(wxString::Format("availability row %zu", i));
+		AssertColourEquals(AvailabilityPartColour(kAvailabilityLegendOrderi, false),
+			AvailabilityPartColour(kAvailabilityLegendOrderi, true));
+	}
+}
+
+TEST(PartBarLegend, TheHashingLegendColoursAreTheOnesTheBarDraws)
+{
+	AssertColourEquals(kExpectedHashed, HashingPartColour(HashingPartState::Hashed, false));
+	AssertColourEquals(kExpectedFlatHashed, HashingPartColour(HashingPartState::Hashed, true));
+	AssertColourEquals(kExpectedHashPending, HashingPartColour(HashingPartState::NotYetHashed, false));
+	AssertColourEquals(kExpectedFlatHashPending, HashingPartColour(HashingPartState::NotYetHashed, true));
+}
+
+TEST(PartBarLegend, TheHashingBarGaveUpItsPrivateGreen)
+{
+	// It carried its own (0,224,0) next to the palette's (0,192,0) for no stated reason.
+	// Adopting the palette's darkens the hashing bar slightly, which is deliberate: two greens
+	// meaning "have it" is the drift this header exists to remove.
+	ASSERT_TRUE(kRetiredHashingGreen != HashingPartColour(HashingPartState::Hashed, false));
+	ASSERT_TRUE(kRetiredHashingGreen != HashingPartColour(HashingPartState::Hashed, true));
+}
+
+TEST(PartBarLegend, NoTwoRowsOfALegendShareAColour)
+{
+	// Two rows of one swatch cannot be told apart on screen, so the legend would be explaining
+	// a distinction the bar does not draw. Checked under both bar styles, since each has its
+	// own values.
+	//
+	// Scoped to one legend at a time, and that is not laziness: the hashing legend's flat not-
+	// yet-hashed fill and the sources legend's next-requested cue are both (255,255,100) and
+	// mean different things. A global uniqueness check would fail on two colours that never
+	// appear side by side, and the only way to satisfy it would be to repaint a bar for the
+	// sake of a legend it is not in.
+	for (int flat = 0; flat <= 1; ++flat) {
+		for (std::size_t i = 0; i < kSourceLegendSize; ++i) {
+			for (std::size_t j = i + 1; j < kSourceLegendSize; ++j) {
+				ASSERT_TRUE(SourcePartColour(kSourceLegendOrderi, flat != 0) !=
+					    SourcePartColour(kSourceLegendOrderj, flat != 0));
+			}
+		}
+		ASSERT_TRUE(PeerPartColour(kPeerLegendOrder0, flat != 0) !=
+			    PeerPartColour(kPeerLegendOrder1, flat != 0));
+
+		for (std::size_t i = 0; i < kAvailabilityLegendSize; ++i) {
+			for (std::size_t j = i + 1; j < kAvailabilityLegendSize; ++j) {
+				ASSERT_TRUE(AvailabilityPartColour(kAvailabilityLegendOrderi, flat != 0) !=
+					    AvailabilityPartColour(kAvailabilityLegendOrderj, flat != 0));
+			}
+		}
+		ASSERT_TRUE(HashingPartColour(kHashingLegendOrder0, flat != 0) !=
+			    HashingPartColour(kHashingLegendOrder1, flat != 0));
+	}
+}
+
+// --- which legend a column gets -----------------------------------------
+
+TEST(PartBarLegend, OnlyTheTwoBarColumnsHaveALegend)
+{
+	ASSERT_TRUE(BarLegendKind::SourceParts == LegendForColumn(ColumnUserProgress));
+	ASSERT_TRUE(BarLegendKind::PeerParts == LegendForColumn(ColumnUserAvailable));
+
+	// Every other column, exhaustively: a legend offered for a text column
+	// would explain a bar that is not there.
+	for (std::size_t i = 0; i < kAllColumnsSize; ++i) {
+		if (kAllColumnsi == ColumnUserProgress || kAllColumnsi == ColumnUserAvailable) {
+			continue;
+		}
+		ASSERT_TRUE(BarLegendKind::None == LegendForColumn(kAllColumnsi));
+	}
+}
+
+TEST(PartBarLegend, TheSharedFilesBarColumnGetsALegendPerMode)
+{
+	// One column, two legends: the cell draws availability most of the time and re-hash
+	// progress while a hash is running, and they share nothing. Which one to show is decided by
+	// the row's mode, not by the column.
+	ASSERT_TRUE(BarLegendKind::SharedAvailability ==
+		    LegendForColumn(SharedFilesBarColumn::SourceAvailability, BarMode::Availability));
+	ASSERT_TRUE(BarLegendKind::SharedHashing ==
+		    LegendForColumn(SharedFilesBarColumn::SourceAvailability, BarMode::Hashing));
+
+	// A row with no parts draws no bar, so there is nothing to explain.
+	ASSERT_TRUE(BarLegendKind::None ==
+		    LegendForColumn(SharedFilesBarColumn::SourceAvailability, BarMode::None));
+}
+
+TEST(PartBarLegend, ASharedFilesRowResolvesItsLegendFromTwoIntegers)
+{
+	// What the row context menu has to decide when it is clicked: the file gives a hashed-part
+	// count and a part count, and the legend follows from those two numbers alone. Composed
+	// once here rather than at the call site so the composition is checkable without a display
+	// -- opening the dialog is not, but choosing which one to open is.
+	//
+	// Expected values are the mode table of the spec, not a second call to ModeFor(): if the
+	// composition were wired the wrong way round, reading the answer back out of the same
+	// expression would agree with it.
+	ASSERT_TRUE(BarLegendKind::SharedAvailability == LegendForSharedFilesRow(0, 9));
+	ASSERT_TRUE(BarLegendKind::SharedHashing == LegendForSharedFilesRow(1, 9));
+	ASSERT_TRUE(BarLegendKind::SharedHashing == LegendForSharedFilesRow(9, 9));
+
+	// A count past the end of the file still means a hash is running:
+	// CHashingTask reports part + 1, so a finished pass reports one too many.
+	ASSERT_TRUE(BarLegendKind::SharedHashing == LegendForSharedFilesRow(9, 4));
+
+	// No parts, no bar, no legend -- for every hashed count, including one
+	// that claims progress through a file with nothing in it.
+	ASSERT_TRUE(BarLegendKind::None == LegendForSharedFilesRow(0, 0));
+	ASSERT_TRUE(BarLegendKind::None == LegendForSharedFilesRow(1, 0));
+	ASSERT_TRUE(BarLegendKind::None == LegendForSharedFilesRow(9, 0));
+}
+
+TEST(PartBarLegend, TheClientListLegendsAreUnaffectedByTheSharedFilesModes)
+{
+	// The mode argument belongs to the shared-files overload alone. The two client-list bar
+	// columns have one legend each and keep answering the single-argument call, so nothing
+	// already in the tree had to change.
+	ASSERT_TRUE(BarLegendKind::SourceParts == LegendForColumn(ColumnUserProgress));
+	ASSERT_TRUE(BarLegendKind::PeerParts == LegendForColumn(ColumnUserAvailable));
+	ASSERT_TRUE(BarLegendKind::SharedAvailability != BarLegendKind::SourceParts);
+	ASSERT_TRUE(BarLegendKind::SharedHashing != BarLegendKind::PeerParts);
+}
+
+TEST(PartBarLegend, ACastFromTheSharedFilesIdSpaceReachesTheWrongLegend)
+{
+	// The two id spaces overlap. COLUMN_SHARED_AREQ is 5 and so is ColumnUserProgress;
+	// COLUMN_SHARED_TRA is 6 and so is ColumnUserAvailable; COLUMN_SHARED_PART -- the bar
+	// column, the one that actually has a legend -- is 8, which is ColumnUserQueueRankLocal and
+	// has none.
+	//
+	// The distinct enum types stop this by accident, but a deliberate static_cast still
+	// compiles, and this is what it gets: a legend for two text columns and no legend for the
+	// bar. Pinned rather than argued about, so that if the id spaces are ever merged the
+	// numbers here fail loudly.
+	for (std::size_t i = 0; i < kAllSharedFilesColumnsSize; ++i) {
+		const int id = kAllSharedFilesColumnsi;
+		CONTEXT(wxString::Format("shared-files column id %d cast across", id));
+
+		const BarLegendKind wrong = LegendForColumn(static_cast<GenericColumnEnum>(id));
+		if (id == 5) {
+			ASSERT_TRUE(BarLegendKind::SourceParts == wrong);
+		} else if (id == 6) {
+			ASSERT_TRUE(BarLegendKind::PeerParts == wrong);
+		} else {
+			ASSERT_TRUE(BarLegendKind::None == wrong);
+		}
+	}
+
+	// Including the bar column itself, which is the whole problem.
+	ASSERT_TRUE(BarLegendKind::None ==
+		    LegendForColumn(static_cast<GenericColumnEnum>(kSharedFilesBarColumnId)));
+
+	// The typed call is the one that works.
+	ASSERT_TRUE(BarLegendKind::SharedAvailability ==
+		    LegendForColumn(SharedFilesBarColumn::SourceAvailability, BarMode::Availability));
+}
+
+// --- the two GUI call sites ---------------------------------------------
+
+TEST(PartBarLegend, OneTableAnswersForEitherBar)
+{
+	// The expression both GetItemBarFill() implementations contain, run over the counts the
+	// table names. The literals were worked out by hand and are not recomputed from the
+	// header's arithmetic, so this fails if the fade moves rather than agreeing with it
+	// wherever it went.
+	for (std::size_t i = 0; i < kAvailabilityTableSize; ++i) {
+		const AvailabilityTableRow &row = kAvailabilityTablei;
+		CONTEXT(wxString::Format("%u sources", row.sources));
+		const BarColour drawn =
+			row.sources == 0 ? AvailabilityPartColour(AvailabilityPartState::ZeroSources, false)
+					 : SourceAvailabilityColour(row.sources);
+		AssertColourEquals(row.colour, drawn);
+	}
+}
+
+TEST(PartBarLegend, NeitherBarKeepsItsOwnFadeArithmetic)
+{
+	// The convergence this change is for, checked where it can actually be observed: in the
+	// text of the two files. Until #1220 the downloads list computed its own shade -- 210 -
+	// 22*(sources-1), assigned to the green channel through a local misnamed "blue", with the
+	// blue channel pinned at 255 -- and the shared-files list computed a third one. Two
+	// constants in a header do not stop that coming back; a call to the one function is what
+	// does, and this is what notices if either file grows a replacement.
+	//
+	// A grep over a foreign source file is a blunt instrument and worth the bluntness here: the
+	// alternative is nothing at all, because neither translation unit can be linked into a
+	// headless suite. It is blunt in one direction worth knowing about -- it cannot tell code
+	// from prose, so neither file may write the retired expression out even in a comment. Both
+	// describe it in words instead.
+	const std::string sharedFiles = ReadWholeFile(kSharedFilesCtrlSource);
+	const std::string downloads = ReadWholeFile(kDownloadListCtrlSource);
+	ASSERT_TRUE_M(!sharedFiles.empty() && !downloads.empty(),
+		wxString("Could not read ") + kSharedFilesCtrlSource + " and " + kDownloadListCtrlSource +
+			" -- whether the two bars still share one fade cannot be checked, so it is "
+			"failing rather than passing silently");
+
+	{
+		CONTEXT("the shared-files bar calls the shared fade");
+		ASSERT_TRUE(sharedFiles.find("SourceAvailabilityColour") != std::string::npos);
+	}
+	{
+		CONTEXT("the downloads bar calls the shared fade");
+		ASSERT_TRUE(downloads.find("SourceAvailabilityColour") != std::string::npos);
+	}
+	{
+		CONTEXT("no second fade in the shared-files bar");
+		ASSERT_FALSE(HasItsOwnFadeArithmetic(sharedFiles));
+	}
+	{
+		CONTEXT("no second fade in the downloads bar");
+		ASSERT_FALSE(HasItsOwnFadeArithmetic(downloads));
+	}
+}
+
+// --- the other surface --------------------------------------------------
+
+TEST(PartBarLegend, TheWebUiSaturatesAtTheSameSourceCount)
+{
+	// Nothing generates one side from the other: there is no JS build step under
+	// src/webapi/static/, so AVAIL_FULL and kAvailFull are two numbers maintained by hand. That
+	// is the honest description of the arrangement, and this is what stops it rotting quietly
+	// -- the test reads the browser's own source and fails naming both files.
+	const std::string js = ReadWholeFile(kWebUiJs);
+	ASSERT_TRUE_M(!js.empty(),
+		wxString("Could not read ") + kWebUiJs +
+			" -- the pin between partbar::kAvailFull and the Web UI's AVAIL_FULL "
+			"cannot be checked, so it is failing rather than passing silently");
+
+	const std::string found = FirstCapture(js, "AVAIL_FULL\\s*=\\s*(0-9+)");
+	ASSERT_TRUE_M(!found.empty(),
+		wxString("No AVAIL_FULL assignment in ") + kWebUiJs +
+			" -- it was renamed or reformatted; src/PartBarLegend.h and this test "
+			"both need updating with it");
+
+	ASSERT_EQUALS((int)kAvailFull, std::stoi(found));
+}
+
+TEST(PartBarLegend, TheWebUiFadesBetweenTheSameTwoColours)
+{
+	// The endpoints live in CSS custom properties, so a theme edit is the realistic way they
+	// drift. Read them from app.css and compare to the two constants the GUI fade is built
+	// from.
+	const std::string css = ReadWholeFile(kWebUiCss);
+	ASSERT_TRUE_M(!css.empty(),
+		wxString("Could not read ") + kWebUiCss +
+			" -- the pin between the GUI fade endpoints and --piece-avail-lo / "
+			"--piece-avail cannot be checked");
+
+	const std::string lo = FirstCapture(css, "--piece-avail-lo\\s*:\\s*#(0-9a-fA-F{6})");
+	const std::string hi = FirstCapture(css, "--piece-avail\\s*:\\s*#(0-9a-fA-F{6})");
+	ASSERT_TRUE_M(!lo.empty() && !hi.empty(),
+		wxString("--piece-avail-lo and --piece-avail are not both six-digit hex in ") + kWebUiCss +
+			" -- src/PartBarLegend.h's kAvailFew/kAvailMany are pinned to them");
+
+	{
+		CONTEXT("--piece-avail-lo against kAvailFew");
+		AssertColourEquals(ColourFromHex(lo), SourceAvailabilityColour(1));
+	}
+	{
+		CONTEXT("--piece-avail against kAvailMany");
+		AssertColourEquals(ColourFromHex(hi), SourceAvailabilityColour(kAvailFull));
+	}
+}

amule-3.1.0.tar.gz/unittests/tests/PartBarSpansTest.cpp Added

@@ -0,0 +1,116 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// Where each part of a file sits in a chunk bar, and which of the two things the shared-files bar
+// is drawing.
+//
+// Wx-free and header-only, like PartBarLegendTest: the expected values are spelled out rather than
+// recomputed from the header's own formula, because a test deriving them the way production does
+// would pass whatever either said. The drawing itself is not reachable from here and is not
+// attempted.
+
+#include <muleunit/test.h>
+
+#include "PartBarSpans.h"
+
+#include <cstddef>
+#include <cstdint>
+
+using namespace muleunit;
+using namespace partbar;
+
+namespace
+{
+
+//! PARTSIZE as the callers use it: 9500 KiB.
+constexpr std::uint64_t kPartSize = 9728000ULL;
+
+} // namespace
+
+DECLARE_SIMPLE(PartBarSpans)
+
+TEST(PartBarSpans, AdjacentSpansDoNotOverlap)
+{
+	// CBarShader::FillRange takes end as inclusive and increments it itself
+	// (src/BarShader.cpp:113-124), so part i must end exactly one byte before part i+1 begins.
+	// Overlapping spans paint one byte twice, and the shared-files bar has been doing that
+	// where the other two bars do not.
+	const std::uint64_t fileSize = kPartSize * 4 + 12345;
+	for (std::size_t i = 0; i + 1 < 5; ++i) {
+		const Span here = SpanFor(i, kPartSize, fileSize);
+		const Span next = SpanFor(i + 1, kPartSize, fileSize);
+		ASSERT_EQUALS(next.start - 1, here.end);
+	}
+}
+
+TEST(PartBarSpans, TheLastSpanEndsAtTheLastByte)
+{
+	// A file that does not divide evenly has a short last part. Its end is the file's last
+	// byte, not one past it: FillRange clamps a span running past m_FileSize, so an over-long
+	// end is silently truncated rather than reported, which is why this was never noticed.
+	const std::uint64_t fileSize = kPartSize * 3 + 1;
+	const Span last = SpanFor(3, kPartSize, fileSize);
+	ASSERT_EQUALS(fileSize - 1, last.end);
+}
+
+TEST(PartBarSpans, AFileOfExactlyOnePartCoversItWhole)
+{
+	const Span only = SpanFor(0, kPartSize, kPartSize);
+	ASSERT_EQUALS((std::uint64_t)0, only.start);
+	ASSERT_EQUALS(kPartSize - 1, only.end);
+}
+
+TEST(PartBarSpans, SpansStartWherePartSizeSaysAndNowhereElse)
+{
+	const std::uint64_t fileSize = kPartSize * 3;
+	ASSERT_EQUALS((std::uint64_t)0, SpanFor(0, kPartSize, fileSize).start);
+	ASSERT_EQUALS(kPartSize, SpanFor(1, kPartSize, fileSize).start);
+	ASSERT_EQUALS(kPartSize * 2, SpanFor(2, kPartSize, fileSize).start);
+}
+
+TEST(PartBarSpans, NoPartsMeansNothingToDrawWhateverProgressSays)
+{
+	// The caller has no span to fill, so a hashing bar over zero parts would be
+	// a bar over nothing. Progress must not override that.
+	ASSERT_TRUE(BarMode::None == ModeFor(0, 0));
+	ASSERT_TRUE(BarMode::None == ModeFor(7, 0));
+}
+
+TEST(PartBarSpans, ProgressAboveZeroSelectsHashingAndZeroSelectsAvailability)
+{
+	ASSERT_TRUE(BarMode::Availability == ModeFor(0, 9));
+	ASSERT_TRUE(BarMode::Hashing == ModeFor(1, 9));
+	ASSERT_TRUE(BarMode::Hashing == ModeFor(4, 9));
+}
+
+TEST(PartBarSpans, TheHashedCountIsClampedToTheParts)
+{
+	// CHashingTask reports part + 1 (src/ThreadTasks.cpp:179, :693), so a finished pass reports
+	// one past the last part. Used unclamped as an index or a count, that reads or fills one
+	// span too many.
+	ASSERT_EQUALS((std::size_t)4, HashedPartsClamped(4, 9));
+	ASSERT_EQUALS((std::size_t)9, HashedPartsClamped(9, 9));
+	ASSERT_EQUALS((std::size_t)9, HashedPartsClamped(10, 9));
+	ASSERT_EQUALS((std::size_t)0, HashedPartsClamped(0, 9));
+}

amule-3.1.0.tar.gz/unittests/tests/PartIndexTest.cpp Added

@@ -0,0 +1,181 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// The two predicates behind `next_requested_part_index` and `downloading_part_index` on GET
+// /{downloads,shared}/{hash}/clients.
+//
+// Every branch here is decided by a value amuled reports about a peer, and the ones that matter are
+// the ones no live peer will hand over on request: the 0xffff "no block pending" sentinel, the
+// boundary at part_count, a file with more than 65535 parts (~637 GB, where 0xffff is a legitimate
+// chunk and the sentinel is indistinguishable from real data by range alone), and a source whose
+// download_state flips to "downloading". Waiting for a daemon to produce those is waiting forever,
+// which is why the predicates live in a header of their own -- no wx, no Boost.Beast, no EC -- and
+// are driven here.
+
+#include <muleunit/test.h>
+
+#include "PartIndex.h"
+
+#include <cstdint>
+#include <string>
+
+using namespace muleunit;
+using namespace webapi;
+
+namespace
+{
+
+// A file with more than 65535 parts: 65536 * 9.28 MB is about 608 GiB, so this is a real size a
+// real user reaches rather than a synthetic extreme. Named because every "large file" case below
+// turns on it being > kNoPartPendingSentinel.
+constexpr std::uint64_t kPartCountAbove16Bit = 200000u;
+
+} // namespace
+
+DECLARE_SIMPLE(PartIndex)
+
+TEST(PartIndex, SentinelIsTheValueTheCoreActuallySends)
+{
+	// Pinned rather than assumed: the whole point of testing the sentinel by
+	// name is that the name and the wire value agree.
+	ASSERT_EQUALS(0xffffu, (unsigned)kNoPartPendingSentinel);
+	ASSERT_TRUE(std::string("downloading") == kDownloadStateDownloading);
+}
+
+// --- UsablePartIndex ----------------------------------------------------
+
+TEST(PartIndex, AnUnreportedIndexIsUnusable)
+{
+	// The has_* flag false: the peer never sent the tag at all. Nothing else
+	// in the call can rescue it -- not an in-range value, not part 0.
+	ASSERT_FALSE(UsablePartIndex(false, 0, 100));
+	ASSERT_FALSE(UsablePartIndex(false, 7, 100));
+	ASSERT_FALSE(UsablePartIndex(false, kNoPartPendingSentinel, 100));
+}
+
+TEST(PartIndex, AnInRangeIndexIsUsable)
+{
+	// The positive path, including part 0 -- a real and common chunk index,
+	// never a stand-in for "unknown".
+	ASSERT_TRUE(UsablePartIndex(true, 0, 1));
+	ASSERT_TRUE(UsablePartIndex(true, 0, 100));
+	ASSERT_TRUE(UsablePartIndex(true, 42, 100));
+}
+
+TEST(PartIndex, PartCountMinusOneIsInsideAndPartCountIsNot)
+{
+	// The boundary. part_count is a count, the index is 0-based, so the last addressable chunk
+	// is part_count - 1 and part_count itself is the first value that must be refused.
+	ASSERT_TRUE(UsablePartIndex(true, 9, 10));
+	ASSERT_FALSE(UsablePartIndex(true, 10, 10));
+	ASSERT_FALSE(UsablePartIndex(true, 11, 10));
+}
+
+TEST(PartIndex, AFileWithNoPartsAddressesNothing)
+{
+	// part_count 0: `0 < 0` is false, so even index 0 is refused. This is the
+	// shape a row whose bitmap could not be resolved arrives in.
+	ASSERT_FALSE(UsablePartIndex(true, 0, 0));
+	ASSERT_FALSE(UsablePartIndex(true, 1, 0));
+	ASSERT_FALSE(UsablePartIndex(true, kNoPartPendingSentinel, 0));
+}
+
+TEST(PartIndex, TheSentinelIsRefusedOnAnOrdinaryFile)
+{
+	// Here the bounds check would have caught it anyway (65535 >= 100). The
+	// next test is the one that proves the by-name test is load-bearing.
+	ASSERT_FALSE(UsablePartIndex(true, kNoPartPendingSentinel, 100));
+	ASSERT_FALSE(UsablePartIndex(true, kNoPartPendingSentinel, 65535));
+}
+
+TEST(PartIndex, TheSentinelIsRefusedEvenWhere65535IsARealChunk)
+{
+	// The 637 GB case, and the entire reason UsablePartIndex names the sentinel instead of
+	// leaving it to the bound: with 200000 parts, 65535 is squarely in range, so a bounds check
+	// alone would relay "no block pending" as an index and paint a stripe on chunk 65535 of
+	// exactly the files a per-source bar is most useful on.
+	ASSERT_TRUE(65535u < kPartCountAbove16Bit); // the bound would have passed it
+	ASSERT_FALSE(UsablePartIndex(true, kNoPartPendingSentinel, kPartCountAbove16Bit));
+
+	// Only the sentinel value is special, not its neighbourhood: 65534 on the
+	// same file is an ordinary chunk and must still come through.
+	ASSERT_TRUE(UsablePartIndex(true, 65534, kPartCountAbove16Bit));
+
+	// And part_count exactly 65536, the smallest file on which the sentinel is
+	// in range at all -- the first size where the by-name test starts mattering.
+	ASSERT_FALSE(UsablePartIndex(true, kNoPartPendingSentinel, 65536));
+	ASSERT_TRUE(UsablePartIndex(true, 65534, 65536));
+}
+
+// --- UsableLastDownloadingPart ------------------------------------------
+
+TEST(PartIndex, LastDownloadingPartNeedsTheDownloadingState)
+{
+	// The defect the guard exists for. The core initialises the field to 0 and ships it
+	// unconditionally, so a source that is merely connected or queued reports a perfectly in-
+	// range 0 -- and since most sources in a list are queued, relaying it would mark chunk 0 as
+	// "downloading now" on nearly every row. Only the exact state string opens the gate.
+	ASSERT_TRUE(UsableLastDownloadingPart("downloading", true, 0, 100));
+
+	ASSERT_FALSE(UsableLastDownloadingPart("queued", true, 0, 100));
+	ASSERT_FALSE(UsableLastDownloadingPart("connecting", true, 0, 100));
+	ASSERT_FALSE(UsableLastDownloadingPart("connected", true, 0, 100));
+	ASSERT_FALSE(UsableLastDownloadingPart("", true, 0, 100));
+
+	// Not just the stale 0: a genuinely in-range value is still refused while the peer is not
+	// transferring, because it describes a chunk that finished arriving at some point in the
+	// past.
+	ASSERT_FALSE(UsableLastDownloadingPart("queued", true, 42, 100));
+	ASSERT_FALSE(UsableLastDownloadingPart("too_many_connections", true, 42, 100));
+}
+
+TEST(PartIndex, TheStateComparisonIsExact)
+{
+	// The state string comes from one enum-to-token mapping (Refresher.cpp:
+	// ClientDownloadStateName) and is compared verbatim, so nothing that merely contains or
+	// resembles the token opens the gate.
+	ASSERT_FALSE(UsableLastDownloadingPart("Downloading", true, 5, 100));
+	ASSERT_FALSE(UsableLastDownloadingPart("downloading ", true, 5, 100));
+	ASSERT_FALSE(UsableLastDownloadingPart("notdownloading", true, 5, 100));
+	ASSERT_FALSE(UsableLastDownloadingPart("downloading_from", true, 5, 100));
+}
+
+TEST(PartIndex, TheStateGuardDoesNotReplaceTheRangeChecks)
+{
+	// "downloading" is necessary, never sufficient: every UsablePartIndex
+	// branch still applies underneath it.
+	ASSERT_FALSE(UsableLastDownloadingPart("downloading", false, 5, 100));
+	ASSERT_FALSE(UsableLastDownloadingPart("downloading", true, kNoPartPendingSentinel, 100));
+	ASSERT_FALSE(UsableLastDownloadingPart("downloading", true, 100, 100));
+	ASSERT_FALSE(UsableLastDownloadingPart("downloading", true, 0, 0));
+
+	// Including on the large file, where the sentinel is in range: a
+	// transferring peer does not make 0xffff mean chunk 65535.
+	ASSERT_FALSE(
+		UsableLastDownloadingPart("downloading", true, kNoPartPendingSentinel, kPartCountAbove16Bit));
+	ASSERT_TRUE(UsableLastDownloadingPart("downloading", true, 65534, kPartCountAbove16Bit));
+
+	// And the boundary once more through this entry point.
+	ASSERT_TRUE(UsableLastDownloadingPart("downloading", true, 99, 100));
+}

amule-3.1.0.tar.gz/unittests/tests/PathPatternsTest.cpp Added

@@ -0,0 +1,386 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include <muleunit/test.h>
+#include "PathPatterns.h"
+
+using namespace muleunit;
+using namespace web_api_path;
+
+DECLARE_SIMPLE(PathPatterns)
+
+// SplitPath
+
+TEST(PathPatterns, SplitPath_Empty)
+{
+	auto s = SplitPath("");
+	ASSERT_EQUALS(static_cast<size_t>(0), s.size());
+}
+
+TEST(PathPatterns, SplitPath_Root)
+{
+	// "/" parses to a single empty segment -- distinguishable from "".
+	auto s = SplitPath("/");
+	ASSERT_EQUALS(static_cast<size_t>(1), s.size());
+	ASSERT_EQUALS(std::string(""), s0);
+}
+
+TEST(PathPatterns, SplitPath_Single)
+{
+	auto s = SplitPath("/version");
+	ASSERT_EQUALS(static_cast<size_t>(1), s.size());
+	ASSERT_EQUALS(std::string("version"), s0);
+}
+
+TEST(PathPatterns, SplitPath_Multiple)
+{
+	auto s = SplitPath("/downloads/abc/pause");
+	ASSERT_EQUALS(static_cast<size_t>(3), s.size());
+	ASSERT_EQUALS(std::string("downloads"), s0);
+	ASSERT_EQUALS(std::string("abc"), s1);
+	ASSERT_EQUALS(std::string("pause"), s2);
+}
+
+TEST(PathPatterns, SplitPath_TrailingSlash)
+{
+	// A trailing slash emits an empty trailing segment so the matcher
+	// can distinguish "/a/" from "/a".
+	auto s = SplitPath("/a/");
+	ASSERT_EQUALS(static_cast<size_t>(2), s.size());
+	ASSERT_EQUALS(std::string("a"), s0);
+	ASSERT_EQUALS(std::string(""), s1);
+}
+
+TEST(PathPatterns, SplitPath_NoLeadingSlash)
+{
+	// Absolute path is conventional, but the splitter doesn't require it.
+	auto s = SplitPath("a/b");
+	ASSERT_EQUALS(static_cast<size_t>(2), s.size());
+	ASSERT_EQUALS(std::string("a"), s0);
+	ASSERT_EQUALS(std::string("b"), s1);
+}
+
+// ParseQuery
+
+TEST(PathPatterns, ParseQuery_Empty)
+{
+	auto m = ParseQuery("");
+	ASSERT_EQUALS(static_cast<size_t>(0), m.size());
+}
+
+TEST(PathPatterns, ParseQuery_Single)
+{
+	auto m = ParseQuery("k=v");
+	ASSERT_EQUALS(static_cast<size_t>(1), m.size());
+	ASSERT_EQUALS(std::string("v"), m"k");
+}
+
+TEST(PathPatterns, ParseQuery_Multiple)
+{
+	auto m = ParseQuery("a=1&b=2&c=3");
+	ASSERT_EQUALS(static_cast<size_t>(3), m.size());
+	ASSERT_EQUALS(std::string("1"), m"a");
+	ASSERT_EQUALS(std::string("2"), m"b");
+	ASSERT_EQUALS(std::string("3"), m"c");
+}
+
+TEST(PathPatterns, ParseQuery_KeyWithoutValue)
+{
+	// "k" with no "=v" is parsed as key "k" with empty value (HTTP /
+	// HTML form convention).
+	auto m = ParseQuery("a&b=2");
+	ASSERT_EQUALS(static_cast<size_t>(2), m.size());
+	ASSERT_EQUALS(std::string(""), m"a");
+	ASSERT_EQUALS(std::string("2"), m"b");
+}
+
+TEST(PathPatterns, ParseQuery_EqualsInValue)
+{
+	// A `=` after the first one is part of the value, not a new
+	// key/value separator.
+	auto m = ParseQuery("expr=a=b");
+	ASSERT_EQUALS(std::string("a=b"), m"expr");
+}
+
+TEST(PathPatterns, ParseQuery_PercentDecode)
+{
+	// %20 in both keys and values; values are application/x-www-form-
+	// urlencoded so `+` decodes to space too.
+	auto m = ParseQuery("a%20b=c%3Dd&e=f+g");
+	ASSERT_EQUALS(std::string("c=d"), m"a b");
+	ASSERT_EQUALS(std::string("f g"), m"e");
+}
+
+TEST(PathPatterns, ParseQuery_MalformedPercentPassThrough)
+{
+	// A stray `%` with no two hex digits behind it passes through verbatim -- dropping the
+	// character would silently shift downstream parsing.
+	auto m = ParseQuery("k=ab%cz");
+	ASSERT_EQUALS(std::string("ab%cz"), m"k");
+	auto m2 = ParseQuery("k=trailing%");
+	ASSERT_EQUALS(std::string("trailing%"), m2"k");
+}
+
+TEST(PathPatterns, ParseQuery_PercentCaseInsensitive)
+{
+	// Both `%2F` and `%2f` decode to `/` per RFC 3986.
+	auto m = ParseQuery("a=foo%2Fbar&b=foo%2fbar");
+	ASSERT_EQUALS(std::string("foo/bar"), m"a");
+	ASSERT_EQUALS(std::string("foo/bar"), m"b");
+}
+
+// ParsePattern
+
+TEST(PathPatterns, ParsePattern_LiteralOnly)
+{
+	RoutePattern p = ParsePattern("/version");
+	ASSERT_EQUALS(static_cast<size_t>(1), p.segments.size());
+	ASSERT_EQUALS(std::string("version"), p.segments0);
+	ASSERT_EQUALS(std::string(""), p.capture_names0);
+}
+
+TEST(PathPatterns, ParsePattern_SingleCapture)
+{
+	RoutePattern p = ParsePattern("/downloads/{hash}");
+	ASSERT_EQUALS(static_cast<size_t>(2), p.segments.size());
+	ASSERT_EQUALS(std::string("downloads"), p.segments0);
+	ASSERT_EQUALS(std::string("{hash}"), p.segments1);
+	ASSERT_EQUALS(std::string(""), p.capture_names0);
+	ASSERT_EQUALS(std::string("hash"), p.capture_names1);
+}
+
+TEST(PathPatterns, ParsePattern_CaptureMidPath)
+{
+	RoutePattern p = ParsePattern("/downloads/{hash}/pause");
+	ASSERT_EQUALS(static_cast<size_t>(3), p.segments.size());
+	ASSERT_EQUALS(std::string("hash"), p.capture_names1);
+	ASSERT_EQUALS(std::string(""), p.capture_names2);
+}
+
+// Match
+
+TEST(PathPatterns, Match_Literal_OK)
+{
+	RoutePattern p = ParsePattern("/version");
+	std::map<std::string, std::string> caps;
+	ASSERT_TRUE(Match(p, SplitPath("/version"), caps));
+	ASSERT_EQUALS(static_cast<size_t>(0), caps.size());
+}
+
+TEST(PathPatterns, Match_Literal_Mismatch)
+{
+	RoutePattern p = ParsePattern("/version");
+	std::map<std::string, std::string> caps;
+	ASSERT_FALSE(Match(p, SplitPath("/status"), caps));
+}
+
+TEST(PathPatterns, Match_Literal_DifferentLength)
+{
+	RoutePattern p = ParsePattern("/a/b");
+	std::map<std::string, std::string> caps;
+	ASSERT_FALSE(Match(p, SplitPath("/a/b/c"), caps));
+	ASSERT_FALSE(Match(p, SplitPath("/a"), caps));
+}
+
+TEST(PathPatterns, Match_Capture_Single)
+{
+	RoutePattern p = ParsePattern("/downloads/{hash}");
+	std::map<std::string, std::string> caps;
+	ASSERT_TRUE(Match(p, SplitPath("/downloads/31d6cfe0"), caps));
+	ASSERT_EQUALS(std::string("31d6cfe0"), caps"hash");
+}
+
+TEST(PathPatterns, Match_Capture_Mid)
+{
+	RoutePattern p = ParsePattern("/downloads/{hash}/pause");
+	std::map<std::string, std::string> caps;
+	ASSERT_TRUE(Match(p, SplitPath("/downloads/abc/pause"), caps));
+	ASSERT_EQUALS(std::string("abc"), caps"hash");
+}
+
+TEST(PathPatterns, Match_Capture_LengthMismatch)
+{
+	RoutePattern p = ParsePattern("/downloads/{hash}/pause");
+	std::map<std::string, std::string> caps;
+	ASSERT_FALSE(Match(p, SplitPath("/downloads/abc"), caps));
+	ASSERT_FALSE(Match(p, SplitPath("/downloads/abc/pause/extra"), caps));
+}
+
+// ShapeEqual
+
+TEST(PathPatterns, ShapeEqual_SamePattern)
+{
+	RoutePattern a = ParsePattern("/downloads/{hash}/pause");
+	RoutePattern b = ParsePattern("/downloads/{hash}/pause");
+	ASSERT_TRUE(ShapeEqual(a, b));
+}
+
+TEST(PathPatterns, ShapeEqual_DifferentCaptureName)
+{
+	// Two patterns differing only in capture name shape-collide.
+	RoutePattern a = ParsePattern("/downloads/{hash}/pause");
+	RoutePattern b = ParsePattern("/downloads/{id}/pause");
+	ASSERT_TRUE(ShapeEqual(a, b));
+}
+
+TEST(PathPatterns, ShapeEqual_DifferentLiteral)
+{
+	RoutePattern a = ParsePattern("/downloads/{hash}/pause");
+	RoutePattern b = ParsePattern("/downloads/{hash}/resume");
+	ASSERT_FALSE(ShapeEqual(a, b));
+}
+
+TEST(PathPatterns, ShapeEqual_CaptureVsLiteral)
+{
+	RoutePattern a = ParsePattern("/downloads/{x}");
+	RoutePattern b = ParsePattern("/downloads/all");
+	ASSERT_FALSE(ShapeEqual(a, b));
+}
+
+TEST(PathPatterns, ShapeEqual_DifferentLengths)
+{
+	RoutePattern a = ParsePattern("/a/b");
+	RoutePattern b = ParsePattern("/a/b/c");
+	ASSERT_FALSE(ShapeEqual(a, b));
+}
+
+// StripTrailingSlash
+
+// `/x/` and `/x` name the same resource. Without this the two spellings disagree by route kind: a
+// literal route misses outright, a capture route matches with an empty capture.
+TEST(PathPatterns, StripTrailingSlash_RemovesOne)
+{
+	ASSERT_EQUALS(std::string("/api/v1/status"), StripTrailingSlash("/api/v1/status/"));
+	ASSERT_EQUALS(std::string("/api/v1/clients"), StripTrailingSlash("/api/v1/clients/"));
+}
+
+// Already-bare paths are returned unchanged, and the root is not a spelling
+// of the empty string.
+TEST(PathPatterns, StripTrailingSlash_LeavesBareAndRootAlone)
+{
+	ASSERT_EQUALS(std::string("/api/v1/status"), StripTrailingSlash("/api/v1/status"));
+	ASSERT_EQUALS(std::string("/"), StripTrailingSlash("/"));
+	ASSERT_EQUALS(std::string(""), StripTrailingSlash(""));
+}
+
+// Only one. `//` is a malformed path rather than a synonym -- collapsing it
+// would let `/a//b` reach the route for `/a/b`.
+TEST(PathPatterns, StripTrailingSlash_StripsOnlyOne)
+{
+	ASSERT_EQUALS(std::string("/a/"), StripTrailingSlash("/a//"));
+}
+
+// Match: empty captures
+
+// Every capture on the surface names a resource -- a hash, an ecid, an index, an address -- and
+// none can be the empty string. Binding one used to hand the handler a URL that names nothing and
+// leave it to pick a status code, which is why an empty {ecid} was a 400 while an empty {hash} was
+// a 404.
+TEST(PathPatterns, Match_RejectsAnEmptyCapture)
+{
+	const auto pat = ParsePattern("/api/v1/clients/{ecid}");
+	std::map<std::string, std::string> caps;
+	ASSERT_TRUE(!Match(pat, SplitPath("/api/v1/clients/"), caps));
+	// The non-empty case still matches, so the guard is not just refusing
+	// everything.
+	ASSERT_TRUE(Match(pat, SplitPath("/api/v1/clients/42"), caps));
+	ASSERT_EQUALS(std::string("42"), caps"ecid");
+}
+
+// A literal segment that happens to be empty is a different question and was
+// already handled: the comparison simply fails.
+TEST(PathPatterns, Match_StillRejectsAMissegmentedLiteral)
+{
+	// Same segment count, so the rejection has to come from the literal
+	// comparison rather than from the length check.
+	const auto pat = ParsePattern("/api/v1/version/check");
+	std::map<std::string, std::string> caps;
+	ASSERT_TRUE(!Match(pat, SplitPath("/api/v1/version/"), caps));
+}
+
+// ParseBoundedUint / ParseBoolValue
+
+// Seven hand-written count parsers disagreed about the two questions that decide what a client
+// sees: what an unparseable value does, and what an out-of-range one does. A typo was a hard error
+// on `interval` and a silent behaviour change on `width` -- on the same endpoint.
+TEST(PathPatterns, ParseBoundedUint_AcceptsInRange)
+{
+	std::uint64_t v = 999;
+	ASSERT_TRUE(ParseBoundedUint("0", 0, 500, v));
+	ASSERT_EQUALS(static_cast<std::uint64_t>(0), v);
+	ASSERT_TRUE(ParseBoundedUint("500", 0, 500, v));
+	ASSERT_EQUALS(static_cast<std::uint64_t>(500), v);
+	ASSERT_TRUE(ParseBoundedUint("1", 1, 3600, v));
+	ASSERT_EQUALS(static_cast<std::uint64_t>(1), v);
+}
+
+// Unparseable and out-of-range are the same answer, which is the whole point:
+// neither silently becomes a default.
+TEST(PathPatterns, ParseBoundedUint_RejectsGarbageAndOutOfRange)
+{
+	std::uint64_t v = 42;
+	ASSERT_TRUE(!ParseBoundedUint("", 0, 500, v));
+	ASSERT_TRUE(!ParseBoundedUint("abc", 0, 500, v));
+	ASSERT_TRUE(!ParseBoundedUint("12x", 0, 500, v));
+	ASSERT_TRUE(!ParseBoundedUint("-1", 0, 500, v));
+	ASSERT_TRUE(!ParseBoundedUint("501", 0, 500, v));
+	ASSERT_TRUE(!ParseBoundedUint("0", 1, 3600, v));
+	// A rejected parse leaves the caller's default alone.
+	ASSERT_EQUALS(static_cast<std::uint64_t>(42), v);
+}
+
+// The bound is checked while accumulating, so a digit string long enough to
+// wrap a uint64 is rejected rather than wrapping into range.
+TEST(PathPatterns, ParseBoundedUint_DoesNotWrapOnLongInput)
+{
+	std::uint64_t v = 7;
+	ASSERT_TRUE(!ParseBoundedUint("99999999999999999999999999", 0, 500, v));
+	ASSERT_TRUE(!ParseBoundedUint("18446744073709551617", 0, 500, v));
+	ASSERT_EQUALS(static_cast<std::uint64_t>(7), v);
+}
+
+// Every boolean parameter goes through here so the vocabulary cannot drift per call site: without
+// it, one parameter could read every unrecognised value as false while its neighbour answered 400,
+// so one typo would be silent and the next fatal. One vocabulary, and anything outside it is
+// answerable.
+TEST(PathPatterns, ParseBoolValue_AcceptsTheThreeSpellings)
+{
+	bool b = false;
+	ASSERT_TRUE(ParseBoolValue("1", b) && b);
+	ASSERT_TRUE(ParseBoolValue("true", b) && b);
+	ASSERT_TRUE(ParseBoolValue("yes", b) && b);
+	ASSERT_TRUE(ParseBoolValue("0", b) && !b);
+	ASSERT_TRUE(ParseBoolValue("false", b) && !b);
+	ASSERT_TRUE(ParseBoolValue("no", b) && !b);
+}
+
+TEST(PathPatterns, ParseBoolValue_RejectsAnythingElse)
+{
+	bool b = true;
+	ASSERT_TRUE(!ParseBoolValue("maybe", b));
+	ASSERT_TRUE(!ParseBoolValue("", b));
+	ASSERT_TRUE(!ParseBoolValue("TRUE", b));
+	// Left alone on rejection.
+	ASSERT_TRUE(b);
+}

amule-3.0.1.tar.gz/unittests/tests/PathTest.cpp -> amule-3.1.0.tar.gz/unittests/tests/PathTest.cpp Changed

@@ -65,12 +65,11 @@
 */
 #endif
 
-wxString StringFrom(const CPath& prt)
+wxString StringFrom(const CPath &prt)
 {
 	return prt.GetPrintable();
 }
 
-
 DECLARE_SIMPLE(GenericPathFunctions)
 
 TEST(GenericPathFunctions, JoinPaths)
@@ -91,7 +90,6 @@
 	}
 }
 
-
 DECLARE_SIMPLE(CPath)
 
 TEST(CPath, DefaultConstructor)
@@ -110,7 +108,6 @@
 	ASSERT_EQUALS(CPath(), tmp.GetFullName());
 }
 
-
 TEST(CPath, PathConstructor)
 {
 	{
@@ -146,10 +143,9 @@
 #endif
 }
 
-
 TEST(CPath, CopyConstructor)
 {
-	const char* tmpPath = "foobar.tgz";
+	const char *tmpPath = "foobar.tgz";
 
 	{
 		CPath a(tmpPath);
@@ -180,11 +176,10 @@
 	}
 }
 
-
 TEST(CPath, Operators)
 {
-	const char* tmpPath1 = "foobar.tgz";
-	const char* tmpPath2 = "barfoo.tar";
+	const char *tmpPath1 = "foobar.tgz";
+	const char *tmpPath2 = "barfoo.tar";
 
 	{
 		CPath a, b;
@@ -237,7 +232,6 @@
 	// TODO: Less than
 }
 
-
 /** Return the path normalized for the current platform. */
 CPath Norm(wxString str)
 {
@@ -246,7 +240,6 @@
 	return CPath(str);
 }
 
-
 TEST(CPath, JoinPaths)
 {
 	const CPath expected1 = Norm("/home/amule/");
@@ -270,7 +263,6 @@
 	ASSERT_EQUALS(expected2, CPath().JoinPaths(expected2));
 }
 
-
 TEST(CPath, StartsWith)
 {
 	const CPath test = Norm("/home/amule/");
@@ -292,7 +284,6 @@
 	ASSERT_FALSE(test.StartsWith(Norm("/home/amule/foo")));
 }
 
-
 TEST(CPath, IsSameDir)
 {
 	ASSERT_TRUE(Norm("/root").IsSameDir(Norm("/root")));
@@ -306,6 +297,72 @@
 	ASSERT_FALSE(Norm("/root").IsSameDir(Norm("/home")));
 }
 
+TEST(CPath, GetDirKeyMatchesIsSameDir)
+{
+	// CSharedFileList groups directories by GetDirKey() instead of comparing every pair with
+	// IsSameDir() (issue #898). That is only valid while the two agree, so assert the
+	// equivalence directly rather than the key's contents, which are platform-dependent by
+	// design.
+	const wxString paths = {
+		"/root",
+		"/root/",
+		"/root//",
+		"/home",
+		"/home/",
+		"/home/amule",
+		"/home/amule/",
+		"/home/./amule",
+		"/home/amule/../amule",
+		"/home/other/../amule",
+		// Case variants: the same directory on Windows, different ones elsewhere. Asserting
+		// the equivalence rather than the key's value covers both without a platform #ifdef
+		// -- and it is the case where a hand-rolled key would diverge from IsSameDir(),
+		// because the folding lives inside wxPATH_NORM_CASE.
+		"/Home/AMule",
+		"/HOME/AMULE/",
+		"/ROOT",
+	};
+	const size_t count = sizeof(paths) / sizeof(paths0);
+
+	for (size_t i = 0; i < count; ++i) {
+		for (size_t j = 0; j < count; ++j) {
+			const CPath a = Norm(pathsi);
+			const CPath b = Norm(pathsj);
+			ASSERT_EQUALS(a.IsSameDir(b), a.GetDirKey() == b.GetDirKey());
+		}
+	}
+}
+
+TEST(CPath, GetDirKeyGroupsEqualDirs)
+{
+	// The property the grouping actually relies on: paths the old pairwise walk would have put
+	// together produce one key, and different directories produce different ones.
+	ASSERT_EQUALS(Norm("/root").GetDirKey(), Norm("/root/").GetDirKey());
+	ASSERT_EQUALS(Norm("/home/amule").GetDirKey(), Norm("/home/amule/").GetDirKey());
+	ASSERT_EQUALS(Norm("/home/amule").GetDirKey(), Norm("/home/./amule").GetDirKey());
+	ASSERT_EQUALS(Norm("/home/amule").GetDirKey(), Norm("/home/other/../amule").GetDirKey());
+
+	ASSERT_TRUE(Norm("/root").GetDirKey() != Norm("/home").GetDirKey());
+	ASSERT_TRUE(Norm("/home/amule").GetDirKey() != Norm("/home/amulf").GetDirKey());
+}
+
+TEST(CPath, IsSameAsUnchangedByKeyExtraction)
+{
+	// NormalizedKey() was lifted out of IsSameAs() (issue #898). Both branches it kept are
+	// asserted here so the extraction cannot quietly change either: bare filenames still
+	// compare through PATHCMP, and anything with a separator still normalises both sides.
+	ASSERT_TRUE(CPath("foobar.tgz") == CPath("foobar.tgz"));
+	ASSERT_TRUE(CPath("foobar.tgz") != CPath("barfoo.tar"));
+
+	ASSERT_TRUE(Norm("/home/amule/x.dat") == Norm("/home/amule/x.dat"));
+	ASSERT_TRUE(Norm("/home/amule/x.dat") == Norm("/home/./amule/x.dat"));
+	ASSERT_TRUE(Norm("/home/amule/x.dat") == Norm("/home/other/../amule/x.dat"));
+	ASSERT_TRUE(Norm("/home/amule/x.dat") != Norm("/home/amule/y.dat"));
+
+	// A bare name against a path: the fast path does not apply, and both
+	// sides go through normalisation, as before the extraction.
+	ASSERT_TRUE(CPath("x.dat") != Norm("/home/amule/x.dat"));
+}
 
 TEST(CPath, GetPath_FullName)
 {
@@ -343,7 +400,6 @@
 	}
 }
 
-
 TEST(CPath, Cleanup)
 {
 	const CPath initial = CPath(" /a\"b*c* <d>?e|\\:f ");
@@ -354,7 +410,6 @@
 	ASSERT_EQUALS(Norm(" abc def "), initial.Cleanup(true, true));
 }
 
-
 TEST(CPath, AddPostFix)
 {
 	ASSERT_EQUALS(Norm("/foo_1.bar"), Norm("/foo.bar").AddPostfix("_1"));
@@ -363,7 +418,6 @@
 	ASSERT_EQUALS(Norm("/_1"), Norm("/").AddPostfix("_1"));
 }
 
-
 TEST(CPath, Extensions)
 {
 	const CPath initial = Norm("/home/amule.foo.bar");
@@ -409,3 +463,29 @@
 	ASSERT_EQUALS("t...", testPath.TruncatePath(6, true));
 	ASSERT_EQUALS("", testPath.TruncatePath(5, true));
 }
+
+TEST(CPath, UnivRoundTrip)
+{
+	// ToUniv()/FromUniv() stores the filesystem bytes verbatim and is the one representation
+	// guaranteed to reproduce the path. The display form is not: on macOS wxConvFileName
+	// normalises to NFD, so GetPrintable() hands back a different byte sequence for the same
+	// characters, and a CPath rebuilt from it is a different path to any filesystem that
+	// compares bytes -- a Linux daemon's, or an SMB/NFS mount. Anything carrying a path through
+	// another medium (a config file, a list control's cells) therefore has to move this pair
+	// around rather than what it displayed.
+	const wxString inputs = {
+		"/tmp/plain",
+		// Precomposed U+00F6, which is what NFD decomposes.
+		wxString::FromUTF8("/tmp/M\xC3\xB6t"),
+		// CJK has no decomposition, so normalisation leaves it alone.
+		wxString::FromUTF8("/tmp/\xE9\x9F\xB3\xE6\xA5\xBD"),
+		// Not valid UTF-8: the mangled-name case the raw/printable split
+		// exists for in the first place.
+		wxString::From8BitData("/tmp/M\xF6t"),
+	};
+
+	for (const wxString &input : inputs) {
+		const CPath path(input);
+		ASSERT_EQUALS(path.GetRaw(), CPath::FromUniv(CPath::ToUniv(path)).GetRaw());
+	}
+}

amule-3.1.0.tar.gz/unittests/tests/PeerAddressingTest.cpp Added

@@ -0,0 +1,784 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// Peer identity: what identifies a peer once a peer can be IPv6.
+//
+// Before this change a peer was a 32-bit address, so an inbound IPv6 peer was accepted by the
+// socket and then dropped -- there was nothing to index it under. Widening that identity has three
+// failure modes worth pinning, and only one of them is about IPv6:
+//
+//   1. Merging two peers that are not the same peer. Keeping absence separate from 0.0.0.0 is
+// hardening rather than a bug observed in #1314. Any new address-keyed container must preserve this
+// invariant.
+//   2. Silently changing IPv4 behaviour. The characterisation half of this file records what an
+// IPv4 peer's identity does today, at the value level the unit tests can reach, so a regression in
+// the widening is loud.
+//   3. Handing a subsystem an address it cannot represent. Kad is IPv4 behind a documented
+// conversion boundary, and ed2k UDP obfuscation derives its key from a 32-bit address, so an
+// inbound datagram has to be routed by what its peer address can actually reach.
+
+#include <muleunit/test.h>
+
+#include <PeerAddressing.h>
+#include <CanonicalPeerIndex.h>
+#include <libs/common/Format.h>
+
+#include <memory>
+
+using namespace muleunit;
+using namespace PeerAddressing;
+
+DECLARE_SIMPLE(PeerAddressing)
+
+TEST(PeerAddressing, ProgrammaticFilterPrefixes)
+{
+	const auto host = CNetworkAddress::FromString("2001:db8:1:2:7fff::1");
+	const auto network = CNetworkAddress::FromString("2001:db8:1:2::");
+	ASSERT_TRUE(MatchesFilterPrefix(host, network, 65));
+	ASSERT_FALSE(MatchesFilterPrefix(CNetworkAddress::FromString("2001:db8:1:2:8000::1"), network, 65));
+	ASSERT_TRUE(MatchesFilterPrefix(host, host, 128));
+	ASSERT_FALSE(MatchesFilterPrefix(host, network, 128));
+	ASSERT_FALSE(MatchesFilterPrefix(host, host, 129));
+	ASSERT_TRUE(MatchesFilterPrefix(host, CNetworkAddress::AnyIPv6(), 0));
+	ASSERT_TRUE(MatchesFilterPrefix(
+		CNetworkAddress::FromString("fe80::1%3"), CNetworkAddress::FromString("fe80::1%9"), 128));
+	const auto v4 = CNetworkAddress::FromIPv4NetworkOrder(0x010200c0);
+	const auto mapped = CNetworkAddress::FromString("::ffff:192.0.2.1");
+	ASSERT_TRUE(MatchesFilterPrefix(mapped, v4, 32));
+	ASSERT_TRUE(MatchesFilterPrefix(v4, mapped, 24));
+	ASSERT_FALSE(MatchesFilterPrefix(v4, mapped, 33));
+	// A mapped prefix may also be written in IPv6 width: /96 is all of IPv4, /104 is /8.
+	const auto mappedTen = CNetworkAddress::FromString("::ffff:10.0.0.0");
+	const auto inTen = CNetworkAddress::FromString("10.1.2.3");
+	ASSERT_TRUE(MatchesFilterPrefix(inTen, mappedTen, 96));
+	ASSERT_TRUE(MatchesFilterPrefix(inTen, mappedTen, 104));
+	ASSERT_FALSE(MatchesFilterPrefix(CNetworkAddress::FromString("11.1.2.3"), mappedTen, 104));
+	ASSERT_FALSE(MatchesFilterPrefix(inTen, mappedTen, 95));
+	ASSERT_FALSE(MatchesFilterPrefix(inTen, mappedTen, 129));
+	// Only a mapped-written prefix gets the IPv6 width; plain IPv4 at /104 is invalid.
+	ASSERT_FALSE(MatchesFilterPrefix(inTen, CNetworkAddress::FromString("10.0.0.0"), 104));
+	ASSERT_FALSE(MatchesFilterPrefix(v4, host, 0));
+}
+
+TEST(PeerAddressing, ProgrammaticFilterRanges)
+{
+	const auto first = CNetworkAddress::FromString("2001:db8::ff");
+	const auto middle = CNetworkAddress::FromString("2001:db8::100");
+	const auto last = CNetworkAddress::FromString("2001:db8::101");
+	for (const auto &host : { first, middle, last }) {
+		ASSERT_TRUE(MatchesFilterRange(host, first, last));
+	}
+	ASSERT_FALSE(MatchesFilterRange(CNetworkAddress::FromString("2001:db8::fe"), first, last));
+	ASSERT_FALSE(MatchesFilterRange(CNetworkAddress::FromString("2001:db8::102"), first, last));
+	ASSERT_FALSE(MatchesFilterRange(middle, last, first));
+	ASSERT_TRUE(MatchesFilterRange(middle, middle, middle));
+	const auto v4 = CNetworkAddress::FromIPv4NetworkOrder(0x010200c0);
+	const auto mapped = CNetworkAddress::FromString("::ffff:192.0.2.1");
+	ASSERT_TRUE(MatchesFilterRange(mapped, v4, v4));
+	ASSERT_TRUE(MatchesFilterRange(v4, mapped, mapped));
+	ASSERT_FALSE(MatchesFilterRange(middle, v4, last));
+	ASSERT_TRUE(MatchesFilterRange(CNetworkAddress::FromString("fe80::1%3"),
+		CNetworkAddress::FromString("fe80::1%9"),
+		CNetworkAddress::FromString("fe80::1%9")));
+}
+
+TEST(PeerAddressing, FilterMatchingRejectsUnknownAndUnspecifiedHosts)
+{
+	const auto host = CNetworkAddress::FromString("2001:db8::1");
+	const auto absent = CNetworkAddress::Absent();
+	for (const auto &invalid : { absent,
+		     CNetworkAddress::AnyIPv6(),
+		     CNetworkAddress::FromIPv4HostOrder(0),
+		     CNetworkAddress::FromString("::ffff:0.0.0.0") }) {
+		ASSERT_FALSE(MatchesFilterPrefix(invalid, invalid, 0));
+		ASSERT_FALSE(MatchesFilterRange(invalid, invalid, invalid));
+	}
+	ASSERT_FALSE(MatchesFilterPrefix(host, absent, 0));
+	ASSERT_FALSE(MatchesFilterRange(host, absent, host));
+	ASSERT_FALSE(MatchesFilterRange(host, host, absent));
+	// A prefix matches only inside its own family, whatever its width: ::/0 covers every IPv6
+	// address and no IPv4 one.
+	const auto ipv4Host = CNetworkAddress::FromString("192.0.2.1");
+	ASSERT_FALSE(MatchesFilterPrefix(ipv4Host, CNetworkAddress::FromString("2001:db8::"), 0));
+	ASSERT_TRUE(MatchesFilterPrefix(host, CNetworkAddress::FromString("2001:db8::"), 0));
+	ASSERT_FALSE(MatchesFilterPrefix(host, CNetworkAddress::FromString("0.0.0.0"), 0));
+}
+
+TEST(PeerAddressing, TcpAdmissionAllowsNativeIPv6ButUtpRemainsIpv4Only)
+{
+	ASSERT_TRUE(CanAdmitTcpPeer(CNetworkAddress::FromString("2001:db8::1")));
+	ASSERT_FALSE(CanAdmitUtpPeer(CNetworkAddress::FromString("2001:db8::1")));
+	ASSERT_TRUE(CanAdmitTcpPeer(CNetworkAddress::FromString("192.0.2.1")));
+	ASSERT_TRUE(CanAdmitUtpPeer(CNetworkAddress::FromString("192.0.2.1")));
+	ASSERT_FALSE(CanAdmitTcpPeer(CNetworkAddress::Absent()));
+	ASSERT_FALSE(CanAdmitTcpPeer(CNetworkAddress::AnyIPv6()));
+	ASSERT_FALSE(CanAdmitUtpPeer(CNetworkAddress::FromString("0.0.0.0")));
+	// Production routes an absent peer through the uTP predicate too, and an accept that
+	// produced no address is not a peer to admit on either transport.
+	ASSERT_FALSE(CanAdmitUtpPeer(CNetworkAddress::Absent()));
+	ASSERT_FALSE(CanAdmitUtpPeer(CNetworkAddress::AnyIPv6()));
+	// Mapped IPv4 is unmapped before admission, so it travels as the IPv4 peer it is.
+	ASSERT_TRUE(CanAdmitUtpPeer(CNetworkAddress::FromString("::ffff:192.0.2.1").Unmapped()));
+}
+
+// The rate-limit scope aggregates a delegated /64 and nothing else: outside globally routable
+// space the prefix is shared by unrelated peers, so the address itself is the scope.
+TEST(PeerAddressing, RateLimitScopeAggregatesOnlyDelegatedPrefixes)
+{
+	ASSERT_TRUE(RateLimitScope(CNetworkAddress::FromString("2001:db8:1:2::1")) ==
+		    RateLimitScope(CNetworkAddress::FromString("2001:db8:1:2::2")));
+	ASSERT_TRUE(RateLimitScope(CNetworkAddress::FromString("fe80::1")) ==
+		    CNetworkAddress::FromString("fe80::1"));
+	ASSERT_TRUE(RateLimitScope(CNetworkAddress::FromString("64:ff9b::1")) ==
+		    CNetworkAddress::FromString("64:ff9b::1"));
+	ASSERT_TRUE(RateLimitScope(CNetworkAddress::FromString("192.0.2.1")) ==
+		    CNetworkAddress::FromString("192.0.2.1"));
+}
+
+// Contact security checks support native IPv6, while callbacks remain IPv4-only and unspecified
+// addresses fail closed.
+TEST(PeerAddressing, ContactSecurityChecksAllowNativeIPv6)
+{
+	for (const char *text : { "2001:4860::1", "2001:db8::1", "fe80::1", "fd00::1", "::1" }) {
+		const auto address = CNetworkAddress::FromString(text);
+		ASSERT_TRUE(CanCheckContactAddress(address));
+		ASSERT_FALSE(CanRequestCallback(address));
+	}
+	ASSERT_FALSE(CanCheckContactAddress(CNetworkAddress::AnyIPv6()));
+	ASSERT_FALSE(CanCheckContactAddress(CNetworkAddress::FromString("::")));
+	// Unknown clients still use the existing LowID/server-ID path, not a made-up address.
+	ASSERT_TRUE(CanCheckContactAddress(CNetworkAddress::Absent()));
+	ASSERT_FALSE(CanRequestCallback(CNetworkAddress::Absent()));
+	for (const char *text : { "192.0.2.1", "::ffff:192.0.2.1" }) {
+		const auto address = CNetworkAddress::FromString(text);
+		ASSERT_TRUE(CanCheckContactAddress(address));
+		ASSERT_TRUE(CanRequestCallback(address));
+	}
+	for (const char *text : { "0.0.0.0", "::ffff:0.0.0.0" }) {
+		const auto address = CNetworkAddress::FromString(text);
+		ASSERT_FALSE(CanCheckContactAddress(address));
+		ASSERT_FALSE(CanRequestCallback(address));
+	}
+}
+
+TEST(PeerAddressing, ContactCheckAddressKeepsLowIDUnchecked)
+{
+	const auto absent = CNetworkAddress::Absent();
+	const auto user = CNetworkAddress::FromString("192.0.2.1");
+	ASSERT_TRUE(ContactCheckAddress(user, absent, false, 0x02000000u) == user);
+	ASSERT_TRUE(ContactCheckAddress(user, absent, true, 0) == user);
+	// A HighID source built from its user ID has no user address until its hello.
+	ASSERT_TRUE(ContactCheckAddress(absent, absent, false, 0x010200C0u) ==
+		    CNetworkAddress::FromString("192.0.2.1"));
+	// A HighID source with a native connect address uses it until its hello.
+	const auto native = CNetworkAddress::FromString("2001:4860::1");
+	ASSERT_TRUE(ContactCheckAddress(absent, native, false, 0) == native);
+	ASSERT_FALSE(CanOpenConnection(native, false));
+	ASSERT_TRUE(CanOpenConnection(native, true));
+	// LowID and zero IDs stay absent: filtering one would disconnect every callback contact.
+	ASSERT_TRUE(ContactCheckAddress(absent, native, true, 0x010200C0u).IsAbsent());
+	ASSERT_TRUE(ContactCheckAddress(absent, absent, false, 0).IsAbsent());
+}
+
+TEST(PeerAddressing, CallbackThrottlePreservesIPv4AndExpiryBoundary)
+{
+	const auto address = CNetworkAddress::FromString("192.0.2.1");
+	const auto mapped = CNetworkAddress::FromString("::ffff:192.0.2.1");
+	ASSERT_TRUE(IsCallbackRequestThrottled(address, address, 0));
+	ASSERT_TRUE(IsCallbackRequestThrottled(mapped, address, 179999));
+	ASSERT_TRUE(IsCallbackRequestThrottled(address, mapped, 179999));
+	ASSERT_FALSE(IsCallbackRequestThrottled(address, address, 180000));
+	ASSERT_FALSE(IsCallbackRequestThrottled(address, address, 180001));
+	ASSERT_FALSE(IsCallbackRequestThrottled(address, CNetworkAddress::FromString("192.0.2.2"), 0));
+	// An address that names nobody is not a budget: every seam refuses it.
+	const auto zero = CNetworkAddress::FromIPv4NetworkOrder(0);
+	ASSERT_FALSE(IsCallbackRequestThrottled(zero, zero, 0));
+	ASSERT_FALSE(CanRequestCallback(zero));
+	ASSERT_FALSE(CanOpenConnection(zero, false));
+	ASSERT_TRUE(CanOpenConnection(zero, true));
+	ASSERT_FALSE(IsCallbackRequestThrottled(CNetworkAddress::Absent(), zero, 0));
+	ASSERT_FALSE(IsCallbackRequestThrottled(zero, CNetworkAddress::Absent(), 0));
+}
+
+TEST(PeerAddressing, DormantIPv6CallbackScopeRemainsPerSubscriber)
+{
+	const auto address = CNetworkAddress::FromString("2001:4860:1:2::1");
+	ASSERT_TRUE(IsCallbackRequestThrottled(address, CNetworkAddress::FromString("2001:4860:1:2::2"), 0));
+	ASSERT_FALSE(IsCallbackRequestThrottled(address, CNetworkAddress::FromString("2001:4860:1:3::1"), 0));
+	// Accounting support is independent from callback permission.
+	ASSERT_FALSE(CanRequestCallback(address));
+	ASSERT_TRUE(CanCheckContactAddress(address));
+}
+
+// Indexability
+
+TEST(PeerAddressing, OnlyAnAddressThatNamesAHostIsIndexable)
+{
+	// Absence is not an address, and the unspecified address names nobody. An index entry under
+	// either would group unrelated peers, and bans would refuse the same key, so the two would
+	// disagree about one peer.
+	ASSERT_FALSE(IsIndexable(CNetworkAddress::Absent()));
+	for (const char *text : { "0.0.0.0", "::", "::ffff:0.0.0.0" }) {
+		const auto address = CNetworkAddress::FromString(text);
+		ASSERT_FALSE(IsIndexable(address));
+		ASSERT_EQUALS(IsSecurityKey(address), IsIndexable(address));
+	}
+	ASSERT_TRUE(IsIndexable(CNetworkAddress::FromString("192.0.2.1")));
+	ASSERT_TRUE(IsIndexable(CNetworkAddress::FromString("2001:db8::1")));
+}
+
+TEST(PeerAddressing, AbsentAndAllZeroAreDifferentKeys)
+{
+	// Prevention invariant: absence must not share an address bucket or acquire
+	// a bucket of its own.
+	CCanonicalPeerIndex<int> index;
+
+	const CNetworkAddress absent = CNetworkAddress::Absent();
+	const CNetworkAddress allZeroV4 = CNetworkAddress::FromString("0.0.0.0");
+	const CNetworkAddress allZeroV6 = CNetworkAddress::FromString("::");
+
+	ASSERT_TRUE(absent != allZeroV4);
+	ASSERT_TRUE(absent != allZeroV6);
+	ASSERT_TRUE(allZeroV4 != allZeroV6);
+
+	// None of the three names a host, so none is indexed, and each reads back empty. That is
+	// what keeps "unknown address" un-bannable rather than banned, and it is the rule the ban
+	// record applies to the same values.
+	index.Insert(absent, 3);
+	index.Insert(allZeroV4, 1);
+	index.Insert(allZeroV6, 2);
+
+	ASSERT_EQUALS((size_t)0, index.size());
+	ASSERT_EQUALS((size_t)0, index.count(allZeroV4));
+	ASSERT_EQUALS((size_t)0, index.count(allZeroV6));
+	ASSERT_EQUALS((size_t)0, index.count(absent));
+}
+
+TEST(PeerAddressing, MappedAndNativeIPv4AreTheSamePeer)
+{
+	// A blocked IPv4 peer reconnecting as ::ffff:a.b.c.d is the same peer, and the index must
+	// not give it a second identity. The address type does not normalise on comparison by
+	// design, so the index key is normalised deliberately, once, here -- and the test says so
+	// rather than assuming it.
+	const CNetworkAddress native = CNetworkAddress::FromString("192.0.2.1");
+	const CNetworkAddress mapped = CNetworkAddress::FromString("::ffff:192.0.2.1");
+
+	ASSERT_TRUE(native != mapped);
+	ASSERT_TRUE(IndexKey(native) == IndexKey(mapped));
+	ASSERT_TRUE(IndexKey(mapped).IsIPv4());
+
+	// An absent address has no key, and asking for one does not invent one.
+	ASSERT_TRUE(IndexKey(CNetworkAddress::Absent()).IsAbsent());
+
+	// A native IPv6 address keys as itself, unchanged.
+	const CNetworkAddress v6 = CNetworkAddress::FromString("2001:db8::1");
+	ASSERT_TRUE(IndexKey(v6) == v6);
+}
+
+TEST(PeerAddressing, DistinctIPv6PeersNeverShareAKey)
+{
+	// Two peers in the same /64 are two peers. The rate-limit scope aggregates
+	// them on purpose (below); the identity index must not.
+	static const char *const addresses = {
+		"2001:db8::1", "2001:db8::2", "2001:db8:0:0:1::1", "2001:db8:1::1", "fe80::1", "::1"
+	};
+	static const size_t count = sizeof(addresses) / sizeof(addresses0);
+
+	CCanonicalPeerIndex<int> index;
+	for (size_t i = 0; i < count; ++i) {
+		const CNetworkAddress address = CNetworkAddress::FromString(addressesi);
+		ASSERT_TRUE(address.IsPresent());
+		index.Insert(address, (int)i);
+	}
+
+	for (size_t i = 0; i < count; ++i) {
+		const CNetworkAddress address = CNetworkAddress::FromString(addressesi);
+		ASSERT_EQUALS((size_t)1, index.count(IndexKey(address)));
+	}
+	ASSERT_EQUALS(count, index.size());
+}
+
+TEST(PeerAddressing, CanonicalAddressRangeRetainsEveryClient)
+{
+	// The address index is a multimap: clients sharing a host must remain
+	// available for the caller's port/hash checks, including mapped IPv4.
+	CCanonicalPeerIndex<int> index;
+	const auto native = CNetworkAddress::FromString("192.0.2.1");
+	const auto mapped = CNetworkAddress::FromString("::ffff:192.0.2.1");
+	index.Insert(native, 1);
+	index.Insert(mapped, 2);
+	index.Insert(CNetworkAddress::FromString("2001:db8::1"), 3);
+
+	const auto range = index.equal_range(mapped);
+	ASSERT_EQUALS((size_t)2, index.count(native));
+	ASSERT_TRUE(range.first->first == native);
+	auto it = range.first;
+	ASSERT_TRUE(it != range.second);
+	ASSERT_EQUALS(1, it->second);
+	++it;
+	ASSERT_TRUE(it != range.second);
+	ASSERT_EQUALS(2, it->second);
+	++it;
+	ASSERT_TRUE(it == range.second);
+}
+
+TEST(PeerAddressing, CanonicalAddressIndexRekeysWithoutStaleEntries)
+{
+	CCanonicalPeerIndex<int> index;
+	const auto oldAddress = CNetworkAddress::FromString("::ffff:192.0.2.7");
+	const auto newAddress = CNetworkAddress::FromString("2001:db8::7");
+	const auto absent = CNetworkAddress::Absent();
+	const auto isSeven = (int value) { return value == 7; };
+	index.Insert(oldAddress, 7);
+	index.Insert(oldAddress, 8);
+
+	index.Update(oldAddress, newAddress, 7, isSeven);
+	ASSERT_EQUALS((size_t)1, index.count(oldAddress));
+	ASSERT_EQUALS(8, index.equal_range(oldAddress).first->second);
+	ASSERT_EQUALS((size_t)1, index.count(newAddress));
+
+	index.Update(newAddress, absent, 7, isSeven);
+	ASSERT_EQUALS((size_t)0, index.count(newAddress));
+	ASSERT_EQUALS((size_t)0, index.count(absent));
+	index.Update(absent, oldAddress, 7, isSeven);
+	ASSERT_EQUALS((size_t)2, index.count(oldAddress));
+	index.Update(oldAddress, CNetworkAddress::FromString("192.0.2.7"), 7, isSeven);
+	ASSERT_EQUALS((size_t)2, index.count(oldAddress));
+	ASSERT_EQUALS(8, index.equal_range(oldAddress).first->second);
+}
+
+TEST(PeerAddressing, CanonicalAddressIndexRemovesOnlySelectedClient)
+{
+	CCanonicalPeerIndex<int> index;
+	const auto address = CNetworkAddress::FromString("192.0.2.7");
+	const auto mapped = CNetworkAddress::FromString("::ffff:192.0.2.7");
+	index.Insert(address, 1);
+	index.Insert(mapped, 2);
+	ASSERT_FALSE(index.Remove(address, (int value) { return value == 3; }));
+	ASSERT_TRUE(index.Remove(mapped, (int value) { return value == 1; }));
+	ASSERT_EQUALS((size_t)1, index.count(address));
+	ASSERT_EQUALS(2, index.equal_range(address).first->second);
+	ASSERT_FALSE(index.Remove(address, (int value) { return value == 1; }));
+	ASSERT_TRUE(index.Remove(address, (int value) { return value == 2; }));
+	ASSERT_EQUALS((size_t)0, index.size());
+}
+
+TEST(PeerAddressing, CanonicalAddressIndexRetainsOwnershipAcrossRekey)
+{
+	using Reference = std::shared_ptr<int>;
+	CCanonicalPeerIndex<Reference> index;
+	const auto oldAddress = CNetworkAddress::FromString("192.0.2.7");
+	const auto newAddress = CNetworkAddress::FromString("2001:db8::7");
+	std::weak_ptr<int> lifetime;
+	{
+		auto reference = std::make_shared<int>(7);
+		lifetime = reference;
+		index.Insert(oldAddress, reference);
+	}
+	ASSERT_FALSE(lifetime.expired());
+	// Pass the index's own reference: erasing its node must not destroy the peer
+	// while Update still needs it for the new entry.
+	index.Update(oldAddress, newAddress, index.begin()->second, (const Reference &reference) {
+		return *reference == 7;
+	});
+	ASSERT_FALSE(lifetime.expired());
+	ASSERT_EQUALS((size_t)0, index.count(oldAddress));
+	ASSERT_EQUALS(7, *index.equal_range(newAddress).first->second);
+	ASSERT_TRUE(index.Remove(newAddress, (const Reference &reference) { return *reference == 7; }));
+	ASSERT_TRUE(lifetime.expired());
+
+	{
+		auto reference = std::make_shared<int>(8);
+		lifetime = reference;
+		index.Insert(newAddress, reference);
+	}
+	index.clear();
+	ASSERT_TRUE(lifetime.expired());
+}
+
+TEST(PeerAddressing, CanonicalAddressIndexKeepsLinkLocalScopesSeparate)
+{
+	CCanonicalPeerIndex<int> index;
+	const auto first = CNetworkAddress::FromString("fe80::1%3");
+	const auto second = CNetworkAddress::FromString("fe80::1%9");
+	index.Insert(first, 1);
+	index.Insert(second, 2);
+	ASSERT_EQUALS((size_t)1, index.count(first));
+	ASSERT_EQUALS((size_t)1, index.count(second));
+	ASSERT_EQUALS(1, index.equal_range(first).first->second);
+	ASSERT_EQUALS(2, index.equal_range(second).first->second);
+}
+
+TEST(PeerAddressing, LegacyZeroCannotFindPresentZeroOrIPv6)
+{
+	CCanonicalPeerIndex<int> index;
+	// The unspecified spellings are refused outright; the IPv6 peers are stored and keep their
+	// own keys even though all four narrow to the same legacy zero.
+	for (const char *text : { "0.0.0.0", "::" }) {
+		index.Insert(IndexKey(CNetworkAddress::FromString(text)), 1);
+	}
+	ASSERT_EQUALS((size_t)0, index.size());
+	for (const char *text : { "2001:db8::1", "2001:db8::2" }) {
+		const auto key = IndexKey(CNetworkAddress::FromString(text));
+		ASSERT_TRUE(IsIndexable(key));
+		ASSERT_EQUALS(0u, key.ToIPv4NetworkOrderOrZero());
+		index.Insert(key, 1);
+	}
+
+	// Narrowing is only a compatibility adapter, never an identity key.
+	ASSERT_EQUALS((size_t)2, index.size());
+	ASSERT_EQUALS((size_t)0, index.count(IndexKey(CNetworkAddress::FromIPv4NetworkOrderOrAbsent(0))));
+	for (const auto &entry : index) {
+		ASSERT_EQUALS((size_t)1, index.count(entry.first));
+	}
+}
+
+// IPv4 characterisation -- must not change
+
+TEST(PeerAddressing, IPv4RoundTripThroughIdentityIsExact)
+{
+	// A client's address used to be an ed2k-order uint32 and the accessors still hand one out.
+	// Every IPv4 value must survive the wider storage unchanged, or an IPv4 peer's identity,
+	// its wire encoding and its Kad conversion all shift together and no interface changes.
+	static const uint32_t values = {
+		0x0100007Fu, 0x010200C0u, 0xFFFFFFFFu, 0x00000001u, 0x01000000u, 0x2A2A2A2Au
+	};
+	static const size_t count = sizeof(values) / sizeof(values0);
+
+	for (size_t i = 0; i < count; ++i) {
+		const CNetworkAddress address = CNetworkAddress::FromIPv4NetworkOrderOrAbsent(valuesi);
+		ASSERT_TRUE(address.IsPresent());
+		ASSERT_TRUE(IsIndexable(address));
+		ASSERT_EQUALS(valuesi, address.ToIPv4NetworkOrderOrZero());
+		// And the identity key of an IPv4 peer is the IPv4 address itself:
+		// grouping is byte-for-byte what the 32-bit multimap did.
+		ASSERT_TRUE(IndexKey(address) == address);
+	}
+
+	// Zero still means "unknown" at the 32-bit boundary, and reads back as zero on the way out.
+	// This is the pre-existing behaviour of a client with no address, and it is unchanged by
+	// having somewhere wider to store one.
+	const CNetworkAddress unknown = CNetworkAddress::FromIPv4NetworkOrderOrAbsent(0);
+	ASSERT_TRUE(unknown.IsAbsent());
+	ASSERT_FALSE(IsIndexable(unknown));
+	ASSERT_EQUALS(0u, unknown.ToIPv4NetworkOrderOrZero());
+}
+
+TEST(PeerAddressing, NativeIPv6HasNoThirtyTwoBitForm)
+{
+	// The guarantee that stops a fabricated address reaching Kad, the ed2k wire or an
+	// obfuscation key: the narrowing fails and leaves the caller's variable alone.
+	const CNetworkAddress v6 = CNetworkAddress::FromString("2001:db8::1");
+	uint32_t scratch = 0xDEADBEEFu;
+	ASSERT_FALSE(v6.ToIPv4NetworkOrder(scratch));
+	ASSERT_EQUALS(0xDEADBEEFu, scratch);
+	ASSERT_FALSE(v6.ToIPv4HostOrder(scratch));
+	ASSERT_EQUALS(0xDEADBEEFu, scratch);
+}
+
+// Inbound datagram routing
+
+TEST(PeerAddressing, DatagramRoutingTable)
+{
+	const struct
+	{
+		const char *address;
+		std::uint16_t port;
+		EUdpRoute expected;
+	} cases = { { "", 4672, EUdpRoute::Reject },
+		{ "0.0.0.0", 4672, EUdpRoute::Reject },
+		{ "::", 4672, EUdpRoute::Reject },
+		{ "0:0:0:0:0:0:0:0", 4672, EUdpRoute::Reject },
+		{ "::0.0.0.0", 4672, EUdpRoute::Reject },
+		{ "::ffff:0.0.0.0", 4672, EUdpRoute::Reject },
+		{ "::ffff:0:0", 4672, EUdpRoute::Reject },
+		{ "0:0:0:0:0:ffff:0:0", 4672, EUdpRoute::Reject },
+		{ "::%1", 4672, EUdpRoute::Reject },
+		{ "::ffff:0.0.0.0%1", 4672, EUdpRoute::Reject },
+		{ "192.0.2.1", 0, EUdpRoute::Reject },
+		{ "::ffff:192.0.2.1", 0, EUdpRoute::Reject },
+		{ "2606:4700::1111", 0, EUdpRoute::Reject },
+		{ "192.0.2.1", 4672, EUdpRoute::Ed2kAndKad },
+		{ "::ffff:192.0.2.1", 65535, EUdpRoute::Ed2kAndKad },
+		{ "2606:4700::1111", 4672, EUdpRoute::Ed2kOnly },
+		{ "fe80::1", 4672, EUdpRoute::Ed2kOnly } };
+	for (const auto &entry : cases) {
+		const auto address = CNetworkAddress::FromString(entry.address);
+		if (entry.address0 != '\0') {
+			ASSERT_TRUE(address.IsPresent());
+		}
+		ASSERT_TRUE(ClassifyUdpPeer({ address, entry.port }) == entry.expected);
+	}
+}
+
+TEST(PeerAddressing, Ed2kUdpObfuscationNeedsAThirtyTwoBitPeer)
+{
+	// The ed2k UDP obfuscation key is MD5 over our user hash, a 32-bit address and a magic byte
+	// (EncryptedDatagramSocket.cpp). There is no IPv6 input to that key in the protocol, so an
+	// obfuscated ed2k datagram from a native IPv6 peer cannot be decrypted -- by anyone, not
+	// just by this build. The boundary is reported rather than papered over with a zero, which
+	// would derive a wrong key and read the packet as junk without saying why.
+	ASSERT_TRUE(SupportsEd2kUdpObfuscation(CNetworkAddress::FromString("192.0.2.1")));
+	ASSERT_TRUE(SupportsEd2kUdpObfuscation(CNetworkAddress::FromString("::ffff:192.0.2.1")));
+	ASSERT_FALSE(SupportsEd2kUdpObfuscation(CNetworkAddress::FromString("2001:db8::1")));
+	ASSERT_FALSE(SupportsEd2kUdpObfuscation(CNetworkAddress::Absent()));
+	// The zero the key derivation must never see, in both spellings.
+	ASSERT_FALSE(SupportsEd2kUdpObfuscation(CNetworkAddress::FromString("0.0.0.0")));
+	ASSERT_FALSE(SupportsEd2kUdpObfuscation(CNetworkAddress::FromString("::ffff:0.0.0.0")));
+}
+
+// Rate-limit scope
+
+TEST(PeerAddressing, IPv4RateLimitScopeIsTheAddress)
+{
+	// Unchanged from the 32-bit throttle: one address, one budget. Neighbours are not
+	// aggregated, so a shared IPv4 address is the only thing that shares a budget -- which is
+	// what it meant before.
+	const CNetworkAddress a = CNetworkAddress::FromString("192.0.2.1");
+	const CNetworkAddress b = CNetworkAddress::FromString("192.0.2.2");
+
+	ASSERT_TRUE(RateLimitScope(a) == a);
+	ASSERT_TRUE(RateLimitScope(a) != RateLimitScope(b));
+
+	// The mapped spelling shares the IPv4 budget: it is the same host over the
+	// same family, and a peer must not double its allowance by respelling.
+	ASSERT_TRUE(RateLimitScope(CNetworkAddress::FromString("::ffff:192.0.2.1")) == a);
+
+	// Absence has no budget, because it identifies nobody.
+	ASSERT_TRUE(RateLimitScope(CNetworkAddress::Absent()).IsAbsent());
+}
+
+TEST(PeerAddressing, IPv6RateLimitScopeAggregatesAtSixtyFour)
+{
+	// The decision this change had to make. A /128 budget under IPv6 throttles nothing: a
+	// subscriber holding a /64 sources each request from a fresh address and every one of them
+	// looks like a first offence. Aggregating at /64 restores the IPv4 meaning of the limit --
+	// one subscriber, one budget.
+	ASSERT_EQUALS(64u, kIPv6RateLimitPrefixBits);
+
+	const CNetworkAddress first = CNetworkAddress::FromString("2001:db8:1:2::1");
+	const CNetworkAddress second = CNetworkAddress::FromString("2001:db8:1:2:ffff:ffff:ffff:ffff");
+	const CNetworkAddress neighbour = CNetworkAddress::FromString("2001:db8:1:3::1");
+
+	// Same /64: one budget.
+	ASSERT_TRUE(RateLimitScope(first) == RateLimitScope(second));
+	// The scope is the prefix itself, host bits cleared.
+	ASSERT_TRUE(RateLimitScope(first) == CNetworkAddress::FromString("2001:db8:1:2::"));
+
+	// A different /64 is a different subscriber and keeps its own budget. This is the other
+	// half of the decision: aggregating at /48 or /56 would put unrelated customers of one
+	// provider in a single bucket, where one of them could lock out the rest.
+	ASSERT_TRUE(RateLimitScope(first) != RateLimitScope(neighbour));
+
+	// An IPv6 scope never collides with an IPv4 one.
+	ASSERT_TRUE(RateLimitScope(first) != RateLimitScope(CNetworkAddress::FromString("192.0.2.1")));
+}
+
+// Direct reachability
+
+TEST(PeerAddressing, GlobalIPv6PeerIsDirectlyReachable)
+{
+	// LowID is an IPv4-with-NAT concept: a peer that cannot accept an inbound connection,
+	// inferred from an ed2k ID a server issued. An IPv6 peer has no ed2k ID at all, so the ID
+	// says nothing about it, and a globally routable IPv6 address is exactly the case where a
+	// callback is neither needed nor possible.
+	ASSERT_TRUE(IsDirectlyReachable(CNetworkAddress::FromString("2606:4700::1111")));
+	ASSERT_FALSE(IsDirectlyReachable(CNetworkAddress::FromString("2001:db8::1")));
+
+	// Addresses aMule cannot dial from here, so they prove nothing about
+	// reachability and must not suppress the callback path.
+	ASSERT_FALSE(IsDirectlyReachable(CNetworkAddress::FromString("fe80::1")));
+	ASSERT_FALSE(IsDirectlyReachable(CNetworkAddress::FromString("fc00::1")));
+	ASSERT_FALSE(IsDirectlyReachable(CNetworkAddress::FromString("::1")));
+	ASSERT_FALSE(IsDirectlyReachable(CNetworkAddress::FromString("::")));
+	ASSERT_FALSE(IsDirectlyReachable(CNetworkAddress::Absent()));
+
+	// IPv4, mapped or not, is left to the existing ed2k ID rule: this predicate
+	// answers only for the family the ID cannot describe.
+	ASSERT_FALSE(IsDirectlyReachable(CNetworkAddress::FromString("192.0.2.1")));
+	ASSERT_FALSE(IsDirectlyReachable(CNetworkAddress::FromString("::ffff:192.0.2.1")));
+}
+
+TEST(PeerAddressing, RateLimitScopeMembersAreContiguousInTheIndexOrder)
+{
+	// Prefix members remain contiguous in the canonical index's address order.
+	// This is an ordering contract, not production rate-limit integration.
+	CCanonicalPeerIndex<int> index;
+
+	static const char *const addresses = { // Inside the /64 under test, deliberately out of order.
+		"2001:db8:1:2:ffff:ffff:ffff:ffff",
+		"2001:db8:1:2::",
+		"2001:db8:1:2:8000::1",
+		// Immediately outside it, on both sides.
+		"2001:db8:1:1:ffff:ffff:ffff:ffff",
+		"2001:db8:1:3::",
+		// Far away, and in the other family.
+		"2001:db8:9::1",
+		"192.0.2.1",
+		"255.255.255.255"
+	};
+	static const size_t count = sizeof(addresses) / sizeof(addresses0);
+	for (size_t i = 0; i < count; ++i) {
+		const CNetworkAddress address = CNetworkAddress::FromString(addressesi);
+		ASSERT_TRUE(address.IsPresent());
+		index.Insert(address, (int)i);
+	}
+
+	const CNetworkAddress scope = RateLimitScope(CNetworkAddress::FromString("2001:db8:1:2::5"));
+	ASSERT_TRUE(scope == CNetworkAddress::FromString("2001:db8:1:2::"));
+
+	size_t visited = 0;
+	for (auto it = index.lower_bound(scope); it != index.end(); ++it) {
+		if (RateLimitScope(it->first) != scope) {
+			break;
+		}
+		++visited;
+	}
+	// Exactly the three members, and the walk was not cut short by the
+	// neighbouring /64 sorting in between them.
+	ASSERT_EQUALS((size_t)3, visited);
+}
+
+TEST(PeerAddressing, Ed2kWireFormIsWhatMayBePublished)
+{
+	// Source exchange, the .part.met.seeds record and the relayed callback all carry a peer as
+	// a 32-bit address. A native IPv6 peer has none, and the only correct thing to do with it
+	// in those formats is to leave it out: a zero there would publish 0.0.0.0 as a source to
+	// every peer that asked, and persist it for the next start to dial.
+	//
+	// This matters more after the widening than before it. An IPv6 peer used to be excluded
+	// from those paths incidentally, by having no ed2k id and so reading as LowID. It is now
+	// correctly HighID, so the exclusion has to be this explicit test instead.
+	ASSERT_TRUE(HasEd2kWireForm(CNetworkAddress::FromString("192.0.2.1")));
+	ASSERT_TRUE(HasEd2kWireForm(CNetworkAddress::FromString("::ffff:192.0.2.1")));
+	ASSERT_FALSE(HasEd2kWireForm(CNetworkAddress::FromString("2001:db8::1")));
+	ASSERT_FALSE(HasEd2kWireForm(CNetworkAddress::Absent()));
+
+	// The zero, in both spellings. It narrows successfully, which is why the old test passed
+	// it, but zero is the value the comment above says must never be written into these
+	// fields. Naming nobody is not the same as having a 32-bit form.
+	ASSERT_FALSE(HasEd2kWireForm(CNetworkAddress::FromString("0.0.0.0")));
+	ASSERT_FALSE(HasEd2kWireForm(CNetworkAddress::FromString("::ffff:0.0.0.0")));
+
+	// A peer that may be published is published with exactly the bytes it had before the
+	// widening -- the mapped spelling included, which narrows to its embedded IPv4 rather than
+	// to something new.
+	uint32_t wire = 0;
+	ASSERT_TRUE(CNetworkAddress::FromString("192.0.2.1").ToIPv4NetworkOrder(wire));
+	ASSERT_EQUALS(0x010200C0u, wire);
+	uint32_t mappedWire = 0;
+	ASSERT_TRUE(CNetworkAddress::FromString("::ffff:192.0.2.1").ToIPv4NetworkOrder(mappedWire));
+	ASSERT_EQUALS(wire, mappedWire);
+}
+
+// UDP source ports
+
+TEST(PeerAddressing, UnknownUDPPortIdentifiesNobody)
+{
+	// A client we know by address has a UDP port only if it advertised one, and zero is how "it
+	// never did" is spelled. Comparing that zero for equality would make every such client a
+	// candidate for a datagram whose source port is also zero -- and behind a carrier NAT one
+	// address is many peers, so the match would name an arbitrary one of them. The rendezvous
+	// relay vouches for whoever this lookup returns, so the unknown side has to lose.
+	const auto address = CNetworkAddress::FromString("192.0.2.1");
+	ASSERT_FALSE(MatchesUdpSource({ address, 0 }, { address, 0 }));
+	ASSERT_FALSE(MatchesUdpSource({ address, 0 }, { address, 4672 }));
+	ASSERT_FALSE(MatchesUdpSource({ address, 4672 }, { address, 0 }));
+}
+
+TEST(PeerAddressing, AdvertisedUDPPortMatchesOnlyItself)
+{
+	// The ordinary case, and the reason this predicate exists at all: the port a peer
+	// advertised for UDP is not the ed2k TCP port it also advertised, so a lookup comparing the
+	// wrong one of the two answers "unknown peer" for every real peer while looking like it
+	// works.
+	const auto address = CNetworkAddress::FromString("192.0.2.1");
+	const auto mapped = CNetworkAddress::FromString("::ffff:192.0.2.1");
+	const auto other = CNetworkAddress::FromString("192.0.2.2");
+	ASSERT_TRUE(MatchesUdpSource({ address, 4672 }, { address, 4672 }));
+	ASSERT_FALSE(MatchesUdpSource({ address, 4672 }, { address, 4662 }));
+	ASSERT_TRUE(MatchesUdpSource({ address, 65535 }, { address, 65535 }));
+	ASSERT_TRUE(MatchesUdpSource({ address, 4672 }, { mapped, 4672 }));
+	ASSERT_TRUE(MatchesUdpSource({ mapped, 4672 }, { address, 4672 }));
+	ASSERT_FALSE(MatchesUdpSource({ address, 4672 }, { other, 4672 }));
+	ASSERT_FALSE(MatchesUdpSource({ CNetworkAddress::Absent(), 4672 }, { address, 4672 }));
+	for (const char *text : { "", "0.0.0.0", "::", "::ffff:0.0.0.0" }) {
+		const auto invalid = CNetworkAddress::FromString(text);
+		ASSERT_FALSE(MatchesUdpSource({ invalid, 4672 }, { invalid, 4672 }));
+	}
+	const auto v6 = CNetworkAddress::FromString("2606:4700::1111");
+	ASSERT_TRUE(MatchesUdpSource({ v6, 4672 }, { v6, 4672 }));
+	ASSERT_FALSE(MatchesUdpSource({ v6, 4672 }, { address, 4672 }));
+	ASSERT_FALSE(MatchesUdpSource({ CNetworkAddress::FromString("fe80::1%1"), 4672 },
+		{ CNetworkAddress::FromString("fe80::1%2"), 4672 }));
+}
+
+TEST(PeerAddressing, TagIdentityTable)
+{
+	// A wire tag carries sixteen bytes and no scope id, so an address that needs one to be
+	// meaningful arrives here as a second identity for a peer the socket already named.
+	const struct
+	{
+		const char *label;
+		const char *address;
+		bool usable;
+	} cases = {
+		{ "global unicast", "2001:4860:4860::8888", true },
+		{ "documentation range is not routable", "2001:db8::1", false },
+		{ "link-local, the case that splits an identity", "fe80::1", false },
+		{ "unique-local", "fd00::1", false },
+		{ "loopback", "::1", false },
+		{ "unspecified", "::", false },
+		{ "IPv4-mapped is not an IPv6 identity", "::ffff:192.0.2.1", false },
+		{ "NAT64", "64:ff9b::192.0.2.1", false },
+		{ "plain IPv4 never reaches this edge", "192.0.2.1", false },
+		{ "absent", "", false },
+	};
+	for (const auto &row : cases) {
+		const CNetworkAddress address = row.address0 == '\0'
+							? CNetworkAddress::Absent()
+							: CNetworkAddress::FromString(row.address);
+		CFormat format("%s: %s expected usable=%u");
+		const wxString message = format % row.label % row.address % unsigned(row.usable);
+		ASSERT_EQUALS_M(row.usable, IsUsableTagIdentity(address), message);
+	}
+}
+
+TEST(PeerAddressing, TheSameLinkLocalPeerWouldBeTwoIdentities)
+{
+	// The defect the rule exists to prevent, stated as values: the socket knows the scope,
+	// the tag cannot carry it, and the two forms are not equal. Dropping the scope from
+	// IndexKey() is not the alternative -- these two are different peers.
+	const CNetworkAddress fromSocket = CNetworkAddress::FromString("fe80::1%3");
+	const CNetworkAddress fromTag = CNetworkAddress::FromString("fe80::1");
+	ASSERT_FALSE(IndexKey(fromSocket) == IndexKey(fromTag));
+
+	const CNetworkAddress otherInterface = CNetworkAddress::FromString("fe80::1%9");
+	ASSERT_FALSE(IndexKey(fromSocket) == IndexKey(otherInterface));
+
+	// So the tag form is refused rather than stored beside the socket's.
+	ASSERT_FALSE(IsUsableTagIdentity(fromTag));
+}
+
+// File_checked_for_headers

amule-3.1.0.tar.gz/unittests/tests/PeerCapabilitiesTest.cpp Added

@@ -0,0 +1,334 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// The CT_MOD_MISCOPTIONS bit positions are wire format shared with eMuleAI, and getting one wrong
+// has no runtime signal: aMule would claim a transport it does not implement, the peer would open a
+// handshake, and the handshake would simply never complete. So the positions are pinned here as
+// literal words rather than restated from the enum -- a test that reads the same enum it is
+// checking cannot catch a renumbering.
+//
+// The reference is eMuleAI's UModMiscOptions union, srchybrid/Opcodes.h:710.
+//
+// CUpDownClient reaches theApp and cannot be linked into a unit test, which is why the capability
+// model lives in a header of its own.
+
+#include <muleunit/test.h>
+
+#include <PeerCapabilities.h>
+
+// The unknown-tag-tolerance test below reads a tag stream through exactly the classes
+// CUpDownClient::ProcessHelloTypePacket() uses. CUpDownClient itself cannot be linked here, but the
+// property that matters is a wire property rather than a client one: an unknown tag must consume
+// its own bytes.
+#include <tags/ClientTags.h>
+#include <tags/FileTags.h>
+#include "MemFile.h"
+#include "Tag.h"
+
+#include <cstring>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(PeerCapabilities)
+
+// Each bit, alone, at the position eMuleAI puts it. Literal words on purpose.
+TEST(PeerCapabilities, BitPositionsAreExact)
+{
+	ASSERT_EQUALS(0x00000001u, (uint32_t)MOD_MISCOPT_EXTENDED_XS);
+	ASSERT_EQUALS(0x00000002u, (uint32_t)MOD_MISCOPT_NAT_TRAVERSAL);
+	ASSERT_EQUALS(0x00000004u, (uint32_t)MOD_MISCOPT_IPV6);
+	ASSERT_EQUALS(0x00000008u, (uint32_t)MOD_MISCOPT_SERVING_BUDDY_PULL);
+	ASSERT_EQUALS(0x00000010u, (uint32_t)MOD_MISCOPT_NAT_TRAVERSAL_QUIC);
+	ASSERT_EQUALS(0x0000001Fu, MOD_MISCOPT_KNOWN_MASK);
+}
+
+// One decoded flag per bit, so a rotation of the enum shows up as a wrong
+// accessor rather than as a still-passing mask test.
+TEST(PeerCapabilities, EachBitDecodesToItsOwnAccessor)
+{
+	CPeerCapabilities caps;
+
+	caps.SetFromWire(0x00000001u);
+	ASSERT_TRUE(caps.SupportsExtendedSourceExchange());
+	ASSERT_FALSE(caps.SupportsNatTraversal());
+	ASSERT_FALSE(caps.SupportsIPv6());
+	ASSERT_FALSE(caps.SupportsServingBuddyPull());
+	ASSERT_FALSE(caps.SupportsNatTraversalQuic());
+
+	caps.SetFromWire(0x00000002u);
+	ASSERT_FALSE(caps.SupportsExtendedSourceExchange());
+	ASSERT_TRUE(caps.SupportsNatTraversal());
+	ASSERT_FALSE(caps.SupportsIPv6());
+	ASSERT_FALSE(caps.SupportsServingBuddyPull());
+	ASSERT_FALSE(caps.SupportsNatTraversalQuic());
+
+	caps.SetFromWire(0x00000004u);
+	ASSERT_FALSE(caps.SupportsExtendedSourceExchange());
+	ASSERT_FALSE(caps.SupportsNatTraversal());
+	ASSERT_TRUE(caps.SupportsIPv6());
+	ASSERT_FALSE(caps.SupportsServingBuddyPull());
+	ASSERT_FALSE(caps.SupportsNatTraversalQuic());
+
+	caps.SetFromWire(0x00000008u);
+	ASSERT_FALSE(caps.SupportsExtendedSourceExchange());
+	ASSERT_FALSE(caps.SupportsNatTraversal());
+	ASSERT_FALSE(caps.SupportsIPv6());
+	ASSERT_TRUE(caps.SupportsServingBuddyPull());
+	ASSERT_FALSE(caps.SupportsNatTraversalQuic());
+
+	caps.SetFromWire(0x00000010u);
+	ASSERT_FALSE(caps.SupportsExtendedSourceExchange());
+	ASSERT_FALSE(caps.SupportsNatTraversal());
+	ASSERT_FALSE(caps.SupportsIPv6());
+	ASSERT_FALSE(caps.SupportsServingBuddyPull());
+	ASSERT_TRUE(caps.SupportsNatTraversalQuic());
+}
+
+// The scenario from the spec delta: a peer that advertises IPv6 and QUIC NAT-T
+// and nothing else. 0x14 == bit 2 | bit 4.
+TEST(PeerCapabilities, PeerAdvertisingIPv6AndQuic)
+{
+	CPeerCapabilities caps;
+	caps.SetFromWire(0x00000014u);
+
+	ASSERT_TRUE(caps.SupportsIPv6());
+	ASSERT_TRUE(caps.SupportsNatTraversalQuic());
+	ASSERT_FALSE(caps.SupportsExtendedSourceExchange());
+	ASSERT_FALSE(caps.SupportsNatTraversal());
+	ASSERT_FALSE(caps.SupportsServingBuddyPull());
+}
+
+// Round-trip: the fixture encoding all five documented bits survives
+// decode -> encode unchanged.
+TEST(PeerCapabilities, RoundTripsEveryKnownBit)
+{
+	for (uint32_t bits = 0; bits <= MOD_MISCOPT_KNOWN_MASK; ++bits) {
+		CPeerCapabilities caps;
+		caps.SetFromWire(bits);
+		ASSERT_EQUALS(bits, caps.KnownBits());
+	}
+}
+
+// Reserved bits 5..31 carry no meaning yet. A peer setting bit 7 must not produce a capability, and
+// must not survive a re-encode either -- otherwise aMule would relay a claim it cannot interpret.
+TEST(PeerCapabilities, ReservedBitsAreMaskedOff)
+{
+	CPeerCapabilities caps;
+	caps.SetFromWire(0x00000080u); // bit 7
+
+	ASSERT_TRUE(caps.IsEmpty());
+	ASSERT_EQUALS(0x00000000u, caps.KnownBits());
+	ASSERT_FALSE(caps.SupportsExtendedSourceExchange());
+	ASSERT_FALSE(caps.SupportsNatTraversal());
+	ASSERT_FALSE(caps.SupportsIPv6());
+	ASSERT_FALSE(caps.SupportsServingBuddyPull());
+	ASSERT_FALSE(caps.SupportsNatTraversalQuic());
+
+	// All reserved bits at once, plus every known bit: only the known five
+	// come back out.
+	caps.SetFromWire(0xFFFFFFFFu);
+	ASSERT_EQUALS(MOD_MISCOPT_KNOWN_MASK, caps.KnownBits());
+}
+
+TEST(PeerCapabilities, DoesNotAdvertiseIncompleteNatTraversal)
+{
+	ASSERT_EQUALS(0x00000000u, LocalAdvertisedModMiscOptions());
+}
+
+// Setters exist for the advertise side; they must land on the same bits the
+// decoder reads, or the two halves drift.
+TEST(PeerCapabilities, SetterAndDecoderAgree)
+{
+	CPeerCapabilities caps;
+
+	caps.Set(MOD_MISCOPT_IPV6, true);
+	caps.Set(MOD_MISCOPT_NAT_TRAVERSAL_QUIC, true);
+	ASSERT_EQUALS(0x00000014u, caps.KnownBits());
+
+	caps.Set(MOD_MISCOPT_IPV6, false);
+	ASSERT_EQUALS(0x00000010u, caps.KnownBits());
+
+	caps.Reset();
+	ASSERT_TRUE(caps.IsEmpty());
+}
+
+// A peer that claims nothing produces an empty string, not a word. That is the contract the client
+// details dialog hides its row on, so it is pinned here rather than left to the dialog: a version
+// of this that returned "None" would put a permanent, meaningless row in front of nearly every
+// user, and the dialog could not tell that apart from a real claim.
+//
+// Reserved bits go the same way: they are masked off, so a peer setting only bit 7 claims nothing
+// and reads as nothing.
+TEST(PeerCapabilities, ClaimingNothingDisplaysAsEmpty)
+{
+	CPeerCapabilities caps;
+	ASSERT_TRUE(caps.GetDisplayText().IsEmpty());
+
+	caps.SetFromWire(0x00000000u);
+	ASSERT_TRUE(caps.GetDisplayText().IsEmpty());
+
+	caps.SetFromWire(0x00000080u); // reserved bit 7 only
+	ASSERT_TRUE(caps.GetDisplayText().IsEmpty());
+}
+
+// Each bit's name, one bit at a time, so the display table is pinned to the positions rather than
+// to the order it happens to be written in. The names are marked for translation, so these are the
+// msgids -- a test binary loads no catalog, and it is the pairing that matters here, not the
+// wording.
+TEST(PeerCapabilities, EachBitDisplaysItsOwnName)
+{
+	CPeerCapabilities caps;
+
+	caps.SetFromWire(MOD_MISCOPT_EXTENDED_XS);
+	ASSERT_EQUALS(wxString("Extended source exchange"), caps.GetDisplayText());
+
+	caps.SetFromWire(MOD_MISCOPT_NAT_TRAVERSAL);
+	ASSERT_EQUALS(wxString("NAT traversal (uTP)"), caps.GetDisplayText());
+
+	caps.SetFromWire(MOD_MISCOPT_IPV6);
+	ASSERT_EQUALS(wxString("IPv6"), caps.GetDisplayText());
+
+	caps.SetFromWire(MOD_MISCOPT_SERVING_BUDDY_PULL);
+	ASSERT_EQUALS(wxString("Buddy info pull"), caps.GetDisplayText());
+
+	caps.SetFromWire(MOD_MISCOPT_NAT_TRAVERSAL_QUIC);
+	ASSERT_EQUALS(wxString("NAT traversal (QUIC)"), caps.GetDisplayText());
+
+	// All five at once: comma-separated, in table order, no trailing comma.
+	caps.SetFromWire(MOD_MISCOPT_KNOWN_MASK);
+	ASSERT_EQUALS(wxString("Extended source exchange, NAT traversal (uTP), IPv6, "
+			       "Buddy info pull, NAT traversal (QUIC)"),
+		caps.GetDisplayText());
+}
+
+// The "ip6" / "bi6" Kad tags carry a 128-bit address as 32 hex characters, big-endian -- eMuleAI
+// writes them with CUInt128::ToHexString() and reads them back with strmd4(). Anything that is not
+// exactly 32 hex characters is a malformed tag, not a shorter address.
+TEST(PeerCapabilities, DecodesIPv6HexTag)
+{
+	uint8_t out16;
+
+	const char *loopback = "00000000000000000000000000000001";
+	ASSERT_TRUE(DecodeIPv6HexTag(loopback, 32, out));
+	for (int i = 0; i < 15; ++i) {
+		ASSERT_EQUALS(0, (int)outi);
+	}
+	ASSERT_EQUALS(1, (int)out15);
+
+	// 2001:db8::dead:beef -- mixed case accepted, byte order big-endian.
+	const char *documented = "20010DB80000000000000000DeAdBeeF";
+	ASSERT_TRUE(DecodeIPv6HexTag(documented, 32, out));
+	ASSERT_EQUALS(0x20, (int)out0);
+	ASSERT_EQUALS(0x01, (int)out1);
+	ASSERT_EQUALS(0x0D, (int)out2);
+	ASSERT_EQUALS(0xB8, (int)out3);
+	ASSERT_EQUALS(0xDE, (int)out12);
+	ASSERT_EQUALS(0xAD, (int)out13);
+	ASSERT_EQUALS(0xBE, (int)out14);
+	ASSERT_EQUALS(0xEF, (int)out15);
+}
+
+TEST(PeerCapabilities, RejectsMalformedIPv6HexTag)
+{
+	uint8_t out16;
+
+	ASSERT_FALSE(DecodeIPv6HexTag("", 0, out));
+	ASSERT_FALSE(DecodeIPv6HexTag("0001", 4, out));                               // too short
+	ASSERT_FALSE(DecodeIPv6HexTag("000000000000000000000000000000012", 33, out)); // too long
+	ASSERT_FALSE(DecodeIPv6HexTag("0000000000000000000000000000000g", 32, out));  // not hex
+	ASSERT_FALSE(DecodeIPv6HexTag(NULL, 32, out));
+
+	// A space anywhere in the run is a malformed tag, not a shorter address.
+	char spaced33;
+	memset(spaced, '0', 32);
+	spaced32 = '\0';
+	spaced17 = ' ';
+	ASSERT_FALSE(DecodeIPv6HexTag(spaced, 32, out));
+}
+
+// Spec delta, "Unknown vendor tag": a tag the client does not recognise must be ignored and the
+// handshake must continue as if it were absent.
+//
+// The failure this guards against is not the ignoring -- the switch in ProcessHelloTypePacket() has
+// no default branch and has always fallen through for unknown ids. It is desynchronisation: the tag
+// loop reads a fixed count of tags, so an unknown tag whose bytes are not fully consumed shifts
+// every later tag by that much, and the hello then decodes as garbage with nothing logged. So what
+// is pinned here is that a stream of known-unknown-known survives with the third tag's value
+// intact.
+TEST(PeerCapabilities, UnknownVendorTagDoesNotDesynchroniseTheStream)
+{
+	CMemFile stream;
+
+	CTagVarInt written(CT_MOD_MISCOPTIONS, 0x00000014u, 32);
+	written.WriteTagToFile(&stream);
+
+	// 0xAB is inside the vendor range and defined by nothing aMule knows.
+	CTagString unknown(static_cast<uint8_t>(0xAB), "some future value");
+	unknown.WriteTagToFile(&stream);
+
+	CTagVarInt trailing(CT_EMULE_VERSION, 0x0A010203u, 32);
+	trailing.WriteTagToFile(&stream);
+
+	stream.Seek(0, wxFromStart);
+
+	const CTag first(stream, true);
+	ASSERT_EQUALS((int)CT_MOD_MISCOPTIONS, (int)first.GetNameID());
+	CPeerCapabilities caps;
+	caps.SetFromWire((uint32_t)first.GetInt());
+	ASSERT_TRUE(caps.SupportsIPv6());
+	ASSERT_TRUE(caps.SupportsNatTraversalQuic());
+
+	// Read and discard, exactly as the handshake does for an id it has no
+	// case for.
+	const CTag ignored(stream, true);
+	ASSERT_EQUALS(0xAB, (int)ignored.GetNameID());
+
+	// The tag after the unknown one is still where it should be. This is the
+	// assertion that fails if an unknown tag under-consumes.
+	const CTag third(stream, true);
+	ASSERT_EQUALS((int)CT_EMULE_VERSION, (int)third.GetNameID());
+	ASSERT_EQUALS(0x0A010203u, (uint32_t)third.GetInt());
+
+	// And the stream is fully consumed: no trailing bytes, so nothing
+	// over-consumed either.
+	ASSERT_EQUALS(stream.GetLength(), stream.GetPosition());
+}
+
+// The vendor tag ids and the Kad tag names are wire format shared with eMuleAI, and nothing at
+// runtime notices a wrong one: aMule would write its IPv6 address under an id the peer decodes as
+// something else, or under a name the peer never looks up, and the handshake would carry on
+// regardless. So the values are pinned here as literals -- an assertion that reads the same symbol
+// it is checking cannot catch a renumbering or a renamed tag.
+//
+// The reference is eMuleAI's srchybrid/Opcodes.h and its Kad tag names.
+TEST(PeerCapabilities, VendorTagIdsAndKadTagNamesAreExact)
+{
+	ASSERT_EQUALS(0xA0, (int)CT_EMULE_SERVINGBUDDYIPV6);
+	ASSERT_EQUALS(0xAA, (int)CT_MOD_MISCOPTIONS);
+	ASSERT_EQUALS(0xAD, (int)CT_MOD_YOUR_IP);
+	ASSERT_EQUALS(0xAE, (int)CT_MOD_IP_V6);
+
+	ASSERT_EQUALS(wxString(wxT("ip6")), wxString(TAG_IPV6));
+	ASSERT_EQUALS(wxString(wxT("bi6")), wxString(TAG_SERVINGBUDDYIPV6));
+}

amule-3.0.1.tar.gz/unittests/tests/PhpArrayTest.cpp -> amule-3.1.0.tar.gz/unittests/tests/PhpArrayTest.cpp Changed

@@ -1,14 +1,12 @@
-// Regression tests for issue #699: amuleweb crashes when the shared-file list
-// exceeds 65535 entries.
+// Regression tests for issue #699: amuleweb crashes when the shared-file list exceeds 65535
+// entries.
 //
-// array_push_back() scanned integer keys in a loop bounded by `i < 0xffff`.
-// With 91k shared files the bound is hit, the function returns null, and the
-// caller crashes on the immediate dereference.  The underlying PHP_ARRAY_TYPE
-// uses std::map (unbounded), so the 0xffff cap is purely artificial.
+// array_push_back() scanned integer keys in a loop bounded by `i < 0xffff`. With 91k shared files
+// the bound is hit, the function returns null, and the caller crashes on the immediate dereference.
+// The underlying PHP_ARRAY_TYPE uses std::map (unbounded), so the 0xffff cap is purely artificial.
 //
-// These tests exercise array_push_back() in isolation, compiled against
-// php_syntree.cpp with PHP_STANDALONE_EN so no WebServer/EC/wx-GUI headers
-// are pulled in.
+// These exercise array_push_back() in isolation, compiled against php_syntree.cpp with
+// PHP_STANDALONE_EN so no WebServer/EC/wx-GUI headers are pulled in.
 
 #include <muleunit/test.h>
 
@@ -41,17 +39,17 @@
 
 	for (int i = 0; i < 200; i++) {
 		PHP_VAR_NODE *slot = array_push_back(&arr);
-		ASSERT_TRUE_M(slot != nullptr,
-			wxString::Format(wxT("array_push_back returned null at i=%d"), i));
+		ASSERT_TRUE_M(
+			slot != nullptr, wxString::Format(wxT("array_push_back returned null at i=%d"), i));
 		slot->value.type = PHP_VAL_OBJECT;
 	}
 
 	value_value_free(&arr);
 }
 
-// Boundary: entry 65536 (index 65535) was the first to fail with the old code.
-// The loop condition `i < 0xffff` (i.e. i < 65535) prevented it from running
-// when push_next_hint == 65535, so the function returned null.
+// Boundary: entry 65536 (index 65535) was the first to fail with the old code. The loop condition
+// `i < 0xffff` prevented it from running when push_next_hint == 65535, so the function returned
+// null.
 TEST(PhpArray, PushBackAtOldBoundary)
 {
 	PHP_VALUE_NODE arr;
@@ -61,8 +59,8 @@
 	const int N = 65536; // one past the old 0xffff limit
 	for (int i = 0; i < N; i++) {
 		PHP_VAR_NODE *slot = array_push_back(&arr);
-		ASSERT_TRUE_M(slot != nullptr,
-			wxString::Format(wxT("array_push_back returned null at i=%d"), i));
+		ASSERT_TRUE_M(
+			slot != nullptr, wxString::Format(wxT("array_push_back returned null at i=%d"), i));
 		slot->value.type = PHP_VAL_OBJECT;
 	}
 
@@ -79,8 +77,8 @@
 	const int N = 92000;
 	for (int i = 0; i < N; i++) {
 		PHP_VAR_NODE *slot = array_push_back(&arr);
-		ASSERT_TRUE_M(slot != nullptr,
-			wxString::Format(wxT("array_push_back returned null at i=%d"), i));
+		ASSERT_TRUE_M(
+			slot != nullptr, wxString::Format(wxT("array_push_back returned null at i=%d"), i));
 		slot->value.type = PHP_VAL_OBJECT;
 	}

amule-3.1.0.tar.gz/unittests/tests/ProxyTest.cpp Added

@@ -0,0 +1,213 @@
+// This file is part of the aMule Project.
+// Copyright (c) 2026 aMule Team ( https://amule-org.github.io )
+// Licensed under the GNU General Public License, version 2 or later.
+
+#include <muleunit/test.h>
+#include <Proxy.h>
+#include <NetworkAddressAsio.h>
+
+#include <algorithm>
+#include <vector>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(Proxy)
+
+namespace
+{
+// Literal wire bytes: neither headers nor port expectations use the encoder.
+const std::vector<unsigned char> ipv4 = { 0, 0, 0, 1, 192, 0, 2, 7, 0x12, 0x80, 0xde, 0, 0xad };
+const std::vector<unsigned char> ipv6 = {
+	0, 0, 0, 4, 0x20, 1, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0x12, 0x80, 0xde, 0, 0xad
+};
+const std::vector<unsigned char> mapped = {
+	0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 192, 0, 2, 7, 0x12, 0x80, 0xde, 0, 0xad
+};
+
+uint32 Parse(const std::vector<unsigned char> &packet,
+	CNetworkAddress &addr,
+	uint16 &port,
+	void *output,
+	uint32 capacity)
+{
+	return ParseSocks5UDPDatagram(
+		reinterpret_cast<const char *>(packet.data()), packet.size(), addr, port, output, capacity);
+}
+
+void CheckRejected(const std::vector<unsigned char> &packet)
+{
+	auto addr = CNetworkAddress::FromString("192.0.2.99");
+	uint16 port = 1234;
+	unsigned char output5;
+	std::fill(std::begin(output), std::end(output), 0xcc);
+	ASSERT_EQUALS(0u, Parse(packet, addr, port, output, sizeof(output)));
+	ASSERT_TRUE(addr.IsAbsent());
+	ASSERT_EQUALS(0u, port);
+	for (auto byte : output) {
+		ASSERT_EQUALS(0xcc, byte);
+	}
+}
+} // namespace
+
+TEST(Proxy, IPv4IPv6AndMappedSourcesMatchSocketIngress)
+{
+	const std::vector<unsigned char> packets = { ipv4, ipv6, mapped };
+	const char *sources = { "192.0.2.7", "2001:db8::1", "::ffff:192.0.2.7" };
+	for (unsigned i = 0; i < 3; ++i) {
+		CNetworkAddress addr;
+		uint16 port = 0;
+		unsigned char output5 = { 0xcc, 0xcc, 0xcc, 0xcc, 0xcc };
+		ASSERT_EQUALS(3u, Parse(packetsi, addr, port, output + 1, 3));
+		const auto expected = NetworkAddressAsio::FromIngressAddress(
+			NetworkAddressAsio::ToAsioAddress(CNetworkAddress::FromString(sourcesi)));
+		ASSERT_TRUE(addr == expected);
+		ASSERT_EQUALS(4736u, port); // 0x1280, not 0x8012; low byte has its high bit set.
+		ASSERT_EQUALS(0xcc, output0);
+		ASSERT_EQUALS(0xde, output1);
+		ASSERT_EQUALS(0, output2);
+		ASSERT_EQUALS(0xad, output3);
+		ASSERT_EQUALS(0xcc, output4);
+		ASSERT_TRUE(i == 1 ? addr.IsIPv6() : addr.IsIPv4());
+		ASSERT_FALSE(addr.IsIPv4Mapped());
+	}
+}
+
+TEST(Proxy, EveryTruncatedHeaderIsRejected)
+{
+	for (const auto &packet : { ipv4, ipv6, mapped }) {
+		const auto headerSize = packet.size() - 3;
+		for (size_t size = 0; size < headerSize; ++size) {
+			CheckRejected(std::vector<unsigned char>(packet.begin(), packet.begin() + size));
+		}
+	}
+}
+
+TEST(Proxy, ReservedBytesAndFragmentsAreRejected)
+{
+	for (const auto &packet : { ipv4, ipv6 }) {
+		for (unsigned index = 0; index < 3; ++index) {
+			for (unsigned char value : { 1, 0x80, 0xff }) {
+				auto invalid = packet;
+				invalidindex = value;
+				CheckRejected(invalid);
+			}
+		}
+	}
+}
+
+TEST(Proxy, DomainAndUnknownAddressTypesAreRejected)
+{
+	// SOCKS5_ATYP_DOMAINNAME is refused deliberately, not left unimplemented. The name is
+	// length-prefixed, so its header has no fixed size; the code this replaced assumed a flat 262
+	// bytes and mis-offset every such datagram. If support is ever added, this row changes to an
+	// expectation rather than being deleted as an obsolete restriction.
+	CheckRejected({ 0, 0, 0, 3, 3, 'a', 'b', 'c', 0x12, 0x80, 0xde });
+	for (unsigned char type : { 0, 2, 5, 0xff }) {
+		auto invalid = ipv6;
+		invalid3 = type;
+		CheckRejected(invalid);
+	}
+}
+
+TEST(Proxy, PayloadIsBoundedByAvailableBytesAndCapacity)
+{
+	for (const auto &packet : { ipv4, ipv6, mapped }) {
+		const auto headerSize = packet.size() - 3;
+		for (unsigned availablePayload = 0; availablePayload <= 3; ++availablePayload) {
+			const std::vector<unsigned char> shortened(
+				packet.begin(), packet.begin() + headerSize + availablePayload);
+			for (unsigned capacity = 0; capacity <= 5; ++capacity) {
+				CNetworkAddress addr;
+				uint16 port = 0;
+				unsigned char output7;
+				std::fill(std::begin(output), std::end(output), 0xcc);
+				const unsigned expected = std::min(availablePayload, capacity);
+				ASSERT_EQUALS(expected, Parse(shortened, addr, port, output + 1, capacity));
+				ASSERT_TRUE(addr.IsPresent());
+				ASSERT_EQUALS(4736u, port);
+				ASSERT_EQUALS(0xcc, output0);
+				for (unsigned i = 0; i < 6; ++i) {
+					ASSERT_EQUALS(
+						i < expected ? packetheaderSize + i : 0xcc, outputi + 1);
+				}
+			}
+		}
+	}
+}
+
+TEST(Proxy, PortDecodesBothOctetsInNetworkOrder)
+{
+	for (const auto &packet : { ipv4, ipv6 }) {
+		const auto headerSize = packet.size() - 3;
+		for (unsigned expected : { 0u, 1u, 255u, 256u, 0x80ffu, 65535u }) {
+			auto input = packet;
+			inputheaderSize - 2 = expected >> 8;
+			inputheaderSize - 1 = expected & 0xff;
+			CNetworkAddress addr;
+			uint16 port = 0;
+			unsigned char output3;
+			ASSERT_EQUALS(3u, Parse(input, addr, port, output, sizeof(output)));
+			ASSERT_EQUALS(expected, port);
+		}
+	}
+}
+
+namespace
+{
+unsigned int PortOffset(const std::vector<unsigned char> &reply)
+{
+	return Socks5ReplyPortOffset(reinterpret_cast<const char *>(reply.data()), reply.size());
+}
+} // namespace
+
+TEST(Proxy, CommandReplyPortOffsetFollowsTheAddressType)
+{
+	const std::vector<unsigned char> v4 = { 5, 0, 0, 1, 192, 0, 2, 7, 0x12, 0x80 };
+	ASSERT_EQUALS(8u, PortOffset(v4));
+	// RFC 1928: VER REP RSV ATYP, one length octet, the name, then the port.
+	const std::vector<unsigned char> domain = { 5, 0, 0, 3, 3, 'a', '.', 'b', 0x12, 0x80 };
+	ASSERT_EQUALS(8u, PortOffset(domain));
+	for (const auto &reply : { v4, domain }) {
+		for (std::size_t size = 0; size < reply.size(); ++size) {
+			ASSERT_EQUALS(0u,
+				PortOffset(std::vector<unsigned char>(reply.begin(), reply.begin() + size)));
+		}
+	}
+	// The bound address is kept as IPv4, so an IPv6 or unknown one cannot be used.
+	std::vector<unsigned char> v6(22, 0);
+	v60 = 5;
+	v63 = 4;
+	ASSERT_EQUALS(0u, PortOffset(v6));
+	auto unknown = v4;
+	unknown3 = 2;
+	ASSERT_EQUALS(0u, PortOffset(unknown));
+}
+
+TEST(Proxy, AnUnspecifiedBoundAddressFallsBackToTheProxyItself)
+{
+	const auto proxy = CNetworkAddress::FromString("198.51.100.9");
+	const auto bound = CNetworkAddress::FromString("192.0.2.1");
+	ASSERT_TRUE(Socks5ExpectedRelay(bound, proxy) == bound);
+	ASSERT_TRUE(Socks5ExpectedRelay(CNetworkAddress::FromString("0.0.0.0"), proxy) == proxy);
+	// Whatever the reply named, a datagram from anywhere else is refused.
+	const auto expected = Socks5ExpectedRelay(CNetworkAddress::FromString("0.0.0.0"), proxy);
+	ASSERT_TRUE(IsFromSocks5Relay(proxy, 1080, expected, 1080));
+	ASSERT_FALSE(IsFromSocks5Relay(bound, 1080, expected, 1080));
+}
+
+TEST(Proxy, RelayDatagramsMustComeFromTheBoundRelay)
+{
+	const auto relay = CNetworkAddress::FromString("192.0.2.1");
+	ASSERT_TRUE(IsFromSocks5Relay(relay, 1080, relay, 1080));
+	ASSERT_TRUE(IsFromSocks5Relay(CNetworkAddress::FromString("::ffff:192.0.2.1"), 1080, relay, 1080));
+	ASSERT_FALSE(IsFromSocks5Relay(relay, 1081, relay, 1080));
+	ASSERT_FALSE(IsFromSocks5Relay(CNetworkAddress::FromString("192.0.2.2"), 1080, relay, 1080));
+	ASSERT_FALSE(IsFromSocks5Relay(CNetworkAddress::Absent(), 1080, relay, 1080));
+	// A relay reported as 0.0.0.0 pins only the port.
+	const auto any = CNetworkAddress::FromString("0.0.0.0");
+	ASSERT_TRUE(IsFromSocks5Relay(CNetworkAddress::FromString("198.51.100.9"), 1080, any, 1080));
+	ASSERT_FALSE(IsFromSocks5Relay(CNetworkAddress::FromString("198.51.100.9"), 1081, any, 1080));
+	ASSERT_FALSE(IsFromSocks5Relay(CNetworkAddress::Absent(), 1080, any, 1080));
+}
+
+// File_checked_for_headers

amule-3.1.0.tar.gz/unittests/tests/PublicIPv6CorroborationTest.cpp Added

@@ -0,0 +1,531 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// CT_MOD_YOUR_IP (0xAD) carries a peer's opinion of our own public address. eMuleAI believes the
+// first peer that offers one; emule-qt does not, and neither does this.
+//
+// Two separate rules are under test, and they carry different weight:
+//
+//  - Peers are unauthenticated, so a claim for an address this machine does not hold must never be
+// believed however many peers repeat it. That is the security control, and it bounds the damage to
+// "picks the wrong one of our own addresses".
+//  - Among addresses we do hold, one voice is never enough, one host cannot be several voices by
+// repeating itself, and a voice goes quiet after a while.
+//
+// The rules have no runtime signal if they are wrong. A client that accepts a bad address for
+// itself does not fail -- it goes on working, publishing an address nobody can reach -- so the
+// tests have to state the rule rather than wait for a symptom.
+//
+// CUpDownClient reaches theApp and cannot be linked into a unit test, so the tracker lives in a
+// header of its own, like CPeerCapabilities.
+
+#include <muleunit/test.h>
+
+#include <PublicIPv6Corroboration.h>
+
+#include <cstring>
+#include <vector>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(PublicIPv6Corroboration)
+
+namespace
+{
+
+typedef CPublicIPv6Corroboration::Address Address;
+
+// 2001:db8::<last>, the documentation prefix -- global unicast, so it passes the address-family
+// gate and only the locally-assigned gate is under test. The last byte is the only thing that
+// varies, so two addresses differ in a single byte, the case a byte-wise comparison is most likely
+// to get wrong.
+Address MakeAddress(uint8_t last)
+{
+	Address address = {};
+	address0 = 0x20;
+	address1 = 0x01;
+	address2 = 0x0d;
+	address3 = 0xb8;
+	address15 = last;
+	return address;
+}
+
+// 203.0.113.<host>, host order, as GetConnectIP() would report it.
+uint32_t MakeObserver(uint8_t host)
+{
+	return 0xCB007100u | host;
+}
+
+// An address with the given leading bytes and nothing else set. Used for the
+// prefixes that are not global unicast, which no peer may ever reflect at us.
+Address MakePrefixed(uint8_t first, uint8_t second)
+{
+	Address address = {};
+	address0 = first;
+	address1 = second;
+	return address;
+}
+
+std::vector<Address> Held(const Address &one)
+{
+	std::vector<Address> local;
+	local.push_back(one);
+	return local;
+}
+
+std::vector<Address> Held(const Address &one, const Address &two)
+{
+	std::vector<Address> local;
+	local.push_back(one);
+	local.push_back(two);
+	return local;
+}
+
+// An arbitrary non-zero start, so a test that forgets to advance the clock
+// cannot pass by accident on a zero-initialised timestamp.
+const uint64_t START_MS = 5000;
+
+} // namespace
+
+// The threshold is a policy decision, not an implementation detail: raising or lowering it changes
+// how much a stranger's word is worth. Pinned as a literal so the change has to be deliberate.
+TEST(PublicIPv6Corroboration, ThresholdIsThreeDistinctObservers)
+{
+	ASSERT_EQUALS(3u, (unsigned)PUBLIC_IPV6_CORROBORATION_THRESHOLD);
+}
+
+// Same for the window: it is the upper bound on how long a claim nobody repeats keeps counting, and
+// shortening or lengthening it changes how long a stale address can survive.
+TEST(PublicIPv6Corroboration, WindowIsThirtyMinutes)
+{
+	ASSERT_EQUALS((uint64_t)(30 * 60 * 1000), (uint64_t)PUBLIC_IPV6_CORROBORATION_WINDOW_MS);
+}
+
+// The security control. A quorum -- more than the threshold, from distinct observers, all agreeing
+// -- must still not make us adopt an address this machine does not hold. Corroboration
+// disambiguates between our own addresses; it does not confer ownership of somebody else's.
+TEST(PublicIPv6Corroboration, AQuorumCannotAdoptAnAddressWeDoNotHold)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address ours = MakeAddress(0x01);
+	const Address foreign = MakeAddress(0x02);
+	tracker.SetLocalAddresses(Held(ours), START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD + 5; ++i) {
+		ASSERT_FALSE(tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), foreign.data(), START_MS));
+	}
+
+	ASSERT_FALSE(tracker.IsCorroborated());
+	ASSERT_TRUE(tracker.CorroboratedAddress() == nullptr);
+}
+
+// A rejected claim must cost nothing to hold. If it allocated a candidate, a peer could spend our
+// memory on values it invented at one claim each, which is the whole reason the filter comes first.
+TEST(PublicIPv6Corroboration, ARejectedClaimLeavesNoTrace)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address ours = MakeAddress(0xFF);
+	tracker.SetLocalAddresses(Held(ours), START_MS);
+
+	for (unsigned i = 0; i < 256; ++i) {
+		const Address invented = MakeAddress((uint8_t)i);
+		if (invented == ours) {
+			continue;
+		}
+		tracker.AddClaim(MakeObserver((uint8_t)i), invented.data(), START_MS);
+	}
+
+	ASSERT_EQUALS(0u, (unsigned)tracker.CandidateCount());
+	ASSERT_FALSE(tracker.IsCorroborated());
+}
+
+// Nothing outside 2000::/3 could be an address the outside world saw us arrive from, so none of it
+// is a legitimate reflection -- not even if the same bytes somehow turned up in the locally-
+// assigned list.
+TEST(PublicIPv6Corroboration, AddressesOutsideGlobalUnicastAreRejected)
+{
+	const Address unspecified = MakePrefixed(0x00, 0x00);
+	Address loopback = MakePrefixed(0x00, 0x00);
+	loopback15 = 0x01;
+	const Address linkLocal = MakePrefixed(0xfe, 0x80);
+	const Address uniqueLocal = MakePrefixed(0xfd, 0x00);
+	const Address multicast = MakePrefixed(0xff, 0x02);
+
+	std::vector<Address> rejected;
+	rejected.push_back(unspecified);
+	rejected.push_back(loopback);
+	rejected.push_back(linkLocal);
+	rejected.push_back(uniqueLocal);
+	rejected.push_back(multicast);
+
+	for (const Address &value : rejected) {
+		ASSERT_FALSE(CPublicIPv6Corroboration::IsGlobalUnicast(value));
+
+		CPublicIPv6Corroboration tracker;
+		// Handed in as "local" on purpose: the address-family gate is an invariant of the
+		// tracker, not a side effect of how the caller happened to fill that set.
+		tracker.SetLocalAddresses(Held(value), START_MS);
+		for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+			tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), value.data(), START_MS);
+		}
+		ASSERT_FALSE(tracker.IsCorroborated());
+		ASSERT_EQUALS(0u, (unsigned)tracker.CandidateCount());
+	}
+}
+
+// Before the interface list has been published there is nothing to check a claim against, and the
+// safe reading of "I do not know which addresses I hold" is "believe nobody".
+TEST(PublicIPv6Corroboration, WithNoPublishedInterfacesNothingIsBelieved)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		ASSERT_FALSE(tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), claimed.data(), START_MS));
+	}
+	ASSERT_EQUALS(0u, (unsigned)tracker.LocalAddressCount());
+}
+
+// One peer is one peer, even about an address we do hold.
+TEST(PublicIPv6Corroboration, OnePeerIsNotBelieved)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+	tracker.SetLocalAddresses(Held(claimed), START_MS);
+
+	ASSERT_FALSE(tracker.AddClaim(MakeObserver(1), claimed.data(), START_MS));
+	ASSERT_FALSE(tracker.IsCorroborated());
+	ASSERT_TRUE(tracker.CorroboratedAddress() == nullptr);
+	ASSERT_EQUALS(1u, (unsigned)tracker.DistinctObserversFor(claimed.data()));
+}
+
+// Two source addresses is one dual-homed host, one new lease, or one attacker
+// with a second socket -- not a second opinion.
+TEST(PublicIPv6Corroboration, TwoPeersAreStillNotEnough)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+	tracker.SetLocalAddresses(Held(claimed), START_MS);
+
+	tracker.AddClaim(MakeObserver(1), claimed.data(), START_MS);
+	ASSERT_FALSE(tracker.AddClaim(MakeObserver(2), claimed.data(), START_MS));
+	ASSERT_FALSE(tracker.IsCorroborated());
+	ASSERT_EQUALS(2u, (unsigned)tracker.DistinctObserversFor(claimed.data()));
+}
+
+TEST(PublicIPv6Corroboration, DistinctObserversReachingTheThresholdCorroborate)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+	tracker.SetLocalAddresses(Held(claimed), START_MS);
+
+	for (unsigned i = 0; i + 1 < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		ASSERT_FALSE(tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), claimed.data(), START_MS));
+	}
+	ASSERT_TRUE(tracker.AddClaim(
+		MakeObserver((uint8_t)PUBLIC_IPV6_CORROBORATION_THRESHOLD), claimed.data(), START_MS));
+
+	ASSERT_TRUE(tracker.IsCorroborated());
+	ASSERT_TRUE(tracker.CorroboratedAddress() != nullptr);
+	ASSERT_EQUALS(0, std::memcmp(tracker.CorroboratedAddress(), claimed.data(), claimed.size()));
+}
+
+// The point of keying on the observed source address: repetition is not
+// corroboration, however many times it happens.
+TEST(PublicIPv6Corroboration, OneObserverRepeatingItselfNeverCorroborates)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+	tracker.SetLocalAddresses(Held(claimed), START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD * 10; ++i) {
+		ASSERT_FALSE(tracker.AddClaim(MakeObserver(7), claimed.data(), START_MS));
+	}
+	ASSERT_EQUALS(1u, (unsigned)tracker.DistinctObserversFor(claimed.data()));
+}
+
+// The reason the cap sits above the quorum. Three peers corroborate an address, three more agree
+// later, and when the first three fall out of the window the address is still held up by the
+// others. With the cap equal to the quorum those later votes were refused, so the first expiry
+// dropped the candidate outright even though half the network was still agreeing.
+TEST(PublicIPv6Corroboration, SurplusVotesCarryAnAddressThroughAnExpiry)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+	tracker.SetLocalAddresses(Held(claimed), START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), claimed.data(), START_MS);
+	}
+	ASSERT_TRUE(tracker.IsCorroborated());
+
+	// A second, later set of peers saying the same thing.
+	const uint64_t later = START_MS + 1000;
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1 + PUBLIC_IPV6_CORROBORATION_THRESHOLD)),
+			claimed.data(),
+			later);
+	}
+	ASSERT_EQUALS((unsigned)(PUBLIC_IPV6_CORROBORATION_THRESHOLD * 2),
+		(unsigned)tracker.DistinctObserversFor(claimed.data()));
+
+	// Past the window for the first set, inside it for the second.
+	tracker.SetLocalAddresses(Held(claimed), START_MS + PUBLIC_IPV6_CORROBORATION_WINDOW_MS + 500);
+
+	ASSERT_TRUE(tracker.IsCorroborated());
+	ASSERT_EQUALS((unsigned)PUBLIC_IPV6_CORROBORATION_THRESHOLD,
+		(unsigned)tracker.DistinctObserversFor(claimed.data()));
+}
+
+// The cap is still a cap. Surplus is redundancy, not an unbounded list a peer can grow.
+TEST(PublicIPv6Corroboration, ObserversStopGrowingAtTheCap)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+	tracker.SetLocalAddresses(Held(claimed), START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_MAX_OBSERVERS + 4; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), claimed.data(), START_MS);
+	}
+
+	ASSERT_EQUALS((unsigned)PUBLIC_IPV6_CORROBORATION_MAX_OBSERVERS,
+		(unsigned)tracker.DistinctObserversFor(claimed.data()));
+}
+
+// Votes are counted per value, never in total: three peers naming three
+// different addresses agree about nothing.
+TEST(PublicIPv6Corroboration, DisagreeingPeersDoNotPoolIntoAQuorum)
+{
+	CPublicIPv6Corroboration tracker;
+	std::vector<Address> local;
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		local.push_back(MakeAddress((uint8_t)(i + 1)));
+	}
+	tracker.SetLocalAddresses(local, START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		const Address claimed = MakeAddress((uint8_t)(i + 1));
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), claimed.data(), START_MS);
+	}
+
+	ASSERT_FALSE(tracker.IsCorroborated());
+	ASSERT_EQUALS((unsigned)PUBLIC_IPV6_CORROBORATION_THRESHOLD, (unsigned)tracker.CandidateCount());
+}
+
+// A seated value is not unseated by a minority. Both addresses here are ours, so the loser is not a
+// threat -- but flipping between them on every packet would be a different address published every
+// few seconds.
+TEST(PublicIPv6Corroboration, AMinorityClaimDoesNotUnseatAQuorum)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address agreed = MakeAddress(0x01);
+	const Address other = MakeAddress(0x02);
+	tracker.SetLocalAddresses(Held(agreed, other), START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), agreed.data(), START_MS);
+	}
+	tracker.AddClaim(MakeObserver(100), other.data(), START_MS);
+	tracker.AddClaim(MakeObserver(101), other.data(), START_MS);
+
+	ASSERT_TRUE(tracker.IsCorroborated());
+	ASSERT_EQUALS(0, std::memcmp(tracker.CorroboratedAddress(), agreed.data(), agreed.size()));
+}
+
+// Without an observed address there is nothing to key on, and an unkeyed claim
+// would let one peer supply the whole quorum by itself.
+TEST(PublicIPv6Corroboration, ClaimsWithNoObservedAddressAreIgnored)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+	tracker.SetLocalAddresses(Held(claimed), START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD * 5; ++i) {
+		ASSERT_FALSE(tracker.AddClaim(0, claimed.data(), START_MS));
+	}
+	ASSERT_EQUALS(0u, (unsigned)tracker.CandidateCount());
+}
+
+TEST(PublicIPv6Corroboration, NullClaimsAreIgnored)
+{
+	CPublicIPv6Corroboration tracker;
+	tracker.SetLocalAddresses(Held(MakeAddress(0x01)), START_MS);
+
+	ASSERT_FALSE(tracker.AddClaim(MakeObserver(1), nullptr, START_MS));
+	ASSERT_EQUALS(0u, (unsigned)tracker.CandidateCount());
+	ASSERT_EQUALS(0u, (unsigned)tracker.DistinctObserversFor(nullptr));
+}
+
+// The filter is what bounds the table: a candidate can only ever be one of the addresses this
+// machine holds, so a peer flooding invented values cannot make the table grow at all -- which is
+// why there is no cap on it any more.
+TEST(PublicIPv6Corroboration, TheCandidateSetIsBoundedByOurOwnAddresses)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address first = MakeAddress(0x01);
+	const Address second = MakeAddress(0x02);
+	tracker.SetLocalAddresses(Held(first, second), START_MS);
+
+	for (unsigned i = 0; i < 250; ++i) {
+		const Address claimed = MakeAddress((uint8_t)i);
+		tracker.AddClaim(MakeObserver((uint8_t)i), claimed.data(), START_MS);
+	}
+
+	ASSERT_EQUALS(2u, (unsigned)tracker.CandidateCount());
+	ASSERT_EQUALS(2u, (unsigned)tracker.LocalAddressCount());
+}
+
+// A vote nobody has repeated within the window is not current evidence. This is the difference
+// between "three peers agree" and "three peers said so at some point since the daemon started".
+TEST(PublicIPv6Corroboration, VotesOlderThanTheWindowStopCounting)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+	tracker.SetLocalAddresses(Held(claimed), START_MS);
+
+	for (unsigned i = 0; i + 1 < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), claimed.data(), START_MS);
+	}
+
+	// The deciding claim arrives one millisecond after the first two aged out.
+	const uint64_t tooLate = START_MS + PUBLIC_IPV6_CORROBORATION_WINDOW_MS + 1;
+	ASSERT_FALSE(tracker.AddClaim(
+		MakeObserver((uint8_t)PUBLIC_IPV6_CORROBORATION_THRESHOLD), claimed.data(), tooLate));
+	ASSERT_EQUALS(1u, (unsigned)tracker.DistinctObserversFor(claimed.data()));
+}
+
+// A quorum that formed and then went quiet must lapse too, otherwise the
+// window only ever applies to claims that never made it.
+TEST(PublicIPv6Corroboration, AnAdoptedValueLapsesWhenItsVotesAgeOut)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+	tracker.SetLocalAddresses(Held(claimed), START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), claimed.data(), START_MS);
+	}
+	ASSERT_TRUE(tracker.IsCorroborated());
+
+	// No peer said anything since; only the periodic interface refresh ran.
+	tracker.SetLocalAddresses(Held(claimed), START_MS + PUBLIC_IPV6_CORROBORATION_WINDOW_MS + 1);
+	ASSERT_FALSE(tracker.IsCorroborated());
+	ASSERT_TRUE(tracker.CorroboratedAddress() == nullptr);
+}
+
+// A peer that is still connected and still saying the same thing keeps its vote. Without this the
+// window would date every vote from the first hello, so a stable client whose peers never stopped
+// agreeing would still lose its quorum once, on the clock, for no reason.
+TEST(PublicIPv6Corroboration, ARepeatingObserverKeepsItsVoteAlive)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+	tracker.SetLocalAddresses(Held(claimed), START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), claimed.data(), START_MS);
+	}
+	ASSERT_TRUE(tracker.IsCorroborated());
+
+	// The same peers say it again, comfortably inside the window.
+	const uint64_t repeated = START_MS + (PUBLIC_IPV6_CORROBORATION_WINDOW_MS * 3) / 5;
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), claimed.data(), repeated);
+	}
+
+	// Past the window measured from the first hello, inside it measured from
+	// the repeat. Only the interface refresh runs here, so nothing is re-added.
+	tracker.SetLocalAddresses(Held(claimed), START_MS + PUBLIC_IPV6_CORROBORATION_WINDOW_MS + 1000);
+
+	ASSERT_TRUE(tracker.IsCorroborated());
+	// Repetition renews a vote; it never adds one.
+	ASSERT_EQUALS((unsigned)PUBLIC_IPV6_CORROBORATION_THRESHOLD,
+		(unsigned)tracker.DistinctObserversFor(claimed.data()));
+}
+
+// The half of the refresh that makes the cache safe: an address that left the interface takes its
+// corroboration with it. Without this a reflection outlives the prefix it came from.
+TEST(PublicIPv6Corroboration, ARenumberDropsTheAdoptedAddress)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address oldPrefix = MakeAddress(0x01);
+	const Address newPrefix = MakeAddress(0x02);
+	tracker.SetLocalAddresses(Held(oldPrefix), START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), oldPrefix.data(), START_MS);
+	}
+	ASSERT_TRUE(tracker.IsCorroborated());
+
+	tracker.SetLocalAddresses(Held(newPrefix), START_MS + 1000);
+
+	ASSERT_FALSE(tracker.IsCorroborated());
+	ASSERT_EQUALS(0u, (unsigned)tracker.CandidateCount());
+	ASSERT_EQUALS(0u, (unsigned)tracker.DistinctObserversFor(oldPrefix.data()));
+}
+
+// After the old value loses its seat, the next value to hold a quorum takes it. A tracker that
+// could only ever elect once would be stuck on the first address it saw for the life of the
+// process.
+TEST(PublicIPv6Corroboration, AnotherAddressIsElectedAfterTheFirstLosesItsSeat)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address oldPrefix = MakeAddress(0x01);
+	const Address newPrefix = MakeAddress(0x02);
+	tracker.SetLocalAddresses(Held(oldPrefix), START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), oldPrefix.data(), START_MS);
+	}
+	ASSERT_EQUALS(0, std::memcmp(tracker.CorroboratedAddress(), oldPrefix.data(), oldPrefix.size()));
+
+	const uint64_t later = START_MS + 1000;
+	tracker.SetLocalAddresses(Held(newPrefix), later);
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), newPrefix.data(), later);
+	}
+
+	ASSERT_TRUE(tracker.IsCorroborated());
+	ASSERT_EQUALS(0, std::memcmp(tracker.CorroboratedAddress(), newPrefix.data(), newPrefix.size()));
+}
+
+// Reset drops what peers said. It deliberately does not drop the interface list: that comes from
+// this machine, and clearing it would leave the filter wide open until the next refresh.
+TEST(PublicIPv6Corroboration, ResetForgetsClaimsButKeepsOurOwnAddresses)
+{
+	CPublicIPv6Corroboration tracker;
+	const Address claimed = MakeAddress(0x01);
+	tracker.SetLocalAddresses(Held(claimed), START_MS);
+
+	for (unsigned i = 0; i < PUBLIC_IPV6_CORROBORATION_THRESHOLD; ++i) {
+		tracker.AddClaim(MakeObserver((uint8_t)(i + 1)), claimed.data(), START_MS);
+	}
+	ASSERT_TRUE(tracker.IsCorroborated());
+
+	tracker.Reset();
+	ASSERT_FALSE(tracker.IsCorroborated());
+	ASSERT_EQUALS(0u, (unsigned)tracker.CandidateCount());
+	ASSERT_EQUALS(0u, (unsigned)tracker.DistinctObserversFor(claimed.data()));
+	ASSERT_EQUALS(1u, (unsigned)tracker.LocalAddressCount());
+}

amule-3.1.0.tar.gz/unittests/tests/RangeFileBodyTest.cpp Added

@@ -0,0 +1,334 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+// Exercises RangeFileBody end to end: build a response over a scratch file, run it through a real
+// Beast response_serializer, and compare the bytes that come off the "wire" with the slice of the
+// file they are supposed to be.
+//
+// Everything here is about the two things the type exists to get right: the window must END where
+// it was told to (stock file_body cannot do that, see RangeFileBody.h), and the Content-Length
+// prepare_payload() stamps must equal the number of body bytes actually written.
+
+#include <muleunit/test.h>
+
+#include "RangeFileBody.h"
+
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/http/serializer.hpp>
+#include <boost/beast/http/write.hpp>
+
+#include <cstdio>
+#include <string>
+
+using namespace muleunit;
+
+namespace beast = boost::beast;
+namespace http = boost::beast::http;
+
+DECLARE_SIMPLE(RangeFileBody)
+
+namespace
+{
+
+// Minimal SyncWriteStream: collects everything the serializer emits into a string. Using the real
+// http::write, rather than driving serializer::next by hand, means the test goes through the same
+// buffer/consume protocol the transport's async_write does.
+struct CollectingStream
+{
+	std::string out;
+
+	template <class ConstBufferSequence>
+	std::size_t write_some(const ConstBufferSequence &buffers, boost::system::error_code &ec)
+	{
+		std::size_t n = 0;
+		for (auto it = boost::asio::buffer_sequence_begin(buffers);
+			it != boost::asio::buffer_sequence_end(buffers);
+			++it) {
+			const boost::asio::const_buffer b = *it;
+			out.append(static_cast<const char *>(b.data()), b.size());
+			n += b.size();
+		}
+		ec = {};
+		return n;
+	}
+
+	template <class ConstBufferSequence> std::size_t write_some(const ConstBufferSequence &buffers)
+	{
+		boost::system::error_code ec;
+		return write_some(buffers, ec);
+	}
+};
+
+// Deterministic, non-repeating-at-64-KiB content so an off-by-one buffer
+// boundary shows up as wrong BYTES, not just a wrong length.
+std::string MakeContent(std::size_t n)
+{
+	std::string s;
+	s.reserve(n);
+	for (std::size_t i = 0; i < n; ++i) {
+		s.push_back(static_cast<char>((i * 31 + (i >> 8) * 7) & 0xFF));
+	}
+	return s;
+}
+
+const char *const kScratchPath = "RangeFileBodyTest.scratch";
+
+void WriteScratch(const std::string &content)
+{
+	std::FILE *f = std::fopen(kScratchPath, "wb");
+	ASSERT_TRUE(f != nullptr);
+	if (!content.empty()) {
+		std::fwrite(content.data(), 1, content.size(), f);
+	}
+	std::fclose(f);
+}
+
+// Result of serialising one window: the advertised length and the body bytes.
+struct Serialised
+{
+	bool ok = false;
+	std::string content_length; // verbatim header value
+	std::string body;
+};
+
+Serialised SerialiseWindow(std::uint64_t first, std::uint64_t last, bool header_only)
+{
+	Serialised r;
+
+	http::response<RangeFileBody> res;
+	res.version(11);
+	res.result(http::status::partial_content);
+	beast::error_code ec;
+	res.body().Open(kScratchPath, ec);
+	if (ec) {
+		return r;
+	}
+	res.body().SetWindow(first, last, ec);
+	if (ec) {
+		return r;
+	}
+	res.prepare_payload();
+
+	CollectingStream stream;
+	http::response_serializer<RangeFileBody> sr{ res };
+	if (header_only) {
+		sr.split(true);
+		http::write_header(stream, sr, ec);
+	} else {
+		http::write(stream, sr, ec);
+	}
+	if (ec && ec != http::error::end_of_stream) {
+		return r;
+	}
+
+	const std::size_t sep = stream.out.find("\r\n\r\n");
+	if (sep == std::string::npos) {
+		return r;
+	}
+	const std::string head = stream.out.substr(0, sep);
+	r.body = stream.out.substr(sep + 4);
+
+	const std::size_t cl = head.find("Content-Length: ");
+	if (cl != std::string::npos) {
+		const std::size_t eol = head.find("\r\n", cl);
+		r.content_length = head.substr(cl + 16, eol - (cl + 16));
+	}
+	r.ok = true;
+	return r;
+}
+
+// One window, checked against the expected slice of `content`.
+void CheckWindow(const std::string &content, std::uint64_t first, std::uint64_t last)
+{
+	const Serialised s = SerialiseWindow(first, last, false);
+	ASSERT_TRUE(s.ok);
+	const std::string expected =
+		content.substr(static_cast<std::size_t>(first), static_cast<std::size_t>(last - first + 1));
+	// Advertised length and delivered length must agree -- a mismatch here is
+	// exactly the bug stock file_body would have shipped.
+	ASSERT_EQUALS(std::to_string(expected.size()), s.content_length);
+	ASSERT_EQUALS(expected.size(), s.body.size());
+	ASSERT_TRUE(s.body == expected);
+}
+
+} // namespace
+
+// Windows smaller than the read buffer.
+
+TEST(RangeFileBody, WholeSmallFile)
+{
+	const std::string content = MakeContent(300);
+	WriteScratch(content);
+	CheckWindow(content, 0, content.size() - 1);
+}
+
+TEST(RangeFileBody, InteriorWindow)
+{
+	const std::string content = MakeContent(300);
+	WriteScratch(content);
+	CheckWindow(content, 100, 199);
+}
+
+TEST(RangeFileBody, SingleByteInTheMiddle)
+{
+	const std::string content = MakeContent(300);
+	WriteScratch(content);
+	CheckWindow(content, 150, 150);
+}
+
+TEST(RangeFileBody, FirstByte)
+{
+	const std::string content = MakeContent(300);
+	WriteScratch(content);
+	CheckWindow(content, 0, 0);
+}
+
+TEST(RangeFileBody, LastByte)
+{
+	const std::string content = MakeContent(300);
+	WriteScratch(content);
+	CheckWindow(content, content.size() - 1, content.size() - 1);
+}
+
+// Windows that force multiple passes through the 64 KiB buffer. This is where a wrong `remain_`
+// bound or a mishandled partial last chunk shows up.
+
+TEST(RangeFileBody, WholeFileLargerThanTheReadBuffer)
+{
+	const std::string content = MakeContent(1024 * 1024);
+	WriteScratch(content);
+	CheckWindow(content, 0, content.size() - 1);
+}
+
+TEST(RangeFileBody, WindowStraddlingBufferBoundaries)
+{
+	const std::string content = MakeContent(1024 * 1024);
+	WriteScratch(content);
+	// Starts and ends off any 64 KiB multiple, and spans several buffers.
+	CheckWindow(content, kRangeFileReadChunkBytes - 3, 3 * kRangeFileReadChunkBytes + 7);
+}
+
+TEST(RangeFileBody, WindowEndingExactlyOnABufferBoundary)
+{
+	const std::string content = MakeContent(1024 * 1024);
+	WriteScratch(content);
+	// last is the final byte of the second buffer: the writer must then stop
+	// rather than issue a zero-length read and report short_read.
+	CheckWindow(content, 0, 2 * kRangeFileReadChunkBytes - 1);
+}
+
+TEST(RangeFileBody, WindowStopsWellBeforeEndOfFile)
+{
+	// The whole point: a bounded window over a much larger file. Stock
+	// file_body would have written every remaining byte.
+	const std::string content = MakeContent(1024 * 1024);
+	WriteScratch(content);
+	CheckWindow(content, 4096, 8191);
+}
+
+// Framing.
+
+TEST(RangeFileBody, HeaderOnlyReportsTheGetLengthAndNoBody)
+{
+	// HEAD must describe what a GET would return. The transport serialises the header alone;
+	// Content-Length still comes from Body::size, so it has to be the window length while zero
+	// body bytes reach the wire.
+	const std::string content = MakeContent(1024 * 1024);
+	WriteScratch(content);
+	const Serialised s = SerialiseWindow(1000, 500999, true);
+	ASSERT_TRUE(s.ok);
+	ASSERT_EQUALS(std::string("500000"), s.content_length);
+	ASSERT_EQUALS(static_cast<size_t>(0), s.body.size());
+}
+
+TEST(RangeFileBody, SizeIsTheWindowNotTheRemainderOfTheFile)
+{
+	const std::string content = MakeContent(1024 * 1024);
+	WriteScratch(content);
+
+	http::response<RangeFileBody> res;
+	beast::error_code ec;
+	res.body().Open(kScratchPath, ec);
+	ASSERT_TRUE(!ec);
+	ASSERT_EQUALS(static_cast<size_t>(1024 * 1024), static_cast<size_t>(res.body().FileSize()));
+	res.body().SetWindow(10, 19, ec);
+	ASSERT_TRUE(!ec);
+	ASSERT_EQUALS(static_cast<size_t>(10), static_cast<size_t>(res.body().size()));
+	ASSERT_EQUALS(static_cast<size_t>(10), static_cast<size_t>(RangeFileBody::size(res.body())));
+}
+
+// Window validation. The transport turns these failures into a 500 while the headers are still
+// unwritten, so they must be reported, never clamped.
+
+TEST(RangeFileBody, RejectsWindowsOutsideTheFile)
+{
+	const std::string content = MakeContent(300);
+	WriteScratch(content);
+
+	http::response<RangeFileBody> res;
+	beast::error_code ec;
+	res.body().Open(kScratchPath, ec);
+	ASSERT_TRUE(!ec);
+
+	// last past EOF.
+	res.body().SetWindow(0, 300, ec);
+	ASSERT_TRUE(static_cast<bool>(ec));
+	// first past EOF.
+	ec = {};
+	res.body().SetWindow(300, 400, ec);
+	ASSERT_TRUE(static_cast<bool>(ec));
+	// Inverted window.
+	ec = {};
+	res.body().SetWindow(10, 9, ec);
+	ASSERT_TRUE(static_cast<bool>(ec));
+	// A rejected window leaves nothing to serialise, rather than a stale one.
+	ASSERT_EQUALS(static_cast<size_t>(0), static_cast<size_t>(res.body().size()));
+}
+
+TEST(RangeFileBody, OpenFailsForAMissingPath)
+{
+	http::response<RangeFileBody> res;
+	beast::error_code ec;
+	res.body().Open("RangeFileBodyTest.no-such-file", ec);
+	ASSERT_TRUE(static_cast<bool>(ec));
+	ASSERT_TRUE(!res.body().IsOpen());
+}
+
+TEST(RangeFileBody, EmptyFileHasNoValidWindow)
+{
+	// Zero-length files have no inclusive window at all; they belong on the buffered `body`
+	// path, and the transport relies on this rejection to notice a handler that routed one
+	// here.
+	WriteScratch(std::string());
+	http::response<RangeFileBody> res;
+	beast::error_code ec;
+	res.body().Open(kScratchPath, ec);
+	ASSERT_TRUE(!ec);
+	ASSERT_EQUALS(static_cast<size_t>(0), static_cast<size_t>(res.body().FileSize()));
+	res.body().SetWindow(0, 0, ec);
+	ASSERT_TRUE(static_cast<bool>(ec));
+
+	std::remove(kScratchPath);
+}

amule-3.0.1.tar.gz/unittests/tests/RangeMapTest.cpp -> amule-3.1.0.tar.gz/unittests/tests/RangeMapTest.cpp Changed

@@ -3,55 +3,43 @@
 #include "Types.h"
 #include "RangeMap.h"
 
-
 using namespace muleunit;
 
 typedef CRangeMap<int> TestRangeMap;
 
-
-/**
- * Returns the contents of a TestRangeMap iterator as a string-presentation.
- */
-wxString StringFrom(const TestRangeMap::const_iterator& it)
+/// Returns the contents of a TestRangeMap iterator as a string-presentation.
+wxString StringFrom(const TestRangeMap::const_iterator &it)
 {
-	return wxString::Format("(%" wxLongLongFmtSpec "u, %"  wxLongLongFmtSpec "u, %i)", it.keyStart(), it.keyEnd(), *it);
+	return wxString::Format(
+		"(%" wxLongLongFmtSpec "u, %" wxLongLongFmtSpec "u, %i)", it.keyStart(), it.keyEnd(), *it);
 }
 
-/**
- * Returns the contents of a TestRangeMap iterator as a string-presentation.
- */
+/// Returns the contents of a TestRangeMap iterator as a string-presentation.
 wxString StringFrom(TestRangeMap::iterator it)
 {
-	return wxString::Format("(%" wxLongLongFmtSpec "u, %"  wxLongLongFmtSpec "u, %i)", it.keyStart(), it.keyEnd(), *it);
+	return wxString::Format(
+		"(%" wxLongLongFmtSpec "u, %" wxLongLongFmtSpec "u, %i)", it.keyStart(), it.keyEnd(), *it);
 }
 
-
-/**
- * Returns the contents of a CRangeSet iterator as a string-presentation.
- */
-wxString StringFrom(const CRangeMap<void>::const_iterator& it)
+/// Returns the contents of a CRangeSet iterator as a string-presentation.
+wxString StringFrom(const CRangeMap<void>::const_iterator &it)
 {
-	return wxString::Format("(%" wxLongLongFmtSpec "u, %"  wxLongLongFmtSpec "u)", it.keyStart(), it.keyEnd());
+	return wxString::Format(
+		"(%" wxLongLongFmtSpec "u, %" wxLongLongFmtSpec "u)", it.keyStart(), it.keyEnd());
 }
 
-/**
- * Returns the contents of a CRangeSet iterator as a string-presentation.
- */
+/// Returns the contents of a CRangeSet iterator as a string-presentation.
 wxString StringFrom(CRangeMap<void>::iterator it)
 {
-	return wxString::Format("(%" wxLongLongFmtSpec "u, %"  wxLongLongFmtSpec "u)", it.keyStart(), it.keyEnd());
+	return wxString::Format(
+		"(%" wxLongLongFmtSpec "u, %" wxLongLongFmtSpec "u)", it.keyStart(), it.keyEnd());
 }
 
-
-
 /**
- * Returns the contents of a TestRangeMap as a string-representation.
- *
- * Using this function allows for easy comparison against the expected
- * result of a particular test.
+ * Returns the contents of a TestRangeMap as a string-representation, for easy comparison against a
+ * test's expected result.
  */
-template <typename VALUE>
-wxString StringFrom(const CRangeMap<VALUE>& map)
+template <typename VALUE> wxString StringFrom(const CRangeMap<VALUE> &map)
 {
 	wxString stream;
 
@@ -67,105 +55,101 @@
 	return "" + stream + "";
 }
 
-
-
 DECLARE(RangeMap);
-	TestRangeMap m_map;
-	TestRangeMap m_mmaps3;
-
-	// Identifiers for the multirange maps
-	enum Maps {
-		CONT  = 0, // Continues ranges, IE no gap
-		SSAME = 1, // Separated but equal
-		SDIFF = 2  // Separated and not equal
-	};
+TestRangeMap m_map;
+TestRangeMap m_mmaps3;
 
-	// Sets up a few maps with predefined ranges.
-	void setUp() {
-		m_map.insert(100, 150, 0);
+// Identifiers for the multirange maps
+enum Maps
+{
+	CONT = 0,  // Continues ranges, IE no gap
+	SSAME = 1, // Separated but equal
+	SDIFF = 2  // Separated and not equal
+};
 
-		m_mmapsCONT.insert(100, 150, 0);
-		m_mmapsCONT.insert(151, 200, 1);
+// Sets up a few maps with predefined ranges.
+void setUp()
+{
+	m_map.insert(100, 150, 0);
 
-		m_mmapsSDIFF.insert(100, 150, 0);
-		m_mmapsSDIFF.insert(160, 200, 1);
+	m_mmapsCONT.insert(100, 150, 0);
+	m_mmapsCONT.insert(151, 200, 1);
 
-		m_mmapsSSAME.insert(100, 150, 1);
-		m_mmapsSSAME.insert(160, 200, 1);
+	m_mmapsSDIFF.insert(100, 150, 0);
+	m_mmapsSDIFF.insert(160, 200, 1);
 
-		ASSERT_EQUALS("(100, 150, 0)", StringFrom(m_map));
-		ASSERT_EQUALS("(100, 150, 0), (151, 200, 1)", StringFrom(m_mmapsCONT));
-		ASSERT_EQUALS("(100, 150, 0), (160, 200, 1)", StringFrom(m_mmapsSDIFF));
-		ASSERT_EQUALS("(100, 150, 1), (160, 200, 1)", StringFrom(m_mmapsSSAME));
-	}
+	m_mmapsSSAME.insert(100, 150, 1);
+	m_mmapsSSAME.insert(160, 200, 1);
 
-	void tearDown() {
-		m_map.clear();
-		m_mmaps0.clear();
-		m_mmaps1.clear();
-		m_mmaps2.clear();
-	}
+	ASSERT_EQUALS("(100, 150, 0)", StringFrom(m_map));
+	ASSERT_EQUALS("(100, 150, 0), (151, 200, 1)", StringFrom(m_mmapsCONT));
+	ASSERT_EQUALS("(100, 150, 0), (160, 200, 1)", StringFrom(m_mmapsSDIFF));
+	ASSERT_EQUALS("(100, 150, 1), (160, 200, 1)", StringFrom(m_mmapsSSAME));
+}
 
+void tearDown()
+{
+	m_map.clear();
+	m_mmaps0.clear();
+	m_mmaps1.clear();
+	m_mmaps2.clear();
+}
 
-	/**
-	 * Tests insertion into a map with a single range, checking against an
-	 * expected result.
-	 */
-	void singleInsert(uint32 start, uint32 end, int value, const wxString& result)
-	{
-		TestRangeMap::iterator it = m_map.insert(start, end, value);
+/**
+ * Tests insertion into a map with a single range, checking against an expected result.
+ */
+void singleInsert(uint32 start, uint32 end, int value, const wxString &result)
+{
+	TestRangeMap::iterator it = m_map.insert(start, end, value);
 
-		// Test that the correct iterator was returned
-		ASSERT_TRUE(it.keyStart() <= start);
-		ASSERT_TRUE(it.keyEnd() >= end);
-		ASSERT_EQUALS(value, *it);
+	// Test that the correct iterator was returned
+	ASSERT_TRUE(it.keyStart() <= start);
+	ASSERT_TRUE(it.keyEnd() >= end);
+	ASSERT_EQUALS(value, *it);
 
-		// Check the resulting map
-		ASSERT_EQUALS(result, StringFrom(m_map));
-		ASSERT_EQUALS((uint32)std::count(result.begin(), result.end(), '('), m_map.size());
+	// Check the resulting map
+	ASSERT_EQUALS(result, StringFrom(m_map));
+	ASSERT_EQUALS((uint32)std::count(result.begin(), result.end(), '('), m_map.size());
 
-		// Reset the rangemap
-		tearDown();
-		setUp();
-	}
+	// Reset the rangemap
+	tearDown();
+	setUp();
+}
 
-	void doErase(uint32 start, uint32 end, const wxString& result)
-	{
-		m_map.erase_range(start, end);
+void doErase(uint32 start, uint32 end, const wxString &result)
+{
+	m_map.erase_range(start, end);
 
-		// Check the resulting map
-		ASSERT_EQUALS(result, StringFrom(m_map));
-		ASSERT_EQUALS((uint32)std::count(result.begin(), result.end(), '('), m_map.size());
+	// Check the resulting map
+	ASSERT_EQUALS(result, StringFrom(m_map));
+	ASSERT_EQUALS((uint32)std::count(result.begin(), result.end(), '('), m_map.size());
 
-		// Reset the rangemap
-		tearDown();
-		setUp();
-	}
+	// Reset the rangemap
+	tearDown();
+	setUp();
+}
 
-	/**
-	 * Tests insertion into a map with multiple ranges, checking against an
-	 * expected result.
-	 */
-	void multiInsert(int type, uint32 start, uint32 end, int value, const wxString& result)
-	{
-		TestRangeMap::iterator it = m_mmapstype.insert(start, end, value);
+/**
+ * Tests insertion into a map with multiple ranges, checking against an expected result.
+ */
+void multiInsert(int type, uint32 start, uint32 end, int value, const wxString &result)
+{
+	TestRangeMap::iterator it = m_mmapstype.insert(start, end, value);
 
-		// Test that the correct iterator was returned
-		ASSERT_TRUE(it.keyStart() <= start);
-		ASSERT_TRUE(it.keyEnd() >= end);
-		ASSERT_EQUALS(value, *it);
+	// Test that the correct iterator was returned
+	ASSERT_TRUE(it.keyStart() <= start);
+	ASSERT_TRUE(it.keyEnd() >= end);
+	ASSERT_EQUALS(value, *it);
 
-		// Check the resulting map
-		ASSERT_EQUALS(result, StringFrom(m_mmapstype));
-		ASSERT_EQUALS((uint32)std::count(result.begin(), result.end(), '('), m_mmapstype.size());
+	// Check the resulting map
+	ASSERT_EQUALS(result, StringFrom(m_mmapstype));
+	ASSERT_EQUALS((uint32)std::count(result.begin(), result.end(), '('), m_mmapstype.size());
 
-		tearDown();
-		setUp();
-	}
+	tearDown();
+	setUp();
+}
 END_DECLARE;
 
-
-
 TEST(RangeMap, DefaultConstructor)
 {
 	TestRangeMap map;
@@ -174,7 +158,6 @@
 	ASSERT_TRUE(map.empty());
 }
 
-
 TEST(RangeMap, CopyConstructor)
 {
 	// Check basic copying
@@ -188,7 +171,6 @@
 	ASSERT_EQUALS(m_mmapsSSAME, mapC);
 	ASSERT_EQUALS(m_mmapsSDIFF, mapD);
 
-
 	// The copies must not affect the originals
 	mapA.insert(125, 175, 2);
 	mapB.insert(125, 175, 2);
@@ -201,7 +183,6 @@
 	ASSERT_FALSE(m_mmapsSDIFF == mapD);
 }
 
-
 TEST(RangeMap, AssignmentOperator)
 {
 	// Check basic assignment
@@ -211,7 +192,6 @@
 	ASSERT_EQUALS(m_map, mapA);
 	ASSERT_EQUALS(m_map, mapB);
 
-
 	// The copies must not affect the originals
 	mapA.insert(125, 175, 2);
 	mapB.insert(125, 175, 2);
@@ -221,7 +201,6 @@
 	ASSERT_FALSE(m_map == mapB);
 }
 
-
 TEST(RangeMap, Equality)
 {
 	TestRangeMap mapA(m_mmapsSSAME), mapB(m_mmapsSDIFF);
@@ -237,7 +216,6 @@
 	ASSERT_FALSE(mapA == mapB);
 }
 
-
 TEST(RangeMap, Iterators)
 {
 	// Adding a third range
@@ -263,7 +241,6 @@
 	ASSERT_EQUALS("(100, 124, 0)", StringFrom(it));
 }
 
-
 TEST(RangeMap, Erase)
 {
 	// Adding a third range
@@ -302,7 +279,6 @@
 	}
 }
 
-
 TEST(RangeMap, Clear)
 {
 	m_map.clear();
@@ -318,7 +294,6 @@
 	}
 }
 
-
 TEST(RangeMap, FindRange)
 {
 	// Adding a third range
@@ -346,26 +321,19 @@
 	ASSERT_EQUALS(map.end(), map.find_range(250));
 }
 
-
 TEST(RangeMap, InvalidErase)
 {
 	ASSERT_RAISES(CInvalidParamsEx, m_map.erase(m_map.end()));
 }
 
-
 TEST(RangeMap, InvalidInsert)
 {
 	ASSERT_RAISES(CInvalidParamsEx, m_map.insert(10, 9, 8));
 }
 
-
-/////////////////////////////////////////////////
-// The following tests exercize the merging algorithm.
-// The comment before each comment descrices the RangeMaps used to test,
-// and which types of ranges are tested. For example, the description
-// "a / b <-> c / d" is to be read as:
-//   Insert range starting at a or b, ending at c or d.
-
+// The following tests exercise the merging algorithm. The comment before each describes the
+// RangeMaps used and which types of ranges are tested: "a / b <-> c / d" reads as "insert range
+// starting at a or b, ending at c or d".
 
 // Single insert before start <-> before start.
 TEST(RangeMap, SingleInsert_BeforeStart_BeforeStart)
@@ -375,27 +343,25 @@
 	singleInsert(0, 90, 1, "(0, 90, 1), (100, 150, 0)");
 }
 
-
 // Single insert before start <-> touching start.
 TEST(RangeMap, SingleInsert_BeforeStart_TouchingStart)
 {
-	singleInsert(0, 99, 0, "(0, 150, 0)"); // Same type
+	singleInsert(0, 99, 0, "(0, 150, 0)");               // Same type
 	singleInsert(0, 99, 1, "(0, 99, 1), (100, 150, 0)"); // Different type
 }
 
-
 // Single insert before start <-> at start / inside.
 TEST(RangeMap, SingleInsert_BeforeStart_AtStart_InSide)
 {
-	for (int offset = 0; offset < 3; ++offset) { // at start, inside, inside
+	for (int offset = 0; offset < 3; ++offset) {               // at start, inside, inside
 		singleInsert(0, 100 + offset, 0, "(0, 150, 0)"); // Same type
 
-		wxString expected = wxString::Format("(0, %u, 1), (%u, 150, 0)", 100 + offset, 101 + offset);
+		wxString expected =
+			wxString::Format("(0, %u, 1), (%u, 150, 0)", 100 + offset, 101 + offset);
 		singleInsert(0, 100 + offset, 1, expected); // Different type
 	}
 }
 
-
 // Single insert before start / touching start <-> at end / touching end / after end.
 TEST(RangeMap, SingleInsert_BeforeStart_TouchingStart_AtEnd_TouchingEnd_AfterEnd)
 {
@@ -405,41 +371,40 @@
 		for (int end_offset = 0; end_offset < 3; ++end_offset) {
 			// (before start, touching start)
 			for (int start_offset = 0; start_offset < 2; ++start_offset) {
-				wxString expected = wxString::Format("(%u, %u, %i)", 98 + start_offset, 150 + end_offset, type);
+				wxString expected = wxString::Format(
+					"(%u, %u, %i)", 98 + start_offset, 150 + end_offset, type);
 				singleInsert(98 + start_offset, 150 + end_offset, type, expected);
 			}
 		}
 	}
 }
 
-
 // Single insert touching start <-> touching start.
 TEST(RangeMap, SingleInsert_TouchingStart_TouchingStart)
 {
-	singleInsert(99, 99, 0, "(99, 150, 0)"); // Same
+	singleInsert(99, 99, 0, "(99, 150, 0)");               // Same
 	singleInsert(99, 99, 1, "(99, 99, 1), (100, 150, 0)"); // Different
 }
 
-
 // Single insert touching start / at start <-> at start / inside.
 TEST(RangeMap, SingleInsert_TouchingStart_AtStart_AtStart_Inside)
 {
-	for (int offset_a = 0; offset_a < 2; ++offset_a) { // (touching start, at start)
+	for (int offset_a = 0; offset_a < 2; ++offset_a) {         // (touching start, at start)
 		for (int offset_b = 0; offset_b < 2; ++offset_b) { // (at start, inside)
 			int start = 99 + offset_a;
-			int end   = 100 + offset_b;
+			int end = 100 + offset_b;
 
 			// Same
 			singleInsert(start, end, 0, wxString::Format("(%u, 150, 0)", 99 + offset_a));
 
 			// Different
-			wxString exp = wxString::Format("(%u, %u, 1), (%u, 150, 0)", start, end, 101 + offset_b);
+			wxString exp =
+				wxString::Format("(%u, %u, 1), (%u, 150, 0)", start, end, 101 + offset_b);
 			singleInsert(start, end, 1, exp);
 		}
 	}
 }
 
-
 // Single insert at start <-> at end / touching end / after end.
 TEST(RangeMap, SingleInsert_AtStart_AtEnd_TouchingEnd_AfterEnd)
 {
@@ -452,7 +417,6 @@
 	}
 }
 
-
 // Single insert inside / at end <-> at end / touching end / after end.
 TEST(RangeMap, SingleInsert_Inside_AtEnd_AtEnd_TouchingEnd_AfterEnd)
 {
@@ -461,18 +425,20 @@
 		// (at end, touching end, after end)
 		for (int offset_b = 0; offset_b < 3; ++offset_b) {
 			int start = 149 + offset_a;
-			int end   = 150 + offset_b;
+			int end = 150 + offset_b;
 
 			// Same
 			singleInsert(start, end, 0, wxString::Format("(100, %u, 0)", end));
 
 			// Different
-			singleInsert(start, end, 1, wxString::Format("(100, %u, 0), (%u, %u, 1)", 148 + offset_a, start, end));
+			singleInsert(start,
+				end,
+				1,
+				wxString::Format("(100, %u, 0), (%u, %u, 1)", 148 + offset_a, start, end));
 		}
 	}
 }
 
-
 // Single insert touching end <-> touching end / after end.
 TEST(RangeMap, SingleInsert_TouchingEnd_TouchingEnd_AfterEnd)
 {
@@ -488,7 +454,6 @@
 	}
 }
 
-
 // Single insert after end <-> after end.
 TEST(RangeMap, SingleInsert_AfterEnd_AfterEnd)
 {
@@ -496,18 +461,28 @@
 	singleInsert(152, 170, 1, "(100, 150, 0), (152, 170, 1)"); // Different
 }
 
-
 // Multi insert before start <-> before start.
 TEST(RangeMap, MultiInsert_BeforeStart_BeforeStart)
 {
 	for (int type = 0; type < 2; ++type) { // Test with same and different type
-		multiInsert(CONT, 0, 90, type, wxString("(0, 90, ") << type << "), (100, 150, 0), (151, 200, 1)");
-		multiInsert(SDIFF, 0, 90, type, wxString("(0, 90, ") << type << "), (100, 150, 0), (160, 200, 1)");
-		multiInsert(SSAME, 0, 90, type, wxString("(0, 90, ") << type << "), (100, 150, 1), (160, 200, 1)");
+		multiInsert(CONT,
+			0,
+			90,
+			type,
+			wxString("(0, 90, ") << type << "), (100, 150, 0), (151, 200, 1)");
+		multiInsert(SDIFF,
+			0,
+			90,
+			type,
+			wxString("(0, 90, ") << type << "), (100, 150, 0), (160, 200, 1)");
+		multiInsert(SSAME,
+			0,
+			90,
+			type,
+			wxString("(0, 90, ") << type << "), (100, 150, 1), (160, 200, 1)");
 	}
 }
 
-
 // Multi insert before start <-> touching start.
 TEST(RangeMap, MultiInsert_BeforeStart_TouchingStart)
 {
@@ -520,7 +495,6 @@
 	multiInsert(SSAME, 0, 99, 1, "(0, 150, 1), (160, 200, 1)");
 }
 
-
 // Multi insert before start <-> at start / inside.
 TEST(RangeMap, MultiInsert_BeforeStart_AtStart_InSide)
 {
@@ -529,35 +503,66 @@
 
 		multiInsert(CONT, 0, end, 0, "(0, 150, 0), (151, 200, 1)");
 		multiInsert(SDIFF, 0, end, 0, "(0, 150, 0), (160, 200, 1)");
-		multiInsert(SSAME, 0, end, 0, wxString::Format("(0, %u, 0), (%u, 150, 1), (160, 200, 1)", end, 101 + offset));
-
-		multiInsert(CONT, 0, end, 1, wxString::Format("(0, %u, 1), (%u, 150, 0), (151, 200, 1)", end, 101 + offset));
-		multiInsert(SDIFF, 0, end, 1, wxString::Format("(0, %u, 1), (%u, 150, 0), (160, 200, 1)", end, 101 + offset));
+		multiInsert(SSAME,
+			0,
+			end,
+			0,
+			wxString::Format("(0, %u, 0), (%u, 150, 1), (160, 200, 1)", end, 101 + offset));
+
+		multiInsert(CONT,
+			0,
+			end,
+			1,
+			wxString::Format("(0, %u, 1), (%u, 150, 0), (151, 200, 1)", end, 101 + offset));
+		multiInsert(SDIFF,
+			0,
+			end,
+			1,
+			wxString::Format("(0, %u, 1), (%u, 150, 0), (160, 200, 1)", end, 101 + offset));
 		multiInsert(SSAME, 0, end, 1, "(0, 150, 1), (160, 200, 1)");
 	}
 }
 
-
 // Multi insert before start / touching start <-> at end / touching end / after end.
 TEST(RangeMap, MultiInsert_BeforeStart_TouchingStart_AtEnd_TouchingEnd_AfterEnd)
 {
 	for (int end_offset = 0; end_offset < 3; ++end_offset) { // (at end, touching end, after end)
-		for (int start_offset = 0; start_offset < 2; ++start_offset) { // (before start, touching start)
+		for (int start_offset = 0; start_offset < 2;
+			++start_offset) { // (before start, touching start)
 			int start = 98 + start_offset;
-			int end   = 150 + end_offset;
-
-			multiInsert(CONT, start, end, 0, wxString::Format("(%u, %u, 0), (%u, 200, 1)", start, end, end + 1));
-			multiInsert(SDIFF, start, end, 0, wxString::Format("(%u, %u, 0), (160, 200, 1)", start, end));
-			multiInsert(SSAME, start, end, 0, wxString::Format("(%u, %u, 0), (160, 200, 1)", start, end));
+			int end = 150 + end_offset;
+
+			multiInsert(CONT,
+				start,
+				end,
+				0,
+				wxString::Format("(%u, %u, 0), (%u, 200, 1)", start, end, end + 1));
+			multiInsert(SDIFF,
+				start,
+				end,
+				0,
+				wxString::Format("(%u, %u, 0), (160, 200, 1)", start, end));
+			multiInsert(SSAME,
+				start,
+				end,
+				0,
+				wxString::Format("(%u, %u, 0), (160, 200, 1)", start, end));
 
 			multiInsert(CONT, start, end, 1, wxString::Format("(%u, 200, 1)", start));
-			multiInsert(SDIFF, start, end, 1, wxString::Format("(%u, %u, 1), (160, 200, 1)", start, end));
-			multiInsert(SSAME, start, end, 1, wxString::Format("(%u, %u, 1), (160, 200, 1)", start, end));
+			multiInsert(SDIFF,
+				start,
+				end,
+				1,
+				wxString::Format("(%u, %u, 1), (160, 200, 1)", start, end));
+			multiInsert(SSAME,
+				start,
+				end,
+				1,
+				wxString::Format("(%u, %u, 1), (160, 200, 1)", start, end));
 		}
 	}
 }
 
-
 // Multi insert touching start <-> touching start.
 TEST(RangeMap, MultiInsert_TouchingStart_TouchingStart)
 {
@@ -570,45 +575,77 @@
 	multiInsert(SSAME, 99, 99, 1, "(99, 150, 1), (160, 200, 1)");
 }
 
-
 // Multi insert touching start / at start <-> at start / inside.
 TEST(RangeMap, MultiInsert_TouchingStart_AtStart_AtStart_Inside)
 {
-	for (int offset_a = 0; offset_a < 2; ++offset_a) { // (touching start, at start)
+	for (int offset_a = 0; offset_a < 2; ++offset_a) {         // (touching start, at start)
 		for (int offset_b = 0; offset_b < 2; ++offset_b) { // (at start, inside)
 			int start = 99 + offset_a;
-			int end   = 100 + offset_b;
-
-			multiInsert(CONT, start, end, 0, wxString::Format("(%u, 150, 0), (151, 200, 1)", start));
-			multiInsert(SDIFF, start, end, 0, wxString::Format("(%u, 150, 0), (160, 200, 1)", start));
-			multiInsert(SSAME, start, end, 0, wxString::Format("(%u, %u, 0), (%u, 150, 1), (160, 200, 1)", start, end, end + 1));
-
-			multiInsert(CONT, start, end, 1, wxString::Format("(%u, %u, 1), (%u, 150, 0), (151, 200, 1)", start, end, end + 1));
-			multiInsert(SDIFF, start, end, 1, wxString::Format("(%u, %u, 1), (%u, 150, 0), (160, 200, 1)", start, end, end + 1));
-			multiInsert(SSAME, start, end, 1, wxString::Format("(%u, 150, 1), (160, 200, 1)", start));
+			int end = 100 + offset_b;
+
+			multiInsert(CONT,
+				start,
+				end,
+				0,
+				wxString::Format("(%u, 150, 0), (151, 200, 1)", start));
+			multiInsert(SDIFF,
+				start,
+				end,
+				0,
+				wxString::Format("(%u, 150, 0), (160, 200, 1)", start));
+			multiInsert(SSAME,
+				start,
+				end,
+				0,
+				wxString::Format(
+					"(%u, %u, 0), (%u, 150, 1), (160, 200, 1)", start, end, end + 1));
+
+			multiInsert(CONT,
+				start,
+				end,
+				1,
+				wxString::Format(
+					"(%u, %u, 1), (%u, 150, 0), (151, 200, 1)", start, end, end + 1));
+			multiInsert(SDIFF,
+				start,
+				end,
+				1,
+				wxString::Format(
+					"(%u, %u, 1), (%u, 150, 0), (160, 200, 1)", start, end, end + 1));
+			multiInsert(SSAME,
+				start,
+				end,
+				1,
+				wxString::Format("(%u, 150, 1), (160, 200, 1)", start));
 		}
 	}
 }
 
-
 // rangeMap: Multi insert at start <-> at end / touching end / after end.
 TEST(RangeMap, MultiInsert_AtStart_AtEnd_TouchingEnd_AfterEnd)
 {
 	for (int offset = 0; offset < 3; ++offset) { // (at end, touching end, after end)
 		int start = 100;
-		int end   = 150 + offset;
-
-		multiInsert(CONT, start, end, 0, wxString::Format("(%u, %u, 0), (%u, 200, 1)", start, end, end + 1));
-		multiInsert(SDIFF, start, end, 0, wxString::Format("(%u, %u, 0), (160, 200, 1)", start, end));
-		multiInsert(SSAME, start, end, 0, wxString::Format("(%u, %u, 0), (160, 200, 1)", start, end));
+		int end = 150 + offset;
+
+		multiInsert(CONT,
+			start,
+			end,
+			0,
+			wxString::Format("(%u, %u, 0), (%u, 200, 1)", start, end, end + 1));
+		multiInsert(
+			SDIFF, start, end, 0, wxString::Format("(%u, %u, 0), (160, 200, 1)", start, end));
+		multiInsert(
+			SSAME, start, end, 0, wxString::Format("(%u, %u, 0), (160, 200, 1)", start, end));
 
 		multiInsert(CONT, start, end, 1, wxString::Format("(%u, 200, 1)", start));
-		multiInsert(SDIFF, start, end, 1, wxString::Format("(%u, %u, 1), (160, 200, 1)", start, end));
-		multiInsert(SSAME, start, end, 1, wxString::Format("(%u, %u, 1), (160, 200, 1)", start, end));
+		multiInsert(
+			SDIFF, start, end, 1, wxString::Format("(%u, %u, 1), (160, 200, 1)", start, end));
+		multiInsert(
+			SSAME, start, end, 1, wxString::Format("(%u, %u, 1), (160, 200, 1)", start, end));
 	}
 }
 
-
 // Multi insert inside <-> inside.
 TEST(RangeMap, MultiInsert_Inside_Inside)
 {
@@ -621,45 +658,71 @@
 	multiInsert(SSAME, 110, 140, 1, "(100, 150, 1), (160, 200, 1)");
 }
 
-
 // Multi insert inside / at end <-> at end / touching end / after end.
 TEST(RangeMap, MultiInsert_Inside_AtEnd_AtEnd_TouchingEnd_AfterEnd)
 {
-	for (int offset_a = 0; offset_a < 2; ++offset_a) { // (inside, at end)
+	for (int offset_a = 0; offset_a < 2; ++offset_a) {         // (inside, at end)
 		for (int offset_b = 0; offset_b < 3; ++offset_b) { // (at end, touching end, after end)
 			int start = 149 + offset_a;
-			int end   = 150 + offset_b;
-
-			multiInsert(CONT, start, end, 0, wxString::Format("(100, %u, 0), (%u, 200, 1)", end, end + 1));
-			multiInsert(SDIFF, start, end, 0, wxString::Format("(100, %u, 0), (160, 200, 1)", end));
-			multiInsert(SSAME, start, end, 0, wxString::Format("(100, %u, 1), (%u, %u, 0), (160, 200, 1)", start - 1, start, end));
-
-			multiInsert(CONT, start, end, 1, wxString::Format("(100, %u, 0), (%u, 200, 1)", start - 1, start));
-			multiInsert(SDIFF, start, end, 1, wxString::Format("(100, %u, 0), (%u, %u, 1), (160, 200, 1)", start - 1, start, end));
-			multiInsert(SSAME, start, end, 1, wxString::Format("(100, %u, 1), (160, 200, 1)", end));
+			int end = 150 + offset_b;
+
+			multiInsert(CONT,
+				start,
+				end,
+				0,
+				wxString::Format("(100, %u, 0), (%u, 200, 1)", end, end + 1));
+			multiInsert(
+				SDIFF, start, end, 0, wxString::Format("(100, %u, 0), (160, 200, 1)", end));
+			multiInsert(SSAME,
+				start,
+				end,
+				0,
+				wxString::Format(
+					"(100, %u, 1), (%u, %u, 0), (160, 200, 1)", start - 1, start, end));
+
+			multiInsert(CONT,
+				start,
+				end,
+				1,
+				wxString::Format("(100, %u, 0), (%u, 200, 1)", start - 1, start));
+			multiInsert(SDIFF,
+				start,
+				end,
+				1,
+				wxString::Format(
+					"(100, %u, 0), (%u, %u, 1), (160, 200, 1)", start - 1, start, end));
+			multiInsert(
+				SSAME, start, end, 1, wxString::Format("(100, %u, 1), (160, 200, 1)", end));
 		}
 	}
 }
 
-
 // Multi insert touching end <-> touching end / after end.
 TEST(RangeMap, MultiInsert_TouchingEnd_TouchingEnd_AfterEnd)
 {
 	for (int offset = 0; offset < 2; ++offset) { // (touching end, after end)
 		int start = 151;
-		int end   = 151 + offset;
+		int end = 151 + offset;
 
-		multiInsert(CONT, start, end, 0, wxString::Format("(100, %u, 0), (%u, 200, 1)", end, end + 1));
+		multiInsert(
+			CONT, start, end, 0, wxString::Format("(100, %u, 0), (%u, 200, 1)", end, end + 1));
 		multiInsert(SDIFF, start, end, 0, wxString::Format("(100, %u, 0), (160, 200, 1)", end));
-		multiInsert(SSAME, start, end, 0, wxString::Format("(100, 150, 1), (%u, %u, 0), (160, 200, 1)", start, end));
+		multiInsert(SSAME,
+			start,
+			end,
+			0,
+			wxString::Format("(100, 150, 1), (%u, %u, 0), (160, 200, 1)", start, end));
 
 		multiInsert(CONT, start, end, 1, wxString::Format("(100, 150, 0), (%u, 200, 1)", start));
-		multiInsert(SDIFF, start, end, 1, wxString::Format("(100, 150, 0), (%u, %u, 1), (160, 200, 1)", start, end));
+		multiInsert(SDIFF,
+			start,
+			end,
+			1,
+			wxString::Format("(100, 150, 0), (%u, %u, 1), (160, 200, 1)", start, end));
 		multiInsert(SSAME, start, end, 1, wxString::Format("(100, %u, 1), (160, 200, 1)", end));
 	}
 }
 
-
 // Multi insert after end <-> after end.
 TEST(RangeMap, MultiInsert_AfterEnd_AfterEnd)
 {
@@ -672,11 +735,8 @@
 	multiInsert(SSAME, 152, 170, 1, "(100, 150, 1), (152, 200, 1)");
 }
 
-
-/////////////////////////////////////////////////
-// The following tests exercize the erase function.
-// Since the erase function use the insert function, all
-// that is needed is to test that no merging is done.
+// The following tests exercise the erase function. Erase uses insert, so all that is needed is to
+// test that no merging is done.
 
 // Single erase before start <-> before start.
 TEST(RangeMap, Erase_BeforeStart_BeforeStart)
@@ -685,14 +745,12 @@
 	doErase(0, 90, "(100, 150, 0)");
 }
 
-
 // Single erase before start <-> touching start.
 TEST(RangeMap, Erase_BeforeStart_TouchingStart)
 {
 	doErase(0, 99, "(100, 150, 0)");
 }
 
-
 // Single erase before start <-> at start / inside.
 TEST(RangeMap, Erase_BeforeStart_AtStart_InSide)
 {
@@ -701,7 +759,6 @@
 	}
 }
 
-
 // Single erase before start / touching start <-> at end / touching end / after end.
 TEST(RangeMap, Erase_BeforeStart_TouchingStart_AtEnd_TouchingEnd_AfterEnd)
 {
@@ -714,28 +771,25 @@
 	}
 }
 
-
 // Single erase touching start <-> touching start.
 TEST(RangeMap, Erase_TouchingStart_TouchingStart)
 {
 	doErase(99, 99, "(100, 150, 0)");
 }
 
-
 // Single erase touching start / at start <-> at start / inside.
 TEST(RangeMap, Erase_TouchingStart_AtStart_AtStart_Inside)
 {
-	for (int offset_a = 0; offset_a < 2; ++offset_a) { // (touching start, at start)
+	for (int offset_a = 0; offset_a < 2; ++offset_a) {         // (touching start, at start)
 		for (int offset_b = 0; offset_b < 2; ++offset_b) { // (at start, inside)
 			int start = 99 + offset_a;
-			int end   = 100 + offset_b;
+			int end = 100 + offset_b;
 
 			doErase(start, end, wxString::Format("(%u, 150, 0)", 100 + offset_b + 1));
 		}
 	}
 }
 
-
 // Single erase at start <-> at end / touching end / after end.
 TEST(RangeMap, Erase_AtStart_AtEnd_TouchingEnd_AfterEnd)
 {
@@ -745,7 +799,6 @@
 	}
 }
 
-
 // Single erase inside / at end <-> at end / touching end / after end.
 TEST(RangeMap, Erase_Inside_AtEnd_AtEnd_TouchingEnd_AfterEnd)
 {
@@ -754,14 +807,13 @@
 		// (at end, touching end, after end)
 		for (int offset_b = 0; offset_b < 3; ++offset_b) {
 			int start = 149 + offset_a;
-			int end   = 150 + offset_b;
+			int end = 150 + offset_b;
 
 			doErase(start, end, wxString::Format("(100, %u, 0)", start - 1));
 		}
 	}
 }
 
-
 // Single erase touching end <-> touching end / after end.
 TEST(RangeMap, Erase_TouchingEnd_TouchingEnd_AfterEnd)
 {
@@ -773,14 +825,12 @@
 	}
 }
 
-
 // Single erase after end <-> after end.
 TEST(RangeMap, Erase_AfterEnd_AfterEnd)
 {
 	doErase(152, 170, "(100, 150, 0)");
 }
 
-
 TEST(RangeMap, Swap)
 {
 	{
@@ -810,10 +860,7 @@
 	}
 }
 
-
-/////////////////////////////////////////////////
-// The following test exercize the CRangeSet specialization.
-//
+// The following test exercises the CRangeSet specialization.
 
 TEST(RangeMap, RangeSet)
 {
@@ -842,4 +889,3 @@
 	ASSERT_EQUALS("(0, 4), (46, 50)", StringFrom(set));
 	ASSERT_EQUALS(2u, set.size());
 }
-

amule-3.1.0.tar.gz/unittests/tests/RateLimiterTest.cpp Added

@@ -0,0 +1,154 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <common/RateLimiter.h>
+#include <muleunit/test.h>
+
+using namespace muleunit;
+
+// The External Connection listener's shipped defaults, copied here rather than read from
+// Preferences: the limiter is a standalone class and pulling in the preferences machinery would
+// need a running app.
+//
+// So this fixture asserts the limiter behaves correctly *at the numbers EC ships with* -- it does
+// not verify that Preferences.cpp still registers those numbers. Changing a default there and not
+// here leaves this suite green. What it does catch is a regression in the limiter itself: AuthTest
+// exercises the same class with small synthetic values, and these cases add the ones EC depends on,
+// including that the window slides rather than tumbles.
+namespace
+{
+const unsigned EC_WINDOW = 60;
+const unsigned EC_THRESHOLD = 10;
+const unsigned EC_LOCKOUT = 300;
+
+CRateLimiter::Config EcDefaults()
+{
+	CRateLimiter::Config cfg;
+	cfg.window_seconds = EC_WINDOW;
+	cfg.threshold = EC_THRESHOLD;
+	cfg.lockout_seconds = EC_LOCKOUT;
+	return cfg;
+}
+} // namespace
+
+DECLARE_SIMPLE(RateLimiterTest)
+
+TEST(RateLimiterTest, AllowsNineFailuresThenLocksOnTheTenth)
+{
+	std::time_t now = 1000;
+	CRateLimiter rl(EcDefaults(), & { return now; });
+
+	// The threshold is the count that arms the lockout, so the first nine
+	// failures must each leave the next attempt permitted.
+	for (unsigned i = 0; i < EC_THRESHOLD - 1; ++i) {
+		rl.NoteFailure("10.0.0.1");
+		ASSERT_FALSE(rl.Check("10.0.0.1").locked_out);
+	}
+
+	rl.NoteFailure("10.0.0.1");
+	ASSERT_TRUE(rl.Check("10.0.0.1").locked_out);
+}
+
+TEST(RateLimiterTest, ReportsTheFullLockoutOnTheFirstRefusal)
+{
+	std::time_t now = 1000;
+	CRateLimiter rl(EcDefaults(), & { return now; });
+
+	for (unsigned i = 0; i < EC_THRESHOLD; ++i) {
+		rl.NoteFailure("10.0.0.1");
+	}
+	// The daemon puts this number in front of the user, so it has to be the
+	// real remaining time rather than a constant.
+	ASSERT_EQUALS((std::time_t)EC_LOCKOUT, rl.Check("10.0.0.1").retry_after_seconds);
+
+	now += 100;
+	ASSERT_EQUALS((std::time_t)(EC_LOCKOUT - 100), rl.Check("10.0.0.1").retry_after_seconds);
+}
+
+TEST(RateLimiterTest, LockoutExpiresAndTheAddressIsUsableAgain)
+{
+	std::time_t now = 1000;
+	CRateLimiter rl(EcDefaults(), & { return now; });
+
+	for (unsigned i = 0; i < EC_THRESHOLD; ++i) {
+		rl.NoteFailure("10.0.0.1");
+	}
+	ASSERT_TRUE(rl.Check("10.0.0.1").locked_out);
+
+	now += EC_LOCKOUT + 1;
+	ASSERT_FALSE(rl.Check("10.0.0.1").locked_out);
+}
+
+TEST(RateLimiterTest, SuccessClearsTheStreak)
+{
+	std::time_t now = 1000;
+	CRateLimiter rl(EcDefaults(), & { return now; });
+
+	// A user who mistypes, gets in, then mistypes again must not be locked out by the two
+	// streaks adding up: nine plus nine is well past the threshold, but the success in between
+	// resets the count.
+	for (unsigned i = 0; i < EC_THRESHOLD - 1; ++i) {
+		rl.NoteFailure("10.0.0.1");
+	}
+	rl.NoteSuccess("10.0.0.1");
+	for (unsigned i = 0; i < EC_THRESHOLD - 1; ++i) {
+		rl.NoteFailure("10.0.0.1");
+	}
+	ASSERT_FALSE(rl.Check("10.0.0.1").locked_out);
+}
+
+TEST(RateLimiterTest, BucketsAreIndependentPerAddress)
+{
+	std::time_t now = 1000;
+	CRateLimiter rl(EcDefaults(), & { return now; });
+
+	for (unsigned i = 0; i < EC_THRESHOLD; ++i) {
+		rl.NoteFailure("10.0.0.1");
+	}
+	ASSERT_TRUE(rl.Check("10.0.0.1").locked_out);
+	// One guesser must not lock everyone else out of the daemon.
+	ASSERT_FALSE(rl.Check("10.0.0.2").locked_out);
+}
+
+TEST(RateLimiterTest, WindowSlidesRatherThanTumbling)
+{
+	std::time_t now = 1000;
+	CRateLimiter rl(EcDefaults(), & { return now; });
+
+	// The failure that matters is the one that ages out. Spend the whole allowance, let a
+	// single stamp expire, and only one more failure should fit before the lockout arms again
+	// -- a tumbling window would have cleared the entire count at the boundary and allowed the
+	// full allowance a second time.
+	for (unsigned i = 0; i < EC_THRESHOLD - 1; ++i) {
+		rl.NoteFailure("10.0.0.1");
+	}
+	now += EC_WINDOW + 1;
+
+	for (unsigned i = 0; i < EC_THRESHOLD - 1; ++i) {
+		rl.NoteFailure("10.0.0.1");
+		ASSERT_FALSE(rl.Check("10.0.0.1").locked_out);
+	}
+	rl.NoteFailure("10.0.0.1");
+	ASSERT_TRUE(rl.Check("10.0.0.1").locked_out);
+}

amule-3.1.0.tar.gz/unittests/tests/RefresherTest.cpp Added

@@ -0,0 +1,3377 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include <muleunit/test.h>
+
+#include <set>
+
+#include "PrefsSchema.h"
+#include "Server.h" // SRV_PR_*
+#include "PrefsSchema.h"
+#include "ClientTagNames.h"
+#include "Constants.h" // ESourceFrom
+#include "Refresher.h"
+#include "State.h"
+
+#include "RLE.h" // PartFileEncoderData for the rle_state arg
+
+#include <ec/cpp/ECPacket.h>
+#include <ec/cpp/ECTag.h>
+#include <ec/cpp/ECCodes.h>
+
+#include "include/protocol/ed2k/ClientSoftware.h" // SO_* client-software enum
+
+#include "kademlia/utils/UInt128.h" // CUInt128 (EC_TAG_KAD_ID payload)
+
+#include <cstdint>
+#include <map>
+
+using namespace muleunit;
+using namespace webapi;
+
+DECLARE_SIMPLE(Refresher)
+// Own suite: the preference-schema domain guards below are about PrefsSchema.cpp, which this target
+// already compiles and links, not about the EC walkers the rest of the file covers.
+DECLARE_SIMPLE(PrefsSchema)
+
+// EC_TAG_FILE_REMOVED -- INC-protocol deletion marker. With GET_UPDATE + EC_DETAIL_INC_UPDATE the
+// marker arrives in the consolidated response packet. Both ApplyGetUpdateToDownloads and
+// ApplyGetUpdateToShared react to it: one is a no-op for any given ECID, the server-side encoder
+// map being unified across both surfaces, but the dispatch is per-walker.
+
+TEST(Refresher, FileRemovedErasesFromDownloads)
+{
+	// Pre-seed two downloads in the cache.
+	FileMap cache;
+	{
+		FileSnapshot d;
+		d.ecid = 42;
+		d.hash = "aaaa0000aaaa0000aaaa0000aaaa0000";
+		d.name = "doomed.iso";
+		cache.emplace(42, d);
+	}
+	{
+		FileSnapshot d;
+		d.ecid = 99;
+		d.hash = "bbbb1111bbbb1111bbbb1111bbbb1111";
+		d.name = "survivor.iso";
+		cache.emplace(99, d);
+	}
+
+	// Craft a GET_UPDATE response holding a single EC_TAG_FILE_REMOVED marker pointing at ECID
+	// 42. The response packet's op code is what amuled emits per ExternalConn.cpp:874
+	// (EC_OP_SHARED_FILES); the walker does not care, it iterates child tags.
+	CECPacket resp(EC_OP_SHARED_FILES);
+	resp.AddTag(CECTag(EC_TAG_FILE_REMOVED, static_cast<std::uint32_t>(42)));
+
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+
+	// Doomed download is gone.
+	ASSERT_TRUE(cache.find(42) == cache.end());
+	// Survivor is untouched -- INC protocol uses explicit deletion
+	// markers, never "absence implies removed".
+	ASSERT_TRUE(cache.find(99) != cache.end());
+	ASSERT_EQUALS(std::string("survivor.iso"), cache.find(99)->second.name);
+}
+
+TEST(Refresher, FileRemovedErasesFromShared)
+{
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	// Symmetric to FileRemovedErasesFromDownloads. The server-side encoder map is unified
+	// across partfiles and sharedfiles, so a FILE_REMOVED marker could target an ECID in either
+	// cache. ApplyGetUpdateToShared evicts unconditionally; the eventual cross-walker call in
+	// RefresherTick has both walkers fire on the same response, so the right cache loses the
+	// entry.
+	FileMap cache;
+	{
+		FileSnapshot s;
+		s.ecid = 33;
+		s.hash = "1111aaaa1111aaaa1111aaaa1111aaaa";
+		s.name = "shared-doomed.iso";
+		cache.emplace(33, s);
+	}
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	resp.AddTag(CECTag(EC_TAG_FILE_REMOVED, static_cast<std::uint32_t>(33)));
+
+	ApplyGetUpdateToShared(&resp, cache, rle_state);
+
+	ASSERT_TRUE(cache.find(33) == cache.end());
+	ASSERT_TRUE(cache.empty());
+}
+
+TEST(Refresher, FileRemovedForUnknownEcidIsNoOp)
+{
+	// Cache contains a single known download.
+	FileMap cache;
+	{
+		FileSnapshot d;
+		d.ecid = 7;
+		d.hash = "cccc2222cccc2222cccc2222cccc2222";
+		d.name = "kept.iso";
+		cache.emplace(7, d);
+	}
+
+	// Server emits a stale removal marker for ECID 9999 we have never seen -- a race, the
+	// server-side gen bumping between the two lookups. Erasing a missing key must be a no-op.
+	CECPacket resp(EC_OP_SHARED_FILES);
+	resp.AddTag(CECTag(EC_TAG_FILE_REMOVED, static_cast<std::uint32_t>(9999)));
+
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	ASSERT_TRUE(cache.find(7) != cache.end());
+	ASSERT_EQUALS(std::string("kept.iso"), cache.find(7)->second.name);
+}
+
+// Empty response (no churn since the last tick) -- the INC protocol's silent-skip semantics.
+// Downloads and shared caches stay intact.
+
+TEST(Refresher, EmptyResponseLeavesCachesIntact)
+{
+	FileMap downloads;
+	{
+		FileSnapshot d;
+		d.ecid = 1;
+		d.name = "alpha";
+		downloads.emplace(1, d);
+	}
+	FileMap shared;
+	{
+		FileSnapshot s;
+		s.ecid = 2;
+		s.name = "beta";
+		shared.emplace(2, s);
+	}
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	ApplyGetUpdateToDownloads(&resp, downloads, rle_state);
+	ApplyGetUpdateToShared(&resp, shared, rle_state);
+
+	// INC protocol: empty response means "no changes since last tick".
+	// Cache stays intact -- no bulk-delete fallback needed.
+	ASSERT_EQUALS(static_cast<size_t>(1), downloads.size());
+	ASSERT_EQUALS(static_cast<size_t>(1), shared.size());
+}
+
+// Mixed top-level dispatch -- one GET_UPDATE response carries both EC_TAG_PARTFILE and
+// EC_TAG_KNOWNFILE at the same level. The two walkers must each consume only their own tag type
+// without cross-contaminating the other cache.
+
+TEST(Refresher, MixedTopLevelDispatchedByTagName)
+{
+	FileMap downloads;
+	FileMap shared;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	// One partfile (ECID 10) -- should land in downloads only.
+	resp.AddTag(CECTag(EC_TAG_PARTFILE, static_cast<std::uint32_t>(10)));
+	// One sharedfile (ECID 20) -- should land in shared only.
+	resp.AddTag(CECTag(EC_TAG_KNOWNFILE, static_cast<std::uint32_t>(20)));
+	// A FILE_REMOVED marker (ECID 99) -- erases from both walkers'
+	// caches; since neither was pre-seeded, it's a no-op for both.
+	resp.AddTag(CECTag(EC_TAG_FILE_REMOVED, static_cast<std::uint32_t>(99)));
+
+	ApplyGetUpdateToDownloads(&resp, downloads, rle_state);
+	ApplyGetUpdateToShared(&resp, shared, rle_state);
+
+	// Downloads walker captured ECID 10 only -- NOT ECID 20 (that
+	// belongs to shared) and NOT ECID 99 (that's the FILE_REMOVED).
+	ASSERT_EQUALS(static_cast<size_t>(1), downloads.size());
+	ASSERT_TRUE(downloads.find(10) != downloads.end());
+	ASSERT_TRUE(downloads.find(20) == downloads.end());
+
+	// Shared walker captured ECID 20 only.
+	ASSERT_EQUALS(static_cast<size_t>(1), shared.size());
+	ASSERT_TRUE(shared.find(20) != shared.end());
+	ASSERT_TRUE(shared.find(10) == shared.end());
+}
+
+// Shared partfile dispatch -- amuled's /shared surface is the union of completed knownfiles AND
+// partfiles with `IsShared()=true`, i.e. at least one chunk completed, so uploadable. GET_UPDATE
+// ships partfiles as EC_TAG_PARTFILE with a child `EC_TAG_PARTFILE_SHARED` bool. The shared walker
+// has to consume both top-level tag types and gate partfile inclusion on the flag.
+
+TEST(Refresher, SharedPartfileWithFlagTrueLandsInShared)
+{
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	FileMap cache;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(50));
+		// IsShared==true: this partfile has ≥1 chunk and is currently
+		// uploadable. The shared walker should pick it up.
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_SHARED, static_cast<std::uint8_t>(1)));
+		resp.AddTag(pf);
+	}
+
+	// PARTFILE_HASH is CValueMap-suppressed on the partfile-to-shared transition tick, so
+	// supply identity via the downloads-cache fallback, which is how the live code recovers it.
+	std::map<std::uint32_t, std::pair<std::string, std::string>> fallback;
+	fallback50 = std::make_pair(
+		std::string("aaaa3333aaaa3333aaaa3333aaaa3333"), std::string("shared-test.iso"));
+	ApplyGetUpdateToShared(&resp, cache, rle_state);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	ASSERT_TRUE(cache.find(50) != cache.end());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(50), cache.find(50)->second.ecid);
+}
+
+TEST(Refresher, UnsharedPartfileSkippedFromShared)
+{
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	// PARTFILE arrives with EC_TAG_PARTFILE_SHARED=false. The shared walker must NOT insert it
+	// -- the file is in the download queue with zero chunks completed, so no peer can request
+	// it.
+	FileMap cache;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(60));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_SHARED, static_cast<std::uint8_t>(0)));
+		resp.AddTag(pf);
+	}
+
+	ApplyGetUpdateToShared(&resp, cache, rle_state);
+
+	ASSERT_TRUE(cache.empty());
+}
+
+// Shared availability bar -- EC_TAG_PARTFILE_PART_STATUS on the EC_TAG_KNOWNFILE tag (issue #982).
+// amuled RLE-encodes the per-part source counts as an XOR delta against the previously encoded
+// state, so the decoder is stateful and every frame must be fed to it in order. These tests drive
+// the real RLE_Data encoder to build the blobs, so they pin the wire format rather than a re-
+// implementation of it.
+
+namespace
+{
+
+// Encode one availability vector the way CKnownFile_Encoder::Encode
+// does and hang it off `parent` as EC_TAG_PARTFILE_PART_STATUS.
+void AddEncodedPartStatus(CECTag &parent, RLE_Data &enc, const ArrayOfUInts16 &sources)
+{
+	int len = 0;
+	bool changed = false;
+	const uint8 *blob = enc.Encode(sources, len, changed);
+	parent.AddTag(CECTag(EC_TAG_PARTFILE_PART_STATUS, len, blob));
+	delete blob;
+}
+
+} // namespace
+
+// Chat sessions -- EC_OP_CHAT_SESSIONS (issue #971). The reply is the daemon's COMPLETE session set
+// plus only the messages newer than the cursor the client sent, so the walker replaces the session
+// vector wholesale while appending messages incrementally. A session missing from a reply is the
+// ONLY signal a close produces.
+
+namespace
+{
+
+// Build one EC_TAG_CHAT_SESSION container the way the daemon does.
+CECTag MakeChatSession(std::uint64_t gui_id, const char *name)
+{
+	CECTag t(EC_TAG_CHAT_SESSION, gui_id);
+	t.AddTag(CECTag(EC_TAG_CHAT_PEER_NAME, wxString::FromAscii(name)));
+	return t;
+}
+
+void AddChatMessage(CECTag &session, std::uint32_t id, bool outgoing, std::uint32_t ts, const char *text)
+{
+	CECTag m(EC_TAG_CHAT_MESSAGE, wxString::FromUTF8(text));
+	m.AddTag(CECTag(EC_TAG_CHAT_MSG_ID, id));
+	m.AddTag(CECTag(EC_TAG_CHAT_DIRECTION, static_cast<std::uint8_t>(outgoing ? 1 : 0)));
+	m.AddTag(CECTag(EC_TAG_CHAT_TIMESTAMP, ts));
+	session.AddTag(m);
+}
+
+// GUI_ID for 10.0.0.1:4662, LSB-first like the wire.
+const std::uint64_t kPeerA = (static_cast<std::uint64_t>(0x0100000Au) << 16) | 4662u;
+const std::uint64_t kPeerB = (static_cast<std::uint64_t>(0x0200000Au) << 16) | 4662u;
+
+} // namespace
+
+TEST(Refresher, ChatSessionDecodesIdentityAndMessages)
+{
+	std::vector<ChatSessionSnapshot> cache;
+	std::uint32_t cursor = 0;
+	std::vector<ChatSessionSnapshot> fresh;
+	std::vector<std::uint64_t> closed;
+
+	CECPacket resp(EC_OP_CHAT_SESSIONS);
+	resp.AddTag(CECTag(EC_TAG_CHAT_MSG_ID, static_cast<std::uint32_t>(2)));
+	{
+		CECTag s = MakeChatSession(kPeerA, "alice");
+		s.AddTag(CECTag(EC_TAG_CLIENT, static_cast<std::uint32_t>(77)));
+		s.AddTag(CECTag(EC_TAG_FRIEND, static_cast<std::uint32_t>(12)));
+		AddChatMessage(s, 1, false, 1000, "hi");
+		AddChatMessage(s, 2, true, 1001, "hello back");
+		resp.AddTag(s);
+	}
+
+	ApplyChatSessions(&resp, cache, cursor, fresh, closed);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	ASSERT_EQUALS(kPeerA, cache0.gui_id);
+	// GUI_ID splits back into the REST conversation key.
+	ASSERT_EQUALS(std::string("10.0.0.1"), cache0.ip);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(4662), cache0.port);
+	ASSERT_EQUALS(std::string("10.0.0.1:4662"), cache0.PeerKey());
+	ASSERT_EQUALS(std::string("alice"), cache0.name);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(77), cache0.client_ecid);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(12), cache0.friend_ecid);
+	ASSERT_EQUALS(static_cast<size_t>(2), cache0.messages.size());
+	ASSERT_TRUE(!cache0.messages0.outgoing);
+	ASSERT_TRUE(cache0.messages1.outgoing);
+	ASSERT_EQUALS(std::string("hello back"), cache0.messages1.text);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(2), cursor);
+	ASSERT_EQUALS(static_cast<size_t>(1), fresh.size());
+	ASSERT_TRUE(closed.empty());
+}
+
+TEST(Refresher, ChatMessagesAccumulateAcrossTicks)
+{
+	// Later replies carry only what is past the cursor, so the walker must carry the earlier
+	// messages over rather than replacing them -- otherwise every tick would shrink the
+	// transcript to whatever just arrived.
+	std::vector<ChatSessionSnapshot> cache;
+	std::uint32_t cursor = 0;
+	{
+		std::vector<ChatSessionSnapshot> fresh;
+		std::vector<std::uint64_t> closed;
+		CECPacket resp(EC_OP_CHAT_SESSIONS);
+		resp.AddTag(CECTag(EC_TAG_CHAT_MSG_ID, static_cast<std::uint32_t>(1)));
+		CECTag s = MakeChatSession(kPeerA, "alice");
+		AddChatMessage(s, 1, false, 1000, "first");
+		resp.AddTag(s);
+		ApplyChatSessions(&resp, cache, cursor, fresh, closed);
+	}
+	{
+		std::vector<ChatSessionSnapshot> fresh;
+		std::vector<std::uint64_t> closed;
+		CECPacket resp(EC_OP_CHAT_SESSIONS);
+		resp.AddTag(CECTag(EC_TAG_CHAT_MSG_ID, static_cast<std::uint32_t>(2)));
+		CECTag s = MakeChatSession(kPeerA, "alice");
+		AddChatMessage(s, 2, true, 1001, "second");
+		resp.AddTag(s);
+		ApplyChatSessions(&resp, cache, cursor, fresh, closed);
+		// Only the genuinely new one is reported for SSE.
+		ASSERT_EQUALS(static_cast<size_t>(1), fresh.size());
+		ASSERT_EQUALS(static_cast<size_t>(1), fresh0.messages.size());
+		ASSERT_EQUALS(std::string("second"), fresh0.messages0.text);
+	}
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	ASSERT_EQUALS(static_cast<size_t>(2), cache0.messages.size());
+	ASSERT_EQUALS(std::string("first"), cache0.messages0.text);
+	ASSERT_EQUALS(std::string("second"), cache0.messages1.text);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(2), cursor);
+}
+
+TEST(Refresher, ChatSessionAbsentFromReplyIsReportedClosed)
+{
+	// Absence IS the close signal -- there is no expiry tag -- so a session the previous tick
+	// held must be dropped AND reported, not merged forward. Merging would resurrect closed
+	// conversations forever.
+	std::vector<ChatSessionSnapshot> cache;
+	std::uint32_t cursor = 0;
+	{
+		std::vector<ChatSessionSnapshot> fresh;
+		std::vector<std::uint64_t> closed;
+		CECPacket resp(EC_OP_CHAT_SESSIONS);
+		CECTag a = MakeChatSession(kPeerA, "alice");
+		AddChatMessage(a, 1, false, 1000, "hi");
+		resp.AddTag(a);
+		resp.AddTag(MakeChatSession(kPeerB, "bob"));
+		ApplyChatSessions(&resp, cache, cursor, fresh, closed);
+		ASSERT_EQUALS(static_cast<size_t>(2), cache.size());
+	}
+	{
+		std::vector<ChatSessionSnapshot> fresh;
+		std::vector<std::uint64_t> closed;
+		CECPacket resp(EC_OP_CHAT_SESSIONS);
+		resp.AddTag(MakeChatSession(kPeerB, "bob"));
+		ApplyChatSessions(&resp, cache, cursor, fresh, closed);
+		ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+		ASSERT_EQUALS(kPeerB, cache0.gui_id);
+		ASSERT_EQUALS(static_cast<size_t>(1), closed.size());
+		ASSERT_EQUALS(kPeerA, closed0);
+	}
+}
+
+TEST(Refresher, ChatSessionWithNoNewMessagesIsStillListed)
+{
+	// A session with nothing past the cursor still encodes, with no message
+	// children: that is how a client connecting late learns it exists at all.
+	std::vector<ChatSessionSnapshot> cache;
+	std::uint32_t cursor = 0;
+	std::vector<ChatSessionSnapshot> fresh;
+	std::vector<std::uint64_t> closed;
+
+	CECPacket resp(EC_OP_CHAT_SESSIONS);
+	resp.AddTag(CECTag(EC_TAG_CHAT_MSG_ID, static_cast<std::uint32_t>(9)));
+	resp.AddTag(MakeChatSession(kPeerA, "alice"));
+
+	ApplyChatSessions(&resp, cache, cursor, fresh, closed);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	ASSERT_TRUE(cache0.messages.empty());
+	// Nothing to emit an SSE frame for.
+	ASSERT_TRUE(fresh.empty());
+	// The cursor still advances, so ids evicted on the daemon are not
+	// requested forever.
+	ASSERT_EQUALS(static_cast<std::uint32_t>(9), cursor);
+}
+
+TEST(Refresher, ChatSessionKeepsAKnownNameWhenTheReplyOmitsIt)
+{
+	// The daemon suppresses an unchanged name; letting that blank the cached one would make an
+	// established conversation fall back to its ip:port label mid-stream.
+	std::vector<ChatSessionSnapshot> cache;
+	std::uint32_t cursor = 0;
+	{
+		std::vector<ChatSessionSnapshot> fresh;
+		std::vector<std::uint64_t> closed;
+		CECPacket resp(EC_OP_CHAT_SESSIONS);
+		resp.AddTag(MakeChatSession(kPeerA, "alice"));
+		ApplyChatSessions(&resp, cache, cursor, fresh, closed);
+	}
+	{
+		std::vector<ChatSessionSnapshot> fresh;
+		std::vector<std::uint64_t> closed;
+		CECPacket resp(EC_OP_CHAT_SESSIONS);
+		resp.AddTag(CECTag(EC_TAG_CHAT_SESSION, kPeerA)); // no name child
+		ApplyChatSessions(&resp, cache, cursor, fresh, closed);
+	}
+	ASSERT_EQUALS(std::string("alice"), cache0.name);
+	ASSERT_EQUALS(std::string("alice"), cache0.DisplayName());
+}
+
+TEST(Refresher, ChatSessionWithoutANameFallsBackToAddress)
+{
+	std::vector<ChatSessionSnapshot> cache;
+	std::uint32_t cursor = 0;
+	std::vector<ChatSessionSnapshot> fresh;
+	std::vector<std::uint64_t> closed;
+
+	CECPacket resp(EC_OP_CHAT_SESSIONS);
+	resp.AddTag(CECTag(EC_TAG_CHAT_SESSION, kPeerA));
+	ApplyChatSessions(&resp, cache, cursor, fresh, closed);
+
+	// The same string the desktop builds, and the one the SSE payload and
+	// the REST list must agree on.
+	ASSERT_EQUALS(std::string("IP: 10.0.0.1 Port: 4662"), cache0.DisplayName());
+}
+
+TEST(Refresher, SharedKnownFileDecodesAvailability)
+{
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	FileMap cache;
+	RLE_Data enc;
+
+	ArrayOfUInts16 sources;
+	sources.push_back(3);
+	sources.push_back(0);
+	sources.push_back(12);
+	sources.push_back(1);
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag kf(EC_TAG_KNOWNFILE, static_cast<std::uint32_t>(80));
+		AddEncodedPartStatus(kf, enc, sources);
+		resp.AddTag(kf);
+	}
+
+	ApplyGetUpdateToShared(&resp, cache, rle_state);
+
+	auto it = cache.find(80);
+	ASSERT_TRUE(it != cache.end());
+	const std::vector<std::uint16_t> &got = it->second.shared.decoded_part_sources;
+	ASSERT_EQUALS(static_cast<size_t>(4), got.size());
+	ASSERT_EQUALS(static_cast<std::uint16_t>(3), got0);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(0), got1);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(12), got2);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(1), got3);
+}
+
+TEST(Refresher, SharedKnownFileAvailabilityTracksDifferentialFrames)
+{
+	// Second and later frames are XOR deltas against the previous decoded buffer, so a decoder
+	// not carried across ticks -- or fed a frame twice -- paints garbage rather than merely
+	// lagging. Drive two frames through one encoder/decoder pair.
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	FileMap cache;
+	RLE_Data enc;
+
+	ArrayOfUInts16 first;
+	first.push_back(1);
+	first.push_back(1);
+	first.push_back(1);
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag kf(EC_TAG_KNOWNFILE, static_cast<std::uint32_t>(81));
+		AddEncodedPartStatus(kf, enc, first);
+		resp.AddTag(kf);
+		ApplyGetUpdateToShared(&resp, cache, rle_state);
+	}
+
+	ArrayOfUInts16 second;
+	second.push_back(1);
+	second.push_back(7);
+	second.push_back(0);
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag kf(EC_TAG_KNOWNFILE, static_cast<std::uint32_t>(81));
+		AddEncodedPartStatus(kf, enc, second);
+		resp.AddTag(kf);
+		ApplyGetUpdateToShared(&resp, cache, rle_state);
+	}
+
+	const std::vector<std::uint16_t> &got = cache.find(81)->second.shared.decoded_part_sources;
+	ASSERT_EQUALS(static_cast<size_t>(3), got.size());
+	ASSERT_EQUALS(static_cast<std::uint16_t>(1), got0);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(7), got1);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(0), got2);
+}
+
+TEST(Refresher, SharedWalkerLeavesPartfileAvailabilityToDownloadsWalker)
+{
+	// A shared partfile reaches this walker as EC_TAG_PARTFILE, and the downloads walker has
+	// already consumed that same tag's PART_STATUS on this very response. Decoding it a second
+	// time here would apply the XOR delta twice and desync the decoder permanently, so the
+	// shared walker must not touch the decoder state for a PARTFILE tag.
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	FileMap cache;
+	RLE_Data enc;
+
+	ArrayOfUInts16 sources;
+	sources.push_back(5);
+	sources.push_back(5);
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(82));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_SHARED, static_cast<std::uint8_t>(1)));
+		AddEncodedPartStatus(pf, enc, sources);
+		resp.AddTag(pf);
+	}
+
+	ApplyGetUpdateToShared(&resp, cache, rle_state);
+
+	auto it = cache.find(82);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_TRUE(it->second.shared.decoded_part_sources.empty());
+	// No decoder state was created for this ECID: the downloads walker
+	// owns it.
+	ASSERT_TRUE(rle_state.find(82) == rle_state.end());
+}
+
+TEST(Refresher, SharedPartfileTransitionsOutClearsSharedRole)
+{
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	// Pre-seed a shared partfile in cache, sharing on previous ticks. Now the operator paused
+	// or stopped it: the next tick emits EC_TAG_PARTFILE_SHARED=false. The walker must clear
+	// the is_shared role, and reset the shared sub-block so /shared cannot surface stale upload
+	// stats. The entry itself stays in the unified map -- entity-level eviction is
+	// FILE_REMOVED's job.
+	FileMap cache;
+	{
+		FileSnapshot s;
+		s.ecid = 70;
+		s.hash = "dddd4444dddd4444dddd4444dddd4444";
+		s.name = "was-sharing.iso";
+		s.is_shared = true;
+		s.shared.uploaded_bytes_session = 99; // stale stat to verify the reset
+		cache.emplace(70, s);
+	}
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(70));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_SHARED, static_cast<std::uint8_t>(0)));
+		resp.AddTag(pf);
+	}
+
+	ApplyGetUpdateToShared(&resp, cache, rle_state);
+
+	ASSERT_TRUE(cache.find(70) != cache.end());
+	ASSERT_TRUE(!cache.find(70)->second.is_shared);
+	// Stale upload stats from the prior sharing period must be cleared
+	// so /shared can never re-surface them.
+	ASSERT_EQUALS(static_cast<std::uint64_t>(0), cache.find(70)->second.shared.uploaded_bytes_session);
+}
+
+TEST(Refresher, SuppressedSharedFlagPreservesCachedPartfile)
+{
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	// CValueMap suppresses the EC_TAG_PARTFILE_SHARED tag when the value matches the previous
+	// frame. For a cached partfile that was previously shared, the absence of the flag means
+	// "still shared" -- the walker must keep it and apply stat deltas.
+	FileMap cache;
+	{
+		FileSnapshot s;
+		s.ecid = 80;
+		s.hash = "eeee5555eeee5555eeee5555eeee5555";
+		s.name = "still-sharing.iso";
+		cache.emplace(80, s);
+	}
+	CECPacket resp(EC_OP_SHARED_FILES);
+	// PARTFILE with no EC_TAG_PARTFILE_SHARED child -- flag suppressed.
+	resp.AddTag(CECTag(EC_TAG_PARTFILE, static_cast<std::uint32_t>(80)));
+
+	ApplyGetUpdateToShared(&resp, cache, rle_state);
+
+	ASSERT_TRUE(cache.find(80) != cache.end());
+	ASSERT_EQUALS(std::string("still-sharing.iso"), cache.find(80)->second.name);
+}
+
+TEST(Refresher, SuppressedSharedFlagSkipsUnknownPartfile)
+{
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	// Mirror of the previous test: a PARTFILE with the SHARED flag suppressed AND no prior
+	// cache entry means we have no signal that it is shared. Do not insert blindly -- wait for
+	// the next tick that flips the state and emits the flag.
+	FileMap cache;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	resp.AddTag(CECTag(EC_TAG_PARTFILE, static_cast<std::uint32_t>(90)));
+
+	ApplyGetUpdateToShared(&resp, cache, rle_state);
+
+	ASSERT_TRUE(cache.empty());
+}
+
+// New ECID arrives in one tick with identity baked in -- the whole point of the GET_UPDATE
+// consolidation. INC_UPDATE does not hit the EC_DETAIL_UPDATE early-return at
+// ECSpecialCoreTags.cpp:244-246, so HASH / NAME / SIZE are shipped on first encounter and no second
+// roundtrip is needed.
+
+TEST(Refresher, NewPartfileInsertedInOneTick)
+{
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+
+	// Craft a partfile tag with just the ECID. The walker dispatches on tag name and calls
+	// TagHashLower + MergePartFileTag, both of which tolerate an absent child set. After the
+	// walker runs, ECID 55 is in the cache with default-init fields. In production a real
+	// CEC_PartFile_Tag at INC_UPDATE always carries the full identity child set; this test pins
+	// the bare-minimum insertion path.
+	CECPacket resp(EC_OP_SHARED_FILES);
+	resp.AddTag(CECTag(EC_TAG_PARTFILE, static_cast<std::uint32_t>(55)));
+
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+
+	// The new ECID landed -- no needed.
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	ASSERT_TRUE(cache.find(55) != cache.end());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(55), cache.find(55)->second.ecid);
+}
+
+// A partfile that is BOTH downloading and shared carries two independent priorities: the download
+// priority (EC_TAG_PARTFILE_PRIO, surfaced on /downloads) and the upload priority
+// (EC_TAG_KNOWNFILE_PRIO, surfaced on /shared). They live in separate sub-blocks; the shared-walker
+// pass must not clobber the download value written by the downloads-walker pass. Regression: a
+// single top-level snapshot `priority` field let the two overwrite each other, so /downloads
+// reported the upload level.
+
+TEST(Refresher, BothFilePrioritiesAreIndependent)
+{
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+
+	// Downloads pass: partfile ECID 77 at download priority PR_HIGH (=2,
+	// Constants.h) → "high".
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(77));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, static_cast<std::uint8_t>(2)));
+		resp.AddTag(pf);
+		ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+	}
+	ASSERT_TRUE(cache.find(77) != cache.end());
+	ASSERT_TRUE(cache.find(77)->second.is_downloading);
+	ASSERT_EQUALS(std::string("high"), cache.find(77)->second.download.priority);
+
+	// Shared pass: SAME ECID, shared flag on, upload priority PR_LOW (=0)
+	// → "low". Must land in shared.priority and leave download.priority.
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(77));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_SHARED, static_cast<std::uint8_t>(1)));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_PRIO, static_cast<std::uint8_t>(0)));
+		resp.AddTag(pf);
+		ApplyGetUpdateToShared(&resp, cache, rle_state);
+	}
+
+	const auto it = cache.find(77);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_TRUE(it->second.is_downloading);
+	ASSERT_TRUE(it->second.is_shared);
+	ASSERT_EQUALS(std::string("high"), it->second.download.priority); // not clobbered
+	ASSERT_EQUALS(std::string("low"), it->second.shared.priority);
+}
+
+// A partfile that starts downloading BEFORE it shares. Its upload priority (EC_TAG_KNOWNFILE_PRIO)
+// is emitted on early ticks while it is still download-only; amuled then CValueMap-suppresses the
+// unchanged tag. When the file later flips shared, the shared walker never sees the priority tag
+// again. The downloads walker must therefore latch the upload priority from the partfile tag, and
+// the share-off reset must preserve it, so /shared reports a real level instead of "". Regression:
+// amule-org/amule#384 follow-up, an empty shared `priority`.
+
+TEST(Refresher, SharedPriorityLatchedBeforeSharingSurvivesSuppression)
+{
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+
+	// Tick 1 -- download-only. The partfile tag carries both priorities (download PR_HIGH=2 ->
+	// "high", upload PR_LOW=0 -> "low") and an explicit not-shared flag. Downloads walker runs
+	// first, then shared.
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(78));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, static_cast<std::uint8_t>(2)));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_PRIO, static_cast<std::uint8_t>(0)));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_SHARED, static_cast<std::uint8_t>(0)));
+		resp.AddTag(pf);
+		ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+		ApplyGetUpdateToShared(&resp, cache, rle_state);
+	}
+	{
+		const auto it = cache.find(78);
+		ASSERT_TRUE(it != cache.end());
+		ASSERT_TRUE(!it->second.is_shared);
+		// Upload priority was latched by the downloads walker and NOT
+		// wiped by the share-off reset.
+		ASSERT_EQUALS(std::string("low"), it->second.shared.priority);
+	}
+
+	// Tick 2 -- the file flips shared, but the unchanged upload priority is now suppressed (no
+	// EC_TAG_KNOWNFILE_PRIO child). Without the latch the shared walker would leave
+	// shared.priority empty.
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(78));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_SHARED, static_cast<std::uint8_t>(1)));
+		resp.AddTag(pf);
+		ApplyGetUpdateToShared(&resp, cache, rle_state);
+	}
+
+	const auto it = cache.find(78);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_TRUE(it->second.is_shared);
+	ASSERT_EQUALS(std::string("high"), it->second.download.priority);
+	ASSERT_EQUALS(std::string("low"), it->second.shared.priority); // not empty
+}
+
+// Single-file detail decode (issue #417). The download-detail and shared-detail endpoints read
+// these off the same snapshot the walkers build, so pin that the new tags land in the right sub-
+// blocks.
+
+TEST(Refresher, DownloadDetailTagsDecodeIntoSnapshot)
+{
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(101));
+	pf.AddTag(CECTag(EC_TAG_PARTFILE_LAST_SEEN_COMP, static_cast<std::uint32_t>(1700000000)));
+	pf.AddTag(CECTag(EC_TAG_PARTFILE_LAST_RECV, static_cast<std::uint32_t>(1700000123)));
+	pf.AddTag(CECTag(EC_TAG_PARTFILE_DOWNLOAD_ACTIVE, static_cast<std::uint32_t>(3600)));
+	pf.AddTag(CECTag(EC_TAG_PARTFILE_AVAILABLE_PARTS, static_cast<std::uint16_t>(12)));
+	pf.AddTag(CECTag(EC_TAG_PARTFILE_HASHED_PART_COUNT, static_cast<std::uint16_t>(3)));
+	pf.AddTag(CECTag(EC_TAG_PARTFILE_LOST_CORRUPTION, static_cast<std::uint64_t>(9728000)));
+	pf.AddTag(CECTag(EC_TAG_PARTFILE_GAINED_COMPRESSION, static_cast<std::uint64_t>(4096)));
+	pf.AddTag(CECTag(EC_TAG_PARTFILE_SAVED_ICH, static_cast<std::uint32_t>(7)));
+	// Still sent by the daemon, deliberately not decoded: partmet_id is not on the surface,
+	// and an undecoded tag must not disturb the rest of the parse.
+	pf.AddTag(CECTag(EC_TAG_PARTFILE_PARTMETID, static_cast<std::uint32_t>(42)));
+	// Base CKnownFile tags carried on the partfile tag too.
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_ON_QUEUE, static_cast<std::uint32_t>(5)));
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_AICH_MASTERHASH, std::string("ABCDEF0123")));
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_FILENAME, std::string("042.part")));
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_PATH, std::string("/home/me/.aMule/Temp")));
+	resp.AddTag(pf);
+
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+
+	const auto it = cache.find(101);
+	ASSERT_TRUE(it != cache.end());
+	const auto &d = it->second;
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1700000000), d.download.last_seen_complete_at);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1700000123), d.download.last_received_at);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(3600), d.download.active_seconds);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(12), d.download.available_part_count);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(3), d.download.hashed_part_count);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(9728000), d.download.lost_to_corruption_bytes);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(4096), d.download.gained_by_compression_bytes);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(7), d.download.ich_recovered_packet_count);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(5), d.queued_count);
+	ASSERT_EQUALS(std::string("ABCDEF0123"), d.aich_hash);
+	ASSERT_EQUALS(std::string("042.part"), d.part_met_basename);
+	ASSERT_EQUALS(std::string("/home/me/.aMule/Temp"), d.on_disk_dir);
+}
+
+TEST(Refresher, SharedDetailTagsDecodeIntoSnapshot)
+{
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	FileMap cache;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	CECTag kf(EC_TAG_KNOWNFILE, static_cast<std::uint32_t>(202));
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_COMPLETE_SOURCES, static_cast<std::uint16_t>(8)));
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_COMPLETE_SOURCES_LOW, static_cast<std::uint16_t>(5)));
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_COMPLETE_SOURCES_HIGH, static_cast<std::uint16_t>(11)));
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_ON_QUEUE, static_cast<std::uint32_t>(9)));
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_AICH_MASTERHASH, std::string("FEDCBA9876")));
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_FILENAME, std::string("/home/me/Incoming")));
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_PATH, std::string("/home/me/Incoming")));
+	// Live upload activity (issue #466).
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_UPLOAD_SPEED, static_cast<std::uint32_t>(51200)));
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_UPLOADING_COUNT, static_cast<std::uint16_t>(3)));
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_LAST_UPLOAD, static_cast<std::uint32_t>(1700000500)));
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_SHARED_SINCE, static_cast<std::uint32_t>(1699000000)));
+	// Verify Local Data / AICH rebuild progress over a complete share.
+	kf.AddTag(CECTag(EC_TAG_KNOWNFILE_HASHED_PART_COUNT, static_cast<std::uint16_t>(4)));
+	resp.AddTag(kf);
+
+	ApplyGetUpdateToShared(&resp, cache, rle_state);
+
+	const auto it = cache.find(202);
+	ASSERT_TRUE(it != cache.end());
+	const auto &s = it->second;
+	ASSERT_EQUALS(static_cast<std::uint16_t>(5), s.shared.complete_sources_low);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(11), s.shared.complete_sources_high);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(9), s.queued_count);
+	ASSERT_EQUALS(std::string("FEDCBA9876"), s.aich_hash);
+	// Completed known file → the directory path arrives on its own tag
+	// (the write layer reports it verbatim, with `incomplete` alongside).
+	ASSERT_EQUALS(std::string("/home/me/Incoming"), s.on_disk_dir);
+	// Upload activity (issue #466) decodes into the shared sub-block.
+	ASSERT_EQUALS(static_cast<std::uint32_t>(51200), s.shared.upload_speed_bytes_per_second);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(3), s.shared.uploading_client_count);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1700000500), s.shared.last_upload);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(4), s.shared.hashing_progress);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1699000000), s.shared.shared_since);
+}
+
+// Comment/rating (issue #419): the user's own comment and rating land at the top level; the per-
+// source EC_TAG_PARTFILE_COMMENTS container decodes into download.source_comments, 4 index-grouped
+// children per source, rating -1 = unrated.
+TEST(Refresher, CommentRatingAndSourceCommentsDecode)
+{
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(303));
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_COMMENT, std::string("my own note")));
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_RATING, static_cast<std::uint32_t>(4)));
+	CECEmptyTag comments(EC_TAG_PARTFILE_COMMENTS);
+	comments.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, std::string("alice")));
+	comments.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, std::string("movie.mkv")));
+	comments.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, static_cast<std::uint64_t>(5)));
+	comments.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, std::string("great quality")));
+	comments.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, std::string("bob")));
+	comments.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, std::string("film.avi")));
+	comments.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, static_cast<std::uint64_t>(-1))); // unrated
+	comments.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, std::string("no rating here")));
+	pf.AddTag(comments);
+	resp.AddTag(pf);
+
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+
+	const auto it = cache.find(303);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_EQUALS(std::string("my own note"), it->second.comment);
+	ASSERT_EQUALS(4, static_cast<int>(it->second.rating));
+	ASSERT_EQUALS(static_cast<size_t>(2), it->second.download.source_comments.size());
+	ASSERT_EQUALS(std::string("alice"), it->second.download.source_comments0.username);
+	ASSERT_EQUALS(std::string("movie.mkv"), it->second.download.source_comments0.filename);
+	ASSERT_EQUALS(5, static_cast<int>(it->second.download.source_comments0.rating));
+	ASSERT_EQUALS(-1, static_cast<int>(it->second.download.source_comments1.rating));
+	ASSERT_EQUALS(std::string("no rating here"), it->second.download.source_comments1.comment);
+}
+
+// Source-reported filenames (issue #420) are delta-encoded by amuled and accumulated across ticks:
+// tick 1 adds two names; tick 2 removes one (COUNTS=0) and updates the other's count (COUNTS-only
+// child).
+TEST(Refresher, SourceNamesDeltaAccumulate)
+{
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(404));
+		CECEmptyTag names(EC_TAG_PARTFILE_SOURCE_NAMES);
+		CECTag c1(EC_TAG_PARTFILE_SOURCE_NAMES, static_cast<std::uint32_t>(1));
+		c1.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_NAMES, std::string("Movie.mkv")));
+		c1.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS, static_cast<std::uint32_t>(7)));
+		names.AddTag(c1);
+		CECTag c2(EC_TAG_PARTFILE_SOURCE_NAMES, static_cast<std::uint32_t>(2));
+		c2.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_NAMES, std::string("movie.avi")));
+		c2.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS, static_cast<std::uint32_t>(2)));
+		names.AddTag(c2);
+		pf.AddTag(names);
+		resp.AddTag(pf);
+		ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+	}
+	{
+		const auto it = cache.find(404);
+		ASSERT_TRUE(it != cache.end());
+		ASSERT_EQUALS(static_cast<size_t>(2), it->second.download.source_names.size());
+		ASSERT_EQUALS(std::string("Movie.mkv"), it->second.download.source_names1.name);
+		ASSERT_EQUALS(static_cast<std::uint32_t>(7), it->second.download.source_names1.count);
+	}
+
+	// Tick 2: remove id 2 (count 0), bump id 1's count to 9 (no name).
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(404));
+		CECEmptyTag names(EC_TAG_PARTFILE_SOURCE_NAMES);
+		CECTag rem(EC_TAG_PARTFILE_SOURCE_NAMES, static_cast<std::uint32_t>(2));
+		rem.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS, static_cast<std::uint32_t>(0)));
+		names.AddTag(rem);
+		CECTag upd(EC_TAG_PARTFILE_SOURCE_NAMES, static_cast<std::uint32_t>(1));
+		upd.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS, static_cast<std::uint32_t>(9)));
+		names.AddTag(upd);
+		pf.AddTag(names);
+		resp.AddTag(pf);
+		ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+	}
+	const auto it = cache.find(404);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_EQUALS(static_cast<size_t>(1), it->second.download.source_names.size());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(9), it->second.download.source_names1.count);
+	ASSERT_TRUE(it->second.download.source_names.find(2) == it->second.download.source_names.end());
+}
+
+// A4AF (issue #421): the auto flag decodes into download.a4af_auto and the
+// EC_TAG_PARTFILE_A4AF_SOURCES container's EC_TAG_ECID children into the a4af_sources list, a full
+// replace when present.
+TEST(Refresher, A4afAutoAndSourcesDecode)
+{
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(505));
+	pf.AddTag(CECTag(EC_TAG_PARTFILE_A4AFAUTO, true));
+	CECEmptyTag a4af(EC_TAG_PARTFILE_A4AF_SOURCES);
+	a4af.AddTag(CECTag(EC_TAG_ECID, static_cast<std::uint32_t>(1234)));
+	a4af.AddTag(CECTag(EC_TAG_ECID, static_cast<std::uint32_t>(5678)));
+	pf.AddTag(a4af);
+	resp.AddTag(pf);
+
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+
+	const auto it = cache.find(505);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_TRUE(it->second.download.a4af_auto);
+	ASSERT_EQUALS(static_cast<size_t>(2), it->second.download.a4af_sources.size());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1234), it->second.download.a4af_sources0);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(5678), it->second.download.a4af_sources1);
+}
+
+// Media metadata (issue #418): the six FT_MEDIA_* EC tags decode into the `media` sub-struct and
+// set `has_media`; a file with no media tags keeps has_media=false, so the API omits the `media`
+// object.
+TEST(Refresher, MediaMetadataDecode)
+{
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(606));
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_LENGTH, static_cast<std::uint32_t>(5400)));
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_BITRATE, static_cast<std::uint32_t>(1500)));
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_CODEC, std::string("h264")));
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_ARTIST, std::string("Some Artist")));
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_ALBUM, std::string("Some Album")));
+	pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_TITLE, std::string("Some Title")));
+	resp.AddTag(pf);
+	// A second file with no media tags stays has_media=false.
+	resp.AddTag(CECTag(EC_TAG_PARTFILE, static_cast<std::uint32_t>(607)));
+
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+
+	const auto it = cache.find(606);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_TRUE(it->second.has_media);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(5400), it->second.media.duration_seconds);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1500), it->second.media.bitrate_kilobits_per_second);
+	ASSERT_EQUALS(std::string("h264"), it->second.media.codec);
+	ASSERT_EQUALS(std::string("Some Artist"), it->second.media.artist);
+	ASSERT_EQUALS(std::string("Some Album"), it->second.media.album);
+	ASSERT_EQUALS(std::string("Some Title"), it->second.media.title);
+
+	const auto it2 = cache.find(607);
+	ASSERT_TRUE(it2 != cache.end());
+	ASSERT_TRUE(!it2->second.has_media);
+}
+
+// The clear half of the same contract. amuled sends a zero or empty value for a field it previously
+// sent a real one for -- a tag simply not offered reads as UNCHANGED to a CValueMap peer, so an
+// omitted field would leave this snapshot serving the stale value, including one inherited
+// unverified from a search result. That is exactly what the completion re-probe exists to correct,
+// and it regressed once already.
+TEST(Refresher, MediaMetadataClearRemovesFieldsAndRecomputesHasMedia)
+{
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(700));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_LENGTH, static_cast<std::uint32_t>(180)));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_BITRATE, static_cast<std::uint32_t>(1500)));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_CODEC, std::string("h264")));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_ARTIST, std::string("Peer Supplied")));
+		resp.AddTag(pf);
+		ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+	}
+	ASSERT_TRUE(cache.find(700)->second.has_media);
+	ASSERT_EQUALS(std::string("Peer Supplied"), cache.find(700)->second.media.artist);
+
+	// The local probe found a codec and nothing else, so amuled clears the
+	// three fields it could not determine and keeps the one it could.
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(700));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_LENGTH, static_cast<std::uint32_t>(0)));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_BITRATE, static_cast<std::uint32_t>(0)));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_ARTIST, std::string()));
+		resp.AddTag(pf);
+		ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+	}
+	const auto it = cache.find(700);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), it->second.media.duration_seconds);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), it->second.media.bitrate_kilobits_per_second);
+	ASSERT_TRUE(it->second.media.artist.empty());
+	// The codec was not mentioned this time, which means UNCHANGED -- not
+	// cleared. Distinguishing those two is the whole point of the design.
+	ASSERT_EQUALS(std::string("h264"), it->second.media.codec);
+	// Still has media, because one field survives.
+	ASSERT_TRUE(it->second.has_media);
+}
+
+TEST(Refresher, MediaMetadataClearingEveryFieldDropsHasMedia)
+{
+	// has_media is DERIVED, not latched: a file whose every field has been cleared must stop
+	// reporting media, or the API keeps emitting an empty `media` object for it.
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(701));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_LENGTH, static_cast<std::uint32_t>(180)));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_CODEC, std::string("mp3")));
+		resp.AddTag(pf);
+		ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+	}
+	ASSERT_TRUE(cache.find(701)->second.has_media);
+	{
+		CECPacket resp(EC_OP_SHARED_FILES);
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(701));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_LENGTH, static_cast<std::uint32_t>(0)));
+		pf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_CODEC, std::string()));
+		resp.AddTag(pf);
+		ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+	}
+	ASSERT_TRUE(!cache.find(701)->second.has_media);
+}
+
+// /servers -- GET_UPDATE wraps per-server tags in an EC_TAG_SERVER container at top level. The
+// walker iterates INTO the container and merges per-ECID; cache entries not seen in the response
+// are evicted, because the server side has no FILE_REMOVED equivalent for servers and the container
+// always carries the full current list.
+
+TEST(Refresher, ServersFromContainerMergesByEcid)
+{
+	std::map<std::uint32_t, ServerSnapshot> cache;
+	// Pre-seed an entry that should disappear: a server the operator removed from amuled
+	// between ticks, so it will not show up in the new response's SERVER container.
+	{
+		ServerSnapshot s;
+		s.ecid = 9999;
+		s.name = "removed";
+		cache.emplace(9999, s);
+	}
+
+	// Build a SERVER container with one per-server child (ECID 42).
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag container(EC_TAG_SERVER, static_cast<std::uint32_t>(0));
+		// One per-server child tag inside the container -- the same EC_TAG_SERVER name, the
+		// walker disambiguating by depth rather than name. The minimum tags needed for the
+		// merge to populate the snapshot.
+		CECTag srv(EC_TAG_SERVER, static_cast<std::uint32_t>(42));
+		srv.AddTag(CECTag(EC_TAG_SERVER_USERS, static_cast<std::uint32_t>(1234)));
+		// #440 server host country ISO code resolved daemon-side.
+		srv.AddTag(CECTag(EC_TAG_SERVER_COUNTRY, wxString::FromUTF8("de")));
+		container.AddTag(srv);
+		resp.AddTag(container);
+	}
+
+	ApplyGetUpdateToServers(&resp, cache);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	ASSERT_TRUE(cache.find(42) != cache.end());
+	ASSERT_TRUE(cache.find(9999) == cache.end()); // evicted
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1234), cache42.users);
+	ASSERT_EQUALS(std::string("de"), cache42.country_code);
+}
+
+// The four fields issue #974 added: publishing limits plus capability bitmasks. They ride the same
+// GET_UPDATE response the rest of the server snapshot comes from, so the only thing to prove is
+// that MergeServerTag reads them and that a tag CValueMap suppressed on an unchanged tick does not
+// clobber the cached value.
+TEST(Refresher, ServerLimitsAndFlagsReachTheSnapshot)
+{
+	std::map<std::uint32_t, ServerSnapshot> cache;
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag container(EC_TAG_SERVER, static_cast<std::uint32_t>(0));
+		CECTag srv(EC_TAG_SERVER, static_cast<std::uint32_t>(7));
+		srv.AddTag(CECTag(EC_TAG_SERVER_FILES_SOFT, static_cast<std::uint32_t>(1000)));
+		srv.AddTag(CECTag(EC_TAG_SERVER_FILES_HARD, static_cast<std::uint32_t>(5000)));
+		srv.AddTag(CECTag(EC_TAG_SERVER_TCP_FLAGS,
+			static_cast<std::uint32_t>(SRV_TCPFLG_COMPRESSION | SRV_TCPFLG_RELATEDSEARCH)));
+		srv.AddTag(CECTag(EC_TAG_SERVER_UDP_FLAGS,
+			static_cast<std::uint32_t>(SRV_UDPFLG_EXT_GETSOURCES | SRV_UDPFLG_LARGEFILES)));
+		container.AddTag(srv);
+		resp.AddTag(container);
+	}
+
+	ApplyGetUpdateToServers(&resp, cache);
+
+	ASSERT_TRUE(cache.find(7) != cache.end());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1000), cache7.soft_file_limit);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(5000), cache7.hard_file_limit);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(SRV_TCPFLG_COMPRESSION | SRV_TCPFLG_RELATEDSEARCH),
+		cache7.tcp_flags);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(SRV_UDPFLG_EXT_GETSOURCES | SRV_UDPFLG_LARGEFILES),
+		cache7.udp_flags);
+
+	// Next tick: the server is still in the list but nothing it announced changed, so CValueMap
+	// suppresses all four tags. The cached values have to survive -- dropping to 0 here would
+	// read as "the server stopped supporting everything".
+	CECPacket quiet(EC_OP_SHARED_FILES);
+	{
+		CECTag container(EC_TAG_SERVER, static_cast<std::uint32_t>(0));
+		CECTag srv(EC_TAG_SERVER, static_cast<std::uint32_t>(7));
+		srv.AddTag(CECTag(EC_TAG_SERVER_USERS, static_cast<std::uint32_t>(42)));
+		container.AddTag(srv);
+		quiet.AddTag(container);
+	}
+
+	ApplyGetUpdateToServers(&quiet, cache);
+
+	ASSERT_EQUALS(static_cast<std::uint32_t>(42), cache7.users);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1000), cache7.soft_file_limit);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(5000), cache7.hard_file_limit);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(SRV_TCPFLG_COMPRESSION | SRV_TCPFLG_RELATEDSEARCH),
+		cache7.tcp_flags);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(SRV_UDPFLG_EXT_GETSOURCES | SRV_UDPFLG_LARGEFILES),
+		cache7.udp_flags);
+}
+
+// A server old enough not to send the tags at all leaves the defaults
+// in place: 0 / 0 / no bits, which the API documents as "not reported".
+TEST(Refresher, ServerWithoutLimitOrFlagTagsKeepsZeroDefaults)
+{
+	std::map<std::uint32_t, ServerSnapshot> cache;
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag container(EC_TAG_SERVER, static_cast<std::uint32_t>(0));
+		CECTag srv(EC_TAG_SERVER, static_cast<std::uint32_t>(3));
+		srv.AddTag(CECTag(EC_TAG_SERVER_USERS, static_cast<std::uint32_t>(9)));
+		container.AddTag(srv);
+		resp.AddTag(container);
+	}
+
+	ApplyGetUpdateToServers(&resp, cache);
+
+	ASSERT_TRUE(cache.find(3) != cache.end());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), cache3.soft_file_limit);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), cache3.hard_file_limit);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), cache3.tcp_flags);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), cache3.udp_flags);
+}
+
+TEST(Refresher, ServersEmptyContainerEmptiesCache)
+{
+	std::map<std::uint32_t, ServerSnapshot> cache;
+	cache.emplace(1, ServerSnapshot{});
+	cache.emplace(2, ServerSnapshot{});
+
+	// Empty SERVER container (operator removed every server). Every
+	// pre-seeded entry is "not seen this tick" → evicted.
+	CECPacket resp(EC_OP_SHARED_FILES);
+	resp.AddTag(CECTag(EC_TAG_SERVER, static_cast<std::uint32_t>(0)));
+
+	ApplyGetUpdateToServers(&resp, cache);
+
+	ASSERT_TRUE(cache.empty());
+}
+
+TEST(Refresher, ServersNoContainerLeavesCacheAlone)
+{
+	// Defensive: if a response is missing the SERVER container entirely -- which production
+	// amuled never does, it always emits the container even when empty -- the walker leaves the
+	// cache untouched. Better than wiping on an unexpected wire shape.
+	std::map<std::uint32_t, ServerSnapshot> cache;
+	cache.emplace(7, ServerSnapshot{});
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	// No EC_TAG_SERVER container in the response.
+
+	ApplyGetUpdateToServers(&resp, cache);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	ASSERT_TRUE(cache.find(7) != cache.end());
+}
+
+// Friends -- the same container shape as servers: full list every tick, per-field CValueMap
+// suppression, eviction by "not seen".
+
+TEST(Refresher, FriendsFromContainerMergesByEcid)
+{
+	std::map<std::uint32_t, FriendSnapshot> cache;
+	{
+		// A friend removed on the daemon side between ticks.
+		FriendSnapshot f;
+		f.ecid = 9999;
+		f.name = "removed";
+		cache.emplace(9999, f);
+	}
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag container(EC_TAG_FRIEND, static_cast<std::uint32_t>(0));
+		CECTag fr(EC_TAG_FRIEND, static_cast<std::uint32_t>(12));
+		fr.AddTag(CECTag(EC_TAG_FRIEND_NAME, wxString::FromUTF8("alice")));
+		fr.AddTag(CECTag(EC_TAG_FRIEND_IP, static_cast<std::uint32_t>(0x2A7100CB)));
+		fr.AddTag(CECTag(EC_TAG_FRIEND_PORT, static_cast<std::uint16_t>(4662)));
+		fr.AddTag(CECTag(EC_TAG_FRIEND_CLIENT, static_cast<std::uint32_t>(4382)));
+		fr.AddTag(CECTag(EC_TAG_FRIEND_FRIENDSLOT, true));
+		container.AddTag(fr);
+		resp.AddTag(container);
+	}
+
+	ApplyGetUpdateToFriends(&resp, cache);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	ASSERT_TRUE(cache.find(12) != cache.end());
+	ASSERT_TRUE(cache.find(9999) == cache.end()); // evicted
+	ASSERT_EQUALS(std::string("alice"), cache12.name);
+	ASSERT_EQUALS(std::string("203.0.113.42"), cache12.ip);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(4662), cache12.port);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(4382), cache12.client_ecid);
+	ASSERT_TRUE(cache12.friend_slot);
+}
+
+TEST(Refresher, FriendsSuppressedFieldsKeepCachedValues)
+{
+	// CValueMap omits unchanged fields, so a tick carrying only the changed one must not blank
+	// the rest. The friend goes offline (CLIENT -> 0) and nothing else is sent.
+	std::map<std::uint32_t, FriendSnapshot> cache;
+	{
+		FriendSnapshot f;
+		f.ecid = 12;
+		f.name = "alice";
+		f.ip = "203.0.113.42";
+		f.port = 4662;
+		f.client_ecid = 4382;
+		f.friend_slot = true;
+		cache.emplace(12, f);
+	}
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag container(EC_TAG_FRIEND, static_cast<std::uint32_t>(0));
+		CECTag fr(EC_TAG_FRIEND, static_cast<std::uint32_t>(12));
+		fr.AddTag(CECTag(EC_TAG_FRIEND_CLIENT, static_cast<std::uint32_t>(0)));
+		container.AddTag(fr);
+		resp.AddTag(container);
+	}
+
+	ApplyGetUpdateToFriends(&resp, cache);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), cache12.client_ecid); // went offline
+	ASSERT_EQUALS(std::string("alice"), cache12.name);                 // preserved
+	ASSERT_EQUALS(std::string("203.0.113.42"), cache12.ip);            // preserved
+	ASSERT_TRUE(cache12.friend_slot);                                  // preserved
+}
+
+TEST(Refresher, FriendsWithoutSlotTagReadFalse)
+{
+	// An older daemon does not serialize EC_TAG_FRIEND_FRIENDSLOT at all.
+	// The snapshot must degrade to false rather than carrying junk.
+	std::map<std::uint32_t, FriendSnapshot> cache;
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag container(EC_TAG_FRIEND, static_cast<std::uint32_t>(0));
+		CECTag fr(EC_TAG_FRIEND, static_cast<std::uint32_t>(5));
+		fr.AddTag(CECTag(EC_TAG_FRIEND_NAME, wxString::FromUTF8("bob")));
+		container.AddTag(fr);
+		resp.AddTag(container);
+	}
+
+	ApplyGetUpdateToFriends(&resp, cache);
+
+	ASSERT_TRUE(cache.find(5) != cache.end());
+	ASSERT_TRUE(!cache5.friend_slot);
+	ASSERT_EQUALS(std::string(""), cache5.ip); // zero IP renders empty
+}
+
+TEST(Refresher, FriendsNoContainerLeavesCacheAlone)
+{
+	std::map<std::uint32_t, FriendSnapshot> cache;
+	cache.emplace(7, FriendSnapshot{});
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	// No EC_TAG_FRIEND container at all.
+
+	ApplyGetUpdateToFriends(&resp, cache);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	ASSERT_TRUE(cache.find(7) != cache.end());
+}
+
+// RLE state map -- cleaned up alongside the cache when a partfile is evicted via FILE_REMOVED.
+// Without the cleanup the decoder's internal buffer, ~200 KB per partfile on TB-class files, would
+// slowly leak.
+
+TEST(Refresher, RleStateErasedAlongsideFileRemoved)
+{
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	{
+		FileSnapshot d;
+		d.ecid = 77;
+		d.hash = "aaaa0000aaaa0000aaaa0000aaaa0000";
+		d.name = "doomed.iso";
+		cache.emplace(77, d);
+		// Simulate a previous tick having allocated a decoder for ECID 77.
+		rle_state.emplace(77, PartFileEncoderData{});
+	}
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	resp.AddTag(CECTag(EC_TAG_FILE_REMOVED, static_cast<std::uint32_t>(77)));
+
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+
+	ASSERT_TRUE(cache.find(77) == cache.end());
+	ASSERT_TRUE(rle_state.find(77) == rle_state.end());
+}
+
+TEST(Refresher, RleStatePreservedForKnownEntryAcrossTick)
+{
+	// A partfile already in cache should KEEP its RLE state across a tick that brings no new
+	// info. The decoder relies on its buffer surviving from the prior tick.
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+	{
+		FileSnapshot d;
+		d.ecid = 5;
+		d.hash = "bbbb1111bbbb1111bbbb1111bbbb1111";
+		d.name = "stable.iso";
+		cache.emplace(5, d);
+		rle_state.emplace(5, PartFileEncoderData{});
+	}
+
+	// A no-op response (no PARTFILE tags, no FILE_REMOVED). Nothing
+	// should churn.
+	CECPacket resp(EC_OP_SHARED_FILES);
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+
+	ASSERT_TRUE(cache.find(5) != cache.end());
+	ASSERT_TRUE(rle_state.find(5) != rle_state.end());
+}
+
+// /stats/tree -- the recursive walk strips the root container and surfaces its children at the top
+// level. Crafted as a hand-built CECTag tree.
+
+TEST(Refresher, StatusDecodeCompleteOverridesStopped)
+{
+	// A completed download in amuled sits in `m_completedDownloads` with
+	// EC_TAG_PARTFILE_STOPPED set true. The decoder used to short-circuit on `stopped` and
+	// report "paused", masking the PS_COMPLETE state from /downloads consumers and breaking the
+	// status=="completed" filter. PS_COMPLETE, and PS_COMPLETING, must take priority over the
+	// stopped flag.
+	//
+	// PS_COMPLETE = 9 (Constants.h). Crafting a partfile tag with PS_STATUS=9 + STOPPED=true
+	// exercises the merge path through ApplyGetUpdateToDownloads.
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(101));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_STATUS, static_cast<std::uint8_t>(9 /* PS_COMPLETE */)));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_STOPPED, true));
+		resp.AddTag(pf);
+	}
+
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+
+	ASSERT_TRUE(cache.find(101) != cache.end());
+	ASSERT_EQUALS(std::string("completed"), cache.find(101)->second.download.status);
+}
+
+TEST(Refresher, StatusDecodeCompletingOverridesStopped)
+{
+	// Same shape: PS_COMPLETING (=8) takes priority over stopped too. Covers the in-flight
+	// finalization race where the cache is being moved from m_filelist to m_completedDownloads.
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(102));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_STATUS, static_cast<std::uint8_t>(8 /* PS_COMPLETING */)));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_STOPPED, true));
+		resp.AddTag(pf);
+	}
+
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+	ASSERT_TRUE(cache.find(102) != cache.end());
+	ASSERT_EQUALS(std::string("completing"), cache.find(102)->second.download.status);
+}
+
+TEST(Refresher, StatusDecodeStoppedNonCompleteReportsStopped)
+{
+	// A download that is stopped but NOT yet completed (the user hit Stop mid-transfer)
+	// surfaces as the distinct wire status "stopped": stop = pause + drop all sources + reset
+	// the Kad source search, and clients need to tell it apart from a plain "paused", which
+	// keeps its sources. PS_COMPLETE / PS_COMPLETING still take priority over the stopped flag
+	// -- see the two tests above.
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(103));
+		// PS_READY = 0 (transferring). User stopped it.
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_STATUS, static_cast<std::uint8_t>(0)));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_STOPPED, true));
+		resp.AddTag(pf);
+	}
+
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+	ASSERT_TRUE(cache.find(103) != cache.end());
+	ASSERT_EQUALS(std::string("stopped"), cache.find(103)->second.download.status);
+}
+
+TEST(Refresher, StatusDecodePausedNotStoppedReportsPaused)
+{
+	// The complement: a paused file that is NOT stopped (PS_PAUSED with the stopped flag clear)
+	// keeps its sources and reports "paused", distinct from the "stopped" state above. Pins
+	// that the "stopped" wire status is gated on EC_TAG_PARTFILE_STOPPED, not on PS_PAUSED.
+	FileMap cache;
+	std::map<std::uint32_t, PartFileEncoderData> rle_state;
+
+	CECPacket resp(EC_OP_SHARED_FILES);
+	{
+		CECTag pf(EC_TAG_PARTFILE, static_cast<std::uint32_t>(104));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_STATUS, static_cast<std::uint8_t>(7 /* PS_PAUSED */)));
+		pf.AddTag(CECTag(EC_TAG_PARTFILE_STOPPED, false));
+		resp.AddTag(pf);
+	}
+
+	ApplyGetUpdateToDownloads(&resp, cache, rle_state);
+	ASSERT_TRUE(cache.find(104) != cache.end());
+	ASSERT_EQUALS(std::string("paused"), cache.find(104)->second.download.status);
+}
+
+TEST(Refresher, ParseStatsTreeStripsRootAndRecursesChildren)
+{
+	// Build:
+	//  root
+	//  ├── Transfer
+	//  │   └── Total bytes ...
+	//  └── Connection
+	CECPacket resp(EC_OP_STATSTREE);
+	CECTag root(EC_TAG_STATTREE_NODE, wxString("root-container-label-discarded"));
+	{
+		CECTag transfer(EC_TAG_STATTREE_NODE, wxString("Transfer"));
+		// Nodes may carry a stable machine key; Connection below omits it
+		// to exercise the "no key" path.
+		transfer.AddTag(CECTag(EC_TAG_STAT_NODE_KEY, wxString("transfer")));
+		{
+			CECTag total(EC_TAG_STATTREE_NODE, wxString("Total bytes transferred: 12.3 GiB"));
+			// Raw numeric ratios ride along as distinctly-named double tags.
+			total.AddTag(CECTag(EC_TAG_STAT_NODE_RATIO, static_cast<double>(2.5)));
+			total.AddTag(CECTag(EC_TAG_STAT_NODE_RATIO_TOTAL, static_cast<double>(3.5)));
+			transfer.AddTag(total);
+		}
+		root.AddTag(transfer);
+	}
+	{
+		CECTag conn(EC_TAG_STATTREE_NODE, wxString("Connection"));
+		root.AddTag(conn);
+	}
+	resp.AddTag(root);
+
+	StatsTreeNode out;
+	ParseStatsTreeFromPacket(&resp, out);
+
+	// The root container itself is discarded; we expose its 2 children
+	// (Transfer + Connection) as top-level nodes.
+	ASSERT_TRUE(out.label.empty());
+	ASSERT_EQUALS(static_cast<size_t>(2), out.children.size());
+	// Transfer subtree.
+	ASSERT_EQUALS(std::string("Transfer"), out.children0.label);
+	// Stable machine key is parsed when present...
+	ASSERT_EQUALS(std::string("transfer"), out.children0.key);
+	ASSERT_EQUALS(static_cast<size_t>(1), out.children0.children.size());
+	ASSERT_EQUALS(std::string("Total bytes transferred: 12.3 GiB"), out.children0.children0.label);
+	// ...and empty when the node omits the tag (Transfer's child + Connection).
+	ASSERT_TRUE(out.children0.children0.key.empty());
+	// Raw numeric ratios are parsed from the distinctly-named double tags.
+	ASSERT_TRUE(out.children0.children0.has_ratio_session);
+	ASSERT_TRUE(out.children0.children0.ratio_session > 2.49 &&
+		    out.children0.children0.ratio_session < 2.51);
+	ASSERT_TRUE(out.children0.children0.has_ratio_total);
+	ASSERT_TRUE(out.children0.children0.ratio_total > 3.49 &&
+		    out.children0.children0.ratio_total < 3.51);
+	// Nodes without the ratio tags report neither.
+	ASSERT_TRUE(!out.children0.has_ratio_session);
+	ASSERT_TRUE(!out.children0.has_ratio_total);
+	// Connection is a leaf at this depth.
+	ASSERT_EQUALS(std::string("Connection"), out.children1.label);
+	ASSERT_TRUE(out.children1.key.empty());
+	ASSERT_EQUALS(static_cast<size_t>(0), out.children1.children.size());
+}
+
+// AdvanceSearchProgress -- maps EC_TAG_SEARCH_LIFECYCLE_STATE + EC_TAG_SEARCH_LIFECYCLE_PERCENT
+// into (percent, complete, active). Trusts the daemon's flags; the percent is the daemon's unified
+// 0..100 for every kind (global = real, Kad = cosmetic ramp), so amuleapi no longer masks it per-
+// kind -- it passes it through and clamps.
+
+namespace
+{
+
+webapi::SearchProgressSnapshot MakeActive(const std::string &kind)
+{
+	webapi::SearchProgressSnapshot s;
+	s.active = true;
+	s.kind = kind;
+	return s;
+}
+
+constexpr std::uint32_t LIFECYCLE_IDLE = 0;
+constexpr std::uint32_t LIFECYCLE_RUNNING = 1;
+constexpr std::uint32_t LIFECYCLE_FINISHED = 2;
+
+} // namespace
+
+// Search result status + type (issue #429): EC_TAG_PARTFILE_STATUS decodes to the lowercase status
+// string, and `type` is derived from the filename. The union reply is not per-search: every result
+// carries EC_TAG_SEARCH_ID the first time the daemon mentions it, and the applier attributes later
+// diffed tags through the ECID -> search_id index. These fixtures therefore stamp one search id on
+// every result tag and pre-create its slot, which is what the refresher does via MarkSearchStarted
+// before any poll runs.
+static constexpr std::uint32_t kSid = 4242;
+
+TEST(Refresher, SearchResultStatusAndTypeDecode)
+{
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+	std::map<std::uint32_t, SearchResult> &cache = slotskSid.results;
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	sf.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("cool.movie.mkv")));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, static_cast<std::uint64_t>(123)));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_STATUS, static_cast<std::uint32_t>(2))); // QUEUED
+	resp.AddTag(sf);
+	// A second result with no status tag defaults to "new"; a .mp3 → audio.
+	CECTag sf2(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(71));
+	sf2.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf2.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("song.mp3")));
+	sf2.AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, static_cast<std::uint64_t>(4)));
+	resp.AddTag(sf2);
+
+	ApplySearchUnion(&resp, slots, owner);
+
+	const auto it = cache.find(70);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_EQUALS(std::string("queued"), it->second.status);
+	// Normalised from GetFiletypeByName's UI label: singular, snake_case, and "unknown" rather
+	// than "any". The same token set as the shared-detail file_type, which shares this helper.
+	ASSERT_EQUALS(std::string("video"), it->second.type);
+
+	const auto it2 = cache.find(71);
+	ASSERT_TRUE(it2 != cache.end());
+	ASSERT_EQUALS(std::string("new"), it2->second.status);
+	ASSERT_EQUALS(std::string("audio"), it2->second.type);
+}
+
+TEST(Refresher, SearchProgressRunningCarriesPercentForGlobal)
+{
+	using webapi::AdvanceSearchProgress;
+	webapi::SearchProgressSnapshot s = MakeActive("global");
+	s = AdvanceSearchProgress(s, LIFECYCLE_RUNNING, /*pct=*/42);
+	ASSERT_TRUE(s.active);
+	ASSERT_TRUE(!s.complete);
+	ASSERT_EQUALS(static_cast<uint32_t>(42), s.percent);
+}
+
+TEST(Refresher, SearchProgressRunningPassesThroughKadRamp)
+{
+	using webapi::AdvanceSearchProgress;
+	webapi::SearchProgressSnapshot s = MakeActive("kad");
+	// The daemon synthesises a cosmetic time-ramp for Kad and ships it in
+	// EC_TAG_SEARCH_LIFECYCLE_PERCENT, so amuleapi no longer masks Kad to 0 -- it passes the
+	// daemon value straight through.
+	s = AdvanceSearchProgress(s, LIFECYCLE_RUNNING, /*pct=*/37);
+	ASSERT_TRUE(s.active);
+	ASSERT_EQUALS(static_cast<uint32_t>(37), s.percent);
+}
+
+TEST(Refresher, SearchProgressRunningClampsPercentAbove100)
+{
+	using webapi::AdvanceSearchProgress;
+	webapi::SearchProgressSnapshot s = MakeActive("global");
+	// The daemon's percent tag is 0..100, but stay defensive: any value
+	// above 100 is clamped rather than surfaced raw to consumers.
+	s = AdvanceSearchProgress(s, LIFECYCLE_RUNNING, /*pct=*/250);
+	ASSERT_TRUE(s.active);
+	ASSERT_EQUALS(static_cast<uint32_t>(100), s.percent);
+}
+
+TEST(Refresher, SearchProgressFinishedSetsComplete)
+{
+	using webapi::AdvanceSearchProgress;
+	webapi::SearchProgressSnapshot s = MakeActive("global");
+	s = AdvanceSearchProgress(s, LIFECYCLE_FINISHED, /*pct=*/0);
+	ASSERT_TRUE(!s.active);
+	ASSERT_TRUE(s.complete);
+	ASSERT_EQUALS(static_cast<uint32_t>(100), s.percent);
+}
+
+TEST(Refresher, SearchProgressIdleZeroesOutGracefully)
+{
+	using webapi::AdvanceSearchProgress;
+	webapi::SearchProgressSnapshot s = MakeActive("kad");
+	// Refresher shouldn't call us with state=IDLE (it gates on active
+	// being true on entry), but stay defensive: flip both flags off.
+	s = AdvanceSearchProgress(s, LIFECYCLE_IDLE, /*pct=*/0);
+	ASSERT_TRUE(!s.active);
+	ASSERT_TRUE(!s.complete);
+	ASSERT_EQUALS(static_cast<uint32_t>(0), s.percent);
+}
+
+// Search result media metadata (issue #430): the EC_TAG_KNOWNFILE_MEDIA_* tags, present only for
+// hits known or probed locally, decode into the SearchResult media sub-struct and set has_media; a
+// hit with none stays has_media=false so the API omits the `media` object.
+TEST(Refresher, SearchResultMediaDecode)
+{
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+	std::map<std::uint32_t, SearchResult> &cache = slotskSid.results;
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(80));
+	sf.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("show.s01e01.mkv")));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, static_cast<std::uint64_t>(999)));
+	sf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_LENGTH, static_cast<std::uint32_t>(1320)));
+	sf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_BITRATE, static_cast<std::uint32_t>(2500)));
+	sf.AddTag(CECTag(EC_TAG_KNOWNFILE_MEDIA_CODEC, std::string("h264")));
+	resp.AddTag(sf);
+	// A second hit with no media tags stays has_media=false.
+	CECTag sf2(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(81));
+	sf2.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf2.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("nomedia.bin")));
+	sf2.AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, static_cast<std::uint64_t>(4)));
+	resp.AddTag(sf2);
+
+	ApplySearchUnion(&resp, slots, owner);
+
+	const auto it = cache.find(80);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_TRUE(it->second.has_media);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1320), it->second.media.duration_seconds);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(2500), it->second.media.bitrate_kilobits_per_second);
+	ASSERT_EQUALS(std::string("h264"), it->second.media.codec);
+
+	const auto it2 = cache.find(81);
+	ASSERT_TRUE(it2 != cache.end());
+	ASSERT_TRUE(!it2->second.has_media);
+}
+
+// #431: result grouping folds same-hash/diff-name children. A parent plus two children, each
+// carrying EC_TAG_SEARCH_PARENT, must collapse to a single top-level result with the two
+// alternative names nested in children; the child ECIDs must not remain top-level.
+TEST(Refresher, SearchResultGroupingFoldsChildren)
+{
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+	std::map<std::uint32_t, SearchResult> &cache = slotskSid.results;
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+
+	CECTag parent(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(100));
+	parent.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	parent.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("best.mkv")));
+	parent.AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, static_cast<std::uint64_t>(123)));
+	parent.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, static_cast<std::uint32_t>(30)));
+	resp.AddTag(parent);
+
+	CECTag c1(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(101));
+	c1.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	c1.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("alt.name.mkv")));
+	c1.AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, static_cast<std::uint64_t>(123)));
+	c1.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, static_cast<std::uint32_t>(10)));
+	c1.AddTag(CECTag(EC_TAG_SEARCH_PARENT, static_cast<std::uint32_t>(100)));
+	resp.AddTag(c1);
+
+	CECTag c2(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(102));
+	c2.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	c2.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("third.mkv")));
+	c2.AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, static_cast<std::uint64_t>(123)));
+	c2.AddTag(CECTag(EC_TAG_SEARCH_PARENT, static_cast<std::uint32_t>(100)));
+	resp.AddTag(c2);
+
+	ApplySearchUnion(&resp, slots, owner);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), cache.size());
+	const auto it = cache.find(100);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_TRUE(cache.find(101) == cache.end());
+	ASSERT_TRUE(cache.find(102) == cache.end());
+	ASSERT_EQUALS(static_cast<size_t>(2), it->second.children.size());
+	// map iterates ecid-ascending, so 101 folds before 102.
+	ASSERT_EQUALS(std::string("alt.name.mkv"), it->second.children0.name);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(101), it->second.children0.ecid);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(10), it->second.children0.source_count);
+	ASSERT_EQUALS(std::string("third.mkv"), it->second.children1.name);
+}
+
+// Browse results carry the folder they live in. EC_TAG_SEARCHFILE_DIRECTORY is attached by the core
+// only to results filed from a peer's shared-file listing, which is what makes it the browse-only
+// "Directories" column. It is per-RESULT, not per-search: two copies of one file in different
+// folders of the same share group land under a single parent, and each must keep its own folder.
+TEST(Refresher, SearchResultDirectoryDecodesAndRidesEachChild)
+{
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+	std::map<std::uint32_t, SearchResult> &cache = slotskSid.results;
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+
+	CECTag parent(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(200));
+	parent.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	parent.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("shared.iso")));
+	parent.AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, static_cast<std::uint64_t>(4096)));
+	parent.AddTag(CECTag(EC_TAG_SEARCHFILE_DIRECTORY, std::string("Incoming/ISOs")));
+	resp.AddTag(parent);
+
+	CECTag child(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(201));
+	child.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	child.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("shared-copy.iso")));
+	child.AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, static_cast<std::uint64_t>(4096)));
+	child.AddTag(CECTag(EC_TAG_SEARCH_PARENT, static_cast<std::uint32_t>(200)));
+	child.AddTag(CECTag(EC_TAG_SEARCHFILE_DIRECTORY, std::string("Backup/ISOs")));
+	resp.AddTag(child);
+
+	ApplySearchUnion(&resp, slots, owner);
+
+	const auto it = cache.find(200);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_EQUALS(std::string("Incoming/ISOs"), it->second.directory);
+	ASSERT_EQUALS(static_cast<size_t>(1), it->second.children.size());
+	// The child keeps ITS folder rather than inheriting the parent's.
+	ASSERT_EQUALS(std::string("Backup/ISOs"), it->second.children0.directory);
+}
+
+TEST(Refresher, SearchResultDirectoryEmptyOnOrdinaryHit)
+{
+	// A server/Kad hit never carries the tag, and must report an empty
+	// string rather than anything that could read as a real folder.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+	std::map<std::uint32_t, SearchResult> &cache = slotskSid.results;
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	CECTag hit(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(300));
+	hit.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	hit.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("remote.iso")));
+	resp.AddTag(hit);
+
+	ApplySearchUnion(&resp, slots, owner);
+
+	const auto it = cache.find(300);
+	ASSERT_TRUE(it != cache.end());
+	ASSERT_TRUE(it->second.directory.empty());
+}
+
+// #359: peer software_version must be locale-independent. The daemon formats the version string
+// with gettext, so an unidentified client yields _("Unknown") -- "Desconocido" on a Spanish daemon.
+// amuleapi is a separate process and cannot reverse the translation, so the refresher keys off the
+// numeric software code and emits the lowercase "unknown" sentinel instead of the translated
+// string.
+
+// Build a one-client GET_UPDATE response: an EC_TAG_CLIENT container with a single child client
+// carrying the software code and, optionally, a version string. Mirrors the amuled-side
+// EC_TAG_CLIENT shape.
+static void PutOneClient(CECPacket &resp,
+	std::uint32_t ecid,
+	std::uint32_t soft,
+	const char *ver_str /* nullptr = omit the version tag */)
+{
+	CECTag container(EC_TAG_CLIENT, static_cast<std::uint32_t>(0));
+	CECTag cli(EC_TAG_CLIENT, ecid);
+	cli.AddTag(CECTag(EC_TAG_CLIENT_SOFTWARE, soft));
+	if (ver_str)
+		cli.AddTag(CECTag(EC_TAG_CLIENT_SOFT_VER_STR, wxString::FromUTF8(ver_str)));
+	container.AddTag(cli);
+	resp.AddTag(container);
+}
+
+// Per-part bitmaps (issue #984). Three wire conventions have to survive the decoder: an EMPTY tag
+// means "holds every part", the buffer is LSB-first within each byte, and an absent tag means
+// unchanged rather than zero.
+static void PutClientWithPartStatus(CECPacket &resp,
+	std::uint32_t ecid,
+	const std::uint8_t *buf /* nullptr = empty tag */,
+	std::size_t len)
+{
+	CECTag container(EC_TAG_CLIENT, static_cast<std::uint32_t>(0));
+	CECTag cli(EC_TAG_CLIENT, ecid);
+	if (buf) {
+		cli.AddTag(CECTag(EC_TAG_CLIENT_PART_STATUS, len, buf));
+	} else {
+		cli.AddTag(CECEmptyTag(EC_TAG_CLIENT_PART_STATUS));
+	}
+	container.AddTag(cli);
+	resp.AddTag(container);
+}
+
+TEST(Refresher, ClientEmptyPartStatusMeansFullSource)
+{
+	std::map<std::uint32_t, ClientSnapshot> cache;
+	const FileMap no_files;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	PutClientWithPartStatus(resp, 11, nullptr, 0);
+
+	ApplyGetUpdateToClients(&resp, cache, no_files);
+
+	ASSERT_TRUE(cache.find(11) != cache.end());
+	ASSERT_TRUE(cache11.has_part_status);
+	// "all" rather than an empty bitmap: the true length is the file's part
+	// count, which only the renderer knows.
+	ASSERT_TRUE(cache11.part_status_all);
+	ASSERT_TRUE(cache11.part_status.empty());
+}
+
+TEST(Refresher, ClientPartStatusIsDecodedLsbFirst)
+{
+	std::map<std::uint32_t, ClientSnapshot> cache;
+	const FileMap no_files;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	// 0x05 = bits 0 and 2 set, LSB-first (BitVector::s_posMask).
+	const std::uint8_t buf = { 0x05 };
+	PutClientWithPartStatus(resp, 12, buf, sizeof(buf));
+
+	ApplyGetUpdateToClients(&resp, cache, no_files);
+
+	ASSERT_TRUE(cache.find(12) != cache.end());
+	ASSERT_TRUE(cache12.has_part_status);
+	ASSERT_TRUE(!cache12.part_status_all);
+	ASSERT_EQUALS(static_cast<size_t>(8), cache12.part_status.size());
+	ASSERT_TRUE(cache12.part_status0);
+	ASSERT_TRUE(!cache12.part_status1);
+	ASSERT_TRUE(cache12.part_status2);
+	ASSERT_TRUE(!cache12.part_status7);
+}
+
+// The same helper plus a REQUEST_FILE ECID, for the swap tests below. The core always sends that
+// tag when the request file changes (AddDiffTag), and sends it as a literal 0 when the peer stops
+// requesting anything (ECSpecialCoreTags.cpp:443).
+static void PutClientWithReqFileAndPartStatus(CECPacket &resp,
+	std::uint32_t ecid,
+	std::uint32_t req_file_ecid,
+	const std::uint8_t *buf /* nullptr = no part-status tag at all */,
+	std::size_t len)
+{
+	CECTag container(EC_TAG_CLIENT, static_cast<std::uint32_t>(0));
+	CECTag cli(EC_TAG_CLIENT, ecid);
+	cli.AddTag(CECTag(EC_TAG_CLIENT_REQUEST_FILE, req_file_ecid));
+	if (buf) {
+		cli.AddTag(CECTag(EC_TAG_CLIENT_PART_STATUS, len, buf));
+	}
+	container.AddTag(cli);
+	resp.AddTag(container);
+}
+
+// ApplyGetUpdateToClients resolves a peer's ECID against the live file map,
+// so the fixtures need FileMap entries rather than a bare ecid->hash map.
+static FileMap FilesWithHashes(std::initializer_list<std::pair<std::uint32_t, const char *>> rows)
+{
+	FileMap m;
+	for (const auto &row : rows) {
+		FileSnapshot f;
+		f.ecid = row.first;
+		f.hash = row.second;
+		m.emplace(row.first, std::move(f));
+	}
+	return m;
+}
+
+TEST(Refresher, ClientPartStatusIsDroppedWhenTheRequestFileChanges)
+{
+	// An A4AF swap. CUpDownClient::SetReqFile clears m_downPartStatus without repopulating it,
+	// and the core then sends no PART_STATUS until the peer answers for the new file -- so a
+	// bitmap kept across the change would describe the OLD file and report the peer as holding
+	// parts of a file it has never sent a status for.
+	std::map<std::uint32_t, ClientSnapshot> cache;
+	const FileMap files = FilesWithHashes(
+		{ { 70, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" }, { 71, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" } });
+
+	const std::uint8_t buf = { 0x05 };
+	CECPacket first(EC_OP_SHARED_FILES);
+	PutClientWithReqFileAndPartStatus(first, 20, 70, buf, sizeof(buf));
+	ApplyGetUpdateToClients(&first, cache, files);
+	ASSERT_TRUE(cache20.has_part_status);
+	ASSERT_EQUALS(std::string("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"), cache20.download_file_hash);
+
+	// Second tick: same peer, different file, and no PART_STATUS with it.
+	CECPacket second(EC_OP_SHARED_FILES);
+	PutClientWithReqFileAndPartStatus(second, 20, 71, nullptr, 0);
+	ApplyGetUpdateToClients(&second, cache, files);
+
+	ASSERT_EQUALS(std::string("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"), cache20.download_file_hash);
+	ASSERT_TRUE(!cache20.has_part_status);
+	ASSERT_TRUE(!cache20.part_status_all);
+	ASSERT_TRUE(cache20.part_status.empty());
+}
+
+TEST(Refresher, ClientPartStatusInTheSameTickSurvivesTheFileChange)
+{
+	// The invalidation must not eat a bitmap the same packet carries: the hash is merged before
+	// the PART_STATUS decode, so a peer that swaps and reports its new status in one tick keeps
+	// the new status.
+	std::map<std::uint32_t, ClientSnapshot> cache;
+	const FileMap files = FilesWithHashes(
+		{ { 70, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" }, { 71, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" } });
+
+	const std::uint8_t old_buf = { 0x05 };
+	CECPacket first(EC_OP_SHARED_FILES);
+	PutClientWithReqFileAndPartStatus(first, 21, 70, old_buf, sizeof(old_buf));
+	ApplyGetUpdateToClients(&first, cache, files);
+
+	const std::uint8_t new_buf = { 0x02 };
+	CECPacket second(EC_OP_SHARED_FILES);
+	PutClientWithReqFileAndPartStatus(second, 21, 71, new_buf, sizeof(new_buf));
+	ApplyGetUpdateToClients(&second, cache, files);
+
+	ASSERT_EQUALS(std::string("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"), cache21.download_file_hash);
+	ASSERT_TRUE(cache21.has_part_status);
+	ASSERT_TRUE(!cache21.part_status0);
+	ASSERT_TRUE(cache21.part_status1);
+}
+
+TEST(Refresher, ClientRequestFileZeroClearsTheDownloadHash)
+{
+	// The core spells "no request file" as the tag carrying 0, not as an absent tag. Reading
+	// that as "unchanged" left a finished peer listed as a source of the file it had just
+	// completed, bitmap and all.
+	std::map<std::uint32_t, ClientSnapshot> cache;
+	const FileMap files = FilesWithHashes({ { 70, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" } });
+
+	const std::uint8_t buf = { 0x05 };
+	CECPacket first(EC_OP_SHARED_FILES);
+	PutClientWithReqFileAndPartStatus(first, 22, 70, buf, sizeof(buf));
+	ApplyGetUpdateToClients(&first, cache, files);
+	ASSERT_EQUALS(std::string("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"), cache22.download_file_hash);
+
+	CECPacket second(EC_OP_SHARED_FILES);
+	PutClientWithReqFileAndPartStatus(second, 22, 0, nullptr, 0);
+	ApplyGetUpdateToClients(&second, cache, files);
+
+	ASSERT_TRUE(cache22.download_file_hash.empty());
+	ASSERT_TRUE(!cache22.has_part_status);
+	ASSERT_TRUE(cache22.part_status.empty());
+}
+
+TEST(Refresher, ClientAbsentPartStatusLeavesCachedBitmap)
+{
+	// Tagmap convention: a tick that does not carry the tag says nothing
+	// about it, so a previously decoded bitmap must survive.
+	std::map<std::uint32_t, ClientSnapshot> cache;
+	{
+		ClientSnapshot c;
+		c.ecid = 13;
+		c.part_status = { true, false, true };
+		c.has_part_status = true;
+		cache.emplace(13, c);
+	}
+	const FileMap no_files;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	PutOneClient(resp, 13, static_cast<std::uint32_t>(SO_AMULE), nullptr);
+
+	ApplyGetUpdateToClients(&resp, cache, no_files);
+
+	ASSERT_TRUE(cache13.has_part_status);
+	ASSERT_EQUALS(static_cast<size_t>(3), cache13.part_status.size());
+	ASSERT_TRUE(cache13.part_status0);
+	ASSERT_TRUE(cache13.part_status2);
+}
+
+TEST(Refresher, ClientVersionUnknownIsLeftEmptyRatherThanTranslated)
+{
+	std::map<std::uint32_t, ClientSnapshot> cache;
+	const FileMap no_files;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	// Unidentified client + a translated version string, as a non-English
+	// daemon would ship it. Must NOT leak into the API response.
+	PutOneClient(resp, 7, static_cast<std::uint32_t>(SO_UNKNOWN), "Desconocido");
+	ApplyGetUpdateToClients(&resp, cache, no_files);
+	ASSERT_TRUE(cache.find(7) != cache.end());
+	// The locale leak is what this test exists to catch: whatever the
+	// representation of "no version", it must not be the daemon's string.
+	ASSERT_TRUE(cache7.software_version != "Desconocido");
+	// Empty here, null on the wire. Not an "unknown" sentinel: software_version
+	// is free text, so there is no enum member to fall back to, and R10 spells an unknown value
+	// null.
+	ASSERT_EQUALS(std::string(), cache7.software_version);
+}
+
+TEST(Refresher, ClientVersionKnownStringPassesThrough)
+{
+	std::map<std::uint32_t, ClientSnapshot> cache;
+	const FileMap no_files;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	PutOneClient(resp, 8, static_cast<std::uint32_t>(SO_AMULE), "aMule 2.3.3");
+	ApplyGetUpdateToClients(&resp, cache, no_files);
+	ASSERT_TRUE(cache.find(8) != cache.end());
+	ASSERT_EQUALS(std::string("aMule 2.3.3"), cache8.software_version);
+}
+
+TEST(Refresher, ClientKnownButNoVersionStringIsLeftEmpty)
+{
+	std::map<std::uint32_t, ClientSnapshot> cache;
+	const FileMap no_files;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	// Known software, but the daemon shipped no version string at all.
+	PutOneClient(resp, 9, static_cast<std::uint32_t>(SO_EMULE), nullptr);
+	ApplyGetUpdateToClients(&resp, cache, no_files);
+	ASSERT_TRUE(cache.find(9) != cache.end());
+	// `software` still identifies the peer as eMule; only the version is
+	// unknown, and it reaches the wire as null.
+	ASSERT_EQUALS(std::string("emule"), cache9.software);
+	ASSERT_EQUALS(std::string(), cache9.software_version);
+}
+
+// #422: detail-only client fields decode. The section-B fields ride the INC_UPDATE client tag and
+// are captured into ClientSnapshot by MergeClientTag; the detail endpoint serializes them. Verify
+// each decodes, that HighID/LowID derives from the hybrid id, and that EC_TAG_CLIENT_FROM maps to
+// the stable origin token.
+TEST(Refresher, ClientDetailFieldsDecode)
+{
+	std::map<std::uint32_t, ClientSnapshot> cache;
+	const FileMap no_files;
+	CECPacket resp(EC_OP_SHARED_FILES);
+	CECTag container(EC_TAG_CLIENT, static_cast<std::uint32_t>(0));
+
+	// A HighID peer carrying the full detail-only set.
+	CECTag hi(EC_TAG_CLIENT, static_cast<std::uint32_t>(50));
+	hi.AddTag(CECTag(EC_TAG_CLIENT_USER_ID, static_cast<std::uint32_t>(0x04030201)));
+	// Host-order IPv4; FormatClientIpv4 renders LSB-first => 127.0.0.1.
+	hi.AddTag(CECTag(EC_TAG_CLIENT_SERVER_IP, static_cast<std::uint32_t>(0x0100007F)));
+	hi.AddTag(CECTag(EC_TAG_CLIENT_SERVER_PORT, static_cast<std::uint16_t>(4242)));
+	hi.AddTag(CECTag(EC_TAG_CLIENT_SERVER_NAME, wxString::FromUTF8("test-server")));
+	hi.AddTag(CECTag(EC_TAG_CLIENT_KAD_PORT, static_cast<std::uint16_t>(4672)));
+	hi.AddTag(CECTag(EC_TAG_CLIENT_FROM, static_cast<std::uint64_t>(3))); // SF_KADEMLIA
+	hi.AddTag(CECTag(EC_TAG_PARTFILE_NAME, wxString::FromUTF8("upload.iso")));
+	hi.AddTag(CECTag(EC_TAG_CLIENT_AVAILABLE_PARTS, static_cast<std::uint32_t>(7)));
+	hi.AddTag(CECTag(EC_TAG_CLIENT_MOD_VERSION, wxString::FromUTF8("mod-x")));
+	hi.AddTag(CECTag(EC_TAG_CLIENT_DISABLE_VIEW_SHARED, true));
+	// #423 friend status + DL/UP modifier.
+	hi.AddTag(CECTag(EC_TAG_CLIENT_IS_FRIEND, true));
+	hi.AddTag(CECTag(EC_TAG_CLIENT_SCORE_RATIO, static_cast<double>(2.5)));
+	// #439 peer country ISO code resolved daemon-side.
+	hi.AddTag(CECTag(EC_TAG_CLIENT_COUNTRY, wxString::FromUTF8("de")));
+	container.AddTag(hi);
+
+	// A LowID peer (hybrid id < 0x1000000) with no section-B tags.
+	CECTag lo(EC_TAG_CLIENT, static_cast<std::uint32_t>(51));
+	lo.AddTag(CECTag(EC_TAG_CLIENT_USER_ID, static_cast<std::uint32_t>(1234)));
+	container.AddTag(lo);
+
+	resp.AddTag(container);
+	ApplyGetUpdateToClients(&resp, cache, no_files);
+
+	const auto it = cache.find(50);
+	ASSERT_TRUE(it != cache.end());
+	const ClientSnapshot &cs = it->second;
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0x04030201), cs.ed2k_user_id);
+	ASSERT_TRUE(cs.high_id);
+	ASSERT_EQUALS(std::string("127.0.0.1"), cs.server_ip);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(4242), cs.server_port);
+	ASSERT_EQUALS(std::string("test-server"), cs.server_name);
+	ASSERT_EQUALS(std::string("de"), cs.country_code);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(4672), cs.kad_port);
+	ASSERT_EQUALS(std::string("kad"), cs.source_origin);
+	ASSERT_EQUALS(std::string("upload.iso"), cs.upload_file_name);
+	ASSERT_TRUE(cs.has_parts_offered_count);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(7), cs.parts_offered_count);
+	ASSERT_EQUALS(std::string("mod-x"), cs.client_mod_name);
+	ASSERT_TRUE(cs.view_shared_disabled);
+	ASSERT_TRUE(cs.is_friend);
+	ASSERT_TRUE(cs.credit_ratio > 2.4 && cs.credit_ratio < 2.6);
+
+	const auto it2 = cache.find(51);
+	ASSERT_TRUE(it2 != cache.end());
+	ASSERT_TRUE(!it2->second.high_id);
+	ASSERT_TRUE(!it2->second.has_parts_offered_count);
+	// #423 fields absent on the wire => defaults preserved.
+	ASSERT_TRUE(!it2->second.is_friend);
+	ASSERT_TRUE(it2->second.credit_ratio == 0.0);
+}
+
+// Every origin the GUI tells apart stays apart on the API, local and remote server included.
+TEST(Refresher, SourceOriginNameMapsEveryOrigin)
+{
+	ASSERT_EQUALS(std::string("local_server"), SourceOriginName(SF_LOCAL_SERVER));
+	ASSERT_EQUALS(std::string("remote_server"), SourceOriginName(SF_REMOTE_SERVER));
+	ASSERT_EQUALS(std::string("kad"), SourceOriginName(SF_KADEMLIA));
+	ASSERT_EQUALS(std::string("source_exchange"), SourceOriginName(SF_SOURCE_EXCHANGE));
+	ASSERT_EQUALS(std::string("passive"), SourceOriginName(SF_PASSIVE));
+	ASSERT_EQUALS(std::string("link"), SourceOriginName(SF_LINK));
+	ASSERT_EQUALS(std::string("source_seeds"), SourceOriginName(SF_SOURCE_SEEDS));
+	ASSERT_EQUALS(std::string("search_result"), SourceOriginName(SF_SEARCH_RESULT));
+	ASSERT_EQUALS(std::string("unknown"), SourceOriginName(SF_NONE));
+	ASSERT_EQUALS(std::string("unknown"), SourceOriginName(SF_SEARCH_RESULT + 1));
+}
+
+// #437: extended EC preference categories decode. Covers both boolean encodings the core serializer
+// uses -- value tags (share_hidden / exclude_patterns_use_regex -> GetInt()!=0) and bare presence
+// tags (ich_enabled / use_secident / endgame_enabled -> tag present == true) -- plus the 3-state
+// shared_files_visibility enum decoded from the wire int (#596, #655), ints, strings, and the
+// directories.shared_paths string array.
+TEST(Refresher, PreferencesExtendedCategoriesDecode)
+{
+	CECPacket resp(EC_OP_SET_PREFERENCES);
+
+	CECEmptyTag dir(EC_TAG_PREFS_DIRECTORIES);
+	dir.AddTag(CECTag(EC_TAG_DIRECTORIES_INCOMING, wxString::FromUTF8("/inc")));
+	dir.AddTag(CECTag(EC_TAG_DIRECTORIES_TEMP, wxString::FromUTF8("/tmp")));
+	CECTag shared(EC_TAG_DIRECTORIES_SHARED, static_cast<std::uint32_t>(2));
+	shared.AddTag(CECTag(EC_TAG_STRING, wxString::FromUTF8("/a")));
+	shared.AddTag(CECTag(EC_TAG_STRING, wxString::FromUTF8("/b")));
+	dir.AddTag(shared);
+	dir.AddTag(CECTag(EC_TAG_DIRECTORIES_SHARE_HIDDEN, true)); // value-encoded bool
+	dir.AddTag(CECTag(EC_TAG_DIRECTORIES_EXCLUDE_REGEX, true));
+	resp.AddTag(dir);
+
+	CECEmptyTag files(EC_TAG_PREFS_FILES);
+	files.AddTag(CECEmptyTag(EC_TAG_FILES_ICH_ENABLED)); // presence == true
+	files.AddTag(CECEmptyTag(EC_TAG_FILES_ENDGAME));     // presence == true (#596)
+	files.AddTag(CECTag(EC_TAG_FILES_MIN_FREE_SPACE, static_cast<std::uint32_t>(512)));
+	resp.AddTag(files);
+
+	CECEmptyTag srv(EC_TAG_PREFS_SERVERS);
+	srv.AddTag(CECTag(EC_TAG_SERVERS_DEAD_SERVER_RETRIES, static_cast<std::uint16_t>(5)));
+	srv.AddTag(CECTag(EC_TAG_SERVERS_UPDATE_URL, wxString::FromUTF8("http://srv")));
+	resp.AddTag(srv);
+
+	CECEmptyTag sec(EC_TAG_PREFS_SECURITY);
+	sec.AddTag(CECTag(EC_TAG_SECURITY_CAN_SEE_SHARES, (uint8)2)); // 3-state: 2 = nobody (#596)
+	sec.AddTag(CECTag(EC_TAG_IPFILTER_LEVEL, static_cast<std::uint32_t>(100)));
+	sec.AddTag(CECEmptyTag(EC_TAG_SECURITY_USE_SECIDENT)); // presence == true
+	resp.AddTag(sec);
+
+	// Message-filter category: presence bools + keyword strings, incl. the
+	// show-in-log / comment-filter fields wired over EC.
+	CECEmptyTag mf(EC_TAG_PREFS_MESSAGEFILTER);
+	mf.AddTag(CECEmptyTag(EC_TAG_MSGFILTER_ENABLED));         // presence == true
+	mf.AddTag(CECEmptyTag(EC_TAG_MSGFILTER_SHOW_IN_LOG));     // presence == true
+	mf.AddTag(CECEmptyTag(EC_TAG_MSGFILTER_FILTER_COMMENTS)); // presence == true
+	mf.AddTag(CECTag(EC_TAG_MSGFILTER_KEYWORDS, wxString::FromUTF8("spam,ads")));
+	mf.AddTag(CECTag(EC_TAG_MSGFILTER_COMMENT_KEYWORDS, wxString::FromUTF8("junk,scam")));
+	resp.AddTag(mf);
+
+	CECEmptyTag cw(EC_TAG_PREFS_CORETWEAKS);
+	cw.AddTag(CECTag(EC_TAG_CORETW_MAX_CONN_PER_FIVE, static_cast<std::uint32_t>(200)));
+	cw.AddTag(CECTag(EC_TAG_CORETW_KAD_REASK_MS, static_cast<std::uint32_t>(1800000)));
+	resp.AddTag(cw);
+
+	CECEmptyTag kad(EC_TAG_PREFS_KADEMLIA);
+	kad.AddTag(CECTag(EC_TAG_KADEMLIA_UPDATE_URL, wxString::FromUTF8("http://nodes")));
+	resp.AddTag(kad);
+
+	CECEmptyTag ip2c(EC_TAG_PREFS_IP2COUNTRY);
+	ip2c.AddTag(CECTag(EC_TAG_IP2COUNTRY_SUPPORTED, true));  // value-encoded bool
+	ip2c.AddTag(CECTag(EC_TAG_IP2COUNTRY_ENABLED, true));    // value-encoded bool
+	ip2c.AddTag(CECTag(EC_TAG_IP2COUNTRY_SOURCE, (uint8)1)); // MaxMind
+	ip2c.AddTag(CECTag(EC_TAG_IP2COUNTRY_CUSTOM_URL, wxString::FromUTF8("http://geo")));
+	ip2c.AddTag(CECTag(EC_TAG_IP2COUNTRY_MAXMIND_LICENSE, wxString::FromUTF8("LICKEY")));
+	ip2c.AddTag(CECTag(EC_TAG_IP2COUNTRY_DB_LOADED, true)); // value-encoded bool
+	ip2c.AddTag(CECTag(EC_TAG_IP2COUNTRY_LOADED_SOURCE, wxString::FromUTF8("maxmind")));
+	resp.AddTag(ip2c);
+
+	PreferencesSnapshot p;
+	std::vector<CategorySnapshot> cats;
+	ParsePreferencesFromPacket(&resp, p, cats);
+
+	ASSERT_EQUALS(std::string("/inc"), p.directories.incoming_path);
+	ASSERT_EQUALS(std::string("/tmp"), p.directories.temp_path);
+	ASSERT_EQUALS(static_cast<size_t>(2), p.directories.shared_paths.size());
+	ASSERT_EQUALS(std::string("/a"), p.directories.shared_paths0);
+	ASSERT_TRUE(p.directories.share_hidden);
+	ASSERT_TRUE(p.directories.exclude_patterns_use_regex);
+	ASSERT_TRUE(!p.directories.rescan_on_startup); // absent -> false
+
+	ASSERT_TRUE(p.files.ich_enabled);
+	ASSERT_TRUE(!p.files.trust_unverified_aich_hashes); // absent presence tag -> false
+	ASSERT_TRUE(p.files.endgame_mode_enabled);          // presence tag -> true (#596)
+	ASSERT_EQUALS(static_cast<std::uint32_t>(512), p.files.min_free_space_mebibytes);
+
+	ASSERT_EQUALS(static_cast<std::uint32_t>(5), p.servers.dead_server_retry_count);
+	ASSERT_EQUALS(std::string("http://srv"), p.servers.update_url);
+
+	// 3-state (#596): the middle/high value round-trips, not just 0/1, and
+	// decodes to its enum string rather than the wire int (#655).
+	ASSERT_EQUALS(std::string("nobody"), p.security.shared_files_visibility);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(100), p.security.ipfilter_min_access_level);
+	ASSERT_TRUE(p.security.secure_identification_enabled);
+	ASSERT_TRUE(!p.security.obfuscation_required); // absent -> false
+
+	ASSERT_TRUE(p.message_filter.enabled);
+	ASSERT_TRUE(p.message_filter.log_filtered_messages);
+	ASSERT_TRUE(p.message_filter.filter_comments);
+	ASSERT_TRUE(!p.message_filter.filter_all_messages); // absent -> false
+	ASSERT_EQUALS(std::string("spam,ads"), p.message_filter.keywords);
+	ASSERT_EQUALS(std::string("junk,scam"), p.message_filter.comment_keywords);
+
+	ASSERT_EQUALS(static_cast<std::uint32_t>(200), p.advanced.max_new_connections_per_5_seconds);
+	// EC carries milliseconds; the API speaks the minutes the core actually
+	// stores, so the decode divides by 60000 (#1159 section 5).
+	ASSERT_EQUALS(static_cast<std::uint32_t>(30), p.advanced.kad_source_reask_minutes);
+	ASSERT_EQUALS(std::string("http://nodes"), p.kad.update_url);
+
+	ASSERT_TRUE(p.geoip.supported);
+	ASSERT_TRUE(p.geoip.enabled);
+	ASSERT_EQUALS(std::string("maxmind"), p.geoip.source); // uint8 1 -> "maxmind"
+	ASSERT_EQUALS(std::string("http://geo"), p.geoip.custom_update_url);
+	ASSERT_EQUALS(std::string("LICKEY"), p.geoip.maxmind_license);
+	ASSERT_TRUE(!p.geoip.auto_update_enabled); // absent -> false
+	ASSERT_TRUE(p.geoip.db_loaded);
+	ASSERT_EQUALS(std::string("maxmind"), p.geoip.loaded_source);
+	ASSERT_TRUE(!p.geoip.download_in_progress); // absent -> false
+}
+
+// #655: enum strings and the nested remote_controls shape. The EC layer is unchanged by the field-
+// naming pass: it still carries the proxy type as a wire int and both remote-control subsystems in
+// one flat category. What changed is the API shape the snapshot feeds, so this pins the two
+// translations that now happen at the webapi boundary.
+//
+// The core emits EC_TAG_GENERAL_CHECK_NEW_VERSION unconditionally, as a value tag rather than a
+// conditional empty one. Decoding it by presence therefore pinned the answer to true, and a read-
+// modify-write of any other preference re-enabled version checking behind the user's back. Both
+// `false` cases below read `true` under that decode.
+TEST(Refresher, VersionCheckEnabledDecodesTheValueNotThePresence)
+{
+	{
+		CECPacket resp(EC_OP_SET_PREFERENCES);
+		CECEmptyTag gen(EC_TAG_PREFS_GENERAL);
+		gen.AddTag(CECTag(EC_TAG_GENERAL_CHECK_NEW_VERSION, false));
+		resp.AddTag(gen);
+
+		PreferencesSnapshot p;
+		std::vector<CategorySnapshot> cats;
+		ParsePreferencesFromPacket(&resp, p, cats);
+		ASSERT_TRUE(!p.version_check_enabled);
+	}
+	{
+		CECPacket resp(EC_OP_SET_PREFERENCES);
+		CECEmptyTag gen(EC_TAG_PREFS_GENERAL);
+		gen.AddTag(CECTag(EC_TAG_GENERAL_CHECK_NEW_VERSION, true));
+		resp.AddTag(gen);
+
+		PreferencesSnapshot p;
+		std::vector<CategorySnapshot> cats;
+		ParsePreferencesFromPacket(&resp, p, cats);
+		ASSERT_TRUE(p.version_check_enabled);
+	}
+}
+
+TEST(Refresher, PreferencesEnumAndNestedRemoteControlsDecode)
+{
+	CECPacket resp(EC_OP_SET_PREFERENCES);
+
+	CECEmptyTag conn(EC_TAG_PREFS_CONNECTIONS);
+	conn.AddTag(CECTag(EC_TAG_PROXY_TYPE, (uint8)2)); // wire 2 == HTTP
+	resp.AddTag(conn);
+
+	CECEmptyTag rc(EC_TAG_PREFS_REMOTECTRL);
+	rc.AddTag(CECEmptyTag(EC_TAG_WEBSERVER_AUTORUN)); // presence == true
+	rc.AddTag(CECTag(EC_TAG_WEBSERVER_PORT, static_cast<std::uint32_t>(4711)));
+	rc.AddTag(CECTag(EC_TAG_WEBSERVER_REFRESH, static_cast<std::uint32_t>(120)));
+	rc.AddTag(CECTag(EC_TAG_WEBSERVER_TEMPLATE, wxString::FromUTF8("php-default")));
+	rc.AddTag(CECTag(EC_TAG_AMULEAPI_PORT, static_cast<std::uint32_t>(4712)));
+	rc.AddTag(CECTag(EC_TAG_AMULEAPI_BIND, wxString::FromUTF8("127.0.0.1")));
+	resp.AddTag(rc);
+
+	PreferencesSnapshot p;
+	std::vector<CategorySnapshot> cats;
+	ParsePreferencesFromPacket(&resp, p, cats);
+
+	// Wire int -> enum string, and an unset field stays empty rather than
+	// defaulting to the first enum member.
+	ASSERT_EQUALS(std::string("http"), p.proxy_type);
+
+	// One flat EC category fans out into the two nested API sub-objects.
+	ASSERT_TRUE(p.remote_controls.webserver.enabled);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(4711), p.remote_controls.webserver.port);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(120), p.remote_controls.webserver.refresh_seconds);
+	ASSERT_EQUALS(std::string("php-default"), p.remote_controls.webserver.template_name);
+	ASSERT_TRUE(!p.remote_controls.webserver.guest_enabled); // absent -> false
+
+	ASSERT_TRUE(!p.remote_controls.amuleapi.enabled); // absent -> false
+	ASSERT_EQUALS(static_cast<std::uint32_t>(4712), p.remote_controls.amuleapi.port);
+	ASSERT_EQUALS(std::string("127.0.0.1"), p.remote_controls.amuleapi.bind_address);
+}
+
+// Every 3-state / 4-state wire value maps to its documented enum string, and
+// an out-of-range value is not invented into a valid one (#655).
+TEST(Refresher, PreferencesEnumStringsCoverEveryWireValue)
+{
+	const char *const kProxy = { "socks5", "socks4", "http", "socks4a" };
+	for (std::uint8_t wire = 0; wire < 4; ++wire) {
+		CECPacket resp(EC_OP_SET_PREFERENCES);
+		CECEmptyTag conn(EC_TAG_PREFS_CONNECTIONS);
+		conn.AddTag(CECTag(EC_TAG_PROXY_TYPE, wire));
+		resp.AddTag(conn);
+
+		PreferencesSnapshot p;
+		std::vector<CategorySnapshot> cats;
+		ParsePreferencesFromPacket(&resp, p, cats);
+		ASSERT_EQUALS(std::string(kProxywire), p.proxy_type);
+	}
+
+	const char *const kVisibility = { "everybody", "friends", "nobody" };
+	for (std::uint8_t wire = 0; wire < 3; ++wire) {
+		CECPacket resp(EC_OP_SET_PREFERENCES);
+		CECEmptyTag sec(EC_TAG_PREFS_SECURITY);
+		sec.AddTag(CECTag(EC_TAG_SECURITY_CAN_SEE_SHARES, wire));
+		resp.AddTag(sec);
+
+		PreferencesSnapshot p;
+		std::vector<CategorySnapshot> cats;
+		ParsePreferencesFromPacket(&resp, p, cats);
+		ASSERT_EQUALS(std::string(kVisibilitywire), p.security.shared_files_visibility);
+	}
+
+	// Out of range: proxy_type clears, visibility falls back to the default.
+	{
+		CECPacket resp(EC_OP_SET_PREFERENCES);
+		CECEmptyTag conn(EC_TAG_PREFS_CONNECTIONS);
+		conn.AddTag(CECTag(EC_TAG_PROXY_TYPE, (uint8)9));
+		resp.AddTag(conn);
+		CECEmptyTag sec(EC_TAG_PREFS_SECURITY);
+		sec.AddTag(CECTag(EC_TAG_SECURITY_CAN_SEE_SHARES, (uint8)9));
+		resp.AddTag(sec);
+
+		PreferencesSnapshot p;
+		std::vector<CategorySnapshot> cats;
+		ParsePreferencesFromPacket(&resp, p, cats);
+		ASSERT_TRUE(p.proxy_type.empty());
+		ASSERT_EQUALS(std::string("everybody"), p.security.shared_files_visibility);
+	}
+}
+
+// #655: the preferences schema table is self-consistent. GET emit, PATCH apply and the EC decode
+// are all driven off PrefSchema(), so a malformed row silently breaks all three at once. These pin
+// the invariants the three walkers rely on.
+TEST(Refresher, PrefsSchemaIsWellFormed)
+{
+	std::set<std::string> seen;
+	std::size_t emitted = 0;
+
+	for (std::size_t i = 0; i < PrefSchemaSize(); ++i) {
+		const PrefField &f = PrefSchema()i;
+		const std::string id = std::string(f.category) + "." + f.key;
+
+		// No duplicate field, or one walker would apply it twice.
+		ASSERT_TRUE(seen.insert(id).second);
+
+		// Every category must resolve to an EC group.
+		ASSERT_TRUE(PrefGroupTagFor(f.category) != 0);
+
+		// Rows that round-trip a value need a backing member; rows that
+		// never do must not have one.
+		const bool needs_member = f.access == PrefAccess::ReadWrite ||
+					  f.access == PrefAccess::ReadOnly || f.access == PrefAccess::Bespoke;
+		ASSERT_TRUE(needs_member == (f.member != nullptr));
+
+		// Enum rows carry a non-empty, nullptr-terminated name table.
+		if (f.type == PrefType::Enum) {
+			ASSERT_TRUE(f.enum_names != nullptr);
+			ASSERT_TRUE(f.enum_names0 != nullptr);
+		} else {
+			ASSERT_TRUE(f.enum_names == nullptr);
+		}
+
+		// A capability gate must name a real bool in the same category.
+		if (f.gated_by) {
+			bool found = false;
+			for (std::size_t g = 0; g < PrefSchemaSize(); ++g) {
+				const PrefField &c = PrefSchema()g;
+				if (std::string(c.category) == f.category &&
+					std::string(c.key) == f.gated_by) {
+					ASSERT_TRUE(c.type == PrefType::Bool);
+					found = true;
+				}
+			}
+			ASSERT_TRUE(found);
+		}
+
+		if (f.access != PrefAccess::WriteOnly && f.access != PrefAccess::Rejected)
+			++emitted;
+	}
+
+	// The documented payload is 119 fields. A row added or dropped without
+	// updating docs/api/REFERENCE.md should trip this.
+	ASSERT_EQUALS(static_cast<std::size_t>(119), emitted);
+}
+
+// The schema's irregularities are enumerated rather than merely counted: each is deliberate and
+// documented, so a new one appearing is a mistake worth catching rather than a pattern to copy.
+//
+// Exactly two fields invert, and both do so because the EC tag they ride on is named for the
+// negative case: EC_TAG_CONN_UDP_DISABLE and, since #655, EC_TAG_FILES_CREATE_NORMAL. In both, the
+// API states the positive fact and the schema undoes the EC negation on read and write alike.
+TEST(Refresher, PrefsSchemaIrregularitiesStayContained)
+{
+	std::size_t inverted = 0, foreign_group = 0, bespoke = 0;
+	for (std::size_t i = 0; i < PrefSchemaSize(); ++i) {
+		const PrefField &f = PrefSchema()i;
+		if (f.invert) {
+			++inverted;
+			const std::string key(f.key);
+			ASSERT_TRUE(key == "extended_udp_port_enabled" || key == "create_sparse_files");
+		}
+		if (f.read_group != 0) {
+			++foreign_group;
+			ASSERT_EQUALS(std::string("upnp_supported"), std::string(f.key));
+		}
+		if (f.access == PrefAccess::Bespoke) {
+			++bespoke;
+			ASSERT_EQUALS(std::string("guest_enabled"), std::string(f.key));
+		}
+	}
+	ASSERT_EQUALS(static_cast<std::size_t>(2), inverted);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), foreign_group);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), bespoke);
+}
+
+// #692: ed2k server priority maps both ways. The SRV_PR_* wire values are not monotone (NORMAL=0,
+// HIGH=1, LOW=2), so a name->code mapping that assumed a name's position in a list was its code --
+// exactly what the generic enum helper on the preferences path does -- would be wrong for every
+// value. Pin both directions and the round trip.
+TEST(Refresher, ServerPriorityMapsBothWays)
+{
+	ASSERT_EQUALS(std::string("normal"), std::string(ServerPriorityName(SRV_PR_NORMAL)));
+	ASSERT_EQUALS(std::string("high"), std::string(ServerPriorityName(SRV_PR_HIGH)));
+	ASSERT_EQUALS(std::string("low"), std::string(ServerPriorityName(SRV_PR_LOW)));
+
+	std::uint32_t code = 0xFFFFFFFFu;
+	ASSERT_TRUE(ServerPriorityCode("normal", code));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(SRV_PR_NORMAL), code);
+	ASSERT_TRUE(ServerPriorityCode("high", code));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(SRV_PR_HIGH), code);
+	ASSERT_TRUE(ServerPriorityCode("low", code));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(SRV_PR_LOW), code);
+
+	// name -> code -> name is the identity for every accepted name.
+	for (const char *name : { "low", "normal", "high" }) {
+		std::uint32_t c = 0;
+		ASSERT_TRUE(ServerPriorityCode(name, c));
+		ASSERT_EQUALS(std::string(name), std::string(ServerPriorityName(c)));
+	}
+
+	// An unknown name is rejected and leaves the out-param untouched, so a
+	// caller that ignores the return value cannot silently write a priority.
+	std::uint32_t untouched = 4242;
+	ASSERT_TRUE(!ServerPriorityCode("urgent", untouched));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(4242), untouched);
+	ASSERT_TRUE(!ServerPriorityCode("", untouched));
+	ASSERT_TRUE(!ServerPriorityCode("HIGH", untouched)); // case-sensitive by design
+	ASSERT_EQUALS(static_cast<std::uint32_t>(4242), untouched);
+}
+
+// Union EC_OP_SEARCH_PROGRESS. Absence from a union reply is how amuleapi learns a search expired,
+// so the parser's return value is load-bearing: a reply it could not parse must be rejected
+// outright rather than handed back as an empty union, which the caller would read as "every tracked
+// search is gone" and retire in one pass.
+
+// The incremental contract. Under EC_DETAIL_INC_UPDATE the daemon sends only what moved, so an
+// absent field means "unchanged". These pin that per field, because the failure mode is silent: a
+// guard forgotten on one field reverts it to its default on the first quiet poll and nothing else
+// notices.
+
+TEST(Refresher, SearchUnionSecondPollKeepsFieldsTheDiffOmits)
+{
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+
+	CECPacket first(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	sf.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("cool.movie.mkv")));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, static_cast<std::uint64_t>(123)));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_STATUS, static_cast<std::uint32_t>(2))); // QUEUED
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, static_cast<std::uint32_t>(9)));
+	first.AddTag(sf);
+	ApplySearchUnion(&first, slots, owner);
+
+	// A diff that moves only the source count. Everything else is absent,
+	// which is the daemon saying "unchanged", not "cleared".
+	CECPacket second(EC_OP_SEARCH_RESULTS);
+	CECTag d(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	d.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, static_cast<std::uint32_t>(11)));
+	second.AddTag(d);
+	ApplySearchUnion(&second, slots, owner);
+
+	const auto it = slotskSid.results.find(70);
+	ASSERT_TRUE(it != slotskSid.results.end());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(11), it->second.source_count);
+	// The fields the diff said nothing about.
+	ASSERT_EQUALS(std::string("cool.movie.mkv"), it->second.name);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(123), it->second.size);
+	ASSERT_EQUALS(std::string("queued"), it->second.status);
+	ASSERT_TRUE(it->second.already_downloaded);
+	ASSERT_EQUALS(std::string("video"), it->second.type);
+}
+
+TEST(Refresher, SearchUnionAppliesAStatusChangeOnAFinishedSearch)
+{
+	// The case #1187 section 2 is about: a hit gets downloaded after its search finished.
+	// Nothing here knows or cares that the search is over -- which is the point, since the
+	// union polls it either way.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+
+	CECPacket first(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	sf.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("iso.img")));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_STATUS, static_cast<std::uint32_t>(0))); // NEW
+	first.AddTag(sf);
+	ApplySearchUnion(&first, slots, owner);
+	ASSERT_TRUE(!slotskSid.results.find(70)->second.already_downloaded);
+
+	CECPacket second(EC_OP_SEARCH_RESULTS);
+	CECTag d(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	d.AddTag(CECTag(EC_TAG_PARTFILE_STATUS, static_cast<std::uint32_t>(1))); // DOWNLOADED
+	second.AddTag(d);
+	ApplySearchUnion(&second, slots, owner);
+
+	const auto &r = slotskSid.results.find(70)->second;
+	ASSERT_EQUALS(std::string("downloaded"), r.status);
+	ASSERT_TRUE(r.already_downloaded);
+}
+
+TEST(Refresher, SearchUnionQuietPollRemovesNothing)
+{
+	// Absence stopped meaning deletion: a poll that mentions a search not at all must leave its
+	// results alone. Sweeping here would empty every result set on the first tick where nothing
+	// changed.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+
+	CECPacket first(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	sf.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("still.here.bin")));
+	first.AddTag(sf);
+	ApplySearchUnion(&first, slots, owner);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), slotskSid.results.size());
+
+	const CECPacket quiet(EC_OP_SEARCH_RESULTS);
+	ApplySearchUnion(&quiet, slots, owner);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), slotskSid.results.size());
+	ASSERT_EQUALS(std::string("still.here.bin"), slotskSid.results.find(70)->second.name);
+}
+
+TEST(Refresher, SearchUnionRemovesOnlyOnTheExplicitTombstone)
+{
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+
+	CECPacket first(EC_OP_SEARCH_RESULTS);
+	for (std::uint32_t ecid : { 70u, 71u }) {
+		CECTag sf(EC_TAG_SEARCHFILE, ecid);
+		sf.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+		sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("f.bin")));
+		first.AddTag(sf);
+	}
+	ApplySearchUnion(&first, slots, owner);
+	ASSERT_EQUALS(static_cast<std::size_t>(2), slotskSid.results.size());
+
+	CECPacket second(EC_OP_SEARCH_RESULTS);
+	second.AddTag(CECTag(EC_TAG_FILE_REMOVED, static_cast<std::uint32_t>(71)));
+	ApplySearchUnion(&second, slots, owner);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), slotskSid.results.size());
+	ASSERT_TRUE(slotskSid.results.find(70) != slotskSid.results.end());
+	// The index loses it with the map, or a later reuse of the ECID would be
+	// attributed to a search that no longer holds it.
+	ASSERT_TRUE(owner.find(71) == owner.end());
+	ASSERT_TRUE(owner.find(70) != owner.end());
+}
+
+TEST(Refresher, SearchUnionAttributesDiffedTagsAcrossTwoSearches)
+{
+	// The index earns its keep here: the second poll carries no search id on
+	// either result, so both can only be placed by remembering who owns them.
+	const std::uint32_t sid_a = 1;
+	const std::uint32_t sid_b = 2 | 0x80000000u; // Kad ids carry the mask
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotssid_a;
+	slotssid_b;
+
+	CECPacket first(EC_OP_SEARCH_RESULTS);
+	CECTag a(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(10));
+	a.AddTag(CECTag(EC_TAG_SEARCH_ID, sid_a));
+	a.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("a.bin")));
+	first.AddTag(a);
+	CECTag b(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(20));
+	b.AddTag(CECTag(EC_TAG_SEARCH_ID, sid_b));
+	b.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("b.bin")));
+	first.AddTag(b);
+	ApplySearchUnion(&first, slots, owner);
+
+	CECPacket second(EC_OP_SEARCH_RESULTS);
+	CECTag da(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(10));
+	da.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, static_cast<std::uint32_t>(5)));
+	second.AddTag(da);
+	CECTag db(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(20));
+	db.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, static_cast<std::uint32_t>(7)));
+	second.AddTag(db);
+	ApplySearchUnion(&second, slots, owner);
+
+	ASSERT_EQUALS(static_cast<std::uint32_t>(5), slotssid_a.results.find(10)->second.source_count);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(7), slotssid_b.results.find(20)->second.source_count);
+	// And neither leaked into the other.
+	ASSERT_EQUALS(static_cast<std::size_t>(1), slotssid_a.results.size());
+	ASSERT_EQUALS(static_cast<std::size_t>(1), slotssid_b.results.size());
+}
+
+TEST(Refresher, SearchUnionDiffedChildStaysFoldedIntoItsParent)
+{
+	// A grouped child is addressable by its own ECID on the wire, so it gets diffed tags of its
+	// own -- which is why `raw` keeps children and the folded view is rebuilt from it rather
+	// than merged into.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+
+	CECPacket first(EC_OP_SEARCH_RESULTS);
+	CECTag parent(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(100));
+	parent.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	parent.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("movie.mkv")));
+	first.AddTag(parent);
+	CECTag child(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(101));
+	child.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	child.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("movie.alt.mkv")));
+	child.AddTag(CECTag(EC_TAG_SEARCH_PARENT, static_cast<std::uint32_t>(100)));
+	first.AddTag(child);
+	ApplySearchUnion(&first, slots, owner);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), slotskSid.results.size());
+	ASSERT_EQUALS(static_cast<std::size_t>(1), slotskSid.results.find(100)->second.children.size());
+
+	// The child's source count moves; it must still be nested, not promoted.
+	CECPacket second(EC_OP_SEARCH_RESULTS);
+	CECTag dc(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(101));
+	dc.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, static_cast<std::uint32_t>(3)));
+	second.AddTag(dc);
+	ApplySearchUnion(&second, slots, owner);
+
+	ASSERT_EQUALS(static_cast<std::size_t>(1), slotskSid.results.size());
+	const auto &kids = slotskSid.results.find(100)->second.children;
+	ASSERT_EQUALS(static_cast<std::size_t>(1), kids.size());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(3), kids0.source_count);
+	ASSERT_EQUALS(std::string("movie.alt.mkv"), kids0.name);
+}
+
+TEST(Refresher, SearchUnionSeesTheKadLookupEnd)
+{
+	// The daemon now always sends EC_TAG_PARTFILE_KAD_COMMENT_SEARCHING, and sends it through
+	// the valuemap, so the 1 -> 0 transition is itself a child tag and the result carrying it
+	// is not elided as unchanged. It used to be emitted only while the lookup ran or had notes,
+	// which made "finished, found nothing" a tag that simply stopped appearing -- and an
+	// incremental client cannot tell that from silence.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+
+	CECPacket running(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	sf.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("noted.bin")));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_KAD_COMMENT_SEARCHING, static_cast<std::uint64_t>(1)));
+	running.AddTag(sf);
+	ApplySearchUnion(&running, slots, owner);
+	ASSERT_TRUE(slotskSid.results.find(70)->second.kad_comment_searching);
+
+	CECPacket done(EC_OP_SEARCH_RESULTS);
+	CECTag d(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	d.AddTag(CECTag(EC_TAG_PARTFILE_KAD_COMMENT_SEARCHING, static_cast<std::uint64_t>(0)));
+	done.AddTag(d);
+	ApplySearchUnion(&done, slots, owner);
+
+	const auto &r = slotskSid.results.find(70)->second;
+	ASSERT_TRUE(!r.kad_comment_searching);
+	// ...and the poll that carried it touched nothing else.
+	ASSERT_EQUALS(std::string("noted.bin"), r.name);
+}
+
+TEST(Refresher, SearchUnionCommentsAbsenceMeansNoNotes)
+{
+	// The comments container is the one field where absence is a value: it is built only when
+	// there are notes and added without the valuemap, so it is never diffed away. A poll that
+	// omits it is saying "no notes", not "unchanged" -- otherwise a note set could never shrink
+	// to empty.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+
+	CECPacket withNotes(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	sf.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("noted.bin")));
+	CECEmptyTag cont(EC_TAG_PARTFILE_COMMENTS);
+	cont.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, std::string("someone")));
+	cont.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, std::string("noted.bin")));
+	cont.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, static_cast<std::uint64_t>(4)));
+	cont.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, std::string("good file")));
+	sf.AddTag(cont);
+	withNotes.AddTag(sf);
+	ApplySearchUnion(&withNotes, slots, owner);
+	ASSERT_EQUALS(static_cast<std::size_t>(1), slotskSid.results.find(70)->second.comments.size());
+
+	CECPacket without(EC_OP_SEARCH_RESULTS);
+	CECTag d(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	d.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, static_cast<std::uint32_t>(2)));
+	without.AddTag(d);
+	ApplySearchUnion(&without, slots, owner);
+	ASSERT_EQUALS(static_cast<std::size_t>(0), slotskSid.results.find(70)->second.comments.size());
+}
+
+TEST(Refresher, SearchUnionIgnoresResultsForAnUnknownSearch)
+{
+	// Slot creation belongs to MarkSearchStarted / discovery, which also set the lifecycle
+	// state GET /search reports. Auto-creating one here would produce a search with results and
+	// no state behind it.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	sf.AddTag(CECTag(EC_TAG_SEARCH_ID, static_cast<std::uint32_t>(999)));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("orphan.bin")));
+	resp.AddTag(sf);
+	ApplySearchUnion(&resp, slots, owner);
+
+	ASSERT_TRUE(slots.empty());
+	// And it is not left in the index pointing at a slot that never existed.
+	ASSERT_TRUE(owner.find(70) == owner.end());
+}
+
+TEST(Refresher, SearchUnionLeavesADetachedSlotAlone)
+{
+	// The daemon evicted the search from its ring. That makes it emit an EC_TAG_FILE_REMOVED
+	// for every result it had sent us -- but the tick has already detached the slot, precisely
+	// so those tombstones do not erase the results the retirement path means to keep for late
+	// reads.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	SearchSlot &slot = slotskSid;
+	SearchResult keep;
+	keep.name = "kept.bin";
+	keep.status = "new";
+	slot.raw70 = keep;
+	slot.results70 = keep;
+	slot.detached = true;
+	owner70 = kSid;
+
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	resp.AddTag(CECTag(EC_TAG_FILE_REMOVED, static_cast<std::uint32_t>(70)));
+	ApplySearchUnion(&resp, slots, owner);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), slotskSid.raw.size());
+	ASSERT_EQUALS(static_cast<size_t>(1), slotskSid.results.size());
+	ASSERT_EQUALS(std::string("kept.bin"), slotskSid.results70.name);
+	// The index entry stays too: nothing will re-establish it, and dropping
+	// it would strand the result it points at.
+	ASSERT_TRUE(owner.find(70) != owner.end());
+}
+
+TEST(Refresher, SearchUnionDoesNotUpdateADetachedSlot)
+{
+	// Same freeze in the other direction. A diffed tag arriving for a search
+	// the daemon no longer holds is the tail of an eviction, not news.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	SearchSlot &slot = slotskSid;
+	SearchResult keep;
+	keep.name = "kept.bin";
+	keep.source_count = 3;
+	slot.raw70 = keep;
+	slot.results70 = keep;
+	slot.detached = true;
+	owner70 = kSid;
+
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(70));
+	sf.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, static_cast<uint32>(99)));
+	resp.AddTag(sf);
+	ApplySearchUnion(&resp, slots, owner);
+
+	ASSERT_EQUALS(static_cast<std::uint32_t>(3), slotskSid.results70.source_count);
+}
+
+TEST(Refresher, SearchUnionDefaultSidAdoptsAnIdLessReply)
+{
+	// The per-search EC_DETAIL_FULL fetch -- the resync path the differential union has no
+	// opcode for. Its reply carries no EC_TAG_SEARCH_ID at all, so every tag in it has to be
+	// attributed to the search that was asked for, and the ECID index built from that.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(71));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("seeded.bin")));
+	resp.AddTag(sf);
+	ApplySearchUnion(&resp, slots, owner, kSid);
+
+	ASSERT_EQUALS(static_cast<size_t>(1), slotskSid.results.size());
+	ASSERT_EQUALS(std::string("seeded.bin"), slotskSid.results71.name);
+	ASSERT_EQUALS(kSid, owner71);
+}
+
+TEST(Refresher, SearchUnionLeavesNoIndexEntryForADetachedSlot)
+{
+	// The index is what eviction walks to clean up after a slot, and it walks it via the slot's
+	// own results. An entry written for a result that was then dropped on the detached guard is
+	// in neither place, so nothing ever removes it -- and a reused ECID would resolve through
+	// it to a search that is gone.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	SearchSlot &slot = slotskSid;
+	slot.detached = true;
+
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(72));
+	sf.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("late.bin")));
+	resp.AddTag(sf);
+	ApplySearchUnion(&resp, slots, owner);
+
+	// Not merged, and no index entry left pointing at the slot that refused it.
+	ASSERT_TRUE(slotskSid.raw.empty());
+	ASSERT_TRUE(owner.find(72) == owner.end());
+}
+
+TEST(Refresher, SearchUnionStillIndexesAResultItAccepts)
+{
+	// The guard above must not cost the normal path its index entry: that is
+	// what attributes every later diffed tag, which carries no search id.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	slotskSid;
+
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(73));
+	sf.AddTag(CECTag(EC_TAG_SEARCH_ID, kSid));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("kept.bin")));
+	resp.AddTag(sf);
+	ApplySearchUnion(&resp, slots, owner);
+
+	ASSERT_EQUALS(kSid, owner73);
+	ASSERT_EQUALS(std::string("kept.bin"), slotskSid.results73.name);
+}
+
+TEST(Refresher, AMergingFullReplyLeavesTheResyncFlagSet)
+{
+	// The flag says "a union reply was lost, so this slot may hold rows the daemon has already
+	// dropped". Only a replace answers that: a merge re-reads what the daemon still has and
+	// cannot remove what it does not. Clearing it on a merge strands those rows for the life of
+	// the slot -- the tombstones went out in the reply that was lost, and the daemon never
+	// mentions them again. The HTTP refresh path (RefreshSearchIfStale) takes exactly this
+	// mode, and it serves the same non-active slots the flag is set on.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	SearchSlot &slot = slotskSid;
+	slot.needs_resync = true;
+	slot.raw80.ecid = 80;
+	slot.raw80.name = "dropped-by-the-daemon.bin";
+	owner80 = kSid;
+
+	// A FULL reply that no longer carries ECID 80. No tombstone: a FULL reply
+	// has none to carry.
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(81));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("still-here.bin")));
+	resp.AddTag(sf);
+	ApplySearchFullReply(&resp, slots, owner, kSid, /*replace=*/false);
+
+	// The stale row survives the merge, which is precisely why the obligation
+	// must survive with it.
+	ASSERT_TRUE(slotskSid.raw.find(80) != slotskSid.raw.end());
+	ASSERT_TRUE(slotskSid.needs_resync);
+}
+
+TEST(Refresher, AReplacingFullReplyDropsStaleRowsAndClearsTheFlag)
+{
+	// The re-seed the tick issues. Swapping the rows wholesale is the only way to express a
+	// deletion from a reply that carries no tombstones, and having done it the slot is
+	// authoritative again.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	SearchSlot &slot = slotskSid;
+	slot.needs_resync = true;
+	slot.raw80.ecid = 80;
+	slot.raw80.name = "dropped-by-the-daemon.bin";
+	slot.results = slot.raw;
+	owner80 = kSid;
+
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	CECTag sf(EC_TAG_SEARCHFILE, static_cast<std::uint32_t>(81));
+	sf.AddTag(CECTag(EC_TAG_PARTFILE_NAME, std::string("still-here.bin")));
+	resp.AddTag(sf);
+	ApplySearchFullReply(&resp, slots, owner, kSid, /*replace=*/true);
+
+	ASSERT_TRUE(slotskSid.raw.find(80) == slotskSid.raw.end());
+	ASSERT_TRUE(slotskSid.results.find(80) == slotskSid.results.end());
+	// The index entry goes with the row, or a later result reusing the ECID
+	// resolves through it.
+	ASSERT_TRUE(owner.find(80) == owner.end());
+	ASSERT_EQUALS(std::string("still-here.bin"), slotskSid.results81.name);
+	ASSERT_TRUE(!slotskSid.needs_resync);
+}
+
+TEST(Refresher, AnEmptyReplacingReplyClearsTheFoldedView)
+{
+	// The daemon reporting nothing left is a real answer, and the one an empty-reply merge
+	// cannot express: ApplySearchUnion refolds only slots it touched, so without the
+	// unconditional refold the stale fold would outlive the rows it was built from.
+	std::map<std::uint32_t, SearchSlot> slots;
+	std::map<std::uint32_t, std::uint32_t> owner;
+	SearchSlot &slot = slotskSid;
+	slot.needs_resync = true;
+	slot.raw80.ecid = 80;
+	slot.raw80.name = "gone.bin";
+	slot.results = slot.raw;
+	owner80 = kSid;
+
+	CECPacket resp(EC_OP_SEARCH_RESULTS);
+	ApplySearchFullReply(&resp, slots, owner, kSid, /*replace=*/true);
+
+	ASSERT_TRUE(slotskSid.raw.empty());
+	ASSERT_TRUE(slotskSid.results.empty());
+	ASSERT_TRUE(owner.empty());
+	ASSERT_TRUE(!slotskSid.needs_resync);
+}
+
+TEST(Refresher, SearchProgressUnionParsesEveryEntry)
+{
+	CECPacket resp(EC_OP_SEARCH_PROGRESS);
+	for (std::uint32_t sid = 1; sid <= 3; ++sid) {
+		CECTag entry(EC_TAG_SEARCH_ID, sid);
+		entry.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_PERCENT, static_cast<uint8>(sid * 10)));
+		entry.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_STATE, static_cast<uint8>(1)));
+		resp.AddTag(entry);
+	}
+
+	std::map<std::uint32_t, std::pair<std::uint32_t, std::uint32_t>> out;
+	ASSERT_TRUE(ParseSearchProgressUnion(&resp, out));
+	ASSERT_EQUALS(static_cast<size_t>(3), out.size());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(20), out2.first);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1), out2.second);
+}
+
+TEST(Refresher, SearchProgressUnionOmitsExpiredSearch)
+{
+	// Two tracked searches, one reported: the missing id must simply not be in
+	// the map, which is what tells the caller to retire that search.
+	CECPacket resp(EC_OP_SEARCH_PROGRESS);
+	CECTag entry(EC_TAG_SEARCH_ID, static_cast<std::uint32_t>(7));
+	entry.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_PERCENT, static_cast<uint8>(100)));
+	entry.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_STATE, static_cast<uint8>(2)));
+	resp.AddTag(entry);
+
+	std::map<std::uint32_t, std::pair<std::uint32_t, std::uint32_t>> out;
+	ASSERT_TRUE(ParseSearchProgressUnion(&resp, out));
+	ASSERT_TRUE(out.find(7) != out.end());
+	ASSERT_TRUE(out.find(8) == out.end());
+}
+
+TEST(Refresher, SearchProgressUnionAcceptsEmptyReply)
+{
+	// Right opcode, no children: the daemon legitimately holds none of the searches asked
+	// about. Accepted, so the caller retires all of them. The discriminator is the opcode,
+	// never the child count.
+	CECPacket resp(EC_OP_SEARCH_PROGRESS);
+	std::map<std::uint32_t, std::pair<std::uint32_t, std::uint32_t>> out;
+	ASSERT_TRUE(ParseSearchProgressUnion(&resp, out));
+	ASSERT_TRUE(out.empty());
+}
+
+TEST(Refresher, SearchProgressUnionRejectsFailureReply)
+{
+	// EC_OP_FAILED must NOT be read as an empty union: that would retire every tracked search
+	// at once. Rejecting it sends the caller back to per-id polling, which expires only on an
+	// explicit EC_TAG_SEARCH_EXPIRED.
+	CECPacket resp(EC_OP_FAILED);
+	std::map<std::uint32_t, std::pair<std::uint32_t, std::uint32_t>> out;
+	ASSERT_TRUE(!ParseSearchProgressUnion(&resp, out));
+	ASSERT_TRUE(out.empty());
+
+	ASSERT_TRUE(!ParseSearchProgressUnion(NULL, out));
+}
+
+// ParseKadFromPacket -- /kad's node_id rides EC_TAG_KAD_ID, a UINT128 sub-tag of EC_TAG_CONNSTATE
+// that amuled sends only while Kad is running. The API contract is 32 LOWERCASE hex chars (the
+// desktop panel renders the same value uppercase), and an empty string rather than an all-zero id
+// when the sub-tag is absent.
+
+namespace
+{
+
+// CEC_ConnState_Tag is core-side, building itself from theApp, so tests synthesise the wire shape
+// instead: a plain EC_TAG_CONNSTATE carrying the flag word, which is exactly what
+// ParseKadFromPacket downcasts. Bit 0x04 = connected to Kad, 0x10 = Kad running.
+CECTag MakeConnState(std::uint32_t flags)
+{
+	return CECTag(EC_TAG_CONNSTATE, flags);
+}
+
+} // namespace
+
+TEST(Refresher, KadNodeIdDecodesAsLowercaseHex)
+{
+	static const uint8_t id16 = {
+		0x8f, 0x3a, 0x1c, 0x07, 0xd9, 0x4b, 0x2e, 0x5a, 0x60, 0x18, 0xbb, 0x4c, 0x7f, 0x20, 0x9d, 0x3e
+	};
+
+	CECPacket resp(EC_OP_STATS);
+	CECTag conn = MakeConnState(0x04 | 0x10);
+	conn.AddTag(CECTag(EC_TAG_KAD_ID, CUInt128(id)));
+	resp.AddTag(conn);
+
+	KadSnapshot out;
+	ParseKadFromPacket(&resp, out);
+
+	ASSERT_EQUALS(std::string("connected"), out.state);
+	ASSERT_EQUALS(std::string("8f3a1c07d94b2e5a6018bb4c7f209d3e"), out.node_id);
+}
+
+TEST(Refresher, KadNodeIdEmptyWhenTagAbsent)
+{
+	// Kad not running: amuled omits EC_TAG_KAD_ID entirely. An all-zero id would read as a real
+	// identity, so the field must stay empty -- exactly the case `state == "disabled"`
+	// describes.
+	CECPacket resp(EC_OP_STATS);
+	resp.AddTag(MakeConnState(0));
+
+	KadSnapshot out;
+	ParseKadFromPacket(&resp, out);
+
+	ASSERT_EQUALS(std::string("disabled"), out.state);
+	ASSERT_TRUE(out.node_id.empty());
+}
+
+TEST(Refresher, KadPublicIpIsOursAndBuddyIpIsSeparate)
+{
+	// The two addresses in this payload belong to different parties, and they land in
+	// differently named fields -- the whole reason ours is `public_ip` and not a bare `ip`.
+	// Encoded the way IPv4ToDotted reads them, least significant byte first: 0x057100CB is
+	// 203.0.113.5 and 0x097100CB is 203.0.113.9.
+	CECPacket resp(EC_OP_STATS);
+	resp.AddTag(MakeConnState(0x04 | 0x10));
+	resp.AddTag(CECTag(EC_TAG_STATS_KAD_IP_ADDRESS, static_cast<std::uint32_t>(0x057100CBu)));
+	resp.AddTag(CECTag(EC_TAG_STATS_BUDDY_IP, static_cast<std::uint32_t>(0x097100CBu)));
+
+	KadSnapshot out;
+	ParseKadFromPacket(&resp, out);
+
+	ASSERT_EQUALS(std::string("203.0.113.5"), out.public_ip);
+	ASSERT_EQUALS(std::string("203.0.113.9"), out.buddy_ip);
+}
+
+TEST(Refresher, KadBuddyStatusIsNoBuddyWhenTagAbsent)
+{
+	// amuled ships EC_TAG_STATS_BUDDY_STATUS only while Kad is connected. Absent, the field
+	// must still hold one of the values /kad documents -- an empty string is a fourth value
+	// outside the enum. The core and amulegui both read the absence as `Disconnected`, so
+	// "no_buddy" is the amule-faithful answer.
+	CECPacket resp(EC_OP_STATS);
+	resp.AddTag(MakeConnState(0));
+
+	KadSnapshot out;
+	ParseKadFromPacket(&resp, out);
+
+	ASSERT_EQUALS(std::string("disabled"), out.state);
+	ASSERT_EQUALS(std::string("no_buddy"), out.buddy_status);
+}
+
+// ParseStatusFromPacket -- our own eD2k identity and the four stats counters /status reports.
+// Everything below decodes from tags amuled already sends in the EC_DETAIL_FULL STAT_REQ response;
+// these tests exercise the decode itself, which is where the two sentinels live: 0xffffffff for
+// "connect in flight" and the free-space -1 that arrives on the wire as 0xFFFFFFFFFFFFFFFF.
+//
+// MakeConnState above supplies the EC_TAG_CONNSTATE flag word; bit 0x01 = connected to ed2k, 0x02 =
+// connecting.
+
+TEST(Refresher, StatusHighIdLandsIdAndDottedQuad)
+{
+	// A HighID *is* our public IPv4 packed LSB-first, so public_ip has to fall out of the id
+	// rather than being a second field to trust: 210.2.150.73 is 210 | 2<<8 | 150<<16 | 73<<24
+	// == 1234567890, and that identity is exactly what the /status docs promise.
+	CECPacket resp(EC_OP_STATS);
+	CECTag conn = MakeConnState(0x01);
+	conn.AddTag(CECTag(EC_TAG_ED2K_ID, static_cast<std::uint32_t>(1234567890u)));
+	resp.AddTag(conn);
+
+	StatusSnapshot out;
+	ParseStatusFromPacket(&resp, out);
+
+	ASSERT_EQUALS(std::string("connected"), out.ed2k_state);
+	ASSERT_TRUE(out.ed2k_high_id);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1234567890u), out.ed2k_user_id);
+	ASSERT_EQUALS(std::string("210.2.150.73"), out.ed2k_public_ip);
+}
+
+TEST(Refresher, StatusLowIdKeepsIdButHasNoPublicAddress)
+{
+	// A LowID is a small number the server picked for a firewalled client and encodes no
+	// address at all -- rendering it as a dotted quad would invent one, here "42.0.0.0".
+	CECPacket resp(EC_OP_STATS);
+	CECTag conn = MakeConnState(0x01);
+	conn.AddTag(CECTag(EC_TAG_ED2K_ID, static_cast<std::uint32_t>(42u)));
+	resp.AddTag(conn);
+
+	StatusSnapshot out;
+	ParseStatusFromPacket(&resp, out);
+
+	ASSERT_EQUALS(std::string("connected"), out.ed2k_state);
+	ASSERT_TRUE(!out.ed2k_high_id);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(42u), out.ed2k_user_id);
+	ASSERT_TRUE(out.ed2k_public_ip.empty());
+}
+
+TEST(Refresher, StatusConnectingSentinelNeverReachesTheSnapshot)
+{
+	// amuled sends 0xffffffff while a connect is in flight (ECSpecialCoreTags.cpp). Surfaced
+	// verbatim it would read as a HighID of 255.255.255.255; normalised, the id stays 0.
+	CECPacket resp(EC_OP_STATS);
+	CECTag conn = MakeConnState(0x01);
+	conn.AddTag(CECTag(EC_TAG_ED2K_ID, static_cast<std::uint32_t>(0xffffffffu)));
+	resp.AddTag(conn);
+
+	StatusSnapshot out;
+	ParseStatusFromPacket(&resp, out);
+
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0u), out.ed2k_user_id);
+	ASSERT_TRUE(out.ed2k_public_ip.empty());
+}
+
+TEST(Refresher, StatusDisconnectedIsNotReportedAsLowId)
+{
+	// The high_id contract, positive sense: with no EC_TAG_ED2K_ID the id reads 0, and HasLowID()
+	// is "id < 16777216", so a negative low_id spelling would report low_id: true for a daemon that
+	// simply has no id yet -- a firewall diagnosis out of thin air. Positive sense reads
+	// correctly.
+	CECPacket resp(EC_OP_STATS);
+	resp.AddTag(MakeConnState(0));
+
+	StatusSnapshot out;
+	ParseStatusFromPacket(&resp, out);
+
+	ASSERT_EQUALS(std::string("disconnected"), out.ed2k_state);
+	ASSERT_TRUE(!out.ed2k_high_id);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0u), out.ed2k_user_id);
+	ASSERT_TRUE(out.ed2k_public_ip.empty());
+}
+
+TEST(Refresher, StatusOverheadAndFreeSpaceTagsDecode)
+{
+	CECPacket resp(EC_OP_STATS);
+	resp.AddTag(MakeConnState(0x01));
+	resp.AddTag(CECTag(EC_TAG_STATS_DOWN_OVERHEAD, static_cast<std::uint32_t>(8700u)));
+	resp.AddTag(CECTag(EC_TAG_STATS_UP_OVERHEAD, static_cast<std::uint32_t>(1100u)));
+	resp.AddTag(CECTag(EC_TAG_STATS_TEMP_FREE_SPACE, static_cast<std::uint64_t>(48318382080ull)));
+	resp.AddTag(CECTag(EC_TAG_STATS_INCOMING_FREE_SPACE, static_cast<std::uint64_t>(24159191040ull)));
+
+	StatusSnapshot out;
+	ParseStatusFromPacket(&resp, out);
+
+	ASSERT_EQUALS(static_cast<std::uint64_t>(8700), out.download_overhead_bytes_per_second);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(1100), out.upload_overhead_bytes_per_second);
+	ASSERT_EQUALS(static_cast<std::int64_t>(48318382080LL), out.temp_free_bytes);
+	ASSERT_EQUALS(static_cast<std::int64_t>(24159191040LL), out.incoming_free_bytes);
+}
+
+// The search filter takes the tokens the rows report, so a client can filter by a value it was
+// given. Every category a row can carry has a term, except "unknown", which no ed2k category
+// matches: it is rejected rather than quietly matching nothing.
+TEST(Refresher, SearchFileTypeTermCoversEveryReportedToken)
+{
+	ASSERT_EQUALS(std::string("Audio"), SearchFileTypeTerm("audio"));
+	ASSERT_EQUALS(std::string("Video"), SearchFileTypeTerm("video"));
+	ASSERT_EQUALS(std::string("Image"), SearchFileTypeTerm("picture"));
+	ASSERT_EQUALS(std::string("Doc"), SearchFileTypeTerm("text"));
+	ASSERT_EQUALS(std::string("Pro"), SearchFileTypeTerm("program"));
+	ASSERT_EQUALS(std::string("Arc"), SearchFileTypeTerm("archive"));
+	ASSERT_EQUALS(std::string("Iso"), SearchFileTypeTerm("disc_image"));
+}
+
+// Everything else is a caller mistake, including the ed2k spellings the filter used to require and
+// the tokens the issue's first draft proposed.
+TEST(Refresher, SearchFileTypeTermRejectsAnythingElse)
+{
+	ASSERT_EQUALS(std::string(""), SearchFileTypeTerm("unknown"));
+	ASSERT_EQUALS(std::string(""), SearchFileTypeTerm(""));
+	ASSERT_EQUALS(std::string(""), SearchFileTypeTerm("Audio"));
+	ASSERT_EQUALS(std::string(""), SearchFileTypeTerm("Iso"));
+	ASSERT_EQUALS(std::string(""), SearchFileTypeTerm("image"));
+	ASSERT_EQUALS(std::string(""), SearchFileTypeTerm("document"));
+	ASSERT_EQUALS(std::string(""), SearchFileTypeTerm("iso"));
+}
+
+TEST(Refresher, StatusFreeSpaceUnknownSentinelReadsBackAsMinusOne)
+{
+	// amuled's FREE_SPACE_UNKNOWN is a signed -1 and its EC serializer casts it straight to
+	// uint64, so the wire carries 0xFFFFFFFFFFFFFFFF. Read unsigned that becomes
+	// 18446744073709551615 -- "17 exabytes free", the exact opposite of the truth. The decode
+	// has to land -1 so the handlers can emit null.
+	CECPacket resp(EC_OP_STATS);
+	resp.AddTag(MakeConnState(0x01));
+	resp.AddTag(CECTag(EC_TAG_STATS_TEMP_FREE_SPACE, static_cast<std::uint64_t>(0xFFFFFFFFFFFFFFFFull)));
+	resp.AddTag(
+		CECTag(EC_TAG_STATS_INCOMING_FREE_SPACE, static_cast<std::uint64_t>(0xFFFFFFFFFFFFFFFFull)));
+
+	StatusSnapshot out;
+	ParseStatusFromPacket(&resp, out);
+
+	ASSERT_EQUALS(static_cast<std::int64_t>(-1), out.temp_free_bytes);
+	ASSERT_EQUALS(static_cast<std::int64_t>(-1), out.incoming_free_bytes);
+}
+
+TEST(Refresher, StatusWithoutStatsTagsKeepsZeroOverheadAndUnknownDisk)
+{
+	// An amuled old enough not to send these tags must still produce a serviceable snapshot:
+	// overhead 0 (the documented "daemon reports nothing"), disk -1 so /status answers null
+	// rather than 0.
+	CECPacket resp(EC_OP_STATS);
+	resp.AddTag(MakeConnState(0x01));
+
+	StatusSnapshot out;
+	ParseStatusFromPacket(&resp, out);
+
+	ASSERT_EQUALS(static_cast<std::uint64_t>(0), out.download_overhead_bytes_per_second);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(0), out.upload_overhead_bytes_per_second);
+	ASSERT_EQUALS(static_cast<std::int64_t>(-1), out.temp_free_bytes);
+	ASSERT_EQUALS(static_cast<std::int64_t>(-1), out.incoming_free_bytes);
+}
+
+// Preference schema domains (#1174).
+//
+// The schema's bounds and the core's storage limits are two copies of one fact, and nothing used to
+// fail when they drifted apart: eight fields declared a range wider than what CPreferences could
+// hold, so a PATCH inside the declared range was accepted, answered 200, and the value was changed
+// by integer division, by a uint8/uint16 wrap, or by a clamp that did not run until the next daemon
+// start.
+//
+// These assert the properties checkable from the schema alone. They deliberately do not restate
+// each field's numbers -- a test hardcoding the same constants as the table only asserts the table
+// equals a copy of itself. What they catch is the SHAPE of the defect.
+
+TEST(PrefsSchema, NumericRowsHaveACoherentDomain)
+{
+	const webapi::PrefField *schema = webapi::PrefSchema();
+	for (std::size_t i = 0; i < webapi::PrefSchemaSize(); ++i) {
+		const webapi::PrefField &f = schemai;
+		if (f.type != webapi::PrefType::Uint16 && f.type != webapi::PrefType::Uint32)
+			continue;
+		const std::string where = std::string(f.category) + "." + f.key;
+		ASSERT_TRUE_M(f.min <= f.max, (where + ": min above max"));
+		// A Uint16 row whose ceiling does not fit in a uint16 is the
+		// max_new_connections_per_5s defect exactly: the declared range says one thing and
+		// the wire type says another, and the excess wraps.
+		if (f.type == webapi::PrefType::Uint16) {
+			ASSERT_TRUE_M(f.max <= 65535u, (where + ": Uint16 row declares a max above 65535"));
+		}
+		if (f.step) {
+			// Both endpoints have to be reachable, or the range advertises
+			// values the step forbids.
+			ASSERT_TRUE_M((f.max % f.step) == 0, (where + ": max is not a multiple of step"));
+			ASSERT_TRUE_M((f.min % f.step) == 0, (where + ": min is not a multiple of step"));
+		}
+	}
+}
+
+TEST(PrefsSchema, AnUnboundedNumericRowIsADeliberateChoice)
+{
+	// The forcing function. A new numeric row that leaves its ceiling at the full uint32 range
+	// fails here until someone puts it on this list, which is the review conversation the eight
+	// fields in #1174 never had. Both entries below were resolved to genuine uint32 members in
+	// the core during that audit.
+	static const char *const kKnownUnbounded = {
+		"files.min_free_space_mebibytes",
+		"remote_controls.webserver.refresh_seconds",
+	};
+	const webapi::PrefField *schema = webapi::PrefSchema();
+	for (std::size_t i = 0; i < webapi::PrefSchemaSize(); ++i) {
+		const webapi::PrefField &f = schemai;
+		if (f.type != webapi::PrefType::Uint16 && f.type != webapi::PrefType::Uint32)
+			continue;
+		if (f.max != 0xFFFFFFFFu)
+			continue;
+		const std::string where = std::string(f.category) + "." + f.key;
+		bool listed = false;
+		for (const char *known : kKnownUnbounded) {
+			if (where == known) {
+				listed = true;
+				break;
+			}
+		}
+		ASSERT_TRUE_M(listed,
+			(where + ": numeric row is unbounded; give it a real max, or add it to "
+				 "kKnownUnbounded once you have checked the core's storage width"));
+	}
+}

amule-3.1.0.tar.gz/unittests/tests/ReservedProtocolFramesTest.cpp Added

@@ -0,0 +1,176 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// OP_UDPRESERVEDPROT2 (0xB2) carries no eD2k opcode: the byte after the protocol byte is a frame
+// type, and the rest is that frame's payload (eMuleAI, srchybrid/ClientUDPSocket.cpp:982).
+// Everything about that layout is wire format, including the fact that a datagram consisting of the
+// protocol byte alone has no type byte to read.
+//
+// CClientUDPSocket needs theApp, so the classification is a free function in a header of its own
+// and the socket does nothing but dispatch on the result. What this covers is therefore the part
+// that decides: truncation, the five registered types, the payload window handed to each handler,
+// and the unknown-type drop. The switch in CClientUDPSocket::ProcessReservedProt2Frame is a five-
+// way jump over the same constants.
+
+#include <muleunit/test.h>
+
+#include <ReservedProtocolFrames.h>
+#include <protocol/Protocols.h>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(ReservedProtocolFrames)
+
+// The frame types are wire format. Literal values, not a restatement of the
+// header they check.
+TEST(ReservedProtocolFrames, FrameTypeValuesAreExact)
+{
+	ASSERT_EQUALS(0xB2, (int)OP_UDPRESERVEDPROT2);
+	ASSERT_EQUALS(0x00, (int)OP_NATT_FRAME_UTP);
+	ASSERT_EQUALS(0x01, (int)OP_NATT_FRAME_QUIC);
+	ASSERT_EQUALS(0x02, (int)OP_NATT_FRAME_CAPS);
+	ASSERT_EQUALS(0x03, (int)OP_NATT_FRAME_CAPS_ACK);
+	ASSERT_EQUALS(0xFF, (int)OP_NATT_FRAME_KEY);
+}
+
+// Spec delta, "Truncated frame": an empty payload must be dropped and the read must not reach past
+// the end. The classifier is handed the frame window only -- the byte after the protocol byte
+// onwards -- so an empty window is exactly the datagram that carried nothing but 0xB2.
+TEST(ReservedProtocolFrames, EmptyFrameIsTruncated)
+{
+	// A deliberately non-zero guard byte one position before the window: if the classifier read
+	// backwards or past its length it would find 0xAA and report it as a frame type.
+	const uint8_t buffer2 = { 0xAA, 0xAA };
+
+	SReservedProt2Frame frame = ClassifyReservedProt2Frame(buffer + 1, 0);
+	ASSERT_EQUALS((int)RP2_TRUNCATED, (int)frame.disposition);
+	ASSERT_EQUALS(0u, (unsigned)frame.payloadLength);
+
+	// A null window is the same condition, not a crash.
+	frame = ClassifyReservedProt2Frame(NULL, 0);
+	ASSERT_EQUALS((int)RP2_TRUNCATED, (int)frame.disposition);
+}
+
+// Each registered type reaches its handler with the payload that follows it, and a type byte with
+// nothing after it is a valid zero-length payload rather than truncation. Only the type byte itself
+// is mandatory.
+TEST(ReservedProtocolFrames, EachKnownTypeIsRecognised)
+{
+	const uint8_t known5 = { OP_NATT_FRAME_UTP,
+		OP_NATT_FRAME_QUIC,
+		OP_NATT_FRAME_CAPS,
+		OP_NATT_FRAME_CAPS_ACK,
+		OP_NATT_FRAME_KEY };
+
+	for (int i = 0; i < 5; ++i) {
+		const uint8_t buffer4 = { knowni, 0x11, 0x22, 0x33 };
+
+		SReservedProt2Frame frame = ClassifyReservedProt2Frame(buffer, 4);
+		ASSERT_EQUALS((int)RP2_KNOWN_TYPE, (int)frame.disposition);
+		ASSERT_EQUALS((int)knowni, (int)frame.type);
+		ASSERT_EQUALS(3u, (unsigned)frame.payloadLength);
+		ASSERT_TRUE(frame.payload == buffer + 1);
+		ASSERT_EQUALS(0x11, (int)frame.payload0);
+
+		// Type byte only: an empty payload for that handler to reject on
+		// its own terms.
+		frame = ClassifyReservedProt2Frame(buffer, 1);
+		ASSERT_EQUALS((int)RP2_KNOWN_TYPE, (int)frame.disposition);
+		ASSERT_EQUALS((int)knowni, (int)frame.type);
+		ASSERT_EQUALS(0u, (unsigned)frame.payloadLength);
+	}
+}
+
+// Spec delta, "Frame type the client cannot handle": every type outside the registered five is
+// dropped. Sweeping the whole byte range keeps a later type addition from silently landing in the
+// wrong branch.
+TEST(ReservedProtocolFrames, EveryUnregisteredTypeIsDropped)
+{
+	for (unsigned type = 0; type <= 0xFF; ++type) {
+		const bool registered = (type == OP_NATT_FRAME_UTP || type == OP_NATT_FRAME_QUIC ||
+					 type == OP_NATT_FRAME_CAPS || type == OP_NATT_FRAME_CAPS_ACK ||
+					 type == OP_NATT_FRAME_KEY);
+
+		const uint8_t buffer2 = { (uint8_t)type, 0x55 };
+		SReservedProt2Frame frame = ClassifyReservedProt2Frame(buffer, 2);
+
+		if (registered) {
+			ASSERT_EQUALS((int)RP2_KNOWN_TYPE, (int)frame.disposition);
+		} else {
+			ASSERT_EQUALS((int)RP2_UNKNOWN_TYPE, (int)frame.disposition);
+			// The type still travels out, because the drop is logged.
+			ASSERT_EQUALS((int)type, (int)frame.type);
+		}
+	}
+}
+
+// The classifier is what the flood-accounting exemption rests on: it returns a disposition and
+// touches nothing else, so a dropped frame cannot reach CPacketTracking. Only OP_KADEMLIAHEADER
+// does (KademliaUDPListener.cpp:263), and this classifier has no way to get there. Asserting the
+// function is const-correct over its input is the closest a unit test gets to that; the placement
+// is what actually guarantees it.
+TEST(ReservedProtocolFrames, ClassificationDoesNotMutateTheDatagram)
+{
+	uint8_t buffer4 = { 0x7E, 0x11, 0x22, 0x33 };
+	const uint8_t before4 = { 0x7E, 0x11, 0x22, 0x33 };
+
+	SReservedProt2Frame frame = ClassifyReservedProt2Frame(buffer, 4);
+	ASSERT_EQUALS((int)RP2_UNKNOWN_TYPE, (int)frame.disposition);
+
+	for (int i = 0; i < 4; ++i) {
+		ASSERT_EQUALS((int)beforei, (int)bufferi);
+	}
+}
+
+// An unknown-frame flood must not become a log flood. The first occurrence logs, the rest of the
+// window is counted, and the count is reported with the next line that does get through.
+TEST(ReservedProtocolFrames, UnknownFrameLogIsRateLimited)
+{
+	CFrameLogThrottle throttle(1000);
+
+	ASSERT_TRUE(throttle.ShouldLog(10000));
+	ASSERT_EQUALS(0u, throttle.TakeSuppressedCount());
+
+	ASSERT_FALSE(throttle.ShouldLog(10001));
+	ASSERT_FALSE(throttle.ShouldLog(10500));
+	ASSERT_FALSE(throttle.ShouldLog(10999));
+
+	ASSERT_TRUE(throttle.ShouldLog(11000));
+	ASSERT_EQUALS(3u, throttle.TakeSuppressedCount());
+	ASSERT_EQUALS(0u, throttle.TakeSuppressedCount());
+
+	ASSERT_FALSE(throttle.ShouldLog(11001));
+	ASSERT_TRUE(throttle.ShouldLog(99999));
+	ASSERT_EQUALS(1u, throttle.TakeSuppressedCount());
+}
+
+// A tick counter that appears to move backwards -- it should not, but the throttle must not answer
+// with a silence lasting until it catches up -- opens the window rather than closing it.
+TEST(ReservedProtocolFrames, ThrottleToleratesNonMonotonicClock)
+{
+	CFrameLogThrottle throttle(1000);
+
+	ASSERT_TRUE(throttle.ShouldLog(10000));
+	ASSERT_TRUE(throttle.ShouldLog(500));
+}

amule-3.1.0.tar.gz/unittests/tests/SafeKadTest.cpp Added

@@ -0,0 +1,575 @@
+//								-*- C++ -*-
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+#include <kademlia/net/SafeKad.h>
+#include <protocol/kad2/Constants.h>
+
+using namespace muleunit;
+using Kademlia::CSafeKad;
+using Kademlia::CUInt128;
+
+// A fixed "now" for every test; the class takes the time as a parameter, so no
+// test here waits on a real clock.
+static const time_t T0 = 1700000000;
+
+static const uint32_t IP_A = 0x0A000001;
+static const uint32_t IP_B = 0x0A000002;
+static const uint16_t PORT_A = 4672;
+static const uint16_t PORT_B = 4673;
+
+static CUInt128 Id(uint32_t seed)
+{
+	return CUInt128(seed);
+}
+
+DECLARE_SIMPLE(SafeKad)
+
+TEST(SafeKad, FirstSightingOfANodeIsAccepted)
+{
+	CSafeKad safe;
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, true, true, T0));
+	ASSERT_EQUALS(1u, (unsigned)safe.GetTrackedNodeCount());
+	ASSERT_FALSE(safe.IsProblematic(IP_A, PORT_A, T0));
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0));
+}
+
+TEST(SafeKad, SameIdentityIsAcceptedRepeatedly)
+{
+	CSafeKad safe;
+	for (unsigned i = 0; i < 20; ++i) {
+		ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, true, true, T0 + i));
+	}
+	ASSERT_EQUALS(1u, (unsigned)safe.GetTrackedNodeCount());
+}
+
+TEST(SafeKad, RapidIdentityRotationIsRejectedAndMarkedProblematic)
+{
+	CSafeKad safe;
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), true, T0));
+
+	// Same address, new ID, well inside the one-hour minimum interval.
+	const time_t soon = T0 + CSafeKad::MIN_ID_CHANGE_INTERVAL - 1;
+	ASSERT_FALSE(safe.TrackNode(IP_A, PORT_A, Id(2), true, soon));
+
+	// The contact must be rejected...
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(2), KADEMLIA_VERSION, true, false, soon));
+	// ...and the address must be on the problematic list.
+	ASSERT_TRUE(safe.IsProblematic(IP_A, PORT_A, soon));
+}
+
+TEST(SafeKad, IdentityChangeAfterTheIntervalIsAccepted)
+{
+	CSafeKad safe;
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), true, T0));
+
+	const time_t later = T0 + CSafeKad::MIN_ID_CHANGE_INTERVAL + 1;
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(2), true, later));
+	ASSERT_FALSE(safe.IsProblematic(IP_A, PORT_A, later));
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(2), KADEMLIA_VERSION, true, false, later));
+}
+
+TEST(SafeKad, RepeatedRotationEscalatesToABan)
+{
+	CSafeKad safe;
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), true, T0));
+	// First rotation: problematic.
+	ASSERT_FALSE(safe.TrackNode(IP_A, PORT_A, Id(2), true, T0 + 10));
+	ASSERT_TRUE(safe.IsProblematic(IP_A, PORT_A, T0 + 10));
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0 + 10));
+
+	// Second rotation while still problematic: banned.
+	ASSERT_FALSE(safe.TrackNode(IP_A, PORT_A, Id(3), true, T0 + 20));
+	ASSERT_TRUE(safe.IsBanned(IP_A, T0 + 20));
+	// A banned address stops being tracked; there is nothing left to weigh.
+	ASSERT_EQUALS(0u, (unsigned)safe.GetTrackedNodeCount());
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(3), KADEMLIA_VERSION, true, false, T0 + 20));
+}
+
+TEST(SafeKad, AnUnverifiedClaimCannotOverwriteAVerifiedIdentity)
+{
+	CSafeKad safe;
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), true, T0));
+
+	// Long past the interval, so the rate limit is not what rejects this.
+	const time_t later = T0 + CSafeKad::MIN_ID_CHANGE_INTERVAL * 2;
+	ASSERT_FALSE(safe.TrackNode(IP_A, PORT_A, Id(9), false, later));
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(9), KADEMLIA_VERSION, false, false, later));
+	// The verified identity is still the one we hold.
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, true, false, later));
+}
+
+TEST(SafeKad, PreVersion8NodesGetNoUnverifiedIdentityChangeAtAll)
+{
+	CSafeKad safe;
+	// Tracked unverified, so the "verified beats unverified" rule is not
+	// what is doing the work here.
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), false, T0));
+
+	// Keep the entry's last-reference time fresh while its last identity change ages. That is
+	// what a node we keep talking to looks like; without it, NODE_MAX_REFERENCE_AGE would
+	// reclaim the entry before the identity-change interval had elapsed and there would be
+	// nothing left to reject.
+	const time_t later = T0 + CSafeKad::MIN_ID_CHANGE_INTERVAL * 2;
+	safe.TrackNode(IP_A, PORT_A, Id(1), false, later - 1);
+
+	// A 0x07 node could not prove which port it listens on.
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(2), 0x07, false, false, later));
+	// The same change from a 0x08 node, past the interval, is fine.
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(2), 0x08, true, false, later));
+}
+
+TEST(SafeKad, OneNodePerAddressIsEnforcedWhenAsked)
+{
+	CSafeKad safe;
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, true, true, T0));
+
+	// A second Kad port on the same address.
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_B, Id(2), KADEMLIA_VERSION, true, true, T0));
+	// The first port keeps working.
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, true, true, T0));
+	// A different address is unaffected.
+	ASSERT_FALSE(safe.IsBadNode(IP_B, PORT_B, Id(3), KADEMLIA_VERSION, true, true, T0));
+
+	// With the check off (the search-response path, where the contact is
+	// already in our routing table), the second port is allowed.
+	CSafeKad relaxed;
+	ASSERT_FALSE(relaxed.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, true, false, T0));
+	ASSERT_FALSE(relaxed.IsBadNode(IP_A, PORT_B, Id(2), KADEMLIA_VERSION, true, false, T0));
+}
+
+TEST(SafeKad, ProblematicEntriesExpireAfterTheirHorizon)
+{
+	CSafeKad safe;
+	safe.TrackProblematicNode(IP_A, PORT_A, T0);
+	ASSERT_TRUE(safe.IsProblematic(IP_A, PORT_A, T0));
+	ASSERT_TRUE(safe.IsProblematic(IP_A, PORT_A, T0 + CSafeKad::MAX_PROBLEMATIC_TIME));
+
+	ASSERT_FALSE(safe.IsProblematic(IP_A, PORT_A, T0 + CSafeKad::MAX_PROBLEMATIC_TIME + 1));
+	ASSERT_EQUALS(0u, (unsigned)safe.GetProblematicNodeCount());
+}
+
+TEST(SafeKad, BansLapseAfterFourHours)
+{
+	CSafeKad safe;
+	safe.BanAddress(IP_A, T0);
+	ASSERT_TRUE(safe.IsBanned(IP_A, T0));
+	ASSERT_TRUE(safe.IsBanned(IP_A, T0 + CSafeKad::MAX_BAN_TIME));
+	ASSERT_EQUALS((unsigned)(4 * 3600), (unsigned)CSafeKad::MAX_BAN_TIME);
+
+	// Past the ceiling the address is judged on its current behaviour alone.
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0 + CSafeKad::MAX_BAN_TIME + 1));
+	ASSERT_EQUALS(0u, (unsigned)safe.GetBannedAddressCount());
+	ASSERT_FALSE(safe.IsBadNode(
+		IP_A, PORT_A, Id(1), KADEMLIA_VERSION, true, true, T0 + CSafeKad::MAX_BAN_TIME + 1));
+}
+
+TEST(SafeKad, ABannedAddressIsProblematicByConstruction)
+{
+	CSafeKad safe;
+	safe.BanAddress(IP_A, T0);
+	ASSERT_TRUE(safe.IsProblematic(IP_A, PORT_A, T0));
+	ASSERT_TRUE(safe.IsProblematic(IP_A, PORT_B, T0));
+	// And it is not tracked or re-marked while banned.
+	safe.TrackProblematicNode(IP_A, PORT_A, T0);
+	ASSERT_EQUALS(0u, (unsigned)safe.GetProblematicNodeCount());
+	ASSERT_FALSE(safe.TrackNode(IP_A, PORT_A, Id(1), true, T0));
+	ASSERT_EQUALS(0u, (unsigned)safe.GetTrackedNodeCount());
+}
+
+TEST(SafeKad, TrackedTableStaysBoundedUnderSustainedTraffic)
+{
+	CSafeKad safe;
+	// Every address is distinct and fresh, which is the shape of a flood:
+	// nothing is old enough for the age horizon to reclaim.
+	for (unsigned i = 0; i < CSafeKad::MAX_TRACKED_NODES + 500; ++i) {
+		safe.TrackNode(0x20000000 + i, PORT_A, Id(i), true, T0);
+	}
+	ASSERT_TRUE(safe.GetTrackedNodeCount() <= CSafeKad::MAX_TRACKED_NODES);
+	ASSERT_EQUALS((unsigned)CSafeKad::MAX_TRACKED_NODES, (unsigned)safe.GetTrackedNodeCount());
+}
+
+TEST(SafeKad, ProblematicTableStaysBoundedUnderSustainedTraffic)
+{
+	CSafeKad safe;
+	for (unsigned i = 0; i < CSafeKad::MAX_PROBLEMATIC_NODES + 500; ++i) {
+		safe.TrackProblematicNode(0x30000000 + i, PORT_A, T0);
+	}
+	ASSERT_EQUALS((unsigned)CSafeKad::MAX_PROBLEMATIC_NODES, (unsigned)safe.GetProblematicNodeCount());
+}
+
+TEST(SafeKad, BannedTableStaysBoundedUnderSustainedTraffic)
+{
+	CSafeKad safe;
+	for (unsigned i = 0; i < CSafeKad::MAX_BANNED_ADDRESSES + 500; ++i) {
+		safe.BanAddress(0x40000000 + i, T0);
+	}
+	ASSERT_EQUALS((unsigned)CSafeKad::MAX_BANNED_ADDRESSES, (unsigned)safe.GetBannedAddressCount());
+}
+
+TEST(SafeKad, TableCapacitiesMatchTheSpecifiedBounds)
+{
+	ASSERT_EQUALS(10000u, (unsigned)CSafeKad::MAX_TRACKED_NODES);
+	ASSERT_EQUALS(10000u, (unsigned)CSafeKad::MAX_PROBLEMATIC_NODES);
+	ASSERT_EQUALS(1000u, (unsigned)CSafeKad::MAX_BANNED_ADDRESSES);
+	ASSERT_EQUALS(3600u, (unsigned)CSafeKad::MIN_ID_CHANGE_INTERVAL);
+	ASSERT_EQUALS(300u, (unsigned)CSafeKad::MAX_PROBLEMATIC_TIME);
+}
+
+TEST(SafeKad, EvictionAtCapacityDropsTheLeastRecentlyReferencedEntry)
+{
+	CSafeKad safe;
+	// One timestamp for the whole fill, so nothing is reclaimable by the age
+	// horizon and the capacity path is what has to do the work.
+	for (unsigned i = 0; i < CSafeKad::MAX_TRACKED_NODES; ++i) {
+		safe.TrackNode(0x50000000 + i, PORT_A, Id(i), true, T0);
+	}
+	ASSERT_EQUALS((unsigned)CSafeKad::MAX_TRACKED_NODES, (unsigned)safe.GetTrackedNodeCount());
+
+	// Refresh one address so it is strictly the most recently referenced.
+	safe.TrackNode(0x50000005, PORT_A, Id(5), true, T0 + 1);
+
+	// A new address has to displace something, and the table must not grow.
+	ASSERT_TRUE(safe.TrackNode(0x5FFFFFFF, PORT_A, Id(0xFFFF), true, T0 + 1));
+	ASSERT_EQUALS((unsigned)CSafeKad::MAX_TRACKED_NODES, (unsigned)safe.GetTrackedNodeCount());
+
+	// The refreshed address survived: it still remembers its identity, so a
+	// rotation inside the one-hour interval is refused.
+	ASSERT_TRUE(safe.IsBadNode(0x50000005, PORT_A, Id(0xBEEF), KADEMLIA_VERSION, true, false, T0 + 1));
+
+	// The least recently referenced address is the one that went: a new identity for it is
+	// accepted as a first sighting rather than rejected as a rotation, which is only possible
+	// if its entry is really gone.
+	ASSERT_TRUE(safe.TrackNode(0x50000000, PORT_A, Id(0x1234), true, T0 + 1));
+}
+
+TEST(SafeKad, CleanupReclaimsEntriesPastTheirReferenceHorizon)
+{
+	CSafeKad safe;
+	safe.TrackNode(IP_A, PORT_A, Id(1), true, T0);
+	safe.TrackProblematicNode(IP_B, PORT_B, T0);
+	safe.BanAddress(0x0A000003, T0);
+	ASSERT_EQUALS(1u, (unsigned)safe.GetTrackedNodeCount());
+	ASSERT_EQUALS(1u, (unsigned)safe.GetProblematicNodeCount());
+	ASSERT_EQUALS(1u, (unsigned)safe.GetBannedAddressCount());
+
+	// Past the node and problematic horizons, but not the ban one.
+	safe.Cleanup(T0 + CSafeKad::NODE_MAX_REFERENCE_AGE + 1);
+	ASSERT_EQUALS(0u, (unsigned)safe.GetTrackedNodeCount());
+	ASSERT_EQUALS(0u, (unsigned)safe.GetProblematicNodeCount());
+	ASSERT_EQUALS(1u, (unsigned)safe.GetBannedAddressCount());
+
+	// And past the ban horizon, which is the ban duration itself.
+	safe.Cleanup(T0 + CSafeKad::BAN_MAX_REFERENCE_AGE + 1);
+	ASSERT_EQUALS(0u, (unsigned)safe.GetBannedAddressCount());
+}
+
+// A refused claim must not be what marks an address verified. The flag gates the escalation
+// ladder, and m_lastID still holds the previous claim at that point, so promoting on a refusal
+// certifies an identity nobody proved.
+TEST(SafeKad, ARefusedRotationDoesNotConferVerification)
+{
+	CSafeKad safe;
+	// An unverified first claim: whoever spoke first, not necessarily the real node.
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), false, T0));
+
+	// A verified claim of a different ID, inside the interval, so it is refused.
+	ASSERT_FALSE(safe.TrackNode(IP_A, PORT_A, Id(2), true, T0 + 10));
+
+	// Nothing was ever verified at this address, so well past the interval an unverified
+	// claim is ordinary rotation and is accepted. It would be refused if the rejected claim
+	// above had been allowed to set the verified flag.
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(3), false, T0 + CSafeKad::MIN_ID_CHANGE_INTERVAL * 2));
+}
+
+// An entry holding an unproven ID must not be kept alive by the traffic it is refusing, or an
+// attacker who merely spoke first from an address owns it for as long as the honest node keeps
+// trying. A verified entry is the opposite: it is the protection, so refused traffic renews it.
+TEST(SafeKad, OnlyAVerifiedEntrySurvivesOnRefusedTrafficAlone)
+{
+	const time_t past = T0 + CSafeKad::NODE_MAX_REFERENCE_AGE + 1;
+
+	CSafeKad unproven;
+	ASSERT_TRUE(unproven.TrackNode(IP_A, PORT_A, Id(1), false, T0));
+	ASSERT_FALSE(unproven.TrackNode(IP_A, PORT_A, Id(2), false, T0 + 10));
+	unproven.Cleanup(past);
+	ASSERT_EQUALS(0u, (unsigned)unproven.GetTrackedNodeCount());
+
+	CSafeKad proven;
+	ASSERT_TRUE(proven.TrackNode(IP_A, PORT_A, Id(1), true, T0));
+	ASSERT_FALSE(proven.TrackNode(IP_A, PORT_A, Id(2), false, T0 + 10));
+	proven.Cleanup(past);
+	ASSERT_EQUALS(1u, (unsigned)proven.GetTrackedNodeCount());
+}
+
+// A ban has to outlive the quiet it causes. Reclaiming banned entries on a horizon shorter than
+// MAX_BAN_TIME ended the ban early for precisely the attacker who backs off, since an address
+// that stops sending stops being referenced.
+TEST(SafeKad, ABanSurvivesAsLongAsItLasts)
+{
+	CSafeKad safe;
+	safe.BanAddress(IP_A, T0);
+
+	// Deliberately no IsBanned() before the sweep. It refreshes m_lastReferenced, which is
+	// exactly what the horizon is measured against, so asking whether the address is banned
+	// would itself postpone the reclaim and hide the regression this pins.
+	//
+	// An hour of silence used to be enough to reclaim it.
+	safe.Cleanup(T0 + 3600 + 1);
+	ASSERT_EQUALS(1u, (unsigned)safe.GetBannedAddressCount());
+	ASSERT_TRUE(safe.IsBanned(IP_A, T0 + 3600 + 1));
+
+	// It ends when the ban ends, not before.
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0 + CSafeKad::MAX_BAN_TIME + 1));
+}
+
+TEST(SafeKad, CleanupKeepsRecentlyReferencedEntries)
+{
+	CSafeKad safe;
+	safe.TrackNode(IP_A, PORT_A, Id(1), true, T0);
+	safe.Cleanup(T0 + CSafeKad::NODE_MAX_REFERENCE_AGE);
+	ASSERT_EQUALS(1u, (unsigned)safe.GetTrackedNodeCount());
+}
+
+TEST(SafeKad, ClearEmptiesEveryTable)
+{
+	CSafeKad safe;
+	safe.TrackNode(IP_A, PORT_A, Id(1), true, T0);
+	safe.TrackProblematicNode(IP_B, PORT_B, T0);
+	safe.BanAddress(0x0A000004, T0);
+
+	safe.Clear();
+	ASSERT_EQUALS(0u, (unsigned)safe.GetTrackedNodeCount());
+	ASSERT_EQUALS(0u, (unsigned)safe.GetProblematicNodeCount());
+	ASSERT_EQUALS(0u, (unsigned)safe.GetBannedAddressCount());
+}
+
+// An unverified identity change against a verified tracked entry is refused outright rather than
+// rate-limited -- and refused without escalating.
+//
+// The refusal is what protects the entry: the identity we verified is still the one we hold, and
+// the claim gets nothing. Escalating on top of it would be the mistake, because nothing about an
+// unverified claim ties it to the address it names. A peer answering one of our Kad requests picks
+// the (IP, port, ID) triples it lists, so the ladder would climb on somebody else's say-so and ban
+// the node that did nothing.
+TEST(SafeKad, AnUnverifiedIdentityChangeAgainstAVerifiedEntryIsRefusedNotEscalated)
+{
+	CSafeKad safe;
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), true, T0));
+
+	// Refused, and nothing recorded against the address.
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(2), KADEMLIA_VERSION, false, false, T0 + 10));
+	ASSERT_FALSE(safe.IsProblematic(IP_A, PORT_A, T0 + 10));
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0 + 10));
+
+	// Retrying earns no more than the first attempt did. Free for the sender, and that is the
+	// accepted cost: an unverified claim can waste our time, but it must not be able to spend
+	// somebody else's reputation.
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(3), KADEMLIA_VERSION, false, false, T0 + 20));
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0 + 20));
+
+	// The entry survives intact, and the identity we verified still works.
+	ASSERT_EQUALS(1u, (unsigned)safe.GetTrackedNodeCount());
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, true, false, T0 + 30));
+}
+
+// The same refusal for a pre-0x08 node, where it is the version rather than the verification state
+// of the tracked entry that refuses the change. Such a node can never verify, so it can never be
+// escalated either -- it keeps the refusal and loses nothing else.
+TEST(SafeKad, AnUnverifiedPreVersion8IdentityChangeIsRefusedNotEscalated)
+{
+	CSafeKad safe;
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), false, T0));
+
+	// Refused, both times, and never escalated. A pre-0x08 node cannot prove which port it
+	// listens on, so nothing it says about its identity is verified -- and an unverified claim
+	// is the one a third party can fabricate. Refusing costs the sender its rotation; banning
+	// would let anyone spoofing this address get the honest node behind it banned.
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(2), 0x07, false, false, T0 + 10));
+	ASSERT_FALSE(safe.IsProblematic(IP_A, PORT_A, T0 + 10));
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0 + 10));
+
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(3), 0x07, false, false, T0 + 20));
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0 + 20));
+}
+
+// One rejected rotation is one step up the ladder, never two. Both refusal paths -- the outright
+// one here and TrackNode's rate limit -- share a single escalation, so a single call must leave the
+// address problematic and not banned. Double-counting would ban on first contact.
+TEST(SafeKad, OneRejectedRotationEscalatesExactlyOneStep)
+{
+	CSafeKad safe;
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, true, false, T0));
+
+	// Verified, so this goes through TrackNode's rate limit rather than the
+	// outright refusal.
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(2), KADEMLIA_VERSION, true, false, T0 + 10));
+	ASSERT_TRUE(safe.IsProblematic(IP_A, PORT_A, T0 + 10));
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0 + 10));
+	ASSERT_EQUALS(1u, (unsigned)safe.GetProblematicNodeCount());
+
+	CSafeKad other;
+	ASSERT_FALSE(other.IsBadNode(IP_B, PORT_A, Id(1), KADEMLIA_VERSION, true, false, T0));
+	// Unverified, so this takes the outright refusal -- which refuses without
+	// escalating, and so leaves no problematic entry at all.
+	ASSERT_TRUE(other.IsBadNode(IP_B, PORT_A, Id(2), KADEMLIA_VERSION, false, false, T0 + 10));
+	ASSERT_FALSE(other.IsProblematic(IP_B, PORT_A, T0 + 10));
+	ASSERT_FALSE(other.IsBanned(IP_B, T0 + 10));
+	ASSERT_EQUALS(0u, (unsigned)other.GetProblematicNodeCount());
+}
+
+// The attack the verification requirement exists to stop, written out as a test because the code
+// reads reasonable without it.
+//
+// ProcessKademlia2Response() calls AddUnfiltered() with verified hardcoded to false, and the peer
+// answering our request chooses the (IP, port, ID) triples it lists. m_lastIDChange is stamped when
+// an entry is created, so every freshly learned contact sits inside the sub-hour window. Two
+// fabricated mentions of an honest node would therefore have marked it problematic and then banned
+// it for four hours, without that node ever sending us anything.
+TEST(SafeKad, FabricatedUnverifiedMentionsCannotBanAnHonestNode)
+{
+	CSafeKad safe;
+
+	// An honest node we have just learned about, exactly as a response
+	// listing it would: unverified, and stamped now.
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, false, false, T0));
+
+	// A hostile peer names the same address twice with identities it made
+	// up, well inside the rotation window.
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(2), KADEMLIA_VERSION, false, false, T0 + 5));
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(3), KADEMLIA_VERSION, false, false, T0 + 10));
+
+	// Neither mention counted for anything.
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0 + 10));
+	ASSERT_FALSE(safe.IsProblematic(IP_A, PORT_A, T0 + 10));
+
+	// And the honest node is still usable under the identity we hold.
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, false, false, T0 + 15));
+}
+
+// The other half: a peer that has proved which port it listens on and then cycles identities faster
+// than once an hour is escalated exactly as before. Requiring verification narrows who can be
+// banned, not what a ban is for.
+TEST(SafeKad, AVerifiedRotationStillEscalatesToABan)
+{
+	CSafeKad safe;
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, true, false, T0));
+
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(2), KADEMLIA_VERSION, true, false, T0 + 10));
+	ASSERT_TRUE(safe.IsProblematic(IP_A, PORT_A, T0 + 10));
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0 + 10));
+
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(3), KADEMLIA_VERSION, true, false, T0 + 20));
+	ASSERT_TRUE(safe.IsBanned(IP_A, T0 + 20));
+}
+
+// The reporting the integration layer logs and counts from. A ban that is merely refreshed must not
+// read as a new one, or the figure counts calls rather than addresses -- the drift CBanRecord was
+// extracted to stop on the client-side ban list.
+TEST(SafeKad, BanAddressReportsOnlyTheFirstBanOfAnAddress)
+{
+	CSafeKad safe;
+	ASSERT_TRUE(safe.BanAddress(IP_A, T0));
+	ASSERT_FALSE(safe.BanAddress(IP_A, T0 + 1));
+	ASSERT_EQUALS(1u, (unsigned)safe.GetBannedAddressCount());
+
+	// A different address is a new ban again.
+	ASSERT_TRUE(safe.BanAddress(IP_B, T0 + 2));
+	ASSERT_EQUALS(2u, (unsigned)safe.GetBannedAddressCount());
+}
+
+// A ban that has lapsed and is imposed again is a new ban: the address left the set in between, so
+// counting it again is what keeps the figure equal to the size of the set.
+TEST(SafeKad, ALapsedBanReimposedReportsAsNew)
+{
+	CSafeKad safe;
+	ASSERT_TRUE(safe.BanAddress(IP_A, T0));
+
+	const time_t afterExpiry = T0 + CSafeKad::MAX_BAN_TIME + 1;
+	ASSERT_FALSE(safe.IsBanned(IP_A, afterExpiry));
+	ASSERT_TRUE(safe.BanAddress(IP_A, afterExpiry));
+}
+
+// TrackNode's out-param is how the ban reaches a caller that can log it.
+// It must stay false on every path that does not ban, including the refusals.
+TEST(SafeKad, TrackNodeReportsANewBanOnlyWhenItEscalatesToOne)
+{
+	CSafeKad safe;
+	bool banned = true; // deliberately wrong, so a missed write shows
+
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), true, T0, &banned));
+	ASSERT_FALSE(banned);
+
+	// First rapid rotation: refused, marked problematic, not yet banned.
+	banned = true;
+	ASSERT_FALSE(safe.TrackNode(IP_A, PORT_A, Id(2), true, T0 + 10, &banned));
+	ASSERT_FALSE(banned);
+
+	// Second: the escalation lands, and this is the event worth reporting.
+	ASSERT_FALSE(safe.TrackNode(IP_A, PORT_A, Id(3), true, T0 + 20, &banned));
+	ASSERT_TRUE(banned);
+
+	// Already banned, so a further attempt reports nothing new.
+	banned = true;
+	ASSERT_FALSE(safe.TrackNode(IP_A, PORT_A, Id(4), true, T0 + 30, &banned));
+	ASSERT_FALSE(banned);
+}
+
+// An unverified claim is refused without escalating, so it must not report a ban either -- this is
+// the path that would let fabricated mentions ban an honest node if the report were wired to the
+// refusal instead of the ban.
+TEST(SafeKad, TrackNodeReportsNoBanForARefusalThatDoesNotEscalate)
+{
+	CSafeKad safe;
+	bool banned = true;
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), true, T0, &banned));
+
+	banned = true;
+	ASSERT_FALSE(safe.TrackNode(IP_A, PORT_A, Id(2), false, T0 + 10, &banned));
+	ASSERT_FALSE(banned);
+	ASSERT_FALSE(safe.IsBanned(IP_A, T0 + 10));
+}
+
+// A change refused only because it could not be verified, long past the interval, is not rapid
+// rotation and must not escalate: a legacy client that legitimately reinstalled once a year is not
+// a sybil, and banning it for four hours over a single refused change would be the protection
+// misfiring.
+TEST(SafeKad, ARefusedChangePastTheIntervalIsNotEscalated)
+{
+	CSafeKad safe;
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), true, T0));
+
+	// Keep the entry referenced while its last identity change ages, so the reference horizon
+	// does not reclaim it before the interval elapses. The refresh goes through TrackNode on
+	// purpose: IsBadNode() runs Cleanup() before it looks the entry up, so refreshing through
+	// it would reclaim the entry first and turn the next call into a first sighting.
+	const time_t later = T0 + CSafeKad::MIN_ID_CHANGE_INTERVAL * 2;
+	ASSERT_TRUE(safe.TrackNode(IP_A, PORT_A, Id(1), true, later - 1));
+
+	ASSERT_TRUE(safe.IsBadNode(IP_A, PORT_A, Id(9), KADEMLIA_VERSION, false, false, later));
+	ASSERT_FALSE(safe.IsProblematic(IP_A, PORT_A, later));
+	ASSERT_FALSE(safe.IsBanned(IP_A, later));
+	// The verified identity we hold is untouched and still usable.
+	ASSERT_FALSE(safe.IsBadNode(IP_A, PORT_A, Id(1), KADEMLIA_VERSION, true, false, later));
+}

amule-3.1.0.tar.gz/unittests/tests/SearchHistoryTest.cpp Added

@@ -0,0 +1,130 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include <SearchHistory.h>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(SearchHistory)
+
+TEST(SearchHistory, NewTermPrependedToEmptyList)
+{
+	wxArrayString result = ApplySearchHistoryEntry(wxArrayString(), "ubuntu", 30);
+
+	ASSERT_EQUALS((size_t)1, result.GetCount());
+	ASSERT_EQUALS(wxString("ubuntu"), result0);
+}
+
+TEST(SearchHistory, NewTermPrependedAheadOfExisting)
+{
+	wxArrayString existing;
+	existing.Add("debian");
+	existing.Add("fedora");
+
+	wxArrayString result = ApplySearchHistoryEntry(existing, "ubuntu", 30);
+
+	ASSERT_EQUALS((size_t)3, result.GetCount());
+	ASSERT_EQUALS(wxString("ubuntu"), result0);
+	ASSERT_EQUALS(wxString("debian"), result1);
+	ASSERT_EQUALS(wxString("fedora"), result2);
+}
+
+TEST(SearchHistory, DuplicateIsMovedToFrontNotAppended)
+{
+	wxArrayString existing;
+	existing.Add("debian");
+	existing.Add("ubuntu");
+	existing.Add("fedora");
+
+	wxArrayString result = ApplySearchHistoryEntry(existing, "ubuntu", 30);
+
+	ASSERT_EQUALS((size_t)3, result.GetCount());
+	ASSERT_EQUALS(wxString("ubuntu"), result0);
+	ASSERT_EQUALS(wxString("debian"), result1);
+	ASSERT_EQUALS(wxString("fedora"), result2);
+}
+
+TEST(SearchHistory, DedupIsCaseInsensitive)
+{
+	wxArrayString existing;
+	existing.Add("Ubuntu");
+
+	wxArrayString result = ApplySearchHistoryEntry(existing, "ubuntu", 30);
+
+	// The freshly-typed casing wins; the stale-cased entry is gone, not
+	// just reordered.
+	ASSERT_EQUALS((size_t)1, result.GetCount());
+	ASSERT_EQUALS(wxString("ubuntu"), result0);
+}
+
+TEST(SearchHistory, EmptyTermLeavesListUnchanged)
+{
+	wxArrayString existing;
+	existing.Add("debian");
+	existing.Add("fedora");
+
+	wxArrayString result = ApplySearchHistoryEntry(existing, "", 30);
+
+	ASSERT_EQUALS((size_t)2, result.GetCount());
+	ASSERT_EQUALS(wxString("debian"), result0);
+	ASSERT_EQUALS(wxString("fedora"), result1);
+}
+
+TEST(SearchHistory, ResultIsCappedAtMaxEntries)
+{
+	wxArrayString existing;
+	for (int i = 0; i < 5; ++i) {
+		existing.Add(wxString::Format("term%d", i));
+	}
+
+	wxArrayString result = ApplySearchHistoryEntry(existing, "newest", 3);
+
+	ASSERT_EQUALS((size_t)3, result.GetCount());
+	ASSERT_EQUALS(wxString("newest"), result0);
+	ASSERT_EQUALS(wxString("term0"), result1);
+	ASSERT_EQUALS(wxString("term1"), result2);
+	// term2..term4 fell off the tail -- oldest entries drop first.
+}
+
+TEST(SearchHistory, CapIsTheSharedConstantTheGuiPassesIn)
+{
+	// Asserts the cap the Search tab actually applies, not just that ApplySearchHistoryEntry
+	// can cap at an arbitrary N -- MAX_SEARCH_HISTORY_ENTRIES is the same symbol CSearchDlg
+	// passes, so this cannot drift from the GUI the way a hardcoded copy of the number could.
+	const size_t cap = MAX_SEARCH_HISTORY_ENTRIES;
+	wxArrayString existing;
+	for (size_t i = 0; i < cap; ++i) {
+		existing.Add(wxString::Format("term%d", (int)i));
+	}
+
+	wxArrayString result = ApplySearchHistoryEntry(existing, "newest", cap);
+
+	ASSERT_EQUALS(cap, result.GetCount());
+	ASSERT_EQUALS(wxString("newest"), result0);
+	// The oldest entry falls off the tail: the last survivor is the
+	// second-oldest of what was there before.
+	ASSERT_EQUALS(wxString::Format("term%d", (int)cap - 2), resultcap - 1);
+}

amule-3.1.0.tar.gz/unittests/tests/SearchProgressReportTest.cpp Added

@@ -0,0 +1,208 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+
+#include "SearchProgressReport.h"
+
+#include <ec/cpp/ECPacket.h>
+#include <ec/cpp/ECCodes.h>
+#include <muleunit/test.h>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(SearchProgressReport)
+
+namespace
+{
+
+// One union child: the entry's own value is the search id, its fields nested.
+CECTag MakeEntry(uint32 id, uint8 state, uint8 percent, uint32 results, const wxString &name = wxEmptyString)
+{
+	CECTag entry(EC_TAG_SEARCH_ID, id);
+	if (!name.IsEmpty()) {
+		entry.AddTag(EC_TAG_SEARCH_NAME, name);
+	}
+	entry.AddTag(CECTag(EC_TAG_SEARCH_STATUS, static_cast<uint16>(percent)));
+	entry.AddTag(CECTag(EC_TAG_SEARCH_ID, id));
+	entry.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_STATE, state));
+	entry.AddTag(CECTag(EC_TAG_SEARCH_RESULT_COUNT, results));
+	entry.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_PERCENT, percent));
+	return entry;
+}
+
+} // namespace
+
+// The shape amulecmd actually receives, and the one it used to misread.
+TEST(SearchProgressReport, UnionReportsEverySearchByItsOwnId)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(MakeEntry(1, 2, 100, 44));
+	p.AddTag(MakeEntry(3, 1, 84, 12));
+
+	const wxString out = ecprogress::FormatSearchProgress(p);
+	ASSERT_TRUE(out.Contains(wxT("Search 1")));
+	ASSERT_TRUE(out.Contains(wxT("100 %")));
+	ASSERT_TRUE(out.Contains(wxT("44 results")));
+	ASSERT_TRUE(out.Contains(wxT("Search 3")));
+	ASSERT_TRUE(out.Contains(wxT("84 %")));
+	ASSERT_TRUE(out.Contains(wxT("12 results")));
+	// One line per search, not one for the reply.
+	ASSERT_EQUALS(2, static_cast<int>(out.Freq(wxT('\n'))));
+}
+
+// The regression itself: a running search must not read as 0 %.
+TEST(SearchProgressReport, AUnionEntryMidSweepIsNotReportedAsZero)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(MakeEntry(7, 1, 84, 3));
+	ASSERT_TRUE(ecprogress::FormatSearchProgress(p).Contains(wxT("84 %")));
+	ASSERT_FALSE(ecprogress::FormatSearchProgress(p).Contains(wxT("0 %")));
+}
+
+TEST(SearchProgressReport, LifecycleStatesAreNamed)
+{
+	CECPacket running(EC_OP_SEARCH_PROGRESS);
+	running.AddTag(MakeEntry(1, 1, 50, 0));
+	ASSERT_TRUE(ecprogress::FormatSearchProgress(running).Contains(wxT("running")));
+
+	CECPacket done(EC_OP_SEARCH_PROGRESS);
+	done.AddTag(MakeEntry(1, 2, 100, 9));
+	ASSERT_TRUE(ecprogress::FormatSearchProgress(done).Contains(wxT("finished")));
+
+	CECPacket idle(EC_OP_SEARCH_PROGRESS);
+	idle.AddTag(MakeEntry(1, 0, 0, 0));
+	ASSERT_TRUE(ecprogress::FormatSearchProgress(idle).Contains(wxT("idle")));
+}
+
+// A daemon that echoed multi-search but not the union answers about one
+// search with the lifecycle tags at the top level.
+TEST(SearchProgressReport, SingleSearchReplyUsesTheLifecycleTags)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(CECTag(EC_TAG_SEARCH_STATUS, static_cast<uint16>(0xffff)));
+	p.AddTag(CECTag(EC_TAG_SEARCH_ID, static_cast<uint32>(5)));
+	p.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_STATE, static_cast<uint8>(2)));
+	p.AddTag(CECTag(EC_TAG_SEARCH_RESULT_COUNT, static_cast<uint32>(17)));
+	p.AddTag(CECTag(EC_TAG_SEARCH_LIFECYCLE_PERCENT, static_cast<uint8>(100)));
+
+	const wxString out = ecprogress::FormatSearchProgress(p);
+	// Read through the lifecycle tags, so a finished search says so rather
+	// than rendering the 0xffff sentinel as "not available".
+	ASSERT_TRUE(out.Contains(wxT("Search 5")));
+	ASSERT_TRUE(out.Contains(wxT("finished")));
+	ASSERT_TRUE(out.Contains(wxT("100 %")));
+}
+
+// Oldest daemons send only the overloaded sentinel.
+TEST(SearchProgressReport, SentinelOnlyReplyKeepsTheLegacyLine)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(CECTag(EC_TAG_SEARCH_STATUS, static_cast<uint16>(42)));
+	ASSERT_TRUE(ecprogress::FormatSearchProgress(p).Contains(wxT("Search progress: 42 %")));
+}
+
+TEST(SearchProgressReport, SentinelAboveOneHundredIsNotAPercentage)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(CECTag(EC_TAG_SEARCH_STATUS, static_cast<uint16>(0xffff)));
+	ASSERT_TRUE(ecprogress::FormatSearchProgress(p).Contains(wxT("not available")));
+}
+
+TEST(SearchProgressReport, ExpiredIsReportedAsExpired)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(CECEmptyTag(EC_TAG_SEARCH_EXPIRED));
+	ASSERT_TRUE(ecprogress::FormatSearchProgress(p).Contains(wxT("expired")));
+}
+
+// The discriminator trap: an expired verdict echoes the id it is about, as a
+// bare leaf. Testing for EC_TAG_SEARCH_ID alone would read that as a union.
+TEST(SearchProgressReport, AnExpiredVerdictEchoingItsIdIsStillExpired)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(CECEmptyTag(EC_TAG_SEARCH_EXPIRED));
+	p.AddTag(CECTag(EC_TAG_SEARCH_ID, static_cast<uint32>(9)));
+	const wxString out = ecprogress::FormatSearchProgress(p);
+	ASSERT_TRUE(out.Contains(wxT("expired")));
+	ASSERT_FALSE(out.Contains(wxT("Search 9")));
+}
+
+// Same trap on the single-search reply, which echoes a bare id leaf beside
+// its top-level fields.
+TEST(SearchProgressReport, ABareIdLeafIsNotAUnionEntry)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(CECTag(EC_TAG_SEARCH_ID, static_cast<uint32>(4)));
+	p.AddTag(CECTag(EC_TAG_SEARCH_STATUS, static_cast<uint16>(30)));
+	// No nested percent anywhere, so this is the sentinel shape, not a union.
+	ASSERT_TRUE(ecprogress::FormatSearchProgress(p).Contains(wxT("Search progress: 30 %")));
+}
+
+// An empty union means the daemon holds no searches, which is not 0 %.
+TEST(SearchProgressReport, AnEmptyUnionIsNotZeroPercent)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	const wxString out = ecprogress::FormatSearchProgress(p);
+	ASSERT_FALSE(out.Contains(wxT("0 %")));
+	ASSERT_TRUE(out.Contains(wxT("No search")));
+}
+
+// A search that has genuinely made no progress still reports 0 %.
+TEST(SearchProgressReport, AJustStartedSearchStillReportsZero)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(MakeEntry(2, 1, 0, 0));
+	ASSERT_TRUE(ecprogress::FormatSearchProgress(p).Contains(wxT("0 %")));
+	ASSERT_TRUE(ecprogress::FormatSearchProgress(p).Contains(wxT("running")));
+}
+
+// The daemon now sends the query alongside the progress, so a poll is readable
+// without a second request for the search list.
+TEST(SearchProgressReport, AnEntryIsLabelledWithItsQuery)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(MakeEntry(1, 1, 40, 5, wxT("freebsd")));
+	p.AddTag(MakeEntry(2, 2, 100, 77, wxT("ubuntu")));
+
+	const wxString out = ecprogress::FormatSearchProgress(p);
+	ASSERT_TRUE(out.Contains(wxT("Search 1 \"freebsd\"")));
+	ASSERT_TRUE(out.Contains(wxT("Search 2 \"ubuntu\"")));
+}
+
+// A daemon too old to send the name must not produce an empty pair of quotes.
+TEST(SearchProgressReport, AnEntryWithoutAQueryKeepsThePlainLine)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(MakeEntry(1, 1, 40, 5));
+	const wxString out = ecprogress::FormatSearchProgress(p);
+	ASSERT_TRUE(out.Contains(wxT("Search 1:")));
+	ASSERT_FALSE(out.Contains(wxT("\"\"")));
+}
+
+// A browse is named by its peer, through the same tag.
+TEST(SearchProgressReport, ABrowseIsLabelledByItsPeer)
+{
+	CECPacket p(EC_OP_SEARCH_PROGRESS);
+	p.AddTag(MakeEntry(4, 1, 10, 0, wxT("some peer")));
+	ASSERT_TRUE(ecprogress::FormatSearchProgress(p).Contains(wxT("Search 4 \"some peer\"")));
+}

amule-3.1.0.tar.gz/unittests/tests/SecIdentTest.cpp Added

@@ -0,0 +1,105 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include "SecIdentPolicy.h"
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(SecIdent)
+
+TEST(SecIdent, AdvertisementRequiresCryptoAndIPv4ForV2)
+{
+	ASSERT_EQUALS(0u, SecIdent::SupportedVersions(false, false));
+	ASSERT_EQUALS(0u, SecIdent::SupportedVersions(false, true));
+	ASSERT_EQUALS(1u, SecIdent::SupportedVersions(true, false));
+	ASSERT_EQUALS(3u, SecIdent::SupportedVersions(true, true));
+}
+
+TEST(SecIdent, IPv4KeepsLegacyVersionPreference)
+{
+	ASSERT_EQUALS(SecIdent::Unavailable, SecIdent::SignatureVersion(0, true));
+	ASSERT_EQUALS(SecIdent::V1, SecIdent::SignatureVersion(1, true));
+	ASSERT_EQUALS(SecIdent::V2, SecIdent::SignatureVersion(2, true));
+	ASSERT_EQUALS(SecIdent::V1, SecIdent::SignatureVersion(3, true));
+}
+
+TEST(SecIdent, WithoutIPv4OnlyMutuallySupportedV1IsUsable)
+{
+	ASSERT_EQUALS(SecIdent::Unavailable, SecIdent::SignatureVersion(0, false));
+	ASSERT_EQUALS(SecIdent::V1, SecIdent::SignatureVersion(1, false));
+	// A fallback must not invent v1 support for a peer advertising only v2.
+	ASSERT_EQUALS(SecIdent::Unavailable, SecIdent::SignatureVersion(2, false));
+	ASSERT_EQUALS(SecIdent::V1, SecIdent::SignatureVersion(3, false));
+}
+
+TEST(SecIdent, ReservedFeatureBitsDoNotEnableSecureIdentification)
+{
+	ASSERT_EQUALS(SecIdent::Unavailable, SecIdent::SignatureVersion(0xfc, true));
+	ASSERT_EQUALS(SecIdent::Unavailable, SecIdent::SignatureVersion(0xfc, false));
+	ASSERT_EQUALS(SecIdent::V1, SecIdent::SignatureVersion(0xfd, false));
+	ASSERT_EQUALS(SecIdent::V2, SecIdent::SignatureVersion(0xfe, true));
+	ASSERT_EQUALS(SecIdent::Unavailable, SecIdent::SignatureVersion(0xfe, false));
+}
+
+// Exercise the exact prerequisite used by VerifyIdent before crypto or credit-state
+// mutation. This is policy coverage, not an RSA/application integration test.
+TEST(SecIdent, VerifyIdentV2RefusesEndpointsWithoutNonzeroIPv4)
+{
+	uint32_t ip = 123;
+	CNetworkAddress::Octets bytes{};
+	bytes0 = 0x20;
+	bytes1 = 0x01;
+	bytes15 = 1;
+	ASSERT_FALSE(SecIdent::PeerIPv4(CNetworkAddress::IPv6FromOctets(bytes), ip));
+	ASSERT_EQUALS(uint32_t(0), ip);
+	ip = 123;
+	ASSERT_FALSE(SecIdent::PeerIPv4(CNetworkAddress::Absent(), ip));
+	ASSERT_EQUALS(uint32_t(0), ip);
+	ASSERT_FALSE(SecIdent::PeerIPv4(CNetworkAddress::FromIPv4NetworkOrder(0), ip));
+	ASSERT_EQUALS(uint32_t(0), ip);
+	bytes = {};
+	bytes10 = bytes11 = 0xff;
+	ASSERT_FALSE(SecIdent::PeerIPv4(CNetworkAddress::IPv6FromOctets(bytes), ip));
+	ASSERT_EQUALS(uint32_t(0), ip);
+}
+
+TEST(SecIdent, VerifyIdentV2DerivesIdenticalMappedAndPlainChallengeIP)
+{
+	const uint32_t expected = 0x010200c0;
+	uint32_t plain = 0;
+	ASSERT_TRUE(SecIdent::PeerIPv4(CNetworkAddress::FromIPv4NetworkOrder(expected), plain));
+	ASSERT_EQUALS(expected, plain);
+	CNetworkAddress::Octets bytes{};
+	bytes10 = bytes11 = 0xff;
+	bytes12 = 192;
+	bytes14 = 2;
+	bytes15 = 1;
+	uint32_t mapped = 0;
+	ASSERT_TRUE(SecIdent::PeerIPv4(CNetworkAddress::IPv6FromOctets(bytes), mapped));
+	ASSERT_EQUALS(plain, mapped);
+}
+
+// File_checked_for_headers

amule-3.1.0.tar.gz/unittests/tests/SharedContentTest.cpp Added

@@ -0,0 +1,697 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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.
+//
+
+#include <muleunit/test.h>
+
+#include "SharedContent.h"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <fstream>
+#include <string>
+#include <vector>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#ifdef _WIN32
+#include <direct.h>
+#include <io.h>
+#include <process.h>
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
+
+using namespace muleunit;
+using namespace webapi;
+
+namespace
+{
+
+// Per-test scratch dir, the same shape as StaticFsTest's helper: POSIX uses mkdtemp(), Windows
+// builds a unique name under %TEMP%. Created empty; the test populates it and must call RemoveAll()
+// itself, because muleunit's DECLARE_SIMPLE has no TearDown hook.
+std::string MakeScratchRoot(const char *tag)
+{
+#ifdef _WIN32
+	char tmpMAX_PATH;
+	DWORD n = GetTempPathA(MAX_PATH, tmp);
+	std::string base(tmp, n);
+	std::string dir =
+		base + "amule-sharedcontent-" + tag + "-" + std::to_string(static_cast<long>(_getpid()));
+	_mkdir(dir.c_str());
+	return dir;
+#else
+	std::string tpl = "/tmp/amule-sharedcontent-";
+	tpl += tag;
+	tpl += "-XXXXXX";
+	std::vector<char> buf(tpl.begin(), tpl.end());
+	buf.push_back('\0');
+	if (!mkdtemp(buf.data()))
+		return std::string();
+	return std::string(buf.data());
+#endif
+}
+
+bool MkSubdir(const std::string &path)
+{
+#ifdef _WIN32
+	return _mkdir(path.c_str()) == 0;
+#else
+	return mkdir(path.c_str(), 0755) == 0;
+#endif
+}
+
+bool WriteFile(const std::string &path, const std::string &body)
+{
+	std::ofstream f(path.c_str(), std::ios::binary);
+	if (!f.is_open())
+		return false;
+	f << body;
+	return f.good();
+}
+
+void RemoveAll(const std::string &path)
+{
+	// Recursive rm via system(); test-scratch only, never on real data.
+	// Quote the path to survive spaces / odd chars in $TMPDIR.
+#ifdef _WIN32
+	std::string cmd = "rmdir /S /Q \"" + path + "\" >NUL 2>&1";
+#else
+	std::string cmd = "rm -rf \"" + path + "\" 2>/dev/null";
+#endif
+	(void)std::system(cmd.c_str());
+}
+
+bool EndsWith(const std::string &s, const std::string &suffix)
+{
+	return s.size() >= suffix.size() && s.compare(s.size() - suffix.size(), suffix.size(), suffix) == 0;
+}
+
+// The platform separator JoinSharedPath is expected to insert. Kept as a
+// helper so the join assertions read the same on both platforms.
+#ifdef _WIN32
+const char kSep = '\\';
+#else
+const char kSep = '/';
+#endif
+
+// 30 digits: comfortably past 2^64 (20 digits), so it can only be
+// accepted by an implementation that wraps or saturates.
+const char *const kOverflowDigits = "123456789012345678901234567890";
+
+} // namespace
+
+DECLARE_SIMPLE(SharedContent)
+
+// JoinSharedPath -- the API's `path` is the directory and `name` is the basename, so this is the
+// only place the two ever meet.
+
+TEST(SharedContent, JoinProducesDirSeparatorName)
+{
+	std::string out;
+	ASSERT_TRUE(JoinSharedPath("/srv/share", "movie.avi", out));
+	ASSERT_EQUALS(std::string("/srv/share") + kSep + "movie.avi", out);
+}
+
+TEST(SharedContent, JoinDoesNotDoubleTrailingSeparator)
+{
+	// A share root configured with a trailing slash is the common case, that being how most
+	// path-picking UIs hand it over, so a doubled separator here would be the normal path
+	// rather than the exotic one.
+	std::string out;
+	ASSERT_TRUE(JoinSharedPath("/srv/share/", "movie.avi", out));
+	ASSERT_EQUALS(std::string("/srv/share/movie.avi"), out);
+
+	std::string out_bs;
+	ASSERT_TRUE(JoinSharedPath("C:\\share\\", "movie.avi", out_bs));
+	ASSERT_EQUALS(std::string("C:\\share\\movie.avi"), out_bs);
+}
+
+TEST(SharedContent, JoinRejectsEmptyDir)
+{
+	std::string out = "untouched";
+	ASSERT_TRUE(!JoinSharedPath("", "movie.avi", out));
+}
+
+TEST(SharedContent, JoinRejectsEmptyName)
+{
+	std::string out;
+	ASSERT_TRUE(!JoinSharedPath("/srv/share", "", out));
+}
+
+TEST(SharedContent, JoinRejectsNameWithForwardSlash)
+{
+	// `name` must be a bare basename. Anything with a separator is either corrupt local state
+	// or a hostile ed2k filename; a traversal attempt is only the loudest instance of that.
+	std::string out;
+	ASSERT_TRUE(!JoinSharedPath("/srv/share", "sub/movie.avi", out));
+	ASSERT_TRUE(!JoinSharedPath("/srv/share", "../../etc/passwd", out));
+}
+
+TEST(SharedContent, JoinRejectsNameWithBackslash)
+{
+	std::string out;
+	ASSERT_TRUE(!JoinSharedPath("/srv/share", "sub\\movie.avi", out));
+	ASSERT_TRUE(!JoinSharedPath("/srv/share", "..\\..\\windows\\win.ini", out));
+}
+
+TEST(SharedContent, JoinRejectsDotAndDotDot)
+{
+	std::string out;
+	ASSERT_TRUE(!JoinSharedPath("/srv/share", ".", out));
+	ASSERT_TRUE(!JoinSharedPath("/srv/share", "..", out));
+}
+
+TEST(SharedContent, JoinRejectsEmbeddedNul)
+{
+	// std::string keeps the NUL, the C path APIs stop at it -- so
+	// without this the string we validated is not the path we open.
+	const std::string dir_nul = std::string("/srv/share\0/evil", 16);
+	const std::string name_nul = std::string("ok.bin\0.exe", 11);
+
+	std::string out;
+	ASSERT_TRUE(!JoinSharedPath(dir_nul, "movie.avi", out));
+	ASSERT_TRUE(!JoinSharedPath("/srv/share", name_nul, out));
+}
+
+// ResolveSharedContentPath -- containment against a LIST of share roots. Every rejection is opaque;
+// the caller maps them all to one 404.
+
+TEST(SharedContent, ResolveAcceptsFileInsideOneOfSeveralRoots)
+{
+	const std::string parent = MakeScratchRoot("multi-root");
+	ASSERT_TRUE(!parent.empty());
+	const std::string root_a = parent + "/a";
+	const std::string root_b = parent + "/b";
+	ASSERT_TRUE(MkSubdir(root_a));
+	ASSERT_TRUE(MkSubdir(root_b));
+	ASSERT_TRUE(WriteFile(root_b + "/movie.avi", "x"));
+
+	std::vector<std::string> roots;
+	roots.push_back(root_a);
+	roots.push_back(root_b);
+
+	std::string out;
+	ASSERT_TRUE(ResolveSharedContentPath(roots, root_b, "movie.avi", out));
+	// $TMPDIR is a symlink on macOS, so the canonical result is not textually the path we
+	// built. The basename is the stable part -- and the separator in front of it is not: the
+	// Windows branch canonicalises through _fullpath(), which returns backslashes. Assert what
+	// is actually invariant, the same way the production code treats either separator as a
+	// boundary.
+	ASSERT_TRUE(EndsWith(out, "/movie.avi") || EndsWith(out, "\\movie.avi"));
+
+	RemoveAll(parent);
+}
+
+TEST(SharedContent, ResolveRejectsFileOutsideEveryRoot)
+{
+	const std::string parent = MakeScratchRoot("outside-roots");
+	ASSERT_TRUE(!parent.empty());
+	const std::string root = parent + "/share";
+	const std::string elsewhere = parent + "/elsewhere";
+	ASSERT_TRUE(MkSubdir(root));
+	ASSERT_TRUE(MkSubdir(elsewhere));
+	ASSERT_TRUE(WriteFile(elsewhere + "/secret.txt", "pwn"));
+
+	std::vector<std::string> roots;
+	roots.push_back(root);
+
+	std::string out;
+	ASSERT_TRUE(!ResolveSharedContentPath(roots, elsewhere, "secret.txt", out));
+
+	RemoveAll(parent);
+}
+
+TEST(SharedContent, ResolveRejectsWhenRootListIsEmpty)
+{
+	// No configured shares means nothing is servable -- not "anything
+	// is servable".
+	const std::string root = MakeScratchRoot("empty-roots");
+	ASSERT_TRUE(!root.empty());
+	ASSERT_TRUE(WriteFile(root + "/movie.avi", "x"));
+
+	std::vector<std::string> roots;
+	std::string out;
+	ASSERT_TRUE(!ResolveSharedContentPath(roots, root, "movie.avi", out));
+
+	RemoveAll(root);
+}
+
+TEST(SharedContent, ResolveRejectsPrefixNeighbourRoot)
+{
+	// `/srv/share-evil` shares a textual prefix with `/srv/share` but is a different directory.
+	// A plain strncmp containment check accepts it; the boundary rule -- the char at root_len
+	// must be a separator or the terminator -- is what rejects it.
+	const std::string parent = MakeScratchRoot("prefix-neighbour");
+	ASSERT_TRUE(!parent.empty());
+	const std::string root = parent + "/share";
+	const std::string neighbour = parent + "/share-evil";
+	ASSERT_TRUE(MkSubdir(root));
+	ASSERT_TRUE(MkSubdir(neighbour));
+	ASSERT_TRUE(WriteFile(neighbour + "/secret.txt", "pwn"));
+
+	std::vector<std::string> roots;
+	roots.push_back(root);
+
+	std::string out;
+	ASSERT_TRUE(!ResolveSharedContentPath(roots, neighbour, "secret.txt", out));
+
+	RemoveAll(parent);
+}
+
+TEST(SharedContent, ResolveRejectsMissingFile)
+{
+	const std::string root = MakeScratchRoot("missing-file");
+	ASSERT_TRUE(!root.empty());
+
+	std::vector<std::string> roots;
+	roots.push_back(root);
+
+	std::string out;
+	ASSERT_TRUE(!ResolveSharedContentPath(roots, root, "not-there.avi", out));
+
+	RemoveAll(root);
+}
+
+TEST(SharedContent, ResolveRejectsBadJoin)
+{
+	// A rejected join must not fall through to a resolve attempt.
+	const std::string root = MakeScratchRoot("bad-join");
+	ASSERT_TRUE(!root.empty());
+
+	std::vector<std::string> roots;
+	roots.push_back(root);
+
+	std::string out;
+	ASSERT_TRUE(!ResolveSharedContentPath(roots, root, "../escape.txt", out));
+	ASSERT_TRUE(!ResolveSharedContentPath(roots, root, "", out));
+
+	RemoveAll(root);
+}
+
+#ifndef _WIN32
+TEST(SharedContent, ResolveRejectsSymlinkEscapingShareRoot)
+{
+	// The arbitrary-file-read case: a symlink planted *inside* a share root pointing outside
+	// it. Every lexical check passes -- the name is a clean basename and the directory really
+	// is a configured root -- so only canonicalisation catches it. Anyone who can write into a
+	// shared directory can plant this.
+	const std::string parent = MakeScratchRoot("symlink-escape");
+	ASSERT_TRUE(!parent.empty());
+	const std::string root = parent + "/share";
+	const std::string outside = parent + "/outside";
+	ASSERT_TRUE(MkSubdir(root));
+	ASSERT_TRUE(MkSubdir(outside));
+	ASSERT_TRUE(WriteFile(outside + "/secret.txt", "pwn"));
+	ASSERT_TRUE(symlink((outside + "/secret.txt").c_str(), (root + "/leak.txt").c_str()) == 0);
+
+	std::vector<std::string> roots;
+	roots.push_back(root);
+
+	std::string out;
+	ASSERT_TRUE(!ResolveSharedContentPath(roots, root, "leak.txt", out));
+
+	RemoveAll(parent);
+}
+
+TEST(SharedContent, ResolveAcceptsSymlinkStayingInsideShareRoot)
+{
+	// Sanity counterpart: not every symlink is an attack, and rejecting
+	// all of them would break ordinary shared trees.
+	const std::string root = MakeScratchRoot("symlink-inside");
+	ASSERT_TRUE(!root.empty());
+	ASSERT_TRUE(WriteFile(root + "/real.avi", "ok"));
+	ASSERT_TRUE(symlink((root + "/real.avi").c_str(), (root + "/alias.avi").c_str()) == 0);
+
+	std::vector<std::string> roots;
+	roots.push_back(root);
+
+	std::string out;
+	ASSERT_TRUE(ResolveSharedContentPath(roots, root, "alias.avi", out));
+	ASSERT_TRUE(EndsWith(out, "/real.avi"));
+
+	RemoveAll(root);
+}
+#endif // !_WIN32
+
+// ParseSingleByteRange -- RFC 7233 2.1/3.1.
+
+TEST(SharedContent, RangeAbsentWhenHeaderEmpty)
+{
+	std::uint64_t f = 42, l = 42;
+	ASSERT_TRUE(ParseSingleByteRange("", 1000, f, l) == RangeResult::kAbsent);
+	ASSERT_TRUE(ParseSingleByteRange("   ", 1000, f, l) == RangeResult::kAbsent);
+}
+
+TEST(SharedContent, RangeFirstLastIsInclusive)
+{
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0-499", 1000, f, l) == RangeResult::kOk);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(0), f);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(499), l);
+}
+
+TEST(SharedContent, RangeSingleByte)
+{
+	std::uint64_t f = 9, l = 9;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0-0", 1000, f, l) == RangeResult::kOk);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(0), f);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(0), l);
+}
+
+TEST(SharedContent, RangeOpenEndedRunsToEof)
+{
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=500-", 1000, f, l) == RangeResult::kOk);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(500), f);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(999), l);
+}
+
+TEST(SharedContent, RangeLastIsClampedToEof)
+{
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=990-1000000", 1000, f, l) == RangeResult::kOk);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(990), f);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(999), l);
+}
+
+TEST(SharedContent, RangeSuffixTakesLastBytes)
+{
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=-500", 1000, f, l) == RangeResult::kOk);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(500), f);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(999), l);
+}
+
+TEST(SharedContent, RangeSuffixLargerThanFileIsWholeFile)
+{
+	std::uint64_t f = 7, l = 7;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=-5000", 1000, f, l) == RangeResult::kOk);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(0), f);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(999), l);
+}
+
+TEST(SharedContent, RangeZeroLengthSuffixIsUnsatisfiable)
+{
+	// "bytes=-0" asks for the last zero bytes. RFC 7233 §2.1 makes a
+	// zero-length suffix unsatisfiable rather than an empty 206.
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=-0", 1000, f, l) == RangeResult::kUnsatisfiable);
+}
+
+TEST(SharedContent, RangeFirstPastEofIsUnsatisfiable)
+{
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=999999-", 1000, f, l) == RangeResult::kUnsatisfiable);
+	// The exact boundary: offset 1000 of a 1000-byte file is one past
+	// the last valid byte.
+	ASSERT_TRUE(ParseSingleByteRange("bytes=1000-", 1000, f, l) == RangeResult::kUnsatisfiable);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=1000-1005", 1000, f, l) == RangeResult::kUnsatisfiable);
+	// ...and 999 is still inside it.
+	ASSERT_TRUE(ParseSingleByteRange("bytes=999-", 1000, f, l) == RangeResult::kOk);
+}
+
+TEST(SharedContent, RangeOnEmptyFileIsAlwaysUnsatisfiable)
+{
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0-", 0, f, l) == RangeResult::kUnsatisfiable);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0-0", 0, f, l) == RangeResult::kUnsatisfiable);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=-1", 0, f, l) == RangeResult::kUnsatisfiable);
+}
+
+TEST(SharedContent, RangeInvertedBoundsIsIgnored)
+{
+	// first > last is syntactically well-formed but semantically invalid, so RFC 7233 2.1 says
+	// the whole byte-range-set is invalid -- which we answer by ignoring the header, not by
+	// 416.
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=500-499", 1000, f, l) == RangeResult::kIgnore);
+}
+
+TEST(SharedContent, MultiRangeIsIgnoredNotServedAsMultipart)
+{
+	// CVE-2011-3192 ("Apache Killer"): a short header carrying many overlapping ranges makes a
+	// multipart/byteranges responder materialise far more bytes than the file holds. We never
+	// assemble multipart at all -- a comma in the set means a plain 200.
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0-1,2-3", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0-1, 2-3", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0-,-1", 1000, f, l) == RangeResult::kIgnore);
+
+	// The historical attack shape itself: hundreds of overlapping
+	// ranges over a small file.
+	std::string killer = "bytes=0-";
+	for (int i = 0; i < 400; ++i)
+		killer += ",5-" + std::to_string(1000 + i);
+	ASSERT_TRUE(ParseSingleByteRange(killer, 1000, f, l) == RangeResult::kIgnore);
+}
+
+TEST(SharedContent, RangeUnitIsCaseInsensitiveButMustBeBytes)
+{
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("BYTES=0-9", 1000, f, l) == RangeResult::kOk);
+	ASSERT_TRUE(ParseSingleByteRange("Bytes=0-9", 1000, f, l) == RangeResult::kOk);
+	// Any other unit is one we do not implement, so we serve the whole
+	// file rather than guessing what it meant.
+	ASSERT_TRUE(ParseSingleByteRange("items=0-1", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("chunks=0-1", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("0-9", 1000, f, l) == RangeResult::kIgnore);
+}
+
+TEST(SharedContent, RangeMalformedIsIgnored)
+{
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("bytes=abc-def", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=-", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=+0-9", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0x10-0x20", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0-9junk", 1000, f, l) == RangeResult::kIgnore);
+}
+
+TEST(SharedContent, RangeToleratesOnlyTheWhitespaceTheGrammarAllows)
+{
+	// RFC 7233's byte-range-spec has no OWS inside it -- OWS is only permitted around the list
+	// commas of the `#rule`, and we reject every comma anyway. So leading/trailing field
+	// whitespace, which HTTP field parsing strips regardless, is tolerated, and a space around
+	// the dash or inside a number is not.
+	std::uint64_t f = 0, l = 0;
+	ASSERT_TRUE(ParseSingleByteRange("  bytes=0-9  ", 1000, f, l) == RangeResult::kOk);
+	ASSERT_TRUE(ParseSingleByteRange("bytes = 0-9", 1000, f, l) == RangeResult::kOk);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0 - 9", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0- 9", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=1 0-9", 1000, f, l) == RangeResult::kIgnore);
+}
+
+TEST(SharedContent, RangeOverflowingDigitsAreRejectedNotWrapped)
+{
+	// A 30-digit bound cannot fit in uint64. Wrapping it would turn an absurd request into a
+	// plausible in-range one; saturating it would turn it into "the rest of the file". Both are
+	// wrong -- it is unparseable, so we ignore the header.
+	std::uint64_t f = 0, l = 0;
+	const std::string big(kOverflowDigits);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=" + big + "-", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=0-" + big, 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=-" + big, 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=" + big + "-" + big, 1000, f, l) == RangeResult::kIgnore);
+
+	// One past UINT64_MAX (which is 18446744073709551615) must fail
+	// too, and the value itself must still parse as a plain number.
+	ASSERT_TRUE(ParseSingleByteRange("bytes=18446744073709551616-", 1000, f, l) == RangeResult::kIgnore);
+	ASSERT_TRUE(ParseSingleByteRange("bytes=18446744073709551615-", 1000, f, l) ==
+		    RangeResult::kUnsatisfiable);
+}
+
+// BuildContentDisposition -- RFC 6266. The one place a remote-chosen string is written into a
+// response header.
+
+TEST(SharedContent, DispositionPlainAsciiNameUsesBothForms)
+{
+	ASSERT_EQUALS(std::string("attachment; filename=\"movie.avi\"; filename*=UTF-8''movie.avi"),
+		BuildContentDisposition("movie.avi"));
+}
+
+TEST(SharedContent, DispositionIsAlwaysAttachmentNeverInline)
+{
+	const std::string d = BuildContentDisposition("page.html");
+	ASSERT_TRUE(d.compare(0, 10, "attachment") == 0);
+	ASSERT_TRUE(d.find("inline") == std::string::npos);
+}
+
+TEST(SharedContent, DispositionStripsCrLfSoHeadersCannotBeInjected)
+{
+	// Regression test for response-header injection. The filename comes off the ed2k network; a
+	// CRLF in it would end the header and let the sender append their own -- or a whole second
+	// response.
+	const std::string evil = "a\r\nSet-Cookie: pwned=1\r\n\r\n<html>.bin";
+	const std::string d = BuildContentDisposition(evil);
+	ASSERT_TRUE(d.find('\r') == std::string::npos);
+	ASSERT_TRUE(d.find('\n') == std::string::npos);
+	// The bare newlines must not survive into the encoded form either; percent-encoded they
+	// would appear as %0D/%0A, which is inert, but nothing raw may remain.
+	ASSERT_TRUE(d.find("Set-Cookie: pwned=1\r") == std::string::npos);
+
+	// A lone LF and a lone CR are just as dangerous with a lenient
+	// client-side parser.
+	const std::string lf = BuildContentDisposition("a\nb.bin");
+	ASSERT_TRUE(lf.find('\n') == std::string::npos);
+	const std::string cr = BuildContentDisposition("a\rb.bin");
+	ASSERT_TRUE(cr.find('\r') == std::string::npos);
+}
+
+TEST(SharedContent, DispositionNeutralisesQuoteAndBackslash)
+{
+	// An unescaped quote would close filename="..." early and let the
+	// rest of the name be read as further header parameters.
+	const std::string d = BuildContentDisposition("a\"b\\c.bin");
+	ASSERT_EQUALS(std::string("attachment; filename=\"a_b_c.bin\"; filename*=UTF-8''a%22b%5Cc.bin"), d);
+}
+
+TEST(SharedContent, DispositionPercentEncodesUtf8InTheExtendedForm)
+{
+	// Accented Latin: the quoted form cannot carry non-ASCII, so it
+	// degrades; filename* carries the real name percent-encoded.
+	ASSERT_EQUALS(std::string("attachment; filename=\"caf__.bin\"; filename*=UTF-8''caf%C3%A9.bin"),
+		BuildContentDisposition("caf\xC3\xA9.bin"));
+
+	// CJK: every byte is outside attr-char, so the whole stem encodes.
+	ASSERT_EQUALS(
+		std::string("attachment; filename=\"______.txt\"; filename*=UTF-8''%E6%97%A5%E6%9C%AC.txt"),
+		BuildContentDisposition("\xE6\x97\xA5\xE6\x9C\xAC.txt"));
+}
+
+TEST(SharedContent, DispositionFallsBackToPlaceholderWhenNothingSurvives)
+{
+	// An all-control name leaves nothing printable. Emitting an empty filename="" would let the
+	// client pick its own name from the URL, so we name it ourselves.
+	const std::string ctrl("\x01\x02\x1F\x7F", 4);
+	ASSERT_EQUALS(std::string("attachment; filename=\"download\"; filename*=UTF-8''download"),
+		BuildContentDisposition(ctrl));
+	ASSERT_EQUALS(std::string("attachment; filename=\"download\"; filename*=UTF-8''download"),
+		BuildContentDisposition(""));
+}
+
+TEST(SharedContent, DispositionRejectsPathSeparatorsInTheQuotedForm)
+{
+	// Some clients still honour a path in filename=. Flatten it.
+	const std::string d = BuildContentDisposition("../../etc/passwd");
+	ASSERT_TRUE(d.find("filename=\"") != std::string::npos);
+	ASSERT_TRUE(d.find("/etc/") == std::string::npos);
+	ASSERT_TRUE(d.find("attachment; filename=\".._.._etc_passwd\"") == 0);
+}
+
+TEST(SharedContent, DispositionSemicolonCannotSplitParameters)
+{
+	// A semicolon inside the quoted string is legal, but only because the quotes hold; the
+	// extended form must still encode it so a lenient parser cannot read it as a new parameter.
+	const std::string d = BuildContentDisposition("a;b.bin");
+	ASSERT_EQUALS(std::string("attachment; filename=\"a;b.bin\"; filename*=UTF-8''a%3Bb.bin"), d);
+}
+
+// BuildContentEtag -- mirrors BuildStaticEtag (Api.cpp:501-507) so the dispatcher's 304 machinery
+// sees one validator shape for both routes.
+
+TEST(SharedContent, EtagHasTheSameShapeAsTheStaticOne)
+{
+	// Quoted strong validator, lowercase hex mtime, '-', lowercase hex
+	// size. 0x68b0... is an ordinary epoch second.
+	ASSERT_EQUALS(std::string("\"68b00000-400\""), BuildContentEtag(0x68b00000ull, 1024ull));
+	ASSERT_EQUALS(std::string("\"0-0\""), BuildContentEtag(0, 0));
+}
+
+TEST(SharedContent, EtagIsStableForTheSameInputs)
+{
+	ASSERT_EQUALS(BuildContentEtag(1700000000ull, 4294967296ull),
+		BuildContentEtag(1700000000ull, 4294967296ull));
+}
+
+TEST(SharedContent, EtagChangesWithMtimeAndWithSize)
+{
+	const std::string base = BuildContentEtag(1700000000ull, 1024ull);
+	ASSERT_TRUE(base != BuildContentEtag(1700000001ull, 1024ull));
+	ASSERT_TRUE(base != BuildContentEtag(1700000000ull, 1025ull));
+	// A truncation that keeps the size but moves the mtime, and a rewrite that keeps the mtime
+	// but moves the size, must both invalidate -- that is the whole point of the pair.
+	ASSERT_TRUE(BuildContentEtag(1, 2) != BuildContentEtag(2, 1));
+}
+
+TEST(SharedContent, EtagHandlesLargeFileSizes)
+{
+	// Multi-GB shared files are the normal case for this endpoint, so
+	// the size half must not be truncated to 32 bits.
+	ASSERT_EQUALS(std::string("\"0-200000000\""), BuildContentEtag(0, 8589934592ull));
+}
+
+// If-Range (RFC 9110 13.1.5).
+//
+// The comparison here is STRONG, unlike the one If-None-Match uses, and these cases exist mostly to
+// pin that difference down: the weak-form test below is the exact regression a reviewer would
+// expect from reaching for webcommon::IfNoneMatchHits, which answers "hit" for the same input.
+
+TEST(SharedContent, IfRangeAbsentLeavesTheRangeAlone)
+{
+	// No precondition, nothing to fail -- the Range stands on its own.
+	ASSERT_TRUE(IfRangeAllowsRange("", "\"abc-100\""));
+	ASSERT_TRUE(IfRangeAllowsRange("   ", "\"abc-100\""));
+}
+
+TEST(SharedContent, IfRangeMatchingStrongValidatorAllowsTheRange)
+{
+	ASSERT_TRUE(IfRangeAllowsRange("\"abc-100\"", "\"abc-100\""));
+	// Optional whitespace around a field value is not part of it.
+	ASSERT_TRUE(IfRangeAllowsRange("  \"abc-100\"\t", "\"abc-100\""));
+}
+
+TEST(SharedContent, IfRangeStaleValidatorRefusesTheRange)
+{
+	// The case the header exists for: the representation moved, so the
+	// window the client asked for belongs to a file it no longer holds.
+	ASSERT_FALSE(IfRangeAllowsRange("\"abc-100\"", "\"def-200\""));
+	// Same opaque payload, different length -- no substring matching.
+	ASSERT_FALSE(IfRangeAllowsRange("\"abc-10\"", "\"abc-100\""));
+}
+
+TEST(SharedContent, IfRangeWeakValidatorNeverMatches)
+{
+	// Strong comparison. A weak validator marks two representations as equivalent, not byte-
+	// identical, which is not a guarantee a byte range can be built on -- even though If-None-
+	// Match accepts exactly this input as a hit.
+	ASSERT_FALSE(IfRangeAllowsRange("W/\"abc-100\"", "\"abc-100\""));
+	ASSERT_FALSE(IfRangeAllowsRange("w/\"abc-100\"", "\"abc-100\""));
+}
+
+TEST(SharedContent, IfRangeBareOrWildcardFormsDoNotMatch)
+{
+	// The unquoted form is tolerated by IfNoneMatchHits for non-canonical clients; it is not
+	// tolerated here, because 13.1.5 distinguishes an entity-tag from an HTTP-date by the
+	// leading DQUOTE. And `*` is not in the If-Range grammar at all.
+	ASSERT_FALSE(IfRangeAllowsRange("abc-100", "\"abc-100\""));
+	ASSERT_FALSE(IfRangeAllowsRange("*", "\"abc-100\""));
+}
+
+TEST(SharedContent, IfRangeHttpDateFormIsTreatedAsNonMatching)
+{
+	// Not implemented, and refused rather than honoured: a second-resolution validator compares
+	// equal across a replacement that happened inside the same second, which is the race the
+	// header is there to close. Serving the whole file is the safe direction.
+	ASSERT_FALSE(IfRangeAllowsRange("Sat, 01 Jan 2000 00:00:00 GMT", "\"abc-100\""));
+	ASSERT_FALSE(IfRangeAllowsRange("Wed, 21 Oct 2015 07:28:00 GMT", "\"abc-100\""));
+}
+
+TEST(SharedContent, IfRangeIsNotAListAndDoesNotWalkOne)
+{
+	// If-Range carries exactly one validator by grammar. A comma-joined pair is malformed, and
+	// a malformed precondition must fail closed rather than be split until something matches.
+	ASSERT_FALSE(IfRangeAllowsRange("\"nope\", \"abc-100\"", "\"abc-100\""));
+}

amule-3.1.0.tar.gz/unittests/tests/SharedFilesReloadLatchTest.cpp Added

@@ -0,0 +1,125 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include "SharedFilesReloadLatch.h"
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(SharedFilesReloadLatch)
+
+TEST(SharedFilesReloadLatch, StartsIdle)
+{
+	CSharedFilesReloadLatch latch;
+	ASSERT_TRUE(!latch.IsPending());
+	ASSERT_TRUE(!latch.ShouldStartFromTick(/*walkRunning=*/false));
+}
+
+TEST(SharedFilesReloadLatch, RequestsCoalesce)
+{
+	// Ten EC callers before the next tick must produce one walk, not ten.
+	CSharedFilesReloadLatch latch;
+	for (int i = 0; i < 10; ++i) {
+		latch.Request();
+	}
+	ASSERT_TRUE(latch.ShouldStartFromTick(false));
+	ASSERT_TRUE(latch.BeginWalk());
+	latch.EndWalk(true, /*aborted=*/false);
+	ASSERT_TRUE(!latch.IsPending());
+	ASSERT_TRUE(!latch.ShouldStartFromTick(false));
+}
+
+TEST(SharedFilesReloadLatch, TickDoesNotStartWhileAWalkRuns)
+{
+	// A request arriving mid-walk waits for a later tick rather than nesting.
+	CSharedFilesReloadLatch latch;
+	latch.Request();
+	ASSERT_TRUE(!latch.ShouldStartFromTick(/*walkRunning=*/true));
+	ASSERT_TRUE(latch.ShouldStartFromTick(/*walkRunning=*/false));
+}
+
+TEST(SharedFilesReloadLatch, RequestDuringAWalkSurvivesIt)
+{
+	// The walk in flight is already past the files the new request is about, so completing must
+	// not consume it. This is why BeginWalk() takes the request rather than EndWalk() clearing
+	// the flag.
+	CSharedFilesReloadLatch latch;
+	latch.Request();
+	const bool serving = latch.BeginWalk();
+	ASSERT_TRUE(serving);
+	ASSERT_TRUE(!latch.IsPending());
+
+	latch.Request(); // arrives while the walk is running
+	latch.EndWalk(serving, /*aborted=*/false);
+
+	ASSERT_TRUE(latch.IsPending());
+	ASSERT_TRUE(latch.ShouldStartFromTick(false));
+}
+
+TEST(SharedFilesReloadLatch, AbortedWalkGivesTheRequestBack)
+{
+	// A cancelled scan leaves a partial share list and satisfies nothing.
+	CSharedFilesReloadLatch latch;
+	latch.Request();
+	const bool serving = latch.BeginWalk();
+	latch.EndWalk(serving, /*aborted=*/true);
+	ASSERT_TRUE(latch.IsPending());
+}
+
+TEST(SharedFilesReloadLatch, AbortedWalkWithNoRequestInventsNone)
+{
+	// A user-initiated walk that nobody asked for, then cancelled, must not
+	// leave a request behind for the next tick to act on.
+	CSharedFilesReloadLatch latch;
+	const bool serving = latch.BeginWalk();
+	ASSERT_TRUE(!serving);
+	latch.EndWalk(serving, /*aborted=*/true);
+	ASSERT_TRUE(!latch.IsPending());
+}
+
+TEST(SharedFilesReloadLatch, AbortedWalkKeepsAMidWalkRequestOnce)
+{
+	// Both rules at once: the walk aborts, so its own request comes back, while another request
+	// arrived mid-walk. One flag, so one walk is owed, not two -- the next walk covers both.
+	CSharedFilesReloadLatch latch;
+	latch.Request();
+	const bool serving = latch.BeginWalk();
+	latch.Request();
+	latch.EndWalk(serving, /*aborted=*/true);
+	ASSERT_TRUE(latch.IsPending());
+
+	const bool nextServing = latch.BeginWalk();
+	ASSERT_TRUE(nextServing);
+	latch.EndWalk(nextServing, false);
+	ASSERT_TRUE(!latch.IsPending());
+}
+
+TEST(SharedFilesReloadLatch, CompletedWalkWithNoRequestChangesNothing)
+{
+	CSharedFilesReloadLatch latch;
+	const bool serving = latch.BeginWalk();
+	latch.EndWalk(serving, false);
+	ASSERT_TRUE(!latch.IsPending());
+}

amule-3.1.0.tar.gz/unittests/tests/StateTest.cpp Added

@@ -0,0 +1,1729 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include <muleunit/test.h>
+
+#include "State.h"
+
+#include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <cstdint>
+#include <map>
+#include <stdexcept>
+#include <thread>
+#include <vector>
+
+using namespace muleunit;
+using namespace webapi;
+
+namespace
+{
+// Stand-ins for the role-filtered accessors CState no longer exposes; the
+// assertions below just want a countable, indexable list.
+std::vector<FileSnapshot> RoleView(const CState &s, bool FileSnapshot::*role)
+{
+	std::vector<FileSnapshot> out;
+	s.WithFiles(&(const FileMap &files) {
+		for (const auto &entry : files) {
+			if (entry.second.*role)
+				out.push_back(entry.second);
+		}
+	});
+	return out;
+}
+
+std::vector<FileSnapshot> Downloads(const CState &s)
+{
+	return RoleView(s, &FileSnapshot::is_downloading);
+}
+
+std::vector<FileSnapshot> Shared(const CState &s)
+{
+	return RoleView(s, &FileSnapshot::is_shared);
+}
+} // namespace
+
+DECLARE_SIMPLE(State)
+
+TEST(State, FreshHasNoSnapshot)
+{
+	CState s;
+	ASSERT_FALSE(s.HasFirstSnapshot());
+	ASSERT_FALSE(s.EcConnected());
+	ASSERT_EQUALS(static_cast<std::time_t>(0), s.SnapshotAt());
+}
+
+TEST(State, MarkTickSuccessFlagsFreshness)
+{
+	CState s;
+	const std::time_t before = std::time(nullptr);
+	s.MarkTickSuccess();
+	const std::time_t after = std::time(nullptr);
+
+	ASSERT_TRUE(s.HasFirstSnapshot());
+	ASSERT_TRUE(s.EcConnected());
+	ASSERT_TRUE(s.SnapshotAt() >= before);
+	ASSERT_TRUE(s.SnapshotAt() <= after);
+}
+
+TEST(State, MarkTickFailurePreservesSnapshotAt)
+{
+	CState s;
+	s.MarkTickSuccess();
+	const std::time_t first_snapshot_at = s.SnapshotAt();
+
+	// Sleep a beat so a "snapshot_at = now" regression on
+	// MarkTickFailure would visibly change the value.
+	std::this_thread::sleep_for(std::chrono::milliseconds(1100));
+
+	s.MarkTickFailure();
+	ASSERT_FALSE(s.EcConnected());
+	// HasFirstSnapshot stays true -- we have stale data, but data nonetheless.
+	ASSERT_TRUE(s.HasFirstSnapshot());
+	ASSERT_EQUALS(first_snapshot_at, s.SnapshotAt());
+}
+
+TEST(State, WriteStatusRoundtrip)
+{
+	CState s;
+	StatusSnapshot in;
+	in.ed2k_state = "connected";
+	in.kad_state = "connecting";
+	in.ed2k_high_id = true;
+	in.ed2k_user_id = 1234567890u; // 210.2.150.73 packed LSB-first
+	in.ed2k_public_ip = "210.2.150.73";
+	in.download_overhead_bytes_per_second = 8700;
+	in.upload_overhead_bytes_per_second = 1100;
+	in.temp_free_bytes = 48318382080LL;
+	in.incoming_free_bytes = -1; // unknown
+	in.kad_firewalled_tcp = false;
+	in.server_name = "Some Server";
+	in.server_ip = "192.0.2.42";
+	in.server_port = 4242;
+	in.download_bytes_per_second = 12345;
+	in.upload_bytes_per_second = 6789;
+	in.ul_queue_len = 3;
+	in.total_src_count = 17;
+	s.WriteStatus(in);
+
+	const StatusSnapshot out = s.Status();
+	ASSERT_EQUALS(std::string("connected"), out.ed2k_state);
+	ASSERT_EQUALS(std::string("connecting"), out.kad_state);
+	ASSERT_TRUE(out.ed2k_high_id);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1234567890u), out.ed2k_user_id);
+	ASSERT_EQUALS(std::string("210.2.150.73"), out.ed2k_public_ip);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(8700), out.download_overhead_bytes_per_second);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(1100), out.upload_overhead_bytes_per_second);
+	ASSERT_EQUALS(static_cast<std::int64_t>(48318382080LL), out.temp_free_bytes);
+	// -1 must survive the round trip as -1: it is what the handler turns
+	// into JSON null, and an unsigned slot would make it 1.8e19.
+	ASSERT_EQUALS(static_cast<std::int64_t>(-1), out.incoming_free_bytes);
+	ASSERT_FALSE(out.kad_firewalled_tcp);
+	ASSERT_EQUALS(std::string("Some Server"), out.server_name);
+	ASSERT_EQUALS(std::string("192.0.2.42"), out.server_ip);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(4242), out.server_port);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(12345), out.download_bytes_per_second);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(6789), out.upload_bytes_per_second);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(3), out.ul_queue_len);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(17), out.total_src_count);
+}
+
+TEST(State, FileMapEmplaceFilesTheSnapshotUnderItsKey)
+{
+	// The clients walker resolves an amuled ECID with find() and then reads the snapshot it
+	// gets back, so the key and FileSnapshot::ecid have to agree. emplace() makes them agree
+	// instead of trusting the caller: a snapshot carrying the wrong id would break /clients
+	// silently.
+	CState s;
+	s.MutateDownloads((FileMap &cache) {
+		FileSnapshot f;
+		f.ecid = 999; // stale / wrong -- the key is what readers look up by
+		f.hash = "cccc2222cccc2222cccc2222cccc2222";
+		f.is_downloading = true;
+		cache.emplace(42, std::move(f));
+	});
+	s.WithFiles((const FileMap &files) {
+		const auto it = files.find(42);
+		ASSERT_TRUE(it != files.end());
+		ASSERT_EQUALS(static_cast<std::uint32_t>(42), it->second.ecid);
+		ASSERT_TRUE(files.find(999) == files.end());
+		// The role index is keyed off the same insert, so it agrees too.
+		std::uint32_t by_hash = 0;
+		ASSERT_TRUE(files.FindDownloadEcidByHash("cccc2222cccc2222cccc2222cccc2222", by_hash));
+		ASSERT_EQUALS(static_cast<std::uint32_t>(42), by_hash);
+		// ...and only under the role the entry actually carries.
+		std::uint32_t as_shared = 0;
+		ASSERT_FALSE(files.FindSharedEcidByHash("cccc2222cccc2222cccc2222cccc2222", as_shared));
+	});
+}
+
+TEST(State, MutateDownloadsRoundtripAndFind)
+{
+	CState s;
+	s.MutateDownloads((FileMap &cache) {
+		FileSnapshot a;
+		a.ecid = 100;
+		a.hash = "aaaa0000aaaa0000aaaa0000aaaa0000";
+		a.name = "foo.iso";
+		a.size = 1000;
+		a.is_downloading = true;
+		a.download.completed_bytes = 250;
+		a.download.priority = "high";
+		a.download.status = "downloading";
+		a.download.percent = 25.0;
+		cache.emplace(a.ecid, a);
+
+		FileSnapshot b;
+		b.ecid = 200;
+		b.hash = "bbbb1111bbbb1111bbbb1111bbbb1111";
+		b.name = "bar.iso";
+		b.is_downloading = true;
+		cache.emplace(b.ecid, b);
+	});
+
+	// Both entries should be present in the vector view. Order is unordered_map-bucket-defined,
+	// FileMap dropping std::map's ECID ordering, so look entries up by ECID rather than
+	// position.
+	const auto out = Downloads(s);
+	ASSERT_EQUALS(static_cast<size_t>(2), out.size());
+	std::string foo_name, bar_name;
+	for (const auto &f : out) {
+		if (f.ecid == 100)
+			foo_name = f.name;
+		if (f.ecid == 200)
+			bar_name = f.name;
+	}
+	ASSERT_EQUALS(std::string("foo.iso"), foo_name);
+	ASSERT_EQUALS(std::string("bar.iso"), bar_name);
+
+	// Hash lookup goes through FindDownload's linear scan; both hits
+	// and misses must come back correctly.
+	FileSnapshot found;
+	ASSERT_TRUE(s.FindDownload("bbbb1111bbbb1111bbbb1111bbbb1111", found));
+	ASSERT_EQUALS(std::string("bar.iso"), found.name);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(200), found.ecid);
+
+	FileSnapshot miss;
+	ASSERT_FALSE(s.FindDownload("0000000000000000000000000000000c", miss));
+}
+
+// #1161 -- a part file and its shared copy are two amuled objects with two ECIDs and one hash.
+// aMule keeps them apart because it has a list per role (CKnownFileList and CSharedFileList are
+// both hash-keyed and de-duplicate on insert); amuleapi merges the roles into one map, so both land
+// here.
+//
+// Whichever was emplaced last used to win the single hash->ECID slot, and the other became
+// unreachable: FindDownload() resolved the hash to the shared entry, saw is_downloading == false
+// and reported "no download with that hash" for a download that was in the map and being refreshed
+// the whole time (#1157). Order must not decide the answer -- each role resolves to its own entry.
+TEST(State, AHashSharedByADownloadAndAShareResolvesToBoth)
+{
+	const std::string kHash = "abcd1234abcd1234abcd1234abcd1234";
+	CState s;
+	s.MutateDownloads(&(FileMap &cache) {
+		FileSnapshot dl;
+		dl.ecid = 11;
+		dl.hash = kHash;
+		dl.name = "movie.part";
+		dl.is_downloading = true;
+		cache.emplace(dl.ecid, dl);
+
+		// The completed copy, obtained elsewhere and dropped into a shared folder: same
+		// content, so the same hash, but a different amuled object and therefore a
+		// different ECID.
+		FileSnapshot sh;
+		sh.ecid = 22;
+		sh.hash = kHash;
+		sh.name = "movie.mkv";
+		sh.is_shared = true;
+		cache.emplace(sh.ecid, sh);
+	});
+
+	FileSnapshot d;
+	ASSERT_TRUE(s.FindDownload(kHash, d));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(11), d.ecid);
+	ASSERT_EQUALS(std::string("movie.part"), d.name);
+
+	FileSnapshot sh;
+	ASSERT_TRUE(s.FindShared(kHash, sh));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(22), sh.ecid);
+	ASSERT_EQUALS(std::string("movie.mkv"), sh.name);
+}
+
+// Same pair, inserted the other way round. The bug was order-dependent, so a
+// test that only covers one order passes at 50%.
+TEST(State, ASharedFirstHashStillResolvesTheDownload)
+{
+	const std::string kHash = "beef0000beef0000beef0000beef0000";
+	CState s;
+	s.MutateDownloads(&(FileMap &cache) {
+		FileSnapshot sh;
+		sh.ecid = 22;
+		sh.hash = kHash;
+		sh.is_shared = true;
+		cache.emplace(sh.ecid, sh);
+
+		FileSnapshot dl;
+		dl.ecid = 11;
+		dl.hash = kHash;
+		dl.is_downloading = true;
+		cache.emplace(dl.ecid, dl);
+	});
+
+	FileSnapshot d;
+	ASSERT_TRUE(s.FindDownload(kHash, d));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(11), d.ecid);
+
+	FileSnapshot sh;
+	ASSERT_TRUE(s.FindShared(kHash, sh));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(22), sh.ecid);
+}
+
+// Erasing one role must not take the other's lookup down with it. This is the half users hit as
+// "deleting the shared file did not help": erasing the shared entry cleared the one index row, so
+// the download stopped resolving too.
+TEST(State, ErasingTheShareLeavesTheDownloadResolvable)
+{
+	const std::string kHash = "feed9999feed9999feed9999feed9999";
+	CState s;
+	s.MutateDownloads(&(FileMap &cache) {
+		FileSnapshot dl;
+		dl.ecid = 11;
+		dl.hash = kHash;
+		dl.is_downloading = true;
+		cache.emplace(dl.ecid, dl);
+
+		FileSnapshot sh;
+		sh.ecid = 22;
+		sh.hash = kHash;
+		sh.is_shared = true;
+		cache.emplace(sh.ecid, sh);
+	});
+	s.MutateDownloads(&(FileMap &cache) {
+		const auto it = cache.find(22);
+		ASSERT_TRUE(it != cache.end());
+		cache.erase(it);
+	});
+
+	FileSnapshot d;
+	ASSERT_TRUE(s.FindDownload(kHash, d));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(11), d.ecid);
+
+	FileSnapshot gone;
+	ASSERT_FALSE(s.FindShared(kHash, gone));
+}
+
+// The share slot changes owner. aMule keeps same-hash variants on
+// CKnownFileList::m_duplicateFileList, and Append() promotes one of them to the live record
+// (m_knownFileMaphash = Record) when the previous owner is displaced or its file disappears -- so
+// the ECID behind a hash's share is not stable even though the hash is. Both orderings, because a
+// tick can deliver the arrival and the departure either way round.
+TEST(State, ShareHandoverToANewEcidKeepsTheHashResolvable)
+{
+	const std::string kHash = "0a0a11110a0a11110a0a11110a0a1111";
+	CState s;
+	s.MutateDownloads(&(FileMap &cache) {
+		FileSnapshot b;
+		b.ecid = 22;
+		b.hash = kHash;
+		b.name = "old-copy.mkv";
+		b.is_shared = true;
+		cache.emplace(b.ecid, b);
+	});
+	// Departure first, then the replacement.
+	s.MutateDownloads(&(FileMap &cache) {
+		cache.erase(cache.find(22));
+		FileSnapshot c;
+		c.ecid = 33;
+		c.hash = kHash;
+		c.name = "new-copy.mkv";
+		c.is_shared = true;
+		cache.emplace(c.ecid, c);
+	});
+
+	FileSnapshot sh;
+	ASSERT_TRUE(s.FindShared(kHash, sh));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(33), sh.ecid);
+	ASSERT_EQUALS(std::string("new-copy.mkv"), sh.name);
+}
+
+TEST(State, ShareHandoverSurvivesTheReplacementArrivingFirst)
+{
+	const std::string kHash = "0b0b22220b0b22220b0b22220b0b2222";
+	CState s;
+	s.MutateDownloads(&(FileMap &cache) {
+		FileSnapshot b;
+		b.ecid = 22;
+		b.hash = kHash;
+		b.is_shared = true;
+		cache.emplace(b.ecid, b);
+	});
+	// Replacement lands before the old entry is dropped. The stale erase
+	// must not take the new owner's row with it.
+	s.MutateDownloads(&(FileMap &cache) {
+		FileSnapshot c;
+		c.ecid = 33;
+		c.hash = kHash;
+		c.is_shared = true;
+		cache.emplace(c.ecid, c);
+		cache.erase(cache.find(22));
+	});
+
+	FileSnapshot sh;
+	ASSERT_TRUE(s.FindShared(kHash, sh));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(33), sh.ecid);
+}
+
+// The refresher clears a role rather than erasing the entry when a file stops being shared but is
+// still known. The index has to follow that too, and must not take the other role down with it.
+TEST(State, ClearingOneRoleLeavesTheOtherResolvable)
+{
+	const std::string kHash = "0c0c33330c0c33330c0c33330c0c3333";
+	CState s;
+	s.MutateDownloads(&(FileMap &cache) {
+		// A part file is itself shared while it downloads, so one entry
+		// legitimately carries both roles and holds a row in each index.
+		FileSnapshot f;
+		f.ecid = 44;
+		f.hash = kHash;
+		f.is_downloading = true;
+		f.is_shared = true;
+		cache.emplace(f.ecid, f);
+	});
+	FileSnapshot both;
+	ASSERT_TRUE(s.FindDownload(kHash, both));
+	ASSERT_TRUE(s.FindShared(kHash, both));
+
+	s.MutateDownloads(&(FileMap &cache) { cache.SetShared(cache.find(44), false); });
+
+	FileSnapshot d;
+	ASSERT_TRUE(s.FindDownload(kHash, d));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(44), d.ecid);
+	FileSnapshot gone;
+	ASSERT_FALSE(s.FindShared(kHash, gone));
+	// Asserted against the index itself, not only through FindShared(): the resolvers re-check
+	// the role after resolving, so a stale row degrades to "not found" and a test going only
+	// through them would pass with the row still there. This is the one that actually watches
+	// the index.
+	s.WithFiles(&(const FileMap &files) {
+		std::uint32_t ecid = 0;
+		ASSERT_FALSE(files.FindSharedEcidByHash(kHash, ecid));
+		ASSERT_TRUE(files.FindDownloadEcidByHash(kHash, ecid));
+		ASSERT_EQUALS(static_cast<std::uint32_t>(44), ecid);
+	});
+}
+
+// A hash can arrive after the insert: a partfile frame with HASH suppressed files the entry with an
+// empty hash, and a later knownfile frame carries it. SetHash() exists so that late arrival still
+// reaches the index -- assigning the field through the iterator would leave the entry unreachable
+// by hash.
+TEST(State, AHashLearnedAfterTheInsertStillResolves)
+{
+	const std::string kHash = "0d0d44440d0d44440d0d44440d0d4444";
+	CState s;
+	s.MutateDownloads(&(FileMap &cache) {
+		FileSnapshot f;
+		f.ecid = 55;
+		f.is_downloading = true; // no hash yet
+		cache.emplace(f.ecid, f);
+	});
+	FileSnapshot before;
+	ASSERT_FALSE(s.FindDownload(kHash, before));
+
+	s.MutateDownloads(&(FileMap &cache) { cache.SetHash(cache.find(55), kHash); });
+
+	FileSnapshot after;
+	ASSERT_TRUE(s.FindDownload(kHash, after));
+	ASSERT_EQUALS(static_cast<std::uint32_t>(55), after.ecid);
+}
+
+TEST(State, MutateDownloadsDecodedRleFieldsRoundtrip)
+{
+	// `decoded_gaps` + `decoded_part_sources` are populated by the refresher's stateful RLE
+	// decoder pass. CState just stores and surfaces them; this pins that the per-part arrays
+	// survive the MutateDownloads -> Downloads()/FindDownload roundtrip with element-level
+	// fidelity. A regression would show as `progress.parts` being empty or wrong-sized on the
+	// wire.
+	CState s;
+	s.MutateDownloads((FileMap &cache) {
+		FileSnapshot a;
+		a.ecid = 42;
+		a.hash = "dddd3333dddd3333dddd3333dddd3333";
+		a.name = "with-rle.iso";
+		a.size = 9728000ull * 3; // exactly 3 parts
+		a.is_downloading = true;
+		// One gap covering byte ranges 100..200 and 9728000..9800000: the first lies
+		// entirely in part 0, the second entirely in part 1.
+		a.download.decoded_gaps = { 100ull, 200ull, 9728000ull, 9800000ull };
+		// Three parts with source counts 5, 0, 7.
+		a.download.decoded_part_sources = { 5, 0, 7 };
+		cache.emplace(a.ecid, a);
+	});
+
+	const auto out = Downloads(s);
+	ASSERT_EQUALS(static_cast<size_t>(1), out.size());
+	ASSERT_EQUALS(static_cast<size_t>(4), out0.download.decoded_gaps.size());
+	ASSERT_EQUALS(static_cast<std::uint64_t>(100), out0.download.decoded_gaps0);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(200), out0.download.decoded_gaps1);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(9728000), out0.download.decoded_gaps2);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(9800000), out0.download.decoded_gaps3);
+	ASSERT_EQUALS(static_cast<size_t>(3), out0.download.decoded_part_sources.size());
+	ASSERT_EQUALS(static_cast<std::uint16_t>(5), out0.download.decoded_part_sources0);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(0), out0.download.decoded_part_sources1);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(7), out0.download.decoded_part_sources2);
+
+	// FindDownload returns the same surface (used by the detail
+	// endpoint, which is the only path that emits progress.parts).
+	FileSnapshot via_find;
+	ASSERT_TRUE(s.FindDownload("dddd3333dddd3333dddd3333dddd3333", via_find));
+	ASSERT_EQUALS(static_cast<size_t>(4), via_find.download.decoded_gaps.size());
+	ASSERT_EQUALS(static_cast<size_t>(3), via_find.download.decoded_part_sources.size());
+	ASSERT_EQUALS(static_cast<std::uint16_t>(7), via_find.download.decoded_part_sources2);
+}
+
+// FileSnapshot::IsIncompletePartfile() decides two things: whether /shared/{hash} reports
+// `incomplete`, and whether "verify local data" is rejected as unsupported. Both want "genuinely
+// still a partfile", which is not the same question as "is in the download queue".
+TEST(State, IncompletePartfileIsFalseForAPureShare)
+{
+	FileSnapshot f;
+	f.is_shared = true;
+	f.is_downloading = false;
+	// A file that was never downloaded here has no download side at all, so
+	// the status string is empty rather than "completed".
+	ASSERT_TRUE(f.download.status.empty());
+	ASSERT_FALSE(f.IsIncompletePartfile());
+}
+
+TEST(State, IncompletePartfileIsTrueWhileDownloading)
+{
+	FileSnapshot f;
+	f.is_downloading = true;
+	f.download.status = "downloading";
+	ASSERT_TRUE(f.IsIncompletePartfile());
+}
+
+// The case the flag exists for: a finished download stays in the queue, with is_downloading still
+// set, until the user clears it -- but by then it is a knownfile whose data is in the destination
+// directory. Reporting it as an incomplete partfile would be wrong, and would also reject a
+// legitimate verify target.
+TEST(State, IncompletePartfileIsFalseForCompletedButNotCleared)
+{
+	FileSnapshot f;
+	f.is_downloading = true;
+	f.download.status = "completed";
+	ASSERT_FALSE(f.IsIncompletePartfile());
+}
+
+// A paused or stopped partfile is still an incomplete partfile: pausing changes whether it
+// transfers, not whether its data is whole. Same for every other non-completed state the wire
+// exposes, including "completing" -- the data lives in the temp directory until that move finishes.
+TEST(State, IncompletePartfileIsTrueForEveryNonCompletedStatus)
+{
+	static const char *const kIncompleteStates = { "downloading",
+		"paused",
+		"stopped",
+		"completing",
+		"hashing",
+		"waiting",
+		"allocating",
+		"erroneous",
+		"insufficient_disk",
+		"unknown" };
+	for (const char *status : kIncompleteStates) {
+		FileSnapshot f;
+		f.is_downloading = true;
+		f.download.status = status;
+		ASSERT_TRUE(f.IsIncompletePartfile());
+	}
+}
+
+// Only the exact wire string counts. The check is against "completed", not a prefix or a substring,
+// so the neighbouring "completing" state must not be swept in with it.
+TEST(State, IncompletePartfileDistinguishesCompletingFromCompleted)
+{
+	FileSnapshot completing;
+	completing.is_downloading = true;
+	completing.download.status = "completing";
+	FileSnapshot completed;
+	completed.is_downloading = true;
+	completed.download.status = "completed";
+	ASSERT_TRUE(completing.IsIncompletePartfile());
+	ASSERT_FALSE(completed.IsIncompletePartfile());
+}
+
+// is_downloading is the gate: a shared knownfile never in the queue is
+// complete whatever the download side happens to hold.
+TEST(State, IncompletePartfileRequiresBeingInTheDownloadQueue)
+{
+	FileSnapshot f;
+	f.is_shared = true;
+	f.is_downloading = false;
+	f.download.status = "downloading";
+	ASSERT_FALSE(f.IsIncompletePartfile());
+}
+
+TEST(State, MutateClientsAndSharedRoundtrip)
+{
+	CState s;
+	// m_clients is the unified peer cache, all upload_state values. The /clients endpoint
+	// surfaces the full set; consumers filter by role on their side.
+	s.MutateClients((std::map<std::uint32_t, ClientSnapshot> &cache) {
+		ClientSnapshot c;
+		c.ecid = 10;
+		c.client_name = "peer-1";
+		c.upload_state = "uploading";
+		c.upload_speed_bytes_per_second = 1234;
+		cache.emplace(c.ecid, c);
+	});
+	ASSERT_EQUALS(static_cast<size_t>(1), s.Clients().size());
+	ASSERT_EQUALS(std::string("peer-1"), s.Clients()0.client_name);
+	ASSERT_EQUALS(std::string("uploading"), s.Clients()0.upload_state);
+
+	s.MutateShared((FileMap &cache) {
+		FileSnapshot x;
+		x.ecid = 20;
+		x.hash = "ffff2222ffff2222ffff2222ffff2222";
+		x.name = "shared.iso";
+		x.size = 4096;
+		x.is_shared = true;
+		x.shared.priority = "normal";
+		cache.emplace(x.ecid, x);
+	});
+	ASSERT_EQUALS(static_cast<size_t>(1), Shared(s).size());
+	ASSERT_EQUALS(std::string("shared.iso"), Shared(s)0.name);
+}
+
+TEST(State, WriteKadAndPreferencesRoundtrip)
+{
+	CState s;
+
+	KadSnapshot k;
+	k.state = "connected";
+	k.users = 12345;
+	k.firewalled_tcp = true;
+	k.public_ip = "1.2.3.4";
+	k.node_id = "8f3a1c07d94b2e5a6018bb4c7f209d3e";
+	s.WriteKad(k);
+
+	PreferencesSnapshot p;
+	p.nickname = "tester";
+	p.user_hash = "deadbeefdeadbeefdeadbeefdeadbeef";
+	p.tcp_port = 4662;
+	p.udp_port = 4672;
+	p.ed2k_enabled = true;
+	s.WritePreferences(p);
+
+	std::vector<CategorySnapshot> cats;
+	{
+		CategorySnapshot c;
+		c.index = 0;
+		c.name = "All";
+		c.priority = "auto";
+		cats.push_back(c);
+	}
+	{
+		CategorySnapshot c;
+		c.index = 1;
+		c.name = "Movies";
+		c.path = "/tmp/movies";
+		c.priority = "high";
+		cats.push_back(c);
+	}
+	s.WriteCategories(cats);
+
+	const auto k_out = s.Kad();
+	ASSERT_EQUALS(std::string("connected"), k_out.state);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(12345), k_out.users);
+	ASSERT_TRUE(k_out.firewalled_tcp);
+	// The two string fields were written but never read back, so a
+	// rename could pass this test while dropping the value.
+	ASSERT_EQUALS(std::string("1.2.3.4"), k_out.public_ip);
+	ASSERT_EQUALS(std::string("8f3a1c07d94b2e5a6018bb4c7f209d3e"), k_out.node_id);
+
+	const auto p_out = s.Preferences();
+	ASSERT_EQUALS(std::string("tester"), p_out.nickname);
+	ASSERT_EQUALS(static_cast<std::uint16_t>(4662), p_out.tcp_port);
+	ASSERT_TRUE(p_out.ed2k_enabled);
+	ASSERT_FALSE(p_out.kad_enabled);
+
+	const auto c_out = s.Categories();
+	ASSERT_EQUALS(static_cast<size_t>(2), c_out.size());
+	ASSERT_EQUALS(std::string("All"), c_out0.name);
+	ASSERT_EQUALS(std::string("Movies"), c_out1.name);
+}
+
+TEST(State, WriteServersRoundtripAndOrder)
+{
+	CState s;
+	s.MutateServers((std::map<std::uint32_t, ServerSnapshot> &cache) {
+		ServerSnapshot a;
+		a.ecid = 200;
+		a.name = "second-by-ecid";
+		cache.emplace(a.ecid, a);
+
+		ServerSnapshot b;
+		b.ecid = 100;
+		b.name = "first-by-ecid";
+		cache.emplace(b.ecid, b);
+	});
+
+	// std::map iterates ECID-ascending, and the Servers() vector view inherits that ordering,
+	// so the wire response is stable across refresher ticks.
+	const auto out = s.Servers();
+	ASSERT_EQUALS(static_cast<size_t>(2), out.size());
+	ASSERT_EQUALS(std::string("first-by-ecid"), out0.name);
+	ASSERT_EQUALS(std::string("second-by-ecid"), out1.name);
+}
+
+TEST(State, AmuleLogFromReportsTotalAndSlicesTheTail)
+{
+	// The per-tick log diff reads the size and the tail in one lock, so both halves are
+	// contract: `total` is always the current line count, and the returned slice starts at
+	// `first`.
+	CState s;
+	std::size_t total = 0;
+
+	// Empty: no lines, and a total of zero rather than an unset out-param.
+	ASSERT_EQUALS(static_cast<size_t>(0), s.AmuleLogFrom(0, total).size());
+	ASSERT_EQUALS(static_cast<size_t>(0), total);
+
+	s.AppendAmuleLog({ "a", "b", "c" });
+
+	// first == 0: the whole buffer.
+	total = 0;
+	const auto all = s.AmuleLogFrom(0, total);
+	ASSERT_EQUALS(static_cast<size_t>(3), all.size());
+	ASSERT_EQUALS(static_cast<size_t>(3), total);
+	ASSERT_EQUALS(std::string("a"), all0);
+	ASSERT_EQUALS(std::string("c"), all2);
+
+	// Mid-buffer: the tail from there on.
+	total = 0;
+	const auto tail = s.AmuleLogFrom(2, total);
+	ASSERT_EQUALS(static_cast<size_t>(1), tail.size());
+	ASSERT_EQUALS(std::string("c"), tail0);
+	ASSERT_EQUALS(static_cast<size_t>(3), total);
+
+	// first == total: caught up, nothing to publish, total still reported.
+	total = 0;
+	ASSERT_EQUALS(static_cast<size_t>(0), s.AmuleLogFrom(3, total).size());
+	ASSERT_EQUALS(static_cast<size_t>(3), total);
+
+	// first > total: past the end truncates to empty rather than reading out of range. This is
+	// the shape the caller sees after a reset shrank the buffer below the counter it was
+	// holding.
+	total = 0;
+	ASSERT_EQUALS(static_cast<size_t>(0), s.AmuleLogFrom(99, total).size());
+	ASSERT_EQUALS(static_cast<size_t>(3), total);
+}
+
+TEST(State, AmuleLogFromAfterAResetReportsTheShrunkTotal)
+{
+	// ClearAmuleLog is the one path that shrinks the buffer. A caller still holding the pre-
+	// reset count must get an empty slice and the new, smaller total -- that pairing is what
+	// tells the log diff a truncation happened rather than an append.
+	CState s;
+	s.AppendAmuleLog({ "one", "two", "three", "four" });
+	std::size_t total = 0;
+	s.AmuleLogFrom(0, total);
+	ASSERT_EQUALS(static_cast<size_t>(4), total);
+
+	s.ClearAmuleLog();
+	total = 99;
+	ASSERT_EQUALS(static_cast<size_t>(0), s.AmuleLogFrom(4, total).size());
+	ASSERT_EQUALS(static_cast<size_t>(0), total);
+
+	// And it appends from scratch afterwards.
+	s.AppendAmuleLog({ "fresh" });
+	total = 0;
+	const auto after = s.AmuleLogFrom(0, total);
+	ASSERT_EQUALS(static_cast<size_t>(1), after.size());
+	ASSERT_EQUALS(std::string("fresh"), after0);
+	ASSERT_EQUALS(static_cast<size_t>(1), total);
+}
+
+TEST(State, AppendAmuleLogUncappedHistory)
+{
+	// Per-operator preference: amule log history is uncapped. Pushing thousands of lines must
+	// NOT trigger any trimming -- operators rely on the full record for triage. A future
+	// `DELETE /logs/amule` mutation is the only intentional truncation path; until that lands,
+	// history grows monotonically.
+	CState s;
+	{
+		std::vector<std::string> first_batch;
+		for (int i = 0; i < 1000; ++i) {
+			first_batch.push_back("first-" + std::to_string(i));
+		}
+		s.AppendAmuleLog(std::move(first_batch));
+	}
+	ASSERT_EQUALS(static_cast<size_t>(1000), s.AmuleLog().size());
+
+	{
+		std::vector<std::string> second_batch;
+		for (int i = 0; i < 1000; ++i) {
+			second_batch.push_back("second-" + std::to_string(i));
+		}
+		s.AppendAmuleLog(std::move(second_batch));
+	}
+	const auto out = s.AmuleLog();
+	ASSERT_EQUALS(static_cast<size_t>(2000), out.size());
+	// Oldest-first preserved.
+	ASSERT_EQUALS(std::string("first-0"), out0);
+	ASSERT_EQUALS(std::string("first-999"), out999);
+	ASSERT_EQUALS(std::string("second-0"), out1000);
+	ASSERT_EQUALS(std::string("second-999"), out1999);
+}
+
+TEST(State, WriteServerInfoRoundtrip)
+{
+	CState s;
+	ServerInfoLog in;
+	in.text = "server hello\nline 2\nline 3\n";
+	s.WriteServerInfo(in);
+
+	const auto out = s.ServerInfo();
+	ASSERT_EQUALS(in.text, out.text);
+
+	// Overwrite semantics: a second write replaces rather than appends -- ServerInfoLog is
+	// amuled's full-snapshot text, not an incremental cursor.
+	ServerInfoLog replacement;
+	replacement.text = "totally different\n";
+	s.WriteServerInfo(replacement);
+	ASSERT_EQUALS(std::string("totally different\n"), s.ServerInfo().text);
+}
+
+TEST(State, WriteStatsTreeRoundtripRecursive)
+{
+	CState s;
+	StatsTreeNode root;
+	root.label = "root";
+	{
+		StatsTreeNode child;
+		child.label = "Transfer";
+		{
+			StatsTreeNode grand;
+			grand.label = "Total bytes transferred: 12.3 GiB";
+			child.children.push_back(grand);
+		}
+		root.children.push_back(child);
+	}
+	{
+		StatsTreeNode sib;
+		sib.label = "Connection";
+		root.children.push_back(sib);
+	}
+	s.WriteStatsTree(root);
+
+	const StatsTreeNode out = s.StatsTree();
+	ASSERT_EQUALS(std::string("root"), out.label);
+	ASSERT_EQUALS(static_cast<size_t>(2), out.children.size());
+	ASSERT_EQUALS(std::string("Transfer"), out.children0.label);
+	ASSERT_EQUALS(static_cast<size_t>(1), out.children0.children.size());
+	ASSERT_EQUALS(std::string("Total bytes transferred: 12.3 GiB"), out.children0.children0.label);
+	ASSERT_EQUALS(std::string("Connection"), out.children1.label);
+}
+
+TEST(State, WriteGraphsRoundtripAllSeries)
+{
+	CState s;
+	StatsGraphs g;
+	g.interval_seconds = 1;
+	g.download_bytes_per_second = { 100, 200, 300 };
+	g.upload_bytes_per_second = { 10, 20, 30 };
+	g.connections = { 1, 2, 3 };
+	g.kad_nodes = { 500, 600, 700 };
+	g.active_uploads = { 4, 5, 6 };
+	g.active_downloads = { 7, 8, 9 };
+	g.max_points = 1800;
+	g.session_download_bytes = 1024;
+	g.session_upload_bytes = 256;
+	g.session_kad_node_seconds = 4096;
+	g.session_duration_seconds = 3600.0;
+	s.WriteGraphs(g);
+
+	const StatsGraphs out = s.Graphs();
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1), out.interval_seconds);
+	ASSERT_EQUALS(static_cast<size_t>(3), out.download_bytes_per_second.size());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(300), out.download_bytes_per_second2);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(700), out.kad_nodes2);
+	// The second data blob rides along point-aligned with the first.
+	ASSERT_EQUALS(static_cast<size_t>(3), out.active_uploads.size());
+	ASSERT_EQUALS(static_cast<std::uint32_t>(6), out.active_uploads2);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(9), out.active_downloads2);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(1800), out.max_points);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(1024), out.session_download_bytes);
+	ASSERT_EQUALS(static_cast<std::uint64_t>(4096), out.session_kad_node_seconds);
+	ASSERT_EQUALS(3600.0, out.session_duration_seconds);
+}
+
+// An amuled predating EC_TAG_STATSGRAPH_DATA_CONN sends the first blob and not the second. The two
+// extra series must come back empty rather than zero-filled: the handler keys "omit the JSON
+// fields" off exactly that, so a consumer can tell "not reported" from "nothing was transferring".
+TEST(State, WriteGraphsWithoutConnBlobLeavesExtraSeriesEmpty)
+{
+	CState s;
+	StatsGraphs g;
+	g.download_bytes_per_second = { 100, 200, 300 };
+	g.connections = { 1, 2, 3 };
+	s.WriteGraphs(g);
+
+	const StatsGraphs out = s.Graphs();
+	ASSERT_EQUALS(static_cast<size_t>(3), out.connections.size());
+	ASSERT_TRUE(out.active_uploads.empty());
+	ASSERT_TRUE(out.active_downloads.empty());
+}
+
+TEST(State, SearchResultsRoundtripAndOrderByEcid)
+{
+	CState s;
+	// Multi-search: a slot must exist before it can be mutated/read.
+	const std::uint32_t sid = 1;
+	s.MarkSearchStarted(sid, "global", "ubuntu");
+	s.MutateSearch(sid, (std::map<std::uint32_t, SearchResult> &cache) {
+		SearchResult a;
+		a.ecid = 50;
+		a.hash = "aaaa0000aaaa0000aaaa0000aaaa0000";
+		a.name = "ascii-name.iso";
+		a.size = 10000;
+		a.source_count = 12;
+		cache.emplace(a.ecid, a);
+
+		SearchResult b;
+		b.ecid = 25;
+		b.hash = "bbbb1111bbbb1111bbbb1111bbbb1111";
+		b.name = "first-by-ecid.iso";
+		b.size = 7000;
+		b.complete_source_count = 5;
+		b.already_downloaded = true;
+		cache.emplace(b.ecid, b);
+	});
+
+	// std::map iterates ECID-ascending → Search() vector is sorted.
+	const auto out = s.Search(sid);
+	ASSERT_EQUALS(static_cast<size_t>(2), out.size());
+	ASSERT_EQUALS(std::string("first-by-ecid.iso"), out0.name);
+	ASSERT_EQUALS(std::string("ascii-name.iso"), out1.name);
+	ASSERT_TRUE(out0.already_downloaded);
+	ASSERT_FALSE(out1.already_downloaded);
+	// The query rides on the slot, so a results read can report what was
+	// searched for without a second lookup.
+	ASSERT_EQUALS(std::string("ubuntu"), s.SearchQuery(sid));
+	// Id 0 is not a search and never resolves to one.
+	ASSERT_TRUE(s.Search(0).empty());
+	ASSERT_FALSE(s.HasSearch(0));
+}
+
+TEST(State, MultiSearchSlotsAreIndependentAndAddressable)
+{
+	CState s;
+	// No search yet: nothing is known and reads are empty.
+	ASSERT_FALSE(s.HasSearch(42));
+	ASSERT_TRUE(s.Search(42).empty());
+
+	// Two concurrent searches, each with its own result.
+	s.MarkSearchStarted(10, "global", "ten");
+	s.MutateSearch(10, (std::map<std::uint32_t, SearchResult> &cache) {
+		SearchResult r;
+		r.ecid = 1;
+		r.name = "in-ten.iso";
+		cache.emplace(r.ecid, r);
+	});
+	s.MarkSearchStarted(20, "kad", "twenty");
+	s.MutateSearch(20, (std::map<std::uint32_t, SearchResult> &cache) {
+		SearchResult r;
+		r.ecid = 2;
+		r.name = "in-twenty.iso";
+		cache.emplace(r.ecid, r);
+	});
+
+	// Each id addresses only its own results -- no cross-contamination, and
+	// no implicit target that could make an unaddressed read mean either.
+	ASSERT_EQUALS(static_cast<size_t>(1), s.Search(10).size());
+	ASSERT_EQUALS(std::string("in-ten.iso"), s.Search(10).at(0).name);
+	ASSERT_EQUALS(std::string("in-twenty.iso"), s.Search(20).at(0).name);
+	ASSERT_TRUE(s.HasSearch(10));
+	ASSERT_TRUE(s.HasSearch(20));
+	ASSERT_FALSE(s.HasSearch(30));
+
+	// Progress kind and query are per-slot.
+	ASSERT_EQUALS(std::string("global"), s.SearchProgress(10).kind);
+	ASSERT_EQUALS(std::string("kad"), s.SearchProgress(20).kind);
+	ASSERT_EQUALS(std::string("ten"), s.SearchQuery(10));
+	ASSERT_EQUALS(std::string("twenty"), s.SearchQuery(20));
+
+	// Freeing one search leaves the other completely alone -- the property
+	// that makes DELETE /search/{id} safe to issue from one tab.
+	s.CloseSearch(20);
+	ASSERT_FALSE(s.HasSearch(20));
+	ASSERT_TRUE(s.HasSearch(10));
+	ASSERT_TRUE(s.Search(20).empty());
+	ASSERT_EQUALS(static_cast<size_t>(1), s.Search(10).size());
+	ASSERT_EQUALS(std::string("in-ten.iso"), s.Search(10).at(0).name);
+}
+
+TEST(State, SearchStartedAtStampsOnlyOurOwnSearches)
+{
+	// GET /search has no recency signal of its own: the daemon returns its searches id-
+	// ascending and ships no timestamp, and id order is not recency because Kad ids carry a
+	// high-bit mask and always sort above ed2k ones. `started_at` is what a client ranks by
+	// instead -- and it exists only for searches THIS session started.
+	CState s;
+	s.MarkSearchStarted(5, "global", "ubuntu");
+	const std::time_t ours = s.SearchStartedAt(5);
+	ASSERT_TRUE(ours != 0);
+
+	// A search another client started, adopted through discovery, has no start time we could
+	// know. 0 means "unknown", which is why the REST layer omits the key rather than emitting a
+	// 1970 timestamp.
+	s.MarkSearchDiscovered(2147483651u, "kad", "debian", /*active=*/true, /*complete=*/false);
+	ASSERT_TRUE(s.HasSearch(2147483651u));
+	ASSERT_EQUALS(static_cast<std::time_t>(0), s.SearchStartedAt(2147483651u));
+
+	// An id nobody holds reports 0 too; HasSearch is what separates them.
+	ASSERT_EQUALS(static_cast<std::time_t>(0), s.SearchStartedAt(999));
+	ASSERT_FALSE(s.HasSearch(999));
+}
+
+TEST(State, DiscoveredSearchKeepsTheDaemonsLifecycleState)
+{
+	// Discovery used to seed every adopted search as active regardless of what the daemon said.
+	// POST /search/{id}/more gates on exactly that, so a FINISHED search adopted this way was
+	// accepted and answered 202 for a request amuled turns into a no-op.
+	CState s;
+	s.MarkSearchDiscovered(42, "kad", "debian", /*active=*/false, /*complete=*/true);
+	const auto finished = s.SearchProgress(42);
+	ASSERT_TRUE(!finished.active);
+	ASSERT_TRUE(finished.complete);
+	ASSERT_EQUALS(std::string("kad"), finished.kind);
+
+	// A still-running one is seeded running, so the tick keeps polling it.
+	s.MarkSearchDiscovered(43, "global", "ubuntu", /*active=*/true, /*complete=*/false);
+	const auto running = s.SearchProgress(43);
+	ASSERT_TRUE(running.active);
+	ASSERT_TRUE(!running.complete);
+
+	// A slot seeded inactive is not polled by the tick, so the read paths have to be able to
+	// refresh it on demand -- otherwise adopting a finished search would show an empty result
+	// list forever.
+	ASSERT_TRUE(s.ClaimSearchRefresh(42, std::chrono::milliseconds(1000)));
+	ASSERT_FALSE(s.ClaimSearchRefresh(43, std::chrono::milliseconds(1000)));
+}
+
+TEST(State, DiscoveredFinishedSearchReportsFullPercent)
+{
+	// A slot discovered as finished is never polled -- it is not in ActiveSearchIds() -- so the
+	// percent has to be seeded at discovery or it stays 0 for the life of the slot,
+	// contradicting the "finished" state carried in the same envelope. A finished search is 100
+	// by definition.
+	CState s;
+	s.MarkSearchDiscovered(2147483660u, "kad", "harry", /*active=*/false, /*complete=*/true);
+	const auto finished = s.SearchProgress(2147483660u);
+	ASSERT_TRUE(finished.complete);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(100), finished.percent);
+}
+
+TEST(State, DiscoveredRunningSearchKeepsZeroPercentAndIsPolled)
+{
+	// The running case must not be faked to 100: it is in ActiveSearchIds(), so the very next
+	// tick overwrites the percent with the daemon's real one. Seeding anything but 0 here would
+	// flash a wrong number for a tick.
+	CState s;
+	s.MarkSearchDiscovered(44, "kad", "ubuntu", /*active=*/true, /*complete=*/false);
+	const auto running = s.SearchProgress(44);
+	ASSERT_TRUE(!running.complete);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), running.percent);
+
+	const auto active = s.ActiveSearchIds();
+	ASSERT_TRUE(std::find(active.begin(), active.end(), 44u) != active.end());
+}
+
+TEST(State, DiscoveredSearchPrefersTheDaemonsReportedPercent)
+{
+	// Once the daemon reports a percent on its listing, that number wins over the one derived
+	// from the lifecycle state -- the whole point of carrying it: a running search adopted mid-
+	// ramp shows its real progress from first sight instead of 0 until the next tick.
+	CState s;
+	s.MarkSearchDiscovered(50, "kad", "ubuntu", /*active=*/true, /*complete=*/false, 62);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(62), s.SearchProgress(50).percent);
+
+	// A finished one likewise takes what the daemon says rather than assuming.
+	s.MarkSearchDiscovered(51, "kad", "debian", /*active=*/false, /*complete=*/true, 100);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(100), s.SearchProgress(51).percent);
+}
+
+TEST(State, DiscoveredSearchFallsBackWhenTheDaemonReportsNoPercent)
+{
+	// -1 is "the listing carried no percent", i.e. a daemon older than the tag. The derived
+	// fallback has to survive: finished is 100, running is 0 and gets corrected by the tick.
+	CState s;
+	s.MarkSearchDiscovered(52, "kad", "harry", /*active=*/false, /*complete=*/true, -1);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(100), s.SearchProgress(52).percent);
+
+	s.MarkSearchDiscovered(53, "kad", "potter", /*active=*/true, /*complete=*/false, -1);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(0), s.SearchProgress(53).percent);
+}
+
+TEST(State, DiscoveryDoesNotStompAnAlreadyKnownSearchsPercent)
+{
+	// Re-discovery of a slot this session already tracks must leave its accumulated progress
+	// alone; only the query is filled in. Seeding the percent must not have opened a path that
+	// overwrites a real one.
+	//
+	// The slot has to exist first: WriteSearchProgress only updates a slot that is already
+	// there, so seeding it needs MarkSearchStarted -- this session started the search -- before
+	// the progress write.
+	CState s;
+	s.MarkSearchStarted(45, "kad", "ubuntu");
+	SearchProgressSnapshot p;
+	p.active = true;
+	p.complete = false;
+	p.percent = 37;
+	p.kind = "kad";
+	s.WriteSearchProgress(45, p);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(37), s.SearchProgress(45).percent);
+
+	// Re-discovery of that same id must leave the real percent alone.
+	s.MarkSearchDiscovered(45, "kad", "named-later", /*active=*/false, /*complete=*/true);
+	ASSERT_EQUALS(static_cast<std::uint32_t>(37), s.SearchProgress(45).percent);
+}
+
+TEST(State, SearchRefreshIsClaimedOncePerTtlAndOnlyWhenIdle)
+{
+	// The read paths refresh a FINISHED search on demand, because the tick only polls active
+	// ones. ClaimSearchRefresh is what stops that turning every GET into an EC roundtrip, and
+	// what keeps two concurrent readers of the same search to one roundtrip between them.
+	CState s;
+	const auto kTtl = std::chrono::milliseconds(1000);
+
+	// Unknown id: nothing to refresh.
+	ASSERT_FALSE(s.ClaimSearchRefresh(99, kTtl));
+
+	// A running search is refreshed by the tick every second already, so the
+	// read path must not add traffic on top of it.
+	s.MarkSearchStarted(7, "global", "still running");
+	ASSERT_FALSE(s.ClaimSearchRefresh(7, kTtl));
+
+	// Once finished it has never been fetched by this path, so the first
+	// caller gets the claim...
+	SearchProgressSnapshot done = s.SearchProgress(7);
+	done.active = false;
+	done.complete = true;
+	s.WriteSearchProgress(7, done);
+	ASSERT_TRUE(s.ClaimSearchRefresh(7, kTtl));
+	// ...and the next one inside the TTL does not, because the claim stamped
+	// the slot rather than waiting for the fetch to finish.
+	ASSERT_FALSE(s.ClaimSearchRefresh(7, kTtl));
+	// A zero TTL means "always stale", which is how the test distinguishes
+	// "coalesced" from "never refreshes again".
+	ASSERT_TRUE(s.ClaimSearchRefresh(7, std::chrono::milliseconds(0)));
+}
+
+TEST(State, BrowseRidesSearchMachinery)
+{
+	// A "View Files" browse (POST /clients/{ecid}/shared_files) is filed under a search_id with
+	// kind "browse" and its files land in the same per-slot result cache as a query search --
+	// the refresher, /search/results and the SSE search channel all treat it identically. Lock
+	// that in: the browse kind is preserved per-slot and its results address only its own id.
+	CState s;
+	s.MarkSearchStarted(17, "browse", "SomePeerNick");
+	s.MutateSearch(17, (std::map<std::uint32_t, SearchResult> &cache) {
+		SearchResult r;
+		r.ecid = 1;
+		r.name = "peer-shared.iso";
+		cache.emplace(r.ecid, r);
+	});
+	ASSERT_TRUE(s.HasSearch(17));
+	ASSERT_EQUALS(std::string("browse"), s.SearchProgress(17).kind);
+	ASSERT_EQUALS(static_cast<size_t>(1), s.Search(17).size());
+	ASSERT_EQUALS(std::string("peer-shared.iso"), s.Search(17).at(0).name);
+	// A browse's "query" is the peer whose share is listed, which is what the
+	// daemon names the search and what GET /search reports for it.
+	ASSERT_EQUALS(std::string("SomePeerNick"), s.SearchQuery(17));
+}
+
+TEST(State, ResetListsLeavesLogsAlone)
+{
+	// Logs survive an EC reconnect on purpose -- the operator can see "EC disconnected at
+	// HH:MM" alongside earlier traffic. ResetLists must not nuke either log buffer.
+	CState s;
+	s.AppendAmuleLog({ "persistent line" });
+	s.WriteServerInfo({ "persistent server info" });
+	s.ResetLists();
+	ASSERT_EQUALS(static_cast<size_t>(1), s.AmuleLog().size());
+	ASSERT_EQUALS(std::string("persistent server info"), s.ServerInfo().text);
+}
+
+TEST(State, ResetListsClearsAll)
+{
+	CState s;
+	s.MutateDownloads((FileMap &cache) {
+		FileSnapshot d;
+		d.ecid = 1;
+		d.name = "a";
+		d.is_downloading = true;
+		cache.emplace(1, d);
+	});
+	s.MutateClients((std::map<std::uint32_t, ClientSnapshot> &cache) {
+		ClientSnapshot c;
+		c.ecid = 1;
+		c.client_name = "b";
+		cache.emplace(1, c);
+	});
+	s.MutateShared((FileMap &cache) {
+		// Same ECID; sets is_shared on the existing entry rather than
+		// creating a new map slot, matching the unified-map model.
+		auto it = cache.find(1);
+		if (it == cache.end()) {
+			FileSnapshot x;
+			x.ecid = 1;
+			x.name = "c";
+			x.is_shared = true;
+			cache.emplace(1, x);
+		} else {
+			it->second.is_shared = true;
+		}
+	});
+	ASSERT_EQUALS(static_cast<size_t>(1), Downloads(s).size());
+	ASSERT_EQUALS(static_cast<size_t>(1), s.Clients().size());
+	ASSERT_EQUALS(static_cast<size_t>(1), Shared(s).size());
+
+	s.ResetLists();
+	ASSERT_EQUALS(static_cast<size_t>(0), Downloads(s).size());
+	ASSERT_EQUALS(static_cast<size_t>(0), s.Clients().size());
+	ASSERT_EQUALS(static_cast<size_t>(0), Shared(s).size());
+}
+
+// The callback accessors run caller code while holding m_mu, which is not recursive. These pin the
+// two halves of that contract that can be checked without deadlocking the test: a nested call on a
+// DIFFERENT instance is a different mutex and must stay legal, and the guard must unwind so a
+// second sequential call still works. Re-entering the SAME instance aborts by design, so it is not
+// exercised here -- see CState::ReentryGuard.
+TEST(State, CallbackOnADifferentStateInstanceIsAllowed)
+{
+	CState a;
+	CState b;
+	a.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 1;
+		f.is_downloading = true;
+		files.emplace(f.ecid, f);
+	});
+
+	// b's callback reads a: a different CState, so a different mutex, and
+	// nothing to deadlock on. The guard must not confuse the two.
+	std::size_t seen = 0;
+	b.MutateClients(&a, &seen(std::map<std::uint32_t, ClientSnapshot> &) {
+		a.WithFiles(&seen(const FileMap &files) { seen = files.size(); });
+	});
+	ASSERT_EQUALS(static_cast<size_t>(1), seen);
+}
+
+TEST(State, CallbackGuardUnwindsSoLaterCallsStillWork)
+{
+	CState s;
+	s.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 7;
+		f.is_downloading = true;
+		files.emplace(f.ecid, f);
+	});
+	std::size_t first = 0, second = 0;
+	s.WithFiles(&first(const FileMap &files) { first = files.size(); });
+	s.WithFiles(&second(const FileMap &files) { second = files.size(); });
+	ASSERT_EQUALS(static_cast<size_t>(1), first);
+	ASSERT_EQUALS(static_cast<size_t>(1), second);
+
+	// And an exception escaping a callback must not leave the guard set.
+	try {
+		s.WithFiles((const FileMap &) { throw std::runtime_error("boom"); });
+	} catch (const std::runtime_error &) {
+		// expected
+	}
+	std::size_t after = 0;
+	s.WithFiles(&after(const FileMap &files) { after = files.size(); });
+	ASSERT_EQUALS(static_cast<size_t>(1), after);
+}
+
+TEST(State, ConcurrentReadersDontTearSnapshot)
+{
+	// Spin up 4 readers + 1 writer for 100ms. The writer churns distinct snapshot values;
+	// readers verify they always observe a *self-consistent* snapshot -- the four numeric
+	// fields below are written under one unique_lock, so a shared_lock reader must see them all
+	// from the same generation. A torn read would show as a mismatched
+	// (download_bytes_per_second, upload_bytes_per_second) pair, which we then assert against.
+
+	CState s;
+	std::atomic<bool> stop{ false };
+	std::atomic<int> observed{ 0 };
+	std::atomic<int> torn{ 0 };
+
+	std::thread writer(& {
+		std::uint64_t gen = 1;
+		while (!stop.load()) {
+			StatusSnapshot v;
+			v.download_bytes_per_second = gen;
+			v.upload_bytes_per_second = gen * 2;
+			v.ul_queue_len = static_cast<std::uint32_t>(gen & 0xffffffff);
+			v.total_src_count = static_cast<std::uint32_t>(gen & 0xffffffff);
+			s.WriteStatus(v);
+			++gen;
+		}
+	});
+
+	std::vector<std::thread> readers;
+	for (int i = 0; i < 4; ++i) {
+		readers.emplace_back(& {
+			while (!stop.load()) {
+				StatusSnapshot r = s.Status();
+				observed.fetch_add(1);
+				// Invariants enforced by the writer's single unique_lock
+				// acquisition: upload_bytes_per_second == 2 *
+				// download_bytes_per_second; ul_queue_len == total_src_count.
+				if (r.upload_bytes_per_second != 2 * r.download_bytes_per_second)
+					torn.fetch_add(1);
+				if (r.ul_queue_len != r.total_src_count)
+					torn.fetch_add(1);
+			}
+		});
+	}
+
+	std::this_thread::sleep_for(std::chrono::milliseconds(100));
+	stop.store(true);
+	writer.join();
+	for (auto &t : readers)
+		t.join();
+
+	// Sanity: the loop actually exercised the contention path. A bar of `> 0` passes with a
+	// single observation, which a debug build or an over-loaded CI runner could plausibly
+	// produce -- leaving the tear-detection harness inactive while the test still reports
+	// green. Require a meaningful number of reads instead; even a slow runner does ~10K reads
+	// per shared_lock-protected field in 100ms, a single uncontended read being sub-
+	// microsecond, and torn-read detection needs many reads to catch the boundary anyway.
+	ASSERT_TRUE(observed.load() > 1000);
+	// And no read saw a torn snapshot.
+	ASSERT_EQUALS(0, torn.load());
+}
+
+// MemoizableTarget. The response-ETag memo is keyed on (target, snapshot revision). Eligibility is
+// opt-in: this used to be an exclusion list and it was wrong four separate times -- a bare
+// collection the prefixes never matched, a live EC roundtrip nobody listed, a per-principal
+// document, and a key that froze while bodies moved. Inverting it makes an oversight cost a wasted
+// hash instead of a 304 for changed content.
+
+// MemoUsable / ShouldStampEtag. Both guard something a sequential test cannot observe: MemoUsable's
+// second condition guards a write landing while a handler serializes, and ShouldStampEtag's
+// `handler_set_etag` guards the dispatcher stamping over a validator a handler already owns.
+// Deleting either used to leave the whole suite green, which is the same as having no guard at all
+// -- these tests exist to go red when that happens.
+
+// The revision moving across the handler is what disqualifies the response:
+// the body belongs to rev_before while the key would claim rev_after.
+TEST(State, MemoUsableRejectsAMovedRevision)
+{
+	ASSERT_TRUE(MemoUsable("/api/v1/downloads", 7, 7));
+	ASSERT_TRUE(!MemoUsable("/api/v1/downloads", 7, 8));
+	// Direction does not matter -- any inequality means the body cannot be
+	// attributed to a revision.
+	ASSERT_TRUE(!MemoUsable("/api/v1/downloads", 8, 7));
+	ASSERT_TRUE(MemoUsable("/api/v1/shared?limit=10", 3, 3));
+	ASSERT_TRUE(!MemoUsable("/api/v1/shared?limit=10", 3, 4));
+}
+
+// Both conditions are required, so an ineligible target stays ineligible even
+// with a perfectly stable revision, and vice versa.
+TEST(State, MemoUsableNeedsBothConditions)
+{
+	ASSERT_TRUE(!MemoUsable("/api/v1/auth/session", 5, 5));
+	ASSERT_TRUE(!MemoUsable("/api/v1/status", 5, 5));
+	ASSERT_TRUE(!MemoUsable("/api/v1/auth/session", 5, 6));
+	// Revision 0 is the pre-first-tick value; eligibility does not depend on the number, only
+	// on it holding still. The caller separately refuses to serve a memo entry stamped 0.
+	ASSERT_TRUE(MemoUsable("/api/v1/downloads", 0, 0));
+}
+
+// A handler that computed its own ETag owns it. Stamping over the top is what gave the static path
+// two validators for one resource, since it clears the body for HEAD and only the GET reached the
+// hashing branch.
+TEST(State, ShouldStampEtagLeavesAHandlerValidatorAlone)
+{
+	ASSERT_TRUE(ShouldStampEtag(true, false, 200, false));
+	ASSERT_TRUE(!ShouldStampEtag(true, true, 200, false));
+}
+
+// The other three terms: unsafe methods carry post-mutation state the client always wants
+// delivered, non-200s are not worth a validator, and an empty body has nothing to hash.
+TEST(State, ShouldStampEtagOnlyForSafe200sWithABody)
+{
+	ASSERT_TRUE(!ShouldStampEtag(false, false, 200, false));
+	ASSERT_TRUE(!ShouldStampEtag(true, false, 404, false));
+	ASSERT_TRUE(!ShouldStampEtag(true, false, 304, true));
+	ASSERT_TRUE(!ShouldStampEtag(true, false, 200, true));
+}
+
+// The two collections the memo exists for: the multi-MB bodies where skipping an MD5 is worth
+// anything.
+TEST(State, MemoizableTargetCoversTheTwoBigCollections)
+{
+	ASSERT_TRUE(MemoizableTarget("/api/v1/downloads"));
+	ASSERT_TRUE(MemoizableTarget("/api/v1/shared"));
+	// A query string picks a page, not a different resource.
+	ASSERT_TRUE(MemoizableTarget("/api/v1/downloads?limit=10&offset=20"));
+	ASSERT_TRUE(MemoizableTarget("/api/v1/shared?sort=name&order=desc"));
+}
+
+// Everything else hashes per request. Each of these was a live bug at some point in this PR's
+// history, and under an opt-in rule none can recur: the self-refreshing ones, the live-EC ones and
+// the per-principal one are all simply absent from the eligible set.
+TEST(State, MemoizableTargetExcludesEverythingElse)
+{
+	// own TTL caches / append-only mirror / refresh-on-read
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/stats/tree"));
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/stats/graphs/download_speed?width=3"));
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/logs/amule"));
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/logs/server_info"));
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/search/7/results"));
+	// live EC roundtrip per read, and the bare collection a trailing-slash
+	// prefix could never match
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/search"));
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/share_directories"));
+	// per-principal: one key cannot describe two callers' documents
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/auth/session"));
+	// snapshot-backed, but not worth a memo -- and absent by default
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/status"));
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/clients"));
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/servers"));
+}
+
+// A sub-resource of an eligible collection is NOT itself eligible: it is a different body, so an
+// "everything under /downloads" or "everything under /shared" rule would sweep back in exactly what
+// the opt-in set leaves out. (/share_directories is not under /shared, and the excluded-set test
+// above covers it.)
+TEST(State, MemoizableTargetDoesNotExtendToSubResources)
+{
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/downloads/8b54a3c2"));
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/downloads/8b54a3c2/clients"));
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/shared/8b54a3c2"));
+	// and no prefix bleed onto a neighbour that merely starts the same
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/downloads_archive"));
+	ASSERT_TRUE(!MemoizableTarget("/api/v1/sharedfiles"));
+}
+
+// Snapshot revision. The ETag memo is keyed on this, not on snapshot_at. snapshot_at cannot serve:
+// it counts whole seconds, so two refreshes inside one second are indistinguishable, and it is
+// stamped only by the background loop, so the inline refreshes mutating handlers run never moved
+// it. A mutation therefore changed a body while the key stood still, and the next conditional GET
+// was answered 304 for content that had just changed.
+TEST(State, SnapshotRevisionAdvancesOnEveryBump)
+{
+	CState state;
+	const std::uint64_t r0 = state.SnapshotRevision();
+	state.BumpSnapshotRevision();
+	const std::uint64_t r1 = state.SnapshotRevision();
+	ASSERT_TRUE(r1 != r0);
+	state.BumpSnapshotRevision();
+	ASSERT_TRUE(state.SnapshotRevision() != r1);
+}
+
+// Two bumps inside the same wall-clock second must still be distinguishable
+// -- the precise case a time_t key collapses.
+TEST(State, SnapshotRevisionSeparatesTwoBumpsInOneSecond)
+{
+	CState state;
+	std::vector<std::uint64_t> seen;
+	for (int i = 0; i < 5; ++i) {
+		state.BumpSnapshotRevision();
+		seen.push_back(state.SnapshotRevision());
+	}
+	for (std::size_t i = 1; i < seen.size(); ++i) {
+		ASSERT_TRUE(seeni != seeni - 1);
+	}
+}
+
+// Every writer of a memoized body advances the key, and it is the WRITER that does it rather than
+// its callers. That is the whole point: the key was advanced from the outside three times and
+// missed a path each time -- the inline refreshes mutating handlers run, and then a tick that
+// failed partway after it had already written. A writer cannot forget that it wrote.
+TEST(State, MutatingDownloadsAdvancesTheRevision)
+{
+	CState state;
+	const std::uint64_t before = state.SnapshotRevision();
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 1;
+		f.hash = "1111111111111111111111111111aaaa";
+		f.is_downloading = true;
+		files.emplace(f.ecid, f);
+	});
+	ASSERT_TRUE(state.SnapshotRevision() != before);
+}
+
+TEST(State, MutatingSharedAdvancesTheRevision)
+{
+	CState state;
+	const std::uint64_t before = state.SnapshotRevision();
+	state.MutateShared((FileMap &) {});
+	ASSERT_TRUE(state.SnapshotRevision() != before);
+}
+
+// The failure path specifically. A tick that dies partway still calls ResetLists on the way back,
+// and that wipe is as much a body change as any mutation -- it is where the key used to freeze
+// while the bodies moved, so a whole EC outage was served 304 against the pre-failure validator.
+TEST(State, ResetListsAdvancesTheRevision)
+{
+	CState state;
+	state.MutateDownloads((FileMap &files) {
+		FileSnapshot f;
+		f.ecid = 2;
+		f.hash = "2222222222222222222222222222bbbb";
+		files.emplace(f.ecid, f);
+	});
+	const std::uint64_t before = state.SnapshotRevision();
+	state.ResetLists();
+	ASSERT_TRUE(state.SnapshotRevision() != before);
+}
+
+// MarkTickSuccess stamps the timestamp; it deliberately does NOT advance the revision, because
+// RefresherTick owns that and the background loop calls both. Pinned so a future edit does not
+// quietly double-count.
+//
+// ResetLists fires when the PREVIOUS tick returned null against a socket that is still up -- an
+// actual dropped connection shuts amuleapi down instead. The daemon's search registry is therefore
+// alive, along with its record of what it has already sent us, and the multi-search union has no
+// resync opcode. Wiping our side would leave every search permanently short by whatever it held
+// when one tick happened to fail.
+TEST(State, ResetListsKeepsSearchSlots)
+{
+	CState state;
+	state.MarkSearchStarted(42, "global", "ubuntu");
+	state.MutateAllSearches((std::map<std::uint32_t, SearchSlot> &slots,
+					std::map<std::uint32_t, std::uint32_t> &owner) {
+		SearchResult r;
+		r.name = "ubuntu.iso";
+		slots42.raw70 = r;
+		slots42.results70 = r;
+		owner70 = 42;
+	});
+
+	state.ResetLists();
+
+	ASSERT_TRUE(!state.AttachedSearchIds().empty());
+	ASSERT_EQUALS(static_cast<size_t>(1), state.Search(42).size());
+}
+
+// A restarted search must not show the previous one's hits through the gaps in a diffed tag.
+// `results` alone is not enough: `raw` is what the union merges into, and RebuildFoldedResults
+// would put any survivor straight back.
+TEST(State, MarkSearchStartedClearsTheRawResultsAndTheIndex)
+{
+	CState state;
+	state.MarkSearchStarted(42, "global", "ubuntu");
+	state.MutateAllSearches((std::map<std::uint32_t, SearchSlot> &slots,
+					std::map<std::uint32_t, std::uint32_t> &owner) {
+		SearchResult r;
+		r.name = "stale.iso";
+		slots42.raw70 = r;
+		slots42.results70 = r;
+		owner70 = 42;
+	});
+
+	state.MarkSearchStarted(42, "global", "debian");
+
+	state.MutateAllSearches((std::map<std::uint32_t, SearchSlot> &slots,
+					std::map<std::uint32_t, std::uint32_t> &owner) {
+		ASSERT_TRUE(slots42.raw.empty());
+		ASSERT_TRUE(slots42.results.empty());
+		ASSERT_TRUE(owner.find(70) == owner.end());
+	});
+}
+
+// The union poll is gated on there being a slot the daemon could still speak for. A detached slot
+// is not one: its search is gone core-side, so polling on its behalf is a roundtrip a second that
+// can never return anything. Without this, a user who runs one search and never deletes it keeps
+// amuleapi polling forever once the daemon's ring drops it.
+TEST(State, DetachedSlotsDoNotKeepTheUnionPollAlive)
+{
+	CState state;
+	state.MarkSearchStarted(42, "global", "ubuntu");
+	ASSERT_TRUE(!state.AttachedSearchIds().empty());
+
+	state.DetachSearch(42);
+	ASSERT_TRUE(state.AttachedSearchIds().empty());
+
+	// A second, still-attached slot re-opens it: the poll covers every search
+	// in one request, so one live slot is reason enough to send it.
+	state.MarkSearchStarted(43, "kad", "debian");
+	ASSERT_TRUE(!state.AttachedSearchIds().empty());
+}
+
+// Slots are capped, or a long-lived process watching a busy GUI accumulates one result map per
+// search forever. Active searches are never the victim, and a detached one -- the daemon no longer
+// holds it, so nothing is lost -- outranks an attached one however much younger.
+TEST(State, SurplusSearchSlotsAreEvictedDetachedFirst)
+{
+	CState state;
+	// Two finished slots, oldest first, then fill well past the cap.
+	state.MarkSearchStarted(1, "global", "oldest-attached");
+	state.MarkSearchStarted(2, "global", "younger-detached");
+	state.WriteSearchProgress(1, SearchProgressSnapshot{});
+	state.WriteSearchProgress(2, SearchProgressSnapshot{});
+	state.DetachSearch(2);
+	for (std::uint32_t sid = 100; sid < 100 + 70; ++sid) {
+		state.MarkSearchStarted(sid, "global", "filler");
+		state.WriteSearchProgress(sid, SearchProgressSnapshot{});
+	}
+
+	const std::vector<std::uint32_t> left = state.AllSearchIds();
+	ASSERT_TRUE(left.size() <= 64);
+	// The detached one went even though slot 1 is older.
+	ASSERT_TRUE(std::find(left.begin(), left.end(), 2u) == left.end());
+}
+
+TEST(State, EvictionNeverTakesTheSlotBeingSeeded)
+{
+	// Eviction runs straight after the insert. With every other slot active -- never a victim
+	// -- the slot just created is the only eligible one, so without an exemption the seed
+	// evicts itself and the caller then applies a full re-read to a slot that is no longer
+	// there.
+	CState state;
+	for (std::uint32_t sid = 100; sid < 100 + 64; ++sid) {
+		SearchProgressSnapshot running;
+		running.active = true;
+		state.MarkSearchStarted(sid, "global", "busy");
+		state.WriteSearchProgress(sid, running);
+	}
+	// Discovered as finished, so it is the one slot that is not active.
+	state.MarkSearchDiscovered(4242, "global", "adopted", false, true, 100);
+
+	const std::vector<std::uint32_t> left = state.AllSearchIds();
+	ASSERT_TRUE(std::find(left.begin(), left.end(), 4242u) != left.end());
+}
+
+TEST(State, AttachedSearchIdsKeepsFinishedSlotsAndDropsDetachedOnes)
+{
+	// The tick polls THIS set for expiry. A finished search has to stay in it: it is the one
+	// the daemon's ring drops first, and the eviction tombstones its results, so a slot not
+	// detached by then has them erased -- exactly what detaching exists to prevent. A detached
+	// slot drops out because the daemon already has nothing to say about it.
+	CState state;
+	state.MarkSearchStarted(1, "global", "running");
+	SearchProgressSnapshot running;
+	running.active = true;
+	state.WriteSearchProgress(1, running);
+
+	state.MarkSearchStarted(2, "global", "finished");
+	SearchProgressSnapshot done;
+	done.active = false;
+	done.complete = true;
+	done.percent = 100;
+	state.WriteSearchProgress(2, done);
+
+	// Detached exactly the way the tick does it: the expiry branch detaches AND writes the
+	// terminal snapshot, so a detached slot is never left marked active. Detaching alone would
+	// be a state the product never produces, and asserting against it would prove nothing.
+	state.MarkSearchStarted(3, "global", "gone");
+	state.DetachSearch(3);
+	SearchProgressSnapshot retired;
+	retired.active = false;
+	retired.complete = true;
+	retired.percent = 100;
+	state.WriteSearchProgress(3, retired);
+
+	const std::vector<std::uint32_t> attached = state.AttachedSearchIds();
+	ASSERT_EQUALS(static_cast<size_t>(2), attached.size());
+	ASSERT_TRUE(std::find(attached.begin(), attached.end(), 1u) != attached.end());
+	ASSERT_TRUE(std::find(attached.begin(), attached.end(), 2u) != attached.end());
+	ASSERT_TRUE(std::find(attached.begin(), attached.end(), 3u) == attached.end());
+
+	// The active set is the narrower one the progress advance still uses.
+	const std::vector<std::uint32_t> active = state.ActiveSearchIds();
+	ASSERT_EQUALS(static_cast<size_t>(1), active.size());
+	ASSERT_EQUALS(1u, active0);
+}
+
+TEST(State, AFailedUnionFlagsEveryLiveSlotForResync)
+{
+	// The daemon commits its differential state while building a reply, so a reply we never
+	// applied is gone rather than repeated. Every slot it could have covered has to be re-
+	// seeded in full.
+	CState state;
+	state.MarkSearchStarted(1, "global", "alpha");
+	state.MarkSearchStarted(2, "kad", "beta");
+	state.MarkSearchStarted(3, "global", "gone");
+	state.DetachSearch(3);
+
+	state.MarkAllSearchesNeedResync();
+	const std::vector<std::uint32_t> pending = state.SearchesNeedingResync();
+
+	ASSERT_EQUALS(static_cast<size_t>(2), pending.size());
+	// Oldest slot first, and the detached one is skipped: the daemon holds
+	// nothing for it, so a full re-read would only come back expired.
+	ASSERT_EQUALS(1u, pending0);
+	ASSERT_EQUALS(2u, pending1);
+}
+
+TEST(State, ADetachedSlotDropsOutOfTheResyncList)
+{
+	// MarkAllSearchesNeedResync skips detached slots; the drain has to apply the same rule,
+	// because a slot can be flagged first and detached later. That is the ordinary sequence:
+	// the union fails and flags every live slot, then the next tick's retirement loop detaches
+	// the ones the daemon has expired -- before the resync loop runs. Left in, each costs a
+	// roundtrip that can only come back expired, and a replace-mode apply against a detached
+	// slot clears the last-known results the detach exists to preserve.
+	CState state;
+	state.MarkSearchStarted(11, "global", "alpha");
+	state.MarkSearchStarted(12, "global", "beta");
+
+	state.MarkAllSearchesNeedResync();
+	ASSERT_EQUALS(static_cast<size_t>(2), state.SearchesNeedingResync().size());
+
+	state.DetachSearch(12);
+
+	const std::vector<std::uint32_t> pending = state.SearchesNeedingResync();
+	ASSERT_EQUALS(static_cast<size_t>(1), pending.size());
+	ASSERT_EQUALS(11u, pending0);
+}
+
+TEST(State, ClearingTheResyncFlagStopsItBeingRequestedAgain)
+{
+	// The daemon answering "expired" is a definitive answer. Left set, the id
+	// would be re-requested on every tick for the life of the slot.
+	CState state;
+	state.MarkSearchStarted(7, "global", "alpha");
+	state.MarkAllSearchesNeedResync();
+	ASSERT_EQUALS(static_cast<size_t>(1), state.SearchesNeedingResync().size());
+
+	state.ClearSearchResyncFlag(7);
+
+	ASSERT_TRUE(state.SearchesNeedingResync().empty());
+}
+
+TEST(State, MarkTickSuccessDoesNotAdvanceTheRevision)
+{
+	CState state;
+	const std::uint64_t before = state.SnapshotRevision();
+	state.MarkTickSuccess();
+	ASSERT_EQUALS(before, state.SnapshotRevision());
+}

amule-3.1.0.tar.gz/unittests/tests/StaticFsTest.cpp Added

@@ -0,0 +1,258 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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.
+//
+
+#include <muleunit/test.h>
+
+#include "StaticFs.h"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <fstream>
+#include <string>
+#include <vector>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#ifdef _WIN32
+#include <direct.h>
+#include <io.h>
+#include <process.h>
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
+
+using namespace muleunit;
+using namespace webapi;
+
+namespace
+{
+
+// Per-test scratch dir. POSIX uses mkdtemp(); Windows builds a unique name under %TEMP%. Created
+// empty; callers populate it and must call RemoveAll() at the end of the test, muleunit's
+// DECLARE_SIMPLE having no TearDown hook.
+std::string MakeScratchRoot(const char *tag)
+{
+#ifdef _WIN32
+	char tmpMAX_PATH;
+	DWORD n = GetTempPathA(MAX_PATH, tmp);
+	std::string base(tmp, n);
+	std::string dir = base + "amule-staticfs-" + tag + "-" + std::to_string(static_cast<long>(_getpid()));
+	_mkdir(dir.c_str());
+	return dir;
+#else
+	std::string tpl = "/tmp/amule-staticfs-";
+	tpl += tag;
+	tpl += "-XXXXXX";
+	std::vector<char> buf(tpl.begin(), tpl.end());
+	buf.push_back('\0');
+	if (!mkdtemp(buf.data()))
+		return std::string();
+	return std::string(buf.data());
+#endif
+}
+
+bool MkSubdir(const std::string &path)
+{
+#ifdef _WIN32
+	return _mkdir(path.c_str()) == 0;
+#else
+	return mkdir(path.c_str(), 0755) == 0;
+#endif
+}
+
+// Write a single-byte file. The content is not load-bearing for these tests -- they only verify the
+// resolver's accept/reject decision and the resolved path, not the file body.
+bool WriteFile(const std::string &path, const std::string &body)
+{
+	std::ofstream f(path.c_str(), std::ios::binary);
+	if (!f.is_open())
+		return false;
+	f << body;
+	return f.good();
+}
+
+void RemoveAll(const std::string &path)
+{
+	// Recursive rm via system(); test-scratch only, never on real
+	// data. Quote the path to survive spaces / odd chars in $TMPDIR.
+#ifdef _WIN32
+	std::string cmd = "rmdir /S /Q \"" + path + "\" >NUL 2>&1";
+#else
+	std::string cmd = "rm -rf \"" + path + "\" 2>/dev/null";
+#endif
+	(void)std::system(cmd.c_str());
+}
+
+} // namespace
+
+DECLARE_SIMPLE(StaticFs)
+
+// Plain accept paths -- file exists inside root.
+
+TEST(StaticFs, FileAtRootResolvesAndReturnsTrue)
+{
+	const std::string root = MakeScratchRoot("file-at-root");
+	ASSERT_TRUE(!root.empty());
+	const std::string asset = root + "/index.html";
+	ASSERT_TRUE(WriteFile(asset, "x"));
+
+	std::string out;
+	ASSERT_TRUE(ResolveWithinRoot(root, "index.html", out));
+	// Trailing separator is stripped by the resolver -- strict equality
+	// against the file path is the cleanest check.
+	ASSERT_TRUE(out.size() >= asset.size() - 1);
+
+	RemoveAll(root);
+}
+
+TEST(StaticFs, RootWithTrailingSlashResolves)
+{
+	// Regression: Windows _fullpath() preserves a trailing slash from its input, which
+	// previously broke the prefix-comparison containment check. AMULEAPI_STATIC_DIR is baked
+	// with a trailing slash (cmake convention for dirs) so the bug shipped to every installed
+	// amuleapi binary until normalised here.
+	const std::string root = MakeScratchRoot("trailing-slash");
+	ASSERT_TRUE(!root.empty());
+	ASSERT_TRUE(WriteFile(root + "/index.html", "x"));
+
+	std::string out;
+	ASSERT_TRUE(ResolveWithinRoot(root + "/", "index.html", out));
+
+	RemoveAll(root);
+}
+
+TEST(StaticFs, NestedFileResolvesAndReturnsTrue)
+{
+	const std::string root = MakeScratchRoot("nested");
+	ASSERT_TRUE(!root.empty());
+	ASSERT_TRUE(MkSubdir(root + "/assets"));
+	ASSERT_TRUE(WriteFile(root + "/assets/app.js", "y"));
+
+	std::string out;
+	ASSERT_TRUE(ResolveWithinRoot(root, "assets/app.js", out));
+
+	RemoveAll(root);
+}
+
+// Reject paths -- an opaque false return for any failure mode, so the dispatcher can map every miss
+// to the same 404.
+
+TEST(StaticFs, MissingFileReturnsFalse)
+{
+	const std::string root = MakeScratchRoot("missing");
+	ASSERT_TRUE(!root.empty());
+
+	std::string out;
+	ASSERT_TRUE(!ResolveWithinRoot(root, "not-there.html", out));
+
+	RemoveAll(root);
+}
+
+TEST(StaticFs, MissingRootReturnsFalse)
+{
+	std::string out;
+	ASSERT_TRUE(!ResolveWithinRoot("/this/path/should/not/exist/amuleapi-test", "index.html", out));
+}
+
+TEST(StaticFs, ParentEscapeRejectedEvenIfTargetExists)
+{
+	// Set up two sibling dirs under a common parent: `root/` and `outside/`, with
+	// `outside/secret.txt` existing. A request for `../outside/secret.txt` under `root` must be
+	// rejected even though the file is real and stat'able -- the canonical resolution would
+	// land outside root.
+	const std::string parent = MakeScratchRoot("parent-escape");
+	ASSERT_TRUE(!parent.empty());
+	const std::string root = parent + "/root";
+	const std::string outside = parent + "/outside";
+	ASSERT_TRUE(MkSubdir(root));
+	ASSERT_TRUE(MkSubdir(outside));
+	ASSERT_TRUE(WriteFile(outside + "/secret.txt", "pwn"));
+
+	std::string out;
+	ASSERT_TRUE(!ResolveWithinRoot(root, "../outside/secret.txt", out));
+
+	RemoveAll(parent);
+}
+
+// Symlink containment -- the security-critical case the resolver exists for. POSIX only: Windows
+// symlinks require elevation and _fullpath() is lexical-only, so symlink behaviour is not part of
+// the Windows wire contract.
+
+#ifndef _WIN32
+TEST(StaticFs, SymlinkEscapingRootIsRejected)
+{
+	const std::string parent = MakeScratchRoot("symlink-escape");
+	ASSERT_TRUE(!parent.empty());
+	const std::string root = parent + "/root";
+	const std::string outside = parent + "/outside";
+	ASSERT_TRUE(MkSubdir(root));
+	ASSERT_TRUE(MkSubdir(outside));
+	ASSERT_TRUE(WriteFile(outside + "/secret.txt", "pwn"));
+	// Plant a symlink INSIDE root that points OUTSIDE root.
+	const std::string link = root + "/leak.txt";
+	ASSERT_TRUE(symlink((outside + "/secret.txt").c_str(), link.c_str()) == 0);
+
+	std::string out;
+	ASSERT_TRUE(!ResolveWithinRoot(root, "leak.txt", out));
+
+	RemoveAll(parent);
+}
+
+TEST(StaticFs, SymlinkPointingInsideRootIsAccepted)
+{
+	// Sanity: not every symlink is an attack. A link from one file in
+	// root to another file in root resolves cleanly and must be served.
+	const std::string root = MakeScratchRoot("symlink-inside");
+	ASSERT_TRUE(!root.empty());
+	ASSERT_TRUE(WriteFile(root + "/real.txt", "ok"));
+	const std::string link = root + "/alias.txt";
+	ASSERT_TRUE(symlink((root + "/real.txt").c_str(), link.c_str()) == 0);
+
+	std::string out;
+	ASSERT_TRUE(ResolveWithinRoot(root, "alias.txt", out));
+
+	RemoveAll(root);
+}
+#endif // !_WIN32
+
+// IsDir -- the tiny stat wrapper the discovery chain uses. The trailing-slash tolerance matters for
+// the configure-time AMULEAPI_STATIC_DIR macro, which is set with a trailing slash for
+// concatenation with sub-paths.
+
+TEST(StaticFs, IsDirTrueForExistingDirectory)
+{
+	const std::string root = MakeScratchRoot("isdir-yes");
+	ASSERT_TRUE(!root.empty());
+	ASSERT_TRUE(IsDir(root));
+	ASSERT_TRUE(IsDir(root + "/")); // trailing slash tolerated
+
+	RemoveAll(root);
+}
+
+TEST(StaticFs, IsDirFalseForFile)
+{
+	const std::string root = MakeScratchRoot("isdir-file");
+	ASSERT_TRUE(!root.empty());
+	const std::string file = root + "/just-a-file.txt";
+	ASSERT_TRUE(WriteFile(file, "x"));
+
+	ASSERT_TRUE(!IsDir(file));
+
+	RemoveAll(root);
+}
+
+TEST(StaticFs, IsDirFalseForMissingPath)
+{
+	ASSERT_TRUE(!IsDir("/path/that/should/not/exist/under/test"));
+	ASSERT_TRUE(!IsDir(""));
+}

amule-3.0.1.tar.gz/unittests/tests/StringFunctionsTest.cpp -> amule-3.1.0.tar.gz/unittests/tests/StringFunctionsTest.cpp Changed

@@ -5,40 +5,40 @@
 
 DECLARE_SIMPLE(StringFunctions)
 
-
 ///////////////////////////////////////////////////////////
 // Tests for the FuzzyStrCmp function
 
 //! Returns the number of items in an array.
-#define itemsof(x) (sizeof(x)/sizeof(x0))
+#define itemsof(x) (sizeof(x) / sizeof(x0))
 
 TEST(StringFunctions, FuzzyStrCmp)
 {
-	struct FuzzyTest {
-		const char* a;
-		const char* b;
+	struct FuzzyTest
+	{
+		const char *a;
+		const char *b;
 		int expected;
 	};
 
 	FuzzyTest checks = {
-		{ "a (10)",	"a (2)",		 1},
-		{ "a (10)",	"b (2)",		-1},
-		{ "c3 (7)",	"c3 (12)",		-1},
-		{ "c3 (12)",	"c3 (7)",		 1},
-		{ "c3 12d",	"c3 12d",		 0},
-		{ "a (10)  ",	"a (2)  ",		 1},
-		{ "a (10)  ",	"b (2)  ",		-1},
-		{ "  c3 (7)",	"  c3 (12)",	-1},
-		{ "  c3 (12)",	"  c3 (7)",	 1},
-		{ "c3 12d",	"c3 12d",		 0},
-		{ "",		"",		 0},
-		{ "",		"c3 12d",		-1},
-		{ "c3 12d",	"",		 1},
-		{ " ",		"c3 12d",		-1},
-		{ "c3 12d",	" ",		 1},
-		{ "17.10",		"17.2",		 1},
-		{ "  c3 (a)",	"  c3 (12)",	 1},
-		{ "  c3 (12)",	"  c3 (a)",	-1},
+		{ "a (10)", "a (2)", 1 },
+		{ "a (10)", "b (2)", -1 },
+		{ "c3 (7)", "c3 (12)", -1 },
+		{ "c3 (12)", "c3 (7)", 1 },
+		{ "c3 12d", "c3 12d", 0 },
+		{ "a (10)  ", "a (2)  ", 1 },
+		{ "a (10)  ", "b (2)  ", -1 },
+		{ "  c3 (7)", "  c3 (12)", -1 },
+		{ "  c3 (12)", "  c3 (7)", 1 },
+		{ "c3 12d", "c3 12d", 0 },
+		{ "", "", 0 },
+		{ "", "c3 12d", -1 },
+		{ "c3 12d", "", 1 },
+		{ " ", "c3 12d", -1 },
+		{ "c3 12d", " ", 1 },
+		{ "17.10", "17.2", 1 },
+		{ "  c3 (a)", "  c3 (12)", 1 },
+		{ "  c3 (12)", "  c3 (a)", -1 },
 	};
 
 	for (size_t i = 0; i < itemsof(checks); ++i) {
@@ -49,13 +49,11 @@
 	}
 }
 
-
 ///////////////////////////////////////////////////////////
 // Tests for the CSimpleParser class
 
 DECLARE_SIMPLE(SimpleParser)
 
-
 TEST(SimpleParser, Constructor)
 {
 	// Empty strings are acceptable and should just return an empty string
@@ -77,7 +75,6 @@
 	}
 }
 
-
 TEST(SimpleParser, EmptyTokens)
 {
 	{
@@ -143,7 +140,6 @@
 	}
 }
 
-
 TEST(SimpleParser, NormalTokens)
 {
 	CSimpleTokenizer tkz("a c", ' ');
@@ -167,3 +163,71 @@
 	ASSERT_EQUALS(1u, tkz.tokenCount());
 }
 
+///////////////////////////////////////////////////////////
+// Tests for UnescapeHTML
+
+TEST(StringFunctions, UnescapeHTMLPlainAscii)
+{
+	ASSERT_EQUALS("some file name.avi", UnescapeHTML("some%20file%20name.avi"));
+	ASSERT_EQUALS("a|b", UnescapeHTML("a%7Cb"));
+	// An escape that is not two hex digits is left exactly as it stands.
+	ASSERT_EQUALS("100%25 sure", UnescapeHTML("100%2525%20sure"));
+	ASSERT_EQUALS("50% off", UnescapeHTML("50%%20off"));
+}
+
+// Regression: the escapes were located by byte offset in a UTF-8 buffer but read by character
+// offset out of the wxString, so one multi-byte character desynchronised the two and every
+// following escape decoded from the wrong place -- injecting stray bytes (a newline, here) and
+// leaving the real escapes untouched. An eD2k link whose filename had an accent came out of
+// CED2KFileLink split in half.
+TEST(StringFunctions, UnescapeHTMLAfterNonAsciiCharacter)
+{
+	const wxString escaped =
+		wxString::FromUTF8("Une%20beaut\xC3\xA9%20faite%20au%20naturel%20-%20Part%202.mkv");
+	const wxString expected = wxString::FromUTF8("Une beaut\xC3\xA9 faite au naturel - Part 2.mkv");
+
+	ASSERT_EQUALS(expected, UnescapeHTML(escaped));
+}
+
+TEST(StringFunctions, UnescapeHTMLKeepsNonAsciiWithoutEscapes)
+{
+	const wxString name = wxString::FromUTF8("caf\xC3\xA9 \xE6\x97\xA5\xE6\x9C\xAC.mkv");
+
+	ASSERT_EQUALS(name, UnescapeHTML(name));
+}
+
+// A '%' whose next two bytes are not hex digits at all -- here the start of a UTF-8 sequence -- has
+// to survive as a literal, without tripping a debug assertion on the way.
+TEST(StringFunctions, UnescapeHTMLPercentBeforeNonAscii)
+{
+	const wxString name = wxString::FromUTF8("100%\xC3\xA9.mkv");
+
+	ASSERT_EQUALS(name, UnescapeHTML(name));
+}
+
+// Issue #873: Chromium refuses to open an ed2k:// URL holding a literal '|', so links are published
+// and copied with the delimiters percent-encoded, and CED2KLink::CreateLinkFromUrl retries through
+// this helper.
+TEST(StringFunctions, RestoreEncodedPipesHandlesBothCases)
+{
+	ASSERT_EQUALS(wxString("ed2k://|file|a.iso|1|H|/"),
+		RestoreEncodedPipes("ed2k://%7Cfile%7Ca.iso%7C1%7CH%7C/"));
+	ASSERT_EQUALS(wxString("ed2k://|file|a.iso|1|H|/"),
+		RestoreEncodedPipes("ed2k://%7cfile%7ca.iso%7c1%7cH%7c/"));
+}
+
+// A link that a mail client only half-encoded still has to come out whole.
+TEST(StringFunctions, RestoreEncodedPipesHandlesMixedSpellings)
+{
+	ASSERT_EQUALS(wxString("a|b|c"), RestoreEncodedPipes("a%7Cb|c"));
+}
+
+// Only the delimiters are its business: every other escape belongs to the filename, which
+// UnescapeHTML decodes later, and decoding it here would double-decode a name containing a literal
+// '%'.
+TEST(StringFunctions, RestoreEncodedPipesLeavesOtherEscapesAlone)
+{
+	ASSERT_EQUALS(wxString("a|b%20c%2F"), RestoreEncodedPipes("a%7Cb%20c%2F"));
+	ASSERT_EQUALS(wxString("nothing to do"), RestoreEncodedPipes("nothing to do"));
+	ASSERT_EQUALS(wxEmptyString, RestoreEncodedPipes(wxEmptyString));
+}

amule-3.0.1.tar.gz/unittests/tests/TextFileTest.cpp -> amule-3.1.0.tar.gz/unittests/tests/TextFileTest.cpp Changed

@@ -8,13 +8,9 @@
 
 DECLARE_SIMPLE(TextFile)
 
-const char* g_filesDefault = {
-	"TextFileTest_dos.txt",
-	"TextFileTest_unix.txt"
-};
-
+const char *g_filesDefault = { "TextFileTest_dos.txt", "TextFileTest_unix.txt" };
 
-wxString ArrToStr(const wxArrayString& arr)
+wxString ArrToStr(const wxArrayString &arr)
 {
 	wxString str = "";
 
@@ -31,15 +27,12 @@
 	return str;
 }
 
-
-wxString ArrToStr(size_t count, const char* arr)
+wxString ArrToStr(size_t count, const char *arr)
 {
 	return ArrToStr(wxArrayString(count, arr));
 }
 
-
-
-void CompareReadLines(size_t count, const char* expected, EReadTextFile criteria)
+void CompareReadLines(size_t count, const char *expected, EReadTextFile criteria)
 {
 	CTextFile file;
 	ASSERT_FALSE(file.IsOpened());
@@ -47,7 +40,9 @@
 	for (size_t j = 0; j < ArraySize(g_filesDefault); ++j) {
 		CONTEXT(wxString("Checking file: ") + g_filesDefaultj);
 
-		ASSERT_TRUE(file.Open(CPath(wxSTRINGIZE_T(SRCDIR)).JoinPaths(CPath(g_filesDefaultj)).GetRaw(), CTextFile::read));
+		ASSERT_TRUE(
+			file.Open(CPath(wxSTRINGIZE_T(SRCDIR)).JoinPaths(CPath(g_filesDefaultj)).GetRaw(),
+				CTextFile::read));
 
 		wxArrayString lines = file.ReadLines(criteria);
 
@@ -58,8 +53,6 @@
 	ASSERT_TRUE(file.Eof());
 };
 
-
-
 TEST(TextFile, ReadLines)
 {
 	ASSERT_TRUE(CPath::DirExists(wxSTRINGIZE_T(SRCDIR)));
@@ -67,7 +60,7 @@
 	{
 		CONTEXT("Checking default parameters");
 
-		const char* lines = {
+		const char *lines = {
 			"abc",
 			"def ghi",
 			"xyz",
@@ -79,17 +72,8 @@
 	{
 		CONTEXT("Checking without criteria");
 
-		const char* lines = {
-			" # comment",
-			"abc",
-			"# foo bar",
-			" ",
-			"def ghi ",
-			"",
-			"# xyz",
-			" xyz",
-			" ",
-			""
+		const char *lines = {
+			" # comment", "abc", "# foo bar", " ", "def ghi ", "", "# xyz", " xyz", " ", ""
 		};
 
 		CompareReadLines(ArraySize(lines), lines, (EReadTextFile)0);
@@ -98,7 +82,7 @@
 	{
 		CONTEXT("Checking txtIgnoreEmptyLines");
 
-		const char* lines = {
+		const char *lines = {
 			" # comment",
 			"abc",
 			"# foo bar",
@@ -115,15 +99,7 @@
 	{
 		CONTEXT("Checking txtIgnoreComments");
 
-		const char* lines = {
-			"abc",
-			" ",
-			"def ghi ",
-			"",
-			" xyz",
-			" ",
-			""
-		};
+		const char *lines = { "abc", " ", "def ghi ", "", " xyz", " ", "" };
 
 		CompareReadLines(ArraySize(lines), lines, txtIgnoreComments);
 	}
@@ -131,29 +107,19 @@
 	{
 		CONTEXT("Checking txtStripWhitespace");
 
-		const char* lines = {
-			"# comment",
-			"abc",
-			"# foo bar",
-			"",
-			"def ghi",
-			"",
-			"# xyz",
-			"xyz",
-			"",
-			""
+		const char *lines = {
+			"# comment", "abc", "# foo bar", "", "def ghi", "", "# xyz", "xyz", "", ""
 		};
 
 		CompareReadLines(ArraySize(lines), lines, txtStripWhitespace);
 	}
 }
 
-
 class TextFileTest : public Test
 {
 public:
 	TextFileTest()
-		: Test("TextFile", "WriteLines")
+	: Test("TextFile", "WriteLines")
 	{
 	}
 
@@ -163,27 +129,14 @@
 		if (path.FileExists()) {
 			ASSERT_TRUE(CPath::RemoveFile(path));
 		}
-
 	}
 
-	virtual void tearDown()
-	{
-		setUp();
-	}
+	virtual void tearDown() { setUp(); }
 
 	virtual void run()
 	{
-		const char* lines = {
-			" # comment",
-			"abc",
-			"# foo bar",
-			" ",
-			"def ghi ",
-			"",
-			"# xyz",
-			" xyz",
-			" ",
-			""
+		const char *lines = {
+			" # comment", "abc", "# foo bar", " ", "def ghi ", "", "# xyz", " xyz", " ", ""
 		};
 
 		{

amule-3.1.0.tar.gz/unittests/tests/TrackedClientRecordTest.cpp Added

@@ -0,0 +1,77 @@
+// This file is part of the aMule Project.
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+// Licensed under the GNU General Public License, version 2 or later.
+
+#include <muleunit/test.h>
+#include "TrackedClientRecord.h"
+
+using namespace muleunit;
+
+static CNetworkAddress IPv6(uint8_t suffix)
+{
+	CNetworkAddress::Octets bytes{};
+	bytes0 = 0x20;
+	bytes1 = 0x01;
+	bytes15 = suffix;
+	return CNetworkAddress::IPv6FromOctets(bytes);
+}
+
+static CNetworkAddress MappedIPv4()
+{
+	CNetworkAddress::Octets bytes{};
+	bytes10 = bytes11 = 0xff;
+	bytes12 = 192;
+	bytes14 = 2;
+	bytes15 = 1;
+	return CNetworkAddress::IPv6FromOctets(bytes);
+}
+
+DECLARE_SIMPLE(TrackedClientRecord)
+
+TEST(TrackedClientRecord, TrackedIPv6EndpointsKeepSeparateHashes)
+{
+	CTrackedClientRecord record;
+	int first, second;
+	ASSERT_TRUE(record.Add(IPv6(1), 4662, &first, 100));
+	ASSERT_TRUE(record.Add(IPv6(2), 4662, &second, 100));
+	ASSERT_TRUE(record.Compare(IPv6(1), 4662, &first));
+	ASSERT_FALSE(record.Compare(IPv6(1), 4662, &second));
+	ASSERT_TRUE(record.Compare(IPv6(2), 4662, &second));
+	ASSERT_FALSE(record.Compare(IPv6(2), 4662, &first));
+	ASSERT_TRUE(record.Compare(IPv6(1), 4663, &second));
+}
+
+TEST(TrackedClientRecord, TrackedMappedAndPlainIPv4ShareHistory)
+{
+	CTrackedClientRecord record;
+	int first, second;
+	const auto plain = CNetworkAddress::FromIPv4NetworkOrder(0x010200c0);
+	ASSERT_TRUE(record.Add(MappedIPv4(), 4662, &first, 100));
+	ASSERT_TRUE(record.Compare(plain, 4662, &first));
+	ASSERT_FALSE(record.Compare(plain, 4662, &second));
+	ASSERT_TRUE(record.Add(plain, 4662, &second, 200));
+	ASSERT_TRUE(record.Compare(MappedIPv4(), 4662, &second));
+	ASSERT_FALSE(record.Compare(MappedIPv4(), 4662, &first));
+}
+
+TEST(TrackedClientRecord, TrackedAbsenceNeverStoresHistory)
+{
+	CTrackedClientRecord record;
+	int first, second;
+	ASSERT_FALSE(record.Add(CNetworkAddress::Absent(), 4662, &first, 100));
+	ASSERT_TRUE(record.Compare(CNetworkAddress::Absent(), 4662, &second));
+	ASSERT_TRUE(record.Add(IPv6(1), 4662, &first, 100));
+	ASSERT_TRUE(record.Compare(CNetworkAddress::Absent(), 4662, &second));
+}
+
+TEST(TrackedClientRecord, TrackedRefreshAndExpiryPreserveLegacyBoundaries)
+{
+	CTrackedClientRecord record;
+	int first, second;
+	record.Add(IPv6(1), 4662, &first, 100);
+	record.Add(IPv6(1), 4663, &second, 200);
+	record.DropLapsed(300, 100);
+	ASSERT_FALSE(record.Compare(IPv6(1), 4662, &second));
+	record.DropLapsed(301, 100);
+	ASSERT_TRUE(record.Compare(IPv6(1), 4662, &second));
+}

amule-3.1.0.tar.gz/unittests/tests/UploadQueueAddressPolicyTest.cpp Added

@@ -0,0 +1,94 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include "UploadQueueAddressPolicy.h"
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(UploadQueueAddressPolicy)
+
+TEST(UploadQueueAddressPolicy, MatchesNativeIPv6Exactly)
+{
+	const auto peer = CNetworkAddress::FromString("2001:db8::1");
+	ASSERT_TRUE(UploadQueueAddressPolicy::Matches(peer, peer));
+	ASSERT_FALSE(UploadQueueAddressPolicy::Matches(peer, CNetworkAddress::FromString("2001:db8::2")));
+}
+
+TEST(UploadQueueAddressPolicy, MatchesMappedIPv4AsCanonicalIPv4)
+{
+	const auto mapped = CNetworkAddress::FromString("::ffff:192.0.2.7");
+	const auto plain = CNetworkAddress::FromString("192.0.2.7");
+	ASSERT_TRUE(UploadQueueAddressPolicy::Matches(mapped, plain));
+}
+
+TEST(UploadQueueAddressPolicy, MatchesRateLimitScopeWithinIpv6Prefix)
+{
+	ASSERT_TRUE(UploadQueueAddressPolicy::MatchesRateLimitScope(
+		CNetworkAddress::FromString("2001:db8:1:2::1"),
+		CNetworkAddress::FromString("2001:db8:1:2::ffff")));
+	ASSERT_FALSE(UploadQueueAddressPolicy::MatchesRateLimitScope(
+		CNetworkAddress::FromString("2001:db8:1:2::1"),
+		CNetworkAddress::FromString("2001:db8:1:3::1")));
+}
+
+TEST(UploadQueueAddressPolicy, RejectsAbsentAndUnspecifiedAddresses)
+{
+	const CNetworkAddress absent;
+	const auto unspecified = CNetworkAddress::FromString("::");
+	const auto peer = CNetworkAddress::FromString("2001:db8::1");
+
+	ASSERT_FALSE(UploadQueueAddressPolicy::Matches(absent, peer));
+	ASSERT_FALSE(UploadQueueAddressPolicy::Matches(unspecified, peer));
+	ASSERT_FALSE(UploadQueueAddressPolicy::Matches(peer, absent));
+
+	// The cases the guard exists for. Two addresses that name nobody are not the same
+	// peer, and without these the assertions above pass on plain inequality alone:
+	// removing the guard leaves every one of them true and the test still green.
+	ASSERT_FALSE(UploadQueueAddressPolicy::Matches(absent, absent));
+	ASSERT_FALSE(UploadQueueAddressPolicy::Matches(unspecified, unspecified));
+	ASSERT_FALSE(UploadQueueAddressPolicy::MatchesRateLimitScope(absent, absent));
+	ASSERT_FALSE(UploadQueueAddressPolicy::MatchesRateLimitScope(unspecified, unspecified));
+	ASSERT_FALSE(UploadQueueAddressPolicy::IsMatchable(absent));
+	ASSERT_FALSE(UploadQueueAddressPolicy::IsMatchable(unspecified));
+}
+
+// A /64 means "one subscriber" only where one was delegated. Link-local addresses all sit
+// under fe80::/64 and NAT64 hosts under one /96, so counting those together would hand a
+// whole LAN, or a whole translated site, the budget of a single customer.
+TEST(UploadQueueAddressPolicy, RateLimitScopeAggregatesOnlyDelegatedPrefixes)
+{
+	ASSERT_FALSE(UploadQueueAddressPolicy::MatchesRateLimitScope(
+		CNetworkAddress::FromString("fe80::1"), CNetworkAddress::FromString("fe80::2")));
+	ASSERT_FALSE(UploadQueueAddressPolicy::MatchesRateLimitScope(
+		CNetworkAddress::FromString("64:ff9b::1"), CNetworkAddress::FromString("64:ff9b::2")));
+	ASSERT_TRUE(UploadQueueAddressPolicy::MatchesRateLimitScope(
+		CNetworkAddress::FromString("fe80::1"), CNetworkAddress::FromString("fe80::1")));
+
+	// Unchanged where it is the point: rotating inside a delegated /64 still counts as one.
+	ASSERT_TRUE(UploadQueueAddressPolicy::MatchesRateLimitScope(
+		CNetworkAddress::FromString("2001:db8:1:2::1"),
+		CNetworkAddress::FromString("2001:db8:1:2::dead:beef")));
+}

amule-3.1.0.tar.gz/unittests/tests/UtpAdmissionTest.cpp Added

amule-3.1.0.tar.gz/unittests/tests/UtpContextTest.cpp Added

@@ -0,0 +1,434 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+#include "UtpContext.h"
+#include "Packet.h"
+#include "libs/common/Format.h"
+#include <vector>
+
+using namespace muleunit;
+DECLARE_SIMPLE(UtpContext)
+
+namespace
+{
+struct State
+{
+	int creates = 0, destroys = 0, receives = 0, acks = 0, timeouts = 0;
+	bool claimed = true, createSucceeds = true;
+	uint32_t ip = 0;
+	uint16_t port = 0;
+	std::vector<uint8_t> payload;
+	IUtpDatagramSink *sink = nullptr;
+	IUtpStreamAcceptor *acceptor = nullptr;
+	CUtpPeerRegistry registered;
+};
+
+class CFakeAcceptor : public IUtpStreamAcceptor
+{
+public:
+	bool AcceptStream(std::unique_ptr<IStreamTransport> &, uint32_t, uint16_t) override { return false; }
+};
+
+class FakeLibrary : public IUtpLibrary
+{
+public:
+	explicit FakeLibrary(State &state)
+	: s(state)
+	{
+	}
+	bool Create(IUtpDatagramSink &sink) override
+	{
+		++s.creates;
+		s.sink = &sink;
+		return s.createSucceeds;
+	}
+	void SetAcceptor(IUtpStreamAcceptor *acceptor) override { s.acceptor = acceptor; }
+	bool HasRegisteredPeer(uint32_t ip, uint16_t port) const override
+	{
+		return s.registered.Has(ip, port);
+	}
+	void Destroy() override
+	{
+		++s.destroys;
+		s.payload.clear();
+		s.sink = nullptr;
+	}
+	bool ProcessDatagram(const uint8_t *data, size_t len, uint32_t ip, uint16_t port) override
+	{
+		++s.receives;
+		s.payload.assign(data, data + len);
+		s.ip = ip;
+		s.port = port;
+		return s.claimed;
+	}
+	void IssueDeferredAcks() override { ++s.acks; }
+	void CheckTimeouts() override { ++s.timeouts; }
+
+private:
+	State &s;
+};
+
+class Sink : public IUtpDatagramSink
+{
+public:
+	std::vector<uint8_t> wire, peerHash, sentHash;
+	uint32_t ip = 0;
+	uint16_t port = 0;
+	bool encrypted = true, kad = true, hasHash = true;
+	uint32_t key = 1;
+	void SendUtpDatagram(const uint8_t *data,
+		size_t len,
+		uint32_t address,
+		uint16_t service,
+		bool encrypt,
+		const uint8_t *userHash) override
+	{
+		// The caller's parameters win when it supplies them; the peerHash
+		// member is the older per-sink default these cases were written around.
+		const bool obfuscate = encrypt || !peerHash.empty();
+		const uint8_t *hash = encrypt ? userHash : (peerHash.empty() ? nullptr : peerHash.data());
+		QueueUtpDatagram<CPacket>(*this, data, len, address, service, obfuscate, hash);
+	}
+	void SendPacket(CPacket *raw,
+		uint32_t address,
+		uint16_t service,
+		bool encrypt,
+		const uint8_t *hash,
+		bool isKad,
+		uint32_t verifyKey)
+	{
+		std::unique_ptr<CPacket> packet(raw);
+		wire.assign(packet->GetUDPHeader(), packet->GetUDPHeader() + 2);
+		wire.insert(wire.end(),
+			packet->GetDataBuffer(),
+			packet->GetDataBuffer() + packet->GetPacketSize());
+		ip = address;
+		port = service;
+		encrypted = encrypt;
+		kad = isKad;
+		hasHash = hash != nullptr;
+		sentHash.clear();
+		if (hash) {
+			sentHash.assign(hash, hash + 16);
+		}
+		key = verifyKey;
+	}
+};
+} // namespace
+
+TEST(UtpContext, ClassifiedPayloadAndClaimArePreserved)
+{
+	State state;
+	Sink sink;
+	CUtpContext context(std::make_unique<FakeLibrary>(state), sink);
+	const uint8_t wire = { 0xB2, 0x00, 0x41, 0x00, 0xFF, 0xB2 };
+	const auto frame = ClassifyReservedProt2Frame(wire + 1, sizeof(wire) - 1);
+	ASSERT_TRUE(ProcessUtpFrame(context, frame, 0x04030201, 4665));
+	ASSERT_EQUALS(4, (int)state.payload.size());
+	for (size_t i = 0; i < state.payload.size(); ++i) {
+		ASSERT_EQUALS((int)wirei + 2, (int)state.payloadi);
+	}
+	ASSERT_EQUALS(0x04030201u, state.ip);
+	ASSERT_EQUALS(4665, (int)state.port);
+	state.claimed = false;
+	ASSERT_FALSE(ProcessUtpFrame(context, frame, state.ip, state.port));
+	ASSERT_EQUALS(1, state.creates);
+}
+
+TEST(UtpContext, OtherTypesNeverReachLibrary)
+{
+	State state;
+	Sink sink;
+	CUtpContext context(std::make_unique<FakeLibrary>(state), sink);
+	for (unsigned type = 1; type <= 255; ++type) {
+		const uint8_t frame = { static_cast<uint8_t>(type), 0x41 };
+		ASSERT_FALSE(
+			ProcessUtpFrame(context, ClassifyReservedProt2Frame(frame, sizeof(frame)), 1, 2));
+	}
+	ASSERT_FALSE(ProcessUtpFrame(context, ClassifyReservedProt2Frame(nullptr, 0), 1, 2));
+	ASSERT_EQUALS(0, state.creates);
+	ASSERT_EQUALS(0, state.receives);
+}
+
+TEST(UtpContext, LibrarySendIsPlaintextWhenNoPeerKnown)
+{
+	State state;
+	Sink sink;
+	CUtpContext context(std::make_unique<FakeLibrary>(state), sink);
+	ASSERT_TRUE(context.Configure());
+	const uint8_t payload = { 0x41, 0x00, 0xFF, 0xB2 };
+	state.sink->SendUtpDatagram(payload, sizeof(payload), 0x04030201, 65535, false, nullptr);
+	ASSERT_EQUALS(6, (int)sink.wire.size());
+	ASSERT_EQUALS(0xB2, (int)sink.wire0);
+	ASSERT_EQUALS(0x00, (int)sink.wire1);
+	for (size_t i = 0; i < sizeof(payload); ++i) {
+		ASSERT_EQUALS((int)payloadi, (int)sink.wirei + 2);
+	}
+	ASSERT_EQUALS(0x04030201u, sink.ip);
+	ASSERT_EQUALS(65535, (int)sink.port);
+	ASSERT_FALSE(sink.encrypted);
+	ASSERT_FALSE(sink.kad);
+	ASSERT_FALSE(sink.hasHash);
+	ASSERT_EQUALS(0u, sink.key);
+}
+
+TEST(UtpContext, LibrarySendIsEncryptedWithHashWhenPeerKnown)
+{
+	State state;
+	Sink sink;
+	sink.peerHash = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
+	CUtpContext context(std::make_unique<FakeLibrary>(state), sink);
+	ASSERT_TRUE(context.Configure());
+	const uint8_t payload = { 0x41, 0x00, 0xFF, 0xB2 };
+	state.sink->SendUtpDatagram(payload, sizeof(payload), 0x04030201, 65535, false, nullptr);
+	ASSERT_EQUALS(6, (int)sink.wire.size());
+	ASSERT_EQUALS(0xB2, (int)sink.wire0);
+	ASSERT_EQUALS(0x00, (int)sink.wire1);
+	for (size_t i = 0; i < sizeof(payload); ++i) {
+		ASSERT_EQUALS((int)payloadi, (int)sink.wirei + 2);
+	}
+	ASSERT_EQUALS(0x04030201u, sink.ip);
+	ASSERT_EQUALS(65535, (int)sink.port);
+	ASSERT_TRUE(sink.encrypted);
+	ASSERT_TRUE(sink.hasHash);
+	ASSERT_TRUE(sink.sentHash == sink.peerHash);
+	ASSERT_FALSE(sink.kad);
+	ASSERT_EQUALS(0u, sink.key);
+}
+
+TEST(UtpContext, ProcessingIssuesDeferredAcksWithoutTick)
+{
+	State state;
+	Sink sink;
+	CUtpContext context(std::make_unique<FakeLibrary>(state), sink);
+	const uint8_t payload = { 0x41 };
+	ASSERT_TRUE(context.ProcessDatagram(payload, sizeof(payload), 1, 2));
+	ASSERT_EQUALS(1, state.acks);
+	ASSERT_EQUALS(0, state.timeouts);
+	state.claimed = false;
+	ASSERT_FALSE(context.ProcessDatagram(payload, sizeof(payload), 1, 2));
+	ASSERT_EQUALS(2, state.acks);
+	ASSERT_EQUALS(0, state.timeouts);
+}
+
+TEST(UtpContext, TickAndCloseAbandonStateUntilNextDatagram)
+{
+	State state;
+	Sink sink;
+	{
+		CUtpContext context(std::make_unique<FakeLibrary>(state), sink);
+		context.Tick();
+		ASSERT_EQUALS(0, state.creates);
+		ASSERT_EQUALS(0, state.acks);
+		const uint8_t payload = { 0x41 };
+		ASSERT_TRUE(context.ProcessDatagram(payload, sizeof(payload), 1, 2));
+		context.Tick();
+		ASSERT_EQUALS(2, state.acks);
+		ASSERT_EQUALS(1, state.timeouts);
+		context.Destroy(); // The operation used by CClientUDPSocket::Close.
+		ASSERT_EQUALS(1, state.destroys);
+		ASSERT_TRUE(state.payload.empty());
+		context.Destroy();
+		context.Tick();
+		ASSERT_EQUALS(1, state.destroys);
+		ASSERT_EQUALS(2, state.acks);
+		ASSERT_EQUALS(1, state.timeouts);
+		ASSERT_TRUE(context.ProcessDatagram(payload, sizeof(payload), 3, 4));
+		ASSERT_EQUALS(2, state.creates);
+	}
+	ASSERT_EQUALS(2, state.destroys);
+}
+
+TEST(UtpContext, EmptyPayloadIsHandedToLibraryWithoutEnvelope)
+{
+	State state;
+	state.claimed = false;
+	Sink sink;
+	CUtpContext context(std::make_unique<FakeLibrary>(state), sink);
+	const uint8_t wire = { 0xB2, 0x00 };
+	ASSERT_FALSE(ProcessUtpFrame(context, ClassifyReservedProt2Frame(wire + 1, sizeof(wire) - 1), 1, 2));
+	ASSERT_EQUALS(1, state.receives);
+	ASSERT_TRUE(state.payload.empty());
+}
+
+TEST(UtpContext, OutgoingEmptyAndInvalidPayloads)
+{
+	Sink sink;
+	sink.SendUtpDatagram(nullptr, 0, 1, 2, false, nullptr);
+	ASSERT_EQUALS(2, (int)sink.wire.size());
+	ASSERT_EQUALS(0xB2, (int)sink.wire0);
+	ASSERT_EQUALS(0x00, (int)sink.wire1);
+	sink.wire.clear();
+	sink.SendUtpDatagram(nullptr, 1, 1, 2, false, nullptr);
+	ASSERT_TRUE(sink.wire.empty());
+	const uint8_t payload = { 0x41 };
+	sink.SendUtpDatagram(payload, 65506, 1, 2, false, nullptr);
+	ASSERT_TRUE(sink.wire.empty());
+}
+
+TEST(UtpContext, FailedCreationDropsWithoutMaintenance)
+{
+	State state;
+	state.createSucceeds = false;
+	Sink sink;
+	CUtpContext context(std::make_unique<FakeLibrary>(state), sink);
+	const uint8_t frame = { 0x00 };
+	ASSERT_FALSE(ProcessUtpFrame(context, ClassifyReservedProt2Frame(frame, sizeof(frame)), 1, 2));
+	context.Tick();
+	ASSERT_EQUALS(0, state.receives);
+	ASSERT_EQUALS(0, state.acks);
+	ASSERT_EQUALS(0, state.timeouts);
+}
+TEST(UtpContext, UdpSizingKeepsTheFamilyAwarenessLibutpHad)
+{
+	// libutp's own defaults branch on the address family; overriding them for the two-byte
+	// envelope must not flatten that, or an IPv6 peer gets IPv4 numbers and libutp sizes
+	// packets 20 bytes too large.
+	ASSERT_EQUALS(1392ull, UtpUdpMtu(false));
+	ASSERT_EQUALS(1222ull, UtpUdpMtu(true));
+	ASSERT_EQUALS(30ull, UtpUdpOverhead(false));
+	ASSERT_EQUALS(78ull, UtpUdpOverhead(true));
+
+	// The envelope is what the override exists for: each is libutp's own
+	// constant moved by exactly two bytes, in the direction that leaves room.
+	ASSERT_EQUALS(1402ull - kUtpEnvelopeBytes - kUtpCryptHeaderBytes, UtpUdpMtu(false));
+	ASSERT_EQUALS(1232ull - kUtpEnvelopeBytes - kUtpCryptHeaderBytes, UtpUdpMtu(true));
+	ASSERT_EQUALS(28ull + kUtpEnvelopeBytes, UtpUdpOverhead(false));
+	ASSERT_EQUALS(76ull + kUtpEnvelopeBytes, UtpUdpOverhead(true));
+}
+
+// The obfuscation header is part of the datagram too. EncryptSendClient() prepends
+// CRYPT_HEADER_WITHOUTPADDING, so a budget that counts only the envelope lets a full-size
+// encrypted packet exceed the very limit the override exists to respect. Dormant while the send
+// path is unencrypted, and the reason the two must be fixed together rather than in either order.
+TEST(UtpContext, TheUdpBudgetLeavesRoomForTheObfuscationHeader)
+{
+	ASSERT_EQUALS(8ull, kUtpCryptHeaderBytes);
+
+	// A full-size payload plus everything aMule puts in front of it still fits the number
+	// libutp was sizing against before the crypt header was accounted for.
+	ASSERT_TRUE(UtpUdpMtu(false) + kUtpEnvelopeBytes + kUtpCryptHeaderBytes <= 1402ull);
+	ASSERT_TRUE(UtpUdpMtu(true) + kUtpEnvelopeBytes + kUtpCryptHeaderBytes <= 1232ull);
+}
+
+TEST(UtpContext, FrameClassificationTable)
+{
+	// Mirrors libutp's own validity test (UTP_Version): type below ST_NUM_STATES,
+	// first extension below 3, version 1. Anything else it would not look at.
+	const struct
+	{
+		const char *label;
+		uint8_t verType;
+		uint8_t extension;
+		size_t length;
+		EUtpFrameKind expected;
+	} cases = {
+		{ "syn v1", 0x41, 0, 20, EUtpFrameKind::Syn },
+		{ "data v1", 0x01, 0, 20, EUtpFrameKind::Existing },
+		{ "fin v1", 0x11, 0, 20, EUtpFrameKind::Existing },
+		{ "state v1", 0x21, 0, 20, EUtpFrameKind::Existing },
+		{ "reset v1", 0x31, 0, 20, EUtpFrameKind::Existing },
+		{ "syn with extension 2", 0x41, 2, 20, EUtpFrameKind::Syn },
+		{ "unknown type 5", 0x51, 0, 20, EUtpFrameKind::Malformed },
+		{ "version 0", 0x40, 0, 20, EUtpFrameKind::Malformed },
+		{ "version 2", 0x42, 0, 20, EUtpFrameKind::Malformed },
+		{ "extension 3", 0x41, 3, 20, EUtpFrameKind::Malformed },
+		{ "one byte short", 0x41, 0, 19, EUtpFrameKind::Malformed },
+		{ "empty", 0x41, 0, 0, EUtpFrameKind::Malformed },
+	};
+	for (const auto &row : cases) {
+		CFormat format("%s: ver_type=0x%02x ext=%u len=%u");
+		const wxString message =
+			format % row.label % row.verType % row.extension % unsigned(row.length);
+		uint8_t frame20 = { 0 };
+		frame0 = row.verType;
+		frame1 = row.extension;
+		const uint8_t *payload = row.length == 0 ? nullptr : frame;
+		ASSERT_TRUE_M(ClassifyUtpFrame(payload, row.length) == row.expected, message);
+	}
+}
+
+TEST(UtpContext, ARegisteredPeerSurvivesOneOfItsSocketsClosing)
+{
+	// One endpoint can hold more than one socket: a peer behind a NAT reusing
+	// its source port, or a second connection opened while the first is dying.
+	// Forgetting on the first close would strand the survivor, whose traffic
+	// would then be answered with an RST as though it came from a stranger.
+	CUtpPeerRegistry registry;
+	ASSERT_FALSE(registry.Has(0x0100007F, 4672));
+
+	registry.Add(0x0100007F, 4672);
+	registry.Add(0x0100007F, 4672);
+	ASSERT_TRUE(registry.Has(0x0100007F, 4672));
+	ASSERT_EQUALS(1u, (unsigned)registry.Size());
+
+	registry.Remove(0x0100007F, 4672);
+	ASSERT_TRUE(registry.Has(0x0100007F, 4672));
+	registry.Remove(0x0100007F, 4672);
+	ASSERT_FALSE(registry.Has(0x0100007F, 4672));
+	ASSERT_EQUALS(0u, (unsigned)registry.Size());
+}
+
+TEST(UtpContext, TheRegistryKeysOnAddressAndPortTogether)
+{
+	// Same address, different port is a different peer; so is the reverse.
+	CUtpPeerRegistry registry;
+	registry.Add(0x0100007F, 4672);
+	ASSERT_FALSE(registry.Has(0x0100007F, 4673));
+	ASSERT_FALSE(registry.Has(0x0200007F, 4672));
+	ASSERT_TRUE(registry.Has(0x0100007F, 4672));
+}
+
+TEST(UtpContext, ForgettingAnUnknownPeerIsHarmless)
+{
+	// DESTROYING can arrive for a socket that never got registered, because
+	// admission rejected it.
+	CUtpPeerRegistry registry;
+	registry.Remove(0x0100007F, 4672);
+	ASSERT_EQUALS(0u, (unsigned)registry.Size());
+}
+
+TEST(UtpContext, TheAcceptorSurvivesTheContextBeingRebuilt)
+{
+	// CClientUDPSocket::Close() destroys the context and Open() lets it come
+	// back lazily, which is what a Kad reconnect does without rebuilding the
+	// object. An acceptor installed once at construction would be gone for the
+	// session, and every inbound SYN refused with no line anywhere.
+	State state;
+	Sink sink;
+	CUtpContext context(std::make_unique<FakeLibrary>(state), sink);
+	CFakeAcceptor acceptor;
+	context.SetAcceptor(&acceptor);
+	ASSERT_TRUE(context.Configure());
+	ASSERT_TRUE(state.acceptor == &acceptor);
+
+	context.Destroy();
+	state.acceptor = nullptr;
+
+	ASSERT_TRUE(context.Configure());
+	ASSERT_TRUE(state.acceptor == &acceptor);
+}
+
+// File_checked_for_headers

amule-3.1.0.tar.gz/unittests/tests/UtpDialPolicyTest.cpp Added

@@ -0,0 +1,74 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+#include "UtpDialPolicy.h"
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(UtpDialPolicy)
+
+TEST(UtpDialPolicy, DecisionMatrix)
+{
+	// The one accepting combination: every fact set except the proxy.
+	for (unsigned bits = 0; bits < 64; ++bits) {
+		const SUtpDialFacts facts{ (bits % 2) != 0,
+			((bits / 2) % 2) != 0,
+			((bits / 4) % 2) != 0,
+			((bits / 8) % 2) != 0,
+			((bits / 16) % 2) != 0,
+			((bits / 32) % 2) != 0 };
+		ASSERT_EQUALS(bits == 55, DecideUtpDial(facts) == EUtpDialDecision::TryUtp);
+	}
+}
+
+TEST(UtpDialPolicy, EndpointRoutability)
+{
+	SUtpDialFacts facts{ true, true, true, false, true, true };
+	ASSERT_TRUE(DecideUtpDial(facts) == EUtpDialDecision::TryUtp);
+	facts.routableEndpoint = false;
+	ASSERT_TRUE(DecideUtpDial(facts) == EUtpDialDecision::PreserveLegacy);
+}
+
+TEST(UtpDialPolicy, SimultaneousConnectionsUseOppositeDirectionDecisions)
+{
+	const uint8_t lower16 = { 0 };
+	const uint8_t higher16 = { 1 };
+
+	ASSERT_TRUE(ShouldKeepFoundUtp(false, lower, higher));
+	ASSERT_TRUE(ShouldKeepFoundUtp(true, higher, lower));
+	ASSERT_FALSE(ShouldKeepFoundUtp(true, lower, higher));
+	ASSERT_FALSE(ShouldKeepFoundUtp(false, higher, lower));
+}
+
+// A peer owed obfuscation is kept on TCP rather than dialled in the clear: the
+// stream handshake does not run over a transport, so the frames are the only
+// thing that could carry it.
+TEST(UtpDialPolicy, ObfuscationOwedButUnavailableStaysOnTcp)
+{
+	SUtpDialFacts facts{ true, true, true, false, true, true };
+	ASSERT_TRUE(DecideUtpDial(facts) == EUtpDialDecision::TryUtp);
+	facts.obfuscationSatisfied = false;
+	ASSERT_TRUE(DecideUtpDial(facts) == EUtpDialDecision::PreserveLegacy);
+}

amule-3.1.0.tar.gz/unittests/tests/UtpLibraryAdapterTest.cpp Added

@@ -0,0 +1,529 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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 <muleunit/test.h>
+
+#include <StreamTransport.h>
+#include <UtpSocketTransport.h>
+#include <UtpStream.h>
+#include <UtpLibraryAdapter.h>
+#include <libs/common/Format.h>
+
+#include <libutp/utp.h>
+
+#include <algorithm>
+#include <deque>
+#include <memory>
+#include <vector>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(UtpLibraryAdapter)
+
+namespace
+{
+constexpr uint32_t kPeerIp = 0x0100007F; // 127.0.0.1 in aMule's low-byte-first form
+constexpr uint16_t kPeerPort = 4672;
+
+// A deterministic loopback through real libutp; datagrams are handed over by hand.
+struct SLoopback
+{
+	std::unique_ptr<IUtpLibrary> server;
+	utp_context *client = nullptr;
+	utp_socket *clientSocket = nullptr;
+	std::deque<std::vector<uint8_t>> toServer, toClient;
+	std::vector<uint8_t> clientRead;
+	bool clientConnected = false;
+};
+
+SLoopback *g_loop = nullptr;
+
+//! Everything the server sends goes to the client.
+class CServerSink : public IUtpDatagramSink
+{
+public:
+	void SendUtpDatagram(const uint8_t *payload,
+		size_t length,
+		uint32_t,
+		uint16_t,
+		bool encrypt,
+		const uint8_t *) override
+	{
+		lastEncrypt = encrypt;
+		++datagrams;
+		g_loop->toClient.emplace_back(payload, payload + length);
+	}
+	bool lastEncrypt = false;
+	unsigned datagrams = 0;
+};
+
+//! Admission, reduced to the decision each test varies.
+class CFakeAcceptor : public IUtpStreamAcceptor
+{
+public:
+	bool AcceptStream(std::unique_ptr<IStreamTransport> &transport, uint32_t ip, uint16_t port) override
+	{
+		++offers;
+		lastIp = ip;
+		lastPort = port;
+		if (!admit) {
+			return false;
+		}
+		accepted = std::move(transport);
+		return true;
+	}
+
+	bool admit = true;
+	int offers = 0;
+	uint32_t lastIp = 0;
+	uint16_t lastPort = 0;
+	std::unique_ptr<IStreamTransport> accepted;
+};
+
+uint64 ClientSendTo(utp_callback_arguments *args)
+{
+	g_loop->toServer.emplace_back(args->buf, args->buf + args->len);
+	return 0;
+}
+
+uint64 ClientOnAccept(utp_callback_arguments *args)
+{
+	g_loop->clientSocket = args->socket;
+	return 0;
+}
+
+uint64 ClientOnState(utp_callback_arguments *args)
+{
+	if (args->state == UTP_STATE_CONNECT || args->state == UTP_STATE_WRITABLE) {
+		g_loop->clientConnected = true;
+	}
+	return 0;
+}
+
+uint64 ClientOnRead(utp_callback_arguments *args)
+{
+	g_loop->clientRead.insert(g_loop->clientRead.end(), args->buf, args->buf + args->len);
+	utp_read_drained(args->socket);
+	return 0;
+}
+
+sockaddr_in Address(uint32_t ip, uint16_t port)
+{
+	sockaddr_in address{};
+	address.sin_family = AF_INET;
+	address.sin_port = htons(port);
+	auto *bytes = reinterpret_cast<uint8_t *>(&address.sin_addr.s_addr);
+	for (unsigned i = 0; i < 4; ++i) {
+		bytesi = static_cast<uint8_t>(ip >> (8 * i));
+	}
+	return address;
+}
+
+//! Hands datagrams across until both directions are idle.
+void Pump(SLoopback &loop, int rounds = 64)
+{
+	const sockaddr_in peer = Address(kPeerIp, kPeerPort);
+	// Before the loop: the window update is deferred through schedule_ack(),
+	// and with both queues empty the loop never runs.
+	loop.server->IssueDeferredAcks();
+	utp_issue_deferred_acks(loop.client);
+	for (int i = 0; i < rounds && (!loop.toServer.empty() || !loop.toClient.empty()); ++i) {
+		while (!loop.toServer.empty()) {
+			const std::vector<uint8_t> datagram = loop.toServer.front();
+			loop.toServer.pop_front();
+			loop.server->ProcessDatagram(datagram.data(), datagram.size(), kPeerIp, kPeerPort);
+		}
+		while (!loop.toClient.empty()) {
+			const std::vector<uint8_t> datagram = loop.toClient.front();
+			loop.toClient.pop_front();
+			utp_process_udp(loop.client,
+				datagram.data(),
+				datagram.size(),
+				reinterpret_cast<const sockaddr *>(&peer),
+				sizeof(peer));
+		}
+		loop.server->IssueDeferredAcks();
+		utp_issue_deferred_acks(loop.client);
+	}
+}
+
+void ConfigureClient(SLoopback &loop)
+{
+	loop.client = utp_init(2);
+	utp_set_callback(loop.client, UTP_SENDTO, ClientSendTo);
+	utp_set_callback(loop.client, UTP_ON_ACCEPT, ClientOnAccept);
+	utp_set_callback(loop.client, UTP_ON_STATE_CHANGE, ClientOnState);
+	utp_set_callback(loop.client, UTP_ON_READ, ClientOnRead);
+}
+
+void StartClient(SLoopback &loop)
+{
+	ConfigureClient(loop);
+	loop.clientSocket = utp_create_socket(loop.client);
+	const sockaddr_in peer = Address(kPeerIp, kPeerPort);
+	utp_connect(loop.clientSocket, reinterpret_cast<const sockaddr *>(&peer), sizeof(peer));
+}
+
+void StartClientAcceptor(SLoopback &loop)
+{
+	ConfigureClient(loop);
+}
+
+void Teardown(SLoopback &loop)
+{
+	if (loop.client != nullptr) {
+		utp_destroy(loop.client);
+		loop.client = nullptr;
+	}
+	loop.server.reset();
+	g_loop = nullptr;
+}
+} // namespace
+
+TEST(UtpLibraryAdapter, AnInboundSynReachesAdmissionWithItsPeer)
+{
+	SLoopback loop;
+	g_loop = &loop;
+	CServerSink sink;
+	CFakeAcceptor acceptor;
+	loop.server = CreateUtpLibrary();
+	ASSERT_TRUE(loop.server->Create(sink));
+	loop.server->SetAcceptor(&acceptor);
+	StartClient(loop);
+
+	Pump(loop);
+
+	ASSERT_EQUALS(1, acceptor.offers);
+	ASSERT_TRUE(acceptor.accepted != nullptr);
+	ASSERT_EQUALS(kPeerIp, acceptor.lastIp);
+	ASSERT_EQUALS(kPeerPort, acceptor.lastPort);
+	// Registered only on success, which is what lets the peer's later non-SYN
+	// frames through the ingress filter.
+	ASSERT_TRUE(loop.server->HasRegisteredPeer(kPeerIp, kPeerPort));
+	Teardown(loop);
+}
+
+TEST(UtpLibraryAdapter, DialCompletesThroughTheRealLoopbackAcceptor)
+{
+	SLoopback loop;
+	g_loop = &loop;
+	CServerSink sink;
+	loop.server = CreateUtpLibrary();
+	ASSERT_TRUE(loop.server->Create(sink));
+	StartClientAcceptor(loop);
+
+	std::unique_ptr<IStreamTransport> transport;
+	ASSERT_TRUE(loop.server->Dial(kPeerIp, kPeerPort, false, nullptr, transport));
+	ASSERT_TRUE(transport != nullptr);
+	Pump(loop);
+	ASSERT_TRUE(transport->IsConnected());
+	ASSERT_TRUE(loop.clientSocket != nullptr);
+	Teardown(loop);
+}
+
+TEST(UtpLibraryAdapter, WithNoAcceptorInstalledEveryInboundSynIsRefused)
+{
+	// The state before an acceptor existed, and after one is detached.
+	SLoopback loop;
+	g_loop = &loop;
+	CServerSink sink;
+	loop.server = CreateUtpLibrary();
+	ASSERT_TRUE(loop.server->Create(sink));
+	StartClient(loop);
+
+	Pump(loop);
+
+	ASSERT_FALSE(loop.server->HasRegisteredPeer(kPeerIp, kPeerPort));
+	Teardown(loop);
+}
+
+TEST(UtpLibraryAdapter, ARefusedStreamIsNeverRegistered)
+{
+	SLoopback loop;
+	g_loop = &loop;
+	CServerSink sink;
+	CFakeAcceptor acceptor;
+	acceptor.admit = false;
+	loop.server = CreateUtpLibrary();
+	ASSERT_TRUE(loop.server->Create(sink));
+	loop.server->SetAcceptor(&acceptor);
+	StartClient(loop);
+
+	Pump(loop);
+
+	ASSERT_EQUALS(1, acceptor.offers);
+	ASSERT_TRUE(acceptor.accepted == nullptr);
+	ASSERT_FALSE(loop.server->HasRegisteredPeer(kPeerIp, kPeerPort));
+	Teardown(loop);
+}
+
+TEST(UtpLibraryAdapter, BytesCrossTheStreamInOrder)
+{
+	// The point of the series: an accepted stream carries bytes.
+	SLoopback loop;
+	g_loop = &loop;
+	CServerSink sink;
+	CFakeAcceptor acceptor;
+	loop.server = CreateUtpLibrary();
+	ASSERT_TRUE(loop.server->Create(sink));
+	loop.server->SetAcceptor(&acceptor);
+	StartClient(loop);
+	Pump(loop);
+	ASSERT_TRUE(acceptor.accepted != nullptr);
+
+	std::vector<uint8_t> payload(4096);
+	for (size_t i = 0; i < payload.size(); ++i) {
+		payloadi = static_cast<uint8_t>(i & 0xFF);
+	}
+	// utp_writev takes only what the window allows; ignoring the return would
+	// "prove" the stream carries one packet.
+	std::vector<uint8_t> received(payload.size());
+	size_t offered = 0;
+	uint32_t total = 0;
+	for (int round = 0; round < 512 && (offered < payload.size() || total < payload.size()); ++round) {
+		if (offered < payload.size()) {
+			utp_iovec vector{ payload.data() + offered, payload.size() - offered };
+			const ssize_t accepted = utp_writev(loop.clientSocket, &vector, 1);
+			if (accepted > 0) {
+				offered += static_cast<size_t>(accepted);
+			}
+		}
+		Pump(loop);
+		while (total < payload.size()) {
+			const uint32_t taken = acceptor.accepted->Read(
+				received.data() + total, static_cast<uint32_t>(payload.size() - total));
+			if (taken == 0) {
+				break;
+			}
+			total += taken;
+		}
+	}
+	ASSERT_EQUALS((unsigned)payload.size(), (unsigned)total);
+	for (size_t i = 0; i < payload.size(); ++i) {
+		CFormat format("byte %u differs");
+		ASSERT_EQUALS_M((int)payloadi, (int)receivedi, format % unsigned(i));
+	}
+	Teardown(loop);
+}
+
+TEST(UtpLibraryAdapter, DeliveryStopsAtTheConfiguredBoundAndResumesOnTheCrossing)
+{
+	// The window is opt_rcvbuf minus reported occupancy, so a reader that stops
+	// stops the peer. Resuming needs the crossing, not an empty buffer.
+	SLoopback loop;
+	g_loop = &loop;
+	CServerSink sink;
+	CFakeAcceptor acceptor;
+	loop.server = CreateUtpLibrary();
+	ASSERT_TRUE(loop.server->Create(sink));
+	loop.server->SetAcceptor(&acceptor);
+	StartClient(loop);
+	Pump(loop);
+	ASSERT_TRUE(acceptor.accepted != nullptr);
+
+	const size_t bound = CUtpStream::kDefaultReadBound;
+	std::vector<uint8_t> payload(bound * 2);
+	for (size_t i = 0; i < payload.size(); ++i) {
+		payloadi = static_cast<uint8_t>((i * 7) & 0xFF);
+	}
+
+	// Offer everything without reading a byte. Delivery must stall at the
+	// bound: more than that in flight would mean the 64 KiB never took effect.
+	size_t offered = 0;
+	for (int round = 0; round < 64 && offered < payload.size(); ++round) {
+		utp_iovec vector{ payload.data() + offered, payload.size() - offered };
+		const ssize_t accepted = utp_writev(loop.clientSocket, &vector, 1);
+		if (accepted > 0) {
+			offered += static_cast<size_t>(accepted);
+		}
+		Pump(loop);
+	}
+	// Occupancy is this type's business, not every transport's.
+	auto *utp = static_cast<CUtpSocketTransport *>(acceptor.accepted.get());
+	const size_t buffered = utp->ReadBufferSize();
+	// Short of the bound: libutp stops once the window cannot hold a packet.
+	// Without UTP_RCVBUF the 1 MiB default would govern and all of it would be
+	// here.
+	CFormat stalled("buffered %u, bound %u, payload %u");
+	const wxString detail = stalled % unsigned(buffered) % unsigned(bound) % unsigned(payload.size());
+	ASSERT_TRUE_M(buffered < payload.size(), detail);
+	ASSERT_TRUE_M(buffered + 2048 >= bound, detail);
+
+	// Read just past the bound, leaving the buffer full but below it. An
+	// empty-buffer rule would signal nothing here and the peer would stall.
+	// Enough to reopen the window without emptying the buffer.
+	const size_t toRead = CUtpStream::kWindowSlackBytes * 2;
+	std::vector<uint8_t> received(payload.size());
+	size_t total = 0;
+	while (total < toRead) {
+		const uint32_t taken = acceptor.accepted->Read(
+			received.data() + total, static_cast<uint32_t>(toRead - total));
+		if (taken == 0) {
+			break;
+		}
+		total += taken;
+	}
+	ASSERT_TRUE(utp->ReadBufferSize() != 0);
+
+	// The rest must now arrive.
+	for (int round = 0; round < 512 && (offered < payload.size() || total < payload.size()); ++round) {
+		if (offered < payload.size()) {
+			utp_iovec vector{ payload.data() + offered, payload.size() - offered };
+			const ssize_t accepted = utp_writev(loop.clientSocket, &vector, 1);
+			if (accepted > 0) {
+				offered += static_cast<size_t>(accepted);
+			}
+		}
+		Pump(loop);
+		// Read the way CEMSocket::OnReceive does: a six-byte header, then a
+		// bounded body, then return with the rest still queued. A reader that
+		// keeps pace this way never empties the buffer, which is precisely why
+		// an empty-buffer rule would never reopen the window and this transfer
+		// would stall short of the payload.
+		// One packet per round, like CEMSocket. Does NOT discriminate the
+		// crossing rule from an empty-buffer one: the reader outpaces the
+		// sender and the buffer empties. PacketReaderReopensWindowWithoutEmptying
+		// covers that.
+		for (int packet = 0; packet < 1 && total < payload.size(); ++packet) {
+			uint8_t header6 = { 0 };
+			const uint32_t headerTaken = acceptor.accepted->Read(header, sizeof(header));
+			if (headerTaken == 0) {
+				break;
+			}
+			std::copy(header, header + headerTaken, received.begin() + total);
+			total += headerTaken;
+			const size_t body = std::min<size_t>(1024, payload.size() - total);
+			if (body == 0) {
+				break;
+			}
+			total +=
+				acceptor.accepted->Read(received.data() + total, static_cast<uint32_t>(body));
+		}
+	}
+	CFormat progress("offered=%u total=%u buffered=%u drained-edges=%u");
+	const wxString diag = progress % unsigned(offered) % unsigned(total) %
+			      unsigned(utp->ReadBufferSize()) % unsigned(sink.datagrams);
+	ASSERT_EQUALS_M((unsigned)payload.size(), (unsigned)total, diag);
+	for (size_t i = 0; i < payload.size(); ++i) {
+		CFormat format("byte %u differs after the window reopened");
+		ASSERT_EQUALS_M((int)payloadi, (int)receivedi, format % unsigned(i));
+	}
+	Teardown(loop);
+}
+
+TEST(UtpLibraryAdapter, DestroyingTheContextEndsTheStreamsItOwned)
+{
+	// utp_destroy() destroys the sockets it owns; ~UTPSocket emits DESTROYING,
+	// which is what makes each transport drop its handle.
+	SLoopback loop;
+	g_loop = &loop;
+	CServerSink sink;
+	CFakeAcceptor acceptor;
+	loop.server = CreateUtpLibrary();
+	ASSERT_TRUE(loop.server->Create(sink));
+	loop.server->SetAcceptor(&acceptor);
+	StartClient(loop);
+	Pump(loop);
+	ASSERT_TRUE(acceptor.accepted != nullptr);
+	ASSERT_TRUE(loop.server->HasRegisteredPeer(kPeerIp, kPeerPort));
+	// Live before the teardown, or what follows proves nothing.
+	ASSERT_TRUE(acceptor.accepted->IsOk());
+
+	loop.server->Destroy();
+
+	// The discriminating assertion: without DESTROYING the handle stays set,
+	// pointing into a destroyed context.
+	auto *utp = static_cast<CUtpSocketTransport *>(acceptor.accepted.get());
+	ASSERT_TRUE(utp->SocketHandle() == nullptr);
+	ASSERT_FALSE(acceptor.accepted->IsOk());
+	ASSERT_FALSE(loop.server->HasRegisteredPeer(kPeerIp, kPeerPort));
+	// The order a real teardown produces; both must be harmless.
+	loop.server->Destroy();
+	acceptor.accepted->Close();
+	Teardown(loop);
+}
+
+TEST(UtpLibraryAdapter, AClosingStreamKeepsItsEndpointUntilTheSocketDies)
+{
+	// utp_close() only starts the socket dying: the peer still has to
+	// acknowledge our FIN, and the ingress gate drops anything from an endpoint
+	// it does not know. Deregistering at close therefore hid that acknowledgement
+	// from libutp, which retransmitted the FIN until it gave up. The endpoint is
+	// dropped when the socket is destroyed, which is what the registry is for.
+	SLoopback loop;
+	g_loop = &loop;
+	CServerSink sink;
+	CFakeAcceptor acceptor;
+	loop.server = CreateUtpLibrary();
+	ASSERT_TRUE(loop.server->Create(sink));
+	loop.server->SetAcceptor(&acceptor);
+	StartClient(loop);
+	Pump(loop);
+	ASSERT_TRUE(acceptor.accepted != nullptr);
+	ASSERT_TRUE(loop.server->HasRegisteredPeer(kPeerIp, kPeerPort));
+
+	acceptor.accepted->Close();
+	ASSERT_TRUE(loop.server->HasRegisteredPeer(kPeerIp, kPeerPort));
+	// The peer's answer to the FIN still reaches libutp rather than the gate.
+	Pump(loop);
+	ASSERT_TRUE(loop.server->HasRegisteredPeer(kPeerIp, kPeerPort));
+
+	loop.server->Destroy();
+	ASSERT_FALSE(loop.server->HasRegisteredPeer(kPeerIp, kPeerPort));
+	Teardown(loop);
+}
+
+TEST(UtpLibraryAdapter, ARefusedSecondStreamMustNotDeregisterTheLivePeer)
+{
+	// A peer uses one client UDP port, so a second stream shares its endpoint
+	// with the first. CloseSocket() removes for every socket that has a
+	// transport, refused ones included, so registering only the admitted ones
+	// would have the refusal decrement the live stream's count and drop it off
+	// the gate its own frames pass through -- for about fifteen seconds, until
+	// the peer times out. TooManySockets is refused exactly when streams are
+	// live, so this is the busy case.
+	SLoopback loop;
+	g_loop = &loop;
+	CServerSink sink;
+	CFakeAcceptor acceptor;
+	loop.server = CreateUtpLibrary();
+	ASSERT_TRUE(loop.server->Create(sink));
+	loop.server->SetAcceptor(&acceptor);
+	StartClient(loop);
+	Pump(loop);
+	ASSERT_TRUE(acceptor.accepted != nullptr);
+	ASSERT_TRUE(loop.server->HasRegisteredPeer(kPeerIp, kPeerPort));
+
+	acceptor.admit = false;
+	utp_socket *second = utp_create_socket(loop.client);
+	const sockaddr_in peer = Address(kPeerIp, kPeerPort);
+	utp_connect(second, reinterpret_cast<const sockaddr *>(&peer), sizeof(peer));
+	Pump(loop);
+	Pump(loop);
+
+	ASSERT_TRUE(loop.server->HasRegisteredPeer(kPeerIp, kPeerPort));
+	Teardown(loop);
+}
+
+// File_checked_for_headers

amule-3.1.0.tar.gz/unittests/tests/UtpSocketTransportTest.cpp Added

@@ -0,0 +1,905 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// The transport between CUtpStream and one libutp socket.
+//
+// Two properties carry the weight. First, a partial write: utp_write() takes
+// less than it is offered as soon as the congestion window fills, and nothing
+// at all before the socket is connected, so the refused tail has to stay in the
+// queue the bound can see. Second, the close: utp_close() must happen exactly
+// once, and UTP_STATE_DESTROYING invalidates the handle before it arrives, so
+// a destructor that closes after a DESTROYING callback is a double free.
+
+#include <muleunit/test.h>
+
+#include <UtpSocketTransport.h>
+
+#include <algorithm>
+#include <functional>
+#include <stdexcept>
+#include <thread>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(UtpSocketTransport)
+
+namespace
+{
+//! Records every libutp call and decides how much a write may take.
+class FakeOperations : public IUtpSocketOperations
+{
+public:
+	std::ptrdiff_t WriteToSocket(Handle socket, const uint8_t *data, size_t length) override
+	{
+		lastWriteSocket = socket;
+		if (onWrite) {
+			onWrite();
+		}
+		if (refuseWithError) {
+			return -1;
+		}
+		const size_t taken = length < acceptLimit ? length : acceptLimit;
+		offered.insert(offered.end(), data, data + length);
+		accepted.insert(accepted.end(), data, data + taken);
+		return taken;
+	}
+	void NotifyReadDrained(Handle) override { ++drainedCalls; }
+	void CloseSocket(Handle socket) override
+	{
+		++closeCalls;
+		lastClosed = socket;
+		if (onClose) {
+			onClose();
+		}
+	}
+	void SetReceiveBuffer(Handle, size_t bytes) override { receiveBound = bytes; }
+
+	std::function<void()> onWrite;
+	std::function<void()> onClose;
+	bool refuseWithError = false;
+	size_t acceptLimit = 1024 * 1024;
+	std::vector<uint8_t> offered;
+	std::vector<uint8_t> accepted;
+	Handle lastWriteSocket = nullptr;
+	Handle lastClosed = nullptr;
+	int drainedCalls = 0;
+	int closeCalls = 0;
+	size_t receiveBound = 0;
+};
+
+class FakeEvents : public IStreamTransportEvents
+{
+public:
+	void OnStreamReadable() override { ++readable; }
+	void OnStreamWritable() override { ++writable; }
+	void OnStreamLost() override { ++lost; }
+	void OnFlushRequested() override
+	{
+		++flushRequests;
+		if (onFlushRequested) {
+			onFlushRequested();
+		}
+	}
+
+	std::function<void()> onFlushRequested;
+
+	int readable = 0, writable = 0, lost = 0, flushRequests = 0;
+};
+
+//! A handle value that is never dereferenced, only compared.
+IUtpSocketOperations::Handle Handle()
+{
+	static int marker = 0;
+	return &marker;
+}
+
+CUtpSocketTransport MakeTransport(FakeOperations &ops, IStreamTransportEvents *events = nullptr)
+{
+	return CUtpSocketTransport(
+		ops, Handle(), CNetworkAddress::FromString("192.0.2.7"), 4662, events, false);
+}
+
+std::vector<uint8_t> Pattern(size_t length, uint8_t seed = 0)
+{
+	std::vector<uint8_t> bytes(length);
+	for (size_t i = 0; i < length; ++i) {
+		bytesi = static_cast<uint8_t>((i * 17 + seed) & 0xFF);
+	}
+	return bytes;
+}
+} // namespace
+
+TEST(UtpSocketTransport, PeerIdentityIsCarriedWhole)
+{
+	FakeOperations ops;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	ASSERT_TRUE(transport.GetPeerAddress() == CNetworkAddress::FromString("192.0.2.7"));
+	ASSERT_EQUALS(4662, (int)transport.GetPeerPort());
+}
+
+TEST(UtpSocketTransport, WriteQueuesWithoutTouchingTheLibrary)
+{
+	// Write() is reached from the upload bandwidth thread, so it must not make
+	// a library call: utp_write() can produce callbacks on a thread libutp
+	// knows nothing about.
+	FakeOperations ops;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	const std::vector<uint8_t> payload = Pattern(64);
+
+	ASSERT_EQUALS(64u, transport.Write(payload.data(), 64));
+	ASSERT_EQUALS(0u, (unsigned)ops.offered.size());
+
+	transport.Flush();
+	ASSERT_EQUALS(64u, (unsigned)ops.accepted.size());
+	for (size_t i = 0; i < payload.size(); ++i) {
+		ASSERT_EQUALS((int)payloadi, (int)ops.acceptedi);
+	}
+}
+
+TEST(UtpSocketTransport, RefusedBytesAreOfferedAgainOnTheNextFlush)
+{
+	FakeOperations ops;
+	ops.acceptLimit = 10;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	const std::vector<uint8_t> payload = Pattern(25, 3);
+	ASSERT_EQUALS(25u, transport.Write(payload.data(), 25));
+
+	transport.Flush();
+	ASSERT_EQUALS(10u, (unsigned)ops.accepted.size());
+
+	ops.acceptLimit = 1024;
+	transport.Flush();
+	ASSERT_EQUALS(25u, (unsigned)ops.accepted.size());
+	// Every byte exactly once, in order: the refused tail was kept, not resent
+	// from the start and not dropped.
+	for (size_t i = 0; i < payload.size(); ++i) {
+		ASSERT_EQUALS((int)payloadi, (int)ops.acceptedi);
+	}
+}
+
+TEST(UtpSocketTransport, AWriteRefusedEntirelyLosesNothing)
+{
+	// utp_write() returns zero while the socket is not yet connected.
+	FakeOperations ops;
+	ops.acceptLimit = 0;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	const std::vector<uint8_t> payload = Pattern(8, 9);
+	transport.Write(payload.data(), 8);
+
+	transport.Flush();
+	transport.Flush();
+	ASSERT_EQUALS(0u, (unsigned)ops.accepted.size());
+
+	ops.acceptLimit = 8;
+	transport.Flush();
+	ASSERT_EQUALS(8u, (unsigned)ops.accepted.size());
+	for (size_t i = 0; i < payload.size(); ++i) {
+		ASSERT_EQUALS((int)payloadi, (int)ops.acceptedi);
+	}
+}
+
+TEST(UtpSocketTransport, FlushWithNothingQueuedMakesNoCall)
+{
+	FakeOperations ops;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	transport.Flush();
+	ASSERT_TRUE(ops.lastWriteSocket == nullptr);
+}
+
+TEST(UtpSocketTransport, EmptyingBelowBoundDoesNotTellTheLibrary)
+{
+	FakeOperations ops;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	const std::vector<uint8_t> payload = Pattern(6);
+	transport.OnPayload(payload.data(), payload.size());
+	ASSERT_EQUALS(1, events.readable);
+
+	uint8_t out6 = { 0 };
+	ASSERT_EQUALS(3u, transport.Read(out, 3));
+	// Still buffered, so libutp has not been kept waiting.
+	ASSERT_EQUALS(0, ops.drainedCalls);
+
+	// Emptying below the bound never reopens a closed window; the old empty-only rule
+	// missed packet readers that cross the bound while retaining a backlog.
+	ASSERT_EQUALS(3u, transport.Read(out, 3));
+	ASSERT_EQUALS(0, ops.drainedCalls);
+
+	ASSERT_EQUALS(0u, transport.Read(out, 3));
+	ASSERT_EQUALS(0, ops.drainedCalls);
+	ASSERT_TRUE(transport.BlocksRead());
+	ASSERT_EQUALS(0, transport.LastError());
+}
+
+TEST(UtpSocketTransport, PacketReaderReopensWindowWithoutEmptying)
+{
+	FakeOperations ops;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	const auto payload = Pattern(CUtpStream::kDefaultReadBound + 10);
+	transport.OnPayload(payload.data(), payload.size());
+	uint8_t out16 = { 0 };
+	// CEMSocket reads a six-byte header, then a body, and returns with a backlog.
+	// Still above the high-water, so the window is closed and nothing is owed.
+	ASSERT_EQUALS(6u, transport.Read(out, 6));
+	ASSERT_EQUALS(0, ops.drainedCalls);
+	// Crossing it reopens the window, with the buffer still far from empty.
+	uint8_t bulk4096 = { 0 };
+	while (transport.ReadBufferSize() > CUtpStream::kDefaultReadBound - 4096) {
+		transport.Read(bulk, sizeof(bulk));
+	}
+	ASSERT_EQUALS(1, ops.drainedCalls);
+	ASSERT_TRUE(transport.ReadBufferSize() != 0);
+	ASSERT_EQUALS(6u, transport.Read(out, 6));
+	ASSERT_EQUALS(1, ops.drainedCalls);
+}
+
+TEST(UtpSocketTransport, CloseHappensExactlyOnce)
+{
+	FakeOperations ops;
+	{
+		CUtpSocketTransport transport = MakeTransport(ops);
+		transport.Close();
+		ASSERT_EQUALS(1, ops.closeCalls);
+		transport.Close();
+		ASSERT_EQUALS(1, ops.closeCalls);
+	}
+	// The destructor must not close again.
+	ASSERT_EQUALS(1, ops.closeCalls);
+}
+
+TEST(UtpSocketTransport, AClosedHandleIsNeverUsedAgain)
+{
+	// The cleared handle is the single guard, so every other call has to
+	// respect it too -- a flush or a drained notification against a closed
+	// socket is the same use-after-free as a second close.
+	FakeOperations ops;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	const std::vector<uint8_t> payload = Pattern(4);
+	FakeEvents events;
+	transport.OnPayload(payload.data(), payload.size());
+	transport.Write(payload.data(), 4);
+
+	transport.Close();
+	ASSERT_EQUALS(1, ops.closeCalls);
+
+	transport.Flush();
+	ASSERT_EQUALS(0u, (unsigned)ops.offered.size());
+
+	uint8_t out4 = { 0 };
+	transport.Read(out, sizeof(out));
+	ASSERT_EQUALS(0, ops.drainedCalls);
+}
+
+TEST(UtpSocketTransport, DestroyingNeverClosesTheDeadHandle)
+{
+	// UTP_STATE_DESTROYING invalidates the handle before the callback returns,
+	// so closing it afterwards is a use-after-free rather than tidiness.
+	FakeOperations ops;
+	FakeEvents events;
+	{
+		CUtpSocketTransport transport = MakeTransport(ops, &events);
+		transport.OnEnded(EUtpTransportFailure::Destroying);
+		ASSERT_EQUALS(1, events.lost);
+		ASSERT_EQUALS(0, ops.closeCalls);
+		transport.Close();
+		ASSERT_EQUALS(0, ops.closeCalls);
+	}
+	ASSERT_EQUALS(0, ops.closeCalls);
+}
+
+TEST(UtpSocketTransport, NothingReachesTheLibraryAfterTheStreamEnds)
+{
+	FakeOperations ops;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	const std::vector<uint8_t> payload = Pattern(4);
+	transport.Write(payload.data(), 4);
+	transport.OnEnded(EUtpTransportFailure::Reset);
+
+	transport.Flush();
+	ASSERT_EQUALS(0u, (unsigned)ops.offered.size());
+	ASSERT_FALSE(transport.IsOk());
+	ASSERT_FALSE(transport.IsConnected());
+	ASSERT_TRUE(transport.LastError() != 0);
+}
+
+TEST(UtpSocketTransport, ACleanEndIsNotAnError)
+{
+	FakeOperations ops;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	transport.OnEnded(EUtpTransportFailure::Eof);
+	ASSERT_FALSE(transport.IsOk());
+	ASSERT_EQUALS(0, transport.LastError());
+	ASSERT_EQUALS(1, events.lost);
+}
+
+TEST(UtpSocketTransport, AcceptorMarksInboundConnectedWithoutOutgoingConnectCallback)
+{
+	FakeOperations ops;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	ASSERT_FALSE(transport.IsConnected());
+	transport.MarkConnected();
+	ASSERT_TRUE(transport.IsConnected());
+	ASSERT_EQUALS(1, events.writable);
+}
+
+TEST(UtpSocketTransport, AWindowOpeningFlushesAndUnblocksOnlyWhenItHelps)
+{
+	FakeOperations ops;
+	ops.acceptLimit = 0;
+	FakeEvents events;
+	CUtpSocketTransport transport(
+		ops, Handle(), CNetworkAddress::FromString("192.0.2.7"), 4662, &events, false);
+
+	// Fill the queue past its bound so the writer is blocked.
+	const std::vector<uint8_t> payload = Pattern(CUtpStream::kDefaultWriteBound + 16, 5);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+	ASSERT_TRUE(transport.BlocksWrite());
+
+	// A window that opens while libutp still takes nothing leaves the writer
+	// blocked: our own queue is what is full.
+	transport.OnWritable();
+	ASSERT_TRUE(transport.BlocksWrite());
+	ASSERT_EQUALS(0, events.writable);
+
+	ops.acceptLimit = CUtpStream::kDefaultWriteBound;
+	transport.OnWritable();
+	ASSERT_FALSE(transport.BlocksWrite());
+	ASSERT_EQUALS(1, events.writable);
+}
+
+TEST(UtpSocketTransport, QueueingAsksForAFlushOncePerIdlePeriod)
+{
+	// The only other trigger is a full window reopening, so bytes queued while
+	// the window was never full would otherwise sit there. Raised on the
+	// idle-to-busy edge, so a busy socket does not post an event per write.
+	FakeOperations ops;
+	ops.acceptLimit = 0;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	const std::vector<uint8_t> payload = Pattern(8);
+
+	transport.Write(payload.data(), 8);
+	ASSERT_EQUALS(1, events.flushRequests);
+	transport.Write(payload.data(), 8);
+	transport.Write(payload.data(), 8);
+	ASSERT_EQUALS(1, events.flushRequests);
+
+	transport.Flush();
+	transport.Write(payload.data(), 8);
+	ASSERT_EQUALS(2, events.flushRequests);
+}
+
+TEST(UtpSocketTransport, ConnectingRequestsWhatTheHandshakeRefused)
+{
+	// utp_write() takes nothing before the handshake completes, so everything
+	// queued until then is still waiting and has no writable edge coming.
+	FakeOperations ops;
+	ops.acceptLimit = 0;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	const std::vector<uint8_t> payload = Pattern(12, 4);
+	transport.Write(payload.data(), 12);
+	transport.Flush();
+	ASSERT_EQUALS(0u, (unsigned)ops.accepted.size());
+
+	ops.acceptLimit = 64;
+	const int before = events.flushRequests;
+	const size_t offeredBefore = ops.offered.size();
+	transport.MarkConnected();
+	// Requested, never offered from inside the callback.
+	ASSERT_EQUALS((unsigned)offeredBefore, (unsigned)ops.offered.size());
+	ASSERT_EQUALS(before + 1, events.flushRequests);
+
+	transport.Flush();
+	ASSERT_EQUALS(12u, (unsigned)ops.accepted.size());
+	for (size_t i = 0; i < payload.size(); ++i) {
+		ASSERT_EQUALS((int)payloadi, (int)ops.acceptedi);
+	}
+}
+
+TEST(UtpSocketTransport, ReadBufferSizeTracksCurrentOccupancy)
+{
+	FakeOperations ops;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	const CUtpSocketTransport &reader = transport;
+	ASSERT_EQUALS(0u, (unsigned)reader.ReadBufferSize());
+	const std::vector<uint8_t> payload = Pattern(40);
+	transport.OnPayload(payload.data(), payload.size());
+
+	transport.ApplyReceiveBound();
+	ASSERT_EQUALS((unsigned)CUtpStream::kDefaultReadBound, (unsigned)ops.receiveBound);
+	ASSERT_EQUALS(40u, (unsigned)reader.ReadBufferSize());
+
+	uint8_t out40 = { 0 };
+	ASSERT_EQUALS(15u, transport.Read(out, 15));
+	ASSERT_EQUALS(25u, (unsigned)reader.ReadBufferSize());
+	ASSERT_EQUALS(25u, transport.Read(out, sizeof(out)));
+	ASSERT_EQUALS(0u, (unsigned)reader.ReadBufferSize());
+	ASSERT_EQUALS(0u, transport.Read(out, sizeof(out)));
+	ASSERT_EQUALS(0u, (unsigned)reader.ReadBufferSize());
+}
+
+TEST(UtpSocketTransport, AnOfferIsBoundedRatherThanTheWholeBacklog)
+{
+	// A blocked socket would otherwise have its entire queue copied on every
+	// attempt, for bytes libutp cannot take in one call anyway.
+	FakeOperations ops;
+	ops.acceptLimit = 0;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	const std::vector<uint8_t> payload = Pattern(CUtpStream::kDefaultWriteBound, 2);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+
+	transport.Flush();
+	ASSERT_TRUE(ops.offered.size() > 0u);
+	ASSERT_TRUE(ops.offered.size() <= 64u * 1024u);
+}
+
+TEST(UtpSocketTransport, WritingWhileFlushingDoesNotCorruptTheQueue)
+{
+	// Only meaningful under ThreadSanitizer: passing unsanitised proves
+	// nothing, because a data race is free to produce the right answer.
+	//
+	//   cmake -S . -B build -DBUILD_TESTING=YES
+	//   cmake -S . -B build -DBUILD_TESTING=YES \
+	//     -DCMAKE_CXX_FLAGS="-fsanitize=thread -g -O1" \
+	//     -DCMAKE_C_FLAGS="-fsanitize=thread -g -O1" \
+	//     -DCMAKE_EXE_LINKER_FLAGS="-fsanitize=thread"
+	//   cmake --build build --target UtpSocketTransportTest
+	//
+	// The first configure is not redundant: TSan cannot run the crypto++
+	// version probe, so the cache has to be populated without it. In a
+	// container add --security-opt seccomp=unconfined, or TSan dies unable to
+	// disable ASLR. Removing this class's locks yields 16 reported races,
+	// naming CUtpStream::Write on the deque.
+	FakeOperations ops;
+	ops.acceptLimit = 32;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	const std::vector<uint8_t> chunk = Pattern(32, 11);
+
+	std::thread writer(&transport, &chunk() {
+		for (int i = 0; i < 500; ++i) {
+			transport.Write(chunk.data(), static_cast<uint32_t>(chunk.size()));
+		}
+	});
+	for (int i = 0; i < 500; ++i) {
+		transport.Flush();
+	}
+	writer.join();
+	while (transport.PendingWriteBytes() != 0) {
+		transport.Flush();
+	}
+
+	// Every byte that was accepted came out in the pattern's order, so nothing
+	// was duplicated, dropped or interleaved.
+	ASSERT_TRUE(ops.accepted.size() % chunk.size() == 0);
+	for (size_t i = 0; i < ops.accepted.size(); ++i) {
+		ASSERT_EQUALS((int)chunki % chunk.size(), (int)ops.acceptedi);
+	}
+}
+
+TEST(UtpSocketTransport, BoundedFlushSchedulesTheTailAndUnblocksWriter)
+{
+	FakeOperations ops;
+	FakeEvents events;
+	auto transport = MakeTransport(ops, &events);
+	const auto payload = Pattern(CUtpStream::kDefaultWriteBound);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+	transport.Flush();
+	ASSERT_EQUALS(2, events.flushRequests);
+	ASSERT_EQUALS(1, events.writable);
+	while (transport.PendingWriteBytes() != 0) {
+		transport.Flush();
+	}
+	ASSERT_TRUE(payload == ops.accepted);
+	ASSERT_EQUALS(4, events.flushRequests);
+	ASSERT_EQUALS(1, events.writable);
+}
+
+TEST(UtpSocketTransport, DirectFlushNotifiesWhenTheQueueUnblocks)
+{
+	FakeOperations ops;
+	FakeEvents events;
+	auto transport = MakeTransport(ops, &events);
+	const auto payload = Pattern(CUtpStream::kDefaultWriteBound);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+	transport.Flush();
+	ASSERT_FALSE(transport.BlocksWrite());
+	ASSERT_EQUALS(1, events.writable);
+}
+
+TEST(UtpSocketTransport, LocalCloseEndsTheStreamBeforeCallingTheLibrary)
+{
+	FakeOperations ops;
+	auto transport = MakeTransport(ops);
+	transport.MarkConnected();
+	ops.onClose = &() {
+		ASSERT_FALSE(transport.IsOk());
+		ASSERT_FALSE(transport.IsConnected());
+		const uint8_t byte = 1;
+		ASSERT_EQUALS(0u, transport.Write(&byte, 1));
+		transport.OnEnded(EUtpTransportFailure::Destroying);
+	};
+	transport.Close();
+	ASSERT_EQUALS(0, transport.LastError());
+	ASSERT_EQUALS(1, ops.closeCalls);
+}
+
+TEST(UtpSocketTransport, DestructorDetachesSinkBeforeDestroyingReentry)
+{
+	FakeOperations ops;
+	FakeEvents events;
+	{
+		auto transport = MakeTransport(ops, &events);
+		ops.onClose = &() { transport.OnEnded(EUtpTransportFailure::Destroying); };
+	}
+	ASSERT_EQUALS(1, ops.closeCalls);
+	ASSERT_EQUALS(0, events.lost);
+}
+
+TEST(UtpSocketTransport, NegativeAcceptancePreservesTheQueue)
+{
+	FakeOperations ops;
+	FakeEvents events;
+	auto transport = MakeTransport(ops, &events);
+	const auto payload = Pattern(12);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+	ops.refuseWithError = true;
+	transport.Flush();
+	ASSERT_EQUALS(12u, (unsigned)transport.PendingWriteBytes());
+	ASSERT_EQUALS(1, events.flushRequests);
+	ops.refuseWithError = false;
+	transport.Flush();
+	ASSERT_TRUE(payload == ops.accepted);
+}
+
+TEST(UtpSocketTransport, ZeroAcceptanceDoesNotScheduleAnotherFlush)
+{
+	FakeOperations ops;
+	FakeEvents events;
+	auto transport = MakeTransport(ops, &events);
+	const auto payload = Pattern(12);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+	ops.acceptLimit = 0;
+	transport.Flush();
+	ASSERT_EQUALS(1, events.flushRequests);
+	ASSERT_EQUALS(12u, (unsigned)transport.PendingWriteBytes());
+	ops.acceptLimit = 12;
+	transport.OnWritable();
+	ASSERT_TRUE(payload == ops.accepted);
+	ASSERT_EQUALS(1, events.flushRequests);
+}
+
+TEST(UtpSocketTransport, PartialAcceptanceWaitsForWritableWithoutScheduling)
+{
+	FakeOperations ops;
+	FakeEvents events;
+	auto transport = MakeTransport(ops, &events);
+	const auto payload = Pattern(12);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+	ops.acceptLimit = 5;
+	transport.Flush();
+	ASSERT_EQUALS(1, events.flushRequests);
+	ASSERT_EQUALS(7u, (unsigned)transport.PendingWriteBytes());
+	ops.acceptLimit = 12;
+	transport.OnWritable();
+	ASSERT_TRUE(payload == ops.accepted);
+	ASSERT_EQUALS(0u, (unsigned)transport.PendingWriteBytes());
+	ASSERT_EQUALS(1, events.flushRequests);
+}
+
+TEST(UtpSocketTransport, ReentrantFlushNeverOffersTheSameBytesTwice)
+{
+	FakeOperations ops;
+	FakeEvents events;
+	auto transport = MakeTransport(ops, &events);
+	const auto payload = Pattern(96 * 1024);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+	bool reentered = false;
+	ops.onWrite = &() {
+		if (!reentered) {
+			reentered = true;
+			transport.Flush();
+		}
+	};
+	transport.Flush();
+	ASSERT_TRUE(reentered);
+	ASSERT_EQUALS(64u * 1024u, (unsigned)ops.accepted.size());
+	ASSERT_EQUALS(2, events.flushRequests);
+	transport.Flush();
+	ASSERT_TRUE(payload == ops.accepted);
+	ASSERT_TRUE(payload == ops.offered);
+}
+
+TEST(UtpSocketTransport, ConnectingNeverCallsTheLibraryFromInsideTheCallback)
+{
+	// MarkConnected() runs inside UTP_ON_ACCEPT, where the socket is still
+	// CS_SYN_RECV: utp_writev would refuse every byte at its state guard, so
+	// offering there copies a window for nothing.
+	FakeOperations ops;
+	ops.acceptLimit = CUtpStream::kDefaultWriteBound;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	const std::vector<uint8_t> payload = Pattern(CUtpStream::kDefaultWriteBound, 9);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+
+	transport.MarkConnected();
+	ASSERT_EQUALS(0u, (unsigned)ops.offered.size());
+	ASSERT_EQUALS(1, events.writable);
+}
+
+TEST(UtpSocketTransport, AReentrantFlushRequestIsHonouredNotDropped)
+{
+	// The outer flush is offering bytes the reentrant caller never saw, so
+	// returning silently would lose whatever edge asked for that flush.
+	FakeOperations ops;
+	ops.acceptLimit = 8;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	const std::vector<uint8_t> payload = Pattern(64, 3);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+	const int queued = events.flushRequests;
+
+	bool reentered = false;
+	ops.onWrite = &() {
+		if (!reentered) {
+			reentered = true;
+			transport.Flush();
+		}
+	};
+	transport.Flush();
+	ASSERT_TRUE(reentered);
+	// Partial acceptance alone would schedule nothing; the swallowed
+	// reentrant request is what must still be answered.
+	ASSERT_EQUALS(queued + 1, events.flushRequests);
+}
+
+TEST(UtpSocketTransport, ALocalCloseIsNotReportedAsThePeersEof)
+{
+	FakeOperations ops;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	transport.MarkConnected();
+	transport.Close();
+	ASSERT_TRUE(transport.Failure() == EUtpTransportFailure::Closed);
+	ASSERT_EQUALS(0, transport.LastError());
+	ASSERT_FALSE(transport.IsOk());
+}
+
+TEST(UtpSocketTransport, IncomingPayloadReleasesAReplyQueuedAtAccept)
+{
+	// libutp completes an inbound handshake silently: CS_SYN_RECV becomes
+	// CS_CONNECTED on the peer's first ST_DATA with no callback, and until
+	// then utp_writev refuses everything without arming a writable edge. So
+	// this payload is the only signal that the reply can now go out.
+	FakeOperations ops;
+	ops.acceptLimit = 0;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	transport.MarkConnected();
+	const std::vector<uint8_t> reply = Pattern(16, 7);
+	transport.Write(reply.data(), static_cast<uint32_t>(reply.size()));
+	transport.Flush();
+	ASSERT_EQUALS(0u, (unsigned)ops.accepted.size());
+	const int before = events.flushRequests;
+
+	const std::vector<uint8_t> incoming = Pattern(8, 1);
+	transport.OnPayload(incoming.data(), incoming.size());
+	ASSERT_EQUALS(before + 1, events.flushRequests);
+
+	ops.acceptLimit = 64;
+	transport.Flush();
+	ASSERT_TRUE(reply == ops.accepted);
+}
+
+TEST(UtpSocketTransport, AThrowingWritableSinkDoesNotWedgeTheFlushPath)
+{
+	// The in-progress flag is what stops a reentrant flush duplicating bytes.
+	// Left set by an exception it would stop Write() requesting flushes at
+	// all -- silently, with IsOk() still true.
+	class CThrowingEvents : public FakeEvents
+	{
+	public:
+		void OnStreamWritable() override { throw std::runtime_error("sink"); }
+	};
+	FakeOperations ops;
+	ops.acceptLimit = CUtpStream::kDefaultWriteBound;
+	CThrowingEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	const std::vector<uint8_t> payload = Pattern(CUtpStream::kDefaultWriteBound, 5);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+
+	bool threw = false;
+	try {
+		transport.Flush();
+	} catch (const std::runtime_error &) {
+		threw = true;
+	}
+	ASSERT_TRUE(threw);
+
+	// Still usable: the queue drains and queueing still asks for a flush.
+	const int before = events.flushRequests;
+	transport.Flush();
+	const std::vector<uint8_t> more = Pattern(8, 2);
+	transport.Write(more.data(), static_cast<uint32_t>(more.size()));
+	ASSERT_TRUE(events.flushRequests > before);
+}
+
+TEST(UtpSocketTransport, AFullyAcceptedFlushStillConsumesTheReentryRecord)
+{
+	// The re-entry record and the in-progress flag must both be cleared before
+	// the sink runs. Leaving them set lets a synchronous sink re-enter, record
+	// a request nothing will ever consume, and strand the queue with IsOk()
+	// still true.
+	FakeOperations ops;
+	ops.acceptLimit = 64 * 1024;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	const std::vector<uint8_t> payload = Pattern(CUtpStream::kDefaultWriteBound, 4);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+
+	// A sink that flushes synchronously, the way a same-thread owner would.
+	events.onFlushRequested = &() { transport.Flush(); };
+	transport.Flush();
+
+	ASSERT_EQUALS(0u, (unsigned)transport.PendingWriteBytes());
+	ASSERT_TRUE(payload == ops.accepted);
+}
+
+// The other half of the re-entry record: clearing the in-progress flag is not enough if the
+// pending flag survives. A request raised during the unlocked offer -- OnPayload() completing an
+// inbound handshake is the real case -- makes the sink re-enter Flush(), which returns early. If
+// that early return leaves m_flushPending set, the tail consumes the re-entry record and then gets
+// nothing from RequestFlushLocked(), which short-circuits on that same flag. Write() short-circuits
+// on it too, so nothing ever asks again and the queue strands with IsOk() still true.
+TEST(UtpSocketTransport, AReentryDuringTheOfferStillLeavesTheQueueFlushable)
+{
+	FakeOperations ops;
+	ops.acceptLimit = 8;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+
+	// A synchronous sink, the way a same-thread owner would be wired.
+	events.onFlushRequested = &() { transport.Flush(); };
+
+	const std::vector<uint8_t> payload = Pattern(64, 9);
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+
+	// Payload arriving while the offer is in flight: this is what raises a request inside the
+	// window where a re-entrant Flush() can only record itself.
+	const std::vector<uint8_t> inbound = Pattern(4, 200);
+	bool delivered = false;
+	ops.onWrite = &() {
+		if (!delivered) {
+			delivered = true;
+			transport.OnPayload(inbound.data(), inbound.size());
+		}
+	};
+
+	transport.Flush();
+	ASSERT_TRUE(delivered);
+
+	// The queue must still be drainable. Without the fix nothing requests a flush again, so
+	// this write cannot get one either and the bytes sit there for good.
+	const size_t before = transport.PendingWriteBytes();
+	ASSERT_TRUE(before > 0u);
+	const std::vector<uint8_t> more = Pattern(4, 77);
+	transport.Write(more.data(), static_cast<uint32_t>(more.size()));
+	ASSERT_TRUE(transport.PendingWriteBytes() < before + more.size());
+}
+
+TEST(UtpSocketTransport, AThrowingFlushSinkDoesNotStopLaterRequests)
+{
+	// m_flushPending gates every later request, so a throw with it left set
+	// stops the socket sending for good -- the same wedge as the in-progress
+	// flag, one flag over.
+	FakeOperations ops;
+	FakeEvents events;
+	CUtpSocketTransport transport = MakeTransport(ops, &events);
+	events.onFlushRequested = &() { throw std::runtime_error("sink"); };
+	const std::vector<uint8_t> payload = Pattern(8, 6);
+
+	bool threw = false;
+	try {
+		transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+	} catch (const std::runtime_error &) {
+		threw = true;
+	}
+	ASSERT_TRUE(threw);
+
+	events.onFlushRequested = nullptr;
+	const int before = events.flushRequests;
+	transport.Write(payload.data(), static_cast<uint32_t>(payload.size()));
+	ASSERT_TRUE(events.flushRequests > before);
+}
+
+TEST(UtpSocketTransport, CryptParametersTravelWithTheSocketNotTheAddress)
+{
+	// The removed reverse lookup keyed on the destination, which can host more
+	// than one client: it could pick the wrong peer's hash and leave the real
+	// recipient unable to decrypt. The socket knows its own peer.
+	FakeOperations ops;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	const uint8_t *hash = nullptr;
+	ASSERT_FALSE(transport.CryptParameters(&hash));
+
+	const uint8_t peerHash16 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
+	transport.SetCryptParameters(true, peerHash);
+	ASSERT_TRUE(transport.CryptParameters(&hash));
+	for (unsigned i = 0; i < 16; ++i) {
+		ASSERT_EQUALS((int)peerHashi, (int)hashi);
+	}
+}
+
+TEST(UtpSocketTransport, TheUserHashIsCopiedBecauseItsOwnerCanBeReplaced)
+{
+	// AttachToAlreadyKnown() replaces the client during the hello exchange
+	// while the socket outlives the swap, so borrowing the hash would leave a
+	// pointer into a dead client.
+	FakeOperations ops;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	uint8_t owned16 = { 0xAA };
+	transport.SetCryptParameters(true, owned);
+	std::fill(std::begin(owned), std::end(owned), uint8_t(0xFF));
+
+	const uint8_t *hash = nullptr;
+	ASSERT_TRUE(transport.CryptParameters(&hash));
+	ASSERT_EQUALS(0xAA, (int)hash0);
+}
+
+TEST(UtpSocketTransport, AskingToEncryptWithoutAHashEncryptsNothing)
+{
+	// Encrypting with no key material would derive one from whatever happened
+	// to be there, which the peer cannot reproduce.
+	FakeOperations ops;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	transport.SetCryptParameters(true, nullptr);
+	const uint8_t *hash = nullptr;
+	ASSERT_FALSE(transport.CryptParameters(&hash));
+}
+
+TEST(UtpSocketTransport, ObfuscationIsReportedFromTheCryptParametersItWasGiven)
+{
+	// The socket above suppresses the ed2k stream handshake on this answer, so
+	// a transport that claims to obfuscate and does not would send in the clear
+	// what the peer was owed obfuscated.
+	FakeOperations ops;
+	CUtpSocketTransport transport = MakeTransport(ops);
+	ASSERT_FALSE(transport.ObfuscatesStream());
+
+	const uint8_t peerHash16 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
+	transport.SetCryptParameters(true, peerHash);
+	ASSERT_TRUE(transport.ObfuscatesStream());
+
+	transport.SetCryptParameters(false, peerHash);
+	ASSERT_FALSE(transport.ObfuscatesStream());
+
+	// Asking to encrypt with no key material encrypts nothing, so it must not
+	// report otherwise either.
+	transport.SetCryptParameters(true, nullptr);
+	ASSERT_FALSE(transport.ObfuscatesStream());
+}
+
+// File_checked_for_headers

amule-3.1.0.tar.gz/unittests/tests/UtpStreamTest.cpp Added

@@ -0,0 +1,455 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2026 aMule Team ( https://amule-org.github.io )
+//
+// 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
+//
+
+// The buffering between libutp and the eD2k stack.
+//
+// The property worth the coverage is the would-block contract, because CEMSocket depends on it
+// rather than merely tolerating it: 0 bytes with the Blocks flag set means "not yet", 0 bytes with
+// an error set means the peer is gone. Getting that backwards disconnects a peer whose send window
+// would have opened a millisecond later, and the symptom -- peers dropping under load -- looks
+// nothing like its cause.
+//
+// The other one is the close: libutp's utp_close() must happen exactly once, and a destructor plus
+// a DESTROYING callback both closing is a double free that only shows up when a peer leaves at the
+// wrong moment.
+
+#include <muleunit/test.h>
+
+#include <UtpStream.h>
+#include <common/Format.h>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(UtpStream)
+
+namespace
+{
+//! Fills a buffer with a recognisable, position-dependent pattern.
+std::vector<uint8_t> Pattern(size_t length, uint8_t seed = 0)
+{
+	std::vector<uint8_t> bytes(length);
+	for (size_t i = 0; i < length; ++i) {
+		bytesi = static_cast<uint8_t>((i * 31 + seed) & 0xFF);
+	}
+	return bytes;
+}
+} // namespace
+
+TEST(UtpStream, EmptyReadBlocksAndIsNotAnError)
+{
+	CUtpStream stream;
+	uint8_t out16 = { 0 };
+
+	ASSERT_EQUALS(0u, stream.Read(out, sizeof(out)));
+	ASSERT_TRUE(stream.BlocksRead());
+	// The whole point: a would-block must not look like a dead connection.
+	ASSERT_EQUALS(0, stream.LastError());
+	ASSERT_FALSE(stream.IsTerminal());
+}
+
+TEST(UtpStream, PayloadArrivesInOrderAndClearsTheBlock)
+{
+	CUtpStream stream;
+	uint8_t out4 = { 0 };
+	ASSERT_EQUALS(0u, stream.Read(out, sizeof(out)));
+	ASSERT_TRUE(stream.BlocksRead());
+
+	const std::vector<uint8_t> sent = Pattern(10);
+	stream.OnPayload(sent.data(), sent.size());
+	ASSERT_FALSE(stream.BlocksRead());
+	ASSERT_EQUALS(10u, (unsigned)stream.ReadBufferSize());
+
+	// A short read takes a prefix and leaves the rest, in order.
+	ASSERT_EQUALS(4u, stream.Read(out, sizeof(out)));
+	for (size_t i = 0; i < 4; ++i) {
+		ASSERT_EQUALS((int)senti, (int)outi);
+	}
+	ASSERT_EQUALS(6u, (unsigned)stream.ReadBufferSize());
+
+	uint8_t rest6 = { 0 };
+	ASSERT_EQUALS(6u, stream.Read(rest, sizeof(rest)));
+	for (size_t i = 0; i < 6; ++i) {
+		ASSERT_EQUALS((int)senti + 4, (int)resti);
+	}
+}
+
+TEST(UtpStream, ReadDrainedCrossingTable)
+{
+	const struct
+	{
+		const char *label;
+		uint32_t initial;
+		uint32_t requested;
+		bool edge;
+	} cases = {
+		{ "above to nonempty below", 12, 6, true },
+		{ "at the bound, still above the high-water", 8, 1, false },
+		{ "at the bound, down past the high-water", 8, 3, true },
+		{ "above to above", 12, 2, false },
+		{ "above to exact bound", 12, 4, false },
+		{ "above to empty", 12, 16, true },
+		{ "zero length at bound", 8, 0, false },
+		{ "empty returns zero", 0, 6, false },
+	};
+	for (const auto &row : cases) {
+		CFormat format("%s: initial=%u read=%u expected-edge=%u");
+		const wxString message =
+			format % row.label % row.initial % row.requested % unsigned(row.edge);
+		CUtpStream stream(CUtpStream::kDefaultWriteBound, 8);
+		const auto payload = Pattern(row.initial);
+		stream.OnPayload(payload.data(), payload.size());
+		uint8_t out16 = { 0 };
+		const auto taken = std::min(row.initial, row.requested);
+		ASSERT_EQUALS_M(taken, stream.Read(out, row.requested), message);
+		ASSERT_EQUALS_M(size_t(row.initial - taken), stream.ReadBufferSize(), message);
+		ASSERT_EQUALS_M(row.edge, stream.ConsumeReadDrainedEdge(), message);
+	}
+}
+
+TEST(UtpStream, EmptyingBelowBoundDoesNotNotify)
+{
+	// Empty is not the window-reopening transition: packet readers can keep a nonempty
+	// backlog forever. Only crossing the receive bound warrants utp_read_drained().
+	CUtpStream stream(CUtpStream::kDefaultWriteBound, 8);
+	const auto payload = Pattern(6);
+	stream.OnPayload(payload.data(), payload.size());
+	uint8_t out6 = { 0 };
+	ASSERT_EQUALS(6u, stream.Read(out, sizeof(out)));
+	ASSERT_FALSE(stream.ConsumeReadDrainedEdge());
+}
+
+TEST(UtpStream, RefillAllowsASecondReadDrainedCrossing)
+{
+	CUtpStream stream(CUtpStream::kDefaultWriteBound, 8);
+	const auto payload = Pattern(12);
+	uint8_t out6 = { 0 };
+	stream.OnPayload(payload.data(), payload.size());
+	ASSERT_EQUALS(6u, stream.Read(out, sizeof(out)));
+	ASSERT_TRUE(stream.ConsumeReadDrainedEdge());
+	stream.OnPayload(payload.data(), 6);
+	ASSERT_EQUALS(size_t(12), stream.ReadBufferSize());
+	ASSERT_EQUALS(6u, stream.Read(out, sizeof(out)));
+	ASSERT_TRUE(stream.ConsumeReadDrainedEdge());
+	ASSERT_FALSE(stream.ConsumeReadDrainedEdge());
+}
+
+TEST(UtpStream, ReadDrainedConsumptionIsOneShot)
+{
+	CUtpStream stream(CUtpStream::kDefaultWriteBound, 8);
+	const auto payload = Pattern(8);
+	uint8_t out2 = { 0 };
+	ASSERT_FALSE(stream.ConsumeReadDrainedEdge());
+	stream.OnPayload(payload.data(), payload.size());
+	// Two bytes cross the high-water; the second read is already below it and
+	// must not erase a notification still owed.
+	ASSERT_EQUALS(2u, stream.Read(out, 2));
+	ASSERT_EQUALS(1u, stream.Read(out, 1));
+	ASSERT_TRUE(stream.ConsumeReadDrainedEdge());
+	ASSERT_FALSE(stream.ConsumeReadDrainedEdge());
+}
+
+TEST(UtpStream, TerminalReadsNeverManufactureReadDrainedEdges)
+{
+	const EUtpTransportFailure endings = { EUtpTransportFailure::Eof,
+		EUtpTransportFailure::Destroying,
+		EUtpTransportFailure::Refused,
+		EUtpTransportFailure::TimedOut,
+		EUtpTransportFailure::Reset };
+	for (const auto ending : endings) {
+		const wxString message = CFormat("terminal ending=%u") % unsigned(ending);
+		CUtpStream stream(CUtpStream::kDefaultWriteBound, 8);
+		const auto payload = Pattern(12);
+		stream.OnPayload(payload.data(), payload.size());
+		stream.OnFailure(ending);
+		uint8_t out6 = { 0 };
+		ASSERT_EQUALS_M(6u, stream.Read(out, sizeof(out)), message);
+		ASSERT_TRUE_M(!stream.ConsumeReadDrainedEdge(), message);
+		ASSERT_EQUALS_M(6u, stream.Read(out, sizeof(out)), message);
+		ASSERT_TRUE_M(!stream.ConsumeReadDrainedEdge(), message);
+		ASSERT_EQUALS_M(0u, stream.Read(out, sizeof(out)), message);
+		ASSERT_TRUE_M(!stream.ConsumeReadDrainedEdge(), message);
+	}
+}
+
+TEST(UtpStream, ReadBoundIsReportedRatherThanEnforced)
+{
+	// libutp can deliver more than the bound in one callback, and a byte dropped here is a hole
+	// in a file the peer already paid to send. So the bound is what UTP_GET_READ_BUFFER_SIZE
+	// reports -- the peer stops a round trip later -- not something this class refuses.
+	CUtpStream stream(CUtpStream::kDefaultWriteBound, 8);
+	const std::vector<uint8_t> first = Pattern(20);
+	const std::vector<uint8_t> second = Pattern(12, 200);
+
+	stream.OnPayload(first.data(), first.size());
+	ASSERT_EQUALS(8u, (unsigned)stream.ReadBound());
+	// Past the bound, and reported as such: this count is what libutp
+	// subtracts from opt_rcvbuf to decide how much window to advertise.
+	ASSERT_EQUALS(20u, (unsigned)stream.ReadBufferSize());
+
+	// The delivery that matters: already past the bound, and it must still be
+	// kept in full. Refusing here is the byte-dropping this bound must not do.
+	stream.OnPayload(second.data(), second.size());
+	ASSERT_EQUALS(32u, (unsigned)stream.ReadBufferSize());
+	ASSERT_EQUALS(0, stream.LastError());
+
+	uint8_t out32 = { 0 };
+	ASSERT_EQUALS(32u, stream.Read(out, sizeof(out)));
+	for (size_t i = 0; i < first.size(); ++i) {
+		ASSERT_EQUALS((int)firsti, (int)outi);
+	}
+	for (size_t i = 0; i < second.size(); ++i) {
+		ASSERT_EQUALS((int)secondi, (int)outfirst.size() + i);
+	}
+	ASSERT_EQUALS(0u, (unsigned)stream.ReadBufferSize());
+}
+
+TEST(UtpStream, ErrorValuesCannotBeMistakenForSocketErrors)
+{
+	// LastError() stands in for CLibSocket::LastError() under the same name and type, and that
+	// one returns a boost error_code value: errno on POSIX, WinSock codes (10000-11999) on
+	// Windows. Every failure of ours has to sit clear of both, or a call site comparing against
+	// a constant matches by coincidence.
+	const EUtpTransportFailure failures = {
+		EUtpTransportFailure::Refused, EUtpTransportFailure::TimedOut, EUtpTransportFailure::Reset
+	};
+	for (size_t i = 0; i < sizeof(failures) / sizeof(failures0); ++i) {
+		CUtpStream stream;
+		stream.OnFailure(failuresi);
+		ASSERT_TRUE(stream.LastError() > 11999);
+	}
+}
+
+TEST(UtpStream, WriteBoundBlocksWithoutFailing)
+{
+	CUtpStream stream(64);
+	const std::vector<uint8_t> payload = Pattern(64, 7);
+
+	ASSERT_EQUALS(64u, stream.Write(payload.data(), 64));
+	ASSERT_TRUE(stream.BlocksWrite());
+	ASSERT_EQUALS(0, stream.LastError());
+
+	// Full queue: refused, but the stream is alive.
+	ASSERT_EQUALS(0u, stream.Write(payload.data(), 8));
+	ASSERT_TRUE(stream.BlocksWrite());
+	ASSERT_EQUALS(0, stream.LastError());
+	ASSERT_FALSE(stream.IsTerminal());
+}
+
+TEST(UtpStream, PartialWriteTakesWhatFits)
+{
+	CUtpStream stream(10);
+	const std::vector<uint8_t> payload = Pattern(16, 3);
+
+	// Accepting what fits rather than refusing the whole write is what keeps
+	// the caller making progress against a slow peer.
+	ASSERT_EQUALS(10u, stream.Write(payload.data(), 16));
+	ASSERT_TRUE(stream.BlocksWrite());
+
+	const std::vector<uint8_t> queued = stream.PeekQueuedBytes();
+	ASSERT_EQUALS(10u, (unsigned)queued.size());
+	for (size_t i = 0; i < queued.size(); ++i) {
+		ASSERT_EQUALS((int)payloadi, (int)queuedi);
+	}
+	// Looking is not taking: the queue is still full until libutp says what
+	// it accepted, so the writer stays blocked.
+	ASSERT_TRUE(stream.BlocksWrite());
+	ASSERT_EQUALS(10u, (unsigned)stream.WriteBufferSize());
+
+	// Draining the queue is what unblocks the writer.
+	stream.ConsumeQueuedBytes(queued.size());
+	ASSERT_FALSE(stream.BlocksWrite());
+	ASSERT_EQUALS(0u, (unsigned)stream.WriteBufferSize());
+}
+
+TEST(UtpStream, RefusedBytesStayQueued)
+{
+	CUtpStream stream(64);
+	const std::vector<uint8_t> payload = Pattern(40, 11);
+	ASSERT_EQUALS(40u, stream.Write(payload.data(), 40));
+
+	// utp_write() takes what the congestion window allows and reports it. The refused tail has
+	// to stay here: if the queue emptied, the caller would have to hold those bytes somewhere
+	// WriteBufferSize() cannot see and m_writeBound does not bound, which is the growth the
+	// bound prevents.
+	stream.ConsumeQueuedBytes(15);
+	ASSERT_EQUALS(25u, (unsigned)stream.WriteBufferSize());
+
+	const std::vector<uint8_t> left = stream.PeekQueuedBytes();
+	ASSERT_EQUALS(25u, (unsigned)left.size());
+	for (size_t i = 0; i < left.size(); ++i) {
+		ASSERT_EQUALS((int)payload15 + i, (int)lefti);
+	}
+
+	// And the queue keeps taking new bytes behind them, in order.
+	const std::vector<uint8_t> more = Pattern(4, 200);
+	ASSERT_EQUALS(4u, stream.Write(more.data(), 4));
+	const std::vector<uint8_t> all = stream.PeekQueuedBytes();
+	ASSERT_EQUALS(29u, (unsigned)all.size());
+	ASSERT_EQUALS((int)more0, (int)all25);
+}
+
+TEST(UtpStream, ConsumingMoreThanIsQueuedIsHarmless)
+{
+	// libutp reports what it took, so accepted should never exceed the queue.
+	// Clamping keeps a wrong count from erasing past the end.
+	CUtpStream stream(64);
+	const std::vector<uint8_t> payload = Pattern(8, 21);
+	ASSERT_EQUALS(8u, stream.Write(payload.data(), 8));
+
+	stream.ConsumeQueuedBytes(4096);
+	ASSERT_EQUALS(0u, (unsigned)stream.WriteBufferSize());
+	ASSERT_FALSE(stream.BlocksWrite());
+}
+
+TEST(UtpStream, ConsumingUnblocksOnlyWhenItDropsBelowTheBound)
+{
+	CUtpStream stream(16);
+	const std::vector<uint8_t> payload = Pattern(16, 31);
+	ASSERT_EQUALS(16u, stream.Write(payload.data(), 16));
+	ASSERT_TRUE(stream.BlocksWrite());
+
+	// libutp took nothing, so nothing changed and the writer stays blocked.
+	stream.ConsumeQueuedBytes(0);
+	ASSERT_TRUE(stream.BlocksWrite());
+	ASSERT_EQUALS(16u, (unsigned)stream.WriteBufferSize());
+
+	stream.ConsumeQueuedBytes(1);
+	ASSERT_FALSE(stream.BlocksWrite());
+}
+
+TEST(UtpStream, WritableReopensAWindowOnlyWhenThereIsRoom)
+{
+	CUtpStream stream(16);
+	const std::vector<uint8_t> payload = Pattern(16, 5);
+	ASSERT_EQUALS(16u, stream.Write(payload.data(), 16));
+	ASSERT_TRUE(stream.BlocksWrite());
+
+	// The peer's window opening does not empty our queue, so it does not
+	// unblock a writer that is bounded by our own buffer. Only draining does.
+	stream.ConsumeQueuedBytes(stream.WriteBufferSize());
+	ASSERT_FALSE(stream.BlocksWrite());
+}
+
+TEST(UtpStream, EofAndDestroyingAreEndsRatherThanErrors)
+{
+	CUtpStream eof;
+	eof.OnFailure(EUtpTransportFailure::Eof);
+	ASSERT_TRUE(eof.IsTerminal());
+	ASSERT_EQUALS(0, eof.LastError());
+	ASSERT_FALSE(IsUtpFailure(eof.Failure()));
+	// A finished transfer must not be charged as a failure.
+	ASSERT_FALSE(eof.BlocksRead());
+
+	CUtpStream destroying;
+	destroying.OnFailure(EUtpTransportFailure::Destroying);
+	ASSERT_TRUE(destroying.IsTerminal());
+	ASSERT_EQUALS(0, destroying.LastError());
+}
+
+TEST(UtpStream, TheThreeFailuresStayDistinct)
+{
+	// A refused connection, a silent peer and a torn-down connection are three different facts
+	// about a peer, and the source list acts differently on each. Collapsing them to "failed"
+	// is what makes a firewalled peer indistinguishable from a dead one.
+	CUtpStream refused;
+	refused.OnFailure(EUtpTransportFailure::Refused);
+	CUtpStream timedOut;
+	timedOut.OnFailure(EUtpTransportFailure::TimedOut);
+	CUtpStream reset;
+	reset.OnFailure(EUtpTransportFailure::Reset);
+
+	ASSERT_TRUE(refused.Failure() == EUtpTransportFailure::Refused);
+	ASSERT_TRUE(timedOut.Failure() == EUtpTransportFailure::TimedOut);
+	ASSERT_TRUE(reset.Failure() == EUtpTransportFailure::Reset);
+
+	ASSERT_TRUE(refused.LastError() != 0);
+	ASSERT_TRUE(timedOut.LastError() != 0);
+	ASSERT_TRUE(reset.LastError() != 0);
+	ASSERT_TRUE(refused.LastError() != timedOut.LastError());
+	ASSERT_TRUE(timedOut.LastError() != reset.LastError());
+}
+
+TEST(UtpStream, TheFirstEndWins)
+{
+	CUtpStream stream;
+	stream.OnFailure(EUtpTransportFailure::Eof);
+	// A reset arriving after a clean close must not retroactively fail a
+	// transfer that finished.
+	stream.OnFailure(EUtpTransportFailure::Reset);
+	ASSERT_TRUE(stream.Failure() == EUtpTransportFailure::Eof);
+	ASSERT_EQUALS(0, stream.LastError());
+}
+
+TEST(UtpStream, WritingToAnEndedStreamIsRefused)
+{
+	CUtpStream stream;
+	const std::vector<uint8_t> payload = Pattern(4);
+	stream.OnFailure(EUtpTransportFailure::Reset);
+	ASSERT_EQUALS(0u, stream.Write(payload.data(), 4));
+	ASSERT_FALSE(stream.BlocksWrite());
+}
+
+TEST(UtpStream, ReadingAnEndedStreamReportsTheEndRatherThanBlocking)
+{
+	CUtpStream stream;
+	uint8_t out4 = { 0 };
+	stream.OnFailure(EUtpTransportFailure::Eof);
+	// 0 bytes and no block: no more bytes are coming, as opposed to not yet.
+	ASSERT_EQUALS(0u, stream.Read(out, sizeof(out)));
+	ASSERT_FALSE(stream.BlocksRead());
+}
+
+TEST(UtpStream, ACleanEndIsNotOkAndIsNotAWouldBlock)
+{
+	CUtpStream stream;
+	const std::vector<uint8_t> payload = Pattern(4, 41);
+	ASSERT_TRUE(stream.IsOk());
+
+	stream.OnFailure(EUtpTransportFailure::Eof);
+
+	// EOF ends the stream without failing it, so Write() refuses while both BlocksWrite() and
+	// LastError() stay 0 -- the pair a would-block sets. IsOk() is what tells the two apart.
+	ASSERT_EQUALS(0u, stream.Write(payload.data(), 4));
+	ASSERT_FALSE(stream.BlocksWrite());
+	ASSERT_EQUALS(0, stream.LastError());
+	ASSERT_FALSE(stream.IsOk());
+}
+
+TEST(UtpStream, BufferedBytesSurviveTheEnd)
+{
+	CUtpStream stream;
+	const std::vector<uint8_t> sent = Pattern(5, 9);
+	stream.OnPayload(sent.data(), sent.size());
+	stream.OnFailure(EUtpTransportFailure::Eof);
+
+	// A peer that sent its last bytes and closed in the same tick has still
+	// sent them; dropping the buffer on EOF loses the tail of every transfer.
+	uint8_t out5 = { 0 };
+	ASSERT_EQUALS(5u, stream.Read(out, sizeof(out)));
+	for (size_t i = 0; i < 5; ++i) {
+		ASSERT_EQUALS((int)senti, (int)outi);
+	}
+}
+
+// File_checked_for_headers